diff --git a/.betterer.results b/.betterer.results
index 00598e6a0779f..983e03cb8ac83 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -5,37 +5,27 @@
 //
 exports[`better eslint`] = {
   value: `{
+    "e2e/scenes/utils/support/types.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
     "e2e/utils/support/types.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "packages/grafana-data/src/dataframe/ArrayDataFrame.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "packages/grafana-data/src/dataframe/CircularDataFrame.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "packages/grafana-data/src/dataframe/DataFrameJSON.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
-    ],
-    "packages/grafana-data/src/dataframe/DataFrameView.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
+      [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "packages/grafana-data/src/dataframe/DataFrameView.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Do not use any type assertions.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Do not use any type assertions.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
     ],
     "packages/grafana-data/src/dataframe/MutableDataFrame.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -46,16 +36,10 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
+      [0, 0, 0, "Do not use any type assertions.", "8"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Do not use any type assertions.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Do not use any type assertions.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
-      [0, 0, 0, "Do not use any type assertions.", "17"]
+      [0, 0, 0, "Do not use any type assertions.", "10"],
+      [0, 0, 0, "Do not use any type assertions.", "11"]
     ],
     "packages/grafana-data/src/dataframe/StreamingDataFrame.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
@@ -63,9 +47,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "2"],
       [0, 0, 0, "Do not use any type assertions.", "3"],
       [0, 0, 0, "Do not use any type assertions.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Do not use any type assertions.", "6"],
-      [0, 0, 0, "Do not use any type assertions.", "7"]
+      [0, 0, 0, "Do not use any type assertions.", "5"]
     ],
     "packages/grafana-data/src/dataframe/dimensions.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -80,24 +62,23 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "3"],
       [0, 0, 0, "Do not use any type assertions.", "4"],
       [0, 0, 0, "Do not use any type assertions.", "5"],
-      [0, 0, 0, "Do not use any type assertions.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
+      [0, 0, 0, "Do not use any type assertions.", "7"],
       [0, 0, 0, "Do not use any type assertions.", "8"],
       [0, 0, 0, "Do not use any type assertions.", "9"],
-      [0, 0, 0, "Do not use any type assertions.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Do not use any type assertions.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Do not use any type assertions.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
+      [0, 0, 0, "Do not use any type assertions.", "11"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
+      [0, 0, 0, "Do not use any type assertions.", "13"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
+      [0, 0, 0, "Do not use any type assertions.", "15"],
       [0, 0, 0, "Do not use any type assertions.", "16"],
       [0, 0, 0, "Do not use any type assertions.", "17"],
       [0, 0, 0, "Do not use any type assertions.", "18"],
       [0, 0, 0, "Do not use any type assertions.", "19"],
       [0, 0, 0, "Do not use any type assertions.", "20"],
       [0, 0, 0, "Do not use any type assertions.", "21"],
-      [0, 0, 0, "Do not use any type assertions.", "22"],
-      [0, 0, 0, "Do not use any type assertions.", "23"]
+      [0, 0, 0, "Do not use any type assertions.", "22"]
     ],
     "packages/grafana-data/src/datetime/datemath.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -139,10 +120,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
-    "packages/grafana-data/src/events/common.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
-    ],
     "packages/grafana-data/src/events/types.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
@@ -153,32 +130,21 @@ exports[`better eslint`] = {
     "packages/grafana-data/src/field/displayProcessor.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
+      [0, 0, 0, "Do not use any type assertions.", "2"]
     ],
-    "packages/grafana-data/src/field/fieldOverrides.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
+    "packages/grafana-data/src/field/fieldState.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "packages/grafana-data/src/field/overrides/processors.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
+      [0, 0, 0, "Do not use any type assertions.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
       [0, 0, 0, "Do not use any type assertions.", "4"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Do not use any type assertions.", "6"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Do not use any type assertions.", "11"]
-    ],
-    "packages/grafana-data/src/field/scale.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"]
+      [0, 0, 0, "Do not use any type assertions.", "8"]
     ],
     "packages/grafana-data/src/field/standardFieldConfigEditorRegistry.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -191,8 +157,7 @@ exports[`better eslint`] = {
     ],
     "packages/grafana-data/src/geo/layer.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "packages/grafana-data/src/panel/PanelPlugin.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -204,16 +169,8 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "6"],
       [0, 0, 0, "Do not use any type assertions.", "7"]
     ],
-    "packages/grafana-data/src/panel/getPanelOptionsWithDefaults.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
-    ],
     "packages/grafana-data/src/panel/registryFactories.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"]
+      [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "packages/grafana-data/src/themes/colorManipulator.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -223,9 +180,6 @@ exports[`better eslint`] = {
     "packages/grafana-data/src/themes/createColors.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "packages/grafana-data/src/transformations/fieldReducer.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "packages/grafana-data/src/transformations/matchers/valueMatchers/types.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
@@ -236,25 +190,14 @@ exports[`better eslint`] = {
     "packages/grafana-data/src/transformations/transformDataFrame.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "packages/grafana-data/src/transformations/transformers/groupBy.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
-    ],
-    "packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
-    "packages/grafana-data/src/transformations/transformers/histogram.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "packages/grafana-data/src/transformations/transformers/joinDataFrames.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "packages/grafana-data/src/transformations/transformers/merge.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+    "packages/grafana-data/src/transformations/transformers/nulls/nullInsertThreshold.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
     ],
     "packages/grafana-data/src/transformations/transformers/reduce.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -344,26 +287,21 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "21"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "22"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "23"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "24"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "25"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "24"]
     ],
     "packages/grafana-data/src/types/explore.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "packages/grafana-data/src/types/fieldOverrides.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "8"]
     ],
     "packages/grafana-data/src/types/flot.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -388,9 +326,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "7"],
       [0, 0, 0, "Do not use any type assertions.", "8"]
     ],
-    "packages/grafana-data/src/types/logs.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
     "packages/grafana-data/src/types/options.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
@@ -413,8 +348,7 @@ exports[`better eslint`] = {
     ],
     "packages/grafana-data/src/types/plugin.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"]
+      [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "packages/grafana-data/src/types/select.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -437,106 +371,34 @@ exports[`better eslint`] = {
     "packages/grafana-data/src/types/variables.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "packages/grafana-data/src/types/vector.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
-    ],
     "packages/grafana-data/src/utils/OptionsUIBuilders.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Do not use any type assertions.", "6"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Do not use any type assertions.", "8"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Do not use any type assertions.", "10"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Do not use any type assertions.", "12"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Do not use any type assertions.", "14"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Do not use any type assertions.", "16"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "17"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "18"],
-      [0, 0, 0, "Do not use any type assertions.", "19"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "19"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "20"],
-      [0, 0, 0, "Do not use any type assertions.", "21"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "21"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "22"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "23"],
-      [0, 0, 0, "Do not use any type assertions.", "24"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "24"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "25"],
-      [0, 0, 0, "Do not use any type assertions.", "26"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "27"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "28"],
-      [0, 0, 0, "Do not use any type assertions.", "29"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "30"],
-      [0, 0, 0, "Do not use any type assertions.", "31"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "32"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "33"],
-      [0, 0, 0, "Do not use any type assertions.", "34"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "35"],
-      [0, 0, 0, "Do not use any type assertions.", "36"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "37"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "38"],
-      [0, 0, 0, "Do not use any type assertions.", "39"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "40"],
-      [0, 0, 0, "Do not use any type assertions.", "41"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "42"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "43"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "44"],
-      [0, 0, 0, "Do not use any type assertions.", "45"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "46"],
-      [0, 0, 0, "Do not use any type assertions.", "47"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "48"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "49"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "50"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "51"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "52"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "53"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "54"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "55"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "56"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "57"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "58"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "59"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "60"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "61"],
-      [0, 0, 0, "Do not use any type assertions.", "62"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "63"],
-      [0, 0, 0, "Do not use any type assertions.", "64"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "65"],
-      [0, 0, 0, "Do not use any type assertions.", "66"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "67"],
-      [0, 0, 0, "Do not use any type assertions.", "68"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "69"],
-      [0, 0, 0, "Do not use any type assertions.", "70"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "71"],
-      [0, 0, 0, "Do not use any type assertions.", "72"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "73"],
-      [0, 0, 0, "Do not use any type assertions.", "74"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "75"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "76"],
-      [0, 0, 0, "Do not use any type assertions.", "77"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "78"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "79"],
-      [0, 0, 0, "Do not use any type assertions.", "80"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "81"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "82"],
-      [0, 0, 0, "Do not use any type assertions.", "83"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "84"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "85"],
-      [0, 0, 0, "Do not use any type assertions.", "86"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "87"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "88"],
-      [0, 0, 0, "Do not use any type assertions.", "89"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "90"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "91"],
-      [0, 0, 0, "Do not use any type assertions.", "92"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "93"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "26"]
     ],
     "packages/grafana-data/src/utils/Registry.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -556,34 +418,25 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "packages/grafana-data/src/utils/datasource.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"]
-    ],
-    "packages/grafana-data/src/utils/fieldParser.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "packages/grafana-data/src/utils/flotPairs.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "packages/grafana-data/src/utils/location.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+      [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "packages/grafana-data/src/utils/url.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Do not use any type assertions.", "5"],
+      [0, 0, 0, "Do not use any type assertions.", "4"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Do not use any type assertions.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"]
+      [0, 0, 0, "Do not use any type assertions.", "7"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "8"]
     ],
     "packages/grafana-data/src/utils/valueMappings.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -592,24 +445,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
     ],
-    "packages/grafana-data/src/vector/AppendedVectors.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"]
-    ],
-    "packages/grafana-data/src/vector/ArrayVector.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
-    ],
     "packages/grafana-data/src/vector/CircularVector.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
-    ],
-    "packages/grafana-data/src/vector/ConstantVector.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
-    "packages/grafana-data/src/vector/FormattedVector.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "packages/grafana-data/src/vector/FunctionalVector.ts:5381": [
@@ -621,12 +457,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"]
-    ],
-    "packages/grafana-data/src/vector/SortedVector.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "8"]
     ],
     "packages/grafana-data/test/__mocks__/pluginMocks.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -668,40 +499,67 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "12"]
     ],
     "packages/grafana-flamegraph/src/TopTable/FlameGraphTopTableContainer.tsx:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"],
+      [0, 0, 0, "Styles should be written using objects.", "1"]
+    ],
+    "packages/grafana-o11y-ds-frontend/src/utils.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
+    "packages/grafana-prometheus/src/components/PromExemplarField.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"]
+      [0, 0, 0, "Styles should be written using objects.", "2"]
     ],
-    "packages/grafana-runtime/src/analytics/types.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    "packages/grafana-prometheus/src/components/PromExploreExtraField.tsx:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"],
+      [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
-    "packages/grafana-runtime/src/config.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
+    "packages/grafana-prometheus/src/components/PromQueryField.test.tsx:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "packages/grafana-runtime/src/services/AngularLoader.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+    "packages/grafana-prometheus/src/components/PromQueryField.tsx:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "packages/grafana-runtime/src/services/EchoSrv.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
+    "packages/grafana-prometheus/src/components/PrometheusMetricsBrowser.tsx:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"],
+      [0, 0, 0, "Styles should be written using objects.", "1"],
+      [0, 0, 0, "Styles should be written using objects.", "2"],
+      [0, 0, 0, "Styles should be written using objects.", "3"],
+      [0, 0, 0, "Styles should be written using objects.", "4"],
+      [0, 0, 0, "Styles should be written using objects.", "5"],
+      [0, 0, 0, "Styles should be written using objects.", "6"],
+      [0, 0, 0, "Styles should be written using objects.", "7"],
+      [0, 0, 0, "Styles should be written using objects.", "8"],
+      [0, 0, 0, "Styles should be written using objects.", "9"],
+      [0, 0, 0, "Styles should be written using objects.", "10"],
+      [0, 0, 0, "Styles should be written using objects.", "11"]
     ],
-    "packages/grafana-runtime/src/services/LocationService.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"]
+    "packages/grafana-prometheus/src/components/monaco-query-field/MonacoQueryField.tsx:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"],
+      [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
-    "packages/grafana-runtime/src/services/backendSrv.ts:5381": [
+    "packages/grafana-prometheus/src/configuration/ConfigEditor.tsx:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"],
+      [0, 0, 0, "Styles should be written using objects.", "1"],
+      [0, 0, 0, "Styles should be written using objects.", "2"],
+      [0, 0, 0, "Styles should be written using objects.", "3"],
+      [0, 0, 0, "Styles should be written using objects.", "4"],
+      [0, 0, 0, "Styles should be written using objects.", "5"],
+      [0, 0, 0, "Styles should be written using objects.", "6"],
+      [0, 0, 0, "Styles should be written using objects.", "7"],
+      [0, 0, 0, "Styles should be written using objects.", "8"],
+      [0, 0, 0, "Styles should be written using objects.", "9"],
+      [0, 0, 0, "Styles should be written using objects.", "10"],
+      [0, 0, 0, "Styles should be written using objects.", "11"],
+      [0, 0, 0, "Styles should be written using objects.", "12"],
+      [0, 0, 0, "Styles should be written using objects.", "13"],
+      [0, 0, 0, "Styles should be written using objects.", "14"],
+      [0, 0, 0, "Styles should be written using objects.", "15"]
+    ],
+    "packages/grafana-prometheus/src/configuration/ExemplarsSettings.tsx:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"]
+    ],
+    "packages/grafana-prometheus/src/datasource.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
@@ -716,45 +574,189 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "12"]
     ],
-    "packages/grafana-runtime/src/utils/DataSourceWithBackend.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
+    "packages/grafana-prometheus/src/gcopypaste/app/features/live/data/amendTimeSeries.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
+      [0, 0, 0, "Do not use any type assertions.", "2"],
+      [0, 0, 0, "Do not use any type assertions.", "3"],
+      [0, 0, 0, "Do not use any type assertions.", "4"]
+    ],
+    "packages/grafana-prometheus/src/gcopypaste/public/test/matchers/index.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    ],
+    "packages/grafana-prometheus/src/gcopypaste/public/test/matchers/toEmitValuesWith.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+    ],
+    "packages/grafana-prometheus/src/gcopypaste/public/test/matchers/utils.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    ],
+    "packages/grafana-prometheus/src/gcopypaste/test/helpers/selectOptionInTest.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
+    "packages/grafana-prometheus/src/language_provider.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
     ],
-    "packages/grafana-runtime/src/utils/queryResponse.ts:5381": [
+    "packages/grafana-prometheus/src/language_utils.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Do not use any type assertions.", "2"]
+    ],
+    "packages/grafana-prometheus/src/metric_find_query.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
+    ],
+    "packages/grafana-prometheus/src/query_hints.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    ],
+    "packages/grafana-prometheus/src/querybuilder/QueryPattern.tsx:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"],
+      [0, 0, 0, "Styles should be written using objects.", "1"],
+      [0, 0, 0, "Styles should be written using objects.", "2"],
+      [0, 0, 0, "Styles should be written using objects.", "3"]
+    ],
+    "packages/grafana-prometheus/src/querybuilder/QueryPatternsModal.tsx:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"],
+      [0, 0, 0, "Styles should be written using objects.", "1"]
+    ],
+    "packages/grafana-prometheus/src/querybuilder/binaryScalarOperations.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    ],
+    "packages/grafana-prometheus/src/querybuilder/components/LabelFilterItem.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"],
+      [0, 0, 0, "Do not use any type assertions.", "2"],
+      [0, 0, 0, "Do not use any type assertions.", "3"]
+    ],
+    "packages/grafana-prometheus/src/querybuilder/components/LabelFilters.tsx:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"]
+    ],
+    "packages/grafana-prometheus/src/querybuilder/components/LabelParamEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "packages/grafana-schema/src/veneer/common.types.ts:5381": [
+    "packages/grafana-prometheus/src/querybuilder/components/MetricSelect.tsx:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
+      [0, 0, 0, "Styles should be written using objects.", "4"],
+      [0, 0, 0, "Styles should be written using objects.", "5"],
+      [0, 0, 0, "Styles should be written using objects.", "6"],
+      [0, 0, 0, "Styles should be written using objects.", "7"],
+      [0, 0, 0, "Styles should be written using objects.", "8"],
+      [0, 0, 0, "Styles should be written using objects.", "9"],
+      [0, 0, 0, "Styles should be written using objects.", "10"],
+      [0, 0, 0, "Styles should be written using objects.", "11"],
+      [0, 0, 0, "Styles should be written using objects.", "12"]
+    ],
+    "packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilder.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
+    "packages/grafana-prometheus/src/querybuilder/components/PromQueryCodeEditor.tsx:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"]
+    ],
+    "packages/grafana-prometheus/src/querybuilder/components/metrics-modal/AdditionalSettings.tsx:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"],
+      [0, 0, 0, "Styles should be written using objects.", "1"],
+      [0, 0, 0, "Styles should be written using objects.", "2"]
+    ],
+    "packages/grafana-prometheus/src/querybuilder/components/metrics-modal/ResultsTable.tsx:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"],
+      [0, 0, 0, "Styles should be written using objects.", "1"],
+      [0, 0, 0, "Styles should be written using objects.", "2"],
+      [0, 0, 0, "Styles should be written using objects.", "3"],
+      [0, 0, 0, "Styles should be written using objects.", "4"],
+      [0, 0, 0, "Styles should be written using objects.", "5"],
+      [0, 0, 0, "Styles should be written using objects.", "6"],
+      [0, 0, 0, "Styles should be written using objects.", "7"],
+      [0, 0, 0, "Styles should be written using objects.", "8"],
+      [0, 0, 0, "Styles should be written using objects.", "9"],
+      [0, 0, 0, "Styles should be written using objects.", "10"],
+      [0, 0, 0, "Styles should be written using objects.", "11"],
+      [0, 0, 0, "Styles should be written using objects.", "12"]
+    ],
+    "packages/grafana-prometheus/src/querybuilder/components/metrics-modal/styles.ts:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"],
+      [0, 0, 0, "Styles should be written using objects.", "1"],
+      [0, 0, 0, "Styles should be written using objects.", "2"],
+      [0, 0, 0, "Styles should be written using objects.", "3"],
+      [0, 0, 0, "Styles should be written using objects.", "4"],
+      [0, 0, 0, "Styles should be written using objects.", "5"],
+      [0, 0, 0, "Styles should be written using objects.", "6"],
+      [0, 0, 0, "Styles should be written using objects.", "7"],
+      [0, 0, 0, "Styles should be written using objects.", "8"],
+      [0, 0, 0, "Styles should be written using objects.", "9"],
+      [0, 0, 0, "Styles should be written using objects.", "10"],
+      [0, 0, 0, "Styles should be written using objects.", "11"],
+      [0, 0, 0, "Styles should be written using objects.", "12"],
+      [0, 0, 0, "Styles should be written using objects.", "13"],
+      [0, 0, 0, "Styles should be written using objects.", "14"],
+      [0, 0, 0, "Styles should be written using objects.", "15"],
+      [0, 0, 0, "Styles should be written using objects.", "16"],
+      [0, 0, 0, "Styles should be written using objects.", "17"],
+      [0, 0, 0, "Styles should be written using objects.", "18"]
+    ],
+    "packages/grafana-prometheus/src/querybuilder/operationUtils.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
+    "packages/grafana-prometheus/src/querybuilder/shared/OperationEditor.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "packages/grafana-schema/src/veneer/dashboard.types.ts:5381": [
+    "packages/grafana-prometheus/src/querybuilder/shared/OperationParamEditor.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"]
+    ],
+    "packages/grafana-prometheus/src/querybuilder/shared/QueryBuilderHints.tsx:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"],
+      [0, 0, 0, "Styles should be written using objects.", "1"]
+    ],
+    "packages/grafana-prometheus/src/querybuilder/shared/types.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"],
-      [0, 0, 0, "Do not use any type assertions.", "5"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
-    "packages/grafana-ui/src/components/ColorPicker/ColorPicker.tsx:5381": [
+    "packages/grafana-prometheus/src/types.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
-    "packages/grafana-ui/src/components/DataLinks/DataLinkInput.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
+    "packages/grafana-runtime/src/analytics/types.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "packages/grafana-ui/src/components/DataLinks/DataLinksContextMenu.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
+    "packages/grafana-runtime/src/config.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"],
+      [0, 0, 0, "Do not use any type assertions.", "2"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
     ],
-    "packages/grafana-ui/src/components/DataSourceSettings/CustomHeadersSettings.tsx:5381": [
+    "packages/grafana-runtime/src/services/AngularLoader.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
-    "packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
+    "packages/grafana-runtime/src/services/EchoSrv.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
     ],
-    "packages/grafana-ui/src/components/DataSourceSettings/types.ts:5381": [
+    "packages/grafana-runtime/src/services/LocationService.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
+      [0, 0, 0, "Do not use any type assertions.", "4"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "5"]
+    ],
+    "packages/grafana-runtime/src/services/backendSrv.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
@@ -762,73 +764,89 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "12"]
     ],
-    "packages/grafana-ui/src/components/DateTimePickers/TimeRangeInput.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
+    "packages/grafana-runtime/src/services/pluginExtensions/getPluginExtensions.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/CalendarHeader.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
+    "packages/grafana-runtime/src/utils/DataSourceWithBackend.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
-    "packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerCalendar.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
+    "packages/grafana-runtime/src/utils/queryResponse.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerFooter.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
+    "packages/grafana-schema/src/veneer/common.types.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeContent.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "1"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "2"]
+    "packages/grafana-schema/src/veneer/dashboard.types.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Do not use any type assertions.", "2"],
+      [0, 0, 0, "Do not use any type assertions.", "3"],
+      [0, 0, 0, "Do not use any type assertions.", "4"],
+      [0, 0, 0, "Do not use any type assertions.", "5"],
+      [0, 0, 0, "Do not use any type assertions.", "6"]
     ],
-    "packages/grafana-ui/src/components/Drawer/Drawer.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
+    "packages/grafana-sql/src/components/query-editor-raw/QueryToolbox.tsx:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"],
+      [0, 0, 0, "Styles should be written using objects.", "1"],
+      [0, 0, 0, "Styles should be written using objects.", "2"],
+      [0, 0, 0, "Styles should be written using objects.", "3"],
+      [0, 0, 0, "Styles should be written using objects.", "4"]
     ],
-    "packages/grafana-ui/src/components/Forms/Legacy/Input/Input.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"]
+    "packages/grafana-sql/src/components/query-editor-raw/QueryValidator.tsx:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"],
+      [0, 0, 0, "Styles should be written using objects.", "1"],
+      [0, 0, 0, "Styles should be written using objects.", "2"]
     ],
-    "packages/grafana-ui/src/components/Forms/Legacy/Select/Select.tsx:5381": [
+    "packages/grafana-sql/src/components/query-editor-raw/RawEditor.tsx:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"],
+      [0, 0, 0, "Styles should be written using objects.", "1"]
+    ],
+    "packages/grafana-sql/src/components/visual-query-builder/AwesomeQueryBuilder.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "packages/grafana-ui/src/components/Forms/Legacy/Select/SelectOption.tsx:5381": [
+    "packages/grafana-sql/src/components/visual-query-builder/SQLWhereRow.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
+    "packages/grafana-ui/src/components/ColorPicker/ColorPicker.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
-    "packages/grafana-ui/src/components/Graph/GraphContextMenu.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    "packages/grafana-ui/src/components/DataLinks/DataLinkInput.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "packages/grafana-ui/src/components/Graph/utils.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    "packages/grafana-ui/src/components/DataSourceSettings/CustomHeadersSettings.tsx:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
-    "packages/grafana-ui/src/components/GraphNG/GraphNG.tsx:5381": [
+    "packages/grafana-ui/src/components/DataSourceSettings/types.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Do not use any type assertions.", "5"],
-      [0, 0, 0, "Do not use any type assertions.", "6"],
-      [0, 0, 0, "Do not use any type assertions.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Do not use any type assertions.", "9"],
-      [0, 0, 0, "Do not use any type assertions.", "10"],
-      [0, 0, 0, "Do not use any type assertions.", "11"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "7"]
     ],
-    "packages/grafana-ui/src/components/GraphNG/hooks.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
+    "packages/grafana-ui/src/components/Forms/Legacy/Input/Input.tsx:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"],
+      [0, 0, 0, "Do not use any type assertions.", "2"]
     ],
-    "packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
+    "packages/grafana-ui/src/components/Forms/Legacy/Select/Select.tsx:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "packages/grafana-ui/src/components/GraphNG/nullToUndefThreshold.ts:5381": [
+    "packages/grafana-ui/src/components/Forms/Legacy/Select/SelectOption.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "packages/grafana-ui/src/components/InfoBox/InfoBox.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
@@ -843,22 +861,12 @@ exports[`better eslint`] = {
     "packages/grafana-ui/src/components/MatchersUI/fieldMatchersUI.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "packages/grafana-ui/src/components/Menu/SubMenu.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "1"]
-    ],
     "packages/grafana-ui/src/components/Modal/ModalsContext.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
     ],
-    "packages/grafana-ui/src/components/PageLayout/PageToolbar.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
-    ],
-    "packages/grafana-ui/src/components/PanelChrome/LoadingIndicator.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
-    ],
     "packages/grafana-ui/src/components/PanelChrome/PanelContext.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
@@ -866,9 +874,6 @@ exports[`better eslint`] = {
     "packages/grafana-ui/src/components/PanelChrome/index.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "packages/grafana-ui/src/components/QueryField/QueryField.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
-    ],
     "packages/grafana-ui/src/components/Segment/SegmentSelect.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
@@ -884,8 +889,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "8"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "11"]
     ],
     "packages/grafana-ui/src/components/Select/SelectOptionGroup.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -951,7 +955,8 @@ exports[`better eslint`] = {
     ],
     "packages/grafana-ui/src/components/Table/Table.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Do not use any type assertions.", "2"]
     ],
     "packages/grafana-ui/src/components/Table/TableCell.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
@@ -981,16 +986,7 @@ exports[`better eslint`] = {
     "packages/grafana-ui/src/components/Tags/Tag.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "packages/grafana-ui/src/components/TimeSeries/utils.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
-    ],
     "packages/grafana-ui/src/components/ValuePicker/ValuePicker.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "1"]
-    ],
-    "packages/grafana-ui/src/components/VizLegend/VizLegendListItem.tsx:5381": [
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
     ],
     "packages/grafana-ui/src/components/VizLegend/types.ts:5381": [
@@ -1025,9 +1021,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
-    "packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin2.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
     "packages/grafana-ui/src/components/uPlot/types.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
@@ -1035,6 +1028,45 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
+    "packages/grafana-ui/src/graveyard/Graph/GraphContextMenu.tsx:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    ],
+    "packages/grafana-ui/src/graveyard/Graph/utils.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    ],
+    "packages/grafana-ui/src/graveyard/GraphNG/GraphNG.tsx:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
+      [0, 0, 0, "Do not use any type assertions.", "5"],
+      [0, 0, 0, "Do not use any type assertions.", "6"],
+      [0, 0, 0, "Do not use any type assertions.", "7"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
+      [0, 0, 0, "Do not use any type assertions.", "9"],
+      [0, 0, 0, "Do not use any type assertions.", "10"],
+      [0, 0, 0, "Do not use any type assertions.", "11"]
+    ],
+    "packages/grafana-ui/src/graveyard/GraphNG/hooks.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
+    "packages/grafana-ui/src/graveyard/GraphNG/nullInsertThreshold.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
+    ],
+    "packages/grafana-ui/src/graveyard/GraphNG/nullToUndefThreshold.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Do not use any type assertions.", "2"]
+    ],
+    "packages/grafana-ui/src/graveyard/TimeSeries/utils.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+    ],
     "packages/grafana-ui/src/options/builder/axis.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
@@ -1044,9 +1076,6 @@ exports[`better eslint`] = {
     "packages/grafana-ui/src/options/builder/hideSeries.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "packages/grafana-ui/src/options/builder/stacking.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "packages/grafana-ui/src/slate-plugins/braces.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
@@ -1113,256 +1142,63 @@ exports[`better eslint`] = {
     "packages/grafana-ui/src/utils/useAsyncDependency.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "plugins-bundled/internal/input-datasource/src/InputDatasource.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/core/TableModel.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"]
-    ],
-    "public/app/core/components/AppChrome/MegaMenu/NavFeatureHighlight.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/core/components/AppChrome/News/NewsContainer.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
-    ],
-    "public/app/core/components/AppChrome/SectionNav/SectionNavItem.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"]
-    ],
-    "public/app/core/components/AppChrome/TopBar/TopSearchBarCommandPaletteTrigger.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/core/components/Branding/Branding.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
-    "public/app/core/components/CardButton.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/core/components/CloseButton/CloseButton.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/core/components/ColorScale/ColorScale.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"]
-    ],
-    "public/app/core/components/Divider.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
-    "public/app/core/components/DynamicImports/SafeDynamicImport.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
-    "public/app/core/components/EmptyListCTA/EmptyListCTA.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
-    ],
-    "public/app/core/components/FolderFilter/FolderFilter.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
-    "public/app/core/components/ForgottenPassword/ChangePassword.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
-    ],
-    "public/app/core/components/ForgottenPassword/ForgottenPassword.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/core/components/Layers/LayerDragDropList.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"]
-    ],
-    "public/app/core/components/Layers/LayerName.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"]
-    ],
-    "public/app/core/components/Login/LoginForm.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "2"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "3"]
-    ],
-    "public/app/core/components/Login/LoginLayout.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Styles should be written using objects.", "8"],
-      [0, 0, 0, "Styles should be written using objects.", "9"],
-      [0, 0, 0, "Styles should be written using objects.", "10"]
-    ],
-    "public/app/core/components/Login/LoginPage.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/core/components/Login/LoginServiceButtons.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "6"]
     ],
-    "public/app/core/components/Login/UserSignup.tsx:5381": [
+    "public/app/core/components/AppChrome/TopBar/TopSearchBarCommandPaletteTrigger.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
-    "public/app/core/components/NestedFolderPicker/Trigger.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
+    "public/app/core/components/DynamicImports/SafeDynamicImport.tsx:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/core/components/NodeGraphSettings.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
+    "public/app/core/components/GraphNG/GraphNG.tsx:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
+      [0, 0, 0, "Do not use any type assertions.", "5"],
+      [0, 0, 0, "Do not use any type assertions.", "6"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
+      [0, 0, 0, "Do not use any type assertions.", "8"],
+      [0, 0, 0, "Do not use any type assertions.", "9"]
     ],
-    "public/app/core/components/OptionsUI/color.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"]
+    "public/app/core/components/GraphNG/hooks.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/core/components/OptionsUI/fieldColor.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
+    "public/app/core/components/NestedFolderPicker/Trigger.tsx:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
     "public/app/core/components/OptionsUI/registry.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Do not use any type assertions.", "6"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Do not use any type assertions.", "8"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Do not use any type assertions.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Do not use any type assertions.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Do not use any type assertions.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Do not use any type assertions.", "16"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "17"],
-      [0, 0, 0, "Do not use any type assertions.", "18"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "19"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "20"],
-      [0, 0, 0, "Do not use any type assertions.", "21"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "22"],
-      [0, 0, 0, "Do not use any type assertions.", "23"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "24"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "25"],
-      [0, 0, 0, "Do not use any type assertions.", "26"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "27"],
-      [0, 0, 0, "Do not use any type assertions.", "28"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "29"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "30"],
-      [0, 0, 0, "Do not use any type assertions.", "31"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "32"],
-      [0, 0, 0, "Do not use any type assertions.", "33"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "34"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "35"],
-      [0, 0, 0, "Do not use any type assertions.", "36"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "37"],
-      [0, 0, 0, "Do not use any type assertions.", "38"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "39"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "40"],
-      [0, 0, 0, "Do not use any type assertions.", "41"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "42"],
-      [0, 0, 0, "Do not use any type assertions.", "43"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "44"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "45"],
-      [0, 0, 0, "Do not use any type assertions.", "46"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "47"],
-      [0, 0, 0, "Do not use any type assertions.", "48"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "49"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "50"],
-      [0, 0, 0, "Do not use any type assertions.", "51"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "52"],
-      [0, 0, 0, "Do not use any type assertions.", "53"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "54"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "55"],
-      [0, 0, 0, "Do not use any type assertions.", "56"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "57"],
-      [0, 0, 0, "Do not use any type assertions.", "58"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "59"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "60"],
-      [0, 0, 0, "Do not use any type assertions.", "61"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "62"],
-      [0, 0, 0, "Do not use any type assertions.", "63"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "64"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "65"],
-      [0, 0, 0, "Do not use any type assertions.", "66"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "67"],
-      [0, 0, 0, "Do not use any type assertions.", "68"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "69"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "70"],
-      [0, 0, 0, "Do not use any type assertions.", "71"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "72"],
-      [0, 0, 0, "Do not use any type assertions.", "73"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "74"],
-      [0, 0, 0, "Do not use any type assertions.", "75"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "76"],
-      [0, 0, 0, "Do not use any type assertions.", "77"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "78"]
-    ],
-    "public/app/core/components/OptionsUI/slider.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/core/components/OptionsUI/strings.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
-    "public/app/core/components/OptionsUI/units.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "10"]
     ],
     "public/app/core/components/PageHeader/PageHeader.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
-    "public/app/core/components/PageHeader/PanelHeaderMenuItem.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
-    ],
     "public/app/core/components/PanelTypeFilter/PanelTypeFilter.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
-    "public/app/core/components/PasswordField/PasswordField.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
-    ],
-    "public/app/core/components/PermissionList/AddPermission.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
     "public/app/core/components/QueryOperationRow/OperationRowHelp.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
-    "public/app/core/components/QueryOperationRow/QueryOperationAction.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
-    ],
     "public/app/core/components/QueryOperationRow/QueryOperationRow.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"]
@@ -1383,27 +1219,11 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "3"],
       [0, 0, 0, "Styles should be written using objects.", "4"],
       [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"]
-    ],
-    "public/app/core/components/RolePicker/RolePickerMenu.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
+      [0, 0, 0, "Styles should be written using objects.", "6"]
     ],
     "public/app/core/components/RolePicker/ValueContainer.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
-    "public/app/core/components/Select/OldFolderPicker.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
-    "public/app/core/components/SharedPreferences/SharedPreferences.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/core/components/SplitPaneWrapper/SplitPaneWrapper.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
-    ],
     "public/app/core/components/TagFilter/TagFilter.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
@@ -1418,15 +1238,10 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "1"],
       [0, 0, 0, "Styles should be written using objects.", "2"]
     ],
-    "public/app/core/components/TraceToLogs/TagMappingInput.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
-    ],
-    "public/app/core/components/TraceToMetrics/TraceToMetricsSettings.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
+    "public/app/core/components/TimeSeries/utils.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
     "public/app/core/components/Upgrade/ProBadge.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
@@ -1455,19 +1270,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
-    "public/app/core/components/help/HelpModal.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"]
-    ],
-    "public/app/core/navigation/GrafanaRouteError.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
     "public/app/core/navigation/types.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
@@ -1506,9 +1308,6 @@ exports[`better eslint`] = {
     "public/app/core/specs/backend_srv.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/core/specs/time_series.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/core/time_series2.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
@@ -1549,24 +1348,13 @@ exports[`better eslint`] = {
     "public/app/core/utils/deferred.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/core/utils/explore.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
-    ],
     "public/app/core/utils/fetch.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
+      [0, 0, 0, "Do not use any type assertions.", "3"],
       [0, 0, 0, "Do not use any type assertions.", "4"],
-      [0, 0, 0, "Do not use any type assertions.", "5"],
-      [0, 0, 0, "Do not use any type assertions.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Do not use any type assertions.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "5"]
     ],
     "public/app/core/utils/flatten.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -1582,15 +1370,8 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/core/utils/ticks.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"],
-      [0, 0, 0, "Do not use any type assertions.", "5"]
-    ],
-    "public/app/core/utils/tracing.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "public/app/features/admin/LicenseChrome.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
@@ -1600,154 +1381,66 @@ exports[`better eslint`] = {
     "public/app/features/admin/OrgRolePicker.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/features/admin/ServerStats.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Styles should be written using objects.", "8"]
-    ],
-    "public/app/features/admin/UpgradePage.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"]
-    ],
-    "public/app/features/admin/UserListPublicDashboardPage/DashboardsListModalButton.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"]
-    ],
-    "public/app/features/admin/UserListPublicDashboardPage/DeleteUserModalButton.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
-    "public/app/features/admin/UserOrgs.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Styles should be written using objects.", "8"],
-      [0, 0, 0, "Styles should be written using objects.", "9"],
-      [0, 0, 0, "Styles should be written using objects.", "10"],
-      [0, 0, 0, "Styles should be written using objects.", "11"],
-      [0, 0, 0, "Styles should be written using objects.", "12"],
-      [0, 0, 0, "Styles should be written using objects.", "13"],
-      [0, 0, 0, "Styles should be written using objects.", "14"],
-      [0, 0, 0, "Styles should be written using objects.", "15"],
-      [0, 0, 0, "Styles should be written using objects.", "16"],
-      [0, 0, 0, "Styles should be written using objects.", "17"]
-    ],
-    "public/app/features/admin/UserPermissions.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/features/admin/UserProfile.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"]
-    ],
-    "public/app/features/admin/UserSessions.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/features/alerting/AlertTab.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "2"]
-    ],
-    "public/app/features/alerting/AlertTabCtrl.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "17"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "18"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "19"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "20"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "21"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "22"],
-      [0, 0, 0, "Do not use any type assertions.", "23"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "24"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "25"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "26"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "27"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "28"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "29"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "30"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "31"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "32"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "33"]
-    ],
-    "public/app/features/alerting/EditNotificationChannelPage.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    "public/app/features/admin/UpgradePage.tsx:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"],
+      [0, 0, 0, "Styles should be written using objects.", "1"],
+      [0, 0, 0, "Styles should be written using objects.", "2"],
+      [0, 0, 0, "Styles should be written using objects.", "3"],
+      [0, 0, 0, "Styles should be written using objects.", "4"]
     ],
-    "public/app/features/alerting/StateHistory.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
+    "public/app/features/admin/UserListPublicDashboardPage/DashboardsListModalButton.tsx:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"],
+      [0, 0, 0, "Styles should be written using objects.", "1"],
+      [0, 0, 0, "Styles should be written using objects.", "2"],
+      [0, 0, 0, "Styles should be written using objects.", "3"],
+      [0, 0, 0, "Styles should be written using objects.", "4"],
+      [0, 0, 0, "Styles should be written using objects.", "5"],
+      [0, 0, 0, "Styles should be written using objects.", "6"],
+      [0, 0, 0, "Styles should be written using objects.", "7"]
     ],
-    "public/app/features/alerting/TestRuleResult.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+    "public/app/features/admin/UserListPublicDashboardPage/DeleteUserModalButton.tsx:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"],
+      [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
-    "public/app/features/alerting/components/NotificationChannelForm.tsx:5381": [
+    "public/app/features/admin/UserOrgs.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
+      [0, 0, 0, "Styles should be written using objects.", "2"],
+      [0, 0, 0, "Styles should be written using objects.", "3"],
+      [0, 0, 0, "Styles should be written using objects.", "4"],
+      [0, 0, 0, "Styles should be written using objects.", "5"],
+      [0, 0, 0, "Styles should be written using objects.", "6"],
+      [0, 0, 0, "Styles should be written using objects.", "7"],
+      [0, 0, 0, "Styles should be written using objects.", "8"],
+      [0, 0, 0, "Styles should be written using objects.", "9"],
+      [0, 0, 0, "Styles should be written using objects.", "10"],
+      [0, 0, 0, "Styles should be written using objects.", "11"],
+      [0, 0, 0, "Styles should be written using objects.", "12"],
+      [0, 0, 0, "Styles should be written using objects.", "13"],
+      [0, 0, 0, "Styles should be written using objects.", "14"],
+      [0, 0, 0, "Styles should be written using objects.", "15"],
+      [0, 0, 0, "Styles should be written using objects.", "16"]
     ],
-    "public/app/features/alerting/components/NotificationChannelOptions.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
+    "public/app/features/admin/UserPermissions.tsx:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
-    "public/app/features/alerting/components/OptionElement.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    "public/app/features/admin/UserProfile.tsx:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"],
+      [0, 0, 0, "Styles should be written using objects.", "1"],
+      [0, 0, 0, "Styles should be written using objects.", "2"]
     ],
-    "public/app/features/alerting/getAlertingValidationMessage.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
+    "public/app/features/alerting/routes.tsx:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/features/alerting/state/ThresholdMapper.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/features/alerting/state/actions.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
-    ],
     "public/app/features/alerting/state/alertDef.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
     ],
     "public/app/features/alerting/state/query_part.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -1772,9 +1465,6 @@ exports[`better eslint`] = {
     "public/app/features/alerting/unified/AlertWarning.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
-    "public/app/features/alerting/unified/AlertsFolderView.test.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/features/alerting/unified/AlertsFolderView.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -1797,20 +1487,15 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "11"],
       [0, 0, 0, "Styles should be written using objects.", "12"],
       [0, 0, 0, "Styles should be written using objects.", "13"],
-      [0, 0, 0, "Styles should be written using objects.", "14"],
-      [0, 0, 0, "Styles should be written using objects.", "15"],
-      [0, 0, 0, "Styles should be written using objects.", "16"],
-      [0, 0, 0, "Styles should be written using objects.", "17"],
-      [0, 0, 0, "Styles should be written using objects.", "18"]
+      [0, 0, 0, "Styles should be written using objects.", "14"]
     ],
     "public/app/features/alerting/unified/NotificationPolicies.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
     "public/app/features/alerting/unified/PanelAlertTabContent.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
+      [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"]
+      [0, 0, 0, "Styles should be written using objects.", "2"]
     ],
     "public/app/features/alerting/unified/RedirectToRuleViewer.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
@@ -1826,14 +1511,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "4"],
       [0, 0, 0, "Styles should be written using objects.", "5"]
     ],
-    "public/app/features/alerting/unified/api/alertmanager.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
-    ],
-    "public/app/features/alerting/unified/api/ruler.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"]
-    ],
     "public/app/features/alerting/unified/components/AlertLabel.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
@@ -1844,16 +1521,12 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
     "public/app/features/alerting/unified/components/AlertStateDot.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"]
+      [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
     "public/app/features/alerting/unified/components/AnnotationDetailsField.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"]
+      [0, 0, 0, "Styles should be written using objects.", "2"]
     ],
     "public/app/features/alerting/unified/components/Authorize.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
@@ -1895,13 +1568,6 @@ exports[`better eslint`] = {
     "public/app/features/alerting/unified/components/GrafanaAlertmanagerDeliveryWarning.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
-    "public/app/features/alerting/unified/components/HoverCard.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"]
-    ],
     "public/app/features/alerting/unified/components/Label.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -1971,24 +1637,19 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
       [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"]
+      [0, 0, 0, "Styles should be written using objects.", "3"]
     ],
     "public/app/features/alerting/unified/components/alert-groups/AlertGroupHeader.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
-    "public/app/features/alerting/unified/components/alert-groups/AlertStateFilter.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
     "public/app/features/alerting/unified/components/alert-groups/GroupBy.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "public/app/features/alerting/unified/components/alert-groups/MatcherFilter.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
+      [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/features/alerting/unified/components/contact-points/ContactPoints.v2.tsx:5381": [
+    "public/app/features/alerting/unified/components/contact-points/ContactPoints.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "public/app/features/alerting/unified/components/export/FileExportPreview.tsx:5381": [
@@ -2053,23 +1714,12 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "2"],
       [0, 0, 0, "Styles should be written using objects.", "3"]
     ],
-    "public/app/features/alerting/unified/components/notification-policies/Filters.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
     "public/app/features/alerting/unified/components/notification-policies/Matchers.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
     "public/app/features/alerting/unified/components/notification-policies/Policy.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Styles should be written using objects.", "8"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/features/alerting/unified/components/notification-policies/PromDurationDocs.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
@@ -2171,9 +1821,8 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"]
+      [0, 0, 0, "Styles should be written using objects.", "3"],
+      [0, 0, 0, "Styles should be written using objects.", "4"]
     ],
     "public/app/features/alerting/unified/components/receivers/form/TestContactPointModal.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
@@ -2188,12 +1837,10 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"]
+      [0, 0, 0, "Styles should be written using objects.", "4"],
+      [0, 0, 0, "Styles should be written using objects.", "5"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "7"]
     ],
     "public/app/features/alerting/unified/components/receivers/form/fields/StringArrayInput.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
@@ -2298,16 +1945,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
-    "public/app/features/alerting/unified/components/rule-editor/LabelsField.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"]
-    ],
     "public/app/features/alerting/unified/components/rule-editor/NeedHelpInfo.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"]
@@ -2403,11 +2040,10 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
     "public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/QueryAndExpressionsStep.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
+      [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
       [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"]
+      [0, 0, 0, "Styles should be written using objects.", "3"]
     ],
     "public/app/features/alerting/unified/components/rule-editor/rule-types/RuleType.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
@@ -2416,41 +2052,16 @@ exports[`better eslint`] = {
     "public/app/features/alerting/unified/components/rule-editor/rule-types/RuleTypePicker.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
-    "public/app/features/alerting/unified/components/rule-viewer/RuleViewer.v1.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Styles should be written using objects.", "8"],
-      [0, 0, 0, "Styles should be written using objects.", "9"],
-      [0, 0, 0, "Styles should be written using objects.", "10"],
-      [0, 0, 0, "Styles should be written using objects.", "11"],
-      [0, 0, 0, "Styles should be written using objects.", "12"]
-    ],
     "public/app/features/alerting/unified/components/rule-viewer/RuleViewerLayout.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
-    "public/app/features/alerting/unified/components/rule-viewer/RuleViewerVisualization.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"]
-    ],
     "public/app/features/alerting/unified/components/rules/ActionButton.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
     "public/app/features/alerting/unified/components/rules/AlertInstanceStateFilter.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
-    "public/app/features/alerting/unified/components/rules/CloneRule.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
     "public/app/features/alerting/unified/components/rules/CloudRules.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -2511,8 +2122,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "1"],
       [0, 0, 0, "Styles should be written using objects.", "2"],
       [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"]
+      [0, 0, 0, "Styles should be written using objects.", "4"]
     ],
     "public/app/features/alerting/unified/components/rules/RuleHealth.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
@@ -2530,13 +2140,6 @@ exports[`better eslint`] = {
     "public/app/features/alerting/unified/components/rules/RuleState.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
-    "public/app/features/alerting/unified/components/rules/RulesFilter.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"]
-    ],
     "public/app/features/alerting/unified/components/rules/RulesGroup.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -2629,23 +2232,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "3"],
       [0, 0, 0, "Styles should be written using objects.", "4"]
     ],
-    "public/app/features/alerting/unified/home/GettingStarted.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Styles should be written using objects.", "8"],
-      [0, 0, 0, "Styles should be written using objects.", "9"],
-      [0, 0, 0, "Styles should be written using objects.", "10"],
-      [0, 0, 0, "Styles should be written using objects.", "11"],
-      [0, 0, 0, "Styles should be written using objects.", "12"],
-      [0, 0, 0, "Styles should be written using objects.", "13"],
-      [0, 0, 0, "Styles should be written using objects.", "14"]
-    ],
     "public/app/features/alerting/unified/hooks/useAlertmanagerConfig.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
@@ -2663,11 +2249,9 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "3"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Do not use any type assertions.", "6"],
-      [0, 0, 0, "Do not use any type assertions.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Do not use any type assertions.", "10"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
+      [0, 0, 0, "Do not use any type assertions.", "8"]
     ],
     "public/app/features/alerting/unified/state/actions.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
@@ -2697,6 +2281,9 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
+    "public/app/features/alerting/unified/utils/misc.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
     "public/app/features/alerting/unified/utils/receiver-form.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
@@ -2721,11 +2308,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"]
-    ],
-    "public/app/features/annotations/components/StandardAnnotationQueryEditor.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
+      [0, 0, 0, "Do not use any type assertions.", "3"]
     ],
     "public/app/features/annotations/events_processing.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -2737,89 +2320,30 @@ exports[`better eslint`] = {
     ],
     "public/app/features/api-keys/ApiKeysTable.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
-    "public/app/features/api-keys/MigrateToServiceAccountsCard.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
-    ],
-    "public/app/features/auth-config/AuthConfigPage.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"]
-    ],
-    "public/app/features/auth-config/components/ConfigureAuthCTA.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
-    "public/app/features/auth-config/components/ProviderCard.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"]
-    ],
-    "public/app/features/canvas/element.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
-    ],
-    "public/app/features/canvas/elements/droneFront.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/features/canvas/elements/droneSide.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/features/canvas/elements/droneTop.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
-    ],
-    "public/app/features/canvas/elements/ellipse.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
-    "public/app/features/canvas/elements/icon.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/features/canvas/elements/metricValue.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
-    ],
-    "public/app/features/canvas/elements/server/server.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"]
+      [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
-    "public/app/features/canvas/elements/text.tsx:5381": [
+    "public/app/features/api-keys/MigrateToServiceAccountsCard.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
       [0, 0, 0, "Styles should be written using objects.", "2"]
     ],
-    "public/app/features/canvas/elements/windTurbine.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
+    "public/app/features/auth-config/utils/data.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
+    "public/app/features/canvas/element.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
     ],
     "public/app/features/canvas/runtime/element.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
+      [0, 0, 0, "Do not use any type assertions.", "2"],
       [0, 0, 0, "Do not use any type assertions.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Do not use any type assertions.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Do not use any type assertions.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"]
+      [0, 0, 0, "Do not use any type assertions.", "4"],
+      [0, 0, 0, "Do not use any type assertions.", "5"]
     ],
     "public/app/features/canvas/runtime/frame.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
@@ -2841,11 +2365,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
-    "public/app/features/connections/tabs/ConnectData/ConnectData.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
-    ],
     "public/app/features/connections/tabs/ConnectData/NoAccessModal/NoAccessModal.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -2857,12 +2376,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "7"],
       [0, 0, 0, "Styles should be written using objects.", "8"]
     ],
-    "public/app/features/connections/tabs/ConnectData/NoResults/NoResults.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/features/connections/tabs/ConnectData/Search/Search.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
     "public/app/features/correlations/CorrelationsPage.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -2881,23 +2394,42 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
-    "public/app/features/correlations/Forms/TransformationsEditor.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
+    "public/app/features/dashboard-scene/inspect/HelpWizard/utils.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "public/app/features/dashboard-scene/inspect/InspectJsonTab.tsx:5381": [
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
     ],
-    "public/app/features/dashboard-scene/scene/setDashboardPanelContext.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    "public/app/features/dashboard-scene/pages/DashboardScenePage.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Do not use any type assertions.", "2"]
     ],
-    "public/app/features/dashboard-scene/serialization/angularMigration.test.ts:5381": [
+    "public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataPane.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
+    "public/app/features/dashboard-scene/saving/DetectChangesWorker.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
+    "public/app/features/dashboard-scene/saving/getDashboardChanges.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"],
+      [0, 0, 0, "Do not use any type assertions.", "2"]
+    ],
+    "public/app/features/dashboard-scene/scene/PanelMenuBehavior.tsx:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Do not use any type assertions.", "2"]
+    ],
+    "public/app/features/dashboard-scene/serialization/angularMigration.test.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    ],
     "public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
     ],
     "public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -2907,37 +2439,41 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "12"]
     ],
     "public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
       [0, 0, 0, "Do not use any type assertions.", "4"],
-      [0, 0, 0, "Do not use any type assertions.", "5"]
+      [0, 0, 0, "Do not use any type assertions.", "5"],
+      [0, 0, 0, "Do not use any type assertions.", "6"],
+      [0, 0, 0, "Do not use any type assertions.", "7"],
+      [0, 0, 0, "Do not use any type assertions.", "8"]
+    ],
+    "public/app/features/dashboard-scene/settings/variables/components/VariableSelectField.tsx:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    ],
+    "public/app/features/dashboard-scene/settings/variables/utils.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    ],
+    "public/app/features/dashboard-scene/utils/DashboardModelCompatibilityWrapper.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
+    "public/app/features/dashboard-scene/utils/PanelModelCompatibilityWrapper.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "public/app/features/dashboard-scene/utils/test-utils.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"]
     ],
-    "public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.test.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
-    "public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "1"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "2"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "3"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Styles should be written using objects.", "8"],
-      [0, 0, 0, "Styles should be written using objects.", "9"],
-      [0, 0, 0, "Styles should be written using objects.", "10"]
-    ],
     "public/app/features/dashboard/components/AddWidgetModal/AddWidgetModal.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -2959,22 +2495,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "17"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "18"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "19"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "20"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "5"]
     ],
     "public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -2982,12 +2503,11 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Do not use any type assertions.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
+      [0, 0, 0, "Do not use any type assertions.", "5"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
+      [0, 0, 0, "Do not use any type assertions.", "7"],
       [0, 0, 0, "Do not use any type assertions.", "8"],
-      [0, 0, 0, "Do not use any type assertions.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "9"]
     ],
     "public/app/features/dashboard/components/DashNav/DashNavButton.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
@@ -3008,9 +2528,10 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "2"],
       [0, 0, 0, "Do not use any type assertions.", "3"],
       [0, 0, 0, "Do not use any type assertions.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Do not use any type assertions.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"]
+      [0, 0, 0, "Do not use any type assertions.", "5"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
+      [0, 0, 0, "Do not use any type assertions.", "7"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "8"]
     ],
     "public/app/features/dashboard/components/DashboardRow/DashboardRow.test.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -3029,10 +2550,6 @@ exports[`better eslint`] = {
     "public/app/features/dashboard/components/Inspector/PanelInspector.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/features/dashboard/components/LinksSettings/LinkSettingsList.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
     "public/app/features/dashboard/components/PanelEditor/DynamicConfigValueEditor.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"]
@@ -3046,16 +2563,7 @@ exports[`better eslint`] = {
     ],
     "public/app/features/dashboard/components/PanelEditor/OptionsPaneCategory.tsx:5381": [
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Styles should be written using objects.", "8"],
-      [0, 0, 0, "Styles should be written using objects.", "9"],
-      [0, 0, 0, "Styles should be written using objects.", "10"]
+      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "1"]
     ],
     "public/app/features/dashboard/components/PanelEditor/OptionsPaneItemDescriptor.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -3128,9 +2636,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
-    "public/app/features/dashboard/components/PanelEditor/types.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/features/dashboard/components/PanelEditor/utils.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
@@ -3152,9 +2657,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "1"]
     ],
-    "public/app/features/dashboard/components/SaveDashboard/SaveDashboardDiff.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
     "public/app/features/dashboard/components/SaveDashboard/SaveDashboardErrorProxy.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -3215,14 +2717,14 @@ exports[`better eslint`] = {
     "public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/UnsupportedDataSourcesAlert.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
-    "public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
     "public/app/features/dashboard/components/SubMenu/AnnotationPicker.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
+    "public/app/features/dashboard/components/SubMenu/DashboardLinksDashboard.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
+    ],
     "public/app/features/dashboard/components/SubMenu/SubMenu.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"]
@@ -3240,75 +2742,27 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "9"],
       [0, 0, 0, "Styles should be written using objects.", "10"]
     ],
-    "public/app/features/dashboard/components/TransformationsEditor/TransformationFilter.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
     "public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"]
-    ],
-    "public/app/features/dashboard/components/VersionHistory/DiffGroup.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
-    ],
-    "public/app/features/dashboard/components/VersionHistory/DiffTitle.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Styles should be written using objects.", "8"]
-    ],
-    "public/app/features/dashboard/components/VersionHistory/DiffValues.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/features/dashboard/components/VersionHistory/DiffViewer.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/features/dashboard/components/VersionHistory/VersionHistoryComparison.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
-    ],
-    "public/app/features/dashboard/components/VersionHistory/VersionHistoryHeader.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/features/dashboard/components/VersionHistory/VersionHistoryTable.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
+      [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "public/app/features/dashboard/components/VersionHistory/useDashboardRestore.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
-    "public/app/features/dashboard/components/VersionHistory/utils.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
-    ],
     "public/app/features/dashboard/containers/DashboardPage.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "4"]
-    ],
-    "public/app/features/dashboard/dashgrid/DashboardGrid.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+      [0, 0, 0, "Do not use any type assertions.", "4"],
+      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "5"]
     ],
-    "public/app/features/dashboard/dashgrid/DashboardPanel.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    "public/app/features/dashboard/containers/DashboardPageProxy.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/features/dashboard/dashgrid/SeriesVisibilityConfigFactory.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
@@ -3330,14 +2784,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "17"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "18"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "11"]
     ],
     "public/app/features/dashboard/state/DashboardMigrator.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -3360,28 +2807,23 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "17"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "18"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "19"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "20"],
+      [0, 0, 0, "Do not use any type assertions.", "20"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "21"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "22"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "23"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "24"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "25"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "26"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "27"],
-      [0, 0, 0, "Do not use any type assertions.", "28"],
-      [0, 0, 0, "Do not use any type assertions.", "29"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "30"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "31"],
-      [0, 0, 0, "Do not use any type assertions.", "32"]
+      [0, 0, 0, "Do not use any type assertions.", "26"],
+      [0, 0, 0, "Do not use any type assertions.", "27"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "28"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "29"],
+      [0, 0, 0, "Do not use any type assertions.", "30"]
     ],
     "public/app/features/dashboard/state/DashboardModel.repeat.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
     ],
     "public/app/features/dashboard/state/DashboardModel.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -3409,22 +2851,11 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "19"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "20"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "21"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "22"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "23"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "24"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "25"],
-      [0, 0, 0, "Do not use any type assertions.", "26"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "27"]
+      [0, 0, 0, "Do not use any type assertions.", "22"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "23"]
     ],
     "public/app/features/dashboard/state/PanelModel.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/features/dashboard/state/PanelModel.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -3460,19 +2891,10 @@ exports[`better eslint`] = {
     "public/app/features/dashboard/state/actions.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/features/dashboard/state/initDashboard.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"]
-    ],
-    "public/app/features/dashboard/state/initDashboard.ts:5381": [
+    "public/app/features/dashboard/state/getPanelPluginToMigrateTo.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/features/dashboard/state/reducers.ts:5381": [
+    "public/app/features/dashboard/state/initDashboard.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/features/dashboard/utils/getPanelMenu.test.ts:5381": [
@@ -3489,26 +2911,18 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
     ],
     "public/app/features/datasources/components/BasicSettings.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
-    "public/app/features/datasources/components/DataSourceReadOnlyMessage.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
+      [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
     "public/app/features/datasources/components/DataSourceTestingStatus.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "3"]
+      [0, 0, 0, "Do not use any type assertions.", "2"]
     ],
     "public/app/features/datasources/components/DataSourceTypeCard.tsx:5381": [
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
     ],
     "public/app/features/datasources/components/DataSourceTypeCardList.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/features/datasources/components/EditDataSource.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
+      [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
     "public/app/features/datasources/components/picker/DataSourceCard.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
@@ -3521,16 +2935,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "7"],
       [0, 0, 0, "Styles should be written using objects.", "8"]
     ],
-    "public/app/features/datasources/components/picker/DataSourceDropdown.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"]
-    ],
     "public/app/features/datasources/components/picker/DataSourceList.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -3554,11 +2958,7 @@ exports[`better eslint`] = {
     ],
     "public/app/features/datasources/state/actions.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/features/datasources/state/actions.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -3652,32 +3052,11 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/features/dimensions/utils.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
+      [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "public/app/features/explore/ContentOutline/ContentOutline.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/features/explore/ExploreDrawer.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
-    ],
-    "public/app/features/explore/ExplorePaneContainer.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/features/explore/FeatureTogglePage.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/features/explore/FlameGraph/FlameGraphExploreContainer.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/features/explore/LiveTailButton.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"]
-    ],
     "public/app/features/explore/Logs/LiveLogs.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -3686,19 +3065,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "4"]
     ],
     "public/app/features/explore/Logs/Logs.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Styles should be written using objects.", "8"],
-      [0, 0, 0, "Styles should be written using objects.", "9"],
-      [0, 0, 0, "Styles should be written using objects.", "10"],
-      [0, 0, 0, "Styles should be written using objects.", "11"],
-      [0, 0, 0, "Styles should be written using objects.", "12"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/features/explore/Logs/LogsMetaRow.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
@@ -3720,8 +3087,7 @@ exports[`better eslint`] = {
     "public/app/features/explore/Logs/LogsSamplePanel.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"]
+      [0, 0, 0, "Styles should be written using objects.", "2"]
     ],
     "public/app/features/explore/Logs/LogsVolumePanel.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
@@ -3740,19 +3106,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "2"],
       [0, 0, 0, "Styles should be written using objects.", "3"]
     ],
-    "public/app/features/explore/MetaInfoText.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"]
-    ],
-    "public/app/features/explore/NoData.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
-    "public/app/features/explore/NoDataSourceCallToAction.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
     "public/app/features/explore/NodeGraph/NodeGraphContainer.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
@@ -3785,9 +3138,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "1"],
       [0, 0, 0, "Styles should be written using objects.", "2"]
     ],
-    "public/app/features/explore/QueryRows.test.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/features/explore/RichHistory/RichHistoryCard.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -3836,13 +3186,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "5"],
       [0, 0, 0, "Styles should be written using objects.", "6"]
     ],
-    "public/app/features/explore/SecondaryActions.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/features/explore/SupplementaryResultError.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
     "public/app/features/explore/TraceView/TraceView.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
@@ -3851,10 +3194,6 @@ exports[`better eslint`] = {
     "public/app/features/explore/TraceView/components/TracePageHeader/Actions/ActionButton.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
-    "public/app/features/explore/TraceView/components/TracePageHeader/Actions/TracePageActions.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
     "public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/NextPrevResult.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -3868,8 +3207,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "1"],
       [0, 0, 0, "Styles should be written using objects.", "2"],
       [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"]
+      [0, 0, 0, "Styles should be written using objects.", "4"]
     ],
     "public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
@@ -3877,8 +3215,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "2"],
       [0, 0, 0, "Styles should be written using objects.", "3"],
       [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"]
+      [0, 0, 0, "Styles should be written using objects.", "5"]
     ],
     "public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/CanvasSpanGraph.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
@@ -3916,18 +3253,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "5"],
       [0, 0, 0, "Styles should be written using objects.", "6"],
       [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Styles should be written using objects.", "8"],
-      [0, 0, 0, "Styles should be written using objects.", "9"],
-      [0, 0, 0, "Styles should be written using objects.", "10"],
-      [0, 0, 0, "Styles should be written using objects.", "11"],
-      [0, 0, 0, "Styles should be written using objects.", "12"]
-    ],
-    "public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBar.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"]
+      [0, 0, 0, "Styles should be written using objects.", "8"]
     ],
     "public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBarRow.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
@@ -3996,6 +3322,9 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "4"],
       [0, 0, 0, "Styles should be written using objects.", "5"]
     ],
+    "public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/SpanFlameGraph.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
     "public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/TextList.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -4066,9 +3395,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "6"],
       [0, 0, 0, "Styles should be written using objects.", "7"]
     ],
-    "public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineRow.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
     "public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -4083,11 +3409,6 @@ exports[`better eslint`] = {
     "public/app/features/explore/TraceView/components/common/CopyIcon.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
-    "public/app/features/explore/TraceView/components/common/Divider.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
-    ],
     "public/app/features/explore/TraceView/components/common/LabeledList.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -4103,10 +3424,6 @@ exports[`better eslint`] = {
     "public/app/features/explore/TraceView/components/demo/trace-generators.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/features/explore/TraceView/components/model/link-patterns.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
-    ],
     "public/app/features/explore/TraceView/components/model/link-patterns.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
@@ -4119,8 +3436,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
       [0, 0, 0, "Do not use any type assertions.", "9"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Do not use any type assertions.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"]
+      [0, 0, 0, "Do not use any type assertions.", "11"]
     ],
     "public/app/features/explore/TraceView/components/model/transform-trace-data.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
@@ -4132,25 +3448,6 @@ exports[`better eslint`] = {
     "public/app/features/explore/TraceView/components/types/trace.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/features/explore/TraceView/components/uberUtilityStyles.ts:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Styles should be written using objects.", "8"],
-      [0, 0, 0, "Styles should be written using objects.", "9"],
-      [0, 0, 0, "Styles should be written using objects.", "10"],
-      [0, 0, 0, "Styles should be written using objects.", "11"],
-      [0, 0, 0, "Styles should be written using objects.", "12"],
-      [0, 0, 0, "Styles should be written using objects.", "13"],
-      [0, 0, 0, "Styles should be written using objects.", "14"],
-      [0, 0, 0, "Styles should be written using objects.", "15"],
-      [0, 0, 0, "Styles should be written using objects.", "16"]
-    ],
     "public/app/features/explore/TraceView/createSpanLink.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"]
@@ -4159,12 +3456,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
-    "public/app/features/explore/spec/interpolation.test.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
-    "public/app/features/explore/spec/queryHistory.test.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/features/explore/state/time.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
@@ -4177,9 +3468,8 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "5"]
     ],
     "public/app/features/expressions/ExpressionDatasource.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"]
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "public/app/features/expressions/components/Condition.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
@@ -4195,16 +3485,9 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "5"],
       [0, 0, 0, "Styles should be written using objects.", "6"]
     ],
-    "public/app/features/expressions/components/Threshold.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
     "public/app/features/expressions/guards.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/features/folders/state/actions.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/features/geo/editor/GazetteerPathEditor.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
@@ -4212,19 +3495,10 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
-    "public/app/features/geo/format/geohash.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
-    "public/app/features/geo/format/geojson.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/features/geo/gazetteer/gazetteer.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
-    "public/app/features/geo/gazetteer/worldmap.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/features/geo/utils/frameVectorSource.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"]
@@ -4238,9 +3512,6 @@ exports[`better eslint`] = {
     "public/app/features/inspector/InspectDataTab.tsx:5381": [
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
     ],
-    "public/app/features/inspector/InspectErrorTab.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/features/inspector/InspectJSONTab.tsx:5381": [
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
     ],
@@ -4258,11 +3529,9 @@ exports[`better eslint`] = {
     ],
     "public/app/features/inspector/QueryInspector.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "4"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "5"]
+      [0, 0, 0, "Styles should be written using objects.", "1"],
+      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "2"],
+      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "3"]
     ],
     "public/app/features/inspector/styles.ts:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
@@ -4277,36 +3546,11 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "9"],
       [0, 0, 0, "Styles should be written using objects.", "10"]
     ],
-    "public/app/features/invites/state/selectors.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
-    "public/app/features/library-panels/components/LibraryPanelCard/LibraryPanelCard.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
     "public/app/features/library-panels/components/LibraryPanelInfo/LibraryPanelInfo.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
       [0, 0, 0, "Styles should be written using objects.", "2"]
     ],
-    "public/app/features/library-panels/components/LibraryPanelsSearch/LibraryPanelsSearch.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Styles should be written using objects.", "8"]
-    ],
-    "public/app/features/library-panels/components/LibraryPanelsView/LibraryPanelsView.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"]
-    ],
     "public/app/features/library-panels/components/LibraryPanelsView/actions.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
@@ -4331,11 +3575,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
-    "public/app/features/live/centrifuge/LiveDataStream.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
-    ],
     "public/app/features/live/centrifuge/LiveDataStream.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
@@ -4345,9 +3584,6 @@ exports[`better eslint`] = {
     "public/app/features/live/centrifuge/serviceWorkerProxy.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/features/live/centrifuge/transferHandlers.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/features/live/data/amendTimeSeries.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
@@ -4355,8 +3591,8 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "3"],
       [0, 0, 0, "Do not use any type assertions.", "4"]
     ],
-    "public/app/features/live/index.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
+    "public/app/features/logs/components/LoadingIndicator.tsx:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
     "public/app/features/logs/components/LogDetailsRow.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
@@ -4430,9 +3666,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "34"],
       [0, 0, 0, "Styles should be written using objects.", "35"]
     ],
-    "public/app/features/logs/components/log-context/LoadingIndicator.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
     "public/app/features/logs/components/log-context/LogRowContextModal.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -4473,9 +3706,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "4"],
       [0, 0, 0, "Styles should be written using objects.", "5"]
     ],
-    "public/app/features/manage-dashboards/state/actions.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/features/manage-dashboards/state/actions.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
@@ -4483,7 +3713,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
       [0, 0, 0, "Do not use any type assertions.", "4"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Do not use any type assertions.", "6"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
@@ -4491,12 +3721,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "17"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "18"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "19"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "14"]
     ],
     "public/app/features/manage-dashboards/state/reducers.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -4506,27 +3731,13 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
     ],
     "public/app/features/org/state/actions.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/features/org/state/reducers.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "public/app/features/panel/components/VizTypePicker/PanelTypeCard.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Styles should be written using objects.", "8"],
-      [0, 0, 0, "Styles should be written using objects.", "9"],
-      [0, 0, 0, "Styles should be written using objects.", "10"]
+      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
     ],
     "public/app/features/panel/components/VizTypePicker/VisualizationSuggestionCard.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
@@ -4535,12 +3746,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "3"],
       [0, 0, 0, "Styles should be written using objects.", "4"]
     ],
-    "public/app/features/panel/components/VizTypePicker/VizTypePicker.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/features/panel/components/VizTypePicker/types.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/features/panel/panellinks/linkSuppliers.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
@@ -4548,18 +3753,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
-    ],
-    "public/app/features/panel/state/actions.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
-    "public/app/features/panel/state/reducers.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
-    ],
-    "public/app/features/playlist/EmptyQueryListBanner.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
     ],
     "public/app/features/playlist/PlaylistForm.tsx:5381": [
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
@@ -4590,12 +3784,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
     "public/app/features/plugins/admin/components/PluginDetailsBody.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
-    ],
-    "public/app/features/plugins/admin/components/PluginDetailsDisabledError.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
+      [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "public/app/features/plugins/admin/components/PluginDetailsHeaderDependencies.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
@@ -4611,17 +3800,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "2"],
       [0, 0, 0, "Styles should be written using objects.", "3"]
     ],
-    "public/app/features/plugins/admin/components/PluginDetailsSignature.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
-    ],
-    "public/app/features/plugins/admin/components/PluginListItem.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"]
-    ],
     "public/app/features/plugins/admin/components/PluginSignatureDetailsBadge.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -4635,9 +3813,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
-    "public/app/features/plugins/admin/components/SearchField.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/features/plugins/admin/components/VersionList.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -4651,11 +3826,7 @@ exports[`better eslint`] = {
     ],
     "public/app/features/plugins/admin/pages/Browse.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"]
+      [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "public/app/features/plugins/admin/state/actions.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
@@ -4663,9 +3834,6 @@ exports[`better eslint`] = {
     "public/app/features/plugins/admin/types.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/features/plugins/components/PluginsErrorsInfo.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
-    ],
     "public/app/features/plugins/datasource_srv.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
@@ -4677,57 +3845,22 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
       [0, 0, 0, "Do not use any type assertions.", "8"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Do not use any type assertions.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
-      [0, 0, 0, "Do not use any type assertions.", "13"]
-    ],
-    "public/app/features/plugins/pluginSettings.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
+      [0, 0, 0, "Do not use any type assertions.", "10"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
+      [0, 0, 0, "Do not use any type assertions.", "12"]
     ],
     "public/app/features/plugins/sandbox/distortion_map.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/features/plugins/sandbox/sandbox_components.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/features/plugins/sandbox/sandbox_plugin_loader.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"]
     ],
-    "public/app/features/plugins/sql/components/query-editor-raw/QueryToolbox.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"]
-    ],
-    "public/app/features/plugins/sql/components/query-editor-raw/QueryValidator.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
-    ],
-    "public/app/features/plugins/sql/components/query-editor-raw/RawEditor.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
-    "public/app/features/plugins/sql/components/visual-query-builder/AwesomeQueryBuilder.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
-    ],
-    "public/app/features/plugins/sql/components/visual-query-builder/SQLWhereRow.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
     "public/app/features/plugins/tests/datasource_srv.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
     "public/app/features/plugins/utils.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
@@ -4735,9 +3868,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "2"],
       [0, 0, 0, "Do not use any type assertions.", "3"]
     ],
-    "public/app/features/profile/ChangePasswordForm.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
     "public/app/features/query/components/QueryEditorRow.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
@@ -4758,26 +3888,18 @@ exports[`better eslint`] = {
     ],
     "public/app/features/query/components/QueryGroup.tsx:5381": [
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "1"],
+      [0, 0, 0, "Styles should be written using objects.", "1"],
       [0, 0, 0, "Styles should be written using objects.", "2"],
       [0, 0, 0, "Styles should be written using objects.", "3"],
       [0, 0, 0, "Styles should be written using objects.", "4"],
       [0, 0, 0, "Styles should be written using objects.", "5"],
       [0, 0, 0, "Styles should be written using objects.", "6"],
       [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Styles should be written using objects.", "8"]
+      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "8"]
     ],
     "public/app/features/query/components/QueryGroupOptions.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
-    "public/app/features/query/state/DashboardQueryRunner/AlertStatesWorker.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
-    ],
-    "public/app/features/query/state/DashboardQueryRunner/AnnotationsQueryRunner.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/features/query/state/DashboardQueryRunner/AnnotationsQueryRunner.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
@@ -4800,8 +3922,7 @@ exports[`better eslint`] = {
     ],
     "public/app/features/query/state/PanelQueryRunner.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"]
+      [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "public/app/features/query/state/runRequest.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
@@ -4817,90 +3938,12 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"]
-    ],
-    "public/app/features/sandbox/TestStuffPage.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
-    "public/app/features/search/components/DashboardListPage.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/features/search/components/ManageDashboardsNew.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"]
-    ],
-    "public/app/features/search/components/SearchCard.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Styles should be written using objects.", "8"],
-      [0, 0, 0, "Styles should be written using objects.", "9"],
-      [0, 0, 0, "Styles should be written using objects.", "10"],
-      [0, 0, 0, "Styles should be written using objects.", "11"]
-    ],
-    "public/app/features/search/components/SearchCardExpanded.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Styles should be written using objects.", "8"],
-      [0, 0, 0, "Styles should be written using objects.", "9"],
-      [0, 0, 0, "Styles should be written using objects.", "10"]
-    ],
-    "public/app/features/search/components/SearchItem.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"]
-    ],
-    "public/app/features/search/hooks/useSearchKeyboardSelection.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "10"]
     ],
     "public/app/features/search/page/components/ActionRow.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
-    "public/app/features/search/page/components/ConfirmDeleteModal.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/features/search/page/components/FolderSection.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Styles should be written using objects.", "8"]
-    ],
-    "public/app/features/search/page/components/MoveToFolderModal.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
-    "public/app/features/search/page/components/RootFolderView.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"]
-    ],
-    "public/app/features/search/page/components/SearchResultsCards.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
     "public/app/features/search/page/components/SearchResultsTable.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -4916,11 +3959,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "11"],
       [0, 0, 0, "Styles should be written using objects.", "12"]
     ],
-    "public/app/features/search/page/components/SearchView.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
-    ],
     "public/app/features/search/page/components/columns.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
@@ -4943,24 +3981,6 @@ exports[`better eslint`] = {
     "public/app/features/search/utils.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/features/serviceaccounts/ServiceAccountsListPage.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Styles should be written using objects.", "8"],
-      [0, 0, 0, "Styles should be written using objects.", "9"]
-    ],
-    "public/app/features/serviceaccounts/components/CreateTokenModal.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"]
-    ],
     "public/app/features/serviceaccounts/components/ServiceAccountProfile.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
@@ -4976,14 +3996,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "5"],
       [0, 0, 0, "Styles should be written using objects.", "6"]
     ],
-    "public/app/features/serviceaccounts/components/ServiceAccountsListItem.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"]
-    ],
     "public/app/features/serviceaccounts/state/reducers.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
@@ -5023,9 +4035,7 @@ exports[`better eslint`] = {
     ],
     "public/app/features/storage/storage.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/features/teams/TeamGroupSync.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -5045,14 +4055,14 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
-    "public/app/features/templating/macroRegistry.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/features/templating/templateProxies.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/features/templating/template_srv.mock.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"],
+      [0, 0, 0, "Do not use any type assertions.", "2"],
+      [0, 0, 0, "Do not use any type assertions.", "3"]
     ],
     "public/app/features/templating/template_srv.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -5065,12 +4075,15 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Do not use any type assertions.", "12"],
-      [0, 0, 0, "Do not use any type assertions.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Do not use any type assertions.", "15"]
+      [0, 0, 0, "Do not use any type assertions.", "10"],
+      [0, 0, 0, "Do not use any type assertions.", "11"],
+      [0, 0, 0, "Do not use any type assertions.", "12"]
+    ],
+    "public/app/features/trails/ActionTabs/utils.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    ],
+    "public/app/features/trails/MetricScene.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "public/app/features/transformers/FilterByValueTransformer/ValueMatchers/BasicMatcherEditor.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -5099,13 +4112,18 @@ exports[`better eslint`] = {
     ],
     "public/app/features/transformers/calculateHeatmap/heatmap.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+      [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "public/app/features/transformers/configFromQuery/ConfigFromQueryTransformerEditor.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
-    "public/app/features/transformers/editors/CalculateFieldTransformerEditor.tsx:5381": [
+    "public/app/features/transformers/editors/CalculateFieldTransformerEditor/CumulativeOptionsEditor.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
+    "public/app/features/transformers/editors/CalculateFieldTransformerEditor/ReduceRowOptionsEditor.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
+    "public/app/features/transformers/editors/CalculateFieldTransformerEditor/WindowOptionsEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "public/app/features/transformers/editors/ConvertFieldTypeTransformerEditor.tsx:5381": [
@@ -5123,13 +4141,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "2"]
     ],
     "public/app/features/transformers/editors/ReduceTransformerEditor.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"]
-    ],
-    "public/app/features/transformers/editors/RenameByRegexTransformer.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
+      [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "public/app/features/transformers/editors/SortByTransformerEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
@@ -5175,8 +4187,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
     "public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -5202,17 +4213,11 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "1"],
       [0, 0, 0, "Styles should be written using objects.", "2"]
     ],
-    "public/app/features/users/state/reducers.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
     "public/app/features/variables/adapters.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
-    "public/app/features/variables/adhoc/actions.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
     "public/app/features/variables/adhoc/picker/AdHocFilterRenderer.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
@@ -5225,19 +4230,12 @@ exports[`better eslint`] = {
     "public/app/features/variables/datasource/actions.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/features/variables/datasource/reducer.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
-    "public/app/features/variables/editor/LegacyVariableQueryEditor.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
-    ],
     "public/app/features/variables/editor/VariableEditorContainer.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "public/app/features/variables/editor/VariableEditorEditor.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "1"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/features/variables/editor/VariableEditorList.tsx:5381": [
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
@@ -5257,16 +4255,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "9"],
       [0, 0, 0, "Styles should be written using objects.", "10"]
     ],
-    "public/app/features/variables/editor/VariableSelectField.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
-    "public/app/features/variables/editor/VariableTextAreaField.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/features/variables/editor/VariableValuesPreview.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
-    ],
     "public/app/features/variables/editor/getVariableQueryEditor.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
@@ -5309,39 +4297,17 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "9"]
     ],
-    "public/app/features/variables/interval/reducer.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
     "public/app/features/variables/pickers/OptionsPicker/actions.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
-    "public/app/features/variables/pickers/OptionsPicker/reducer.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"]
-    ],
     "public/app/features/variables/pickers/shared/VariableLink.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
+      [0, 0, 0, "Styles should be written using objects.", "0"],
+      [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
     "public/app/features/variables/pickers/shared/VariableOptions.tsx:5381": [
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
     ],
-    "public/app/features/variables/query/QueryVariableEditor.test.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/features/variables/query/QueryVariableEditor.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
@@ -5351,51 +4317,29 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "public/app/features/variables/query/actions.test.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
-    ],
-    "public/app/features/variables/query/actions.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
-    ],
-    "public/app/features/variables/query/operators.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
-    ],
-    "public/app/features/variables/query/queryRunners.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "17"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    ],
+    "public/app/features/variables/query/actions.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
+    ],
+    "public/app/features/variables/query/operators.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
+    ],
+    "public/app/features/variables/query/queryRunners.test.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/features/variables/query/queryRunners.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/features/variables/query/reducer.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/features/variables/query/variableQueryObserver.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -5405,13 +4349,9 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
-    "public/app/features/variables/shared/testing/datasourceVariableBuilder.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/features/variables/shared/testing/optionsVariableBuilder.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+      [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "public/app/features/variables/shared/testing/variableBuilder.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
@@ -5422,35 +4362,18 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "2"],
       [0, 0, 0, "Do not use any type assertions.", "3"],
       [0, 0, 0, "Do not use any type assertions.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Do not use any type assertions.", "6"],
-      [0, 0, 0, "Do not use any type assertions.", "7"],
-      [0, 0, 0, "Do not use any type assertions.", "8"],
-      [0, 0, 0, "Do not use any type assertions.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"]
+      [0, 0, 0, "Do not use any type assertions.", "5"],
+      [0, 0, 0, "Do not use any type assertions.", "6"]
     ],
     "public/app/features/variables/state/keyedVariablesReducer.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
-    "public/app/features/variables/state/reducers.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
-    ],
     "public/app/features/variables/state/sharedReducer.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
-    "public/app/features/variables/state/transactionReducer.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
-    ],
     "public/app/features/variables/state/types.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
@@ -5461,13 +4384,12 @@ exports[`better eslint`] = {
     "public/app/features/variables/system/adapter.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
+      [0, 0, 0, "Do not use any type assertions.", "2"],
       [0, 0, 0, "Do not use any type assertions.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
+      [0, 0, 0, "Do not use any type assertions.", "5"],
       [0, 0, 0, "Do not use any type assertions.", "6"],
-      [0, 0, 0, "Do not use any type assertions.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "7"]
     ],
     "public/app/features/variables/types.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -5480,25 +4402,14 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Do not use any type assertions.", "9"]
+      [0, 0, 0, "Do not use any type assertions.", "6"]
     ],
     "public/app/features/visualization/data-hover/DataHoverRows.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
-    "public/app/features/visualization/data-hover/DataHoverView.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"]
-    ],
     "public/app/plugins/datasource/alertmanager/DataSource.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
@@ -5510,10 +4421,6 @@ exports[`better eslint`] = {
     "public/app/plugins/datasource/azuremonitor/azure_monitor/azure_monitor_datasource.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/QueryField.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"]
-    ],
     "public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
@@ -5522,8 +4429,7 @@ exports[`better eslint`] = {
     ],
     "public/app/plugins/datasource/cloud-monitoring/CloudMonitoringMetricFindQuery.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/plugins/datasource/cloud-monitoring/annotationSupport.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
@@ -5532,42 +4438,24 @@ exports[`better eslint`] = {
     "public/app/plugins/datasource/cloud-monitoring/components/Aggregation.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/plugins/datasource/cloud-monitoring/components/AliasBy.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
-    ],
     "public/app/plugins/datasource/cloud-monitoring/components/CloudMonitoringCheatSheet.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
-    "public/app/plugins/datasource/cloud-monitoring/components/MQLQueryEditor.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/plugins/datasource/cloud-monitoring/components/VariableQueryEditor.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"]
+      [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
+      [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
     "public/app/plugins/datasource/cloud-monitoring/datasource.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Do not use any type assertions.", "5"],
-      [0, 0, 0, "Do not use any type assertions.", "6"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
+      [0, 0, 0, "Do not use any type assertions.", "3"]
     ],
     "public/app/plugins/datasource/cloud-monitoring/functions.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+      [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "public/app/plugins/datasource/cloud-monitoring/types/types.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -5582,18 +4470,12 @@ exports[`better eslint`] = {
     "public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryEditor.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
-    "public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryFieldOld.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
     "public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/DynamicLabelsField.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
     "public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LegacyLogGroupNamesSelection.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
-    "public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsField.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
     "public/app/plugins/datasource/cloudwatch/datasource.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
@@ -5609,9 +4491,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
-    "public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
     "public/app/plugins/datasource/cloudwatch/types.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
@@ -5623,15 +4502,10 @@ exports[`better eslint`] = {
     ],
     "public/app/plugins/datasource/cloudwatch/utils/datalinks.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"]
+      [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "public/app/plugins/datasource/cloudwatch/utils/logsRetry.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
-    ],
-    "public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/plugins/datasource/dashboard/runSharedRequest.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
@@ -5643,27 +4517,27 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Do not use any type assertions.", "5"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Do not use any type assertions.", "11"],
-      [0, 0, 0, "Do not use any type assertions.", "12"],
+      [0, 0, 0, "Do not use any type assertions.", "10"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "17"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "18"],
+      [0, 0, 0, "Do not use any type assertions.", "18"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "19"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "20"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "21"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "22"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "23"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "24"],
-      [0, 0, 0, "Do not use any type assertions.", "25"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "25"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "26"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "27"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "28"],
@@ -5671,19 +4545,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "30"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "31"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "32"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "33"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "34"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "35"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "36"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "37"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "38"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "39"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "40"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "41"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "42"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "43"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "44"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "45"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "33"]
     ],
     "public/app/plugins/datasource/elasticsearch/LanguageProvider.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -5697,9 +4559,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
     ],
-    "public/app/plugins/datasource/elasticsearch/QueryBuilder.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/plugins/datasource/elasticsearch/QueryBuilder.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
@@ -5707,17 +4566,12 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
+      [0, 0, 0, "Do not use any type assertions.", "6"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Do not use any type assertions.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "8"]
     ],
     "public/app/plugins/datasource/elasticsearch/components/AddRemove.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
+      [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
     "public/app/plugins/datasource/elasticsearch/components/MetricPicker.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
@@ -5734,21 +4588,14 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "2"]
     ],
     "public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/TermsSettingsEditor.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"]
+      [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/aggregations.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/state/actions.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/state/reducer.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/plugins/datasource/elasticsearch/components/QueryEditor/ElasticsearchQueryContext.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
     "public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/MetricEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
@@ -5768,11 +4615,6 @@ exports[`better eslint`] = {
     "public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/aggregations.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/state/actions.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
-    ],
     "public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/state/reducer.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
@@ -5811,13 +4653,11 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "2"]
     ],
     "public/app/plugins/datasource/elasticsearch/datasource.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
     ],
     "public/app/plugins/datasource/elasticsearch/hooks/useStatelessReducer.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
@@ -5829,32 +4669,25 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
-    "public/app/plugins/datasource/grafana-testdata-datasource/ConfigEditor.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    "public/app/plugins/datasource/grafana-pyroscope-datasource/utils.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "public/app/plugins/datasource/grafana-testdata-datasource/QueryEditor.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Do not use any type assertions.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"]
+      [0, 0, 0, "Do not use any type assertions.", "3"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
     ],
     "public/app/plugins/datasource/grafana-testdata-datasource/components/RandomWalkEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"]
-    ],
-    "public/app/plugins/datasource/grafana-testdata-datasource/components/RawFrameEditor.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Do not use any type assertions.", "2"]
     ],
     "public/app/plugins/datasource/grafana-testdata-datasource/components/SimulationQueryEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
     "public/app/plugins/datasource/grafana-testdata-datasource/components/SimulationSchemaForm.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -5865,11 +4698,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
-    "public/app/plugins/datasource/grafana-testdata-datasource/nodeGraphUtils.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
-    ],
     "public/app/plugins/datasource/grafana-testdata-datasource/runStreams.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
@@ -5877,19 +4705,11 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "public/app/plugins/datasource/grafana/components/QueryEditor.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Do not use any type assertions.", "5"],
-      [0, 0, 0, "Do not use any type assertions.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"]
-    ],
-    "public/app/plugins/datasource/grafana/components/SearchEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"]
+      [0, 0, 0, "Do not use any type assertions.", "2"],
+      [0, 0, 0, "Do not use any type assertions.", "3"],
+      [0, 0, 0, "Styles should be written using objects.", "4"]
     ],
     "public/app/plugins/datasource/grafana/components/TimePickerInput.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
@@ -5901,31 +4721,21 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
-    "public/app/plugins/datasource/grafana/datasource.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/plugins/datasource/grafana/datasource.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
       [0, 0, 0, "Do not use any type assertions.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
+      [0, 0, 0, "Do not use any type assertions.", "5"],
+      [0, 0, 0, "Do not use any type assertions.", "6"],
       [0, 0, 0, "Do not use any type assertions.", "7"],
-      [0, 0, 0, "Do not use any type assertions.", "8"],
-      [0, 0, 0, "Do not use any type assertions.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Do not use any type assertions.", "12"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
+      [0, 0, 0, "Do not use any type assertions.", "9"]
     ],
     "public/app/plugins/datasource/graphite/components/AddGraphiteFunction.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
-    "public/app/plugins/datasource/graphite/components/FunctionEditor.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
-    ],
     "public/app/plugins/datasource/graphite/components/FunctionParamEditor.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
@@ -5959,26 +4769,22 @@ exports[`better eslint`] = {
     "public/app/plugins/datasource/graphite/datasource.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
     "public/app/plugins/datasource/graphite/datasource.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
+      [0, 0, 0, "Do not use any type assertions.", "3"],
       [0, 0, 0, "Do not use any type assertions.", "4"],
-      [0, 0, 0, "Do not use any type assertions.", "5"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
+      [0, 0, 0, "Do not use any type assertions.", "10"],
       [0, 0, 0, "Do not use any type assertions.", "11"],
-      [0, 0, 0, "Do not use any type assertions.", "12"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
@@ -6020,15 +4826,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "51"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "52"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "53"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "54"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "55"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "56"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "57"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "58"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "59"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "60"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "61"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "62"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "54"]
     ],
     "public/app/plugins/datasource/graphite/gfunc.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -6041,11 +4839,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "10"]
     ],
     "public/app/plugins/datasource/graphite/graphite_query.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -6063,15 +4857,11 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "17"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "18"],
-      [0, 0, 0, "Do not use any type assertions.", "19"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "20"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "21"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "22"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "23"]
+      [0, 0, 0, "Do not use any type assertions.", "15"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "17"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "18"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "19"]
     ],
     "public/app/plugins/datasource/graphite/lexer.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -6085,11 +4875,6 @@ exports[`better eslint`] = {
     "public/app/plugins/datasource/graphite/migrations.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/plugins/datasource/graphite/parser.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
-    ],
     "public/app/plugins/datasource/graphite/specs/graphite_query.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
@@ -6106,17 +4891,14 @@ exports[`better eslint`] = {
     ],
     "public/app/plugins/datasource/graphite/state/store.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"]
+      [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "public/app/plugins/datasource/graphite/types.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/plugins/datasource/graphite/utils.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/plugins/datasource/influxdb/components/editor/config/ConfigEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
@@ -6149,9 +4931,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
-      [0, 0, 0, "Do not use any type assertions.", "17"]
+      [0, 0, 0, "Do not use any type assertions.", "15"]
     ],
     "public/app/plugins/datasource/influxdb/influx_query_model.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -6166,14 +4946,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "17"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "18"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "19"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "12"]
     ],
     "public/app/plugins/datasource/influxdb/influx_series.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -6221,8 +4994,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "15"]
     ],
     "public/app/plugins/datasource/influxdb/response_parser.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -6232,8 +5004,11 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
-    "public/app/plugins/datasource/jaeger/components/QueryEditor.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
+    "public/app/plugins/datasource/jaeger/_importedDependencies/model/transform-trace-data.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
+    "public/app/plugins/datasource/jaeger/_importedDependencies/types/trace.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/plugins/datasource/jaeger/configuration/ConfigEditor.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
@@ -6243,14 +5018,12 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
     "public/app/plugins/datasource/jaeger/datasource.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"]
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
+    ],
+    "public/app/plugins/datasource/jaeger/helpers/createFetchResponse.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "public/app/plugins/datasource/jaeger/testResponse.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -6259,13 +5032,9 @@ exports[`better eslint`] = {
     "public/app/plugins/datasource/jaeger/types.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/plugins/datasource/jaeger/util.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/plugins/datasource/loki/LanguageProvider.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/plugins/datasource/loki/LiveStreams.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -6297,29 +5066,15 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "10"],
       [0, 0, 0, "Styles should be written using objects.", "11"],
       [0, 0, 0, "Styles should be written using objects.", "12"],
-      [0, 0, 0, "Styles should be written using objects.", "13"],
-      [0, 0, 0, "Do not use any type assertions.", "14"],
-      [0, 0, 0, "Do not use any type assertions.", "15"]
-    ],
-    "public/app/plugins/datasource/loki/components/LokiOptionFields.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
-    "public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
+      [0, 0, 0, "Styles should be written using objects.", "13"]
     ],
     "public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "2"]
+      [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
     "public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/plugins/datasource/loki/configuration/DebugSection.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
-    ],
     "public/app/plugins/datasource/loki/configuration/DerivedField.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -6342,8 +5097,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "5"]
     ],
     "public/app/plugins/datasource/loki/queryUtils.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
@@ -6375,13 +5129,11 @@ exports[`better eslint`] = {
     ],
     "public/app/plugins/datasource/loki/streaming.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/plugins/datasource/opentsdb/components/OpenTsdbQueryEditor.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
+      [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
     "public/app/plugins/datasource/opentsdb/datasource.d.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -6462,16 +5214,11 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
-    "public/app/plugins/datasource/prometheus/components/PromLink.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
     "public/app/plugins/datasource/prometheus/components/PromQueryField.test.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/plugins/datasource/prometheus/components/PromQueryField.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/plugins/datasource/prometheus/components/PrometheusMetricsBrowser.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
@@ -6485,14 +5232,11 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "8"],
       [0, 0, 0, "Styles should be written using objects.", "9"],
       [0, 0, 0, "Styles should be written using objects.", "10"],
-      [0, 0, 0, "Styles should be written using objects.", "11"],
-      [0, 0, 0, "Do not use any type assertions.", "12"],
-      [0, 0, 0, "Do not use any type assertions.", "13"]
+      [0, 0, 0, "Styles should be written using objects.", "11"]
     ],
     "public/app/plugins/datasource/prometheus/components/monaco-query-field/MonacoQueryField.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "2"]
+      [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
     "public/app/plugins/datasource/prometheus/configuration/AzureCredentialsConfig.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -6537,29 +5281,14 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "18"],
       [0, 0, 0, "Styles should be written using objects.", "19"]
     ],
-    "public/app/plugins/datasource/prometheus/configuration/ExemplarSetting.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
-    ],
-    "public/app/plugins/datasource/prometheus/configuration/ExemplarsSettings.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
-    "public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
-    "public/app/plugins/datasource/prometheus/datasource.test.ts:5381": [
+    "public/app/plugins/datasource/prometheus/configuration/ConfigEditorPackage.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
+    ],
+    "public/app/plugins/datasource/prometheus/configuration/ExemplarsSettings.tsx:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
     "public/app/plugins/datasource/prometheus/datasource.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -6573,54 +5302,26 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Do not use any type assertions.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "17"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "18"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "19"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "20"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "21"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "22"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "23"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "24"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "25"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "26"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "27"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "28"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "12"]
     ],
     "public/app/plugins/datasource/prometheus/language_provider.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Do not use any type assertions.", "6"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
     ],
     "public/app/plugins/datasource/prometheus/language_utils.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Do not use any type assertions.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Do not use any type assertions.", "7"],
-      [0, 0, 0, "Do not use any type assertions.", "8"],
-      [0, 0, 0, "Do not use any type assertions.", "9"]
-    ],
-    "public/app/plugins/datasource/prometheus/metric_find_query.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+      [0, 0, 0, "Do not use any type assertions.", "2"]
     ],
     "public/app/plugins/datasource/prometheus/metric_find_query.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
     ],
     "public/app/plugins/datasource/prometheus/query_hints.ts:5381": [
@@ -6640,13 +5341,10 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/plugins/datasource/prometheus/querybuilder/components/LabelFilterItem.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "4"],
-      [0, 0, 0, "Do not use any type assertions.", "5"],
-      [0, 0, 0, "Do not use any type assertions.", "6"]
+      [0, 0, 0, "Do not use any type assertions.", "2"],
+      [0, 0, 0, "Do not use any type assertions.", "3"]
     ],
     "public/app/plugins/datasource/prometheus/querybuilder/components/LabelFilters.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
@@ -6675,9 +5373,6 @@ exports[`better eslint`] = {
     "public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryCodeEditor.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
-    "public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryEditorSelector.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
-    ],
     "public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/AdditionalSettings.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -6719,19 +5414,19 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "17"],
       [0, 0, 0, "Styles should be written using objects.", "18"]
     ],
+    "public/app/plugins/datasource/prometheus/querybuilder/operationUtils.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
     "public/app/plugins/datasource/prometheus/querybuilder/shared/LabelFilterItem.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "3"],
+      [0, 0, 0, "Do not use any type assertions.", "3"],
       [0, 0, 0, "Do not use any type assertions.", "4"],
       [0, 0, 0, "Do not use any type assertions.", "5"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "6"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
       [0, 0, 0, "Do not use any type assertions.", "7"],
-      [0, 0, 0, "Do not use any type assertions.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Do not use any type assertions.", "10"],
-      [0, 0, 0, "Do not use any type assertions.", "11"]
+      [0, 0, 0, "Do not use any type assertions.", "8"]
     ],
     "public/app/plugins/datasource/prometheus/querybuilder/shared/LabelFilters.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
@@ -6747,138 +5442,43 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
-    "public/app/plugins/datasource/prometheus/querybuilder/shared/operationUtils.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
-    "public/app/plugins/datasource/prometheus/querybuilder/shared/parsingUtils.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/plugins/datasource/prometheus/querybuilder/shared/types.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
-    "public/app/plugins/datasource/prometheus/result_transformer.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "17"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "18"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "19"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "20"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "21"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "22"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "23"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "24"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "25"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "26"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "27"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "28"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "29"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "30"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "31"]
-    ],
     "public/app/plugins/datasource/prometheus/types.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
-    ],
-    "public/app/plugins/datasource/tempo/LokiSearch.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"]
-    ],
-    "public/app/plugins/datasource/tempo/NativeSearch/NativeSearch.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
-    "public/app/plugins/datasource/tempo/NativeSearch/TagsField/TagsField.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
-    "public/app/plugins/datasource/tempo/SearchTraceQLEditor/DurationInput.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/plugins/datasource/tempo/SearchTraceQLEditor/GroupByField.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/plugins/datasource/tempo/SearchTraceQLEditor/SearchField.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/plugins/datasource/tempo/SearchTraceQLEditor/TagsInput.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
-    "public/app/plugins/datasource/tempo/SearchTraceQLEditor/TraceQLSearch.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
     "public/app/plugins/datasource/tempo/ServiceGraphSection.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"]
-    ],
-    "public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
+      [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/plugins/datasource/tempo/configuration/QuerySettings.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
+    "public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/AdHocFilterRenderer.tsx:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/plugins/datasource/tempo/configuration/TraceQLSearchSettings.tsx:5381": [
+    "public/app/plugins/datasource/tempo/_importedDependencies/datasources/prometheus/language_utils.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/plugins/datasource/tempo/datasource.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"]
-    ],
-    "public/app/plugins/datasource/tempo/datasource.ts:5381": [
+    "public/app/plugins/datasource/tempo/_importedDependencies/datasources/prometheus/types.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+    ],
+    "public/app/plugins/datasource/tempo/_importedDependencies/test/helpers/createFetchResponse.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"]
+    ],
+    "public/app/plugins/datasource/tempo/configuration/TraceQLSearchSettings.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
+    "public/app/plugins/datasource/tempo/datasource.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Do not use any type assertions.", "9"],
-      [0, 0, 0, "Do not use any type assertions.", "10"],
-      [0, 0, 0, "Do not use any type assertions.", "11"],
-      [0, 0, 0, "Do not use any type assertions.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
     ],
     "public/app/plugins/datasource/tempo/language_provider.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -6893,31 +5493,16 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "6"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "7"]
     ],
-    "public/app/plugins/datasource/tempo/traceql/QueryEditor.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/plugins/datasource/tempo/traceql/TraceQLEditor.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
-    "public/app/plugins/datasource/tempo/traceql/autocomplete.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
-    ],
     "public/app/plugins/datasource/zipkin/ConfigEditor.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
     "public/app/plugins/datasource/zipkin/QueryField.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/plugins/datasource/zipkin/datasource.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/plugins/datasource/zipkin/utils/testResponse.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -6926,39 +5511,10 @@ exports[`better eslint`] = {
     "public/app/plugins/datasource/zipkin/utils/transforms.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/plugins/panel/alertGroups/AlertGroup.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"]
-    ],
     "public/app/plugins/panel/alertlist/AlertInstances.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
-    "public/app/plugins/panel/alertlist/AlertList.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Styles should be written using objects.", "8"],
-      [0, 0, 0, "Styles should be written using objects.", "9"],
-      [0, 0, 0, "Styles should be written using objects.", "10"],
-      [0, 0, 0, "Styles should be written using objects.", "11"],
-      [0, 0, 0, "Styles should be written using objects.", "12"]
-    ],
-    "public/app/plugins/panel/alertlist/AlertListMigrationHandler.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
-    ],
     "public/app/plugins/panel/alertlist/UnifiedAlertList.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -6987,20 +5543,9 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "5"],
       [0, 0, 0, "Styles should be written using objects.", "6"]
     ],
-    "public/app/plugins/panel/annolist/AnnoListPanel.test.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
-    ],
     "public/app/plugins/panel/annolist/AnnoListPanel.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"]
-    ],
-    "public/app/plugins/panel/annolist/module.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
     "public/app/plugins/panel/barchart/BarChartPanel.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
@@ -7019,77 +5564,24 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
-    "public/app/plugins/panel/canvas/components/CanvasContextMenu.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/plugins/panel/canvas/components/CanvasTooltip.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/plugins/panel/canvas/components/SetBackground.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
-    "public/app/plugins/panel/canvas/components/connections/ConnectionAnchors.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"]
-    ],
-    "public/app/plugins/panel/canvas/components/connections/ConnectionSVG.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
-    "public/app/plugins/panel/canvas/editor/connectionEditor.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/plugins/panel/canvas/editor/element/APIEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/plugins/panel/canvas/editor/element/ConstraintSelectionBox.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"]
-    ],
     "public/app/plugins/panel/canvas/editor/element/PlacementEditor.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/plugins/panel/canvas/editor/element/QuickPositioning.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
     "public/app/plugins/panel/canvas/editor/element/elementEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
-    "public/app/plugins/panel/canvas/editor/inline/InlineEdit.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"]
-    ],
     "public/app/plugins/panel/canvas/editor/inline/InlineEditBody.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
     ],
     "public/app/plugins/panel/canvas/editor/layer/TreeNavigationEditor.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
-    "public/app/plugins/panel/canvas/editor/layer/TreeNodeTitle.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/plugins/panel/canvas/editor/layer/layerEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
@@ -7100,9 +5592,6 @@ exports[`better eslint`] = {
     "public/app/plugins/panel/canvas/globalStyles.ts:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
-    "public/app/plugins/panel/dashlist/migrations.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/plugins/panel/dashlist/styles.ts:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -7123,8 +5612,7 @@ exports[`better eslint`] = {
     ],
     "public/app/plugins/panel/debug/EventBusLogger.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/plugins/panel/gauge/GaugeMigrations.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -7174,28 +5662,11 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/plugins/panel/geomap/utils/layers.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"]
-    ],
-    "public/app/plugins/panel/geomap/utils/selection.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/plugins/panel/geomap/utils/tooltip.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/plugins/panel/gettingstarted/GettingStarted.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Styles should be written using objects.", "8"],
-      [0, 0, 0, "Styles should be written using objects.", "9"],
-      [0, 0, 0, "Styles should be written using objects.", "10"]
-    ],
     "public/app/plugins/panel/gettingstarted/components/DocsCard.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -7203,12 +5674,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "3"],
       [0, 0, 0, "Styles should be written using objects.", "4"]
     ],
-    "public/app/plugins/panel/gettingstarted/components/Step.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"]
-    ],
     "public/app/plugins/panel/gettingstarted/components/TutorialCard.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -7218,23 +5683,15 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "5"]
     ],
     "public/app/plugins/panel/gettingstarted/components/sharedStyles.ts:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
+      [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
     "public/app/plugins/panel/heatmap/HeatmapPanel.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/plugins/panel/heatmap/migrations.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/plugins/panel/heatmap/module.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
-    ],
     "public/app/plugins/panel/heatmap/palettes.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
@@ -7261,11 +5718,8 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "15"],
       [0, 0, 0, "Do not use any type assertions.", "16"]
     ],
-    "public/app/plugins/panel/histogram/Histogram.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
+    "public/app/plugins/panel/histogram/migrations.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/plugins/panel/live/LiveChannelEditor.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -7281,24 +5735,9 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "6"],
       [0, 0, 0, "Styles should be written using objects.", "7"]
     ],
-    "public/app/plugins/panel/live/types.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/plugins/panel/logs/LogsPanel.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/plugins/panel/news/component/News.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Styles should be written using objects.", "8"],
-      [0, 0, 0, "Styles should be written using objects.", "9"]
-    ],
     "public/app/plugins/panel/nodeGraph/Edge.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
@@ -7359,128 +5798,23 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"]
     ],
-    "public/app/plugins/panel/nodeGraph/utils.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
-    ],
     "public/app/plugins/panel/piechart/PieChart.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
+      [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
       [0, 0, 0, "Styles should be written using objects.", "2"],
       [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"]
-    ],
-    "public/app/plugins/panel/piechart/migrations.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
-    ],
-    "public/app/plugins/panel/stat/StatMigrations.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
-    ],
-    "public/app/plugins/panel/state-timeline/migrations.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
-    ],
-    "public/app/plugins/panel/table-old/column_options.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "17"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "18"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "19"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "20"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "21"]
-    ],
-    "public/app/plugins/panel/table-old/editor.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"]
-    ],
-    "public/app/plugins/panel/table-old/module.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "17"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "18"]
+      [0, 0, 0, "Styles should be written using objects.", "4"]
     ],
-    "public/app/plugins/panel/table-old/renderer.ts:5381": [
+    "public/app/plugins/panel/piechart/migrations.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Do not use any type assertions.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
-    "public/app/plugins/panel/table-old/transformers.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"]
+    "public/app/plugins/panel/stat/StatMigrations.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/plugins/panel/table-old/types.ts:5381": [
+    "public/app/plugins/panel/state-timeline/migrations.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/plugins/panel/table/TablePanel.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
@@ -7514,31 +5848,18 @@ exports[`better eslint`] = {
     ],
     "public/app/plugins/panel/timeseries/migrations.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Do not use any type assertions.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Do not use any type assertions.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"]
+      [0, 0, 0, "Do not use any type assertions.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
+      [0, 0, 0, "Do not use any type assertions.", "3"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
+      [0, 0, 0, "Do not use any type assertions.", "5"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
+      [0, 0, 0, "Do not use any type assertions.", "7"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "9"]
     ],
-    "public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Styles should be written using objects.", "8"],
-      [0, 0, 0, "Styles should be written using objects.", "9"],
-      [0, 0, 0, "Styles should be written using objects.", "10"],
-      [0, 0, 0, "Styles should be written using objects.", "11"]
+    "public/app/plugins/panel/timeseries/plugins/AnnotationsPlugin2.tsx:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/plugins/panel/timeseries/plugins/ThresholdDragHandle.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
@@ -7550,12 +5871,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "6"]
     ],
     "public/app/plugins/panel/timeseries/plugins/annotations/AnnotationEditor.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"]
+      [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "public/app/plugins/panel/timeseries/plugins/annotations/AnnotationEditorForm.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
@@ -7566,11 +5882,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "5"],
       [0, 0, 0, "Styles should be written using objects.", "6"]
     ],
-    "public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
-    ],
     "public/app/plugins/panel/timeseries/plugins/annotations/AnnotationTooltip.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -7582,6 +5893,15 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "7"],
       [0, 0, 0, "Styles should be written using objects.", "8"]
     ],
+    "public/app/plugins/panel/timeseries/plugins/annotations2/AnnotationEditor2.tsx:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    ],
+    "public/app/plugins/panel/timeseries/plugins/annotations2/AnnotationMarker2.tsx:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    ],
+    "public/app/plugins/panel/timeseries/plugins/annotations2/AnnotationTooltip2.tsx:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    ],
     "public/app/plugins/panel/timeseries/plugins/styles.ts:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"]
@@ -7603,8 +5923,18 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "2"]
     ],
     "public/app/plugins/panel/xychart/ManualEditor.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
+    "public/app/plugins/panel/xychart/TooltipView.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
+    "public/app/plugins/panel/xychart/XYChartPanel.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Do not use any type assertions.", "1"]
+    ],
+    "public/app/plugins/panel/xychart/scatter.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
       [0, 0, 0, "Do not use any type assertions.", "4"],
@@ -7613,33 +5943,20 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
       [0, 0, 0, "Do not use any type assertions.", "8"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Do not use any type assertions.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Styles should be written using objects.", "12"],
-      [0, 0, 0, "Styles should be written using objects.", "13"],
-      [0, 0, 0, "Styles should be written using objects.", "14"],
-      [0, 0, 0, "Styles should be written using objects.", "15"]
-    ],
-    "public/app/plugins/panel/xychart/TooltipView.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"]
-    ],
-    "public/app/plugins/panel/xychart/XYChartPanel2.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
+      [0, 0, 0, "Do not use any type assertions.", "10"]
     ],
-    "public/app/plugins/panel/xychart/dims.ts:5381": [
+    "public/app/plugins/panel/xychart/v2/SeriesEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"]
+      [0, 0, 0, "Do not use any type assertions.", "3"],
+      [0, 0, 0, "Do not use any type assertions.", "4"]
     ],
-    "public/app/plugins/panel/xychart/scatter.ts:5381": [
+    "public/app/plugins/panel/xychart/v2/migrations.ts:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"]
+    ],
+    "public/app/plugins/panel/xychart/v2/scatter.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
@@ -7649,9 +5966,10 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "6"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
       [0, 0, 0, "Do not use any type assertions.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Do not use any type assertions.", "10"],
-      [0, 0, 0, "Do not use any type assertions.", "11"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "9"]
+    ],
+    "public/app/plugins/panel/xychart/v2/utils.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/store/configureStore.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -7709,19 +6027,8 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
-    "public/app/types/templates.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/types/unified-alerting-dto.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"]
-    ],
-    "public/test/core/redux/mocks.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
-    "public/test/core/redux/reducerTester.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
+      [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "public/test/core/redux/reduxTester.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -7739,15 +6046,11 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "7"]
     ],
     "public/test/global-jquery-shim.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/test/helpers/convertToStoreState.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/test/helpers/getDashboardModel.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
@@ -7760,20 +6063,6 @@ exports[`better eslint`] = {
     "public/test/lib/common.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/test/matchers/index.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
-    "public/test/matchers/toEmitValuesWith.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
-    ],
-    "public/test/matchers/utils.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
-    "public/test/mocks/workers.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/test/specs/helpers.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
@@ -7785,12 +6074,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "10"]
     ]
   }`
 };
@@ -7859,3 +6143,1072 @@ exports[`no undocumented stories`] = {
     ]
   }`
 };
+
+exports[`no gf-form usage`] = {
+  value: `{
+    "e2e/scenes/utils/flows/addDataSource.ts:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "e2e/utils/flows/addDataSource.ts:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "packages/grafana-e2e/src/flows/addDataSource.ts:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "packages/grafana-prometheus/src/components/PromExploreExtraField.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "packages/grafana-prometheus/src/components/PromQueryField.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "packages/grafana-prometheus/src/configuration/AlertingSettingsOverhaul.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "packages/grafana-prometheus/src/configuration/ExemplarSetting.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "packages/grafana-prometheus/src/configuration/PromSettings.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "packages/grafana-prometheus/src/querybuilder/components/PromQueryCodeEditor.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "packages/grafana-ui/src/components/DataSourceSettings/AlertingSettings.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "packages/grafana-ui/src/components/DataSourceSettings/CustomHeadersSettings.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "packages/grafana-ui/src/components/DataSourceSettings/HttpProxySettings.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "packages/grafana-ui/src/components/DataSourceSettings/SecureSocksProxySettings.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "packages/grafana-ui/src/components/DataSourceSettings/TLSAuthSettings.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "packages/grafana-ui/src/components/FormField/FormField.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "packages/grafana-ui/src/components/FormLabel/FormLabel.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "packages/grafana-ui/src/components/Forms/Legacy/Input/Input.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "packages/grafana-ui/src/components/Forms/Legacy/Select/NoOptionsMessage.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "packages/grafana-ui/src/components/Forms/Legacy/Select/Select.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "packages/grafana-ui/src/components/Forms/Legacy/Select/SelectOption.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "packages/grafana-ui/src/components/Forms/Legacy/Switch/Switch.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "packages/grafana-ui/src/components/SecretFormField/SecretFormField.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "packages/grafana-ui/src/components/Segment/Segment.story.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "packages/grafana-ui/src/components/Segment/SegmentAsync.story.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "packages/grafana-ui/src/components/Segment/SegmentInput.story.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "packages/grafana-ui/src/components/Segment/SegmentInput.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/angular/components/code_editor/code_editor.ts:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/angular/components/form_dropdown/form_dropdown.ts:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/angular/components/info_popover.ts:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/angular/components/switch.ts:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/angular/dropdown_typeahead.ts:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/angular/metric_segment.ts:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/angular/misc.ts:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/angular/panel/partials/query_editor_row.html:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/angular/partials/tls_auth_settings.html:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/core/components/AccessControl/PermissionList.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/core/components/PageHeader/PageHeader.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/features/admin/UserLdapSyncInfo.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/features/admin/partials/edit_org.html:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/features/admin/partials/styleguide.html:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/features/annotations/partials/event_editor.html:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/features/dashboard-scene/sharing/ShareLinkTab.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/features/dashboard/components/SubMenu/AnnotationPicker.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/features/dashboard/components/SubMenu/SubMenuItems.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/features/datasources/components/BasicSettings.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/features/datasources/components/ButtonRow.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/features/datasources/components/DataSourceLoadError.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/features/datasources/components/DataSourcePluginState.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/features/datasources/components/DataSourceTestingStatus.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/features/plugins/admin/components/AppConfigWrapper.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/features/query/components/QueryEditorRow.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/features/query/components/QueryGroupOptions.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/features/transformers/FilterByValueTransformer/ValueMatchers/RangeMatcherEditor.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/features/transformers/editors/OrganizeFieldsTransformerEditor.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/features/variables/adhoc/picker/AdHocFilter.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/features/variables/adhoc/picker/AdHocFilterKey.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/features/variables/adhoc/picker/AdHocFilterRenderer.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/features/variables/adhoc/picker/AdHocFilterValue.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/features/variables/adhoc/picker/ConditionSegment.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/features/variables/pickers/PickerRenderer.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/features/variables/pickers/shared/VariableInput.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/partials/confirm_modal.html:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/partials/reset_password.html:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/partials/signup_invited.html:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/alertmanager/ConfigEditor.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/cloudwatch/components/ConfigEditor/XrayLinkConfig.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryEditor.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryField.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LegacyLogGroupNamesSelection.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsField.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/elasticsearch/components/QueryEditor/SettingsEditorContainer.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/elasticsearch/configuration/DataLinks.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/grafana-pyroscope-datasource/ConfigEditor.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/graphite/components/AnnotationsEditor.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/graphite/configuration/MappingsConfiguration.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/influxdb/components/editor/annotation/AnnotationEditor.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/influxdb/components/editor/query/QueryEditor.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/influxdb/components/editor/query/flux/FluxQueryEditor.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/influxdb/components/editor/query/fsql/FSQLEditor.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/PartListSection.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/TagsSection.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/influxdb/components/editor/variable/VariableQueryEditor.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/loki/components/LokiQueryField.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/loki/configuration/DerivedField.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/loki/querybuilder/components/LokiQueryCodeEditor.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/opentsdb/components/AnnotationEditor.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/prometheus/components/PromExploreExtraField.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/prometheus/components/PromQueryField.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/prometheus/configuration/AlertingSettingsOverhaul.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/prometheus/configuration/AzureCredentialsForm.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/prometheus/configuration/ExemplarSetting.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryCodeEditor.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/AdHocFilter.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/AdHocFilterKey.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/AdHocFilterRenderer.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/AdHocFilterValue.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/ConditionSegment.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/zipkin/QueryField.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/panel/graph/axes_editor.html:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/panel/graph/tab_display.html:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/panel/graph/tab_legend.html:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/panel/graph/tab_series_overrides.html:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/panel/graph/thresholds_form.html:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/panel/graph/time_regions_form.html:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/panel/heatmap/partials/axes_editor.html:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/panel/heatmap/partials/display_editor.html:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/panel/table-old/column_options.html:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/panel/table-old/editor.html:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ]
+  }`
+};
diff --git a/.betterer.results.json b/.betterer.results.json
new file mode 100644
index 0000000000000..d5db475d6b14b
--- /dev/null
+++ b/.betterer.results.json
@@ -0,0 +1,8166 @@
+{
+  "better eslint": {
+    "/e2e/utils/support/types.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/dataframe/ArrayDataFrame.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-data/src/dataframe/CircularDataFrame.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/dataframe/DataFrameJSON.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-data/src/dataframe/DataFrameView.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-data/src/dataframe/MutableDataFrame.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 13
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-data/src/dataframe/StreamingDataFrame.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 6
+      }
+    ],
+    "/packages/grafana-data/src/dataframe/dimensions.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/dataframe/processDataFrame.test.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/dataframe/processDataFrame.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 18
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 5
+      }
+    ],
+    "/packages/grafana-data/src/datetime/datemath.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/datetime/durationutil.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/datetime/formatter.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/datetime/moment_wrapper.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 8
+      }
+    ],
+    "/packages/grafana-data/src/datetime/parser.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 9
+      }
+    ],
+    "/packages/grafana-data/src/datetime/rangeutil.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/events/EventBus.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-data/src/events/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 5
+      }
+    ],
+    "/packages/grafana-data/src/field/displayProcessor.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-data/src/field/overrides/processors.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 6
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-data/src/field/standardFieldConfigEditorRegistry.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 7
+      }
+    ],
+    "/packages/grafana-data/src/geo/layer.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-data/src/panel/PanelPlugin.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 6
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-data/src/panel/registryFactories.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/themes/colorManipulator.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-data/src/themes/createColors.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/transformations/matchers/valueMatchers/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-data/src/transformations/standardTransformersRegistry.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/transformations/transformDataFrame.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/transformations/transformers/joinDataFrames.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/transformations/transformers/nulls/nullInsertThreshold.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-data/src/transformations/transformers/reduce.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-data/src/transformations/transformers/utils.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/types/OptionsUIRegistryBuilder.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 7
+      }
+    ],
+    "/packages/grafana-data/src/types/ScopedVars.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-data/src/types/annotations.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 6
+      }
+    ],
+    "/packages/grafana-data/src/types/app.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-data/src/types/config.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/types/dashboard.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-data/src/types/data.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 4
+      }
+    ],
+    "/packages/grafana-data/src/types/dataFrame.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 4
+      }
+    ],
+    "/packages/grafana-data/src/types/dataLink.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 7
+      }
+    ],
+    "/packages/grafana-data/src/types/datasource.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 25
+      }
+    ],
+    "/packages/grafana-data/src/types/explore.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/types/fieldOverrides.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 9
+      }
+    ],
+    "/packages/grafana-data/src/types/flot.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/types/graph.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-data/src/types/legacyEvents.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-data/src/types/live.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 7
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-data/src/types/options.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-data/src/types/panel.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 14
+      }
+    ],
+    "/packages/grafana-data/src/types/plugin.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/types/select.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-data/src/types/templateVars.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-data/src/types/trace.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/types/transformations.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 5
+      }
+    ],
+    "/packages/grafana-data/src/types/variables.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/types/vector.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-data/src/utils/OptionsUIBuilders.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 27
+      }
+    ],
+    "/packages/grafana-data/src/utils/Registry.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/utils/arrayUtils.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-data/src/utils/csv.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 3
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-data/src/utils/dataLinks.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/utils/datasource.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-data/src/utils/flotPairs.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/utils/location.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/utils/url.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 7
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-data/src/utils/valueMappings.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-data/src/vector/AppendedVectors.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-data/src/vector/ArrayVector.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-data/src/vector/CircularVector.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/vector/ConstantVector.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/vector/FormattedVector.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/src/vector/FunctionalVector.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 10
+      }
+    ],
+    "/packages/grafana-data/src/vector/SortedVector.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-data/test/__mocks__/pluginMocks.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-flamegraph/src/FlameGraph/FlameGraph.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/packages/grafana-flamegraph/src/FlameGraph/FlameGraphMetadata.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/packages/grafana-flamegraph/src/FlameGraph/FlameGraphTooltip.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 6
+      }
+    ],
+    "/packages/grafana-flamegraph/src/FlameGraphHeader.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 13
+      }
+    ],
+    "/packages/grafana-flamegraph/src/TopTable/FlameGraphTopTableContainer.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-o11y-ds-frontend/src/utils.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-prometheus/src/components/PromExemplarField.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-prometheus/src/components/PromExploreExtraField.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-prometheus/src/components/PromQueryField.test.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-prometheus/src/components/PromQueryField.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-prometheus/src/components/PrometheusMetricsBrowser.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 12
+      }
+    ],
+    "/packages/grafana-prometheus/src/components/monaco-query-field/MonacoQueryField.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-prometheus/src/configuration/ConfigEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 16
+      }
+    ],
+    "/packages/grafana-prometheus/src/configuration/ExemplarsSettings.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-prometheus/src/datasource.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 13
+      }
+    ],
+    "/packages/grafana-prometheus/src/gcopypaste/app/features/live/data/amendTimeSeries.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 4
+      }
+    ],
+    "/packages/grafana-prometheus/src/gcopypaste/public/test/matchers/index.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-prometheus/src/gcopypaste/public/test/matchers/toEmitValuesWith.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-prometheus/src/gcopypaste/public/test/matchers/utils.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-prometheus/src/gcopypaste/test/helpers/selectOptionInTest.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-prometheus/src/language_provider.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 5
+      }
+    ],
+    "/packages/grafana-prometheus/src/language_utils.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-prometheus/src/metric_find_query.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 5
+      }
+    ],
+    "/packages/grafana-prometheus/src/query_hints.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-prometheus/src/querybuilder/QueryPattern.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/packages/grafana-prometheus/src/querybuilder/QueryPatternsModal.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-prometheus/src/querybuilder/binaryScalarOperations.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-prometheus/src/querybuilder/components/LabelFilterItem.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 4
+      }
+    ],
+    "/packages/grafana-prometheus/src/querybuilder/components/LabelFilters.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-prometheus/src/querybuilder/components/LabelParamEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-prometheus/src/querybuilder/components/MetricSelect.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 4
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 9
+      }
+    ],
+    "/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilder.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-prometheus/src/querybuilder/components/PromQueryCodeEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/AdditionalSettings.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/ResultsTable.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 13
+      }
+    ],
+    "/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/styles.ts": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 19
+      }
+    ],
+    "/packages/grafana-prometheus/src/querybuilder/operationUtils.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-prometheus/src/querybuilder/shared/OperationEditor.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-prometheus/src/querybuilder/shared/OperationParamEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-prometheus/src/querybuilder/shared/QueryBuilderHints.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-prometheus/src/querybuilder/shared/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-prometheus/src/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-runtime/src/analytics/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-runtime/src/config.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 3
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-runtime/src/services/AngularLoader.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-runtime/src/services/EchoSrv.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 4
+      }
+    ],
+    "/packages/grafana-runtime/src/services/LocationService.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 5
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-runtime/src/services/backendSrv.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 13
+      }
+    ],
+    "/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-runtime/src/utils/queryResponse.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-schema/src/veneer/common.types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-schema/src/veneer/dashboard.types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 5
+      }
+    ],
+    "/packages/grafana-sql/src/components/query-editor-raw/QueryToolbox.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/packages/grafana-sql/src/components/query-editor-raw/QueryValidator.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-sql/src/components/query-editor-raw/RawEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-sql/src/components/visual-query-builder/AwesomeQueryBuilder.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-sql/src/components/visual-query-builder/SQLWhereRow.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/ColorPicker/ColorPicker.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-ui/src/components/DataLinks/DataLinkInput.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/DataSourceSettings/CustomHeadersSettings.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-ui/src/components/DataSourceSettings/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 8
+      }
+    ],
+    "/packages/grafana-ui/src/components/Forms/Legacy/Input/Input.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-ui/src/components/Forms/Legacy/Select/Select.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/Forms/Legacy/Select/SelectOption.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-ui/src/components/InfoBox/InfoBox.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/JSONFormatter/json_explorer/json_explorer.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-ui/src/components/MatchersUI/FieldValueMatcher.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/MatchersUI/fieldMatchersUI.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/Modal/ModalsContext.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 4
+      }
+    ],
+    "/packages/grafana-ui/src/components/PanelChrome/PanelContext.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-ui/src/components/PanelChrome/index.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/Segment/SegmentSelect.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/Select/SelectBase.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 8
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 4
+      }
+    ],
+    "/packages/grafana-ui/src/components/Select/SelectOptionGroup.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-ui/src/components/Select/ValueContainer.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/Select/resetSelectStyles.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 4
+      }
+    ],
+    "/packages/grafana-ui/src/components/Select/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 6
+      }
+    ],
+    "/packages/grafana-ui/src/components/SingleStatShared/SingleStatBaseOptions.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 15
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 5
+      }
+    ],
+    "/packages/grafana-ui/src/components/StatsPicker/StatsPicker.story.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-ui/src/components/Table/Filter.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/Table/FilterPopup.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/Table/FooterRow.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/Table/HeaderRow.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/Table/Table.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/Table/TableCell.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 3
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/Table/TableCellInspectModal.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/Table/reducer.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/Table/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-ui/src/components/Table/utils.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 6
+      }
+    ],
+    "/packages/grafana-ui/src/components/Tags/Tag.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/ValuePicker/ValuePicker.tsx": [
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/VizLegend/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-ui/src/components/VizRepeater/VizRepeater.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 4
+      }
+    ],
+    "/packages/grafana-ui/src/components/VizTooltip/VizTooltip.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-ui/src/components/uPlot/Plot.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-ui/src/components/uPlot/PlotLegend.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-ui/src/components/uPlot/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/uPlot/utils.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-ui/src/graveyard/Graph/GraphContextMenu.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/graveyard/Graph/utils.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/graveyard/GraphNG/GraphNG.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 6
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 6
+      }
+    ],
+    "/packages/grafana-ui/src/graveyard/GraphNG/hooks.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/graveyard/GraphNG/nullInsertThreshold.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-ui/src/graveyard/GraphNG/nullToUndefThreshold.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/graveyard/TimeSeries/utils.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/options/builder/axis.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-ui/src/options/builder/hideSeries.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/slate-plugins/braces.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/slate-plugins/slate-prism/index.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-ui/src/slate-plugins/slate-prism/options.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-ui/src/slate-plugins/suggestions.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/themes/ThemeContext.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-ui/src/themes/stylesFactory.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-ui/src/types/forms.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/types/jquery.d.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 9
+      }
+    ],
+    "/packages/grafana-ui/src/types/mdx.d.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/types/react-table-config.d.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-ui/src/utils/debug.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/utils/dom.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-ui/src/utils/logger.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-ui/src/utils/storybook/withTheme.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-ui/src/utils/useAsyncDependency.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/plugins-bundled/internal/input-datasource/src/InputDatasource.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/core/TableModel.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 7
+      }
+    ],
+    "/public/app/core/components/AppChrome/TopBar/TopSearchBarCommandPaletteTrigger.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/core/components/DynamicImports/SafeDynamicImport.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/core/components/GraphNG/GraphNG.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 6
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 6
+      }
+    ],
+    "/public/app/core/components/GraphNG/hooks.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/core/components/NestedFolderPicker/Trigger.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/core/components/OptionsUI/registry.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 11
+      }
+    ],
+    "/public/app/core/components/PageHeader/PageHeader.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/core/components/PanelTypeFilter/PanelTypeFilter.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/core/components/QueryOperationRow/OperationRowHelp.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/core/components/QueryOperationRow/QueryOperationRow.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/core/components/QueryOperationRow/QueryOperationRowHeader.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 7
+      }
+    ],
+    "/public/app/core/components/RolePicker/RolePickerInput.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 7
+      }
+    ],
+    "/public/app/core/components/RolePicker/ValueContainer.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/core/components/TagFilter/TagFilter.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 5
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/core/components/TagFilter/TagOption.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/core/components/TimeSeries/utils.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/core/components/Upgrade/ProBadge.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/core/components/Upgrade/UpgradeBox.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 18
+      }
+    ],
+    "/public/app/core/components/connectWithCleanUp.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/core/navigation/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/core/reducers/root.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/core/services/ResponseQueue.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/core/services/backend_srv.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 9
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/core/services/context_srv.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/core/services/echo/backends/analytics/ApplicationInsightsBackend.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/core/services/echo/backends/analytics/RudderstackBackend.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/core/specs/backend_srv.test.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/core/time_series2.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 19
+      }
+    ],
+    "/public/app/core/utils/ConfigProvider.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/core/utils/connectWithReduxStore.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 8
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/core/utils/deferred.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/core/utils/fetch.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 5
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/core/utils/flatten.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/core/utils/object.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 3
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/core/utils/richHistory.test.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/core/utils/ticks.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/admin/LicenseChrome.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/admin/OrgRolePicker.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/admin/UpgradePage.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/admin/UserListPublicDashboardPage/DashboardsListModalButton.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 8
+      }
+    ],
+    "/public/app/features/admin/UserListPublicDashboardPage/DeleteUserModalButton.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/admin/UserOrgs.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 17
+      }
+    ],
+    "/public/app/features/admin/UserPermissions.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/admin/UserProfile.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/alerting/AlertTab.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/AlertTabCtrl.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 33
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/EditNotificationChannelPage.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/StateHistory.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/TestRuleResult.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/alerting/components/NotificationChannelForm.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/alerting/components/NotificationChannelOptions.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/components/OptionElement.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/state/ThresholdMapper.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/state/actions.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/alerting/state/alertDef.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/state/query_part.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 11
+      }
+    ],
+    "/public/app/features/alerting/state/reducers.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/AlertGroups.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/AlertWarning.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/AlertsFolderView.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/alerting/unified/GrafanaRuleQueryViewer.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 19
+      }
+    ],
+    "/public/app/features/alerting/unified/NotificationPolicies.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/PanelAlertTabContent.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/alerting/unified/RedirectToRuleViewer.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/alerting/unified/RuleList.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/alerting/unified/components/AlertLabel.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/AlertLabels.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/AlertManagerPicker.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/AlertStateDot.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/AnnotationDetailsField.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/Authorize.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/DetailsField.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/alerting/unified/components/DynamicTable.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 7
+      }
+    ],
+    "/public/app/features/alerting/unified/components/DynamicTableWithGuidelines.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 6
+      }
+    ],
+    "/public/app/features/alerting/unified/components/EmptyArea.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/EmptyAreaWithCTA.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/alerting/unified/components/Expression.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/GrafanaAlertmanagerDeliveryWarning.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/HoverCard.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/alerting/unified/components/Label.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/alerting/unified/components/MetaText.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/Spacer.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/StateColoredText.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/alerting/unified/components/StateTag.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 9
+      }
+    ],
+    "/public/app/features/alerting/unified/components/Tokenize.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/alerting/unified/components/Well.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/admin/AlertmanagerConfig.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/admin/AlertmanagerConfigSelector.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/admin/ExternalAlertmanagerDataSources.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/alerting/unified/components/admin/ExternalAlertmanagers.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/alerting/unified/components/alert-groups/AlertDetails.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/alerting/unified/components/alert-groups/AlertGroupAlertsTable.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/alert-groups/AlertGroupFilter.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/alerting/unified/components/alert-groups/AlertGroupHeader.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/alert-groups/GroupBy.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/alert-groups/MatcherFilter.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/contact-points/ContactPoints.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/export/FileExportPreview.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/alerting/unified/components/expressions/Expression.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 25
+      }
+    ],
+    "/public/app/features/alerting/unified/components/expressions/ExpressionStatusIndicator.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/mute-timings/MuteTimingForm.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/mute-timings/MuteTimingTimeInterval.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/alerting/unified/components/mute-timings/MuteTimingTimeRange.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/alerting/unified/components/mute-timings/MuteTimingsTable.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/notification-policies/EditNotificationPolicyForm.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/alerting/unified/components/notification-policies/Matchers.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/notification-policies/Policy.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/notification-policies/PromDurationDocs.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/alerting/unified/components/notification-policies/formStyles.ts": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 6
+      }
+    ],
+    "/public/app/features/alerting/unified/components/receivers/AlertInstanceModalSelector.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 18
+      }
+    ],
+    "/public/app/features/alerting/unified/components/receivers/PayloadEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 9
+      }
+    ],
+    "/public/app/features/alerting/unified/components/receivers/ReceiversSection.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/receivers/TemplateDataDocs.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 13
+      }
+    ],
+    "/public/app/features/alerting/unified/components/receivers/form/ChannelOptions.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/receivers/form/ChannelSubForm.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/alerting/unified/components/receivers/form/CollapsibleSection.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/alerting/unified/components/receivers/form/GenerateAlertDataModal.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 6
+      }
+    ],
+    "/public/app/features/alerting/unified/components/receivers/form/ReceiverForm.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/receivers/form/TestContactPointModal.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/receivers/form/fields/KeyValueMapInput.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/receivers/form/fields/OptionField.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 5
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/receivers/form/fields/StringArrayInput.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/alerting/unified/components/receivers/form/fields/SubformArrayField.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/receivers/form/fields/SubformField.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/receivers/form/fields/styles.ts": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/AnnotationKeyInput.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/AnnotationsStep.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 11
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/CloudAlertPreview.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/CloudEvaluationBehavior.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/CustomAnnotationHeaderField.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/DashboardAnnotationField.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/DashboardPicker.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 15
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/ExpressionEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/ExpressionsEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 11
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/GroupAndNamespaceFields.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/NeedHelpInfo.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/PreviewRule.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/PreviewRuleResult.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/QueryEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/QueryOptions.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/QueryWrapper.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/RecordingRuleEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/RuleEditorSection.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/RuleFolderPicker.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/RuleInspector.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/VizWrapper.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationPolicyMatchers.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationPreview.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 7
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationPreviewByAlertManager.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationRoute.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 9
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationRouteDetailsModal.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 11
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/CloudDataSourceSelector.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/QueryAndExpressionsStep.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/rule-types/RuleType.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-editor/rule-types/RuleTypePicker.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-viewer/RuleViewer.v1.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 13
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-viewer/RuleViewerLayout.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rule-viewer/RuleViewerVisualization.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rules/ActionButton.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rules/AlertInstanceStateFilter.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rules/CloudRules.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rules/GrafanaRules.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rules/NoRulesCTA.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rules/ReorderRuleGroupModal.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 7
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rules/RuleActionsButtons.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rules/RuleConfigStatus.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rules/RuleDetails.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rules/RuleDetailsActionButtons.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rules/RuleDetailsAnnotations.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rules/RuleDetailsDataSources.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rules/RuleDetailsExpression.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rules/RuleHealth.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rules/RuleListErrors.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rules/RuleListStateSection.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rules/RuleState.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rules/RulesGroup.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 12
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rules/RulesTable.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rules/state-history/LogRecordViewer.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rules/state-history/LokiStateHistory.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 6
+      }
+    ],
+    "/public/app/features/alerting/unified/components/rules/state-history/StateHistory.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/alerting/unified/components/silences/Matchers.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/silences/MatchersField.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/alerting/unified/components/silences/SilenceDetails.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/alerting/unified/components/silences/SilencePeriod.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/components/silences/SilencedAlertsTable.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/alerting/unified/components/silences/SilencedInstancesPreview.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/alerting/unified/components/silences/SilencesEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/alerting/unified/components/silences/SilencesFilter.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/alerting/unified/components/silences/SilencesTable.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/alerting/unified/home/GettingStarted.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 15
+      }
+    ],
+    "/public/app/features/alerting/unified/hooks/useAlertmanagerConfig.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/hooks/useControlledFieldArray.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/hooks/useStateHistoryModal.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/mocks.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 5
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/alerting/unified/state/actions.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/styles/notifications.ts": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/alerting/unified/styles/pagination.ts": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/styles/table.ts": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/alerting/unified/types/receiver-form.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/alerting/unified/utils/misc.test.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/alerting/unified/utils/misc.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/utils/receiver-form.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 3
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/utils/redux.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 7
+      }
+    ],
+    "/public/app/features/alerting/unified/utils/rulerClient.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/alerting/unified/utils/rules.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/annotations/components/StandardAnnotationQueryEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/annotations/events_processing.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/annotations/standardAnnotationSupport.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/api-keys/ApiKeysTable.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/api-keys/MigrateToServiceAccountsCard.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/auth-config/utils/data.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/canvas/element.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/canvas/elements/ellipse.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/canvas/runtime/element.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 5
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/canvas/runtime/frame.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/canvas/runtime/root.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/canvas/runtime/scene.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/connections/components/ConnectionsRedirectNotice/ConnectionsRedirectNotice.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/connections/tabs/ConnectData/CategoryHeader/CategoryHeader.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/connections/tabs/ConnectData/NoAccessModal/NoAccessModal.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 9
+      }
+    ],
+    "/public/app/features/connections/tabs/ConnectData/NoResults/NoResults.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/correlations/CorrelationsPage.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/correlations/Forms/AddCorrelationForm.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/correlations/Forms/ConfigureCorrelationBasicInfoForm.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/correlations/Forms/ConfigureCorrelationSourceForm.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/dashboard-scene/inspect/HelpWizard/utils.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard-scene/inspect/InspectJsonTab.tsx": [
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard-scene/pages/DashboardScenePage.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataPane.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard-scene/saving/SaveDashboardForm.tsx": [
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 2
+      }
+    ],
+    "/public/app/features/dashboard-scene/saving/getSaveDashboardChange.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/dashboard-scene/saving/shared.tsx": [
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard-scene/scene/PanelMenuBehavior.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.test.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 10
+      }
+    ],
+    "/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 7
+      }
+    ],
+    "/public/app/features/dashboard-scene/settings/variables/components/VariableSelectField.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard-scene/settings/variables/utils.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard-scene/utils/DashboardModelCompatibilityWrapper.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard-scene/utils/PanelModelCompatibilityWrapper.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard-scene/utils/test-utils.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/dashboard/components/AddWidgetModal/AddWidgetModal.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsEdit.tsx": [
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 4
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsList.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 6
+      }
+    ],
+    "/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 7
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/dashboard/components/DashNav/DashNavButton.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/components/DashboardLoading/DashboardFailed.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/components/DashboardLoading/DashboardLoading.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/dashboard/components/DashboardPrompt/DashboardPrompt.test.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/components/DashboardPrompt/DashboardPrompt.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 7
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/dashboard/components/DashboardRow/DashboardRow.test.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/components/DashboardSettings/ListNewButton.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/components/DeleteDashboard/DeleteDashboardModal.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/components/HelpWizard/HelpWizard.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/dashboard/components/Inspector/PanelInspector.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/components/PanelEditor/DynamicConfigValueEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/dashboard/components/PanelEditor/OptionsPane.tsx": [
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/dashboard/components/PanelEditor/OptionsPaneCategory.tsx": [
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 2
+      }
+    ],
+    "/public/app/features/dashboard/components/PanelEditor/OptionsPaneItemDescriptor.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/components/PanelEditor/OptionsPaneOptions.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 10
+      }
+    ],
+    "/public/app/features/dashboard/components/PanelEditor/OverrideCategoryTitle.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/dashboard/components/PanelEditor/PanelEditor.tsx": [
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 3
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 10
+      }
+    ],
+    "/public/app/features/dashboard/components/PanelEditor/PanelEditorTabs.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/dashboard/components/PanelEditor/VisualizationButton.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/dashboard/components/PanelEditor/VisualizationSelectPane.tsx": [
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 10
+      }
+    ],
+    "/public/app/features/dashboard/components/PanelEditor/getFieldOverrideElements.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/components/PanelEditor/getVisualizationOptions.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/dashboard/components/PanelEditor/utils.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 4
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/dashboard/components/PublicDashboardNotAvailable/PublicDashboardNotAvailable.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/dashboard/components/RowOptions/RowOptionsModal.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/components/SaveDashboard/SaveDashboardButton.tsx": [
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 2
+      }
+    ],
+    "/public/app/features/dashboard/components/SaveDashboard/SaveDashboardErrorProxy.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/dashboard/components/SaveDashboard/UnsavedChangesModal.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardAsForm.test.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardForm.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 3
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/components/SaveDashboard/forms/SaveProvisionedDashboardForm.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/components/SaveDashboard/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/components/SaveDashboard/useDashboardSave.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/components/ShareModal/ShareExport.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/ConfigPublicDashboard.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/EmailSharingConfiguration.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 6
+      }
+    ],
+    "/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/SettingsSummary.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/CreatePublicDashboard/AcknowledgeCheckboxes.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/CreatePublicDashboard/CreatePublicDashboard.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 6
+      }
+    ],
+    "/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/UnsupportedDataSourcesAlert.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/components/SubMenu/AnnotationPicker.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/dashboard/components/SubMenu/DashboardLinksDashboard.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/components/SubMenu/SubMenu.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/dashboard/components/TransformationsEditor/TransformationEditor.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 10
+      }
+    ],
+    "/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/dashboard/components/VersionHistory/useDashboardRestore.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/containers/DashboardPage.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      },
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/containers/DashboardPageProxy.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/dashgrid/SeriesVisibilityConfigFactory.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/services/DashboardLoaderSrv.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/dashboard/state/DashboardMigrator.test.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 12
+      }
+    ],
+    "/public/app/features/dashboard/state/DashboardMigrator.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 27
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/dashboard/state/DashboardModel.repeat.test.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/dashboard/state/DashboardModel.test.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/state/DashboardModel.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 23
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/state/PanelModel.test.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/state/PanelModel.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 20
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/dashboard/state/TimeModel.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/dashboard/state/actions.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/state/initDashboard.test.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/utils/getPanelMenu.test.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/utils/getPanelMenu.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/utils/panelMerge.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/datasources/components/BasicSettings.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/datasources/components/DataSourceTestingStatus.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/datasources/components/DataSourceTypeCard.tsx": [
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 1
+      }
+    ],
+    "/public/app/features/datasources/components/DataSourceTypeCardList.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/datasources/components/EditDataSource.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/datasources/components/picker/DataSourceCard.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 9
+      }
+    ],
+    "/public/app/features/datasources/components/picker/DataSourceList.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/datasources/components/picker/DataSourceLogo.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/datasources/components/picker/DataSourceModal.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 10
+      }
+    ],
+    "/public/app/features/datasources/state/actions.test.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/datasources/state/actions.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/datasources/state/navModel.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/datasources/state/reducers.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/datasources/state/selectors.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/dimensions/editors/ColorDimensionEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/dimensions/editors/FileUploader.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 8
+      }
+    ],
+    "/public/app/features/dimensions/editors/FolderPickerTab.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dimensions/editors/ResourceCards.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/dimensions/editors/ResourceDimensionEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dimensions/editors/ResourcePicker.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/dimensions/editors/ResourcePickerPopover.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/dimensions/editors/ScalarDimensionEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dimensions/editors/ScaleDimensionEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dimensions/editors/TextDimensionEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/dimensions/editors/ThresholdsEditor/ThresholdsEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 8
+      }
+    ],
+    "/public/app/features/dimensions/editors/URLPickerTab.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/dimensions/editors/ValueMappingsEditor/ValueMappingsEditorModal.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dimensions/scale.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dimensions/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dimensions/utils.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/explore/ContentOutline/ContentOutline.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/explore/Logs/LiveLogs.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/explore/Logs/Logs.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/explore/Logs/LogsMetaRow.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/explore/Logs/LogsNavigation.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/explore/Logs/LogsNavigationPages.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/explore/Logs/LogsSamplePanel.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/explore/Logs/LogsVolumePanel.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/explore/Logs/LogsVolumePanelList.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/explore/Logs/utils/LogsCrossFadeTransition.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/explore/NodeGraph/NodeGraphContainer.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/explore/PrometheusListView/ItemLabels.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/explore/PrometheusListView/ItemValues.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/explore/PrometheusListView/RawListContainer.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 6
+      }
+    ],
+    "/public/app/features/explore/PrometheusListView/RawListItem.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/explore/PrometheusListView/RawListItemAttributes.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/explore/RichHistory/RichHistoryCard.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 14
+      }
+    ],
+    "/public/app/features/explore/RichHistory/RichHistoryQueriesTab.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 14
+      }
+    ],
+    "/public/app/features/explore/RichHistory/RichHistorySettingsTab.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/explore/RichHistory/RichHistoryStarredTab.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 7
+      }
+    ],
+    "/public/app/features/explore/TraceView/TraceView.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TracePageHeader/Actions/ActionButton.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/NextPrevResult.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 6
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/TracePageSearchBar.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 6
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/CanvasSpanGraph.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/GraphTicks.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/Scrubber.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/TickLabels.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/ViewingLayer.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 8
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TracePageHeader/TracePageHeader.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 9
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBarRow.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 22
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianKeyValues.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 8
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianLogs.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianReferences.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 14
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianText.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/KeyValuesTable.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 6
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/SpanFlameGraph.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/TextList.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 11
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetailRow.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanLinks.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanTreeOffset.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 6
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TraceTimelineViewer/Ticks.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineCollapser.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineColumnResizer.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 8
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineHeaderRow.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineViewingLayer.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 8
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/common/BreakableText.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/common/CopyIcon.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/common/LabeledList.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/common/NewWindowIcon.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/common/TraceName.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/demo/trace-generators.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/model/link-patterns.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 10
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/model/transform-trace-data.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/settings/SpanBarSettings.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/explore/TraceView/components/types/trace.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/explore/TraceView/createSpanLink.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/explore/spec/helper/setup.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/explore/state/time.test.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/explore/state/utils.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 4
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/expressions/ExpressionDatasource.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/expressions/components/Condition.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/expressions/components/Math.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 7
+      }
+    ],
+    "/public/app/features/expressions/guards.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/geo/editor/GazetteerPathEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/geo/editor/locationModeEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/geo/gazetteer/gazetteer.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/geo/utils/frameVectorSource.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/inspector/DetailText.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/inspector/InspectDataOptions.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/inspector/InspectDataTab.tsx": [
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 1
+      }
+    ],
+    "/public/app/features/inspector/InspectJSONTab.tsx": [
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 1
+      }
+    ],
+    "/public/app/features/inspector/InspectStatsTab.tsx": [
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/inspector/InspectStatsTable.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/inspector/InspectStatsTraceIdsTable.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/inspector/QueryInspector.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      },
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 2
+      }
+    ],
+    "/public/app/features/inspector/styles.ts": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 11
+      }
+    ],
+    "/public/app/features/library-panels/components/LibraryPanelInfo/LibraryPanelInfo.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/library-panels/components/LibraryPanelsSearch/LibraryPanelsSearch.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 9
+      }
+    ],
+    "/public/app/features/library-panels/components/LibraryPanelsView/actions.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/library-panels/components/OpenLibraryPanelModal/OpenLibraryPanelModal.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/library-panels/components/PanelLibraryOptionsGroup/PanelLibraryOptionsGroup.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/library-panels/styles.ts": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 6
+      }
+    ],
+    "/public/app/features/library-panels/utils.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/live/LiveConnectionWarning.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/live/centrifuge/LiveDataStream.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/live/centrifuge/channel.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/live/centrifuge/serviceWorkerProxy.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/live/data/amendTimeSeries.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/logs/components/LoadingIndicator.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/logs/components/LogDetailsRow.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 7
+      }
+    ],
+    "/public/app/features/logs/components/LogLabelStats.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/logs/components/LogLabelStatsRow.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 8
+      }
+    ],
+    "/public/app/features/logs/components/LogLabels.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/logs/components/LogRowMessageDisplayedFields.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/logs/components/getLogRowStyles.ts": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 36
+      }
+    ],
+    "/public/app/features/logs/components/log-context/LogRowContextModal.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 13
+      }
+    ],
+    "/public/app/features/logs/utils.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/manage-dashboards/DashboardImportPage.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/manage-dashboards/components/ImportDashboardLibraryPanelsList.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/manage-dashboards/components/PublicDashboardListTable/DeletePublicDashboardModal.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 6
+      }
+    ],
+    "/public/app/features/manage-dashboards/state/actions.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 14
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/manage-dashboards/state/reducers.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 4
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/org/state/actions.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/org/state/reducers.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/panel/components/VizTypePicker/PanelTypeCard.tsx": [
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 1
+      }
+    ],
+    "/public/app/features/panel/components/VizTypePicker/VisualizationSuggestionCard.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/panel/panellinks/linkSuppliers.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/panel/panellinks/link_srv.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/playlist/EmptyQueryListBanner.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/playlist/PlaylistForm.tsx": [
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 2
+      }
+    ],
+    "/public/app/features/playlist/PlaylistTableRows.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/plugins/admin/components/Badges/PluginUpdateAvailableBadge.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/plugins/admin/components/Badges/sharedStyles.ts": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/plugins/admin/components/GetStartedWithPlugin/GetStartedWithDataSource.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/plugins/admin/components/HorizontalGroup.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/plugins/admin/components/InstallControls/InstallControlsWarning.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/plugins/admin/components/PluginActions.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/plugins/admin/components/PluginDetailsBody.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/plugins/admin/components/PluginDetailsHeaderDependencies.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/plugins/admin/components/PluginDetailsHeaderSignature.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/plugins/admin/components/PluginDetailsPage.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/plugins/admin/components/PluginSignatureDetailsBadge.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/plugins/admin/components/PluginSubtitle.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/plugins/admin/components/PluginUsage.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/plugins/admin/components/VersionList.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/plugins/admin/hooks/useHistory.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/plugins/admin/hooks/usePluginInfo.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/plugins/admin/pages/Browse.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/plugins/admin/state/actions.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/plugins/admin/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/plugins/datasource_srv.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 5
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 8
+      }
+    ],
+    "/public/app/features/plugins/sandbox/distortion_map.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/plugins/sandbox/sandbox_plugin_loader.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/plugins/tests/datasource_srv.test.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/plugins/utils.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/profile/ChangePasswordForm.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/query/components/QueryEditorRow.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 4
+      },
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 1
+      }
+    ],
+    "/public/app/features/query/components/QueryEditorRowHeader.tsx": [
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 8
+      }
+    ],
+    "/public/app/features/query/components/QueryGroup.tsx": [
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 2
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 7
+      }
+    ],
+    "/public/app/features/query/components/QueryGroupOptions.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/query/state/DashboardQueryRunner/AnnotationsQueryRunner.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/query/state/DashboardQueryRunner/DashboardQueryRunner.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/query/state/DashboardQueryRunner/PublicAnnotationsDataSource.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/query/state/DashboardQueryRunner/testHelpers.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/query/state/DashboardQueryRunner/utils.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/query/state/PanelQueryRunner.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/query/state/runRequest.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/query/state/updateQueries.test.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 11
+      }
+    ],
+    "/public/app/features/search/page/components/ActionRow.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/search/page/components/SearchResultsTable.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 13
+      }
+    ],
+    "/public/app/features/search/page/components/columns.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/search/service/bluge.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/search/service/sql.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/search/service/utils.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/search/state/SearchStateManager.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/search/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/search/utils.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/serviceaccounts/components/CreateTokenModal.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/serviceaccounts/components/ServiceAccountProfile.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/serviceaccounts/components/ServiceAccountProfileRow.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/serviceaccounts/components/ServiceAccountTokensTable.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 7
+      }
+    ],
+    "/public/app/features/serviceaccounts/state/reducers.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/storage/Breadcrumb.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/storage/FileView.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 7
+      }
+    ],
+    "/public/app/features/storage/FolderView.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/storage/RootView.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/storage/StoragePage.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 6
+      }
+    ],
+    "/public/app/features/storage/UploadButton.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/storage/storage.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/teams/TeamGroupSync.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/teams/state/reducers.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/teams/state/selectors.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/templating/fieldAccessorCache.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/templating/formatVariableValue.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/templating/templateProxies.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/templating/template_srv.mock.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/templating/template_srv.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 10
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/transformers/FilterByValueTransformer/ValueMatchers/BasicMatcherEditor.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/transformers/FilterByValueTransformer/ValueMatchers/NoopMatcherEditor.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/transformers/FilterByValueTransformer/ValueMatchers/RangeMatcherEditor.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/transformers/FilterByValueTransformer/ValueMatchers/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/transformers/FilterByValueTransformer/ValueMatchers/utils.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/transformers/FilterByValueTransformer/ValueMatchers/valueMatchersUI.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/transformers/calculateHeatmap/editor/helper.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/transformers/calculateHeatmap/heatmap.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/transformers/configFromQuery/ConfigFromQueryTransformerEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/transformers/editors/CalculateFieldTransformerEditor/CumulativeOptionsEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/transformers/editors/CalculateFieldTransformerEditor/ReduceRowOptionsEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/transformers/editors/CalculateFieldTransformerEditor/WindowOptionsEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/transformers/editors/ConvertFieldTypeTransformerEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/transformers/editors/GroupByTransformerEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/transformers/editors/OrganizeFieldsTransformerEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/transformers/editors/ReduceTransformerEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/transformers/editors/SortByTransformerEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/transformers/extractFields/ExtractFieldsTransformerEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/transformers/extractFields/components/JSONPathEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/transformers/extractFields/extractFields.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/transformers/extractFields/fieldExtractors.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/transformers/fieldToConfigMapping/FieldToConfigMappingEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/transformers/fieldToConfigMapping/fieldToConfigMapping.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/transformers/lookupGazetteer/FieldLookupTransformerEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/transformers/lookupGazetteer/fieldLookup.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/transformers/prepareTimeSeries/PrepareTimeSeriesEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.test.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/transformers/spatial/SpatialTransformerEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/transformers/spatial/optionsHelper.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/transformers/standardTransformers.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/users/TokenRevokedModal.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/variables/adapters.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/variables/adhoc/picker/AdHocFilterRenderer.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/variables/constant/reducer.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/variables/custom/reducer.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/variables/datasource/actions.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/variables/editor/VariableEditorContainer.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/variables/editor/VariableEditorEditor.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/variables/editor/VariableEditorList.tsx": [
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 2
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/variables/editor/VariableEditorListRow.tsx": [
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 4
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 7
+      }
+    ],
+    "/public/app/features/variables/editor/getVariableQueryEditor.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/variables/editor/reducer.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/variables/editor/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/variables/guard.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/variables/inspect/NetworkGraph.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 7
+      }
+    ],
+    "/public/app/features/variables/inspect/VariablesUnknownTable.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/variables/inspect/utils.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 8
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/variables/pickers/OptionsPicker/actions.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/variables/pickers/shared/VariableLink.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/variables/pickers/shared/VariableOptions.tsx": [
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 1
+      }
+    ],
+    "/public/app/features/variables/query/QueryVariableEditor.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/variables/query/VariableQueryRunner.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/variables/query/actions.test.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/variables/query/actions.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/variables/query/operators.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/variables/query/queryRunners.test.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/variables/query/queryRunners.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/variables/query/reducer.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/variables/query/variableQueryObserver.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/variables/shared/formatVariable.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/variables/shared/testing/optionsVariableBuilder.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/variables/shared/testing/variableBuilder.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/variables/state/actions.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 7
+      }
+    ],
+    "/public/app/features/variables/state/keyedVariablesReducer.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/variables/state/sharedReducer.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/variables/state/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/variables/state/upgradeLegacyQueries.test.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/variables/system/adapter.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 4
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/variables/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/variables/utils.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 6
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/visualization/data-hover/DataHoverRows.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/alertmanager/DataSource.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/alertmanager/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/azuremonitor/azure_monitor/azure_monitor_datasource.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/QueryField.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/azuremonitor/utils/messageFromError.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/cloud-monitoring/CloudMonitoringMetricFindQuery.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/cloud-monitoring/annotationSupport.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/cloud-monitoring/components/Aggregation.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/cloud-monitoring/components/CloudMonitoringCheatSheet.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/cloud-monitoring/components/VariableQueryEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/cloud-monitoring/datasource.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/cloud-monitoring/functions.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/cloud-monitoring/types/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/cloudwatch/components/CheatSheet/LogsCheatSheet.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/XrayLinkConfig.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryFieldOld.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/DynamicLabelsField.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LegacyLogGroupNamesSelection.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/cloudwatch/datasource.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/cloudwatch/guards.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs/CloudWatchLogsLanguageProvider.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/cloudwatch/memoizedDebounce.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/cloudwatch/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 7
+      }
+    ],
+    "/public/app/plugins/datasource/cloudwatch/utils/datalinks.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/cloudwatch/utils/logsRetry.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/dashboard/runSharedRequest.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/ElasticResponse.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 32
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/LanguageProvider.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 4
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/LegacyQueryRunner.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/QueryBuilder.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 8
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/components/AddRemove.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/components/MetricPicker.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/BucketAggregationEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/DateHistogramSettingsEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/FiltersSettingsEditor/index.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/TermsSettingsEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/aggregations.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/state/reducer.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/MetricEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/BucketScriptSettingsEditor/index.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/SettingField.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/TopMetricsSettingsEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/aggregations.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/state/reducer.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/styles.ts": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorRow.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/components/QueryEditor/SettingsEditorContainer.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/components/QueryEditor/index.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/components/QueryEditor/styles.ts": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/configuration/DataLink.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 6
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/configuration/DataLinks.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/datasource.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 5
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/hooks/useStatelessReducer.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/test-helpers/render.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/LabelsEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/grafana-pyroscope-datasource/utils.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/grafana-testdata-datasource/QueryEditor.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/grafana-testdata-datasource/components/RandomWalkEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/grafana-testdata-datasource/components/SimulationQueryEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/grafana-testdata-datasource/components/SimulationSchemaForm.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/grafana-testdata-datasource/datasource.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/grafana-testdata-datasource/nodeGraphUtils.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/grafana-testdata-datasource/runStreams.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/grafana/components/AnnotationQueryEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/grafana/components/QueryEditor.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 4
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/grafana/components/TimePickerInput.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/plugins/datasource/grafana/components/TimeRegionEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/grafana/datasource.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 7
+      }
+    ],
+    "/public/app/plugins/datasource/graphite/components/AddGraphiteFunction.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/graphite/components/FunctionParamEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/graphite/components/GraphiteFunctionEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/graphite/components/GraphiteQueryEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/graphite/components/MetricTankMetaInspector.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 10
+      }
+    ],
+    "/public/app/plugins/datasource/graphite/components/TagsSection.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/graphite/components/helpers.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/graphite/datasource.test.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/graphite/datasource.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 51
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 4
+      }
+    ],
+    "/public/app/plugins/datasource/graphite/gfunc.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 9
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/graphite/graphite_query.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 19
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/graphite/lexer.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 7
+      }
+    ],
+    "/public/app/plugins/datasource/graphite/migrations.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/graphite/specs/graphite_query.test.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/graphite/specs/store.test.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/graphite/state/context.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/graphite/state/helpers.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/graphite/state/store.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/graphite/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/graphite/utils.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/influxdb/components/editor/config/ConfigEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/influxdb/components/editor/query/flux/FluxQueryEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/influxdb/components/editor/query/fsql/FSQLEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/VisualInfluxQLEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/influxdb/datasource.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 14
+      }
+    ],
+    "/public/app/plugins/datasource/influxdb/influx_query_model.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 13
+      }
+    ],
+    "/public/app/plugins/datasource/influxdb/influx_series.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 19
+      }
+    ],
+    "/public/app/plugins/datasource/influxdb/migrations.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/influxdb/mocks.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 4
+      }
+    ],
+    "/public/app/plugins/datasource/influxdb/query_part.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 16
+      }
+    ],
+    "/public/app/plugins/datasource/influxdb/response_parser.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/jaeger/CheatSheet.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/jaeger/configuration/ConfigEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/jaeger/configuration/TraceIdTimeParams.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/jaeger/datasource.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/jaeger/testResponse.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/jaeger/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/loki/LanguageProvider.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/loki/LiveStreams.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/loki/components/LokiContextUi.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 11
+      }
+    ],
+    "/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 14
+      }
+    ],
+    "/public/app/plugins/datasource/loki/components/LokiOptionFields.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/loki/configuration/DerivedField.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 7
+      }
+    ],
+    "/public/app/plugins/datasource/loki/configuration/DerivedFields.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/plugins/datasource/loki/datasource.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 6
+      }
+    ],
+    "/public/app/plugins/datasource/loki/queryUtils.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/loki/querybuilder/binaryScalarOperations.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryCodeEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/loki/querybuilder/components/QueryPattern.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/plugins/datasource/loki/querybuilder/components/QueryPatternsModal.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/loki/streaming.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/opentsdb/components/OpenTsdbQueryEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/opentsdb/datasource.d.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/opentsdb/datasource.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 57
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/opentsdb/migrations.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/parca/QueryEditor/LabelsEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/components/PromExemplarField.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/components/PromExploreExtraField.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/components/PromQueryField.test.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/components/PrometheusMetricsBrowser.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 12
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/components/monaco-query-field/MonacoQueryField.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/configuration/AzureCredentialsConfig.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 18
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/configuration/ConfigEditor.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 4
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 16
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/configuration/ExemplarsSettings.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/datasource.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 13
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/language_provider.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 5
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/language_utils.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/metric_find_query.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 5
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/query_hints.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/querybuilder/QueryPattern.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/querybuilder/QueryPatternsModal.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/querybuilder/binaryScalarOperations.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/querybuilder/components/LabelFilterItem.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 4
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/querybuilder/components/LabelFilters.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/querybuilder/components/LabelParamEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 4
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 9
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryCodeEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/AdditionalSettings.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/ResultsTable.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 13
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/styles.ts": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 19
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/querybuilder/operationUtils.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/querybuilder/shared/LabelFilterItem.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 8
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/querybuilder/shared/LabelFilters.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationEditor.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationParamEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/querybuilder/shared/QueryBuilderHints.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/querybuilder/shared/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/tempo/LokiSearch.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/tempo/ServiceGraphSection.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/AdHocFilterRenderer.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/tempo/_importedDependencies/datasources/loki/LanguageProvider.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/tempo/_importedDependencies/datasources/loki/monaco-query-field/MonacoQueryField.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      },
+      {
+        "message": "Use data-testid for E2E selectors instead of aria-label",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/tempo/_importedDependencies/datasources/loki/monaco-query-field/monaco-completion-provider/CompletionDataProvider.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/tempo/_importedDependencies/datasources/loki/monaco-query-field/monaco-completion-provider/index.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/tempo/_importedDependencies/datasources/loki/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 4
+      }
+    ],
+    "/public/app/plugins/datasource/tempo/_importedDependencies/datasources/prometheus/language_utils.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/tempo/_importedDependencies/datasources/prometheus/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/tempo/_importedDependencies/store.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/tempo/_importedDependencies/test/helpers/createFetchResponse.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/tempo/configuration/TraceQLSearchSettings.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/tempo/datasource.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 4
+      }
+    ],
+    "/public/app/plugins/datasource/tempo/language_provider.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/tempo/resultTransformer.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 4
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 4
+      }
+    ],
+    "/public/app/plugins/datasource/zipkin/ConfigEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/zipkin/QueryField.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/zipkin/datasource.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/zipkin/utils/testResponse.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/zipkin/utils/transforms.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/alertGroups/AlertGroup.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 7
+      }
+    ],
+    "/public/app/plugins/panel/alertlist/AlertInstances.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/panel/alertlist/AlertList.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 10
+      }
+    ],
+    "/public/app/plugins/panel/alertlist/AlertListMigrationHandler.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/panel/alertlist/UnifiedAlertList.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 17
+      }
+    ],
+    "/public/app/plugins/panel/alertlist/unified-alerting/UngroupedView.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 7
+      }
+    ],
+    "/public/app/plugins/panel/annolist/AnnoListPanel.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/barchart/BarChartPanel.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/panel/barchart/bars.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/barchart/module.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/barchart/quadtree.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/candlestick/CandlestickPanel.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/canvas/editor/element/APIEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/canvas/editor/element/PlacementEditor.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/canvas/editor/element/elementEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/canvas/editor/inline/InlineEditBody.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 3
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/canvas/editor/layer/TreeNavigationEditor.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/canvas/editor/layer/layerEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/panel/canvas/globalStyles.ts": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/dashlist/styles.ts": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 7
+      }
+    ],
+    "/public/app/plugins/panel/datagrid/utils.ts": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/panel/debug/CursorView.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/debug/EventBusLogger.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/panel/gauge/GaugeMigrations.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/geomap/components/MarkersLegend.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/geomap/editor/GeomapStyleRulesEditor.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/geomap/editor/StyleEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 12
+      }
+    ],
+    "/public/app/plugins/panel/geomap/editor/StyleRuleEditor.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/geomap/layers/basemaps/esri.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/geomap/layers/data/geojsonDynamic.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/geomap/layers/data/routeLayer.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/geomap/layers/registry.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/panel/geomap/migrations.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/panel/geomap/utils/layers.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/geomap/utils/tooltip.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/gettingstarted/components/DocsCard.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/plugins/panel/gettingstarted/components/Step.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 4
+      }
+    ],
+    "/public/app/plugins/panel/gettingstarted/components/TutorialCard.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 6
+      }
+    ],
+    "/public/app/plugins/panel/gettingstarted/components/sharedStyles.ts": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/heatmap/HeatmapPanel.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/heatmap/migrations.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/heatmap/palettes.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/heatmap/types.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/heatmap/utils.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 17
+      }
+    ],
+    "/public/app/plugins/panel/histogram/Histogram.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/live/LiveChannelEditor.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/live/LivePanel.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 7
+      }
+    ],
+    "/public/app/plugins/panel/live/types.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/logs/LogsPanel.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/nodeGraph/Edge.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/nodeGraph/EdgeLabel.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/nodeGraph/Legend.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/panel/nodeGraph/Marker.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/panel/nodeGraph/Node.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 9
+      }
+    ],
+    "/public/app/plugins/panel/nodeGraph/NodeGraph.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 10
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 4
+      }
+    ],
+    "/public/app/plugins/panel/nodeGraph/ViewControls.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/nodeGraph/editor/ArcOptionsEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/nodeGraph/layout.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/panel/nodeGraph/useContextMenu.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/panel/piechart/PieChart.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 5
+      }
+    ],
+    "/public/app/plugins/panel/piechart/migrations.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/panel/stat/StatMigrations.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/state-timeline/migrations.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/panel/table/TablePanel.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/panel/table/cells/SparklineCellOptionsEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/table/migrations.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 6
+      }
+    ],
+    "/public/app/plugins/panel/text/TextPanel.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/panel/text/TextPanelEditor.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/text/textPanelMigrationHandler.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/timeseries/TimezonesEditor.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/panel/timeseries/migrations.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 6
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 4
+      }
+    ],
+    "/public/app/plugins/panel/timeseries/plugins/AnnotationsPlugin2.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/timeseries/plugins/ThresholdDragHandle.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 7
+      }
+    ],
+    "/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationEditorForm.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 7
+      }
+    ],
+    "/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationTooltip.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 9
+      }
+    ],
+    "/public/app/plugins/panel/timeseries/plugins/annotations2/AnnotationEditor2.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/timeseries/plugins/annotations2/AnnotationMarker2.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/timeseries/plugins/annotations2/AnnotationTooltip2.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/timeseries/plugins/styles.ts": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/panel/traces/TracesPanel.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/welcome/Welcome.tsx": [
+      {
+        "message": "Styles should be written using objects.",
+        "count": 6
+      }
+    ],
+    "/public/app/plugins/panel/xychart/AutoEditor.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Styles should be written using objects.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/panel/xychart/ManualEditor.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/xychart/TooltipView.tsx": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/xychart/XYChartPanel.tsx": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/panel/xychart/scatter.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 7
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 4
+      }
+    ],
+    "/public/app/store/configureStore.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/store/store.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      },
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/types/alerting.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 5
+      }
+    ],
+    "/public/app/types/appEvent.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 7
+      }
+    ],
+    "/public/app/types/dashboard.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/app/types/events.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 13
+      }
+    ],
+    "/public/app/types/jquery/jquery.d.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 9
+      }
+    ],
+    "/public/app/types/store.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      },
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/app/types/unified-alerting-dto.ts": [
+      {
+        "message": "Do not use any type assertions.",
+        "count": 1
+      }
+    ],
+    "/public/test/core/redux/reduxTester.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 6
+      }
+    ],
+    "/public/test/core/thunk/thunkTester.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 8
+      }
+    ],
+    "/public/test/global-jquery-shim.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/test/helpers/getDashboardModel.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/test/helpers/initTemplateSrv.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/test/jest-setup.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/test/lib/common.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 1
+      }
+    ],
+    "/public/test/specs/helpers.ts": [
+      {
+        "message": "Unexpected any. Specify a different type.",
+        "count": 11
+      }
+    ]
+  },
+  "no undocumented stories": {
+    "/packages/grafana-ui/src/components/ButtonCascader/ButtonCascader.story.tsx": [
+      {
+        "message": "No undocumented stories are allowed, please add an .mdx file with some documentation",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.story.tsx": [
+      {
+        "message": "No undocumented stories are allowed, please add an .mdx file with some documentation",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/DateTimePickers/RelativeTimeRangePicker/RelativeTimeRangePicker.story.tsx": [
+      {
+        "message": "No undocumented stories are allowed, please add an .mdx file with some documentation",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/DateTimePickers/TimeOfDayPicker.story.tsx": [
+      {
+        "message": "No undocumented stories are allowed, please add an .mdx file with some documentation",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.story.tsx": [
+      {
+        "message": "No undocumented stories are allowed, please add an .mdx file with some documentation",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/DateTimePickers/TimeZonePicker.story.tsx": [
+      {
+        "message": "No undocumented stories are allowed, please add an .mdx file with some documentation",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/DateTimePickers/WeekStartPicker.story.tsx": [
+      {
+        "message": "No undocumented stories are allowed, please add an .mdx file with some documentation",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/PageLayout/PageToolbar.story.tsx": [
+      {
+        "message": "No undocumented stories are allowed, please add an .mdx file with some documentation",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/QueryField/QueryField.story.tsx": [
+      {
+        "message": "No undocumented stories are allowed, please add an .mdx file with some documentation",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/SecretTextArea/SecretTextArea.story.tsx": [
+      {
+        "message": "No undocumented stories are allowed, please add an .mdx file with some documentation",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/Segment/Segment.story.tsx": [
+      {
+        "message": "No undocumented stories are allowed, please add an .mdx file with some documentation",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/Segment/SegmentAsync.story.tsx": [
+      {
+        "message": "No undocumented stories are allowed, please add an .mdx file with some documentation",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/Segment/SegmentInput.story.tsx": [
+      {
+        "message": "No undocumented stories are allowed, please add an .mdx file with some documentation",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/Slider/RangeSlider.story.tsx": [
+      {
+        "message": "No undocumented stories are allowed, please add an .mdx file with some documentation",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/Slider/Slider.story.tsx": [
+      {
+        "message": "No undocumented stories are allowed, please add an .mdx file with some documentation",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/StatsPicker/StatsPicker.story.tsx": [
+      {
+        "message": "No undocumented stories are allowed, please add an .mdx file with some documentation",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/ThemeDemos/ThemeDemo.story.tsx": [
+      {
+        "message": "No undocumented stories are allowed, please add an .mdx file with some documentation",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/VizLayout/VizLayout.story.tsx": [
+      {
+        "message": "No undocumented stories are allowed, please add an .mdx file with some documentation",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/VizLegend/VizLegend.story.tsx": [
+      {
+        "message": "No undocumented stories are allowed, please add an .mdx file with some documentation",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/VizTooltip/SeriesTable.story.tsx": [
+      {
+        "message": "No undocumented stories are allowed, please add an .mdx file with some documentation",
+        "count": 1
+      }
+    ]
+  },
+  "no gf-form usage": {
+    "/e2e/utils/flows/addDataSource.ts": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-e2e/src/flows/addDataSource.ts": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-prometheus/src/components/PromExploreExtraField.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 4
+      }
+    ],
+    "/packages/grafana-prometheus/src/components/PromQueryField.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 6
+      }
+    ],
+    "/packages/grafana-prometheus/src/configuration/AlertingSettingsOverhaul.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-prometheus/src/configuration/ExemplarSetting.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-prometheus/src/configuration/PromSettings.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 25
+      }
+    ],
+    "/packages/grafana-prometheus/src/querybuilder/components/PromQueryCodeEditor.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/DataSourceSettings/AlertingSettings.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-ui/src/components/DataSourceSettings/CustomHeadersSettings.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 16
+      }
+    ],
+    "/packages/grafana-ui/src/components/DataSourceSettings/HttpProxySettings.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-ui/src/components/DataSourceSettings/SecureSocksProxySettings.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-ui/src/components/DataSourceSettings/TLSAuthSettings.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-ui/src/components/FormField/FormField.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/FormLabel/FormLabel.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 3
+      }
+    ],
+    "/packages/grafana-ui/src/components/Forms/Legacy/Input/Input.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/Forms/Legacy/Select/NoOptionsMessage.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-ui/src/components/Forms/Legacy/Select/Select.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 6
+      }
+    ],
+    "/packages/grafana-ui/src/components/Forms/Legacy/Select/SelectOption.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 4
+      }
+    ],
+    "/packages/grafana-ui/src/components/Forms/Legacy/Switch/Switch.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 8
+      }
+    ],
+    "/packages/grafana-ui/src/components/SecretFormField/SecretFormField.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-ui/src/components/Segment/Segment.story.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-ui/src/components/Segment/SegmentAsync.story.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 2
+      }
+    ],
+    "/packages/grafana-ui/src/components/Segment/SegmentInput.story.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/packages/grafana-ui/src/components/Segment/SegmentInput.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 2
+      }
+    ],
+    "/plugins-bundled/internal/input-datasource/src/InputConfigEditor.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/angular/components/code_editor/code_editor.ts": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/angular/components/form_dropdown/form_dropdown.ts": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 4
+      }
+    ],
+    "/public/app/angular/components/info_popover.ts": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 2
+      }
+    ],
+    "/public/app/angular/components/switch.ts": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 8
+      }
+    ],
+    "/public/app/angular/dropdown_typeahead.ts": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 4
+      }
+    ],
+    "/public/app/angular/metric_segment.ts": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 4
+      }
+    ],
+    "/public/app/angular/misc.ts": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 2
+      }
+    ],
+    "/public/app/angular/panel/partials/query_editor_row.html": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/angular/partials/tls_auth_settings.html": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 35
+      }
+    ],
+    "/public/app/core/components/AccessControl/PermissionList.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/core/components/PageHeader/PageHeader.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/admin/UserLdapSyncInfo.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/admin/partials/edit_org.html": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 8
+      }
+    ],
+    "/public/app/features/admin/partials/styleguide.html": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/alerting/AlertRuleList.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/alerting/partials/alert_tab.html": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 71
+      }
+    ],
+    "/public/app/features/annotations/partials/event_editor.html": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 7
+      }
+    ],
+    "/public/app/features/dashboard-scene/sharing/ShareLinkTab.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/dashboard/components/SubMenu/AnnotationPicker.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/dashboard/components/SubMenu/SubMenuItems.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/datasources/components/BasicSettings.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/datasources/components/ButtonRow.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/datasources/components/DataSourceLoadError.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/datasources/components/DataSourcePluginState.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 4
+      }
+    ],
+    "/public/app/features/datasources/components/DataSourceTestingStatus.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/plugins/admin/components/AppConfigWrapper.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/query/components/QueryEditorRow.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/query/components/QueryGroupOptions.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 17
+      }
+    ],
+    "/public/app/features/transformers/FilterByValueTransformer/ValueMatchers/RangeMatcherEditor.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/transformers/editors/OrganizeFieldsTransformerEditor.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/variables/adhoc/picker/AdHocFilter.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/variables/adhoc/picker/AdHocFilterKey.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 3
+      }
+    ],
+    "/public/app/features/variables/adhoc/picker/AdHocFilterRenderer.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/variables/adhoc/picker/AdHocFilterValue.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/features/variables/adhoc/picker/ConditionSegment.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 2
+      }
+    ],
+    "/public/app/features/variables/pickers/PickerRenderer.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 5
+      }
+    ],
+    "/public/app/features/variables/pickers/shared/VariableInput.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/partials/confirm_modal.html": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/partials/reset_password.html": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 13
+      }
+    ],
+    "/public/app/partials/signup_invited.html": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 14
+      }
+    ],
+    "/public/app/plugins/datasource/alertmanager/ConfigEditor.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 4
+      }
+    ],
+    "/public/app/plugins/datasource/cloud-monitoring/components/AnnotationsHelp.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/XrayLinkConfig.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryEditor.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryField.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryFieldOld.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 4
+      }
+    ],
+    "/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LegacyLogGroupNamesSelection.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsField.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/components/QueryEditor/SettingsEditorContainer.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/elasticsearch/configuration/DataLinks.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/grafana-pyroscope-datasource/ConfigEditor.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/graphite/components/AnnotationsEditor.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/graphite/configuration/MappingsConfiguration.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/influxdb/components/editor/annotation/AnnotationEditor.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 8
+      }
+    ],
+    "/public/app/plugins/datasource/influxdb/components/editor/query/QueryEditor.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/influxdb/components/editor/query/flux/FluxQueryEditor.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 5
+      }
+    ],
+    "/public/app/plugins/datasource/influxdb/components/editor/query/fsql/FSQLEditor.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 5
+      }
+    ],
+    "/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/PartListSection.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/TagsSection.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/influxdb/components/editor/variable/VariableQueryEditor.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 4
+      }
+    ],
+    "/public/app/plugins/datasource/loki/components/AnnotationsQueryEditor.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/loki/components/LokiOptionFields.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/loki/components/LokiQueryField.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/loki/configuration/DerivedField.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryCodeEditor.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/opentsdb/components/AnnotationEditor.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/components/PromExploreExtraField.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 4
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 6
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/configuration/AlertingSettingsOverhaul.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/configuration/AzureCredentialsForm.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 21
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/configuration/ExemplarSetting.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 25
+      }
+    ],
+    "/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryCodeEditor.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/AdHocFilter.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/AdHocFilterKey.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/AdHocFilterRenderer.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/AdHocFilterValue.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 1
+      }
+    ],
+    "/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/ConditionSegment.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/datasource/tempo/_importedDependencies/datasources/loki/LokiQueryField.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 3
+      }
+    ],
+    "/public/app/plugins/datasource/zipkin/QueryField.tsx": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 2
+      }
+    ],
+    "/public/app/plugins/panel/graph/axes_editor.html": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 50
+      }
+    ],
+    "/public/app/plugins/panel/graph/tab_display.html": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 56
+      }
+    ],
+    "/public/app/plugins/panel/graph/tab_legend.html": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 42
+      }
+    ],
+    "/public/app/plugins/panel/graph/tab_series_overrides.html": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 10
+      }
+    ],
+    "/public/app/plugins/panel/graph/thresholds_form.html": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 31
+      }
+    ],
+    "/public/app/plugins/panel/graph/time_regions_form.html": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 32
+      }
+    ],
+    "/public/app/plugins/panel/heatmap/partials/axes_editor.html": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 53
+      }
+    ],
+    "/public/app/plugins/panel/heatmap/partials/display_editor.html": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 51
+      }
+    ],
+    "/public/app/plugins/panel/table-old/column_options.html": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 91
+      }
+    ],
+    "/public/app/plugins/panel/table-old/editor.html": [
+      {
+        "message": "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.",
+        "count": 22
+      }
+    ]
+  }
+}
diff --git a/.betterer.ts b/.betterer.ts
index 4b57b973e4d3d..019979e7e9405 100644
--- a/.betterer.ts
+++ b/.betterer.ts
@@ -5,19 +5,26 @@ import path from 'path';
 import { glob } from 'glob';
 
 // Why are we ignoring these?
-// They're all deprecated/being removed soon so doesn't make sense to fix types
+// They're all deprecated/being removed so doesn't make sense to fix types
 const eslintPathsToIgnore = [
   'packages/grafana-e2e', // deprecated.
   'public/app/angular', // will be removed in Grafana 11
   'public/app/plugins/panel/graph', // will be removed alongside angular
+  'public/app/plugins/panel/table-old', // will be removed alongside angular
 ];
 
+// Avoid using functions that report the position of the issues, as this causes a lot of merge conflicts
 export default {
   'better eslint': () =>
     countEslintErrors()
       .include('**/*.{ts,tsx}')
       .exclude(new RegExp(eslintPathsToIgnore.join('|'))),
   'no undocumented stories': () => countUndocumentedStories().include('**/!(*.internal).story.tsx'),
+  'no gf-form usage': () =>
+    regexp(
+      /gf-form/gm,
+      'gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.'
+    ).include('**/*.{ts,tsx,html}'),
 };
 
 function countUndocumentedStories() {
@@ -25,9 +32,16 @@ function countUndocumentedStories() {
     await Promise.all(
       filePaths.map(async (filePath) => {
         // look for .mdx import in the story file
-        const regex = new RegExp("^import.*.mdx';$", 'gm');
+        const mdxImportRegex = new RegExp("^import.*\\.mdx';$", 'gm');
+        // Looks for the "autodocs" string in the file
+        const autodocsStringRegex = /autodocs/;
+
         const fileText = await fs.readFile(filePath, 'utf8');
-        if (!regex.test(fileText)) {
+
+        const hasMdxImport = mdxImportRegex.test(fileText);
+        const hasAutodocsString = autodocsStringRegex.test(fileText);
+        // If both .mdx import and autodocs string are missing, add an issue
+        if (!hasMdxImport && !hasAutodocsString) {
           // In this case the file contents don't matter:
           const file = fileTestResult.addFile(filePath, '');
           // Add the issue to the first character of the file:
@@ -38,6 +52,28 @@ function countUndocumentedStories() {
   });
 }
 
+/**
+ *  Generic regexp pattern matcher, similar to @betterer/regexp.
+ *  The only difference is that the positions of the errors are not reported, as this may cause a lot of merge conflicts.
+ */
+function regexp(pattern: RegExp, issueMessage: string) {
+  return new BettererFileTest(async (filePaths, fileTestResult) => {
+    await Promise.all(
+      filePaths.map(async (filePath) => {
+        const fileText = await fs.readFile(filePath, 'utf8');
+        const matches = fileText.match(pattern);
+        if (matches) {
+          // File contents doesn't matter, since we're not reporting the position
+          const file = fileTestResult.addFile(filePath, '');
+          matches.forEach(() => {
+            file.addIssue(0, 0, issueMessage);
+          });
+        }
+      })
+    );
+  });
+}
+
 function countEslintErrors() {
   return new BettererFileTest(async (filePaths, fileTestResult, resolver) => {
     const { baseDirectory } = resolver;
diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk
index 84f3fe5ce8ce8..c6a5d32a42892 100644
--- a/.bingo/Variables.mk
+++ b/.bingo/Variables.mk
@@ -35,11 +35,11 @@ $(DRONE): $(BINGO_DIR)/drone.mod
 	@echo "(re)installing $(GOBIN)/drone-v1.5.0"
 	@cd $(BINGO_DIR) && GOWORK=off CGO_ENABLED=0 $(GO) build -mod=mod -modfile=drone.mod -o=$(GOBIN)/drone-v1.5.0 "github.com/drone/drone-cli/drone"
 
-GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.53.3
+GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.57.1
 $(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/golangci-lint-v1.53.3"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.53.3 "github.com/golangci/golangci-lint/cmd/golangci-lint"
+	@echo "(re)installing $(GOBIN)/golangci-lint-v1.57.1"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.57.1 "github.com/golangci/golangci-lint/cmd/golangci-lint"
 
 JB := $(GOBIN)/jb-v0.5.1
 $(JB): $(BINGO_DIR)/jb.mod
@@ -59,9 +59,3 @@ $(SWAGGER): $(BINGO_DIR)/swagger.mod
 	@echo "(re)installing $(GOBIN)/swagger-v0.30.2"
 	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=swagger.mod -o=$(GOBIN)/swagger-v0.30.2 "github.com/go-swagger/go-swagger/cmd/swagger"
 
-WIRE := $(GOBIN)/wire-v0.5.0
-$(WIRE): $(BINGO_DIR)/wire.mod
-	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/wire-v0.5.0"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=wire.mod -o=$(GOBIN)/wire-v0.5.0 "github.com/google/wire/cmd/wire"
-
diff --git a/.bingo/golangci-lint.mod b/.bingo/golangci-lint.mod
index 6275d68be9537..3eb46ed1e4cb3 100644
--- a/.bingo/golangci-lint.mod
+++ b/.bingo/golangci-lint.mod
@@ -1,5 +1,7 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.20
+go 1.21
 
-require github.com/golangci/golangci-lint v1.53.3 // cmd/golangci-lint
+toolchain go1.21.6
+
+require github.com/golangci/golangci-lint v1.57.1 // cmd/golangci-lint
diff --git a/.bingo/golangci-lint.sum b/.bingo/golangci-lint.sum
index dea162a792ef1..c41da6943cb5f 100644
--- a/.bingo/golangci-lint.sum
+++ b/.bingo/golangci-lint.sum
@@ -42,22 +42,32 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/4meepo/tagalign v1.2.2 h1:kQeUTkFTaBRtd/7jm8OKJl9iHk0gAO+TDFPHGSna0aw=
 github.com/4meepo/tagalign v1.2.2/go.mod h1:Q9c1rYMZJc9dPRkbQPpcBNCLEmY2njbAsXhQOZFE2dE=
+github.com/4meepo/tagalign v1.3.3 h1:ZsOxcwGD/jP4U/aw7qeWu58i7dwYemfy5Y+IF1ACoNw=
+github.com/4meepo/tagalign v1.3.3/go.mod h1:Q9c1rYMZJc9dPRkbQPpcBNCLEmY2njbAsXhQOZFE2dE=
 github.com/Abirdcfly/dupword v0.0.9 h1:MxprGjKq3yDBICXDgEEsyGirIXfMYXkLNT/agPsE1tk=
 github.com/Abirdcfly/dupword v0.0.9/go.mod h1:PzmHVLLZ27MvHSzV7eFmMXSFArWXZPZmfuuziuUrf2g=
 github.com/Abirdcfly/dupword v0.0.11 h1:z6v8rMETchZXUIuHxYNmlUAuKuB21PeaSymTed16wgU=
 github.com/Abirdcfly/dupword v0.0.11/go.mod h1:wH8mVGuf3CP5fsBTkfWwwwKTjDnVVCxtU8d8rgeVYXA=
+github.com/Abirdcfly/dupword v0.0.14 h1:3U4ulkc8EUo+CaT105/GJ1BQwtgyj6+VaBVbAX11Ba8=
+github.com/Abirdcfly/dupword v0.0.14/go.mod h1:VKDAbxdY8YbKUByLGg8EETzYSuC4crm9WwI6Y3S0cLI=
 github.com/Antonboom/errname v0.1.7 h1:mBBDKvEYwPl4WFFNwec1CZO096G6vzK9vvDQzAwkako=
 github.com/Antonboom/errname v0.1.7/go.mod h1:g0ONh16msHIPgJSGsecu1G/dcF2hlYR/0SddnIAGavU=
 github.com/Antonboom/errname v0.1.9 h1:BZDX4r3l4TBZxZ2o2LNrlGxSHran4d1u4veZdoORTT4=
 github.com/Antonboom/errname v0.1.9/go.mod h1:nLTcJzevREuAsgTbG85UsuiWpMpAqbKD1HNZ29OzE58=
 github.com/Antonboom/errname v0.1.10 h1:RZ7cYo/GuZqjr1nuJLNe8ZH+a+Jd9DaZzttWzak9Bls=
 github.com/Antonboom/errname v0.1.10/go.mod h1:xLeiCIrvVNpUtsN0wxAh05bNIZpqE22/qDMnTBTttiA=
+github.com/Antonboom/errname v0.1.12 h1:oh9ak2zUtsLp5oaEd/erjB4GPu9w19NyoIskZClDcQY=
+github.com/Antonboom/errname v0.1.12/go.mod h1:bK7todrzvlaZoQagP1orKzWXv59X/x0W0Io2XT1Ssro=
 github.com/Antonboom/nilnil v0.1.1 h1:PHhrh5ANKFWRBh7TdYmyyq2gyT2lotnvFvvFbylF81Q=
 github.com/Antonboom/nilnil v0.1.1/go.mod h1:L1jBqoWM7AOeTD+tSquifKSesRHs4ZdaxvZR+xdJEaI=
 github.com/Antonboom/nilnil v0.1.3 h1:6RTbx3d2mcEu3Zwq9TowQpQMVpP75zugwOtqY1RTtcE=
 github.com/Antonboom/nilnil v0.1.3/go.mod h1:iOov/7gRcXkeEU+EMGpBu2ORih3iyVEiWjeste1SJm8=
 github.com/Antonboom/nilnil v0.1.5 h1:X2JAdEVcbPaOom2TUa1FxZ3uyuUlex0XMLGYMemu6l0=
 github.com/Antonboom/nilnil v0.1.5/go.mod h1:I24toVuBKhfP5teihGWctrRiPbRKHwZIFOvc6v3HZXk=
+github.com/Antonboom/nilnil v0.1.7 h1:ofgL+BA7vlA1K2wNQOsHzLJ2Pw5B5DpWRLdDAVvvTow=
+github.com/Antonboom/nilnil v0.1.7/go.mod h1:TP+ScQWVEq0eSIxqU8CbdT5DFWoHp0MbP+KMUO1BKYQ=
+github.com/Antonboom/testifylint v1.2.0 h1:015bxD8zc5iY8QwTp4+RG9I4kIbqwvGX9TrBbb7jGdM=
+github.com/Antonboom/testifylint v1.2.0/go.mod h1:rkmEqjqVnHDRNsinyN6fPSLnoajzFwsCcguJgwADBkw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak=
 github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
@@ -68,12 +78,18 @@ github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 h1:sHglBQTwgx+rW
 github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs=
 github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 h1:+r1rSv4gvYn0wmRjC8X7IAzX8QezqtFV9m0MUHFJgts=
 github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0/go.mod h1:b3g59n2Y+T5xmcxJL+UEG2f8cQploZm1mR/v6BW0mU0=
+github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0 h1:sATXp1x6/axKxz2Gjxv8MALP0bXaNRfQinEwyfMcx8c=
+github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0/go.mod h1:Nl76DrGNJTA1KJ0LePKBw/vznBX1EHbAZX8mwjR82nI=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/OpenPeeDeeP/depguard v1.1.1 h1:TSUznLjvp/4IUP+OQ0t/4jF4QUyxIcVX8YnghZdunyA=
 github.com/OpenPeeDeeP/depguard v1.1.1/go.mod h1:JtAMzWkmFEzDPyAd+W0NHl1lvpQKTvT9jnRVsohBKpc=
 github.com/OpenPeeDeeP/depguard/v2 v2.1.0 h1:aQl70G173h/GZYhWf36aE5H0KaujXfVMnn/f1kSDVYY=
 github.com/OpenPeeDeeP/depguard/v2 v2.1.0/go.mod h1:PUBgk35fX4i7JDmwzlJwJ+GMe6NfO1723wmJMgPThNQ=
+github.com/OpenPeeDeeP/depguard/v2 v2.2.0 h1:vDfG60vDtIuf0MEOhmLlLLSzqaRM8EMcgJPdp74zmpA=
+github.com/OpenPeeDeeP/depguard/v2 v2.2.0/go.mod h1:CIzddKRvLBC4Au5aYP/i3nyaWQ+ClszLIuVocRiCYFQ=
+github.com/alecthomas/go-check-sumtype v0.1.4 h1:WCvlB3l5Vq5dZQTFmodqL2g68uHiSwwlWcT5a2FGK0c=
+github.com/alecthomas/go-check-sumtype v0.1.4/go.mod h1:WyYPfhfkdhyrdaligV6svFopZV8Lqdzn5pyVBaV6jhQ=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
@@ -81,6 +97,8 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 github.com/alexkohler/nakedret/v2 v2.0.2 h1:qnXuZNvv3/AxkAb22q/sEsEpcA99YxLFACDtEw9TPxE=
 github.com/alexkohler/nakedret/v2 v2.0.2/go.mod h1:2b8Gkk0GsOrqQv/gPWjNLDSKwG8I5moSXG1K4VIBcTQ=
+github.com/alexkohler/nakedret/v2 v2.0.4 h1:yZuKmjqGi0pSmjGpOC016LtPJysIL0WEUiaXW5SUnNg=
+github.com/alexkohler/nakedret/v2 v2.0.4/go.mod h1:bF5i0zF2Wo2o4X4USt9ntUWve6JbFv02Ff4vlkmS/VU=
 github.com/alexkohler/prealloc v1.0.0 h1:Hbq0/3fJPQhNkN0dR95AVrr6R7tou91y0uHG5pOcUuw=
 github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE=
 github.com/alingse/asasalint v0.0.11 h1:SFwnQXJ49Kx/1GghOFz1XGqHYKp21Kq1nHad/0WQRnw=
@@ -91,6 +109,8 @@ github.com/ashanbrown/forbidigo v1.5.1 h1:WXhzLjOlnuDYPYQo/eFlcFMi8X/kLfvWLYu6CS
 github.com/ashanbrown/forbidigo v1.5.1/go.mod h1:Y8j9jy9ZYAEHXdu723cUlraTqbzjKF1MUyfOKL+AjcU=
 github.com/ashanbrown/forbidigo v1.5.3 h1:jfg+fkm/snMx+V9FBwsl1d340BV/99kZGv5jN9hBoXk=
 github.com/ashanbrown/forbidigo v1.5.3/go.mod h1:Y8j9jy9ZYAEHXdu723cUlraTqbzjKF1MUyfOKL+AjcU=
+github.com/ashanbrown/forbidigo v1.6.0 h1:D3aewfM37Yb3pxHujIPSpTf6oQk9sc9WZi8gerOIVIY=
+github.com/ashanbrown/forbidigo v1.6.0/go.mod h1:Y8j9jy9ZYAEHXdu723cUlraTqbzjKF1MUyfOKL+AjcU=
 github.com/ashanbrown/makezero v1.1.1 h1:iCQ87C0V0vSyO+M9E/FZYbu65auqH0lnsOkf5FcB28s=
 github.com/ashanbrown/makezero v1.1.1/go.mod h1:i1bJLCRSCHOcOa9Y6MyF2FTfMZMFdHvxKHxgO5Z1axI=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
@@ -105,20 +125,32 @@ github.com/blizzy78/varnamelen v0.8.0 h1:oqSblyuQvFsW1hbBHh1zfwrKe3kcSj0rnXkKzsQ
 github.com/blizzy78/varnamelen v0.8.0/go.mod h1:V9TzQZ4fLJ1DSrjVDfl89H7aMnTvKkApdHeyESmyR7k=
 github.com/bombsimon/wsl/v3 v3.4.0 h1:RkSxjT3tmlptwfgEgTgU+KYKLI35p/tviNXNXiL2aNU=
 github.com/bombsimon/wsl/v3 v3.4.0/go.mod h1:KkIB+TXkqy6MvK9BDZVbZxKNYsE1/oLRJbIFtf14qqo=
+github.com/bombsimon/wsl/v4 v4.2.1 h1:Cxg6u+XDWff75SIFFmNsqnIOgob+Q9hG6y/ioKbRFiM=
+github.com/bombsimon/wsl/v4 v4.2.1/go.mod h1:Xu/kDxGZTofQcDGCtQe9KCzhHphIe0fDuyWTxER9Feo=
 github.com/breml/bidichk v0.2.3 h1:qe6ggxpTfA8E75hdjWPZ581sY3a2lnl0IRxLQFelECI=
 github.com/breml/bidichk v0.2.3/go.mod h1:8u2C6DnAy0g2cEq+k/A2+tr9O1s+vHGxWn0LTc70T2A=
 github.com/breml/bidichk v0.2.4 h1:i3yedFWWQ7YzjdZJHnPo9d/xURinSq3OM+gyM43K4/8=
 github.com/breml/bidichk v0.2.4/go.mod h1:7Zk0kRFt1LIZxtQdl9W9JwGAcLTTkOs+tN7wuEYGJ3s=
+github.com/breml/bidichk v0.2.7 h1:dAkKQPLl/Qrk7hnP6P+E0xOodrq8Us7+U0o4UBOAlQY=
+github.com/breml/bidichk v0.2.7/go.mod h1:YodjipAGI9fGcYM7II6wFvGhdMYsC5pHDlGzqvEW3tQ=
 github.com/breml/errchkjson v0.3.0 h1:YdDqhfqMT+I1vIxPSas44P+9Z9HzJwCeAzjB8PxP1xw=
 github.com/breml/errchkjson v0.3.0/go.mod h1:9Cogkyv9gcT8HREpzi3TiqBxCqDzo8awa92zSDFcofU=
 github.com/breml/errchkjson v0.3.1 h1:hlIeXuspTyt8Y/UmP5qy1JocGNR00KQHgfaNtRAjoxQ=
 github.com/breml/errchkjson v0.3.1/go.mod h1:XroxrzKjdiutFyW3nWhw34VGg7kiMsDQox73yWCGI2U=
+github.com/breml/errchkjson v0.3.6 h1:VLhVkqSBH96AvXEyclMR37rZslRrY2kcyq+31HCsVrA=
+github.com/breml/errchkjson v0.3.6/go.mod h1:jhSDoFheAF2RSDOlCfhHO9KqhZgAYLyvHe7bRCX8f/U=
 github.com/butuzov/ireturn v0.1.1 h1:QvrO2QF2+/Cx1WA/vETCIYBKtRjc30vesdoPUNo1EbY=
 github.com/butuzov/ireturn v0.1.1/go.mod h1:Wh6Zl3IMtTpaIKbmwzqi6olnM9ptYQxxVacMsOEFPoc=
 github.com/butuzov/ireturn v0.2.0 h1:kCHi+YzC150GE98WFuZQu9yrTn6GEydO2AuPLbTgnO4=
 github.com/butuzov/ireturn v0.2.0/go.mod h1:Wh6Zl3IMtTpaIKbmwzqi6olnM9ptYQxxVacMsOEFPoc=
+github.com/butuzov/ireturn v0.3.0 h1:hTjMqWw3y5JC3kpnC5vXmFJAWI/m31jaCYQqzkS6PL0=
+github.com/butuzov/ireturn v0.3.0/go.mod h1:A09nIiwiqzN/IoVo9ogpa0Hzi9fex1kd9PSD6edP5ZA=
 github.com/butuzov/mirror v1.1.0 h1:ZqX54gBVMXu78QLoiqdwpl2mgmoOJTk7s4p4o+0avZI=
 github.com/butuzov/mirror v1.1.0/go.mod h1:8Q0BdQU6rC6WILDiBM60DBfvV78OLJmMmixe7GF45AE=
+github.com/catenacyber/perfsprint v0.7.1 h1:PGW5G/Kxn+YrN04cRAZKC+ZuvlVwolYMrIyyTJ/rMmc=
+github.com/catenacyber/perfsprint v0.7.1/go.mod h1:/wclWYompEyjUD2FuIIDVKNkqz7IgBIWXIH3V0Zol50=
+github.com/ccojocar/zxcvbn-go v1.0.2 h1:na/czXU8RrhXO4EZme6eQJLR4PzcGsahsBOAwU6I3Vg=
+github.com/ccojocar/zxcvbn-go v1.0.2/go.mod h1:g1qkXtUSvHP8lhHp5GrSmTz6uWALGRMQdw6Qnz/hi60=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
@@ -131,9 +163,13 @@ github.com/chavacava/garif v0.0.0-20221024190013-b3ef35877348 h1:cy5GCEZLUCshCGC
 github.com/chavacava/garif v0.0.0-20221024190013-b3ef35877348/go.mod h1:f/miWtG3SSuTxKsNK3o58H1xl+XV6ZIfbC6p7lPPB8U=
 github.com/chavacava/garif v0.0.0-20230227094218-b8c73b2037b8 h1:W9o46d2kbNL06lq7UNDPV0zYLzkrde/bjIqO02eoll0=
 github.com/chavacava/garif v0.0.0-20230227094218-b8c73b2037b8/go.mod h1:gakxgyXaaPkxvLw1XQxNGK4I37ys9iBRzNUx/B7pUCo=
+github.com/chavacava/garif v0.1.0 h1:2JHa3hbYf5D9dsgseMKAmc/MZ109otzgNFk5s87H9Pc=
+github.com/chavacava/garif v0.1.0/go.mod h1:XMyYCkEL58DF0oyW4qDjjnPWONs2HBqYKI+UIPD+Gww=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/ckaznocha/intrange v0.1.0 h1:ZiGBhvrdsKpoEfzh9CjBfDSZof6QB0ORY5tXasUtiew=
+github.com/ckaznocha/intrange v0.1.0/go.mod h1:Vwa9Ekex2BrEQMg6zlrWwbs/FtYw7eS5838Q7UjK7TQ=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
@@ -145,11 +181,15 @@ github.com/daixiang0/gci v0.9.1 h1:jBrwBmBZTDsGsXiaCTLIe9diotp1X4X64zodFrh7l+c=
 github.com/daixiang0/gci v0.9.1/go.mod h1:EpVfrztufwVgQRXjnX4zuNinEpLj5OmMjtu/+MB0V0c=
 github.com/daixiang0/gci v0.10.1 h1:eheNA3ljF6SxnPD/vE4lCBusVHmV3Rs3dkKvFrJ7MR0=
 github.com/daixiang0/gci v0.10.1/go.mod h1:xtHP9N7AHdNvtRNfcx9gwTDfw7FRJx4bZUsiEfiNNAI=
+github.com/daixiang0/gci v0.12.3 h1:yOZI7VAxAGPQmkb1eqt5g/11SUlwoat1fSblGLmdiQc=
+github.com/daixiang0/gci v0.12.3/go.mod h1:xtHP9N7AHdNvtRNfcx9gwTDfw7FRJx4bZUsiEfiNNAI=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/denis-tingaikin/go-header v0.4.3 h1:tEaZKAlqql6SKCY++utLmkPLd6K8IBM20Ha7UVm+mtU=
 github.com/denis-tingaikin/go-header v0.4.3/go.mod h1:0wOCWuN71D5qIgE2nz9KrKmuYBAC2Mra5RassOIQ2/c=
+github.com/denis-tingaikin/go-header v0.5.0 h1:SRdnP5ZKvcO9KKRP1KJrhFR3RrlGuD+42t4429eC9k8=
+github.com/denis-tingaikin/go-header v0.5.0/go.mod h1:mMenU5bWrok6Wl2UsZjy+1okegmwQ3UgWl4V1D8gjlY=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -160,10 +200,14 @@ github.com/esimonov/ifshort v1.0.4 h1:6SID4yGWfRae/M7hkVDVVyppy8q/v9OuxNdmjLQStB
 github.com/esimonov/ifshort v1.0.4/go.mod h1:Pe8zjlRrJ80+q2CxHLfEOfTwxCZ4O+MuhcHcfgNWTk0=
 github.com/ettle/strcase v0.1.1 h1:htFueZyVeE1XNnMEfbqp5r67qAN/4r6ya1ysq8Q+Zcw=
 github.com/ettle/strcase v0.1.1/go.mod h1:hzDLsPC7/lwKyBOywSHEP89nt2pDgdy+No1NBA9o9VY=
+github.com/ettle/strcase v0.2.0 h1:fGNiVF21fHXpX1niBgk0aROov1LagYsOwV/xqKDKR/Q=
+github.com/ettle/strcase v0.2.0/go.mod h1:DajmHElDSaX76ITe3/VHVyMin4LWSJN5Z909Wp+ED1A=
 github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
 github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
 github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
 github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
+github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
+github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
 github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
 github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
 github.com/firefart/nonamedreturns v1.0.4 h1:abzI1p7mAEPYuR4A+VLKn4eNDOycjYo2phmY9sfv40Y=
@@ -172,12 +216,16 @@ github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwV
 github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
 github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo=
 github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA=
+github.com/ghostiam/protogetter v0.3.5 h1:+f7UiF8XNd4w3a//4DnusQ2SZjPkUjxkMEfjbxOK4Ug=
+github.com/ghostiam/protogetter v0.3.5/go.mod h1:7lpeDnEJ1ZjL/YtyoN99ljO4z0pd3H0d18/t2dPBxHw=
 github.com/go-critic/go-critic v0.6.7 h1:1evPrElnLQ2LZtJfmNDzlieDhjnq36SLgNzisx06oPM=
 github.com/go-critic/go-critic v0.6.7/go.mod h1:fYZUijFdcnxgx6wPjQA2QEjIRaNCT0gO8bhexy6/QmE=
 github.com/go-critic/go-critic v0.7.0 h1:tqbKzB8pqi0NsRZ+1pyU4aweAF7A7QN0Pi4Q02+rYnQ=
 github.com/go-critic/go-critic v0.7.0/go.mod h1:moYzd7GdVXE2C2hYTwd7h0CPcqlUeclsyBRwMa38v64=
 github.com/go-critic/go-critic v0.8.1 h1:16omCF1gN3gTzt4j4J6fKI/HnRojhEp+Eks6EuKw3vw=
 github.com/go-critic/go-critic v0.8.1/go.mod h1:kpzXl09SIJX1cr9TB/g/sAG+eFEl7ZS9f9cqvZtyNl0=
+github.com/go-critic/go-critic v0.11.2 h1:81xH/2muBphEgPtcwH1p6QD+KzXl2tMSi3hXjBSxDnM=
+github.com/go-critic/go-critic v0.11.2/go.mod h1:OePaicfjsf+KPy33yq4gzv6CO7TEQ9Rom6ns1KsJnl8=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -198,6 +246,8 @@ github.com/go-toolsmith/astequal v1.0.2/go.mod h1:9Ai4UglvtR+4up+bAD4+hCj7iTo4m/
 github.com/go-toolsmith/astequal v1.0.3/go.mod h1:9Ai4UglvtR+4up+bAD4+hCj7iTo4m/OXVTSLnCyTAx4=
 github.com/go-toolsmith/astequal v1.1.0 h1:kHKm1AWqClYn15R0K1KKE4RG614D46n+nqUQ06E1dTw=
 github.com/go-toolsmith/astequal v1.1.0/go.mod h1:sedf7VIdCL22LD8qIvv7Nn9MuWJruQA/ysswh64lffQ=
+github.com/go-toolsmith/astequal v1.2.0 h1:3Fs3CYZ1k9Vo4FzFhwwewC3CHISHDnVUPC4x0bI2+Cw=
+github.com/go-toolsmith/astequal v1.2.0/go.mod h1:c8NZ3+kSFtFY/8lPso4v8LuJjdJiUFVnSuU3s0qrrDY=
 github.com/go-toolsmith/astfmt v1.1.0 h1:iJVPDPp6/7AaeLJEruMsBUlOYCmvg0MoCfJprsOmcco=
 github.com/go-toolsmith/astfmt v1.1.0/go.mod h1:OrcLlRwu0CuiIBp/8b5PYF9ktGVZUjlNMV634mhwuQ4=
 github.com/go-toolsmith/astp v1.1.0 h1:dXPuCl6u2llURjdPLLDxJeZInAeZ0/eZwFJmqZMnpQA=
@@ -207,6 +257,8 @@ github.com/go-toolsmith/strparse v1.1.0 h1:GAioeZUK9TGxnLS+qfdqNbA4z0SSm5zVNtCQi
 github.com/go-toolsmith/strparse v1.1.0/go.mod h1:7ksGy58fsaQkGQlY8WVoBFNyEPMGuJin1rfoPS4lBSQ=
 github.com/go-toolsmith/typep v1.1.0 h1:fIRYDyF+JywLfqzyhdiHzRop/GQDxxNhLGQ6gFUNHus=
 github.com/go-toolsmith/typep v1.1.0/go.mod h1:fVIw+7zjdsMxDA3ITWnH1yOiw1rnTQKCsF/sk2H/qig=
+github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c=
+github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/go-xmlfmt/xmlfmt v1.1.2 h1:Nea7b4icn8s57fTx1M5AI4qQT5HEM3rVUO8MuE6g80U=
 github.com/go-xmlfmt/xmlfmt v1.1.2/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
@@ -242,6 +294,8 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 h1:23T5iq8rbUYlhpt5DB4XJkc6BU31uODLD1o1gKvZmD0=
 github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4=
 github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9uMCefW1WDie15eSP/4MssdenaM=
@@ -250,22 +304,34 @@ github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe h1:6RGUuS7EGotKx6
 github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe/go.mod h1:gjqyPShc/m8pEMpk0a3SeagVb0kaqvhscv+i9jI5ZhQ=
 github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2 h1:amWTbTGqOZ71ruzrdA+Nx5WA3tV1N0goTspwmKCQvBY=
 github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2/go.mod h1:9wOXstvyDRshQ9LggQuzBCGysxs3b6Uo/1MvYCR2NMs=
+github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e h1:ULcKCDV1LOZPFxGZaA6TlQbiM3J2GCPnkx/bGF6sX/g=
+github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e/go.mod h1:Pm5KhLPA8gSnQwrQ6ukebRcapGb/BG9iUkdaiCcGHJM=
 github.com/golangci/golangci-lint v1.51.2 h1:yIcsT1X9ZYHdSpeWXRT1ORC/FPGSqDHbHsu9uk4FK7M=
 github.com/golangci/golangci-lint v1.51.2/go.mod h1:KH9Q7/3glwpYSknxUgUyLlAv46A8fsSKo1hH2wDvkr8=
 github.com/golangci/golangci-lint v1.52.2 h1:FrPElUUI5rrHXg1mQ7KxI1MXPAw5lBVskiz7U7a8a1A=
 github.com/golangci/golangci-lint v1.52.2/go.mod h1:S5fhC5sHM5kE22/HcATKd1XLWQxX+y7mHj8B5H91Q/0=
 github.com/golangci/golangci-lint v1.53.3 h1:CUcRafczT4t1F+mvdkUm6KuOpxUZTl0yWN/rSU6sSMo=
 github.com/golangci/golangci-lint v1.53.3/go.mod h1:W4Gg3ONq6p3Jl+0s/h9Gr0j7yEgHJWWZO2bHl2tBUXM=
+github.com/golangci/golangci-lint v1.57.1 h1:cqhpzkzjDwdN12rfMf1SUyyKyp88a1SltNqEYGS0nJw=
+github.com/golangci/golangci-lint v1.57.1/go.mod h1:zLcHhz3NHc88T5zV2j75lyc0zH3LdOPOybblYa4p0oI=
 github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 h1:MfyDlzVjl1hoaPzPD4Gpb/QgoRfSBR0jdhwGyAWwMSA=
 github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg=
 github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca h1:kNY3/svz5T29MYHubXix4aDDuE3RWHkPvopM/EDv/MA=
 github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod h1:tvlJhZqDe4LMs4ZHD0oMUlt9G2LWuDGoisJTBzLMV9o=
 github.com/golangci/misspell v0.4.0 h1:KtVB/hTK4bbL/S6bs64rYyk8adjmh1BygbBiaAiX+a0=
 github.com/golangci/misspell v0.4.0/go.mod h1:W6O/bwV6lGDxUCChm2ykw9NQdd5bYd1Xkjo88UcWyJc=
+github.com/golangci/misspell v0.4.1 h1:+y73iSicVy2PqyX7kmUefHusENlrP9YwuHZHPLGQj/g=
+github.com/golangci/misspell v0.4.1/go.mod h1:9mAN1quEo3DlpbaIKKyEvRxK1pwqR9s/Sea1bJCtlNI=
+github.com/golangci/plugin-module-register v0.1.1 h1:TCmesur25LnyJkpsVrupv1Cdzo+2f7zX0H6Jkw1Ol6c=
+github.com/golangci/plugin-module-register v0.1.1/go.mod h1:TTpqoB6KkwOJMV8u7+NyXMrkwwESJLOkfl9TxR1DGFc=
 github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 h1:DIPQnGy2Gv2FSA4B/hh8Q7xx3B7AIDk3DAMeHclH1vQ=
 github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6/go.mod h1:0AKcRCkMoKvUvlf89F6O7H2LYdhr1zBh736mBItOdRs=
+github.com/golangci/revgrep v0.5.2 h1:EndcWoRhcnfj2NHQ+28hyuXpLMF+dQmCN+YaeeIl4FU=
+github.com/golangci/revgrep v0.5.2/go.mod h1:bjAMA+Sh/QUfTDcHzxfyHxr4xKvllVr/0sCv2e7jJHA=
 github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 h1:zwtduBRr5SSWhqsYNgcuWO2kFlpdOZbP0+yRjmvPGys=
 github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ=
+github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed h1:IURFTjxeTfNFP0hTEi1YKjB/ub8zkpaOqFFMApi2EAs=
+github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed/go.mod h1:XLXN8bNw4CGRPaqgl3bv/lhz7bsGPh4/xSaMTbo2vkQ=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -282,6 +348,8 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -305,6 +373,8 @@ github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28 h1:9alfqbr
 github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0=
 github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601 h1:mrEEilTAUmaAORhssPPkxj84TsHrPMLBGW2Z4SoTxm8=
 github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0=
+github.com/gordonklaus/ineffassign v0.1.0 h1:y2Gd/9I7MdY1oEIt+n+rowjBNDcLQq3RsH5hwJd0f9s=
+github.com/gordonklaus/ineffassign v0.1.0/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0=
 github.com/gostaticanalysis/analysisutil v0.0.3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE=
 github.com/gostaticanalysis/analysisutil v0.1.0/go.mod h1:dMhHRU9KTiDcuLGdy87/2gTR8WruwYZrKdRq9m1O6uw=
 github.com/gostaticanalysis/analysisutil v0.7.1 h1:ZMCjoue3DtDWQ5WyU16YbjbQEQ3VuzwxALrpYd+HeKk=
@@ -339,10 +409,14 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jgautheron/goconst v1.5.1 h1:HxVbL1MhydKs8R8n/HE5NPvzfaYmQJA3o879lE4+WcM=
 github.com/jgautheron/goconst v1.5.1/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4=
+github.com/jgautheron/goconst v1.7.0 h1:cEqH+YBKLsECnRSd4F4TK5ri8t/aXtt/qoL0Ft252B0=
+github.com/jgautheron/goconst v1.7.0/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4=
 github.com/jingyugao/rowserrcheck v1.1.1 h1:zibz55j/MJtLsjP1OF4bSdgXxwL1b+Vn7Tjzq7gFzUs=
 github.com/jingyugao/rowserrcheck v1.1.1/go.mod h1:4yvlZSDb3IyDTUZJUmpZfm2Hwok+Dtp+nu2qOq+er9c=
 github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af h1:KA9BjwUk7KlCh6S9EAGWBt1oExIUv9WyNCiRz5amv48=
 github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0=
+github.com/jjti/go-spancheck v0.5.3 h1:vfq4s2IB8T3HvbpiwDTYgVPj1Ze/ZSXrTtaZRTc7CuM=
+github.com/jjti/go-spancheck v0.5.3/go.mod h1:eQdOX1k3T+nAKvZDyLC3Eby0La4dZ+I19iOl5NzSPFE=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -358,8 +432,12 @@ github.com/junk1tm/musttag v0.4.5 h1:d+mpJ1vn6WFEVKHwkgJiIedis1u/EawKOuUTygAUtCo
 github.com/junk1tm/musttag v0.4.5/go.mod h1:XkcL/9O6RmD88JBXb+I15nYRl9W4ExhgQeCBEhfMC8U=
 github.com/junk1tm/musttag v0.5.0 h1:bV1DTdi38Hi4pG4OVWa7Kap0hi0o7EczuK6wQt9zPOM=
 github.com/junk1tm/musttag v0.5.0/go.mod h1:PcR7BA+oREQYvHwgjIDmw3exJeds5JzRcvEJTfjrA0M=
+github.com/karamaru-alpha/copyloopvar v1.0.8 h1:gieLARwuByhEMxRwM3GRS/juJqFbLraftXIKDDNJ50Q=
+github.com/karamaru-alpha/copyloopvar v1.0.8/go.mod h1:u7CIfztblY0jZLOQZgH3oYsJzpC2A7S6u/lfgSXHy0k=
 github.com/kisielk/errcheck v1.6.3 h1:dEKh+GLHcWm2oN34nMvDzn1sqI0i0WxPvrgiJA5JuM8=
 github.com/kisielk/errcheck v1.6.3/go.mod h1:nXw/i/MfnvRHqXa7XXmQMUB0oNFGuBrNI8d8NLy0LPw=
+github.com/kisielk/errcheck v1.7.0 h1:+SbscKmWJ5mOK/bO1zS60F5I9WwZDWOfRsC4RwfwRV0=
+github.com/kisielk/errcheck v1.7.0/go.mod h1:1kLL+jV4e+CFfueBmI1dSK2ADDyQnlrnrY/FqKluHJQ=
 github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kkHAIKE/contextcheck v1.1.3 h1:l4pNvrb8JSwRd51ojtcOxOeHJzHek+MtOyXbaR0uvmw=
@@ -379,6 +457,8 @@ github.com/kunwardeep/paralleltest v1.0.6 h1:FCKYMF1OF2+RveWlABsdnmsvJrei5aoyZoa
 github.com/kunwardeep/paralleltest v1.0.6/go.mod h1:Y0Y0XISdZM5IKm3TREQMZ6iteqn1YuwCsJO/0kL9Zes=
 github.com/kunwardeep/paralleltest v1.0.7 h1:2uCk94js0+nVNQoHZNLBkAR1DQJrVzw6T0RMzJn55dQ=
 github.com/kunwardeep/paralleltest v1.0.7/go.mod h1:2C7s65hONVqY7Q5Efj5aLzRCNLjw2h4eMc9EcypGjcY=
+github.com/kunwardeep/paralleltest v1.0.10 h1:wrodoaKYzS2mdNVnc4/w31YaXFtsc21PCTdvWJ/lDDs=
+github.com/kunwardeep/paralleltest v1.0.10/go.mod h1:2C7s65hONVqY7Q5Efj5aLzRCNLjw2h4eMc9EcypGjcY=
 github.com/kyoh86/exportloopref v0.1.11 h1:1Z0bcmTypkL3Q4k+IDHMWTcnCliEZcaPiIe0/ymEyhQ=
 github.com/kyoh86/exportloopref v0.1.11/go.mod h1:qkV4UF1zGl6EkF1ox8L5t9SwyeBAZ3qLMd6up458uqA=
 github.com/ldez/gomoddirectives v0.2.3 h1:y7MBaisZVDYmKvt9/l1mjNCiSA1BVn34U0ObUcJwlhA=
@@ -391,6 +471,8 @@ github.com/leonklingele/grouper v1.1.1 h1:suWXRU57D4/Enn6pXR0QVqqWWrnJ9Osrz+5rjt
 github.com/leonklingele/grouper v1.1.1/go.mod h1:uk3I3uDfi9B6PeUjsCKi6ndcf63Uy7snXgR4yDYQVDY=
 github.com/lufeee/execinquery v1.2.1 h1:hf0Ems4SHcUGBxpGN7Jz78z1ppVkP/837ZlETPCEtOM=
 github.com/lufeee/execinquery v1.2.1/go.mod h1:EC7DrEKView09ocscGHC+apXMIaorh4xqSxS/dy8SbM=
+github.com/macabu/inamedparam v0.1.3 h1:2tk/phHkMlEL/1GNe/Yf6kkR/hkcUdAEY3L0hjYV1Mk=
+github.com/macabu/inamedparam v0.1.3/go.mod h1:93FLICAIk/quk7eaPPQvbzihUdn/QkGDwIZEoLtpH6I=
 github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
 github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
 github.com/maratori/testableexamples v1.0.0 h1:dU5alXRrD8WKSjOUnmJZuzdxWOEQ57+7s93SLMxb2vI=
@@ -409,6 +491,8 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
 github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
@@ -421,6 +505,8 @@ github.com/mgechev/revive v1.3.1 h1:OlQkcH40IB2cGuprTPcjB0iIUddgVZgGmDX3IAMR8D4=
 github.com/mgechev/revive v1.3.1/go.mod h1:YlD6TTWl2B8A103R9KWJSPVI9DrEf+oqr15q21Ld+5I=
 github.com/mgechev/revive v1.3.2 h1:Wb8NQKBaALBJ3xrrj4zpwJwqwNA6nDpyJSEQWcCka6U=
 github.com/mgechev/revive v1.3.2/go.mod h1:UCLtc7o5vg5aXCwdUTU1kEBQ1v+YXPAkYDIDXbrs5I0=
+github.com/mgechev/revive v1.3.7 h1:502QY0vQGe9KtYJ9FpxMz9rL+Fc/P13CI5POL4uHCcE=
+github.com/mgechev/revive v1.3.7/go.mod h1:RJ16jUbF0OWC3co/+XTxmFNgEpUPwnnA0BRllX2aDNA=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
@@ -444,6 +530,8 @@ github.com/nishanths/exhaustive v0.9.5 h1:TzssWan6orBiLYVqewCG8faud9qlFntJE30ACp
 github.com/nishanths/exhaustive v0.9.5/go.mod h1:IbwrGdVMizvDcIxPYGVdQn5BqWJaOwpCvg4RGb8r/TA=
 github.com/nishanths/exhaustive v0.11.0 h1:T3I8nUGhl/Cwu5Z2hfc92l0e04D2GEW6e0l8pzda2l0=
 github.com/nishanths/exhaustive v0.11.0/go.mod h1:RqwDsZ1xY0dNdqHho2z6X+bgzizwbLYOWnZbbl2wLB4=
+github.com/nishanths/exhaustive v0.12.0 h1:vIY9sALmw6T/yxiASewa4TQcFsVYZQQRUQJhKRf3Swg=
+github.com/nishanths/exhaustive v0.12.0/go.mod h1:mEZ95wPIZW+x8kC4TgC+9YCUgiST7ecevsVDTgc2obs=
 github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm/w98Vk=
 github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c=
 github.com/nunnatsa/ginkgolinter v0.8.1 h1:/y4o/0hV+ruUHj4xXh89xlFjoaitnI4LnkpuYs02q1c=
@@ -452,6 +540,8 @@ github.com/nunnatsa/ginkgolinter v0.9.0 h1:Sm0zX5QfjJzkeCjEp+t6d3Ha0jwvoDjleP9XC
 github.com/nunnatsa/ginkgolinter v0.9.0/go.mod h1:FHaMLURXP7qImeH6bvxWJUpyH+2tuqe5j4rW1gxJRmI=
 github.com/nunnatsa/ginkgolinter v0.12.1 h1:vwOqb5Nu05OikTXqhvLdHCGcx5uthIYIl0t79UVrERQ=
 github.com/nunnatsa/ginkgolinter v0.12.1/go.mod h1:AK8Ab1PypVrcGUusuKD8RDcl2KgsIwvNaaxAlyHSzso=
+github.com/nunnatsa/ginkgolinter v0.16.1 h1:uDIPSxgVHZ7PgbJElRDGzymkXH+JaF7mjew+Thjnt6Q=
+github.com/nunnatsa/ginkgolinter v0.16.1/go.mod h1:4tWRinDN1FeJgU+iJANW/kz7xKN5nYRAOfJDQUS9dOQ=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw=
@@ -463,6 +553,8 @@ github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3v
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg=
 github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas=
+github.com/pelletier/go-toml/v2 v2.2.0 h1:QLgLl2yMN7N+ruc31VynXs1vhMZa7CeHHejIeBAsoHo=
+github.com/pelletier/go-toml/v2 v2.2.0/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -476,6 +568,8 @@ github.com/polyfloyd/go-errorlint v1.4.0 h1:b+sQ5HibPIAjEZwtuwU8Wz/u0dMZ7YL+bk+9
 github.com/polyfloyd/go-errorlint v1.4.0/go.mod h1:qJCkPeBn+0EXkdKTrUCcuFStM2xrDKfxI3MGLXPexUs=
 github.com/polyfloyd/go-errorlint v1.4.2 h1:CU+O4181IxFDdPH6t/HT7IiDj1I7zxNi1RIUxYwn8d0=
 github.com/polyfloyd/go-errorlint v1.4.2/go.mod h1:k6fU/+fQe38ednoZS51T7gSIGQW1y94d6TkSr35OzH8=
+github.com/polyfloyd/go-errorlint v1.4.8 h1:jiEjKDH33ouFktyez7sckv6pHWif9B7SuS8cutDXFHw=
+github.com/polyfloyd/go-errorlint v1.4.8/go.mod h1:NNCxFcFjZcw3xNjVdCchERkEM6Oz7wta2XJVxRftwO4=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
@@ -500,6 +594,8 @@ github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0
 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/quasilyte/go-ruleguard v0.3.19 h1:tfMnabXle/HzOb5Xe9CUZYWXKfkS1KwRmZyPmD9nVcc=
 github.com/quasilyte/go-ruleguard v0.3.19/go.mod h1:lHSn69Scl48I7Gt9cX3VrbsZYvYiBYszZOZW4A+oTEw=
+github.com/quasilyte/go-ruleguard v0.4.2 h1:htXcXDK6/rO12kiTHKfHuqR4kr3Y4M0J0rOL6CH/BYs=
+github.com/quasilyte/go-ruleguard v0.4.2/go.mod h1:GJLgqsLeo4qgavUoL8JeGFNS7qcisx3awV/w9eWTmNI=
 github.com/quasilyte/gogrep v0.5.0 h1:eTKODPXbI8ffJMN+W2aE0+oL0z/nh8/5eNdiO34SOAo=
 github.com/quasilyte/gogrep v0.5.0/go.mod h1:Cm9lpz9NZjEoL1tgZ2OgeUKPIxL1meE7eo60Z6Sk+Ng=
 github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 h1:L8QM9bvf68pVdQ3bCFZMDmnt9yqcMBro1pC7F+IPYMY=
@@ -512,18 +608,28 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryancurrah/gomodguard v1.3.0 h1:q15RT/pd6UggBXVBuLps8BXRvl5GPBcwVA7BJHMLuTw=
 github.com/ryancurrah/gomodguard v1.3.0/go.mod h1:ggBxb3luypPEzqVtq33ee7YSN35V28XeGnid8dnni50=
+github.com/ryancurrah/gomodguard v1.3.1 h1:fH+fUg+ngsQO0ruZXXHnA/2aNllWA1whly4a6UvyzGE=
+github.com/ryancurrah/gomodguard v1.3.1/go.mod h1:DGFHzEhi6iJ0oIDfMuo3TgrS+L9gZvrEfmjjuelnRU0=
 github.com/ryanrolds/sqlclosecheck v0.4.0 h1:i8SX60Rppc1wRuyQjMciLqIzV3xnoHB7/tXbr6RGYNI=
 github.com/ryanrolds/sqlclosecheck v0.4.0/go.mod h1:TBRRjzL31JONc9i4XMinicuo+s+E8yKZ5FN8X3G6CKQ=
+github.com/ryanrolds/sqlclosecheck v0.5.1 h1:dibWW826u0P8jNLsLN+En7+RqWWTYrjCB9fJfSfdyCU=
+github.com/ryanrolds/sqlclosecheck v0.5.1/go.mod h1:2g3dUjoS6AL4huFdv6wn55WpLIDjY7ZgUR4J8HOO/XQ=
 github.com/sanposhiho/wastedassign/v2 v2.0.7 h1:J+6nrY4VW+gC9xFzUc+XjPD3g3wF3je/NsJFwFK7Uxc=
 github.com/sanposhiho/wastedassign/v2 v2.0.7/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI=
+github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 h1:lZUw3E0/J3roVtGQ+SCrUrg3ON6NgVqpn3+iol9aGu4=
+github.com/santhosh-tekuri/jsonschema/v5 v5.3.1/go.mod h1:uToXkOrWAZ6/Oc07xWQrPOhJotwFIyu2bBVN41fcDUY=
 github.com/sashamelentyev/interfacebloat v1.1.0 h1:xdRdJp0irL086OyW1H/RTZTr1h/tMEOsumirXcOJqAw=
 github.com/sashamelentyev/interfacebloat v1.1.0/go.mod h1:+Y9yU5YdTkrNvoX0xHc84dxiN1iBi9+G8zZIhPVoNjQ=
 github.com/sashamelentyev/usestdlibvars v1.23.0 h1:01h+/2Kd+NblNItNeux0veSL5cBF1jbEOPrEhDzGYq0=
 github.com/sashamelentyev/usestdlibvars v1.23.0/go.mod h1:YPwr/Y1LATzHI93CqoPUN/2BzGQ/6N/cl/KwgR0B/aU=
+github.com/sashamelentyev/usestdlibvars v1.25.0 h1:IK8SI2QyFzy/2OD2PYnhy84dpfNo9qADrRt6LH8vSzU=
+github.com/sashamelentyev/usestdlibvars v1.25.0/go.mod h1:9nl0jgOfHKWNFS43Ojw0i7aRoS4j6EBye3YBhmAIRF8=
 github.com/securego/gosec/v2 v2.15.0 h1:v4Ym7FF58/jlykYmmhZ7mTm7FQvN/setNm++0fgIAtw=
 github.com/securego/gosec/v2 v2.15.0/go.mod h1:VOjTrZOkUtSDt2QLSJmQBMWnvwiQPEjg0l+5juIqGk8=
 github.com/securego/gosec/v2 v2.16.0 h1:Pi0JKoasQQ3NnoRao/ww/N/XdynIB9NRYYZT5CyOs5U=
 github.com/securego/gosec/v2 v2.16.0/go.mod h1:xvLcVZqUfo4aAQu56TNv7/Ltz6emAOQAEsrZrt7uGlI=
+github.com/securego/gosec/v2 v2.19.0 h1:gl5xMkOI0/E6Hxx0XCY2XujA3V7SNSefA8sC+3f1gnk=
+github.com/securego/gosec/v2 v2.19.0/go.mod h1:hOkDcHz9J/XIgIlPDXalxjeVYsHxoWUc5zJSHxcB8YM=
 github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c h1:W65qqJCIOVP4jpqPQ0YvHYKwcMEMVWIzWC5iNQQfBTU=
 github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs=
 github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
@@ -551,6 +657,8 @@ github.com/sourcegraph/go-diff v0.7.0 h1:9uLlrd5T46OXs5qpp8L/MTltk0zikUGi0sNNyCp
 github.com/sourcegraph/go-diff v0.7.0/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs=
 github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo=
 github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
+github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
+github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY=
 github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
 github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
 github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
@@ -572,6 +680,8 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
@@ -586,6 +696,8 @@ github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs=
 github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
 github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c h1:+aPplBwWcHBo6q9xrfWdMrT9o4kltkmmvpemgIjep/8=
@@ -598,6 +710,8 @@ github.com/tenntenn/modver v1.0.1/go.mod h1:bePIyQPb7UeioSRkw3Q0XeMhYZSMx9B8ePqg
 github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY=
 github.com/tetafro/godot v1.4.11 h1:BVoBIqAf/2QdbFmSwAWnaIqDivZdOV0ZRwEm6jivLKw=
 github.com/tetafro/godot v1.4.11/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8=
+github.com/tetafro/godot v1.4.16 h1:4ChfhveiNLk4NveAZ9Pu2AN8QZ2nkUGFuadM9lrr5D0=
+github.com/tetafro/godot v1.4.16/go.mod h1:2oVxTBSftRTh4+MVfUaUXR6bn2GDXCaMcOG4Dk3rfio=
 github.com/timakin/bodyclose v0.0.0-20221125081123-e39cf3fc478e h1:MV6KaVu/hzByHP0UvJ4HcMGE/8a6A4Rggc/0wx2AvJo=
 github.com/timakin/bodyclose v0.0.0-20221125081123-e39cf3fc478e/go.mod h1:27bSVNWSBOHm+qRp1T9qzaIpsWEP6TbUnei/43HK+PQ=
 github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 h1:quvGphlmUVU+nhpFa4gg4yJyTRJ13reZMDHrKwYw53M=
@@ -610,22 +724,34 @@ github.com/tomarrell/wrapcheck/v2 v2.8.0 h1:qDzbir0xmoE+aNxGCPrn+rUSxAX+nG6vREgb
 github.com/tomarrell/wrapcheck/v2 v2.8.0/go.mod h1:ao7l5p0aOlUNJKI0qVwB4Yjlqutd0IvAB9Rdwyilxvg=
 github.com/tomarrell/wrapcheck/v2 v2.8.1 h1:HxSqDSN0sAt0yJYsrcYVoEeyM4aI9yAm3KQpIXDJRhQ=
 github.com/tomarrell/wrapcheck/v2 v2.8.1/go.mod h1:/n2Q3NZ4XFT50ho6Hbxg+RV1uyo2Uow/Vdm9NQcl5SE=
+github.com/tomarrell/wrapcheck/v2 v2.8.3 h1:5ov+Cbhlgi7s/a42BprYoxsr73CbdMUTzE3bRDFASUs=
+github.com/tomarrell/wrapcheck/v2 v2.8.3/go.mod h1:g9vNIyhb5/9TQgumxQyOEqDHsmGYcGsVMOx/xGkqdMo=
 github.com/tommy-muehle/go-mnd/v2 v2.5.1 h1:NowYhSdyE/1zwK9QCLeRb6USWdoif80Ie+v+yU8u1Zw=
 github.com/tommy-muehle/go-mnd/v2 v2.5.1/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw=
 github.com/ultraware/funlen v0.0.3 h1:5ylVWm8wsNwH5aWo9438pwvsK0QiqVuUrt9bn7S/iLA=
 github.com/ultraware/funlen v0.0.3/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA=
+github.com/ultraware/funlen v0.1.0 h1:BuqclbkY6pO+cvxoq7OsktIXZpgBSkYTQtmwhAK81vI=
+github.com/ultraware/funlen v0.1.0/go.mod h1:XJqmOQja6DpxarLj6Jj1U7JuoS8PvL4nEqDaQhy22p4=
 github.com/ultraware/whitespace v0.0.5 h1:hh+/cpIcopyMYbZNVov9iSxvJU3OYQg78Sfaqzi/CzI=
 github.com/ultraware/whitespace v0.0.5/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA=
+github.com/ultraware/whitespace v0.1.0 h1:O1HKYoh0kIeqE8sFqZf1o0qbORXUCOQFrlaQyZsczZw=
+github.com/ultraware/whitespace v0.1.0/go.mod h1:/se4r3beMFNmewJ4Xmz0nMQ941GJt+qmSHGP9emHYe0=
 github.com/uudashr/gocognit v1.0.6 h1:2Cgi6MweCsdB6kpcVQp7EW4U23iBFQWfTXiWlyp842Y=
 github.com/uudashr/gocognit v1.0.6/go.mod h1:nAIUuVBnYU7pcninia3BHOvQkpQCeO76Uscky5BOwcY=
+github.com/uudashr/gocognit v1.1.2 h1:l6BAEKJqQH2UpKAPKdMfZf5kE4W/2xk8pfU1OVLvniI=
+github.com/uudashr/gocognit v1.1.2/go.mod h1:aAVdLURqcanke8h3vg35BC++eseDm66Z7KmchI5et4k=
 github.com/xen0n/gosmopolitan v1.2.1 h1:3pttnTuFumELBRSh+KQs1zcz4fN6Zy7aB0xlnQSn1Iw=
 github.com/xen0n/gosmopolitan v1.2.1/go.mod h1:JsHq/Brs1o050OOdmzHeOr0N7OtlnKRAGAsElF8xBQA=
+github.com/xen0n/gosmopolitan v1.2.2 h1:/p2KTnMzwRexIW8GlKawsTWOxn7UHA+jCMF/V8HHtvU=
+github.com/xen0n/gosmopolitan v1.2.2/go.mod h1:7XX7Mj61uLYrj0qmeN0zi7XDon9JRAEhYQqAPLVNTeg=
 github.com/yagipy/maintidx v1.0.0 h1:h5NvIsCz+nRDapQ0exNv4aJ0yXSI0420omVANTv3GJM=
 github.com/yagipy/maintidx v1.0.0/go.mod h1:0qNf/I/CCZXSMhsRsrEPDZ+DkekpKLXAJfsTACwgXLk=
 github.com/yeya24/promlinter v0.2.0 h1:xFKDQ82orCU5jQujdaD8stOHiv8UN68BSdn2a8u8Y3o=
 github.com/yeya24/promlinter v0.2.0/go.mod h1:u54lkmBOZrpEbQQ6gox2zWKKLKu2SGe+2KOiextY+IA=
 github.com/ykadowak/zerologlint v0.1.2 h1:Um4P5RMmelfjQqQJKtE8ZW+dLZrXrENeIzWWKw800U4=
 github.com/ykadowak/zerologlint v0.1.2/go.mod h1:KaUskqF3e/v59oPmdq1U1DnKcuHokl2/K1U4pmIELKg=
+github.com/ykadowak/zerologlint v0.1.5 h1:Gy/fMz1dFQN9JZTPjv1hxEk+sRWm05row04Yoolgdiw=
+github.com/ykadowak/zerologlint v0.1.5/go.mod h1:KaUskqF3e/v59oPmdq1U1DnKcuHokl2/K1U4pmIELKg=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -635,6 +761,12 @@ github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 gitlab.com/bosi/decorder v0.2.3 h1:gX4/RgK16ijY8V+BRQHAySfQAb354T7/xQpDB2n10P0=
 gitlab.com/bosi/decorder v0.2.3/go.mod h1:9K1RB5+VPNQYtXtTDAzd2OEftsZb1oV0IrJrzChSdGE=
+gitlab.com/bosi/decorder v0.4.1 h1:VdsdfxhstabyhZovHafFw+9eJ6eU0d2CkFNJcZz/NU4=
+gitlab.com/bosi/decorder v0.4.1/go.mod h1:jecSqWUew6Yle1pCr2eLWTensJMmsxHsBwt+PVbkAqA=
+go-simpler.org/musttag v0.9.0 h1:Dzt6/tyP9ONr5g9h9P3cnYWCxeBFRkd0uJL/w+1Mxos=
+go-simpler.org/musttag v0.9.0/go.mod h1:gA9nThnalvNSKpEoyp3Ko4/vCX2xTpqKoUtNqXOnVR4=
+go-simpler.org/sloglint v0.5.0 h1:2YCcd+YMuYpuqthCgubcF5lBSjb6berc5VMOYUHKrpY=
+go-simpler.org/sloglint v0.5.0/go.mod h1:EUknX5s8iXqf18KQxKnaBHUPVriiPnOrPjjJcsaTcSQ=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -645,6 +777,8 @@ go.tmz.dev/musttag v0.7.0 h1:QfytzjTWGXZmChoX0L++7uQN+yRCPfyFm+whsM+lfGc=
 go.tmz.dev/musttag v0.7.0/go.mod h1:oTFPvgOkJmp5kYL02S8+jrH0eLrBIl57rzWeA26zDEM=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8=
+go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0=
 go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/zap v1.17.0 h1:MTjgFu6ZLKvY6Pvaqk97GlxNBuMpV4Hy/3P6tRGlI2U=
@@ -675,11 +809,15 @@ golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfU
 golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
 golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea h1:vLCWI/yYrdEHyN2JzIzPO3aaQJHQdp89IZBA/+azVC4=
 golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
+golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc h1:ao2WRsKSzW6KuUY9IWPwWahcHCgR0s52IfwutMfEbdM=
+golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
 golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
 golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9 h1:6WHiuFL9FNjg8RljAaT7FNUuKDbvMqS1i5cr2OE2sLQ=
 golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
 golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2 h1:J74nGeMgeFnYQJN59eFwh06jX/V8g0lB7LWpjSLxtgU=
 golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
+golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f h1:phY1HzDcf18Aq9A8KkmRtY9WvOFIxN8wgfvy6Zm1DV8=
+golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -715,6 +853,8 @@ golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
 golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
 golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
+golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -783,6 +923,8 @@ golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
 golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -847,6 +989,8 @@ golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -870,6 +1014,8 @@ golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -954,6 +1100,8 @@ golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
 golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
 golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
 golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
+golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
+golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1050,6 +1198,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -1080,16 +1230,22 @@ honnef.co/go/tools v0.4.2 h1:6qXr+R5w+ktL5UkwEbPp+fEvfyoMPche6GkOpGHZcLc=
 honnef.co/go/tools v0.4.2/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA=
 honnef.co/go/tools v0.4.3 h1:o/n5/K5gXqk8Gozvs2cnL0F2S1/g1vcGCAx2vETjITw=
 honnef.co/go/tools v0.4.3/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA=
+honnef.co/go/tools v0.4.7 h1:9MDAWxMoSnB6QoSqiVr7P5mtkT9pOc1kSxchzPCnqJs=
+honnef.co/go/tools v0.4.7/go.mod h1:+rnGS1THNh8zMwnd2oVOTL9QF6vmfyG6ZXBULae2uc0=
 mvdan.cc/gofumpt v0.4.0 h1:JVf4NN1mIpHogBj7ABpgOyZc65/UUOkKQFkoURsz4MM=
 mvdan.cc/gofumpt v0.4.0/go.mod h1:PljLOHDeZqgS8opHRKLzp2It2VBuSdteAgqUfzMTxlQ=
 mvdan.cc/gofumpt v0.5.0 h1:0EQ+Z56k8tXjj/6TQD25BFNKQXpCvT0rnansIc7Ug5E=
 mvdan.cc/gofumpt v0.5.0/go.mod h1:HBeVDtMKRZpXyxFciAirzdKklDlGu8aAy1wEbH5Y9js=
+mvdan.cc/gofumpt v0.6.0 h1:G3QvahNDmpD+Aek/bNOLrFR2XC6ZAdo62dZu65gmwGo=
+mvdan.cc/gofumpt v0.6.0/go.mod h1:4L0wf+kgIPZtcCWXynNS2e6bhmj73umwnuXSZarixzA=
 mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed h1:WX1yoOaKQfddO/mLzdV4wptyWgoH/6hwLs7QHTixo0I=
 mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc=
 mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b h1:DxJ5nJdkhDlLok9K6qO+5290kphDJbHOQO1DFFFTeBo=
 mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4=
 mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d h1:3rvTIIM22r9pvXk+q3swxUQAQOxksVMGK7sml4nG57w=
 mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d/go.mod h1:IeHQjmn6TOD+e4Z3RFiZMMsLVL+A96Nvptar8Fj71is=
+mvdan.cc/unparam v0.0.0-20240104100049-c549a3470d14 h1:zCr3iRRgdk5eIikZNDphGcM6KGVTx3Yu+/Uu9Es254w=
+mvdan.cc/unparam v0.0.0-20240104100049-c549a3470d14/go.mod h1:ZzZjEpJDOmx8TdVU6umamY3Xy0UAQUI2DHbf05USVbI=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
diff --git a/.bingo/variables.env b/.bingo/variables.env
index cf844231b928d..c48e144db2237 100644
--- a/.bingo/variables.env
+++ b/.bingo/variables.env
@@ -14,7 +14,7 @@ CUE="${GOBIN}/cue-v0.5.0"
 
 DRONE="${GOBIN}/drone-v1.5.0"
 
-GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.53.3"
+GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.57.1"
 
 JB="${GOBIN}/jb-v0.5.1"
 
@@ -22,5 +22,3 @@ LEFTHOOK="${GOBIN}/lefthook-v1.4.8"
 
 SWAGGER="${GOBIN}/swagger-v0.30.2"
 
-WIRE="${GOBIN}/wire-v0.5.0"
-
diff --git a/.bingo/wire.mod b/.bingo/wire.mod
deleted file mode 100644
index fc39b30da167c..0000000000000
--- a/.bingo/wire.mod
+++ /dev/null
@@ -1,5 +0,0 @@
-module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
-
-go 1.16
-
-require github.com/google/wire v0.5.0 // cmd/wire
diff --git a/.bingo/wire.sum b/.bingo/wire.sum
deleted file mode 100644
index 6d4b4b386440f..0000000000000
--- a/.bingo/wire.sum
+++ /dev/null
@@ -1,13 +0,0 @@
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/subcommands v1.0.1 h1:/eqq+otEXm5vhfBrbREPCSVQbvofip6kIz+mX5TUH7k=
-github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
-github.com/google/wire v0.5.0 h1:I7ELFeVBr3yfPIcc8+MWvrjk+3VjbcSzoXm3JVa+jD8=
-github.com/google/wire v0.5.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b h1:NVD8gBK33xpdqCaZVVtd6OFJp+3dxkXuz7+U7KaVN6s=
-golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
diff --git a/.changelog-archive/CHANGELOG.2.md b/.changelog-archive/CHANGELOG.2.md
index 34491f2731f88..7fc14a683dc40 100644
--- a/.changelog-archive/CHANGELOG.2.md
+++ b/.changelog-archive/CHANGELOG.2.md
@@ -105,7 +105,7 @@
 - Notice to makers/users of custom data sources, there is a minor breaking change in 2.2 that
   require an update to custom data sources for them to work in 2.2. [Read this doc](https://github.com/grafana/grafana/tree/master/docs/sources/datasources/plugin_api.md) for more on the
   data source api change.
-- Data source api changes, [PLUGIN_CHANGES.md](https://github.com/grafana/grafana/blob/master/public/app/plugins/PLUGIN_CHANGES.md)
+- Data source api changes, [PLUGIN_CHANGES.md](https://github.com/grafana/grafana/blob/main/public/app/plugins/PLUGIN_CHANGES.md)
 - The duplicate query function used in data source editors is changed, and moveMetricQuery function was renamed
 
 **Tech (Note for devs)**
diff --git a/.changelog-archive/CHANGELOG.3.md b/.changelog-archive/CHANGELOG.3.md
index 12f18c3128765..258aa1ce2e432 100644
--- a/.changelog-archive/CHANGELOG.3.md
+++ b/.changelog-archive/CHANGELOG.3.md
@@ -198,7 +198,7 @@ slack channel (link to slack channel in readme).
 
 ### Breaking changes
 
-- **Plugin API**: Both data source and panel plugin api (and plugin.json schema) have been updated, requiring an update to plugins. See [plugin api](https://github.com/grafana/grafana/blob/master/public/app/plugins/plugin_api.md) for more info.
+- **Plugin API**: Both data source and panel plugin api (and plugin.json schema) have been updated, requiring an update to plugins. See [plugin api](https://github.com/grafana/grafana/blob/main/public/app/plugins/plugin_api.md) for more info.
 - **InfluxDB 0.8.x** The data source for the old version of influxdb (0.8.x) is no longer included in default builds, but can easily be installed via improved plugin system, closes [#3523](https://github.com/grafana/grafana/issues/3523)
 - **KairosDB** The data source is no longer included in default builds, but can easily be installed via improved plugin system, closes [#3524](https://github.com/grafana/grafana/issues/3524)
 - **Templating**: Templating value formats (glob/regex/pipe etc) are now handled automatically and not specified by the user, this makes variable values possible to reuse in many contexts. It can in some edge cases break existing dashboards that have template variables that do not reload on dashboard load. To fix any issue just go into template variable options and update the variable (so it's values are reloaded.).
diff --git a/.changelog-archive/CHANGELOG.4.md b/.changelog-archive/CHANGELOG.4.md
index bb93963a2b443..e919c0c51e3e9 100644
--- a/.changelog-archive/CHANGELOG.4.md
+++ b/.changelog-archive/CHANGELOG.4.md
@@ -100,7 +100,7 @@ See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-
 ## Tech
 
 - **Go**: Grafana is now built using golang 1.9
-- **Webpack**: Changed from systemjs to webpack (see readme or building from source guide for new build instructions). Systemjs is still used to load plugins but now plugins can only import a limited set of dependencies. See [PLUGIN_DEV.md](https://github.com/grafana/grafana/blob/master/PLUGIN_DEV.md) for more details on how this can effect some plugins.
+- **Webpack**: Changed from systemjs to webpack (see readme or building from source guide for new build instructions). Systemjs is still used to load plugins but now plugins can only import a limited set of dependencies. See [PLUGIN_DEV.md](https://github.com/grafana/grafana/blob/main/PLUGIN_DEV.md) for more details on how this can effect some plugins.
 
 # 4.5.2 (2017-09-22)
 
diff --git a/.changelog-archive/CHANGELOG.6.md b/.changelog-archive/CHANGELOG.6.md
index 4cfbded16cab1..6d4ddfe0086de 100644
--- a/.changelog-archive/CHANGELOG.6.md
+++ b/.changelog-archive/CHANGELOG.6.md
@@ -1291,4 +1291,4 @@ repo on July 1st. Make sure you have switched to the new repo by then. The new r
 - **Text Panel**: The text panel does no longer by default allow unsanitized HTML. [#4117](https://github.com/grafana/grafana/issues/4117). This means that if you have text panels with scripts tags they will no longer work as before. To enable unsafe javascript execution in text panels enable the settings `disable_sanitize_html` under the section `[panels]` in your Grafana ini file, or set env variable `GF_PANELS_DISABLE_SANITIZE_HTML=true`.
 - **Dashboard**: Panel property `minSpan` replaced by `maxPerRow`. Dashboard migration will automatically migrate all dashboard panels using the `minSpan` property to the new `maxPerRow` property [#12991](https://github.com/grafana/grafana/pull/12991)
 
-For older release notes, refer to the [CHANGELOG_ARCHIVE.md](https://github.com/grafana/grafana/blob/master/CHANGELOG_ARCHIVE.md)
+For older release notes, refer to the [CHANGELOG_ARCHIVE.md](https://github.com/grafana/grafana/blob/main/CHANGELOG_ARCHIVE.md)
diff --git a/.changelog-archive/CHANGELOG.7.md b/.changelog-archive/CHANGELOG.7.md
index baa857fcdfc88..504788b7481e4 100644
--- a/.changelog-archive/CHANGELOG.7.md
+++ b/.changelog-archive/CHANGELOG.7.md
@@ -544,7 +544,7 @@ Issue [#29407](https://github.com/grafana/grafana/issues/29407)
 
 We have upgraded AngularJS from version 1.6.6 to 1.8.2. Due to this upgrade some old angular plugins might stop working and will require a small update. This is due to the deprecation and removal of pre-assigned bindings. So if your custom angular controllers expect component bindings in the controller constructor you need to move this code to an `$onInit` function. For more details on how to migrate AngularJS code open the [migration guide](https://docs.angularjs.org/guide/migration) and search for **pre-assigning bindings**.
 
-In order not to break all angular panel plugins and data sources we have some custom [angular inject behavior](https://github.com/grafana/grafana/blob/master/public/app/core/injectorMonkeyPatch.ts) that makes sure that bindings for these controllers are still set before constructor is called so many old angular panels and data source plugins will still work. Issue [#28736](https://github.com/grafana/grafana/issues/28736)
+In order not to break all angular panel plugins and data sources we have some custom [angular inject behavior](https://github.com/grafana/grafana/blob/main/public/app/core/injectorMonkeyPatch.ts) that makes sure that bindings for these controllers are still set before constructor is called so many old angular panels and data source plugins will still work. Issue [#28736](https://github.com/grafana/grafana/issues/28736)
 
 ### Deprecations
 
@@ -1288,8 +1288,8 @@ This option to group query variable values into groups by tags has been an exper
 - **Datasource/Loki**: Support for [deprecated Loki endpoints](https://github.com/grafana/loki/blob/master/docs/api.md#lokis-http-api) has been removed.
 - **Backend plugins**: Grafana now requires backend plugins to be signed, otherwise Grafana will not load/start them. This is an additional security measure to make sure backend plugin binaries and files haven't been tampered with. Refer to [Upgrade Grafana](https://grafana.com/docs/grafana/latest/installation/upgrading/#upgrading-to-v7-0) for more information.
 - **Docker**: Our Ubuntu based images have been upgraded to Ubuntu [20.04 LTS](https://releases.ubuntu.com/20.04/).
-- **@grafana/ui**: Forms migration notice, see [@grafana/ui changelog](https://github.com/grafana/grafana/blob/master/packages/grafana-ui/CHANGELOG.md)
-- **@grafana/ui**: Select API change for creating custom values, see [@grafana/ui changelog](https://github.com/grafana/grafana/blob/master/packages/grafana-ui/CHANGELOG.md)
+- **@grafana/ui**: Forms migration notice, see [@grafana/ui changelog](https://github.com/grafana/grafana/blob/main/packages/grafana-ui/CHANGELOG.md)
+- **@grafana/ui**: Select API change for creating custom values, see [@grafana/ui changelog](https://github.com/grafana/grafana/blob/main/packages/grafana-ui/CHANGELOG.md)
 
 **Deprecation warnings**
 
@@ -1304,7 +1304,7 @@ Not just visualizing data from anywhere, in Grafana 7 you can transform it too.
 
 Data transformations will provide a common set of data operations that were previously duplicated as custom features in many panels or data sources but are now an integral part of the Grafana data processing pipeline and something all data sources and panels can take advantage of.
 
-In Grafana 7.0 we have a shared data model for both time series and table data that we call [DataFrame](https://github.com/grafana/grafana/blob/master/docs/sources/plugins/developing/dataframe.md). A DataFrame is like a table with columns but we refer to columns as fields. A time series is simply a DataFrame with two fields (time & value).
+In Grafana 7.0 we have a shared data model for both time series and table data that we call [DataFrame](https://github.com/grafana/grafana/blob/main/docs/sources/plugins/developing/dataframe.md). A DataFrame is like a table with columns but we refer to columns as fields. A time series is simply a DataFrame with two fields (time & value).
 
 **Transformations shipping in 7.0**
 
@@ -1414,7 +1414,7 @@ We have also extended the time zone options so you can select any of the standar
 ### Features / Enhancements
 
 - **Docker**: Upgrade to Alpine 3.11. [#24056](https://github.com/grafana/grafana/pull/24056), [@aknuds1](https://github.com/aknuds1)
-- **Forms**: Remove Forms namespace [BREAKING]. Will cause all `Forms` imports to stop working. See migration guide in [@grafana/ui changelog](https://github.com/grafana/grafana/blob/master/packages/grafana-ui/CHANGELOG.md)[#24378](https://github.com/grafana/grafana/pull/24378), [@tskarhed](https://github.com/tskarhed)
+- **Forms**: Remove Forms namespace [BREAKING]. Will cause all `Forms` imports to stop working. See migration guide in [@grafana/ui changelog](https://github.com/grafana/grafana/blob/main/packages/grafana-ui/CHANGELOG.md)[#24378](https://github.com/grafana/grafana/pull/24378), [@tskarhed](https://github.com/tskarhed)
 
 ### Bug Fixes
 
@@ -1429,7 +1429,7 @@ We have also extended the time zone options so you can select any of the standar
 - **Removed PhantomJS**: PhantomJS was deprecated in [Grafana v6.4](https://grafana.com/docs/grafana/latest/guides/whats-new-in-v6-4/#phantomjs-deprecation) and starting from Grafana v7.0.0, all PhantomJS support has been removed. This means that Grafana no longer ships with a built-in image renderer, and we advise you to install the [Grafana Image Renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer).
 - **Docker**: Our Ubuntu based images have been upgraded to Ubuntu [20.04 LTS](https://releases.ubuntu.com/20.04/).
 - **Dashboard**: A global minimum dashboard refresh interval is now enforced and defaults to 5 seconds.
-- **@grafana/ui**: Forms migration notice, see [@grafana/ui changelog](https://github.com/grafana/grafana/blob/master/packages/grafana-ui/CHANGELOG.md)
+- **@grafana/ui**: Forms migration notice, see [@grafana/ui changelog](https://github.com/grafana/grafana/blob/main/packages/grafana-ui/CHANGELOG.md)
 - **Interval calculation**: There is now a new option `Max data points` that controls the auto interval `$__interval` calculation. Interval was previously calculated by dividing the panel width by the time range. With the new max data points option it is now easy to set `$__interval` to a dynamic value that is time range agnostic. For example if you set `Max data points` to 10 Grafana will dynamically set `$__interval` by dividing the current time range by 10.
 - **Datasource/Loki**: Support for [deprecated Loki endpoints](https://github.com/grafana/loki/blob/master/docs/api.md#lokis-http-api) has been removed.
 
@@ -1484,8 +1484,8 @@ We have also extended the time zone options so you can select any of the standar
 - **Removed PhantomJS**: PhantomJS was deprecated in [Grafana v6.4](https://grafana.com/docs/grafana/latest/guides/whats-new-in-v6-4/#phantomjs-deprecation) and starting from Grafana v7.0.0, all PhantomJS support has been removed. This means that Grafana no longer ships with a built-in image renderer, and we advise you to install the [Grafana Image Renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer).
 - **Docker**: Our Ubuntu based images have been upgraded to Ubuntu [20.04 LTS](https://releases.ubuntu.com/20.04/).
 - **Dashboard**: A global minimum dashboard refresh interval is now enforced and defaults to 5 seconds.
-- **@grafana/ui**: Forms migration notice, see [@grafana/ui changelog](https://github.com/grafana/grafana/blob/master/packages/grafana-ui/CHANGELOG.md)
-- **@grafana/ui**: Select API change for creating custom values, see [@grafana/ui changelog](https://github.com/grafana/grafana/blob/master/packages/grafana-ui/CHANGELOG.md)
+- **@grafana/ui**: Forms migration notice, see [@grafana/ui changelog](https://github.com/grafana/grafana/blob/main/packages/grafana-ui/CHANGELOG.md)
+- **@grafana/ui**: Select API change for creating custom values, see [@grafana/ui changelog](https://github.com/grafana/grafana/blob/main/packages/grafana-ui/CHANGELOG.md)
 - **Interval calculation**: There is now a new option `Max data points` that controls the auto interval `$__interval` calculation. Interval was previously calculated by dividing the panel width by the time range. With the new max data points option it is now easy to set `$__interval` to a dynamic value that is time range agnostic. For example if you set `Max data points` to 10 Grafana will dynamically set `$__interval` by dividing the current time range by 10.
 - **Datasource/Loki**: Support for [deprecated Loki endpoints](https://github.com/grafana/loki/blob/master/docs/api.md#lokis-http-api) has been removed.
 
diff --git a/.drone.star b/.drone.star
index a14146a7c144b..725aeec7850ab 100644
--- a/.drone.star
+++ b/.drone.star
@@ -19,7 +19,6 @@ load(
 )
 load(
     "scripts/drone/pipelines/ci_images.star",
-    "publish_ci_build_container_image_pipeline",
     "publish_ci_windows_test_image_pipeline",
 )
 load(
@@ -51,7 +50,6 @@ def main(_ctx):
         }, "oss", "testing")] +
         integration_test_pipelines() +
         publish_ci_windows_test_image_pipeline() +
-        publish_ci_build_container_image_pipeline() +
         cronjobs() +
         secrets()
     )
diff --git a/.drone.yml b/.drone.yml
index d0814c2440789..f4d661a86157a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,7 +5,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: pr-verify-drone
 node:
@@ -17,14 +18,14 @@ services: []
 steps:
 - commands:
   - echo $DRONE_RUNNER_NAME
-  image: alpine:3.18.3
+  image: alpine:3.19.1
   name: identify-runner
 - commands:
   - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: compile-build-cmd
 - commands:
   - ./bin/build verify-drone
@@ -55,7 +56,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: pr-verify-starlark
 node:
@@ -67,21 +69,21 @@ services: []
 steps:
 - commands:
   - echo $DRONE_RUNNER_NAME
-  image: alpine:3.18.3
+  image: alpine:3.19.1
   name: identify-runner
 - commands:
   - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: compile-build-cmd
 - commands:
   - go install github.com/bazelbuild/buildtools/buildifier@latest
   - buildifier --lint=warn -mode=check -r .
   depends_on:
   - compile-build-cmd
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: lint-starlark
 trigger:
   event:
@@ -105,7 +107,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: pr-test-frontend
 node:
@@ -117,10 +120,11 @@ services: []
 steps:
 - commands:
   - echo $DRONE_RUNNER_NAME
-  image: alpine:3.18.3
+  image: alpine:3.19.1
   name: identify-runner
 - commands:
-  - yarn install --immutable
+  - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
+  - yarn install --immutable || yarn install --immutable
   depends_on: []
   image: node:20.9.0-alpine
   name: yarn-install
@@ -184,7 +188,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: pr-lint-frontend
 node:
@@ -217,10 +222,11 @@ steps:
   name: clone-enterprise
 - commands:
   - echo $DRONE_RUNNER_NAME
-  image: alpine:3.18.3
+  image: alpine:3.19.1
   name: identify-runner
 - commands:
-  - yarn install --immutable
+  - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
+  - yarn install --immutable || yarn install --immutable
   depends_on: []
   image: node:20.9.0-alpine
   name: yarn-install
@@ -244,9 +250,9 @@ steps:
     \"\nTranslation extraction has not been committed. Please run 'yarn i18n:extract',
     commit the changes and push again.\"\n                exit 1\n            fi\n
     \           "
-  - yarn run i18n:compile
   depends_on:
   - yarn-install
+  failure: ignore
   image: node:20.9.0-alpine
   name: verify-i18n
 trigger:
@@ -273,7 +279,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: pr-test-backend
 node:
@@ -306,7 +313,7 @@ steps:
   name: clone-enterprise
 - commands:
   - echo $DRONE_RUNNER_NAME
-  image: alpine:3.18.3
+  image: alpine:3.19.1
   name: identify-runner
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -316,7 +323,7 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -325,21 +332,22 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: verify-gen-jsonnet
 - commands:
   - apk add --update make
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: wire-install
 - commands:
   - apk add --update build-base shared-mime-info shared-mime-info-lang
-  - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
+  - go list -f '{{.Dir}}/...' -m | xargs go test -tags requires_buildifer -short -covermode=atomic
+    -timeout=5m
   depends_on:
   - wire-install
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: test-backend
 - commands:
   - apk add --update build-base
@@ -348,7 +356,7 @@ steps:
     | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: test-backend-integration
 trigger:
   event:
@@ -358,6 +366,7 @@ trigger:
     - docs/**
     - '*.md'
     include:
+    - Makefile
     - pkg/**
     - packaging/**
     - .drone.yml
@@ -365,6 +374,7 @@ trigger:
     - go.sum
     - go.mod
     - public/app/plugins/**/plugin.json
+    - docs/sources/setup-grafana/configure-grafana/feature-toggles/**
     - devenv/**
 type: docker
 volumes:
@@ -378,7 +388,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: pr-lint-backend
 node:
@@ -390,14 +401,14 @@ services: []
 steps:
 - commands:
   - echo $DRONE_RUNNER_NAME
-  image: alpine:3.18.3
+  image: alpine:3.19.1
   name: identify-runner
 - commands:
   - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: compile-build-cmd
 - commands:
   - apk add --update curl jq bash
@@ -424,7 +435,7 @@ steps:
   - apk add --update make
   - make gen-go
   depends_on: []
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: wire-install
 - commands:
   - apk add --update make build-base
@@ -433,16 +444,16 @@ steps:
   - wire-install
   environment:
     CGO_ENABLED: "1"
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: lint-backend
 - commands:
   - go run scripts/modowners/modowners.go check go.mod
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: validate-modfile
 - commands:
   - apk add --update make
   - make swagger-validate
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: validate-openapi-spec
 trigger:
   event:
@@ -452,6 +463,8 @@ trigger:
     - docs/**
     - '*.md'
     include:
+    - .golangci.toml
+    - Makefile
     - pkg/**
     - packaging/**
     - .drone.yml
@@ -473,7 +486,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: pr-build-e2e
 node:
@@ -485,11 +499,11 @@ services: []
 steps:
 - commands:
   - echo $DRONE_RUNNER_NAME
-  image: alpine:3.18.3
+  image: alpine:3.19.1
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.50/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -498,7 +512,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: compile-build-cmd
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -508,7 +522,7 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -517,17 +531,18 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: verify-gen-jsonnet
 - commands:
   - apk add --update make
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: wire-install
 - commands:
-  - yarn install --immutable
+  - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
+  - yarn install --immutable || yarn install --immutable
   depends_on: []
   image: node:20.9.0-alpine
   name: yarn-install
@@ -556,11 +571,14 @@ steps:
     token:
       from_secret: drone_token
 - commands:
-  - /src/grafana-build package --distro=linux/amd64,linux/arm64 --go-version=1.20.10
-    --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD
-    > packages.txt
+  - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64
+    -a targz:grafana:linux/arm/v7 --go-version=1.21.10 --yarn-cache=$$YARN_CACHE_FOLDER
+    --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt
   depends_on:
   - yarn-install
+  environment:
+    _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
+      from_secret: dagger_token
   image: grafana/grafana-build:main
   name: rgm-package
   pull: always
@@ -579,7 +597,7 @@ steps:
     GF_APP_MODE: development
     GF_SERVER_HTTP_PORT: "3001"
     GF_SERVER_ROUTER_LOGGING: "1"
-  image: alpine:3.18.3
+  image: alpine:3.19.1
   name: grafana-server
 - commands:
   - ./bin/build e2e-tests --port 3001 --suite dashboards-suite
@@ -640,6 +658,61 @@ steps:
     repo:
     - grafana/grafana
 - commands:
+  - sleep 10s
+  - yarn e2e:playwright
+  depends_on:
+  - grafana-server
+  environment:
+    HOST: grafana-server
+    PORT: "3001"
+    PROV_DIR: /grafana/scripts/grafana-server/tmp/conf/provisioning
+  image: mcr.microsoft.com/playwright:v1.42.1-jammy
+  name: playwright-plugin-e2e
+- commands:
+  - apt-get update
+  - apt-get install -yq zip
+  - printenv GCP_GRAFANA_UPLOAD_ARTIFACTS_KEY > /tmp/gcpkey_upload_artifacts.json
+  - gcloud auth activate-service-account --key-file=/tmp/gcpkey_upload_artifacts.json
+  - gsutil cp -r ./playwright-report/. gs://releng-pipeline-artifacts-dev/${DRONE_BUILD_NUMBER}/playwright-report
+  - export E2E_PLAYWRIGHT_REPORT_URL=https://storage.googleapis.com/releng-pipeline-artifacts-dev/${DRONE_BUILD_NUMBER}/playwright-report/index.html
+  - "echo \"E2E Playwright report uploaded to: \n $${E2E_PLAYWRIGHT_REPORT_URL}\""
+  depends_on:
+  - playwright-plugin-e2e
+  environment:
+    GCP_GRAFANA_UPLOAD_ARTIFACTS_KEY:
+      from_secret: gcp_upload_artifacts_key
+  failure: ignore
+  image: google/cloud-sdk:431.0.0
+  name: playwright-e2e-report-upload
+  when:
+    status:
+    - success
+    - failure
+- commands:
+  - if [ ! -d ./playwright-report/trace ]; then echo 'all tests passed'; exit 0; fi
+  - export E2E_PLAYWRIGHT_REPORT_URL=https://storage.googleapis.com/releng-pipeline-artifacts-dev/${DRONE_BUILD_NUMBER}/playwright-report/index.html
+  - 'curl -L -X POST https://api.github.com/repos/grafana/grafana/issues/${DRONE_PULL_REQUEST}/comments
+    -H "Accept: application/vnd.github+json" -H "Authorization: Bearer $${GITHUB_TOKEN}"
+    -H "X-GitHub-Api-Version: 2022-11-28" -d "{\"body\":\"❌ Failed to run Playwright
+    plugin e2e tests. <br /> <br /> Click [here]($${E2E_PLAYWRIGHT_REPORT_URL}) to
+    browse the Playwright report and trace viewer. <br /> For information on how to
+    run Playwright tests locally, refer to the [Developer guide](https://github.com/grafana/grafana/blob/main/contribute/developer-guide.md#to-run-the-playwright-tests).
+    \"}"'
+  depends_on:
+  - playwright-e2e-report-upload
+  environment:
+    GITHUB_TOKEN:
+      from_secret: github_token
+  failure: ignore
+  image: byrnedo/alpine-curl:0.1.8
+  name: playwright-e2e-report-post-link
+  when:
+    status:
+    - success
+    - failure
+- commands:
+  - if [ -z `find ./e2e -type f -name *spec.ts.mp4` ]; then echo 'missing videos';
+    false; fi
   - apt-get update
   - apt-get install -yq zip
   - printenv GCP_GRAFANA_UPLOAD_ARTIFACTS_KEY > /tmp/gcpkey_upload_artifacts.json
@@ -685,7 +758,7 @@ steps:
       include:
       - packages/grafana-ui/**
 - commands:
-  - yarn wait-on http://$HOST:$PORT
+  - npx wait-on@7.0.1 http://$HOST:$PORT
   - pa11y-ci --config .pa11yci-pr.conf.js
   depends_on:
   - grafana-server
@@ -699,13 +772,18 @@ steps:
   name: test-a11y-frontend
 - commands:
   - docker run --privileged --rm tonistiigi/binfmt --install all
-  - /src/grafana-build docker $(cat packages.txt | grep tar.gz | grep -v docker |
-    grep -v sha256 | awk '{print "--package=" $0}') --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.18.3
-    --tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --ubuntu-tag-format='{{
+  - /src/grafana-build artifacts -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu
+    -a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7
+    -a docker:grafana:linux/arm/v7:ubuntu --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER
+    --go-version=1.21.10 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{
+    .version_base }}-{{ .buildID }}-{{ .arch }}' --grafana-dir=$$PWD --ubuntu-tag-format='{{
     .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' > docker.txt
   - find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i
   depends_on:
-  - rgm-package
+  - yarn-install
+  environment:
+    _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
+      from_secret: dagger_token
   image: grafana/grafana-build:main
   name: rgm-build-docker
   pull: always
@@ -753,7 +831,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: pr-integration-tests
 node:
@@ -797,9 +876,9 @@ services:
   - name: mysql80
     path: /var/lib/mysql
 - commands:
-  - /bin/mimir -target=backend
+  - /bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled
   environment: {}
-  image: grafana/mimir:latest
+  image: us.gcr.io/kubernetes-dev/mimir:santihernandezc-remove_id_from_grafana_config-d3826b4f8-WIP
   name: mimir_backend
 - environment: {}
   image: redis:6.2.11-alpine
@@ -831,7 +910,7 @@ steps:
   name: clone-enterprise
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.50/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -840,11 +919,11 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: compile-build-cmd
 - commands:
   - echo $DRONE_RUNNER_NAME
-  image: alpine:3.18.3
+  image: alpine:3.19.1
   name: identify-runner
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -854,7 +933,7 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -863,14 +942,14 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: verify-gen-jsonnet
 - commands:
   - apk add --update make
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: wire-install
 - commands:
   - dockerize -wait tcp://postgres:5432 -timeout 120s
@@ -891,7 +970,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: postgres-integration-tests
 - commands:
   - dockerize -wait tcp://mysql57:3306 -timeout 120s
@@ -912,7 +991,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql57
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: mysql-5.7-integration-tests
 - commands:
   - dockerize -wait tcp://mysql80:3306 -timeout 120s
@@ -933,7 +1012,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql80
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: mysql-8.0-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379 -timeout 120s
@@ -942,13 +1021,14 @@ steps:
 - commands:
   - apk add --update build-base
   - go clean -testcache
-  - go test -run IntegrationRedis -covermode=atomic -timeout=2m ./pkg/...
+  - go list -f '{{.Dir}}/...' -m | xargs go test -run IntegrationRedis -covermode=atomic
+    -timeout=2m
   depends_on:
   - wire-install
   - wait-for-redis
   environment:
     REDIS_URL: redis://redis:6379/0
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: redis-integration-tests
 - commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -957,13 +1037,14 @@ steps:
 - commands:
   - apk add --update build-base
   - go clean -testcache
-  - go test -run IntegrationMemcached -covermode=atomic -timeout=2m ./pkg/...
+  - go list -f '{{.Dir}}/...' -m | xargs go test -run IntegrationMemcached -covermode=atomic
+    -timeout=2m
   depends_on:
   - wire-install
   - wait-for-memcached
   environment:
     MEMCACHED_HOSTS: memcached:11211
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: memcached-integration-tests
 - commands:
   - dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@@ -972,15 +1053,14 @@ steps:
 - commands:
   - apk add --update build-base
   - go clean -testcache
-  - go test -run TestIntegrationRemoteAlertmanager -covermode=atomic -timeout=2m ./pkg/services/ngalert/notifier/...
+  - go test -run TestIntegrationRemoteAlertmanager -covermode=atomic -timeout=2m ./pkg/services/ngalert/...
   depends_on:
   - wire-install
   - wait-for-remote-alertmanager
   environment:
-    AM_PASSWORD: test
     AM_TENANT_ID: test
     AM_URL: http://mimir_backend:8080
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: remote-alertmanager-integration-tests
 trigger:
   event:
@@ -1018,7 +1098,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: pr-docs
 node:
@@ -1030,16 +1111,17 @@ services: []
 steps:
 - commands:
   - echo $DRONE_RUNNER_NAME
-  image: alpine:3.18.3
+  image: alpine:3.19.1
   name: identify-runner
 - commands:
-  - yarn install --immutable
+  - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
+  - yarn install --immutable || yarn install --immutable
   depends_on: []
   image: node:20.9.0-alpine
   name: yarn-install
 - commands:
   - pip3 install codespell
-  - codespell -I .codespellignore docs/
+  - codespell -I docs/.codespellignore docs/
   image: python:3.8
   name: codespell
 - commands:
@@ -1056,8 +1138,9 @@ steps:
     true\n---\n'' > /hugo/content/docs/grafana/_index.md'
   - cp -r docs/sources/* /hugo/content/docs/grafana/latest/
   - cd /hugo && make prod
-  image: grafana/docs-base:dbd975af06
+  image: grafana/docs-base:latest
   name: build-docs-website
+  pull: always
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
     with its inputs.'
@@ -1066,7 +1149,7 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: verify-gen-cue
 trigger:
   event:
@@ -1091,7 +1174,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: pr-shellcheck
 node:
@@ -1106,7 +1190,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: compile-build-cmd
 - commands:
   - apt-get update -yq && apt-get install shellcheck
@@ -1133,7 +1217,8 @@ clone:
   retries: 3
 depends_on: []
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: pr-swagger-gen
 node:
@@ -1149,11 +1234,15 @@ steps:
     | jq .head.repo.fork)
   - if [ "$is_fork" != false ]; then return 1; fi
   - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
-    grafana-enterprise
-  - cd grafana-enterprise
+    ../grafana-enterprise
+  - cd ../grafana-enterprise
   - if git checkout ${DRONE_SOURCE_BRANCH}; then echo "checked out ${DRONE_SOURCE_BRANCH}";
-    elif git checkout main; then echo "git checkout main"; else git checkout main;
-    fi
+    elif git checkout ${DRONE_TARGET_BRANCH}; then echo "git checkout ${DRONE_TARGET_BRANCH}";
+    else git checkout main; fi
+  - cd ../
+  - ln -s src grafana
+  - cd ./grafana-enterprise
+  - ./build.sh
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
@@ -1165,25 +1254,19 @@ steps:
   - make swagger-clean && make openapi3-gen
   - for f in public/api-merged.json public/openapi3.json; do git add $f; done
   - if [ -z "$(git diff --name-only --cached)" ]; then echo "Everything seems up to
-    date!"; else echo "Please ensure the branch is up-to-date, then regenerate the
-    specification by running make swagger-clean && make openapi3-gen" && return 1;
-    fi
+    date!"; else git diff --cached && echo "Please ensure the branch is up-to-date,
+    then regenerate the specification by running make swagger-clean && make openapi3-gen"
+    && return 1; fi
   depends_on:
   - clone-enterprise
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: swagger-gen
 trigger:
   event:
   - pull_request
-  paths:
-    exclude:
-    - docs/**
-    - '*.md'
-    include:
-    - pkg/**
 type: docker
 volumes:
 - host:
@@ -1196,7 +1279,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: pr-integration-benchmarks
 node:
@@ -1240,9 +1324,9 @@ services:
   - name: mysql80
     path: /var/lib/mysql
 - commands:
-  - /bin/mimir -target=backend
+  - /bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled
   environment: {}
-  image: grafana/mimir:latest
+  image: us.gcr.io/kubernetes-dev/mimir:santihernandezc-remove_id_from_grafana_config-d3826b4f8-WIP
   name: mimir_backend
 - environment: {}
   image: redis:6.2.11-alpine
@@ -1274,7 +1358,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: compile-build-cmd
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -1285,7 +1369,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - clone-enterprise
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -1295,14 +1379,14 @@ steps:
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on:
   - clone-enterprise
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: verify-gen-jsonnet
 - commands:
   - apk add --update make
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: wire-install
 - commands:
   - apk add --update build-base
@@ -1310,7 +1394,7 @@ steps:
   - go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES}
   depends_on:
   - wire-install
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: sqlite-benchmark-integration-tests
 - commands:
   - apk add --update build-base
@@ -1322,7 +1406,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: postgres-benchmark-integration-tests
 - commands:
   - apk add --update build-base
@@ -1333,7 +1417,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql57
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: mysql-5.7-benchmark-integration-tests
 - commands:
   - apk add --update build-base
@@ -1344,7 +1428,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql80
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: mysql-8.0-benchmark-integration-tests
 trigger:
   event:
@@ -1372,7 +1456,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: main-docs
 node:
@@ -1384,16 +1469,17 @@ services: []
 steps:
 - commands:
   - echo $DRONE_RUNNER_NAME
-  image: alpine:3.18.3
+  image: alpine:3.19.1
   name: identify-runner
 - commands:
-  - yarn install --immutable
+  - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
+  - yarn install --immutable || yarn install --immutable
   depends_on: []
   image: node:20.9.0-alpine
   name: yarn-install
 - commands:
   - pip3 install codespell
-  - codespell -I .codespellignore docs/
+  - codespell -I docs/.codespellignore docs/
   image: python:3.8
   name: codespell
 - commands:
@@ -1410,8 +1496,9 @@ steps:
     true\n---\n'' > /hugo/content/docs/grafana/_index.md'
   - cp -r docs/sources/* /hugo/content/docs/grafana/latest/
   - cd /hugo && make prod
-  image: grafana/docs-base:dbd975af06
+  image: grafana/docs-base:latest
   name: build-docs-website
+  pull: always
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
     with its inputs.'
@@ -1420,7 +1507,7 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: verify-gen-cue
 trigger:
   branch: main
@@ -1446,7 +1533,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: main-test-frontend
 node:
@@ -1458,10 +1546,11 @@ services: []
 steps:
 - commands:
   - echo $DRONE_RUNNER_NAME
-  image: alpine:3.18.3
+  image: alpine:3.19.1
   name: identify-runner
 - commands:
-  - yarn install --immutable
+  - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
+  - yarn install --immutable || yarn install --immutable
   depends_on: []
   image: node:20.9.0-alpine
   name: yarn-install
@@ -1503,7 +1592,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: main-lint-frontend
 node:
@@ -1515,10 +1605,11 @@ services: []
 steps:
 - commands:
   - echo $DRONE_RUNNER_NAME
-  image: alpine:3.18.3
+  image: alpine:3.19.1
   name: identify-runner
 - commands:
-  - yarn install --immutable
+  - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
+  - yarn install --immutable || yarn install --immutable
   depends_on: []
   image: node:20.9.0-alpine
   name: yarn-install
@@ -1542,9 +1633,9 @@ steps:
     \"\nTranslation extraction has not been committed. Please run 'yarn i18n:extract',
     commit the changes and push again.\"\n                exit 1\n            fi\n
     \           "
-  - yarn run i18n:compile
   depends_on:
   - yarn-install
+  failure: ignore
   image: node:20.9.0-alpine
   name: verify-i18n
 trigger:
@@ -1570,7 +1661,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: main-test-backend
 node:
@@ -1582,7 +1674,7 @@ services: []
 steps:
 - commands:
   - echo $DRONE_RUNNER_NAME
-  image: alpine:3.18.3
+  image: alpine:3.19.1
   name: identify-runner
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -1592,7 +1684,7 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -1601,21 +1693,22 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: verify-gen-jsonnet
 - commands:
   - apk add --update make
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: wire-install
 - commands:
   - apk add --update build-base shared-mime-info shared-mime-info-lang
-  - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
+  - go list -f '{{.Dir}}/...' -m | xargs go test -tags requires_buildifer -short -covermode=atomic
+    -timeout=5m
   depends_on:
   - wire-install
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: test-backend
 - commands:
   - apk add --update build-base
@@ -1624,7 +1717,7 @@ steps:
     | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: test-backend-integration
 trigger:
   branch: main
@@ -1649,7 +1742,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: main-lint-backend
 node:
@@ -1661,20 +1755,20 @@ services: []
 steps:
 - commands:
   - echo $DRONE_RUNNER_NAME
-  image: alpine:3.18.3
+  image: alpine:3.19.1
   name: identify-runner
 - commands:
   - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: compile-build-cmd
 - commands:
   - apk add --update make
   - make gen-go
   depends_on: []
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: wire-install
 - commands:
   - apk add --update make build-base
@@ -1683,16 +1777,16 @@ steps:
   - wire-install
   environment:
     CGO_ENABLED: "1"
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: lint-backend
 - commands:
   - go run scripts/modowners/modowners.go check go.mod
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: validate-modfile
 - commands:
   - apk add --update make
   - make swagger-validate
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: validate-openapi-spec
 - commands:
   - ./bin/build verify-drone
@@ -1723,7 +1817,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: main-build-e2e-publish
 node:
@@ -1735,11 +1830,11 @@ services: []
 steps:
 - commands:
   - echo $DRONE_RUNNER_NAME
-  image: alpine:3.18.3
+  image: alpine:3.19.1
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.50/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -1748,7 +1843,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: compile-build-cmd
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -1758,7 +1853,7 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -1767,23 +1862,24 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: verify-gen-jsonnet
 - commands:
   - apk add --update make
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: wire-install
 - commands:
-  - yarn install --immutable
+  - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
+  - yarn install --immutable || yarn install --immutable
   depends_on: []
   image: node:20.9.0-alpine
   name: yarn-install
 - commands:
   - apk add --update jq
-  - new_version=$(cat package.json | jq .version | sed s/pre/${DRONE_BUILD_NUMBER}/g)
+  - new_version=$(cat package.json | jq -r .version | sed s/pre/${DRONE_BUILD_NUMBER}/g)
   - 'echo "New version: $new_version"'
   - yarn run lerna version $new_version --exact --no-git-tag-version --no-push --force-publish
     -y
@@ -1805,11 +1901,14 @@ steps:
   image: node:20.9.0-alpine
   name: build-frontend-packages
 - commands:
-  - /src/grafana-build package --distro=linux/amd64,linux/arm64 --go-version=1.20.10
-    --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD
-    > packages.txt
+  - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64
+    -a targz:grafana:linux/arm/v7 --go-version=1.21.10 --yarn-cache=$$YARN_CACHE_FOLDER
+    --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt
   depends_on:
   - update-package-json-version
+  environment:
+    _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
+      from_secret: dagger_token
   image: grafana/grafana-build:main
   name: rgm-package
   pull: always
@@ -1828,7 +1927,7 @@ steps:
     GF_APP_MODE: development
     GF_SERVER_HTTP_PORT: "3001"
     GF_SERVER_ROUTER_LOGGING: "1"
-  image: alpine:3.18.3
+  image: alpine:3.19.1
   name: grafana-server
 - commands:
   - ./bin/build e2e-tests --port 3001 --suite dashboards-suite
@@ -1889,6 +1988,61 @@ steps:
     repo:
     - grafana/grafana
 - commands:
+  - sleep 10s
+  - yarn e2e:playwright
+  depends_on:
+  - grafana-server
+  environment:
+    HOST: grafana-server
+    PORT: "3001"
+    PROV_DIR: /grafana/scripts/grafana-server/tmp/conf/provisioning
+  image: mcr.microsoft.com/playwright:v1.42.1-jammy
+  name: playwright-plugin-e2e
+- commands:
+  - apt-get update
+  - apt-get install -yq zip
+  - printenv GCP_GRAFANA_UPLOAD_ARTIFACTS_KEY > /tmp/gcpkey_upload_artifacts.json
+  - gcloud auth activate-service-account --key-file=/tmp/gcpkey_upload_artifacts.json
+  - gsutil cp -r ./playwright-report/. gs://releng-pipeline-artifacts-dev/${DRONE_BUILD_NUMBER}/playwright-report
+  - export E2E_PLAYWRIGHT_REPORT_URL=https://storage.googleapis.com/releng-pipeline-artifacts-dev/${DRONE_BUILD_NUMBER}/playwright-report/index.html
+  - "echo \"E2E Playwright report uploaded to: \n $${E2E_PLAYWRIGHT_REPORT_URL}\""
+  depends_on:
+  - playwright-plugin-e2e
+  environment:
+    GCP_GRAFANA_UPLOAD_ARTIFACTS_KEY:
+      from_secret: gcp_upload_artifacts_key
+  failure: ignore
+  image: google/cloud-sdk:431.0.0
+  name: playwright-e2e-report-upload
+  when:
+    status:
+    - success
+    - failure
+- commands:
+  - if [ ! -d ./playwright-report/trace ]; then echo 'all tests passed'; exit 0; fi
+  - export E2E_PLAYWRIGHT_REPORT_URL=https://storage.googleapis.com/releng-pipeline-artifacts-dev/${DRONE_BUILD_NUMBER}/playwright-report/index.html
+  - 'curl -L -X POST https://api.github.com/repos/grafana/grafana/issues/${DRONE_PULL_REQUEST}/comments
+    -H "Accept: application/vnd.github+json" -H "Authorization: Bearer $${GITHUB_TOKEN}"
+    -H "X-GitHub-Api-Version: 2022-11-28" -d "{\"body\":\"❌ Failed to run Playwright
+    plugin e2e tests. <br /> <br /> Click [here]($${E2E_PLAYWRIGHT_REPORT_URL}) to
+    browse the Playwright report and trace viewer. <br /> For information on how to
+    run Playwright tests locally, refer to the [Developer guide](https://github.com/grafana/grafana/blob/main/contribute/developer-guide.md#to-run-the-playwright-tests).
+    \"}"'
+  depends_on:
+  - playwright-e2e-report-upload
+  environment:
+    GITHUB_TOKEN:
+      from_secret: github_token
+  failure: ignore
+  image: byrnedo/alpine-curl:0.1.8
+  name: playwright-e2e-report-post-link
+  when:
+    status:
+    - success
+    - failure
+- commands:
+  - if [ -z `find ./e2e -type f -name *spec.ts.mp4` ]; then echo 'missing videos';
+    false; fi
   - apt-get update
   - apt-get install -yq zip
   - printenv GCP_GRAFANA_UPLOAD_ARTIFACTS_KEY > /tmp/gcpkey_upload_artifacts.json
@@ -1934,7 +2088,7 @@ steps:
       include:
       - packages/grafana-ui/**
 - commands:
-  - yarn wait-on http://$HOST:$PORT
+  - npx wait-on@7.0.1 http://$HOST:$PORT
   - pa11y-ci --config .pa11yci.conf.js --json > pa11y-ci-results.json
   depends_on:
   - grafana-server
@@ -1984,13 +2138,18 @@ steps:
     - grafana/grafana
 - commands:
   - docker run --privileged --rm tonistiigi/binfmt --install all
-  - /src/grafana-build docker $(cat packages.txt | grep tar.gz | grep -v docker |
-    grep -v sha256 | awk '{print "--package=" $0}') --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.18.3
-    --tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --ubuntu-tag-format='{{
+  - /src/grafana-build artifacts -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu
+    -a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7
+    -a docker:grafana:linux/arm/v7:ubuntu --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER
+    --go-version=1.21.10 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{
+    .version_base }}-{{ .buildID }}-{{ .arch }}' --grafana-dir=$$PWD --ubuntu-tag-format='{{
     .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' > docker.txt
   - find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i
   depends_on:
-  - rgm-package
+  - update-package-json-version
+  environment:
+    _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
+      from_secret: dagger_token
   image: grafana/grafana-build:main
   name: rgm-build-docker
   pull: always
@@ -2121,7 +2280,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: main-integration-tests
 node:
@@ -2165,9 +2325,9 @@ services:
   - name: mysql80
     path: /var/lib/mysql
 - commands:
-  - /bin/mimir -target=backend
+  - /bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled
   environment: {}
-  image: grafana/mimir:latest
+  image: us.gcr.io/kubernetes-dev/mimir:santihernandezc-remove_id_from_grafana_config-d3826b4f8-WIP
   name: mimir_backend
 - environment: {}
   image: redis:6.2.11-alpine
@@ -2178,7 +2338,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.50/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2187,11 +2347,11 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: compile-build-cmd
 - commands:
   - echo $DRONE_RUNNER_NAME
-  image: alpine:3.18.3
+  image: alpine:3.19.1
   name: identify-runner
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -2201,7 +2361,7 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -2210,14 +2370,14 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: verify-gen-jsonnet
 - commands:
   - apk add --update make
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: wire-install
 - commands:
   - dockerize -wait tcp://postgres:5432 -timeout 120s
@@ -2238,7 +2398,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: postgres-integration-tests
 - commands:
   - dockerize -wait tcp://mysql57:3306 -timeout 120s
@@ -2259,7 +2419,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql57
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: mysql-5.7-integration-tests
 - commands:
   - dockerize -wait tcp://mysql80:3306 -timeout 120s
@@ -2280,7 +2440,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql80
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: mysql-8.0-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379 -timeout 120s
@@ -2289,13 +2449,14 @@ steps:
 - commands:
   - apk add --update build-base
   - go clean -testcache
-  - go test -run IntegrationRedis -covermode=atomic -timeout=2m ./pkg/...
+  - go list -f '{{.Dir}}/...' -m | xargs go test -run IntegrationRedis -covermode=atomic
+    -timeout=2m
   depends_on:
   - wire-install
   - wait-for-redis
   environment:
     REDIS_URL: redis://redis:6379/0
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: redis-integration-tests
 - commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -2304,13 +2465,14 @@ steps:
 - commands:
   - apk add --update build-base
   - go clean -testcache
-  - go test -run IntegrationMemcached -covermode=atomic -timeout=2m ./pkg/...
+  - go list -f '{{.Dir}}/...' -m | xargs go test -run IntegrationMemcached -covermode=atomic
+    -timeout=2m
   depends_on:
   - wire-install
   - wait-for-memcached
   environment:
     MEMCACHED_HOSTS: memcached:11211
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: memcached-integration-tests
 - commands:
   - dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@@ -2319,15 +2481,14 @@ steps:
 - commands:
   - apk add --update build-base
   - go clean -testcache
-  - go test -run TestIntegrationRemoteAlertmanager -covermode=atomic -timeout=2m ./pkg/services/ngalert/notifier/...
+  - go test -run TestIntegrationRemoteAlertmanager -covermode=atomic -timeout=2m ./pkg/services/ngalert/...
   depends_on:
   - wire-install
   - wait-for-remote-alertmanager
   environment:
-    AM_PASSWORD: test
     AM_TENANT_ID: test
     AM_URL: http://mimir_backend:8080
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: remote-alertmanager-integration-tests
 trigger:
   branch: main
@@ -2365,7 +2526,8 @@ depends_on:
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: main-windows
 platform:
@@ -2380,7 +2542,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.50/windows/grabpl.exe
     -OutFile grabpl.exe
   image: grafana/ci-wix:0.1.1
   name: windows-init
@@ -2409,7 +2571,8 @@ depends_on:
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: main-trigger-downstream
 node:
@@ -2440,7 +2603,7 @@ trigger:
     - docs/**
     - latest.json
   repo:
-  - grafana/grafana-security-mirror
+  - grafana/grafana
 type: docker
 volumes:
 - host:
@@ -2492,7 +2655,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: publish-docker-public
 node:
@@ -2504,11 +2668,11 @@ services: []
 steps:
 - commands:
   - echo $DRONE_RUNNER_NAME
-  image: alpine:3.18.3
+  image: alpine:3.19.1
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.50/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2517,7 +2681,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: compile-build-cmd
 - commands:
   - ./bin/build artifacts docker fetch --edition oss
@@ -2598,7 +2762,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: publish-artifacts-public
 node:
@@ -2613,7 +2778,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: compile-build-cmd
 - commands:
   - ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET}
@@ -2667,7 +2832,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: publish-npm-packages-public
 node:
@@ -2682,10 +2848,11 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: compile-build-cmd
 - commands:
-  - yarn install --immutable
+  - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
+  - yarn install --immutable || yarn install --immutable
   depends_on: []
   image: node:20.9.0-alpine
   name: yarn-install
@@ -2711,7 +2878,7 @@ steps:
     NPM_TOKEN:
       from_secret: npm_token
   failure: ignore
-  image: golang:1.20.10-alpine
+  image: node:20.9.0-alpine
   name: release-npm-packages
 trigger:
   event:
@@ -2732,7 +2899,8 @@ depends_on:
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: publish-packages
 node:
@@ -2747,7 +2915,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: compile-build-cmd
 - depends_on:
   - compile-build-cmd
@@ -2820,7 +2988,8 @@ depends_on:
 - main-test-backend
 - main-test-frontend
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: rgm-main-prerelease
 node:
@@ -2836,6 +3005,7 @@ steps:
   environment:
     _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
       from_secret: dagger_token
+    ALPINE_BASE: alpine:3.19.1
     CDN_DESTINATION:
       from_secret: rgm_cdn_destination
     DESTINATION:
@@ -2852,7 +3022,7 @@ steps:
       from_secret: gcp_key_base64
     GITHUB_TOKEN:
       from_secret: github_token
-    GO_VERSION: 1.20.10
+    GO_VERSION: 1.21.10
     GPG_PASSPHRASE:
       from_secret: packages_gpg_passphrase
     GPG_PRIVATE_KEY:
@@ -2863,6 +3033,7 @@ steps:
       from_secret: npm_token
     STORYBOOK_DESTINATION:
       from_secret: rgm_storybook_destination
+    UBUNTU_BASE: ubuntu:22.04
   image: grafana/grafana-build:main
   name: rgm-build
   pull: always
@@ -2893,7 +3064,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: release-whatsnew-checker
 node:
@@ -2908,13 +3080,13 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: compile-build-cmd
 - commands:
   - ./bin/build whatsnew-checker
   depends_on:
   - compile-build-cmd
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: whats-new-checker
 trigger:
   event:
@@ -2937,7 +3109,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: release-test-frontend
 node:
@@ -2949,10 +3122,11 @@ services: []
 steps:
 - commands:
   - echo $DRONE_RUNNER_NAME
-  image: alpine:3.18.3
+  image: alpine:3.19.1
   name: identify-runner
 - commands:
-  - yarn install --immutable
+  - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
+  - yarn install --immutable || yarn install --immutable
   depends_on: []
   image: node:20.9.0-alpine
   name: yarn-install
@@ -2992,7 +3166,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: release-test-backend
 node:
@@ -3004,7 +3179,7 @@ services: []
 steps:
 - commands:
   - echo $DRONE_RUNNER_NAME
-  image: alpine:3.18.3
+  image: alpine:3.19.1
   name: identify-runner
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -3014,7 +3189,7 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -3023,21 +3198,22 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: verify-gen-jsonnet
 - commands:
   - apk add --update make
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: wire-install
 - commands:
   - apk add --update build-base shared-mime-info shared-mime-info-lang
-  - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
+  - go list -f '{{.Dir}}/...' -m | xargs go test -tags requires_buildifer -short -covermode=atomic
+    -timeout=5m
   depends_on:
   - wire-install
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: test-backend
 - commands:
   - apk add --update build-base
@@ -3046,7 +3222,7 @@ steps:
     | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: test-backend-integration
 trigger:
   event:
@@ -3069,7 +3245,8 @@ depends_on:
 - release-test-backend
 - release-test-frontend
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: rgm-tag-prerelease
 node:
@@ -3085,6 +3262,7 @@ steps:
   environment:
     _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
       from_secret: dagger_token
+    ALPINE_BASE: alpine:3.19.1
     CDN_DESTINATION:
       from_secret: rgm_cdn_destination
     DESTINATION:
@@ -3101,7 +3279,7 @@ steps:
       from_secret: gcp_key_base64
     GITHUB_TOKEN:
       from_secret: github_token
-    GO_VERSION: 1.20.10
+    GO_VERSION: 1.21.10
     GPG_PASSPHRASE:
       from_secret: packages_gpg_passphrase
     GPG_PRIVATE_KEY:
@@ -3112,6 +3290,7 @@ steps:
       from_secret: npm_token
     STORYBOOK_DESTINATION:
       from_secret: rgm_storybook_destination
+    UBUNTU_BASE: ubuntu:22.04
   image: grafana/grafana-build:main
   name: rgm-build
   pull: always
@@ -3138,7 +3317,8 @@ clone:
 depends_on:
 - rgm-tag-prerelease
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: rgm-tag-prerelease-windows
 platform:
@@ -3153,7 +3333,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.50/windows/grabpl.exe
     -OutFile grabpl.exe
   image: grafana/ci-wix:0.1.1
   name: windows-init
@@ -3202,7 +3382,8 @@ depends_on:
 - rgm-tag-prerelease
 - rgm-tag-prerelease-windows
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: rgm-tag-verify-prerelease-assets
 node:
@@ -3247,7 +3428,8 @@ depends_on:
 - release-test-backend
 - release-test-frontend
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: rgm-version-branch-prerelease
 node:
@@ -3263,6 +3445,7 @@ steps:
   environment:
     _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
       from_secret: dagger_token
+    ALPINE_BASE: alpine:3.19.1
     CDN_DESTINATION:
       from_secret: rgm_cdn_destination
     DESTINATION:
@@ -3279,7 +3462,7 @@ steps:
       from_secret: gcp_key_base64
     GITHUB_TOKEN:
       from_secret: github_token
-    GO_VERSION: 1.20.10
+    GO_VERSION: 1.21.10
     GPG_PASSPHRASE:
       from_secret: packages_gpg_passphrase
     GPG_PRIVATE_KEY:
@@ -3290,6 +3473,7 @@ steps:
       from_secret: npm_token
     STORYBOOK_DESTINATION:
       from_secret: rgm_storybook_destination
+    UBUNTU_BASE: ubuntu:22.04
   image: grafana/grafana-build:main
   name: rgm-build
   pull: always
@@ -3310,7 +3494,8 @@ clone:
 depends_on:
 - rgm-version-branch-prerelease
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: rgm-prerelease-verify-prerelease-assets
 node:
@@ -3349,7 +3534,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: nightly-test-frontend
 node:
@@ -3361,10 +3547,11 @@ services: []
 steps:
 - commands:
   - echo $DRONE_RUNNER_NAME
-  image: alpine:3.18.3
+  image: alpine:3.19.1
   name: identify-runner
 - commands:
-  - yarn install --immutable
+  - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
+  - yarn install --immutable || yarn install --immutable
   depends_on: []
   image: node:20.9.0-alpine
   name: yarn-install
@@ -3402,7 +3589,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: nightly-test-backend
 node:
@@ -3414,7 +3602,7 @@ services: []
 steps:
 - commands:
   - echo $DRONE_RUNNER_NAME
-  image: alpine:3.18.3
+  image: alpine:3.19.1
   name: identify-runner
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -3424,7 +3612,7 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -3433,21 +3621,22 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: verify-gen-jsonnet
 - commands:
   - apk add --update make
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: wire-install
 - commands:
   - apk add --update build-base shared-mime-info shared-mime-info-lang
-  - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
+  - go list -f '{{.Dir}}/...' -m | xargs go test -tags requires_buildifer -short -covermode=atomic
+    -timeout=5m
   depends_on:
   - wire-install
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: test-backend
 - commands:
   - apk add --update build-base
@@ -3456,7 +3645,7 @@ steps:
     | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: test-backend-integration
 trigger:
   cron:
@@ -3477,7 +3666,8 @@ depends_on:
 - nightly-test-backend
 - nightly-test-frontend
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: rgm-nightly-build
 node:
@@ -3493,6 +3683,7 @@ steps:
   environment:
     _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
       from_secret: dagger_token
+    ALPINE_BASE: alpine:3.19.1
     CDN_DESTINATION:
       from_secret: rgm_cdn_destination
     DESTINATION:
@@ -3509,7 +3700,7 @@ steps:
       from_secret: gcp_key_base64
     GITHUB_TOKEN:
       from_secret: github_token
-    GO_VERSION: 1.20.10
+    GO_VERSION: 1.21.10
     GPG_PASSPHRASE:
       from_secret: packages_gpg_passphrase
     GPG_PRIVATE_KEY:
@@ -3520,6 +3711,7 @@ steps:
       from_secret: npm_token
     STORYBOOK_DESTINATION:
       from_secret: rgm_storybook_destination
+    UBUNTU_BASE: ubuntu:22.04
   image: grafana/grafana-build:main
   name: rgm-build
   pull: always
@@ -3582,7 +3774,8 @@ clone:
 depends_on:
 - rgm-nightly-build
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: rgm-nightly-publish
 node:
@@ -3637,6 +3830,7 @@ steps:
   environment:
     _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
       from_secret: dagger_token
+    ALPINE_BASE: alpine:3.19.1
     CDN_DESTINATION:
       from_secret: rgm_cdn_destination
     DESTINATION:
@@ -3653,7 +3847,7 @@ steps:
       from_secret: gcp_key_base64
     GITHUB_TOKEN:
       from_secret: github_token
-    GO_VERSION: 1.20.10
+    GO_VERSION: 1.21.10
     GPG_PASSPHRASE:
       from_secret: packages_gpg_passphrase
     GPG_PRIVATE_KEY:
@@ -3664,6 +3858,7 @@ steps:
       from_secret: npm_token
     STORYBOOK_DESTINATION:
       from_secret: rgm_storybook_destination
+    UBUNTU_BASE: ubuntu:22.04
   image: grafana/grafana-build:main
   name: rgm-publish
   pull: always
@@ -3723,13 +3918,115 @@ volumes:
     path: /var/run/docker.sock
   name: docker
 ---
+clone:
+  retries: 3
+depends_on: []
+image_pull_secrets:
+- gcr
+- gar
+kind: pipeline
+name: rgm-promotion
+node:
+  type: no-parallel
+platform:
+  arch: amd64
+  os: linux
+services: []
+steps:
+- commands:
+  - 'dagger run --silent /src/grafana-build artifacts -a $${ARTIFACTS} --grafana-ref=$${GRAFANA_REF}
+    --enterprise-ref=$${ENTERPRISE_REF} --grafana-repo=$${GRAFANA_REPO} --version=$${VERSION} '
+  environment:
+    _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
+      from_secret: dagger_token
+    ALPINE_BASE: alpine:3.19.1
+    CDN_DESTINATION:
+      from_secret: rgm_cdn_destination
+    DESTINATION:
+      from_secret: destination
+    DOCKER_PASSWORD:
+      from_secret: docker_password
+    DOCKER_USERNAME:
+      from_secret: docker_username
+    DOWNLOADS_DESTINATION:
+      from_secret: rgm_downloads_destination
+    GCOM_API_KEY:
+      from_secret: grafana_api_key
+    GCP_KEY_BASE64:
+      from_secret: gcp_key_base64
+    GITHUB_TOKEN:
+      from_secret: github_token
+    GO_VERSION: 1.21.10
+    GPG_PASSPHRASE:
+      from_secret: packages_gpg_passphrase
+    GPG_PRIVATE_KEY:
+      from_secret: packages_gpg_private_key
+    GPG_PUBLIC_KEY:
+      from_secret: packages_gpg_public_key
+    NPM_TOKEN:
+      from_secret: npm_token
+    STORYBOOK_DESTINATION:
+      from_secret: rgm_storybook_destination
+    UBUNTU_BASE: ubuntu:22.04
+  image: grafana/grafana-build:main
+  name: rgm-build
+  pull: always
+  volumes:
+  - name: docker
+    path: /var/run/docker.sock
+- commands:
+  - printenv GCP_KEY_BASE64 | base64 -d > /tmp/key.json
+  - gcloud auth activate-service-account --key-file=/tmp/key.json
+  - gcloud storage cp -r dist/* $${UPLOAD_TO}
+  environment:
+    _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
+      from_secret: dagger_token
+    CDN_DESTINATION:
+      from_secret: rgm_cdn_destination
+    DESTINATION:
+      from_secret: destination
+    DOCKER_PASSWORD:
+      from_secret: docker_password
+    DOCKER_USERNAME:
+      from_secret: docker_username
+    DOWNLOADS_DESTINATION:
+      from_secret: rgm_downloads_destination
+    GCOM_API_KEY:
+      from_secret: grafana_api_key
+    GCP_KEY_BASE64:
+      from_secret: gcp_key_base64
+    GITHUB_TOKEN:
+      from_secret: github_token
+    GPG_PASSPHRASE:
+      from_secret: packages_gpg_passphrase
+    GPG_PRIVATE_KEY:
+      from_secret: packages_gpg_private_key
+    GPG_PUBLIC_KEY:
+      from_secret: packages_gpg_public_key
+    NPM_TOKEN:
+      from_secret: npm_token
+    STORYBOOK_DESTINATION:
+      from_secret: rgm_storybook_destination
+  image: google/cloud-sdk:alpine
+  name: rgm-copy
+trigger:
+  event:
+  - promote
+  target: upload-packages
+type: docker
+volumes:
+- host:
+    path: /var/run/docker.sock
+  name: docker
+---
 clone:
   disable: true
 depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: testing-test-backend-windows
 platform:
@@ -3749,20 +4046,20 @@ steps:
 - commands: []
   depends_on:
   - clone
-  image: golang:1.20.10-windowsservercore-1809
+  image: golang:1.21.10-windowsservercore-1809
   name: windows-init
 - commands:
   - go install github.com/google/wire/cmd/wire@v0.5.0
   - wire gen -tags oss ./pkg/server
   depends_on:
   - windows-init
-  image: golang:1.20.10-windowsservercore-1809
+  image: golang:1.21.10-windowsservercore-1809
   name: wire-install
 - commands:
   - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
   depends_on:
   - wire-install
-  image: golang:1.20.10-windowsservercore-1809
+  image: golang:1.21.10-windowsservercore-1809
   name: test-backend
 trigger:
   event:
@@ -3781,7 +4078,8 @@ depends_on: []
 environment:
   EDITION: oss
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: integration-tests
 node:
@@ -3825,9 +4123,9 @@ services:
   - name: mysql80
     path: /var/lib/mysql
 - commands:
-  - /bin/mimir -target=backend
+  - /bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled
   environment: {}
-  image: grafana/mimir:latest
+  image: us.gcr.io/kubernetes-dev/mimir:santihernandezc-remove_id_from_grafana_config-d3826b4f8-WIP
   name: mimir_backend
 - environment: {}
   image: redis:6.2.11-alpine
@@ -3838,13 +4136,13 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.50/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
 - commands:
   - echo $DRONE_RUNNER_NAME
-  image: alpine:3.18.3
+  image: alpine:3.19.1
   name: identify-runner
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -3854,7 +4152,7 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -3863,14 +4161,14 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: verify-gen-jsonnet
 - commands:
   - apk add --update make
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: wire-install
 - commands:
   - dockerize -wait tcp://postgres:5432 -timeout 120s
@@ -3891,7 +4189,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: postgres-integration-tests
 - commands:
   - dockerize -wait tcp://mysql57:3306 -timeout 120s
@@ -3912,7 +4210,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql57
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: mysql-5.7-integration-tests
 - commands:
   - dockerize -wait tcp://mysql80:3306 -timeout 120s
@@ -3933,7 +4231,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql80
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: mysql-8.0-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379 -timeout 120s
@@ -3942,13 +4240,14 @@ steps:
 - commands:
   - apk add --update build-base
   - go clean -testcache
-  - go test -run IntegrationRedis -covermode=atomic -timeout=2m ./pkg/...
+  - go list -f '{{.Dir}}/...' -m | xargs go test -run IntegrationRedis -covermode=atomic
+    -timeout=2m
   depends_on:
   - wire-install
   - wait-for-redis
   environment:
     REDIS_URL: redis://redis:6379/0
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: redis-integration-tests
 - commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -3957,13 +4256,14 @@ steps:
 - commands:
   - apk add --update build-base
   - go clean -testcache
-  - go test -run IntegrationMemcached -covermode=atomic -timeout=2m ./pkg/...
+  - go list -f '{{.Dir}}/...' -m | xargs go test -run IntegrationMemcached -covermode=atomic
+    -timeout=2m
   depends_on:
   - wire-install
   - wait-for-memcached
   environment:
     MEMCACHED_HOSTS: memcached:11211
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: memcached-integration-tests
 - commands:
   - dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@@ -3972,15 +4272,14 @@ steps:
 - commands:
   - apk add --update build-base
   - go clean -testcache
-  - go test -run TestIntegrationRemoteAlertmanager -covermode=atomic -timeout=2m ./pkg/services/ngalert/notifier/...
+  - go test -run TestIntegrationRemoteAlertmanager -covermode=atomic -timeout=2m ./pkg/services/ngalert/...
   depends_on:
   - wire-install
   - wait-for-remote-alertmanager
   environment:
-    AM_PASSWORD: test
     AM_TENANT_ID: test
     AM_URL: http://mimir_backend:8080
-  image: golang:1.20.10-alpine
+  image: golang:1.21.10-alpine
   name: remote-alertmanager-integration-tests
 trigger:
   event:
@@ -4005,7 +4304,8 @@ clone:
   disable: true
 depends_on: []
 image_pull_secrets:
-- dockerconfigjson
+- gcr
+- gar
 kind: pipeline
 name: publish-ci-windows-test-image
 platform:
@@ -4049,59 +4349,6 @@ volumes:
     path: //./pipe/docker_engine/
   name: docker
 ---
-clone:
-  retries: 3
-depends_on: []
-image_pull_secrets:
-- dockerconfigjson
-kind: pipeline
-name: publish-ci-build-container-image
-node:
-  type: no-parallel
-platform:
-  arch: amd64
-  os: linux
-services: []
-steps:
-- commands:
-  - if [ -z "${BUILD_CONTAINER_VERSION}" ]; then echo Missing BUILD_CONTAINER_VERSION;
-    false; fi
-  image: alpine:3.18.3
-  name: validate-version
-- commands:
-  - printenv GCP_KEY > /tmp/key.json
-  - gcloud auth activate-service-account --key-file=/tmp/key.json
-  - gsutil cp gs://grafana-private-downloads/MacOSX10.15.sdk.tar.xz ./scripts/build/ci-build/MacOSX10.15.sdk.tar.xz
-  environment:
-    GCP_KEY:
-      from_secret: gcp_download_build_container_assets_key
-  image: google/cloud-sdk:431.0.0
-  name: download-macos-sdk
-- commands:
-  - printenv DOCKER_PASSWORD | docker login -u "$DOCKER_USERNAME" --password-stdin
-  - docker build -t "grafana/build-container:${BUILD_CONTAINER_VERSION}" ./scripts/build/ci-build
-  - docker push "grafana/build-container:${BUILD_CONTAINER_VERSION}"
-  environment:
-    DOCKER_PASSWORD:
-      from_secret: docker_password
-    DOCKER_USERNAME:
-      from_secret: docker_username
-  image: google/cloud-sdk:431.0.0
-  name: build-and-publish
-  volumes:
-  - name: docker
-    path: /var/run/docker.sock
-trigger:
-  event:
-  - promote
-  target:
-  - ci-build-container-image
-type: docker
-volumes:
-- host:
-    path: /var/run/docker.sock
-  name: docker
----
 clone:
   retries: 3
 kind: pipeline
@@ -4386,17 +4633,17 @@ steps:
     path: /root/.docker/
 - commands:
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine/git:2.40.1
-  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.20.10-alpine
+  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.21.10-alpine
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20.9.0-alpine
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana-ci-deploy:1.3.3
-  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine:3.18.3
+  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine:3.19.1
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM ubuntu:22.04
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM byrnedo/alpine-curl:0.1.8
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM plugins/slack
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM python:3.8
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM postgres:12.3-alpine
-  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/mimir:latest
+  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM us.gcr.io/kubernetes-dev/mimir:santihernandezc-remove_id_from_grafana_config-d3826b4f8-WIP
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM mysql:5.7.39
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM mysql:8.0.32
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM redis:6.2.11-alpine
@@ -4405,10 +4652,11 @@ steps:
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM osixia/openldap:1.4.0
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/drone-downstream
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/docker-puppeteer:1.1.0
-  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/docs-base:dbd975af06
+  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/docs-base:latest
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM cypress/included:13.1.0
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM jwilder/dockerize:0.6.1
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM koalaman/shellcheck:stable
+  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM mcr.microsoft.com/playwright:v1.42.1-jammy
   depends_on:
   - authenticate-gcr
   image: aquasec/trivy:0.21.0
@@ -4420,17 +4668,17 @@ steps:
     path: /root/.docker/
 - commands:
   - trivy --exit-code 1 --severity HIGH,CRITICAL alpine/git:2.40.1
-  - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.20.10-alpine
+  - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.21.10-alpine
   - trivy --exit-code 1 --severity HIGH,CRITICAL node:20.9.0-alpine
   - trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0
   - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana-ci-deploy:1.3.3
-  - trivy --exit-code 1 --severity HIGH,CRITICAL alpine:3.18.3
+  - trivy --exit-code 1 --severity HIGH,CRITICAL alpine:3.19.1
   - trivy --exit-code 1 --severity HIGH,CRITICAL ubuntu:22.04
   - trivy --exit-code 1 --severity HIGH,CRITICAL byrnedo/alpine-curl:0.1.8
   - trivy --exit-code 1 --severity HIGH,CRITICAL plugins/slack
   - trivy --exit-code 1 --severity HIGH,CRITICAL python:3.8
   - trivy --exit-code 1 --severity HIGH,CRITICAL postgres:12.3-alpine
-  - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/mimir:latest
+  - trivy --exit-code 1 --severity HIGH,CRITICAL us.gcr.io/kubernetes-dev/mimir:santihernandezc-remove_id_from_grafana_config-d3826b4f8-WIP
   - trivy --exit-code 1 --severity HIGH,CRITICAL mysql:5.7.39
   - trivy --exit-code 1 --severity HIGH,CRITICAL mysql:8.0.32
   - trivy --exit-code 1 --severity HIGH,CRITICAL redis:6.2.11-alpine
@@ -4439,10 +4687,11 @@ steps:
   - trivy --exit-code 1 --severity HIGH,CRITICAL osixia/openldap:1.4.0
   - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/drone-downstream
   - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/docker-puppeteer:1.1.0
-  - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/docs-base:dbd975af06
+  - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/docs-base:latest
   - trivy --exit-code 1 --severity HIGH,CRITICAL cypress/included:13.1.0
   - trivy --exit-code 1 --severity HIGH,CRITICAL jwilder/dockerize:0.6.1
   - trivy --exit-code 1 --severity HIGH,CRITICAL koalaman/shellcheck:stable
+  - trivy --exit-code 1 --severity HIGH,CRITICAL mcr.microsoft.com/playwright:v1.42.1-jammy
   depends_on:
   - authenticate-gcr
   environment:
@@ -4497,7 +4746,13 @@ get:
   name: .dockerconfigjson
   path: secret/data/common/gcr
 kind: secret
-name: dockerconfigjson
+name: gcr
+---
+get:
+  name: .dockerconfigjson
+  path: secret/data/common/gar
+kind: secret
+name: gar
 ---
 get:
   name: pat
@@ -4668,6 +4923,6 @@ kind: secret
 name: gcr_credentials
 ---
 kind: signature
-hmac: 4c04040e7890d9f1da64ff3e2c006db1b3de4276b57ce4401849ec4ceb665ea8
+hmac: 9aca5c8de91c97ea30ac4ff4b5f5acf930a61afa727197d99b8dd4f3311fca47
 
 ...
diff --git a/.eslintrc b/.eslintrc
index 50061606929d3..b64d731e0c913 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -96,8 +96,36 @@
     },
     {
       "files": [
+        "public/app/plugins/datasource/azuremonitor/*.{ts,tsx}",
+        "public/app/plugins/datasource/azuremonitor/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/cloud-monitoring/*.{ts,tsx}",
+        "public/app/plugins/datasource/cloud-monitoring/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/elasticsearch/*.{ts,tsx}",
+        "public/app/plugins/datasource/elasticsearch/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/grafana-postgresql-datasource/*.{ts,tsx}",
+        "public/app/plugins/datasource/grafana-postgresql-datasource/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/grafana-pyroscope-datasource/*.{ts,tsx}",
+        "public/app/plugins/datasource/grafana-pyroscope-datasource/**/*.{ts,tsx}",
         "public/app/plugins/datasource/grafana-testdata-datasource/*.{ts,tsx}",
-        "public/app/plugins/datasource/grafana-testdata-datasource/**/*.{ts,tsx}"
+        "public/app/plugins/datasource/grafana-testdata-datasource/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/jaeger/*.{ts,tsx}",
+        "public/app/plugins/datasource/jaeger/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/loki/*.{ts,tsx}",
+        "public/app/plugins/datasource/loki/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/mysql/*.{ts,tsx}",
+        "public/app/plugins/datasource/mysql/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/parca/*.{ts,tsx}",
+        "public/app/plugins/datasource/parca/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/tempo/*.{ts,tsx}",
+        "public/app/plugins/datasource/tempo/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/loki/*.{ts,tsx}",
+        "public/app/plugins/datasource/loki/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/elasticsearch/*.{ts,tsx}",
+        "public/app/plugins/datasource/elasticsearch/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/cloudwatch/*.{ts,tsx}",
+        "public/app/plugins/datasource/cloudwatch/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/zipkin/*.{ts,tsx}",
+        "public/app/plugins/datasource/zipkin/**/*.{ts,tsx}"
       ],
       "settings": {
         "import/resolver": {
@@ -113,8 +141,8 @@
             "zones": [
               {
                 "target": "./public/app/plugins",
-                "from": "./public/app",
-                "except": ["./plugins"],
+                "from": "./public",
+                "except": ["./app/plugins"],
                 "message": "Core plugins are not allowed to depend on Grafana core packages"
               }
             ]
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 2a7d1df2adc17..f1898318c7db9 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -12,14 +12,12 @@
 # This should make it easy to add new rules without breaking existing ones.
 
 # Documentation
-/.changelog-archive @grafana/grafana-delivery
-/.codespellignore @grafana/docs-tooling
-/CHANGELOG.md @grafana/grafana-delivery
+/.changelog-archive @grafana/grafana-release-guild
+/CHANGELOG.md @grafana/grafana-release-guild
 /CODE_OF_CONDUCT.md @grafana/grafana-community-support
 /CONTRIBUTING.md @grafana/grafana-community-support
 /GOVERNANCE.md @RichiH
 /HALL_OF_FAME.md @grafana/grafana-community-support
-/ISSUE_TRIAGE.md @grafana/grafana-community-support
 /LICENSE @torkelo
 /LICENSING.md @torkelo
 /MAINTAINERS.md @RichiH
@@ -28,35 +26,42 @@
 /ROADMAP.md @torkelo
 /SECURITY.md @grafana/security-team
 /SUPPORT.md @torkelo
-/UPGRADING_DEPENDENCIES.md @grafana/docs-grafana
 /WORKFLOW.md @torkelo
 /contribute/ @grafana/grafana-community-support
+/contribute/UPGRADING_DEPENDENCIES.md @grafana/docs-grafana
 /devenv/README.md @grafana/docs-grafana
 
-# Technical documentation
+# START Technical documentation
 # `make docs` procedure and related workflows are owned @grafana/docs-tooling. Slack #docs.
-# Documentation sources might have different owners.
-/docs/                                                                       @grafana/docs-tooling
-/docs/sources/                                                               @Eve832
-/docs/sources/administration/                                                @jdbaldry
-/docs/sources/alerting/                                                      @brendamuir
-/docs/sources/dashboards/                                                    @imatwawana
-/docs/sources/datasources/                                                   @lwandz13
-/docs/sources/explore/                                                       @grafana/explore-squad
-/docs/sources/fundamentals                                                   @chri2547
-/docs/sources/getting-started/                                               @chri2547
-/docs/sources/introduction/                                                  @chri2547
-/docs/sources/old-alerting/                                                  @brendamuir
-/docs/sources/panels-visualizations/                                         @imatwawana
-/docs/sources/release-notes/                                                 @Eve832 @GrafanaWriter
-/docs/sources/setup-grafana/                                                 @chri2547
-/docs/sources/upgrade-guide/                                                 @imatwawana
-/docs/sources/whatsnew/                                                      @imatwawana
-/docs/sources/developers/plugins/                                            @Eve832 @josmperez @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
+/docs/                                                                            @grafana/docs-tooling
+
+/docs/.codespellignore                                                            @grafana/docs-tooling
+/docs/sources/                                                                    @Eve832
+
+/docs/sources/administration/                                                     @jdbaldry
+/docs/sources/alerting/                                                           @brendamuir
+/docs/sources/dashboards/                                                         @imatwawana
+/docs/sources/datasources/                                                        @jdbaldry
+/docs/sources/explore/                                                            @grafana/explore-squad @lwandz13
+/docs/sources/fundamentals                                                        @chri2547
+/docs/sources/getting-started/                                                    @chri2547
+/docs/sources/introduction/                                                       @chri2547
+/docs/sources/panels-visualizations/                                              @imatwawana
+/docs/sources/release-notes/                                                      @Eve832 @GrafanaWriter
+/docs/sources/setup-grafana/                                                      @chri2547
+/docs/sources/upgrade-guide/                                                      @imatwawana
+/docs/sources/whatsnew/                                                           @imatwawana
+
+/docs/sources/developers/plugins/                                                 @Eve832 @josmperez @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
+
+/docs/sources/panels-visualizations/query-transform-data/transform-data/index.md  @imatwawana @baldm0mma
+# END Technical documentation
 
 # Backend code
 /go.mod @grafana/backend-platform
 /go.sum @grafana/backend-platform
+/go.work @grafana/grafana-app-platform-squad
+/go.work.sum @grafana/grafana-app-platform-squad
 /.bingo/ @grafana/backend-platform
 /pkg/README.md @grafana/backend-platform
 /pkg/ruleguard.rules.go @grafana/backend-platform
@@ -64,13 +69,15 @@
 /.golangci.toml @grafana/backend-platform
 /build.go @grafana/backend-platform
 /scripts/modowners/ @grafana/backend-platform
+/hack/ @grafana/grafana-app-platform-squad
 
 /pkg/api/ @grafana/backend-platform
 /pkg/apis/ @grafana/grafana-app-platform-squad
 /pkg/bus/ @grafana/backend-platform
 /pkg/cmd/ @grafana/backend-platform
-/pkg/components/apikeygen/ @grafana/grafana-authnz-team
-/pkg/components/satokengen/ @grafana/grafana-authnz-team
+/pkg/cmd/grafana/apiserver @grafana/grafana-app-platform-squad
+/pkg/components/apikeygen/ @grafana/identity-access-team
+/pkg/components/satokengen/ @grafana/identity-access-team
 /pkg/components/dashdiffs/ @grafana/backend-platform
 /pkg/components/imguploader/ @grafana/backend-platform
 /pkg/components/loki/ @grafana/backend-platform
@@ -81,7 +88,6 @@
 /pkg/ifaces/ @grafana/backend-platform
 /pkg/infra/appcontext/ @grafana/backend-platform
 /pkg/infra/db/ @grafana/backend-platform
-/pkg/infra/grn/ @grafana/backend-platform
 /pkg/infra/localcache/ @grafana/backend-platform
 /pkg/infra/log/ @grafana/backend-platform
 /pkg/infra/metrics/ @grafana/backend-platform
@@ -96,18 +102,20 @@
 /pkg/mocks/ @grafana/backend-platform
 /pkg/models/ @grafana/backend-platform
 /pkg/server/ @grafana/backend-platform
+/pkg/apiserver @grafana/grafana-app-platform-squad
+/pkg/apimachinery @grafana/grafana-app-platform-squad
+/pkg/promlib @grafana/observability-metrics
 /pkg/services/annotations/ @grafana/backend-platform
-/pkg/services/apikey/ @grafana/grafana-authnz-team
+/pkg/services/apikey/ @grafana/identity-access-team
 /pkg/services/cleanup/ @grafana/backend-platform
 /pkg/services/contexthandler/ @grafana/backend-platform
 /pkg/services/correlations/ @grafana/explore-squad
 /pkg/services/dashboardimport/ @grafana/backend-platform
 /pkg/services/dashboards/ @grafana/backend-platform
-/pkg/services/dashboardsnapshots/ @grafana/sharing-squad
 /pkg/services/dashboardversion/ @grafana/backend-platform
 /pkg/services/encryption/ @grafana/backend-platform
 /pkg/services/folder/ @grafana/backend-platform
-/pkg/services/grafana-apiserver @grafana/grafana-app-platform-squad
+/pkg/services/apiserver @grafana/grafana-app-platform-squad
 /pkg/services/hooks/ @grafana/backend-platform
 /pkg/services/kmsproviders/ @grafana/backend-platform
 /pkg/services/licensing/ @grafana/backend-platform
@@ -115,10 +123,8 @@
 /pkg/services/notifications/ @grafana/backend-platform
 /pkg/services/org/ @grafana/backend-platform
 /pkg/services/playlist/ @grafana/grafana-app-platform-squad
-/pkg/services/plugindashboards/ @grafana/backend-platform
 /pkg/services/preference/ @grafana/backend-platform
 /pkg/services/provisioning/ @grafana/backend-platform
-/pkg/services/publicdashboards/ @grafana/sharing-squad
 /pkg/services/query/ @grafana/backend-platform
 /pkg/services/queryhistory/ @grafana/backend-platform
 /pkg/services/quota/ @grafana/backend-platform
@@ -129,27 +135,26 @@
 /pkg/services/secrets/ @grafana/backend-platform
 /pkg/services/shorturls/ @grafana/backend-platform
 /pkg/services/sqlstore/ @grafana/backend-platform
+/pkg/services/ssosettings/ @grafana/identity-access-team
 /pkg/services/star/ @grafana/backend-platform
 /pkg/services/stats/ @grafana/backend-platform
 /pkg/services/tag/ @grafana/backend-platform
-/pkg/services/team/ @grafana/grafana-authnz-team
+/pkg/services/team/ @grafana/identity-access-team
 /pkg/services/temp_user/ @grafana/backend-platform
 /pkg/services/updatechecker/ @grafana/backend-platform
-/pkg/services/user/ @grafana/grafana-authnz-team
+/pkg/services/user/ @grafana/identity-access-team
 /pkg/services/validations/ @grafana/backend-platform
 /pkg/setting/ @grafana/backend-platform
 /pkg/tests/ @grafana/backend-platform
+/pkg/tests/apis/ @grafana/grafana-app-platform-squad
 /pkg/tests/api/correlations/ @grafana/explore-squad
 /pkg/tsdb/grafanads/ @grafana/backend-platform
-/pkg/tsdb/intervalv2/ @grafana/backend-platform
 /pkg/tsdb/legacydata/ @grafana/backend-platform
 /pkg/tsdb/opentsdb/ @grafana/backend-platform
 /pkg/tsdb/sqleng/ @grafana/partner-datasources @grafana/oss-big-tent
-/pkg/tsdb/sqleng/proxyutil @grafana/hosted-grafana-team
 /pkg/util/ @grafana/backend-platform
 /pkg/web/ @grafana/backend-platform
 
-/pkg/services/grpcserver/ @grafana/backend-platform
 /pkg/infra/kvstore/ @grafana/backend-platform
 /pkg/infra/fs/ @grafana/backend-platform
 /pkg/infra/x/ @grafana/backend-platform
@@ -157,7 +162,7 @@
 
 # devenv
 # Backend code, developers environment
-/devenv/docker/blocks/auth/ @grafana/grafana-authnz-team
+/devenv/docker/blocks/auth/ @grafana/identity-access-team
 
 # Logs code, developers environment
 /devenv/docker/blocks/loki* @grafana/observability-logs
@@ -166,8 +171,8 @@
 
 /devenv/bulk-dashboards/ @grafana/dashboards-squad
 /devenv/bulk-folders/ @grafana/grafana-frontend-platform
-/devenv/bulk_alerting_dashboards/ @grafana/alerting-backend-product
 /devenv/create_docker_compose.sh @grafana/backend-platform
+/devenv/alert_rules.yaml @grafana/alerting-backend-product
 /devenv/dashboards.yaml @grafana/dashboards-squad
 /devenv/datasources.yaml @grafana/backend-platform
 /devenv/datasources_docker.yaml @grafana/backend-platform
@@ -185,13 +190,13 @@
 /devenv/docker/blocks/influxdb1/ @grafana/observability-metrics
 /devenv/docker/blocks/jaeger/ @grafana/observability-traces-and-profiling
 /devenv/docker/blocks/maildev/ @grafana/alerting-frontend
-/devenv/docker/blocks/mariadb/ @grafana/grafana-bi-squad
+/devenv/docker/blocks/mariadb/ @grafana/oss-big-tent
 /devenv/docker/blocks/memcached/ @grafana/backend-platform
 /devenv/docker/blocks/mimir_backend/ @grafana/alerting-backend-product
-/devenv/docker/blocks/mssql/ @grafana/grafana-bi-squad
-/devenv/docker/blocks/mssql_arm64/ @grafana/grafana-bi-squad
-/devenv/docker/blocks/mssql_tests/ @grafana/grafana-bi-squad
-/devenv/docker/blocks/mssql_tls/ @grafana/grafana-bi-squad
+/devenv/docker/blocks/mssql/ @grafana/partner-datasources
+/devenv/docker/blocks/mssql_arm64/ @grafana/partner-datasources
+/devenv/docker/blocks/mssql_tests/ @grafana/partner-datasources
+/devenv/docker/blocks/mssql_tls/ @grafana/partner-datasources
 /devenv/docker/blocks/mysql/ @grafana/oss-big-tent
 /devenv/docker/blocks/mysql_exporter/ @grafana/oss-big-tent
 /devenv/docker/blocks/mysql_opendata/ @grafana/oss-big-tent
@@ -230,15 +235,15 @@
 
 
 # Continuous Integration
-.drone.yml @grafana/grafana-delivery
-.drone.star @grafana/grafana-delivery
-/scripts/drone/ @grafana/grafana-delivery
-/pkg/build/ @grafana/grafana-delivery
-/.dockerignore @grafana/grafana-delivery
-/Dockerfile @grafana/grafana-delivery
-/Makefile @grafana/grafana-delivery
-/scripts/build/ @grafana/grafana-delivery
-/scripts/list-release-artifacts.sh @grafana/grafana-delivery
+.drone.yml @grafana/grafana-release-guild
+.drone.star @grafana/grafana-release-guild
+/scripts/drone/ @grafana/grafana-release-guild
+/pkg/build/ @grafana/grafana-release-guild
+/.dockerignore @grafana/grafana-release-guild
+/Dockerfile @grafana/grafana-release-guild
+/Makefile @grafana/grafana-release-guild
+/scripts/build/ @grafana/grafana-release-guild
+/scripts/list-release-artifacts.sh @grafana/grafana-release-guild
 
 # OSS Plugin Partnerships backend code
 /pkg/tsdb/cloudwatch/ @grafana/aws-datasources
@@ -255,10 +260,12 @@
 /pkg/tsdb/grafana-pyroscope-datasource/ @grafana/observability-traces-and-profiling
 /pkg/tsdb/parca/ @grafana/observability-traces-and-profiling
 
-# BI backend code
+# OSS Big Tent backend code
 /pkg/tsdb/mysql/ @grafana/oss-big-tent
-/pkg/tsdb/postgres/ @grafana/oss-big-tent
-/pkg/tsdb/mssql/ @grafana/grafana-bi-squad
+/pkg/tsdb/grafana-postgresql-datasource/ @grafana/oss-big-tent
+
+# Partner Datasources backend code
+/pkg/tsdb/mssql/ @grafana/partner-datasources
 
 # Database migrations
 /pkg/services/sqlstore/migrations/ @grafana/backend-platform @grafana/hosted-grafana-team
@@ -269,20 +276,19 @@
 /pkg/services/searchV2/ @grafana/grafana-app-platform-squad
 /pkg/services/store/ @grafana/grafana-app-platform-squad
 /pkg/infra/filestorage/ @grafana/grafana-app-platform-squad
-/pkg/util/converter/ @grafana/grafana-app-platform-squad
 /pkg/modules/ @grafana/grafana-app-platform-squad
-/pkg/kindsysreport/ @grafana/grafana-app-platform-squad
+/pkg/services/grpcserver/ @grafana/grafana-app-platform-squad
+/pkg/generated @grafana/grafana-app-platform-squad
 
 # Alerting
 /pkg/services/ngalert/ @grafana/alerting-backend-product
 /pkg/services/sqlstore/migrations/ualert/ @grafana/alerting-backend-product
-/pkg/services/alerting/ @grafana/alerting-backend-product
 /pkg/tests/api/alerting/ @grafana/alerting-backend-product
 /public/app/features/alerting/ @grafana/alerting-frontend
 
 # Library Services
-/pkg/services/libraryelements/ @grafana/grafana-frontend-platform
-/pkg/services/librarypanels/ @grafana/grafana-frontend-platform
+/pkg/services/libraryelements/ @grafana/dashboards-squad
+/pkg/services/librarypanels/ @grafana/dashboards-squad
 
 # Plugins
 /pkg/api/pluginproxy/ @grafana/plugins-platform-backend
@@ -295,6 +301,7 @@
 /pkg/tsdb/grafana-testdata-datasource/ @grafana/plugins-platform-backend
 /pkg/tsdb/Magefile.go @grafana/plugins-platform-backend
 /pkg/services/pluginsintegration/pluginsettings/ @grafana/plugins-platform-backend
+/pkg/services/plugindashboards/ @grafana/plugins-platform-backend
 
 # Backend code docs
 /contribute/backend/ @grafana/backend-platform
@@ -305,18 +312,17 @@
 /public/app/core/internationalization/ @grafana/grafana-frontend-platform
 /e2e/ @grafana/grafana-frontend-platform
 /e2e/cloud-plugins-suite/ @grafana/partner-datasources
+/e2e/plugin-e2e/plugin-e2e-api-tests/ @grafana/plugins-platform-frontend
 /packages/ @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend
 /packages/grafana-e2e-selectors/ @grafana/grafana-frontend-platform
 /packages/grafana-e2e/ @grafana/grafana-frontend-platform
 /packages/grafana-ui/.storybook/ @grafana/plugins-platform-frontend
 /packages/grafana-ui/src/components/ @grafana/grafana-frontend-platform
 /packages/grafana-ui/src/components/DateTimePickers/ @grafana/grafana-frontend-platform
-/packages/grafana-ui/src/components/Table/ @grafana/grafana-bi-squad
+/packages/grafana-ui/src/components/Table/ @grafana/dataviz-squad
+/packages/grafana-ui/src/components/Table/SparklineCell.tsx @grafana/dataviz-squad @grafana/app-o11y-visualizations
 /packages/grafana-ui/src/components/Gauge/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/BarGauge/ @grafana/dataviz-squad
-/packages/grafana-ui/src/components/GraphNG/ @grafana/dataviz-squad
-/packages/grafana-ui/src/components/Graph/ @grafana/dataviz-squad
-/packages/grafana-ui/src/components/TimeSeries/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/uPlot/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/DataLinks/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/ValuePicker/ @grafana/dataviz-squad
@@ -324,19 +330,28 @@
 /packages/grafana-ui/src/components/VizLegend/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/VizRepeater/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/VizTooltip/ @grafana/dataviz-squad
+/packages/grafana-ui/src/components/Sparkline/ @grafana/grafana-frontend-platform @grafana/app-o11y-visualizations
+/packages/grafana-ui/src/graveyard/Graph/ @grafana/dataviz-squad
+/packages/grafana-ui/src/graveyard/GraphNG/ @grafana/dataviz-squad
+/packages/grafana-ui/src/graveyard/TimeSeries/ @grafana/dataviz-squad
 /packages/grafana-ui/src/utils/storybook/ @grafana/plugins-platform-frontend
-/packages/grafana-data/src/transformations/ @grafana/grafana-bi-squad
+/packages/grafana-data/src/transformations/ @grafana/dataviz-squad
 /packages/grafana-data/src/**/*logs* @grafana/observability-logs
 /packages/grafana-schema/src/**/*tempo* @grafana/observability-traces-and-profiling
+/packages/grafana-schema/src/**/*canvas* @grafana/dataviz-squad
 /packages/grafana-flamegraph/ @grafana/observability-traces-and-profiling
 /plugins-bundled/ @grafana/plugins-platform-frontend
 /packages/grafana-plugin-configs/ @grafana/plugins-platform-frontend
-
+/packages/grafana-prometheus/ @grafana/observability-metrics
+/packages/grafana-o11y-ds-frontend/ @grafana/observability-logs @grafana/observability-traces-and-profiling
+/packages/grafana-sql/ @grafana/partner-datasources @grafana/oss-big-tent
 
 # root files, mostly frontend
-.browserslistrc @grafana/frontend-ops
-package.json @grafana/frontend-ops
-tsconfig.json @grafana/frontend-ops
+/.browserslistrc @grafana/frontend-ops
+/package.json @grafana/frontend-ops
+/nx.json @grafana/frontend-ops
+/project.json @grafana/frontend-ops
+/tsconfig.json @grafana/frontend-ops
 /.editorconfig @grafana/frontend-ops
 /.eslintignore @grafana/frontend-ops
 /.gitattributes @grafana/frontend-ops
@@ -346,33 +361,39 @@ tsconfig.json @grafana/frontend-ops
 /.yarn @grafana/frontend-ops
 /.yarnrc.yml @grafana/frontend-ops
 /yarn.lock @grafana/frontend-ops
-/babel.config.json @grafana/frontend-ops
-lerna.json @grafana/frontend-ops
+/lerna.json @grafana/frontend-ops
 /.prettierrc.js @grafana/frontend-ops
 /.eslintrc @grafana/frontend-ops
 /.vim @zoltanbedi
 /jest.config.js @grafana/frontend-ops
 /latest.json @grafana/frontend-ops
-/metadata.md @grafana/plugins-platform
 /stylelint.config.js @grafana/frontend-ops
 /tools/ @grafana/frontend-ops
 /lefthook.yml @grafana/frontend-ops
 /lefthook.rc @grafana/frontend-ops
-.husky/pre-commit @grafana/frontend-ops
-cypress.config.js @grafana/grafana-frontend-platform
-.levignore.js @grafana/plugins-platform-frontend
+/.husky/pre-commit @grafana/frontend-ops
+/cypress.config.js @grafana/grafana-frontend-platform
+/.levignore.js @grafana/plugins-platform-frontend
+playwright.config.ts @grafana/plugins-platform-frontend
 
 
 # public folder
 /public/app/core/ @grafana/grafana-frontend-platform
 /public/app/core/components/TimePicker/ @grafana/grafana-frontend-platform
 /public/app/core/components/Layers/ @grafana/dataviz-squad
-/public/app/core/components/TraceToLogs @grafana/observability-traces-and-profiling
+/public/app/core/components/GraphNG/ @grafana/dataviz-squad
+/public/app/core/components/TimeSeries/ @grafana/dataviz-squad
+/public/app/core/components/TimelineChart/ @grafana/dataviz-squad
+/public/app/core/components/Form/ @grafana/grafana-frontend-platform
 /public/app/features/all.ts @grafana/grafana-frontend-platform
-/public/app/features/admin/ @grafana/grafana-authnz-team
-/public/app/features/auth-config/ @grafana/grafana-authnz-team
-/public/app/features/annotations/ @grafana/grafana-frontend-platform
-/public/app/features/api-keys/ @grafana/grafana-authnz-team
+/public/app/features/admin/ @grafana/identity-access-team
+
+# Temp owners until Enterprise team takes over
+/public/app/features/migrate-to-cloud @grafana/grafana-frontend-platform
+
+/public/app/features/auth-config/ @grafana/identity-access-team
+/public/app/features/annotations/ @grafana/dashboards-squad
+/public/app/features/api-keys/ @grafana/identity-access-team
 /public/app/features/canvas/ @grafana/dataviz-squad
 /public/app/features/geo/ @grafana/dataviz-squad
 /public/app/features/visualization/data-hover/ @grafana/dataviz-squad
@@ -380,62 +401,64 @@ cypress.config.js @grafana/grafana-frontend-platform
 /public/app/features/connections/ @grafana/plugins-platform-frontend @mikkancso
 /public/app/features/correlations/ @grafana/explore-squad
 /public/app/features/dashboard/ @grafana/dashboards-squad
-/public/app/features/dashboard/components/TransformationsEditor/ @grafana/grafana-bi-squad
+/public/app/features/dashboard/components/TransformationsEditor/ @grafana/dataviz-squad
 /public/app/features/dashboard-scene/ @grafana/dashboards-squad
+/public/app/features/scopes/ @grafana/dashboards-squad
 /public/app/features/datasources/ @grafana/plugins-platform-frontend @mikkancso
 /public/app/features/dimensions/ @grafana/dataviz-squad
-/public/app/features/dataframe-import/ @grafana/grafana-bi-squad
+/public/app/features/dataframe-import/ @grafana/dataviz-squad
 /public/app/features/explore/ @grafana/explore-squad
 /public/app/features/expressions/ @grafana/observability-metrics
 /public/app/features/folders/ @grafana/grafana-frontend-platform
 /public/app/features/inspector/ @grafana/dashboards-squad
 /public/app/features/invites/ @grafana/grafana-frontend-platform
-/public/app/features/library-panels/ @grafana/grafana-frontend-platform
+/public/app/features/library-panels/ @grafana/dashboards-squad
 /public/app/features/logs/ @grafana/observability-logs
 /public/app/features/live/ @grafana/grafana-app-platform-squad
+/public/app/features/apiserver/ @grafana/grafana-app-platform-squad
 /public/app/features/manage-dashboards/ @grafana/dashboards-squad
 /public/app/features/notifications/ @grafana/grafana-frontend-platform
 /public/app/features/org/ @grafana/grafana-frontend-platform
 /public/app/features/panel/ @grafana/dashboards-squad
 /public/app/features/playlist/ @grafana/dashboards-squad
 /public/app/features/plugins/ @grafana/plugins-platform-frontend
-/public/app/features/plugins/sql/ @grafana/partner-datasources @grafana/oss-big-tent
 /public/app/features/profile/ @grafana/grafana-frontend-platform
 /public/app/features/runtime/ @ryantxu
 /public/app/features/query/ @grafana/dashboards-squad
 /public/app/features/sandbox/ @grafana/grafana-frontend-platform
-/public/app/features/scenes/ @grafana/dashboards-squad
 /public/app/features/browse-dashboards/ @grafana/grafana-frontend-platform
 /public/app/features/search/ @grafana/grafana-frontend-platform
-/public/app/features/serviceaccounts/ @grafana/grafana-authnz-team
+/public/app/features/serviceaccounts/ @grafana/identity-access-team
 /public/app/features/storage/ @grafana/grafana-app-platform-squad
-/public/app/features/teams/ @grafana/grafana-authnz-team
+/public/app/features/teams/ @grafana/identity-access-team
 /public/app/features/templating/ @grafana/dashboards-squad
-/public/app/features/transformers/ @grafana/grafana-bi-squad
-/public/app/features/users/ @grafana/grafana-authnz-team
+/public/app/features/trails/ @torkelo
+/public/app/features/transformers/ @grafana/dataviz-squad
+/public/app/features/transformers/timeSeriesTable/ @grafana/dataviz-squad @grafana/app-o11y-visualizations
+/public/app/features/users/ @grafana/identity-access-team
 /public/app/features/variables/ @grafana/dashboards-squad
-/public/app/plugins/panel/alertGroups/ @grafana/alerting-frontend
 /public/app/plugins/panel/alertlist/ @grafana/alerting-frontend
 /public/app/plugins/panel/annolist/ @grafana/grafana-frontend-platform
 /public/app/plugins/panel/barchart/ @grafana/dataviz-squad
 /public/app/plugins/panel/bargauge/ @grafana/dataviz-squad
 /public/app/plugins/panel/dashlist/ @grafana/grafana-frontend-platform
 /public/app/plugins/panel/debug/ @ryantxu
-/public/app/plugins/panel/datagrid/ @grafana/grafana-bi-squad
+/public/app/plugins/panel/datagrid/ @grafana/dataviz-squad
 /public/app/plugins/panel/gauge/ @grafana/dataviz-squad
 /public/app/plugins/panel/gettingstarted/ @grafana/grafana-frontend-platform
 /public/app/plugins/panel/graph/ @grafana/dataviz-squad
 /public/app/plugins/panel/heatmap/ @grafana/dataviz-squad
 /public/app/plugins/panel/histogram/ @grafana/dataviz-squad
 /public/app/plugins/panel/logs/ @grafana/observability-logs
-/public/app/plugins/panel/nodeGraph/ @grafana/observability-traces-and-profiling
+/public/app/plugins/panel/nodeGraph/ @grafana/observability-traces-and-profiling @grafana/app-o11y-visualizations
 /public/app/plugins/panel/traces/ @grafana/observability-traces-and-profiling
 /public/app/plugins/panel/flamegraph/ @grafana/observability-traces-and-profiling
 /public/app/plugins/panel/piechart/ @grafana/dataviz-squad
 /public/app/plugins/panel/state-timeline/ @grafana/dataviz-squad
 /public/app/plugins/panel/status-history/ @grafana/dataviz-squad
-/public/app/plugins/panel/table/ @grafana/grafana-bi-squad
-/public/app/plugins/panel/table-old/ @grafana/grafana-bi-squad
+/public/app/plugins/panel/table/ @grafana/dataviz-squad
+/public/app/plugins/panel/table/cells/SparklineCellOptionsEditor.tsx @grafana/dataviz-squad @grafana/app-o11y-visualizations
+/public/app/plugins/panel/table-old/ @grafana/dataviz-squad
 /public/app/plugins/panel/timeseries/ @grafana/dataviz-squad
 /public/app/plugins/panel/trend/ @grafana/dataviz-squad
 /public/app/plugins/panel/geomap/ @grafana/dataviz-squad
@@ -451,19 +474,19 @@ cypress.config.js @grafana/grafana-frontend-platform
 /public/app/routes/ @grafana/grafana-frontend-platform
 /public/app/store/ @grafana/grafana-frontend-platform
 /public/app/types/ @grafana/grafana-frontend-platform
+/public/app/types/alerting.ts @grafana/alerting-frontend
 /public/dashboards/ @grafana/dashboards-squad
-/public/fonts/ @grafana/alerting-frontend
 /public/gazetteer/ @ryantxu
 /public/img/ @grafana/grafana-frontend-platform
 /public/lib/ @grafana/grafana-frontend-platform
 /public/lib/monaco-languages/kusto.ts @grafana/partner-datasources
 /public/maps/ @ryantxu
 /public/robots.txt @grafana/frontend-ops
+/public/fonts/ @grafana/grafana-frontend-platform
 /public/sass/ @grafana/grafana-frontend-platform
 /public/test/ @grafana/grafana-frontend-platform
 /public/test/helpers/alertingRuleEditor.tsx @grafana/alerting-frontend
 /public/views/ @grafana/grafana-frontend-platform
-/public/views/openapi3.html @grafana/backend-platform
 /public/views/swagger.html @grafana/backend-platform
 
 /public/app/features/explore/Logs/ @grafana/observability-logs
@@ -488,37 +511,39 @@ cypress.config.js @grafana/grafana-frontend-platform
 
 
 
-/scripts/benchmark-access-control.sh @grafana/grafana-authnz-team
+/scripts/benchmark-access-control.sh @grafana/identity-access-team
 /scripts/check-breaking-changes.sh @grafana/plugins-platform-frontend
-/scripts/ci-* @grafana/grafana-delivery
-/scripts/circle-* @grafana/grafana-delivery
-/scripts/publish-npm-packages.sh @grafana/grafana-delivery @grafana/plugins-platform-frontend
-/scripts/validate-npm-packages.sh @grafana/grafana-delivery @grafana/plugins-platform-frontend
-/scripts/ci-frontend-metrics.sh @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend @grafana/grafana-bi-squad
+/scripts/ci-* @grafana/grafana-release-guild
+/scripts/circle-* @grafana/grafana-release-guild
+/scripts/publish-npm-packages.sh @grafana/grafana-release-guild @grafana/plugins-platform-frontend
+/scripts/validate-npm-packages.sh @grafana/grafana-release-guild @grafana/plugins-platform-frontend
+/scripts/ci-frontend-metrics.sh @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend @grafana/dataviz-squad
 /scripts/cli/ @grafana/grafana-frontend-platform
 /scripts/clean-git-or-error.sh @grafana/grafana-as-code
 /scripts/grafana-server/ @grafana/grafana-frontend-platform
-/scripts/helpers/ @grafana/grafana-delivery
+/scripts/helpers/ @grafana/grafana-release-guild
 /scripts/import_many_dashboards.sh @torkelo
 /scripts/mixin-check.sh @bergquist
 /scripts/openapi3/ @grafana/grafana-operator-experience-squad
 /scripts/prepare-packagejson.js @grafana/frontend-ops
 /scripts/protobuf-check.sh @grafana/plugins-platform-backend
 /scripts/stripnulls.sh @grafana/grafana-as-code
-/scripts/tag_release.sh @grafana/grafana-delivery
-/scripts/trigger_docker_build.sh @grafana/grafana-delivery
-/scripts/trigger_grafana_packer.sh @grafana/grafana-delivery
-/scripts/trigger_windows_build.sh @grafana/grafana-delivery
+/scripts/tag_release.sh @grafana/grafana-release-guild
+/scripts/trigger_docker_build.sh @grafana/grafana-release-guild
+/scripts/trigger_grafana_packer.sh @grafana/grafana-release-guild
+/scripts/trigger_windows_build.sh @grafana/grafana-release-guild
 /scripts/cleanup-husky.sh @grafana/frontend-ops
-/scripts/verify-repo-update/ @grafana/grafana-delivery
-scripts/generate-icon-bundle.js @grafana/plugins-platform-frontend @grafana/grafana-frontend-platform
+/scripts/verify-repo-update/ @grafana/grafana-release-guild
+/scripts/generate-icon-bundle.js @grafana/plugins-platform-frontend @grafana/grafana-frontend-platform
+/scripts/levitate-parse-json-report.js @grafana/plugins-platform-frontend
 
-/scripts/docs/generate-transformations.ts @grafana/grafana-bi-squad
+/scripts/**/generate-transformations* @grafana/dataviz-squad
 /scripts/webpack/ @grafana/frontend-ops
 /scripts/generate-a11y-report.sh @grafana/grafana-frontend-platform
 .pa11yci.conf.js @grafana/grafana-frontend-platform
 .pa11yci-pr.conf.js @grafana/grafana-frontend-platform
 .betterer.results @grafanabot
+.betterer.results.json @grafanabot
 .betterer.ts @grafana/grafana-frontend-platform
 
 # @grafana/ui component documentation
@@ -539,10 +564,10 @@ scripts/generate-icon-bundle.js @grafana/plugins-platform-frontend @grafana/graf
 /public/app/plugins/datasource/jaeger/ @grafana/observability-traces-and-profiling
 /public/app/plugins/datasource/loki/ @grafana/observability-logs
 /public/app/plugins/datasource/mixed/ @grafana/dashboards-squad
-/public/app/plugins/datasource/mssql/ @grafana/grafana-bi-squad
+/public/app/plugins/datasource/mssql/ @grafana/partner-datasources
 /public/app/plugins/datasource/mysql/ @grafana/oss-big-tent
 /public/app/plugins/datasource/opentsdb/ @grafana/observability-metrics
-/public/app/plugins/datasource/postgres/ @grafana/oss-big-tent
+/public/app/plugins/datasource/grafana-postgresql-datasource/ @grafana/oss-big-tent
 /public/app/plugins/datasource/prometheus/ @grafana/observability-metrics
 /public/app/plugins/datasource/cloud-monitoring/ @grafana/partner-datasources
 /public/app/plugins/datasource/zipkin/ @grafana/observability-traces-and-profiling
@@ -551,6 +576,14 @@ scripts/generate-icon-bundle.js @grafana/plugins-platform-frontend @grafana/graf
 /public/app/plugins/datasource/parca/ @grafana/observability-traces-and-profiling
 /public/app/plugins/datasource/alertmanager/ @grafana/alerting-squad
 
+# Grafana Sharing Squad
+/public/app/features/dashboard/components/ShareModal/ @grafana/sharing-squad
+/public/app/features/manage-dashboards/components/PublicDashboardListTable/ @grafana/sharing-squad
+/public/app/features/dashboard/containers/PublicDashboardPage.tsx @grafana/sharing-squad
+/public/app/features/manage-dashboards/components/SnapshotListTable.tsx @grafana/sharing-squad
+/pkg/services/dashboardsnapshots/ @grafana/sharing-squad
+/pkg/services/publicdashboards/ @grafana/sharing-squad
+
 # SSE - Server Side Expressions
 /pkg/expr/ @grafana/observability-metrics
 
@@ -558,31 +591,34 @@ scripts/generate-icon-bundle.js @grafana/plugins-platform-frontend @grafana/graf
 /grafana-mixin/ @grafana/hosted-grafana-team
 
 # Grafana authentication and authorization
-/pkg/login/ @grafana/grafana-authnz-team
-/pkg/services/accesscontrol/ @grafana/grafana-authnz-team
-/pkg/services/anonymous/ @grafana/grafana-authnz-team
-/pkg/services/auth/ @grafana/grafana-authnz-team
-/pkg/services/authn/ @grafana/grafana-authnz-team
-/pkg/services/signingkeys/ @grafana/grafana-authnz-team
-/pkg/services/dashboards/accesscontrol.go @grafana/grafana-authnz-team
-/pkg/services/datasources/guardian/ @grafana/grafana-authnz-team
-/pkg/services/guardian/ @grafana/grafana-authnz-team
-/pkg/services/ldap/ @grafana/grafana-authnz-team
-/pkg/services/login/ @grafana/grafana-authnz-team
-/pkg/services/loginattempt/ @grafana/grafana-authnz-team
-/pkg/services/extsvcauth/ @grafana/grafana-authnz-team
-/pkg/services/oauthtoken/ @grafana/grafana-authnz-team
-/pkg/services/serviceaccounts/ @grafana/grafana-authnz-team
+/pkg/login/ @grafana/identity-access-team
+/pkg/services/accesscontrol/ @grafana/identity-access-team
+/pkg/services/anonymous/ @grafana/identity-access-team
+/pkg/services/auth/ @grafana/identity-access-team
+/pkg/services/authn/ @grafana/identity-access-team
+/pkg/services/signingkeys/ @grafana/identity-access-team
+/pkg/services/dashboards/accesscontrol.go @grafana/identity-access-team
+/pkg/services/datasources/guardian/ @grafana/identity-access-team
+/pkg/services/guardian/ @grafana/identity-access-team
+/pkg/services/ldap/ @grafana/identity-access-team
+/pkg/services/login/ @grafana/identity-access-team
+/pkg/services/loginattempt/ @grafana/identity-access-team
+/pkg/services/extsvcauth/ @grafana/identity-access-team
+/pkg/services/oauthtoken/ @grafana/identity-access-team
+/pkg/services/serviceaccounts/ @grafana/identity-access-team
 
 # Support bundles
-/public/app/features/support-bundles/ @grafana/grafana-authnz-team
-/pkg/services/supportbundles/ @grafana/grafana-authnz-team
+/public/app/features/support-bundles/ @grafana/identity-access-team
+/pkg/services/supportbundles/ @grafana/identity-access-team
 
 # Grafana Operator Experience Team
-/pkg/infra/httpclient/httpclientprovider/sigv4_middleware.go @grafana/grafana-operator-experience-squad
-/pkg/infra/httpclient/httpclientprovider/sigv4_middleware_test.go @grafana/grafana-operator-experience-squad
 /pkg/services/caching/ @grafana/grafana-operator-experience-squad
-/pkg/services/featuremgmt/ @grafana/grafana-operator-experience-squad
+/pkg/services/cloudmigration/ @grafana/grafana-operator-experience-squad
+/pkg/services/gcom/ @grafana/grafana-operator-experience-squad
+
+# Feature toggles
+/pkg/services/featuremgmt/ @grafana/grafana-backend-services-squad
+
 
 # Kind definitions
 /kinds/dashboard @grafana/dashboards-squad
@@ -591,11 +627,12 @@ scripts/generate-icon-bundle.js @grafana/plugins-platform-frontend @grafana/graf
 # Kind system and code generation
 embed.go @grafana/grafana-as-code
 /pkg/kinds/ @grafana/grafana-as-code
-/pkg/cuectx/ @grafana/grafana-as-code
 /pkg/registry/ @grafana/grafana-as-code
+/pkg/registry/apis/ @grafana/grafana-app-platform-squad
 /pkg/codegen/ @grafana/grafana-as-code
+/pkg/codegen/generators @grafana/grafana-as-code
 /pkg/kinds/*/*_gen.go @grafana/grafana-as-code
-/pkg/registry/corekind/ @grafana/grafana-as-code
+/pkg/registry/schemas/ @grafana/grafana-as-code
 /public/app/plugins/*gen.go @grafana/grafana-as-code
 /cue.mod/ @grafana/grafana-as-code
 
@@ -613,49 +650,54 @@ embed.go @grafana/grafana-as-code
 /.github/renovate.json5 @grafana/frontend-ops
 /.github/teams.yml @armandgrillet
 /.github/workflows/alerting-swagger-gen.yml @grafana/alerting-backend-product
-/.github/workflows/auto-milestone.yml @grafana/grafana-delivery
-/.github/workflows/backport.yml @grafana/grafana-delivery
-/.github/workflows/bump-version.yml @grafana/grafana-delivery
-/.github/workflows/close-milestone.yml @grafana/grafana-delivery
+/.github/workflows/auto-milestone.yml @grafana/grafana-release-guild
+/.github/workflows/backport.yml @grafana/grafana-release-guild
+/.github/workflows/bump-version.yml @grafana/grafana-release-guild
+/.github/workflows/close-milestone.yml @grafana/grafana-release-guild
 /.github/workflows/codeowners-validator.yml @tolzhabayev
 /.github/workflows/codeql-analysis.yml @DanCech
 /.github/workflows/commands.yml @torkelo
-/.github/workflows/community-release.yml @grafana/grafana-delivery
+/.github/workflows/community-release.yml @grafana/grafana-release-guild
 /.github/workflows/detect-breaking-changes-* @grafana/plugins-platform-frontend
 /.github/workflows/doc-validator.yml @grafana/docs-tooling
 /.github/workflows/epic-add-to-platform-ux-parent-project.yml @meanmina
-/.github/workflows/github-release.yml @grafana/grafana-delivery
+/.github/workflows/github-release.yml @grafana/grafana-release-guild
 /.github/workflows/issue-labeled.yml @armandgrillet
 /.github/workflows/issue-opened.yml @grafana/grafana-community-support
 /.github/workflows/metrics-collector.yml @torkelo
 /.github/workflows/milestone.yml @marefr
-/.github/workflows/ox-code-coverage.yml @grafana/explore-squad
 /.github/workflows/pr-checks.yml @marefr
 /.github/workflows/pr-codeql-analysis-go.yml @DanCech
 /.github/workflows/pr-codeql-analysis-javascript.yml @DanCech
 /.github/workflows/pr-codeql-analysis-python.yml @DanCech
 /.github/workflows/pr-commands.yml @marefr
-/.github/workflows/pr-patch-check.yml @grafana/grafana-delivery
-/.github/workflows/sync-mirror.yml @grafana/grafana-delivery
+/.github/workflows/pr-patch-check.yml @grafana/grafana-release-guild
+/.github/workflows/sync-mirror.yml @grafana/grafana-release-guild
 /.github/workflows/publish-technical-documentation-next.yml @grafana/docs-tooling
 /.github/workflows/publish-technical-documentation-release.yml @grafana/docs-tooling
-/.github/workflows/remove-milestone.yml @grafana/grafana-delivery
+/.github/workflows/remove-milestone.yml @grafana/grafana-release-guild
 /.github/workflows/sbom-report.yml @grafana/security-team
 /.github/workflows/scripts/json-file-to-job-output.js @grafana/plugins-platform-frontend
 /.github/workflows/scripts/pr-get-job-link.js @grafana/plugins-platform-frontend
-/.github/workflows/stale.yml @grafana/grafana-delivery
-/.github/workflows/update-changelog.yml @grafana/grafana-delivery
+/.github/workflows/stale.yml @grafana/grafana-release-guild
+/.github/workflows/update-changelog.yml @grafana/grafana-release-guild
 /.github/workflows/update-make-docs.yml @grafana/docs-tooling
 /.github/workflows/snyk.yml @grafana/security-team
-/.github/workflows/scripts/kinds/verify-kinds.go @grafana/grafana-as-code
-/.github/workflows/publish-kinds-next.yml @grafana/grafana-as-code
-/.github/workflows/publish-kinds-release.yml @grafana/grafana-as-code
-/.github/workflows/verify-kinds.yml @grafana/grafana-as-code
+/.github/workflows/scripts/kinds/verify-kinds.go @grafana/platform-cat
+/.github/workflows/publish-kinds-next.yml @grafana/platform-cat
+/.github/workflows/publish-kinds-release.yml @grafana/platform-cat
+/.github/workflows/verify-kinds.yml @grafana/platform-cat
 /.github/workflows/dashboards-issue-add-label.yml @grafana/dashboards-squad
 /.github/workflows/ephemeral-instances-pr-comment.yml @grafana/grafana-operator-experience-squad
 /.github/workflows/ephemeral-instances-pr-opened-closed.yml @grafana/grafana-operator-experience-squad
-/.github/workflows/create-security-patch-from-security-mirror.yml @grafana/grafana-delivery
-
+/.github/workflows/create-security-patch-from-security-mirror.yml @grafana/grafana-release-guild
+/.github/workflows/core-plugins-build-and-release.yml @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
+/.github/workflows/i18n-crowdin-upload.yml @grafana/grafana-frontend-platform
+/.github/workflows/i18n-crowdin-download.yml @grafana/grafana-frontend-platform
+/.github/workflows/feature-toggle-cleanup.yml @tolzhabayev
+/.github/workflows/scripts/feature-toggle-cleanup/feature-toggle-cleanup.js @tolzhabayev
+/.github/workflows/pr-go-workspace-check.yml @grafana/grafana-app-platform-squad
+/.github/workflows/run-scenes-e2e.yml @grafana/dashboards-squad
 
 # Generated files not requiring owner approval
 /packages/grafana-data/src/types/featureToggles.gen.ts @grafanabot
@@ -667,11 +709,10 @@ embed.go @grafana/grafana-as-code
 # Conf
 /conf/defaults.ini @torkelo
 /conf/sample.ini @torkelo
-/conf/ldap.toml @grafana/grafana-authnz-team
-/conf/ldap_multiple.toml @grafana/grafana-authnz-team
-/conf/provisioning/access-control/ @grafana/grafana-authnz-team
+/conf/ldap.toml @grafana/identity-access-team
+/conf/ldap_multiple.toml @grafana/identity-access-team
+/conf/provisioning/access-control/ @grafana/identity-access-team
 /conf/provisioning/alerting/ @grafana/alerting-backend-product
 /conf/provisioning/dashboards/ @grafana/dashboards-squad
 /conf/provisioning/datasources/ @grafana/plugins-platform-backend
-/conf/provisioning/notifiers/ @bergquist
 /conf/provisioning/plugins/ @grafana/plugins-platform-backend
diff --git a/.github/ISSUE_TEMPLATE/1-feature_requests.md b/.github/ISSUE_TEMPLATE/1-feature_requests.md
index ab43f8c1d83be..67449c9af2a1f 100644
--- a/.github/ISSUE_TEMPLATE/1-feature_requests.md
+++ b/.github/ISSUE_TEMPLATE/1-feature_requests.md
@@ -1,7 +1,6 @@
 ---
 name: Feature Requests
 about: Suggest an enhancement or new feature for the Grafana project
-labels: 'type/feature-request'
 ---
 
 <!-- Please only use this template for submitting feature requests -->
@@ -18,4 +17,4 @@ labels: 'type/feature-request'
 
 **Who is this feature for?**
 
-[Add information on what kind of user the feature is for.]
\ No newline at end of file
+[Add information on what kind of user the feature is for.]
diff --git a/.github/bot.md b/.github/bot.md
index ec745bcf93aa9..9477ab291e27f 100644
--- a/.github/bot.md
+++ b/.github/bot.md
@@ -9,8 +9,8 @@ Comment commands:
 
 Label commands:
 
-* Add label `bot/question` the the bot will close with standard question message and add label `type/question`
-* Add label `bot/duplicate` the the bot will close with standard duplicate message and add label `type/duplicate`
+* Add label `bot/question` the bot will close with standard question message and add label `type/question`
+* Add label `bot/duplicate` the bot will close with standard duplicate message and add label `type/duplicate`
 * Add label `bot/needs more info` for bot to request more info (or use comment command mentioned above)
 * Add label `bot/close feature request` for bot to close a feature request with standard message and adds label `not implemented`
 * Add label `bot/no new info` for bot to close an issue where we asked for more info but has not received any updates in at least 14 days.
diff --git a/.github/pr-checks.json b/.github/pr-checks.json
index fec10a1201dda..b97dbc137ece1 100644
--- a/.github/pr-checks.json
+++ b/.github/pr-checks.json
@@ -6,25 +6,6 @@
     "success": "Milestone set",
     "failure": "Milestone not set"
   },
-  {
-    "type": "check-label",
-    "title": "Backport Check",
-    "labels": {
-      "exists": "Backport enabled",
-      "notExists": "Backport decision needed",
-      "matches": [
-        "backport v*"
-      ]
-    },
-    "skip": {
-      "message": "Backport skipped",
-      "matches": [
-        "backport",
-        "no-backport"
-      ]
-    },
-    "targetUrl": "https://github.com/grafana/grafana/blob/main/contribute/merge-pull-request.md#should-the-pull-request-be-backported"
-  },
   {
     "type": "check-changelog",
     "title": "Changelog Check",
diff --git a/.github/pr-commands.json b/.github/pr-commands.json
index ec60e516e218e..0e4f0da1150c3 100644
--- a/.github/pr-commands.json
+++ b/.github/pr-commands.json
@@ -23,7 +23,6 @@
         "package.json",
         "tsconfig.json",
         "lerna.json",
-        ".babelrc",
         ".prettierrc.js",
         ".eslintrc",
         "**/*.mdx"
@@ -119,7 +118,7 @@
   },
   {
     "type": "changedfiles",
-    "matches": [ "public/app/plugins/datasource/jaeger"],
+    "matches": [ "public/app/plugins/datasource/jaeger/**/*"],
     "action": "updateLabel",
     "addLabel": "datasource/Jaeger"
   },
@@ -149,7 +148,19 @@
   },
   {
     "type": "changedfiles",
-    "matches": [ "public/app/plugins/datasource/postgres/**/*", "pkg/tsdb/postgres/**/*"],
+    "matches": [ "public/app/plugins/datasource/parca/**/*"],
+    "action": "updateLabel",
+    "addLabel": "datasource/Parca"
+  },
+  {
+    "type": "changedfiles",
+    "matches": [ "public/app/plugins/datasource/grafana-pyroscope-datasource/**/*", "pkg/tsdb/grafana-pyroscope-datasource/**/*"],
+    "action": "updateLabel",
+    "addLabel": "datasource/grafana-pyroscope"
+  },
+  {
+    "type": "changedfiles",
+    "matches": [ "public/app/plugins/datasource/grafana-postgresql-datasource/**/*", "pkg/tsdb/grafana-postgresql-datasource/**/*"],
     "action": "updateLabel",
     "addLabel": "datasource/Postgres"
   },
diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 6f64cde93fdf8..f1df23dde1a45 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -4,30 +4,23 @@
   ],
   "enabledManagers": ["npm"],
   "ignoreDeps": [
-    "commander", // we are planning to remove this, so no need to update it
-    "execa", // we should bump this once we move to esm modules
-    "history", // we should bump this together with react-router-dom
-    "@mdx-js/react", // storybook peer-depends on its 1.x version, we should upgrade this when we upgrade storybook
+    "history", // we should bump this together with react-router-dom (see https://github.com/grafana/grafana/issues/76744)
+    "react-router-dom", // we should bump this together with history (see https://github.com/grafana/grafana/issues/76744)
+    "loader-utils", // v3 requires upstream changes in ngtemplate-loader. ignore, and remove when we remove angular.
     "monaco-editor", // due to us exposing this via @grafana/ui/CodeEditor's props bumping can break plugins
-    "react-hook-form", // due to us exposing these hooks via @grafana/ui form components bumping can break plugins
-    "react-redux", // react-beautiful-dnd depends on react-redux 7.x, we need to update that one first
-    "react-router-dom", // we should bump this together with history
-    "ts-loader", // we should remove ts-loader and use babel-loader instead
-    "ora", // we should bump this once we move to esm modules
-    "@locker/near-membrane-dom", // critical library. we need to bump this only intentionally
-    "@locker/near-membrane-shared", // critical library. we need to bump this only intentionally
-    "@locker/near-membrane-shared-dom", // critical library. we need to bump this only intentionally
+    "@fingerprintjs/fingerprintjs", // we don't want to bump to v4 due to licensing changes
+    "@swc/core", // versions ~1.4.5 contain multiple bugs related to baseUrl resolution breaking builds.
   ],
   "includePaths": ["package.json", "packages/**", "public/app/plugins/**"],
-  "ignorePaths": ["emails/**", "plugins-bundled/**", "**/mocks/**"],
-  "labels": ["area/frontend", "dependencies", "no-backport", "no-changelog"],
+  "ignorePaths": ["emails/**", "plugins-bundled/**", "**/mocks/**", "packages/grafana-e2e/**"],
+  "labels": ["area/frontend", "dependencies", "no-changelog"],
   "postUpdateOptions": ["yarnDedupeHighest"],
   "packageRules": [
     {
+      "automerge": true,
+      "matchCurrentVersion": "!/^0/",
       "matchUpdateTypes": ["patch"],
-      "excludePackagePatterns": ["^@?storybook"],
-      "extends": ["schedule:monthly"],
-      "groupName": "Monthly patch updates"
+      "excludePackagePatterns": ["^@?storybook", "^@locker"]
     },
     {
       "matchPackagePatterns": ["^@?storybook"],
@@ -78,6 +71,13 @@
       ],
       "reviewers": ["leeoniya"],
     },
+    {
+      "groupName": "locker",
+      "matchPackagePrefixes": [
+        "@locker/"
+      ],
+      "reviewers": ["team:grafana/plugins-platform-frontend"],
+    },
   ],
   "pin": {
     "enabled": false
diff --git a/.github/workflows/alerting-swagger-gen.yml b/.github/workflows/alerting-swagger-gen.yml
index f42389ceeed26..2fa61fe231244 100644
--- a/.github/workflows/alerting-swagger-gen.yml
+++ b/.github/workflows/alerting-swagger-gen.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Set go version
         uses: actions/setup-go@v4
         with:
-          go-version: '1.20.10'
+          go-version: '1.21.10'
       - name: Build swagger
         run: |
           make -C pkg/services/ngalert/api/tooling post.json api.json
@@ -31,7 +31,7 @@ jobs:
             Please review and merge.
           branch: update-alerting-swagger-spec
           delete-branch: true
-          labels: 'area/alerting,type/docs,no-backport,no-changelog'
+          labels: 'area/alerting,type/docs,no-changelog'
           team-reviewers: 'grafana/alerting-backend-product'
           draft: false
 
diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml
index 768fb684dc65d..56cf8d5ddd18a 100644
--- a/.github/workflows/bump-version.yml
+++ b/.github/workflows/bump-version.yml
@@ -58,10 +58,10 @@ jobs:
       # Go is required for also updating the schema versions as part of the precommit hook:
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
-      - uses: actions/setup-node@v3.8.1
+          go-version: '1.21'
+      - uses: actions/setup-node@v4
         with:
-          node-version: '16'
+          node-version: '18'
       - name: Install Actions
         run: npm install --production --prefix ./actions
       - name: "Generate token"
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 60fe93679cf42..d6dd9f8f6f06f 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -47,7 +47,7 @@ jobs:
       name: Set go version
       uses: actions/setup-go@v4
       with:
-        go-version: '1.20.10'
+        go-version: '1.21.10'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
@@ -67,3 +67,4 @@ jobs:
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
+      if: github.repository == 'grafana/grafana'
diff --git a/.github/workflows/core-plugins-build-and-release.yml b/.github/workflows/core-plugins-build-and-release.yml
new file mode 100644
index 0000000000000..e4803a2208f67
--- /dev/null
+++ b/.github/workflows/core-plugins-build-and-release.yml
@@ -0,0 +1,269 @@
+name: Build and release core plugins
+
+on:
+  workflow_dispatch:
+    inputs:
+      plugin_id:
+        description: "ID of the plugin you want to publish"
+        required: true
+        type: choice
+        options:
+          - grafana-azure-monitor-datasource
+          - grafana-pyroscope-datasource
+          - grafana-testdata-datasource
+          - jaeger
+          - parca
+          - stackdriver
+          - tempo
+          - zipkin
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ inputs.plugin_id }}
+  cancel-in-progress: true
+
+env:
+  GRABPL_VERSION: 3.0.44
+  GCP_BUCKET: integration-artifacts # Dev: plugins-community-staging
+  GCOM_API: https://grafana.com # Dev: https://grafana-dev.com
+
+# These permissions are needed to assume roles from Github's OIDC.
+permissions:
+  contents: read
+  id-token: write
+
+jobs:
+  build-and-publish:
+    name: Build and publish ${{ inputs.plugin_id }}
+    runs-on: ubuntu-latest
+    outputs:
+      type: ${{ steps.get_dir.outputs.dir }}
+      has_backend: ${{ steps.check_backend.outputs.has_backend }}
+      version: ${{ steps.build_frontend.outputs.version }}
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+      - name: Verify inputs
+        run: |
+          if [ -z ${{ inputs.plugin_id }} ]; then echo "Missing plugin ID"; exit 1; fi
+      - id: get-secrets
+        uses: grafana/shared-workflows/actions/get-vault-secrets@main
+        with:
+          # Secrets placed in the ci/repo/grafana/<repo>/<path> path in Vault
+          repo_secrets: |
+            PLUGINS_GOOGLE_CREDENTIALS=core-plugins-build-and-release:PLUGINS_GOOGLE_CREDENTIALS
+            PLUGINS_GRAFANA_API_KEY=core-plugins-build-and-release:PLUGINS_GRAFANA_API_KEY
+            PLUGINS_GCOM_TOKEN=core-plugins-build-and-release:PLUGINS_GCOM_TOKEN
+      - name: 'Authenticate to Google Cloud'
+        uses: 'google-github-actions/auth@v2'
+        with:
+          credentials_json: '${{ env.PLUGINS_GOOGLE_CREDENTIALS }}'
+      - name: 'Set up Cloud SDK'
+        uses: 'google-github-actions/setup-gcloud@v2'
+      - name: Setup nodejs environment
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: .nvmrc
+          cache: yarn
+      - name: Find plugin directory
+        shell: bash
+        id: get_dir
+        run: |
+          dir=$(dirname \
+            $(egrep -lir --include=plugin.json --exclude-dir=dist \
+              '"id": "${{ inputs.plugin_id }}"' \
+              public/app/plugins \
+            ) \
+          )
+          echo "dir=${dir}" >> $GITHUB_OUTPUT
+      - name: Install frontend dependencies
+        shell: bash
+        working-directory: ${{ steps.get_dir.outputs.dir }}
+        run: |
+          yarn install --immutable
+      - name: Download grabpl executable
+        shell: sh
+        working-directory: ${{ steps.get_dir.outputs.dir }}
+        run: |
+          [ ! -d ./bin ] && mkdir -pv ./bin || true
+          curl -fL -o ./bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v${{ env.GRABPL_VERSION }}/grabpl
+          chmod 0755 ./bin/grabpl
+      - name: Check backend
+        id: check_backend
+        shell: bash
+        run: |
+          if egrep -qr --include=main.go 'datasource.Manage\("${{ inputs.plugin_id }}"' pkg/tsdb; then
+            echo "has_backend=true" >> $GITHUB_OUTPUT
+          else
+            echo "has_backend=false" >> $GITHUB_OUTPUT
+          fi
+      - name: Setup golang environment
+        uses: actions/setup-go@v4
+        if: steps.check_backend.outputs.has_backend == 'true'
+        with:
+          go-version-file: go.mod
+      - name: Install Mage
+        shell: bash
+        if: steps.check_backend.outputs.has_backend == 'true'
+        run: |
+          go install github.com/magefile/mage
+      - name: Check tools
+        shell: bash
+        working-directory: ${{ steps.get_dir.outputs.dir }}
+        run: |
+          echo "======================================="
+          echo "  Frontend tools"
+          echo "======================================="
+          echo "-------- node version -----"
+          node --version
+          echo "-------- npm version -----"
+          npm --version
+          echo "-------- yarn version -----"
+          yarn --version
+          echo "======================================="
+          echo "  Misc tools"
+          echo "======================================="
+          echo "-------- docker version -----"
+          docker --version
+          echo "-------- jq version -----"
+          jq --version
+          echo "-------- grabpl version -----"
+          ./bin/grabpl --version
+          echo "======================================="
+      - name: Check backend tools
+        shell: bash
+        if: steps.check_backend.outputs.has_backend == 'true'
+        working-directory: ${{ steps.get_dir.outputs.dir }}
+        run: |
+          echo "======================================="
+          echo "  Backend tools"
+          echo "======================================="
+          echo "-------- go version -----"
+          go version
+          echo "-------- mage version -----"
+          mage --version
+          echo "======================================="
+      - name: build:frontend
+        shell: bash
+        id: build_frontend
+        run: |
+          command="plugin:build:commit"
+          if [ "$GITHUB_REF" != "refs/heads/main" ]; then
+            # Release branch, do not add commit hash to version
+            command="plugin:build"
+          fi
+          yarn $command --scope="@grafana-plugins/${{ inputs.plugin_id }}"
+          version=$(cat ${{ steps.get_dir.outputs.dir }}/dist/plugin.json | jq -r .info.version)
+          echo "version=${version}" >> $GITHUB_OUTPUT
+      - name: build:backend
+        if: steps.check_backend.outputs.has_backend == 'true'
+        shell: bash
+        env:
+          VERSION: ${{ steps.build_frontend.outputs.version }}  
+        run: |
+          make build-plugin-go PLUGIN_ID=${{ inputs.plugin_id }}
+      - name: package
+        working-directory: ${{ steps.get_dir.outputs.dir }}
+        run: |
+          mkdir -p ci/jobs/package
+          bin/grabpl plugin package
+        env:
+          GRAFANA_API_KEY: ${{ env.PLUGINS_GRAFANA_API_KEY }}
+          PLUGIN_SIGNATURE_TYPE: grafana
+      - name: Check existing release
+        env:
+          GCOM_TOKEN: ${{ env.PLUGINS_GCOM_TOKEN }}
+          VERSION: ${{ steps.build_frontend.outputs.version }}  
+        run: |
+          api_res=$(curl -X 'GET' -H "Authorization: Bearer $GCOM_TOKEN" \
+            '${{ env.GCOM_API}}/api/plugins/${{ inputs.plugin_id }}?version=$VERSION' \
+            -H 'accept: application/json')
+          api_res_code=$(echo $api_res | jq -r .code)
+          if [ "$api_res_code" = "NotFound" ]; then
+            echo "No existing release found"
+          else
+            echo "Expecting a missing release, got:"
+            echo $api_res
+            exit 1
+          fi
+      - name: store build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-artifacts
+          path: ${{ steps.get_dir.outputs.dir }}/ci/packages/*.zip
+      - name: Publish release to Google Cloud Storage
+        working-directory: ${{ steps.get_dir.outputs.dir }}
+        env:
+          VERSION: ${{ steps.build_frontend.outputs.version }}  
+        run: |
+          echo "Publish release to Google Cloud Storage:"
+          touch ci/packages/windows ci/packages/darwin ci/packages/linux ci/packages/any
+          gsutil -m cp -r ci/packages/*windows* gs://${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/windows
+          gsutil -m cp -r ci/packages/*linux* gs://${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/linux 
+          gsutil -m cp -r ci/packages/*darwin* gs://${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/darwin
+          gsutil -m cp -r ci/packages/*any* gs://${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/any
+      - name: Publish new plugin version on grafana.com
+        if: steps.check_backend.outputs.has_backend == 'true'
+        working-directory: ${{ steps.get_dir.outputs.dir }}
+        env:
+          GCOM_TOKEN: ${{ env.PLUGINS_GCOM_TOKEN }}
+          VERSION: ${{ steps.build_frontend.outputs.version }}  
+        run: |
+          echo "Publish new plugin version on grafana.com:"
+          echo "Plugin version: ${VERSION}"
+          result=`curl -H "Authorization: Bearer $GCOM_TOKEN" -H "Content-Type: application/json" ${{ env.GCOM_API}}/api/plugins -d "{
+            \"url\": \"https://github.com/grafana/grafana/tree/main/${{ steps.get_dir.outputs.dir }}\",
+            \"download\": {
+              \"linux-amd64\": {
+                \"url\": \"https://storage.googleapis.com/${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/linux/${{ inputs.plugin_id }}-${VERSION}.linux_amd64.zip\",
+                \"md5\": \"$(cat ci/packages/info-linux_amd64.json | jq -r .plugin.md5)\"
+              },
+              \"linux-arm64\": {
+                \"url\": \"https://storage.googleapis.com/${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/linux/${{ inputs.plugin_id }}-${VERSION}.linux_arm64.zip\",
+                \"md5\": \"$(cat ci/packages/info-linux_arm64.json | jq -r .plugin.md5)\"
+              },
+              \"linux-arm\": {
+                \"url\": \"https://storage.googleapis.com/${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/linux/${{ inputs.plugin_id }}-${VERSION}.linux_arm.zip\",
+                \"md5\": \"$(cat ci/packages/info-linux_arm.json | jq -r .plugin.md5)\"
+              },
+              \"windows-amd64\": {
+                \"url\": \"https://storage.googleapis.com/${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/windows/${{ inputs.plugin_id }}-${VERSION}.windows_amd64.zip\",
+                \"md5\": \"$(cat ci/packages/info-windows_amd64.json | jq -r .plugin.md5)\"
+              },
+              \"darwin-amd64\": {
+                \"url\": \"https://storage.googleapis.com/${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/darwin/${{ inputs.plugin_id }}-${VERSION}.darwin_amd64.zip\",
+                \"md5\": \"$(cat ci/packages/info-darwin_amd64.json | jq -r .plugin.md5)\"
+              },
+              \"darwin-arm64\": {
+                \"url\": \"https://storage.googleapis.com/${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/darwin/${{ inputs.plugin_id }}-${VERSION}.darwin_arm64.zip\",
+                \"md5\": \"$(cat ci/packages/info-darwin_arm64.json | jq -r .plugin.md5)\"
+              }
+            }
+          }"`
+          if [[ "$(echo $result | jq -r .version)" == "null" ]]; then
+            echo "Failed to publish plugin version. Got:"
+            echo $result
+            exit 1
+          fi
+      - name: Publish new plugin version on grafana.com (frontend only)
+        if: steps.check_backend.outputs.has_backend == 'false'
+        working-directory: ${{ steps.get_dir.outputs.dir }}
+        env:
+          GCOM_TOKEN: ${{ env.PLUGINS_GCOM_TOKEN }}
+          VERSION: ${{ steps.build_frontend.outputs.version }}
+        run: |
+          echo "Publish new plugin version on grafana.com:"
+          echo "Plugin version: ${VERSION}"
+          result=`curl -H "Authorization: Bearer $GCOM_TOKEN" -H "Content-Type: application/json" ${{ env.GCOM_API}}/api/plugins -d "{
+            \"url\": \"https://github.com/grafana/grafana/tree/main/${{ steps.get_dir.outputs.dir }}\",
+            \"download\": {
+              \"any\": {
+                \"url\": \"https://storage.googleapis.com/${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/any/${{ inputs.plugin_id }}-${VERSION}.any.zip\",
+                \"md5\": \"$(cat ci/packages/info-any.json | jq -r .plugin.md5)\"
+              }
+            }
+          }"`
+          if [[ "$(echo $result | jq -r .version)" == "null" ]]; then
+            echo "Failed to publish plugin version. Got:"
+            echo $result
+            exit 1
+          fi
diff --git a/.github/workflows/create-security-patch-from-security-mirror.yml b/.github/workflows/create-security-patch-from-security-mirror.yml
index 413addb6827dc..e187149b8b47c 100644
--- a/.github/workflows/create-security-patch-from-security-mirror.yml
+++ b/.github/workflows/create-security-patch-from-security-mirror.yml
@@ -1,5 +1,5 @@
-# Owned by grafana-delivery-squad
-# Intended to be dropped into the base repo (Ex: grafana/grafana) for use in the security mirror. 
+# Owned by grafana-release-guild
+# Intended to be dropped into the base repo (Ex: grafana/grafana) for use in the security mirror.
 name: Create security patch
 run-name: create-security-patch
 on:
@@ -17,7 +17,7 @@ jobs:
   trigger_downstream_create_security_patch:
     concurrency: create-patch-${{ github.ref_name }}
     uses: grafana/security-patch-actions/.github/workflows/create-patch.yml@main
-    if: github.repository == 'grafana/grafana-security-mirror' 
+    if: github.repository == 'grafana/grafana-security-mirror'
     with:
       repo: "${{ github.repository }}"
       src_ref: "${{ github.head_ref }}" # this is the source branch name, Ex: "feature/newthing"
diff --git a/.github/workflows/detect-breaking-changes-build-skip.yml b/.github/workflows/detect-breaking-changes-build-skip.yml
deleted file mode 100644
index 58e3cb5642451..0000000000000
--- a/.github/workflows/detect-breaking-changes-build-skip.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-# Workflow for skipping the Levitate detection
-# (This is needed because workflows that are skipped due to path filtering will show up as pending in Github.
-# As this has the same name as the one in detect-breaking-changes-build.yml it will take over in these cases and succeed quickly.)
-
-name: Levitate / Detect breaking changes
-
-on:
-  pull_request:
-    paths-ignore:
-      - "packages/**"
-    branches:
-      - 'main'
-
-jobs:
-  detect:
-    name: Detect breaking changes
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Skipping
-        run: echo "No modifications in the public API (packages/), skipping."
-
-        # Build and persist output as a JSON (we need to tell the report workflow that the check has been skipped)
-      - name: Persisting the check output
-        run: |
-          mkdir -p ./levitate
-          echo "{ \"shouldSkip\": true }" > ./levitate/result.json
-
-      # Upload artifact (so it can be used in the more privileged "report" workflow)
-      - name: Upload check output as artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: levitate
-          path: levitate/
diff --git a/.github/workflows/detect-breaking-changes-build.yml b/.github/workflows/detect-breaking-changes-build.yml
deleted file mode 100644
index 4479c8600fc9a..0000000000000
--- a/.github/workflows/detect-breaking-changes-build.yml
+++ /dev/null
@@ -1,163 +0,0 @@
-# Only runs if anything under the packages/ directory changes. 
-# (Otherwise detect-breaking-changes-build-skip.yml takes over)
-
-name: Levitate / Detect breaking changes
-
-on: 
-  pull_request:
-    paths:
-      - 'packages/**'
-    branches:
-      - 'main'
-
-jobs:
-  buildPR:
-    name: Build PR
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: './pr'
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        path: './pr'
-    - uses: actions/setup-node@v3.8.1
-      with:
-        node-version: 16.16.0
-
-    - name: Get yarn cache directory path
-      id: yarn-cache-dir-path
-      run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
-
-    - name: Restore yarn cache
-      uses: actions/cache@v3.3.1
-      id: yarn-cache
-      with:
-        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-        key: yarn-cache-folder-${{ hashFiles('**/yarn.lock', '.yarnrc.yml') }}
-        restore-keys: |
-          yarn-cache-folder-
-
-    - name: Install dependencies
-      run: yarn install --immutable
-
-    - name: Build packages
-      run: yarn packages:build
-
-    - name: Pack packages
-      run: yarn packages:pack --out ./%s.tgz
-
-    - name: Zip built tarballed packages
-      run: zip -r ./pr_built_packages.zip ./packages/**/*.tgz
-
-    - name: Upload build output as artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: buildPr
-        path: './pr/pr_built_packages.zip'
-
-  buildBase:
-    name: Build Base
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: './base'
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        path: './base'
-        ref: ${{ github.event.pull_request.base.ref }}
-
-    - uses: actions/setup-node@v3.8.1
-      with:
-        node-version: 16.16.0
-
-    - name: Get yarn cache directory path
-      id: yarn-cache-dir-path
-      run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
-
-    - name: Restore yarn cache
-      uses: actions/cache@v3.3.1
-      id: yarn-cache
-      with:
-        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-        key: yarn-cache-folder-${{ hashFiles('**/yarn.lock', '.yarnrc.yml') }}
-        restore-keys: |
-          yarn-cache-folder-
-
-    - name: Install dependencies
-      run: yarn install --immutable
-
-    - name: Build packages
-      run: yarn packages:build
-
-    - name: Pack packages
-      run: yarn packages:pack --out ./%s.tgz
-
-    - name: Zip built tarballed packages
-      run: zip -r ./base_built_packages.zip ./packages/**/*.tgz
-
-    - name: Upload build output as artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: buildBase
-        path: './base/base_built_packages.zip'
-
-  Detect:
-    name: Detect breaking changes
-    runs-on: ubuntu-latest
-    needs: ['buildPR', 'buildBase']
-    env:
-      GITHUB_STEP_NUMBER: 8
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Get built packages from pr
-        uses: actions/download-artifact@v3
-        with:
-          name: buildPr
-
-      - name: Get built packages from base
-        uses: actions/download-artifact@v3
-        with:
-          name: buildBase
-
-      - name: Unzip artifact from pr
-        run: unzip -j pr_built_packages.zip -d ./pr && rm pr_built_packages.zip
-
-      - name: Unzip artifact from base
-        run: unzip -j base_built_packages.zip -d ./base && rm base_built_packages.zip
-
-      - name: Get link for the Github Action job
-        id: job
-        uses: actions/github-script@v6
-        with:
-          script: |
-              const name = 'Detect breaking changes';
-              const script = require('./.github/workflows/scripts/pr-get-job-link.js')
-              await script({name, github, context, core})
-
-      - name: Detect breaking changes
-        id: breaking-changes
-        run: ./scripts/check-breaking-changes.sh
-        env:
-          FORCE_COLOR: 3
-          GITHUB_JOB_LINK: ${{ steps.job.outputs.link }}
-
-      - name: Persisting the check output
-        run: |
-            mkdir -p ./levitate
-            echo "{ \"exit_code\": ${{ steps.breaking-changes.outputs.is_breaking }}, \"message\": \"${{ steps.breaking-changes.outputs.message }}\", \"job_link\": \"${{ steps.job.outputs.link }}#step:${GITHUB_STEP_NUMBER}:1\", \"pr_number\": \"${{ github.event.pull_request.number }}\" }" > ./levitate/result.json
-
-      - name: Upload check output as artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: levitate
-          path: levitate/
-
-      - name: Exit
-        run: exit ${{ steps.breaking-changes.outputs.is_breaking }}
-        shell: bash
diff --git a/.github/workflows/detect-breaking-changes-levitate.yml b/.github/workflows/detect-breaking-changes-levitate.yml
new file mode 100644
index 0000000000000..6ef0ac3514a68
--- /dev/null
+++ b/.github/workflows/detect-breaking-changes-levitate.yml
@@ -0,0 +1,340 @@
+# Only runs if anything under the packages/ directory changes.
+---
+name: Levitate / Detect breaking changes in PR
+
+on:
+  pull_request:
+    paths:
+      - 'packages/**'
+    branches:
+      - 'main'
+
+jobs:
+  buildPR:
+    name: Build PR
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: './pr'
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: './pr'
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20.9.0
+
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
+
+      - name: Restore yarn cache
+        uses: actions/cache@v4
+        id: yarn-cache
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: yarn-cache-folder-${{ hashFiles('**/yarn.lock', '.yarnrc.yml') }}
+          restore-keys: |
+            yarn-cache-folder-
+
+      - name: Install dependencies
+        run: yarn install --immutable
+
+      - name: Build packages
+        run: yarn packages:build
+
+      - name: Pack packages
+        run: yarn packages:pack --out ./%s.tgz
+
+      - name: Zip built tarballed packages
+        run: zip -r ./pr_built_packages.zip ./packages/**/*.tgz
+
+      - name: Upload build output as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: buildPr
+          path: './pr/pr_built_packages.zip'
+
+  buildBase:
+    name: Build Base
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: './base'
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: './base'
+          ref: ${{ github.event.pull_request.base.ref }}
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20.9.0
+
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
+
+      - name: Restore yarn cache
+        uses: actions/cache@v4
+        id: yarn-cache
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: yarn-cache-folder-${{ hashFiles('**/yarn.lock', '.yarnrc.yml') }}
+          restore-keys: |
+            yarn-cache-folder-
+
+      - name: Install dependencies
+        run: yarn install --immutable
+
+      - name: Build packages
+        run: yarn packages:build
+
+      - name: Pack packages
+        run: yarn packages:pack --out ./%s.tgz
+
+      - name: Zip built tarballed packages
+        run: zip -r ./base_built_packages.zip ./packages/**/*.tgz
+
+      - name: Upload build output as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: buildBase
+          path: './base/base_built_packages.zip'
+
+  Detect:
+    name: Detect breaking changes
+    runs-on: ubuntu-latest
+    needs: ['buildPR', 'buildBase']
+    env:
+      GITHUB_STEP_NUMBER: 8
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20.9.0
+
+      - name: Get built packages from pr
+        uses: actions/download-artifact@v4
+        with:
+          name: buildPr
+
+      - name: Get built packages from base
+        uses: actions/download-artifact@v4
+        with:
+          name: buildBase
+
+      - name: Unzip artifact from pr
+        run: unzip -j pr_built_packages.zip -d ./pr && rm pr_built_packages.zip
+
+      - name: Unzip artifact from base
+        run: unzip -j base_built_packages.zip -d ./base && rm base_built_packages.zip
+
+      - name: Get link for the Github Action job
+        id: job
+        uses: actions/github-script@v6
+        with:
+          script: |
+              const name = 'Detect breaking changes';
+              const script = require('./.github/workflows/scripts/pr-get-job-link.js')
+              await script({name, github, context, core})
+
+      - name: Detect breaking changes
+        id: breaking-changes
+        run: ./scripts/check-breaking-changes.sh
+        env:
+          FORCE_COLOR: 3
+          GITHUB_JOB_LINK: ${{ steps.job.outputs.link }}
+
+      - name: Persisting the check output
+        run: |
+            mkdir -p ./levitate
+            echo "{ \"exit_code\": ${{ steps.breaking-changes.outputs.is_breaking }}, \"message\": \"${{ steps.breaking-changes.outputs.message }}\", \"job_link\": \"${{ steps.job.outputs.link }}#step:${GITHUB_STEP_NUMBER}:1\", \"pr_number\": \"${{ github.event.pull_request.number }}\" }" > ./levitate/result.json
+
+      - name: Upload check output as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: levitate
+          path: levitate/
+
+
+  Report:
+    name: Report breaking changes in PR
+    runs-on: ubuntu-latest
+    needs: ['Detect']
+
+    steps:
+      - name: "Generate token"
+        id: generate_token
+        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
+        with:
+          app_id: ${{ secrets.GRAFANA_PR_AUTOMATION_APP_ID }}
+          private_key: ${{ secrets.GRAFANA_PR_AUTOMATION_APP_PEM }}
+
+      - uses: actions/checkout@v4
+
+      - name: 'Download artifact'
+        uses: actions/download-artifact@v4
+        with:
+          name: levitate
+
+      - name: Parsing levitate result
+        uses: actions/github-script@v6
+        id: levitate-run
+        with:
+          script: |
+            const filePath = 'result.json';
+            const script = require('./.github/workflows/scripts/json-file-to-job-output.js');
+            await script({ core, filePath });
+
+      # Check if label exists
+      - name: Check if "levitate breaking change" label exists
+        id: does-label-exist
+        uses: actions/github-script@v6
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+        with:
+          script: |
+            const { data } = await github.rest.issues.listLabelsOnIssue({
+              issue_number: process.env.PR_NUMBER,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+            });
+            const labels = data.map(({ name }) => name);
+            const doesExist = labels.includes('levitate breaking change');
+
+            return doesExist ? 1 : 0;
+
+      # put the markdown into a variable
+      - name: Levitate Markdown
+        id: levitate-markdown
+        run: |
+            if [ -f "levitate.md" ]; then
+            {
+              echo 'levitate_markdown<<EOF'
+              cat levitate.md
+              echo EOF
+            } >> $GITHUB_OUTPUT
+            else
+              echo "levitate_markdown=No breaking changes detected" >> $GITHUB_OUTPUT
+            fi
+
+
+      # Comment on the PR
+      - name: Comment on PR
+        if: steps.levitate-run.outputs.exit_code == 1
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          header: levitate-breaking-change-comment
+          number: ${{ github.event.pull_request.number }}
+          message: |
+            ⚠️ &nbsp;&nbsp;**Possible breaking changes (md version)**&nbsp;&nbsp; ⚠️
+
+            ${{ steps.levitate-markdown.outputs.levitate_markdown }}
+
+            [Read our guideline](https://github.com/grafana/grafana/blob/main/contribute/breaking-changes-guide/breaking-changes-guide.md)
+            [Console output](${{ steps.levitate-run.outputs.job_link }})
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+
+      # Remove comment from the PR (no more breaking changes)
+      - name: Remove comment from PR
+        if: steps.levitate-run.outputs.exit_code == 0
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          header: levitate-breaking-change-comment
+          number: ${{ github.event.pull_request.number }}
+          delete: true
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+
+      # Posts a notification to Slack if a PR has a breaking change and it did not have a breaking change before
+      - name: Post to Slack
+        id: slack
+        if: steps.levitate-run.outputs.exit_code == 1 && steps.does-label-exist.outputs.result == 0 && env.HAS_SECRETS
+        uses: slackapi/slack-github-action@v1.24.0
+        with:
+          payload: |
+            {
+              "pr_link": "https://github.com/grafana/grafana/pull/${{ steps.levitate-run.outputs.pr_number }}",
+              "pr_number": "${{ steps.levitate-run.outputs.pr_number }}",
+              "job_link": "${{ steps.levitate-run.outputs.job_link }}",
+              "reporting_job_link": "${{ github.event.workflow_run.html_url }}",
+              "message": "${{ steps.levitate-run.outputs.message }}"
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_LEVITATE_WEBHOOK_URL }}
+          HAS_SECRETS: ${{ (github.repository == 'grafana/grafana' || secrets.SLACK_LEVITATE_WEBHOOK_URL != '') || '' }}
+
+      # Add the label
+      - name: Add "levitate breaking change" label
+        if: steps.levitate-run.outputs.exit_code == 1 && steps.does-label-exist.outputs.result == 0
+        uses: actions/github-script@v6
+        env:
+          PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
+        with:
+          github-token: ${{ steps.generate_token.outputs.token }}
+          script: |
+            await github.rest.issues.addLabels({
+              issue_number: process.env.PR_NUMBER,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ['levitate breaking change']
+            })
+
+      # Remove label (no more breaking changes)
+      - name: Remove "levitate breaking change" label
+        if: steps.levitate-run.outputs.exit_code == 0 && steps.does-label-exist.outputs.result == 1
+        uses: actions/github-script@v6
+        env:
+          PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
+        with:
+          github-token: ${{ steps.generate_token.outputs.token }}
+          script: |
+            await github.rest.issues.removeLabel({
+              issue_number: process.env.PR_NUMBER,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              name: 'levitate breaking change'
+            })
+
+      # Add reviewers
+      # This is very weird, the actual request goes through (comes back with a 201), but does not assign the team.
+      # Related issue: https://github.com/renovatebot/renovate/issues/1908
+      - name: Add "grafana/plugins-platform-frontend" as a reviewer
+        if: steps.levitate-run.outputs.exit_code == 1
+        uses: actions/github-script@v6
+        env:
+          PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
+        with:
+          github-token: ${{ steps.generate_token.outputs.token }}
+          script: |
+            await github.rest.pulls.requestReviewers({
+              pull_number: process.env.PR_NUMBER,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              reviewers: [],
+              team_reviewers: ['plugins-platform-frontend']
+            });
+
+      # Remove reviewers (no more breaking changes)
+      - name: Remove "grafana/plugins-platform-frontend" from the list of reviewers
+        if: steps.levitate-run.outputs.exit_code == 0
+        uses: actions/github-script@v6
+        env:
+          PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
+        with:
+          github-token: ${{ steps.generate_token.outputs.token }}
+          script: |
+            await github.rest.pulls.removeRequestedReviewers({
+              pull_number: process.env.PR_NUMBER,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              reviewers: [],
+              team_reviewers: ['plugins-platform-frontend']
+            });
+
+      - name: Exit
+        run: exit ${{ steps.levitate-run.outputs.exit_code }}
+        shell: bash
diff --git a/.github/workflows/detect-breaking-changes-report.yml b/.github/workflows/detect-breaking-changes-report.yml
deleted file mode 100644
index fbf0431a2a887..0000000000000
--- a/.github/workflows/detect-breaking-changes-report.yml
+++ /dev/null
@@ -1,209 +0,0 @@
-name: Levitate / Report breaking changes
-
-on:
-  workflow_run:
-    workflows: ["Levitate / Detect breaking changes"]
-    types: [completed]
-
-permissions:
-  pull-requests: write
-
-jobs:
-  notify:
-    name: Report
-    runs-on: ubuntu-latest
-    env:
-      ARTIFACT_NAME: 'levitate' # The name of the artifact that we would like to download
-      ARTIFACT_FOLDER: '${{ github.workspace }}/tmp' # The name of the folder where we will download the artifact to
-    permissions:
-      contents: read
-      issues: write
-      pull-requests: write
-
-    steps:
-    - uses: actions/checkout@v4
-
-    # Download artifact (as a .zip archive)
-    - name: 'Download artifact'
-      uses: actions/github-script@v6
-      env:
-        RUN_ID: ${{ github.event.workflow_run.id }}
-      with:
-        script: |
-          const fs = require('fs');
-
-          const { owner, repo } = context.repo;
-          const runId = process.env.RUN_ID;
-          const artifactName = process.env.ARTIFACT_NAME;
-          const artifactFolder = process.env.ARTIFACT_FOLDER;
-          const artifacts = await github.rest.actions.listWorkflowRunArtifacts({
-              owner,
-              repo,
-              run_id: runId,
-          });
-          const artifact = artifacts.data.artifacts.find(a => a.name === artifactName);
-
-          if (!artifact) {
-              throw new Error(`Could not find artifact ${ artifactName } in workflow (${ runId })`);
-          }
-
-          const download = await github.rest.actions.downloadArtifact({
-              owner,
-              repo,
-              artifact_id: artifact.id,
-              archive_format: 'zip',
-          });
-
-          fs.mkdirSync(artifactFolder, { recursive: true });
-          fs.writeFileSync(`${ artifactFolder }/${ artifactName }.zip`, Buffer.from(download.data));
-
-    # Unzip artifact
-    - name: Unzip artifact
-      run: unzip "${ARTIFACT_FOLDER}/${ARTIFACT_NAME}.zip" -d "${ARTIFACT_FOLDER}"
-
-     # Parse the artifact and register fields as step output variables
-      # (All fields in the JSON will be available as ${{ steps.levitate-run.outputs.<field-name> }}
-    - name: Parsing levitate result
-      uses: actions/github-script@v6
-      id: levitate-run
-      with:
-        script: |
-          const filePath = `${ process.env.ARTIFACT_FOLDER }/result.json`;
-          const script = require('./.github/workflows/scripts/json-file-to-job-output.js');
-          await script({ core, filePath });
-
-    # Skip - print a message if the "Detect" workflow was skipped
-    - name: Check if the workflow should be skipped
-      if: steps.levitate-run.outputs.shouldSkip == 'true'
-      run: echo "Skipping."
-
-    # Check if label exists
-    - name: Check if "levitate breaking change" label exists
-      id: does-label-exist
-      if: steps.levitate-run.outputs.shouldSkip != 'true'
-      uses: actions/github-script@v6
-      env:
-        PR_NUMBER: ${{ github.event.workflow_run.pull_requests[0].number }}
-      with:
-        script: |
-          const { data } = await github.rest.issues.listLabelsOnIssue({
-            issue_number: process.env.PR_NUMBER,
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-          });
-          const labels = data.map(({ name }) => name);
-          const doesExist = labels.includes('levitate breaking change');
-
-          return doesExist ? 1 : 0;
-
-    # Comment on the PR
-    - name: Comment on PR
-      if: steps.levitate-run.outputs.exit_code == 1 && steps.levitate-run.outputs.shouldSkip != 'true'
-      uses: marocchino/sticky-pull-request-comment@v2
-      with:
-        number: ${{ steps.levitate-run.outputs.pr_number }}
-        message: |
-          ⚠️ &nbsp;&nbsp;**Possible breaking changes**
-
-          _(Open the links below in a new tab to go to the correct steps)_
-
-          ${{ steps.levitate-run.outputs.message }}
-
-          [Console output](${{ steps.levitate-run.outputs.job_link }})
-          [Read our guideline](https://github.com/grafana/grafana/blob/main/contribute/breaking-changes-guide/breaking-changes-guide.md)
-
-    # Remove comment from the PR (no more breaking changes)
-    - name: Remove comment from PR
-      if: steps.levitate-run.outputs.exit_code == 0 && steps.levitate-run.outputs.shouldSkip != 'true'
-      uses: marocchino/sticky-pull-request-comment@v2
-      with:
-        number: ${{ steps.levitate-run.outputs.pr_number }}
-        delete: true
-
-    # Posts a notification to Slack if a PR has a breaking change and it did not have a breaking change before
-    - name: Post to Slack
-      id: slack
-      if: steps.levitate-run.outputs.exit_code == 1 && steps.does-label-exist.outputs.result == 0 && steps.levitate-run.outputs.shouldSkip != 'true' && env.HAS_SECRETS
-      uses: slackapi/slack-github-action@v1.24.0
-      with:
-        payload: |
-          {
-            "pr_link": "https://github.com/grafana/grafana/pull/${{ steps.levitate-run.outputs.pr_number }}",
-            "pr_number": "${{ steps.levitate-run.outputs.pr_number }}",
-            "job_link": "${{ steps.levitate-run.outputs.job_link }}",
-            "reporting_job_link": "${{ github.event.workflow_run.html_url }}",
-            "message": "${{ steps.levitate-run.outputs.message }}"
-          }
-      env:
-        SLACK_WEBHOOK_URL: ${{ secrets.SLACK_LEVITATE_WEBHOOK_URL }}
-        HAS_SECRETS: ${{ (github.repository == 'grafana/grafana' || secrets.SLACK_LEVITATE_WEBHOOK_URL != '') || '' }}
-
-    # Add the label
-    - name: Add "levitate breaking change" label
-      if: steps.levitate-run.outputs.exit_code == 1 && steps.does-label-exist.outputs.result == 0 && steps.levitate-run.outputs.shouldSkip != 'true'
-      uses: actions/github-script@v6
-      env:
-        PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        script: |
-          await github.rest.issues.addLabels({
-            issue_number: process.env.PR_NUMBER,
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            labels: ['levitate breaking change']
-          })
-
-    # Remove label (no more breaking changes)
-    - name: Remove "levitate breaking change" label
-      if: steps.levitate-run.outputs.exit_code == 0 && steps.does-label-exist.outputs.result == 1 && steps.levitate-run.outputs.shouldSkip != 'true'
-      uses: actions/github-script@v6
-      env:
-        PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        script: |
-          await github.rest.issues.removeLabel({
-            issue_number: process.env.PR_NUMBER,
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            name: 'levitate breaking change'
-          })
-
-    # Add reviewers
-    # This is very weird, the actual request goes through (comes back with a 201), but does not assign the team.
-    # Related issue: https://github.com/renovatebot/renovate/issues/1908
-    - name: Add "grafana/plugins-platform-frontend" as a reviewer
-      if: steps.levitate-run.outputs.exit_code && steps.levitate-run.outputs.shouldSkip != 'true'
-      uses: actions/github-script@v6
-      env:
-        PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        script: |
-          await github.rest.pulls.requestReviewers({
-            pull_number: process.env.PR_NUMBER,
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            reviewers: [],
-            team_reviewers: ['grafana/plugins-platform-frontend']
-          });
-
-    # Remove reviewers (no more breaking changes)
-    - name: Remove "grafana/plugins-platform-frontend" from the list of reviewers
-      if: steps.levitate-run.outputs.exit_code == 0 && steps.levitate-run.outputs.shouldSkip != 'true'
-      uses: actions/github-script@v6
-      env:
-        PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        script: |
-          await github.rest.pulls.removeRequestedReviewers({
-            pull_number: process.env.PR_NUMBER,
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            reviewers: [],
-            team_reviewers: ['grafana/plugins-platform-frontend']
-          });
-
-
diff --git a/.github/workflows/doc-validator.yml b/.github/workflows/doc-validator.yml
index 9e28a128b9785..75b721904cc10 100644
--- a/.github/workflows/doc-validator.yml
+++ b/.github/workflows/doc-validator.yml
@@ -7,7 +7,7 @@ jobs:
   doc-validator:
     runs-on: "ubuntu-latest"
     container:
-      image: "grafana/doc-validator:v4.0.0"
+      image: "grafana/doc-validator:v5.0.0"
     steps:
       - name: "Checkout code"
         uses: "actions/checkout@v4"
diff --git a/.github/workflows/ephemeral-instances-pr-comment.yml b/.github/workflows/ephemeral-instances-pr-comment.yml
index 13916e5829dd9..4a6ec0ff134f3 100644
--- a/.github/workflows/ephemeral-instances-pr-comment.yml
+++ b/.github/workflows/ephemeral-instances-pr-comment.yml
@@ -4,7 +4,11 @@ on:
     types: [created]
 jobs:
   config:
-    runs-on: "ubuntu-latest"
+    if: github.event.sender.type == 'User' &&
+        github.event.issue.pull_request &&
+        startsWith(github.event.comment.body, '/deploy-to-hg')
+    runs-on:
+      labels: ubuntu-latest-8-cores
     outputs:
       has-secrets: ${{ steps.check.outputs.has-secrets }}
     steps:
diff --git a/.github/workflows/feature-toggle-cleanup.yml b/.github/workflows/feature-toggle-cleanup.yml
new file mode 100644
index 0000000000000..f157dfcb61491
--- /dev/null
+++ b/.github/workflows/feature-toggle-cleanup.yml
@@ -0,0 +1,28 @@
+name: Feature Toggle Cleanup
+
+on:
+  workflow_dispatch:
+  schedule:
+      # * is a special character in YAML so you have to quote this string
+      - cron:  '30 10 * * *'
+jobs:
+    feature-toggle-cleanup:
+        runs-on: ubuntu-latest
+        # This check is here to prevent this workflow from running on forks.    
+        if: github.repository == 'grafana/grafana'
+        steps:
+            - name: Check out the code
+              uses: actions/checkout@v3
+            - uses: actions/setup-node@v4
+              with:
+                node-version: "20.x"
+            - run: npm install csv-parse
+            - name: Parse CVS file to see which Feature Toggles should be notified about
+              id: parse-csv-file
+              uses: actions/github-script@v7
+              env:
+                    FEATURE_TOGGLES_CSV_FILE_PATH: "pkg/services/featuremgmt/toggles_gen.csv"
+              with:
+                    script: |
+                        const { default: cleanupFeatureFlags } = await import('${{ github.workspace }}/.github/workflows/scripts/feature-toggle-cleanup/feature-toggle-cleanup.mjs')                        
+                        await cleanupFeatureFlags({github, context, core})
\ No newline at end of file
diff --git a/.github/workflows/i18n-crowdin-download.yml b/.github/workflows/i18n-crowdin-download.yml
new file mode 100644
index 0000000000000..c442dc1404897
--- /dev/null
+++ b/.github/workflows/i18n-crowdin-download.yml
@@ -0,0 +1,122 @@
+name: Crowdin Download Action
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 * * * *"
+
+jobs:
+  download-sources-from-crowdin:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write # needed to commit changes into the PR
+      pull-requests: write # needed to update PR description, labels, etc
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}
+
+      - name: Download sources
+        id: crowdin-download
+        uses: crowdin/github-action@v1
+        with:
+          upload_sources: false
+          upload_translations: false
+          download_sources: false
+          download_translations: true
+          export_only_approved: true
+          localization_branch_name: i18n_crowdin_translations
+          create_pull_request: true
+          pull_request_title: 'I18n: Download translations from Crowdin'
+          pull_request_body:  |
+            :robot: Automatic download of translations from Crowdin.
+
+            Steps for merging:
+              1. A quick sanity check of the changes and approve. Things to look out for:
+                - No changes in the English file. The source of truth is in the main branch, NOT in Crowdin.
+                - Translations maybe be removed if the English phrase was removed, but there should not be many of these
+                - Anything else that looks 'funky'. Ask if you're not sure.
+              2. Approve & (Auto-)merge. :tada:
+
+            If there's a conflict, close the pull request and **delete the branch**. A GH action will recreate the pull request.
+            Remember, the longer this pull request is open, the more likely it is that it'll get conflicts.
+          pull_request_labels: 'area/frontend, area/internationalization, no-changelog, no-backport'
+          pull_request_reviewers: 'grafana-frontend-platform'
+          pull_request_base_branch_name: 'main'
+          base_url: 'https://grafana.api.crowdin.com'
+          config: 'crowdin.yml'
+          source: 'public/locales/en-US/grafana.json'
+          translation: 'public/locales/%locale%/%original_file_name%'
+          # Magic details of the github-actions bot user, to pass CLA checks
+          github_user_name: "github-actions[bot]"
+          github_user_email: "41898282+github-actions[bot]@users.noreply.github.com"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
+
+      - name: Generate token
+        if: steps.crowdin-download.outputs.pull_request_url
+        id: generate_token
+        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
+        with:
+          app_id: ${{ secrets.GRAFANA_PR_AUTOMATION_APP_ID }}
+          private_key: ${{ secrets.GRAFANA_PR_AUTOMATION_APP_PEM }}
+
+      - name: Get pull request ID
+        if: steps.crowdin-download.outputs.pull_request_url
+        shell: bash
+        # Crowdin action returns us the URL of the pull request, but we need an ID for the GraphQL API
+        # that looks like 'PR_kwDOAOaWjc5mP_GU'
+        run: |
+          pr_id=$(gh pr view ${{ steps.crowdin-download.outputs.pull_request_url }} --json id -q .id)
+          echo "PULL_REQUEST_ID=$pr_id" >> "$GITHUB_ENV"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get project board ID
+        uses: octokit/graphql-action@v2.x
+        id: get-project-id
+        if: steps.crowdin-download.outputs.pull_request_url
+        with:
+          # Frontend Platform project - https://github.com/orgs/grafana/projects/78
+          org: grafana
+          project_number: 78
+          query: |
+            query getProjectId($org: String!, $project_number: Int!){
+              organization(login: $org) {
+                projectV2(number: $project_number) {
+                  title
+                  id
+                }
+              }
+            }
+        env:
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+
+      - name: Add to project board
+        uses: octokit/graphql-action@v2.x
+        if: steps.crowdin-download.outputs.pull_request_url
+        with:
+          projectid: ${{ fromJson(steps.get-project-id.outputs.data).organization.projectV2.id }}
+          prid: ${{ env.PULL_REQUEST_ID }}
+          query: |
+            mutation addPullRequestToProject($projectid: ID!, $prid: ID!){
+              addProjectV2ItemById(input: {projectId: $projectid, contentId: $prid}) {
+                item {
+                  id
+                }
+              }
+            }
+
+        env:
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+
+      - name: Run auto-milestone
+        uses: grafana/grafana-github-actions-go/auto-milestone@main
+        if: steps.crowdin-download.outputs.pull_request_url
+        with:
+          pr: ${{ steps.crowdin-download.outputs.pull_request_number }}
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/i18n-crowdin-upload.yml b/.github/workflows/i18n-crowdin-upload.yml
new file mode 100644
index 0000000000000..9e028b5386fe2
--- /dev/null
+++ b/.github/workflows/i18n-crowdin-upload.yml
@@ -0,0 +1,33 @@
+name: Crowdin Upload Action
+
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - 'public/locales/en-US/grafana.json'
+    branches:
+      - main
+
+jobs:
+  upload-sources-to-crowdin:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Upload sources
+        uses: crowdin/github-action@v1
+        with:
+          upload_sources: true
+          upload_sources_args: '--dest=public/locales/en-US/grafana.json'
+          upload_translations: false
+          download_translations: false
+          create_pull_request: false
+          base_url: 'https://grafana.api.crowdin.com'
+          config: 'crowdin.yml'
+          source: 'public/locales/en-US/grafana.json'
+          translation: 'public/locales/%locale%/%original_file_name%'
+        env:
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
diff --git a/.github/workflows/issue-labeled.yml b/.github/workflows/issue-labeled.yml
index e0a5abcdc3798..586b2d6d7f13e 100644
--- a/.github/workflows/issue-labeled.yml
+++ b/.github/workflows/issue-labeled.yml
@@ -53,7 +53,7 @@ jobs:
           echo "TEAM=${TEAM}" >> $GITHUB_ENV
 
       - name: "Prepare payload"
-        uses: frabert/replace-string-action@v2.0
+        uses: frabert/replace-string-action@v2.5
         id: preparePayload
         with:
           # replace double quotes with single quotes to avoid breaking the JSON payload sent to Slack
@@ -64,7 +64,7 @@ jobs:
 
       - name: Get Token
         id: get_workflow_token
-        uses: peter-murray/workflow-application-token-action@v2
+        uses: peter-murray/workflow-application-token-action@v3
         with:
           application_id: ${{ secrets.APP_GRAFANA_TEAM_CHECKER_ID }}
           application_private_key: ${{ secrets.APP_GRAFANA_TEAM_CHECKER_KEY }}
diff --git a/.github/workflows/metrics-collector.yml b/.github/workflows/metrics-collector.yml
index 7728516153329..2e22a830a8845 100644
--- a/.github/workflows/metrics-collector.yml
+++ b/.github/workflows/metrics-collector.yml
@@ -25,7 +25,7 @@ jobs:
         id: check
         shell: bash
         run: |
-          if [ -n "${{ (secrets.GRAFANA_MISC_STATS_API_KEY != '' && secrets.GH_BOT_ACCESS_TOKEN != '') || '' }}" ]; then
+          if [ -n "${{ (secrets.GRAFANA_MISC_STATS_API_KEY != '') || '' }}" ]; then
             echo "has-secrets=1" >> "$GITHUB_OUTPUT"
           fi
 
@@ -46,5 +46,5 @@ jobs:
         uses: ./actions/metrics-collector
         with:
           metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}
-          token: ${{secrets.GH_BOT_ACCESS_TOKEN}}
+          token: ${{secrets.GITHUB_TOKEN}}
           configPath: "metrics-collector"
diff --git a/.github/workflows/ox-code-coverage.yml b/.github/workflows/ox-code-coverage.yml
deleted file mode 100644
index acc72ed68528e..0000000000000
--- a/.github/workflows/ox-code-coverage.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Observability Experience test code coverage
-on:
-  pull_request:
-    paths:
-      - 'pkg/services/queryhistory/**'
-      - 'pkg/tsdb/loki/**'
-      - 'pkg/tsdb/elasticsearch/**'
-      - 'public/app/features/explore/**'
-      - 'public/app/features/correlations/**'
-      - 'public/app/plugins/datasource/loki/**'
-      - 'public/app/plugins/datasource/elasticsearch/**'
-    branches-ignore:
-      - dependabot/**
-      - backport-*
-
-jobs:
-  workflow-call:
-    uses: grafana/code-coverage/.github/workflows/code-coverage.yml@v0.1.20
-    with:
-      frontend-path-regexp: public\/app\/features\/(explore|correlations)|public\/app\/plugins\/datasource\/(loki|elasticsearch)
-      backend-path-regexp: pkg\/services\/(queryhistory)|pkg\/tsdb\/(loki|elasticsearch)
diff --git a/.github/workflows/pr-codeql-analysis-go.yml b/.github/workflows/pr-codeql-analysis-go.yml
index 26b45ad58145f..8485f33868332 100644
--- a/.github/workflows/pr-codeql-analysis-go.yml
+++ b/.github/workflows/pr-codeql-analysis-go.yml
@@ -16,17 +16,26 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+    - name: "Generate token"
+      id: generate_token
+      continue-on-error: true
+      uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
+      with:
+        app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
+        private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
+
     - name: Checkout repository
       uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
         fetch-depth: 2
+        token: ${{ steps.generate_token.outputs.token }}
 
     - name: Set go version
       uses: actions/setup-go@v4
       with:
-        go-version: '1.20.10'
+        go-version: '1.21.10'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
@@ -41,3 +50,4 @@ jobs:
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
+      if: github.repository == 'grafana/grafana'
diff --git a/.github/workflows/pr-codeql-analysis-javascript.yml b/.github/workflows/pr-codeql-analysis-javascript.yml
index 304b2798fbc80..e09b3a71c7051 100644
--- a/.github/workflows/pr-codeql-analysis-javascript.yml
+++ b/.github/workflows/pr-codeql-analysis-javascript.yml
@@ -33,3 +33,4 @@ jobs:
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
+      if: github.repository == 'grafana/grafana'
diff --git a/.github/workflows/pr-codeql-analysis-python.yml b/.github/workflows/pr-codeql-analysis-python.yml
index acd2352a2aecf..e990d71391509 100644
--- a/.github/workflows/pr-codeql-analysis-python.yml
+++ b/.github/workflows/pr-codeql-analysis-python.yml
@@ -31,3 +31,4 @@ jobs:
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
+      if: github.repository == 'grafana/grafana'
diff --git a/.github/workflows/pr-go-workspace-check.yml b/.github/workflows/pr-go-workspace-check.yml
new file mode 100644
index 0000000000000..4f1672e367a0c
--- /dev/null
+++ b/.github/workflows/pr-go-workspace-check.yml
@@ -0,0 +1,47 @@
+name: "Go Workspace Check"
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches: [main]
+    paths:
+      - '**/go.work'
+      - '**/go.work.sum'
+      - '**/go.mod'
+      - '**/go.sum'
+
+jobs:
+  check:
+    name: Go Workspace Check
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    - name: Set go version
+      uses: actions/setup-go@v4
+      with:
+        go-version: '1.21.10'
+
+    - name: Workspace Sync
+      run: go work sync
+
+    - name: Check for go mod & workspace changes 
+      run: |
+        if ! git diff --exit-code --quiet; then
+          echo "Changes detected. Please run 'go work sync' and commit the changes."
+          exit 1
+        fi
+
+    - name: Build
+      run: make build-go
+
+    - name: Check for go workspace changes 
+      run: |
+        if ! git diff --exit-code --quiet; then
+          echo "Changes detected. Please run 'make build-go' and commit the changes."
+          exit 1
+        fi
\ No newline at end of file
diff --git a/.github/workflows/pr-patch-check.yml b/.github/workflows/pr-patch-check.yml
index 1ff327ebdef8c..ef1009b7545a4 100644
--- a/.github/workflows/pr-patch-check.yml
+++ b/.github/workflows/pr-patch-check.yml
@@ -1,4 +1,4 @@
-# Owned by grafana-delivery-squad
+# Owned by grafana-release-guild
 # Intended to be dropped into the base repo Ex: grafana/grafana
 name: Check for patch conflicts
 run-name: check-patch-conflicts-${{ github.base_ref }}-${{ github.head_ref }}
@@ -18,6 +18,7 @@ on:
 jobs:
   trigger_downstream_patch_check:
     uses: grafana/security-patch-actions/.github/workflows/test-patches.yml@main
+    if: github.repository == 'grafana/grafana'
     with:
       src_repo: "${{ github.repository }}"
       src_ref: "${{ github.head_ref }}" # this is the source branch name, Ex: "feature/newthing"
diff --git a/.github/workflows/publish-kinds-next.yml b/.github/workflows/publish-kinds-next.yml
index 97c70377ac559..ec2c8e7ae7abb 100644
--- a/.github/workflows/publish-kinds-next.yml
+++ b/.github/workflows/publish-kinds-next.yml
@@ -36,7 +36,7 @@ jobs:
       - name: "Setup Go"
         uses: "actions/setup-go@v4"
         with:
-          go-version: '1.20.10'
+          go-version: '1.21.10'
 
       - name: "Verify kinds"
         run: go run .github/workflows/scripts/kinds/verify-kinds.go
diff --git a/.github/workflows/publish-kinds-release.yml b/.github/workflows/publish-kinds-release.yml
index 30516f062d895..3a86ae356e562 100644
--- a/.github/workflows/publish-kinds-release.yml
+++ b/.github/workflows/publish-kinds-release.yml
@@ -39,7 +39,7 @@ jobs:
       - name: "Setup Go"
         uses: "actions/setup-go@v4"
         with:
-          go-version: '1.20.10'
+          go-version: '1.21.10'
 
       - name: "Verify kinds"
         run: go run .github/workflows/scripts/kinds/verify-kinds.go
diff --git a/.github/workflows/publish-technical-documentation-release.yml b/.github/workflows/publish-technical-documentation-release.yml
index 87f34de25b269..3cc7a8d45f989 100644
--- a/.github/workflows/publish-technical-documentation-release.yml
+++ b/.github/workflows/publish-technical-documentation-release.yml
@@ -28,23 +28,13 @@ jobs:
       - name: "Install Actions from library"
         run: "npm install --production --prefix ./actions"
 
-      - name: "Determine if there is a matching release tag"
-        id: "has-matching-release-tag"
-        uses: "./actions/has-matching-release-tag"
-        with:
-          ref_name: "${{ github.ref_name }}"
-          release_tag_regexp: "^v(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)$"
-          release_branch_regexp: "^v(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.x$"
-
       - name: "Determine technical documentation version"
-        if: "steps.has-matching-release-tag.outputs.bool == 'true'"
         uses: "./actions/docs-target"
         id: "target"
         with:
           ref_name: "${{ github.ref_name }}"
 
       - name: "Clone website-sync Action"
-        if: "steps.has-matching-release-tag.outputs.bool == 'true'"
         # WEBSITE_SYNC_TOKEN is a fine-grained GitHub Personal Access Token that expires.
         # It must be regenerated in the grafanabot GitHub account and requires a Grafana organization
         # GitHub administrator to update the organization secret.
@@ -54,11 +44,10 @@ jobs:
       - name: "Switch to HEAD of version branch for tags"
         # Tags aren't necessarily made to the HEAD of the version branch.
         # The documentation to be published is always on the HEAD of the version branch.
-        if: "steps.has-matching-release-tag.outputs.bool == 'true' && github.ref_type == 'tag'"
-        run: "git switch --detach origin/${{ steps.target.output.target }}.x"
+        if: "github.ref_type == 'tag'"
+        run: "git switch --detach origin/${{ steps.target.outputs.target }}.x"
 
       - name: "Publish to website repository (release)"
-        if: "steps.has-matching-release-tag.outputs.bool == 'true'"
         uses: "./.github/actions/website-sync"
         id: "publish-release"
         with:
diff --git a/.github/workflows/run-scenes-e2e.yml b/.github/workflows/run-scenes-e2e.yml
new file mode 100644
index 0000000000000..ff2e70841a2d6
--- /dev/null
+++ b/.github/workflows/run-scenes-e2e.yml
@@ -0,0 +1,46 @@
+name: Run dashboard scenes e2e
+
+on:
+  schedule:
+    - cron: "0 8 * * 1-5" # every day at 08:00UTC on weekdays
+
+env:
+  ARCH: linux-amd64
+
+jobs:
+  dashboard-scenes-e2e:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Pin Go version to mod file
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+      - run: go version
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: Install dependencies
+        run: yarn install --immutable
+      - name: Build grafana
+        run: make build
+      - name: Install Cypress dependencies
+        uses: cypress-io/github-action@v6
+        with: 
+          runTests: false
+      - name: Run dashboard scenes e2e
+        run: yarn e2e:scenes
+      - name: "Send Slack notification"
+        if: ${{ failure() }}
+        uses: slackapi/slack-github-action@v1.26.0
+        with:
+          payload: >
+            {
+              "icon_emoji": ":this-is-fine-fire:",
+              "username": "Dashboard scenes e2e tests failed",
+              "text": "Link to run: https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}",
+              "channel": "#grafana-dashboards-squad"
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
diff --git a/.github/workflows/scripts/feature-toggle-cleanup/feature-toggle-cleanup.js b/.github/workflows/scripts/feature-toggle-cleanup/feature-toggle-cleanup.js
new file mode 100644
index 0000000000000..35bc2938c1002
--- /dev/null
+++ b/.github/workflows/scripts/feature-toggle-cleanup/feature-toggle-cleanup.js
@@ -0,0 +1,38 @@
+import { parse } from 'csv-parse/sync';
+import fs from 'fs';
+
+/***
+ * Feauture Flag Structure example
+ *  Name: 'disableEnvelopeEncryption',
+    Stage: 'GA',
+    Owner: '@grafana/grafana-as-code',
+    Created: '2022-05-24',
+    requiresDevMode: 'false',
+    RequiresLicense: 'false',
+    RequiresRestart: 'false',
+    FrontendOnly: 'false'
+ * 
+ */
+
+
+export default function cleanupFeatureFlags() {
+	const today = new Date();
+	const sixMonthAgo = today.setMonth(today.getMonth() - 6);
+	const inputFileContents = fs.readFileSync(process.env.FEATURE_TOGGLES_CSV_FILE_PATH);
+	const parsedFeatureFlags = parse(inputFileContents, {
+		columns: true,
+		skip_empty_lines: true,
+		cast: true,
+		cast_date: true,
+	  });
+
+	// Here we can have the custom logic of how to handle what type of feature flag - e.g. GA can be treated differently than experimental and so on.
+	for (const flag of parsedFeatureFlags) {
+		if (flag.Created < sixMonthAgo) {
+			console.log(`The flag ${flag.Name} was created more than 6 months ago. It should be checked.`);
+			console.log(flag);
+		}
+	}
+	
+
+}
diff --git a/.github/workflows/scripts/kinds/verify-kinds.go b/.github/workflows/scripts/kinds/verify-kinds.go
index 72fc3b3047619..ab60a90bd3ee0 100644
--- a/.github/workflows/scripts/kinds/verify-kinds.go
+++ b/.github/workflows/scripts/kinds/verify-kinds.go
@@ -1,227 +1,124 @@
 package main
 
 import (
-	"archive/zip"
 	"context"
+	"errors"
 	"fmt"
-	"io"
-	"net/http"
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
 	"os"
 	"path/filepath"
 	"regexp"
-	"strconv"
 	"strings"
-	"testing/fstest"
 
 	"cuelang.org/go/cue"
 	cueformat "cuelang.org/go/cue/format"
-	"github.com/google/go-github/github"
 	"github.com/grafana/codejen"
-	"github.com/grafana/grafana/pkg/codegen"
-	"github.com/grafana/grafana/pkg/cuectx"
-	"github.com/grafana/grafana/pkg/plugins/pfs"
-	"github.com/grafana/grafana/pkg/plugins/pfs/corelist"
-	"github.com/grafana/grafana/pkg/registry/corekind"
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema"
-	"golang.org/x/oauth2"
+	"github.com/grafana/grafana/pkg/registry/schemas"
 )
 
-const (
-	GITHUB_OWNER = "grafana"
-	GITHUB_REPO  = "kind-registry"
-)
+var nonAlphaNumRegex = regexp.MustCompile("[^a-zA-Z0-9 ]+")
 
 // main This script verifies that stable kinds are not updated once published (new schemas
 // can be added but existing ones cannot be updated).
-// If the env variable CODEGEN_VERIFY is not present, this also generates kind files into a
-// local "next" folder, ready to be published in the kind-registry repo.
+// It generates kind files into a local "next" folder, ready to be published in the kind-registry repo.
 // If kind names are given as parameters, the script will make the above actions only for the
 // given kinds.
 func main() {
-	var corek []kindsys.Kind
-	var compok []kindsys.Composable
-
-	kindRegistry, err := NewKindRegistry()
-	defer kindRegistry.cleanUp()
-	if err != nil {
-		die(err)
-	}
-
-	// Search for the latest version directory present in the kind-registry repo
-	latestRegistryDir, err := kindRegistry.findLatestDir()
-	if err != nil {
-		die(fmt.Errorf("failed to get latest directory for published kinds: %s", err))
-	}
-
-	errs := make([]error, 0)
-
-	// Kind verification
-	for _, kind := range corekind.NewBase(nil).All() {
-		name := kind.Props().Common().MachineName
-		err := verifyKind(kindRegistry, kind, name, "core", latestRegistryDir)
-		if err != nil {
-			errs = append(errs, err)
-			continue
-		}
-
-		corek = append(corek, kind)
-	}
-
-	for _, pp := range corelist.New(nil) {
-		for _, kind := range pp.ComposableKinds {
-			si, err := kindsys.FindSchemaInterface(kind.Def().Properties.SchemaInterface)
-			if err != nil {
-				errs = append(errs, err)
-				continue
-			}
-
-			name := strings.ToLower(fmt.Sprintf("%s/%s", strings.TrimSuffix(kind.Lineage().Name(), si.Name()), si.Name()))
-			err = verifyKind(kindRegistry, kind, name, "composable", latestRegistryDir)
-			if err != nil {
-				errs = append(errs, err)
-				continue
-			}
-
-			compok = append(compok, kind)
-		}
-	}
-
-	die(errs...)
-
-	if _, set := os.LookupEnv("CODEGEN_VERIFY"); set {
-		os.Exit(0)
-	}
-
 	// File generation
 	jfs := codejen.NewFS()
 	outputPath := filepath.Join(".github", "workflows", "scripts", "kinds")
 
-	coreJennies := codejen.JennyList[kindsys.Kind]{}
+	corekinds, err := schemas.GetCoreKinds()
+	die(err)
+
+	composableKinds, err := schemas.GetComposableKinds()
+	die(err)
+
+	coreJennies := codejen.JennyList[schemas.CoreKind]{}
 	coreJennies.Append(
-		KindRegistryJenny(outputPath),
+		CoreKindRegistryJenny(outputPath),
 	)
-	corefs, err := coreJennies.GenerateFS(corek...)
+	corefs, err := coreJennies.GenerateFS(corekinds...)
 	die(err)
 	die(jfs.Merge(corefs))
 
-	composableJennies := codejen.JennyList[kindsys.Composable]{}
+	composableJennies := codejen.JennyList[schemas.ComposableKind]{}
 	composableJennies.Append(
 		ComposableKindRegistryJenny(outputPath),
 	)
-	composablefs, err := composableJennies.GenerateFS(compok...)
+	composablefs, err := composableJennies.GenerateFS(composableKinds...)
 	die(err)
 	die(jfs.Merge(composablefs))
 
 	if err = jfs.Write(context.Background(), ""); err != nil {
 		die(fmt.Errorf("error while writing generated code to disk:\n%s", err))
 	}
-}
 
-func die(errs ...error) {
-	if len(errs) > 0 && errs[0] != nil {
-		for _, err := range errs {
-			fmt.Fprint(os.Stderr, err, "\n")
-		}
-		os.Exit(1)
+	if err := copyCueSchemas("packages/grafana-schema/src/common", filepath.Join(outputPath, "next")); err != nil {
+		die(fmt.Errorf("error while copying the grafana-schema/common package:\n%s", err))
 	}
 }
 
-// verifyKind verifies that stable kinds are not updated once published (new schemas
-// can be added but existing ones cannot be updated)
-func verifyKind(registry *kindRegistry, kind kindsys.Kind, name string, category string, latestRegistryDir string) error {
-	oldKindString, err := registry.getPublishedKind(name, category, latestRegistryDir)
-	if err != nil {
-		return err
-	}
+func copyCueSchemas(fromDir string, toDir string) error {
+	baseTargetDir := filepath.Base(fromDir)
 
-	var oldKind kindsys.Kind
-	if oldKindString != "" {
-		switch category {
-		case "core":
-			oldKind, err = loadCoreKind(name, oldKindString)
-		case "composable":
-			oldKind, err = loadComposableKind(name, oldKindString)
-		default:
-			return fmt.Errorf("kind can only be core or composable")
+	return filepath.Walk(fromDir, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
 		}
-	}
-	if err != nil {
-		return err
-	}
-
-	// Kind is new - no need to compare it
-	if oldKind == nil {
-		return nil
-	}
-
-	// Check that maturity isn't downgraded
-	if kind.Maturity().Less(oldKind.Maturity()) {
-		return fmt.Errorf("kind maturity can't be downgraded once a kind is published")
-	}
-
-	if oldKind.Maturity().Less(kindsys.MaturityStable) {
-		return nil
-	}
 
-	// Check that old schemas do not contain updates
-	err = thema.IsAppendOnly(oldKind.Lineage(), kind.Lineage())
-	if err != nil {
-		return fmt.Errorf("existing schemas in lineage %s cannot be modified: %w", name, err)
-	}
+		targetPath := filepath.Join(
+			toDir,
+			baseTargetDir,
+			strings.TrimPrefix(path, fromDir),
+		)
 
-	return nil
-}
+		if info.IsDir() {
+			return ensureDirectoryExists(targetPath, info.Mode())
+		}
 
-func isLess(v1 []uint64, v2 []uint64) bool {
-	if len(v1) == 1 || len(v2) == 1 {
-		return v1[0] < v2[0]
-	}
+		if !strings.HasSuffix(path, ".cue") {
+			return nil
+		}
 
-	return v1[0] < v2[0] || (v1[0] == v2[0] && isLess(v1[2:], v2[2:]))
+		return copyFile(path, targetPath, info.Mode())
+	})
 }
 
-func loadCoreKind(name string, kind string) (kindsys.Kind, error) {
-	fs := fstest.MapFS{
-		fmt.Sprintf("%s.cue", name): &fstest.MapFile{
-			Data: []byte(kind),
-		},
-	}
-
-	rt := cuectx.GrafanaThemaRuntime()
-
-	def, err := cuectx.LoadCoreKindDef(fmt.Sprintf("%s.cue", name), rt.Context(), fs)
+func copyFile(from string, to string, mode os.FileMode) error {
+	input, err := os.ReadFile(from)
 	if err != nil {
-		return nil, fmt.Errorf("%s is not a valid kind: %w", name, err)
+		return err
 	}
 
-	return kindsys.BindCore(rt, def)
+	return os.WriteFile(to, input, mode)
 }
 
-func loadComposableKind(name string, kind string) (kindsys.Kind, error) {
-	parts := strings.Split(name, "/")
-	if len(parts) > 1 {
-		name = parts[1]
-	}
-
-	fs := fstest.MapFS{
-		fmt.Sprintf("%s.cue", name): &fstest.MapFile{
-			Data: []byte(kind),
-		},
+func ensureDirectoryExists(directory string, mode os.FileMode) error {
+	_, err := os.Stat(directory)
+	if errors.Is(err, os.ErrNotExist) {
+		if err = os.Mkdir(directory, mode); err != nil {
+			return err
+		}
+	} else if err != nil {
+		return err
 	}
 
-	rt := cuectx.GrafanaThemaRuntime()
+	return os.Chmod(directory, mode)
+}
 
-	def, err := pfs.LoadComposableKindDef(fs, rt, fmt.Sprintf("%s.cue", name))
-	if err != nil {
-		return nil, fmt.Errorf("%s is not a valid kind: %w", name, err)
+func die(errs ...error) {
+	if len(errs) > 0 && errs[0] != nil {
+		for _, err := range errs {
+			fmt.Fprint(os.Stderr, err, "\n")
+		}
+		os.Exit(1)
 	}
-
-	return kindsys.BindComposable(rt, def)
 }
 
-// KindRegistryJenny generates kind files into the "next" folder of the local kind registry.
-func KindRegistryJenny(path string) codegen.OneToOne {
+// CoreKindRegistryJenny generates kind files into the "next" folder of the local kind registry.
+func CoreKindRegistryJenny(path string) codejen.OneToOne[schemas.CoreKind] {
 	return &kindregjenny{
 		path: path,
 	}
@@ -235,35 +132,18 @@ func (j *kindregjenny) JennyName() string {
 	return "KindRegistryJenny"
 }
 
-func (j *kindregjenny) Generate(kind kindsys.Kind) (*codejen.File, error) {
-	name := kind.Props().Common().MachineName
-	core, ok := kind.(kindsys.Core)
-	if !ok {
-		return nil, fmt.Errorf("kind sent to KindRegistryJenny must be a core kind")
-	}
-
-	newKindBytes, err := kindToBytes(core.Def().V)
+func (j *kindregjenny) Generate(kind schemas.CoreKind) (*codejen.File, error) {
+	newKindBytes, err := kindToBytes(kind.CueFile)
 	if err != nil {
 		return nil, err
 	}
 
-	path := filepath.Join(j.path, "next", "core", name, name+".cue")
+	path := filepath.Join(j.path, "next", "core", kind.Name, kind.Name+".cue")
 	return codejen.NewFile(path, newKindBytes, j), nil
 }
 
-// kindToBytes converts a kind cue value to a .cue file content
-func kindToBytes(kind cue.Value) ([]byte, error) {
-	node := kind.Syntax(
-		cue.All(),
-		cue.Schema(),
-		cue.Docs(true),
-	)
-
-	return cueformat.Node(node)
-}
-
 // ComposableKindRegistryJenny generates kind files into the "next" folder of the local kind registry.
-func ComposableKindRegistryJenny(path string) codejen.OneToOne[kindsys.Composable] {
+func ComposableKindRegistryJenny(path string) codejen.OneToOne[schemas.ComposableKind] {
 	return &ckrJenny{
 		path: path,
 	}
@@ -277,149 +157,73 @@ func (j *ckrJenny) JennyName() string {
 	return "ComposableKindRegistryJenny"
 }
 
-func (j *ckrJenny) Generate(k kindsys.Composable) (*codejen.File, error) {
-	si, err := kindsys.FindSchemaInterface(k.Def().Properties.SchemaInterface)
-	if err != nil {
-		panic(err)
-	}
+func (j *ckrJenny) Generate(k schemas.ComposableKind) (*codejen.File, error) {
+	name := strings.ToLower(fmt.Sprintf("%s/%s", k.Name, k.Filename))
 
-	name := strings.ToLower(fmt.Sprintf("%s/%s", strings.TrimSuffix(k.Lineage().Name(), si.Name()), si.Name()))
+	v := fixComposableKindFormat(k)
 
-	newKindBytes, err := kindToBytes(k.Def().V)
+	newKindBytes, err := kindToBytes(v)
 	if err != nil {
 		return nil, err
 	}
 
 	newKindBytes = []byte(fmt.Sprintf("package grafanaplugin\n\n%s", newKindBytes))
 
-	return codejen.NewFile(filepath.Join(j.path, "next", "composable", name+".cue"), newKindBytes, j), nil
-}
-
-type kindRegistry struct {
-	zipDir  string
-	zipFile *zip.ReadCloser
+	return codejen.NewFile(filepath.Join(j.path, "next", "composable", name), newKindBytes, j), nil
 }
 
-// NewKindRegistry downloads the archive of the kind-registry GH repository and open it
-func NewKindRegistry() (*kindRegistry, error) {
-	ctx := context.Background()
-	tc := oauth2.NewClient(ctx, nil)
-	client := github.NewClient(tc)
-
-	// Create a temporary file to store the downloaded archive
-	file, err := os.CreateTemp("", "*.zip")
-	if err != nil {
-		return nil, fmt.Errorf("failed to create temporary file: %w", err)
-	}
-	defer file.Close()
-
-	// Get the repository archive URL
-	archiveURL, _, err := client.Repositories.GetArchiveLink(ctx, GITHUB_OWNER, GITHUB_REPO, github.Zipball, &github.RepositoryContentGetOptions{})
-	if err != nil {
-		return nil, fmt.Errorf("failed to get archive URL: %w", err)
-	}
-
-	// Download the archive file
-	httpClient := http.DefaultClient
-	resp, err := httpClient.Get(archiveURL.String())
-	if err != nil {
-		return nil, fmt.Errorf("failed to download archive: %w", err)
-	}
-	defer resp.Body.Close()
-
-	// Save the downloaded archive to the temporary file
-	_, err = io.Copy(file, resp.Body)
-	if err != nil {
-		return nil, fmt.Errorf("failed to save archive: %w", err)
-	}
-
-	// Open the zip file for reading
-	zipDir := file.Name()
-	zipFile, err := zip.OpenReader(zipDir)
-	if err != nil {
-		return nil, fmt.Errorf("failed to open zip file %s: %w", zipDir, err)
-	}
+// kindToBytes converts a kind cue value to a .cue file content
+func kindToBytes(kind cue.Value) ([]byte, error) {
+	node := kind.Syntax(
+		cue.All(),
+		cue.Schema(),
+		cue.Docs(true),
+	)
 
-	return &kindRegistry{
-		zipDir:  zipDir,
-		zipFile: zipFile,
-	}, nil
+	return cueformat.Node(node)
 }
 
-// cleanUp removes the archive from the temporary files and closes the zip reader
-func (registry *kindRegistry) cleanUp() {
-	if registry.zipDir != "" {
-		err := os.Remove(registry.zipDir)
-		if err != nil {
-			fmt.Fprint(os.Stderr, fmt.Errorf("failed to remove zip archive: %w", err))
-		}
+func fixComposableKindFormat(schema schemas.ComposableKind) cue.Value {
+	variant := "PanelCfg"
+	if schema.CueFile.LookupPath(cue.ParsePath("composableKinds.DataQuery")).Exists() {
+		variant = "DataQuery"
 	}
 
-	if registry.zipFile != nil {
-		err := registry.zipFile.Close()
-		if err != nil {
-			fmt.Fprint(os.Stderr, fmt.Errorf("failed to close zip file reader: %w", err))
-		}
-	}
-}
-
-// findLatestDir get the latest version directory published in the kind registry
-func (registry *kindRegistry) findLatestDir() (string, error) {
-	re := regexp.MustCompile(`([0-9]+)\.([0-9]+)\.([0-9]+)`)
-	latestVersion := []uint64{0, 0, 0}
-	latestDir := ""
+	newCue := schema.CueFile.Context().CompileString(
+		fmt.Sprintf("schemaInterface: %q\n", variant) +
+			fmt.Sprintf("name: %q + %q\n\n", UpperCamelCase(schema.Name), variant) +
+			"lineage: _",
+	)
 
-	for _, file := range registry.zipFile.File {
-		if !file.FileInfo().IsDir() {
-			continue
-		}
+	lineagePath := cue.MakePath(cue.Str("composableKinds"), cue.Str(variant), cue.Str("lineage"))
+	return newCue.FillPath(cue.MakePath(cue.Str("lineage")), schema.CueFile.LookupPath(lineagePath))
+}
 
-		parts := re.FindStringSubmatch(file.Name)
-		if parts == nil || len(parts) < 4 {
-			continue
-		}
+func UpperCamelCase(s string) string {
+	s = LowerCamelCase(s)
 
-		version := make([]uint64, len(parts)-1)
-		for i := 1; i < len(parts); i++ {
-			version[i-1], _ = strconv.ParseUint(parts[i], 10, 32)
-		}
-
-		if isLess(latestVersion, version) {
-			latestVersion = version
-			latestDir = file.Name
-		}
+	// Uppercase the first letter
+	if len(s) > 0 {
+		s = strings.ToUpper(s[:1]) + s[1:]
 	}
 
-	return latestDir, nil
+	return s
 }
 
-// getPublishedKind retrieves the latest published kind from the kind registry
-func (registry *kindRegistry) getPublishedKind(name string, category string, latestRegistryDir string) (string, error) {
-	if latestRegistryDir == "" {
-		return "", nil
-	}
+func LowerCamelCase(s string) string {
+	// Replace all non-alphanumeric characters by spaces
+	s = nonAlphaNumRegex.ReplaceAllString(s, " ")
 
-	var cueFilePath string
-	switch category {
-		case "core":
-			cueFilePath = fmt.Sprintf("%s/%s.cue", name, name)
-		case "composable":
-			cueFilePath = fmt.Sprintf("%s.cue", name)
-		default:
-		return "", fmt.Errorf("kind can only be core or composable")
-	}
+	// Title case s
+	s = cases.Title(language.AmericanEnglish, cases.NoLower).String(s)
 
-	kindPath := filepath.Join(latestRegistryDir, category, cueFilePath)
-	file, err := registry.zipFile.Open(kindPath)
-	if err != nil {
-		return "", fmt.Errorf("failed to open file: %w", err)
-	}
-	defer file.Close()
+	// Remove all spaces
+	s = strings.ReplaceAll(s, " ", "")
 
-	data, err := io.ReadAll(file)
-	if err != nil {
-		return "", fmt.Errorf("failed to read file: %w", err)
+	// Lowercase the first letter
+	if len(s) > 0 {
+		s = strings.ToLower(s[:1]) + s[1:]
 	}
 
-	return string(data), nil
+	return s
 }
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index de50fe2f26bf2..778a49b16d00f 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -4,33 +4,39 @@ on:
     - cron: '30 1 * * *'
 
 permissions:
+  issues: write
   pull-requests: write
 
 jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          # Number of days of inactivity before a stale Issue or Pull Request is closed.
-          # Set to -1 to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
-          days-before-close: 14
-          # Number of days of inactivity before an Issue or Pull Request becomes stale
-          days-before-stale: 30
-          # We don't want any Issues to be marked as stale for now.
-          days-before-issue-stale: -1
-          exempt-issue-labels: no stalebot
-          exempt-pr-labels: no stalebot
-          operations-per-run: 500
+          operations-per-run: 750
+          # start from the oldest issues/PRs when performing stale operations
+          ascending: true
+          days-before-issue-stale: 365
+          days-before-issue-close: 30
           stale-issue-label: stale
+          exempt-issue-labels: no stalebot,type/epic
+          stale-issue-message: >
+            This issue has been automatically marked as stale because it has not had
+            activity in the last year. It will be closed in 30 days if no further activity occurs. Please
+            feel free to leave a comment if you believe the issue is still relevant.
+            Thank you for your contributions!
+          close-issue-message: >
+            This issue has been automatically closed because it has not had any further
+            activity in the last 30 days. Thank you for your contributions!
+          days-before-pr-stale: 30
+          days-before-pr-close: 14
           stale-pr-label: stale
+          exempt-pr-labels: no stalebot
           stale-pr-message: >
             This pull request has been automatically marked as stale because it has not had
             activity in the last 30 days. It will be closed in 2 weeks if no further activity occurs. Please
-            feel free to give a status update now, ping for review, or re-open when it's ready.
-            Thank you for your contributions!
+            feel free to give a status update or ping for review. Thank you for your contributions!
           close-pr-message: >
-            This pull request has been automatically closed because it has not had
-            activity in the last 2 weeks. Please feel free to give a status update now, ping for review, or re-open when it's ready.
-            Thank you for your contributions!
+            This pull request has been automatically closed because it has not had any further
+            activity in the last 2 weeks. Thank you for your contributions!
diff --git a/.github/workflows/sync-mirror.yml b/.github/workflows/sync-mirror.yml
index fd8d93d62260c..09c8f87d50902 100644
--- a/.github/workflows/sync-mirror.yml
+++ b/.github/workflows/sync-mirror.yml
@@ -1,4 +1,4 @@
-# Owned by grafana-delivery-squad
+# Owned by grafana-release-guild
 # Intended to be dropped into the base repo, Ex: grafana/grafana
 name: Sync to mirror
 run-name: sync-to-mirror-${{ github.ref_name }}
diff --git a/.github/workflows/update-make-docs.yml b/.github/workflows/update-make-docs.yml
index 1bd0f70cb7131..49b64504bd0db 100644
--- a/.github/workflows/update-make-docs.yml
+++ b/.github/workflows/update-make-docs.yml
@@ -2,26 +2,18 @@ name: Update `make docs` procedure
 on:
   schedule:
     - cron: '0 7 * * 1-5'
+  workflow_dispatch:
 jobs:
   main:
     if: github.repository == 'grafana/grafana'
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Update procedure
-        run: |
-          curl -s -Lo docs/docs.mk https://raw.githubusercontent.com/grafana/writers-toolkit/main/docs/docs.mk
-          curl -s -Lo docs/make-docs https://raw.githubusercontent.com/grafana/writers-toolkit/main/docs/make-docs
-          if git diff --exit-code; then exit 0; fi
-          BRANCH="$(date +%Y-%m-%d)/update-make-docs"
-          git checkout -b "${BRANCH}"
-          git add .
-          git config --local user.email "bot@grafana.com"
-          git config --local user.name "grafanabot"
-          git commit -m "Update \`make docs\` procedure"
-          git push -v origin "refs/heads/${BRANCH}"
-          gh pr create --fill --label no-changelog --label --no-backport --label type/docs
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/checkout@v4
+      - uses: grafana/writers-toolkit/update-make-docs@update-make-docs/v1
+        with:
+          pr_options: >
+            --label 'backport v10.1.x'
+            --label 'backport v10.2.x'
+            --label 'backport v10.3.x'
+            --label no-changelog
+            --label type/docs
diff --git a/.github/workflows/verify-kinds.yml b/.github/workflows/verify-kinds.yml
index 7ea1bb46a1c38..169dc8663569d 100644
--- a/.github/workflows/verify-kinds.yml
+++ b/.github/workflows/verify-kinds.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
     branches: [ main ]
     paths:
-    - '**/*.cue'
+      - '**/*.cue'
 
 jobs:
   main:
@@ -18,10 +18,9 @@ jobs:
       - name: "Setup Go"
         uses: "actions/setup-go@v4"
         with:
-          go-version: '1.20.10'
+          go-version: '1.21.10'
 
       - name: "Verify kinds"
         run: go run .github/workflows/scripts/kinds/verify-kinds.go
         env:
-          CODEGEN_VERIFY: 1
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.gitignore b/.gitignore
index 431a6300f7619..c85e9ef4fbf79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,8 +7,6 @@ awsconfig
 /.awcache
 /dist
 /public/build
-/public/views/index.html
-/public/views/error.html
 /emails/dist
 /reports
 /e2e/tmp
@@ -26,9 +24,6 @@ __debug_bin*
 !.yarn/plugins
 !.yarn/sdks
 !.yarn/versions
-# we temporarily commit this file because yarn downloading it
-# somehow produces different checksum values
-!.yarn/cache/pa11y-ci-https-1e9675e9e1-668c9119bd.zip
 .pnp.*
 
 # Enterprise emails
@@ -78,6 +73,13 @@ public/css/*.min.css
 /data/*
 /bin/*
 
+# any certificates generated by grafana apiserver
+apiserver.local.config/
+default.etcd/
+
+# kubeconfig path used by example apiserver
+example-apiserver/
+
 # devenv
 /devenv/docker-compose.yaml
 /devenv/docker-compose.override.yaml
@@ -86,7 +88,7 @@ public/css/*.min.css
 /devenv/docker/ha-test-unified-alerting/logs/webhook/dumps/
 /devenv/docker/ha-test-unified-alerting/logs/webhook/webhook-listener.log
 
-conf/custom.ini
+# Psiphon change - remove conf/custom.ini from gitignore so custom config can be used
 
 /conf/provisioning/**/*.yaml
 !/conf/provisioning/**/sample.yaml
@@ -129,9 +131,7 @@ pkg/services/quota/quotaimpl/storage/storage.json
 
 /devenv/bulk-dashboards/*.json
 /devenv/bulk-folders/*/*.json
-/devenv/bulk_alerting_dashboards/*.json
 /devenv/datasources_bulk.yaml
-/devenv/bulk_alerting_dashboards/bulk_alerting_datasources.yaml
 
 /scripts/build/release_publisher/release_publisher
 *.patch
@@ -169,6 +169,11 @@ compilation-stats.json
 /e2e/build_results.zip
 /e2e/extensions
 /e2e/extensions-suite
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/
+/playwright/.auth/
 
 # grafana server
 /scripts/grafana-server/server.log
@@ -197,6 +202,7 @@ public/api-spec.json
 deployment_tools_config.json
 
 .betterer.cache
+.nx
 
 # Temporary file for backporting PRs
 .pr-body.txt
@@ -207,3 +213,6 @@ public/app/plugins/**/dist/
 # Ignore transpiled JavaScript resulting from the generate-transformations.ts script.
 /public/app/features/transformers/docs/*.js
 /scripts/docs/generate-transformations.js
+
+# Go coverage files created with go test -cover -coverprogile=something.out ...
+*.out
diff --git a/.golangci.toml b/.golangci.toml
index 1d894ab85cd9f..c3be795e99dca 100644
--- a/.golangci.toml
+++ b/.golangci.toml
@@ -1,10 +1,6 @@
 [run]
 timeout = "10m"
 
-[linters-settings.goconst]
-min-len = 5
-min-occurrences = 5
-
 [linters-settings.exhaustive]
 default-signifies-exhaustive = true
 
@@ -52,10 +48,63 @@ deny = [
   { pkg = "github.com/grafana/grafana/pkg/server", desc = "Core plugins are not allowed to depend on Grafana core packages" },
   { pkg = "github.com/grafana/grafana/pkg/tests", desc = "Core plugins are not allowed to depend on Grafana core packages" },
   { pkg = "github.com/grafana/grafana/pkg/web", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/tsdb/intervalv2", desc = "Core plugins are not allowed to depend on Grafana core packages" },
 ]
 files = [
+  "**/pkg/tsdb/grafana-pyroscope-datasource/*",
+  "**/pkg/tsdb/grafana-pyroscope-datasource/**/*",
   "**/pkg/tsdb/grafana-testdata-datasource/*",
   "**/pkg/tsdb/grafana-testdata-datasource/**/*",
+  "**/pkg/tsdb/azuremonitor/*",
+  "**/pkg/tsdb/azuremonitor/**/*",
+  "**/pkg/tsdb/cloud-monitoring/*",
+  "**/pkg/tsdb/cloud-monitoring/**/*",
+  "**/pkg/tsdb/parca/*",
+  "**/pkg/tsdb/parca/**/*",
+  "**/pkg/tsdb/tempo/*",
+  "**/pkg/tsdb/tempo/**/*",
+  "**/pkg/tsdb/cloudwatch/*",
+  "**/pkg/tsdb/cloudwatch/**/*",
+]
+
+[linters-settings.depguard.rules.apiserver]
+list-mode = "lax"
+allow = [
+  "github.com/grafana/grafana/pkg/apimachinery",
+  "github.com/grafana/grafana/pkg/apiserver",
+]
+deny = [
+  { pkg = "github.com/grafana/grafana/pkg", desc = "apiserver is not allowed to import grafana core" }
+]
+files = [
+  "**/pkg/apiserver/*",
+  "**/pkg/apiserver/**/*"
+]
+
+[linters-settings.depguard.rules.apimachinery]
+list-mode = "lax"
+allow = [
+  "github.com/grafana/grafana/pkg/apimachinery",
+]
+deny = [
+  { pkg = "github.com/grafana/grafana/pkg", desc = "apimachinery is not allowed to import grafana core" }
+]
+files = [
+  "**/pkg/apimachinery/*",
+  "**/pkg/apimachinery/**/*"
+]
+
+[linters-settings.depguard.rules.promlib]
+list-mode = "lax" # allow unless explicitely denied
+deny = [
+  { pkg = "github.com/grafana/grafana/pkg", desc = "promlib is not allowed to import grafana core" }
+]
+allow = [
+  "github.com/grafana/grafana/pkg/promlib"
+]
+files = [
+  "**/pkg/promlib/*",
+  "**/pkg/promlib/**/*"
 ]
 
 [linters-settings.gocritic]
@@ -74,7 +123,7 @@ enable = [
   "dogsled",
   "errcheck",
   # "gochecknoinits",
-  "goconst",
+  # "goconst",
   # "gocritic", # Temporarily disabled on 2022-09-09, running into weird bug "ruleguard: execution error: used Run() with an empty rule set; forgot to call Load() first?"
   "goimports",
   "goprintffuncname",
@@ -192,3 +241,10 @@ text = "ST1020"
 [[issues.exclude-rules]]
 linters = ["stylecheck"]
 text = "ST1021"
+
+# Remove this when we have go v1.22 in place
+# https://stackoverflow.com/a/68247837/767660
+[[issues.exclude-rules]]
+linters = ["gosec"]
+path = '(.+)_test\.go'
+text = "G601"
diff --git a/.pa11yci-pr.conf.js b/.pa11yci-pr.conf.js
index 71990e6a11524..acbfdd782ab2a 100644
--- a/.pa11yci-pr.conf.js
+++ b/.pa11yci-pr.conf.js
@@ -34,7 +34,7 @@ var dashboardSettings = [
     wait: 500,
     rootElement: '.main-view',
     // TODO: improve the accessibility of the permission tab https://github.com/grafana/grafana/issues/77203
-    threshold: 11,
+    threshold: 5,
   },
   {
     url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge?orgId=1&editview=dashboard_json',
@@ -51,6 +51,7 @@ var config = {
     useIncognitoBrowserContext: false,
     standard: 'WCAG2AA',
     chromeLaunchConfig: {
+      executablePath: '/usr/bin/google-chrome',
       args: ['--no-sandbox'],
     },
     // see https://github.com/grafana/grafana/pull/41693#issuecomment-979921463 for context
@@ -63,7 +64,7 @@ var config = {
       url: '${HOST}/login',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 13,
+      threshold: 0,
     },
     {
       url: '${HOST}/login',
@@ -72,16 +73,16 @@ var config = {
         "wait for element input[name='user'] to be added",
         "set field input[name='user'] to admin",
         "set field input[name='password'] to admin",
-        "click element button[aria-label='Login button']",
-        "wait for element [aria-label='Skip change password button'] to be visible",
+        "click element button[data-testid='data-testid Login button']",
+        "wait for element button[data-testid='data-testid Skip change password button'] to be visible",
       ],
-      threshold: 15,
+      threshold: 2,
       rootElement: '.main-view',
     },
     {
       url: '${HOST}/?orgId=1',
       wait: 500,
-      threshold: 3,
+      threshold: 0,
     },
     {
       url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge',
@@ -94,7 +95,7 @@ var config = {
       url: '${HOST}/?orgId=1&search=open',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 3,
+      threshold: 0,
     },
     {
       url: '${HOST}/alerting/list',
@@ -102,49 +103,49 @@ var config = {
       rootElement: '.main-view',
       // the unified alerting promotion alert's content contrast is too low
       // see https://github.com/grafana/grafana/pull/41829
-      threshold: 6,
+      threshold: 7,
     },
     {
       url: '${HOST}/datasources',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 3,
+      threshold: 0,
     },
     {
       url: '${HOST}/org/users',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 1,
+      threshold: 0,
     },
     {
       url: '${HOST}/org/teams',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 1,
+      threshold: 0,
     },
     {
       url: '${HOST}/plugins',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 3,
+      threshold: 0,
     },
     {
       url: '${HOST}/org',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 1,
+      threshold: 0,
     },
     {
       url: '${HOST}/org/apikeys',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 4,
+      threshold: 2,
     },
     {
       url: '${HOST}/dashboards',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 1,
+      threshold: 0,
     },
   ],
 };
diff --git a/.pa11yci.conf.js b/.pa11yci.conf.js
index b15b7c7d80a95..5c8256c3f3ed7 100644
--- a/.pa11yci.conf.js
+++ b/.pa11yci.conf.js
@@ -61,8 +61,8 @@ var config = {
         "wait for element input[name='user'] to be added",
         "set field input[name='user'] to admin",
         "set field input[name='password'] to admin",
-        "click element button[aria-label='Login button']",
-        "wait for element [aria-label='Skip change password button'] to be visible",
+        "click element button[data-testid='data-testid Login button']",
+        "wait for element button[data-testid='data-testid Skip change password button'] to be visible",
       ],
       wait: 500,
       rootElement: '.main-view',
diff --git a/.prettierignore b/.prettierignore
index 9f95507f7b307..160926fd718cc 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -12,6 +12,7 @@ node_modules
 pkg
 public/lib/monaco
 public/sass/*.generated.scss
+scripts/cli/bettererIssueTemplate.md
 scripts/grafana-server/tmp
 vendor
 
@@ -31,10 +32,5 @@ public/api-merged.json
 public/api-enterprise-spec.json
 public/openapi3.json
 
-# Generated Kinds report
-kinds/report.json
-
-# Generated schema docs
-docs/sources/developers/kinds/
-
-scripts/cli/bettererIssueTemplate.md
+# Crowdin files
+public/locales/**/*.json
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 792addee9505c..99a3f849ca932 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -11,6 +11,33 @@
       "cwd": "${workspaceFolder}",
       "args": ["server", "--homepath", "${workspaceFolder}", "--packaging", "dev"]
     },
+    {
+      "name": "Run API Server (testdata)",
+      "type": "go",
+      "request": "launch",
+      "mode": "auto",
+      "program": "${workspaceFolder}/pkg/cmd/grafana/",
+      "env": {},
+      "cwd": "${workspaceFolder}",
+      "args": ["apiserver", 
+          "--secure-port=8443", 
+          "--runtime-config=testdata.datasource.grafana.app/v0alpha1=true"]
+    },
+    {
+      "name": "Run API Server (query-localhost)",
+      "type": "go",
+      "request": "launch",
+      "mode": "auto",
+      "program": "${workspaceFolder}/pkg/cmd/grafana/",
+      "env": {},
+      "cwd": "${workspaceFolder}",
+      "args": ["apiserver", 
+          "--secure-port=8443", 
+          "--runtime-config=query.grafana.app/v0alpha1=true",
+          "--grafana.authn.signing-keys-url=http://localhost:3000/api/signing-keys/keys",
+          "--hg-url=http://localhost:3000",
+          "--hg-key=$HGAPIKEY"]
+    },
     {
       "name": "Attach to Chrome",
       "port": 9222,
diff --git a/.yarn/cache/tether-drop-https-3382d2649f-a10a7337d5.zip b/.yarn/cache/tether-drop-https-3382d2649f-a10a7337d5.zip
deleted file mode 100644
index 1602b2e6742fa..0000000000000
Binary files a/.yarn/cache/tether-drop-https-3382d2649f-a10a7337d5.zip and /dev/null differ
diff --git a/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs b/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
deleted file mode 100644
index f55248f90a0e3..0000000000000
--- a/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+++ /dev/null
@@ -1,546 +0,0 @@
-/* eslint-disable */
-//prettier-ignore
-module.exports = {
-name: "@yarnpkg/plugin-interactive-tools",
-factory: function (require) {
-var plugin=(()=>{var ZP=Object.create,Pg=Object.defineProperty,$P=Object.defineProperties,eI=Object.getOwnPropertyDescriptor,tI=Object.getOwnPropertyDescriptors,nI=Object.getOwnPropertyNames,L_=Object.getOwnPropertySymbols,rI=Object.getPrototypeOf,nD=Object.prototype.hasOwnProperty,lS=Object.prototype.propertyIsEnumerable;var sS=(i,o,a)=>o in i?Pg(i,o,{enumerable:!0,configurable:!0,writable:!0,value:a}):i[o]=a,Ht=(i,o)=>{for(var a in o||(o={}))nD.call(o,a)&&sS(i,a,o[a]);if(L_)for(var a of L_(o))lS.call(o,a)&&sS(i,a,o[a]);return i},Zr=(i,o)=>$P(i,tI(o)),iI=i=>Pg(i,"__esModule",{value:!0});var wl=(i,o)=>{var a={};for(var c in i)nD.call(i,c)&&o.indexOf(c)<0&&(a[c]=i[c]);if(i!=null&&L_)for(var c of L_(i))o.indexOf(c)<0&&lS.call(i,c)&&(a[c]=i[c]);return a};var Ke=(i,o)=>()=>(o||i((o={exports:{}}).exports,o),o.exports),uI=(i,o)=>{for(var a in o)Pg(i,a,{get:o[a],enumerable:!0})},oI=(i,o,a)=>{if(o&&typeof o=="object"||typeof o=="function")for(let c of nI(o))!nD.call(i,c)&&c!=="default"&&Pg(i,c,{get:()=>o[c],enumerable:!(a=eI(o,c))||a.enumerable});return i},ou=i=>oI(iI(Pg(i!=null?ZP(rI(i)):{},"default",i&&i.__esModule&&"default"in i?{get:()=>i.default,enumerable:!0}:{value:i,enumerable:!0})),i);var Ig=Ke((mW,aS)=>{"use strict";var fS=Object.getOwnPropertySymbols,lI=Object.prototype.hasOwnProperty,sI=Object.prototype.propertyIsEnumerable;function aI(i){if(i==null)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(i)}function fI(){try{if(!Object.assign)return!1;var i=new String("abc");if(i[5]="de",Object.getOwnPropertyNames(i)[0]==="5")return!1;for(var o={},a=0;a<10;a++)o["_"+String.fromCharCode(a)]=a;var c=Object.getOwnPropertyNames(o).map(function(t){return o[t]});if(c.join("")!=="0123456789")return!1;var _={};return"abcdefghijklmnopqrst".split("").forEach(function(t){_[t]=t}),Object.keys(Object.assign({},_)).join("")==="abcdefghijklmnopqrst"}catch(t){return!1}}aS.exports=fI()?Object.assign:function(i,o){for(var a,c=aI(i),_,t=1;t<arguments.length;t++){a=Object(arguments[t]);for(var O in a)lI.call(a,O)&&(c[O]=a[O]);if(fS){_=fS(a);for(var N=0;N<_.length;N++)sI.call(a,_[N])&&(c[_[N]]=a[_[N]])}}return c}});var wS=Ke(_u=>{"use strict";var rD=Ig(),$f=typeof Symbol=="function"&&Symbol.for,bg=$f?Symbol.for("react.element"):60103,cI=$f?Symbol.for("react.portal"):60106,dI=$f?Symbol.for("react.fragment"):60107,pI=$f?Symbol.for("react.strict_mode"):60108,hI=$f?Symbol.for("react.profiler"):60114,vI=$f?Symbol.for("react.provider"):60109,mI=$f?Symbol.for("react.context"):60110,gI=$f?Symbol.for("react.forward_ref"):60112,yI=$f?Symbol.for("react.suspense"):60113,_I=$f?Symbol.for("react.memo"):60115,EI=$f?Symbol.for("react.lazy"):60116,cS=typeof Symbol=="function"&&Symbol.iterator;function Bg(i){for(var o="https://reactjs.org/docs/error-decoder.html?invariant="+i,a=1;a<arguments.length;a++)o+="&args[]="+encodeURIComponent(arguments[a]);return"Minified React error #"+i+"; visit "+o+" for the full message or use the non-minified dev environment for full errors and additional helpful warnings."}var dS={isMounted:function(){return!1},enqueueForceUpdate:function(){},enqueueReplaceState:function(){},enqueueSetState:function(){}},pS={};function qv(i,o,a){this.props=i,this.context=o,this.refs=pS,this.updater=a||dS}qv.prototype.isReactComponent={};qv.prototype.setState=function(i,o){if(typeof i!="object"&&typeof i!="function"&&i!=null)throw Error(Bg(85));this.updater.enqueueSetState(this,i,o,"setState")};qv.prototype.forceUpdate=function(i){this.updater.enqueueForceUpdate(this,i,"forceUpdate")};function hS(){}hS.prototype=qv.prototype;function iD(i,o,a){this.props=i,this.context=o,this.refs=pS,this.updater=a||dS}var uD=iD.prototype=new hS;uD.constructor=iD;rD(uD,qv.prototype);uD.isPureReactComponent=!0;var oD={current:null},vS=Object.prototype.hasOwnProperty,mS={key:!0,ref:!0,__self:!0,__source:!0};function gS(i,o,a){var c,_={},t=null,O=null;if(o!=null)for(c in o.ref!==void 0&&(O=o.ref),o.key!==void 0&&(t=""+o.key),o)vS.call(o,c)&&!mS.hasOwnProperty(c)&&(_[c]=o[c]);var N=arguments.length-2;if(N===1)_.children=a;else if(1<N){for(var M=Array(N),T=0;T<N;T++)M[T]=arguments[T+2];_.children=M}if(i&&i.defaultProps)for(c in N=i.defaultProps,N)_[c]===void 0&&(_[c]=N[c]);return{$$typeof:bg,type:i,key:t,ref:O,props:_,_owner:oD.current}}function DI(i,o){return{$$typeof:bg,type:i.type,key:o,ref:i.ref,props:i.props,_owner:i._owner}}function lD(i){return typeof i=="object"&&i!==null&&i.$$typeof===bg}function wI(i){var o={"=":"=0",":":"=2"};return"$"+(""+i).replace(/[=:]/g,function(a){return o[a]})}var yS=/\/+/g,N_=[];function _S(i,o,a,c){if(N_.length){var _=N_.pop();return _.result=i,_.keyPrefix=o,_.func=a,_.context=c,_.count=0,_}return{result:i,keyPrefix:o,func:a,context:c,count:0}}function ES(i){i.result=null,i.keyPrefix=null,i.func=null,i.context=null,i.count=0,10>N_.length&&N_.push(i)}function sD(i,o,a,c){var _=typeof i;(_==="undefined"||_==="boolean")&&(i=null);var t=!1;if(i===null)t=!0;else switch(_){case"string":case"number":t=!0;break;case"object":switch(i.$$typeof){case bg:case cI:t=!0}}if(t)return a(c,i,o===""?"."+aD(i,0):o),1;if(t=0,o=o===""?".":o+":",Array.isArray(i))for(var O=0;O<i.length;O++){_=i[O];var N=o+aD(_,O);t+=sD(_,N,a,c)}else if(i===null||typeof i!="object"?N=null:(N=cS&&i[cS]||i["@@iterator"],N=typeof N=="function"?N:null),typeof N=="function")for(i=N.call(i),O=0;!(_=i.next()).done;)_=_.value,N=o+aD(_,O++),t+=sD(_,N,a,c);else if(_==="object")throw a=""+i,Error(Bg(31,a==="[object Object]"?"object with keys {"+Object.keys(i).join(", ")+"}":a,""));return t}function fD(i,o,a){return i==null?0:sD(i,"",o,a)}function aD(i,o){return typeof i=="object"&&i!==null&&i.key!=null?wI(i.key):o.toString(36)}function SI(i,o){i.func.call(i.context,o,i.count++)}function TI(i,o,a){var c=i.result,_=i.keyPrefix;i=i.func.call(i.context,o,i.count++),Array.isArray(i)?cD(i,c,a,function(t){return t}):i!=null&&(lD(i)&&(i=DI(i,_+(!i.key||o&&o.key===i.key?"":(""+i.key).replace(yS,"$&/")+"/")+a)),c.push(i))}function cD(i,o,a,c,_){var t="";a!=null&&(t=(""+a).replace(yS,"$&/")+"/"),o=_S(o,t,c,_),fD(i,TI,o),ES(o)}var DS={current:null};function K1(){var i=DS.current;if(i===null)throw Error(Bg(321));return i}var CI={ReactCurrentDispatcher:DS,ReactCurrentBatchConfig:{suspense:null},ReactCurrentOwner:oD,IsSomeRendererActing:{current:!1},assign:rD};_u.Children={map:function(i,o,a){if(i==null)return i;var c=[];return cD(i,c,null,o,a),c},forEach:function(i,o,a){if(i==null)return i;o=_S(null,null,o,a),fD(i,SI,o),ES(o)},count:function(i){return fD(i,function(){return null},null)},toArray:function(i){var o=[];return cD(i,o,null,function(a){return a}),o},only:function(i){if(!lD(i))throw Error(Bg(143));return i}};_u.Component=qv;_u.Fragment=dI;_u.Profiler=hI;_u.PureComponent=iD;_u.StrictMode=pI;_u.Suspense=yI;_u.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED=CI;_u.cloneElement=function(i,o,a){if(i==null)throw Error(Bg(267,i));var c=rD({},i.props),_=i.key,t=i.ref,O=i._owner;if(o!=null){if(o.ref!==void 0&&(t=o.ref,O=oD.current),o.key!==void 0&&(_=""+o.key),i.type&&i.type.defaultProps)var N=i.type.defaultProps;for(M in o)vS.call(o,M)&&!mS.hasOwnProperty(M)&&(c[M]=o[M]===void 0&&N!==void 0?N[M]:o[M])}var M=arguments.length-2;if(M===1)c.children=a;else if(1<M){N=Array(M);for(var T=0;T<M;T++)N[T]=arguments[T+2];c.children=N}return{$$typeof:bg,type:i.type,key:_,ref:t,props:c,_owner:O}};_u.createContext=function(i,o){return o===void 0&&(o=null),i={$$typeof:mI,_calculateChangedBits:o,_currentValue:i,_currentValue2:i,_threadCount:0,Provider:null,Consumer:null},i.Provider={$$typeof:vI,_context:i},i.Consumer=i};_u.createElement=gS;_u.createFactory=function(i){var o=gS.bind(null,i);return o.type=i,o};_u.createRef=function(){return{current:null}};_u.forwardRef=function(i){return{$$typeof:gI,render:i}};_u.isValidElement=lD;_u.lazy=function(i){return{$$typeof:EI,_ctor:i,_status:-1,_result:null}};_u.memo=function(i,o){return{$$typeof:_I,type:i,compare:o===void 0?null:o}};_u.useCallback=function(i,o){return K1().useCallback(i,o)};_u.useContext=function(i,o){return K1().useContext(i,o)};_u.useDebugValue=function(){};_u.useEffect=function(i,o){return K1().useEffect(i,o)};_u.useImperativeHandle=function(i,o,a){return K1().useImperativeHandle(i,o,a)};_u.useLayoutEffect=function(i,o){return K1().useLayoutEffect(i,o)};_u.useMemo=function(i,o){return K1().useMemo(i,o)};_u.useReducer=function(i,o,a){return K1().useReducer(i,o,a)};_u.useRef=function(i){return K1().useRef(i)};_u.useState=function(i){return K1().useState(i)};_u.version="16.13.1"});var TS=Ke((yW,SS)=>{"use strict";var xI="SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED";SS.exports=xI});var pD=Ke((_W,CS)=>{"use strict";var dD=function(){};process.env.NODE_ENV!=="production"&&(xS=TS(),F_={},AS=Function.call.bind(Object.prototype.hasOwnProperty),dD=function(i){var o="Warning: "+i;typeof console!="undefined"&&console.error(o);try{throw new Error(o)}catch(a){}});var xS,F_,AS;function RS(i,o,a,c,_){if(process.env.NODE_ENV!=="production"){for(var t in i)if(AS(i,t)){var O;try{if(typeof i[t]!="function"){var N=Error((c||"React class")+": "+a+" type `"+t+"` is invalid; it must be a function, usually from the `prop-types` package, but received `"+typeof i[t]+"`.");throw N.name="Invariant Violation",N}O=i[t](o,t,c,a,null,xS)}catch(T){O=T}if(O&&!(O instanceof Error)&&dD((c||"React class")+": type specification of "+a+" `"+t+"` is invalid; the type checker function must return `null` or an `Error` but returned a "+typeof O+". You may have forgotten to pass an argument to the type checker creator (arrayOf, instanceOf, objectOf, oneOf, oneOfType, and shape all require an argument)."),O instanceof Error&&!(O.message in F_)){F_[O.message]=!0;var M=_?_():"";dD("Failed "+a+" type: "+O.message+(M!=null?M:""))}}}}RS.resetWarningCache=function(){process.env.NODE_ENV!=="production"&&(F_={})};CS.exports=RS});var OS=Ke(Eu=>{"use strict";process.env.NODE_ENV!=="production"&&function(){"use strict";var i=Ig(),o=pD(),a="16.13.1",c=typeof Symbol=="function"&&Symbol.for,_=c?Symbol.for("react.element"):60103,t=c?Symbol.for("react.portal"):60106,O=c?Symbol.for("react.fragment"):60107,N=c?Symbol.for("react.strict_mode"):60108,M=c?Symbol.for("react.profiler"):60114,T=c?Symbol.for("react.provider"):60109,B=c?Symbol.for("react.context"):60110,H=c?Symbol.for("react.concurrent_mode"):60111,q=c?Symbol.for("react.forward_ref"):60112,ne=c?Symbol.for("react.suspense"):60113,m=c?Symbol.for("react.suspense_list"):60120,he=c?Symbol.for("react.memo"):60115,De=c?Symbol.for("react.lazy"):60116,se=c?Symbol.for("react.block"):60121,fe=c?Symbol.for("react.fundamental"):60117,_e=c?Symbol.for("react.responder"):60118,ce=c?Symbol.for("react.scope"):60119,me=typeof Symbol=="function"&&Symbol.iterator,ie="@@iterator";function Oe(Q){if(Q===null||typeof Q!="object")return null;var we=me&&Q[me]||Q[ie];return typeof we=="function"?we:null}var Ue={current:null},je={suspense:null},at={current:null},Dt=/^(.*)[\\\/]/;function Qe(Q,we,Ne){var Le="";if(we){var pt=we.fileName,Yn=pt.replace(Dt,"");if(/^index\./.test(Yn)){var Cn=pt.match(Dt);if(Cn){var cr=Cn[1];if(cr){var Si=cr.replace(Dt,"");Yn=Si+"/"+Yn}}}Le=" (at "+Yn+":"+we.lineNumber+")"}else Ne&&(Le=" (created by "+Ne+")");return`
-    in `+(Q||"Unknown")+Le}var ut=1;function Ve(Q){return Q._status===ut?Q._result:null}function It(Q,we,Ne){var Le=we.displayName||we.name||"";return Q.displayName||(Le!==""?Ne+"("+Le+")":Ne)}function Xt(Q){if(Q==null)return null;if(typeof Q.tag=="number"&&dt("Received an unexpected object in getComponentName(). This is likely a bug in React. Please file an issue."),typeof Q=="function")return Q.displayName||Q.name||null;if(typeof Q=="string")return Q;switch(Q){case O:return"Fragment";case t:return"Portal";case M:return"Profiler";case N:return"StrictMode";case ne:return"Suspense";case m:return"SuspenseList"}if(typeof Q=="object")switch(Q.$$typeof){case B:return"Context.Consumer";case T:return"Context.Provider";case q:return It(Q,Q.render,"ForwardRef");case he:return Xt(Q.type);case se:return Xt(Q.render);case De:{var we=Q,Ne=Ve(we);if(Ne)return Xt(Ne);break}}return null}var rt={},X=null;function de(Q){X=Q}rt.getCurrentStack=null,rt.getStackAddendum=function(){var Q="";if(X){var we=Xt(X.type),Ne=X._owner;Q+=Qe(we,X._source,Ne&&Xt(Ne.type))}var Le=rt.getCurrentStack;return Le&&(Q+=Le()||""),Q};var Ce={current:!1},oe={ReactCurrentDispatcher:Ue,ReactCurrentBatchConfig:je,ReactCurrentOwner:at,IsSomeRendererActing:Ce,assign:i};i(oe,{ReactDebugCurrentFrame:rt,ReactComponentTreeHook:{}});function He(Q){{for(var we=arguments.length,Ne=new Array(we>1?we-1:0),Le=1;Le<we;Le++)Ne[Le-1]=arguments[Le];At("warn",Q,Ne)}}function dt(Q){{for(var we=arguments.length,Ne=new Array(we>1?we-1:0),Le=1;Le<we;Le++)Ne[Le-1]=arguments[Le];At("error",Q,Ne)}}function At(Q,we,Ne){{var Le=Ne.length>0&&typeof Ne[Ne.length-1]=="string"&&Ne[Ne.length-1].indexOf(`
-    in`)===0;if(!Le){var pt=oe.ReactDebugCurrentFrame,Yn=pt.getStackAddendum();Yn!==""&&(we+="%s",Ne=Ne.concat([Yn]))}var Cn=Ne.map(function(Mu){return""+Mu});Cn.unshift("Warning: "+we),Function.prototype.apply.call(console[Q],console,Cn);try{var cr=0,Si="Warning: "+we.replace(/%s/g,function(){return Ne[cr++]});throw new Error(Si)}catch(Mu){}}}var nn={};function an(Q,we){{var Ne=Q.constructor,Le=Ne&&(Ne.displayName||Ne.name)||"ReactClass",pt=Le+"."+we;if(nn[pt])return;dt("Can't call %s on a component that is not yet mounted. This is a no-op, but it might indicate a bug in your application. Instead, assign to `this.state` directly or define a `state = {};` class property with the desired state in the %s component.",we,Le),nn[pt]=!0}}var Mn={isMounted:function(Q){return!1},enqueueForceUpdate:function(Q,we,Ne){an(Q,"forceUpdate")},enqueueReplaceState:function(Q,we,Ne,Le){an(Q,"replaceState")},enqueueSetState:function(Q,we,Ne,Le){an(Q,"setState")}},lr={};Object.freeze(lr);function ln(Q,we,Ne){this.props=Q,this.context=we,this.refs=lr,this.updater=Ne||Mn}ln.prototype.isReactComponent={},ln.prototype.setState=function(Q,we){if(!(typeof Q=="object"||typeof Q=="function"||Q==null))throw Error("setState(...): takes an object of state variables to update or a function which returns an object of state variables.");this.updater.enqueueSetState(this,Q,we,"setState")},ln.prototype.forceUpdate=function(Q){this.updater.enqueueForceUpdate(this,Q,"forceUpdate")};{var Vt={isMounted:["isMounted","Instead, make sure to clean up subscriptions and pending requests in componentWillUnmount to prevent memory leaks."],replaceState:["replaceState","Refactor your code to use setState instead (see https://github.com/facebook/react/issues/3236)."]},Dr=function(Q,we){Object.defineProperty(ln.prototype,Q,{get:function(){He("%s(...) is deprecated in plain JavaScript React classes. %s",we[0],we[1])}})};for(var w in Vt)Vt.hasOwnProperty(w)&&Dr(w,Vt[w])}function jt(){}jt.prototype=ln.prototype;function Xn(Q,we,Ne){this.props=Q,this.context=we,this.refs=lr,this.updater=Ne||Mn}var vr=Xn.prototype=new jt;vr.constructor=Xn,i(vr,ln.prototype),vr.isPureReactComponent=!0;function jr(){var Q={current:null};return Object.seal(Q),Q}var fr=Object.prototype.hasOwnProperty,zr={key:!0,ref:!0,__self:!0,__source:!0},Qt,wu,d0;d0={};function Ro(Q){if(fr.call(Q,"ref")){var we=Object.getOwnPropertyDescriptor(Q,"ref").get;if(we&&we.isReactWarning)return!1}return Q.ref!==void 0}function Jo(Q){if(fr.call(Q,"key")){var we=Object.getOwnPropertyDescriptor(Q,"key").get;if(we&&we.isReactWarning)return!1}return Q.key!==void 0}function Ps(Q,we){var Ne=function(){Qt||(Qt=!0,dt("%s: `key` is not a prop. Trying to access it will result in `undefined` being returned. If you need to access the same value within the child component, you should pass it as a different prop. (https://fb.me/react-special-props)",we))};Ne.isReactWarning=!0,Object.defineProperty(Q,"key",{get:Ne,configurable:!0})}function Zo(Q,we){var Ne=function(){wu||(wu=!0,dt("%s: `ref` is not a prop. Trying to access it will result in `undefined` being returned. If you need to access the same value within the child component, you should pass it as a different prop. (https://fb.me/react-special-props)",we))};Ne.isReactWarning=!0,Object.defineProperty(Q,"ref",{get:Ne,configurable:!0})}function $o(Q){if(typeof Q.ref=="string"&&at.current&&Q.__self&&at.current.stateNode!==Q.__self){var we=Xt(at.current.type);d0[we]||(dt('Component "%s" contains the string ref "%s". Support for string refs will be removed in a future major release. This case cannot be automatically converted to an arrow function. We ask you to manually fix this case by using useRef() or createRef() instead. Learn more about using refs safely here: https://fb.me/react-strict-mode-string-ref',Xt(at.current.type),Q.ref),d0[we]=!0)}}var qt=function(Q,we,Ne,Le,pt,Yn,Cn){var cr={$$typeof:_,type:Q,key:we,ref:Ne,props:Cn,_owner:Yn};return cr._store={},Object.defineProperty(cr._store,"validated",{configurable:!1,enumerable:!1,writable:!0,value:!1}),Object.defineProperty(cr,"_self",{configurable:!1,enumerable:!1,writable:!1,value:Le}),Object.defineProperty(cr,"_source",{configurable:!1,enumerable:!1,writable:!1,value:pt}),Object.freeze&&(Object.freeze(cr.props),Object.freeze(cr)),cr};function Ai(Q,we,Ne){var Le,pt={},Yn=null,Cn=null,cr=null,Si=null;if(we!=null){Ro(we)&&(Cn=we.ref,$o(we)),Jo(we)&&(Yn=""+we.key),cr=we.__self===void 0?null:we.__self,Si=we.__source===void 0?null:we.__source;for(Le in we)fr.call(we,Le)&&!zr.hasOwnProperty(Le)&&(pt[Le]=we[Le])}var Mu=arguments.length-2;if(Mu===1)pt.children=Ne;else if(Mu>1){for(var zu=Array(Mu),Hu=0;Hu<Mu;Hu++)zu[Hu]=arguments[Hu+2];Object.freeze&&Object.freeze(zu),pt.children=zu}if(Q&&Q.defaultProps){var Su=Q.defaultProps;for(Le in Su)pt[Le]===void 0&&(pt[Le]=Su[Le])}if(Yn||Cn){var Ti=typeof Q=="function"?Q.displayName||Q.name||"Unknown":Q;Yn&&Ps(pt,Ti),Cn&&Zo(pt,Ti)}return qt(Q,Yn,Cn,cr,Si,at.current,pt)}function su(Q,we){var Ne=qt(Q.type,we,Q.ref,Q._self,Q._source,Q._owner,Q.props);return Ne}function mi(Q,we,Ne){if(Q==null)throw Error("React.cloneElement(...): The argument must be a React element, but you passed "+Q+".");var Le,pt=i({},Q.props),Yn=Q.key,Cn=Q.ref,cr=Q._self,Si=Q._source,Mu=Q._owner;if(we!=null){Ro(we)&&(Cn=we.ref,Mu=at.current),Jo(we)&&(Yn=""+we.key);var zu;Q.type&&Q.type.defaultProps&&(zu=Q.type.defaultProps);for(Le in we)fr.call(we,Le)&&!zr.hasOwnProperty(Le)&&(we[Le]===void 0&&zu!==void 0?pt[Le]=zu[Le]:pt[Le]=we[Le])}var Hu=arguments.length-2;if(Hu===1)pt.children=Ne;else if(Hu>1){for(var Su=Array(Hu),Ti=0;Ti<Hu;Ti++)Su[Ti]=arguments[Ti+2];pt.children=Su}return qt(Q.type,Yn,Cn,cr,Si,Mu,pt)}function wr(Q){return typeof Q=="object"&&Q!==null&&Q.$$typeof===_}var el=".",Y0=":";function Uu(Q){var we=/[=:]/g,Ne={"=":"=0",":":"=2"},Le=(""+Q).replace(we,function(pt){return Ne[pt]});return"$"+Le}var K0=!1,Xr=/\/+/g;function Oo(Q){return(""+Q).replace(Xr,"$&/")}var Mo=10,F0=[];function au(Q,we,Ne,Le){if(F0.length){var pt=F0.pop();return pt.result=Q,pt.keyPrefix=we,pt.func=Ne,pt.context=Le,pt.count=0,pt}else return{result:Q,keyPrefix:we,func:Ne,context:Le,count:0}}function Li(Q){Q.result=null,Q.keyPrefix=null,Q.func=null,Q.context=null,Q.count=0,F0.length<Mo&&F0.push(Q)}function Is(Q,we,Ne,Le){var pt=typeof Q;(pt==="undefined"||pt==="boolean")&&(Q=null);var Yn=!1;if(Q===null)Yn=!0;else switch(pt){case"string":case"number":Yn=!0;break;case"object":switch(Q.$$typeof){case _:case t:Yn=!0}}if(Yn)return Ne(Le,Q,we===""?el+P0(Q,0):we),1;var Cn,cr,Si=0,Mu=we===""?el:we+Y0;if(Array.isArray(Q))for(var zu=0;zu<Q.length;zu++)Cn=Q[zu],cr=Mu+P0(Cn,zu),Si+=Is(Cn,cr,Ne,Le);else{var Hu=Oe(Q);if(typeof Hu=="function"){Hu===Q.entries&&(K0||He("Using Maps as children is deprecated and will be removed in a future major release. Consider converting children to an array of keyed ReactElements instead."),K0=!0);for(var Su=Hu.call(Q),Ti,Fo=0;!(Ti=Su.next()).done;)Cn=Ti.value,cr=Mu+P0(Cn,Fo++),Si+=Is(Cn,cr,Ne,Le)}else if(pt==="object"){var ku="";ku=" If you meant to render a collection of children, use an array instead."+rt.getStackAddendum();var po=""+Q;throw Error("Objects are not valid as a React child (found: "+(po==="[object Object]"?"object with keys {"+Object.keys(Q).join(", ")+"}":po)+")."+ku)}}return Si}function Xl(Q,we,Ne){return Q==null?0:Is(Q,"",we,Ne)}function P0(Q,we){return typeof Q=="object"&&Q!==null&&Q.key!=null?Uu(Q.key):we.toString(36)}function p0(Q,we,Ne){var Le=Q.func,pt=Q.context;Le.call(pt,we,Q.count++)}function Hr(Q,we,Ne){if(Q==null)return Q;var Le=au(null,null,we,Ne);Xl(Q,p0,Le),Li(Le)}function Ri(Q,we,Ne){var Le=Q.result,pt=Q.keyPrefix,Yn=Q.func,Cn=Q.context,cr=Yn.call(Cn,we,Q.count++);Array.isArray(cr)?X0(cr,Le,Ne,function(Si){return Si}):cr!=null&&(wr(cr)&&(cr=su(cr,pt+(cr.key&&(!we||we.key!==cr.key)?Oo(cr.key)+"/":"")+Ne)),Le.push(cr))}function X0(Q,we,Ne,Le,pt){var Yn="";Ne!=null&&(Yn=Oo(Ne)+"/");var Cn=au(we,Yn,Le,pt);Xl(Q,Ri,Cn),Li(Cn)}function gi(Q,we,Ne){if(Q==null)return Q;var Le=[];return X0(Q,Le,null,we,Ne),Le}function en(Q){return Xl(Q,function(){return null},null)}function bn(Q){var we=[];return X0(Q,we,null,function(Ne){return Ne}),we}function Oi(Q){if(!wr(Q))throw Error("React.Children.only expected to receive a single React element child.");return Q}function yi(Q,we){we===void 0?we=null:we!==null&&typeof we!="function"&&dt("createContext: Expected the optional second argument to be a function. Instead received: %s",we);var Ne={$$typeof:B,_calculateChangedBits:we,_currentValue:Q,_currentValue2:Q,_threadCount:0,Provider:null,Consumer:null};Ne.Provider={$$typeof:T,_context:Ne};var Le=!1,pt=!1;{var Yn={$$typeof:B,_context:Ne,_calculateChangedBits:Ne._calculateChangedBits};Object.defineProperties(Yn,{Provider:{get:function(){return pt||(pt=!0,dt("Rendering <Context.Consumer.Provider> is not supported and will be removed in a future major release. Did you mean to render <Context.Provider> instead?")),Ne.Provider},set:function(Cn){Ne.Provider=Cn}},_currentValue:{get:function(){return Ne._currentValue},set:function(Cn){Ne._currentValue=Cn}},_currentValue2:{get:function(){return Ne._currentValue2},set:function(Cn){Ne._currentValue2=Cn}},_threadCount:{get:function(){return Ne._threadCount},set:function(Cn){Ne._threadCount=Cn}},Consumer:{get:function(){return Le||(Le=!0,dt("Rendering <Context.Consumer.Consumer> is not supported and will be removed in a future major release. Did you mean to render <Context.Consumer> instead?")),Ne.Consumer}}}),Ne.Consumer=Yn}return Ne._currentRenderer=null,Ne._currentRenderer2=null,Ne}function Wt(Q){var we={$$typeof:De,_ctor:Q,_status:-1,_result:null};{var Ne,Le;Object.defineProperties(we,{defaultProps:{configurable:!0,get:function(){return Ne},set:function(pt){dt("React.lazy(...): It is not supported to assign `defaultProps` to a lazy component import. Either specify them where the component is defined, or create a wrapping component around it."),Ne=pt,Object.defineProperty(we,"defaultProps",{enumerable:!0})}},propTypes:{configurable:!0,get:function(){return Le},set:function(pt){dt("React.lazy(...): It is not supported to assign `propTypes` to a lazy component import. Either specify them where the component is defined, or create a wrapping component around it."),Le=pt,Object.defineProperty(we,"propTypes",{enumerable:!0})}}})}return we}function Ru(Q){return Q!=null&&Q.$$typeof===he?dt("forwardRef requires a render function but received a `memo` component. Instead of forwardRef(memo(...)), use memo(forwardRef(...))."):typeof Q!="function"?dt("forwardRef requires a render function but was given %s.",Q===null?"null":typeof Q):Q.length!==0&&Q.length!==2&&dt("forwardRef render functions accept exactly two parameters: props and ref. %s",Q.length===1?"Did you forget to use the ref parameter?":"Any additional parameter will be undefined."),Q!=null&&(Q.defaultProps!=null||Q.propTypes!=null)&&dt("forwardRef render functions do not support propTypes or defaultProps. Did you accidentally pass a React component?"),{$$typeof:q,render:Q}}function eu(Q){return typeof Q=="string"||typeof Q=="function"||Q===O||Q===H||Q===M||Q===N||Q===ne||Q===m||typeof Q=="object"&&Q!==null&&(Q.$$typeof===De||Q.$$typeof===he||Q.$$typeof===T||Q.$$typeof===B||Q.$$typeof===q||Q.$$typeof===fe||Q.$$typeof===_e||Q.$$typeof===ce||Q.$$typeof===se)}function Q0(Q,we){return eu(Q)||dt("memo: The first argument must be a component. Instead received: %s",Q===null?"null":typeof Q),{$$typeof:he,type:Q,compare:we===void 0?null:we}}function Yi(){var Q=Ue.current;if(Q===null)throw Error(`Invalid hook call. Hooks can only be called inside of the body of a function component. This could happen for one of the following reasons:
-1. You might have mismatching versions of React and the renderer (such as React DOM)
-2. You might be breaking the Rules of Hooks
-3. You might have more than one copy of React in the same app
-See https://fb.me/react-invalid-hook-call for tips about how to debug and fix this problem.`);return Q}function Ql(Q,we){var Ne=Yi();if(we!==void 0&&dt("useContext() second argument is reserved for future use in React. Passing it is not supported. You passed: %s.%s",we,typeof we=="number"&&Array.isArray(arguments[2])?`
-
-Did you call array.map(useContext)? Calling Hooks inside a loop is not supported. Learn more at https://fb.me/rules-of-hooks`:""),Q._context!==void 0){var Le=Q._context;Le.Consumer===Q?dt("Calling useContext(Context.Consumer) is not supported, may cause bugs, and will be removed in a future major release. Did you mean to call useContext(Context) instead?"):Le.Provider===Q&&dt("Calling useContext(Context.Provider) is not supported. Did you mean to call useContext(Context) instead?")}return Ne.useContext(Q,we)}function ko(Q){var we=Yi();return we.useState(Q)}function ai(Q,we,Ne){var Le=Yi();return Le.useReducer(Q,we,Ne)}function ao(Q){var we=Yi();return we.useRef(Q)}function Jl(Q,we){var Ne=Yi();return Ne.useEffect(Q,we)}function Lo(Q,we){var Ne=Yi();return Ne.useLayoutEffect(Q,we)}function bs(Q,we){var Ne=Yi();return Ne.useCallback(Q,we)}function $n(Q,we){var Ne=Yi();return Ne.useMemo(Q,we)}function tl(Q,we,Ne){var Le=Yi();return Le.useImperativeHandle(Q,we,Ne)}function fo(Q,we){{var Ne=Yi();return Ne.useDebugValue(Q,we)}}var I0;I0=!1;function Sl(){if(at.current){var Q=Xt(at.current.type);if(Q)return`
-
-Check the render method of \``+Q+"`."}return""}function No(Q){if(Q!==void 0){var we=Q.fileName.replace(/^.*[\\\/]/,""),Ne=Q.lineNumber;return`
-
-Check your code at `+we+":"+Ne+"."}return""}function wt(Q){return Q!=null?No(Q.__source):""}var bt={};function Hn(Q){var we=Sl();if(!we){var Ne=typeof Q=="string"?Q:Q.displayName||Q.name;Ne&&(we=`
-
-Check the top-level render call using <`+Ne+">.")}return we}function qr(Q,we){if(!(!Q._store||Q._store.validated||Q.key!=null)){Q._store.validated=!0;var Ne=Hn(we);if(!bt[Ne]){bt[Ne]=!0;var Le="";Q&&Q._owner&&Q._owner!==at.current&&(Le=" It was passed a child from "+Xt(Q._owner.type)+"."),de(Q),dt('Each child in a list should have a unique "key" prop.%s%s See https://fb.me/react-warning-keys for more information.',Ne,Le),de(null)}}}function Ki(Q,we){if(typeof Q=="object"){if(Array.isArray(Q))for(var Ne=0;Ne<Q.length;Ne++){var Le=Q[Ne];wr(Le)&&qr(Le,we)}else if(wr(Q))Q._store&&(Q._store.validated=!0);else if(Q){var pt=Oe(Q);if(typeof pt=="function"&&pt!==Q.entries)for(var Yn=pt.call(Q),Cn;!(Cn=Yn.next()).done;)wr(Cn.value)&&qr(Cn.value,we)}}}function Qr(Q){{var we=Q.type;if(we==null||typeof we=="string")return;var Ne=Xt(we),Le;if(typeof we=="function")Le=we.propTypes;else if(typeof we=="object"&&(we.$$typeof===q||we.$$typeof===he))Le=we.propTypes;else return;Le?(de(Q),o(Le,Q.props,"prop",Ne,rt.getStackAddendum),de(null)):we.PropTypes!==void 0&&!I0&&(I0=!0,dt("Component %s declared `PropTypes` instead of `propTypes`. Did you misspell the property assignment?",Ne||"Unknown")),typeof we.getDefaultProps=="function"&&!we.getDefaultProps.isReactClassApproved&&dt("getDefaultProps is only used on classic React.createClass definitions. Use a static property named `defaultProps` instead.")}}function Ou(Q){{de(Q);for(var we=Object.keys(Q.props),Ne=0;Ne<we.length;Ne++){var Le=we[Ne];if(Le!=="children"&&Le!=="key"){dt("Invalid prop `%s` supplied to `React.Fragment`. React.Fragment can only have `key` and `children` props.",Le);break}}Q.ref!==null&&dt("Invalid attribute `ref` supplied to `React.Fragment`."),de(null)}}function h0(Q,we,Ne){var Le=eu(Q);if(!Le){var pt="";(Q===void 0||typeof Q=="object"&&Q!==null&&Object.keys(Q).length===0)&&(pt+=" You likely forgot to export your component from the file it's defined in, or you might have mixed up default and named imports.");var Yn=wt(we);Yn?pt+=Yn:pt+=Sl();var Cn;Q===null?Cn="null":Array.isArray(Q)?Cn="array":Q!==void 0&&Q.$$typeof===_?(Cn="<"+(Xt(Q.type)||"Unknown")+" />",pt=" Did you accidentally export a JSX literal instead of a component?"):Cn=typeof Q,dt("React.createElement: type is invalid -- expected a string (for built-in components) or a class/function (for composite components) but got: %s.%s",Cn,pt)}var cr=Ai.apply(this,arguments);if(cr==null)return cr;if(Le)for(var Si=2;Si<arguments.length;Si++)Ki(arguments[Si],Q);return Q===O?Ou(cr):Qr(cr),cr}var Ni=!1;function v0(Q){var we=h0.bind(null,Q);return we.type=Q,Ni||(Ni=!0,He("React.createFactory() is deprecated and will be removed in a future major release. Consider using JSX or use React.createElement() directly instead.")),Object.defineProperty(we,"type",{enumerable:!1,get:function(){return He("Factory.type is deprecated. Access the class directly before passing it to createFactory."),Object.defineProperty(this,"type",{value:Q}),Q}}),we}function vs(Q,we,Ne){for(var Le=mi.apply(this,arguments),pt=2;pt<arguments.length;pt++)Ki(arguments[pt],Le.type);return Qr(Le),Le}try{var Tt=Object.freeze({}),co=new Map([[Tt,null]]),nl=new Set([Tt]);co.set(0,0),nl.add(0)}catch(Q){}var Zl=h0,ju=vs,ms=v0,b0={map:gi,forEach:Hr,count:en,toArray:bn,only:Oi};Eu.Children=b0,Eu.Component=ln,Eu.Fragment=O,Eu.Profiler=M,Eu.PureComponent=Xn,Eu.StrictMode=N,Eu.Suspense=ne,Eu.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED=oe,Eu.cloneElement=ju,Eu.createContext=yi,Eu.createElement=Zl,Eu.createFactory=ms,Eu.createRef=jr,Eu.forwardRef=Ru,Eu.isValidElement=wr,Eu.lazy=Wt,Eu.memo=Q0,Eu.useCallback=bs,Eu.useContext=Ql,Eu.useDebugValue=fo,Eu.useEffect=Jl,Eu.useImperativeHandle=tl,Eu.useLayoutEffect=Lo,Eu.useMemo=$n,Eu.useReducer=ai,Eu.useRef=ao,Eu.useState=ko,Eu.version=a}()});var ki=Ke((DW,hD)=>{"use strict";process.env.NODE_ENV==="production"?hD.exports=wS():hD.exports=OS()});var MS=Ke((Wv,Ug)=>{(function(){var i,o="4.17.21",a=200,c="Unsupported core-js use. Try https://npms.io/search?q=ponyfill.",_="Expected a function",t="Invalid `variable` option passed into `_.template`",O="__lodash_hash_undefined__",N=500,M="__lodash_placeholder__",T=1,B=2,H=4,q=1,ne=2,m=1,he=2,De=4,se=8,fe=16,_e=32,ce=64,me=128,ie=256,Oe=512,Ue=30,je="...",at=800,Dt=16,Qe=1,ut=2,Ve=3,It=1/0,Xt=9007199254740991,rt=17976931348623157e292,X=0/0,de=4294967295,Ce=de-1,oe=de>>>1,He=[["ary",me],["bind",m],["bindKey",he],["curry",se],["curryRight",fe],["flip",Oe],["partial",_e],["partialRight",ce],["rearg",ie]],dt="[object Arguments]",At="[object Array]",nn="[object AsyncFunction]",an="[object Boolean]",Mn="[object Date]",lr="[object DOMException]",ln="[object Error]",Vt="[object Function]",Dr="[object GeneratorFunction]",w="[object Map]",jt="[object Number]",Xn="[object Null]",vr="[object Object]",jr="[object Promise]",fr="[object Proxy]",zr="[object RegExp]",Qt="[object Set]",wu="[object String]",d0="[object Symbol]",Ro="[object Undefined]",Jo="[object WeakMap]",Ps="[object WeakSet]",Zo="[object ArrayBuffer]",$o="[object DataView]",qt="[object Float32Array]",Ai="[object Float64Array]",su="[object Int8Array]",mi="[object Int16Array]",wr="[object Int32Array]",el="[object Uint8Array]",Y0="[object Uint8ClampedArray]",Uu="[object Uint16Array]",K0="[object Uint32Array]",Xr=/\b__p \+= '';/g,Oo=/\b(__p \+=) '' \+/g,Mo=/(__e\(.*?\)|\b__t\)) \+\n'';/g,F0=/&(?:amp|lt|gt|quot|#39);/g,au=/[&<>"']/g,Li=RegExp(F0.source),Is=RegExp(au.source),Xl=/<%-([\s\S]+?)%>/g,P0=/<%([\s\S]+?)%>/g,p0=/<%=([\s\S]+?)%>/g,Hr=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,Ri=/^\w*$/,X0=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,gi=/[\\^$.*+?()[\]{}|]/g,en=RegExp(gi.source),bn=/^\s+/,Oi=/\s/,yi=/\{(?:\n\/\* \[wrapped with .+\] \*\/)?\n?/,Wt=/\{\n\/\* \[wrapped with (.+)\] \*/,Ru=/,? & /,eu=/[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g,Q0=/[()=,{}\[\]\/\s]/,Yi=/\\(\\)?/g,Ql=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,ko=/\w*$/,ai=/^[-+]0x[0-9a-f]+$/i,ao=/^0b[01]+$/i,Jl=/^\[object .+?Constructor\]$/,Lo=/^0o[0-7]+$/i,bs=/^(?:0|[1-9]\d*)$/,$n=/[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g,tl=/($^)/,fo=/['\n\r\u2028\u2029\\]/g,I0="\\ud800-\\udfff",Sl="\\u0300-\\u036f",No="\\ufe20-\\ufe2f",wt="\\u20d0-\\u20ff",bt=Sl+No+wt,Hn="\\u2700-\\u27bf",qr="a-z\\xdf-\\xf6\\xf8-\\xff",Ki="\\xac\\xb1\\xd7\\xf7",Qr="\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf",Ou="\\u2000-\\u206f",h0=" \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000",Ni="A-Z\\xc0-\\xd6\\xd8-\\xde",v0="\\ufe0e\\ufe0f",vs=Ki+Qr+Ou+h0,Tt="['\u2019]",co="["+I0+"]",nl="["+vs+"]",Zl="["+bt+"]",ju="\\d+",ms="["+Hn+"]",b0="["+qr+"]",Q="[^"+I0+vs+ju+Hn+qr+Ni+"]",we="\\ud83c[\\udffb-\\udfff]",Ne="(?:"+Zl+"|"+we+")",Le="[^"+I0+"]",pt="(?:\\ud83c[\\udde6-\\uddff]){2}",Yn="[\\ud800-\\udbff][\\udc00-\\udfff]",Cn="["+Ni+"]",cr="\\u200d",Si="(?:"+b0+"|"+Q+")",Mu="(?:"+Cn+"|"+Q+")",zu="(?:"+Tt+"(?:d|ll|m|re|s|t|ve))?",Hu="(?:"+Tt+"(?:D|LL|M|RE|S|T|VE))?",Su=Ne+"?",Ti="["+v0+"]?",Fo="(?:"+cr+"(?:"+[Le,pt,Yn].join("|")+")"+Ti+Su+")*",ku="\\d*(?:1st|2nd|3rd|(?![123])\\dth)(?=\\b|[A-Z_])",po="\\d*(?:1ST|2ND|3RD|(?![123])\\dTH)(?=\\b|[a-z_])",qu=Ti+Su+Fo,Ia="(?:"+[ms,pt,Yn].join("|")+")"+qu,m0="(?:"+[Le+Zl+"?",Zl,pt,Yn,co].join("|")+")",ua=RegExp(Tt,"g"),J0=RegExp(Zl,"g"),oa=RegExp(we+"(?="+we+")|"+m0+qu,"g"),ba=RegExp([Cn+"?"+b0+"+"+zu+"(?="+[nl,Cn,"$"].join("|")+")",Mu+"+"+Hu+"(?="+[nl,Cn+Si,"$"].join("|")+")",Cn+"?"+Si+"+"+zu,Cn+"+"+Hu,po,ku,ju,Ia].join("|"),"g"),gs=RegExp("["+cr+I0+bt+v0+"]"),S0=/[a-z][A-Z]|[A-Z]{2}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/,Qn=["Array","Buffer","DataView","Date","Error","Float32Array","Float64Array","Function","Int8Array","Int16Array","Int32Array","Map","Math","Object","Promise","RegExp","Set","String","Symbol","TypeError","Uint8Array","Uint8ClampedArray","Uint16Array","Uint32Array","WeakMap","_","clearTimeout","isFinite","parseInt","setTimeout"],fc=-1,fi={};fi[qt]=fi[Ai]=fi[su]=fi[mi]=fi[wr]=fi[el]=fi[Y0]=fi[Uu]=fi[K0]=!0,fi[dt]=fi[At]=fi[Zo]=fi[an]=fi[$o]=fi[Mn]=fi[ln]=fi[Vt]=fi[w]=fi[jt]=fi[vr]=fi[zr]=fi[Qt]=fi[wu]=fi[Jo]=!1;var $r={};$r[dt]=$r[At]=$r[Zo]=$r[$o]=$r[an]=$r[Mn]=$r[qt]=$r[Ai]=$r[su]=$r[mi]=$r[wr]=$r[w]=$r[jt]=$r[vr]=$r[zr]=$r[Qt]=$r[wu]=$r[d0]=$r[el]=$r[Y0]=$r[Uu]=$r[K0]=!0,$r[ln]=$r[Vt]=$r[Jo]=!1;var $l={\u00C0:"A",\u00C1:"A",\u00C2:"A",\u00C3:"A",\u00C4:"A",\u00C5:"A",\u00E0:"a",\u00E1:"a",\u00E2:"a",\u00E3:"a",\u00E4:"a",\u00E5:"a",\u00C7:"C",\u00E7:"c",\u00D0:"D",\u00F0:"d",\u00C8:"E",\u00C9:"E",\u00CA:"E",\u00CB:"E",\u00E8:"e",\u00E9:"e",\u00EA:"e",\u00EB:"e",\u00CC:"I",\u00CD:"I",\u00CE:"I",\u00CF:"I",\u00EC:"i",\u00ED:"i",\u00EE:"i",\u00EF:"i",\u00D1:"N",\u00F1:"n",\u00D2:"O",\u00D3:"O",\u00D4:"O",\u00D5:"O",\u00D6:"O",\u00D8:"O",\u00F2:"o",\u00F3:"o",\u00F4:"o",\u00F5:"o",\u00F6:"o",\u00F8:"o",\u00D9:"U",\u00DA:"U",\u00DB:"U",\u00DC:"U",\u00F9:"u",\u00FA:"u",\u00FB:"u",\u00FC:"u",\u00DD:"Y",\u00FD:"y",\u00FF:"y",\u00C6:"Ae",\u00E6:"ae",\u00DE:"Th",\u00FE:"th",\u00DF:"ss",\u0100:"A",\u0102:"A",\u0104:"A",\u0101:"a",\u0103:"a",\u0105:"a",\u0106:"C",\u0108:"C",\u010A:"C",\u010C:"C",\u0107:"c",\u0109:"c",\u010B:"c",\u010D:"c",\u010E:"D",\u0110:"D",\u010F:"d",\u0111:"d",\u0112:"E",\u0114:"E",\u0116:"E",\u0118:"E",\u011A:"E",\u0113:"e",\u0115:"e",\u0117:"e",\u0119:"e",\u011B:"e",\u011C:"G",\u011E:"G",\u0120:"G",\u0122:"G",\u011D:"g",\u011F:"g",\u0121:"g",\u0123:"g",\u0124:"H",\u0126:"H",\u0125:"h",\u0127:"h",\u0128:"I",\u012A:"I",\u012C:"I",\u012E:"I",\u0130:"I",\u0129:"i",\u012B:"i",\u012D:"i",\u012F:"i",\u0131:"i",\u0134:"J",\u0135:"j",\u0136:"K",\u0137:"k",\u0138:"k",\u0139:"L",\u013B:"L",\u013D:"L",\u013F:"L",\u0141:"L",\u013A:"l",\u013C:"l",\u013E:"l",\u0140:"l",\u0142:"l",\u0143:"N",\u0145:"N",\u0147:"N",\u014A:"N",\u0144:"n",\u0146:"n",\u0148:"n",\u014B:"n",\u014C:"O",\u014E:"O",\u0150:"O",\u014D:"o",\u014F:"o",\u0151:"o",\u0154:"R",\u0156:"R",\u0158:"R",\u0155:"r",\u0157:"r",\u0159:"r",\u015A:"S",\u015C:"S",\u015E:"S",\u0160:"S",\u015B:"s",\u015D:"s",\u015F:"s",\u0161:"s",\u0162:"T",\u0164:"T",\u0166:"T",\u0163:"t",\u0165:"t",\u0167:"t",\u0168:"U",\u016A:"U",\u016C:"U",\u016E:"U",\u0170:"U",\u0172:"U",\u0169:"u",\u016B:"u",\u016D:"u",\u016F:"u",\u0171:"u",\u0173:"u",\u0174:"W",\u0175:"w",\u0176:"Y",\u0177:"y",\u0178:"Y",\u0179:"Z",\u017B:"Z",\u017D:"Z",\u017A:"z",\u017C:"z",\u017E:"z",\u0132:"IJ",\u0133:"ij",\u0152:"Oe",\u0153:"oe",\u0149:"'n",\u017F:"s"},la={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;"},hf={"&amp;":"&","&lt;":"<","&gt;":">","&quot;":'"',"&#39;":"'"},Bs={"\\":"\\","'":"'","\n":"n","\r":"r","\u2028":"u2028","\u2029":"u2029"},Ba=parseFloat,Us=parseInt,g0=typeof global=="object"&&global&&global.Object===Object&&global,js=typeof self=="object"&&self&&self.Object===Object&&self,ji=g0||js||Function("return this")(),U=typeof Wv=="object"&&Wv&&!Wv.nodeType&&Wv,z=U&&typeof Ug=="object"&&Ug&&!Ug.nodeType&&Ug,G=z&&z.exports===U,$=G&&g0.process,Te=function(){try{var xe=z&&z.require&&z.require("util").types;return xe||$&&$.binding&&$.binding("util")}catch(tt){}}(),ye=Te&&Te.isArrayBuffer,Ae=Te&&Te.isDate,Z=Te&&Te.isMap,ke=Te&&Te.isRegExp,Je=Te&&Te.isSet,vt=Te&&Te.isTypedArray;function ue(xe,tt,Ye){switch(Ye.length){case 0:return xe.call(tt);case 1:return xe.call(tt,Ye[0]);case 2:return xe.call(tt,Ye[0],Ye[1]);case 3:return xe.call(tt,Ye[0],Ye[1],Ye[2])}return xe.apply(tt,Ye)}function qe(xe,tt,Ye,Yt){for(var Kt=-1,pr=xe==null?0:xe.length;++Kt<pr;){var Wr=xe[Kt];tt(Yt,Wr,Ye(Wr),xe)}return Yt}function nt(xe,tt){for(var Ye=-1,Yt=xe==null?0:xe.length;++Ye<Yt&&tt(xe[Ye],Ye,xe)!==!1;);return xe}function Ct(xe,tt){for(var Ye=xe==null?0:xe.length;Ye--&&tt(xe[Ye],Ye,xe)!==!1;);return xe}function Mt(xe,tt){for(var Ye=-1,Yt=xe==null?0:xe.length;++Ye<Yt;)if(!tt(xe[Ye],Ye,xe))return!1;return!0}function Pt(xe,tt){for(var Ye=-1,Yt=xe==null?0:xe.length,Kt=0,pr=[];++Ye<Yt;){var Wr=xe[Ye];tt(Wr,Ye,xe)&&(pr[Kt++]=Wr)}return pr}function sn(xe,tt){var Ye=xe==null?0:xe.length;return!!Ye&&Et(xe,tt,0)>-1}function rn(xe,tt,Ye){for(var Yt=-1,Kt=xe==null?0:xe.length;++Yt<Kt;)if(Ye(tt,xe[Yt]))return!0;return!1}function Nt(xe,tt){for(var Ye=-1,Yt=xe==null?0:xe.length,Kt=Array(Yt);++Ye<Yt;)Kt[Ye]=tt(xe[Ye],Ye,xe);return Kt}function Dn(xe,tt){for(var Ye=-1,Yt=tt.length,Kt=xe.length;++Ye<Yt;)xe[Kt+Ye]=tt[Ye];return xe}function dr(xe,tt,Ye,Yt){var Kt=-1,pr=xe==null?0:xe.length;for(Yt&&pr&&(Ye=xe[++Kt]);++Kt<pr;)Ye=tt(Ye,xe[Kt],Kt,xe);return Ye}function er(xe,tt,Ye,Yt){var Kt=xe==null?0:xe.length;for(Yt&&Kt&&(Ye=xe[--Kt]);Kt--;)Ye=tt(Ye,xe[Kt],Kt,xe);return Ye}function Cr(xe,tt){for(var Ye=-1,Yt=xe==null?0:xe.length;++Ye<Yt;)if(tt(xe[Ye],Ye,xe))return!0;return!1}var Rn=fn("length");function Lr(xe){return xe.split("")}function y0(xe){return xe.match(eu)||[]}function Nr(xe,tt,Ye){var Yt;return Ye(xe,function(Kt,pr,Wr){if(tt(Kt,pr,Wr))return Yt=pr,!1}),Yt}function it(xe,tt,Ye,Yt){for(var Kt=xe.length,pr=Ye+(Yt?1:-1);Yt?pr--:++pr<Kt;)if(tt(xe[pr],pr,xe))return pr;return-1}function Et(xe,tt,Ye){return tt===tt?sa(xe,tt,Ye):it(xe,Ft,Ye)}function et(xe,tt,Ye,Yt){for(var Kt=Ye-1,pr=xe.length;++Kt<pr;)if(Yt(xe[Kt],tt))return Kt;return-1}function Ft(xe){return xe!==xe}function un(xe,tt){var Ye=xe==null?0:xe.length;return Ye?Lu(xe,tt)/Ye:X}function fn(xe){return function(tt){return tt==null?i:tt[xe]}}function Jn(xe){return function(tt){return xe==null?i:xe[tt]}}function Sr(xe,tt,Ye,Yt,Kt){return Kt(xe,function(pr,Wr,xn){Ye=Yt?(Yt=!1,pr):tt(Ye,pr,Wr,xn)}),Ye}function fu(xe,tt){var Ye=xe.length;for(xe.sort(tt);Ye--;)xe[Ye]=xe[Ye].value;return xe}function Lu(xe,tt){for(var Ye,Yt=-1,Kt=xe.length;++Yt<Kt;){var pr=tt(xe[Yt]);pr!==i&&(Ye=Ye===i?pr:Ye+pr)}return Ye}function T0(xe,tt){for(var Ye=-1,Yt=Array(xe);++Ye<xe;)Yt[Ye]=tt(Ye);return Yt}function Z0(xe,tt){return Nt(tt,function(Ye){return[Ye,xe[Ye]]})}function Nu(xe){return xe&&xe.slice(0,ho(xe)+1).replace(bn,"")}function _i(xe){return function(tt){return xe(tt)}}function Po(xe,tt){return Nt(tt,function(Ye){return xe[Ye]})}function rl(xe,tt){return xe.has(tt)}function vf(xe,tt){for(var Ye=-1,Yt=xe.length;++Ye<Yt&&Et(tt,xe[Ye],0)>-1;);return Ye}function Tl(xe,tt){for(var Ye=xe.length;Ye--&&Et(tt,xe[Ye],0)>-1;);return Ye}function mf(xe,tt){for(var Ye=xe.length,Yt=0;Ye--;)xe[Ye]===tt&&++Yt;return Yt}var Io=Jn($l),ys=Jn(la);function zs(xe){return"\\"+Bs[xe]}function bo(xe,tt){return xe==null?i:xe[tt]}function Bo(xe){return gs.test(xe)}function _s(xe){return S0.test(xe)}function Qu(xe){for(var tt,Ye=[];!(tt=xe.next()).done;)Ye.push(tt.value);return Ye}function Tu(xe){var tt=-1,Ye=Array(xe.size);return xe.forEach(function(Yt,Kt){Ye[++tt]=[Kt,Yt]}),Ye}function Ei(xe,tt){return function(Ye){return xe(tt(Ye))}}function C0(xe,tt){for(var Ye=-1,Yt=xe.length,Kt=0,pr=[];++Ye<Yt;){var Wr=xe[Ye];(Wr===tt||Wr===M)&&(xe[Ye]=M,pr[Kt++]=Ye)}return pr}function $0(xe){var tt=-1,Ye=Array(xe.size);return xe.forEach(function(Yt){Ye[++tt]=Yt}),Ye}function Uo(xe){var tt=-1,Ye=Array(xe.size);return xe.forEach(function(Yt){Ye[++tt]=[Yt,Yt]}),Ye}function sa(xe,tt,Ye){for(var Yt=Ye-1,Kt=xe.length;++Yt<Kt;)if(xe[Yt]===tt)return Yt;return-1}function es(xe,tt,Ye){for(var Yt=Ye+1;Yt--;)if(xe[Yt]===tt)return Yt;return Yt}function tu(xe){return Bo(xe)?Ci(xe):Rn(xe)}function ei(xe){return Bo(xe)?gf(xe):Lr(xe)}function ho(xe){for(var tt=xe.length;tt--&&Oi.test(xe.charAt(tt)););return tt}var Bi=Jn(hf);function Ci(xe){for(var tt=oa.lastIndex=0;oa.test(xe);)++tt;return tt}function gf(xe){return xe.match(oa)||[]}function yf(xe){return xe.match(ba)||[]}var eo=function xe(tt){tt=tt==null?ji:to.defaults(ji.Object(),tt,to.pick(ji,Qn));var Ye=tt.Array,Yt=tt.Date,Kt=tt.Error,pr=tt.Function,Wr=tt.Math,xn=tt.Object,gu=tt.RegExp,Ju=tt.String,ti=tt.TypeError,Jr=Ye.prototype,Wu=pr.prototype,An=xn.prototype,x0=tt["__core-js_shared__"],Fu=Wu.toString,li=An.hasOwnProperty,Cl=0,Hs=function(){var p=/[^.]+$/.exec(x0&&x0.keys&&x0.keys.IE_PROTO||"");return p?"Symbol(src)_1."+p:""}(),Vu=An.toString,aa=Fu.call(xn),Xi=ji._,qs=gu("^"+Fu.call(li).replace(gi,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),A0=G?tt.Buffer:i,zi=tt.Symbol,R0=tt.Uint8Array,Hi=A0?A0.allocUnsafe:i,il=Ei(xn.getPrototypeOf,xn),xl=xn.create,B0=An.propertyIsEnumerable,O0=Jr.splice,vo=zi?zi.isConcatSpreadable:i,Pu=zi?zi.iterator:i,Zu=zi?zi.toStringTag:i,ts=function(){try{var p=Eo(xn,"defineProperty");return p({},"",{}),p}catch(v){}}(),Es=tt.clearTimeout!==ji.clearTimeout&&tt.clearTimeout,fa=Yt&&Yt.now!==ji.Date.now&&Yt.now,_f=tt.setTimeout!==ji.setTimeout&&tt.setTimeout,$u=Wr.ceil,Ds=Wr.floor,Ar=xn.getOwnPropertySymbols,no=A0?A0.isBuffer:i,nu=tt.isFinite,cu=Jr.join,Fi=Ei(xn.keys,xn),ni=Wr.max,Kn=Wr.min,e0=Yt.now,_0=tt.parseInt,E0=Wr.random,Fn=Jr.reverse,ae=Eo(tt,"DataView"),re=Eo(tt,"Map"),Fe=Eo(tt,"Promise"),Re=Eo(tt,"Set"),st=Eo(tt,"WeakMap"),mt=Eo(xn,"create"),Jt=st&&new st,On={},Sn=Da(ae),_n=Da(re),Tn=Da(Fe),ir=Da(Re),Bt=Da(st),Pi=zi?zi.prototype:i,Rr=Pi?Pi.valueOf:i,mr=Pi?Pi.toString:i;function Y(p){if(Yu(p)&&!tr(p)&&!(p instanceof ft)){if(p instanceof Vr)return p;if(li.call(p,"__wrapped__"))return b2(p)}return new Vr(p)}var ri=function(){function p(){}return function(v){if(!bu(v))return{};if(xl)return xl(v);p.prototype=v;var x=new p;return p.prototype=i,x}}();function ii(){}function Vr(p,v){this.__wrapped__=p,this.__actions__=[],this.__chain__=!!v,this.__index__=0,this.__values__=i}Y.templateSettings={escape:Xl,evaluate:P0,interpolate:p0,variable:"",imports:{_:Y}},Y.prototype=ii.prototype,Y.prototype.constructor=Y,Vr.prototype=ri(ii.prototype),Vr.prototype.constructor=Vr;function ft(p){this.__wrapped__=p,this.__actions__=[],this.__dir__=1,this.__filtered__=!1,this.__iteratees__=[],this.__takeCount__=de,this.__views__=[]}function Di(){var p=new ft(this.__wrapped__);return p.__actions__=iu(this.__actions__),p.__dir__=this.__dir__,p.__filtered__=this.__filtered__,p.__iteratees__=iu(this.__iteratees__),p.__takeCount__=this.__takeCount__,p.__views__=iu(this.__views__),p}function ru(){if(this.__filtered__){var p=new ft(this);p.__dir__=-1,p.__filtered__=!0}else p=this.clone(),p.__dir__*=-1;return p}function D0(){var p=this.__wrapped__.value(),v=this.__dir__,x=tr(p),P=v<0,W=x?p.length:0,ee=is(0,W,this.__views__),ve=ee.start,Ee=ee.end,Ie=Ee-ve,_t=P?Ee:ve-1,St=this.__iteratees__,Rt=St.length,on=0,kn=Kn(Ie,this.__takeCount__);if(!x||!P&&W==Ie&&kn==Ie)return _h(p,this.__actions__);var rr=[];e:for(;Ie--&&on<kn;){_t+=v;for(var br=-1,ar=p[_t];++br<Rt;){var ui=St[br],di=ui.iteratee,zl=ui.type,Zi=di(ar);if(zl==ut)ar=Zi;else if(!Zi){if(zl==Qe)continue e;break e}}rr[on++]=ar}return rr}ft.prototype=ri(ii.prototype),ft.prototype.constructor=ft;function Un(p){var v=-1,x=p==null?0:p.length;for(this.clear();++v<x;){var P=p[v];this.set(P[0],P[1])}}function t0(){this.__data__=mt?mt(null):{},this.size=0}function ro(p){var v=this.has(p)&&delete this.__data__[p];return this.size-=v?1:0,v}function mo(p){var v=this.__data__;if(mt){var x=v[p];return x===O?i:x}return li.call(v,p)?v[p]:i}function n0(p){var v=this.__data__;return mt?v[p]!==i:li.call(v,p)}function jo(p,v){var x=this.__data__;return this.size+=this.has(p)?0:1,x[p]=mt&&v===i?O:v,this}Un.prototype.clear=t0,Un.prototype.delete=ro,Un.prototype.get=mo,Un.prototype.has=n0,Un.prototype.set=jo;function io(p){var v=-1,x=p==null?0:p.length;for(this.clear();++v<x;){var P=p[v];this.set(P[0],P[1])}}function Ua(){this.__data__=[],this.size=0}function Ef(p){var v=this.__data__,x=ns(v,p);if(x<0)return!1;var P=v.length-1;return x==P?v.pop():O0.call(v,x,1),--this.size,!0}function cc(p){var v=this.__data__,x=ns(v,p);return x<0?i:v[x][1]}function ws(p){return ns(this.__data__,p)>-1}function ca(p,v){var x=this.__data__,P=ns(x,p);return P<0?(++this.size,x.push([p,v])):x[P][1]=v,this}io.prototype.clear=Ua,io.prototype.delete=Ef,io.prototype.get=cc,io.prototype.has=ws,io.prototype.set=ca;function U0(p){var v=-1,x=p==null?0:p.length;for(this.clear();++v<x;){var P=p[v];this.set(P[0],P[1])}}function dc(){this.size=0,this.__data__={hash:new Un,map:new(re||io),string:new Un}}function ja(p){var v=dl(this,p).delete(p);return this.size-=v?1:0,v}function D2(p){return dl(this,p).get(p)}function rd(p){return dl(this,p).has(p)}function id(p,v){var x=dl(this,p),P=x.size;return x.set(p,v),this.size+=x.size==P?0:1,this}U0.prototype.clear=dc,U0.prototype.delete=ja,U0.prototype.get=D2,U0.prototype.has=rd,U0.prototype.set=id;function go(p){var v=-1,x=p==null?0:p.length;for(this.__data__=new U0;++v<x;)this.add(p[v])}function qc(p){return this.__data__.set(p,O),this}function Al(p){return this.__data__.has(p)}go.prototype.add=go.prototype.push=qc,go.prototype.has=Al;function ul(p){var v=this.__data__=new io(p);this.size=v.size}function w2(){this.__data__=new io,this.size=0}function Ws(p){var v=this.__data__,x=v.delete(p);return this.size=v.size,x}function Rl(p){return this.__data__.get(p)}function ud(p){return this.__data__.has(p)}function zo(p,v){var x=this.__data__;if(x instanceof io){var P=x.__data__;if(!re||P.length<a-1)return P.push([p,v]),this.size=++x.size,this;x=this.__data__=new U0(P)}return x.set(p,v),this.size=x.size,this}ul.prototype.clear=w2,ul.prototype.delete=Ws,ul.prototype.get=Rl,ul.prototype.has=ud,ul.prototype.set=zo;function za(p,v){var x=tr(p),P=!x&&pl(p),W=!x&&!P&&Zs(p),ee=!x&&!P&&!W&&Ra(p),ve=x||P||W||ee,Ee=ve?T0(p.length,Ju):[],Ie=Ee.length;for(var _t in p)(v||li.call(p,_t))&&!(ve&&(_t=="length"||W&&(_t=="offset"||_t=="parent")||ee&&(_t=="buffer"||_t=="byteLength"||_t=="byteOffset")||Do(_t,Ie)))&&Ee.push(_t);return Ee}function Ha(p){var v=p.length;return v?p[fd(0,v-1)]:i}function qa(p,v){return Sc(iu(p),r0(v,0,p.length))}function da(p){return Sc(iu(p))}function Ss(p,v,x){(x!==i&&!So(p[v],x)||x===i&&!(v in p))&&Gu(p,v,x)}function Ts(p,v,x){var P=p[v];(!(li.call(p,v)&&So(P,x))||x===i&&!(v in p))&&Gu(p,v,x)}function ns(p,v){for(var x=p.length;x--;)if(So(p[x][0],v))return x;return-1}function Ho(p,v,x,P){return Cs(p,function(W,ee,ve){v(P,W,x(W),ve)}),P}function Df(p,v){return p&&M0(v,L0(v),p)}function ol(p,v){return p&&M0(v,dn(v),p)}function Gu(p,v,x){v=="__proto__"&&ts?ts(p,v,{configurable:!0,enumerable:!0,value:x,writable:!0}):p[v]=x}function Wa(p,v){for(var x=-1,P=v.length,W=Ye(P),ee=p==null;++x<P;)W[x]=ee?i:Ul(p,v[x]);return W}function r0(p,v,x){return p===p&&(x!==i&&(p=p<=x?p:x),v!==i&&(p=p>=v?p:v)),p}function j0(p,v,x,P,W,ee){var ve,Ee=v&T,Ie=v&B,_t=v&H;if(x&&(ve=W?x(p,P,W,ee):x(p)),ve!==i)return ve;if(!bu(p))return p;var St=tr(p);if(St){if(ve=xs(p),!Ee)return iu(p,ve)}else{var Rt=Iu(p),on=Rt==Vt||Rt==Dr;if(Zs(p))return mc(p,Ee);if(Rt==vr||Rt==dt||on&&!W){if(ve=Ie||on?{}:Dc(p),!Ee)return Ie?rs(p,ol(ve,p)):o0(p,Df(ve,p))}else{if(!$r[Rt])return W?p:{};ve=Th(p,Rt,Ee)}}ee||(ee=new ul);var kn=ee.get(p);if(kn)return kn;ee.set(p,ve),bd(p)?p.forEach(function(ar){ve.add(j0(ar,v,x,ar,p,ee))}):Dp(p)&&p.forEach(function(ar,ui){ve.set(ui,j0(ar,v,x,ui,p,ee))});var rr=_t?Ie?sr:r1:Ie?dn:L0,br=St?i:rr(p);return nt(br||p,function(ar,ui){br&&(ui=ar,ar=p[ui]),Ts(ve,ui,j0(ar,v,x,ui,p,ee))}),ve}function wf(p){var v=L0(p);return function(x){return Wc(x,p,v)}}function Wc(p,v,x){var P=x.length;if(p==null)return!P;for(p=xn(p);P--;){var W=x[P],ee=v[W],ve=p[W];if(ve===i&&!(W in p)||!ee(ve))return!1}return!0}function pc(p,v,x){if(typeof p!="function")throw new ti(_);return Ja(function(){p.apply(i,x)},v)}function Ol(p,v,x,P){var W=-1,ee=sn,ve=!0,Ee=p.length,Ie=[],_t=v.length;if(!Ee)return Ie;x&&(v=Nt(v,_i(x))),P?(ee=rn,ve=!1):v.length>=a&&(ee=rl,ve=!1,v=new go(v));e:for(;++W<Ee;){var St=p[W],Rt=x==null?St:x(St);if(St=P||St!==0?St:0,ve&&Rt===Rt){for(var on=_t;on--;)if(v[on]===Rt)continue e;Ie.push(St)}else ee(v,Rt,P)||Ie.push(St)}return Ie}var Cs=fl(A),pa=fl(F,!0);function od(p,v){var x=!0;return Cs(p,function(P,W,ee){return x=!!v(P,W,ee),x}),x}function ha(p,v,x){for(var P=-1,W=p.length;++P<W;){var ee=p[P],ve=v(ee);if(ve!=null&&(Ee===i?ve===ve&&!Bl(ve):x(ve,Ee)))var Ee=ve,Ie=ee}return Ie}function hc(p,v,x,P){var W=p.length;for(x=Mr(x),x<0&&(x=-x>W?0:W+x),P=P===i||P>W?W:Mr(P),P<0&&(P+=W),P=x>P?0:Sp(P);x<P;)p[x++]=v;return p}function Vc(p,v){var x=[];return Cs(p,function(P,W,ee){v(P,W,ee)&&x.push(P)}),x}function qi(p,v,x,P,W){var ee=-1,ve=p.length;for(x||(x=us),W||(W=[]);++ee<ve;){var Ee=p[ee];v>0&&x(Ee)?v>1?qi(Ee,v-1,x,P,W):Dn(W,Ee):P||(W[W.length]=Ee)}return W}var y=yc(),g=yc(!0);function A(p,v){return p&&y(p,v,L0)}function F(p,v){return p&&g(p,v,L0)}function b(p,v){return Pt(v,function(x){return Aa(p[x])})}function J(p,v){v=Vs(v,p);for(var x=0,P=v.length;p!=null&&x<P;)p=p[Fl(v[x++])];return x&&x==P?p:i}function pe(p,v,x){var P=v(p);return tr(p)?P:Dn(P,x(p))}function gt(p){return p==null?p===i?Ro:Xn:Zu&&Zu in xn(p)?_c(p):Qa(p)}function xt(p,v){return p>v}function kt(p,v){return p!=null&&li.call(p,v)}function xr(p,v){return p!=null&&v in xn(p)}function i0(p,v,x){return p>=Kn(v,x)&&p<ni(v,x)}function du(p,v,x){for(var P=x?rn:sn,W=p[0].length,ee=p.length,ve=ee,Ee=Ye(ee),Ie=Infinity,_t=[];ve--;){var St=p[ve];ve&&v&&(St=Nt(St,_i(v))),Ie=Kn(St.length,Ie),Ee[ve]=!x&&(v||W>=120&&St.length>=120)?new go(ve&&St):i}St=p[0];var Rt=-1,on=Ee[0];e:for(;++Rt<W&&_t.length<Ie;){var kn=St[Rt],rr=v?v(kn):kn;if(kn=x||kn!==0?kn:0,!(on?rl(on,rr):P(_t,rr,x))){for(ve=ee;--ve;){var br=Ee[ve];if(!(br?rl(br,rr):P(p[ve],rr,x)))continue e}on&&on.push(rr),_t.push(kn)}}return _t}function z0(p,v,x,P){return A(p,function(W,ee,ve){v(P,x(W),ee,ve)}),P}function Ml(p,v,x){v=Vs(v,p),p=Dd(p,v);var P=p==null?p:p[Fl(Il(v))];return P==null?i:ue(P,p,x)}function u0(p){return Yu(p)&&gt(p)==dt}function We(p){return Yu(p)&&gt(p)==Zo}function ze(p){return Yu(p)&&gt(p)==Mn}function lt(p,v,x,P,W){return p===v?!0:p==null||v==null||!Yu(p)&&!Yu(v)?p!==p&&v!==v:$t(p,v,x,P,lt,W)}function $t(p,v,x,P,W,ee){var ve=tr(p),Ee=tr(v),Ie=ve?At:Iu(p),_t=Ee?At:Iu(v);Ie=Ie==dt?vr:Ie,_t=_t==dt?vr:_t;var St=Ie==vr,Rt=_t==vr,on=Ie==_t;if(on&&Zs(p)){if(!Zs(v))return!1;ve=!0,St=!1}if(on&&!St)return ee||(ee=new ul),ve||Ra(p)?Mf(p,v,x,P,W,ee):Sh(p,v,Ie,x,P,W,ee);if(!(x&q)){var kn=St&&li.call(p,"__wrapped__"),rr=Rt&&li.call(v,"__wrapped__");if(kn||rr){var br=kn?p.value():p,ar=rr?v.value():v;return ee||(ee=new ul),W(br,ar,x,P,ee)}}return on?(ee||(ee=new ul),dm(p,v,x,P,W,ee)):!1}function Wn(p){return Yu(p)&&Iu(p)==w}function si(p,v,x,P){var W=x.length,ee=W,ve=!P;if(p==null)return!ee;for(p=xn(p);W--;){var Ee=x[W];if(ve&&Ee[2]?Ee[1]!==p[Ee[0]]:!(Ee[0]in p))return!1}for(;++W<ee;){Ee=x[W];var Ie=Ee[0],_t=p[Ie],St=Ee[1];if(ve&&Ee[2]){if(_t===i&&!(Ie in p))return!1}else{var Rt=new ul;if(P)var on=P(_t,St,Ie,p,v,Rt);if(!(on===i?lt(St,_t,q|ne,P,Rt):on))return!1}}return!0}function ur(p){if(!bu(p)||pm(p))return!1;var v=Aa(p)?qs:Jl;return v.test(Da(p))}function ci(p){return Yu(p)&&gt(p)==zr}function Qi(p){return Yu(p)&&Iu(p)==Qt}function Gr(p){return Yu(p)&&Pd(p.length)&&!!fi[gt(p)]}function Cu(p){return typeof p=="function"?p:p==null?s0:typeof p=="object"?tr(p)?Sf(p[0],p[1]):T2(p):Bp(p)}function Va(p){if(!Nf(p))return Fi(p);var v=[];for(var x in xn(p))li.call(p,x)&&x!="constructor"&&v.push(x);return v}function Ga(p){if(!bu(p))return i1(p);var v=Nf(p),x=[];for(var P in p)P=="constructor"&&(v||!li.call(p,P))||x.push(P);return x}function ld(p,v){return p<v}function S2(p,v){var x=-1,P=hl(p)?Ye(p.length):[];return Cs(p,function(W,ee,ve){P[++x]=v(W,ee,ve)}),P}function T2(p){var v=jn(p);return v.length==1&&v[0][2]?_d(v[0][0],v[0][1]):function(x){return x===p||si(x,p,v)}}function Sf(p,v){return Ji(p)&&Ff(v)?_d(Fl(p),v):function(x){var P=Ul(x,p);return P===i&&P===v?Ac(x,p):lt(v,P,q|ne)}}function sd(p,v,x,P,W){p!==v&&y(v,function(ee,ve){if(W||(W=new ul),bu(ee))hh(p,v,ve,x,sd,P,W);else{var Ee=P?P(Pf(p,ve),ee,ve+"",p,v,W):i;Ee===i&&(Ee=ee),Ss(p,ve,Ee)}},dn)}function hh(p,v,x,P,W,ee,ve){var Ee=Pf(p,x),Ie=Pf(v,x),_t=ve.get(Ie);if(_t){Ss(p,x,_t);return}var St=ee?ee(Ee,Ie,x+"",p,v,ve):i,Rt=St===i;if(Rt){var on=tr(Ie),kn=!on&&Zs(Ie),rr=!on&&!kn&&Ra(Ie);St=Ie,on||kn||rr?tr(Ee)?St=Ee:l0(Ee)?St=iu(Ee):kn?(Rt=!1,St=mc(Ie,!0)):rr?(Rt=!1,St=$c(Ie,!0)):St=[]:xc(Ie)||pl(Ie)?(St=Ee,pl(Ee)?St=yu(Ee):(!bu(Ee)||Aa(Ee))&&(St=Dc(Ie))):Rt=!1}Rt&&(ve.set(Ie,St),W(St,Ie,P,ee,ve),ve.delete(Ie)),Ss(p,x,St)}function Gc(p,v){var x=p.length;if(!!x)return v+=v<0?x:0,Do(v,x)?p[v]:i}function yo(p,v,x){v.length?v=Nt(v,function(ee){return tr(ee)?function(ve){return J(ve,ee.length===1?ee[0]:ee)}:ee}):v=[s0];var P=-1;v=Nt(v,_i(Vn()));var W=S2(p,function(ee,ve,Ee){var Ie=Nt(v,function(_t){return _t(ee)});return{criteria:Ie,index:++P,value:ee}});return fu(W,function(ee,ve){return am(ee,ve,x)})}function vh(p,v){return mh(p,v,function(x,P){return Ac(p,P)})}function mh(p,v,x){for(var P=-1,W=v.length,ee={};++P<W;){var ve=v[P],Ee=J(p,ve);x(Ee,ve)&&Ya(ee,Vs(ve,p),Ee)}return ee}function _o(p){return function(v){return J(v,p)}}function kl(p,v,x,P){var W=P?et:Et,ee=-1,ve=v.length,Ee=p;for(p===v&&(v=iu(v)),x&&(Ee=Nt(p,_i(x)));++ee<ve;)for(var Ie=0,_t=v[ee],St=x?x(_t):_t;(Ie=W(Ee,St,Ie,P))>-1;)Ee!==p&&O0.call(Ee,Ie,1),O0.call(p,Ie,1);return p}function ad(p,v){for(var x=p?v.length:0,P=x-1;x--;){var W=v[x];if(x==P||W!==ee){var ee=W;Do(W)?O0.call(p,W,1):R2(p,W)}}return p}function fd(p,v){return p+Ds(E0()*(v-p+1))}function C2(p,v,x,P){for(var W=-1,ee=ni($u((v-p)/(x||1)),0),ve=Ye(ee);ee--;)ve[P?ee:++W]=p,p+=x;return ve}function Yc(p,v){var x="";if(!p||v<1||v>Xt)return x;do v%2&&(x+=p),v=Ds(v/2),v&&(p+=p);while(v);return x}function Ir(p,v){return l1(P2(p,v,s0),p+"")}function cd(p){return Ha(Nc(p))}function dd(p,v){var x=Nc(p);return Sc(x,r0(v,0,x.length))}function Ya(p,v,x,P){if(!bu(p))return p;v=Vs(v,p);for(var W=-1,ee=v.length,ve=ee-1,Ee=p;Ee!=null&&++W<ee;){var Ie=Fl(v[W]),_t=x;if(Ie==="__proto__"||Ie==="constructor"||Ie==="prototype")return p;if(W!=ve){var St=Ee[Ie];_t=P?P(St,Ie,Ee):i,_t===i&&(_t=bu(St)?St:Do(v[W+1])?[]:{})}Ts(Ee,Ie,_t),Ee=Ee[Ie]}return p}var Kc=Jt?function(p,v){return Jt.set(p,v),p}:s0,x2=ts?function(p,v){return ts(p,"toString",{configurable:!0,enumerable:!1,value:Jd(v),writable:!0})}:s0;function ll(p){return Sc(Nc(p))}function sl(p,v,x){var P=-1,W=p.length;v<0&&(v=-v>W?0:W+v),x=x>W?W:x,x<0&&(x+=W),W=v>x?0:x-v>>>0,v>>>=0;for(var ee=Ye(W);++P<W;)ee[P]=p[P+v];return ee}function gh(p,v){var x;return Cs(p,function(P,W,ee){return x=v(P,W,ee),!x}),!!x}function Tf(p,v,x){var P=0,W=p==null?P:p.length;if(typeof v=="number"&&v===v&&W<=oe){for(;P<W;){var ee=P+W>>>1,ve=p[ee];ve!==null&&!Bl(ve)&&(x?ve<=v:ve<v)?P=ee+1:W=ee}return W}return Xc(p,v,s0,x)}function Xc(p,v,x,P){var W=0,ee=p==null?0:p.length;if(ee===0)return 0;v=x(v);for(var ve=v!==v,Ee=v===null,Ie=Bl(v),_t=v===i;W<ee;){var St=Ds((W+ee)/2),Rt=x(p[St]),on=Rt!==i,kn=Rt===null,rr=Rt===Rt,br=Bl(Rt);if(ve)var ar=P||rr;else _t?ar=rr&&(P||on):Ee?ar=rr&&on&&(P||!kn):Ie?ar=rr&&on&&!kn&&(P||!br):kn||br?ar=!1:ar=P?Rt<=v:Rt<v;ar?W=St+1:ee=St}return Kn(ee,Ce)}function A2(p,v){for(var x=-1,P=p.length,W=0,ee=[];++x<P;){var ve=p[x],Ee=v?v(ve):ve;if(!x||!So(Ee,Ie)){var Ie=Ee;ee[W++]=ve===0?0:ve}}return ee}function yh(p){return typeof p=="number"?p:Bl(p)?X:+p}function al(p){if(typeof p=="string")return p;if(tr(p))return Nt(p,al)+"";if(Bl(p))return mr?mr.call(p):"";var v=p+"";return v=="0"&&1/p==-It?"-0":v}function va(p,v,x){var P=-1,W=sn,ee=p.length,ve=!0,Ee=[],Ie=Ee;if(x)ve=!1,W=rn;else if(ee>=a){var _t=v?null:fm(p);if(_t)return $0(_t);ve=!1,W=rl,Ie=new go}else Ie=v?[]:Ee;e:for(;++P<ee;){var St=p[P],Rt=v?v(St):St;if(St=x||St!==0?St:0,ve&&Rt===Rt){for(var on=Ie.length;on--;)if(Ie[on]===Rt)continue e;v&&Ie.push(Rt),Ee.push(St)}else W(Ie,Rt,x)||(Ie!==Ee&&Ie.push(Rt),Ee.push(St))}return Ee}function R2(p,v){return v=Vs(v,p),p=Dd(p,v),p==null||delete p[Fl(Il(v))]}function O2(p,v,x,P){return Ya(p,v,x(J(p,v)),P)}function vc(p,v,x,P){for(var W=p.length,ee=P?W:-1;(P?ee--:++ee<W)&&v(p[ee],ee,p););return x?sl(p,P?0:ee,P?ee+1:W):sl(p,P?ee+1:0,P?W:ee)}function _h(p,v){var x=p;return x instanceof ft&&(x=x.value()),dr(v,function(P,W){return W.func.apply(W.thisArg,Dn([P],W.args))},x)}function M2(p,v,x){var P=p.length;if(P<2)return P?va(p[0]):[];for(var W=-1,ee=Ye(P);++W<P;)for(var ve=p[W],Ee=-1;++Ee<P;)Ee!=W&&(ee[W]=Ol(ee[W]||ve,p[Ee],v,x));return va(qi(ee,1),v,x)}function pd(p,v,x){for(var P=-1,W=p.length,ee=v.length,ve={};++P<W;){var Ee=P<ee?v[P]:i;x(ve,p[P],Ee)}return ve}function Qc(p){return l0(p)?p:[]}function Jc(p){return typeof p=="function"?p:s0}function Vs(p,v){return tr(p)?p:Ji(p,v)?[p]:s1(Ui(p))}var k2=Ir;function ma(p,v,x){var P=p.length;return x=x===i?P:x,!v&&x>=P?p:sl(p,v,x)}var Zc=Es||function(p){return ji.clearTimeout(p)};function mc(p,v){if(v)return p.slice();var x=p.length,P=Hi?Hi(x):new p.constructor(x);return p.copy(P),P}function gc(p){var v=new p.constructor(p.byteLength);return new R0(v).set(new R0(p)),v}function hd(p,v){var x=v?gc(p.buffer):p.buffer;return new p.constructor(x,p.byteOffset,p.byteLength)}function Eh(p){var v=new p.constructor(p.source,ko.exec(p));return v.lastIndex=p.lastIndex,v}function Cf(p){return Rr?xn(Rr.call(p)):{}}function $c(p,v){var x=v?gc(p.buffer):p.buffer;return new p.constructor(x,p.byteOffset,p.length)}function Dh(p,v){if(p!==v){var x=p!==i,P=p===null,W=p===p,ee=Bl(p),ve=v!==i,Ee=v===null,Ie=v===v,_t=Bl(v);if(!Ee&&!_t&&!ee&&p>v||ee&&ve&&Ie&&!Ee&&!_t||P&&ve&&Ie||!x&&Ie||!W)return 1;if(!P&&!ee&&!_t&&p<v||_t&&x&&W&&!P&&!ee||Ee&&x&&W||!ve&&W||!Ie)return-1}return 0}function am(p,v,x){for(var P=-1,W=p.criteria,ee=v.criteria,ve=W.length,Ee=x.length;++P<ve;){var Ie=Dh(W[P],ee[P]);if(Ie){if(P>=Ee)return Ie;var _t=x[P];return Ie*(_t=="desc"?-1:1)}}return p.index-v.index}function Gs(p,v,x,P){for(var W=-1,ee=p.length,ve=x.length,Ee=-1,Ie=v.length,_t=ni(ee-ve,0),St=Ye(Ie+_t),Rt=!P;++Ee<Ie;)St[Ee]=v[Ee];for(;++W<ve;)(Rt||W<ee)&&(St[x[W]]=p[W]);for(;_t--;)St[Ee++]=p[W++];return St}function ga(p,v,x,P){for(var W=-1,ee=p.length,ve=-1,Ee=x.length,Ie=-1,_t=v.length,St=ni(ee-Ee,0),Rt=Ye(St+_t),on=!P;++W<St;)Rt[W]=p[W];for(var kn=W;++Ie<_t;)Rt[kn+Ie]=v[Ie];for(;++ve<Ee;)(on||W<ee)&&(Rt[kn+x[ve]]=p[W++]);return Rt}function iu(p,v){var x=-1,P=p.length;for(v||(v=Ye(P));++x<P;)v[x]=p[x];return v}function M0(p,v,x,P){var W=!x;x||(x={});for(var ee=-1,ve=v.length;++ee<ve;){var Ee=v[ee],Ie=P?P(x[Ee],p[Ee],Ee,x,p):i;Ie===i&&(Ie=p[Ee]),W?Gu(x,Ee,Ie):Ts(x,Ee,Ie)}return x}function o0(p,v){return M0(p,oo(p),v)}function rs(p,v){return M0(p,Xa(p),v)}function Ka(p,v){return function(x,P){var W=tr(x)?qe:Ho,ee=v?v():{};return W(x,p,Vn(P,2),ee)}}function uo(p){return Ir(function(v,x){var P=-1,W=x.length,ee=W>1?x[W-1]:i,ve=W>2?x[2]:i;for(ee=p.length>3&&typeof ee=="function"?(W--,ee):i,ve&&lo(x[0],x[1],ve)&&(ee=W<3?i:ee,W=1),v=xn(v);++P<W;){var Ee=x[P];Ee&&p(v,Ee,P,ee)}return v})}function fl(p,v){return function(x,P){if(x==null)return x;if(!hl(x))return p(x,P);for(var W=x.length,ee=v?W:-1,ve=xn(x);(v?ee--:++ee<W)&&P(ve[ee],ee,ve)!==!1;);return x}}function yc(p){return function(v,x,P){for(var W=-1,ee=xn(v),ve=P(v),Ee=ve.length;Ee--;){var Ie=ve[p?Ee:++W];if(x(ee[Ie],Ie,ee)===!1)break}return v}}function L2(p,v,x){var P=v&m,W=Af(p);function ee(){var ve=this&&this!==ji&&this instanceof ee?W:p;return ve.apply(P?x:this,arguments)}return ee}function wh(p){return function(v){v=Ui(v);var x=Bo(v)?ei(v):i,P=x?x[0]:v.charAt(0),W=x?ma(x,1).join(""):v.slice(1);return P[p]()+W}}function xf(p){return function(v){return dr(Dv(Yd(v).replace(ua,"")),p,"")}}function Af(p){return function(){var v=arguments;switch(v.length){case 0:return new p;case 1:return new p(v[0]);case 2:return new p(v[0],v[1]);case 3:return new p(v[0],v[1],v[2]);case 4:return new p(v[0],v[1],v[2],v[3]);case 5:return new p(v[0],v[1],v[2],v[3],v[4]);case 6:return new p(v[0],v[1],v[2],v[3],v[4],v[5]);case 7:return new p(v[0],v[1],v[2],v[3],v[4],v[5],v[6])}var x=ri(p.prototype),P=p.apply(x,v);return bu(P)?P:x}}function e1(p,v,x){var P=Af(p);function W(){for(var ee=arguments.length,ve=Ye(ee),Ee=ee,Ie=yr(W);Ee--;)ve[Ee]=arguments[Ee];var _t=ee<3&&ve[0]!==Ie&&ve[ee-1]!==Ie?[]:C0(ve,Ie);if(ee-=_t.length,ee<x)return wi(p,v,ya,W.placeholder,i,ve,_t,i,i,x-ee);var St=this&&this!==ji&&this instanceof W?P:p;return ue(St,this,ve)}return W}function Ll(p){return function(v,x,P){var W=xn(v);if(!hl(v)){var ee=Vn(x,3);v=L0(v),x=function(Ee){return ee(W[Ee],Ee,W)}}var ve=p(v,x,P);return ve>-1?W[ee?v[ve]:ve]:i}}function t1(p){return cl(function(v){var x=v.length,P=x,W=Vr.prototype.thru;for(p&&v.reverse();P--;){var ee=v[P];if(typeof ee!="function")throw new ti(_);if(W&&!ve&&qo(ee)=="wrapper")var ve=new Vr([],!0)}for(P=ve?P:x;++P<x;){ee=v[P];var Ee=qo(ee),Ie=Ee=="wrapper"?qn(ee):i;Ie&&Lf(Ie[0])&&Ie[1]==(me|se|_e|ie)&&!Ie[4].length&&Ie[9]==1?ve=ve[qo(Ie[0])].apply(ve,Ie[3]):ve=ee.length==1&&Lf(ee)?ve[Ee]():ve.thru(ee)}return function(){var _t=arguments,St=_t[0];if(ve&&_t.length==1&&tr(St))return ve.plant(St).value();for(var Rt=0,on=x?v[Rt].apply(this,_t):St;++Rt<x;)on=v[Rt].call(this,on);return on}})}function ya(p,v,x,P,W,ee,ve,Ee,Ie,_t){var St=v&me,Rt=v&m,on=v&he,kn=v&(se|fe),rr=v&Oe,br=on?i:Af(p);function ar(){for(var ui=arguments.length,di=Ye(ui),zl=ui;zl--;)di[zl]=arguments[zl];if(kn)var Zi=yr(ar),so=mf(di,Zi);if(P&&(di=Gs(di,P,W,kn)),ee&&(di=ga(di,ee,ve,kn)),ui-=so,kn&&ui<_t){var a0=C0(di,Zi);return wi(p,v,ya,ar.placeholder,x,di,a0,Ee,Ie,_t-ui)}var Ms=Rt?x:this,Co=on?Ms[p]:p;return ui=di.length,Ee?di=u1(di,Ee):rr&&ui>1&&di.reverse(),St&&Ie<ui&&(di.length=Ie),this&&this!==ji&&this instanceof ar&&(Co=br||Af(Co)),Co.apply(Ms,di)}return ar}function vd(p,v){return function(x,P){return z0(x,p,v(P),{})}}function md(p,v){return function(x,P){var W;if(x===i&&P===i)return v;if(x!==i&&(W=x),P!==i){if(W===i)return P;typeof x=="string"||typeof P=="string"?(x=al(x),P=al(P)):(x=yh(x),P=yh(P)),W=p(x,P)}return W}}function Fr(p){return cl(function(v){return v=Nt(v,_i(Vn())),Ir(function(x){var P=this;return p(v,function(W){return ue(W,P,x)})})})}function Ea(p,v){v=v===i?" ":al(v);var x=v.length;if(x<2)return x?Yc(v,p):v;var P=Yc(v,$u(p/tu(v)));return Bo(v)?ma(ei(P),0,p).join(""):P.slice(0,p)}function N2(p,v,x,P){var W=v&m,ee=Af(p);function ve(){for(var Ee=-1,Ie=arguments.length,_t=-1,St=P.length,Rt=Ye(St+Ie),on=this&&this!==ji&&this instanceof ve?ee:p;++_t<St;)Rt[_t]=P[_t];for(;Ie--;)Rt[_t++]=arguments[++Ee];return ue(on,W?x:this,Rt)}return ve}function n1(p){return function(v,x,P){return P&&typeof P!="number"&&lo(v,x,P)&&(x=P=i),v=Oa(v),x===i?(x=v,v=0):x=Oa(x),P=P===i?v<x?1:-1:Oa(P),C2(v,x,P,p)}}function gd(p){return function(v,x){return typeof v=="string"&&typeof x=="string"||(v=vl(v),x=vl(x)),p(v,x)}}function wi(p,v,x,P,W,ee,ve,Ee,Ie,_t){var St=v&se,Rt=St?ve:i,on=St?i:ve,kn=St?ee:i,rr=St?i:ee;v|=St?_e:ce,v&=~(St?ce:_e),v&De||(v&=~(m|he));var br=[p,v,W,kn,Rt,rr,on,Ee,Ie,_t],ar=x.apply(i,br);return Lf(p)&&o1(ar,br),ar.placeholder=P,I2(ar,p,v)}function F2(p){var v=Wr[p];return function(x,P){if(x=vl(x),P=P==null?0:Kn(Mr(P),292),P&&nu(x)){var W=(Ui(x)+"e").split("e"),ee=v(W[0]+"e"+(+W[1]+P));return W=(Ui(ee)+"e").split("e"),+(W[0]+"e"+(+W[1]-P))}return v(x)}}var fm=Re&&1/$0(new Re([,-0]))[1]==It?function(p){return new Re(p)}:bp;function yd(p){return function(v){var x=Iu(v);return x==w?Tu(v):x==Qt?Uo(v):Z0(v,p(v))}}function hn(p,v,x,P,W,ee,ve,Ee){var Ie=v&he;if(!Ie&&typeof p!="function")throw new ti(_);var _t=P?P.length:0;if(_t||(v&=~(_e|ce),P=W=i),ve=ve===i?ve:ni(Mr(ve),0),Ee=Ee===i?Ee:Mr(Ee),_t-=W?W.length:0,v&ce){var St=P,Rt=W;P=W=i}var on=Ie?i:qn(p),kn=[p,v,x,P,W,St,Rt,ee,ve,Ee];if(on&&wc(kn,on),p=kn[0],v=kn[1],x=kn[2],P=kn[3],W=kn[4],Ee=kn[9]=kn[9]===i?Ie?0:p.length:ni(kn[9]-_t,0),!Ee&&v&(se|fe)&&(v&=~(se|fe)),!v||v==m)var rr=L2(p,v,x);else v==se||v==fe?rr=e1(p,v,Ee):(v==_e||v==(m|_e))&&!W.length?rr=N2(p,v,x,P):rr=ya.apply(i,kn);var br=on?Kc:o1;return I2(br(rr,kn),p,v)}function Rf(p,v,x,P){return p===i||So(p,An[x])&&!li.call(P,x)?v:p}function Of(p,v,x,P,W,ee){return bu(p)&&bu(v)&&(ee.set(v,p),sd(p,v,i,Of,ee),ee.delete(v)),p}function cm(p){return xc(p)?i:p}function Mf(p,v,x,P,W,ee){var ve=x&q,Ee=p.length,Ie=v.length;if(Ee!=Ie&&!(ve&&Ie>Ee))return!1;var _t=ee.get(p),St=ee.get(v);if(_t&&St)return _t==v&&St==p;var Rt=-1,on=!0,kn=x&ne?new go:i;for(ee.set(p,v),ee.set(v,p);++Rt<Ee;){var rr=p[Rt],br=v[Rt];if(P)var ar=ve?P(br,rr,Rt,v,p,ee):P(rr,br,Rt,p,v,ee);if(ar!==i){if(ar)continue;on=!1;break}if(kn){if(!Cr(v,function(ui,di){if(!rl(kn,di)&&(rr===ui||W(rr,ui,x,P,ee)))return kn.push(di)})){on=!1;break}}else if(!(rr===br||W(rr,br,x,P,ee))){on=!1;break}}return ee.delete(p),ee.delete(v),on}function Sh(p,v,x,P,W,ee,ve){switch(x){case $o:if(p.byteLength!=v.byteLength||p.byteOffset!=v.byteOffset)return!1;p=p.buffer,v=v.buffer;case Zo:return!(p.byteLength!=v.byteLength||!ee(new R0(p),new R0(v)));case an:case Mn:case jt:return So(+p,+v);case ln:return p.name==v.name&&p.message==v.message;case zr:case wu:return p==v+"";case w:var Ee=Tu;case Qt:var Ie=P&q;if(Ee||(Ee=$0),p.size!=v.size&&!Ie)return!1;var _t=ve.get(p);if(_t)return _t==v;P|=ne,ve.set(p,v);var St=Mf(Ee(p),Ee(v),P,W,ee,ve);return ve.delete(p),St;case d0:if(Rr)return Rr.call(p)==Rr.call(v)}return!1}function dm(p,v,x,P,W,ee){var ve=x&q,Ee=r1(p),Ie=Ee.length,_t=r1(v),St=_t.length;if(Ie!=St&&!ve)return!1;for(var Rt=Ie;Rt--;){var on=Ee[Rt];if(!(ve?on in v:li.call(v,on)))return!1}var kn=ee.get(p),rr=ee.get(v);if(kn&&rr)return kn==v&&rr==p;var br=!0;ee.set(p,v),ee.set(v,p);for(var ar=ve;++Rt<Ie;){on=Ee[Rt];var ui=p[on],di=v[on];if(P)var zl=ve?P(di,ui,on,v,p,ee):P(ui,di,on,p,v,ee);if(!(zl===i?ui===di||W(ui,di,x,P,ee):zl)){br=!1;break}ar||(ar=on=="constructor")}if(br&&!ar){var Zi=p.constructor,so=v.constructor;Zi!=so&&"constructor"in p&&"constructor"in v&&!(typeof Zi=="function"&&Zi instanceof Zi&&typeof so=="function"&&so instanceof so)&&(br=!1)}return ee.delete(p),ee.delete(v),br}function cl(p){return l1(P2(p,i,f1),p+"")}function r1(p){return pe(p,L0,oo)}function sr(p){return pe(p,dn,Xa)}var qn=Jt?function(p){return Jt.get(p)}:bp;function qo(p){for(var v=p.name+"",x=On[v],P=li.call(On,v)?x.length:0;P--;){var W=x[P],ee=W.func;if(ee==null||ee==p)return W.name}return v}function yr(p){var v=li.call(Y,"placeholder")?Y:p;return v.placeholder}function Vn(){var p=Y.iteratee||Np;return p=p===Np?Cu:p,arguments.length?p(arguments[0],arguments[1]):p}function dl(p,v){var x=p.__data__;return Yr(v)?x[typeof v=="string"?"string":"hash"]:x.map}function jn(p){for(var v=L0(p),x=v.length;x--;){var P=v[x],W=p[P];v[x]=[P,W,Ff(W)]}return v}function Eo(p,v){var x=bo(p,v);return ur(x)?x:i}function _c(p){var v=li.call(p,Zu),x=p[Zu];try{p[Zu]=i;var P=!0}catch(ee){}var W=Vu.call(p);return P&&(v?p[Zu]=x:delete p[Zu]),W}var oo=Ar?function(p){return p==null?[]:(p=xn(p),Pt(Ar(p),function(v){return B0.call(p,v)}))}:Up,Xa=Ar?function(p){for(var v=[];p;)Dn(v,oo(p)),p=il(p);return v}:Up,Iu=gt;(ae&&Iu(new ae(new ArrayBuffer(1)))!=$o||re&&Iu(new re)!=w||Fe&&Iu(Fe.resolve())!=jr||Re&&Iu(new Re)!=Qt||st&&Iu(new st)!=Jo)&&(Iu=function(p){var v=gt(p),x=v==vr?p.constructor:i,P=x?Da(x):"";if(P)switch(P){case Sn:return $o;case _n:return w;case Tn:return jr;case ir:return Qt;case Bt:return Jo}return v});function is(p,v,x){for(var P=-1,W=x.length;++P<W;){var ee=x[P],ve=ee.size;switch(ee.type){case"drop":p+=ve;break;case"dropRight":v-=ve;break;case"take":v=Kn(v,p+ve);break;case"takeRight":p=ni(p,v-ve);break}}return{start:p,end:v}}function kf(p){var v=p.match(Wt);return v?v[1].split(Ru):[]}function Ec(p,v,x){v=Vs(v,p);for(var P=-1,W=v.length,ee=!1;++P<W;){var ve=Fl(v[P]);if(!(ee=p!=null&&x(p,ve)))break;p=p[ve]}return ee||++P!=W?ee:(W=p==null?0:p.length,!!W&&Pd(W)&&Do(ve,W)&&(tr(p)||pl(p)))}function xs(p){var v=p.length,x=new p.constructor(v);return v&&typeof p[0]=="string"&&li.call(p,"index")&&(x.index=p.index,x.input=p.input),x}function Dc(p){return typeof p.constructor=="function"&&!Nf(p)?ri(il(p)):{}}function Th(p,v,x){var P=p.constructor;switch(v){case Zo:return gc(p);case an:case Mn:return new P(+p);case $o:return hd(p,x);case qt:case Ai:case su:case mi:case wr:case el:case Y0:case Uu:case K0:return $c(p,x);case w:return new P;case jt:case wu:return new P(p);case zr:return Eh(p);case Qt:return new P;case d0:return Cf(p)}}function cn(p,v){var x=v.length;if(!x)return p;var P=x-1;return v[P]=(x>1?"& ":"")+v[P],v=v.join(x>2?", ":" "),p.replace(yi,`{
-/* [wrapped with `+v+`] */
-`)}function us(p){return tr(p)||pl(p)||!!(vo&&p&&p[vo])}function Do(p,v){var x=typeof p;return v=v==null?Xt:v,!!v&&(x=="number"||x!="symbol"&&bs.test(p))&&p>-1&&p%1==0&&p<v}function lo(p,v,x){if(!bu(x))return!1;var P=typeof v;return(P=="number"?hl(x)&&Do(v,x.length):P=="string"&&v in x)?So(x[v],p):!1}function Ji(p,v){if(tr(p))return!1;var x=typeof p;return x=="number"||x=="symbol"||x=="boolean"||p==null||Bl(p)?!0:Ri.test(p)||!Hr.test(p)||v!=null&&p in xn(v)}function Yr(p){var v=typeof p;return v=="string"||v=="number"||v=="symbol"||v=="boolean"?p!=="__proto__":p===null}function Lf(p){var v=qo(p),x=Y[v];if(typeof x!="function"||!(v in ft.prototype))return!1;if(p===x)return!0;var P=qn(x);return!!P&&p===P[0]}function pm(p){return!!Hs&&Hs in p}var Nl=x0?Aa:jp;function Nf(p){var v=p&&p.constructor,x=typeof v=="function"&&v.prototype||An;return p===x}function Ff(p){return p===p&&!bu(p)}function _d(p,v){return function(x){return x==null?!1:x[p]===v&&(v!==i||p in xn(x))}}function Ed(p){var v=Rd(p,function(P){return x.size===N&&x.clear(),P}),x=v.cache;return v}function wc(p,v){var x=p[1],P=v[1],W=x|P,ee=W<(m|he|me),ve=P==me&&x==se||P==me&&x==ie&&p[7].length<=v[8]||P==(me|ie)&&v[7].length<=v[8]&&x==se;if(!(ee||ve))return p;P&m&&(p[2]=v[2],W|=x&m?0:De);var Ee=v[3];if(Ee){var Ie=p[3];p[3]=Ie?Gs(Ie,Ee,v[4]):Ee,p[4]=Ie?C0(p[3],M):v[4]}return Ee=v[5],Ee&&(Ie=p[5],p[5]=Ie?ga(Ie,Ee,v[6]):Ee,p[6]=Ie?C0(p[5],M):v[6]),Ee=v[7],Ee&&(p[7]=Ee),P&me&&(p[8]=p[8]==null?v[8]:Kn(p[8],v[8])),p[9]==null&&(p[9]=v[9]),p[0]=v[0],p[1]=W,p}function i1(p){var v=[];if(p!=null)for(var x in xn(p))v.push(x);return v}function Qa(p){return Vu.call(p)}function P2(p,v,x){return v=ni(v===i?p.length-1:v,0),function(){for(var P=arguments,W=-1,ee=ni(P.length-v,0),ve=Ye(ee);++W<ee;)ve[W]=P[v+W];W=-1;for(var Ee=Ye(v+1);++W<v;)Ee[W]=P[W];return Ee[v]=x(ve),ue(p,this,Ee)}}function Dd(p,v){return v.length<2?p:J(p,sl(v,0,-1))}function u1(p,v){for(var x=p.length,P=Kn(v.length,x),W=iu(p);P--;){var ee=v[P];p[P]=Do(ee,x)?W[ee]:i}return p}function Pf(p,v){if(!(v==="constructor"&&typeof p[v]=="function")&&v!="__proto__")return p[v]}var o1=wd(Kc),Ja=_f||function(p,v){return ji.setTimeout(p,v)},l1=wd(x2);function I2(p,v,x){var P=v+"";return l1(p,cn(P,Ch(kf(P),x)))}function wd(p){var v=0,x=0;return function(){var P=e0(),W=Dt-(P-x);if(x=P,W>0){if(++v>=at)return arguments[0]}else v=0;return p.apply(i,arguments)}}function Sc(p,v){var x=-1,P=p.length,W=P-1;for(v=v===i?P:v;++x<v;){var ee=fd(x,W),ve=p[ee];p[ee]=p[x],p[x]=ve}return p.length=v,p}var s1=Ed(function(p){var v=[];return p.charCodeAt(0)===46&&v.push(""),p.replace(X0,function(x,P,W,ee){v.push(W?ee.replace(Yi,"$1"):P||x)}),v});function Fl(p){if(typeof p=="string"||Bl(p))return p;var v=p+"";return v=="0"&&1/p==-It?"-0":v}function Da(p){if(p!=null){try{return Fu.call(p)}catch(v){}try{return p+""}catch(v){}}return""}function Ch(p,v){return nt(He,function(x){var P="_."+x[0];v&x[1]&&!sn(p,P)&&p.push(P)}),p.sort()}function b2(p){if(p instanceof ft)return p.clone();var v=new Vr(p.__wrapped__,p.__chain__);return v.__actions__=iu(p.__actions__),v.__index__=p.__index__,v.__values__=p.__values__,v}function B2(p,v,x){(x?lo(p,v,x):v===i)?v=1:v=ni(Mr(v),0);var P=p==null?0:p.length;if(!P||v<1)return[];for(var W=0,ee=0,ve=Ye($u(P/v));W<P;)ve[ee++]=sl(p,W,W+=v);return ve}function xh(p){for(var v=-1,x=p==null?0:p.length,P=0,W=[];++v<x;){var ee=p[v];ee&&(W[P++]=ee)}return W}function Sd(){var p=arguments.length;if(!p)return[];for(var v=Ye(p-1),x=arguments[0],P=p;P--;)v[P-1]=arguments[P];return Dn(tr(x)?iu(x):[x],qi(v,1))}var Ah=Ir(function(p,v){return l0(p)?Ol(p,qi(v,1,l0,!0)):[]}),Pl=Ir(function(p,v){var x=Il(v);return l0(x)&&(x=i),l0(p)?Ol(p,qi(v,1,l0,!0),Vn(x,2)):[]}),os=Ir(function(p,v){var x=Il(v);return l0(x)&&(x=i),l0(p)?Ol(p,qi(v,1,l0,!0),i,x):[]});function As(p,v,x){var P=p==null?0:p.length;return P?(v=x||v===i?1:Mr(v),sl(p,v<0?0:v,P)):[]}function Ys(p,v,x){var P=p==null?0:p.length;return P?(v=x||v===i?1:Mr(v),v=P-v,sl(p,0,v<0?0:v)):[]}function U2(p,v){return p&&p.length?vc(p,Vn(v,3),!0,!0):[]}function Rh(p,v){return p&&p.length?vc(p,Vn(v,3),!0):[]}function j2(p,v,x,P){var W=p==null?0:p.length;return W?(x&&typeof x!="number"&&lo(p,v,x)&&(x=0,P=W),hc(p,v,x,P)):[]}function z2(p,v,x){var P=p==null?0:p.length;if(!P)return-1;var W=x==null?0:Mr(x);return W<0&&(W=ni(P+W,0)),it(p,Vn(v,3),W)}function a1(p,v,x){var P=p==null?0:p.length;if(!P)return-1;var W=P-1;return x!==i&&(W=Mr(x),W=x<0?ni(P+W,0):Kn(W,P-1)),it(p,Vn(v,3),W,!0)}function f1(p){var v=p==null?0:p.length;return v?qi(p,1):[]}function Oh(p){var v=p==null?0:p.length;return v?qi(p,It):[]}function H2(p,v){var x=p==null?0:p.length;return x?(v=v===i?1:Mr(v),qi(p,v)):[]}function q2(p){for(var v=-1,x=p==null?0:p.length,P={};++v<x;){var W=p[v];P[W[0]]=W[1]}return P}function Rs(p){return p&&p.length?p[0]:i}function Za(p,v,x){var P=p==null?0:p.length;if(!P)return-1;var W=x==null?0:Mr(x);return W<0&&(W=ni(P+W,0)),Et(p,v,W)}function Mh(p){var v=p==null?0:p.length;return v?sl(p,0,-1):[]}var pu=Ir(function(p){var v=Nt(p,Qc);return v.length&&v[0]===p[0]?du(v):[]}),c1=Ir(function(p){var v=Il(p),x=Nt(p,Qc);return v===Il(x)?v=i:x.pop(),x.length&&x[0]===p[0]?du(x,Vn(v,2)):[]}),kh=Ir(function(p){var v=Il(p),x=Nt(p,Qc);return v=typeof v=="function"?v:i,v&&x.pop(),x.length&&x[0]===p[0]?du(x,i,v):[]});function d1(p,v){return p==null?"":cu.call(p,v)}function Il(p){var v=p==null?0:p.length;return v?p[v-1]:i}function Lh(p,v,x){var P=p==null?0:p.length;if(!P)return-1;var W=P;return x!==i&&(W=Mr(x),W=W<0?ni(P+W,0):Kn(W,P-1)),v===v?es(p,v,W):it(p,Ft,W,!0)}function W2(p,v){return p&&p.length?Gc(p,Mr(v)):i}var Nh=Ir(p1);function p1(p,v){return p&&p.length&&v&&v.length?kl(p,v):p}function bl(p,v,x){return p&&p.length&&v&&v.length?kl(p,v,Vn(x,2)):p}function $a(p,v,x){return p&&p.length&&v&&v.length?kl(p,v,i,x):p}var wa=cl(function(p,v){var x=p==null?0:p.length,P=Wa(p,v);return ad(p,Nt(v,function(W){return Do(W,x)?+W:W}).sort(Dh)),P});function V2(p,v){var x=[];if(!(p&&p.length))return x;var P=-1,W=[],ee=p.length;for(v=Vn(v,3);++P<ee;){var ve=p[P];v(ve,P,p)&&(x.push(ve),W.push(P))}return ad(p,W),x}function G2(p){return p==null?p:Fn.call(p)}function hm(p,v,x){var P=p==null?0:p.length;return P?(x&&typeof x!="number"&&lo(p,v,x)?(v=0,x=P):(v=v==null?0:Mr(v),x=x===i?P:Mr(x)),sl(p,v,x)):[]}function Y2(p,v){return Tf(p,v)}function Fh(p,v,x){return Xc(p,v,Vn(x,2))}function Ph(p,v){var x=p==null?0:p.length;if(x){var P=Tf(p,v);if(P<x&&So(p[P],v))return P}return-1}function K2(p,v){return Tf(p,v,!0)}function vm(p,v,x){return Xc(p,v,Vn(x,2),!0)}function mm(p,v){var x=p==null?0:p.length;if(x){var P=Tf(p,v,!0)-1;if(So(p[P],v))return P}return-1}function Ih(p){return p&&p.length?A2(p):[]}function gm(p,v){return p&&p.length?A2(p,Vn(v,2)):[]}function X2(p){var v=p==null?0:p.length;return v?sl(p,1,v):[]}function h1(p,v,x){return p&&p.length?(v=x||v===i?1:Mr(v),sl(p,0,v<0?0:v)):[]}function v1(p,v,x){var P=p==null?0:p.length;return P?(v=x||v===i?1:Mr(v),v=P-v,sl(p,v<0?0:v,P)):[]}function m1(p,v){return p&&p.length?vc(p,Vn(v,3),!1,!0):[]}function Sa(p,v){return p&&p.length?vc(p,Vn(v,3)):[]}var Q2=Ir(function(p){return va(qi(p,1,l0,!0))}),Ks=Ir(function(p){var v=Il(p);return l0(v)&&(v=i),va(qi(p,1,l0,!0),Vn(v,2))}),Xs=Ir(function(p){var v=Il(p);return v=typeof v=="function"?v:i,va(qi(p,1,l0,!0),i,v)});function Qs(p){return p&&p.length?va(p):[]}function J2(p,v){return p&&p.length?va(p,Vn(v,2)):[]}function Ta(p,v){return v=typeof v=="function"?v:i,p&&p.length?va(p,i,v):[]}function g1(p){if(!(p&&p.length))return[];var v=0;return p=Pt(p,function(x){if(l0(x))return v=ni(x.length,v),!0}),T0(v,function(x){return Nt(p,fn(x))})}function Td(p,v){if(!(p&&p.length))return[];var x=g1(p);return v==null?x:Nt(x,function(P){return ue(v,i,P)})}var Tc=Ir(function(p,v){return l0(p)?Ol(p,v):[]}),Z2=Ir(function(p){return M2(Pt(p,l0))}),wo=Ir(function(p){var v=Il(p);return l0(v)&&(v=i),M2(Pt(p,l0),Vn(v,2))}),bh=Ir(function(p){var v=Il(p);return v=typeof v=="function"?v:i,M2(Pt(p,l0),i,v)}),Bh=Ir(g1);function Uh(p,v){return pd(p||[],v||[],Ts)}function jh(p,v){return pd(p||[],v||[],Ya)}var ym=Ir(function(p){var v=p.length,x=v>1?p[v-1]:i;return x=typeof x=="function"?(p.pop(),x):i,Td(p,x)});function zh(p){var v=Y(p);return v.__chain__=!0,v}function Hh(p,v){return v(p),p}function y1(p,v){return v(p)}var $2=cl(function(p){var v=p.length,x=v?p[0]:0,P=this.__wrapped__,W=function(ee){return Wa(ee,p)};return v>1||this.__actions__.length||!(P instanceof ft)||!Do(x)?this.thru(W):(P=P.slice(x,+x+(v?1:0)),P.__actions__.push({func:y1,args:[W],thisArg:i}),new Vr(P,this.__chain__).thru(function(ee){return v&&!ee.length&&ee.push(i),ee}))});function qh(){return zh(this)}function ep(){return new Vr(this.value(),this.__chain__)}function Wh(){this.__values__===i&&(this.__values__=fv(this.value()));var p=this.__index__>=this.__values__.length,v=p?i:this.__values__[this.__index__++];return{done:p,value:v}}function _m(){return this}function Em(p){for(var v,x=this;x instanceof ii;){var P=b2(x);P.__index__=0,P.__values__=i,v?W.__wrapped__=P:v=P;var W=P;x=x.__wrapped__}return W.__wrapped__=p,v}function If(){var p=this.__wrapped__;if(p instanceof ft){var v=p;return this.__actions__.length&&(v=new ft(this)),v=v.reverse(),v.__actions__.push({func:y1,args:[G2],thisArg:i}),new Vr(v,this.__chain__)}return this.thru(G2)}function bf(){return _h(this.__wrapped__,this.__actions__)}var Cd=Ka(function(p,v,x){li.call(p,x)?++p[x]:Gu(p,x,1)});function Dm(p,v,x){var P=tr(p)?Mt:od;return x&&lo(p,v,x)&&(v=i),P(p,Vn(v,3))}function tp(p,v){var x=tr(p)?Pt:Vc;return x(p,Vn(v,3))}var xd=Ll(z2),np=Ll(a1);function Vh(p,v){return qi(_1(p,v),1)}function rp(p,v){return qi(_1(p,v),It)}function Gh(p,v,x){return x=x===i?1:Mr(x),qi(_1(p,v),x)}function Yh(p,v){var x=tr(p)?nt:Cs;return x(p,Vn(v,3))}function ip(p,v){var x=tr(p)?Ct:pa;return x(p,Vn(v,3))}var wm=Ka(function(p,v,x){li.call(p,x)?p[x].push(v):Gu(p,x,[v])});function Sm(p,v,x,P){p=hl(p)?p:Nc(p),x=x&&!P?Mr(x):0;var W=p.length;return x<0&&(x=ni(W+x,0)),S1(p)?x<=W&&p.indexOf(v,x)>-1:!!W&&Et(p,v,x)>-1}var Tm=Ir(function(p,v,x){var P=-1,W=typeof v=="function",ee=hl(p)?Ye(p.length):[];return Cs(p,function(ve){ee[++P]=W?ue(v,ve,x):Ml(ve,v,x)}),ee}),Kh=Ka(function(p,v,x){Gu(p,x,v)});function _1(p,v){var x=tr(p)?Nt:S2;return x(p,Vn(v,3))}function Cm(p,v,x,P){return p==null?[]:(tr(v)||(v=v==null?[]:[v]),x=P?i:x,tr(x)||(x=x==null?[]:[x]),yo(p,v,x))}var up=Ka(function(p,v,x){p[x?0:1].push(v)},function(){return[[],[]]});function op(p,v,x){var P=tr(p)?dr:Sr,W=arguments.length<3;return P(p,Vn(v,4),x,W,Cs)}function xm(p,v,x){var P=tr(p)?er:Sr,W=arguments.length<3;return P(p,Vn(v,4),x,W,pa)}function Am(p,v){var x=tr(p)?Pt:Vc;return x(p,Od(Vn(v,3)))}function Xh(p){var v=tr(p)?Ha:cd;return v(p)}function Rm(p,v,x){(x?lo(p,v,x):v===i)?v=1:v=Mr(v);var P=tr(p)?qa:dd;return P(p,v)}function Om(p){var v=tr(p)?da:ll;return v(p)}function lp(p){if(p==null)return 0;if(hl(p))return S1(p)?tu(p):p.length;var v=Iu(p);return v==w||v==Qt?p.size:Va(p).length}function sp(p,v,x){var P=tr(p)?Cr:gh;return x&&lo(p,v,x)&&(v=i),P(p,Vn(v,3))}var Ca=Ir(function(p,v){if(p==null)return[];var x=v.length;return x>1&&lo(p,v[0],v[1])?v=[]:x>2&&lo(v[0],v[1],v[2])&&(v=[v[0]]),yo(p,qi(v,1),[])}),E1=fa||function(){return ji.Date.now()};function ap(p,v){if(typeof v!="function")throw new ti(_);return p=Mr(p),function(){if(--p<1)return v.apply(this,arguments)}}function Qh(p,v,x){return v=x?i:v,v=p&&v==null?p.length:v,hn(p,me,i,i,i,i,v)}function Ad(p,v){var x;if(typeof v!="function")throw new ti(_);return p=Mr(p),function(){return--p>0&&(x=v.apply(this,arguments)),p<=1&&(v=i),x}}var D1=Ir(function(p,v,x){var P=m;if(x.length){var W=C0(x,yr(D1));P|=_e}return hn(p,P,v,x,W)}),Jh=Ir(function(p,v,x){var P=m|he;if(x.length){var W=C0(x,yr(Jh));P|=_e}return hn(v,P,p,x,W)});function fp(p,v,x){v=x?i:v;var P=hn(p,se,i,i,i,i,i,v);return P.placeholder=fp.placeholder,P}function Zh(p,v,x){v=x?i:v;var P=hn(p,fe,i,i,i,i,i,v);return P.placeholder=Zh.placeholder,P}function cp(p,v,x){var P,W,ee,ve,Ee,Ie,_t=0,St=!1,Rt=!1,on=!0;if(typeof p!="function")throw new ti(_);v=vl(v)||0,bu(x)&&(St=!!x.leading,Rt="maxWait"in x,ee=Rt?ni(vl(x.maxWait)||0,v):ee,on="trailing"in x?!!x.trailing:on);function kn(a0){var Ms=P,Co=W;return P=W=i,_t=a0,ve=p.apply(Co,Ms),ve}function rr(a0){return _t=a0,Ee=Ja(ui,v),St?kn(a0):ve}function br(a0){var Ms=a0-Ie,Co=a0-_t,kv=v-Ms;return Rt?Kn(kv,ee-Co):kv}function ar(a0){var Ms=a0-Ie,Co=a0-_t;return Ie===i||Ms>=v||Ms<0||Rt&&Co>=ee}function ui(){var a0=E1();if(ar(a0))return di(a0);Ee=Ja(ui,br(a0))}function di(a0){return Ee=i,on&&P?kn(a0):(P=W=i,ve)}function zl(){Ee!==i&&Zc(Ee),_t=0,P=Ie=W=Ee=i}function Zi(){return Ee===i?ve:di(E1())}function so(){var a0=E1(),Ms=ar(a0);if(P=arguments,W=this,Ie=a0,Ms){if(Ee===i)return rr(Ie);if(Rt)return Zc(Ee),Ee=Ja(ui,v),kn(Ie)}return Ee===i&&(Ee=Ja(ui,v)),ve}return so.cancel=zl,so.flush=Zi,so}var $h=Ir(function(p,v){return pc(p,1,v)}),ev=Ir(function(p,v,x){return pc(p,vl(v)||0,x)});function dp(p){return hn(p,Oe)}function Rd(p,v){if(typeof p!="function"||v!=null&&typeof v!="function")throw new ti(_);var x=function(){var P=arguments,W=v?v.apply(this,P):P[0],ee=x.cache;if(ee.has(W))return ee.get(W);var ve=p.apply(this,P);return x.cache=ee.set(W,ve)||ee,ve};return x.cache=new(Rd.Cache||U0),x}Rd.Cache=U0;function Od(p){if(typeof p!="function")throw new ti(_);return function(){var v=arguments;switch(v.length){case 0:return!p.call(this);case 1:return!p.call(this,v[0]);case 2:return!p.call(this,v[0],v[1]);case 3:return!p.call(this,v[0],v[1],v[2])}return!p.apply(this,v)}}function H0(p){return Ad(2,p)}var Md=k2(function(p,v){v=v.length==1&&tr(v[0])?Nt(v[0],_i(Vn())):Nt(qi(v,1),_i(Vn()));var x=v.length;return Ir(function(P){for(var W=-1,ee=Kn(P.length,x);++W<ee;)P[W]=v[W].call(this,P[W]);return ue(p,this,P)})}),xa=Ir(function(p,v){var x=C0(v,yr(xa));return hn(p,_e,i,v,x)}),ef=Ir(function(p,v){var x=C0(v,yr(ef));return hn(p,ce,i,v,x)}),kd=cl(function(p,v){return hn(p,ie,i,i,i,v)});function Ld(p,v){if(typeof p!="function")throw new ti(_);return v=v===i?v:Mr(v),Ir(p,v)}function pp(p,v){if(typeof p!="function")throw new ti(_);return v=v==null?0:ni(Mr(v),0),Ir(function(x){var P=x[v],W=ma(x,0,v);return P&&Dn(W,P),ue(p,this,W)})}function Nd(p,v,x){var P=!0,W=!0;if(typeof p!="function")throw new ti(_);return bu(x)&&(P="leading"in x?!!x.leading:P,W="trailing"in x?!!x.trailing:W),cp(p,v,{leading:P,maxWait:v,trailing:W})}function tv(p){return Qh(p,1)}function Mm(p,v){return xa(Jc(v),p)}function nv(){if(!arguments.length)return[];var p=arguments[0];return tr(p)?p:[p]}function hp(p){return j0(p,H)}function vp(p,v){return v=typeof v=="function"?v:i,j0(p,H,v)}function mp(p){return j0(p,T|H)}function km(p,v){return v=typeof v=="function"?v:i,j0(p,T|H,v)}function Lm(p,v){return v==null||Wc(p,v,L0(v))}function So(p,v){return p===v||p!==p&&v!==v}var Fd=gd(xt),Nm=gd(function(p,v){return p>=v}),pl=u0(function(){return arguments}())?u0:function(p){return Yu(p)&&li.call(p,"callee")&&!B0.call(p,"callee")},tr=Ye.isArray,Js=ye?_i(ye):We;function hl(p){return p!=null&&Pd(p.length)&&!Aa(p)}function l0(p){return Yu(p)&&hl(p)}function rv(p){return p===!0||p===!1||Yu(p)&&gt(p)==an}var Zs=no||jp,gp=Ae?_i(Ae):ze;function Fm(p){return Yu(p)&&p.nodeType===1&&!xc(p)}function iv(p){if(p==null)return!0;if(hl(p)&&(tr(p)||typeof p=="string"||typeof p.splice=="function"||Zs(p)||Ra(p)||pl(p)))return!p.length;var v=Iu(p);if(v==w||v==Qt)return!p.size;if(Nf(p))return!Va(p).length;for(var x in p)if(li.call(p,x))return!1;return!0}function yp(p,v){return lt(p,v)}function Pm(p,v,x){x=typeof x=="function"?x:i;var P=x?x(p,v):i;return P===i?lt(p,v,i,x):!!P}function _p(p){if(!Yu(p))return!1;var v=gt(p);return v==ln||v==lr||typeof p.message=="string"&&typeof p.name=="string"&&!xc(p)}function Cc(p){return typeof p=="number"&&nu(p)}function Aa(p){if(!bu(p))return!1;var v=gt(p);return v==Vt||v==Dr||v==nn||v==fr}function Ep(p){return typeof p=="number"&&p==Mr(p)}function Pd(p){return typeof p=="number"&&p>-1&&p%1==0&&p<=Xt}function bu(p){var v=typeof p;return p!=null&&(v=="object"||v=="function")}function Yu(p){return p!=null&&typeof p=="object"}var Dp=Z?_i(Z):Wn;function wp(p,v){return p===v||si(p,v,jn(v))}function uv(p,v,x){return x=typeof x=="function"?x:i,si(p,v,jn(v),x)}function Im(p){return ov(p)&&p!=+p}function bm(p){if(Nl(p))throw new Kt(c);return ur(p)}function Bm(p){return p===null}function Id(p){return p==null}function ov(p){return typeof p=="number"||Yu(p)&&gt(p)==jt}function xc(p){if(!Yu(p)||gt(p)!=vr)return!1;var v=il(p);if(v===null)return!0;var x=li.call(v,"constructor")&&v.constructor;return typeof x=="function"&&x instanceof x&&Fu.call(x)==aa}var w1=ke?_i(ke):ci;function Um(p){return Ep(p)&&p>=-Xt&&p<=Xt}var bd=Je?_i(Je):Qi;function S1(p){return typeof p=="string"||!tr(p)&&Yu(p)&&gt(p)==wu}function Bl(p){return typeof p=="symbol"||Yu(p)&&gt(p)==d0}var Ra=vt?_i(vt):Gr;function lv(p){return p===i}function jm(p){return Yu(p)&&Iu(p)==Jo}function sv(p){return Yu(p)&&gt(p)==Ps}var av=gd(ld),zm=gd(function(p,v){return p<=v});function fv(p){if(!p)return[];if(hl(p))return S1(p)?ei(p):iu(p);if(Pu&&p[Pu])return Qu(p[Pu]());var v=Iu(p),x=v==w?Tu:v==Qt?$0:Nc;return x(p)}function Oa(p){if(!p)return p===0?p:0;if(p=vl(p),p===It||p===-It){var v=p<0?-1:1;return v*rt}return p===p?p:0}function Mr(p){var v=Oa(p),x=v%1;return v===v?x?v-x:v:0}function Sp(p){return p?r0(Mr(p),0,de):0}function vl(p){if(typeof p=="number")return p;if(Bl(p))return X;if(bu(p)){var v=typeof p.valueOf=="function"?p.valueOf():p;p=bu(v)?v+"":v}if(typeof p!="string")return p===0?p:+p;p=Nu(p);var x=ao.test(p);return x||Lo.test(p)?Us(p.slice(2),x?2:8):ai.test(p)?X:+p}function yu(p){return M0(p,dn(p))}function T1(p){return p?r0(Mr(p),-Xt,Xt):p===0?p:0}function Ui(p){return p==null?"":al(p)}var Tp=uo(function(p,v){if(Nf(v)||hl(v)){M0(v,L0(v),p);return}for(var x in v)li.call(v,x)&&Ts(p,x,v[x])}),Bd=uo(function(p,v){M0(v,dn(v),p)}),To=uo(function(p,v,x,P){M0(v,dn(v),p,P)}),Os=uo(function(p,v,x,P){M0(v,L0(v),p,P)}),Bf=cl(Wa);function Ud(p,v){var x=ri(p);return v==null?x:Df(x,v)}var Cp=Ir(function(p,v){p=xn(p);var x=-1,P=v.length,W=P>2?v[2]:i;for(W&&lo(v[0],v[1],W)&&(P=1);++x<P;)for(var ee=v[x],ve=dn(ee),Ee=-1,Ie=ve.length;++Ee<Ie;){var _t=ve[Ee],St=p[_t];(St===i||So(St,An[_t])&&!li.call(p,_t))&&(p[_t]=ee[_t])}return p}),C1=Ir(function(p){return p.push(i,Of),ue(Mc,i,p)});function x1(p,v){return Nr(p,Vn(v,3),A)}function xp(p,v){return Nr(p,Vn(v,3),F)}function nr(p,v){return p==null?p:y(p,Vn(v,3),dn)}function ml(p,v){return p==null?p:g(p,Vn(v,3),dn)}function Gn(p,v){return p&&A(p,Vn(v,3))}function q0(p,v){return p&&F(p,Vn(v,3))}function k0(p){return p==null?[]:b(p,L0(p))}function jd(p){return p==null?[]:b(p,dn(p))}function Ul(p,v,x){var P=p==null?i:J(p,v);return P===i?x:P}function A1(p,v){return p!=null&&Ec(p,v,kt)}function Ac(p,v){return p!=null&&Ec(p,v,xr)}var Rc=vd(function(p,v,x){v!=null&&typeof v.toString!="function"&&(v=Vu.call(v)),p[v]=x},Jd(s0)),zd=vd(function(p,v,x){v!=null&&typeof v.toString!="function"&&(v=Vu.call(v)),li.call(p,v)?p[v].push(x):p[v]=[x]},Vn),Ap=Ir(Ml);function L0(p){return hl(p)?za(p):Va(p)}function dn(p){return hl(p)?za(p,!0):Ga(p)}function Hd(p,v){var x={};return v=Vn(v,3),A(p,function(P,W,ee){Gu(x,v(P,W,ee),P)}),x}function qd(p,v){var x={};return v=Vn(v,3),A(p,function(P,W,ee){Gu(x,W,v(P,W,ee))}),x}var Oc=uo(function(p,v,x){sd(p,v,x)}),Mc=uo(function(p,v,x,P){sd(p,v,x,P)}),kc=cl(function(p,v){var x={};if(p==null)return x;var P=!1;v=Nt(v,function(ee){return ee=Vs(ee,p),P||(P=ee.length>1),ee}),M0(p,sr(p),x),P&&(x=j0(x,T|B|H,cm));for(var W=v.length;W--;)R2(x,v[W]);return x});function R1(p,v){return tf(p,Od(Vn(v)))}var Rp=cl(function(p,v){return p==null?{}:vh(p,v)});function tf(p,v){if(p==null)return{};var x=Nt(sr(p),function(P){return[P]});return v=Vn(v),mh(p,x,function(P,W){return v(P,W[0])})}function Hm(p,v,x){v=Vs(v,p);var P=-1,W=v.length;for(W||(W=1,p=i);++P<W;){var ee=p==null?i:p[Fl(v[P])];ee===i&&(P=W,ee=x),p=Aa(ee)?ee.call(p):ee}return p}function Lc(p,v,x){return p==null?p:Ya(p,v,x)}function Wd(p,v,x,P){return P=typeof P=="function"?P:i,p==null?p:Ya(p,v,x,P)}var cv=yd(L0),O1=yd(dn);function Uf(p,v,x){var P=tr(p),W=P||Zs(p)||Ra(p);if(v=Vn(v,4),x==null){var ee=p&&p.constructor;W?x=P?new ee:[]:bu(p)?x=Aa(ee)?ri(il(p)):{}:x={}}return(W?nt:A)(p,function(ve,Ee,Ie){return v(x,ve,Ee,Ie)}),x}function jf(p,v){return p==null?!0:R2(p,v)}function M1(p,v,x){return p==null?p:O2(p,v,Jc(x))}function jl(p,v,x,P){return P=typeof P=="function"?P:i,p==null?p:O2(p,v,Jc(x),P)}function Nc(p){return p==null?[]:Po(p,L0(p))}function zf(p){return p==null?[]:Po(p,dn(p))}function qm(p,v,x){return x===i&&(x=v,v=i),x!==i&&(x=vl(x),x=x===x?x:0),v!==i&&(v=vl(v),v=v===v?v:0),r0(vl(p),v,x)}function gl(p,v,x){return v=Oa(v),x===i?(x=v,v=0):x=Oa(x),p=vl(p),i0(p,v,x)}function Vd(p,v,x){if(x&&typeof x!="boolean"&&lo(p,v,x)&&(v=x=i),x===i&&(typeof v=="boolean"?(x=v,v=i):typeof p=="boolean"&&(x=p,p=i)),p===i&&v===i?(p=0,v=1):(p=Oa(p),v===i?(v=p,p=0):v=Oa(v)),p>v){var P=p;p=v,v=P}if(x||p%1||v%1){var W=E0();return Kn(p+W*(v-p+Ba("1e-"+((W+"").length-1))),v)}return fd(p,v)}var Gd=xf(function(p,v,x){return v=v.toLowerCase(),p+(x?Wo(v):v)});function Wo(p){return kp(Ui(p).toLowerCase())}function Yd(p){return p=Ui(p),p&&p.replace($n,Io).replace(J0,"")}function Wm(p,v,x){p=Ui(p),v=al(v);var P=p.length;x=x===i?P:r0(Mr(x),0,P);var W=x;return x-=v.length,x>=0&&p.slice(x,W)==v}function k1(p){return p=Ui(p),p&&Is.test(p)?p.replace(au,ys):p}function Vm(p){return p=Ui(p),p&&en.test(p)?p.replace(gi,"\\$&"):p}var Gm=xf(function(p,v,x){return p+(x?"-":"")+v.toLowerCase()}),dv=xf(function(p,v,x){return p+(x?" ":"")+v.toLowerCase()}),Ym=wh("toLowerCase");function pv(p,v,x){p=Ui(p),v=Mr(v);var P=v?tu(p):0;if(!v||P>=v)return p;var W=(v-P)/2;return Ea(Ds(W),x)+p+Ea($u(W),x)}function Km(p,v,x){p=Ui(p),v=Mr(v);var P=v?tu(p):0;return v&&P<v?p+Ea(v-P,x):p}function Xm(p,v,x){p=Ui(p),v=Mr(v);var P=v?tu(p):0;return v&&P<v?Ea(v-P,x)+p:p}function Qm(p,v,x){return x||v==null?v=0:v&&(v=+v),_0(Ui(p).replace(bn,""),v||0)}function hv(p,v,x){return(x?lo(p,v,x):v===i)?v=1:v=Mr(v),Yc(Ui(p),v)}function Jm(){var p=arguments,v=Ui(p[0]);return p.length<3?v:v.replace(p[1],p[2])}var Op=xf(function(p,v,x){return p+(x?"_":"")+v.toLowerCase()});function Zm(p,v,x){return x&&typeof x!="number"&&lo(p,v,x)&&(v=x=i),x=x===i?de:x>>>0,x?(p=Ui(p),p&&(typeof v=="string"||v!=null&&!w1(v))&&(v=al(v),!v&&Bo(p))?ma(ei(p),0,x):p.split(v,x)):[]}var Hf=xf(function(p,v,x){return p+(x?" ":"")+kp(v)});function vv(p,v,x){return p=Ui(p),x=x==null?0:r0(Mr(x),0,p.length),v=al(v),p.slice(x,x+v.length)==v}function mv(p,v,x){var P=Y.templateSettings;x&&lo(p,v,x)&&(v=i),p=Ui(p),v=To({},v,P,Rf);var W=To({},v.imports,P.imports,Rf),ee=L0(W),ve=Po(W,ee),Ee,Ie,_t=0,St=v.interpolate||tl,Rt="__p += '",on=gu((v.escape||tl).source+"|"+St.source+"|"+(St===p0?Ql:tl).source+"|"+(v.evaluate||tl).source+"|$","g"),kn="//# sourceURL="+(li.call(v,"sourceURL")?(v.sourceURL+"").replace(/\s/g," "):"lodash.templateSources["+ ++fc+"]")+`
-`;p.replace(on,function(ar,ui,di,zl,Zi,so){return di||(di=zl),Rt+=p.slice(_t,so).replace(fo,zs),ui&&(Ee=!0,Rt+=`' +
-__e(`+ui+`) +
-'`),Zi&&(Ie=!0,Rt+=`';
-`+Zi+`;
-__p += '`),di&&(Rt+=`' +
-((__t = (`+di+`)) == null ? '' : __t) +
-'`),_t=so+ar.length,ar}),Rt+=`';
-`;var rr=li.call(v,"variable")&&v.variable;if(!rr)Rt=`with (obj) {
-`+Rt+`
-}
-`;else if(Q0.test(rr))throw new Kt(t);Rt=(Ie?Rt.replace(Xr,""):Rt).replace(Oo,"$1").replace(Mo,"$1;"),Rt="function("+(rr||"obj")+`) {
-`+(rr?"":`obj || (obj = {});
-`)+"var __t, __p = ''"+(Ee?", __e = _.escape":"")+(Ie?`, __j = Array.prototype.join;
-function print() { __p += __j.call(arguments, '') }
-`:`;
-`)+Rt+`return __p
-}`;var br=wv(function(){return pr(ee,kn+"return "+Rt).apply(i,ve)});if(br.source=Rt,_p(br))throw br;return br}function gv(p){return Ui(p).toLowerCase()}function Kd(p){return Ui(p).toUpperCase()}function Xd(p,v,x){if(p=Ui(p),p&&(x||v===i))return Nu(p);if(!p||!(v=al(v)))return p;var P=ei(p),W=ei(v),ee=vf(P,W),ve=Tl(P,W)+1;return ma(P,ee,ve).join("")}function Mp(p,v,x){if(p=Ui(p),p&&(x||v===i))return p.slice(0,ho(p)+1);if(!p||!(v=al(v)))return p;var P=ei(p),W=Tl(P,ei(v))+1;return ma(P,0,W).join("")}function yv(p,v,x){if(p=Ui(p),p&&(x||v===i))return p.replace(bn,"");if(!p||!(v=al(v)))return p;var P=ei(p),W=vf(P,ei(v));return ma(P,W).join("")}function Qd(p,v){var x=Ue,P=je;if(bu(v)){var W="separator"in v?v.separator:W;x="length"in v?Mr(v.length):x,P="omission"in v?al(v.omission):P}p=Ui(p);var ee=p.length;if(Bo(p)){var ve=ei(p);ee=ve.length}if(x>=ee)return p;var Ee=x-tu(P);if(Ee<1)return P;var Ie=ve?ma(ve,0,Ee).join(""):p.slice(0,Ee);if(W===i)return Ie+P;if(ve&&(Ee+=Ie.length-Ee),w1(W)){if(p.slice(Ee).search(W)){var _t,St=Ie;for(W.global||(W=gu(W.source,Ui(ko.exec(W))+"g")),W.lastIndex=0;_t=W.exec(St);)var Rt=_t.index;Ie=Ie.slice(0,Rt===i?Ee:Rt)}}else if(p.indexOf(al(W),Ee)!=Ee){var on=Ie.lastIndexOf(W);on>-1&&(Ie=Ie.slice(0,on))}return Ie+P}function _v(p){return p=Ui(p),p&&Li.test(p)?p.replace(F0,Bi):p}var Ev=xf(function(p,v,x){return p+(x?" ":"")+v.toUpperCase()}),kp=wh("toUpperCase");function Dv(p,v,x){return p=Ui(p),v=x?i:v,v===i?_s(p)?yf(p):y0(p):p.match(v)||[]}var wv=Ir(function(p,v){try{return ue(p,i,v)}catch(x){return _p(x)?x:new Kt(x)}}),$m=cl(function(p,v){return nt(v,function(x){x=Fl(x),Gu(p,x,D1(p[x],p))}),p});function Sv(p){var v=p==null?0:p.length,x=Vn();return p=v?Nt(p,function(P){if(typeof P[1]!="function")throw new ti(_);return[x(P[0]),P[1]]}):[],Ir(function(P){for(var W=-1;++W<v;){var ee=p[W];if(ue(ee[0],this,P))return ue(ee[1],this,P)}})}function eg(p){return wf(j0(p,T))}function Jd(p){return function(){return p}}function Tv(p,v){return p==null||p!==p?v:p}var Lp=t1(),tg=t1(!0);function s0(p){return p}function Np(p){return Cu(typeof p=="function"?p:j0(p,T))}function ng(p){return T2(j0(p,T))}function rg(p,v){return Sf(p,j0(v,T))}var Fp=Ir(function(p,v){return function(x){return Ml(x,p,v)}}),nf=Ir(function(p,v){return function(x){return Ml(p,x,v)}});function Pp(p,v,x){var P=L0(v),W=b(v,P);x==null&&!(bu(v)&&(W.length||!P.length))&&(x=v,v=p,p=this,W=b(v,L0(v)));var ee=!(bu(x)&&"chain"in x)||!!x.chain,ve=Aa(p);return nt(W,function(Ee){var Ie=v[Ee];p[Ee]=Ie,ve&&(p.prototype[Ee]=function(){var _t=this.__chain__;if(ee||_t){var St=p(this.__wrapped__),Rt=St.__actions__=iu(this.__actions__);return Rt.push({func:Ie,args:arguments,thisArg:p}),St.__chain__=_t,St}return Ie.apply(p,Dn([this.value()],arguments))})}),p}function Ip(){return ji._===this&&(ji._=Xi),this}function bp(){}function ig(p){return p=Mr(p),Ir(function(v){return Gc(v,p)})}var ug=Fr(Nt),Cv=Fr(Mt),qf=Fr(Cr);function Bp(p){return Ji(p)?fn(Fl(p)):_o(p)}function xv(p){return function(v){return p==null?i:J(p,v)}}var og=n1(),lg=n1(!0);function Up(){return[]}function jp(){return!1}function sg(){return{}}function ag(){return""}function Av(){return!0}function zp(p,v){if(p=Mr(p),p<1||p>Xt)return[];var x=de,P=Kn(p,de);v=Vn(v),p-=de;for(var W=T0(P,v);++x<p;)v(x);return W}function Hp(p){return tr(p)?Nt(p,Fl):Bl(p)?[p]:iu(s1(Ui(p)))}function Zd(p){var v=++Cl;return Ui(p)+v}var fg=md(function(p,v){return p+v},0),L1=F2("ceil"),cg=md(function(p,v){return p/v},1),Rv=F2("floor");function Ov(p){return p&&p.length?ha(p,s0,xt):i}function dg(p,v){return p&&p.length?ha(p,Vn(v,2),xt):i}function Wf(p){return un(p,s0)}function qp(p,v){return un(p,Vn(v,2))}function Mv(p){return p&&p.length?ha(p,s0,ld):i}function pg(p,v){return p&&p.length?ha(p,Vn(v,2),ld):i}var hg=md(function(p,v){return p*v},1),Wp=F2("round"),vg=md(function(p,v){return p-v},0);function $s(p){return p&&p.length?Lu(p,s0):0}function mg(p,v){return p&&p.length?Lu(p,Vn(v,2)):0}return Y.after=ap,Y.ary=Qh,Y.assign=Tp,Y.assignIn=Bd,Y.assignInWith=To,Y.assignWith=Os,Y.at=Bf,Y.before=Ad,Y.bind=D1,Y.bindAll=$m,Y.bindKey=Jh,Y.castArray=nv,Y.chain=zh,Y.chunk=B2,Y.compact=xh,Y.concat=Sd,Y.cond=Sv,Y.conforms=eg,Y.constant=Jd,Y.countBy=Cd,Y.create=Ud,Y.curry=fp,Y.curryRight=Zh,Y.debounce=cp,Y.defaults=Cp,Y.defaultsDeep=C1,Y.defer=$h,Y.delay=ev,Y.difference=Ah,Y.differenceBy=Pl,Y.differenceWith=os,Y.drop=As,Y.dropRight=Ys,Y.dropRightWhile=U2,Y.dropWhile=Rh,Y.fill=j2,Y.filter=tp,Y.flatMap=Vh,Y.flatMapDeep=rp,Y.flatMapDepth=Gh,Y.flatten=f1,Y.flattenDeep=Oh,Y.flattenDepth=H2,Y.flip=dp,Y.flow=Lp,Y.flowRight=tg,Y.fromPairs=q2,Y.functions=k0,Y.functionsIn=jd,Y.groupBy=wm,Y.initial=Mh,Y.intersection=pu,Y.intersectionBy=c1,Y.intersectionWith=kh,Y.invert=Rc,Y.invertBy=zd,Y.invokeMap=Tm,Y.iteratee=Np,Y.keyBy=Kh,Y.keys=L0,Y.keysIn=dn,Y.map=_1,Y.mapKeys=Hd,Y.mapValues=qd,Y.matches=ng,Y.matchesProperty=rg,Y.memoize=Rd,Y.merge=Oc,Y.mergeWith=Mc,Y.method=Fp,Y.methodOf=nf,Y.mixin=Pp,Y.negate=Od,Y.nthArg=ig,Y.omit=kc,Y.omitBy=R1,Y.once=H0,Y.orderBy=Cm,Y.over=ug,Y.overArgs=Md,Y.overEvery=Cv,Y.overSome=qf,Y.partial=xa,Y.partialRight=ef,Y.partition=up,Y.pick=Rp,Y.pickBy=tf,Y.property=Bp,Y.propertyOf=xv,Y.pull=Nh,Y.pullAll=p1,Y.pullAllBy=bl,Y.pullAllWith=$a,Y.pullAt=wa,Y.range=og,Y.rangeRight=lg,Y.rearg=kd,Y.reject=Am,Y.remove=V2,Y.rest=Ld,Y.reverse=G2,Y.sampleSize=Rm,Y.set=Lc,Y.setWith=Wd,Y.shuffle=Om,Y.slice=hm,Y.sortBy=Ca,Y.sortedUniq=Ih,Y.sortedUniqBy=gm,Y.split=Zm,Y.spread=pp,Y.tail=X2,Y.take=h1,Y.takeRight=v1,Y.takeRightWhile=m1,Y.takeWhile=Sa,Y.tap=Hh,Y.throttle=Nd,Y.thru=y1,Y.toArray=fv,Y.toPairs=cv,Y.toPairsIn=O1,Y.toPath=Hp,Y.toPlainObject=yu,Y.transform=Uf,Y.unary=tv,Y.union=Q2,Y.unionBy=Ks,Y.unionWith=Xs,Y.uniq=Qs,Y.uniqBy=J2,Y.uniqWith=Ta,Y.unset=jf,Y.unzip=g1,Y.unzipWith=Td,Y.update=M1,Y.updateWith=jl,Y.values=Nc,Y.valuesIn=zf,Y.without=Tc,Y.words=Dv,Y.wrap=Mm,Y.xor=Z2,Y.xorBy=wo,Y.xorWith=bh,Y.zip=Bh,Y.zipObject=Uh,Y.zipObjectDeep=jh,Y.zipWith=ym,Y.entries=cv,Y.entriesIn=O1,Y.extend=Bd,Y.extendWith=To,Pp(Y,Y),Y.add=fg,Y.attempt=wv,Y.camelCase=Gd,Y.capitalize=Wo,Y.ceil=L1,Y.clamp=qm,Y.clone=hp,Y.cloneDeep=mp,Y.cloneDeepWith=km,Y.cloneWith=vp,Y.conformsTo=Lm,Y.deburr=Yd,Y.defaultTo=Tv,Y.divide=cg,Y.endsWith=Wm,Y.eq=So,Y.escape=k1,Y.escapeRegExp=Vm,Y.every=Dm,Y.find=xd,Y.findIndex=z2,Y.findKey=x1,Y.findLast=np,Y.findLastIndex=a1,Y.findLastKey=xp,Y.floor=Rv,Y.forEach=Yh,Y.forEachRight=ip,Y.forIn=nr,Y.forInRight=ml,Y.forOwn=Gn,Y.forOwnRight=q0,Y.get=Ul,Y.gt=Fd,Y.gte=Nm,Y.has=A1,Y.hasIn=Ac,Y.head=Rs,Y.identity=s0,Y.includes=Sm,Y.indexOf=Za,Y.inRange=gl,Y.invoke=Ap,Y.isArguments=pl,Y.isArray=tr,Y.isArrayBuffer=Js,Y.isArrayLike=hl,Y.isArrayLikeObject=l0,Y.isBoolean=rv,Y.isBuffer=Zs,Y.isDate=gp,Y.isElement=Fm,Y.isEmpty=iv,Y.isEqual=yp,Y.isEqualWith=Pm,Y.isError=_p,Y.isFinite=Cc,Y.isFunction=Aa,Y.isInteger=Ep,Y.isLength=Pd,Y.isMap=Dp,Y.isMatch=wp,Y.isMatchWith=uv,Y.isNaN=Im,Y.isNative=bm,Y.isNil=Id,Y.isNull=Bm,Y.isNumber=ov,Y.isObject=bu,Y.isObjectLike=Yu,Y.isPlainObject=xc,Y.isRegExp=w1,Y.isSafeInteger=Um,Y.isSet=bd,Y.isString=S1,Y.isSymbol=Bl,Y.isTypedArray=Ra,Y.isUndefined=lv,Y.isWeakMap=jm,Y.isWeakSet=sv,Y.join=d1,Y.kebabCase=Gm,Y.last=Il,Y.lastIndexOf=Lh,Y.lowerCase=dv,Y.lowerFirst=Ym,Y.lt=av,Y.lte=zm,Y.max=Ov,Y.maxBy=dg,Y.mean=Wf,Y.meanBy=qp,Y.min=Mv,Y.minBy=pg,Y.stubArray=Up,Y.stubFalse=jp,Y.stubObject=sg,Y.stubString=ag,Y.stubTrue=Av,Y.multiply=hg,Y.nth=W2,Y.noConflict=Ip,Y.noop=bp,Y.now=E1,Y.pad=pv,Y.padEnd=Km,Y.padStart=Xm,Y.parseInt=Qm,Y.random=Vd,Y.reduce=op,Y.reduceRight=xm,Y.repeat=hv,Y.replace=Jm,Y.result=Hm,Y.round=Wp,Y.runInContext=xe,Y.sample=Xh,Y.size=lp,Y.snakeCase=Op,Y.some=sp,Y.sortedIndex=Y2,Y.sortedIndexBy=Fh,Y.sortedIndexOf=Ph,Y.sortedLastIndex=K2,Y.sortedLastIndexBy=vm,Y.sortedLastIndexOf=mm,Y.startCase=Hf,Y.startsWith=vv,Y.subtract=vg,Y.sum=$s,Y.sumBy=mg,Y.template=mv,Y.times=zp,Y.toFinite=Oa,Y.toInteger=Mr,Y.toLength=Sp,Y.toLower=gv,Y.toNumber=vl,Y.toSafeInteger=T1,Y.toString=Ui,Y.toUpper=Kd,Y.trim=Xd,Y.trimEnd=Mp,Y.trimStart=yv,Y.truncate=Qd,Y.unescape=_v,Y.uniqueId=Zd,Y.upperCase=Ev,Y.upperFirst=kp,Y.each=Yh,Y.eachRight=ip,Y.first=Rs,Pp(Y,function(){var p={};return A(Y,function(v,x){li.call(Y.prototype,x)||(p[x]=v)}),p}(),{chain:!1}),Y.VERSION=o,nt(["bind","bindKey","curry","curryRight","partial","partialRight"],function(p){Y[p].placeholder=Y}),nt(["drop","take"],function(p,v){ft.prototype[p]=function(x){x=x===i?1:ni(Mr(x),0);var P=this.__filtered__&&!v?new ft(this):this.clone();return P.__filtered__?P.__takeCount__=Kn(x,P.__takeCount__):P.__views__.push({size:Kn(x,de),type:p+(P.__dir__<0?"Right":"")}),P},ft.prototype[p+"Right"]=function(x){return this.reverse()[p](x).reverse()}}),nt(["filter","map","takeWhile"],function(p,v){var x=v+1,P=x==Qe||x==Ve;ft.prototype[p]=function(W){var ee=this.clone();return ee.__iteratees__.push({iteratee:Vn(W,3),type:x}),ee.__filtered__=ee.__filtered__||P,ee}}),nt(["head","last"],function(p,v){var x="take"+(v?"Right":"");ft.prototype[p]=function(){return this[x](1).value()[0]}}),nt(["initial","tail"],function(p,v){var x="drop"+(v?"":"Right");ft.prototype[p]=function(){return this.__filtered__?new ft(this):this[x](1)}}),ft.prototype.compact=function(){return this.filter(s0)},ft.prototype.find=function(p){return this.filter(p).head()},ft.prototype.findLast=function(p){return this.reverse().find(p)},ft.prototype.invokeMap=Ir(function(p,v){return typeof p=="function"?new ft(this):this.map(function(x){return Ml(x,p,v)})}),ft.prototype.reject=function(p){return this.filter(Od(Vn(p)))},ft.prototype.slice=function(p,v){p=Mr(p);var x=this;return x.__filtered__&&(p>0||v<0)?new ft(x):(p<0?x=x.takeRight(-p):p&&(x=x.drop(p)),v!==i&&(v=Mr(v),x=v<0?x.dropRight(-v):x.take(v-p)),x)},ft.prototype.takeRightWhile=function(p){return this.reverse().takeWhile(p).reverse()},ft.prototype.toArray=function(){return this.take(de)},A(ft.prototype,function(p,v){var x=/^(?:filter|find|map|reject)|While$/.test(v),P=/^(?:head|last)$/.test(v),W=Y[P?"take"+(v=="last"?"Right":""):v],ee=P||/^find/.test(v);!W||(Y.prototype[v]=function(){var ve=this.__wrapped__,Ee=P?[1]:arguments,Ie=ve instanceof ft,_t=Ee[0],St=Ie||tr(ve),Rt=function(ui){var di=W.apply(Y,Dn([ui],Ee));return P&&on?di[0]:di};St&&x&&typeof _t=="function"&&_t.length!=1&&(Ie=St=!1);var on=this.__chain__,kn=!!this.__actions__.length,rr=ee&&!on,br=Ie&&!kn;if(!ee&&St){ve=br?ve:new ft(this);var ar=p.apply(ve,Ee);return ar.__actions__.push({func:y1,args:[Rt],thisArg:i}),new Vr(ar,on)}return rr&&br?p.apply(this,Ee):(ar=this.thru(Rt),rr?P?ar.value()[0]:ar.value():ar)})}),nt(["pop","push","shift","sort","splice","unshift"],function(p){var v=Jr[p],x=/^(?:push|sort|unshift)$/.test(p)?"tap":"thru",P=/^(?:pop|shift)$/.test(p);Y.prototype[p]=function(){var W=arguments;if(P&&!this.__chain__){var ee=this.value();return v.apply(tr(ee)?ee:[],W)}return this[x](function(ve){return v.apply(tr(ve)?ve:[],W)})}}),A(ft.prototype,function(p,v){var x=Y[v];if(x){var P=x.name+"";li.call(On,P)||(On[P]=[]),On[P].push({name:v,func:x})}}),On[ya(i,he).name]=[{name:"wrapper",func:i}],ft.prototype.clone=Di,ft.prototype.reverse=ru,ft.prototype.value=D0,Y.prototype.at=$2,Y.prototype.chain=qh,Y.prototype.commit=ep,Y.prototype.next=Wh,Y.prototype.plant=Em,Y.prototype.reverse=If,Y.prototype.toJSON=Y.prototype.valueOf=Y.prototype.value=bf,Y.prototype.first=Y.prototype.head,Pu&&(Y.prototype[Pu]=_m),Y},to=eo();typeof define=="function"&&typeof define.amd=="object"&&define.amd?(ji._=to,define(function(){return to})):z?((z.exports=to)._=to,U._=to):ji._=to}).call(Wv)});var mD=Ke((wW,vD)=>{"use strict";var Ii=vD.exports;vD.exports.default=Ii;var Du="[",jg="]",Vv="\x07",P_=";",kS=process.env.TERM_PROGRAM==="Apple_Terminal";Ii.cursorTo=(i,o)=>{if(typeof i!="number")throw new TypeError("The `x` argument is required");return typeof o!="number"?Du+(i+1)+"G":Du+(o+1)+";"+(i+1)+"H"};Ii.cursorMove=(i,o)=>{if(typeof i!="number")throw new TypeError("The `x` argument is required");let a="";return i<0?a+=Du+-i+"D":i>0&&(a+=Du+i+"C"),o<0?a+=Du+-o+"A":o>0&&(a+=Du+o+"B"),a};Ii.cursorUp=(i=1)=>Du+i+"A";Ii.cursorDown=(i=1)=>Du+i+"B";Ii.cursorForward=(i=1)=>Du+i+"C";Ii.cursorBackward=(i=1)=>Du+i+"D";Ii.cursorLeft=Du+"G";Ii.cursorSavePosition=kS?"7":Du+"s";Ii.cursorRestorePosition=kS?"8":Du+"u";Ii.cursorGetPosition=Du+"6n";Ii.cursorNextLine=Du+"E";Ii.cursorPrevLine=Du+"F";Ii.cursorHide=Du+"?25l";Ii.cursorShow=Du+"?25h";Ii.eraseLines=i=>{let o="";for(let a=0;a<i;a++)o+=Ii.eraseLine+(a<i-1?Ii.cursorUp():"");return i&&(o+=Ii.cursorLeft),o};Ii.eraseEndLine=Du+"K";Ii.eraseStartLine=Du+"1K";Ii.eraseLine=Du+"2K";Ii.eraseDown=Du+"J";Ii.eraseUp=Du+"1J";Ii.eraseScreen=Du+"2J";Ii.scrollUp=Du+"S";Ii.scrollDown=Du+"T";Ii.clearScreen="c";Ii.clearTerminal=process.platform==="win32"?`${Ii.eraseScreen}${Du}0f`:`${Ii.eraseScreen}${Du}3J${Du}H`;Ii.beep=Vv;Ii.link=(i,o)=>[jg,"8",P_,P_,o,Vv,i,jg,"8",P_,P_,Vv].join("");Ii.image=(i,o={})=>{let a=`${jg}1337;File=inline=1`;return o.width&&(a+=`;width=${o.width}`),o.height&&(a+=`;height=${o.height}`),o.preserveAspectRatio===!1&&(a+=";preserveAspectRatio=0"),a+":"+i.toString("base64")+Vv};Ii.iTerm={setCwd:(i=process.cwd())=>`${jg}50;CurrentDir=${i}${Vv}`,annotation:(i,o={})=>{let a=`${jg}1337;`,c=typeof o.x!="undefined",_=typeof o.y!="undefined";if((c||_)&&!(c&&_&&typeof o.length!="undefined"))throw new Error("`x`, `y` and `length` must be defined when `x` or `y` is defined");return i=i.replace(/\|/g,""),a+=o.isHidden?"AddHiddenAnnotation=":"AddAnnotation=",o.length>0?a+=(c?[i,o.length,o.x,o.y]:[o.length,i]).join("|"):a+=i,a+Vv}}});var NS=Ke((SW,gD)=>{"use strict";var LS=(i,o)=>{for(let a of Reflect.ownKeys(o))Object.defineProperty(i,a,Object.getOwnPropertyDescriptor(o,a));return i};gD.exports=LS;gD.exports.default=LS});var IS=Ke((TW,I_)=>{"use strict";var AI=NS(),b_=new WeakMap,PS=(i,o={})=>{if(typeof i!="function")throw new TypeError("Expected a function");let a,c=!1,_=0,t=i.displayName||i.name||"<anonymous>",O=function(...N){if(b_.set(O,++_),c){if(o.throw===!0)throw new Error(`Function \`${t}\` can only be called once`);return a}return c=!0,a=i.apply(this,N),i=null,a};return AI(O,i),b_.set(O,_),O};I_.exports=PS;I_.exports.default=PS;I_.exports.callCount=i=>{if(!b_.has(i))throw new Error(`The given function \`${i.name}\` is not wrapped by the \`onetime\` package`);return b_.get(i)}});var bS=Ke((CW,B_)=>{B_.exports=["SIGABRT","SIGALRM","SIGHUP","SIGINT","SIGTERM"];process.platform!=="win32"&&B_.exports.push("SIGVTALRM","SIGXCPU","SIGXFSZ","SIGUSR2","SIGTRAP","SIGSYS","SIGQUIT","SIGIOT");process.platform==="linux"&&B_.exports.push("SIGIO","SIGPOLL","SIGPWR","SIGSTKFLT","SIGUNUSED")});var DD=Ke((xW,zg)=>{var RI=require("assert"),Hg=bS(),OI=/^win/i.test(process.platform),U_=require("events");typeof U_!="function"&&(U_=U_.EventEmitter);var Yl;process.__signal_exit_emitter__?Yl=process.__signal_exit_emitter__:(Yl=process.__signal_exit_emitter__=new U_,Yl.count=0,Yl.emitted={});Yl.infinite||(Yl.setMaxListeners(Infinity),Yl.infinite=!0);zg.exports=function(i,o){RI.equal(typeof i,"function","a callback must be provided for exit handler"),qg===!1&&BS();var a="exit";o&&o.alwaysLast&&(a="afterexit");var c=function(){Yl.removeListener(a,i),Yl.listeners("exit").length===0&&Yl.listeners("afterexit").length===0&&yD()};return Yl.on(a,i),c};zg.exports.unload=yD;function yD(){!qg||(qg=!1,Hg.forEach(function(i){try{process.removeListener(i,_D[i])}catch(o){}}),process.emit=ED,process.reallyExit=US,Yl.count-=1)}function Gv(i,o,a){Yl.emitted[i]||(Yl.emitted[i]=!0,Yl.emit(i,o,a))}var _D={};Hg.forEach(function(i){_D[i]=function(){var a=process.listeners(i);a.length===Yl.count&&(yD(),Gv("exit",null,i),Gv("afterexit",null,i),OI&&i==="SIGHUP"&&(i="SIGINT"),process.kill(process.pid,i))}});zg.exports.signals=function(){return Hg};zg.exports.load=BS;var qg=!1;function BS(){qg||(qg=!0,Yl.count+=1,Hg=Hg.filter(function(i){try{return process.on(i,_D[i]),!0}catch(o){return!1}}),process.emit=kI,process.reallyExit=MI)}var US=process.reallyExit;function MI(i){process.exitCode=i||0,Gv("exit",process.exitCode,null),Gv("afterexit",process.exitCode,null),US.call(process,process.exitCode)}var ED=process.emit;function kI(i,o){if(i==="exit"){o!==void 0&&(process.exitCode=o);var a=ED.apply(this,arguments);return Gv("exit",process.exitCode,null),Gv("afterexit",process.exitCode,null),a}else return ED.apply(this,arguments)}});var zS=Ke((AW,jS)=>{"use strict";var LI=IS(),NI=DD();jS.exports=LI(()=>{NI(()=>{process.stderr.write("[?25h")},{alwaysLast:!0})})});var wD=Ke(Yv=>{"use strict";var FI=zS(),j_=!1;Yv.show=(i=process.stderr)=>{!i.isTTY||(j_=!1,i.write("[?25h"))};Yv.hide=(i=process.stderr)=>{!i.isTTY||(FI(),j_=!0,i.write("[?25l"))};Yv.toggle=(i,o)=>{i!==void 0&&(j_=i),j_?Yv.show(o):Yv.hide(o)}});var VS=Ke(Wg=>{"use strict";var HS=Wg&&Wg.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(Wg,"__esModule",{value:!0});var qS=HS(mD()),WS=HS(wD()),PI=(i,{showCursor:o=!1}={})=>{let a=0,c="",_=!1,t=O=>{!o&&!_&&(WS.default.hide(),_=!0);let N=O+`
-`;N!==c&&(c=N,i.write(qS.default.eraseLines(a)+N),a=N.split(`
-`).length)};return t.clear=()=>{i.write(qS.default.eraseLines(a)),c="",a=0},t.done=()=>{c="",a=0,o||(WS.default.show(),_=!1)},t};Wg.default={create:PI}});var YS=Ke((MW,GS)=>{GS.exports=[{name:"AppVeyor",constant:"APPVEYOR",env:"APPVEYOR",pr:"APPVEYOR_PULL_REQUEST_NUMBER"},{name:"Azure Pipelines",constant:"AZURE_PIPELINES",env:"SYSTEM_TEAMFOUNDATIONCOLLECTIONURI",pr:"SYSTEM_PULLREQUEST_PULLREQUESTID"},{name:"Bamboo",constant:"BAMBOO",env:"bamboo_planKey"},{name:"Bitbucket Pipelines",constant:"BITBUCKET",env:"BITBUCKET_COMMIT",pr:"BITBUCKET_PR_ID"},{name:"Bitrise",constant:"BITRISE",env:"BITRISE_IO",pr:"BITRISE_PULL_REQUEST"},{name:"Buddy",constant:"BUDDY",env:"BUDDY_WORKSPACE_ID",pr:"BUDDY_EXECUTION_PULL_REQUEST_ID"},{name:"Buildkite",constant:"BUILDKITE",env:"BUILDKITE",pr:{env:"BUILDKITE_PULL_REQUEST",ne:"false"}},{name:"CircleCI",constant:"CIRCLE",env:"CIRCLECI",pr:"CIRCLE_PULL_REQUEST"},{name:"Cirrus CI",constant:"CIRRUS",env:"CIRRUS_CI",pr:"CIRRUS_PR"},{name:"AWS CodeBuild",constant:"CODEBUILD",env:"CODEBUILD_BUILD_ARN"},{name:"Codeship",constant:"CODESHIP",env:{CI_NAME:"codeship"}},{name:"Drone",constant:"DRONE",env:"DRONE",pr:{DRONE_BUILD_EVENT:"pull_request"}},{name:"dsari",constant:"DSARI",env:"DSARI"},{name:"GitLab CI",constant:"GITLAB",env:"GITLAB_CI"},{name:"GoCD",constant:"GOCD",env:"GO_PIPELINE_LABEL"},{name:"Hudson",constant:"HUDSON",env:"HUDSON_URL"},{name:"Jenkins",constant:"JENKINS",env:["JENKINS_URL","BUILD_ID"],pr:{any:["ghprbPullId","CHANGE_ID"]}},{name:"Magnum CI",constant:"MAGNUM",env:"MAGNUM"},{name:"Netlify CI",constant:"NETLIFY",env:"NETLIFY_BUILD_BASE",pr:{env:"PULL_REQUEST",ne:"false"}},{name:"Sail CI",constant:"SAIL",env:"SAILCI",pr:"SAIL_PULL_REQUEST_NUMBER"},{name:"Semaphore",constant:"SEMAPHORE",env:"SEMAPHORE",pr:"PULL_REQUEST_NUMBER"},{name:"Shippable",constant:"SHIPPABLE",env:"SHIPPABLE",pr:{IS_PULL_REQUEST:"true"}},{name:"Solano CI",constant:"SOLANO",env:"TDDIUM",pr:"TDDIUM_PR_ID"},{name:"Strider CD",constant:"STRIDER",env:"STRIDER"},{name:"TaskCluster",constant:"TASKCLUSTER",env:["TASK_ID","RUN_ID"]},{name:"TeamCity",constant:"TEAMCITY",env:"TEAMCITY_VERSION"},{name:"Travis CI",constant:"TRAVIS",env:"TRAVIS",pr:{env:"TRAVIS_PULL_REQUEST",ne:"false"}}]});var QS=Ke(Pa=>{"use strict";var KS=YS(),jc=process.env;Object.defineProperty(Pa,"_vendors",{value:KS.map(function(i){return i.constant})});Pa.name=null;Pa.isPR=null;KS.forEach(function(i){var o=Array.isArray(i.env)?i.env:[i.env],a=o.every(function(c){return XS(c)});if(Pa[i.constant]=a,a)switch(Pa.name=i.name,typeof i.pr){case"string":Pa.isPR=!!jc[i.pr];break;case"object":"env"in i.pr?Pa.isPR=i.pr.env in jc&&jc[i.pr.env]!==i.pr.ne:"any"in i.pr?Pa.isPR=i.pr.any.some(function(c){return!!jc[c]}):Pa.isPR=XS(i.pr);break;default:Pa.isPR=null}});Pa.isCI=!!(jc.CI||jc.CONTINUOUS_INTEGRATION||jc.BUILD_NUMBER||jc.RUN_ID||Pa.name);function XS(i){return typeof i=="string"?!!jc[i]:Object.keys(i).every(function(o){return jc[o]===i[o]})}});var ZS=Ke((LW,JS)=>{"use strict";JS.exports=QS().isCI});var eT=Ke((NW,$S)=>{"use strict";var II=i=>{let o=new Set;do for(let a of Reflect.ownKeys(i))o.add([i,a]);while((i=Reflect.getPrototypeOf(i))&&i!==Object.prototype);return o};$S.exports=(i,{include:o,exclude:a}={})=>{let c=_=>{let t=O=>typeof O=="string"?_===O:O.test(_);return o?o.some(t):a?!a.some(t):!0};for(let[_,t]of II(i.constructor.prototype)){if(t==="constructor"||!c(t))continue;let O=Reflect.getOwnPropertyDescriptor(_,t);O&&typeof O.value=="function"&&(i[t]=i[t].bind(i))}return i}});var lT=Ke(lu=>{"use strict";Object.defineProperty(lu,"__esModule",{value:!0});var Kv,Vg,z_,H_,SD;typeof window=="undefined"||typeof MessageChannel!="function"?(Xv=null,TD=null,CD=function(){if(Xv!==null)try{var i=lu.unstable_now();Xv(!0,i),Xv=null}catch(o){throw setTimeout(CD,0),o}},tT=Date.now(),lu.unstable_now=function(){return Date.now()-tT},Kv=function(i){Xv!==null?setTimeout(Kv,0,i):(Xv=i,setTimeout(CD,0))},Vg=function(i,o){TD=setTimeout(i,o)},z_=function(){clearTimeout(TD)},H_=function(){return!1},SD=lu.unstable_forceFrameRate=function(){}):(q_=window.performance,xD=window.Date,nT=window.setTimeout,rT=window.clearTimeout,typeof console!="undefined"&&(iT=window.cancelAnimationFrame,typeof window.requestAnimationFrame!="function"&&console.error("This browser doesn't support requestAnimationFrame. Make sure that you load a polyfill in older browsers. https://fb.me/react-polyfills"),typeof iT!="function"&&console.error("This browser doesn't support cancelAnimationFrame. Make sure that you load a polyfill in older browsers. https://fb.me/react-polyfills")),typeof q_=="object"&&typeof q_.now=="function"?lu.unstable_now=function(){return q_.now()}:(uT=xD.now(),lu.unstable_now=function(){return xD.now()-uT}),Gg=!1,Yg=null,W_=-1,AD=5,RD=0,H_=function(){return lu.unstable_now()>=RD},SD=function(){},lu.unstable_forceFrameRate=function(i){0>i||125<i?console.error("forceFrameRate takes a positive int between 0 and 125, forcing framerates higher than 125 fps is not unsupported"):AD=0<i?Math.floor(1e3/i):5},OD=new MessageChannel,V_=OD.port2,OD.port1.onmessage=function(){if(Yg!==null){var i=lu.unstable_now();RD=i+AD;try{Yg(!0,i)?V_.postMessage(null):(Gg=!1,Yg=null)}catch(o){throw V_.postMessage(null),o}}else Gg=!1},Kv=function(i){Yg=i,Gg||(Gg=!0,V_.postMessage(null))},Vg=function(i,o){W_=nT(function(){i(lu.unstable_now())},o)},z_=function(){rT(W_),W_=-1});var Xv,TD,CD,tT,q_,xD,nT,rT,iT,uT,Gg,Yg,W_,AD,RD,OD,V_;function MD(i,o){var a=i.length;i.push(o);e:for(;;){var c=Math.floor((a-1)/2),_=i[c];if(_!==void 0&&0<G_(_,o))i[c]=o,i[a]=_,a=c;else break e}}function df(i){return i=i[0],i===void 0?null:i}function Y_(i){var o=i[0];if(o!==void 0){var a=i.pop();if(a!==o){i[0]=a;e:for(var c=0,_=i.length;c<_;){var t=2*(c+1)-1,O=i[t],N=t+1,M=i[N];if(O!==void 0&&0>G_(O,a))M!==void 0&&0>G_(M,O)?(i[c]=M,i[N]=a,c=N):(i[c]=O,i[t]=a,c=t);else if(M!==void 0&&0>G_(M,a))i[c]=M,i[N]=a,c=N;else break e}}return o}return null}function G_(i,o){var a=i.sortIndex-o.sortIndex;return a!==0?a:i.id-o.id}var ec=[],d2=[],bI=1,Fs=null,ps=3,K_=!1,$p=!1,Kg=!1;function X_(i){for(var o=df(d2);o!==null;){if(o.callback===null)Y_(d2);else if(o.startTime<=i)Y_(d2),o.sortIndex=o.expirationTime,MD(ec,o);else break;o=df(d2)}}function kD(i){if(Kg=!1,X_(i),!$p)if(df(ec)!==null)$p=!0,Kv(LD);else{var o=df(d2);o!==null&&Vg(kD,o.startTime-i)}}function LD(i,o){$p=!1,Kg&&(Kg=!1,z_()),K_=!0;var a=ps;try{for(X_(o),Fs=df(ec);Fs!==null&&(!(Fs.expirationTime>o)||i&&!H_());){var c=Fs.callback;if(c!==null){Fs.callback=null,ps=Fs.priorityLevel;var _=c(Fs.expirationTime<=o);o=lu.unstable_now(),typeof _=="function"?Fs.callback=_:Fs===df(ec)&&Y_(ec),X_(o)}else Y_(ec);Fs=df(ec)}if(Fs!==null)var t=!0;else{var O=df(d2);O!==null&&Vg(kD,O.startTime-o),t=!1}return t}finally{Fs=null,ps=a,K_=!1}}function oT(i){switch(i){case 1:return-1;case 2:return 250;case 5:return 1073741823;case 4:return 1e4;default:return 5e3}}var BI=SD;lu.unstable_ImmediatePriority=1;lu.unstable_UserBlockingPriority=2;lu.unstable_NormalPriority=3;lu.unstable_IdlePriority=5;lu.unstable_LowPriority=4;lu.unstable_runWithPriority=function(i,o){switch(i){case 1:case 2:case 3:case 4:case 5:break;default:i=3}var a=ps;ps=i;try{return o()}finally{ps=a}};lu.unstable_next=function(i){switch(ps){case 1:case 2:case 3:var o=3;break;default:o=ps}var a=ps;ps=o;try{return i()}finally{ps=a}};lu.unstable_scheduleCallback=function(i,o,a){var c=lu.unstable_now();if(typeof a=="object"&&a!==null){var _=a.delay;_=typeof _=="number"&&0<_?c+_:c,a=typeof a.timeout=="number"?a.timeout:oT(i)}else a=oT(i),_=c;return a=_+a,i={id:bI++,callback:o,priorityLevel:i,startTime:_,expirationTime:a,sortIndex:-1},_>c?(i.sortIndex=_,MD(d2,i),df(ec)===null&&i===df(d2)&&(Kg?z_():Kg=!0,Vg(kD,_-c))):(i.sortIndex=a,MD(ec,i),$p||K_||($p=!0,Kv(LD))),i};lu.unstable_cancelCallback=function(i){i.callback=null};lu.unstable_wrapCallback=function(i){var o=ps;return function(){var a=ps;ps=o;try{return i.apply(this,arguments)}finally{ps=a}}};lu.unstable_getCurrentPriorityLevel=function(){return ps};lu.unstable_shouldYield=function(){var i=lu.unstable_now();X_(i);var o=df(ec);return o!==Fs&&Fs!==null&&o!==null&&o.callback!==null&&o.startTime<=i&&o.expirationTime<Fs.expirationTime||H_()};lu.unstable_requestPaint=BI;lu.unstable_continueExecution=function(){$p||K_||($p=!0,Kv(LD))};lu.unstable_pauseExecution=function(){};lu.unstable_getFirstCallbackNode=function(){return df(ec)};lu.unstable_Profiling=null});var sT=Ke(bi=>{"use strict";process.env.NODE_ENV!=="production"&&function(){"use strict";Object.defineProperty(bi,"__esModule",{value:!0});var i=!1,o=!1,a=!0,c,_,t,O,N;if(typeof window=="undefined"||typeof MessageChannel!="function"){var M=null,T=null,B=function(){if(M!==null)try{var wt=bi.unstable_now(),bt=!0;M(bt,wt),M=null}catch(Hn){throw setTimeout(B,0),Hn}},H=Date.now();bi.unstable_now=function(){return Date.now()-H},c=function(wt){M!==null?setTimeout(c,0,wt):(M=wt,setTimeout(B,0))},_=function(wt,bt){T=setTimeout(wt,bt)},t=function(){clearTimeout(T)},O=function(){return!1},N=bi.unstable_forceFrameRate=function(){}}else{var q=window.performance,ne=window.Date,m=window.setTimeout,he=window.clearTimeout;if(typeof console!="undefined"){var De=window.requestAnimationFrame,se=window.cancelAnimationFrame;typeof De!="function"&&console.error("This browser doesn't support requestAnimationFrame. Make sure that you load a polyfill in older browsers. https://fb.me/react-polyfills"),typeof se!="function"&&console.error("This browser doesn't support cancelAnimationFrame. Make sure that you load a polyfill in older browsers. https://fb.me/react-polyfills")}if(typeof q=="object"&&typeof q.now=="function")bi.unstable_now=function(){return q.now()};else{var fe=ne.now();bi.unstable_now=function(){return ne.now()-fe}}var _e=!1,ce=null,me=-1,ie=5,Oe=0,Ue=300,je=!1;if(o&&navigator!==void 0&&navigator.scheduling!==void 0&&navigator.scheduling.isInputPending!==void 0){var at=navigator.scheduling;O=function(){var wt=bi.unstable_now();return wt>=Oe?je||at.isInputPending()?!0:wt>=Ue:!1},N=function(){je=!0}}else O=function(){return bi.unstable_now()>=Oe},N=function(){};bi.unstable_forceFrameRate=function(wt){if(wt<0||wt>125){console.error("forceFrameRate takes a positive int between 0 and 125, forcing framerates higher than 125 fps is not unsupported");return}wt>0?ie=Math.floor(1e3/wt):ie=5};var Dt=function(){if(ce!==null){var wt=bi.unstable_now();Oe=wt+ie;var bt=!0;try{var Hn=ce(bt,wt);Hn?ut.postMessage(null):(_e=!1,ce=null)}catch(qr){throw ut.postMessage(null),qr}}else _e=!1;je=!1},Qe=new MessageChannel,ut=Qe.port2;Qe.port1.onmessage=Dt,c=function(wt){ce=wt,_e||(_e=!0,ut.postMessage(null))},_=function(wt,bt){me=m(function(){wt(bi.unstable_now())},bt)},t=function(){he(me),me=-1}}function Ve(wt,bt){var Hn=wt.length;wt.push(bt),rt(wt,bt,Hn)}function It(wt){var bt=wt[0];return bt===void 0?null:bt}function Xt(wt){var bt=wt[0];if(bt!==void 0){var Hn=wt.pop();return Hn!==bt&&(wt[0]=Hn,X(wt,Hn,0)),bt}else return null}function rt(wt,bt,Hn){for(var qr=Hn;;){var Ki=Math.floor((qr-1)/2),Qr=wt[Ki];if(Qr!==void 0&&de(Qr,bt)>0)wt[Ki]=bt,wt[qr]=Qr,qr=Ki;else return}}function X(wt,bt,Hn){for(var qr=Hn,Ki=wt.length;qr<Ki;){var Qr=(qr+1)*2-1,Ou=wt[Qr],h0=Qr+1,Ni=wt[h0];if(Ou!==void 0&&de(Ou,bt)<0)Ni!==void 0&&de(Ni,Ou)<0?(wt[qr]=Ni,wt[h0]=bt,qr=h0):(wt[qr]=Ou,wt[Qr]=bt,qr=Qr);else if(Ni!==void 0&&de(Ni,bt)<0)wt[qr]=Ni,wt[h0]=bt,qr=h0;else return}}function de(wt,bt){var Hn=wt.sortIndex-bt.sortIndex;return Hn!==0?Hn:wt.id-bt.id}var Ce=0,oe=1,He=2,dt=3,At=4,nn=5,an=0,Mn=0,lr=4,ln=a?typeof SharedArrayBuffer=="function"?new SharedArrayBuffer(lr*Int32Array.BYTES_PER_ELEMENT):typeof ArrayBuffer=="function"?new ArrayBuffer(lr*Int32Array.BYTES_PER_ELEMENT):null:null,Vt=a&&ln!==null?new Int32Array(ln):[],Dr=0,w=1,jt=2,Xn=3;a&&(Vt[Dr]=Ce,Vt[Xn]=0,Vt[w]=0);var vr=131072,jr=524288,fr=0,zr=null,Qt=null,wu=0,d0=1,Ro=2,Jo=3,Ps=4,Zo=5,$o=6,qt=7,Ai=8;function su(wt){if(Qt!==null){var bt=wu;if(wu+=wt.length,wu+1>fr){if(fr*=2,fr>jr){console.error("Scheduler Profiling: Event log exceeded maximum size. Don't forget to call `stopLoggingProfilingEvents()`."),wr();return}var Hn=new Int32Array(fr*4);Hn.set(Qt),zr=Hn.buffer,Qt=Hn}Qt.set(wt,bt)}}function mi(){fr=vr,zr=new ArrayBuffer(fr*4),Qt=new Int32Array(zr),wu=0}function wr(){var wt=zr;return fr=0,zr=null,Qt=null,wu=0,wt}function el(wt,bt){a&&(Vt[Xn]++,Qt!==null&&su([d0,bt*1e3,wt.id,wt.priorityLevel]))}function Y0(wt,bt){a&&(Vt[Dr]=Ce,Vt[w]=0,Vt[Xn]--,Qt!==null&&su([Ro,bt*1e3,wt.id]))}function Uu(wt,bt){a&&(Vt[Xn]--,Qt!==null&&su([Ps,bt*1e3,wt.id]))}function K0(wt,bt){a&&(Vt[Dr]=Ce,Vt[w]=0,Vt[Xn]--,Qt!==null&&su([Jo,bt*1e3,wt.id]))}function Xr(wt,bt){a&&(an++,Vt[Dr]=wt.priorityLevel,Vt[w]=wt.id,Vt[jt]=an,Qt!==null&&su([Zo,bt*1e3,wt.id,an]))}function Oo(wt,bt){a&&(Vt[Dr]=Ce,Vt[w]=0,Vt[jt]=0,Qt!==null&&su([$o,bt*1e3,wt.id,an]))}function Mo(wt){a&&(Mn++,Qt!==null&&su([qt,wt*1e3,Mn]))}function F0(wt){a&&Qt!==null&&su([Ai,wt*1e3,Mn])}var au=1073741823,Li=-1,Is=250,Xl=5e3,P0=1e4,p0=au,Hr=[],Ri=[],X0=1,gi=!1,en=null,bn=dt,Oi=!1,yi=!1,Wt=!1;function Ru(wt){for(var bt=It(Ri);bt!==null;){if(bt.callback===null)Xt(Ri);else if(bt.startTime<=wt)Xt(Ri),bt.sortIndex=bt.expirationTime,Ve(Hr,bt),a&&(el(bt,wt),bt.isQueued=!0);else return;bt=It(Ri)}}function eu(wt){if(Wt=!1,Ru(wt),!yi)if(It(Hr)!==null)yi=!0,c(Q0);else{var bt=It(Ri);bt!==null&&_(eu,bt.startTime-wt)}}function Q0(wt,bt){a&&F0(bt),yi=!1,Wt&&(Wt=!1,t()),Oi=!0;var Hn=bn;try{if(a)try{return Yi(wt,bt)}catch(Qr){if(en!==null){var qr=bi.unstable_now();K0(en,qr),en.isQueued=!1}throw Qr}else return Yi(wt,bt)}finally{if(en=null,bn=Hn,Oi=!1,a){var Ki=bi.unstable_now();Mo(Ki)}}}function Yi(wt,bt){var Hn=bt;for(Ru(Hn),en=It(Hr);en!==null&&!(i&&gi)&&!(en.expirationTime>Hn&&(!wt||O()));){var qr=en.callback;if(qr!==null){en.callback=null,bn=en.priorityLevel;var Ki=en.expirationTime<=Hn;Xr(en,Hn);var Qr=qr(Ki);Hn=bi.unstable_now(),typeof Qr=="function"?(en.callback=Qr,Oo(en,Hn)):(a&&(Y0(en,Hn),en.isQueued=!1),en===It(Hr)&&Xt(Hr)),Ru(Hn)}else Xt(Hr);en=It(Hr)}if(en!==null)return!0;var Ou=It(Ri);return Ou!==null&&_(eu,Ou.startTime-Hn),!1}function Ql(wt,bt){switch(wt){case oe:case He:case dt:case At:case nn:break;default:wt=dt}var Hn=bn;bn=wt;try{return bt()}finally{bn=Hn}}function ko(wt){var bt;switch(bn){case oe:case He:case dt:bt=dt;break;default:bt=bn;break}var Hn=bn;bn=bt;try{return wt()}finally{bn=Hn}}function ai(wt){var bt=bn;return function(){var Hn=bn;bn=bt;try{return wt.apply(this,arguments)}finally{bn=Hn}}}function ao(wt){switch(wt){case oe:return Li;case He:return Is;case nn:return p0;case At:return P0;case dt:default:return Xl}}function Jl(wt,bt,Hn){var qr=bi.unstable_now(),Ki,Qr;if(typeof Hn=="object"&&Hn!==null){var Ou=Hn.delay;typeof Ou=="number"&&Ou>0?Ki=qr+Ou:Ki=qr,Qr=typeof Hn.timeout=="number"?Hn.timeout:ao(wt)}else Qr=ao(wt),Ki=qr;var h0=Ki+Qr,Ni={id:X0++,callback:bt,priorityLevel:wt,startTime:Ki,expirationTime:h0,sortIndex:-1};return a&&(Ni.isQueued=!1),Ki>qr?(Ni.sortIndex=Ki,Ve(Ri,Ni),It(Hr)===null&&Ni===It(Ri)&&(Wt?t():Wt=!0,_(eu,Ki-qr))):(Ni.sortIndex=h0,Ve(Hr,Ni),a&&(el(Ni,qr),Ni.isQueued=!0),!yi&&!Oi&&(yi=!0,c(Q0))),Ni}function Lo(){gi=!0}function bs(){gi=!1,!yi&&!Oi&&(yi=!0,c(Q0))}function $n(){return It(Hr)}function tl(wt){if(a&&wt.isQueued){var bt=bi.unstable_now();Uu(wt,bt),wt.isQueued=!1}wt.callback=null}function fo(){return bn}function I0(){var wt=bi.unstable_now();Ru(wt);var bt=It(Hr);return bt!==en&&en!==null&&bt!==null&&bt.callback!==null&&bt.startTime<=wt&&bt.expirationTime<en.expirationTime||O()}var Sl=N,No=a?{startLoggingProfilingEvents:mi,stopLoggingProfilingEvents:wr,sharedProfilingBuffer:ln}:null;bi.unstable_ImmediatePriority=oe,bi.unstable_UserBlockingPriority=He,bi.unstable_NormalPriority=dt,bi.unstable_IdlePriority=nn,bi.unstable_LowPriority=At,bi.unstable_runWithPriority=Ql,bi.unstable_next=ko,bi.unstable_scheduleCallback=Jl,bi.unstable_cancelCallback=tl,bi.unstable_wrapCallback=ai,bi.unstable_getCurrentPriorityLevel=fo,bi.unstable_shouldYield=I0,bi.unstable_requestPaint=Sl,bi.unstable_continueExecution=bs,bi.unstable_pauseExecution=Lo,bi.unstable_getFirstCallbackNode=$n,bi.unstable_Profiling=No}()});var Q_=Ke((IW,ND)=>{"use strict";process.env.NODE_ENV==="production"?ND.exports=lT():ND.exports=sT()});var aT=Ke((bW,Xg)=>{Xg.exports=function i(o){"use strict";var a=Ig(),c=ki(),_=Q_();function t(y){for(var g="https://reactjs.org/docs/error-decoder.html?invariant="+y,A=1;A<arguments.length;A++)g+="&args[]="+encodeURIComponent(arguments[A]);return"Minified React error #"+y+"; visit "+g+" for the full message or use the non-minified dev environment for full errors and additional helpful warnings."}var O=c.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;O.hasOwnProperty("ReactCurrentDispatcher")||(O.ReactCurrentDispatcher={current:null}),O.hasOwnProperty("ReactCurrentBatchConfig")||(O.ReactCurrentBatchConfig={suspense:null});var N=typeof Symbol=="function"&&Symbol.for,M=N?Symbol.for("react.element"):60103,T=N?Symbol.for("react.portal"):60106,B=N?Symbol.for("react.fragment"):60107,H=N?Symbol.for("react.strict_mode"):60108,q=N?Symbol.for("react.profiler"):60114,ne=N?Symbol.for("react.provider"):60109,m=N?Symbol.for("react.context"):60110,he=N?Symbol.for("react.concurrent_mode"):60111,De=N?Symbol.for("react.forward_ref"):60112,se=N?Symbol.for("react.suspense"):60113,fe=N?Symbol.for("react.suspense_list"):60120,_e=N?Symbol.for("react.memo"):60115,ce=N?Symbol.for("react.lazy"):60116;N&&Symbol.for("react.fundamental"),N&&Symbol.for("react.responder"),N&&Symbol.for("react.scope");var me=typeof Symbol=="function"&&Symbol.iterator;function ie(y){return y===null||typeof y!="object"?null:(y=me&&y[me]||y["@@iterator"],typeof y=="function"?y:null)}function Oe(y){if(y._status===-1){y._status=0;var g=y._ctor;g=g(),y._result=g,g.then(function(A){y._status===0&&(A=A.default,y._status=1,y._result=A)},function(A){y._status===0&&(y._status=2,y._result=A)})}}function Ue(y){if(y==null)return null;if(typeof y=="function")return y.displayName||y.name||null;if(typeof y=="string")return y;switch(y){case B:return"Fragment";case T:return"Portal";case q:return"Profiler";case H:return"StrictMode";case se:return"Suspense";case fe:return"SuspenseList"}if(typeof y=="object")switch(y.$$typeof){case m:return"Context.Consumer";case ne:return"Context.Provider";case De:var g=y.render;return g=g.displayName||g.name||"",y.displayName||(g!==""?"ForwardRef("+g+")":"ForwardRef");case _e:return Ue(y.type);case ce:if(y=y._status===1?y._result:null)return Ue(y)}return null}function je(y){var g=y,A=y;if(y.alternate)for(;g.return;)g=g.return;else{y=g;do g=y,(g.effectTag&1026)!=0&&(A=g.return),y=g.return;while(y)}return g.tag===3?A:null}function at(y){if(je(y)!==y)throw Error(t(188))}function Dt(y){var g=y.alternate;if(!g){if(g=je(y),g===null)throw Error(t(188));return g!==y?null:y}for(var A=y,F=g;;){var b=A.return;if(b===null)break;var J=b.alternate;if(J===null){if(F=b.return,F!==null){A=F;continue}break}if(b.child===J.child){for(J=b.child;J;){if(J===A)return at(b),y;if(J===F)return at(b),g;J=J.sibling}throw Error(t(188))}if(A.return!==F.return)A=b,F=J;else{for(var pe=!1,gt=b.child;gt;){if(gt===A){pe=!0,A=b,F=J;break}if(gt===F){pe=!0,F=b,A=J;break}gt=gt.sibling}if(!pe){for(gt=J.child;gt;){if(gt===A){pe=!0,A=J,F=b;break}if(gt===F){pe=!0,F=J,A=b;break}gt=gt.sibling}if(!pe)throw Error(t(189))}}if(A.alternate!==F)throw Error(t(190))}if(A.tag!==3)throw Error(t(188));return A.stateNode.current===A?y:g}function Qe(y){if(y=Dt(y),!y)return null;for(var g=y;;){if(g.tag===5||g.tag===6)return g;if(g.child)g.child.return=g,g=g.child;else{if(g===y)break;for(;!g.sibling;){if(!g.return||g.return===y)return null;g=g.return}g.sibling.return=g.return,g=g.sibling}}return null}function ut(y){if(y=Dt(y),!y)return null;for(var g=y;;){if(g.tag===5||g.tag===6)return g;if(g.child&&g.tag!==4)g.child.return=g,g=g.child;else{if(g===y)break;for(;!g.sibling;){if(!g.return||g.return===y)return null;g=g.return}g.sibling.return=g.return,g=g.sibling}}return null}var Ve=o.getPublicInstance,It=o.getRootHostContext,Xt=o.getChildHostContext,rt=o.prepareForCommit,X=o.resetAfterCommit,de=o.createInstance,Ce=o.appendInitialChild,oe=o.finalizeInitialChildren,He=o.prepareUpdate,dt=o.shouldSetTextContent,At=o.shouldDeprioritizeSubtree,nn=o.createTextInstance,an=o.setTimeout,Mn=o.clearTimeout,lr=o.noTimeout,ln=o.isPrimaryRenderer,Vt=o.supportsMutation,Dr=o.supportsPersistence,w=o.supportsHydration,jt=o.appendChild,Xn=o.appendChildToContainer,vr=o.commitTextUpdate,jr=o.commitMount,fr=o.commitUpdate,zr=o.insertBefore,Qt=o.insertInContainerBefore,wu=o.removeChild,d0=o.removeChildFromContainer,Ro=o.resetTextContent,Jo=o.hideInstance,Ps=o.hideTextInstance,Zo=o.unhideInstance,$o=o.unhideTextInstance,qt=o.cloneInstance,Ai=o.createContainerChildSet,su=o.appendChildToContainerChildSet,mi=o.finalizeContainerChildren,wr=o.replaceContainerChildren,el=o.cloneHiddenInstance,Y0=o.cloneHiddenTextInstance,Uu=o.canHydrateInstance,K0=o.canHydrateTextInstance,Xr=o.isSuspenseInstancePending,Oo=o.isSuspenseInstanceFallback,Mo=o.getNextHydratableSibling,F0=o.getFirstHydratableChild,au=o.hydrateInstance,Li=o.hydrateTextInstance,Is=o.getNextHydratableInstanceAfterSuspenseInstance,Xl=o.commitHydratedContainer,P0=o.commitHydratedSuspenseInstance,p0=/^(.*)[\\\/]/;function Hr(y){var g="";do{e:switch(y.tag){case 3:case 4:case 6:case 7:case 10:case 9:var A="";break e;default:var F=y._debugOwner,b=y._debugSource,J=Ue(y.type);A=null,F&&(A=Ue(F.type)),F=J,J="",b?J=" (at "+b.fileName.replace(p0,"")+":"+b.lineNumber+")":A&&(J=" (created by "+A+")"),A=`
-    in `+(F||"Unknown")+J}g+=A,y=y.return}while(y);return g}new Set;var Ri=[],X0=-1;function gi(y){0>X0||(y.current=Ri[X0],Ri[X0]=null,X0--)}function en(y,g){X0++,Ri[X0]=y.current,y.current=g}var bn={},Oi={current:bn},yi={current:!1},Wt=bn;function Ru(y,g){var A=y.type.contextTypes;if(!A)return bn;var F=y.stateNode;if(F&&F.__reactInternalMemoizedUnmaskedChildContext===g)return F.__reactInternalMemoizedMaskedChildContext;var b={},J;for(J in A)b[J]=g[J];return F&&(y=y.stateNode,y.__reactInternalMemoizedUnmaskedChildContext=g,y.__reactInternalMemoizedMaskedChildContext=b),b}function eu(y){return y=y.childContextTypes,y!=null}function Q0(y){gi(yi,y),gi(Oi,y)}function Yi(y){gi(yi,y),gi(Oi,y)}function Ql(y,g,A){if(Oi.current!==bn)throw Error(t(168));en(Oi,g,y),en(yi,A,y)}function ko(y,g,A){var F=y.stateNode;if(y=g.childContextTypes,typeof F.getChildContext!="function")return A;F=F.getChildContext();for(var b in F)if(!(b in y))throw Error(t(108,Ue(g)||"Unknown",b));return a({},A,{},F)}function ai(y){var g=y.stateNode;return g=g&&g.__reactInternalMemoizedMergedChildContext||bn,Wt=Oi.current,en(Oi,g,y),en(yi,yi.current,y),!0}function ao(y,g,A){var F=y.stateNode;if(!F)throw Error(t(169));A?(g=ko(y,g,Wt),F.__reactInternalMemoizedMergedChildContext=g,gi(yi,y),gi(Oi,y),en(Oi,g,y)):gi(yi,y),en(yi,A,y)}var Jl=_.unstable_runWithPriority,Lo=_.unstable_scheduleCallback,bs=_.unstable_cancelCallback,$n=_.unstable_shouldYield,tl=_.unstable_requestPaint,fo=_.unstable_now,I0=_.unstable_getCurrentPriorityLevel,Sl=_.unstable_ImmediatePriority,No=_.unstable_UserBlockingPriority,wt=_.unstable_NormalPriority,bt=_.unstable_LowPriority,Hn=_.unstable_IdlePriority,qr={},Ki=tl!==void 0?tl:function(){},Qr=null,Ou=null,h0=!1,Ni=fo(),v0=1e4>Ni?fo:function(){return fo()-Ni};function vs(){switch(I0()){case Sl:return 99;case No:return 98;case wt:return 97;case bt:return 96;case Hn:return 95;default:throw Error(t(332))}}function Tt(y){switch(y){case 99:return Sl;case 98:return No;case 97:return wt;case 96:return bt;case 95:return Hn;default:throw Error(t(332))}}function co(y,g){return y=Tt(y),Jl(y,g)}function nl(y,g,A){return y=Tt(y),Lo(y,g,A)}function Zl(y){return Qr===null?(Qr=[y],Ou=Lo(Sl,ms)):Qr.push(y),qr}function ju(){if(Ou!==null){var y=Ou;Ou=null,bs(y)}ms()}function ms(){if(!h0&&Qr!==null){h0=!0;var y=0;try{var g=Qr;co(99,function(){for(;y<g.length;y++){var A=g[y];do A=A(!0);while(A!==null)}}),Qr=null}catch(A){throw Qr!==null&&(Qr=Qr.slice(y+1)),Lo(Sl,ju),A}finally{h0=!1}}}var b0=3;function Q(y,g,A){return A/=10,1073741821-(((1073741821-y+g/10)/A|0)+1)*A}function we(y,g){return y===g&&(y!==0||1/y==1/g)||y!==y&&g!==g}var Ne=typeof Object.is=="function"?Object.is:we,Le=Object.prototype.hasOwnProperty;function pt(y,g){if(Ne(y,g))return!0;if(typeof y!="object"||y===null||typeof g!="object"||g===null)return!1;var A=Object.keys(y),F=Object.keys(g);if(A.length!==F.length)return!1;for(F=0;F<A.length;F++)if(!Le.call(g,A[F])||!Ne(y[A[F]],g[A[F]]))return!1;return!0}function Yn(y,g){if(y&&y.defaultProps){g=a({},g),y=y.defaultProps;for(var A in y)g[A]===void 0&&(g[A]=y[A])}return g}var Cn={current:null},cr=null,Si=null,Mu=null;function zu(){Mu=Si=cr=null}function Hu(y,g){var A=y.type._context;ln?(en(Cn,A._currentValue,y),A._currentValue=g):(en(Cn,A._currentValue2,y),A._currentValue2=g)}function Su(y){var g=Cn.current;gi(Cn,y),y=y.type._context,ln?y._currentValue=g:y._currentValue2=g}function Ti(y,g){for(;y!==null;){var A=y.alternate;if(y.childExpirationTime<g)y.childExpirationTime=g,A!==null&&A.childExpirationTime<g&&(A.childExpirationTime=g);else if(A!==null&&A.childExpirationTime<g)A.childExpirationTime=g;else break;y=y.return}}function Fo(y,g){cr=y,Mu=Si=null,y=y.dependencies,y!==null&&y.firstContext!==null&&(y.expirationTime>=g&&(ho=!0),y.firstContext=null)}function ku(y,g){if(Mu!==y&&g!==!1&&g!==0)if((typeof g!="number"||g===1073741823)&&(Mu=y,g=1073741823),g={context:y,observedBits:g,next:null},Si===null){if(cr===null)throw Error(t(308));Si=g,cr.dependencies={expirationTime:0,firstContext:g,responders:null}}else Si=Si.next=g;return ln?y._currentValue:y._currentValue2}var po=!1;function qu(y){return{baseState:y,firstUpdate:null,lastUpdate:null,firstCapturedUpdate:null,lastCapturedUpdate:null,firstEffect:null,lastEffect:null,firstCapturedEffect:null,lastCapturedEffect:null}}function Ia(y){return{baseState:y.baseState,firstUpdate:y.firstUpdate,lastUpdate:y.lastUpdate,firstCapturedUpdate:null,lastCapturedUpdate:null,firstEffect:null,lastEffect:null,firstCapturedEffect:null,lastCapturedEffect:null}}function m0(y,g){return{expirationTime:y,suspenseConfig:g,tag:0,payload:null,callback:null,next:null,nextEffect:null}}function ua(y,g){y.lastUpdate===null?y.firstUpdate=y.lastUpdate=g:(y.lastUpdate.next=g,y.lastUpdate=g)}function J0(y,g){var A=y.alternate;if(A===null){var F=y.updateQueue,b=null;F===null&&(F=y.updateQueue=qu(y.memoizedState))}else F=y.updateQueue,b=A.updateQueue,F===null?b===null?(F=y.updateQueue=qu(y.memoizedState),b=A.updateQueue=qu(A.memoizedState)):F=y.updateQueue=Ia(b):b===null&&(b=A.updateQueue=Ia(F));b===null||F===b?ua(F,g):F.lastUpdate===null||b.lastUpdate===null?(ua(F,g),ua(b,g)):(ua(F,g),b.lastUpdate=g)}function oa(y,g){var A=y.updateQueue;A=A===null?y.updateQueue=qu(y.memoizedState):ba(y,A),A.lastCapturedUpdate===null?A.firstCapturedUpdate=A.lastCapturedUpdate=g:(A.lastCapturedUpdate.next=g,A.lastCapturedUpdate=g)}function ba(y,g){var A=y.alternate;return A!==null&&g===A.updateQueue&&(g=y.updateQueue=Ia(g)),g}function gs(y,g,A,F,b,J){switch(A.tag){case 1:return y=A.payload,typeof y=="function"?y.call(J,F,b):y;case 3:y.effectTag=y.effectTag&-4097|64;case 0:if(y=A.payload,b=typeof y=="function"?y.call(J,F,b):y,b==null)break;return a({},F,b);case 2:po=!0}return F}function S0(y,g,A,F,b){po=!1,g=ba(y,g);for(var J=g.baseState,pe=null,gt=0,xt=g.firstUpdate,kt=J;xt!==null;){var xr=xt.expirationTime;xr<b?(pe===null&&(pe=xt,J=kt),gt<xr&&(gt=xr)):(dc(xr,xt.suspenseConfig),kt=gs(y,g,xt,kt,A,F),xt.callback!==null&&(y.effectTag|=32,xt.nextEffect=null,g.lastEffect===null?g.firstEffect=g.lastEffect=xt:(g.lastEffect.nextEffect=xt,g.lastEffect=xt))),xt=xt.next}for(xr=null,xt=g.firstCapturedUpdate;xt!==null;){var i0=xt.expirationTime;i0<b?(xr===null&&(xr=xt,pe===null&&(J=kt)),gt<i0&&(gt=i0)):(kt=gs(y,g,xt,kt,A,F),xt.callback!==null&&(y.effectTag|=32,xt.nextEffect=null,g.lastCapturedEffect===null?g.firstCapturedEffect=g.lastCapturedEffect=xt:(g.lastCapturedEffect.nextEffect=xt,g.lastCapturedEffect=xt))),xt=xt.next}pe===null&&(g.lastUpdate=null),xr===null?g.lastCapturedUpdate=null:y.effectTag|=32,pe===null&&xr===null&&(J=kt),g.baseState=J,g.firstUpdate=pe,g.firstCapturedUpdate=xr,ja(gt),y.expirationTime=gt,y.memoizedState=kt}function Qn(y,g,A){g.firstCapturedUpdate!==null&&(g.lastUpdate!==null&&(g.lastUpdate.next=g.firstCapturedUpdate,g.lastUpdate=g.lastCapturedUpdate),g.firstCapturedUpdate=g.lastCapturedUpdate=null),fc(g.firstEffect,A),g.firstEffect=g.lastEffect=null,fc(g.firstCapturedEffect,A),g.firstCapturedEffect=g.lastCapturedEffect=null}function fc(y,g){for(;y!==null;){var A=y.callback;if(A!==null){y.callback=null;var F=g;if(typeof A!="function")throw Error(t(191,A));A.call(F)}y=y.nextEffect}}var fi=O.ReactCurrentBatchConfig,$r=new c.Component().refs;function $l(y,g,A,F){g=y.memoizedState,A=A(F,g),A=A==null?g:a({},g,A),y.memoizedState=A,F=y.updateQueue,F!==null&&y.expirationTime===0&&(F.baseState=A)}var la={isMounted:function(y){return(y=y._reactInternalFiber)?je(y)===y:!1},enqueueSetState:function(y,g,A){y=y._reactInternalFiber;var F=D0(),b=fi.suspense;F=Un(F,y,b),b=m0(F,b),b.payload=g,A!=null&&(b.callback=A),J0(y,b),t0(y,F)},enqueueReplaceState:function(y,g,A){y=y._reactInternalFiber;var F=D0(),b=fi.suspense;F=Un(F,y,b),b=m0(F,b),b.tag=1,b.payload=g,A!=null&&(b.callback=A),J0(y,b),t0(y,F)},enqueueForceUpdate:function(y,g){y=y._reactInternalFiber;var A=D0(),F=fi.suspense;A=Un(A,y,F),F=m0(A,F),F.tag=2,g!=null&&(F.callback=g),J0(y,F),t0(y,A)}};function hf(y,g,A,F,b,J,pe){return y=y.stateNode,typeof y.shouldComponentUpdate=="function"?y.shouldComponentUpdate(F,J,pe):g.prototype&&g.prototype.isPureReactComponent?!pt(A,F)||!pt(b,J):!0}function Bs(y,g,A){var F=!1,b=bn,J=g.contextType;return typeof J=="object"&&J!==null?J=ku(J):(b=eu(g)?Wt:Oi.current,F=g.contextTypes,J=(F=F!=null)?Ru(y,b):bn),g=new g(A,J),y.memoizedState=g.state!==null&&g.state!==void 0?g.state:null,g.updater=la,y.stateNode=g,g._reactInternalFiber=y,F&&(y=y.stateNode,y.__reactInternalMemoizedUnmaskedChildContext=b,y.__reactInternalMemoizedMaskedChildContext=J),g}function Ba(y,g,A,F){y=g.state,typeof g.componentWillReceiveProps=="function"&&g.componentWillReceiveProps(A,F),typeof g.UNSAFE_componentWillReceiveProps=="function"&&g.UNSAFE_componentWillReceiveProps(A,F),g.state!==y&&la.enqueueReplaceState(g,g.state,null)}function Us(y,g,A,F){var b=y.stateNode;b.props=A,b.state=y.memoizedState,b.refs=$r;var J=g.contextType;typeof J=="object"&&J!==null?b.context=ku(J):(J=eu(g)?Wt:Oi.current,b.context=Ru(y,J)),J=y.updateQueue,J!==null&&(S0(y,J,A,b,F),b.state=y.memoizedState),J=g.getDerivedStateFromProps,typeof J=="function"&&($l(y,g,J,A),b.state=y.memoizedState),typeof g.getDerivedStateFromProps=="function"||typeof b.getSnapshotBeforeUpdate=="function"||typeof b.UNSAFE_componentWillMount!="function"&&typeof b.componentWillMount!="function"||(g=b.state,typeof b.componentWillMount=="function"&&b.componentWillMount(),typeof b.UNSAFE_componentWillMount=="function"&&b.UNSAFE_componentWillMount(),g!==b.state&&la.enqueueReplaceState(b,b.state,null),J=y.updateQueue,J!==null&&(S0(y,J,A,b,F),b.state=y.memoizedState)),typeof b.componentDidMount=="function"&&(y.effectTag|=4)}var g0=Array.isArray;function js(y,g,A){if(y=A.ref,y!==null&&typeof y!="function"&&typeof y!="object"){if(A._owner){if(A=A._owner,A){if(A.tag!==1)throw Error(t(309));var F=A.stateNode}if(!F)throw Error(t(147,y));var b=""+y;return g!==null&&g.ref!==null&&typeof g.ref=="function"&&g.ref._stringRef===b?g.ref:(g=function(J){var pe=F.refs;pe===$r&&(pe=F.refs={}),J===null?delete pe[b]:pe[b]=J},g._stringRef=b,g)}if(typeof y!="string")throw Error(t(284));if(!A._owner)throw Error(t(290,y))}return y}function ji(y,g){if(y.type!=="textarea")throw Error(t(31,Object.prototype.toString.call(g)==="[object Object]"?"object with keys {"+Object.keys(g).join(", ")+"}":g,""))}function U(y){function g(We,ze){if(y){var lt=We.lastEffect;lt!==null?(lt.nextEffect=ze,We.lastEffect=ze):We.firstEffect=We.lastEffect=ze,ze.nextEffect=null,ze.effectTag=8}}function A(We,ze){if(!y)return null;for(;ze!==null;)g(We,ze),ze=ze.sibling;return null}function F(We,ze){for(We=new Map;ze!==null;)ze.key!==null?We.set(ze.key,ze):We.set(ze.index,ze),ze=ze.sibling;return We}function b(We,ze,lt){return We=Gu(We,ze,lt),We.index=0,We.sibling=null,We}function J(We,ze,lt){return We.index=lt,y?(lt=We.alternate,lt!==null?(lt=lt.index,lt<ze?(We.effectTag=2,ze):lt):(We.effectTag=2,ze)):ze}function pe(We){return y&&We.alternate===null&&(We.effectTag=2),We}function gt(We,ze,lt,$t){return ze===null||ze.tag!==6?(ze=j0(lt,We.mode,$t),ze.return=We,ze):(ze=b(ze,lt,$t),ze.return=We,ze)}function xt(We,ze,lt,$t){return ze!==null&&ze.elementType===lt.type?($t=b(ze,lt.props,$t),$t.ref=js(We,ze,lt),$t.return=We,$t):($t=Wa(lt.type,lt.key,lt.props,null,We.mode,$t),$t.ref=js(We,ze,lt),$t.return=We,$t)}function kt(We,ze,lt,$t){return ze===null||ze.tag!==4||ze.stateNode.containerInfo!==lt.containerInfo||ze.stateNode.implementation!==lt.implementation?(ze=wf(lt,We.mode,$t),ze.return=We,ze):(ze=b(ze,lt.children||[],$t),ze.return=We,ze)}function xr(We,ze,lt,$t,Wn){return ze===null||ze.tag!==7?(ze=r0(lt,We.mode,$t,Wn),ze.return=We,ze):(ze=b(ze,lt,$t),ze.return=We,ze)}function i0(We,ze,lt){if(typeof ze=="string"||typeof ze=="number")return ze=j0(""+ze,We.mode,lt),ze.return=We,ze;if(typeof ze=="object"&&ze!==null){switch(ze.$$typeof){case M:return lt=Wa(ze.type,ze.key,ze.props,null,We.mode,lt),lt.ref=js(We,null,ze),lt.return=We,lt;case T:return ze=wf(ze,We.mode,lt),ze.return=We,ze}if(g0(ze)||ie(ze))return ze=r0(ze,We.mode,lt,null),ze.return=We,ze;ji(We,ze)}return null}function du(We,ze,lt,$t){var Wn=ze!==null?ze.key:null;if(typeof lt=="string"||typeof lt=="number")return Wn!==null?null:gt(We,ze,""+lt,$t);if(typeof lt=="object"&&lt!==null){switch(lt.$$typeof){case M:return lt.key===Wn?lt.type===B?xr(We,ze,lt.props.children,$t,Wn):xt(We,ze,lt,$t):null;case T:return lt.key===Wn?kt(We,ze,lt,$t):null}if(g0(lt)||ie(lt))return Wn!==null?null:xr(We,ze,lt,$t,null);ji(We,lt)}return null}function z0(We,ze,lt,$t,Wn){if(typeof $t=="string"||typeof $t=="number")return We=We.get(lt)||null,gt(ze,We,""+$t,Wn);if(typeof $t=="object"&&$t!==null){switch($t.$$typeof){case M:return We=We.get($t.key===null?lt:$t.key)||null,$t.type===B?xr(ze,We,$t.props.children,Wn,$t.key):xt(ze,We,$t,Wn);case T:return We=We.get($t.key===null?lt:$t.key)||null,kt(ze,We,$t,Wn)}if(g0($t)||ie($t))return We=We.get(lt)||null,xr(ze,We,$t,Wn,null);ji(ze,$t)}return null}function Ml(We,ze,lt,$t){for(var Wn=null,si=null,ur=ze,ci=ze=0,Qi=null;ur!==null&&ci<lt.length;ci++){ur.index>ci?(Qi=ur,ur=null):Qi=ur.sibling;var Gr=du(We,ur,lt[ci],$t);if(Gr===null){ur===null&&(ur=Qi);break}y&&ur&&Gr.alternate===null&&g(We,ur),ze=J(Gr,ze,ci),si===null?Wn=Gr:si.sibling=Gr,si=Gr,ur=Qi}if(ci===lt.length)return A(We,ur),Wn;if(ur===null){for(;ci<lt.length;ci++)ur=i0(We,lt[ci],$t),ur!==null&&(ze=J(ur,ze,ci),si===null?Wn=ur:si.sibling=ur,si=ur);return Wn}for(ur=F(We,ur);ci<lt.length;ci++)Qi=z0(ur,We,ci,lt[ci],$t),Qi!==null&&(y&&Qi.alternate!==null&&ur.delete(Qi.key===null?ci:Qi.key),ze=J(Qi,ze,ci),si===null?Wn=Qi:si.sibling=Qi,si=Qi);return y&&ur.forEach(function(Cu){return g(We,Cu)}),Wn}function u0(We,ze,lt,$t){var Wn=ie(lt);if(typeof Wn!="function")throw Error(t(150));if(lt=Wn.call(lt),lt==null)throw Error(t(151));for(var si=Wn=null,ur=ze,ci=ze=0,Qi=null,Gr=lt.next();ur!==null&&!Gr.done;ci++,Gr=lt.next()){ur.index>ci?(Qi=ur,ur=null):Qi=ur.sibling;var Cu=du(We,ur,Gr.value,$t);if(Cu===null){ur===null&&(ur=Qi);break}y&&ur&&Cu.alternate===null&&g(We,ur),ze=J(Cu,ze,ci),si===null?Wn=Cu:si.sibling=Cu,si=Cu,ur=Qi}if(Gr.done)return A(We,ur),Wn;if(ur===null){for(;!Gr.done;ci++,Gr=lt.next())Gr=i0(We,Gr.value,$t),Gr!==null&&(ze=J(Gr,ze,ci),si===null?Wn=Gr:si.sibling=Gr,si=Gr);return Wn}for(ur=F(We,ur);!Gr.done;ci++,Gr=lt.next())Gr=z0(ur,We,ci,Gr.value,$t),Gr!==null&&(y&&Gr.alternate!==null&&ur.delete(Gr.key===null?ci:Gr.key),ze=J(Gr,ze,ci),si===null?Wn=Gr:si.sibling=Gr,si=Gr);return y&&ur.forEach(function(Va){return g(We,Va)}),Wn}return function(We,ze,lt,$t){var Wn=typeof lt=="object"&&lt!==null&&lt.type===B&&lt.key===null;Wn&&(lt=lt.props.children);var si=typeof lt=="object"&&lt!==null;if(si)switch(lt.$$typeof){case M:e:{for(si=lt.key,Wn=ze;Wn!==null;){if(Wn.key===si)if(Wn.tag===7?lt.type===B:Wn.elementType===lt.type){A(We,Wn.sibling),ze=b(Wn,lt.type===B?lt.props.children:lt.props,$t),ze.ref=js(We,Wn,lt),ze.return=We,We=ze;break e}else{A(We,Wn);break}else g(We,Wn);Wn=Wn.sibling}lt.type===B?(ze=r0(lt.props.children,We.mode,$t,lt.key),ze.return=We,We=ze):($t=Wa(lt.type,lt.key,lt.props,null,We.mode,$t),$t.ref=js(We,ze,lt),$t.return=We,We=$t)}return pe(We);case T:e:{for(Wn=lt.key;ze!==null;){if(ze.key===Wn)if(ze.tag===4&&ze.stateNode.containerInfo===lt.containerInfo&&ze.stateNode.implementation===lt.implementation){A(We,ze.sibling),ze=b(ze,lt.children||[],$t),ze.return=We,We=ze;break e}else{A(We,ze);break}else g(We,ze);ze=ze.sibling}ze=wf(lt,We.mode,$t),ze.return=We,We=ze}return pe(We)}if(typeof lt=="string"||typeof lt=="number")return lt=""+lt,ze!==null&&ze.tag===6?(A(We,ze.sibling),ze=b(ze,lt,$t),ze.return=We,We=ze):(A(We,ze),ze=j0(lt,We.mode,$t),ze.return=We,We=ze),pe(We);if(g0(lt))return Ml(We,ze,lt,$t);if(ie(lt))return u0(We,ze,lt,$t);if(si&&ji(We,lt),typeof lt=="undefined"&&!Wn)switch(We.tag){case 1:case 0:throw We=We.type,Error(t(152,We.displayName||We.name||"Component"))}return A(We,ze)}}var z=U(!0),G=U(!1),$={},Te={current:$},ye={current:$},Ae={current:$};function Z(y){if(y===$)throw Error(t(174));return y}function ke(y,g){en(Ae,g,y),en(ye,y,y),en(Te,$,y),g=It(g),gi(Te,y),en(Te,g,y)}function Je(y){gi(Te,y),gi(ye,y),gi(Ae,y)}function vt(y){var g=Z(Ae.current),A=Z(Te.current);g=Xt(A,y.type,g),A!==g&&(en(ye,y,y),en(Te,g,y))}function ue(y){ye.current===y&&(gi(Te,y),gi(ye,y))}var qe={current:0};function nt(y){for(var g=y;g!==null;){if(g.tag===13){var A=g.memoizedState;if(A!==null&&(A=A.dehydrated,A===null||Xr(A)||Oo(A)))return g}else if(g.tag===19&&g.memoizedProps.revealOrder!==void 0){if((g.effectTag&64)!=0)return g}else if(g.child!==null){g.child.return=g,g=g.child;continue}if(g===y)break;for(;g.sibling===null;){if(g.return===null||g.return===y)return null;g=g.return}g.sibling.return=g.return,g=g.sibling}return null}function Ct(y,g){return{responder:y,props:g}}var Mt=O.ReactCurrentDispatcher,Pt=O.ReactCurrentBatchConfig,sn=0,rn=null,Nt=null,Dn=null,dr=null,er=null,Cr=null,Rn=0,Lr=null,y0=0,Nr=!1,it=null,Et=0;function et(){throw Error(t(321))}function Ft(y,g){if(g===null)return!1;for(var A=0;A<g.length&&A<y.length;A++)if(!Ne(y[A],g[A]))return!1;return!0}function un(y,g,A,F,b,J){if(sn=J,rn=g,Dn=y!==null?y.memoizedState:null,Mt.current=Dn===null?Bo:_s,g=A(F,b),Nr){do Nr=!1,Et+=1,Dn=y!==null?y.memoizedState:null,Cr=dr,Lr=er=Nt=null,Mt.current=_s,g=A(F,b);while(Nr);it=null,Et=0}if(Mt.current=bo,y=rn,y.memoizedState=dr,y.expirationTime=Rn,y.updateQueue=Lr,y.effectTag|=y0,y=Nt!==null&&Nt.next!==null,sn=0,Cr=er=dr=Dn=Nt=rn=null,Rn=0,Lr=null,y0=0,y)throw Error(t(300));return g}function fn(){Mt.current=bo,sn=0,Cr=er=dr=Dn=Nt=rn=null,Rn=0,Lr=null,y0=0,Nr=!1,it=null,Et=0}function Jn(){var y={memoizedState:null,baseState:null,queue:null,baseUpdate:null,next:null};return er===null?dr=er=y:er=er.next=y,er}function Sr(){if(Cr!==null)er=Cr,Cr=er.next,Nt=Dn,Dn=Nt!==null?Nt.next:null;else{if(Dn===null)throw Error(t(310));Nt=Dn;var y={memoizedState:Nt.memoizedState,baseState:Nt.baseState,queue:Nt.queue,baseUpdate:Nt.baseUpdate,next:null};er=er===null?dr=y:er.next=y,Dn=Nt.next}return er}function fu(y,g){return typeof g=="function"?g(y):g}function Lu(y){var g=Sr(),A=g.queue;if(A===null)throw Error(t(311));if(A.lastRenderedReducer=y,0<Et){var F=A.dispatch;if(it!==null){var b=it.get(A);if(b!==void 0){it.delete(A);var J=g.memoizedState;do J=y(J,b.action),b=b.next;while(b!==null);return Ne(J,g.memoizedState)||(ho=!0),g.memoizedState=J,g.baseUpdate===A.last&&(g.baseState=J),A.lastRenderedState=J,[J,F]}}return[g.memoizedState,F]}F=A.last;var pe=g.baseUpdate;if(J=g.baseState,pe!==null?(F!==null&&(F.next=null),F=pe.next):F=F!==null?F.next:null,F!==null){var gt=b=null,xt=F,kt=!1;do{var xr=xt.expirationTime;xr<sn?(kt||(kt=!0,gt=pe,b=J),xr>Rn&&(Rn=xr,ja(Rn))):(dc(xr,xt.suspenseConfig),J=xt.eagerReducer===y?xt.eagerState:y(J,xt.action)),pe=xt,xt=xt.next}while(xt!==null&&xt!==F);kt||(gt=pe,b=J),Ne(J,g.memoizedState)||(ho=!0),g.memoizedState=J,g.baseUpdate=gt,g.baseState=b,A.lastRenderedState=J}return[g.memoizedState,A.dispatch]}function T0(y){var g=Jn();return typeof y=="function"&&(y=y()),g.memoizedState=g.baseState=y,y=g.queue={last:null,dispatch:null,lastRenderedReducer:fu,lastRenderedState:y},y=y.dispatch=zs.bind(null,rn,y),[g.memoizedState,y]}function Z0(y){return Lu(fu,y)}function Nu(y,g,A,F){return y={tag:y,create:g,destroy:A,deps:F,next:null},Lr===null?(Lr={lastEffect:null},Lr.lastEffect=y.next=y):(g=Lr.lastEffect,g===null?Lr.lastEffect=y.next=y:(A=g.next,g.next=y,y.next=A,Lr.lastEffect=y)),y}function _i(y,g,A,F){var b=Jn();y0|=y,b.memoizedState=Nu(g,A,void 0,F===void 0?null:F)}function Po(y,g,A,F){var b=Sr();F=F===void 0?null:F;var J=void 0;if(Nt!==null){var pe=Nt.memoizedState;if(J=pe.destroy,F!==null&&Ft(F,pe.deps)){Nu(0,A,J,F);return}}y0|=y,b.memoizedState=Nu(g,A,J,F)}function rl(y,g){return _i(516,192,y,g)}function vf(y,g){return Po(516,192,y,g)}function Tl(y,g){if(typeof g=="function")return y=y(),g(y),function(){g(null)};if(g!=null)return y=y(),g.current=y,function(){g.current=null}}function mf(){}function Io(y,g){return Jn().memoizedState=[y,g===void 0?null:g],y}function ys(y,g){var A=Sr();g=g===void 0?null:g;var F=A.memoizedState;return F!==null&&g!==null&&Ft(g,F[1])?F[0]:(A.memoizedState=[y,g],y)}function zs(y,g,A){if(!(25>Et))throw Error(t(301));var F=y.alternate;if(y===rn||F!==null&&F===rn)if(Nr=!0,y={expirationTime:sn,suspenseConfig:null,action:A,eagerReducer:null,eagerState:null,next:null},it===null&&(it=new Map),A=it.get(g),A===void 0)it.set(g,y);else{for(g=A;g.next!==null;)g=g.next;g.next=y}else{var b=D0(),J=fi.suspense;b=Un(b,y,J),J={expirationTime:b,suspenseConfig:J,action:A,eagerReducer:null,eagerState:null,next:null};var pe=g.last;if(pe===null)J.next=J;else{var gt=pe.next;gt!==null&&(J.next=gt),pe.next=J}if(g.last=J,y.expirationTime===0&&(F===null||F.expirationTime===0)&&(F=g.lastRenderedReducer,F!==null))try{var xt=g.lastRenderedState,kt=F(xt,A);if(J.eagerReducer=F,J.eagerState=kt,Ne(kt,xt))return}catch(xr){}finally{}t0(y,b)}}var bo={readContext:ku,useCallback:et,useContext:et,useEffect:et,useImperativeHandle:et,useLayoutEffect:et,useMemo:et,useReducer:et,useRef:et,useState:et,useDebugValue:et,useResponder:et,useDeferredValue:et,useTransition:et},Bo={readContext:ku,useCallback:Io,useContext:ku,useEffect:rl,useImperativeHandle:function(y,g,A){return A=A!=null?A.concat([y]):null,_i(4,36,Tl.bind(null,g,y),A)},useLayoutEffect:function(y,g){return _i(4,36,y,g)},useMemo:function(y,g){var A=Jn();return g=g===void 0?null:g,y=y(),A.memoizedState=[y,g],y},useReducer:function(y,g,A){var F=Jn();return g=A!==void 0?A(g):g,F.memoizedState=F.baseState=g,y=F.queue={last:null,dispatch:null,lastRenderedReducer:y,lastRenderedState:g},y=y.dispatch=zs.bind(null,rn,y),[F.memoizedState,y]},useRef:function(y){var g=Jn();return y={current:y},g.memoizedState=y},useState:T0,useDebugValue:mf,useResponder:Ct,useDeferredValue:function(y,g){var A=T0(y),F=A[0],b=A[1];return rl(function(){_.unstable_next(function(){var J=Pt.suspense;Pt.suspense=g===void 0?null:g;try{b(y)}finally{Pt.suspense=J}})},[y,g]),F},useTransition:function(y){var g=T0(!1),A=g[0],F=g[1];return[Io(function(b){F(!0),_.unstable_next(function(){var J=Pt.suspense;Pt.suspense=y===void 0?null:y;try{F(!1),b()}finally{Pt.suspense=J}})},[y,A]),A]}},_s={readContext:ku,useCallback:ys,useContext:ku,useEffect:vf,useImperativeHandle:function(y,g,A){return A=A!=null?A.concat([y]):null,Po(4,36,Tl.bind(null,g,y),A)},useLayoutEffect:function(y,g){return Po(4,36,y,g)},useMemo:function(y,g){var A=Sr();g=g===void 0?null:g;var F=A.memoizedState;return F!==null&&g!==null&&Ft(g,F[1])?F[0]:(y=y(),A.memoizedState=[y,g],y)},useReducer:Lu,useRef:function(){return Sr().memoizedState},useState:Z0,useDebugValue:mf,useResponder:Ct,useDeferredValue:function(y,g){var A=Z0(y),F=A[0],b=A[1];return vf(function(){_.unstable_next(function(){var J=Pt.suspense;Pt.suspense=g===void 0?null:g;try{b(y)}finally{Pt.suspense=J}})},[y,g]),F},useTransition:function(y){var g=Z0(!1),A=g[0],F=g[1];return[ys(function(b){F(!0),_.unstable_next(function(){var J=Pt.suspense;Pt.suspense=y===void 0?null:y;try{F(!1),b()}finally{Pt.suspense=J}})},[y,A]),A]}},Qu=null,Tu=null,Ei=!1;function C0(y,g){var A=Ho(5,null,null,0);A.elementType="DELETED",A.type="DELETED",A.stateNode=g,A.return=y,A.effectTag=8,y.lastEffect!==null?(y.lastEffect.nextEffect=A,y.lastEffect=A):y.firstEffect=y.lastEffect=A}function $0(y,g){switch(y.tag){case 5:return g=Uu(g,y.type,y.pendingProps),g!==null?(y.stateNode=g,!0):!1;case 6:return g=K0(g,y.pendingProps),g!==null?(y.stateNode=g,!0):!1;case 13:return!1;default:return!1}}function Uo(y){if(Ei){var g=Tu;if(g){var A=g;if(!$0(y,g)){if(g=Mo(A),!g||!$0(y,g)){y.effectTag=y.effectTag&-1025|2,Ei=!1,Qu=y;return}C0(Qu,A)}Qu=y,Tu=F0(g)}else y.effectTag=y.effectTag&-1025|2,Ei=!1,Qu=y}}function sa(y){for(y=y.return;y!==null&&y.tag!==5&&y.tag!==3&&y.tag!==13;)y=y.return;Qu=y}function es(y){if(!w||y!==Qu)return!1;if(!Ei)return sa(y),Ei=!0,!1;var g=y.type;if(y.tag!==5||g!=="head"&&g!=="body"&&!dt(g,y.memoizedProps))for(g=Tu;g;)C0(y,g),g=Mo(g);if(sa(y),y.tag===13){if(!w)throw Error(t(316));if(y=y.memoizedState,y=y!==null?y.dehydrated:null,!y)throw Error(t(317));Tu=Is(y)}else Tu=Qu?Mo(y.stateNode):null;return!0}function tu(){w&&(Tu=Qu=null,Ei=!1)}var ei=O.ReactCurrentOwner,ho=!1;function Bi(y,g,A,F){g.child=y===null?G(g,null,A,F):z(g,y.child,A,F)}function Ci(y,g,A,F,b){A=A.render;var J=g.ref;return Fo(g,b),F=un(y,g,A,F,J,b),y!==null&&!ho?(g.updateQueue=y.updateQueue,g.effectTag&=-517,y.expirationTime<=b&&(y.expirationTime=0),gu(y,g,b)):(g.effectTag|=1,Bi(y,g,F,b),g.child)}function gf(y,g,A,F,b,J){if(y===null){var pe=A.type;return typeof pe=="function"&&!Df(pe)&&pe.defaultProps===void 0&&A.compare===null&&A.defaultProps===void 0?(g.tag=15,g.type=pe,yf(y,g,pe,F,b,J)):(y=Wa(A.type,null,F,null,g.mode,J),y.ref=g.ref,y.return=g,g.child=y)}return pe=y.child,b<J&&(b=pe.memoizedProps,A=A.compare,A=A!==null?A:pt,A(b,F)&&y.ref===g.ref)?gu(y,g,J):(g.effectTag|=1,y=Gu(pe,F,J),y.ref=g.ref,y.return=g,g.child=y)}function yf(y,g,A,F,b,J){return y!==null&&pt(y.memoizedProps,F)&&y.ref===g.ref&&(ho=!1,b<J)?gu(y,g,J):to(y,g,A,F,J)}function eo(y,g){var A=g.ref;(y===null&&A!==null||y!==null&&y.ref!==A)&&(g.effectTag|=128)}function to(y,g,A,F,b){var J=eu(A)?Wt:Oi.current;return J=Ru(g,J),Fo(g,b),A=un(y,g,A,F,J,b),y!==null&&!ho?(g.updateQueue=y.updateQueue,g.effectTag&=-517,y.expirationTime<=b&&(y.expirationTime=0),gu(y,g,b)):(g.effectTag|=1,Bi(y,g,A,b),g.child)}function xe(y,g,A,F,b){if(eu(A)){var J=!0;ai(g)}else J=!1;if(Fo(g,b),g.stateNode===null)y!==null&&(y.alternate=null,g.alternate=null,g.effectTag|=2),Bs(g,A,F,b),Us(g,A,F,b),F=!0;else if(y===null){var pe=g.stateNode,gt=g.memoizedProps;pe.props=gt;var xt=pe.context,kt=A.contextType;typeof kt=="object"&&kt!==null?kt=ku(kt):(kt=eu(A)?Wt:Oi.current,kt=Ru(g,kt));var xr=A.getDerivedStateFromProps,i0=typeof xr=="function"||typeof pe.getSnapshotBeforeUpdate=="function";i0||typeof pe.UNSAFE_componentWillReceiveProps!="function"&&typeof pe.componentWillReceiveProps!="function"||(gt!==F||xt!==kt)&&Ba(g,pe,F,kt),po=!1;var du=g.memoizedState;xt=pe.state=du;var z0=g.updateQueue;z0!==null&&(S0(g,z0,F,pe,b),xt=g.memoizedState),gt!==F||du!==xt||yi.current||po?(typeof xr=="function"&&($l(g,A,xr,F),xt=g.memoizedState),(gt=po||hf(g,A,gt,F,du,xt,kt))?(i0||typeof pe.UNSAFE_componentWillMount!="function"&&typeof pe.componentWillMount!="function"||(typeof pe.componentWillMount=="function"&&pe.componentWillMount(),typeof pe.UNSAFE_componentWillMount=="function"&&pe.UNSAFE_componentWillMount()),typeof pe.componentDidMount=="function"&&(g.effectTag|=4)):(typeof pe.componentDidMount=="function"&&(g.effectTag|=4),g.memoizedProps=F,g.memoizedState=xt),pe.props=F,pe.state=xt,pe.context=kt,F=gt):(typeof pe.componentDidMount=="function"&&(g.effectTag|=4),F=!1)}else pe=g.stateNode,gt=g.memoizedProps,pe.props=g.type===g.elementType?gt:Yn(g.type,gt),xt=pe.context,kt=A.contextType,typeof kt=="object"&&kt!==null?kt=ku(kt):(kt=eu(A)?Wt:Oi.current,kt=Ru(g,kt)),xr=A.getDerivedStateFromProps,(i0=typeof xr=="function"||typeof pe.getSnapshotBeforeUpdate=="function")||typeof pe.UNSAFE_componentWillReceiveProps!="function"&&typeof pe.componentWillReceiveProps!="function"||(gt!==F||xt!==kt)&&Ba(g,pe,F,kt),po=!1,xt=g.memoizedState,du=pe.state=xt,z0=g.updateQueue,z0!==null&&(S0(g,z0,F,pe,b),du=g.memoizedState),gt!==F||xt!==du||yi.current||po?(typeof xr=="function"&&($l(g,A,xr,F),du=g.memoizedState),(xr=po||hf(g,A,gt,F,xt,du,kt))?(i0||typeof pe.UNSAFE_componentWillUpdate!="function"&&typeof pe.componentWillUpdate!="function"||(typeof pe.componentWillUpdate=="function"&&pe.componentWillUpdate(F,du,kt),typeof pe.UNSAFE_componentWillUpdate=="function"&&pe.UNSAFE_componentWillUpdate(F,du,kt)),typeof pe.componentDidUpdate=="function"&&(g.effectTag|=4),typeof pe.getSnapshotBeforeUpdate=="function"&&(g.effectTag|=256)):(typeof pe.componentDidUpdate!="function"||gt===y.memoizedProps&&xt===y.memoizedState||(g.effectTag|=4),typeof pe.getSnapshotBeforeUpdate!="function"||gt===y.memoizedProps&&xt===y.memoizedState||(g.effectTag|=256),g.memoizedProps=F,g.memoizedState=du),pe.props=F,pe.state=du,pe.context=kt,F=xr):(typeof pe.componentDidUpdate!="function"||gt===y.memoizedProps&&xt===y.memoizedState||(g.effectTag|=4),typeof pe.getSnapshotBeforeUpdate!="function"||gt===y.memoizedProps&&xt===y.memoizedState||(g.effectTag|=256),F=!1);return tt(y,g,A,F,J,b)}function tt(y,g,A,F,b,J){eo(y,g);var pe=(g.effectTag&64)!=0;if(!F&&!pe)return b&&ao(g,A,!1),gu(y,g,J);F=g.stateNode,ei.current=g;var gt=pe&&typeof A.getDerivedStateFromError!="function"?null:F.render();return g.effectTag|=1,y!==null&&pe?(g.child=z(g,y.child,null,J),g.child=z(g,null,gt,J)):Bi(y,g,gt,J),g.memoizedState=F.state,b&&ao(g,A,!0),g.child}function Ye(y){var g=y.stateNode;g.pendingContext?Ql(y,g.pendingContext,g.pendingContext!==g.context):g.context&&Ql(y,g.context,!1),ke(y,g.containerInfo)}var Yt={dehydrated:null,retryTime:0};function Kt(y,g,A){var F=g.mode,b=g.pendingProps,J=qe.current,pe=!1,gt;if((gt=(g.effectTag&64)!=0)||(gt=(J&2)!=0&&(y===null||y.memoizedState!==null)),gt?(pe=!0,g.effectTag&=-65):y!==null&&y.memoizedState===null||b.fallback===void 0||b.unstable_avoidThisFallback===!0||(J|=1),en(qe,J&1,g),y===null){if(b.fallback!==void 0&&Uo(g),pe){if(pe=b.fallback,b=r0(null,F,0,null),b.return=g,(g.mode&2)==0)for(y=g.memoizedState!==null?g.child.child:g.child,b.child=y;y!==null;)y.return=b,y=y.sibling;return A=r0(pe,F,A,null),A.return=g,b.sibling=A,g.memoizedState=Yt,g.child=b,A}return F=b.children,g.memoizedState=null,g.child=G(g,null,F,A)}if(y.memoizedState!==null){if(y=y.child,F=y.sibling,pe){if(b=b.fallback,A=Gu(y,y.pendingProps,0),A.return=g,(g.mode&2)==0&&(pe=g.memoizedState!==null?g.child.child:g.child,pe!==y.child))for(A.child=pe;pe!==null;)pe.return=A,pe=pe.sibling;return F=Gu(F,b,F.expirationTime),F.return=g,A.sibling=F,A.childExpirationTime=0,g.memoizedState=Yt,g.child=A,F}return A=z(g,y.child,b.children,A),g.memoizedState=null,g.child=A}if(y=y.child,pe){if(pe=b.fallback,b=r0(null,F,0,null),b.return=g,b.child=y,y!==null&&(y.return=b),(g.mode&2)==0)for(y=g.memoizedState!==null?g.child.child:g.child,b.child=y;y!==null;)y.return=b,y=y.sibling;return A=r0(pe,F,A,null),A.return=g,b.sibling=A,A.effectTag|=2,b.childExpirationTime=0,g.memoizedState=Yt,g.child=b,A}return g.memoizedState=null,g.child=z(g,y,b.children,A)}function pr(y,g){y.expirationTime<g&&(y.expirationTime=g);var A=y.alternate;A!==null&&A.expirationTime<g&&(A.expirationTime=g),Ti(y.return,g)}function Wr(y,g,A,F,b,J){var pe=y.memoizedState;pe===null?y.memoizedState={isBackwards:g,rendering:null,last:F,tail:A,tailExpiration:0,tailMode:b,lastEffect:J}:(pe.isBackwards=g,pe.rendering=null,pe.last=F,pe.tail=A,pe.tailExpiration=0,pe.tailMode=b,pe.lastEffect=J)}function xn(y,g,A){var F=g.pendingProps,b=F.revealOrder,J=F.tail;if(Bi(y,g,F.children,A),F=qe.current,(F&2)!=0)F=F&1|2,g.effectTag|=64;else{if(y!==null&&(y.effectTag&64)!=0)e:for(y=g.child;y!==null;){if(y.tag===13)y.memoizedState!==null&&pr(y,A);else if(y.tag===19)pr(y,A);else if(y.child!==null){y.child.return=y,y=y.child;continue}if(y===g)break e;for(;y.sibling===null;){if(y.return===null||y.return===g)break e;y=y.return}y.sibling.return=y.return,y=y.sibling}F&=1}if(en(qe,F,g),(g.mode&2)==0)g.memoizedState=null;else switch(b){case"forwards":for(A=g.child,b=null;A!==null;)y=A.alternate,y!==null&&nt(y)===null&&(b=A),A=A.sibling;A=b,A===null?(b=g.child,g.child=null):(b=A.sibling,A.sibling=null),Wr(g,!1,b,A,J,g.lastEffect);break;case"backwards":for(A=null,b=g.child,g.child=null;b!==null;){if(y=b.alternate,y!==null&&nt(y)===null){g.child=b;break}y=b.sibling,b.sibling=A,A=b,b=y}Wr(g,!0,A,null,J,g.lastEffect);break;case"together":Wr(g,!1,null,null,void 0,g.lastEffect);break;default:g.memoizedState=null}return g.child}function gu(y,g,A){y!==null&&(g.dependencies=y.dependencies);var F=g.expirationTime;if(F!==0&&ja(F),g.childExpirationTime<A)return null;if(y!==null&&g.child!==y.child)throw Error(t(153));if(g.child!==null){for(y=g.child,A=Gu(y,y.pendingProps,y.expirationTime),g.child=A,A.return=g;y.sibling!==null;)y=y.sibling,A=A.sibling=Gu(y,y.pendingProps,y.expirationTime),A.return=g;A.sibling=null}return g.child}function Ju(y){y.effectTag|=4}var ti,Jr,Wu,An;if(Vt)ti=function(y,g){for(var A=g.child;A!==null;){if(A.tag===5||A.tag===6)Ce(y,A.stateNode);else if(A.tag!==4&&A.child!==null){A.child.return=A,A=A.child;continue}if(A===g)break;for(;A.sibling===null;){if(A.return===null||A.return===g)return;A=A.return}A.sibling.return=A.return,A=A.sibling}},Jr=function(){},Wu=function(y,g,A,F,b){if(y=y.memoizedProps,y!==F){var J=g.stateNode,pe=Z(Te.current);A=He(J,A,y,F,b,pe),(g.updateQueue=A)&&Ju(g)}},An=function(y,g,A,F){A!==F&&Ju(g)};else if(Dr){ti=function(y,g,A,F){for(var b=g.child;b!==null;){if(b.tag===5){var J=b.stateNode;A&&F&&(J=el(J,b.type,b.memoizedProps,b)),Ce(y,J)}else if(b.tag===6)J=b.stateNode,A&&F&&(J=Y0(J,b.memoizedProps,b)),Ce(y,J);else if(b.tag!==4){if(b.tag===13&&(b.effectTag&4)!=0&&(J=b.memoizedState!==null)){var pe=b.child;if(pe!==null&&(pe.child!==null&&(pe.child.return=pe,ti(y,pe,!0,J)),J=pe.sibling,J!==null)){J.return=b,b=J;continue}}if(b.child!==null){b.child.return=b,b=b.child;continue}}if(b===g)break;for(;b.sibling===null;){if(b.return===null||b.return===g)return;b=b.return}b.sibling.return=b.return,b=b.sibling}};var x0=function(y,g,A,F){for(var b=g.child;b!==null;){if(b.tag===5){var J=b.stateNode;A&&F&&(J=el(J,b.type,b.memoizedProps,b)),su(y,J)}else if(b.tag===6)J=b.stateNode,A&&F&&(J=Y0(J,b.memoizedProps,b)),su(y,J);else if(b.tag!==4){if(b.tag===13&&(b.effectTag&4)!=0&&(J=b.memoizedState!==null)){var pe=b.child;if(pe!==null&&(pe.child!==null&&(pe.child.return=pe,x0(y,pe,!0,J)),J=pe.sibling,J!==null)){J.return=b,b=J;continue}}if(b.child!==null){b.child.return=b,b=b.child;continue}}if(b===g)break;for(;b.sibling===null;){if(b.return===null||b.return===g)return;b=b.return}b.sibling.return=b.return,b=b.sibling}};Jr=function(y){var g=y.stateNode;if(y.firstEffect!==null){var A=g.containerInfo,F=Ai(A);x0(F,y,!1,!1),g.pendingChildren=F,Ju(y),mi(A,F)}},Wu=function(y,g,A,F,b){var J=y.stateNode,pe=y.memoizedProps;if((y=g.firstEffect===null)&&pe===F)g.stateNode=J;else{var gt=g.stateNode,xt=Z(Te.current),kt=null;pe!==F&&(kt=He(gt,A,pe,F,b,xt)),y&&kt===null?g.stateNode=J:(J=qt(J,kt,A,pe,F,g,y,gt),oe(J,A,F,b,xt)&&Ju(g),g.stateNode=J,y?Ju(g):ti(J,g,!1,!1))}},An=function(y,g,A,F){A!==F&&(y=Z(Ae.current),A=Z(Te.current),g.stateNode=nn(F,y,A,g),Ju(g))}}else Jr=function(){},Wu=function(){},An=function(){};function Fu(y,g){switch(y.tailMode){case"hidden":g=y.tail;for(var A=null;g!==null;)g.alternate!==null&&(A=g),g=g.sibling;A===null?y.tail=null:A.sibling=null;break;case"collapsed":A=y.tail;for(var F=null;A!==null;)A.alternate!==null&&(F=A),A=A.sibling;F===null?g||y.tail===null?y.tail=null:y.tail.sibling=null:F.sibling=null}}function li(y){switch(y.tag){case 1:eu(y.type)&&Q0(y);var g=y.effectTag;return g&4096?(y.effectTag=g&-4097|64,y):null;case 3:if(Je(y),Yi(y),g=y.effectTag,(g&64)!=0)throw Error(t(285));return y.effectTag=g&-4097|64,y;case 5:return ue(y),null;case 13:return gi(qe,y),g=y.effectTag,g&4096?(y.effectTag=g&-4097|64,y):null;case 19:return gi(qe,y),null;case 4:return Je(y),null;case 10:return Su(y),null;default:return null}}function Cl(y,g){return{value:y,source:g,stack:Hr(g)}}var Hs=typeof WeakSet=="function"?WeakSet:Set;function Vu(y,g){var A=g.source,F=g.stack;F===null&&A!==null&&(F=Hr(A)),A!==null&&Ue(A.type),g=g.value,y!==null&&y.tag===1&&Ue(y.type);try{console.error(g)}catch(b){setTimeout(function(){throw b})}}function aa(y,g){try{g.props=y.memoizedProps,g.state=y.memoizedState,g.componentWillUnmount()}catch(A){zo(y,A)}}function Xi(y){var g=y.ref;if(g!==null)if(typeof g=="function")try{g(null)}catch(A){zo(y,A)}else g.current=null}function qs(y,g){switch(g.tag){case 0:case 11:case 15:A0(2,0,g);break;case 1:if(g.effectTag&256&&y!==null){var A=y.memoizedProps,F=y.memoizedState;y=g.stateNode,g=y.getSnapshotBeforeUpdate(g.elementType===g.type?A:Yn(g.type,A),F),y.__reactInternalSnapshotBeforeUpdate=g}break;case 3:case 5:case 6:case 4:case 17:break;default:throw Error(t(163))}}function A0(y,g,A){if(A=A.updateQueue,A=A!==null?A.lastEffect:null,A!==null){var F=A=A.next;do{if((F.tag&y)!=0){var b=F.destroy;F.destroy=void 0,b!==void 0&&b()}(F.tag&g)!=0&&(b=F.create,F.destroy=b()),F=F.next}while(F!==A)}}function zi(y,g,A){switch(typeof Ss=="function"&&Ss(g),g.tag){case 0:case 11:case 14:case 15:if(y=g.updateQueue,y!==null&&(y=y.lastEffect,y!==null)){var F=y.next;co(97<A?97:A,function(){var b=F;do{var J=b.destroy;if(J!==void 0){var pe=g;try{J()}catch(gt){zo(pe,gt)}}b=b.next}while(b!==F)})}break;case 1:Xi(g),A=g.stateNode,typeof A.componentWillUnmount=="function"&&aa(g,A);break;case 5:Xi(g);break;case 4:Vt?O0(y,g,A):Dr&&il(g)}}function R0(y,g,A){for(var F=g;;)if(zi(y,F,A),F.child===null||Vt&&F.tag===4){if(F===g)break;for(;F.sibling===null;){if(F.return===null||F.return===g)return;F=F.return}F.sibling.return=F.return,F=F.sibling}else F.child.return=F,F=F.child}function Hi(y){var g=y.alternate;y.return=null,y.child=null,y.memoizedState=null,y.updateQueue=null,y.dependencies=null,y.alternate=null,y.firstEffect=null,y.lastEffect=null,y.pendingProps=null,y.memoizedProps=null,g!==null&&Hi(g)}function il(y){if(Dr){y=y.stateNode.containerInfo;var g=Ai(y);wr(y,g)}}function xl(y){return y.tag===5||y.tag===3||y.tag===4}function B0(y){if(Vt){e:{for(var g=y.return;g!==null;){if(xl(g)){var A=g;break e}g=g.return}throw Error(t(160))}switch(g=A.stateNode,A.tag){case 5:var F=!1;break;case 3:g=g.containerInfo,F=!0;break;case 4:g=g.containerInfo,F=!0;break;default:throw Error(t(161))}A.effectTag&16&&(Ro(g),A.effectTag&=-17);e:t:for(A=y;;){for(;A.sibling===null;){if(A.return===null||xl(A.return)){A=null;break e}A=A.return}for(A.sibling.return=A.return,A=A.sibling;A.tag!==5&&A.tag!==6&&A.tag!==18;){if(A.effectTag&2||A.child===null||A.tag===4)continue t;A.child.return=A,A=A.child}if(!(A.effectTag&2)){A=A.stateNode;break e}}for(var b=y;;){var J=b.tag===5||b.tag===6;if(J)J=J?b.stateNode:b.stateNode.instance,A?F?Qt(g,J,A):zr(g,J,A):F?Xn(g,J):jt(g,J);else if(b.tag!==4&&b.child!==null){b.child.return=b,b=b.child;continue}if(b===y)break;for(;b.sibling===null;){if(b.return===null||b.return===y)return;b=b.return}b.sibling.return=b.return,b=b.sibling}}}function O0(y,g,A){for(var F=g,b=!1,J,pe;;){if(!b){b=F.return;e:for(;;){if(b===null)throw Error(t(160));switch(J=b.stateNode,b.tag){case 5:pe=!1;break e;case 3:J=J.containerInfo,pe=!0;break e;case 4:J=J.containerInfo,pe=!0;break e}b=b.return}b=!0}if(F.tag===5||F.tag===6)R0(y,F,A),pe?d0(J,F.stateNode):wu(J,F.stateNode);else if(F.tag===4){if(F.child!==null){J=F.stateNode.containerInfo,pe=!0,F.child.return=F,F=F.child;continue}}else if(zi(y,F,A),F.child!==null){F.child.return=F,F=F.child;continue}if(F===g)break;for(;F.sibling===null;){if(F.return===null||F.return===g)return;F=F.return,F.tag===4&&(b=!1)}F.sibling.return=F.return,F=F.sibling}}function vo(y,g){if(Vt)switch(g.tag){case 0:case 11:case 14:case 15:A0(4,8,g);break;case 1:break;case 5:var A=g.stateNode;if(A!=null){var F=g.memoizedProps;y=y!==null?y.memoizedProps:F;var b=g.type,J=g.updateQueue;g.updateQueue=null,J!==null&&fr(A,J,b,y,F,g)}break;case 6:if(g.stateNode===null)throw Error(t(162));A=g.memoizedProps,vr(g.stateNode,y!==null?y.memoizedProps:A,A);break;case 3:w&&(g=g.stateNode,g.hydrate&&(g.hydrate=!1,Xl(g.containerInfo)));break;case 12:break;case 13:Pu(g),Zu(g);break;case 19:Zu(g);break;case 17:break;case 20:break;case 21:break;default:throw Error(t(163))}else{switch(g.tag){case 0:case 11:case 14:case 15:A0(4,8,g);return;case 12:return;case 13:Pu(g),Zu(g);return;case 19:Zu(g);return;case 3:w&&(A=g.stateNode,A.hydrate&&(A.hydrate=!1,Xl(A.containerInfo)))}e:if(Dr)switch(g.tag){case 1:case 5:case 6:case 20:break e;case 3:case 4:g=g.stateNode,wr(g.containerInfo,g.pendingChildren);break e;default:throw Error(t(163))}}}function Pu(y){var g=y;if(y.memoizedState===null)var A=!1;else A=!0,g=y.child,Tn=v0();if(Vt&&g!==null)e:if(y=g,Vt)for(g=y;;){if(g.tag===5){var F=g.stateNode;A?Jo(F):Zo(g.stateNode,g.memoizedProps)}else if(g.tag===6)F=g.stateNode,A?Ps(F):$o(F,g.memoizedProps);else if(g.tag===13&&g.memoizedState!==null&&g.memoizedState.dehydrated===null){F=g.child.sibling,F.return=g,g=F;continue}else if(g.child!==null){g.child.return=g,g=g.child;continue}if(g===y)break e;for(;g.sibling===null;){if(g.return===null||g.return===y)break e;g=g.return}g.sibling.return=g.return,g=g.sibling}}function Zu(y){var g=y.updateQueue;if(g!==null){y.updateQueue=null;var A=y.stateNode;A===null&&(A=y.stateNode=new Hs),g.forEach(function(F){var b=Ha.bind(null,y,F);A.has(F)||(A.add(F),F.then(b,b))})}}var ts=typeof WeakMap=="function"?WeakMap:Map;function Es(y,g,A){A=m0(A,null),A.tag=3,A.payload={element:null};var F=g.value;return A.callback=function(){Pi||(Pi=!0,Rr=F),Vu(y,g)},A}function fa(y,g,A){A=m0(A,null),A.tag=3;var F=y.type.getDerivedStateFromError;if(typeof F=="function"){var b=g.value;A.payload=function(){return Vu(y,g),F(b)}}var J=y.stateNode;return J!==null&&typeof J.componentDidCatch=="function"&&(A.callback=function(){typeof F!="function"&&(mr===null?mr=new Set([this]):mr.add(this),Vu(y,g));var pe=g.stack;this.componentDidCatch(g.value,{componentStack:pe!==null?pe:""})}),A}var _f=Math.ceil,$u=O.ReactCurrentDispatcher,Ds=O.ReactCurrentOwner,Ar=0,no=8,nu=16,cu=32,Fi=0,ni=1,Kn=2,e0=3,_0=4,E0=5,Fn=Ar,ae=null,re=null,Fe=0,Re=Fi,st=null,mt=1073741823,Jt=1073741823,On=null,Sn=0,_n=!1,Tn=0,ir=500,Bt=null,Pi=!1,Rr=null,mr=null,Y=!1,ri=null,ii=90,Vr=null,ft=0,Di=null,ru=0;function D0(){return(Fn&(nu|cu))!==Ar?1073741821-(v0()/10|0):ru!==0?ru:ru=1073741821-(v0()/10|0)}function Un(y,g,A){if(g=g.mode,(g&2)==0)return 1073741823;var F=vs();if((g&4)==0)return F===99?1073741823:1073741822;if((Fn&nu)!==Ar)return Fe;if(A!==null)y=Q(y,A.timeoutMs|0||5e3,250);else switch(F){case 99:y=1073741823;break;case 98:y=Q(y,150,100);break;case 97:case 96:y=Q(y,5e3,250);break;case 95:y=2;break;default:throw Error(t(326))}return ae!==null&&y===Fe&&--y,y}function t0(y,g){if(50<ft)throw ft=0,Di=null,Error(t(185));if(y=ro(y,g),y!==null){var A=vs();g===1073741823?(Fn&no)!==Ar&&(Fn&(nu|cu))===Ar?io(y):(n0(y),Fn===Ar&&ju()):n0(y),(Fn&4)===Ar||A!==98&&A!==99||(Vr===null?Vr=new Map([[y,g]]):(A=Vr.get(y),(A===void 0||A>g)&&Vr.set(y,g)))}}function ro(y,g){y.expirationTime<g&&(y.expirationTime=g);var A=y.alternate;A!==null&&A.expirationTime<g&&(A.expirationTime=g);var F=y.return,b=null;if(F===null&&y.tag===3)b=y.stateNode;else for(;F!==null;){if(A=F.alternate,F.childExpirationTime<g&&(F.childExpirationTime=g),A!==null&&A.childExpirationTime<g&&(A.childExpirationTime=g),F.return===null&&F.tag===3){b=F.stateNode;break}F=F.return}return b!==null&&(ae===b&&(ja(g),Re===_0&&Ol(b,Fe)),Cs(b,g)),b}function mo(y){var g=y.lastExpiredTime;return g!==0||(g=y.firstPendingTime,!pc(y,g))?g:(g=y.lastPingedTime,y=y.nextKnownPendingLevel,g>y?g:y)}function n0(y){if(y.lastExpiredTime!==0)y.callbackExpirationTime=1073741823,y.callbackPriority=99,y.callbackNode=Zl(io.bind(null,y));else{var g=mo(y),A=y.callbackNode;if(g===0)A!==null&&(y.callbackNode=null,y.callbackExpirationTime=0,y.callbackPriority=90);else{var F=D0();if(g===1073741823?F=99:g===1||g===2?F=95:(F=10*(1073741821-g)-10*(1073741821-F),F=0>=F?99:250>=F?98:5250>=F?97:95),A!==null){var b=y.callbackPriority;if(y.callbackExpirationTime===g&&b>=F)return;A!==qr&&bs(A)}y.callbackExpirationTime=g,y.callbackPriority=F,g=g===1073741823?Zl(io.bind(null,y)):nl(F,jo.bind(null,y),{timeout:10*(1073741821-g)-v0()}),y.callbackNode=g}}}function jo(y,g){if(ru=0,g)return g=D0(),pa(y,g),n0(y),null;var A=mo(y);if(A!==0){if(g=y.callbackNode,(Fn&(nu|cu))!==Ar)throw Error(t(327));if(Ws(),y===ae&&A===Fe||ws(y,A),re!==null){var F=Fn;Fn|=nu;var b=U0(y);do try{rd();break}catch(gt){ca(y,gt)}while(1);if(zu(),Fn=F,$u.current=b,Re===ni)throw g=st,ws(y,A),Ol(y,A),n0(y),g;if(re===null)switch(b=y.finishedWork=y.current.alternate,y.finishedExpirationTime=A,F=Re,ae=null,F){case Fi:case ni:throw Error(t(345));case Kn:pa(y,2<A?2:A);break;case e0:if(Ol(y,A),F=y.lastSuspendedTime,A===F&&(y.nextKnownPendingLevel=qc(b)),mt===1073741823&&(b=Tn+ir-v0(),10<b)){if(_n){var J=y.lastPingedTime;if(J===0||J>=A){y.lastPingedTime=A,ws(y,A);break}}if(J=mo(y),J!==0&&J!==A)break;if(F!==0&&F!==A){y.lastPingedTime=F;break}y.timeoutHandle=an(Al.bind(null,y),b);break}Al(y);break;case _0:if(Ol(y,A),F=y.lastSuspendedTime,A===F&&(y.nextKnownPendingLevel=qc(b)),_n&&(b=y.lastPingedTime,b===0||b>=A)){y.lastPingedTime=A,ws(y,A);break}if(b=mo(y),b!==0&&b!==A)break;if(F!==0&&F!==A){y.lastPingedTime=F;break}if(Jt!==1073741823?F=10*(1073741821-Jt)-v0():mt===1073741823?F=0:(F=10*(1073741821-mt)-5e3,b=v0(),A=10*(1073741821-A)-b,F=b-F,0>F&&(F=0),F=(120>F?120:480>F?480:1080>F?1080:1920>F?1920:3e3>F?3e3:4320>F?4320:1960*_f(F/1960))-F,A<F&&(F=A)),10<F){y.timeoutHandle=an(Al.bind(null,y),F);break}Al(y);break;case E0:if(mt!==1073741823&&On!==null){J=mt;var pe=On;if(F=pe.busyMinDurationMs|0,0>=F?F=0:(b=pe.busyDelayMs|0,J=v0()-(10*(1073741821-J)-(pe.timeoutMs|0||5e3)),F=J<=b?0:b+F-J),10<F){Ol(y,A),y.timeoutHandle=an(Al.bind(null,y),F);break}}Al(y);break;default:throw Error(t(329))}if(n0(y),y.callbackNode===g)return jo.bind(null,y)}}return null}function io(y){var g=y.lastExpiredTime;if(g=g!==0?g:1073741823,y.finishedExpirationTime===g)Al(y);else{if((Fn&(nu|cu))!==Ar)throw Error(t(327));if(Ws(),y===ae&&g===Fe||ws(y,g),re!==null){var A=Fn;Fn|=nu;var F=U0(y);do try{D2();break}catch(b){ca(y,b)}while(1);if(zu(),Fn=A,$u.current=F,Re===ni)throw A=st,ws(y,g),Ol(y,g),n0(y),A;if(re!==null)throw Error(t(261));y.finishedWork=y.current.alternate,y.finishedExpirationTime=g,ae=null,Al(y),n0(y)}}return null}function Ua(y,g){pa(y,g),n0(y),(Fn&(nu|cu))===Ar&&ju()}function Ef(){if(Vr!==null){var y=Vr;Vr=null,y.forEach(function(g,A){pa(A,g),n0(A)}),ju()}}function cc(y,g){if((Fn&(nu|cu))!==Ar)throw Error(t(187));var A=Fn;Fn|=1;try{return co(99,y.bind(null,g))}finally{Fn=A,ju()}}function ws(y,g){y.finishedWork=null,y.finishedExpirationTime=0;var A=y.timeoutHandle;if(A!==lr&&(y.timeoutHandle=lr,Mn(A)),re!==null)for(A=re.return;A!==null;){var F=A;switch(F.tag){case 1:var b=F.type.childContextTypes;b!=null&&Q0(F);break;case 3:Je(F),Yi(F);break;case 5:ue(F);break;case 4:Je(F);break;case 13:gi(qe,F);break;case 19:gi(qe,F);break;case 10:Su(F)}A=A.return}ae=y,re=Gu(y.current,null,g),Fe=g,Re=Fi,st=null,Jt=mt=1073741823,On=null,Sn=0,_n=!1}function ca(y,g){do{try{if(zu(),fn(),re===null||re.return===null)return Re=ni,st=g,null;e:{var A=y,F=re.return,b=re,J=g;if(g=Fe,b.effectTag|=2048,b.firstEffect=b.lastEffect=null,J!==null&&typeof J=="object"&&typeof J.then=="function"){var pe=J,gt=(qe.current&1)!=0,xt=F;do{var kt;if(kt=xt.tag===13){var xr=xt.memoizedState;if(xr!==null)kt=xr.dehydrated!==null;else{var i0=xt.memoizedProps;kt=i0.fallback===void 0?!1:i0.unstable_avoidThisFallback!==!0?!0:!gt}}if(kt){var du=xt.updateQueue;if(du===null){var z0=new Set;z0.add(pe),xt.updateQueue=z0}else du.add(pe);if((xt.mode&2)==0){if(xt.effectTag|=64,b.effectTag&=-2981,b.tag===1)if(b.alternate===null)b.tag=17;else{var Ml=m0(1073741823,null);Ml.tag=2,J0(b,Ml)}b.expirationTime=1073741823;break e}J=void 0,b=g;var u0=A.pingCache;if(u0===null?(u0=A.pingCache=new ts,J=new Set,u0.set(pe,J)):(J=u0.get(pe),J===void 0&&(J=new Set,u0.set(pe,J))),!J.has(b)){J.add(b);var We=za.bind(null,A,pe,b);pe.then(We,We)}xt.effectTag|=4096,xt.expirationTime=g;break e}xt=xt.return}while(xt!==null);J=Error((Ue(b.type)||"A React component")+` suspended while rendering, but no fallback UI was specified.
-
-Add a <Suspense fallback=...> component higher in the tree to provide a loading indicator or placeholder to display.`+Hr(b))}Re!==E0&&(Re=Kn),J=Cl(J,b),xt=F;do{switch(xt.tag){case 3:pe=J,xt.effectTag|=4096,xt.expirationTime=g;var ze=Es(xt,pe,g);oa(xt,ze);break e;case 1:pe=J;var lt=xt.type,$t=xt.stateNode;if((xt.effectTag&64)==0&&(typeof lt.getDerivedStateFromError=="function"||$t!==null&&typeof $t.componentDidCatch=="function"&&(mr===null||!mr.has($t)))){xt.effectTag|=4096,xt.expirationTime=g;var Wn=fa(xt,pe,g);oa(xt,Wn);break e}}xt=xt.return}while(xt!==null)}re=go(re)}catch(si){g=si;continue}break}while(1)}function U0(){var y=$u.current;return $u.current=bo,y===null?bo:y}function dc(y,g){y<mt&&2<y&&(mt=y),g!==null&&y<Jt&&2<y&&(Jt=y,On=g)}function ja(y){y>Sn&&(Sn=y)}function D2(){for(;re!==null;)re=id(re)}function rd(){for(;re!==null&&!$n();)re=id(re)}function id(y){var g=qa(y.alternate,y,Fe);return y.memoizedProps=y.pendingProps,g===null&&(g=go(y)),Ds.current=null,g}function go(y){re=y;do{var g=re.alternate;if(y=re.return,(re.effectTag&2048)==0){e:{var A=g;g=re;var F=Fe,b=g.pendingProps;switch(g.tag){case 2:break;case 16:break;case 15:case 0:break;case 1:eu(g.type)&&Q0(g);break;case 3:Je(g),Yi(g),b=g.stateNode,b.pendingContext&&(b.context=b.pendingContext,b.pendingContext=null),(A===null||A.child===null)&&es(g)&&Ju(g),Jr(g);break;case 5:ue(g);var J=Z(Ae.current);if(F=g.type,A!==null&&g.stateNode!=null)Wu(A,g,F,b,J),A.ref!==g.ref&&(g.effectTag|=128);else if(b){if(A=Z(Te.current),es(g)){if(b=g,!w)throw Error(t(175));A=au(b.stateNode,b.type,b.memoizedProps,J,A,b),b.updateQueue=A,A=A!==null,A&&Ju(g)}else{var pe=de(F,b,J,A,g);ti(pe,g,!1,!1),g.stateNode=pe,oe(pe,F,b,J,A)&&Ju(g)}g.ref!==null&&(g.effectTag|=128)}else if(g.stateNode===null)throw Error(t(166));break;case 6:if(A&&g.stateNode!=null)An(A,g,A.memoizedProps,b);else{if(typeof b!="string"&&g.stateNode===null)throw Error(t(166));if(A=Z(Ae.current),J=Z(Te.current),es(g)){if(A=g,!w)throw Error(t(176));(A=Li(A.stateNode,A.memoizedProps,A))&&Ju(g)}else g.stateNode=nn(b,A,J,g)}break;case 11:break;case 13:if(gi(qe,g),b=g.memoizedState,(g.effectTag&64)!=0){g.expirationTime=F;break e}b=b!==null,J=!1,A===null?g.memoizedProps.fallback!==void 0&&es(g):(F=A.memoizedState,J=F!==null,b||F===null||(F=A.child.sibling,F!==null&&(pe=g.firstEffect,pe!==null?(g.firstEffect=F,F.nextEffect=pe):(g.firstEffect=g.lastEffect=F,F.nextEffect=null),F.effectTag=8))),b&&!J&&(g.mode&2)!=0&&(A===null&&g.memoizedProps.unstable_avoidThisFallback!==!0||(qe.current&1)!=0?Re===Fi&&(Re=e0):((Re===Fi||Re===e0)&&(Re=_0),Sn!==0&&ae!==null&&(Ol(ae,Fe),Cs(ae,Sn)))),Dr&&b&&(g.effectTag|=4),Vt&&(b||J)&&(g.effectTag|=4);break;case 7:break;case 8:break;case 12:break;case 4:Je(g),Jr(g);break;case 10:Su(g);break;case 9:break;case 14:break;case 17:eu(g.type)&&Q0(g);break;case 19:if(gi(qe,g),b=g.memoizedState,b===null)break;if(J=(g.effectTag&64)!=0,pe=b.rendering,pe===null){if(J)Fu(b,!1);else if(Re!==Fi||A!==null&&(A.effectTag&64)!=0)for(A=g.child;A!==null;){if(pe=nt(A),pe!==null){for(g.effectTag|=64,Fu(b,!1),A=pe.updateQueue,A!==null&&(g.updateQueue=A,g.effectTag|=4),b.lastEffect===null&&(g.firstEffect=null),g.lastEffect=b.lastEffect,A=F,b=g.child;b!==null;)J=b,F=A,J.effectTag&=2,J.nextEffect=null,J.firstEffect=null,J.lastEffect=null,pe=J.alternate,pe===null?(J.childExpirationTime=0,J.expirationTime=F,J.child=null,J.memoizedProps=null,J.memoizedState=null,J.updateQueue=null,J.dependencies=null):(J.childExpirationTime=pe.childExpirationTime,J.expirationTime=pe.expirationTime,J.child=pe.child,J.memoizedProps=pe.memoizedProps,J.memoizedState=pe.memoizedState,J.updateQueue=pe.updateQueue,F=pe.dependencies,J.dependencies=F===null?null:{expirationTime:F.expirationTime,firstContext:F.firstContext,responders:F.responders}),b=b.sibling;en(qe,qe.current&1|2,g),g=g.child;break e}A=A.sibling}}else{if(!J)if(A=nt(pe),A!==null){if(g.effectTag|=64,J=!0,A=A.updateQueue,A!==null&&(g.updateQueue=A,g.effectTag|=4),Fu(b,!0),b.tail===null&&b.tailMode==="hidden"&&!pe.alternate){g=g.lastEffect=b.lastEffect,g!==null&&(g.nextEffect=null);break}}else v0()>b.tailExpiration&&1<F&&(g.effectTag|=64,J=!0,Fu(b,!1),g.expirationTime=g.childExpirationTime=F-1);b.isBackwards?(pe.sibling=g.child,g.child=pe):(A=b.last,A!==null?A.sibling=pe:g.child=pe,b.last=pe)}if(b.tail!==null){b.tailExpiration===0&&(b.tailExpiration=v0()+500),A=b.tail,b.rendering=A,b.tail=A.sibling,b.lastEffect=g.lastEffect,A.sibling=null,b=qe.current,b=J?b&1|2:b&1,en(qe,b,g),g=A;break e}break;case 20:break;case 21:break;default:throw Error(t(156,g.tag))}g=null}if(A=re,Fe===1||A.childExpirationTime!==1){for(b=0,J=A.child;J!==null;)F=J.expirationTime,pe=J.childExpirationTime,F>b&&(b=F),pe>b&&(b=pe),J=J.sibling;A.childExpirationTime=b}if(g!==null)return g;y!==null&&(y.effectTag&2048)==0&&(y.firstEffect===null&&(y.firstEffect=re.firstEffect),re.lastEffect!==null&&(y.lastEffect!==null&&(y.lastEffect.nextEffect=re.firstEffect),y.lastEffect=re.lastEffect),1<re.effectTag&&(y.lastEffect!==null?y.lastEffect.nextEffect=re:y.firstEffect=re,y.lastEffect=re))}else{if(g=li(re,Fe),g!==null)return g.effectTag&=2047,g;y!==null&&(y.firstEffect=y.lastEffect=null,y.effectTag|=2048)}if(g=re.sibling,g!==null)return g;re=y}while(re!==null);return Re===Fi&&(Re=E0),null}function qc(y){var g=y.expirationTime;return y=y.childExpirationTime,g>y?g:y}function Al(y){var g=vs();return co(99,ul.bind(null,y,g)),null}function ul(y,g){do Ws();while(ri!==null);if((Fn&(nu|cu))!==Ar)throw Error(t(327));var A=y.finishedWork,F=y.finishedExpirationTime;if(A===null)return null;if(y.finishedWork=null,y.finishedExpirationTime=0,A===y.current)throw Error(t(177));y.callbackNode=null,y.callbackExpirationTime=0,y.callbackPriority=90,y.nextKnownPendingLevel=0;var b=qc(A);if(y.firstPendingTime=b,F<=y.lastSuspendedTime?y.firstSuspendedTime=y.lastSuspendedTime=y.nextKnownPendingLevel=0:F<=y.firstSuspendedTime&&(y.firstSuspendedTime=F-1),F<=y.lastPingedTime&&(y.lastPingedTime=0),F<=y.lastExpiredTime&&(y.lastExpiredTime=0),y===ae&&(re=ae=null,Fe=0),1<A.effectTag?A.lastEffect!==null?(A.lastEffect.nextEffect=A,b=A.firstEffect):b=A:b=A.firstEffect,b!==null){var J=Fn;Fn|=cu,Ds.current=null,rt(y.containerInfo),Bt=b;do try{w2()}catch(Cu){if(Bt===null)throw Error(t(330));zo(Bt,Cu),Bt=Bt.nextEffect}while(Bt!==null);Bt=b;do try{for(var pe=y,gt=g;Bt!==null;){var xt=Bt.effectTag;if(xt&16&&Vt&&Ro(Bt.stateNode),xt&128){var kt=Bt.alternate;if(kt!==null){var xr=kt.ref;xr!==null&&(typeof xr=="function"?xr(null):xr.current=null)}}switch(xt&1038){case 2:B0(Bt),Bt.effectTag&=-3;break;case 6:B0(Bt),Bt.effectTag&=-3,vo(Bt.alternate,Bt);break;case 1024:Bt.effectTag&=-1025;break;case 1028:Bt.effectTag&=-1025,vo(Bt.alternate,Bt);break;case 4:vo(Bt.alternate,Bt);break;case 8:var i0=pe,du=Bt,z0=gt;Vt?O0(i0,du,z0):R0(i0,du,z0),Hi(du)}Bt=Bt.nextEffect}}catch(Cu){if(Bt===null)throw Error(t(330));zo(Bt,Cu),Bt=Bt.nextEffect}while(Bt!==null);X(y.containerInfo),y.current=A,Bt=b;do try{for(xt=F;Bt!==null;){var Ml=Bt.effectTag;if(Ml&36){var u0=Bt.alternate;switch(kt=Bt,xr=xt,kt.tag){case 0:case 11:case 15:A0(16,32,kt);break;case 1:var We=kt.stateNode;if(kt.effectTag&4)if(u0===null)We.componentDidMount();else{var ze=kt.elementType===kt.type?u0.memoizedProps:Yn(kt.type,u0.memoizedProps);We.componentDidUpdate(ze,u0.memoizedState,We.__reactInternalSnapshotBeforeUpdate)}var lt=kt.updateQueue;lt!==null&&Qn(kt,lt,We,xr);break;case 3:var $t=kt.updateQueue;if($t!==null){if(pe=null,kt.child!==null)switch(kt.child.tag){case 5:pe=Ve(kt.child.stateNode);break;case 1:pe=kt.child.stateNode}Qn(kt,$t,pe,xr)}break;case 5:var Wn=kt.stateNode;u0===null&&kt.effectTag&4&&jr(Wn,kt.type,kt.memoizedProps,kt);break;case 6:break;case 4:break;case 12:break;case 13:if(w&&kt.memoizedState===null){var si=kt.alternate;if(si!==null){var ur=si.memoizedState;if(ur!==null){var ci=ur.dehydrated;ci!==null&&P0(ci)}}}break;case 19:case 17:case 20:case 21:break;default:throw Error(t(163))}}if(Ml&128){kt=void 0;var Qi=Bt.ref;if(Qi!==null){var Gr=Bt.stateNode;switch(Bt.tag){case 5:kt=Ve(Gr);break;default:kt=Gr}typeof Qi=="function"?Qi(kt):Qi.current=kt}}Bt=Bt.nextEffect}}catch(Cu){if(Bt===null)throw Error(t(330));zo(Bt,Cu),Bt=Bt.nextEffect}while(Bt!==null);Bt=null,Ki(),Fn=J}else y.current=A;if(Y)Y=!1,ri=y,ii=g;else for(Bt=b;Bt!==null;)g=Bt.nextEffect,Bt.nextEffect=null,Bt=g;if(g=y.firstPendingTime,g===0&&(mr=null),g===1073741823?y===Di?ft++:(ft=0,Di=y):ft=0,typeof da=="function"&&da(A.stateNode,F),n0(y),Pi)throw Pi=!1,y=Rr,Rr=null,y;return(Fn&no)!==Ar||ju(),null}function w2(){for(;Bt!==null;){var y=Bt.effectTag;(y&256)!=0&&qs(Bt.alternate,Bt),(y&512)==0||Y||(Y=!0,nl(97,function(){return Ws(),null})),Bt=Bt.nextEffect}}function Ws(){if(ii!==90){var y=97<ii?97:ii;return ii=90,co(y,Rl)}}function Rl(){if(ri===null)return!1;var y=ri;if(ri=null,(Fn&(nu|cu))!==Ar)throw Error(t(331));var g=Fn;for(Fn|=cu,y=y.current.firstEffect;y!==null;){try{var A=y;if((A.effectTag&512)!=0)switch(A.tag){case 0:case 11:case 15:A0(128,0,A),A0(0,64,A)}}catch(F){if(y===null)throw Error(t(330));zo(y,F)}A=y.nextEffect,y.nextEffect=null,y=A}return Fn=g,ju(),!0}function ud(y,g,A){g=Cl(A,g),g=Es(y,g,1073741823),J0(y,g),y=ro(y,1073741823),y!==null&&n0(y)}function zo(y,g){if(y.tag===3)ud(y,y,g);else for(var A=y.return;A!==null;){if(A.tag===3){ud(A,y,g);break}else if(A.tag===1){var F=A.stateNode;if(typeof A.type.getDerivedStateFromError=="function"||typeof F.componentDidCatch=="function"&&(mr===null||!mr.has(F))){y=Cl(g,y),y=fa(A,y,1073741823),J0(A,y),A=ro(A,1073741823),A!==null&&n0(A);break}}A=A.return}}function za(y,g,A){var F=y.pingCache;F!==null&&F.delete(g),ae===y&&Fe===A?Re===_0||Re===e0&&mt===1073741823&&v0()-Tn<ir?ws(y,Fe):_n=!0:pc(y,A)&&(g=y.lastPingedTime,g!==0&&g<A||(y.lastPingedTime=A,y.finishedExpirationTime===A&&(y.finishedExpirationTime=0,y.finishedWork=null),n0(y)))}function Ha(y,g){var A=y.stateNode;A!==null&&A.delete(g),g=0,g===0&&(g=D0(),g=Un(g,y,null)),y=ro(y,g),y!==null&&n0(y)}var qa;qa=function(y,g,A){var F=g.expirationTime;if(y!==null){var b=g.pendingProps;if(y.memoizedProps!==b||yi.current)ho=!0;else{if(F<A){switch(ho=!1,g.tag){case 3:Ye(g),tu();break;case 5:if(vt(g),g.mode&4&&A!==1&&At(g.type,b))return g.expirationTime=g.childExpirationTime=1,null;break;case 1:eu(g.type)&&ai(g);break;case 4:ke(g,g.stateNode.containerInfo);break;case 10:Hu(g,g.memoizedProps.value);break;case 13:if(g.memoizedState!==null)return F=g.child.childExpirationTime,F!==0&&F>=A?Kt(y,g,A):(en(qe,qe.current&1,g),g=gu(y,g,A),g!==null?g.sibling:null);en(qe,qe.current&1,g);break;case 19:if(F=g.childExpirationTime>=A,(y.effectTag&64)!=0){if(F)return xn(y,g,A);g.effectTag|=64}if(b=g.memoizedState,b!==null&&(b.rendering=null,b.tail=null),en(qe,qe.current,g),!F)return null}return gu(y,g,A)}ho=!1}}else ho=!1;switch(g.expirationTime=0,g.tag){case 2:if(F=g.type,y!==null&&(y.alternate=null,g.alternate=null,g.effectTag|=2),y=g.pendingProps,b=Ru(g,Oi.current),Fo(g,A),b=un(null,g,F,y,b,A),g.effectTag|=1,typeof b=="object"&&b!==null&&typeof b.render=="function"&&b.$$typeof===void 0){if(g.tag=1,fn(),eu(F)){var J=!0;ai(g)}else J=!1;g.memoizedState=b.state!==null&&b.state!==void 0?b.state:null;var pe=F.getDerivedStateFromProps;typeof pe=="function"&&$l(g,F,pe,y),b.updater=la,g.stateNode=b,b._reactInternalFiber=g,Us(g,F,y,A),g=tt(null,g,F,!0,J,A)}else g.tag=0,Bi(null,g,b,A),g=g.child;return g;case 16:if(b=g.elementType,y!==null&&(y.alternate=null,g.alternate=null,g.effectTag|=2),y=g.pendingProps,Oe(b),b._status!==1)throw b._result;switch(b=b._result,g.type=b,J=g.tag=ol(b),y=Yn(b,y),J){case 0:g=to(null,g,b,y,A);break;case 1:g=xe(null,g,b,y,A);break;case 11:g=Ci(null,g,b,y,A);break;case 14:g=gf(null,g,b,Yn(b.type,y),F,A);break;default:throw Error(t(306,b,""))}return g;case 0:return F=g.type,b=g.pendingProps,b=g.elementType===F?b:Yn(F,b),to(y,g,F,b,A);case 1:return F=g.type,b=g.pendingProps,b=g.elementType===F?b:Yn(F,b),xe(y,g,F,b,A);case 3:if(Ye(g),F=g.updateQueue,F===null)throw Error(t(282));if(b=g.memoizedState,b=b!==null?b.element:null,S0(g,F,g.pendingProps,null,A),F=g.memoizedState.element,F===b)tu(),g=gu(y,g,A);else{if((b=g.stateNode.hydrate)&&(w?(Tu=F0(g.stateNode.containerInfo),Qu=g,b=Ei=!0):b=!1),b)for(A=G(g,null,F,A),g.child=A;A;)A.effectTag=A.effectTag&-3|1024,A=A.sibling;else Bi(y,g,F,A),tu();g=g.child}return g;case 5:return vt(g),y===null&&Uo(g),F=g.type,b=g.pendingProps,J=y!==null?y.memoizedProps:null,pe=b.children,dt(F,b)?pe=null:J!==null&&dt(F,J)&&(g.effectTag|=16),eo(y,g),g.mode&4&&A!==1&&At(F,b)?(g.expirationTime=g.childExpirationTime=1,g=null):(Bi(y,g,pe,A),g=g.child),g;case 6:return y===null&&Uo(g),null;case 13:return Kt(y,g,A);case 4:return ke(g,g.stateNode.containerInfo),F=g.pendingProps,y===null?g.child=z(g,null,F,A):Bi(y,g,F,A),g.child;case 11:return F=g.type,b=g.pendingProps,b=g.elementType===F?b:Yn(F,b),Ci(y,g,F,b,A);case 7:return Bi(y,g,g.pendingProps,A),g.child;case 8:return Bi(y,g,g.pendingProps.children,A),g.child;case 12:return Bi(y,g,g.pendingProps.children,A),g.child;case 10:e:{if(F=g.type._context,b=g.pendingProps,pe=g.memoizedProps,J=b.value,Hu(g,J),pe!==null){var gt=pe.value;if(J=Ne(gt,J)?0:(typeof F._calculateChangedBits=="function"?F._calculateChangedBits(gt,J):1073741823)|0,J===0){if(pe.children===b.children&&!yi.current){g=gu(y,g,A);break e}}else for(gt=g.child,gt!==null&&(gt.return=g);gt!==null;){var xt=gt.dependencies;if(xt!==null){pe=gt.child;for(var kt=xt.firstContext;kt!==null;){if(kt.context===F&&(kt.observedBits&J)!=0){gt.tag===1&&(kt=m0(A,null),kt.tag=2,J0(gt,kt)),gt.expirationTime<A&&(gt.expirationTime=A),kt=gt.alternate,kt!==null&&kt.expirationTime<A&&(kt.expirationTime=A),Ti(gt.return,A),xt.expirationTime<A&&(xt.expirationTime=A);break}kt=kt.next}}else pe=gt.tag===10&&gt.type===g.type?null:gt.child;if(pe!==null)pe.return=gt;else for(pe=gt;pe!==null;){if(pe===g){pe=null;break}if(gt=pe.sibling,gt!==null){gt.return=pe.return,pe=gt;break}pe=pe.return}gt=pe}}Bi(y,g,b.children,A),g=g.child}return g;case 9:return b=g.type,J=g.pendingProps,F=J.children,Fo(g,A),b=ku(b,J.unstable_observedBits),F=F(b),g.effectTag|=1,Bi(y,g,F,A),g.child;case 14:return b=g.type,J=Yn(b,g.pendingProps),J=Yn(b.type,J),gf(y,g,b,J,F,A);case 15:return yf(y,g,g.type,g.pendingProps,F,A);case 17:return F=g.type,b=g.pendingProps,b=g.elementType===F?b:Yn(F,b),y!==null&&(y.alternate=null,g.alternate=null,g.effectTag|=2),g.tag=1,eu(F)?(y=!0,ai(g)):y=!1,Fo(g,A),Bs(g,F,b,A),Us(g,F,b,A),tt(null,g,F,!0,y,A);case 19:return xn(y,g,A)}throw Error(t(156,g.tag))};var da=null,Ss=null;function Ts(y){if(typeof __REACT_DEVTOOLS_GLOBAL_HOOK__=="undefined")return!1;var g=__REACT_DEVTOOLS_GLOBAL_HOOK__;if(g.isDisabled||!g.supportsFiber)return!0;try{var A=g.inject(y);da=function(F){try{g.onCommitFiberRoot(A,F,void 0,(F.current.effectTag&64)==64)}catch(b){}},Ss=function(F){try{g.onCommitFiberUnmount(A,F)}catch(b){}}}catch(F){}return!0}function ns(y,g,A,F){this.tag=y,this.key=A,this.sibling=this.child=this.return=this.stateNode=this.type=this.elementType=null,this.index=0,this.ref=null,this.pendingProps=g,this.dependencies=this.memoizedState=this.updateQueue=this.memoizedProps=null,this.mode=F,this.effectTag=0,this.lastEffect=this.firstEffect=this.nextEffect=null,this.childExpirationTime=this.expirationTime=0,this.alternate=null}function Ho(y,g,A,F){return new ns(y,g,A,F)}function Df(y){return y=y.prototype,!(!y||!y.isReactComponent)}function ol(y){if(typeof y=="function")return Df(y)?1:0;if(y!=null){if(y=y.$$typeof,y===De)return 11;if(y===_e)return 14}return 2}function Gu(y,g){var A=y.alternate;return A===null?(A=Ho(y.tag,g,y.key,y.mode),A.elementType=y.elementType,A.type=y.type,A.stateNode=y.stateNode,A.alternate=y,y.alternate=A):(A.pendingProps=g,A.effectTag=0,A.nextEffect=null,A.firstEffect=null,A.lastEffect=null),A.childExpirationTime=y.childExpirationTime,A.expirationTime=y.expirationTime,A.child=y.child,A.memoizedProps=y.memoizedProps,A.memoizedState=y.memoizedState,A.updateQueue=y.updateQueue,g=y.dependencies,A.dependencies=g===null?null:{expirationTime:g.expirationTime,firstContext:g.firstContext,responders:g.responders},A.sibling=y.sibling,A.index=y.index,A.ref=y.ref,A}function Wa(y,g,A,F,b,J){var pe=2;if(F=y,typeof y=="function")Df(y)&&(pe=1);else if(typeof y=="string")pe=5;else e:switch(y){case B:return r0(A.children,b,J,g);case he:pe=8,b|=7;break;case H:pe=8,b|=1;break;case q:return y=Ho(12,A,g,b|8),y.elementType=q,y.type=q,y.expirationTime=J,y;case se:return y=Ho(13,A,g,b),y.type=se,y.elementType=se,y.expirationTime=J,y;case fe:return y=Ho(19,A,g,b),y.elementType=fe,y.expirationTime=J,y;default:if(typeof y=="object"&&y!==null)switch(y.$$typeof){case ne:pe=10;break e;case m:pe=9;break e;case De:pe=11;break e;case _e:pe=14;break e;case ce:pe=16,F=null;break e}throw Error(t(130,y==null?y:typeof y,""))}return g=Ho(pe,A,g,b),g.elementType=y,g.type=F,g.expirationTime=J,g}function r0(y,g,A,F){return y=Ho(7,y,F,g),y.expirationTime=A,y}function j0(y,g,A){return y=Ho(6,y,null,g),y.expirationTime=A,y}function wf(y,g,A){return g=Ho(4,y.children!==null?y.children:[],y.key,g),g.expirationTime=A,g.stateNode={containerInfo:y.containerInfo,pendingChildren:null,implementation:y.implementation},g}function Wc(y,g,A){this.tag=g,this.current=null,this.containerInfo=y,this.pingCache=this.pendingChildren=null,this.finishedExpirationTime=0,this.finishedWork=null,this.timeoutHandle=lr,this.pendingContext=this.context=null,this.hydrate=A,this.callbackNode=null,this.callbackPriority=90,this.lastExpiredTime=this.lastPingedTime=this.nextKnownPendingLevel=this.lastSuspendedTime=this.firstSuspendedTime=this.firstPendingTime=0}function pc(y,g){var A=y.firstSuspendedTime;return y=y.lastSuspendedTime,A!==0&&A>=g&&y<=g}function Ol(y,g){var A=y.firstSuspendedTime,F=y.lastSuspendedTime;A<g&&(y.firstSuspendedTime=g),(F>g||A===0)&&(y.lastSuspendedTime=g),g<=y.lastPingedTime&&(y.lastPingedTime=0),g<=y.lastExpiredTime&&(y.lastExpiredTime=0)}function Cs(y,g){g>y.firstPendingTime&&(y.firstPendingTime=g);var A=y.firstSuspendedTime;A!==0&&(g>=A?y.firstSuspendedTime=y.lastSuspendedTime=y.nextKnownPendingLevel=0:g>=y.lastSuspendedTime&&(y.lastSuspendedTime=g+1),g>y.nextKnownPendingLevel&&(y.nextKnownPendingLevel=g))}function pa(y,g){var A=y.lastExpiredTime;(A===0||A>g)&&(y.lastExpiredTime=g)}function od(y){var g=y._reactInternalFiber;if(g===void 0)throw typeof y.render=="function"?Error(t(188)):Error(t(268,Object.keys(y)));return y=Qe(g),y===null?null:y.stateNode}function ha(y,g){y=y.memoizedState,y!==null&&y.dehydrated!==null&&y.retryTime<g&&(y.retryTime=g)}function hc(y,g){ha(y,g),(y=y.alternate)&&ha(y,g)}var Vc={createContainer:function(y,g,A){return y=new Wc(y,g,A),g=Ho(3,null,null,g===2?7:g===1?3:0),y.current=g,g.stateNode=y},updateContainer:function(y,g,A,F){var b=g.current,J=D0(),pe=fi.suspense;J=Un(J,b,pe);e:if(A){A=A._reactInternalFiber;t:{if(je(A)!==A||A.tag!==1)throw Error(t(170));var gt=A;do{switch(gt.tag){case 3:gt=gt.stateNode.context;break t;case 1:if(eu(gt.type)){gt=gt.stateNode.__reactInternalMemoizedMergedChildContext;break t}}gt=gt.return}while(gt!==null);throw Error(t(171))}if(A.tag===1){var xt=A.type;if(eu(xt)){A=ko(A,xt,gt);break e}}A=gt}else A=bn;return g.context===null?g.context=A:g.pendingContext=A,g=m0(J,pe),g.payload={element:y},F=F===void 0?null:F,F!==null&&(g.callback=F),J0(b,g),t0(b,J),J},batchedEventUpdates:function(y,g){var A=Fn;Fn|=2;try{return y(g)}finally{Fn=A,Fn===Ar&&ju()}},batchedUpdates:function(y,g){var A=Fn;Fn|=1;try{return y(g)}finally{Fn=A,Fn===Ar&&ju()}},unbatchedUpdates:function(y,g){var A=Fn;Fn&=-2,Fn|=no;try{return y(g)}finally{Fn=A,Fn===Ar&&ju()}},deferredUpdates:function(y){return co(97,y)},syncUpdates:function(y,g,A,F){return co(99,y.bind(null,g,A,F))},discreteUpdates:function(y,g,A,F){var b=Fn;Fn|=4;try{return co(98,y.bind(null,g,A,F))}finally{Fn=b,Fn===Ar&&ju()}},flushDiscreteUpdates:function(){(Fn&(1|nu|cu))===Ar&&(Ef(),Ws())},flushControlled:function(y){var g=Fn;Fn|=1;try{co(99,y)}finally{Fn=g,Fn===Ar&&ju()}},flushSync:cc,flushPassiveEffects:Ws,IsThisRendererActing:{current:!1},getPublicRootInstance:function(y){if(y=y.current,!y.child)return null;switch(y.child.tag){case 5:return Ve(y.child.stateNode);default:return y.child.stateNode}},attemptSynchronousHydration:function(y){switch(y.tag){case 3:var g=y.stateNode;g.hydrate&&Ua(g,g.firstPendingTime);break;case 13:cc(function(){return t0(y,1073741823)}),g=Q(D0(),150,100),hc(y,g)}},attemptUserBlockingHydration:function(y){if(y.tag===13){var g=Q(D0(),150,100);t0(y,g),hc(y,g)}},attemptContinuousHydration:function(y){if(y.tag===13){D0();var g=b0++;t0(y,g),hc(y,g)}},attemptHydrationAtCurrentPriority:function(y){if(y.tag===13){var g=D0();g=Un(g,y,null),t0(y,g),hc(y,g)}},findHostInstance:od,findHostInstanceWithWarning:function(y){return od(y)},findHostInstanceWithNoPortals:function(y){return y=ut(y),y===null?null:y.tag===20?y.stateNode.instance:y.stateNode},shouldSuspend:function(){return!1},injectIntoDevTools:function(y){var g=y.findFiberByHostInstance;return Ts(a({},y,{overrideHookState:null,overrideProps:null,setSuspenseHandler:null,scheduleUpdate:null,currentDispatcherRef:O.ReactCurrentDispatcher,findHostInstanceByFiber:function(A){return A=Qe(A),A===null?null:A.stateNode},findFiberByHostInstance:function(A){return g?g(A):null},findHostInstancesForRefresh:null,scheduleRefresh:null,scheduleRoot:null,setRefreshHandler:null,getCurrentFiber:null}))}};Xg.exports=Vc.default||Vc;var qi=Xg.exports;return Xg.exports=i,qi}});var fT=Ke(tc=>{"use strict";Object.defineProperty(tc,"__esModule",{value:!0});var UI=0;tc.__interactionsRef=null;tc.__subscriberRef=null;tc.unstable_clear=function(i){return i()};tc.unstable_getCurrent=function(){return null};tc.unstable_getThreadID=function(){return++UI};tc.unstable_trace=function(i,o,a){return a()};tc.unstable_wrap=function(i){return i};tc.unstable_subscribe=function(){};tc.unstable_unsubscribe=function(){}});var cT=Ke(mu=>{"use strict";process.env.NODE_ENV!=="production"&&function(){"use strict";Object.defineProperty(mu,"__esModule",{value:!0});var i=!0,o=0,a=0,c=0;mu.__interactionsRef=null,mu.__subscriberRef=null,i&&(mu.__interactionsRef={current:new Set},mu.__subscriberRef={current:null});function _(fe){if(!i)return fe();var _e=mu.__interactionsRef.current;mu.__interactionsRef.current=new Set;try{return fe()}finally{mu.__interactionsRef.current=_e}}function t(){return i?mu.__interactionsRef.current:null}function O(){return++c}function N(fe,_e,ce){var me=arguments.length>3&&arguments[3]!==void 0?arguments[3]:o;if(!i)return ce();var ie={__count:1,id:a++,name:fe,timestamp:_e},Oe=mu.__interactionsRef.current,Ue=new Set(Oe);Ue.add(ie),mu.__interactionsRef.current=Ue;var je=mu.__subscriberRef.current,at;try{je!==null&&je.onInteractionTraced(ie)}finally{try{je!==null&&je.onWorkStarted(Ue,me)}finally{try{at=ce()}finally{mu.__interactionsRef.current=Oe;try{je!==null&&je.onWorkStopped(Ue,me)}finally{ie.__count--,je!==null&&ie.__count===0&&je.onInteractionScheduledWorkCompleted(ie)}}}}return at}function M(fe){var _e=arguments.length>1&&arguments[1]!==void 0?arguments[1]:o;if(!i)return fe;var ce=mu.__interactionsRef.current,me=mu.__subscriberRef.current;me!==null&&me.onWorkScheduled(ce,_e),ce.forEach(function(Ue){Ue.__count++});var ie=!1;function Oe(){var Ue=mu.__interactionsRef.current;mu.__interactionsRef.current=ce,me=mu.__subscriberRef.current;try{var je;try{me!==null&&me.onWorkStarted(ce,_e)}finally{try{je=fe.apply(void 0,arguments)}finally{mu.__interactionsRef.current=Ue,me!==null&&me.onWorkStopped(ce,_e)}}return je}finally{ie||(ie=!0,ce.forEach(function(at){at.__count--,me!==null&&at.__count===0&&me.onInteractionScheduledWorkCompleted(at)}))}}return Oe.cancel=function(){me=mu.__subscriberRef.current;try{me!==null&&me.onWorkCanceled(ce,_e)}finally{ce.forEach(function(je){je.__count--,me&&je.__count===0&&me.onInteractionScheduledWorkCompleted(je)})}},Oe}var T=null;i&&(T=new Set);function B(fe){i&&(T.add(fe),T.size===1&&(mu.__subscriberRef.current={onInteractionScheduledWorkCompleted:ne,onInteractionTraced:q,onWorkCanceled:se,onWorkScheduled:m,onWorkStarted:he,onWorkStopped:De}))}function H(fe){i&&(T.delete(fe),T.size===0&&(mu.__subscriberRef.current=null))}function q(fe){var _e=!1,ce=null;if(T.forEach(function(me){try{me.onInteractionTraced(fe)}catch(ie){_e||(_e=!0,ce=ie)}}),_e)throw ce}function ne(fe){var _e=!1,ce=null;if(T.forEach(function(me){try{me.onInteractionScheduledWorkCompleted(fe)}catch(ie){_e||(_e=!0,ce=ie)}}),_e)throw ce}function m(fe,_e){var ce=!1,me=null;if(T.forEach(function(ie){try{ie.onWorkScheduled(fe,_e)}catch(Oe){ce||(ce=!0,me=Oe)}}),ce)throw me}function he(fe,_e){var ce=!1,me=null;if(T.forEach(function(ie){try{ie.onWorkStarted(fe,_e)}catch(Oe){ce||(ce=!0,me=Oe)}}),ce)throw me}function De(fe,_e){var ce=!1,me=null;if(T.forEach(function(ie){try{ie.onWorkStopped(fe,_e)}catch(Oe){ce||(ce=!0,me=Oe)}}),ce)throw me}function se(fe,_e){var ce=!1,me=null;if(T.forEach(function(ie){try{ie.onWorkCanceled(fe,_e)}catch(Oe){ce||(ce=!0,me=Oe)}}),ce)throw me}mu.unstable_clear=_,mu.unstable_getCurrent=t,mu.unstable_getThreadID=O,mu.unstable_trace=N,mu.unstable_wrap=M,mu.unstable_subscribe=B,mu.unstable_unsubscribe=H}()});var dT=Ke((jW,FD)=>{"use strict";process.env.NODE_ENV==="production"?FD.exports=fT():FD.exports=cT()});var pT=Ke((zW,Qg)=>{"use strict";process.env.NODE_ENV!=="production"&&(Qg.exports=function i(o){"use strict";var a=Ig(),c=ki(),_=pD(),t=Q_(),O=dT(),N=0,M=1,T=2,B=3,H=4,q=5,ne=6,m=7,he=8,De=9,se=10,fe=11,_e=12,ce=13,me=14,ie=15,Oe=16,Ue=17,je=18,at=19,Dt=20,Qe=21,ut=function(){};ut=function(f,d){for(var E=arguments.length,C=new Array(E>2?E-2:0),R=2;R<E;R++)C[R-2]=arguments[R];if(d===void 0)throw new Error("`warningWithoutStack(condition, format, ...args)` requires a warning message argument");if(C.length>8)throw new Error("warningWithoutStack() currently supports at most 8 arguments.");if(!f){if(typeof console!="undefined"){var j=C.map(function(le){return""+le});j.unshift("Warning: "+d),Function.prototype.apply.call(console.error,console,j)}try{var V=0,te="Warning: "+d.replace(/%s/g,function(){return C[V++]});throw new Error(te)}catch(le){}}};var Ve=ut;function It(f){return f._reactInternalFiber}function Xt(f,d){f._reactInternalFiber=d}var rt=c.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;rt.hasOwnProperty("ReactCurrentDispatcher")||(rt.ReactCurrentDispatcher={current:null}),rt.hasOwnProperty("ReactCurrentBatchConfig")||(rt.ReactCurrentBatchConfig={suspense:null});var X=typeof Symbol=="function"&&Symbol.for,de=X?Symbol.for("react.element"):60103,Ce=X?Symbol.for("react.portal"):60106,oe=X?Symbol.for("react.fragment"):60107,He=X?Symbol.for("react.strict_mode"):60108,dt=X?Symbol.for("react.profiler"):60114,At=X?Symbol.for("react.provider"):60109,nn=X?Symbol.for("react.context"):60110,an=X?Symbol.for("react.concurrent_mode"):60111,Mn=X?Symbol.for("react.forward_ref"):60112,lr=X?Symbol.for("react.suspense"):60113,ln=X?Symbol.for("react.suspense_list"):60120,Vt=X?Symbol.for("react.memo"):60115,Dr=X?Symbol.for("react.lazy"):60116,w=X?Symbol.for("react.fundamental"):60117,jt=X?Symbol.for("react.responder"):60118,Xn=X?Symbol.for("react.scope"):60119,vr=typeof Symbol=="function"&&Symbol.iterator,jr="@@iterator";function fr(f){if(f===null||typeof f!="object")return null;var d=vr&&f[vr]||f[jr];return typeof d=="function"?d:null}var zr=Ve;zr=function(f,d){if(!f){for(var E=rt.ReactDebugCurrentFrame,C=E.getStackAddendum(),R=arguments.length,j=new Array(R>2?R-2:0),V=2;V<R;V++)j[V-2]=arguments[V];Ve.apply(void 0,[!1,d+"%s"].concat(j,[C]))}};var Qt=zr,wu=-1,d0=0,Ro=1,Jo=2;function Ps(f){return f._status===Ro?f._result:null}function Zo(f){if(f._status===wu){f._status=d0;var d=f._ctor,E=d();f._result=E,E.then(function(C){if(f._status===d0){var R=C.default;R===void 0&&Qt(!1,`lazy: Expected the result of a dynamic import() call. Instead received: %s
-
-Your code should look like: 
-  const MyComponent = lazy(() => import('./MyComponent'))`,C),f._status=Ro,f._result=R}},function(C){f._status===d0&&(f._status=Jo,f._result=C)})}}function $o(f,d,E){var C=d.displayName||d.name||"";return f.displayName||(C!==""?E+"("+C+")":E)}function qt(f){if(f==null)return null;if(typeof f.tag=="number"&&Ve(!1,"Received an unexpected object in getComponentName(). This is likely a bug in React. Please file an issue."),typeof f=="function")return f.displayName||f.name||null;if(typeof f=="string")return f;switch(f){case oe:return"Fragment";case Ce:return"Portal";case dt:return"Profiler";case He:return"StrictMode";case lr:return"Suspense";case ln:return"SuspenseList"}if(typeof f=="object")switch(f.$$typeof){case nn:return"Context.Consumer";case At:return"Context.Provider";case Mn:return $o(f,f.render,"ForwardRef");case Vt:return qt(f.type);case Dr:{var d=f,E=Ps(d);if(E)return qt(E);break}}return null}var Ai=0,su=1,mi=2,wr=4,el=6,Y0=8,Uu=16,K0=32,Xr=64,Oo=128,Mo=256,F0=512,au=1024,Li=1028,Is=932,Xl=2047,P0=2048,p0=4096,Hr=!0,Ri=!0,X0=!0,gi=!0,en=!0,bn=!0,Oi=!1,yi=!1,Wt=!1,Ru=!1,eu=!1,Q0=!0,Yi=!1,Ql=!1,ko=!1,ai=!1,ao=!1,Jl=rt.ReactCurrentOwner;function Lo(f){var d=f,E=f;if(f.alternate)for(;d.return;)d=d.return;else{var C=d;do d=C,(d.effectTag&(mi|au))!==Ai&&(E=d.return),C=d.return;while(C)}return d.tag===B?E:null}function bs(f){return Lo(f)===f}function $n(f){{var d=Jl.current;if(d!==null&&d.tag===M){var E=d,C=E.stateNode;C._warnedAboutRefsInRender||Ve(!1,"%s is accessing isMounted inside its render() function. render() should be a pure function of props and state. It should never access something that requires stale data from the previous render, such as refs. Move this logic to componentDidMount and componentDidUpdate instead.",qt(E.type)||"A component"),C._warnedAboutRefsInRender=!0}}var R=It(f);return R?Lo(R)===R:!1}function tl(f){if(Lo(f)!==f)throw Error("Unable to find node on an unmounted component.")}function fo(f){var d=f.alternate;if(!d){var E=Lo(f);if(E===null)throw Error("Unable to find node on an unmounted component.");return E!==f?null:f}for(var C=f,R=d;;){var j=C.return;if(j===null)break;var V=j.alternate;if(V===null){var te=j.return;if(te!==null){C=R=te;continue}break}if(j.child===V.child){for(var le=j.child;le;){if(le===C)return tl(j),f;if(le===R)return tl(j),d;le=le.sibling}throw Error("Unable to find node on an unmounted component.")}if(C.return!==R.return)C=j,R=V;else{for(var Be=!1,Xe=j.child;Xe;){if(Xe===C){Be=!0,C=j,R=V;break}if(Xe===R){Be=!0,R=j,C=V;break}Xe=Xe.sibling}if(!Be){for(Xe=V.child;Xe;){if(Xe===C){Be=!0,C=V,R=j;break}if(Xe===R){Be=!0,R=V,C=j;break}Xe=Xe.sibling}if(!Be)throw Error("Child was not found in either parent set. This indicates a bug in React related to the return pointer. Please file an issue.")}}if(C.alternate!==R)throw Error("Return fibers should always be each others' alternates. This error is likely caused by a bug in React. Please file an issue.")}if(C.tag!==B)throw Error("Unable to find node on an unmounted component.");return C.stateNode.current===C?f:d}function I0(f){var d=fo(f);if(!d)return null;for(var E=d;;){if(E.tag===q||E.tag===ne)return E;if(E.child){E.child.return=E,E=E.child;continue}if(E===d)return null;for(;!E.sibling;){if(!E.return||E.return===d)return null;E=E.return}E.sibling.return=E.return,E=E.sibling}return null}function Sl(f){var d=fo(f);if(!d)return null;for(var E=d;;){if(E.tag===q||E.tag===ne||Wt&&E.tag===Dt)return E;if(E.child&&E.tag!==H){E.child.return=E,E=E.child;continue}if(E===d)return null;for(;!E.sibling;){if(!E.return||E.return===d)return null;E=E.return}E.sibling.return=E.return,E=E.sibling}return null}var No=o.getPublicInstance,wt=o.getRootHostContext,bt=o.getChildHostContext,Hn=o.prepareForCommit,qr=o.resetAfterCommit,Ki=o.createInstance,Qr=o.appendInitialChild,Ou=o.finalizeInitialChildren,h0=o.prepareUpdate,Ni=o.shouldSetTextContent,v0=o.shouldDeprioritizeSubtree,vs=o.createTextInstance,Tt=o.setTimeout,co=o.clearTimeout,nl=o.noTimeout,Zl=o.now,ju=o.isPrimaryRenderer,ms=o.warnsIfNotActing,b0=o.supportsMutation,Q=o.supportsPersistence,we=o.supportsHydration,Ne=o.mountResponderInstance,Le=o.unmountResponderInstance,pt=o.getFundamentalComponentInstance,Yn=o.mountFundamentalComponent,Cn=o.shouldUpdateFundamentalComponent,cr=o.getInstanceFromNode,Si=o.appendChild,Mu=o.appendChildToContainer,zu=o.commitTextUpdate,Hu=o.commitMount,Su=o.commitUpdate,Ti=o.insertBefore,Fo=o.insertInContainerBefore,ku=o.removeChild,po=o.removeChildFromContainer,qu=o.resetTextContent,Ia=o.hideInstance,m0=o.hideTextInstance,ua=o.unhideInstance,J0=o.unhideTextInstance,oa=o.updateFundamentalComponent,ba=o.unmountFundamentalComponent,gs=o.cloneInstance,S0=o.createContainerChildSet,Qn=o.appendChildToContainerChildSet,fc=o.finalizeContainerChildren,fi=o.replaceContainerChildren,$r=o.cloneHiddenInstance,$l=o.cloneHiddenTextInstance,la=o.cloneInstance,hf=o.canHydrateInstance,Bs=o.canHydrateTextInstance,Ba=o.canHydrateSuspenseInstance,Us=o.isSuspenseInstancePending,g0=o.isSuspenseInstanceFallback,js=o.registerSuspenseInstanceRetry,ji=o.getNextHydratableSibling,U=o.getFirstHydratableChild,z=o.hydrateInstance,G=o.hydrateTextInstance,$=o.hydrateSuspenseInstance,Te=o.getNextHydratableInstanceAfterSuspenseInstance,ye=o.commitHydratedContainer,Ae=o.commitHydratedSuspenseInstance,Z=o.clearSuspenseBoundary,ke=o.clearSuspenseBoundaryFromContainer,Je=o.didNotMatchHydratedContainerTextInstance,vt=o.didNotMatchHydratedTextInstance,ue=o.didNotHydrateContainerInstance,qe=o.didNotHydrateInstance,nt=o.didNotFindHydratableContainerInstance,Ct=o.didNotFindHydratableContainerTextInstance,Mt=o.didNotFindHydratableContainerSuspenseInstance,Pt=o.didNotFindHydratableInstance,sn=o.didNotFindHydratableTextInstance,rn=o.didNotFindHydratableSuspenseInstance,Nt=/^(.*)[\\\/]/,Dn=function(f,d,E){var C="";if(d){var R=d.fileName,j=R.replace(Nt,"");if(/^index\./.test(j)){var V=R.match(Nt);if(V){var te=V[1];if(te){var le=te.replace(Nt,"");j=le+"/"+j}}}C=" (at "+j+":"+d.lineNumber+")"}else E&&(C=" (created by "+E+")");return`
-    in `+(f||"Unknown")+C},dr=rt.ReactDebugCurrentFrame;function er(f){switch(f.tag){case B:case H:case ne:case m:case se:case De:return"";default:var d=f._debugOwner,E=f._debugSource,C=qt(f.type),R=null;return d&&(R=qt(d.type)),Dn(C,E,R)}}function Cr(f){var d="",E=f;do d+=er(E),E=E.return;while(E);return d}var Rn=null,Lr=null;function y0(){{if(Rn===null)return null;var f=Rn._debugOwner;if(f!==null&&typeof f!="undefined")return qt(f.type)}return null}function Nr(){return Rn===null?"":Cr(Rn)}function it(){dr.getCurrentStack=null,Rn=null,Lr=null}function Et(f){dr.getCurrentStack=Nr,Rn=f,Lr=null}function et(f){Lr=f}var Ft="\u269B",un="\u26D4",fn=typeof performance!="undefined"&&typeof performance.mark=="function"&&typeof performance.clearMarks=="function"&&typeof performance.measure=="function"&&typeof performance.clearMeasures=="function",Jn=null,Sr=null,fu=null,Lu=!1,T0=!1,Z0=!1,Nu=0,_i=0,Po=new Set,rl=function(f){return Ft+" "+f},vf=function(f,d){var E=d?un+" ":Ft+" ",C=d?" Warning: "+d:"";return""+E+f+C},Tl=function(f){performance.mark(rl(f))},mf=function(f){performance.clearMarks(rl(f))},Io=function(f,d,E){var C=rl(d),R=vf(f,E);try{performance.measure(R,C)}catch(j){}performance.clearMarks(C),performance.clearMeasures(R)},ys=function(f,d){return f+" (#"+d+")"},zs=function(f,d,E){return E===null?f+" ["+(d?"update":"mount")+"]":f+"."+E},bo=function(f,d){var E=qt(f.type)||"Unknown",C=f._debugID,R=f.alternate!==null,j=zs(E,R,d);if(Lu&&Po.has(j))return!1;Po.add(j);var V=ys(j,C);return Tl(V),!0},Bo=function(f,d){var E=qt(f.type)||"Unknown",C=f._debugID,R=f.alternate!==null,j=zs(E,R,d),V=ys(j,C);mf(V)},_s=function(f,d,E){var C=qt(f.type)||"Unknown",R=f._debugID,j=f.alternate!==null,V=zs(C,j,d),te=ys(V,R);Io(V,te,E)},Qu=function(f){switch(f.tag){case B:case q:case ne:case H:case m:case se:case De:case he:return!0;default:return!1}},Tu=function(){Sr!==null&&fu!==null&&Bo(fu,Sr),fu=null,Sr=null,Z0=!1},Ei=function(){for(var f=Jn;f;)f._debugIsCurrentlyTiming&&_s(f,null,null),f=f.return},C0=function(f){f.return!==null&&C0(f.return),f._debugIsCurrentlyTiming&&bo(f,null)},$0=function(){Jn!==null&&C0(Jn)};function Uo(){Hr&&_i++}function sa(){Hr&&(Lu&&(T0=!0),Sr!==null&&Sr!=="componentWillMount"&&Sr!=="componentWillReceiveProps"&&(Z0=!0))}function es(f){if(Hr){if(!fn||Qu(f)||(Jn=f,!bo(f,null)))return;f._debugIsCurrentlyTiming=!0}}function tu(f){if(Hr){if(!fn||Qu(f))return;f._debugIsCurrentlyTiming=!1,Bo(f,null)}}function ei(f){if(Hr){if(!fn||Qu(f)||(Jn=f.return,!f._debugIsCurrentlyTiming))return;f._debugIsCurrentlyTiming=!1,_s(f,null,null)}}function ho(f){if(Hr){if(!fn||Qu(f)||(Jn=f.return,!f._debugIsCurrentlyTiming))return;f._debugIsCurrentlyTiming=!1;var d=f.tag===ce?"Rendering was suspended":"An error was thrown inside this error boundary";_s(f,null,d)}}function Bi(f,d){if(Hr){if(!fn||(Tu(),!bo(f,d)))return;fu=f,Sr=d}}function Ci(){if(Hr){if(!fn)return;if(Sr!==null&&fu!==null){var f=Z0?"Scheduled a cascading update":null;_s(fu,Sr,f)}Sr=null,fu=null}}function gf(f){if(Hr){if(Jn=f,!fn)return;Nu=0,Tl("(React Tree Reconciliation)"),$0()}}function yf(f,d){if(Hr){if(!fn)return;var E=null;if(f!==null)if(f.tag===B)E="A top-level update interrupted the previous render";else{var C=qt(f.type)||"Unknown";E="An update to "+C+" interrupted the previous render"}else Nu>1&&(E="There were cascading updates");Nu=0;var R=d?"(React Tree Reconciliation: Completed Root)":"(React Tree Reconciliation: Yielded)";Ei(),Io(R,"(React Tree Reconciliation)",E)}}function eo(){if(Hr){if(!fn)return;Lu=!0,T0=!1,Po.clear(),Tl("(Committing Changes)")}}function to(){if(Hr){if(!fn)return;var f=null;T0?f="Lifecycle hook scheduled a cascading update":Nu>0&&(f="Caused by a cascading update in earlier commit"),T0=!1,Nu++,Lu=!1,Po.clear(),Io("(Committing Changes)","(Committing Changes)",f)}}function xe(){if(Hr){if(!fn)return;_i=0,Tl("(Committing Snapshot Effects)")}}function tt(){if(Hr){if(!fn)return;var f=_i;_i=0,Io("(Committing Snapshot Effects: "+f+" Total)","(Committing Snapshot Effects)",null)}}function Ye(){if(Hr){if(!fn)return;_i=0,Tl("(Committing Host Effects)")}}function Yt(){if(Hr){if(!fn)return;var f=_i;_i=0,Io("(Committing Host Effects: "+f+" Total)","(Committing Host Effects)",null)}}function Kt(){if(Hr){if(!fn)return;_i=0,Tl("(Calling Lifecycle Methods)")}}function pr(){if(Hr){if(!fn)return;var f=_i;_i=0,Io("(Calling Lifecycle Methods: "+f+" Total)","(Calling Lifecycle Methods)",null)}}var Wr=[],xn;xn=[];var gu=-1;function Ju(f){return{current:f}}function ti(f,d){if(gu<0){Ve(!1,"Unexpected pop.");return}d!==xn[gu]&&Ve(!1,"Unexpected Fiber popped."),f.current=Wr[gu],Wr[gu]=null,xn[gu]=null,gu--}function Jr(f,d,E){gu++,Wr[gu]=f.current,xn[gu]=E,f.current=d}var Wu;Wu={};var An={};Object.freeze(An);var x0=Ju(An),Fu=Ju(!1),li=An;function Cl(f,d,E){return ai?An:E&&Xi(d)?li:x0.current}function Hs(f,d,E){if(!ai){var C=f.stateNode;C.__reactInternalMemoizedUnmaskedChildContext=d,C.__reactInternalMemoizedMaskedChildContext=E}}function Vu(f,d){if(ai)return An;var E=f.type,C=E.contextTypes;if(!C)return An;var R=f.stateNode;if(R&&R.__reactInternalMemoizedUnmaskedChildContext===d)return R.__reactInternalMemoizedMaskedChildContext;var j={};for(var V in C)j[V]=d[V];{var te=qt(E)||"Unknown";_(C,j,"context",te,Nr)}return R&&Hs(f,d,j),j}function aa(){return ai?!1:Fu.current}function Xi(f){if(ai)return!1;var d=f.childContextTypes;return d!=null}function qs(f){ai||(ti(Fu,f),ti(x0,f))}function A0(f){ai||(ti(Fu,f),ti(x0,f))}function zi(f,d,E){if(!ai){if(x0.current!==An)throw Error("Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue.");Jr(x0,d,f),Jr(Fu,E,f)}}function R0(f,d,E){if(ai)return E;var C=f.stateNode,R=d.childContextTypes;if(typeof C.getChildContext!="function"){{var j=qt(d)||"Unknown";Wu[j]||(Wu[j]=!0,Ve(!1,"%s.childContextTypes is specified but there is no getChildContext() method on the instance. You can either define getChildContext() on %s or remove childContextTypes from it.",j,j))}return E}var V;et("getChildContext"),Bi(f,"getChildContext"),V=C.getChildContext(),Ci(),et(null);for(var te in V)if(!(te in R))throw Error((qt(d)||"Unknown")+'.getChildContext(): key "'+te+'" is not defined in childContextTypes.');{var le=qt(d)||"Unknown";_(R,V,"child context",le,Nr)}return a({},E,{},V)}function Hi(f){if(ai)return!1;var d=f.stateNode,E=d&&d.__reactInternalMemoizedMergedChildContext||An;return li=x0.current,Jr(x0,E,f),Jr(Fu,Fu.current,f),!0}function il(f,d,E){if(!ai){var C=f.stateNode;if(!C)throw Error("Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue.");if(E){var R=R0(f,d,li);C.__reactInternalMemoizedMergedChildContext=R,ti(Fu,f),ti(x0,f),Jr(x0,R,f),Jr(Fu,E,f)}else ti(Fu,f),Jr(Fu,E,f)}}function xl(f){if(ai)return An;if(!(bs(f)&&f.tag===M))throw Error("Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue.");var d=f;do{switch(d.tag){case B:return d.stateNode.context;case M:{var E=d.type;if(Xi(E))return d.stateNode.__reactInternalMemoizedMergedChildContext;break}}d=d.return}while(d!==null);throw Error("Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue.")}var B0=1,O0=2,vo=t.unstable_runWithPriority,Pu=t.unstable_scheduleCallback,Zu=t.unstable_cancelCallback,ts=t.unstable_shouldYield,Es=t.unstable_requestPaint,fa=t.unstable_now,_f=t.unstable_getCurrentPriorityLevel,$u=t.unstable_ImmediatePriority,Ds=t.unstable_UserBlockingPriority,Ar=t.unstable_NormalPriority,no=t.unstable_LowPriority,nu=t.unstable_IdlePriority;if(bn&&!(O.__interactionsRef!=null&&O.__interactionsRef.current!=null))throw Error("It is not supported to run the profiling version of a renderer (for example, `react-dom/profiling`) without also replacing the `scheduler/tracing` module with `scheduler/tracing-profiling`. Your bundler might have a setting for aliasing both modules. Learn more at http://fb.me/react-profiling");var cu={},Fi=99,ni=98,Kn=97,e0=96,_0=95,E0=90,Fn=ts,ae=Es!==void 0?Es:function(){},re=null,Fe=null,Re=!1,st=fa(),mt=st<1e4?fa:function(){return fa()-st};function Jt(){switch(_f()){case $u:return Fi;case Ds:return ni;case Ar:return Kn;case no:return e0;case nu:return _0;default:throw Error("Unknown priority level.")}}function On(f){switch(f){case Fi:return $u;case ni:return Ds;case Kn:return Ar;case e0:return no;case _0:return nu;default:throw Error("Unknown priority level.")}}function Sn(f,d){var E=On(f);return vo(E,d)}function _n(f,d,E){var C=On(f);return Pu(C,d,E)}function Tn(f){return re===null?(re=[f],Fe=Pu($u,Pi)):re.push(f),cu}function ir(f){f!==cu&&Zu(f)}function Bt(){if(Fe!==null){var f=Fe;Fe=null,Zu(f)}Pi()}function Pi(){if(!Re&&re!==null){Re=!0;var f=0;try{var d=!0,E=re;Sn(Fi,function(){for(;f<E.length;f++){var C=E[f];do C=C(d);while(C!==null)}}),re=null}catch(C){throw re!==null&&(re=re.slice(f+1)),Pu($u,Bt),C}finally{Re=!1}}}var Rr=0,mr=1,Y=2,ri=4,ii=8,Vr=1073741823,ft=0,Di=1,ru=2,D0=3,Un=Vr,t0=Un-1,ro=10,mo=t0-1;function n0(f){return mo-(f/ro|0)}function jo(f){return(mo-f)*ro}function io(f,d){return((f/d|0)+1)*d}function Ua(f,d,E){return mo-io(mo-f+d/ro,E/ro)}var Ef=5e3,cc=250;function ws(f){return Ua(f,Ef,cc)}function ca(f,d){return Ua(f,d,cc)}var U0=500,dc=100;function ja(f){return Ua(f,U0,dc)}function D2(f){return D0++}function rd(f,d){if(d===Un)return Fi;if(d===Di||d===ru)return _0;var E=jo(d)-jo(f);return E<=0?Fi:E<=U0+dc?ni:E<=Ef+cc?Kn:_0}function id(f,d){return f===d&&(f!==0||1/f==1/d)||f!==f&&d!==d}var go=typeof Object.is=="function"?Object.is:id,qc=Object.prototype.hasOwnProperty;function Al(f,d){if(go(f,d))return!0;if(typeof f!="object"||f===null||typeof d!="object"||d===null)return!1;var E=Object.keys(f),C=Object.keys(d);if(E.length!==C.length)return!1;for(var R=0;R<E.length;R++)if(!qc.call(d,E[R])||!go(f[E[R]],d[E[R]]))return!1;return!0}var ul=function(){};{var w2=function(f){for(var d=arguments.length,E=new Array(d>1?d-1:0),C=1;C<d;C++)E[C-1]=arguments[C];var R=0,j="Warning: "+f.replace(/%s/g,function(){return E[R++]});typeof console!="undefined"&&console.warn(j);try{throw new Error(j)}catch(V){}};ul=function(f,d){if(d===void 0)throw new Error("`lowPriorityWarningWithoutStack(condition, format, ...args)` requires a warning message argument");if(!f){for(var E=arguments.length,C=new Array(E>2?E-2:0),R=2;R<E;R++)C[R-2]=arguments[R];w2.apply(void 0,[d].concat(C))}}}var Ws=ul,Rl={recordUnsafeLifecycleWarnings:function(f,d){},flushPendingUnsafeLifecycleWarnings:function(){},recordLegacyContextWarning:function(f,d){},flushLegacyContextWarning:function(){},discardPendingWarnings:function(){}};{var ud=function(f){for(var d=null,E=f;E!==null;)E.mode&mr&&(d=E),E=E.return;return d},zo=function(f){var d=[];return f.forEach(function(E){d.push(E)}),d.sort().join(", ")},za=[],Ha=[],qa=[],da=[],Ss=[],Ts=[],ns=new Set;Rl.recordUnsafeLifecycleWarnings=function(f,d){ns.has(f.type)||(typeof d.componentWillMount=="function"&&d.componentWillMount.__suppressDeprecationWarning!==!0&&za.push(f),f.mode&mr&&typeof d.UNSAFE_componentWillMount=="function"&&Ha.push(f),typeof d.componentWillReceiveProps=="function"&&d.componentWillReceiveProps.__suppressDeprecationWarning!==!0&&qa.push(f),f.mode&mr&&typeof d.UNSAFE_componentWillReceiveProps=="function"&&da.push(f),typeof d.componentWillUpdate=="function"&&d.componentWillUpdate.__suppressDeprecationWarning!==!0&&Ss.push(f),f.mode&mr&&typeof d.UNSAFE_componentWillUpdate=="function"&&Ts.push(f))},Rl.flushPendingUnsafeLifecycleWarnings=function(){var f=new Set;za.length>0&&(za.forEach(function(Lt){f.add(qt(Lt.type)||"Component"),ns.add(Lt.type)}),za=[]);var d=new Set;Ha.length>0&&(Ha.forEach(function(Lt){d.add(qt(Lt.type)||"Component"),ns.add(Lt.type)}),Ha=[]);var E=new Set;qa.length>0&&(qa.forEach(function(Lt){E.add(qt(Lt.type)||"Component"),ns.add(Lt.type)}),qa=[]);var C=new Set;da.length>0&&(da.forEach(function(Lt){C.add(qt(Lt.type)||"Component"),ns.add(Lt.type)}),da=[]);var R=new Set;Ss.length>0&&(Ss.forEach(function(Lt){R.add(qt(Lt.type)||"Component"),ns.add(Lt.type)}),Ss=[]);var j=new Set;if(Ts.length>0&&(Ts.forEach(function(Lt){j.add(qt(Lt.type)||"Component"),ns.add(Lt.type)}),Ts=[]),d.size>0){var V=zo(d);Ve(!1,`Using UNSAFE_componentWillMount in strict mode is not recommended and may indicate bugs in your code. See https://fb.me/react-unsafe-component-lifecycles for details.
-
-* Move code with side effects to componentDidMount, and set initial state in the constructor.
-
-Please update the following components: %s`,V)}if(C.size>0){var te=zo(C);Ve(!1,`Using UNSAFE_componentWillReceiveProps in strict mode is not recommended and may indicate bugs in your code. See https://fb.me/react-unsafe-component-lifecycles for details.
-
-* Move data fetching code or side effects to componentDidUpdate.
-* If you're updating state whenever props change, refactor your code to use memoization techniques or move it to static getDerivedStateFromProps. Learn more at: https://fb.me/react-derived-state
-
-Please update the following components: %s`,te)}if(j.size>0){var le=zo(j);Ve(!1,`Using UNSAFE_componentWillUpdate in strict mode is not recommended and may indicate bugs in your code. See https://fb.me/react-unsafe-component-lifecycles for details.
-
-* Move data fetching code or side effects to componentDidUpdate.
-
-Please update the following components: %s`,le)}if(f.size>0){var Be=zo(f);Ws(!1,`componentWillMount has been renamed, and is not recommended for use. See https://fb.me/react-unsafe-component-lifecycles for details.
-
-* Move code with side effects to componentDidMount, and set initial state in the constructor.
-* Rename componentWillMount to UNSAFE_componentWillMount to suppress this warning in non-strict mode. In React 17.x, only the UNSAFE_ name will work. To rename all deprecated lifecycles to their new names, you can run \`npx react-codemod rename-unsafe-lifecycles\` in your project source folder.
-
-Please update the following components: %s`,Be)}if(E.size>0){var Xe=zo(E);Ws(!1,`componentWillReceiveProps has been renamed, and is not recommended for use. See https://fb.me/react-unsafe-component-lifecycles for details.
-
-* Move data fetching code or side effects to componentDidUpdate.
-* If you're updating state whenever props change, refactor your code to use memoization techniques or move it to static getDerivedStateFromProps. Learn more at: https://fb.me/react-derived-state
-* Rename componentWillReceiveProps to UNSAFE_componentWillReceiveProps to suppress this warning in non-strict mode. In React 17.x, only the UNSAFE_ name will work. To rename all deprecated lifecycles to their new names, you can run \`npx react-codemod rename-unsafe-lifecycles\` in your project source folder.
-
-Please update the following components: %s`,Xe)}if(R.size>0){var ht=zo(R);Ws(!1,`componentWillUpdate has been renamed, and is not recommended for use. See https://fb.me/react-unsafe-component-lifecycles for details.
-
-* Move data fetching code or side effects to componentDidUpdate.
-* Rename componentWillUpdate to UNSAFE_componentWillUpdate to suppress this warning in non-strict mode. In React 17.x, only the UNSAFE_ name will work. To rename all deprecated lifecycles to their new names, you can run \`npx react-codemod rename-unsafe-lifecycles\` in your project source folder.
-
-Please update the following components: %s`,ht)}};var Ho=new Map,Df=new Set;Rl.recordLegacyContextWarning=function(f,d){var E=ud(f);if(E===null){Ve(!1,"Expected to find a StrictMode component in a strict mode tree. This error is likely caused by a bug in React. Please file an issue.");return}if(!Df.has(f.type)){var C=Ho.get(E);(f.type.contextTypes!=null||f.type.childContextTypes!=null||d!==null&&typeof d.getChildContext=="function")&&(C===void 0&&(C=[],Ho.set(E,C)),C.push(f))}},Rl.flushLegacyContextWarning=function(){Ho.forEach(function(f,d){var E=new Set;f.forEach(function(j){E.add(qt(j.type)||"Component"),Df.add(j.type)});var C=zo(E),R=Cr(d);Ve(!1,`Legacy context API has been detected within a strict-mode tree.
-
-The old API will be supported in all 16.x releases, but applications using it should migrate to the new version.
-
-Please update the following components: %s
-
-Learn more about this warning here: https://fb.me/react-legacy-context%s`,C,R)})},Rl.discardPendingWarnings=function(){za=[],Ha=[],qa=[],da=[],Ss=[],Ts=[],Ho=new Map}}var ol=null,Gu=null,Wa=function(f){ol=f};function r0(f){{if(ol===null)return f;var d=ol(f);return d===void 0?f:d.current}}function j0(f){return r0(f)}function wf(f){{if(ol===null)return f;var d=ol(f);if(d===void 0){if(f!=null&&typeof f.render=="function"){var E=r0(f.render);if(f.render!==E){var C={$$typeof:Mn,render:E};return f.displayName!==void 0&&(C.displayName=f.displayName),C}}return f}return d.current}}function Wc(f,d){{if(ol===null)return!1;var E=f.elementType,C=d.type,R=!1,j=typeof C=="object"&&C!==null?C.$$typeof:null;switch(f.tag){case M:{typeof C=="function"&&(R=!0);break}case N:{(typeof C=="function"||j===Dr)&&(R=!0);break}case fe:{(j===Mn||j===Dr)&&(R=!0);break}case me:case ie:{(j===Vt||j===Dr)&&(R=!0);break}default:return!1}if(R){var V=ol(E);if(V!==void 0&&V===ol(C))return!0}return!1}}function pc(f){{if(ol===null||typeof WeakSet!="function")return;Gu===null&&(Gu=new WeakSet),Gu.add(f)}}var Ol=function(f,d){{if(ol===null)return;var E=d.staleFamilies,C=d.updatedFamilies;nf(),Op(function(){pa(f.current,C,E)})}},Cs=function(f,d){{if(f.context!==An)return;nf(),pv(function(){o_(d,f,null,null)})}};function pa(f,d,E){{var C=f.alternate,R=f.child,j=f.sibling,V=f.tag,te=f.type,le=null;switch(V){case N:case ie:case M:le=te;break;case fe:le=te.render;break;default:break}if(ol===null)throw new Error("Expected resolveFamily to be set during hot reload.");var Be=!1,Xe=!1;if(le!==null){var ht=ol(le);ht!==void 0&&(E.has(ht)?Xe=!0:d.has(ht)&&(V===M?Xe=!0:Be=!0))}Gu!==null&&(Gu.has(f)||C!==null&&Gu.has(C))&&(Xe=!0),Xe&&(f._debugNeedsRemount=!0),(Xe||Be)&&gl(f,Un),R!==null&&!Xe&&pa(R,d,E),j!==null&&pa(j,d,E)}}var od=function(f,d){{var E=new Set,C=new Set(d.map(function(R){return R.current}));return ha(f.current,C,E),E}};function ha(f,d,E){{var C=f.child,R=f.sibling,j=f.tag,V=f.type,te=null;switch(j){case N:case ie:case M:te=V;break;case fe:te=V.render;break;default:break}var le=!1;te!==null&&d.has(te)&&(le=!0),le?hc(f,E):C!==null&&ha(C,d,E),R!==null&&ha(R,d,E)}}function hc(f,d){{var E=Vc(f,d);if(E)return;for(var C=f;;){switch(C.tag){case q:d.add(C.stateNode);return;case H:d.add(C.stateNode.containerInfo);return;case B:d.add(C.stateNode.containerInfo);return}if(C.return===null)throw new Error("Expected to reach root first.");C=C.return}}}function Vc(f,d){for(var E=f,C=!1;;){if(E.tag===q)C=!0,d.add(E.stateNode);else if(E.child!==null){E.child.return=E,E=E.child;continue}if(E===f)return C;for(;E.sibling===null;){if(E.return===null||E.return===f)return C;E=E.return}E.sibling.return=E.return,E=E.sibling}return!1}function qi(f,d){if(f&&f.defaultProps){var E=a({},d),C=f.defaultProps;for(var R in C)E[R]===void 0&&(E[R]=C[R]);return E}return d}function y(f){if(Zo(f),f._status!==Ro)throw f._result;return f._result}var g=Ju(null),A;A={};var F=null,b=null,J=null,pe=!1;function gt(){F=null,b=null,J=null,pe=!1}function xt(){pe=!0}function kt(){pe=!1}function xr(f,d){var E=f.type._context;ju?(Jr(g,E._currentValue,f),E._currentValue=d,E._currentRenderer===void 0||E._currentRenderer===null||E._currentRenderer===A||Ve(!1,"Detected multiple renderers concurrently rendering the same context provider. This is currently unsupported."),E._currentRenderer=A):(Jr(g,E._currentValue2,f),E._currentValue2=d,E._currentRenderer2===void 0||E._currentRenderer2===null||E._currentRenderer2===A||Ve(!1,"Detected multiple renderers concurrently rendering the same context provider. This is currently unsupported."),E._currentRenderer2=A)}function i0(f){var d=g.current;ti(g,f);var E=f.type._context;ju?E._currentValue=d:E._currentValue2=d}function du(f,d,E){if(go(E,d))return 0;var C=typeof f._calculateChangedBits=="function"?f._calculateChangedBits(E,d):Vr;return(C&Vr)!==C&&Qt(!1,"calculateChangedBits: Expected the return value to be a 31-bit integer. Instead received: %s",C),C|0}function z0(f,d){for(var E=f;E!==null;){var C=E.alternate;if(E.childExpirationTime<d)E.childExpirationTime=d,C!==null&&C.childExpirationTime<d&&(C.childExpirationTime=d);else if(C!==null&&C.childExpirationTime<d)C.childExpirationTime=d;else break;E=E.return}}function Ml(f,d,E,C){var R=f.child;for(R!==null&&(R.return=f);R!==null;){var j=void 0,V=R.dependencies;if(V!==null){j=R.child;for(var te=V.firstContext;te!==null;){if(te.context===d&&(te.observedBits&E)!=0){if(R.tag===M){var le=Cu(C,null);le.tag=$t,Ga(R,le)}R.expirationTime<C&&(R.expirationTime=C);var Be=R.alternate;Be!==null&&Be.expirationTime<C&&(Be.expirationTime=C),z0(R.return,C),V.expirationTime<C&&(V.expirationTime=C);break}te=te.next}}else if(R.tag===se)j=R.type===f.type?null:R.child;else if(Oi&&R.tag===je){var Xe=R.return;if(Xe===null)throw Error("We just came from a parent so we must have had a parent. This is a bug in React.");Xe.expirationTime<C&&(Xe.expirationTime=C);var ht=Xe.alternate;ht!==null&&ht.expirationTime<C&&(ht.expirationTime=C),z0(Xe,C),j=R.sibling}else j=R.child;if(j!==null)j.return=R;else for(j=R;j!==null;){if(j===f){j=null;break}var Lt=j.sibling;if(Lt!==null){Lt.return=j.return,j=Lt;break}j=j.return}R=j}}function u0(f,d){F=f,b=null,J=null;var E=f.dependencies;if(E!==null){var C=E.firstContext;C!==null&&(E.expirationTime>=d&&sp(),E.firstContext=null)}}function We(f,d){if(pe&&Qt(!1,"Context can only be read while React is rendering. In classes, you can read it in the render method or getDerivedStateFromProps. In function components, you can read it directly in the function body, but not inside Hooks like useReducer() or useMemo()."),J!==f){if(!(d===!1||d===0)){var E;typeof d!="number"||d===Vr?(J=f,E=Vr):E=d;var C={context:f,observedBits:E,next:null};if(b===null){if(F===null)throw Error("Context can only be read while React is rendering. In classes, you can read it in the render method or getDerivedStateFromProps. In function components, you can read it directly in the function body, but not inside Hooks like useReducer() or useMemo().");b=C,F.dependencies={expirationTime:ft,firstContext:C,responders:null}}else b=b.next=C}}return ju?f._currentValue:f._currentValue2}var ze=0,lt=1,$t=2,Wn=3,si=!1,ur,ci;ur=!1,ci=null;function Qi(f){var d={baseState:f,firstUpdate:null,lastUpdate:null,firstCapturedUpdate:null,lastCapturedUpdate:null,firstEffect:null,lastEffect:null,firstCapturedEffect:null,lastCapturedEffect:null};return d}function Gr(f){var d={baseState:f.baseState,firstUpdate:f.firstUpdate,lastUpdate:f.lastUpdate,firstCapturedUpdate:null,lastCapturedUpdate:null,firstEffect:null,lastEffect:null,firstCapturedEffect:null,lastCapturedEffect:null};return d}function Cu(f,d){var E={expirationTime:f,suspenseConfig:d,tag:ze,payload:null,callback:null,next:null,nextEffect:null};return E.priority=Jt(),E}function Va(f,d){f.lastUpdate===null?f.firstUpdate=f.lastUpdate=d:(f.lastUpdate.next=d,f.lastUpdate=d)}function Ga(f,d){var E=f.alternate,C,R;E===null?(C=f.updateQueue,R=null,C===null&&(C=f.updateQueue=Qi(f.memoizedState))):(C=f.updateQueue,R=E.updateQueue,C===null?R===null?(C=f.updateQueue=Qi(f.memoizedState),R=E.updateQueue=Qi(E.memoizedState)):C=f.updateQueue=Gr(R):R===null&&(R=E.updateQueue=Gr(C))),R===null||C===R?Va(C,d):C.lastUpdate===null||R.lastUpdate===null?(Va(C,d),Va(R,d)):(Va(C,d),R.lastUpdate=d),f.tag===M&&(ci===C||R!==null&&ci===R)&&!ur&&(Ve(!1,"An update (setState, replaceState, or forceUpdate) was scheduled from inside an update function. Update functions should be pure, with zero side-effects. Consider using componentDidUpdate or a callback."),ur=!0)}function ld(f,d){var E=f.updateQueue;E===null?E=f.updateQueue=Qi(f.memoizedState):E=S2(f,E),E.lastCapturedUpdate===null?E.firstCapturedUpdate=E.lastCapturedUpdate=d:(E.lastCapturedUpdate.next=d,E.lastCapturedUpdate=d)}function S2(f,d){var E=f.alternate;return E!==null&&d===E.updateQueue&&(d=f.updateQueue=Gr(d)),d}function T2(f,d,E,C,R,j){switch(E.tag){case lt:{var V=E.payload;if(typeof V=="function"){xt(),Ri&&f.mode&mr&&V.call(j,C,R);var te=V.call(j,C,R);return kt(),te}return V}case Wn:f.effectTag=f.effectTag&~p0|Xr;case ze:{var le=E.payload,Be;return typeof le=="function"?(xt(),Ri&&f.mode&mr&&le.call(j,C,R),Be=le.call(j,C,R),kt()):Be=le,Be==null?C:a({},C,Be)}case $t:return si=!0,C}return C}function Sf(f,d,E,C,R){si=!1,d=S2(f,d),ci=d;for(var j=d.baseState,V=null,te=ft,le=d.firstUpdate,Be=j;le!==null;){var Xe=le.expirationTime;if(Xe<R)V===null&&(V=le,j=Be),te<Xe&&(te=Xe);else{yv(Xe,le.suspenseConfig),Be=T2(f,d,le,Be,E,C);var ht=le.callback;ht!==null&&(f.effectTag|=K0,le.nextEffect=null,d.lastEffect===null?d.firstEffect=d.lastEffect=le:(d.lastEffect.nextEffect=le,d.lastEffect=le))}le=le.next}var Lt=null;for(le=d.firstCapturedUpdate;le!==null;){var Gt=le.expirationTime;if(Gt<R)Lt===null&&(Lt=le,V===null&&(j=Be)),te<Gt&&(te=Gt);else{Be=T2(f,d,le,Be,E,C);var zt=le.callback;zt!==null&&(f.effectTag|=K0,le.nextEffect=null,d.lastCapturedEffect===null?d.firstCapturedEffect=d.lastCapturedEffect=le:(d.lastCapturedEffect.nextEffect=le,d.lastCapturedEffect=le))}le=le.next}V===null&&(d.lastUpdate=null),Lt===null?d.lastCapturedUpdate=null:f.effectTag|=K0,V===null&&Lt===null&&(j=Be),d.baseState=j,d.firstUpdate=V,d.firstCapturedUpdate=Lt,Qd(te),f.expirationTime=te,f.memoizedState=Be,ci=null}function sd(f,d){if(typeof f!="function")throw Error("Invalid argument passed as callback. Expected a function. Instead received: "+f);f.call(d)}function hh(){si=!1}function Gc(){return si}function yo(f,d,E,C){d.firstCapturedUpdate!==null&&(d.lastUpdate!==null&&(d.lastUpdate.next=d.firstCapturedUpdate,d.lastUpdate=d.lastCapturedUpdate),d.firstCapturedUpdate=d.lastCapturedUpdate=null),vh(d.firstEffect,E),d.firstEffect=d.lastEffect=null,vh(d.firstCapturedEffect,E),d.firstCapturedEffect=d.lastCapturedEffect=null}function vh(f,d){for(;f!==null;){var E=f.callback;E!==null&&(f.callback=null,sd(E,d)),f=f.nextEffect}}var mh=rt.ReactCurrentBatchConfig;function _o(){return mh.suspense}var kl={},ad=Array.isArray,fd=new c.Component().refs,C2,Yc,Ir,cd,dd,Ya,Kc,x2,ll,sl;{C2=new Set,Yc=new Set,Ir=new Set,cd=new Set,x2=new Set,dd=new Set,ll=new Set,sl=new Set;var gh=new Set;Kc=function(f,d){if(!(f===null||typeof f=="function")){var E=d+"_"+f;gh.has(E)||(gh.add(E),Ve(!1,"%s(...): Expected the last optional `callback` argument to be a function. Instead received: %s.",d,f))}},Ya=function(f,d){if(d===void 0){var E=qt(f)||"Component";dd.has(E)||(dd.add(E),Ve(!1,"%s.getDerivedStateFromProps(): A valid state object (or null) must be returned. You have returned undefined.",E))}},Object.defineProperty(kl,"_processChildContext",{enumerable:!1,value:function(){throw Error("_processChildContext is not available in React 16+. This likely means you have multiple copies of React and are attempting to nest a React 15 tree inside a React 16 tree using unstable_renderSubtreeIntoContainer, which isn't supported. Try to make sure you have only one copy of React (and ideally, switch to ReactDOM.createPortal).")}}),Object.freeze(kl)}function Tf(f,d,E,C){var R=f.memoizedState;Ri&&f.mode&mr&&E(C,R);var j=E(C,R);Ya(d,j);var V=j==null?R:a({},R,j);f.memoizedState=V;var te=f.updateQueue;te!==null&&f.expirationTime===ft&&(te.baseState=V)}var Xc={isMounted:$n,enqueueSetState:function(f,d,E){var C=It(f),R=jl(),j=_o(),V=zf(R,C,j),te=Cu(V,j);te.payload=d,E!=null&&(Kc(E,"setState"),te.callback=E),Ga(C,te),gl(C,V)},enqueueReplaceState:function(f,d,E){var C=It(f),R=jl(),j=_o(),V=zf(R,C,j),te=Cu(V,j);te.tag=lt,te.payload=d,E!=null&&(Kc(E,"replaceState"),te.callback=E),Ga(C,te),gl(C,V)},enqueueForceUpdate:function(f,d){var E=It(f),C=jl(),R=_o(),j=zf(C,E,R),V=Cu(j,R);V.tag=$t,d!=null&&(Kc(d,"forceUpdate"),V.callback=d),Ga(E,V),gl(E,j)}};function A2(f,d,E,C,R,j,V){var te=f.stateNode;if(typeof te.shouldComponentUpdate=="function"){Bi(f,"shouldComponentUpdate");var le=te.shouldComponentUpdate(C,j,V);return Ci(),le===void 0&&Ve(!1,"%s.shouldComponentUpdate(): Returned undefined instead of a boolean value. Make sure to return true or false.",qt(d)||"Component"),le}return d.prototype&&d.prototype.isPureReactComponent?!Al(E,C)||!Al(R,j):!0}function yh(f,d,E){var C=f.stateNode;{var R=qt(d)||"Component",j=C.render;j||(d.prototype&&typeof d.prototype.render=="function"?Ve(!1,"%s(...): No `render` method found on the returned component instance: did you accidentally return an object from the constructor?",R):Ve(!1,"%s(...): No `render` method found on the returned component instance: you may have forgotten to define `render`.",R));var V=!C.getInitialState||C.getInitialState.isReactClassApproved||C.state;V||Ve(!1,"getInitialState was defined on %s, a plain JavaScript class. This is only supported for classes created using React.createClass. Did you mean to define a state property instead?",R);var te=!C.getDefaultProps||C.getDefaultProps.isReactClassApproved;te||Ve(!1,"getDefaultProps was defined on %s, a plain JavaScript class. This is only supported for classes created using React.createClass. Use a static property to define defaultProps instead.",R);var le=!C.propTypes;le||Ve(!1,"propTypes was defined as an instance property on %s. Use a static property to define propTypes instead.",R);var Be=!C.contextType;if(Be||Ve(!1,"contextType was defined as an instance property on %s. Use a static property to define contextType instead.",R),ai)d.childContextTypes&&Ve(!1,"%s uses the legacy childContextTypes API which is no longer supported. Use React.createContext() instead.",R),d.contextTypes&&Ve(!1,"%s uses the legacy contextTypes API which is no longer supported. Use React.createContext() with static contextType instead.",R);else{var Xe=!C.contextTypes;Xe||Ve(!1,"contextTypes was defined as an instance property on %s. Use a static property to define contextTypes instead.",R),d.contextType&&d.contextTypes&&!ll.has(d)&&(ll.add(d),Ve(!1,"%s declares both contextTypes and contextType static properties. The legacy contextTypes property will be ignored.",R))}var ht=typeof C.componentShouldUpdate!="function";ht||Ve(!1,"%s has a method called componentShouldUpdate(). Did you mean shouldComponentUpdate()? The name is phrased as a question because the function is expected to return a value.",R),d.prototype&&d.prototype.isPureReactComponent&&typeof C.shouldComponentUpdate!="undefined"&&Ve(!1,"%s has a method called shouldComponentUpdate(). shouldComponentUpdate should not be used when extending React.PureComponent. Please extend React.Component if shouldComponentUpdate is used.",qt(d)||"A pure component");var Lt=typeof C.componentDidUnmount!="function";Lt||Ve(!1,"%s has a method called componentDidUnmount(). But there is no such lifecycle method. Did you mean componentWillUnmount()?",R);var Gt=typeof C.componentDidReceiveProps!="function";Gt||Ve(!1,"%s has a method called componentDidReceiveProps(). But there is no such lifecycle method. If you meant to update the state in response to changing props, use componentWillReceiveProps(). If you meant to fetch data or run side-effects or mutations after React has updated the UI, use componentDidUpdate().",R);var zt=typeof C.componentWillRecieveProps!="function";zt||Ve(!1,"%s has a method called componentWillRecieveProps(). Did you mean componentWillReceiveProps()?",R);var gn=typeof C.UNSAFE_componentWillRecieveProps!="function";gn||Ve(!1,"%s has a method called UNSAFE_componentWillRecieveProps(). Did you mean UNSAFE_componentWillReceiveProps()?",R);var kr=C.props!==E;C.props===void 0||!kr||Ve(!1,"%s(...): When calling super() in `%s`, make sure to pass up the same props that your component's constructor was passed.",R,R);var oi=!C.defaultProps;oi||Ve(!1,"Setting defaultProps as an instance property on %s is not supported and will be ignored. Instead, define defaultProps as a static property on %s.",R,R),typeof C.getSnapshotBeforeUpdate=="function"&&typeof C.componentDidUpdate!="function"&&!Ir.has(d)&&(Ir.add(d),Ve(!1,"%s: getSnapshotBeforeUpdate() should be used with componentDidUpdate(). This component defines getSnapshotBeforeUpdate() only.",qt(d)));var Mi=typeof C.getDerivedStateFromProps!="function";Mi||Ve(!1,"%s: getDerivedStateFromProps() is defined as an instance method and will be ignored. Instead, declare it as a static method.",R);var N0=typeof C.getDerivedStateFromError!="function";N0||Ve(!1,"%s: getDerivedStateFromError() is defined as an instance method and will be ignored. Instead, declare it as a static method.",R);var $i=typeof d.getSnapshotBeforeUpdate!="function";$i||Ve(!1,"%s: getSnapshotBeforeUpdate() is defined as a static method and will be ignored. Instead, declare it as an instance method.",R);var ot=C.state;ot&&(typeof ot!="object"||ad(ot))&&Ve(!1,"%s.state: must be set to an object or null",R),typeof C.getChildContext=="function"&&typeof d.childContextTypes!="object"&&Ve(!1,"%s.getChildContext(): childContextTypes must be defined in order to use getChildContext().",R)}}function al(f,d){d.updater=Xc,f.stateNode=d,Xt(d,f),d._reactInternalInstance=kl}function va(f,d,E,C){var R=!1,j=An,V=An,te=d.contextType;if("contextType"in d){var le=te===null||te!==void 0&&te.$$typeof===nn&&te._context===void 0;if(!le&&!sl.has(d)){sl.add(d);var Be="";te===void 0?Be=" However, it is set to undefined. This can be caused by a typo or by mixing up named and default imports. This can also happen due to a circular dependency, so try moving the createContext() call to a separate file.":typeof te!="object"?Be=" However, it is set to a "+typeof te+".":te.$$typeof===At?Be=" Did you accidentally pass the Context.Provider instead?":te._context!==void 0?Be=" Did you accidentally pass the Context.Consumer instead?":Be=" However, it is set to an object with keys {"+Object.keys(te).join(", ")+"}.",Ve(!1,"%s defines an invalid contextType. contextType should point to the Context object returned by React.createContext().%s",qt(d)||"Component",Be)}}if(typeof te=="object"&&te!==null)V=We(te);else if(!ai){j=Cl(f,d,!0);var Xe=d.contextTypes;R=Xe!=null,V=R?Vu(f,j):An}Ri&&f.mode&mr&&new d(E,V);var ht=new d(E,V),Lt=f.memoizedState=ht.state!==null&&ht.state!==void 0?ht.state:null;al(f,ht);{if(typeof d.getDerivedStateFromProps=="function"&&Lt===null){var Gt=qt(d)||"Component";Yc.has(Gt)||(Yc.add(Gt),Ve(!1,"`%s` uses `getDerivedStateFromProps` but its initial state is %s. This is not recommended. Instead, define the initial state by assigning an object to `this.state` in the constructor of `%s`. This ensures that `getDerivedStateFromProps` arguments have a consistent shape.",Gt,ht.state===null?"null":"undefined",Gt))}if(typeof d.getDerivedStateFromProps=="function"||typeof ht.getSnapshotBeforeUpdate=="function"){var zt=null,gn=null,kr=null;if(typeof ht.componentWillMount=="function"&&ht.componentWillMount.__suppressDeprecationWarning!==!0?zt="componentWillMount":typeof ht.UNSAFE_componentWillMount=="function"&&(zt="UNSAFE_componentWillMount"),typeof ht.componentWillReceiveProps=="function"&&ht.componentWillReceiveProps.__suppressDeprecationWarning!==!0?gn="componentWillReceiveProps":typeof ht.UNSAFE_componentWillReceiveProps=="function"&&(gn="UNSAFE_componentWillReceiveProps"),typeof ht.componentWillUpdate=="function"&&ht.componentWillUpdate.__suppressDeprecationWarning!==!0?kr="componentWillUpdate":typeof ht.UNSAFE_componentWillUpdate=="function"&&(kr="UNSAFE_componentWillUpdate"),zt!==null||gn!==null||kr!==null){var oi=qt(d)||"Component",Mi=typeof d.getDerivedStateFromProps=="function"?"getDerivedStateFromProps()":"getSnapshotBeforeUpdate()";cd.has(oi)||(cd.add(oi),Ve(!1,`Unsafe legacy lifecycles will not be called for components using new component APIs.
-
-%s uses %s but also contains the following legacy lifecycles:%s%s%s
-
-The above lifecycles should be removed. Learn more about this warning here:
-https://fb.me/react-unsafe-component-lifecycles`,oi,Mi,zt!==null?`
-  `+zt:"",gn!==null?`
-  `+gn:"",kr!==null?`
-  `+kr:""))}}}return R&&Hs(f,j,V),ht}function R2(f,d){Bi(f,"componentWillMount");var E=d.state;typeof d.componentWillMount=="function"&&d.componentWillMount(),typeof d.UNSAFE_componentWillMount=="function"&&d.UNSAFE_componentWillMount(),Ci(),E!==d.state&&(Ve(!1,"%s.componentWillMount(): Assigning directly to this.state is deprecated (except inside a component's constructor). Use setState instead.",qt(f.type)||"Component"),Xc.enqueueReplaceState(d,d.state,null))}function O2(f,d,E,C){var R=d.state;if(Bi(f,"componentWillReceiveProps"),typeof d.componentWillReceiveProps=="function"&&d.componentWillReceiveProps(E,C),typeof d.UNSAFE_componentWillReceiveProps=="function"&&d.UNSAFE_componentWillReceiveProps(E,C),Ci(),d.state!==R){{var j=qt(f.type)||"Component";C2.has(j)||(C2.add(j),Ve(!1,"%s.componentWillReceiveProps(): Assigning directly to this.state is deprecated (except inside a component's constructor). Use setState instead.",j))}Xc.enqueueReplaceState(d,d.state,null)}}function vc(f,d,E,C){yh(f,d,E);var R=f.stateNode;R.props=E,R.state=f.memoizedState,R.refs=fd;var j=d.contextType;if(typeof j=="object"&&j!==null)R.context=We(j);else if(ai)R.context=An;else{var V=Cl(f,d,!0);R.context=Vu(f,V)}{if(R.state===E){var te=qt(d)||"Component";x2.has(te)||(x2.add(te),Ve(!1,"%s: It is not recommended to assign props directly to state because updates to props won't be reflected in state. In most cases, it is better to use props directly.",te))}f.mode&mr&&Rl.recordLegacyContextWarning(f,R),gi&&Rl.recordUnsafeLifecycleWarnings(f,R)}var le=f.updateQueue;le!==null&&(Sf(f,le,E,R,C),R.state=f.memoizedState);var Be=d.getDerivedStateFromProps;typeof Be=="function"&&(Tf(f,d,Be,E),R.state=f.memoizedState),typeof d.getDerivedStateFromProps!="function"&&typeof R.getSnapshotBeforeUpdate!="function"&&(typeof R.UNSAFE_componentWillMount=="function"||typeof R.componentWillMount=="function")&&(R2(f,R),le=f.updateQueue,le!==null&&(Sf(f,le,E,R,C),R.state=f.memoizedState)),typeof R.componentDidMount=="function"&&(f.effectTag|=wr)}function _h(f,d,E,C){var R=f.stateNode,j=f.memoizedProps;R.props=j;var V=R.context,te=d.contextType,le=An;if(typeof te=="object"&&te!==null)le=We(te);else if(!ai){var Be=Cl(f,d,!0);le=Vu(f,Be)}var Xe=d.getDerivedStateFromProps,ht=typeof Xe=="function"||typeof R.getSnapshotBeforeUpdate=="function";!ht&&(typeof R.UNSAFE_componentWillReceiveProps=="function"||typeof R.componentWillReceiveProps=="function")&&(j!==E||V!==le)&&O2(f,R,E,le),hh();var Lt=f.memoizedState,Gt=R.state=Lt,zt=f.updateQueue;if(zt!==null&&(Sf(f,zt,E,R,C),Gt=f.memoizedState),j===E&&Lt===Gt&&!aa()&&!Gc())return typeof R.componentDidMount=="function"&&(f.effectTag|=wr),!1;typeof Xe=="function"&&(Tf(f,d,Xe,E),Gt=f.memoizedState);var gn=Gc()||A2(f,d,j,E,Lt,Gt,le);return gn?(!ht&&(typeof R.UNSAFE_componentWillMount=="function"||typeof R.componentWillMount=="function")&&(Bi(f,"componentWillMount"),typeof R.componentWillMount=="function"&&R.componentWillMount(),typeof R.UNSAFE_componentWillMount=="function"&&R.UNSAFE_componentWillMount(),Ci()),typeof R.componentDidMount=="function"&&(f.effectTag|=wr)):(typeof R.componentDidMount=="function"&&(f.effectTag|=wr),f.memoizedProps=E,f.memoizedState=Gt),R.props=E,R.state=Gt,R.context=le,gn}function M2(f,d,E,C,R){var j=d.stateNode,V=d.memoizedProps;j.props=d.type===d.elementType?V:qi(d.type,V);var te=j.context,le=E.contextType,Be=An;if(typeof le=="object"&&le!==null)Be=We(le);else if(!ai){var Xe=Cl(d,E,!0);Be=Vu(d,Xe)}var ht=E.getDerivedStateFromProps,Lt=typeof ht=="function"||typeof j.getSnapshotBeforeUpdate=="function";!Lt&&(typeof j.UNSAFE_componentWillReceiveProps=="function"||typeof j.componentWillReceiveProps=="function")&&(V!==C||te!==Be)&&O2(d,j,C,Be),hh();var Gt=d.memoizedState,zt=j.state=Gt,gn=d.updateQueue;if(gn!==null&&(Sf(d,gn,C,j,R),zt=d.memoizedState),V===C&&Gt===zt&&!aa()&&!Gc())return typeof j.componentDidUpdate=="function"&&(V!==f.memoizedProps||Gt!==f.memoizedState)&&(d.effectTag|=wr),typeof j.getSnapshotBeforeUpdate=="function"&&(V!==f.memoizedProps||Gt!==f.memoizedState)&&(d.effectTag|=Mo),!1;typeof ht=="function"&&(Tf(d,E,ht,C),zt=d.memoizedState);var kr=Gc()||A2(d,E,V,C,Gt,zt,Be);return kr?(!Lt&&(typeof j.UNSAFE_componentWillUpdate=="function"||typeof j.componentWillUpdate=="function")&&(Bi(d,"componentWillUpdate"),typeof j.componentWillUpdate=="function"&&j.componentWillUpdate(C,zt,Be),typeof j.UNSAFE_componentWillUpdate=="function"&&j.UNSAFE_componentWillUpdate(C,zt,Be),Ci()),typeof j.componentDidUpdate=="function"&&(d.effectTag|=wr),typeof j.getSnapshotBeforeUpdate=="function"&&(d.effectTag|=Mo)):(typeof j.componentDidUpdate=="function"&&(V!==f.memoizedProps||Gt!==f.memoizedState)&&(d.effectTag|=wr),typeof j.getSnapshotBeforeUpdate=="function"&&(V!==f.memoizedProps||Gt!==f.memoizedState)&&(d.effectTag|=Mo),d.memoizedProps=C,d.memoizedState=zt),j.props=C,j.state=zt,j.context=Be,kr}var pd,Qc,Jc,Vs,k2,ma=function(f){};pd=!1,Qc=!1,Jc={},Vs={},k2={},ma=function(f){if(!(f===null||typeof f!="object")&&!(!f._store||f._store.validated||f.key!=null)){if(typeof f._store!="object")throw Error("React Component in warnForMissingKey should have a _store. This error is likely caused by a bug in React. Please file an issue.");f._store.validated=!0;var d='Each child in a list should have a unique "key" prop. See https://fb.me/react-warning-keys for more information.'+Nr();Vs[d]||(Vs[d]=!0,Qt(!1,'Each child in a list should have a unique "key" prop. See https://fb.me/react-warning-keys for more information.'))}};var Zc=Array.isArray;function mc(f,d,E){var C=E.ref;if(C!==null&&typeof C!="function"&&typeof C!="object"){if(f.mode&mr||ko){var R=qt(f.type)||"Component";Jc[R]||(ko?Ve(!1,'Component "%s" contains the string ref "%s". Support for string refs will be removed in a future major release. We recommend using useRef() or createRef() instead. Learn more about using refs safely here: https://fb.me/react-strict-mode-string-ref%s',R,C,Cr(f)):Ve(!1,'A string ref, "%s", has been found within a strict mode tree. String refs are a source of potential bugs and should be avoided. We recommend using useRef() or createRef() instead. Learn more about using refs safely here: https://fb.me/react-strict-mode-string-ref%s',C,Cr(f)),Jc[R]=!0)}if(E._owner){var j=E._owner,V;if(j){var te=j;if(te.tag!==M)throw Error("Function components cannot have refs. Did you mean to use React.forwardRef()?");V=te.stateNode}if(!V)throw Error("Missing owner for string ref "+C+". This error is likely caused by a bug in React. Please file an issue.");var le=""+C;if(d!==null&&d.ref!==null&&typeof d.ref=="function"&&d.ref._stringRef===le)return d.ref;var Be=function(Xe){var ht=V.refs;ht===fd&&(ht=V.refs={}),Xe===null?delete ht[le]:ht[le]=Xe};return Be._stringRef=le,Be}else{if(typeof C!="string")throw Error("Expected ref to be a function, a string, an object returned by React.createRef(), or null.");if(!E._owner)throw Error("Element ref was specified as a string ("+C+`) but no owner was set. This could happen for one of the following reasons:
-1. You may be adding a ref to a function component
-2. You may be adding a ref to a component that was not created inside a component's render method
-3. You have multiple copies of React loaded
-See https://fb.me/react-refs-must-have-owner for more information.`)}}return C}function gc(f,d){if(f.type!=="textarea"){var E="";throw E=" If you meant to render a collection of children, use an array instead."+Nr(),Error("Objects are not valid as a React child (found: "+(Object.prototype.toString.call(d)==="[object Object]"?"object with keys {"+Object.keys(d).join(", ")+"}":d)+")."+E)}}function hd(){var f="Functions are not valid as a React child. This may happen if you return a Component instead of <Component /> from render. Or maybe you meant to call this function rather than return it."+Nr();k2[f]||(k2[f]=!0,Qt(!1,"Functions are not valid as a React child. This may happen if you return a Component instead of <Component /> from render. Or maybe you meant to call this function rather than return it."))}function Eh(f){function d(ot,Ot){if(!!f){var $e=ot.lastEffect;$e!==null?($e.nextEffect=Ot,ot.lastEffect=Ot):ot.firstEffect=ot.lastEffect=Ot,Ot.nextEffect=null,Ot.effectTag=Y0}}function E(ot,Ot){if(!f)return null;for(var $e=Ot;$e!==null;)d(ot,$e),$e=$e.sibling;return null}function C(ot,Ot){for(var $e=new Map,Ut=Ot;Ut!==null;)Ut.key!==null?$e.set(Ut.key,Ut):$e.set(Ut.index,Ut),Ut=Ut.sibling;return $e}function R(ot,Ot,$e){var Ut=Co(ot,Ot,$e);return Ut.index=0,Ut.sibling=null,Ut}function j(ot,Ot,$e){if(ot.index=$e,!f)return Ot;var Ut=ot.alternate;if(Ut!==null){var Pn=Ut.index;return Pn<Ot?(ot.effectTag=mi,Ot):Pn}else return ot.effectTag=mi,Ot}function V(ot){return f&&ot.alternate===null&&(ot.effectTag=mi),ot}function te(ot,Ot,$e,Ut){if(Ot===null||Ot.tag!==ne){var Pn=_g($e,ot.mode,Ut);return Pn.return=ot,Pn}else{var vn=R(Ot,$e,Ut);return vn.return=ot,vn}}function le(ot,Ot,$e,Ut){if(Ot!==null&&(Ot.elementType===$e.type||Wc(Ot,$e))){var Pn=R(Ot,$e.props,Ut);return Pn.ref=mc(ot,Ot,$e),Pn.return=ot,Pn._debugSource=$e._source,Pn._debugOwner=$e._owner,Pn}else{var vn=yg($e,ot.mode,Ut);return vn.ref=mc(ot,Ot,$e),vn.return=ot,vn}}function Be(ot,Ot,$e,Ut){if(Ot===null||Ot.tag!==H||Ot.stateNode.containerInfo!==$e.containerInfo||Ot.stateNode.implementation!==$e.implementation){var Pn=Eg($e,ot.mode,Ut);return Pn.return=ot,Pn}else{var vn=R(Ot,$e.children||[],Ut);return vn.return=ot,vn}}function Xe(ot,Ot,$e,Ut,Pn){if(Ot===null||Ot.tag!==m){var vn=rf($e,ot.mode,Ut,Pn);return vn.return=ot,vn}else{var Wi=R(Ot,$e,Ut);return Wi.return=ot,Wi}}function ht(ot,Ot,$e){if(typeof Ot=="string"||typeof Ot=="number"){var Ut=_g(""+Ot,ot.mode,$e);return Ut.return=ot,Ut}if(typeof Ot=="object"&&Ot!==null){switch(Ot.$$typeof){case de:{var Pn=yg(Ot,ot.mode,$e);return Pn.ref=mc(ot,null,Ot),Pn.return=ot,Pn}case Ce:{var vn=Eg(Ot,ot.mode,$e);return vn.return=ot,vn}}if(Zc(Ot)||fr(Ot)){var Wi=rf(Ot,ot.mode,$e,null);return Wi.return=ot,Wi}gc(ot,Ot)}return typeof Ot=="function"&&hd(),null}function Lt(ot,Ot,$e,Ut){var Pn=Ot!==null?Ot.key:null;if(typeof $e=="string"||typeof $e=="number")return Pn!==null?null:te(ot,Ot,""+$e,Ut);if(typeof $e=="object"&&$e!==null){switch($e.$$typeof){case de:return $e.key===Pn?$e.type===oe?Xe(ot,Ot,$e.props.children,Ut,Pn):le(ot,Ot,$e,Ut):null;case Ce:return $e.key===Pn?Be(ot,Ot,$e,Ut):null}if(Zc($e)||fr($e))return Pn!==null?null:Xe(ot,Ot,$e,Ut,null);gc(ot,$e)}return typeof $e=="function"&&hd(),null}function Gt(ot,Ot,$e,Ut,Pn){if(typeof Ut=="string"||typeof Ut=="number"){var vn=ot.get($e)||null;return te(Ot,vn,""+Ut,Pn)}if(typeof Ut=="object"&&Ut!==null){switch(Ut.$$typeof){case de:{var Wi=ot.get(Ut.key===null?$e:Ut.key)||null;return Ut.type===oe?Xe(Ot,Wi,Ut.props.children,Pn,Ut.key):le(Ot,Wi,Ut,Pn)}case Ce:{var pi=ot.get(Ut.key===null?$e:Ut.key)||null;return Be(Ot,pi,Ut,Pn)}}if(Zc(Ut)||fr(Ut)){var Ku=ot.get($e)||null;return Xe(Ot,Ku,Ut,Pn,null)}gc(Ot,Ut)}return typeof Ut=="function"&&hd(),null}function zt(ot,Ot){{if(typeof ot!="object"||ot===null)return Ot;switch(ot.$$typeof){case de:case Ce:ma(ot);var $e=ot.key;if(typeof $e!="string")break;if(Ot===null){Ot=new Set,Ot.add($e);break}if(!Ot.has($e)){Ot.add($e);break}Qt(!1,"Encountered two children with the same key, `%s`. Keys should be unique so that components maintain their identity across updates. Non-unique keys may cause children to be duplicated and/or omitted \u2014 the behavior is unsupported and could change in a future version.",$e);break;default:break}}return Ot}function gn(ot,Ot,$e,Ut){for(var Pn=null,vn=0;vn<$e.length;vn++){var Wi=$e[vn];Pn=zt(Wi,Pn)}for(var pi=null,Ku=null,hr=Ot,hu=0,Kr=0,xu=null;hr!==null&&Kr<$e.length;Kr++){hr.index>Kr?(xu=hr,hr=null):xu=hr.sibling;var w0=Lt(ot,hr,$e[Kr],Ut);if(w0===null){hr===null&&(hr=xu);break}f&&hr&&w0.alternate===null&&d(ot,hr),hu=j(w0,hu,Kr),Ku===null?pi=w0:Ku.sibling=w0,Ku=w0,hr=xu}if(Kr===$e.length)return E(ot,hr),pi;if(hr===null){for(;Kr<$e.length;Kr++){var W0=ht(ot,$e[Kr],Ut);W0!==null&&(hu=j(W0,hu,Kr),Ku===null?pi=W0:Ku.sibling=W0,Ku=W0)}return pi}for(var ks=C(ot,hr);Kr<$e.length;Kr++){var Xu=Gt(ks,ot,Kr,$e[Kr],Ut);Xu!==null&&(f&&Xu.alternate!==null&&ks.delete(Xu.key===null?Kr:Xu.key),hu=j(Xu,hu,Kr),Ku===null?pi=Xu:Ku.sibling=Xu,Ku=Xu)}return f&&ks.forEach(function(yl){return d(ot,yl)}),pi}function kr(ot,Ot,$e,Ut){var Pn=fr($e);if(typeof Pn!="function")throw Error("An object is not an iterable. This error is likely caused by a bug in React. Please file an issue.");{typeof Symbol=="function"&&$e[Symbol.toStringTag]==="Generator"&&(Qc||Qt(!1,"Using Generators as children is unsupported and will likely yield unexpected results because enumerating a generator mutates it. You may convert it to an array with `Array.from()` or the `[...spread]` operator before rendering. Keep in mind you might need to polyfill these features for older browsers."),Qc=!0),$e.entries===Pn&&(pd||Qt(!1,"Using Maps as children is unsupported and will likely yield unexpected results. Convert it to a sequence/iterable of keyed ReactElements instead."),pd=!0);var vn=Pn.call($e);if(vn)for(var Wi=null,pi=vn.next();!pi.done;pi=vn.next()){var Ku=pi.value;Wi=zt(Ku,Wi)}}var hr=Pn.call($e);if(hr==null)throw Error("An iterable object provided no iterator.");for(var hu=null,Kr=null,xu=Ot,w0=0,W0=0,ks=null,Xu=hr.next();xu!==null&&!Xu.done;W0++,Xu=hr.next()){xu.index>W0?(ks=xu,xu=null):ks=xu.sibling;var yl=Lt(ot,xu,Xu.value,Ut);if(yl===null){xu===null&&(xu=ks);break}f&&xu&&yl.alternate===null&&d(ot,xu),w0=j(yl,w0,W0),Kr===null?hu=yl:Kr.sibling=yl,Kr=yl,xu=ks}if(Xu.done)return E(ot,xu),hu;if(xu===null){for(;!Xu.done;W0++,Xu=hr.next()){var uf=ht(ot,Xu.value,Ut);uf!==null&&(w0=j(uf,w0,W0),Kr===null?hu=uf:Kr.sibling=uf,Kr=uf)}return hu}for(var Vo=C(ot,xu);!Xu.done;W0++,Xu=hr.next()){var Ls=Gt(Vo,ot,W0,Xu.value,Ut);Ls!==null&&(f&&Ls.alternate!==null&&Vo.delete(Ls.key===null?W0:Ls.key),w0=j(Ls,w0,W0),Kr===null?hu=Ls:Kr.sibling=Ls,Kr=Ls)}return f&&Vo.forEach(function($d){return d(ot,$d)}),hu}function oi(ot,Ot,$e,Ut){if(Ot!==null&&Ot.tag===ne){E(ot,Ot.sibling);var Pn=R(Ot,$e,Ut);return Pn.return=ot,Pn}E(ot,Ot);var vn=_g($e,ot.mode,Ut);return vn.return=ot,vn}function Mi(ot,Ot,$e,Ut){for(var Pn=$e.key,vn=Ot;vn!==null;){if(vn.key===Pn)if(vn.tag===m?$e.type===oe:vn.elementType===$e.type||Wc(vn,$e)){E(ot,vn.sibling);var Wi=R(vn,$e.type===oe?$e.props.children:$e.props,Ut);return Wi.ref=mc(ot,vn,$e),Wi.return=ot,Wi._debugSource=$e._source,Wi._debugOwner=$e._owner,Wi}else{E(ot,vn);break}else d(ot,vn);vn=vn.sibling}if($e.type===oe){var pi=rf($e.props.children,ot.mode,Ut,$e.key);return pi.return=ot,pi}else{var Ku=yg($e,ot.mode,Ut);return Ku.ref=mc(ot,Ot,$e),Ku.return=ot,Ku}}function N0(ot,Ot,$e,Ut){for(var Pn=$e.key,vn=Ot;vn!==null;){if(vn.key===Pn)if(vn.tag===H&&vn.stateNode.containerInfo===$e.containerInfo&&vn.stateNode.implementation===$e.implementation){E(ot,vn.sibling);var Wi=R(vn,$e.children||[],Ut);return Wi.return=ot,Wi}else{E(ot,vn);break}else d(ot,vn);vn=vn.sibling}var pi=Eg($e,ot.mode,Ut);return pi.return=ot,pi}function $i(ot,Ot,$e,Ut){var Pn=typeof $e=="object"&&$e!==null&&$e.type===oe&&$e.key===null;Pn&&($e=$e.props.children);var vn=typeof $e=="object"&&$e!==null;if(vn)switch($e.$$typeof){case de:return V(Mi(ot,Ot,$e,Ut));case Ce:return V(N0(ot,Ot,$e,Ut))}if(typeof $e=="string"||typeof $e=="number")return V(oi(ot,Ot,""+$e,Ut));if(Zc($e))return gn(ot,Ot,$e,Ut);if(fr($e))return kr(ot,Ot,$e,Ut);if(vn&&gc(ot,$e),typeof $e=="function"&&hd(),typeof $e=="undefined"&&!Pn)switch(ot.tag){case M:{var Wi=ot.stateNode;if(Wi.render._isMockFunction)break}case N:{var pi=ot.type;throw Error((pi.displayName||pi.name||"Component")+"(...): Nothing was returned from render. This usually means a return statement is missing. Or, to render nothing, return null.")}}return E(ot,Ot)}return $i}var Cf=Eh(!0),$c=Eh(!1);function Dh(f,d){if(!(f===null||d.child===f.child))throw Error("Resuming work not yet implemented.");if(d.child!==null){var E=d.child,C=Co(E,E.pendingProps,E.expirationTime);for(d.child=C,C.return=d;E.sibling!==null;)E=E.sibling,C=C.sibling=Co(E,E.pendingProps,E.expirationTime),C.return=d;C.sibling=null}}function am(f,d){for(var E=f.child;E!==null;)kv(E,d),E=E.sibling}var Gs={},ga=Ju(Gs),iu=Ju(Gs),M0=Ju(Gs);function o0(f){if(f===Gs)throw Error("Expected host context to exist. This error is likely caused by a bug in React. Please file an issue.");return f}function rs(){var f=o0(M0.current);return f}function Ka(f,d){Jr(M0,d,f),Jr(iu,f,f),Jr(ga,Gs,f);var E=wt(d);ti(ga,f),Jr(ga,E,f)}function uo(f){ti(ga,f),ti(iu,f),ti(M0,f)}function fl(){var f=o0(ga.current);return f}function yc(f){var d=o0(M0.current),E=o0(ga.current),C=bt(E,f.type,d);E!==C&&(Jr(iu,f,f),Jr(ga,C,f))}function L2(f){iu.current===f&&(ti(ga,f),ti(iu,f))}var wh=0,xf=1,Af=1,e1=2,Ll=Ju(wh);function t1(f,d){return(f&d)!=0}function ya(f){return f&xf}function vd(f,d){return f&xf|d}function md(f,d){return f|d}function Fr(f,d){Jr(Ll,d,f)}function Ea(f){ti(Ll,f)}function N2(f,d){var E=f.memoizedState;if(E!==null)return E.dehydrated!==null;var C=f.memoizedProps;return C.fallback===void 0?!1:C.unstable_avoidThisFallback!==!0?!0:!d}function n1(f){for(var d=f;d!==null;){if(d.tag===ce){var E=d.memoizedState;if(E!==null){var C=E.dehydrated;if(C===null||Us(C)||g0(C))return d}}else if(d.tag===at&&d.memoizedProps.revealOrder!==void 0){var R=(d.effectTag&Xr)!==Ai;if(R)return d}else if(d.child!==null){d.child.return=d,d=d.child;continue}if(d===f)return null;for(;d.sibling===null;){if(d.return===null||d.return===f)return null;d=d.return}d.sibling.return=d.return,d=d.sibling}return null}var gd={},wi=Array.isArray;function F2(f,d,E,C){return{fiber:C,props:d,responder:f,rootEventTypes:null,state:E}}function fm(f,d,E,C,R){var j=gd,V=f.getInitialState;V!==null&&(j=V(d));var te=F2(f,d,j,E);if(!R)for(var le=E;le!==null;){var Be=le.tag;if(Be===q){R=le.stateNode;break}else if(Be===B){R=le.stateNode.containerInfo;break}le=le.return}Ne(f,te,d,j,R),C.set(f,te)}function yd(f,d,E,C,R){var j,V;if(f&&(j=f.responder,V=f.props),!(j&&j.$$typeof===jt))throw Error("An invalid value was used as an event listener. Expect one or many event listeners created via React.unstable_useResponder().");var te=V;if(E.has(j)){Qt(!1,'Duplicate event responder "%s" found in event listeners. Event listeners passed to elements cannot use the same event responder more than once.',j.displayName);return}E.add(j);var le=C.get(j);le===void 0?fm(j,te,d,C,R):(le.props=te,le.fiber=d)}function hn(f,d,E){var C=new Set,R=d.dependencies;if(f!=null){R===null&&(R=d.dependencies={expirationTime:ft,firstContext:null,responders:new Map});var j=R.responders;if(j===null&&(j=new Map),wi(f))for(var V=0,te=f.length;V<te;V++){var le=f[V];yd(le,d,C,j,E)}else yd(f,d,C,j,E)}if(R!==null){var Be=R.responders;if(Be!==null)for(var Xe=Array.from(Be.keys()),ht=0,Lt=Xe.length;ht<Lt;ht++){var Gt=Xe[ht];if(!C.has(Gt)){var zt=Be.get(Gt);Le(zt),Be.delete(Gt)}}}}function Rf(f,d){var E={responder:f,props:d};return Object.freeze(E),E}var Of=0,cm=2,Mf=4,Sh=8,dm=16,cl=32,r1=64,sr=128,qn=rt.ReactCurrentDispatcher,qo=rt.ReactCurrentBatchConfig,yr;yr=new Set;var Vn=ft,dl=null,jn=null,Eo=null,_c=null,oo=null,Xa=null,Iu=ft,is=null,kf=0,Ec=!1,xs=null,Dc=0,Th=25,cn=null,us=null,Do=-1,lo=!1;function Ji(){{var f=cn;us===null?us=[f]:us.push(f)}}function Yr(){{var f=cn;us!==null&&(Do++,us[Do]!==f&&pm(f))}}function Lf(f){f!=null&&!Array.isArray(f)&&Qt(!1,"%s received a final argument that is not an array (instead, received `%s`). When specified, the final argument must be an array.",cn,typeof f)}function pm(f){{var d=qt(dl.type);if(!yr.has(d)&&(yr.add(d),us!==null)){for(var E="",C=30,R=0;R<=Do;R++){for(var j=us[R],V=R===Do?f:j,te=R+1+". "+j;te.length<C;)te+=" ";te+=V+`
-`,E+=te}Qt(!1,`React has detected a change in the order of Hooks called by %s. This will lead to bugs and errors if not fixed. For more information, read the Rules of Hooks: https://fb.me/rules-of-hooks
-
-   Previous render            Next render
-   ------------------------------------------------------
-%s   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-`,d,E)}}}function Nl(){throw Error(`Invalid hook call. Hooks can only be called inside of the body of a function component. This could happen for one of the following reasons:
-1. You might have mismatching versions of React and the renderer (such as React DOM)
-2. You might be breaking the Rules of Hooks
-3. You might have more than one copy of React in the same app
-See https://fb.me/react-invalid-hook-call for tips about how to debug and fix this problem.`)}function Nf(f,d){if(lo)return!1;if(d===null)return Qt(!1,"%s received a final argument during this render, but not during the previous render. Even though the final argument is optional, its type cannot change between renders.",cn),!1;f.length!==d.length&&Qt(!1,`The final argument passed to %s changed size between renders. The order and size of this array must remain constant.
-
-Previous: %s
-Incoming: %s`,cn,"["+d.join(", ")+"]","["+f.join(", ")+"]");for(var E=0;E<d.length&&E<f.length;E++)if(!go(f[E],d[E]))return!1;return!0}function Ff(f,d,E,C,R,j){Vn=j,dl=d,Eo=f!==null?f.memoizedState:null,us=f!==null?f._debugHookTypes:null,Do=-1,lo=f!==null&&f.type!==d.type,Eo!==null?qn.current=q2:us!==null?qn.current=H2:qn.current=Oh;var V=E(C,R);if(Ec){do Ec=!1,Dc+=1,lo=!1,Eo=f!==null?f.memoizedState:null,Xa=_c,jn=null,oo=null,is=null,Do=-1,qn.current=q2,V=E(C,R);while(Ec);xs=null,Dc=0}qn.current=f1;var te=dl;te.memoizedState=_c,te.expirationTime=Iu,te.updateQueue=is,te.effectTag|=kf,te._debugHookTypes=us;var le=jn!==null&&jn.next!==null;if(Vn=ft,dl=null,jn=null,Eo=null,_c=null,oo=null,Xa=null,cn=null,us=null,Do=-1,Iu=ft,is=null,kf=0,le)throw Error("Rendered fewer hooks than expected. This may be caused by an accidental early return statement.");return V}function _d(f,d,E){d.updateQueue=f.updateQueue,d.effectTag&=~(F0|wr),f.expirationTime<=E&&(f.expirationTime=ft)}function Ed(){qn.current=f1,Vn=ft,dl=null,jn=null,Eo=null,_c=null,oo=null,Xa=null,us=null,Do=-1,cn=null,Iu=ft,is=null,kf=0,Ec=!1,xs=null,Dc=0}function wc(){var f={memoizedState:null,baseState:null,queue:null,baseUpdate:null,next:null};return oo===null?_c=oo=f:oo=oo.next=f,oo}function i1(){if(Xa!==null)oo=Xa,Xa=oo.next,jn=Eo,Eo=jn!==null?jn.next:null;else{if(Eo===null)throw Error("Rendered more hooks than during the previous render.");jn=Eo;var f={memoizedState:jn.memoizedState,baseState:jn.baseState,queue:jn.queue,baseUpdate:jn.baseUpdate,next:null};oo===null?oo=_c=f:oo=oo.next=f,Eo=jn.next}return oo}function Qa(){return{lastEffect:null}}function P2(f,d){return typeof d=="function"?d(f):d}function Dd(f,d,E){var C=wc(),R;E!==void 0?R=E(d):R=d,C.memoizedState=C.baseState=R;var j=C.queue={last:null,dispatch:null,lastRenderedReducer:f,lastRenderedState:R},V=j.dispatch=a1.bind(null,dl,j);return[C.memoizedState,V]}function u1(f,d,E){var C=i1(),R=C.queue;if(R===null)throw Error("Should have a queue. This is likely a bug in React. Please file an issue.");if(R.lastRenderedReducer=f,Dc>0){var j=R.dispatch;if(xs!==null){var V=xs.get(R);if(V!==void 0){xs.delete(R);var te=C.memoizedState,le=V;do{var Be=le.action;te=f(te,Be),le=le.next}while(le!==null);return go(te,C.memoizedState)||sp(),C.memoizedState=te,C.baseUpdate===R.last&&(C.baseState=te),R.lastRenderedState=te,[te,j]}}return[C.memoizedState,j]}var Xe=R.last,ht=C.baseUpdate,Lt=C.baseState,Gt;if(ht!==null?(Xe!==null&&(Xe.next=null),Gt=ht.next):Gt=Xe!==null?Xe.next:null,Gt!==null){var zt=Lt,gn=null,kr=null,oi=ht,Mi=Gt,N0=!1;do{var $i=Mi.expirationTime;if($i<Vn)N0||(N0=!0,kr=oi,gn=zt),$i>Iu&&(Iu=$i,Qd(Iu));else if(yv($i,Mi.suspenseConfig),Mi.eagerReducer===f)zt=Mi.eagerState;else{var ot=Mi.action;zt=f(zt,ot)}oi=Mi,Mi=Mi.next}while(Mi!==null&&Mi!==Gt);N0||(kr=oi,gn=zt),go(zt,C.memoizedState)||sp(),C.memoizedState=zt,C.baseUpdate=kr,C.baseState=gn,R.lastRenderedState=zt}var Ot=R.dispatch;return[C.memoizedState,Ot]}function Pf(f){var d=wc();typeof f=="function"&&(f=f()),d.memoizedState=d.baseState=f;var E=d.queue={last:null,dispatch:null,lastRenderedReducer:P2,lastRenderedState:f},C=E.dispatch=a1.bind(null,dl,E);return[d.memoizedState,C]}function o1(f){return u1(P2,f)}function Ja(f,d,E,C){var R={tag:f,create:d,destroy:E,deps:C,next:null};if(is===null)is=Qa(),is.lastEffect=R.next=R;else{var j=is.lastEffect;if(j===null)is.lastEffect=R.next=R;else{var V=j.next;j.next=R,R.next=V,is.lastEffect=R}}return R}function l1(f){var d=wc(),E={current:f};return Object.seal(E),d.memoizedState=E,E}function I2(f){var d=i1();return d.memoizedState}function wd(f,d,E,C){var R=wc(),j=C===void 0?null:C;kf|=f,R.memoizedState=Ja(d,E,void 0,j)}function Sc(f,d,E,C){var R=i1(),j=C===void 0?null:C,V=void 0;if(jn!==null){var te=jn.memoizedState;if(V=te.destroy,j!==null){var le=te.deps;if(Nf(j,le)){Ja(Of,E,V,j);return}}}kf|=f,R.memoizedState=Ja(d,E,V,j)}function s1(f,d){return typeof jest!="undefined"&&Mv(dl),wd(wr|F0,sr|r1,f,d)}function Fl(f,d){return typeof jest!="undefined"&&Mv(dl),Sc(wr|F0,sr|r1,f,d)}function Da(f,d){return wd(wr,Mf|cl,f,d)}function Ch(f,d){return Sc(wr,Mf|cl,f,d)}function b2(f,d){if(typeof d=="function"){var E=d,C=f();return E(C),function(){E(null)}}else if(d!=null){var R=d;R.hasOwnProperty("current")||Qt(!1,"Expected useImperativeHandle() first argument to either be a ref callback or React.createRef() object. Instead received: %s.","an object with keys {"+Object.keys(R).join(", ")+"}");var j=f();return R.current=j,function(){R.current=null}}}function B2(f,d,E){typeof d!="function"&&Qt(!1,"Expected useImperativeHandle() second argument to be a function that creates a handle. Instead received: %s.",d!==null?typeof d:"null");var C=E!=null?E.concat([f]):null;return wd(wr,Mf|cl,b2.bind(null,d,f),C)}function xh(f,d,E){typeof d!="function"&&Qt(!1,"Expected useImperativeHandle() second argument to be a function that creates a handle. Instead received: %s.",d!==null?typeof d:"null");var C=E!=null?E.concat([f]):null;return Sc(wr,Mf|cl,b2.bind(null,d,f),C)}function Sd(f,d){}var Ah=Sd;function Pl(f,d){var E=wc(),C=d===void 0?null:d;return E.memoizedState=[f,C],f}function os(f,d){var E=i1(),C=d===void 0?null:d,R=E.memoizedState;if(R!==null&&C!==null){var j=R[1];if(Nf(C,j))return R[0]}return E.memoizedState=[f,C],f}function As(f,d){var E=wc(),C=d===void 0?null:d,R=f();return E.memoizedState=[R,C],R}function Ys(f,d){var E=i1(),C=d===void 0?null:d,R=E.memoizedState;if(R!==null&&C!==null){var j=R[1];if(Nf(C,j))return R[0]}var V=f();return E.memoizedState=[V,C],V}function U2(f,d){var E=Pf(f),C=E[0],R=E[1];return s1(function(){t.unstable_next(function(){var j=qo.suspense;qo.suspense=d===void 0?null:d;try{R(f)}finally{qo.suspense=j}})},[f,d]),C}function Rh(f,d){var E=o1(f),C=E[0],R=E[1];return Fl(function(){t.unstable_next(function(){var j=qo.suspense;qo.suspense=d===void 0?null:d;try{R(f)}finally{qo.suspense=j}})},[f,d]),C}function j2(f){var d=Pf(!1),E=d[0],C=d[1],R=Pl(function(j){C(!0),t.unstable_next(function(){var V=qo.suspense;qo.suspense=f===void 0?null:f;try{C(!1),j()}finally{qo.suspense=V}})},[f,E]);return[R,E]}function z2(f){var d=o1(!1),E=d[0],C=d[1],R=os(function(j){C(!0),t.unstable_next(function(){var V=qo.suspense;qo.suspense=f===void 0?null:f;try{C(!1),j()}finally{qo.suspense=V}})},[f,E]);return[R,E]}function a1(f,d,E){if(!(Dc<Th))throw Error("Too many re-renders. React limits the number of renders to prevent an infinite loop.");typeof arguments[3]=="function"&&Qt(!1,"State updates from the useState() and useReducer() Hooks don't support the second callback argument. To execute a side effect after rendering, declare it in the component body with useEffect().");var C=f.alternate;if(f===dl||C!==null&&C===dl){Ec=!0;var R={expirationTime:Vn,suspenseConfig:null,action:E,eagerReducer:null,eagerState:null,next:null};R.priority=Jt(),xs===null&&(xs=new Map);var j=xs.get(d);if(j===void 0)xs.set(d,R);else{for(var V=j;V.next!==null;)V=V.next;V.next=R}}else{var te=jl(),le=_o(),Be=zf(te,f,le),Xe={expirationTime:Be,suspenseConfig:le,action:E,eagerReducer:null,eagerState:null,next:null};Xe.priority=Jt();var ht=d.last;if(ht===null)Xe.next=Xe;else{var Lt=ht.next;Lt!==null&&(Xe.next=Lt),ht.next=Xe}if(d.last=Xe,f.expirationTime===ft&&(C===null||C.expirationTime===ft)){var Gt=d.lastRenderedReducer;if(Gt!==null){var zt;zt=qn.current,qn.current=Za;try{var gn=d.lastRenderedState,kr=Gt(gn,E);if(Xe.eagerReducer=Gt,Xe.eagerState=kr,go(kr,gn))return}catch(oi){}finally{qn.current=zt}}}typeof jest!="undefined"&&(qp(f),hg(f)),gl(f,Be)}}var f1={readContext:We,useCallback:Nl,useContext:Nl,useEffect:Nl,useImperativeHandle:Nl,useLayoutEffect:Nl,useMemo:Nl,useReducer:Nl,useRef:Nl,useState:Nl,useDebugValue:Nl,useResponder:Nl,useDeferredValue:Nl,useTransition:Nl},Oh=null,H2=null,q2=null,Rs=null,Za=null;{var Mh=function(){Qt(!1,"Context can only be read while React is rendering. In classes, you can read it in the render method or getDerivedStateFromProps. In function components, you can read it directly in the function body, but not inside Hooks like useReducer() or useMemo().")},pu=function(){Qt(!1,"Do not call Hooks inside useEffect(...), useMemo(...), or other built-in Hooks. You can only call Hooks at the top level of your React function. For more information, see https://fb.me/rules-of-hooks")};Oh={readContext:function(f,d){return We(f,d)},useCallback:function(f,d){return cn="useCallback",Ji(),Lf(d),Pl(f,d)},useContext:function(f,d){return cn="useContext",Ji(),We(f,d)},useEffect:function(f,d){return cn="useEffect",Ji(),Lf(d),s1(f,d)},useImperativeHandle:function(f,d,E){return cn="useImperativeHandle",Ji(),Lf(E),B2(f,d,E)},useLayoutEffect:function(f,d){return cn="useLayoutEffect",Ji(),Lf(d),Da(f,d)},useMemo:function(f,d){cn="useMemo",Ji(),Lf(d);var E=qn.current;qn.current=Rs;try{return As(f,d)}finally{qn.current=E}},useReducer:function(f,d,E){cn="useReducer",Ji();var C=qn.current;qn.current=Rs;try{return Dd(f,d,E)}finally{qn.current=C}},useRef:function(f){return cn="useRef",Ji(),l1(f)},useState:function(f){cn="useState",Ji();var d=qn.current;qn.current=Rs;try{return Pf(f)}finally{qn.current=d}},useDebugValue:function(f,d){return cn="useDebugValue",Ji(),Sd(f,d)},useResponder:function(f,d){return cn="useResponder",Ji(),Rf(f,d)},useDeferredValue:function(f,d){return cn="useDeferredValue",Ji(),U2(f,d)},useTransition:function(f){return cn="useTransition",Ji(),j2(f)}},H2={readContext:function(f,d){return We(f,d)},useCallback:function(f,d){return cn="useCallback",Yr(),Pl(f,d)},useContext:function(f,d){return cn="useContext",Yr(),We(f,d)},useEffect:function(f,d){return cn="useEffect",Yr(),s1(f,d)},useImperativeHandle:function(f,d,E){return cn="useImperativeHandle",Yr(),B2(f,d,E)},useLayoutEffect:function(f,d){return cn="useLayoutEffect",Yr(),Da(f,d)},useMemo:function(f,d){cn="useMemo",Yr();var E=qn.current;qn.current=Rs;try{return As(f,d)}finally{qn.current=E}},useReducer:function(f,d,E){cn="useReducer",Yr();var C=qn.current;qn.current=Rs;try{return Dd(f,d,E)}finally{qn.current=C}},useRef:function(f){return cn="useRef",Yr(),l1(f)},useState:function(f){cn="useState",Yr();var d=qn.current;qn.current=Rs;try{return Pf(f)}finally{qn.current=d}},useDebugValue:function(f,d){return cn="useDebugValue",Yr(),Sd(f,d)},useResponder:function(f,d){return cn="useResponder",Yr(),Rf(f,d)},useDeferredValue:function(f,d){return cn="useDeferredValue",Yr(),U2(f,d)},useTransition:function(f){return cn="useTransition",Yr(),j2(f)}},q2={readContext:function(f,d){return We(f,d)},useCallback:function(f,d){return cn="useCallback",Yr(),os(f,d)},useContext:function(f,d){return cn="useContext",Yr(),We(f,d)},useEffect:function(f,d){return cn="useEffect",Yr(),Fl(f,d)},useImperativeHandle:function(f,d,E){return cn="useImperativeHandle",Yr(),xh(f,d,E)},useLayoutEffect:function(f,d){return cn="useLayoutEffect",Yr(),Ch(f,d)},useMemo:function(f,d){cn="useMemo",Yr();var E=qn.current;qn.current=Za;try{return Ys(f,d)}finally{qn.current=E}},useReducer:function(f,d,E){cn="useReducer",Yr();var C=qn.current;qn.current=Za;try{return u1(f,d,E)}finally{qn.current=C}},useRef:function(f){return cn="useRef",Yr(),I2(f)},useState:function(f){cn="useState",Yr();var d=qn.current;qn.current=Za;try{return o1(f)}finally{qn.current=d}},useDebugValue:function(f,d){return cn="useDebugValue",Yr(),Ah(f,d)},useResponder:function(f,d){return cn="useResponder",Yr(),Rf(f,d)},useDeferredValue:function(f,d){return cn="useDeferredValue",Yr(),Rh(f,d)},useTransition:function(f){return cn="useTransition",Yr(),z2(f)}},Rs={readContext:function(f,d){return Mh(),We(f,d)},useCallback:function(f,d){return cn="useCallback",pu(),Ji(),Pl(f,d)},useContext:function(f,d){return cn="useContext",pu(),Ji(),We(f,d)},useEffect:function(f,d){return cn="useEffect",pu(),Ji(),s1(f,d)},useImperativeHandle:function(f,d,E){return cn="useImperativeHandle",pu(),Ji(),B2(f,d,E)},useLayoutEffect:function(f,d){return cn="useLayoutEffect",pu(),Ji(),Da(f,d)},useMemo:function(f,d){cn="useMemo",pu(),Ji();var E=qn.current;qn.current=Rs;try{return As(f,d)}finally{qn.current=E}},useReducer:function(f,d,E){cn="useReducer",pu(),Ji();var C=qn.current;qn.current=Rs;try{return Dd(f,d,E)}finally{qn.current=C}},useRef:function(f){return cn="useRef",pu(),Ji(),l1(f)},useState:function(f){cn="useState",pu(),Ji();var d=qn.current;qn.current=Rs;try{return Pf(f)}finally{qn.current=d}},useDebugValue:function(f,d){return cn="useDebugValue",pu(),Ji(),Sd(f,d)},useResponder:function(f,d){return cn="useResponder",pu(),Ji(),Rf(f,d)},useDeferredValue:function(f,d){return cn="useDeferredValue",pu(),Ji(),U2(f,d)},useTransition:function(f){return cn="useTransition",pu(),Ji(),j2(f)}},Za={readContext:function(f,d){return Mh(),We(f,d)},useCallback:function(f,d){return cn="useCallback",pu(),Yr(),os(f,d)},useContext:function(f,d){return cn="useContext",pu(),Yr(),We(f,d)},useEffect:function(f,d){return cn="useEffect",pu(),Yr(),Fl(f,d)},useImperativeHandle:function(f,d,E){return cn="useImperativeHandle",pu(),Yr(),xh(f,d,E)},useLayoutEffect:function(f,d){return cn="useLayoutEffect",pu(),Yr(),Ch(f,d)},useMemo:function(f,d){cn="useMemo",pu(),Yr();var E=qn.current;qn.current=Za;try{return Ys(f,d)}finally{qn.current=E}},useReducer:function(f,d,E){cn="useReducer",pu(),Yr();var C=qn.current;qn.current=Za;try{return u1(f,d,E)}finally{qn.current=C}},useRef:function(f){return cn="useRef",pu(),Yr(),I2(f)},useState:function(f){cn="useState",pu(),Yr();var d=qn.current;qn.current=Za;try{return o1(f)}finally{qn.current=d}},useDebugValue:function(f,d){return cn="useDebugValue",pu(),Yr(),Ah(f,d)},useResponder:function(f,d){return cn="useResponder",pu(),Yr(),Rf(f,d)},useDeferredValue:function(f,d){return cn="useDeferredValue",pu(),Yr(),Rh(f,d)},useTransition:function(f){return cn="useTransition",pu(),Yr(),z2(f)}}}var c1=t.unstable_now,kh=0,d1=-1;function Il(){return kh}function Lh(){!en||(kh=c1())}function W2(f){!en||(d1=c1(),f.actualStartTime<0&&(f.actualStartTime=c1()))}function Nh(f){!en||(d1=-1)}function p1(f,d){if(!!en&&d1>=0){var E=c1()-d1;f.actualDuration+=E,d&&(f.selfBaseDuration=E),d1=-1}}var bl=null,$a=null,wa=!1;function V2(){wa&&Qt(!1,"We should not be hydrating here. This is a bug in React. Please file a bug.")}function G2(f){if(!we)return!1;var d=f.stateNode.containerInfo;return $a=U(d),bl=f,wa=!0,!0}function hm(f,d){return we?($a=ji(d),X2(f),wa=!0,!0):!1}function Y2(f,d){switch(f.tag){case B:ue(f.stateNode.containerInfo,d);break;case q:qe(f.type,f.memoizedProps,f.stateNode,d);break}var E=nE();E.stateNode=d,E.return=f,E.effectTag=Y0,f.lastEffect!==null?(f.lastEffect.nextEffect=E,f.lastEffect=E):f.firstEffect=f.lastEffect=E}function Fh(f,d){switch(d.effectTag=d.effectTag&~au|mi,f.tag){case B:{var E=f.stateNode.containerInfo;switch(d.tag){case q:var C=d.type,R=d.pendingProps;nt(E,C,R);break;case ne:var j=d.pendingProps;Ct(E,j);break;case ce:Mt(E);break}break}case q:{var V=f.type,te=f.memoizedProps,le=f.stateNode;switch(d.tag){case q:var Be=d.type,Xe=d.pendingProps;Pt(V,te,le,Be,Xe);break;case ne:var ht=d.pendingProps;sn(V,te,le,ht);break;case ce:rn(V,te,le);break}break}default:return}}function Ph(f,d){switch(f.tag){case q:{var E=f.type,C=f.pendingProps,R=hf(d,E,C);return R!==null?(f.stateNode=R,!0):!1}case ne:{var j=f.pendingProps,V=Bs(d,j);return V!==null?(f.stateNode=V,!0):!1}case ce:{if(Oi){var te=Ba(d);if(te!==null){var le={dehydrated:te,retryTime:Di};f.memoizedState=le;var Be=rE(te);return Be.return=f,f.child=Be,!0}}return!1}default:return!1}}function K2(f){if(!!wa){var d=$a;if(!d){Fh(bl,f),wa=!1,bl=f;return}var E=d;if(!Ph(f,d)){if(d=ji(E),!d||!Ph(f,d)){Fh(bl,f),wa=!1,bl=f;return}Y2(bl,E)}bl=f,$a=U(d)}}function vm(f,d,E){if(!we)throw Error("Expected prepareToHydrateHostInstance() to never be called. This error is likely caused by a bug in React. Please file an issue.");var C=f.stateNode,R=z(C,f.type,f.memoizedProps,d,E,f);return f.updateQueue=R,R!==null}function mm(f){if(!we)throw Error("Expected prepareToHydrateHostTextInstance() to never be called. This error is likely caused by a bug in React. Please file an issue.");var d=f.stateNode,E=f.memoizedProps,C=G(d,E,f);if(C){var R=bl;if(R!==null)switch(R.tag){case B:{var j=R.stateNode.containerInfo;Je(j,d,E);break}case q:{var V=R.type,te=R.memoizedProps,le=R.stateNode;vt(V,te,le,d,E);break}}}return C}function Ih(f){if(!we)throw Error("Expected prepareToHydrateHostSuspenseInstance() to never be called. This error is likely caused by a bug in React. Please file an issue.");var d=f.memoizedState,E=d!==null?d.dehydrated:null;if(!E)throw Error("Expected to have a hydrated suspense instance. This error is likely caused by a bug in React. Please file an issue.");$(E,f)}function gm(f){if(!we)throw Error("Expected skipPastDehydratedSuspenseInstance() to never be called. This error is likely caused by a bug in React. Please file an issue.");var d=f.memoizedState,E=d!==null?d.dehydrated:null;if(!E)throw Error("Expected to have a hydrated suspense instance. This error is likely caused by a bug in React. Please file an issue.");return Te(E)}function X2(f){for(var d=f.return;d!==null&&d.tag!==q&&d.tag!==B&&d.tag!==ce;)d=d.return;bl=d}function h1(f){if(!we||f!==bl)return!1;if(!wa)return X2(f),wa=!0,!1;var d=f.type;if(f.tag!==q||d!=="head"&&d!=="body"&&!Ni(d,f.memoizedProps))for(var E=$a;E;)Y2(f,E),E=ji(E);return X2(f),f.tag===ce?$a=gm(f):$a=bl?ji(f.stateNode):null,!0}function v1(){!we||(bl=null,$a=null,wa=!1)}var m1=rt.ReactCurrentOwner,Sa=!1,Q2,Ks,Xs,Qs,J2,Ta,g1,Td,Tc,Z2;Q2={},Ks={},Xs={},Qs={},J2={},Ta=!1,g1=!1,Td={},Tc={},Z2={};function wo(f,d,E,C){f===null?d.child=$c(d,null,E,C):d.child=Cf(d,f.child,E,C)}function bh(f,d,E,C){d.child=Cf(d,f.child,null,C),d.child=Cf(d,null,E,C)}function Bh(f,d,E,C,R){if(d.type!==d.elementType){var j=E.propTypes;j&&_(j,C,"prop",qt(E),Nr)}var V=E.render,te=d.ref,le;return u0(d,R),m1.current=d,et("render"),le=Ff(f,d,V,C,te,R),Ri&&d.mode&mr&&d.memoizedState!==null&&(le=Ff(f,d,V,C,te,R)),et(null),f!==null&&!Sa?(_d(f,d,R),Ca(f,d,R)):(d.effectTag|=su,wo(f,d,le,R),d.child)}function Uh(f,d,E,C,R,j){if(f===null){var V=E.type;if(a0(V)&&E.compare===null&&E.defaultProps===void 0){var te=V;return te=r0(V),d.tag=ie,d.type=te,tp(d,V),jh(f,d,te,C,R,j)}{var le=V.propTypes;le&&_(le,C,"prop",qt(V),Nr)}var Be=gg(E.type,null,C,null,d.mode,j);return Be.ref=d.ref,Be.return=d,d.child=Be,Be}{var Xe=E.type,ht=Xe.propTypes;ht&&_(ht,C,"prop",qt(Xe),Nr)}var Lt=f.child;if(R<j){var Gt=Lt.memoizedProps,zt=E.compare;if(zt=zt!==null?zt:Al,zt(Gt,C)&&f.ref===d.ref)return Ca(f,d,j)}d.effectTag|=su;var gn=Co(Lt,C,j);return gn.ref=d.ref,gn.return=d,d.child=gn,gn}function jh(f,d,E,C,R,j){if(d.type!==d.elementType){var V=d.elementType;V.$$typeof===Dr&&(V=Ps(V));var te=V&&V.propTypes;te&&_(te,C,"prop",qt(V),Nr)}if(f!==null){var le=f.memoizedProps;if(Al(le,C)&&f.ref===d.ref&&d.type===f.type&&(Sa=!1,R<j))return Ca(f,d,j)}return $2(f,d,E,C,j)}function ym(f,d,E){var C=d.pendingProps;return wo(f,d,C,E),d.child}function zh(f,d,E){var C=d.pendingProps.children;return wo(f,d,C,E),d.child}function Hh(f,d,E){en&&(d.effectTag|=wr);var C=d.pendingProps,R=C.children;return wo(f,d,R,E),d.child}function y1(f,d){var E=d.ref;(f===null&&E!==null||f!==null&&f.ref!==E)&&(d.effectTag|=Oo)}function $2(f,d,E,C,R){if(d.type!==d.elementType){var j=E.propTypes;j&&_(j,C,"prop",qt(E),Nr)}var V;if(!ai){var te=Cl(d,E,!0);V=Vu(d,te)}var le;return u0(d,R),m1.current=d,et("render"),le=Ff(f,d,E,C,V,R),Ri&&d.mode&mr&&d.memoizedState!==null&&(le=Ff(f,d,E,C,V,R)),et(null),f!==null&&!Sa?(_d(f,d,R),Ca(f,d,R)):(d.effectTag|=su,wo(f,d,le,R),d.child)}function qh(f,d,E,C,R){if(d.type!==d.elementType){var j=E.propTypes;j&&_(j,C,"prop",qt(E),Nr)}var V;Xi(E)?(V=!0,Hi(d)):V=!1,u0(d,R);var te=d.stateNode,le;te===null?(f!==null&&(f.alternate=null,d.alternate=null,d.effectTag|=mi),va(d,E,C,R),vc(d,E,C,R),le=!0):f===null?le=_h(d,E,C,R):le=M2(f,d,E,C,R);var Be=ep(f,d,E,le,V,R);{var Xe=d.stateNode;Xe.props!==C&&(Ta||Qt(!1,"It looks like %s is reassigning its own `this.props` while rendering. This is not supported and can lead to confusing bugs.",qt(d.type)||"a component"),Ta=!0)}return Be}function ep(f,d,E,C,R,j){y1(f,d);var V=(d.effectTag&Xr)!==Ai;if(!C&&!V)return R&&il(d,E,!1),Ca(f,d,j);var te=d.stateNode;m1.current=d;var le;return V&&typeof E.getDerivedStateFromError!="function"?(le=null,en&&Nh(d)):(et("render"),le=te.render(),Ri&&d.mode&mr&&te.render(),et(null)),d.effectTag|=su,f!==null&&V?bh(f,d,le,j):wo(f,d,le,j),d.memoizedState=te.state,R&&il(d,E,!0),d.child}function Wh(f){var d=f.stateNode;d.pendingContext?zi(f,d.pendingContext,d.pendingContext!==d.context):d.context&&zi(f,d.context,!1),Ka(f,d.containerInfo)}function _m(f,d,E){Wh(d);var C=d.updateQueue;if(C===null)throw Error("If the root does not have an updateQueue, we should have already bailed out. This error is likely caused by a bug in React. Please file an issue.");var R=d.pendingProps,j=d.memoizedState,V=j!==null?j.element:null;Sf(d,C,R,null,E);var te=d.memoizedState,le=te.element;if(le===V)return v1(),Ca(f,d,E);var Be=d.stateNode;if(Be.hydrate&&G2(d)){var Xe=$c(d,null,le,E);d.child=Xe;for(var ht=Xe;ht;)ht.effectTag=ht.effectTag&~mi|au,ht=ht.sibling}else wo(f,d,le,E),v1();return d.child}function Em(f,d,E){yc(d),f===null&&K2(d);var C=d.type,R=d.pendingProps,j=f!==null?f.memoizedProps:null,V=R.children,te=Ni(C,R);return te?V=null:j!==null&&Ni(C,j)&&(d.effectTag|=Uu),y1(f,d),d.mode&ri&&E!==Di&&v0(C,R)?(bn&&x(Di),d.expirationTime=d.childExpirationTime=Di,null):(wo(f,d,V,E),d.child)}function If(f,d){return f===null&&K2(d),null}function bf(f,d,E,C,R){f!==null&&(f.alternate=null,d.alternate=null,d.effectTag|=mi);var j=d.pendingProps;tu(d);var V=y(E);d.type=V;var te=d.tag=Ms(V);es(d);var le=qi(V,j),Be;switch(te){case N:{tp(d,V),d.type=V=r0(V),Be=$2(null,d,V,le,R);break}case M:{d.type=V=j0(V),Be=qh(null,d,V,le,R);break}case fe:{d.type=V=wf(V),Be=Bh(null,d,V,le,R);break}case me:{if(d.type!==d.elementType){var Xe=V.propTypes;Xe&&_(Xe,le,"prop",qt(V),Nr)}Be=Uh(null,d,V,qi(V.type,le),C,R);break}default:{var ht="";throw V!==null&&typeof V=="object"&&V.$$typeof===Dr&&(ht=" Did you wrap a component in React.lazy() more than once?"),Error("Element type is invalid. Received a promise that resolves to: "+V+". Lazy element type must resolve to a class or function."+ht)}}return Be}function Cd(f,d,E,C,R){f!==null&&(f.alternate=null,d.alternate=null,d.effectTag|=mi),d.tag=M;var j;return Xi(E)?(j=!0,Hi(d)):j=!1,u0(d,R),va(d,E,C,R),vc(d,E,C,R),ep(null,d,E,!0,j,R)}function Dm(f,d,E,C){f!==null&&(f.alternate=null,d.alternate=null,d.effectTag|=mi);var R=d.pendingProps,j;if(!ai){var V=Cl(d,E,!1);j=Vu(d,V)}u0(d,C);var te;{if(E.prototype&&typeof E.prototype.render=="function"){var le=qt(E)||"Unknown";Q2[le]||(Ve(!1,"The <%s /> component appears to have a render method, but doesn't extend React.Component. This is likely to cause errors. Change %s to extend React.Component instead.",le,le),Q2[le]=!0)}d.mode&mr&&Rl.recordLegacyContextWarning(d,null),m1.current=d,te=Ff(null,d,E,R,j,C)}if(d.effectTag|=su,typeof te=="object"&&te!==null&&typeof te.render=="function"&&te.$$typeof===void 0){{var Be=qt(E)||"Unknown";Ks[Be]||(Ve(!1,"The <%s /> component appears to be a function component that returns a class instance. Change %s to a class that extends React.Component instead. If you can't use a class try assigning the prototype on the function as a workaround. `%s.prototype = React.Component.prototype`. Don't use an arrow function since it cannot be called with `new` by React.",Be,Be,Be),Ks[Be]=!0)}d.tag=M,Ed();var Xe=!1;Xi(E)?(Xe=!0,Hi(d)):Xe=!1,d.memoizedState=te.state!==null&&te.state!==void 0?te.state:null;var ht=E.getDerivedStateFromProps;return typeof ht=="function"&&Tf(d,E,ht,R),al(d,te),vc(d,E,R,C),ep(null,d,E,!0,Xe,C)}else return d.tag=N,ai&&E.contextTypes&&Ve(!1,"%s uses the legacy contextTypes API which is no longer supported. Use React.createContext() with React.useContext() instead.",qt(E)||"Unknown"),Ri&&d.mode&mr&&d.memoizedState!==null&&(te=Ff(null,d,E,R,j,C)),wo(null,d,te,C),tp(d,E),d.child}function tp(f,d){if(d&&d.childContextTypes&&Ve(!1,"%s(...): childContextTypes cannot be defined on a function component.",d.displayName||d.name||"Component"),f.ref!==null){var E="",C=y0();C&&(E+=`
-
-Check the render method of \``+C+"`.");var R=C||f._debugID||"",j=f._debugSource;j&&(R=j.fileName+":"+j.lineNumber),J2[R]||(J2[R]=!0,Qt(!1,"Function components cannot be given refs. Attempts to access this ref will fail. Did you mean to use React.forwardRef()?%s",E))}if(Ql&&d.defaultProps!==void 0){var V=qt(d)||"Unknown";Z2[V]||(Ve(!1,"%s: Support for defaultProps will be removed from function components in a future major release. Use JavaScript default parameters instead.",V),Z2[V]=!0)}if(typeof d.getDerivedStateFromProps=="function"){var te=qt(d)||"Unknown";Qs[te]||(Ve(!1,"%s: Function components do not support getDerivedStateFromProps.",te),Qs[te]=!0)}if(typeof d.contextType=="object"&&d.contextType!==null){var le=qt(d)||"Unknown";Xs[le]||(Ve(!1,"%s: Function components do not support contextType.",le),Xs[le]=!0)}}var xd={dehydrated:null,retryTime:ft};function np(f,d,E){return t1(f,e1)&&(d===null||d.memoizedState!==null)}function Vh(f,d,E){var C=d.mode,R=d.pendingProps;s_(d)&&(d.effectTag|=Xr);var j=Ll.current,V=!1,te=(d.effectTag&Xr)!==Ai;if(te||np(j,f,d)?(V=!0,d.effectTag&=~Xr):(f===null||f.memoizedState!==null)&&R.fallback!==void 0&&R.unstable_avoidThisFallback!==!0&&(j=md(j,Af)),j=ya(j),Fr(d,j),"maxDuration"in R&&(g1||(g1=!0,Qt(!1,"maxDuration has been removed from React. Remove the maxDuration prop."))),f===null){if(R.fallback!==void 0&&(K2(d),Oi)){var le=d.memoizedState;if(le!==null){var Be=le.dehydrated;if(Be!==null)return Gh(d,Be,E)}}if(V){var Xe=R.fallback,ht=rf(null,C,ft,null);if(ht.return=d,(d.mode&Y)===Rr){var Lt=d.memoizedState,Gt=Lt!==null?d.child.child:d.child;ht.child=Gt;for(var zt=Gt;zt!==null;)zt.return=ht,zt=zt.sibling}var gn=rf(Xe,C,E,null);return gn.return=d,ht.sibling=gn,d.memoizedState=xd,d.child=ht,gn}else{var kr=R.children;return d.memoizedState=null,d.child=$c(d,null,kr,E)}}else{var oi=f.memoizedState;if(oi!==null){if(Oi){var Mi=oi.dehydrated;if(Mi!==null)if(te){if(d.memoizedState!==null)return d.child=f.child,d.effectTag|=Xr,null;var N0=R.fallback,$i=rf(null,C,ft,null);if($i.return=d,$i.child=null,(d.mode&Y)===Rr)for(var ot=$i.child=d.child;ot!==null;)ot.return=$i,ot=ot.sibling;else Cf(d,f.child,null,E);if(en&&d.mode&ii){for(var Ot=0,$e=$i.child;$e!==null;)Ot+=$e.treeBaseDuration,$e=$e.sibling;$i.treeBaseDuration=Ot}var Ut=rf(N0,C,E,null);return Ut.return=d,$i.sibling=Ut,Ut.effectTag|=mi,$i.childExpirationTime=ft,d.memoizedState=xd,d.child=$i,Ut}else return Yh(f,d,Mi,oi,E)}var Pn=f.child,vn=Pn.sibling;if(V){var Wi=R.fallback,pi=Co(Pn,Pn.pendingProps,ft);if(pi.return=d,(d.mode&Y)===Rr){var Ku=d.memoizedState,hr=Ku!==null?d.child.child:d.child;if(hr!==Pn.child){pi.child=hr;for(var hu=hr;hu!==null;)hu.return=pi,hu=hu.sibling}}if(en&&d.mode&ii){for(var Kr=0,xu=pi.child;xu!==null;)Kr+=xu.treeBaseDuration,xu=xu.sibling;pi.treeBaseDuration=Kr}var w0=Co(vn,Wi,vn.expirationTime);return w0.return=d,pi.sibling=w0,pi.childExpirationTime=ft,d.memoizedState=xd,d.child=pi,w0}else{var W0=R.children,ks=Pn.child,Xu=Cf(d,ks,W0,E);return d.memoizedState=null,d.child=Xu}}else{var yl=f.child;if(V){var uf=R.fallback,Vo=rf(null,C,ft,null);if(Vo.return=d,Vo.child=yl,yl!==null&&(yl.return=Vo),(d.mode&Y)===Rr){var Ls=d.memoizedState,$d=Ls!==null?d.child.child:d.child;Vo.child=$d;for(var Gf=$d;Gf!==null;)Gf.return=Vo,Gf=Gf.sibling}if(en&&d.mode&ii){for(var Fc=0,Hl=Vo.child;Hl!==null;)Fc+=Hl.treeBaseDuration,Hl=Hl.sibling;Vo.treeBaseDuration=Fc}var Go=rf(uf,C,E,null);return Go.return=d,Vo.sibling=Go,Go.effectTag|=mi,Vo.childExpirationTime=ft,d.memoizedState=xd,d.child=Vo,Go}else{d.memoizedState=null;var N1=R.children;return d.child=Cf(d,yl,N1,E)}}}}function rp(f,d,E){d.memoizedState=null;var C=d.pendingProps,R=C.children;return wo(f,d,R,E),d.child}function Gh(f,d,E){if((f.mode&Y)===Rr)Qt(!1,"Cannot hydrate Suspense in legacy mode. Switch from ReactDOM.hydrate(element, container) to ReactDOM.createBlockingRoot(container, { hydrate: true }).render(element) or remove the Suspense components from the server rendered components."),f.expirationTime=Un;else if(g0(d)){var C=jl(),R=ws(C);bn&&x(R),f.expirationTime=R}else f.expirationTime=Di,bn&&x(Di);return null}function Yh(f,d,E,C,R){if(V2(),(d.mode&Y)===Rr||g0(E))return rp(f,d,R);var j=f.childExpirationTime>=R;if(Sa||j){if(R<Un&&C.retryTime<=R){var V=R+1;C.retryTime=V,gl(f,V)}return Ev(),rp(f,d,R)}else{if(Us(E))return d.effectTag|=Xr,d.child=f.child,js(E,og.bind(null,f)),null;hm(d,E);for(var te=d.pendingProps,le=te.children,Be=$c(d,null,le,R),Xe=Be;Xe;)Xe.effectTag|=au,Xe=Xe.sibling;return d.child=Be,d.child}}function ip(f,d){f.expirationTime<d&&(f.expirationTime=d);var E=f.alternate;E!==null&&E.expirationTime<d&&(E.expirationTime=d),z0(f.return,d)}function wm(f,d,E){for(var C=d;C!==null;){if(C.tag===ce){var R=C.memoizedState;R!==null&&ip(C,E)}else if(C.tag===at)ip(C,E);else if(C.child!==null){C.child.return=C,C=C.child;continue}if(C===f)return;for(;C.sibling===null;){if(C.return===null||C.return===f)return;C=C.return}C.sibling.return=C.return,C=C.sibling}}function Sm(f){for(var d=f,E=null;d!==null;){var C=d.alternate;C!==null&&n1(C)===null&&(E=d),d=d.sibling}return E}function Tm(f){if(f!==void 0&&f!=="forwards"&&f!=="backwards"&&f!=="together"&&!Td[f])if(Td[f]=!0,typeof f=="string")switch(f.toLowerCase()){case"together":case"forwards":case"backwards":{Qt(!1,'"%s" is not a valid value for revealOrder on <SuspenseList />. Use lowercase "%s" instead.',f,f.toLowerCase());break}case"forward":case"backward":{Qt(!1,'"%s" is not a valid value for revealOrder on <SuspenseList />. React uses the -s suffix in the spelling. Use "%ss" instead.',f,f.toLowerCase());break}default:Qt(!1,'"%s" is not a supported revealOrder on <SuspenseList />. Did you mean "together", "forwards" or "backwards"?',f);break}else Qt(!1,'%s is not a supported value for revealOrder on <SuspenseList />. Did you mean "together", "forwards" or "backwards"?',f)}function Kh(f,d){f!==void 0&&!Tc[f]&&(f!=="collapsed"&&f!=="hidden"?(Tc[f]=!0,Qt(!1,'"%s" is not a supported value for tail on <SuspenseList />. Did you mean "collapsed" or "hidden"?',f)):d!=="forwards"&&d!=="backwards"&&(Tc[f]=!0,Qt(!1,'<SuspenseList tail="%s" /> is only valid if revealOrder is "forwards" or "backwards". Did you mean to specify revealOrder="forwards"?',f)))}function _1(f,d){{var E=Array.isArray(f),C=!E&&typeof fr(f)=="function";if(E||C){var R=E?"array":"iterable";return Qt(!1,"A nested %s was passed to row #%s in <SuspenseList />. Wrap it in an additional SuspenseList to configure its revealOrder: <SuspenseList revealOrder=...> ... <SuspenseList revealOrder=...>{%s}</SuspenseList> ... </SuspenseList>",R,d,R),!1}}return!0}function Cm(f,d){if((d==="forwards"||d==="backwards")&&f!==void 0&&f!==null&&f!==!1)if(Array.isArray(f)){for(var E=0;E<f.length;E++)if(!_1(f[E],E))return}else{var C=fr(f);if(typeof C=="function"){var R=C.call(f);if(R)for(var j=R.next(),V=0;!j.done;j=R.next()){if(!_1(j.value,V))return;V++}}else Qt(!1,'A single row was passed to a <SuspenseList revealOrder="%s" />. This is not useful since it needs multiple rows. Did you mean to pass multiple children or an array?',d)}}function up(f,d,E,C,R,j){var V=f.memoizedState;V===null?f.memoizedState={isBackwards:d,rendering:null,last:C,tail:E,tailExpiration:0,tailMode:R,lastEffect:j}:(V.isBackwards=d,V.rendering=null,V.last=C,V.tail=E,V.tailExpiration=0,V.tailMode=R,V.lastEffect=j)}function op(f,d,E){var C=d.pendingProps,R=C.revealOrder,j=C.tail,V=C.children;Tm(R),Kh(j,R),Cm(V,R),wo(f,d,V,E);var te=Ll.current,le=t1(te,e1);if(le)te=vd(te,e1),d.effectTag|=Xr;else{var Be=f!==null&&(f.effectTag&Xr)!==Ai;Be&&wm(d,d.child,E),te=ya(te)}if(Fr(d,te),(d.mode&Y)===Rr)d.memoizedState=null;else switch(R){case"forwards":{var Xe=Sm(d.child),ht;Xe===null?(ht=d.child,d.child=null):(ht=Xe.sibling,Xe.sibling=null),up(d,!1,ht,Xe,j,d.lastEffect);break}case"backwards":{var Lt=null,Gt=d.child;for(d.child=null;Gt!==null;){var zt=Gt.alternate;if(zt!==null&&n1(zt)===null){d.child=Gt;break}var gn=Gt.sibling;Gt.sibling=Lt,Lt=Gt,Gt=gn}up(d,!0,Lt,null,j,d.lastEffect);break}case"together":{up(d,!1,null,null,void 0,d.lastEffect);break}default:d.memoizedState=null}return d.child}function xm(f,d,E){Ka(d,d.stateNode.containerInfo);var C=d.pendingProps;return f===null?d.child=Cf(d,null,C,E):wo(f,d,C,E),d.child}function Am(f,d,E){var C=d.type,R=C._context,j=d.pendingProps,V=d.memoizedProps,te=j.value;{var le=d.type.propTypes;le&&_(le,j,"prop","Context.Provider",Nr)}if(xr(d,te),V!==null){var Be=V.value,Xe=du(R,te,Be);if(Xe===0){if(V.children===j.children&&!aa())return Ca(f,d,E)}else Ml(d,R,Xe,E)}var ht=j.children;return wo(f,d,ht,E),d.child}var Xh=!1;function Rm(f,d,E){var C=d.type;C._context===void 0?C!==C.Consumer&&(Xh||(Xh=!0,Qt(!1,"Rendering <Context> directly is not supported and will be removed in a future major release. Did you mean to render <Context.Consumer> instead?"))):C=C._context;var R=d.pendingProps,j=R.children;typeof j!="function"&&Ve(!1,"A context consumer was rendered with multiple children, or a child that isn't a function. A context consumer expects a single child that is a function. If you did pass a function, make sure there is no trailing or leading whitespace around it."),u0(d,E);var V=We(C,R.unstable_observedBits),te;return m1.current=d,et("render"),te=j(V),et(null),d.effectTag|=su,wo(f,d,te,E),d.child}function Om(f,d,E){var C=d.type.impl;if(C.reconcileChildren===!1)return null;var R=d.pendingProps,j=R.children;return wo(f,d,j,E),d.child}function lp(f,d,E){var C=d.pendingProps,R=C.children;return wo(f,d,R,E),d.child}function sp(){Sa=!0}function Ca(f,d,E){tu(d),f!==null&&(d.dependencies=f.dependencies),en&&Nh(d);var C=d.expirationTime;C!==ft&&Qd(C);var R=d.childExpirationTime;return R<E?null:(Dh(f,d),d.child)}function E1(f,d,E){{var C=d.return;if(C===null)throw new Error("Cannot swap the root fiber.");if(f.alternate=null,d.alternate=null,E.index=d.index,E.sibling=d.sibling,E.return=d.return,E.ref=d.ref,d===C.child)C.child=E;else{var R=C.child;if(R===null)throw new Error("Expected parent to have a child.");for(;R.sibling!==d;)if(R=R.sibling,R===null)throw new Error("Expected to find the previous sibling.");R.sibling=E}var j=C.lastEffect;return j!==null?(j.nextEffect=f,C.lastEffect=f):C.firstEffect=C.lastEffect=f,f.nextEffect=null,f.effectTag=Y0,E.effectTag|=mi,E}}function ap(f,d,E){var C=d.expirationTime;if(d._debugNeedsRemount&&f!==null)return E1(f,d,gg(d.type,d.key,d.pendingProps,d._debugOwner||null,d.mode,d.expirationTime));if(f!==null){var R=f.memoizedProps,j=d.pendingProps;if(R!==j||aa()||d.type!==f.type)Sa=!0;else if(C<E){switch(Sa=!1,d.tag){case B:Wh(d),v1();break;case q:if(yc(d),d.mode&ri&&E!==Di&&v0(d.type,j))return bn&&x(Di),d.expirationTime=d.childExpirationTime=Di,null;break;case M:{var V=d.type;Xi(V)&&Hi(d);break}case H:Ka(d,d.stateNode.containerInfo);break;case se:{var te=d.memoizedProps.value;xr(d,te);break}case _e:if(en){var le=d.childExpirationTime>=E;le&&(d.effectTag|=wr)}break;case ce:{var Be=d.memoizedState;if(Be!==null){if(Oi&&Be.dehydrated!==null){Fr(d,ya(Ll.current)),d.effectTag|=Xr;break}var Xe=d.child,ht=Xe.childExpirationTime;if(ht!==ft&&ht>=E)return Vh(f,d,E);Fr(d,ya(Ll.current));var Lt=Ca(f,d,E);return Lt!==null?Lt.sibling:null}else Fr(d,ya(Ll.current));break}case at:{var Gt=(f.effectTag&Xr)!==Ai,zt=d.childExpirationTime>=E;if(Gt){if(zt)return op(f,d,E);d.effectTag|=Xr}var gn=d.memoizedState;if(gn!==null&&(gn.rendering=null,gn.tail=null),Fr(d,Ll.current),zt)break;return null}}return Ca(f,d,E)}else Sa=!1}else Sa=!1;switch(d.expirationTime=ft,d.tag){case T:return Dm(f,d,d.type,E);case Oe:{var kr=d.elementType;return bf(f,d,kr,C,E)}case N:{var oi=d.type,Mi=d.pendingProps,N0=d.elementType===oi?Mi:qi(oi,Mi);return $2(f,d,oi,N0,E)}case M:{var $i=d.type,ot=d.pendingProps,Ot=d.elementType===$i?ot:qi($i,ot);return qh(f,d,$i,Ot,E)}case B:return _m(f,d,E);case q:return Em(f,d,E);case ne:return If(f,d);case ce:return Vh(f,d,E);case H:return xm(f,d,E);case fe:{var $e=d.type,Ut=d.pendingProps,Pn=d.elementType===$e?Ut:qi($e,Ut);return Bh(f,d,$e,Pn,E)}case m:return ym(f,d,E);case he:return zh(f,d,E);case _e:return Hh(f,d,E);case se:return Am(f,d,E);case De:return Rm(f,d,E);case me:{var vn=d.type,Wi=d.pendingProps,pi=qi(vn,Wi);if(d.type!==d.elementType){var Ku=vn.propTypes;Ku&&_(Ku,pi,"prop",qt(vn),Nr)}return pi=qi(vn.type,pi),Uh(f,d,vn,pi,C,E)}case ie:return jh(f,d,d.type,d.pendingProps,C,E);case Ue:{var hr=d.type,hu=d.pendingProps,Kr=d.elementType===hr?hu:qi(hr,hu);return Cd(f,d,hr,Kr,E)}case at:return op(f,d,E);case Dt:{if(Wt)return Om(f,d,E);break}case Qe:{if(Ru)return lp(f,d,E);break}}throw Error("Unknown unit of work tag ("+d.tag+"). This error is likely caused by a bug in React. Please file an issue.")}function Qh(f,d,E,C){return{currentFiber:f,impl:E,instance:null,prevProps:null,props:d,state:C}}function Ad(f){return f.tag===ce&&f.memoizedState!==null}function D1(f){return f.child.sibling.child}var Jh={};function fp(f,d,E){if(Ru){if(f.tag===q){var C=f.type,R=f.memoizedProps,j=f.stateNode,V=No(j);V!==null&&d(C,R||Jh,V)===!0&&E.push(V)}var te=f.child;Ad(f)&&(te=D1(f)),te!==null&&cp(te,d,E)}}function Zh(f,d){if(Ru){if(f.tag===q){var E=f.type,C=f.memoizedProps,R=f.stateNode,j=No(R);if(j!==null&&d(E,C,j)===!0)return j}var V=f.child;if(Ad(f)&&(V=D1(f)),V!==null)return $h(V,d)}return null}function cp(f,d,E){for(var C=f;C!==null;)fp(C,d,E),C=C.sibling}function $h(f,d){for(var E=f;E!==null;){var C=Zh(E,d);if(C!==null)return C;E=E.sibling}return null}function ev(f,d,E){if(Rd(f,d))E.push(f.stateNode.methods);else{var C=f.child;Ad(f)&&(C=D1(f)),C!==null&&dp(C,d,E)}}function dp(f,d,E){for(var C=f;C!==null;)ev(C,d,E),C=C.sibling}function Rd(f,d){return f.tag===Qe&&f.type===d&&f.stateNode!==null}function Od(f,d){return{getChildren:function(){var E=d.fiber,C=E.child,R=[];return C!==null&&dp(C,f,R),R.length===0?null:R},getChildrenFromRoot:function(){for(var E=d.fiber,C=E;C!==null;){var R=C.return;if(R===null||(C=R,C.tag===Qe&&C.type===f))break}var j=[];return dp(C.child,f,j),j.length===0?null:j},getParent:function(){for(var E=d.fiber.return;E!==null;){if(E.tag===Qe&&E.type===f)return E.stateNode.methods;E=E.return}return null},getProps:function(){var E=d.fiber;return E.memoizedProps},queryAllNodes:function(E){var C=d.fiber,R=C.child,j=[];return R!==null&&cp(R,E,j),j.length===0?null:j},queryFirstNode:function(E){var C=d.fiber,R=C.child;return R!==null?$h(R,E):null},containsNode:function(E){for(var C=cr(E);C!==null;){if(C.tag===Qe&&C.type===f&&C.stateNode===d)return!0;C=C.return}return!1}}}function H0(f){f.effectTag|=wr}function Md(f){f.effectTag|=Oo}var xa,ef,kd,Ld;if(b0)xa=function(f,d,E,C){for(var R=d.child;R!==null;){if(R.tag===q||R.tag===ne)Qr(f,R.stateNode);else if(Wt&&R.tag===Dt)Qr(f,R.stateNode.instance);else if(R.tag!==H){if(R.child!==null){R.child.return=R,R=R.child;continue}}if(R===d)return;for(;R.sibling===null;){if(R.return===null||R.return===d)return;R=R.return}R.sibling.return=R.return,R=R.sibling}},ef=function(f){},kd=function(f,d,E,C,R){var j=f.memoizedProps;if(j!==C){var V=d.stateNode,te=fl(),le=h0(V,E,j,C,R,te);d.updateQueue=le,le&&H0(d)}},Ld=function(f,d,E,C){E!==C&&H0(d)};else if(Q){xa=function(f,d,E,C){for(var R=d.child;R!==null;){e:if(R.tag===q){var j=R.stateNode;if(E&&C){var V=R.memoizedProps,te=R.type;j=$r(j,te,V,R)}Qr(f,j)}else if(R.tag===ne){var le=R.stateNode;if(E&&C){var Be=R.memoizedProps;le=$l(le,Be,R)}Qr(f,le)}else if(Wt&&R.tag===Dt){var Xe=R.stateNode.instance;if(E&&C){var ht=R.memoizedProps,Lt=R.type;Xe=$r(Xe,Lt,ht,R)}Qr(f,Xe)}else if(R.tag!==H){if(R.tag===ce){if((R.effectTag&wr)!==Ai){var Gt=R.memoizedState!==null;if(Gt){var zt=R.child;if(zt!==null){zt.child!==null&&(zt.child.return=zt,xa(f,zt,!0,Gt));var gn=zt.sibling;if(gn!==null){gn.return=R,R=gn;continue}}}}if(R.child!==null){R.child.return=R,R=R.child;continue}}else if(R.child!==null){R.child.return=R,R=R.child;continue}}if(R=R,R===d)return;for(;R.sibling===null;){if(R.return===null||R.return===d)return;R=R.return}R.sibling.return=R.return,R=R.sibling}};var pp=function(f,d,E,C){for(var R=d.child;R!==null;){e:if(R.tag===q){var j=R.stateNode;if(E&&C){var V=R.memoizedProps,te=R.type;j=$r(j,te,V,R)}Qn(f,j)}else if(R.tag===ne){var le=R.stateNode;if(E&&C){var Be=R.memoizedProps;le=$l(le,Be,R)}Qn(f,le)}else if(Wt&&R.tag===Dt){var Xe=R.stateNode.instance;if(E&&C){var ht=R.memoizedProps,Lt=R.type;Xe=$r(Xe,Lt,ht,R)}Qn(f,Xe)}else if(R.tag!==H){if(R.tag===ce){if((R.effectTag&wr)!==Ai){var Gt=R.memoizedState!==null;if(Gt){var zt=R.child;if(zt!==null){zt.child!==null&&(zt.child.return=zt,pp(f,zt,!0,Gt));var gn=zt.sibling;if(gn!==null){gn.return=R,R=gn;continue}}}}if(R.child!==null){R.child.return=R,R=R.child;continue}}else if(R.child!==null){R.child.return=R,R=R.child;continue}}if(R=R,R===d)return;for(;R.sibling===null;){if(R.return===null||R.return===d)return;R=R.return}R.sibling.return=R.return,R=R.sibling}};ef=function(f){var d=f.stateNode,E=f.firstEffect===null;if(!E){var C=d.containerInfo,R=S0(C);pp(R,f,!1,!1),d.pendingChildren=R,H0(f),fc(C,R)}},kd=function(f,d,E,C,R){var j=f.stateNode,V=f.memoizedProps,te=d.firstEffect===null;if(te&&V===C){d.stateNode=j;return}var le=d.stateNode,Be=fl(),Xe=null;if(V!==C&&(Xe=h0(le,E,V,C,R,Be)),te&&Xe===null){d.stateNode=j;return}var ht=gs(j,Xe,E,V,C,d,te,le);Ou(ht,E,C,R,Be)&&H0(d),d.stateNode=ht,te?H0(d):xa(ht,d,!1,!1)},Ld=function(f,d,E,C){if(E!==C){var R=rs(),j=fl();d.stateNode=vs(C,R,j,d),H0(d)}}}else ef=function(f){},kd=function(f,d,E,C,R){},Ld=function(f,d,E,C){};function Nd(f,d){switch(f.tailMode){case"hidden":{for(var E=f.tail,C=null;E!==null;)E.alternate!==null&&(C=E),E=E.sibling;C===null?f.tail=null:C.sibling=null;break}case"collapsed":{for(var R=f.tail,j=null;R!==null;)R.alternate!==null&&(j=R),R=R.sibling;j===null?!d&&f.tail!==null?f.tail.sibling=null:f.tail=null:j.sibling=null;break}}}function tv(f,d,E){var C=d.pendingProps;switch(d.tag){case T:break;case Oe:break;case ie:case N:break;case M:{var R=d.type;Xi(R)&&qs(d);break}case B:{uo(d),A0(d);var j=d.stateNode;if(j.pendingContext&&(j.context=j.pendingContext,j.pendingContext=null),f===null||f.child===null){var V=h1(d);V&&H0(d)}ef(d);break}case q:{L2(d);var te=rs(),le=d.type;if(f!==null&&d.stateNode!=null){if(kd(f,d,le,C,te),yi){var Be=f.memoizedProps.listeners,Xe=C.listeners;Be!==Xe&&H0(d)}f.ref!==d.ref&&Md(d)}else{if(!C){if(d.stateNode===null)throw Error("We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue.");break}var ht=fl(),Lt=h1(d);if(Lt){if(vm(d,te,ht)&&H0(d),yi){var Gt=C.listeners;Gt!=null&&hn(Gt,d,te)}}else{var zt=Ki(le,C,te,ht,d);if(xa(zt,d,!1,!1),d.stateNode=zt,yi){var gn=C.listeners;gn!=null&&hn(gn,d,te)}Ou(zt,le,C,te,ht)&&H0(d)}d.ref!==null&&Md(d)}break}case ne:{var kr=C;if(f&&d.stateNode!=null){var oi=f.memoizedProps;Ld(f,d,oi,kr)}else{if(typeof kr!="string"&&d.stateNode===null)throw Error("We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue.");var Mi=rs(),N0=fl(),$i=h1(d);$i?mm(d)&&H0(d):d.stateNode=vs(kr,Mi,N0,d)}break}case fe:break;case ce:{Ea(d);var ot=d.memoizedState;if(Oi&&ot!==null&&ot.dehydrated!==null)if(f===null){var Ot=h1(d);if(!Ot)throw Error("A dehydrated suspense component was completed without a hydrated node. This is probably a bug in React.");return Ih(d),bn&&x(Di),null}else return v1(),(d.effectTag&Xr)===Ai&&(d.memoizedState=null),d.effectTag|=wr,null;if((d.effectTag&Xr)!==Ai)return d.expirationTime=E,d;var $e=ot!==null,Ut=!1;if(f===null)d.memoizedProps.fallback!==void 0&&h1(d);else{var Pn=f.memoizedState;if(Ut=Pn!==null,!$e&&Pn!==null){var vn=f.child.sibling;if(vn!==null){var Wi=d.firstEffect;Wi!==null?(d.firstEffect=vn,vn.nextEffect=Wi):(d.firstEffect=d.lastEffect=vn,vn.nextEffect=null),vn.effectTag=Y0}}}if($e&&!Ut&&(d.mode&Y)!==Rr){var pi=f===null&&d.memoizedProps.unstable_avoidThisFallback!==!0;pi||t1(Ll.current,Af)?_v():Ev()}Q&&$e&&(d.effectTag|=wr),b0&&($e||Ut)&&(d.effectTag|=wr),Yi&&d.updateQueue!==null&&d.memoizedProps.suspenseCallback!=null&&(d.effectTag|=wr);break}case m:break;case he:break;case _e:break;case H:uo(d),ef(d);break;case se:i0(d);break;case De:break;case me:break;case Ue:{var Ku=d.type;Xi(Ku)&&qs(d);break}case at:{Ea(d);var hr=d.memoizedState;if(hr===null)break;var hu=(d.effectTag&Xr)!==Ai,Kr=hr.rendering;if(Kr===null)if(hu)Nd(hr,!1);else{var xu=Dv()&&(f===null||(f.effectTag&Xr)===Ai);if(!xu)for(var w0=d.child;w0!==null;){var W0=n1(w0);if(W0!==null){hu=!0,d.effectTag|=Xr,Nd(hr,!1);var ks=W0.updateQueue;return ks!==null&&(d.updateQueue=ks,d.effectTag|=wr),hr.lastEffect===null&&(d.firstEffect=null),d.lastEffect=hr.lastEffect,am(d,E),Fr(d,vd(Ll.current,e1)),d.child}w0=w0.sibling}}else{if(!hu){var Xu=n1(Kr);if(Xu!==null){d.effectTag|=Xr,hu=!0;var yl=Xu.updateQueue;if(yl!==null&&(d.updateQueue=yl,d.effectTag|=wr),Nd(hr,!0),hr.tail===null&&hr.tailMode==="hidden"&&!Kr.alternate){var uf=d.lastEffect=hr.lastEffect;return uf!==null&&(uf.nextEffect=null),null}}else if(mt()>hr.tailExpiration&&E>Di){d.effectTag|=Xr,hu=!0,Nd(hr,!1);var Vo=E-1;d.expirationTime=d.childExpirationTime=Vo,bn&&x(Vo)}}if(hr.isBackwards)Kr.sibling=d.child,d.child=Kr;else{var Ls=hr.last;Ls!==null?Ls.sibling=Kr:d.child=Kr,hr.last=Kr}}if(hr.tail!==null){if(hr.tailExpiration===0){var $d=500;hr.tailExpiration=mt()+$d}var Gf=hr.tail;hr.rendering=Gf,hr.tail=Gf.sibling,hr.lastEffect=d.lastEffect,Gf.sibling=null;var Fc=Ll.current;return hu?Fc=vd(Fc,e1):Fc=ya(Fc),Fr(d,Fc),Gf}break}case Dt:{if(Wt){var Hl=d.type.impl,Go=d.stateNode;if(Go===null){var N1=Hl.getInitialState,v_;N1!==void 0&&(v_=N1(C)),Go=d.stateNode=Qh(d,C,Hl,v_||{});var m_=pt(Go);if(Go.instance=m_,Hl.reconcileChildren===!1)return null;xa(m_,d,!1,!1),Yn(Go)}else{var _E=Go.props;if(Go.prevProps=_E,Go.props=C,Go.currentFiber=d,Q){var g_=la(Go);Go.instance=g_,xa(g_,d,!1,!1)}var EE=Cn(Go);EE&&H0(d)}}break}case Qe:{if(Ru)if(f===null){var DE=d.type,Ag={fiber:d,methods:null};if(d.stateNode=Ag,Ag.methods=Od(DE,Ag),yi){var y_=C.listeners;if(y_!=null){var wE=rs();hn(y_,d,wE)}}d.ref!==null&&(Md(d),H0(d))}else{if(yi){var SE=f.memoizedProps.listeners,TE=C.listeners;(SE!==TE||d.ref!==null)&&H0(d)}else d.ref!==null&&H0(d);f.ref!==d.ref&&Md(d)}break}default:throw Error("Unknown unit of work tag ("+d.tag+"). This error is likely caused by a bug in React. Please file an issue.")}return null}function Mm(f,d){switch(f.tag){case M:{var E=f.type;Xi(E)&&qs(f);var C=f.effectTag;return C&p0?(f.effectTag=C&~p0|Xr,f):null}case B:{uo(f),A0(f);var R=f.effectTag;if((R&Xr)!==Ai)throw Error("The root failed to unmount after an error. This is likely a bug in React. Please file an issue.");return f.effectTag=R&~p0|Xr,f}case q:return L2(f),null;case ce:{if(Ea(f),Oi){var j=f.memoizedState;if(j!==null&&j.dehydrated!==null){if(f.alternate===null)throw Error("Threw in newly mounted dehydrated component. This is likely a bug in React. Please file an issue.");v1()}}var V=f.effectTag;return V&p0?(f.effectTag=V&~p0|Xr,f):null}case at:return Ea(f),null;case H:return uo(f),null;case se:return i0(f),null;default:return null}}function nv(f){switch(f.tag){case M:{var d=f.type.childContextTypes;d!=null&&qs(f);break}case B:{uo(f),A0(f);break}case q:{L2(f);break}case H:uo(f);break;case ce:Ea(f);break;case at:Ea(f);break;case se:i0(f);break;default:break}}function hp(f,d){return{value:f,source:d,stack:Cr(d)}}var vp=function(f,d,E,C,R,j,V,te,le){var Be=Array.prototype.slice.call(arguments,3);try{d.apply(E,Be)}catch(Xe){this.onError(Xe)}};if(typeof window!="undefined"&&typeof window.dispatchEvent=="function"&&typeof document!="undefined"&&typeof document.createEvent=="function"){var mp=document.createElement("react"),km=function(f,d,E,C,R,j,V,te,le){if(typeof document=="undefined")throw Error("The `document` global was defined when React was initialized, but is not defined anymore. This can happen in a test environment if a component schedules an update from an asynchronous callback, but the test has already finished running. To solve this, you can either unmount the component at the end of your test (and ensure that any asynchronous operations get canceled in `componentWillUnmount`), or you can change the test itself to be asynchronous.");var Be=document.createEvent("Event"),Xe=!0,ht=window.event,Lt=Object.getOwnPropertyDescriptor(window,"event"),Gt=Array.prototype.slice.call(arguments,3);function zt(){mp.removeEventListener(N0,zt,!1),typeof window.event!="undefined"&&window.hasOwnProperty("event")&&(window.event=ht),d.apply(E,Gt),Xe=!1}var gn,kr=!1,oi=!1;function Mi($i){if(gn=$i.error,kr=!0,gn===null&&$i.colno===0&&$i.lineno===0&&(oi=!0),$i.defaultPrevented&&gn!=null&&typeof gn=="object")try{gn._suppressLogging=!0}catch(ot){}}var N0="react-"+(f||"invokeguardedcallback");window.addEventListener("error",Mi),mp.addEventListener(N0,zt,!1),Be.initEvent(N0,!1,!1),mp.dispatchEvent(Be),Lt&&Object.defineProperty(window,"event",Lt),Xe&&(kr?oi&&(gn=new Error("A cross-origin error was thrown. React doesn't have access to the actual error object in development. See https://fb.me/react-crossorigin-error for more information.")):gn=new Error(`An error was thrown inside one of your components, but React doesn't know what it was. This is likely due to browser flakiness. React does its best to preserve the "Pause on exceptions" behavior of the DevTools, which requires some DEV-mode only tricks. It's possible that these don't work in your browser. Try triggering the error in production mode, or switching to a modern browser. If you suspect that this is actually an issue with React, please file an issue.`),this.onError(gn)),window.removeEventListener("error",Mi)};vp=km}var Lm=vp,So=!1,Fd=null,Nm={onError:function(f){So=!0,Fd=f}};function pl(f,d,E,C,R,j,V,te,le){So=!1,Fd=null,Lm.apply(Nm,arguments)}function tr(){return So}function Js(){if(So){var f=Fd;return So=!1,Fd=null,f}else throw Error("clearCaughtError was called but no error was captured. This error is likely caused by a bug in React. Please file an issue.")}function hl(f){return!0}function l0(f){var d=hl(f);if(d!==!1){var E=f.error;{var C=f.componentName,R=f.componentStack,j=f.errorBoundaryName,V=f.errorBoundaryFound,te=f.willRetry;if(E!=null&&E._suppressLogging){if(V&&te)return;console.error(E)}var le=C?"The above error occurred in the <"+C+"> component:":"The above error occurred in one of your React components:",Be;V&&j?te?Be="React will try to recreate this component tree from scratch "+("using the error boundary you provided, "+j+"."):Be="This error was initially handled by the error boundary "+j+`.
-Recreating the tree from scratch failed so React will unmount the tree.`:Be=`Consider adding an error boundary to your tree to customize error handling behavior.
-Visit https://fb.me/react-error-boundaries to learn more about error boundaries.`;var Xe=""+le+R+`
-
-`+(""+Be);console.error(Xe)}}}var rv=null;rv=new Set;var Zs=typeof WeakSet=="function"?WeakSet:Set;function gp(f,d){var E=d.source,C=d.stack;C===null&&E!==null&&(C=Cr(E));var R={componentName:E!==null?qt(E.type):null,componentStack:C!==null?C:"",error:d.value,errorBoundary:null,errorBoundaryName:null,errorBoundaryFound:!1,willRetry:!1};f!==null&&f.tag===M&&(R.errorBoundary=f.stateNode,R.errorBoundaryName=qt(f.type),R.errorBoundaryFound=!0,R.willRetry=!0);try{l0(R)}catch(j){setTimeout(function(){throw j})}}var Fm=function(f,d){Bi(f,"componentWillUnmount"),d.props=f.memoizedProps,d.state=f.memoizedState,d.componentWillUnmount(),Ci()};function iv(f,d){if(pl(null,Fm,null,f,d),tr()){var E=Js();qf(f,E)}}function yp(f){var d=f.ref;if(d!==null)if(typeof d=="function"){if(pl(null,d,null,null),tr()){var E=Js();qf(f,E)}}else d.current=null}function Pm(f,d){if(pl(null,d,null),tr()){var E=Js();qf(f,E)}}function _p(f,d){switch(d.tag){case N:case fe:case ie:{Cc(cm,Of,d);return}case M:{if(d.effectTag&Mo&&f!==null){var E=f.memoizedProps,C=f.memoizedState;Bi(d,"getSnapshotBeforeUpdate");var R=d.stateNode;d.type===d.elementType&&!Ta&&(R.props!==d.memoizedProps&&Qt(!1,"Expected %s props to match memoized props before getSnapshotBeforeUpdate. This might either be because of a bug in React, or because a component reassigns its own `this.props`. Please file an issue.",qt(d.type)||"instance"),R.state!==d.memoizedState&&Qt(!1,"Expected %s state to match memoized state before getSnapshotBeforeUpdate. This might either be because of a bug in React, or because a component reassigns its own `this.props`. Please file an issue.",qt(d.type)||"instance"));var j=R.getSnapshotBeforeUpdate(d.elementType===d.type?E:qi(d.type,E),C);{var V=rv;j===void 0&&!V.has(d.type)&&(V.add(d.type),Ve(!1,"%s.getSnapshotBeforeUpdate(): A snapshot value (or null) must be returned. You have returned undefined.",qt(d.type)))}R.__reactInternalSnapshotBeforeUpdate=j,Ci()}return}case B:case q:case ne:case H:case Ue:return;default:throw Error("This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue.")}}function Cc(f,d,E){var C=E.updateQueue,R=C!==null?C.lastEffect:null;if(R!==null){var j=R.next,V=j;do{if((V.tag&f)!==Of){var te=V.destroy;V.destroy=void 0,te!==void 0&&te()}if((V.tag&d)!==Of){var le=V.create;V.destroy=le();{var Be=V.destroy;if(Be!==void 0&&typeof Be!="function"){var Xe=void 0;Be===null?Xe=" You returned null. If your effect does not require clean up, return undefined (or nothing).":typeof Be.then=="function"?Xe=`
-
-It looks like you wrote useEffect(async () => ...) or returned a Promise. Instead, write the async function inside your effect and call it immediately:
-
-useEffect(() => {
-  async function fetchData() {
-    // You can await here
-    const response = await MyAPI.getData(someId);
-    // ...
-  }
-  fetchData();
-}, [someId]); // Or [] if effect doesn't need props or state
-
-Learn more about data fetching with Hooks: https://fb.me/react-hooks-data-fetching`:Xe=" You returned: "+Be,Ve(!1,"An effect function must not return anything besides a function, which is used for clean-up.%s%s",Xe,Cr(E))}}}V=V.next}while(V!==j)}}function Aa(f){if((f.effectTag&F0)!==Ai)switch(f.tag){case N:case fe:case ie:{Cc(sr,Of,f),Cc(Of,r1,f);break}default:break}}function Ep(f,d,E,C){switch(E.tag){case N:case fe:case ie:{Cc(dm,cl,E);break}case M:{var R=E.stateNode;if(E.effectTag&wr)if(d===null)Bi(E,"componentDidMount"),E.type===E.elementType&&!Ta&&(R.props!==E.memoizedProps&&Qt(!1,"Expected %s props to match memoized props before componentDidMount. This might either be because of a bug in React, or because a component reassigns its own `this.props`. Please file an issue.",qt(E.type)||"instance"),R.state!==E.memoizedState&&Qt(!1,"Expected %s state to match memoized state before componentDidMount. This might either be because of a bug in React, or because a component reassigns its own `this.props`. Please file an issue.",qt(E.type)||"instance")),R.componentDidMount(),Ci();else{var j=E.elementType===E.type?d.memoizedProps:qi(E.type,d.memoizedProps),V=d.memoizedState;Bi(E,"componentDidUpdate"),E.type===E.elementType&&!Ta&&(R.props!==E.memoizedProps&&Qt(!1,"Expected %s props to match memoized props before componentDidUpdate. This might either be because of a bug in React, or because a component reassigns its own `this.props`. Please file an issue.",qt(E.type)||"instance"),R.state!==E.memoizedState&&Qt(!1,"Expected %s state to match memoized state before componentDidUpdate. This might either be because of a bug in React, or because a component reassigns its own `this.props`. Please file an issue.",qt(E.type)||"instance")),R.componentDidUpdate(j,V,R.__reactInternalSnapshotBeforeUpdate),Ci()}var te=E.updateQueue;te!==null&&(E.type===E.elementType&&!Ta&&(R.props!==E.memoizedProps&&Qt(!1,"Expected %s props to match memoized props before processing the update queue. This might either be because of a bug in React, or because a component reassigns its own `this.props`. Please file an issue.",qt(E.type)||"instance"),R.state!==E.memoizedState&&Qt(!1,"Expected %s state to match memoized state before processing the update queue. This might either be because of a bug in React, or because a component reassigns its own `this.props`. Please file an issue.",qt(E.type)||"instance")),yo(E,te,R,C));return}case B:{var le=E.updateQueue;if(le!==null){var Be=null;if(E.child!==null)switch(E.child.tag){case q:Be=No(E.child.stateNode);break;case M:Be=E.child.stateNode;break}yo(E,le,Be,C)}return}case q:{var Xe=E.stateNode;if(d===null&&E.effectTag&wr){var ht=E.type,Lt=E.memoizedProps;Hu(Xe,ht,Lt,E)}return}case ne:return;case H:return;case _e:{if(en){var Gt=E.memoizedProps.onRender;typeof Gt=="function"&&(bn?Gt(E.memoizedProps.id,d===null?"mount":"update",E.actualDuration,E.treeBaseDuration,E.actualStartTime,Il(),f.memoizedInteractions):Gt(E.memoizedProps.id,d===null?"mount":"update",E.actualDuration,E.treeBaseDuration,E.actualStartTime,Il()))}return}case ce:{Bl(f,E);return}case at:case Ue:case Dt:case Qe:return;default:throw Error("This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue.")}}function Pd(f,d){if(b0)for(var E=f;;){if(E.tag===q){var C=E.stateNode;d?Ia(C):ua(E.stateNode,E.memoizedProps)}else if(E.tag===ne){var R=E.stateNode;d?m0(R):J0(R,E.memoizedProps)}else if(E.tag===ce&&E.memoizedState!==null&&E.memoizedState.dehydrated===null){var j=E.child.sibling;j.return=E,E=j;continue}else if(E.child!==null){E.child.return=E,E=E.child;continue}if(E===f)return;for(;E.sibling===null;){if(E.return===null||E.return===f)return;E=E.return}E.sibling.return=E.return,E=E.sibling}}function bu(f){var d=f.ref;if(d!==null){var E=f.stateNode,C;switch(f.tag){case q:C=No(E);break;default:C=E}Ru&&f.tag===Qe&&(C=E.methods),typeof d=="function"?d(C):(d.hasOwnProperty("current")||Ve(!1,"Unexpected ref object provided for %s. Use either a ref-setter function or React.createRef().%s",qt(f.type),Cr(f)),d.current=C)}}function Yu(f){var d=f.ref;d!==null&&(typeof d=="function"?d(null):d.current=null)}function Dp(f,d,E){switch(kn(d),d.tag){case N:case fe:case me:case ie:{var C=d.updateQueue;if(C!==null){var R=C.lastEffect;if(R!==null){var j=R.next,V=E>Kn?Kn:E;Sn(V,function(){var oi=j;do{var Mi=oi.destroy;Mi!==void 0&&Pm(d,Mi),oi=oi.next}while(oi!==j)})}}break}case M:{yp(d);var te=d.stateNode;typeof te.componentWillUnmount=="function"&&iv(d,te);return}case q:{if(yi){var le=d.dependencies;if(le!==null){var Be=le.responders;if(Be!==null){for(var Xe=Array.from(Be.values()),ht=0,Lt=Xe.length;ht<Lt;ht++){var Gt=Xe[ht];Le(Gt)}le.responders=null}}}yp(d);return}case H:{b0?w1(f,d,E):Q&&Im(d);return}case Dt:{if(Wt){var zt=d.stateNode;zt!==null&&(ba(zt),d.stateNode=null)}return}case je:{if(Yi){var gn=f.hydrationCallbacks;if(gn!==null){var kr=gn.onDeleted;kr&&kr(d.stateNode)}}return}case Qe:Ru&&yp(d)}}function wp(f,d,E){for(var C=d;;){if(Dp(f,C,E),C.child!==null&&(!b0||C.tag!==H)){C.child.return=C,C=C.child;continue}if(C===d)return;for(;C.sibling===null;){if(C.return===null||C.return===d)return;C=C.return}C.sibling.return=C.return,C=C.sibling}}function uv(f){var d=f.alternate;f.return=null,f.child=null,f.memoizedState=null,f.updateQueue=null,f.dependencies=null,f.alternate=null,f.firstEffect=null,f.lastEffect=null,f.pendingProps=null,f.memoizedProps=null,d!==null&&uv(d)}function Im(f){if(!!Q){var d=f.stateNode,E=d.containerInfo,C=S0(E);fi(E,C)}}function bm(f){if(!!Q)switch(f.tag){case M:case q:case ne:case Dt:return;case B:case H:{var d=f.stateNode,E=d.containerInfo,C=d.pendingChildren;fi(E,C);return}default:throw Error("This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue.")}}function Bm(f){for(var d=f.return;d!==null;){if(Id(d))return d;d=d.return}throw Error("Expected to find a host parent. This error is likely caused by a bug in React. Please file an issue.")}function Id(f){return f.tag===q||f.tag===B||f.tag===H}function ov(f){var d=f;e:for(;;){for(;d.sibling===null;){if(d.return===null||Id(d.return))return null;d=d.return}for(d.sibling.return=d.return,d=d.sibling;d.tag!==q&&d.tag!==ne&&d.tag!==je;){if(d.effectTag&mi||d.child===null||d.tag===H)continue e;d.child.return=d,d=d.child}if(!(d.effectTag&mi))return d.stateNode}}function xc(f){if(!!b0){var d=Bm(f),E,C,R=d.stateNode;switch(d.tag){case q:E=R,C=!1;break;case B:E=R.containerInfo,C=!0;break;case H:E=R.containerInfo,C=!0;break;case Dt:Wt&&(E=R.instance,C=!1);default:throw Error("Invalid host parent fiber. This error is likely caused by a bug in React. Please file an issue.")}d.effectTag&Uu&&(qu(E),d.effectTag&=~Uu);for(var j=ov(f),V=f;;){var te=V.tag===q||V.tag===ne;if(te||Wt&&V.tag===Dt){var le=te?V.stateNode:V.stateNode.instance;j?C?Fo(E,le,j):Ti(E,le,j):C?Mu(E,le):Si(E,le)}else if(V.tag!==H){if(V.child!==null){V.child.return=V,V=V.child;continue}}if(V===f)return;for(;V.sibling===null;){if(V.return===null||V.return===f)return;V=V.return}V.sibling.return=V.return,V=V.sibling}}}function w1(f,d,E){for(var C=d,R=!1,j,V;;){if(!R){var te=C.return;e:for(;;){if(te===null)throw Error("Expected to find a host parent. This error is likely caused by a bug in React. Please file an issue.");var le=te.stateNode;switch(te.tag){case q:j=le,V=!1;break e;case B:j=le.containerInfo,V=!0;break e;case H:j=le.containerInfo,V=!0;break e;case Dt:Wt&&(j=le.instance,V=!1)}te=te.return}R=!0}if(C.tag===q||C.tag===ne)wp(f,C,E),V?po(j,C.stateNode):ku(j,C.stateNode);else if(Wt&&C.tag===Dt){var Be=C.stateNode.instance;wp(f,C,E),V?po(j,Be):ku(j,Be)}else if(Oi&&C.tag===je){if(Yi){var Xe=f.hydrationCallbacks;if(Xe!==null){var ht=Xe.onDeleted;ht&&ht(C.stateNode)}}V?ke(j,C.stateNode):Z(j,C.stateNode)}else if(C.tag===H){if(C.child!==null){j=C.stateNode.containerInfo,V=!0,C.child.return=C,C=C.child;continue}}else if(Dp(f,C,E),C.child!==null){C.child.return=C,C=C.child;continue}if(C===d)return;for(;C.sibling===null;){if(C.return===null||C.return===d)return;C=C.return,C.tag===H&&(R=!1)}C.sibling.return=C.return,C=C.sibling}}function Um(f,d,E){b0?w1(f,d,E):wp(f,d,E),uv(d)}function bd(f,d){if(!b0){switch(d.tag){case N:case fe:case me:case ie:{Cc(Mf,Sh,d);return}case _e:return;case ce:{S1(d),Ra(d);return}case at:{Ra(d);return}case B:{if(we){var E=d.stateNode;E.hydrate&&(E.hydrate=!1,ye(E.containerInfo))}break}}bm(d);return}switch(d.tag){case N:case fe:case me:case ie:{Cc(Mf,Sh,d);return}case M:return;case q:{var C=d.stateNode;if(C!=null){var R=d.memoizedProps,j=f!==null?f.memoizedProps:R,V=d.type,te=d.updateQueue;if(d.updateQueue=null,te!==null&&Su(C,te,V,j,R,d),yi){var le=j.listeners,Be=R.listeners;le!==Be&&hn(Be,d,null)}}return}case ne:{if(d.stateNode===null)throw Error("This should have a text node initialized. This error is likely caused by a bug in React. Please file an issue.");var Xe=d.stateNode,ht=d.memoizedProps,Lt=f!==null?f.memoizedProps:ht;zu(Xe,Lt,ht);return}case B:{if(we){var Gt=d.stateNode;Gt.hydrate&&(Gt.hydrate=!1,ye(Gt.containerInfo))}return}case _e:return;case ce:{S1(d),Ra(d);return}case at:{Ra(d);return}case Ue:return;case Dt:{if(Wt){var zt=d.stateNode;oa(zt)}return}case Qe:{if(Ru){var gn=d.stateNode;if(gn.fiber=d,yi){var kr=d.memoizedProps,oi=f!==null?f.memoizedProps:kr,Mi=oi.listeners,N0=kr.listeners;Mi!==N0&&hn(N0,d,null)}}return}default:throw Error("This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue.")}}function S1(f){var d=f.memoizedState,E,C=f;if(d===null?E=!1:(E=!0,C=f.child,Mp()),b0&&C!==null&&Pd(C,E),Yi&&d!==null){var R=f.memoizedProps.suspenseCallback;if(typeof R=="function"){var j=f.updateQueue;j!==null&&R(new Set(j))}else R!==void 0&&Qt(!1,"Unexpected type for suspenseCallback.")}}function Bl(f,d){if(!!we){var E=d.memoizedState;if(E===null){var C=d.alternate;if(C!==null){var R=C.memoizedState;if(R!==null){var j=R.dehydrated;if(j!==null&&(Ae(j),Yi)){var V=f.hydrationCallbacks;if(V!==null){var te=V.onHydrated;te&&te(j)}}}}}}}function Ra(f){var d=f.updateQueue;if(d!==null){f.updateQueue=null;var E=f.stateNode;E===null&&(E=f.stateNode=new Zs),d.forEach(function(C){var R=lg.bind(null,f,C);E.has(C)||(bn&&C.__reactDoNotTraceInteractions!==!0&&(R=O.unstable_wrap(R)),E.add(C),C.then(R,R))})}}function lv(f){!b0||qu(f.stateNode)}var jm=typeof WeakMap=="function"?WeakMap:Map;function sv(f,d,E){var C=Cu(E,null);C.tag=Wn,C.payload={element:null};var R=d.value;return C.callback=function(){ug(R),gp(f,d)},C}function av(f,d,E){var C=Cu(E,null);C.tag=Wn;var R=f.type.getDerivedStateFromError;if(typeof R=="function"){var j=d.value;C.payload=function(){return gp(f,d),R(j)}}var V=f.stateNode;return V!==null&&typeof V.componentDidCatch=="function"?C.callback=function(){pc(f),typeof R!="function"&&(bp(this),gp(f,d));var le=d.value,Be=d.stack;this.componentDidCatch(le,{componentStack:Be!==null?Be:""}),typeof R!="function"&&f.expirationTime!==Un&&Ve(!1,"%s: Error boundaries should implement getDerivedStateFromError(). In that method, return a state update to display an error message or fallback UI.",qt(f.type)||"Unknown")}:C.callback=function(){pc(f)},C}function zm(f,d,E){var C=f.pingCache,R;if(C===null?(C=f.pingCache=new jm,R=new Set,C.set(E,R)):(R=C.get(E),R===void 0&&(R=new Set,C.set(E,R))),!R.has(d)){R.add(d);var j=Bp.bind(null,f,E,d);E.then(j,j)}}function fv(f,d,E,C,R){if(E.effectTag|=P0,E.firstEffect=E.lastEffect=null,C!==null&&typeof C=="object"&&typeof C.then=="function"){var j=C;mg(E);var V=t1(Ll.current,Af),te=d;do{if(te.tag===ce&&N2(te,V)){var le=te.updateQueue;if(le===null){var Be=new Set;Be.add(j),te.updateQueue=Be}else le.add(j);if((te.mode&Y)===Rr){if(te.effectTag|=Xr,E.effectTag&=~(Is|P0),E.tag===M){var Xe=E.alternate;if(Xe===null)E.tag=Ue;else{var ht=Cu(Un,null);ht.tag=$t,Ga(E,ht)}}E.expirationTime=Un;return}zm(f,R,j),te.effectTag|=p0,te.expirationTime=R;return}te=te.return}while(te!==null);C=new Error((qt(E.type)||"A React component")+` suspended while rendering, but no fallback UI was specified.
-
-Add a <Suspense fallback=...> component higher in the tree to provide a loading indicator or placeholder to display.`+Cr(E))}kp(),C=hp(C,E);var Lt=d;do{switch(Lt.tag){case B:{var Gt=C;Lt.effectTag|=p0,Lt.expirationTime=R;var zt=sv(Lt,Gt,R);ld(Lt,zt);return}case M:var gn=C,kr=Lt.type,oi=Lt.stateNode;if((Lt.effectTag&Xr)===Ai&&(typeof kr.getDerivedStateFromError=="function"||oi!==null&&typeof oi.componentDidCatch=="function"&&!Ip(oi))){Lt.effectTag|=p0,Lt.expirationTime=R;var Mi=av(Lt,gn,R);ld(Lt,Mi);return}break;default:break}Lt=Lt.return}while(Lt!==null)}var Oa=Math.ceil,Mr=rt.ReactCurrentDispatcher,Sp=rt.ReactCurrentOwner,vl=rt.IsSomeRendererActing,yu=0,T1=1,Ui=2,Tp=4,Bd=8,To=16,Os=32,Bf=0,Ud=1,Cp=2,C1=3,x1=4,xp=5,nr=yu,ml=null,Gn=null,q0=ft,k0=Bf,jd=null,Ul=Un,A1=Un,Ac=null,Rc=ft,zd=!1,Ap=0,L0=500,dn=null,Hd=!1,qd=null,Oc=null,Mc=!1,kc=null,R1=E0,Rp=ft,tf=null,Hm=50,Lc=0,Wd=null,cv=50,O1=0,Uf=null,jf=null,M1=ft;function jl(){return(nr&(To|Os))!==yu?n0(mt()):(M1!==ft||(M1=n0(mt())),M1)}function Nc(){return n0(mt())}function zf(f,d,E){var C=d.mode;if((C&Y)===Rr)return Un;var R=Jt();if((C&ri)===Rr)return R===Fi?Un:t0;if((nr&To)!==yu)return q0;var j;if(E!==null)j=ca(f,E.timeoutMs|0||Ef);else switch(R){case Fi:j=Un;break;case ni:j=ja(f);break;case Kn:case e0:j=ws(f);break;case _0:j=ru;break;default:throw Error("Expected a valid priority level")}return ml!==null&&j===q0&&(j-=1),j}function qm(f,d){sg(),dg(f);var E=Vd(f,d);if(E===null){fg(f);return}Hp(f,d),sa();var C=Jt();if(d===Un?(nr&Bd)!==yu&&(nr&(To|Os))===yu?(W(E,d),k1(E)):(Wo(E),W(E,d),nr===yu&&Bt()):(Wo(E),W(E,d)),(nr&Tp)!==yu&&(C===ni||C===Fi))if(tf===null)tf=new Map([[E,d]]);else{var R=tf.get(E);(R===void 0||R>d)&&tf.set(E,d)}}var gl=qm;function Vd(f,d){f.expirationTime<d&&(f.expirationTime=d);var E=f.alternate;E!==null&&E.expirationTime<d&&(E.expirationTime=d);var C=f.return,R=null;if(C===null&&f.tag===B)R=f.stateNode;else for(;C!==null;){if(E=C.alternate,C.childExpirationTime<d&&(C.childExpirationTime=d),E!==null&&E.childExpirationTime<d&&(E.childExpirationTime=d),C.return===null&&C.tag===B){R=C.stateNode;break}C=C.return}return R!==null&&(ml===R&&(Qd(d),k0===x1&&Vf(R,q0)),u_(R,d)),R}function Gd(f){var d=f.lastExpiredTime;if(d!==ft)return d;var E=f.firstPendingTime;if(!i_(f,E))return E;var C=f.lastPingedTime,R=f.nextKnownPendingLevel;return C>R?C:R}function Wo(f){var d=f.lastExpiredTime;if(d!==ft){f.callbackExpirationTime=Un,f.callbackPriority=Fi,f.callbackNode=Tn(k1.bind(null,f));return}var E=Gd(f),C=f.callbackNode;if(E===ft){C!==null&&(f.callbackNode=null,f.callbackExpirationTime=ft,f.callbackPriority=E0);return}var R=jl(),j=rd(R,E);if(C!==null){var V=f.callbackPriority,te=f.callbackExpirationTime;if(te===E&&V>=j)return;ir(C)}f.callbackExpirationTime=E,f.callbackPriority=j;var le;E===Un?le=Tn(k1.bind(null,f)):ao?le=_n(j,Yd.bind(null,f)):le=_n(j,Yd.bind(null,f),{timeout:jo(E)-mt()}),f.callbackNode=le}function Yd(f,d){if(M1=ft,d){var E=jl();return Vp(f,E),Wo(f),null}var C=Gd(f);if(C!==ft){var R=f.callbackNode;if((nr&(To|Os))!==yu)throw Error("Should not already be working.");if(nf(),(f!==ml||C!==q0)&&(Hf(f,C),ee(f,C)),Gn!==null){var j=nr;nr|=To;var V=mv(f),te=Kd(f);gf(Gn);do try{eg();break}catch(Xe){vv(f,Xe)}while(!0);if(gt(),nr=j,gv(V),bn&&Xd(te),k0===Ud){var le=jd;throw zp(),Hf(f,C),Vf(f,C),Wo(f),le}if(Gn!==null)zp();else{Av();var Be=f.finishedWork=f.current.alternate;f.finishedExpirationTime=C,Wm(f,Be,k0,C)}if(Wo(f),f.callbackNode===R)return Yd.bind(null,f)}}return null}function Wm(f,d,E,C){switch(ml=null,E){case Bf:case Ud:throw Error("Root did not complete. This is a bug in React.");case Cp:{Vp(f,C>ru?ru:C);break}case C1:{Vf(f,C);var R=f.lastSuspendedTime;C===R&&(f.nextKnownPendingLevel=Lp(d)),p();var j=Ul===Un;if(j&&!(Q0&&Wf.current)){var V=Ap+L0-mt();if(V>10){if(zd){var te=f.lastPingedTime;if(te===ft||te>=C){f.lastPingedTime=C,Hf(f,C);break}}var le=Gd(f);if(le!==ft&&le!==C)break;if(R!==ft&&R!==C){f.lastPingedTime=R;break}f.timeoutHandle=Tt(s0.bind(null,f),V);break}}s0(f);break}case x1:{Vf(f,C);var Be=f.lastSuspendedTime;if(C===Be&&(f.nextKnownPendingLevel=Lp(d)),p(),!(Q0&&Wf.current)){if(zd){var Xe=f.lastPingedTime;if(Xe===ft||Xe>=C){f.lastPingedTime=C,Hf(f,C);break}}var ht=Gd(f);if(ht!==ft&&ht!==C)break;if(Be!==ft&&Be!==C){f.lastPingedTime=Be;break}var Lt;if(A1!==Un)Lt=jo(A1)-mt();else if(Ul===Un)Lt=0;else{var Gt=wv(Ul),zt=mt(),gn=jo(C)-zt,kr=zt-Gt;kr<0&&(kr=0),Lt=Up(kr)-kr,gn<Lt&&(Lt=gn)}if(Lt>10){f.timeoutHandle=Tt(s0.bind(null,f),Lt);break}}s0(f);break}case xp:{if(!(Q0&&Wf.current)&&Ul!==Un&&Ac!==null){var oi=jp(Ul,C,Ac);if(oi>10){Vf(f,C),f.timeoutHandle=Tt(s0.bind(null,f),oi);break}}s0(f);break}default:throw Error("Unknown root exit status.")}}function k1(f){var d=f.lastExpiredTime,E=d!==ft?d:Un;if(f.finishedExpirationTime===E)s0(f);else{if((nr&(To|Os))!==yu)throw Error("Should not already be working.");if(nf(),(f!==ml||E!==q0)&&(Hf(f,E),ee(f,E)),Gn!==null){var C=nr;nr|=To;var R=mv(f),j=Kd(f);gf(Gn);do try{Sv();break}catch(te){vv(f,te)}while(!0);if(gt(),nr=C,gv(R),bn&&Xd(j),k0===Ud){var V=jd;throw zp(),Hf(f,E),Vf(f,E),Wo(f),V}if(Gn!==null)throw Error("Cannot commit an incomplete root. This error is likely caused by a bug in React. Please file an issue.");Av(),f.finishedWork=f.current.alternate,f.finishedExpirationTime=E,Vm(f,k0,E),Wo(f)}}return null}function Vm(f,d,E){ml=null,(d===C1||d===x1)&&p(),s0(f)}function Gm(f,d){Vp(f,d),Wo(f),(nr&(To|Os))===yu&&Bt()}function dv(){if((nr&(T1|To|Os))!==yu){(nr&To)!==yu&&Qt(!1,"unstable_flushDiscreteUpdates: Cannot flush updates when React is already rendering.");return}Km(),nf()}function Ym(f){return Sn(Kn,f)}function pv(f,d,E,C){return Sn(Fi,f.bind(null,d,E,C))}function Km(){if(tf!==null){var f=tf;tf=null,f.forEach(function(d,E){Vp(E,d),Wo(E)}),Bt()}}function Xm(f,d){var E=nr;nr|=T1;try{return f(d)}finally{nr=E,nr===yu&&Bt()}}function Qm(f,d){var E=nr;nr|=Ui;try{return f(d)}finally{nr=E,nr===yu&&Bt()}}function hv(f,d,E,C){var R=nr;nr|=Tp;try{return Sn(ni,f.bind(null,d,E,C))}finally{nr=R,nr===yu&&Bt()}}function Jm(f,d){var E=nr;nr&=~T1,nr|=Bd;try{return f(d)}finally{nr=E,nr===yu&&Bt()}}function Op(f,d){if((nr&(To|Os))!==yu)throw Error("flushSync was called from inside a lifecycle method. It cannot be called when React is already rendering.");var E=nr;nr|=T1;try{return Sn(Fi,f.bind(null,d))}finally{nr=E,Bt()}}function Zm(f){var d=nr;nr|=T1;try{Sn(Fi,f)}finally{nr=d,nr===yu&&Bt()}}function Hf(f,d){f.finishedWork=null,f.finishedExpirationTime=ft;var E=f.timeoutHandle;if(E!==nl&&(f.timeoutHandle=nl,co(E)),Gn!==null)for(var C=Gn.return;C!==null;)nv(C),C=C.return;ml=f,Gn=Co(f.current,null,d),q0=d,k0=Bf,jd=null,Ul=Un,A1=Un,Ac=null,Rc=ft,zd=!1,bn&&(jf=null),Rl.discardPendingWarnings(),$s=null}function vv(f,d){do{try{if(gt(),Ed(),it(),Gn===null||Gn.return===null)return k0=Ud,jd=d,null;en&&Gn.mode&ii&&p1(Gn,!0),fv(f,Gn.return,Gn,d,q0),Gn=Tv(Gn)}catch(E){d=E;continue}return}while(!0)}function mv(f){var d=Mr.current;return Mr.current=f1,d===null?f1:d}function gv(f){Mr.current=f}function Kd(f){if(bn){var d=O.__interactionsRef.current;return O.__interactionsRef.current=f.memoizedInteractions,d}return null}function Xd(f){bn&&(O.__interactionsRef.current=f)}function Mp(){Ap=mt()}function yv(f,d){f<Ul&&f>ru&&(Ul=f),d!==null&&f<A1&&f>ru&&(A1=f,Ac=d)}function Qd(f){f>Rc&&(Rc=f)}function _v(){k0===Bf&&(k0=C1)}function Ev(){(k0===Bf||k0===C1)&&(k0=x1),Rc!==ft&&ml!==null&&(Vf(ml,q0),u_(ml,Rc))}function kp(){k0!==xp&&(k0=Cp)}function Dv(){return k0===Bf}function wv(f){var d=jo(f);return d-Ef}function $m(f,d){var E=jo(f);return E-(d.timeoutMs|0||Ef)}function Sv(){for(;Gn!==null;)Gn=Jd(Gn)}function eg(){for(;Gn!==null&&!Fn();)Gn=Jd(Gn)}function Jd(f){var d=f.alternate;es(f),Et(f);var E;return en&&(f.mode&ii)!==Rr?(W2(f),E=L1(d,f,q0),p1(f,!0)):E=L1(d,f,q0),it(),f.memoizedProps=f.pendingProps,E===null&&(E=Tv(f)),Sp.current=null,E}function Tv(f){Gn=f;do{var d=Gn.alternate,E=Gn.return;if((Gn.effectTag&P0)===Ai){Et(Gn);var C=void 0;if(!en||(Gn.mode&ii)===Rr?C=tv(d,Gn,q0):(W2(Gn),C=tv(d,Gn,q0),p1(Gn,!1)),ei(Gn),it(),tg(Gn),C!==null)return C;if(E!==null&&(E.effectTag&P0)===Ai){E.firstEffect===null&&(E.firstEffect=Gn.firstEffect),Gn.lastEffect!==null&&(E.lastEffect!==null&&(E.lastEffect.nextEffect=Gn.firstEffect),E.lastEffect=Gn.lastEffect);var R=Gn.effectTag;R>su&&(E.lastEffect!==null?E.lastEffect.nextEffect=Gn:E.firstEffect=Gn,E.lastEffect=Gn)}}else{var j=Mm(Gn,q0);if(en&&(Gn.mode&ii)!==Rr){p1(Gn,!1);for(var V=Gn.actualDuration,te=Gn.child;te!==null;)V+=te.actualDuration,te=te.sibling;Gn.actualDuration=V}if(j!==null)return ho(Gn),j.effectTag&=Xl,j;ei(Gn),E!==null&&(E.firstEffect=E.lastEffect=null,E.effectTag|=P0)}var le=Gn.sibling;if(le!==null)return le;Gn=E}while(Gn!==null);return k0===Bf&&(k0=xp),null}function Lp(f){var d=f.expirationTime,E=f.childExpirationTime;return d>E?d:E}function tg(f){if(!(q0!==Di&&f.childExpirationTime===Di)){var d=ft;if(en&&(f.mode&ii)!==Rr){for(var E=f.actualDuration,C=f.selfBaseDuration,R=f.alternate===null||f.child!==f.alternate.child,j=f.child;j!==null;){var V=j.expirationTime,te=j.childExpirationTime;V>d&&(d=V),te>d&&(d=te),R&&(E+=j.actualDuration),C+=j.treeBaseDuration,j=j.sibling}f.actualDuration=E,f.treeBaseDuration=C}else for(var le=f.child;le!==null;){var Be=le.expirationTime,Xe=le.childExpirationTime;Be>d&&(d=Be),Xe>d&&(d=Xe),le=le.sibling}f.childExpirationTime=d}}function s0(f){var d=Jt();return Sn(Fi,Np.bind(null,f,d)),null}function Np(f,d){do nf();while(kc!==null);if(ag(),(nr&(To|Os))!==yu)throw Error("Should not already be working.");var E=f.finishedWork,C=f.finishedExpirationTime;if(E===null)return null;if(f.finishedWork=null,f.finishedExpirationTime=ft,E===f.current)throw Error("Cannot commit the same tree as before. This error is likely caused by a bug in React. Please file an issue.");f.callbackNode=null,f.callbackExpirationTime=ft,f.callbackPriority=E0,f.nextKnownPendingLevel=ft,eo();var R=Lp(E);oE(f,C,R),f===ml&&(ml=null,Gn=null,q0=ft);var j;if(E.effectTag>su?E.lastEffect!==null?(E.lastEffect.nextEffect=E,j=E.firstEffect):j=E:j=E.firstEffect,j!==null){var V=nr;nr|=Os;var te=Kd(f);Sp.current=null,xe(),Hn(f.containerInfo),dn=j;do if(pl(null,ng,null),tr()){if(dn===null)throw Error("Should be working on an effect.");var le=Js();qf(dn,le),dn=dn.nextEffect}while(dn!==null);tt(),en&&Lh(),Ye(),dn=j;do if(pl(null,rg,null,f,d),tr()){if(dn===null)throw Error("Should be working on an effect.");var Be=Js();qf(dn,Be),dn=dn.nextEffect}while(dn!==null);Yt(),qr(f.containerInfo),f.current=E,Kt(),dn=j;do if(pl(null,Fp,null,f,C),tr()){if(dn===null)throw Error("Should be working on an effect.");var Xe=Js();qf(dn,Xe),dn=dn.nextEffect}while(dn!==null);pr(),dn=null,ae(),bn&&Xd(te),nr=V}else f.current=E,xe(),tt(),en&&Lh(),Ye(),Yt(),Kt(),pr();to();var ht=Mc;if(Mc)Mc=!1,kc=f,Rp=C,R1=d;else for(dn=j;dn!==null;){var Lt=dn.nextEffect;dn.nextEffect=null,dn=Lt}var Gt=f.firstPendingTime;if(Gt!==ft){if(bn){if(jf!==null){var zt=jf;jf=null;for(var gn=0;gn<zt.length;gn++)P(f,zt[gn],f.memoizedInteractions)}W(f,Gt)}}else Oc=null;if(bn&&(ht||ve(f,C)),Gt===Un?f===Wd?Lc++:(Lc=0,Wd=f):Lc=0,on(E.stateNode,C),Wo(f),Hd){Hd=!1;var kr=qd;throw qd=null,kr}return(nr&Bd)!==yu||Bt(),null}function ng(){for(;dn!==null;){var f=dn.effectTag;if((f&Mo)!==Ai){Et(dn),Uo();var d=dn.alternate;_p(d,dn),it()}(f&F0)!==Ai&&(Mc||(Mc=!0,_n(Kn,function(){return nf(),null}))),dn=dn.nextEffect}}function rg(f,d){for(;dn!==null;){Et(dn);var E=dn.effectTag;if(E&Uu&&lv(dn),E&Oo){var C=dn.alternate;C!==null&&Yu(C)}var R=E&(mi|wr|Y0|au);switch(R){case mi:{xc(dn),dn.effectTag&=~mi;break}case el:{xc(dn),dn.effectTag&=~mi;var j=dn.alternate;bd(j,dn);break}case au:{dn.effectTag&=~au;break}case Li:{dn.effectTag&=~au;var V=dn.alternate;bd(V,dn);break}case wr:{var te=dn.alternate;bd(te,dn);break}case Y0:{Um(f,dn,d);break}}Uo(),it(),dn=dn.nextEffect}}function Fp(f,d){for(;dn!==null;){Et(dn);var E=dn.effectTag;if(E&(wr|K0)){Uo();var C=dn.alternate;Ep(f,C,dn,d)}E&Oo&&(Uo(),bu(dn)),it(),dn=dn.nextEffect}}function nf(){if(R1!==E0){var f=R1>Kn?Kn:R1;return R1=E0,Sn(f,Pp)}}function Pp(){if(kc===null)return!1;var f=kc,d=Rp;if(kc=null,Rp=ft,(nr&(To|Os))!==yu)throw Error("Cannot flush passive effects while already rendering.");var E=nr;nr|=Os;for(var C=Kd(f),R=f.current.firstEffect;R!==null;){{if(Et(R),pl(null,Aa,null,R),tr()){if(R===null)throw Error("Should be working on an effect.");var j=Js();qf(R,j)}it()}var V=R.nextEffect;R.nextEffect=null,R=V}return bn&&(Xd(C),ve(f,d)),nr=E,Bt(),O1=kc===null?0:O1+1,!0}function Ip(f){return Oc!==null&&Oc.has(f)}function bp(f){Oc===null?Oc=new Set([f]):Oc.add(f)}function ig(f){Hd||(Hd=!0,qd=f)}var ug=ig;function Cv(f,d,E){var C=hp(E,d),R=sv(f,C,Un);Ga(f,R);var j=Vd(f,Un);j!==null&&(Wo(j),W(j,Un))}function qf(f,d){if(f.tag===B){Cv(f,f,d);return}for(var E=f.return;E!==null;){if(E.tag===B){Cv(E,f,d);return}else if(E.tag===M){var C=E.type,R=E.stateNode;if(typeof C.getDerivedStateFromError=="function"||typeof R.componentDidCatch=="function"&&!Ip(R)){var j=hp(d,f),V=av(E,j,Un);Ga(E,V);var te=Vd(E,Un);te!==null&&(Wo(te),W(te,Un));return}}E=E.return}}function Bp(f,d,E){var C=f.pingCache;if(C!==null&&C.delete(d),ml===f&&q0===E){k0===x1||k0===C1&&Ul===Un&&mt()-Ap<L0?Hf(f,q0):zd=!0;return}if(!!i_(f,E)){var R=f.lastPingedTime;R!==ft&&R<E||(f.lastPingedTime=E,f.finishedExpirationTime===E&&(f.finishedExpirationTime=ft,f.finishedWork=null),Wo(f),W(f,E))}}function xv(f,d){if(d===ft){var E=null,C=jl();d=zf(C,f,E)}var R=Vd(f,d);R!==null&&(Wo(R),W(R,d))}function og(f){var d=f.memoizedState,E=ft;d!==null&&(E=d.retryTime),xv(f,E)}function lg(f,d){var E=ft,C;if(Oi)switch(f.tag){case ce:C=f.stateNode;var R=f.memoizedState;R!==null&&(E=R.retryTime);break;case at:C=f.stateNode;break;default:throw Error("Pinged unknown suspense boundary type. This is probably a bug in React.")}else C=f.stateNode;C!==null&&C.delete(d),xv(f,E)}function Up(f){return f<120?120:f<480?480:f<1080?1080:f<1920?1920:f<3e3?3e3:f<4320?4320:Oa(f/1960)*1960}function jp(f,d,E){var C=E.busyMinDurationMs|0;if(C<=0)return 0;var R=E.busyDelayMs|0,j=mt(),V=$m(f,E),te=j-V;if(te<=R)return 0;var le=R+C-te;return le}function sg(){if(Lc>Hm)throw Lc=0,Wd=null,Error("Maximum update depth exceeded. This can happen when a component repeatedly calls setState inside componentWillUpdate or componentDidUpdate. React limits the number of nested updates to prevent infinite loops.");O1>cv&&(O1=0,Qt(!1,"Maximum update depth exceeded. This can happen when a component calls setState inside useEffect, but useEffect either doesn't have a dependency array, or one of the dependencies changes on every render."))}function ag(){Rl.flushLegacyContextWarning(),gi&&Rl.flushPendingUnsafeLifecycleWarnings()}function Av(){var f=!0;yf(Uf,f),Uf=null}function zp(){var f=!1;yf(Uf,f),Uf=null}function Hp(f,d){Hr&&ml!==null&&d>q0&&(Uf=f)}var Zd=null;function fg(f){{var d=f.tag;if(d!==B&&d!==M&&d!==N&&d!==fe&&d!==me&&d!==ie)return;var E=qt(f.type)||"ReactComponent";if(Zd!==null){if(Zd.has(E))return;Zd.add(E)}else Zd=new Set([E]);Ve(!1,"Can't perform a React state update on an unmounted component. This is a no-op, but it indicates a memory leak in your application. To fix, cancel all subscriptions and asynchronous tasks in %s.%s",d===M?"the componentWillUnmount method":"a useEffect cleanup function",Cr(f))}}var L1;if(X0){var cg=null;L1=function(f,d,E){var C=r_(cg,d);try{return ap(f,d,E)}catch(j){if(j!==null&&typeof j=="object"&&typeof j.then=="function")throw j;if(gt(),Ed(),nv(d),r_(d,C),en&&d.mode&ii&&W2(d),pl(null,ap,null,f,d,E),tr()){var R=Js();throw R}else throw j}}}else L1=ap;var Rv=!1,Ov=!1;function dg(f){if(f.tag===M)switch(Lr){case"getChildContext":if(Ov)return;Ve(!1,"setState(...): Cannot call setState() inside getChildContext()"),Ov=!0;break;case"render":if(Rv)return;Ve(!1,"Cannot update during an existing state transition (such as within `render`). Render methods should be a pure function of props and state."),Rv=!0;break}}var Wf={current:!1};function qp(f){ms===!0&&vl.current===!0&&Wf.current!==!0&&Ve(!1,`It looks like you're using the wrong act() around your test interactions.
-Be sure to use the matching version of act() corresponding to your renderer:
-
-// for react-dom:
-import {act} from 'react-dom/test-utils';
-// ...
-act(() => ...);
-
-// for react-test-renderer:
-import TestRenderer from 'react-test-renderer';
-const {act} = TestRenderer;
-// ...
-act(() => ...);%s`,Cr(f))}function Mv(f){ms===!0&&(f.mode&mr)!==Rr&&vl.current===!1&&Wf.current===!1&&Ve(!1,`An update to %s ran an effect, but was not wrapped in act(...).
-
-When testing, code that causes React state updates should be wrapped into act(...):
-
-act(() => {
-  /* fire events that update state */
-});
-/* assert on the output */
-
-This ensures that you're testing the behavior the user would see in the browser. Learn more at https://fb.me/react-wrap-tests-with-act%s`,qt(f.type),Cr(f))}function pg(f){ms===!0&&nr===yu&&vl.current===!1&&Wf.current===!1&&Ve(!1,`An update to %s inside a test was not wrapped in act(...).
-
-When testing, code that causes React state updates should be wrapped into act(...):
-
-act(() => {
-  /* fire events that update state */
-});
-/* assert on the output */
-
-This ensures that you're testing the behavior the user would see in the browser. Learn more at https://fb.me/react-wrap-tests-with-act%s`,qt(f.type),Cr(f))}var hg=pg,Wp=!1;function vg(f){Wp===!1&&t.unstable_flushAllWithoutAsserting===void 0&&(f.mode&Y||f.mode&ri?(Wp=!0,Ve(!1,`In Concurrent or Sync modes, the "scheduler" module needs to be mocked to guarantee consistent behaviour across tests and browsers. For example, with jest: 
-jest.mock('scheduler', () => require('scheduler/unstable_mock'));
-
-For more info, visit https://fb.me/react-mock-scheduler`)):eu===!0&&(Wp=!0,Ve(!1,`Starting from React v17, the "scheduler" module will need to be mocked to guarantee consistent behaviour across tests and browsers. For example, with jest: 
-jest.mock('scheduler', () => require('scheduler/unstable_mock'));
-
-For more info, visit https://fb.me/react-mock-scheduler`)))}var $s=null;function mg(f){{var d=Jt();if((f.mode&ri)!==Ai&&(d===ni||d===Fi))for(var E=f;E!==null;){var C=E.alternate;if(C!==null)switch(E.tag){case M:var R=C.updateQueue;if(R!==null)for(var j=R.firstUpdate;j!==null;){var V=j.priority;if(V===ni||V===Fi){$s===null?$s=new Set([qt(E.type)]):$s.add(qt(E.type));break}j=j.next}break;case N:case fe:case ie:if(E.memoizedState!==null&&E.memoizedState.baseUpdate!==null)for(var te=E.memoizedState.baseUpdate;te!==null;){var le=te.priority;if(le===ni||le===Fi){$s===null?$s=new Set([qt(E.type)]):$s.add(qt(E.type));break}if(te.next===E.memoizedState.baseUpdate)break;te=te.next}break;default:break}E=E.return}}}function p(){if($s!==null){var f=[];$s.forEach(function(d){return f.push(d)}),$s=null,f.length>0&&Ve(!1,`%s triggered a user-blocking update that suspended.
-
-The fix is to split the update into multiple parts: a user-blocking update to provide immediate feedback, and another update that triggers the bulk of the changes.
-
-Refer to the documentation for useTransition to learn how to implement this pattern.`,f.sort().join(", "))}}function v(f,d){return d*1e3+f.interactionThreadID}function x(f){!bn||(jf===null?jf=[f]:jf.push(f))}function P(f,d,E){if(!!bn&&E.size>0){var C=f.pendingInteractionMap,R=C.get(d);R!=null?E.forEach(function(te){R.has(te)||te.__count++,R.add(te)}):(C.set(d,new Set(E)),E.forEach(function(te){te.__count++}));var j=O.__subscriberRef.current;if(j!==null){var V=v(f,d);j.onWorkScheduled(E,V)}}}function W(f,d){!bn||P(f,d,O.__interactionsRef.current)}function ee(f,d){if(!!bn){var E=new Set;if(f.pendingInteractionMap.forEach(function(j,V){V>=d&&j.forEach(function(te){return E.add(te)})}),f.memoizedInteractions=E,E.size>0){var C=O.__subscriberRef.current;if(C!==null){var R=v(f,d);try{C.onWorkStarted(E,R)}catch(j){_n(Fi,function(){throw j})}}}}}function ve(f,d){if(!!bn){var E=f.firstPendingTime,C;try{if(C=O.__subscriberRef.current,C!==null&&f.memoizedInteractions.size>0){var R=v(f,d);C.onWorkStopped(f.memoizedInteractions,R)}}catch(V){_n(Fi,function(){throw V})}finally{var j=f.pendingInteractionMap;j.forEach(function(V,te){te>E&&(j.delete(te),V.forEach(function(le){if(le.__count--,C!==null&&le.__count===0)try{C.onInteractionScheduledWorkCompleted(le)}catch(Be){_n(Fi,function(){throw Be})}}))})}}}var Ee=null,Ie=null,_t=!1,St=typeof __REACT_DEVTOOLS_GLOBAL_HOOK__!="undefined";function Rt(f){if(typeof __REACT_DEVTOOLS_GLOBAL_HOOK__=="undefined")return!1;var d=__REACT_DEVTOOLS_GLOBAL_HOOK__;if(d.isDisabled)return!0;if(!d.supportsFiber)return Ve(!1,"The installed version of React DevTools is too old and will not work with the current version of React. Please update React DevTools. https://fb.me/react-devtools"),!0;try{var E=d.inject(f);Ee=function(C,R){try{var j=(C.current.effectTag&Xr)===Xr;if(en){var V=Nc(),te=rd(V,R);d.onCommitFiberRoot(E,C,te,j)}else d.onCommitFiberRoot(E,C,void 0,j)}catch(le){_t||(_t=!0,Ve(!1,"React DevTools encountered an error: %s",le))}},Ie=function(C){try{d.onCommitFiberUnmount(E,C)}catch(R){_t||(_t=!0,Ve(!1,"React DevTools encountered an error: %s",R))}}}catch(C){Ve(!1,"React DevTools encountered an error: %s.",C)}return!0}function on(f,d){typeof Ee=="function"&&Ee(f,d)}function kn(f){typeof Ie=="function"&&Ie(f)}var rr;{rr=!1;try{var br=Object.preventExtensions({}),ar=new Map([[br,null]]),ui=new Set([br]);ar.set(0,0),ui.add(0)}catch(f){rr=!0}}var di=1;function zl(f,d,E,C){this.tag=f,this.key=E,this.elementType=null,this.type=null,this.stateNode=null,this.return=null,this.child=null,this.sibling=null,this.index=0,this.ref=null,this.pendingProps=d,this.memoizedProps=null,this.updateQueue=null,this.memoizedState=null,this.dependencies=null,this.mode=C,this.effectTag=Ai,this.nextEffect=null,this.firstEffect=null,this.lastEffect=null,this.expirationTime=ft,this.childExpirationTime=ft,this.alternate=null,en&&(this.actualDuration=Number.NaN,this.actualStartTime=Number.NaN,this.selfBaseDuration=Number.NaN,this.treeBaseDuration=Number.NaN,this.actualDuration=0,this.actualStartTime=-1,this.selfBaseDuration=0,this.treeBaseDuration=0),Hr&&(this._debugID=di++,this._debugIsCurrentlyTiming=!1),this._debugSource=null,this._debugOwner=null,this._debugNeedsRemount=!1,this._debugHookTypes=null,!rr&&typeof Object.preventExtensions=="function"&&Object.preventExtensions(this)}var Zi=function(f,d,E,C){return new zl(f,d,E,C)};function so(f){var d=f.prototype;return!!(d&&d.isReactComponent)}function a0(f){return typeof f=="function"&&!so(f)&&f.defaultProps===void 0}function Ms(f){if(typeof f=="function")return so(f)?M:N;if(f!=null){var d=f.$$typeof;if(d===Mn)return fe;if(d===Vt)return me}return T}function Co(f,d,E){var C=f.alternate;C===null?(C=Zi(f.tag,d,f.key,f.mode),C.elementType=f.elementType,C.type=f.type,C.stateNode=f.stateNode,C._debugID=f._debugID,C._debugSource=f._debugSource,C._debugOwner=f._debugOwner,C._debugHookTypes=f._debugHookTypes,C.alternate=f,f.alternate=C):(C.pendingProps=d,C.effectTag=Ai,C.nextEffect=null,C.firstEffect=null,C.lastEffect=null,en&&(C.actualDuration=0,C.actualStartTime=-1)),C.childExpirationTime=f.childExpirationTime,C.expirationTime=f.expirationTime,C.child=f.child,C.memoizedProps=f.memoizedProps,C.memoizedState=f.memoizedState,C.updateQueue=f.updateQueue;var R=f.dependencies;switch(C.dependencies=R===null?null:{expirationTime:R.expirationTime,firstContext:R.firstContext,responders:R.responders},C.sibling=f.sibling,C.index=f.index,C.ref=f.ref,en&&(C.selfBaseDuration=f.selfBaseDuration,C.treeBaseDuration=f.treeBaseDuration),C._debugNeedsRemount=f._debugNeedsRemount,C.tag){case T:case N:case ie:C.type=r0(f.type);break;case M:C.type=j0(f.type);break;case fe:C.type=wf(f.type);break;default:break}return C}function kv(f,d){f.effectTag&=mi,f.nextEffect=null,f.firstEffect=null,f.lastEffect=null;var E=f.alternate;if(E===null)f.childExpirationTime=ft,f.expirationTime=d,f.child=null,f.memoizedProps=null,f.memoizedState=null,f.updateQueue=null,f.dependencies=null,en&&(f.selfBaseDuration=0,f.treeBaseDuration=0);else{f.childExpirationTime=E.childExpirationTime,f.expirationTime=E.expirationTime,f.child=E.child,f.memoizedProps=E.memoizedProps,f.memoizedState=E.memoizedState,f.updateQueue=E.updateQueue;var C=E.dependencies;f.dependencies=C===null?null:{expirationTime:C.expirationTime,firstContext:C.firstContext,responders:C.responders},en&&(f.selfBaseDuration=E.selfBaseDuration,f.treeBaseDuration=E.treeBaseDuration)}return f}function J4(f){var d;return f===O0?d=ri|Y|mr:f===B0?d=Y|mr:d=Rr,en&&St&&(d|=ii),Zi(B,null,null,d)}function gg(f,d,E,C,R,j){var V,te=T,le=f;if(typeof f=="function")so(f)?(te=M,le=j0(le)):le=r0(le);else if(typeof f=="string")te=q;else{e:switch(f){case oe:return rf(E.children,R,j,d);case an:te=he,R|=ri|Y|mr;break;case He:te=he,R|=mr;break;case dt:return $4(E,R,j,d);case lr:return eE(E,R,j,d);case ln:return tE(E,R,j,d);default:{if(typeof f=="object"&&f!==null)switch(f.$$typeof){case At:te=se;break e;case nn:te=De;break e;case Mn:te=fe,le=wf(le);break e;case Vt:te=me;break e;case Dr:te=Oe,le=null;break e;case w:if(Wt)return n_(f,E,R,j,d);break;case Xn:if(Ru)return Z4(f,E,R,j,d)}var Be="";{(f===void 0||typeof f=="object"&&f!==null&&Object.keys(f).length===0)&&(Be+=" You likely forgot to export your component from the file it's defined in, or you might have mixed up default and named imports.");var Xe=C?qt(C.type):null;Xe&&(Be+=`
-
-Check the render method of \``+Xe+"`.")}throw Error("Element type is invalid: expected a string (for built-in components) or a class/function (for composite components) but got: "+(f==null?f:typeof f)+"."+Be)}}}return V=Zi(te,E,d,R),V.elementType=f,V.type=le,V.expirationTime=j,V}function yg(f,d,E){var C=null;C=f._owner;var R=f.type,j=f.key,V=f.props,te=gg(R,j,V,C,d,E);return te._debugSource=f._source,te._debugOwner=f._owner,te}function rf(f,d,E,C){var R=Zi(m,f,C,d);return R.expirationTime=E,R}function n_(f,d,E,C,R){var j=Zi(Dt,d,R,E);return j.elementType=f,j.type=f,j.expirationTime=C,j}function Z4(f,d,E,C,R){var j=Zi(Qe,d,R,E);return j.type=f,j.elementType=f,j.expirationTime=C,j}function $4(f,d,E,C){(typeof f.id!="string"||typeof f.onRender!="function")&&Ve(!1,'Profiler must specify an "id" string and "onRender" function as props');var R=Zi(_e,f,C,d|ii);return R.elementType=dt,R.type=dt,R.expirationTime=E,R}function eE(f,d,E,C){var R=Zi(ce,f,C,d);return R.type=lr,R.elementType=lr,R.expirationTime=E,R}function tE(f,d,E,C){var R=Zi(at,f,C,d);return R.type=ln,R.elementType=ln,R.expirationTime=E,R}function _g(f,d,E){var C=Zi(ne,f,null,d);return C.expirationTime=E,C}function nE(){var f=Zi(q,null,null,Rr);return f.elementType="DELETED",f.type="DELETED",f}function rE(f){var d=Zi(je,null,null,Rr);return d.stateNode=f,d}function Eg(f,d,E){var C=f.children!==null?f.children:[],R=Zi(H,C,f.key,d);return R.expirationTime=E,R.stateNode={containerInfo:f.containerInfo,pendingChildren:null,implementation:f.implementation},R}function r_(f,d){return f===null&&(f=Zi(T,null,null,Rr)),f.tag=d.tag,f.key=d.key,f.elementType=d.elementType,f.type=d.type,f.stateNode=d.stateNode,f.return=d.return,f.child=d.child,f.sibling=d.sibling,f.index=d.index,f.ref=d.ref,f.pendingProps=d.pendingProps,f.memoizedProps=d.memoizedProps,f.updateQueue=d.updateQueue,f.memoizedState=d.memoizedState,f.dependencies=d.dependencies,f.mode=d.mode,f.effectTag=d.effectTag,f.nextEffect=d.nextEffect,f.firstEffect=d.firstEffect,f.lastEffect=d.lastEffect,f.expirationTime=d.expirationTime,f.childExpirationTime=d.childExpirationTime,f.alternate=d.alternate,en&&(f.actualDuration=d.actualDuration,f.actualStartTime=d.actualStartTime,f.selfBaseDuration=d.selfBaseDuration,f.treeBaseDuration=d.treeBaseDuration),f._debugID=d._debugID,f._debugSource=d._debugSource,f._debugOwner=d._debugOwner,f._debugIsCurrentlyTiming=d._debugIsCurrentlyTiming,f._debugNeedsRemount=d._debugNeedsRemount,f._debugHookTypes=d._debugHookTypes,f}function iE(f,d,E){this.tag=d,this.current=null,this.containerInfo=f,this.pendingChildren=null,this.pingCache=null,this.finishedExpirationTime=ft,this.finishedWork=null,this.timeoutHandle=nl,this.context=null,this.pendingContext=null,this.hydrate=E,this.callbackNode=null,this.callbackPriority=E0,this.firstPendingTime=ft,this.firstSuspendedTime=ft,this.lastSuspendedTime=ft,this.nextKnownPendingLevel=ft,this.lastPingedTime=ft,this.lastExpiredTime=ft,bn&&(this.interactionThreadID=O.unstable_getThreadID(),this.memoizedInteractions=new Set,this.pendingInteractionMap=new Map),Yi&&(this.hydrationCallbacks=null)}function uE(f,d,E,C){var R=new iE(f,d,E);Yi&&(R.hydrationCallbacks=C);var j=J4(d);return R.current=j,j.stateNode=R,R}function i_(f,d){var E=f.firstSuspendedTime,C=f.lastSuspendedTime;return E!==ft&&E>=d&&C<=d}function Vf(f,d){var E=f.firstSuspendedTime,C=f.lastSuspendedTime;E<d&&(f.firstSuspendedTime=d),(C>d||E===ft)&&(f.lastSuspendedTime=d),d<=f.lastPingedTime&&(f.lastPingedTime=ft),d<=f.lastExpiredTime&&(f.lastExpiredTime=ft)}function u_(f,d){var E=f.firstPendingTime;d>E&&(f.firstPendingTime=d);var C=f.firstSuspendedTime;C!==ft&&(d>=C?f.firstSuspendedTime=f.lastSuspendedTime=f.nextKnownPendingLevel=ft:d>=f.lastSuspendedTime&&(f.lastSuspendedTime=d+1),d>f.nextKnownPendingLevel&&(f.nextKnownPendingLevel=d))}function oE(f,d,E){f.firstPendingTime=E,d<=f.lastSuspendedTime?f.firstSuspendedTime=f.lastSuspendedTime=f.nextKnownPendingLevel=ft:d<=f.firstSuspendedTime&&(f.firstSuspendedTime=d-1),d<=f.lastPingedTime&&(f.lastPingedTime=ft),d<=f.lastExpiredTime&&(f.lastExpiredTime=ft)}function Vp(f,d){var E=f.lastExpiredTime;(E===ft||E>d)&&(f.lastExpiredTime=d)}var lE={debugTool:null},Lv=lE,Dg,wg;Dg=!1,wg={};function sE(f){if(!f)return An;var d=It(f),E=xl(d);if(d.tag===M){var C=d.type;if(Xi(C))return R0(d,C,E)}return E}function Sg(f){var d=It(f);if(d===void 0)throw typeof f.render=="function"?Error("Unable to find node on an unmounted component."):Error("Argument appears to not be a ReactComponent. Keys: "+Object.keys(f));var E=I0(d);return E===null?null:E.stateNode}function aE(f,d){{var E=It(f);if(E===void 0)throw typeof f.render=="function"?Error("Unable to find node on an unmounted component."):Error("Argument appears to not be a ReactComponent. Keys: "+Object.keys(f));var C=I0(E);if(C===null)return null;if(C.mode&mr){var R=qt(E.type)||"Component";wg[R]||(wg[R]=!0,E.mode&mr?Ve(!1,"%s is deprecated in StrictMode. %s was passed an instance of %s which is inside StrictMode. Instead, add a ref directly to the element you want to reference. Learn more about using refs safely here: https://fb.me/react-strict-mode-find-node%s",d,d,R,Cr(C)):Ve(!1,"%s is deprecated in StrictMode. %s was passed an instance of %s which renders StrictMode children. Instead, add a ref directly to the element you want to reference. Learn more about using refs safely here: https://fb.me/react-strict-mode-find-node%s",d,d,R,Cr(C)))}return C.stateNode}return Sg(f)}function fE(f,d,E,C){return uE(f,d,E,C)}function o_(f,d,E,C){var R=d.current,j=jl();typeof jest!="undefined"&&(vg(R),qp(R));var V=_o(),te=zf(j,R,V);Lv.debugTool&&(R.alternate===null?Lv.debugTool.onMountContainer(d):f===null?Lv.debugTool.onUnmountContainer(d):Lv.debugTool.onUpdateContainer(d));var le=sE(E);d.context===null?d.context=le:d.pendingContext=le,Lr==="render"&&Rn!==null&&!Dg&&(Dg=!0,Ve(!1,`Render methods should be a pure function of props and state; triggering nested component updates from render is not allowed. If necessary, trigger nested updates in componentDidUpdate.
-
-Check the render method of %s.`,qt(Rn.type)||"Unknown"));var Be=Cu(te,V);return Be.payload={element:f},C=C===void 0?null:C,C!==null&&(typeof C!="function"&&Ve(!1,"render(...): Expected the last optional `callback` argument to be a function. Instead received: %s.",C),Be.callback=C),Ga(R,Be),gl(R,te),te}function cE(f){var d=f.current;if(!d.child)return null;switch(d.child.tag){case q:return No(d.child.stateNode);default:return d.child.stateNode}}function dE(f){switch(f.tag){case B:var d=f.stateNode;d.hydrate&&Gm(d,d.firstPendingTime);break;case ce:Op(function(){return gl(f,Un)});var E=ja(jl());Nv(f,E);break}}function l_(f,d){var E=f.memoizedState;E!==null&&E.dehydrated!==null&&E.retryTime<d&&(E.retryTime=d)}function Nv(f,d){l_(f,d);var E=f.alternate;E&&l_(E,d)}function pE(f){if(f.tag===ce){var d=ja(jl());gl(f,d),Nv(f,d)}}function Tg(f){if(f.tag===ce){var d=D2(jl());gl(f,d),Nv(f,d)}}function hE(f){if(f.tag===ce){var d=jl(),E=zf(d,f,null);gl(f,E),Nv(f,E)}}function vE(f){var d=Sl(f);return d===null?null:d.tag===Dt?d.stateNode.instance:d.stateNode}var Cg=function(f){return!1};function s_(f){return Cg(f)}var a_=null,f_=null,c_=null,d_=null;{var xg=function(f,d,E,C){if(E>=d.length)return C;var R=d[E],j=Array.isArray(f)?f.slice():a({},f);return j[R]=xg(f[R],d,E+1,C),j},p_=function(f,d,E){return xg(f,d,0,E)};a_=function(f,d,E,C){for(var R=f.memoizedState;R!==null&&d>0;)R=R.next,d--;if(R!==null){var j=p_(R.memoizedState,E,C);R.memoizedState=j,R.baseState=j,f.memoizedProps=a({},f.memoizedProps),gl(f,Un)}},f_=function(f,d,E){f.pendingProps=p_(f.memoizedProps,d,E),f.alternate&&(f.alternate.pendingProps=f.pendingProps),gl(f,Un)},c_=function(f){gl(f,Un)},d_=function(f){Cg=f}}function mE(f){var d=f.findFiberByHostInstance,E=rt.ReactCurrentDispatcher;return Rt(a({},f,{overrideHookState:a_,overrideProps:f_,setSuspenseHandler:d_,scheduleUpdate:c_,currentDispatcherRef:E,findHostInstanceByFiber:function(C){var R=I0(C);return R===null?null:R.stateNode},findFiberByHostInstance:function(C){return d?d(C):null},findHostInstancesForRefresh:od,scheduleRefresh:Ol,scheduleRoot:Cs,setRefreshHandler:Wa,getCurrentFiber:function(){return Rn}}))}var h_=Object.freeze({createContainer:fE,updateContainer:o_,batchedEventUpdates:Qm,batchedUpdates:Xm,unbatchedUpdates:Jm,deferredUpdates:Ym,syncUpdates:pv,discreteUpdates:hv,flushDiscreteUpdates:dv,flushControlled:Zm,flushSync:Op,flushPassiveEffects:nf,IsThisRendererActing:Wf,getPublicRootInstance:cE,attemptSynchronousHydration:dE,attemptUserBlockingHydration:pE,attemptContinuousHydration:Tg,attemptHydrationAtCurrentPriority:hE,findHostInstance:Sg,findHostInstanceWithWarning:aE,findHostInstanceWithNoPortals:vE,shouldSuspend:s_,injectIntoDevTools:mE}),gE=h_.default||h_;Qg.exports=gE;var yE=Qg.exports;return Qg.exports=i,yE})});var hT=Ke((HW,PD)=>{"use strict";process.env.NODE_ENV==="production"?PD.exports=aT():PD.exports=pT()});var mT=Ke((qW,vT)=>{"use strict";var jI={ALIGN_COUNT:8,ALIGN_AUTO:0,ALIGN_FLEX_START:1,ALIGN_CENTER:2,ALIGN_FLEX_END:3,ALIGN_STRETCH:4,ALIGN_BASELINE:5,ALIGN_SPACE_BETWEEN:6,ALIGN_SPACE_AROUND:7,DIMENSION_COUNT:2,DIMENSION_WIDTH:0,DIMENSION_HEIGHT:1,DIRECTION_COUNT:3,DIRECTION_INHERIT:0,DIRECTION_LTR:1,DIRECTION_RTL:2,DISPLAY_COUNT:2,DISPLAY_FLEX:0,DISPLAY_NONE:1,EDGE_COUNT:9,EDGE_LEFT:0,EDGE_TOP:1,EDGE_RIGHT:2,EDGE_BOTTOM:3,EDGE_START:4,EDGE_END:5,EDGE_HORIZONTAL:6,EDGE_VERTICAL:7,EDGE_ALL:8,EXPERIMENTAL_FEATURE_COUNT:1,EXPERIMENTAL_FEATURE_WEB_FLEX_BASIS:0,FLEX_DIRECTION_COUNT:4,FLEX_DIRECTION_COLUMN:0,FLEX_DIRECTION_COLUMN_REVERSE:1,FLEX_DIRECTION_ROW:2,FLEX_DIRECTION_ROW_REVERSE:3,JUSTIFY_COUNT:6,JUSTIFY_FLEX_START:0,JUSTIFY_CENTER:1,JUSTIFY_FLEX_END:2,JUSTIFY_SPACE_BETWEEN:3,JUSTIFY_SPACE_AROUND:4,JUSTIFY_SPACE_EVENLY:5,LOG_LEVEL_COUNT:6,LOG_LEVEL_ERROR:0,LOG_LEVEL_WARN:1,LOG_LEVEL_INFO:2,LOG_LEVEL_DEBUG:3,LOG_LEVEL_VERBOSE:4,LOG_LEVEL_FATAL:5,MEASURE_MODE_COUNT:3,MEASURE_MODE_UNDEFINED:0,MEASURE_MODE_EXACTLY:1,MEASURE_MODE_AT_MOST:2,NODE_TYPE_COUNT:2,NODE_TYPE_DEFAULT:0,NODE_TYPE_TEXT:1,OVERFLOW_COUNT:3,OVERFLOW_VISIBLE:0,OVERFLOW_HIDDEN:1,OVERFLOW_SCROLL:2,POSITION_TYPE_COUNT:2,POSITION_TYPE_RELATIVE:0,POSITION_TYPE_ABSOLUTE:1,PRINT_OPTIONS_COUNT:3,PRINT_OPTIONS_LAYOUT:1,PRINT_OPTIONS_STYLE:2,PRINT_OPTIONS_CHILDREN:4,UNIT_COUNT:4,UNIT_UNDEFINED:0,UNIT_POINT:1,UNIT_PERCENT:2,UNIT_AUTO:3,WRAP_COUNT:3,WRAP_NO_WRAP:0,WRAP_WRAP:1,WRAP_WRAP_REVERSE:2};vT.exports=jI});var ET=Ke((WW,gT)=>{"use strict";var zI=Object.assign||function(i){for(var o=1;o<arguments.length;o++){var a=arguments[o];for(var c in a)Object.prototype.hasOwnProperty.call(a,c)&&(i[c]=a[c])}return i},J_=function(){function i(o,a){for(var c=0;c<a.length;c++){var _=a[c];_.enumerable=_.enumerable||!1,_.configurable=!0,"value"in _&&(_.writable=!0),Object.defineProperty(o,_.key,_)}}return function(o,a,c){return a&&i(o.prototype,a),c&&i(o,c),o}}();function ID(i,o,a){return o in i?Object.defineProperty(i,o,{value:a,enumerable:!0,configurable:!0,writable:!0}):i[o]=a,i}function bD(i,o){if(!(i instanceof o))throw new TypeError("Cannot call a class as a function")}var nc=mT(),HI=function(){function i(o,a,c,_,t,O){bD(this,i),this.left=o,this.right=a,this.top=c,this.bottom=_,this.width=t,this.height=O}return J_(i,[{key:"fromJS",value:function(a){a(this.left,this.right,this.top,this.bottom,this.width,this.height)}},{key:"toString",value:function(){return"<Layout#"+this.left+":"+this.right+";"+this.top+":"+this.bottom+";"+this.width+":"+this.height+">"}}]),i}(),yT=function(){J_(i,null,[{key:"fromJS",value:function(a){var c=a.width,_=a.height;return new i(c,_)}}]);function i(o,a){bD(this,i),this.width=o,this.height=a}return J_(i,[{key:"fromJS",value:function(a){a(this.width,this.height)}},{key:"toString",value:function(){return"<Size#"+this.width+"x"+this.height+">"}}]),i}(),_T=function(){function i(o,a){bD(this,i),this.unit=o,this.value=a}return J_(i,[{key:"fromJS",value:function(a){a(this.unit,this.value)}},{key:"toString",value:function(){switch(this.unit){case nc.UNIT_POINT:return String(this.value);case nc.UNIT_PERCENT:return this.value+"%";case nc.UNIT_AUTO:return"auto";default:return this.value+"?"}}},{key:"valueOf",value:function(){return this.value}}]),i}();gT.exports=function(i,o){function a(O,N,M){var T=O[N];O[N]=function(){for(var B=arguments.length,H=Array(B),q=0;q<B;q++)H[q]=arguments[q];return M.call.apply(M,[this,T].concat(H))}}for(var c=["setPosition","setMargin","setFlexBasis","setWidth","setHeight","setMinWidth","setMinHeight","setMaxWidth","setMaxHeight","setPadding"],_=function(){var N,M=c[t],T=(N={},ID(N,nc.UNIT_POINT,o.Node.prototype[M]),ID(N,nc.UNIT_PERCENT,o.Node.prototype[M+"Percent"]),ID(N,nc.UNIT_AUTO,o.Node.prototype[M+"Auto"]),N);a(o.Node.prototype,M,function(B){for(var H=arguments.length,q=Array(H>1?H-1:0),ne=1;ne<H;ne++)q[ne-1]=arguments[ne];var m=q.pop(),he=void 0,De=void 0;if(m==="auto")he=nc.UNIT_AUTO,De=void 0;else if(m instanceof _T)he=m.unit,De=m.valueOf();else if(he=typeof m=="string"&&m.endsWith("%")?nc.UNIT_PERCENT:nc.UNIT_POINT,De=parseFloat(m),!Number.isNaN(m)&&Number.isNaN(De))throw new Error("Invalid value "+m+" for "+M);if(!T[he])throw new Error('Failed to execute "'+M+`": Unsupported unit '`+m+"'");if(De!==void 0){var se;return(se=T[he]).call.apply(se,[this].concat(q,[De]))}else{var fe;return(fe=T[he]).call.apply(fe,[this].concat(q))}})},t=0;t<c.length;t++)_();return a(o.Config.prototype,"free",function(){o.Config.destroy(this)}),a(o.Node,"create",function(O,N){return N?o.Node.createWithConfig(N):o.Node.createDefault()}),a(o.Node.prototype,"free",function(){o.Node.destroy(this)}),a(o.Node.prototype,"freeRecursive",function(){for(var O=0,N=this.getChildCount();O<N;++O)this.getChild(0).freeRecursive();this.free()}),a(o.Node.prototype,"setMeasureFunc",function(O,N){return N?O.call(this,function(){return yT.fromJS(N.apply(void 0,arguments))}):this.unsetMeasureFunc()}),a(o.Node.prototype,"calculateLayout",function(O){var N=arguments.length>1&&arguments[1]!==void 0?arguments[1]:NaN,M=arguments.length>2&&arguments[2]!==void 0?arguments[2]:NaN,T=arguments.length>3&&arguments[3]!==void 0?arguments[3]:nc.DIRECTION_LTR;return O.call(this,N,M,T)}),zI({Config:o.Config,Node:o.Node,Layout:i("Layout",HI),Size:i("Size",yT),Value:i("Value",_T),getInstanceCount:function(){return o.getInstanceCount.apply(o,arguments)}},nc)}});var DT=Ke((exports,module)=>{(function(i,o){typeof define=="function"&&define.amd?define([],function(){return o}):typeof module=="object"&&module.exports?module.exports=o:(i.nbind=i.nbind||{}).init=o})(exports,function(Module,cb){typeof Module=="function"&&(cb=Module,Module={}),Module.onRuntimeInitialized=function(i,o){return function(){i&&i.apply(this,arguments);try{Module.ccall("nbind_init")}catch(a){o(a);return}o(null,{bind:Module._nbind_value,reflect:Module.NBind.reflect,queryType:Module.NBind.queryType,toggleLightGC:Module.toggleLightGC,lib:Module})}}(Module.onRuntimeInitialized,cb);var Module;Module||(Module=(typeof Module!="undefined"?Module:null)||{});var moduleOverrides={};for(var key in Module)Module.hasOwnProperty(key)&&(moduleOverrides[key]=Module[key]);var ENVIRONMENT_IS_WEB=!1,ENVIRONMENT_IS_WORKER=!1,ENVIRONMENT_IS_NODE=!1,ENVIRONMENT_IS_SHELL=!1;if(Module.ENVIRONMENT)if(Module.ENVIRONMENT==="WEB")ENVIRONMENT_IS_WEB=!0;else if(Module.ENVIRONMENT==="WORKER")ENVIRONMENT_IS_WORKER=!0;else if(Module.ENVIRONMENT==="NODE")ENVIRONMENT_IS_NODE=!0;else if(Module.ENVIRONMENT==="SHELL")ENVIRONMENT_IS_SHELL=!0;else throw new Error("The provided Module['ENVIRONMENT'] value is not valid. It must be one of: WEB|WORKER|NODE|SHELL.");else ENVIRONMENT_IS_WEB=typeof window=="object",ENVIRONMENT_IS_WORKER=typeof importScripts=="function",ENVIRONMENT_IS_NODE=typeof process=="object"&&typeof require=="function"&&!ENVIRONMENT_IS_WEB&&!ENVIRONMENT_IS_WORKER,ENVIRONMENT_IS_SHELL=!ENVIRONMENT_IS_WEB&&!ENVIRONMENT_IS_NODE&&!ENVIRONMENT_IS_WORKER;if(ENVIRONMENT_IS_NODE){Module.print||(Module.print=console.log),Module.printErr||(Module.printErr=console.warn);var nodeFS,nodePath;Module.read=function(o,a){nodeFS||(nodeFS={}("")),nodePath||(nodePath={}("")),o=nodePath.normalize(o);var c=nodeFS.readFileSync(o);return a?c:c.toString()},Module.readBinary=function(o){var a=Module.read(o,!0);return a.buffer||(a=new Uint8Array(a)),assert(a.buffer),a},Module.load=function(o){globalEval(read(o))},Module.thisProgram||(process.argv.length>1?Module.thisProgram=process.argv[1].replace(/\\/g,"/"):Module.thisProgram="unknown-program"),Module.arguments=process.argv.slice(2),typeof module!="undefined"&&(module.exports=Module),Module.inspect=function(){return"[Emscripten Module object]"}}else if(ENVIRONMENT_IS_SHELL)Module.print||(Module.print=print),typeof printErr!="undefined"&&(Module.printErr=printErr),typeof read!="undefined"?Module.read=read:Module.read=function(){throw"no read() available"},Module.readBinary=function(o){if(typeof readbuffer=="function")return new Uint8Array(readbuffer(o));var a=read(o,"binary");return assert(typeof a=="object"),a},typeof scriptArgs!="undefined"?Module.arguments=scriptArgs:typeof arguments!="undefined"&&(Module.arguments=arguments),typeof quit=="function"&&(Module.quit=function(i,o){quit(i)});else if(ENVIRONMENT_IS_WEB||ENVIRONMENT_IS_WORKER){if(Module.read=function(o){var a=new XMLHttpRequest;return a.open("GET",o,!1),a.send(null),a.responseText},ENVIRONMENT_IS_WORKER&&(Module.readBinary=function(o){var a=new XMLHttpRequest;return a.open("GET",o,!1),a.responseType="arraybuffer",a.send(null),new Uint8Array(a.response)}),Module.readAsync=function(o,a,c){var _=new XMLHttpRequest;_.open("GET",o,!0),_.responseType="arraybuffer",_.onload=function(){_.status==200||_.status==0&&_.response?a(_.response):c()},_.onerror=c,_.send(null)},typeof arguments!="undefined"&&(Module.arguments=arguments),typeof console!="undefined")Module.print||(Module.print=function(o){console.log(o)}),Module.printErr||(Module.printErr=function(o){console.warn(o)});else{var TRY_USE_DUMP=!1;Module.print||(Module.print=TRY_USE_DUMP&&typeof dump!="undefined"?function(i){dump(i)}:function(i){})}ENVIRONMENT_IS_WORKER&&(Module.load=importScripts),typeof Module.setWindowTitle=="undefined"&&(Module.setWindowTitle=function(i){document.title=i})}else throw"Unknown runtime environment. Where are we?";function globalEval(i){eval.call(null,i)}!Module.load&&Module.read&&(Module.load=function(o){globalEval(Module.read(o))}),Module.print||(Module.print=function(){}),Module.printErr||(Module.printErr=Module.print),Module.arguments||(Module.arguments=[]),Module.thisProgram||(Module.thisProgram="./this.program"),Module.quit||(Module.quit=function(i,o){throw o}),Module.print=Module.print,Module.printErr=Module.printErr,Module.preRun=[],Module.postRun=[];for(var key in moduleOverrides)moduleOverrides.hasOwnProperty(key)&&(Module[key]=moduleOverrides[key]);moduleOverrides=void 0;var Runtime={setTempRet0:function(i){return tempRet0=i,i},getTempRet0:function(){return tempRet0},stackSave:function(){return STACKTOP},stackRestore:function(i){STACKTOP=i},getNativeTypeSize:function(i){switch(i){case"i1":case"i8":return 1;case"i16":return 2;case"i32":return 4;case"i64":return 8;case"float":return 4;case"double":return 8;default:{if(i[i.length-1]==="*")return Runtime.QUANTUM_SIZE;if(i[0]==="i"){var o=parseInt(i.substr(1));return assert(o%8==0),o/8}else return 0}}},getNativeFieldSize:function(i){return Math.max(Runtime.getNativeTypeSize(i),Runtime.QUANTUM_SIZE)},STACK_ALIGN:16,prepVararg:function(i,o){return o==="double"||o==="i64"?i&7&&(assert((i&7)==4),i+=4):assert((i&3)==0),i},getAlignSize:function(i,o,a){return!a&&(i=="i64"||i=="double")?8:i?Math.min(o||(i?Runtime.getNativeFieldSize(i):0),Runtime.QUANTUM_SIZE):Math.min(o,8)},dynCall:function(i,o,a){return a&&a.length?Module["dynCall_"+i].apply(null,[o].concat(a)):Module["dynCall_"+i].call(null,o)},functionPointers:[],addFunction:function(i){for(var o=0;o<Runtime.functionPointers.length;o++)if(!Runtime.functionPointers[o])return Runtime.functionPointers[o]=i,2*(1+o);throw"Finished up all reserved function pointers. Use a higher value for RESERVED_FUNCTION_POINTERS."},removeFunction:function(i){Runtime.functionPointers[(i-2)/2]=null},warnOnce:function(i){Runtime.warnOnce.shown||(Runtime.warnOnce.shown={}),Runtime.warnOnce.shown[i]||(Runtime.warnOnce.shown[i]=1,Module.printErr(i))},funcWrappers:{},getFuncWrapper:function(i,o){if(!!i){assert(o),Runtime.funcWrappers[o]||(Runtime.funcWrappers[o]={});var a=Runtime.funcWrappers[o];return a[i]||(o.length===1?a[i]=function(){return Runtime.dynCall(o,i)}:o.length===2?a[i]=function(_){return Runtime.dynCall(o,i,[_])}:a[i]=function(){return Runtime.dynCall(o,i,Array.prototype.slice.call(arguments))}),a[i]}},getCompilerSetting:function(i){throw"You must build with -s RETAIN_COMPILER_SETTINGS=1 for Runtime.getCompilerSetting or emscripten_get_compiler_setting to work"},stackAlloc:function(i){var o=STACKTOP;return STACKTOP=STACKTOP+i|0,STACKTOP=STACKTOP+15&-16,o},staticAlloc:function(i){var o=STATICTOP;return STATICTOP=STATICTOP+i|0,STATICTOP=STATICTOP+15&-16,o},dynamicAlloc:function(i){var o=HEAP32[DYNAMICTOP_PTR>>2],a=(o+i+15|0)&-16;if(HEAP32[DYNAMICTOP_PTR>>2]=a,a>=TOTAL_MEMORY){var c=enlargeMemory();if(!c)return HEAP32[DYNAMICTOP_PTR>>2]=o,0}return o},alignMemory:function(i,o){var a=i=Math.ceil(i/(o||16))*(o||16);return a},makeBigInt:function(i,o,a){var c=a?+(i>>>0)+ +(o>>>0)*4294967296:+(i>>>0)+ +(o|0)*4294967296;return c},GLOBAL_BASE:8,QUANTUM_SIZE:4,__dummy__:0};Module.Runtime=Runtime;var ABORT=0,EXITSTATUS=0;function assert(i,o){i||abort("Assertion failed: "+o)}function getCFunc(ident){var func=Module["_"+ident];if(!func)try{func=eval("_"+ident)}catch(i){}return assert(func,"Cannot call unknown function "+ident+" (perhaps LLVM optimizations or closure removed it?)"),func}var cwrap,ccall;(function(){var JSfuncs={stackSave:function(){Runtime.stackSave()},stackRestore:function(){Runtime.stackRestore()},arrayToC:function(i){var o=Runtime.stackAlloc(i.length);return writeArrayToMemory(i,o),o},stringToC:function(i){var o=0;if(i!=null&&i!==0){var a=(i.length<<2)+1;o=Runtime.stackAlloc(a),stringToUTF8(i,o,a)}return o}},toC={string:JSfuncs.stringToC,array:JSfuncs.arrayToC};ccall=function(o,a,c,_,t){var O=getCFunc(o),N=[],M=0;if(_)for(var T=0;T<_.length;T++){var B=toC[c[T]];B?(M===0&&(M=Runtime.stackSave()),N[T]=B(_[T])):N[T]=_[T]}var H=O.apply(null,N);if(a==="string"&&(H=Pointer_stringify(H)),M!==0){if(t&&t.async){EmterpreterAsync.asyncFinalizers.push(function(){Runtime.stackRestore(M)});return}Runtime.stackRestore(M)}return H};var sourceRegex=/^function\s*[a-zA-Z$_0-9]*\s*\(([^)]*)\)\s*{\s*([^*]*?)[\s;]*(?:return\s*(.*?)[;\s]*)?}$/;function parseJSFunc(i){var o=i.toString().match(sourceRegex).slice(1);return{arguments:o[0],body:o[1],returnValue:o[2]}}var JSsource=null;function ensureJSsource(){if(!JSsource){JSsource={};for(var i in JSfuncs)JSfuncs.hasOwnProperty(i)&&(JSsource[i]=parseJSFunc(JSfuncs[i]))}}cwrap=function(ident,returnType,argTypes){argTypes=argTypes||[];var cfunc=getCFunc(ident),numericArgs=argTypes.every(function(i){return i==="number"}),numericRet=returnType!=="string";if(numericRet&&numericArgs)return cfunc;var argNames=argTypes.map(function(i,o){return"$"+o}),funcstr="(function("+argNames.join(",")+") {",nargs=argTypes.length;if(!numericArgs){ensureJSsource(),funcstr+="var stack = "+JSsource.stackSave.body+";";for(var i=0;i<nargs;i++){var arg=argNames[i],type=argTypes[i];if(type!=="number"){var convertCode=JSsource[type+"ToC"];funcstr+="var "+convertCode.arguments+" = "+arg+";",funcstr+=convertCode.body+";",funcstr+=arg+"=("+convertCode.returnValue+");"}}}var cfuncname=parseJSFunc(function(){return cfunc}).returnValue;if(funcstr+="var ret = "+cfuncname+"("+argNames.join(",")+");",!numericRet){var strgfy=parseJSFunc(function(){return Pointer_stringify}).returnValue;funcstr+="ret = "+strgfy+"(ret);"}return numericArgs||(ensureJSsource(),funcstr+=JSsource.stackRestore.body.replace("()","(stack)")+";"),funcstr+="return ret})",eval(funcstr)}})(),Module.ccall=ccall,Module.cwrap=cwrap;function setValue(i,o,a,c){switch(a=a||"i8",a.charAt(a.length-1)==="*"&&(a="i32"),a){case"i1":HEAP8[i>>0]=o;break;case"i8":HEAP8[i>>0]=o;break;case"i16":HEAP16[i>>1]=o;break;case"i32":HEAP32[i>>2]=o;break;case"i64":tempI64=[o>>>0,(tempDouble=o,+Math_abs(tempDouble)>=1?tempDouble>0?(Math_min(+Math_floor(tempDouble/4294967296),4294967295)|0)>>>0:~~+Math_ceil((tempDouble-+(~~tempDouble>>>0))/4294967296)>>>0:0)],HEAP32[i>>2]=tempI64[0],HEAP32[i+4>>2]=tempI64[1];break;case"float":HEAPF32[i>>2]=o;break;case"double":HEAPF64[i>>3]=o;break;default:abort("invalid type for setValue: "+a)}}Module.setValue=setValue;function getValue(i,o,a){switch(o=o||"i8",o.charAt(o.length-1)==="*"&&(o="i32"),o){case"i1":return HEAP8[i>>0];case"i8":return HEAP8[i>>0];case"i16":return HEAP16[i>>1];case"i32":return HEAP32[i>>2];case"i64":return HEAP32[i>>2];case"float":return HEAPF32[i>>2];case"double":return HEAPF64[i>>3];default:abort("invalid type for setValue: "+o)}return null}Module.getValue=getValue;var ALLOC_NORMAL=0,ALLOC_STACK=1,ALLOC_STATIC=2,ALLOC_DYNAMIC=3,ALLOC_NONE=4;Module.ALLOC_NORMAL=ALLOC_NORMAL,Module.ALLOC_STACK=ALLOC_STACK,Module.ALLOC_STATIC=ALLOC_STATIC,Module.ALLOC_DYNAMIC=ALLOC_DYNAMIC,Module.ALLOC_NONE=ALLOC_NONE;function allocate(i,o,a,c){var _,t;typeof i=="number"?(_=!0,t=i):(_=!1,t=i.length);var O=typeof o=="string"?o:null,N;if(a==ALLOC_NONE?N=c:N=[typeof _malloc=="function"?_malloc:Runtime.staticAlloc,Runtime.stackAlloc,Runtime.staticAlloc,Runtime.dynamicAlloc][a===void 0?ALLOC_STATIC:a](Math.max(t,O?1:o.length)),_){var c=N,M;for(assert((N&3)==0),M=N+(t&~3);c<M;c+=4)HEAP32[c>>2]=0;for(M=N+t;c<M;)HEAP8[c++>>0]=0;return N}if(O==="i8")return i.subarray||i.slice?HEAPU8.set(i,N):HEAPU8.set(new Uint8Array(i),N),N;for(var T=0,B,H,q;T<t;){var ne=i[T];if(typeof ne=="function"&&(ne=Runtime.getFunctionIndex(ne)),B=O||o[T],B===0){T++;continue}B=="i64"&&(B="i32"),setValue(N+T,ne,B),q!==B&&(H=Runtime.getNativeTypeSize(B),q=B),T+=H}return N}Module.allocate=allocate;function getMemory(i){return staticSealed?runtimeInitialized?_malloc(i):Runtime.dynamicAlloc(i):Runtime.staticAlloc(i)}Module.getMemory=getMemory;function Pointer_stringify(i,o){if(o===0||!i)return"";for(var a=0,c,_=0;c=HEAPU8[i+_>>0],a|=c,!(c==0&&!o||(_++,o&&_==o)););o||(o=_);var t="";if(a<128){for(var O=1024,N;o>0;)N=String.fromCharCode.apply(String,HEAPU8.subarray(i,i+Math.min(o,O))),t=t?t+N:N,i+=O,o-=O;return t}return Module.UTF8ToString(i)}Module.Pointer_stringify=Pointer_stringify;function AsciiToString(i){for(var o="";;){var a=HEAP8[i++>>0];if(!a)return o;o+=String.fromCharCode(a)}}Module.AsciiToString=AsciiToString;function stringToAscii(i,o){return writeAsciiToMemory(i,o,!1)}Module.stringToAscii=stringToAscii;var UTF8Decoder=typeof TextDecoder!="undefined"?new TextDecoder("utf8"):void 0;function UTF8ArrayToString(i,o){for(var a=o;i[a];)++a;if(a-o>16&&i.subarray&&UTF8Decoder)return UTF8Decoder.decode(i.subarray(o,a));for(var c,_,t,O,N,M,T="";;){if(c=i[o++],!c)return T;if(!(c&128)){T+=String.fromCharCode(c);continue}if(_=i[o++]&63,(c&224)==192){T+=String.fromCharCode((c&31)<<6|_);continue}if(t=i[o++]&63,(c&240)==224?c=(c&15)<<12|_<<6|t:(O=i[o++]&63,(c&248)==240?c=(c&7)<<18|_<<12|t<<6|O:(N=i[o++]&63,(c&252)==248?c=(c&3)<<24|_<<18|t<<12|O<<6|N:(M=i[o++]&63,c=(c&1)<<30|_<<24|t<<18|O<<12|N<<6|M))),c<65536)T+=String.fromCharCode(c);else{var B=c-65536;T+=String.fromCharCode(55296|B>>10,56320|B&1023)}}}Module.UTF8ArrayToString=UTF8ArrayToString;function UTF8ToString(i){return UTF8ArrayToString(HEAPU8,i)}Module.UTF8ToString=UTF8ToString;function stringToUTF8Array(i,o,a,c){if(!(c>0))return 0;for(var _=a,t=a+c-1,O=0;O<i.length;++O){var N=i.charCodeAt(O);if(N>=55296&&N<=57343&&(N=65536+((N&1023)<<10)|i.charCodeAt(++O)&1023),N<=127){if(a>=t)break;o[a++]=N}else if(N<=2047){if(a+1>=t)break;o[a++]=192|N>>6,o[a++]=128|N&63}else if(N<=65535){if(a+2>=t)break;o[a++]=224|N>>12,o[a++]=128|N>>6&63,o[a++]=128|N&63}else if(N<=2097151){if(a+3>=t)break;o[a++]=240|N>>18,o[a++]=128|N>>12&63,o[a++]=128|N>>6&63,o[a++]=128|N&63}else if(N<=67108863){if(a+4>=t)break;o[a++]=248|N>>24,o[a++]=128|N>>18&63,o[a++]=128|N>>12&63,o[a++]=128|N>>6&63,o[a++]=128|N&63}else{if(a+5>=t)break;o[a++]=252|N>>30,o[a++]=128|N>>24&63,o[a++]=128|N>>18&63,o[a++]=128|N>>12&63,o[a++]=128|N>>6&63,o[a++]=128|N&63}}return o[a]=0,a-_}Module.stringToUTF8Array=stringToUTF8Array;function stringToUTF8(i,o,a){return stringToUTF8Array(i,HEAPU8,o,a)}Module.stringToUTF8=stringToUTF8;function lengthBytesUTF8(i){for(var o=0,a=0;a<i.length;++a){var c=i.charCodeAt(a);c>=55296&&c<=57343&&(c=65536+((c&1023)<<10)|i.charCodeAt(++a)&1023),c<=127?++o:c<=2047?o+=2:c<=65535?o+=3:c<=2097151?o+=4:c<=67108863?o+=5:o+=6}return o}Module.lengthBytesUTF8=lengthBytesUTF8;var UTF16Decoder=typeof TextDecoder!="undefined"?new TextDecoder("utf-16le"):void 0;function demangle(i){var o=Module.___cxa_demangle||Module.__cxa_demangle;if(o){try{var a=i.substr(1),c=lengthBytesUTF8(a)+1,_=_malloc(c);stringToUTF8(a,_,c);var t=_malloc(4),O=o(_,0,0,t);if(getValue(t,"i32")===0&&O)return Pointer_stringify(O)}catch(N){}finally{_&&_free(_),t&&_free(t),O&&_free(O)}return i}return Runtime.warnOnce("warning: build with  -s DEMANGLE_SUPPORT=1  to link in libcxxabi demangling"),i}function demangleAll(i){var o=/__Z[\w\d_]+/g;return i.replace(o,function(a){var c=demangle(a);return a===c?a:a+" ["+c+"]"})}function jsStackTrace(){var i=new Error;if(!i.stack){try{throw new Error(0)}catch(o){i=o}if(!i.stack)return"(no stack trace available)"}return i.stack.toString()}function stackTrace(){var i=jsStackTrace();return Module.extraStackTrace&&(i+=`
-`+Module.extraStackTrace()),demangleAll(i)}Module.stackTrace=stackTrace;var HEAP,buffer,HEAP8,HEAPU8,HEAP16,HEAPU16,HEAP32,HEAPU32,HEAPF32,HEAPF64;function updateGlobalBufferViews(){Module.HEAP8=HEAP8=new Int8Array(buffer),Module.HEAP16=HEAP16=new Int16Array(buffer),Module.HEAP32=HEAP32=new Int32Array(buffer),Module.HEAPU8=HEAPU8=new Uint8Array(buffer),Module.HEAPU16=HEAPU16=new Uint16Array(buffer),Module.HEAPU32=HEAPU32=new Uint32Array(buffer),Module.HEAPF32=HEAPF32=new Float32Array(buffer),Module.HEAPF64=HEAPF64=new Float64Array(buffer)}var STATIC_BASE,STATICTOP,staticSealed,STACK_BASE,STACKTOP,STACK_MAX,DYNAMIC_BASE,DYNAMICTOP_PTR;STATIC_BASE=STATICTOP=STACK_BASE=STACKTOP=STACK_MAX=DYNAMIC_BASE=DYNAMICTOP_PTR=0,staticSealed=!1;function abortOnCannotGrowMemory(){abort("Cannot enlarge memory arrays. Either (1) compile with  -s TOTAL_MEMORY=X  with X higher than the current value "+TOTAL_MEMORY+", (2) compile with  -s ALLOW_MEMORY_GROWTH=1  which allows increasing the size at runtime but prevents some optimizations, (3) set Module.TOTAL_MEMORY to a higher value before the program runs, or (4) if you want malloc to return NULL (0) instead of this abort, compile with  -s ABORTING_MALLOC=0 ")}function enlargeMemory(){abortOnCannotGrowMemory()}var TOTAL_STACK=Module.TOTAL_STACK||5242880,TOTAL_MEMORY=Module.TOTAL_MEMORY||134217728;TOTAL_MEMORY<TOTAL_STACK&&Module.printErr("TOTAL_MEMORY should be larger than TOTAL_STACK, was "+TOTAL_MEMORY+"! (TOTAL_STACK="+TOTAL_STACK+")"),Module.buffer?buffer=Module.buffer:buffer=new ArrayBuffer(TOTAL_MEMORY),updateGlobalBufferViews();function getTotalMemory(){return TOTAL_MEMORY}if(HEAP32[0]=1668509029,HEAP16[1]=25459,HEAPU8[2]!==115||HEAPU8[3]!==99)throw"Runtime error: expected the system to be little-endian!";Module.HEAP=HEAP,Module.buffer=buffer,Module.HEAP8=HEAP8,Module.HEAP16=HEAP16,Module.HEAP32=HEAP32,Module.HEAPU8=HEAPU8,Module.HEAPU16=HEAPU16,Module.HEAPU32=HEAPU32,Module.HEAPF32=HEAPF32,Module.HEAPF64=HEAPF64;function callRuntimeCallbacks(i){for(;i.length>0;){var o=i.shift();if(typeof o=="function"){o();continue}var a=o.func;typeof a=="number"?o.arg===void 0?Module.dynCall_v(a):Module.dynCall_vi(a,o.arg):a(o.arg===void 0?null:o.arg)}}var __ATPRERUN__=[],__ATINIT__=[],__ATMAIN__=[],__ATEXIT__=[],__ATPOSTRUN__=[],runtimeInitialized=!1,runtimeExited=!1;function preRun(){if(Module.preRun)for(typeof Module.preRun=="function"&&(Module.preRun=[Module.preRun]);Module.preRun.length;)addOnPreRun(Module.preRun.shift());callRuntimeCallbacks(__ATPRERUN__)}function ensureInitRuntime(){runtimeInitialized||(runtimeInitialized=!0,callRuntimeCallbacks(__ATINIT__))}function preMain(){callRuntimeCallbacks(__ATMAIN__)}function exitRuntime(){callRuntimeCallbacks(__ATEXIT__),runtimeExited=!0}function postRun(){if(Module.postRun)for(typeof Module.postRun=="function"&&(Module.postRun=[Module.postRun]);Module.postRun.length;)addOnPostRun(Module.postRun.shift());callRuntimeCallbacks(__ATPOSTRUN__)}function addOnPreRun(i){__ATPRERUN__.unshift(i)}Module.addOnPreRun=addOnPreRun;function addOnInit(i){__ATINIT__.unshift(i)}Module.addOnInit=addOnInit;function addOnPreMain(i){__ATMAIN__.unshift(i)}Module.addOnPreMain=addOnPreMain;function addOnExit(i){__ATEXIT__.unshift(i)}Module.addOnExit=addOnExit;function addOnPostRun(i){__ATPOSTRUN__.unshift(i)}Module.addOnPostRun=addOnPostRun;function intArrayFromString(i,o,a){var c=a>0?a:lengthBytesUTF8(i)+1,_=new Array(c),t=stringToUTF8Array(i,_,0,_.length);return o&&(_.length=t),_}Module.intArrayFromString=intArrayFromString;function intArrayToString(i){for(var o=[],a=0;a<i.length;a++){var c=i[a];c>255&&(c&=255),o.push(String.fromCharCode(c))}return o.join("")}Module.intArrayToString=intArrayToString;function writeStringToMemory(i,o,a){Runtime.warnOnce("writeStringToMemory is deprecated and should not be called! Use stringToUTF8() instead!");var c,_;a&&(_=o+lengthBytesUTF8(i),c=HEAP8[_]),stringToUTF8(i,o,Infinity),a&&(HEAP8[_]=c)}Module.writeStringToMemory=writeStringToMemory;function writeArrayToMemory(i,o){HEAP8.set(i,o)}Module.writeArrayToMemory=writeArrayToMemory;function writeAsciiToMemory(i,o,a){for(var c=0;c<i.length;++c)HEAP8[o++>>0]=i.charCodeAt(c);a||(HEAP8[o>>0]=0)}if(Module.writeAsciiToMemory=writeAsciiToMemory,(!Math.imul||Math.imul(4294967295,5)!==-5)&&(Math.imul=function(o,a){var c=o>>>16,_=o&65535,t=a>>>16,O=a&65535;return _*O+(c*O+_*t<<16)|0}),Math.imul=Math.imul,!Math.fround){var froundBuffer=new Float32Array(1);Math.fround=function(i){return froundBuffer[0]=i,froundBuffer[0]}}Math.fround=Math.fround,Math.clz32||(Math.clz32=function(i){i=i>>>0;for(var o=0;o<32;o++)if(i&1<<31-o)return o;return 32}),Math.clz32=Math.clz32,Math.trunc||(Math.trunc=function(i){return i<0?Math.ceil(i):Math.floor(i)}),Math.trunc=Math.trunc;var Math_abs=Math.abs,Math_cos=Math.cos,Math_sin=Math.sin,Math_tan=Math.tan,Math_acos=Math.acos,Math_asin=Math.asin,Math_atan=Math.atan,Math_atan2=Math.atan2,Math_exp=Math.exp,Math_log=Math.log,Math_sqrt=Math.sqrt,Math_ceil=Math.ceil,Math_floor=Math.floor,Math_pow=Math.pow,Math_imul=Math.imul,Math_fround=Math.fround,Math_round=Math.round,Math_min=Math.min,Math_clz32=Math.clz32,Math_trunc=Math.trunc,runDependencies=0,runDependencyWatcher=null,dependenciesFulfilled=null;function getUniqueRunDependency(i){return i}function addRunDependency(i){runDependencies++,Module.monitorRunDependencies&&Module.monitorRunDependencies(runDependencies)}Module.addRunDependency=addRunDependency;function removeRunDependency(i){if(runDependencies--,Module.monitorRunDependencies&&Module.monitorRunDependencies(runDependencies),runDependencies==0&&(runDependencyWatcher!==null&&(clearInterval(runDependencyWatcher),runDependencyWatcher=null),dependenciesFulfilled)){var o=dependenciesFulfilled;dependenciesFulfilled=null,o()}}Module.removeRunDependency=removeRunDependency,Module.preloadedImages={},Module.preloadedAudios={};var ASM_CONSTS=[function(i,o,a,c,_,t,O,N){return _nbind.callbackSignatureList[i].apply(this,arguments)}];function _emscripten_asm_const_iiiiiiii(i,o,a,c,_,t,O,N){return ASM_CONSTS[i](o,a,c,_,t,O,N)}function _emscripten_asm_const_iiiii(i,o,a,c,_){return ASM_CONSTS[i](o,a,c,_)}function _emscripten_asm_const_iiidddddd(i,o,a,c,_,t,O,N,M){return ASM_CONSTS[i](o,a,c,_,t,O,N,M)}function _emscripten_asm_const_iiididi(i,o,a,c,_,t,O){return ASM_CONSTS[i](o,a,c,_,t,O)}function _emscripten_asm_const_iiii(i,o,a,c){return ASM_CONSTS[i](o,a,c)}function _emscripten_asm_const_iiiid(i,o,a,c,_){return ASM_CONSTS[i](o,a,c,_)}function _emscripten_asm_const_iiiiii(i,o,a,c,_,t){return ASM_CONSTS[i](o,a,c,_,t)}STATIC_BASE=Runtime.GLOBAL_BASE,STATICTOP=STATIC_BASE+12800,__ATINIT__.push({func:function(){__GLOBAL__sub_I_Yoga_cpp()}},{func:function(){__GLOBAL__sub_I_nbind_cc()}},{func:function(){__GLOBAL__sub_I_common_cc()}},{func:function(){__GLOBAL__sub_I_Binding_cc()}}),allocate([0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,127,0,0,192,127,0,0,192,127,0,0,192,127,3,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,3,0,0,0,0,0,192,127,3,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,127,0,0,192,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,127,0,0,0,0,0,0,0,0,255,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,127,0,0,192,127,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,0,0,128,191,0,0,128,191,0,0,192,127,0,0,0,0,0,0,0,0,0,0,128,63,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,3,0,0,0,1,0,0,0,2,0,0,0,0,0,0,0,190,12,0,0,200,12,0,0,208,12,0,0,216,12,0,0,230,12,0,0,242,12,0,0,1,0,0,0,3,0,0,0,0,0,0,0,2,0,0,0,0,0,192,127,3,0,0,0,180,45,0,0,181,45,0,0,182,45,0,0,181,45,0,0,182,45,0,0,0,0,0,0,0,0,0,0,1,0,0,0,2,0,0,0,3,0,0,0,1,0,0,0,4,0,0,0,183,45,0,0,181,45,0,0,181,45,0,0,181,45,0,0,181,45,0,0,181,45,0,0,181,45,0,0,184,45,0,0,185,45,0,0,181,45,0,0,181,45,0,0,182,45,0,0,186,45,0,0,185,45,0,0,148,4,0,0,3,0,0,0,187,45,0,0,164,4,0,0,188,45,0,0,2,0,0,0,189,45,0,0,164,4,0,0,188,45,0,0,185,45,0,0,164,4,0,0,185,45,0,0,164,4,0,0,188,45,0,0,181,45,0,0,182,45,0,0,181,45,0,0,0,0,0,0,0,0,0,0,1,0,0,0,5,0,0,0,6,0,0,0,1,0,0,0,7,0,0,0,183,45,0,0,182,45,0,0,181,45,0,0,190,45,0,0,190,45,0,0,182,45,0,0,182,45,0,0,185,45,0,0,181,45,0,0,185,45,0,0,182,45,0,0,181,45,0,0,185,45,0,0,182,45,0,0,185,45,0,0,48,5,0,0,3,0,0,0,56,5,0,0,1,0,0,0,189,45,0,0,185,45,0,0,164,4,0,0,76,5,0,0,2,0,0,0,191,45,0,0,186,45,0,0,182,45,0,0,185,45,0,0,192,45,0,0,185,45,0,0,182,45,0,0,186,45,0,0,185,45,0,0,76,5,0,0,76,5,0,0,136,5,0,0,182,45,0,0,181,45,0,0,2,0,0,0,190,45,0,0,136,5,0,0,56,19,0,0,156,5,0,0,2,0,0,0,184,45,0,0,0,0,0,0,0,0,0,0,1,0,0,0,8,0,0,0,9,0,0,0,1,0,0,0,10,0,0,0,204,5,0,0,181,45,0,0,181,45,0,0,2,0,0,0,180,45,0,0,204,5,0,0,2,0,0,0,195,45,0,0,236,5,0,0,97,19,0,0,198,45,0,0,211,45,0,0,212,45,0,0,213,45,0,0,214,45,0,0,215,45,0,0,188,45,0,0,182,45,0,0,216,45,0,0,217,45,0,0,218,45,0,0,219,45,0,0,192,45,0,0,181,45,0,0,0,0,0,0,185,45,0,0,110,19,0,0,186,45,0,0,115,19,0,0,221,45,0,0,120,19,0,0,148,4,0,0,132,19,0,0,96,6,0,0,145,19,0,0,222,45,0,0,164,19,0,0,223,45,0,0,173,19,0,0,0,0,0,0,3,0,0,0,104,6,0,0,1,0,0,0,187,45,0,0,0,0,0,0,0,0,0,0,1,0,0,0,11,0,0,0,12,0,0,0,1,0,0,0,13,0,0,0,185,45,0,0,224,45,0,0,164,6,0,0,188,45,0,0,172,6,0,0,180,6,0,0,2,0,0,0,188,6,0,0,7,0,0,0,224,45,0,0,7,0,0,0,164,6,0,0,1,0,0,0,213,45,0,0,185,45,0,0,224,45,0,0,172,6,0,0,185,45,0,0,224,45,0,0,164,6,0,0,185,45,0,0,224,45,0,0,211,45,0,0,211,45,0,0,222,45,0,0,211,45,0,0,224,45,0,0,222,45,0,0,211,45,0,0,224,45,0,0,172,6,0,0,222,45,0,0,211,45,0,0,224,45,0,0,188,45,0,0,222,45,0,0,211,45,0,0,40,7,0,0,188,45,0,0,2,0,0,0,224,45,0,0,185,45,0,0,188,45,0,0,188,45,0,0,188,45,0,0,188,45,0,0,222,45,0,0,224,45,0,0,148,4,0,0,185,45,0,0,148,4,0,0,148,4,0,0,148,4,0,0,148,4,0,0,148,4,0,0,185,45,0,0,164,6,0,0,148,4,0,0,0,0,0,0,0,0,0,0,1,0,0,0,14,0,0,0,15,0,0,0,1,0,0,0,16,0,0,0,148,7,0,0,2,0,0,0,225,45,0,0,183,45,0,0,188,45,0,0,168,7,0,0,5,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,2,0,0,0,234,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,148,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,9,0,0,5,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,2,0,0,0,242,45,0,0,0,4,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,255,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,67,111,117,108,100,32,110,111,116,32,97,108,108,111,99,97,116,101,32,109,101,109,111,114,121,32,102,111,114,32,110,111,100,101,0,67,97,110,110,111,116,32,114,101,115,101,116,32,97,32,110,111,100,101,32,119,104,105,99,104,32,115,116,105,108,108,32,104,97,115,32,99,104,105,108,100,114,101,110,32,97,116,116,97,99,104,101,100,0,67,97,110,110,111,116,32,114,101,115,101,116,32,97,32,110,111,100,101,32,115,116,105,108,108,32,97,116,116,97,99,104,101,100,32,116,111,32,97,32,112,97,114,101,110,116,0,67,111,117,108,100,32,110,111,116,32,97,108,108,111,99,97,116,101,32,109,101,109,111,114,121,32,102,111,114,32,99,111,110,102,105,103,0,67,97,110,110,111,116,32,115,101,116,32,109,101,97,115,117,114,101,32,102,117,110,99,116,105,111,110,58,32,78,111,100,101,115,32,119,105,116,104,32,109,101,97,115,117,114,101,32,102,117,110,99,116,105,111,110,115,32,99,97,110,110,111,116,32,104,97,118,101,32,99,104,105,108,100,114,101,110,46,0,67,104,105,108,100,32,97,108,114,101,97,100,121,32,104,97,115,32,97,32,112,97,114,101,110,116,44,32,105,116,32,109,117,115,116,32,98,101,32,114,101,109,111,118,101,100,32,102,105,114,115,116,46,0,67,97,110,110,111,116,32,97,100,100,32,99,104,105,108,100,58,32,78,111,100,101,115,32,119,105,116,104,32,109,101,97,115,117,114,101,32,102,117,110,99,116,105,111,110,115,32,99,97,110,110,111,116,32,104,97,118,101,32,99,104,105,108,100,114,101,110,46,0,79,110,108,121,32,108,101,97,102,32,110,111,100,101,115,32,119,105,116,104,32,99,117,115,116,111,109,32,109,101,97,115,117,114,101,32,102,117,110,99,116,105,111,110,115,115,104,111,117,108,100,32,109,97,110,117,97,108,108,121,32,109,97,114,107,32,116,104,101,109,115,101,108,118,101,115,32,97,115,32,100,105,114,116,121,0,67,97,110,110,111,116,32,103,101,116,32,108,97,121,111,117,116,32,112,114,111,112,101,114,116,105,101,115,32,111,102,32,109,117,108,116,105,45,101,100,103,101,32,115,104,111,114,116,104,97,110,100,115,0,37,115,37,100,46,123,91,115,107,105,112,112,101,100,93,32,0,119,109,58,32,37,115,44,32,104,109,58,32,37,115,44,32,97,119,58,32,37,102,32,97,104,58,32,37,102,32,61,62,32,100,58,32,40,37,102,44,32,37,102,41,32,37,115,10,0,37,115,37,100,46,123,37,115,0,42,0,119,109,58,32,37,115,44,32,104,109,58,32,37,115,44,32,97,119,58,32,37,102,32,97,104,58,32,37,102,32,37,115,10,0,37,115,37,100,46,125,37,115,0,119,109,58,32,37,115,44,32,104,109,58,32,37,115,44,32,100,58,32,40,37,102,44,32,37,102,41,32,37,115,10,0,79,117,116,32,111,102,32,99,97,99,104,101,32,101,110,116,114,105,101,115,33,10,0,83,99,97,108,101,32,102,97,99,116,111,114,32,115,104,111,117,108,100,32,110,111,116,32,98,101,32,108,101,115,115,32,116,104,97,110,32,122,101,114,111,0,105,110,105,116,105,97,108,0,37,115,10,0,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,0,85,78,68,69,70,73,78,69,68,0,69,88,65,67,84,76,89,0,65,84,95,77,79,83,84,0,76,65,89,95,85,78,68,69,70,73,78,69,68,0,76,65,89,95,69,88,65,67,84,76,89,0,76,65,89,95,65,84,95,77,79,83,84,0,97,118,97,105,108,97,98,108,101,87,105,100,116,104,32,105,115,32,105,110,100,101,102,105,110,105,116,101,32,115,111,32,119,105,100,116,104,77,101,97,115,117,114,101,77,111,100,101,32,109,117,115,116,32,98,101,32,89,71,77,101,97,115,117,114,101,77,111,100,101,85,110,100,101,102,105,110,101,100,0,97,118,97,105,108,97,98,108,101,72,101,105,103,104,116,32,105,115,32,105,110,100,101,102,105,110,105,116,101,32,115,111,32,104,101,105,103,104,116,77,101,97,115,117,114,101,77,111,100,101,32,109,117,115,116,32,98,101,32,89,71,77,101,97,115,117,114,101,77,111,100,101,85,110,100,101,102,105,110,101,100,0,102,108,101,120,0,115,116,114,101,116,99,104,0,109,117,108,116,105,108,105,110,101,45,115,116,114,101,116,99,104,0,69,120,112,101,99,116,101,100,32,110,111,100,101,32,116,111,32,104,97,118,101,32,99,117,115,116,111,109,32,109,101,97,115,117,114,101,32,102,117,110,99,116,105,111,110,0,109,101,97,115,117,114,101,0,69,120,112,101,99,116,32,99,117,115,116,111,109,32,98,97,115,101,108,105,110,101,32,102,117,110,99,116,105,111,110,32,116,111,32,110,111,116,32,114,101,116,117,114,110,32,78,97,78,0,97,98,115,45,109,101,97,115,117,114,101,0,97,98,115,45,108,97,121,111,117,116,0,78,111,100,101,0,99,114,101,97,116,101,68,101,102,97,117,108,116,0,99,114,101,97,116,101,87,105,116,104,67,111,110,102,105,103,0,100,101,115,116,114,111,121,0,114,101,115,101,116,0,99,111,112,121,83,116,121,108,101,0,115,101,116,80,111,115,105,116,105,111,110,84,121,112,101,0,115,101,116,80,111,115,105,116,105,111,110,0,115,101,116,80,111,115,105,116,105,111,110,80,101,114,99,101,110,116,0,115,101,116,65,108,105,103,110,67,111,110,116,101,110,116,0,115,101,116,65,108,105,103,110,73,116,101,109,115,0,115,101,116,65,108,105,103,110,83,101,108,102,0,115,101,116,70,108,101,120,68,105,114,101,99,116,105,111,110,0,115,101,116,70,108,101,120,87,114,97,112,0,115,101,116,74,117,115,116,105,102,121,67,111,110,116,101,110,116,0,115,101,116,77,97,114,103,105,110,0,115,101,116,77,97,114,103,105,110,80,101,114,99,101,110,116,0,115,101,116,77,97,114,103,105,110,65,117,116,111,0,115,101,116,79,118,101,114,102,108,111,119,0,115,101,116,68,105,115,112,108,97,121,0,115,101,116,70,108,101,120,0,115,101,116,70,108,101,120,66,97,115,105,115,0,115,101,116,70,108,101,120,66,97,115,105,115,80,101,114,99,101,110,116,0,115,101,116,70,108,101,120,71,114,111,119,0,115,101,116,70,108,101,120,83,104,114,105,110,107,0,115,101,116,87,105,100,116,104,0,115,101,116,87,105,100,116,104,80,101,114,99,101,110,116,0,115,101,116,87,105,100,116,104,65,117,116,111,0,115,101,116,72,101,105,103,104,116,0,115,101,116,72,101,105,103,104,116,80,101,114,99,101,110,116,0,115,101,116,72,101,105,103,104,116,65,117,116,111,0,115,101,116,77,105,110,87,105,100,116,104,0,115,101,116,77,105,110,87,105,100,116,104,80,101,114,99,101,110,116,0,115,101,116,77,105,110,72,101,105,103,104,116,0,115,101,116,77,105,110,72,101,105,103,104,116,80,101,114,99,101,110,116,0,115,101,116,77,97,120,87,105,100,116,104,0,115,101,116,77,97,120,87,105,100,116,104,80,101,114,99,101,110,116,0,115,101,116,77,97,120,72,101,105,103,104,116,0,115,101,116,77,97,120,72,101,105,103,104,116,80,101,114,99,101,110,116,0,115,101,116,65,115,112,101,99,116,82,97,116,105,111,0,115,101,116,66,111,114,100,101,114,0,115,101,116,80,97,100,100,105,110,103,0,115,101,116,80,97,100,100,105,110,103,80,101,114,99,101,110,116,0,103,101,116,80,111,115,105,116,105,111,110,84,121,112,101,0,103,101,116,80,111,115,105,116,105,111,110,0,103,101,116,65,108,105,103,110,67,111,110,116,101,110,116,0,103,101,116,65,108,105,103,110,73,116,101,109,115,0,103,101,116,65,108,105,103,110,83,101,108,102,0,103,101,116,70,108,101,120,68,105,114,101,99,116,105,111,110,0,103,101,116,70,108,101,120,87,114,97,112,0,103,101,116,74,117,115,116,105,102,121,67,111,110,116,101,110,116,0,103,101,116,77,97,114,103,105,110,0,103,101,116,70,108,101,120,66,97,115,105,115,0,103,101,116,70,108,101,120,71,114,111,119,0,103,101,116,70,108,101,120,83,104,114,105,110,107,0,103,101,116,87,105,100,116,104,0,103,101,116,72,101,105,103,104,116,0,103,101,116,77,105,110,87,105,100,116,104,0,103,101,116,77,105,110,72,101,105,103,104,116,0,103,101,116,77,97,120,87,105,100,116,104,0,103,101,116,77,97,120,72,101,105,103,104,116,0,103,101,116,65,115,112,101,99,116,82,97,116,105,111,0,103,101,116,66,111,114,100,101,114,0,103,101,116,79,118,101,114,102,108,111,119,0,103,101,116,68,105,115,112,108,97,121,0,103,101,116,80,97,100,100,105,110,103,0,105,110,115,101,114,116,67,104,105,108,100,0,114,101,109,111,118,101,67,104,105,108,100,0,103,101,116,67,104,105,108,100,67,111,117,110,116,0,103,101,116,80,97,114,101,110,116,0,103,101,116,67,104,105,108,100,0,115,101,116,77,101,97,115,117,114,101,70,117,110,99,0,117,110,115,101,116,77,101,97,115,117,114,101,70,117,110,99,0,109,97,114,107,68,105,114,116,121,0,105,115,68,105,114,116,121,0,99,97,108,99,117,108,97,116,101,76,97,121,111,117,116,0,103,101,116,67,111,109,112,117,116,101,100,76,101,102,116,0,103,101,116,67,111,109,112,117,116,101,100,82,105,103,104,116,0,103,101,116,67,111,109,112,117,116,101,100,84,111,112,0,103,101,116,67,111,109,112,117,116,101,100,66,111,116,116,111,109,0,103,101,116,67,111,109,112,117,116,101,100,87,105,100,116,104,0,103,101,116,67,111,109,112,117,116,101,100,72,101,105,103,104,116,0,103,101,116,67,111,109,112,117,116,101,100,76,97,121,111,117,116,0,103,101,116,67,111,109,112,117,116,101,100,77,97,114,103,105,110,0,103,101,116,67,111,109,112,117,116,101,100,66,111,114,100,101,114,0,103,101,116,67,111,109,112,117,116,101,100,80,97,100,100,105,110,103,0,67,111,110,102,105,103,0,99,114,101,97,116,101,0,115,101,116,69,120,112,101,114,105,109,101,110,116,97,108,70,101,97,116,117,114,101,69,110,97,98,108,101,100,0,115,101,116,80,111,105,110,116,83,99,97,108,101,70,97,99,116,111,114,0,105,115,69,120,112,101,114,105,109,101,110,116,97,108,70,101,97,116,117,114,101,69,110,97,98,108,101,100,0,86,97,108,117,101,0,76,97,121,111,117,116,0,83,105,122,101,0,103,101,116,73,110,115,116,97,110,99,101,67,111,117,110,116,0,73,110,116,54,52,0,1,1,1,2,2,4,4,4,4,8,8,4,8,118,111,105,100,0,98,111,111,108,0,115,116,100,58,58,115,116,114,105,110,103,0,99,98,70,117,110,99,116,105,111,110,32,38,0,99,111,110,115,116,32,99,98,70,117,110,99,116,105,111,110,32,38,0,69,120,116,101,114,110,97,108,0,66,117,102,102,101,114,0,78,66,105,110,100,73,68,0,78,66,105,110,100,0,98,105,110,100,95,118,97,108,117,101,0,114,101,102,108,101,99,116,0,113,117,101,114,121,84,121,112,101,0,108,97,108,108,111,99,0,108,114,101,115,101,116,0,123,114,101,116,117,114,110,40,95,110,98,105,110,100,46,99,97,108,108,98,97,99,107,83,105,103,110,97,116,117,114,101,76,105,115,116,91,36,48,93,46,97,112,112,108,121,40,116,104,105,115,44,97,114,103,117,109,101,110,116,115,41,41,59,125,0,95,110,98,105,110,100,95,110,101,119,0,17,0,10,0,17,17,17,0,0,0,0,5,0,0,0,0,0,0,9,0,0,0,0,11,0,0,0,0,0,0,0,0,17,0,15,10,17,17,17,3,10,7,0,1,19,9,11,11,0,0,9,6,11,0,0,11,0,6,17,0,0,0,17,17,17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,17,0,10,10,17,17,17,0,10,0,0,2,0,9,11,0,0,0,9,0,11,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,12,0,0,0,0,9,12,0,0,0,0,0,12,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14,0,0,0,0,0,0,0,0,0,0,0,13,0,0,0,4,13,0,0,0,0,9,14,0,0,0,0,0,14,0,0,14,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,15,0,0,0,0,9,16,0,0,0,0,0,16,0,0,16,0,0,18,0,0,0,18,18,18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,0,0,0,18,18,18,0,0,0,0,0,0,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,10,0,0,0,0,10,0,0,0,0,9,11,0,0,0,0,0,11,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,12,0,0,0,0,9,12,0,0,0,0,0,12,0,0,12,0,0,45,43,32,32,32,48,88,48,120,0,40,110,117,108,108,41,0,45,48,88,43,48,88,32,48,88,45,48,120,43,48,120,32,48,120,0,105,110,102,0,73,78,70,0,110,97,110,0,78,65,78,0,48,49,50,51,52,53,54,55,56,57,65,66,67,68,69,70,46,0,84,33,34,25,13,1,2,3,17,75,28,12,16,4,11,29,18,30,39,104,110,111,112,113,98,32,5,6,15,19,20,21,26,8,22,7,40,36,23,24,9,10,14,27,31,37,35,131,130,125,38,42,43,60,61,62,63,67,71,74,77,88,89,90,91,92,93,94,95,96,97,99,100,101,102,103,105,106,107,108,114,115,116,121,122,123,124,0,73,108,108,101,103,97,108,32,98,121,116,101,32,115,101,113,117,101,110,99,101,0,68,111,109,97,105,110,32,101,114,114,111,114,0,82,101,115,117,108,116,32,110,111,116,32,114,101,112,114,101,115,101,110,116,97,98,108,101,0,78,111,116,32,97,32,116,116,121,0,80,101,114,109,105,115,115,105,111,110,32,100,101,110,105,101,100,0,79,112,101,114,97,116,105,111,110,32,110,111,116,32,112,101,114,109,105,116,116,101,100,0,78,111,32,115,117,99,104,32,102,105,108,101,32,111,114,32,100,105,114,101,99,116,111,114,121,0,78,111,32,115,117,99,104,32,112,114,111,99,101,115,115,0,70,105,108,101,32,101,120,105,115,116,115,0,86,97,108,117,101,32,116,111,111,32,108,97,114,103,101,32,102,111,114,32,100,97,116,97,32,116,121,112,101,0,78,111,32,115,112,97,99,101,32,108,101,102,116,32,111,110,32,100,101,118,105,99,101,0,79,117,116,32,111,102,32,109,101,109,111,114,121,0,82,101,115,111,117,114,99,101,32,98,117,115,121,0,73,110,116,101,114,114,117,112,116,101,100,32,115,121,115,116,101,109,32,99,97,108,108,0,82,101,115,111,117,114,99,101,32,116,101,109,112,111,114,97,114,105,108,121,32,117,110,97,118,97,105,108,97,98,108,101,0,73,110,118,97,108,105,100,32,115,101,101,107,0,67,114,111,115,115,45,100,101,118,105,99,101,32,108,105,110,107,0,82,101,97,100,45,111,110,108,121,32,102,105,108,101,32,115,121,115,116,101,109,0,68,105,114,101,99,116,111,114,121,32,110,111,116,32,101,109,112,116,121,0,67,111,110,110,101,99,116,105,111,110,32,114,101,115,101,116,32,98,121,32,112,101,101,114,0,79,112,101,114,97,116,105,111,110,32,116,105,109,101,100,32,111,117,116,0,67,111,110,110,101,99,116,105,111,110,32,114,101,102,117,115,101,100,0,72,111,115,116,32,105,115,32,100,111,119,110,0,72,111,115,116,32,105,115,32,117,110,114,101,97,99,104,97,98,108,101,0,65,100,100,114,101,115,115,32,105,110,32,117,115,101,0,66,114,111,107,101,110,32,112,105,112,101,0,73,47,79,32,101,114,114,111,114,0,78,111,32,115,117,99,104,32,100,101,118,105,99,101,32,111,114,32,97,100,100,114,101,115,115,0,66,108,111,99,107,32,100,101,118,105,99,101,32,114,101,113,117,105,114,101,100,0,78,111,32,115,117,99,104,32,100,101,118,105,99,101,0,78,111,116,32,97,32,100,105,114,101,99,116,111,114,121,0,73,115,32,97,32,100,105,114,101,99,116,111,114,121,0,84,101,120,116,32,102,105,108,101,32,98,117,115,121,0,69,120,101,99,32,102,111,114,109,97,116,32,101,114,114,111,114,0,73,110,118,97,108,105,100,32,97,114,103,117,109,101,110,116,0,65,114,103,117,109,101,110,116,32,108,105,115,116,32,116,111,111,32,108,111,110,103,0,83,121,109,98,111,108,105,99,32,108,105,110,107,32,108,111,111,112,0,70,105,108,101,110,97,109,101,32,116,111,111,32,108,111,110,103,0,84,111,111,32,109,97,110,121,32,111,112,101,110,32,102,105,108,101,115,32,105,110,32,115,121,115,116,101,109,0,78,111,32,102,105,108,101,32,100,101,115,99,114,105,112,116,111,114,115,32,97,118,97,105,108,97,98,108,101,0,66,97,100,32,102,105,108,101,32,100,101,115,99,114,105,112,116,111,114,0,78,111,32,99,104,105,108,100,32,112,114,111,99,101,115,115,0,66,97,100,32,97,100,100,114,101,115,115,0,70,105,108,101,32,116,111,111,32,108,97,114,103,101,0,84,111,111,32,109,97,110,121,32,108,105,110,107,115,0,78,111,32,108,111,99,107,115,32,97,118,97,105,108,97,98,108,101,0,82,101,115,111,117,114,99,101,32,100,101,97,100,108,111,99,107,32,119,111,117,108,100,32,111,99,99,117,114,0,83,116,97,116,101,32,110,111,116,32,114,101,99,111,118,101,114,97,98,108,101,0,80,114,101,118,105,111,117,115,32,111,119,110,101,114,32,100,105,101,100,0,79,112,101,114,97,116,105,111,110,32,99,97,110,99,101,108,101,100,0,70,117,110,99,116,105,111,110,32,110,111,116,32,105,109,112,108,101,109,101,110,116,101,100,0,78,111,32,109,101,115,115,97,103,101,32,111,102,32,100,101,115,105,114,101,100,32,116,121,112,101,0,73,100,101,110,116,105,102,105,101,114,32,114,101,109,111,118,101,100,0,68,101,118,105,99,101,32,110,111,116,32,97,32,115,116,114,101,97,109,0,78,111,32,100,97,116,97,32,97,118,97,105,108,97,98,108,101,0,68,101,118,105,99,101,32,116,105,109,101,111,117,116,0,79,117,116,32,111,102,32,115,116,114,101,97,109,115,32,114,101,115,111,117,114,99,101,115,0,76,105,110,107,32,104,97,115,32,98,101,101,110,32,115,101,118,101,114,101,100,0,80,114,111,116,111,99,111,108,32,101,114,114,111,114,0,66,97,100,32,109,101,115,115,97,103,101,0,70,105,108,101,32,100,101,115,99,114,105,112,116,111,114,32,105,110,32,98,97,100,32,115,116,97,116,101,0,78,111,116,32,97,32,115,111,99,107,101,116,0,68,101,115,116,105,110,97,116,105,111,110,32,97,100,100,114,101,115,115,32,114,101,113,117,105,114,101,100,0,77,101,115,115,97,103,101,32,116,111,111,32,108,97,114,103,101,0,80,114,111,116,111,99,111,108,32,119,114,111,110,103,32,116,121,112,101,32,102,111,114,32,115,111,99,107,101,116,0,80,114,111,116,111,99,111,108,32,110,111,116,32,97,118,97,105,108,97,98,108,101,0,80,114,111,116,111,99,111,108,32,110,111,116,32,115,117,112,112,111,114,116,101,100,0,83,111,99,107,101,116,32,116,121,112,101,32,110,111,116,32,115,117,112,112,111,114,116,101,100,0,78,111,116,32,115,117,112,112,111,114,116,101,100,0,80,114,111,116,111,99,111,108,32,102,97,109,105,108,121,32,110,111,116,32,115,117,112,112,111,114,116,101,100,0,65,100,100,114,101,115,115,32,102,97,109,105,108,121,32,110,111,116,32,115,117,112,112,111,114,116,101,100,32,98,121,32,112,114,111,116,111,99,111,108,0,65,100,100,114,101,115,115,32,110,111,116,32,97,118,97,105,108,97,98,108,101,0,78,101,116,119,111,114,107,32,105,115,32,100,111,119,110,0,78,101,116,119,111,114,107,32,117,110,114,101,97,99,104,97,98,108,101,0,67,111,110,110,101,99,116,105,111,110,32,114,101,115,101,116,32,98,121,32,110,101,116,119,111,114,107,0,67,111,110,110,101,99,116,105,111,110,32,97,98,111,114,116,101,100,0,78,111,32,98,117,102,102,101,114,32,115,112,97,99,101,32,97,118,97,105,108,97,98,108,101,0,83,111,99,107,101,116,32,105,115,32,99,111,110,110,101,99,116,101,100,0,83,111,99,107,101,116,32,110,111,116,32,99,111,110,110,101,99,116,101,100,0,67,97,110,110,111,116,32,115,101,110,100,32,97,102,116,101,114,32,115,111,99,107,101,116,32,115,104,117,116,100,111,119,110,0,79,112,101,114,97,116,105,111,110,32,97,108,114,101,97,100,121,32,105,110,32,112,114,111,103,114,101,115,115,0,79,112,101,114,97,116,105,111,110,32,105,110,32,112,114,111,103,114,101,115,115,0,83,116,97,108,101,32,102,105,108,101,32,104,97,110,100,108,101,0,82,101,109,111,116,101,32,73,47,79,32,101,114,114,111,114,0,81,117,111,116,97,32,101,120,99,101,101,100,101,100,0,78,111,32,109,101,100,105,117,109,32,102,111,117,110,100,0,87,114,111,110,103,32,109,101,100,105,117,109,32,116,121,112,101,0,78,111,32,101,114,114,111,114,32,105,110,102,111,114,109,97,116,105,111,110,0,0],"i8",ALLOC_NONE,Runtime.GLOBAL_BASE);var tempDoublePtr=STATICTOP;STATICTOP+=16;function _atexit(i,o){__ATEXIT__.unshift({func:i,arg:o})}function ___cxa_atexit(){return _atexit.apply(null,arguments)}function _abort(){Module.abort()}function __ZN8facebook4yoga14YGNodeToStringEPNSt3__212basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEP6YGNode14YGPrintOptionsj(){Module.printErr("missing function: _ZN8facebook4yoga14YGNodeToStringEPNSt3__212basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEP6YGNode14YGPrintOptionsj"),abort(-1)}function __decorate(i,o,a,c){var _=arguments.length,t=_<3?o:c===null?c=Object.getOwnPropertyDescriptor(o,a):c,O;if(typeof Reflect=="object"&&typeof Reflect.decorate=="function")t=Reflect.decorate(i,o,a,c);else for(var N=i.length-1;N>=0;N--)(O=i[N])&&(t=(_<3?O(t):_>3?O(o,a,t):O(o,a))||t);return _>3&&t&&Object.defineProperty(o,a,t),t}function _defineHidden(i){return function(o,a){Object.defineProperty(o,a,{configurable:!1,enumerable:!1,value:i,writable:!0})}}var _nbind={};function __nbind_free_external(i){_nbind.externalList[i].dereference(i)}function __nbind_reference_external(i){_nbind.externalList[i].reference()}function _llvm_stackrestore(i){var o=_llvm_stacksave,a=o.LLVM_SAVEDSTACKS[i];o.LLVM_SAVEDSTACKS.splice(i,1),Runtime.stackRestore(a)}function __nbind_register_pool(i,o,a,c){_nbind.Pool.pageSize=i,_nbind.Pool.usedPtr=o/4,_nbind.Pool.rootPtr=a,_nbind.Pool.pagePtr=c/4,HEAP32[o/4]=16909060,HEAP8[o]==1&&(_nbind.bigEndian=!0),HEAP32[o/4]=0,_nbind.makeTypeKindTbl=(t={},t[1024]=_nbind.PrimitiveType,t[64]=_nbind.Int64Type,t[2048]=_nbind.BindClass,t[3072]=_nbind.BindClassPtr,t[4096]=_nbind.SharedClassPtr,t[5120]=_nbind.ArrayType,t[6144]=_nbind.ArrayType,t[7168]=_nbind.CStringType,t[9216]=_nbind.CallbackType,t[10240]=_nbind.BindType,t),_nbind.makeTypeNameTbl={Buffer:_nbind.BufferType,External:_nbind.ExternalType,Int64:_nbind.Int64Type,_nbind_new:_nbind.CreateValueType,bool:_nbind.BooleanType,"cbFunction &":_nbind.CallbackType,"const cbFunction &":_nbind.CallbackType,"const std::string &":_nbind.StringType,"std::string":_nbind.StringType},Module.toggleLightGC=_nbind.toggleLightGC,_nbind.callUpcast=Module.dynCall_ii;var _=_nbind.makeType(_nbind.constructType,{flags:2048,id:0,name:""});_.proto=Module,_nbind.BindClass.list.push(_);var t}function _emscripten_set_main_loop_timing(i,o){if(Browser.mainLoop.timingMode=i,Browser.mainLoop.timingValue=o,!Browser.mainLoop.func)return 1;if(i==0)Browser.mainLoop.scheduler=function(){var O=Math.max(0,Browser.mainLoop.tickStartTime+o-_emscripten_get_now())|0;setTimeout(Browser.mainLoop.runner,O)},Browser.mainLoop.method="timeout";else if(i==1)Browser.mainLoop.scheduler=function(){Browser.requestAnimationFrame(Browser.mainLoop.runner)},Browser.mainLoop.method="rAF";else if(i==2){if(!window.setImmediate){let t=function(O){O.source===window&&O.data===c&&(O.stopPropagation(),a.shift()())};var _=t,a=[],c="setimmediate";window.addEventListener("message",t,!0),window.setImmediate=function(N){a.push(N),ENVIRONMENT_IS_WORKER?(Module.setImmediates===void 0&&(Module.setImmediates=[]),Module.setImmediates.push(N),window.postMessage({target:c})):window.postMessage(c,"*")}}Browser.mainLoop.scheduler=function(){window.setImmediate(Browser.mainLoop.runner)},Browser.mainLoop.method="immediate"}return 0}function _emscripten_get_now(){abort()}function _emscripten_set_main_loop(i,o,a,c,_){Module.noExitRuntime=!0,assert(!Browser.mainLoop.func,"emscripten_set_main_loop: there can only be one main loop function at once: call emscripten_cancel_main_loop to cancel the previous one before setting a new one with different parameters."),Browser.mainLoop.func=i,Browser.mainLoop.arg=c;var t;typeof c!="undefined"?t=function(){Module.dynCall_vi(i,c)}:t=function(){Module.dynCall_v(i)};var O=Browser.mainLoop.currentlyRunningMainloop;if(Browser.mainLoop.runner=function(){if(!ABORT){if(Browser.mainLoop.queue.length>0){var M=Date.now(),T=Browser.mainLoop.queue.shift();if(T.func(T.arg),Browser.mainLoop.remainingBlockers){var B=Browser.mainLoop.remainingBlockers,H=B%1==0?B-1:Math.floor(B);T.counted?Browser.mainLoop.remainingBlockers=H:(H=H+.5,Browser.mainLoop.remainingBlockers=(8*B+H)/9)}if(console.log('main loop blocker "'+T.name+'" took '+(Date.now()-M)+" ms"),Browser.mainLoop.updateStatus(),O<Browser.mainLoop.currentlyRunningMainloop)return;setTimeout(Browser.mainLoop.runner,0);return}if(!(O<Browser.mainLoop.currentlyRunningMainloop)){if(Browser.mainLoop.currentFrameNumber=Browser.mainLoop.currentFrameNumber+1|0,Browser.mainLoop.timingMode==1&&Browser.mainLoop.timingValue>1&&Browser.mainLoop.currentFrameNumber%Browser.mainLoop.timingValue!=0){Browser.mainLoop.scheduler();return}else Browser.mainLoop.timingMode==0&&(Browser.mainLoop.tickStartTime=_emscripten_get_now());Browser.mainLoop.method==="timeout"&&Module.ctx&&(Module.printErr("Looks like you are rendering without using requestAnimationFrame for the main loop. You should use 0 for the frame rate in emscripten_set_main_loop in order to use requestAnimationFrame, as that can greatly improve your frame rates!"),Browser.mainLoop.method=""),Browser.mainLoop.runIter(t),!(O<Browser.mainLoop.currentlyRunningMainloop)&&(typeof SDL=="object"&&SDL.audio&&SDL.audio.queueNewAudioData&&SDL.audio.queueNewAudioData(),Browser.mainLoop.scheduler())}}},_||(o&&o>0?_emscripten_set_main_loop_timing(0,1e3/o):_emscripten_set_main_loop_timing(1,1),Browser.mainLoop.scheduler()),a)throw"SimulateInfiniteLoop"}var Browser={mainLoop:{scheduler:null,method:"",currentlyRunningMainloop:0,func:null,arg:0,timingMode:0,timingValue:0,currentFrameNumber:0,queue:[],pause:function(){Browser.mainLoop.scheduler=null,Browser.mainLoop.currentlyRunningMainloop++},resume:function(){Browser.mainLoop.currentlyRunningMainloop++;var i=Browser.mainLoop.timingMode,o=Browser.mainLoop.timingValue,a=Browser.mainLoop.func;Browser.mainLoop.func=null,_emscripten_set_main_loop(a,0,!1,Browser.mainLoop.arg,!0),_emscripten_set_main_loop_timing(i,o),Browser.mainLoop.scheduler()},updateStatus:function(){if(Module.setStatus){var i=Module.statusMessage||"Please wait...",o=Browser.mainLoop.remainingBlockers,a=Browser.mainLoop.expectedBlockers;o?o<a?Module.setStatus(i+" ("+(a-o)+"/"+a+")"):Module.setStatus(i):Module.setStatus("")}},runIter:function(i){if(!ABORT){if(Module.preMainLoop){var o=Module.preMainLoop();if(o===!1)return}try{i()}catch(a){if(a instanceof ExitStatus)return;throw a&&typeof a=="object"&&a.stack&&Module.printErr("exception thrown: "+[a,a.stack]),a}Module.postMainLoop&&Module.postMainLoop()}}},isFullscreen:!1,pointerLock:!1,moduleContextCreatedCallbacks:[],workers:[],init:function(){if(Module.preloadPlugins||(Module.preloadPlugins=[]),Browser.initted)return;Browser.initted=!0;try{new Blob,Browser.hasBlobConstructor=!0}catch(_){Browser.hasBlobConstructor=!1,console.log("warning: no blob constructor, cannot create blobs with mimetypes")}Browser.BlobBuilder=typeof MozBlobBuilder!="undefined"?MozBlobBuilder:typeof WebKitBlobBuilder!="undefined"?WebKitBlobBuilder:Browser.hasBlobConstructor?null:console.log("warning: no BlobBuilder"),Browser.URLObject=typeof window!="undefined"?window.URL?window.URL:window.webkitURL:void 0,!Module.noImageDecoding&&typeof Browser.URLObject=="undefined"&&(console.log("warning: Browser does not support creating object URLs. Built-in browser image decoding will not be available."),Module.noImageDecoding=!0);var i={};i.canHandle=function(t){return!Module.noImageDecoding&&/\.(jpg|jpeg|png|bmp)$/i.test(t)},i.handle=function(t,O,N,M){var T=null;if(Browser.hasBlobConstructor)try{T=new Blob([t],{type:Browser.getMimetype(O)}),T.size!==t.length&&(T=new Blob([new Uint8Array(t).buffer],{type:Browser.getMimetype(O)}))}catch(ne){Runtime.warnOnce("Blob constructor present but fails: "+ne+"; falling back to blob builder")}if(!T){var B=new Browser.BlobBuilder;B.append(new Uint8Array(t).buffer),T=B.getBlob()}var H=Browser.URLObject.createObjectURL(T),q=new Image;q.onload=function(){assert(q.complete,"Image "+O+" could not be decoded");var m=document.createElement("canvas");m.width=q.width,m.height=q.height;var he=m.getContext("2d");he.drawImage(q,0,0),Module.preloadedImages[O]=m,Browser.URLObject.revokeObjectURL(H),N&&N(t)},q.onerror=function(m){console.log("Image "+H+" could not be decoded"),M&&M()},q.src=H},Module.preloadPlugins.push(i);var o={};o.canHandle=function(t){return!Module.noAudioDecoding&&t.substr(-4)in{".ogg":1,".wav":1,".mp3":1}},o.handle=function(t,O,N,M){var T=!1;function B(he){T||(T=!0,Module.preloadedAudios[O]=he,N&&N(t))}function H(){T||(T=!0,Module.preloadedAudios[O]=new Audio,M&&M())}if(Browser.hasBlobConstructor){try{var q=new Blob([t],{type:Browser.getMimetype(O)})}catch(he){return H()}var ne=Browser.URLObject.createObjectURL(q),m=new Audio;m.addEventListener("canplaythrough",function(){B(m)},!1),m.onerror=function(De){if(T)return;console.log("warning: browser could not fully decode audio "+O+", trying slower base64 approach");function se(fe){for(var _e="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",ce="=",me="",ie=0,Oe=0,Ue=0;Ue<fe.length;Ue++)for(ie=ie<<8|fe[Ue],Oe+=8;Oe>=6;){var je=ie>>Oe-6&63;Oe-=6,me+=_e[je]}return Oe==2?(me+=_e[(ie&3)<<4],me+=ce+ce):Oe==4&&(me+=_e[(ie&15)<<2],me+=ce),me}m.src="data:audio/x-"+O.substr(-3)+";base64,"+se(t),B(m)},m.src=ne,Browser.safeSetTimeout(function(){B(m)},1e4)}else return H()},Module.preloadPlugins.push(o);function a(){Browser.pointerLock=document.pointerLockElement===Module.canvas||document.mozPointerLockElement===Module.canvas||document.webkitPointerLockElement===Module.canvas||document.msPointerLockElement===Module.canvas}var c=Module.canvas;c&&(c.requestPointerLock=c.requestPointerLock||c.mozRequestPointerLock||c.webkitRequestPointerLock||c.msRequestPointerLock||function(){},c.exitPointerLock=document.exitPointerLock||document.mozExitPointerLock||document.webkitExitPointerLock||document.msExitPointerLock||function(){},c.exitPointerLock=c.exitPointerLock.bind(document),document.addEventListener("pointerlockchange",a,!1),document.addEventListener("mozpointerlockchange",a,!1),document.addEventListener("webkitpointerlockchange",a,!1),document.addEventListener("mspointerlockchange",a,!1),Module.elementPointerLock&&c.addEventListener("click",function(_){!Browser.pointerLock&&Module.canvas.requestPointerLock&&(Module.canvas.requestPointerLock(),_.preventDefault())},!1))},createContext:function(i,o,a,c){if(o&&Module.ctx&&i==Module.canvas)return Module.ctx;var _,t;if(o){var O={antialias:!1,alpha:!1};if(c)for(var N in c)O[N]=c[N];t=GL.createContext(i,O),t&&(_=GL.getContext(t).GLctx)}else _=i.getContext("2d");return _?(a&&(o||assert(typeof GLctx=="undefined","cannot set in module if GLctx is used, but we are a non-GL context that would replace it"),Module.ctx=_,o&&GL.makeContextCurrent(t),Module.useWebGL=o,Browser.moduleContextCreatedCallbacks.forEach(function(M){M()}),Browser.init()),_):null},destroyContext:function(i,o,a){},fullscreenHandlersInstalled:!1,lockPointer:void 0,resizeCanvas:void 0,requestFullscreen:function(i,o,a){Browser.lockPointer=i,Browser.resizeCanvas=o,Browser.vrDevice=a,typeof Browser.lockPointer=="undefined"&&(Browser.lockPointer=!0),typeof Browser.resizeCanvas=="undefined"&&(Browser.resizeCanvas=!1),typeof Browser.vrDevice=="undefined"&&(Browser.vrDevice=null);var c=Module.canvas;function _(){Browser.isFullscreen=!1;var O=c.parentNode;(document.fullscreenElement||document.mozFullScreenElement||document.msFullscreenElement||document.webkitFullscreenElement||document.webkitCurrentFullScreenElement)===O?(c.exitFullscreen=document.exitFullscreen||document.cancelFullScreen||document.mozCancelFullScreen||document.msExitFullscreen||document.webkitCancelFullScreen||function(){},c.exitFullscreen=c.exitFullscreen.bind(document),Browser.lockPointer&&c.requestPointerLock(),Browser.isFullscreen=!0,Browser.resizeCanvas&&Browser.setFullscreenCanvasSize()):(O.parentNode.insertBefore(c,O),O.parentNode.removeChild(O),Browser.resizeCanvas&&Browser.setWindowedCanvasSize()),Module.onFullScreen&&Module.onFullScreen(Browser.isFullscreen),Module.onFullscreen&&Module.onFullscreen(Browser.isFullscreen),Browser.updateCanvasDimensions(c)}Browser.fullscreenHandlersInstalled||(Browser.fullscreenHandlersInstalled=!0,document.addEventListener("fullscreenchange",_,!1),document.addEventListener("mozfullscreenchange",_,!1),document.addEventListener("webkitfullscreenchange",_,!1),document.addEventListener("MSFullscreenChange",_,!1));var t=document.createElement("div");c.parentNode.insertBefore(t,c),t.appendChild(c),t.requestFullscreen=t.requestFullscreen||t.mozRequestFullScreen||t.msRequestFullscreen||(t.webkitRequestFullscreen?function(){t.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT)}:null)||(t.webkitRequestFullScreen?function(){t.webkitRequestFullScreen(Element.ALLOW_KEYBOARD_INPUT)}:null),a?t.requestFullscreen({vrDisplay:a}):t.requestFullscreen()},requestFullScreen:function(i,o,a){return Module.printErr("Browser.requestFullScreen() is deprecated. Please call Browser.requestFullscreen instead."),Browser.requestFullScreen=function(c,_,t){return Browser.requestFullscreen(c,_,t)},Browser.requestFullscreen(i,o,a)},nextRAF:0,fakeRequestAnimationFrame:function(i){var o=Date.now();if(Browser.nextRAF===0)Browser.nextRAF=o+1e3/60;else for(;o+2>=Browser.nextRAF;)Browser.nextRAF+=1e3/60;var a=Math.max(Browser.nextRAF-o,0);setTimeout(i,a)},requestAnimationFrame:function(o){typeof window=="undefined"?Browser.fakeRequestAnimationFrame(o):(window.requestAnimationFrame||(window.requestAnimationFrame=window.requestAnimationFrame||window.mozRequestAnimationFrame||window.webkitRequestAnimationFrame||window.msRequestAnimationFrame||window.oRequestAnimationFrame||Browser.fakeRequestAnimationFrame),window.requestAnimationFrame(o))},safeCallback:function(i){return function(){if(!ABORT)return i.apply(null,arguments)}},allowAsyncCallbacks:!0,queuedAsyncCallbacks:[],pauseAsyncCallbacks:function(){Browser.allowAsyncCallbacks=!1},resumeAsyncCallbacks:function(){if(Browser.allowAsyncCallbacks=!0,Browser.queuedAsyncCallbacks.length>0){var i=Browser.queuedAsyncCallbacks;Browser.queuedAsyncCallbacks=[],i.forEach(function(o){o()})}},safeRequestAnimationFrame:function(i){return Browser.requestAnimationFrame(function(){ABORT||(Browser.allowAsyncCallbacks?i():Browser.queuedAsyncCallbacks.push(i))})},safeSetTimeout:function(i,o){return Module.noExitRuntime=!0,setTimeout(function(){ABORT||(Browser.allowAsyncCallbacks?i():Browser.queuedAsyncCallbacks.push(i))},o)},safeSetInterval:function(i,o){return Module.noExitRuntime=!0,setInterval(function(){ABORT||Browser.allowAsyncCallbacks&&i()},o)},getMimetype:function(i){return{jpg:"image/jpeg",jpeg:"image/jpeg",png:"image/png",bmp:"image/bmp",ogg:"audio/ogg",wav:"audio/wav",mp3:"audio/mpeg"}[i.substr(i.lastIndexOf(".")+1)]},getUserMedia:function(i){window.getUserMedia||(window.getUserMedia=navigator.getUserMedia||navigator.mozGetUserMedia),window.getUserMedia(i)},getMovementX:function(i){return i.movementX||i.mozMovementX||i.webkitMovementX||0},getMovementY:function(i){return i.movementY||i.mozMovementY||i.webkitMovementY||0},getMouseWheelDelta:function(i){var o=0;switch(i.type){case"DOMMouseScroll":o=i.detail;break;case"mousewheel":o=i.wheelDelta;break;case"wheel":o=i.deltaY;break;default:throw"unrecognized mouse wheel event: "+i.type}return o},mouseX:0,mouseY:0,mouseMovementX:0,mouseMovementY:0,touches:{},lastTouches:{},calculateMouseEvent:function(i){if(Browser.pointerLock)i.type!="mousemove"&&"mozMovementX"in i?Browser.mouseMovementX=Browser.mouseMovementY=0:(Browser.mouseMovementX=Browser.getMovementX(i),Browser.mouseMovementY=Browser.getMovementY(i)),typeof SDL!="undefined"?(Browser.mouseX=SDL.mouseX+Browser.mouseMovementX,Browser.mouseY=SDL.mouseY+Browser.mouseMovementY):(Browser.mouseX+=Browser.mouseMovementX,Browser.mouseY+=Browser.mouseMovementY);else{var o=Module.canvas.getBoundingClientRect(),a=Module.canvas.width,c=Module.canvas.height,_=typeof window.scrollX!="undefined"?window.scrollX:window.pageXOffset,t=typeof window.scrollY!="undefined"?window.scrollY:window.pageYOffset;if(i.type==="touchstart"||i.type==="touchend"||i.type==="touchmove"){var O=i.touch;if(O===void 0)return;var N=O.pageX-(_+o.left),M=O.pageY-(t+o.top);N=N*(a/o.width),M=M*(c/o.height);var T={x:N,y:M};if(i.type==="touchstart")Browser.lastTouches[O.identifier]=T,Browser.touches[O.identifier]=T;else if(i.type==="touchend"||i.type==="touchmove"){var B=Browser.touches[O.identifier];B||(B=T),Browser.lastTouches[O.identifier]=B,Browser.touches[O.identifier]=T}return}var H=i.pageX-(_+o.left),q=i.pageY-(t+o.top);H=H*(a/o.width),q=q*(c/o.height),Browser.mouseMovementX=H-Browser.mouseX,Browser.mouseMovementY=q-Browser.mouseY,Browser.mouseX=H,Browser.mouseY=q}},asyncLoad:function(i,o,a,c){var _=c?"":getUniqueRunDependency("al "+i);Module.readAsync(i,function(t){assert(t,'Loading data file "'+i+'" failed (no arrayBuffer).'),o(new Uint8Array(t)),_&&removeRunDependency(_)},function(t){if(a)a();else throw'Loading data file "'+i+'" failed.'}),_&&addRunDependency(_)},resizeListeners:[],updateResizeListeners:function(){var i=Module.canvas;Browser.resizeListeners.forEach(function(o){o(i.width,i.height)})},setCanvasSize:function(i,o,a){var c=Module.canvas;Browser.updateCanvasDimensions(c,i,o),a||Browser.updateResizeListeners()},windowedWidth:0,windowedHeight:0,setFullscreenCanvasSize:function(){if(typeof SDL!="undefined"){var i=HEAPU32[SDL.screen+Runtime.QUANTUM_SIZE*0>>2];i=i|8388608,HEAP32[SDL.screen+Runtime.QUANTUM_SIZE*0>>2]=i}Browser.updateResizeListeners()},setWindowedCanvasSize:function(){if(typeof SDL!="undefined"){var i=HEAPU32[SDL.screen+Runtime.QUANTUM_SIZE*0>>2];i=i&~8388608,HEAP32[SDL.screen+Runtime.QUANTUM_SIZE*0>>2]=i}Browser.updateResizeListeners()},updateCanvasDimensions:function(i,o,a){o&&a?(i.widthNative=o,i.heightNative=a):(o=i.widthNative,a=i.heightNative);var c=o,_=a;if(Module.forcedAspectRatio&&Module.forcedAspectRatio>0&&(c/_<Module.forcedAspectRatio?c=Math.round(_*Module.forcedAspectRatio):_=Math.round(c/Module.forcedAspectRatio)),(document.fullscreenElement||document.mozFullScreenElement||document.msFullscreenElement||document.webkitFullscreenElement||document.webkitCurrentFullScreenElement)===i.parentNode&&typeof screen!="undefined"){var t=Math.min(screen.width/c,screen.height/_);c=Math.round(c*t),_=Math.round(_*t)}Browser.resizeCanvas?(i.width!=c&&(i.width=c),i.height!=_&&(i.height=_),typeof i.style!="undefined"&&(i.style.removeProperty("width"),i.style.removeProperty("height"))):(i.width!=o&&(i.width=o),i.height!=a&&(i.height=a),typeof i.style!="undefined"&&(c!=o||_!=a?(i.style.setProperty("width",c+"px","important"),i.style.setProperty("height",_+"px","important")):(i.style.removeProperty("width"),i.style.removeProperty("height"))))},wgetRequests:{},nextWgetRequestHandle:0,getNextWgetRequestHandle:function(){var i=Browser.nextWgetRequestHandle;return Browser.nextWgetRequestHandle++,i}},SYSCALLS={varargs:0,get:function(i){SYSCALLS.varargs+=4;var o=HEAP32[SYSCALLS.varargs-4>>2];return o},getStr:function(){var i=Pointer_stringify(SYSCALLS.get());return i},get64:function(){var i=SYSCALLS.get(),o=SYSCALLS.get();return i>=0?assert(o===0):assert(o===-1),i},getZero:function(){assert(SYSCALLS.get()===0)}};function ___syscall6(i,o){SYSCALLS.varargs=o;try{var a=SYSCALLS.getStreamFromFD();return FS.close(a),0}catch(c){return(typeof FS=="undefined"||!(c instanceof FS.ErrnoError))&&abort(c),-c.errno}}function ___syscall54(i,o){SYSCALLS.varargs=o;try{return 0}catch(a){return(typeof FS=="undefined"||!(a instanceof FS.ErrnoError))&&abort(a),-a.errno}}function _typeModule(i){var o=[[0,1,"X"],[1,1,"const X"],[128,1,"X *"],[256,1,"X &"],[384,1,"X &&"],[512,1,"std::shared_ptr<X>"],[640,1,"std::unique_ptr<X>"],[5120,1,"std::vector<X>"],[6144,2,"std::array<X, Y>"],[9216,-1,"std::function<X (Y)>"]];function a(M,T,B,H,q,ne){if(T==1){var m=H&896;(m==128||m==256||m==384)&&(M="X const")}var he;return ne?he=B.replace("X",M).replace("Y",q):he=M.replace("X",B).replace("Y",q),he.replace(/([*&]) (?=[*&])/g,"$1")}function c(M,T,B,H,q){throw new Error(M+" type "+B.replace("X",T+"?")+(H?" with flag "+H:"")+" in "+q)}function _(M,T,B,H,q,ne,m,he){ne===void 0&&(ne="X"),he===void 0&&(he=1);var De=B(M);if(De)return De;var se=H(M),fe=se.placeholderFlag,_e=o[fe];m&&_e&&(ne=a(m[2],m[0],ne,_e[0],"?",!0));var ce;fe==0&&(ce="Unbound"),fe>=10&&(ce="Corrupt"),he>20&&(ce="Deeply nested"),ce&&c(ce,M,ne,fe,q||"?");var me=se.paramList[0],ie=_(me,T,B,H,q,ne,_e,he+1),Oe,Ue={flags:_e[0],id:M,name:"",paramList:[ie]},je=[],at="?";switch(se.placeholderFlag){case 1:Oe=ie.spec;break;case 2:if((ie.flags&15360)==1024&&ie.spec.ptrSize==1){Ue.flags=7168;break}case 3:case 6:case 5:Oe=ie.spec,(ie.flags&15360)!=2048;break;case 8:at=""+se.paramList[1],Ue.paramList.push(se.paramList[1]);break;case 9:for(var Dt=0,Qe=se.paramList[1];Dt<Qe.length;Dt++){var ut=Qe[Dt],Ve=_(ut,T,B,H,q,ne,_e,he+1);je.push(Ve.name),Ue.paramList.push(Ve)}at=je.join(", ");break;default:break}if(Ue.name=a(_e[2],_e[0],ie.name,ie.flags,at),Oe){for(var It=0,Xt=Object.keys(Oe);It<Xt.length;It++){var rt=Xt[It];Ue[rt]=Ue[rt]||Oe[rt]}Ue.flags|=Oe.flags}return t(T,Ue)}function t(M,T){var B=T.flags,H=B&896,q=B&15360;return!T.name&&q==1024&&(T.ptrSize==1?T.name=(B&16?"":(B&8?"un":"")+"signed ")+"char":T.name=(B&8?"u":"")+(B&32?"float":"int")+(T.ptrSize*8+"_t")),T.ptrSize==8&&!(B&32)&&(q=64),q==2048&&(H==512||H==640?q=4096:H&&(q=3072)),M(q,T)}var O=function(){function M(T){this.id=T.id,this.name=T.name,this.flags=T.flags,this.spec=T}return M.prototype.toString=function(){return this.name},M}(),N={Type:O,getComplexType:_,makeType:t,structureList:o};return i.output=N,i.output||N}function __nbind_register_type(i,o){var a=_nbind.readAsciiString(o),c={flags:10240,id:i,name:a};_nbind.makeType(_nbind.constructType,c)}function __nbind_register_callback_signature(i,o){var a=_nbind.readTypeIdList(i,o),c=_nbind.callbackSignatureList.length;return _nbind.callbackSignatureList[c]=_nbind.makeJSCaller(a),c}function __extends(i,o){for(var a in o)o.hasOwnProperty(a)&&(i[a]=o[a]);function c(){this.constructor=i}c.prototype=o.prototype,i.prototype=new c}function __nbind_register_class(i,o,a,c,_,t,O){var N=_nbind.readAsciiString(O),M=_nbind.readPolicyList(o),T=HEAPU32.subarray(i/4,i/4+2),B={flags:2048|(M.Value?2:0),id:T[0],name:N},H=_nbind.makeType(_nbind.constructType,B);H.ptrType=_nbind.getComplexType(T[1],_nbind.constructType,_nbind.getType,_nbind.queryType),H.destroy=_nbind.makeMethodCaller(H.ptrType,{boundID:B.id,flags:0,name:"destroy",num:0,ptr:t,title:H.name+".free",typeList:["void","uint32_t","uint32_t"]}),_&&(H.superIdList=Array.prototype.slice.call(HEAPU32.subarray(a/4,a/4+_)),H.upcastList=Array.prototype.slice.call(HEAPU32.subarray(c/4,c/4+_))),Module[H.name]=H.makeBound(M),_nbind.BindClass.list.push(H)}function _removeAccessorPrefix(i){var o=/^[Gg]et_?([A-Z]?([A-Z]?))/;return i.replace(o,function(a,c,_){return _?c:c.toLowerCase()})}function __nbind_register_function(i,o,a,c,_,t,O,N,M,T){var B=_nbind.getType(i),H=_nbind.readPolicyList(o),q=_nbind.readTypeIdList(a,c),ne;if(O==5)ne=[{direct:_,name:"__nbindConstructor",ptr:0,title:B.name+" constructor",typeList:["uint32_t"].concat(q.slice(1))},{direct:t,name:"__nbindValueConstructor",ptr:0,title:B.name+" value constructor",typeList:["void","uint32_t"].concat(q.slice(1))}];else{var m=_nbind.readAsciiString(N),he=(B.name&&B.name+".")+m;(O==3||O==4)&&(m=_removeAccessorPrefix(m)),ne=[{boundID:i,direct:t,name:m,ptr:_,title:he,typeList:q}]}for(var De=0,se=ne;De<se.length;De++){var fe=se[De];fe.signatureType=O,fe.policyTbl=H,fe.num=M,fe.flags=T,B.addMethod(fe)}}function _nbind_value(i,o){_nbind.typeNameTbl[i]||_nbind.throwError("Unknown value type "+i),Module.NBind.bind_value(i,o),_defineHidden(_nbind.typeNameTbl[i].proto.prototype.__nbindValueConstructor)(o.prototype,"__nbindValueConstructor")}Module._nbind_value=_nbind_value;function __nbind_get_value_object(i,o){var a=_nbind.popValue(i);if(!a.fromJS)throw new Error("Object "+a+" has no fromJS function");a.fromJS(function(){a.__nbindValueConstructor.apply(this,Array.prototype.concat.apply([o],arguments))})}function _emscripten_memcpy_big(i,o,a){return HEAPU8.set(HEAPU8.subarray(o,o+a),i),i}function __nbind_register_primitive(i,o,a){var c={flags:1024|a,id:i,ptrSize:o};_nbind.makeType(_nbind.constructType,c)}var cttz_i8=allocate([8,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,6,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,7,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,6,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0],"i8",ALLOC_STATIC);function ___setErrNo(i){return Module.___errno_location&&(HEAP32[Module.___errno_location()>>2]=i),i}function _llvm_stacksave(){var i=_llvm_stacksave;return i.LLVM_SAVEDSTACKS||(i.LLVM_SAVEDSTACKS=[]),i.LLVM_SAVEDSTACKS.push(Runtime.stackSave()),i.LLVM_SAVEDSTACKS.length-1}function ___syscall140(i,o){SYSCALLS.varargs=o;try{var a=SYSCALLS.getStreamFromFD(),c=SYSCALLS.get(),_=SYSCALLS.get(),t=SYSCALLS.get(),O=SYSCALLS.get(),N=_;return FS.llseek(a,N,O),HEAP32[t>>2]=a.position,a.getdents&&N===0&&O===0&&(a.getdents=null),0}catch(M){return(typeof FS=="undefined"||!(M instanceof FS.ErrnoError))&&abort(M),-M.errno}}function ___syscall146(i,o){SYSCALLS.varargs=o;try{var a=SYSCALLS.get(),c=SYSCALLS.get(),_=SYSCALLS.get(),t=0;___syscall146.buffer||(___syscall146.buffers=[null,[],[]],___syscall146.printChar=function(B,H){var q=___syscall146.buffers[B];assert(q),H===0||H===10?((B===1?Module.print:Module.printErr)(UTF8ArrayToString(q,0)),q.length=0):q.push(H)});for(var O=0;O<_;O++){for(var N=HEAP32[c+O*8>>2],M=HEAP32[c+(O*8+4)>>2],T=0;T<M;T++)___syscall146.printChar(a,HEAPU8[N+T]);t+=M}return t}catch(B){return(typeof FS=="undefined"||!(B instanceof FS.ErrnoError))&&abort(B),-B.errno}}function __nbind_finish(){for(var i=0,o=_nbind.BindClass.list;i<o.length;i++){var a=o[i];a.finish()}}var ___dso_handle=STATICTOP;STATICTOP+=16,function(_nbind){var typeIdTbl={};_nbind.typeNameTbl={};var Pool=function(){function i(){}return i.lalloc=function(o){o=o+7&~7;var a=HEAPU32[i.usedPtr];if(o>i.pageSize/2||o>i.pageSize-a){var c=_nbind.typeNameTbl.NBind.proto;return c.lalloc(o)}else return HEAPU32[i.usedPtr]=a+o,i.rootPtr+a},i.lreset=function(o,a){var c=HEAPU32[i.pagePtr];if(c){var _=_nbind.typeNameTbl.NBind.proto;_.lreset(o,a)}else HEAPU32[i.usedPtr]=o},i}();_nbind.Pool=Pool;function constructType(i,o){var a=i==10240?_nbind.makeTypeNameTbl[o.name]||_nbind.BindType:_nbind.makeTypeKindTbl[i],c=new a(o);return typeIdTbl[o.id]=c,_nbind.typeNameTbl[o.name]=c,c}_nbind.constructType=constructType;function getType(i){return typeIdTbl[i]}_nbind.getType=getType;function queryType(i){var o=HEAPU8[i],a=_nbind.structureList[o][1];i/=4,a<0&&(++i,a=HEAPU32[i]+1);var c=Array.prototype.slice.call(HEAPU32.subarray(i+1,i+1+a));return o==9&&(c=[c[0],c.slice(1)]),{paramList:c,placeholderFlag:o}}_nbind.queryType=queryType;function getTypes(i,o){return i.map(function(a){return typeof a=="number"?_nbind.getComplexType(a,constructType,getType,queryType,o):_nbind.typeNameTbl[a]})}_nbind.getTypes=getTypes;function readTypeIdList(i,o){return Array.prototype.slice.call(HEAPU32,i/4,i/4+o)}_nbind.readTypeIdList=readTypeIdList;function readAsciiString(i){for(var o=i;HEAPU8[o++];);return String.fromCharCode.apply("",HEAPU8.subarray(i,o-1))}_nbind.readAsciiString=readAsciiString;function readPolicyList(i){var o={};if(i)for(;;){var a=HEAPU32[i/4];if(!a)break;o[readAsciiString(a)]=!0,i+=4}return o}_nbind.readPolicyList=readPolicyList;function getDynCall(i,o){var a={float32_t:"d",float64_t:"d",int64_t:"d",uint64_t:"d",void:"v"},c=i.map(function(t){return a[t.name]||"i"}).join(""),_=Module["dynCall_"+c];if(!_)throw new Error("dynCall_"+c+" not found for "+o+"("+i.map(function(t){return t.name}).join(", ")+")");return _}_nbind.getDynCall=getDynCall;function addMethod(i,o,a,c){var _=i[o];i.hasOwnProperty(o)&&_?((_.arity||_.arity===0)&&(_=_nbind.makeOverloader(_,_.arity),i[o]=_),_.addMethod(a,c)):(a.arity=c,i[o]=a)}_nbind.addMethod=addMethod;function throwError(i){throw new Error(i)}_nbind.throwError=throwError,_nbind.bigEndian=!1,_a=_typeModule(_typeModule),_nbind.Type=_a.Type,_nbind.makeType=_a.makeType,_nbind.getComplexType=_a.getComplexType,_nbind.structureList=_a.structureList;var BindType=function(i){__extends(o,i);function o(){var a=i!==null&&i.apply(this,arguments)||this;return a.heap=HEAPU32,a.ptrSize=4,a}return o.prototype.needsWireRead=function(a){return!!this.wireRead||!!this.makeWireRead},o.prototype.needsWireWrite=function(a){return!!this.wireWrite||!!this.makeWireWrite},o}(_nbind.Type);_nbind.BindType=BindType;var PrimitiveType=function(i){__extends(o,i);function o(a){var c=i.call(this,a)||this,_=a.flags&32?{32:HEAPF32,64:HEAPF64}:a.flags&8?{8:HEAPU8,16:HEAPU16,32:HEAPU32}:{8:HEAP8,16:HEAP16,32:HEAP32};return c.heap=_[a.ptrSize*8],c.ptrSize=a.ptrSize,c}return o.prototype.needsWireWrite=function(a){return!!a&&!!a.Strict},o.prototype.makeWireWrite=function(a,c){return c&&c.Strict&&function(_){if(typeof _=="number")return _;throw new Error("Type mismatch")}},o}(BindType);_nbind.PrimitiveType=PrimitiveType;function pushCString(i,o){if(i==null){if(o&&o.Nullable)return 0;throw new Error("Type mismatch")}if(o&&o.Strict){if(typeof i!="string")throw new Error("Type mismatch")}else i=i.toString();var a=Module.lengthBytesUTF8(i)+1,c=_nbind.Pool.lalloc(a);return Module.stringToUTF8Array(i,HEAPU8,c,a),c}_nbind.pushCString=pushCString;function popCString(i){return i===0?null:Module.Pointer_stringify(i)}_nbind.popCString=popCString;var CStringType=function(i){__extends(o,i);function o(){var a=i!==null&&i.apply(this,arguments)||this;return a.wireRead=popCString,a.wireWrite=pushCString,a.readResources=[_nbind.resources.pool],a.writeResources=[_nbind.resources.pool],a}return o.prototype.makeWireWrite=function(a,c){return function(_){return pushCString(_,c)}},o}(BindType);_nbind.CStringType=CStringType;var BooleanType=function(i){__extends(o,i);function o(){var a=i!==null&&i.apply(this,arguments)||this;return a.wireRead=function(c){return!!c},a}return o.prototype.needsWireWrite=function(a){return!!a&&!!a.Strict},o.prototype.makeWireRead=function(a){return"!!("+a+")"},o.prototype.makeWireWrite=function(a,c){return c&&c.Strict&&function(_){if(typeof _=="boolean")return _;throw new Error("Type mismatch")}||a},o}(BindType);_nbind.BooleanType=BooleanType;var Wrapper=function(){function i(){}return i.prototype.persist=function(){this.__nbindState|=1},i}();_nbind.Wrapper=Wrapper;function makeBound(i,o){var a=function(c){__extends(_,c);function _(t,O,N,M){var T=c.call(this)||this;if(!(T instanceof _))return new(Function.prototype.bind.apply(_,Array.prototype.concat.apply([null],arguments)));var B=O,H=N,q=M;if(t!==_nbind.ptrMarker){var ne=T.__nbindConstructor.apply(T,arguments);B=4096|512,q=HEAPU32[ne/4],H=HEAPU32[ne/4+1]}var m={configurable:!0,enumerable:!1,value:null,writable:!1},he={__nbindFlags:B,__nbindPtr:H};q&&(he.__nbindShared=q,_nbind.mark(T));for(var De=0,se=Object.keys(he);De<se.length;De++){var fe=se[De];m.value=he[fe],Object.defineProperty(T,fe,m)}return _defineHidden(0)(T,"__nbindState"),T}return _.prototype.free=function(){o.destroy.call(this,this.__nbindShared,this.__nbindFlags),this.__nbindState|=2,disableMember(this,"__nbindShared"),disableMember(this,"__nbindPtr")},_}(Wrapper);return __decorate([_defineHidden()],a.prototype,"__nbindConstructor",void 0),__decorate([_defineHidden()],a.prototype,"__nbindValueConstructor",void 0),__decorate([_defineHidden(i)],a.prototype,"__nbindPolicies",void 0),a}_nbind.makeBound=makeBound;function disableMember(i,o){function a(){throw new Error("Accessing deleted object")}Object.defineProperty(i,o,{configurable:!1,enumerable:!1,get:a,set:a})}_nbind.ptrMarker={};var BindClass=function(i){__extends(o,i);function o(a){var c=i.call(this,a)||this;return c.wireRead=function(_){return _nbind.popValue(_,c.ptrType)},c.wireWrite=function(_){return pushPointer(_,c.ptrType,!0)},c.pendingSuperCount=0,c.ready=!1,c.methodTbl={},a.paramList?(c.classType=a.paramList[0].classType,c.proto=c.classType.proto):c.classType=c,c}return o.prototype.makeBound=function(a){var c=_nbind.makeBound(a,this);return this.proto=c,this.ptrType.proto=c,c},o.prototype.addMethod=function(a){var c=this.methodTbl[a.name]||[];c.push(a),this.methodTbl[a.name]=c},o.prototype.registerMethods=function(a,c){for(var _,t=0,O=Object.keys(a.methodTbl);t<O.length;t++)for(var N=O[t],M=a.methodTbl[N],T=0,B=M;T<B.length;T++){var H=B[T],q=void 0,ne=void 0;if(q=this.proto.prototype,!(c&&H.signatureType!=1))switch(H.signatureType){case 1:q=this.proto;case 5:ne=_nbind.makeCaller(H),_nbind.addMethod(q,H.name,ne,H.typeList.length-1);break;case 4:_=_nbind.makeMethodCaller(a.ptrType,H);break;case 3:Object.defineProperty(q,H.name,{configurable:!0,enumerable:!1,get:_nbind.makeMethodCaller(a.ptrType,H),set:_});break;case 2:ne=_nbind.makeMethodCaller(a.ptrType,H),_nbind.addMethod(q,H.name,ne,H.typeList.length-1);break;default:break}}},o.prototype.registerSuperMethods=function(a,c,_){if(!_[a.name]){_[a.name]=!0;for(var t=0,O,N=0,M=a.superIdList||[];N<M.length;N++){var T=M[N],B=_nbind.getType(T);t++<c||c<0?O=-1:O=0,this.registerSuperMethods(B,O,_)}this.registerMethods(a,c<0)}},o.prototype.finish=function(){if(this.ready)return this;this.ready=!0,this.superList=(this.superIdList||[]).map(function(_){return _nbind.getType(_).finish()});var a=this.proto;if(this.superList.length){var c=function(){this.constructor=a};c.prototype=this.superList[0].proto.prototype,a.prototype=new c}return a!=Module&&(a.prototype.__nbindType=this),this.registerSuperMethods(this,1,{}),this},o.prototype.upcastStep=function(a,c){if(a==this)return c;for(var _=0;_<this.superList.length;++_){var t=this.superList[_].upcastStep(a,_nbind.callUpcast(this.upcastList[_],c));if(t)return t}return 0},o}(_nbind.BindType);BindClass.list=[],_nbind.BindClass=BindClass;function popPointer(i,o){return i?new o.proto(_nbind.ptrMarker,o.flags,i):null}_nbind.popPointer=popPointer;function pushPointer(i,o,a){if(!(i instanceof _nbind.Wrapper)){if(a)return _nbind.pushValue(i);throw new Error("Type mismatch")}var c=i.__nbindPtr,_=i.__nbindType.classType,t=o.classType;if(i instanceof o.proto)for(;_!=t;)c=_nbind.callUpcast(_.upcastList[0],c),_=_.superList[0];else if(c=_.upcastStep(t,c),!c)throw new Error("Type mismatch");return c}_nbind.pushPointer=pushPointer;function pushMutablePointer(i,o){var a=pushPointer(i,o);if(i.__nbindFlags&1)throw new Error("Passing a const value as a non-const argument");return a}var BindClassPtr=function(i){__extends(o,i);function o(a){var c=i.call(this,a)||this;c.classType=a.paramList[0].classType,c.proto=c.classType.proto;var _=a.flags&1,t=(c.flags&896)==256&&a.flags&2,O=_?pushPointer:pushMutablePointer,N=t?_nbind.popValue:popPointer;return c.makeWireWrite=function(M,T){return T.Nullable?function(B){return B?O(B,c):0}:function(B){return O(B,c)}},c.wireRead=function(M){return N(M,c)},c.wireWrite=function(M){return O(M,c)},c}return o}(_nbind.BindType);_nbind.BindClassPtr=BindClassPtr;function popShared(i,o){var a=HEAPU32[i/4],c=HEAPU32[i/4+1];return c?new o.proto(_nbind.ptrMarker,o.flags,c,a):null}_nbind.popShared=popShared;function pushShared(i,o){if(!(i instanceof o.proto))throw new Error("Type mismatch");return i.__nbindShared}function pushMutableShared(i,o){if(!(i instanceof o.proto))throw new Error("Type mismatch");if(i.__nbindFlags&1)throw new Error("Passing a const value as a non-const argument");return i.__nbindShared}var SharedClassPtr=function(i){__extends(o,i);function o(a){var c=i.call(this,a)||this;c.readResources=[_nbind.resources.pool],c.classType=a.paramList[0].classType,c.proto=c.classType.proto;var _=a.flags&1,t=_?pushShared:pushMutableShared;return c.wireRead=function(O){return popShared(O,c)},c.wireWrite=function(O){return t(O,c)},c}return o}(_nbind.BindType);_nbind.SharedClassPtr=SharedClassPtr,_nbind.externalList=[0];var firstFreeExternal=0,External=function(){function i(o){this.refCount=1,this.data=o}return i.prototype.register=function(){var o=firstFreeExternal;return o?firstFreeExternal=_nbind.externalList[o]:o=_nbind.externalList.length,_nbind.externalList[o]=this,o},i.prototype.reference=function(){++this.refCount},i.prototype.dereference=function(o){--this.refCount==0&&(this.free&&this.free(),_nbind.externalList[o]=firstFreeExternal,firstFreeExternal=o)},i}();_nbind.External=External;function popExternal(i){var o=_nbind.externalList[i];return o.dereference(i),o.data}function pushExternal(i){var o=new External(i);return o.reference(),o.register()}var ExternalType=function(i){__extends(o,i);function o(){var a=i!==null&&i.apply(this,arguments)||this;return a.wireRead=popExternal,a.wireWrite=pushExternal,a}return o}(_nbind.BindType);_nbind.ExternalType=ExternalType,_nbind.callbackSignatureList=[];var CallbackType=function(i){__extends(o,i);function o(){var a=i!==null&&i.apply(this,arguments)||this;return a.wireWrite=function(c){return typeof c!="function"&&_nbind.throwError("Type mismatch"),new _nbind.External(c).register()},a}return o}(_nbind.BindType);_nbind.CallbackType=CallbackType,_nbind.valueList=[0];var firstFreeValue=0;function pushValue(i){var o=firstFreeValue;return o?firstFreeValue=_nbind.valueList[o]:o=_nbind.valueList.length,_nbind.valueList[o]=i,o*2+1}_nbind.pushValue=pushValue;function popValue(i,o){if(i||_nbind.throwError("Value type JavaScript class is missing or not registered"),i&1){i>>=1;var a=_nbind.valueList[i];return _nbind.valueList[i]=firstFreeValue,firstFreeValue=i,a}else{if(o)return _nbind.popShared(i,o);throw new Error("Invalid value slot "+i)}}_nbind.popValue=popValue;var valueBase=18446744073709552e3;function push64(i){return typeof i=="number"?i:pushValue(i)*4096+valueBase}function pop64(i){return i<valueBase?i:popValue((i-valueBase)/4096)}var CreateValueType=function(i){__extends(o,i);function o(){return i!==null&&i.apply(this,arguments)||this}return o.prototype.makeWireWrite=function(a){return"(_nbind.pushValue(new "+a+"))"},o}(_nbind.BindType);_nbind.CreateValueType=CreateValueType;var Int64Type=function(i){__extends(o,i);function o(){var a=i!==null&&i.apply(this,arguments)||this;return a.wireWrite=push64,a.wireRead=pop64,a}return o}(_nbind.BindType);_nbind.Int64Type=Int64Type;function pushArray(i,o){if(!i)return 0;var a=i.length;if((o.size||o.size===0)&&a<o.size)throw new Error("Type mismatch");var c=o.memberType.ptrSize,_=_nbind.Pool.lalloc(4+a*c);HEAPU32[_/4]=a;var t=o.memberType.heap,O=(_+4)/c,N=o.memberType.wireWrite,M=0;if(N)for(;M<a;)t[O++]=N(i[M++]);else for(;M<a;)t[O++]=i[M++];return _}_nbind.pushArray=pushArray;function popArray(i,o){if(i===0)return null;var a=HEAPU32[i/4],c=new Array(a),_=o.memberType.heap;i=(i+4)/o.memberType.ptrSize;var t=o.memberType.wireRead,O=0;if(t)for(;O<a;)c[O++]=t(_[i++]);else for(;O<a;)c[O++]=_[i++];return c}_nbind.popArray=popArray;var ArrayType=function(i){__extends(o,i);function o(a){var c=i.call(this,a)||this;return c.wireRead=function(_){return popArray(_,c)},c.wireWrite=function(_){return pushArray(_,c)},c.readResources=[_nbind.resources.pool],c.writeResources=[_nbind.resources.pool],c.memberType=a.paramList[0],a.paramList[1]&&(c.size=a.paramList[1]),c}return o}(_nbind.BindType);_nbind.ArrayType=ArrayType;function pushString(i,o){if(i==null)if(o&&o.Nullable)i="";else throw new Error("Type mismatch");if(o&&o.Strict){if(typeof i!="string")throw new Error("Type mismatch")}else i=i.toString();var a=Module.lengthBytesUTF8(i),c=_nbind.Pool.lalloc(4+a+1);return HEAPU32[c/4]=a,Module.stringToUTF8Array(i,HEAPU8,c+4,a+1),c}_nbind.pushString=pushString;function popString(i){if(i===0)return null;var o=HEAPU32[i/4];return Module.Pointer_stringify(i+4,o)}_nbind.popString=popString;var StringType=function(i){__extends(o,i);function o(){var a=i!==null&&i.apply(this,arguments)||this;return a.wireRead=popString,a.wireWrite=pushString,a.readResources=[_nbind.resources.pool],a.writeResources=[_nbind.resources.pool],a}return o.prototype.makeWireWrite=function(a,c){return function(_){return pushString(_,c)}},o}(_nbind.BindType);_nbind.StringType=StringType;function makeArgList(i){return Array.apply(null,Array(i)).map(function(o,a){return"a"+(a+1)})}function anyNeedsWireWrite(i,o){return i.reduce(function(a,c){return a||c.needsWireWrite(o)},!1)}function anyNeedsWireRead(i,o){return i.reduce(function(a,c){return a||!!c.needsWireRead(o)},!1)}function makeWireRead(i,o,a,c){var _=i.length;return a.makeWireRead?a.makeWireRead(c,i,_):a.wireRead?(i[_]=a.wireRead,"(convertParamList["+_+"]("+c+"))"):c}function makeWireWrite(i,o,a,c){var _,t=i.length;return a.makeWireWrite?_=a.makeWireWrite(c,o,i,t):_=a.wireWrite,_?typeof _=="string"?_:(i[t]=_,"(convertParamList["+t+"]("+c+"))"):c}function buildCallerFunction(dynCall,ptrType,ptr,num,policyTbl,needsWireWrite,prefix,returnType,argTypeList,mask,err){var argList=makeArgList(argTypeList.length),convertParamList=[],callExpression=makeWireRead(convertParamList,policyTbl,returnType,"dynCall("+[prefix].concat(argList.map(function(i,o){return makeWireWrite(convertParamList,policyTbl,argTypeList[o],i)})).join(",")+")"),resourceSet=_nbind.listResources([returnType],argTypeList),sourceCode="function("+argList.join(",")+"){"+(mask?"this.__nbindFlags&mask&&err();":"")+resourceSet.makeOpen()+"var r="+callExpression+";"+resourceSet.makeClose()+"return r;}";return eval("("+sourceCode+")")}function buildJSCallerFunction(returnType,argTypeList){var argList=makeArgList(argTypeList.length),convertParamList=[],callExpression=makeWireWrite(convertParamList,null,returnType,"_nbind.externalList[num].data("+argList.map(function(i,o){return makeWireRead(convertParamList,null,argTypeList[o],i)}).join(",")+")"),resourceSet=_nbind.listResources(argTypeList,[returnType]);resourceSet.remove(_nbind.resources.pool);var sourceCode="function("+["dummy","num"].concat(argList).join(",")+"){"+resourceSet.makeOpen()+"var r="+callExpression+";"+resourceSet.makeClose()+"return r;}";return eval("("+sourceCode+")")}_nbind.buildJSCallerFunction=buildJSCallerFunction;function makeJSCaller(i){var o=i.length-1,a=_nbind.getTypes(i,"callback"),c=a[0],_=a.slice(1),t=anyNeedsWireRead(_,null),O=c.needsWireWrite(null);if(!O&&!t)switch(o){case 0:return function(N,M){return _nbind.externalList[M].data()};case 1:return function(N,M,T){return _nbind.externalList[M].data(T)};case 2:return function(N,M,T,B){return _nbind.externalList[M].data(T,B)};case 3:return function(N,M,T,B,H){return _nbind.externalList[M].data(T,B,H)};default:break}return buildJSCallerFunction(c,_)}_nbind.makeJSCaller=makeJSCaller;function makeMethodCaller(i,o){var a=o.typeList.length-1,c=o.typeList.slice(0);c.splice(1,0,"uint32_t",o.boundID);var _=_nbind.getTypes(c,o.title),t=_[0],O=_.slice(3),N=t.needsWireRead(o.policyTbl),M=anyNeedsWireWrite(O,o.policyTbl),T=o.ptr,B=o.num,H=_nbind.getDynCall(_,o.title),q=~o.flags&1;function ne(){throw new Error("Calling a non-const method on a const object")}if(!N&&!M)switch(a){case 0:return function(){return this.__nbindFlags&q?ne():H(T,B,_nbind.pushPointer(this,i))};case 1:return function(m){return this.__nbindFlags&q?ne():H(T,B,_nbind.pushPointer(this,i),m)};case 2:return function(m,he){return this.__nbindFlags&q?ne():H(T,B,_nbind.pushPointer(this,i),m,he)};case 3:return function(m,he,De){return this.__nbindFlags&q?ne():H(T,B,_nbind.pushPointer(this,i),m,he,De)};default:break}return buildCallerFunction(H,i,T,B,o.policyTbl,M,"ptr,num,pushPointer(this,ptrType)",t,O,q,ne)}_nbind.makeMethodCaller=makeMethodCaller;function makeCaller(i){var o=i.typeList.length-1,a=_nbind.getTypes(i.typeList,i.title),c=a[0],_=a.slice(1),t=c.needsWireRead(i.policyTbl),O=anyNeedsWireWrite(_,i.policyTbl),N=i.direct,M=i.ptr;if(i.direct&&!t&&!O){var T=_nbind.getDynCall(a,i.title);switch(o){case 0:return function(){return T(N)};case 1:return function(ne){return T(N,ne)};case 2:return function(ne,m){return T(N,ne,m)};case 3:return function(ne,m,he){return T(N,ne,m,he)};default:break}M=0}var B;if(M){var H=i.typeList.slice(0);H.splice(1,0,"uint32_t"),a=_nbind.getTypes(H,i.title),B="ptr,num"}else M=N,B="ptr";var q=_nbind.getDynCall(a,i.title);return buildCallerFunction(q,null,M,i.num,i.policyTbl,O,B,c,_)}_nbind.makeCaller=makeCaller;function makeOverloader(i,o){var a=[];function c(){return a[arguments.length].apply(this,arguments)}return c.addMethod=function(_,t){a[t]=_},c.addMethod(i,o),c}_nbind.makeOverloader=makeOverloader;var Resource=function(){function i(o,a){var c=this;this.makeOpen=function(){return Object.keys(c.openTbl).join("")},this.makeClose=function(){return Object.keys(c.closeTbl).join("")},this.openTbl={},this.closeTbl={},o&&(this.openTbl[o]=!0),a&&(this.closeTbl[a]=!0)}return i.prototype.add=function(o){for(var a=0,c=Object.keys(o.openTbl);a<c.length;a++){var _=c[a];this.openTbl[_]=!0}for(var t=0,O=Object.keys(o.closeTbl);t<O.length;t++){var _=O[t];this.closeTbl[_]=!0}},i.prototype.remove=function(o){for(var a=0,c=Object.keys(o.openTbl);a<c.length;a++){var _=c[a];delete this.openTbl[_]}for(var t=0,O=Object.keys(o.closeTbl);t<O.length;t++){var _=O[t];delete this.closeTbl[_]}},i}();_nbind.Resource=Resource;function listResources(i,o){for(var a=new Resource,c=0,_=i;c<_.length;c++)for(var t=_[c],O=0,N=t.readResources||[];O<N.length;O++){var M=N[O];a.add(M)}for(var T=0,B=o;T<B.length;T++)for(var t=B[T],H=0,q=t.writeResources||[];H<q.length;H++){var M=q[H];a.add(M)}return a}_nbind.listResources=listResources,_nbind.resources={pool:new Resource("var used=HEAPU32[_nbind.Pool.usedPtr],page=HEAPU32[_nbind.Pool.pagePtr];","_nbind.Pool.lreset(used,page);")};var ExternalBuffer=function(i){__extends(o,i);function o(a,c){var _=i.call(this,a)||this;return _.ptr=c,_}return o.prototype.free=function(){_free(this.ptr)},o}(_nbind.External);function getBuffer(i){return i instanceof ArrayBuffer?new Uint8Array(i):i instanceof DataView?new Uint8Array(i.buffer,i.byteOffset,i.byteLength):i}function pushBuffer(i,o){if(i==null&&o&&o.Nullable&&(i=[]),typeof i!="object")throw new Error("Type mismatch");var a=i,c=a.byteLength||a.length;if(!c&&c!==0&&a.byteLength!==0)throw new Error("Type mismatch");var _=_nbind.Pool.lalloc(8),t=_malloc(c),O=_/4;return HEAPU32[O++]=c,HEAPU32[O++]=t,HEAPU32[O++]=new ExternalBuffer(i,t).register(),HEAPU8.set(getBuffer(i),t),_}var BufferType=function(i){__extends(o,i);function o(){var a=i!==null&&i.apply(this,arguments)||this;return a.wireWrite=pushBuffer,a.readResources=[_nbind.resources.pool],a.writeResources=[_nbind.resources.pool],a}return o.prototype.makeWireWrite=function(a,c){return function(_){return pushBuffer(_,c)}},o}(_nbind.BindType);_nbind.BufferType=BufferType;function commitBuffer(i,o,a){var c=_nbind.externalList[i].data,_=Buffer;if(typeof Buffer!="function"&&(_=function(){}),!(c instanceof Array)){var t=HEAPU8.subarray(o,o+a);if(c instanceof _){var O=void 0;typeof Buffer.from=="function"&&Buffer.from.length>=3?O=Buffer.from(t):O=new Buffer(t),O.copy(c)}else getBuffer(c).set(t)}}_nbind.commitBuffer=commitBuffer;var dirtyList=[],gcTimer=0;function sweep(){for(var i=0,o=dirtyList;i<o.length;i++){var a=o[i];a.__nbindState&(1|2)||a.free()}dirtyList=[],gcTimer=0}_nbind.mark=function(i){};function toggleLightGC(i){i?_nbind.mark=function(o){dirtyList.push(o),gcTimer||(gcTimer=setTimeout(sweep,0))}:_nbind.mark=function(o){}}_nbind.toggleLightGC=toggleLightGC}(_nbind),Module.requestFullScreen=function(o,a,c){Module.printErr("Module.requestFullScreen is deprecated. Please call Module.requestFullscreen instead."),Module.requestFullScreen=Module.requestFullscreen,Browser.requestFullScreen(o,a,c)},Module.requestFullscreen=function(o,a,c){Browser.requestFullscreen(o,a,c)},Module.requestAnimationFrame=function(o){Browser.requestAnimationFrame(o)},Module.setCanvasSize=function(o,a,c){Browser.setCanvasSize(o,a,c)},Module.pauseMainLoop=function(){Browser.mainLoop.pause()},Module.resumeMainLoop=function(){Browser.mainLoop.resume()},Module.getUserMedia=function(){Browser.getUserMedia()},Module.createContext=function(o,a,c,_){return Browser.createContext(o,a,c,_)},ENVIRONMENT_IS_NODE?_emscripten_get_now=function(){var o=process.hrtime();return o[0]*1e3+o[1]/1e6}:typeof dateNow!="undefined"?_emscripten_get_now=dateNow:typeof self=="object"&&self.performance&&typeof self.performance.now=="function"?_emscripten_get_now=function(){return self.performance.now()}:typeof performance=="object"&&typeof performance.now=="function"?_emscripten_get_now=function(){return performance.now()}:_emscripten_get_now=Date.now,__ATEXIT__.push(function(){var i=Module._fflush;i&&i(0);var o=___syscall146.printChar;if(!!o){var a=___syscall146.buffers;a[1].length&&o(1,10),a[2].length&&o(2,10)}}),DYNAMICTOP_PTR=allocate(1,"i32",ALLOC_STATIC),STACK_BASE=STACKTOP=Runtime.alignMemory(STATICTOP),STACK_MAX=STACK_BASE+TOTAL_STACK,DYNAMIC_BASE=Runtime.alignMemory(STACK_MAX),HEAP32[DYNAMICTOP_PTR>>2]=DYNAMIC_BASE,staticSealed=!0;function invoke_viiiii(i,o,a,c,_,t){try{Module.dynCall_viiiii(i,o,a,c,_,t)}catch(O){if(typeof O!="number"&&O!=="longjmp")throw O;Module.setThrew(1,0)}}function invoke_vif(i,o,a){try{Module.dynCall_vif(i,o,a)}catch(c){if(typeof c!="number"&&c!=="longjmp")throw c;Module.setThrew(1,0)}}function invoke_vid(i,o,a){try{Module.dynCall_vid(i,o,a)}catch(c){if(typeof c!="number"&&c!=="longjmp")throw c;Module.setThrew(1,0)}}function invoke_fiff(i,o,a,c){try{return Module.dynCall_fiff(i,o,a,c)}catch(_){if(typeof _!="number"&&_!=="longjmp")throw _;Module.setThrew(1,0)}}function invoke_vi(i,o){try{Module.dynCall_vi(i,o)}catch(a){if(typeof a!="number"&&a!=="longjmp")throw a;Module.setThrew(1,0)}}function invoke_vii(i,o,a){try{Module.dynCall_vii(i,o,a)}catch(c){if(typeof c!="number"&&c!=="longjmp")throw c;Module.setThrew(1,0)}}function invoke_ii(i,o){try{return Module.dynCall_ii(i,o)}catch(a){if(typeof a!="number"&&a!=="longjmp")throw a;Module.setThrew(1,0)}}function invoke_viddi(i,o,a,c,_){try{Module.dynCall_viddi(i,o,a,c,_)}catch(t){if(typeof t!="number"&&t!=="longjmp")throw t;Module.setThrew(1,0)}}function invoke_vidd(i,o,a,c){try{Module.dynCall_vidd(i,o,a,c)}catch(_){if(typeof _!="number"&&_!=="longjmp")throw _;Module.setThrew(1,0)}}function invoke_iiii(i,o,a,c){try{return Module.dynCall_iiii(i,o,a,c)}catch(_){if(typeof _!="number"&&_!=="longjmp")throw _;Module.setThrew(1,0)}}function invoke_diii(i,o,a,c){try{return Module.dynCall_diii(i,o,a,c)}catch(_){if(typeof _!="number"&&_!=="longjmp")throw _;Module.setThrew(1,0)}}function invoke_di(i,o){try{return Module.dynCall_di(i,o)}catch(a){if(typeof a!="number"&&a!=="longjmp")throw a;Module.setThrew(1,0)}}function invoke_iid(i,o,a){try{return Module.dynCall_iid(i,o,a)}catch(c){if(typeof c!="number"&&c!=="longjmp")throw c;Module.setThrew(1,0)}}function invoke_iii(i,o,a){try{return Module.dynCall_iii(i,o,a)}catch(c){if(typeof c!="number"&&c!=="longjmp")throw c;Module.setThrew(1,0)}}function invoke_viiddi(i,o,a,c,_,t){try{Module.dynCall_viiddi(i,o,a,c,_,t)}catch(O){if(typeof O!="number"&&O!=="longjmp")throw O;Module.setThrew(1,0)}}function invoke_viiiiii(i,o,a,c,_,t,O){try{Module.dynCall_viiiiii(i,o,a,c,_,t,O)}catch(N){if(typeof N!="number"&&N!=="longjmp")throw N;Module.setThrew(1,0)}}function invoke_dii(i,o,a){try{return Module.dynCall_dii(i,o,a)}catch(c){if(typeof c!="number"&&c!=="longjmp")throw c;Module.setThrew(1,0)}}function invoke_i(i){try{return Module.dynCall_i(i)}catch(o){if(typeof o!="number"&&o!=="longjmp")throw o;Module.setThrew(1,0)}}function invoke_iiiiii(i,o,a,c,_,t){try{return Module.dynCall_iiiiii(i,o,a,c,_,t)}catch(O){if(typeof O!="number"&&O!=="longjmp")throw O;Module.setThrew(1,0)}}function invoke_viiid(i,o,a,c,_){try{Module.dynCall_viiid(i,o,a,c,_)}catch(t){if(typeof t!="number"&&t!=="longjmp")throw t;Module.setThrew(1,0)}}function invoke_viififi(i,o,a,c,_,t,O){try{Module.dynCall_viififi(i,o,a,c,_,t,O)}catch(N){if(typeof N!="number"&&N!=="longjmp")throw N;Module.setThrew(1,0)}}function invoke_viii(i,o,a,c){try{Module.dynCall_viii(i,o,a,c)}catch(_){if(typeof _!="number"&&_!=="longjmp")throw _;Module.setThrew(1,0)}}function invoke_v(i){try{Module.dynCall_v(i)}catch(o){if(typeof o!="number"&&o!=="longjmp")throw o;Module.setThrew(1,0)}}function invoke_viid(i,o,a,c){try{Module.dynCall_viid(i,o,a,c)}catch(_){if(typeof _!="number"&&_!=="longjmp")throw _;Module.setThrew(1,0)}}function invoke_idd(i,o,a){try{return Module.dynCall_idd(i,o,a)}catch(c){if(typeof c!="number"&&c!=="longjmp")throw c;Module.setThrew(1,0)}}function invoke_viiii(i,o,a,c,_){try{Module.dynCall_viiii(i,o,a,c,_)}catch(t){if(typeof t!="number"&&t!=="longjmp")throw t;Module.setThrew(1,0)}}Module.asmGlobalArg={Math,Int8Array,Int16Array,Int32Array,Uint8Array,Uint16Array,Uint32Array,Float32Array,Float64Array,NaN:NaN,Infinity:Infinity},Module.asmLibraryArg={abort,assert,enlargeMemory,getTotalMemory,abortOnCannotGrowMemory,invoke_viiiii,invoke_vif,invoke_vid,invoke_fiff,invoke_vi,invoke_vii,invoke_ii,invoke_viddi,invoke_vidd,invoke_iiii,invoke_diii,invoke_di,invoke_iid,invoke_iii,invoke_viiddi,invoke_viiiiii,invoke_dii,invoke_i,invoke_iiiiii,invoke_viiid,invoke_viififi,invoke_viii,invoke_v,invoke_viid,invoke_idd,invoke_viiii,_emscripten_asm_const_iiiii,_emscripten_asm_const_iiidddddd,_emscripten_asm_const_iiiid,__nbind_reference_external,_emscripten_asm_const_iiiiiiii,_removeAccessorPrefix,_typeModule,__nbind_register_pool,__decorate,_llvm_stackrestore,___cxa_atexit,__extends,__nbind_get_value_object,__ZN8facebook4yoga14YGNodeToStringEPNSt3__212basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEP6YGNode14YGPrintOptionsj,_emscripten_set_main_loop_timing,__nbind_register_primitive,__nbind_register_type,_emscripten_memcpy_big,__nbind_register_function,___setErrNo,__nbind_register_class,__nbind_finish,_abort,_nbind_value,_llvm_stacksave,___syscall54,_defineHidden,_emscripten_set_main_loop,_emscripten_get_now,__nbind_register_callback_signature,_emscripten_asm_const_iiiiii,__nbind_free_external,_emscripten_asm_const_iiii,_emscripten_asm_const_iiididi,___syscall6,_atexit,___syscall140,___syscall146,DYNAMICTOP_PTR,tempDoublePtr,ABORT,STACKTOP,STACK_MAX,cttz_i8,___dso_handle};var asm=function(i,o,a){var c=new i.Int8Array(a),_=new i.Int16Array(a),t=new i.Int32Array(a),O=new i.Uint8Array(a),N=new i.Uint16Array(a),M=new i.Uint32Array(a),T=new i.Float32Array(a),B=new i.Float64Array(a),H=o.DYNAMICTOP_PTR|0,q=o.tempDoublePtr|0,ne=o.ABORT|0,m=o.STACKTOP|0,he=o.STACK_MAX|0,De=o.cttz_i8|0,se=o.___dso_handle|0,fe=0,_e=0,ce=0,me=0,ie=i.NaN,Oe=i.Infinity,Ue=0,je=0,at=0,Dt=0,Qe=0,ut=0,Ve=i.Math.floor,It=i.Math.abs,Xt=i.Math.sqrt,rt=i.Math.pow,X=i.Math.cos,de=i.Math.sin,Ce=i.Math.tan,oe=i.Math.acos,He=i.Math.asin,dt=i.Math.atan,At=i.Math.atan2,nn=i.Math.exp,an=i.Math.log,Mn=i.Math.ceil,lr=i.Math.imul,ln=i.Math.min,Vt=i.Math.max,Dr=i.Math.clz32,w=i.Math.fround,jt=o.abort,Xn=o.assert,vr=o.enlargeMemory,jr=o.getTotalMemory,fr=o.abortOnCannotGrowMemory,zr=o.invoke_viiiii,Qt=o.invoke_vif,wu=o.invoke_vid,d0=o.invoke_fiff,Ro=o.invoke_vi,Jo=o.invoke_vii,Ps=o.invoke_ii,Zo=o.invoke_viddi,$o=o.invoke_vidd,qt=o.invoke_iiii,Ai=o.invoke_diii,su=o.invoke_di,mi=o.invoke_iid,wr=o.invoke_iii,el=o.invoke_viiddi,Y0=o.invoke_viiiiii,Uu=o.invoke_dii,K0=o.invoke_i,Xr=o.invoke_iiiiii,Oo=o.invoke_viiid,Mo=o.invoke_viififi,F0=o.invoke_viii,au=o.invoke_v,Li=o.invoke_viid,Is=o.invoke_idd,Xl=o.invoke_viiii,P0=o._emscripten_asm_const_iiiii,p0=o._emscripten_asm_const_iiidddddd,Hr=o._emscripten_asm_const_iiiid,Ri=o.__nbind_reference_external,X0=o._emscripten_asm_const_iiiiiiii,gi=o._removeAccessorPrefix,en=o._typeModule,bn=o.__nbind_register_pool,Oi=o.__decorate,yi=o._llvm_stackrestore,Wt=o.___cxa_atexit,Ru=o.__extends,eu=o.__nbind_get_value_object,Q0=o.__ZN8facebook4yoga14YGNodeToStringEPNSt3__212basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEP6YGNode14YGPrintOptionsj,Yi=o._emscripten_set_main_loop_timing,Ql=o.__nbind_register_primitive,ko=o.__nbind_register_type,ai=o._emscripten_memcpy_big,ao=o.__nbind_register_function,Jl=o.___setErrNo,Lo=o.__nbind_register_class,bs=o.__nbind_finish,$n=o._abort,tl=o._nbind_value,fo=o._llvm_stacksave,I0=o.___syscall54,Sl=o._defineHidden,No=o._emscripten_set_main_loop,wt=o._emscripten_get_now,bt=o.__nbind_register_callback_signature,Hn=o._emscripten_asm_const_iiiiii,qr=o.__nbind_free_external,Ki=o._emscripten_asm_const_iiii,Qr=o._emscripten_asm_const_iiididi,Ou=o.___syscall6,h0=o._atexit,Ni=o.___syscall140,v0=o.___syscall146,vs=w(0);let Tt=w(0);function co(e){e=e|0;var n=0;return n=m,m=m+e|0,m=m+15&-16,n|0}function nl(){return m|0}function Zl(e){e=e|0,m=e}function ju(e,n){e=e|0,n=n|0,m=e,he=n}function ms(e,n){e=e|0,n=n|0,fe||(fe=e,_e=n)}function b0(e){e=e|0,ut=e}function Q(){return ut|0}function we(){var e=0,n=0;_r(8104,8,400)|0,_r(8504,408,540)|0,e=9044,n=e+44|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));c[9088]=0,c[9089]=1,t[2273]=0,t[2274]=948,t[2275]=948,Wt(17,8104,se|0)|0}function Ne(e){e=e|0,fc(e+948|0)}function Le(e){return e=w(e),((mr(e)|0)&2147483647)>>>0>2139095040|0}function pt(e,n,r){e=e|0,n=n|0,r=r|0;e:do if(t[e+(n<<3)+4>>2]|0)e=e+(n<<3)|0;else{if((n|2|0)==3?t[e+60>>2]|0:0){e=e+56|0;break}switch(n|0){case 0:case 2:case 4:case 5:{if(t[e+52>>2]|0){e=e+48|0;break e}break}default:}if(t[e+68>>2]|0){e=e+64|0;break}else{e=(n|1|0)==5?948:r;break}}while(0);return e|0}function Yn(e){e=e|0;var n=0;return n=T_(1e3)|0,Cn(e,(n|0)!=0,2456),t[2276]=(t[2276]|0)+1,_r(n|0,8104,1e3)|0,c[e+2>>0]|0&&(t[n+4>>2]=2,t[n+12>>2]=4),t[n+976>>2]=e,n|0}function Cn(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0;l=m,m=m+16|0,u=l,n||(t[u>>2]=r,Cl(e,5,3197,u)),m=l}function cr(){return Yn(956)|0}function Si(e){e=e|0;var n=0;return n=pn(1e3)|0,Mu(n,e),Cn(t[e+976>>2]|0,1,2456),t[2276]=(t[2276]|0)+1,t[n+944>>2]=0,n|0}function Mu(e,n){e=e|0,n=n|0;var r=0;_r(e|0,n|0,948)|0,aa(e+948|0,n+948|0),r=e+960|0,e=n+960|0,n=r+40|0;do t[r>>2]=t[e>>2],r=r+4|0,e=e+4|0;while((r|0)<(n|0))}function zu(e){e=e|0;var n=0,r=0,u=0,l=0;if(n=e+944|0,r=t[n>>2]|0,r|0&&(Hu(r+948|0,e)|0,t[n>>2]=0),r=Su(e)|0,r|0){n=0;do t[(Ti(e,n)|0)+944>>2]=0,n=n+1|0;while((n|0)!=(r|0))}r=e+948|0,u=t[r>>2]|0,l=e+952|0,n=t[l>>2]|0,(n|0)!=(u|0)&&(t[l>>2]=n+(~((n+-4-u|0)>>>2)<<2)),Fo(r),C_(e),t[2276]=(t[2276]|0)+-1}function Hu(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0;u=t[e>>2]|0,D=e+4|0,r=t[D>>2]|0,s=r;e:do if((u|0)==(r|0))l=u,h=4;else for(e=u;;){if((t[e>>2]|0)==(n|0)){l=e,h=4;break e}if(e=e+4|0,(e|0)==(r|0)){e=0;break}}while(0);return(h|0)==4&&((l|0)!=(r|0)?(u=l+4|0,e=s-u|0,n=e>>2,n&&(kg(l|0,u|0,e|0)|0,r=t[D>>2]|0),e=l+(n<<2)|0,(r|0)==(e|0)||(t[D>>2]=r+(~((r+-4-e|0)>>>2)<<2)),e=1):e=0),e|0}function Su(e){return e=e|0,(t[e+952>>2]|0)-(t[e+948>>2]|0)>>2|0}function Ti(e,n){e=e|0,n=n|0;var r=0;return r=t[e+948>>2]|0,(t[e+952>>2]|0)-r>>2>>>0>n>>>0?e=t[r+(n<<2)>>2]|0:e=0,e|0}function Fo(e){e=e|0;var n=0,r=0,u=0,l=0;u=m,m=m+32|0,n=u,l=t[e>>2]|0,r=(t[e+4>>2]|0)-l|0,((t[e+8>>2]|0)-l|0)>>>0>r>>>0&&(l=r>>2,Y(n,l,l,e+8|0),ri(e,n),ii(n)),m=u}function ku(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0;L=Su(e)|0;do if(L|0){if((t[(Ti(e,0)|0)+944>>2]|0)==(e|0)){if(!(Hu(e+948|0,n)|0))break;_r(n+400|0,8504,540)|0,t[n+944>>2]=0,Qn(e);break}h=t[(t[e+976>>2]|0)+12>>2]|0,D=e+948|0,S=(h|0)==0,r=0,s=0;do u=t[(t[D>>2]|0)+(s<<2)>>2]|0,(u|0)==(n|0)?Qn(e):(l=Si(u)|0,t[(t[D>>2]|0)+(r<<2)>>2]=l,t[l+944>>2]=e,S||tD[h&15](u,l,e,r),r=r+1|0),s=s+1|0;while((s|0)!=(L|0));if(r>>>0<L>>>0){S=e+948|0,D=e+952|0,h=r,r=t[D>>2]|0;do s=(t[S>>2]|0)+(h<<2)|0,u=s+4|0,l=r-u|0,n=l>>2,n&&(kg(s|0,u|0,l|0)|0,r=t[D>>2]|0),l=r,u=s+(n<<2)|0,(l|0)!=(u|0)&&(r=l+(~((l+-4-u|0)>>>2)<<2)|0,t[D>>2]=r),h=h+1|0;while((h|0)!=(L|0))}}while(0)}function po(e){e=e|0;var n=0,r=0,u=0,l=0;qu(e,(Su(e)|0)==0,2491),qu(e,(t[e+944>>2]|0)==0,2545),n=e+948|0,r=t[n>>2]|0,u=e+952|0,l=t[u>>2]|0,(l|0)!=(r|0)&&(t[u>>2]=l+(~((l+-4-r|0)>>>2)<<2)),Fo(n),n=e+976|0,r=t[n>>2]|0,_r(e|0,8104,1e3)|0,c[r+2>>0]|0&&(t[e+4>>2]=2,t[e+12>>2]=4),t[n>>2]=r}function qu(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0;l=m,m=m+16|0,u=l,n||(t[u>>2]=r,pr(e,5,3197,u)),m=l}function Ia(){return t[2276]|0}function m0(){var e=0;return e=T_(20)|0,ua((e|0)!=0,2592),t[2277]=(t[2277]|0)+1,t[e>>2]=t[239],t[e+4>>2]=t[240],t[e+8>>2]=t[241],t[e+12>>2]=t[242],t[e+16>>2]=t[243],e|0}function ua(e,n){e=e|0,n=n|0;var r=0,u=0;u=m,m=m+16|0,r=u,e||(t[r>>2]=n,pr(0,5,3197,r)),m=u}function J0(e){e=e|0,C_(e),t[2277]=(t[2277]|0)+-1}function oa(e,n){e=e|0,n=n|0;var r=0;n?(qu(e,(Su(e)|0)==0,2629),r=1):(r=0,n=0),t[e+964>>2]=n,t[e+988>>2]=r}function ba(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;u=m,m=m+16|0,s=u+8|0,l=u+4|0,h=u,t[l>>2]=n,qu(e,(t[n+944>>2]|0)==0,2709),qu(e,(t[e+964>>2]|0)==0,2763),gs(e),n=e+948|0,t[h>>2]=(t[n>>2]|0)+(r<<2),t[s>>2]=t[h>>2],S0(n,s,l)|0,t[(t[l>>2]|0)+944>>2]=e,Qn(e),m=u}function gs(e){e=e|0;var n=0,r=0,u=0,l=0,s=0,h=0,D=0;if(r=Su(e)|0,r|0?(t[(Ti(e,0)|0)+944>>2]|0)!=(e|0):0){u=t[(t[e+976>>2]|0)+12>>2]|0,l=e+948|0,s=(u|0)==0,n=0;do h=t[(t[l>>2]|0)+(n<<2)>>2]|0,D=Si(h)|0,t[(t[l>>2]|0)+(n<<2)>>2]=D,t[D+944>>2]=e,s||tD[u&15](h,D,e,n),n=n+1|0;while((n|0)!=(r|0))}}function S0(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0,be=0,Se=0,ge=0,Ze=0,Ge=0;Ze=m,m=m+64|0,I=Ze+52|0,D=Ze+48|0,K=Ze+28|0,be=Ze+24|0,Se=Ze+20|0,ge=Ze,u=t[e>>2]|0,s=u,n=u+((t[n>>2]|0)-s>>2<<2)|0,u=e+4|0,l=t[u>>2]|0,h=e+8|0;do if(l>>>0<(t[h>>2]|0)>>>0){if((n|0)==(l|0)){t[n>>2]=t[r>>2],t[u>>2]=(t[u>>2]|0)+4;break}Vr(e,n,l,n+4|0),n>>>0<=r>>>0&&(r=(t[u>>2]|0)>>>0>r>>>0?r+4|0:r),t[n>>2]=t[r>>2]}else{u=(l-s>>2)+1|0,l=A0(e)|0,l>>>0<u>>>0&&hi(e),k=t[e>>2]|0,L=(t[h>>2]|0)-k|0,s=L>>1,Y(ge,L>>2>>>0<l>>>1>>>0?s>>>0<u>>>0?u:s:l,n-k>>2,e+8|0),k=ge+8|0,u=t[k>>2]|0,s=ge+12|0,L=t[s>>2]|0,h=L,S=u;do if((u|0)==(L|0)){if(L=ge+4|0,u=t[L>>2]|0,Ge=t[ge>>2]|0,l=Ge,u>>>0<=Ge>>>0){u=h-l>>1,u=(u|0)==0?1:u,Y(K,u,u>>>2,t[ge+16>>2]|0),t[be>>2]=t[L>>2],t[Se>>2]=t[k>>2],t[D>>2]=t[be>>2],t[I>>2]=t[Se>>2],Di(K,D,I),u=t[ge>>2]|0,t[ge>>2]=t[K>>2],t[K>>2]=u,u=K+4|0,Ge=t[L>>2]|0,t[L>>2]=t[u>>2],t[u>>2]=Ge,u=K+8|0,Ge=t[k>>2]|0,t[k>>2]=t[u>>2],t[u>>2]=Ge,u=K+12|0,Ge=t[s>>2]|0,t[s>>2]=t[u>>2],t[u>>2]=Ge,ii(K),u=t[k>>2]|0;break}s=u,h=((s-l>>2)+1|0)/-2|0,D=u+(h<<2)|0,l=S-s|0,s=l>>2,s&&(kg(D|0,u|0,l|0)|0,u=t[L>>2]|0),Ge=D+(s<<2)|0,t[k>>2]=Ge,t[L>>2]=u+(h<<2),u=Ge}while(0);t[u>>2]=t[r>>2],t[k>>2]=(t[k>>2]|0)+4,n=ft(e,ge,n)|0,ii(ge)}while(0);return m=Ze,n|0}function Qn(e){e=e|0;var n=0;do{if(n=e+984|0,c[n>>0]|0)break;c[n>>0]=1,T[e+504>>2]=w(ie),e=t[e+944>>2]|0}while((e|0)!=0)}function fc(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-4-u|0)>>>2)<<2)),yt(r))}function fi(e){return e=e|0,t[e+944>>2]|0}function $r(e){e=e|0,qu(e,(t[e+964>>2]|0)!=0,2832),Qn(e)}function $l(e){return e=e|0,(c[e+984>>0]|0)!=0|0}function la(e,n){e=e|0,n=n|0,kF(e,n,400)|0&&(_r(e|0,n|0,400)|0,Qn(e))}function hf(e){e=e|0;var n=Tt;return n=w(T[e+44>>2]),e=Le(n)|0,w(e?w(0):n)}function Bs(e){e=e|0;var n=Tt;return n=w(T[e+48>>2]),Le(n)|0&&(n=c[(t[e+976>>2]|0)+2>>0]|0?w(1):w(0)),w(n)}function Ba(e,n){e=e|0,n=n|0,t[e+980>>2]=n}function Us(e){return e=e|0,t[e+980>>2]|0}function g0(e,n){e=e|0,n=n|0;var r=0;r=e+4|0,(t[r>>2]|0)!=(n|0)&&(t[r>>2]=n,Qn(e))}function js(e){return e=e|0,t[e+4>>2]|0}function ji(e,n){e=e|0,n=n|0;var r=0;r=e+8|0,(t[r>>2]|0)!=(n|0)&&(t[r>>2]=n,Qn(e))}function U(e){return e=e|0,t[e+8>>2]|0}function z(e,n){e=e|0,n=n|0;var r=0;r=e+12|0,(t[r>>2]|0)!=(n|0)&&(t[r>>2]=n,Qn(e))}function G(e){return e=e|0,t[e+12>>2]|0}function $(e,n){e=e|0,n=n|0;var r=0;r=e+16|0,(t[r>>2]|0)!=(n|0)&&(t[r>>2]=n,Qn(e))}function Te(e){return e=e|0,t[e+16>>2]|0}function ye(e,n){e=e|0,n=n|0;var r=0;r=e+20|0,(t[r>>2]|0)!=(n|0)&&(t[r>>2]=n,Qn(e))}function Ae(e){return e=e|0,t[e+20>>2]|0}function Z(e,n){e=e|0,n=n|0;var r=0;r=e+24|0,(t[r>>2]|0)!=(n|0)&&(t[r>>2]=n,Qn(e))}function ke(e){return e=e|0,t[e+24>>2]|0}function Je(e,n){e=e|0,n=n|0;var r=0;r=e+28|0,(t[r>>2]|0)!=(n|0)&&(t[r>>2]=n,Qn(e))}function vt(e){return e=e|0,t[e+28>>2]|0}function ue(e,n){e=e|0,n=n|0;var r=0;r=e+32|0,(t[r>>2]|0)!=(n|0)&&(t[r>>2]=n,Qn(e))}function qe(e){return e=e|0,t[e+32>>2]|0}function nt(e,n){e=e|0,n=n|0;var r=0;r=e+36|0,(t[r>>2]|0)!=(n|0)&&(t[r>>2]=n,Qn(e))}function Ct(e){return e=e|0,t[e+36>>2]|0}function Mt(e,n){e=e|0,n=w(n);var r=0;r=e+40|0,w(T[r>>2])!=n&&(T[r>>2]=n,Qn(e))}function Pt(e,n){e=e|0,n=w(n);var r=0;r=e+44|0,w(T[r>>2])!=n&&(T[r>>2]=n,Qn(e))}function sn(e,n){e=e|0,n=w(n);var r=0;r=e+48|0,w(T[r>>2])!=n&&(T[r>>2]=n,Qn(e))}function rn(e,n){e=e|0,n=w(n);var r=0,u=0,l=0,s=0;s=Le(n)|0,r=(s^1)&1,u=e+52|0,l=e+56|0,(s|w(T[u>>2])==n?(t[l>>2]|0)==(r|0):0)||(T[u>>2]=n,t[l>>2]=r,Qn(e))}function Nt(e,n){e=e|0,n=w(n);var r=0,u=0;u=e+52|0,r=e+56|0,(w(T[u>>2])==n?(t[r>>2]|0)==2:0)||(T[u>>2]=n,u=Le(n)|0,t[r>>2]=u?3:2,Qn(e))}function Dn(e,n){e=e|0,n=n|0;var r=0,u=0;u=n+52|0,r=t[u+4>>2]|0,n=e,t[n>>2]=t[u>>2],t[n+4>>2]=r}function dr(e,n,r){e=e|0,n=n|0,r=w(r);var u=0,l=0,s=0;s=Le(r)|0,u=(s^1)&1,l=e+132+(n<<3)|0,n=e+132+(n<<3)+4|0,(s|w(T[l>>2])==r?(t[n>>2]|0)==(u|0):0)||(T[l>>2]=r,t[n>>2]=u,Qn(e))}function er(e,n,r){e=e|0,n=n|0,r=w(r);var u=0,l=0,s=0;s=Le(r)|0,u=s?0:2,l=e+132+(n<<3)|0,n=e+132+(n<<3)+4|0,(s|w(T[l>>2])==r?(t[n>>2]|0)==(u|0):0)||(T[l>>2]=r,t[n>>2]=u,Qn(e))}function Cr(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=n+132+(r<<3)|0,n=t[u+4>>2]|0,r=e,t[r>>2]=t[u>>2],t[r+4>>2]=n}function Rn(e,n,r){e=e|0,n=n|0,r=w(r);var u=0,l=0,s=0;s=Le(r)|0,u=(s^1)&1,l=e+60+(n<<3)|0,n=e+60+(n<<3)+4|0,(s|w(T[l>>2])==r?(t[n>>2]|0)==(u|0):0)||(T[l>>2]=r,t[n>>2]=u,Qn(e))}function Lr(e,n,r){e=e|0,n=n|0,r=w(r);var u=0,l=0,s=0;s=Le(r)|0,u=s?0:2,l=e+60+(n<<3)|0,n=e+60+(n<<3)+4|0,(s|w(T[l>>2])==r?(t[n>>2]|0)==(u|0):0)||(T[l>>2]=r,t[n>>2]=u,Qn(e))}function y0(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=n+60+(r<<3)|0,n=t[u+4>>2]|0,r=e,t[r>>2]=t[u>>2],t[r+4>>2]=n}function Nr(e,n){e=e|0,n=n|0;var r=0;r=e+60+(n<<3)+4|0,(t[r>>2]|0)!=3&&(T[e+60+(n<<3)>>2]=w(ie),t[r>>2]=3,Qn(e))}function it(e,n,r){e=e|0,n=n|0,r=w(r);var u=0,l=0,s=0;s=Le(r)|0,u=(s^1)&1,l=e+204+(n<<3)|0,n=e+204+(n<<3)+4|0,(s|w(T[l>>2])==r?(t[n>>2]|0)==(u|0):0)||(T[l>>2]=r,t[n>>2]=u,Qn(e))}function Et(e,n,r){e=e|0,n=n|0,r=w(r);var u=0,l=0,s=0;s=Le(r)|0,u=s?0:2,l=e+204+(n<<3)|0,n=e+204+(n<<3)+4|0,(s|w(T[l>>2])==r?(t[n>>2]|0)==(u|0):0)||(T[l>>2]=r,t[n>>2]=u,Qn(e))}function et(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=n+204+(r<<3)|0,n=t[u+4>>2]|0,r=e,t[r>>2]=t[u>>2],t[r+4>>2]=n}function Ft(e,n,r){e=e|0,n=n|0,r=w(r);var u=0,l=0,s=0;s=Le(r)|0,u=(s^1)&1,l=e+276+(n<<3)|0,n=e+276+(n<<3)+4|0,(s|w(T[l>>2])==r?(t[n>>2]|0)==(u|0):0)||(T[l>>2]=r,t[n>>2]=u,Qn(e))}function un(e,n){return e=e|0,n=n|0,w(T[e+276+(n<<3)>>2])}function fn(e,n){e=e|0,n=w(n);var r=0,u=0,l=0,s=0;s=Le(n)|0,r=(s^1)&1,u=e+348|0,l=e+352|0,(s|w(T[u>>2])==n?(t[l>>2]|0)==(r|0):0)||(T[u>>2]=n,t[l>>2]=r,Qn(e))}function Jn(e,n){e=e|0,n=w(n);var r=0,u=0;u=e+348|0,r=e+352|0,(w(T[u>>2])==n?(t[r>>2]|0)==2:0)||(T[u>>2]=n,u=Le(n)|0,t[r>>2]=u?3:2,Qn(e))}function Sr(e){e=e|0;var n=0;n=e+352|0,(t[n>>2]|0)!=3&&(T[e+348>>2]=w(ie),t[n>>2]=3,Qn(e))}function fu(e,n){e=e|0,n=n|0;var r=0,u=0;u=n+348|0,r=t[u+4>>2]|0,n=e,t[n>>2]=t[u>>2],t[n+4>>2]=r}function Lu(e,n){e=e|0,n=w(n);var r=0,u=0,l=0,s=0;s=Le(n)|0,r=(s^1)&1,u=e+356|0,l=e+360|0,(s|w(T[u>>2])==n?(t[l>>2]|0)==(r|0):0)||(T[u>>2]=n,t[l>>2]=r,Qn(e))}function T0(e,n){e=e|0,n=w(n);var r=0,u=0;u=e+356|0,r=e+360|0,(w(T[u>>2])==n?(t[r>>2]|0)==2:0)||(T[u>>2]=n,u=Le(n)|0,t[r>>2]=u?3:2,Qn(e))}function Z0(e){e=e|0;var n=0;n=e+360|0,(t[n>>2]|0)!=3&&(T[e+356>>2]=w(ie),t[n>>2]=3,Qn(e))}function Nu(e,n){e=e|0,n=n|0;var r=0,u=0;u=n+356|0,r=t[u+4>>2]|0,n=e,t[n>>2]=t[u>>2],t[n+4>>2]=r}function _i(e,n){e=e|0,n=w(n);var r=0,u=0,l=0,s=0;s=Le(n)|0,r=(s^1)&1,u=e+364|0,l=e+368|0,(s|w(T[u>>2])==n?(t[l>>2]|0)==(r|0):0)||(T[u>>2]=n,t[l>>2]=r,Qn(e))}function Po(e,n){e=e|0,n=w(n);var r=0,u=0,l=0,s=0;s=Le(n)|0,r=s?0:2,u=e+364|0,l=e+368|0,(s|w(T[u>>2])==n?(t[l>>2]|0)==(r|0):0)||(T[u>>2]=n,t[l>>2]=r,Qn(e))}function rl(e,n){e=e|0,n=n|0;var r=0,u=0;u=n+364|0,r=t[u+4>>2]|0,n=e,t[n>>2]=t[u>>2],t[n+4>>2]=r}function vf(e,n){e=e|0,n=w(n);var r=0,u=0,l=0,s=0;s=Le(n)|0,r=(s^1)&1,u=e+372|0,l=e+376|0,(s|w(T[u>>2])==n?(t[l>>2]|0)==(r|0):0)||(T[u>>2]=n,t[l>>2]=r,Qn(e))}function Tl(e,n){e=e|0,n=w(n);var r=0,u=0,l=0,s=0;s=Le(n)|0,r=s?0:2,u=e+372|0,l=e+376|0,(s|w(T[u>>2])==n?(t[l>>2]|0)==(r|0):0)||(T[u>>2]=n,t[l>>2]=r,Qn(e))}function mf(e,n){e=e|0,n=n|0;var r=0,u=0;u=n+372|0,r=t[u+4>>2]|0,n=e,t[n>>2]=t[u>>2],t[n+4>>2]=r}function Io(e,n){e=e|0,n=w(n);var r=0,u=0,l=0,s=0;s=Le(n)|0,r=(s^1)&1,u=e+380|0,l=e+384|0,(s|w(T[u>>2])==n?(t[l>>2]|0)==(r|0):0)||(T[u>>2]=n,t[l>>2]=r,Qn(e))}function ys(e,n){e=e|0,n=w(n);var r=0,u=0,l=0,s=0;s=Le(n)|0,r=s?0:2,u=e+380|0,l=e+384|0,(s|w(T[u>>2])==n?(t[l>>2]|0)==(r|0):0)||(T[u>>2]=n,t[l>>2]=r,Qn(e))}function zs(e,n){e=e|0,n=n|0;var r=0,u=0;u=n+380|0,r=t[u+4>>2]|0,n=e,t[n>>2]=t[u>>2],t[n+4>>2]=r}function bo(e,n){e=e|0,n=w(n);var r=0,u=0,l=0,s=0;s=Le(n)|0,r=(s^1)&1,u=e+388|0,l=e+392|0,(s|w(T[u>>2])==n?(t[l>>2]|0)==(r|0):0)||(T[u>>2]=n,t[l>>2]=r,Qn(e))}function Bo(e,n){e=e|0,n=w(n);var r=0,u=0,l=0,s=0;s=Le(n)|0,r=s?0:2,u=e+388|0,l=e+392|0,(s|w(T[u>>2])==n?(t[l>>2]|0)==(r|0):0)||(T[u>>2]=n,t[l>>2]=r,Qn(e))}function _s(e,n){e=e|0,n=n|0;var r=0,u=0;u=n+388|0,r=t[u+4>>2]|0,n=e,t[n>>2]=t[u>>2],t[n+4>>2]=r}function Qu(e,n){e=e|0,n=w(n);var r=0;r=e+396|0,w(T[r>>2])!=n&&(T[r>>2]=n,Qn(e))}function Tu(e){return e=e|0,w(T[e+396>>2])}function Ei(e){return e=e|0,w(T[e+400>>2])}function C0(e){return e=e|0,w(T[e+404>>2])}function $0(e){return e=e|0,w(T[e+408>>2])}function Uo(e){return e=e|0,w(T[e+412>>2])}function sa(e){return e=e|0,w(T[e+416>>2])}function es(e){return e=e|0,w(T[e+420>>2])}function tu(e,n){switch(e=e|0,n=n|0,qu(e,(n|0)<6,2918),n|0){case 0:{n=(t[e+496>>2]|0)==2?5:4;break}case 2:{n=(t[e+496>>2]|0)==2?4:5;break}default:}return w(T[e+424+(n<<2)>>2])}function ei(e,n){switch(e=e|0,n=n|0,qu(e,(n|0)<6,2918),n|0){case 0:{n=(t[e+496>>2]|0)==2?5:4;break}case 2:{n=(t[e+496>>2]|0)==2?4:5;break}default:}return w(T[e+448+(n<<2)>>2])}function ho(e,n){switch(e=e|0,n=n|0,qu(e,(n|0)<6,2918),n|0){case 0:{n=(t[e+496>>2]|0)==2?5:4;break}case 2:{n=(t[e+496>>2]|0)==2?4:5;break}default:}return w(T[e+472+(n<<2)>>2])}function Bi(e,n){e=e|0,n=n|0;var r=0,u=Tt;return r=t[e+4>>2]|0,(r|0)==(t[n+4>>2]|0)?r?(u=w(T[e>>2]),e=w(It(w(u-w(T[n>>2]))))<w(999999974e-13)):e=1:e=0,e|0}function Ci(e,n){e=w(e),n=w(n);var r=0;return Le(e)|0?r=Le(n)|0:r=w(It(w(e-n)))<w(999999974e-13),r|0}function gf(e,n){e=e|0,n=n|0,yf(e,n)}function yf(e,n){e=e|0,n=n|0;var r=0,u=0;r=m,m=m+16|0,u=r+4|0,t[u>>2]=0,t[u+4>>2]=0,t[u+8>>2]=0,Q0(u|0,e|0,n|0,0),pr(e,3,(c[u+11>>0]|0)<0?t[u>>2]|0:u,r),eP(u),m=r}function eo(e,n,r,u){e=w(e),n=w(n),r=r|0,u=u|0;var l=Tt;e=w(e*n),l=w(XE(e,w(1)));do if(Ci(l,w(0))|0)e=w(e-l);else{if(e=w(e-l),Ci(l,w(1))|0){e=w(e+w(1));break}if(r){e=w(e+w(1));break}u||(l>w(.5)?l=w(1):(u=Ci(l,w(.5))|0,l=w(u?1:0)),e=w(e+l))}while(0);return w(e/n)}function to(e,n,r,u,l,s,h,D,S,L,k,I,K){e=e|0,n=w(n),r=r|0,u=w(u),l=l|0,s=w(s),h=h|0,D=w(D),S=w(S),L=w(L),k=w(k),I=w(I),K=K|0;var be=0,Se=Tt,ge=Tt,Ze=Tt,Ge=Tt,ct=Tt,Me=Tt;return S<w(0)|L<w(0)?K=0:(((K|0)!=0?(Se=w(T[K+4>>2]),Se!=w(0)):0)?(Ze=w(eo(n,Se,0,0)),Ge=w(eo(u,Se,0,0)),ge=w(eo(s,Se,0,0)),Se=w(eo(D,Se,0,0))):(ge=s,Ze=n,Se=D,Ge=u),(l|0)==(e|0)?be=Ci(ge,Ze)|0:be=0,(h|0)==(r|0)?K=Ci(Se,Ge)|0:K=0,((be?0:(ct=w(n-k),!(xe(e,ct,S)|0)))?!(tt(e,ct,l,S)|0):0)?be=Ye(e,ct,l,s,S)|0:be=1,((K?0:(Me=w(u-I),!(xe(r,Me,L)|0)))?!(tt(r,Me,h,L)|0):0)?K=Ye(r,Me,h,D,L)|0:K=1,K=be&K),K|0}function xe(e,n,r){return e=e|0,n=w(n),r=w(r),(e|0)==1?e=Ci(n,r)|0:e=0,e|0}function tt(e,n,r,u){return e=e|0,n=w(n),r=r|0,u=w(u),(e|0)==2&(r|0)==0?n>=u?e=1:e=Ci(n,u)|0:e=0,e|0}function Ye(e,n,r,u,l){return e=e|0,n=w(n),r=r|0,u=w(u),l=w(l),(e|0)==2&(r|0)==2&u>n?l<=n?e=1:e=Ci(n,l)|0:e=0,e|0}function Yt(e,n,r,u,l,s,h,D,S,L,k){e=e|0,n=w(n),r=w(r),u=u|0,l=l|0,s=s|0,h=w(h),D=w(D),S=S|0,L=L|0,k=k|0;var I=0,K=0,be=0,Se=0,ge=Tt,Ze=Tt,Ge=0,ct=0,Me=0,Pe=0,Zt=0,Br=0,In=0,yn=0,Er=0,Pr=0,Ln=0,uu=Tt,ls=Tt,ss=Tt,as=0,ta=0;Ln=m,m=m+160|0,yn=Ln+152|0,In=Ln+120|0,Br=Ln+104|0,Me=Ln+72|0,Se=Ln+56|0,Zt=Ln+8|0,ct=Ln,Pe=(t[2279]|0)+1|0,t[2279]=Pe,Er=e+984|0,((c[Er>>0]|0)!=0?(t[e+512>>2]|0)!=(t[2278]|0):0)?Ge=4:(t[e+516>>2]|0)==(u|0)?Pr=0:Ge=4,(Ge|0)==4&&(t[e+520>>2]=0,t[e+924>>2]=-1,t[e+928>>2]=-1,T[e+932>>2]=w(-1),T[e+936>>2]=w(-1),Pr=1);e:do if(t[e+964>>2]|0)if(ge=w(Kt(e,2,h)),Ze=w(Kt(e,0,h)),I=e+916|0,ss=w(T[I>>2]),ls=w(T[e+920>>2]),uu=w(T[e+932>>2]),to(l,n,s,r,t[e+924>>2]|0,ss,t[e+928>>2]|0,ls,uu,w(T[e+936>>2]),ge,Ze,k)|0)Ge=22;else if(be=t[e+520>>2]|0,!be)Ge=21;else for(K=0;;){if(I=e+524+(K*24|0)|0,uu=w(T[I>>2]),ls=w(T[e+524+(K*24|0)+4>>2]),ss=w(T[e+524+(K*24|0)+16>>2]),to(l,n,s,r,t[e+524+(K*24|0)+8>>2]|0,uu,t[e+524+(K*24|0)+12>>2]|0,ls,ss,w(T[e+524+(K*24|0)+20>>2]),ge,Ze,k)|0){Ge=22;break e}if(K=K+1|0,K>>>0>=be>>>0){Ge=21;break}}else{if(S){if(I=e+916|0,!(Ci(w(T[I>>2]),n)|0)){Ge=21;break}if(!(Ci(w(T[e+920>>2]),r)|0)){Ge=21;break}if((t[e+924>>2]|0)!=(l|0)){Ge=21;break}I=(t[e+928>>2]|0)==(s|0)?I:0,Ge=22;break}if(be=t[e+520>>2]|0,!be)Ge=21;else for(K=0;;){if(I=e+524+(K*24|0)|0,((Ci(w(T[I>>2]),n)|0?Ci(w(T[e+524+(K*24|0)+4>>2]),r)|0:0)?(t[e+524+(K*24|0)+8>>2]|0)==(l|0):0)?(t[e+524+(K*24|0)+12>>2]|0)==(s|0):0){Ge=22;break e}if(K=K+1|0,K>>>0>=be>>>0){Ge=21;break}}}while(0);do if((Ge|0)==21)c[11697]|0?(I=0,Ge=28):(I=0,Ge=31);else if((Ge|0)==22){if(K=(c[11697]|0)!=0,!((I|0)!=0&(Pr^1)))if(K){Ge=28;break}else{Ge=31;break}Se=I+16|0,t[e+908>>2]=t[Se>>2],be=I+20|0,t[e+912>>2]=t[be>>2],(c[11698]|0)==0|K^1||(t[ct>>2]=Wr(Pe)|0,t[ct+4>>2]=Pe,pr(e,4,2972,ct),K=t[e+972>>2]|0,K|0&&P1[K&127](e),l=xn(l,S)|0,s=xn(s,S)|0,ta=+w(T[Se>>2]),as=+w(T[be>>2]),t[Zt>>2]=l,t[Zt+4>>2]=s,B[Zt+8>>3]=+n,B[Zt+16>>3]=+r,B[Zt+24>>3]=ta,B[Zt+32>>3]=as,t[Zt+40>>2]=L,pr(e,4,2989,Zt))}while(0);return(Ge|0)==28&&(K=Wr(Pe)|0,t[Se>>2]=K,t[Se+4>>2]=Pe,t[Se+8>>2]=Pr?3047:11699,pr(e,4,3038,Se),K=t[e+972>>2]|0,K|0&&P1[K&127](e),Zt=xn(l,S)|0,Ge=xn(s,S)|0,t[Me>>2]=Zt,t[Me+4>>2]=Ge,B[Me+8>>3]=+n,B[Me+16>>3]=+r,t[Me+24>>2]=L,pr(e,4,3049,Me),Ge=31),(Ge|0)==31&&(gu(e,n,r,u,l,s,h,D,S,k),c[11697]|0&&(K=t[2279]|0,Zt=Wr(K)|0,t[Br>>2]=Zt,t[Br+4>>2]=K,t[Br+8>>2]=Pr?3047:11699,pr(e,4,3083,Br),K=t[e+972>>2]|0,K|0&&P1[K&127](e),Zt=xn(l,S)|0,Br=xn(s,S)|0,as=+w(T[e+908>>2]),ta=+w(T[e+912>>2]),t[In>>2]=Zt,t[In+4>>2]=Br,B[In+8>>3]=as,B[In+16>>3]=ta,t[In+24>>2]=L,pr(e,4,3092,In)),t[e+516>>2]=u,I||(K=e+520|0,I=t[K>>2]|0,(I|0)==16&&(c[11697]|0&&pr(e,4,3124,yn),t[K>>2]=0,I=0),S?I=e+916|0:(t[K>>2]=I+1,I=e+524+(I*24|0)|0),T[I>>2]=n,T[I+4>>2]=r,t[I+8>>2]=l,t[I+12>>2]=s,t[I+16>>2]=t[e+908>>2],t[I+20>>2]=t[e+912>>2],I=0)),S&&(t[e+416>>2]=t[e+908>>2],t[e+420>>2]=t[e+912>>2],c[e+985>>0]=1,c[Er>>0]=0),t[2279]=(t[2279]|0)+-1,t[e+512>>2]=t[2278],m=Ln,Pr|(I|0)==0|0}function Kt(e,n,r){e=e|0,n=n|0,r=w(r);var u=Tt;return u=w(zi(e,n,r)),w(u+w(R0(e,n,r)))}function pr(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0;s=m,m=m+16|0,l=s,t[l>>2]=u,e?u=t[e+976>>2]|0:u=0,Hs(u,e,n,r,l),m=s}function Wr(e){return e=e|0,(e>>>0>60?3201:3201+(60-e)|0)|0}function xn(e,n){e=e|0,n=n|0;var r=0,u=0,l=0;return l=m,m=m+32|0,r=l+12|0,u=l,t[r>>2]=t[254],t[r+4>>2]=t[255],t[r+8>>2]=t[256],t[u>>2]=t[257],t[u+4>>2]=t[258],t[u+8>>2]=t[259],(e|0)>2?e=11699:e=t[(n?u:r)+(e<<2)>>2]|0,m=l,e|0}function gu(e,n,r,u,l,s,h,D,S,L){e=e|0,n=w(n),r=w(r),u=u|0,l=l|0,s=s|0,h=w(h),D=w(D),S=S|0,L=L|0;var k=0,I=0,K=0,be=0,Se=Tt,ge=Tt,Ze=Tt,Ge=Tt,ct=Tt,Me=Tt,Pe=Tt,Zt=0,Br=0,In=0,yn=Tt,Er=Tt,Pr=0,Ln=Tt,uu=0,ls=0,ss=0,as=0,ta=0,r2=0,i2=0,of=0,u2=0,Pc=0,Ic=0,o2=0,l2=0,s2=0,vi=0,lf=0,a2=0,Kf=0,f2=Tt,c2=Tt,bc=Tt,Bc=Tt,Xf=Tt,ql=0,Fa=0,Ns=0,sf=0,b1=0,B1=Tt,Uc=Tt,U1=Tt,j1=Tt,Wl=Tt,El=Tt,af=0,vu=Tt,z1=Tt,fs=Tt,Qf=Tt,cs=Tt,Jf=Tt,H1=0,q1=0,Zf=Tt,Vl=Tt,ff=0,W1=0,V1=0,G1=0,Tr=Tt,Bu=0,Dl=0,ds=0,Gl=0,Or=0,Bn=0,cf=0,mn=Tt,Y1=0,f0=0;cf=m,m=m+16|0,ql=cf+12|0,Fa=cf+8|0,Ns=cf+4|0,sf=cf,qu(e,(l|0)==0|(Le(n)|0)^1,3326),qu(e,(s|0)==0|(Le(r)|0)^1,3406),Dl=xl(e,u)|0,t[e+496>>2]=Dl,Or=B0(2,Dl)|0,Bn=B0(0,Dl)|0,T[e+440>>2]=w(zi(e,Or,h)),T[e+444>>2]=w(R0(e,Or,h)),T[e+428>>2]=w(zi(e,Bn,h)),T[e+436>>2]=w(R0(e,Bn,h)),T[e+464>>2]=w(O0(e,Or)),T[e+468>>2]=w(vo(e,Or)),T[e+452>>2]=w(O0(e,Bn)),T[e+460>>2]=w(vo(e,Bn)),T[e+488>>2]=w(Pu(e,Or,h)),T[e+492>>2]=w(Zu(e,Or,h)),T[e+476>>2]=w(Pu(e,Bn,h)),T[e+484>>2]=w(Zu(e,Bn,h));do if(t[e+964>>2]|0)ts(e,n,r,l,s,h,D);else{if(ds=e+948|0,Gl=(t[e+952>>2]|0)-(t[ds>>2]|0)>>2,!Gl){Es(e,n,r,l,s,h,D);break}if(S?0:fa(e,n,r,l,s,h,D)|0)break;gs(e),lf=e+508|0,c[lf>>0]=0,Or=B0(t[e+4>>2]|0,Dl)|0,Bn=_f(Or,Dl)|0,Bu=Hi(Or)|0,a2=t[e+8>>2]|0,W1=e+28|0,Kf=(t[W1>>2]|0)!=0,cs=Bu?h:D,Zf=Bu?D:h,f2=w($u(e,Or,h)),c2=w(Ds(e,Or,h)),Se=w($u(e,Bn,h)),Jf=w(Ar(e,Or,h)),Vl=w(Ar(e,Bn,h)),In=Bu?l:s,ff=Bu?s:l,Tr=Bu?Jf:Vl,ct=Bu?Vl:Jf,Qf=w(Kt(e,2,h)),Ge=w(Kt(e,0,h)),ge=w(w(An(e+364|0,h))-Tr),Ze=w(w(An(e+380|0,h))-Tr),Me=w(w(An(e+372|0,D))-ct),Pe=w(w(An(e+388|0,D))-ct),bc=Bu?ge:Me,Bc=Bu?Ze:Pe,Qf=w(n-Qf),n=w(Qf-Tr),Le(n)|0?Tr=n:Tr=w(Au(w(Qp(n,Ze)),ge)),z1=w(r-Ge),n=w(z1-ct),Le(n)|0?fs=n:fs=w(Au(w(Qp(n,Pe)),Me)),ge=Bu?Tr:fs,vu=Bu?fs:Tr;e:do if((In|0)==1)for(u=0,I=0;;){if(k=Ti(e,I)|0,!u)(w(nu(k))>w(0)?w(cu(k))>w(0):0)?u=k:u=0;else if(no(k)|0){be=0;break e}if(I=I+1|0,I>>>0>=Gl>>>0){be=u;break}}else be=0;while(0);Zt=be+500|0,Br=be+504|0,u=0,k=0,n=w(0),K=0;do{if(I=t[(t[ds>>2]|0)+(K<<2)>>2]|0,(t[I+36>>2]|0)==1)Fi(I),c[I+985>>0]=1,c[I+984>>0]=0;else{Jr(I),S&&x0(I,xl(I,Dl)|0,ge,vu,Tr);do if((t[I+24>>2]|0)!=1)if((I|0)==(be|0)){t[Zt>>2]=t[2278],T[Br>>2]=w(0);break}else{ni(e,I,Tr,l,fs,Tr,fs,s,Dl,L);break}else k|0&&(t[k+960>>2]=I),t[I+960>>2]=0,k=I,u=(u|0)==0?I:u;while(0);El=w(T[I+504>>2]),n=w(n+w(El+w(Kt(I,Or,Tr))))}K=K+1|0}while((K|0)!=(Gl|0));for(ss=n>ge,af=Kf&((In|0)==2&ss)?1:In,uu=(ff|0)==1,ta=uu&(S^1),r2=(af|0)==1,i2=(af|0)==2,of=976+(Or<<2)|0,u2=(ff|2|0)==2,s2=uu&(Kf^1),Pc=1040+(Bn<<2)|0,Ic=1040+(Or<<2)|0,o2=976+(Bn<<2)|0,l2=(ff|0)!=1,ss=Kf&((In|0)!=0&ss),ls=e+976|0,uu=uu^1,n=ge,Pr=0,as=0,El=w(0),Xf=w(0);;){e:do if(Pr>>>0<Gl>>>0)for(Br=t[ds>>2]|0,K=0,Pe=w(0),Me=w(0),Ze=w(0),ge=w(0),I=0,k=0,be=Pr;;){if(Zt=t[Br+(be<<2)>>2]|0,(t[Zt+36>>2]|0)!=1?(t[Zt+940>>2]=as,(t[Zt+24>>2]|0)!=1):0){if(Ge=w(Kt(Zt,Or,Tr)),vi=t[of>>2]|0,r=w(An(Zt+380+(vi<<3)|0,cs)),ct=w(T[Zt+504>>2]),r=w(Qp(r,ct)),r=w(Au(w(An(Zt+364+(vi<<3)|0,cs)),r)),Kf&(K|0)!=0&w(Ge+w(Me+r))>n){s=K,Ge=Pe,In=be;break e}Ge=w(Ge+r),r=w(Me+Ge),Ge=w(Pe+Ge),no(Zt)|0&&(Ze=w(Ze+w(nu(Zt))),ge=w(ge-w(ct*w(cu(Zt))))),k|0&&(t[k+960>>2]=Zt),t[Zt+960>>2]=0,K=K+1|0,k=Zt,I=(I|0)==0?Zt:I}else Ge=Pe,r=Me;if(be=be+1|0,be>>>0<Gl>>>0)Pe=Ge,Me=r;else{s=K,In=be;break}}else s=0,Ge=w(0),Ze=w(0),ge=w(0),I=0,In=Pr;while(0);vi=Ze>w(0)&Ze<w(1),yn=vi?w(1):Ze,vi=ge>w(0)&ge<w(1),Pe=vi?w(1):ge;do if(r2)vi=51;else if(Ge<bc&((Le(bc)|0)^1))n=bc,vi=51;else if(Ge>Bc&((Le(Bc)|0)^1))n=Bc,vi=51;else if(c[(t[ls>>2]|0)+3>>0]|0)vi=51;else{if(yn!=w(0)?w(nu(e))!=w(0):0){vi=53;break}n=Ge,vi=53}while(0);if((vi|0)==51&&(vi=0,Le(n)|0?vi=53:(Er=w(n-Ge),Ln=n)),(vi|0)==53&&(vi=0,Ge<w(0)?(Er=w(-Ge),Ln=n):(Er=w(0),Ln=n)),ta?0:(b1=(I|0)==0,!b1)){K=t[of>>2]|0,be=Er<w(0),ct=w(Er/Pe),Zt=Er>w(0),Me=w(Er/yn),Ze=w(0),Ge=w(0),n=w(0),k=I;do r=w(An(k+380+(K<<3)|0,cs)),ge=w(An(k+364+(K<<3)|0,cs)),ge=w(Qp(r,w(Au(ge,w(T[k+504>>2]))))),be?(r=w(ge*w(cu(k))),(r!=w(-0)?(mn=w(ge-w(ct*r)),B1=w(Kn(k,Or,mn,Ln,Tr)),mn!=B1):0)&&(Ze=w(Ze-w(B1-ge)),n=w(n+r))):((Zt?(Uc=w(nu(k)),Uc!=w(0)):0)?(mn=w(ge+w(Me*Uc)),U1=w(Kn(k,Or,mn,Ln,Tr)),mn!=U1):0)&&(Ze=w(Ze-w(U1-ge)),Ge=w(Ge-Uc)),k=t[k+960>>2]|0;while((k|0)!=0);if(n=w(Pe+n),ge=w(Er+Ze),b1)n=w(0);else{ct=w(yn+Ge),be=t[of>>2]|0,Zt=ge<w(0),Br=n==w(0),Me=w(ge/n),K=ge>w(0),ct=w(ge/ct),n=w(0);do{mn=w(An(I+380+(be<<3)|0,cs)),Ze=w(An(I+364+(be<<3)|0,cs)),Ze=w(Qp(mn,w(Au(Ze,w(T[I+504>>2]))))),Zt?(mn=w(Ze*w(cu(I))),ge=w(-mn),mn!=w(-0)?(mn=w(Me*ge),ge=w(Kn(I,Or,w(Ze+(Br?ge:mn)),Ln,Tr))):ge=Ze):(K?(j1=w(nu(I)),j1!=w(0)):0)?ge=w(Kn(I,Or,w(Ze+w(ct*j1)),Ln,Tr)):ge=Ze,n=w(n-w(ge-Ze)),Ge=w(Kt(I,Or,Tr)),r=w(Kt(I,Bn,Tr)),ge=w(ge+Ge),T[Fa>>2]=ge,t[sf>>2]=1,Ze=w(T[I+396>>2]);e:do if(Le(Ze)|0){k=Le(vu)|0;do if(!k){if(ss|(Wu(I,Bn,vu)|0|uu)||(e0(e,I)|0)!=4||(t[(_0(I,Bn)|0)+4>>2]|0)==3||(t[(E0(I,Bn)|0)+4>>2]|0)==3)break;T[ql>>2]=vu,t[Ns>>2]=1;break e}while(0);if(Wu(I,Bn,vu)|0){k=t[I+992+(t[o2>>2]<<2)>>2]|0,mn=w(r+w(An(k,vu))),T[ql>>2]=mn,k=l2&(t[k+4>>2]|0)==2,t[Ns>>2]=((Le(mn)|0|k)^1)&1;break}else{T[ql>>2]=vu,t[Ns>>2]=k?0:2;break}}else mn=w(ge-Ge),yn=w(mn/Ze),mn=w(Ze*mn),t[Ns>>2]=1,T[ql>>2]=w(r+(Bu?yn:mn));while(0);Fn(I,Or,Ln,Tr,sf,Fa),Fn(I,Bn,vu,Tr,Ns,ql);do if(Wu(I,Bn,vu)|0?0:(e0(e,I)|0)==4){if((t[(_0(I,Bn)|0)+4>>2]|0)==3){k=0;break}k=(t[(E0(I,Bn)|0)+4>>2]|0)!=3}else k=0;while(0);mn=w(T[Fa>>2]),yn=w(T[ql>>2]),Y1=t[sf>>2]|0,f0=t[Ns>>2]|0,Yt(I,Bu?mn:yn,Bu?yn:mn,Dl,Bu?Y1:f0,Bu?f0:Y1,Tr,fs,S&(k^1),3488,L)|0,c[lf>>0]=c[lf>>0]|c[I+508>>0],I=t[I+960>>2]|0}while((I|0)!=0)}}else n=w(0);if(n=w(Er+n),f0=n<w(0)&1,c[lf>>0]=f0|O[lf>>0],i2&n>w(0)?(k=t[of>>2]|0,((t[e+364+(k<<3)+4>>2]|0)!=0?(Wl=w(An(e+364+(k<<3)|0,cs)),Wl>=w(0)):0)?ge=w(Au(w(0),w(Wl-w(Ln-n)))):ge=w(0)):ge=n,Zt=Pr>>>0<In>>>0,Zt){be=t[ds>>2]|0,K=Pr,k=0;do I=t[be+(K<<2)>>2]|0,t[I+24>>2]|0||(k=((t[(_0(I,Or)|0)+4>>2]|0)==3&1)+k|0,k=k+((t[(E0(I,Or)|0)+4>>2]|0)==3&1)|0),K=K+1|0;while((K|0)!=(In|0));k?(Ge=w(0),r=w(0)):vi=101}else vi=101;e:do if((vi|0)==101)switch(vi=0,a2|0){case 1:{k=0,Ge=w(ge*w(.5)),r=w(0);break e}case 2:{k=0,Ge=ge,r=w(0);break e}case 3:{if(s>>>0<=1){k=0,Ge=w(0),r=w(0);break e}r=w((s+-1|0)>>>0),k=0,Ge=w(0),r=w(w(Au(ge,w(0)))/r);break e}case 5:{r=w(ge/w((s+1|0)>>>0)),k=0,Ge=r;break e}case 4:{r=w(ge/w(s>>>0)),k=0,Ge=w(r*w(.5));break e}default:{k=0,Ge=w(0),r=w(0);break e}}while(0);if(n=w(f2+Ge),Zt){Ze=w(ge/w(k|0)),K=t[ds>>2]|0,I=Pr,ge=w(0);do{k=t[K+(I<<2)>>2]|0;e:do if((t[k+36>>2]|0)!=1){switch(t[k+24>>2]|0){case 1:{if(ae(k,Or)|0){if(!S)break e;mn=w(re(k,Or,Ln)),mn=w(mn+w(O0(e,Or))),mn=w(mn+w(zi(k,Or,Tr))),T[k+400+(t[Ic>>2]<<2)>>2]=mn;break e}break}case 0:if(f0=(t[(_0(k,Or)|0)+4>>2]|0)==3,mn=w(Ze+n),n=f0?mn:n,S&&(f0=k+400+(t[Ic>>2]<<2)|0,T[f0>>2]=w(n+w(T[f0>>2]))),f0=(t[(E0(k,Or)|0)+4>>2]|0)==3,mn=w(Ze+n),n=f0?mn:n,ta){mn=w(r+w(Kt(k,Or,Tr))),ge=vu,n=w(n+w(mn+w(T[k+504>>2])));break e}else{n=w(n+w(r+w(Fe(k,Or,Tr)))),ge=w(Au(ge,w(Fe(k,Bn,Tr))));break e}default:}S&&(mn=w(Ge+w(O0(e,Or))),f0=k+400+(t[Ic>>2]<<2)|0,T[f0>>2]=w(mn+w(T[f0>>2])))}while(0);I=I+1|0}while((I|0)!=(In|0))}else ge=w(0);if(r=w(c2+n),u2?Ge=w(w(Kn(e,Bn,w(Vl+ge),Zf,h))-Vl):Ge=vu,Ze=w(w(Kn(e,Bn,w(Vl+(s2?vu:ge)),Zf,h))-Vl),Zt&S){I=Pr;do{K=t[(t[ds>>2]|0)+(I<<2)>>2]|0;do if((t[K+36>>2]|0)!=1){if((t[K+24>>2]|0)==1){if(ae(K,Bn)|0){if(mn=w(re(K,Bn,vu)),mn=w(mn+w(O0(e,Bn))),mn=w(mn+w(zi(K,Bn,Tr))),k=t[Pc>>2]|0,T[K+400+(k<<2)>>2]=mn,!(Le(mn)|0))break}else k=t[Pc>>2]|0;mn=w(O0(e,Bn)),T[K+400+(k<<2)>>2]=w(mn+w(zi(K,Bn,Tr)));break}k=e0(e,K)|0;do if((k|0)==4){if((t[(_0(K,Bn)|0)+4>>2]|0)==3){vi=139;break}if((t[(E0(K,Bn)|0)+4>>2]|0)==3){vi=139;break}if(Wu(K,Bn,vu)|0){n=Se;break}Y1=t[K+908+(t[of>>2]<<2)>>2]|0,t[ql>>2]=Y1,n=w(T[K+396>>2]),f0=Le(n)|0,ge=(t[q>>2]=Y1,w(T[q>>2])),f0?n=Ze:(Er=w(Kt(K,Bn,Tr)),mn=w(ge/n),n=w(n*ge),n=w(Er+(Bu?mn:n))),T[Fa>>2]=n,T[ql>>2]=w(w(Kt(K,Or,Tr))+ge),t[Ns>>2]=1,t[sf>>2]=1,Fn(K,Or,Ln,Tr,Ns,ql),Fn(K,Bn,vu,Tr,sf,Fa),n=w(T[ql>>2]),Er=w(T[Fa>>2]),mn=Bu?n:Er,n=Bu?Er:n,f0=((Le(mn)|0)^1)&1,Yt(K,mn,n,Dl,f0,((Le(n)|0)^1)&1,Tr,fs,1,3493,L)|0,n=Se}else vi=139;while(0);e:do if((vi|0)==139){vi=0,n=w(Ge-w(Fe(K,Bn,Tr)));do if((t[(_0(K,Bn)|0)+4>>2]|0)==3){if((t[(E0(K,Bn)|0)+4>>2]|0)!=3)break;n=w(Se+w(Au(w(0),w(n*w(.5)))));break e}while(0);if((t[(E0(K,Bn)|0)+4>>2]|0)==3){n=Se;break}if((t[(_0(K,Bn)|0)+4>>2]|0)==3){n=w(Se+w(Au(w(0),n)));break}switch(k|0){case 1:{n=Se;break e}case 2:{n=w(Se+w(n*w(.5)));break e}default:{n=w(Se+n);break e}}}while(0);mn=w(El+n),f0=K+400+(t[Pc>>2]<<2)|0,T[f0>>2]=w(mn+w(T[f0>>2]))}while(0);I=I+1|0}while((I|0)!=(In|0))}if(El=w(El+Ze),Xf=w(Au(Xf,r)),s=as+1|0,In>>>0>=Gl>>>0)break;n=Ln,Pr=In,as=s}do if(S){if(k=s>>>0>1,k?0:!(Re(e)|0))break;if(!(Le(vu)|0)){n=w(vu-El);e:do switch(t[e+12>>2]|0){case 3:{Se=w(Se+n),Me=w(0);break}case 2:{Se=w(Se+w(n*w(.5))),Me=w(0);break}case 4:{vu>El?Me=w(n/w(s>>>0)):Me=w(0);break}case 7:if(vu>El){Se=w(Se+w(n/w(s<<1>>>0))),Me=w(n/w(s>>>0)),Me=k?Me:w(0);break e}else{Se=w(Se+w(n*w(.5))),Me=w(0);break e}case 6:{Me=w(n/w(as>>>0)),Me=vu>El&k?Me:w(0);break}default:Me=w(0)}while(0);if(s|0)for(Zt=1040+(Bn<<2)|0,Br=976+(Bn<<2)|0,be=0,I=0;;){e:do if(I>>>0<Gl>>>0)for(ge=w(0),Ze=w(0),n=w(0),K=I;;){k=t[(t[ds>>2]|0)+(K<<2)>>2]|0;do if((t[k+36>>2]|0)!=1?(t[k+24>>2]|0)==0:0){if((t[k+940>>2]|0)!=(be|0))break e;if(st(k,Bn)|0&&(mn=w(T[k+908+(t[Br>>2]<<2)>>2]),n=w(Au(n,w(mn+w(Kt(k,Bn,Tr)))))),(e0(e,k)|0)!=5)break;Wl=w(mt(k)),Wl=w(Wl+w(zi(k,0,Tr))),mn=w(T[k+912>>2]),mn=w(w(mn+w(Kt(k,0,Tr)))-Wl),Wl=w(Au(Ze,Wl)),mn=w(Au(ge,mn)),ge=mn,Ze=Wl,n=w(Au(n,w(Wl+mn)))}while(0);if(k=K+1|0,k>>>0<Gl>>>0)K=k;else{K=k;break}}else Ze=w(0),n=w(0),K=I;while(0);if(ct=w(Me+n),r=Se,Se=w(Se+ct),I>>>0<K>>>0){Ge=w(r+Ze),k=I;do{I=t[(t[ds>>2]|0)+(k<<2)>>2]|0;e:do if((t[I+36>>2]|0)!=1?(t[I+24>>2]|0)==0:0)switch(e0(e,I)|0){case 1:{mn=w(r+w(zi(I,Bn,Tr))),T[I+400+(t[Zt>>2]<<2)>>2]=mn;break e}case 3:{mn=w(w(Se-w(R0(I,Bn,Tr)))-w(T[I+908+(t[Br>>2]<<2)>>2])),T[I+400+(t[Zt>>2]<<2)>>2]=mn;break e}case 2:{mn=w(r+w(w(ct-w(T[I+908+(t[Br>>2]<<2)>>2]))*w(.5))),T[I+400+(t[Zt>>2]<<2)>>2]=mn;break e}case 4:{if(mn=w(r+w(zi(I,Bn,Tr))),T[I+400+(t[Zt>>2]<<2)>>2]=mn,Wu(I,Bn,vu)|0||(Bu?(ge=w(T[I+908>>2]),n=w(ge+w(Kt(I,Or,Tr))),Ze=ct):(Ze=w(T[I+912>>2]),Ze=w(Ze+w(Kt(I,Bn,Tr))),n=ct,ge=w(T[I+908>>2])),Ci(n,ge)|0?Ci(Ze,w(T[I+912>>2]))|0:0))break e;Yt(I,n,Ze,Dl,1,1,Tr,fs,1,3501,L)|0;break e}case 5:{T[I+404>>2]=w(w(Ge-w(mt(I)))+w(re(I,0,vu)));break e}default:break e}while(0);k=k+1|0}while((k|0)!=(K|0))}if(be=be+1|0,(be|0)==(s|0))break;I=K}}}while(0);if(T[e+908>>2]=w(Kn(e,2,Qf,h,h)),T[e+912>>2]=w(Kn(e,0,z1,D,h)),((af|0)!=0?(H1=t[e+32>>2]|0,q1=(af|0)==2,!(q1&(H1|0)!=2)):0)?q1&(H1|0)==2&&(n=w(Jf+Ln),n=w(Au(w(Qp(n,w(Jt(e,Or,Xf,cs)))),Jf)),vi=198):(n=w(Kn(e,Or,Xf,cs,h)),vi=198),(vi|0)==198&&(T[e+908+(t[976+(Or<<2)>>2]<<2)>>2]=n),((ff|0)!=0?(V1=t[e+32>>2]|0,G1=(ff|0)==2,!(G1&(V1|0)!=2)):0)?G1&(V1|0)==2&&(n=w(Vl+vu),n=w(Au(w(Qp(n,w(Jt(e,Bn,w(Vl+El),Zf)))),Vl)),vi=204):(n=w(Kn(e,Bn,w(Vl+El),Zf,h)),vi=204),(vi|0)==204&&(T[e+908+(t[976+(Bn<<2)>>2]<<2)>>2]=n),S){if((t[W1>>2]|0)==2){I=976+(Bn<<2)|0,K=1040+(Bn<<2)|0,k=0;do be=Ti(e,k)|0,t[be+24>>2]|0||(Y1=t[I>>2]|0,mn=w(T[e+908+(Y1<<2)>>2]),f0=be+400+(t[K>>2]<<2)|0,mn=w(mn-w(T[f0>>2])),T[f0>>2]=w(mn-w(T[be+908+(Y1<<2)>>2]))),k=k+1|0;while((k|0)!=(Gl|0))}if(u|0){k=Bu?af:l;do On(e,u,Tr,k,fs,Dl,L),u=t[u+960>>2]|0;while((u|0)!=0)}if(k=(Or|2|0)==3,I=(Bn|2|0)==3,k|I){u=0;do K=t[(t[ds>>2]|0)+(u<<2)>>2]|0,(t[K+36>>2]|0)!=1&&(k&&Sn(e,K,Or),I&&Sn(e,K,Bn)),u=u+1|0;while((u|0)!=(Gl|0))}}}while(0);m=cf}function Ju(e,n){e=e|0,n=w(n);var r=0;Cn(e,n>=w(0),3147),r=n==w(0),T[e+4>>2]=r?w(0):n}function ti(e,n,r,u){e=e|0,n=w(n),r=w(r),u=u|0;var l=Tt,s=Tt,h=0,D=0,S=0;t[2278]=(t[2278]|0)+1,Jr(e),Wu(e,2,n)|0?(l=w(An(t[e+992>>2]|0,n)),S=1,l=w(l+w(Kt(e,2,n)))):(l=w(An(e+380|0,n)),l>=w(0)?S=2:(S=((Le(n)|0)^1)&1,l=n)),Wu(e,0,r)|0?(s=w(An(t[e+996>>2]|0,r)),D=1,s=w(s+w(Kt(e,0,n)))):(s=w(An(e+388|0,r)),s>=w(0)?D=2:(D=((Le(r)|0)^1)&1,s=r)),h=e+976|0,(Yt(e,l,s,u,S,D,n,r,1,3189,t[h>>2]|0)|0?(x0(e,t[e+496>>2]|0,n,r,n),Fu(e,w(T[(t[h>>2]|0)+4>>2]),w(0),w(0)),c[11696]|0):0)&&gf(e,7)}function Jr(e){e=e|0;var n=0,r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0;D=m,m=m+32|0,h=D+24|0,s=D+16|0,u=D+8|0,l=D,r=0;do n=e+380+(r<<3)|0,((t[e+380+(r<<3)+4>>2]|0)!=0?(S=n,L=t[S+4>>2]|0,k=u,t[k>>2]=t[S>>2],t[k+4>>2]=L,k=e+364+(r<<3)|0,L=t[k+4>>2]|0,S=l,t[S>>2]=t[k>>2],t[S+4>>2]=L,t[s>>2]=t[u>>2],t[s+4>>2]=t[u+4>>2],t[h>>2]=t[l>>2],t[h+4>>2]=t[l+4>>2],Bi(s,h)|0):0)||(n=e+348+(r<<3)|0),t[e+992+(r<<2)>>2]=n,r=r+1|0;while((r|0)!=2);m=D}function Wu(e,n,r){e=e|0,n=n|0,r=w(r);var u=0;switch(e=t[e+992+(t[976+(n<<2)>>2]<<2)>>2]|0,t[e+4>>2]|0){case 0:case 3:{e=0;break}case 1:{w(T[e>>2])<w(0)?e=0:u=5;break}case 2:{w(T[e>>2])<w(0)?e=0:e=(Le(r)|0)^1;break}default:u=5}return(u|0)==5&&(e=1),e|0}function An(e,n){switch(e=e|0,n=w(n),t[e+4>>2]|0){case 2:{n=w(w(w(T[e>>2])*n)/w(100));break}case 1:{n=w(T[e>>2]);break}default:n=w(ie)}return w(n)}function x0(e,n,r,u,l){e=e|0,n=n|0,r=w(r),u=w(u),l=w(l);var s=0,h=Tt;n=t[e+944>>2]|0?n:1,s=B0(t[e+4>>2]|0,n)|0,n=_f(s,n)|0,r=w(Rr(e,s,r)),u=w(Rr(e,n,u)),h=w(r+w(zi(e,s,l))),T[e+400+(t[1040+(s<<2)>>2]<<2)>>2]=h,r=w(r+w(R0(e,s,l))),T[e+400+(t[1e3+(s<<2)>>2]<<2)>>2]=r,r=w(u+w(zi(e,n,l))),T[e+400+(t[1040+(n<<2)>>2]<<2)>>2]=r,l=w(u+w(R0(e,n,l))),T[e+400+(t[1e3+(n<<2)>>2]<<2)>>2]=l}function Fu(e,n,r,u){e=e|0,n=w(n),r=w(r),u=w(u);var l=0,s=0,h=Tt,D=Tt,S=0,L=0,k=Tt,I=0,K=Tt,be=Tt,Se=Tt,ge=Tt;if(n!=w(0)&&(l=e+400|0,ge=w(T[l>>2]),s=e+404|0,Se=w(T[s>>2]),I=e+416|0,be=w(T[I>>2]),L=e+420|0,h=w(T[L>>2]),K=w(ge+r),k=w(Se+u),u=w(K+be),D=w(k+h),S=(t[e+988>>2]|0)==1,T[l>>2]=w(eo(ge,n,0,S)),T[s>>2]=w(eo(Se,n,0,S)),r=w(XE(w(be*n),w(1))),Ci(r,w(0))|0?s=0:s=(Ci(r,w(1))|0)^1,r=w(XE(w(h*n),w(1))),Ci(r,w(0))|0?l=0:l=(Ci(r,w(1))|0)^1,ge=w(eo(u,n,S&s,S&(s^1))),T[I>>2]=w(ge-w(eo(K,n,0,S))),ge=w(eo(D,n,S&l,S&(l^1))),T[L>>2]=w(ge-w(eo(k,n,0,S))),s=(t[e+952>>2]|0)-(t[e+948>>2]|0)>>2,s|0)){l=0;do Fu(Ti(e,l)|0,n,K,k),l=l+1|0;while((l|0)!=(s|0))}}function li(e,n,r,u,l){switch(e=e|0,n=n|0,r=r|0,u=u|0,l=l|0,r|0){case 5:case 0:{e=I8(t[489]|0,u,l)|0;break}default:e=QF(u,l)|0}return e|0}function Cl(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0;l=m,m=m+16|0,s=l,t[s>>2]=u,Hs(e,0,n,r,s),m=l}function Hs(e,n,r,u,l){if(e=e|0,n=n|0,r=r|0,u=u|0,l=l|0,e=e|0?e:956,rS[t[e+8>>2]&1](e,n,r,u,l)|0,(r|0)==5)$n();else return}function Vu(e,n,r){e=e|0,n=n|0,r=r|0,c[e+n>>0]=r&1}function aa(e,n){e=e|0,n=n|0;var r=0,u=0;t[e>>2]=0,t[e+4>>2]=0,t[e+8>>2]=0,r=n+4|0,u=(t[r>>2]|0)-(t[n>>2]|0)>>2,u|0&&(Xi(e,u),qs(e,t[n>>2]|0,t[r>>2]|0,u))}function Xi(e,n){e=e|0,n=n|0;var r=0;if((A0(e)|0)>>>0<n>>>0&&hi(e),n>>>0>1073741823)$n();else{r=pn(n<<2)|0,t[e+4>>2]=r,t[e>>2]=r,t[e+8>>2]=r+(n<<2);return}}function qs(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0,u=e+4|0,e=r-n|0,(e|0)>0&&(_r(t[u>>2]|0,n|0,e|0)|0,t[u>>2]=(t[u>>2]|0)+(e>>>2<<2))}function A0(e){return e=e|0,1073741823}function zi(e,n,r){return e=e|0,n=n|0,r=w(r),(Hi(n)|0?(t[e+96>>2]|0)!=0:0)?e=e+92|0:e=pt(e+60|0,t[1040+(n<<2)>>2]|0,992)|0,w(il(e,r))}function R0(e,n,r){return e=e|0,n=n|0,r=w(r),(Hi(n)|0?(t[e+104>>2]|0)!=0:0)?e=e+100|0:e=pt(e+60|0,t[1e3+(n<<2)>>2]|0,992)|0,w(il(e,r))}function Hi(e){return e=e|0,(e|1|0)==3|0}function il(e,n){return e=e|0,n=w(n),(t[e+4>>2]|0)==3?n=w(0):n=w(An(e,n)),w(n)}function xl(e,n){return e=e|0,n=n|0,e=t[e>>2]|0,((e|0)==0?(n|0)>1?n:1:e)|0}function B0(e,n){e=e|0,n=n|0;var r=0;e:do if((n|0)==2){switch(e|0){case 2:{e=3;break e}case 3:break;default:{r=4;break e}}e=2}else r=4;while(0);return e|0}function O0(e,n){e=e|0,n=n|0;var r=Tt;return((Hi(n)|0?(t[e+312>>2]|0)!=0:0)?(r=w(T[e+308>>2]),r>=w(0)):0)||(r=w(Au(w(T[(pt(e+276|0,t[1040+(n<<2)>>2]|0,992)|0)>>2]),w(0)))),w(r)}function vo(e,n){e=e|0,n=n|0;var r=Tt;return((Hi(n)|0?(t[e+320>>2]|0)!=0:0)?(r=w(T[e+316>>2]),r>=w(0)):0)||(r=w(Au(w(T[(pt(e+276|0,t[1e3+(n<<2)>>2]|0,992)|0)>>2]),w(0)))),w(r)}function Pu(e,n,r){e=e|0,n=n|0,r=w(r);var u=Tt;return((Hi(n)|0?(t[e+240>>2]|0)!=0:0)?(u=w(An(e+236|0,r)),u>=w(0)):0)||(u=w(Au(w(An(pt(e+204|0,t[1040+(n<<2)>>2]|0,992)|0,r)),w(0)))),w(u)}function Zu(e,n,r){e=e|0,n=n|0,r=w(r);var u=Tt;return((Hi(n)|0?(t[e+248>>2]|0)!=0:0)?(u=w(An(e+244|0,r)),u>=w(0)):0)||(u=w(Au(w(An(pt(e+204|0,t[1e3+(n<<2)>>2]|0,992)|0,r)),w(0)))),w(u)}function ts(e,n,r,u,l,s,h){e=e|0,n=w(n),r=w(r),u=u|0,l=l|0,s=w(s),h=w(h);var D=Tt,S=Tt,L=Tt,k=Tt,I=Tt,K=Tt,be=0,Se=0,ge=0;ge=m,m=m+16|0,be=ge,Se=e+964|0,qu(e,(t[Se>>2]|0)!=0,3519),D=w(Ar(e,2,n)),S=w(Ar(e,0,n)),L=w(Kt(e,2,n)),k=w(Kt(e,0,n)),Le(n)|0?I=n:I=w(Au(w(0),w(w(n-L)-D))),Le(r)|0?K=r:K=w(Au(w(0),w(w(r-k)-S))),(u|0)==1&(l|0)==1?(T[e+908>>2]=w(Kn(e,2,w(n-L),s,s)),n=w(Kn(e,0,w(r-k),h,s))):(iS[t[Se>>2]&1](be,e,I,u,K,l),I=w(D+w(T[be>>2])),K=w(n-L),T[e+908>>2]=w(Kn(e,2,(u|2|0)==2?I:K,s,s)),K=w(S+w(T[be+4>>2])),n=w(r-k),n=w(Kn(e,0,(l|2|0)==2?K:n,h,s))),T[e+912>>2]=n,m=ge}function Es(e,n,r,u,l,s,h){e=e|0,n=w(n),r=w(r),u=u|0,l=l|0,s=w(s),h=w(h);var D=Tt,S=Tt,L=Tt,k=Tt;L=w(Ar(e,2,s)),D=w(Ar(e,0,s)),k=w(Kt(e,2,s)),S=w(Kt(e,0,s)),n=w(n-k),T[e+908>>2]=w(Kn(e,2,(u|2|0)==2?L:n,s,s)),r=w(r-S),T[e+912>>2]=w(Kn(e,0,(l|2|0)==2?D:r,h,s))}function fa(e,n,r,u,l,s,h){e=e|0,n=w(n),r=w(r),u=u|0,l=l|0,s=w(s),h=w(h);var D=0,S=Tt,L=Tt;return D=(u|0)==2,((n<=w(0)&D?0:!(r<=w(0)&(l|0)==2))?!((u|0)==1&(l|0)==1):0)?e=0:(S=w(Kt(e,0,s)),L=w(Kt(e,2,s)),D=n<w(0)&D|(Le(n)|0),n=w(n-L),T[e+908>>2]=w(Kn(e,2,D?w(0):n,s,s)),n=w(r-S),D=r<w(0)&(l|0)==2|(Le(r)|0),T[e+912>>2]=w(Kn(e,0,D?w(0):n,h,s)),e=1),e|0}function _f(e,n){return e=e|0,n=n|0,_n(e)|0?e=B0(2,n)|0:e=0,e|0}function $u(e,n,r){return e=e|0,n=n|0,r=w(r),r=w(Pu(e,n,r)),w(r+w(O0(e,n)))}function Ds(e,n,r){return e=e|0,n=n|0,r=w(r),r=w(Zu(e,n,r)),w(r+w(vo(e,n)))}function Ar(e,n,r){e=e|0,n=n|0,r=w(r);var u=Tt;return u=w($u(e,n,r)),w(u+w(Ds(e,n,r)))}function no(e){return e=e|0,t[e+24>>2]|0?e=0:w(nu(e))!=w(0)?e=1:e=w(cu(e))!=w(0),e|0}function nu(e){e=e|0;var n=Tt;if(t[e+944>>2]|0){if(n=w(T[e+44>>2]),Le(n)|0)return n=w(T[e+40>>2]),e=n>w(0)&((Le(n)|0)^1),w(e?n:w(0))}else n=w(0);return w(n)}function cu(e){e=e|0;var n=Tt,r=0,u=Tt;do if(t[e+944>>2]|0){if(n=w(T[e+48>>2]),Le(n)|0){if(r=c[(t[e+976>>2]|0)+2>>0]|0,r<<24>>24==0?(u=w(T[e+40>>2]),u<w(0)&((Le(u)|0)^1)):0){n=w(-u);break}n=r<<24>>24?w(1):w(0)}}else n=w(0);while(0);return w(n)}function Fi(e){e=e|0;var n=0,r=0;if(jv(e+400|0,0,540)|0,c[e+985>>0]=1,gs(e),r=Su(e)|0,r|0){n=e+948|0,e=0;do Fi(t[(t[n>>2]|0)+(e<<2)>>2]|0),e=e+1|0;while((e|0)!=(r|0))}}function ni(e,n,r,u,l,s,h,D,S,L){e=e|0,n=n|0,r=w(r),u=u|0,l=w(l),s=w(s),h=w(h),D=D|0,S=S|0,L=L|0;var k=0,I=Tt,K=0,be=0,Se=Tt,ge=Tt,Ze=0,Ge=Tt,ct=0,Me=Tt,Pe=0,Zt=0,Br=0,In=0,yn=0,Er=0,Pr=0,Ln=0,uu=0,ls=0;uu=m,m=m+16|0,Br=uu+12|0,In=uu+8|0,yn=uu+4|0,Er=uu,Ln=B0(t[e+4>>2]|0,S)|0,Pe=Hi(Ln)|0,I=w(An(Tn(n)|0,Pe?s:h)),Zt=Wu(n,2,s)|0,Pr=Wu(n,0,h)|0;do if(Le(I)|0?0:!(Le(Pe?r:l)|0)){if(k=n+504|0,!(Le(w(T[k>>2]))|0)&&(!(ir(t[n+976>>2]|0,0)|0)||(t[n+500>>2]|0)==(t[2278]|0)))break;T[k>>2]=w(Au(I,w(Ar(n,Ln,s))))}else K=7;while(0);do if((K|0)==7){if(ct=Pe^1,!(ct|Zt^1)){h=w(An(t[n+992>>2]|0,s)),T[n+504>>2]=w(Au(h,w(Ar(n,2,s))));break}if(!(Pe|Pr^1)){h=w(An(t[n+996>>2]|0,h)),T[n+504>>2]=w(Au(h,w(Ar(n,0,s))));break}T[Br>>2]=w(ie),T[In>>2]=w(ie),t[yn>>2]=0,t[Er>>2]=0,Ge=w(Kt(n,2,s)),Me=w(Kt(n,0,s)),Zt?(Se=w(Ge+w(An(t[n+992>>2]|0,s))),T[Br>>2]=Se,t[yn>>2]=1,be=1):(be=0,Se=w(ie)),Pr?(I=w(Me+w(An(t[n+996>>2]|0,h))),T[In>>2]=I,t[Er>>2]=1,k=1):(k=0,I=w(ie)),K=t[e+32>>2]|0,Pe&(K|0)==2?K=2:(Le(Se)|0?!(Le(r)|0):0)&&(T[Br>>2]=r,t[yn>>2]=2,be=2,Se=r),(((K|0)==2&ct?0:Le(I)|0)?!(Le(l)|0):0)&&(T[In>>2]=l,t[Er>>2]=2,k=2,I=l),ge=w(T[n+396>>2]),Ze=Le(ge)|0;do if(Ze)K=be;else{if((be|0)==1&ct){T[In>>2]=w(w(Se-Ge)/ge),t[Er>>2]=1,k=1,K=1;break}Pe&(k|0)==1?(T[Br>>2]=w(ge*w(I-Me)),t[yn>>2]=1,k=1,K=1):K=be}while(0);ls=Le(r)|0,be=(e0(e,n)|0)!=4,(Pe|Zt|((u|0)!=1|ls)|(be|(K|0)==1)?0:(T[Br>>2]=r,t[yn>>2]=1,!Ze))&&(T[In>>2]=w(w(r-Ge)/ge),t[Er>>2]=1,k=1),(Pr|ct|((D|0)!=1|(Le(l)|0))|(be|(k|0)==1)?0:(T[In>>2]=l,t[Er>>2]=1,!Ze))&&(T[Br>>2]=w(ge*w(l-Me)),t[yn>>2]=1),Fn(n,2,s,s,yn,Br),Fn(n,0,h,s,Er,In),r=w(T[Br>>2]),l=w(T[In>>2]),Yt(n,r,l,S,t[yn>>2]|0,t[Er>>2]|0,s,h,0,3565,L)|0,h=w(T[n+908+(t[976+(Ln<<2)>>2]<<2)>>2]),T[n+504>>2]=w(Au(h,w(Ar(n,Ln,s))))}while(0);t[n+500>>2]=t[2278],m=uu}function Kn(e,n,r,u,l){return e=e|0,n=n|0,r=w(r),u=w(u),l=w(l),u=w(Jt(e,n,r,u)),w(Au(u,w(Ar(e,n,l))))}function e0(e,n){return e=e|0,n=n|0,n=n+20|0,n=t[((t[n>>2]|0)==0?e+16|0:n)>>2]|0,((n|0)==5?_n(t[e+4>>2]|0)|0:0)&&(n=1),n|0}function _0(e,n){return e=e|0,n=n|0,(Hi(n)|0?(t[e+96>>2]|0)!=0:0)?n=4:n=t[1040+(n<<2)>>2]|0,e+60+(n<<3)|0}function E0(e,n){return e=e|0,n=n|0,(Hi(n)|0?(t[e+104>>2]|0)!=0:0)?n=5:n=t[1e3+(n<<2)>>2]|0,e+60+(n<<3)|0}function Fn(e,n,r,u,l,s){switch(e=e|0,n=n|0,r=w(r),u=w(u),l=l|0,s=s|0,r=w(An(e+380+(t[976+(n<<2)>>2]<<3)|0,r)),r=w(r+w(Kt(e,n,u))),t[l>>2]|0){case 2:case 1:{l=Le(r)|0,u=w(T[s>>2]),T[s>>2]=l|u<r?u:r;break}case 0:{Le(r)|0||(t[l>>2]=2,T[s>>2]=r);break}default:}}function ae(e,n){return e=e|0,n=n|0,e=e+132|0,(Hi(n)|0?(t[(pt(e,4,948)|0)+4>>2]|0)!=0:0)?e=1:e=(t[(pt(e,t[1040+(n<<2)>>2]|0,948)|0)+4>>2]|0)!=0,e|0}function re(e,n,r){e=e|0,n=n|0,r=w(r);var u=0,l=0;return e=e+132|0,(Hi(n)|0?(u=pt(e,4,948)|0,(t[u+4>>2]|0)!=0):0)?l=4:(u=pt(e,t[1040+(n<<2)>>2]|0,948)|0,t[u+4>>2]|0?l=4:r=w(0)),(l|0)==4&&(r=w(An(u,r))),w(r)}function Fe(e,n,r){e=e|0,n=n|0,r=w(r);var u=Tt;return u=w(T[e+908+(t[976+(n<<2)>>2]<<2)>>2]),u=w(u+w(zi(e,n,r))),w(u+w(R0(e,n,r)))}function Re(e){e=e|0;var n=0,r=0,u=0;e:do if(_n(t[e+4>>2]|0)|0)n=0;else if((t[e+16>>2]|0)!=5)if(r=Su(e)|0,!r)n=0;else for(n=0;;){if(u=Ti(e,n)|0,(t[u+24>>2]|0)==0?(t[u+20>>2]|0)==5:0){n=1;break e}if(n=n+1|0,n>>>0>=r>>>0){n=0;break}}else n=1;while(0);return n|0}function st(e,n){e=e|0,n=n|0;var r=Tt;return r=w(T[e+908+(t[976+(n<<2)>>2]<<2)>>2]),r>=w(0)&((Le(r)|0)^1)|0}function mt(e){e=e|0;var n=Tt,r=0,u=0,l=0,s=0,h=0,D=0,S=Tt;if(r=t[e+968>>2]|0,r)S=w(T[e+908>>2]),n=w(T[e+912>>2]),n=w($8[r&0](e,S,n)),qu(e,(Le(n)|0)^1,3573);else{s=Su(e)|0;do if(s|0){for(r=0,l=0;;){if(u=Ti(e,l)|0,t[u+940>>2]|0){h=8;break}if((t[u+24>>2]|0)!=1)if(D=(e0(e,u)|0)==5,D){r=u;break}else r=(r|0)==0?u:r;if(l=l+1|0,l>>>0>=s>>>0){h=8;break}}if((h|0)==8&&!r)break;return n=w(mt(r)),w(n+w(T[r+404>>2]))}while(0);n=w(T[e+912>>2])}return w(n)}function Jt(e,n,r,u){e=e|0,n=n|0,r=w(r),u=w(u);var l=Tt,s=0;return _n(n)|0?(n=1,s=3):Hi(n)|0?(n=0,s=3):(u=w(ie),l=w(ie)),(s|0)==3&&(l=w(An(e+364+(n<<3)|0,u)),u=w(An(e+380+(n<<3)|0,u))),s=u<r&(u>=w(0)&((Le(u)|0)^1)),r=s?u:r,s=l>=w(0)&((Le(l)|0)^1)&r<l,w(s?l:r)}function On(e,n,r,u,l,s,h){e=e|0,n=n|0,r=w(r),u=u|0,l=w(l),s=s|0,h=h|0;var D=Tt,S=Tt,L=0,k=0,I=Tt,K=Tt,be=Tt,Se=0,ge=0,Ze=0,Ge=0,ct=Tt,Me=0;Ze=B0(t[e+4>>2]|0,s)|0,Se=_f(Ze,s)|0,ge=Hi(Ze)|0,I=w(Kt(n,2,r)),K=w(Kt(n,0,r)),Wu(n,2,r)|0?D=w(I+w(An(t[n+992>>2]|0,r))):(ae(n,2)|0?Bt(n,2)|0:0)?(D=w(T[e+908>>2]),S=w(O0(e,2)),S=w(D-w(S+w(vo(e,2)))),D=w(re(n,2,r)),D=w(Kn(n,2,w(S-w(D+w(Pi(n,2,r)))),r,r))):D=w(ie),Wu(n,0,l)|0?S=w(K+w(An(t[n+996>>2]|0,l))):(ae(n,0)|0?Bt(n,0)|0:0)?(S=w(T[e+912>>2]),ct=w(O0(e,0)),ct=w(S-w(ct+w(vo(e,0)))),S=w(re(n,0,l)),S=w(Kn(n,0,w(ct-w(S+w(Pi(n,0,l)))),l,r))):S=w(ie),L=Le(D)|0,k=Le(S)|0;do if(L^k?(be=w(T[n+396>>2]),!(Le(be)|0)):0)if(L){D=w(I+w(w(S-K)*be));break}else{ct=w(K+w(w(D-I)/be)),S=k?ct:S;break}while(0);k=Le(D)|0,L=Le(S)|0,k|L&&(Me=(k^1)&1,u=r>w(0)&((u|0)!=0&k),D=ge?D:u?r:D,Yt(n,D,S,s,ge?Me:u?2:Me,k&(L^1)&1,D,S,0,3623,h)|0,D=w(T[n+908>>2]),D=w(D+w(Kt(n,2,r))),S=w(T[n+912>>2]),S=w(S+w(Kt(n,0,r)))),Yt(n,D,S,s,1,1,D,S,1,3635,h)|0,(Bt(n,Ze)|0?!(ae(n,Ze)|0):0)?(Me=t[976+(Ze<<2)>>2]|0,ct=w(T[e+908+(Me<<2)>>2]),ct=w(ct-w(T[n+908+(Me<<2)>>2])),ct=w(ct-w(vo(e,Ze))),ct=w(ct-w(R0(n,Ze,r))),ct=w(ct-w(Pi(n,Ze,ge?r:l))),T[n+400+(t[1040+(Ze<<2)>>2]<<2)>>2]=ct):Ge=21;do if((Ge|0)==21){if(ae(n,Ze)|0?0:(t[e+8>>2]|0)==1){Me=t[976+(Ze<<2)>>2]|0,ct=w(T[e+908+(Me<<2)>>2]),ct=w(w(ct-w(T[n+908+(Me<<2)>>2]))*w(.5)),T[n+400+(t[1040+(Ze<<2)>>2]<<2)>>2]=ct;break}(ae(n,Ze)|0?0:(t[e+8>>2]|0)==2)&&(Me=t[976+(Ze<<2)>>2]|0,ct=w(T[e+908+(Me<<2)>>2]),ct=w(ct-w(T[n+908+(Me<<2)>>2])),T[n+400+(t[1040+(Ze<<2)>>2]<<2)>>2]=ct)}while(0);(Bt(n,Se)|0?!(ae(n,Se)|0):0)?(Me=t[976+(Se<<2)>>2]|0,ct=w(T[e+908+(Me<<2)>>2]),ct=w(ct-w(T[n+908+(Me<<2)>>2])),ct=w(ct-w(vo(e,Se))),ct=w(ct-w(R0(n,Se,r))),ct=w(ct-w(Pi(n,Se,ge?l:r))),T[n+400+(t[1040+(Se<<2)>>2]<<2)>>2]=ct):Ge=30;do if((Ge|0)==30?!(ae(n,Se)|0):0){if((e0(e,n)|0)==2){Me=t[976+(Se<<2)>>2]|0,ct=w(T[e+908+(Me<<2)>>2]),ct=w(w(ct-w(T[n+908+(Me<<2)>>2]))*w(.5)),T[n+400+(t[1040+(Se<<2)>>2]<<2)>>2]=ct;break}Me=(e0(e,n)|0)==3,Me^(t[e+28>>2]|0)==2&&(Me=t[976+(Se<<2)>>2]|0,ct=w(T[e+908+(Me<<2)>>2]),ct=w(ct-w(T[n+908+(Me<<2)>>2])),T[n+400+(t[1040+(Se<<2)>>2]<<2)>>2]=ct)}while(0)}function Sn(e,n,r){e=e|0,n=n|0,r=r|0;var u=Tt,l=0;l=t[976+(r<<2)>>2]|0,u=w(T[n+908+(l<<2)>>2]),u=w(w(T[e+908+(l<<2)>>2])-u),u=w(u-w(T[n+400+(t[1040+(r<<2)>>2]<<2)>>2])),T[n+400+(t[1e3+(r<<2)>>2]<<2)>>2]=u}function _n(e){return e=e|0,(e|1|0)==1|0}function Tn(e){e=e|0;var n=Tt;switch(t[e+56>>2]|0){case 0:case 3:{n=w(T[e+40>>2]),n>w(0)&((Le(n)|0)^1)?e=c[(t[e+976>>2]|0)+2>>0]|0?1056:992:e=1056;break}default:e=e+52|0}return e|0}function ir(e,n){return e=e|0,n=n|0,(c[e+n>>0]|0)!=0|0}function Bt(e,n){return e=e|0,n=n|0,e=e+132|0,(Hi(n)|0?(t[(pt(e,5,948)|0)+4>>2]|0)!=0:0)?e=1:e=(t[(pt(e,t[1e3+(n<<2)>>2]|0,948)|0)+4>>2]|0)!=0,e|0}function Pi(e,n,r){e=e|0,n=n|0,r=w(r);var u=0,l=0;return e=e+132|0,(Hi(n)|0?(u=pt(e,5,948)|0,(t[u+4>>2]|0)!=0):0)?l=4:(u=pt(e,t[1e3+(n<<2)>>2]|0,948)|0,t[u+4>>2]|0?l=4:r=w(0)),(l|0)==4&&(r=w(An(u,r))),w(r)}function Rr(e,n,r){return e=e|0,n=n|0,r=w(r),ae(e,n)|0?r=w(re(e,n,r)):r=w(-w(Pi(e,n,r))),w(r)}function mr(e){return e=w(e),T[q>>2]=e,t[q>>2]|0|0}function Y(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>1073741823)$n();else{l=pn(n<<2)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r<<2)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n<<2)}function ri(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(0-(l>>2)<<2)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function ii(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~((u+-4-n|0)>>>2)<<2)),e=t[e>>2]|0,e|0&&yt(e)}function Vr(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0;if(h=e+4|0,D=t[h>>2]|0,l=D-u|0,s=l>>2,e=n+(s<<2)|0,e>>>0<r>>>0){u=D;do t[u>>2]=t[e>>2],e=e+4|0,u=(t[h>>2]|0)+4|0,t[h>>2]=u;while(e>>>0<r>>>0)}s|0&&kg(D+(0-s<<2)|0,n|0,l|0)|0}function ft(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0;return D=n+4|0,S=t[D>>2]|0,l=t[e>>2]|0,h=r,s=h-l|0,u=S+(0-(s>>2)<<2)|0,t[D>>2]=u,(s|0)>0&&_r(u|0,l|0,s|0)|0,l=e+4|0,s=n+8|0,u=(t[l>>2]|0)-h|0,(u|0)>0&&(_r(t[s>>2]|0,r|0,u|0)|0,t[s>>2]=(t[s>>2]|0)+(u>>>2<<2)),h=t[e>>2]|0,t[e>>2]=t[D>>2],t[D>>2]=h,h=t[l>>2]|0,t[l>>2]=t[s>>2],t[s>>2]=h,h=e+8|0,r=n+12|0,e=t[h>>2]|0,t[h>>2]=t[r>>2],t[r>>2]=e,t[n>>2]=t[D>>2],S|0}function Di(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;if(h=t[n>>2]|0,s=t[r>>2]|0,(h|0)!=(s|0)){l=e+8|0,r=((s+-4-h|0)>>>2)+1|0,e=h,u=t[l>>2]|0;do t[u>>2]=t[e>>2],u=(t[l>>2]|0)+4|0,t[l>>2]=u,e=e+4|0;while((e|0)!=(s|0));t[n>>2]=h+(r<<2)}}function ru(){we()}function D0(){var e=0;return e=pn(4)|0,Un(e),e|0}function Un(e){e=e|0,t[e>>2]=m0()|0}function t0(e){e=e|0,e|0&&(ro(e),yt(e))}function ro(e){e=e|0,J0(t[e>>2]|0)}function mo(e,n,r){e=e|0,n=n|0,r=r|0,Vu(t[e>>2]|0,n,r)}function n0(e,n){e=e|0,n=w(n),Ju(t[e>>2]|0,n)}function jo(e,n){return e=e|0,n=n|0,ir(t[e>>2]|0,n)|0}function io(){var e=0;return e=pn(8)|0,Ua(e,0),e|0}function Ua(e,n){e=e|0,n=n|0,n?n=Yn(t[n>>2]|0)|0:n=cr()|0,t[e>>2]=n,t[e+4>>2]=0,Ba(n,e)}function Ef(e){e=e|0;var n=0;return n=pn(8)|0,Ua(n,e),n|0}function cc(e){e=e|0,e|0&&(ws(e),yt(e))}function ws(e){e=e|0;var n=0;zu(t[e>>2]|0),n=e+4|0,e=t[n>>2]|0,t[n>>2]=0,e|0&&(ca(e),yt(e))}function ca(e){e=e|0,U0(e)}function U0(e){e=e|0,e=t[e>>2]|0,e|0&&qr(e|0)}function dc(e){return e=e|0,Us(e)|0}function ja(e){e=e|0;var n=0,r=0;r=e+4|0,n=t[r>>2]|0,t[r>>2]=0,n|0&&(ca(n),yt(n)),po(t[e>>2]|0)}function D2(e,n){e=e|0,n=n|0,la(t[e>>2]|0,t[n>>2]|0)}function rd(e,n){e=e|0,n=n|0,Z(t[e>>2]|0,n)}function id(e,n,r){e=e|0,n=n|0,r=+r,dr(t[e>>2]|0,n,w(r))}function go(e,n,r){e=e|0,n=n|0,r=+r,er(t[e>>2]|0,n,w(r))}function qc(e,n){e=e|0,n=n|0,z(t[e>>2]|0,n)}function Al(e,n){e=e|0,n=n|0,$(t[e>>2]|0,n)}function ul(e,n){e=e|0,n=n|0,ye(t[e>>2]|0,n)}function w2(e,n){e=e|0,n=n|0,g0(t[e>>2]|0,n)}function Ws(e,n){e=e|0,n=n|0,Je(t[e>>2]|0,n)}function Rl(e,n){e=e|0,n=n|0,ji(t[e>>2]|0,n)}function ud(e,n,r){e=e|0,n=n|0,r=+r,Rn(t[e>>2]|0,n,w(r))}function zo(e,n,r){e=e|0,n=n|0,r=+r,Lr(t[e>>2]|0,n,w(r))}function za(e,n){e=e|0,n=n|0,Nr(t[e>>2]|0,n)}function Ha(e,n){e=e|0,n=n|0,ue(t[e>>2]|0,n)}function qa(e,n){e=e|0,n=n|0,nt(t[e>>2]|0,n)}function da(e,n){e=e|0,n=+n,Mt(t[e>>2]|0,w(n))}function Ss(e,n){e=e|0,n=+n,rn(t[e>>2]|0,w(n))}function Ts(e,n){e=e|0,n=+n,Nt(t[e>>2]|0,w(n))}function ns(e,n){e=e|0,n=+n,Pt(t[e>>2]|0,w(n))}function Ho(e,n){e=e|0,n=+n,sn(t[e>>2]|0,w(n))}function Df(e,n){e=e|0,n=+n,fn(t[e>>2]|0,w(n))}function ol(e,n){e=e|0,n=+n,Jn(t[e>>2]|0,w(n))}function Gu(e){e=e|0,Sr(t[e>>2]|0)}function Wa(e,n){e=e|0,n=+n,Lu(t[e>>2]|0,w(n))}function r0(e,n){e=e|0,n=+n,T0(t[e>>2]|0,w(n))}function j0(e){e=e|0,Z0(t[e>>2]|0)}function wf(e,n){e=e|0,n=+n,_i(t[e>>2]|0,w(n))}function Wc(e,n){e=e|0,n=+n,Po(t[e>>2]|0,w(n))}function pc(e,n){e=e|0,n=+n,vf(t[e>>2]|0,w(n))}function Ol(e,n){e=e|0,n=+n,Tl(t[e>>2]|0,w(n))}function Cs(e,n){e=e|0,n=+n,Io(t[e>>2]|0,w(n))}function pa(e,n){e=e|0,n=+n,ys(t[e>>2]|0,w(n))}function od(e,n){e=e|0,n=+n,bo(t[e>>2]|0,w(n))}function ha(e,n){e=e|0,n=+n,Bo(t[e>>2]|0,w(n))}function hc(e,n){e=e|0,n=+n,Qu(t[e>>2]|0,w(n))}function Vc(e,n,r){e=e|0,n=n|0,r=+r,Ft(t[e>>2]|0,n,w(r))}function qi(e,n,r){e=e|0,n=n|0,r=+r,it(t[e>>2]|0,n,w(r))}function y(e,n,r){e=e|0,n=n|0,r=+r,Et(t[e>>2]|0,n,w(r))}function g(e){return e=e|0,ke(t[e>>2]|0)|0}function A(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0;u=m,m=m+16|0,l=u,Cr(l,t[n>>2]|0,r),F(e,l),m=u}function F(e,n){e=e|0,n=n|0,b(e,t[n+4>>2]|0,+w(T[n>>2]))}function b(e,n,r){e=e|0,n=n|0,r=+r,t[e>>2]=n,B[e+8>>3]=r}function J(e){return e=e|0,G(t[e>>2]|0)|0}function pe(e){return e=e|0,Te(t[e>>2]|0)|0}function gt(e){return e=e|0,Ae(t[e>>2]|0)|0}function xt(e){return e=e|0,js(t[e>>2]|0)|0}function kt(e){return e=e|0,vt(t[e>>2]|0)|0}function xr(e){return e=e|0,U(t[e>>2]|0)|0}function i0(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0;u=m,m=m+16|0,l=u,y0(l,t[n>>2]|0,r),F(e,l),m=u}function du(e){return e=e|0,qe(t[e>>2]|0)|0}function z0(e){return e=e|0,Ct(t[e>>2]|0)|0}function Ml(e,n){e=e|0,n=n|0;var r=0,u=0;r=m,m=m+16|0,u=r,Dn(u,t[n>>2]|0),F(e,u),m=r}function u0(e){return e=e|0,+ +w(hf(t[e>>2]|0))}function We(e){return e=e|0,+ +w(Bs(t[e>>2]|0))}function ze(e,n){e=e|0,n=n|0;var r=0,u=0;r=m,m=m+16|0,u=r,fu(u,t[n>>2]|0),F(e,u),m=r}function lt(e,n){e=e|0,n=n|0;var r=0,u=0;r=m,m=m+16|0,u=r,Nu(u,t[n>>2]|0),F(e,u),m=r}function $t(e,n){e=e|0,n=n|0;var r=0,u=0;r=m,m=m+16|0,u=r,rl(u,t[n>>2]|0),F(e,u),m=r}function Wn(e,n){e=e|0,n=n|0;var r=0,u=0;r=m,m=m+16|0,u=r,mf(u,t[n>>2]|0),F(e,u),m=r}function si(e,n){e=e|0,n=n|0;var r=0,u=0;r=m,m=m+16|0,u=r,zs(u,t[n>>2]|0),F(e,u),m=r}function ur(e,n){e=e|0,n=n|0;var r=0,u=0;r=m,m=m+16|0,u=r,_s(u,t[n>>2]|0),F(e,u),m=r}function ci(e){return e=e|0,+ +w(Tu(t[e>>2]|0))}function Qi(e,n){return e=e|0,n=n|0,+ +w(un(t[e>>2]|0,n))}function Gr(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0;u=m,m=m+16|0,l=u,et(l,t[n>>2]|0,r),F(e,l),m=u}function Cu(e,n,r){e=e|0,n=n|0,r=r|0,ba(t[e>>2]|0,t[n>>2]|0,r)}function Va(e,n){e=e|0,n=n|0,ku(t[e>>2]|0,t[n>>2]|0)}function Ga(e){return e=e|0,Su(t[e>>2]|0)|0}function ld(e){return e=e|0,e=fi(t[e>>2]|0)|0,e?e=dc(e)|0:e=0,e|0}function S2(e,n){return e=e|0,n=n|0,e=Ti(t[e>>2]|0,n)|0,e?e=dc(e)|0:e=0,e|0}function T2(e,n){e=e|0,n=n|0;var r=0,u=0;u=pn(4)|0,Sf(u,n),r=e+4|0,n=t[r>>2]|0,t[r>>2]=u,n|0&&(ca(n),yt(n)),oa(t[e>>2]|0,1)}function Sf(e,n){e=e|0,n=n|0,sl(e,n)}function sd(e,n,r,u,l,s){e=e|0,n=n|0,r=w(r),u=u|0,l=w(l),s=s|0;var h=0,D=0;h=m,m=m+16|0,D=h,hh(D,Us(n)|0,+r,u,+l,s),T[e>>2]=w(+B[D>>3]),T[e+4>>2]=w(+B[D+8>>3]),m=h}function hh(e,n,r,u,l,s){e=e|0,n=n|0,r=+r,u=u|0,l=+l,s=s|0;var h=0,D=0,S=0,L=0,k=0;h=m,m=m+32|0,k=h+8|0,L=h+20|0,S=h,D=h+16|0,B[k>>3]=r,t[L>>2]=u,B[S>>3]=l,t[D>>2]=s,Gc(e,t[n+4>>2]|0,k,L,S,D),m=h}function Gc(e,n,r,u,l,s){e=e|0,n=n|0,r=r|0,u=u|0,l=l|0,s=s|0;var h=0,D=0;h=m,m=m+16|0,D=h,ka(D),n=yo(n)|0,vh(e,n,+B[r>>3],t[u>>2]|0,+B[l>>3],t[s>>2]|0),La(D),m=h}function yo(e){return e=e|0,t[e>>2]|0}function vh(e,n,r,u,l,s){e=e|0,n=n|0,r=+r,u=u|0,l=+l,s=s|0;var h=0;h=_o(mh()|0)|0,r=+kl(r),u=ad(u)|0,l=+kl(l),fd(e,Qr(0,h|0,n|0,+r,u|0,+l,ad(s)|0)|0)}function mh(){var e=0;return c[7608]|0||(Kc(9120),e=7608,t[e>>2]=1,t[e+4>>2]=0),9120}function _o(e){return e=e|0,t[e+8>>2]|0}function kl(e){return e=+e,+ +Ya(e)}function ad(e){return e=e|0,dd(e)|0}function fd(e,n){e=e|0,n=n|0;var r=0,u=0,l=0;l=m,m=m+32|0,r=l,u=n,u&1?(C2(r,0),eu(u|0,r|0)|0,Yc(e,r),Ir(r)):(t[e>>2]=t[n>>2],t[e+4>>2]=t[n+4>>2],t[e+8>>2]=t[n+8>>2],t[e+12>>2]=t[n+12>>2]),m=l}function C2(e,n){e=e|0,n=n|0,cd(e,n),t[e+8>>2]=0,c[e+24>>0]=0}function Yc(e,n){e=e|0,n=n|0,n=n+8|0,t[e>>2]=t[n>>2],t[e+4>>2]=t[n+4>>2],t[e+8>>2]=t[n+8>>2],t[e+12>>2]=t[n+12>>2]}function Ir(e){e=e|0,c[e+24>>0]=0}function cd(e,n){e=e|0,n=n|0,t[e>>2]=n}function dd(e){return e=e|0,e|0}function Ya(e){return e=+e,+e}function Kc(e){e=e|0,ll(e,x2()|0,4)}function x2(){return 1064}function ll(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,t[e+4>>2]=r,t[e+8>>2]=bt(n|0,r+1|0)|0}function sl(e,n){e=e|0,n=n|0,n=t[n>>2]|0,t[e>>2]=n,Ri(n|0)}function gh(e){e=e|0;var n=0,r=0;r=e+4|0,n=t[r>>2]|0,t[r>>2]=0,n|0&&(ca(n),yt(n)),oa(t[e>>2]|0,0)}function Tf(e){e=e|0,$r(t[e>>2]|0)}function Xc(e){return e=e|0,$l(t[e>>2]|0)|0}function A2(e,n,r,u){e=e|0,n=+n,r=+r,u=u|0,ti(t[e>>2]|0,w(n),w(r),u)}function yh(e){return e=e|0,+ +w(Ei(t[e>>2]|0))}function al(e){return e=e|0,+ +w($0(t[e>>2]|0))}function va(e){return e=e|0,+ +w(C0(t[e>>2]|0))}function R2(e){return e=e|0,+ +w(Uo(t[e>>2]|0))}function O2(e){return e=e|0,+ +w(sa(t[e>>2]|0))}function vc(e){return e=e|0,+ +w(es(t[e>>2]|0))}function _h(e,n){e=e|0,n=n|0,B[e>>3]=+w(Ei(t[n>>2]|0)),B[e+8>>3]=+w($0(t[n>>2]|0)),B[e+16>>3]=+w(C0(t[n>>2]|0)),B[e+24>>3]=+w(Uo(t[n>>2]|0)),B[e+32>>3]=+w(sa(t[n>>2]|0)),B[e+40>>3]=+w(es(t[n>>2]|0))}function M2(e,n){return e=e|0,n=n|0,+ +w(tu(t[e>>2]|0,n))}function pd(e,n){return e=e|0,n=n|0,+ +w(ei(t[e>>2]|0,n))}function Qc(e,n){return e=e|0,n=n|0,+ +w(ho(t[e>>2]|0,n))}function Jc(){return Ia()|0}function Vs(){k2(),ma(),Zc(),mc(),gc(),hd()}function k2(){PO(11713,4938,1)}function ma(){eO(10448)}function Zc(){P7(10408)}function mc(){i7(10324)}function gc(){_E(10096)}function hd(){Eh(9132)}function Eh(e){e=e|0;var n=0,r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0,be=0,Se=0,ge=0,Ze=0,Ge=0,ct=0,Me=0,Pe=0,Zt=0,Br=0,In=0,yn=0,Er=0,Pr=0,Ln=0,uu=0,ls=0,ss=0,as=0,ta=0,r2=0,i2=0,of=0,u2=0,Pc=0,Ic=0,o2=0,l2=0,s2=0,vi=0,lf=0,a2=0,Kf=0,f2=0,c2=0,bc=0,Bc=0,Xf=0,ql=0,Fa=0,Ns=0,sf=0,b1=0,B1=0,Uc=0,U1=0,j1=0,Wl=0,El=0,af=0,vu=0,z1=0,fs=0,Qf=0,cs=0,Jf=0,H1=0,q1=0,Zf=0,Vl=0,ff=0,W1=0,V1=0,G1=0,Tr=0,Bu=0,Dl=0,ds=0,Gl=0,Or=0,Bn=0,cf=0;n=m,m=m+672|0,r=n+656|0,cf=n+648|0,Bn=n+640|0,Or=n+632|0,Gl=n+624|0,ds=n+616|0,Dl=n+608|0,Bu=n+600|0,Tr=n+592|0,G1=n+584|0,V1=n+576|0,W1=n+568|0,ff=n+560|0,Vl=n+552|0,Zf=n+544|0,q1=n+536|0,H1=n+528|0,Jf=n+520|0,cs=n+512|0,Qf=n+504|0,fs=n+496|0,z1=n+488|0,vu=n+480|0,af=n+472|0,El=n+464|0,Wl=n+456|0,j1=n+448|0,U1=n+440|0,Uc=n+432|0,B1=n+424|0,b1=n+416|0,sf=n+408|0,Ns=n+400|0,Fa=n+392|0,ql=n+384|0,Xf=n+376|0,Bc=n+368|0,bc=n+360|0,c2=n+352|0,f2=n+344|0,Kf=n+336|0,a2=n+328|0,lf=n+320|0,vi=n+312|0,s2=n+304|0,l2=n+296|0,o2=n+288|0,Ic=n+280|0,Pc=n+272|0,u2=n+264|0,of=n+256|0,i2=n+248|0,r2=n+240|0,ta=n+232|0,as=n+224|0,ss=n+216|0,ls=n+208|0,uu=n+200|0,Ln=n+192|0,Pr=n+184|0,Er=n+176|0,yn=n+168|0,In=n+160|0,Br=n+152|0,Zt=n+144|0,Pe=n+136|0,Me=n+128|0,ct=n+120|0,Ge=n+112|0,Ze=n+104|0,ge=n+96|0,Se=n+88|0,be=n+80|0,K=n+72|0,I=n+64|0,k=n+56|0,L=n+48|0,S=n+40|0,D=n+32|0,h=n+24|0,s=n+16|0,l=n+8|0,u=n,Cf(e,3646),$c(e,3651,2)|0,Dh(e,3665,2)|0,am(e,3682,18)|0,t[cf>>2]=19,t[cf+4>>2]=0,t[r>>2]=t[cf>>2],t[r+4>>2]=t[cf+4>>2],Gs(e,3690,r)|0,t[Bn>>2]=1,t[Bn+4>>2]=0,t[r>>2]=t[Bn>>2],t[r+4>>2]=t[Bn+4>>2],ga(e,3696,r)|0,t[Or>>2]=2,t[Or+4>>2]=0,t[r>>2]=t[Or>>2],t[r+4>>2]=t[Or+4>>2],iu(e,3706,r)|0,t[Gl>>2]=1,t[Gl+4>>2]=0,t[r>>2]=t[Gl>>2],t[r+4>>2]=t[Gl+4>>2],M0(e,3722,r)|0,t[ds>>2]=2,t[ds+4>>2]=0,t[r>>2]=t[ds>>2],t[r+4>>2]=t[ds+4>>2],M0(e,3734,r)|0,t[Dl>>2]=3,t[Dl+4>>2]=0,t[r>>2]=t[Dl>>2],t[r+4>>2]=t[Dl+4>>2],iu(e,3753,r)|0,t[Bu>>2]=4,t[Bu+4>>2]=0,t[r>>2]=t[Bu>>2],t[r+4>>2]=t[Bu+4>>2],iu(e,3769,r)|0,t[Tr>>2]=5,t[Tr+4>>2]=0,t[r>>2]=t[Tr>>2],t[r+4>>2]=t[Tr+4>>2],iu(e,3783,r)|0,t[G1>>2]=6,t[G1+4>>2]=0,t[r>>2]=t[G1>>2],t[r+4>>2]=t[G1+4>>2],iu(e,3796,r)|0,t[V1>>2]=7,t[V1+4>>2]=0,t[r>>2]=t[V1>>2],t[r+4>>2]=t[V1+4>>2],iu(e,3813,r)|0,t[W1>>2]=8,t[W1+4>>2]=0,t[r>>2]=t[W1>>2],t[r+4>>2]=t[W1+4>>2],iu(e,3825,r)|0,t[ff>>2]=3,t[ff+4>>2]=0,t[r>>2]=t[ff>>2],t[r+4>>2]=t[ff+4>>2],M0(e,3843,r)|0,t[Vl>>2]=4,t[Vl+4>>2]=0,t[r>>2]=t[Vl>>2],t[r+4>>2]=t[Vl+4>>2],M0(e,3853,r)|0,t[Zf>>2]=9,t[Zf+4>>2]=0,t[r>>2]=t[Zf>>2],t[r+4>>2]=t[Zf+4>>2],iu(e,3870,r)|0,t[q1>>2]=10,t[q1+4>>2]=0,t[r>>2]=t[q1>>2],t[r+4>>2]=t[q1+4>>2],iu(e,3884,r)|0,t[H1>>2]=11,t[H1+4>>2]=0,t[r>>2]=t[H1>>2],t[r+4>>2]=t[H1+4>>2],iu(e,3896,r)|0,t[Jf>>2]=1,t[Jf+4>>2]=0,t[r>>2]=t[Jf>>2],t[r+4>>2]=t[Jf+4>>2],o0(e,3907,r)|0,t[cs>>2]=2,t[cs+4>>2]=0,t[r>>2]=t[cs>>2],t[r+4>>2]=t[cs+4>>2],o0(e,3915,r)|0,t[Qf>>2]=3,t[Qf+4>>2]=0,t[r>>2]=t[Qf>>2],t[r+4>>2]=t[Qf+4>>2],o0(e,3928,r)|0,t[fs>>2]=4,t[fs+4>>2]=0,t[r>>2]=t[fs>>2],t[r+4>>2]=t[fs+4>>2],o0(e,3948,r)|0,t[z1>>2]=5,t[z1+4>>2]=0,t[r>>2]=t[z1>>2],t[r+4>>2]=t[z1+4>>2],o0(e,3960,r)|0,t[vu>>2]=6,t[vu+4>>2]=0,t[r>>2]=t[vu>>2],t[r+4>>2]=t[vu+4>>2],o0(e,3974,r)|0,t[af>>2]=7,t[af+4>>2]=0,t[r>>2]=t[af>>2],t[r+4>>2]=t[af+4>>2],o0(e,3983,r)|0,t[El>>2]=20,t[El+4>>2]=0,t[r>>2]=t[El>>2],t[r+4>>2]=t[El+4>>2],Gs(e,3999,r)|0,t[Wl>>2]=8,t[Wl+4>>2]=0,t[r>>2]=t[Wl>>2],t[r+4>>2]=t[Wl+4>>2],o0(e,4012,r)|0,t[j1>>2]=9,t[j1+4>>2]=0,t[r>>2]=t[j1>>2],t[r+4>>2]=t[j1+4>>2],o0(e,4022,r)|0,t[U1>>2]=21,t[U1+4>>2]=0,t[r>>2]=t[U1>>2],t[r+4>>2]=t[U1+4>>2],Gs(e,4039,r)|0,t[Uc>>2]=10,t[Uc+4>>2]=0,t[r>>2]=t[Uc>>2],t[r+4>>2]=t[Uc+4>>2],o0(e,4053,r)|0,t[B1>>2]=11,t[B1+4>>2]=0,t[r>>2]=t[B1>>2],t[r+4>>2]=t[B1+4>>2],o0(e,4065,r)|0,t[b1>>2]=12,t[b1+4>>2]=0,t[r>>2]=t[b1>>2],t[r+4>>2]=t[b1+4>>2],o0(e,4084,r)|0,t[sf>>2]=13,t[sf+4>>2]=0,t[r>>2]=t[sf>>2],t[r+4>>2]=t[sf+4>>2],o0(e,4097,r)|0,t[Ns>>2]=14,t[Ns+4>>2]=0,t[r>>2]=t[Ns>>2],t[r+4>>2]=t[Ns+4>>2],o0(e,4117,r)|0,t[Fa>>2]=15,t[Fa+4>>2]=0,t[r>>2]=t[Fa>>2],t[r+4>>2]=t[Fa+4>>2],o0(e,4129,r)|0,t[ql>>2]=16,t[ql+4>>2]=0,t[r>>2]=t[ql>>2],t[r+4>>2]=t[ql+4>>2],o0(e,4148,r)|0,t[Xf>>2]=17,t[Xf+4>>2]=0,t[r>>2]=t[Xf>>2],t[r+4>>2]=t[Xf+4>>2],o0(e,4161,r)|0,t[Bc>>2]=18,t[Bc+4>>2]=0,t[r>>2]=t[Bc>>2],t[r+4>>2]=t[Bc+4>>2],o0(e,4181,r)|0,t[bc>>2]=5,t[bc+4>>2]=0,t[r>>2]=t[bc>>2],t[r+4>>2]=t[bc+4>>2],M0(e,4196,r)|0,t[c2>>2]=6,t[c2+4>>2]=0,t[r>>2]=t[c2>>2],t[r+4>>2]=t[c2+4>>2],M0(e,4206,r)|0,t[f2>>2]=7,t[f2+4>>2]=0,t[r>>2]=t[f2>>2],t[r+4>>2]=t[f2+4>>2],M0(e,4217,r)|0,t[Kf>>2]=3,t[Kf+4>>2]=0,t[r>>2]=t[Kf>>2],t[r+4>>2]=t[Kf+4>>2],rs(e,4235,r)|0,t[a2>>2]=1,t[a2+4>>2]=0,t[r>>2]=t[a2>>2],t[r+4>>2]=t[a2+4>>2],Ka(e,4251,r)|0,t[lf>>2]=4,t[lf+4>>2]=0,t[r>>2]=t[lf>>2],t[r+4>>2]=t[lf+4>>2],rs(e,4263,r)|0,t[vi>>2]=5,t[vi+4>>2]=0,t[r>>2]=t[vi>>2],t[r+4>>2]=t[vi+4>>2],rs(e,4279,r)|0,t[s2>>2]=6,t[s2+4>>2]=0,t[r>>2]=t[s2>>2],t[r+4>>2]=t[s2+4>>2],rs(e,4293,r)|0,t[l2>>2]=7,t[l2+4>>2]=0,t[r>>2]=t[l2>>2],t[r+4>>2]=t[l2+4>>2],rs(e,4306,r)|0,t[o2>>2]=8,t[o2+4>>2]=0,t[r>>2]=t[o2>>2],t[r+4>>2]=t[o2+4>>2],rs(e,4323,r)|0,t[Ic>>2]=9,t[Ic+4>>2]=0,t[r>>2]=t[Ic>>2],t[r+4>>2]=t[Ic+4>>2],rs(e,4335,r)|0,t[Pc>>2]=2,t[Pc+4>>2]=0,t[r>>2]=t[Pc>>2],t[r+4>>2]=t[Pc+4>>2],Ka(e,4353,r)|0,t[u2>>2]=12,t[u2+4>>2]=0,t[r>>2]=t[u2>>2],t[r+4>>2]=t[u2+4>>2],uo(e,4363,r)|0,t[of>>2]=1,t[of+4>>2]=0,t[r>>2]=t[of>>2],t[r+4>>2]=t[of+4>>2],fl(e,4376,r)|0,t[i2>>2]=2,t[i2+4>>2]=0,t[r>>2]=t[i2>>2],t[r+4>>2]=t[i2+4>>2],fl(e,4388,r)|0,t[r2>>2]=13,t[r2+4>>2]=0,t[r>>2]=t[r2>>2],t[r+4>>2]=t[r2+4>>2],uo(e,4402,r)|0,t[ta>>2]=14,t[ta+4>>2]=0,t[r>>2]=t[ta>>2],t[r+4>>2]=t[ta+4>>2],uo(e,4411,r)|0,t[as>>2]=15,t[as+4>>2]=0,t[r>>2]=t[as>>2],t[r+4>>2]=t[as+4>>2],uo(e,4421,r)|0,t[ss>>2]=16,t[ss+4>>2]=0,t[r>>2]=t[ss>>2],t[r+4>>2]=t[ss+4>>2],uo(e,4433,r)|0,t[ls>>2]=17,t[ls+4>>2]=0,t[r>>2]=t[ls>>2],t[r+4>>2]=t[ls+4>>2],uo(e,4446,r)|0,t[uu>>2]=18,t[uu+4>>2]=0,t[r>>2]=t[uu>>2],t[r+4>>2]=t[uu+4>>2],uo(e,4458,r)|0,t[Ln>>2]=3,t[Ln+4>>2]=0,t[r>>2]=t[Ln>>2],t[r+4>>2]=t[Ln+4>>2],fl(e,4471,r)|0,t[Pr>>2]=1,t[Pr+4>>2]=0,t[r>>2]=t[Pr>>2],t[r+4>>2]=t[Pr+4>>2],yc(e,4486,r)|0,t[Er>>2]=10,t[Er+4>>2]=0,t[r>>2]=t[Er>>2],t[r+4>>2]=t[Er+4>>2],rs(e,4496,r)|0,t[yn>>2]=11,t[yn+4>>2]=0,t[r>>2]=t[yn>>2],t[r+4>>2]=t[yn+4>>2],rs(e,4508,r)|0,t[In>>2]=3,t[In+4>>2]=0,t[r>>2]=t[In>>2],t[r+4>>2]=t[In+4>>2],Ka(e,4519,r)|0,t[Br>>2]=4,t[Br+4>>2]=0,t[r>>2]=t[Br>>2],t[r+4>>2]=t[Br+4>>2],L2(e,4530,r)|0,t[Zt>>2]=19,t[Zt+4>>2]=0,t[r>>2]=t[Zt>>2],t[r+4>>2]=t[Zt+4>>2],wh(e,4542,r)|0,t[Pe>>2]=12,t[Pe+4>>2]=0,t[r>>2]=t[Pe>>2],t[r+4>>2]=t[Pe+4>>2],xf(e,4554,r)|0,t[Me>>2]=13,t[Me+4>>2]=0,t[r>>2]=t[Me>>2],t[r+4>>2]=t[Me+4>>2],Af(e,4568,r)|0,t[ct>>2]=2,t[ct+4>>2]=0,t[r>>2]=t[ct>>2],t[r+4>>2]=t[ct+4>>2],e1(e,4578,r)|0,t[Ge>>2]=20,t[Ge+4>>2]=0,t[r>>2]=t[Ge>>2],t[r+4>>2]=t[Ge+4>>2],Ll(e,4587,r)|0,t[Ze>>2]=22,t[Ze+4>>2]=0,t[r>>2]=t[Ze>>2],t[r+4>>2]=t[Ze+4>>2],Gs(e,4602,r)|0,t[ge>>2]=23,t[ge+4>>2]=0,t[r>>2]=t[ge>>2],t[r+4>>2]=t[ge+4>>2],Gs(e,4619,r)|0,t[Se>>2]=14,t[Se+4>>2]=0,t[r>>2]=t[Se>>2],t[r+4>>2]=t[Se+4>>2],t1(e,4629,r)|0,t[be>>2]=1,t[be+4>>2]=0,t[r>>2]=t[be>>2],t[r+4>>2]=t[be+4>>2],ya(e,4637,r)|0,t[K>>2]=4,t[K+4>>2]=0,t[r>>2]=t[K>>2],t[r+4>>2]=t[K+4>>2],fl(e,4653,r)|0,t[I>>2]=5,t[I+4>>2]=0,t[r>>2]=t[I>>2],t[r+4>>2]=t[I+4>>2],fl(e,4669,r)|0,t[k>>2]=6,t[k+4>>2]=0,t[r>>2]=t[k>>2],t[r+4>>2]=t[k+4>>2],fl(e,4686,r)|0,t[L>>2]=7,t[L+4>>2]=0,t[r>>2]=t[L>>2],t[r+4>>2]=t[L+4>>2],fl(e,4701,r)|0,t[S>>2]=8,t[S+4>>2]=0,t[r>>2]=t[S>>2],t[r+4>>2]=t[S+4>>2],fl(e,4719,r)|0,t[D>>2]=9,t[D+4>>2]=0,t[r>>2]=t[D>>2],t[r+4>>2]=t[D+4>>2],fl(e,4736,r)|0,t[h>>2]=21,t[h+4>>2]=0,t[r>>2]=t[h>>2],t[r+4>>2]=t[h+4>>2],vd(e,4754,r)|0,t[s>>2]=2,t[s+4>>2]=0,t[r>>2]=t[s>>2],t[r+4>>2]=t[s+4>>2],yc(e,4772,r)|0,t[l>>2]=3,t[l+4>>2]=0,t[r>>2]=t[l>>2],t[r+4>>2]=t[l+4>>2],yc(e,4790,r)|0,t[u>>2]=4,t[u+4>>2]=0,t[r>>2]=t[u>>2],t[r+4>>2]=t[u+4>>2],yc(e,4808,r)|0,m=n}function Cf(e,n){e=e|0,n=n|0;var r=0;r=uf()|0,t[e>>2]=r,Vo(r,n),e2(t[e>>2]|0)}function $c(e,n,r){return e=e|0,n=n|0,r=r|0,Ot(e,Fr(n)|0,r,0),e|0}function Dh(e,n,r){return e=e|0,n=n|0,r=r|0,d(e,Fr(n)|0,r,0),e|0}function am(e,n,r){return e=e|0,n=n|0,r=r|0,pE(e,Fr(n)|0,r,0),e|0}function Gs(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=t[r+4>>2]|0,t[s>>2]=t[r>>2],t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],uE(e,n,l),m=u,e|0}function ga(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=t[r+4>>2]|0,t[s>>2]=t[r>>2],t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],zl(e,n,l),m=u,e|0}function iu(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=t[r+4>>2]|0,t[s>>2]=t[r>>2],t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],p(e,n,l),m=u,e|0}function M0(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=t[r+4>>2]|0,t[s>>2]=t[r>>2],t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],Av(e,n,l),m=u,e|0}function o0(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=t[r+4>>2]|0,t[s>>2]=t[r>>2],t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],ng(e,n,l),m=u,e|0}function rs(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=t[r+4>>2]|0,t[s>>2]=t[r>>2],t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],Kd(e,n,l),m=u,e|0}function Ka(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=t[r+4>>2]|0,t[s>>2]=t[r>>2],t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],Yd(e,n,l),m=u,e|0}function uo(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=t[r+4>>2]|0,t[s>>2]=t[r>>2],t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],k0(e,n,l),m=u,e|0}function fl(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=t[r+4>>2]|0,t[s>>2]=t[r>>2],t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],Sp(e,n,l),m=u,e|0}function yc(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=t[r+4>>2]|0,t[s>>2]=t[r>>2],t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],bm(e,n,l),m=u,e|0}function L2(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=t[r+4>>2]|0,t[s>>2]=t[r>>2],t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],l0(e,n,l),m=u,e|0}function wh(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=t[r+4>>2]|0,t[s>>2]=t[r>>2],t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],Md(e,n,l),m=u,e|0}function xf(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=t[r+4>>2]|0,t[s>>2]=t[r>>2],t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],Rm(e,n,l),m=u,e|0}function Af(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=t[r+4>>2]|0,t[s>>2]=t[r>>2],t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],tp(e,n,l),m=u,e|0}function e1(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=t[r+4>>2]|0,t[s>>2]=t[r>>2],t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],g1(e,n,l),m=u,e|0}function Ll(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=t[r+4>>2]|0,t[s>>2]=t[r>>2],t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],$a(e,n,l),m=u,e|0}function t1(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=t[r+4>>2]|0,t[s>>2]=t[r>>2],t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],j2(e,n,l),m=u,e|0}function ya(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=t[r+4>>2]|0,t[s>>2]=t[r>>2],t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],P2(e,n,l),m=u,e|0}function vd(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=t[r+4>>2]|0,t[s>>2]=t[r>>2],t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],md(e,n,l),m=u,e|0}function md(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+16|0,l=u+8|0,s=u,D=t[r>>2]|0,h=t[r+4>>2]|0,r=Fr(n)|0,t[s>>2]=D,t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],Ea(e,r,l,1),m=u}function Fr(e){return e=e|0,e|0}function Ea(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0,S=0,L=0,k=0;l=m,m=m+32|0,s=l+16|0,k=l+8|0,D=l,L=t[r>>2]|0,S=t[r+4>>2]|0,h=t[e>>2]|0,e=N2()|0,t[k>>2]=L,t[k+4>>2]=S,t[s>>2]=t[k>>2],t[s+4>>2]=t[k+4>>2],r=n1(s)|0,t[D>>2]=L,t[D+4>>2]=S,t[s>>2]=t[D>>2],t[s+4>>2]=t[D+4>>2],wi(h,n,e,r,gd(s,u)|0,u),m=l}function N2(){var e=0,n=0;if(c[7616]|0||(cl(9136),Wt(24,9136,se|0)|0,n=7616,t[n>>2]=1,t[n+4>>2]=0),!(sr(9136)|0)){e=9136,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));cl(9136)}return 9136}function n1(e){return e=e|0,0}function gd(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0;return k=m,m=m+32|0,l=k+24|0,h=k+16|0,D=k,S=k+8|0,s=t[e>>2]|0,u=t[e+4>>2]|0,t[D>>2]=s,t[D+4>>2]=u,I=N2()|0,L=I+24|0,e=hn(n,4)|0,t[S>>2]=e,n=I+28|0,r=t[n>>2]|0,r>>>0<(t[I+32>>2]|0)>>>0?(t[h>>2]=s,t[h+4>>2]=u,t[l>>2]=t[h>>2],t[l+4>>2]=t[h+4>>2],Rf(r,l,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(Of(L,D,S),e=t[n>>2]|0),m=k,((e-(t[L>>2]|0)|0)/12|0)+-1|0}function wi(e,n,r,u,l,s){e=e|0,n=n|0,r=r|0,u=u|0,l=l|0,s=s|0;var h=0,D=0,S=0,L=0,k=0,I=0,K=0,be=0;h=m,m=m+32|0,K=h+24|0,I=h+20|0,S=h+16|0,k=h+12|0,L=h+8|0,D=h+4|0,be=h,t[I>>2]=n,t[S>>2]=r,t[k>>2]=u,t[L>>2]=l,t[D>>2]=s,s=e+28|0,t[be>>2]=t[s>>2],t[K>>2]=t[be>>2],F2(e+24|0,K,I,k,L,S,D)|0,t[s>>2]=t[t[s>>2]>>2],m=h}function F2(e,n,r,u,l,s,h){return e=e|0,n=n|0,r=r|0,u=u|0,l=l|0,s=s|0,h=h|0,e=fm(n)|0,n=pn(24)|0,yd(n+4|0,t[r>>2]|0,t[u>>2]|0,t[l>>2]|0,t[s>>2]|0,t[h>>2]|0),t[n>>2]=t[e>>2],t[e>>2]=n,n|0}function fm(e){return e=e|0,t[e>>2]|0}function yd(e,n,r,u,l,s){e=e|0,n=n|0,r=r|0,u=u|0,l=l|0,s=s|0,t[e>>2]=n,t[e+4>>2]=r,t[e+8>>2]=u,t[e+12>>2]=l,t[e+16>>2]=s}function hn(e,n){return e=e|0,n=n|0,n|e|0}function Rf(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=u,t[e+8>>2]=r}function Of(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0;if(L=m,m=m+48|0,u=L+32|0,h=L+24|0,D=L,S=e+4|0,l=(((t[S>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,s=cm(e)|0,s>>>0<l>>>0)hi(e);else{k=t[e>>2]|0,K=((t[e+8>>2]|0)-k|0)/12|0,I=K<<1,Mf(D,K>>>0<s>>>1>>>0?I>>>0<l>>>0?l:I:s,((t[S>>2]|0)-k|0)/12|0,e+8|0),S=D+8|0,s=t[S>>2]|0,l=t[n+4>>2]|0,r=t[r>>2]|0,t[h>>2]=t[n>>2],t[h+4>>2]=l,t[u>>2]=t[h>>2],t[u+4>>2]=t[h+4>>2],Rf(s,u,r),t[S>>2]=(t[S>>2]|0)+12,Sh(e,D),dm(D),m=L;return}}function cm(e){return e=e|0,357913941}function Mf(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>357913941)$n();else{l=pn(n*12|0)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r*12|0)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n*12|0)}function Sh(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(((l|0)/-12|0)*12|0)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function dm(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~(((u+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&yt(e)}function cl(e){e=e|0,qo(e)}function r1(e){e=e|0,qn(e+24|0)}function sr(e){return e=e|0,t[e>>2]|0}function qn(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-u|0)>>>0)/12|0)*12|0)),yt(r))}function qo(e){e=e|0;var n=0;n=yr()|0,jn(e,2,3,n,Vn()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function yr(){return 9228}function Vn(){return 1140}function dl(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0;return r=m,m=m+16|0,u=r+8|0,l=r,s=Eo(e)|0,e=t[s+4>>2]|0,t[l>>2]=t[s>>2],t[l+4>>2]=e,t[u>>2]=t[l>>2],t[u+4>>2]=t[l+4>>2],n=_c(n,u)|0,m=r,n|0}function jn(e,n,r,u,l,s){e=e|0,n=n|0,r=r|0,u=u|0,l=l|0,s=s|0,t[e>>2]=n,t[e+4>>2]=r,t[e+8>>2]=u,t[e+12>>2]=l,t[e+16>>2]=s}function Eo(e){return e=e|0,(t[(N2()|0)+24>>2]|0)+(e*12|0)|0}function _c(e,n){e=e|0,n=n|0;var r=0,u=0,l=0;return l=m,m=m+48|0,u=l,r=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(r=t[(t[e>>2]|0)+r>>2]|0),I1[r&31](u,e),u=oo(u)|0,m=l,u|0}function oo(e){e=e|0;var n=0,r=0,u=0,l=0;return l=m,m=m+32|0,n=l+12|0,r=l,u=Iu(Xa()|0)|0,u?(is(n,u),kf(r,n),Ec(e,r),e=xs(n)|0):e=Dc(e)|0,m=l,e|0}function Xa(){var e=0;return c[7632]|0||(Nf(9184),Wt(25,9184,se|0)|0,e=7632,t[e>>2]=1,t[e+4>>2]=0),9184}function Iu(e){return e=e|0,t[e+36>>2]|0}function is(e,n){e=e|0,n=n|0,t[e>>2]=n,t[e+4>>2]=e,t[e+8>>2]=0}function kf(e,n){e=e|0,n=n|0,t[e>>2]=t[n>>2],t[e+4>>2]=t[n+4>>2],t[e+8>>2]=0}function Ec(e,n){e=e|0,n=n|0,lo(n,e,e+8|0,e+16|0,e+24|0,e+32|0,e+40|0)|0}function xs(e){return e=e|0,t[(t[e+4>>2]|0)+8>>2]|0}function Dc(e){e=e|0;var n=0,r=0,u=0,l=0,s=0,h=0,D=0,S=0;S=m,m=m+16|0,r=S+4|0,u=S,l=Ma(8)|0,s=l,h=pn(48)|0,D=h,n=D+48|0;do t[D>>2]=t[e>>2],D=D+4|0,e=e+4|0;while((D|0)<(n|0));return n=s+4|0,t[n>>2]=h,D=pn(8)|0,h=t[n>>2]|0,t[u>>2]=0,t[r>>2]=t[u>>2],Th(D,h,r),t[l>>2]=D,m=S,s|0}function Th(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,r=pn(16)|0,t[r+4>>2]=0,t[r+8>>2]=0,t[r>>2]=1092,t[r+12>>2]=n,t[e+4>>2]=r}function cn(e){e=e|0,Uv(e),yt(e)}function us(e){e=e|0,e=t[e+12>>2]|0,e|0&&yt(e)}function Do(e){e=e|0,yt(e)}function lo(e,n,r,u,l,s,h){return e=e|0,n=n|0,r=r|0,u=u|0,l=l|0,s=s|0,h=h|0,s=Ji(t[e>>2]|0,n,r,u,l,s,h)|0,h=e+4|0,t[(t[h>>2]|0)+8>>2]=s,t[(t[h>>2]|0)+8>>2]|0}function Ji(e,n,r,u,l,s,h){e=e|0,n=n|0,r=r|0,u=u|0,l=l|0,s=s|0,h=h|0;var D=0,S=0;return D=m,m=m+16|0,S=D,ka(S),e=yo(e)|0,h=Yr(e,+B[n>>3],+B[r>>3],+B[u>>3],+B[l>>3],+B[s>>3],+B[h>>3])|0,La(S),m=D,h|0}function Yr(e,n,r,u,l,s,h){e=e|0,n=+n,r=+r,u=+u,l=+l,s=+s,h=+h;var D=0;return D=_o(Lf()|0)|0,n=+kl(n),r=+kl(r),u=+kl(u),l=+kl(l),s=+kl(s),p0(0,D|0,e|0,+n,+r,+u,+l,+s,+ +kl(h))|0}function Lf(){var e=0;return c[7624]|0||(pm(9172),e=7624,t[e>>2]=1,t[e+4>>2]=0),9172}function pm(e){e=e|0,ll(e,Nl()|0,6)}function Nl(){return 1112}function Nf(e){e=e|0,Qa(e)}function Ff(e){e=e|0,_d(e+24|0),Ed(e+16|0)}function _d(e){e=e|0,i1(e)}function Ed(e){e=e|0,wc(e)}function wc(e){e=e|0;var n=0,r=0;if(n=t[e>>2]|0,n|0)do r=n,n=t[n>>2]|0,yt(r);while((n|0)!=0);t[e>>2]=0}function i1(e){e=e|0;var n=0,r=0;if(n=t[e>>2]|0,n|0)do r=n,n=t[n>>2]|0,yt(r);while((n|0)!=0);t[e>>2]=0}function Qa(e){e=e|0;var n=0;t[e+16>>2]=0,t[e+20>>2]=0,n=e+24|0,t[n>>2]=0,t[e+28>>2]=n,t[e+36>>2]=0,c[e+40>>0]=0,c[e+41>>0]=0}function P2(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+16|0,l=u+8|0,s=u,D=t[r>>2]|0,h=t[r+4>>2]|0,r=Fr(n)|0,t[s>>2]=D,t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],Dd(e,r,l,0),m=u}function Dd(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0,S=0,L=0,k=0;l=m,m=m+32|0,s=l+16|0,k=l+8|0,D=l,L=t[r>>2]|0,S=t[r+4>>2]|0,h=t[e>>2]|0,e=u1()|0,t[k>>2]=L,t[k+4>>2]=S,t[s>>2]=t[k>>2],t[s+4>>2]=t[k+4>>2],r=Pf(s)|0,t[D>>2]=L,t[D+4>>2]=S,t[s>>2]=t[D>>2],t[s+4>>2]=t[D+4>>2],wi(h,n,e,r,o1(s,u)|0,u),m=l}function u1(){var e=0,n=0;if(c[7640]|0||(Fl(9232),Wt(26,9232,se|0)|0,n=7640,t[n>>2]=1,t[n+4>>2]=0),!(sr(9232)|0)){e=9232,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Fl(9232)}return 9232}function Pf(e){return e=e|0,0}function o1(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0;return k=m,m=m+32|0,l=k+24|0,h=k+16|0,D=k,S=k+8|0,s=t[e>>2]|0,u=t[e+4>>2]|0,t[D>>2]=s,t[D+4>>2]=u,I=u1()|0,L=I+24|0,e=hn(n,4)|0,t[S>>2]=e,n=I+28|0,r=t[n>>2]|0,r>>>0<(t[I+32>>2]|0)>>>0?(t[h>>2]=s,t[h+4>>2]=u,t[l>>2]=t[h>>2],t[l+4>>2]=t[h+4>>2],Ja(r,l,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(l1(L,D,S),e=t[n>>2]|0),m=k,((e-(t[L>>2]|0)|0)/12|0)+-1|0}function Ja(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=u,t[e+8>>2]=r}function l1(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0;if(L=m,m=m+48|0,u=L+32|0,h=L+24|0,D=L,S=e+4|0,l=(((t[S>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,s=I2(e)|0,s>>>0<l>>>0)hi(e);else{k=t[e>>2]|0,K=((t[e+8>>2]|0)-k|0)/12|0,I=K<<1,wd(D,K>>>0<s>>>1>>>0?I>>>0<l>>>0?l:I:s,((t[S>>2]|0)-k|0)/12|0,e+8|0),S=D+8|0,s=t[S>>2]|0,l=t[n+4>>2]|0,r=t[r>>2]|0,t[h>>2]=t[n>>2],t[h+4>>2]=l,t[u>>2]=t[h>>2],t[u+4>>2]=t[h+4>>2],Ja(s,u,r),t[S>>2]=(t[S>>2]|0)+12,Sc(e,D),s1(D),m=L;return}}function I2(e){return e=e|0,357913941}function wd(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>357913941)$n();else{l=pn(n*12|0)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r*12|0)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n*12|0)}function Sc(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(((l|0)/-12|0)*12|0)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function s1(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~(((u+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&yt(e)}function Fl(e){e=e|0,b2(e)}function Da(e){e=e|0,Ch(e+24|0)}function Ch(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-u|0)>>>0)/12|0)*12|0)),yt(r))}function b2(e){e=e|0;var n=0;n=yr()|0,jn(e,2,1,n,B2()|0,3),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function B2(){return 1144}function xh(e,n,r,u,l){e=e|0,n=n|0,r=+r,u=+u,l=l|0;var s=0,h=0,D=0,S=0;s=m,m=m+16|0,h=s+8|0,D=s,S=Sd(e)|0,e=t[S+4>>2]|0,t[D>>2]=t[S>>2],t[D+4>>2]=e,t[h>>2]=t[D>>2],t[h+4>>2]=t[D+4>>2],Ah(n,h,r,u,l),m=s}function Sd(e){return e=e|0,(t[(u1()|0)+24>>2]|0)+(e*12|0)|0}function Ah(e,n,r,u,l){e=e|0,n=n|0,r=+r,u=+u,l=l|0;var s=0,h=0,D=0,S=0,L=0;L=m,m=m+16|0,h=L+2|0,D=L+1|0,S=L,s=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(s=t[(t[e>>2]|0)+s>>2]|0),Pl(h,r),r=+os(h,r),Pl(D,u),u=+os(D,u),As(S,l),S=Ys(S,l)|0,eS[s&1](e,r,u,S),m=L}function Pl(e,n){e=e|0,n=+n}function os(e,n){return e=e|0,n=+n,+ +Rh(n)}function As(e,n){e=e|0,n=n|0}function Ys(e,n){return e=e|0,n=n|0,U2(n)|0}function U2(e){return e=e|0,e|0}function Rh(e){return e=+e,+e}function j2(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+16|0,l=u+8|0,s=u,D=t[r>>2]|0,h=t[r+4>>2]|0,r=Fr(n)|0,t[s>>2]=D,t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],z2(e,r,l,1),m=u}function z2(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0,S=0,L=0,k=0;l=m,m=m+32|0,s=l+16|0,k=l+8|0,D=l,L=t[r>>2]|0,S=t[r+4>>2]|0,h=t[e>>2]|0,e=a1()|0,t[k>>2]=L,t[k+4>>2]=S,t[s>>2]=t[k>>2],t[s+4>>2]=t[k+4>>2],r=f1(s)|0,t[D>>2]=L,t[D+4>>2]=S,t[s>>2]=t[D>>2],t[s+4>>2]=t[D+4>>2],wi(h,n,e,r,Oh(s,u)|0,u),m=l}function a1(){var e=0,n=0;if(c[7648]|0||(c1(9268),Wt(27,9268,se|0)|0,n=7648,t[n>>2]=1,t[n+4>>2]=0),!(sr(9268)|0)){e=9268,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));c1(9268)}return 9268}function f1(e){return e=e|0,0}function Oh(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0;return k=m,m=m+32|0,l=k+24|0,h=k+16|0,D=k,S=k+8|0,s=t[e>>2]|0,u=t[e+4>>2]|0,t[D>>2]=s,t[D+4>>2]=u,I=a1()|0,L=I+24|0,e=hn(n,4)|0,t[S>>2]=e,n=I+28|0,r=t[n>>2]|0,r>>>0<(t[I+32>>2]|0)>>>0?(t[h>>2]=s,t[h+4>>2]=u,t[l>>2]=t[h>>2],t[l+4>>2]=t[h+4>>2],H2(r,l,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(q2(L,D,S),e=t[n>>2]|0),m=k,((e-(t[L>>2]|0)|0)/12|0)+-1|0}function H2(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=u,t[e+8>>2]=r}function q2(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0;if(L=m,m=m+48|0,u=L+32|0,h=L+24|0,D=L,S=e+4|0,l=(((t[S>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,s=Rs(e)|0,s>>>0<l>>>0)hi(e);else{k=t[e>>2]|0,K=((t[e+8>>2]|0)-k|0)/12|0,I=K<<1,Za(D,K>>>0<s>>>1>>>0?I>>>0<l>>>0?l:I:s,((t[S>>2]|0)-k|0)/12|0,e+8|0),S=D+8|0,s=t[S>>2]|0,l=t[n+4>>2]|0,r=t[r>>2]|0,t[h>>2]=t[n>>2],t[h+4>>2]=l,t[u>>2]=t[h>>2],t[u+4>>2]=t[h+4>>2],H2(s,u,r),t[S>>2]=(t[S>>2]|0)+12,Mh(e,D),pu(D),m=L;return}}function Rs(e){return e=e|0,357913941}function Za(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>357913941)$n();else{l=pn(n*12|0)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r*12|0)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n*12|0)}function Mh(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(((l|0)/-12|0)*12|0)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function pu(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~(((u+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&yt(e)}function c1(e){e=e|0,Il(e)}function kh(e){e=e|0,d1(e+24|0)}function d1(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-u|0)>>>0)/12|0)*12|0)),yt(r))}function Il(e){e=e|0;var n=0;n=yr()|0,jn(e,2,4,n,Lh()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function Lh(){return 1160}function W2(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0;return r=m,m=m+16|0,u=r+8|0,l=r,s=Nh(e)|0,e=t[s+4>>2]|0,t[l>>2]=t[s>>2],t[l+4>>2]=e,t[u>>2]=t[l>>2],t[u+4>>2]=t[l+4>>2],n=p1(n,u)|0,m=r,n|0}function Nh(e){return e=e|0,(t[(a1()|0)+24>>2]|0)+(e*12|0)|0}function p1(e,n){e=e|0,n=n|0;var r=0;return r=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(r=t[(t[e>>2]|0)+r>>2]|0),bl(Zp[r&31](e)|0)|0}function bl(e){return e=e|0,e&1|0}function $a(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+16|0,l=u+8|0,s=u,D=t[r>>2]|0,h=t[r+4>>2]|0,r=Fr(n)|0,t[s>>2]=D,t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],wa(e,r,l,0),m=u}function wa(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0,S=0,L=0,k=0;l=m,m=m+32|0,s=l+16|0,k=l+8|0,D=l,L=t[r>>2]|0,S=t[r+4>>2]|0,h=t[e>>2]|0,e=V2()|0,t[k>>2]=L,t[k+4>>2]=S,t[s>>2]=t[k>>2],t[s+4>>2]=t[k+4>>2],r=G2(s)|0,t[D>>2]=L,t[D+4>>2]=S,t[s>>2]=t[D>>2],t[s+4>>2]=t[D+4>>2],wi(h,n,e,r,hm(s,u)|0,u),m=l}function V2(){var e=0,n=0;if(c[7656]|0||(Ih(9304),Wt(28,9304,se|0)|0,n=7656,t[n>>2]=1,t[n+4>>2]=0),!(sr(9304)|0)){e=9304,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Ih(9304)}return 9304}function G2(e){return e=e|0,0}function hm(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0;return k=m,m=m+32|0,l=k+24|0,h=k+16|0,D=k,S=k+8|0,s=t[e>>2]|0,u=t[e+4>>2]|0,t[D>>2]=s,t[D+4>>2]=u,I=V2()|0,L=I+24|0,e=hn(n,4)|0,t[S>>2]=e,n=I+28|0,r=t[n>>2]|0,r>>>0<(t[I+32>>2]|0)>>>0?(t[h>>2]=s,t[h+4>>2]=u,t[l>>2]=t[h>>2],t[l+4>>2]=t[h+4>>2],Y2(r,l,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(Fh(L,D,S),e=t[n>>2]|0),m=k,((e-(t[L>>2]|0)|0)/12|0)+-1|0}function Y2(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=u,t[e+8>>2]=r}function Fh(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0;if(L=m,m=m+48|0,u=L+32|0,h=L+24|0,D=L,S=e+4|0,l=(((t[S>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,s=Ph(e)|0,s>>>0<l>>>0)hi(e);else{k=t[e>>2]|0,K=((t[e+8>>2]|0)-k|0)/12|0,I=K<<1,K2(D,K>>>0<s>>>1>>>0?I>>>0<l>>>0?l:I:s,((t[S>>2]|0)-k|0)/12|0,e+8|0),S=D+8|0,s=t[S>>2]|0,l=t[n+4>>2]|0,r=t[r>>2]|0,t[h>>2]=t[n>>2],t[h+4>>2]=l,t[u>>2]=t[h>>2],t[u+4>>2]=t[h+4>>2],Y2(s,u,r),t[S>>2]=(t[S>>2]|0)+12,vm(e,D),mm(D),m=L;return}}function Ph(e){return e=e|0,357913941}function K2(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>357913941)$n();else{l=pn(n*12|0)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r*12|0)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n*12|0)}function vm(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(((l|0)/-12|0)*12|0)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function mm(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~(((u+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&yt(e)}function Ih(e){e=e|0,h1(e)}function gm(e){e=e|0,X2(e+24|0)}function X2(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-u|0)>>>0)/12|0)*12|0)),yt(r))}function h1(e){e=e|0;var n=0;n=yr()|0,jn(e,2,5,n,v1()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function v1(){return 1164}function m1(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;u=m,m=m+16|0,l=u+8|0,s=u,h=Sa(e)|0,e=t[h+4>>2]|0,t[s>>2]=t[h>>2],t[s+4>>2]=e,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],Q2(n,l,r),m=u}function Sa(e){return e=e|0,(t[(V2()|0)+24>>2]|0)+(e*12|0)|0}function Q2(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0;s=m,m=m+16|0,l=s,u=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(u=t[(t[e>>2]|0)+u>>2]|0),Ks(l,r),r=Xs(l,r)|0,I1[u&31](e,r),Qs(l),m=s}function Ks(e,n){e=e|0,n=n|0,J2(e,n)}function Xs(e,n){return e=e|0,n=n|0,e|0}function Qs(e){e=e|0,ca(e)}function J2(e,n){e=e|0,n=n|0,Ta(e,n)}function Ta(e,n){e=e|0,n=n|0,t[e>>2]=n}function g1(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+16|0,l=u+8|0,s=u,D=t[r>>2]|0,h=t[r+4>>2]|0,r=Fr(n)|0,t[s>>2]=D,t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],Td(e,r,l,0),m=u}function Td(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0,S=0,L=0,k=0;l=m,m=m+32|0,s=l+16|0,k=l+8|0,D=l,L=t[r>>2]|0,S=t[r+4>>2]|0,h=t[e>>2]|0,e=Tc()|0,t[k>>2]=L,t[k+4>>2]=S,t[s>>2]=t[k>>2],t[s+4>>2]=t[k+4>>2],r=Z2(s)|0,t[D>>2]=L,t[D+4>>2]=S,t[s>>2]=t[D>>2],t[s+4>>2]=t[D+4>>2],wi(h,n,e,r,wo(s,u)|0,u),m=l}function Tc(){var e=0,n=0;if(c[7664]|0||(Hh(9340),Wt(29,9340,se|0)|0,n=7664,t[n>>2]=1,t[n+4>>2]=0),!(sr(9340)|0)){e=9340,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Hh(9340)}return 9340}function Z2(e){return e=e|0,0}function wo(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0;return k=m,m=m+32|0,l=k+24|0,h=k+16|0,D=k,S=k+8|0,s=t[e>>2]|0,u=t[e+4>>2]|0,t[D>>2]=s,t[D+4>>2]=u,I=Tc()|0,L=I+24|0,e=hn(n,4)|0,t[S>>2]=e,n=I+28|0,r=t[n>>2]|0,r>>>0<(t[I+32>>2]|0)>>>0?(t[h>>2]=s,t[h+4>>2]=u,t[l>>2]=t[h>>2],t[l+4>>2]=t[h+4>>2],bh(r,l,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(Bh(L,D,S),e=t[n>>2]|0),m=k,((e-(t[L>>2]|0)|0)/12|0)+-1|0}function bh(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=u,t[e+8>>2]=r}function Bh(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0;if(L=m,m=m+48|0,u=L+32|0,h=L+24|0,D=L,S=e+4|0,l=(((t[S>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,s=Uh(e)|0,s>>>0<l>>>0)hi(e);else{k=t[e>>2]|0,K=((t[e+8>>2]|0)-k|0)/12|0,I=K<<1,jh(D,K>>>0<s>>>1>>>0?I>>>0<l>>>0?l:I:s,((t[S>>2]|0)-k|0)/12|0,e+8|0),S=D+8|0,s=t[S>>2]|0,l=t[n+4>>2]|0,r=t[r>>2]|0,t[h>>2]=t[n>>2],t[h+4>>2]=l,t[u>>2]=t[h>>2],t[u+4>>2]=t[h+4>>2],bh(s,u,r),t[S>>2]=(t[S>>2]|0)+12,ym(e,D),zh(D),m=L;return}}function Uh(e){return e=e|0,357913941}function jh(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>357913941)$n();else{l=pn(n*12|0)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r*12|0)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n*12|0)}function ym(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(((l|0)/-12|0)*12|0)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function zh(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~(((u+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&yt(e)}function Hh(e){e=e|0,qh(e)}function y1(e){e=e|0,$2(e+24|0)}function $2(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-u|0)>>>0)/12|0)*12|0)),yt(r))}function qh(e){e=e|0;var n=0;n=yr()|0,jn(e,2,4,n,ep()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function ep(){return 1180}function Wh(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=_m(e)|0,e=t[h+4>>2]|0,t[s>>2]=t[h>>2],t[s+4>>2]=e,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],r=Em(n,l,r)|0,m=u,r|0}function _m(e){return e=e|0,(t[(Tc()|0)+24>>2]|0)+(e*12|0)|0}function Em(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0;return s=m,m=m+16|0,l=s,u=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(u=t[(t[e>>2]|0)+u>>2]|0),If(l,r),l=bf(l,r)|0,l=Cd(eD[u&15](e,l)|0)|0,m=s,l|0}function If(e,n){e=e|0,n=n|0}function bf(e,n){return e=e|0,n=n|0,Dm(n)|0}function Cd(e){return e=e|0,e|0}function Dm(e){return e=e|0,e|0}function tp(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+16|0,l=u+8|0,s=u,D=t[r>>2]|0,h=t[r+4>>2]|0,r=Fr(n)|0,t[s>>2]=D,t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],xd(e,r,l,0),m=u}function xd(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0,S=0,L=0,k=0;l=m,m=m+32|0,s=l+16|0,k=l+8|0,D=l,L=t[r>>2]|0,S=t[r+4>>2]|0,h=t[e>>2]|0,e=np()|0,t[k>>2]=L,t[k+4>>2]=S,t[s>>2]=t[k>>2],t[s+4>>2]=t[k+4>>2],r=Vh(s)|0,t[D>>2]=L,t[D+4>>2]=S,t[s>>2]=t[D>>2],t[s+4>>2]=t[D+4>>2],wi(h,n,e,r,rp(s,u)|0,u),m=l}function np(){var e=0,n=0;if(c[7672]|0||(Kh(9376),Wt(30,9376,se|0)|0,n=7672,t[n>>2]=1,t[n+4>>2]=0),!(sr(9376)|0)){e=9376,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Kh(9376)}return 9376}function Vh(e){return e=e|0,0}function rp(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0;return k=m,m=m+32|0,l=k+24|0,h=k+16|0,D=k,S=k+8|0,s=t[e>>2]|0,u=t[e+4>>2]|0,t[D>>2]=s,t[D+4>>2]=u,I=np()|0,L=I+24|0,e=hn(n,4)|0,t[S>>2]=e,n=I+28|0,r=t[n>>2]|0,r>>>0<(t[I+32>>2]|0)>>>0?(t[h>>2]=s,t[h+4>>2]=u,t[l>>2]=t[h>>2],t[l+4>>2]=t[h+4>>2],Gh(r,l,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(Yh(L,D,S),e=t[n>>2]|0),m=k,((e-(t[L>>2]|0)|0)/12|0)+-1|0}function Gh(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=u,t[e+8>>2]=r}function Yh(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0;if(L=m,m=m+48|0,u=L+32|0,h=L+24|0,D=L,S=e+4|0,l=(((t[S>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,s=ip(e)|0,s>>>0<l>>>0)hi(e);else{k=t[e>>2]|0,K=((t[e+8>>2]|0)-k|0)/12|0,I=K<<1,wm(D,K>>>0<s>>>1>>>0?I>>>0<l>>>0?l:I:s,((t[S>>2]|0)-k|0)/12|0,e+8|0),S=D+8|0,s=t[S>>2]|0,l=t[n+4>>2]|0,r=t[r>>2]|0,t[h>>2]=t[n>>2],t[h+4>>2]=l,t[u>>2]=t[h>>2],t[u+4>>2]=t[h+4>>2],Gh(s,u,r),t[S>>2]=(t[S>>2]|0)+12,Sm(e,D),Tm(D),m=L;return}}function ip(e){return e=e|0,357913941}function wm(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>357913941)$n();else{l=pn(n*12|0)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r*12|0)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n*12|0)}function Sm(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(((l|0)/-12|0)*12|0)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function Tm(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~(((u+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&yt(e)}function Kh(e){e=e|0,up(e)}function _1(e){e=e|0,Cm(e+24|0)}function Cm(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-u|0)>>>0)/12|0)*12|0)),yt(r))}function up(e){e=e|0;var n=0;n=yr()|0,jn(e,2,5,n,op()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function op(){return 1196}function xm(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0;return r=m,m=m+16|0,u=r+8|0,l=r,s=Am(e)|0,e=t[s+4>>2]|0,t[l>>2]=t[s>>2],t[l+4>>2]=e,t[u>>2]=t[l>>2],t[u+4>>2]=t[l+4>>2],n=Xh(n,u)|0,m=r,n|0}function Am(e){return e=e|0,(t[(np()|0)+24>>2]|0)+(e*12|0)|0}function Xh(e,n){e=e|0,n=n|0;var r=0;return r=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(r=t[(t[e>>2]|0)+r>>2]|0),Cd(Zp[r&31](e)|0)|0}function Rm(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+16|0,l=u+8|0,s=u,D=t[r>>2]|0,h=t[r+4>>2]|0,r=Fr(n)|0,t[s>>2]=D,t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],Om(e,r,l,1),m=u}function Om(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0,S=0,L=0,k=0;l=m,m=m+32|0,s=l+16|0,k=l+8|0,D=l,L=t[r>>2]|0,S=t[r+4>>2]|0,h=t[e>>2]|0,e=lp()|0,t[k>>2]=L,t[k+4>>2]=S,t[s>>2]=t[k>>2],t[s+4>>2]=t[k+4>>2],r=sp(s)|0,t[D>>2]=L,t[D+4>>2]=S,t[s>>2]=t[D>>2],t[s+4>>2]=t[D+4>>2],wi(h,n,e,r,Ca(s,u)|0,u),m=l}function lp(){var e=0,n=0;if(c[7680]|0||(fp(9412),Wt(31,9412,se|0)|0,n=7680,t[n>>2]=1,t[n+4>>2]=0),!(sr(9412)|0)){e=9412,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));fp(9412)}return 9412}function sp(e){return e=e|0,0}function Ca(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0;return k=m,m=m+32|0,l=k+24|0,h=k+16|0,D=k,S=k+8|0,s=t[e>>2]|0,u=t[e+4>>2]|0,t[D>>2]=s,t[D+4>>2]=u,I=lp()|0,L=I+24|0,e=hn(n,4)|0,t[S>>2]=e,n=I+28|0,r=t[n>>2]|0,r>>>0<(t[I+32>>2]|0)>>>0?(t[h>>2]=s,t[h+4>>2]=u,t[l>>2]=t[h>>2],t[l+4>>2]=t[h+4>>2],E1(r,l,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(ap(L,D,S),e=t[n>>2]|0),m=k,((e-(t[L>>2]|0)|0)/12|0)+-1|0}function E1(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=u,t[e+8>>2]=r}function ap(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0;if(L=m,m=m+48|0,u=L+32|0,h=L+24|0,D=L,S=e+4|0,l=(((t[S>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,s=Qh(e)|0,s>>>0<l>>>0)hi(e);else{k=t[e>>2]|0,K=((t[e+8>>2]|0)-k|0)/12|0,I=K<<1,Ad(D,K>>>0<s>>>1>>>0?I>>>0<l>>>0?l:I:s,((t[S>>2]|0)-k|0)/12|0,e+8|0),S=D+8|0,s=t[S>>2]|0,l=t[n+4>>2]|0,r=t[r>>2]|0,t[h>>2]=t[n>>2],t[h+4>>2]=l,t[u>>2]=t[h>>2],t[u+4>>2]=t[h+4>>2],E1(s,u,r),t[S>>2]=(t[S>>2]|0)+12,D1(e,D),Jh(D),m=L;return}}function Qh(e){return e=e|0,357913941}function Ad(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>357913941)$n();else{l=pn(n*12|0)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r*12|0)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n*12|0)}function D1(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(((l|0)/-12|0)*12|0)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function Jh(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~(((u+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&yt(e)}function fp(e){e=e|0,$h(e)}function Zh(e){e=e|0,cp(e+24|0)}function cp(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-u|0)>>>0)/12|0)*12|0)),yt(r))}function $h(e){e=e|0;var n=0;n=yr()|0,jn(e,2,6,n,ev()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function ev(){return 1200}function dp(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0;return r=m,m=m+16|0,u=r+8|0,l=r,s=Rd(e)|0,e=t[s+4>>2]|0,t[l>>2]=t[s>>2],t[l+4>>2]=e,t[u>>2]=t[l>>2],t[u+4>>2]=t[l+4>>2],n=Od(n,u)|0,m=r,n|0}function Rd(e){return e=e|0,(t[(lp()|0)+24>>2]|0)+(e*12|0)|0}function Od(e,n){e=e|0,n=n|0;var r=0;return r=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(r=t[(t[e>>2]|0)+r>>2]|0),H0(Zp[r&31](e)|0)|0}function H0(e){return e=e|0,e|0}function Md(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+16|0,l=u+8|0,s=u,D=t[r>>2]|0,h=t[r+4>>2]|0,r=Fr(n)|0,t[s>>2]=D,t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],xa(e,r,l,0),m=u}function xa(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0,S=0,L=0,k=0;l=m,m=m+32|0,s=l+16|0,k=l+8|0,D=l,L=t[r>>2]|0,S=t[r+4>>2]|0,h=t[e>>2]|0,e=ef()|0,t[k>>2]=L,t[k+4>>2]=S,t[s>>2]=t[k>>2],t[s+4>>2]=t[k+4>>2],r=kd(s)|0,t[D>>2]=L,t[D+4>>2]=S,t[s>>2]=t[D>>2],t[s+4>>2]=t[D+4>>2],wi(h,n,e,r,Ld(s,u)|0,u),m=l}function ef(){var e=0,n=0;if(c[7688]|0||(vp(9448),Wt(32,9448,se|0)|0,n=7688,t[n>>2]=1,t[n+4>>2]=0),!(sr(9448)|0)){e=9448,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));vp(9448)}return 9448}function kd(e){return e=e|0,0}function Ld(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0;return k=m,m=m+32|0,l=k+24|0,h=k+16|0,D=k,S=k+8|0,s=t[e>>2]|0,u=t[e+4>>2]|0,t[D>>2]=s,t[D+4>>2]=u,I=ef()|0,L=I+24|0,e=hn(n,4)|0,t[S>>2]=e,n=I+28|0,r=t[n>>2]|0,r>>>0<(t[I+32>>2]|0)>>>0?(t[h>>2]=s,t[h+4>>2]=u,t[l>>2]=t[h>>2],t[l+4>>2]=t[h+4>>2],pp(r,l,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(Nd(L,D,S),e=t[n>>2]|0),m=k,((e-(t[L>>2]|0)|0)/12|0)+-1|0}function pp(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=u,t[e+8>>2]=r}function Nd(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0;if(L=m,m=m+48|0,u=L+32|0,h=L+24|0,D=L,S=e+4|0,l=(((t[S>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,s=tv(e)|0,s>>>0<l>>>0)hi(e);else{k=t[e>>2]|0,K=((t[e+8>>2]|0)-k|0)/12|0,I=K<<1,Mm(D,K>>>0<s>>>1>>>0?I>>>0<l>>>0?l:I:s,((t[S>>2]|0)-k|0)/12|0,e+8|0),S=D+8|0,s=t[S>>2]|0,l=t[n+4>>2]|0,r=t[r>>2]|0,t[h>>2]=t[n>>2],t[h+4>>2]=l,t[u>>2]=t[h>>2],t[u+4>>2]=t[h+4>>2],pp(s,u,r),t[S>>2]=(t[S>>2]|0)+12,nv(e,D),hp(D),m=L;return}}function tv(e){return e=e|0,357913941}function Mm(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>357913941)$n();else{l=pn(n*12|0)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r*12|0)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n*12|0)}function nv(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(((l|0)/-12|0)*12|0)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function hp(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~(((u+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&yt(e)}function vp(e){e=e|0,Lm(e)}function mp(e){e=e|0,km(e+24|0)}function km(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-u|0)>>>0)/12|0)*12|0)),yt(r))}function Lm(e){e=e|0;var n=0;n=yr()|0,jn(e,2,6,n,So()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function So(){return 1204}function Fd(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;u=m,m=m+16|0,l=u+8|0,s=u,h=Nm(e)|0,e=t[h+4>>2]|0,t[s>>2]=t[h>>2],t[s+4>>2]=e,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],pl(n,l,r),m=u}function Nm(e){return e=e|0,(t[(ef()|0)+24>>2]|0)+(e*12|0)|0}function pl(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0;s=m,m=m+16|0,l=s,u=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(u=t[(t[e>>2]|0)+u>>2]|0),tr(l,r),l=Js(l,r)|0,I1[u&31](e,l),m=s}function tr(e,n){e=e|0,n=n|0}function Js(e,n){return e=e|0,n=n|0,hl(n)|0}function hl(e){return e=e|0,e|0}function l0(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+16|0,l=u+8|0,s=u,D=t[r>>2]|0,h=t[r+4>>2]|0,r=Fr(n)|0,t[s>>2]=D,t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],rv(e,r,l,0),m=u}function rv(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0,S=0,L=0,k=0;l=m,m=m+32|0,s=l+16|0,k=l+8|0,D=l,L=t[r>>2]|0,S=t[r+4>>2]|0,h=t[e>>2]|0,e=Zs()|0,t[k>>2]=L,t[k+4>>2]=S,t[s>>2]=t[k>>2],t[s+4>>2]=t[k+4>>2],r=gp(s)|0,t[D>>2]=L,t[D+4>>2]=S,t[s>>2]=t[D>>2],t[s+4>>2]=t[D+4>>2],wi(h,n,e,r,Fm(s,u)|0,u),m=l}function Zs(){var e=0,n=0;if(c[7696]|0||(Ep(9484),Wt(33,9484,se|0)|0,n=7696,t[n>>2]=1,t[n+4>>2]=0),!(sr(9484)|0)){e=9484,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Ep(9484)}return 9484}function gp(e){return e=e|0,0}function Fm(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0;return k=m,m=m+32|0,l=k+24|0,h=k+16|0,D=k,S=k+8|0,s=t[e>>2]|0,u=t[e+4>>2]|0,t[D>>2]=s,t[D+4>>2]=u,I=Zs()|0,L=I+24|0,e=hn(n,4)|0,t[S>>2]=e,n=I+28|0,r=t[n>>2]|0,r>>>0<(t[I+32>>2]|0)>>>0?(t[h>>2]=s,t[h+4>>2]=u,t[l>>2]=t[h>>2],t[l+4>>2]=t[h+4>>2],iv(r,l,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(yp(L,D,S),e=t[n>>2]|0),m=k,((e-(t[L>>2]|0)|0)/12|0)+-1|0}function iv(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=u,t[e+8>>2]=r}function yp(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0;if(L=m,m=m+48|0,u=L+32|0,h=L+24|0,D=L,S=e+4|0,l=(((t[S>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,s=Pm(e)|0,s>>>0<l>>>0)hi(e);else{k=t[e>>2]|0,K=((t[e+8>>2]|0)-k|0)/12|0,I=K<<1,_p(D,K>>>0<s>>>1>>>0?I>>>0<l>>>0?l:I:s,((t[S>>2]|0)-k|0)/12|0,e+8|0),S=D+8|0,s=t[S>>2]|0,l=t[n+4>>2]|0,r=t[r>>2]|0,t[h>>2]=t[n>>2],t[h+4>>2]=l,t[u>>2]=t[h>>2],t[u+4>>2]=t[h+4>>2],iv(s,u,r),t[S>>2]=(t[S>>2]|0)+12,Cc(e,D),Aa(D),m=L;return}}function Pm(e){return e=e|0,357913941}function _p(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>357913941)$n();else{l=pn(n*12|0)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r*12|0)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n*12|0)}function Cc(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(((l|0)/-12|0)*12|0)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function Aa(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~(((u+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&yt(e)}function Ep(e){e=e|0,Yu(e)}function Pd(e){e=e|0,bu(e+24|0)}function bu(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-u|0)>>>0)/12|0)*12|0)),yt(r))}function Yu(e){e=e|0;var n=0;n=yr()|0,jn(e,2,1,n,Dp()|0,2),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function Dp(){return 1212}function wp(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0;l=m,m=m+16|0,s=l+8|0,h=l,D=uv(e)|0,e=t[D+4>>2]|0,t[h>>2]=t[D>>2],t[h+4>>2]=e,t[s>>2]=t[h>>2],t[s+4>>2]=t[h+4>>2],Im(n,s,r,u),m=l}function uv(e){return e=e|0,(t[(Zs()|0)+24>>2]|0)+(e*12|0)|0}function Im(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0;D=m,m=m+16|0,s=D+1|0,h=D,l=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(l=t[(t[e>>2]|0)+l>>2]|0),tr(s,r),s=Js(s,r)|0,If(h,u),h=bf(h,u)|0,Fg[l&15](e,s,h),m=D}function bm(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+16|0,l=u+8|0,s=u,D=t[r>>2]|0,h=t[r+4>>2]|0,r=Fr(n)|0,t[s>>2]=D,t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],Bm(e,r,l,1),m=u}function Bm(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0,S=0,L=0,k=0;l=m,m=m+32|0,s=l+16|0,k=l+8|0,D=l,L=t[r>>2]|0,S=t[r+4>>2]|0,h=t[e>>2]|0,e=Id()|0,t[k>>2]=L,t[k+4>>2]=S,t[s>>2]=t[k>>2],t[s+4>>2]=t[k+4>>2],r=ov(s)|0,t[D>>2]=L,t[D+4>>2]=S,t[s>>2]=t[D>>2],t[s+4>>2]=t[D+4>>2],wi(h,n,e,r,xc(s,u)|0,u),m=l}function Id(){var e=0,n=0;if(c[7704]|0||(lv(9520),Wt(34,9520,se|0)|0,n=7704,t[n>>2]=1,t[n+4>>2]=0),!(sr(9520)|0)){e=9520,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));lv(9520)}return 9520}function ov(e){return e=e|0,0}function xc(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0;return k=m,m=m+32|0,l=k+24|0,h=k+16|0,D=k,S=k+8|0,s=t[e>>2]|0,u=t[e+4>>2]|0,t[D>>2]=s,t[D+4>>2]=u,I=Id()|0,L=I+24|0,e=hn(n,4)|0,t[S>>2]=e,n=I+28|0,r=t[n>>2]|0,r>>>0<(t[I+32>>2]|0)>>>0?(t[h>>2]=s,t[h+4>>2]=u,t[l>>2]=t[h>>2],t[l+4>>2]=t[h+4>>2],w1(r,l,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(Um(L,D,S),e=t[n>>2]|0),m=k,((e-(t[L>>2]|0)|0)/12|0)+-1|0}function w1(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=u,t[e+8>>2]=r}function Um(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0;if(L=m,m=m+48|0,u=L+32|0,h=L+24|0,D=L,S=e+4|0,l=(((t[S>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,s=bd(e)|0,s>>>0<l>>>0)hi(e);else{k=t[e>>2]|0,K=((t[e+8>>2]|0)-k|0)/12|0,I=K<<1,S1(D,K>>>0<s>>>1>>>0?I>>>0<l>>>0?l:I:s,((t[S>>2]|0)-k|0)/12|0,e+8|0),S=D+8|0,s=t[S>>2]|0,l=t[n+4>>2]|0,r=t[r>>2]|0,t[h>>2]=t[n>>2],t[h+4>>2]=l,t[u>>2]=t[h>>2],t[u+4>>2]=t[h+4>>2],w1(s,u,r),t[S>>2]=(t[S>>2]|0)+12,Bl(e,D),Ra(D),m=L;return}}function bd(e){return e=e|0,357913941}function S1(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>357913941)$n();else{l=pn(n*12|0)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r*12|0)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n*12|0)}function Bl(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(((l|0)/-12|0)*12|0)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function Ra(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~(((u+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&yt(e)}function lv(e){e=e|0,av(e)}function jm(e){e=e|0,sv(e+24|0)}function sv(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-u|0)>>>0)/12|0)*12|0)),yt(r))}function av(e){e=e|0;var n=0;n=yr()|0,jn(e,2,1,n,zm()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function zm(){return 1224}function fv(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;return l=m,m=m+16|0,s=l+8|0,h=l,D=Oa(e)|0,e=t[D+4>>2]|0,t[h>>2]=t[D>>2],t[h+4>>2]=e,t[s>>2]=t[h>>2],t[s+4>>2]=t[h+4>>2],u=+Mr(n,s,r),m=l,+u}function Oa(e){return e=e|0,(t[(Id()|0)+24>>2]|0)+(e*12|0)|0}function Mr(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return s=m,m=m+16|0,l=s,u=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(u=t[(t[e>>2]|0)+u>>2]|0),As(l,r),l=Ys(l,r)|0,h=+Ya(+nS[u&7](e,l)),m=s,+h}function Sp(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+16|0,l=u+8|0,s=u,D=t[r>>2]|0,h=t[r+4>>2]|0,r=Fr(n)|0,t[s>>2]=D,t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],vl(e,r,l,1),m=u}function vl(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0,S=0,L=0,k=0;l=m,m=m+32|0,s=l+16|0,k=l+8|0,D=l,L=t[r>>2]|0,S=t[r+4>>2]|0,h=t[e>>2]|0,e=yu()|0,t[k>>2]=L,t[k+4>>2]=S,t[s>>2]=t[k>>2],t[s+4>>2]=t[k+4>>2],r=T1(s)|0,t[D>>2]=L,t[D+4>>2]=S,t[s>>2]=t[D>>2],t[s+4>>2]=t[D+4>>2],wi(h,n,e,r,Ui(s,u)|0,u),m=l}function yu(){var e=0,n=0;if(c[7712]|0||(Cp(9556),Wt(35,9556,se|0)|0,n=7712,t[n>>2]=1,t[n+4>>2]=0),!(sr(9556)|0)){e=9556,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Cp(9556)}return 9556}function T1(e){return e=e|0,0}function Ui(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0;return k=m,m=m+32|0,l=k+24|0,h=k+16|0,D=k,S=k+8|0,s=t[e>>2]|0,u=t[e+4>>2]|0,t[D>>2]=s,t[D+4>>2]=u,I=yu()|0,L=I+24|0,e=hn(n,4)|0,t[S>>2]=e,n=I+28|0,r=t[n>>2]|0,r>>>0<(t[I+32>>2]|0)>>>0?(t[h>>2]=s,t[h+4>>2]=u,t[l>>2]=t[h>>2],t[l+4>>2]=t[h+4>>2],Tp(r,l,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(Bd(L,D,S),e=t[n>>2]|0),m=k,((e-(t[L>>2]|0)|0)/12|0)+-1|0}function Tp(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=u,t[e+8>>2]=r}function Bd(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0;if(L=m,m=m+48|0,u=L+32|0,h=L+24|0,D=L,S=e+4|0,l=(((t[S>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,s=To(e)|0,s>>>0<l>>>0)hi(e);else{k=t[e>>2]|0,K=((t[e+8>>2]|0)-k|0)/12|0,I=K<<1,Os(D,K>>>0<s>>>1>>>0?I>>>0<l>>>0?l:I:s,((t[S>>2]|0)-k|0)/12|0,e+8|0),S=D+8|0,s=t[S>>2]|0,l=t[n+4>>2]|0,r=t[r>>2]|0,t[h>>2]=t[n>>2],t[h+4>>2]=l,t[u>>2]=t[h>>2],t[u+4>>2]=t[h+4>>2],Tp(s,u,r),t[S>>2]=(t[S>>2]|0)+12,Bf(e,D),Ud(D),m=L;return}}function To(e){return e=e|0,357913941}function Os(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>357913941)$n();else{l=pn(n*12|0)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r*12|0)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n*12|0)}function Bf(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(((l|0)/-12|0)*12|0)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function Ud(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~(((u+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&yt(e)}function Cp(e){e=e|0,xp(e)}function C1(e){e=e|0,x1(e+24|0)}function x1(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-u|0)>>>0)/12|0)*12|0)),yt(r))}function xp(e){e=e|0;var n=0;n=yr()|0,jn(e,2,5,n,nr()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function nr(){return 1232}function ml(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=Gn(e)|0,e=t[h+4>>2]|0,t[s>>2]=t[h>>2],t[s+4>>2]=e,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],r=+q0(n,l),m=u,+r}function Gn(e){return e=e|0,(t[(yu()|0)+24>>2]|0)+(e*12|0)|0}function q0(e,n){e=e|0,n=n|0;var r=0;return r=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(r=t[(t[e>>2]|0)+r>>2]|0),+ +Ya(+tS[r&15](e))}function k0(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+16|0,l=u+8|0,s=u,D=t[r>>2]|0,h=t[r+4>>2]|0,r=Fr(n)|0,t[s>>2]=D,t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],jd(e,r,l,1),m=u}function jd(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0,S=0,L=0,k=0;l=m,m=m+32|0,s=l+16|0,k=l+8|0,D=l,L=t[r>>2]|0,S=t[r+4>>2]|0,h=t[e>>2]|0,e=Ul()|0,t[k>>2]=L,t[k+4>>2]=S,t[s>>2]=t[k>>2],t[s+4>>2]=t[k+4>>2],r=A1(s)|0,t[D>>2]=L,t[D+4>>2]=S,t[s>>2]=t[D>>2],t[s+4>>2]=t[D+4>>2],wi(h,n,e,r,Ac(s,u)|0,u),m=l}function Ul(){var e=0,n=0;if(c[7720]|0||(qd(9592),Wt(36,9592,se|0)|0,n=7720,t[n>>2]=1,t[n+4>>2]=0),!(sr(9592)|0)){e=9592,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));qd(9592)}return 9592}function A1(e){return e=e|0,0}function Ac(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0;return k=m,m=m+32|0,l=k+24|0,h=k+16|0,D=k,S=k+8|0,s=t[e>>2]|0,u=t[e+4>>2]|0,t[D>>2]=s,t[D+4>>2]=u,I=Ul()|0,L=I+24|0,e=hn(n,4)|0,t[S>>2]=e,n=I+28|0,r=t[n>>2]|0,r>>>0<(t[I+32>>2]|0)>>>0?(t[h>>2]=s,t[h+4>>2]=u,t[l>>2]=t[h>>2],t[l+4>>2]=t[h+4>>2],Rc(r,l,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(zd(L,D,S),e=t[n>>2]|0),m=k,((e-(t[L>>2]|0)|0)/12|0)+-1|0}function Rc(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=u,t[e+8>>2]=r}function zd(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0;if(L=m,m=m+48|0,u=L+32|0,h=L+24|0,D=L,S=e+4|0,l=(((t[S>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,s=Ap(e)|0,s>>>0<l>>>0)hi(e);else{k=t[e>>2]|0,K=((t[e+8>>2]|0)-k|0)/12|0,I=K<<1,L0(D,K>>>0<s>>>1>>>0?I>>>0<l>>>0?l:I:s,((t[S>>2]|0)-k|0)/12|0,e+8|0),S=D+8|0,s=t[S>>2]|0,l=t[n+4>>2]|0,r=t[r>>2]|0,t[h>>2]=t[n>>2],t[h+4>>2]=l,t[u>>2]=t[h>>2],t[u+4>>2]=t[h+4>>2],Rc(s,u,r),t[S>>2]=(t[S>>2]|0)+12,dn(e,D),Hd(D),m=L;return}}function Ap(e){return e=e|0,357913941}function L0(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>357913941)$n();else{l=pn(n*12|0)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r*12|0)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n*12|0)}function dn(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(((l|0)/-12|0)*12|0)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function Hd(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~(((u+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&yt(e)}function qd(e){e=e|0,kc(e)}function Oc(e){e=e|0,Mc(e+24|0)}function Mc(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-u|0)>>>0)/12|0)*12|0)),yt(r))}function kc(e){e=e|0;var n=0;n=yr()|0,jn(e,2,7,n,R1()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function R1(){return 1276}function Rp(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0;return r=m,m=m+16|0,u=r+8|0,l=r,s=tf(e)|0,e=t[s+4>>2]|0,t[l>>2]=t[s>>2],t[l+4>>2]=e,t[u>>2]=t[l>>2],t[u+4>>2]=t[l+4>>2],n=Hm(n,u)|0,m=r,n|0}function tf(e){return e=e|0,(t[(Ul()|0)+24>>2]|0)+(e*12|0)|0}function Hm(e,n){e=e|0,n=n|0;var r=0,u=0,l=0;return l=m,m=m+16|0,u=l,r=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(r=t[(t[e>>2]|0)+r>>2]|0),I1[r&31](u,e),u=Lc(u)|0,m=l,u|0}function Lc(e){e=e|0;var n=0,r=0,u=0,l=0;return l=m,m=m+32|0,n=l+12|0,r=l,u=Iu(Wd()|0)|0,u?(is(n,u),kf(r,n),cv(e,r),e=xs(n)|0):e=O1(e)|0,m=l,e|0}function Wd(){var e=0;return c[7736]|0||(Wo(9640),Wt(25,9640,se|0)|0,e=7736,t[e>>2]=1,t[e+4>>2]=0),9640}function cv(e,n){e=e|0,n=n|0,Nc(n,e,e+8|0)|0}function O1(e){e=e|0;var n=0,r=0,u=0,l=0,s=0,h=0,D=0;return r=m,m=m+16|0,l=r+4|0,h=r,u=Ma(8)|0,n=u,D=pn(16)|0,t[D>>2]=t[e>>2],t[D+4>>2]=t[e+4>>2],t[D+8>>2]=t[e+8>>2],t[D+12>>2]=t[e+12>>2],s=n+4|0,t[s>>2]=D,e=pn(8)|0,s=t[s>>2]|0,t[h>>2]=0,t[l>>2]=t[h>>2],Uf(e,s,l),t[u>>2]=e,m=r,n|0}function Uf(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,r=pn(16)|0,t[r+4>>2]=0,t[r+8>>2]=0,t[r>>2]=1244,t[r+12>>2]=n,t[e+4>>2]=r}function jf(e){e=e|0,Uv(e),yt(e)}function M1(e){e=e|0,e=t[e+12>>2]|0,e|0&&yt(e)}function jl(e){e=e|0,yt(e)}function Nc(e,n,r){return e=e|0,n=n|0,r=r|0,n=zf(t[e>>2]|0,n,r)|0,r=e+4|0,t[(t[r>>2]|0)+8>>2]=n,t[(t[r>>2]|0)+8>>2]|0}function zf(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0;return u=m,m=m+16|0,l=u,ka(l),e=yo(e)|0,r=qm(e,t[n>>2]|0,+B[r>>3])|0,La(l),m=u,r|0}function qm(e,n,r){e=e|0,n=n|0,r=+r;var u=0;return u=_o(gl()|0)|0,n=ad(n)|0,Hr(0,u|0,e|0,n|0,+ +kl(r))|0}function gl(){var e=0;return c[7728]|0||(Vd(9628),e=7728,t[e>>2]=1,t[e+4>>2]=0),9628}function Vd(e){e=e|0,ll(e,Gd()|0,2)}function Gd(){return 1264}function Wo(e){e=e|0,Qa(e)}function Yd(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+16|0,l=u+8|0,s=u,D=t[r>>2]|0,h=t[r+4>>2]|0,r=Fr(n)|0,t[s>>2]=D,t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],Wm(e,r,l,1),m=u}function Wm(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0,S=0,L=0,k=0;l=m,m=m+32|0,s=l+16|0,k=l+8|0,D=l,L=t[r>>2]|0,S=t[r+4>>2]|0,h=t[e>>2]|0,e=k1()|0,t[k>>2]=L,t[k+4>>2]=S,t[s>>2]=t[k>>2],t[s+4>>2]=t[k+4>>2],r=Vm(s)|0,t[D>>2]=L,t[D+4>>2]=S,t[s>>2]=t[D>>2],t[s+4>>2]=t[D+4>>2],wi(h,n,e,r,Gm(s,u)|0,u),m=l}function k1(){var e=0,n=0;if(c[7744]|0||(hv(9684),Wt(37,9684,se|0)|0,n=7744,t[n>>2]=1,t[n+4>>2]=0),!(sr(9684)|0)){e=9684,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));hv(9684)}return 9684}function Vm(e){return e=e|0,0}function Gm(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0;return k=m,m=m+32|0,l=k+24|0,h=k+16|0,D=k,S=k+8|0,s=t[e>>2]|0,u=t[e+4>>2]|0,t[D>>2]=s,t[D+4>>2]=u,I=k1()|0,L=I+24|0,e=hn(n,4)|0,t[S>>2]=e,n=I+28|0,r=t[n>>2]|0,r>>>0<(t[I+32>>2]|0)>>>0?(t[h>>2]=s,t[h+4>>2]=u,t[l>>2]=t[h>>2],t[l+4>>2]=t[h+4>>2],dv(r,l,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(Ym(L,D,S),e=t[n>>2]|0),m=k,((e-(t[L>>2]|0)|0)/12|0)+-1|0}function dv(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=u,t[e+8>>2]=r}function Ym(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0;if(L=m,m=m+48|0,u=L+32|0,h=L+24|0,D=L,S=e+4|0,l=(((t[S>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,s=pv(e)|0,s>>>0<l>>>0)hi(e);else{k=t[e>>2]|0,K=((t[e+8>>2]|0)-k|0)/12|0,I=K<<1,Km(D,K>>>0<s>>>1>>>0?I>>>0<l>>>0?l:I:s,((t[S>>2]|0)-k|0)/12|0,e+8|0),S=D+8|0,s=t[S>>2]|0,l=t[n+4>>2]|0,r=t[r>>2]|0,t[h>>2]=t[n>>2],t[h+4>>2]=l,t[u>>2]=t[h>>2],t[u+4>>2]=t[h+4>>2],dv(s,u,r),t[S>>2]=(t[S>>2]|0)+12,Xm(e,D),Qm(D),m=L;return}}function pv(e){return e=e|0,357913941}function Km(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>357913941)$n();else{l=pn(n*12|0)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r*12|0)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n*12|0)}function Xm(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(((l|0)/-12|0)*12|0)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function Qm(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~(((u+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&yt(e)}function hv(e){e=e|0,Zm(e)}function Jm(e){e=e|0,Op(e+24|0)}function Op(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-u|0)>>>0)/12|0)*12|0)),yt(r))}function Zm(e){e=e|0;var n=0;n=yr()|0,jn(e,2,5,n,Hf()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function Hf(){return 1280}function vv(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=mv(e)|0,e=t[h+4>>2]|0,t[s>>2]=t[h>>2],t[s+4>>2]=e,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],r=gv(n,l,r)|0,m=u,r|0}function mv(e){return e=e|0,(t[(k1()|0)+24>>2]|0)+(e*12|0)|0}function gv(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return h=m,m=m+32|0,l=h,s=h+16|0,u=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(u=t[(t[e>>2]|0)+u>>2]|0),As(s,r),s=Ys(s,r)|0,Fg[u&15](l,e,s),s=Lc(l)|0,m=h,s|0}function Kd(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+16|0,l=u+8|0,s=u,D=t[r>>2]|0,h=t[r+4>>2]|0,r=Fr(n)|0,t[s>>2]=D,t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],Xd(e,r,l,1),m=u}function Xd(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0,S=0,L=0,k=0;l=m,m=m+32|0,s=l+16|0,k=l+8|0,D=l,L=t[r>>2]|0,S=t[r+4>>2]|0,h=t[e>>2]|0,e=Mp()|0,t[k>>2]=L,t[k+4>>2]=S,t[s>>2]=t[k>>2],t[s+4>>2]=t[k+4>>2],r=yv(s)|0,t[D>>2]=L,t[D+4>>2]=S,t[s>>2]=t[D>>2],t[s+4>>2]=t[D+4>>2],wi(h,n,e,r,Qd(s,u)|0,u),m=l}function Mp(){var e=0,n=0;if(c[7752]|0||(Sv(9720),Wt(38,9720,se|0)|0,n=7752,t[n>>2]=1,t[n+4>>2]=0),!(sr(9720)|0)){e=9720,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Sv(9720)}return 9720}function yv(e){return e=e|0,0}function Qd(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0;return k=m,m=m+32|0,l=k+24|0,h=k+16|0,D=k,S=k+8|0,s=t[e>>2]|0,u=t[e+4>>2]|0,t[D>>2]=s,t[D+4>>2]=u,I=Mp()|0,L=I+24|0,e=hn(n,4)|0,t[S>>2]=e,n=I+28|0,r=t[n>>2]|0,r>>>0<(t[I+32>>2]|0)>>>0?(t[h>>2]=s,t[h+4>>2]=u,t[l>>2]=t[h>>2],t[l+4>>2]=t[h+4>>2],_v(r,l,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(Ev(L,D,S),e=t[n>>2]|0),m=k,((e-(t[L>>2]|0)|0)/12|0)+-1|0}function _v(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=u,t[e+8>>2]=r}function Ev(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0;if(L=m,m=m+48|0,u=L+32|0,h=L+24|0,D=L,S=e+4|0,l=(((t[S>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,s=kp(e)|0,s>>>0<l>>>0)hi(e);else{k=t[e>>2]|0,K=((t[e+8>>2]|0)-k|0)/12|0,I=K<<1,Dv(D,K>>>0<s>>>1>>>0?I>>>0<l>>>0?l:I:s,((t[S>>2]|0)-k|0)/12|0,e+8|0),S=D+8|0,s=t[S>>2]|0,l=t[n+4>>2]|0,r=t[r>>2]|0,t[h>>2]=t[n>>2],t[h+4>>2]=l,t[u>>2]=t[h>>2],t[u+4>>2]=t[h+4>>2],_v(s,u,r),t[S>>2]=(t[S>>2]|0)+12,wv(e,D),$m(D),m=L;return}}function kp(e){return e=e|0,357913941}function Dv(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>357913941)$n();else{l=pn(n*12|0)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r*12|0)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n*12|0)}function wv(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(((l|0)/-12|0)*12|0)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function $m(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~(((u+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&yt(e)}function Sv(e){e=e|0,Tv(e)}function eg(e){e=e|0,Jd(e+24|0)}function Jd(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-u|0)>>>0)/12|0)*12|0)),yt(r))}function Tv(e){e=e|0;var n=0;n=yr()|0,jn(e,2,8,n,Lp()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function Lp(){return 1288}function tg(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0;return r=m,m=m+16|0,u=r+8|0,l=r,s=s0(e)|0,e=t[s+4>>2]|0,t[l>>2]=t[s>>2],t[l+4>>2]=e,t[u>>2]=t[l>>2],t[u+4>>2]=t[l+4>>2],n=Np(n,u)|0,m=r,n|0}function s0(e){return e=e|0,(t[(Mp()|0)+24>>2]|0)+(e*12|0)|0}function Np(e,n){e=e|0,n=n|0;var r=0;return r=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(r=t[(t[e>>2]|0)+r>>2]|0),dd(Zp[r&31](e)|0)|0}function ng(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+16|0,l=u+8|0,s=u,D=t[r>>2]|0,h=t[r+4>>2]|0,r=Fr(n)|0,t[s>>2]=D,t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],rg(e,r,l,0),m=u}function rg(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0,S=0,L=0,k=0;l=m,m=m+32|0,s=l+16|0,k=l+8|0,D=l,L=t[r>>2]|0,S=t[r+4>>2]|0,h=t[e>>2]|0,e=Fp()|0,t[k>>2]=L,t[k+4>>2]=S,t[s>>2]=t[k>>2],t[s+4>>2]=t[k+4>>2],r=nf(s)|0,t[D>>2]=L,t[D+4>>2]=S,t[s>>2]=t[D>>2],t[s+4>>2]=t[D+4>>2],wi(h,n,e,r,Pp(s,u)|0,u),m=l}function Fp(){var e=0,n=0;if(c[7760]|0||(Bp(9756),Wt(39,9756,se|0)|0,n=7760,t[n>>2]=1,t[n+4>>2]=0),!(sr(9756)|0)){e=9756,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Bp(9756)}return 9756}function nf(e){return e=e|0,0}function Pp(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0;return k=m,m=m+32|0,l=k+24|0,h=k+16|0,D=k,S=k+8|0,s=t[e>>2]|0,u=t[e+4>>2]|0,t[D>>2]=s,t[D+4>>2]=u,I=Fp()|0,L=I+24|0,e=hn(n,4)|0,t[S>>2]=e,n=I+28|0,r=t[n>>2]|0,r>>>0<(t[I+32>>2]|0)>>>0?(t[h>>2]=s,t[h+4>>2]=u,t[l>>2]=t[h>>2],t[l+4>>2]=t[h+4>>2],Ip(r,l,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(bp(L,D,S),e=t[n>>2]|0),m=k,((e-(t[L>>2]|0)|0)/12|0)+-1|0}function Ip(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=u,t[e+8>>2]=r}function bp(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0;if(L=m,m=m+48|0,u=L+32|0,h=L+24|0,D=L,S=e+4|0,l=(((t[S>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,s=ig(e)|0,s>>>0<l>>>0)hi(e);else{k=t[e>>2]|0,K=((t[e+8>>2]|0)-k|0)/12|0,I=K<<1,ug(D,K>>>0<s>>>1>>>0?I>>>0<l>>>0?l:I:s,((t[S>>2]|0)-k|0)/12|0,e+8|0),S=D+8|0,s=t[S>>2]|0,l=t[n+4>>2]|0,r=t[r>>2]|0,t[h>>2]=t[n>>2],t[h+4>>2]=l,t[u>>2]=t[h>>2],t[u+4>>2]=t[h+4>>2],Ip(s,u,r),t[S>>2]=(t[S>>2]|0)+12,Cv(e,D),qf(D),m=L;return}}function ig(e){return e=e|0,357913941}function ug(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>357913941)$n();else{l=pn(n*12|0)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r*12|0)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n*12|0)}function Cv(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(((l|0)/-12|0)*12|0)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function qf(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~(((u+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&yt(e)}function Bp(e){e=e|0,lg(e)}function xv(e){e=e|0,og(e+24|0)}function og(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-u|0)>>>0)/12|0)*12|0)),yt(r))}function lg(e){e=e|0;var n=0;n=yr()|0,jn(e,2,8,n,Up()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function Up(){return 1292}function jp(e,n,r){e=e|0,n=n|0,r=+r;var u=0,l=0,s=0,h=0;u=m,m=m+16|0,l=u+8|0,s=u,h=sg(e)|0,e=t[h+4>>2]|0,t[s>>2]=t[h>>2],t[s+4>>2]=e,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],ag(n,l,r),m=u}function sg(e){return e=e|0,(t[(Fp()|0)+24>>2]|0)+(e*12|0)|0}function ag(e,n,r){e=e|0,n=n|0,r=+r;var u=0,l=0,s=0;s=m,m=m+16|0,l=s,u=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(u=t[(t[e>>2]|0)+u>>2]|0),Pl(l,r),r=+os(l,r),Z8[u&31](e,r),m=s}function Av(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+16|0,l=u+8|0,s=u,D=t[r>>2]|0,h=t[r+4>>2]|0,r=Fr(n)|0,t[s>>2]=D,t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],zp(e,r,l,0),m=u}function zp(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0,S=0,L=0,k=0;l=m,m=m+32|0,s=l+16|0,k=l+8|0,D=l,L=t[r>>2]|0,S=t[r+4>>2]|0,h=t[e>>2]|0,e=Hp()|0,t[k>>2]=L,t[k+4>>2]=S,t[s>>2]=t[k>>2],t[s+4>>2]=t[k+4>>2],r=Zd(s)|0,t[D>>2]=L,t[D+4>>2]=S,t[s>>2]=t[D>>2],t[s+4>>2]=t[D+4>>2],wi(h,n,e,r,fg(s,u)|0,u),m=l}function Hp(){var e=0,n=0;if(c[7768]|0||(qp(9792),Wt(40,9792,se|0)|0,n=7768,t[n>>2]=1,t[n+4>>2]=0),!(sr(9792)|0)){e=9792,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));qp(9792)}return 9792}function Zd(e){return e=e|0,0}function fg(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0;return k=m,m=m+32|0,l=k+24|0,h=k+16|0,D=k,S=k+8|0,s=t[e>>2]|0,u=t[e+4>>2]|0,t[D>>2]=s,t[D+4>>2]=u,I=Hp()|0,L=I+24|0,e=hn(n,4)|0,t[S>>2]=e,n=I+28|0,r=t[n>>2]|0,r>>>0<(t[I+32>>2]|0)>>>0?(t[h>>2]=s,t[h+4>>2]=u,t[l>>2]=t[h>>2],t[l+4>>2]=t[h+4>>2],L1(r,l,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(cg(L,D,S),e=t[n>>2]|0),m=k,((e-(t[L>>2]|0)|0)/12|0)+-1|0}function L1(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=u,t[e+8>>2]=r}function cg(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0;if(L=m,m=m+48|0,u=L+32|0,h=L+24|0,D=L,S=e+4|0,l=(((t[S>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,s=Rv(e)|0,s>>>0<l>>>0)hi(e);else{k=t[e>>2]|0,K=((t[e+8>>2]|0)-k|0)/12|0,I=K<<1,Ov(D,K>>>0<s>>>1>>>0?I>>>0<l>>>0?l:I:s,((t[S>>2]|0)-k|0)/12|0,e+8|0),S=D+8|0,s=t[S>>2]|0,l=t[n+4>>2]|0,r=t[r>>2]|0,t[h>>2]=t[n>>2],t[h+4>>2]=l,t[u>>2]=t[h>>2],t[u+4>>2]=t[h+4>>2],L1(s,u,r),t[S>>2]=(t[S>>2]|0)+12,dg(e,D),Wf(D),m=L;return}}function Rv(e){return e=e|0,357913941}function Ov(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>357913941)$n();else{l=pn(n*12|0)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r*12|0)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n*12|0)}function dg(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(((l|0)/-12|0)*12|0)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function Wf(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~(((u+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&yt(e)}function qp(e){e=e|0,hg(e)}function Mv(e){e=e|0,pg(e+24|0)}function pg(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-u|0)>>>0)/12|0)*12|0)),yt(r))}function hg(e){e=e|0;var n=0;n=yr()|0,jn(e,2,1,n,Wp()|0,2),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function Wp(){return 1300}function vg(e,n,r,u){e=e|0,n=n|0,r=r|0,u=+u;var l=0,s=0,h=0,D=0;l=m,m=m+16|0,s=l+8|0,h=l,D=$s(e)|0,e=t[D+4>>2]|0,t[h>>2]=t[D>>2],t[h+4>>2]=e,t[s>>2]=t[h>>2],t[s+4>>2]=t[h+4>>2],mg(n,s,r,u),m=l}function $s(e){return e=e|0,(t[(Hp()|0)+24>>2]|0)+(e*12|0)|0}function mg(e,n,r,u){e=e|0,n=n|0,r=r|0,u=+u;var l=0,s=0,h=0,D=0;D=m,m=m+16|0,s=D+1|0,h=D,l=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(l=t[(t[e>>2]|0)+l>>2]|0),As(s,r),s=Ys(s,r)|0,Pl(h,u),u=+os(h,u),oS[l&15](e,s,u),m=D}function p(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+16|0,l=u+8|0,s=u,D=t[r>>2]|0,h=t[r+4>>2]|0,r=Fr(n)|0,t[s>>2]=D,t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],v(e,r,l,0),m=u}function v(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0,S=0,L=0,k=0;l=m,m=m+32|0,s=l+16|0,k=l+8|0,D=l,L=t[r>>2]|0,S=t[r+4>>2]|0,h=t[e>>2]|0,e=x()|0,t[k>>2]=L,t[k+4>>2]=S,t[s>>2]=t[k>>2],t[s+4>>2]=t[k+4>>2],r=P(s)|0,t[D>>2]=L,t[D+4>>2]=S,t[s>>2]=t[D>>2],t[s+4>>2]=t[D+4>>2],wi(h,n,e,r,W(s,u)|0,u),m=l}function x(){var e=0,n=0;if(c[7776]|0||(Rt(9828),Wt(41,9828,se|0)|0,n=7776,t[n>>2]=1,t[n+4>>2]=0),!(sr(9828)|0)){e=9828,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Rt(9828)}return 9828}function P(e){return e=e|0,0}function W(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0;return k=m,m=m+32|0,l=k+24|0,h=k+16|0,D=k,S=k+8|0,s=t[e>>2]|0,u=t[e+4>>2]|0,t[D>>2]=s,t[D+4>>2]=u,I=x()|0,L=I+24|0,e=hn(n,4)|0,t[S>>2]=e,n=I+28|0,r=t[n>>2]|0,r>>>0<(t[I+32>>2]|0)>>>0?(t[h>>2]=s,t[h+4>>2]=u,t[l>>2]=t[h>>2],t[l+4>>2]=t[h+4>>2],ee(r,l,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(ve(L,D,S),e=t[n>>2]|0),m=k,((e-(t[L>>2]|0)|0)/12|0)+-1|0}function ee(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=u,t[e+8>>2]=r}function ve(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0;if(L=m,m=m+48|0,u=L+32|0,h=L+24|0,D=L,S=e+4|0,l=(((t[S>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,s=Ee(e)|0,s>>>0<l>>>0)hi(e);else{k=t[e>>2]|0,K=((t[e+8>>2]|0)-k|0)/12|0,I=K<<1,Ie(D,K>>>0<s>>>1>>>0?I>>>0<l>>>0?l:I:s,((t[S>>2]|0)-k|0)/12|0,e+8|0),S=D+8|0,s=t[S>>2]|0,l=t[n+4>>2]|0,r=t[r>>2]|0,t[h>>2]=t[n>>2],t[h+4>>2]=l,t[u>>2]=t[h>>2],t[u+4>>2]=t[h+4>>2],ee(s,u,r),t[S>>2]=(t[S>>2]|0)+12,_t(e,D),St(D),m=L;return}}function Ee(e){return e=e|0,357913941}function Ie(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>357913941)$n();else{l=pn(n*12|0)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r*12|0)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n*12|0)}function _t(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(((l|0)/-12|0)*12|0)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function St(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~(((u+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&yt(e)}function Rt(e){e=e|0,rr(e)}function on(e){e=e|0,kn(e+24|0)}function kn(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-u|0)>>>0)/12|0)*12|0)),yt(r))}function rr(e){e=e|0;var n=0;n=yr()|0,jn(e,2,7,n,br()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function br(){return 1312}function ar(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;u=m,m=m+16|0,l=u+8|0,s=u,h=ui(e)|0,e=t[h+4>>2]|0,t[s>>2]=t[h>>2],t[s+4>>2]=e,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],di(n,l,r),m=u}function ui(e){return e=e|0,(t[(x()|0)+24>>2]|0)+(e*12|0)|0}function di(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0;s=m,m=m+16|0,l=s,u=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(u=t[(t[e>>2]|0)+u>>2]|0),As(l,r),l=Ys(l,r)|0,I1[u&31](e,l),m=s}function zl(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+16|0,l=u+8|0,s=u,D=t[r>>2]|0,h=t[r+4>>2]|0,r=Fr(n)|0,t[s>>2]=D,t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],Zi(e,r,l,0),m=u}function Zi(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0,S=0,L=0,k=0;l=m,m=m+32|0,s=l+16|0,k=l+8|0,D=l,L=t[r>>2]|0,S=t[r+4>>2]|0,h=t[e>>2]|0,e=so()|0,t[k>>2]=L,t[k+4>>2]=S,t[s>>2]=t[k>>2],t[s+4>>2]=t[k+4>>2],r=a0(s)|0,t[D>>2]=L,t[D+4>>2]=S,t[s>>2]=t[D>>2],t[s+4>>2]=t[D+4>>2],wi(h,n,e,r,Ms(s,u)|0,u),m=l}function so(){var e=0,n=0;if(c[7784]|0||(n_(9864),Wt(42,9864,se|0)|0,n=7784,t[n>>2]=1,t[n+4>>2]=0),!(sr(9864)|0)){e=9864,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));n_(9864)}return 9864}function a0(e){return e=e|0,0}function Ms(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0;return k=m,m=m+32|0,l=k+24|0,h=k+16|0,D=k,S=k+8|0,s=t[e>>2]|0,u=t[e+4>>2]|0,t[D>>2]=s,t[D+4>>2]=u,I=so()|0,L=I+24|0,e=hn(n,4)|0,t[S>>2]=e,n=I+28|0,r=t[n>>2]|0,r>>>0<(t[I+32>>2]|0)>>>0?(t[h>>2]=s,t[h+4>>2]=u,t[l>>2]=t[h>>2],t[l+4>>2]=t[h+4>>2],Co(r,l,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(kv(L,D,S),e=t[n>>2]|0),m=k,((e-(t[L>>2]|0)|0)/12|0)+-1|0}function Co(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=u,t[e+8>>2]=r}function kv(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0;if(L=m,m=m+48|0,u=L+32|0,h=L+24|0,D=L,S=e+4|0,l=(((t[S>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,s=J4(e)|0,s>>>0<l>>>0)hi(e);else{k=t[e>>2]|0,K=((t[e+8>>2]|0)-k|0)/12|0,I=K<<1,gg(D,K>>>0<s>>>1>>>0?I>>>0<l>>>0?l:I:s,((t[S>>2]|0)-k|0)/12|0,e+8|0),S=D+8|0,s=t[S>>2]|0,l=t[n+4>>2]|0,r=t[r>>2]|0,t[h>>2]=t[n>>2],t[h+4>>2]=l,t[u>>2]=t[h>>2],t[u+4>>2]=t[h+4>>2],Co(s,u,r),t[S>>2]=(t[S>>2]|0)+12,yg(e,D),rf(D),m=L;return}}function J4(e){return e=e|0,357913941}function gg(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>357913941)$n();else{l=pn(n*12|0)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r*12|0)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n*12|0)}function yg(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(((l|0)/-12|0)*12|0)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function rf(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~(((u+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&yt(e)}function n_(e){e=e|0,eE(e)}function Z4(e){e=e|0,$4(e+24|0)}function $4(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-u|0)>>>0)/12|0)*12|0)),yt(r))}function eE(e){e=e|0;var n=0;n=yr()|0,jn(e,2,8,n,tE()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function tE(){return 1320}function _g(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;u=m,m=m+16|0,l=u+8|0,s=u,h=nE(e)|0,e=t[h+4>>2]|0,t[s>>2]=t[h>>2],t[s+4>>2]=e,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],rE(n,l,r),m=u}function nE(e){return e=e|0,(t[(so()|0)+24>>2]|0)+(e*12|0)|0}function rE(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0;s=m,m=m+16|0,l=s,u=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(u=t[(t[e>>2]|0)+u>>2]|0),Eg(l,r),l=r_(l,r)|0,I1[u&31](e,l),m=s}function Eg(e,n){e=e|0,n=n|0}function r_(e,n){return e=e|0,n=n|0,iE(n)|0}function iE(e){return e=e|0,e|0}function uE(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+16|0,l=u+8|0,s=u,D=t[r>>2]|0,h=t[r+4>>2]|0,r=Fr(n)|0,t[s>>2]=D,t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],i_(e,r,l,0),m=u}function i_(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0,S=0,L=0,k=0;l=m,m=m+32|0,s=l+16|0,k=l+8|0,D=l,L=t[r>>2]|0,S=t[r+4>>2]|0,h=t[e>>2]|0,e=Vf()|0,t[k>>2]=L,t[k+4>>2]=S,t[s>>2]=t[k>>2],t[s+4>>2]=t[k+4>>2],r=u_(s)|0,t[D>>2]=L,t[D+4>>2]=S,t[s>>2]=t[D>>2],t[s+4>>2]=t[D+4>>2],wi(h,n,e,r,oE(s,u)|0,u),m=l}function Vf(){var e=0,n=0;if(c[7792]|0||(Sg(9900),Wt(43,9900,se|0)|0,n=7792,t[n>>2]=1,t[n+4>>2]=0),!(sr(9900)|0)){e=9900,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Sg(9900)}return 9900}function u_(e){return e=e|0,0}function oE(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0;return k=m,m=m+32|0,l=k+24|0,h=k+16|0,D=k,S=k+8|0,s=t[e>>2]|0,u=t[e+4>>2]|0,t[D>>2]=s,t[D+4>>2]=u,I=Vf()|0,L=I+24|0,e=hn(n,4)|0,t[S>>2]=e,n=I+28|0,r=t[n>>2]|0,r>>>0<(t[I+32>>2]|0)>>>0?(t[h>>2]=s,t[h+4>>2]=u,t[l>>2]=t[h>>2],t[l+4>>2]=t[h+4>>2],Vp(r,l,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(lE(L,D,S),e=t[n>>2]|0),m=k,((e-(t[L>>2]|0)|0)/12|0)+-1|0}function Vp(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=u,t[e+8>>2]=r}function lE(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0;if(L=m,m=m+48|0,u=L+32|0,h=L+24|0,D=L,S=e+4|0,l=(((t[S>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,s=Lv(e)|0,s>>>0<l>>>0)hi(e);else{k=t[e>>2]|0,K=((t[e+8>>2]|0)-k|0)/12|0,I=K<<1,Dg(D,K>>>0<s>>>1>>>0?I>>>0<l>>>0?l:I:s,((t[S>>2]|0)-k|0)/12|0,e+8|0),S=D+8|0,s=t[S>>2]|0,l=t[n+4>>2]|0,r=t[r>>2]|0,t[h>>2]=t[n>>2],t[h+4>>2]=l,t[u>>2]=t[h>>2],t[u+4>>2]=t[h+4>>2],Vp(s,u,r),t[S>>2]=(t[S>>2]|0)+12,wg(e,D),sE(D),m=L;return}}function Lv(e){return e=e|0,357913941}function Dg(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>357913941)$n();else{l=pn(n*12|0)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r*12|0)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n*12|0)}function wg(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(((l|0)/-12|0)*12|0)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function sE(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~(((u+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&yt(e)}function Sg(e){e=e|0,o_(e)}function aE(e){e=e|0,fE(e+24|0)}function fE(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-u|0)>>>0)/12|0)*12|0)),yt(r))}function o_(e){e=e|0;var n=0;n=yr()|0,jn(e,2,22,n,cE()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function cE(){return 1344}function dE(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0;r=m,m=m+16|0,u=r+8|0,l=r,s=l_(e)|0,e=t[s+4>>2]|0,t[l>>2]=t[s>>2],t[l+4>>2]=e,t[u>>2]=t[l>>2],t[u+4>>2]=t[l+4>>2],Nv(n,u),m=r}function l_(e){return e=e|0,(t[(Vf()|0)+24>>2]|0)+(e*12|0)|0}function Nv(e,n){e=e|0,n=n|0;var r=0;r=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(r=t[(t[e>>2]|0)+r>>2]|0),P1[r&127](e)}function pE(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0;s=t[e>>2]|0,l=Tg()|0,e=hE(r)|0,wi(s,n,l,e,vE(r,u)|0,u)}function Tg(){var e=0,n=0;if(c[7800]|0||(xg(9936),Wt(44,9936,se|0)|0,n=7800,t[n>>2]=1,t[n+4>>2]=0),!(sr(9936)|0)){e=9936,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));xg(9936)}return 9936}function hE(e){return e=e|0,e|0}function vE(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0;return D=m,m=m+16|0,l=D,s=D+4|0,t[l>>2]=e,S=Tg()|0,h=S+24|0,n=hn(n,4)|0,t[s>>2]=n,r=S+28|0,u=t[r>>2]|0,u>>>0<(t[S+32>>2]|0)>>>0?(Cg(u,e,n),n=(t[r>>2]|0)+8|0,t[r>>2]=n):(s_(h,l,s),n=t[r>>2]|0),m=D,(n-(t[h>>2]|0)>>3)+-1|0}function Cg(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,t[e+4>>2]=r}function s_(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0;if(D=m,m=m+32|0,l=D,s=e+4|0,h=((t[s>>2]|0)-(t[e>>2]|0)>>3)+1|0,u=a_(e)|0,u>>>0<h>>>0)hi(e);else{S=t[e>>2]|0,k=(t[e+8>>2]|0)-S|0,L=k>>2,f_(l,k>>3>>>0<u>>>1>>>0?L>>>0<h>>>0?h:L:u,(t[s>>2]|0)-S>>3,e+8|0),h=l+8|0,Cg(t[h>>2]|0,t[n>>2]|0,t[r>>2]|0),t[h>>2]=(t[h>>2]|0)+8,c_(e,l),d_(l),m=D;return}}function a_(e){return e=e|0,536870911}function f_(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>536870911)$n();else{l=pn(n<<3)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r<<3)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n<<3)}function c_(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(0-(l>>3)<<3)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function d_(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~((u+-8-n|0)>>>3)<<3)),e=t[e>>2]|0,e|0&&yt(e)}function xg(e){e=e|0,h_(e)}function p_(e){e=e|0,mE(e+24|0)}function mE(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-u|0)>>>3)<<3)),yt(r))}function h_(e){e=e|0;var n=0;n=yr()|0,jn(e,1,23,n,So()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function gE(e,n){e=e|0,n=n|0,f(t[(yE(e)|0)>>2]|0,n)}function yE(e){return e=e|0,(t[(Tg()|0)+24>>2]|0)+(e<<3)|0}function f(e,n){e=e|0,n=n|0;var r=0,u=0;r=m,m=m+16|0,u=r,tr(u,n),n=Js(u,n)|0,P1[e&127](n),m=r}function d(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0;s=t[e>>2]|0,l=E()|0,e=C(r)|0,wi(s,n,l,e,R(r,u)|0,u)}function E(){var e=0,n=0;if(c[7808]|0||(ht(9972),Wt(45,9972,se|0)|0,n=7808,t[n>>2]=1,t[n+4>>2]=0),!(sr(9972)|0)){e=9972,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));ht(9972)}return 9972}function C(e){return e=e|0,e|0}function R(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0;return D=m,m=m+16|0,l=D,s=D+4|0,t[l>>2]=e,S=E()|0,h=S+24|0,n=hn(n,4)|0,t[s>>2]=n,r=S+28|0,u=t[r>>2]|0,u>>>0<(t[S+32>>2]|0)>>>0?(j(u,e,n),n=(t[r>>2]|0)+8|0,t[r>>2]=n):(V(h,l,s),n=t[r>>2]|0),m=D,(n-(t[h>>2]|0)>>3)+-1|0}function j(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,t[e+4>>2]=r}function V(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0;if(D=m,m=m+32|0,l=D,s=e+4|0,h=((t[s>>2]|0)-(t[e>>2]|0)>>3)+1|0,u=te(e)|0,u>>>0<h>>>0)hi(e);else{S=t[e>>2]|0,k=(t[e+8>>2]|0)-S|0,L=k>>2,le(l,k>>3>>>0<u>>>1>>>0?L>>>0<h>>>0?h:L:u,(t[s>>2]|0)-S>>3,e+8|0),h=l+8|0,j(t[h>>2]|0,t[n>>2]|0,t[r>>2]|0),t[h>>2]=(t[h>>2]|0)+8,Be(e,l),Xe(l),m=D;return}}function te(e){return e=e|0,536870911}function le(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>536870911)$n();else{l=pn(n<<3)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r<<3)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n<<3)}function Be(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(0-(l>>3)<<3)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function Xe(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~((u+-8-n|0)>>>3)<<3)),e=t[e>>2]|0,e|0&&yt(e)}function ht(e){e=e|0,zt(e)}function Lt(e){e=e|0,Gt(e+24|0)}function Gt(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-u|0)>>>3)<<3)),yt(r))}function zt(e){e=e|0;var n=0;n=yr()|0,jn(e,1,9,n,gn()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function gn(){return 1348}function kr(e,n){return e=e|0,n=n|0,Mi(t[(oi(e)|0)>>2]|0,n)|0}function oi(e){return e=e|0,(t[(E()|0)+24>>2]|0)+(e<<3)|0}function Mi(e,n){e=e|0,n=n|0;var r=0,u=0;return r=m,m=m+16|0,u=r,N0(u,n),n=$i(u,n)|0,n=Cd(Zp[e&31](n)|0)|0,m=r,n|0}function N0(e,n){e=e|0,n=n|0}function $i(e,n){return e=e|0,n=n|0,ot(n)|0}function ot(e){return e=e|0,e|0}function Ot(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0;s=t[e>>2]|0,l=$e()|0,e=Ut(r)|0,wi(s,n,l,e,Pn(r,u)|0,u)}function $e(){var e=0,n=0;if(c[7816]|0||(Kr(10008),Wt(46,10008,se|0)|0,n=7816,t[n>>2]=1,t[n+4>>2]=0),!(sr(10008)|0)){e=10008,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Kr(10008)}return 10008}function Ut(e){return e=e|0,e|0}function Pn(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0;return D=m,m=m+16|0,l=D,s=D+4|0,t[l>>2]=e,S=$e()|0,h=S+24|0,n=hn(n,4)|0,t[s>>2]=n,r=S+28|0,u=t[r>>2]|0,u>>>0<(t[S+32>>2]|0)>>>0?(vn(u,e,n),n=(t[r>>2]|0)+8|0,t[r>>2]=n):(Wi(h,l,s),n=t[r>>2]|0),m=D,(n-(t[h>>2]|0)>>3)+-1|0}function vn(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,t[e+4>>2]=r}function Wi(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0;if(D=m,m=m+32|0,l=D,s=e+4|0,h=((t[s>>2]|0)-(t[e>>2]|0)>>3)+1|0,u=pi(e)|0,u>>>0<h>>>0)hi(e);else{S=t[e>>2]|0,k=(t[e+8>>2]|0)-S|0,L=k>>2,Ku(l,k>>3>>>0<u>>>1>>>0?L>>>0<h>>>0?h:L:u,(t[s>>2]|0)-S>>3,e+8|0),h=l+8|0,vn(t[h>>2]|0,t[n>>2]|0,t[r>>2]|0),t[h>>2]=(t[h>>2]|0)+8,hr(e,l),hu(l),m=D;return}}function pi(e){return e=e|0,536870911}function Ku(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>536870911)$n();else{l=pn(n<<3)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r<<3)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n<<3)}function hr(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(0-(l>>3)<<3)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function hu(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~((u+-8-n|0)>>>3)<<3)),e=t[e>>2]|0,e|0&&yt(e)}function Kr(e){e=e|0,W0(e)}function xu(e){e=e|0,w0(e+24|0)}function w0(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-u|0)>>>3)<<3)),yt(r))}function W0(e){e=e|0;var n=0;n=yr()|0,jn(e,1,15,n,op()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function ks(e){return e=e|0,yl(t[(Xu(e)|0)>>2]|0)|0}function Xu(e){return e=e|0,(t[($e()|0)+24>>2]|0)+(e<<3)|0}function yl(e){return e=e|0,Cd(k_[e&7]()|0)|0}function uf(){var e=0;return c[7832]|0||(m_(10052),Wt(25,10052,se|0)|0,e=7832,t[e>>2]=1,t[e+4>>2]=0),10052}function Vo(e,n){e=e|0,n=n|0,t[e>>2]=Ls()|0,t[e+4>>2]=$d()|0,t[e+12>>2]=n,t[e+8>>2]=Gf()|0,t[e+32>>2]=2}function Ls(){return 11709}function $d(){return 1188}function Gf(){return N1()|0}function Fc(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0,(Hl(u,896)|0)==512?r|0&&(Go(r),yt(r)):n|0&&(ws(n),yt(n))}function Hl(e,n){return e=e|0,n=n|0,n&e|0}function Go(e){e=e|0,e=t[e+4>>2]|0,e|0&&t2(e)}function N1(){var e=0;return c[7824]|0||(t[2511]=v_()|0,t[2512]=0,e=7824,t[e>>2]=1,t[e+4>>2]=0),10044}function v_(){return 0}function m_(e){e=e|0,Qa(e)}function _E(e){e=e|0;var n=0,r=0,u=0,l=0,s=0;n=m,m=m+32|0,r=n+24|0,s=n+16|0,l=n+8|0,u=n,g_(e,4827),EE(e,4834,3)|0,DE(e,3682,47)|0,t[s>>2]=9,t[s+4>>2]=0,t[r>>2]=t[s>>2],t[r+4>>2]=t[s+4>>2],Ag(e,4841,r)|0,t[l>>2]=1,t[l+4>>2]=0,t[r>>2]=t[l>>2],t[r+4>>2]=t[l+4>>2],y_(e,4871,r)|0,t[u>>2]=10,t[u+4>>2]=0,t[r>>2]=t[u>>2],t[r+4>>2]=t[u+4>>2],wE(e,4891,r)|0,m=n}function g_(e,n){e=e|0,n=n|0;var r=0;r=QR()|0,t[e>>2]=r,JR(r,n),e2(t[e>>2]|0)}function EE(e,n,r){return e=e|0,n=n|0,r=r|0,FR(e,Fr(n)|0,r,0),e|0}function DE(e,n,r){return e=e|0,n=n|0,r=r|0,_R(e,Fr(n)|0,r,0),e|0}function Ag(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=t[r+4>>2]|0,t[s>>2]=t[r>>2],t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],eR(e,n,l),m=u,e|0}function y_(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=t[r+4>>2]|0,t[s>>2]=t[r>>2],t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],PA(e,n,l),m=u,e|0}function wE(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=t[r+4>>2]|0,t[s>>2]=t[r>>2],t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],SE(e,n,l),m=u,e|0}function SE(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+16|0,l=u+8|0,s=u,D=t[r>>2]|0,h=t[r+4>>2]|0,r=Fr(n)|0,t[s>>2]=D,t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],TE(e,r,l,1),m=u}function TE(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0,S=0,L=0,k=0;l=m,m=m+32|0,s=l+16|0,k=l+8|0,D=l,L=t[r>>2]|0,S=t[r+4>>2]|0,h=t[e>>2]|0,e=CE()|0,t[k>>2]=L,t[k+4>>2]=S,t[s>>2]=t[k>>2],t[s+4>>2]=t[k+4>>2],r=DA(s)|0,t[D>>2]=L,t[D+4>>2]=S,t[s>>2]=t[D>>2],t[s+4>>2]=t[D+4>>2],wi(h,n,e,r,wA(s,u)|0,u),m=l}function CE(){var e=0,n=0;if(c[7840]|0||(Pw(10100),Wt(48,10100,se|0)|0,n=7840,t[n>>2]=1,t[n+4>>2]=0),!(sr(10100)|0)){e=10100,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Pw(10100)}return 10100}function DA(e){return e=e|0,0}function wA(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0;return k=m,m=m+32|0,l=k+24|0,h=k+16|0,D=k,S=k+8|0,s=t[e>>2]|0,u=t[e+4>>2]|0,t[D>>2]=s,t[D+4>>2]=u,I=CE()|0,L=I+24|0,e=hn(n,4)|0,t[S>>2]=e,n=I+28|0,r=t[n>>2]|0,r>>>0<(t[I+32>>2]|0)>>>0?(t[h>>2]=s,t[h+4>>2]=u,t[l>>2]=t[h>>2],t[l+4>>2]=t[h+4>>2],Fw(r,l,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(SA(L,D,S),e=t[n>>2]|0),m=k,((e-(t[L>>2]|0)|0)/12|0)+-1|0}function Fw(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=u,t[e+8>>2]=r}function SA(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0;if(L=m,m=m+48|0,u=L+32|0,h=L+24|0,D=L,S=e+4|0,l=(((t[S>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,s=TA(e)|0,s>>>0<l>>>0)hi(e);else{k=t[e>>2]|0,K=((t[e+8>>2]|0)-k|0)/12|0,I=K<<1,CA(D,K>>>0<s>>>1>>>0?I>>>0<l>>>0?l:I:s,((t[S>>2]|0)-k|0)/12|0,e+8|0),S=D+8|0,s=t[S>>2]|0,l=t[n+4>>2]|0,r=t[r>>2]|0,t[h>>2]=t[n>>2],t[h+4>>2]=l,t[u>>2]=t[h>>2],t[u+4>>2]=t[h+4>>2],Fw(s,u,r),t[S>>2]=(t[S>>2]|0)+12,xA(e,D),AA(D),m=L;return}}function TA(e){return e=e|0,357913941}function CA(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>357913941)$n();else{l=pn(n*12|0)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r*12|0)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n*12|0)}function xA(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(((l|0)/-12|0)*12|0)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function AA(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~(((u+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&yt(e)}function Pw(e){e=e|0,MA(e)}function RA(e){e=e|0,OA(e+24|0)}function OA(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-u|0)>>>0)/12|0)*12|0)),yt(r))}function MA(e){e=e|0;var n=0;n=yr()|0,jn(e,2,6,n,kA()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function kA(){return 1364}function LA(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;return u=m,m=m+16|0,l=u+8|0,s=u,h=NA(e)|0,e=t[h+4>>2]|0,t[s>>2]=t[h>>2],t[s+4>>2]=e,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],r=FA(n,l,r)|0,m=u,r|0}function NA(e){return e=e|0,(t[(CE()|0)+24>>2]|0)+(e*12|0)|0}function FA(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0;return s=m,m=m+16|0,l=s,u=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(u=t[(t[e>>2]|0)+u>>2]|0),As(l,r),l=Ys(l,r)|0,l=bl(eD[u&15](e,l)|0)|0,m=s,l|0}function PA(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+16|0,l=u+8|0,s=u,D=t[r>>2]|0,h=t[r+4>>2]|0,r=Fr(n)|0,t[s>>2]=D,t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],IA(e,r,l,0),m=u}function IA(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0,S=0,L=0,k=0;l=m,m=m+32|0,s=l+16|0,k=l+8|0,D=l,L=t[r>>2]|0,S=t[r+4>>2]|0,h=t[e>>2]|0,e=xE()|0,t[k>>2]=L,t[k+4>>2]=S,t[s>>2]=t[k>>2],t[s+4>>2]=t[k+4>>2],r=bA(s)|0,t[D>>2]=L,t[D+4>>2]=S,t[s>>2]=t[D>>2],t[s+4>>2]=t[D+4>>2],wi(h,n,e,r,BA(s,u)|0,u),m=l}function xE(){var e=0,n=0;if(c[7848]|0||(bw(10136),Wt(49,10136,se|0)|0,n=7848,t[n>>2]=1,t[n+4>>2]=0),!(sr(10136)|0)){e=10136,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));bw(10136)}return 10136}function bA(e){return e=e|0,0}function BA(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0;return k=m,m=m+32|0,l=k+24|0,h=k+16|0,D=k,S=k+8|0,s=t[e>>2]|0,u=t[e+4>>2]|0,t[D>>2]=s,t[D+4>>2]=u,I=xE()|0,L=I+24|0,e=hn(n,4)|0,t[S>>2]=e,n=I+28|0,r=t[n>>2]|0,r>>>0<(t[I+32>>2]|0)>>>0?(t[h>>2]=s,t[h+4>>2]=u,t[l>>2]=t[h>>2],t[l+4>>2]=t[h+4>>2],Iw(r,l,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(UA(L,D,S),e=t[n>>2]|0),m=k,((e-(t[L>>2]|0)|0)/12|0)+-1|0}function Iw(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=u,t[e+8>>2]=r}function UA(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0;if(L=m,m=m+48|0,u=L+32|0,h=L+24|0,D=L,S=e+4|0,l=(((t[S>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,s=jA(e)|0,s>>>0<l>>>0)hi(e);else{k=t[e>>2]|0,K=((t[e+8>>2]|0)-k|0)/12|0,I=K<<1,zA(D,K>>>0<s>>>1>>>0?I>>>0<l>>>0?l:I:s,((t[S>>2]|0)-k|0)/12|0,e+8|0),S=D+8|0,s=t[S>>2]|0,l=t[n+4>>2]|0,r=t[r>>2]|0,t[h>>2]=t[n>>2],t[h+4>>2]=l,t[u>>2]=t[h>>2],t[u+4>>2]=t[h+4>>2],Iw(s,u,r),t[S>>2]=(t[S>>2]|0)+12,HA(e,D),qA(D),m=L;return}}function jA(e){return e=e|0,357913941}function zA(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>357913941)$n();else{l=pn(n*12|0)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r*12|0)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n*12|0)}function HA(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(((l|0)/-12|0)*12|0)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function qA(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~(((u+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&yt(e)}function bw(e){e=e|0,GA(e)}function WA(e){e=e|0,VA(e+24|0)}function VA(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-u|0)>>>0)/12|0)*12|0)),yt(r))}function GA(e){e=e|0;var n=0;n=yr()|0,jn(e,2,9,n,YA()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function YA(){return 1372}function KA(e,n,r){e=e|0,n=n|0,r=+r;var u=0,l=0,s=0,h=0;u=m,m=m+16|0,l=u+8|0,s=u,h=XA(e)|0,e=t[h+4>>2]|0,t[s>>2]=t[h>>2],t[s+4>>2]=e,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],QA(n,l,r),m=u}function XA(e){return e=e|0,(t[(xE()|0)+24>>2]|0)+(e*12|0)|0}function QA(e,n,r){e=e|0,n=n|0,r=+r;var u=0,l=0,s=0,h=Tt;s=m,m=m+16|0,l=s,u=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(u=t[(t[e>>2]|0)+u>>2]|0),JA(l,r),h=w(ZA(l,r)),J8[u&1](e,h),m=s}function JA(e,n){e=e|0,n=+n}function ZA(e,n){return e=e|0,n=+n,w($A(n))}function $A(e){return e=+e,w(e)}function eR(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+16|0,l=u+8|0,s=u,D=t[r>>2]|0,h=t[r+4>>2]|0,r=Fr(n)|0,t[s>>2]=D,t[s+4>>2]=h,t[l>>2]=t[s>>2],t[l+4>>2]=t[s+4>>2],tR(e,r,l,0),m=u}function tR(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0,S=0,L=0,k=0;l=m,m=m+32|0,s=l+16|0,k=l+8|0,D=l,L=t[r>>2]|0,S=t[r+4>>2]|0,h=t[e>>2]|0,e=AE()|0,t[k>>2]=L,t[k+4>>2]=S,t[s>>2]=t[k>>2],t[s+4>>2]=t[k+4>>2],r=nR(s)|0,t[D>>2]=L,t[D+4>>2]=S,t[s>>2]=t[D>>2],t[s+4>>2]=t[D+4>>2],wi(h,n,e,r,rR(s,u)|0,u),m=l}function AE(){var e=0,n=0;if(c[7856]|0||(Uw(10172),Wt(50,10172,se|0)|0,n=7856,t[n>>2]=1,t[n+4>>2]=0),!(sr(10172)|0)){e=10172,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Uw(10172)}return 10172}function nR(e){return e=e|0,0}function rR(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0;return k=m,m=m+32|0,l=k+24|0,h=k+16|0,D=k,S=k+8|0,s=t[e>>2]|0,u=t[e+4>>2]|0,t[D>>2]=s,t[D+4>>2]=u,I=AE()|0,L=I+24|0,e=hn(n,4)|0,t[S>>2]=e,n=I+28|0,r=t[n>>2]|0,r>>>0<(t[I+32>>2]|0)>>>0?(t[h>>2]=s,t[h+4>>2]=u,t[l>>2]=t[h>>2],t[l+4>>2]=t[h+4>>2],Bw(r,l,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(iR(L,D,S),e=t[n>>2]|0),m=k,((e-(t[L>>2]|0)|0)/12|0)+-1|0}function Bw(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=u,t[e+8>>2]=r}function iR(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0;if(L=m,m=m+48|0,u=L+32|0,h=L+24|0,D=L,S=e+4|0,l=(((t[S>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,s=uR(e)|0,s>>>0<l>>>0)hi(e);else{k=t[e>>2]|0,K=((t[e+8>>2]|0)-k|0)/12|0,I=K<<1,oR(D,K>>>0<s>>>1>>>0?I>>>0<l>>>0?l:I:s,((t[S>>2]|0)-k|0)/12|0,e+8|0),S=D+8|0,s=t[S>>2]|0,l=t[n+4>>2]|0,r=t[r>>2]|0,t[h>>2]=t[n>>2],t[h+4>>2]=l,t[u>>2]=t[h>>2],t[u+4>>2]=t[h+4>>2],Bw(s,u,r),t[S>>2]=(t[S>>2]|0)+12,lR(e,D),sR(D),m=L;return}}function uR(e){return e=e|0,357913941}function oR(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>357913941)$n();else{l=pn(n*12|0)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r*12|0)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n*12|0)}function lR(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(((l|0)/-12|0)*12|0)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function sR(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~(((u+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&yt(e)}function Uw(e){e=e|0,cR(e)}function aR(e){e=e|0,fR(e+24|0)}function fR(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-u|0)>>>0)/12|0)*12|0)),yt(r))}function cR(e){e=e|0;var n=0;n=yr()|0,jn(e,2,3,n,dR()|0,2),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function dR(){return 1380}function pR(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0;l=m,m=m+16|0,s=l+8|0,h=l,D=hR(e)|0,e=t[D+4>>2]|0,t[h>>2]=t[D>>2],t[h+4>>2]=e,t[s>>2]=t[h>>2],t[s+4>>2]=t[h+4>>2],vR(n,s,r,u),m=l}function hR(e){return e=e|0,(t[(AE()|0)+24>>2]|0)+(e*12|0)|0}function vR(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0;D=m,m=m+16|0,s=D+1|0,h=D,l=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(l=t[(t[e>>2]|0)+l>>2]|0),As(s,r),s=Ys(s,r)|0,mR(h,u),h=gR(h,u)|0,Fg[l&15](e,s,h),m=D}function mR(e,n){e=e|0,n=n|0}function gR(e,n){return e=e|0,n=n|0,yR(n)|0}function yR(e){return e=e|0,(e|0)!=0|0}function _R(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0;s=t[e>>2]|0,l=RE()|0,e=ER(r)|0,wi(s,n,l,e,DR(r,u)|0,u)}function RE(){var e=0,n=0;if(c[7864]|0||(zw(10208),Wt(51,10208,se|0)|0,n=7864,t[n>>2]=1,t[n+4>>2]=0),!(sr(10208)|0)){e=10208,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));zw(10208)}return 10208}function ER(e){return e=e|0,e|0}function DR(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0;return D=m,m=m+16|0,l=D,s=D+4|0,t[l>>2]=e,S=RE()|0,h=S+24|0,n=hn(n,4)|0,t[s>>2]=n,r=S+28|0,u=t[r>>2]|0,u>>>0<(t[S+32>>2]|0)>>>0?(jw(u,e,n),n=(t[r>>2]|0)+8|0,t[r>>2]=n):(wR(h,l,s),n=t[r>>2]|0),m=D,(n-(t[h>>2]|0)>>3)+-1|0}function jw(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,t[e+4>>2]=r}function wR(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0;if(D=m,m=m+32|0,l=D,s=e+4|0,h=((t[s>>2]|0)-(t[e>>2]|0)>>3)+1|0,u=SR(e)|0,u>>>0<h>>>0)hi(e);else{S=t[e>>2]|0,k=(t[e+8>>2]|0)-S|0,L=k>>2,TR(l,k>>3>>>0<u>>>1>>>0?L>>>0<h>>>0?h:L:u,(t[s>>2]|0)-S>>3,e+8|0),h=l+8|0,jw(t[h>>2]|0,t[n>>2]|0,t[r>>2]|0),t[h>>2]=(t[h>>2]|0)+8,CR(e,l),xR(l),m=D;return}}function SR(e){return e=e|0,536870911}function TR(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>536870911)$n();else{l=pn(n<<3)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r<<3)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n<<3)}function CR(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(0-(l>>3)<<3)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function xR(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~((u+-8-n|0)>>>3)<<3)),e=t[e>>2]|0,e|0&&yt(e)}function zw(e){e=e|0,OR(e)}function AR(e){e=e|0,RR(e+24|0)}function RR(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-u|0)>>>3)<<3)),yt(r))}function OR(e){e=e|0;var n=0;n=yr()|0,jn(e,1,24,n,MR()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function MR(){return 1392}function kR(e,n){e=e|0,n=n|0,NR(t[(LR(e)|0)>>2]|0,n)}function LR(e){return e=e|0,(t[(RE()|0)+24>>2]|0)+(e<<3)|0}function NR(e,n){e=e|0,n=n|0;var r=0,u=0;r=m,m=m+16|0,u=r,N0(u,n),n=$i(u,n)|0,P1[e&127](n),m=r}function FR(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0;s=t[e>>2]|0,l=OE()|0,e=PR(r)|0,wi(s,n,l,e,IR(r,u)|0,u)}function OE(){var e=0,n=0;if(c[7872]|0||(qw(10244),Wt(52,10244,se|0)|0,n=7872,t[n>>2]=1,t[n+4>>2]=0),!(sr(10244)|0)){e=10244,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));qw(10244)}return 10244}function PR(e){return e=e|0,e|0}function IR(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0;return D=m,m=m+16|0,l=D,s=D+4|0,t[l>>2]=e,S=OE()|0,h=S+24|0,n=hn(n,4)|0,t[s>>2]=n,r=S+28|0,u=t[r>>2]|0,u>>>0<(t[S+32>>2]|0)>>>0?(Hw(u,e,n),n=(t[r>>2]|0)+8|0,t[r>>2]=n):(bR(h,l,s),n=t[r>>2]|0),m=D,(n-(t[h>>2]|0)>>3)+-1|0}function Hw(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,t[e+4>>2]=r}function bR(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0;if(D=m,m=m+32|0,l=D,s=e+4|0,h=((t[s>>2]|0)-(t[e>>2]|0)>>3)+1|0,u=BR(e)|0,u>>>0<h>>>0)hi(e);else{S=t[e>>2]|0,k=(t[e+8>>2]|0)-S|0,L=k>>2,UR(l,k>>3>>>0<u>>>1>>>0?L>>>0<h>>>0?h:L:u,(t[s>>2]|0)-S>>3,e+8|0),h=l+8|0,Hw(t[h>>2]|0,t[n>>2]|0,t[r>>2]|0),t[h>>2]=(t[h>>2]|0)+8,jR(e,l),zR(l),m=D;return}}function BR(e){return e=e|0,536870911}function UR(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>536870911)$n();else{l=pn(n<<3)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r<<3)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n<<3)}function jR(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(0-(l>>3)<<3)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function zR(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~((u+-8-n|0)>>>3)<<3)),e=t[e>>2]|0,e|0&&yt(e)}function qw(e){e=e|0,WR(e)}function HR(e){e=e|0,qR(e+24|0)}function qR(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-u|0)>>>3)<<3)),yt(r))}function WR(e){e=e|0;var n=0;n=yr()|0,jn(e,1,16,n,VR()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function VR(){return 1400}function GR(e){return e=e|0,KR(t[(YR(e)|0)>>2]|0)|0}function YR(e){return e=e|0,(t[(OE()|0)+24>>2]|0)+(e<<3)|0}function KR(e){return e=e|0,XR(k_[e&7]()|0)|0}function XR(e){return e=e|0,e|0}function QR(){var e=0;return c[7880]|0||(r7(10280),Wt(25,10280,se|0)|0,e=7880,t[e>>2]=1,t[e+4>>2]=0),10280}function JR(e,n){e=e|0,n=n|0,t[e>>2]=ZR()|0,t[e+4>>2]=$R()|0,t[e+12>>2]=n,t[e+8>>2]=e7()|0,t[e+32>>2]=4}function ZR(){return 11711}function $R(){return 1356}function e7(){return N1()|0}function t7(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0,(Hl(u,896)|0)==512?r|0&&(n7(r),yt(r)):n|0&&(ro(n),yt(n))}function n7(e){e=e|0,e=t[e+4>>2]|0,e|0&&t2(e)}function r7(e){e=e|0,Qa(e)}function i7(e){e=e|0,u7(e,4920),o7(e)|0,l7(e)|0}function u7(e,n){e=e|0,n=n|0;var r=0;r=Wd()|0,t[e>>2]=r,R7(r,n),e2(t[e>>2]|0)}function o7(e){e=e|0;var n=0;return n=t[e>>2]|0,Gp(n,y7()|0),e|0}function l7(e){e=e|0;var n=0;return n=t[e>>2]|0,Gp(n,s7()|0),e|0}function s7(){var e=0;return c[7888]|0||(Ww(10328),Wt(53,10328,se|0)|0,e=7888,t[e>>2]=1,t[e+4>>2]=0),sr(10328)|0||Ww(10328),10328}function Gp(e,n){e=e|0,n=n|0,wi(e,0,n,0,0,0)}function Ww(e){e=e|0,c7(e),Yp(e,10)}function a7(e){e=e|0,f7(e+24|0)}function f7(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-u|0)>>>3)<<3)),yt(r))}function c7(e){e=e|0;var n=0;n=yr()|0,jn(e,5,1,n,v7()|0,2),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function d7(e,n,r){e=e|0,n=n|0,r=+r,p7(e,n,r)}function Yp(e,n){e=e|0,n=n|0,t[e+20>>2]=n}function p7(e,n,r){e=e|0,n=n|0,r=+r;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+16|0,s=u+8|0,D=u+13|0,l=u,h=u+12|0,As(D,n),t[s>>2]=Ys(D,n)|0,Pl(h,r),B[l>>3]=+os(h,r),h7(e,s,l),m=u}function h7(e,n,r){e=e|0,n=n|0,r=r|0,b(e+8|0,t[n>>2]|0,+B[r>>3]),c[e+24>>0]=1}function v7(){return 1404}function m7(e,n){return e=e|0,n=+n,g7(e,n)|0}function g7(e,n){e=e|0,n=+n;var r=0,u=0,l=0,s=0,h=0,D=0,S=0;return u=m,m=m+16|0,s=u+4|0,h=u+8|0,D=u,l=Ma(8)|0,r=l,S=pn(16)|0,As(s,e),e=Ys(s,e)|0,Pl(h,n),b(S,e,+os(h,n)),h=r+4|0,t[h>>2]=S,e=pn(8)|0,h=t[h>>2]|0,t[D>>2]=0,t[s>>2]=t[D>>2],Uf(e,h,s),t[l>>2]=e,m=u,r|0}function y7(){var e=0;return c[7896]|0||(Vw(10364),Wt(54,10364,se|0)|0,e=7896,t[e>>2]=1,t[e+4>>2]=0),sr(10364)|0||Vw(10364),10364}function Vw(e){e=e|0,D7(e),Yp(e,55)}function _7(e){e=e|0,E7(e+24|0)}function E7(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-u|0)>>>3)<<3)),yt(r))}function D7(e){e=e|0;var n=0;n=yr()|0,jn(e,5,4,n,C7()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function w7(e){e=e|0,S7(e)}function S7(e){e=e|0,T7(e)}function T7(e){e=e|0,Gw(e+8|0),c[e+24>>0]=1}function Gw(e){e=e|0,t[e>>2]=0,B[e+8>>3]=0}function C7(){return 1424}function x7(){return A7()|0}function A7(){var e=0,n=0,r=0,u=0,l=0,s=0,h=0;return n=m,m=m+16|0,l=n+4|0,h=n,r=Ma(8)|0,e=r,u=pn(16)|0,Gw(u),s=e+4|0,t[s>>2]=u,u=pn(8)|0,s=t[s>>2]|0,t[h>>2]=0,t[l>>2]=t[h>>2],Uf(u,s,l),t[r>>2]=u,m=n,e|0}function R7(e,n){e=e|0,n=n|0,t[e>>2]=O7()|0,t[e+4>>2]=M7()|0,t[e+12>>2]=n,t[e+8>>2]=k7()|0,t[e+32>>2]=5}function O7(){return 11710}function M7(){return 1416}function k7(){return __()|0}function L7(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0,(Hl(u,896)|0)==512?r|0&&(N7(r),yt(r)):n|0&&yt(n)}function N7(e){e=e|0,e=t[e+4>>2]|0,e|0&&t2(e)}function __(){var e=0;return c[7904]|0||(t[2600]=F7()|0,t[2601]=0,e=7904,t[e>>2]=1,t[e+4>>2]=0),10400}function F7(){return t[357]|0}function P7(e){e=e|0,I7(e,4926),b7(e)|0}function I7(e,n){e=e|0,n=n|0;var r=0;r=Xa()|0,t[e>>2]=r,K7(r,n),e2(t[e>>2]|0)}function b7(e){e=e|0;var n=0;return n=t[e>>2]|0,Gp(n,B7()|0),e|0}function B7(){var e=0;return c[7912]|0||(Yw(10412),Wt(56,10412,se|0)|0,e=7912,t[e>>2]=1,t[e+4>>2]=0),sr(10412)|0||Yw(10412),10412}function Yw(e){e=e|0,z7(e),Yp(e,57)}function U7(e){e=e|0,j7(e+24|0)}function j7(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-u|0)>>>3)<<3)),yt(r))}function z7(e){e=e|0;var n=0;n=yr()|0,jn(e,5,5,n,V7()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function H7(e){e=e|0,q7(e)}function q7(e){e=e|0,W7(e)}function W7(e){e=e|0;var n=0,r=0;n=e+8|0,r=n+48|0;do t[n>>2]=0,n=n+4|0;while((n|0)<(r|0));c[e+56>>0]=1}function V7(){return 1432}function G7(){return Y7()|0}function Y7(){var e=0,n=0,r=0,u=0,l=0,s=0,h=0,D=0;h=m,m=m+16|0,e=h+4|0,n=h,r=Ma(8)|0,u=r,l=pn(48)|0,s=l,D=s+48|0;do t[s>>2]=0,s=s+4|0;while((s|0)<(D|0));return s=u+4|0,t[s>>2]=l,D=pn(8)|0,s=t[s>>2]|0,t[n>>2]=0,t[e>>2]=t[n>>2],Th(D,s,e),t[r>>2]=D,m=h,u|0}function K7(e,n){e=e|0,n=n|0,t[e>>2]=X7()|0,t[e+4>>2]=Q7()|0,t[e+12>>2]=n,t[e+8>>2]=J7()|0,t[e+32>>2]=6}function X7(){return 11704}function Q7(){return 1436}function J7(){return __()|0}function Z7(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0,(Hl(u,896)|0)==512?r|0&&($7(r),yt(r)):n|0&&yt(n)}function $7(e){e=e|0,e=t[e+4>>2]|0,e|0&&t2(e)}function eO(e){e=e|0,tO(e,4933),nO(e)|0,rO(e)|0}function tO(e,n){e=e|0,n=n|0;var r=0;r=AO()|0,t[e>>2]=r,RO(r,n),e2(t[e>>2]|0)}function nO(e){e=e|0;var n=0;return n=t[e>>2]|0,Gp(n,gO()|0),e|0}function rO(e){e=e|0;var n=0;return n=t[e>>2]|0,Gp(n,iO()|0),e|0}function iO(){var e=0;return c[7920]|0||(Kw(10452),Wt(58,10452,se|0)|0,e=7920,t[e>>2]=1,t[e+4>>2]=0),sr(10452)|0||Kw(10452),10452}function Kw(e){e=e|0,lO(e),Yp(e,1)}function uO(e){e=e|0,oO(e+24|0)}function oO(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-u|0)>>>3)<<3)),yt(r))}function lO(e){e=e|0;var n=0;n=yr()|0,jn(e,5,1,n,cO()|0,2),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function sO(e,n,r){e=e|0,n=+n,r=+r,aO(e,n,r)}function aO(e,n,r){e=e|0,n=+n,r=+r;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+32|0,s=u+8|0,D=u+17|0,l=u,h=u+16|0,Pl(D,n),B[s>>3]=+os(D,n),Pl(h,r),B[l>>3]=+os(h,r),fO(e,s,l),m=u}function fO(e,n,r){e=e|0,n=n|0,r=r|0,Xw(e+8|0,+B[n>>3],+B[r>>3]),c[e+24>>0]=1}function Xw(e,n,r){e=e|0,n=+n,r=+r,B[e>>3]=n,B[e+8>>3]=r}function cO(){return 1472}function dO(e,n){return e=+e,n=+n,pO(e,n)|0}function pO(e,n){e=+e,n=+n;var r=0,u=0,l=0,s=0,h=0,D=0,S=0;return u=m,m=m+16|0,h=u+4|0,D=u+8|0,S=u,l=Ma(8)|0,r=l,s=pn(16)|0,Pl(h,e),e=+os(h,e),Pl(D,n),Xw(s,e,+os(D,n)),D=r+4|0,t[D>>2]=s,s=pn(8)|0,D=t[D>>2]|0,t[S>>2]=0,t[h>>2]=t[S>>2],Qw(s,D,h),t[l>>2]=s,m=u,r|0}function Qw(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,r=pn(16)|0,t[r+4>>2]=0,t[r+8>>2]=0,t[r>>2]=1452,t[r+12>>2]=n,t[e+4>>2]=r}function hO(e){e=e|0,Uv(e),yt(e)}function vO(e){e=e|0,e=t[e+12>>2]|0,e|0&&yt(e)}function mO(e){e=e|0,yt(e)}function gO(){var e=0;return c[7928]|0||(Jw(10488),Wt(59,10488,se|0)|0,e=7928,t[e>>2]=1,t[e+4>>2]=0),sr(10488)|0||Jw(10488),10488}function Jw(e){e=e|0,EO(e),Yp(e,60)}function yO(e){e=e|0,_O(e+24|0)}function _O(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-u|0)>>>3)<<3)),yt(r))}function EO(e){e=e|0;var n=0;n=yr()|0,jn(e,5,6,n,TO()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function DO(e){e=e|0,wO(e)}function wO(e){e=e|0,SO(e)}function SO(e){e=e|0,Zw(e+8|0),c[e+24>>0]=1}function Zw(e){e=e|0,t[e>>2]=0,t[e+4>>2]=0,t[e+8>>2]=0,t[e+12>>2]=0}function TO(){return 1492}function CO(){return xO()|0}function xO(){var e=0,n=0,r=0,u=0,l=0,s=0,h=0;return n=m,m=m+16|0,l=n+4|0,h=n,r=Ma(8)|0,e=r,u=pn(16)|0,Zw(u),s=e+4|0,t[s>>2]=u,u=pn(8)|0,s=t[s>>2]|0,t[h>>2]=0,t[l>>2]=t[h>>2],Qw(u,s,l),t[r>>2]=u,m=n,e|0}function AO(){var e=0;return c[7936]|0||(FO(10524),Wt(25,10524,se|0)|0,e=7936,t[e>>2]=1,t[e+4>>2]=0),10524}function RO(e,n){e=e|0,n=n|0,t[e>>2]=OO()|0,t[e+4>>2]=MO()|0,t[e+12>>2]=n,t[e+8>>2]=kO()|0,t[e+32>>2]=7}function OO(){return 11700}function MO(){return 1484}function kO(){return __()|0}function LO(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0,(Hl(u,896)|0)==512?r|0&&(NO(r),yt(r)):n|0&&yt(n)}function NO(e){e=e|0,e=t[e+4>>2]|0,e|0&&t2(e)}function FO(e){e=e|0,Qa(e)}function PO(e,n,r){e=e|0,n=n|0,r=r|0,e=Fr(n)|0,n=IO(r)|0,r=bO(r,0)|0,pM(e,n,r,ME()|0,0)}function IO(e){return e=e|0,e|0}function bO(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0;return D=m,m=m+16|0,l=D,s=D+4|0,t[l>>2]=e,S=ME()|0,h=S+24|0,n=hn(n,4)|0,t[s>>2]=n,r=S+28|0,u=t[r>>2]|0,u>>>0<(t[S+32>>2]|0)>>>0?(e8(u,e,n),n=(t[r>>2]|0)+8|0,t[r>>2]=n):(WO(h,l,s),n=t[r>>2]|0),m=D,(n-(t[h>>2]|0)>>3)+-1|0}function ME(){var e=0,n=0;if(c[7944]|0||($w(10568),Wt(61,10568,se|0)|0,n=7944,t[n>>2]=1,t[n+4>>2]=0),!(sr(10568)|0)){e=10568,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));$w(10568)}return 10568}function $w(e){e=e|0,jO(e)}function BO(e){e=e|0,UO(e+24|0)}function UO(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-u|0)>>>3)<<3)),yt(r))}function jO(e){e=e|0;var n=0;n=yr()|0,jn(e,1,17,n,ev()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function zO(e){return e=e|0,qO(t[(HO(e)|0)>>2]|0)|0}function HO(e){return e=e|0,(t[(ME()|0)+24>>2]|0)+(e<<3)|0}function qO(e){return e=e|0,H0(k_[e&7]()|0)|0}function e8(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,t[e+4>>2]=r}function WO(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0;if(D=m,m=m+32|0,l=D,s=e+4|0,h=((t[s>>2]|0)-(t[e>>2]|0)>>3)+1|0,u=VO(e)|0,u>>>0<h>>>0)hi(e);else{S=t[e>>2]|0,k=(t[e+8>>2]|0)-S|0,L=k>>2,GO(l,k>>3>>>0<u>>>1>>>0?L>>>0<h>>>0?h:L:u,(t[s>>2]|0)-S>>3,e+8|0),h=l+8|0,e8(t[h>>2]|0,t[n>>2]|0,t[r>>2]|0),t[h>>2]=(t[h>>2]|0)+8,YO(e,l),KO(l),m=D;return}}function VO(e){return e=e|0,536870911}function GO(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>536870911)$n();else{l=pn(n<<3)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r<<3)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n<<3)}function YO(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(0-(l>>3)<<3)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function KO(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~((u+-8-n|0)>>>3)<<3)),e=t[e>>2]|0,e|0&&yt(e)}function XO(){QO()}function QO(){JO(10604)}function JO(e){e=e|0,ZO(e,4955)}function ZO(e,n){e=e|0,n=n|0;var r=0;r=$O()|0,t[e>>2]=r,eM(r,n),e2(t[e>>2]|0)}function $O(){var e=0;return c[7952]|0||(aM(10612),Wt(25,10612,se|0)|0,e=7952,t[e>>2]=1,t[e+4>>2]=0),10612}function eM(e,n){e=e|0,n=n|0,t[e>>2]=iM()|0,t[e+4>>2]=uM()|0,t[e+12>>2]=n,t[e+8>>2]=oM()|0,t[e+32>>2]=8}function e2(e){e=e|0;var n=0,r=0;n=m,m=m+16|0,r=n,Fv()|0,t[r>>2]=e,tM(10608,r),m=n}function Fv(){return c[11714]|0||(t[2652]=0,Wt(62,10608,se|0)|0,c[11714]=1),10608}function tM(e,n){e=e|0,n=n|0;var r=0;r=pn(8)|0,t[r+4>>2]=t[n>>2],t[r>>2]=t[e>>2],t[e>>2]=r}function nM(e){e=e|0,rM(e)}function rM(e){e=e|0;var n=0,r=0;if(n=t[e>>2]|0,n|0)do r=n,n=t[n>>2]|0,yt(r);while((n|0)!=0);t[e>>2]=0}function iM(){return 11715}function uM(){return 1496}function oM(){return N1()|0}function lM(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0,(Hl(u,896)|0)==512?r|0&&(sM(r),yt(r)):n|0&&yt(n)}function sM(e){e=e|0,e=t[e+4>>2]|0,e|0&&t2(e)}function aM(e){e=e|0,Qa(e)}function fM(e,n){e=e|0,n=n|0;var r=0,u=0;Fv()|0,r=t[2652]|0;e:do if(r|0){for(;u=t[r+4>>2]|0,!(u|0?(P8(kE(u)|0,e)|0)==0:0);)if(r=t[r>>2]|0,!r)break e;cM(u,n)}while(0)}function kE(e){return e=e|0,t[e+12>>2]|0}function cM(e,n){e=e|0,n=n|0;var r=0;e=e+36|0,r=t[e>>2]|0,r|0&&(ca(r),yt(r)),r=pn(4)|0,Sf(r,n),t[e>>2]=r}function LE(){return c[11716]|0||(t[2664]=0,Wt(63,10656,se|0)|0,c[11716]=1),10656}function t8(){var e=0;return c[11717]|0?e=t[2665]|0:(dM(),t[2665]=1504,c[11717]=1,e=1504),e|0}function dM(){c[11740]|0||(c[11718]=hn(hn(8,0)|0,0)|0,c[11719]=hn(hn(0,0)|0,0)|0,c[11720]=hn(hn(0,16)|0,0)|0,c[11721]=hn(hn(8,0)|0,0)|0,c[11722]=hn(hn(0,0)|0,0)|0,c[11723]=hn(hn(8,0)|0,0)|0,c[11724]=hn(hn(0,0)|0,0)|0,c[11725]=hn(hn(8,0)|0,0)|0,c[11726]=hn(hn(0,0)|0,0)|0,c[11727]=hn(hn(8,0)|0,0)|0,c[11728]=hn(hn(0,0)|0,0)|0,c[11729]=hn(hn(0,0)|0,32)|0,c[11730]=hn(hn(0,0)|0,32)|0,c[11740]=1)}function n8(){return 1572}function pM(e,n,r,u,l){e=e|0,n=n|0,r=r|0,u=u|0,l=l|0;var s=0,h=0,D=0,S=0,L=0,k=0;s=m,m=m+32|0,k=s+16|0,L=s+12|0,S=s+8|0,D=s+4|0,h=s,t[k>>2]=e,t[L>>2]=n,t[S>>2]=r,t[D>>2]=u,t[h>>2]=l,LE()|0,hM(10656,k,L,S,D,h),m=s}function hM(e,n,r,u,l,s){e=e|0,n=n|0,r=r|0,u=u|0,l=l|0,s=s|0;var h=0;h=pn(24)|0,yd(h+4|0,t[n>>2]|0,t[r>>2]|0,t[u>>2]|0,t[l>>2]|0,t[s>>2]|0),t[h>>2]=t[e>>2],t[e>>2]=h}function r8(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0,be=0,Se=0,ge=0,Ze=0,Ge=0,ct=0;if(ct=m,m=m+32|0,Se=ct+20|0,ge=ct+8|0,Ze=ct+4|0,Ge=ct,n=t[n>>2]|0,n|0){be=Se+4|0,S=Se+8|0,L=ge+4|0,k=ge+8|0,I=ge+8|0,K=Se+8|0;do{if(h=n+4|0,D=NE(h)|0,D|0){if(l=Rg(D)|0,t[Se>>2]=0,t[be>>2]=0,t[S>>2]=0,u=(Og(D)|0)+1|0,vM(Se,u),u|0)for(;u=u+-1|0,Yf(ge,t[l>>2]|0),s=t[be>>2]|0,s>>>0<(t[K>>2]|0)>>>0?(t[s>>2]=t[ge>>2],t[be>>2]=(t[be>>2]|0)+4):FE(Se,ge),u;)l=l+4|0;u=Mg(D)|0,t[ge>>2]=0,t[L>>2]=0,t[k>>2]=0;e:do if(t[u>>2]|0)for(l=0,s=0;;){if((l|0)==(s|0)?mM(ge,u):(t[l>>2]=t[u>>2],t[L>>2]=(t[L>>2]|0)+4),u=u+4|0,!(t[u>>2]|0))break e;l=t[L>>2]|0,s=t[I>>2]|0}while(0);t[Ze>>2]=E_(h)|0,t[Ge>>2]=sr(D)|0,gM(r,e,Ze,Ge,Se,ge),PE(ge),F1(Se)}n=t[n>>2]|0}while((n|0)!=0)}m=ct}function NE(e){return e=e|0,t[e+12>>2]|0}function Rg(e){return e=e|0,t[e+12>>2]|0}function Og(e){return e=e|0,t[e+16>>2]|0}function vM(e,n){e=e|0,n=n|0;var r=0,u=0,l=0;l=m,m=m+32|0,r=l,u=t[e>>2]|0,(t[e+8>>2]|0)-u>>2>>>0<n>>>0&&(c8(r,n,(t[e+4>>2]|0)-u>>2,e+8|0),d8(e,r),p8(r)),m=l}function FE(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0;if(h=m,m=m+32|0,r=h,u=e+4|0,l=((t[u>>2]|0)-(t[e>>2]|0)>>2)+1|0,s=f8(e)|0,s>>>0<l>>>0)hi(e);else{D=t[e>>2]|0,L=(t[e+8>>2]|0)-D|0,S=L>>1,c8(r,L>>2>>>0<s>>>1>>>0?S>>>0<l>>>0?l:S:s,(t[u>>2]|0)-D>>2,e+8|0),s=r+8|0,t[t[s>>2]>>2]=t[n>>2],t[s>>2]=(t[s>>2]|0)+4,d8(e,r),p8(r),m=h;return}}function Mg(e){return e=e|0,t[e+8>>2]|0}function mM(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0;if(h=m,m=m+32|0,r=h,u=e+4|0,l=((t[u>>2]|0)-(t[e>>2]|0)>>2)+1|0,s=a8(e)|0,s>>>0<l>>>0)hi(e);else{D=t[e>>2]|0,L=(t[e+8>>2]|0)-D|0,S=L>>1,IM(r,L>>2>>>0<s>>>1>>>0?S>>>0<l>>>0?l:S:s,(t[u>>2]|0)-D>>2,e+8|0),s=r+8|0,t[t[s>>2]>>2]=t[n>>2],t[s>>2]=(t[s>>2]|0)+4,bM(e,r),BM(r),m=h;return}}function E_(e){return e=e|0,t[e>>2]|0}function gM(e,n,r,u,l,s){e=e|0,n=n|0,r=r|0,u=u|0,l=l|0,s=s|0,yM(e,n,r,u,l,s)}function PE(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-4-u|0)>>>2)<<2)),yt(r))}function F1(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-4-u|0)>>>2)<<2)),yt(r))}function yM(e,n,r,u,l,s){e=e|0,n=n|0,r=r|0,u=u|0,l=l|0,s=s|0;var h=0,D=0,S=0,L=0,k=0,I=0;h=m,m=m+48|0,k=h+40|0,D=h+32|0,I=h+24|0,S=h+12|0,L=h,ka(D),e=yo(e)|0,t[I>>2]=t[n>>2],r=t[r>>2]|0,u=t[u>>2]|0,IE(S,l),_M(L,s),t[k>>2]=t[I>>2],EM(e,k,r,u,S,L),PE(L),F1(S),La(D),m=h}function IE(e,n){e=e|0,n=n|0;var r=0,u=0;t[e>>2]=0,t[e+4>>2]=0,t[e+8>>2]=0,r=n+4|0,u=(t[r>>2]|0)-(t[n>>2]|0)>>2,u|0&&(FM(e,u),PM(e,t[n>>2]|0,t[r>>2]|0,u))}function _M(e,n){e=e|0,n=n|0;var r=0,u=0;t[e>>2]=0,t[e+4>>2]=0,t[e+8>>2]=0,r=n+4|0,u=(t[r>>2]|0)-(t[n>>2]|0)>>2,u|0&&(LM(e,u),NM(e,t[n>>2]|0,t[r>>2]|0,u))}function EM(e,n,r,u,l,s){e=e|0,n=n|0,r=r|0,u=u|0,l=l|0,s=s|0;var h=0,D=0,S=0,L=0,k=0,I=0;h=m,m=m+32|0,k=h+28|0,I=h+24|0,D=h+12|0,S=h,L=_o(DM()|0)|0,t[I>>2]=t[n>>2],t[k>>2]=t[I>>2],n=Kp(k)|0,r=i8(r)|0,u=bE(u)|0,t[D>>2]=t[l>>2],k=l+4|0,t[D+4>>2]=t[k>>2],I=l+8|0,t[D+8>>2]=t[I>>2],t[I>>2]=0,t[k>>2]=0,t[l>>2]=0,l=BE(D)|0,t[S>>2]=t[s>>2],k=s+4|0,t[S+4>>2]=t[k>>2],I=s+8|0,t[S+8>>2]=t[I>>2],t[I>>2]=0,t[k>>2]=0,t[s>>2]=0,X0(0,L|0,e|0,n|0,r|0,u|0,l|0,wM(S)|0)|0,PE(S),F1(D),m=h}function DM(){var e=0;return c[7968]|0||(MM(10708),e=7968,t[e>>2]=1,t[e+4>>2]=0),10708}function Kp(e){return e=e|0,o8(e)|0}function i8(e){return e=e|0,u8(e)|0}function bE(e){return e=e|0,H0(e)|0}function BE(e){return e=e|0,TM(e)|0}function wM(e){return e=e|0,SM(e)|0}function SM(e){e=e|0;var n=0,r=0,u=0;if(u=(t[e+4>>2]|0)-(t[e>>2]|0)|0,r=u>>2,u=Ma(u+4|0)|0,t[u>>2]=r,r|0){n=0;do t[u+4+(n<<2)>>2]=u8(t[(t[e>>2]|0)+(n<<2)>>2]|0)|0,n=n+1|0;while((n|0)!=(r|0))}return u|0}function u8(e){return e=e|0,e|0}function TM(e){e=e|0;var n=0,r=0,u=0;if(u=(t[e+4>>2]|0)-(t[e>>2]|0)|0,r=u>>2,u=Ma(u+4|0)|0,t[u>>2]=r,r|0){n=0;do t[u+4+(n<<2)>>2]=o8((t[e>>2]|0)+(n<<2)|0)|0,n=n+1|0;while((n|0)!=(r|0))}return u|0}function o8(e){e=e|0;var n=0,r=0,u=0,l=0;return l=m,m=m+32|0,n=l+12|0,r=l,u=Iu(l8()|0)|0,u?(is(n,u),kf(r,n),lF(e,r),e=xs(n)|0):e=CM(e)|0,m=l,e|0}function l8(){var e=0;return c[7960]|0||(OM(10664),Wt(25,10664,se|0)|0,e=7960,t[e>>2]=1,t[e+4>>2]=0),10664}function CM(e){e=e|0;var n=0,r=0,u=0,l=0,s=0,h=0,D=0;return r=m,m=m+16|0,l=r+4|0,h=r,u=Ma(8)|0,n=u,D=pn(4)|0,t[D>>2]=t[e>>2],s=n+4|0,t[s>>2]=D,e=pn(8)|0,s=t[s>>2]|0,t[h>>2]=0,t[l>>2]=t[h>>2],s8(e,s,l),t[u>>2]=e,m=r,n|0}function s8(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,r=pn(16)|0,t[r+4>>2]=0,t[r+8>>2]=0,t[r>>2]=1656,t[r+12>>2]=n,t[e+4>>2]=r}function xM(e){e=e|0,Uv(e),yt(e)}function AM(e){e=e|0,e=t[e+12>>2]|0,e|0&&yt(e)}function RM(e){e=e|0,yt(e)}function OM(e){e=e|0,Qa(e)}function MM(e){e=e|0,ll(e,kM()|0,5)}function kM(){return 1676}function LM(e,n){e=e|0,n=n|0;var r=0;if((a8(e)|0)>>>0<n>>>0&&hi(e),n>>>0>1073741823)$n();else{r=pn(n<<2)|0,t[e+4>>2]=r,t[e>>2]=r,t[e+8>>2]=r+(n<<2);return}}function NM(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0,u=e+4|0,e=r-n|0,(e|0)>0&&(_r(t[u>>2]|0,n|0,e|0)|0,t[u>>2]=(t[u>>2]|0)+(e>>>2<<2))}function a8(e){return e=e|0,1073741823}function FM(e,n){e=e|0,n=n|0;var r=0;if((f8(e)|0)>>>0<n>>>0&&hi(e),n>>>0>1073741823)$n();else{r=pn(n<<2)|0,t[e+4>>2]=r,t[e>>2]=r,t[e+8>>2]=r+(n<<2);return}}function PM(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0,u=e+4|0,e=r-n|0,(e|0)>0&&(_r(t[u>>2]|0,n|0,e|0)|0,t[u>>2]=(t[u>>2]|0)+(e>>>2<<2))}function f8(e){return e=e|0,1073741823}function IM(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>1073741823)$n();else{l=pn(n<<2)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r<<2)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n<<2)}function bM(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(0-(l>>2)<<2)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function BM(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~((u+-4-n|0)>>>2)<<2)),e=t[e>>2]|0,e|0&&yt(e)}function c8(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>1073741823)$n();else{l=pn(n<<2)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r<<2)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n<<2)}function d8(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(0-(l>>2)<<2)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function p8(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~((u+-4-n|0)>>>2)<<2)),e=t[e>>2]|0,e|0&&yt(e)}function UM(e,n,r,u,l){e=e|0,n=n|0,r=r|0,u=u|0,l=l|0;var s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0,be=0,Se=0,ge=0;if(ge=m,m=m+32|0,k=ge+20|0,I=ge+12|0,L=ge+16|0,K=ge+4|0,be=ge,Se=ge+8|0,D=t8()|0,s=t[D>>2]|0,h=t[s>>2]|0,h|0)for(S=t[D+8>>2]|0,D=t[D+4>>2]|0;Yf(k,h),jM(e,k,D,S),s=s+4|0,h=t[s>>2]|0,h;)S=S+1|0,D=D+1|0;if(s=n8()|0,h=t[s>>2]|0,h|0)do Yf(k,h),t[I>>2]=t[s+4>>2],zM(n,k,I),s=s+8|0,h=t[s>>2]|0;while((h|0)!=0);if(s=t[(Fv()|0)>>2]|0,s|0)do n=t[s+4>>2]|0,Yf(k,t[(Pv(n)|0)>>2]|0),t[I>>2]=kE(n)|0,HM(r,k,I),s=t[s>>2]|0;while((s|0)!=0);if(Yf(L,0),s=LE()|0,t[k>>2]=t[L>>2],r8(k,s,l),s=t[(Fv()|0)>>2]|0,s|0){e=k+4|0,n=k+8|0,r=k+8|0;do{if(S=t[s+4>>2]|0,Yf(I,t[(Pv(S)|0)>>2]|0),qM(K,h8(S)|0),h=t[K>>2]|0,h|0){t[k>>2]=0,t[e>>2]=0,t[n>>2]=0;do Yf(be,t[(Pv(t[h+4>>2]|0)|0)>>2]|0),D=t[e>>2]|0,D>>>0<(t[r>>2]|0)>>>0?(t[D>>2]=t[be>>2],t[e>>2]=(t[e>>2]|0)+4):FE(k,be),h=t[h>>2]|0;while((h|0)!=0);WM(u,I,k),F1(k)}t[Se>>2]=t[I>>2],L=v8(S)|0,t[k>>2]=t[Se>>2],r8(k,L,l),Ed(K),s=t[s>>2]|0}while((s|0)!=0)}m=ge}function jM(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0,nk(e,n,r,u)}function zM(e,n,r){e=e|0,n=n|0,r=r|0,tk(e,n,r)}function Pv(e){return e=e|0,e|0}function HM(e,n,r){e=e|0,n=n|0,r=r|0,JM(e,n,r)}function h8(e){return e=e|0,e+16|0}function qM(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0;if(s=m,m=m+16|0,l=s+8|0,r=s,t[e>>2]=0,u=t[n>>2]|0,t[l>>2]=u,t[r>>2]=e,r=QM(r)|0,u|0){if(u=pn(12)|0,h=(m8(l)|0)+4|0,e=t[h+4>>2]|0,n=u+4|0,t[n>>2]=t[h>>2],t[n+4>>2]=e,n=t[t[l>>2]>>2]|0,t[l>>2]=n,!n)e=u;else for(n=u;e=pn(12)|0,S=(m8(l)|0)+4|0,D=t[S+4>>2]|0,h=e+4|0,t[h>>2]=t[S>>2],t[h+4>>2]=D,t[n>>2]=e,h=t[t[l>>2]>>2]|0,t[l>>2]=h,h;)n=e;t[e>>2]=t[r>>2],t[r>>2]=u}m=s}function WM(e,n,r){e=e|0,n=n|0,r=r|0,VM(e,n,r)}function v8(e){return e=e|0,e+24|0}function VM(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+32|0,h=u+24|0,l=u+16|0,D=u+12|0,s=u,ka(l),e=yo(e)|0,t[D>>2]=t[n>>2],IE(s,r),t[h>>2]=t[D>>2],GM(e,h,s),F1(s),La(l),m=u}function GM(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;u=m,m=m+32|0,h=u+16|0,D=u+12|0,l=u,s=_o(YM()|0)|0,t[D>>2]=t[n>>2],t[h>>2]=t[D>>2],n=Kp(h)|0,t[l>>2]=t[r>>2],h=r+4|0,t[l+4>>2]=t[h>>2],D=r+8|0,t[l+8>>2]=t[D>>2],t[D>>2]=0,t[h>>2]=0,t[r>>2]=0,P0(0,s|0,e|0,n|0,BE(l)|0)|0,F1(l),m=u}function YM(){var e=0;return c[7976]|0||(KM(10720),e=7976,t[e>>2]=1,t[e+4>>2]=0),10720}function KM(e){e=e|0,ll(e,XM()|0,2)}function XM(){return 1732}function QM(e){return e=e|0,t[e>>2]|0}function m8(e){return e=e|0,t[e>>2]|0}function JM(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;u=m,m=m+32|0,s=u+16|0,l=u+8|0,h=u,ka(l),e=yo(e)|0,t[h>>2]=t[n>>2],r=t[r>>2]|0,t[s>>2]=t[h>>2],g8(e,s,r),La(l),m=u}function g8(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;u=m,m=m+16|0,s=u+4|0,h=u,l=_o(ZM()|0)|0,t[h>>2]=t[n>>2],t[s>>2]=t[h>>2],n=Kp(s)|0,P0(0,l|0,e|0,n|0,i8(r)|0)|0,m=u}function ZM(){var e=0;return c[7984]|0||($M(10732),e=7984,t[e>>2]=1,t[e+4>>2]=0),10732}function $M(e){e=e|0,ll(e,ek()|0,2)}function ek(){return 1744}function tk(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;u=m,m=m+32|0,s=u+16|0,l=u+8|0,h=u,ka(l),e=yo(e)|0,t[h>>2]=t[n>>2],r=t[r>>2]|0,t[s>>2]=t[h>>2],g8(e,s,r),La(l),m=u}function nk(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0;l=m,m=m+32|0,h=l+16|0,s=l+8|0,D=l,ka(s),e=yo(e)|0,t[D>>2]=t[n>>2],r=c[r>>0]|0,u=c[u>>0]|0,t[h>>2]=t[D>>2],rk(e,h,r,u),La(s),m=l}function rk(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0;l=m,m=m+16|0,h=l+4|0,D=l,s=_o(ik()|0)|0,t[D>>2]=t[n>>2],t[h>>2]=t[D>>2],n=Kp(h)|0,r=Iv(r)|0,Hn(0,s|0,e|0,n|0,r|0,Iv(u)|0)|0,m=l}function ik(){var e=0;return c[7992]|0||(ok(10744),e=7992,t[e>>2]=1,t[e+4>>2]=0),10744}function Iv(e){return e=e|0,uk(e)|0}function uk(e){return e=e|0,e&255|0}function ok(e){e=e|0,ll(e,lk()|0,3)}function lk(){return 1756}function sk(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0;switch(K=m,m=m+32|0,D=K+8|0,S=K+4|0,L=K+20|0,k=K,Ta(e,0),u=oF(n)|0,t[D>>2]=0,I=D+4|0,t[I>>2]=0,t[D+8>>2]=0,u<<24>>24){case 0:{c[L>>0]=0,ak(S,r,L),D_(e,S)|0,U0(S);break}case 8:{I=WE(n)|0,c[L>>0]=8,Yf(k,t[I+4>>2]|0),fk(S,r,L,k,I+8|0),D_(e,S)|0,U0(S);break}case 9:{if(s=WE(n)|0,n=t[s+4>>2]|0,n|0)for(h=D+8|0,l=s+12|0;n=n+-1|0,Yf(S,t[l>>2]|0),u=t[I>>2]|0,u>>>0<(t[h>>2]|0)>>>0?(t[u>>2]=t[S>>2],t[I>>2]=(t[I>>2]|0)+4):FE(D,S),n;)l=l+4|0;c[L>>0]=9,Yf(k,t[s+8>>2]|0),ck(S,r,L,k,D),D_(e,S)|0,U0(S);break}default:I=WE(n)|0,c[L>>0]=u,Yf(k,t[I+4>>2]|0),dk(S,r,L,k),D_(e,S)|0,U0(S)}F1(D),m=K}function ak(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0;u=m,m=m+16|0,l=u,ka(l),n=yo(n)|0,Ck(e,n,c[r>>0]|0),La(l),m=u}function D_(e,n){e=e|0,n=n|0;var r=0;return r=t[e>>2]|0,r|0&&qr(r|0),t[e>>2]=t[n>>2],t[n>>2]=0,e|0}function fk(e,n,r,u,l){e=e|0,n=n|0,r=r|0,u=u|0,l=l|0;var s=0,h=0,D=0,S=0;s=m,m=m+32|0,D=s+16|0,h=s+8|0,S=s,ka(h),n=yo(n)|0,r=c[r>>0]|0,t[S>>2]=t[u>>2],l=t[l>>2]|0,t[D>>2]=t[S>>2],Dk(e,n,r,D,l),La(h),m=s}function ck(e,n,r,u,l){e=e|0,n=n|0,r=r|0,u=u|0,l=l|0;var s=0,h=0,D=0,S=0,L=0;s=m,m=m+32|0,S=s+24|0,h=s+16|0,L=s+12|0,D=s,ka(h),n=yo(n)|0,r=c[r>>0]|0,t[L>>2]=t[u>>2],IE(D,l),t[S>>2]=t[L>>2],gk(e,n,r,S,D),F1(D),La(h),m=s}function dk(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0;l=m,m=m+32|0,h=l+16|0,s=l+8|0,D=l,ka(s),n=yo(n)|0,r=c[r>>0]|0,t[D>>2]=t[u>>2],t[h>>2]=t[D>>2],pk(e,n,r,h),La(s),m=l}function pk(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0,h=0,D=0;l=m,m=m+16|0,s=l+4|0,D=l,h=_o(hk()|0)|0,r=Iv(r)|0,t[D>>2]=t[u>>2],t[s>>2]=t[D>>2],w_(e,P0(0,h|0,n|0,r|0,Kp(s)|0)|0),m=l}function hk(){var e=0;return c[8e3]|0||(vk(10756),e=8e3,t[e>>2]=1,t[e+4>>2]=0),10756}function w_(e,n){e=e|0,n=n|0,Ta(e,n)}function vk(e){e=e|0,ll(e,mk()|0,2)}function mk(){return 1772}function gk(e,n,r,u,l){e=e|0,n=n|0,r=r|0,u=u|0,l=l|0;var s=0,h=0,D=0,S=0,L=0;s=m,m=m+32|0,S=s+16|0,L=s+12|0,h=s,D=_o(yk()|0)|0,r=Iv(r)|0,t[L>>2]=t[u>>2],t[S>>2]=t[L>>2],u=Kp(S)|0,t[h>>2]=t[l>>2],S=l+4|0,t[h+4>>2]=t[S>>2],L=l+8|0,t[h+8>>2]=t[L>>2],t[L>>2]=0,t[S>>2]=0,t[l>>2]=0,w_(e,Hn(0,D|0,n|0,r|0,u|0,BE(h)|0)|0),F1(h),m=s}function yk(){var e=0;return c[8008]|0||(_k(10768),e=8008,t[e>>2]=1,t[e+4>>2]=0),10768}function _k(e){e=e|0,ll(e,Ek()|0,3)}function Ek(){return 1784}function Dk(e,n,r,u,l){e=e|0,n=n|0,r=r|0,u=u|0,l=l|0;var s=0,h=0,D=0,S=0;s=m,m=m+16|0,D=s+4|0,S=s,h=_o(wk()|0)|0,r=Iv(r)|0,t[S>>2]=t[u>>2],t[D>>2]=t[S>>2],u=Kp(D)|0,w_(e,Hn(0,h|0,n|0,r|0,u|0,bE(l)|0)|0),m=s}function wk(){var e=0;return c[8016]|0||(Sk(10780),e=8016,t[e>>2]=1,t[e+4>>2]=0),10780}function Sk(e){e=e|0,ll(e,Tk()|0,3)}function Tk(){return 1800}function Ck(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;u=_o(xk()|0)|0,w_(e,Ki(0,u|0,n|0,Iv(r)|0)|0)}function xk(){var e=0;return c[8024]|0||(Ak(10792),e=8024,t[e>>2]=1,t[e+4>>2]=0),10792}function Ak(e){e=e|0,ll(e,Rk()|0,1)}function Rk(){return 1816}function Ok(){Mk(),kk(),Lk()}function Mk(){t[2702]=V8(65536)|0}function kk(){Zk(10856)}function Lk(){Nk(10816)}function Nk(e){e=e|0,Fk(e,5044),Pk(e)|0}function Fk(e,n){e=e|0,n=n|0;var r=0;r=l8()|0,t[e>>2]=r,Gk(r,n),e2(t[e>>2]|0)}function Pk(e){e=e|0;var n=0;return n=t[e>>2]|0,Gp(n,Ik()|0),e|0}function Ik(){var e=0;return c[8032]|0||(y8(10820),Wt(64,10820,se|0)|0,e=8032,t[e>>2]=1,t[e+4>>2]=0),sr(10820)|0||y8(10820),10820}function y8(e){e=e|0,Uk(e),Yp(e,25)}function bk(e){e=e|0,Bk(e+24|0)}function Bk(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-u|0)>>>3)<<3)),yt(r))}function Uk(e){e=e|0;var n=0;n=yr()|0,jn(e,5,18,n,qk()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function jk(e,n){e=e|0,n=n|0,zk(e,n)}function zk(e,n){e=e|0,n=n|0;var r=0,u=0,l=0;r=m,m=m+16|0,u=r,l=r+4|0,If(l,n),t[u>>2]=bf(l,n)|0,Hk(e,u),m=r}function Hk(e,n){e=e|0,n=n|0,_8(e+4|0,t[n>>2]|0),c[e+8>>0]=1}function _8(e,n){e=e|0,n=n|0,t[e>>2]=n}function qk(){return 1824}function Wk(e){return e=e|0,Vk(e)|0}function Vk(e){e=e|0;var n=0,r=0,u=0,l=0,s=0,h=0,D=0;return r=m,m=m+16|0,l=r+4|0,h=r,u=Ma(8)|0,n=u,D=pn(4)|0,If(l,e),_8(D,bf(l,e)|0),s=n+4|0,t[s>>2]=D,e=pn(8)|0,s=t[s>>2]|0,t[h>>2]=0,t[l>>2]=t[h>>2],s8(e,s,l),t[u>>2]=e,m=r,n|0}function Ma(e){e=e|0;var n=0,r=0;return e=e+7&-8,(e>>>0<=32768?(n=t[2701]|0,e>>>0<=(65536-n|0)>>>0):0)?(r=(t[2702]|0)+n|0,t[2701]=n+e,e=r):(e=V8(e+8|0)|0,t[e>>2]=t[2703],t[2703]=e,e=e+8|0),e|0}function Gk(e,n){e=e|0,n=n|0,t[e>>2]=Yk()|0,t[e+4>>2]=Kk()|0,t[e+12>>2]=n,t[e+8>>2]=Xk()|0,t[e+32>>2]=9}function Yk(){return 11744}function Kk(){return 1832}function Xk(){return __()|0}function Qk(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0,(Hl(u,896)|0)==512?r|0&&(Jk(r),yt(r)):n|0&&yt(n)}function Jk(e){e=e|0,e=t[e+4>>2]|0,e|0&&t2(e)}function Zk(e){e=e|0,$k(e,5052),eL(e)|0,tL(e,5058,26)|0,nL(e,5069,1)|0,rL(e,5077,10)|0,iL(e,5087,19)|0,uL(e,5094,27)|0}function $k(e,n){e=e|0,n=n|0;var r=0;r=ZN()|0,t[e>>2]=r,$N(r,n),e2(t[e>>2]|0)}function eL(e){e=e|0;var n=0;return n=t[e>>2]|0,Gp(n,BN()|0),e|0}function tL(e,n,r){return e=e|0,n=n|0,r=r|0,EN(e,Fr(n)|0,r,0),e|0}function nL(e,n,r){return e=e|0,n=n|0,r=r|0,uN(e,Fr(n)|0,r,0),e|0}function rL(e,n,r){return e=e|0,n=n|0,r=r|0,IL(e,Fr(n)|0,r,0),e|0}function iL(e,n,r){return e=e|0,n=n|0,r=r|0,DL(e,Fr(n)|0,r,0),e|0}function E8(e,n){e=e|0,n=n|0;var r=0,u=0;e:for(;;){for(r=t[2703]|0;;){if((r|0)==(n|0))break e;if(u=t[r>>2]|0,t[2703]=u,!r)r=u;else break}yt(r)}t[2701]=e}function uL(e,n,r){return e=e|0,n=n|0,r=r|0,oL(e,Fr(n)|0,r,0),e|0}function oL(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0;s=t[e>>2]|0,l=UE()|0,e=lL(r)|0,wi(s,n,l,e,sL(r,u)|0,u)}function UE(){var e=0,n=0;if(c[8040]|0||(w8(10860),Wt(65,10860,se|0)|0,n=8040,t[n>>2]=1,t[n+4>>2]=0),!(sr(10860)|0)){e=10860,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));w8(10860)}return 10860}function lL(e){return e=e|0,e|0}function sL(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0;return D=m,m=m+16|0,l=D,s=D+4|0,t[l>>2]=e,S=UE()|0,h=S+24|0,n=hn(n,4)|0,t[s>>2]=n,r=S+28|0,u=t[r>>2]|0,u>>>0<(t[S+32>>2]|0)>>>0?(D8(u,e,n),n=(t[r>>2]|0)+8|0,t[r>>2]=n):(aL(h,l,s),n=t[r>>2]|0),m=D,(n-(t[h>>2]|0)>>3)+-1|0}function D8(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,t[e+4>>2]=r}function aL(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0;if(D=m,m=m+32|0,l=D,s=e+4|0,h=((t[s>>2]|0)-(t[e>>2]|0)>>3)+1|0,u=fL(e)|0,u>>>0<h>>>0)hi(e);else{S=t[e>>2]|0,k=(t[e+8>>2]|0)-S|0,L=k>>2,cL(l,k>>3>>>0<u>>>1>>>0?L>>>0<h>>>0?h:L:u,(t[s>>2]|0)-S>>3,e+8|0),h=l+8|0,D8(t[h>>2]|0,t[n>>2]|0,t[r>>2]|0),t[h>>2]=(t[h>>2]|0)+8,dL(e,l),pL(l),m=D;return}}function fL(e){return e=e|0,536870911}function cL(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>536870911)$n();else{l=pn(n<<3)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r<<3)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n<<3)}function dL(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(0-(l>>3)<<3)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function pL(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~((u+-8-n|0)>>>3)<<3)),e=t[e>>2]|0,e|0&&yt(e)}function w8(e){e=e|0,mL(e)}function hL(e){e=e|0,vL(e+24|0)}function vL(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-u|0)>>>3)<<3)),yt(r))}function mL(e){e=e|0;var n=0;n=yr()|0,jn(e,1,11,n,gL()|0,2),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function gL(){return 1840}function yL(e,n,r){e=e|0,n=n|0,r=r|0,EL(t[(_L(e)|0)>>2]|0,n,r)}function _L(e){return e=e|0,(t[(UE()|0)+24>>2]|0)+(e<<3)|0}function EL(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0;u=m,m=m+16|0,s=u+1|0,l=u,If(s,n),n=bf(s,n)|0,If(l,r),r=bf(l,r)|0,I1[e&31](n,r),m=u}function DL(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0;s=t[e>>2]|0,l=jE()|0,e=wL(r)|0,wi(s,n,l,e,SL(r,u)|0,u)}function jE(){var e=0,n=0;if(c[8048]|0||(T8(10896),Wt(66,10896,se|0)|0,n=8048,t[n>>2]=1,t[n+4>>2]=0),!(sr(10896)|0)){e=10896,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));T8(10896)}return 10896}function wL(e){return e=e|0,e|0}function SL(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0;return D=m,m=m+16|0,l=D,s=D+4|0,t[l>>2]=e,S=jE()|0,h=S+24|0,n=hn(n,4)|0,t[s>>2]=n,r=S+28|0,u=t[r>>2]|0,u>>>0<(t[S+32>>2]|0)>>>0?(S8(u,e,n),n=(t[r>>2]|0)+8|0,t[r>>2]=n):(TL(h,l,s),n=t[r>>2]|0),m=D,(n-(t[h>>2]|0)>>3)+-1|0}function S8(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,t[e+4>>2]=r}function TL(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0;if(D=m,m=m+32|0,l=D,s=e+4|0,h=((t[s>>2]|0)-(t[e>>2]|0)>>3)+1|0,u=CL(e)|0,u>>>0<h>>>0)hi(e);else{S=t[e>>2]|0,k=(t[e+8>>2]|0)-S|0,L=k>>2,xL(l,k>>3>>>0<u>>>1>>>0?L>>>0<h>>>0?h:L:u,(t[s>>2]|0)-S>>3,e+8|0),h=l+8|0,S8(t[h>>2]|0,t[n>>2]|0,t[r>>2]|0),t[h>>2]=(t[h>>2]|0)+8,AL(e,l),RL(l),m=D;return}}function CL(e){return e=e|0,536870911}function xL(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>536870911)$n();else{l=pn(n<<3)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r<<3)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n<<3)}function AL(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(0-(l>>3)<<3)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function RL(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~((u+-8-n|0)>>>3)<<3)),e=t[e>>2]|0,e|0&&yt(e)}function T8(e){e=e|0,kL(e)}function OL(e){e=e|0,ML(e+24|0)}function ML(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-u|0)>>>3)<<3)),yt(r))}function kL(e){e=e|0;var n=0;n=yr()|0,jn(e,1,11,n,LL()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function LL(){return 1852}function NL(e,n){return e=e|0,n=n|0,PL(t[(FL(e)|0)>>2]|0,n)|0}function FL(e){return e=e|0,(t[(jE()|0)+24>>2]|0)+(e<<3)|0}function PL(e,n){e=e|0,n=n|0;var r=0,u=0;return r=m,m=m+16|0,u=r,If(u,n),n=bf(u,n)|0,n=H0(Zp[e&31](n)|0)|0,m=r,n|0}function IL(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0;s=t[e>>2]|0,l=zE()|0,e=bL(r)|0,wi(s,n,l,e,BL(r,u)|0,u)}function zE(){var e=0,n=0;if(c[8056]|0||(x8(10932),Wt(67,10932,se|0)|0,n=8056,t[n>>2]=1,t[n+4>>2]=0),!(sr(10932)|0)){e=10932,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));x8(10932)}return 10932}function bL(e){return e=e|0,e|0}function BL(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0;return D=m,m=m+16|0,l=D,s=D+4|0,t[l>>2]=e,S=zE()|0,h=S+24|0,n=hn(n,4)|0,t[s>>2]=n,r=S+28|0,u=t[r>>2]|0,u>>>0<(t[S+32>>2]|0)>>>0?(C8(u,e,n),n=(t[r>>2]|0)+8|0,t[r>>2]=n):(UL(h,l,s),n=t[r>>2]|0),m=D,(n-(t[h>>2]|0)>>3)+-1|0}function C8(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,t[e+4>>2]=r}function UL(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0;if(D=m,m=m+32|0,l=D,s=e+4|0,h=((t[s>>2]|0)-(t[e>>2]|0)>>3)+1|0,u=jL(e)|0,u>>>0<h>>>0)hi(e);else{S=t[e>>2]|0,k=(t[e+8>>2]|0)-S|0,L=k>>2,zL(l,k>>3>>>0<u>>>1>>>0?L>>>0<h>>>0?h:L:u,(t[s>>2]|0)-S>>3,e+8|0),h=l+8|0,C8(t[h>>2]|0,t[n>>2]|0,t[r>>2]|0),t[h>>2]=(t[h>>2]|0)+8,HL(e,l),qL(l),m=D;return}}function jL(e){return e=e|0,536870911}function zL(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>536870911)$n();else{l=pn(n<<3)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r<<3)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n<<3)}function HL(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(0-(l>>3)<<3)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function qL(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~((u+-8-n|0)>>>3)<<3)),e=t[e>>2]|0,e|0&&yt(e)}function x8(e){e=e|0,YL(e)}function WL(e){e=e|0,VL(e+24|0)}function VL(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-u|0)>>>3)<<3)),yt(r))}function YL(e){e=e|0;var n=0;n=yr()|0,jn(e,1,7,n,KL()|0,2),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function KL(){return 1860}function XL(e,n,r){return e=e|0,n=n|0,r=r|0,JL(t[(QL(e)|0)>>2]|0,n,r)|0}function QL(e){return e=e|0,(t[(zE()|0)+24>>2]|0)+(e<<3)|0}function JL(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0;return u=m,m=m+32|0,h=u+12|0,s=u+8|0,D=u,S=u+16|0,l=u+4|0,ZL(S,n),$L(D,S,n),Ks(l,r),r=Xs(l,r)|0,t[h>>2]=t[D>>2],Fg[e&15](s,h,r),r=eN(s)|0,U0(s),Qs(l),m=u,r|0}function ZL(e,n){e=e|0,n=n|0}function $L(e,n,r){e=e|0,n=n|0,r=r|0,tN(e,r)}function eN(e){return e=e|0,yo(e)|0}function tN(e,n){e=e|0,n=n|0;var r=0,u=0,l=0;l=m,m=m+16|0,r=l,u=n,u&1?(nN(r,0),eu(u|0,r|0)|0,rN(e,r),iN(r)):t[e>>2]=t[n>>2],m=l}function nN(e,n){e=e|0,n=n|0,cd(e,n),t[e+4>>2]=0,c[e+8>>0]=0}function rN(e,n){e=e|0,n=n|0,t[e>>2]=t[n+4>>2]}function iN(e){e=e|0,c[e+8>>0]=0}function uN(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0;s=t[e>>2]|0,l=HE()|0,e=oN(r)|0,wi(s,n,l,e,lN(r,u)|0,u)}function HE(){var e=0,n=0;if(c[8064]|0||(R8(10968),Wt(68,10968,se|0)|0,n=8064,t[n>>2]=1,t[n+4>>2]=0),!(sr(10968)|0)){e=10968,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));R8(10968)}return 10968}function oN(e){return e=e|0,e|0}function lN(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0;return D=m,m=m+16|0,l=D,s=D+4|0,t[l>>2]=e,S=HE()|0,h=S+24|0,n=hn(n,4)|0,t[s>>2]=n,r=S+28|0,u=t[r>>2]|0,u>>>0<(t[S+32>>2]|0)>>>0?(A8(u,e,n),n=(t[r>>2]|0)+8|0,t[r>>2]=n):(sN(h,l,s),n=t[r>>2]|0),m=D,(n-(t[h>>2]|0)>>3)+-1|0}function A8(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,t[e+4>>2]=r}function sN(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0;if(D=m,m=m+32|0,l=D,s=e+4|0,h=((t[s>>2]|0)-(t[e>>2]|0)>>3)+1|0,u=aN(e)|0,u>>>0<h>>>0)hi(e);else{S=t[e>>2]|0,k=(t[e+8>>2]|0)-S|0,L=k>>2,fN(l,k>>3>>>0<u>>>1>>>0?L>>>0<h>>>0?h:L:u,(t[s>>2]|0)-S>>3,e+8|0),h=l+8|0,A8(t[h>>2]|0,t[n>>2]|0,t[r>>2]|0),t[h>>2]=(t[h>>2]|0)+8,cN(e,l),dN(l),m=D;return}}function aN(e){return e=e|0,536870911}function fN(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>536870911)$n();else{l=pn(n<<3)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r<<3)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n<<3)}function cN(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(0-(l>>3)<<3)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function dN(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~((u+-8-n|0)>>>3)<<3)),e=t[e>>2]|0,e|0&&yt(e)}function R8(e){e=e|0,vN(e)}function pN(e){e=e|0,hN(e+24|0)}function hN(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-u|0)>>>3)<<3)),yt(r))}function vN(e){e=e|0;var n=0;n=yr()|0,jn(e,1,1,n,mN()|0,5),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function mN(){return 1872}function gN(e,n,r,u,l,s){e=e|0,n=n|0,r=r|0,u=u|0,l=l|0,s=s|0,_N(t[(yN(e)|0)>>2]|0,n,r,u,l,s)}function yN(e){return e=e|0,(t[(HE()|0)+24>>2]|0)+(e<<3)|0}function _N(e,n,r,u,l,s){e=e|0,n=n|0,r=r|0,u=u|0,l=l|0,s=s|0;var h=0,D=0,S=0,L=0,k=0,I=0;h=m,m=m+32|0,D=h+16|0,S=h+12|0,L=h+8|0,k=h+4|0,I=h,Ks(D,n),n=Xs(D,n)|0,Ks(S,r),r=Xs(S,r)|0,Ks(L,u),u=Xs(L,u)|0,Ks(k,l),l=Xs(k,l)|0,Ks(I,s),s=Xs(I,s)|0,Q8[e&1](n,r,u,l,s),Qs(I),Qs(k),Qs(L),Qs(S),Qs(D),m=h}function EN(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0;s=t[e>>2]|0,l=qE()|0,e=DN(r)|0,wi(s,n,l,e,wN(r,u)|0,u)}function qE(){var e=0,n=0;if(c[8072]|0||(M8(11004),Wt(69,11004,se|0)|0,n=8072,t[n>>2]=1,t[n+4>>2]=0),!(sr(11004)|0)){e=11004,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));M8(11004)}return 11004}function DN(e){return e=e|0,e|0}function wN(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0,D=0,S=0;return D=m,m=m+16|0,l=D,s=D+4|0,t[l>>2]=e,S=qE()|0,h=S+24|0,n=hn(n,4)|0,t[s>>2]=n,r=S+28|0,u=t[r>>2]|0,u>>>0<(t[S+32>>2]|0)>>>0?(O8(u,e,n),n=(t[r>>2]|0)+8|0,t[r>>2]=n):(SN(h,l,s),n=t[r>>2]|0),m=D,(n-(t[h>>2]|0)>>3)+-1|0}function O8(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,t[e+4>>2]=r}function SN(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0;if(D=m,m=m+32|0,l=D,s=e+4|0,h=((t[s>>2]|0)-(t[e>>2]|0)>>3)+1|0,u=TN(e)|0,u>>>0<h>>>0)hi(e);else{S=t[e>>2]|0,k=(t[e+8>>2]|0)-S|0,L=k>>2,CN(l,k>>3>>>0<u>>>1>>>0?L>>>0<h>>>0?h:L:u,(t[s>>2]|0)-S>>3,e+8|0),h=l+8|0,O8(t[h>>2]|0,t[n>>2]|0,t[r>>2]|0),t[h>>2]=(t[h>>2]|0)+8,xN(e,l),AN(l),m=D;return}}function TN(e){return e=e|0,536870911}function CN(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0;t[e+12>>2]=0,t[e+16>>2]=u;do if(n)if(n>>>0>536870911)$n();else{l=pn(n<<3)|0;break}else l=0;while(0);t[e>>2]=l,u=l+(r<<3)|0,t[e+8>>2]=u,t[e+4>>2]=u,t[e+12>>2]=l+(n<<3)}function xN(e,n){e=e|0,n=n|0;var r=0,u=0,l=0,s=0,h=0;u=t[e>>2]|0,h=e+4|0,s=n+4|0,l=(t[h>>2]|0)-u|0,r=(t[s>>2]|0)+(0-(l>>3)<<3)|0,t[s>>2]=r,(l|0)>0?(_r(r|0,u|0,l|0)|0,u=s,r=t[s>>2]|0):u=s,s=t[e>>2]|0,t[e>>2]=r,t[u>>2]=s,s=n+8|0,l=t[h>>2]|0,t[h>>2]=t[s>>2],t[s>>2]=l,s=e+8|0,h=n+12|0,e=t[s>>2]|0,t[s>>2]=t[h>>2],t[h>>2]=e,t[n>>2]=t[u>>2]}function AN(e){e=e|0;var n=0,r=0,u=0;n=t[e+4>>2]|0,r=e+8|0,u=t[r>>2]|0,(u|0)!=(n|0)&&(t[r>>2]=u+(~((u+-8-n|0)>>>3)<<3)),e=t[e>>2]|0,e|0&&yt(e)}function M8(e){e=e|0,MN(e)}function RN(e){e=e|0,ON(e+24|0)}function ON(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-u|0)>>>3)<<3)),yt(r))}function MN(e){e=e|0;var n=0;n=yr()|0,jn(e,1,12,n,kN()|0,2),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function kN(){return 1896}function LN(e,n,r){e=e|0,n=n|0,r=r|0,FN(t[(NN(e)|0)>>2]|0,n,r)}function NN(e){return e=e|0,(t[(qE()|0)+24>>2]|0)+(e<<3)|0}function FN(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0;u=m,m=m+16|0,s=u+4|0,l=u,PN(s,n),n=IN(s,n)|0,Ks(l,r),r=Xs(l,r)|0,I1[e&31](n,r),Qs(l),m=u}function PN(e,n){e=e|0,n=n|0}function IN(e,n){return e=e|0,n=n|0,bN(n)|0}function bN(e){return e=e|0,e|0}function BN(){var e=0;return c[8080]|0||(k8(11040),Wt(70,11040,se|0)|0,e=8080,t[e>>2]=1,t[e+4>>2]=0),sr(11040)|0||k8(11040),11040}function k8(e){e=e|0,zN(e),Yp(e,71)}function UN(e){e=e|0,jN(e+24|0)}function jN(e){e=e|0;var n=0,r=0,u=0;r=t[e>>2]|0,u=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-u|0)>>>3)<<3)),yt(r))}function zN(e){e=e|0;var n=0;n=yr()|0,jn(e,5,7,n,VN()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function HN(e){e=e|0,qN(e)}function qN(e){e=e|0,WN(e)}function WN(e){e=e|0,c[e+8>>0]=1}function VN(){return 1936}function GN(){return YN()|0}function YN(){var e=0,n=0,r=0,u=0,l=0,s=0,h=0;return n=m,m=m+16|0,l=n+4|0,h=n,r=Ma(8)|0,e=r,s=e+4|0,t[s>>2]=pn(1)|0,u=pn(8)|0,s=t[s>>2]|0,t[h>>2]=0,t[l>>2]=t[h>>2],KN(u,s,l),t[r>>2]=u,m=n,e|0}function KN(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,r=pn(16)|0,t[r+4>>2]=0,t[r+8>>2]=0,t[r>>2]=1916,t[r+12>>2]=n,t[e+4>>2]=r}function XN(e){e=e|0,Uv(e),yt(e)}function QN(e){e=e|0,e=t[e+12>>2]|0,e|0&&yt(e)}function JN(e){e=e|0,yt(e)}function ZN(){var e=0;return c[8088]|0||(uF(11076),Wt(25,11076,se|0)|0,e=8088,t[e>>2]=1,t[e+4>>2]=0),11076}function $N(e,n){e=e|0,n=n|0,t[e>>2]=eF()|0,t[e+4>>2]=tF()|0,t[e+12>>2]=n,t[e+8>>2]=nF()|0,t[e+32>>2]=10}function eF(){return 11745}function tF(){return 1940}function nF(){return N1()|0}function rF(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0,(Hl(u,896)|0)==512?r|0&&(iF(r),yt(r)):n|0&&yt(n)}function iF(e){e=e|0,e=t[e+4>>2]|0,e|0&&t2(e)}function uF(e){e=e|0,Qa(e)}function Yf(e,n){e=e|0,n=n|0,t[e>>2]=n}function WE(e){return e=e|0,t[e>>2]|0}function oF(e){return e=e|0,c[t[e>>2]>>0]|0}function lF(e,n){e=e|0,n=n|0;var r=0,u=0;r=m,m=m+16|0,u=r,t[u>>2]=t[e>>2],sF(n,u)|0,m=r}function sF(e,n){e=e|0,n=n|0;var r=0;return r=aF(t[e>>2]|0,n)|0,n=e+4|0,t[(t[n>>2]|0)+8>>2]=r,t[(t[n>>2]|0)+8>>2]|0}function aF(e,n){e=e|0,n=n|0;var r=0,u=0;return r=m,m=m+16|0,u=r,ka(u),e=yo(e)|0,n=fF(e,t[n>>2]|0)|0,La(u),m=r,n|0}function ka(e){e=e|0,t[e>>2]=t[2701],t[e+4>>2]=t[2703]}function fF(e,n){e=e|0,n=n|0;var r=0;return r=_o(cF()|0)|0,Ki(0,r|0,e|0,bE(n)|0)|0}function La(e){e=e|0,E8(t[e>>2]|0,t[e+4>>2]|0)}function cF(){var e=0;return c[8096]|0||(dF(11120),e=8096,t[e>>2]=1,t[e+4>>2]=0),11120}function dF(e){e=e|0,ll(e,pF()|0,1)}function pF(){return 1948}function hF(){vF()}function vF(){var e=0,n=0,r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0,be=0,Se=0,ge=0;if(Se=m,m=m+16|0,k=Se+4|0,I=Se,bn(65536,10804,t[2702]|0,10812),r=t8()|0,n=t[r>>2]|0,e=t[n>>2]|0,e|0)for(u=t[r+8>>2]|0,r=t[r+4>>2]|0;Ql(e|0,O[r>>0]|0|0,c[u>>0]|0),n=n+4|0,e=t[n>>2]|0,e;)u=u+1|0,r=r+1|0;if(e=n8()|0,n=t[e>>2]|0,n|0)do ko(n|0,t[e+4>>2]|0),e=e+8|0,n=t[e>>2]|0;while((n|0)!=0);ko(mF()|0,5167),L=Fv()|0,e=t[L>>2]|0;e:do if(e|0){do gF(t[e+4>>2]|0),e=t[e>>2]|0;while((e|0)!=0);if(e=t[L>>2]|0,e|0){S=L;do{for(;l=e,e=t[e>>2]|0,l=t[l+4>>2]|0,!!(yF(l)|0);)if(t[I>>2]=S,t[k>>2]=t[I>>2],_F(L,k)|0,!e)break e;if(EF(l),S=t[S>>2]|0,n=L8(l)|0,s=fo()|0,h=m,m=m+((1*(n<<2)|0)+15&-16)|0,D=m,m=m+((1*(n<<2)|0)+15&-16)|0,n=t[(h8(l)|0)>>2]|0,n|0)for(r=h,u=D;t[r>>2]=t[(Pv(t[n+4>>2]|0)|0)>>2],t[u>>2]=t[n+8>>2],n=t[n>>2]|0,n;)r=r+4|0,u=u+4|0;ge=Pv(l)|0,n=DF(l)|0,r=L8(l)|0,u=wF(l)|0,Lo(ge|0,n|0,h|0,D|0,r|0,u|0,kE(l)|0),yi(s|0)}while((e|0)!=0)}}while(0);if(e=t[(LE()|0)>>2]|0,e|0)do ge=e+4|0,L=NE(ge)|0,l=Mg(L)|0,s=Rg(L)|0,h=(Og(L)|0)+1|0,D=S_(L)|0,S=N8(ge)|0,L=sr(L)|0,k=E_(ge)|0,I=VE(ge)|0,ao(0,l|0,s|0,h|0,D|0,S|0,L|0,k|0,I|0,GE(ge)|0),e=t[e>>2]|0;while((e|0)!=0);e=t[(Fv()|0)>>2]|0;e:do if(e|0){t:for(;;){if(n=t[e+4>>2]|0,n|0?(K=t[(Pv(n)|0)>>2]|0,be=t[(v8(n)|0)>>2]|0,be|0):0){r=be;do{n=r+4|0,u=NE(n)|0;n:do if(u|0)switch(sr(u)|0){case 0:break t;case 4:case 3:case 2:{D=Mg(u)|0,S=Rg(u)|0,L=(Og(u)|0)+1|0,k=S_(u)|0,I=sr(u)|0,ge=E_(n)|0,ao(K|0,D|0,S|0,L|0,k|0,0,I|0,ge|0,VE(n)|0,GE(n)|0);break n}case 1:{h=Mg(u)|0,D=Rg(u)|0,S=(Og(u)|0)+1|0,L=S_(u)|0,k=N8(n)|0,I=sr(u)|0,ge=E_(n)|0,ao(K|0,h|0,D|0,S|0,L|0,k|0,I|0,ge|0,VE(n)|0,GE(n)|0);break n}case 5:{L=Mg(u)|0,k=Rg(u)|0,I=(Og(u)|0)+1|0,ge=S_(u)|0,ao(K|0,L|0,k|0,I|0,ge|0,SF(u)|0,sr(u)|0,0,0,0);break n}default:break n}while(0);r=t[r>>2]|0}while((r|0)!=0)}if(e=t[e>>2]|0,!e)break e}$n()}while(0);bs(),m=Se}function mF(){return 11703}function gF(e){e=e|0,c[e+40>>0]=0}function yF(e){return e=e|0,(c[e+40>>0]|0)!=0|0}function _F(e,n){return e=e|0,n=n|0,n=TF(n)|0,e=t[n>>2]|0,t[n>>2]=t[e>>2],yt(e),t[n>>2]|0}function EF(e){e=e|0,c[e+40>>0]=1}function L8(e){return e=e|0,t[e+20>>2]|0}function DF(e){return e=e|0,t[e+8>>2]|0}function wF(e){return e=e|0,t[e+32>>2]|0}function S_(e){return e=e|0,t[e+4>>2]|0}function N8(e){return e=e|0,t[e+4>>2]|0}function VE(e){return e=e|0,t[e+8>>2]|0}function GE(e){return e=e|0,t[e+16>>2]|0}function SF(e){return e=e|0,t[e+20>>2]|0}function TF(e){return e=e|0,t[e>>2]|0}function T_(e){e=e|0;var n=0,r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0,be=0,Se=0,ge=0,Ze=0,Ge=0,ct=0,Me=0,Pe=0,Zt=0;Zt=m,m=m+16|0,K=Zt;do if(e>>>0<245){if(L=e>>>0<11?16:e+11&-8,e=L>>>3,I=t[2783]|0,r=I>>>e,r&3|0)return n=(r&1^1)+e|0,e=11172+(n<<1<<2)|0,r=e+8|0,u=t[r>>2]|0,l=u+8|0,s=t[l>>2]|0,(e|0)==(s|0)?t[2783]=I&~(1<<n):(t[s+12>>2]=e,t[r>>2]=s),Pe=n<<3,t[u+4>>2]=Pe|3,Pe=u+Pe+4|0,t[Pe>>2]=t[Pe>>2]|1,Pe=l,m=Zt,Pe|0;if(k=t[2785]|0,L>>>0>k>>>0){if(r|0)return n=2<<e,n=r<<e&(n|0-n),n=(n&0-n)+-1|0,h=n>>>12&16,n=n>>>h,r=n>>>5&8,n=n>>>r,l=n>>>2&4,n=n>>>l,e=n>>>1&2,n=n>>>e,u=n>>>1&1,u=(r|h|l|e|u)+(n>>>u)|0,n=11172+(u<<1<<2)|0,e=n+8|0,l=t[e>>2]|0,h=l+8|0,r=t[h>>2]|0,(n|0)==(r|0)?(e=I&~(1<<u),t[2783]=e):(t[r+12>>2]=n,t[e>>2]=r,e=I),s=(u<<3)-L|0,t[l+4>>2]=L|3,u=l+L|0,t[u+4>>2]=s|1,t[u+s>>2]=s,k|0&&(l=t[2788]|0,n=k>>>3,r=11172+(n<<1<<2)|0,n=1<<n,e&n?(e=r+8|0,n=t[e>>2]|0):(t[2783]=e|n,n=r,e=r+8|0),t[e>>2]=l,t[n+12>>2]=l,t[l+8>>2]=n,t[l+12>>2]=r),t[2785]=s,t[2788]=u,Pe=h,m=Zt,Pe|0;if(D=t[2784]|0,D){if(r=(D&0-D)+-1|0,h=r>>>12&16,r=r>>>h,s=r>>>5&8,r=r>>>s,S=r>>>2&4,r=r>>>S,u=r>>>1&2,r=r>>>u,e=r>>>1&1,e=t[11436+((s|h|S|u|e)+(r>>>e)<<2)>>2]|0,r=(t[e+4>>2]&-8)-L|0,u=t[e+16+(((t[e+16>>2]|0)==0&1)<<2)>>2]|0,!u)S=e,s=r;else{do h=(t[u+4>>2]&-8)-L|0,S=h>>>0<r>>>0,r=S?h:r,e=S?u:e,u=t[u+16+(((t[u+16>>2]|0)==0&1)<<2)>>2]|0;while((u|0)!=0);S=e,s=r}if(h=S+L|0,S>>>0<h>>>0){l=t[S+24>>2]|0,n=t[S+12>>2]|0;do if((n|0)==(S|0)){if(e=S+20|0,n=t[e>>2]|0,!n&&(e=S+16|0,n=t[e>>2]|0,!n)){r=0;break}for(;;){if(r=n+20|0,u=t[r>>2]|0,u|0){n=u,e=r;continue}if(r=n+16|0,u=t[r>>2]|0,u)n=u,e=r;else break}t[e>>2]=0,r=n}else r=t[S+8>>2]|0,t[r+12>>2]=n,t[n+8>>2]=r,r=n;while(0);do if(l|0){if(n=t[S+28>>2]|0,e=11436+(n<<2)|0,(S|0)==(t[e>>2]|0)){if(t[e>>2]=r,!r){t[2784]=D&~(1<<n);break}}else if(t[l+16+(((t[l+16>>2]|0)!=(S|0)&1)<<2)>>2]=r,!r)break;t[r+24>>2]=l,n=t[S+16>>2]|0,n|0&&(t[r+16>>2]=n,t[n+24>>2]=r),n=t[S+20>>2]|0,n|0&&(t[r+20>>2]=n,t[n+24>>2]=r)}while(0);return s>>>0<16?(Pe=s+L|0,t[S+4>>2]=Pe|3,Pe=S+Pe+4|0,t[Pe>>2]=t[Pe>>2]|1):(t[S+4>>2]=L|3,t[h+4>>2]=s|1,t[h+s>>2]=s,k|0&&(u=t[2788]|0,n=k>>>3,r=11172+(n<<1<<2)|0,n=1<<n,I&n?(e=r+8|0,n=t[e>>2]|0):(t[2783]=I|n,n=r,e=r+8|0),t[e>>2]=u,t[n+12>>2]=u,t[u+8>>2]=n,t[u+12>>2]=r),t[2785]=s,t[2788]=h),Pe=S+8|0,m=Zt,Pe|0}else I=L}else I=L}else I=L}else if(e>>>0<=4294967231)if(e=e+11|0,L=e&-8,S=t[2784]|0,S){u=0-L|0,e=e>>>8,e?L>>>0>16777215?D=31:(I=(e+1048320|0)>>>16&8,Me=e<<I,k=(Me+520192|0)>>>16&4,Me=Me<<k,D=(Me+245760|0)>>>16&2,D=14-(k|I|D)+(Me<<D>>>15)|0,D=L>>>(D+7|0)&1|D<<1):D=0,r=t[11436+(D<<2)>>2]|0;e:do if(!r)r=0,e=0,Me=57;else for(e=0,h=L<<((D|0)==31?0:25-(D>>>1)|0),s=0;;){if(l=(t[r+4>>2]&-8)-L|0,l>>>0<u>>>0)if(l)e=r,u=l;else{e=r,u=0,l=r,Me=61;break e}if(l=t[r+20>>2]|0,r=t[r+16+(h>>>31<<2)>>2]|0,s=(l|0)==0|(l|0)==(r|0)?s:l,l=(r|0)==0,l){r=s,Me=57;break}else h=h<<((l^1)&1)}while(0);if((Me|0)==57){if((r|0)==0&(e|0)==0){if(e=2<<D,e=S&(e|0-e),!e){I=L;break}I=(e&0-e)+-1|0,h=I>>>12&16,I=I>>>h,s=I>>>5&8,I=I>>>s,D=I>>>2&4,I=I>>>D,k=I>>>1&2,I=I>>>k,r=I>>>1&1,e=0,r=t[11436+((s|h|D|k|r)+(I>>>r)<<2)>>2]|0}r?(l=r,Me=61):(D=e,h=u)}if((Me|0)==61)for(;;)if(Me=0,r=(t[l+4>>2]&-8)-L|0,I=r>>>0<u>>>0,r=I?r:u,e=I?l:e,l=t[l+16+(((t[l+16>>2]|0)==0&1)<<2)>>2]|0,l)u=r,Me=61;else{D=e,h=r;break}if((D|0)!=0?h>>>0<((t[2785]|0)-L|0)>>>0:0){if(s=D+L|0,D>>>0>=s>>>0)return Pe=0,m=Zt,Pe|0;l=t[D+24>>2]|0,n=t[D+12>>2]|0;do if((n|0)==(D|0)){if(e=D+20|0,n=t[e>>2]|0,!n&&(e=D+16|0,n=t[e>>2]|0,!n)){n=0;break}for(;;){if(r=n+20|0,u=t[r>>2]|0,u|0){n=u,e=r;continue}if(r=n+16|0,u=t[r>>2]|0,u)n=u,e=r;else break}t[e>>2]=0}else Pe=t[D+8>>2]|0,t[Pe+12>>2]=n,t[n+8>>2]=Pe;while(0);do if(l){if(e=t[D+28>>2]|0,r=11436+(e<<2)|0,(D|0)==(t[r>>2]|0)){if(t[r>>2]=n,!n){u=S&~(1<<e),t[2784]=u;break}}else if(t[l+16+(((t[l+16>>2]|0)!=(D|0)&1)<<2)>>2]=n,!n){u=S;break}t[n+24>>2]=l,e=t[D+16>>2]|0,e|0&&(t[n+16>>2]=e,t[e+24>>2]=n),e=t[D+20>>2]|0,e&&(t[n+20>>2]=e,t[e+24>>2]=n),u=S}else u=S;while(0);do if(h>>>0>=16){if(t[D+4>>2]=L|3,t[s+4>>2]=h|1,t[s+h>>2]=h,n=h>>>3,h>>>0<256){r=11172+(n<<1<<2)|0,e=t[2783]|0,n=1<<n,e&n?(e=r+8|0,n=t[e>>2]|0):(t[2783]=e|n,n=r,e=r+8|0),t[e>>2]=s,t[n+12>>2]=s,t[s+8>>2]=n,t[s+12>>2]=r;break}if(n=h>>>8,n?h>>>0>16777215?n=31:(Me=(n+1048320|0)>>>16&8,Pe=n<<Me,ct=(Pe+520192|0)>>>16&4,Pe=Pe<<ct,n=(Pe+245760|0)>>>16&2,n=14-(ct|Me|n)+(Pe<<n>>>15)|0,n=h>>>(n+7|0)&1|n<<1):n=0,r=11436+(n<<2)|0,t[s+28>>2]=n,e=s+16|0,t[e+4>>2]=0,t[e>>2]=0,e=1<<n,!(u&e)){t[2784]=u|e,t[r>>2]=s,t[s+24>>2]=r,t[s+12>>2]=s,t[s+8>>2]=s;break}for(e=h<<((n|0)==31?0:25-(n>>>1)|0),r=t[r>>2]|0;;){if((t[r+4>>2]&-8|0)==(h|0)){Me=97;break}if(u=r+16+(e>>>31<<2)|0,n=t[u>>2]|0,n)e=e<<1,r=n;else{Me=96;break}}if((Me|0)==96){t[u>>2]=s,t[s+24>>2]=r,t[s+12>>2]=s,t[s+8>>2]=s;break}else if((Me|0)==97){Me=r+8|0,Pe=t[Me>>2]|0,t[Pe+12>>2]=s,t[Me>>2]=s,t[s+8>>2]=Pe,t[s+12>>2]=r,t[s+24>>2]=0;break}}else Pe=h+L|0,t[D+4>>2]=Pe|3,Pe=D+Pe+4|0,t[Pe>>2]=t[Pe>>2]|1;while(0);return Pe=D+8|0,m=Zt,Pe|0}else I=L}else I=L;else I=-1;while(0);if(r=t[2785]|0,r>>>0>=I>>>0)return n=r-I|0,e=t[2788]|0,n>>>0>15?(Pe=e+I|0,t[2788]=Pe,t[2785]=n,t[Pe+4>>2]=n|1,t[Pe+n>>2]=n,t[e+4>>2]=I|3):(t[2785]=0,t[2788]=0,t[e+4>>2]=r|3,Pe=e+r+4|0,t[Pe>>2]=t[Pe>>2]|1),Pe=e+8|0,m=Zt,Pe|0;if(h=t[2786]|0,h>>>0>I>>>0)return ct=h-I|0,t[2786]=ct,Pe=t[2789]|0,Me=Pe+I|0,t[2789]=Me,t[Me+4>>2]=ct|1,t[Pe+4>>2]=I|3,Pe=Pe+8|0,m=Zt,Pe|0;if(t[2901]|0?e=t[2903]|0:(t[2903]=4096,t[2902]=4096,t[2904]=-1,t[2905]=-1,t[2906]=0,t[2894]=0,e=K&-16^1431655768,t[K>>2]=e,t[2901]=e,e=4096),D=I+48|0,S=I+47|0,s=e+S|0,l=0-e|0,L=s&l,L>>>0<=I>>>0||(e=t[2893]|0,e|0?(k=t[2891]|0,K=k+L|0,K>>>0<=k>>>0|K>>>0>e>>>0):0))return Pe=0,m=Zt,Pe|0;e:do if(t[2894]&4)n=0,Me=133;else{r=t[2789]|0;t:do if(r){for(u=11580;e=t[u>>2]|0,!(e>>>0<=r>>>0?(ge=u+4|0,(e+(t[ge>>2]|0)|0)>>>0>r>>>0):0);)if(e=t[u+8>>2]|0,e)u=e;else{Me=118;break t}if(n=s-h&l,n>>>0<2147483647)if(e=n2(n|0)|0,(e|0)==((t[u>>2]|0)+(t[ge>>2]|0)|0)){if((e|0)!=(-1|0)){h=n,s=e,Me=135;break e}}else u=e,Me=126;else n=0}else Me=118;while(0);do if((Me|0)==118)if(r=n2(0)|0,(r|0)!=(-1|0)?(n=r,be=t[2902]|0,Se=be+-1|0,n=((Se&n|0)==0?0:(Se+n&0-be)-n|0)+L|0,be=t[2891]|0,Se=n+be|0,n>>>0>I>>>0&n>>>0<2147483647):0){if(ge=t[2893]|0,ge|0?Se>>>0<=be>>>0|Se>>>0>ge>>>0:0){n=0;break}if(e=n2(n|0)|0,(e|0)==(r|0)){h=n,s=r,Me=135;break e}else u=e,Me=126}else n=0;while(0);do if((Me|0)==126){if(r=0-n|0,!(D>>>0>n>>>0&(n>>>0<2147483647&(u|0)!=(-1|0))))if((u|0)==(-1|0)){n=0;break}else{h=n,s=u,Me=135;break e}if(e=t[2903]|0,e=S-n+e&0-e,e>>>0>=2147483647){h=n,s=u,Me=135;break e}if((n2(e|0)|0)==(-1|0)){n2(r|0)|0,n=0;break}else{h=e+n|0,s=u,Me=135;break e}}while(0);t[2894]=t[2894]|4,Me=133}while(0);if((((Me|0)==133?L>>>0<2147483647:0)?(ct=n2(L|0)|0,ge=n2(0)|0,Ze=ge-ct|0,Ge=Ze>>>0>(I+40|0)>>>0,!((ct|0)==(-1|0)|Ge^1|ct>>>0<ge>>>0&((ct|0)!=(-1|0)&(ge|0)!=(-1|0))^1)):0)&&(h=Ge?Ze:n,s=ct,Me=135),(Me|0)==135){n=(t[2891]|0)+h|0,t[2891]=n,n>>>0>(t[2892]|0)>>>0&&(t[2892]=n),S=t[2789]|0;do if(S){for(n=11580;;){if(e=t[n>>2]|0,r=n+4|0,u=t[r>>2]|0,(s|0)==(e+u|0)){Me=145;break}if(l=t[n+8>>2]|0,l)n=l;else break}if(((Me|0)==145?(t[n+12>>2]&8|0)==0:0)?S>>>0<s>>>0&S>>>0>=e>>>0:0){t[r>>2]=u+h,Pe=S+8|0,Pe=(Pe&7|0)==0?0:0-Pe&7,Me=S+Pe|0,Pe=(t[2786]|0)+(h-Pe)|0,t[2789]=Me,t[2786]=Pe,t[Me+4>>2]=Pe|1,t[Me+Pe+4>>2]=40,t[2790]=t[2905];break}for(s>>>0<(t[2787]|0)>>>0&&(t[2787]=s),r=s+h|0,n=11580;;){if((t[n>>2]|0)==(r|0)){Me=153;break}if(e=t[n+8>>2]|0,e)n=e;else break}if((Me|0)==153?(t[n+12>>2]&8|0)==0:0){t[n>>2]=s,k=n+4|0,t[k>>2]=(t[k>>2]|0)+h,k=s+8|0,k=s+((k&7|0)==0?0:0-k&7)|0,n=r+8|0,n=r+((n&7|0)==0?0:0-n&7)|0,L=k+I|0,D=n-k-I|0,t[k+4>>2]=I|3;do if((n|0)!=(S|0)){if((n|0)==(t[2788]|0)){Pe=(t[2785]|0)+D|0,t[2785]=Pe,t[2788]=L,t[L+4>>2]=Pe|1,t[L+Pe>>2]=Pe;break}if(e=t[n+4>>2]|0,(e&3|0)==1){h=e&-8,u=e>>>3;e:do if(e>>>0<256)if(e=t[n+8>>2]|0,r=t[n+12>>2]|0,(r|0)==(e|0)){t[2783]=t[2783]&~(1<<u);break}else{t[e+12>>2]=r,t[r+8>>2]=e;break}else{s=t[n+24>>2]|0,e=t[n+12>>2]|0;do if((e|0)==(n|0)){if(u=n+16|0,r=u+4|0,e=t[r>>2]|0,!e)if(e=t[u>>2]|0,e)r=u;else{e=0;break}for(;;){if(u=e+20|0,l=t[u>>2]|0,l|0){e=l,r=u;continue}if(u=e+16|0,l=t[u>>2]|0,l)e=l,r=u;else break}t[r>>2]=0}else Pe=t[n+8>>2]|0,t[Pe+12>>2]=e,t[e+8>>2]=Pe;while(0);if(!s)break;r=t[n+28>>2]|0,u=11436+(r<<2)|0;do if((n|0)!=(t[u>>2]|0)){if(t[s+16+(((t[s+16>>2]|0)!=(n|0)&1)<<2)>>2]=e,!e)break e}else{if(t[u>>2]=e,e|0)break;t[2784]=t[2784]&~(1<<r);break e}while(0);if(t[e+24>>2]=s,r=n+16|0,u=t[r>>2]|0,u|0&&(t[e+16>>2]=u,t[u+24>>2]=e),r=t[r+4>>2]|0,!r)break;t[e+20>>2]=r,t[r+24>>2]=e}while(0);n=n+h|0,l=h+D|0}else l=D;if(n=n+4|0,t[n>>2]=t[n>>2]&-2,t[L+4>>2]=l|1,t[L+l>>2]=l,n=l>>>3,l>>>0<256){r=11172+(n<<1<<2)|0,e=t[2783]|0,n=1<<n,e&n?(e=r+8|0,n=t[e>>2]|0):(t[2783]=e|n,n=r,e=r+8|0),t[e>>2]=L,t[n+12>>2]=L,t[L+8>>2]=n,t[L+12>>2]=r;break}n=l>>>8;do if(!n)n=0;else{if(l>>>0>16777215){n=31;break}Me=(n+1048320|0)>>>16&8,Pe=n<<Me,ct=(Pe+520192|0)>>>16&4,Pe=Pe<<ct,n=(Pe+245760|0)>>>16&2,n=14-(ct|Me|n)+(Pe<<n>>>15)|0,n=l>>>(n+7|0)&1|n<<1}while(0);if(u=11436+(n<<2)|0,t[L+28>>2]=n,e=L+16|0,t[e+4>>2]=0,t[e>>2]=0,e=t[2784]|0,r=1<<n,!(e&r)){t[2784]=e|r,t[u>>2]=L,t[L+24>>2]=u,t[L+12>>2]=L,t[L+8>>2]=L;break}for(e=l<<((n|0)==31?0:25-(n>>>1)|0),r=t[u>>2]|0;;){if((t[r+4>>2]&-8|0)==(l|0)){Me=194;break}if(u=r+16+(e>>>31<<2)|0,n=t[u>>2]|0,n)e=e<<1,r=n;else{Me=193;break}}if((Me|0)==193){t[u>>2]=L,t[L+24>>2]=r,t[L+12>>2]=L,t[L+8>>2]=L;break}else if((Me|0)==194){Me=r+8|0,Pe=t[Me>>2]|0,t[Pe+12>>2]=L,t[Me>>2]=L,t[L+8>>2]=Pe,t[L+12>>2]=r,t[L+24>>2]=0;break}}else Pe=(t[2786]|0)+D|0,t[2786]=Pe,t[2789]=L,t[L+4>>2]=Pe|1;while(0);return Pe=k+8|0,m=Zt,Pe|0}for(n=11580;e=t[n>>2]|0,!(e>>>0<=S>>>0?(Pe=e+(t[n+4>>2]|0)|0,Pe>>>0>S>>>0):0);)n=t[n+8>>2]|0;l=Pe+-47|0,e=l+8|0,e=l+((e&7|0)==0?0:0-e&7)|0,l=S+16|0,e=e>>>0<l>>>0?S:e,n=e+8|0,r=s+8|0,r=(r&7|0)==0?0:0-r&7,Me=s+r|0,r=h+-40-r|0,t[2789]=Me,t[2786]=r,t[Me+4>>2]=r|1,t[Me+r+4>>2]=40,t[2790]=t[2905],r=e+4|0,t[r>>2]=27,t[n>>2]=t[2895],t[n+4>>2]=t[2896],t[n+8>>2]=t[2897],t[n+12>>2]=t[2898],t[2895]=s,t[2896]=h,t[2898]=0,t[2897]=n,n=e+24|0;do Me=n,n=n+4|0,t[n>>2]=7;while((Me+8|0)>>>0<Pe>>>0);if((e|0)!=(S|0)){if(s=e-S|0,t[r>>2]=t[r>>2]&-2,t[S+4>>2]=s|1,t[e>>2]=s,n=s>>>3,s>>>0<256){r=11172+(n<<1<<2)|0,e=t[2783]|0,n=1<<n,e&n?(e=r+8|0,n=t[e>>2]|0):(t[2783]=e|n,n=r,e=r+8|0),t[e>>2]=S,t[n+12>>2]=S,t[S+8>>2]=n,t[S+12>>2]=r;break}if(n=s>>>8,n?s>>>0>16777215?r=31:(Me=(n+1048320|0)>>>16&8,Pe=n<<Me,ct=(Pe+520192|0)>>>16&4,Pe=Pe<<ct,r=(Pe+245760|0)>>>16&2,r=14-(ct|Me|r)+(Pe<<r>>>15)|0,r=s>>>(r+7|0)&1|r<<1):r=0,u=11436+(r<<2)|0,t[S+28>>2]=r,t[S+20>>2]=0,t[l>>2]=0,n=t[2784]|0,e=1<<r,!(n&e)){t[2784]=n|e,t[u>>2]=S,t[S+24>>2]=u,t[S+12>>2]=S,t[S+8>>2]=S;break}for(e=s<<((r|0)==31?0:25-(r>>>1)|0),r=t[u>>2]|0;;){if((t[r+4>>2]&-8|0)==(s|0)){Me=216;break}if(u=r+16+(e>>>31<<2)|0,n=t[u>>2]|0,n)e=e<<1,r=n;else{Me=215;break}}if((Me|0)==215){t[u>>2]=S,t[S+24>>2]=r,t[S+12>>2]=S,t[S+8>>2]=S;break}else if((Me|0)==216){Me=r+8|0,Pe=t[Me>>2]|0,t[Pe+12>>2]=S,t[Me>>2]=S,t[S+8>>2]=Pe,t[S+12>>2]=r,t[S+24>>2]=0;break}}}else{Pe=t[2787]|0,(Pe|0)==0|s>>>0<Pe>>>0&&(t[2787]=s),t[2895]=s,t[2896]=h,t[2898]=0,t[2792]=t[2901],t[2791]=-1,n=0;do Pe=11172+(n<<1<<2)|0,t[Pe+12>>2]=Pe,t[Pe+8>>2]=Pe,n=n+1|0;while((n|0)!=32);Pe=s+8|0,Pe=(Pe&7|0)==0?0:0-Pe&7,Me=s+Pe|0,Pe=h+-40-Pe|0,t[2789]=Me,t[2786]=Pe,t[Me+4>>2]=Pe|1,t[Me+Pe+4>>2]=40,t[2790]=t[2905]}while(0);if(n=t[2786]|0,n>>>0>I>>>0)return ct=n-I|0,t[2786]=ct,Pe=t[2789]|0,Me=Pe+I|0,t[2789]=Me,t[Me+4>>2]=ct|1,t[Pe+4>>2]=I|3,Pe=Pe+8|0,m=Zt,Pe|0}return t[(bv()|0)>>2]=12,Pe=0,m=Zt,Pe|0}function C_(e){e=e|0;var n=0,r=0,u=0,l=0,s=0,h=0,D=0,S=0;if(!!e){r=e+-8|0,l=t[2787]|0,e=t[e+-4>>2]|0,n=e&-8,S=r+n|0;do if(e&1)D=r,h=r;else{if(u=t[r>>2]|0,!(e&3)||(h=r+(0-u)|0,s=u+n|0,h>>>0<l>>>0))return;if((h|0)==(t[2788]|0)){if(e=S+4|0,n=t[e>>2]|0,(n&3|0)!=3){D=h,n=s;break}t[2785]=s,t[e>>2]=n&-2,t[h+4>>2]=s|1,t[h+s>>2]=s;return}if(r=u>>>3,u>>>0<256)if(e=t[h+8>>2]|0,n=t[h+12>>2]|0,(n|0)==(e|0)){t[2783]=t[2783]&~(1<<r),D=h,n=s;break}else{t[e+12>>2]=n,t[n+8>>2]=e,D=h,n=s;break}l=t[h+24>>2]|0,e=t[h+12>>2]|0;do if((e|0)==(h|0)){if(r=h+16|0,n=r+4|0,e=t[n>>2]|0,!e)if(e=t[r>>2]|0,e)n=r;else{e=0;break}for(;;){if(r=e+20|0,u=t[r>>2]|0,u|0){e=u,n=r;continue}if(r=e+16|0,u=t[r>>2]|0,u)e=u,n=r;else break}t[n>>2]=0}else D=t[h+8>>2]|0,t[D+12>>2]=e,t[e+8>>2]=D;while(0);if(l){if(n=t[h+28>>2]|0,r=11436+(n<<2)|0,(h|0)==(t[r>>2]|0)){if(t[r>>2]=e,!e){t[2784]=t[2784]&~(1<<n),D=h,n=s;break}}else if(t[l+16+(((t[l+16>>2]|0)!=(h|0)&1)<<2)>>2]=e,!e){D=h,n=s;break}t[e+24>>2]=l,n=h+16|0,r=t[n>>2]|0,r|0&&(t[e+16>>2]=r,t[r+24>>2]=e),n=t[n+4>>2]|0,n?(t[e+20>>2]=n,t[n+24>>2]=e,D=h,n=s):(D=h,n=s)}else D=h,n=s}while(0);if(!(h>>>0>=S>>>0)&&(e=S+4|0,u=t[e>>2]|0,!!(u&1))){if(u&2)t[e>>2]=u&-2,t[D+4>>2]=n|1,t[h+n>>2]=n,l=n;else{if(e=t[2788]|0,(S|0)==(t[2789]|0)){if(S=(t[2786]|0)+n|0,t[2786]=S,t[2789]=D,t[D+4>>2]=S|1,(D|0)!=(e|0))return;t[2788]=0,t[2785]=0;return}if((S|0)==(e|0)){S=(t[2785]|0)+n|0,t[2785]=S,t[2788]=h,t[D+4>>2]=S|1,t[h+S>>2]=S;return}l=(u&-8)+n|0,r=u>>>3;do if(u>>>0<256)if(n=t[S+8>>2]|0,e=t[S+12>>2]|0,(e|0)==(n|0)){t[2783]=t[2783]&~(1<<r);break}else{t[n+12>>2]=e,t[e+8>>2]=n;break}else{s=t[S+24>>2]|0,e=t[S+12>>2]|0;do if((e|0)==(S|0)){if(r=S+16|0,n=r+4|0,e=t[n>>2]|0,!e)if(e=t[r>>2]|0,e)n=r;else{r=0;break}for(;;){if(r=e+20|0,u=t[r>>2]|0,u|0){e=u,n=r;continue}if(r=e+16|0,u=t[r>>2]|0,u)e=u,n=r;else break}t[n>>2]=0,r=e}else r=t[S+8>>2]|0,t[r+12>>2]=e,t[e+8>>2]=r,r=e;while(0);if(s|0){if(e=t[S+28>>2]|0,n=11436+(e<<2)|0,(S|0)==(t[n>>2]|0)){if(t[n>>2]=r,!r){t[2784]=t[2784]&~(1<<e);break}}else if(t[s+16+(((t[s+16>>2]|0)!=(S|0)&1)<<2)>>2]=r,!r)break;t[r+24>>2]=s,e=S+16|0,n=t[e>>2]|0,n|0&&(t[r+16>>2]=n,t[n+24>>2]=r),e=t[e+4>>2]|0,e|0&&(t[r+20>>2]=e,t[e+24>>2]=r)}}while(0);if(t[D+4>>2]=l|1,t[h+l>>2]=l,(D|0)==(t[2788]|0)){t[2785]=l;return}}if(e=l>>>3,l>>>0<256){r=11172+(e<<1<<2)|0,n=t[2783]|0,e=1<<e,n&e?(n=r+8|0,e=t[n>>2]|0):(t[2783]=n|e,e=r,n=r+8|0),t[n>>2]=D,t[e+12>>2]=D,t[D+8>>2]=e,t[D+12>>2]=r;return}e=l>>>8,e?l>>>0>16777215?e=31:(h=(e+1048320|0)>>>16&8,S=e<<h,s=(S+520192|0)>>>16&4,S=S<<s,e=(S+245760|0)>>>16&2,e=14-(s|h|e)+(S<<e>>>15)|0,e=l>>>(e+7|0)&1|e<<1):e=0,u=11436+(e<<2)|0,t[D+28>>2]=e,t[D+20>>2]=0,t[D+16>>2]=0,n=t[2784]|0,r=1<<e;do if(n&r){for(n=l<<((e|0)==31?0:25-(e>>>1)|0),r=t[u>>2]|0;;){if((t[r+4>>2]&-8|0)==(l|0)){e=73;break}if(u=r+16+(n>>>31<<2)|0,e=t[u>>2]|0,e)n=n<<1,r=e;else{e=72;break}}if((e|0)==72){t[u>>2]=D,t[D+24>>2]=r,t[D+12>>2]=D,t[D+8>>2]=D;break}else if((e|0)==73){h=r+8|0,S=t[h>>2]|0,t[S+12>>2]=D,t[h>>2]=D,t[D+8>>2]=S,t[D+12>>2]=r,t[D+24>>2]=0;break}}else t[2784]=n|r,t[u>>2]=D,t[D+24>>2]=u,t[D+12>>2]=D,t[D+8>>2]=D;while(0);if(S=(t[2791]|0)+-1|0,t[2791]=S,!S)e=11588;else return;for(;e=t[e>>2]|0,e;)e=e+8|0;t[2791]=-1}}}function CF(){return 11628}function xF(e){e=e|0;var n=0,r=0;return n=m,m=m+16|0,r=n,t[r>>2]=OF(t[e+60>>2]|0)|0,e=x_(Ou(6,r|0)|0)|0,m=n,e|0}function F8(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0,be=0;I=m,m=m+48|0,L=I+16|0,s=I,l=I+32|0,D=e+28|0,u=t[D>>2]|0,t[l>>2]=u,S=e+20|0,u=(t[S>>2]|0)-u|0,t[l+4>>2]=u,t[l+8>>2]=n,t[l+12>>2]=r,u=u+r|0,h=e+60|0,t[s>>2]=t[h>>2],t[s+4>>2]=l,t[s+8>>2]=2,s=x_(v0(146,s|0)|0)|0;e:do if((u|0)!=(s|0)){for(n=2;!((s|0)<0);)if(u=u-s|0,be=t[l+4>>2]|0,K=s>>>0>be>>>0,l=K?l+8|0:l,n=(K<<31>>31)+n|0,be=s-(K?be:0)|0,t[l>>2]=(t[l>>2]|0)+be,K=l+4|0,t[K>>2]=(t[K>>2]|0)-be,t[L>>2]=t[h>>2],t[L+4>>2]=l,t[L+8>>2]=n,s=x_(v0(146,L|0)|0)|0,(u|0)==(s|0)){k=3;break e}t[e+16>>2]=0,t[D>>2]=0,t[S>>2]=0,t[e>>2]=t[e>>2]|32,(n|0)==2?r=0:r=r-(t[l+4>>2]|0)|0}else k=3;while(0);return(k|0)==3&&(be=t[e+44>>2]|0,t[e+16>>2]=be+(t[e+48>>2]|0),t[D>>2]=be,t[S>>2]=be),m=I,r|0}function AF(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0;return l=m,m=m+32|0,s=l,u=l+20|0,t[s>>2]=t[e+60>>2],t[s+4>>2]=0,t[s+8>>2]=n,t[s+12>>2]=u,t[s+16>>2]=r,(x_(Ni(140,s|0)|0)|0)<0?(t[u>>2]=-1,e=-1):e=t[u>>2]|0,m=l,e|0}function x_(e){return e=e|0,e>>>0>4294963200&&(t[(bv()|0)>>2]=0-e,e=-1),e|0}function bv(){return(RF()|0)+64|0}function RF(){return YE()|0}function YE(){return 2084}function OF(e){return e=e|0,e|0}function MF(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0;return l=m,m=m+32|0,u=l,t[e+36>>2]=1,((t[e>>2]&64|0)==0?(t[u>>2]=t[e+60>>2],t[u+4>>2]=21523,t[u+8>>2]=l+16,I0(54,u|0)|0):0)&&(c[e+75>>0]=-1),u=F8(e,n,r)|0,m=l,u|0}function P8(e,n){e=e|0,n=n|0;var r=0,u=0;if(r=c[e>>0]|0,u=c[n>>0]|0,r<<24>>24==0?1:r<<24>>24!=u<<24>>24)e=u;else{do e=e+1|0,n=n+1|0,r=c[e>>0]|0,u=c[n>>0]|0;while(!(r<<24>>24==0?1:r<<24>>24!=u<<24>>24));e=u}return(r&255)-(e&255)|0}function kF(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0;e:do if(!r)e=0;else{for(;u=c[e>>0]|0,l=c[n>>0]|0,u<<24>>24==l<<24>>24;)if(r=r+-1|0,r)e=e+1|0,n=n+1|0;else{e=0;break e}e=(u&255)-(l&255)|0}while(0);return e|0}function I8(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0,be=0,Se=0,ge=0;ge=m,m=m+224|0,k=ge+120|0,I=ge+80|0,be=ge,Se=ge+136|0,u=I,l=u+40|0;do t[u>>2]=0,u=u+4|0;while((u|0)<(l|0));return t[k>>2]=t[r>>2],(KE(0,n,k,be,I)|0)<0?r=-1:((t[e+76>>2]|0)>-1?K=LF(e)|0:K=0,r=t[e>>2]|0,L=r&32,(c[e+74>>0]|0)<1&&(t[e>>2]=r&-33),u=e+48|0,t[u>>2]|0?r=KE(e,n,k,be,I)|0:(l=e+44|0,s=t[l>>2]|0,t[l>>2]=Se,h=e+28|0,t[h>>2]=Se,D=e+20|0,t[D>>2]=Se,t[u>>2]=80,S=e+16|0,t[S>>2]=Se+80,r=KE(e,n,k,be,I)|0,s&&(M_[t[e+36>>2]&7](e,0,0)|0,r=(t[D>>2]|0)==0?-1:r,t[l>>2]=s,t[u>>2]=0,t[S>>2]=0,t[h>>2]=0,t[D>>2]=0)),u=t[e>>2]|0,t[e>>2]=u|L,K|0&&NF(e),r=(u&32|0)==0?r:-1),m=ge,r|0}function KE(e,n,r,u,l){e=e|0,n=n|0,r=r|0,u=u|0,l=l|0;var s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0,be=0,Se=0,ge=0,Ze=0,Ge=0,ct=0,Me=0,Pe=0,Zt=0,Br=0,In=0,yn=0,Er=0,Pr=0,Ln=0;Ln=m,m=m+64|0,In=Ln+16|0,yn=Ln,Zt=Ln+24|0,Er=Ln+8|0,Pr=Ln+20|0,t[In>>2]=n,ct=(e|0)!=0,Me=Zt+40|0,Pe=Me,Zt=Zt+39|0,Br=Er+4|0,h=0,s=0,k=0;e:for(;;){do if((s|0)>-1)if((h|0)>(2147483647-s|0)){t[(bv()|0)>>2]=75,s=-1;break}else{s=h+s|0;break}while(0);if(h=c[n>>0]|0,h<<24>>24)D=n;else{Ge=87;break}t:for(;;){switch(h<<24>>24){case 37:{h=D,Ge=9;break t}case 0:{h=D;break t}default:}Ze=D+1|0,t[In>>2]=Ze,h=c[Ze>>0]|0,D=Ze}t:do if((Ge|0)==9)for(;;){if(Ge=0,(c[D+1>>0]|0)!=37)break t;if(h=h+1|0,D=D+2|0,t[In>>2]=D,(c[D>>0]|0)==37)Ge=9;else break}while(0);if(h=h-n|0,ct&&Yo(e,n,h),h|0){n=D;continue}S=D+1|0,h=(c[S>>0]|0)+-48|0,h>>>0<10?(Ze=(c[D+2>>0]|0)==36,ge=Ze?h:-1,k=Ze?1:k,S=Ze?D+3|0:S):ge=-1,t[In>>2]=S,h=c[S>>0]|0,D=(h<<24>>24)+-32|0;t:do if(D>>>0<32)for(L=0,I=h;;){if(h=1<<D,!(h&75913)){h=I;break t}if(L=h|L,S=S+1|0,t[In>>2]=S,h=c[S>>0]|0,D=(h<<24>>24)+-32|0,D>>>0>=32)break;I=h}else L=0;while(0);if(h<<24>>24==42){if(D=S+1|0,h=(c[D>>0]|0)+-48|0,h>>>0<10?(c[S+2>>0]|0)==36:0)t[l+(h<<2)>>2]=10,h=t[u+((c[D>>0]|0)+-48<<3)>>2]|0,k=1,S=S+3|0;else{if(k|0){s=-1;break}ct?(k=(t[r>>2]|0)+(4-1)&~(4-1),h=t[k>>2]|0,t[r>>2]=k+4,k=0,S=D):(h=0,k=0,S=D)}t[In>>2]=S,Ze=(h|0)<0,h=Ze?0-h|0:h,L=Ze?L|8192:L}else{if(h=b8(In)|0,(h|0)<0){s=-1;break}S=t[In>>2]|0}do if((c[S>>0]|0)==46){if((c[S+1>>0]|0)!=42){t[In>>2]=S+1,D=b8(In)|0,S=t[In>>2]|0;break}if(I=S+2|0,D=(c[I>>0]|0)+-48|0,D>>>0<10?(c[S+3>>0]|0)==36:0){t[l+(D<<2)>>2]=10,D=t[u+((c[I>>0]|0)+-48<<3)>>2]|0,S=S+4|0,t[In>>2]=S;break}if(k|0){s=-1;break e}ct?(Ze=(t[r>>2]|0)+(4-1)&~(4-1),D=t[Ze>>2]|0,t[r>>2]=Ze+4):D=0,t[In>>2]=I,S=I}else D=-1;while(0);for(Se=0;;){if(((c[S>>0]|0)+-65|0)>>>0>57){s=-1;break e}if(Ze=S+1|0,t[In>>2]=Ze,I=c[(c[S>>0]|0)+-65+(5178+(Se*58|0))>>0]|0,K=I&255,(K+-1|0)>>>0<8)Se=K,S=Ze;else break}if(!(I<<24>>24)){s=-1;break}be=(ge|0)>-1;do if(I<<24>>24==19)if(be){s=-1;break e}else Ge=49;else{if(be){t[l+(ge<<2)>>2]=K,be=u+(ge<<3)|0,ge=t[be+4>>2]|0,Ge=yn,t[Ge>>2]=t[be>>2],t[Ge+4>>2]=ge,Ge=49;break}if(!ct){s=0;break e}B8(yn,K,r)}while(0);if((Ge|0)==49?(Ge=0,!ct):0){h=0,n=Ze;continue}S=c[S>>0]|0,S=(Se|0)!=0&(S&15|0)==3?S&-33:S,be=L&-65537,ge=(L&8192|0)==0?L:be;t:do switch(S|0){case 110:switch((Se&255)<<24>>24){case 0:{t[t[yn>>2]>>2]=s,h=0,n=Ze;continue e}case 1:{t[t[yn>>2]>>2]=s,h=0,n=Ze;continue e}case 2:{h=t[yn>>2]|0,t[h>>2]=s,t[h+4>>2]=((s|0)<0)<<31>>31,h=0,n=Ze;continue e}case 3:{_[t[yn>>2]>>1]=s,h=0,n=Ze;continue e}case 4:{c[t[yn>>2]>>0]=s,h=0,n=Ze;continue e}case 6:{t[t[yn>>2]>>2]=s,h=0,n=Ze;continue e}case 7:{h=t[yn>>2]|0,t[h>>2]=s,t[h+4>>2]=((s|0)<0)<<31>>31,h=0,n=Ze;continue e}default:{h=0,n=Ze;continue e}}case 112:{S=120,D=D>>>0>8?D:8,n=ge|8,Ge=61;break}case 88:case 120:{n=ge,Ge=61;break}case 111:{S=yn,n=t[S>>2]|0,S=t[S+4>>2]|0,K=PF(n,S,Me)|0,be=Pe-K|0,L=0,I=5642,D=(ge&8|0)==0|(D|0)>(be|0)?D:be+1|0,be=ge,Ge=67;break}case 105:case 100:if(S=yn,n=t[S>>2]|0,S=t[S+4>>2]|0,(S|0)<0){n=A_(0,0,n|0,S|0)|0,S=ut,L=yn,t[L>>2]=n,t[L+4>>2]=S,L=1,I=5642,Ge=66;break t}else{L=(ge&2049|0)!=0&1,I=(ge&2048|0)==0?(ge&1|0)==0?5642:5644:5643,Ge=66;break t}case 117:{S=yn,L=0,I=5642,n=t[S>>2]|0,S=t[S+4>>2]|0,Ge=66;break}case 99:{c[Zt>>0]=t[yn>>2],n=Zt,L=0,I=5642,K=Me,S=1,D=be;break}case 109:{S=IF(t[(bv()|0)>>2]|0)|0,Ge=71;break}case 115:{S=t[yn>>2]|0,S=S|0?S:5652,Ge=71;break}case 67:{t[Er>>2]=t[yn>>2],t[Br>>2]=0,t[yn>>2]=Er,K=-1,S=Er,Ge=75;break}case 83:{n=t[yn>>2]|0,D?(K=D,S=n,Ge=75):(_l(e,32,h,0,ge),n=0,Ge=84);break}case 65:case 71:case 70:case 69:case 97:case 103:case 102:case 101:{h=BF(e,+B[yn>>3],h,D,ge,S)|0,n=Ze;continue e}default:L=0,I=5642,K=Me,S=D,D=ge}while(0);t:do if((Ge|0)==61)ge=yn,Se=t[ge>>2]|0,ge=t[ge+4>>2]|0,K=FF(Se,ge,Me,S&32)|0,I=(n&8|0)==0|(Se|0)==0&(ge|0)==0,L=I?0:2,I=I?5642:5642+(S>>4)|0,be=n,n=Se,S=ge,Ge=67;else if((Ge|0)==66)K=Bv(n,S,Me)|0,be=ge,Ge=67;else if((Ge|0)==71)Ge=0,ge=bF(S,0,D)|0,Se=(ge|0)==0,n=S,L=0,I=5642,K=Se?S+D|0:ge,S=Se?D:ge-S|0,D=be;else if((Ge|0)==75){for(Ge=0,I=S,n=0,D=0;L=t[I>>2]|0,!(!L||(D=U8(Pr,L)|0,(D|0)<0|D>>>0>(K-n|0)>>>0));)if(n=D+n|0,K>>>0>n>>>0)I=I+4|0;else break;if((D|0)<0){s=-1;break e}if(_l(e,32,h,n,ge),!n)n=0,Ge=84;else for(L=0;;){if(D=t[S>>2]|0,!D){Ge=84;break t}if(D=U8(Pr,D)|0,L=D+L|0,(L|0)>(n|0)){Ge=84;break t}if(Yo(e,Pr,D),L>>>0>=n>>>0){Ge=84;break}else S=S+4|0}}while(0);if((Ge|0)==67)Ge=0,S=(n|0)!=0|(S|0)!=0,ge=(D|0)!=0|S,S=((S^1)&1)+(Pe-K)|0,n=ge?K:Me,K=Me,S=ge?(D|0)>(S|0)?D:S:D,D=(D|0)>-1?be&-65537:be;else if((Ge|0)==84){Ge=0,_l(e,32,h,n,ge^8192),h=(h|0)>(n|0)?h:n,n=Ze;continue}Se=K-n|0,be=(S|0)<(Se|0)?Se:S,ge=be+L|0,h=(h|0)<(ge|0)?ge:h,_l(e,32,h,ge,D),Yo(e,I,L),_l(e,48,h,ge,D^65536),_l(e,48,be,Se,0),Yo(e,n,Se),_l(e,32,h,ge,D^8192),n=Ze}e:do if((Ge|0)==87&&!e)if(!k)s=0;else{for(s=1;n=t[l+(s<<2)>>2]|0,!!n;)if(B8(u+(s<<3)|0,n,r),s=s+1|0,(s|0)>=10){s=1;break e}for(;;){if(t[l+(s<<2)>>2]|0){s=-1;break e}if(s=s+1|0,(s|0)>=10){s=1;break}}}while(0);return m=Ln,s|0}function LF(e){return e=e|0,0}function NF(e){e=e|0}function Yo(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]&32||YF(n,r,e)|0}function b8(e){e=e|0;var n=0,r=0,u=0;if(r=t[e>>2]|0,u=(c[r>>0]|0)+-48|0,u>>>0<10){n=0;do n=u+(n*10|0)|0,r=r+1|0,t[e>>2]=r,u=(c[r>>0]|0)+-48|0;while(u>>>0<10)}else n=0;return n|0}function B8(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0;e:do if(n>>>0<=20)do switch(n|0){case 9:{u=(t[r>>2]|0)+(4-1)&~(4-1),n=t[u>>2]|0,t[r>>2]=u+4,t[e>>2]=n;break e}case 10:{u=(t[r>>2]|0)+(4-1)&~(4-1),n=t[u>>2]|0,t[r>>2]=u+4,u=e,t[u>>2]=n,t[u+4>>2]=((n|0)<0)<<31>>31;break e}case 11:{u=(t[r>>2]|0)+(4-1)&~(4-1),n=t[u>>2]|0,t[r>>2]=u+4,u=e,t[u>>2]=n,t[u+4>>2]=0;break e}case 12:{u=(t[r>>2]|0)+(8-1)&~(8-1),n=u,l=t[n>>2]|0,n=t[n+4>>2]|0,t[r>>2]=u+8,u=e,t[u>>2]=l,t[u+4>>2]=n;break e}case 13:{l=(t[r>>2]|0)+(4-1)&~(4-1),u=t[l>>2]|0,t[r>>2]=l+4,u=(u&65535)<<16>>16,l=e,t[l>>2]=u,t[l+4>>2]=((u|0)<0)<<31>>31;break e}case 14:{l=(t[r>>2]|0)+(4-1)&~(4-1),u=t[l>>2]|0,t[r>>2]=l+4,l=e,t[l>>2]=u&65535,t[l+4>>2]=0;break e}case 15:{l=(t[r>>2]|0)+(4-1)&~(4-1),u=t[l>>2]|0,t[r>>2]=l+4,u=(u&255)<<24>>24,l=e,t[l>>2]=u,t[l+4>>2]=((u|0)<0)<<31>>31;break e}case 16:{l=(t[r>>2]|0)+(4-1)&~(4-1),u=t[l>>2]|0,t[r>>2]=l+4,l=e,t[l>>2]=u&255,t[l+4>>2]=0;break e}case 17:{l=(t[r>>2]|0)+(8-1)&~(8-1),s=+B[l>>3],t[r>>2]=l+8,B[e>>3]=s;break e}case 18:{l=(t[r>>2]|0)+(8-1)&~(8-1),s=+B[l>>3],t[r>>2]=l+8,B[e>>3]=s;break e}default:break e}while(0);while(0)}function FF(e,n,r,u){if(e=e|0,n=n|0,r=r|0,u=u|0,!((e|0)==0&(n|0)==0))do r=r+-1|0,c[r>>0]=O[5694+(e&15)>>0]|0|u,e=R_(e|0,n|0,4)|0,n=ut;while(!((e|0)==0&(n|0)==0));return r|0}function PF(e,n,r){if(e=e|0,n=n|0,r=r|0,!((e|0)==0&(n|0)==0))do r=r+-1|0,c[r>>0]=e&7|48,e=R_(e|0,n|0,3)|0,n=ut;while(!((e|0)==0&(n|0)==0));return r|0}function Bv(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;if(n>>>0>0|(n|0)==0&e>>>0>4294967295){for(;u=ZE(e|0,n|0,10,0)|0,r=r+-1|0,c[r>>0]=u&255|48,u=e,e=JE(e|0,n|0,10,0)|0,n>>>0>9|(n|0)==9&u>>>0>4294967295;)n=ut;n=e}else n=e;if(n)for(;r=r+-1|0,c[r>>0]=(n>>>0)%10|0|48,!(n>>>0<10);)n=(n>>>0)/10|0;return r|0}function IF(e){return e=e|0,qF(e,t[(HF()|0)+188>>2]|0)|0}function bF(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;s=n&255,u=(r|0)!=0;e:do if(u&(e&3|0)!=0)for(l=n&255;;){if((c[e>>0]|0)==l<<24>>24){h=6;break e}if(e=e+1|0,r=r+-1|0,u=(r|0)!=0,!(u&(e&3|0)!=0)){h=5;break}}else h=5;while(0);(h|0)==5&&(u?h=6:r=0);e:do if((h|0)==6&&(l=n&255,(c[e>>0]|0)!=l<<24>>24)){u=lr(s,16843009)|0;t:do if(r>>>0>3){for(;s=t[e>>2]^u,!((s&-2139062144^-2139062144)&s+-16843009|0);)if(e=e+4|0,r=r+-4|0,r>>>0<=3){h=11;break t}}else h=11;while(0);if((h|0)==11&&!r){r=0;break}for(;;){if((c[e>>0]|0)==l<<24>>24)break e;if(e=e+1|0,r=r+-1|0,!r){r=0;break}}}while(0);return(r|0?e:0)|0}function _l(e,n,r,u,l){e=e|0,n=n|0,r=r|0,u=u|0,l=l|0;var s=0,h=0;if(h=m,m=m+256|0,s=h,(r|0)>(u|0)&(l&73728|0)==0){if(l=r-u|0,jv(s|0,n|0,(l>>>0<256?l:256)|0)|0,l>>>0>255){n=r-u|0;do Yo(e,s,256),l=l+-256|0;while(l>>>0>255);l=n&255}Yo(e,s,l)}m=h}function U8(e,n){return e=e|0,n=n|0,e?e=jF(e,n,0)|0:e=0,e|0}function BF(e,n,r,u,l,s){e=e|0,n=+n,r=r|0,u=u|0,l=l|0,s=s|0;var h=0,D=0,S=0,L=0,k=0,I=0,K=0,be=0,Se=0,ge=0,Ze=0,Ge=0,ct=0,Me=0,Pe=0,Zt=0,Br=0,In=0,yn=0,Er=0,Pr=0,Ln=0,uu=0;uu=m,m=m+560|0,S=uu+8|0,Ze=uu,Ln=uu+524|0,Pr=Ln,L=uu+512|0,t[Ze>>2]=0,Er=L+12|0,j8(n)|0,(ut|0)<0?(n=-n,In=1,Br=5659):(In=(l&2049|0)!=0&1,Br=(l&2048|0)==0?(l&1|0)==0?5660:5665:5662),j8(n)|0,yn=ut&2146435072;do if(yn>>>0<2146435072|(yn|0)==2146435072&0<0){if(be=+UF(n,Ze)*2,h=be!=0,h&&(t[Ze>>2]=(t[Ze>>2]|0)+-1),ct=s|32,(ct|0)==97){Se=s&32,K=(Se|0)==0?Br:Br+9|0,I=In|2,h=12-u|0;do if(u>>>0>11|(h|0)==0)n=be;else{n=8;do h=h+-1|0,n=n*16;while((h|0)!=0);if((c[K>>0]|0)==45){n=-(n+(-be-n));break}else{n=be+n-n;break}}while(0);D=t[Ze>>2]|0,h=(D|0)<0?0-D|0:D,h=Bv(h,((h|0)<0)<<31>>31,Er)|0,(h|0)==(Er|0)&&(h=L+11|0,c[h>>0]=48),c[h+-1>>0]=(D>>31&2)+43,k=h+-2|0,c[k>>0]=s+15,L=(u|0)<1,S=(l&8|0)==0,h=Ln;do yn=~~n,D=h+1|0,c[h>>0]=O[5694+yn>>0]|Se,n=(n-+(yn|0))*16,((D-Pr|0)==1?!(S&(L&n==0)):0)?(c[D>>0]=46,h=h+2|0):h=D;while(n!=0);yn=h-Pr|0,Pr=Er-k|0,Er=(u|0)!=0&(yn+-2|0)<(u|0)?u+2|0:yn,h=Pr+I+Er|0,_l(e,32,r,h,l),Yo(e,K,I),_l(e,48,r,h,l^65536),Yo(e,Ln,yn),_l(e,48,Er-yn|0,0,0),Yo(e,k,Pr),_l(e,32,r,h,l^8192);break}D=(u|0)<0?6:u,h?(h=(t[Ze>>2]|0)+-28|0,t[Ze>>2]=h,n=be*268435456):(n=be,h=t[Ze>>2]|0),yn=(h|0)<0?S:S+288|0,S=yn;do Pe=~~n>>>0,t[S>>2]=Pe,S=S+4|0,n=(n-+(Pe>>>0))*1e9;while(n!=0);if((h|0)>0)for(L=yn,I=S;;){if(k=(h|0)<29?h:29,h=I+-4|0,h>>>0>=L>>>0){S=0;do Me=G8(t[h>>2]|0,0,k|0)|0,Me=QE(Me|0,ut|0,S|0,0)|0,Pe=ut,Ge=ZE(Me|0,Pe|0,1e9,0)|0,t[h>>2]=Ge,S=JE(Me|0,Pe|0,1e9,0)|0,h=h+-4|0;while(h>>>0>=L>>>0);S&&(L=L+-4|0,t[L>>2]=S)}for(S=I;!(S>>>0<=L>>>0);)if(h=S+-4|0,!(t[h>>2]|0))S=h;else break;if(h=(t[Ze>>2]|0)-k|0,t[Ze>>2]=h,(h|0)>0)I=S;else break}else L=yn;if((h|0)<0){u=((D+25|0)/9|0)+1|0,ge=(ct|0)==102;do{if(Se=0-h|0,Se=(Se|0)<9?Se:9,L>>>0<S>>>0){k=(1<<Se)+-1|0,I=1e9>>>Se,K=0,h=L;do Pe=t[h>>2]|0,t[h>>2]=(Pe>>>Se)+K,K=lr(Pe&k,I)|0,h=h+4|0;while(h>>>0<S>>>0);h=(t[L>>2]|0)==0?L+4|0:L,K?(t[S>>2]=K,L=h,h=S+4|0):(L=h,h=S)}else L=(t[L>>2]|0)==0?L+4|0:L,h=S;S=ge?yn:L,S=(h-S>>2|0)>(u|0)?S+(u<<2)|0:h,h=(t[Ze>>2]|0)+Se|0,t[Ze>>2]=h}while((h|0)<0);h=L,u=S}else h=L,u=S;if(Pe=yn,h>>>0<u>>>0){if(S=(Pe-h>>2)*9|0,k=t[h>>2]|0,k>>>0>=10){L=10;do L=L*10|0,S=S+1|0;while(k>>>0>=L>>>0)}}else S=0;if(ge=(ct|0)==103,Ge=(D|0)!=0,L=D-((ct|0)!=102?S:0)+((Ge&ge)<<31>>31)|0,(L|0)<(((u-Pe>>2)*9|0)+-9|0)){if(L=L+9216|0,Se=yn+4+(((L|0)/9|0)+-1024<<2)|0,L=((L|0)%9|0)+1|0,(L|0)<9){k=10;do k=k*10|0,L=L+1|0;while((L|0)!=9)}else k=10;if(I=t[Se>>2]|0,K=(I>>>0)%(k>>>0)|0,L=(Se+4|0)==(u|0),L&(K|0)==0)L=Se;else if(be=(((I>>>0)/(k>>>0)|0)&1|0)==0?9007199254740992:9007199254740994,Me=(k|0)/2|0,n=K>>>0<Me>>>0?.5:L&(K|0)==(Me|0)?1:1.5,In&&(Me=(c[Br>>0]|0)==45,n=Me?-n:n,be=Me?-be:be),L=I-K|0,t[Se>>2]=L,be+n!=be){if(Me=L+k|0,t[Se>>2]=Me,Me>>>0>999999999)for(S=Se;L=S+-4|0,t[S>>2]=0,L>>>0<h>>>0&&(h=h+-4|0,t[h>>2]=0),Me=(t[L>>2]|0)+1|0,t[L>>2]=Me,Me>>>0>999999999;)S=L;else L=Se;if(S=(Pe-h>>2)*9|0,I=t[h>>2]|0,I>>>0>=10){k=10;do k=k*10|0,S=S+1|0;while(I>>>0>=k>>>0)}}else L=Se;L=L+4|0,L=u>>>0>L>>>0?L:u,Me=h}else L=u,Me=h;for(ct=L;;){if(ct>>>0<=Me>>>0){Ze=0;break}if(h=ct+-4|0,!(t[h>>2]|0))ct=h;else{Ze=1;break}}u=0-S|0;do if(ge)if(h=((Ge^1)&1)+D|0,(h|0)>(S|0)&(S|0)>-5?(k=s+-1|0,D=h+-1-S|0):(k=s+-2|0,D=h+-1|0),h=l&8,h)Se=h;else{if(Ze?(Zt=t[ct+-4>>2]|0,(Zt|0)!=0):0)if((Zt>>>0)%10|0)L=0;else{L=0,h=10;do h=h*10|0,L=L+1|0;while(!((Zt>>>0)%(h>>>0)|0|0))}else L=9;if(h=((ct-Pe>>2)*9|0)+-9|0,(k|32|0)==102){Se=h-L|0,Se=(Se|0)>0?Se:0,D=(D|0)<(Se|0)?D:Se,Se=0;break}else{Se=h+S-L|0,Se=(Se|0)>0?Se:0,D=(D|0)<(Se|0)?D:Se,Se=0;break}}else k=s,Se=l&8;while(0);if(ge=D|Se,I=(ge|0)!=0&1,K=(k|32|0)==102,K)Ge=0,h=(S|0)>0?S:0;else{if(h=(S|0)<0?u:S,h=Bv(h,((h|0)<0)<<31>>31,Er)|0,L=Er,(L-h|0)<2)do h=h+-1|0,c[h>>0]=48;while((L-h|0)<2);c[h+-1>>0]=(S>>31&2)+43,h=h+-2|0,c[h>>0]=k,Ge=h,h=L-h|0}if(h=In+1+D+I+h|0,_l(e,32,r,h,l),Yo(e,Br,In),_l(e,48,r,h,l^65536),K){k=Me>>>0>yn>>>0?yn:Me,Se=Ln+9|0,I=Se,K=Ln+8|0,L=k;do{if(S=Bv(t[L>>2]|0,0,Se)|0,(L|0)==(k|0))(S|0)==(Se|0)&&(c[K>>0]=48,S=K);else if(S>>>0>Ln>>>0){jv(Ln|0,48,S-Pr|0)|0;do S=S+-1|0;while(S>>>0>Ln>>>0)}Yo(e,S,I-S|0),L=L+4|0}while(L>>>0<=yn>>>0);if(ge|0&&Yo(e,5710,1),L>>>0<ct>>>0&(D|0)>0)for(;;){if(S=Bv(t[L>>2]|0,0,Se)|0,S>>>0>Ln>>>0){jv(Ln|0,48,S-Pr|0)|0;do S=S+-1|0;while(S>>>0>Ln>>>0)}if(Yo(e,S,(D|0)<9?D:9),L=L+4|0,S=D+-9|0,L>>>0<ct>>>0&(D|0)>9)D=S;else{D=S;break}}_l(e,48,D+9|0,9,0)}else{if(ge=Ze?ct:Me+4|0,(D|0)>-1){Ze=Ln+9|0,Se=(Se|0)==0,u=Ze,I=0-Pr|0,K=Ln+8|0,k=Me;do{S=Bv(t[k>>2]|0,0,Ze)|0,(S|0)==(Ze|0)&&(c[K>>0]=48,S=K);do if((k|0)==(Me|0)){if(L=S+1|0,Yo(e,S,1),Se&(D|0)<1){S=L;break}Yo(e,5710,1),S=L}else{if(S>>>0<=Ln>>>0)break;jv(Ln|0,48,S+I|0)|0;do S=S+-1|0;while(S>>>0>Ln>>>0)}while(0);Pr=u-S|0,Yo(e,S,(D|0)>(Pr|0)?Pr:D),D=D-Pr|0,k=k+4|0}while(k>>>0<ge>>>0&(D|0)>-1)}_l(e,48,D+18|0,18,0),Yo(e,Ge,Er-Ge|0)}_l(e,32,r,h,l^8192)}else Ln=(s&32|0)!=0,h=In+3|0,_l(e,32,r,h,l&-65537),Yo(e,Br,In),Yo(e,n!=n|!1?Ln?5686:5690:Ln?5678:5682,3),_l(e,32,r,h,l^8192);while(0);return m=uu,((h|0)<(r|0)?r:h)|0}function j8(e){e=+e;var n=0;return B[q>>3]=e,n=t[q>>2]|0,ut=t[q+4>>2]|0,n|0}function UF(e,n){return e=+e,n=n|0,+ +z8(e,n)}function z8(e,n){e=+e,n=n|0;var r=0,u=0,l=0;switch(B[q>>3]=e,r=t[q>>2]|0,u=t[q+4>>2]|0,l=R_(r|0,u|0,52)|0,l&2047){case 0:{e!=0?(e=+z8(e*18446744073709552e3,n),r=(t[n>>2]|0)+-64|0):r=0,t[n>>2]=r;break}case 2047:break;default:t[n>>2]=(l&2047)+-1022,t[q>>2]=r,t[q+4>>2]=u&-2146435073|1071644672,e=+B[q>>3]}return+e}function jF(e,n,r){e=e|0,n=n|0,r=r|0;do if(e){if(n>>>0<128){c[e>>0]=n,e=1;break}if(!(t[t[(zF()|0)+188>>2]>>2]|0))if((n&-128|0)==57216){c[e>>0]=n,e=1;break}else{t[(bv()|0)>>2]=84,e=-1;break}if(n>>>0<2048){c[e>>0]=n>>>6|192,c[e+1>>0]=n&63|128,e=2;break}if(n>>>0<55296|(n&-8192|0)==57344){c[e>>0]=n>>>12|224,c[e+1>>0]=n>>>6&63|128,c[e+2>>0]=n&63|128,e=3;break}if((n+-65536|0)>>>0<1048576){c[e>>0]=n>>>18|240,c[e+1>>0]=n>>>12&63|128,c[e+2>>0]=n>>>6&63|128,c[e+3>>0]=n&63|128,e=4;break}else{t[(bv()|0)>>2]=84,e=-1;break}}else e=1;while(0);return e|0}function zF(){return YE()|0}function HF(){return YE()|0}function qF(e,n){e=e|0,n=n|0;var r=0,u=0;for(u=0;;){if((O[5712+u>>0]|0)==(e|0)){e=2;break}if(r=u+1|0,(r|0)==87){r=5800,u=87,e=5;break}else u=r}if((e|0)==2&&(u?(r=5800,e=5):r=5800),(e|0)==5)for(;;){do e=r,r=r+1|0;while((c[e>>0]|0)!=0);if(u=u+-1|0,u)e=5;else break}return WF(r,t[n+20>>2]|0)|0}function WF(e,n){return e=e|0,n=n|0,VF(e,n)|0}function VF(e,n){return e=e|0,n=n|0,n?n=GF(t[n>>2]|0,t[n+4>>2]|0,e)|0:n=0,(n|0?n:e)|0}function GF(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0;K=(t[e>>2]|0)+1794895138|0,s=Xp(t[e+8>>2]|0,K)|0,u=Xp(t[e+12>>2]|0,K)|0,l=Xp(t[e+16>>2]|0,K)|0;e:do if((s>>>0<n>>>2>>>0?(I=n-(s<<2)|0,u>>>0<I>>>0&l>>>0<I>>>0):0)?((l|u)&3|0)==0:0){for(I=u>>>2,k=l>>>2,L=0;;){if(D=s>>>1,S=L+D|0,h=S<<1,l=h+I|0,u=Xp(t[e+(l<<2)>>2]|0,K)|0,l=Xp(t[e+(l+1<<2)>>2]|0,K)|0,!(l>>>0<n>>>0&u>>>0<(n-l|0)>>>0)){u=0;break e}if(c[e+(l+u)>>0]|0){u=0;break e}if(u=P8(r,e+l|0)|0,!u)break;if(u=(u|0)<0,(s|0)==1){u=0;break e}else L=u?L:S,s=u?D:s-D|0}u=h+k|0,l=Xp(t[e+(u<<2)>>2]|0,K)|0,u=Xp(t[e+(u+1<<2)>>2]|0,K)|0,u>>>0<n>>>0&l>>>0<(n-u|0)>>>0?u=(c[e+(u+l)>>0]|0)==0?e+u|0:0:u=0}else u=0;while(0);return u|0}function Xp(e,n){e=e|0,n=n|0;var r=0;return r=X8(e|0)|0,((n|0)==0?e:r)|0}function YF(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0,D=0;u=r+16|0,l=t[u>>2]|0,l?s=5:KF(r)|0?u=0:(l=t[u>>2]|0,s=5);e:do if((s|0)==5){if(D=r+20|0,h=t[D>>2]|0,u=h,(l-h|0)>>>0<n>>>0){u=M_[t[r+36>>2]&7](r,e,n)|0;break}t:do if((c[r+75>>0]|0)>-1){for(h=n;;){if(!h){s=0,l=e;break t}if(l=h+-1|0,(c[e+l>>0]|0)==10)break;h=l}if(u=M_[t[r+36>>2]&7](r,e,h)|0,u>>>0<h>>>0)break e;s=h,l=e+h|0,n=n-h|0,u=t[D>>2]|0}else s=0,l=e;while(0);_r(u|0,l|0,n|0)|0,t[D>>2]=(t[D>>2]|0)+n,u=s+n|0}while(0);return u|0}function KF(e){e=e|0;var n=0,r=0;return n=e+74|0,r=c[n>>0]|0,c[n>>0]=r+255|r,n=t[e>>2]|0,n&8?(t[e>>2]=n|32,e=-1):(t[e+8>>2]=0,t[e+4>>2]=0,r=t[e+44>>2]|0,t[e+28>>2]=r,t[e+20>>2]=r,t[e+16>>2]=r+(t[e+48>>2]|0),e=0),e|0}function Au(e,n){e=w(e),n=w(n);var r=0,u=0;r=H8(e)|0;do if((r&2147483647)>>>0<=2139095040){if(u=H8(n)|0,(u&2147483647)>>>0<=2139095040)if((u^r|0)<0){e=(r|0)<0?n:e;break}else{e=e<n?n:e;break}}else e=n;while(0);return w(e)}function H8(e){return e=w(e),T[q>>2]=e,t[q>>2]|0|0}function Qp(e,n){e=w(e),n=w(n);var r=0,u=0;r=q8(e)|0;do if((r&2147483647)>>>0<=2139095040){if(u=q8(n)|0,(u&2147483647)>>>0<=2139095040)if((u^r|0)<0){e=(r|0)<0?e:n;break}else{e=e<n?e:n;break}}else e=n;while(0);return w(e)}function q8(e){return e=w(e),T[q>>2]=e,t[q>>2]|0|0}function XE(e,n){e=w(e),n=w(n);var r=0,u=0,l=0,s=0,h=0,D=0,S=0,L=0;s=(T[q>>2]=e,t[q>>2]|0),D=(T[q>>2]=n,t[q>>2]|0),r=s>>>23&255,h=D>>>23&255,S=s&-2147483648,l=D<<1;e:do if((l|0)!=0?!((r|0)==255|((XF(n)|0)&2147483647)>>>0>2139095040):0){if(u=s<<1,u>>>0<=l>>>0)return n=w(e*w(0)),w((u|0)==(l|0)?n:e);if(r)u=s&8388607|8388608;else{if(r=s<<9,(r|0)>-1){u=r,r=0;do r=r+-1|0,u=u<<1;while((u|0)>-1)}else r=0;u=s<<1-r}if(h)D=D&8388607|8388608;else{if(s=D<<9,(s|0)>-1){l=0;do l=l+-1|0,s=s<<1;while((s|0)>-1)}else l=0;h=l,D=D<<1-l}l=u-D|0,s=(l|0)>-1;t:do if((r|0)>(h|0)){for(;;){if(s)if(l)u=l;else break;if(u=u<<1,r=r+-1|0,l=u-D|0,s=(l|0)>-1,(r|0)<=(h|0))break t}n=w(e*w(0));break e}while(0);if(s)if(l)u=l;else{n=w(e*w(0));break}if(u>>>0<8388608)do u=u<<1,r=r+-1|0;while(u>>>0<8388608);(r|0)>0?r=u+-8388608|r<<23:r=u>>>(1-r|0),n=(t[q>>2]=r|S,w(T[q>>2]))}else L=3;while(0);return(L|0)==3&&(n=w(e*n),n=w(n/n)),w(n)}function XF(e){return e=w(e),T[q>>2]=e,t[q>>2]|0|0}function QF(e,n){return e=e|0,n=n|0,I8(t[582]|0,e,n)|0}function hi(e){e=e|0,$n()}function Uv(e){e=e|0}function JF(e,n){return e=e|0,n=n|0,0}function ZF(e){return e=e|0,(W8(e+4|0)|0)==-1?(P1[t[(t[e>>2]|0)+8>>2]&127](e),e=1):e=0,e|0}function W8(e){e=e|0;var n=0;return n=t[e>>2]|0,t[e>>2]=n+-1,n+-1|0}function t2(e){e=e|0,ZF(e)|0&&$F(e)}function $F(e){e=e|0;var n=0;n=e+8|0,((t[n>>2]|0)!=0?(W8(n)|0)!=-1:0)||P1[t[(t[e>>2]|0)+16>>2]&127](e)}function pn(e){e=e|0;var n=0;for(n=(e|0)==0?1:e;e=T_(n)|0,!(e|0);){if(e=tP()|0,!e){e=0;break}uS[e&0]()}return e|0}function V8(e){return e=e|0,pn(e)|0}function yt(e){e=e|0,C_(e)}function eP(e){e=e|0,(c[e+11>>0]|0)<0&&yt(t[e>>2]|0)}function tP(){var e=0;return e=t[2923]|0,t[2923]=e+0,e|0}function nP(){}function A_(e,n,r,u){return e=e|0,n=n|0,r=r|0,u=u|0,u=n-u-(r>>>0>e>>>0|0)>>>0,ut=u,e-r>>>0|0|0}function QE(e,n,r,u){return e=e|0,n=n|0,r=r|0,u=u|0,r=e+r>>>0,ut=n+u+(r>>>0<e>>>0|0)>>>0,r|0|0}function jv(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0,h=0;if(s=e+r|0,n=n&255,(r|0)>=67){for(;e&3;)c[e>>0]=n,e=e+1|0;for(u=s&-4|0,l=u-64|0,h=n|n<<8|n<<16|n<<24;(e|0)<=(l|0);)t[e>>2]=h,t[e+4>>2]=h,t[e+8>>2]=h,t[e+12>>2]=h,t[e+16>>2]=h,t[e+20>>2]=h,t[e+24>>2]=h,t[e+28>>2]=h,t[e+32>>2]=h,t[e+36>>2]=h,t[e+40>>2]=h,t[e+44>>2]=h,t[e+48>>2]=h,t[e+52>>2]=h,t[e+56>>2]=h,t[e+60>>2]=h,e=e+64|0;for(;(e|0)<(u|0);)t[e>>2]=h,e=e+4|0}for(;(e|0)<(s|0);)c[e>>0]=n,e=e+1|0;return s-r|0}function G8(e,n,r){return e=e|0,n=n|0,r=r|0,(r|0)<32?(ut=n<<r|(e&(1<<r)-1<<32-r)>>>32-r,e<<r):(ut=e<<r-32,0)}function R_(e,n,r){return e=e|0,n=n|0,r=r|0,(r|0)<32?(ut=n>>>r,e>>>r|(n&(1<<r)-1)<<32-r):(ut=0,n>>>r-32|0)}function _r(e,n,r){e=e|0,n=n|0,r=r|0;var u=0,l=0,s=0;if((r|0)>=8192)return ai(e|0,n|0,r|0)|0;if(s=e|0,l=e+r|0,(e&3)==(n&3)){for(;e&3;){if(!r)return s|0;c[e>>0]=c[n>>0]|0,e=e+1|0,n=n+1|0,r=r-1|0}for(r=l&-4|0,u=r-64|0;(e|0)<=(u|0);)t[e>>2]=t[n>>2],t[e+4>>2]=t[n+4>>2],t[e+8>>2]=t[n+8>>2],t[e+12>>2]=t[n+12>>2],t[e+16>>2]=t[n+16>>2],t[e+20>>2]=t[n+20>>2],t[e+24>>2]=t[n+24>>2],t[e+28>>2]=t[n+28>>2],t[e+32>>2]=t[n+32>>2],t[e+36>>2]=t[n+36>>2],t[e+40>>2]=t[n+40>>2],t[e+44>>2]=t[n+44>>2],t[e+48>>2]=t[n+48>>2],t[e+52>>2]=t[n+52>>2],t[e+56>>2]=t[n+56>>2],t[e+60>>2]=t[n+60>>2],e=e+64|0,n=n+64|0;for(;(e|0)<(r|0);)t[e>>2]=t[n>>2],e=e+4|0,n=n+4|0}else for(r=l-4|0;(e|0)<(r|0);)c[e>>0]=c[n>>0]|0,c[e+1>>0]=c[n+1>>0]|0,c[e+2>>0]=c[n+2>>0]|0,c[e+3>>0]=c[n+3>>0]|0,e=e+4|0,n=n+4|0;for(;(e|0)<(l|0);)c[e>>0]=c[n>>0]|0,e=e+1|0,n=n+1|0;return s|0}function Y8(e){e=e|0;var n=0;return n=c[De+(e&255)>>0]|0,(n|0)<8?n|0:(n=c[De+(e>>8&255)>>0]|0,(n|0)<8?n+8|0:(n=c[De+(e>>16&255)>>0]|0,(n|0)<8?n+16|0:(c[De+(e>>>24)>>0]|0)+24|0))}function K8(e,n,r,u,l){e=e|0,n=n|0,r=r|0,u=u|0,l=l|0;var s=0,h=0,D=0,S=0,L=0,k=0,I=0,K=0,be=0,Se=0;if(k=e,S=n,L=S,h=r,K=u,D=K,!L)return s=(l|0)!=0,D?s?(t[l>>2]=e|0,t[l+4>>2]=n&0,K=0,l=0,ut=K,l|0):(K=0,l=0,ut=K,l|0):(s&&(t[l>>2]=(k>>>0)%(h>>>0),t[l+4>>2]=0),K=0,l=(k>>>0)/(h>>>0)>>>0,ut=K,l|0);s=(D|0)==0;do if(h){if(!s){if(s=(Dr(D|0)|0)-(Dr(L|0)|0)|0,s>>>0<=31){I=s+1|0,D=31-s|0,n=s-31>>31,h=I,e=k>>>(I>>>0)&n|L<<D,n=L>>>(I>>>0)&n,s=0,D=k<<D;break}return l?(t[l>>2]=e|0,t[l+4>>2]=S|n&0,K=0,l=0,ut=K,l|0):(K=0,l=0,ut=K,l|0)}if(s=h-1|0,s&h|0){D=(Dr(h|0)|0)+33-(Dr(L|0)|0)|0,Se=64-D|0,I=32-D|0,S=I>>31,be=D-32|0,n=be>>31,h=D,e=I-1>>31&L>>>(be>>>0)|(L<<I|k>>>(D>>>0))&n,n=n&L>>>(D>>>0),s=k<<Se&S,D=(L<<Se|k>>>(be>>>0))&S|k<<I&D-33>>31;break}return l|0&&(t[l>>2]=s&k,t[l+4>>2]=0),(h|0)==1?(be=S|n&0,Se=e|0|0,ut=be,Se|0):(Se=Y8(h|0)|0,be=L>>>(Se>>>0)|0,Se=L<<32-Se|k>>>(Se>>>0)|0,ut=be,Se|0)}else{if(s)return l|0&&(t[l>>2]=(L>>>0)%(h>>>0),t[l+4>>2]=0),be=0,Se=(L>>>0)/(h>>>0)>>>0,ut=be,Se|0;if(!k)return l|0&&(t[l>>2]=0,t[l+4>>2]=(L>>>0)%(D>>>0)),be=0,Se=(L>>>0)/(D>>>0)>>>0,ut=be,Se|0;if(s=D-1|0,!(s&D))return l|0&&(t[l>>2]=e|0,t[l+4>>2]=s&L|n&0),be=0,Se=L>>>((Y8(D|0)|0)>>>0),ut=be,Se|0;if(s=(Dr(D|0)|0)-(Dr(L|0)|0)|0,s>>>0<=30){n=s+1|0,D=31-s|0,h=n,e=L<<D|k>>>(n>>>0),n=L>>>(n>>>0),s=0,D=k<<D;break}return l?(t[l>>2]=e|0,t[l+4>>2]=S|n&0,be=0,Se=0,ut=be,Se|0):(be=0,Se=0,ut=be,Se|0)}while(0);if(!h)L=D,S=0,D=0;else{I=r|0|0,k=K|u&0,L=QE(I|0,k|0,-1,-1)|0,r=ut,S=D,D=0;do u=S,S=s>>>31|S<<1,s=D|s<<1,u=e<<1|u>>>31|0,K=e>>>31|n<<1|0,A_(L|0,r|0,u|0,K|0)|0,Se=ut,be=Se>>31|((Se|0)<0?-1:0)<<1,D=be&1,e=A_(u|0,K|0,be&I|0,(((Se|0)<0?-1:0)>>31|((Se|0)<0?-1:0)<<1)&k|0)|0,n=ut,h=h-1|0;while((h|0)!=0);L=S,S=0}return h=0,l|0&&(t[l>>2]=e,t[l+4>>2]=n),be=(s|0)>>>31|(L|h)<<1|(h<<1|s>>>31)&0|S,Se=(s<<1|0>>>31)&-2|D,ut=be,Se|0}function JE(e,n,r,u){return e=e|0,n=n|0,r=r|0,u=u|0,K8(e,n,r,u,0)|0}function n2(e){e=e|0;var n=0,r=0;return r=e+15&-16|0,n=t[H>>2]|0,e=n+r|0,(r|0)>0&(e|0)<(n|0)|(e|0)<0?(fr()|0,Jl(12),-1):(t[H>>2]=e,((e|0)>(jr()|0)?(vr()|0)==0:0)?(t[H>>2]=n,Jl(12),-1):n|0)}function kg(e,n,r){e=e|0,n=n|0,r=r|0;var u=0;if((n|0)<(e|0)&(e|0)<(n+r|0)){for(u=e,n=n+r|0,e=e+r|0;(r|0)>0;)e=e-1|0,n=n-1|0,r=r-1|0,c[e>>0]=c[n>>0]|0;e=u}else _r(e,n,r)|0;return e|0}function ZE(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0;var l=0,s=0;return s=m,m=m+16|0,l=s|0,K8(e,n,r,u,l)|0,m=s,ut=t[l+4>>2]|0,t[l>>2]|0|0}function X8(e){return e=e|0,(e&255)<<24|(e>>8&255)<<16|(e>>16&255)<<8|e>>>24|0}function rP(e,n,r,u,l,s){e=e|0,n=n|0,r=r|0,u=u|0,l=l|0,s=s|0,Q8[e&1](n|0,r|0,u|0,l|0,s|0)}function iP(e,n,r){e=e|0,n=n|0,r=w(r),J8[e&1](n|0,w(r))}function uP(e,n,r){e=e|0,n=n|0,r=+r,Z8[e&31](n|0,+r)}function oP(e,n,r,u){return e=e|0,n=n|0,r=w(r),u=w(u),w($8[e&0](n|0,w(r),w(u)))}function lP(e,n){e=e|0,n=n|0,P1[e&127](n|0)}function sP(e,n,r){e=e|0,n=n|0,r=r|0,I1[e&31](n|0,r|0)}function aP(e,n){return e=e|0,n=n|0,Zp[e&31](n|0)|0}function fP(e,n,r,u,l){e=e|0,n=n|0,r=+r,u=+u,l=l|0,eS[e&1](n|0,+r,+u,l|0)}function cP(e,n,r,u){e=e|0,n=n|0,r=+r,u=+u,VP[e&1](n|0,+r,+u)}function dP(e,n,r,u){return e=e|0,n=n|0,r=r|0,u=u|0,M_[e&7](n|0,r|0,u|0)|0}function pP(e,n,r,u){return e=e|0,n=n|0,r=r|0,u=u|0,+GP[e&1](n|0,r|0,u|0)}function hP(e,n){return e=e|0,n=n|0,+tS[e&15](n|0)}function vP(e,n,r){return e=e|0,n=n|0,r=+r,YP[e&1](n|0,+r)|0}function mP(e,n,r){return e=e|0,n=n|0,r=r|0,eD[e&15](n|0,r|0)|0}function gP(e,n,r,u,l,s){e=e|0,n=n|0,r=r|0,u=+u,l=+l,s=s|0,KP[e&1](n|0,r|0,+u,+l,s|0)}function yP(e,n,r,u,l,s,h){e=e|0,n=n|0,r=r|0,u=u|0,l=l|0,s=s|0,h=h|0,XP[e&1](n|0,r|0,u|0,l|0,s|0,h|0)}function _P(e,n,r){return e=e|0,n=n|0,r=r|0,+nS[e&7](n|0,r|0)}function EP(e){return e=e|0,k_[e&7]()|0}function DP(e,n,r,u,l,s){return e=e|0,n=n|0,r=r|0,u=u|0,l=l|0,s=s|0,rS[e&1](n|0,r|0,u|0,l|0,s|0)|0}function wP(e,n,r,u,l){e=e|0,n=n|0,r=r|0,u=u|0,l=+l,QP[e&1](n|0,r|0,u|0,+l)}function SP(e,n,r,u,l,s,h){e=e|0,n=n|0,r=r|0,u=w(u),l=l|0,s=w(s),h=h|0,iS[e&1](n|0,r|0,w(u),l|0,w(s),h|0)}function TP(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0,Fg[e&15](n|0,r|0,u|0)}function CP(e){e=e|0,uS[e&0]()}function xP(e,n,r,u){e=e|0,n=n|0,r=r|0,u=+u,oS[e&15](n|0,r|0,+u)}function AP(e,n,r){return e=e|0,n=+n,r=+r,JP[e&1](+n,+r)|0}function RP(e,n,r,u,l){e=e|0,n=n|0,r=r|0,u=u|0,l=l|0,tD[e&15](n|0,r|0,u|0,l|0)}function OP(e,n,r,u,l){e=e|0,n=n|0,r=r|0,u=u|0,l=l|0,jt(0)}function MP(e,n){e=e|0,n=w(n),jt(1)}function ea(e,n){e=e|0,n=+n,jt(2)}function kP(e,n,r){return e=e|0,n=w(n),r=w(r),jt(3),Tt}function Zn(e){e=e|0,jt(4)}function Lg(e,n){e=e|0,n=n|0,jt(5)}function Na(e){return e=e|0,jt(6),0}function LP(e,n,r,u){e=e|0,n=+n,r=+r,u=u|0,jt(7)}function NP(e,n,r){e=e|0,n=+n,r=+r,jt(8)}function FP(e,n,r){return e=e|0,n=n|0,r=r|0,jt(9),0}function PP(e,n,r){return e=e|0,n=n|0,r=r|0,jt(10),0}function Jp(e){return e=e|0,jt(11),0}function IP(e,n){return e=e|0,n=+n,jt(12),0}function Ng(e,n){return e=e|0,n=n|0,jt(13),0}function bP(e,n,r,u,l){e=e|0,n=n|0,r=+r,u=+u,l=l|0,jt(14)}function BP(e,n,r,u,l,s){e=e|0,n=n|0,r=r|0,u=u|0,l=l|0,s=s|0,jt(15)}function $E(e,n){return e=e|0,n=n|0,jt(16),0}function UP(){return jt(17),0}function jP(e,n,r,u,l){return e=e|0,n=n|0,r=r|0,u=u|0,l=l|0,jt(18),0}function zP(e,n,r,u){e=e|0,n=n|0,r=r|0,u=+u,jt(19)}function HP(e,n,r,u,l,s){e=e|0,n=n|0,r=w(r),u=u|0,l=w(l),s=s|0,jt(20)}function O_(e,n,r){e=e|0,n=n|0,r=r|0,jt(21)}function qP(){jt(22)}function zv(e,n,r){e=e|0,n=n|0,r=+r,jt(23)}function WP(e,n){return e=+e,n=+n,jt(24),0}function Hv(e,n,r,u){e=e|0,n=n|0,r=r|0,u=u|0,jt(25)}var Q8=[OP,UM],J8=[MP,n0],Z8=[ea,da,Ss,Ts,ns,Ho,Df,ol,Wa,r0,wf,Wc,pc,Ol,Cs,pa,od,ha,hc,ea,ea,ea,ea,ea,ea,ea,ea,ea,ea,ea,ea,ea],$8=[kP],P1=[Zn,Uv,cn,us,Do,jf,M1,jl,hO,vO,mO,xM,AM,RM,XN,QN,JN,Ne,cc,ja,Gu,j0,gh,Tf,r1,Ff,Da,kh,gm,y1,_1,Zh,mp,Pd,jm,C1,Oc,Jm,eg,xv,Mv,on,Z4,aE,p_,Lt,xu,t0,RA,WA,aR,AR,HR,a7,_7,w7,U7,H7,uO,yO,DO,BO,nM,_d,bk,hL,OL,WL,pN,RN,UN,HN,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn,Zn],I1=[Lg,D2,rd,qc,Al,ul,w2,Ws,Rl,za,Ha,qa,Ml,ze,lt,$t,Wn,si,ur,Va,T2,_h,dE,gE,kR,jk,fM,E8,Lg,Lg,Lg,Lg],Zp=[Na,xF,Ef,g,J,pe,gt,xt,kt,xr,du,z0,Ga,ld,Xc,ks,GR,zO,Wk,Ma,Na,Na,Na,Na,Na,Na,Na,Na,Na,Na,Na,Na],eS=[LP,A2],VP=[NP,sO],M_=[FP,F8,AF,MF,Wh,vv,LA,XL],GP=[PP,fv],tS=[Jp,u0,We,ci,yh,al,va,R2,O2,vc,Jp,Jp,Jp,Jp,Jp,Jp],YP=[IP,m7],eD=[Ng,JF,S2,dl,W2,xm,dp,Rp,tg,kr,jo,NL,Ng,Ng,Ng,Ng],KP=[bP,xh],XP=[BP,gN],nS=[$E,Qi,M2,pd,Qc,ml,$E,$E],k_=[UP,Jc,io,D0,x7,G7,CO,GN],rS=[jP,li],QP=[zP,vg],iS=[HP,sd],Fg=[O_,A,i0,Gr,Cu,m1,Fd,ar,_g,mo,sk,yL,LN,O_,O_,O_],uS=[qP],oS=[zv,id,go,ud,zo,Vc,qi,y,jp,KA,d7,zv,zv,zv,zv,zv],JP=[WP,dO],tD=[Hv,wp,Fc,pR,t7,L7,Z7,LO,lM,Qk,rF,Hv,Hv,Hv,Hv,Hv];return{_llvm_bswap_i32:X8,dynCall_idd:AP,dynCall_i:EP,_i64Subtract:A_,___udivdi3:JE,dynCall_vif:iP,setThrew:ms,dynCall_viii:TP,_bitshift64Lshr:R_,_bitshift64Shl:G8,dynCall_vi:lP,dynCall_viiddi:gP,dynCall_diii:pP,dynCall_iii:mP,_memset:jv,_sbrk:n2,_memcpy:_r,__GLOBAL__sub_I_Yoga_cpp:ru,dynCall_vii:sP,___uremdi3:ZE,dynCall_vid:uP,stackAlloc:co,_nbind_init:hF,getTempRet0:Q,dynCall_di:hP,dynCall_iid:vP,setTempRet0:b0,_i64Add:QE,dynCall_fiff:oP,dynCall_iiii:dP,_emscripten_get_global_libc:CF,dynCall_viid:xP,dynCall_viiid:wP,dynCall_viififi:SP,dynCall_ii:aP,__GLOBAL__sub_I_Binding_cc:Ok,dynCall_viiii:RP,dynCall_iiiiii:DP,stackSave:nl,dynCall_viiiii:rP,__GLOBAL__sub_I_nbind_cc:Vs,dynCall_vidd:cP,_free:C_,runPostSets:nP,dynCall_viiiiii:yP,establishStackSpace:ju,_memmove:kg,stackRestore:Zl,_malloc:T_,__GLOBAL__sub_I_common_cc:XO,dynCall_viddi:fP,dynCall_dii:_P,dynCall_v:CP}}(Module.asmGlobalArg,Module.asmLibraryArg,buffer),_llvm_bswap_i32=Module._llvm_bswap_i32=asm._llvm_bswap_i32,getTempRet0=Module.getTempRet0=asm.getTempRet0,___udivdi3=Module.___udivdi3=asm.___udivdi3,setThrew=Module.setThrew=asm.setThrew,_bitshift64Lshr=Module._bitshift64Lshr=asm._bitshift64Lshr,_bitshift64Shl=Module._bitshift64Shl=asm._bitshift64Shl,_memset=Module._memset=asm._memset,_sbrk=Module._sbrk=asm._sbrk,_memcpy=Module._memcpy=asm._memcpy,stackAlloc=Module.stackAlloc=asm.stackAlloc,___uremdi3=Module.___uremdi3=asm.___uremdi3,_nbind_init=Module._nbind_init=asm._nbind_init,_i64Subtract=Module._i64Subtract=asm._i64Subtract,setTempRet0=Module.setTempRet0=asm.setTempRet0,_i64Add=Module._i64Add=asm._i64Add,_emscripten_get_global_libc=Module._emscripten_get_global_libc=asm._emscripten_get_global_libc,__GLOBAL__sub_I_Yoga_cpp=Module.__GLOBAL__sub_I_Yoga_cpp=asm.__GLOBAL__sub_I_Yoga_cpp,__GLOBAL__sub_I_Binding_cc=Module.__GLOBAL__sub_I_Binding_cc=asm.__GLOBAL__sub_I_Binding_cc,stackSave=Module.stackSave=asm.stackSave,__GLOBAL__sub_I_nbind_cc=Module.__GLOBAL__sub_I_nbind_cc=asm.__GLOBAL__sub_I_nbind_cc,_free=Module._free=asm._free,runPostSets=Module.runPostSets=asm.runPostSets,establishStackSpace=Module.establishStackSpace=asm.establishStackSpace,_memmove=Module._memmove=asm._memmove,stackRestore=Module.stackRestore=asm.stackRestore,_malloc=Module._malloc=asm._malloc,__GLOBAL__sub_I_common_cc=Module.__GLOBAL__sub_I_common_cc=asm.__GLOBAL__sub_I_common_cc,dynCall_viiiii=Module.dynCall_viiiii=asm.dynCall_viiiii,dynCall_vif=Module.dynCall_vif=asm.dynCall_vif,dynCall_vid=Module.dynCall_vid=asm.dynCall_vid,dynCall_fiff=Module.dynCall_fiff=asm.dynCall_fiff,dynCall_vi=Module.dynCall_vi=asm.dynCall_vi,dynCall_vii=Module.dynCall_vii=asm.dynCall_vii,dynCall_ii=Module.dynCall_ii=asm.dynCall_ii,dynCall_viddi=Module.dynCall_viddi=asm.dynCall_viddi,dynCall_vidd=Module.dynCall_vidd=asm.dynCall_vidd,dynCall_iiii=Module.dynCall_iiii=asm.dynCall_iiii,dynCall_diii=Module.dynCall_diii=asm.dynCall_diii,dynCall_di=Module.dynCall_di=asm.dynCall_di,dynCall_iid=Module.dynCall_iid=asm.dynCall_iid,dynCall_iii=Module.dynCall_iii=asm.dynCall_iii,dynCall_viiddi=Module.dynCall_viiddi=asm.dynCall_viiddi,dynCall_viiiiii=Module.dynCall_viiiiii=asm.dynCall_viiiiii,dynCall_dii=Module.dynCall_dii=asm.dynCall_dii,dynCall_i=Module.dynCall_i=asm.dynCall_i,dynCall_iiiiii=Module.dynCall_iiiiii=asm.dynCall_iiiiii,dynCall_viiid=Module.dynCall_viiid=asm.dynCall_viiid,dynCall_viififi=Module.dynCall_viififi=asm.dynCall_viififi,dynCall_viii=Module.dynCall_viii=asm.dynCall_viii,dynCall_v=Module.dynCall_v=asm.dynCall_v,dynCall_viid=Module.dynCall_viid=asm.dynCall_viid,dynCall_idd=Module.dynCall_idd=asm.dynCall_idd,dynCall_viiii=Module.dynCall_viiii=asm.dynCall_viiii;Runtime.stackAlloc=Module.stackAlloc,Runtime.stackSave=Module.stackSave,Runtime.stackRestore=Module.stackRestore,Runtime.establishStackSpace=Module.establishStackSpace,Runtime.setTempRet0=Module.setTempRet0,Runtime.getTempRet0=Module.getTempRet0,Module.asm=asm;function ExitStatus(i){this.name="ExitStatus",this.message="Program terminated with exit("+i+")",this.status=i}ExitStatus.prototype=new Error,ExitStatus.prototype.constructor=ExitStatus;var initialStackTop,preloadStartTime=null,calledMain=!1;dependenciesFulfilled=function i(){Module.calledRun||run(),Module.calledRun||(dependenciesFulfilled=i)},Module.callMain=Module.callMain=function(o){o=o||[],ensureInitRuntime();var a=o.length+1;function c(){for(var M=0;M<4-1;M++)_.push(0)}var _=[allocate(intArrayFromString(Module.thisProgram),"i8",ALLOC_NORMAL)];c();for(var t=0;t<a-1;t=t+1)_.push(allocate(intArrayFromString(o[t]),"i8",ALLOC_NORMAL)),c();_.push(0),_=allocate(_,"i32",ALLOC_NORMAL);try{var O=Module._main(a,_,0);exit(O,!0)}catch(M){if(M instanceof ExitStatus)return;if(M=="SimulateInfiniteLoop"){Module.noExitRuntime=!0;return}else{var N=M;M&&typeof M=="object"&&M.stack&&(N=[M,M.stack]),Module.printErr("exception thrown: "+N),Module.quit(1,M)}}finally{calledMain=!0}};function run(i){if(i=i||Module.arguments,preloadStartTime===null&&(preloadStartTime=Date.now()),runDependencies>0||(preRun(),runDependencies>0)||Module.calledRun)return;function o(){Module.calledRun||(Module.calledRun=!0,!ABORT&&(ensureInitRuntime(),preMain(),Module.onRuntimeInitialized&&Module.onRuntimeInitialized(),Module._main&&shouldRunNow&&Module.callMain(i),postRun()))}Module.setStatus?(Module.setStatus("Running..."),setTimeout(function(){setTimeout(function(){Module.setStatus("")},1),o()},1)):o()}Module.run=Module.run=run;function exit(i,o){o&&Module.noExitRuntime||(Module.noExitRuntime||(ABORT=!0,EXITSTATUS=i,STACKTOP=initialStackTop,exitRuntime(),Module.onExit&&Module.onExit(i)),ENVIRONMENT_IS_NODE&&process.exit(i),Module.quit(i,new ExitStatus(i)))}Module.exit=Module.exit=exit;var abortDecorators=[];function abort(i){Module.onAbort&&Module.onAbort(i),i!==void 0?(Module.print(i),Module.printErr(i),i=JSON.stringify(i)):i="",ABORT=!0,EXITSTATUS=1;var o=`
-If this abort() is unexpected, build with -s ASSERTIONS=1 which can give more information.`,a="abort("+i+") at "+stackTrace()+o;throw abortDecorators&&abortDecorators.forEach(function(c){a=c(a,i)}),a}if(Module.abort=Module.abort=abort,Module.preInit)for(typeof Module.preInit=="function"&&(Module.preInit=[Module.preInit]);Module.preInit.length>0;)Module.preInit.pop()();var shouldRunNow=!0;Module.noInitialRun&&(shouldRunNow=!1),run()})});var eh=Ke((VW,wT)=>{"use strict";var qI=ET(),WI=DT(),BD=!1,UD=null;WI({},function(i,o){if(!BD){if(BD=!0,i)throw i;UD=o}});if(!BD)throw new Error("Failed to load the yoga module - it needed to be loaded synchronously, but didn't");wT.exports=qI(UD.bind,UD.lib)});var TT=Ke((GW,ST)=>{"use strict";ST.exports=({onlyFirst:i=!1}={})=>{let o=["[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)","(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))"].join("|");return new RegExp(o,i?void 0:"g")}});var jD=Ke((YW,CT)=>{"use strict";var VI=TT();CT.exports=i=>typeof i=="string"?i.replace(VI(),""):i});var HD=Ke((KW,zD)=>{"use strict";var xT=i=>Number.isNaN(i)?!1:i>=4352&&(i<=4447||i===9001||i===9002||11904<=i&&i<=12871&&i!==12351||12880<=i&&i<=19903||19968<=i&&i<=42182||43360<=i&&i<=43388||44032<=i&&i<=55203||63744<=i&&i<=64255||65040<=i&&i<=65049||65072<=i&&i<=65131||65281<=i&&i<=65376||65504<=i&&i<=65510||110592<=i&&i<=110593||127488<=i&&i<=127569||131072<=i&&i<=262141);zD.exports=xT;zD.exports.default=xT});var RT=Ke((XW,AT)=>{"use strict";AT.exports=function(){return/\uD83C\uDFF4\uDB40\uDC67\uDB40\uDC62(?:\uDB40\uDC65\uDB40\uDC6E\uDB40\uDC67|\uDB40\uDC73\uDB40\uDC63\uDB40\uDC74|\uDB40\uDC77\uDB40\uDC6C\uDB40\uDC73)\uDB40\uDC7F|\uD83D\uDC68(?:\uD83C\uDFFC\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68\uD83C\uDFFB|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFF\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFE])|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFE\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFD])|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFD\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB\uDFFC])|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\u200D(?:\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D)?\uD83D\uDC68|(?:\uD83D[\uDC68\uDC69])\u200D(?:\uD83D\uDC66\u200D\uD83D\uDC66|\uD83D\uDC67\u200D(?:\uD83D[\uDC66\uDC67]))|\uD83D\uDC66\u200D\uD83D\uDC66|\uD83D\uDC67\u200D(?:\uD83D[\uDC66\uDC67])|(?:\uD83D[\uDC68\uDC69])\u200D(?:\uD83D[\uDC66\uDC67])|[\u2695\u2696\u2708]\uFE0F|\uD83D[\uDC66\uDC67]|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|(?:\uD83C\uDFFB\u200D[\u2695\u2696\u2708]|\uD83C\uDFFF\u200D[\u2695\u2696\u2708]|\uD83C\uDFFE\u200D[\u2695\u2696\u2708]|\uD83C\uDFFD\u200D[\u2695\u2696\u2708]|\uD83C\uDFFC\u200D[\u2695\u2696\u2708])\uFE0F|\uD83C\uDFFB\u200D(?:\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C[\uDFFB-\uDFFF])|(?:\uD83E\uDDD1\uD83C\uDFFB\u200D\uD83E\uDD1D\u200D\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFC\u200D\uD83E\uDD1D\u200D\uD83D\uDC69)\uD83C\uDFFB|\uD83E\uDDD1(?:\uD83C\uDFFF\u200D\uD83E\uDD1D\u200D\uD83E\uDDD1(?:\uD83C[\uDFFB-\uDFFF])|\u200D\uD83E\uDD1D\u200D\uD83E\uDDD1)|(?:\uD83E\uDDD1\uD83C\uDFFE\u200D\uD83E\uDD1D\u200D\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFF\u200D\uD83E\uDD1D\u200D(?:\uD83D[\uDC68\uDC69]))(?:\uD83C[\uDFFB-\uDFFE])|(?:\uD83E\uDDD1\uD83C\uDFFC\u200D\uD83E\uDD1D\u200D\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFD\u200D\uD83E\uDD1D\u200D\uD83D\uDC69)(?:\uD83C[\uDFFB\uDFFC])|\uD83D\uDC69(?:\uD83C\uDFFE\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFD\uDFFF])|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFC\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB\uDFFD-\uDFFF])|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFB\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFC-\uDFFF])|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFD\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF])|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\u200D(?:\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D(?:\uD83D[\uDC68\uDC69])|\uD83D[\uDC68\uDC69])|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFF\u200D(?:\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD]))|\uD83D\uDC69\u200D\uD83D\uDC69\u200D(?:\uD83D\uDC66\u200D\uD83D\uDC66|\uD83D\uDC67\u200D(?:\uD83D[\uDC66\uDC67]))|(?:\uD83E\uDDD1\uD83C\uDFFD\u200D\uD83E\uDD1D\u200D\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFE\u200D\uD83E\uDD1D\u200D\uD83D\uDC69)(?:\uD83C[\uDFFB-\uDFFD])|\uD83D\uDC69\u200D\uD83D\uDC66\u200D\uD83D\uDC66|\uD83D\uDC69\u200D\uD83D\uDC69\u200D(?:\uD83D[\uDC66\uDC67])|(?:\uD83D\uDC41\uFE0F\u200D\uD83D\uDDE8|\uD83D\uDC69(?:\uD83C\uDFFF\u200D[\u2695\u2696\u2708]|\uD83C\uDFFE\u200D[\u2695\u2696\u2708]|\uD83C\uDFFC\u200D[\u2695\u2696\u2708]|\uD83C\uDFFB\u200D[\u2695\u2696\u2708]|\uD83C\uDFFD\u200D[\u2695\u2696\u2708]|\u200D[\u2695\u2696\u2708])|(?:(?:\u26F9|\uD83C[\uDFCB\uDFCC]|\uD83D\uDD75)\uFE0F|\uD83D\uDC6F|\uD83E[\uDD3C\uDDDE\uDDDF])\u200D[\u2640\u2642]|(?:\u26F9|\uD83C[\uDFCB\uDFCC]|\uD83D\uDD75)(?:\uD83C[\uDFFB-\uDFFF])\u200D[\u2640\u2642]|(?:\uD83C[\uDFC3\uDFC4\uDFCA]|\uD83D[\uDC6E\uDC71\uDC73\uDC77\uDC81\uDC82\uDC86\uDC87\uDE45-\uDE47\uDE4B\uDE4D\uDE4E\uDEA3\uDEB4-\uDEB6]|\uD83E[\uDD26\uDD37-\uDD39\uDD3D\uDD3E\uDDB8\uDDB9\uDDCD-\uDDCF\uDDD6-\uDDDD])(?:(?:\uD83C[\uDFFB-\uDFFF])\u200D[\u2640\u2642]|\u200D[\u2640\u2642])|\uD83C\uDFF4\u200D\u2620)\uFE0F|\uD83D\uDC69\u200D\uD83D\uDC67\u200D(?:\uD83D[\uDC66\uDC67])|\uD83C\uDFF3\uFE0F\u200D\uD83C\uDF08|\uD83D\uDC15\u200D\uD83E\uDDBA|\uD83D\uDC69\u200D\uD83D\uDC66|\uD83D\uDC69\u200D\uD83D\uDC67|\uD83C\uDDFD\uD83C\uDDF0|\uD83C\uDDF4\uD83C\uDDF2|\uD83C\uDDF6\uD83C\uDDE6|[#\*0-9]\uFE0F\u20E3|\uD83C\uDDE7(?:\uD83C[\uDDE6\uDDE7\uDDE9-\uDDEF\uDDF1-\uDDF4\uDDF6-\uDDF9\uDDFB\uDDFC\uDDFE\uDDFF])|\uD83C\uDDF9(?:\uD83C[\uDDE6\uDDE8\uDDE9\uDDEB-\uDDED\uDDEF-\uDDF4\uDDF7\uDDF9\uDDFB\uDDFC\uDDFF])|\uD83C\uDDEA(?:\uD83C[\uDDE6\uDDE8\uDDEA\uDDEC\uDDED\uDDF7-\uDDFA])|\uD83E\uDDD1(?:\uD83C[\uDFFB-\uDFFF])|\uD83C\uDDF7(?:\uD83C[\uDDEA\uDDF4\uDDF8\uDDFA\uDDFC])|\uD83D\uDC69(?:\uD83C[\uDFFB-\uDFFF])|\uD83C\uDDF2(?:\uD83C[\uDDE6\uDDE8-\uDDED\uDDF0-\uDDFF])|\uD83C\uDDE6(?:\uD83C[\uDDE8-\uDDEC\uDDEE\uDDF1\uDDF2\uDDF4\uDDF6-\uDDFA\uDDFC\uDDFD\uDDFF])|\uD83C\uDDF0(?:\uD83C[\uDDEA\uDDEC-\uDDEE\uDDF2\uDDF3\uDDF5\uDDF7\uDDFC\uDDFE\uDDFF])|\uD83C\uDDED(?:\uD83C[\uDDF0\uDDF2\uDDF3\uDDF7\uDDF9\uDDFA])|\uD83C\uDDE9(?:\uD83C[\uDDEA\uDDEC\uDDEF\uDDF0\uDDF2\uDDF4\uDDFF])|\uD83C\uDDFE(?:\uD83C[\uDDEA\uDDF9])|\uD83C\uDDEC(?:\uD83C[\uDDE6\uDDE7\uDDE9-\uDDEE\uDDF1-\uDDF3\uDDF5-\uDDFA\uDDFC\uDDFE])|\uD83C\uDDF8(?:\uD83C[\uDDE6-\uDDEA\uDDEC-\uDDF4\uDDF7-\uDDF9\uDDFB\uDDFD-\uDDFF])|\uD83C\uDDEB(?:\uD83C[\uDDEE-\uDDF0\uDDF2\uDDF4\uDDF7])|\uD83C\uDDF5(?:\uD83C[\uDDE6\uDDEA-\uDDED\uDDF0-\uDDF3\uDDF7-\uDDF9\uDDFC\uDDFE])|\uD83C\uDDFB(?:\uD83C[\uDDE6\uDDE8\uDDEA\uDDEC\uDDEE\uDDF3\uDDFA])|\uD83C\uDDF3(?:\uD83C[\uDDE6\uDDE8\uDDEA-\uDDEC\uDDEE\uDDF1\uDDF4\uDDF5\uDDF7\uDDFA\uDDFF])|\uD83C\uDDE8(?:\uD83C[\uDDE6\uDDE8\uDDE9\uDDEB-\uDDEE\uDDF0-\uDDF5\uDDF7\uDDFA-\uDDFF])|\uD83C\uDDF1(?:\uD83C[\uDDE6-\uDDE8\uDDEE\uDDF0\uDDF7-\uDDFB\uDDFE])|\uD83C\uDDFF(?:\uD83C[\uDDE6\uDDF2\uDDFC])|\uD83C\uDDFC(?:\uD83C[\uDDEB\uDDF8])|\uD83C\uDDFA(?:\uD83C[\uDDE6\uDDEC\uDDF2\uDDF3\uDDF8\uDDFE\uDDFF])|\uD83C\uDDEE(?:\uD83C[\uDDE8-\uDDEA\uDDF1-\uDDF4\uDDF6-\uDDF9])|\uD83C\uDDEF(?:\uD83C[\uDDEA\uDDF2\uDDF4\uDDF5])|(?:\uD83C[\uDFC3\uDFC4\uDFCA]|\uD83D[\uDC6E\uDC71\uDC73\uDC77\uDC81\uDC82\uDC86\uDC87\uDE45-\uDE47\uDE4B\uDE4D\uDE4E\uDEA3\uDEB4-\uDEB6]|\uD83E[\uDD26\uDD37-\uDD39\uDD3D\uDD3E\uDDB8\uDDB9\uDDCD-\uDDCF\uDDD6-\uDDDD])(?:\uD83C[\uDFFB-\uDFFF])|(?:\u26F9|\uD83C[\uDFCB\uDFCC]|\uD83D\uDD75)(?:\uD83C[\uDFFB-\uDFFF])|(?:[\u261D\u270A-\u270D]|\uD83C[\uDF85\uDFC2\uDFC7]|\uD83D[\uDC42\uDC43\uDC46-\uDC50\uDC66\uDC67\uDC6B-\uDC6D\uDC70\uDC72\uDC74-\uDC76\uDC78\uDC7C\uDC83\uDC85\uDCAA\uDD74\uDD7A\uDD90\uDD95\uDD96\uDE4C\uDE4F\uDEC0\uDECC]|\uD83E[\uDD0F\uDD18-\uDD1C\uDD1E\uDD1F\uDD30-\uDD36\uDDB5\uDDB6\uDDBB\uDDD2-\uDDD5])(?:\uD83C[\uDFFB-\uDFFF])|(?:[\u231A\u231B\u23E9-\u23EC\u23F0\u23F3\u25FD\u25FE\u2614\u2615\u2648-\u2653\u267F\u2693\u26A1\u26AA\u26AB\u26BD\u26BE\u26C4\u26C5\u26CE\u26D4\u26EA\u26F2\u26F3\u26F5\u26FA\u26FD\u2705\u270A\u270B\u2728\u274C\u274E\u2753-\u2755\u2757\u2795-\u2797\u27B0\u27BF\u2B1B\u2B1C\u2B50\u2B55]|\uD83C[\uDC04\uDCCF\uDD8E\uDD91-\uDD9A\uDDE6-\uDDFF\uDE01\uDE1A\uDE2F\uDE32-\uDE36\uDE38-\uDE3A\uDE50\uDE51\uDF00-\uDF20\uDF2D-\uDF35\uDF37-\uDF7C\uDF7E-\uDF93\uDFA0-\uDFCA\uDFCF-\uDFD3\uDFE0-\uDFF0\uDFF4\uDFF8-\uDFFF]|\uD83D[\uDC00-\uDC3E\uDC40\uDC42-\uDCFC\uDCFF-\uDD3D\uDD4B-\uDD4E\uDD50-\uDD67\uDD7A\uDD95\uDD96\uDDA4\uDDFB-\uDE4F\uDE80-\uDEC5\uDECC\uDED0-\uDED2\uDED5\uDEEB\uDEEC\uDEF4-\uDEFA\uDFE0-\uDFEB]|\uD83E[\uDD0D-\uDD3A\uDD3C-\uDD45\uDD47-\uDD71\uDD73-\uDD76\uDD7A-\uDDA2\uDDA5-\uDDAA\uDDAE-\uDDCA\uDDCD-\uDDFF\uDE70-\uDE73\uDE78-\uDE7A\uDE80-\uDE82\uDE90-\uDE95])|(?:[#\*0-9\xA9\xAE\u203C\u2049\u2122\u2139\u2194-\u2199\u21A9\u21AA\u231A\u231B\u2328\u23CF\u23E9-\u23F3\u23F8-\u23FA\u24C2\u25AA\u25AB\u25B6\u25C0\u25FB-\u25FE\u2600-\u2604\u260E\u2611\u2614\u2615\u2618\u261D\u2620\u2622\u2623\u2626\u262A\u262E\u262F\u2638-\u263A\u2640\u2642\u2648-\u2653\u265F\u2660\u2663\u2665\u2666\u2668\u267B\u267E\u267F\u2692-\u2697\u2699\u269B\u269C\u26A0\u26A1\u26AA\u26AB\u26B0\u26B1\u26BD\u26BE\u26C4\u26C5\u26C8\u26CE\u26CF\u26D1\u26D3\u26D4\u26E9\u26EA\u26F0-\u26F5\u26F7-\u26FA\u26FD\u2702\u2705\u2708-\u270D\u270F\u2712\u2714\u2716\u271D\u2721\u2728\u2733\u2734\u2744\u2747\u274C\u274E\u2753-\u2755\u2757\u2763\u2764\u2795-\u2797\u27A1\u27B0\u27BF\u2934\u2935\u2B05-\u2B07\u2B1B\u2B1C\u2B50\u2B55\u3030\u303D\u3297\u3299]|\uD83C[\uDC04\uDCCF\uDD70\uDD71\uDD7E\uDD7F\uDD8E\uDD91-\uDD9A\uDDE6-\uDDFF\uDE01\uDE02\uDE1A\uDE2F\uDE32-\uDE3A\uDE50\uDE51\uDF00-\uDF21\uDF24-\uDF93\uDF96\uDF97\uDF99-\uDF9B\uDF9E-\uDFF0\uDFF3-\uDFF5\uDFF7-\uDFFF]|\uD83D[\uDC00-\uDCFD\uDCFF-\uDD3D\uDD49-\uDD4E\uDD50-\uDD67\uDD6F\uDD70\uDD73-\uDD7A\uDD87\uDD8A-\uDD8D\uDD90\uDD95\uDD96\uDDA4\uDDA5\uDDA8\uDDB1\uDDB2\uDDBC\uDDC2-\uDDC4\uDDD1-\uDDD3\uDDDC-\uDDDE\uDDE1\uDDE3\uDDE8\uDDEF\uDDF3\uDDFA-\uDE4F\uDE80-\uDEC5\uDECB-\uDED2\uDED5\uDEE0-\uDEE5\uDEE9\uDEEB\uDEEC\uDEF0\uDEF3-\uDEFA\uDFE0-\uDFEB]|\uD83E[\uDD0D-\uDD3A\uDD3C-\uDD45\uDD47-\uDD71\uDD73-\uDD76\uDD7A-\uDDA2\uDDA5-\uDDAA\uDDAE-\uDDCA\uDDCD-\uDDFF\uDE70-\uDE73\uDE78-\uDE7A\uDE80-\uDE82\uDE90-\uDE95])\uFE0F|(?:[\u261D\u26F9\u270A-\u270D]|\uD83C[\uDF85\uDFC2-\uDFC4\uDFC7\uDFCA-\uDFCC]|\uD83D[\uDC42\uDC43\uDC46-\uDC50\uDC66-\uDC78\uDC7C\uDC81-\uDC83\uDC85-\uDC87\uDC8F\uDC91\uDCAA\uDD74\uDD75\uDD7A\uDD90\uDD95\uDD96\uDE45-\uDE47\uDE4B-\uDE4F\uDEA3\uDEB4-\uDEB6\uDEC0\uDECC]|\uD83E[\uDD0F\uDD18-\uDD1F\uDD26\uDD30-\uDD39\uDD3C-\uDD3E\uDDB5\uDDB6\uDDB8\uDDB9\uDDBB\uDDCD-\uDDCF\uDDD1-\uDDDD])/g}});var Z_=Ke((QW,qD)=>{"use strict";var GI=jD(),YI=HD(),KI=RT(),OT=i=>{if(i=i.replace(KI(),"  "),typeof i!="string"||i.length===0)return 0;i=GI(i);let o=0;for(let a=0;a<i.length;a++){let c=i.codePointAt(a);c<=31||c>=127&&c<=159||c>=768&&c<=879||(c>65535&&a++,o+=YI(c)?2:1)}return o};qD.exports=OT;qD.exports.default=OT});var VD=Ke((JW,WD)=>{"use strict";var XI=Z_(),MT=i=>{let o=0;for(let a of i.split(`
-`))o=Math.max(o,XI(a));return o};WD.exports=MT;WD.exports.default=MT});var kT=Ke(Jg=>{"use strict";var QI=Jg&&Jg.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(Jg,"__esModule",{value:!0});var JI=QI(VD()),GD={};Jg.default=i=>{if(i.length===0)return{width:0,height:0};if(GD[i])return GD[i];let o=JI.default(i),a=i.split(`
-`).length;return GD[i]={width:o,height:a},{width:o,height:a}}});var LT=Ke(Zg=>{"use strict";var ZI=Zg&&Zg.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(Zg,"__esModule",{value:!0});var Vi=ZI(eh()),$I=(i,o)=>{"position"in o&&i.setPositionType(o.position==="absolute"?Vi.default.POSITION_TYPE_ABSOLUTE:Vi.default.POSITION_TYPE_RELATIVE)},eb=(i,o)=>{"marginLeft"in o&&i.setMargin(Vi.default.EDGE_START,o.marginLeft||0),"marginRight"in o&&i.setMargin(Vi.default.EDGE_END,o.marginRight||0),"marginTop"in o&&i.setMargin(Vi.default.EDGE_TOP,o.marginTop||0),"marginBottom"in o&&i.setMargin(Vi.default.EDGE_BOTTOM,o.marginBottom||0)},tb=(i,o)=>{"paddingLeft"in o&&i.setPadding(Vi.default.EDGE_LEFT,o.paddingLeft||0),"paddingRight"in o&&i.setPadding(Vi.default.EDGE_RIGHT,o.paddingRight||0),"paddingTop"in o&&i.setPadding(Vi.default.EDGE_TOP,o.paddingTop||0),"paddingBottom"in o&&i.setPadding(Vi.default.EDGE_BOTTOM,o.paddingBottom||0)},nb=(i,o)=>{var a;"flexGrow"in o&&i.setFlexGrow((a=o.flexGrow)!==null&&a!==void 0?a:0),"flexShrink"in o&&i.setFlexShrink(typeof o.flexShrink=="number"?o.flexShrink:1),"flexDirection"in o&&(o.flexDirection==="row"&&i.setFlexDirection(Vi.default.FLEX_DIRECTION_ROW),o.flexDirection==="row-reverse"&&i.setFlexDirection(Vi.default.FLEX_DIRECTION_ROW_REVERSE),o.flexDirection==="column"&&i.setFlexDirection(Vi.default.FLEX_DIRECTION_COLUMN),o.flexDirection==="column-reverse"&&i.setFlexDirection(Vi.default.FLEX_DIRECTION_COLUMN_REVERSE)),"flexBasis"in o&&(typeof o.flexBasis=="number"?i.setFlexBasis(o.flexBasis):typeof o.flexBasis=="string"?i.setFlexBasisPercent(Number.parseInt(o.flexBasis,10)):i.setFlexBasis(NaN)),"alignItems"in o&&((o.alignItems==="stretch"||!o.alignItems)&&i.setAlignItems(Vi.default.ALIGN_STRETCH),o.alignItems==="flex-start"&&i.setAlignItems(Vi.default.ALIGN_FLEX_START),o.alignItems==="center"&&i.setAlignItems(Vi.default.ALIGN_CENTER),o.alignItems==="flex-end"&&i.setAlignItems(Vi.default.ALIGN_FLEX_END)),"alignSelf"in o&&((o.alignSelf==="auto"||!o.alignSelf)&&i.setAlignSelf(Vi.default.ALIGN_AUTO),o.alignSelf==="flex-start"&&i.setAlignSelf(Vi.default.ALIGN_FLEX_START),o.alignSelf==="center"&&i.setAlignSelf(Vi.default.ALIGN_CENTER),o.alignSelf==="flex-end"&&i.setAlignSelf(Vi.default.ALIGN_FLEX_END)),"justifyContent"in o&&((o.justifyContent==="flex-start"||!o.justifyContent)&&i.setJustifyContent(Vi.default.JUSTIFY_FLEX_START),o.justifyContent==="center"&&i.setJustifyContent(Vi.default.JUSTIFY_CENTER),o.justifyContent==="flex-end"&&i.setJustifyContent(Vi.default.JUSTIFY_FLEX_END),o.justifyContent==="space-between"&&i.setJustifyContent(Vi.default.JUSTIFY_SPACE_BETWEEN),o.justifyContent==="space-around"&&i.setJustifyContent(Vi.default.JUSTIFY_SPACE_AROUND))},rb=(i,o)=>{var a,c;"width"in o&&(typeof o.width=="number"?i.setWidth(o.width):typeof o.width=="string"?i.setWidthPercent(Number.parseInt(o.width,10)):i.setWidthAuto()),"height"in o&&(typeof o.height=="number"?i.setHeight(o.height):typeof o.height=="string"?i.setHeightPercent(Number.parseInt(o.height,10)):i.setHeightAuto()),"minWidth"in o&&(typeof o.minWidth=="string"?i.setMinWidthPercent(Number.parseInt(o.minWidth,10)):i.setMinWidth((a=o.minWidth)!==null&&a!==void 0?a:0)),"minHeight"in o&&(typeof o.minHeight=="string"?i.setMinHeightPercent(Number.parseInt(o.minHeight,10)):i.setMinHeight((c=o.minHeight)!==null&&c!==void 0?c:0))},ib=(i,o)=>{"display"in o&&i.setDisplay(o.display==="flex"?Vi.default.DISPLAY_FLEX:Vi.default.DISPLAY_NONE)},ub=(i,o)=>{if("borderStyle"in o){let a=typeof o.borderStyle=="string"?1:0;i.setBorder(Vi.default.EDGE_TOP,a),i.setBorder(Vi.default.EDGE_BOTTOM,a),i.setBorder(Vi.default.EDGE_LEFT,a),i.setBorder(Vi.default.EDGE_RIGHT,a)}};Zg.default=(i,o={})=>{$I(i,o),eb(i,o),tb(i,o),nb(i,o),rb(i,o),ib(i,o),ub(i,o)}});var FT=Ke((eV,NT)=>{"use strict";NT.exports={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]}});var YD=Ke((tV,PT)=>{var $g=FT(),IT={};for(let i of Object.keys($g))IT[$g[i]]=i;var zn={rgb:{channels:3,labels:"rgb"},hsl:{channels:3,labels:"hsl"},hsv:{channels:3,labels:"hsv"},hwb:{channels:3,labels:"hwb"},cmyk:{channels:4,labels:"cmyk"},xyz:{channels:3,labels:"xyz"},lab:{channels:3,labels:"lab"},lch:{channels:3,labels:"lch"},hex:{channels:1,labels:["hex"]},keyword:{channels:1,labels:["keyword"]},ansi16:{channels:1,labels:["ansi16"]},ansi256:{channels:1,labels:["ansi256"]},hcg:{channels:3,labels:["h","c","g"]},apple:{channels:3,labels:["r16","g16","b16"]},gray:{channels:1,labels:["gray"]}};PT.exports=zn;for(let i of Object.keys(zn)){if(!("channels"in zn[i]))throw new Error("missing channels property: "+i);if(!("labels"in zn[i]))throw new Error("missing channel labels property: "+i);if(zn[i].labels.length!==zn[i].channels)throw new Error("channel and label counts mismatch: "+i);let{channels:o,labels:a}=zn[i];delete zn[i].channels,delete zn[i].labels,Object.defineProperty(zn[i],"channels",{value:o}),Object.defineProperty(zn[i],"labels",{value:a})}zn.rgb.hsl=function(i){let o=i[0]/255,a=i[1]/255,c=i[2]/255,_=Math.min(o,a,c),t=Math.max(o,a,c),O=t-_,N,M;t===_?N=0:o===t?N=(a-c)/O:a===t?N=2+(c-o)/O:c===t&&(N=4+(o-a)/O),N=Math.min(N*60,360),N<0&&(N+=360);let T=(_+t)/2;return t===_?M=0:T<=.5?M=O/(t+_):M=O/(2-t-_),[N,M*100,T*100]};zn.rgb.hsv=function(i){let o,a,c,_,t,O=i[0]/255,N=i[1]/255,M=i[2]/255,T=Math.max(O,N,M),B=T-Math.min(O,N,M),H=function(q){return(T-q)/6/B+1/2};return B===0?(_=0,t=0):(t=B/T,o=H(O),a=H(N),c=H(M),O===T?_=c-a:N===T?_=1/3+o-c:M===T&&(_=2/3+a-o),_<0?_+=1:_>1&&(_-=1)),[_*360,t*100,T*100]};zn.rgb.hwb=function(i){let o=i[0],a=i[1],c=i[2],_=zn.rgb.hsl(i)[0],t=1/255*Math.min(o,Math.min(a,c));return c=1-1/255*Math.max(o,Math.max(a,c)),[_,t*100,c*100]};zn.rgb.cmyk=function(i){let o=i[0]/255,a=i[1]/255,c=i[2]/255,_=Math.min(1-o,1-a,1-c),t=(1-o-_)/(1-_)||0,O=(1-a-_)/(1-_)||0,N=(1-c-_)/(1-_)||0;return[t*100,O*100,N*100,_*100]};function ob(i,o){return(i[0]-o[0])**2+(i[1]-o[1])**2+(i[2]-o[2])**2}zn.rgb.keyword=function(i){let o=IT[i];if(o)return o;let a=Infinity,c;for(let _ of Object.keys($g)){let t=$g[_],O=ob(i,t);O<a&&(a=O,c=_)}return c};zn.keyword.rgb=function(i){return $g[i]};zn.rgb.xyz=function(i){let o=i[0]/255,a=i[1]/255,c=i[2]/255;o=o>.04045?((o+.055)/1.055)**2.4:o/12.92,a=a>.04045?((a+.055)/1.055)**2.4:a/12.92,c=c>.04045?((c+.055)/1.055)**2.4:c/12.92;let _=o*.4124+a*.3576+c*.1805,t=o*.2126+a*.7152+c*.0722,O=o*.0193+a*.1192+c*.9505;return[_*100,t*100,O*100]};zn.rgb.lab=function(i){let o=zn.rgb.xyz(i),a=o[0],c=o[1],_=o[2];a/=95.047,c/=100,_/=108.883,a=a>.008856?a**(1/3):7.787*a+16/116,c=c>.008856?c**(1/3):7.787*c+16/116,_=_>.008856?_**(1/3):7.787*_+16/116;let t=116*c-16,O=500*(a-c),N=200*(c-_);return[t,O,N]};zn.hsl.rgb=function(i){let o=i[0]/360,a=i[1]/100,c=i[2]/100,_,t,O;if(a===0)return O=c*255,[O,O,O];c<.5?_=c*(1+a):_=c+a-c*a;let N=2*c-_,M=[0,0,0];for(let T=0;T<3;T++)t=o+1/3*-(T-1),t<0&&t++,t>1&&t--,6*t<1?O=N+(_-N)*6*t:2*t<1?O=_:3*t<2?O=N+(_-N)*(2/3-t)*6:O=N,M[T]=O*255;return M};zn.hsl.hsv=function(i){let o=i[0],a=i[1]/100,c=i[2]/100,_=a,t=Math.max(c,.01);c*=2,a*=c<=1?c:2-c,_*=t<=1?t:2-t;let O=(c+a)/2,N=c===0?2*_/(t+_):2*a/(c+a);return[o,N*100,O*100]};zn.hsv.rgb=function(i){let o=i[0]/60,a=i[1]/100,c=i[2]/100,_=Math.floor(o)%6,t=o-Math.floor(o),O=255*c*(1-a),N=255*c*(1-a*t),M=255*c*(1-a*(1-t));switch(c*=255,_){case 0:return[c,M,O];case 1:return[N,c,O];case 2:return[O,c,M];case 3:return[O,N,c];case 4:return[M,O,c];case 5:return[c,O,N]}};zn.hsv.hsl=function(i){let o=i[0],a=i[1]/100,c=i[2]/100,_=Math.max(c,.01),t,O;O=(2-a)*c;let N=(2-a)*_;return t=a*_,t/=N<=1?N:2-N,t=t||0,O/=2,[o,t*100,O*100]};zn.hwb.rgb=function(i){let o=i[0]/360,a=i[1]/100,c=i[2]/100,_=a+c,t;_>1&&(a/=_,c/=_);let O=Math.floor(6*o),N=1-c;t=6*o-O,(O&1)!=0&&(t=1-t);let M=a+t*(N-a),T,B,H;switch(O){default:case 6:case 0:T=N,B=M,H=a;break;case 1:T=M,B=N,H=a;break;case 2:T=a,B=N,H=M;break;case 3:T=a,B=M,H=N;break;case 4:T=M,B=a,H=N;break;case 5:T=N,B=a,H=M;break}return[T*255,B*255,H*255]};zn.cmyk.rgb=function(i){let o=i[0]/100,a=i[1]/100,c=i[2]/100,_=i[3]/100,t=1-Math.min(1,o*(1-_)+_),O=1-Math.min(1,a*(1-_)+_),N=1-Math.min(1,c*(1-_)+_);return[t*255,O*255,N*255]};zn.xyz.rgb=function(i){let o=i[0]/100,a=i[1]/100,c=i[2]/100,_,t,O;return _=o*3.2406+a*-1.5372+c*-.4986,t=o*-.9689+a*1.8758+c*.0415,O=o*.0557+a*-.204+c*1.057,_=_>.0031308?1.055*_**(1/2.4)-.055:_*12.92,t=t>.0031308?1.055*t**(1/2.4)-.055:t*12.92,O=O>.0031308?1.055*O**(1/2.4)-.055:O*12.92,_=Math.min(Math.max(0,_),1),t=Math.min(Math.max(0,t),1),O=Math.min(Math.max(0,O),1),[_*255,t*255,O*255]};zn.xyz.lab=function(i){let o=i[0],a=i[1],c=i[2];o/=95.047,a/=100,c/=108.883,o=o>.008856?o**(1/3):7.787*o+16/116,a=a>.008856?a**(1/3):7.787*a+16/116,c=c>.008856?c**(1/3):7.787*c+16/116;let _=116*a-16,t=500*(o-a),O=200*(a-c);return[_,t,O]};zn.lab.xyz=function(i){let o=i[0],a=i[1],c=i[2],_,t,O;t=(o+16)/116,_=a/500+t,O=t-c/200;let N=t**3,M=_**3,T=O**3;return t=N>.008856?N:(t-16/116)/7.787,_=M>.008856?M:(_-16/116)/7.787,O=T>.008856?T:(O-16/116)/7.787,_*=95.047,t*=100,O*=108.883,[_,t,O]};zn.lab.lch=function(i){let o=i[0],a=i[1],c=i[2],_;_=Math.atan2(c,a)*360/2/Math.PI,_<0&&(_+=360);let O=Math.sqrt(a*a+c*c);return[o,O,_]};zn.lch.lab=function(i){let o=i[0],a=i[1],_=i[2]/360*2*Math.PI,t=a*Math.cos(_),O=a*Math.sin(_);return[o,t,O]};zn.rgb.ansi16=function(i,o=null){let[a,c,_]=i,t=o===null?zn.rgb.hsv(i)[2]:o;if(t=Math.round(t/50),t===0)return 30;let O=30+(Math.round(_/255)<<2|Math.round(c/255)<<1|Math.round(a/255));return t===2&&(O+=60),O};zn.hsv.ansi16=function(i){return zn.rgb.ansi16(zn.hsv.rgb(i),i[2])};zn.rgb.ansi256=function(i){let o=i[0],a=i[1],c=i[2];return o===a&&a===c?o<8?16:o>248?231:Math.round((o-8)/247*24)+232:16+36*Math.round(o/255*5)+6*Math.round(a/255*5)+Math.round(c/255*5)};zn.ansi16.rgb=function(i){let o=i%10;if(o===0||o===7)return i>50&&(o+=3.5),o=o/10.5*255,[o,o,o];let a=(~~(i>50)+1)*.5,c=(o&1)*a*255,_=(o>>1&1)*a*255,t=(o>>2&1)*a*255;return[c,_,t]};zn.ansi256.rgb=function(i){if(i>=232){let t=(i-232)*10+8;return[t,t,t]}i-=16;let o,a=Math.floor(i/36)/5*255,c=Math.floor((o=i%36)/6)/5*255,_=o%6/5*255;return[a,c,_]};zn.rgb.hex=function(i){let a=(((Math.round(i[0])&255)<<16)+((Math.round(i[1])&255)<<8)+(Math.round(i[2])&255)).toString(16).toUpperCase();return"000000".substring(a.length)+a};zn.hex.rgb=function(i){let o=i.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);if(!o)return[0,0,0];let a=o[0];o[0].length===3&&(a=a.split("").map(N=>N+N).join(""));let c=parseInt(a,16),_=c>>16&255,t=c>>8&255,O=c&255;return[_,t,O]};zn.rgb.hcg=function(i){let o=i[0]/255,a=i[1]/255,c=i[2]/255,_=Math.max(Math.max(o,a),c),t=Math.min(Math.min(o,a),c),O=_-t,N,M;return O<1?N=t/(1-O):N=0,O<=0?M=0:_===o?M=(a-c)/O%6:_===a?M=2+(c-o)/O:M=4+(o-a)/O,M/=6,M%=1,[M*360,O*100,N*100]};zn.hsl.hcg=function(i){let o=i[1]/100,a=i[2]/100,c=a<.5?2*o*a:2*o*(1-a),_=0;return c<1&&(_=(a-.5*c)/(1-c)),[i[0],c*100,_*100]};zn.hsv.hcg=function(i){let o=i[1]/100,a=i[2]/100,c=o*a,_=0;return c<1&&(_=(a-c)/(1-c)),[i[0],c*100,_*100]};zn.hcg.rgb=function(i){let o=i[0]/360,a=i[1]/100,c=i[2]/100;if(a===0)return[c*255,c*255,c*255];let _=[0,0,0],t=o%1*6,O=t%1,N=1-O,M=0;switch(Math.floor(t)){case 0:_[0]=1,_[1]=O,_[2]=0;break;case 1:_[0]=N,_[1]=1,_[2]=0;break;case 2:_[0]=0,_[1]=1,_[2]=O;break;case 3:_[0]=0,_[1]=N,_[2]=1;break;case 4:_[0]=O,_[1]=0,_[2]=1;break;default:_[0]=1,_[1]=0,_[2]=N}return M=(1-a)*c,[(a*_[0]+M)*255,(a*_[1]+M)*255,(a*_[2]+M)*255]};zn.hcg.hsv=function(i){let o=i[1]/100,a=i[2]/100,c=o+a*(1-o),_=0;return c>0&&(_=o/c),[i[0],_*100,c*100]};zn.hcg.hsl=function(i){let o=i[1]/100,c=i[2]/100*(1-o)+.5*o,_=0;return c>0&&c<.5?_=o/(2*c):c>=.5&&c<1&&(_=o/(2*(1-c))),[i[0],_*100,c*100]};zn.hcg.hwb=function(i){let o=i[1]/100,a=i[2]/100,c=o+a*(1-o);return[i[0],(c-o)*100,(1-c)*100]};zn.hwb.hcg=function(i){let o=i[1]/100,a=i[2]/100,c=1-a,_=c-o,t=0;return _<1&&(t=(c-_)/(1-_)),[i[0],_*100,t*100]};zn.apple.rgb=function(i){return[i[0]/65535*255,i[1]/65535*255,i[2]/65535*255]};zn.rgb.apple=function(i){return[i[0]/255*65535,i[1]/255*65535,i[2]/255*65535]};zn.gray.rgb=function(i){return[i[0]/100*255,i[0]/100*255,i[0]/100*255]};zn.gray.hsl=function(i){return[0,0,i[0]]};zn.gray.hsv=zn.gray.hsl;zn.gray.hwb=function(i){return[0,100,i[0]]};zn.gray.cmyk=function(i){return[0,0,0,i[0]]};zn.gray.lab=function(i){return[i[0],0,0]};zn.gray.hex=function(i){let o=Math.round(i[0]/100*255)&255,c=((o<<16)+(o<<8)+o).toString(16).toUpperCase();return"000000".substring(c.length)+c};zn.rgb.gray=function(i){return[(i[0]+i[1]+i[2])/3/255*100]}});var BT=Ke((nV,bT)=>{var $_=YD();function lb(){let i={},o=Object.keys($_);for(let a=o.length,c=0;c<a;c++)i[o[c]]={distance:-1,parent:null};return i}function sb(i){let o=lb(),a=[i];for(o[i].distance=0;a.length;){let c=a.pop(),_=Object.keys($_[c]);for(let t=_.length,O=0;O<t;O++){let N=_[O],M=o[N];M.distance===-1&&(M.distance=o[c].distance+1,M.parent=c,a.unshift(N))}}return o}function ab(i,o){return function(a){return o(i(a))}}function fb(i,o){let a=[o[i].parent,i],c=$_[o[i].parent][i],_=o[i].parent;for(;o[_].parent;)a.unshift(o[_].parent),c=ab($_[o[_].parent][_],c),_=o[_].parent;return c.conversion=a,c}bT.exports=function(i){let o=sb(i),a={},c=Object.keys(o);for(let _=c.length,t=0;t<_;t++){let O=c[t];o[O].parent!==null&&(a[O]=fb(O,o))}return a}});var jT=Ke((rV,UT)=>{var KD=YD(),cb=BT(),Qv={},db=Object.keys(KD);function pb(i){let o=function(...a){let c=a[0];return c==null?c:(c.length>1&&(a=c),i(a))};return"conversion"in i&&(o.conversion=i.conversion),o}function hb(i){let o=function(...a){let c=a[0];if(c==null)return c;c.length>1&&(a=c);let _=i(a);if(typeof _=="object")for(let t=_.length,O=0;O<t;O++)_[O]=Math.round(_[O]);return _};return"conversion"in i&&(o.conversion=i.conversion),o}db.forEach(i=>{Qv[i]={},Object.defineProperty(Qv[i],"channels",{value:KD[i].channels}),Object.defineProperty(Qv[i],"labels",{value:KD[i].labels});let o=cb(i);Object.keys(o).forEach(c=>{let _=o[c];Qv[i][c]=hb(_),Qv[i][c].raw=pb(_)})});UT.exports=Qv});var t4=Ke((iV,zT)=>{"use strict";var HT=(i,o)=>(...a)=>`[${i(...a)+o}m`,qT=(i,o)=>(...a)=>{let c=i(...a);return`[${38+o};5;${c}m`},WT=(i,o)=>(...a)=>{let c=i(...a);return`[${38+o};2;${c[0]};${c[1]};${c[2]}m`},e4=i=>i,VT=(i,o,a)=>[i,o,a],Jv=(i,o,a)=>{Object.defineProperty(i,o,{get:()=>{let c=a();return Object.defineProperty(i,o,{value:c,enumerable:!0,configurable:!0}),c},enumerable:!0,configurable:!0})},XD,Zv=(i,o,a,c)=>{XD===void 0&&(XD=jT());let _=c?10:0,t={};for(let[O,N]of Object.entries(XD)){let M=O==="ansi16"?"ansi":O;O===o?t[M]=i(a,_):typeof N=="object"&&(t[M]=i(N[o],_))}return t};function vb(){let i=new Map,o={modifier:{reset:[0,0],bold:[1,22],dim:[2,22],italic:[3,23],underline:[4,24],inverse:[7,27],hidden:[8,28],strikethrough:[9,29]},color:{black:[30,39],red:[31,39],green:[32,39],yellow:[33,39],blue:[34,39],magenta:[35,39],cyan:[36,39],white:[37,39],blackBright:[90,39],redBright:[91,39],greenBright:[92,39],yellowBright:[93,39],blueBright:[94,39],magentaBright:[95,39],cyanBright:[96,39],whiteBright:[97,39]},bgColor:{bgBlack:[40,49],bgRed:[41,49],bgGreen:[42,49],bgYellow:[43,49],bgBlue:[44,49],bgMagenta:[45,49],bgCyan:[46,49],bgWhite:[47,49],bgBlackBright:[100,49],bgRedBright:[101,49],bgGreenBright:[102,49],bgYellowBright:[103,49],bgBlueBright:[104,49],bgMagentaBright:[105,49],bgCyanBright:[106,49],bgWhiteBright:[107,49]}};o.color.gray=o.color.blackBright,o.bgColor.bgGray=o.bgColor.bgBlackBright,o.color.grey=o.color.blackBright,o.bgColor.bgGrey=o.bgColor.bgBlackBright;for(let[a,c]of Object.entries(o)){for(let[_,t]of Object.entries(c))o[_]={open:`[${t[0]}m`,close:`[${t[1]}m`},c[_]=o[_],i.set(t[0],t[1]);Object.defineProperty(o,a,{value:c,enumerable:!1})}return Object.defineProperty(o,"codes",{value:i,enumerable:!1}),o.color.close="",o.bgColor.close="",Jv(o.color,"ansi",()=>Zv(HT,"ansi16",e4,!1)),Jv(o.color,"ansi256",()=>Zv(qT,"ansi256",e4,!1)),Jv(o.color,"ansi16m",()=>Zv(WT,"rgb",VT,!1)),Jv(o.bgColor,"ansi",()=>Zv(HT,"ansi16",e4,!0)),Jv(o.bgColor,"ansi256",()=>Zv(qT,"ansi256",e4,!0)),Jv(o.bgColor,"ansi16m",()=>Zv(WT,"rgb",VT,!0)),o}Object.defineProperty(zT,"exports",{enumerable:!0,get:vb})});var KT=Ke((uV,GT)=>{"use strict";var ey=Z_(),mb=jD(),gb=t4(),QD=new Set(["","\x9B"]),yb=39,YT=i=>`${QD.values().next().value}[${i}m`,_b=i=>i.split(" ").map(o=>ey(o)),JD=(i,o,a)=>{let c=[...o],_=!1,t=ey(mb(i[i.length-1]));for(let[O,N]of c.entries()){let M=ey(N);if(t+M<=a?i[i.length-1]+=N:(i.push(N),t=0),QD.has(N))_=!0;else if(_&&N==="m"){_=!1;continue}_||(t+=M,t===a&&O<c.length-1&&(i.push(""),t=0))}!t&&i[i.length-1].length>0&&i.length>1&&(i[i.length-2]+=i.pop())},Eb=i=>{let o=i.split(" "),a=o.length;for(;a>0&&!(ey(o[a-1])>0);)a--;return a===o.length?i:o.slice(0,a).join(" ")+o.slice(a).join("")},Db=(i,o,a={})=>{if(a.trim!==!1&&i.trim()==="")return"";let c="",_="",t,O=_b(i),N=[""];for(let[M,T]of i.split(" ").entries()){a.trim!==!1&&(N[N.length-1]=N[N.length-1].trimLeft());let B=ey(N[N.length-1]);if(M!==0&&(B>=o&&(a.wordWrap===!1||a.trim===!1)&&(N.push(""),B=0),(B>0||a.trim===!1)&&(N[N.length-1]+=" ",B++)),a.hard&&O[M]>o){let H=o-B,q=1+Math.floor((O[M]-H-1)/o);Math.floor((O[M]-1)/o)<q&&N.push(""),JD(N,T,o);continue}if(B+O[M]>o&&B>0&&O[M]>0){if(a.wordWrap===!1&&B<o){JD(N,T,o);continue}N.push("")}if(B+O[M]>o&&a.wordWrap===!1){JD(N,T,o);continue}N[N.length-1]+=T}a.trim!==!1&&(N=N.map(Eb)),c=N.join(`
-`);for(let[M,T]of[...c].entries()){if(_+=T,QD.has(T)){let H=parseFloat(/\d[^m]*/.exec(c.slice(M,M+4)));t=H===yb?null:H}let B=gb.codes.get(Number(t));t&&B&&(c[M+1]===`
-`?_+=YT(B):T===`
-`&&(_+=YT(t)))}return _};GT.exports=(i,o,a)=>String(i).normalize().replace(/\r\n/g,`
-`).split(`
-`).map(c=>Db(c,o,a)).join(`
-`)});var JT=Ke((oV,XT)=>{"use strict";var QT="[\uD800-\uDBFF][\uDC00-\uDFFF]",wb=i=>i&&i.exact?new RegExp(`^${QT}$`):new RegExp(QT,"g");XT.exports=wb});var ZD=Ke((lV,ZT)=>{"use strict";var Sb=HD(),Tb=JT(),$T=t4(),eC=["","\x9B"],n4=i=>`${eC[0]}[${i}m`,tC=(i,o,a)=>{let c=[];i=[...i];for(let _ of i){let t=_;_.match(";")&&(_=_.split(";")[0][0]+"0");let O=$T.codes.get(parseInt(_,10));if(O){let N=i.indexOf(O.toString());N>=0?i.splice(N,1):c.push(n4(o?O:t))}else if(o){c.push(n4(0));break}else c.push(n4(t))}if(o&&(c=c.filter((_,t)=>c.indexOf(_)===t),a!==void 0)){let _=n4($T.codes.get(parseInt(a,10)));c=c.reduce((t,O)=>O===_?[O,...t]:[...t,O],[])}return c.join("")};ZT.exports=(i,o,a)=>{let c=[...i.normalize()],_=[];a=typeof a=="number"?a:c.length;let t=!1,O,N=0,M="";for(let[T,B]of c.entries()){let H=!1;if(eC.includes(B)){let q=/\d[^m]*/.exec(i.slice(T,T+18));O=q&&q.length>0?q[0]:void 0,N<a&&(t=!0,O!==void 0&&_.push(O))}else t&&B==="m"&&(t=!1,H=!0);if(!t&&!H&&++N,!Tb({exact:!0}).test(B)&&Sb(B.codePointAt())&&++N,N>o&&N<=a)M+=B;else if(N===o&&!t&&O!==void 0)M=tC(_);else if(N>=a){M+=tC(_,!0,O);break}}return M}});var rC=Ke((sV,nC)=>{"use strict";var p2=ZD(),Cb=Z_();function r4(i,o,a){if(i.charAt(o)===" ")return o;for(let c=1;c<=3;c++)if(a){if(i.charAt(o+c)===" ")return o+c}else if(i.charAt(o-c)===" ")return o-c;return o}nC.exports=(i,o,a)=>{a=Ht({position:"end",preferTruncationOnSpace:!1},a);let{position:c,space:_,preferTruncationOnSpace:t}=a,O="\u2026",N=1;if(typeof i!="string")throw new TypeError(`Expected \`input\` to be a string, got ${typeof i}`);if(typeof o!="number")throw new TypeError(`Expected \`columns\` to be a number, got ${typeof o}`);if(o<1)return"";if(o===1)return O;let M=Cb(i);if(M<=o)return i;if(c==="start"){if(t){let T=r4(i,M-o+1,!0);return O+p2(i,T,M).trim()}return _===!0&&(O+=" ",N=2),O+p2(i,M-o+N,M)}if(c==="middle"){_===!0&&(O=" "+O+" ",N=3);let T=Math.floor(o/2);if(t){let B=r4(i,T),H=r4(i,M-(o-T)+1,!0);return p2(i,0,B)+O+p2(i,H,M).trim()}return p2(i,0,T)+O+p2(i,M-(o-T)+N,M)}if(c==="end"){if(t){let T=r4(i,o-1);return p2(i,0,T)+O}return _===!0&&(O=" "+O,N=2),p2(i,0,o-N)+O}throw new Error(`Expected \`options.position\` to be either \`start\`, \`middle\` or \`end\`, got ${c}`)}});var e3=Ke(ty=>{"use strict";var iC=ty&&ty.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(ty,"__esModule",{value:!0});var xb=iC(KT()),Ab=iC(rC()),$D={};ty.default=(i,o,a)=>{let c=i+String(o)+String(a);if($D[c])return $D[c];let _=i;if(a==="wrap"&&(_=xb.default(i,o,{trim:!1,hard:!0})),a.startsWith("truncate")){let t="end";a==="truncate-middle"&&(t="middle"),a==="truncate-start"&&(t="start"),_=Ab.default(i,o,{position:t})}return $D[c]=_,_}});var n3=Ke(t3=>{"use strict";Object.defineProperty(t3,"__esModule",{value:!0});var uC=i=>{let o="";if(i.childNodes.length>0)for(let a of i.childNodes){let c="";a.nodeName==="#text"?c=a.nodeValue:((a.nodeName==="ink-text"||a.nodeName==="ink-virtual-text")&&(c=uC(a)),c.length>0&&typeof a.internal_transform=="function"&&(c=a.internal_transform(c))),o+=c}return o};t3.default=uC});var r3=Ke(c0=>{"use strict";var ny=c0&&c0.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(c0,"__esModule",{value:!0});c0.setTextNodeValue=c0.createTextNode=c0.setStyle=c0.setAttribute=c0.removeChildNode=c0.insertBeforeNode=c0.appendChildNode=c0.createNode=c0.TEXT_NAME=void 0;var Rb=ny(eh()),oC=ny(kT()),Ob=ny(LT()),Mb=ny(e3()),kb=ny(n3());c0.TEXT_NAME="#text";c0.createNode=i=>{var o;let a={nodeName:i,style:{},attributes:{},childNodes:[],parentNode:null,yogaNode:i==="ink-virtual-text"?void 0:Rb.default.Node.create()};return i==="ink-text"&&((o=a.yogaNode)===null||o===void 0||o.setMeasureFunc(Lb.bind(null,a))),a};c0.appendChildNode=(i,o)=>{var a;o.parentNode&&c0.removeChildNode(o.parentNode,o),o.parentNode=i,i.childNodes.push(o),o.yogaNode&&((a=i.yogaNode)===null||a===void 0||a.insertChild(o.yogaNode,i.yogaNode.getChildCount())),(i.nodeName==="ink-text"||i.nodeName==="ink-virtual-text")&&i4(i)};c0.insertBeforeNode=(i,o,a)=>{var c,_;o.parentNode&&c0.removeChildNode(o.parentNode,o),o.parentNode=i;let t=i.childNodes.indexOf(a);if(t>=0){i.childNodes.splice(t,0,o),o.yogaNode&&((c=i.yogaNode)===null||c===void 0||c.insertChild(o.yogaNode,t));return}i.childNodes.push(o),o.yogaNode&&((_=i.yogaNode)===null||_===void 0||_.insertChild(o.yogaNode,i.yogaNode.getChildCount())),(i.nodeName==="ink-text"||i.nodeName==="ink-virtual-text")&&i4(i)};c0.removeChildNode=(i,o)=>{var a,c;o.yogaNode&&((c=(a=o.parentNode)===null||a===void 0?void 0:a.yogaNode)===null||c===void 0||c.removeChild(o.yogaNode)),o.parentNode=null;let _=i.childNodes.indexOf(o);_>=0&&i.childNodes.splice(_,1),(i.nodeName==="ink-text"||i.nodeName==="ink-virtual-text")&&i4(i)};c0.setAttribute=(i,o,a)=>{i.attributes[o]=a};c0.setStyle=(i,o)=>{i.style=o,i.yogaNode&&Ob.default(i.yogaNode,o)};c0.createTextNode=i=>{let o={nodeName:"#text",nodeValue:i,yogaNode:void 0,parentNode:null,style:{}};return c0.setTextNodeValue(o,i),o};var Lb=function(i,o){var a,c;let _=i.nodeName==="#text"?i.nodeValue:kb.default(i),t=oC.default(_);if(t.width<=o||t.width>=1&&o>0&&o<1)return t;let O=(c=(a=i.style)===null||a===void 0?void 0:a.textWrap)!==null&&c!==void 0?c:"wrap",N=Mb.default(_,o,O);return oC.default(N)},lC=i=>{var o;if(!(!i||!i.parentNode))return(o=i.yogaNode)!==null&&o!==void 0?o:lC(i.parentNode)},i4=i=>{let o=lC(i);o==null||o.markDirty()};c0.setTextNodeValue=(i,o)=>{typeof o!="string"&&(o=String(o)),i.nodeValue=o,i4(i)}});var th=Ke((dV,sC)=>{"use strict";sC.exports={BINARY_TYPES:["nodebuffer","arraybuffer","fragments"],GUID:"258EAFA5-E914-47DA-95CA-C5AB0DC85B11",kStatusCode:Symbol("status-code"),kWebSocket:Symbol("websocket"),EMPTY_BUFFER:Buffer.alloc(0),NOOP:()=>{}}});var ry=Ke((pV,i3)=>{"use strict";var{EMPTY_BUFFER:Nb}=th();function aC(i,o){if(i.length===0)return Nb;if(i.length===1)return i[0];let a=Buffer.allocUnsafe(o),c=0;for(let _=0;_<i.length;_++){let t=i[_];a.set(t,c),c+=t.length}return c<o?a.slice(0,c):a}function fC(i,o,a,c,_){for(let t=0;t<_;t++)a[c+t]=i[t]^o[t&3]}function cC(i,o){let a=i.length;for(let c=0;c<a;c++)i[c]^=o[c&3]}function dC(i){return i.byteLength===i.buffer.byteLength?i.buffer:i.buffer.slice(i.byteOffset,i.byteOffset+i.byteLength)}function u4(i){if(u4.readOnly=!0,Buffer.isBuffer(i))return i;let o;return i instanceof ArrayBuffer?o=Buffer.from(i):ArrayBuffer.isView(i)?o=Buffer.from(i.buffer,i.byteOffset,i.byteLength):(o=Buffer.from(i),u4.readOnly=!1),o}try{let i=require("bufferutil"),o=i.BufferUtil||i;i3.exports={concat:aC,mask(a,c,_,t,O){O<48?fC(a,c,_,t,O):o.mask(a,c,_,t,O)},toArrayBuffer:dC,toBuffer:u4,unmask(a,c){a.length<32?cC(a,c):o.unmask(a,c)}}}catch(i){i3.exports={concat:aC,mask:fC,toArrayBuffer:dC,toBuffer:u4,unmask:cC}}});var mC=Ke((hV,pC)=>{"use strict";var hC=Symbol("kDone"),u3=Symbol("kRun"),vC=class{constructor(o){this[hC]=()=>{this.pending--,this[u3]()},this.concurrency=o||Infinity,this.jobs=[],this.pending=0}add(o){this.jobs.push(o),this[u3]()}[u3](){if(this.pending!==this.concurrency&&this.jobs.length){let o=this.jobs.shift();this.pending++,o(this[hC])}}};pC.exports=vC});var oy=Ke((vV,gC)=>{"use strict";var iy=require("zlib"),yC=ry(),Fb=mC(),{kStatusCode:_C,NOOP:Pb}=th(),Ib=Buffer.from([0,0,255,255]),o4=Symbol("permessage-deflate"),X1=Symbol("total-length"),uy=Symbol("callback"),h2=Symbol("buffers"),o3=Symbol("error"),l4,EC=class{constructor(o,a,c){if(this._maxPayload=c|0,this._options=o||{},this._threshold=this._options.threshold!==void 0?this._options.threshold:1024,this._isServer=!!a,this._deflate=null,this._inflate=null,this.params=null,!l4){let _=this._options.concurrencyLimit!==void 0?this._options.concurrencyLimit:10;l4=new Fb(_)}}static get extensionName(){return"permessage-deflate"}offer(){let o={};return this._options.serverNoContextTakeover&&(o.server_no_context_takeover=!0),this._options.clientNoContextTakeover&&(o.client_no_context_takeover=!0),this._options.serverMaxWindowBits&&(o.server_max_window_bits=this._options.serverMaxWindowBits),this._options.clientMaxWindowBits?o.client_max_window_bits=this._options.clientMaxWindowBits:this._options.clientMaxWindowBits==null&&(o.client_max_window_bits=!0),o}accept(o){return o=this.normalizeParams(o),this.params=this._isServer?this.acceptAsServer(o):this.acceptAsClient(o),this.params}cleanup(){if(this._inflate&&(this._inflate.close(),this._inflate=null),this._deflate){let o=this._deflate[uy];this._deflate.close(),this._deflate=null,o&&o(new Error("The deflate stream was closed while data was being processed"))}}acceptAsServer(o){let a=this._options,c=o.find(_=>!(a.serverNoContextTakeover===!1&&_.server_no_context_takeover||_.server_max_window_bits&&(a.serverMaxWindowBits===!1||typeof a.serverMaxWindowBits=="number"&&a.serverMaxWindowBits>_.server_max_window_bits)||typeof a.clientMaxWindowBits=="number"&&!_.client_max_window_bits));if(!c)throw new Error("None of the extension offers can be accepted");return a.serverNoContextTakeover&&(c.server_no_context_takeover=!0),a.clientNoContextTakeover&&(c.client_no_context_takeover=!0),typeof a.serverMaxWindowBits=="number"&&(c.server_max_window_bits=a.serverMaxWindowBits),typeof a.clientMaxWindowBits=="number"?c.client_max_window_bits=a.clientMaxWindowBits:(c.client_max_window_bits===!0||a.clientMaxWindowBits===!1)&&delete c.client_max_window_bits,c}acceptAsClient(o){let a=o[0];if(this._options.clientNoContextTakeover===!1&&a.client_no_context_takeover)throw new Error('Unexpected parameter "client_no_context_takeover"');if(!a.client_max_window_bits)typeof this._options.clientMaxWindowBits=="number"&&(a.client_max_window_bits=this._options.clientMaxWindowBits);else if(this._options.clientMaxWindowBits===!1||typeof this._options.clientMaxWindowBits=="number"&&a.client_max_window_bits>this._options.clientMaxWindowBits)throw new Error('Unexpected or invalid parameter "client_max_window_bits"');return a}normalizeParams(o){return o.forEach(a=>{Object.keys(a).forEach(c=>{let _=a[c];if(_.length>1)throw new Error(`Parameter "${c}" must have only a single value`);if(_=_[0],c==="client_max_window_bits"){if(_!==!0){let t=+_;if(!Number.isInteger(t)||t<8||t>15)throw new TypeError(`Invalid value for parameter "${c}": ${_}`);_=t}else if(!this._isServer)throw new TypeError(`Invalid value for parameter "${c}": ${_}`)}else if(c==="server_max_window_bits"){let t=+_;if(!Number.isInteger(t)||t<8||t>15)throw new TypeError(`Invalid value for parameter "${c}": ${_}`);_=t}else if(c==="client_no_context_takeover"||c==="server_no_context_takeover"){if(_!==!0)throw new TypeError(`Invalid value for parameter "${c}": ${_}`)}else throw new Error(`Unknown parameter "${c}"`);a[c]=_})}),o}decompress(o,a,c){l4.add(_=>{this._decompress(o,a,(t,O)=>{_(),c(t,O)})})}compress(o,a,c){l4.add(_=>{this._compress(o,a,(t,O)=>{_(),c(t,O)})})}_decompress(o,a,c){let _=this._isServer?"client":"server";if(!this._inflate){let t=`${_}_max_window_bits`,O=typeof this.params[t]!="number"?iy.Z_DEFAULT_WINDOWBITS:this.params[t];this._inflate=iy.createInflateRaw(Zr(Ht({},this._options.zlibInflateOptions),{windowBits:O})),this._inflate[o4]=this,this._inflate[X1]=0,this._inflate[h2]=[],this._inflate.on("error",Bb),this._inflate.on("data",DC)}this._inflate[uy]=c,this._inflate.write(o),a&&this._inflate.write(Ib),this._inflate.flush(()=>{let t=this._inflate[o3];if(t){this._inflate.close(),this._inflate=null,c(t);return}let O=yC.concat(this._inflate[h2],this._inflate[X1]);this._inflate._readableState.endEmitted?(this._inflate.close(),this._inflate=null):(this._inflate[X1]=0,this._inflate[h2]=[],a&&this.params[`${_}_no_context_takeover`]&&this._inflate.reset()),c(null,O)})}_compress(o,a,c){let _=this._isServer?"server":"client";if(!this._deflate){let t=`${_}_max_window_bits`,O=typeof this.params[t]!="number"?iy.Z_DEFAULT_WINDOWBITS:this.params[t];this._deflate=iy.createDeflateRaw(Zr(Ht({},this._options.zlibDeflateOptions),{windowBits:O})),this._deflate[X1]=0,this._deflate[h2]=[],this._deflate.on("error",Pb),this._deflate.on("data",bb)}this._deflate[uy]=c,this._deflate.write(o),this._deflate.flush(iy.Z_SYNC_FLUSH,()=>{if(!this._deflate)return;let t=yC.concat(this._deflate[h2],this._deflate[X1]);a&&(t=t.slice(0,t.length-4)),this._deflate[uy]=null,this._deflate[X1]=0,this._deflate[h2]=[],a&&this.params[`${_}_no_context_takeover`]&&this._deflate.reset(),c(null,t)})}};gC.exports=EC;function bb(i){this[h2].push(i),this[X1]+=i.length}function DC(i){if(this[X1]+=i.length,this[o4]._maxPayload<1||this[X1]<=this[o4]._maxPayload){this[h2].push(i);return}this[o3]=new RangeError("Max payload size exceeded"),this[o3][_C]=1009,this.removeListener("data",DC),this.reset()}function Bb(i){this[o4]._inflate=null,i[_C]=1007,this[uy](i)}});var s3=Ke((mV,l3)=>{"use strict";function wC(i){return i>=1e3&&i<=1014&&i!==1004&&i!==1005&&i!==1006||i>=3e3&&i<=4999}function SC(i){let o=i.length,a=0;for(;a<o;)if((i[a]&128)==0)a++;else if((i[a]&224)==192){if(a+1===o||(i[a+1]&192)!=128||(i[a]&254)==192)return!1;a+=2}else if((i[a]&240)==224){if(a+2>=o||(i[a+1]&192)!=128||(i[a+2]&192)!=128||i[a]===224&&(i[a+1]&224)==128||i[a]===237&&(i[a+1]&224)==160)return!1;a+=3}else if((i[a]&248)==240){if(a+3>=o||(i[a+1]&192)!=128||(i[a+2]&192)!=128||(i[a+3]&192)!=128||i[a]===240&&(i[a+1]&240)==128||i[a]===244&&i[a+1]>143||i[a]>244)return!1;a+=4}else return!1;return!0}try{let i=require("utf-8-validate");typeof i=="object"&&(i=i.Validation.isValidUTF8),l3.exports={isValidStatusCode:wC,isValidUTF8(o){return o.length<150?SC(o):i(o)}}}catch(i){l3.exports={isValidStatusCode:wC,isValidUTF8:SC}}});var c3=Ke((gV,TC)=>{"use strict";var{Writable:Ub}=require("stream"),CC=oy(),{BINARY_TYPES:jb,EMPTY_BUFFER:zb,kStatusCode:Hb,kWebSocket:qb}=th(),{concat:a3,toArrayBuffer:Wb,unmask:Vb}=ry(),{isValidStatusCode:Gb,isValidUTF8:xC}=s3(),ly=0,AC=1,RC=2,OC=3,f3=4,Yb=5,MC=class extends Ub{constructor(o,a,c,_){super();this._binaryType=o||jb[0],this[qb]=void 0,this._extensions=a||{},this._isServer=!!c,this._maxPayload=_|0,this._bufferedBytes=0,this._buffers=[],this._compressed=!1,this._payloadLength=0,this._mask=void 0,this._fragmented=0,this._masked=!1,this._fin=!1,this._opcode=0,this._totalPayloadLength=0,this._messageLength=0,this._fragments=[],this._state=ly,this._loop=!1}_write(o,a,c){if(this._opcode===8&&this._state==ly)return c();this._bufferedBytes+=o.length,this._buffers.push(o),this.startLoop(c)}consume(o){if(this._bufferedBytes-=o,o===this._buffers[0].length)return this._buffers.shift();if(o<this._buffers[0].length){let c=this._buffers[0];return this._buffers[0]=c.slice(o),c.slice(0,o)}let a=Buffer.allocUnsafe(o);do{let c=this._buffers[0],_=a.length-o;o>=c.length?a.set(this._buffers.shift(),_):(a.set(new Uint8Array(c.buffer,c.byteOffset,o),_),this._buffers[0]=c.slice(o)),o-=c.length}while(o>0);return a}startLoop(o){let a;this._loop=!0;do switch(this._state){case ly:a=this.getInfo();break;case AC:a=this.getPayloadLength16();break;case RC:a=this.getPayloadLength64();break;case OC:this.getMask();break;case f3:a=this.getData(o);break;default:this._loop=!1;return}while(this._loop);o(a)}getInfo(){if(this._bufferedBytes<2){this._loop=!1;return}let o=this.consume(2);if((o[0]&48)!=0)return this._loop=!1,Ko(RangeError,"RSV2 and RSV3 must be clear",!0,1002);let a=(o[0]&64)==64;if(a&&!this._extensions[CC.extensionName])return this._loop=!1,Ko(RangeError,"RSV1 must be clear",!0,1002);if(this._fin=(o[0]&128)==128,this._opcode=o[0]&15,this._payloadLength=o[1]&127,this._opcode===0){if(a)return this._loop=!1,Ko(RangeError,"RSV1 must be clear",!0,1002);if(!this._fragmented)return this._loop=!1,Ko(RangeError,"invalid opcode 0",!0,1002);this._opcode=this._fragmented}else if(this._opcode===1||this._opcode===2){if(this._fragmented)return this._loop=!1,Ko(RangeError,`invalid opcode ${this._opcode}`,!0,1002);this._compressed=a}else if(this._opcode>7&&this._opcode<11){if(!this._fin)return this._loop=!1,Ko(RangeError,"FIN must be set",!0,1002);if(a)return this._loop=!1,Ko(RangeError,"RSV1 must be clear",!0,1002);if(this._payloadLength>125)return this._loop=!1,Ko(RangeError,`invalid payload length ${this._payloadLength}`,!0,1002)}else return this._loop=!1,Ko(RangeError,`invalid opcode ${this._opcode}`,!0,1002);if(!this._fin&&!this._fragmented&&(this._fragmented=this._opcode),this._masked=(o[1]&128)==128,this._isServer){if(!this._masked)return this._loop=!1,Ko(RangeError,"MASK must be set",!0,1002)}else if(this._masked)return this._loop=!1,Ko(RangeError,"MASK must be clear",!0,1002);if(this._payloadLength===126)this._state=AC;else if(this._payloadLength===127)this._state=RC;else return this.haveLength()}getPayloadLength16(){if(this._bufferedBytes<2){this._loop=!1;return}return this._payloadLength=this.consume(2).readUInt16BE(0),this.haveLength()}getPayloadLength64(){if(this._bufferedBytes<8){this._loop=!1;return}let o=this.consume(8),a=o.readUInt32BE(0);return a>Math.pow(2,53-32)-1?(this._loop=!1,Ko(RangeError,"Unsupported WebSocket frame: payload length > 2^53 - 1",!1,1009)):(this._payloadLength=a*Math.pow(2,32)+o.readUInt32BE(4),this.haveLength())}haveLength(){if(this._payloadLength&&this._opcode<8&&(this._totalPayloadLength+=this._payloadLength,this._totalPayloadLength>this._maxPayload&&this._maxPayload>0))return this._loop=!1,Ko(RangeError,"Max payload size exceeded",!1,1009);this._masked?this._state=OC:this._state=f3}getMask(){if(this._bufferedBytes<4){this._loop=!1;return}this._mask=this.consume(4),this._state=f3}getData(o){let a=zb;if(this._payloadLength){if(this._bufferedBytes<this._payloadLength){this._loop=!1;return}a=this.consume(this._payloadLength),this._masked&&Vb(a,this._mask)}if(this._opcode>7)return this.controlMessage(a);if(this._compressed){this._state=Yb,this.decompress(a,o);return}return a.length&&(this._messageLength=this._totalPayloadLength,this._fragments.push(a)),this.dataMessage()}decompress(o,a){this._extensions[CC.extensionName].decompress(o,this._fin,(_,t)=>{if(_)return a(_);if(t.length){if(this._messageLength+=t.length,this._messageLength>this._maxPayload&&this._maxPayload>0)return a(Ko(RangeError,"Max payload size exceeded",!1,1009));this._fragments.push(t)}let O=this.dataMessage();if(O)return a(O);this.startLoop(a)})}dataMessage(){if(this._fin){let o=this._messageLength,a=this._fragments;if(this._totalPayloadLength=0,this._messageLength=0,this._fragmented=0,this._fragments=[],this._opcode===2){let c;this._binaryType==="nodebuffer"?c=a3(a,o):this._binaryType==="arraybuffer"?c=Wb(a3(a,o)):c=a,this.emit("message",c)}else{let c=a3(a,o);if(!xC(c))return this._loop=!1,Ko(Error,"invalid UTF-8 sequence",!0,1007);this.emit("message",c.toString())}}this._state=ly}controlMessage(o){if(this._opcode===8)if(this._loop=!1,o.length===0)this.emit("conclude",1005,""),this.end();else{if(o.length===1)return Ko(RangeError,"invalid payload length 1",!0,1002);{let a=o.readUInt16BE(0);if(!Gb(a))return Ko(RangeError,`invalid status code ${a}`,!0,1002);let c=o.slice(2);if(!xC(c))return Ko(Error,"invalid UTF-8 sequence",!0,1007);this.emit("conclude",a,c.toString()),this.end()}}else this._opcode===9?this.emit("ping",o):this.emit("pong",o);this._state=ly}};TC.exports=MC;function Ko(i,o,a,c){let _=new i(a?`Invalid WebSocket frame: ${o}`:o);return Error.captureStackTrace(_,Ko),_[Hb]=c,_}});var d3=Ke((yV,kC)=>{"use strict";var{randomFillSync:Kb}=require("crypto"),LC=oy(),{EMPTY_BUFFER:Xb}=th(),{isValidStatusCode:Qb}=s3(),{mask:NC,toBuffer:Q1}=ry(),nh=Buffer.alloc(4),J1=class{constructor(o,a){this._extensions=a||{},this._socket=o,this._firstFragment=!0,this._compress=!1,this._bufferedBytes=0,this._deflating=!1,this._queue=[]}static frame(o,a){let c=a.mask&&a.readOnly,_=a.mask?6:2,t=o.length;o.length>=65536?(_+=8,t=127):o.length>125&&(_+=2,t=126);let O=Buffer.allocUnsafe(c?o.length+_:_);return O[0]=a.fin?a.opcode|128:a.opcode,a.rsv1&&(O[0]|=64),O[1]=t,t===126?O.writeUInt16BE(o.length,2):t===127&&(O.writeUInt32BE(0,2),O.writeUInt32BE(o.length,6)),a.mask?(Kb(nh,0,4),O[1]|=128,O[_-4]=nh[0],O[_-3]=nh[1],O[_-2]=nh[2],O[_-1]=nh[3],c?(NC(o,nh,O,_,o.length),[O]):(NC(o,nh,o,0,o.length),[O,o])):[O,o]}close(o,a,c,_){let t;if(o===void 0)t=Xb;else{if(typeof o!="number"||!Qb(o))throw new TypeError("First argument must be a valid error code number");if(a===void 0||a==="")t=Buffer.allocUnsafe(2),t.writeUInt16BE(o,0);else{let O=Buffer.byteLength(a);if(O>123)throw new RangeError("The message must not be greater than 123 bytes");t=Buffer.allocUnsafe(2+O),t.writeUInt16BE(o,0),t.write(a,2)}}this._deflating?this.enqueue([this.doClose,t,c,_]):this.doClose(t,c,_)}doClose(o,a,c){this.sendFrame(J1.frame(o,{fin:!0,rsv1:!1,opcode:8,mask:a,readOnly:!1}),c)}ping(o,a,c){let _=Q1(o);if(_.length>125)throw new RangeError("The data size must not be greater than 125 bytes");this._deflating?this.enqueue([this.doPing,_,a,Q1.readOnly,c]):this.doPing(_,a,Q1.readOnly,c)}doPing(o,a,c,_){this.sendFrame(J1.frame(o,{fin:!0,rsv1:!1,opcode:9,mask:a,readOnly:c}),_)}pong(o,a,c){let _=Q1(o);if(_.length>125)throw new RangeError("The data size must not be greater than 125 bytes");this._deflating?this.enqueue([this.doPong,_,a,Q1.readOnly,c]):this.doPong(_,a,Q1.readOnly,c)}doPong(o,a,c,_){this.sendFrame(J1.frame(o,{fin:!0,rsv1:!1,opcode:10,mask:a,readOnly:c}),_)}send(o,a,c){let _=Q1(o),t=this._extensions[LC.extensionName],O=a.binary?2:1,N=a.compress;if(this._firstFragment?(this._firstFragment=!1,N&&t&&(N=_.length>=t._threshold),this._compress=N):(N=!1,O=0),a.fin&&(this._firstFragment=!0),t){let M={fin:a.fin,rsv1:N,opcode:O,mask:a.mask,readOnly:Q1.readOnly};this._deflating?this.enqueue([this.dispatch,_,this._compress,M,c]):this.dispatch(_,this._compress,M,c)}else this.sendFrame(J1.frame(_,{fin:a.fin,rsv1:!1,opcode:O,mask:a.mask,readOnly:Q1.readOnly}),c)}dispatch(o,a,c,_){if(!a){this.sendFrame(J1.frame(o,c),_);return}let t=this._extensions[LC.extensionName];this._bufferedBytes+=o.length,this._deflating=!0,t.compress(o,c.fin,(O,N)=>{if(this._socket.destroyed){let M=new Error("The socket was closed while data was being compressed");typeof _=="function"&&_(M);for(let T=0;T<this._queue.length;T++){let B=this._queue[T][4];typeof B=="function"&&B(M)}return}this._bufferedBytes-=o.length,this._deflating=!1,c.readOnly=!1,this.sendFrame(J1.frame(N,c),_),this.dequeue()})}dequeue(){for(;!this._deflating&&this._queue.length;){let o=this._queue.shift();this._bufferedBytes-=o[1].length,Reflect.apply(o[0],this,o.slice(1))}}enqueue(o){this._bufferedBytes+=o[1].length,this._queue.push(o)}sendFrame(o,a){o.length===2?(this._socket.cork(),this._socket.write(o[0]),this._socket.write(o[1],a),this._socket.uncork()):this._socket.write(o[0],a)}};kC.exports=J1});var UC=Ke((_V,FC)=>{"use strict";var sy=class{constructor(o,a){this.target=a,this.type=o}},PC=class extends sy{constructor(o,a){super("message",a);this.data=o}},IC=class extends sy{constructor(o,a,c){super("close",c);this.wasClean=c._closeFrameReceived&&c._closeFrameSent,this.reason=a,this.code=o}},bC=class extends sy{constructor(o){super("open",o)}},BC=class extends sy{constructor(o,a){super("error",a);this.message=o.message,this.error=o}},Jb={addEventListener(i,o,a){if(typeof o!="function")return;function c(M){o.call(this,new PC(M,this))}function _(M,T){o.call(this,new IC(M,T,this))}function t(M){o.call(this,new BC(M,this))}function O(){o.call(this,new bC(this))}let N=a&&a.once?"once":"on";i==="message"?(c._listener=o,this[N](i,c)):i==="close"?(_._listener=o,this[N](i,_)):i==="error"?(t._listener=o,this[N](i,t)):i==="open"?(O._listener=o,this[N](i,O)):this[N](i,o)},removeEventListener(i,o){let a=this.listeners(i);for(let c=0;c<a.length;c++)(a[c]===o||a[c]._listener===o)&&this.removeListener(i,a[c])}};FC.exports=Jb});var p3=Ke((EV,jC)=>{"use strict";var ay=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,1,1,1,1,0,0,1,1,0,1,1,0,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,0,1,0];function zc(i,o,a){i[o]===void 0?i[o]=[a]:i[o].push(a)}function Zb(i){let o=Object.create(null);if(i===void 0||i==="")return o;let a=Object.create(null),c=!1,_=!1,t=!1,O,N,M=-1,T=-1,B=0;for(;B<i.length;B++){let q=i.charCodeAt(B);if(O===void 0)if(T===-1&&ay[q]===1)M===-1&&(M=B);else if(q===32||q===9)T===-1&&M!==-1&&(T=B);else if(q===59||q===44){if(M===-1)throw new SyntaxError(`Unexpected character at index ${B}`);T===-1&&(T=B);let ne=i.slice(M,T);q===44?(zc(o,ne,a),a=Object.create(null)):O=ne,M=T=-1}else throw new SyntaxError(`Unexpected character at index ${B}`);else if(N===void 0)if(T===-1&&ay[q]===1)M===-1&&(M=B);else if(q===32||q===9)T===-1&&M!==-1&&(T=B);else if(q===59||q===44){if(M===-1)throw new SyntaxError(`Unexpected character at index ${B}`);T===-1&&(T=B),zc(a,i.slice(M,T),!0),q===44&&(zc(o,O,a),a=Object.create(null),O=void 0),M=T=-1}else if(q===61&&M!==-1&&T===-1)N=i.slice(M,B),M=T=-1;else throw new SyntaxError(`Unexpected character at index ${B}`);else if(_){if(ay[q]!==1)throw new SyntaxError(`Unexpected character at index ${B}`);M===-1?M=B:c||(c=!0),_=!1}else if(t)if(ay[q]===1)M===-1&&(M=B);else if(q===34&&M!==-1)t=!1,T=B;else if(q===92)_=!0;else throw new SyntaxError(`Unexpected character at index ${B}`);else if(q===34&&i.charCodeAt(B-1)===61)t=!0;else if(T===-1&&ay[q]===1)M===-1&&(M=B);else if(M!==-1&&(q===32||q===9))T===-1&&(T=B);else if(q===59||q===44){if(M===-1)throw new SyntaxError(`Unexpected character at index ${B}`);T===-1&&(T=B);let ne=i.slice(M,T);c&&(ne=ne.replace(/\\/g,""),c=!1),zc(a,N,ne),q===44&&(zc(o,O,a),a=Object.create(null),O=void 0),N=void 0,M=T=-1}else throw new SyntaxError(`Unexpected character at index ${B}`)}if(M===-1||t)throw new SyntaxError("Unexpected end of input");T===-1&&(T=B);let H=i.slice(M,T);return O===void 0?zc(o,H,a):(N===void 0?zc(a,H,!0):c?zc(a,N,H.replace(/\\/g,"")):zc(a,N,H),zc(o,O,a)),o}function $b(i){return Object.keys(i).map(o=>{let a=i[o];return Array.isArray(a)||(a=[a]),a.map(c=>[o].concat(Object.keys(c).map(_=>{let t=c[_];return Array.isArray(t)||(t=[t]),t.map(O=>O===!0?_:`${_}=${O}`).join("; ")})).join("; ")).join(", ")}).join(", ")}jC.exports={format:$b,parse:Zb}});var y3=Ke((DV,zC)=>{"use strict";var eB=require("events"),tB=require("https"),nB=require("http"),HC=require("net"),rB=require("tls"),{randomBytes:iB,createHash:uB}=require("crypto"),{URL:h3}=require("url"),v2=oy(),oB=c3(),lB=d3(),{BINARY_TYPES:qC,EMPTY_BUFFER:v3,GUID:sB,kStatusCode:aB,kWebSocket:na,NOOP:WC}=th(),{addEventListener:fB,removeEventListener:cB}=UC(),{format:dB,parse:pB}=p3(),{toBuffer:hB}=ry(),VC=["CONNECTING","OPEN","CLOSING","CLOSED"],m3=[8,13],vB=30*1e3,Gi=class extends eB{constructor(o,a,c){super();this._binaryType=qC[0],this._closeCode=1006,this._closeFrameReceived=!1,this._closeFrameSent=!1,this._closeMessage="",this._closeTimer=null,this._extensions={},this._protocol="",this._readyState=Gi.CONNECTING,this._receiver=null,this._sender=null,this._socket=null,o!==null?(this._bufferedAmount=0,this._isServer=!1,this._redirects=0,Array.isArray(a)?a=a.join(", "):typeof a=="object"&&a!==null&&(c=a,a=void 0),GC(this,o,a,c)):this._isServer=!0}get binaryType(){return this._binaryType}set binaryType(o){!qC.includes(o)||(this._binaryType=o,this._receiver&&(this._receiver._binaryType=o))}get bufferedAmount(){return this._socket?this._socket._writableState.length+this._sender._bufferedBytes:this._bufferedAmount}get extensions(){return Object.keys(this._extensions).join()}get protocol(){return this._protocol}get readyState(){return this._readyState}get url(){return this._url}setSocket(o,a,c){let _=new oB(this.binaryType,this._extensions,this._isServer,c);this._sender=new lB(o,this._extensions),this._receiver=_,this._socket=o,_[na]=this,o[na]=this,_.on("conclude",mB),_.on("drain",gB),_.on("error",yB),_.on("message",_B),_.on("ping",EB),_.on("pong",DB),o.setTimeout(0),o.setNoDelay(),a.length>0&&o.unshift(a),o.on("close",YC),o.on("data",s4),o.on("end",KC),o.on("error",XC),this._readyState=Gi.OPEN,this.emit("open")}emitClose(){if(!this._socket){this._readyState=Gi.CLOSED,this.emit("close",this._closeCode,this._closeMessage);return}this._extensions[v2.extensionName]&&this._extensions[v2.extensionName].cleanup(),this._receiver.removeAllListeners(),this._readyState=Gi.CLOSED,this.emit("close",this._closeCode,this._closeMessage)}close(o,a){if(this.readyState!==Gi.CLOSED){if(this.readyState===Gi.CONNECTING){let c="WebSocket was closed before the connection was established";return Z1(this,this._req,c)}if(this.readyState===Gi.CLOSING){this._closeFrameSent&&this._closeFrameReceived&&this._socket.end();return}this._readyState=Gi.CLOSING,this._sender.close(o,a,!this._isServer,c=>{c||(this._closeFrameSent=!0,this._closeFrameReceived&&this._socket.end())}),this._closeTimer=setTimeout(this._socket.destroy.bind(this._socket),vB)}}ping(o,a,c){if(this.readyState===Gi.CONNECTING)throw new Error("WebSocket is not open: readyState 0 (CONNECTING)");if(typeof o=="function"?(c=o,o=a=void 0):typeof a=="function"&&(c=a,a=void 0),typeof o=="number"&&(o=o.toString()),this.readyState!==Gi.OPEN){g3(this,o,c);return}a===void 0&&(a=!this._isServer),this._sender.ping(o||v3,a,c)}pong(o,a,c){if(this.readyState===Gi.CONNECTING)throw new Error("WebSocket is not open: readyState 0 (CONNECTING)");if(typeof o=="function"?(c=o,o=a=void 0):typeof a=="function"&&(c=a,a=void 0),typeof o=="number"&&(o=o.toString()),this.readyState!==Gi.OPEN){g3(this,o,c);return}a===void 0&&(a=!this._isServer),this._sender.pong(o||v3,a,c)}send(o,a,c){if(this.readyState===Gi.CONNECTING)throw new Error("WebSocket is not open: readyState 0 (CONNECTING)");if(typeof a=="function"&&(c=a,a={}),typeof o=="number"&&(o=o.toString()),this.readyState!==Gi.OPEN){g3(this,o,c);return}let _=Ht({binary:typeof o!="string",mask:!this._isServer,compress:!0,fin:!0},a);this._extensions[v2.extensionName]||(_.compress=!1),this._sender.send(o||v3,_,c)}terminate(){if(this.readyState!==Gi.CLOSED){if(this.readyState===Gi.CONNECTING){let o="WebSocket was closed before the connection was established";return Z1(this,this._req,o)}this._socket&&(this._readyState=Gi.CLOSING,this._socket.destroy())}}};VC.forEach((i,o)=>{let a={enumerable:!0,value:o};Object.defineProperty(Gi.prototype,i,a),Object.defineProperty(Gi,i,a)});["binaryType","bufferedAmount","extensions","protocol","readyState","url"].forEach(i=>{Object.defineProperty(Gi.prototype,i,{enumerable:!0})});["open","error","close","message"].forEach(i=>{Object.defineProperty(Gi.prototype,`on${i}`,{configurable:!0,enumerable:!0,get(){let o=this.listeners(i);for(let a=0;a<o.length;a++)if(o[a]._listener)return o[a]._listener},set(o){let a=this.listeners(i);for(let c=0;c<a.length;c++)a[c]._listener&&this.removeListener(i,a[c]);this.addEventListener(i,o)}})});Gi.prototype.addEventListener=fB;Gi.prototype.removeEventListener=cB;zC.exports=Gi;function GC(i,o,a,c){let _=Zr(Ht({protocolVersion:m3[1],maxPayload:100*1024*1024,perMessageDeflate:!0,followRedirects:!1,maxRedirects:10},c),{createConnection:void 0,socketPath:void 0,hostname:void 0,protocol:void 0,timeout:void 0,method:void 0,host:void 0,path:void 0,port:void 0});if(!m3.includes(_.protocolVersion))throw new RangeError(`Unsupported protocol version: ${_.protocolVersion} (supported versions: ${m3.join(", ")})`);let t;o instanceof h3?(t=o,i._url=o.href):(t=new h3(o),i._url=o);let O=t.protocol==="ws+unix:";if(!t.host&&(!O||!t.pathname))throw new Error(`Invalid URL: ${i.url}`);let N=t.protocol==="wss:"||t.protocol==="https:",M=N?443:80,T=iB(16).toString("base64"),B=N?tB.get:nB.get,H;if(_.createConnection=N?SB:wB,_.defaultPort=_.defaultPort||M,_.port=t.port||M,_.host=t.hostname.startsWith("[")?t.hostname.slice(1,-1):t.hostname,_.headers=Ht({"Sec-WebSocket-Version":_.protocolVersion,"Sec-WebSocket-Key":T,Connection:"Upgrade",Upgrade:"websocket"},_.headers),_.path=t.pathname+t.search,_.timeout=_.handshakeTimeout,_.perMessageDeflate&&(H=new v2(_.perMessageDeflate!==!0?_.perMessageDeflate:{},!1,_.maxPayload),_.headers["Sec-WebSocket-Extensions"]=dB({[v2.extensionName]:H.offer()})),a&&(_.headers["Sec-WebSocket-Protocol"]=a),_.origin&&(_.protocolVersion<13?_.headers["Sec-WebSocket-Origin"]=_.origin:_.headers.Origin=_.origin),(t.username||t.password)&&(_.auth=`${t.username}:${t.password}`),O){let ne=_.path.split(":");_.socketPath=ne[0],_.path=ne[1]}let q=i._req=B(_);_.timeout&&q.on("timeout",()=>{Z1(i,q,"Opening handshake has timed out")}),q.on("error",ne=>{q===null||q.aborted||(q=i._req=null,i._readyState=Gi.CLOSING,i.emit("error",ne),i.emitClose())}),q.on("response",ne=>{let m=ne.headers.location,he=ne.statusCode;if(m&&_.followRedirects&&he>=300&&he<400){if(++i._redirects>_.maxRedirects){Z1(i,q,"Maximum redirects exceeded");return}q.abort();let De=new h3(m,o);GC(i,De,a,c)}else i.emit("unexpected-response",q,ne)||Z1(i,q,`Unexpected server response: ${ne.statusCode}`)}),q.on("upgrade",(ne,m,he)=>{if(i.emit("upgrade",ne),i.readyState!==Gi.CONNECTING)return;q=i._req=null;let De=uB("sha1").update(T+sB).digest("base64");if(ne.headers["sec-websocket-accept"]!==De){Z1(i,m,"Invalid Sec-WebSocket-Accept header");return}let se=ne.headers["sec-websocket-protocol"],fe=(a||"").split(/, */),_e;if(!a&&se?_e="Server sent a subprotocol but none was requested":a&&!se?_e="Server sent no subprotocol":se&&!fe.includes(se)&&(_e="Server sent an invalid subprotocol"),_e){Z1(i,m,_e);return}if(se&&(i._protocol=se),H)try{let ce=pB(ne.headers["sec-websocket-extensions"]);ce[v2.extensionName]&&(H.accept(ce[v2.extensionName]),i._extensions[v2.extensionName]=H)}catch(ce){Z1(i,m,"Invalid Sec-WebSocket-Extensions header");return}i.setSocket(m,he,_.maxPayload)})}function wB(i){return i.path=i.socketPath,HC.connect(i)}function SB(i){return i.path=void 0,!i.servername&&i.servername!==""&&(i.servername=HC.isIP(i.host)?"":i.host),rB.connect(i)}function Z1(i,o,a){i._readyState=Gi.CLOSING;let c=new Error(a);Error.captureStackTrace(c,Z1),o.setHeader?(o.abort(),o.socket&&!o.socket.destroyed&&o.socket.destroy(),o.once("abort",i.emitClose.bind(i)),i.emit("error",c)):(o.destroy(c),o.once("error",i.emit.bind(i,"error")),o.once("close",i.emitClose.bind(i)))}function g3(i,o,a){if(o){let c=hB(o).length;i._socket?i._sender._bufferedBytes+=c:i._bufferedAmount+=c}if(a){let c=new Error(`WebSocket is not open: readyState ${i.readyState} (${VC[i.readyState]})`);a(c)}}function mB(i,o){let a=this[na];a._socket.removeListener("data",s4),a._socket.resume(),a._closeFrameReceived=!0,a._closeMessage=o,a._closeCode=i,i===1005?a.close():a.close(i,o)}function gB(){this[na]._socket.resume()}function yB(i){let o=this[na];o._socket.removeListener("data",s4),o._readyState=Gi.CLOSING,o._closeCode=i[aB],o.emit("error",i),o._socket.destroy()}function QC(){this[na].emitClose()}function _B(i){this[na].emit("message",i)}function EB(i){let o=this[na];o.pong(i,!o._isServer,WC),o.emit("ping",i)}function DB(i){this[na].emit("pong",i)}function YC(){let i=this[na];this.removeListener("close",YC),this.removeListener("end",KC),i._readyState=Gi.CLOSING,i._socket.read(),i._receiver.end(),this.removeListener("data",s4),this[na]=void 0,clearTimeout(i._closeTimer),i._receiver._writableState.finished||i._receiver._writableState.errorEmitted?i.emitClose():(i._receiver.on("error",QC),i._receiver.on("finish",QC))}function s4(i){this[na]._receiver.write(i)||this.pause()}function KC(){let i=this[na];i._readyState=Gi.CLOSING,i._receiver.end(),this.end()}function XC(){let i=this[na];this.removeListener("error",XC),this.on("error",WC),i&&(i._readyState=Gi.CLOSING,this.destroy())}});var e6=Ke((wV,JC)=>{"use strict";var{Duplex:TB}=require("stream");function ZC(i){i.emit("close")}function CB(){!this.destroyed&&this._writableState.finished&&this.destroy()}function $C(i){this.removeListener("error",$C),this.destroy(),this.listenerCount("error")===0&&this.emit("error",i)}function xB(i,o){let a=!0;function c(){a&&i._socket.resume()}i.readyState===i.CONNECTING?i.once("open",function(){i._receiver.removeAllListeners("drain"),i._receiver.on("drain",c)}):(i._receiver.removeAllListeners("drain"),i._receiver.on("drain",c));let _=new TB(Zr(Ht({},o),{autoDestroy:!1,emitClose:!1,objectMode:!1,writableObjectMode:!1}));return i.on("message",function(O){_.push(O)||(a=!1,i._socket.pause())}),i.once("error",function(O){_.destroyed||_.destroy(O)}),i.once("close",function(){_.destroyed||_.push(null)}),_._destroy=function(t,O){if(i.readyState===i.CLOSED){O(t),process.nextTick(ZC,_);return}let N=!1;i.once("error",function(T){N=!0,O(T)}),i.once("close",function(){N||O(t),process.nextTick(ZC,_)}),i.terminate()},_._final=function(t){if(i.readyState===i.CONNECTING){i.once("open",function(){_._final(t)});return}i._socket!==null&&(i._socket._writableState.finished?(t(),_._readableState.endEmitted&&_.destroy()):(i._socket.once("finish",function(){t()}),i.close()))},_._read=function(){i.readyState===i.OPEN&&!a&&(a=!0,i._receiver._writableState.needDrain||i._socket.resume())},_._write=function(t,O,N){if(i.readyState===i.CONNECTING){i.once("open",function(){_._write(t,O,N)});return}i.send(t,N)},_.on("end",CB),_.on("error",$C),_}JC.exports=xB});var r6=Ke((SV,t6)=>{"use strict";var AB=require("events"),{createHash:RB}=require("crypto"),{createServer:OB,STATUS_CODES:_3}=require("http"),rh=oy(),MB=y3(),{format:kB,parse:LB}=p3(),{GUID:NB,kWebSocket:FB}=th(),PB=/^[+/0-9A-Za-z]{22}==$/,n6=class extends AB{constructor(o,a){super();if(o=Ht({maxPayload:100*1024*1024,perMessageDeflate:!1,handleProtocols:null,clientTracking:!0,verifyClient:null,noServer:!1,backlog:null,server:null,host:null,path:null,port:null},o),o.port==null&&!o.server&&!o.noServer)throw new TypeError('One of the "port", "server", or "noServer" options must be specified');if(o.port!=null?(this._server=OB((c,_)=>{let t=_3[426];_.writeHead(426,{"Content-Length":t.length,"Content-Type":"text/plain"}),_.end(t)}),this._server.listen(o.port,o.host,o.backlog,a)):o.server&&(this._server=o.server),this._server){let c=this.emit.bind(this,"connection");this._removeListeners=IB(this._server,{listening:this.emit.bind(this,"listening"),error:this.emit.bind(this,"error"),upgrade:(_,t,O)=>{this.handleUpgrade(_,t,O,c)}})}o.perMessageDeflate===!0&&(o.perMessageDeflate={}),o.clientTracking&&(this.clients=new Set),this.options=o}address(){if(this.options.noServer)throw new Error('The server is operating in "noServer" mode');return this._server?this._server.address():null}close(o){if(o&&this.once("close",o),this.clients)for(let c of this.clients)c.terminate();let a=this._server;if(a&&(this._removeListeners(),this._removeListeners=this._server=null,this.options.port!=null)){a.close(()=>this.emit("close"));return}process.nextTick(bB,this)}shouldHandle(o){if(this.options.path){let a=o.url.indexOf("?");if((a!==-1?o.url.slice(0,a):o.url)!==this.options.path)return!1}return!0}handleUpgrade(o,a,c,_){a.on("error",E3);let t=o.headers["sec-websocket-key"]!==void 0?o.headers["sec-websocket-key"].trim():!1,O=+o.headers["sec-websocket-version"],N={};if(o.method!=="GET"||o.headers.upgrade.toLowerCase()!=="websocket"||!t||!PB.test(t)||O!==8&&O!==13||!this.shouldHandle(o))return a4(a,400);if(this.options.perMessageDeflate){let M=new rh(this.options.perMessageDeflate,!0,this.options.maxPayload);try{let T=LB(o.headers["sec-websocket-extensions"]);T[rh.extensionName]&&(M.accept(T[rh.extensionName]),N[rh.extensionName]=M)}catch(T){return a4(a,400)}}if(this.options.verifyClient){let M={origin:o.headers[`${O===8?"sec-websocket-origin":"origin"}`],secure:!!(o.socket.authorized||o.socket.encrypted),req:o};if(this.options.verifyClient.length===2){this.options.verifyClient(M,(T,B,H,q)=>{if(!T)return a4(a,B||401,H,q);this.completeUpgrade(t,N,o,a,c,_)});return}if(!this.options.verifyClient(M))return a4(a,401)}this.completeUpgrade(t,N,o,a,c,_)}completeUpgrade(o,a,c,_,t,O){if(!_.readable||!_.writable)return _.destroy();if(_[FB])throw new Error("server.handleUpgrade() was called more than once with the same socket, possibly due to a misconfiguration");let N=RB("sha1").update(o+NB).digest("base64"),M=["HTTP/1.1 101 Switching Protocols","Upgrade: websocket","Connection: Upgrade",`Sec-WebSocket-Accept: ${N}`],T=new MB(null),B=c.headers["sec-websocket-protocol"];if(B&&(B=B.split(",").map(BB),this.options.handleProtocols?B=this.options.handleProtocols(B,c):B=B[0],B&&(M.push(`Sec-WebSocket-Protocol: ${B}`),T._protocol=B)),a[rh.extensionName]){let H=a[rh.extensionName].params,q=kB({[rh.extensionName]:[H]});M.push(`Sec-WebSocket-Extensions: ${q}`),T._extensions=a}this.emit("headers",M,c),_.write(M.concat(`\r
-`).join(`\r
-`)),_.removeListener("error",E3),T.setSocket(_,t,this.options.maxPayload),this.clients&&(this.clients.add(T),T.on("close",()=>this.clients.delete(T))),O(T,c)}};t6.exports=n6;function IB(i,o){for(let a of Object.keys(o))i.on(a,o[a]);return function(){for(let c of Object.keys(o))i.removeListener(c,o[c])}}function bB(i){i.emit("close")}function E3(){this.destroy()}function a4(i,o,a,c){i.writable&&(a=a||_3[o],c=Ht({Connection:"close","Content-Type":"text/html","Content-Length":Buffer.byteLength(a)},c),i.write(`HTTP/1.1 ${o} ${_3[o]}\r
-`+Object.keys(c).map(_=>`${_}: ${c[_]}`).join(`\r
-`)+`\r
-\r
-`+a)),i.removeListener("error",E3),i.destroy()}function BB(i){return i.trim()}});var u6=Ke((TV,i6)=>{"use strict";var fy=y3();fy.createWebSocketStream=e6();fy.Server=r6();fy.Receiver=c3();fy.Sender=d3();i6.exports=fy});var o6=Ke(f4=>{"use strict";var UB=f4&&f4.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(f4,"__esModule",{value:!0});var jB=UB(u6()),cy=global;cy.WebSocket||(cy.WebSocket=jB.default);cy.window||(cy.window=global);cy.window.__REACT_DEVTOOLS_COMPONENT_FILTERS__=[{type:1,value:7,isEnabled:!0},{type:2,value:"InternalApp",isEnabled:!0,isValid:!0},{type:2,value:"InternalAppContext",isEnabled:!0,isValid:!0},{type:2,value:"InternalStdoutContext",isEnabled:!0,isValid:!0},{type:2,value:"InternalStderrContext",isEnabled:!0,isValid:!0},{type:2,value:"InternalStdinContext",isEnabled:!0,isValid:!0},{type:2,value:"InternalFocusContext",isEnabled:!0,isValid:!0}]});var l6=Ke((c4,D3)=>{(function(i,o){typeof c4=="object"&&typeof D3=="object"?D3.exports=o():typeof define=="function"&&define.amd?define([],o):typeof c4=="object"?c4.ReactDevToolsBackend=o():i.ReactDevToolsBackend=o()})(window,function(){return function(i){var o={};function a(c){if(o[c])return o[c].exports;var _=o[c]={i:c,l:!1,exports:{}};return i[c].call(_.exports,_,_.exports,a),_.l=!0,_.exports}return a.m=i,a.c=o,a.d=function(c,_,t){a.o(c,_)||Object.defineProperty(c,_,{enumerable:!0,get:t})},a.r=function(c){typeof Symbol!="undefined"&&Symbol.toStringTag&&Object.defineProperty(c,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(c,"__esModule",{value:!0})},a.t=function(c,_){if(1&_&&(c=a(c)),8&_||4&_&&typeof c=="object"&&c&&c.__esModule)return c;var t=Object.create(null);if(a.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:c}),2&_&&typeof c!="string")for(var O in c)a.d(t,O,function(N){return c[N]}.bind(null,O));return t},a.n=function(c){var _=c&&c.__esModule?function(){return c.default}:function(){return c};return a.d(_,"a",_),_},a.o=function(c,_){return Object.prototype.hasOwnProperty.call(c,_)},a.p="",a(a.s=20)}([function(i,o,a){"use strict";i.exports=a(12)},function(i,o,a){"use strict";var c=Object.getOwnPropertySymbols,_=Object.prototype.hasOwnProperty,t=Object.prototype.propertyIsEnumerable;function O(N){if(N==null)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(N)}i.exports=function(){try{if(!Object.assign)return!1;var N=new String("abc");if(N[5]="de",Object.getOwnPropertyNames(N)[0]==="5")return!1;for(var M={},T=0;T<10;T++)M["_"+String.fromCharCode(T)]=T;if(Object.getOwnPropertyNames(M).map(function(H){return M[H]}).join("")!=="0123456789")return!1;var B={};return"abcdefghijklmnopqrst".split("").forEach(function(H){B[H]=H}),Object.keys(Object.assign({},B)).join("")==="abcdefghijklmnopqrst"}catch(H){return!1}}()?Object.assign:function(N,M){for(var T,B,H=O(N),q=1;q<arguments.length;q++){for(var ne in T=Object(arguments[q]))_.call(T,ne)&&(H[ne]=T[ne]);if(c){B=c(T);for(var m=0;m<B.length;m++)t.call(T,B[m])&&(H[B[m]]=T[B[m]])}}return H}},function(i,o,a){(function(c){function _(me){return(_=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(ie){return typeof ie}:function(ie){return ie&&typeof Symbol=="function"&&ie.constructor===Symbol&&ie!==Symbol.prototype?"symbol":typeof ie})(me)}var t=/^\s+|\s+$/g,O=/^[-+]0x[0-9a-f]+$/i,N=/^0b[01]+$/i,M=/^0o[0-7]+$/i,T=parseInt,B=(c===void 0?"undefined":_(c))=="object"&&c&&c.Object===Object&&c,H=(typeof self=="undefined"?"undefined":_(self))=="object"&&self&&self.Object===Object&&self,q=B||H||Function("return this")(),ne=Object.prototype.toString,m=Math.max,he=Math.min,De=function(){return q.Date.now()};function se(me,ie,Oe){var Ue,je,at,Dt,Qe,ut,Ve=0,It=!1,Xt=!1,rt=!0;if(typeof me!="function")throw new TypeError("Expected a function");function X(At){var nn=Ue,an=je;return Ue=je=void 0,Ve=At,Dt=me.apply(an,nn)}function de(At){return Ve=At,Qe=setTimeout(oe,ie),It?X(At):Dt}function Ce(At){var nn=At-ut;return ut===void 0||nn>=ie||nn<0||Xt&&At-Ve>=at}function oe(){var At=De();if(Ce(At))return He(At);Qe=setTimeout(oe,function(nn){var an=ie-(nn-ut);return Xt?he(an,at-(nn-Ve)):an}(At))}function He(At){return Qe=void 0,rt&&Ue?X(At):(Ue=je=void 0,Dt)}function dt(){var At=De(),nn=Ce(At);if(Ue=arguments,je=this,ut=At,nn){if(Qe===void 0)return de(ut);if(Xt)return Qe=setTimeout(oe,ie),X(ut)}return Qe===void 0&&(Qe=setTimeout(oe,ie)),Dt}return ie=ce(ie)||0,fe(Oe)&&(It=!!Oe.leading,at=(Xt="maxWait"in Oe)?m(ce(Oe.maxWait)||0,ie):at,rt="trailing"in Oe?!!Oe.trailing:rt),dt.cancel=function(){Qe!==void 0&&clearTimeout(Qe),Ve=0,Ue=ut=je=Qe=void 0},dt.flush=function(){return Qe===void 0?Dt:He(De())},dt}function fe(me){var ie=_(me);return!!me&&(ie=="object"||ie=="function")}function _e(me){return _(me)=="symbol"||function(ie){return!!ie&&_(ie)=="object"}(me)&&ne.call(me)=="[object Symbol]"}function ce(me){if(typeof me=="number")return me;if(_e(me))return NaN;if(fe(me)){var ie=typeof me.valueOf=="function"?me.valueOf():me;me=fe(ie)?ie+"":ie}if(typeof me!="string")return me===0?me:+me;me=me.replace(t,"");var Oe=N.test(me);return Oe||M.test(me)?T(me.slice(2),Oe?2:8):O.test(me)?NaN:+me}i.exports=function(me,ie,Oe){var Ue=!0,je=!0;if(typeof me!="function")throw new TypeError("Expected a function");return fe(Oe)&&(Ue="leading"in Oe?!!Oe.leading:Ue,je="trailing"in Oe?!!Oe.trailing:je),se(me,ie,{leading:Ue,maxWait:ie,trailing:je})}}).call(this,a(4))},function(i,o,a){(function(c){function _(X){return(_=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(de){return typeof de}:function(de){return de&&typeof Symbol=="function"&&de.constructor===Symbol&&de!==Symbol.prototype?"symbol":typeof de})(X)}var t;o=i.exports=m,t=(c===void 0?"undefined":_(c))==="object"&&c.env&&c.env.NODE_DEBUG&&/\bsemver\b/i.test(c.env.NODE_DEBUG)?function(){var X=Array.prototype.slice.call(arguments,0);X.unshift("SEMVER"),console.log.apply(console,X)}:function(){},o.SEMVER_SPEC_VERSION="2.0.0";var O=Number.MAX_SAFE_INTEGER||9007199254740991,N=o.re=[],M=o.src=[],T=o.tokens={},B=0;function H(X){T[X]=B++}H("NUMERICIDENTIFIER"),M[T.NUMERICIDENTIFIER]="0|[1-9]\\d*",H("NUMERICIDENTIFIERLOOSE"),M[T.NUMERICIDENTIFIERLOOSE]="[0-9]+",H("NONNUMERICIDENTIFIER"),M[T.NONNUMERICIDENTIFIER]="\\d*[a-zA-Z-][a-zA-Z0-9-]*",H("MAINVERSION"),M[T.MAINVERSION]="("+M[T.NUMERICIDENTIFIER]+")\\.("+M[T.NUMERICIDENTIFIER]+")\\.("+M[T.NUMERICIDENTIFIER]+")",H("MAINVERSIONLOOSE"),M[T.MAINVERSIONLOOSE]="("+M[T.NUMERICIDENTIFIERLOOSE]+")\\.("+M[T.NUMERICIDENTIFIERLOOSE]+")\\.("+M[T.NUMERICIDENTIFIERLOOSE]+")",H("PRERELEASEIDENTIFIER"),M[T.PRERELEASEIDENTIFIER]="(?:"+M[T.NUMERICIDENTIFIER]+"|"+M[T.NONNUMERICIDENTIFIER]+")",H("PRERELEASEIDENTIFIERLOOSE"),M[T.PRERELEASEIDENTIFIERLOOSE]="(?:"+M[T.NUMERICIDENTIFIERLOOSE]+"|"+M[T.NONNUMERICIDENTIFIER]+")",H("PRERELEASE"),M[T.PRERELEASE]="(?:-("+M[T.PRERELEASEIDENTIFIER]+"(?:\\."+M[T.PRERELEASEIDENTIFIER]+")*))",H("PRERELEASELOOSE"),M[T.PRERELEASELOOSE]="(?:-?("+M[T.PRERELEASEIDENTIFIERLOOSE]+"(?:\\."+M[T.PRERELEASEIDENTIFIERLOOSE]+")*))",H("BUILDIDENTIFIER"),M[T.BUILDIDENTIFIER]="[0-9A-Za-z-]+",H("BUILD"),M[T.BUILD]="(?:\\+("+M[T.BUILDIDENTIFIER]+"(?:\\."+M[T.BUILDIDENTIFIER]+")*))",H("FULL"),H("FULLPLAIN"),M[T.FULLPLAIN]="v?"+M[T.MAINVERSION]+M[T.PRERELEASE]+"?"+M[T.BUILD]+"?",M[T.FULL]="^"+M[T.FULLPLAIN]+"$",H("LOOSEPLAIN"),M[T.LOOSEPLAIN]="[v=\\s]*"+M[T.MAINVERSIONLOOSE]+M[T.PRERELEASELOOSE]+"?"+M[T.BUILD]+"?",H("LOOSE"),M[T.LOOSE]="^"+M[T.LOOSEPLAIN]+"$",H("GTLT"),M[T.GTLT]="((?:<|>)?=?)",H("XRANGEIDENTIFIERLOOSE"),M[T.XRANGEIDENTIFIERLOOSE]=M[T.NUMERICIDENTIFIERLOOSE]+"|x|X|\\*",H("XRANGEIDENTIFIER"),M[T.XRANGEIDENTIFIER]=M[T.NUMERICIDENTIFIER]+"|x|X|\\*",H("XRANGEPLAIN"),M[T.XRANGEPLAIN]="[v=\\s]*("+M[T.XRANGEIDENTIFIER]+")(?:\\.("+M[T.XRANGEIDENTIFIER]+")(?:\\.("+M[T.XRANGEIDENTIFIER]+")(?:"+M[T.PRERELEASE]+")?"+M[T.BUILD]+"?)?)?",H("XRANGEPLAINLOOSE"),M[T.XRANGEPLAINLOOSE]="[v=\\s]*("+M[T.XRANGEIDENTIFIERLOOSE]+")(?:\\.("+M[T.XRANGEIDENTIFIERLOOSE]+")(?:\\.("+M[T.XRANGEIDENTIFIERLOOSE]+")(?:"+M[T.PRERELEASELOOSE]+")?"+M[T.BUILD]+"?)?)?",H("XRANGE"),M[T.XRANGE]="^"+M[T.GTLT]+"\\s*"+M[T.XRANGEPLAIN]+"$",H("XRANGELOOSE"),M[T.XRANGELOOSE]="^"+M[T.GTLT]+"\\s*"+M[T.XRANGEPLAINLOOSE]+"$",H("COERCE"),M[T.COERCE]="(^|[^\\d])(\\d{1,16})(?:\\.(\\d{1,16}))?(?:\\.(\\d{1,16}))?(?:$|[^\\d])",H("COERCERTL"),N[T.COERCERTL]=new RegExp(M[T.COERCE],"g"),H("LONETILDE"),M[T.LONETILDE]="(?:~>?)",H("TILDETRIM"),M[T.TILDETRIM]="(\\s*)"+M[T.LONETILDE]+"\\s+",N[T.TILDETRIM]=new RegExp(M[T.TILDETRIM],"g"),H("TILDE"),M[T.TILDE]="^"+M[T.LONETILDE]+M[T.XRANGEPLAIN]+"$",H("TILDELOOSE"),M[T.TILDELOOSE]="^"+M[T.LONETILDE]+M[T.XRANGEPLAINLOOSE]+"$",H("LONECARET"),M[T.LONECARET]="(?:\\^)",H("CARETTRIM"),M[T.CARETTRIM]="(\\s*)"+M[T.LONECARET]+"\\s+",N[T.CARETTRIM]=new RegExp(M[T.CARETTRIM],"g"),H("CARET"),M[T.CARET]="^"+M[T.LONECARET]+M[T.XRANGEPLAIN]+"$",H("CARETLOOSE"),M[T.CARETLOOSE]="^"+M[T.LONECARET]+M[T.XRANGEPLAINLOOSE]+"$",H("COMPARATORLOOSE"),M[T.COMPARATORLOOSE]="^"+M[T.GTLT]+"\\s*("+M[T.LOOSEPLAIN]+")$|^$",H("COMPARATOR"),M[T.COMPARATOR]="^"+M[T.GTLT]+"\\s*("+M[T.FULLPLAIN]+")$|^$",H("COMPARATORTRIM"),M[T.COMPARATORTRIM]="(\\s*)"+M[T.GTLT]+"\\s*("+M[T.LOOSEPLAIN]+"|"+M[T.XRANGEPLAIN]+")",N[T.COMPARATORTRIM]=new RegExp(M[T.COMPARATORTRIM],"g"),H("HYPHENRANGE"),M[T.HYPHENRANGE]="^\\s*("+M[T.XRANGEPLAIN]+")\\s+-\\s+("+M[T.XRANGEPLAIN]+")\\s*$",H("HYPHENRANGELOOSE"),M[T.HYPHENRANGELOOSE]="^\\s*("+M[T.XRANGEPLAINLOOSE]+")\\s+-\\s+("+M[T.XRANGEPLAINLOOSE]+")\\s*$",H("STAR"),M[T.STAR]="(<|>)?=?\\s*\\*";for(var q=0;q<B;q++)t(q,M[q]),N[q]||(N[q]=new RegExp(M[q]));function ne(X,de){if(de&&_(de)==="object"||(de={loose:!!de,includePrerelease:!1}),X instanceof m)return X;if(typeof X!="string"||X.length>256||!(de.loose?N[T.LOOSE]:N[T.FULL]).test(X))return null;try{return new m(X,de)}catch(Ce){return null}}function m(X,de){if(de&&_(de)==="object"||(de={loose:!!de,includePrerelease:!1}),X instanceof m){if(X.loose===de.loose)return X;X=X.version}else if(typeof X!="string")throw new TypeError("Invalid Version: "+X);if(X.length>256)throw new TypeError("version is longer than 256 characters");if(!(this instanceof m))return new m(X,de);t("SemVer",X,de),this.options=de,this.loose=!!de.loose;var Ce=X.trim().match(de.loose?N[T.LOOSE]:N[T.FULL]);if(!Ce)throw new TypeError("Invalid Version: "+X);if(this.raw=X,this.major=+Ce[1],this.minor=+Ce[2],this.patch=+Ce[3],this.major>O||this.major<0)throw new TypeError("Invalid major version");if(this.minor>O||this.minor<0)throw new TypeError("Invalid minor version");if(this.patch>O||this.patch<0)throw new TypeError("Invalid patch version");Ce[4]?this.prerelease=Ce[4].split(".").map(function(oe){if(/^[0-9]+$/.test(oe)){var He=+oe;if(He>=0&&He<O)return He}return oe}):this.prerelease=[],this.build=Ce[5]?Ce[5].split("."):[],this.format()}o.parse=ne,o.valid=function(X,de){var Ce=ne(X,de);return Ce?Ce.version:null},o.clean=function(X,de){var Ce=ne(X.trim().replace(/^[=v]+/,""),de);return Ce?Ce.version:null},o.SemVer=m,m.prototype.format=function(){return this.version=this.major+"."+this.minor+"."+this.patch,this.prerelease.length&&(this.version+="-"+this.prerelease.join(".")),this.version},m.prototype.toString=function(){return this.version},m.prototype.compare=function(X){return t("SemVer.compare",this.version,this.options,X),X instanceof m||(X=new m(X,this.options)),this.compareMain(X)||this.comparePre(X)},m.prototype.compareMain=function(X){return X instanceof m||(X=new m(X,this.options)),De(this.major,X.major)||De(this.minor,X.minor)||De(this.patch,X.patch)},m.prototype.comparePre=function(X){if(X instanceof m||(X=new m(X,this.options)),this.prerelease.length&&!X.prerelease.length)return-1;if(!this.prerelease.length&&X.prerelease.length)return 1;if(!this.prerelease.length&&!X.prerelease.length)return 0;var de=0;do{var Ce=this.prerelease[de],oe=X.prerelease[de];if(t("prerelease compare",de,Ce,oe),Ce===void 0&&oe===void 0)return 0;if(oe===void 0)return 1;if(Ce===void 0)return-1;if(Ce!==oe)return De(Ce,oe)}while(++de)},m.prototype.compareBuild=function(X){X instanceof m||(X=new m(X,this.options));var de=0;do{var Ce=this.build[de],oe=X.build[de];if(t("prerelease compare",de,Ce,oe),Ce===void 0&&oe===void 0)return 0;if(oe===void 0)return 1;if(Ce===void 0)return-1;if(Ce!==oe)return De(Ce,oe)}while(++de)},m.prototype.inc=function(X,de){switch(X){case"premajor":this.prerelease.length=0,this.patch=0,this.minor=0,this.major++,this.inc("pre",de);break;case"preminor":this.prerelease.length=0,this.patch=0,this.minor++,this.inc("pre",de);break;case"prepatch":this.prerelease.length=0,this.inc("patch",de),this.inc("pre",de);break;case"prerelease":this.prerelease.length===0&&this.inc("patch",de),this.inc("pre",de);break;case"major":this.minor===0&&this.patch===0&&this.prerelease.length!==0||this.major++,this.minor=0,this.patch=0,this.prerelease=[];break;case"minor":this.patch===0&&this.prerelease.length!==0||this.minor++,this.patch=0,this.prerelease=[];break;case"patch":this.prerelease.length===0&&this.patch++,this.prerelease=[];break;case"pre":if(this.prerelease.length===0)this.prerelease=[0];else{for(var Ce=this.prerelease.length;--Ce>=0;)typeof this.prerelease[Ce]=="number"&&(this.prerelease[Ce]++,Ce=-2);Ce===-1&&this.prerelease.push(0)}de&&(this.prerelease[0]===de?isNaN(this.prerelease[1])&&(this.prerelease=[de,0]):this.prerelease=[de,0]);break;default:throw new Error("invalid increment argument: "+X)}return this.format(),this.raw=this.version,this},o.inc=function(X,de,Ce,oe){typeof Ce=="string"&&(oe=Ce,Ce=void 0);try{return new m(X,Ce).inc(de,oe).version}catch(He){return null}},o.diff=function(X,de){if(ce(X,de))return null;var Ce=ne(X),oe=ne(de),He="";if(Ce.prerelease.length||oe.prerelease.length){He="pre";var dt="prerelease"}for(var At in Ce)if((At==="major"||At==="minor"||At==="patch")&&Ce[At]!==oe[At])return He+At;return dt},o.compareIdentifiers=De;var he=/^[0-9]+$/;function De(X,de){var Ce=he.test(X),oe=he.test(de);return Ce&&oe&&(X=+X,de=+de),X===de?0:Ce&&!oe?-1:oe&&!Ce?1:X<de?-1:1}function se(X,de,Ce){return new m(X,Ce).compare(new m(de,Ce))}function fe(X,de,Ce){return se(X,de,Ce)>0}function _e(X,de,Ce){return se(X,de,Ce)<0}function ce(X,de,Ce){return se(X,de,Ce)===0}function me(X,de,Ce){return se(X,de,Ce)!==0}function ie(X,de,Ce){return se(X,de,Ce)>=0}function Oe(X,de,Ce){return se(X,de,Ce)<=0}function Ue(X,de,Ce,oe){switch(de){case"===":return _(X)==="object"&&(X=X.version),_(Ce)==="object"&&(Ce=Ce.version),X===Ce;case"!==":return _(X)==="object"&&(X=X.version),_(Ce)==="object"&&(Ce=Ce.version),X!==Ce;case"":case"=":case"==":return ce(X,Ce,oe);case"!=":return me(X,Ce,oe);case">":return fe(X,Ce,oe);case">=":return ie(X,Ce,oe);case"<":return _e(X,Ce,oe);case"<=":return Oe(X,Ce,oe);default:throw new TypeError("Invalid operator: "+de)}}function je(X,de){if(de&&_(de)==="object"||(de={loose:!!de,includePrerelease:!1}),X instanceof je){if(X.loose===!!de.loose)return X;X=X.value}if(!(this instanceof je))return new je(X,de);t("comparator",X,de),this.options=de,this.loose=!!de.loose,this.parse(X),this.semver===at?this.value="":this.value=this.operator+this.semver.version,t("comp",this)}o.rcompareIdentifiers=function(X,de){return De(de,X)},o.major=function(X,de){return new m(X,de).major},o.minor=function(X,de){return new m(X,de).minor},o.patch=function(X,de){return new m(X,de).patch},o.compare=se,o.compareLoose=function(X,de){return se(X,de,!0)},o.compareBuild=function(X,de,Ce){var oe=new m(X,Ce),He=new m(de,Ce);return oe.compare(He)||oe.compareBuild(He)},o.rcompare=function(X,de,Ce){return se(de,X,Ce)},o.sort=function(X,de){return X.sort(function(Ce,oe){return o.compareBuild(Ce,oe,de)})},o.rsort=function(X,de){return X.sort(function(Ce,oe){return o.compareBuild(oe,Ce,de)})},o.gt=fe,o.lt=_e,o.eq=ce,o.neq=me,o.gte=ie,o.lte=Oe,o.cmp=Ue,o.Comparator=je;var at={};function Dt(X,de){if(de&&_(de)==="object"||(de={loose:!!de,includePrerelease:!1}),X instanceof Dt)return X.loose===!!de.loose&&X.includePrerelease===!!de.includePrerelease?X:new Dt(X.raw,de);if(X instanceof je)return new Dt(X.value,de);if(!(this instanceof Dt))return new Dt(X,de);if(this.options=de,this.loose=!!de.loose,this.includePrerelease=!!de.includePrerelease,this.raw=X,this.set=X.split(/\s*\|\|\s*/).map(function(Ce){return this.parseRange(Ce.trim())},this).filter(function(Ce){return Ce.length}),!this.set.length)throw new TypeError("Invalid SemVer Range: "+X);this.format()}function Qe(X,de){for(var Ce=!0,oe=X.slice(),He=oe.pop();Ce&&oe.length;)Ce=oe.every(function(dt){return He.intersects(dt,de)}),He=oe.pop();return Ce}function ut(X){return!X||X.toLowerCase()==="x"||X==="*"}function Ve(X,de,Ce,oe,He,dt,At,nn,an,Mn,lr,ln,Vt){return((de=ut(Ce)?"":ut(oe)?">="+Ce+".0.0":ut(He)?">="+Ce+"."+oe+".0":">="+de)+" "+(nn=ut(an)?"":ut(Mn)?"<"+(+an+1)+".0.0":ut(lr)?"<"+an+"."+(+Mn+1)+".0":ln?"<="+an+"."+Mn+"."+lr+"-"+ln:"<="+nn)).trim()}function It(X,de,Ce){for(var oe=0;oe<X.length;oe++)if(!X[oe].test(de))return!1;if(de.prerelease.length&&!Ce.includePrerelease){for(oe=0;oe<X.length;oe++)if(t(X[oe].semver),X[oe].semver!==at&&X[oe].semver.prerelease.length>0){var He=X[oe].semver;if(He.major===de.major&&He.minor===de.minor&&He.patch===de.patch)return!0}return!1}return!0}function Xt(X,de,Ce){try{de=new Dt(de,Ce)}catch(oe){return!1}return de.test(X)}function rt(X,de,Ce,oe){var He,dt,At,nn,an;switch(X=new m(X,oe),de=new Dt(de,oe),Ce){case">":He=fe,dt=Oe,At=_e,nn=">",an=">=";break;case"<":He=_e,dt=ie,At=fe,nn="<",an="<=";break;default:throw new TypeError('Must provide a hilo val of "<" or ">"')}if(Xt(X,de,oe))return!1;for(var Mn=0;Mn<de.set.length;++Mn){var lr=de.set[Mn],ln=null,Vt=null;if(lr.forEach(function(Dr){Dr.semver===at&&(Dr=new je(">=0.0.0")),ln=ln||Dr,Vt=Vt||Dr,He(Dr.semver,ln.semver,oe)?ln=Dr:At(Dr.semver,Vt.semver,oe)&&(Vt=Dr)}),ln.operator===nn||ln.operator===an||(!Vt.operator||Vt.operator===nn)&&dt(X,Vt.semver)||Vt.operator===an&&At(X,Vt.semver))return!1}return!0}je.prototype.parse=function(X){var de=this.options.loose?N[T.COMPARATORLOOSE]:N[T.COMPARATOR],Ce=X.match(de);if(!Ce)throw new TypeError("Invalid comparator: "+X);this.operator=Ce[1]!==void 0?Ce[1]:"",this.operator==="="&&(this.operator=""),Ce[2]?this.semver=new m(Ce[2],this.options.loose):this.semver=at},je.prototype.toString=function(){return this.value},je.prototype.test=function(X){if(t("Comparator.test",X,this.options.loose),this.semver===at||X===at)return!0;if(typeof X=="string")try{X=new m(X,this.options)}catch(de){return!1}return Ue(X,this.operator,this.semver,this.options)},je.prototype.intersects=function(X,de){if(!(X instanceof je))throw new TypeError("a Comparator is required");var Ce;if(de&&_(de)==="object"||(de={loose:!!de,includePrerelease:!1}),this.operator==="")return this.value===""||(Ce=new Dt(X.value,de),Xt(this.value,Ce,de));if(X.operator==="")return X.value===""||(Ce=new Dt(this.value,de),Xt(X.semver,Ce,de));var oe=!(this.operator!==">="&&this.operator!==">"||X.operator!==">="&&X.operator!==">"),He=!(this.operator!=="<="&&this.operator!=="<"||X.operator!=="<="&&X.operator!=="<"),dt=this.semver.version===X.semver.version,At=!(this.operator!==">="&&this.operator!=="<="||X.operator!==">="&&X.operator!=="<="),nn=Ue(this.semver,"<",X.semver,de)&&(this.operator===">="||this.operator===">")&&(X.operator==="<="||X.operator==="<"),an=Ue(this.semver,">",X.semver,de)&&(this.operator==="<="||this.operator==="<")&&(X.operator===">="||X.operator===">");return oe||He||dt&&At||nn||an},o.Range=Dt,Dt.prototype.format=function(){return this.range=this.set.map(function(X){return X.join(" ").trim()}).join("||").trim(),this.range},Dt.prototype.toString=function(){return this.range},Dt.prototype.parseRange=function(X){var de=this.options.loose;X=X.trim();var Ce=de?N[T.HYPHENRANGELOOSE]:N[T.HYPHENRANGE];X=X.replace(Ce,Ve),t("hyphen replace",X),X=X.replace(N[T.COMPARATORTRIM],"$1$2$3"),t("comparator trim",X,N[T.COMPARATORTRIM]),X=(X=(X=X.replace(N[T.TILDETRIM],"$1~")).replace(N[T.CARETTRIM],"$1^")).split(/\s+/).join(" ");var oe=de?N[T.COMPARATORLOOSE]:N[T.COMPARATOR],He=X.split(" ").map(function(dt){return function(At,nn){return t("comp",At,nn),At=function(an,Mn){return an.trim().split(/\s+/).map(function(lr){return function(ln,Vt){t("caret",ln,Vt);var Dr=Vt.loose?N[T.CARETLOOSE]:N[T.CARET];return ln.replace(Dr,function(w,jt,Xn,vr,jr){var fr;return t("caret",ln,w,jt,Xn,vr,jr),ut(jt)?fr="":ut(Xn)?fr=">="+jt+".0.0 <"+(+jt+1)+".0.0":ut(vr)?fr=jt==="0"?">="+jt+"."+Xn+".0 <"+jt+"."+(+Xn+1)+".0":">="+jt+"."+Xn+".0 <"+(+jt+1)+".0.0":jr?(t("replaceCaret pr",jr),fr=jt==="0"?Xn==="0"?">="+jt+"."+Xn+"."+vr+"-"+jr+" <"+jt+"."+Xn+"."+(+vr+1):">="+jt+"."+Xn+"."+vr+"-"+jr+" <"+jt+"."+(+Xn+1)+".0":">="+jt+"."+Xn+"."+vr+"-"+jr+" <"+(+jt+1)+".0.0"):(t("no pr"),fr=jt==="0"?Xn==="0"?">="+jt+"."+Xn+"."+vr+" <"+jt+"."+Xn+"."+(+vr+1):">="+jt+"."+Xn+"."+vr+" <"+jt+"."+(+Xn+1)+".0":">="+jt+"."+Xn+"."+vr+" <"+(+jt+1)+".0.0"),t("caret return",fr),fr})}(lr,Mn)}).join(" ")}(At,nn),t("caret",At),At=function(an,Mn){return an.trim().split(/\s+/).map(function(lr){return function(ln,Vt){var Dr=Vt.loose?N[T.TILDELOOSE]:N[T.TILDE];return ln.replace(Dr,function(w,jt,Xn,vr,jr){var fr;return t("tilde",ln,w,jt,Xn,vr,jr),ut(jt)?fr="":ut(Xn)?fr=">="+jt+".0.0 <"+(+jt+1)+".0.0":ut(vr)?fr=">="+jt+"."+Xn+".0 <"+jt+"."+(+Xn+1)+".0":jr?(t("replaceTilde pr",jr),fr=">="+jt+"."+Xn+"."+vr+"-"+jr+" <"+jt+"."+(+Xn+1)+".0"):fr=">="+jt+"."+Xn+"."+vr+" <"+jt+"."+(+Xn+1)+".0",t("tilde return",fr),fr})}(lr,Mn)}).join(" ")}(At,nn),t("tildes",At),At=function(an,Mn){return t("replaceXRanges",an,Mn),an.split(/\s+/).map(function(lr){return function(ln,Vt){ln=ln.trim();var Dr=Vt.loose?N[T.XRANGELOOSE]:N[T.XRANGE];return ln.replace(Dr,function(w,jt,Xn,vr,jr,fr){t("xRange",ln,w,jt,Xn,vr,jr,fr);var zr=ut(Xn),Qt=zr||ut(vr),wu=Qt||ut(jr),d0=wu;return jt==="="&&d0&&(jt=""),fr=Vt.includePrerelease?"-0":"",zr?w=jt===">"||jt==="<"?"<0.0.0-0":"*":jt&&d0?(Qt&&(vr=0),jr=0,jt===">"?(jt=">=",Qt?(Xn=+Xn+1,vr=0,jr=0):(vr=+vr+1,jr=0)):jt==="<="&&(jt="<",Qt?Xn=+Xn+1:vr=+vr+1),w=jt+Xn+"."+vr+"."+jr+fr):Qt?w=">="+Xn+".0.0"+fr+" <"+(+Xn+1)+".0.0"+fr:wu&&(w=">="+Xn+"."+vr+".0"+fr+" <"+Xn+"."+(+vr+1)+".0"+fr),t("xRange return",w),w})}(lr,Mn)}).join(" ")}(At,nn),t("xrange",At),At=function(an,Mn){return t("replaceStars",an,Mn),an.trim().replace(N[T.STAR],"")}(At,nn),t("stars",At),At}(dt,this.options)},this).join(" ").split(/\s+/);return this.options.loose&&(He=He.filter(function(dt){return!!dt.match(oe)})),He=He.map(function(dt){return new je(dt,this.options)},this)},Dt.prototype.intersects=function(X,de){if(!(X instanceof Dt))throw new TypeError("a Range is required");return this.set.some(function(Ce){return Qe(Ce,de)&&X.set.some(function(oe){return Qe(oe,de)&&Ce.every(function(He){return oe.every(function(dt){return He.intersects(dt,de)})})})})},o.toComparators=function(X,de){return new Dt(X,de).set.map(function(Ce){return Ce.map(function(oe){return oe.value}).join(" ").trim().split(" ")})},Dt.prototype.test=function(X){if(!X)return!1;if(typeof X=="string")try{X=new m(X,this.options)}catch(Ce){return!1}for(var de=0;de<this.set.length;de++)if(It(this.set[de],X,this.options))return!0;return!1},o.satisfies=Xt,o.maxSatisfying=function(X,de,Ce){var oe=null,He=null;try{var dt=new Dt(de,Ce)}catch(At){return null}return X.forEach(function(At){dt.test(At)&&(oe&&He.compare(At)!==-1||(He=new m(oe=At,Ce)))}),oe},o.minSatisfying=function(X,de,Ce){var oe=null,He=null;try{var dt=new Dt(de,Ce)}catch(At){return null}return X.forEach(function(At){dt.test(At)&&(oe&&He.compare(At)!==1||(He=new m(oe=At,Ce)))}),oe},o.minVersion=function(X,de){X=new Dt(X,de);var Ce=new m("0.0.0");if(X.test(Ce)||(Ce=new m("0.0.0-0"),X.test(Ce)))return Ce;Ce=null;for(var oe=0;oe<X.set.length;++oe)X.set[oe].forEach(function(He){var dt=new m(He.semver.version);switch(He.operator){case">":dt.prerelease.length===0?dt.patch++:dt.prerelease.push(0),dt.raw=dt.format();case"":case">=":Ce&&!fe(Ce,dt)||(Ce=dt);break;case"<":case"<=":break;default:throw new Error("Unexpected operation: "+He.operator)}});return Ce&&X.test(Ce)?Ce:null},o.validRange=function(X,de){try{return new Dt(X,de).range||"*"}catch(Ce){return null}},o.ltr=function(X,de,Ce){return rt(X,de,"<",Ce)},o.gtr=function(X,de,Ce){return rt(X,de,">",Ce)},o.outside=rt,o.prerelease=function(X,de){var Ce=ne(X,de);return Ce&&Ce.prerelease.length?Ce.prerelease:null},o.intersects=function(X,de,Ce){return X=new Dt(X,Ce),de=new Dt(de,Ce),X.intersects(de)},o.coerce=function(X,de){if(X instanceof m)return X;if(typeof X=="number"&&(X=String(X)),typeof X!="string")return null;var Ce=null;if((de=de||{}).rtl){for(var oe;(oe=N[T.COERCERTL].exec(X))&&(!Ce||Ce.index+Ce[0].length!==X.length);)Ce&&oe.index+oe[0].length===Ce.index+Ce[0].length||(Ce=oe),N[T.COERCERTL].lastIndex=oe.index+oe[1].length+oe[2].length;N[T.COERCERTL].lastIndex=-1}else Ce=X.match(N[T.COERCE]);return Ce===null?null:ne(Ce[2]+"."+(Ce[3]||"0")+"."+(Ce[4]||"0"),de)}}).call(this,a(5))},function(i,o){function a(_){return(a=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(t){return typeof t}:function(t){return t&&typeof Symbol=="function"&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(_)}var c;c=function(){return this}();try{c=c||new Function("return this")()}catch(_){(typeof window=="undefined"?"undefined":a(window))==="object"&&(c=window)}i.exports=c},function(i,o){var a,c,_=i.exports={};function t(){throw new Error("setTimeout has not been defined")}function O(){throw new Error("clearTimeout has not been defined")}function N(De){if(a===setTimeout)return setTimeout(De,0);if((a===t||!a)&&setTimeout)return a=setTimeout,setTimeout(De,0);try{return a(De,0)}catch(se){try{return a.call(null,De,0)}catch(fe){return a.call(this,De,0)}}}(function(){try{a=typeof setTimeout=="function"?setTimeout:t}catch(De){a=t}try{c=typeof clearTimeout=="function"?clearTimeout:O}catch(De){c=O}})();var M,T=[],B=!1,H=-1;function q(){B&&M&&(B=!1,M.length?T=M.concat(T):H=-1,T.length&&ne())}function ne(){if(!B){var De=N(q);B=!0;for(var se=T.length;se;){for(M=T,T=[];++H<se;)M&&M[H].run();H=-1,se=T.length}M=null,B=!1,function(fe){if(c===clearTimeout)return clearTimeout(fe);if((c===O||!c)&&clearTimeout)return c=clearTimeout,clearTimeout(fe);try{c(fe)}catch(_e){try{return c.call(null,fe)}catch(ce){return c.call(this,fe)}}}(De)}}function m(De,se){this.fun=De,this.array=se}function he(){}_.nextTick=function(De){var se=new Array(arguments.length-1);if(arguments.length>1)for(var fe=1;fe<arguments.length;fe++)se[fe-1]=arguments[fe];T.push(new m(De,se)),T.length!==1||B||N(ne)},m.prototype.run=function(){this.fun.apply(null,this.array)},_.title="browser",_.browser=!0,_.env={},_.argv=[],_.version="",_.versions={},_.on=he,_.addListener=he,_.once=he,_.off=he,_.removeListener=he,_.removeAllListeners=he,_.emit=he,_.prependListener=he,_.prependOnceListener=he,_.listeners=function(De){return[]},_.binding=function(De){throw new Error("process.binding is not supported")},_.cwd=function(){return"/"},_.chdir=function(De){throw new Error("process.chdir is not supported")},_.umask=function(){return 0}},function(i,o,a){"use strict";function c(Ue,je){if(!(Ue instanceof je))throw new TypeError("Cannot call a class as a function")}function _(Ue,je){for(var at=0;at<je.length;at++){var Dt=je[at];Dt.enumerable=Dt.enumerable||!1,Dt.configurable=!0,"value"in Dt&&(Dt.writable=!0),Object.defineProperty(Ue,Dt.key,Dt)}}var t=a(10),O=Symbol("max"),N=Symbol("length"),M=Symbol("lengthCalculator"),T=Symbol("allowStale"),B=Symbol("maxAge"),H=Symbol("dispose"),q=Symbol("noDisposeOnSet"),ne=Symbol("lruList"),m=Symbol("cache"),he=Symbol("updateAgeOnGet"),De=function(){return 1},se=function(){function Ue(Qe){if(c(this,Ue),typeof Qe=="number"&&(Qe={max:Qe}),Qe||(Qe={}),Qe.max&&(typeof Qe.max!="number"||Qe.max<0))throw new TypeError("max must be a non-negative number");this[O]=Qe.max||1/0;var ut=Qe.length||De;if(this[M]=typeof ut!="function"?De:ut,this[T]=Qe.stale||!1,Qe.maxAge&&typeof Qe.maxAge!="number")throw new TypeError("maxAge must be a number");this[B]=Qe.maxAge||0,this[H]=Qe.dispose,this[q]=Qe.noDisposeOnSet||!1,this[he]=Qe.updateAgeOnGet||!1,this.reset()}var je,at,Dt;return je=Ue,(at=[{key:"rforEach",value:function(Qe,ut){ut=ut||this;for(var Ve=this[ne].tail;Ve!==null;){var It=Ve.prev;Oe(this,Qe,Ve,ut),Ve=It}}},{key:"forEach",value:function(Qe,ut){ut=ut||this;for(var Ve=this[ne].head;Ve!==null;){var It=Ve.next;Oe(this,Qe,Ve,ut),Ve=It}}},{key:"keys",value:function(){return this[ne].toArray().map(function(Qe){return Qe.key})}},{key:"values",value:function(){return this[ne].toArray().map(function(Qe){return Qe.value})}},{key:"reset",value:function(){var Qe=this;this[H]&&this[ne]&&this[ne].length&&this[ne].forEach(function(ut){return Qe[H](ut.key,ut.value)}),this[m]=new Map,this[ne]=new t,this[N]=0}},{key:"dump",value:function(){var Qe=this;return this[ne].map(function(ut){return!_e(Qe,ut)&&{k:ut.key,v:ut.value,e:ut.now+(ut.maxAge||0)}}).toArray().filter(function(ut){return ut})}},{key:"dumpLru",value:function(){return this[ne]}},{key:"set",value:function(Qe,ut,Ve){if((Ve=Ve||this[B])&&typeof Ve!="number")throw new TypeError("maxAge must be a number");var It=Ve?Date.now():0,Xt=this[M](ut,Qe);if(this[m].has(Qe)){if(Xt>this[O])return me(this,this[m].get(Qe)),!1;var rt=this[m].get(Qe).value;return this[H]&&(this[q]||this[H](Qe,rt.value)),rt.now=It,rt.maxAge=Ve,rt.value=ut,this[N]+=Xt-rt.length,rt.length=Xt,this.get(Qe),ce(this),!0}var X=new ie(Qe,ut,Xt,It,Ve);return X.length>this[O]?(this[H]&&this[H](Qe,ut),!1):(this[N]+=X.length,this[ne].unshift(X),this[m].set(Qe,this[ne].head),ce(this),!0)}},{key:"has",value:function(Qe){if(!this[m].has(Qe))return!1;var ut=this[m].get(Qe).value;return!_e(this,ut)}},{key:"get",value:function(Qe){return fe(this,Qe,!0)}},{key:"peek",value:function(Qe){return fe(this,Qe,!1)}},{key:"pop",value:function(){var Qe=this[ne].tail;return Qe?(me(this,Qe),Qe.value):null}},{key:"del",value:function(Qe){me(this,this[m].get(Qe))}},{key:"load",value:function(Qe){this.reset();for(var ut=Date.now(),Ve=Qe.length-1;Ve>=0;Ve--){var It=Qe[Ve],Xt=It.e||0;if(Xt===0)this.set(It.k,It.v);else{var rt=Xt-ut;rt>0&&this.set(It.k,It.v,rt)}}}},{key:"prune",value:function(){var Qe=this;this[m].forEach(function(ut,Ve){return fe(Qe,Ve,!1)})}},{key:"max",set:function(Qe){if(typeof Qe!="number"||Qe<0)throw new TypeError("max must be a non-negative number");this[O]=Qe||1/0,ce(this)},get:function(){return this[O]}},{key:"allowStale",set:function(Qe){this[T]=!!Qe},get:function(){return this[T]}},{key:"maxAge",set:function(Qe){if(typeof Qe!="number")throw new TypeError("maxAge must be a non-negative number");this[B]=Qe,ce(this)},get:function(){return this[B]}},{key:"lengthCalculator",set:function(Qe){var ut=this;typeof Qe!="function"&&(Qe=De),Qe!==this[M]&&(this[M]=Qe,this[N]=0,this[ne].forEach(function(Ve){Ve.length=ut[M](Ve.value,Ve.key),ut[N]+=Ve.length})),ce(this)},get:function(){return this[M]}},{key:"length",get:function(){return this[N]}},{key:"itemCount",get:function(){return this[ne].length}}])&&_(je.prototype,at),Dt&&_(je,Dt),Ue}(),fe=function(Ue,je,at){var Dt=Ue[m].get(je);if(Dt){var Qe=Dt.value;if(_e(Ue,Qe)){if(me(Ue,Dt),!Ue[T])return}else at&&(Ue[he]&&(Dt.value.now=Date.now()),Ue[ne].unshiftNode(Dt));return Qe.value}},_e=function(Ue,je){if(!je||!je.maxAge&&!Ue[B])return!1;var at=Date.now()-je.now;return je.maxAge?at>je.maxAge:Ue[B]&&at>Ue[B]},ce=function(Ue){if(Ue[N]>Ue[O])for(var je=Ue[ne].tail;Ue[N]>Ue[O]&&je!==null;){var at=je.prev;me(Ue,je),je=at}},me=function(Ue,je){if(je){var at=je.value;Ue[H]&&Ue[H](at.key,at.value),Ue[N]-=at.length,Ue[m].delete(at.key),Ue[ne].removeNode(je)}},ie=function Ue(je,at,Dt,Qe,ut){c(this,Ue),this.key=je,this.value=at,this.length=Dt,this.now=Qe,this.maxAge=ut||0},Oe=function(Ue,je,at,Dt){var Qe=at.value;_e(Ue,Qe)&&(me(Ue,at),Ue[T]||(Qe=void 0)),Qe&&je.call(Dt,Qe.value,Qe.key,Ue)};i.exports=se},function(i,o,a){(function(c){function _(t){return(_=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(O){return typeof O}:function(O){return O&&typeof Symbol=="function"&&O.constructor===Symbol&&O!==Symbol.prototype?"symbol":typeof O})(t)}i.exports=function(){if(typeof document=="undefined"||!document.addEventListener)return null;var t,O,N,M={};return M.copy=function(){var T=!1,B=null,H=!1;function q(){T=!1,B=null,H&&window.getSelection().removeAllRanges(),H=!1}return document.addEventListener("copy",function(ne){if(T){for(var m in B)ne.clipboardData.setData(m,B[m]);ne.preventDefault()}}),function(ne){return new Promise(function(m,he){T=!0,typeof ne=="string"?B={"text/plain":ne}:ne instanceof Node?B={"text/html":new XMLSerializer().serializeToString(ne)}:ne instanceof Object?B=ne:he("Invalid data type. Must be string, DOM node, or an object mapping MIME types to strings."),function De(se){try{if(document.execCommand("copy"))q(),m();else{if(se)throw q(),new Error("Unable to copy. Perhaps it's not available in your browser?");(function(){var fe=document.getSelection();if(!document.queryCommandEnabled("copy")&&fe.isCollapsed){var _e=document.createRange();_e.selectNodeContents(document.body),fe.removeAllRanges(),fe.addRange(_e),H=!0}})(),De(!0)}}catch(fe){q(),he(fe)}}(!1)})}}(),M.paste=(N=!1,document.addEventListener("paste",function(T){if(N){N=!1,T.preventDefault();var B=t;t=null,B(T.clipboardData.getData(O))}}),function(T){return new Promise(function(B,H){N=!0,t=B,O=T||"text/plain";try{document.execCommand("paste")||(N=!1,H(new Error("Unable to paste. Pasting only works in Internet Explorer at the moment.")))}catch(q){N=!1,H(new Error(q))}})}),typeof ClipboardEvent=="undefined"&&window.clipboardData!==void 0&&window.clipboardData.setData!==void 0&&(function(T){function B(ce,me){return function(){ce.apply(me,arguments)}}function H(ce){if(_(this)!="object")throw new TypeError("Promises must be constructed via new");if(typeof ce!="function")throw new TypeError("not a function");this._state=null,this._value=null,this._deferreds=[],se(ce,B(ne,this),B(m,this))}function q(ce){var me=this;return this._state===null?void this._deferreds.push(ce):void fe(function(){var ie=me._state?ce.onFulfilled:ce.onRejected;if(ie!==null){var Oe;try{Oe=ie(me._value)}catch(Ue){return void ce.reject(Ue)}ce.resolve(Oe)}else(me._state?ce.resolve:ce.reject)(me._value)})}function ne(ce){try{if(ce===this)throw new TypeError("A promise cannot be resolved with itself.");if(ce&&(_(ce)=="object"||typeof ce=="function")){var me=ce.then;if(typeof me=="function")return void se(B(me,ce),B(ne,this),B(m,this))}this._state=!0,this._value=ce,he.call(this)}catch(ie){m.call(this,ie)}}function m(ce){this._state=!1,this._value=ce,he.call(this)}function he(){for(var ce=0,me=this._deferreds.length;me>ce;ce++)q.call(this,this._deferreds[ce]);this._deferreds=null}function De(ce,me,ie,Oe){this.onFulfilled=typeof ce=="function"?ce:null,this.onRejected=typeof me=="function"?me:null,this.resolve=ie,this.reject=Oe}function se(ce,me,ie){var Oe=!1;try{ce(function(Ue){Oe||(Oe=!0,me(Ue))},function(Ue){Oe||(Oe=!0,ie(Ue))})}catch(Ue){if(Oe)return;Oe=!0,ie(Ue)}}var fe=H.immediateFn||typeof c=="function"&&c||function(ce){setTimeout(ce,1)},_e=Array.isArray||function(ce){return Object.prototype.toString.call(ce)==="[object Array]"};H.prototype.catch=function(ce){return this.then(null,ce)},H.prototype.then=function(ce,me){var ie=this;return new H(function(Oe,Ue){q.call(ie,new De(ce,me,Oe,Ue))})},H.all=function(){var ce=Array.prototype.slice.call(arguments.length===1&&_e(arguments[0])?arguments[0]:arguments);return new H(function(me,ie){function Oe(at,Dt){try{if(Dt&&(_(Dt)=="object"||typeof Dt=="function")){var Qe=Dt.then;if(typeof Qe=="function")return void Qe.call(Dt,function(ut){Oe(at,ut)},ie)}ce[at]=Dt,--Ue==0&&me(ce)}catch(ut){ie(ut)}}if(ce.length===0)return me([]);for(var Ue=ce.length,je=0;je<ce.length;je++)Oe(je,ce[je])})},H.resolve=function(ce){return ce&&_(ce)=="object"&&ce.constructor===H?ce:new H(function(me){me(ce)})},H.reject=function(ce){return new H(function(me,ie){ie(ce)})},H.race=function(ce){return new H(function(me,ie){for(var Oe=0,Ue=ce.length;Ue>Oe;Oe++)ce[Oe].then(me,ie)})},i.exports?i.exports=H:T.Promise||(T.Promise=H)}(this),M.copy=function(T){return new Promise(function(B,H){if(typeof T!="string"&&!("text/plain"in T))throw new Error("You must provide a text/plain type.");var q=typeof T=="string"?T:T["text/plain"];window.clipboardData.setData("Text",q)?B():H(new Error("Copying was rejected."))})},M.paste=function(){return new Promise(function(T,B){var H=window.clipboardData.getData("Text");H?T(H):B(new Error("Pasting was rejected."))})}),M}()}).call(this,a(13).setImmediate)},function(i,o,a){"use strict";i.exports=a(15)},function(i,o,a){"use strict";a.r(o),o.default=`:root {
-  /**
-   * IMPORTANT: When new theme variables are added below\u2013 also add them to SettingsContext updateThemeVariables()
-   */
-
-  /* Light theme */
-  --light-color-attribute-name: #ef6632;
-  --light-color-attribute-name-not-editable: #23272f;
-  --light-color-attribute-name-inverted: rgba(255, 255, 255, 0.7);
-  --light-color-attribute-value: #1a1aa6;
-  --light-color-attribute-value-inverted: #ffffff;
-  --light-color-attribute-editable-value: #1a1aa6;
-  --light-color-background: #ffffff;
-  --light-color-background-hover: rgba(0, 136, 250, 0.1);
-  --light-color-background-inactive: #e5e5e5;
-  --light-color-background-invalid: #fff0f0;
-  --light-color-background-selected: #0088fa;
-  --light-color-button-background: #ffffff;
-  --light-color-button-background-focus: #ededed;
-  --light-color-button: #5f6673;
-  --light-color-button-disabled: #cfd1d5;
-  --light-color-button-active: #0088fa;
-  --light-color-button-focus: #23272f;
-  --light-color-button-hover: #23272f;
-  --light-color-border: #eeeeee;
-  --light-color-commit-did-not-render-fill: #cfd1d5;
-  --light-color-commit-did-not-render-fill-text: #000000;
-  --light-color-commit-did-not-render-pattern: #cfd1d5;
-  --light-color-commit-did-not-render-pattern-text: #333333;
-  --light-color-commit-gradient-0: #37afa9;
-  --light-color-commit-gradient-1: #63b19e;
-  --light-color-commit-gradient-2: #80b393;
-  --light-color-commit-gradient-3: #97b488;
-  --light-color-commit-gradient-4: #abb67d;
-  --light-color-commit-gradient-5: #beb771;
-  --light-color-commit-gradient-6: #cfb965;
-  --light-color-commit-gradient-7: #dfba57;
-  --light-color-commit-gradient-8: #efbb49;
-  --light-color-commit-gradient-9: #febc38;
-  --light-color-commit-gradient-text: #000000;
-  --light-color-component-name: #6a51b2;
-  --light-color-component-name-inverted: #ffffff;
-  --light-color-component-badge-background: rgba(0, 0, 0, 0.1);
-  --light-color-component-badge-background-inverted: rgba(255, 255, 255, 0.25);
-  --light-color-component-badge-count: #777d88;
-  --light-color-component-badge-count-inverted: rgba(255, 255, 255, 0.7);
-  --light-color-context-background: rgba(0,0,0,.9);
-  --light-color-context-background-hover: rgba(255, 255, 255, 0.1);
-  --light-color-context-background-selected: #178fb9;
-  --light-color-context-border: #3d424a;
-  --light-color-context-text: #ffffff;
-  --light-color-context-text-selected: #ffffff;
-  --light-color-dim: #777d88;
-  --light-color-dimmer: #cfd1d5;
-  --light-color-dimmest: #eff0f1;
-  --light-color-error-background: hsl(0, 100%, 97%);
-  --light-color-error-border: hsl(0, 100%, 92%);
-  --light-color-error-text: #ff0000;
-  --light-color-expand-collapse-toggle: #777d88;
-  --light-color-link: #0000ff;
-  --light-color-modal-background: rgba(255, 255, 255, 0.75);
-  --light-color-record-active: #fc3a4b;
-  --light-color-record-hover: #3578e5;
-  --light-color-record-inactive: #0088fa;
-  --light-color-scroll-thumb: #c2c2c2;
-  --light-color-scroll-track: #fafafa;
-  --light-color-search-match: yellow;
-  --light-color-search-match-current: #f7923b;
-  --light-color-selected-tree-highlight-active: rgba(0, 136, 250, 0.1);
-  --light-color-selected-tree-highlight-inactive: rgba(0, 0, 0, 0.05);
-  --light-color-shadow: rgba(0, 0, 0, 0.25);
-  --light-color-tab-selected-border: #0088fa;
-  --light-color-text: #000000;
-  --light-color-text-invalid: #ff0000;
-  --light-color-text-selected: #ffffff;
-  --light-color-toggle-background-invalid: #fc3a4b;
-  --light-color-toggle-background-on: #0088fa;
-  --light-color-toggle-background-off: #cfd1d5;
-  --light-color-toggle-text: #ffffff;
-  --light-color-tooltip-background: rgba(0, 0, 0, 0.9);
-  --light-color-tooltip-text: #ffffff;
-
-  /* Dark theme */
-  --dark-color-attribute-name: #9d87d2;
-  --dark-color-attribute-name-not-editable: #ededed;
-  --dark-color-attribute-name-inverted: #282828;
-  --dark-color-attribute-value: #cedae0;
-  --dark-color-attribute-value-inverted: #ffffff;
-  --dark-color-attribute-editable-value: yellow;
-  --dark-color-background: #282c34;
-  --dark-color-background-hover: rgba(255, 255, 255, 0.1);
-  --dark-color-background-inactive: #3d424a;
-  --dark-color-background-invalid: #5c0000;
-  --dark-color-background-selected: #178fb9;
-  --dark-color-button-background: #282c34;
-  --dark-color-button-background-focus: #3d424a;
-  --dark-color-button: #afb3b9;
-  --dark-color-button-active: #61dafb;
-  --dark-color-button-disabled: #4f5766;
-  --dark-color-button-focus: #a2e9fc;
-  --dark-color-button-hover: #ededed;
-  --dark-color-border: #3d424a;
-  --dark-color-commit-did-not-render-fill: #777d88;
-  --dark-color-commit-did-not-render-fill-text: #000000;
-  --dark-color-commit-did-not-render-pattern: #666c77;
-  --dark-color-commit-did-not-render-pattern-text: #ffffff;
-  --dark-color-commit-gradient-0: #37afa9;
-  --dark-color-commit-gradient-1: #63b19e;
-  --dark-color-commit-gradient-2: #80b393;
-  --dark-color-commit-gradient-3: #97b488;
-  --dark-color-commit-gradient-4: #abb67d;
-  --dark-color-commit-gradient-5: #beb771;
-  --dark-color-commit-gradient-6: #cfb965;
-  --dark-color-commit-gradient-7: #dfba57;
-  --dark-color-commit-gradient-8: #efbb49;
-  --dark-color-commit-gradient-9: #febc38;
-  --dark-color-commit-gradient-text: #000000;
-  --dark-color-component-name: #61dafb;
-  --dark-color-component-name-inverted: #282828;
-  --dark-color-component-badge-background: rgba(255, 255, 255, 0.25);
-  --dark-color-component-badge-background-inverted: rgba(0, 0, 0, 0.25);
-  --dark-color-component-badge-count: #8f949d;
-  --dark-color-component-badge-count-inverted: rgba(255, 255, 255, 0.7);
-  --dark-color-context-background: rgba(255,255,255,.9);
-  --dark-color-context-background-hover: rgba(0, 136, 250, 0.1);
-  --dark-color-context-background-selected: #0088fa;
-  --dark-color-context-border: #eeeeee;
-  --dark-color-context-text: #000000;
-  --dark-color-context-text-selected: #ffffff;
-  --dark-color-dim: #8f949d;
-  --dark-color-dimmer: #777d88;
-  --dark-color-dimmest: #4f5766;
-  --dark-color-error-background: #200;
-  --dark-color-error-border: #900;
-  --dark-color-error-text: #f55;
-  --dark-color-expand-collapse-toggle: #8f949d;
-  --dark-color-link: #61dafb;
-  --dark-color-modal-background: rgba(0, 0, 0, 0.75);
-  --dark-color-record-active: #fc3a4b;
-  --dark-color-record-hover: #a2e9fc;
-  --dark-color-record-inactive: #61dafb;
-  --dark-color-scroll-thumb: #afb3b9;
-  --dark-color-scroll-track: #313640;
-  --dark-color-search-match: yellow;
-  --dark-color-search-match-current: #f7923b;
-  --dark-color-selected-tree-highlight-active: rgba(23, 143, 185, 0.15);
-  --dark-color-selected-tree-highlight-inactive: rgba(255, 255, 255, 0.05);
-  --dark-color-shadow: rgba(0, 0, 0, 0.5);
-  --dark-color-tab-selected-border: #178fb9;
-  --dark-color-text: #ffffff;
-  --dark-color-text-invalid: #ff8080;
-  --dark-color-text-selected: #ffffff;
-  --dark-color-toggle-background-invalid: #fc3a4b;
-  --dark-color-toggle-background-on: #178fb9;
-  --dark-color-toggle-background-off: #777d88;
-  --dark-color-toggle-text: #ffffff;
-  --dark-color-tooltip-background: rgba(255, 255, 255, 0.9);
-  --dark-color-tooltip-text: #000000;
-
-  /* Font smoothing */
-  --light-font-smoothing: auto;
-  --dark-font-smoothing: antialiased;
-  --font-smoothing: auto;
-
-  /* Compact density */
-  --compact-font-size-monospace-small: 9px;
-  --compact-font-size-monospace-normal: 11px;
-  --compact-font-size-monospace-large: 15px;
-  --compact-font-size-sans-small: 10px;
-  --compact-font-size-sans-normal: 12px;
-  --compact-font-size-sans-large: 14px;
-  --compact-line-height-data: 18px;
-  --compact-root-font-size: 16px;
-
-  /* Comfortable density */
-  --comfortable-font-size-monospace-small: 10px;
-  --comfortable-font-size-monospace-normal: 13px;
-  --comfortable-font-size-monospace-large: 17px;
-  --comfortable-font-size-sans-small: 12px;
-  --comfortable-font-size-sans-normal: 14px;
-  --comfortable-font-size-sans-large: 16px;
-  --comfortable-line-height-data: 22px;
-  --comfortable-root-font-size: 20px;
-
-  /* GitHub.com system fonts */
-  --font-family-monospace: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo,
-    Courier, monospace;
-  --font-family-sans: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica,
-    Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol;
-
-  /* Constant values shared between JS and CSS */
-  --interaction-commit-size: 10px;
-  --interaction-label-width: 200px;
-}
-`},function(i,o,a){"use strict";function c(M){var T=this;if(T instanceof c||(T=new c),T.tail=null,T.head=null,T.length=0,M&&typeof M.forEach=="function")M.forEach(function(q){T.push(q)});else if(arguments.length>0)for(var B=0,H=arguments.length;B<H;B++)T.push(arguments[B]);return T}function _(M,T,B){var H=T===M.head?new N(B,null,T,M):new N(B,T,T.next,M);return H.next===null&&(M.tail=H),H.prev===null&&(M.head=H),M.length++,H}function t(M,T){M.tail=new N(T,M.tail,null,M),M.head||(M.head=M.tail),M.length++}function O(M,T){M.head=new N(T,null,M.head,M),M.tail||(M.tail=M.head),M.length++}function N(M,T,B,H){if(!(this instanceof N))return new N(M,T,B,H);this.list=H,this.value=M,T?(T.next=this,this.prev=T):this.prev=null,B?(B.prev=this,this.next=B):this.next=null}i.exports=c,c.Node=N,c.create=c,c.prototype.removeNode=function(M){if(M.list!==this)throw new Error("removing node which does not belong to this list");var T=M.next,B=M.prev;return T&&(T.prev=B),B&&(B.next=T),M===this.head&&(this.head=T),M===this.tail&&(this.tail=B),M.list.length--,M.next=null,M.prev=null,M.list=null,T},c.prototype.unshiftNode=function(M){if(M!==this.head){M.list&&M.list.removeNode(M);var T=this.head;M.list=this,M.next=T,T&&(T.prev=M),this.head=M,this.tail||(this.tail=M),this.length++}},c.prototype.pushNode=function(M){if(M!==this.tail){M.list&&M.list.removeNode(M);var T=this.tail;M.list=this,M.prev=T,T&&(T.next=M),this.tail=M,this.head||(this.head=M),this.length++}},c.prototype.push=function(){for(var M=0,T=arguments.length;M<T;M++)t(this,arguments[M]);return this.length},c.prototype.unshift=function(){for(var M=0,T=arguments.length;M<T;M++)O(this,arguments[M]);return this.length},c.prototype.pop=function(){if(this.tail){var M=this.tail.value;return this.tail=this.tail.prev,this.tail?this.tail.next=null:this.head=null,this.length--,M}},c.prototype.shift=function(){if(this.head){var M=this.head.value;return this.head=this.head.next,this.head?this.head.prev=null:this.tail=null,this.length--,M}},c.prototype.forEach=function(M,T){T=T||this;for(var B=this.head,H=0;B!==null;H++)M.call(T,B.value,H,this),B=B.next},c.prototype.forEachReverse=function(M,T){T=T||this;for(var B=this.tail,H=this.length-1;B!==null;H--)M.call(T,B.value,H,this),B=B.prev},c.prototype.get=function(M){for(var T=0,B=this.head;B!==null&&T<M;T++)B=B.next;if(T===M&&B!==null)return B.value},c.prototype.getReverse=function(M){for(var T=0,B=this.tail;B!==null&&T<M;T++)B=B.prev;if(T===M&&B!==null)return B.value},c.prototype.map=function(M,T){T=T||this;for(var B=new c,H=this.head;H!==null;)B.push(M.call(T,H.value,this)),H=H.next;return B},c.prototype.mapReverse=function(M,T){T=T||this;for(var B=new c,H=this.tail;H!==null;)B.push(M.call(T,H.value,this)),H=H.prev;return B},c.prototype.reduce=function(M,T){var B,H=this.head;if(arguments.length>1)B=T;else{if(!this.head)throw new TypeError("Reduce of empty list with no initial value");H=this.head.next,B=this.head.value}for(var q=0;H!==null;q++)B=M(B,H.value,q),H=H.next;return B},c.prototype.reduceReverse=function(M,T){var B,H=this.tail;if(arguments.length>1)B=T;else{if(!this.tail)throw new TypeError("Reduce of empty list with no initial value");H=this.tail.prev,B=this.tail.value}for(var q=this.length-1;H!==null;q--)B=M(B,H.value,q),H=H.prev;return B},c.prototype.toArray=function(){for(var M=new Array(this.length),T=0,B=this.head;B!==null;T++)M[T]=B.value,B=B.next;return M},c.prototype.toArrayReverse=function(){for(var M=new Array(this.length),T=0,B=this.tail;B!==null;T++)M[T]=B.value,B=B.prev;return M},c.prototype.slice=function(M,T){(T=T||this.length)<0&&(T+=this.length),(M=M||0)<0&&(M+=this.length);var B=new c;if(T<M||T<0)return B;M<0&&(M=0),T>this.length&&(T=this.length);for(var H=0,q=this.head;q!==null&&H<M;H++)q=q.next;for(;q!==null&&H<T;H++,q=q.next)B.push(q.value);return B},c.prototype.sliceReverse=function(M,T){(T=T||this.length)<0&&(T+=this.length),(M=M||0)<0&&(M+=this.length);var B=new c;if(T<M||T<0)return B;M<0&&(M=0),T>this.length&&(T=this.length);for(var H=this.length,q=this.tail;q!==null&&H>T;H--)q=q.prev;for(;q!==null&&H>M;H--,q=q.prev)B.push(q.value);return B},c.prototype.splice=function(M,T){M>this.length&&(M=this.length-1),M<0&&(M=this.length+M);for(var B=0,H=this.head;H!==null&&B<M;B++)H=H.next;var q=[];for(B=0;H&&B<T;B++)q.push(H.value),H=this.removeNode(H);for(H===null&&(H=this.tail),H!==this.head&&H!==this.tail&&(H=H.prev),B=2;B<arguments.length;B++)H=_(this,H,arguments[B]);return q},c.prototype.reverse=function(){for(var M=this.head,T=this.tail,B=M;B!==null;B=B.prev){var H=B.prev;B.prev=B.next,B.next=H}return this.head=T,this.tail=M,this};try{a(11)(c)}catch(M){}},function(i,o,a){"use strict";i.exports=function(c){c.prototype[Symbol.iterator]=regeneratorRuntime.mark(function _(){var t;return regeneratorRuntime.wrap(function(O){for(;;)switch(O.prev=O.next){case 0:t=this.head;case 1:if(!t){O.next=7;break}return O.next=4,t.value;case 4:t=t.next,O.next=1;break;case 7:case"end":return O.stop()}},_,this)})}},function(i,o,a){"use strict";function c(rt){return(c=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(X){return typeof X}:function(X){return X&&typeof Symbol=="function"&&X.constructor===Symbol&&X!==Symbol.prototype?"symbol":typeof X})(rt)}var _=60103,t=60106,O=60107,N=60108,M=60114,T=60109,B=60110,H=60112,q=60113,ne=60120,m=60115,he=60116,De=60121,se=60122,fe=60117,_e=60129,ce=60131;if(typeof Symbol=="function"&&Symbol.for){var me=Symbol.for;_=me("react.element"),t=me("react.portal"),O=me("react.fragment"),N=me("react.strict_mode"),M=me("react.profiler"),T=me("react.provider"),B=me("react.context"),H=me("react.forward_ref"),q=me("react.suspense"),ne=me("react.suspense_list"),m=me("react.memo"),he=me("react.lazy"),De=me("react.block"),se=me("react.server.block"),fe=me("react.fundamental"),_e=me("react.debug_trace_mode"),ce=me("react.legacy_hidden")}function ie(rt){if(c(rt)==="object"&&rt!==null){var X=rt.$$typeof;switch(X){case _:switch(rt=rt.type){case O:case M:case N:case q:case ne:return rt;default:switch(rt=rt&&rt.$$typeof){case B:case H:case he:case m:case T:return rt;default:return X}}case t:return X}}}var Oe=T,Ue=_,je=H,at=O,Dt=he,Qe=m,ut=t,Ve=M,It=N,Xt=q;o.ContextConsumer=B,o.ContextProvider=Oe,o.Element=Ue,o.ForwardRef=je,o.Fragment=at,o.Lazy=Dt,o.Memo=Qe,o.Portal=ut,o.Profiler=Ve,o.StrictMode=It,o.Suspense=Xt,o.isAsyncMode=function(){return!1},o.isConcurrentMode=function(){return!1},o.isContextConsumer=function(rt){return ie(rt)===B},o.isContextProvider=function(rt){return ie(rt)===T},o.isElement=function(rt){return c(rt)==="object"&&rt!==null&&rt.$$typeof===_},o.isForwardRef=function(rt){return ie(rt)===H},o.isFragment=function(rt){return ie(rt)===O},o.isLazy=function(rt){return ie(rt)===he},o.isMemo=function(rt){return ie(rt)===m},o.isPortal=function(rt){return ie(rt)===t},o.isProfiler=function(rt){return ie(rt)===M},o.isStrictMode=function(rt){return ie(rt)===N},o.isSuspense=function(rt){return ie(rt)===q},o.isValidElementType=function(rt){return typeof rt=="string"||typeof rt=="function"||rt===O||rt===M||rt===_e||rt===N||rt===q||rt===ne||rt===ce||c(rt)==="object"&&rt!==null&&(rt.$$typeof===he||rt.$$typeof===m||rt.$$typeof===T||rt.$$typeof===B||rt.$$typeof===H||rt.$$typeof===fe||rt.$$typeof===De||rt[0]===se)},o.typeOf=ie},function(i,o,a){(function(c){var _=c!==void 0&&c||typeof self!="undefined"&&self||window,t=Function.prototype.apply;function O(N,M){this._id=N,this._clearFn=M}o.setTimeout=function(){return new O(t.call(setTimeout,_,arguments),clearTimeout)},o.setInterval=function(){return new O(t.call(setInterval,_,arguments),clearInterval)},o.clearTimeout=o.clearInterval=function(N){N&&N.close()},O.prototype.unref=O.prototype.ref=function(){},O.prototype.close=function(){this._clearFn.call(_,this._id)},o.enroll=function(N,M){clearTimeout(N._idleTimeoutId),N._idleTimeout=M},o.unenroll=function(N){clearTimeout(N._idleTimeoutId),N._idleTimeout=-1},o._unrefActive=o.active=function(N){clearTimeout(N._idleTimeoutId);var M=N._idleTimeout;M>=0&&(N._idleTimeoutId=setTimeout(function(){N._onTimeout&&N._onTimeout()},M))},a(14),o.setImmediate=typeof self!="undefined"&&self.setImmediate||c!==void 0&&c.setImmediate||this&&this.setImmediate,o.clearImmediate=typeof self!="undefined"&&self.clearImmediate||c!==void 0&&c.clearImmediate||this&&this.clearImmediate}).call(this,a(4))},function(i,o,a){(function(c,_){(function(t,O){"use strict";if(!t.setImmediate){var N,M,T,B,H,q=1,ne={},m=!1,he=t.document,De=Object.getPrototypeOf&&Object.getPrototypeOf(t);De=De&&De.setTimeout?De:t,{}.toString.call(t.process)==="[object process]"?N=function(_e){_.nextTick(function(){fe(_e)})}:function(){if(t.postMessage&&!t.importScripts){var _e=!0,ce=t.onmessage;return t.onmessage=function(){_e=!1},t.postMessage("","*"),t.onmessage=ce,_e}}()?(B="setImmediate$"+Math.random()+"$",H=function(_e){_e.source===t&&typeof _e.data=="string"&&_e.data.indexOf(B)===0&&fe(+_e.data.slice(B.length))},t.addEventListener?t.addEventListener("message",H,!1):t.attachEvent("onmessage",H),N=function(_e){t.postMessage(B+_e,"*")}):t.MessageChannel?((T=new MessageChannel).port1.onmessage=function(_e){fe(_e.data)},N=function(_e){T.port2.postMessage(_e)}):he&&"onreadystatechange"in he.createElement("script")?(M=he.documentElement,N=function(_e){var ce=he.createElement("script");ce.onreadystatechange=function(){fe(_e),ce.onreadystatechange=null,M.removeChild(ce),ce=null},M.appendChild(ce)}):N=function(_e){setTimeout(fe,0,_e)},De.setImmediate=function(_e){typeof _e!="function"&&(_e=new Function(""+_e));for(var ce=new Array(arguments.length-1),me=0;me<ce.length;me++)ce[me]=arguments[me+1];var ie={callback:_e,args:ce};return ne[q]=ie,N(q),q++},De.clearImmediate=se}function se(_e){delete ne[_e]}function fe(_e){if(m)setTimeout(fe,0,_e);else{var ce=ne[_e];if(ce){m=!0;try{(function(me){var ie=me.callback,Oe=me.args;switch(Oe.length){case 0:ie();break;case 1:ie(Oe[0]);break;case 2:ie(Oe[0],Oe[1]);break;case 3:ie(Oe[0],Oe[1],Oe[2]);break;default:ie.apply(void 0,Oe)}})(ce)}finally{se(_e),m=!1}}}}})(typeof self=="undefined"?c===void 0?this:c:self)}).call(this,a(4),a(5))},function(i,o,a){"use strict";function c(ie){return(c=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(Oe){return typeof Oe}:function(Oe){return Oe&&typeof Symbol=="function"&&Oe.constructor===Symbol&&Oe!==Symbol.prototype?"symbol":typeof Oe})(ie)}var _=a(1),t=a(16),O=a(18).__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,N=60128;if(typeof Symbol=="function"&&Symbol.for){var M=Symbol.for;N=M("react.opaque.id")}var T=[],B=null,H=null;function q(){if(B===null){var ie=new Map;try{he.useContext({_currentValue:null}),he.useState(null),he.useReducer(function(at){return at},null),he.useRef(null),he.useLayoutEffect(function(){}),he.useEffect(function(){}),he.useImperativeHandle(void 0,function(){return null}),he.useDebugValue(null),he.useCallback(function(){}),he.useMemo(function(){return null})}finally{var Oe=T;T=[]}for(var Ue=0;Ue<Oe.length;Ue++){var je=Oe[Ue];ie.set(je.primitive,t.parse(je.stackError))}B=ie}return B}var ne=null;function m(){var ie=ne;return ie!==null&&(ne=ie.next),ie}var he={readContext:function(ie){return ie._currentValue},useCallback:function(ie){var Oe=m();return T.push({primitive:"Callback",stackError:Error(),value:Oe!==null?Oe.memoizedState[0]:ie}),ie},useContext:function(ie){return T.push({primitive:"Context",stackError:Error(),value:ie._currentValue}),ie._currentValue},useEffect:function(ie){m(),T.push({primitive:"Effect",stackError:Error(),value:ie})},useImperativeHandle:function(ie){m();var Oe=void 0;ie!==null&&c(ie)==="object"&&(Oe=ie.current),T.push({primitive:"ImperativeHandle",stackError:Error(),value:Oe})},useDebugValue:function(ie,Oe){T.push({primitive:"DebugValue",stackError:Error(),value:typeof Oe=="function"?Oe(ie):ie})},useLayoutEffect:function(ie){m(),T.push({primitive:"LayoutEffect",stackError:Error(),value:ie})},useMemo:function(ie){var Oe=m();return ie=Oe!==null?Oe.memoizedState[0]:ie(),T.push({primitive:"Memo",stackError:Error(),value:ie}),ie},useReducer:function(ie,Oe,Ue){return Oe=(ie=m())!==null?ie.memoizedState:Ue!==void 0?Ue(Oe):Oe,T.push({primitive:"Reducer",stackError:Error(),value:Oe}),[Oe,function(){}]},useRef:function(ie){var Oe=m();return ie=Oe!==null?Oe.memoizedState:{current:ie},T.push({primitive:"Ref",stackError:Error(),value:ie.current}),ie},useState:function(ie){var Oe=m();return ie=Oe!==null?Oe.memoizedState:typeof ie=="function"?ie():ie,T.push({primitive:"State",stackError:Error(),value:ie}),[ie,function(){}]},useTransition:function(){return m(),m(),T.push({primitive:"Transition",stackError:Error(),value:void 0}),[function(){},!1]},useMutableSource:function(ie,Oe){return m(),m(),m(),m(),ie=Oe(ie._source),T.push({primitive:"MutableSource",stackError:Error(),value:ie}),ie},useDeferredValue:function(ie){return m(),m(),T.push({primitive:"DeferredValue",stackError:Error(),value:ie}),ie},useOpaqueIdentifier:function(){var ie=m();return H&&H.mode===0&&m(),(ie=ie===null?void 0:ie.memoizedState)&&ie.$$typeof===N&&(ie=void 0),T.push({primitive:"OpaqueIdentifier",stackError:Error(),value:ie}),ie}},De=0;function se(ie,Oe,Ue){var je=Oe[Ue].source,at=0;e:for(;at<ie.length;at++)if(ie[at].source===je){for(var Dt=Ue+1,Qe=at+1;Dt<Oe.length&&Qe<ie.length;Dt++,Qe++)if(ie[Qe].source!==Oe[Dt].source)continue e;return at}return-1}function fe(ie,Oe){return!!ie&&(Oe="use"+Oe,!(ie.length<Oe.length)&&ie.lastIndexOf(Oe)===ie.length-Oe.length)}function _e(ie){if(!ie)return"";var Oe=ie.lastIndexOf(".");return Oe===-1&&(Oe=0),ie.substr(Oe,3)==="use"&&(Oe+=3),ie.substr(Oe)}function ce(ie,Oe){for(var Ue=[],je=null,at=Ue,Dt=0,Qe=[],ut=0;ut<Oe.length;ut++){var Ve=Oe[ut],It=ie,Xt=t.parse(Ve.stackError);e:{var rt=Xt,X=se(rt,It,De);if(X!==-1)It=X;else{for(var de=0;de<It.length&&5>de;de++)if((X=se(rt,It,de))!==-1){De=de,It=X;break e}It=-1}}e:{if(rt=Xt,(X=q().get(Ve.primitive))!==void 0){for(de=0;de<X.length&&de<rt.length;de++)if(X[de].source!==rt[de].source){de<rt.length-1&&fe(rt[de].functionName,Ve.primitive)&&de++,de<rt.length-1&&fe(rt[de].functionName,Ve.primitive)&&de++,rt=de;break e}}rt=-1}if((Xt=It===-1||rt===-1||2>It-rt?null:Xt.slice(rt,It-1))!==null){if(It=0,je!==null){for(;It<Xt.length&&It<je.length&&Xt[Xt.length-It-1].source===je[je.length-It-1].source;)It++;for(je=je.length-1;je>It;je--)at=Qe.pop()}for(je=Xt.length-It-1;1<=je;je--)It=[],at.push({id:null,isStateEditable:!1,name:_e(Xt[je-1].functionName),value:void 0,subHooks:It}),Qe.push(at),at=It;je=Xt}It=(Xt=Ve.primitive)==="Context"||Xt==="DebugValue"?null:Dt++,at.push({id:It,isStateEditable:Xt==="Reducer"||Xt==="State",name:Xt,value:Ve.value,subHooks:[]})}return function Ce(oe,He){for(var dt=[],At=0;At<oe.length;At++){var nn=oe[At];nn.name==="DebugValue"&&nn.subHooks.length===0?(oe.splice(At,1),At--,dt.push(nn)):Ce(nn.subHooks,nn)}He!==null&&(dt.length===1?He.value=dt[0].value:1<dt.length&&(He.value=dt.map(function(an){return an.value})))}(Ue,null),Ue}function me(ie,Oe,Ue){Ue==null&&(Ue=O.ReactCurrentDispatcher);var je=Ue.current;Ue.current=he;try{var at=Error();ie(Oe)}finally{ie=T,T=[],Ue.current=je}return ce(Ue=t.parse(at),ie)}o.inspectHooks=me,o.inspectHooksOfFiber=function(ie,Oe){if(Oe==null&&(Oe=O.ReactCurrentDispatcher),H=ie,ie.tag!==0&&ie.tag!==15&&ie.tag!==11&&ie.tag!==22)throw Error("Unknown Fiber. Needs to be a function component to inspect hooks.");q();var Ue=ie.type,je=ie.memoizedProps;if(Ue!==ie.elementType&&Ue&&Ue.defaultProps){je=_({},je);var at=Ue.defaultProps;for(Dt in at)je[Dt]===void 0&&(je[Dt]=at[Dt])}ne=ie.memoizedState;var Dt=new Map;try{for(at=ie;at;){if(at.tag===10){var Qe=at.type._context;Dt.has(Qe)||(Dt.set(Qe,Qe._currentValue),Qe._currentValue=at.memoizedProps.value)}at=at.return}if(ie.tag===11){var ut=Ue.render;Ue=je;var Ve=ie.ref,It=(ie=Oe).current;ie.current=he;try{var Xt=Error();ut(Ue,Ve)}finally{var rt=T;T=[],ie.current=It}return ce(t.parse(Xt),rt)}return me(Ue,je,Oe)}finally{ne=null,function(X){X.forEach(function(de,Ce){return Ce._currentValue=de})}(Dt)}}},function(i,o,a){var c,_,t;(function(O,N){"use strict";_=[a(17)],(t=typeof(c=function(M){var T=/(^|@)\S+:\d+/,B=/^\s*at .*(\S+:\d+|\(native\))/m,H=/^(eval@)?(\[native code])?$/;return{parse:function(q){if(q.stacktrace!==void 0||q["opera#sourceloc"]!==void 0)return this.parseOpera(q);if(q.stack&&q.stack.match(B))return this.parseV8OrIE(q);if(q.stack)return this.parseFFOrSafari(q);throw new Error("Cannot parse given Error object")},extractLocation:function(q){if(q.indexOf(":")===-1)return[q];var ne=/(.+?)(?::(\d+))?(?::(\d+))?$/.exec(q.replace(/[()]/g,""));return[ne[1],ne[2]||void 0,ne[3]||void 0]},parseV8OrIE:function(q){return q.stack.split(`
-`).filter(function(ne){return!!ne.match(B)},this).map(function(ne){ne.indexOf("(eval ")>-1&&(ne=ne.replace(/eval code/g,"eval").replace(/(\(eval at [^()]*)|(\),.*$)/g,""));var m=ne.replace(/^\s+/,"").replace(/\(eval code/g,"("),he=m.match(/ (\((.+):(\d+):(\d+)\)$)/),De=(m=he?m.replace(he[0],""):m).split(/\s+/).slice(1),se=this.extractLocation(he?he[1]:De.pop()),fe=De.join(" ")||void 0,_e=["eval","<anonymous>"].indexOf(se[0])>-1?void 0:se[0];return new M({functionName:fe,fileName:_e,lineNumber:se[1],columnNumber:se[2],source:ne})},this)},parseFFOrSafari:function(q){return q.stack.split(`
-`).filter(function(ne){return!ne.match(H)},this).map(function(ne){if(ne.indexOf(" > eval")>-1&&(ne=ne.replace(/ line (\d+)(?: > eval line \d+)* > eval:\d+:\d+/g,":$1")),ne.indexOf("@")===-1&&ne.indexOf(":")===-1)return new M({functionName:ne});var m=/((.*".+"[^@]*)?[^@]*)(?:@)/,he=ne.match(m),De=he&&he[1]?he[1]:void 0,se=this.extractLocation(ne.replace(m,""));return new M({functionName:De,fileName:se[0],lineNumber:se[1],columnNumber:se[2],source:ne})},this)},parseOpera:function(q){return!q.stacktrace||q.message.indexOf(`
-`)>-1&&q.message.split(`
-`).length>q.stacktrace.split(`
-`).length?this.parseOpera9(q):q.stack?this.parseOpera11(q):this.parseOpera10(q)},parseOpera9:function(q){for(var ne=/Line (\d+).*script (?:in )?(\S+)/i,m=q.message.split(`
-`),he=[],De=2,se=m.length;De<se;De+=2){var fe=ne.exec(m[De]);fe&&he.push(new M({fileName:fe[2],lineNumber:fe[1],source:m[De]}))}return he},parseOpera10:function(q){for(var ne=/Line (\d+).*script (?:in )?(\S+)(?:: In function (\S+))?$/i,m=q.stacktrace.split(`
-`),he=[],De=0,se=m.length;De<se;De+=2){var fe=ne.exec(m[De]);fe&&he.push(new M({functionName:fe[3]||void 0,fileName:fe[2],lineNumber:fe[1],source:m[De]}))}return he},parseOpera11:function(q){return q.stack.split(`
-`).filter(function(ne){return!!ne.match(T)&&!ne.match(/^Error created at/)},this).map(function(ne){var m,he=ne.split("@"),De=this.extractLocation(he.pop()),se=he.shift()||"",fe=se.replace(/<anonymous function(: (\w+))?>/,"$2").replace(/\([^)]*\)/g,"")||void 0;se.match(/\(([^)]*)\)/)&&(m=se.replace(/^[^(]+\(([^)]*)\)$/,"$1"));var _e=m===void 0||m==="[arguments not available]"?void 0:m.split(",");return new M({functionName:fe,args:_e,fileName:De[0],lineNumber:De[1],columnNumber:De[2],source:ne})},this)}}})=="function"?c.apply(o,_):c)===void 0||(i.exports=t)})()},function(i,o,a){var c,_,t;(function(O,N){"use strict";_=[],(t=typeof(c=function(){function M(fe){return fe.charAt(0).toUpperCase()+fe.substring(1)}function T(fe){return function(){return this[fe]}}var B=["isConstructor","isEval","isNative","isToplevel"],H=["columnNumber","lineNumber"],q=["fileName","functionName","source"],ne=B.concat(H,q,["args"]);function m(fe){if(fe)for(var _e=0;_e<ne.length;_e++)fe[ne[_e]]!==void 0&&this["set"+M(ne[_e])](fe[ne[_e]])}m.prototype={getArgs:function(){return this.args},setArgs:function(fe){if(Object.prototype.toString.call(fe)!=="[object Array]")throw new TypeError("Args must be an Array");this.args=fe},getEvalOrigin:function(){return this.evalOrigin},setEvalOrigin:function(fe){if(fe instanceof m)this.evalOrigin=fe;else{if(!(fe instanceof Object))throw new TypeError("Eval Origin must be an Object or StackFrame");this.evalOrigin=new m(fe)}},toString:function(){var fe=this.getFileName()||"",_e=this.getLineNumber()||"",ce=this.getColumnNumber()||"",me=this.getFunctionName()||"";return this.getIsEval()?fe?"[eval] ("+fe+":"+_e+":"+ce+")":"[eval]:"+_e+":"+ce:me?me+" ("+fe+":"+_e+":"+ce+")":fe+":"+_e+":"+ce}},m.fromString=function(fe){var _e=fe.indexOf("("),ce=fe.lastIndexOf(")"),me=fe.substring(0,_e),ie=fe.substring(_e+1,ce).split(","),Oe=fe.substring(ce+1);if(Oe.indexOf("@")===0)var Ue=/@(.+?)(?::(\d+))?(?::(\d+))?$/.exec(Oe,""),je=Ue[1],at=Ue[2],Dt=Ue[3];return new m({functionName:me,args:ie||void 0,fileName:je,lineNumber:at||void 0,columnNumber:Dt||void 0})};for(var he=0;he<B.length;he++)m.prototype["get"+M(B[he])]=T(B[he]),m.prototype["set"+M(B[he])]=function(fe){return function(_e){this[fe]=Boolean(_e)}}(B[he]);for(var De=0;De<H.length;De++)m.prototype["get"+M(H[De])]=T(H[De]),m.prototype["set"+M(H[De])]=function(fe){return function(_e){if(ce=_e,isNaN(parseFloat(ce))||!isFinite(ce))throw new TypeError(fe+" must be a Number");var ce;this[fe]=Number(_e)}}(H[De]);for(var se=0;se<q.length;se++)m.prototype["get"+M(q[se])]=T(q[se]),m.prototype["set"+M(q[se])]=function(fe){return function(_e){this[fe]=String(_e)}}(q[se]);return m})=="function"?c.apply(o,_):c)===void 0||(i.exports=t)})()},function(i,o,a){"use strict";i.exports=a(19)},function(i,o,a){"use strict";function c(oe){return(c=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(He){return typeof He}:function(He){return He&&typeof Symbol=="function"&&He.constructor===Symbol&&He!==Symbol.prototype?"symbol":typeof He})(oe)}var _=a(1),t=60103,O=60106;o.Fragment=60107,o.StrictMode=60108,o.Profiler=60114;var N=60109,M=60110,T=60112;o.Suspense=60113,o.unstable_SuspenseList=60120;var B=60115,H=60116,q=60121;if(o.unstable_DebugTracingMode=60129,o.unstable_LegacyHidden=60131,typeof Symbol=="function"&&Symbol.for){var ne=Symbol.for;t=ne("react.element"),O=ne("react.portal"),o.Fragment=ne("react.fragment"),o.StrictMode=ne("react.strict_mode"),o.Profiler=ne("react.profiler"),N=ne("react.provider"),M=ne("react.context"),T=ne("react.forward_ref"),o.Suspense=ne("react.suspense"),o.unstable_SuspenseList=ne("react.suspense_list"),B=ne("react.memo"),H=ne("react.lazy"),q=ne("react.block"),o.unstable_DebugTracingMode=ne("react.debug_trace_mode"),o.unstable_LegacyHidden=ne("react.legacy_hidden")}var m=typeof Symbol=="function"&&Symbol.iterator;function he(oe){for(var He="https://reactjs.org/docs/error-decoder.html?invariant="+oe,dt=1;dt<arguments.length;dt++)He+="&args[]="+encodeURIComponent(arguments[dt]);return"Minified React error #"+oe+"; visit "+He+" for the full message or use the non-minified dev environment for full errors and additional helpful warnings."}var De={isMounted:function(){return!1},enqueueForceUpdate:function(){},enqueueReplaceState:function(){},enqueueSetState:function(){}},se={};function fe(oe,He,dt){this.props=oe,this.context=He,this.refs=se,this.updater=dt||De}function _e(){}function ce(oe,He,dt){this.props=oe,this.context=He,this.refs=se,this.updater=dt||De}fe.prototype.isReactComponent={},fe.prototype.setState=function(oe,He){if(c(oe)!=="object"&&typeof oe!="function"&&oe!=null)throw Error(he(85));this.updater.enqueueSetState(this,oe,He,"setState")},fe.prototype.forceUpdate=function(oe){this.updater.enqueueForceUpdate(this,oe,"forceUpdate")},_e.prototype=fe.prototype;var me=ce.prototype=new _e;me.constructor=ce,_(me,fe.prototype),me.isPureReactComponent=!0;var ie={current:null},Oe=Object.prototype.hasOwnProperty,Ue={key:!0,ref:!0,__self:!0,__source:!0};function je(oe,He,dt){var At,nn={},an=null,Mn=null;if(He!=null)for(At in He.ref!==void 0&&(Mn=He.ref),He.key!==void 0&&(an=""+He.key),He)Oe.call(He,At)&&!Ue.hasOwnProperty(At)&&(nn[At]=He[At]);var lr=arguments.length-2;if(lr===1)nn.children=dt;else if(1<lr){for(var ln=Array(lr),Vt=0;Vt<lr;Vt++)ln[Vt]=arguments[Vt+2];nn.children=ln}if(oe&&oe.defaultProps)for(At in lr=oe.defaultProps)nn[At]===void 0&&(nn[At]=lr[At]);return{$$typeof:t,type:oe,key:an,ref:Mn,props:nn,_owner:ie.current}}function at(oe){return c(oe)==="object"&&oe!==null&&oe.$$typeof===t}var Dt=/\/+/g;function Qe(oe,He){return c(oe)==="object"&&oe!==null&&oe.key!=null?function(dt){var At={"=":"=0",":":"=2"};return"$"+dt.replace(/[=:]/g,function(nn){return At[nn]})}(""+oe.key):He.toString(36)}function ut(oe,He,dt,At,nn){var an=c(oe);an!=="undefined"&&an!=="boolean"||(oe=null);var Mn=!1;if(oe===null)Mn=!0;else switch(an){case"string":case"number":Mn=!0;break;case"object":switch(oe.$$typeof){case t:case O:Mn=!0}}if(Mn)return nn=nn(Mn=oe),oe=At===""?"."+Qe(Mn,0):At,Array.isArray(nn)?(dt="",oe!=null&&(dt=oe.replace(Dt,"$&/")+"/"),ut(nn,He,dt,"",function(Vt){return Vt})):nn!=null&&(at(nn)&&(nn=function(Vt,Dr){return{$$typeof:t,type:Vt.type,key:Dr,ref:Vt.ref,props:Vt.props,_owner:Vt._owner}}(nn,dt+(!nn.key||Mn&&Mn.key===nn.key?"":(""+nn.key).replace(Dt,"$&/")+"/")+oe)),He.push(nn)),1;if(Mn=0,At=At===""?".":At+":",Array.isArray(oe))for(var lr=0;lr<oe.length;lr++){var ln=At+Qe(an=oe[lr],lr);Mn+=ut(an,He,dt,ln,nn)}else if(typeof(ln=function(Vt){return Vt===null||c(Vt)!=="object"?null:typeof(Vt=m&&Vt[m]||Vt["@@iterator"])=="function"?Vt:null}(oe))=="function")for(oe=ln.call(oe),lr=0;!(an=oe.next()).done;)Mn+=ut(an=an.value,He,dt,ln=At+Qe(an,lr++),nn);else if(an==="object")throw He=""+oe,Error(he(31,He==="[object Object]"?"object with keys {"+Object.keys(oe).join(", ")+"}":He));return Mn}function Ve(oe,He,dt){if(oe==null)return oe;var At=[],nn=0;return ut(oe,At,"","",function(an){return He.call(dt,an,nn++)}),At}function It(oe){if(oe._status===-1){var He=oe._result;He=He(),oe._status=0,oe._result=He,He.then(function(dt){oe._status===0&&(dt=dt.default,oe._status=1,oe._result=dt)},function(dt){oe._status===0&&(oe._status=2,oe._result=dt)})}if(oe._status===1)return oe._result;throw oe._result}function Xt(oe){return{$$typeof:q,_data:oe.load.apply(null,oe.args),_render:oe.render}}var rt={current:null};function X(){var oe=rt.current;if(oe===null)throw Error(he(321));return oe}var de={transition:0},Ce={ReactCurrentDispatcher:rt,ReactCurrentBatchConfig:de,ReactCurrentOwner:ie,IsSomeRendererActing:{current:!1},assign:_};o.Children={map:Ve,forEach:function(oe,He,dt){Ve(oe,function(){He.apply(this,arguments)},dt)},count:function(oe){var He=0;return Ve(oe,function(){He++}),He},toArray:function(oe){return Ve(oe,function(He){return He})||[]},only:function(oe){if(!at(oe))throw Error(he(143));return oe}},o.Component=fe,o.PureComponent=ce,o.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED=Ce,o.cloneElement=function(oe,He,dt){if(oe==null)throw Error(he(267,oe));var At=_({},oe.props),nn=oe.key,an=oe.ref,Mn=oe._owner;if(He!=null){if(He.ref!==void 0&&(an=He.ref,Mn=ie.current),He.key!==void 0&&(nn=""+He.key),oe.type&&oe.type.defaultProps)var lr=oe.type.defaultProps;for(ln in He)Oe.call(He,ln)&&!Ue.hasOwnProperty(ln)&&(At[ln]=He[ln]===void 0&&lr!==void 0?lr[ln]:He[ln])}var ln=arguments.length-2;if(ln===1)At.children=dt;else if(1<ln){lr=Array(ln);for(var Vt=0;Vt<ln;Vt++)lr[Vt]=arguments[Vt+2];At.children=lr}return{$$typeof:t,type:oe.type,key:nn,ref:an,props:At,_owner:Mn}},o.createContext=function(oe,He){return He===void 0&&(He=null),(oe={$$typeof:M,_calculateChangedBits:He,_currentValue:oe,_currentValue2:oe,_threadCount:0,Provider:null,Consumer:null}).Provider={$$typeof:N,_context:oe},oe.Consumer=oe},o.createElement=je,o.createFactory=function(oe){var He=je.bind(null,oe);return He.type=oe,He},o.createRef=function(){return{current:null}},o.forwardRef=function(oe){return{$$typeof:T,render:oe}},o.isValidElement=at,o.lazy=function(oe){return{$$typeof:H,_payload:{_status:-1,_result:oe},_init:It}},o.memo=function(oe,He){return{$$typeof:B,type:oe,compare:He===void 0?null:He}},o.unstable_block=function(oe,He){return He===void 0?function(){return{$$typeof:q,_data:void 0,_render:oe}}:function(){return{$$typeof:H,_payload:{load:He,args:arguments,render:oe},_init:Xt}}},o.unstable_createMutableSource=function(oe,He){return{_getVersion:He,_source:oe,_workInProgressVersionPrimary:null,_workInProgressVersionSecondary:null}},o.unstable_startTransition=function(oe){var He=de.transition;de.transition=1;try{oe()}finally{de.transition=He}},o.unstable_useDeferredValue=function(oe){return X().useDeferredValue(oe)},o.unstable_useMutableSource=function(oe,He,dt){return X().useMutableSource(oe,He,dt)},o.unstable_useOpaqueIdentifier=function(){return X().useOpaqueIdentifier()},o.unstable_useTransition=function(){return X().useTransition()},o.useCallback=function(oe,He){return X().useCallback(oe,He)},o.useContext=function(oe,He){return X().useContext(oe,He)},o.useDebugValue=function(){},o.useEffect=function(oe,He){return X().useEffect(oe,He)},o.useImperativeHandle=function(oe,He,dt){return X().useImperativeHandle(oe,He,dt)},o.useLayoutEffect=function(oe,He){return X().useLayoutEffect(oe,He)},o.useMemo=function(oe,He){return X().useMemo(oe,He)},o.useReducer=function(oe,He,dt){return X().useReducer(oe,He,dt)},o.useRef=function(oe){return X().useRef(oe)},o.useState=function(oe){return X().useState(oe)},o.version="17.0.0-alpha.0-experimental-51a3aa6af"},function(i,o,a){"use strict";function c(U,z){for(var G=0;G<z.length;G++){var $=z[G];$.enumerable=$.enumerable||!1,$.configurable=!0,"value"in $&&($.writable=!0),Object.defineProperty(U,$.key,$)}}a.r(o),a.d(o,"connectToDevTools",function(){return ji});var _=function(){function U(){var Te,ye,Ae;(function(Z,ke){if(!(Z instanceof ke))throw new TypeError("Cannot call a class as a function")})(this,U),Te=this,ye="listenersMap",Ae=new Map,ye in Te?Object.defineProperty(Te,ye,{value:Ae,enumerable:!0,configurable:!0,writable:!0}):Te[ye]=Ae}var z,G,$;return z=U,(G=[{key:"addListener",value:function(Te,ye){var Ae=this.listenersMap.get(Te);Ae===void 0?this.listenersMap.set(Te,[ye]):Ae.indexOf(ye)<0&&Ae.push(ye)}},{key:"emit",value:function(Te){var ye=this.listenersMap.get(Te);if(ye!==void 0){for(var Ae=arguments.length,Z=new Array(Ae>1?Ae-1:0),ke=1;ke<Ae;ke++)Z[ke-1]=arguments[ke];if(ye.length===1){var Je=ye[0];Je.apply(null,Z)}else{for(var vt=!1,ue=null,qe=Array.from(ye),nt=0;nt<qe.length;nt++){var Ct=qe[nt];try{Ct.apply(null,Z)}catch(Mt){ue===null&&(vt=!0,ue=Mt)}}if(vt)throw ue}}}},{key:"removeAllListeners",value:function(){this.listenersMap.clear()}},{key:"removeListener",value:function(Te,ye){var Ae=this.listenersMap.get(Te);if(Ae!==void 0){var Z=Ae.indexOf(ye);Z>=0&&Ae.splice(Z,1)}}}])&&c(z.prototype,G),$&&c(z,$),U}(),t=a(2),O=a.n(t);try{var N=a(9).default,M=function(U){var z=new RegExp("".concat(U,": ([0-9]+)")),G=N.match(z);return parseInt(G[1],10)};M("comfortable-line-height-data"),M("compact-line-height-data")}catch(U){}function T(U){try{return sessionStorage.getItem(U)}catch(z){return null}}function B(U){try{sessionStorage.removeItem(U)}catch(z){}}function H(U,z){try{return sessionStorage.setItem(U,z)}catch(G){}}var q=function(U,z){return U===z},ne=a(1),m=a.n(ne);function he(U){return U.ownerDocument?U.ownerDocument.defaultView:null}function De(U){var z=he(U);return z?z.frameElement:null}function se(U){var z=ce(U);return fe([U.getBoundingClientRect(),{top:z.borderTop,left:z.borderLeft,bottom:z.borderBottom,right:z.borderRight,width:0,height:0}])}function fe(U){return U.reduce(function(z,G){return z==null?G:{top:z.top+G.top,left:z.left+G.left,width:z.width,height:z.height,bottom:z.bottom+G.bottom,right:z.right+G.right}})}function _e(U,z){var G=De(U);if(G&&G!==z){for(var $=[U.getBoundingClientRect()],Te=G,ye=!1;Te;){var Ae=se(Te);if($.push(Ae),Te=De(Te),ye)break;Te&&he(Te)===z&&(ye=!0)}return fe($)}return U.getBoundingClientRect()}function ce(U){var z=window.getComputedStyle(U);return{borderLeft:parseInt(z.borderLeftWidth,10),borderRight:parseInt(z.borderRightWidth,10),borderTop:parseInt(z.borderTopWidth,10),borderBottom:parseInt(z.borderBottomWidth,10),marginLeft:parseInt(z.marginLeft,10),marginRight:parseInt(z.marginRight,10),marginTop:parseInt(z.marginTop,10),marginBottom:parseInt(z.marginBottom,10),paddingLeft:parseInt(z.paddingLeft,10),paddingRight:parseInt(z.paddingRight,10),paddingTop:parseInt(z.paddingTop,10),paddingBottom:parseInt(z.paddingBottom,10)}}function me(U,z){var G;if(typeof Symbol=="undefined"||U[Symbol.iterator]==null){if(Array.isArray(U)||(G=function(ke,Je){if(!!ke){if(typeof ke=="string")return ie(ke,Je);var vt=Object.prototype.toString.call(ke).slice(8,-1);if(vt==="Object"&&ke.constructor&&(vt=ke.constructor.name),vt==="Map"||vt==="Set")return Array.from(ke);if(vt==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(vt))return ie(ke,Je)}}(U))||z&&U&&typeof U.length=="number"){G&&(U=G);var $=0,Te=function(){};return{s:Te,n:function(){return $>=U.length?{done:!0}:{done:!1,value:U[$++]}},e:function(ke){throw ke},f:Te}}throw new TypeError(`Invalid attempt to iterate non-iterable instance.
-In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`)}var ye,Ae=!0,Z=!1;return{s:function(){G=U[Symbol.iterator]()},n:function(){var ke=G.next();return Ae=ke.done,ke},e:function(ke){Z=!0,ye=ke},f:function(){try{Ae||G.return==null||G.return()}finally{if(Z)throw ye}}}}function ie(U,z){(z==null||z>U.length)&&(z=U.length);for(var G=0,$=new Array(z);G<z;G++)$[G]=U[G];return $}function Oe(U,z){if(!(U instanceof z))throw new TypeError("Cannot call a class as a function")}function Ue(U,z){for(var G=0;G<z.length;G++){var $=z[G];$.enumerable=$.enumerable||!1,$.configurable=!0,"value"in $&&($.writable=!0),Object.defineProperty(U,$.key,$)}}function je(U,z,G){return z&&Ue(U.prototype,z),G&&Ue(U,G),U}var at=function(){function U(z,G){Oe(this,U),this.node=z.createElement("div"),this.border=z.createElement("div"),this.padding=z.createElement("div"),this.content=z.createElement("div"),this.border.style.borderColor=Ve.border,this.padding.style.borderColor=Ve.padding,this.content.style.backgroundColor=Ve.background,m()(this.node.style,{borderColor:Ve.margin,pointerEvents:"none",position:"fixed"}),this.node.style.zIndex="10000000",this.node.appendChild(this.border),this.border.appendChild(this.padding),this.padding.appendChild(this.content),G.appendChild(this.node)}return je(U,[{key:"remove",value:function(){this.node.parentNode&&this.node.parentNode.removeChild(this.node)}},{key:"update",value:function(z,G){ut(G,"margin",this.node),ut(G,"border",this.border),ut(G,"padding",this.padding),m()(this.content.style,{height:z.height-G.borderTop-G.borderBottom-G.paddingTop-G.paddingBottom+"px",width:z.width-G.borderLeft-G.borderRight-G.paddingLeft-G.paddingRight+"px"}),m()(this.node.style,{top:z.top-G.marginTop+"px",left:z.left-G.marginLeft+"px"})}}]),U}(),Dt=function(){function U(z,G){Oe(this,U),this.tip=z.createElement("div"),m()(this.tip.style,{display:"flex",flexFlow:"row nowrap",backgroundColor:"#333740",borderRadius:"2px",fontFamily:'"SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace',fontWeight:"bold",padding:"3px 5px",pointerEvents:"none",position:"fixed",fontSize:"12px",whiteSpace:"nowrap"}),this.nameSpan=z.createElement("span"),this.tip.appendChild(this.nameSpan),m()(this.nameSpan.style,{color:"#ee78e6",borderRight:"1px solid #aaaaaa",paddingRight:"0.5rem",marginRight:"0.5rem"}),this.dimSpan=z.createElement("span"),this.tip.appendChild(this.dimSpan),m()(this.dimSpan.style,{color:"#d7d7d7"}),this.tip.style.zIndex="10000000",G.appendChild(this.tip)}return je(U,[{key:"remove",value:function(){this.tip.parentNode&&this.tip.parentNode.removeChild(this.tip)}},{key:"updateText",value:function(z,G,$){this.nameSpan.textContent=z,this.dimSpan.textContent=Math.round(G)+"px \xD7 "+Math.round($)+"px"}},{key:"updatePosition",value:function(z,G){var $=this.tip.getBoundingClientRect(),Te=function(ye,Ae,Z){var ke,Je=Math.max(Z.height,20),vt=Math.max(Z.width,60);ke=ye.top+ye.height+Je<=Ae.top+Ae.height?ye.top+ye.height<Ae.top+0?Ae.top+5:ye.top+ye.height+5:ye.top-Je<=Ae.top+Ae.height?ye.top-Je-5<Ae.top+5?Ae.top+5:ye.top-Je-5:Ae.top+Ae.height-Je-5;var ue=ye.left+5;return ye.left<Ae.left&&(ue=Ae.left+5),ye.left+vt>Ae.left+Ae.width&&(ue=Ae.left+Ae.width-vt-5),{style:{top:ke+="px",left:ue+="px"}}}(z,G,{width:$.width,height:$.height});m()(this.tip.style,Te.style)}}]),U}(),Qe=function(){function U(){Oe(this,U);var z=window.__REACT_DEVTOOLS_TARGET_WINDOW__||window;this.window=z;var G=window.__REACT_DEVTOOLS_TARGET_WINDOW__||window;this.tipBoundsWindow=G;var $=z.document;this.container=$.createElement("div"),this.container.style.zIndex="10000000",this.tip=new Dt($,this.container),this.rects=[],$.body.appendChild(this.container)}return je(U,[{key:"remove",value:function(){this.tip.remove(),this.rects.forEach(function(z){z.remove()}),this.rects.length=0,this.container.parentNode&&this.container.parentNode.removeChild(this.container)}},{key:"inspect",value:function(z,G){for(var $=this,Te=z.filter(function(Ct){return Ct.nodeType===Node.ELEMENT_NODE});this.rects.length>Te.length;)this.rects.pop().remove();if(Te.length!==0){for(;this.rects.length<Te.length;)this.rects.push(new at(this.window.document,this.container));var ye={top:Number.POSITIVE_INFINITY,right:Number.NEGATIVE_INFINITY,bottom:Number.NEGATIVE_INFINITY,left:Number.POSITIVE_INFINITY};if(Te.forEach(function(Ct,Mt){var Pt=_e(Ct,$.window),sn=ce(Ct);ye.top=Math.min(ye.top,Pt.top-sn.marginTop),ye.right=Math.max(ye.right,Pt.left+Pt.width+sn.marginRight),ye.bottom=Math.max(ye.bottom,Pt.top+Pt.height+sn.marginBottom),ye.left=Math.min(ye.left,Pt.left-sn.marginLeft),$.rects[Mt].update(Pt,sn)}),!G){G=Te[0].nodeName.toLowerCase();var Ae=Te[0],Z=Ae.ownerDocument.defaultView.__REACT_DEVTOOLS_GLOBAL_HOOK__;if(Z!=null&&Z.rendererInterfaces!=null){var ke,Je=null,vt=me(Z.rendererInterfaces.values());try{for(vt.s();!(ke=vt.n()).done;){var ue=ke.value,qe=ue.getFiberIDForNative(Ae,!0);if(qe!==null){Je=ue.getDisplayNameForFiberID(qe,!0);break}}}catch(Ct){vt.e(Ct)}finally{vt.f()}Je&&(G+=" (in "+Je+")")}}this.tip.updateText(G,ye.right-ye.left,ye.bottom-ye.top);var nt=_e(this.tipBoundsWindow.document.documentElement,this.window);this.tip.updatePosition({top:ye.top,left:ye.left,height:ye.bottom-ye.top,width:ye.right-ye.left},{top:nt.top+this.tipBoundsWindow.scrollY,left:nt.left+this.tipBoundsWindow.scrollX,height:this.tipBoundsWindow.innerHeight,width:this.tipBoundsWindow.innerWidth})}}}]),U}();function ut(U,z,G){m()(G.style,{borderTopWidth:U[z+"Top"]+"px",borderLeftWidth:U[z+"Left"]+"px",borderRightWidth:U[z+"Right"]+"px",borderBottomWidth:U[z+"Bottom"]+"px",borderStyle:"solid"})}var Ve={background:"rgba(120, 170, 210, 0.7)",padding:"rgba(77, 200, 0, 0.3)",margin:"rgba(255, 155, 0, 0.3)",border:"rgba(255, 200, 50, 0.3)"},It=null,Xt=null;function rt(){It=null,Xt!==null&&(Xt.remove(),Xt=null)}function X(U,z,G){window.document!=null&&(It!==null&&clearTimeout(It),U!=null&&(Xt===null&&(Xt=new Qe),Xt.inspect(U,z),G&&(It=setTimeout(rt,2e3))))}var de=new Set;function Ce(U,z){function G(ue){ue&&typeof ue.addEventListener=="function"&&(ue.addEventListener("click",ye,!0),ue.addEventListener("mousedown",Ae,!0),ue.addEventListener("mouseover",Ae,!0),ue.addEventListener("mouseup",Ae,!0),ue.addEventListener("pointerdown",Z,!0),ue.addEventListener("pointerover",ke,!0),ue.addEventListener("pointerup",Je,!0))}function $(){rt(),Te(window),de.forEach(function(ue){try{Te(ue.contentWindow)}catch(qe){}}),de=new Set}function Te(ue){ue&&typeof ue.removeEventListener=="function"&&(ue.removeEventListener("click",ye,!0),ue.removeEventListener("mousedown",Ae,!0),ue.removeEventListener("mouseover",Ae,!0),ue.removeEventListener("mouseup",Ae,!0),ue.removeEventListener("pointerdown",Z,!0),ue.removeEventListener("pointerover",ke,!0),ue.removeEventListener("pointerup",Je,!0))}function ye(ue){ue.preventDefault(),ue.stopPropagation(),$(),U.send("stopInspectingNative",!0)}function Ae(ue){ue.preventDefault(),ue.stopPropagation()}function Z(ue){ue.preventDefault(),ue.stopPropagation(),vt(ue.target)}function ke(ue){ue.preventDefault(),ue.stopPropagation();var qe=ue.target;if(qe.tagName==="IFRAME"){var nt=qe;try{de.has(nt)||(G(nt.contentWindow),de.add(nt))}catch(Ct){}}X([qe],null,!1),vt(qe)}function Je(ue){ue.preventDefault(),ue.stopPropagation()}U.addListener("clearNativeElementHighlight",function(){rt()}),U.addListener("highlightNativeElement",function(ue){var qe=ue.displayName,nt=ue.hideAfterTimeout,Ct=ue.id,Mt=ue.openNativeElementsPanel,Pt=ue.rendererID,sn=ue.scrollIntoView,rn=z.rendererInterfaces[Pt];rn==null&&console.warn('Invalid renderer id "'.concat(Pt,'" for element "').concat(Ct,'"'));var Nt=null;if(rn!=null&&(Nt=rn.findNativeNodesForFiberID(Ct)),Nt!=null&&Nt[0]!=null){var Dn=Nt[0];sn&&typeof Dn.scrollIntoView=="function"&&Dn.scrollIntoView({block:"nearest",inline:"nearest"}),X(Nt,qe,nt),Mt&&(window.__REACT_DEVTOOLS_GLOBAL_HOOK__.$0=Dn,U.send("syncSelectionToNativeElementsPanel"))}else rt()}),U.addListener("shutdown",$),U.addListener("startInspectingNative",function(){G(window)}),U.addListener("stopInspectingNative",$);var vt=O()(function(ue){var qe=arguments.length>1&&arguments[1]!==void 0?arguments[1]:q,nt=void 0,Ct=[],Mt=void 0,Pt=!1,sn=function(Nt,Dn){return qe(Nt,Ct[Dn])},rn=function(){for(var Nt=arguments.length,Dn=Array(Nt),dr=0;dr<Nt;dr++)Dn[dr]=arguments[dr];return Pt&&nt===this&&Dn.length===Ct.length&&Dn.every(sn)?Mt:(Pt=!0,nt=this,Ct=Dn,Mt=ue.apply(this,Dn))};return rn}(function(ue){var qe=z.getIDForNode(ue);qe!==null&&U.send("selectFiber",qe)}),200,{leading:!1})}var oe=["#37afa9","#63b19e","#80b393","#97b488","#abb67d","#beb771","#cfb965","#dfba57","#efbb49","#febc38"],He=null;function dt(U){He===null&&function(){(He=window.document.createElement("canvas")).style.cssText=`
-    xx-background-color: red;
-    xx-opacity: 0.5;
-    bottom: 0;
-    left: 0;
-    pointer-events: none;
-    position: fixed;
-    right: 0;
-    top: 0;
-    z-index: 1000000000;
-  `;var $=window.document.documentElement;$.insertBefore(He,$.firstChild)}();var z=He;z.width=window.innerWidth,z.height=window.innerHeight;var G=z.getContext("2d");G.clearRect(0,0,z.width,z.height),U.forEach(function($){var Te=$.count,ye=$.rect;if(ye!==null){var Ae=Math.min(oe.length-1,Te-1);(function(Z,ke,Je){var vt=ke.height,ue=ke.left,qe=ke.top,nt=ke.width;Z.lineWidth=1,Z.strokeStyle="#f0f0f0",Z.strokeRect(ue-1,qe-1,nt+2,vt+2),Z.lineWidth=1,Z.strokeStyle="#f0f0f0",Z.strokeRect(ue+1,qe+1,nt-1,vt-1),Z.strokeStyle=Je,Z.setLineDash([0]),Z.lineWidth=1,Z.strokeRect(ue,qe,nt-1,vt-1),Z.setLineDash([0])})(G,ye,oe[Ae])}})}function At(U){return(At=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(z){return typeof z}:function(z){return z&&typeof Symbol=="function"&&z.constructor===Symbol&&z!==Symbol.prototype?"symbol":typeof z})(U)}var nn=(typeof performance=="undefined"?"undefined":At(performance))==="object"&&typeof performance.now=="function"?function(){return performance.now()}:function(){return Date.now()},an=new Map,Mn=null,lr=!1,ln=null;function Vt(U){(lr=U)||(an.clear(),Mn!==null&&(cancelAnimationFrame(Mn),Mn=null),ln!==null&&(clearTimeout(ln),ln=null),He!==null&&(He.parentNode!=null&&He.parentNode.removeChild(He),He=null))}function Dr(U){lr&&(U.forEach(function(z){var G=an.get(z),$=nn(),Te=G!=null?G.lastMeasuredAt:0,ye=G!=null?G.rect:null;(ye===null||Te+250<$)&&(Te=$,ye=function(Ae){if(!Ae||typeof Ae.getBoundingClientRect!="function")return null;var Z=window.__REACT_DEVTOOLS_TARGET_WINDOW__||window;return _e(Ae,Z)}(z)),an.set(z,{count:G!=null?G.count+1:1,expirationTime:G!=null?Math.min($+3e3,G.expirationTime+250):$+250,lastMeasuredAt:Te,rect:ye})}),ln!==null&&(clearTimeout(ln),ln=null),Mn===null&&(Mn=requestAnimationFrame(w)))}function w(){Mn=null,ln=null;var U=nn(),z=Number.MAX_VALUE;an.forEach(function(G,$){G.expirationTime<U?an.delete($):z=Math.min(z,G.expirationTime)}),dt(an),z!==Number.MAX_VALUE&&(ln=setTimeout(w,z-U))}var jt=a(3),Xn=a(6),vr=a.n(Xn),jr=a(0),fr=60120;if(typeof Symbol=="function"&&Symbol.for){var zr=Symbol.for;zr("react.element"),zr("react.portal"),zr("react.fragment"),zr("react.strict_mode"),zr("react.profiler"),zr("react.provider"),zr("react.context"),zr("react.forward_ref"),zr("react.suspense"),fr=zr("react.suspense_list"),zr("react.memo"),zr("react.lazy"),zr("react.block"),zr("react.server.block"),zr("react.fundamental"),zr("react.scope"),zr("react.opaque.id"),zr("react.debug_trace_mode"),zr("react.offscreen"),zr("react.legacy_hidden")}typeof Symbol=="function"&&Symbol.iterator;function Qt(U){return(Qt=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(z){return typeof z}:function(z){return z&&typeof Symbol=="function"&&z.constructor===Symbol&&z!==Symbol.prototype?"symbol":typeof z})(U)}var wu={inspectable:Symbol("inspectable"),inspected:Symbol("inspected"),name:Symbol("name"),preview_long:Symbol("preview_long"),preview_short:Symbol("preview_short"),readonly:Symbol("readonly"),size:Symbol("size"),type:Symbol("type"),unserializable:Symbol("unserializable")};function d0(U,z,G,$,Te){$.push(Te);var ye={inspectable:z,type:U,preview_long:Li(G,!0),preview_short:Li(G,!1),name:G.constructor&&G.constructor.name!=="Object"?G.constructor.name:""};return U==="array"||U==="typed_array"?ye.size=G.length:U==="object"&&(ye.size=Object.keys(G).length),U!=="iterator"&&U!=="typed_array"||(ye.readonly=!0),ye}function Ro(U,z,G,$,Te){var ye,Ae=arguments.length>5&&arguments[5]!==void 0?arguments[5]:0,Z=Mo(U);switch(Z){case"html_element":return z.push($),{inspectable:!1,preview_short:Li(U,!1),preview_long:Li(U,!0),name:U.tagName,type:Z};case"function":return z.push($),{inspectable:!1,preview_short:Li(U,!1),preview_long:Li(U,!0),name:typeof U.name!="function"&&U.name?U.name:"function",type:Z};case"string":return U.length<=500?U:U.slice(0,500)+"...";case"bigint":case"symbol":return z.push($),{inspectable:!1,preview_short:Li(U,!1),preview_long:Li(U,!0),name:U.toString(),type:Z};case"react_element":return z.push($),{inspectable:!1,preview_short:Li(U,!1),preview_long:Li(U,!0),name:F0(U)||"Unknown",type:Z};case"array_buffer":case"data_view":return z.push($),{inspectable:!1,preview_short:Li(U,!1),preview_long:Li(U,!0),name:Z==="data_view"?"DataView":"ArrayBuffer",size:U.byteLength,type:Z};case"array":return ye=Te($),Ae>=2&&!ye?d0(Z,!0,U,z,$):U.map(function(vt,ue){return Ro(vt,z,G,$.concat([ue]),Te,ye?1:Ae+1)});case"html_all_collection":case"typed_array":case"iterator":if(ye=Te($),Ae>=2&&!ye)return d0(Z,!0,U,z,$);var ke={unserializable:!0,type:Z,readonly:!0,size:Z==="typed_array"?U.length:void 0,preview_short:Li(U,!1),preview_long:Li(U,!0),name:U.constructor&&U.constructor.name!=="Object"?U.constructor.name:""};return Qt(U[Symbol.iterator])&&Array.from(U).forEach(function(vt,ue){return ke[ue]=Ro(vt,z,G,$.concat([ue]),Te,ye?1:Ae+1)}),G.push($),ke;case"opaque_iterator":return z.push($),{inspectable:!1,preview_short:Li(U,!1),preview_long:Li(U,!0),name:U[Symbol.toStringTag],type:Z};case"date":case"regexp":return z.push($),{inspectable:!1,preview_short:Li(U,!1),preview_long:Li(U,!0),name:U.toString(),type:Z};case"object":if(ye=Te($),Ae>=2&&!ye)return d0(Z,!0,U,z,$);var Je={};return su(U).forEach(function(vt){var ue=vt.toString();Je[ue]=Ro(U[vt],z,G,$.concat([ue]),Te,ye?1:Ae+1)}),Je;case"infinity":case"nan":case"undefined":return z.push($),{type:Z};default:return U}}function Jo(U){return(Jo=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(z){return typeof z}:function(z){return z&&typeof Symbol=="function"&&z.constructor===Symbol&&z!==Symbol.prototype?"symbol":typeof z})(U)}function Ps(U){return function(z){if(Array.isArray(z))return Zo(z)}(U)||function(z){if(typeof Symbol!="undefined"&&Symbol.iterator in Object(z))return Array.from(z)}(U)||function(z,G){if(!!z){if(typeof z=="string")return Zo(z,G);var $=Object.prototype.toString.call(z).slice(8,-1);if($==="Object"&&z.constructor&&($=z.constructor.name),$==="Map"||$==="Set")return Array.from(z);if($==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test($))return Zo(z,G)}}(U)||function(){throw new TypeError(`Invalid attempt to spread non-iterable instance.
-In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`)}()}function Zo(U,z){(z==null||z>U.length)&&(z=U.length);for(var G=0,$=new Array(z);G<z;G++)$[G]=U[G];return $}var $o=new WeakMap,qt=new vr.a({max:1e3});function Ai(U,z){return U.toString()>z.toString()?1:z.toString()>U.toString()?-1:0}function su(U){for(var z=[],G=U,$=function(){var Te=[].concat(Ps(Object.keys(G)),Ps(Object.getOwnPropertySymbols(G))),ye=Object.getOwnPropertyDescriptors(G);Te.forEach(function(Ae){ye[Ae].enumerable&&z.push(Ae)}),G=Object.getPrototypeOf(G)};G!=null;)$();return z}function mi(U){var z=arguments.length>1&&arguments[1]!==void 0?arguments[1]:"Anonymous",G=$o.get(U);if(G!=null)return G;var $=z;return typeof U.displayName=="string"?$=U.displayName:typeof U.name=="string"&&U.name!==""&&($=U.name),$o.set(U,$),$}var wr=0;function el(){return++wr}function Y0(U){var z=qt.get(U);if(z!==void 0)return z;for(var G=new Array(U.length),$=0;$<U.length;$++)G[$]=U.codePointAt($);return qt.set(U,G),G}function Uu(U,z){return z.reduce(function(G,$){if(G){if(hasOwnProperty.call(G,$))return G[$];if(typeof G[Symbol.iterator]=="function")return Array.from(G)[$]}return null},U)}function K0(U,z){var G=z.length,$=z[G-1];if(U!=null){var Te=Uu(U,z.slice(0,G-1));Te&&(Array.isArray(Te)?Te.splice($,1):delete Te[$])}}function Xr(U,z,G){var $=z.length;if(U!=null){var Te=Uu(U,z.slice(0,$-1));if(Te){var ye=z[$-1];Te[G[$-1]]=Te[ye],Array.isArray(Te)?Te.splice(ye,1):delete Te[ye]}}}function Oo(U,z,G){var $=z.length,Te=z[$-1];if(U!=null){var ye=Uu(U,z.slice(0,$-1));ye&&(ye[Te]=G)}}function Mo(U){if(U===null)return"null";if(U===void 0)return"undefined";if(Object(jr.isElement)(U))return"react_element";if(typeof HTMLElement!="undefined"&&U instanceof HTMLElement)return"html_element";switch(Jo(U)){case"bigint":return"bigint";case"boolean":return"boolean";case"function":return"function";case"number":return Number.isNaN(U)?"nan":Number.isFinite(U)?"number":"infinity";case"object":if(Array.isArray(U))return"array";if(ArrayBuffer.isView(U))return hasOwnProperty.call(U.constructor,"BYTES_PER_ELEMENT")?"typed_array":"data_view";if(U.constructor&&U.constructor.name==="ArrayBuffer")return"array_buffer";if(typeof U[Symbol.iterator]=="function")return U[Symbol.iterator]()===U?"opaque_iterator":"iterator";if(U.constructor&&U.constructor.name==="RegExp")return"regexp";var z=Object.prototype.toString.call(U);return z==="[object Date]"?"date":z==="[object HTMLAllCollection]"?"html_all_collection":"object";case"string":return"string";case"symbol":return"symbol";case"undefined":return Object.prototype.toString.call(U)==="[object HTMLAllCollection]"?"html_all_collection":"undefined";default:return"unknown"}}function F0(U){switch(Object(jr.typeOf)(U)){case jr.ContextConsumer:return"ContextConsumer";case jr.ContextProvider:return"ContextProvider";case jr.ForwardRef:return"ForwardRef";case jr.Fragment:return"Fragment";case jr.Lazy:return"Lazy";case jr.Memo:return"Memo";case jr.Portal:return"Portal";case jr.Profiler:return"Profiler";case jr.StrictMode:return"StrictMode";case jr.Suspense:return"Suspense";case fr:return"SuspenseList";default:var z=U.type;return typeof z=="string"?z:typeof z=="function"?mi(z,"Anonymous"):z!=null?"NotImplementedInDevtools":"Element"}}function au(U){var z=arguments.length>1&&arguments[1]!==void 0?arguments[1]:50;return U.length>z?U.substr(0,z)+"\u2026":U}function Li(U,z){if(U!=null&&hasOwnProperty.call(U,wu.type))return z?U[wu.preview_long]:U[wu.preview_short];switch(Mo(U)){case"html_element":return"<".concat(au(U.tagName.toLowerCase())," />");case"function":return au("\u0192 ".concat(typeof U.name=="function"?"":U.name,"() {}"));case"string":return'"'.concat(U,'"');case"bigint":return au(U.toString()+"n");case"regexp":case"symbol":return au(U.toString());case"react_element":return"<".concat(au(F0(U)||"Unknown")," />");case"array_buffer":return"ArrayBuffer(".concat(U.byteLength,")");case"data_view":return"DataView(".concat(U.buffer.byteLength,")");case"array":if(z){for(var G="",$=0;$<U.length&&($>0&&(G+=", "),!((G+=Li(U[$],!1)).length>50));$++);return"[".concat(au(G),"]")}var Te=hasOwnProperty.call(U,wu.size)?U[wu.size]:U.length;return"Array(".concat(Te,")");case"typed_array":var ye="".concat(U.constructor.name,"(").concat(U.length,")");if(z){for(var Ae="",Z=0;Z<U.length&&(Z>0&&(Ae+=", "),!((Ae+=U[Z]).length>50));Z++);return"".concat(ye," [").concat(au(Ae),"]")}return ye;case"iterator":var ke=U.constructor.name;if(z){for(var Je=Array.from(U),vt="",ue=0;ue<Je.length;ue++){var qe=Je[ue];if(ue>0&&(vt+=", "),Array.isArray(qe)){var nt=Li(qe[0],!0),Ct=Li(qe[1],!1);vt+="".concat(nt," => ").concat(Ct)}else vt+=Li(qe,!1);if(vt.length>50)break}return"".concat(ke,"(").concat(U.size,") {").concat(au(vt),"}")}return"".concat(ke,"(").concat(U.size,")");case"opaque_iterator":return U[Symbol.toStringTag];case"date":return U.toString();case"object":if(z){for(var Mt=su(U).sort(Ai),Pt="",sn=0;sn<Mt.length;sn++){var rn=Mt[sn];if(sn>0&&(Pt+=", "),(Pt+="".concat(rn.toString(),": ").concat(Li(U[rn],!1))).length>50)break}return"{".concat(au(Pt),"}")}return"{\u2026}";case"boolean":case"number":case"infinity":case"nan":case"null":case"undefined":return U;default:try{return au(""+U)}catch(Nt){return"unserializable"}}}var Is=a(7);function Xl(U){return(Xl=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(z){return typeof z}:function(z){return z&&typeof Symbol=="function"&&z.constructor===Symbol&&z!==Symbol.prototype?"symbol":typeof z})(U)}function P0(U,z){var G=Object.keys(U);if(Object.getOwnPropertySymbols){var $=Object.getOwnPropertySymbols(U);z&&($=$.filter(function(Te){return Object.getOwnPropertyDescriptor(U,Te).enumerable})),G.push.apply(G,$)}return G}function p0(U){for(var z=1;z<arguments.length;z++){var G=arguments[z]!=null?arguments[z]:{};z%2?P0(Object(G),!0).forEach(function($){Hr(U,$,G[$])}):Object.getOwnPropertyDescriptors?Object.defineProperties(U,Object.getOwnPropertyDescriptors(G)):P0(Object(G)).forEach(function($){Object.defineProperty(U,$,Object.getOwnPropertyDescriptor(G,$))})}return U}function Hr(U,z,G){return z in U?Object.defineProperty(U,z,{value:G,enumerable:!0,configurable:!0,writable:!0}):U[z]=G,U}function Ri(U,z){var G=arguments.length>2&&arguments[2]!==void 0?arguments[2]:[];if(U!==null){var $=[],Te=[],ye=Ro(U,$,Te,G,z);return{data:ye,cleaned:$,unserializable:Te}}return null}function X0(U){var z,G,$=(z=U,G=new Set,JSON.stringify(z,function(Ae,Z){if(Xl(Z)==="object"&&Z!==null){if(G.has(Z))return;G.add(Z)}return typeof Z=="bigint"?Z.toString()+"n":Z})),Te=$===void 0?"undefined":$,ye=window.__REACT_DEVTOOLS_GLOBAL_HOOK__.clipboardCopyText;typeof ye=="function"?ye(Te).catch(function(Ae){}):Object(Is.copy)(Te)}function gi(U,z){var G=arguments.length>2&&arguments[2]!==void 0?arguments[2]:0,$=z[G],Te=Array.isArray(U)?U.slice():p0({},U);return G+1===z.length?Array.isArray(Te)?Te.splice($,1):delete Te[$]:Te[$]=gi(U[$],z,G+1),Te}function en(U,z,G){var $=arguments.length>3&&arguments[3]!==void 0?arguments[3]:0,Te=z[$],ye=Array.isArray(U)?U.slice():p0({},U);if($+1===z.length){var Ae=G[$];ye[Ae]=ye[Te],Array.isArray(ye)?ye.splice(Te,1):delete ye[Te]}else ye[Te]=en(U[Te],z,G,$+1);return ye}function bn(U,z,G){var $=arguments.length>3&&arguments[3]!==void 0?arguments[3]:0;if($>=z.length)return G;var Te=z[$],ye=Array.isArray(U)?U.slice():p0({},U);return ye[Te]=bn(U[Te],z,G,$+1),ye}var Oi=a(8);function yi(U,z){var G=Object.keys(U);if(Object.getOwnPropertySymbols){var $=Object.getOwnPropertySymbols(U);z&&($=$.filter(function(Te){return Object.getOwnPropertyDescriptor(U,Te).enumerable})),G.push.apply(G,$)}return G}function Wt(U){for(var z=1;z<arguments.length;z++){var G=arguments[z]!=null?arguments[z]:{};z%2?yi(Object(G),!0).forEach(function($){Ru(U,$,G[$])}):Object.getOwnPropertyDescriptors?Object.defineProperties(U,Object.getOwnPropertyDescriptors(G)):yi(Object(G)).forEach(function($){Object.defineProperty(U,$,Object.getOwnPropertyDescriptor(G,$))})}return U}function Ru(U,z,G){return z in U?Object.defineProperty(U,z,{value:G,enumerable:!0,configurable:!0,writable:!0}):U[z]=G,U}function eu(U){return function(z){if(Array.isArray(z))return ko(z)}(U)||function(z){if(typeof Symbol!="undefined"&&Symbol.iterator in Object(z))return Array.from(z)}(U)||Ql(U)||function(){throw new TypeError(`Invalid attempt to spread non-iterable instance.
-In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`)}()}function Q0(U,z){return function(G){if(Array.isArray(G))return G}(U)||function(G,$){if(!(typeof Symbol=="undefined"||!(Symbol.iterator in Object(G)))){var Te=[],ye=!0,Ae=!1,Z=void 0;try{for(var ke,Je=G[Symbol.iterator]();!(ye=(ke=Je.next()).done)&&(Te.push(ke.value),!$||Te.length!==$);ye=!0);}catch(vt){Ae=!0,Z=vt}finally{try{ye||Je.return==null||Je.return()}finally{if(Ae)throw Z}}return Te}}(U,z)||Ql(U,z)||function(){throw new TypeError(`Invalid attempt to destructure non-iterable instance.
-In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`)}()}function Yi(U,z){var G;if(typeof Symbol=="undefined"||U[Symbol.iterator]==null){if(Array.isArray(U)||(G=Ql(U))||z&&U&&typeof U.length=="number"){G&&(U=G);var $=0,Te=function(){};return{s:Te,n:function(){return $>=U.length?{done:!0}:{done:!1,value:U[$++]}},e:function(ke){throw ke},f:Te}}throw new TypeError(`Invalid attempt to iterate non-iterable instance.
-In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`)}var ye,Ae=!0,Z=!1;return{s:function(){G=U[Symbol.iterator]()},n:function(){var ke=G.next();return Ae=ke.done,ke},e:function(ke){Z=!0,ye=ke},f:function(){try{Ae||G.return==null||G.return()}finally{if(Z)throw ye}}}}function Ql(U,z){if(U){if(typeof U=="string")return ko(U,z);var G=Object.prototype.toString.call(U).slice(8,-1);return G==="Object"&&U.constructor&&(G=U.constructor.name),G==="Map"||G==="Set"?Array.from(U):G==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(G)?ko(U,z):void 0}}function ko(U,z){(z==null||z>U.length)&&(z=U.length);for(var G=0,$=new Array(z);G<z;G++)$[G]=U[G];return $}function ai(U){return(ai=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(z){return typeof z}:function(z){return z&&typeof Symbol=="function"&&z.constructor===Symbol&&z!==Symbol.prototype?"symbol":typeof z})(U)}function ao(U){return U.flags!==void 0?U.flags:U.effectTag}var Jl=(typeof performance=="undefined"?"undefined":ai(performance))==="object"&&typeof performance.now=="function"?function(){return performance.now()}:function(){return Date.now()};function Lo(U){var z=null;function G(rn){var Nt=ai(rn)==="object"&&rn!==null?rn.$$typeof:rn;return ai(Nt)==="symbol"?Nt.toString():Nt}var $=z=Object(jt.gte)(U,"17.0.0-alpha")?{Block:22,ClassComponent:1,ContextConsumer:9,ContextProvider:10,CoroutineComponent:-1,CoroutineHandlerPhase:-1,DehydratedSuspenseComponent:18,ForwardRef:11,Fragment:7,FunctionComponent:0,HostComponent:5,HostPortal:4,HostRoot:3,HostText:6,IncompleteClassComponent:17,IndeterminateComponent:2,LazyComponent:16,MemoComponent:14,Mode:8,OffscreenComponent:23,Profiler:12,SimpleMemoComponent:15,SuspenseComponent:13,SuspenseListComponent:19,YieldComponent:-1}:Object(jt.gte)(U,"16.6.0-beta.0")?{Block:22,ClassComponent:1,ContextConsumer:9,ContextProvider:10,CoroutineComponent:-1,CoroutineHandlerPhase:-1,DehydratedSuspenseComponent:18,ForwardRef:11,Fragment:7,FunctionComponent:0,HostComponent:5,HostPortal:4,HostRoot:3,HostText:6,IncompleteClassComponent:17,IndeterminateComponent:2,LazyComponent:16,MemoComponent:14,Mode:8,OffscreenComponent:-1,Profiler:12,SimpleMemoComponent:15,SuspenseComponent:13,SuspenseListComponent:19,YieldComponent:-1}:Object(jt.gte)(U,"16.4.3-alpha")?{Block:-1,ClassComponent:2,ContextConsumer:11,ContextProvider:12,CoroutineComponent:-1,CoroutineHandlerPhase:-1,DehydratedSuspenseComponent:-1,ForwardRef:13,Fragment:9,FunctionComponent:0,HostComponent:7,HostPortal:6,HostRoot:5,HostText:8,IncompleteClassComponent:-1,IndeterminateComponent:4,LazyComponent:-1,MemoComponent:-1,Mode:10,OffscreenComponent:-1,Profiler:15,SimpleMemoComponent:-1,SuspenseComponent:16,SuspenseListComponent:-1,YieldComponent:-1}:{Block:-1,ClassComponent:2,ContextConsumer:12,ContextProvider:13,CoroutineComponent:7,CoroutineHandlerPhase:8,DehydratedSuspenseComponent:-1,ForwardRef:14,Fragment:10,FunctionComponent:1,HostComponent:5,HostPortal:4,HostRoot:3,HostText:6,IncompleteClassComponent:-1,IndeterminateComponent:0,LazyComponent:-1,MemoComponent:-1,Mode:11,OffscreenComponent:-1,Profiler:15,SimpleMemoComponent:-1,SuspenseComponent:16,SuspenseListComponent:-1,YieldComponent:9},Te=$.ClassComponent,ye=$.IncompleteClassComponent,Ae=$.FunctionComponent,Z=$.IndeterminateComponent,ke=$.ForwardRef,Je=$.HostRoot,vt=$.HostComponent,ue=$.HostPortal,qe=$.HostText,nt=$.Fragment,Ct=$.MemoComponent,Mt=$.SimpleMemoComponent,Pt=$.SuspenseComponent,sn=$.SuspenseListComponent;return{getDisplayNameForFiber:function(rn){var Nt=rn.type,Dn=rn.tag,dr=Nt;ai(Nt)==="object"&&Nt!==null&&(dr=function Cr(Rn){switch(G(Rn)){case 60115:case"Symbol(react.memo)":return Cr(Rn.type);case 60112:case"Symbol(react.forward_ref)":return Rn.render;default:return Rn}}(Nt));var er=null;switch(Dn){case Te:case ye:return mi(dr);case Ae:case Z:return mi(dr);case ke:return Nt&&Nt.displayName||mi(dr,"Anonymous");case Je:return null;case vt:return Nt;case ue:case qe:case nt:return null;case Ct:case Mt:return mi(dr,"Anonymous");case Pt:return"Suspense";case sn:return"SuspenseList";default:switch(G(Nt)){case 60111:case"Symbol(react.concurrent_mode)":case"Symbol(react.async_mode)":return null;case 60109:case"Symbol(react.provider)":return er=rn.type._context||rn.type.context,"".concat(er.displayName||"Context",".Provider");case 60110:case"Symbol(react.context)":return er=rn.type._context||rn.type,"".concat(er.displayName||"Context",".Consumer");case 60108:case"Symbol(react.strict_mode)":return null;case 60114:case"Symbol(react.profiler)":return"Profiler(".concat(rn.memoizedProps.id,")");case 60119:case"Symbol(react.scope)":return"Scope";default:return null}}},getTypeSymbol:G,ReactPriorityLevels:{ImmediatePriority:99,UserBlockingPriority:98,NormalPriority:97,LowPriority:96,IdlePriority:95,NoPriority:90},ReactTypeOfWork:z,ReactTypeOfSideEffect:{NoFlags:0,PerformedWork:1,Placement:2}}}function bs(U,z,G,$){var Te=Lo(G.version),ye=Te.getDisplayNameForFiber,Ae=Te.getTypeSymbol,Z=Te.ReactPriorityLevels,ke=Te.ReactTypeOfWork,Je=Te.ReactTypeOfSideEffect,vt=Je.NoFlags,ue=Je.PerformedWork,qe=Je.Placement,nt=ke.FunctionComponent,Ct=ke.ClassComponent,Mt=ke.ContextConsumer,Pt=ke.DehydratedSuspenseComponent,sn=ke.Fragment,rn=ke.ForwardRef,Nt=ke.HostRoot,Dn=ke.HostPortal,dr=ke.HostComponent,er=ke.HostText,Cr=ke.IncompleteClassComponent,Rn=ke.IndeterminateComponent,Lr=ke.MemoComponent,y0=ke.OffscreenComponent,Nr=ke.SimpleMemoComponent,it=ke.SuspenseComponent,Et=ke.SuspenseListComponent,et=Z.ImmediatePriority,Ft=Z.UserBlockingPriority,un=Z.NormalPriority,fn=Z.LowPriority,Jn=Z.IdlePriority,Sr=Z.NoPriority,fu=G.overrideHookState,Lu=G.overrideHookStateDeletePath,T0=G.overrideHookStateRenamePath,Z0=G.overrideProps,Nu=G.overridePropsDeletePath,_i=G.overridePropsRenamePath,Po=G.setSuspenseHandler,rl=G.scheduleUpdate,vf=typeof Po=="function"&&typeof rl=="function";co(G);var Tl=window.__REACT_DEVTOOLS_APPEND_COMPONENT_STACK__!==!1,mf=window.__REACT_DEVTOOLS_BREAK_ON_CONSOLE_ERRORS__===!0;(Tl||mf)&&Zl({appendComponentStack:Tl,breakOnConsoleErrors:mf});var Io=new Set,ys=new Set,zs=new Set,bo=!1,Bo=new Set;function _s(ae){zs.clear(),Io.clear(),ys.clear(),ae.forEach(function(re){if(re.isEnabled)switch(re.type){case 2:re.isValid&&re.value!==""&&Io.add(new RegExp(re.value,"i"));break;case 1:zs.add(re.value);break;case 3:re.isValid&&re.value!==""&&ys.add(new RegExp(re.value,"i"));break;case 4:Io.add(new RegExp("\\("));break;default:console.warn('Invalid component filter type "'.concat(re.type,'"'))}})}function Qu(ae){var re=ae._debugSource,Fe=ae.tag,Re=ae.type;switch(Fe){case Pt:return!0;case Dn:case er:case sn:case y0:return!0;case Nt:return!1;default:switch(Ae(Re)){case 60111:case"Symbol(react.concurrent_mode)":case"Symbol(react.async_mode)":case 60108:case"Symbol(react.strict_mode)":return!0}}var st=Tu(ae);if(zs.has(st))return!0;if(Io.size>0){var mt=ye(ae);if(mt!=null){var Jt,On=Yi(Io);try{for(On.s();!(Jt=On.n()).done;)if(Jt.value.test(mt))return!0}catch(ir){On.e(ir)}finally{On.f()}}}if(re!=null&&ys.size>0){var Sn,_n=re.fileName,Tn=Yi(ys);try{for(Tn.s();!(Sn=Tn.n()).done;)if(Sn.value.test(_n))return!0}catch(ir){Tn.e(ir)}finally{Tn.f()}}return!1}function Tu(ae){var re=ae.type;switch(ae.tag){case Ct:case Cr:return 1;case nt:case Rn:return 5;case rn:return 6;case Nt:return 11;case dr:return 7;case Dn:case er:case sn:return 9;case Lr:case Nr:return 8;case it:return 12;case Et:return 13;default:switch(Ae(re)){case 60111:case"Symbol(react.concurrent_mode)":case"Symbol(react.async_mode)":return 9;case 60109:case"Symbol(react.provider)":return 2;case 60110:case"Symbol(react.context)":return 2;case 60108:case"Symbol(react.strict_mode)":return 9;case 60114:case"Symbol(react.profiler)":return 10;default:return 9}}}function Ei(ae){if(Uo.has(ae))return ae;var re=ae.alternate;return re!=null&&Uo.has(re)?re:(Uo.add(ae),ae)}window.__REACT_DEVTOOLS_COMPONENT_FILTERS__!=null?_s(window.__REACT_DEVTOOLS_COMPONENT_FILTERS__):_s([{type:1,value:7,isEnabled:!0}]);var C0=new Map,$0=new Map,Uo=new Set,sa=new Map,es=new Map,tu=-1;function ei(ae){if(!C0.has(ae)){var re=el();C0.set(ae,re),$0.set(re,ae)}return C0.get(ae)}function ho(ae){switch(Tu(ae)){case 1:if(B0!==null){var re=ei(Ei(ae)),Fe=Ci(ae);Fe!==null&&B0.set(re,Fe)}}}var Bi={};function Ci(ae){switch(Tu(ae)){case 1:var re=ae.stateNode,Fe=Bi,Re=Bi;return re!=null&&(re.constructor&&re.constructor.contextType!=null?Re=re.context:(Fe=re.context)&&Object.keys(Fe).length===0&&(Fe=Bi)),[Fe,Re];default:return null}}function gf(ae){switch(Tu(ae)){case 1:if(B0!==null){var re=ei(Ei(ae)),Fe=B0.has(re)?B0.get(re):null,Re=Ci(ae);if(Fe==null||Re==null)return null;var st=Q0(Fe,2),mt=st[0],Jt=st[1],On=Q0(Re,2),Sn=On[0],_n=On[1];if(Sn!==Bi)return eo(mt,Sn);if(_n!==Bi)return Jt!==_n}}return null}function yf(ae,re){if(ae==null||re==null)return!1;if(re.hasOwnProperty("baseState")&&re.hasOwnProperty("memoizedState")&&re.hasOwnProperty("next")&&re.hasOwnProperty("queue"))for(;re!==null;){if(re.memoizedState!==ae.memoizedState)return!0;re=re.next,ae=ae.next}return!1}function eo(ae,re){if(ae==null||re==null||re.hasOwnProperty("baseState")&&re.hasOwnProperty("memoizedState")&&re.hasOwnProperty("next")&&re.hasOwnProperty("queue"))return null;var Fe,Re=[],st=Yi(new Set([].concat(eu(Object.keys(ae)),eu(Object.keys(re)))));try{for(st.s();!(Fe=st.n()).done;){var mt=Fe.value;ae[mt]!==re[mt]&&Re.push(mt)}}catch(Jt){st.e(Jt)}finally{st.f()}return Re}function to(ae,re){switch(re.tag){case Ct:case nt:case Mt:case Lr:case Nr:return(ao(re)&ue)===ue;default:return ae.memoizedProps!==re.memoizedProps||ae.memoizedState!==re.memoizedState||ae.ref!==re.ref}}var xe=[],tt=[],Ye=[],Yt=[],Kt=new Map,pr=0,Wr=null;function xn(ae){xe.push(ae)}function gu(ae){if(xe.length!==0||tt.length!==0||Ye.length!==0||Wr!==null||Pu){var re=tt.length+Ye.length+(Wr===null?0:1),Fe=new Array(3+pr+(re>0?2+re:0)+xe.length),Re=0;if(Fe[Re++]=z,Fe[Re++]=tu,Fe[Re++]=pr,Kt.forEach(function(On,Sn){Fe[Re++]=Sn.length;for(var _n=Y0(Sn),Tn=0;Tn<_n.length;Tn++)Fe[Re+Tn]=_n[Tn];Re+=Sn.length}),re>0){Fe[Re++]=2,Fe[Re++]=re;for(var st=tt.length-1;st>=0;st--)Fe[Re++]=tt[st];for(var mt=0;mt<Ye.length;mt++)Fe[Re+mt]=Ye[mt];Re+=Ye.length,Wr!==null&&(Fe[Re]=Wr,Re++)}for(var Jt=0;Jt<xe.length;Jt++)Fe[Re+Jt]=xe[Jt];Re+=xe.length,Yt!==null?Yt.push(Fe):U.emit("operations",Fe),xe.length=0,tt.length=0,Ye.length=0,Wr=null,Kt.clear(),pr=0}}function Ju(ae){if(ae===null)return 0;var re=Kt.get(ae);if(re!==void 0)return re;var Fe=Kt.size+1;return Kt.set(ae,Fe),pr+=ae.length+1,Fe}function ti(ae,re){no!==null&&(ae!==no&&ae!==no.alternate||Fi(null));var Fe=ae.tag===Nt,Re=Ei(ae);if(C0.has(Re)){var st=ei(Re);Fe?Wr=st:Qu(ae)||(re?Ye.push(st):tt.push(st)),C0.delete(Re),$0.delete(st),Uo.delete(Re),ae.hasOwnProperty("treeBaseDuration")&&(es.delete(st),sa.delete(st))}else Uo.delete(Re)}function Jr(ae,re,Fe,Re){var st=function(Tn){if(Ar===null||!cu)return!1;var ir=Tn.return,Bt=ir!==null?ir.alternate:null;if(no===ir||no===Bt&&Bt!==null){var Pi=E0(Tn),Rr=Ar[nu+1];if(Rr===void 0)throw new Error("Expected to see a frame at the next depth.");if(Pi.index===Rr.index&&Pi.key===Rr.key&&Pi.displayName===Rr.displayName)return no=Tn,nu++,cu=nu!==Ar.length-1,!1}return cu=!1,!0}(ae),mt=!Qu(ae);if(mt&&function(Tn,ir){var Bt=Tn.tag===Nt,Pi=ei(Ei(Tn)),Rr=Tn.hasOwnProperty("_debugOwner"),mr=Tn.hasOwnProperty("treeBaseDuration");if(Bt)xn(1),xn(Pi),xn(11),xn(mr?1:0),xn(Rr?1:0),Pu&&xl!==null&&xl.set(Pi,_0(Tn));else{var Y=Tn.key,ri=ye(Tn),ii=Tu(Tn),Vr=Tn._debugOwner,ft=Vr!=null?ei(Ei(Vr)):0,Di=ir?ei(Ei(ir)):0,ru=Ju(ri),D0=Ju(Y===null?null:""+Y);xn(1),xn(Pi),xn(ii),xn(Di),xn(ft),xn(ru),xn(D0)}mr&&(es.set(Pi,tu),An(Tn))}(ae,re),bo&&Re&&Tu(ae)===7&&(Bo.add(ae.stateNode),Re=!1),ae.tag===ke.SuspenseComponent)if(ae.memoizedState!==null){var Jt=ae.child,On=Jt?Jt.sibling:null,Sn=On?On.child:null;Sn!==null&&Jr(Sn,mt?ae:re,!0,Re)}else{var _n=null;y0===-1?_n=ae.child:ae.child!==null&&(_n=ae.child.child),_n!==null&&Jr(_n,mt?ae:re,!0,Re)}else ae.child!==null&&Jr(ae.child,mt?ae:re,!0,Re);(function(Tn){cu=Tn})(st),Fe&&ae.sibling!==null&&Jr(ae.sibling,re,!0,Re)}function Wu(ae){var re=ae.tag===ke.SuspenseComponent&&ae.memoizedState!==null,Fe=ae.child;if(re){var Re=ae.child,st=Re?Re.sibling:null;Fe=st?st.child:null}for(;Fe!==null;)Fe.return!==null&&(Wu(Fe),ti(Fe,!0)),Fe=Fe.sibling}function An(ae){var re=ei(Ei(ae)),Fe=ae.actualDuration,Re=ae.treeBaseDuration;if(sa.set(re,Re||0),Pu){var st=ae.alternate;if(st==null||Re!==st.treeBaseDuration){var mt=Math.floor(1e3*(Re||0));xn(4),xn(re),xn(mt)}if((st==null||to(st,ae))&&Fe!=null){for(var Jt=Fe,On=ae.child;On!==null;)Jt-=On.actualDuration||0,On=On.sibling;var Sn=il;if(Sn.durations.push(re,Fe,Jt),Sn.maxActualDuration=Math.max(Sn.maxActualDuration,Fe),ts){var _n=function(Tn,ir){switch(Tu(ir)){case 1:case 5:case 8:case 6:return Tn===null?{context:null,didHooksChange:!1,isFirstMount:!0,props:null,state:null}:{context:gf(ir),didHooksChange:yf(Tn.memoizedState,ir.memoizedState),isFirstMount:!1,props:eo(Tn.memoizedProps,ir.memoizedProps),state:eo(Tn.memoizedState,ir.memoizedState)};default:return null}}(st,ae);_n!==null&&Sn.changeDescriptions!==null&&Sn.changeDescriptions.set(re,_n),ho(ae)}}}}function x0(ae,re){if(Qu(ae)){var Fe=ae.child;if(ae.tag===it&&ae.memoizedState!==null){var Re=ae.child,st=Re?Re.sibling:null,mt=st?st.child:null;mt!==null&&(Fe=mt)}for(;Fe!==null;)x0(Fe,re),Fe=Fe.sibling}else re.push(ei(Ei(ae)))}function Fu(ae,re,Fe,Re){if(bo){var st=Tu(ae);Re?st===7&&(Bo.add(ae.stateNode),Re=!1):st!==5&&st!==1&&st!==2||(Re=to(re,ae))}Xi!==null&&Xi.id===ei(Ei(ae))&&to(re,ae)&&(qs=!0);var mt=!Qu(ae),Jt=ae.tag===it,On=!1,Sn=Jt&&re.memoizedState!==null,_n=Jt&&ae.memoizedState!==null;if(Sn&&_n){var Tn=ae.child,ir=Tn?Tn.sibling:null,Bt=re.child,Pi=Bt?Bt.sibling:null;ir!=null&&Pi!=null&&Fu(ir,Pi,ae,Re)&&(On=!0)}else if(Sn&&!_n){var Rr=ae.child;Rr!==null&&Jr(Rr,mt?ae:Fe,!0,Re),On=!0}else if(!Sn&&_n){Wu(re);var mr=ae.child,Y=mr?mr.sibling:null;Y!=null&&(Jr(Y,mt?ae:Fe,!0,Re),On=!0)}else if(ae.child!==re.child){for(var ri=ae.child,ii=re.child;ri;){if(ri.alternate){var Vr=ri.alternate;Fu(ri,Vr,mt?ae:Fe,Re)&&(On=!0),Vr!==ii&&(On=!0)}else Jr(ri,mt?ae:Fe,!1,Re),On=!0;ri=ri.sibling,On||ii===null||(ii=ii.sibling)}ii!==null&&(On=!0)}else bo&&Re&&li(ei(Ei(ae))).forEach(function(ru){Bo.add(ru.stateNode)});if(mt&&ae.hasOwnProperty("treeBaseDuration")&&An(ae),On){if(mt){var ft=ae.child;if(_n){var Di=ae.child;ft=Di?Di.sibling:null}return ft!=null&&function(ru,D0){for(var Un=[],t0=D0;t0!==null;)x0(t0,Un),t0=t0.sibling;var ro=Un.length;if(!(ro<2)){xn(3),xn(ei(Ei(ru))),xn(ro);for(var mo=0;mo<Un.length;mo++)xn(Un[mo])}}(ae,ft),!1}return!0}return!1}function li(ae){var re=[],Fe=Vu(ae);if(!Fe)return re;for(var Re=Fe;;){if(Re.tag===dr||Re.tag===er)re.push(Re);else if(Re.child){Re.child.return=Re,Re=Re.child;continue}if(Re===Fe)return re;for(;!Re.sibling;){if(!Re.return||Re.return===Fe)return re;Re=Re.return}Re.sibling.return=Re.return,Re=Re.sibling}return re}function Cl(ae){try{var re=Vu(ae);if(re===null)return null;if(re.tag===it&&re.memoizedState!==null){var Fe=re.child&&re.child.sibling;Fe!=null&&(re=Fe)}return li(ae).map(function(Re){return Re.stateNode}).filter(Boolean)}catch(Re){return null}}function Hs(ae){var re=ae;if(ae.alternate)for(;re.return;)re=re.return;else{if((ao(re)&qe)!==vt)return 1;for(;re.return;)if((ao(re=re.return)&qe)!==vt)return 1}return re.tag===Nt?2:3}function Vu(ae){var re=$0.get(ae);if(re==null)return console.warn('Could not find Fiber with id "'.concat(ae,'"')),null;var Fe=re.alternate;if(!Fe){var Re=Hs(re);if(Re===3)throw Error("Unable to find node on an unmounted component.");return Re===1?null:re}for(var st=re,mt=Fe;;){var Jt=st.return;if(Jt===null)break;var On=Jt.alternate;if(On===null){var Sn=Jt.return;if(Sn!==null){st=mt=Sn;continue}break}if(Jt.child===On.child){for(var _n=Jt.child;_n;){if(_n===st){if(Hs(Jt)!==2)throw Error("Unable to find node on an unmounted component.");return re}if(_n===mt){if(Hs(Jt)!==2)throw Error("Unable to find node on an unmounted component.");return Fe}_n=_n.sibling}throw Error("Unable to find node on an unmounted component.")}if(st.return!==mt.return)st=Jt,mt=On;else{for(var Tn=!1,ir=Jt.child;ir;){if(ir===st){Tn=!0,st=Jt,mt=On;break}if(ir===mt){Tn=!0,mt=Jt,st=On;break}ir=ir.sibling}if(!Tn){for(ir=On.child;ir;){if(ir===st){Tn=!0,st=On,mt=Jt;break}if(ir===mt){Tn=!0,mt=On,st=Jt;break}ir=ir.sibling}if(!Tn)throw Error("Child was not found in either parent set. This indicates a bug in React related to the return pointer. Please file an issue.")}}if(st.alternate!==mt)throw Error("Return fibers should always be each others' alternates. This error is likely caused by a bug in React. Please file an issue.")}if(st.tag!==Nt)throw Error("Unable to find node on an unmounted component.");return st.stateNode.current===st?re:Fe}function aa(ae){var re=Vu(ae);if(re==null)return null;var Fe=re._debugOwner,Re=re._debugSource,st=re.stateNode,mt=re.key,Jt=re.memoizedProps,On=re.memoizedState,Sn=re.dependencies,_n=re.tag,Tn=re.type,ir=Tu(re),Bt=!(_n!==nt&&_n!==Nr&&_n!==rn||!On&&!Sn),Pi=Ae(Tn),Rr=!1,mr=null;if(_n===Ct||_n===nt||_n===Cr||_n===Rn||_n===Lr||_n===rn||_n===Nr)Rr=!0,st&&st.context!=null&&(ir===1&&!(Tn.contextTypes||Tn.contextType)||(mr=st.context));else if(Pi===60110||Pi==="Symbol(react.context)"){var Y=Tn._context||Tn;mr=Y._currentValue||null;for(var ri=re.return;ri!==null;){var ii=ri.type,Vr=Ae(ii);if((Vr===60109||Vr==="Symbol(react.provider)")&&(ii._context||ii.context)===Y){mr=ri.memoizedProps.value;break}ri=ri.return}}var ft=!1;mr!==null&&(ft=!!Tn.contextTypes,mr={value:mr});var Di=null;if(Fe){Di=[];for(var ru=Fe;ru!==null;)Di.push({displayName:ye(ru)||"Anonymous",id:ei(Ei(ru)),type:Tu(ru)}),ru=ru._debugOwner||null}var D0=_n===it&&On!==null,Un=null;if(Bt){var t0={};for(var ro in console)try{t0[ro]=console[ro],console[ro]=function(){}}catch(Ua){}try{Un=Object(Oi.inspectHooksOfFiber)(re,G.currentDispatcherRef)}finally{for(var mo in t0)try{console[mo]=t0[mo]}catch(Ua){}}}for(var n0=null,jo=re;jo.return!==null;)jo=jo.return;var io=jo.stateNode;return io!=null&&io._debugRootType!==null&&(n0=io._debugRootType),{id:ae,canEditHooks:typeof fu=="function",canEditFunctionProps:typeof Z0=="function",canEditHooksAndDeletePaths:typeof Lu=="function",canEditHooksAndRenamePaths:typeof T0=="function",canEditFunctionPropsDeletePaths:typeof Nu=="function",canEditFunctionPropsRenamePaths:typeof _i=="function",canToggleSuspense:vf&&(!D0||$u.has(ae)),canViewSource:Rr,hasLegacyContext:ft,key:mt!=null?mt:null,displayName:ye(re),type:ir,context:mr,hooks:Un,props:Jt,state:Bt?null:On,owners:Di,source:Re||null,rootType:n0,rendererPackageName:G.rendererPackageName,rendererVersion:G.version}}var Xi=null,qs=!1,A0={};function zi(ae){return Xi!==null&&Xi.id===ae&&!qs}function R0(ae){var re=A0;ae.forEach(function(Fe){re[Fe]||(re[Fe]={}),re=re[Fe]})}function Hi(ae,re){return function(Fe){switch(re){case"hooks":if(Fe.length===1||Fe[Fe.length-1]==="subHooks"||Fe[Fe.length-2]==="subHooks")return!0}var Re=ae===null?A0:A0[ae];if(!Re)return!1;for(var st=0;st<Fe.length;st++)if(!(Re=Re[Fe[st]]))return!1;return!0}}var il=null,xl=null,B0=null,O0=null,vo=null,Pu=!1,Zu=0,ts=!1,Es=null;function fa(ae){Pu||(ts=ae,xl=new Map,O0=new Map(sa),vo=new Map(es),B0=new Map,U.getFiberRoots(z).forEach(function(re){var Fe=ei(Ei(re.current));xl.set(Fe,_0(re.current)),ae&&function Re(st){ho(st);for(var mt=st.child;mt!==null;)Re(mt),mt=mt.sibling}(re.current)}),Pu=!0,Zu=Jl(),Es=new Map)}function _f(){return!1}T("React::DevTools::reloadAndProfile")==="true"&&fa(T("React::DevTools::recordChangeDescriptions")==="true");var $u=new Set;function Ds(ae){var re=ei(Ei(ae));return $u.has(re)}var Ar=null,no=null,nu=-1,cu=!1;function Fi(ae){ae===null&&(no=null,nu=-1,cu=!1),Ar=ae}var ni=new Map,Kn=new Map;function e0(ae,re){var Fe=_0(re),Re=Kn.get(Fe)||0;Kn.set(Fe,Re+1);var st="".concat(Fe,":").concat(Re);ni.set(ae,st)}function _0(ae){for(var re=null,Fe=null,Re=ae.child,st=0;st<3&&Re!==null;st++){var mt=ye(Re);if(mt!==null&&(typeof Re.type=="function"?re=mt:Fe===null&&(Fe=mt)),re!==null)break;Re=Re.child}return re||Fe||"Anonymous"}function E0(ae){var re=ae.key,Fe=ye(ae),Re=ae.index;switch(ae.tag){case Nt:var st=ei(Ei(ae)),mt=ni.get(st);if(mt===void 0)throw new Error("Expected mounted root to have known pseudo key.");Fe=mt;break;case dr:Fe=ae.type}return{displayName:Fe,key:re,index:Re}}var Fn=function(ae){if(ae==null)return"Unknown";switch(ae){case et:return"Immediate";case Ft:return"User-Blocking";case un:return"Normal";case fn:return"Low";case Jn:return"Idle";case Sr:default:return"Unknown"}};return{cleanup:function(){},copyElementPath:function(ae,re){zi(ae)&&X0(Uu(Xi,re))},deletePath:function(ae,re,Fe,Re){var st=Vu(re);if(st!==null){var mt=st.stateNode;switch(ae){case"context":switch(Re=Re.slice(1),st.tag){case Ct:Re.length===0||K0(mt.context,Re),mt.forceUpdate()}break;case"hooks":typeof Lu=="function"&&Lu(st,Fe,Re);break;case"props":mt===null?typeof Nu=="function"&&Nu(st,Re):(st.pendingProps=gi(mt.props,Re),mt.forceUpdate());break;case"state":K0(mt.state,Re),mt.forceUpdate()}}},findNativeNodesForFiberID:Cl,flushInitialOperations:function(){var ae=Yt;Yt=null,ae!==null&&ae.length>0?ae.forEach(function(re){U.emit("operations",re)}):(Ar!==null&&(cu=!0),U.getFiberRoots(z).forEach(function(re){e0(tu=ei(Ei(re.current)),re.current),Pu&&re.memoizedInteractions!=null&&(il={changeDescriptions:ts?new Map:null,durations:[],commitTime:Jl()-Zu,interactions:Array.from(re.memoizedInteractions).map(function(Fe){return Wt(Wt({},Fe),{},{timestamp:Fe.timestamp-Zu})}),maxActualDuration:0,priorityLevel:null}),Jr(re.current,null,!1,!1),gu(),tu=-1}))},getBestMatchForTrackedPath:function(){if(Ar===null||no===null)return null;for(var ae=no;ae!==null&&Qu(ae);)ae=ae.return;return ae===null?null:{id:ei(Ei(ae)),isFullMatch:nu===Ar.length-1}},getDisplayNameForFiberID:function(ae){var re=$0.get(ae);return re!=null?ye(re):null},getFiberIDForNative:function(ae){var re=arguments.length>1&&arguments[1]!==void 0&&arguments[1],Fe=G.findFiberByHostInstance(ae);if(Fe!=null){if(re)for(;Fe!==null&&Qu(Fe);)Fe=Fe.return;return ei(Ei(Fe))}return null},getInstanceAndStyle:function(ae){var re=null,Fe=null,Re=Vu(ae);return Re!==null&&(re=Re.stateNode,Re.memoizedProps!==null&&(Fe=Re.memoizedProps.style)),{instance:re,style:Fe}},getOwnersList:function(ae){var re=Vu(ae);if(re==null)return null;var Fe=re._debugOwner,Re=[{displayName:ye(re)||"Anonymous",id:ae,type:Tu(re)}];if(Fe)for(var st=Fe;st!==null;)Re.unshift({displayName:ye(st)||"Anonymous",id:ei(Ei(st)),type:Tu(st)}),st=st._debugOwner||null;return Re},getPathForElement:function(ae){var re=$0.get(ae);if(re==null)return null;for(var Fe=[];re!==null;)Fe.push(E0(re)),re=re.return;return Fe.reverse(),Fe},getProfilingData:function(){var ae=[];if(Es===null)throw Error("getProfilingData() called before any profiling data was recorded");return Es.forEach(function(re,Fe){var Re=[],st=[],mt=new Map,Jt=new Map,On=xl!==null&&xl.get(Fe)||"Unknown";O0!=null&&O0.forEach(function(Sn,_n){vo!=null&&vo.get(_n)===Fe&&st.push([_n,Sn])}),re.forEach(function(Sn,_n){var Tn=Sn.changeDescriptions,ir=Sn.durations,Bt=Sn.interactions,Pi=Sn.maxActualDuration,Rr=Sn.priorityLevel,mr=Sn.commitTime,Y=[];Bt.forEach(function(Di){mt.has(Di.id)||mt.set(Di.id,Di),Y.push(Di.id);var ru=Jt.get(Di.id);ru!=null?ru.push(_n):Jt.set(Di.id,[_n])});for(var ri=[],ii=[],Vr=0;Vr<ir.length;Vr+=3){var ft=ir[Vr];ri.push([ft,ir[Vr+1]]),ii.push([ft,ir[Vr+2]])}Re.push({changeDescriptions:Tn!==null?Array.from(Tn.entries()):null,duration:Pi,fiberActualDurations:ri,fiberSelfDurations:ii,interactionIDs:Y,priorityLevel:Rr,timestamp:mr})}),ae.push({commitData:Re,displayName:On,initialTreeBaseDurations:st,interactionCommits:Array.from(Jt.entries()),interactions:Array.from(mt.entries()),rootID:Fe})}),{dataForRoots:ae,rendererID:z}},handleCommitFiberRoot:function(ae,re){var Fe=ae.current,Re=Fe.alternate;tu=ei(Ei(Fe)),Ar!==null&&(cu=!0),bo&&Bo.clear();var st=ae.memoizedInteractions!=null;if(Pu&&st&&(il={changeDescriptions:ts?new Map:null,durations:[],commitTime:Jl()-Zu,interactions:Array.from(ae.memoizedInteractions).map(function(Sn){return Wt(Wt({},Sn),{},{timestamp:Sn.timestamp-Zu})}),maxActualDuration:0,priorityLevel:re==null?null:Fn(re)}),Re){var mt=Re.memoizedState!=null&&Re.memoizedState.element!=null,Jt=Fe.memoizedState!=null&&Fe.memoizedState.element!=null;!mt&&Jt?(e0(tu,Fe),Jr(Fe,null,!1,!1)):mt&&Jt?Fu(Fe,Re,null,!1):mt&&!Jt&&(function(Sn){var _n=ni.get(Sn);if(_n===void 0)throw new Error("Expected root pseudo key to be known.");var Tn=_n.substring(0,_n.lastIndexOf(":")),ir=Kn.get(Tn);if(ir===void 0)throw new Error("Expected counter to be known.");ir>1?Kn.set(Tn,ir-1):Kn.delete(Tn),ni.delete(Sn)}(tu),ti(Fe,!1))}else e0(tu,Fe),Jr(Fe,null,!1,!1);if(Pu&&st){var On=Es.get(tu);On!=null?On.push(il):Es.set(tu,[il])}gu(),bo&&U.emit("traceUpdates",Bo),tu=-1},handleCommitFiberUnmount:function(ae){ti(ae,!1)},inspectElement:function(ae,re){if(zi(ae)){if(re!=null){R0(re);var Fe=null;return re[0]==="hooks"&&(Fe="hooks"),{id:ae,type:"hydrated-path",path:re,value:Ri(Uu(Xi,re),Hi(null,Fe),re)}}return{id:ae,type:"no-change"}}if(qs=!1,Xi!==null&&Xi.id===ae||(A0={}),(Xi=aa(ae))===null)return{id:ae,type:"not-found"};re!=null&&R0(re),function(st){var mt=st.hooks,Jt=st.id,On=st.props,Sn=$0.get(Jt);if(Sn!=null){var _n=Sn.elementType,Tn=Sn.stateNode,ir=Sn.tag,Bt=Sn.type;switch(ir){case Ct:case Cr:case Rn:$.$r=Tn;break;case nt:$.$r={hooks:mt,props:On,type:Bt};break;case rn:$.$r={props:On,type:Bt.render};break;case Lr:case Nr:$.$r={props:On,type:_n!=null&&_n.type!=null?_n.type:Bt};break;default:$.$r=null}}else console.warn('Could not find Fiber with id "'.concat(Jt,'"'))}(Xi);var Re=Wt({},Xi);return Re.context=Ri(Re.context,Hi("context",null)),Re.hooks=Ri(Re.hooks,Hi("hooks","hooks")),Re.props=Ri(Re.props,Hi("props",null)),Re.state=Ri(Re.state,Hi("state",null)),{id:ae,type:"full-data",value:Re}},logElementToConsole:function(ae){var re=zi(ae)?Xi:aa(ae);if(re!==null){var Fe=typeof console.groupCollapsed=="function";Fe&&console.groupCollapsed("[Click to expand] %c<".concat(re.displayName||"Component"," />"),"color: var(--dom-tag-name-color); font-weight: normal;"),re.props!==null&&console.log("Props:",re.props),re.state!==null&&console.log("State:",re.state),re.hooks!==null&&console.log("Hooks:",re.hooks);var Re=Cl(ae);Re!==null&&console.log("Nodes:",Re),re.source!==null&&console.log("Location:",re.source),(window.chrome||/firefox/i.test(navigator.userAgent))&&console.log("Right-click any value to save it as a global variable for further inspection."),Fe&&console.groupEnd()}else console.warn('Could not find Fiber with id "'.concat(ae,'"'))},prepareViewAttributeSource:function(ae,re){zi(ae)&&(window.$attribute=Uu(Xi,re))},prepareViewElementSource:function(ae){var re=$0.get(ae);if(re!=null){var Fe=re.elementType,Re=re.tag,st=re.type;switch(Re){case Ct:case Cr:case Rn:case nt:$.$type=st;break;case rn:$.$type=st.render;break;case Lr:case Nr:$.$type=Fe!=null&&Fe.type!=null?Fe.type:st;break;default:$.$type=null}}else console.warn('Could not find Fiber with id "'.concat(ae,'"'))},overrideSuspense:function(ae,re){if(typeof Po!="function"||typeof rl!="function")throw new Error("Expected overrideSuspense() to not get called for earlier React versions.");re?($u.add(ae),$u.size===1&&Po(Ds)):($u.delete(ae),$u.size===0&&Po(_f));var Fe=$0.get(ae);Fe!=null&&rl(Fe)},overrideValueAtPath:function(ae,re,Fe,Re,st){var mt=Vu(re);if(mt!==null){var Jt=mt.stateNode;switch(ae){case"context":switch(Re=Re.slice(1),mt.tag){case Ct:Re.length===0?Jt.context=st:Oo(Jt.context,Re,st),Jt.forceUpdate()}break;case"hooks":typeof fu=="function"&&fu(mt,Fe,Re,st);break;case"props":switch(mt.tag){case Ct:mt.pendingProps=bn(Jt.props,Re,st),Jt.forceUpdate();break;default:typeof Z0=="function"&&Z0(mt,Re,st)}break;case"state":switch(mt.tag){case Ct:Oo(Jt.state,Re,st),Jt.forceUpdate()}}}},renamePath:function(ae,re,Fe,Re,st){var mt=Vu(re);if(mt!==null){var Jt=mt.stateNode;switch(ae){case"context":switch(Re=Re.slice(1),st=st.slice(1),mt.tag){case Ct:Re.length===0||Xr(Jt.context,Re,st),Jt.forceUpdate()}break;case"hooks":typeof T0=="function"&&T0(mt,Fe,Re,st);break;case"props":Jt===null?typeof _i=="function"&&_i(mt,Re,st):(mt.pendingProps=en(Jt.props,Re,st),Jt.forceUpdate());break;case"state":Xr(Jt.state,Re,st),Jt.forceUpdate()}}},renderer:G,setTraceUpdatesEnabled:function(ae){bo=ae},setTrackedPath:Fi,startProfiling:fa,stopProfiling:function(){Pu=!1,ts=!1},storeAsGlobal:function(ae,re,Fe){if(zi(ae)){var Re=Uu(Xi,re),st="$reactTemp".concat(Fe);window[st]=Re,console.log(st),console.log(Re)}},updateComponentFilters:function(ae){if(Pu)throw Error("Cannot modify filter preferences while profiling");U.getFiberRoots(z).forEach(function(re){tu=ei(Ei(re.current)),Wu(re.current),ti(re.current,!1),tu=-1}),_s(ae),Kn.clear(),U.getFiberRoots(z).forEach(function(re){e0(tu=ei(Ei(re.current)),re.current),Jr(re.current,null,!1,!1),gu(re),tu=-1})}}}var $n;function tl(U){return(tl=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(z){return typeof z}:function(z){return z&&typeof Symbol=="function"&&z.constructor===Symbol&&z!==Symbol.prototype?"symbol":typeof z})(U)}function fo(U,z,G){if($n===void 0)try{throw Error()}catch(Te){var $=Te.stack.trim().match(/\n( *(at )?)/);$n=$&&$[1]||""}return`
-`+$n+U}var I0=!1;function Sl(U,z,G){if(!U||I0)return"";var $,Te=Error.prepareStackTrace;Error.prepareStackTrace=void 0,I0=!0;var ye=G.current;G.current=null;try{if(z){var Ae=function(){throw Error()};if(Object.defineProperty(Ae.prototype,"props",{set:function(){throw Error()}}),(typeof Reflect=="undefined"?"undefined":tl(Reflect))==="object"&&Reflect.construct){try{Reflect.construct(Ae,[])}catch(qe){$=qe}Reflect.construct(U,[],Ae)}else{try{Ae.call()}catch(qe){$=qe}U.call(Ae.prototype)}}else{try{throw Error()}catch(qe){$=qe}U()}}catch(qe){if(qe&&$&&typeof qe.stack=="string"){for(var Z=qe.stack.split(`
-`),ke=$.stack.split(`
-`),Je=Z.length-1,vt=ke.length-1;Je>=1&&vt>=0&&Z[Je]!==ke[vt];)vt--;for(;Je>=1&&vt>=0;Je--,vt--)if(Z[Je]!==ke[vt]){if(Je!==1||vt!==1)do if(Je--,--vt<0||Z[Je]!==ke[vt])return`
-`+Z[Je].replace(" at new "," at ");while(Je>=1&&vt>=0);break}}}finally{I0=!1,Error.prepareStackTrace=Te,G.current=ye}var ue=U?U.displayName||U.name:"";return ue?fo(ue):""}function No(U,z,G,$){return Sl(U,!1,$)}function wt(U,z,G){var $=U.HostComponent,Te=U.LazyComponent,ye=U.SuspenseComponent,Ae=U.SuspenseListComponent,Z=U.FunctionComponent,ke=U.IndeterminateComponent,Je=U.SimpleMemoComponent,vt=U.ForwardRef,ue=U.Block,qe=U.ClassComponent;switch(z.tag){case $:return fo(z.type);case Te:return fo("Lazy");case ye:return fo("Suspense");case Ae:return fo("SuspenseList");case Z:case ke:case Je:return No(z.type,0,0,G);case vt:return No(z.type.render,0,0,G);case ue:return No(z.type._render,0,0,G);case qe:return function(nt,Ct,Mt,Pt){return Sl(nt,!0,Pt)}(z.type,0,0,G);default:return""}}function bt(U,z,G){try{var $="",Te=z;do $+=wt(U,Te,G),Te=Te.return;while(Te);return $}catch(ye){return`
-Error generating stack: `+ye.message+`
-`+ye.stack}}function Hn(U,z){var G;if(typeof Symbol=="undefined"||U[Symbol.iterator]==null){if(Array.isArray(U)||(G=function(ke,Je){if(!!ke){if(typeof ke=="string")return qr(ke,Je);var vt=Object.prototype.toString.call(ke).slice(8,-1);if(vt==="Object"&&ke.constructor&&(vt=ke.constructor.name),vt==="Map"||vt==="Set")return Array.from(ke);if(vt==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(vt))return qr(ke,Je)}}(U))||z&&U&&typeof U.length=="number"){G&&(U=G);var $=0,Te=function(){};return{s:Te,n:function(){return $>=U.length?{done:!0}:{done:!1,value:U[$++]}},e:function(ke){throw ke},f:Te}}throw new TypeError(`Invalid attempt to iterate non-iterable instance.
-In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`)}var ye,Ae=!0,Z=!1;return{s:function(){G=U[Symbol.iterator]()},n:function(){var ke=G.next();return Ae=ke.done,ke},e:function(ke){Z=!0,ye=ke},f:function(){try{Ae||G.return==null||G.return()}finally{if(Z)throw ye}}}}function qr(U,z){(z==null||z>U.length)&&(z=U.length);for(var G=0,$=new Array(z);G<z;G++)$[G]=U[G];return $}var Ki=["error","trace","warn"],Qr=/\s{4}(in|at)\s{1}/,Ou=/:\d+:\d+(\n|$)/,h0=new Map,Ni=console,v0={};for(var vs in console)v0[vs]=console[vs];var Tt=null;function co(U){var z=U.currentDispatcherRef,G=U.getCurrentFiber,$=U.findFiberByHostInstance,Te=U.version;if(typeof $=="function"&&z!=null&&typeof G=="function"){var ye=Lo(Te).ReactTypeOfWork;h0.set(U,{currentDispatcherRef:z,getCurrentFiber:G,workTagMap:ye})}}var nl={appendComponentStack:!1,breakOnConsoleErrors:!1};function Zl(U){var z=U.appendComponentStack,G=U.breakOnConsoleErrors;if(nl.appendComponentStack=z,nl.breakOnConsoleErrors=G,Tt===null){var $={};Tt=function(){for(var Te in $)try{Ni[Te]=$[Te]}catch(ye){}},Ki.forEach(function(Te){try{var ye=$[Te]=Ni[Te],Ae=function(){for(var Z=nl.appendComponentStack,ke=(nl.breakOnConsoleErrors,arguments.length),Je=new Array(ke),vt=0;vt<ke;vt++)Je[vt]=arguments[vt];if(Z)try{var ue=Je.length>0?Je[Je.length-1]:null,qe=ue!==null&&(Qr.test(ue)||Ou.test(ue));if(!qe){var nt,Ct=Hn(h0.values());try{for(Ct.s();!(nt=Ct.n()).done;){var Mt=nt.value,Pt=Mt.currentDispatcherRef,sn=Mt.getCurrentFiber,rn=Mt.workTagMap,Nt=sn();if(Nt!=null){var Dn=bt(rn,Nt,Pt);Dn!==""&&Je.push(Dn);break}}}catch(dr){Ct.e(dr)}finally{Ct.f()}}}catch(dr){}ye.apply(void 0,Je)};Ae.__REACT_DEVTOOLS_ORIGINAL_METHOD__=ye,Ni[Te]=Ae}catch(Z){}})}}function ju(U){return(ju=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(z){return typeof z}:function(z){return z&&typeof Symbol=="function"&&z.constructor===Symbol&&z!==Symbol.prototype?"symbol":typeof z})(U)}function ms(U,z){for(var G=0;G<z.length;G++){var $=z[G];$.enumerable=$.enumerable||!1,$.configurable=!0,"value"in $&&($.writable=!0),Object.defineProperty(U,$.key,$)}}function b0(U,z){return(b0=Object.setPrototypeOf||function(G,$){return G.__proto__=$,G})(U,z)}function Q(U){var z=function(){if(typeof Reflect=="undefined"||!Reflect.construct||Reflect.construct.sham)return!1;if(typeof Proxy=="function")return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],function(){})),!0}catch(G){return!1}}();return function(){var G,$=Le(U);if(z){var Te=Le(this).constructor;G=Reflect.construct($,arguments,Te)}else G=$.apply(this,arguments);return we(this,G)}}function we(U,z){return!z||ju(z)!=="object"&&typeof z!="function"?Ne(U):z}function Ne(U){if(U===void 0)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return U}function Le(U){return(Le=Object.setPrototypeOf?Object.getPrototypeOf:function(z){return z.__proto__||Object.getPrototypeOf(z)})(U)}function pt(U,z,G){return z in U?Object.defineProperty(U,z,{value:G,enumerable:!0,configurable:!0,writable:!0}):U[z]=G,U}var Yn=function(U){(function(Ae,Z){if(typeof Z!="function"&&Z!==null)throw new TypeError("Super expression must either be null or a function");Ae.prototype=Object.create(Z&&Z.prototype,{constructor:{value:Ae,writable:!0,configurable:!0}}),Z&&b0(Ae,Z)})(ye,U);var z,G,$,Te=Q(ye);function ye(Ae){var Z;(function(ue,qe){if(!(ue instanceof qe))throw new TypeError("Cannot call a class as a function")})(this,ye),pt(Ne(Z=Te.call(this)),"_isProfiling",!1),pt(Ne(Z),"_recordChangeDescriptions",!1),pt(Ne(Z),"_rendererInterfaces",{}),pt(Ne(Z),"_persistedSelection",null),pt(Ne(Z),"_persistedSelectionMatch",null),pt(Ne(Z),"_traceUpdatesEnabled",!1),pt(Ne(Z),"copyElementPath",function(ue){var qe=ue.id,nt=ue.path,Ct=ue.rendererID,Mt=Z._rendererInterfaces[Ct];Mt==null?console.warn('Invalid renderer id "'.concat(Ct,'" for element "').concat(qe,'"')):Mt.copyElementPath(qe,nt)}),pt(Ne(Z),"deletePath",function(ue){var qe=ue.hookID,nt=ue.id,Ct=ue.path,Mt=ue.rendererID,Pt=ue.type,sn=Z._rendererInterfaces[Mt];sn==null?console.warn('Invalid renderer id "'.concat(Mt,'" for element "').concat(nt,'"')):sn.deletePath(Pt,nt,qe,Ct)}),pt(Ne(Z),"getProfilingData",function(ue){var qe=ue.rendererID,nt=Z._rendererInterfaces[qe];nt==null&&console.warn('Invalid renderer id "'.concat(qe,'"')),Z._bridge.send("profilingData",nt.getProfilingData())}),pt(Ne(Z),"getProfilingStatus",function(){Z._bridge.send("profilingStatus",Z._isProfiling)}),pt(Ne(Z),"getOwnersList",function(ue){var qe=ue.id,nt=ue.rendererID,Ct=Z._rendererInterfaces[nt];if(Ct==null)console.warn('Invalid renderer id "'.concat(nt,'" for element "').concat(qe,'"'));else{var Mt=Ct.getOwnersList(qe);Z._bridge.send("ownersList",{id:qe,owners:Mt})}}),pt(Ne(Z),"inspectElement",function(ue){var qe=ue.id,nt=ue.path,Ct=ue.rendererID,Mt=Z._rendererInterfaces[Ct];Mt==null?console.warn('Invalid renderer id "'.concat(Ct,'" for element "').concat(qe,'"')):(Z._bridge.send("inspectedElement",Mt.inspectElement(qe,nt)),Z._persistedSelectionMatch!==null&&Z._persistedSelectionMatch.id===qe||(Z._persistedSelection=null,Z._persistedSelectionMatch=null,Mt.setTrackedPath(null),Z._throttledPersistSelection(Ct,qe)))}),pt(Ne(Z),"logElementToConsole",function(ue){var qe=ue.id,nt=ue.rendererID,Ct=Z._rendererInterfaces[nt];Ct==null?console.warn('Invalid renderer id "'.concat(nt,'" for element "').concat(qe,'"')):Ct.logElementToConsole(qe)}),pt(Ne(Z),"overrideSuspense",function(ue){var qe=ue.id,nt=ue.rendererID,Ct=ue.forceFallback,Mt=Z._rendererInterfaces[nt];Mt==null?console.warn('Invalid renderer id "'.concat(nt,'" for element "').concat(qe,'"')):Mt.overrideSuspense(qe,Ct)}),pt(Ne(Z),"overrideValueAtPath",function(ue){var qe=ue.hookID,nt=ue.id,Ct=ue.path,Mt=ue.rendererID,Pt=ue.type,sn=ue.value,rn=Z._rendererInterfaces[Mt];rn==null?console.warn('Invalid renderer id "'.concat(Mt,'" for element "').concat(nt,'"')):rn.overrideValueAtPath(Pt,nt,qe,Ct,sn)}),pt(Ne(Z),"overrideContext",function(ue){var qe=ue.id,nt=ue.path,Ct=ue.rendererID,Mt=ue.wasForwarded,Pt=ue.value;Mt||Z.overrideValueAtPath({id:qe,path:nt,rendererID:Ct,type:"context",value:Pt})}),pt(Ne(Z),"overrideHookState",function(ue){var qe=ue.id,nt=(ue.hookID,ue.path),Ct=ue.rendererID,Mt=ue.wasForwarded,Pt=ue.value;Mt||Z.overrideValueAtPath({id:qe,path:nt,rendererID:Ct,type:"hooks",value:Pt})}),pt(Ne(Z),"overrideProps",function(ue){var qe=ue.id,nt=ue.path,Ct=ue.rendererID,Mt=ue.wasForwarded,Pt=ue.value;Mt||Z.overrideValueAtPath({id:qe,path:nt,rendererID:Ct,type:"props",value:Pt})}),pt(Ne(Z),"overrideState",function(ue){var qe=ue.id,nt=ue.path,Ct=ue.rendererID,Mt=ue.wasForwarded,Pt=ue.value;Mt||Z.overrideValueAtPath({id:qe,path:nt,rendererID:Ct,type:"state",value:Pt})}),pt(Ne(Z),"reloadAndProfile",function(ue){H("React::DevTools::reloadAndProfile","true"),H("React::DevTools::recordChangeDescriptions",ue?"true":"false"),Z._bridge.send("reloadAppForProfiling")}),pt(Ne(Z),"renamePath",function(ue){var qe=ue.hookID,nt=ue.id,Ct=ue.newPath,Mt=ue.oldPath,Pt=ue.rendererID,sn=ue.type,rn=Z._rendererInterfaces[Pt];rn==null?console.warn('Invalid renderer id "'.concat(Pt,'" for element "').concat(nt,'"')):rn.renamePath(sn,nt,qe,Mt,Ct)}),pt(Ne(Z),"setTraceUpdatesEnabled",function(ue){for(var qe in Z._traceUpdatesEnabled=ue,Vt(ue),Z._rendererInterfaces)Z._rendererInterfaces[qe].setTraceUpdatesEnabled(ue)}),pt(Ne(Z),"syncSelectionFromNativeElementsPanel",function(){var ue=window.__REACT_DEVTOOLS_GLOBAL_HOOK__.$0;ue!=null&&Z.selectNode(ue)}),pt(Ne(Z),"shutdown",function(){Z.emit("shutdown")}),pt(Ne(Z),"startProfiling",function(ue){for(var qe in Z._recordChangeDescriptions=ue,Z._isProfiling=!0,Z._rendererInterfaces)Z._rendererInterfaces[qe].startProfiling(ue);Z._bridge.send("profilingStatus",Z._isProfiling)}),pt(Ne(Z),"stopProfiling",function(){for(var ue in Z._isProfiling=!1,Z._recordChangeDescriptions=!1,Z._rendererInterfaces)Z._rendererInterfaces[ue].stopProfiling();Z._bridge.send("profilingStatus",Z._isProfiling)}),pt(Ne(Z),"storeAsGlobal",function(ue){var qe=ue.count,nt=ue.id,Ct=ue.path,Mt=ue.rendererID,Pt=Z._rendererInterfaces[Mt];Pt==null?console.warn('Invalid renderer id "'.concat(Mt,'" for element "').concat(nt,'"')):Pt.storeAsGlobal(nt,Ct,qe)}),pt(Ne(Z),"updateConsolePatchSettings",function(ue){var qe=ue.appendComponentStack,nt=ue.breakOnConsoleErrors;qe||nt?Zl({appendComponentStack:qe,breakOnConsoleErrors:nt}):Tt!==null&&(Tt(),Tt=null)}),pt(Ne(Z),"updateComponentFilters",function(ue){for(var qe in Z._rendererInterfaces)Z._rendererInterfaces[qe].updateComponentFilters(ue)}),pt(Ne(Z),"viewAttributeSource",function(ue){var qe=ue.id,nt=ue.path,Ct=ue.rendererID,Mt=Z._rendererInterfaces[Ct];Mt==null?console.warn('Invalid renderer id "'.concat(Ct,'" for element "').concat(qe,'"')):Mt.prepareViewAttributeSource(qe,nt)}),pt(Ne(Z),"viewElementSource",function(ue){var qe=ue.id,nt=ue.rendererID,Ct=Z._rendererInterfaces[nt];Ct==null?console.warn('Invalid renderer id "'.concat(nt,'" for element "').concat(qe,'"')):Ct.prepareViewElementSource(qe)}),pt(Ne(Z),"onTraceUpdates",function(ue){Z.emit("traceUpdates",ue)}),pt(Ne(Z),"onHookOperations",function(ue){if(Z._bridge.send("operations",ue),Z._persistedSelection!==null){var qe=ue[0];if(Z._persistedSelection.rendererID===qe){var nt=Z._rendererInterfaces[qe];if(nt==null)console.warn('Invalid renderer id "'.concat(qe,'"'));else{var Ct=Z._persistedSelectionMatch,Mt=nt.getBestMatchForTrackedPath();Z._persistedSelectionMatch=Mt;var Pt=Ct!==null?Ct.id:null,sn=Mt!==null?Mt.id:null;Pt!==sn&&sn!==null&&Z._bridge.send("selectFiber",sn),Mt!==null&&Mt.isFullMatch&&(Z._persistedSelection=null,Z._persistedSelectionMatch=null,nt.setTrackedPath(null))}}}}),pt(Ne(Z),"_throttledPersistSelection",O()(function(ue,qe){var nt=Z._rendererInterfaces[ue],Ct=nt!=null?nt.getPathForElement(qe):null;Ct!==null?H("React::DevTools::lastSelection",JSON.stringify({rendererID:ue,path:Ct})):B("React::DevTools::lastSelection")},1e3)),T("React::DevTools::reloadAndProfile")==="true"&&(Z._recordChangeDescriptions=T("React::DevTools::recordChangeDescriptions")==="true",Z._isProfiling=!0,B("React::DevTools::recordChangeDescriptions"),B("React::DevTools::reloadAndProfile"));var ke=T("React::DevTools::lastSelection");ke!=null&&(Z._persistedSelection=JSON.parse(ke)),Z._bridge=Ae,Ae.addListener("copyElementPath",Z.copyElementPath),Ae.addListener("deletePath",Z.deletePath),Ae.addListener("getProfilingData",Z.getProfilingData),Ae.addListener("getProfilingStatus",Z.getProfilingStatus),Ae.addListener("getOwnersList",Z.getOwnersList),Ae.addListener("inspectElement",Z.inspectElement),Ae.addListener("logElementToConsole",Z.logElementToConsole),Ae.addListener("overrideSuspense",Z.overrideSuspense),Ae.addListener("overrideValueAtPath",Z.overrideValueAtPath),Ae.addListener("reloadAndProfile",Z.reloadAndProfile),Ae.addListener("renamePath",Z.renamePath),Ae.addListener("setTraceUpdatesEnabled",Z.setTraceUpdatesEnabled),Ae.addListener("startProfiling",Z.startProfiling),Ae.addListener("stopProfiling",Z.stopProfiling),Ae.addListener("storeAsGlobal",Z.storeAsGlobal),Ae.addListener("syncSelectionFromNativeElementsPanel",Z.syncSelectionFromNativeElementsPanel),Ae.addListener("shutdown",Z.shutdown),Ae.addListener("updateConsolePatchSettings",Z.updateConsolePatchSettings),Ae.addListener("updateComponentFilters",Z.updateComponentFilters),Ae.addListener("viewAttributeSource",Z.viewAttributeSource),Ae.addListener("viewElementSource",Z.viewElementSource),Ae.addListener("overrideContext",Z.overrideContext),Ae.addListener("overrideHookState",Z.overrideHookState),Ae.addListener("overrideProps",Z.overrideProps),Ae.addListener("overrideState",Z.overrideState),Z._isProfiling&&Ae.send("profilingStatus",!0);var Je,vt=!1;try{localStorage.getItem("test"),vt=!0}catch(ue){}return Ae.send("isBackendStorageAPISupported",vt),Ce(Ae,Ne(Z)),Je=Ne(Z),Je.addListener("traceUpdates",Dr),Z}return z=ye,(G=[{key:"getInstanceAndStyle",value:function(Ae){var Z=Ae.id,ke=Ae.rendererID,Je=this._rendererInterfaces[ke];return Je==null?(console.warn('Invalid renderer id "'.concat(ke,'"')),null):Je.getInstanceAndStyle(Z)}},{key:"getIDForNode",value:function(Ae){for(var Z in this._rendererInterfaces){var ke=this._rendererInterfaces[Z];try{var Je=ke.getFiberIDForNative(Ae,!0);if(Je!==null)return Je}catch(vt){}}return null}},{key:"selectNode",value:function(Ae){var Z=this.getIDForNode(Ae);Z!==null&&this._bridge.send("selectFiber",Z)}},{key:"setRendererInterface",value:function(Ae,Z){this._rendererInterfaces[Ae]=Z,this._isProfiling&&Z.startProfiling(this._recordChangeDescriptions),Z.setTraceUpdatesEnabled(this._traceUpdatesEnabled);var ke=this._persistedSelection;ke!==null&&ke.rendererID===Ae&&Z.setTrackedPath(ke.path)}},{key:"onUnsupportedRenderer",value:function(Ae){this._bridge.send("unsupportedRendererVersion",Ae)}},{key:"rendererInterfaces",get:function(){return this._rendererInterfaces}}])&&ms(z.prototype,G),$&&ms(z,$),ye}(_);function Cn(U){return(Cn=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(z){return typeof z}:function(z){return z&&typeof Symbol=="function"&&z.constructor===Symbol&&z!==Symbol.prototype?"symbol":typeof z})(U)}function cr(U){return function(z){if(Array.isArray(z))return Si(z)}(U)||function(z){if(typeof Symbol!="undefined"&&Symbol.iterator in Object(z))return Array.from(z)}(U)||function(z,G){if(!!z){if(typeof z=="string")return Si(z,G);var $=Object.prototype.toString.call(z).slice(8,-1);if($==="Object"&&z.constructor&&($=z.constructor.name),$==="Map"||$==="Set")return Array.from(z);if($==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test($))return Si(z,G)}}(U)||function(){throw new TypeError(`Invalid attempt to spread non-iterable instance.
-In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`)}()}function Si(U,z){(z==null||z>U.length)&&(z=U.length);for(var G=0,$=new Array(z);G<z;G++)$[G]=U[G];return $}function Mu(U,z){for(var G=0;G<z.length;G++){var $=z[G];$.enumerable=$.enumerable||!1,$.configurable=!0,"value"in $&&($.writable=!0),Object.defineProperty(U,$.key,$)}}function zu(U,z){return(zu=Object.setPrototypeOf||function(G,$){return G.__proto__=$,G})(U,z)}function Hu(U){var z=function(){if(typeof Reflect=="undefined"||!Reflect.construct||Reflect.construct.sham)return!1;if(typeof Proxy=="function")return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],function(){})),!0}catch(G){return!1}}();return function(){var G,$=Fo(U);if(z){var Te=Fo(this).constructor;G=Reflect.construct($,arguments,Te)}else G=$.apply(this,arguments);return Su(this,G)}}function Su(U,z){return!z||Cn(z)!=="object"&&typeof z!="function"?Ti(U):z}function Ti(U){if(U===void 0)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return U}function Fo(U){return(Fo=Object.setPrototypeOf?Object.getPrototypeOf:function(z){return z.__proto__||Object.getPrototypeOf(z)})(U)}function ku(U,z,G){return z in U?Object.defineProperty(U,z,{value:G,enumerable:!0,configurable:!0,writable:!0}):U[z]=G,U}var po=function(U){(function(Ae,Z){if(typeof Z!="function"&&Z!==null)throw new TypeError("Super expression must either be null or a function");Ae.prototype=Object.create(Z&&Z.prototype,{constructor:{value:Ae,writable:!0,configurable:!0}}),Z&&zu(Ae,Z)})(ye,U);var z,G,$,Te=Hu(ye);function ye(Ae){var Z;return function(ke,Je){if(!(ke instanceof Je))throw new TypeError("Cannot call a class as a function")}(this,ye),ku(Ti(Z=Te.call(this)),"_isShutdown",!1),ku(Ti(Z),"_messageQueue",[]),ku(Ti(Z),"_timeoutID",null),ku(Ti(Z),"_wallUnlisten",null),ku(Ti(Z),"_flush",function(){if(Z._timeoutID!==null&&(clearTimeout(Z._timeoutID),Z._timeoutID=null),Z._messageQueue.length){for(var ke=0;ke<Z._messageQueue.length;ke+=2){var Je;(Je=Z._wall).send.apply(Je,[Z._messageQueue[ke]].concat(cr(Z._messageQueue[ke+1])))}Z._messageQueue.length=0,Z._timeoutID=setTimeout(Z._flush,100)}}),ku(Ti(Z),"overrideValueAtPath",function(ke){var Je=ke.id,vt=ke.path,ue=ke.rendererID,qe=ke.type,nt=ke.value;switch(qe){case"context":Z.send("overrideContext",{id:Je,path:vt,rendererID:ue,wasForwarded:!0,value:nt});break;case"hooks":Z.send("overrideHookState",{id:Je,path:vt,rendererID:ue,wasForwarded:!0,value:nt});break;case"props":Z.send("overrideProps",{id:Je,path:vt,rendererID:ue,wasForwarded:!0,value:nt});break;case"state":Z.send("overrideState",{id:Je,path:vt,rendererID:ue,wasForwarded:!0,value:nt})}}),Z._wall=Ae,Z._wallUnlisten=Ae.listen(function(ke){Ti(Z).emit(ke.event,ke.payload)})||null,Z.addListener("overrideValueAtPath",Z.overrideValueAtPath),Z}return z=ye,(G=[{key:"send",value:function(Ae){if(this._isShutdown)console.warn('Cannot send message "'.concat(Ae,'" through a Bridge that has been shutdown.'));else{for(var Z=arguments.length,ke=new Array(Z>1?Z-1:0),Je=1;Je<Z;Je++)ke[Je-1]=arguments[Je];this._messageQueue.push(Ae,ke),this._timeoutID||(this._timeoutID=setTimeout(this._flush,0))}}},{key:"shutdown",value:function(){if(this._isShutdown)console.warn("Bridge was already shutdown.");else{this.send("shutdown"),this._isShutdown=!0,this.addListener=function(){},this.emit=function(){},this.removeAllListeners();var Ae=this._wallUnlisten;Ae&&Ae();do this._flush();while(this._messageQueue.length);this._timeoutID!==null&&(clearTimeout(this._timeoutID),this._timeoutID=null)}}},{key:"wall",get:function(){return this._wall}}])&&Mu(z.prototype,G),$&&Mu(z,$),ye}(_);function qu(U,z,G){var $=U[z];return U[z]=function(Te){return G.call(this,$,arguments)},$}function Ia(U,z){for(var G in z)U[G]=z[G]}function m0(U){typeof U.forceUpdate=="function"?U.forceUpdate():U.updater!=null&&typeof U.updater.enqueueForceUpdate=="function"&&U.updater.enqueueForceUpdate(this,function(){},"forceUpdate")}function ua(U,z){var G=Object.keys(U);if(Object.getOwnPropertySymbols){var $=Object.getOwnPropertySymbols(U);z&&($=$.filter(function(Te){return Object.getOwnPropertyDescriptor(U,Te).enumerable})),G.push.apply(G,$)}return G}function J0(U){for(var z=1;z<arguments.length;z++){var G=arguments[z]!=null?arguments[z]:{};z%2?ua(Object(G),!0).forEach(function($){oa(U,$,G[$])}):Object.getOwnPropertyDescriptors?Object.defineProperties(U,Object.getOwnPropertyDescriptors(G)):ua(Object(G)).forEach(function($){Object.defineProperty(U,$,Object.getOwnPropertyDescriptor(G,$))})}return U}function oa(U,z,G){return z in U?Object.defineProperty(U,z,{value:G,enumerable:!0,configurable:!0,writable:!0}):U[z]=G,U}function ba(U){return(ba=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(z){return typeof z}:function(z){return z&&typeof Symbol=="function"&&z.constructor===Symbol&&z!==Symbol.prototype?"symbol":typeof z})(U)}function gs(U){var z=null,G=null;if(U._currentElement!=null){U._currentElement.key&&(G=""+U._currentElement.key);var $=U._currentElement.type;typeof $=="string"?z=$:typeof $=="function"&&(z=mi($))}return{displayName:z,key:G}}function S0(U){if(U._currentElement!=null){var z=U._currentElement.type;if(typeof z=="function")return U.getPublicInstance()!==null?1:5;if(typeof z=="string")return 7}return 9}function Qn(U){var z=[];if(ba(U)==="object"){if(!(U._currentElement===null||U._currentElement===!1)){if(U._renderedComponent){var G=U._renderedComponent;S0(G)!==9&&z.push(G)}else if(U._renderedChildren){var $=U._renderedChildren;for(var Te in $){var ye=$[Te];S0(ye)!==9&&z.push(ye)}}}}return z}function fc(U,z,G,$){var Te,ye=new Map,Ae=new WeakMap,Z=new WeakMap,ke=null;function Je(it){if(ba(it)!=="object"||it===null)throw new Error("Invalid internal instance: "+it);if(!Ae.has(it)){var Et=el();Ae.set(it,Et),ye.set(Et,it)}return Ae.get(it)}function vt(it,Et){if(it.length!==Et.length)return!1;for(var et=0;et<it.length;et++)if(it[et]!==Et[et])return!1;return!0}G.ComponentTree?(ke=function(it,Et){var et=G.ComponentTree.getClosestInstanceFromNode(it);return Ae.get(et)||null},Te=function(it){var Et=ye.get(it);return G.ComponentTree.getNodeFromInstance(Et)}):G.Mount.getID&&G.Mount.getNode&&(ke=function(it,Et){return null},Te=function(it){return null});var ue=[],qe=null;function nt(it,Et,et){if(et===0){var Ft=it._currentElement!=null&&it._currentElement._owner!=null;er(1),er(Et),er(11),er(0),er(Ft?1:0)}else{var un=S0(it),fn=gs(it),Jn=fn.displayName,Sr=fn.key,fu=it._currentElement!=null&&it._currentElement._owner!=null?Je(it._currentElement._owner):0,Lu=Cr(Jn),T0=Cr(Sr);er(1),er(Et),er(un),er(et),er(fu),er(Lu),er(T0)}}function Ct(it,Et,et){er(3),er(Et);var Ft=et.map(Je);er(Ft.length);for(var un=0;un<Ft.length;un++)er(Ft[un])}function Mt(it,Et,et){var Ft=ye.get(it);Ft!=null&&(Z.set(Ft,et),nt(Ft,it,Et),Qn(Ft).forEach(function(un){return Mt(Je(un),it,et)}))}G.Reconciler&&(qe=function(it,Et){var et={};for(var Ft in Et)et[Ft]=qu(it,Ft,Et[Ft]);return et}(G.Reconciler,{mountComponent:function(it,Et){var et=Et[0],Ft=Et[3];if(S0(et)===9)return it.apply(this,Et);if(Ft._topLevelWrapper===void 0)return it.apply(this,Et);var un=Je(et);nt(et,un,ue.length>0?ue[ue.length-1]:0),ue.push(un),Z.set(et,Je(Ft._topLevelWrapper));try{var fn=it.apply(this,Et);return ue.pop(),fn}catch(Sr){throw ue=[],Sr}finally{if(ue.length===0){var Jn=Z.get(et);if(Jn===void 0)throw new Error("Expected to find root ID.");dr(Jn)}}},performUpdateIfNecessary:function(it,Et){var et=Et[0];if(S0(et)===9)return it.apply(this,Et);var Ft=Je(et);ue.push(Ft);var un=Qn(et);try{var fn=it.apply(this,Et),Jn=Qn(et);return vt(un,Jn)||Ct(et,Ft,Jn),ue.pop(),fn}catch(fu){throw ue=[],fu}finally{if(ue.length===0){var Sr=Z.get(et);if(Sr===void 0)throw new Error("Expected to find root ID.");dr(Sr)}}},receiveComponent:function(it,Et){var et=Et[0];if(S0(et)===9)return it.apply(this,Et);var Ft=Je(et);ue.push(Ft);var un=Qn(et);try{var fn=it.apply(this,Et),Jn=Qn(et);return vt(un,Jn)||Ct(et,Ft,Jn),ue.pop(),fn}catch(fu){throw ue=[],fu}finally{if(ue.length===0){var Sr=Z.get(et);if(Sr===void 0)throw new Error("Expected to find root ID.");dr(Sr)}}},unmountComponent:function(it,Et){var et=Et[0];if(S0(et)===9)return it.apply(this,Et);var Ft=Je(et);ue.push(Ft);try{var un=it.apply(this,Et);return ue.pop(),function(Jn,Sr){rn.push(Sr),ye.delete(Sr)}(0,Ft),un}catch(Jn){throw ue=[],Jn}finally{if(ue.length===0){var fn=Z.get(et);if(fn===void 0)throw new Error("Expected to find root ID.");dr(fn)}}}}));var Pt=[],sn=new Map,rn=[],Nt=0,Dn=null;function dr(it){if(Pt.length!==0||rn.length!==0||Dn!==null){var Et=rn.length+(Dn===null?0:1),et=new Array(3+Nt+(Et>0?2+Et:0)+Pt.length),Ft=0;if(et[Ft++]=z,et[Ft++]=it,et[Ft++]=Nt,sn.forEach(function(Jn,Sr){et[Ft++]=Sr.length;for(var fu=Y0(Sr),Lu=0;Lu<fu.length;Lu++)et[Ft+Lu]=fu[Lu];Ft+=Sr.length}),Et>0){et[Ft++]=2,et[Ft++]=Et;for(var un=0;un<rn.length;un++)et[Ft++]=rn[un];Dn!==null&&(et[Ft]=Dn,Ft++)}for(var fn=0;fn<Pt.length;fn++)et[Ft+fn]=Pt[fn];Ft+=Pt.length,U.emit("operations",et),Pt.length=0,rn=[],Dn=null,sn.clear(),Nt=0}}function er(it){Pt.push(it)}function Cr(it){if(it===null)return 0;var Et=sn.get(it);if(Et!==void 0)return Et;var et=sn.size+1;return sn.set(it,et),Nt+=it.length+1,et}var Rn=null,Lr={};function y0(it){return function(Et){var et=Lr[it];if(!et)return!1;for(var Ft=0;Ft<Et.length;Ft++)if(!(et=et[Et[Ft]]))return!1;return!0}}function Nr(it){var Et=ye.get(it);if(Et==null)return null;var et=gs(Et),Ft=et.displayName,un=et.key,fn=S0(Et),Jn=null,Sr=null,fu=null,Lu=null,T0=null,Z0=Et._currentElement;if(Z0!==null){fu=Z0.props,T0=Z0._source!=null?Z0._source:null;var Nu=Z0._owner;if(Nu)for(Sr=[];Nu!=null;)Sr.push({displayName:gs(Nu).displayName||"Unknown",id:Je(Nu),type:S0(Nu)}),Nu._currentElement&&(Nu=Nu._currentElement._owner)}var _i=Et._instance;return _i!=null&&(Jn=_i.context||null,Lu=_i.state||null),{id:it,canEditHooks:!1,canEditFunctionProps:!1,canEditHooksAndDeletePaths:!1,canEditHooksAndRenamePaths:!1,canEditFunctionPropsDeletePaths:!1,canEditFunctionPropsRenamePaths:!1,canToggleSuspense:!1,canViewSource:fn===1||fn===5,hasLegacyContext:!0,displayName:Ft,type:fn,key:un!=null?un:null,context:Jn,hooks:null,props:fu,state:Lu,owners:Sr,source:T0,rootType:null,rendererPackageName:null,rendererVersion:null}}return{cleanup:function(){qe!==null&&(G.Component?Ia(G.Component.Mixin,qe):Ia(G.Reconciler,qe)),qe=null},copyElementPath:function(it,Et){var et=Nr(it);et!==null&&X0(Uu(et,Et))},deletePath:function(it,Et,et,Ft){var un=ye.get(Et);if(un!=null){var fn=un._instance;if(fn!=null)switch(it){case"context":K0(fn.context,Ft),m0(fn);break;case"hooks":throw new Error("Hooks not supported by this renderer");case"props":var Jn=un._currentElement;un._currentElement=J0(J0({},Jn),{},{props:gi(Jn.props,Ft)}),m0(fn);break;case"state":K0(fn.state,Ft),m0(fn)}}},flushInitialOperations:function(){var it=G.Mount._instancesByReactRootID||G.Mount._instancesByContainerID;for(var Et in it){var et=Je(it[Et]);Mt(et,0,et),dr(et)}},getBestMatchForTrackedPath:function(){return null},getDisplayNameForFiberID:function(it){var Et=ye.get(it);return Et?gs(Et).displayName:null},getFiberIDForNative:ke,getInstanceAndStyle:function(it){var Et=null,et=null,Ft=ye.get(it);if(Ft!=null){Et=Ft._instance||null;var un=Ft._currentElement;un!=null&&un.props!=null&&(et=un.props.style||null)}return{instance:Et,style:et}},findNativeNodesForFiberID:function(it){var Et=Te(it);return Et==null?null:[Et]},getOwnersList:function(it){return null},getPathForElement:function(it){return null},getProfilingData:function(){throw new Error("getProfilingData not supported by this renderer")},handleCommitFiberRoot:function(){throw new Error("handleCommitFiberRoot not supported by this renderer")},handleCommitFiberUnmount:function(){throw new Error("handleCommitFiberUnmount not supported by this renderer")},inspectElement:function(it,Et){Rn!==it&&(Rn=it,Lr={});var et=Nr(it);return et===null?{id:it,type:"not-found"}:(Et!=null&&function(Ft){var un=Lr;Ft.forEach(function(fn){un[fn]||(un[fn]={}),un=un[fn]})}(Et),function(Ft){var un=ye.get(Ft);if(un!=null)switch(S0(un)){case 1:$.$r=un._instance;break;case 5:var fn=un._currentElement;if(fn==null)return void console.warn('Could not find element with id "'.concat(Ft,'"'));$.$r={props:fn.props,type:fn.type};break;default:$.$r=null}else console.warn('Could not find instance with id "'.concat(Ft,'"'))}(it),et.context=Ri(et.context,y0("context")),et.props=Ri(et.props,y0("props")),et.state=Ri(et.state,y0("state")),{id:it,type:"full-data",value:et})},logElementToConsole:function(it){var Et=Nr(it);if(Et!==null){var et=typeof console.groupCollapsed=="function";et&&console.groupCollapsed("[Click to expand] %c<".concat(Et.displayName||"Component"," />"),"color: var(--dom-tag-name-color); font-weight: normal;"),Et.props!==null&&console.log("Props:",Et.props),Et.state!==null&&console.log("State:",Et.state),Et.context!==null&&console.log("Context:",Et.context);var Ft=Te(it);Ft!==null&&console.log("Node:",Ft),(window.chrome||/firefox/i.test(navigator.userAgent))&&console.log("Right-click any value to save it as a global variable for further inspection."),et&&console.groupEnd()}else console.warn('Could not find element with id "'.concat(it,'"'))},overrideSuspense:function(){throw new Error("overrideSuspense not supported by this renderer")},overrideValueAtPath:function(it,Et,et,Ft,un){var fn=ye.get(Et);if(fn!=null){var Jn=fn._instance;if(Jn!=null)switch(it){case"context":Oo(Jn.context,Ft,un),m0(Jn);break;case"hooks":throw new Error("Hooks not supported by this renderer");case"props":var Sr=fn._currentElement;fn._currentElement=J0(J0({},Sr),{},{props:bn(Sr.props,Ft,un)}),m0(Jn);break;case"state":Oo(Jn.state,Ft,un),m0(Jn)}}},renamePath:function(it,Et,et,Ft,un){var fn=ye.get(Et);if(fn!=null){var Jn=fn._instance;if(Jn!=null)switch(it){case"context":Xr(Jn.context,Ft,un),m0(Jn);break;case"hooks":throw new Error("Hooks not supported by this renderer");case"props":var Sr=fn._currentElement;fn._currentElement=J0(J0({},Sr),{},{props:en(Sr.props,Ft,un)}),m0(Jn);break;case"state":Xr(Jn.state,Ft,un),m0(Jn)}}},prepareViewAttributeSource:function(it,Et){var et=Nr(it);et!==null&&(window.$attribute=Uu(et,Et))},prepareViewElementSource:function(it){var Et=ye.get(it);if(Et!=null){var et=Et._currentElement;et!=null?$.$type=et.type:console.warn('Could not find element with id "'.concat(it,'"'))}else console.warn('Could not find instance with id "'.concat(it,'"'))},renderer:G,setTraceUpdatesEnabled:function(it){},setTrackedPath:function(it){},startProfiling:function(){},stopProfiling:function(){},storeAsGlobal:function(it,Et,et){var Ft=Nr(it);if(Ft!==null){var un=Uu(Ft,Et),fn="$reactTemp".concat(et);window[fn]=un,console.log(fn),console.log(un)}},updateComponentFilters:function(it){}}}function fi(U,z){var G=!1,$={bottom:0,left:0,right:0,top:0},Te=z[U];if(Te!=null){for(var ye=0,Ae=Object.keys($);ye<Ae.length;ye++)$[Ae[ye]]=Te;G=!0}var Z=z[U+"Horizontal"];if(Z!=null)$.left=Z,$.right=Z,G=!0;else{var ke=z[U+"Left"];ke!=null&&($.left=ke,G=!0);var Je=z[U+"Right"];Je!=null&&($.right=Je,G=!0);var vt=z[U+"End"];vt!=null&&($.right=vt,G=!0);var ue=z[U+"Start"];ue!=null&&($.left=ue,G=!0)}var qe=z[U+"Vertical"];if(qe!=null)$.bottom=qe,$.top=qe,G=!0;else{var nt=z[U+"Bottom"];nt!=null&&($.bottom=nt,G=!0);var Ct=z[U+"Top"];Ct!=null&&($.top=Ct,G=!0)}return G?$:null}function $r(U){return($r=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(z){return typeof z}:function(z){return z&&typeof Symbol=="function"&&z.constructor===Symbol&&z!==Symbol.prototype?"symbol":typeof z})(U)}function $l(U,z,G){return z in U?Object.defineProperty(U,z,{value:G,enumerable:!0,configurable:!0,writable:!0}):U[z]=G,U}function la(U,z,G,$){U.addListener("NativeStyleEditor_measure",function(Te){var ye=Te.id,Ae=Te.rendererID;Ba(z,U,G,ye,Ae)}),U.addListener("NativeStyleEditor_renameAttribute",function(Te){var ye=Te.id,Ae=Te.rendererID,Z=Te.oldName,ke=Te.newName,Je=Te.value;(function(vt,ue,qe,nt,Ct,Mt){var Pt,sn=vt.getInstanceAndStyle({id:ue,rendererID:qe});if(!(!sn||!sn.style)){var rn,Nt=sn.instance,Dn=sn.style,dr=Ct?($l(Pt={},nt,void 0),$l(Pt,Ct,Mt),Pt):$l({},nt,void 0);if(Nt!==null&&typeof Nt.setNativeProps=="function"){var er=Bs.get(ue);er?Object.assign(er,dr):Bs.set(ue,dr),Nt.setNativeProps({style:dr})}else if(Array.isArray(Dn)){var Cr=Dn.length-1;$r(Dn[Cr])!=="object"||Array.isArray(Dn[Cr])?vt.overrideValueAtPath({type:"props",id:ue,rendererID:qe,path:["style"],value:Dn.concat([dr])}):(delete(rn=Us(Dn[Cr]))[nt],Ct?rn[Ct]=Mt:rn[nt]=void 0,vt.overrideValueAtPath({type:"props",id:ue,rendererID:qe,path:["style",Cr],value:rn}))}else $r(Dn)==="object"?(delete(rn=Us(Dn))[nt],Ct?rn[Ct]=Mt:rn[nt]=void 0,vt.overrideValueAtPath({type:"props",id:ue,rendererID:qe,path:["style"],value:rn})):vt.overrideValueAtPath({type:"props",id:ue,rendererID:qe,path:["style"],value:[Dn,dr]});vt.emit("hideNativeHighlight")}})(z,ye,Ae,Z,ke,Je),setTimeout(function(){return Ba(z,U,G,ye,Ae)})}),U.addListener("NativeStyleEditor_setValue",function(Te){var ye=Te.id,Ae=Te.rendererID,Z=Te.name,ke=Te.value;(function(Je,vt,ue,qe,nt){var Ct=Je.getInstanceAndStyle({id:vt,rendererID:ue});if(!(!Ct||!Ct.style)){var Mt=Ct.instance,Pt=Ct.style,sn=$l({},qe,nt);if(Mt!==null&&typeof Mt.setNativeProps=="function"){var rn=Bs.get(vt);rn?Object.assign(rn,sn):Bs.set(vt,sn),Mt.setNativeProps({style:sn})}else if(Array.isArray(Pt)){var Nt=Pt.length-1;$r(Pt[Nt])!=="object"||Array.isArray(Pt[Nt])?Je.overrideValueAtPath({type:"props",id:vt,rendererID:ue,path:["style"],value:Pt.concat([sn])}):Je.overrideValueAtPath({type:"props",id:vt,rendererID:ue,path:["style",Nt,qe],value:nt})}else Je.overrideValueAtPath({type:"props",id:vt,rendererID:ue,path:["style"],value:[Pt,sn]});Je.emit("hideNativeHighlight")}})(z,ye,Ae,Z,ke),setTimeout(function(){return Ba(z,U,G,ye,Ae)})}),U.send("isNativeStyleEditorSupported",{isSupported:!0,validAttributes:$})}var hf={top:0,left:0,right:0,bottom:0},Bs=new Map;function Ba(U,z,G,$,Te){var ye=U.getInstanceAndStyle({id:$,rendererID:Te});if(ye&&ye.style){var Ae=ye.instance,Z=G(ye.style),ke=Bs.get($);ke!=null&&(Z=Object.assign({},Z,ke)),Ae&&typeof Ae.measure=="function"?Ae.measure(function(Je,vt,ue,qe,nt,Ct){if(typeof Je=="number"){var Mt=Z!=null&&fi("margin",Z)||hf,Pt=Z!=null&&fi("padding",Z)||hf;z.send("NativeStyleEditor_styleAndLayout",{id:$,layout:{x:Je,y:vt,width:ue,height:qe,left:nt,top:Ct,margin:Mt,padding:Pt},style:Z||null})}else z.send("NativeStyleEditor_styleAndLayout",{id:$,layout:null,style:Z||null})}):z.send("NativeStyleEditor_styleAndLayout",{id:$,layout:null,style:Z||null})}else z.send("NativeStyleEditor_styleAndLayout",{id:$,layout:null,style:null})}function Us(U){var z={};for(var G in U)z[G]=U[G];return z}(function(U){if(U.hasOwnProperty("__REACT_DEVTOOLS_GLOBAL_HOOK__"))return null;var z=0,G=!1,$={},Te=new Map,ye={},Ae=new Map,Z={rendererInterfaces:Te,listeners:ye,renderers:Ae,emit:function(ke,Je){ye[ke]&&ye[ke].map(function(vt){return vt(Je)})},getFiberRoots:function(ke){var Je=$;return Je[ke]||(Je[ke]=new Set),Je[ke]},inject:function(ke){var Je=++z;Ae.set(Je,ke);var vt=G?"deadcode":function(Mt){try{if(typeof Mt.version=="string")return Mt.bundleType>0?"development":"production";var Pt=Function.prototype.toString;if(Mt.Mount&&Mt.Mount._renderNewRootComponent){var sn=Pt.call(Mt.Mount._renderNewRootComponent);return sn.indexOf("function")!==0?"production":sn.indexOf("storedMeasure")!==-1?"development":sn.indexOf("should be a pure function")!==-1?sn.indexOf("NODE_ENV")!==-1||sn.indexOf("development")!==-1||sn.indexOf("true")!==-1?"development":sn.indexOf("nextElement")!==-1||sn.indexOf("nextComponent")!==-1?"unminified":"development":sn.indexOf("nextElement")!==-1||sn.indexOf("nextComponent")!==-1?"unminified":"outdated"}}catch(rn){}return"production"}(ke);try{var ue=window.__REACT_DEVTOOLS_APPEND_COMPONENT_STACK__!==!1,qe=window.__REACT_DEVTOOLS_BREAK_ON_CONSOLE_ERRORS__===!0;(ue||qe)&&(co(ke),Zl({appendComponentStack:ue,breakOnConsoleErrors:qe}))}catch(Mt){}var nt=U.__REACT_DEVTOOLS_ATTACH__;if(typeof nt=="function"){var Ct=nt(Z,Je,ke,U);Z.rendererInterfaces.set(Je,Ct)}return Z.emit("renderer",{id:Je,renderer:ke,reactBuildType:vt}),Je},on:function(ke,Je){ye[ke]||(ye[ke]=[]),ye[ke].push(Je)},off:function(ke,Je){if(ye[ke]){var vt=ye[ke].indexOf(Je);vt!==-1&&ye[ke].splice(vt,1),ye[ke].length||delete ye[ke]}},sub:function(ke,Je){return Z.on(ke,Je),function(){return Z.off(ke,Je)}},supportsFiber:!0,checkDCE:function(ke){try{Function.prototype.toString.call(ke).indexOf("^_^")>-1&&(G=!0,setTimeout(function(){throw new Error("React is running in production mode, but dead code elimination has not been applied. Read how to correctly configure React for production: https://reactjs.org/link/perf-use-production-build")}))}catch(Je){}},onCommitFiberUnmount:function(ke,Je){var vt=Te.get(ke);vt!=null&&vt.handleCommitFiberUnmount(Je)},onCommitFiberRoot:function(ke,Je,vt){var ue=Z.getFiberRoots(ke),qe=Je.current,nt=ue.has(Je),Ct=qe.memoizedState==null||qe.memoizedState.element==null;nt||Ct?nt&&Ct&&ue.delete(Je):ue.add(Je);var Mt=Te.get(ke);Mt!=null&&Mt.handleCommitFiberRoot(Je,vt)}};Object.defineProperty(U,"__REACT_DEVTOOLS_GLOBAL_HOOK__",{configurable:!1,enumerable:!1,get:function(){return Z}})})(window);var g0=window.__REACT_DEVTOOLS_GLOBAL_HOOK__,js=[{type:1,value:7,isEnabled:!0}];function ji(U){if(g0!=null){var z=U||{},G=z.host,$=G===void 0?"localhost":G,Te=z.nativeStyleEditorValidAttributes,ye=z.useHttps,Ae=ye!==void 0&&ye,Z=z.port,ke=Z===void 0?8097:Z,Je=z.websocket,vt=z.resolveRNStyle,ue=vt===void 0?null:vt,qe=z.isAppActive,nt=Ae?"wss":"ws",Ct=null;if((qe===void 0?function(){return!0}:qe)()){var Mt=null,Pt=[],sn=nt+"://"+$+":"+ke,rn=Je||new window.WebSocket(sn);rn.onclose=function(){Mt!==null&&Mt.emit("shutdown"),Nt()},rn.onerror=function(){Nt()},rn.onmessage=function(Dn){var dr;try{if(typeof Dn.data!="string")throw Error();dr=JSON.parse(Dn.data)}catch(er){return void console.error("[React DevTools] Failed to parse JSON: "+Dn.data)}Pt.forEach(function(er){try{er(dr)}catch(Cr){throw console.log("[React DevTools] Error calling listener",dr),console.log("error:",Cr),Cr}})},rn.onopen=function(){(Mt=new po({listen:function(Rn){return Pt.push(Rn),function(){var Lr=Pt.indexOf(Rn);Lr>=0&&Pt.splice(Lr,1)}},send:function(Rn,Lr,y0){rn.readyState===rn.OPEN?rn.send(JSON.stringify({event:Rn,payload:Lr})):(Mt!==null&&Mt.shutdown(),Nt())}})).addListener("inspectElement",function(Rn){var Lr=Rn.id,y0=Rn.rendererID,Nr=Dn.rendererInterfaces[y0];if(Nr!=null){var it=Nr.findNativeNodesForFiberID(Lr);it!=null&&it[0]!=null&&Dn.emit("showNativeHighlight",it[0])}}),Mt.addListener("updateComponentFilters",function(Rn){js=Rn}),window.__REACT_DEVTOOLS_COMPONENT_FILTERS__==null&&Mt.send("overrideComponentFilters",js);var Dn=new Yn(Mt);if(Dn.addListener("shutdown",function(){g0.emit("shutdown")}),function(Rn,Lr,y0){if(Rn==null)return function(){};var Nr=[Rn.sub("renderer-attached",function(et){var Ft=et.id,un=(et.renderer,et.rendererInterface);Lr.setRendererInterface(Ft,un),un.flushInitialOperations()}),Rn.sub("unsupported-renderer-version",function(et){Lr.onUnsupportedRenderer(et)}),Rn.sub("operations",Lr.onHookOperations),Rn.sub("traceUpdates",Lr.onTraceUpdates)],it=function(et,Ft){var un=Rn.rendererInterfaces.get(et);un==null&&(typeof Ft.findFiberByHostInstance=="function"?un=bs(Rn,et,Ft,y0):Ft.ComponentTree&&(un=fc(Rn,et,Ft,y0)),un!=null&&Rn.rendererInterfaces.set(et,un)),un!=null?Rn.emit("renderer-attached",{id:et,renderer:Ft,rendererInterface:un}):Rn.emit("unsupported-renderer-version",et)};Rn.renderers.forEach(function(et,Ft){it(Ft,et)}),Nr.push(Rn.sub("renderer",function(et){var Ft=et.id,un=et.renderer;it(Ft,un)})),Rn.emit("react-devtools",Lr),Rn.reactDevtoolsAgent=Lr;var Et=function(){Nr.forEach(function(et){return et()}),Rn.rendererInterfaces.forEach(function(et){et.cleanup()}),Rn.reactDevtoolsAgent=null};Lr.addListener("shutdown",Et),Nr.push(function(){Lr.removeListener("shutdown",Et)})}(g0,Dn,window),ue!=null||g0.resolveRNStyle!=null)la(Mt,Dn,ue||g0.resolveRNStyle,Te||g0.nativeStyleEditorValidAttributes||null);else{var dr,er,Cr=function(){Mt!==null&&la(Mt,Dn,dr,er)};g0.hasOwnProperty("resolveRNStyle")||Object.defineProperty(g0,"resolveRNStyle",{enumerable:!1,get:function(){return dr},set:function(Rn){dr=Rn,Cr()}}),g0.hasOwnProperty("nativeStyleEditorValidAttributes")||Object.defineProperty(g0,"nativeStyleEditorValidAttributes",{enumerable:!1,get:function(){return er},set:function(Rn){er=Rn,Cr()}})}}}else Nt()}function Nt(){Ct===null&&(Ct=setTimeout(function(){return ji(U)},2e3))}}}])})});var a6=Ke(s6=>{"use strict";Object.defineProperty(s6,"__esModule",{value:!0});o6();var zB=l6();zB.connectToDevTools()});var h6=Ke(dy=>{"use strict";var f6=dy&&dy.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(dy,"__esModule",{value:!0});var c6=Q_(),HB=f6(hT()),d6=f6(eh()),hs=r3();process.env.DEV==="true"&&a6();var p6=i=>{i==null||i.unsetMeasureFunc(),i==null||i.freeRecursive()};dy.default=HB.default({schedulePassiveEffects:c6.unstable_scheduleCallback,cancelPassiveEffects:c6.unstable_cancelCallback,now:Date.now,getRootHostContext:()=>({isInsideText:!1}),prepareForCommit:()=>{},resetAfterCommit:i=>{if(i.isStaticDirty){i.isStaticDirty=!1,typeof i.onImmediateRender=="function"&&i.onImmediateRender();return}typeof i.onRender=="function"&&i.onRender()},getChildHostContext:(i,o)=>{let a=i.isInsideText,c=o==="ink-text"||o==="ink-virtual-text";return a===c?i:{isInsideText:c}},shouldSetTextContent:()=>!1,createInstance:(i,o,a,c)=>{if(c.isInsideText&&i==="ink-box")throw new Error("<Box> can\u2019t be nested inside <Text> component");let _=i==="ink-text"&&c.isInsideText?"ink-virtual-text":i,t=hs.createNode(_);for(let[O,N]of Object.entries(o))O!=="children"&&(O==="style"?hs.setStyle(t,N):O==="internal_transform"?t.internal_transform=N:O==="internal_static"?t.internal_static=!0:hs.setAttribute(t,O,N));return t},createTextInstance:(i,o,a)=>{if(!a.isInsideText)throw new Error(`Text string "${i}" must be rendered inside <Text> component`);return hs.createTextNode(i)},resetTextContent:()=>{},hideTextInstance:i=>{hs.setTextNodeValue(i,"")},unhideTextInstance:(i,o)=>{hs.setTextNodeValue(i,o)},getPublicInstance:i=>i,hideInstance:i=>{var o;(o=i.yogaNode)===null||o===void 0||o.setDisplay(d6.default.DISPLAY_NONE)},unhideInstance:i=>{var o;(o=i.yogaNode)===null||o===void 0||o.setDisplay(d6.default.DISPLAY_FLEX)},appendInitialChild:hs.appendChildNode,appendChild:hs.appendChildNode,insertBefore:hs.insertBeforeNode,finalizeInitialChildren:(i,o,a,c)=>(i.internal_static&&(c.isStaticDirty=!0,c.staticNode=i),!1),supportsMutation:!0,appendChildToContainer:hs.appendChildNode,insertInContainerBefore:hs.insertBeforeNode,removeChildFromContainer:(i,o)=>{hs.removeChildNode(i,o),p6(o.yogaNode)},prepareUpdate:(i,o,a,c,_)=>{i.internal_static&&(_.isStaticDirty=!0);let t={},O=Object.keys(c);for(let N of O)if(c[N]!==a[N]){if(N==="style"&&typeof c.style=="object"&&typeof a.style=="object"){let T=c.style,B=a.style,H=Object.keys(T);for(let q of H){if(q==="borderStyle"||q==="borderColor"){if(typeof t.style!="object"){let ne={};t.style=ne}t.style.borderStyle=T.borderStyle,t.style.borderColor=T.borderColor}if(T[q]!==B[q]){if(typeof t.style!="object"){let ne={};t.style=ne}t.style[q]=T[q]}}continue}t[N]=c[N]}return t},commitUpdate:(i,o)=>{for(let[a,c]of Object.entries(o))a!=="children"&&(a==="style"?hs.setStyle(i,c):a==="internal_transform"?i.internal_transform=c:a==="internal_static"?i.internal_static=!0:hs.setAttribute(i,a,c))},commitTextUpdate:(i,o,a)=>{hs.setTextNodeValue(i,a)},removeChild:(i,o)=>{hs.removeChildNode(i,o),p6(o.yogaNode)}})});var m6=Ke((RV,v6)=>{"use strict";v6.exports=(i,o=1,a)=>{if(a=Ht({indent:" ",includeEmptyLines:!1},a),typeof i!="string")throw new TypeError(`Expected \`input\` to be a \`string\`, got \`${typeof i}\``);if(typeof o!="number")throw new TypeError(`Expected \`count\` to be a \`number\`, got \`${typeof o}\``);if(typeof a.indent!="string")throw new TypeError(`Expected \`options.indent\` to be a \`string\`, got \`${typeof a.indent}\``);if(o===0)return i;let c=a.includeEmptyLines?/^/gm:/^(?!\s*$)/gm;return i.replace(c,a.indent.repeat(o))}});var g6=Ke(py=>{"use strict";var qB=py&&py.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(py,"__esModule",{value:!0});var d4=qB(eh());py.default=i=>i.getComputedWidth()-i.getComputedPadding(d4.default.EDGE_LEFT)-i.getComputedPadding(d4.default.EDGE_RIGHT)-i.getComputedBorder(d4.default.EDGE_LEFT)-i.getComputedBorder(d4.default.EDGE_RIGHT)});var _6=Ke((MV,y6)=>{y6.exports={single:{topLeft:"\u250C",topRight:"\u2510",bottomRight:"\u2518",bottomLeft:"\u2514",vertical:"\u2502",horizontal:"\u2500"},double:{topLeft:"\u2554",topRight:"\u2557",bottomRight:"\u255D",bottomLeft:"\u255A",vertical:"\u2551",horizontal:"\u2550"},round:{topLeft:"\u256D",topRight:"\u256E",bottomRight:"\u256F",bottomLeft:"\u2570",vertical:"\u2502",horizontal:"\u2500"},bold:{topLeft:"\u250F",topRight:"\u2513",bottomRight:"\u251B",bottomLeft:"\u2517",vertical:"\u2503",horizontal:"\u2501"},singleDouble:{topLeft:"\u2553",topRight:"\u2556",bottomRight:"\u255C",bottomLeft:"\u2559",vertical:"\u2551",horizontal:"\u2500"},doubleSingle:{topLeft:"\u2552",topRight:"\u2555",bottomRight:"\u255B",bottomLeft:"\u2558",vertical:"\u2502",horizontal:"\u2550"},classic:{topLeft:"+",topRight:"+",bottomRight:"+",bottomLeft:"+",vertical:"|",horizontal:"-"}}});var D6=Ke((kV,w3)=>{"use strict";var E6=_6();w3.exports=E6;w3.exports.default=E6});var S6=Ke((LV,w6)=>{"use strict";w6.exports=(i,o=process.argv)=>{let a=i.startsWith("-")?"":i.length===1?"-":"--",c=o.indexOf(a+i),_=o.indexOf("--");return c!==-1&&(_===-1||c<_)}});var x6=Ke((NV,T6)=>{"use strict";var WB=require("os"),C6=require("tty"),pf=S6(),{env:Xo}=process,m2;pf("no-color")||pf("no-colors")||pf("color=false")||pf("color=never")?m2=0:(pf("color")||pf("colors")||pf("color=true")||pf("color=always"))&&(m2=1);"FORCE_COLOR"in Xo&&(Xo.FORCE_COLOR==="true"?m2=1:Xo.FORCE_COLOR==="false"?m2=0:m2=Xo.FORCE_COLOR.length===0?1:Math.min(parseInt(Xo.FORCE_COLOR,10),3));function S3(i){return i===0?!1:{level:i,hasBasic:!0,has256:i>=2,has16m:i>=3}}function T3(i,o){if(m2===0)return 0;if(pf("color=16m")||pf("color=full")||pf("color=truecolor"))return 3;if(pf("color=256"))return 2;if(i&&!o&&m2===void 0)return 0;let a=m2||0;if(Xo.TERM==="dumb")return a;if(process.platform==="win32"){let c=WB.release().split(".");return Number(c[0])>=10&&Number(c[2])>=10586?Number(c[2])>=14931?3:2:1}if("CI"in Xo)return["TRAVIS","CIRCLECI","APPVEYOR","GITLAB_CI"].some(c=>c in Xo)||Xo.CI_NAME==="codeship"?1:a;if("TEAMCITY_VERSION"in Xo)return/^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(Xo.TEAMCITY_VERSION)?1:0;if("GITHUB_ACTIONS"in Xo)return 1;if(Xo.COLORTERM==="truecolor")return 3;if("TERM_PROGRAM"in Xo){let c=parseInt((Xo.TERM_PROGRAM_VERSION||"").split(".")[0],10);switch(Xo.TERM_PROGRAM){case"iTerm.app":return c>=3?3:2;case"Apple_Terminal":return 2}}return/-256(color)?$/i.test(Xo.TERM)?2:/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(Xo.TERM)||"COLORTERM"in Xo?1:a}function VB(i){let o=T3(i,i&&i.isTTY);return S3(o)}T6.exports={supportsColor:VB,stdout:S3(T3(!0,C6.isatty(1))),stderr:S3(T3(!0,C6.isatty(2)))}});var R6=Ke((FV,A6)=>{"use strict";var GB=(i,o,a)=>{let c=i.indexOf(o);if(c===-1)return i;let _=o.length,t=0,O="";do O+=i.substr(t,c-t)+o+a,t=c+_,c=i.indexOf(o,t);while(c!==-1);return O+=i.substr(t),O},YB=(i,o,a,c)=>{let _=0,t="";do{let O=i[c-1]==="\r";t+=i.substr(_,(O?c-1:c)-_)+o+(O?`\r
-`:`
-`)+a,_=c+1,c=i.indexOf(`
-`,_)}while(c!==-1);return t+=i.substr(_),t};A6.exports={stringReplaceAll:GB,stringEncaseCRLFWithFirstIndex:YB}});var N6=Ke((PV,O6)=>{"use strict";var KB=/(?:\\(u(?:[a-f\d]{4}|\{[a-f\d]{1,6}\})|x[a-f\d]{2}|.))|(?:\{(~)?(\w+(?:\([^)]*\))?(?:\.\w+(?:\([^)]*\))?)*)(?:[ \t]|(?=\r?\n)))|(\})|((?:.|[\r\n\f])+?)/gi,M6=/(?:^|\.)(\w+)(?:\(([^)]*)\))?/g,XB=/^(['"])((?:\\.|(?!\1)[^\\])*)\1$/,QB=/\\(u(?:[a-f\d]{4}|{[a-f\d]{1,6}})|x[a-f\d]{2}|.)|([^\\])/gi,JB=new Map([["n",`
-`],["r","\r"],["t","	"],["b","\b"],["f","\f"],["v","\v"],["0","\0"],["\\","\\"],["e",""],["a","\x07"]]);function k6(i){let o=i[0]==="u",a=i[1]==="{";return o&&!a&&i.length===5||i[0]==="x"&&i.length===3?String.fromCharCode(parseInt(i.slice(1),16)):o&&a?String.fromCodePoint(parseInt(i.slice(2,-1),16)):JB.get(i)||i}function ZB(i,o){let a=[],c=o.trim().split(/\s*,\s*/g),_;for(let t of c){let O=Number(t);if(!Number.isNaN(O))a.push(O);else if(_=t.match(XB))a.push(_[2].replace(QB,(N,M,T)=>M?k6(M):T));else throw new Error(`Invalid Chalk template style argument: ${t} (in style '${i}')`)}return a}function $B(i){M6.lastIndex=0;let o=[],a;for(;(a=M6.exec(i))!==null;){let c=a[1];if(a[2]){let _=ZB(c,a[2]);o.push([c].concat(_))}else o.push([c])}return o}function L6(i,o){let a={};for(let _ of o)for(let t of _.styles)a[t[0]]=_.inverse?null:t.slice(1);let c=i;for(let[_,t]of Object.entries(a))if(!!Array.isArray(t)){if(!(_ in c))throw new Error(`Unknown Chalk style: ${_}`);c=t.length>0?c[_](...t):c[_]}return c}O6.exports=(i,o)=>{let a=[],c=[],_=[];if(o.replace(KB,(t,O,N,M,T,B)=>{if(O)_.push(k6(O));else if(M){let H=_.join("");_=[],c.push(a.length===0?H:L6(i,a)(H)),a.push({inverse:N,styles:$B(M)})}else if(T){if(a.length===0)throw new Error("Found extraneous } in Chalk template literal");c.push(L6(i,a)(_.join(""))),_=[],a.pop()}else _.push(B)}),c.push(_.join("")),a.length>0){let t=`Chalk template literal is missing ${a.length} closing bracket${a.length===1?"":"s"} (\`}\`)`;throw new Error(t)}return c.join("")}});var g4=Ke((IV,F6)=>{"use strict";var hy=t4(),{stdout:C3,stderr:x3}=x6(),{stringReplaceAll:eU,stringEncaseCRLFWithFirstIndex:tU}=R6(),{isArray:p4}=Array,P6=["ansi","ansi","ansi256","ansi16m"],$v=Object.create(null),nU=(i,o={})=>{if(o.level&&!(Number.isInteger(o.level)&&o.level>=0&&o.level<=3))throw new Error("The `level` option should be an integer from 0 to 3");let a=C3?C3.level:0;i.level=o.level===void 0?a:o.level},I6=class{constructor(o){return b6(o)}},b6=i=>{let o={};return nU(o,i),o.template=(...a)=>B6(o.template,...a),Object.setPrototypeOf(o,h4.prototype),Object.setPrototypeOf(o.template,o),o.template.constructor=()=>{throw new Error("`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.")},o.template.Instance=I6,o.template};function h4(i){return b6(i)}for(let[i,o]of Object.entries(hy))$v[i]={get(){let a=v4(this,A3(o.open,o.close,this._styler),this._isEmpty);return Object.defineProperty(this,i,{value:a}),a}};$v.visible={get(){let i=v4(this,this._styler,!0);return Object.defineProperty(this,"visible",{value:i}),i}};var U6=["rgb","hex","keyword","hsl","hsv","hwb","ansi","ansi256"];for(let i of U6)$v[i]={get(){let{level:o}=this;return function(...a){let c=A3(hy.color[P6[o]][i](...a),hy.color.close,this._styler);return v4(this,c,this._isEmpty)}}};for(let i of U6){let o="bg"+i[0].toUpperCase()+i.slice(1);$v[o]={get(){let{level:a}=this;return function(...c){let _=A3(hy.bgColor[P6[a]][i](...c),hy.bgColor.close,this._styler);return v4(this,_,this._isEmpty)}}}}var rU=Object.defineProperties(()=>{},Zr(Ht({},$v),{level:{enumerable:!0,get(){return this._generator.level},set(i){this._generator.level=i}}})),A3=(i,o,a)=>{let c,_;return a===void 0?(c=i,_=o):(c=a.openAll+i,_=o+a.closeAll),{open:i,close:o,openAll:c,closeAll:_,parent:a}},v4=(i,o,a)=>{let c=(..._)=>p4(_[0])&&p4(_[0].raw)?j6(c,B6(c,..._)):j6(c,_.length===1?""+_[0]:_.join(" "));return Object.setPrototypeOf(c,rU),c._generator=i,c._styler=o,c._isEmpty=a,c},j6=(i,o)=>{if(i.level<=0||!o)return i._isEmpty?"":o;let a=i._styler;if(a===void 0)return o;let{openAll:c,closeAll:_}=a;if(o.indexOf("")!==-1)for(;a!==void 0;)o=eU(o,a.close,a.open),a=a.parent;let t=o.indexOf(`
-`);return t!==-1&&(o=tU(o,_,c,t)),c+o+_},R3,B6=(i,...o)=>{let[a]=o;if(!p4(a)||!p4(a.raw))return o.join(" ");let c=o.slice(1),_=[a.raw[0]];for(let t=1;t<a.length;t++)_.push(String(c[t-1]).replace(/[{}\\]/g,"\\$&"),String(a.raw[t]));return R3===void 0&&(R3=N6()),R3(i,_.join(""))};Object.defineProperties(h4.prototype,$v);var m4=h4();m4.supportsColor=C3;m4.stderr=h4({level:x3?x3.level:0});m4.stderr.supportsColor=x3;F6.exports=m4});var O3=Ke(vy=>{"use strict";var iU=vy&&vy.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(vy,"__esModule",{value:!0});var my=iU(g4()),uU=/^(rgb|hsl|hsv|hwb)\(\s?(\d+),\s?(\d+),\s?(\d+)\s?\)$/,oU=/^(ansi|ansi256)\(\s?(\d+)\s?\)$/,y4=(i,o)=>o==="foreground"?i:"bg"+i[0].toUpperCase()+i.slice(1);vy.default=(i,o,a)=>{if(!o)return i;if(o in my.default){let _=y4(o,a);return my.default[_](i)}if(o.startsWith("#")){let _=y4("hex",a);return my.default[_](o)(i)}if(o.startsWith("ansi")){let _=oU.exec(o);if(!_)return i;let t=y4(_[1],a),O=Number(_[2]);return my.default[t](O)(i)}if(o.startsWith("rgb")||o.startsWith("hsl")||o.startsWith("hsv")||o.startsWith("hwb")){let _=uU.exec(o);if(!_)return i;let t=y4(_[1],a),O=Number(_[2]),N=Number(_[3]),M=Number(_[4]);return my.default[t](O,N,M)(i)}return i}});var H6=Ke(gy=>{"use strict";var z6=gy&&gy.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(gy,"__esModule",{value:!0});var lU=z6(D6()),M3=z6(O3());gy.default=(i,o,a,c)=>{if(typeof a.style.borderStyle=="string"){let _=a.yogaNode.getComputedWidth(),t=a.yogaNode.getComputedHeight(),O=a.style.borderColor,N=lU.default[a.style.borderStyle],M=M3.default(N.topLeft+N.horizontal.repeat(_-2)+N.topRight,O,"foreground"),T=(M3.default(N.vertical,O,"foreground")+`
-`).repeat(t-2),B=M3.default(N.bottomLeft+N.horizontal.repeat(_-2)+N.bottomRight,O,"foreground");c.write(i,o,M,{transformers:[]}),c.write(i,o+1,T,{transformers:[]}),c.write(i+_-1,o+1,T,{transformers:[]}),c.write(i,o+t-1,B,{transformers:[]})}}});var W6=Ke(yy=>{"use strict";var ih=yy&&yy.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(yy,"__esModule",{value:!0});var sU=ih(eh()),aU=ih(VD()),fU=ih(m6()),cU=ih(e3()),dU=ih(g6()),pU=ih(n3()),hU=ih(H6()),vU=(i,o)=>{var a;let c=(a=i.childNodes[0])===null||a===void 0?void 0:a.yogaNode;if(c){let _=c.getComputedLeft(),t=c.getComputedTop();o=`
-`.repeat(t)+fU.default(o,_)}return o},q6=(i,o,a)=>{var c;let{offsetX:_=0,offsetY:t=0,transformers:O=[],skipStaticElements:N}=a;if(N&&i.internal_static)return;let{yogaNode:M}=i;if(M){if(M.getDisplay()===sU.default.DISPLAY_NONE)return;let T=_+M.getComputedLeft(),B=t+M.getComputedTop(),H=O;if(typeof i.internal_transform=="function"&&(H=[i.internal_transform,...O]),i.nodeName==="ink-text"){let q=pU.default(i);if(q.length>0){let ne=aU.default(q),m=dU.default(M);if(ne>m){let he=(c=i.style.textWrap)!==null&&c!==void 0?c:"wrap";q=cU.default(q,m,he)}q=vU(i,q),o.write(T,B,q,{transformers:H})}return}if(i.nodeName==="ink-box"&&hU.default(T,B,i,o),i.nodeName==="ink-root"||i.nodeName==="ink-box")for(let q of i.childNodes)q6(q,o,{offsetX:T,offsetY:B,transformers:H,skipStaticElements:N})}};yy.default=q6});var G6=Ke((jV,V6)=>{"use strict";V6.exports=i=>{i=Object.assign({onlyFirst:!1},i);let o=["[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)","(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))"].join("|");return new RegExp(o,i.onlyFirst?void 0:"g")}});var K6=Ke((zV,k3)=>{"use strict";var mU=G6(),Y6=i=>typeof i=="string"?i.replace(mU(),""):i;k3.exports=Y6;k3.exports.default=Y6});var J6=Ke((HV,X6)=>{"use strict";var Q6="[\uD800-\uDBFF][\uDC00-\uDFFF]";X6.exports=i=>i&&i.exact?new RegExp(`^${Q6}$`):new RegExp(Q6,"g")});var $6=Ke((qV,L3)=>{"use strict";var gU=K6(),yU=J6(),Z6=i=>gU(i).replace(yU()," ").length;L3.exports=Z6;L3.exports.default=Z6});var rx=Ke(_y=>{"use strict";var ex=_y&&_y.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(_y,"__esModule",{value:!0});var tx=ex(ZD()),_U=ex($6()),nx=class{constructor(o){this.writes=[];let{width:a,height:c}=o;this.width=a,this.height=c}write(o,a,c,_){let{transformers:t}=_;!c||this.writes.push({x:o,y:a,text:c,transformers:t})}get(){let o=[];for(let c=0;c<this.height;c++)o.push(" ".repeat(this.width));for(let c of this.writes){let{x:_,y:t,text:O,transformers:N}=c,M=O.split(`
-`),T=0;for(let B of M){let H=o[t+T];if(!H)continue;let q=_U.default(B);for(let ne of N)B=ne(B);o[t+T]=tx.default(H,0,_)+B+tx.default(H,_+q),T++}}return{output:o.map(c=>c.trimRight()).join(`
-`),height:o.length}}};_y.default=nx});var ox=Ke(Ey=>{"use strict";var N3=Ey&&Ey.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(Ey,"__esModule",{value:!0});var EU=N3(eh()),ix=N3(W6()),ux=N3(rx());Ey.default=(i,o)=>{var a;if(i.yogaNode.setWidth(o),i.yogaNode){i.yogaNode.calculateLayout(void 0,void 0,EU.default.DIRECTION_LTR);let c=new ux.default({width:i.yogaNode.getComputedWidth(),height:i.yogaNode.getComputedHeight()});ix.default(i,c,{skipStaticElements:!0});let _;((a=i.staticNode)===null||a===void 0?void 0:a.yogaNode)&&(_=new ux.default({width:i.staticNode.yogaNode.getComputedWidth(),height:i.staticNode.yogaNode.getComputedHeight()}),ix.default(i.staticNode,_,{skipStaticElements:!1}));let{output:t,height:O}=c.get();return{output:t,outputHeight:O,staticOutput:_?`${_.get().output}
-`:""}}return{output:"",outputHeight:0,staticOutput:""}}});var fx=Ke((GV,lx)=>{"use strict";var sx=require("stream"),ax=["assert","count","countReset","debug","dir","dirxml","error","group","groupCollapsed","groupEnd","info","log","table","time","timeEnd","timeLog","trace","warn"],F3={},DU=i=>{let o=new sx.PassThrough,a=new sx.PassThrough;o.write=_=>i("stdout",_),a.write=_=>i("stderr",_);let c=new console.Console(o,a);for(let _ of ax)F3[_]=console[_],console[_]=c[_];return()=>{for(let _ of ax)console[_]=F3[_];F3={}}};lx.exports=DU});var I3=Ke(P3=>{"use strict";Object.defineProperty(P3,"__esModule",{value:!0});P3.default=new WeakMap});var B3=Ke(b3=>{"use strict";Object.defineProperty(b3,"__esModule",{value:!0});var wU=ki(),cx=wU.createContext({exit:()=>{}});cx.displayName="InternalAppContext";b3.default=cx});var j3=Ke(U3=>{"use strict";Object.defineProperty(U3,"__esModule",{value:!0});var SU=ki(),dx=SU.createContext({stdin:void 0,setRawMode:()=>{},isRawModeSupported:!1,internal_exitOnCtrlC:!0});dx.displayName="InternalStdinContext";U3.default=dx});var H3=Ke(z3=>{"use strict";Object.defineProperty(z3,"__esModule",{value:!0});var TU=ki(),px=TU.createContext({stdout:void 0,write:()=>{}});px.displayName="InternalStdoutContext";z3.default=px});var W3=Ke(q3=>{"use strict";Object.defineProperty(q3,"__esModule",{value:!0});var CU=ki(),hx=CU.createContext({stderr:void 0,write:()=>{}});hx.displayName="InternalStderrContext";q3.default=hx});var _4=Ke(V3=>{"use strict";Object.defineProperty(V3,"__esModule",{value:!0});var xU=ki(),vx=xU.createContext({activeId:void 0,add:()=>{},remove:()=>{},activate:()=>{},deactivate:()=>{},enableFocus:()=>{},disableFocus:()=>{},focusNext:()=>{},focusPrevious:()=>{}});vx.displayName="InternalFocusContext";V3.default=vx});var gx=Ke(($V,mx)=>{"use strict";var AU=/[|\\{}()[\]^$+*?.-]/g;mx.exports=i=>{if(typeof i!="string")throw new TypeError("Expected a string");return i.replace(AU,"\\$&")}});var Dx=Ke((eG,yx)=>{"use strict";var RU=gx(),_x=[].concat(require("module").builtinModules,"bootstrap_node","node").map(i=>new RegExp(`(?:\\(${i}\\.js:\\d+:\\d+\\)$|^\\s*at ${i}\\.js:\\d+:\\d+$)`));_x.push(/\(internal\/[^:]+:\d+:\d+\)$/,/\s*at internal\/[^:]+:\d+:\d+$/,/\/\.node-spawn-wrap-\w+-\w+\/node:\d+:\d+\)?$/);var E4=class{constructor(o){o=Ht({ignoredPackages:[]},o),"internals"in o||(o.internals=E4.nodeInternals()),"cwd"in o||(o.cwd=process.cwd()),this._cwd=o.cwd.replace(/\\/g,"/"),this._internals=[].concat(o.internals,OU(o.ignoredPackages)),this._wrapCallSite=o.wrapCallSite||!1}static nodeInternals(){return[..._x]}clean(o,a=0){a=" ".repeat(a),Array.isArray(o)||(o=o.split(`
-`)),!/^\s*at /.test(o[0])&&/^\s*at /.test(o[1])&&(o=o.slice(1));let c=!1,_=null,t=[];return o.forEach(O=>{if(O=O.replace(/\\/g,"/"),this._internals.some(M=>M.test(O)))return;let N=/^\s*at /.test(O);c?O=O.trimEnd().replace(/^(\s+)at /,"$1"):(O=O.trim(),N&&(O=O.slice(3))),O=O.replace(`${this._cwd}/`,""),O&&(N?(_&&(t.push(_),_=null),t.push(O)):(c=!0,_=O))}),t.map(O=>`${a}${O}
-`).join("")}captureString(o,a=this.captureString){typeof o=="function"&&(a=o,o=Infinity);let{stackTraceLimit:c}=Error;o&&(Error.stackTraceLimit=o);let _={};Error.captureStackTrace(_,a);let{stack:t}=_;return Error.stackTraceLimit=c,this.clean(t)}capture(o,a=this.capture){typeof o=="function"&&(a=o,o=Infinity);let{prepareStackTrace:c,stackTraceLimit:_}=Error;Error.prepareStackTrace=(N,M)=>this._wrapCallSite?M.map(this._wrapCallSite):M,o&&(Error.stackTraceLimit=o);let t={};Error.captureStackTrace(t,a);let{stack:O}=t;return Object.assign(Error,{prepareStackTrace:c,stackTraceLimit:_}),O}at(o=this.at){let[a]=this.capture(1,o);if(!a)return{};let c={line:a.getLineNumber(),column:a.getColumnNumber()};Ex(c,a.getFileName(),this._cwd),a.isConstructor()&&(c.constructor=!0),a.isEval()&&(c.evalOrigin=a.getEvalOrigin()),a.isNative()&&(c.native=!0);let _;try{_=a.getTypeName()}catch(N){}_&&_!=="Object"&&_!=="[object Object]"&&(c.type=_);let t=a.getFunctionName();t&&(c.function=t);let O=a.getMethodName();return O&&t!==O&&(c.method=O),c}parseLine(o){let a=o&&o.match(MU);if(!a)return null;let c=a[1]==="new",_=a[2],t=a[3],O=a[4],N=Number(a[5]),M=Number(a[6]),T=a[7],B=a[8],H=a[9],q=a[10]==="native",ne=a[11]===")",m,he={};if(B&&(he.line=Number(B)),H&&(he.column=Number(H)),ne&&T){let De=0;for(let se=T.length-1;se>0;se--)if(T.charAt(se)===")")De++;else if(T.charAt(se)==="("&&T.charAt(se-1)===" "&&(De--,De===-1&&T.charAt(se-1)===" ")){let fe=T.slice(0,se-1);T=T.slice(se+1),_+=` (${fe}`;break}}if(_){let De=_.match(kU);De&&(_=De[1],m=De[2])}return Ex(he,T,this._cwd),c&&(he.constructor=!0),t&&(he.evalOrigin=t,he.evalLine=N,he.evalColumn=M,he.evalFile=O&&O.replace(/\\/g,"/")),q&&(he.native=!0),_&&(he.function=_),m&&_!==m&&(he.method=m),he}};function Ex(i,o,a){o&&(o=o.replace(/\\/g,"/"),o.startsWith(`${a}/`)&&(o=o.slice(a.length+1)),i.file=o)}function OU(i){if(i.length===0)return[];let o=i.map(a=>RU(a));return new RegExp(`[/\\\\]node_modules[/\\\\](?:${o.join("|")})[/\\\\][^:]+:\\d+:\\d+`)}var MU=new RegExp("^(?:\\s*at )?(?:(new) )?(?:(.*?) \\()?(?:eval at ([^ ]+) \\((.+?):(\\d+):(\\d+)\\), )?(?:(.+?):(\\d+):(\\d+)|(native))(\\)?)$"),kU=/^(.*?) \[as (.*?)\]$/;yx.exports=E4});var Sx=Ke((tG,wx)=>{"use strict";wx.exports=(i,o)=>i.replace(/^\t+/gm,a=>" ".repeat(a.length*(o||2)))});var Cx=Ke((nG,Tx)=>{"use strict";var LU=Sx(),NU=(i,o)=>{let a=[],c=i-o,_=i+o;for(let t=c;t<=_;t++)a.push(t);return a};Tx.exports=(i,o,a)=>{if(typeof i!="string")throw new TypeError("Source code is missing.");if(!o||o<1)throw new TypeError("Line number must start from `1`.");if(i=LU(i).split(/\r?\n/),!(o>i.length))return a=Ht({around:3},a),NU(o,a.around).filter(c=>i[c-1]!==void 0).map(c=>({line:c,value:i[c-1]}))}});var D4=Ke(rc=>{"use strict";var FU=rc&&rc.__createBinding||(Object.create?function(i,o,a,c){c===void 0&&(c=a),Object.defineProperty(i,c,{enumerable:!0,get:function(){return o[a]}})}:function(i,o,a,c){c===void 0&&(c=a),i[c]=o[a]}),PU=rc&&rc.__setModuleDefault||(Object.create?function(i,o){Object.defineProperty(i,"default",{enumerable:!0,value:o})}:function(i,o){i.default=o}),IU=rc&&rc.__importStar||function(i){if(i&&i.__esModule)return i;var o={};if(i!=null)for(var a in i)a!=="default"&&Object.hasOwnProperty.call(i,a)&&FU(o,i,a);return PU(o,i),o},bU=rc&&rc.__rest||function(i,o){var a={};for(var c in i)Object.prototype.hasOwnProperty.call(i,c)&&o.indexOf(c)<0&&(a[c]=i[c]);if(i!=null&&typeof Object.getOwnPropertySymbols=="function")for(var _=0,c=Object.getOwnPropertySymbols(i);_<c.length;_++)o.indexOf(c[_])<0&&Object.prototype.propertyIsEnumerable.call(i,c[_])&&(a[c[_]]=i[c[_]]);return a};Object.defineProperty(rc,"__esModule",{value:!0});var xx=IU(ki()),G3=xx.forwardRef((i,o)=>{var{children:a}=i,c=bU(i,["children"]);let _=Object.assign(Object.assign({},c),{marginLeft:c.marginLeft||c.marginX||c.margin||0,marginRight:c.marginRight||c.marginX||c.margin||0,marginTop:c.marginTop||c.marginY||c.margin||0,marginBottom:c.marginBottom||c.marginY||c.margin||0,paddingLeft:c.paddingLeft||c.paddingX||c.padding||0,paddingRight:c.paddingRight||c.paddingX||c.padding||0,paddingTop:c.paddingTop||c.paddingY||c.padding||0,paddingBottom:c.paddingBottom||c.paddingY||c.padding||0});return xx.default.createElement("ink-box",{ref:o,style:_},a)});G3.displayName="Box";G3.defaultProps={flexDirection:"row",flexGrow:0,flexShrink:1};rc.default=G3});var X3=Ke(Dy=>{"use strict";var Y3=Dy&&Dy.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(Dy,"__esModule",{value:!0});var BU=Y3(ki()),em=Y3(g4()),Ax=Y3(O3()),K3=({color:i,backgroundColor:o,dimColor:a,bold:c,italic:_,underline:t,strikethrough:O,inverse:N,wrap:M,children:T})=>{if(T==null)return null;let B=H=>(a&&(H=em.default.dim(H)),i&&(H=Ax.default(H,i,"foreground")),o&&(H=Ax.default(H,o,"background")),c&&(H=em.default.bold(H)),_&&(H=em.default.italic(H)),t&&(H=em.default.underline(H)),O&&(H=em.default.strikethrough(H)),N&&(H=em.default.inverse(H)),H);return BU.default.createElement("ink-text",{style:{flexGrow:0,flexShrink:1,flexDirection:"row",textWrap:M},internal_transform:B},T)};K3.displayName="Text";K3.defaultProps={dimColor:!1,bold:!1,italic:!1,underline:!1,strikethrough:!1,wrap:"wrap"};Dy.default=K3});var kx=Ke(ic=>{"use strict";var UU=ic&&ic.__createBinding||(Object.create?function(i,o,a,c){c===void 0&&(c=a),Object.defineProperty(i,c,{enumerable:!0,get:function(){return o[a]}})}:function(i,o,a,c){c===void 0&&(c=a),i[c]=o[a]}),jU=ic&&ic.__setModuleDefault||(Object.create?function(i,o){Object.defineProperty(i,"default",{enumerable:!0,value:o})}:function(i,o){i.default=o}),zU=ic&&ic.__importStar||function(i){if(i&&i.__esModule)return i;var o={};if(i!=null)for(var a in i)a!=="default"&&Object.hasOwnProperty.call(i,a)&&UU(o,i,a);return jU(o,i),o},wy=ic&&ic.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(ic,"__esModule",{value:!0});var Rx=zU(require("fs")),Qo=wy(ki()),Ox=wy(Dx()),HU=wy(Cx()),$1=wy(D4()),Hc=wy(X3()),Mx=new Ox.default({cwd:process.cwd(),internals:Ox.default.nodeInternals()}),qU=({error:i})=>{let o=i.stack?i.stack.split(`
-`).slice(1):void 0,a=o?Mx.parseLine(o[0]):void 0,c,_=0;if((a==null?void 0:a.file)&&(a==null?void 0:a.line)&&Rx.existsSync(a.file)){let t=Rx.readFileSync(a.file,"utf8");if(c=HU.default(t,a.line),c)for(let{line:O}of c)_=Math.max(_,String(O).length)}return Qo.default.createElement($1.default,{flexDirection:"column",padding:1},Qo.default.createElement($1.default,null,Qo.default.createElement(Hc.default,{backgroundColor:"red",color:"white"}," ","ERROR"," "),Qo.default.createElement(Hc.default,null," ",i.message)),a&&Qo.default.createElement($1.default,{marginTop:1},Qo.default.createElement(Hc.default,{dimColor:!0},a.file,":",a.line,":",a.column)),a&&c&&Qo.default.createElement($1.default,{marginTop:1,flexDirection:"column"},c.map(({line:t,value:O})=>Qo.default.createElement($1.default,{key:t},Qo.default.createElement($1.default,{width:_+1},Qo.default.createElement(Hc.default,{dimColor:t!==a.line,backgroundColor:t===a.line?"red":void 0,color:t===a.line?"white":void 0},String(t).padStart(_," "),":")),Qo.default.createElement(Hc.default,{key:t,backgroundColor:t===a.line?"red":void 0,color:t===a.line?"white":void 0}," "+O)))),i.stack&&Qo.default.createElement($1.default,{marginTop:1,flexDirection:"column"},i.stack.split(`
-`).slice(1).map(t=>{let O=Mx.parseLine(t);return O?Qo.default.createElement($1.default,{key:t},Qo.default.createElement(Hc.default,{dimColor:!0},"- "),Qo.default.createElement(Hc.default,{dimColor:!0,bold:!0},O.function),Qo.default.createElement(Hc.default,{dimColor:!0,color:"gray"}," ","(",O.file,":",O.line,":",O.column,")")):Qo.default.createElement($1.default,{key:t},Qo.default.createElement(Hc.default,{dimColor:!0},"- "),Qo.default.createElement(Hc.default,{dimColor:!0,bold:!0},t))})))};ic.default=qU});var Nx=Ke(uc=>{"use strict";var WU=uc&&uc.__createBinding||(Object.create?function(i,o,a,c){c===void 0&&(c=a),Object.defineProperty(i,c,{enumerable:!0,get:function(){return o[a]}})}:function(i,o,a,c){c===void 0&&(c=a),i[c]=o[a]}),VU=uc&&uc.__setModuleDefault||(Object.create?function(i,o){Object.defineProperty(i,"default",{enumerable:!0,value:o})}:function(i,o){i.default=o}),GU=uc&&uc.__importStar||function(i){if(i&&i.__esModule)return i;var o={};if(i!=null)for(var a in i)a!=="default"&&Object.hasOwnProperty.call(i,a)&&WU(o,i,a);return VU(o,i),o},uh=uc&&uc.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(uc,"__esModule",{value:!0});var oh=GU(ki()),Lx=uh(wD()),YU=uh(B3()),KU=uh(j3()),XU=uh(H3()),QU=uh(W3()),JU=uh(_4()),ZU=uh(kx()),$U="	",ej="",tj="",Q3=class extends oh.PureComponent{constructor(){super(...arguments);this.state={isFocusEnabled:!0,activeFocusId:void 0,focusables:[],error:void 0},this.rawModeEnabledCount=0,this.handleSetRawMode=o=>{let{stdin:a}=this.props;if(!this.isRawModeSupported())throw a===process.stdin?new Error(`Raw mode is not supported on the current process.stdin, which Ink uses as input stream by default.
-Read about how to prevent this error on https://github.com/vadimdemedes/ink/#israwmodesupported`):new Error(`Raw mode is not supported on the stdin provided to Ink.
-Read about how to prevent this error on https://github.com/vadimdemedes/ink/#israwmodesupported`);if(a.setEncoding("utf8"),o){this.rawModeEnabledCount===0&&(a.addListener("data",this.handleInput),a.resume(),a.setRawMode(!0)),this.rawModeEnabledCount++;return}--this.rawModeEnabledCount==0&&(a.setRawMode(!1),a.removeListener("data",this.handleInput),a.pause())},this.handleInput=o=>{o===""&&this.props.exitOnCtrlC&&this.handleExit(),o===tj&&this.state.activeFocusId&&this.setState({activeFocusId:void 0}),this.state.isFocusEnabled&&this.state.focusables.length>0&&(o===$U&&this.focusNext(),o===ej&&this.focusPrevious())},this.handleExit=o=>{this.isRawModeSupported()&&this.handleSetRawMode(!1),this.props.onExit(o)},this.enableFocus=()=>{this.setState({isFocusEnabled:!0})},this.disableFocus=()=>{this.setState({isFocusEnabled:!1})},this.focusNext=()=>{this.setState(o=>{let a=o.focusables[0].id;return{activeFocusId:this.findNextFocusable(o)||a}})},this.focusPrevious=()=>{this.setState(o=>{let a=o.focusables[o.focusables.length-1].id;return{activeFocusId:this.findPreviousFocusable(o)||a}})},this.addFocusable=(o,{autoFocus:a})=>{this.setState(c=>{let _=c.activeFocusId;return!_&&a&&(_=o),{activeFocusId:_,focusables:[...c.focusables,{id:o,isActive:!0}]}})},this.removeFocusable=o=>{this.setState(a=>({activeFocusId:a.activeFocusId===o?void 0:a.activeFocusId,focusables:a.focusables.filter(c=>c.id!==o)}))},this.activateFocusable=o=>{this.setState(a=>({focusables:a.focusables.map(c=>c.id!==o?c:{id:o,isActive:!0})}))},this.deactivateFocusable=o=>{this.setState(a=>({activeFocusId:a.activeFocusId===o?void 0:a.activeFocusId,focusables:a.focusables.map(c=>c.id!==o?c:{id:o,isActive:!1})}))},this.findNextFocusable=o=>{let a=o.focusables.findIndex(c=>c.id===o.activeFocusId);for(let c=a+1;c<o.focusables.length;c++)if(o.focusables[c].isActive)return o.focusables[c].id},this.findPreviousFocusable=o=>{let a=o.focusables.findIndex(c=>c.id===o.activeFocusId);for(let c=a-1;c>=0;c--)if(o.focusables[c].isActive)return o.focusables[c].id}}static getDerivedStateFromError(o){return{error:o}}isRawModeSupported(){return this.props.stdin.isTTY}render(){return oh.default.createElement(YU.default.Provider,{value:{exit:this.handleExit}},oh.default.createElement(KU.default.Provider,{value:{stdin:this.props.stdin,setRawMode:this.handleSetRawMode,isRawModeSupported:this.isRawModeSupported(),internal_exitOnCtrlC:this.props.exitOnCtrlC}},oh.default.createElement(XU.default.Provider,{value:{stdout:this.props.stdout,write:this.props.writeToStdout}},oh.default.createElement(QU.default.Provider,{value:{stderr:this.props.stderr,write:this.props.writeToStderr}},oh.default.createElement(JU.default.Provider,{value:{activeId:this.state.activeFocusId,add:this.addFocusable,remove:this.removeFocusable,activate:this.activateFocusable,deactivate:this.deactivateFocusable,enableFocus:this.enableFocus,disableFocus:this.disableFocus,focusNext:this.focusNext,focusPrevious:this.focusPrevious}},this.state.error?oh.default.createElement(ZU.default,{error:this.state.error}):this.props.children)))))}componentDidMount(){Lx.default.hide(this.props.stdout)}componentWillUnmount(){Lx.default.show(this.props.stdout),this.isRawModeSupported()&&this.handleSetRawMode(!1)}componentDidCatch(o){this.handleExit(o)}};uc.default=Q3;Q3.displayName="InternalApp"});var bx=Ke(oc=>{"use strict";var nj=oc&&oc.__createBinding||(Object.create?function(i,o,a,c){c===void 0&&(c=a),Object.defineProperty(i,c,{enumerable:!0,get:function(){return o[a]}})}:function(i,o,a,c){c===void 0&&(c=a),i[c]=o[a]}),rj=oc&&oc.__setModuleDefault||(Object.create?function(i,o){Object.defineProperty(i,"default",{enumerable:!0,value:o})}:function(i,o){i.default=o}),ij=oc&&oc.__importStar||function(i){if(i&&i.__esModule)return i;var o={};if(i!=null)for(var a in i)a!=="default"&&Object.hasOwnProperty.call(i,a)&&nj(o,i,a);return rj(o,i),o},lc=oc&&oc.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(oc,"__esModule",{value:!0});var uj=lc(ki()),Fx=MS(),oj=lc(VS()),lj=lc(mD()),sj=lc(ZS()),aj=lc(eT()),w4=lc(h6()),fj=lc(ox()),cj=lc(DD()),dj=lc(fx()),pj=ij(r3()),hj=lc(I3()),vj=lc(Nx()),tm=process.env.CI==="false"?!1:sj.default,Px=()=>{},Ix=class{constructor(o){this.resolveExitPromise=()=>{},this.rejectExitPromise=()=>{},this.unsubscribeExit=()=>{},this.onRender=()=>{if(this.isUnmounted)return;let{output:a,outputHeight:c,staticOutput:_}=fj.default(this.rootNode,this.options.stdout.columns||80),t=_&&_!==`
-`;if(this.options.debug){t&&(this.fullStaticOutput+=_),this.options.stdout.write(this.fullStaticOutput+a);return}if(tm){t&&this.options.stdout.write(_),this.lastOutput=a;return}if(t&&(this.fullStaticOutput+=_),c>=this.options.stdout.rows){this.options.stdout.write(lj.default.clearTerminal+this.fullStaticOutput+a),this.lastOutput=a;return}t&&(this.log.clear(),this.options.stdout.write(_),this.log(a)),!t&&a!==this.lastOutput&&this.throttledLog(a),this.lastOutput=a},aj.default(this),this.options=o,this.rootNode=pj.createNode("ink-root"),this.rootNode.onRender=o.debug?this.onRender:Fx.throttle(this.onRender,32,{leading:!0,trailing:!0}),this.rootNode.onImmediateRender=this.onRender,this.log=oj.default.create(o.stdout),this.throttledLog=o.debug?this.log:Fx.throttle(this.log,void 0,{leading:!0,trailing:!0}),this.isUnmounted=!1,this.lastOutput="",this.fullStaticOutput="",this.container=w4.default.createContainer(this.rootNode,!1,!1),this.unsubscribeExit=cj.default(this.unmount,{alwaysLast:!1}),process.env.DEV==="true"&&w4.default.injectIntoDevTools({bundleType:0,version:"16.13.1",rendererPackageName:"ink"}),o.patchConsole&&this.patchConsole(),tm||(o.stdout.on("resize",this.onRender),this.unsubscribeResize=()=>{o.stdout.off("resize",this.onRender)})}render(o){let a=uj.default.createElement(vj.default,{stdin:this.options.stdin,stdout:this.options.stdout,stderr:this.options.stderr,writeToStdout:this.writeToStdout,writeToStderr:this.writeToStderr,exitOnCtrlC:this.options.exitOnCtrlC,onExit:this.unmount},o);w4.default.updateContainer(a,this.container,null,Px)}writeToStdout(o){if(!this.isUnmounted){if(this.options.debug){this.options.stdout.write(o+this.fullStaticOutput+this.lastOutput);return}if(tm){this.options.stdout.write(o);return}this.log.clear(),this.options.stdout.write(o),this.log(this.lastOutput)}}writeToStderr(o){if(!this.isUnmounted){if(this.options.debug){this.options.stderr.write(o),this.options.stdout.write(this.fullStaticOutput+this.lastOutput);return}if(tm){this.options.stderr.write(o);return}this.log.clear(),this.options.stderr.write(o),this.log(this.lastOutput)}}unmount(o){this.isUnmounted||(this.onRender(),this.unsubscribeExit(),typeof this.restoreConsole=="function"&&this.restoreConsole(),typeof this.unsubscribeResize=="function"&&this.unsubscribeResize(),tm?this.options.stdout.write(this.lastOutput+`
-`):this.options.debug||this.log.done(),this.isUnmounted=!0,w4.default.updateContainer(null,this.container,null,Px),hj.default.delete(this.options.stdout),o instanceof Error?this.rejectExitPromise(o):this.resolveExitPromise())}waitUntilExit(){return this.exitPromise||(this.exitPromise=new Promise((o,a)=>{this.resolveExitPromise=o,this.rejectExitPromise=a})),this.exitPromise}clear(){!tm&&!this.options.debug&&this.log.clear()}patchConsole(){this.options.debug||(this.restoreConsole=dj.default((o,a)=>{o==="stdout"&&this.writeToStdout(a),o==="stderr"&&(a.startsWith("The above error occurred")||this.writeToStderr(a))}))}};oc.default=Ix});var Ux=Ke(Sy=>{"use strict";var Bx=Sy&&Sy.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(Sy,"__esModule",{value:!0});var mj=Bx(bx()),S4=Bx(I3()),gj=require("stream"),Ej=(i,o)=>{let a=Object.assign({stdout:process.stdout,stdin:process.stdin,stderr:process.stderr,debug:!1,exitOnCtrlC:!0,patchConsole:!0},yj(o)),c=_j(a.stdout,()=>new mj.default(a));return c.render(i),{rerender:c.render,unmount:()=>c.unmount(),waitUntilExit:c.waitUntilExit,cleanup:()=>S4.default.delete(a.stdout),clear:c.clear}};Sy.default=Ej;var yj=(i={})=>i instanceof gj.Stream?{stdout:i,stdin:process.stdin}:i,_j=(i,o)=>{let a;return S4.default.has(i)?a=S4.default.get(i):(a=o(),S4.default.set(i,a)),a}});var zx=Ke(ed=>{"use strict";var Dj=ed&&ed.__createBinding||(Object.create?function(i,o,a,c){c===void 0&&(c=a),Object.defineProperty(i,c,{enumerable:!0,get:function(){return o[a]}})}:function(i,o,a,c){c===void 0&&(c=a),i[c]=o[a]}),wj=ed&&ed.__setModuleDefault||(Object.create?function(i,o){Object.defineProperty(i,"default",{enumerable:!0,value:o})}:function(i,o){i.default=o}),Sj=ed&&ed.__importStar||function(i){if(i&&i.__esModule)return i;var o={};if(i!=null)for(var a in i)a!=="default"&&Object.hasOwnProperty.call(i,a)&&Dj(o,i,a);return wj(o,i),o};Object.defineProperty(ed,"__esModule",{value:!0});var Ty=Sj(ki()),jx=i=>{let{items:o,children:a,style:c}=i,[_,t]=Ty.useState(0),O=Ty.useMemo(()=>o.slice(_),[o,_]);Ty.useLayoutEffect(()=>{t(o.length)},[o.length]);let N=O.map((T,B)=>a(T,_+B)),M=Ty.useMemo(()=>Object.assign({position:"absolute",flexDirection:"column"},c),[c]);return Ty.default.createElement("ink-box",{internal_static:!0,style:M},N)};jx.displayName="Static";ed.default=jx});var qx=Ke(Cy=>{"use strict";var Tj=Cy&&Cy.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(Cy,"__esModule",{value:!0});var Cj=Tj(ki()),Hx=({children:i,transform:o})=>i==null?null:Cj.default.createElement("ink-text",{style:{flexGrow:0,flexShrink:1,flexDirection:"row"},internal_transform:o},i);Hx.displayName="Transform";Cy.default=Hx});var Vx=Ke(xy=>{"use strict";var xj=xy&&xy.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(xy,"__esModule",{value:!0});var Aj=xj(ki()),Wx=({count:i=1})=>Aj.default.createElement("ink-text",null,`
-`.repeat(i));Wx.displayName="Newline";xy.default=Wx});var Kx=Ke(Ay=>{"use strict";var Gx=Ay&&Ay.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(Ay,"__esModule",{value:!0});var Rj=Gx(ki()),Oj=Gx(D4()),Yx=()=>Rj.default.createElement(Oj.default,{flexGrow:1});Yx.displayName="Spacer";Ay.default=Yx});var T4=Ke(Ry=>{"use strict";var Mj=Ry&&Ry.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(Ry,"__esModule",{value:!0});var kj=ki(),Lj=Mj(j3()),Nj=()=>kj.useContext(Lj.default);Ry.default=Nj});var Qx=Ke(Oy=>{"use strict";var Fj=Oy&&Oy.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(Oy,"__esModule",{value:!0});var Xx=ki(),Pj=Fj(T4()),Ij=(i,o={})=>{let{stdin:a,setRawMode:c,internal_exitOnCtrlC:_}=Pj.default();Xx.useEffect(()=>{if(o.isActive!==!1)return c(!0),()=>{c(!1)}},[o.isActive,c]),Xx.useEffect(()=>{if(o.isActive===!1)return;let t=O=>{let N=String(O),M={upArrow:N==="",downArrow:N==="",leftArrow:N==="",rightArrow:N==="",pageDown:N==="[6~",pageUp:N==="[5~",return:N==="\r",escape:N==="",ctrl:!1,shift:!1,tab:N==="	"||N==="",backspace:N==="\b",delete:N==="\x7F"||N==="[3~",meta:!1};N<=""&&!M.return&&(N=String.fromCharCode(N.charCodeAt(0)+"a".charCodeAt(0)-1),M.ctrl=!0),N.startsWith("")&&(N=N.slice(1),M.meta=!0);let T=N>="A"&&N<="Z",B=N>="\u0410"&&N<="\u042F";N.length===1&&(T||B)&&(M.shift=!0),M.tab&&N==="[Z"&&(M.shift=!0),(M.tab||M.backspace||M.delete)&&(N=""),(!(N==="c"&&M.ctrl)||!_)&&i(N,M)};return a==null||a.on("data",t),()=>{a==null||a.off("data",t)}},[o.isActive,a,_,i])};Oy.default=Ij});var Jx=Ke(My=>{"use strict";var bj=My&&My.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(My,"__esModule",{value:!0});var Bj=ki(),Uj=bj(B3()),jj=()=>Bj.useContext(Uj.default);My.default=jj});var Zx=Ke(ky=>{"use strict";var zj=ky&&ky.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(ky,"__esModule",{value:!0});var Hj=ki(),qj=zj(H3()),Wj=()=>Hj.useContext(qj.default);ky.default=Wj});var $x=Ke(Ly=>{"use strict";var Vj=Ly&&Ly.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(Ly,"__esModule",{value:!0});var Gj=ki(),Yj=Vj(W3()),Kj=()=>Gj.useContext(Yj.default);Ly.default=Kj});var t5=Ke(Ny=>{"use strict";var e5=Ny&&Ny.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(Ny,"__esModule",{value:!0});var Fy=ki(),Xj=e5(_4()),Qj=e5(T4()),Jj=({isActive:i=!0,autoFocus:o=!1}={})=>{let{isRawModeSupported:a,setRawMode:c}=Qj.default(),{activeId:_,add:t,remove:O,activate:N,deactivate:M}=Fy.useContext(Xj.default),T=Fy.useMemo(()=>Math.random().toString().slice(2,7),[]);return Fy.useEffect(()=>(t(T,{autoFocus:o}),()=>{O(T)}),[T,o]),Fy.useEffect(()=>{i?N(T):M(T)},[i,T]),Fy.useEffect(()=>{if(!(!a||!i))return c(!0),()=>{c(!1)}},[i]),{isFocused:Boolean(T)&&_===T}};Ny.default=Jj});var n5=Ke(Py=>{"use strict";var Zj=Py&&Py.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(Py,"__esModule",{value:!0});var $j=ki(),ez=Zj(_4()),tz=()=>{let i=$j.useContext(ez.default);return{enableFocus:i.enableFocus,disableFocus:i.disableFocus,focusNext:i.focusNext,focusPrevious:i.focusPrevious}};Py.default=tz});var r5=Ke(J3=>{"use strict";Object.defineProperty(J3,"__esModule",{value:!0});J3.default=i=>{var o,a,c,_;return{width:(a=(o=i.yogaNode)===null||o===void 0?void 0:o.getComputedWidth())!==null&&a!==void 0?a:0,height:(_=(c=i.yogaNode)===null||c===void 0?void 0:c.getComputedHeight())!==null&&_!==void 0?_:0}}});var sc=Ke(Kl=>{"use strict";Object.defineProperty(Kl,"__esModule",{value:!0});var nz=Ux();Object.defineProperty(Kl,"render",{enumerable:!0,get:function(){return nz.default}});var rz=D4();Object.defineProperty(Kl,"Box",{enumerable:!0,get:function(){return rz.default}});var iz=X3();Object.defineProperty(Kl,"Text",{enumerable:!0,get:function(){return iz.default}});var uz=zx();Object.defineProperty(Kl,"Static",{enumerable:!0,get:function(){return uz.default}});var oz=qx();Object.defineProperty(Kl,"Transform",{enumerable:!0,get:function(){return oz.default}});var lz=Vx();Object.defineProperty(Kl,"Newline",{enumerable:!0,get:function(){return lz.default}});var sz=Kx();Object.defineProperty(Kl,"Spacer",{enumerable:!0,get:function(){return sz.default}});var az=Qx();Object.defineProperty(Kl,"useInput",{enumerable:!0,get:function(){return az.default}});var fz=Jx();Object.defineProperty(Kl,"useApp",{enumerable:!0,get:function(){return fz.default}});var cz=T4();Object.defineProperty(Kl,"useStdin",{enumerable:!0,get:function(){return cz.default}});var dz=Zx();Object.defineProperty(Kl,"useStdout",{enumerable:!0,get:function(){return dz.default}});var pz=$x();Object.defineProperty(Kl,"useStderr",{enumerable:!0,get:function(){return pz.default}});var hz=t5();Object.defineProperty(Kl,"useFocus",{enumerable:!0,get:function(){return hz.default}});var vz=n5();Object.defineProperty(Kl,"useFocusManager",{enumerable:!0,get:function(){return vz.default}});var mz=r5();Object.defineProperty(Kl,"measureElement",{enumerable:!0,get:function(){return mz.default}})});var p5=Ke(Iy=>{"use strict";Object.defineProperty(Iy,"__esModule",{value:!0});Iy.UncontrolledTextInput=void 0;var f5=ki(),ew=ki(),c5=sc(),ah=g4(),d5=({value:i,placeholder:o="",focus:a=!0,mask:c,highlightPastedText:_=!1,showCursor:t=!0,onChange:O,onSubmit:N})=>{let[{cursorOffset:M,cursorWidth:T},B]=ew.useState({cursorOffset:(i||"").length,cursorWidth:0});ew.useEffect(()=>{B(he=>{if(!a||!t)return he;let De=i||"";return he.cursorOffset>De.length-1?{cursorOffset:De.length,cursorWidth:0}:he})},[i,a,t]);let H=_?T:0,q=c?c.repeat(i.length):i,ne=q,m=o?ah.grey(o):void 0;if(t&&a){m=o.length>0?ah.inverse(o[0])+ah.grey(o.slice(1)):ah.inverse(" "),ne=q.length>0?"":ah.inverse(" ");let he=0;for(let De of q)he>=M-H&&he<=M?ne+=ah.inverse(De):ne+=De,he++;q.length>0&&M===q.length&&(ne+=ah.inverse(" "))}return c5.useInput((he,De)=>{if(De.upArrow||De.downArrow||De.ctrl&&he==="c"||De.tab||De.shift&&De.tab)return;if(De.return){N&&N(i);return}let se=M,fe=i,_e=0;De.leftArrow?t&&se--:De.rightArrow?t&&se++:De.backspace||De.delete?M>0&&(fe=i.slice(0,M-1)+i.slice(M,i.length),se--):(fe=i.slice(0,M)+he+i.slice(M,i.length),se+=he.length,he.length>1&&(_e=he.length)),M<0&&(se=0),M>i.length&&(se=i.length),B({cursorOffset:se,cursorWidth:_e}),fe!==i&&O(fe)},{isActive:a}),f5.createElement(c5.Text,null,o?q.length>0?ne:m:ne)};Iy.default=d5;Iy.UncontrolledTextInput=i=>{let[o,a]=ew.useState("");return f5.createElement(d5,Object.assign({},i,{value:o,onChange:a}))}});var v5=Ke(N4=>{"use strict";Object.defineProperty(N4,"__esModule",{value:!0});function by(i){let o=[...i.caches],a=o.shift();return a===void 0?h5():{get(c,_,t={miss:()=>Promise.resolve()}){return a.get(c,_,t).catch(()=>by({caches:o}).get(c,_,t))},set(c,_){return a.set(c,_).catch(()=>by({caches:o}).set(c,_))},delete(c){return a.delete(c).catch(()=>by({caches:o}).delete(c))},clear(){return a.clear().catch(()=>by({caches:o}).clear())}}}function h5(){return{get(i,o,a={miss:()=>Promise.resolve()}){return o().then(_=>Promise.all([_,a.miss(_)])).then(([_])=>_)},set(i,o){return Promise.resolve(o)},delete(i){return Promise.resolve()},clear(){return Promise.resolve()}}}N4.createFallbackableCache=by;N4.createNullCache=h5});var g5=Ke((jG,m5)=>{m5.exports=v5()});var y5=Ke(tw=>{"use strict";Object.defineProperty(tw,"__esModule",{value:!0});function gz(i={serializable:!0}){let o={};return{get(a,c,_={miss:()=>Promise.resolve()}){let t=JSON.stringify(a);if(t in o)return Promise.resolve(i.serializable?JSON.parse(o[t]):o[t]);let O=c(),N=_&&_.miss||(()=>Promise.resolve());return O.then(M=>N(M)).then(()=>O)},set(a,c){return o[JSON.stringify(a)]=i.serializable?JSON.stringify(c):c,Promise.resolve(c)},delete(a){return delete o[JSON.stringify(a)],Promise.resolve()},clear(){return o={},Promise.resolve()}}}tw.createInMemoryCache=gz});var E5=Ke((HG,_5)=>{_5.exports=y5()});var w5=Ke(ac=>{"use strict";Object.defineProperty(ac,"__esModule",{value:!0});function yz(i,o,a){let c={"x-algolia-api-key":a,"x-algolia-application-id":o};return{headers(){return i===nw.WithinHeaders?c:{}},queryParameters(){return i===nw.WithinQueryParameters?c:{}}}}function _z(i){let o=0,a=()=>(o++,new Promise(c=>{setTimeout(()=>{c(i(a))},Math.min(100*o,1e3))}));return i(a)}function D5(i,o=(a,c)=>Promise.resolve()){return Object.assign(i,{wait(a){return D5(i.then(c=>Promise.all([o(c,a),c])).then(c=>c[1]))}})}function Ez(i){let o=i.length-1;for(o;o>0;o--){let a=Math.floor(Math.random()*(o+1)),c=i[o];i[o]=i[a],i[a]=c}return i}function Dz(i,o){return Object.keys(o!==void 0?o:{}).forEach(a=>{i[a]=o[a](i)}),i}function wz(i,...o){let a=0;return i.replace(/%s/g,()=>encodeURIComponent(o[a++]))}var Sz="4.2.0",Tz=i=>()=>i.transporter.requester.destroy(),nw={WithinQueryParameters:0,WithinHeaders:1};ac.AuthMode=nw;ac.addMethods=Dz;ac.createAuth=yz;ac.createRetryablePromise=_z;ac.createWaitablePromise=D5;ac.destroy=Tz;ac.encode=wz;ac.shuffle=Ez;ac.version=Sz});var By=Ke((WG,S5)=>{S5.exports=w5()});var T5=Ke(rw=>{"use strict";Object.defineProperty(rw,"__esModule",{value:!0});var Cz={Delete:"DELETE",Get:"GET",Post:"POST",Put:"PUT"};rw.MethodEnum=Cz});var Uy=Ke((GG,C5)=>{C5.exports=T5()});var j5=Ke(V0=>{"use strict";Object.defineProperty(V0,"__esModule",{value:!0});var x5=Uy();function iw(i,o){let a=i||{},c=a.data||{};return Object.keys(a).forEach(_=>{["timeout","headers","queryParameters","data","cacheable"].indexOf(_)===-1&&(c[_]=a[_])}),{data:Object.entries(c).length>0?c:void 0,timeout:a.timeout||o,headers:a.headers||{},queryParameters:a.queryParameters||{},cacheable:a.cacheable}}var F4={Read:1,Write:2,Any:3},nm={Up:1,Down:2,Timeouted:3},A5=2*60*1e3;function uw(i,o=nm.Up){return Zr(Ht({},i),{status:o,lastUpdate:Date.now()})}function R5(i){return i.status===nm.Up||Date.now()-i.lastUpdate>A5}function O5(i){return i.status===nm.Timeouted&&Date.now()-i.lastUpdate<=A5}function ow(i){return{protocol:i.protocol||"https",url:i.url,accept:i.accept||F4.Any}}function xz(i,o){return Promise.all(o.map(a=>i.get(a,()=>Promise.resolve(uw(a))))).then(a=>{let c=a.filter(N=>R5(N)),_=a.filter(N=>O5(N)),t=[...c,..._],O=t.length>0?t.map(N=>ow(N)):o;return{getTimeout(N,M){return(_.length===0&&N===0?1:_.length+3+N)*M},statelessHosts:O}})}var Az=({isTimedOut:i,status:o})=>!i&&~~o==0,Rz=i=>{let o=i.status;return i.isTimedOut||Az(i)||~~(o/100)!=2&&~~(o/100)!=4},Oz=({status:i})=>~~(i/100)==2,Mz=(i,o)=>Rz(i)?o.onRetry(i):Oz(i)?o.onSucess(i):o.onFail(i);function I5(i,o,a,c){let _=[],t=N5(a,c),O=F5(i,c),N=a.method,M=a.method!==x5.MethodEnum.Get?{}:Ht(Ht({},a.data),c.data),T=Ht(Ht(Ht({"x-algolia-agent":i.userAgent.value},i.queryParameters),M),c.queryParameters),B=0,H=(q,ne)=>{let m=q.pop();if(m===void 0)throw P5(lw(_));let he={data:t,headers:O,method:N,url:L5(m,a.path,T),connectTimeout:ne(B,i.timeouts.connect),responseTimeout:ne(B,c.timeout)},De=fe=>{let _e={request:he,response:fe,host:m,triesLeft:q.length};return _.push(_e),_e},se={onSucess:fe=>M5(fe),onRetry(fe){let _e=De(fe);return fe.isTimedOut&&B++,Promise.all([i.logger.info("Retryable failure",sw(_e)),i.hostsCache.set(m,uw(m,fe.isTimedOut?nm.Timeouted:nm.Down))]).then(()=>H(q,ne))},onFail(fe){throw De(fe),k5(fe,lw(_))}};return i.requester.send(he).then(fe=>Mz(fe,se))};return xz(i.hostsCache,o).then(q=>H([...q.statelessHosts].reverse(),q.getTimeout))}function kz(i){let{hostsCache:o,logger:a,requester:c,requestsCache:_,responsesCache:t,timeouts:O,userAgent:N,hosts:M,queryParameters:T,headers:B}=i,H={hostsCache:o,logger:a,requester:c,requestsCache:_,responsesCache:t,timeouts:O,userAgent:N,headers:B,queryParameters:T,hosts:M.map(q=>ow(q)),read(q,ne){let m=iw(ne,H.timeouts.read),he=()=>I5(H,H.hosts.filter(fe=>(fe.accept&F4.Read)!=0),q,m);if((m.cacheable!==void 0?m.cacheable:q.cacheable)!==!0)return he();let se={request:q,mappedRequestOptions:m,transporter:{queryParameters:H.queryParameters,headers:H.headers}};return H.responsesCache.get(se,()=>H.requestsCache.get(se,()=>H.requestsCache.set(se,he()).then(fe=>Promise.all([H.requestsCache.delete(se),fe]),fe=>Promise.all([H.requestsCache.delete(se),Promise.reject(fe)])).then(([fe,_e])=>_e)),{miss:fe=>H.responsesCache.set(se,fe)})},write(q,ne){return I5(H,H.hosts.filter(m=>(m.accept&F4.Write)!=0),q,iw(ne,H.timeouts.write))}};return H}function Lz(i){let o={value:`Algolia for JavaScript (${i})`,add(a){let c=`; ${a.segment}${a.version!==void 0?` (${a.version})`:""}`;return o.value.indexOf(c)===-1&&(o.value=`${o.value}${c}`),o}};return o}function M5(i){try{return JSON.parse(i.content)}catch(o){throw b5(o.message,i)}}function k5({content:i,status:o},a){let c=i;try{c=JSON.parse(i).message}catch(_){}return B5(c,o,a)}function Nz(i,...o){let a=0;return i.replace(/%s/g,()=>encodeURIComponent(o[a++]))}function L5(i,o,a){let c=U5(a),_=`${i.protocol}://${i.url}/${o.charAt(0)==="/"?o.substr(1):o}`;return c.length&&(_+=`?${c}`),_}function U5(i){let o=a=>Object.prototype.toString.call(a)==="[object Object]"||Object.prototype.toString.call(a)==="[object Array]";return Object.keys(i).map(a=>Nz("%s=%s",a,o(i[a])?JSON.stringify(i[a]):i[a])).join("&")}function N5(i,o){if(i.method===x5.MethodEnum.Get||i.data===void 0&&o.data===void 0)return;let a=Array.isArray(i.data)?i.data:Ht(Ht({},i.data),o.data);return JSON.stringify(a)}function F5(i,o){let a=Ht(Ht({},i.headers),o.headers),c={};return Object.keys(a).forEach(_=>{let t=a[_];c[_.toLowerCase()]=t}),c}function lw(i){return i.map(o=>sw(o))}function sw(i){let o=i.request.headers["x-algolia-api-key"]?{"x-algolia-api-key":"*****"}:{};return Zr(Ht({},i),{request:Zr(Ht({},i.request),{headers:Ht(Ht({},i.request.headers),o)})})}function B5(i,o,a){return{name:"ApiError",message:i,status:o,transporterStackTrace:a}}function b5(i,o){return{name:"DeserializationError",message:i,response:o}}function P5(i){return{name:"RetryError",message:"Unreachable hosts - your application id may be incorrect. If the error persists, contact support@algolia.com.",transporterStackTrace:i}}V0.CallEnum=F4;V0.HostStatusEnum=nm;V0.createApiError=B5;V0.createDeserializationError=b5;V0.createMappedRequestOptions=iw;V0.createRetryError=P5;V0.createStatefulHost=uw;V0.createStatelessHost=ow;V0.createTransporter=kz;V0.createUserAgent=Lz;V0.deserializeFailure=k5;V0.deserializeSuccess=M5;V0.isStatefulHostTimeouted=O5;V0.isStatefulHostUp=R5;V0.serializeData=N5;V0.serializeHeaders=F5;V0.serializeQueryParameters=U5;V0.serializeUrl=L5;V0.stackFrameWithoutCredentials=sw;V0.stackTraceWithoutCredentials=lw});var jy=Ke((KG,z5)=>{z5.exports=j5()});var H5=Ke(_2=>{"use strict";Object.defineProperty(_2,"__esModule",{value:!0});var rm=By(),Fz=jy(),zy=Uy(),Pz=i=>{let o=i.region||"us",a=rm.createAuth(rm.AuthMode.WithinHeaders,i.appId,i.apiKey),c=Fz.createTransporter(Zr(Ht({hosts:[{url:`analytics.${o}.algolia.com`}]},i),{headers:Ht(Zr(Ht({},a.headers()),{"content-type":"application/json"}),i.headers),queryParameters:Ht(Ht({},a.queryParameters()),i.queryParameters)})),_=i.appId;return rm.addMethods({appId:_,transporter:c},i.methods)},Iz=i=>(o,a)=>i.transporter.write({method:zy.MethodEnum.Post,path:"2/abtests",data:o},a),bz=i=>(o,a)=>i.transporter.write({method:zy.MethodEnum.Delete,path:rm.encode("2/abtests/%s",o)},a),Bz=i=>(o,a)=>i.transporter.read({method:zy.MethodEnum.Get,path:rm.encode("2/abtests/%s",o)},a),Uz=i=>o=>i.transporter.read({method:zy.MethodEnum.Get,path:"2/abtests"},o),jz=i=>(o,a)=>i.transporter.write({method:zy.MethodEnum.Post,path:rm.encode("2/abtests/%s/stop",o)},a);_2.addABTest=Iz;_2.createAnalyticsClient=Pz;_2.deleteABTest=bz;_2.getABTest=Bz;_2.getABTests=Uz;_2.stopABTest=jz});var W5=Ke((QG,q5)=>{q5.exports=H5()});var G5=Ke(Hy=>{"use strict";Object.defineProperty(Hy,"__esModule",{value:!0});var aw=By(),zz=jy(),V5=Uy(),Hz=i=>{let o=i.region||"us",a=aw.createAuth(aw.AuthMode.WithinHeaders,i.appId,i.apiKey),c=zz.createTransporter(Zr(Ht({hosts:[{url:`recommendation.${o}.algolia.com`}]},i),{headers:Ht(Zr(Ht({},a.headers()),{"content-type":"application/json"}),i.headers),queryParameters:Ht(Ht({},a.queryParameters()),i.queryParameters)}));return aw.addMethods({appId:i.appId,transporter:c},i.methods)},qz=i=>o=>i.transporter.read({method:V5.MethodEnum.Get,path:"1/strategies/personalization"},o),Wz=i=>(o,a)=>i.transporter.write({method:V5.MethodEnum.Post,path:"1/strategies/personalization",data:o},a);Hy.createRecommendationClient=Hz;Hy.getPersonalizationStrategy=qz;Hy.setPersonalizationStrategy=Wz});var K5=Ke((ZG,Y5)=>{Y5.exports=G5()});var l9=Ke(tn=>{"use strict";Object.defineProperty(tn,"__esModule",{value:!0});var Nn=By(),ia=jy(),Ur=Uy(),Vz=require("crypto");function P4(i){let o=a=>i.request(a).then(c=>{if(i.batch!==void 0&&i.batch(c.hits),!i.shouldStop(c))return c.cursor?o({cursor:c.cursor}):o({page:(a.page||0)+1})});return o({})}var Gz=i=>{let o=i.appId,a=Nn.createAuth(i.authMode!==void 0?i.authMode:Nn.AuthMode.WithinHeaders,o,i.apiKey),c=ia.createTransporter(Zr(Ht({hosts:[{url:`${o}-dsn.algolia.net`,accept:ia.CallEnum.Read},{url:`${o}.algolia.net`,accept:ia.CallEnum.Write}].concat(Nn.shuffle([{url:`${o}-1.algolianet.com`},{url:`${o}-2.algolianet.com`},{url:`${o}-3.algolianet.com`}]))},i),{headers:Ht(Zr(Ht({},a.headers()),{"content-type":"application/x-www-form-urlencoded"}),i.headers),queryParameters:Ht(Ht({},a.queryParameters()),i.queryParameters)})),_={transporter:c,appId:o,addAlgoliaAgent(t,O){c.userAgent.add({segment:t,version:O})},clearCache(){return Promise.all([c.requestsCache.clear(),c.responsesCache.clear()]).then(()=>{})}};return Nn.addMethods(_,i.methods)};function X5(){return{name:"MissingObjectIDError",message:"All objects must have an unique objectID (like a primary key) to be valid. Algolia is also able to generate objectIDs automatically but *it's not recommended*. To do it, use the `{'autoGenerateObjectIDIfNotExist': true}` option."}}function Q5(){return{name:"ObjectNotFoundError",message:"Object not found."}}function J5(){return{name:"ValidUntilNotFoundError",message:"ValidUntil not found in given secured api key."}}var Yz=i=>(o,a)=>{let N=a||{},{queryParameters:c}=N,_=wl(N,["queryParameters"]),t=Ht({acl:o},c!==void 0?{queryParameters:c}:{}),O=(M,T)=>Nn.createRetryablePromise(B=>qy(i)(M.key,T).catch(H=>{if(H.status!==404)throw H;return B()}));return Nn.createWaitablePromise(i.transporter.write({method:Ur.MethodEnum.Post,path:"1/keys",data:t},_),O)},Kz=i=>(o,a,c)=>{let _=ia.createMappedRequestOptions(c);return _.queryParameters["X-Algolia-User-ID"]=o,i.transporter.write({method:Ur.MethodEnum.Post,path:"1/clusters/mapping",data:{cluster:a}},_)},Xz=i=>(o,a,c)=>i.transporter.write({method:Ur.MethodEnum.Post,path:"1/clusters/mapping/batch",data:{users:o,cluster:a}},c),I4=i=>(o,a,c)=>{let _=(t,O)=>Wy(i)(o,{methods:{waitTask:xo}}).waitTask(t.taskID,O);return Nn.createWaitablePromise(i.transporter.write({method:Ur.MethodEnum.Post,path:Nn.encode("1/indexes/%s/operation",o),data:{operation:"copy",destination:a}},c),_)},Qz=i=>(o,a,c)=>I4(i)(o,a,Zr(Ht({},c),{scope:[b4.Rules]})),Jz=i=>(o,a,c)=>I4(i)(o,a,Zr(Ht({},c),{scope:[b4.Settings]})),Zz=i=>(o,a,c)=>I4(i)(o,a,Zr(Ht({},c),{scope:[b4.Synonyms]})),$z=i=>(o,a)=>{let c=(_,t)=>Nn.createRetryablePromise(O=>qy(i)(o,t).then(O).catch(N=>{if(N.status!==404)throw N}));return Nn.createWaitablePromise(i.transporter.write({method:Ur.MethodEnum.Delete,path:Nn.encode("1/keys/%s",o)},a),c)},eH=()=>(i,o)=>{let a=ia.serializeQueryParameters(o),c=Vz.createHmac("sha256",i).update(a).digest("hex");return Buffer.from(c+a).toString("base64")},qy=i=>(o,a)=>i.transporter.read({method:Ur.MethodEnum.Get,path:Nn.encode("1/keys/%s",o)},a),tH=i=>o=>i.transporter.read({method:Ur.MethodEnum.Get,path:"1/logs"},o),nH=()=>i=>{let o=Buffer.from(i,"base64").toString("ascii"),a=/validUntil=(\d+)/,c=o.match(a);if(c===null)throw J5();return parseInt(c[1],10)-Math.round(new Date().getTime()/1e3)},rH=i=>o=>i.transporter.read({method:Ur.MethodEnum.Get,path:"1/clusters/mapping/top"},o),iH=i=>(o,a)=>i.transporter.read({method:Ur.MethodEnum.Get,path:Nn.encode("1/clusters/mapping/%s",o)},a),uH=i=>o=>{let _=o||{},{retrieveMappings:a}=_,c=wl(_,["retrieveMappings"]);return a===!0&&(c.getClusters=!0),i.transporter.read({method:Ur.MethodEnum.Get,path:"1/clusters/mapping/pending"},c)},Wy=i=>(o,a={})=>{let c={transporter:i.transporter,appId:i.appId,indexName:o};return Nn.addMethods(c,a.methods)},oH=i=>o=>i.transporter.read({method:Ur.MethodEnum.Get,path:"1/keys"},o),lH=i=>o=>i.transporter.read({method:Ur.MethodEnum.Get,path:"1/clusters"},o),sH=i=>o=>i.transporter.read({method:Ur.MethodEnum.Get,path:"1/indexes"},o),aH=i=>o=>i.transporter.read({method:Ur.MethodEnum.Get,path:"1/clusters/mapping"},o),fH=i=>(o,a,c)=>{let _=(t,O)=>Wy(i)(o,{methods:{waitTask:xo}}).waitTask(t.taskID,O);return Nn.createWaitablePromise(i.transporter.write({method:Ur.MethodEnum.Post,path:Nn.encode("1/indexes/%s/operation",o),data:{operation:"move",destination:a}},c),_)},cH=i=>(o,a)=>{let c=(_,t)=>Promise.all(Object.keys(_.taskID).map(O=>Wy(i)(O,{methods:{waitTask:xo}}).waitTask(_.taskID[O],t)));return Nn.createWaitablePromise(i.transporter.write({method:Ur.MethodEnum.Post,path:"1/indexes/*/batch",data:{requests:o}},a),c)},dH=i=>(o,a)=>i.transporter.read({method:Ur.MethodEnum.Post,path:"1/indexes/*/objects",data:{requests:o}},a),pH=i=>(o,a)=>{let c=o.map(_=>Zr(Ht({},_),{params:ia.serializeQueryParameters(_.params||{})}));return i.transporter.read({method:Ur.MethodEnum.Post,path:"1/indexes/*/queries",data:{requests:c},cacheable:!0},a)},hH=i=>(o,a)=>Promise.all(o.map(c=>{let N=c.params,{facetName:_,facetQuery:t}=N,O=wl(N,["facetName","facetQuery"]);return Wy(i)(c.indexName,{methods:{searchForFacetValues:Z5}}).searchForFacetValues(_,t,Ht(Ht({},a),O))})),vH=i=>(o,a)=>{let c=ia.createMappedRequestOptions(a);return c.queryParameters["X-Algolia-User-ID"]=o,i.transporter.write({method:Ur.MethodEnum.Delete,path:"1/clusters/mapping"},c)},mH=i=>(o,a)=>{let c=(_,t)=>Nn.createRetryablePromise(O=>qy(i)(o,t).catch(N=>{if(N.status!==404)throw N;return O()}));return Nn.createWaitablePromise(i.transporter.write({method:Ur.MethodEnum.Post,path:Nn.encode("1/keys/%s/restore",o)},a),c)},gH=i=>(o,a)=>i.transporter.read({method:Ur.MethodEnum.Post,path:"1/clusters/mapping/search",data:{query:o}},a),yH=i=>(o,a)=>{let c=Object.assign({},a),B=a||{},{queryParameters:_}=B,t=wl(B,["queryParameters"]),O=_?{queryParameters:_}:{},N=["acl","indexes","referers","restrictSources","queryParameters","description","maxQueriesPerIPPerHour","maxHitsPerQuery"],M=H=>Object.keys(c).filter(q=>N.indexOf(q)!==-1).every(q=>H[q]===c[q]),T=(H,q)=>Nn.createRetryablePromise(ne=>qy(i)(o,q).then(m=>M(m)?Promise.resolve():ne()));return Nn.createWaitablePromise(i.transporter.write({method:Ur.MethodEnum.Put,path:Nn.encode("1/keys/%s",o),data:O},t),T)},$5=i=>(o,a)=>{let c=(_,t)=>xo(i)(_.taskID,t);return Nn.createWaitablePromise(i.transporter.write({method:Ur.MethodEnum.Post,path:Nn.encode("1/indexes/%s/batch",i.indexName),data:{requests:o}},a),c)},_H=i=>o=>P4(Zr(Ht({},o),{shouldStop:a=>a.cursor===void 0,request:a=>i.transporter.read({method:Ur.MethodEnum.Post,path:Nn.encode("1/indexes/%s/browse",i.indexName),data:a},o)})),EH=i=>o=>{let a=Ht({hitsPerPage:1e3},o);return P4(Zr(Ht({},a),{shouldStop:c=>c.hits.length<a.hitsPerPage,request(c){return e9(i)("",Ht(Ht({},a),c)).then(_=>Zr(Ht({},_),{hits:_.hits.map(t=>(delete t._highlightResult,t))}))}}))},DH=i=>o=>{let a=Ht({hitsPerPage:1e3},o);return P4(Zr(Ht({},a),{shouldStop:c=>c.hits.length<a.hitsPerPage,request(c){return t9(i)("",Ht(Ht({},a),c)).then(_=>Zr(Ht({},_),{hits:_.hits.map(t=>(delete t._highlightResult,t))}))}}))},B4=i=>(o,a,c)=>{let M=c||{},{batchSize:_}=M,t=wl(M,["batchSize"]),O={taskIDs:[],objectIDs:[]},N=(T=0)=>{let B=[],H;for(H=T;H<o.length&&(B.push(o[H]),B.length!==(_||1e3));H++);return B.length===0?Promise.resolve(O):$5(i)(B.map(q=>({action:a,body:q})),t).then(q=>(O.objectIDs=O.objectIDs.concat(q.objectIDs),O.taskIDs.push(q.taskID),H++,N(H)))};return Nn.createWaitablePromise(N(),(T,B)=>Promise.all(T.taskIDs.map(H=>xo(i)(H,B))))},wH=i=>o=>Nn.createWaitablePromise(i.transporter.write({method:Ur.MethodEnum.Post,path:Nn.encode("1/indexes/%s/clear",i.indexName)},o),(a,c)=>xo(i)(a.taskID,c)),SH=i=>o=>{let t=o||{},{forwardToReplicas:a}=t,c=wl(t,["forwardToReplicas"]),_=ia.createMappedRequestOptions(c);return a&&(_.queryParameters.forwardToReplicas=1),Nn.createWaitablePromise(i.transporter.write({method:Ur.MethodEnum.Post,path:Nn.encode("1/indexes/%s/rules/clear",i.indexName)},_),(O,N)=>xo(i)(O.taskID,N))},TH=i=>o=>{let t=o||{},{forwardToReplicas:a}=t,c=wl(t,["forwardToReplicas"]),_=ia.createMappedRequestOptions(c);return a&&(_.queryParameters.forwardToReplicas=1),Nn.createWaitablePromise(i.transporter.write({method:Ur.MethodEnum.Post,path:Nn.encode("1/indexes/%s/synonyms/clear",i.indexName)},_),(O,N)=>xo(i)(O.taskID,N))},CH=i=>(o,a)=>Nn.createWaitablePromise(i.transporter.write({method:Ur.MethodEnum.Post,path:Nn.encode("1/indexes/%s/deleteByQuery",i.indexName),data:o},a),(c,_)=>xo(i)(c.taskID,_)),xH=i=>o=>Nn.createWaitablePromise(i.transporter.write({method:Ur.MethodEnum.Delete,path:Nn.encode("1/indexes/%s",i.indexName)},o),(a,c)=>xo(i)(a.taskID,c)),AH=i=>(o,a)=>Nn.createWaitablePromise(n9(i)([o],a).then(c=>({taskID:c.taskIDs[0]})),(c,_)=>xo(i)(c.taskID,_)),n9=i=>(o,a)=>{let c=o.map(_=>({objectID:_}));return B4(i)(c,fh.DeleteObject,a)},RH=i=>(o,a)=>{let O=a||{},{forwardToReplicas:c}=O,_=wl(O,["forwardToReplicas"]),t=ia.createMappedRequestOptions(_);return c&&(t.queryParameters.forwardToReplicas=1),Nn.createWaitablePromise(i.transporter.write({method:Ur.MethodEnum.Delete,path:Nn.encode("1/indexes/%s/rules/%s",i.indexName,o)},t),(N,M)=>xo(i)(N.taskID,M))},OH=i=>(o,a)=>{let O=a||{},{forwardToReplicas:c}=O,_=wl(O,["forwardToReplicas"]),t=ia.createMappedRequestOptions(_);return c&&(t.queryParameters.forwardToReplicas=1),Nn.createWaitablePromise(i.transporter.write({method:Ur.MethodEnum.Delete,path:Nn.encode("1/indexes/%s/synonyms/%s",i.indexName,o)},t),(N,M)=>xo(i)(N.taskID,M))},MH=i=>o=>r9(i)(o).then(()=>!0).catch(a=>{if(a.status!==404)throw a;return!1}),kH=i=>(o,a)=>{let M=a||{},{query:c,paginate:_}=M,t=wl(M,["query","paginate"]),O=0,N=()=>i9(i)(c||"",Zr(Ht({},t),{page:O})).then(T=>{for(let[B,H]of Object.entries(T.hits))if(o(H))return{object:H,position:parseInt(B,10),page:O};if(O++,_===!1||O>=T.nbPages)throw Q5();return N()});return N()},LH=i=>(o,a)=>i.transporter.read({method:Ur.MethodEnum.Get,path:Nn.encode("1/indexes/%s/%s",i.indexName,o)},a),NH=()=>(i,o)=>{for(let[a,c]of Object.entries(i.hits))if(c.objectID===o)return parseInt(a,10);return-1},FH=i=>(o,a)=>{let O=a||{},{attributesToRetrieve:c}=O,_=wl(O,["attributesToRetrieve"]),t=o.map(N=>Ht({indexName:i.indexName,objectID:N},c?{attributesToRetrieve:c}:{}));return i.transporter.read({method:Ur.MethodEnum.Post,path:"1/indexes/*/objects",data:{requests:t}},_)},PH=i=>(o,a)=>i.transporter.read({method:Ur.MethodEnum.Get,path:Nn.encode("1/indexes/%s/rules/%s",i.indexName,o)},a),r9=i=>o=>i.transporter.read({method:Ur.MethodEnum.Get,path:Nn.encode("1/indexes/%s/settings",i.indexName),data:{getVersion:2}},o),IH=i=>(o,a)=>i.transporter.read({method:Ur.MethodEnum.Get,path:Nn.encode("1/indexes/%s/synonyms/%s",i.indexName,o)},a),u9=i=>(o,a)=>i.transporter.read({method:Ur.MethodEnum.Get,path:Nn.encode("1/indexes/%s/task/%s",i.indexName,o.toString())},a),bH=i=>(o,a)=>Nn.createWaitablePromise(o9(i)([o],a).then(c=>({objectID:c.objectIDs[0],taskID:c.taskIDs[0]})),(c,_)=>xo(i)(c.taskID,_)),o9=i=>(o,a)=>{let O=a||{},{createIfNotExists:c}=O,_=wl(O,["createIfNotExists"]),t=c?fh.PartialUpdateObject:fh.PartialUpdateObjectNoCreate;return B4(i)(o,t,_)},BH=i=>(o,a)=>{let m=a||{},{safe:c,autoGenerateObjectIDIfNotExist:_,batchSize:t}=m,O=wl(m,["safe","autoGenerateObjectIDIfNotExist","batchSize"]),N=(he,De,se,fe)=>Nn.createWaitablePromise(i.transporter.write({method:Ur.MethodEnum.Post,path:Nn.encode("1/indexes/%s/operation",he),data:{operation:se,destination:De}},fe),(_e,ce)=>xo(i)(_e.taskID,ce)),M=Math.random().toString(36).substring(7),T=`${i.indexName}_tmp_${M}`,B=fw({appId:i.appId,transporter:i.transporter,indexName:T}),H=[],q=N(i.indexName,T,"copy",Zr(Ht({},O),{scope:["settings","synonyms","rules"]}));H.push(q);let ne=(c?q.wait(O):q).then(()=>{let he=B(o,Zr(Ht({},O),{autoGenerateObjectIDIfNotExist:_,batchSize:t}));return H.push(he),c?he.wait(O):he}).then(()=>{let he=N(T,i.indexName,"move",O);return H.push(he),c?he.wait(O):he}).then(()=>Promise.all(H)).then(([he,De,se])=>({objectIDs:De.objectIDs,taskIDs:[he.taskID,...De.taskIDs,se.taskID]}));return Nn.createWaitablePromise(ne,(he,De)=>Promise.all(H.map(se=>se.wait(De))))},UH=i=>(o,a)=>cw(i)(o,Zr(Ht({},a),{clearExistingRules:!0})),jH=i=>(o,a)=>dw(i)(o,Zr(Ht({},a),{replaceExistingSynonyms:!0})),zH=i=>(o,a)=>Nn.createWaitablePromise(fw(i)([o],a).then(c=>({objectID:c.objectIDs[0],taskID:c.taskIDs[0]})),(c,_)=>xo(i)(c.taskID,_)),fw=i=>(o,a)=>{let O=a||{},{autoGenerateObjectIDIfNotExist:c}=O,_=wl(O,["autoGenerateObjectIDIfNotExist"]),t=c?fh.AddObject:fh.UpdateObject;if(t===fh.UpdateObject){for(let N of o)if(N.objectID===void 0)return Nn.createWaitablePromise(Promise.reject(X5()))}return B4(i)(o,t,_)},HH=i=>(o,a)=>cw(i)([o],a),cw=i=>(o,a)=>{let N=a||{},{forwardToReplicas:c,clearExistingRules:_}=N,t=wl(N,["forwardToReplicas","clearExistingRules"]),O=ia.createMappedRequestOptions(t);return c&&(O.queryParameters.forwardToReplicas=1),_&&(O.queryParameters.clearExistingRules=1),Nn.createWaitablePromise(i.transporter.write({method:Ur.MethodEnum.Post,path:Nn.encode("1/indexes/%s/rules/batch",i.indexName),data:o},O),(M,T)=>xo(i)(M.taskID,T))},qH=i=>(o,a)=>dw(i)([o],a),dw=i=>(o,a)=>{let N=a||{},{forwardToReplicas:c,replaceExistingSynonyms:_}=N,t=wl(N,["forwardToReplicas","replaceExistingSynonyms"]),O=ia.createMappedRequestOptions(t);return c&&(O.queryParameters.forwardToReplicas=1),_&&(O.queryParameters.replaceExistingSynonyms=1),Nn.createWaitablePromise(i.transporter.write({method:Ur.MethodEnum.Post,path:Nn.encode("1/indexes/%s/synonyms/batch",i.indexName),data:o},O),(M,T)=>xo(i)(M.taskID,T))},i9=i=>(o,a)=>i.transporter.read({method:Ur.MethodEnum.Post,path:Nn.encode("1/indexes/%s/query",i.indexName),data:{query:o},cacheable:!0},a),Z5=i=>(o,a,c)=>i.transporter.read({method:Ur.MethodEnum.Post,path:Nn.encode("1/indexes/%s/facets/%s/query",i.indexName,o),data:{facetQuery:a},cacheable:!0},c),e9=i=>(o,a)=>i.transporter.read({method:Ur.MethodEnum.Post,path:Nn.encode("1/indexes/%s/rules/search",i.indexName),data:{query:o}},a),t9=i=>(o,a)=>i.transporter.read({method:Ur.MethodEnum.Post,path:Nn.encode("1/indexes/%s/synonyms/search",i.indexName),data:{query:o}},a),WH=i=>(o,a)=>{let O=a||{},{forwardToReplicas:c}=O,_=wl(O,["forwardToReplicas"]),t=ia.createMappedRequestOptions(_);return c&&(t.queryParameters.forwardToReplicas=1),Nn.createWaitablePromise(i.transporter.write({method:Ur.MethodEnum.Put,path:Nn.encode("1/indexes/%s/settings",i.indexName),data:o},t),(N,M)=>xo(i)(N.taskID,M))},xo=i=>(o,a)=>Nn.createRetryablePromise(c=>u9(i)(o,a).then(_=>_.status!=="published"?c():void 0)),VH={AddObject:"addObject",Analytics:"analytics",Browser:"browse",DeleteIndex:"deleteIndex",DeleteObject:"deleteObject",EditSettings:"editSettings",ListIndexes:"listIndexes",Logs:"logs",Recommendation:"recommendation",Search:"search",SeeUnretrievableAttributes:"seeUnretrievableAttributes",Settings:"settings",Usage:"usage"},fh={AddObject:"addObject",UpdateObject:"updateObject",PartialUpdateObject:"partialUpdateObject",PartialUpdateObjectNoCreate:"partialUpdateObjectNoCreate",DeleteObject:"deleteObject"},b4={Settings:"settings",Synonyms:"synonyms",Rules:"rules"},GH={None:"none",StopIfEnoughMatches:"stopIfEnoughMatches"},YH={Synonym:"synonym",OneWaySynonym:"oneWaySynonym",AltCorrection1:"altCorrection1",AltCorrection2:"altCorrection2",Placeholder:"placeholder"};tn.ApiKeyACLEnum=VH;tn.BatchActionEnum=fh;tn.ScopeEnum=b4;tn.StrategyEnum=GH;tn.SynonymEnum=YH;tn.addApiKey=Yz;tn.assignUserID=Kz;tn.assignUserIDs=Xz;tn.batch=$5;tn.browseObjects=_H;tn.browseRules=EH;tn.browseSynonyms=DH;tn.chunkedBatch=B4;tn.clearObjects=wH;tn.clearRules=SH;tn.clearSynonyms=TH;tn.copyIndex=I4;tn.copyRules=Qz;tn.copySettings=Jz;tn.copySynonyms=Zz;tn.createBrowsablePromise=P4;tn.createMissingObjectIDError=X5;tn.createObjectNotFoundError=Q5;tn.createSearchClient=Gz;tn.createValidUntilNotFoundError=J5;tn.deleteApiKey=$z;tn.deleteBy=CH;tn.deleteIndex=xH;tn.deleteObject=AH;tn.deleteObjects=n9;tn.deleteRule=RH;tn.deleteSynonym=OH;tn.exists=MH;tn.findObject=kH;tn.generateSecuredApiKey=eH;tn.getApiKey=qy;tn.getLogs=tH;tn.getObject=LH;tn.getObjectPosition=NH;tn.getObjects=FH;tn.getRule=PH;tn.getSecuredApiKeyRemainingValidity=nH;tn.getSettings=r9;tn.getSynonym=IH;tn.getTask=u9;tn.getTopUserIDs=rH;tn.getUserID=iH;tn.hasPendingMappings=uH;tn.initIndex=Wy;tn.listApiKeys=oH;tn.listClusters=lH;tn.listIndices=sH;tn.listUserIDs=aH;tn.moveIndex=fH;tn.multipleBatch=cH;tn.multipleGetObjects=dH;tn.multipleQueries=pH;tn.multipleSearchForFacetValues=hH;tn.partialUpdateObject=bH;tn.partialUpdateObjects=o9;tn.removeUserID=vH;tn.replaceAllObjects=BH;tn.replaceAllRules=UH;tn.replaceAllSynonyms=jH;tn.restoreApiKey=mH;tn.saveObject=zH;tn.saveObjects=fw;tn.saveRule=HH;tn.saveRules=cw;tn.saveSynonym=qH;tn.saveSynonyms=dw;tn.search=i9;tn.searchForFacetValues=Z5;tn.searchRules=e9;tn.searchSynonyms=t9;tn.searchUserIDs=gH;tn.setSettings=WH;tn.updateApiKey=yH;tn.waitTask=xo});var a9=Ke((eY,s9)=>{s9.exports=l9()});var f9=Ke(U4=>{"use strict";Object.defineProperty(U4,"__esModule",{value:!0});function KH(){return{debug(i,o){return Promise.resolve()},info(i,o){return Promise.resolve()},error(i,o){return Promise.resolve()}}}var XH={Debug:1,Info:2,Error:3};U4.LogLevelEnum=XH;U4.createNullLogger=KH});var d9=Ke((nY,c9)=>{c9.exports=f9()});var v9=Ke(pw=>{"use strict";Object.defineProperty(pw,"__esModule",{value:!0});var p9=require("http"),h9=require("https"),QH=require("url");function JH(){let i={keepAlive:!0},o=new p9.Agent(i),a=new h9.Agent(i);return{send(c){return new Promise(_=>{let t=QH.parse(c.url),O=t.query===null?t.pathname:`${t.pathname}?${t.query}`,N=Ht({agent:t.protocol==="https:"?a:o,hostname:t.hostname,path:O,method:c.method,headers:c.headers},t.port!==void 0?{port:t.port||""}:{}),M=(t.protocol==="https:"?h9:p9).request(N,q=>{let ne="";q.on("data",m=>ne+=m),q.on("end",()=>{clearTimeout(B),clearTimeout(H),_({status:q.statusCode||0,content:ne,isTimedOut:!1})})}),T=(q,ne)=>setTimeout(()=>{M.abort(),_({status:0,content:ne,isTimedOut:!0})},q*1e3),B=T(c.connectTimeout,"Connection timeout"),H;M.on("error",q=>{clearTimeout(B),clearTimeout(H),_({status:0,content:q.message,isTimedOut:!1})}),M.once("response",()=>{clearTimeout(B),H=T(c.responseTimeout,"Socket timeout")}),c.data!==void 0&&M.write(c.data),M.end()})},destroy(){return o.destroy(),a.destroy(),Promise.resolve()}}}pw.createNodeHttpRequester=JH});var g9=Ke((iY,m9)=>{m9.exports=v9()});var D9=Ke((uY,y9)=>{"use strict";var _9=g5(),ZH=E5(),im=W5(),hw=By(),vw=K5(),wn=a9(),$H=d9(),eq=g9(),tq=jy();function E9(i,o,a){let c={appId:i,apiKey:o,timeouts:{connect:2,read:5,write:30},requester:eq.createNodeHttpRequester(),logger:$H.createNullLogger(),responsesCache:_9.createNullCache(),requestsCache:_9.createNullCache(),hostsCache:ZH.createInMemoryCache(),userAgent:tq.createUserAgent(hw.version).add({segment:"Node.js",version:process.versions.node})};return wn.createSearchClient(Zr(Ht(Ht({},c),a),{methods:{search:wn.multipleQueries,searchForFacetValues:wn.multipleSearchForFacetValues,multipleBatch:wn.multipleBatch,multipleGetObjects:wn.multipleGetObjects,multipleQueries:wn.multipleQueries,copyIndex:wn.copyIndex,copySettings:wn.copySettings,copyRules:wn.copyRules,copySynonyms:wn.copySynonyms,moveIndex:wn.moveIndex,listIndices:wn.listIndices,getLogs:wn.getLogs,listClusters:wn.listClusters,multipleSearchForFacetValues:wn.multipleSearchForFacetValues,getApiKey:wn.getApiKey,addApiKey:wn.addApiKey,listApiKeys:wn.listApiKeys,updateApiKey:wn.updateApiKey,deleteApiKey:wn.deleteApiKey,restoreApiKey:wn.restoreApiKey,assignUserID:wn.assignUserID,assignUserIDs:wn.assignUserIDs,getUserID:wn.getUserID,searchUserIDs:wn.searchUserIDs,listUserIDs:wn.listUserIDs,getTopUserIDs:wn.getTopUserIDs,removeUserID:wn.removeUserID,hasPendingMappings:wn.hasPendingMappings,generateSecuredApiKey:wn.generateSecuredApiKey,getSecuredApiKeyRemainingValidity:wn.getSecuredApiKeyRemainingValidity,destroy:hw.destroy,initIndex:_=>t=>wn.initIndex(_)(t,{methods:{batch:wn.batch,delete:wn.deleteIndex,getObject:wn.getObject,getObjects:wn.getObjects,saveObject:wn.saveObject,saveObjects:wn.saveObjects,search:wn.search,searchForFacetValues:wn.searchForFacetValues,waitTask:wn.waitTask,setSettings:wn.setSettings,getSettings:wn.getSettings,partialUpdateObject:wn.partialUpdateObject,partialUpdateObjects:wn.partialUpdateObjects,deleteObject:wn.deleteObject,deleteObjects:wn.deleteObjects,deleteBy:wn.deleteBy,clearObjects:wn.clearObjects,browseObjects:wn.browseObjects,getObjectPosition:wn.getObjectPosition,findObject:wn.findObject,exists:wn.exists,saveSynonym:wn.saveSynonym,saveSynonyms:wn.saveSynonyms,getSynonym:wn.getSynonym,searchSynonyms:wn.searchSynonyms,browseSynonyms:wn.browseSynonyms,deleteSynonym:wn.deleteSynonym,clearSynonyms:wn.clearSynonyms,replaceAllObjects:wn.replaceAllObjects,replaceAllSynonyms:wn.replaceAllSynonyms,searchRules:wn.searchRules,getRule:wn.getRule,deleteRule:wn.deleteRule,saveRule:wn.saveRule,saveRules:wn.saveRules,replaceAllRules:wn.replaceAllRules,browseRules:wn.browseRules,clearRules:wn.clearRules}}),initAnalytics:()=>_=>im.createAnalyticsClient(Zr(Ht(Ht({},c),_),{methods:{addABTest:im.addABTest,getABTest:im.getABTest,getABTests:im.getABTests,stopABTest:im.stopABTest,deleteABTest:im.deleteABTest}})),initRecommendation:()=>_=>vw.createRecommendationClient(Zr(Ht(Ht({},c),_),{methods:{getPersonalizationStrategy:vw.getPersonalizationStrategy,setPersonalizationStrategy:vw.setPersonalizationStrategy}}))}}))}E9.version=hw.version;y9.exports=E9});var S9=Ke((oY,mw)=>{var w9=D9();mw.exports=w9;mw.exports.default=w9});var nd=Ke(_w=>{"use strict";Object.defineProperty(_w,"__esModule",{value:!0});_w.default=L9;function L9(){}L9.prototype={diff:function(o,a){var c=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{},_=c.callback;typeof c=="function"&&(_=c,c={}),this.options=c;var t=this;function O(he){return _?(setTimeout(function(){_(void 0,he)},0),!0):he}o=this.castInput(o),a=this.castInput(a),o=this.removeEmpty(this.tokenize(o)),a=this.removeEmpty(this.tokenize(a));var N=a.length,M=o.length,T=1,B=N+M,H=[{newPos:-1,components:[]}],q=this.extractCommon(H[0],a,o,0);if(H[0].newPos+1>=N&&q+1>=M)return O([{value:this.join(a),count:a.length}]);function ne(){for(var he=-1*T;he<=T;he+=2){var De=void 0,se=H[he-1],fe=H[he+1],_e=(fe?fe.newPos:0)-he;se&&(H[he-1]=void 0);var ce=se&&se.newPos+1<N,me=fe&&0<=_e&&_e<M;if(!ce&&!me){H[he]=void 0;continue}if(!ce||me&&se.newPos<fe.newPos?(De=iq(fe),t.pushComponent(De.components,void 0,!0)):(De=se,De.newPos++,t.pushComponent(De.components,!0,void 0)),_e=t.extractCommon(De,a,o,he),De.newPos+1>=N&&_e+1>=M)return O(rq(t,De.components,a,o,t.useLongestToken));H[he]=De}T++}if(_)(function he(){setTimeout(function(){if(T>B)return _();ne()||he()},0)})();else for(;T<=B;){var m=ne();if(m)return m}},pushComponent:function(o,a,c){var _=o[o.length-1];_&&_.added===a&&_.removed===c?o[o.length-1]={count:_.count+1,added:a,removed:c}:o.push({count:1,added:a,removed:c})},extractCommon:function(o,a,c,_){for(var t=a.length,O=c.length,N=o.newPos,M=N-_,T=0;N+1<t&&M+1<O&&this.equals(a[N+1],c[M+1]);)N++,M++,T++;return T&&o.components.push({count:T}),o.newPos=N,M},equals:function(o,a){return this.options.comparator?this.options.comparator(o,a):o===a||this.options.ignoreCase&&o.toLowerCase()===a.toLowerCase()},removeEmpty:function(o){for(var a=[],c=0;c<o.length;c++)o[c]&&a.push(o[c]);return a},castInput:function(o){return o},tokenize:function(o){return o.split("")},join:function(o){return o.join("")}};function rq(i,o,a,c,_){for(var t=0,O=o.length,N=0,M=0;t<O;t++){var T=o[t];if(T.removed){if(T.value=i.join(c.slice(M,M+T.count)),M+=T.count,t&&o[t-1].added){var H=o[t-1];o[t-1]=o[t],o[t]=H}}else{if(!T.added&&_){var B=a.slice(N,N+T.count);B=B.map(function(ne,m){var he=c[M+m];return he.length>ne.length?he:ne}),T.value=i.join(B)}else T.value=i.join(a.slice(N,N+T.count));N+=T.count,T.added||(M+=T.count)}}var q=o[O-1];return O>1&&typeof q.value=="string"&&(q.added||q.removed)&&i.equals("",q.value)&&(o[O-2].value+=q.value,o.pop()),o}function iq(i){return{newPos:i.newPos,components:i.components.slice(0)}}});var F9=Ke(Ky=>{"use strict";Object.defineProperty(Ky,"__esModule",{value:!0});Ky.diffChars=uq;Ky.characterDiff=void 0;var lq=oq(nd());function oq(i){return i&&i.__esModule?i:{default:i}}var N9=new lq.default;Ky.characterDiff=N9;function uq(i,o,a){return N9.diff(i,o,a)}});var Dw=Ke(Ew=>{"use strict";Object.defineProperty(Ew,"__esModule",{value:!0});Ew.generateOptions=sq;function sq(i,o){if(typeof i=="function")o.callback=i;else if(i)for(var a in i)i.hasOwnProperty(a)&&(o[a]=i[a]);return o}});var b9=Ke(um=>{"use strict";Object.defineProperty(um,"__esModule",{value:!0});um.diffWords=aq;um.diffWordsWithSpace=fq;um.wordDiff=void 0;var dq=cq(nd()),pq=Dw();function cq(i){return i&&i.__esModule?i:{default:i}}var P9=/^[A-Za-z\xC0-\u02C6\u02C8-\u02D7\u02DE-\u02FF\u1E00-\u1EFF]+$/,I9=/\S/,Xy=new dq.default;um.wordDiff=Xy;Xy.equals=function(i,o){return this.options.ignoreCase&&(i=i.toLowerCase(),o=o.toLowerCase()),i===o||this.options.ignoreWhitespace&&!I9.test(i)&&!I9.test(o)};Xy.tokenize=function(i){for(var o=i.split(/(\s+|[()[\]{}'"]|\b)/),a=0;a<o.length-1;a++)!o[a+1]&&o[a+2]&&P9.test(o[a])&&P9.test(o[a+2])&&(o[a]+=o[a+2],o.splice(a+1,2),a--);return o};function aq(i,o,a){return a=(0,pq.generateOptions)(a,{ignoreWhitespace:!0}),Xy.diff(i,o,a)}function fq(i,o,a){return Xy.diff(i,o,a)}});var H4=Ke(om=>{"use strict";Object.defineProperty(om,"__esModule",{value:!0});om.diffLines=hq;om.diffTrimmedLines=vq;om.lineDiff=void 0;var gq=mq(nd()),yq=Dw();function mq(i){return i&&i.__esModule?i:{default:i}}var z4=new gq.default;om.lineDiff=z4;z4.tokenize=function(i){var o=[],a=i.split(/(\n|\r\n)/);a[a.length-1]||a.pop();for(var c=0;c<a.length;c++){var _=a[c];c%2&&!this.options.newlineIsToken?o[o.length-1]+=_:(this.options.ignoreWhitespace&&(_=_.trim()),o.push(_))}return o};function hq(i,o,a){return z4.diff(i,o,a)}function vq(i,o,a){var c=(0,yq.generateOptions)(a,{ignoreWhitespace:!0});return z4.diff(i,o,c)}});var B9=Ke(Qy=>{"use strict";Object.defineProperty(Qy,"__esModule",{value:!0});Qy.diffSentences=_q;Qy.sentenceDiff=void 0;var Dq=Eq(nd());function Eq(i){return i&&i.__esModule?i:{default:i}}var ww=new Dq.default;Qy.sentenceDiff=ww;ww.tokenize=function(i){return i.split(/(\S.+?[.!?])(?=\s+|$)/)};function _q(i,o,a){return ww.diff(i,o,a)}});var U9=Ke(Jy=>{"use strict";Object.defineProperty(Jy,"__esModule",{value:!0});Jy.diffCss=wq;Jy.cssDiff=void 0;var Tq=Sq(nd());function Sq(i){return i&&i.__esModule?i:{default:i}}var Sw=new Tq.default;Jy.cssDiff=Sw;Sw.tokenize=function(i){return i.split(/([{}:;,]|\s+)/)};function wq(i,o,a){return Sw.diff(i,o,a)}});var z9=Ke(lm=>{"use strict";Object.defineProperty(lm,"__esModule",{value:!0});lm.diffJson=Cq;lm.canonicalize=q4;lm.jsonDiff=void 0;var j9=xq(nd()),Aq=H4();function xq(i){return i&&i.__esModule?i:{default:i}}function W4(i){return typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?W4=function(a){return typeof a}:W4=function(a){return a&&typeof Symbol=="function"&&a.constructor===Symbol&&a!==Symbol.prototype?"symbol":typeof a},W4(i)}var Rq=Object.prototype.toString,dh=new j9.default;lm.jsonDiff=dh;dh.useLongestToken=!0;dh.tokenize=Aq.lineDiff.tokenize;dh.castInput=function(i){var o=this.options,a=o.undefinedReplacement,c=o.stringifyReplacer,_=c===void 0?function(t,O){return typeof O=="undefined"?a:O}:c;return typeof i=="string"?i:JSON.stringify(q4(i,null,null,_),_,"  ")};dh.equals=function(i,o){return j9.default.prototype.equals.call(dh,i.replace(/,([\r\n])/g,"$1"),o.replace(/,([\r\n])/g,"$1"))};function Cq(i,o,a){return dh.diff(i,o,a)}function q4(i,o,a,c,_){o=o||[],a=a||[],c&&(i=c(_,i));var t;for(t=0;t<o.length;t+=1)if(o[t]===i)return a[t];var O;if(Rq.call(i)==="[object Array]"){for(o.push(i),O=new Array(i.length),a.push(O),t=0;t<i.length;t+=1)O[t]=q4(i[t],o,a,c,_);return o.pop(),a.pop(),O}if(i&&i.toJSON&&(i=i.toJSON()),W4(i)==="object"&&i!==null){o.push(i),O={},a.push(O);var N=[],M;for(M in i)i.hasOwnProperty(M)&&N.push(M);for(N.sort(),t=0;t<N.length;t+=1)M=N[t],O[M]=q4(i[M],o,a,c,M);o.pop(),a.pop()}else O=i;return O}});var H9=Ke(Zy=>{"use strict";Object.defineProperty(Zy,"__esModule",{value:!0});Zy.diffArrays=Oq;Zy.arrayDiff=void 0;var kq=Mq(nd());function Mq(i){return i&&i.__esModule?i:{default:i}}var $y=new kq.default;Zy.arrayDiff=$y;$y.tokenize=function(i){return i.slice()};$y.join=$y.removeEmpty=function(i){return i};function Oq(i,o,a){return $y.diff(i,o,a)}});var V4=Ke(Tw=>{"use strict";Object.defineProperty(Tw,"__esModule",{value:!0});Tw.parsePatch=Lq;function Lq(i){var o=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},a=i.split(/\r\n|[\n\v\f\r\x85]/),c=i.match(/\r\n|[\n\v\f\r\x85]/g)||[],_=[],t=0;function O(){var T={};for(_.push(T);t<a.length;){var B=a[t];if(/^(\-\-\-|\+\+\+|@@)\s/.test(B))break;var H=/^(?:Index:|diff(?: -r \w+)+)\s+(.+?)\s*$/.exec(B);H&&(T.index=H[1]),t++}for(N(T),N(T),T.hunks=[];t<a.length;){var q=a[t];if(/^(Index:|diff|\-\-\-|\+\+\+)\s/.test(q))break;if(/^@@/.test(q))T.hunks.push(M());else{if(q&&o.strict)throw new Error("Unknown line "+(t+1)+" "+JSON.stringify(q));t++}}}function N(T){var B=/^(---|\+\+\+)\s+(.*)$/.exec(a[t]);if(B){var H=B[1]==="---"?"old":"new",q=B[2].split("	",2),ne=q[0].replace(/\\\\/g,"\\");/^".*"$/.test(ne)&&(ne=ne.substr(1,ne.length-2)),T[H+"FileName"]=ne,T[H+"Header"]=(q[1]||"").trim(),t++}}function M(){for(var T=t,B=a[t++],H=B.split(/@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/),q={oldStart:+H[1],oldLines:+H[2]||1,newStart:+H[3],newLines:+H[4]||1,lines:[],linedelimiters:[]},ne=0,m=0;t<a.length&&!(a[t].indexOf("--- ")===0&&t+2<a.length&&a[t+1].indexOf("+++ ")===0&&a[t+2].indexOf("@@")===0);t++){var he=a[t].length==0&&t!=a.length-1?" ":a[t][0];if(he==="+"||he==="-"||he===" "||he==="\\")q.lines.push(a[t]),q.linedelimiters.push(c[t]||`
-`),he==="+"?ne++:he==="-"?m++:he===" "&&(ne++,m++);else break}if(!ne&&q.newLines===1&&(q.newLines=0),!m&&q.oldLines===1&&(q.oldLines=0),o.strict){if(ne!==q.newLines)throw new Error("Added line count did not match for hunk at line "+(T+1));if(m!==q.oldLines)throw new Error("Removed line count did not match for hunk at line "+(T+1))}return q}for(;t<a.length;)O();return _}});var q9=Ke(Cw=>{"use strict";Object.defineProperty(Cw,"__esModule",{value:!0});Cw.default=Nq;function Nq(i,o,a){var c=!0,_=!1,t=!1,O=1;return function N(){if(c&&!t){if(_?O++:c=!1,i+O<=a)return O;t=!0}if(!_)return t||(c=!0),o<=i-O?-O++:(_=!0,N())}}});var G9=Ke(G4=>{"use strict";Object.defineProperty(G4,"__esModule",{value:!0});G4.applyPatch=W9;G4.applyPatches=Fq;var V9=V4(),Iq=Pq(q9());function Pq(i){return i&&i.__esModule?i:{default:i}}function W9(i,o){var a=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{};if(typeof o=="string"&&(o=(0,V9.parsePatch)(o)),Array.isArray(o)){if(o.length>1)throw new Error("applyPatch only works with a single input.");o=o[0]}var c=i.split(/\r\n|[\n\v\f\r\x85]/),_=i.match(/\r\n|[\n\v\f\r\x85]/g)||[],t=o.hunks,O=a.compareLine||function(It,Xt,rt,X){return Xt===X},N=0,M=a.fuzzFactor||0,T=0,B=0,H,q;function ne(It,Xt){for(var rt=0;rt<It.lines.length;rt++){var X=It.lines[rt],de=X.length>0?X[0]:" ",Ce=X.length>0?X.substr(1):X;if(de===" "||de==="-"){if(!O(Xt+1,c[Xt],de,Ce)&&(N++,N>M))return!1;Xt++}}return!0}for(var m=0;m<t.length;m++){for(var he=t[m],De=c.length-he.oldLines,se=0,fe=B+he.oldStart-1,_e=(0,Iq.default)(fe,T,De);se!==void 0;se=_e())if(ne(he,fe+se)){he.offset=B+=se;break}if(se===void 0)return!1;T=he.offset+he.oldStart+he.oldLines}for(var ce=0,me=0;me<t.length;me++){var ie=t[me],Oe=ie.oldStart+ie.offset+ce-1;ce+=ie.newLines-ie.oldLines,Oe<0&&(Oe=0);for(var Ue=0;Ue<ie.lines.length;Ue++){var je=ie.lines[Ue],at=je.length>0?je[0]:" ",Dt=je.length>0?je.substr(1):je,Qe=ie.linedelimiters[Ue];if(at===" ")Oe++;else if(at==="-")c.splice(Oe,1),_.splice(Oe,1);else if(at==="+")c.splice(Oe,0,Dt),_.splice(Oe,0,Qe),Oe++;else if(at==="\\"){var ut=ie.lines[Ue-1]?ie.lines[Ue-1][0]:null;ut==="+"?H=!0:ut==="-"&&(q=!0)}}}if(H)for(;!c[c.length-1];)c.pop(),_.pop();else q&&(c.push(""),_.push(`
-`));for(var Ve=0;Ve<c.length-1;Ve++)c[Ve]=c[Ve]+_[Ve];return c.join("")}function Fq(i,o){typeof i=="string"&&(i=(0,V9.parsePatch)(i));var a=0;function c(){var _=i[a++];if(!_)return o.complete();o.loadFile(_,function(t,O){if(t)return o.complete(t);var N=W9(O,_,o);o.patched(_,N,function(M){if(M)return o.complete(M);c()})})}c()}});var Aw=Ke(e_=>{"use strict";Object.defineProperty(e_,"__esModule",{value:!0});e_.structuredPatch=Y9;e_.createTwoFilesPatch=K9;e_.createPatch=bq;var Bq=H4();function xw(i){return zq(i)||jq(i)||Uq()}function Uq(){throw new TypeError("Invalid attempt to spread non-iterable instance")}function jq(i){if(Symbol.iterator in Object(i)||Object.prototype.toString.call(i)==="[object Arguments]")return Array.from(i)}function zq(i){if(Array.isArray(i)){for(var o=0,a=new Array(i.length);o<i.length;o++)a[o]=i[o];return a}}function Y9(i,o,a,c,_,t,O){O||(O={}),typeof O.context=="undefined"&&(O.context=4);var N=(0,Bq.diffLines)(a,c,O);N.push({value:"",lines:[]});function M(se){return se.map(function(fe){return" "+fe})}for(var T=[],B=0,H=0,q=[],ne=1,m=1,he=function(fe){var _e=N[fe],ce=_e.lines||_e.value.replace(/\n$/,"").split(`
-`);if(_e.lines=ce,_e.added||_e.removed){var me;if(!B){var ie=N[fe-1];B=ne,H=m,ie&&(q=O.context>0?M(ie.lines.slice(-O.context)):[],B-=q.length,H-=q.length)}(me=q).push.apply(me,xw(ce.map(function(Ve){return(_e.added?"+":"-")+Ve}))),_e.added?m+=ce.length:ne+=ce.length}else{if(B)if(ce.length<=O.context*2&&fe<N.length-2){var Oe;(Oe=q).push.apply(Oe,xw(M(ce)))}else{var Ue,je=Math.min(ce.length,O.context);(Ue=q).push.apply(Ue,xw(M(ce.slice(0,je))));var at={oldStart:B,oldLines:ne-B+je,newStart:H,newLines:m-H+je,lines:q};if(fe>=N.length-2&&ce.length<=O.context){var Dt=/\n$/.test(a),Qe=/\n$/.test(c),ut=ce.length==0&&q.length>at.oldLines;!Dt&&ut&&q.splice(at.oldLines,0,"\\ No newline at end of file"),(!Dt&&!ut||!Qe)&&q.push("\\ No newline at end of file")}T.push(at),B=0,H=0,q=[]}ne+=ce.length,m+=ce.length}},De=0;De<N.length;De++)he(De);return{oldFileName:i,newFileName:o,oldHeader:_,newHeader:t,hunks:T}}function K9(i,o,a,c,_,t,O){var N=Y9(i,o,a,c,_,t,O),M=[];i==o&&M.push("Index: "+i),M.push("==================================================================="),M.push("--- "+N.oldFileName+(typeof N.oldHeader=="undefined"?"":"	"+N.oldHeader)),M.push("+++ "+N.newFileName+(typeof N.newHeader=="undefined"?"":"	"+N.newHeader));for(var T=0;T<N.hunks.length;T++){var B=N.hunks[T];M.push("@@ -"+B.oldStart+","+B.oldLines+" +"+B.newStart+","+B.newLines+" @@"),M.push.apply(M,B.lines)}return M.join(`
-`)+`
-`}function bq(i,o,a,c,_,t){return K9(i,i,o,a,c,_,t)}});var Q9=Ke(Y4=>{"use strict";Object.defineProperty(Y4,"__esModule",{value:!0});Y4.arrayEqual=Hq;Y4.arrayStartsWith=X9;function Hq(i,o){return i.length!==o.length?!1:X9(i,o)}function X9(i,o){if(o.length>i.length)return!1;for(var a=0;a<o.length;a++)if(o[a]!==i[a])return!1;return!0}});var lA=Ke(K4=>{"use strict";Object.defineProperty(K4,"__esModule",{value:!0});K4.calcLineCount=J9;K4.merge=qq;var Wq=Aw(),Vq=V4(),Rw=Q9();function sm(i){return Kq(i)||Yq(i)||Gq()}function Gq(){throw new TypeError("Invalid attempt to spread non-iterable instance")}function Yq(i){if(Symbol.iterator in Object(i)||Object.prototype.toString.call(i)==="[object Arguments]")return Array.from(i)}function Kq(i){if(Array.isArray(i)){for(var o=0,a=new Array(i.length);o<i.length;o++)a[o]=i[o];return a}}function J9(i){var o=Ow(i.lines),a=o.oldLines,c=o.newLines;a!==void 0?i.oldLines=a:delete i.oldLines,c!==void 0?i.newLines=c:delete i.newLines}function qq(i,o,a){i=Z9(i,a),o=Z9(o,a);var c={};(i.index||o.index)&&(c.index=i.index||o.index),(i.newFileName||o.newFileName)&&($9(i)?$9(o)?(c.oldFileName=X4(c,i.oldFileName,o.oldFileName),c.newFileName=X4(c,i.newFileName,o.newFileName),c.oldHeader=X4(c,i.oldHeader,o.oldHeader),c.newHeader=X4(c,i.newHeader,o.newHeader)):(c.oldFileName=i.oldFileName,c.newFileName=i.newFileName,c.oldHeader=i.oldHeader,c.newHeader=i.newHeader):(c.oldFileName=o.oldFileName||i.oldFileName,c.newFileName=o.newFileName||i.newFileName,c.oldHeader=o.oldHeader||i.oldHeader,c.newHeader=o.newHeader||i.newHeader)),c.hunks=[];for(var _=0,t=0,O=0,N=0;_<i.hunks.length||t<o.hunks.length;){var M=i.hunks[_]||{oldStart:Infinity},T=o.hunks[t]||{oldStart:Infinity};if(eA(M,T))c.hunks.push(tA(M,O)),_++,N+=M.newLines-M.oldLines;else if(eA(T,M))c.hunks.push(tA(T,N)),t++,O+=T.newLines-T.oldLines;else{var B={oldStart:Math.min(M.oldStart,T.oldStart),oldLines:0,newStart:Math.min(M.newStart+O,T.oldStart+N),newLines:0,lines:[]};Xq(B,M.oldStart,M.lines,T.oldStart,T.lines),t++,_++,c.hunks.push(B)}}return c}function Z9(i,o){if(typeof i=="string"){if(/^@@/m.test(i)||/^Index:/m.test(i))return(0,Vq.parsePatch)(i)[0];if(!o)throw new Error("Must provide a base reference or pass in a patch");return(0,Wq.structuredPatch)(void 0,void 0,o,i)}return i}function $9(i){return i.newFileName&&i.newFileName!==i.oldFileName}function X4(i,o,a){return o===a?o:(i.conflict=!0,{mine:o,theirs:a})}function eA(i,o){return i.oldStart<o.oldStart&&i.oldStart+i.oldLines<o.oldStart}function tA(i,o){return{oldStart:i.oldStart,oldLines:i.oldLines,newStart:i.newStart+o,newLines:i.newLines,lines:i.lines}}function Xq(i,o,a,c,_){var t={offset:o,lines:a,index:0},O={offset:c,lines:_,index:0};for(rA(i,t,O),rA(i,O,t);t.index<t.lines.length&&O.index<O.lines.length;){var N=t.lines[t.index],M=O.lines[O.index];if((N[0]==="-"||N[0]==="+")&&(M[0]==="-"||M[0]==="+"))Qq(i,t,O);else if(N[0]==="+"&&M[0]===" "){var T;(T=i.lines).push.apply(T,sm(ph(t)))}else if(M[0]==="+"&&N[0]===" "){var B;(B=i.lines).push.apply(B,sm(ph(O)))}else N[0]==="-"&&M[0]===" "?nA(i,t,O):M[0]==="-"&&N[0]===" "?nA(i,O,t,!0):N===M?(i.lines.push(N),t.index++,O.index++):Mw(i,ph(t),ph(O))}iA(i,t),iA(i,O),J9(i)}function Qq(i,o,a){var c=ph(o),_=ph(a);if(uA(c)&&uA(_)){if((0,Rw.arrayStartsWith)(c,_)&&oA(a,c,c.length-_.length)){var t;(t=i.lines).push.apply(t,sm(c));return}else if((0,Rw.arrayStartsWith)(_,c)&&oA(o,_,_.length-c.length)){var O;(O=i.lines).push.apply(O,sm(_));return}}else if((0,Rw.arrayEqual)(c,_)){var N;(N=i.lines).push.apply(N,sm(c));return}Mw(i,c,_)}function nA(i,o,a,c){var _=ph(o),t=Jq(a,_);if(t.merged){var O;(O=i.lines).push.apply(O,sm(t.merged))}else Mw(i,c?t:_,c?_:t)}function Mw(i,o,a){i.conflict=!0,i.lines.push({conflict:!0,mine:o,theirs:a})}function rA(i,o,a){for(;o.offset<a.offset&&o.index<o.lines.length;){var c=o.lines[o.index++];i.lines.push(c),o.offset++}}function iA(i,o){for(;o.index<o.lines.length;){var a=o.lines[o.index++];i.lines.push(a)}}function ph(i){for(var o=[],a=i.lines[i.index][0];i.index<i.lines.length;){var c=i.lines[i.index];if(a==="-"&&c[0]==="+"&&(a="+"),a===c[0])o.push(c),i.index++;else break}return o}function Jq(i,o){for(var a=[],c=[],_=0,t=!1,O=!1;_<o.length&&i.index<i.lines.length;){var N=i.lines[i.index],M=o[_];if(M[0]==="+")break;if(t=t||N[0]!==" ",c.push(M),_++,N[0]==="+")for(O=!0;N[0]==="+";)a.push(N),N=i.lines[++i.index];M.substr(1)===N.substr(1)?(a.push(N),i.index++):O=!0}if((o[_]||"")[0]==="+"&&t&&(O=!0),O)return a;for(;_<o.length;)c.push(o[_++]);return{merged:c,changes:a}}function uA(i){return i.reduce(function(o,a){return o&&a[0]==="-"},!0)}function oA(i,o,a){for(var c=0;c<a;c++){var _=o[o.length-a+c].substr(1);if(i.lines[i.index+c]!==" "+_)return!1}return i.index+=a,!0}function Ow(i){var o=0,a=0;return i.forEach(function(c){if(typeof c!="string"){var _=Ow(c.mine),t=Ow(c.theirs);o!==void 0&&(_.oldLines===t.oldLines?o+=_.oldLines:o=void 0),a!==void 0&&(_.newLines===t.newLines?a+=_.newLines:a=void 0)}else a!==void 0&&(c[0]==="+"||c[0]===" ")&&a++,o!==void 0&&(c[0]==="-"||c[0]===" ")&&o++}),{oldLines:o,newLines:a}}});var sA=Ke(kw=>{"use strict";Object.defineProperty(kw,"__esModule",{value:!0});kw.convertChangesToDMP=Zq;function Zq(i){for(var o=[],a,c,_=0;_<i.length;_++)a=i[_],a.added?c=1:a.removed?c=-1:c=0,o.push([c,a.value]);return o}});var aA=Ke(Lw=>{"use strict";Object.defineProperty(Lw,"__esModule",{value:!0});Lw.convertChangesToXML=$q;function $q(i){for(var o=[],a=0;a<i.length;a++){var c=i[a];c.added?o.push("<ins>"):c.removed&&o.push("<del>"),o.push(eW(c.value)),c.added?o.push("</ins>"):c.removed&&o.push("</del>")}return o.join("")}function eW(i){var o=i;return o=o.replace(/&/g,"&amp;"),o=o.replace(/</g,"&lt;"),o=o.replace(/>/g,"&gt;"),o=o.replace(/"/g,"&quot;"),o}});var hA=Ke(G0=>{"use strict";Object.defineProperty(G0,"__esModule",{value:!0});Object.defineProperty(G0,"Diff",{enumerable:!0,get:function(){return tW.default}});Object.defineProperty(G0,"diffChars",{enumerable:!0,get:function(){return nW.diffChars}});Object.defineProperty(G0,"diffWords",{enumerable:!0,get:function(){return fA.diffWords}});Object.defineProperty(G0,"diffWordsWithSpace",{enumerable:!0,get:function(){return fA.diffWordsWithSpace}});Object.defineProperty(G0,"diffLines",{enumerable:!0,get:function(){return cA.diffLines}});Object.defineProperty(G0,"diffTrimmedLines",{enumerable:!0,get:function(){return cA.diffTrimmedLines}});Object.defineProperty(G0,"diffSentences",{enumerable:!0,get:function(){return rW.diffSentences}});Object.defineProperty(G0,"diffCss",{enumerable:!0,get:function(){return iW.diffCss}});Object.defineProperty(G0,"diffJson",{enumerable:!0,get:function(){return dA.diffJson}});Object.defineProperty(G0,"canonicalize",{enumerable:!0,get:function(){return dA.canonicalize}});Object.defineProperty(G0,"diffArrays",{enumerable:!0,get:function(){return uW.diffArrays}});Object.defineProperty(G0,"applyPatch",{enumerable:!0,get:function(){return pA.applyPatch}});Object.defineProperty(G0,"applyPatches",{enumerable:!0,get:function(){return pA.applyPatches}});Object.defineProperty(G0,"parsePatch",{enumerable:!0,get:function(){return oW.parsePatch}});Object.defineProperty(G0,"merge",{enumerable:!0,get:function(){return lW.merge}});Object.defineProperty(G0,"structuredPatch",{enumerable:!0,get:function(){return Nw.structuredPatch}});Object.defineProperty(G0,"createTwoFilesPatch",{enumerable:!0,get:function(){return Nw.createTwoFilesPatch}});Object.defineProperty(G0,"createPatch",{enumerable:!0,get:function(){return Nw.createPatch}});Object.defineProperty(G0,"convertChangesToDMP",{enumerable:!0,get:function(){return sW.convertChangesToDMP}});Object.defineProperty(G0,"convertChangesToXML",{enumerable:!0,get:function(){return aW.convertChangesToXML}});var tW=fW(nd()),nW=F9(),fA=b9(),cA=H4(),rW=B9(),iW=U9(),dA=z9(),uW=H9(),pA=G9(),oW=V4(),lW=lA(),Nw=Aw(),sW=sA(),aW=aA();function fW(i){return i&&i.__esModule?i:{default:i}}});var dW={};uI(dW,{default:()=>hW});var C9=ou(require("@yarnpkg/cli")),ch=ou(require("@yarnpkg/core"));var i5=ou(sc()),lh=ou(ki()),C4=(0,lh.memo)(({active:i})=>{let o=(0,lh.useMemo)(()=>i?"\u25C9":"\u25EF",[i]),a=(0,lh.useMemo)(()=>i?"green":"yellow",[i]);return lh.default.createElement(i5.Text,{color:a},o)});var y2=ou(sc()),ra=ou(ki());var u5=ou(sc()),x4=ou(ki());function g2({active:i},o,a){let{stdin:c}=(0,u5.useStdin)(),_=(0,x4.useCallback)((t,O)=>o(t,O),a);(0,x4.useEffect)(()=>{if(!(!i||!c))return c.on("keypress",_),()=>{c.off("keypress",_)}},[i,_,c])}var A4;(function(a){a.BEFORE="before",a.AFTER="after"})(A4||(A4={}));var o5=function({active:i},o,a){g2({active:i},(c,_)=>{_.name==="tab"&&(_.shift?o(A4.BEFORE):o(A4.AFTER))},a)};var R4=function(i,o,{active:a,minus:c,plus:_,set:t,loop:O=!0}){g2({active:a},(N,M)=>{let T=o.indexOf(i);switch(M.name){case c:{let B=T-1;if(O){t(o[(o.length+B)%o.length]);return}if(B<0)return;t(o[B])}break;case _:{let B=T+1;if(O){t(o[B%o.length]);return}if(B>=o.length)return;t(o[B])}break}},[o,i,_,t,O])};var O4=({active:i=!0,children:o=[],radius:a=10,size:c=1,loop:_=!0,onFocusRequest:t,willReachEnd:O})=>{let N=De=>{if(De.key===null)throw new Error("Expected all children to have a key");return De.key},M=ra.default.Children.map(o,De=>N(De)),T=M[0],[B,H]=(0,ra.useState)(T),q=M.indexOf(B);(0,ra.useEffect)(()=>{M.includes(B)||H(T)},[o]),(0,ra.useEffect)(()=>{O&&q>=M.length-2&&O()},[q]),o5({active:i&&!!t},De=>{t==null||t(De)},[t]),R4(B,M,{active:i,minus:"up",plus:"down",set:H,loop:_});let ne=q-a,m=q+a;m>M.length&&(ne-=m-M.length,m=M.length),ne<0&&(m+=-ne,ne=0),m>=M.length&&(m=M.length-1);let he=[];for(let De=ne;De<=m;++De){let se=M[De],fe=i&&se===B;he.push(ra.default.createElement(y2.Box,{key:se,height:c},ra.default.createElement(y2.Box,{marginLeft:1,marginRight:1},ra.default.createElement(y2.Text,null,fe?ra.default.createElement(y2.Text,{color:"cyan",bold:!0},">"):" ")),ra.default.createElement(y2.Box,null,ra.default.cloneElement(o[De],{active:fe}))))}return ra.default.createElement(y2.Box,{flexDirection:"column",width:"100%"},he)};var M4=ou(ki());var l5=ou(sc()),td=ou(ki()),s5=ou(require("readline")),Z3=td.default.createContext(null),a5=({children:i})=>{let{stdin:o,setRawMode:a}=(0,l5.useStdin)();(0,td.useEffect)(()=>{a&&a(!0),o&&(0,s5.emitKeypressEvents)(o)},[o,a]);let[c,_]=(0,td.useState)(new Map),t=(0,td.useMemo)(()=>({getAll:()=>c,get:O=>c.get(O),set:(O,N)=>_(new Map([...c,[O,N]]))}),[c,_]);return td.default.createElement(Z3.Provider,{value:t,children:i})};function sh(i,o){let a=(0,M4.useContext)(Z3);if(a===null)throw new Error("Expected this hook to run with a ministore context attached");if(typeof i=="undefined")return a.getAll();let c=(0,M4.useCallback)(t=>{a.set(i,t)},[i,a.set]),_=a.get(i);return typeof _=="undefined"&&(_=o),[_,c]}var k4=ou(sc()),$3=ou(ki());async function L4(i,o){let a,c=t=>{let{exit:O}=(0,k4.useApp)();g2({active:!0},(N,M)=>{M.name==="return"&&(a=t,O())},[O,t])},{waitUntilExit:_}=(0,k4.render)($3.default.createElement(a5,null,$3.default.createElement(i,Zr(Ht({},o),{useSubmit:c}))));return await _(),a}var x9=ou(require("clipanion")),A9=ou(p5()),or=ou(sc()),En=ou(ki());var T9=ou(S9()),gw={appId:"OFCNCOG2CU",apiKey:"6fe4476ee5a1832882e326b506d14126",indexName:"npm-search"},nq=(0,T9.default)(gw.appId,gw.apiKey).initIndex(gw.indexName),yw=async(i,o=0)=>await nq.search(i,{analyticsTags:["yarn-plugin-interactive-tools"],attributesToRetrieve:["name","version","owner","repository","humanDownloadsLast30Days"],page:o,hitsPerPage:10});var Vy=["regular","dev","peer"],Gy=class extends C9.BaseCommand{async execute(){let o=await ch.Configuration.find(this.context.cwd,this.context.plugins),a=()=>En.default.createElement(or.Box,{flexDirection:"row"},En.default.createElement(or.Box,{flexDirection:"column",width:48},En.default.createElement(or.Box,null,En.default.createElement(or.Text,null,"Press ",En.default.createElement(or.Text,{bold:!0,color:"cyanBright"},"<up>"),"/",En.default.createElement(or.Text,{bold:!0,color:"cyanBright"},"<down>")," to move between packages.")),En.default.createElement(or.Box,null,En.default.createElement(or.Text,null,"Press ",En.default.createElement(or.Text,{bold:!0,color:"cyanBright"},"<space>")," to select a package.")),En.default.createElement(or.Box,null,En.default.createElement(or.Text,null,"Press ",En.default.createElement(or.Text,{bold:!0,color:"cyanBright"},"<space>")," again to change the target."))),En.default.createElement(or.Box,{flexDirection:"column"},En.default.createElement(or.Box,{marginLeft:1},En.default.createElement(or.Text,null,"Press ",En.default.createElement(or.Text,{bold:!0,color:"cyanBright"},"<enter>")," to install the selected packages.")),En.default.createElement(or.Box,{marginLeft:1},En.default.createElement(or.Text,null,"Press ",En.default.createElement(or.Text,{bold:!0,color:"cyanBright"},"<ctrl+c>")," to abort.")))),c=()=>En.default.createElement(En.default.Fragment,null,En.default.createElement(or.Box,{width:15},En.default.createElement(or.Text,{bold:!0,underline:!0,color:"gray"},"Owner")),En.default.createElement(or.Box,{width:11},En.default.createElement(or.Text,{bold:!0,underline:!0,color:"gray"},"Version")),En.default.createElement(or.Box,{width:10},En.default.createElement(or.Text,{bold:!0,underline:!0,color:"gray"},"Downloads"))),_=()=>En.default.createElement(or.Box,{width:17},En.default.createElement(or.Text,{bold:!0,underline:!0,color:"gray"},"Target")),t=({hit:ne,active:m})=>{let[he,De]=sh(ne.name,null);g2({active:m},(_e,ce)=>{if(ce.name!=="space")return;if(!he){De(Vy[0]);return}let me=Vy.indexOf(he)+1;me===Vy.length?De(null):De(Vy[me])},[he,De]);let se=ch.structUtils.parseIdent(ne.name),fe=ch.structUtils.prettyIdent(o,se);return En.default.createElement(or.Box,null,En.default.createElement(or.Box,{width:45},En.default.createElement(or.Text,{bold:!0,wrap:"wrap"},fe)),En.default.createElement(or.Box,{width:14,marginLeft:1},En.default.createElement(or.Text,{bold:!0,wrap:"truncate"},ne.owner.name)),En.default.createElement(or.Box,{width:10,marginLeft:1},En.default.createElement(or.Text,{italic:!0,wrap:"truncate"},ne.version)),En.default.createElement(or.Box,{width:16,marginLeft:1},En.default.createElement(or.Text,null,ne.humanDownloadsLast30Days)))},O=({name:ne,active:m})=>{let[he]=sh(ne,null),De=ch.structUtils.parseIdent(ne);return En.default.createElement(or.Box,null,En.default.createElement(or.Box,{width:47},En.default.createElement(or.Text,{bold:!0}," - ",ch.structUtils.prettyIdent(o,De))),Vy.map(se=>En.default.createElement(or.Box,{key:se,width:14,marginLeft:1},En.default.createElement(or.Text,null," ",En.default.createElement(C4,{active:he===se})," ",En.default.createElement(or.Text,{bold:!0},se)))))},N=()=>En.default.createElement(or.Box,{marginTop:1},En.default.createElement(or.Text,null,"Powered by Algolia.")),T=await L4(({useSubmit:ne})=>{let m=sh();ne(m);let he=Array.from(m.keys()).filter(je=>m.get(je)!==null),[De,se]=(0,En.useState)(""),[fe,_e]=(0,En.useState)(0),[ce,me]=(0,En.useState)([]),ie=je=>{je.match(/\t| /)||se(je)},Oe=async()=>{_e(0);let je=await yw(De);je.query===De&&me(je.hits)},Ue=async()=>{let je=await yw(De,fe+1);je.query===De&&je.page-1===fe&&(_e(je.page),me([...ce,...je.hits]))};return(0,En.useEffect)(()=>{De?Oe():me([])},[De]),En.default.createElement(or.Box,{flexDirection:"column"},En.default.createElement(a,null),En.default.createElement(or.Box,{flexDirection:"row",marginTop:1},En.default.createElement(or.Text,{bold:!0},"Search: "),En.default.createElement(or.Box,{width:41},En.default.createElement(A9.default,{value:De,onChange:ie,placeholder:"i.e. babel, webpack, react...",showCursor:!1})),En.default.createElement(c,null)),ce.length?En.default.createElement(O4,{radius:2,loop:!1,children:ce.map(je=>En.default.createElement(t,{key:je.name,hit:je,active:!1})),willReachEnd:Ue}):En.default.createElement(or.Text,{color:"gray"},"Start typing..."),En.default.createElement(or.Box,{flexDirection:"row",marginTop:1},En.default.createElement(or.Box,{width:49},En.default.createElement(or.Text,{bold:!0},"Selected:")),En.default.createElement(_,null)),he.length?he.map(je=>En.default.createElement(O,{key:je,name:je,active:!1})):En.default.createElement(or.Text,{color:"gray"},"No selected packages..."),En.default.createElement(N,null))},{});if(typeof T=="undefined")return 1;let B=Array.from(T.keys()).filter(ne=>T.get(ne)==="regular"),H=Array.from(T.keys()).filter(ne=>T.get(ne)==="dev"),q=Array.from(T.keys()).filter(ne=>T.get(ne)==="peer");return B.length&&await this.cli.run(["add",...B]),H.length&&await this.cli.run(["add","--dev",...H]),q&&await this.cli.run(["add","--peer",...q]),0}};Gy.paths=[["search"]],Gy.usage=x9.Command.Usage({category:"Interactive commands",description:"open the search interface",details:`
-    This command opens a fullscreen terminal interface where you can search for and install packages from the npm registry.
-    `,examples:[["Open the search window","yarn search"]]});var R9=Gy;var Q4=ou(require("@yarnpkg/cli")),Ao=ou(require("@yarnpkg/core"));var Yy=ou(sc()),E2=ou(ki());var O9=ou(sc()),M9=ou(ki()),j4=({length:i,active:o})=>{if(i===0)return null;let a=i>1?` ${"-".repeat(i-1)}`:" ";return M9.default.createElement(O9.Text,{dimColor:!o},a)};var k9=function({active:i,skewer:o,options:a,value:c,onChange:_,sizes:t=[]}){let O=a.filter(({label:M})=>!!M).map(({value:M})=>M),N=a.findIndex(M=>M.value===c&&M.label!="");return R4(c,O,{active:i,minus:"left",plus:"right",set:_}),E2.default.createElement(E2.default.Fragment,null,a.map(({label:M},T)=>{let B=T===N,H=t[T]-1||0,q=M.replace(/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,""),ne=Math.max(0,H-q.length-2);return M?E2.default.createElement(Yy.Box,{key:M,width:H,marginLeft:1},E2.default.createElement(Yy.Text,{wrap:"truncate"},E2.default.createElement(C4,{active:B})," ",M),o?E2.default.createElement(j4,{active:i,length:ne}):null):E2.default.createElement(Yy.Box,{key:`spacer-${T}`,width:H,marginLeft:1})}))};var vA=ou(require("@yarnpkg/plugin-essentials")),mA=ou(require("clipanion")),gA=ou(hA()),xi=ou(sc()),gr=ou(ki()),yA=ou(require("semver")),_A=/^((?:[\^~]|>=?)?)([0-9]+)(\.[0-9]+)(\.[0-9]+)((?:-\S+)?)$/,cW=10,t_=class extends Q4.BaseCommand{async execute(){let o=await Ao.Configuration.find(this.context.cwd,this.context.plugins),{project:a,workspace:c}=await Ao.Project.find(o,this.context.cwd),_=await Ao.Cache.find(o);if(!c)throw new Q4.WorkspaceRequiredError(a.cwd,this.context.cwd);await a.restoreInstallState({restoreResolutions:!1});let t=(se,fe)=>{let _e=(0,gA.diffWords)(se,fe),ce="";for(let me of _e)me.added?ce+=Ao.formatUtils.pretty(o,me.value,"green"):me.removed||(ce+=me.value);return ce},O=(se,fe)=>{if(se===fe)return fe;let _e=Ao.structUtils.parseRange(se),ce=Ao.structUtils.parseRange(fe),me=_e.selector.match(_A),ie=ce.selector.match(_A);if(!me||!ie)return t(se,fe);let Oe=["gray","red","yellow","green","magenta"],Ue=null,je="";for(let at=1;at<Oe.length;++at)Ue!==null||me[at]!==ie[at]?(Ue===null&&(Ue=Oe[at-1]),je+=Ao.formatUtils.pretty(o,ie[at],Ue)):je+=ie[at];return je},N=async(se,fe,_e)=>{let ce=await vA.suggestUtils.fetchDescriptorFrom(se,_e,{project:a,cache:_,preserveModifier:fe,workspace:c});return ce!==null?ce.range:se.range},M=async se=>{let fe=yA.default.valid(se.range)?`^${se.range}`:se.range,[_e,ce]=await Promise.all([N(se,se.range,fe).catch(()=>null),N(se,se.range,"latest").catch(()=>null)]),me=[{value:null,label:se.range}];return _e&&_e!==se.range?me.push({value:_e,label:O(se.range,_e)}):me.push({value:null,label:""}),ce&&ce!==_e&&ce!==se.range?me.push({value:ce,label:O(se.range,ce)}):me.push({value:null,label:""}),me},T=()=>gr.default.createElement(xi.Box,{flexDirection:"row"},gr.default.createElement(xi.Box,{flexDirection:"column",width:49},gr.default.createElement(xi.Box,{marginLeft:1},gr.default.createElement(xi.Text,null,"Press ",gr.default.createElement(xi.Text,{bold:!0,color:"cyanBright"},"<up>"),"/",gr.default.createElement(xi.Text,{bold:!0,color:"cyanBright"},"<down>")," to select packages.")),gr.default.createElement(xi.Box,{marginLeft:1},gr.default.createElement(xi.Text,null,"Press ",gr.default.createElement(xi.Text,{bold:!0,color:"cyanBright"},"<left>"),"/",gr.default.createElement(xi.Text,{bold:!0,color:"cyanBright"},"<right>")," to select versions."))),gr.default.createElement(xi.Box,{flexDirection:"column"},gr.default.createElement(xi.Box,{marginLeft:1},gr.default.createElement(xi.Text,null,"Press ",gr.default.createElement(xi.Text,{bold:!0,color:"cyanBright"},"<enter>")," to install.")),gr.default.createElement(xi.Box,{marginLeft:1},gr.default.createElement(xi.Text,null,"Press ",gr.default.createElement(xi.Text,{bold:!0,color:"cyanBright"},"<ctrl+c>")," to abort.")))),B=()=>gr.default.createElement(xi.Box,{flexDirection:"row",paddingTop:1,paddingBottom:1},gr.default.createElement(xi.Box,{width:50},gr.default.createElement(xi.Text,{bold:!0},gr.default.createElement(xi.Text,{color:"greenBright"},"?")," Pick the packages you want to upgrade.")),gr.default.createElement(xi.Box,{width:17},gr.default.createElement(xi.Text,{bold:!0,underline:!0,color:"gray"},"Current")),gr.default.createElement(xi.Box,{width:17},gr.default.createElement(xi.Text,{bold:!0,underline:!0,color:"gray"},"Range")),gr.default.createElement(xi.Box,{width:17},gr.default.createElement(xi.Text,{bold:!0,underline:!0,color:"gray"},"Latest"))),H=({active:se,descriptor:fe,suggestions:_e})=>{let[ce,me]=sh(fe.descriptorHash,null),ie=Ao.structUtils.stringifyIdent(fe),Oe=Math.max(0,45-ie.length);return gr.default.createElement(gr.default.Fragment,null,gr.default.createElement(xi.Box,null,gr.default.createElement(xi.Box,{width:45},gr.default.createElement(xi.Text,{bold:!0},Ao.structUtils.prettyIdent(o,fe)),gr.default.createElement(j4,{active:se,length:Oe})),_e!==null?gr.default.createElement(k9,{active:se,options:_e,value:ce,skewer:!0,onChange:me,sizes:[17,17,17]}):gr.default.createElement(xi.Box,{marginLeft:2},gr.default.createElement(xi.Text,{color:"gray"},"Fetching suggestions..."))))},q=({dependencies:se})=>{let[fe,_e]=(0,gr.useState)(null),ce=(0,gr.useRef)(!0);return(0,gr.useEffect)(()=>()=>{ce.current=!1}),(0,gr.useEffect)(()=>{Promise.all(se.map(me=>M(me))).then(me=>{let ie=se.map((Oe,Ue)=>{let je=me[Ue];return[Oe,je]}).filter(([Oe,Ue])=>Ue.filter(je=>je.label!=="").length>1);ce.current&&_e(ie)})},[]),fe?fe.length?gr.default.createElement(O4,{radius:cW,children:fe.map(([me,ie])=>gr.default.createElement(H,{key:me.descriptorHash,active:!1,descriptor:me,suggestions:ie}))}):gr.default.createElement(xi.Text,null,"No upgrades found"):gr.default.createElement(xi.Text,null,"Fetching suggestions...")},m=await L4(({useSubmit:se})=>{se(sh());let fe=new Map;for(let ce of a.workspaces)for(let me of["dependencies","devDependencies"])for(let ie of ce.manifest[me].values())a.tryWorkspaceByDescriptor(ie)===null&&fe.set(ie.descriptorHash,ie);let _e=Ao.miscUtils.sortMap(fe.values(),ce=>Ao.structUtils.stringifyDescriptor(ce));return gr.default.createElement(xi.Box,{flexDirection:"column"},gr.default.createElement(T,null),gr.default.createElement(B,null),gr.default.createElement(q,{dependencies:_e}))},{});if(typeof m=="undefined")return 1;let he=!1;for(let se of a.workspaces)for(let fe of["dependencies","devDependencies"]){let _e=se.manifest[fe];for(let ce of _e.values()){let me=m.get(ce.descriptorHash);typeof me!="undefined"&&me!==null&&(_e.set(ce.identHash,Ao.structUtils.makeDescriptor(ce,me)),he=!0)}}return he?(await Ao.StreamReport.start({configuration:o,stdout:this.context.stdout,includeLogs:!this.context.quiet},async se=>{await a.install({cache:_,report:se})})).exitCode():0}};t_.paths=[["upgrade-interactive"]],t_.usage=mA.Command.Usage({category:"Interactive commands",description:"open the upgrade interface",details:`
-      This command opens a fullscreen terminal interface where you can see any out of date packages used by your application, their status compared to the latest versions available on the remote registry, and select packages to upgrade.
-    `,examples:[["Open the upgrade window","yarn upgrade-interactive"]]});var EA=t_;var pW={commands:[R9,EA]},hW=pW;return dW;})();
-/*
-object-assign
-(c) Sindre Sorhus
-@license MIT
-*/
-/**
- * @license
- * Lodash <https://lodash.com/>
- * Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
- * Released under MIT license <https://lodash.com/license>
- * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
- * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
- */
-/** @license React v0.0.0-experimental-51a3aa6af
- * react-debug-tools.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-/** @license React v0.0.0-experimental-51a3aa6af
- * react-is.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-/** @license React v0.0.0-experimental-51a3aa6af
- * react.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-/** @license React v0.18.0
- * scheduler-tracing.development.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-/** @license React v0.18.0
- * scheduler-tracing.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-/** @license React v0.18.0
- * scheduler.development.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-/** @license React v0.18.0
- * scheduler.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-/** @license React v0.24.0
- * react-reconciler.development.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-/** @license React v0.24.0
- * react-reconciler.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-/** @license React v16.13.1
- * react.development.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-/** @license React v16.13.1
- * react.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-return plugin;
-}
-};
diff --git a/.yarn/plugins/@yarnpkg/plugin-typescript.cjs b/.yarn/plugins/@yarnpkg/plugin-typescript.cjs
deleted file mode 100644
index 5c1859e0b90d1..0000000000000
--- a/.yarn/plugins/@yarnpkg/plugin-typescript.cjs
+++ /dev/null
@@ -1,9 +0,0 @@
-/* eslint-disable */
-//prettier-ignore
-module.exports = {
-name: "@yarnpkg/plugin-typescript",
-factory: function (require) {
-var plugin=(()=>{var Ft=Object.create,H=Object.defineProperty,Bt=Object.defineProperties,Kt=Object.getOwnPropertyDescriptor,zt=Object.getOwnPropertyDescriptors,Gt=Object.getOwnPropertyNames,Q=Object.getOwnPropertySymbols,$t=Object.getPrototypeOf,ne=Object.prototype.hasOwnProperty,De=Object.prototype.propertyIsEnumerable;var Re=(e,t,r)=>t in e?H(e,t,{enumerable:!0,configurable:!0,writable:!0,value:r}):e[t]=r,u=(e,t)=>{for(var r in t||(t={}))ne.call(t,r)&&Re(e,r,t[r]);if(Q)for(var r of Q(t))De.call(t,r)&&Re(e,r,t[r]);return e},g=(e,t)=>Bt(e,zt(t)),Lt=e=>H(e,"__esModule",{value:!0});var R=(e,t)=>{var r={};for(var s in e)ne.call(e,s)&&t.indexOf(s)<0&&(r[s]=e[s]);if(e!=null&&Q)for(var s of Q(e))t.indexOf(s)<0&&De.call(e,s)&&(r[s]=e[s]);return r};var I=(e,t)=>()=>(t||e((t={exports:{}}).exports,t),t.exports),Vt=(e,t)=>{for(var r in t)H(e,r,{get:t[r],enumerable:!0})},Qt=(e,t,r)=>{if(t&&typeof t=="object"||typeof t=="function")for(let s of Gt(t))!ne.call(e,s)&&s!=="default"&&H(e,s,{get:()=>t[s],enumerable:!(r=Kt(t,s))||r.enumerable});return e},C=e=>Qt(Lt(H(e!=null?Ft($t(e)):{},"default",e&&e.__esModule&&"default"in e?{get:()=>e.default,enumerable:!0}:{value:e,enumerable:!0})),e);var xe=I(J=>{"use strict";Object.defineProperty(J,"__esModule",{value:!0});function _(e){let t=[...e.caches],r=t.shift();return r===void 0?ve():{get(s,n,a={miss:()=>Promise.resolve()}){return r.get(s,n,a).catch(()=>_({caches:t}).get(s,n,a))},set(s,n){return r.set(s,n).catch(()=>_({caches:t}).set(s,n))},delete(s){return r.delete(s).catch(()=>_({caches:t}).delete(s))},clear(){return r.clear().catch(()=>_({caches:t}).clear())}}}function ve(){return{get(e,t,r={miss:()=>Promise.resolve()}){return t().then(n=>Promise.all([n,r.miss(n)])).then(([n])=>n)},set(e,t){return Promise.resolve(t)},delete(e){return Promise.resolve()},clear(){return Promise.resolve()}}}J.createFallbackableCache=_;J.createNullCache=ve});var Ee=I(($s,qe)=>{qe.exports=xe()});var Te=I(ae=>{"use strict";Object.defineProperty(ae,"__esModule",{value:!0});function Jt(e={serializable:!0}){let t={};return{get(r,s,n={miss:()=>Promise.resolve()}){let a=JSON.stringify(r);if(a in t)return Promise.resolve(e.serializable?JSON.parse(t[a]):t[a]);let o=s(),d=n&&n.miss||(()=>Promise.resolve());return o.then(y=>d(y)).then(()=>o)},set(r,s){return t[JSON.stringify(r)]=e.serializable?JSON.stringify(s):s,Promise.resolve(s)},delete(r){return delete t[JSON.stringify(r)],Promise.resolve()},clear(){return t={},Promise.resolve()}}}ae.createInMemoryCache=Jt});var we=I((Vs,Me)=>{Me.exports=Te()});var Ce=I(M=>{"use strict";Object.defineProperty(M,"__esModule",{value:!0});function Xt(e,t,r){let s={"x-algolia-api-key":r,"x-algolia-application-id":t};return{headers(){return e===oe.WithinHeaders?s:{}},queryParameters(){return e===oe.WithinQueryParameters?s:{}}}}function Yt(e){let t=0,r=()=>(t++,new Promise(s=>{setTimeout(()=>{s(e(r))},Math.min(100*t,1e3))}));return e(r)}function ke(e,t=(r,s)=>Promise.resolve()){return Object.assign(e,{wait(r){return ke(e.then(s=>Promise.all([t(s,r),s])).then(s=>s[1]))}})}function Zt(e){let t=e.length-1;for(t;t>0;t--){let r=Math.floor(Math.random()*(t+1)),s=e[t];e[t]=e[r],e[r]=s}return e}function er(e,t){return Object.keys(t!==void 0?t:{}).forEach(r=>{e[r]=t[r](e)}),e}function tr(e,...t){let r=0;return e.replace(/%s/g,()=>encodeURIComponent(t[r++]))}var rr="4.2.0",sr=e=>()=>e.transporter.requester.destroy(),oe={WithinQueryParameters:0,WithinHeaders:1};M.AuthMode=oe;M.addMethods=er;M.createAuth=Xt;M.createRetryablePromise=Yt;M.createWaitablePromise=ke;M.destroy=sr;M.encode=tr;M.shuffle=Zt;M.version=rr});var F=I((Js,Ue)=>{Ue.exports=Ce()});var Ne=I(ie=>{"use strict";Object.defineProperty(ie,"__esModule",{value:!0});var nr={Delete:"DELETE",Get:"GET",Post:"POST",Put:"PUT"};ie.MethodEnum=nr});var B=I((Ys,We)=>{We.exports=Ne()});var Ze=I(A=>{"use strict";Object.defineProperty(A,"__esModule",{value:!0});var He=B();function ce(e,t){let r=e||{},s=r.data||{};return Object.keys(r).forEach(n=>{["timeout","headers","queryParameters","data","cacheable"].indexOf(n)===-1&&(s[n]=r[n])}),{data:Object.entries(s).length>0?s:void 0,timeout:r.timeout||t,headers:r.headers||{},queryParameters:r.queryParameters||{},cacheable:r.cacheable}}var X={Read:1,Write:2,Any:3},U={Up:1,Down:2,Timeouted:3},_e=2*60*1e3;function ue(e,t=U.Up){return g(u({},e),{status:t,lastUpdate:Date.now()})}function Fe(e){return e.status===U.Up||Date.now()-e.lastUpdate>_e}function Be(e){return e.status===U.Timeouted&&Date.now()-e.lastUpdate<=_e}function le(e){return{protocol:e.protocol||"https",url:e.url,accept:e.accept||X.Any}}function ar(e,t){return Promise.all(t.map(r=>e.get(r,()=>Promise.resolve(ue(r))))).then(r=>{let s=r.filter(d=>Fe(d)),n=r.filter(d=>Be(d)),a=[...s,...n],o=a.length>0?a.map(d=>le(d)):t;return{getTimeout(d,y){return(n.length===0&&d===0?1:n.length+3+d)*y},statelessHosts:o}})}var or=({isTimedOut:e,status:t})=>!e&&~~t==0,ir=e=>{let t=e.status;return e.isTimedOut||or(e)||~~(t/100)!=2&&~~(t/100)!=4},cr=({status:e})=>~~(e/100)==2,ur=(e,t)=>ir(e)?t.onRetry(e):cr(e)?t.onSucess(e):t.onFail(e);function Qe(e,t,r,s){let n=[],a=$e(r,s),o=Le(e,s),d=r.method,y=r.method!==He.MethodEnum.Get?{}:u(u({},r.data),s.data),b=u(u(u({"x-algolia-agent":e.userAgent.value},e.queryParameters),y),s.queryParameters),f=0,p=(h,S)=>{let O=h.pop();if(O===void 0)throw Ve(de(n));let P={data:a,headers:o,method:d,url:Ge(O,r.path,b),connectTimeout:S(f,e.timeouts.connect),responseTimeout:S(f,s.timeout)},x=j=>{let T={request:P,response:j,host:O,triesLeft:h.length};return n.push(T),T},v={onSucess:j=>Ke(j),onRetry(j){let T=x(j);return j.isTimedOut&&f++,Promise.all([e.logger.info("Retryable failure",pe(T)),e.hostsCache.set(O,ue(O,j.isTimedOut?U.Timeouted:U.Down))]).then(()=>p(h,S))},onFail(j){throw x(j),ze(j,de(n))}};return e.requester.send(P).then(j=>ur(j,v))};return ar(e.hostsCache,t).then(h=>p([...h.statelessHosts].reverse(),h.getTimeout))}function lr(e){let{hostsCache:t,logger:r,requester:s,requestsCache:n,responsesCache:a,timeouts:o,userAgent:d,hosts:y,queryParameters:b,headers:f}=e,p={hostsCache:t,logger:r,requester:s,requestsCache:n,responsesCache:a,timeouts:o,userAgent:d,headers:f,queryParameters:b,hosts:y.map(h=>le(h)),read(h,S){let O=ce(S,p.timeouts.read),P=()=>Qe(p,p.hosts.filter(j=>(j.accept&X.Read)!=0),h,O);if((O.cacheable!==void 0?O.cacheable:h.cacheable)!==!0)return P();let v={request:h,mappedRequestOptions:O,transporter:{queryParameters:p.queryParameters,headers:p.headers}};return p.responsesCache.get(v,()=>p.requestsCache.get(v,()=>p.requestsCache.set(v,P()).then(j=>Promise.all([p.requestsCache.delete(v),j]),j=>Promise.all([p.requestsCache.delete(v),Promise.reject(j)])).then(([j,T])=>T)),{miss:j=>p.responsesCache.set(v,j)})},write(h,S){return Qe(p,p.hosts.filter(O=>(O.accept&X.Write)!=0),h,ce(S,p.timeouts.write))}};return p}function dr(e){let t={value:`Algolia for JavaScript (${e})`,add(r){let s=`; ${r.segment}${r.version!==void 0?` (${r.version})`:""}`;return t.value.indexOf(s)===-1&&(t.value=`${t.value}${s}`),t}};return t}function Ke(e){try{return JSON.parse(e.content)}catch(t){throw Je(t.message,e)}}function ze({content:e,status:t},r){let s=e;try{s=JSON.parse(e).message}catch(n){}return Xe(s,t,r)}function pr(e,...t){let r=0;return e.replace(/%s/g,()=>encodeURIComponent(t[r++]))}function Ge(e,t,r){let s=Ye(r),n=`${e.protocol}://${e.url}/${t.charAt(0)==="/"?t.substr(1):t}`;return s.length&&(n+=`?${s}`),n}function Ye(e){let t=r=>Object.prototype.toString.call(r)==="[object Object]"||Object.prototype.toString.call(r)==="[object Array]";return Object.keys(e).map(r=>pr("%s=%s",r,t(e[r])?JSON.stringify(e[r]):e[r])).join("&")}function $e(e,t){if(e.method===He.MethodEnum.Get||e.data===void 0&&t.data===void 0)return;let r=Array.isArray(e.data)?e.data:u(u({},e.data),t.data);return JSON.stringify(r)}function Le(e,t){let r=u(u({},e.headers),t.headers),s={};return Object.keys(r).forEach(n=>{let a=r[n];s[n.toLowerCase()]=a}),s}function de(e){return e.map(t=>pe(t))}function pe(e){let t=e.request.headers["x-algolia-api-key"]?{"x-algolia-api-key":"*****"}:{};return g(u({},e),{request:g(u({},e.request),{headers:u(u({},e.request.headers),t)})})}function Xe(e,t,r){return{name:"ApiError",message:e,status:t,transporterStackTrace:r}}function Je(e,t){return{name:"DeserializationError",message:e,response:t}}function Ve(e){return{name:"RetryError",message:"Unreachable hosts - your application id may be incorrect. If the error persists, contact support@algolia.com.",transporterStackTrace:e}}A.CallEnum=X;A.HostStatusEnum=U;A.createApiError=Xe;A.createDeserializationError=Je;A.createMappedRequestOptions=ce;A.createRetryError=Ve;A.createStatefulHost=ue;A.createStatelessHost=le;A.createTransporter=lr;A.createUserAgent=dr;A.deserializeFailure=ze;A.deserializeSuccess=Ke;A.isStatefulHostTimeouted=Be;A.isStatefulHostUp=Fe;A.serializeData=$e;A.serializeHeaders=Le;A.serializeQueryParameters=Ye;A.serializeUrl=Ge;A.stackFrameWithoutCredentials=pe;A.stackTraceWithoutCredentials=de});var K=I((en,et)=>{et.exports=Ze()});var tt=I(w=>{"use strict";Object.defineProperty(w,"__esModule",{value:!0});var N=F(),mr=K(),z=B(),hr=e=>{let t=e.region||"us",r=N.createAuth(N.AuthMode.WithinHeaders,e.appId,e.apiKey),s=mr.createTransporter(g(u({hosts:[{url:`analytics.${t}.algolia.com`}]},e),{headers:u(g(u({},r.headers()),{"content-type":"application/json"}),e.headers),queryParameters:u(u({},r.queryParameters()),e.queryParameters)})),n=e.appId;return N.addMethods({appId:n,transporter:s},e.methods)},yr=e=>(t,r)=>e.transporter.write({method:z.MethodEnum.Post,path:"2/abtests",data:t},r),gr=e=>(t,r)=>e.transporter.write({method:z.MethodEnum.Delete,path:N.encode("2/abtests/%s",t)},r),fr=e=>(t,r)=>e.transporter.read({method:z.MethodEnum.Get,path:N.encode("2/abtests/%s",t)},r),br=e=>t=>e.transporter.read({method:z.MethodEnum.Get,path:"2/abtests"},t),Pr=e=>(t,r)=>e.transporter.write({method:z.MethodEnum.Post,path:N.encode("2/abtests/%s/stop",t)},r);w.addABTest=yr;w.createAnalyticsClient=hr;w.deleteABTest=gr;w.getABTest=fr;w.getABTests=br;w.stopABTest=Pr});var st=I((rn,rt)=>{rt.exports=tt()});var at=I(G=>{"use strict";Object.defineProperty(G,"__esModule",{value:!0});var me=F(),jr=K(),nt=B(),Or=e=>{let t=e.region||"us",r=me.createAuth(me.AuthMode.WithinHeaders,e.appId,e.apiKey),s=jr.createTransporter(g(u({hosts:[{url:`recommendation.${t}.algolia.com`}]},e),{headers:u(g(u({},r.headers()),{"content-type":"application/json"}),e.headers),queryParameters:u(u({},r.queryParameters()),e.queryParameters)}));return me.addMethods({appId:e.appId,transporter:s},e.methods)},Ir=e=>t=>e.transporter.read({method:nt.MethodEnum.Get,path:"1/strategies/personalization"},t),Ar=e=>(t,r)=>e.transporter.write({method:nt.MethodEnum.Post,path:"1/strategies/personalization",data:t},r);G.createRecommendationClient=Or;G.getPersonalizationStrategy=Ir;G.setPersonalizationStrategy=Ar});var it=I((nn,ot)=>{ot.exports=at()});var jt=I(i=>{"use strict";Object.defineProperty(i,"__esModule",{value:!0});var l=F(),q=K(),m=B(),Sr=require("crypto");function Y(e){let t=r=>e.request(r).then(s=>{if(e.batch!==void 0&&e.batch(s.hits),!e.shouldStop(s))return s.cursor?t({cursor:s.cursor}):t({page:(r.page||0)+1})});return t({})}var Dr=e=>{let t=e.appId,r=l.createAuth(e.authMode!==void 0?e.authMode:l.AuthMode.WithinHeaders,t,e.apiKey),s=q.createTransporter(g(u({hosts:[{url:`${t}-dsn.algolia.net`,accept:q.CallEnum.Read},{url:`${t}.algolia.net`,accept:q.CallEnum.Write}].concat(l.shuffle([{url:`${t}-1.algolianet.com`},{url:`${t}-2.algolianet.com`},{url:`${t}-3.algolianet.com`}]))},e),{headers:u(g(u({},r.headers()),{"content-type":"application/x-www-form-urlencoded"}),e.headers),queryParameters:u(u({},r.queryParameters()),e.queryParameters)})),n={transporter:s,appId:t,addAlgoliaAgent(a,o){s.userAgent.add({segment:a,version:o})},clearCache(){return Promise.all([s.requestsCache.clear(),s.responsesCache.clear()]).then(()=>{})}};return l.addMethods(n,e.methods)};function ct(){return{name:"MissingObjectIDError",message:"All objects must have an unique objectID (like a primary key) to be valid. Algolia is also able to generate objectIDs automatically but *it's not recommended*. To do it, use the `{'autoGenerateObjectIDIfNotExist': true}` option."}}function ut(){return{name:"ObjectNotFoundError",message:"Object not found."}}function lt(){return{name:"ValidUntilNotFoundError",message:"ValidUntil not found in given secured api key."}}var Rr=e=>(t,r)=>{let d=r||{},{queryParameters:s}=d,n=R(d,["queryParameters"]),a=u({acl:t},s!==void 0?{queryParameters:s}:{}),o=(y,b)=>l.createRetryablePromise(f=>$(e)(y.key,b).catch(p=>{if(p.status!==404)throw p;return f()}));return l.createWaitablePromise(e.transporter.write({method:m.MethodEnum.Post,path:"1/keys",data:a},n),o)},vr=e=>(t,r,s)=>{let n=q.createMappedRequestOptions(s);return n.queryParameters["X-Algolia-User-ID"]=t,e.transporter.write({method:m.MethodEnum.Post,path:"1/clusters/mapping",data:{cluster:r}},n)},xr=e=>(t,r,s)=>e.transporter.write({method:m.MethodEnum.Post,path:"1/clusters/mapping/batch",data:{users:t,cluster:r}},s),Z=e=>(t,r,s)=>{let n=(a,o)=>L(e)(t,{methods:{waitTask:D}}).waitTask(a.taskID,o);return l.createWaitablePromise(e.transporter.write({method:m.MethodEnum.Post,path:l.encode("1/indexes/%s/operation",t),data:{operation:"copy",destination:r}},s),n)},qr=e=>(t,r,s)=>Z(e)(t,r,g(u({},s),{scope:[ee.Rules]})),Er=e=>(t,r,s)=>Z(e)(t,r,g(u({},s),{scope:[ee.Settings]})),Tr=e=>(t,r,s)=>Z(e)(t,r,g(u({},s),{scope:[ee.Synonyms]})),Mr=e=>(t,r)=>{let s=(n,a)=>l.createRetryablePromise(o=>$(e)(t,a).then(o).catch(d=>{if(d.status!==404)throw d}));return l.createWaitablePromise(e.transporter.write({method:m.MethodEnum.Delete,path:l.encode("1/keys/%s",t)},r),s)},wr=()=>(e,t)=>{let r=q.serializeQueryParameters(t),s=Sr.createHmac("sha256",e).update(r).digest("hex");return Buffer.from(s+r).toString("base64")},$=e=>(t,r)=>e.transporter.read({method:m.MethodEnum.Get,path:l.encode("1/keys/%s",t)},r),kr=e=>t=>e.transporter.read({method:m.MethodEnum.Get,path:"1/logs"},t),Cr=()=>e=>{let t=Buffer.from(e,"base64").toString("ascii"),r=/validUntil=(\d+)/,s=t.match(r);if(s===null)throw lt();return parseInt(s[1],10)-Math.round(new Date().getTime()/1e3)},Ur=e=>t=>e.transporter.read({method:m.MethodEnum.Get,path:"1/clusters/mapping/top"},t),Nr=e=>(t,r)=>e.transporter.read({method:m.MethodEnum.Get,path:l.encode("1/clusters/mapping/%s",t)},r),Wr=e=>t=>{let n=t||{},{retrieveMappings:r}=n,s=R(n,["retrieveMappings"]);return r===!0&&(s.getClusters=!0),e.transporter.read({method:m.MethodEnum.Get,path:"1/clusters/mapping/pending"},s)},L=e=>(t,r={})=>{let s={transporter:e.transporter,appId:e.appId,indexName:t};return l.addMethods(s,r.methods)},Hr=e=>t=>e.transporter.read({method:m.MethodEnum.Get,path:"1/keys"},t),_r=e=>t=>e.transporter.read({method:m.MethodEnum.Get,path:"1/clusters"},t),Fr=e=>t=>e.transporter.read({method:m.MethodEnum.Get,path:"1/indexes"},t),Br=e=>t=>e.transporter.read({method:m.MethodEnum.Get,path:"1/clusters/mapping"},t),Kr=e=>(t,r,s)=>{let n=(a,o)=>L(e)(t,{methods:{waitTask:D}}).waitTask(a.taskID,o);return l.createWaitablePromise(e.transporter.write({method:m.MethodEnum.Post,path:l.encode("1/indexes/%s/operation",t),data:{operation:"move",destination:r}},s),n)},zr=e=>(t,r)=>{let s=(n,a)=>Promise.all(Object.keys(n.taskID).map(o=>L(e)(o,{methods:{waitTask:D}}).waitTask(n.taskID[o],a)));return l.createWaitablePromise(e.transporter.write({method:m.MethodEnum.Post,path:"1/indexes/*/batch",data:{requests:t}},r),s)},Gr=e=>(t,r)=>e.transporter.read({method:m.MethodEnum.Post,path:"1/indexes/*/objects",data:{requests:t}},r),$r=e=>(t,r)=>{let s=t.map(n=>g(u({},n),{params:q.serializeQueryParameters(n.params||{})}));return e.transporter.read({method:m.MethodEnum.Post,path:"1/indexes/*/queries",data:{requests:s},cacheable:!0},r)},Lr=e=>(t,r)=>Promise.all(t.map(s=>{let d=s.params,{facetName:n,facetQuery:a}=d,o=R(d,["facetName","facetQuery"]);return L(e)(s.indexName,{methods:{searchForFacetValues:dt}}).searchForFacetValues(n,a,u(u({},r),o))})),Vr=e=>(t,r)=>{let s=q.createMappedRequestOptions(r);return s.queryParameters["X-Algolia-User-ID"]=t,e.transporter.write({method:m.MethodEnum.Delete,path:"1/clusters/mapping"},s)},Qr=e=>(t,r)=>{let s=(n,a)=>l.createRetryablePromise(o=>$(e)(t,a).catch(d=>{if(d.status!==404)throw d;return o()}));return l.createWaitablePromise(e.transporter.write({method:m.MethodEnum.Post,path:l.encode("1/keys/%s/restore",t)},r),s)},Jr=e=>(t,r)=>e.transporter.read({method:m.MethodEnum.Post,path:"1/clusters/mapping/search",data:{query:t}},r),Xr=e=>(t,r)=>{let s=Object.assign({},r),f=r||{},{queryParameters:n}=f,a=R(f,["queryParameters"]),o=n?{queryParameters:n}:{},d=["acl","indexes","referers","restrictSources","queryParameters","description","maxQueriesPerIPPerHour","maxHitsPerQuery"],y=p=>Object.keys(s).filter(h=>d.indexOf(h)!==-1).every(h=>p[h]===s[h]),b=(p,h)=>l.createRetryablePromise(S=>$(e)(t,h).then(O=>y(O)?Promise.resolve():S()));return l.createWaitablePromise(e.transporter.write({method:m.MethodEnum.Put,path:l.encode("1/keys/%s",t),data:o},a),b)},pt=e=>(t,r)=>{let s=(n,a)=>D(e)(n.taskID,a);return l.createWaitablePromise(e.transporter.write({method:m.MethodEnum.Post,path:l.encode("1/indexes/%s/batch",e.indexName),data:{requests:t}},r),s)},Yr=e=>t=>Y(g(u({},t),{shouldStop:r=>r.cursor===void 0,request:r=>e.transporter.read({method:m.MethodEnum.Post,path:l.encode("1/indexes/%s/browse",e.indexName),data:r},t)})),Zr=e=>t=>{let r=u({hitsPerPage:1e3},t);return Y(g(u({},r),{shouldStop:s=>s.hits.length<r.hitsPerPage,request(s){return mt(e)("",u(u({},r),s)).then(n=>g(u({},n),{hits:n.hits.map(a=>(delete a._highlightResult,a))}))}}))},es=e=>t=>{let r=u({hitsPerPage:1e3},t);return Y(g(u({},r),{shouldStop:s=>s.hits.length<r.hitsPerPage,request(s){return ht(e)("",u(u({},r),s)).then(n=>g(u({},n),{hits:n.hits.map(a=>(delete a._highlightResult,a))}))}}))},te=e=>(t,r,s)=>{let y=s||{},{batchSize:n}=y,a=R(y,["batchSize"]),o={taskIDs:[],objectIDs:[]},d=(b=0)=>{let f=[],p;for(p=b;p<t.length&&(f.push(t[p]),f.length!==(n||1e3));p++);return f.length===0?Promise.resolve(o):pt(e)(f.map(h=>({action:r,body:h})),a).then(h=>(o.objectIDs=o.objectIDs.concat(h.objectIDs),o.taskIDs.push(h.taskID),p++,d(p)))};return l.createWaitablePromise(d(),(b,f)=>Promise.all(b.taskIDs.map(p=>D(e)(p,f))))},ts=e=>t=>l.createWaitablePromise(e.transporter.write({method:m.MethodEnum.Post,path:l.encode("1/indexes/%s/clear",e.indexName)},t),(r,s)=>D(e)(r.taskID,s)),rs=e=>t=>{let a=t||{},{forwardToReplicas:r}=a,s=R(a,["forwardToReplicas"]),n=q.createMappedRequestOptions(s);return r&&(n.queryParameters.forwardToReplicas=1),l.createWaitablePromise(e.transporter.write({method:m.MethodEnum.Post,path:l.encode("1/indexes/%s/rules/clear",e.indexName)},n),(o,d)=>D(e)(o.taskID,d))},ss=e=>t=>{let a=t||{},{forwardToReplicas:r}=a,s=R(a,["forwardToReplicas"]),n=q.createMappedRequestOptions(s);return r&&(n.queryParameters.forwardToReplicas=1),l.createWaitablePromise(e.transporter.write({method:m.MethodEnum.Post,path:l.encode("1/indexes/%s/synonyms/clear",e.indexName)},n),(o,d)=>D(e)(o.taskID,d))},ns=e=>(t,r)=>l.createWaitablePromise(e.transporter.write({method:m.MethodEnum.Post,path:l.encode("1/indexes/%s/deleteByQuery",e.indexName),data:t},r),(s,n)=>D(e)(s.taskID,n)),as=e=>t=>l.createWaitablePromise(e.transporter.write({method:m.MethodEnum.Delete,path:l.encode("1/indexes/%s",e.indexName)},t),(r,s)=>D(e)(r.taskID,s)),os=e=>(t,r)=>l.createWaitablePromise(yt(e)([t],r).then(s=>({taskID:s.taskIDs[0]})),(s,n)=>D(e)(s.taskID,n)),yt=e=>(t,r)=>{let s=t.map(n=>({objectID:n}));return te(e)(s,k.DeleteObject,r)},is=e=>(t,r)=>{let o=r||{},{forwardToReplicas:s}=o,n=R(o,["forwardToReplicas"]),a=q.createMappedRequestOptions(n);return s&&(a.queryParameters.forwardToReplicas=1),l.createWaitablePromise(e.transporter.write({method:m.MethodEnum.Delete,path:l.encode("1/indexes/%s/rules/%s",e.indexName,t)},a),(d,y)=>D(e)(d.taskID,y))},cs=e=>(t,r)=>{let o=r||{},{forwardToReplicas:s}=o,n=R(o,["forwardToReplicas"]),a=q.createMappedRequestOptions(n);return s&&(a.queryParameters.forwardToReplicas=1),l.createWaitablePromise(e.transporter.write({method:m.MethodEnum.Delete,path:l.encode("1/indexes/%s/synonyms/%s",e.indexName,t)},a),(d,y)=>D(e)(d.taskID,y))},us=e=>t=>gt(e)(t).then(()=>!0).catch(r=>{if(r.status!==404)throw r;return!1}),ls=e=>(t,r)=>{let y=r||{},{query:s,paginate:n}=y,a=R(y,["query","paginate"]),o=0,d=()=>ft(e)(s||"",g(u({},a),{page:o})).then(b=>{for(let[f,p]of Object.entries(b.hits))if(t(p))return{object:p,position:parseInt(f,10),page:o};if(o++,n===!1||o>=b.nbPages)throw ut();return d()});return d()},ds=e=>(t,r)=>e.transporter.read({method:m.MethodEnum.Get,path:l.encode("1/indexes/%s/%s",e.indexName,t)},r),ps=()=>(e,t)=>{for(let[r,s]of Object.entries(e.hits))if(s.objectID===t)return parseInt(r,10);return-1},ms=e=>(t,r)=>{let o=r||{},{attributesToRetrieve:s}=o,n=R(o,["attributesToRetrieve"]),a=t.map(d=>u({indexName:e.indexName,objectID:d},s?{attributesToRetrieve:s}:{}));return e.transporter.read({method:m.MethodEnum.Post,path:"1/indexes/*/objects",data:{requests:a}},n)},hs=e=>(t,r)=>e.transporter.read({method:m.MethodEnum.Get,path:l.encode("1/indexes/%s/rules/%s",e.indexName,t)},r),gt=e=>t=>e.transporter.read({method:m.MethodEnum.Get,path:l.encode("1/indexes/%s/settings",e.indexName),data:{getVersion:2}},t),ys=e=>(t,r)=>e.transporter.read({method:m.MethodEnum.Get,path:l.encode("1/indexes/%s/synonyms/%s",e.indexName,t)},r),bt=e=>(t,r)=>e.transporter.read({method:m.MethodEnum.Get,path:l.encode("1/indexes/%s/task/%s",e.indexName,t.toString())},r),gs=e=>(t,r)=>l.createWaitablePromise(Pt(e)([t],r).then(s=>({objectID:s.objectIDs[0],taskID:s.taskIDs[0]})),(s,n)=>D(e)(s.taskID,n)),Pt=e=>(t,r)=>{let o=r||{},{createIfNotExists:s}=o,n=R(o,["createIfNotExists"]),a=s?k.PartialUpdateObject:k.PartialUpdateObjectNoCreate;return te(e)(t,a,n)},fs=e=>(t,r)=>{let O=r||{},{safe:s,autoGenerateObjectIDIfNotExist:n,batchSize:a}=O,o=R(O,["safe","autoGenerateObjectIDIfNotExist","batchSize"]),d=(P,x,v,j)=>l.createWaitablePromise(e.transporter.write({method:m.MethodEnum.Post,path:l.encode("1/indexes/%s/operation",P),data:{operation:v,destination:x}},j),(T,V)=>D(e)(T.taskID,V)),y=Math.random().toString(36).substring(7),b=`${e.indexName}_tmp_${y}`,f=he({appId:e.appId,transporter:e.transporter,indexName:b}),p=[],h=d(e.indexName,b,"copy",g(u({},o),{scope:["settings","synonyms","rules"]}));p.push(h);let S=(s?h.wait(o):h).then(()=>{let P=f(t,g(u({},o),{autoGenerateObjectIDIfNotExist:n,batchSize:a}));return p.push(P),s?P.wait(o):P}).then(()=>{let P=d(b,e.indexName,"move",o);return p.push(P),s?P.wait(o):P}).then(()=>Promise.all(p)).then(([P,x,v])=>({objectIDs:x.objectIDs,taskIDs:[P.taskID,...x.taskIDs,v.taskID]}));return l.createWaitablePromise(S,(P,x)=>Promise.all(p.map(v=>v.wait(x))))},bs=e=>(t,r)=>ye(e)(t,g(u({},r),{clearExistingRules:!0})),Ps=e=>(t,r)=>ge(e)(t,g(u({},r),{replaceExistingSynonyms:!0})),js=e=>(t,r)=>l.createWaitablePromise(he(e)([t],r).then(s=>({objectID:s.objectIDs[0],taskID:s.taskIDs[0]})),(s,n)=>D(e)(s.taskID,n)),he=e=>(t,r)=>{let o=r||{},{autoGenerateObjectIDIfNotExist:s}=o,n=R(o,["autoGenerateObjectIDIfNotExist"]),a=s?k.AddObject:k.UpdateObject;if(a===k.UpdateObject){for(let d of t)if(d.objectID===void 0)return l.createWaitablePromise(Promise.reject(ct()))}return te(e)(t,a,n)},Os=e=>(t,r)=>ye(e)([t],r),ye=e=>(t,r)=>{let d=r||{},{forwardToReplicas:s,clearExistingRules:n}=d,a=R(d,["forwardToReplicas","clearExistingRules"]),o=q.createMappedRequestOptions(a);return s&&(o.queryParameters.forwardToReplicas=1),n&&(o.queryParameters.clearExistingRules=1),l.createWaitablePromise(e.transporter.write({method:m.MethodEnum.Post,path:l.encode("1/indexes/%s/rules/batch",e.indexName),data:t},o),(y,b)=>D(e)(y.taskID,b))},Is=e=>(t,r)=>ge(e)([t],r),ge=e=>(t,r)=>{let d=r||{},{forwardToReplicas:s,replaceExistingSynonyms:n}=d,a=R(d,["forwardToReplicas","replaceExistingSynonyms"]),o=q.createMappedRequestOptions(a);return s&&(o.queryParameters.forwardToReplicas=1),n&&(o.queryParameters.replaceExistingSynonyms=1),l.createWaitablePromise(e.transporter.write({method:m.MethodEnum.Post,path:l.encode("1/indexes/%s/synonyms/batch",e.indexName),data:t},o),(y,b)=>D(e)(y.taskID,b))},ft=e=>(t,r)=>e.transporter.read({method:m.MethodEnum.Post,path:l.encode("1/indexes/%s/query",e.indexName),data:{query:t},cacheable:!0},r),dt=e=>(t,r,s)=>e.transporter.read({method:m.MethodEnum.Post,path:l.encode("1/indexes/%s/facets/%s/query",e.indexName,t),data:{facetQuery:r},cacheable:!0},s),mt=e=>(t,r)=>e.transporter.read({method:m.MethodEnum.Post,path:l.encode("1/indexes/%s/rules/search",e.indexName),data:{query:t}},r),ht=e=>(t,r)=>e.transporter.read({method:m.MethodEnum.Post,path:l.encode("1/indexes/%s/synonyms/search",e.indexName),data:{query:t}},r),As=e=>(t,r)=>{let o=r||{},{forwardToReplicas:s}=o,n=R(o,["forwardToReplicas"]),a=q.createMappedRequestOptions(n);return s&&(a.queryParameters.forwardToReplicas=1),l.createWaitablePromise(e.transporter.write({method:m.MethodEnum.Put,path:l.encode("1/indexes/%s/settings",e.indexName),data:t},a),(d,y)=>D(e)(d.taskID,y))},D=e=>(t,r)=>l.createRetryablePromise(s=>bt(e)(t,r).then(n=>n.status!=="published"?s():void 0)),Ss={AddObject:"addObject",Analytics:"analytics",Browser:"browse",DeleteIndex:"deleteIndex",DeleteObject:"deleteObject",EditSettings:"editSettings",ListIndexes:"listIndexes",Logs:"logs",Recommendation:"recommendation",Search:"search",SeeUnretrievableAttributes:"seeUnretrievableAttributes",Settings:"settings",Usage:"usage"},k={AddObject:"addObject",UpdateObject:"updateObject",PartialUpdateObject:"partialUpdateObject",PartialUpdateObjectNoCreate:"partialUpdateObjectNoCreate",DeleteObject:"deleteObject"},ee={Settings:"settings",Synonyms:"synonyms",Rules:"rules"},Ds={None:"none",StopIfEnoughMatches:"stopIfEnoughMatches"},Rs={Synonym:"synonym",OneWaySynonym:"oneWaySynonym",AltCorrection1:"altCorrection1",AltCorrection2:"altCorrection2",Placeholder:"placeholder"};i.ApiKeyACLEnum=Ss;i.BatchActionEnum=k;i.ScopeEnum=ee;i.StrategyEnum=Ds;i.SynonymEnum=Rs;i.addApiKey=Rr;i.assignUserID=vr;i.assignUserIDs=xr;i.batch=pt;i.browseObjects=Yr;i.browseRules=Zr;i.browseSynonyms=es;i.chunkedBatch=te;i.clearObjects=ts;i.clearRules=rs;i.clearSynonyms=ss;i.copyIndex=Z;i.copyRules=qr;i.copySettings=Er;i.copySynonyms=Tr;i.createBrowsablePromise=Y;i.createMissingObjectIDError=ct;i.createObjectNotFoundError=ut;i.createSearchClient=Dr;i.createValidUntilNotFoundError=lt;i.deleteApiKey=Mr;i.deleteBy=ns;i.deleteIndex=as;i.deleteObject=os;i.deleteObjects=yt;i.deleteRule=is;i.deleteSynonym=cs;i.exists=us;i.findObject=ls;i.generateSecuredApiKey=wr;i.getApiKey=$;i.getLogs=kr;i.getObject=ds;i.getObjectPosition=ps;i.getObjects=ms;i.getRule=hs;i.getSecuredApiKeyRemainingValidity=Cr;i.getSettings=gt;i.getSynonym=ys;i.getTask=bt;i.getTopUserIDs=Ur;i.getUserID=Nr;i.hasPendingMappings=Wr;i.initIndex=L;i.listApiKeys=Hr;i.listClusters=_r;i.listIndices=Fr;i.listUserIDs=Br;i.moveIndex=Kr;i.multipleBatch=zr;i.multipleGetObjects=Gr;i.multipleQueries=$r;i.multipleSearchForFacetValues=Lr;i.partialUpdateObject=gs;i.partialUpdateObjects=Pt;i.removeUserID=Vr;i.replaceAllObjects=fs;i.replaceAllRules=bs;i.replaceAllSynonyms=Ps;i.restoreApiKey=Qr;i.saveObject=js;i.saveObjects=he;i.saveRule=Os;i.saveRules=ye;i.saveSynonym=Is;i.saveSynonyms=ge;i.search=ft;i.searchForFacetValues=dt;i.searchRules=mt;i.searchSynonyms=ht;i.searchUserIDs=Jr;i.setSettings=As;i.updateApiKey=Xr;i.waitTask=D});var It=I((on,Ot)=>{Ot.exports=jt()});var At=I(re=>{"use strict";Object.defineProperty(re,"__esModule",{value:!0});function vs(){return{debug(e,t){return Promise.resolve()},info(e,t){return Promise.resolve()},error(e,t){return Promise.resolve()}}}var xs={Debug:1,Info:2,Error:3};re.LogLevelEnum=xs;re.createNullLogger=vs});var Dt=I((un,St)=>{St.exports=At()});var xt=I(fe=>{"use strict";Object.defineProperty(fe,"__esModule",{value:!0});var Rt=require("http"),vt=require("https"),qs=require("url");function Es(){let e={keepAlive:!0},t=new Rt.Agent(e),r=new vt.Agent(e);return{send(s){return new Promise(n=>{let a=qs.parse(s.url),o=a.query===null?a.pathname:`${a.pathname}?${a.query}`,d=u({agent:a.protocol==="https:"?r:t,hostname:a.hostname,path:o,method:s.method,headers:s.headers},a.port!==void 0?{port:a.port||""}:{}),y=(a.protocol==="https:"?vt:Rt).request(d,h=>{let S="";h.on("data",O=>S+=O),h.on("end",()=>{clearTimeout(f),clearTimeout(p),n({status:h.statusCode||0,content:S,isTimedOut:!1})})}),b=(h,S)=>setTimeout(()=>{y.abort(),n({status:0,content:S,isTimedOut:!0})},h*1e3),f=b(s.connectTimeout,"Connection timeout"),p;y.on("error",h=>{clearTimeout(f),clearTimeout(p),n({status:0,content:h.message,isTimedOut:!1})}),y.once("response",()=>{clearTimeout(f),p=b(s.responseTimeout,"Socket timeout")}),s.data!==void 0&&y.write(s.data),y.end()})},destroy(){return t.destroy(),r.destroy(),Promise.resolve()}}}fe.createNodeHttpRequester=Es});var Et=I((dn,qt)=>{qt.exports=xt()});var kt=I((pn,Tt)=>{"use strict";var Mt=Ee(),Ts=we(),W=st(),be=F(),Pe=it(),c=It(),Ms=Dt(),ws=Et(),ks=K();function wt(e,t,r){let s={appId:e,apiKey:t,timeouts:{connect:2,read:5,write:30},requester:ws.createNodeHttpRequester(),logger:Ms.createNullLogger(),responsesCache:Mt.createNullCache(),requestsCache:Mt.createNullCache(),hostsCache:Ts.createInMemoryCache(),userAgent:ks.createUserAgent(be.version).add({segment:"Node.js",version:process.versions.node})};return c.createSearchClient(g(u(u({},s),r),{methods:{search:c.multipleQueries,searchForFacetValues:c.multipleSearchForFacetValues,multipleBatch:c.multipleBatch,multipleGetObjects:c.multipleGetObjects,multipleQueries:c.multipleQueries,copyIndex:c.copyIndex,copySettings:c.copySettings,copyRules:c.copyRules,copySynonyms:c.copySynonyms,moveIndex:c.moveIndex,listIndices:c.listIndices,getLogs:c.getLogs,listClusters:c.listClusters,multipleSearchForFacetValues:c.multipleSearchForFacetValues,getApiKey:c.getApiKey,addApiKey:c.addApiKey,listApiKeys:c.listApiKeys,updateApiKey:c.updateApiKey,deleteApiKey:c.deleteApiKey,restoreApiKey:c.restoreApiKey,assignUserID:c.assignUserID,assignUserIDs:c.assignUserIDs,getUserID:c.getUserID,searchUserIDs:c.searchUserIDs,listUserIDs:c.listUserIDs,getTopUserIDs:c.getTopUserIDs,removeUserID:c.removeUserID,hasPendingMappings:c.hasPendingMappings,generateSecuredApiKey:c.generateSecuredApiKey,getSecuredApiKeyRemainingValidity:c.getSecuredApiKeyRemainingValidity,destroy:be.destroy,initIndex:n=>a=>c.initIndex(n)(a,{methods:{batch:c.batch,delete:c.deleteIndex,getObject:c.getObject,getObjects:c.getObjects,saveObject:c.saveObject,saveObjects:c.saveObjects,search:c.search,searchForFacetValues:c.searchForFacetValues,waitTask:c.waitTask,setSettings:c.setSettings,getSettings:c.getSettings,partialUpdateObject:c.partialUpdateObject,partialUpdateObjects:c.partialUpdateObjects,deleteObject:c.deleteObject,deleteObjects:c.deleteObjects,deleteBy:c.deleteBy,clearObjects:c.clearObjects,browseObjects:c.browseObjects,getObjectPosition:c.getObjectPosition,findObject:c.findObject,exists:c.exists,saveSynonym:c.saveSynonym,saveSynonyms:c.saveSynonyms,getSynonym:c.getSynonym,searchSynonyms:c.searchSynonyms,browseSynonyms:c.browseSynonyms,deleteSynonym:c.deleteSynonym,clearSynonyms:c.clearSynonyms,replaceAllObjects:c.replaceAllObjects,replaceAllSynonyms:c.replaceAllSynonyms,searchRules:c.searchRules,getRule:c.getRule,deleteRule:c.deleteRule,saveRule:c.saveRule,saveRules:c.saveRules,replaceAllRules:c.replaceAllRules,browseRules:c.browseRules,clearRules:c.clearRules}}),initAnalytics:()=>n=>W.createAnalyticsClient(g(u(u({},s),n),{methods:{addABTest:W.addABTest,getABTest:W.getABTest,getABTests:W.getABTests,stopABTest:W.stopABTest,deleteABTest:W.deleteABTest}})),initRecommendation:()=>n=>Pe.createRecommendationClient(g(u(u({},s),n),{methods:{getPersonalizationStrategy:Pe.getPersonalizationStrategy,setPersonalizationStrategy:Pe.setPersonalizationStrategy}}))}}))}wt.version=be.version;Tt.exports=wt});var Ut=I((mn,je)=>{var Ct=kt();je.exports=Ct;je.exports.default=Ct});var Ws={};Vt(Ws,{default:()=>Ks});var Oe=C(require("@yarnpkg/core")),E=C(require("@yarnpkg/core")),Ie=C(require("@yarnpkg/plugin-essentials")),Ht=C(require("semver"));var se=C(require("@yarnpkg/core")),Nt=C(Ut()),Cs="e8e1bd300d860104bb8c58453ffa1eb4",Us="OFCNCOG2CU",Wt=async(e,t)=>{var a;let r=se.structUtils.stringifyIdent(e),n=Ns(t).initIndex("npm-search");try{return((a=(await n.getObject(r,{attributesToRetrieve:["types"]})).types)==null?void 0:a.ts)==="definitely-typed"}catch(o){return!1}},Ns=e=>(0,Nt.default)(Us,Cs,{requester:{async send(r){try{let s=await se.httpUtils.request(r.url,r.data||null,{configuration:e,headers:r.headers});return{content:s.body,isTimedOut:!1,status:s.statusCode}}catch(s){return{content:s.response.body,isTimedOut:!1,status:s.response.statusCode}}}}});var _t=e=>e.scope?`${e.scope}__${e.name}`:`${e.name}`,Hs=async(e,t,r,s)=>{if(r.scope==="types")return;let{project:n}=e,{configuration:a}=n,o=a.makeResolver(),d={project:n,resolver:o,report:new E.ThrowReport};if(!await Wt(r,a))return;let b=_t(r),f=E.structUtils.parseRange(r.range).selector;if(!E.semverUtils.validRange(f)){let P=await o.getCandidates(r,new Map,d);f=E.structUtils.parseRange(P[0].reference).selector}let p=Ht.default.coerce(f);if(p===null)return;let h=`${Ie.suggestUtils.Modifier.CARET}${p.major}`,S=E.structUtils.makeDescriptor(E.structUtils.makeIdent("types",b),h),O=E.miscUtils.mapAndFind(n.workspaces,P=>{var T,V;let x=(T=P.manifest.dependencies.get(r.identHash))==null?void 0:T.descriptorHash,v=(V=P.manifest.devDependencies.get(r.identHash))==null?void 0:V.descriptorHash;if(x!==r.descriptorHash&&v!==r.descriptorHash)return E.miscUtils.mapAndFind.skip;let j=[];for(let Ae of Oe.Manifest.allDependencies){let Se=P.manifest[Ae].get(S.identHash);typeof Se!="undefined"&&j.push([Ae,Se])}return j.length===0?E.miscUtils.mapAndFind.skip:j});if(typeof O!="undefined")for(let[P,x]of O)e.manifest[P].set(x.identHash,x);else{try{if((await o.getCandidates(S,new Map,d)).length===0)return}catch{return}e.manifest[Ie.suggestUtils.Target.DEVELOPMENT].set(S.identHash,S)}},_s=async(e,t,r)=>{if(r.scope==="types")return;let s=_t(r),n=E.structUtils.makeIdent("types",s);for(let a of Oe.Manifest.allDependencies)typeof e.manifest[a].get(n.identHash)!="undefined"&&e.manifest[a].delete(n.identHash)},Fs=(e,t)=>{t.publishConfig&&t.publishConfig.typings&&(t.typings=t.publishConfig.typings),t.publishConfig&&t.publishConfig.types&&(t.types=t.publishConfig.types)},Bs={hooks:{afterWorkspaceDependencyAddition:Hs,afterWorkspaceDependencyRemoval:_s,beforeWorkspacePacking:Fs}},Ks=Bs;return Ws;})();
-return plugin;
-}
-};
diff --git a/.yarn/releases/yarn-3.6.4.cjs b/.yarn/releases/yarn-3.6.4.cjs
deleted file mode 100755
index ebd9272da5e06..0000000000000
--- a/.yarn/releases/yarn-3.6.4.cjs
+++ /dev/null
@@ -1,874 +0,0 @@
-#!/usr/bin/env node
-/* eslint-disable */
-//prettier-ignore
-(()=>{var Dge=Object.create;var lS=Object.defineProperty;var kge=Object.getOwnPropertyDescriptor;var Rge=Object.getOwnPropertyNames;var Fge=Object.getPrototypeOf,Nge=Object.prototype.hasOwnProperty;var J=(r=>typeof require<"u"?require:typeof Proxy<"u"?new Proxy(r,{get:(e,t)=>(typeof require<"u"?require:e)[t]}):r)(function(r){if(typeof require<"u")return require.apply(this,arguments);throw new Error('Dynamic require of "'+r+'" is not supported')});var Tge=(r,e)=>()=>(r&&(e=r(r=0)),e);var w=(r,e)=>()=>(e||r((e={exports:{}}).exports,e),e.exports),ut=(r,e)=>{for(var t in e)lS(r,t,{get:e[t],enumerable:!0})},Lge=(r,e,t,i)=>{if(e&&typeof e=="object"||typeof e=="function")for(let n of Rge(e))!Nge.call(r,n)&&n!==t&&lS(r,n,{get:()=>e[n],enumerable:!(i=kge(e,n))||i.enumerable});return r};var Pe=(r,e,t)=>(t=r!=null?Dge(Fge(r)):{},Lge(e||!r||!r.__esModule?lS(t,"default",{value:r,enumerable:!0}):t,r));var PK=w((zXe,xK)=>{xK.exports=vK;vK.sync=ife;var QK=J("fs");function rfe(r,e){var t=e.pathExt!==void 0?e.pathExt:process.env.PATHEXT;if(!t||(t=t.split(";"),t.indexOf("")!==-1))return!0;for(var i=0;i<t.length;i++){var n=t[i].toLowerCase();if(n&&r.substr(-n.length).toLowerCase()===n)return!0}return!1}function SK(r,e,t){return!r.isSymbolicLink()&&!r.isFile()?!1:rfe(e,t)}function vK(r,e,t){QK.stat(r,function(i,n){t(i,i?!1:SK(n,r,e))})}function ife(r,e){return SK(QK.statSync(r),r,e)}});var NK=w((VXe,FK)=>{FK.exports=kK;kK.sync=nfe;var DK=J("fs");function kK(r,e,t){DK.stat(r,function(i,n){t(i,i?!1:RK(n,e))})}function nfe(r,e){return RK(DK.statSync(r),e)}function RK(r,e){return r.isFile()&&sfe(r,e)}function sfe(r,e){var t=r.mode,i=r.uid,n=r.gid,s=e.uid!==void 0?e.uid:process.getuid&&process.getuid(),o=e.gid!==void 0?e.gid:process.getgid&&process.getgid(),a=parseInt("100",8),l=parseInt("010",8),c=parseInt("001",8),u=a|l,g=t&c||t&l&&n===o||t&a&&i===s||t&u&&s===0;return g}});var LK=w((ZXe,TK)=>{var XXe=J("fs"),lI;process.platform==="win32"||global.TESTING_WINDOWS?lI=PK():lI=NK();TK.exports=SS;SS.sync=ofe;function SS(r,e,t){if(typeof e=="function"&&(t=e,e={}),!t){if(typeof Promise!="function")throw new TypeError("callback not provided");return new Promise(function(i,n){SS(r,e||{},function(s,o){s?n(s):i(o)})})}lI(r,e||{},function(i,n){i&&(i.code==="EACCES"||e&&e.ignoreErrors)&&(i=null,n=!1),t(i,n)})}function ofe(r,e){try{return lI.sync(r,e||{})}catch(t){if(e&&e.ignoreErrors||t.code==="EACCES")return!1;throw t}}});var YK=w((_Xe,GK)=>{var Dg=process.platform==="win32"||process.env.OSTYPE==="cygwin"||process.env.OSTYPE==="msys",OK=J("path"),afe=Dg?";":":",MK=LK(),KK=r=>Object.assign(new Error(`not found: ${r}`),{code:"ENOENT"}),UK=(r,e)=>{let t=e.colon||afe,i=r.match(/\//)||Dg&&r.match(/\\/)?[""]:[...Dg?[process.cwd()]:[],...(e.path||process.env.PATH||"").split(t)],n=Dg?e.pathExt||process.env.PATHEXT||".EXE;.CMD;.BAT;.COM":"",s=Dg?n.split(t):[""];return Dg&&r.indexOf(".")!==-1&&s[0]!==""&&s.unshift(""),{pathEnv:i,pathExt:s,pathExtExe:n}},HK=(r,e,t)=>{typeof e=="function"&&(t=e,e={}),e||(e={});let{pathEnv:i,pathExt:n,pathExtExe:s}=UK(r,e),o=[],a=c=>new Promise((u,g)=>{if(c===i.length)return e.all&&o.length?u(o):g(KK(r));let f=i[c],h=/^".*"$/.test(f)?f.slice(1,-1):f,p=OK.join(h,r),C=!h&&/^\.[\\\/]/.test(r)?r.slice(0,2)+p:p;u(l(C,c,0))}),l=(c,u,g)=>new Promise((f,h)=>{if(g===n.length)return f(a(u+1));let p=n[g];MK(c+p,{pathExt:s},(C,y)=>{if(!C&&y)if(e.all)o.push(c+p);else return f(c+p);return f(l(c,u,g+1))})});return t?a(0).then(c=>t(null,c),t):a(0)},Afe=(r,e)=>{e=e||{};let{pathEnv:t,pathExt:i,pathExtExe:n}=UK(r,e),s=[];for(let o=0;o<t.length;o++){let a=t[o],l=/^".*"$/.test(a)?a.slice(1,-1):a,c=OK.join(l,r),u=!l&&/^\.[\\\/]/.test(r)?r.slice(0,2)+c:c;for(let g=0;g<i.length;g++){let f=u+i[g];try{if(MK.sync(f,{pathExt:n}))if(e.all)s.push(f);else return f}catch{}}}if(e.all&&s.length)return s;if(e.nothrow)return null;throw KK(r)};GK.exports=HK;HK.sync=Afe});var qK=w(($Xe,vS)=>{"use strict";var jK=(r={})=>{let e=r.env||process.env;return(r.platform||process.platform)!=="win32"?"PATH":Object.keys(e).reverse().find(i=>i.toUpperCase()==="PATH")||"Path"};vS.exports=jK;vS.exports.default=jK});var VK=w((eZe,zK)=>{"use strict";var JK=J("path"),lfe=YK(),cfe=qK();function WK(r,e){let t=r.options.env||process.env,i=process.cwd(),n=r.options.cwd!=null,s=n&&process.chdir!==void 0&&!process.chdir.disabled;if(s)try{process.chdir(r.options.cwd)}catch{}let o;try{o=lfe.sync(r.command,{path:t[cfe({env:t})],pathExt:e?JK.delimiter:void 0})}catch{}finally{s&&process.chdir(i)}return o&&(o=JK.resolve(n?r.options.cwd:"",o)),o}function ufe(r){return WK(r)||WK(r,!0)}zK.exports=ufe});var XK=w((tZe,PS)=>{"use strict";var xS=/([()\][%!^"`<>&|;, *?])/g;function gfe(r){return r=r.replace(xS,"^$1"),r}function ffe(r,e){return r=`${r}`,r=r.replace(/(\\*)"/g,'$1$1\\"'),r=r.replace(/(\\*)$/,"$1$1"),r=`"${r}"`,r=r.replace(xS,"^$1"),e&&(r=r.replace(xS,"^$1")),r}PS.exports.command=gfe;PS.exports.argument=ffe});var _K=w((rZe,ZK)=>{"use strict";ZK.exports=/^#!(.*)/});var eU=w((iZe,$K)=>{"use strict";var hfe=_K();$K.exports=(r="")=>{let e=r.match(hfe);if(!e)return null;let[t,i]=e[0].replace(/#! ?/,"").split(" "),n=t.split("/").pop();return n==="env"?i:i?`${n} ${i}`:n}});var rU=w((nZe,tU)=>{"use strict";var DS=J("fs"),pfe=eU();function dfe(r){let t=Buffer.alloc(150),i;try{i=DS.openSync(r,"r"),DS.readSync(i,t,0,150,0),DS.closeSync(i)}catch{}return pfe(t.toString())}tU.exports=dfe});var oU=w((sZe,sU)=>{"use strict";var Cfe=J("path"),iU=VK(),nU=XK(),mfe=rU(),Efe=process.platform==="win32",Ife=/\.(?:com|exe)$/i,yfe=/node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i;function wfe(r){r.file=iU(r);let e=r.file&&mfe(r.file);return e?(r.args.unshift(r.file),r.command=e,iU(r)):r.file}function Bfe(r){if(!Efe)return r;let e=wfe(r),t=!Ife.test(e);if(r.options.forceShell||t){let i=yfe.test(e);r.command=Cfe.normalize(r.command),r.command=nU.command(r.command),r.args=r.args.map(s=>nU.argument(s,i));let n=[r.command].concat(r.args).join(" ");r.args=["/d","/s","/c",`"${n}"`],r.command=process.env.comspec||"cmd.exe",r.options.windowsVerbatimArguments=!0}return r}function bfe(r,e,t){e&&!Array.isArray(e)&&(t=e,e=null),e=e?e.slice(0):[],t=Object.assign({},t);let i={command:r,args:e,options:t,file:void 0,original:{command:r,args:e}};return t.shell?i:Bfe(i)}sU.exports=bfe});var lU=w((oZe,AU)=>{"use strict";var kS=process.platform==="win32";function RS(r,e){return Object.assign(new Error(`${e} ${r.command} ENOENT`),{code:"ENOENT",errno:"ENOENT",syscall:`${e} ${r.command}`,path:r.command,spawnargs:r.args})}function Qfe(r,e){if(!kS)return;let t=r.emit;r.emit=function(i,n){if(i==="exit"){let s=aU(n,e,"spawn");if(s)return t.call(r,"error",s)}return t.apply(r,arguments)}}function aU(r,e){return kS&&r===1&&!e.file?RS(e.original,"spawn"):null}function Sfe(r,e){return kS&&r===1&&!e.file?RS(e.original,"spawnSync"):null}AU.exports={hookChildProcess:Qfe,verifyENOENT:aU,verifyENOENTSync:Sfe,notFoundError:RS}});var TS=w((aZe,kg)=>{"use strict";var cU=J("child_process"),FS=oU(),NS=lU();function uU(r,e,t){let i=FS(r,e,t),n=cU.spawn(i.command,i.args,i.options);return NS.hookChildProcess(n,i),n}function vfe(r,e,t){let i=FS(r,e,t),n=cU.spawnSync(i.command,i.args,i.options);return n.error=n.error||NS.verifyENOENTSync(n.status,i),n}kg.exports=uU;kg.exports.spawn=uU;kg.exports.sync=vfe;kg.exports._parse=FS;kg.exports._enoent=NS});var fU=w((AZe,gU)=>{"use strict";function xfe(r,e){function t(){this.constructor=r}t.prototype=e.prototype,r.prototype=new t}function Zl(r,e,t,i){this.message=r,this.expected=e,this.found=t,this.location=i,this.name="SyntaxError",typeof Error.captureStackTrace=="function"&&Error.captureStackTrace(this,Zl)}xfe(Zl,Error);Zl.buildMessage=function(r,e){var t={literal:function(c){return'"'+n(c.text)+'"'},class:function(c){var u="",g;for(g=0;g<c.parts.length;g++)u+=c.parts[g]instanceof Array?s(c.parts[g][0])+"-"+s(c.parts[g][1]):s(c.parts[g]);return"["+(c.inverted?"^":"")+u+"]"},any:function(c){return"any character"},end:function(c){return"end of input"},other:function(c){return c.description}};function i(c){return c.charCodeAt(0).toString(16).toUpperCase()}function n(c){return c.replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,function(u){return"\\x0"+i(u)}).replace(/[\x10-\x1F\x7F-\x9F]/g,function(u){return"\\x"+i(u)})}function s(c){return c.replace(/\\/g,"\\\\").replace(/\]/g,"\\]").replace(/\^/g,"\\^").replace(/-/g,"\\-").replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,function(u){return"\\x0"+i(u)}).replace(/[\x10-\x1F\x7F-\x9F]/g,function(u){return"\\x"+i(u)})}function o(c){return t[c.type](c)}function a(c){var u=new Array(c.length),g,f;for(g=0;g<c.length;g++)u[g]=o(c[g]);if(u.sort(),u.length>0){for(g=1,f=1;g<u.length;g++)u[g-1]!==u[g]&&(u[f]=u[g],f++);u.length=f}switch(u.length){case 1:return u[0];case 2:return u[0]+" or "+u[1];default:return u.slice(0,-1).join(", ")+", or "+u[u.length-1]}}function l(c){return c?'"'+n(c)+'"':"end of input"}return"Expected "+a(r)+" but "+l(e)+" found."};function Pfe(r,e){e=e!==void 0?e:{};var t={},i={Start:SA},n=SA,s=function(m){return m||[]},o=function(m,Q,N){return[{command:m,type:Q}].concat(N||[])},a=function(m,Q){return[{command:m,type:Q||";"}]},l=function(m){return m},c=";",u=me(";",!1),g="&",f=me("&",!1),h=function(m,Q){return Q?{chain:m,then:Q}:{chain:m}},p=function(m,Q){return{type:m,line:Q}},C="&&",y=me("&&",!1),B="||",v=me("||",!1),D=function(m,Q){return Q?{...m,then:Q}:m},T=function(m,Q){return{type:m,chain:Q}},H="|&",j=me("|&",!1),$="|",V=me("|",!1),W="=",_=me("=",!1),A=function(m,Q){return{name:m,args:[Q]}},Ae=function(m){return{name:m,args:[]}},ge="(",re=me("(",!1),O=")",F=me(")",!1),ue=function(m,Q){return{type:"subshell",subshell:m,args:Q}},pe="{",ke=me("{",!1),Fe="}",Ne=me("}",!1),oe=function(m,Q){return{type:"group",group:m,args:Q}},le=function(m,Q){return{type:"command",args:Q,envs:m}},Be=function(m){return{type:"envs",envs:m}},fe=function(m){return m},ae=function(m){return m},qe=/^[0-9]/,ne=Je([["0","9"]],!1,!1),Y=function(m,Q,N){return{type:"redirection",subtype:Q,fd:m!==null?parseInt(m):null,args:[N]}},he=">>",ie=me(">>",!1),de=">&",_e=me(">&",!1),Pt=">",It=me(">",!1),Or="<<<",ii=me("<<<",!1),gi="<&",hr=me("<&",!1),fi="<",ni=me("<",!1),Ks=function(m){return{type:"argument",segments:[].concat(...m)}},pr=function(m){return m},Ii="$'",rs=me("$'",!1),fa="'",dA=me("'",!1),cg=function(m){return[{type:"text",text:m}]},is='""',CA=me('""',!1),ha=function(){return{type:"text",text:""}},wp='"',mA=me('"',!1),EA=function(m){return m},wr=function(m){return{type:"arithmetic",arithmetic:m,quoted:!0}},Tl=function(m){return{type:"shell",shell:m,quoted:!0}},ug=function(m){return{type:"variable",...m,quoted:!0}},yo=function(m){return{type:"text",text:m}},gg=function(m){return{type:"arithmetic",arithmetic:m,quoted:!1}},Bp=function(m){return{type:"shell",shell:m,quoted:!1}},bp=function(m){return{type:"variable",...m,quoted:!1}},vr=function(m){return{type:"glob",pattern:m}},se=/^[^']/,wo=Je(["'"],!0,!1),Fn=function(m){return m.join("")},fg=/^[^$"]/,bt=Je(["$",'"'],!0,!1),Ll=`\\
-`,Nn=me(`\\
-`,!1),ns=function(){return""},ss="\\",gt=me("\\",!1),Bo=/^[\\$"`]/,At=Je(["\\","$",'"',"`"],!1,!1),ln=function(m){return m},S="\\a",Lt=me("\\a",!1),hg=function(){return"a"},Ol="\\b",Qp=me("\\b",!1),Sp=function(){return"\b"},vp=/^[Ee]/,xp=Je(["E","e"],!1,!1),Pp=function(){return"\x1B"},G="\\f",yt=me("\\f",!1),IA=function(){return"\f"},zi="\\n",Ml=me("\\n",!1),Xe=function(){return`
-`},pa="\\r",pg=me("\\r",!1),OE=function(){return"\r"},Dp="\\t",ME=me("\\t",!1),ar=function(){return"	"},Tn="\\v",Kl=me("\\v",!1),kp=function(){return"\v"},Us=/^[\\'"?]/,da=Je(["\\","'",'"',"?"],!1,!1),cn=function(m){return String.fromCharCode(parseInt(m,16))},Le="\\x",dg=me("\\x",!1),Ul="\\u",Hs=me("\\u",!1),Hl="\\U",yA=me("\\U",!1),Cg=function(m){return String.fromCodePoint(parseInt(m,16))},mg=/^[0-7]/,Ca=Je([["0","7"]],!1,!1),ma=/^[0-9a-fA-f]/,rt=Je([["0","9"],["a","f"],["A","f"]],!1,!1),bo=nt(),wA="-",Gl=me("-",!1),Gs="+",Yl=me("+",!1),KE=".",Rp=me(".",!1),Eg=function(m,Q,N){return{type:"number",value:(m==="-"?-1:1)*parseFloat(Q.join("")+"."+N.join(""))}},Fp=function(m,Q){return{type:"number",value:(m==="-"?-1:1)*parseInt(Q.join(""))}},UE=function(m){return{type:"variable",...m}},jl=function(m){return{type:"variable",name:m}},HE=function(m){return m},Ig="*",BA=me("*",!1),Rr="/",GE=me("/",!1),Ys=function(m,Q,N){return{type:Q==="*"?"multiplication":"division",right:N}},js=function(m,Q){return Q.reduce((N,U)=>({left:N,...U}),m)},yg=function(m,Q,N){return{type:Q==="+"?"addition":"subtraction",right:N}},bA="$((",R=me("$((",!1),q="))",Ce=me("))",!1),Ke=function(m){return m},Re="$(",ze=me("$(",!1),dt=function(m){return m},Ft="${",Ln=me("${",!1),JQ=":-",k1=me(":-",!1),R1=function(m,Q){return{name:m,defaultValue:Q}},WQ=":-}",F1=me(":-}",!1),N1=function(m){return{name:m,defaultValue:[]}},zQ=":+",T1=me(":+",!1),L1=function(m,Q){return{name:m,alternativeValue:Q}},VQ=":+}",O1=me(":+}",!1),M1=function(m){return{name:m,alternativeValue:[]}},XQ=function(m){return{name:m}},K1="$",U1=me("$",!1),H1=function(m){return e.isGlobPattern(m)},G1=function(m){return m},ZQ=/^[a-zA-Z0-9_]/,_Q=Je([["a","z"],["A","Z"],["0","9"],"_"],!1,!1),$Q=function(){return L()},eS=/^[$@*?#a-zA-Z0-9_\-]/,tS=Je(["$","@","*","?","#",["a","z"],["A","Z"],["0","9"],"_","-"],!1,!1),Y1=/^[(){}<>$|&; \t"']/,wg=Je(["(",")","{","}","<",">","$","|","&",";"," ","	",'"',"'"],!1,!1),rS=/^[<>&; \t"']/,iS=Je(["<",">","&",";"," ","	",'"',"'"],!1,!1),YE=/^[ \t]/,jE=Je([" ","	"],!1,!1),b=0,Me=0,QA=[{line:1,column:1}],d=0,E=[],I=0,k;if("startRule"in e){if(!(e.startRule in i))throw new Error(`Can't start parsing from rule "`+e.startRule+'".');n=i[e.startRule]}function L(){return r.substring(Me,b)}function Z(){return Et(Me,b)}function te(m,Q){throw Q=Q!==void 0?Q:Et(Me,b),Ri([lt(m)],r.substring(Me,b),Q)}function we(m,Q){throw Q=Q!==void 0?Q:Et(Me,b),On(m,Q)}function me(m,Q){return{type:"literal",text:m,ignoreCase:Q}}function Je(m,Q,N){return{type:"class",parts:m,inverted:Q,ignoreCase:N}}function nt(){return{type:"any"}}function wt(){return{type:"end"}}function lt(m){return{type:"other",description:m}}function it(m){var Q=QA[m],N;if(Q)return Q;for(N=m-1;!QA[N];)N--;for(Q=QA[N],Q={line:Q.line,column:Q.column};N<m;)r.charCodeAt(N)===10?(Q.line++,Q.column=1):Q.column++,N++;return QA[m]=Q,Q}function Et(m,Q){var N=it(m),U=it(Q);return{start:{offset:m,line:N.line,column:N.column},end:{offset:Q,line:U.line,column:U.column}}}function be(m){b<d||(b>d&&(d=b,E=[]),E.push(m))}function On(m,Q){return new Zl(m,null,null,Q)}function Ri(m,Q,N){return new Zl(Zl.buildMessage(m,Q),m,Q,N)}function SA(){var m,Q;return m=b,Q=Mr(),Q===t&&(Q=null),Q!==t&&(Me=m,Q=s(Q)),m=Q,m}function Mr(){var m,Q,N,U,ce;if(m=b,Q=Kr(),Q!==t){for(N=[],U=He();U!==t;)N.push(U),U=He();N!==t?(U=Ea(),U!==t?(ce=os(),ce===t&&(ce=null),ce!==t?(Me=m,Q=o(Q,U,ce),m=Q):(b=m,m=t)):(b=m,m=t)):(b=m,m=t)}else b=m,m=t;if(m===t)if(m=b,Q=Kr(),Q!==t){for(N=[],U=He();U!==t;)N.push(U),U=He();N!==t?(U=Ea(),U===t&&(U=null),U!==t?(Me=m,Q=a(Q,U),m=Q):(b=m,m=t)):(b=m,m=t)}else b=m,m=t;return m}function os(){var m,Q,N,U,ce;for(m=b,Q=[],N=He();N!==t;)Q.push(N),N=He();if(Q!==t)if(N=Mr(),N!==t){for(U=[],ce=He();ce!==t;)U.push(ce),ce=He();U!==t?(Me=m,Q=l(N),m=Q):(b=m,m=t)}else b=m,m=t;else b=m,m=t;return m}function Ea(){var m;return r.charCodeAt(b)===59?(m=c,b++):(m=t,I===0&&be(u)),m===t&&(r.charCodeAt(b)===38?(m=g,b++):(m=t,I===0&&be(f))),m}function Kr(){var m,Q,N;return m=b,Q=j1(),Q!==t?(N=fge(),N===t&&(N=null),N!==t?(Me=m,Q=h(Q,N),m=Q):(b=m,m=t)):(b=m,m=t),m}function fge(){var m,Q,N,U,ce,Se,ht;for(m=b,Q=[],N=He();N!==t;)Q.push(N),N=He();if(Q!==t)if(N=hge(),N!==t){for(U=[],ce=He();ce!==t;)U.push(ce),ce=He();if(U!==t)if(ce=Kr(),ce!==t){for(Se=[],ht=He();ht!==t;)Se.push(ht),ht=He();Se!==t?(Me=m,Q=p(N,ce),m=Q):(b=m,m=t)}else b=m,m=t;else b=m,m=t}else b=m,m=t;else b=m,m=t;return m}function hge(){var m;return r.substr(b,2)===C?(m=C,b+=2):(m=t,I===0&&be(y)),m===t&&(r.substr(b,2)===B?(m=B,b+=2):(m=t,I===0&&be(v))),m}function j1(){var m,Q,N;return m=b,Q=Cge(),Q!==t?(N=pge(),N===t&&(N=null),N!==t?(Me=m,Q=D(Q,N),m=Q):(b=m,m=t)):(b=m,m=t),m}function pge(){var m,Q,N,U,ce,Se,ht;for(m=b,Q=[],N=He();N!==t;)Q.push(N),N=He();if(Q!==t)if(N=dge(),N!==t){for(U=[],ce=He();ce!==t;)U.push(ce),ce=He();if(U!==t)if(ce=j1(),ce!==t){for(Se=[],ht=He();ht!==t;)Se.push(ht),ht=He();Se!==t?(Me=m,Q=T(N,ce),m=Q):(b=m,m=t)}else b=m,m=t;else b=m,m=t}else b=m,m=t;else b=m,m=t;return m}function dge(){var m;return r.substr(b,2)===H?(m=H,b+=2):(m=t,I===0&&be(j)),m===t&&(r.charCodeAt(b)===124?(m=$,b++):(m=t,I===0&&be(V))),m}function qE(){var m,Q,N,U,ce,Se;if(m=b,Q=rK(),Q!==t)if(r.charCodeAt(b)===61?(N=W,b++):(N=t,I===0&&be(_)),N!==t)if(U=W1(),U!==t){for(ce=[],Se=He();Se!==t;)ce.push(Se),Se=He();ce!==t?(Me=m,Q=A(Q,U),m=Q):(b=m,m=t)}else b=m,m=t;else b=m,m=t;else b=m,m=t;if(m===t)if(m=b,Q=rK(),Q!==t)if(r.charCodeAt(b)===61?(N=W,b++):(N=t,I===0&&be(_)),N!==t){for(U=[],ce=He();ce!==t;)U.push(ce),ce=He();U!==t?(Me=m,Q=Ae(Q),m=Q):(b=m,m=t)}else b=m,m=t;else b=m,m=t;return m}function Cge(){var m,Q,N,U,ce,Se,ht,Bt,qr,hi,as;for(m=b,Q=[],N=He();N!==t;)Q.push(N),N=He();if(Q!==t)if(r.charCodeAt(b)===40?(N=ge,b++):(N=t,I===0&&be(re)),N!==t){for(U=[],ce=He();ce!==t;)U.push(ce),ce=He();if(U!==t)if(ce=Mr(),ce!==t){for(Se=[],ht=He();ht!==t;)Se.push(ht),ht=He();if(Se!==t)if(r.charCodeAt(b)===41?(ht=O,b++):(ht=t,I===0&&be(F)),ht!==t){for(Bt=[],qr=He();qr!==t;)Bt.push(qr),qr=He();if(Bt!==t){for(qr=[],hi=Np();hi!==t;)qr.push(hi),hi=Np();if(qr!==t){for(hi=[],as=He();as!==t;)hi.push(as),as=He();hi!==t?(Me=m,Q=ue(ce,qr),m=Q):(b=m,m=t)}else b=m,m=t}else b=m,m=t}else b=m,m=t;else b=m,m=t}else b=m,m=t;else b=m,m=t}else b=m,m=t;else b=m,m=t;if(m===t){for(m=b,Q=[],N=He();N!==t;)Q.push(N),N=He();if(Q!==t)if(r.charCodeAt(b)===123?(N=pe,b++):(N=t,I===0&&be(ke)),N!==t){for(U=[],ce=He();ce!==t;)U.push(ce),ce=He();if(U!==t)if(ce=Mr(),ce!==t){for(Se=[],ht=He();ht!==t;)Se.push(ht),ht=He();if(Se!==t)if(r.charCodeAt(b)===125?(ht=Fe,b++):(ht=t,I===0&&be(Ne)),ht!==t){for(Bt=[],qr=He();qr!==t;)Bt.push(qr),qr=He();if(Bt!==t){for(qr=[],hi=Np();hi!==t;)qr.push(hi),hi=Np();if(qr!==t){for(hi=[],as=He();as!==t;)hi.push(as),as=He();hi!==t?(Me=m,Q=oe(ce,qr),m=Q):(b=m,m=t)}else b=m,m=t}else b=m,m=t}else b=m,m=t;else b=m,m=t}else b=m,m=t;else b=m,m=t}else b=m,m=t;else b=m,m=t;if(m===t){for(m=b,Q=[],N=He();N!==t;)Q.push(N),N=He();if(Q!==t){for(N=[],U=qE();U!==t;)N.push(U),U=qE();if(N!==t){for(U=[],ce=He();ce!==t;)U.push(ce),ce=He();if(U!==t){if(ce=[],Se=J1(),Se!==t)for(;Se!==t;)ce.push(Se),Se=J1();else ce=t;if(ce!==t){for(Se=[],ht=He();ht!==t;)Se.push(ht),ht=He();Se!==t?(Me=m,Q=le(N,ce),m=Q):(b=m,m=t)}else b=m,m=t}else b=m,m=t}else b=m,m=t}else b=m,m=t;if(m===t){for(m=b,Q=[],N=He();N!==t;)Q.push(N),N=He();if(Q!==t){if(N=[],U=qE(),U!==t)for(;U!==t;)N.push(U),U=qE();else N=t;if(N!==t){for(U=[],ce=He();ce!==t;)U.push(ce),ce=He();U!==t?(Me=m,Q=Be(N),m=Q):(b=m,m=t)}else b=m,m=t}else b=m,m=t}}}return m}function q1(){var m,Q,N,U,ce;for(m=b,Q=[],N=He();N!==t;)Q.push(N),N=He();if(Q!==t){if(N=[],U=JE(),U!==t)for(;U!==t;)N.push(U),U=JE();else N=t;if(N!==t){for(U=[],ce=He();ce!==t;)U.push(ce),ce=He();U!==t?(Me=m,Q=fe(N),m=Q):(b=m,m=t)}else b=m,m=t}else b=m,m=t;return m}function J1(){var m,Q,N;for(m=b,Q=[],N=He();N!==t;)Q.push(N),N=He();if(Q!==t?(N=Np(),N!==t?(Me=m,Q=ae(N),m=Q):(b=m,m=t)):(b=m,m=t),m===t){for(m=b,Q=[],N=He();N!==t;)Q.push(N),N=He();Q!==t?(N=JE(),N!==t?(Me=m,Q=ae(N),m=Q):(b=m,m=t)):(b=m,m=t)}return m}function Np(){var m,Q,N,U,ce;for(m=b,Q=[],N=He();N!==t;)Q.push(N),N=He();return Q!==t?(qe.test(r.charAt(b))?(N=r.charAt(b),b++):(N=t,I===0&&be(ne)),N===t&&(N=null),N!==t?(U=mge(),U!==t?(ce=JE(),ce!==t?(Me=m,Q=Y(N,U,ce),m=Q):(b=m,m=t)):(b=m,m=t)):(b=m,m=t)):(b=m,m=t),m}function mge(){var m;return r.substr(b,2)===he?(m=he,b+=2):(m=t,I===0&&be(ie)),m===t&&(r.substr(b,2)===de?(m=de,b+=2):(m=t,I===0&&be(_e)),m===t&&(r.charCodeAt(b)===62?(m=Pt,b++):(m=t,I===0&&be(It)),m===t&&(r.substr(b,3)===Or?(m=Or,b+=3):(m=t,I===0&&be(ii)),m===t&&(r.substr(b,2)===gi?(m=gi,b+=2):(m=t,I===0&&be(hr)),m===t&&(r.charCodeAt(b)===60?(m=fi,b++):(m=t,I===0&&be(ni))))))),m}function JE(){var m,Q,N;for(m=b,Q=[],N=He();N!==t;)Q.push(N),N=He();return Q!==t?(N=W1(),N!==t?(Me=m,Q=ae(N),m=Q):(b=m,m=t)):(b=m,m=t),m}function W1(){var m,Q,N;if(m=b,Q=[],N=z1(),N!==t)for(;N!==t;)Q.push(N),N=z1();else Q=t;return Q!==t&&(Me=m,Q=Ks(Q)),m=Q,m}function z1(){var m,Q;return m=b,Q=Ege(),Q!==t&&(Me=m,Q=pr(Q)),m=Q,m===t&&(m=b,Q=Ige(),Q!==t&&(Me=m,Q=pr(Q)),m=Q,m===t&&(m=b,Q=yge(),Q!==t&&(Me=m,Q=pr(Q)),m=Q,m===t&&(m=b,Q=wge(),Q!==t&&(Me=m,Q=pr(Q)),m=Q))),m}function Ege(){var m,Q,N,U;return m=b,r.substr(b,2)===Ii?(Q=Ii,b+=2):(Q=t,I===0&&be(rs)),Q!==t?(N=Qge(),N!==t?(r.charCodeAt(b)===39?(U=fa,b++):(U=t,I===0&&be(dA)),U!==t?(Me=m,Q=cg(N),m=Q):(b=m,m=t)):(b=m,m=t)):(b=m,m=t),m}function Ige(){var m,Q,N,U;return m=b,r.charCodeAt(b)===39?(Q=fa,b++):(Q=t,I===0&&be(dA)),Q!==t?(N=Bge(),N!==t?(r.charCodeAt(b)===39?(U=fa,b++):(U=t,I===0&&be(dA)),U!==t?(Me=m,Q=cg(N),m=Q):(b=m,m=t)):(b=m,m=t)):(b=m,m=t),m}function yge(){var m,Q,N,U;if(m=b,r.substr(b,2)===is?(Q=is,b+=2):(Q=t,I===0&&be(CA)),Q!==t&&(Me=m,Q=ha()),m=Q,m===t)if(m=b,r.charCodeAt(b)===34?(Q=wp,b++):(Q=t,I===0&&be(mA)),Q!==t){for(N=[],U=V1();U!==t;)N.push(U),U=V1();N!==t?(r.charCodeAt(b)===34?(U=wp,b++):(U=t,I===0&&be(mA)),U!==t?(Me=m,Q=EA(N),m=Q):(b=m,m=t)):(b=m,m=t)}else b=m,m=t;return m}function wge(){var m,Q,N;if(m=b,Q=[],N=X1(),N!==t)for(;N!==t;)Q.push(N),N=X1();else Q=t;return Q!==t&&(Me=m,Q=EA(Q)),m=Q,m}function V1(){var m,Q;return m=b,Q=eK(),Q!==t&&(Me=m,Q=wr(Q)),m=Q,m===t&&(m=b,Q=tK(),Q!==t&&(Me=m,Q=Tl(Q)),m=Q,m===t&&(m=b,Q=aS(),Q!==t&&(Me=m,Q=ug(Q)),m=Q,m===t&&(m=b,Q=bge(),Q!==t&&(Me=m,Q=yo(Q)),m=Q))),m}function X1(){var m,Q;return m=b,Q=eK(),Q!==t&&(Me=m,Q=gg(Q)),m=Q,m===t&&(m=b,Q=tK(),Q!==t&&(Me=m,Q=Bp(Q)),m=Q,m===t&&(m=b,Q=aS(),Q!==t&&(Me=m,Q=bp(Q)),m=Q,m===t&&(m=b,Q=xge(),Q!==t&&(Me=m,Q=vr(Q)),m=Q,m===t&&(m=b,Q=vge(),Q!==t&&(Me=m,Q=yo(Q)),m=Q)))),m}function Bge(){var m,Q,N;for(m=b,Q=[],se.test(r.charAt(b))?(N=r.charAt(b),b++):(N=t,I===0&&be(wo));N!==t;)Q.push(N),se.test(r.charAt(b))?(N=r.charAt(b),b++):(N=t,I===0&&be(wo));return Q!==t&&(Me=m,Q=Fn(Q)),m=Q,m}function bge(){var m,Q,N;if(m=b,Q=[],N=Z1(),N===t&&(fg.test(r.charAt(b))?(N=r.charAt(b),b++):(N=t,I===0&&be(bt))),N!==t)for(;N!==t;)Q.push(N),N=Z1(),N===t&&(fg.test(r.charAt(b))?(N=r.charAt(b),b++):(N=t,I===0&&be(bt)));else Q=t;return Q!==t&&(Me=m,Q=Fn(Q)),m=Q,m}function Z1(){var m,Q,N;return m=b,r.substr(b,2)===Ll?(Q=Ll,b+=2):(Q=t,I===0&&be(Nn)),Q!==t&&(Me=m,Q=ns()),m=Q,m===t&&(m=b,r.charCodeAt(b)===92?(Q=ss,b++):(Q=t,I===0&&be(gt)),Q!==t?(Bo.test(r.charAt(b))?(N=r.charAt(b),b++):(N=t,I===0&&be(At)),N!==t?(Me=m,Q=ln(N),m=Q):(b=m,m=t)):(b=m,m=t)),m}function Qge(){var m,Q,N;for(m=b,Q=[],N=_1(),N===t&&(se.test(r.charAt(b))?(N=r.charAt(b),b++):(N=t,I===0&&be(wo)));N!==t;)Q.push(N),N=_1(),N===t&&(se.test(r.charAt(b))?(N=r.charAt(b),b++):(N=t,I===0&&be(wo)));return Q!==t&&(Me=m,Q=Fn(Q)),m=Q,m}function _1(){var m,Q,N;return m=b,r.substr(b,2)===S?(Q=S,b+=2):(Q=t,I===0&&be(Lt)),Q!==t&&(Me=m,Q=hg()),m=Q,m===t&&(m=b,r.substr(b,2)===Ol?(Q=Ol,b+=2):(Q=t,I===0&&be(Qp)),Q!==t&&(Me=m,Q=Sp()),m=Q,m===t&&(m=b,r.charCodeAt(b)===92?(Q=ss,b++):(Q=t,I===0&&be(gt)),Q!==t?(vp.test(r.charAt(b))?(N=r.charAt(b),b++):(N=t,I===0&&be(xp)),N!==t?(Me=m,Q=Pp(),m=Q):(b=m,m=t)):(b=m,m=t),m===t&&(m=b,r.substr(b,2)===G?(Q=G,b+=2):(Q=t,I===0&&be(yt)),Q!==t&&(Me=m,Q=IA()),m=Q,m===t&&(m=b,r.substr(b,2)===zi?(Q=zi,b+=2):(Q=t,I===0&&be(Ml)),Q!==t&&(Me=m,Q=Xe()),m=Q,m===t&&(m=b,r.substr(b,2)===pa?(Q=pa,b+=2):(Q=t,I===0&&be(pg)),Q!==t&&(Me=m,Q=OE()),m=Q,m===t&&(m=b,r.substr(b,2)===Dp?(Q=Dp,b+=2):(Q=t,I===0&&be(ME)),Q!==t&&(Me=m,Q=ar()),m=Q,m===t&&(m=b,r.substr(b,2)===Tn?(Q=Tn,b+=2):(Q=t,I===0&&be(Kl)),Q!==t&&(Me=m,Q=kp()),m=Q,m===t&&(m=b,r.charCodeAt(b)===92?(Q=ss,b++):(Q=t,I===0&&be(gt)),Q!==t?(Us.test(r.charAt(b))?(N=r.charAt(b),b++):(N=t,I===0&&be(da)),N!==t?(Me=m,Q=ln(N),m=Q):(b=m,m=t)):(b=m,m=t),m===t&&(m=Sge()))))))))),m}function Sge(){var m,Q,N,U,ce,Se,ht,Bt,qr,hi,as,AS;return m=b,r.charCodeAt(b)===92?(Q=ss,b++):(Q=t,I===0&&be(gt)),Q!==t?(N=nS(),N!==t?(Me=m,Q=cn(N),m=Q):(b=m,m=t)):(b=m,m=t),m===t&&(m=b,r.substr(b,2)===Le?(Q=Le,b+=2):(Q=t,I===0&&be(dg)),Q!==t?(N=b,U=b,ce=nS(),ce!==t?(Se=Mn(),Se!==t?(ce=[ce,Se],U=ce):(b=U,U=t)):(b=U,U=t),U===t&&(U=nS()),U!==t?N=r.substring(N,b):N=U,N!==t?(Me=m,Q=cn(N),m=Q):(b=m,m=t)):(b=m,m=t),m===t&&(m=b,r.substr(b,2)===Ul?(Q=Ul,b+=2):(Q=t,I===0&&be(Hs)),Q!==t?(N=b,U=b,ce=Mn(),ce!==t?(Se=Mn(),Se!==t?(ht=Mn(),ht!==t?(Bt=Mn(),Bt!==t?(ce=[ce,Se,ht,Bt],U=ce):(b=U,U=t)):(b=U,U=t)):(b=U,U=t)):(b=U,U=t),U!==t?N=r.substring(N,b):N=U,N!==t?(Me=m,Q=cn(N),m=Q):(b=m,m=t)):(b=m,m=t),m===t&&(m=b,r.substr(b,2)===Hl?(Q=Hl,b+=2):(Q=t,I===0&&be(yA)),Q!==t?(N=b,U=b,ce=Mn(),ce!==t?(Se=Mn(),Se!==t?(ht=Mn(),ht!==t?(Bt=Mn(),Bt!==t?(qr=Mn(),qr!==t?(hi=Mn(),hi!==t?(as=Mn(),as!==t?(AS=Mn(),AS!==t?(ce=[ce,Se,ht,Bt,qr,hi,as,AS],U=ce):(b=U,U=t)):(b=U,U=t)):(b=U,U=t)):(b=U,U=t)):(b=U,U=t)):(b=U,U=t)):(b=U,U=t)):(b=U,U=t),U!==t?N=r.substring(N,b):N=U,N!==t?(Me=m,Q=Cg(N),m=Q):(b=m,m=t)):(b=m,m=t)))),m}function nS(){var m;return mg.test(r.charAt(b))?(m=r.charAt(b),b++):(m=t,I===0&&be(Ca)),m}function Mn(){var m;return ma.test(r.charAt(b))?(m=r.charAt(b),b++):(m=t,I===0&&be(rt)),m}function vge(){var m,Q,N,U,ce;if(m=b,Q=[],N=b,r.charCodeAt(b)===92?(U=ss,b++):(U=t,I===0&&be(gt)),U!==t?(r.length>b?(ce=r.charAt(b),b++):(ce=t,I===0&&be(bo)),ce!==t?(Me=N,U=ln(ce),N=U):(b=N,N=t)):(b=N,N=t),N===t&&(N=b,U=b,I++,ce=iK(),I--,ce===t?U=void 0:(b=U,U=t),U!==t?(r.length>b?(ce=r.charAt(b),b++):(ce=t,I===0&&be(bo)),ce!==t?(Me=N,U=ln(ce),N=U):(b=N,N=t)):(b=N,N=t)),N!==t)for(;N!==t;)Q.push(N),N=b,r.charCodeAt(b)===92?(U=ss,b++):(U=t,I===0&&be(gt)),U!==t?(r.length>b?(ce=r.charAt(b),b++):(ce=t,I===0&&be(bo)),ce!==t?(Me=N,U=ln(ce),N=U):(b=N,N=t)):(b=N,N=t),N===t&&(N=b,U=b,I++,ce=iK(),I--,ce===t?U=void 0:(b=U,U=t),U!==t?(r.length>b?(ce=r.charAt(b),b++):(ce=t,I===0&&be(bo)),ce!==t?(Me=N,U=ln(ce),N=U):(b=N,N=t)):(b=N,N=t));else Q=t;return Q!==t&&(Me=m,Q=Fn(Q)),m=Q,m}function sS(){var m,Q,N,U,ce,Se;if(m=b,r.charCodeAt(b)===45?(Q=wA,b++):(Q=t,I===0&&be(Gl)),Q===t&&(r.charCodeAt(b)===43?(Q=Gs,b++):(Q=t,I===0&&be(Yl))),Q===t&&(Q=null),Q!==t){if(N=[],qe.test(r.charAt(b))?(U=r.charAt(b),b++):(U=t,I===0&&be(ne)),U!==t)for(;U!==t;)N.push(U),qe.test(r.charAt(b))?(U=r.charAt(b),b++):(U=t,I===0&&be(ne));else N=t;if(N!==t)if(r.charCodeAt(b)===46?(U=KE,b++):(U=t,I===0&&be(Rp)),U!==t){if(ce=[],qe.test(r.charAt(b))?(Se=r.charAt(b),b++):(Se=t,I===0&&be(ne)),Se!==t)for(;Se!==t;)ce.push(Se),qe.test(r.charAt(b))?(Se=r.charAt(b),b++):(Se=t,I===0&&be(ne));else ce=t;ce!==t?(Me=m,Q=Eg(Q,N,ce),m=Q):(b=m,m=t)}else b=m,m=t;else b=m,m=t}else b=m,m=t;if(m===t){if(m=b,r.charCodeAt(b)===45?(Q=wA,b++):(Q=t,I===0&&be(Gl)),Q===t&&(r.charCodeAt(b)===43?(Q=Gs,b++):(Q=t,I===0&&be(Yl))),Q===t&&(Q=null),Q!==t){if(N=[],qe.test(r.charAt(b))?(U=r.charAt(b),b++):(U=t,I===0&&be(ne)),U!==t)for(;U!==t;)N.push(U),qe.test(r.charAt(b))?(U=r.charAt(b),b++):(U=t,I===0&&be(ne));else N=t;N!==t?(Me=m,Q=Fp(Q,N),m=Q):(b=m,m=t)}else b=m,m=t;if(m===t&&(m=b,Q=aS(),Q!==t&&(Me=m,Q=UE(Q)),m=Q,m===t&&(m=b,Q=ql(),Q!==t&&(Me=m,Q=jl(Q)),m=Q,m===t)))if(m=b,r.charCodeAt(b)===40?(Q=ge,b++):(Q=t,I===0&&be(re)),Q!==t){for(N=[],U=He();U!==t;)N.push(U),U=He();if(N!==t)if(U=$1(),U!==t){for(ce=[],Se=He();Se!==t;)ce.push(Se),Se=He();ce!==t?(r.charCodeAt(b)===41?(Se=O,b++):(Se=t,I===0&&be(F)),Se!==t?(Me=m,Q=HE(U),m=Q):(b=m,m=t)):(b=m,m=t)}else b=m,m=t;else b=m,m=t}else b=m,m=t}return m}function oS(){var m,Q,N,U,ce,Se,ht,Bt;if(m=b,Q=sS(),Q!==t){for(N=[],U=b,ce=[],Se=He();Se!==t;)ce.push(Se),Se=He();if(ce!==t)if(r.charCodeAt(b)===42?(Se=Ig,b++):(Se=t,I===0&&be(BA)),Se===t&&(r.charCodeAt(b)===47?(Se=Rr,b++):(Se=t,I===0&&be(GE))),Se!==t){for(ht=[],Bt=He();Bt!==t;)ht.push(Bt),Bt=He();ht!==t?(Bt=sS(),Bt!==t?(Me=U,ce=Ys(Q,Se,Bt),U=ce):(b=U,U=t)):(b=U,U=t)}else b=U,U=t;else b=U,U=t;for(;U!==t;){for(N.push(U),U=b,ce=[],Se=He();Se!==t;)ce.push(Se),Se=He();if(ce!==t)if(r.charCodeAt(b)===42?(Se=Ig,b++):(Se=t,I===0&&be(BA)),Se===t&&(r.charCodeAt(b)===47?(Se=Rr,b++):(Se=t,I===0&&be(GE))),Se!==t){for(ht=[],Bt=He();Bt!==t;)ht.push(Bt),Bt=He();ht!==t?(Bt=sS(),Bt!==t?(Me=U,ce=Ys(Q,Se,Bt),U=ce):(b=U,U=t)):(b=U,U=t)}else b=U,U=t;else b=U,U=t}N!==t?(Me=m,Q=js(Q,N),m=Q):(b=m,m=t)}else b=m,m=t;return m}function $1(){var m,Q,N,U,ce,Se,ht,Bt;if(m=b,Q=oS(),Q!==t){for(N=[],U=b,ce=[],Se=He();Se!==t;)ce.push(Se),Se=He();if(ce!==t)if(r.charCodeAt(b)===43?(Se=Gs,b++):(Se=t,I===0&&be(Yl)),Se===t&&(r.charCodeAt(b)===45?(Se=wA,b++):(Se=t,I===0&&be(Gl))),Se!==t){for(ht=[],Bt=He();Bt!==t;)ht.push(Bt),Bt=He();ht!==t?(Bt=oS(),Bt!==t?(Me=U,ce=yg(Q,Se,Bt),U=ce):(b=U,U=t)):(b=U,U=t)}else b=U,U=t;else b=U,U=t;for(;U!==t;){for(N.push(U),U=b,ce=[],Se=He();Se!==t;)ce.push(Se),Se=He();if(ce!==t)if(r.charCodeAt(b)===43?(Se=Gs,b++):(Se=t,I===0&&be(Yl)),Se===t&&(r.charCodeAt(b)===45?(Se=wA,b++):(Se=t,I===0&&be(Gl))),Se!==t){for(ht=[],Bt=He();Bt!==t;)ht.push(Bt),Bt=He();ht!==t?(Bt=oS(),Bt!==t?(Me=U,ce=yg(Q,Se,Bt),U=ce):(b=U,U=t)):(b=U,U=t)}else b=U,U=t;else b=U,U=t}N!==t?(Me=m,Q=js(Q,N),m=Q):(b=m,m=t)}else b=m,m=t;return m}function eK(){var m,Q,N,U,ce,Se;if(m=b,r.substr(b,3)===bA?(Q=bA,b+=3):(Q=t,I===0&&be(R)),Q!==t){for(N=[],U=He();U!==t;)N.push(U),U=He();if(N!==t)if(U=$1(),U!==t){for(ce=[],Se=He();Se!==t;)ce.push(Se),Se=He();ce!==t?(r.substr(b,2)===q?(Se=q,b+=2):(Se=t,I===0&&be(Ce)),Se!==t?(Me=m,Q=Ke(U),m=Q):(b=m,m=t)):(b=m,m=t)}else b=m,m=t;else b=m,m=t}else b=m,m=t;return m}function tK(){var m,Q,N,U;return m=b,r.substr(b,2)===Re?(Q=Re,b+=2):(Q=t,I===0&&be(ze)),Q!==t?(N=Mr(),N!==t?(r.charCodeAt(b)===41?(U=O,b++):(U=t,I===0&&be(F)),U!==t?(Me=m,Q=dt(N),m=Q):(b=m,m=t)):(b=m,m=t)):(b=m,m=t),m}function aS(){var m,Q,N,U,ce,Se;return m=b,r.substr(b,2)===Ft?(Q=Ft,b+=2):(Q=t,I===0&&be(Ln)),Q!==t?(N=ql(),N!==t?(r.substr(b,2)===JQ?(U=JQ,b+=2):(U=t,I===0&&be(k1)),U!==t?(ce=q1(),ce!==t?(r.charCodeAt(b)===125?(Se=Fe,b++):(Se=t,I===0&&be(Ne)),Se!==t?(Me=m,Q=R1(N,ce),m=Q):(b=m,m=t)):(b=m,m=t)):(b=m,m=t)):(b=m,m=t)):(b=m,m=t),m===t&&(m=b,r.substr(b,2)===Ft?(Q=Ft,b+=2):(Q=t,I===0&&be(Ln)),Q!==t?(N=ql(),N!==t?(r.substr(b,3)===WQ?(U=WQ,b+=3):(U=t,I===0&&be(F1)),U!==t?(Me=m,Q=N1(N),m=Q):(b=m,m=t)):(b=m,m=t)):(b=m,m=t),m===t&&(m=b,r.substr(b,2)===Ft?(Q=Ft,b+=2):(Q=t,I===0&&be(Ln)),Q!==t?(N=ql(),N!==t?(r.substr(b,2)===zQ?(U=zQ,b+=2):(U=t,I===0&&be(T1)),U!==t?(ce=q1(),ce!==t?(r.charCodeAt(b)===125?(Se=Fe,b++):(Se=t,I===0&&be(Ne)),Se!==t?(Me=m,Q=L1(N,ce),m=Q):(b=m,m=t)):(b=m,m=t)):(b=m,m=t)):(b=m,m=t)):(b=m,m=t),m===t&&(m=b,r.substr(b,2)===Ft?(Q=Ft,b+=2):(Q=t,I===0&&be(Ln)),Q!==t?(N=ql(),N!==t?(r.substr(b,3)===VQ?(U=VQ,b+=3):(U=t,I===0&&be(O1)),U!==t?(Me=m,Q=M1(N),m=Q):(b=m,m=t)):(b=m,m=t)):(b=m,m=t),m===t&&(m=b,r.substr(b,2)===Ft?(Q=Ft,b+=2):(Q=t,I===0&&be(Ln)),Q!==t?(N=ql(),N!==t?(r.charCodeAt(b)===125?(U=Fe,b++):(U=t,I===0&&be(Ne)),U!==t?(Me=m,Q=XQ(N),m=Q):(b=m,m=t)):(b=m,m=t)):(b=m,m=t),m===t&&(m=b,r.charCodeAt(b)===36?(Q=K1,b++):(Q=t,I===0&&be(U1)),Q!==t?(N=ql(),N!==t?(Me=m,Q=XQ(N),m=Q):(b=m,m=t)):(b=m,m=t)))))),m}function xge(){var m,Q,N;return m=b,Q=Pge(),Q!==t?(Me=b,N=H1(Q),N?N=void 0:N=t,N!==t?(Me=m,Q=G1(Q),m=Q):(b=m,m=t)):(b=m,m=t),m}function Pge(){var m,Q,N,U,ce;if(m=b,Q=[],N=b,U=b,I++,ce=nK(),I--,ce===t?U=void 0:(b=U,U=t),U!==t?(r.length>b?(ce=r.charAt(b),b++):(ce=t,I===0&&be(bo)),ce!==t?(Me=N,U=ln(ce),N=U):(b=N,N=t)):(b=N,N=t),N!==t)for(;N!==t;)Q.push(N),N=b,U=b,I++,ce=nK(),I--,ce===t?U=void 0:(b=U,U=t),U!==t?(r.length>b?(ce=r.charAt(b),b++):(ce=t,I===0&&be(bo)),ce!==t?(Me=N,U=ln(ce),N=U):(b=N,N=t)):(b=N,N=t);else Q=t;return Q!==t&&(Me=m,Q=Fn(Q)),m=Q,m}function rK(){var m,Q,N;if(m=b,Q=[],ZQ.test(r.charAt(b))?(N=r.charAt(b),b++):(N=t,I===0&&be(_Q)),N!==t)for(;N!==t;)Q.push(N),ZQ.test(r.charAt(b))?(N=r.charAt(b),b++):(N=t,I===0&&be(_Q));else Q=t;return Q!==t&&(Me=m,Q=$Q()),m=Q,m}function ql(){var m,Q,N;if(m=b,Q=[],eS.test(r.charAt(b))?(N=r.charAt(b),b++):(N=t,I===0&&be(tS)),N!==t)for(;N!==t;)Q.push(N),eS.test(r.charAt(b))?(N=r.charAt(b),b++):(N=t,I===0&&be(tS));else Q=t;return Q!==t&&(Me=m,Q=$Q()),m=Q,m}function iK(){var m;return Y1.test(r.charAt(b))?(m=r.charAt(b),b++):(m=t,I===0&&be(wg)),m}function nK(){var m;return rS.test(r.charAt(b))?(m=r.charAt(b),b++):(m=t,I===0&&be(iS)),m}function He(){var m,Q;if(m=[],YE.test(r.charAt(b))?(Q=r.charAt(b),b++):(Q=t,I===0&&be(jE)),Q!==t)for(;Q!==t;)m.push(Q),YE.test(r.charAt(b))?(Q=r.charAt(b),b++):(Q=t,I===0&&be(jE));else m=t;return m}if(k=n(),k!==t&&b===r.length)return k;throw k!==t&&b<r.length&&be(wt()),Ri(E,d<r.length?r.charAt(d):null,d<r.length?Et(d,d+1):Et(d,d))}gU.exports={SyntaxError:Zl,parse:Pfe}});var dU=w((wZe,pU)=>{"use strict";function Dfe(r,e){function t(){this.constructor=r}t.prototype=e.prototype,r.prototype=new t}function $l(r,e,t,i){this.message=r,this.expected=e,this.found=t,this.location=i,this.name="SyntaxError",typeof Error.captureStackTrace=="function"&&Error.captureStackTrace(this,$l)}Dfe($l,Error);$l.buildMessage=function(r,e){var t={literal:function(c){return'"'+n(c.text)+'"'},class:function(c){var u="",g;for(g=0;g<c.parts.length;g++)u+=c.parts[g]instanceof Array?s(c.parts[g][0])+"-"+s(c.parts[g][1]):s(c.parts[g]);return"["+(c.inverted?"^":"")+u+"]"},any:function(c){return"any character"},end:function(c){return"end of input"},other:function(c){return c.description}};function i(c){return c.charCodeAt(0).toString(16).toUpperCase()}function n(c){return c.replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,function(u){return"\\x0"+i(u)}).replace(/[\x10-\x1F\x7F-\x9F]/g,function(u){return"\\x"+i(u)})}function s(c){return c.replace(/\\/g,"\\\\").replace(/\]/g,"\\]").replace(/\^/g,"\\^").replace(/-/g,"\\-").replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,function(u){return"\\x0"+i(u)}).replace(/[\x10-\x1F\x7F-\x9F]/g,function(u){return"\\x"+i(u)})}function o(c){return t[c.type](c)}function a(c){var u=new Array(c.length),g,f;for(g=0;g<c.length;g++)u[g]=o(c[g]);if(u.sort(),u.length>0){for(g=1,f=1;g<u.length;g++)u[g-1]!==u[g]&&(u[f]=u[g],f++);u.length=f}switch(u.length){case 1:return u[0];case 2:return u[0]+" or "+u[1];default:return u.slice(0,-1).join(", ")+", or "+u[u.length-1]}}function l(c){return c?'"'+n(c)+'"':"end of input"}return"Expected "+a(r)+" but "+l(e)+" found."};function kfe(r,e){e=e!==void 0?e:{};var t={},i={resolution:le},n=le,s="/",o=ge("/",!1),a=function(ne,Y){return{from:ne,descriptor:Y}},l=function(ne){return{descriptor:ne}},c="@",u=ge("@",!1),g=function(ne,Y){return{fullName:ne,description:Y}},f=function(ne){return{fullName:ne}},h=function(){return W()},p=/^[^\/@]/,C=re(["/","@"],!0,!1),y=/^[^\/]/,B=re(["/"],!0,!1),v=0,D=0,T=[{line:1,column:1}],H=0,j=[],$=0,V;if("startRule"in e){if(!(e.startRule in i))throw new Error(`Can't start parsing from rule "`+e.startRule+'".');n=i[e.startRule]}function W(){return r.substring(D,v)}function _(){return ke(D,v)}function A(ne,Y){throw Y=Y!==void 0?Y:ke(D,v),oe([ue(ne)],r.substring(D,v),Y)}function Ae(ne,Y){throw Y=Y!==void 0?Y:ke(D,v),Ne(ne,Y)}function ge(ne,Y){return{type:"literal",text:ne,ignoreCase:Y}}function re(ne,Y,he){return{type:"class",parts:ne,inverted:Y,ignoreCase:he}}function O(){return{type:"any"}}function F(){return{type:"end"}}function ue(ne){return{type:"other",description:ne}}function pe(ne){var Y=T[ne],he;if(Y)return Y;for(he=ne-1;!T[he];)he--;for(Y=T[he],Y={line:Y.line,column:Y.column};he<ne;)r.charCodeAt(he)===10?(Y.line++,Y.column=1):Y.column++,he++;return T[ne]=Y,Y}function ke(ne,Y){var he=pe(ne),ie=pe(Y);return{start:{offset:ne,line:he.line,column:he.column},end:{offset:Y,line:ie.line,column:ie.column}}}function Fe(ne){v<H||(v>H&&(H=v,j=[]),j.push(ne))}function Ne(ne,Y){return new $l(ne,null,null,Y)}function oe(ne,Y,he){return new $l($l.buildMessage(ne,Y),ne,Y,he)}function le(){var ne,Y,he,ie;return ne=v,Y=Be(),Y!==t?(r.charCodeAt(v)===47?(he=s,v++):(he=t,$===0&&Fe(o)),he!==t?(ie=Be(),ie!==t?(D=ne,Y=a(Y,ie),ne=Y):(v=ne,ne=t)):(v=ne,ne=t)):(v=ne,ne=t),ne===t&&(ne=v,Y=Be(),Y!==t&&(D=ne,Y=l(Y)),ne=Y),ne}function Be(){var ne,Y,he,ie;return ne=v,Y=fe(),Y!==t?(r.charCodeAt(v)===64?(he=c,v++):(he=t,$===0&&Fe(u)),he!==t?(ie=qe(),ie!==t?(D=ne,Y=g(Y,ie),ne=Y):(v=ne,ne=t)):(v=ne,ne=t)):(v=ne,ne=t),ne===t&&(ne=v,Y=fe(),Y!==t&&(D=ne,Y=f(Y)),ne=Y),ne}function fe(){var ne,Y,he,ie,de;return ne=v,r.charCodeAt(v)===64?(Y=c,v++):(Y=t,$===0&&Fe(u)),Y!==t?(he=ae(),he!==t?(r.charCodeAt(v)===47?(ie=s,v++):(ie=t,$===0&&Fe(o)),ie!==t?(de=ae(),de!==t?(D=ne,Y=h(),ne=Y):(v=ne,ne=t)):(v=ne,ne=t)):(v=ne,ne=t)):(v=ne,ne=t),ne===t&&(ne=v,Y=ae(),Y!==t&&(D=ne,Y=h()),ne=Y),ne}function ae(){var ne,Y,he;if(ne=v,Y=[],p.test(r.charAt(v))?(he=r.charAt(v),v++):(he=t,$===0&&Fe(C)),he!==t)for(;he!==t;)Y.push(he),p.test(r.charAt(v))?(he=r.charAt(v),v++):(he=t,$===0&&Fe(C));else Y=t;return Y!==t&&(D=ne,Y=h()),ne=Y,ne}function qe(){var ne,Y,he;if(ne=v,Y=[],y.test(r.charAt(v))?(he=r.charAt(v),v++):(he=t,$===0&&Fe(B)),he!==t)for(;he!==t;)Y.push(he),y.test(r.charAt(v))?(he=r.charAt(v),v++):(he=t,$===0&&Fe(B));else Y=t;return Y!==t&&(D=ne,Y=h()),ne=Y,ne}if(V=n(),V!==t&&v===r.length)return V;throw V!==t&&v<r.length&&Fe(F()),oe(j,H<r.length?r.charAt(H):null,H<r.length?ke(H,H+1):ke(H,H))}pU.exports={SyntaxError:$l,parse:kfe}});var tc=w((bZe,ec)=>{"use strict";function mU(r){return typeof r>"u"||r===null}function Rfe(r){return typeof r=="object"&&r!==null}function Ffe(r){return Array.isArray(r)?r:mU(r)?[]:[r]}function Nfe(r,e){var t,i,n,s;if(e)for(s=Object.keys(e),t=0,i=s.length;t<i;t+=1)n=s[t],r[n]=e[n];return r}function Tfe(r,e){var t="",i;for(i=0;i<e;i+=1)t+=r;return t}function Lfe(r){return r===0&&Number.NEGATIVE_INFINITY===1/r}ec.exports.isNothing=mU;ec.exports.isObject=Rfe;ec.exports.toArray=Ffe;ec.exports.repeat=Tfe;ec.exports.isNegativeZero=Lfe;ec.exports.extend=Nfe});var Ng=w((QZe,EU)=>{"use strict";function Vp(r,e){Error.call(this),this.name="YAMLException",this.reason=r,this.mark=e,this.message=(this.reason||"(unknown reason)")+(this.mark?" "+this.mark.toString():""),Error.captureStackTrace?Error.captureStackTrace(this,this.constructor):this.stack=new Error().stack||""}Vp.prototype=Object.create(Error.prototype);Vp.prototype.constructor=Vp;Vp.prototype.toString=function(e){var t=this.name+": ";return t+=this.reason||"(unknown reason)",!e&&this.mark&&(t+=" "+this.mark.toString()),t};EU.exports=Vp});var wU=w((SZe,yU)=>{"use strict";var IU=tc();function HS(r,e,t,i,n){this.name=r,this.buffer=e,this.position=t,this.line=i,this.column=n}HS.prototype.getSnippet=function(e,t){var i,n,s,o,a;if(!this.buffer)return null;for(e=e||4,t=t||75,i="",n=this.position;n>0&&`\0\r
-\x85\u2028\u2029`.indexOf(this.buffer.charAt(n-1))===-1;)if(n-=1,this.position-n>t/2-1){i=" ... ",n+=5;break}for(s="",o=this.position;o<this.buffer.length&&`\0\r
-\x85\u2028\u2029`.indexOf(this.buffer.charAt(o))===-1;)if(o+=1,o-this.position>t/2-1){s=" ... ",o-=5;break}return a=this.buffer.slice(n,o),IU.repeat(" ",e)+i+a+s+`
-`+IU.repeat(" ",e+this.position-n+i.length)+"^"};HS.prototype.toString=function(e){var t,i="";return this.name&&(i+='in "'+this.name+'" '),i+="at line "+(this.line+1)+", column "+(this.column+1),e||(t=this.getSnippet(),t&&(i+=`:
-`+t)),i};yU.exports=HS});var si=w((vZe,bU)=>{"use strict";var BU=Ng(),Ofe=["kind","resolve","construct","instanceOf","predicate","represent","defaultStyle","styleAliases"],Mfe=["scalar","sequence","mapping"];function Kfe(r){var e={};return r!==null&&Object.keys(r).forEach(function(t){r[t].forEach(function(i){e[String(i)]=t})}),e}function Ufe(r,e){if(e=e||{},Object.keys(e).forEach(function(t){if(Ofe.indexOf(t)===-1)throw new BU('Unknown option "'+t+'" is met in definition of "'+r+'" YAML type.')}),this.tag=r,this.kind=e.kind||null,this.resolve=e.resolve||function(){return!0},this.construct=e.construct||function(t){return t},this.instanceOf=e.instanceOf||null,this.predicate=e.predicate||null,this.represent=e.represent||null,this.defaultStyle=e.defaultStyle||null,this.styleAliases=Kfe(e.styleAliases||null),Mfe.indexOf(this.kind)===-1)throw new BU('Unknown kind "'+this.kind+'" is specified for "'+r+'" YAML type.')}bU.exports=Ufe});var rc=w((xZe,SU)=>{"use strict";var QU=tc(),dI=Ng(),Hfe=si();function GS(r,e,t){var i=[];return r.include.forEach(function(n){t=GS(n,e,t)}),r[e].forEach(function(n){t.forEach(function(s,o){s.tag===n.tag&&s.kind===n.kind&&i.push(o)}),t.push(n)}),t.filter(function(n,s){return i.indexOf(s)===-1})}function Gfe(){var r={scalar:{},sequence:{},mapping:{},fallback:{}},e,t;function i(n){r[n.kind][n.tag]=r.fallback[n.tag]=n}for(e=0,t=arguments.length;e<t;e+=1)arguments[e].forEach(i);return r}function Tg(r){this.include=r.include||[],this.implicit=r.implicit||[],this.explicit=r.explicit||[],this.implicit.forEach(function(e){if(e.loadKind&&e.loadKind!=="scalar")throw new dI("There is a non-scalar type in the implicit list of a schema. Implicit resolving of such types is not supported.")}),this.compiledImplicit=GS(this,"implicit",[]),this.compiledExplicit=GS(this,"explicit",[]),this.compiledTypeMap=Gfe(this.compiledImplicit,this.compiledExplicit)}Tg.DEFAULT=null;Tg.create=function(){var e,t;switch(arguments.length){case 1:e=Tg.DEFAULT,t=arguments[0];break;case 2:e=arguments[0],t=arguments[1];break;default:throw new dI("Wrong number of arguments for Schema.create function")}if(e=QU.toArray(e),t=QU.toArray(t),!e.every(function(i){return i instanceof Tg}))throw new dI("Specified list of super schemas (or a single Schema object) contains a non-Schema object.");if(!t.every(function(i){return i instanceof Hfe}))throw new dI("Specified list of YAML types (or a single Type object) contains a non-Type object.");return new Tg({include:e,explicit:t})};SU.exports=Tg});var xU=w((PZe,vU)=>{"use strict";var Yfe=si();vU.exports=new Yfe("tag:yaml.org,2002:str",{kind:"scalar",construct:function(r){return r!==null?r:""}})});var DU=w((DZe,PU)=>{"use strict";var jfe=si();PU.exports=new jfe("tag:yaml.org,2002:seq",{kind:"sequence",construct:function(r){return r!==null?r:[]}})});var RU=w((kZe,kU)=>{"use strict";var qfe=si();kU.exports=new qfe("tag:yaml.org,2002:map",{kind:"mapping",construct:function(r){return r!==null?r:{}}})});var CI=w((RZe,FU)=>{"use strict";var Jfe=rc();FU.exports=new Jfe({explicit:[xU(),DU(),RU()]})});var TU=w((FZe,NU)=>{"use strict";var Wfe=si();function zfe(r){if(r===null)return!0;var e=r.length;return e===1&&r==="~"||e===4&&(r==="null"||r==="Null"||r==="NULL")}function Vfe(){return null}function Xfe(r){return r===null}NU.exports=new Wfe("tag:yaml.org,2002:null",{kind:"scalar",resolve:zfe,construct:Vfe,predicate:Xfe,represent:{canonical:function(){return"~"},lowercase:function(){return"null"},uppercase:function(){return"NULL"},camelcase:function(){return"Null"}},defaultStyle:"lowercase"})});var OU=w((NZe,LU)=>{"use strict";var Zfe=si();function _fe(r){if(r===null)return!1;var e=r.length;return e===4&&(r==="true"||r==="True"||r==="TRUE")||e===5&&(r==="false"||r==="False"||r==="FALSE")}function $fe(r){return r==="true"||r==="True"||r==="TRUE"}function ehe(r){return Object.prototype.toString.call(r)==="[object Boolean]"}LU.exports=new Zfe("tag:yaml.org,2002:bool",{kind:"scalar",resolve:_fe,construct:$fe,predicate:ehe,represent:{lowercase:function(r){return r?"true":"false"},uppercase:function(r){return r?"TRUE":"FALSE"},camelcase:function(r){return r?"True":"False"}},defaultStyle:"lowercase"})});var KU=w((TZe,MU)=>{"use strict";var the=tc(),rhe=si();function ihe(r){return 48<=r&&r<=57||65<=r&&r<=70||97<=r&&r<=102}function nhe(r){return 48<=r&&r<=55}function she(r){return 48<=r&&r<=57}function ohe(r){if(r===null)return!1;var e=r.length,t=0,i=!1,n;if(!e)return!1;if(n=r[t],(n==="-"||n==="+")&&(n=r[++t]),n==="0"){if(t+1===e)return!0;if(n=r[++t],n==="b"){for(t++;t<e;t++)if(n=r[t],n!=="_"){if(n!=="0"&&n!=="1")return!1;i=!0}return i&&n!=="_"}if(n==="x"){for(t++;t<e;t++)if(n=r[t],n!=="_"){if(!ihe(r.charCodeAt(t)))return!1;i=!0}return i&&n!=="_"}for(;t<e;t++)if(n=r[t],n!=="_"){if(!nhe(r.charCodeAt(t)))return!1;i=!0}return i&&n!=="_"}if(n==="_")return!1;for(;t<e;t++)if(n=r[t],n!=="_"){if(n===":")break;if(!she(r.charCodeAt(t)))return!1;i=!0}return!i||n==="_"?!1:n!==":"?!0:/^(:[0-5]?[0-9])+$/.test(r.slice(t))}function ahe(r){var e=r,t=1,i,n,s=[];return e.indexOf("_")!==-1&&(e=e.replace(/_/g,"")),i=e[0],(i==="-"||i==="+")&&(i==="-"&&(t=-1),e=e.slice(1),i=e[0]),e==="0"?0:i==="0"?e[1]==="b"?t*parseInt(e.slice(2),2):e[1]==="x"?t*parseInt(e,16):t*parseInt(e,8):e.indexOf(":")!==-1?(e.split(":").forEach(function(o){s.unshift(parseInt(o,10))}),e=0,n=1,s.forEach(function(o){e+=o*n,n*=60}),t*e):t*parseInt(e,10)}function Ahe(r){return Object.prototype.toString.call(r)==="[object Number]"&&r%1===0&&!the.isNegativeZero(r)}MU.exports=new rhe("tag:yaml.org,2002:int",{kind:"scalar",resolve:ohe,construct:ahe,predicate:Ahe,represent:{binary:function(r){return r>=0?"0b"+r.toString(2):"-0b"+r.toString(2).slice(1)},octal:function(r){return r>=0?"0"+r.toString(8):"-0"+r.toString(8).slice(1)},decimal:function(r){return r.toString(10)},hexadecimal:function(r){return r>=0?"0x"+r.toString(16).toUpperCase():"-0x"+r.toString(16).toUpperCase().slice(1)}},defaultStyle:"decimal",styleAliases:{binary:[2,"bin"],octal:[8,"oct"],decimal:[10,"dec"],hexadecimal:[16,"hex"]}})});var GU=w((LZe,HU)=>{"use strict";var UU=tc(),lhe=si(),che=new RegExp("^(?:[-+]?(?:0|[1-9][0-9_]*)(?:\\.[0-9_]*)?(?:[eE][-+]?[0-9]+)?|\\.[0-9_]+(?:[eE][-+]?[0-9]+)?|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN))$");function uhe(r){return!(r===null||!che.test(r)||r[r.length-1]==="_")}function ghe(r){var e,t,i,n;return e=r.replace(/_/g,"").toLowerCase(),t=e[0]==="-"?-1:1,n=[],"+-".indexOf(e[0])>=0&&(e=e.slice(1)),e===".inf"?t===1?Number.POSITIVE_INFINITY:Number.NEGATIVE_INFINITY:e===".nan"?NaN:e.indexOf(":")>=0?(e.split(":").forEach(function(s){n.unshift(parseFloat(s,10))}),e=0,i=1,n.forEach(function(s){e+=s*i,i*=60}),t*e):t*parseFloat(e,10)}var fhe=/^[-+]?[0-9]+e/;function hhe(r,e){var t;if(isNaN(r))switch(e){case"lowercase":return".nan";case"uppercase":return".NAN";case"camelcase":return".NaN"}else if(Number.POSITIVE_INFINITY===r)switch(e){case"lowercase":return".inf";case"uppercase":return".INF";case"camelcase":return".Inf"}else if(Number.NEGATIVE_INFINITY===r)switch(e){case"lowercase":return"-.inf";case"uppercase":return"-.INF";case"camelcase":return"-.Inf"}else if(UU.isNegativeZero(r))return"-0.0";return t=r.toString(10),fhe.test(t)?t.replace("e",".e"):t}function phe(r){return Object.prototype.toString.call(r)==="[object Number]"&&(r%1!==0||UU.isNegativeZero(r))}HU.exports=new lhe("tag:yaml.org,2002:float",{kind:"scalar",resolve:uhe,construct:ghe,predicate:phe,represent:hhe,defaultStyle:"lowercase"})});var YS=w((OZe,YU)=>{"use strict";var dhe=rc();YU.exports=new dhe({include:[CI()],implicit:[TU(),OU(),KU(),GU()]})});var jS=w((MZe,jU)=>{"use strict";var Che=rc();jU.exports=new Che({include:[YS()]})});var zU=w((KZe,WU)=>{"use strict";var mhe=si(),qU=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9])-([0-9][0-9])$"),JU=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9]?)-([0-9][0-9]?)(?:[Tt]|[ \\t]+)([0-9][0-9]?):([0-9][0-9]):([0-9][0-9])(?:\\.([0-9]*))?(?:[ \\t]*(Z|([-+])([0-9][0-9]?)(?::([0-9][0-9]))?))?$");function Ehe(r){return r===null?!1:qU.exec(r)!==null||JU.exec(r)!==null}function Ihe(r){var e,t,i,n,s,o,a,l=0,c=null,u,g,f;if(e=qU.exec(r),e===null&&(e=JU.exec(r)),e===null)throw new Error("Date resolve error");if(t=+e[1],i=+e[2]-1,n=+e[3],!e[4])return new Date(Date.UTC(t,i,n));if(s=+e[4],o=+e[5],a=+e[6],e[7]){for(l=e[7].slice(0,3);l.length<3;)l+="0";l=+l}return e[9]&&(u=+e[10],g=+(e[11]||0),c=(u*60+g)*6e4,e[9]==="-"&&(c=-c)),f=new Date(Date.UTC(t,i,n,s,o,a,l)),c&&f.setTime(f.getTime()-c),f}function yhe(r){return r.toISOString()}WU.exports=new mhe("tag:yaml.org,2002:timestamp",{kind:"scalar",resolve:Ehe,construct:Ihe,instanceOf:Date,represent:yhe})});var XU=w((UZe,VU)=>{"use strict";var whe=si();function Bhe(r){return r==="<<"||r===null}VU.exports=new whe("tag:yaml.org,2002:merge",{kind:"scalar",resolve:Bhe})});var $U=w((HZe,_U)=>{"use strict";var ic;try{ZU=J,ic=ZU("buffer").Buffer}catch{}var ZU,bhe=si(),qS=`ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=
-\r`;function Qhe(r){if(r===null)return!1;var e,t,i=0,n=r.length,s=qS;for(t=0;t<n;t++)if(e=s.indexOf(r.charAt(t)),!(e>64)){if(e<0)return!1;i+=6}return i%8===0}function She(r){var e,t,i=r.replace(/[\r\n=]/g,""),n=i.length,s=qS,o=0,a=[];for(e=0;e<n;e++)e%4===0&&e&&(a.push(o>>16&255),a.push(o>>8&255),a.push(o&255)),o=o<<6|s.indexOf(i.charAt(e));return t=n%4*6,t===0?(a.push(o>>16&255),a.push(o>>8&255),a.push(o&255)):t===18?(a.push(o>>10&255),a.push(o>>2&255)):t===12&&a.push(o>>4&255),ic?ic.from?ic.from(a):new ic(a):a}function vhe(r){var e="",t=0,i,n,s=r.length,o=qS;for(i=0;i<s;i++)i%3===0&&i&&(e+=o[t>>18&63],e+=o[t>>12&63],e+=o[t>>6&63],e+=o[t&63]),t=(t<<8)+r[i];return n=s%3,n===0?(e+=o[t>>18&63],e+=o[t>>12&63],e+=o[t>>6&63],e+=o[t&63]):n===2?(e+=o[t>>10&63],e+=o[t>>4&63],e+=o[t<<2&63],e+=o[64]):n===1&&(e+=o[t>>2&63],e+=o[t<<4&63],e+=o[64],e+=o[64]),e}function xhe(r){return ic&&ic.isBuffer(r)}_U.exports=new bhe("tag:yaml.org,2002:binary",{kind:"scalar",resolve:Qhe,construct:She,predicate:xhe,represent:vhe})});var t2=w((YZe,e2)=>{"use strict";var Phe=si(),Dhe=Object.prototype.hasOwnProperty,khe=Object.prototype.toString;function Rhe(r){if(r===null)return!0;var e=[],t,i,n,s,o,a=r;for(t=0,i=a.length;t<i;t+=1){if(n=a[t],o=!1,khe.call(n)!=="[object Object]")return!1;for(s in n)if(Dhe.call(n,s))if(!o)o=!0;else return!1;if(!o)return!1;if(e.indexOf(s)===-1)e.push(s);else return!1}return!0}function Fhe(r){return r!==null?r:[]}e2.exports=new Phe("tag:yaml.org,2002:omap",{kind:"sequence",resolve:Rhe,construct:Fhe})});var i2=w((jZe,r2)=>{"use strict";var Nhe=si(),The=Object.prototype.toString;function Lhe(r){if(r===null)return!0;var e,t,i,n,s,o=r;for(s=new Array(o.length),e=0,t=o.length;e<t;e+=1){if(i=o[e],The.call(i)!=="[object Object]"||(n=Object.keys(i),n.length!==1))return!1;s[e]=[n[0],i[n[0]]]}return!0}function Ohe(r){if(r===null)return[];var e,t,i,n,s,o=r;for(s=new Array(o.length),e=0,t=o.length;e<t;e+=1)i=o[e],n=Object.keys(i),s[e]=[n[0],i[n[0]]];return s}r2.exports=new Nhe("tag:yaml.org,2002:pairs",{kind:"sequence",resolve:Lhe,construct:Ohe})});var s2=w((qZe,n2)=>{"use strict";var Mhe=si(),Khe=Object.prototype.hasOwnProperty;function Uhe(r){if(r===null)return!0;var e,t=r;for(e in t)if(Khe.call(t,e)&&t[e]!==null)return!1;return!0}function Hhe(r){return r!==null?r:{}}n2.exports=new Mhe("tag:yaml.org,2002:set",{kind:"mapping",resolve:Uhe,construct:Hhe})});var Lg=w((JZe,o2)=>{"use strict";var Ghe=rc();o2.exports=new Ghe({include:[jS()],implicit:[zU(),XU()],explicit:[$U(),t2(),i2(),s2()]})});var A2=w((WZe,a2)=>{"use strict";var Yhe=si();function jhe(){return!0}function qhe(){}function Jhe(){return""}function Whe(r){return typeof r>"u"}a2.exports=new Yhe("tag:yaml.org,2002:js/undefined",{kind:"scalar",resolve:jhe,construct:qhe,predicate:Whe,represent:Jhe})});var c2=w((zZe,l2)=>{"use strict";var zhe=si();function Vhe(r){if(r===null||r.length===0)return!1;var e=r,t=/\/([gim]*)$/.exec(r),i="";return!(e[0]==="/"&&(t&&(i=t[1]),i.length>3||e[e.length-i.length-1]!=="/"))}function Xhe(r){var e=r,t=/\/([gim]*)$/.exec(r),i="";return e[0]==="/"&&(t&&(i=t[1]),e=e.slice(1,e.length-i.length-1)),new RegExp(e,i)}function Zhe(r){var e="/"+r.source+"/";return r.global&&(e+="g"),r.multiline&&(e+="m"),r.ignoreCase&&(e+="i"),e}function _he(r){return Object.prototype.toString.call(r)==="[object RegExp]"}l2.exports=new zhe("tag:yaml.org,2002:js/regexp",{kind:"scalar",resolve:Vhe,construct:Xhe,predicate:_he,represent:Zhe})});var f2=w((VZe,g2)=>{"use strict";var mI;try{u2=J,mI=u2("esprima")}catch{typeof window<"u"&&(mI=window.esprima)}var u2,$he=si();function epe(r){if(r===null)return!1;try{var e="("+r+")",t=mI.parse(e,{range:!0});return!(t.type!=="Program"||t.body.length!==1||t.body[0].type!=="ExpressionStatement"||t.body[0].expression.type!=="ArrowFunctionExpression"&&t.body[0].expression.type!=="FunctionExpression")}catch{return!1}}function tpe(r){var e="("+r+")",t=mI.parse(e,{range:!0}),i=[],n;if(t.type!=="Program"||t.body.length!==1||t.body[0].type!=="ExpressionStatement"||t.body[0].expression.type!=="ArrowFunctionExpression"&&t.body[0].expression.type!=="FunctionExpression")throw new Error("Failed to resolve function");return t.body[0].expression.params.forEach(function(s){i.push(s.name)}),n=t.body[0].expression.body.range,t.body[0].expression.body.type==="BlockStatement"?new Function(i,e.slice(n[0]+1,n[1]-1)):new Function(i,"return "+e.slice(n[0],n[1]))}function rpe(r){return r.toString()}function ipe(r){return Object.prototype.toString.call(r)==="[object Function]"}g2.exports=new $he("tag:yaml.org,2002:js/function",{kind:"scalar",resolve:epe,construct:tpe,predicate:ipe,represent:rpe})});var Xp=w((ZZe,p2)=>{"use strict";var h2=rc();p2.exports=h2.DEFAULT=new h2({include:[Lg()],explicit:[A2(),c2(),f2()]})});var N2=w((_Ze,Zp)=>{"use strict";var Ba=tc(),w2=Ng(),npe=wU(),B2=Lg(),spe=Xp(),kA=Object.prototype.hasOwnProperty,EI=1,b2=2,Q2=3,II=4,JS=1,ope=2,d2=3,ape=/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x84\x86-\x9F\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/,Ape=/[\x85\u2028\u2029]/,lpe=/[,\[\]\{\}]/,S2=/^(?:!|!!|![a-z\-]+!)$/i,v2=/^(?:!|[^,\[\]\{\}])(?:%[0-9a-f]{2}|[0-9a-z\-#;\/\?:@&=\+\$,_\.!~\*'\(\)\[\]])*$/i;function C2(r){return Object.prototype.toString.call(r)}function xo(r){return r===10||r===13}function sc(r){return r===9||r===32}function fn(r){return r===9||r===32||r===10||r===13}function Og(r){return r===44||r===91||r===93||r===123||r===125}function cpe(r){var e;return 48<=r&&r<=57?r-48:(e=r|32,97<=e&&e<=102?e-97+10:-1)}function upe(r){return r===120?2:r===117?4:r===85?8:0}function gpe(r){return 48<=r&&r<=57?r-48:-1}function m2(r){return r===48?"\0":r===97?"\x07":r===98?"\b":r===116||r===9?"	":r===110?`
-`:r===118?"\v":r===102?"\f":r===114?"\r":r===101?"\x1B":r===32?" ":r===34?'"':r===47?"/":r===92?"\\":r===78?"\x85":r===95?"\xA0":r===76?"\u2028":r===80?"\u2029":""}function fpe(r){return r<=65535?String.fromCharCode(r):String.fromCharCode((r-65536>>10)+55296,(r-65536&1023)+56320)}var x2=new Array(256),P2=new Array(256);for(nc=0;nc<256;nc++)x2[nc]=m2(nc)?1:0,P2[nc]=m2(nc);var nc;function hpe(r,e){this.input=r,this.filename=e.filename||null,this.schema=e.schema||spe,this.onWarning=e.onWarning||null,this.legacy=e.legacy||!1,this.json=e.json||!1,this.listener=e.listener||null,this.implicitTypes=this.schema.compiledImplicit,this.typeMap=this.schema.compiledTypeMap,this.length=r.length,this.position=0,this.line=0,this.lineStart=0,this.lineIndent=0,this.documents=[]}function D2(r,e){return new w2(e,new npe(r.filename,r.input,r.position,r.line,r.position-r.lineStart))}function ft(r,e){throw D2(r,e)}function yI(r,e){r.onWarning&&r.onWarning.call(null,D2(r,e))}var E2={YAML:function(e,t,i){var n,s,o;e.version!==null&&ft(e,"duplication of %YAML directive"),i.length!==1&&ft(e,"YAML directive accepts exactly one argument"),n=/^([0-9]+)\.([0-9]+)$/.exec(i[0]),n===null&&ft(e,"ill-formed argument of the YAML directive"),s=parseInt(n[1],10),o=parseInt(n[2],10),s!==1&&ft(e,"unacceptable YAML version of the document"),e.version=i[0],e.checkLineBreaks=o<2,o!==1&&o!==2&&yI(e,"unsupported YAML version of the document")},TAG:function(e,t,i){var n,s;i.length!==2&&ft(e,"TAG directive accepts exactly two arguments"),n=i[0],s=i[1],S2.test(n)||ft(e,"ill-formed tag handle (first argument) of the TAG directive"),kA.call(e.tagMap,n)&&ft(e,'there is a previously declared suffix for "'+n+'" tag handle'),v2.test(s)||ft(e,"ill-formed tag prefix (second argument) of the TAG directive"),e.tagMap[n]=s}};function DA(r,e,t,i){var n,s,o,a;if(e<t){if(a=r.input.slice(e,t),i)for(n=0,s=a.length;n<s;n+=1)o=a.charCodeAt(n),o===9||32<=o&&o<=1114111||ft(r,"expected valid JSON character");else ape.test(a)&&ft(r,"the stream contains non-printable characters");r.result+=a}}function I2(r,e,t,i){var n,s,o,a;for(Ba.isObject(t)||ft(r,"cannot merge mappings; the provided source object is unacceptable"),n=Object.keys(t),o=0,a=n.length;o<a;o+=1)s=n[o],kA.call(e,s)||(e[s]=t[s],i[s]=!0)}function Mg(r,e,t,i,n,s,o,a){var l,c;if(Array.isArray(n))for(n=Array.prototype.slice.call(n),l=0,c=n.length;l<c;l+=1)Array.isArray(n[l])&&ft(r,"nested arrays are not supported inside keys"),typeof n=="object"&&C2(n[l])==="[object Object]"&&(n[l]="[object Object]");if(typeof n=="object"&&C2(n)==="[object Object]"&&(n="[object Object]"),n=String(n),e===null&&(e={}),i==="tag:yaml.org,2002:merge")if(Array.isArray(s))for(l=0,c=s.length;l<c;l+=1)I2(r,e,s[l],t);else I2(r,e,s,t);else!r.json&&!kA.call(t,n)&&kA.call(e,n)&&(r.line=o||r.line,r.position=a||r.position,ft(r,"duplicated mapping key")),e[n]=s,delete t[n];return e}function WS(r){var e;e=r.input.charCodeAt(r.position),e===10?r.position++:e===13?(r.position++,r.input.charCodeAt(r.position)===10&&r.position++):ft(r,"a line break is expected"),r.line+=1,r.lineStart=r.position}function zr(r,e,t){for(var i=0,n=r.input.charCodeAt(r.position);n!==0;){for(;sc(n);)n=r.input.charCodeAt(++r.position);if(e&&n===35)do n=r.input.charCodeAt(++r.position);while(n!==10&&n!==13&&n!==0);if(xo(n))for(WS(r),n=r.input.charCodeAt(r.position),i++,r.lineIndent=0;n===32;)r.lineIndent++,n=r.input.charCodeAt(++r.position);else break}return t!==-1&&i!==0&&r.lineIndent<t&&yI(r,"deficient indentation"),i}function wI(r){var e=r.position,t;return t=r.input.charCodeAt(e),!!((t===45||t===46)&&t===r.input.charCodeAt(e+1)&&t===r.input.charCodeAt(e+2)&&(e+=3,t=r.input.charCodeAt(e),t===0||fn(t)))}function zS(r,e){e===1?r.result+=" ":e>1&&(r.result+=Ba.repeat(`
-`,e-1))}function ppe(r,e,t){var i,n,s,o,a,l,c,u,g=r.kind,f=r.result,h;if(h=r.input.charCodeAt(r.position),fn(h)||Og(h)||h===35||h===38||h===42||h===33||h===124||h===62||h===39||h===34||h===37||h===64||h===96||(h===63||h===45)&&(n=r.input.charCodeAt(r.position+1),fn(n)||t&&Og(n)))return!1;for(r.kind="scalar",r.result="",s=o=r.position,a=!1;h!==0;){if(h===58){if(n=r.input.charCodeAt(r.position+1),fn(n)||t&&Og(n))break}else if(h===35){if(i=r.input.charCodeAt(r.position-1),fn(i))break}else{if(r.position===r.lineStart&&wI(r)||t&&Og(h))break;if(xo(h))if(l=r.line,c=r.lineStart,u=r.lineIndent,zr(r,!1,-1),r.lineIndent>=e){a=!0,h=r.input.charCodeAt(r.position);continue}else{r.position=o,r.line=l,r.lineStart=c,r.lineIndent=u;break}}a&&(DA(r,s,o,!1),zS(r,r.line-l),s=o=r.position,a=!1),sc(h)||(o=r.position+1),h=r.input.charCodeAt(++r.position)}return DA(r,s,o,!1),r.result?!0:(r.kind=g,r.result=f,!1)}function dpe(r,e){var t,i,n;if(t=r.input.charCodeAt(r.position),t!==39)return!1;for(r.kind="scalar",r.result="",r.position++,i=n=r.position;(t=r.input.charCodeAt(r.position))!==0;)if(t===39)if(DA(r,i,r.position,!0),t=r.input.charCodeAt(++r.position),t===39)i=r.position,r.position++,n=r.position;else return!0;else xo(t)?(DA(r,i,n,!0),zS(r,zr(r,!1,e)),i=n=r.position):r.position===r.lineStart&&wI(r)?ft(r,"unexpected end of the document within a single quoted scalar"):(r.position++,n=r.position);ft(r,"unexpected end of the stream within a single quoted scalar")}function Cpe(r,e){var t,i,n,s,o,a;if(a=r.input.charCodeAt(r.position),a!==34)return!1;for(r.kind="scalar",r.result="",r.position++,t=i=r.position;(a=r.input.charCodeAt(r.position))!==0;){if(a===34)return DA(r,t,r.position,!0),r.position++,!0;if(a===92){if(DA(r,t,r.position,!0),a=r.input.charCodeAt(++r.position),xo(a))zr(r,!1,e);else if(a<256&&x2[a])r.result+=P2[a],r.position++;else if((o=upe(a))>0){for(n=o,s=0;n>0;n--)a=r.input.charCodeAt(++r.position),(o=cpe(a))>=0?s=(s<<4)+o:ft(r,"expected hexadecimal character");r.result+=fpe(s),r.position++}else ft(r,"unknown escape sequence");t=i=r.position}else xo(a)?(DA(r,t,i,!0),zS(r,zr(r,!1,e)),t=i=r.position):r.position===r.lineStart&&wI(r)?ft(r,"unexpected end of the document within a double quoted scalar"):(r.position++,i=r.position)}ft(r,"unexpected end of the stream within a double quoted scalar")}function mpe(r,e){var t=!0,i,n=r.tag,s,o=r.anchor,a,l,c,u,g,f={},h,p,C,y;if(y=r.input.charCodeAt(r.position),y===91)l=93,g=!1,s=[];else if(y===123)l=125,g=!0,s={};else return!1;for(r.anchor!==null&&(r.anchorMap[r.anchor]=s),y=r.input.charCodeAt(++r.position);y!==0;){if(zr(r,!0,e),y=r.input.charCodeAt(r.position),y===l)return r.position++,r.tag=n,r.anchor=o,r.kind=g?"mapping":"sequence",r.result=s,!0;t||ft(r,"missed comma between flow collection entries"),p=h=C=null,c=u=!1,y===63&&(a=r.input.charCodeAt(r.position+1),fn(a)&&(c=u=!0,r.position++,zr(r,!0,e))),i=r.line,Kg(r,e,EI,!1,!0),p=r.tag,h=r.result,zr(r,!0,e),y=r.input.charCodeAt(r.position),(u||r.line===i)&&y===58&&(c=!0,y=r.input.charCodeAt(++r.position),zr(r,!0,e),Kg(r,e,EI,!1,!0),C=r.result),g?Mg(r,s,f,p,h,C):c?s.push(Mg(r,null,f,p,h,C)):s.push(h),zr(r,!0,e),y=r.input.charCodeAt(r.position),y===44?(t=!0,y=r.input.charCodeAt(++r.position)):t=!1}ft(r,"unexpected end of the stream within a flow collection")}function Epe(r,e){var t,i,n=JS,s=!1,o=!1,a=e,l=0,c=!1,u,g;if(g=r.input.charCodeAt(r.position),g===124)i=!1;else if(g===62)i=!0;else return!1;for(r.kind="scalar",r.result="";g!==0;)if(g=r.input.charCodeAt(++r.position),g===43||g===45)JS===n?n=g===43?d2:ope:ft(r,"repeat of a chomping mode identifier");else if((u=gpe(g))>=0)u===0?ft(r,"bad explicit indentation width of a block scalar; it cannot be less than one"):o?ft(r,"repeat of an indentation width identifier"):(a=e+u-1,o=!0);else break;if(sc(g)){do g=r.input.charCodeAt(++r.position);while(sc(g));if(g===35)do g=r.input.charCodeAt(++r.position);while(!xo(g)&&g!==0)}for(;g!==0;){for(WS(r),r.lineIndent=0,g=r.input.charCodeAt(r.position);(!o||r.lineIndent<a)&&g===32;)r.lineIndent++,g=r.input.charCodeAt(++r.position);if(!o&&r.lineIndent>a&&(a=r.lineIndent),xo(g)){l++;continue}if(r.lineIndent<a){n===d2?r.result+=Ba.repeat(`
-`,s?1+l:l):n===JS&&s&&(r.result+=`
-`);break}for(i?sc(g)?(c=!0,r.result+=Ba.repeat(`
-`,s?1+l:l)):c?(c=!1,r.result+=Ba.repeat(`
-`,l+1)):l===0?s&&(r.result+=" "):r.result+=Ba.repeat(`
-`,l):r.result+=Ba.repeat(`
-`,s?1+l:l),s=!0,o=!0,l=0,t=r.position;!xo(g)&&g!==0;)g=r.input.charCodeAt(++r.position);DA(r,t,r.position,!1)}return!0}function y2(r,e){var t,i=r.tag,n=r.anchor,s=[],o,a=!1,l;for(r.anchor!==null&&(r.anchorMap[r.anchor]=s),l=r.input.charCodeAt(r.position);l!==0&&!(l!==45||(o=r.input.charCodeAt(r.position+1),!fn(o)));){if(a=!0,r.position++,zr(r,!0,-1)&&r.lineIndent<=e){s.push(null),l=r.input.charCodeAt(r.position);continue}if(t=r.line,Kg(r,e,Q2,!1,!0),s.push(r.result),zr(r,!0,-1),l=r.input.charCodeAt(r.position),(r.line===t||r.lineIndent>e)&&l!==0)ft(r,"bad indentation of a sequence entry");else if(r.lineIndent<e)break}return a?(r.tag=i,r.anchor=n,r.kind="sequence",r.result=s,!0):!1}function Ipe(r,e,t){var i,n,s,o,a=r.tag,l=r.anchor,c={},u={},g=null,f=null,h=null,p=!1,C=!1,y;for(r.anchor!==null&&(r.anchorMap[r.anchor]=c),y=r.input.charCodeAt(r.position);y!==0;){if(i=r.input.charCodeAt(r.position+1),s=r.line,o=r.position,(y===63||y===58)&&fn(i))y===63?(p&&(Mg(r,c,u,g,f,null),g=f=h=null),C=!0,p=!0,n=!0):p?(p=!1,n=!0):ft(r,"incomplete explicit mapping pair; a key node is missed; or followed by a non-tabulated empty line"),r.position+=1,y=i;else if(Kg(r,t,b2,!1,!0))if(r.line===s){for(y=r.input.charCodeAt(r.position);sc(y);)y=r.input.charCodeAt(++r.position);if(y===58)y=r.input.charCodeAt(++r.position),fn(y)||ft(r,"a whitespace character is expected after the key-value separator within a block mapping"),p&&(Mg(r,c,u,g,f,null),g=f=h=null),C=!0,p=!1,n=!1,g=r.tag,f=r.result;else if(C)ft(r,"can not read an implicit mapping pair; a colon is missed");else return r.tag=a,r.anchor=l,!0}else if(C)ft(r,"can not read a block mapping entry; a multiline key may not be an implicit key");else return r.tag=a,r.anchor=l,!0;else break;if((r.line===s||r.lineIndent>e)&&(Kg(r,e,II,!0,n)&&(p?f=r.result:h=r.result),p||(Mg(r,c,u,g,f,h,s,o),g=f=h=null),zr(r,!0,-1),y=r.input.charCodeAt(r.position)),r.lineIndent>e&&y!==0)ft(r,"bad indentation of a mapping entry");else if(r.lineIndent<e)break}return p&&Mg(r,c,u,g,f,null),C&&(r.tag=a,r.anchor=l,r.kind="mapping",r.result=c),C}function ype(r){var e,t=!1,i=!1,n,s,o;if(o=r.input.charCodeAt(r.position),o!==33)return!1;if(r.tag!==null&&ft(r,"duplication of a tag property"),o=r.input.charCodeAt(++r.position),o===60?(t=!0,o=r.input.charCodeAt(++r.position)):o===33?(i=!0,n="!!",o=r.input.charCodeAt(++r.position)):n="!",e=r.position,t){do o=r.input.charCodeAt(++r.position);while(o!==0&&o!==62);r.position<r.length?(s=r.input.slice(e,r.position),o=r.input.charCodeAt(++r.position)):ft(r,"unexpected end of the stream within a verbatim tag")}else{for(;o!==0&&!fn(o);)o===33&&(i?ft(r,"tag suffix cannot contain exclamation marks"):(n=r.input.slice(e-1,r.position+1),S2.test(n)||ft(r,"named tag handle cannot contain such characters"),i=!0,e=r.position+1)),o=r.input.charCodeAt(++r.position);s=r.input.slice(e,r.position),lpe.test(s)&&ft(r,"tag suffix cannot contain flow indicator characters")}return s&&!v2.test(s)&&ft(r,"tag name cannot contain such characters: "+s),t?r.tag=s:kA.call(r.tagMap,n)?r.tag=r.tagMap[n]+s:n==="!"?r.tag="!"+s:n==="!!"?r.tag="tag:yaml.org,2002:"+s:ft(r,'undeclared tag handle "'+n+'"'),!0}function wpe(r){var e,t;if(t=r.input.charCodeAt(r.position),t!==38)return!1;for(r.anchor!==null&&ft(r,"duplication of an anchor property"),t=r.input.charCodeAt(++r.position),e=r.position;t!==0&&!fn(t)&&!Og(t);)t=r.input.charCodeAt(++r.position);return r.position===e&&ft(r,"name of an anchor node must contain at least one character"),r.anchor=r.input.slice(e,r.position),!0}function Bpe(r){var e,t,i;if(i=r.input.charCodeAt(r.position),i!==42)return!1;for(i=r.input.charCodeAt(++r.position),e=r.position;i!==0&&!fn(i)&&!Og(i);)i=r.input.charCodeAt(++r.position);return r.position===e&&ft(r,"name of an alias node must contain at least one character"),t=r.input.slice(e,r.position),kA.call(r.anchorMap,t)||ft(r,'unidentified alias "'+t+'"'),r.result=r.anchorMap[t],zr(r,!0,-1),!0}function Kg(r,e,t,i,n){var s,o,a,l=1,c=!1,u=!1,g,f,h,p,C;if(r.listener!==null&&r.listener("open",r),r.tag=null,r.anchor=null,r.kind=null,r.result=null,s=o=a=II===t||Q2===t,i&&zr(r,!0,-1)&&(c=!0,r.lineIndent>e?l=1:r.lineIndent===e?l=0:r.lineIndent<e&&(l=-1)),l===1)for(;ype(r)||wpe(r);)zr(r,!0,-1)?(c=!0,a=s,r.lineIndent>e?l=1:r.lineIndent===e?l=0:r.lineIndent<e&&(l=-1)):a=!1;if(a&&(a=c||n),(l===1||II===t)&&(EI===t||b2===t?p=e:p=e+1,C=r.position-r.lineStart,l===1?a&&(y2(r,C)||Ipe(r,C,p))||mpe(r,p)?u=!0:(o&&Epe(r,p)||dpe(r,p)||Cpe(r,p)?u=!0:Bpe(r)?(u=!0,(r.tag!==null||r.anchor!==null)&&ft(r,"alias node should not have any properties")):ppe(r,p,EI===t)&&(u=!0,r.tag===null&&(r.tag="?")),r.anchor!==null&&(r.anchorMap[r.anchor]=r.result)):l===0&&(u=a&&y2(r,C))),r.tag!==null&&r.tag!=="!")if(r.tag==="?"){for(r.result!==null&&r.kind!=="scalar"&&ft(r,'unacceptable node kind for !<?> tag; it should be "scalar", not "'+r.kind+'"'),g=0,f=r.implicitTypes.length;g<f;g+=1)if(h=r.implicitTypes[g],h.resolve(r.result)){r.result=h.construct(r.result),r.tag=h.tag,r.anchor!==null&&(r.anchorMap[r.anchor]=r.result);break}}else kA.call(r.typeMap[r.kind||"fallback"],r.tag)?(h=r.typeMap[r.kind||"fallback"][r.tag],r.result!==null&&h.kind!==r.kind&&ft(r,"unacceptable node kind for !<"+r.tag+'> tag; it should be "'+h.kind+'", not "'+r.kind+'"'),h.resolve(r.result)?(r.result=h.construct(r.result),r.anchor!==null&&(r.anchorMap[r.anchor]=r.result)):ft(r,"cannot resolve a node with !<"+r.tag+"> explicit tag")):ft(r,"unknown tag !<"+r.tag+">");return r.listener!==null&&r.listener("close",r),r.tag!==null||r.anchor!==null||u}function bpe(r){var e=r.position,t,i,n,s=!1,o;for(r.version=null,r.checkLineBreaks=r.legacy,r.tagMap={},r.anchorMap={};(o=r.input.charCodeAt(r.position))!==0&&(zr(r,!0,-1),o=r.input.charCodeAt(r.position),!(r.lineIndent>0||o!==37));){for(s=!0,o=r.input.charCodeAt(++r.position),t=r.position;o!==0&&!fn(o);)o=r.input.charCodeAt(++r.position);for(i=r.input.slice(t,r.position),n=[],i.length<1&&ft(r,"directive name must not be less than one character in length");o!==0;){for(;sc(o);)o=r.input.charCodeAt(++r.position);if(o===35){do o=r.input.charCodeAt(++r.position);while(o!==0&&!xo(o));break}if(xo(o))break;for(t=r.position;o!==0&&!fn(o);)o=r.input.charCodeAt(++r.position);n.push(r.input.slice(t,r.position))}o!==0&&WS(r),kA.call(E2,i)?E2[i](r,i,n):yI(r,'unknown document directive "'+i+'"')}if(zr(r,!0,-1),r.lineIndent===0&&r.input.charCodeAt(r.position)===45&&r.input.charCodeAt(r.position+1)===45&&r.input.charCodeAt(r.position+2)===45?(r.position+=3,zr(r,!0,-1)):s&&ft(r,"directives end mark is expected"),Kg(r,r.lineIndent-1,II,!1,!0),zr(r,!0,-1),r.checkLineBreaks&&Ape.test(r.input.slice(e,r.position))&&yI(r,"non-ASCII line breaks are interpreted as content"),r.documents.push(r.result),r.position===r.lineStart&&wI(r)){r.input.charCodeAt(r.position)===46&&(r.position+=3,zr(r,!0,-1));return}if(r.position<r.length-1)ft(r,"end of the stream or a document separator is expected");else return}function k2(r,e){r=String(r),e=e||{},r.length!==0&&(r.charCodeAt(r.length-1)!==10&&r.charCodeAt(r.length-1)!==13&&(r+=`
-`),r.charCodeAt(0)===65279&&(r=r.slice(1)));var t=new hpe(r,e),i=r.indexOf("\0");for(i!==-1&&(t.position=i,ft(t,"null byte is not allowed in input")),t.input+="\0";t.input.charCodeAt(t.position)===32;)t.lineIndent+=1,t.position+=1;for(;t.position<t.length-1;)bpe(t);return t.documents}function R2(r,e,t){e!==null&&typeof e=="object"&&typeof t>"u"&&(t=e,e=null);var i=k2(r,t);if(typeof e!="function")return i;for(var n=0,s=i.length;n<s;n+=1)e(i[n])}function F2(r,e){var t=k2(r,e);if(t.length!==0){if(t.length===1)return t[0];throw new w2("expected a single document in the stream, but found more")}}function Qpe(r,e,t){return typeof e=="object"&&e!==null&&typeof t>"u"&&(t=e,e=null),R2(r,e,Ba.extend({schema:B2},t))}function Spe(r,e){return F2(r,Ba.extend({schema:B2},e))}Zp.exports.loadAll=R2;Zp.exports.load=F2;Zp.exports.safeLoadAll=Qpe;Zp.exports.safeLoad=Spe});var iH=w(($Ze,_S)=>{"use strict";var $p=tc(),ed=Ng(),vpe=Xp(),xpe=Lg(),G2=Object.prototype.toString,Y2=Object.prototype.hasOwnProperty,Ppe=9,_p=10,Dpe=13,kpe=32,Rpe=33,Fpe=34,j2=35,Npe=37,Tpe=38,Lpe=39,Ope=42,q2=44,Mpe=45,J2=58,Kpe=61,Upe=62,Hpe=63,Gpe=64,W2=91,z2=93,Ype=96,V2=123,jpe=124,X2=125,Ni={};Ni[0]="\\0";Ni[7]="\\a";Ni[8]="\\b";Ni[9]="\\t";Ni[10]="\\n";Ni[11]="\\v";Ni[12]="\\f";Ni[13]="\\r";Ni[27]="\\e";Ni[34]='\\"';Ni[92]="\\\\";Ni[133]="\\N";Ni[160]="\\_";Ni[8232]="\\L";Ni[8233]="\\P";var qpe=["y","Y","yes","Yes","YES","on","On","ON","n","N","no","No","NO","off","Off","OFF"];function Jpe(r,e){var t,i,n,s,o,a,l;if(e===null)return{};for(t={},i=Object.keys(e),n=0,s=i.length;n<s;n+=1)o=i[n],a=String(e[o]),o.slice(0,2)==="!!"&&(o="tag:yaml.org,2002:"+o.slice(2)),l=r.compiledTypeMap.fallback[o],l&&Y2.call(l.styleAliases,a)&&(a=l.styleAliases[a]),t[o]=a;return t}function T2(r){var e,t,i;if(e=r.toString(16).toUpperCase(),r<=255)t="x",i=2;else if(r<=65535)t="u",i=4;else if(r<=4294967295)t="U",i=8;else throw new ed("code point within a string may not be greater than 0xFFFFFFFF");return"\\"+t+$p.repeat("0",i-e.length)+e}function Wpe(r){this.schema=r.schema||vpe,this.indent=Math.max(1,r.indent||2),this.noArrayIndent=r.noArrayIndent||!1,this.skipInvalid=r.skipInvalid||!1,this.flowLevel=$p.isNothing(r.flowLevel)?-1:r.flowLevel,this.styleMap=Jpe(this.schema,r.styles||null),this.sortKeys=r.sortKeys||!1,this.lineWidth=r.lineWidth||80,this.noRefs=r.noRefs||!1,this.noCompatMode=r.noCompatMode||!1,this.condenseFlow=r.condenseFlow||!1,this.implicitTypes=this.schema.compiledImplicit,this.explicitTypes=this.schema.compiledExplicit,this.tag=null,this.result="",this.duplicates=[],this.usedDuplicates=null}function L2(r,e){for(var t=$p.repeat(" ",e),i=0,n=-1,s="",o,a=r.length;i<a;)n=r.indexOf(`
-`,i),n===-1?(o=r.slice(i),i=a):(o=r.slice(i,n+1),i=n+1),o.length&&o!==`
-`&&(s+=t),s+=o;return s}function VS(r,e){return`
-`+$p.repeat(" ",r.indent*e)}function zpe(r,e){var t,i,n;for(t=0,i=r.implicitTypes.length;t<i;t+=1)if(n=r.implicitTypes[t],n.resolve(e))return!0;return!1}function ZS(r){return r===kpe||r===Ppe}function Ug(r){return 32<=r&&r<=126||161<=r&&r<=55295&&r!==8232&&r!==8233||57344<=r&&r<=65533&&r!==65279||65536<=r&&r<=1114111}function Vpe(r){return Ug(r)&&!ZS(r)&&r!==65279&&r!==Dpe&&r!==_p}function O2(r,e){return Ug(r)&&r!==65279&&r!==q2&&r!==W2&&r!==z2&&r!==V2&&r!==X2&&r!==J2&&(r!==j2||e&&Vpe(e))}function Xpe(r){return Ug(r)&&r!==65279&&!ZS(r)&&r!==Mpe&&r!==Hpe&&r!==J2&&r!==q2&&r!==W2&&r!==z2&&r!==V2&&r!==X2&&r!==j2&&r!==Tpe&&r!==Ope&&r!==Rpe&&r!==jpe&&r!==Kpe&&r!==Upe&&r!==Lpe&&r!==Fpe&&r!==Npe&&r!==Gpe&&r!==Ype}function Z2(r){var e=/^\n* /;return e.test(r)}var _2=1,$2=2,eH=3,tH=4,BI=5;function Zpe(r,e,t,i,n){var s,o,a,l=!1,c=!1,u=i!==-1,g=-1,f=Xpe(r.charCodeAt(0))&&!ZS(r.charCodeAt(r.length-1));if(e)for(s=0;s<r.length;s++){if(o=r.charCodeAt(s),!Ug(o))return BI;a=s>0?r.charCodeAt(s-1):null,f=f&&O2(o,a)}else{for(s=0;s<r.length;s++){if(o=r.charCodeAt(s),o===_p)l=!0,u&&(c=c||s-g-1>i&&r[g+1]!==" ",g=s);else if(!Ug(o))return BI;a=s>0?r.charCodeAt(s-1):null,f=f&&O2(o,a)}c=c||u&&s-g-1>i&&r[g+1]!==" "}return!l&&!c?f&&!n(r)?_2:$2:t>9&&Z2(r)?BI:c?tH:eH}function _pe(r,e,t,i){r.dump=function(){if(e.length===0)return"''";if(!r.noCompatMode&&qpe.indexOf(e)!==-1)return"'"+e+"'";var n=r.indent*Math.max(1,t),s=r.lineWidth===-1?-1:Math.max(Math.min(r.lineWidth,40),r.lineWidth-n),o=i||r.flowLevel>-1&&t>=r.flowLevel;function a(l){return zpe(r,l)}switch(Zpe(e,o,r.indent,s,a)){case _2:return e;case $2:return"'"+e.replace(/'/g,"''")+"'";case eH:return"|"+M2(e,r.indent)+K2(L2(e,n));case tH:return">"+M2(e,r.indent)+K2(L2($pe(e,s),n));case BI:return'"'+ede(e,s)+'"';default:throw new ed("impossible error: invalid scalar style")}}()}function M2(r,e){var t=Z2(r)?String(e):"",i=r[r.length-1]===`
-`,n=i&&(r[r.length-2]===`
-`||r===`
-`),s=n?"+":i?"":"-";return t+s+`
-`}function K2(r){return r[r.length-1]===`
-`?r.slice(0,-1):r}function $pe(r,e){for(var t=/(\n+)([^\n]*)/g,i=function(){var c=r.indexOf(`
-`);return c=c!==-1?c:r.length,t.lastIndex=c,U2(r.slice(0,c),e)}(),n=r[0]===`
-`||r[0]===" ",s,o;o=t.exec(r);){var a=o[1],l=o[2];s=l[0]===" ",i+=a+(!n&&!s&&l!==""?`
-`:"")+U2(l,e),n=s}return i}function U2(r,e){if(r===""||r[0]===" ")return r;for(var t=/ [^ ]/g,i,n=0,s,o=0,a=0,l="";i=t.exec(r);)a=i.index,a-n>e&&(s=o>n?o:a,l+=`
-`+r.slice(n,s),n=s+1),o=a;return l+=`
-`,r.length-n>e&&o>n?l+=r.slice(n,o)+`
-`+r.slice(o+1):l+=r.slice(n),l.slice(1)}function ede(r){for(var e="",t,i,n,s=0;s<r.length;s++){if(t=r.charCodeAt(s),t>=55296&&t<=56319&&(i=r.charCodeAt(s+1),i>=56320&&i<=57343)){e+=T2((t-55296)*1024+i-56320+65536),s++;continue}n=Ni[t],e+=!n&&Ug(t)?r[s]:n||T2(t)}return e}function tde(r,e,t){var i="",n=r.tag,s,o;for(s=0,o=t.length;s<o;s+=1)oc(r,e,t[s],!1,!1)&&(s!==0&&(i+=","+(r.condenseFlow?"":" ")),i+=r.dump);r.tag=n,r.dump="["+i+"]"}function rde(r,e,t,i){var n="",s=r.tag,o,a;for(o=0,a=t.length;o<a;o+=1)oc(r,e+1,t[o],!0,!0)&&((!i||o!==0)&&(n+=VS(r,e)),r.dump&&_p===r.dump.charCodeAt(0)?n+="-":n+="- ",n+=r.dump);r.tag=s,r.dump=n||"[]"}function ide(r,e,t){var i="",n=r.tag,s=Object.keys(t),o,a,l,c,u;for(o=0,a=s.length;o<a;o+=1)u="",o!==0&&(u+=", "),r.condenseFlow&&(u+='"'),l=s[o],c=t[l],oc(r,e,l,!1,!1)&&(r.dump.length>1024&&(u+="? "),u+=r.dump+(r.condenseFlow?'"':"")+":"+(r.condenseFlow?"":" "),oc(r,e,c,!1,!1)&&(u+=r.dump,i+=u));r.tag=n,r.dump="{"+i+"}"}function nde(r,e,t,i){var n="",s=r.tag,o=Object.keys(t),a,l,c,u,g,f;if(r.sortKeys===!0)o.sort();else if(typeof r.sortKeys=="function")o.sort(r.sortKeys);else if(r.sortKeys)throw new ed("sortKeys must be a boolean or a function");for(a=0,l=o.length;a<l;a+=1)f="",(!i||a!==0)&&(f+=VS(r,e)),c=o[a],u=t[c],oc(r,e+1,c,!0,!0,!0)&&(g=r.tag!==null&&r.tag!=="?"||r.dump&&r.dump.length>1024,g&&(r.dump&&_p===r.dump.charCodeAt(0)?f+="?":f+="? "),f+=r.dump,g&&(f+=VS(r,e)),oc(r,e+1,u,!0,g)&&(r.dump&&_p===r.dump.charCodeAt(0)?f+=":":f+=": ",f+=r.dump,n+=f));r.tag=s,r.dump=n||"{}"}function H2(r,e,t){var i,n,s,o,a,l;for(n=t?r.explicitTypes:r.implicitTypes,s=0,o=n.length;s<o;s+=1)if(a=n[s],(a.instanceOf||a.predicate)&&(!a.instanceOf||typeof e=="object"&&e instanceof a.instanceOf)&&(!a.predicate||a.predicate(e))){if(r.tag=t?a.tag:"?",a.represent){if(l=r.styleMap[a.tag]||a.defaultStyle,G2.call(a.represent)==="[object Function]")i=a.represent(e,l);else if(Y2.call(a.represent,l))i=a.represent[l](e,l);else throw new ed("!<"+a.tag+'> tag resolver accepts not "'+l+'" style');r.dump=i}return!0}return!1}function oc(r,e,t,i,n,s){r.tag=null,r.dump=t,H2(r,t,!1)||H2(r,t,!0);var o=G2.call(r.dump);i&&(i=r.flowLevel<0||r.flowLevel>e);var a=o==="[object Object]"||o==="[object Array]",l,c;if(a&&(l=r.duplicates.indexOf(t),c=l!==-1),(r.tag!==null&&r.tag!=="?"||c||r.indent!==2&&e>0)&&(n=!1),c&&r.usedDuplicates[l])r.dump="*ref_"+l;else{if(a&&c&&!r.usedDuplicates[l]&&(r.usedDuplicates[l]=!0),o==="[object Object]")i&&Object.keys(r.dump).length!==0?(nde(r,e,r.dump,n),c&&(r.dump="&ref_"+l+r.dump)):(ide(r,e,r.dump),c&&(r.dump="&ref_"+l+" "+r.dump));else if(o==="[object Array]"){var u=r.noArrayIndent&&e>0?e-1:e;i&&r.dump.length!==0?(rde(r,u,r.dump,n),c&&(r.dump="&ref_"+l+r.dump)):(tde(r,u,r.dump),c&&(r.dump="&ref_"+l+" "+r.dump))}else if(o==="[object String]")r.tag!=="?"&&_pe(r,r.dump,e,s);else{if(r.skipInvalid)return!1;throw new ed("unacceptable kind of an object to dump "+o)}r.tag!==null&&r.tag!=="?"&&(r.dump="!<"+r.tag+"> "+r.dump)}return!0}function sde(r,e){var t=[],i=[],n,s;for(XS(r,t,i),n=0,s=i.length;n<s;n+=1)e.duplicates.push(t[i[n]]);e.usedDuplicates=new Array(s)}function XS(r,e,t){var i,n,s;if(r!==null&&typeof r=="object")if(n=e.indexOf(r),n!==-1)t.indexOf(n)===-1&&t.push(n);else if(e.push(r),Array.isArray(r))for(n=0,s=r.length;n<s;n+=1)XS(r[n],e,t);else for(i=Object.keys(r),n=0,s=i.length;n<s;n+=1)XS(r[i[n]],e,t)}function rH(r,e){e=e||{};var t=new Wpe(e);return t.noRefs||sde(r,t),oc(t,0,r,!0,!0)?t.dump+`
-`:""}function ode(r,e){return rH(r,$p.extend({schema:xpe},e))}_S.exports.dump=rH;_S.exports.safeDump=ode});var sH=w((e_e,Fr)=>{"use strict";var bI=N2(),nH=iH();function QI(r){return function(){throw new Error("Function "+r+" is deprecated and cannot be used.")}}Fr.exports.Type=si();Fr.exports.Schema=rc();Fr.exports.FAILSAFE_SCHEMA=CI();Fr.exports.JSON_SCHEMA=YS();Fr.exports.CORE_SCHEMA=jS();Fr.exports.DEFAULT_SAFE_SCHEMA=Lg();Fr.exports.DEFAULT_FULL_SCHEMA=Xp();Fr.exports.load=bI.load;Fr.exports.loadAll=bI.loadAll;Fr.exports.safeLoad=bI.safeLoad;Fr.exports.safeLoadAll=bI.safeLoadAll;Fr.exports.dump=nH.dump;Fr.exports.safeDump=nH.safeDump;Fr.exports.YAMLException=Ng();Fr.exports.MINIMAL_SCHEMA=CI();Fr.exports.SAFE_SCHEMA=Lg();Fr.exports.DEFAULT_SCHEMA=Xp();Fr.exports.scan=QI("scan");Fr.exports.parse=QI("parse");Fr.exports.compose=QI("compose");Fr.exports.addConstructor=QI("addConstructor")});var aH=w((t_e,oH)=>{"use strict";var ade=sH();oH.exports=ade});var lH=w((r_e,AH)=>{"use strict";function Ade(r,e){function t(){this.constructor=r}t.prototype=e.prototype,r.prototype=new t}function ac(r,e,t,i){this.message=r,this.expected=e,this.found=t,this.location=i,this.name="SyntaxError",typeof Error.captureStackTrace=="function"&&Error.captureStackTrace(this,ac)}Ade(ac,Error);ac.buildMessage=function(r,e){var t={literal:function(c){return'"'+n(c.text)+'"'},class:function(c){var u="",g;for(g=0;g<c.parts.length;g++)u+=c.parts[g]instanceof Array?s(c.parts[g][0])+"-"+s(c.parts[g][1]):s(c.parts[g]);return"["+(c.inverted?"^":"")+u+"]"},any:function(c){return"any character"},end:function(c){return"end of input"},other:function(c){return c.description}};function i(c){return c.charCodeAt(0).toString(16).toUpperCase()}function n(c){return c.replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,function(u){return"\\x0"+i(u)}).replace(/[\x10-\x1F\x7F-\x9F]/g,function(u){return"\\x"+i(u)})}function s(c){return c.replace(/\\/g,"\\\\").replace(/\]/g,"\\]").replace(/\^/g,"\\^").replace(/-/g,"\\-").replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,function(u){return"\\x0"+i(u)}).replace(/[\x10-\x1F\x7F-\x9F]/g,function(u){return"\\x"+i(u)})}function o(c){return t[c.type](c)}function a(c){var u=new Array(c.length),g,f;for(g=0;g<c.length;g++)u[g]=o(c[g]);if(u.sort(),u.length>0){for(g=1,f=1;g<u.length;g++)u[g-1]!==u[g]&&(u[f]=u[g],f++);u.length=f}switch(u.length){case 1:return u[0];case 2:return u[0]+" or "+u[1];default:return u.slice(0,-1).join(", ")+", or "+u[u.length-1]}}function l(c){return c?'"'+n(c)+'"':"end of input"}return"Expected "+a(r)+" but "+l(e)+" found."};function lde(r,e){e=e!==void 0?e:{};var t={},i={Start:Hs},n=Hs,s=function(R){return[].concat(...R)},o="-",a=ar("-",!1),l=function(R){return R},c=function(R){return Object.assign({},...R)},u="#",g=ar("#",!1),f=Kl(),h=function(){return{}},p=":",C=ar(":",!1),y=function(R,q){return{[R]:q}},B=",",v=ar(",",!1),D=function(R,q){return q},T=function(R,q,Ce){return Object.assign({},...[R].concat(q).map(Ke=>({[Ke]:Ce})))},H=function(R){return R},j=function(R){return R},$=Us("correct indentation"),V=" ",W=ar(" ",!1),_=function(R){return R.length===bA*yg},A=function(R){return R.length===(bA+1)*yg},Ae=function(){return bA++,!0},ge=function(){return bA--,!0},re=function(){return pg()},O=Us("pseudostring"),F=/^[^\r\n\t ?:,\][{}#&*!|>'"%@`\-]/,ue=Tn(["\r",`
-`,"	"," ","?",":",",","]","[","{","}","#","&","*","!","|",">","'",'"',"%","@","`","-"],!0,!1),pe=/^[^\r\n\t ,\][{}:#"']/,ke=Tn(["\r",`
-`,"	"," ",",","]","[","{","}",":","#",'"',"'"],!0,!1),Fe=function(){return pg().replace(/^ *| *$/g,"")},Ne="--",oe=ar("--",!1),le=/^[a-zA-Z\/0-9]/,Be=Tn([["a","z"],["A","Z"],"/",["0","9"]],!1,!1),fe=/^[^\r\n\t :,]/,ae=Tn(["\r",`
-`,"	"," ",":",","],!0,!1),qe="null",ne=ar("null",!1),Y=function(){return null},he="true",ie=ar("true",!1),de=function(){return!0},_e="false",Pt=ar("false",!1),It=function(){return!1},Or=Us("string"),ii='"',gi=ar('"',!1),hr=function(){return""},fi=function(R){return R},ni=function(R){return R.join("")},Ks=/^[^"\\\0-\x1F\x7F]/,pr=Tn(['"',"\\",["\0",""],"\x7F"],!0,!1),Ii='\\"',rs=ar('\\"',!1),fa=function(){return'"'},dA="\\\\",cg=ar("\\\\",!1),is=function(){return"\\"},CA="\\/",ha=ar("\\/",!1),wp=function(){return"/"},mA="\\b",EA=ar("\\b",!1),wr=function(){return"\b"},Tl="\\f",ug=ar("\\f",!1),yo=function(){return"\f"},gg="\\n",Bp=ar("\\n",!1),bp=function(){return`
-`},vr="\\r",se=ar("\\r",!1),wo=function(){return"\r"},Fn="\\t",fg=ar("\\t",!1),bt=function(){return"	"},Ll="\\u",Nn=ar("\\u",!1),ns=function(R,q,Ce,Ke){return String.fromCharCode(parseInt(`0x${R}${q}${Ce}${Ke}`))},ss=/^[0-9a-fA-F]/,gt=Tn([["0","9"],["a","f"],["A","F"]],!1,!1),Bo=Us("blank space"),At=/^[ \t]/,ln=Tn([" ","	"],!1,!1),S=Us("white space"),Lt=/^[ \t\n\r]/,hg=Tn([" ","	",`
-`,"\r"],!1,!1),Ol=`\r
-`,Qp=ar(`\r
-`,!1),Sp=`
-`,vp=ar(`
-`,!1),xp="\r",Pp=ar("\r",!1),G=0,yt=0,IA=[{line:1,column:1}],zi=0,Ml=[],Xe=0,pa;if("startRule"in e){if(!(e.startRule in i))throw new Error(`Can't start parsing from rule "`+e.startRule+'".');n=i[e.startRule]}function pg(){return r.substring(yt,G)}function OE(){return cn(yt,G)}function Dp(R,q){throw q=q!==void 0?q:cn(yt,G),Ul([Us(R)],r.substring(yt,G),q)}function ME(R,q){throw q=q!==void 0?q:cn(yt,G),dg(R,q)}function ar(R,q){return{type:"literal",text:R,ignoreCase:q}}function Tn(R,q,Ce){return{type:"class",parts:R,inverted:q,ignoreCase:Ce}}function Kl(){return{type:"any"}}function kp(){return{type:"end"}}function Us(R){return{type:"other",description:R}}function da(R){var q=IA[R],Ce;if(q)return q;for(Ce=R-1;!IA[Ce];)Ce--;for(q=IA[Ce],q={line:q.line,column:q.column};Ce<R;)r.charCodeAt(Ce)===10?(q.line++,q.column=1):q.column++,Ce++;return IA[R]=q,q}function cn(R,q){var Ce=da(R),Ke=da(q);return{start:{offset:R,line:Ce.line,column:Ce.column},end:{offset:q,line:Ke.line,column:Ke.column}}}function Le(R){G<zi||(G>zi&&(zi=G,Ml=[]),Ml.push(R))}function dg(R,q){return new ac(R,null,null,q)}function Ul(R,q,Ce){return new ac(ac.buildMessage(R,q),R,q,Ce)}function Hs(){var R;return R=Cg(),R}function Hl(){var R,q,Ce;for(R=G,q=[],Ce=yA();Ce!==t;)q.push(Ce),Ce=yA();return q!==t&&(yt=R,q=s(q)),R=q,R}function yA(){var R,q,Ce,Ke,Re;return R=G,q=ma(),q!==t?(r.charCodeAt(G)===45?(Ce=o,G++):(Ce=t,Xe===0&&Le(a)),Ce!==t?(Ke=Rr(),Ke!==t?(Re=Ca(),Re!==t?(yt=R,q=l(Re),R=q):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t),R}function Cg(){var R,q,Ce;for(R=G,q=[],Ce=mg();Ce!==t;)q.push(Ce),Ce=mg();return q!==t&&(yt=R,q=c(q)),R=q,R}function mg(){var R,q,Ce,Ke,Re,ze,dt,Ft,Ln;if(R=G,q=Rr(),q===t&&(q=null),q!==t){if(Ce=G,r.charCodeAt(G)===35?(Ke=u,G++):(Ke=t,Xe===0&&Le(g)),Ke!==t){if(Re=[],ze=G,dt=G,Xe++,Ft=js(),Xe--,Ft===t?dt=void 0:(G=dt,dt=t),dt!==t?(r.length>G?(Ft=r.charAt(G),G++):(Ft=t,Xe===0&&Le(f)),Ft!==t?(dt=[dt,Ft],ze=dt):(G=ze,ze=t)):(G=ze,ze=t),ze!==t)for(;ze!==t;)Re.push(ze),ze=G,dt=G,Xe++,Ft=js(),Xe--,Ft===t?dt=void 0:(G=dt,dt=t),dt!==t?(r.length>G?(Ft=r.charAt(G),G++):(Ft=t,Xe===0&&Le(f)),Ft!==t?(dt=[dt,Ft],ze=dt):(G=ze,ze=t)):(G=ze,ze=t);else Re=t;Re!==t?(Ke=[Ke,Re],Ce=Ke):(G=Ce,Ce=t)}else G=Ce,Ce=t;if(Ce===t&&(Ce=null),Ce!==t){if(Ke=[],Re=Ys(),Re!==t)for(;Re!==t;)Ke.push(Re),Re=Ys();else Ke=t;Ke!==t?(yt=R,q=h(),R=q):(G=R,R=t)}else G=R,R=t}else G=R,R=t;if(R===t&&(R=G,q=ma(),q!==t?(Ce=Gl(),Ce!==t?(Ke=Rr(),Ke===t&&(Ke=null),Ke!==t?(r.charCodeAt(G)===58?(Re=p,G++):(Re=t,Xe===0&&Le(C)),Re!==t?(ze=Rr(),ze===t&&(ze=null),ze!==t?(dt=Ca(),dt!==t?(yt=R,q=y(Ce,dt),R=q):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t),R===t&&(R=G,q=ma(),q!==t?(Ce=Gs(),Ce!==t?(Ke=Rr(),Ke===t&&(Ke=null),Ke!==t?(r.charCodeAt(G)===58?(Re=p,G++):(Re=t,Xe===0&&Le(C)),Re!==t?(ze=Rr(),ze===t&&(ze=null),ze!==t?(dt=Ca(),dt!==t?(yt=R,q=y(Ce,dt),R=q):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t),R===t))){if(R=G,q=ma(),q!==t)if(Ce=Gs(),Ce!==t)if(Ke=Rr(),Ke!==t)if(Re=KE(),Re!==t){if(ze=[],dt=Ys(),dt!==t)for(;dt!==t;)ze.push(dt),dt=Ys();else ze=t;ze!==t?(yt=R,q=y(Ce,Re),R=q):(G=R,R=t)}else G=R,R=t;else G=R,R=t;else G=R,R=t;else G=R,R=t;if(R===t)if(R=G,q=ma(),q!==t)if(Ce=Gs(),Ce!==t){if(Ke=[],Re=G,ze=Rr(),ze===t&&(ze=null),ze!==t?(r.charCodeAt(G)===44?(dt=B,G++):(dt=t,Xe===0&&Le(v)),dt!==t?(Ft=Rr(),Ft===t&&(Ft=null),Ft!==t?(Ln=Gs(),Ln!==t?(yt=Re,ze=D(Ce,Ln),Re=ze):(G=Re,Re=t)):(G=Re,Re=t)):(G=Re,Re=t)):(G=Re,Re=t),Re!==t)for(;Re!==t;)Ke.push(Re),Re=G,ze=Rr(),ze===t&&(ze=null),ze!==t?(r.charCodeAt(G)===44?(dt=B,G++):(dt=t,Xe===0&&Le(v)),dt!==t?(Ft=Rr(),Ft===t&&(Ft=null),Ft!==t?(Ln=Gs(),Ln!==t?(yt=Re,ze=D(Ce,Ln),Re=ze):(G=Re,Re=t)):(G=Re,Re=t)):(G=Re,Re=t)):(G=Re,Re=t);else Ke=t;Ke!==t?(Re=Rr(),Re===t&&(Re=null),Re!==t?(r.charCodeAt(G)===58?(ze=p,G++):(ze=t,Xe===0&&Le(C)),ze!==t?(dt=Rr(),dt===t&&(dt=null),dt!==t?(Ft=Ca(),Ft!==t?(yt=R,q=T(Ce,Ke,Ft),R=q):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)}else G=R,R=t;else G=R,R=t}return R}function Ca(){var R,q,Ce,Ke,Re,ze,dt;if(R=G,q=G,Xe++,Ce=G,Ke=js(),Ke!==t?(Re=rt(),Re!==t?(r.charCodeAt(G)===45?(ze=o,G++):(ze=t,Xe===0&&Le(a)),ze!==t?(dt=Rr(),dt!==t?(Ke=[Ke,Re,ze,dt],Ce=Ke):(G=Ce,Ce=t)):(G=Ce,Ce=t)):(G=Ce,Ce=t)):(G=Ce,Ce=t),Xe--,Ce!==t?(G=q,q=void 0):q=t,q!==t?(Ce=Ys(),Ce!==t?(Ke=bo(),Ke!==t?(Re=Hl(),Re!==t?(ze=wA(),ze!==t?(yt=R,q=H(Re),R=q):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t),R===t&&(R=G,q=js(),q!==t?(Ce=bo(),Ce!==t?(Ke=Cg(),Ke!==t?(Re=wA(),Re!==t?(yt=R,q=H(Ke),R=q):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t),R===t))if(R=G,q=Yl(),q!==t){if(Ce=[],Ke=Ys(),Ke!==t)for(;Ke!==t;)Ce.push(Ke),Ke=Ys();else Ce=t;Ce!==t?(yt=R,q=j(q),R=q):(G=R,R=t)}else G=R,R=t;return R}function ma(){var R,q,Ce;for(Xe++,R=G,q=[],r.charCodeAt(G)===32?(Ce=V,G++):(Ce=t,Xe===0&&Le(W));Ce!==t;)q.push(Ce),r.charCodeAt(G)===32?(Ce=V,G++):(Ce=t,Xe===0&&Le(W));return q!==t?(yt=G,Ce=_(q),Ce?Ce=void 0:Ce=t,Ce!==t?(q=[q,Ce],R=q):(G=R,R=t)):(G=R,R=t),Xe--,R===t&&(q=t,Xe===0&&Le($)),R}function rt(){var R,q,Ce;for(R=G,q=[],r.charCodeAt(G)===32?(Ce=V,G++):(Ce=t,Xe===0&&Le(W));Ce!==t;)q.push(Ce),r.charCodeAt(G)===32?(Ce=V,G++):(Ce=t,Xe===0&&Le(W));return q!==t?(yt=G,Ce=A(q),Ce?Ce=void 0:Ce=t,Ce!==t?(q=[q,Ce],R=q):(G=R,R=t)):(G=R,R=t),R}function bo(){var R;return yt=G,R=Ae(),R?R=void 0:R=t,R}function wA(){var R;return yt=G,R=ge(),R?R=void 0:R=t,R}function Gl(){var R;return R=jl(),R===t&&(R=Rp()),R}function Gs(){var R,q,Ce;if(R=jl(),R===t){if(R=G,q=[],Ce=Eg(),Ce!==t)for(;Ce!==t;)q.push(Ce),Ce=Eg();else q=t;q!==t&&(yt=R,q=re()),R=q}return R}function Yl(){var R;return R=Fp(),R===t&&(R=UE(),R===t&&(R=jl(),R===t&&(R=Rp()))),R}function KE(){var R;return R=Fp(),R===t&&(R=jl(),R===t&&(R=Eg())),R}function Rp(){var R,q,Ce,Ke,Re,ze;if(Xe++,R=G,F.test(r.charAt(G))?(q=r.charAt(G),G++):(q=t,Xe===0&&Le(ue)),q!==t){for(Ce=[],Ke=G,Re=Rr(),Re===t&&(Re=null),Re!==t?(pe.test(r.charAt(G))?(ze=r.charAt(G),G++):(ze=t,Xe===0&&Le(ke)),ze!==t?(Re=[Re,ze],Ke=Re):(G=Ke,Ke=t)):(G=Ke,Ke=t);Ke!==t;)Ce.push(Ke),Ke=G,Re=Rr(),Re===t&&(Re=null),Re!==t?(pe.test(r.charAt(G))?(ze=r.charAt(G),G++):(ze=t,Xe===0&&Le(ke)),ze!==t?(Re=[Re,ze],Ke=Re):(G=Ke,Ke=t)):(G=Ke,Ke=t);Ce!==t?(yt=R,q=Fe(),R=q):(G=R,R=t)}else G=R,R=t;return Xe--,R===t&&(q=t,Xe===0&&Le(O)),R}function Eg(){var R,q,Ce,Ke,Re;if(R=G,r.substr(G,2)===Ne?(q=Ne,G+=2):(q=t,Xe===0&&Le(oe)),q===t&&(q=null),q!==t)if(le.test(r.charAt(G))?(Ce=r.charAt(G),G++):(Ce=t,Xe===0&&Le(Be)),Ce!==t){for(Ke=[],fe.test(r.charAt(G))?(Re=r.charAt(G),G++):(Re=t,Xe===0&&Le(ae));Re!==t;)Ke.push(Re),fe.test(r.charAt(G))?(Re=r.charAt(G),G++):(Re=t,Xe===0&&Le(ae));Ke!==t?(yt=R,q=Fe(),R=q):(G=R,R=t)}else G=R,R=t;else G=R,R=t;return R}function Fp(){var R,q;return R=G,r.substr(G,4)===qe?(q=qe,G+=4):(q=t,Xe===0&&Le(ne)),q!==t&&(yt=R,q=Y()),R=q,R}function UE(){var R,q;return R=G,r.substr(G,4)===he?(q=he,G+=4):(q=t,Xe===0&&Le(ie)),q!==t&&(yt=R,q=de()),R=q,R===t&&(R=G,r.substr(G,5)===_e?(q=_e,G+=5):(q=t,Xe===0&&Le(Pt)),q!==t&&(yt=R,q=It()),R=q),R}function jl(){var R,q,Ce,Ke;return Xe++,R=G,r.charCodeAt(G)===34?(q=ii,G++):(q=t,Xe===0&&Le(gi)),q!==t?(r.charCodeAt(G)===34?(Ce=ii,G++):(Ce=t,Xe===0&&Le(gi)),Ce!==t?(yt=R,q=hr(),R=q):(G=R,R=t)):(G=R,R=t),R===t&&(R=G,r.charCodeAt(G)===34?(q=ii,G++):(q=t,Xe===0&&Le(gi)),q!==t?(Ce=HE(),Ce!==t?(r.charCodeAt(G)===34?(Ke=ii,G++):(Ke=t,Xe===0&&Le(gi)),Ke!==t?(yt=R,q=fi(Ce),R=q):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)),Xe--,R===t&&(q=t,Xe===0&&Le(Or)),R}function HE(){var R,q,Ce;if(R=G,q=[],Ce=Ig(),Ce!==t)for(;Ce!==t;)q.push(Ce),Ce=Ig();else q=t;return q!==t&&(yt=R,q=ni(q)),R=q,R}function Ig(){var R,q,Ce,Ke,Re,ze;return Ks.test(r.charAt(G))?(R=r.charAt(G),G++):(R=t,Xe===0&&Le(pr)),R===t&&(R=G,r.substr(G,2)===Ii?(q=Ii,G+=2):(q=t,Xe===0&&Le(rs)),q!==t&&(yt=R,q=fa()),R=q,R===t&&(R=G,r.substr(G,2)===dA?(q=dA,G+=2):(q=t,Xe===0&&Le(cg)),q!==t&&(yt=R,q=is()),R=q,R===t&&(R=G,r.substr(G,2)===CA?(q=CA,G+=2):(q=t,Xe===0&&Le(ha)),q!==t&&(yt=R,q=wp()),R=q,R===t&&(R=G,r.substr(G,2)===mA?(q=mA,G+=2):(q=t,Xe===0&&Le(EA)),q!==t&&(yt=R,q=wr()),R=q,R===t&&(R=G,r.substr(G,2)===Tl?(q=Tl,G+=2):(q=t,Xe===0&&Le(ug)),q!==t&&(yt=R,q=yo()),R=q,R===t&&(R=G,r.substr(G,2)===gg?(q=gg,G+=2):(q=t,Xe===0&&Le(Bp)),q!==t&&(yt=R,q=bp()),R=q,R===t&&(R=G,r.substr(G,2)===vr?(q=vr,G+=2):(q=t,Xe===0&&Le(se)),q!==t&&(yt=R,q=wo()),R=q,R===t&&(R=G,r.substr(G,2)===Fn?(q=Fn,G+=2):(q=t,Xe===0&&Le(fg)),q!==t&&(yt=R,q=bt()),R=q,R===t&&(R=G,r.substr(G,2)===Ll?(q=Ll,G+=2):(q=t,Xe===0&&Le(Nn)),q!==t?(Ce=BA(),Ce!==t?(Ke=BA(),Ke!==t?(Re=BA(),Re!==t?(ze=BA(),ze!==t?(yt=R,q=ns(Ce,Ke,Re,ze),R=q):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)))))))))),R}function BA(){var R;return ss.test(r.charAt(G))?(R=r.charAt(G),G++):(R=t,Xe===0&&Le(gt)),R}function Rr(){var R,q;if(Xe++,R=[],At.test(r.charAt(G))?(q=r.charAt(G),G++):(q=t,Xe===0&&Le(ln)),q!==t)for(;q!==t;)R.push(q),At.test(r.charAt(G))?(q=r.charAt(G),G++):(q=t,Xe===0&&Le(ln));else R=t;return Xe--,R===t&&(q=t,Xe===0&&Le(Bo)),R}function GE(){var R,q;if(Xe++,R=[],Lt.test(r.charAt(G))?(q=r.charAt(G),G++):(q=t,Xe===0&&Le(hg)),q!==t)for(;q!==t;)R.push(q),Lt.test(r.charAt(G))?(q=r.charAt(G),G++):(q=t,Xe===0&&Le(hg));else R=t;return Xe--,R===t&&(q=t,Xe===0&&Le(S)),R}function Ys(){var R,q,Ce,Ke,Re,ze;if(R=G,q=js(),q!==t){for(Ce=[],Ke=G,Re=Rr(),Re===t&&(Re=null),Re!==t?(ze=js(),ze!==t?(Re=[Re,ze],Ke=Re):(G=Ke,Ke=t)):(G=Ke,Ke=t);Ke!==t;)Ce.push(Ke),Ke=G,Re=Rr(),Re===t&&(Re=null),Re!==t?(ze=js(),ze!==t?(Re=[Re,ze],Ke=Re):(G=Ke,Ke=t)):(G=Ke,Ke=t);Ce!==t?(q=[q,Ce],R=q):(G=R,R=t)}else G=R,R=t;return R}function js(){var R;return r.substr(G,2)===Ol?(R=Ol,G+=2):(R=t,Xe===0&&Le(Qp)),R===t&&(r.charCodeAt(G)===10?(R=Sp,G++):(R=t,Xe===0&&Le(vp)),R===t&&(r.charCodeAt(G)===13?(R=xp,G++):(R=t,Xe===0&&Le(Pp)))),R}let yg=2,bA=0;if(pa=n(),pa!==t&&G===r.length)return pa;throw pa!==t&&G<r.length&&Le(kp()),Ul(Ml,zi<r.length?r.charAt(zi):null,zi<r.length?cn(zi,zi+1):cn(zi,zi))}AH.exports={SyntaxError:ac,parse:lde}});var pH=w((a_e,ev)=>{"use strict";var hde=r=>{let e=!1,t=!1,i=!1;for(let n=0;n<r.length;n++){let s=r[n];e&&/[a-zA-Z]/.test(s)&&s.toUpperCase()===s?(r=r.slice(0,n)+"-"+r.slice(n),e=!1,i=t,t=!0,n++):t&&i&&/[a-zA-Z]/.test(s)&&s.toLowerCase()===s?(r=r.slice(0,n-1)+"-"+r.slice(n-1),i=t,t=!1,e=!0):(e=s.toLowerCase()===s&&s.toUpperCase()!==s,i=t,t=s.toUpperCase()===s&&s.toLowerCase()!==s)}return r},hH=(r,e)=>{if(!(typeof r=="string"||Array.isArray(r)))throw new TypeError("Expected the input to be `string | string[]`");e=Object.assign({pascalCase:!1},e);let t=n=>e.pascalCase?n.charAt(0).toUpperCase()+n.slice(1):n;return Array.isArray(r)?r=r.map(n=>n.trim()).filter(n=>n.length).join("-"):r=r.trim(),r.length===0?"":r.length===1?e.pascalCase?r.toUpperCase():r.toLowerCase():(r!==r.toLowerCase()&&(r=hde(r)),r=r.replace(/^[_.\- ]+/,"").toLowerCase().replace(/[_.\- ]+(\w|$)/g,(n,s)=>s.toUpperCase()).replace(/\d+(\w|$)/g,n=>n.toUpperCase()),t(r))};ev.exports=hH;ev.exports.default=hH});var dH=w((A_e,pde)=>{pde.exports=[{name:"AppVeyor",constant:"APPVEYOR",env:"APPVEYOR",pr:"APPVEYOR_PULL_REQUEST_NUMBER"},{name:"Azure Pipelines",constant:"AZURE_PIPELINES",env:"SYSTEM_TEAMFOUNDATIONCOLLECTIONURI",pr:"SYSTEM_PULLREQUEST_PULLREQUESTID"},{name:"Appcircle",constant:"APPCIRCLE",env:"AC_APPCIRCLE"},{name:"Bamboo",constant:"BAMBOO",env:"bamboo_planKey"},{name:"Bitbucket Pipelines",constant:"BITBUCKET",env:"BITBUCKET_COMMIT",pr:"BITBUCKET_PR_ID"},{name:"Bitrise",constant:"BITRISE",env:"BITRISE_IO",pr:"BITRISE_PULL_REQUEST"},{name:"Buddy",constant:"BUDDY",env:"BUDDY_WORKSPACE_ID",pr:"BUDDY_EXECUTION_PULL_REQUEST_ID"},{name:"Buildkite",constant:"BUILDKITE",env:"BUILDKITE",pr:{env:"BUILDKITE_PULL_REQUEST",ne:"false"}},{name:"CircleCI",constant:"CIRCLE",env:"CIRCLECI",pr:"CIRCLE_PULL_REQUEST"},{name:"Cirrus CI",constant:"CIRRUS",env:"CIRRUS_CI",pr:"CIRRUS_PR"},{name:"AWS CodeBuild",constant:"CODEBUILD",env:"CODEBUILD_BUILD_ARN"},{name:"Codefresh",constant:"CODEFRESH",env:"CF_BUILD_ID",pr:{any:["CF_PULL_REQUEST_NUMBER","CF_PULL_REQUEST_ID"]}},{name:"Codeship",constant:"CODESHIP",env:{CI_NAME:"codeship"}},{name:"Drone",constant:"DRONE",env:"DRONE",pr:{DRONE_BUILD_EVENT:"pull_request"}},{name:"dsari",constant:"DSARI",env:"DSARI"},{name:"GitHub Actions",constant:"GITHUB_ACTIONS",env:"GITHUB_ACTIONS",pr:{GITHUB_EVENT_NAME:"pull_request"}},{name:"GitLab CI",constant:"GITLAB",env:"GITLAB_CI",pr:"CI_MERGE_REQUEST_ID"},{name:"GoCD",constant:"GOCD",env:"GO_PIPELINE_LABEL"},{name:"LayerCI",constant:"LAYERCI",env:"LAYERCI",pr:"LAYERCI_PULL_REQUEST"},{name:"Hudson",constant:"HUDSON",env:"HUDSON_URL"},{name:"Jenkins",constant:"JENKINS",env:["JENKINS_URL","BUILD_ID"],pr:{any:["ghprbPullId","CHANGE_ID"]}},{name:"Magnum CI",constant:"MAGNUM",env:"MAGNUM"},{name:"Netlify CI",constant:"NETLIFY",env:"NETLIFY",pr:{env:"PULL_REQUEST",ne:"false"}},{name:"Nevercode",constant:"NEVERCODE",env:"NEVERCODE",pr:{env:"NEVERCODE_PULL_REQUEST",ne:"false"}},{name:"Render",constant:"RENDER",env:"RENDER",pr:{IS_PULL_REQUEST:"true"}},{name:"Sail CI",constant:"SAIL",env:"SAILCI",pr:"SAIL_PULL_REQUEST_NUMBER"},{name:"Semaphore",constant:"SEMAPHORE",env:"SEMAPHORE",pr:"PULL_REQUEST_NUMBER"},{name:"Screwdriver",constant:"SCREWDRIVER",env:"SCREWDRIVER",pr:{env:"SD_PULL_REQUEST",ne:"false"}},{name:"Shippable",constant:"SHIPPABLE",env:"SHIPPABLE",pr:{IS_PULL_REQUEST:"true"}},{name:"Solano CI",constant:"SOLANO",env:"TDDIUM",pr:"TDDIUM_PR_ID"},{name:"Strider CD",constant:"STRIDER",env:"STRIDER"},{name:"TaskCluster",constant:"TASKCLUSTER",env:["TASK_ID","RUN_ID"]},{name:"TeamCity",constant:"TEAMCITY",env:"TEAMCITY_VERSION"},{name:"Travis CI",constant:"TRAVIS",env:"TRAVIS",pr:{env:"TRAVIS_PULL_REQUEST",ne:"false"}},{name:"Vercel",constant:"VERCEL",env:"NOW_BUILDER"},{name:"Visual Studio App Center",constant:"APPCENTER",env:"APPCENTER_BUILD_ID"}]});var Ac=w(Un=>{"use strict";var mH=dH(),Po=process.env;Object.defineProperty(Un,"_vendors",{value:mH.map(function(r){return r.constant})});Un.name=null;Un.isPR=null;mH.forEach(function(r){let t=(Array.isArray(r.env)?r.env:[r.env]).every(function(i){return CH(i)});if(Un[r.constant]=t,t)switch(Un.name=r.name,typeof r.pr){case"string":Un.isPR=!!Po[r.pr];break;case"object":"env"in r.pr?Un.isPR=r.pr.env in Po&&Po[r.pr.env]!==r.pr.ne:"any"in r.pr?Un.isPR=r.pr.any.some(function(i){return!!Po[i]}):Un.isPR=CH(r.pr);break;default:Un.isPR=null}});Un.isCI=!!(Po.CI||Po.CONTINUOUS_INTEGRATION||Po.BUILD_NUMBER||Po.RUN_ID||Un.name);function CH(r){return typeof r=="string"?!!Po[r]:Object.keys(r).every(function(e){return Po[e]===r[e]})}});var hn={};ut(hn,{KeyRelationship:()=>lc,applyCascade:()=>od,base64RegExp:()=>BH,colorStringAlphaRegExp:()=>wH,colorStringRegExp:()=>yH,computeKey:()=>RA,getPrintable:()=>Vr,hasExactLength:()=>xH,hasForbiddenKeys:()=>Wde,hasKeyRelationship:()=>av,hasMaxLength:()=>Dde,hasMinLength:()=>Pde,hasMutuallyExclusiveKeys:()=>zde,hasRequiredKeys:()=>Jde,hasUniqueItems:()=>kde,isArray:()=>yde,isAtLeast:()=>Nde,isAtMost:()=>Tde,isBase64:()=>jde,isBoolean:()=>mde,isDate:()=>Ide,isDict:()=>Bde,isEnum:()=>Zi,isHexColor:()=>Yde,isISO8601:()=>Gde,isInExclusiveRange:()=>Ode,isInInclusiveRange:()=>Lde,isInstanceOf:()=>Qde,isInteger:()=>Mde,isJSON:()=>qde,isLiteral:()=>dde,isLowerCase:()=>Kde,isNegative:()=>Rde,isNullable:()=>xde,isNumber:()=>Ede,isObject:()=>bde,isOneOf:()=>Sde,isOptional:()=>vde,isPositive:()=>Fde,isString:()=>sd,isTuple:()=>wde,isUUID4:()=>Hde,isUnknown:()=>vH,isUpperCase:()=>Ude,iso8601RegExp:()=>ov,makeCoercionFn:()=>cc,makeSetter:()=>SH,makeTrait:()=>QH,makeValidator:()=>Qt,matchesRegExp:()=>ad,plural:()=>kI,pushError:()=>pt,simpleKeyRegExp:()=>IH,uuid4RegExp:()=>bH});function Qt({test:r}){return QH(r)()}function Vr(r){return r===null?"null":r===void 0?"undefined":r===""?"an empty string":JSON.stringify(r)}function RA(r,e){var t,i,n;return typeof e=="number"?`${(t=r==null?void 0:r.p)!==null&&t!==void 0?t:"."}[${e}]`:IH.test(e)?`${(i=r==null?void 0:r.p)!==null&&i!==void 0?i:""}.${e}`:`${(n=r==null?void 0:r.p)!==null&&n!==void 0?n:"."}[${JSON.stringify(e)}]`}function cc(r,e){return t=>{let i=r[e];return r[e]=t,cc(r,e).bind(null,i)}}function SH(r,e){return t=>{r[e]=t}}function kI(r,e,t){return r===1?e:t}function pt({errors:r,p:e}={},t){return r==null||r.push(`${e!=null?e:"."}: ${t}`),!1}function dde(r){return Qt({test:(e,t)=>e!==r?pt(t,`Expected a literal (got ${Vr(r)})`):!0})}function Zi(r){let e=Array.isArray(r)?r:Object.values(r),t=new Set(e);return Qt({test:(i,n)=>t.has(i)?!0:pt(n,`Expected a valid enumeration value (got ${Vr(i)})`)})}var IH,yH,wH,BH,bH,ov,QH,vH,sd,Cde,mde,Ede,Ide,yde,wde,Bde,bde,Qde,Sde,od,vde,xde,Pde,Dde,xH,kde,Rde,Fde,Nde,Tde,Lde,Ode,Mde,ad,Kde,Ude,Hde,Gde,Yde,jde,qde,Jde,Wde,zde,lc,Vde,av,ls=Tge(()=>{IH=/^[a-zA-Z_][a-zA-Z0-9_]*$/,yH=/^#[0-9a-f]{6}$/i,wH=/^#[0-9a-f]{6}([0-9a-f]{2})?$/i,BH=/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/,bH=/^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89aAbB][a-f0-9]{3}-[a-f0-9]{12}$/i,ov=/^(?:[1-9]\d{3}(-?)(?:(?:0[1-9]|1[0-2])\1(?:0[1-9]|1\d|2[0-8])|(?:0[13-9]|1[0-2])\1(?:29|30)|(?:0[13578]|1[02])(?:\1)31|00[1-9]|0[1-9]\d|[12]\d{2}|3(?:[0-5]\d|6[0-5]))|(?:[1-9]\d(?:0[48]|[2468][048]|[13579][26])|(?:[2468][048]|[13579][26])00)(?:(-?)02(?:\2)29|-?366))T(?:[01]\d|2[0-3])(:?)[0-5]\d(?:\3[0-5]\d)?(?:Z|[+-][01]\d(?:\3[0-5]\d)?)$/,QH=r=>()=>r;vH=()=>Qt({test:(r,e)=>!0});sd=()=>Qt({test:(r,e)=>typeof r!="string"?pt(e,`Expected a string (got ${Vr(r)})`):!0});Cde=new Map([["true",!0],["True",!0],["1",!0],[1,!0],["false",!1],["False",!1],["0",!1],[0,!1]]),mde=()=>Qt({test:(r,e)=>{var t;if(typeof r!="boolean"){if(typeof(e==null?void 0:e.coercions)<"u"){if(typeof(e==null?void 0:e.coercion)>"u")return pt(e,"Unbound coercion result");let i=Cde.get(r);if(typeof i<"u")return e.coercions.push([(t=e.p)!==null&&t!==void 0?t:".",e.coercion.bind(null,i)]),!0}return pt(e,`Expected a boolean (got ${Vr(r)})`)}return!0}}),Ede=()=>Qt({test:(r,e)=>{var t;if(typeof r!="number"){if(typeof(e==null?void 0:e.coercions)<"u"){if(typeof(e==null?void 0:e.coercion)>"u")return pt(e,"Unbound coercion result");let i;if(typeof r=="string"){let n;try{n=JSON.parse(r)}catch{}if(typeof n=="number")if(JSON.stringify(n)===r)i=n;else return pt(e,`Received a number that can't be safely represented by the runtime (${r})`)}if(typeof i<"u")return e.coercions.push([(t=e.p)!==null&&t!==void 0?t:".",e.coercion.bind(null,i)]),!0}return pt(e,`Expected a number (got ${Vr(r)})`)}return!0}}),Ide=()=>Qt({test:(r,e)=>{var t;if(!(r instanceof Date)){if(typeof(e==null?void 0:e.coercions)<"u"){if(typeof(e==null?void 0:e.coercion)>"u")return pt(e,"Unbound coercion result");let i;if(typeof r=="string"&&ov.test(r))i=new Date(r);else{let n;if(typeof r=="string"){let s;try{s=JSON.parse(r)}catch{}typeof s=="number"&&(n=s)}else typeof r=="number"&&(n=r);if(typeof n<"u")if(Number.isSafeInteger(n)||!Number.isSafeInteger(n*1e3))i=new Date(n*1e3);else return pt(e,`Received a timestamp that can't be safely represented by the runtime (${r})`)}if(typeof i<"u")return e.coercions.push([(t=e.p)!==null&&t!==void 0?t:".",e.coercion.bind(null,i)]),!0}return pt(e,`Expected a date (got ${Vr(r)})`)}return!0}}),yde=(r,{delimiter:e}={})=>Qt({test:(t,i)=>{var n;if(typeof t=="string"&&typeof e<"u"&&typeof(i==null?void 0:i.coercions)<"u"){if(typeof(i==null?void 0:i.coercion)>"u")return pt(i,"Unbound coercion result");t=t.split(e),i.coercions.push([(n=i.p)!==null&&n!==void 0?n:".",i.coercion.bind(null,t)])}if(!Array.isArray(t))return pt(i,`Expected an array (got ${Vr(t)})`);let s=!0;for(let o=0,a=t.length;o<a&&(s=r(t[o],Object.assign(Object.assign({},i),{p:RA(i,o),coercion:cc(t,o)}))&&s,!(!s&&(i==null?void 0:i.errors)==null));++o);return s}}),wde=(r,{delimiter:e}={})=>{let t=xH(r.length);return Qt({test:(i,n)=>{var s;if(typeof i=="string"&&typeof e<"u"&&typeof(n==null?void 0:n.coercions)<"u"){if(typeof(n==null?void 0:n.coercion)>"u")return pt(n,"Unbound coercion result");i=i.split(e),n.coercions.push([(s=n.p)!==null&&s!==void 0?s:".",n.coercion.bind(null,i)])}if(!Array.isArray(i))return pt(n,`Expected a tuple (got ${Vr(i)})`);let o=t(i,Object.assign({},n));for(let a=0,l=i.length;a<l&&a<r.length&&(o=r[a](i[a],Object.assign(Object.assign({},n),{p:RA(n,a),coercion:cc(i,a)}))&&o,!(!o&&(n==null?void 0:n.errors)==null));++a);return o}})},Bde=(r,{keys:e=null}={})=>Qt({test:(t,i)=>{if(typeof t!="object"||t===null)return pt(i,`Expected an object (got ${Vr(t)})`);let n=Object.keys(t),s=!0;for(let o=0,a=n.length;o<a&&(s||(i==null?void 0:i.errors)!=null);++o){let l=n[o],c=t[l];if(l==="__proto__"||l==="constructor"){s=pt(Object.assign(Object.assign({},i),{p:RA(i,l)}),"Unsafe property name");continue}if(e!==null&&!e(l,i)){s=!1;continue}if(!r(c,Object.assign(Object.assign({},i),{p:RA(i,l),coercion:cc(t,l)}))){s=!1;continue}}return s}}),bde=(r,{extra:e=null}={})=>{let t=Object.keys(r);return Qt({test:(i,n)=>{if(typeof i!="object"||i===null)return pt(n,`Expected an object (got ${Vr(i)})`);let s=new Set([...t,...Object.keys(i)]),o={},a=!0;for(let l of s){if(l==="constructor"||l==="__proto__")a=pt(Object.assign(Object.assign({},n),{p:RA(n,l)}),"Unsafe property name");else{let c=Object.prototype.hasOwnProperty.call(r,l)?r[l]:void 0,u=Object.prototype.hasOwnProperty.call(i,l)?i[l]:void 0;typeof c<"u"?a=c(u,Object.assign(Object.assign({},n),{p:RA(n,l),coercion:cc(i,l)}))&&a:e===null?a=pt(Object.assign(Object.assign({},n),{p:RA(n,l)}),`Extraneous property (got ${Vr(u)})`):Object.defineProperty(o,l,{enumerable:!0,get:()=>u,set:SH(i,l)})}if(!a&&(n==null?void 0:n.errors)==null)break}return e!==null&&(a||(n==null?void 0:n.errors)!=null)&&(a=e(o,n)&&a),a}})},Qde=r=>Qt({test:(e,t)=>e instanceof r?!0:pt(t,`Expected an instance of ${r.name} (got ${Vr(e)})`)}),Sde=(r,{exclusive:e=!1}={})=>Qt({test:(t,i)=>{var n,s,o;let a=[],l=typeof(i==null?void 0:i.errors)<"u"?[]:void 0;for(let c=0,u=r.length;c<u;++c){let g=typeof(i==null?void 0:i.errors)<"u"?[]:void 0,f=typeof(i==null?void 0:i.coercions)<"u"?[]:void 0;if(r[c](t,Object.assign(Object.assign({},i),{errors:g,coercions:f,p:`${(n=i==null?void 0:i.p)!==null&&n!==void 0?n:"."}#${c+1}`}))){if(a.push([`#${c+1}`,f]),!e)break}else l==null||l.push(g[0])}if(a.length===1){let[,c]=a[0];return typeof c<"u"&&((s=i==null?void 0:i.coercions)===null||s===void 0||s.push(...c)),!0}return a.length>1?pt(i,`Expected to match exactly a single predicate (matched ${a.join(", ")})`):(o=i==null?void 0:i.errors)===null||o===void 0||o.push(...l),!1}}),od=(r,e)=>Qt({test:(t,i)=>{var n,s;let o={value:t},a=typeof(i==null?void 0:i.coercions)<"u"?cc(o,"value"):void 0,l=typeof(i==null?void 0:i.coercions)<"u"?[]:void 0;if(!r(t,Object.assign(Object.assign({},i),{coercion:a,coercions:l})))return!1;let c=[];if(typeof l<"u")for(let[,u]of l)c.push(u());try{if(typeof(i==null?void 0:i.coercions)<"u"){if(o.value!==t){if(typeof(i==null?void 0:i.coercion)>"u")return pt(i,"Unbound coercion result");i.coercions.push([(n=i.p)!==null&&n!==void 0?n:".",i.coercion.bind(null,o.value)])}(s=i==null?void 0:i.coercions)===null||s===void 0||s.push(...l)}return e.every(u=>u(o.value,i))}finally{for(let u of c)u()}}}),vde=r=>Qt({test:(e,t)=>typeof e>"u"?!0:r(e,t)}),xde=r=>Qt({test:(e,t)=>e===null?!0:r(e,t)}),Pde=r=>Qt({test:(e,t)=>e.length>=r?!0:pt(t,`Expected to have a length of at least ${r} elements (got ${e.length})`)}),Dde=r=>Qt({test:(e,t)=>e.length<=r?!0:pt(t,`Expected to have a length of at most ${r} elements (got ${e.length})`)}),xH=r=>Qt({test:(e,t)=>e.length!==r?pt(t,`Expected to have a length of exactly ${r} elements (got ${e.length})`):!0}),kde=({map:r}={})=>Qt({test:(e,t)=>{let i=new Set,n=new Set;for(let s=0,o=e.length;s<o;++s){let a=e[s],l=typeof r<"u"?r(a):a;if(i.has(l)){if(n.has(l))continue;pt(t,`Expected to contain unique elements; got a duplicate with ${Vr(e)}`),n.add(l)}else i.add(l)}return n.size===0}}),Rde=()=>Qt({test:(r,e)=>r<=0?!0:pt(e,`Expected to be negative (got ${r})`)}),Fde=()=>Qt({test:(r,e)=>r>=0?!0:pt(e,`Expected to be positive (got ${r})`)}),Nde=r=>Qt({test:(e,t)=>e>=r?!0:pt(t,`Expected to be at least ${r} (got ${e})`)}),Tde=r=>Qt({test:(e,t)=>e<=r?!0:pt(t,`Expected to be at most ${r} (got ${e})`)}),Lde=(r,e)=>Qt({test:(t,i)=>t>=r&&t<=e?!0:pt(i,`Expected to be in the [${r}; ${e}] range (got ${t})`)}),Ode=(r,e)=>Qt({test:(t,i)=>t>=r&&t<e?!0:pt(i,`Expected to be in the [${r}; ${e}[ range (got ${t})`)}),Mde=({unsafe:r=!1}={})=>Qt({test:(e,t)=>e!==Math.round(e)?pt(t,`Expected to be an integer (got ${e})`):Number.isSafeInteger(e)?!0:pt(t,`Expected to be a safe integer (got ${e})`)}),ad=r=>Qt({test:(e,t)=>r.test(e)?!0:pt(t,`Expected to match the pattern ${r.toString()} (got ${Vr(e)})`)}),Kde=()=>Qt({test:(r,e)=>r!==r.toLowerCase()?pt(e,`Expected to be all-lowercase (got ${r})`):!0}),Ude=()=>Qt({test:(r,e)=>r!==r.toUpperCase()?pt(e,`Expected to be all-uppercase (got ${r})`):!0}),Hde=()=>Qt({test:(r,e)=>bH.test(r)?!0:pt(e,`Expected to be a valid UUID v4 (got ${Vr(r)})`)}),Gde=()=>Qt({test:(r,e)=>ov.test(r)?!1:pt(e,`Expected to be a valid ISO 8601 date string (got ${Vr(r)})`)}),Yde=({alpha:r=!1})=>Qt({test:(e,t)=>(r?yH.test(e):wH.test(e))?!0:pt(t,`Expected to be a valid hexadecimal color string (got ${Vr(e)})`)}),jde=()=>Qt({test:(r,e)=>BH.test(r)?!0:pt(e,`Expected to be a valid base 64 string (got ${Vr(r)})`)}),qde=(r=vH())=>Qt({test:(e,t)=>{let i;try{i=JSON.parse(e)}catch{return pt(t,`Expected to be a valid JSON string (got ${Vr(e)})`)}return r(i,t)}}),Jde=r=>{let e=new Set(r);return Qt({test:(t,i)=>{let n=new Set(Object.keys(t)),s=[];for(let o of e)n.has(o)||s.push(o);return s.length>0?pt(i,`Missing required ${kI(s.length,"property","properties")} ${s.map(o=>`"${o}"`).join(", ")}`):!0}})},Wde=r=>{let e=new Set(r);return Qt({test:(t,i)=>{let n=new Set(Object.keys(t)),s=[];for(let o of e)n.has(o)&&s.push(o);return s.length>0?pt(i,`Forbidden ${kI(s.length,"property","properties")} ${s.map(o=>`"${o}"`).join(", ")}`):!0}})},zde=r=>{let e=new Set(r);return Qt({test:(t,i)=>{let n=new Set(Object.keys(t)),s=[];for(let o of e)n.has(o)&&s.push(o);return s.length>1?pt(i,`Mutually exclusive properties ${s.map(o=>`"${o}"`).join(", ")}`):!0}})};(function(r){r.Forbids="Forbids",r.Requires="Requires"})(lc||(lc={}));Vde={[lc.Forbids]:{expect:!1,message:"forbids using"},[lc.Requires]:{expect:!0,message:"requires using"}},av=(r,e,t,{ignore:i=[]}={})=>{let n=new Set(i),s=new Set(t),o=Vde[e];return Qt({test:(a,l)=>{let c=new Set(Object.keys(a));if(!c.has(r)||n.has(a[r]))return!0;let u=[];for(let g of s)(c.has(g)&&!n.has(a[g]))!==o.expect&&u.push(g);return u.length>=1?pt(l,`Property "${r}" ${o.message} ${kI(u.length,"property","properties")} ${u.map(g=>`"${g}"`).join(", ")}`):!0}})}});var qH=w((A$e,jH)=>{"use strict";jH.exports=(r,...e)=>new Promise(t=>{t(r(...e))})});var Jg=w((l$e,pv)=>{"use strict";var gCe=qH(),JH=r=>{if(r<1)throw new TypeError("Expected `concurrency` to be a number from 1 and up");let e=[],t=0,i=()=>{t--,e.length>0&&e.shift()()},n=(a,l,...c)=>{t++;let u=gCe(a,...c);l(u),u.then(i,i)},s=(a,l,...c)=>{t<r?n(a,l,...c):e.push(n.bind(null,a,l,...c))},o=(a,...l)=>new Promise(c=>s(a,c,...l));return Object.defineProperties(o,{activeCount:{get:()=>t},pendingCount:{get:()=>e.length}}),o};pv.exports=JH;pv.exports.default=JH});var gd=w((u$e,WH)=>{var fCe="2.0.0",hCe=Number.MAX_SAFE_INTEGER||9007199254740991,pCe=16;WH.exports={SEMVER_SPEC_VERSION:fCe,MAX_LENGTH:256,MAX_SAFE_INTEGER:hCe,MAX_SAFE_COMPONENT_LENGTH:pCe}});var fd=w((g$e,zH)=>{var dCe=typeof process=="object"&&process.env&&process.env.NODE_DEBUG&&/\bsemver\b/i.test(process.env.NODE_DEBUG)?(...r)=>console.error("SEMVER",...r):()=>{};zH.exports=dCe});var uc=w((NA,VH)=>{var{MAX_SAFE_COMPONENT_LENGTH:dv}=gd(),CCe=fd();NA=VH.exports={};var mCe=NA.re=[],et=NA.src=[],tt=NA.t={},ECe=0,St=(r,e,t)=>{let i=ECe++;CCe(i,e),tt[r]=i,et[i]=e,mCe[i]=new RegExp(e,t?"g":void 0)};St("NUMERICIDENTIFIER","0|[1-9]\\d*");St("NUMERICIDENTIFIERLOOSE","[0-9]+");St("NONNUMERICIDENTIFIER","\\d*[a-zA-Z-][a-zA-Z0-9-]*");St("MAINVERSION",`(${et[tt.NUMERICIDENTIFIER]})\\.(${et[tt.NUMERICIDENTIFIER]})\\.(${et[tt.NUMERICIDENTIFIER]})`);St("MAINVERSIONLOOSE",`(${et[tt.NUMERICIDENTIFIERLOOSE]})\\.(${et[tt.NUMERICIDENTIFIERLOOSE]})\\.(${et[tt.NUMERICIDENTIFIERLOOSE]})`);St("PRERELEASEIDENTIFIER",`(?:${et[tt.NUMERICIDENTIFIER]}|${et[tt.NONNUMERICIDENTIFIER]})`);St("PRERELEASEIDENTIFIERLOOSE",`(?:${et[tt.NUMERICIDENTIFIERLOOSE]}|${et[tt.NONNUMERICIDENTIFIER]})`);St("PRERELEASE",`(?:-(${et[tt.PRERELEASEIDENTIFIER]}(?:\\.${et[tt.PRERELEASEIDENTIFIER]})*))`);St("PRERELEASELOOSE",`(?:-?(${et[tt.PRERELEASEIDENTIFIERLOOSE]}(?:\\.${et[tt.PRERELEASEIDENTIFIERLOOSE]})*))`);St("BUILDIDENTIFIER","[0-9A-Za-z-]+");St("BUILD",`(?:\\+(${et[tt.BUILDIDENTIFIER]}(?:\\.${et[tt.BUILDIDENTIFIER]})*))`);St("FULLPLAIN",`v?${et[tt.MAINVERSION]}${et[tt.PRERELEASE]}?${et[tt.BUILD]}?`);St("FULL",`^${et[tt.FULLPLAIN]}$`);St("LOOSEPLAIN",`[v=\\s]*${et[tt.MAINVERSIONLOOSE]}${et[tt.PRERELEASELOOSE]}?${et[tt.BUILD]}?`);St("LOOSE",`^${et[tt.LOOSEPLAIN]}$`);St("GTLT","((?:<|>)?=?)");St("XRANGEIDENTIFIERLOOSE",`${et[tt.NUMERICIDENTIFIERLOOSE]}|x|X|\\*`);St("XRANGEIDENTIFIER",`${et[tt.NUMERICIDENTIFIER]}|x|X|\\*`);St("XRANGEPLAIN",`[v=\\s]*(${et[tt.XRANGEIDENTIFIER]})(?:\\.(${et[tt.XRANGEIDENTIFIER]})(?:\\.(${et[tt.XRANGEIDENTIFIER]})(?:${et[tt.PRERELEASE]})?${et[tt.BUILD]}?)?)?`);St("XRANGEPLAINLOOSE",`[v=\\s]*(${et[tt.XRANGEIDENTIFIERLOOSE]})(?:\\.(${et[tt.XRANGEIDENTIFIERLOOSE]})(?:\\.(${et[tt.XRANGEIDENTIFIERLOOSE]})(?:${et[tt.PRERELEASELOOSE]})?${et[tt.BUILD]}?)?)?`);St("XRANGE",`^${et[tt.GTLT]}\\s*${et[tt.XRANGEPLAIN]}$`);St("XRANGELOOSE",`^${et[tt.GTLT]}\\s*${et[tt.XRANGEPLAINLOOSE]}$`);St("COERCE",`(^|[^\\d])(\\d{1,${dv}})(?:\\.(\\d{1,${dv}}))?(?:\\.(\\d{1,${dv}}))?(?:$|[^\\d])`);St("COERCERTL",et[tt.COERCE],!0);St("LONETILDE","(?:~>?)");St("TILDETRIM",`(\\s*)${et[tt.LONETILDE]}\\s+`,!0);NA.tildeTrimReplace="$1~";St("TILDE",`^${et[tt.LONETILDE]}${et[tt.XRANGEPLAIN]}$`);St("TILDELOOSE",`^${et[tt.LONETILDE]}${et[tt.XRANGEPLAINLOOSE]}$`);St("LONECARET","(?:\\^)");St("CARETTRIM",`(\\s*)${et[tt.LONECARET]}\\s+`,!0);NA.caretTrimReplace="$1^";St("CARET",`^${et[tt.LONECARET]}${et[tt.XRANGEPLAIN]}$`);St("CARETLOOSE",`^${et[tt.LONECARET]}${et[tt.XRANGEPLAINLOOSE]}$`);St("COMPARATORLOOSE",`^${et[tt.GTLT]}\\s*(${et[tt.LOOSEPLAIN]})$|^$`);St("COMPARATOR",`^${et[tt.GTLT]}\\s*(${et[tt.FULLPLAIN]})$|^$`);St("COMPARATORTRIM",`(\\s*)${et[tt.GTLT]}\\s*(${et[tt.LOOSEPLAIN]}|${et[tt.XRANGEPLAIN]})`,!0);NA.comparatorTrimReplace="$1$2$3";St("HYPHENRANGE",`^\\s*(${et[tt.XRANGEPLAIN]})\\s+-\\s+(${et[tt.XRANGEPLAIN]})\\s*$`);St("HYPHENRANGELOOSE",`^\\s*(${et[tt.XRANGEPLAINLOOSE]})\\s+-\\s+(${et[tt.XRANGEPLAINLOOSE]})\\s*$`);St("STAR","(<|>)?=?\\s*\\*");St("GTE0","^\\s*>=\\s*0.0.0\\s*$");St("GTE0PRE","^\\s*>=\\s*0.0.0-0\\s*$")});var hd=w((f$e,XH)=>{var ICe=["includePrerelease","loose","rtl"],yCe=r=>r?typeof r!="object"?{loose:!0}:ICe.filter(e=>r[e]).reduce((e,t)=>(e[t]=!0,e),{}):{};XH.exports=yCe});var OI=w((h$e,$H)=>{var ZH=/^[0-9]+$/,_H=(r,e)=>{let t=ZH.test(r),i=ZH.test(e);return t&&i&&(r=+r,e=+e),r===e?0:t&&!i?-1:i&&!t?1:r<e?-1:1},wCe=(r,e)=>_H(e,r);$H.exports={compareIdentifiers:_H,rcompareIdentifiers:wCe}});var Li=w((p$e,iG)=>{var MI=fd(),{MAX_LENGTH:eG,MAX_SAFE_INTEGER:KI}=gd(),{re:tG,t:rG}=uc(),BCe=hd(),{compareIdentifiers:pd}=OI(),Yn=class{constructor(e,t){if(t=BCe(t),e instanceof Yn){if(e.loose===!!t.loose&&e.includePrerelease===!!t.includePrerelease)return e;e=e.version}else if(typeof e!="string")throw new TypeError(`Invalid Version: ${e}`);if(e.length>eG)throw new TypeError(`version is longer than ${eG} characters`);MI("SemVer",e,t),this.options=t,this.loose=!!t.loose,this.includePrerelease=!!t.includePrerelease;let i=e.trim().match(t.loose?tG[rG.LOOSE]:tG[rG.FULL]);if(!i)throw new TypeError(`Invalid Version: ${e}`);if(this.raw=e,this.major=+i[1],this.minor=+i[2],this.patch=+i[3],this.major>KI||this.major<0)throw new TypeError("Invalid major version");if(this.minor>KI||this.minor<0)throw new TypeError("Invalid minor version");if(this.patch>KI||this.patch<0)throw new TypeError("Invalid patch version");i[4]?this.prerelease=i[4].split(".").map(n=>{if(/^[0-9]+$/.test(n)){let s=+n;if(s>=0&&s<KI)return s}return n}):this.prerelease=[],this.build=i[5]?i[5].split("."):[],this.format()}format(){return this.version=`${this.major}.${this.minor}.${this.patch}`,this.prerelease.length&&(this.version+=`-${this.prerelease.join(".")}`),this.version}toString(){return this.version}compare(e){if(MI("SemVer.compare",this.version,this.options,e),!(e instanceof Yn)){if(typeof e=="string"&&e===this.version)return 0;e=new Yn(e,this.options)}return e.version===this.version?0:this.compareMain(e)||this.comparePre(e)}compareMain(e){return e instanceof Yn||(e=new Yn(e,this.options)),pd(this.major,e.major)||pd(this.minor,e.minor)||pd(this.patch,e.patch)}comparePre(e){if(e instanceof Yn||(e=new Yn(e,this.options)),this.prerelease.length&&!e.prerelease.length)return-1;if(!this.prerelease.length&&e.prerelease.length)return 1;if(!this.prerelease.length&&!e.prerelease.length)return 0;let t=0;do{let i=this.prerelease[t],n=e.prerelease[t];if(MI("prerelease compare",t,i,n),i===void 0&&n===void 0)return 0;if(n===void 0)return 1;if(i===void 0)return-1;if(i===n)continue;return pd(i,n)}while(++t)}compareBuild(e){e instanceof Yn||(e=new Yn(e,this.options));let t=0;do{let i=this.build[t],n=e.build[t];if(MI("prerelease compare",t,i,n),i===void 0&&n===void 0)return 0;if(n===void 0)return 1;if(i===void 0)return-1;if(i===n)continue;return pd(i,n)}while(++t)}inc(e,t){switch(e){case"premajor":this.prerelease.length=0,this.patch=0,this.minor=0,this.major++,this.inc("pre",t);break;case"preminor":this.prerelease.length=0,this.patch=0,this.minor++,this.inc("pre",t);break;case"prepatch":this.prerelease.length=0,this.inc("patch",t),this.inc("pre",t);break;case"prerelease":this.prerelease.length===0&&this.inc("patch",t),this.inc("pre",t);break;case"major":(this.minor!==0||this.patch!==0||this.prerelease.length===0)&&this.major++,this.minor=0,this.patch=0,this.prerelease=[];break;case"minor":(this.patch!==0||this.prerelease.length===0)&&this.minor++,this.patch=0,this.prerelease=[];break;case"patch":this.prerelease.length===0&&this.patch++,this.prerelease=[];break;case"pre":if(this.prerelease.length===0)this.prerelease=[0];else{let i=this.prerelease.length;for(;--i>=0;)typeof this.prerelease[i]=="number"&&(this.prerelease[i]++,i=-2);i===-1&&this.prerelease.push(0)}t&&(this.prerelease[0]===t?isNaN(this.prerelease[1])&&(this.prerelease=[t,0]):this.prerelease=[t,0]);break;default:throw new Error(`invalid increment argument: ${e}`)}return this.format(),this.raw=this.version,this}};iG.exports=Yn});var gc=w((d$e,aG)=>{var{MAX_LENGTH:bCe}=gd(),{re:nG,t:sG}=uc(),oG=Li(),QCe=hd(),SCe=(r,e)=>{if(e=QCe(e),r instanceof oG)return r;if(typeof r!="string"||r.length>bCe||!(e.loose?nG[sG.LOOSE]:nG[sG.FULL]).test(r))return null;try{return new oG(r,e)}catch{return null}};aG.exports=SCe});var lG=w((C$e,AG)=>{var vCe=gc(),xCe=(r,e)=>{let t=vCe(r,e);return t?t.version:null};AG.exports=xCe});var uG=w((m$e,cG)=>{var PCe=gc(),DCe=(r,e)=>{let t=PCe(r.trim().replace(/^[=v]+/,""),e);return t?t.version:null};cG.exports=DCe});var fG=w((E$e,gG)=>{var kCe=Li(),RCe=(r,e,t,i)=>{typeof t=="string"&&(i=t,t=void 0);try{return new kCe(r,t).inc(e,i).version}catch{return null}};gG.exports=RCe});var cs=w((I$e,pG)=>{var hG=Li(),FCe=(r,e,t)=>new hG(r,t).compare(new hG(e,t));pG.exports=FCe});var UI=w((y$e,dG)=>{var NCe=cs(),TCe=(r,e,t)=>NCe(r,e,t)===0;dG.exports=TCe});var EG=w((w$e,mG)=>{var CG=gc(),LCe=UI(),OCe=(r,e)=>{if(LCe(r,e))return null;{let t=CG(r),i=CG(e),n=t.prerelease.length||i.prerelease.length,s=n?"pre":"",o=n?"prerelease":"";for(let a in t)if((a==="major"||a==="minor"||a==="patch")&&t[a]!==i[a])return s+a;return o}};mG.exports=OCe});var yG=w((B$e,IG)=>{var MCe=Li(),KCe=(r,e)=>new MCe(r,e).major;IG.exports=KCe});var BG=w((b$e,wG)=>{var UCe=Li(),HCe=(r,e)=>new UCe(r,e).minor;wG.exports=HCe});var QG=w((Q$e,bG)=>{var GCe=Li(),YCe=(r,e)=>new GCe(r,e).patch;bG.exports=YCe});var vG=w((S$e,SG)=>{var jCe=gc(),qCe=(r,e)=>{let t=jCe(r,e);return t&&t.prerelease.length?t.prerelease:null};SG.exports=qCe});var PG=w((v$e,xG)=>{var JCe=cs(),WCe=(r,e,t)=>JCe(e,r,t);xG.exports=WCe});var kG=w((x$e,DG)=>{var zCe=cs(),VCe=(r,e)=>zCe(r,e,!0);DG.exports=VCe});var HI=w((P$e,FG)=>{var RG=Li(),XCe=(r,e,t)=>{let i=new RG(r,t),n=new RG(e,t);return i.compare(n)||i.compareBuild(n)};FG.exports=XCe});var TG=w((D$e,NG)=>{var ZCe=HI(),_Ce=(r,e)=>r.sort((t,i)=>ZCe(t,i,e));NG.exports=_Ce});var OG=w((k$e,LG)=>{var $Ce=HI(),eme=(r,e)=>r.sort((t,i)=>$Ce(i,t,e));LG.exports=eme});var dd=w((R$e,MG)=>{var tme=cs(),rme=(r,e,t)=>tme(r,e,t)>0;MG.exports=rme});var GI=w((F$e,KG)=>{var ime=cs(),nme=(r,e,t)=>ime(r,e,t)<0;KG.exports=nme});var Cv=w((N$e,UG)=>{var sme=cs(),ome=(r,e,t)=>sme(r,e,t)!==0;UG.exports=ome});var YI=w((T$e,HG)=>{var ame=cs(),Ame=(r,e,t)=>ame(r,e,t)>=0;HG.exports=Ame});var jI=w((L$e,GG)=>{var lme=cs(),cme=(r,e,t)=>lme(r,e,t)<=0;GG.exports=cme});var mv=w((O$e,YG)=>{var ume=UI(),gme=Cv(),fme=dd(),hme=YI(),pme=GI(),dme=jI(),Cme=(r,e,t,i)=>{switch(e){case"===":return typeof r=="object"&&(r=r.version),typeof t=="object"&&(t=t.version),r===t;case"!==":return typeof r=="object"&&(r=r.version),typeof t=="object"&&(t=t.version),r!==t;case"":case"=":case"==":return ume(r,t,i);case"!=":return gme(r,t,i);case">":return fme(r,t,i);case">=":return hme(r,t,i);case"<":return pme(r,t,i);case"<=":return dme(r,t,i);default:throw new TypeError(`Invalid operator: ${e}`)}};YG.exports=Cme});var qG=w((M$e,jG)=>{var mme=Li(),Eme=gc(),{re:qI,t:JI}=uc(),Ime=(r,e)=>{if(r instanceof mme)return r;if(typeof r=="number"&&(r=String(r)),typeof r!="string")return null;e=e||{};let t=null;if(!e.rtl)t=r.match(qI[JI.COERCE]);else{let i;for(;(i=qI[JI.COERCERTL].exec(r))&&(!t||t.index+t[0].length!==r.length);)(!t||i.index+i[0].length!==t.index+t[0].length)&&(t=i),qI[JI.COERCERTL].lastIndex=i.index+i[1].length+i[2].length;qI[JI.COERCERTL].lastIndex=-1}return t===null?null:Eme(`${t[2]}.${t[3]||"0"}.${t[4]||"0"}`,e)};jG.exports=Ime});var WG=w((K$e,JG)=>{"use strict";JG.exports=function(r){r.prototype[Symbol.iterator]=function*(){for(let e=this.head;e;e=e.next)yield e.value}}});var WI=w((U$e,zG)=>{"use strict";zG.exports=Ht;Ht.Node=fc;Ht.create=Ht;function Ht(r){var e=this;if(e instanceof Ht||(e=new Ht),e.tail=null,e.head=null,e.length=0,r&&typeof r.forEach=="function")r.forEach(function(n){e.push(n)});else if(arguments.length>0)for(var t=0,i=arguments.length;t<i;t++)e.push(arguments[t]);return e}Ht.prototype.removeNode=function(r){if(r.list!==this)throw new Error("removing node which does not belong to this list");var e=r.next,t=r.prev;return e&&(e.prev=t),t&&(t.next=e),r===this.head&&(this.head=e),r===this.tail&&(this.tail=t),r.list.length--,r.next=null,r.prev=null,r.list=null,e};Ht.prototype.unshiftNode=function(r){if(r!==this.head){r.list&&r.list.removeNode(r);var e=this.head;r.list=this,r.next=e,e&&(e.prev=r),this.head=r,this.tail||(this.tail=r),this.length++}};Ht.prototype.pushNode=function(r){if(r!==this.tail){r.list&&r.list.removeNode(r);var e=this.tail;r.list=this,r.prev=e,e&&(e.next=r),this.tail=r,this.head||(this.head=r),this.length++}};Ht.prototype.push=function(){for(var r=0,e=arguments.length;r<e;r++)wme(this,arguments[r]);return this.length};Ht.prototype.unshift=function(){for(var r=0,e=arguments.length;r<e;r++)Bme(this,arguments[r]);return this.length};Ht.prototype.pop=function(){if(!!this.tail){var r=this.tail.value;return this.tail=this.tail.prev,this.tail?this.tail.next=null:this.head=null,this.length--,r}};Ht.prototype.shift=function(){if(!!this.head){var r=this.head.value;return this.head=this.head.next,this.head?this.head.prev=null:this.tail=null,this.length--,r}};Ht.prototype.forEach=function(r,e){e=e||this;for(var t=this.head,i=0;t!==null;i++)r.call(e,t.value,i,this),t=t.next};Ht.prototype.forEachReverse=function(r,e){e=e||this;for(var t=this.tail,i=this.length-1;t!==null;i--)r.call(e,t.value,i,this),t=t.prev};Ht.prototype.get=function(r){for(var e=0,t=this.head;t!==null&&e<r;e++)t=t.next;if(e===r&&t!==null)return t.value};Ht.prototype.getReverse=function(r){for(var e=0,t=this.tail;t!==null&&e<r;e++)t=t.prev;if(e===r&&t!==null)return t.value};Ht.prototype.map=function(r,e){e=e||this;for(var t=new Ht,i=this.head;i!==null;)t.push(r.call(e,i.value,this)),i=i.next;return t};Ht.prototype.mapReverse=function(r,e){e=e||this;for(var t=new Ht,i=this.tail;i!==null;)t.push(r.call(e,i.value,this)),i=i.prev;return t};Ht.prototype.reduce=function(r,e){var t,i=this.head;if(arguments.length>1)t=e;else if(this.head)i=this.head.next,t=this.head.value;else throw new TypeError("Reduce of empty list with no initial value");for(var n=0;i!==null;n++)t=r(t,i.value,n),i=i.next;return t};Ht.prototype.reduceReverse=function(r,e){var t,i=this.tail;if(arguments.length>1)t=e;else if(this.tail)i=this.tail.prev,t=this.tail.value;else throw new TypeError("Reduce of empty list with no initial value");for(var n=this.length-1;i!==null;n--)t=r(t,i.value,n),i=i.prev;return t};Ht.prototype.toArray=function(){for(var r=new Array(this.length),e=0,t=this.head;t!==null;e++)r[e]=t.value,t=t.next;return r};Ht.prototype.toArrayReverse=function(){for(var r=new Array(this.length),e=0,t=this.tail;t!==null;e++)r[e]=t.value,t=t.prev;return r};Ht.prototype.slice=function(r,e){e=e||this.length,e<0&&(e+=this.length),r=r||0,r<0&&(r+=this.length);var t=new Ht;if(e<r||e<0)return t;r<0&&(r=0),e>this.length&&(e=this.length);for(var i=0,n=this.head;n!==null&&i<r;i++)n=n.next;for(;n!==null&&i<e;i++,n=n.next)t.push(n.value);return t};Ht.prototype.sliceReverse=function(r,e){e=e||this.length,e<0&&(e+=this.length),r=r||0,r<0&&(r+=this.length);var t=new Ht;if(e<r||e<0)return t;r<0&&(r=0),e>this.length&&(e=this.length);for(var i=this.length,n=this.tail;n!==null&&i>e;i--)n=n.prev;for(;n!==null&&i>r;i--,n=n.prev)t.push(n.value);return t};Ht.prototype.splice=function(r,e,...t){r>this.length&&(r=this.length-1),r<0&&(r=this.length+r);for(var i=0,n=this.head;n!==null&&i<r;i++)n=n.next;for(var s=[],i=0;n&&i<e;i++)s.push(n.value),n=this.removeNode(n);n===null&&(n=this.tail),n!==this.head&&n!==this.tail&&(n=n.prev);for(var i=0;i<t.length;i++)n=yme(this,n,t[i]);return s};Ht.prototype.reverse=function(){for(var r=this.head,e=this.tail,t=r;t!==null;t=t.prev){var i=t.prev;t.prev=t.next,t.next=i}return this.head=e,this.tail=r,this};function yme(r,e,t){var i=e===r.head?new fc(t,null,e,r):new fc(t,e,e.next,r);return i.next===null&&(r.tail=i),i.prev===null&&(r.head=i),r.length++,i}function wme(r,e){r.tail=new fc(e,r.tail,null,r),r.head||(r.head=r.tail),r.length++}function Bme(r,e){r.head=new fc(e,null,r.head,r),r.tail||(r.tail=r.head),r.length++}function fc(r,e,t,i){if(!(this instanceof fc))return new fc(r,e,t,i);this.list=i,this.value=r,e?(e.next=this,this.prev=e):this.prev=null,t?(t.prev=this,this.next=t):this.next=null}try{WG()(Ht)}catch{}});var $G=w((H$e,_G)=>{"use strict";var bme=WI(),hc=Symbol("max"),va=Symbol("length"),Wg=Symbol("lengthCalculator"),md=Symbol("allowStale"),pc=Symbol("maxAge"),Sa=Symbol("dispose"),VG=Symbol("noDisposeOnSet"),di=Symbol("lruList"),Zs=Symbol("cache"),ZG=Symbol("updateAgeOnGet"),Ev=()=>1,yv=class{constructor(e){if(typeof e=="number"&&(e={max:e}),e||(e={}),e.max&&(typeof e.max!="number"||e.max<0))throw new TypeError("max must be a non-negative number");let t=this[hc]=e.max||1/0,i=e.length||Ev;if(this[Wg]=typeof i!="function"?Ev:i,this[md]=e.stale||!1,e.maxAge&&typeof e.maxAge!="number")throw new TypeError("maxAge must be a number");this[pc]=e.maxAge||0,this[Sa]=e.dispose,this[VG]=e.noDisposeOnSet||!1,this[ZG]=e.updateAgeOnGet||!1,this.reset()}set max(e){if(typeof e!="number"||e<0)throw new TypeError("max must be a non-negative number");this[hc]=e||1/0,Cd(this)}get max(){return this[hc]}set allowStale(e){this[md]=!!e}get allowStale(){return this[md]}set maxAge(e){if(typeof e!="number")throw new TypeError("maxAge must be a non-negative number");this[pc]=e,Cd(this)}get maxAge(){return this[pc]}set lengthCalculator(e){typeof e!="function"&&(e=Ev),e!==this[Wg]&&(this[Wg]=e,this[va]=0,this[di].forEach(t=>{t.length=this[Wg](t.value,t.key),this[va]+=t.length})),Cd(this)}get lengthCalculator(){return this[Wg]}get length(){return this[va]}get itemCount(){return this[di].length}rforEach(e,t){t=t||this;for(let i=this[di].tail;i!==null;){let n=i.prev;XG(this,e,i,t),i=n}}forEach(e,t){t=t||this;for(let i=this[di].head;i!==null;){let n=i.next;XG(this,e,i,t),i=n}}keys(){return this[di].toArray().map(e=>e.key)}values(){return this[di].toArray().map(e=>e.value)}reset(){this[Sa]&&this[di]&&this[di].length&&this[di].forEach(e=>this[Sa](e.key,e.value)),this[Zs]=new Map,this[di]=new bme,this[va]=0}dump(){return this[di].map(e=>zI(this,e)?!1:{k:e.key,v:e.value,e:e.now+(e.maxAge||0)}).toArray().filter(e=>e)}dumpLru(){return this[di]}set(e,t,i){if(i=i||this[pc],i&&typeof i!="number")throw new TypeError("maxAge must be a number");let n=i?Date.now():0,s=this[Wg](t,e);if(this[Zs].has(e)){if(s>this[hc])return zg(this,this[Zs].get(e)),!1;let l=this[Zs].get(e).value;return this[Sa]&&(this[VG]||this[Sa](e,l.value)),l.now=n,l.maxAge=i,l.value=t,this[va]+=s-l.length,l.length=s,this.get(e),Cd(this),!0}let o=new wv(e,t,s,n,i);return o.length>this[hc]?(this[Sa]&&this[Sa](e,t),!1):(this[va]+=o.length,this[di].unshift(o),this[Zs].set(e,this[di].head),Cd(this),!0)}has(e){if(!this[Zs].has(e))return!1;let t=this[Zs].get(e).value;return!zI(this,t)}get(e){return Iv(this,e,!0)}peek(e){return Iv(this,e,!1)}pop(){let e=this[di].tail;return e?(zg(this,e),e.value):null}del(e){zg(this,this[Zs].get(e))}load(e){this.reset();let t=Date.now();for(let i=e.length-1;i>=0;i--){let n=e[i],s=n.e||0;if(s===0)this.set(n.k,n.v);else{let o=s-t;o>0&&this.set(n.k,n.v,o)}}}prune(){this[Zs].forEach((e,t)=>Iv(this,t,!1))}},Iv=(r,e,t)=>{let i=r[Zs].get(e);if(i){let n=i.value;if(zI(r,n)){if(zg(r,i),!r[md])return}else t&&(r[ZG]&&(i.value.now=Date.now()),r[di].unshiftNode(i));return n.value}},zI=(r,e)=>{if(!e||!e.maxAge&&!r[pc])return!1;let t=Date.now()-e.now;return e.maxAge?t>e.maxAge:r[pc]&&t>r[pc]},Cd=r=>{if(r[va]>r[hc])for(let e=r[di].tail;r[va]>r[hc]&&e!==null;){let t=e.prev;zg(r,e),e=t}},zg=(r,e)=>{if(e){let t=e.value;r[Sa]&&r[Sa](t.key,t.value),r[va]-=t.length,r[Zs].delete(t.key),r[di].removeNode(e)}},wv=class{constructor(e,t,i,n,s){this.key=e,this.value=t,this.length=i,this.now=n,this.maxAge=s||0}},XG=(r,e,t,i)=>{let n=t.value;zI(r,n)&&(zg(r,t),r[md]||(n=void 0)),n&&e.call(i,n.value,n.key,r)};_G.exports=yv});var us=w((G$e,iY)=>{var dc=class{constructor(e,t){if(t=Sme(t),e instanceof dc)return e.loose===!!t.loose&&e.includePrerelease===!!t.includePrerelease?e:new dc(e.raw,t);if(e instanceof Bv)return this.raw=e.value,this.set=[[e]],this.format(),this;if(this.options=t,this.loose=!!t.loose,this.includePrerelease=!!t.includePrerelease,this.raw=e,this.set=e.split(/\s*\|\|\s*/).map(i=>this.parseRange(i.trim())).filter(i=>i.length),!this.set.length)throw new TypeError(`Invalid SemVer Range: ${e}`);if(this.set.length>1){let i=this.set[0];if(this.set=this.set.filter(n=>!tY(n[0])),this.set.length===0)this.set=[i];else if(this.set.length>1){for(let n of this.set)if(n.length===1&&kme(n[0])){this.set=[n];break}}}this.format()}format(){return this.range=this.set.map(e=>e.join(" ").trim()).join("||").trim(),this.range}toString(){return this.range}parseRange(e){e=e.trim();let i=`parseRange:${Object.keys(this.options).join(",")}:${e}`,n=eY.get(i);if(n)return n;let s=this.options.loose,o=s?Oi[bi.HYPHENRANGELOOSE]:Oi[bi.HYPHENRANGE];e=e.replace(o,Hme(this.options.includePrerelease)),Hr("hyphen replace",e),e=e.replace(Oi[bi.COMPARATORTRIM],xme),Hr("comparator trim",e,Oi[bi.COMPARATORTRIM]),e=e.replace(Oi[bi.TILDETRIM],Pme),e=e.replace(Oi[bi.CARETTRIM],Dme),e=e.split(/\s+/).join(" ");let a=s?Oi[bi.COMPARATORLOOSE]:Oi[bi.COMPARATOR],l=e.split(" ").map(f=>Rme(f,this.options)).join(" ").split(/\s+/).map(f=>Ume(f,this.options)).filter(this.options.loose?f=>!!f.match(a):()=>!0).map(f=>new Bv(f,this.options)),c=l.length,u=new Map;for(let f of l){if(tY(f))return[f];u.set(f.value,f)}u.size>1&&u.has("")&&u.delete("");let g=[...u.values()];return eY.set(i,g),g}intersects(e,t){if(!(e instanceof dc))throw new TypeError("a Range is required");return this.set.some(i=>rY(i,t)&&e.set.some(n=>rY(n,t)&&i.every(s=>n.every(o=>s.intersects(o,t)))))}test(e){if(!e)return!1;if(typeof e=="string")try{e=new vme(e,this.options)}catch{return!1}for(let t=0;t<this.set.length;t++)if(Gme(this.set[t],e,this.options))return!0;return!1}};iY.exports=dc;var Qme=$G(),eY=new Qme({max:1e3}),Sme=hd(),Bv=Ed(),Hr=fd(),vme=Li(),{re:Oi,t:bi,comparatorTrimReplace:xme,tildeTrimReplace:Pme,caretTrimReplace:Dme}=uc(),tY=r=>r.value==="<0.0.0-0",kme=r=>r.value==="",rY=(r,e)=>{let t=!0,i=r.slice(),n=i.pop();for(;t&&i.length;)t=i.every(s=>n.intersects(s,e)),n=i.pop();return t},Rme=(r,e)=>(Hr("comp",r,e),r=Tme(r,e),Hr("caret",r),r=Fme(r,e),Hr("tildes",r),r=Ome(r,e),Hr("xrange",r),r=Kme(r,e),Hr("stars",r),r),$i=r=>!r||r.toLowerCase()==="x"||r==="*",Fme=(r,e)=>r.trim().split(/\s+/).map(t=>Nme(t,e)).join(" "),Nme=(r,e)=>{let t=e.loose?Oi[bi.TILDELOOSE]:Oi[bi.TILDE];return r.replace(t,(i,n,s,o,a)=>{Hr("tilde",r,i,n,s,o,a);let l;return $i(n)?l="":$i(s)?l=`>=${n}.0.0 <${+n+1}.0.0-0`:$i(o)?l=`>=${n}.${s}.0 <${n}.${+s+1}.0-0`:a?(Hr("replaceTilde pr",a),l=`>=${n}.${s}.${o}-${a} <${n}.${+s+1}.0-0`):l=`>=${n}.${s}.${o} <${n}.${+s+1}.0-0`,Hr("tilde return",l),l})},Tme=(r,e)=>r.trim().split(/\s+/).map(t=>Lme(t,e)).join(" "),Lme=(r,e)=>{Hr("caret",r,e);let t=e.loose?Oi[bi.CARETLOOSE]:Oi[bi.CARET],i=e.includePrerelease?"-0":"";return r.replace(t,(n,s,o,a,l)=>{Hr("caret",r,n,s,o,a,l);let c;return $i(s)?c="":$i(o)?c=`>=${s}.0.0${i} <${+s+1}.0.0-0`:$i(a)?s==="0"?c=`>=${s}.${o}.0${i} <${s}.${+o+1}.0-0`:c=`>=${s}.${o}.0${i} <${+s+1}.0.0-0`:l?(Hr("replaceCaret pr",l),s==="0"?o==="0"?c=`>=${s}.${o}.${a}-${l} <${s}.${o}.${+a+1}-0`:c=`>=${s}.${o}.${a}-${l} <${s}.${+o+1}.0-0`:c=`>=${s}.${o}.${a}-${l} <${+s+1}.0.0-0`):(Hr("no pr"),s==="0"?o==="0"?c=`>=${s}.${o}.${a}${i} <${s}.${o}.${+a+1}-0`:c=`>=${s}.${o}.${a}${i} <${s}.${+o+1}.0-0`:c=`>=${s}.${o}.${a} <${+s+1}.0.0-0`),Hr("caret return",c),c})},Ome=(r,e)=>(Hr("replaceXRanges",r,e),r.split(/\s+/).map(t=>Mme(t,e)).join(" ")),Mme=(r,e)=>{r=r.trim();let t=e.loose?Oi[bi.XRANGELOOSE]:Oi[bi.XRANGE];return r.replace(t,(i,n,s,o,a,l)=>{Hr("xRange",r,i,n,s,o,a,l);let c=$i(s),u=c||$i(o),g=u||$i(a),f=g;return n==="="&&f&&(n=""),l=e.includePrerelease?"-0":"",c?n===">"||n==="<"?i="<0.0.0-0":i="*":n&&f?(u&&(o=0),a=0,n===">"?(n=">=",u?(s=+s+1,o=0,a=0):(o=+o+1,a=0)):n==="<="&&(n="<",u?s=+s+1:o=+o+1),n==="<"&&(l="-0"),i=`${n+s}.${o}.${a}${l}`):u?i=`>=${s}.0.0${l} <${+s+1}.0.0-0`:g&&(i=`>=${s}.${o}.0${l} <${s}.${+o+1}.0-0`),Hr("xRange return",i),i})},Kme=(r,e)=>(Hr("replaceStars",r,e),r.trim().replace(Oi[bi.STAR],"")),Ume=(r,e)=>(Hr("replaceGTE0",r,e),r.trim().replace(Oi[e.includePrerelease?bi.GTE0PRE:bi.GTE0],"")),Hme=r=>(e,t,i,n,s,o,a,l,c,u,g,f,h)=>($i(i)?t="":$i(n)?t=`>=${i}.0.0${r?"-0":""}`:$i(s)?t=`>=${i}.${n}.0${r?"-0":""}`:o?t=`>=${t}`:t=`>=${t}${r?"-0":""}`,$i(c)?l="":$i(u)?l=`<${+c+1}.0.0-0`:$i(g)?l=`<${c}.${+u+1}.0-0`:f?l=`<=${c}.${u}.${g}-${f}`:r?l=`<${c}.${u}.${+g+1}-0`:l=`<=${l}`,`${t} ${l}`.trim()),Gme=(r,e,t)=>{for(let i=0;i<r.length;i++)if(!r[i].test(e))return!1;if(e.prerelease.length&&!t.includePrerelease){for(let i=0;i<r.length;i++)if(Hr(r[i].semver),r[i].semver!==Bv.ANY&&r[i].semver.prerelease.length>0){let n=r[i].semver;if(n.major===e.major&&n.minor===e.minor&&n.patch===e.patch)return!0}return!1}return!0}});var Ed=w((Y$e,AY)=>{var Id=Symbol("SemVer ANY"),Vg=class{static get ANY(){return Id}constructor(e,t){if(t=Yme(t),e instanceof Vg){if(e.loose===!!t.loose)return e;e=e.value}Qv("comparator",e,t),this.options=t,this.loose=!!t.loose,this.parse(e),this.semver===Id?this.value="":this.value=this.operator+this.semver.version,Qv("comp",this)}parse(e){let t=this.options.loose?nY[sY.COMPARATORLOOSE]:nY[sY.COMPARATOR],i=e.match(t);if(!i)throw new TypeError(`Invalid comparator: ${e}`);this.operator=i[1]!==void 0?i[1]:"",this.operator==="="&&(this.operator=""),i[2]?this.semver=new oY(i[2],this.options.loose):this.semver=Id}toString(){return this.value}test(e){if(Qv("Comparator.test",e,this.options.loose),this.semver===Id||e===Id)return!0;if(typeof e=="string")try{e=new oY(e,this.options)}catch{return!1}return bv(e,this.operator,this.semver,this.options)}intersects(e,t){if(!(e instanceof Vg))throw new TypeError("a Comparator is required");if((!t||typeof t!="object")&&(t={loose:!!t,includePrerelease:!1}),this.operator==="")return this.value===""?!0:new aY(e.value,t).test(this.value);if(e.operator==="")return e.value===""?!0:new aY(this.value,t).test(e.semver);let i=(this.operator===">="||this.operator===">")&&(e.operator===">="||e.operator===">"),n=(this.operator==="<="||this.operator==="<")&&(e.operator==="<="||e.operator==="<"),s=this.semver.version===e.semver.version,o=(this.operator===">="||this.operator==="<=")&&(e.operator===">="||e.operator==="<="),a=bv(this.semver,"<",e.semver,t)&&(this.operator===">="||this.operator===">")&&(e.operator==="<="||e.operator==="<"),l=bv(this.semver,">",e.semver,t)&&(this.operator==="<="||this.operator==="<")&&(e.operator===">="||e.operator===">");return i||n||s&&o||a||l}};AY.exports=Vg;var Yme=hd(),{re:nY,t:sY}=uc(),bv=mv(),Qv=fd(),oY=Li(),aY=us()});var yd=w((j$e,lY)=>{var jme=us(),qme=(r,e,t)=>{try{e=new jme(e,t)}catch{return!1}return e.test(r)};lY.exports=qme});var uY=w((q$e,cY)=>{var Jme=us(),Wme=(r,e)=>new Jme(r,e).set.map(t=>t.map(i=>i.value).join(" ").trim().split(" "));cY.exports=Wme});var fY=w((J$e,gY)=>{var zme=Li(),Vme=us(),Xme=(r,e,t)=>{let i=null,n=null,s=null;try{s=new Vme(e,t)}catch{return null}return r.forEach(o=>{s.test(o)&&(!i||n.compare(o)===-1)&&(i=o,n=new zme(i,t))}),i};gY.exports=Xme});var pY=w((W$e,hY)=>{var Zme=Li(),_me=us(),$me=(r,e,t)=>{let i=null,n=null,s=null;try{s=new _me(e,t)}catch{return null}return r.forEach(o=>{s.test(o)&&(!i||n.compare(o)===1)&&(i=o,n=new Zme(i,t))}),i};hY.exports=$me});var mY=w((z$e,CY)=>{var Sv=Li(),eEe=us(),dY=dd(),tEe=(r,e)=>{r=new eEe(r,e);let t=new Sv("0.0.0");if(r.test(t)||(t=new Sv("0.0.0-0"),r.test(t)))return t;t=null;for(let i=0;i<r.set.length;++i){let n=r.set[i],s=null;n.forEach(o=>{let a=new Sv(o.semver.version);switch(o.operator){case">":a.prerelease.length===0?a.patch++:a.prerelease.push(0),a.raw=a.format();case"":case">=":(!s||dY(a,s))&&(s=a);break;case"<":case"<=":break;default:throw new Error(`Unexpected operation: ${o.operator}`)}}),s&&(!t||dY(t,s))&&(t=s)}return t&&r.test(t)?t:null};CY.exports=tEe});var IY=w((V$e,EY)=>{var rEe=us(),iEe=(r,e)=>{try{return new rEe(r,e).range||"*"}catch{return null}};EY.exports=iEe});var VI=w((X$e,bY)=>{var nEe=Li(),BY=Ed(),{ANY:sEe}=BY,oEe=us(),aEe=yd(),yY=dd(),wY=GI(),AEe=jI(),lEe=YI(),cEe=(r,e,t,i)=>{r=new nEe(r,i),e=new oEe(e,i);let n,s,o,a,l;switch(t){case">":n=yY,s=AEe,o=wY,a=">",l=">=";break;case"<":n=wY,s=lEe,o=yY,a="<",l="<=";break;default:throw new TypeError('Must provide a hilo val of "<" or ">"')}if(aEe(r,e,i))return!1;for(let c=0;c<e.set.length;++c){let u=e.set[c],g=null,f=null;if(u.forEach(h=>{h.semver===sEe&&(h=new BY(">=0.0.0")),g=g||h,f=f||h,n(h.semver,g.semver,i)?g=h:o(h.semver,f.semver,i)&&(f=h)}),g.operator===a||g.operator===l||(!f.operator||f.operator===a)&&s(r,f.semver))return!1;if(f.operator===l&&o(r,f.semver))return!1}return!0};bY.exports=cEe});var SY=w((Z$e,QY)=>{var uEe=VI(),gEe=(r,e,t)=>uEe(r,e,">",t);QY.exports=gEe});var xY=w((_$e,vY)=>{var fEe=VI(),hEe=(r,e,t)=>fEe(r,e,"<",t);vY.exports=hEe});var kY=w(($$e,DY)=>{var PY=us(),pEe=(r,e,t)=>(r=new PY(r,t),e=new PY(e,t),r.intersects(e));DY.exports=pEe});var FY=w((eet,RY)=>{var dEe=yd(),CEe=cs();RY.exports=(r,e,t)=>{let i=[],n=null,s=null,o=r.sort((u,g)=>CEe(u,g,t));for(let u of o)dEe(u,e,t)?(s=u,n||(n=u)):(s&&i.push([n,s]),s=null,n=null);n&&i.push([n,null]);let a=[];for(let[u,g]of i)u===g?a.push(u):!g&&u===o[0]?a.push("*"):g?u===o[0]?a.push(`<=${g}`):a.push(`${u} - ${g}`):a.push(`>=${u}`);let l=a.join(" || "),c=typeof e.raw=="string"?e.raw:String(e);return l.length<c.length?l:e}});var MY=w((tet,OY)=>{var NY=us(),XI=Ed(),{ANY:vv}=XI,wd=yd(),xv=cs(),mEe=(r,e,t={})=>{if(r===e)return!0;r=new NY(r,t),e=new NY(e,t);let i=!1;e:for(let n of r.set){for(let s of e.set){let o=EEe(n,s,t);if(i=i||o!==null,o)continue e}if(i)return!1}return!0},EEe=(r,e,t)=>{if(r===e)return!0;if(r.length===1&&r[0].semver===vv){if(e.length===1&&e[0].semver===vv)return!0;t.includePrerelease?r=[new XI(">=0.0.0-0")]:r=[new XI(">=0.0.0")]}if(e.length===1&&e[0].semver===vv){if(t.includePrerelease)return!0;e=[new XI(">=0.0.0")]}let i=new Set,n,s;for(let h of r)h.operator===">"||h.operator===">="?n=TY(n,h,t):h.operator==="<"||h.operator==="<="?s=LY(s,h,t):i.add(h.semver);if(i.size>1)return null;let o;if(n&&s){if(o=xv(n.semver,s.semver,t),o>0)return null;if(o===0&&(n.operator!==">="||s.operator!=="<="))return null}for(let h of i){if(n&&!wd(h,String(n),t)||s&&!wd(h,String(s),t))return null;for(let p of e)if(!wd(h,String(p),t))return!1;return!0}let a,l,c,u,g=s&&!t.includePrerelease&&s.semver.prerelease.length?s.semver:!1,f=n&&!t.includePrerelease&&n.semver.prerelease.length?n.semver:!1;g&&g.prerelease.length===1&&s.operator==="<"&&g.prerelease[0]===0&&(g=!1);for(let h of e){if(u=u||h.operator===">"||h.operator===">=",c=c||h.operator==="<"||h.operator==="<=",n){if(f&&h.semver.prerelease&&h.semver.prerelease.length&&h.semver.major===f.major&&h.semver.minor===f.minor&&h.semver.patch===f.patch&&(f=!1),h.operator===">"||h.operator===">="){if(a=TY(n,h,t),a===h&&a!==n)return!1}else if(n.operator===">="&&!wd(n.semver,String(h),t))return!1}if(s){if(g&&h.semver.prerelease&&h.semver.prerelease.length&&h.semver.major===g.major&&h.semver.minor===g.minor&&h.semver.patch===g.patch&&(g=!1),h.operator==="<"||h.operator==="<="){if(l=LY(s,h,t),l===h&&l!==s)return!1}else if(s.operator==="<="&&!wd(s.semver,String(h),t))return!1}if(!h.operator&&(s||n)&&o!==0)return!1}return!(n&&c&&!s&&o!==0||s&&u&&!n&&o!==0||f||g)},TY=(r,e,t)=>{if(!r)return e;let i=xv(r.semver,e.semver,t);return i>0?r:i<0||e.operator===">"&&r.operator===">="?e:r},LY=(r,e,t)=>{if(!r)return e;let i=xv(r.semver,e.semver,t);return i<0?r:i>0||e.operator==="<"&&r.operator==="<="?e:r};OY.exports=mEe});var Xr=w((ret,KY)=>{var Pv=uc();KY.exports={re:Pv.re,src:Pv.src,tokens:Pv.t,SEMVER_SPEC_VERSION:gd().SEMVER_SPEC_VERSION,SemVer:Li(),compareIdentifiers:OI().compareIdentifiers,rcompareIdentifiers:OI().rcompareIdentifiers,parse:gc(),valid:lG(),clean:uG(),inc:fG(),diff:EG(),major:yG(),minor:BG(),patch:QG(),prerelease:vG(),compare:cs(),rcompare:PG(),compareLoose:kG(),compareBuild:HI(),sort:TG(),rsort:OG(),gt:dd(),lt:GI(),eq:UI(),neq:Cv(),gte:YI(),lte:jI(),cmp:mv(),coerce:qG(),Comparator:Ed(),Range:us(),satisfies:yd(),toComparators:uY(),maxSatisfying:fY(),minSatisfying:pY(),minVersion:mY(),validRange:IY(),outside:VI(),gtr:SY(),ltr:xY(),intersects:kY(),simplifyRange:FY(),subset:MY()}});var Dv=w(ZI=>{"use strict";Object.defineProperty(ZI,"__esModule",{value:!0});ZI.VERSION=void 0;ZI.VERSION="9.1.0"});var Gt=w((exports,module)=>{"use strict";var __spreadArray=exports&&exports.__spreadArray||function(r,e,t){if(t||arguments.length===2)for(var i=0,n=e.length,s;i<n;i++)(s||!(i in e))&&(s||(s=Array.prototype.slice.call(e,0,i)),s[i]=e[i]);return r.concat(s||Array.prototype.slice.call(e))};Object.defineProperty(exports,"__esModule",{value:!0});exports.toFastProperties=exports.timer=exports.peek=exports.isES2015MapSupported=exports.PRINT_WARNING=exports.PRINT_ERROR=exports.packArray=exports.IDENTITY=exports.NOOP=exports.merge=exports.groupBy=exports.defaults=exports.assignNoOverwrite=exports.assign=exports.zipObject=exports.sortBy=exports.indexOf=exports.some=exports.difference=exports.every=exports.isObject=exports.isRegExp=exports.isArray=exports.partial=exports.uniq=exports.compact=exports.reduce=exports.findAll=exports.find=exports.cloneObj=exports.cloneArr=exports.contains=exports.has=exports.pick=exports.reject=exports.filter=exports.dropRight=exports.drop=exports.isFunction=exports.isUndefined=exports.isString=exports.forEach=exports.last=exports.first=exports.flatten=exports.map=exports.mapValues=exports.values=exports.keys=exports.isEmpty=void 0;exports.upperFirst=void 0;function isEmpty(r){return r&&r.length===0}exports.isEmpty=isEmpty;function keys(r){return r==null?[]:Object.keys(r)}exports.keys=keys;function values(r){for(var e=[],t=Object.keys(r),i=0;i<t.length;i++)e.push(r[t[i]]);return e}exports.values=values;function mapValues(r,e){for(var t=[],i=keys(r),n=0;n<i.length;n++){var s=i[n];t.push(e.call(null,r[s],s))}return t}exports.mapValues=mapValues;function map(r,e){for(var t=[],i=0;i<r.length;i++)t.push(e.call(null,r[i],i));return t}exports.map=map;function flatten(r){for(var e=[],t=0;t<r.length;t++){var i=r[t];Array.isArray(i)?e=e.concat(flatten(i)):e.push(i)}return e}exports.flatten=flatten;function first(r){return isEmpty(r)?void 0:r[0]}exports.first=first;function last(r){var e=r&&r.length;return e?r[e-1]:void 0}exports.last=last;function forEach(r,e){if(Array.isArray(r))for(var t=0;t<r.length;t++)e.call(null,r[t],t);else if(isObject(r))for(var i=keys(r),t=0;t<i.length;t++){var n=i[t],s=r[n];e.call(null,s,n)}else throw Error("non exhaustive match")}exports.forEach=forEach;function isString(r){return typeof r=="string"}exports.isString=isString;function isUndefined(r){return r===void 0}exports.isUndefined=isUndefined;function isFunction(r){return r instanceof Function}exports.isFunction=isFunction;function drop(r,e){return e===void 0&&(e=1),r.slice(e,r.length)}exports.drop=drop;function dropRight(r,e){return e===void 0&&(e=1),r.slice(0,r.length-e)}exports.dropRight=dropRight;function filter(r,e){var t=[];if(Array.isArray(r))for(var i=0;i<r.length;i++){var n=r[i];e.call(null,n)&&t.push(n)}return t}exports.filter=filter;function reject(r,e){return filter(r,function(t){return!e(t)})}exports.reject=reject;function pick(r,e){for(var t=Object.keys(r),i={},n=0;n<t.length;n++){var s=t[n],o=r[s];e(o)&&(i[s]=o)}return i}exports.pick=pick;function has(r,e){return isObject(r)?r.hasOwnProperty(e):!1}exports.has=has;function contains(r,e){return find(r,function(t){return t===e})!==void 0}exports.contains=contains;function cloneArr(r){for(var e=[],t=0;t<r.length;t++)e.push(r[t]);return e}exports.cloneArr=cloneArr;function cloneObj(r){var e={};for(var t in r)Object.prototype.hasOwnProperty.call(r,t)&&(e[t]=r[t]);return e}exports.cloneObj=cloneObj;function find(r,e){for(var t=0;t<r.length;t++){var i=r[t];if(e.call(null,i))return i}}exports.find=find;function findAll(r,e){for(var t=[],i=0;i<r.length;i++){var n=r[i];e.call(null,n)&&t.push(n)}return t}exports.findAll=findAll;function reduce(r,e,t){for(var i=Array.isArray(r),n=i?r:values(r),s=i?[]:keys(r),o=t,a=0;a<n.length;a++)o=e.call(null,o,n[a],i?a:s[a]);return o}exports.reduce=reduce;function compact(r){return reject(r,function(e){return e==null})}exports.compact=compact;function uniq(r,e){e===void 0&&(e=function(i){return i});var t=[];return reduce(r,function(i,n){var s=e(n);return contains(t,s)?i:(t.push(s),i.concat(n))},[])}exports.uniq=uniq;function partial(r){for(var e=[],t=1;t<arguments.length;t++)e[t-1]=arguments[t];var i=[null],n=i.concat(e);return Function.bind.apply(r,n)}exports.partial=partial;function isArray(r){return Array.isArray(r)}exports.isArray=isArray;function isRegExp(r){return r instanceof RegExp}exports.isRegExp=isRegExp;function isObject(r){return r instanceof Object}exports.isObject=isObject;function every(r,e){for(var t=0;t<r.length;t++)if(!e(r[t],t))return!1;return!0}exports.every=every;function difference(r,e){return reject(r,function(t){return contains(e,t)})}exports.difference=difference;function some(r,e){for(var t=0;t<r.length;t++)if(e(r[t]))return!0;return!1}exports.some=some;function indexOf(r,e){for(var t=0;t<r.length;t++)if(r[t]===e)return t;return-1}exports.indexOf=indexOf;function sortBy(r,e){var t=cloneArr(r);return t.sort(function(i,n){return e(i)-e(n)}),t}exports.sortBy=sortBy;function zipObject(r,e){if(r.length!==e.length)throw Error("can't zipObject with different number of keys and values!");for(var t={},i=0;i<r.length;i++)t[r[i]]=e[i];return t}exports.zipObject=zipObject;function assign(r){for(var e=[],t=1;t<arguments.length;t++)e[t-1]=arguments[t];for(var i=0;i<e.length;i++)for(var n=e[i],s=keys(n),o=0;o<s.length;o++){var a=s[o];r[a]=n[a]}return r}exports.assign=assign;function assignNoOverwrite(r){for(var e=[],t=1;t<arguments.length;t++)e[t-1]=arguments[t];for(var i=0;i<e.length;i++)for(var n=e[i],s=keys(n),o=0;o<s.length;o++){var a=s[o];has(r,a)||(r[a]=n[a])}return r}exports.assignNoOverwrite=assignNoOverwrite;function defaults(){for(var r=[],e=0;e<arguments.length;e++)r[e]=arguments[e];return assignNoOverwrite.apply(void 0,__spreadArray([{}],r,!1))}exports.defaults=defaults;function groupBy(r,e){var t={};return forEach(r,function(i){var n=e(i),s=t[n];s?s.push(i):t[n]=[i]}),t}exports.groupBy=groupBy;function merge(r,e){for(var t=cloneObj(r),i=keys(e),n=0;n<i.length;n++){var s=i[n],o=e[s];t[s]=o}return t}exports.merge=merge;function NOOP(){}exports.NOOP=NOOP;function IDENTITY(r){return r}exports.IDENTITY=IDENTITY;function packArray(r){for(var e=[],t=0;t<r.length;t++){var i=r[t];e.push(i!==void 0?i:void 0)}return e}exports.packArray=packArray;function PRINT_ERROR(r){console&&console.error&&console.error("Error: "+r)}exports.PRINT_ERROR=PRINT_ERROR;function PRINT_WARNING(r){console&&console.warn&&console.warn("Warning: "+r)}exports.PRINT_WARNING=PRINT_WARNING;function isES2015MapSupported(){return typeof Map=="function"}exports.isES2015MapSupported=isES2015MapSupported;function peek(r){return r[r.length-1]}exports.peek=peek;function timer(r){var e=new Date().getTime(),t=r(),i=new Date().getTime(),n=i-e;return{time:n,value:t}}exports.timer=timer;function toFastProperties(toBecomeFast){function FakeConstructor(){}FakeConstructor.prototype=toBecomeFast;var fakeInstance=new FakeConstructor;function fakeAccess(){return typeof fakeInstance.bar}return fakeAccess(),fakeAccess(),toBecomeFast;eval(toBecomeFast)}exports.toFastProperties=toFastProperties;function upperFirst(r){if(!r)return r;var e=getCharacterFromCodePointAt(r,0);return e.toUpperCase()+r.substring(e.length)}exports.upperFirst=upperFirst;var surrogatePairPattern=/[\uD800-\uDBFF][\uDC00-\uDFFF]/;function getCharacterFromCodePointAt(r,e){var t=r.substring(e,e+1);return surrogatePairPattern.test(t)?t:r[e]}});var $I=w((UY,_I)=>{(function(r,e){typeof define=="function"&&define.amd?define([],e):typeof _I=="object"&&_I.exports?_I.exports=e():r.regexpToAst=e()})(typeof self<"u"?self:UY,function(){function r(){}r.prototype.saveState=function(){return{idx:this.idx,input:this.input,groupIdx:this.groupIdx}},r.prototype.restoreState=function(p){this.idx=p.idx,this.input=p.input,this.groupIdx=p.groupIdx},r.prototype.pattern=function(p){this.idx=0,this.input=p,this.groupIdx=0,this.consumeChar("/");var C=this.disjunction();this.consumeChar("/");for(var y={type:"Flags",loc:{begin:this.idx,end:p.length},global:!1,ignoreCase:!1,multiLine:!1,unicode:!1,sticky:!1};this.isRegExpFlag();)switch(this.popChar()){case"g":o(y,"global");break;case"i":o(y,"ignoreCase");break;case"m":o(y,"multiLine");break;case"u":o(y,"unicode");break;case"y":o(y,"sticky");break}if(this.idx!==this.input.length)throw Error("Redundant input: "+this.input.substring(this.idx));return{type:"Pattern",flags:y,value:C,loc:this.loc(0)}},r.prototype.disjunction=function(){var p=[],C=this.idx;for(p.push(this.alternative());this.peekChar()==="|";)this.consumeChar("|"),p.push(this.alternative());return{type:"Disjunction",value:p,loc:this.loc(C)}},r.prototype.alternative=function(){for(var p=[],C=this.idx;this.isTerm();)p.push(this.term());return{type:"Alternative",value:p,loc:this.loc(C)}},r.prototype.term=function(){return this.isAssertion()?this.assertion():this.atom()},r.prototype.assertion=function(){var p=this.idx;switch(this.popChar()){case"^":return{type:"StartAnchor",loc:this.loc(p)};case"$":return{type:"EndAnchor",loc:this.loc(p)};case"\\":switch(this.popChar()){case"b":return{type:"WordBoundary",loc:this.loc(p)};case"B":return{type:"NonWordBoundary",loc:this.loc(p)}}throw Error("Invalid Assertion Escape");case"(":this.consumeChar("?");var C;switch(this.popChar()){case"=":C="Lookahead";break;case"!":C="NegativeLookahead";break}a(C);var y=this.disjunction();return this.consumeChar(")"),{type:C,value:y,loc:this.loc(p)}}l()},r.prototype.quantifier=function(p){var C,y=this.idx;switch(this.popChar()){case"*":C={atLeast:0,atMost:1/0};break;case"+":C={atLeast:1,atMost:1/0};break;case"?":C={atLeast:0,atMost:1};break;case"{":var B=this.integerIncludingZero();switch(this.popChar()){case"}":C={atLeast:B,atMost:B};break;case",":var v;this.isDigit()?(v=this.integerIncludingZero(),C={atLeast:B,atMost:v}):C={atLeast:B,atMost:1/0},this.consumeChar("}");break}if(p===!0&&C===void 0)return;a(C);break}if(!(p===!0&&C===void 0))return a(C),this.peekChar(0)==="?"?(this.consumeChar("?"),C.greedy=!1):C.greedy=!0,C.type="Quantifier",C.loc=this.loc(y),C},r.prototype.atom=function(){var p,C=this.idx;switch(this.peekChar()){case".":p=this.dotAll();break;case"\\":p=this.atomEscape();break;case"[":p=this.characterClass();break;case"(":p=this.group();break}return p===void 0&&this.isPatternCharacter()&&(p=this.patternCharacter()),a(p),p.loc=this.loc(C),this.isQuantifier()&&(p.quantifier=this.quantifier()),p},r.prototype.dotAll=function(){return this.consumeChar("."),{type:"Set",complement:!0,value:[n(`
-`),n("\r"),n("\u2028"),n("\u2029")]}},r.prototype.atomEscape=function(){switch(this.consumeChar("\\"),this.peekChar()){case"1":case"2":case"3":case"4":case"5":case"6":case"7":case"8":case"9":return this.decimalEscapeAtom();case"d":case"D":case"s":case"S":case"w":case"W":return this.characterClassEscape();case"f":case"n":case"r":case"t":case"v":return this.controlEscapeAtom();case"c":return this.controlLetterEscapeAtom();case"0":return this.nulCharacterAtom();case"x":return this.hexEscapeSequenceAtom();case"u":return this.regExpUnicodeEscapeSequenceAtom();default:return this.identityEscapeAtom()}},r.prototype.decimalEscapeAtom=function(){var p=this.positiveInteger();return{type:"GroupBackReference",value:p}},r.prototype.characterClassEscape=function(){var p,C=!1;switch(this.popChar()){case"d":p=u;break;case"D":p=u,C=!0;break;case"s":p=f;break;case"S":p=f,C=!0;break;case"w":p=g;break;case"W":p=g,C=!0;break}return a(p),{type:"Set",value:p,complement:C}},r.prototype.controlEscapeAtom=function(){var p;switch(this.popChar()){case"f":p=n("\f");break;case"n":p=n(`
-`);break;case"r":p=n("\r");break;case"t":p=n("	");break;case"v":p=n("\v");break}return a(p),{type:"Character",value:p}},r.prototype.controlLetterEscapeAtom=function(){this.consumeChar("c");var p=this.popChar();if(/[a-zA-Z]/.test(p)===!1)throw Error("Invalid ");var C=p.toUpperCase().charCodeAt(0)-64;return{type:"Character",value:C}},r.prototype.nulCharacterAtom=function(){return this.consumeChar("0"),{type:"Character",value:n("\0")}},r.prototype.hexEscapeSequenceAtom=function(){return this.consumeChar("x"),this.parseHexDigits(2)},r.prototype.regExpUnicodeEscapeSequenceAtom=function(){return this.consumeChar("u"),this.parseHexDigits(4)},r.prototype.identityEscapeAtom=function(){var p=this.popChar();return{type:"Character",value:n(p)}},r.prototype.classPatternCharacterAtom=function(){switch(this.peekChar()){case`
-`:case"\r":case"\u2028":case"\u2029":case"\\":case"]":throw Error("TBD");default:var p=this.popChar();return{type:"Character",value:n(p)}}},r.prototype.characterClass=function(){var p=[],C=!1;for(this.consumeChar("["),this.peekChar(0)==="^"&&(this.consumeChar("^"),C=!0);this.isClassAtom();){var y=this.classAtom(),B=y.type==="Character";if(B&&this.isRangeDash()){this.consumeChar("-");var v=this.classAtom(),D=v.type==="Character";if(D){if(v.value<y.value)throw Error("Range out of order in character class");p.push({from:y.value,to:v.value})}else s(y.value,p),p.push(n("-")),s(v.value,p)}else s(y.value,p)}return this.consumeChar("]"),{type:"Set",complement:C,value:p}},r.prototype.classAtom=function(){switch(this.peekChar()){case"]":case`
-`:case"\r":case"\u2028":case"\u2029":throw Error("TBD");case"\\":return this.classEscape();default:return this.classPatternCharacterAtom()}},r.prototype.classEscape=function(){switch(this.consumeChar("\\"),this.peekChar()){case"b":return this.consumeChar("b"),{type:"Character",value:n("\b")};case"d":case"D":case"s":case"S":case"w":case"W":return this.characterClassEscape();case"f":case"n":case"r":case"t":case"v":return this.controlEscapeAtom();case"c":return this.controlLetterEscapeAtom();case"0":return this.nulCharacterAtom();case"x":return this.hexEscapeSequenceAtom();case"u":return this.regExpUnicodeEscapeSequenceAtom();default:return this.identityEscapeAtom()}},r.prototype.group=function(){var p=!0;switch(this.consumeChar("("),this.peekChar(0)){case"?":this.consumeChar("?"),this.consumeChar(":"),p=!1;break;default:this.groupIdx++;break}var C=this.disjunction();this.consumeChar(")");var y={type:"Group",capturing:p,value:C};return p&&(y.idx=this.groupIdx),y},r.prototype.positiveInteger=function(){var p=this.popChar();if(i.test(p)===!1)throw Error("Expecting a positive integer");for(;t.test(this.peekChar(0));)p+=this.popChar();return parseInt(p,10)},r.prototype.integerIncludingZero=function(){var p=this.popChar();if(t.test(p)===!1)throw Error("Expecting an integer");for(;t.test(this.peekChar(0));)p+=this.popChar();return parseInt(p,10)},r.prototype.patternCharacter=function(){var p=this.popChar();switch(p){case`
-`:case"\r":case"\u2028":case"\u2029":case"^":case"$":case"\\":case".":case"*":case"+":case"?":case"(":case")":case"[":case"|":throw Error("TBD");default:return{type:"Character",value:n(p)}}},r.prototype.isRegExpFlag=function(){switch(this.peekChar(0)){case"g":case"i":case"m":case"u":case"y":return!0;default:return!1}},r.prototype.isRangeDash=function(){return this.peekChar()==="-"&&this.isClassAtom(1)},r.prototype.isDigit=function(){return t.test(this.peekChar(0))},r.prototype.isClassAtom=function(p){switch(p===void 0&&(p=0),this.peekChar(p)){case"]":case`
-`:case"\r":case"\u2028":case"\u2029":return!1;default:return!0}},r.prototype.isTerm=function(){return this.isAtom()||this.isAssertion()},r.prototype.isAtom=function(){if(this.isPatternCharacter())return!0;switch(this.peekChar(0)){case".":case"\\":case"[":case"(":return!0;default:return!1}},r.prototype.isAssertion=function(){switch(this.peekChar(0)){case"^":case"$":return!0;case"\\":switch(this.peekChar(1)){case"b":case"B":return!0;default:return!1}case"(":return this.peekChar(1)==="?"&&(this.peekChar(2)==="="||this.peekChar(2)==="!");default:return!1}},r.prototype.isQuantifier=function(){var p=this.saveState();try{return this.quantifier(!0)!==void 0}catch{return!1}finally{this.restoreState(p)}},r.prototype.isPatternCharacter=function(){switch(this.peekChar()){case"^":case"$":case"\\":case".":case"*":case"+":case"?":case"(":case")":case"[":case"|":case"/":case`
-`:case"\r":case"\u2028":case"\u2029":return!1;default:return!0}},r.prototype.parseHexDigits=function(p){for(var C="",y=0;y<p;y++){var B=this.popChar();if(e.test(B)===!1)throw Error("Expecting a HexDecimal digits");C+=B}var v=parseInt(C,16);return{type:"Character",value:v}},r.prototype.peekChar=function(p){return p===void 0&&(p=0),this.input[this.idx+p]},r.prototype.popChar=function(){var p=this.peekChar(0);return this.consumeChar(),p},r.prototype.consumeChar=function(p){if(p!==void 0&&this.input[this.idx]!==p)throw Error("Expected: '"+p+"' but found: '"+this.input[this.idx]+"' at offset: "+this.idx);if(this.idx>=this.input.length)throw Error("Unexpected end of input");this.idx++},r.prototype.loc=function(p){return{begin:p,end:this.idx}};var e=/[0-9a-fA-F]/,t=/[0-9]/,i=/[1-9]/;function n(p){return p.charCodeAt(0)}function s(p,C){p.length!==void 0?p.forEach(function(y){C.push(y)}):C.push(p)}function o(p,C){if(p[C]===!0)throw"duplicate flag "+C;p[C]=!0}function a(p){if(p===void 0)throw Error("Internal Error - Should never get here!")}function l(){throw Error("Internal Error - Should never get here!")}var c,u=[];for(c=n("0");c<=n("9");c++)u.push(c);var g=[n("_")].concat(u);for(c=n("a");c<=n("z");c++)g.push(c);for(c=n("A");c<=n("Z");c++)g.push(c);var f=[n(" "),n("\f"),n(`
-`),n("\r"),n("	"),n("\v"),n("	"),n("\xA0"),n("\u1680"),n("\u2000"),n("\u2001"),n("\u2002"),n("\u2003"),n("\u2004"),n("\u2005"),n("\u2006"),n("\u2007"),n("\u2008"),n("\u2009"),n("\u200A"),n("\u2028"),n("\u2029"),n("\u202F"),n("\u205F"),n("\u3000"),n("\uFEFF")];function h(){}return h.prototype.visitChildren=function(p){for(var C in p){var y=p[C];p.hasOwnProperty(C)&&(y.type!==void 0?this.visit(y):Array.isArray(y)&&y.forEach(function(B){this.visit(B)},this))}},h.prototype.visit=function(p){switch(p.type){case"Pattern":this.visitPattern(p);break;case"Flags":this.visitFlags(p);break;case"Disjunction":this.visitDisjunction(p);break;case"Alternative":this.visitAlternative(p);break;case"StartAnchor":this.visitStartAnchor(p);break;case"EndAnchor":this.visitEndAnchor(p);break;case"WordBoundary":this.visitWordBoundary(p);break;case"NonWordBoundary":this.visitNonWordBoundary(p);break;case"Lookahead":this.visitLookahead(p);break;case"NegativeLookahead":this.visitNegativeLookahead(p);break;case"Character":this.visitCharacter(p);break;case"Set":this.visitSet(p);break;case"Group":this.visitGroup(p);break;case"GroupBackReference":this.visitGroupBackReference(p);break;case"Quantifier":this.visitQuantifier(p);break}this.visitChildren(p)},h.prototype.visitPattern=function(p){},h.prototype.visitFlags=function(p){},h.prototype.visitDisjunction=function(p){},h.prototype.visitAlternative=function(p){},h.prototype.visitStartAnchor=function(p){},h.prototype.visitEndAnchor=function(p){},h.prototype.visitWordBoundary=function(p){},h.prototype.visitNonWordBoundary=function(p){},h.prototype.visitLookahead=function(p){},h.prototype.visitNegativeLookahead=function(p){},h.prototype.visitCharacter=function(p){},h.prototype.visitSet=function(p){},h.prototype.visitGroup=function(p){},h.prototype.visitGroupBackReference=function(p){},h.prototype.visitQuantifier=function(p){},{RegExpParser:r,BaseRegExpVisitor:h,VERSION:"0.5.0"}})});var ty=w(Xg=>{"use strict";Object.defineProperty(Xg,"__esModule",{value:!0});Xg.clearRegExpParserCache=Xg.getRegExpAst=void 0;var IEe=$I(),ey={},yEe=new IEe.RegExpParser;function wEe(r){var e=r.toString();if(ey.hasOwnProperty(e))return ey[e];var t=yEe.pattern(e);return ey[e]=t,t}Xg.getRegExpAst=wEe;function BEe(){ey={}}Xg.clearRegExpParserCache=BEe});var qY=w(Cn=>{"use strict";var bEe=Cn&&Cn.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(Cn,"__esModule",{value:!0});Cn.canMatchCharCode=Cn.firstCharOptimizedIndices=Cn.getOptimizedStartCodesIndices=Cn.failedOptimizationPrefixMsg=void 0;var GY=$I(),gs=Gt(),YY=ty(),xa=Rv(),jY="Complement Sets are not supported for first char optimization";Cn.failedOptimizationPrefixMsg=`Unable to use "first char" lexer optimizations:
-`;function QEe(r,e){e===void 0&&(e=!1);try{var t=(0,YY.getRegExpAst)(r),i=iy(t.value,{},t.flags.ignoreCase);return i}catch(s){if(s.message===jY)e&&(0,gs.PRINT_WARNING)(""+Cn.failedOptimizationPrefixMsg+("	Unable to optimize: < "+r.toString()+` >
-`)+`	Complement Sets cannot be automatically optimized.
-	This will disable the lexer's first char optimizations.
-	See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#COMPLEMENT for details.`);else{var n="";e&&(n=`
-	This will disable the lexer's first char optimizations.
-	See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#REGEXP_PARSING for details.`),(0,gs.PRINT_ERROR)(Cn.failedOptimizationPrefixMsg+`
-`+("	Failed parsing: < "+r.toString()+` >
-`)+("	Using the regexp-to-ast library version: "+GY.VERSION+`
-`)+"	Please open an issue at: https://github.com/bd82/regexp-to-ast/issues"+n)}}return[]}Cn.getOptimizedStartCodesIndices=QEe;function iy(r,e,t){switch(r.type){case"Disjunction":for(var i=0;i<r.value.length;i++)iy(r.value[i],e,t);break;case"Alternative":for(var n=r.value,i=0;i<n.length;i++){var s=n[i];switch(s.type){case"EndAnchor":case"GroupBackReference":case"Lookahead":case"NegativeLookahead":case"StartAnchor":case"WordBoundary":case"NonWordBoundary":continue}var o=s;switch(o.type){case"Character":ry(o.value,e,t);break;case"Set":if(o.complement===!0)throw Error(jY);(0,gs.forEach)(o.value,function(c){if(typeof c=="number")ry(c,e,t);else{var u=c;if(t===!0)for(var g=u.from;g<=u.to;g++)ry(g,e,t);else{for(var g=u.from;g<=u.to&&g<xa.minOptimizationVal;g++)ry(g,e,t);if(u.to>=xa.minOptimizationVal)for(var f=u.from>=xa.minOptimizationVal?u.from:xa.minOptimizationVal,h=u.to,p=(0,xa.charCodeToOptimizedIndex)(f),C=(0,xa.charCodeToOptimizedIndex)(h),y=p;y<=C;y++)e[y]=y}}});break;case"Group":iy(o.value,e,t);break;default:throw Error("Non Exhaustive Match")}var a=o.quantifier!==void 0&&o.quantifier.atLeast===0;if(o.type==="Group"&&kv(o)===!1||o.type!=="Group"&&a===!1)break}break;default:throw Error("non exhaustive match!")}return(0,gs.values)(e)}Cn.firstCharOptimizedIndices=iy;function ry(r,e,t){var i=(0,xa.charCodeToOptimizedIndex)(r);e[i]=i,t===!0&&SEe(r,e)}function SEe(r,e){var t=String.fromCharCode(r),i=t.toUpperCase();if(i!==t){var n=(0,xa.charCodeToOptimizedIndex)(i.charCodeAt(0));e[n]=n}else{var s=t.toLowerCase();if(s!==t){var n=(0,xa.charCodeToOptimizedIndex)(s.charCodeAt(0));e[n]=n}}}function HY(r,e){return(0,gs.find)(r.value,function(t){if(typeof t=="number")return(0,gs.contains)(e,t);var i=t;return(0,gs.find)(e,function(n){return i.from<=n&&n<=i.to})!==void 0})}function kv(r){return r.quantifier&&r.quantifier.atLeast===0?!0:r.value?(0,gs.isArray)(r.value)?(0,gs.every)(r.value,kv):kv(r.value):!1}var vEe=function(r){bEe(e,r);function e(t){var i=r.call(this)||this;return i.targetCharCodes=t,i.found=!1,i}return e.prototype.visitChildren=function(t){if(this.found!==!0){switch(t.type){case"Lookahead":this.visitLookahead(t);return;case"NegativeLookahead":this.visitNegativeLookahead(t);return}r.prototype.visitChildren.call(this,t)}},e.prototype.visitCharacter=function(t){(0,gs.contains)(this.targetCharCodes,t.value)&&(this.found=!0)},e.prototype.visitSet=function(t){t.complement?HY(t,this.targetCharCodes)===void 0&&(this.found=!0):HY(t,this.targetCharCodes)!==void 0&&(this.found=!0)},e}(GY.BaseRegExpVisitor);function xEe(r,e){if(e instanceof RegExp){var t=(0,YY.getRegExpAst)(e),i=new vEe(r);return i.visit(t),i.found}else return(0,gs.find)(e,function(n){return(0,gs.contains)(r,n.charCodeAt(0))})!==void 0}Cn.canMatchCharCode=xEe});var Rv=w(Ve=>{"use strict";var JY=Ve&&Ve.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(Ve,"__esModule",{value:!0});Ve.charCodeToOptimizedIndex=Ve.minOptimizationVal=Ve.buildLineBreakIssueMessage=Ve.LineTerminatorOptimizedTester=Ve.isShortPattern=Ve.isCustomPattern=Ve.cloneEmptyGroups=Ve.performWarningRuntimeChecks=Ve.performRuntimeChecks=Ve.addStickyFlag=Ve.addStartOfInput=Ve.findUnreachablePatterns=Ve.findModesThatDoNotExist=Ve.findInvalidGroupType=Ve.findDuplicatePatterns=Ve.findUnsupportedFlags=Ve.findStartOfInputAnchor=Ve.findEmptyMatchRegExps=Ve.findEndOfInputAnchor=Ve.findInvalidPatterns=Ve.findMissingPatterns=Ve.validatePatterns=Ve.analyzeTokenTypes=Ve.enableSticky=Ve.disableSticky=Ve.SUPPORT_STICKY=Ve.MODES=Ve.DEFAULT_MODE=void 0;var WY=$I(),ir=Bd(),xe=Gt(),Zg=qY(),zY=ty(),ko="PATTERN";Ve.DEFAULT_MODE="defaultMode";Ve.MODES="modes";Ve.SUPPORT_STICKY=typeof new RegExp("(?:)").sticky=="boolean";function PEe(){Ve.SUPPORT_STICKY=!1}Ve.disableSticky=PEe;function DEe(){Ve.SUPPORT_STICKY=!0}Ve.enableSticky=DEe;function kEe(r,e){e=(0,xe.defaults)(e,{useSticky:Ve.SUPPORT_STICKY,debug:!1,safeMode:!1,positionTracking:"full",lineTerminatorCharacters:["\r",`
-`],tracer:function(v,D){return D()}});var t=e.tracer;t("initCharCodeToOptimizedIndexMap",function(){HEe()});var i;t("Reject Lexer.NA",function(){i=(0,xe.reject)(r,function(v){return v[ko]===ir.Lexer.NA})});var n=!1,s;t("Transform Patterns",function(){n=!1,s=(0,xe.map)(i,function(v){var D=v[ko];if((0,xe.isRegExp)(D)){var T=D.source;return T.length===1&&T!=="^"&&T!=="$"&&T!=="."&&!D.ignoreCase?T:T.length===2&&T[0]==="\\"&&!(0,xe.contains)(["d","D","s","S","t","r","n","t","0","c","b","B","f","v","w","W"],T[1])?T[1]:e.useSticky?Tv(D):Nv(D)}else{if((0,xe.isFunction)(D))return n=!0,{exec:D};if((0,xe.has)(D,"exec"))return n=!0,D;if(typeof D=="string"){if(D.length===1)return D;var H=D.replace(/[\\^$.*+?()[\]{}|]/g,"\\$&"),j=new RegExp(H);return e.useSticky?Tv(j):Nv(j)}else throw Error("non exhaustive match")}})});var o,a,l,c,u;t("misc mapping",function(){o=(0,xe.map)(i,function(v){return v.tokenTypeIdx}),a=(0,xe.map)(i,function(v){var D=v.GROUP;if(D!==ir.Lexer.SKIPPED){if((0,xe.isString)(D))return D;if((0,xe.isUndefined)(D))return!1;throw Error("non exhaustive match")}}),l=(0,xe.map)(i,function(v){var D=v.LONGER_ALT;if(D){var T=(0,xe.isArray)(D)?(0,xe.map)(D,function(H){return(0,xe.indexOf)(i,H)}):[(0,xe.indexOf)(i,D)];return T}}),c=(0,xe.map)(i,function(v){return v.PUSH_MODE}),u=(0,xe.map)(i,function(v){return(0,xe.has)(v,"POP_MODE")})});var g;t("Line Terminator Handling",function(){var v=Aj(e.lineTerminatorCharacters);g=(0,xe.map)(i,function(D){return!1}),e.positionTracking!=="onlyOffset"&&(g=(0,xe.map)(i,function(D){if((0,xe.has)(D,"LINE_BREAKS"))return D.LINE_BREAKS;if(oj(D,v)===!1)return(0,Zg.canMatchCharCode)(v,D.PATTERN)}))});var f,h,p,C;t("Misc Mapping #2",function(){f=(0,xe.map)(i,Ov),h=(0,xe.map)(s,sj),p=(0,xe.reduce)(i,function(v,D){var T=D.GROUP;return(0,xe.isString)(T)&&T!==ir.Lexer.SKIPPED&&(v[T]=[]),v},{}),C=(0,xe.map)(s,function(v,D){return{pattern:s[D],longerAlt:l[D],canLineTerminator:g[D],isCustom:f[D],short:h[D],group:a[D],push:c[D],pop:u[D],tokenTypeIdx:o[D],tokenType:i[D]}})});var y=!0,B=[];return e.safeMode||t("First Char Optimization",function(){B=(0,xe.reduce)(i,function(v,D,T){if(typeof D.PATTERN=="string"){var H=D.PATTERN.charCodeAt(0),j=Lv(H);Fv(v,j,C[T])}else if((0,xe.isArray)(D.START_CHARS_HINT)){var $;(0,xe.forEach)(D.START_CHARS_HINT,function(W){var _=typeof W=="string"?W.charCodeAt(0):W,A=Lv(_);$!==A&&($=A,Fv(v,A,C[T]))})}else if((0,xe.isRegExp)(D.PATTERN))if(D.PATTERN.unicode)y=!1,e.ensureOptimizations&&(0,xe.PRINT_ERROR)(""+Zg.failedOptimizationPrefixMsg+("	Unable to analyze < "+D.PATTERN.toString()+` > pattern.
-`)+`	The regexp unicode flag is not currently supported by the regexp-to-ast library.
-	This will disable the lexer's first char optimizations.
-	For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#UNICODE_OPTIMIZE`);else{var V=(0,Zg.getOptimizedStartCodesIndices)(D.PATTERN,e.ensureOptimizations);(0,xe.isEmpty)(V)&&(y=!1),(0,xe.forEach)(V,function(W){Fv(v,W,C[T])})}else e.ensureOptimizations&&(0,xe.PRINT_ERROR)(""+Zg.failedOptimizationPrefixMsg+("	TokenType: <"+D.name+`> is using a custom token pattern without providing <start_chars_hint> parameter.
-`)+`	This will disable the lexer's first char optimizations.
-	For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#CUSTOM_OPTIMIZE`),y=!1;return v},[])}),t("ArrayPacking",function(){B=(0,xe.packArray)(B)}),{emptyGroups:p,patternIdxToConfig:C,charCodeToPatternIdxToConfig:B,hasCustom:n,canBeOptimized:y}}Ve.analyzeTokenTypes=kEe;function REe(r,e){var t=[],i=VY(r);t=t.concat(i.errors);var n=XY(i.valid),s=n.valid;return t=t.concat(n.errors),t=t.concat(FEe(s)),t=t.concat(rj(s)),t=t.concat(ij(s,e)),t=t.concat(nj(s)),t}Ve.validatePatterns=REe;function FEe(r){var e=[],t=(0,xe.filter)(r,function(i){return(0,xe.isRegExp)(i[ko])});return e=e.concat(ZY(t)),e=e.concat($Y(t)),e=e.concat(ej(t)),e=e.concat(tj(t)),e=e.concat(_Y(t)),e}function VY(r){var e=(0,xe.filter)(r,function(n){return!(0,xe.has)(n,ko)}),t=(0,xe.map)(e,function(n){return{message:"Token Type: ->"+n.name+"<- missing static 'PATTERN' property",type:ir.LexerDefinitionErrorType.MISSING_PATTERN,tokenTypes:[n]}}),i=(0,xe.difference)(r,e);return{errors:t,valid:i}}Ve.findMissingPatterns=VY;function XY(r){var e=(0,xe.filter)(r,function(n){var s=n[ko];return!(0,xe.isRegExp)(s)&&!(0,xe.isFunction)(s)&&!(0,xe.has)(s,"exec")&&!(0,xe.isString)(s)}),t=(0,xe.map)(e,function(n){return{message:"Token Type: ->"+n.name+"<- static 'PATTERN' can only be a RegExp, a Function matching the {CustomPatternMatcherFunc} type or an Object matching the {ICustomPattern} interface.",type:ir.LexerDefinitionErrorType.INVALID_PATTERN,tokenTypes:[n]}}),i=(0,xe.difference)(r,e);return{errors:t,valid:i}}Ve.findInvalidPatterns=XY;var NEe=/[^\\][\$]/;function ZY(r){var e=function(n){JY(s,n);function s(){var o=n!==null&&n.apply(this,arguments)||this;return o.found=!1,o}return s.prototype.visitEndAnchor=function(o){this.found=!0},s}(WY.BaseRegExpVisitor),t=(0,xe.filter)(r,function(n){var s=n[ko];try{var o=(0,zY.getRegExpAst)(s),a=new e;return a.visit(o),a.found}catch{return NEe.test(s.source)}}),i=(0,xe.map)(t,function(n){return{message:`Unexpected RegExp Anchor Error:
-	Token Type: ->`+n.name+`<- static 'PATTERN' cannot contain end of input anchor '$'
-	See chevrotain.io/docs/guide/resolving_lexer_errors.html#ANCHORS	for details.`,type:ir.LexerDefinitionErrorType.EOI_ANCHOR_FOUND,tokenTypes:[n]}});return i}Ve.findEndOfInputAnchor=ZY;function _Y(r){var e=(0,xe.filter)(r,function(i){var n=i[ko];return n.test("")}),t=(0,xe.map)(e,function(i){return{message:"Token Type: ->"+i.name+"<- static 'PATTERN' must not match an empty string",type:ir.LexerDefinitionErrorType.EMPTY_MATCH_PATTERN,tokenTypes:[i]}});return t}Ve.findEmptyMatchRegExps=_Y;var TEe=/[^\\[][\^]|^\^/;function $Y(r){var e=function(n){JY(s,n);function s(){var o=n!==null&&n.apply(this,arguments)||this;return o.found=!1,o}return s.prototype.visitStartAnchor=function(o){this.found=!0},s}(WY.BaseRegExpVisitor),t=(0,xe.filter)(r,function(n){var s=n[ko];try{var o=(0,zY.getRegExpAst)(s),a=new e;return a.visit(o),a.found}catch{return TEe.test(s.source)}}),i=(0,xe.map)(t,function(n){return{message:`Unexpected RegExp Anchor Error:
-	Token Type: ->`+n.name+`<- static 'PATTERN' cannot contain start of input anchor '^'
-	See https://chevrotain.io/docs/guide/resolving_lexer_errors.html#ANCHORS	for details.`,type:ir.LexerDefinitionErrorType.SOI_ANCHOR_FOUND,tokenTypes:[n]}});return i}Ve.findStartOfInputAnchor=$Y;function ej(r){var e=(0,xe.filter)(r,function(i){var n=i[ko];return n instanceof RegExp&&(n.multiline||n.global)}),t=(0,xe.map)(e,function(i){return{message:"Token Type: ->"+i.name+"<- static 'PATTERN' may NOT contain global('g') or multiline('m')",type:ir.LexerDefinitionErrorType.UNSUPPORTED_FLAGS_FOUND,tokenTypes:[i]}});return t}Ve.findUnsupportedFlags=ej;function tj(r){var e=[],t=(0,xe.map)(r,function(s){return(0,xe.reduce)(r,function(o,a){return s.PATTERN.source===a.PATTERN.source&&!(0,xe.contains)(e,a)&&a.PATTERN!==ir.Lexer.NA&&(e.push(a),o.push(a)),o},[])});t=(0,xe.compact)(t);var i=(0,xe.filter)(t,function(s){return s.length>1}),n=(0,xe.map)(i,function(s){var o=(0,xe.map)(s,function(l){return l.name}),a=(0,xe.first)(s).PATTERN;return{message:"The same RegExp pattern ->"+a+"<-"+("has been used in all of the following Token Types: "+o.join(", ")+" <-"),type:ir.LexerDefinitionErrorType.DUPLICATE_PATTERNS_FOUND,tokenTypes:s}});return n}Ve.findDuplicatePatterns=tj;function rj(r){var e=(0,xe.filter)(r,function(i){if(!(0,xe.has)(i,"GROUP"))return!1;var n=i.GROUP;return n!==ir.Lexer.SKIPPED&&n!==ir.Lexer.NA&&!(0,xe.isString)(n)}),t=(0,xe.map)(e,function(i){return{message:"Token Type: ->"+i.name+"<- static 'GROUP' can only be Lexer.SKIPPED/Lexer.NA/A String",type:ir.LexerDefinitionErrorType.INVALID_GROUP_TYPE_FOUND,tokenTypes:[i]}});return t}Ve.findInvalidGroupType=rj;function ij(r,e){var t=(0,xe.filter)(r,function(n){return n.PUSH_MODE!==void 0&&!(0,xe.contains)(e,n.PUSH_MODE)}),i=(0,xe.map)(t,function(n){var s="Token Type: ->"+n.name+"<- static 'PUSH_MODE' value cannot refer to a Lexer Mode ->"+n.PUSH_MODE+"<-which does not exist";return{message:s,type:ir.LexerDefinitionErrorType.PUSH_MODE_DOES_NOT_EXIST,tokenTypes:[n]}});return i}Ve.findModesThatDoNotExist=ij;function nj(r){var e=[],t=(0,xe.reduce)(r,function(i,n,s){var o=n.PATTERN;return o===ir.Lexer.NA||((0,xe.isString)(o)?i.push({str:o,idx:s,tokenType:n}):(0,xe.isRegExp)(o)&&OEe(o)&&i.push({str:o.source,idx:s,tokenType:n})),i},[]);return(0,xe.forEach)(r,function(i,n){(0,xe.forEach)(t,function(s){var o=s.str,a=s.idx,l=s.tokenType;if(n<a&&LEe(o,i.PATTERN)){var c="Token: ->"+l.name+`<- can never be matched.
-`+("Because it appears AFTER the Token Type ->"+i.name+"<-")+`in the lexer's definition.
-See https://chevrotain.io/docs/guide/resolving_lexer_errors.html#UNREACHABLE`;e.push({message:c,type:ir.LexerDefinitionErrorType.UNREACHABLE_PATTERN,tokenTypes:[i,l]})}})}),e}Ve.findUnreachablePatterns=nj;function LEe(r,e){if((0,xe.isRegExp)(e)){var t=e.exec(r);return t!==null&&t.index===0}else{if((0,xe.isFunction)(e))return e(r,0,[],{});if((0,xe.has)(e,"exec"))return e.exec(r,0,[],{});if(typeof e=="string")return e===r;throw Error("non exhaustive match")}}function OEe(r){var e=[".","\\","[","]","|","^","$","(",")","?","*","+","{"];return(0,xe.find)(e,function(t){return r.source.indexOf(t)!==-1})===void 0}function Nv(r){var e=r.ignoreCase?"i":"";return new RegExp("^(?:"+r.source+")",e)}Ve.addStartOfInput=Nv;function Tv(r){var e=r.ignoreCase?"iy":"y";return new RegExp(""+r.source,e)}Ve.addStickyFlag=Tv;function MEe(r,e,t){var i=[];return(0,xe.has)(r,Ve.DEFAULT_MODE)||i.push({message:"A MultiMode Lexer cannot be initialized without a <"+Ve.DEFAULT_MODE+`> property in its definition
-`,type:ir.LexerDefinitionErrorType.MULTI_MODE_LEXER_WITHOUT_DEFAULT_MODE}),(0,xe.has)(r,Ve.MODES)||i.push({message:"A MultiMode Lexer cannot be initialized without a <"+Ve.MODES+`> property in its definition
-`,type:ir.LexerDefinitionErrorType.MULTI_MODE_LEXER_WITHOUT_MODES_PROPERTY}),(0,xe.has)(r,Ve.MODES)&&(0,xe.has)(r,Ve.DEFAULT_MODE)&&!(0,xe.has)(r.modes,r.defaultMode)&&i.push({message:"A MultiMode Lexer cannot be initialized with a "+Ve.DEFAULT_MODE+": <"+r.defaultMode+`>which does not exist
-`,type:ir.LexerDefinitionErrorType.MULTI_MODE_LEXER_DEFAULT_MODE_VALUE_DOES_NOT_EXIST}),(0,xe.has)(r,Ve.MODES)&&(0,xe.forEach)(r.modes,function(n,s){(0,xe.forEach)(n,function(o,a){(0,xe.isUndefined)(o)&&i.push({message:"A Lexer cannot be initialized using an undefined Token Type. Mode:"+("<"+s+"> at index: <"+a+`>
-`),type:ir.LexerDefinitionErrorType.LEXER_DEFINITION_CANNOT_CONTAIN_UNDEFINED})})}),i}Ve.performRuntimeChecks=MEe;function KEe(r,e,t){var i=[],n=!1,s=(0,xe.compact)((0,xe.flatten)((0,xe.mapValues)(r.modes,function(l){return l}))),o=(0,xe.reject)(s,function(l){return l[ko]===ir.Lexer.NA}),a=Aj(t);return e&&(0,xe.forEach)(o,function(l){var c=oj(l,a);if(c!==!1){var u=aj(l,c),g={message:u,type:c.issue,tokenType:l};i.push(g)}else(0,xe.has)(l,"LINE_BREAKS")?l.LINE_BREAKS===!0&&(n=!0):(0,Zg.canMatchCharCode)(a,l.PATTERN)&&(n=!0)}),e&&!n&&i.push({message:`Warning: No LINE_BREAKS Found.
-	This Lexer has been defined to track line and column information,
-	But none of the Token Types can be identified as matching a line terminator.
-	See https://chevrotain.io/docs/guide/resolving_lexer_errors.html#LINE_BREAKS 
-	for details.`,type:ir.LexerDefinitionErrorType.NO_LINE_BREAKS_FLAGS}),i}Ve.performWarningRuntimeChecks=KEe;function UEe(r){var e={},t=(0,xe.keys)(r);return(0,xe.forEach)(t,function(i){var n=r[i];if((0,xe.isArray)(n))e[i]=[];else throw Error("non exhaustive match")}),e}Ve.cloneEmptyGroups=UEe;function Ov(r){var e=r.PATTERN;if((0,xe.isRegExp)(e))return!1;if((0,xe.isFunction)(e))return!0;if((0,xe.has)(e,"exec"))return!0;if((0,xe.isString)(e))return!1;throw Error("non exhaustive match")}Ve.isCustomPattern=Ov;function sj(r){return(0,xe.isString)(r)&&r.length===1?r.charCodeAt(0):!1}Ve.isShortPattern=sj;Ve.LineTerminatorOptimizedTester={test:function(r){for(var e=r.length,t=this.lastIndex;t<e;t++){var i=r.charCodeAt(t);if(i===10)return this.lastIndex=t+1,!0;if(i===13)return r.charCodeAt(t+1)===10?this.lastIndex=t+2:this.lastIndex=t+1,!0}return!1},lastIndex:0};function oj(r,e){if((0,xe.has)(r,"LINE_BREAKS"))return!1;if((0,xe.isRegExp)(r.PATTERN)){try{(0,Zg.canMatchCharCode)(e,r.PATTERN)}catch(t){return{issue:ir.LexerDefinitionErrorType.IDENTIFY_TERMINATOR,errMsg:t.message}}return!1}else{if((0,xe.isString)(r.PATTERN))return!1;if(Ov(r))return{issue:ir.LexerDefinitionErrorType.CUSTOM_LINE_BREAK};throw Error("non exhaustive match")}}function aj(r,e){if(e.issue===ir.LexerDefinitionErrorType.IDENTIFY_TERMINATOR)return`Warning: unable to identify line terminator usage in pattern.
-`+("	The problem is in the <"+r.name+`> Token Type
-`)+("	 Root cause: "+e.errMsg+`.
-`)+"	For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#IDENTIFY_TERMINATOR";if(e.issue===ir.LexerDefinitionErrorType.CUSTOM_LINE_BREAK)return`Warning: A Custom Token Pattern should specify the <line_breaks> option.
-`+("	The problem is in the <"+r.name+`> Token Type
-`)+"	For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#CUSTOM_LINE_BREAK";throw Error("non exhaustive match")}Ve.buildLineBreakIssueMessage=aj;function Aj(r){var e=(0,xe.map)(r,function(t){return(0,xe.isString)(t)&&t.length>0?t.charCodeAt(0):t});return e}function Fv(r,e,t){r[e]===void 0?r[e]=[t]:r[e].push(t)}Ve.minOptimizationVal=256;var ny=[];function Lv(r){return r<Ve.minOptimizationVal?r:ny[r]}Ve.charCodeToOptimizedIndex=Lv;function HEe(){if((0,xe.isEmpty)(ny)){ny=new Array(65536);for(var r=0;r<65536;r++)ny[r]=r>255?255+~~(r/255):r}}});var _g=w(Nt=>{"use strict";Object.defineProperty(Nt,"__esModule",{value:!0});Nt.isTokenType=Nt.hasExtendingTokensTypesMapProperty=Nt.hasExtendingTokensTypesProperty=Nt.hasCategoriesProperty=Nt.hasShortKeyProperty=Nt.singleAssignCategoriesToksMap=Nt.assignCategoriesMapProp=Nt.assignCategoriesTokensProp=Nt.assignTokenDefaultProps=Nt.expandCategories=Nt.augmentTokenTypes=Nt.tokenIdxToClass=Nt.tokenShortNameIdx=Nt.tokenStructuredMatcherNoCategories=Nt.tokenStructuredMatcher=void 0;var Zr=Gt();function GEe(r,e){var t=r.tokenTypeIdx;return t===e.tokenTypeIdx?!0:e.isParent===!0&&e.categoryMatchesMap[t]===!0}Nt.tokenStructuredMatcher=GEe;function YEe(r,e){return r.tokenTypeIdx===e.tokenTypeIdx}Nt.tokenStructuredMatcherNoCategories=YEe;Nt.tokenShortNameIdx=1;Nt.tokenIdxToClass={};function jEe(r){var e=lj(r);cj(e),gj(e),uj(e),(0,Zr.forEach)(e,function(t){t.isParent=t.categoryMatches.length>0})}Nt.augmentTokenTypes=jEe;function lj(r){for(var e=(0,Zr.cloneArr)(r),t=r,i=!0;i;){t=(0,Zr.compact)((0,Zr.flatten)((0,Zr.map)(t,function(s){return s.CATEGORIES})));var n=(0,Zr.difference)(t,e);e=e.concat(n),(0,Zr.isEmpty)(n)?i=!1:t=n}return e}Nt.expandCategories=lj;function cj(r){(0,Zr.forEach)(r,function(e){fj(e)||(Nt.tokenIdxToClass[Nt.tokenShortNameIdx]=e,e.tokenTypeIdx=Nt.tokenShortNameIdx++),Mv(e)&&!(0,Zr.isArray)(e.CATEGORIES)&&(e.CATEGORIES=[e.CATEGORIES]),Mv(e)||(e.CATEGORIES=[]),hj(e)||(e.categoryMatches=[]),pj(e)||(e.categoryMatchesMap={})})}Nt.assignTokenDefaultProps=cj;function uj(r){(0,Zr.forEach)(r,function(e){e.categoryMatches=[],(0,Zr.forEach)(e.categoryMatchesMap,function(t,i){e.categoryMatches.push(Nt.tokenIdxToClass[i].tokenTypeIdx)})})}Nt.assignCategoriesTokensProp=uj;function gj(r){(0,Zr.forEach)(r,function(e){Kv([],e)})}Nt.assignCategoriesMapProp=gj;function Kv(r,e){(0,Zr.forEach)(r,function(t){e.categoryMatchesMap[t.tokenTypeIdx]=!0}),(0,Zr.forEach)(e.CATEGORIES,function(t){var i=r.concat(e);(0,Zr.contains)(i,t)||Kv(i,t)})}Nt.singleAssignCategoriesToksMap=Kv;function fj(r){return(0,Zr.has)(r,"tokenTypeIdx")}Nt.hasShortKeyProperty=fj;function Mv(r){return(0,Zr.has)(r,"CATEGORIES")}Nt.hasCategoriesProperty=Mv;function hj(r){return(0,Zr.has)(r,"categoryMatches")}Nt.hasExtendingTokensTypesProperty=hj;function pj(r){return(0,Zr.has)(r,"categoryMatchesMap")}Nt.hasExtendingTokensTypesMapProperty=pj;function qEe(r){return(0,Zr.has)(r,"tokenTypeIdx")}Nt.isTokenType=qEe});var Uv=w(sy=>{"use strict";Object.defineProperty(sy,"__esModule",{value:!0});sy.defaultLexerErrorProvider=void 0;sy.defaultLexerErrorProvider={buildUnableToPopLexerModeMessage:function(r){return"Unable to pop Lexer Mode after encountering Token ->"+r.image+"<- The Mode Stack is empty"},buildUnexpectedCharactersMessage:function(r,e,t,i,n){return"unexpected character: ->"+r.charAt(e)+"<- at offset: "+e+","+(" skipped "+t+" characters.")}}});var Bd=w(Cc=>{"use strict";Object.defineProperty(Cc,"__esModule",{value:!0});Cc.Lexer=Cc.LexerDefinitionErrorType=void 0;var _s=Rv(),nr=Gt(),JEe=_g(),WEe=Uv(),zEe=ty(),VEe;(function(r){r[r.MISSING_PATTERN=0]="MISSING_PATTERN",r[r.INVALID_PATTERN=1]="INVALID_PATTERN",r[r.EOI_ANCHOR_FOUND=2]="EOI_ANCHOR_FOUND",r[r.UNSUPPORTED_FLAGS_FOUND=3]="UNSUPPORTED_FLAGS_FOUND",r[r.DUPLICATE_PATTERNS_FOUND=4]="DUPLICATE_PATTERNS_FOUND",r[r.INVALID_GROUP_TYPE_FOUND=5]="INVALID_GROUP_TYPE_FOUND",r[r.PUSH_MODE_DOES_NOT_EXIST=6]="PUSH_MODE_DOES_NOT_EXIST",r[r.MULTI_MODE_LEXER_WITHOUT_DEFAULT_MODE=7]="MULTI_MODE_LEXER_WITHOUT_DEFAULT_MODE",r[r.MULTI_MODE_LEXER_WITHOUT_MODES_PROPERTY=8]="MULTI_MODE_LEXER_WITHOUT_MODES_PROPERTY",r[r.MULTI_MODE_LEXER_DEFAULT_MODE_VALUE_DOES_NOT_EXIST=9]="MULTI_MODE_LEXER_DEFAULT_MODE_VALUE_DOES_NOT_EXIST",r[r.LEXER_DEFINITION_CANNOT_CONTAIN_UNDEFINED=10]="LEXER_DEFINITION_CANNOT_CONTAIN_UNDEFINED",r[r.SOI_ANCHOR_FOUND=11]="SOI_ANCHOR_FOUND",r[r.EMPTY_MATCH_PATTERN=12]="EMPTY_MATCH_PATTERN",r[r.NO_LINE_BREAKS_FLAGS=13]="NO_LINE_BREAKS_FLAGS",r[r.UNREACHABLE_PATTERN=14]="UNREACHABLE_PATTERN",r[r.IDENTIFY_TERMINATOR=15]="IDENTIFY_TERMINATOR",r[r.CUSTOM_LINE_BREAK=16]="CUSTOM_LINE_BREAK"})(VEe=Cc.LexerDefinitionErrorType||(Cc.LexerDefinitionErrorType={}));var bd={deferDefinitionErrorsHandling:!1,positionTracking:"full",lineTerminatorsPattern:/\n|\r\n?/g,lineTerminatorCharacters:[`
-`,"\r"],ensureOptimizations:!1,safeMode:!1,errorMessageProvider:WEe.defaultLexerErrorProvider,traceInitPerf:!1,skipValidations:!1};Object.freeze(bd);var XEe=function(){function r(e,t){var i=this;if(t===void 0&&(t=bd),this.lexerDefinition=e,this.lexerDefinitionErrors=[],this.lexerDefinitionWarning=[],this.patternIdxToConfig={},this.charCodeToPatternIdxToConfig={},this.modes=[],this.emptyGroups={},this.config=void 0,this.trackStartLines=!0,this.trackEndLines=!0,this.hasCustom=!1,this.canModeBeOptimized={},typeof t=="boolean")throw Error(`The second argument to the Lexer constructor is now an ILexerConfig Object.
-a boolean 2nd argument is no longer supported`);this.config=(0,nr.merge)(bd,t);var n=this.config.traceInitPerf;n===!0?(this.traceInitMaxIdent=1/0,this.traceInitPerf=!0):typeof n=="number"&&(this.traceInitMaxIdent=n,this.traceInitPerf=!0),this.traceInitIndent=-1,this.TRACE_INIT("Lexer Constructor",function(){var s,o=!0;i.TRACE_INIT("Lexer Config handling",function(){if(i.config.lineTerminatorsPattern===bd.lineTerminatorsPattern)i.config.lineTerminatorsPattern=_s.LineTerminatorOptimizedTester;else if(i.config.lineTerminatorCharacters===bd.lineTerminatorCharacters)throw Error(`Error: Missing <lineTerminatorCharacters> property on the Lexer config.
-	For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#MISSING_LINE_TERM_CHARS`);if(t.safeMode&&t.ensureOptimizations)throw Error('"safeMode" and "ensureOptimizations" flags are mutually exclusive.');i.trackStartLines=/full|onlyStart/i.test(i.config.positionTracking),i.trackEndLines=/full/i.test(i.config.positionTracking),(0,nr.isArray)(e)?(s={modes:{}},s.modes[_s.DEFAULT_MODE]=(0,nr.cloneArr)(e),s[_s.DEFAULT_MODE]=_s.DEFAULT_MODE):(o=!1,s=(0,nr.cloneObj)(e))}),i.config.skipValidations===!1&&(i.TRACE_INIT("performRuntimeChecks",function(){i.lexerDefinitionErrors=i.lexerDefinitionErrors.concat((0,_s.performRuntimeChecks)(s,i.trackStartLines,i.config.lineTerminatorCharacters))}),i.TRACE_INIT("performWarningRuntimeChecks",function(){i.lexerDefinitionWarning=i.lexerDefinitionWarning.concat((0,_s.performWarningRuntimeChecks)(s,i.trackStartLines,i.config.lineTerminatorCharacters))})),s.modes=s.modes?s.modes:{},(0,nr.forEach)(s.modes,function(u,g){s.modes[g]=(0,nr.reject)(u,function(f){return(0,nr.isUndefined)(f)})});var a=(0,nr.keys)(s.modes);if((0,nr.forEach)(s.modes,function(u,g){i.TRACE_INIT("Mode: <"+g+"> processing",function(){if(i.modes.push(g),i.config.skipValidations===!1&&i.TRACE_INIT("validatePatterns",function(){i.lexerDefinitionErrors=i.lexerDefinitionErrors.concat((0,_s.validatePatterns)(u,a))}),(0,nr.isEmpty)(i.lexerDefinitionErrors)){(0,JEe.augmentTokenTypes)(u);var f;i.TRACE_INIT("analyzeTokenTypes",function(){f=(0,_s.analyzeTokenTypes)(u,{lineTerminatorCharacters:i.config.lineTerminatorCharacters,positionTracking:t.positionTracking,ensureOptimizations:t.ensureOptimizations,safeMode:t.safeMode,tracer:i.TRACE_INIT.bind(i)})}),i.patternIdxToConfig[g]=f.patternIdxToConfig,i.charCodeToPatternIdxToConfig[g]=f.charCodeToPatternIdxToConfig,i.emptyGroups=(0,nr.merge)(i.emptyGroups,f.emptyGroups),i.hasCustom=f.hasCustom||i.hasCustom,i.canModeBeOptimized[g]=f.canBeOptimized}})}),i.defaultMode=s.defaultMode,!(0,nr.isEmpty)(i.lexerDefinitionErrors)&&!i.config.deferDefinitionErrorsHandling){var l=(0,nr.map)(i.lexerDefinitionErrors,function(u){return u.message}),c=l.join(`-----------------------
-`);throw new Error(`Errors detected in definition of Lexer:
-`+c)}(0,nr.forEach)(i.lexerDefinitionWarning,function(u){(0,nr.PRINT_WARNING)(u.message)}),i.TRACE_INIT("Choosing sub-methods implementations",function(){if(_s.SUPPORT_STICKY?(i.chopInput=nr.IDENTITY,i.match=i.matchWithTest):(i.updateLastIndex=nr.NOOP,i.match=i.matchWithExec),o&&(i.handleModes=nr.NOOP),i.trackStartLines===!1&&(i.computeNewColumn=nr.IDENTITY),i.trackEndLines===!1&&(i.updateTokenEndLineColumnLocation=nr.NOOP),/full/i.test(i.config.positionTracking))i.createTokenInstance=i.createFullToken;else if(/onlyStart/i.test(i.config.positionTracking))i.createTokenInstance=i.createStartOnlyToken;else if(/onlyOffset/i.test(i.config.positionTracking))i.createTokenInstance=i.createOffsetOnlyToken;else throw Error('Invalid <positionTracking> config option: "'+i.config.positionTracking+'"');i.hasCustom?(i.addToken=i.addTokenUsingPush,i.handlePayload=i.handlePayloadWithCustom):(i.addToken=i.addTokenUsingMemberAccess,i.handlePayload=i.handlePayloadNoCustom)}),i.TRACE_INIT("Failed Optimization Warnings",function(){var u=(0,nr.reduce)(i.canModeBeOptimized,function(g,f,h){return f===!1&&g.push(h),g},[]);if(t.ensureOptimizations&&!(0,nr.isEmpty)(u))throw Error("Lexer Modes: < "+u.join(", ")+` > cannot be optimized.
-	 Disable the "ensureOptimizations" lexer config flag to silently ignore this and run the lexer in an un-optimized mode.
-	 Or inspect the console log for details on how to resolve these issues.`)}),i.TRACE_INIT("clearRegExpParserCache",function(){(0,zEe.clearRegExpParserCache)()}),i.TRACE_INIT("toFastProperties",function(){(0,nr.toFastProperties)(i)})})}return r.prototype.tokenize=function(e,t){if(t===void 0&&(t=this.defaultMode),!(0,nr.isEmpty)(this.lexerDefinitionErrors)){var i=(0,nr.map)(this.lexerDefinitionErrors,function(o){return o.message}),n=i.join(`-----------------------
-`);throw new Error(`Unable to Tokenize because Errors detected in definition of Lexer:
-`+n)}var s=this.tokenizeInternal(e,t);return s},r.prototype.tokenizeInternal=function(e,t){var i=this,n,s,o,a,l,c,u,g,f,h,p,C,y,B,v,D,T=e,H=T.length,j=0,$=0,V=this.hasCustom?0:Math.floor(e.length/10),W=new Array(V),_=[],A=this.trackStartLines?1:void 0,Ae=this.trackStartLines?1:void 0,ge=(0,_s.cloneEmptyGroups)(this.emptyGroups),re=this.trackStartLines,O=this.config.lineTerminatorsPattern,F=0,ue=[],pe=[],ke=[],Fe=[];Object.freeze(Fe);var Ne=void 0;function oe(){return ue}function le(pr){var Ii=(0,_s.charCodeToOptimizedIndex)(pr),rs=pe[Ii];return rs===void 0?Fe:rs}var Be=function(pr){if(ke.length===1&&pr.tokenType.PUSH_MODE===void 0){var Ii=i.config.errorMessageProvider.buildUnableToPopLexerModeMessage(pr);_.push({offset:pr.startOffset,line:pr.startLine!==void 0?pr.startLine:void 0,column:pr.startColumn!==void 0?pr.startColumn:void 0,length:pr.image.length,message:Ii})}else{ke.pop();var rs=(0,nr.last)(ke);ue=i.patternIdxToConfig[rs],pe=i.charCodeToPatternIdxToConfig[rs],F=ue.length;var fa=i.canModeBeOptimized[rs]&&i.config.safeMode===!1;pe&&fa?Ne=le:Ne=oe}};function fe(pr){ke.push(pr),pe=this.charCodeToPatternIdxToConfig[pr],ue=this.patternIdxToConfig[pr],F=ue.length,F=ue.length;var Ii=this.canModeBeOptimized[pr]&&this.config.safeMode===!1;pe&&Ii?Ne=le:Ne=oe}fe.call(this,t);for(var ae;j<H;){c=null;var qe=T.charCodeAt(j),ne=Ne(qe),Y=ne.length;for(n=0;n<Y;n++){ae=ne[n];var he=ae.pattern;u=null;var ie=ae.short;if(ie!==!1?qe===ie&&(c=he):ae.isCustom===!0?(D=he.exec(T,j,W,ge),D!==null?(c=D[0],D.payload!==void 0&&(u=D.payload)):c=null):(this.updateLastIndex(he,j),c=this.match(he,e,j)),c!==null){if(l=ae.longerAlt,l!==void 0){var de=l.length;for(o=0;o<de;o++){var _e=ue[l[o]],Pt=_e.pattern;if(g=null,_e.isCustom===!0?(D=Pt.exec(T,j,W,ge),D!==null?(a=D[0],D.payload!==void 0&&(g=D.payload)):a=null):(this.updateLastIndex(Pt,j),a=this.match(Pt,e,j)),a&&a.length>c.length){c=a,u=g,ae=_e;break}}}break}}if(c!==null){if(f=c.length,h=ae.group,h!==void 0&&(p=ae.tokenTypeIdx,C=this.createTokenInstance(c,j,p,ae.tokenType,A,Ae,f),this.handlePayload(C,u),h===!1?$=this.addToken(W,$,C):ge[h].push(C)),e=this.chopInput(e,f),j=j+f,Ae=this.computeNewColumn(Ae,f),re===!0&&ae.canLineTerminator===!0){var It=0,Or=void 0,ii=void 0;O.lastIndex=0;do Or=O.test(c),Or===!0&&(ii=O.lastIndex-1,It++);while(Or===!0);It!==0&&(A=A+It,Ae=f-ii,this.updateTokenEndLineColumnLocation(C,h,ii,It,A,Ae,f))}this.handleModes(ae,Be,fe,C)}else{for(var gi=j,hr=A,fi=Ae,ni=!1;!ni&&j<H;)for(B=T.charCodeAt(j),e=this.chopInput(e,1),j++,s=0;s<F;s++){var Ks=ue[s],he=Ks.pattern,ie=Ks.short;if(ie!==!1?T.charCodeAt(j)===ie&&(ni=!0):Ks.isCustom===!0?ni=he.exec(T,j,W,ge)!==null:(this.updateLastIndex(he,j),ni=he.exec(e)!==null),ni===!0)break}y=j-gi,v=this.config.errorMessageProvider.buildUnexpectedCharactersMessage(T,gi,y,hr,fi),_.push({offset:gi,line:hr,column:fi,length:y,message:v})}}return this.hasCustom||(W.length=$),{tokens:W,groups:ge,errors:_}},r.prototype.handleModes=function(e,t,i,n){if(e.pop===!0){var s=e.push;t(n),s!==void 0&&i.call(this,s)}else e.push!==void 0&&i.call(this,e.push)},r.prototype.chopInput=function(e,t){return e.substring(t)},r.prototype.updateLastIndex=function(e,t){e.lastIndex=t},r.prototype.updateTokenEndLineColumnLocation=function(e,t,i,n,s,o,a){var l,c;t!==void 0&&(l=i===a-1,c=l?-1:0,n===1&&l===!0||(e.endLine=s+c,e.endColumn=o-1+-c))},r.prototype.computeNewColumn=function(e,t){return e+t},r.prototype.createTokenInstance=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return null},r.prototype.createOffsetOnlyToken=function(e,t,i,n){return{image:e,startOffset:t,tokenTypeIdx:i,tokenType:n}},r.prototype.createStartOnlyToken=function(e,t,i,n,s,o){return{image:e,startOffset:t,startLine:s,startColumn:o,tokenTypeIdx:i,tokenType:n}},r.prototype.createFullToken=function(e,t,i,n,s,o,a){return{image:e,startOffset:t,endOffset:t+a-1,startLine:s,endLine:s,startColumn:o,endColumn:o+a-1,tokenTypeIdx:i,tokenType:n}},r.prototype.addToken=function(e,t,i){return 666},r.prototype.addTokenUsingPush=function(e,t,i){return e.push(i),t},r.prototype.addTokenUsingMemberAccess=function(e,t,i){return e[t]=i,t++,t},r.prototype.handlePayload=function(e,t){},r.prototype.handlePayloadNoCustom=function(e,t){},r.prototype.handlePayloadWithCustom=function(e,t){t!==null&&(e.payload=t)},r.prototype.match=function(e,t,i){return null},r.prototype.matchWithTest=function(e,t,i){var n=e.test(t);return n===!0?t.substring(i,e.lastIndex):null},r.prototype.matchWithExec=function(e,t){var i=e.exec(t);return i!==null?i[0]:i},r.prototype.TRACE_INIT=function(e,t){if(this.traceInitPerf===!0){this.traceInitIndent++;var i=new Array(this.traceInitIndent+1).join("	");this.traceInitIndent<this.traceInitMaxIdent&&console.log(i+"--> <"+e+">");var n=(0,nr.timer)(t),s=n.time,o=n.value,a=s>10?console.warn:console.log;return this.traceInitIndent<this.traceInitMaxIdent&&a(i+"<-- <"+e+"> time: "+s+"ms"),this.traceInitIndent--,o}else return t()},r.SKIPPED="This marks a skipped Token pattern, this means each token identified by it willbe consumed and then thrown into oblivion, this can be used to for example to completely ignore whitespace.",r.NA=/NOT_APPLICABLE/,r}();Cc.Lexer=XEe});var TA=w(Qi=>{"use strict";Object.defineProperty(Qi,"__esModule",{value:!0});Qi.tokenMatcher=Qi.createTokenInstance=Qi.EOF=Qi.createToken=Qi.hasTokenLabel=Qi.tokenName=Qi.tokenLabel=void 0;var $s=Gt(),ZEe=Bd(),Hv=_g();function _Ee(r){return bj(r)?r.LABEL:r.name}Qi.tokenLabel=_Ee;function $Ee(r){return r.name}Qi.tokenName=$Ee;function bj(r){return(0,$s.isString)(r.LABEL)&&r.LABEL!==""}Qi.hasTokenLabel=bj;var eIe="parent",dj="categories",Cj="label",mj="group",Ej="push_mode",Ij="pop_mode",yj="longer_alt",wj="line_breaks",Bj="start_chars_hint";function Qj(r){return tIe(r)}Qi.createToken=Qj;function tIe(r){var e=r.pattern,t={};if(t.name=r.name,(0,$s.isUndefined)(e)||(t.PATTERN=e),(0,$s.has)(r,eIe))throw`The parent property is no longer supported.
-See: https://github.com/chevrotain/chevrotain/issues/564#issuecomment-349062346 for details.`;return(0,$s.has)(r,dj)&&(t.CATEGORIES=r[dj]),(0,Hv.augmentTokenTypes)([t]),(0,$s.has)(r,Cj)&&(t.LABEL=r[Cj]),(0,$s.has)(r,mj)&&(t.GROUP=r[mj]),(0,$s.has)(r,Ij)&&(t.POP_MODE=r[Ij]),(0,$s.has)(r,Ej)&&(t.PUSH_MODE=r[Ej]),(0,$s.has)(r,yj)&&(t.LONGER_ALT=r[yj]),(0,$s.has)(r,wj)&&(t.LINE_BREAKS=r[wj]),(0,$s.has)(r,Bj)&&(t.START_CHARS_HINT=r[Bj]),t}Qi.EOF=Qj({name:"EOF",pattern:ZEe.Lexer.NA});(0,Hv.augmentTokenTypes)([Qi.EOF]);function rIe(r,e,t,i,n,s,o,a){return{image:e,startOffset:t,endOffset:i,startLine:n,endLine:s,startColumn:o,endColumn:a,tokenTypeIdx:r.tokenTypeIdx,tokenType:r}}Qi.createTokenInstance=rIe;function iIe(r,e){return(0,Hv.tokenStructuredMatcher)(r,e)}Qi.tokenMatcher=iIe});var mn=w(zt=>{"use strict";var Pa=zt&&zt.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(zt,"__esModule",{value:!0});zt.serializeProduction=zt.serializeGrammar=zt.Terminal=zt.Alternation=zt.RepetitionWithSeparator=zt.Repetition=zt.RepetitionMandatoryWithSeparator=zt.RepetitionMandatory=zt.Option=zt.Alternative=zt.Rule=zt.NonTerminal=zt.AbstractProduction=void 0;var Ar=Gt(),nIe=TA(),Ro=function(){function r(e){this._definition=e}return Object.defineProperty(r.prototype,"definition",{get:function(){return this._definition},set:function(e){this._definition=e},enumerable:!1,configurable:!0}),r.prototype.accept=function(e){e.visit(this),(0,Ar.forEach)(this.definition,function(t){t.accept(e)})},r}();zt.AbstractProduction=Ro;var Sj=function(r){Pa(e,r);function e(t){var i=r.call(this,[])||this;return i.idx=1,(0,Ar.assign)(i,(0,Ar.pick)(t,function(n){return n!==void 0})),i}return Object.defineProperty(e.prototype,"definition",{get:function(){return this.referencedRule!==void 0?this.referencedRule.definition:[]},set:function(t){},enumerable:!1,configurable:!0}),e.prototype.accept=function(t){t.visit(this)},e}(Ro);zt.NonTerminal=Sj;var vj=function(r){Pa(e,r);function e(t){var i=r.call(this,t.definition)||this;return i.orgText="",(0,Ar.assign)(i,(0,Ar.pick)(t,function(n){return n!==void 0})),i}return e}(Ro);zt.Rule=vj;var xj=function(r){Pa(e,r);function e(t){var i=r.call(this,t.definition)||this;return i.ignoreAmbiguities=!1,(0,Ar.assign)(i,(0,Ar.pick)(t,function(n){return n!==void 0})),i}return e}(Ro);zt.Alternative=xj;var Pj=function(r){Pa(e,r);function e(t){var i=r.call(this,t.definition)||this;return i.idx=1,(0,Ar.assign)(i,(0,Ar.pick)(t,function(n){return n!==void 0})),i}return e}(Ro);zt.Option=Pj;var Dj=function(r){Pa(e,r);function e(t){var i=r.call(this,t.definition)||this;return i.idx=1,(0,Ar.assign)(i,(0,Ar.pick)(t,function(n){return n!==void 0})),i}return e}(Ro);zt.RepetitionMandatory=Dj;var kj=function(r){Pa(e,r);function e(t){var i=r.call(this,t.definition)||this;return i.idx=1,(0,Ar.assign)(i,(0,Ar.pick)(t,function(n){return n!==void 0})),i}return e}(Ro);zt.RepetitionMandatoryWithSeparator=kj;var Rj=function(r){Pa(e,r);function e(t){var i=r.call(this,t.definition)||this;return i.idx=1,(0,Ar.assign)(i,(0,Ar.pick)(t,function(n){return n!==void 0})),i}return e}(Ro);zt.Repetition=Rj;var Fj=function(r){Pa(e,r);function e(t){var i=r.call(this,t.definition)||this;return i.idx=1,(0,Ar.assign)(i,(0,Ar.pick)(t,function(n){return n!==void 0})),i}return e}(Ro);zt.RepetitionWithSeparator=Fj;var Nj=function(r){Pa(e,r);function e(t){var i=r.call(this,t.definition)||this;return i.idx=1,i.ignoreAmbiguities=!1,i.hasPredicates=!1,(0,Ar.assign)(i,(0,Ar.pick)(t,function(n){return n!==void 0})),i}return Object.defineProperty(e.prototype,"definition",{get:function(){return this._definition},set:function(t){this._definition=t},enumerable:!1,configurable:!0}),e}(Ro);zt.Alternation=Nj;var oy=function(){function r(e){this.idx=1,(0,Ar.assign)(this,(0,Ar.pick)(e,function(t){return t!==void 0}))}return r.prototype.accept=function(e){e.visit(this)},r}();zt.Terminal=oy;function sIe(r){return(0,Ar.map)(r,Qd)}zt.serializeGrammar=sIe;function Qd(r){function e(s){return(0,Ar.map)(s,Qd)}if(r instanceof Sj){var t={type:"NonTerminal",name:r.nonTerminalName,idx:r.idx};return(0,Ar.isString)(r.label)&&(t.label=r.label),t}else{if(r instanceof xj)return{type:"Alternative",definition:e(r.definition)};if(r instanceof Pj)return{type:"Option",idx:r.idx,definition:e(r.definition)};if(r instanceof Dj)return{type:"RepetitionMandatory",idx:r.idx,definition:e(r.definition)};if(r instanceof kj)return{type:"RepetitionMandatoryWithSeparator",idx:r.idx,separator:Qd(new oy({terminalType:r.separator})),definition:e(r.definition)};if(r instanceof Fj)return{type:"RepetitionWithSeparator",idx:r.idx,separator:Qd(new oy({terminalType:r.separator})),definition:e(r.definition)};if(r instanceof Rj)return{type:"Repetition",idx:r.idx,definition:e(r.definition)};if(r instanceof Nj)return{type:"Alternation",idx:r.idx,definition:e(r.definition)};if(r instanceof oy){var i={type:"Terminal",name:r.terminalType.name,label:(0,nIe.tokenLabel)(r.terminalType),idx:r.idx};(0,Ar.isString)(r.label)&&(i.terminalLabel=r.label);var n=r.terminalType.PATTERN;return r.terminalType.PATTERN&&(i.pattern=(0,Ar.isRegExp)(n)?n.source:n),i}else{if(r instanceof vj)return{type:"Rule",name:r.name,orgText:r.orgText,definition:e(r.definition)};throw Error("non exhaustive match")}}}zt.serializeProduction=Qd});var Ay=w(ay=>{"use strict";Object.defineProperty(ay,"__esModule",{value:!0});ay.RestWalker=void 0;var Gv=Gt(),En=mn(),oIe=function(){function r(){}return r.prototype.walk=function(e,t){var i=this;t===void 0&&(t=[]),(0,Gv.forEach)(e.definition,function(n,s){var o=(0,Gv.drop)(e.definition,s+1);if(n instanceof En.NonTerminal)i.walkProdRef(n,o,t);else if(n instanceof En.Terminal)i.walkTerminal(n,o,t);else if(n instanceof En.Alternative)i.walkFlat(n,o,t);else if(n instanceof En.Option)i.walkOption(n,o,t);else if(n instanceof En.RepetitionMandatory)i.walkAtLeastOne(n,o,t);else if(n instanceof En.RepetitionMandatoryWithSeparator)i.walkAtLeastOneSep(n,o,t);else if(n instanceof En.RepetitionWithSeparator)i.walkManySep(n,o,t);else if(n instanceof En.Repetition)i.walkMany(n,o,t);else if(n instanceof En.Alternation)i.walkOr(n,o,t);else throw Error("non exhaustive match")})},r.prototype.walkTerminal=function(e,t,i){},r.prototype.walkProdRef=function(e,t,i){},r.prototype.walkFlat=function(e,t,i){var n=t.concat(i);this.walk(e,n)},r.prototype.walkOption=function(e,t,i){var n=t.concat(i);this.walk(e,n)},r.prototype.walkAtLeastOne=function(e,t,i){var n=[new En.Option({definition:e.definition})].concat(t,i);this.walk(e,n)},r.prototype.walkAtLeastOneSep=function(e,t,i){var n=Tj(e,t,i);this.walk(e,n)},r.prototype.walkMany=function(e,t,i){var n=[new En.Option({definition:e.definition})].concat(t,i);this.walk(e,n)},r.prototype.walkManySep=function(e,t,i){var n=Tj(e,t,i);this.walk(e,n)},r.prototype.walkOr=function(e,t,i){var n=this,s=t.concat(i);(0,Gv.forEach)(e.definition,function(o){var a=new En.Alternative({definition:[o]});n.walk(a,s)})},r}();ay.RestWalker=oIe;function Tj(r,e,t){var i=[new En.Option({definition:[new En.Terminal({terminalType:r.separator})].concat(r.definition)})],n=i.concat(e,t);return n}});var $g=w(ly=>{"use strict";Object.defineProperty(ly,"__esModule",{value:!0});ly.GAstVisitor=void 0;var Fo=mn(),aIe=function(){function r(){}return r.prototype.visit=function(e){var t=e;switch(t.constructor){case Fo.NonTerminal:return this.visitNonTerminal(t);case Fo.Alternative:return this.visitAlternative(t);case Fo.Option:return this.visitOption(t);case Fo.RepetitionMandatory:return this.visitRepetitionMandatory(t);case Fo.RepetitionMandatoryWithSeparator:return this.visitRepetitionMandatoryWithSeparator(t);case Fo.RepetitionWithSeparator:return this.visitRepetitionWithSeparator(t);case Fo.Repetition:return this.visitRepetition(t);case Fo.Alternation:return this.visitAlternation(t);case Fo.Terminal:return this.visitTerminal(t);case Fo.Rule:return this.visitRule(t);default:throw Error("non exhaustive match")}},r.prototype.visitNonTerminal=function(e){},r.prototype.visitAlternative=function(e){},r.prototype.visitOption=function(e){},r.prototype.visitRepetition=function(e){},r.prototype.visitRepetitionMandatory=function(e){},r.prototype.visitRepetitionMandatoryWithSeparator=function(e){},r.prototype.visitRepetitionWithSeparator=function(e){},r.prototype.visitAlternation=function(e){},r.prototype.visitTerminal=function(e){},r.prototype.visitRule=function(e){},r}();ly.GAstVisitor=aIe});var vd=w(Mi=>{"use strict";var AIe=Mi&&Mi.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(Mi,"__esModule",{value:!0});Mi.collectMethods=Mi.DslMethodsCollectorVisitor=Mi.getProductionDslName=Mi.isBranchingProd=Mi.isOptionalProd=Mi.isSequenceProd=void 0;var Sd=Gt(),br=mn(),lIe=$g();function cIe(r){return r instanceof br.Alternative||r instanceof br.Option||r instanceof br.Repetition||r instanceof br.RepetitionMandatory||r instanceof br.RepetitionMandatoryWithSeparator||r instanceof br.RepetitionWithSeparator||r instanceof br.Terminal||r instanceof br.Rule}Mi.isSequenceProd=cIe;function Yv(r,e){e===void 0&&(e=[]);var t=r instanceof br.Option||r instanceof br.Repetition||r instanceof br.RepetitionWithSeparator;return t?!0:r instanceof br.Alternation?(0,Sd.some)(r.definition,function(i){return Yv(i,e)}):r instanceof br.NonTerminal&&(0,Sd.contains)(e,r)?!1:r instanceof br.AbstractProduction?(r instanceof br.NonTerminal&&e.push(r),(0,Sd.every)(r.definition,function(i){return Yv(i,e)})):!1}Mi.isOptionalProd=Yv;function uIe(r){return r instanceof br.Alternation}Mi.isBranchingProd=uIe;function gIe(r){if(r instanceof br.NonTerminal)return"SUBRULE";if(r instanceof br.Option)return"OPTION";if(r instanceof br.Alternation)return"OR";if(r instanceof br.RepetitionMandatory)return"AT_LEAST_ONE";if(r instanceof br.RepetitionMandatoryWithSeparator)return"AT_LEAST_ONE_SEP";if(r instanceof br.RepetitionWithSeparator)return"MANY_SEP";if(r instanceof br.Repetition)return"MANY";if(r instanceof br.Terminal)return"CONSUME";throw Error("non exhaustive match")}Mi.getProductionDslName=gIe;var Lj=function(r){AIe(e,r);function e(){var t=r!==null&&r.apply(this,arguments)||this;return t.separator="-",t.dslMethods={option:[],alternation:[],repetition:[],repetitionWithSeparator:[],repetitionMandatory:[],repetitionMandatoryWithSeparator:[]},t}return e.prototype.reset=function(){this.dslMethods={option:[],alternation:[],repetition:[],repetitionWithSeparator:[],repetitionMandatory:[],repetitionMandatoryWithSeparator:[]}},e.prototype.visitTerminal=function(t){var i=t.terminalType.name+this.separator+"Terminal";(0,Sd.has)(this.dslMethods,i)||(this.dslMethods[i]=[]),this.dslMethods[i].push(t)},e.prototype.visitNonTerminal=function(t){var i=t.nonTerminalName+this.separator+"Terminal";(0,Sd.has)(this.dslMethods,i)||(this.dslMethods[i]=[]),this.dslMethods[i].push(t)},e.prototype.visitOption=function(t){this.dslMethods.option.push(t)},e.prototype.visitRepetitionWithSeparator=function(t){this.dslMethods.repetitionWithSeparator.push(t)},e.prototype.visitRepetitionMandatory=function(t){this.dslMethods.repetitionMandatory.push(t)},e.prototype.visitRepetitionMandatoryWithSeparator=function(t){this.dslMethods.repetitionMandatoryWithSeparator.push(t)},e.prototype.visitRepetition=function(t){this.dslMethods.repetition.push(t)},e.prototype.visitAlternation=function(t){this.dslMethods.alternation.push(t)},e}(lIe.GAstVisitor);Mi.DslMethodsCollectorVisitor=Lj;var cy=new Lj;function fIe(r){cy.reset(),r.accept(cy);var e=cy.dslMethods;return cy.reset(),e}Mi.collectMethods=fIe});var qv=w(No=>{"use strict";Object.defineProperty(No,"__esModule",{value:!0});No.firstForTerminal=No.firstForBranching=No.firstForSequence=No.first=void 0;var uy=Gt(),Oj=mn(),jv=vd();function gy(r){if(r instanceof Oj.NonTerminal)return gy(r.referencedRule);if(r instanceof Oj.Terminal)return Uj(r);if((0,jv.isSequenceProd)(r))return Mj(r);if((0,jv.isBranchingProd)(r))return Kj(r);throw Error("non exhaustive match")}No.first=gy;function Mj(r){for(var e=[],t=r.definition,i=0,n=t.length>i,s,o=!0;n&&o;)s=t[i],o=(0,jv.isOptionalProd)(s),e=e.concat(gy(s)),i=i+1,n=t.length>i;return(0,uy.uniq)(e)}No.firstForSequence=Mj;function Kj(r){var e=(0,uy.map)(r.definition,function(t){return gy(t)});return(0,uy.uniq)((0,uy.flatten)(e))}No.firstForBranching=Kj;function Uj(r){return[r.terminalType]}No.firstForTerminal=Uj});var Jv=w(fy=>{"use strict";Object.defineProperty(fy,"__esModule",{value:!0});fy.IN=void 0;fy.IN="_~IN~_"});var qj=w(fs=>{"use strict";var hIe=fs&&fs.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(fs,"__esModule",{value:!0});fs.buildInProdFollowPrefix=fs.buildBetweenProdsFollowPrefix=fs.computeAllProdsFollows=fs.ResyncFollowsWalker=void 0;var pIe=Ay(),dIe=qv(),Hj=Gt(),Gj=Jv(),CIe=mn(),Yj=function(r){hIe(e,r);function e(t){var i=r.call(this)||this;return i.topProd=t,i.follows={},i}return e.prototype.startWalking=function(){return this.walk(this.topProd),this.follows},e.prototype.walkTerminal=function(t,i,n){},e.prototype.walkProdRef=function(t,i,n){var s=jj(t.referencedRule,t.idx)+this.topProd.name,o=i.concat(n),a=new CIe.Alternative({definition:o}),l=(0,dIe.first)(a);this.follows[s]=l},e}(pIe.RestWalker);fs.ResyncFollowsWalker=Yj;function mIe(r){var e={};return(0,Hj.forEach)(r,function(t){var i=new Yj(t).startWalking();(0,Hj.assign)(e,i)}),e}fs.computeAllProdsFollows=mIe;function jj(r,e){return r.name+e+Gj.IN}fs.buildBetweenProdsFollowPrefix=jj;function EIe(r){var e=r.terminalType.name;return e+r.idx+Gj.IN}fs.buildInProdFollowPrefix=EIe});var xd=w(Da=>{"use strict";Object.defineProperty(Da,"__esModule",{value:!0});Da.defaultGrammarValidatorErrorProvider=Da.defaultGrammarResolverErrorProvider=Da.defaultParserErrorProvider=void 0;var ef=TA(),IIe=Gt(),eo=Gt(),Wv=mn(),Jj=vd();Da.defaultParserErrorProvider={buildMismatchTokenMessage:function(r){var e=r.expected,t=r.actual,i=r.previous,n=r.ruleName,s=(0,ef.hasTokenLabel)(e),o=s?"--> "+(0,ef.tokenLabel)(e)+" <--":"token of type --> "+e.name+" <--",a="Expecting "+o+" but found --> '"+t.image+"' <--";return a},buildNotAllInputParsedMessage:function(r){var e=r.firstRedundant,t=r.ruleName;return"Redundant input, expecting EOF but found: "+e.image},buildNoViableAltMessage:function(r){var e=r.expectedPathsPerAlt,t=r.actual,i=r.previous,n=r.customUserDescription,s=r.ruleName,o="Expecting: ",a=(0,eo.first)(t).image,l=`
-but found: '`+a+"'";if(n)return o+n+l;var c=(0,eo.reduce)(e,function(h,p){return h.concat(p)},[]),u=(0,eo.map)(c,function(h){return"["+(0,eo.map)(h,function(p){return(0,ef.tokenLabel)(p)}).join(", ")+"]"}),g=(0,eo.map)(u,function(h,p){return"  "+(p+1)+". "+h}),f=`one of these possible Token sequences:
-`+g.join(`
-`);return o+f+l},buildEarlyExitMessage:function(r){var e=r.expectedIterationPaths,t=r.actual,i=r.customUserDescription,n=r.ruleName,s="Expecting: ",o=(0,eo.first)(t).image,a=`
-but found: '`+o+"'";if(i)return s+i+a;var l=(0,eo.map)(e,function(u){return"["+(0,eo.map)(u,function(g){return(0,ef.tokenLabel)(g)}).join(",")+"]"}),c=`expecting at least one iteration which starts with one of these possible Token sequences::
-  `+("<"+l.join(" ,")+">");return s+c+a}};Object.freeze(Da.defaultParserErrorProvider);Da.defaultGrammarResolverErrorProvider={buildRuleNotFoundError:function(r,e){var t="Invalid grammar, reference to a rule which is not defined: ->"+e.nonTerminalName+`<-
-inside top level rule: ->`+r.name+"<-";return t}};Da.defaultGrammarValidatorErrorProvider={buildDuplicateFoundError:function(r,e){function t(u){return u instanceof Wv.Terminal?u.terminalType.name:u instanceof Wv.NonTerminal?u.nonTerminalName:""}var i=r.name,n=(0,eo.first)(e),s=n.idx,o=(0,Jj.getProductionDslName)(n),a=t(n),l=s>0,c="->"+o+(l?s:"")+"<- "+(a?"with argument: ->"+a+"<-":"")+`
-                  appears more than once (`+e.length+" times) in the top level rule: ->"+i+`<-.                  
-                  For further details see: https://chevrotain.io/docs/FAQ.html#NUMERICAL_SUFFIXES 
-                  `;return c=c.replace(/[ \t]+/g," "),c=c.replace(/\s\s+/g,`
-`),c},buildNamespaceConflictError:function(r){var e=`Namespace conflict found in grammar.
-`+("The grammar has both a Terminal(Token) and a Non-Terminal(Rule) named: <"+r.name+`>.
-`)+`To resolve this make sure each Terminal and Non-Terminal names are unique
-This is easy to accomplish by using the convention that Terminal names start with an uppercase letter
-and Non-Terminal names start with a lower case letter.`;return e},buildAlternationPrefixAmbiguityError:function(r){var e=(0,eo.map)(r.prefixPath,function(n){return(0,ef.tokenLabel)(n)}).join(", "),t=r.alternation.idx===0?"":r.alternation.idx,i="Ambiguous alternatives: <"+r.ambiguityIndices.join(" ,")+`> due to common lookahead prefix
-`+("in <OR"+t+"> inside <"+r.topLevelRule.name+`> Rule,
-`)+("<"+e+`> may appears as a prefix path in all these alternatives.
-`)+`See: https://chevrotain.io/docs/guide/resolving_grammar_errors.html#COMMON_PREFIX
-For Further details.`;return i},buildAlternationAmbiguityError:function(r){var e=(0,eo.map)(r.prefixPath,function(n){return(0,ef.tokenLabel)(n)}).join(", "),t=r.alternation.idx===0?"":r.alternation.idx,i="Ambiguous Alternatives Detected: <"+r.ambiguityIndices.join(" ,")+"> in <OR"+t+">"+(" inside <"+r.topLevelRule.name+`> Rule,
-`)+("<"+e+`> may appears as a prefix path in all these alternatives.
-`);return i=i+`See: https://chevrotain.io/docs/guide/resolving_grammar_errors.html#AMBIGUOUS_ALTERNATIVES
-For Further details.`,i},buildEmptyRepetitionError:function(r){var e=(0,Jj.getProductionDslName)(r.repetition);r.repetition.idx!==0&&(e+=r.repetition.idx);var t="The repetition <"+e+"> within Rule <"+r.topLevelRule.name+`> can never consume any tokens.
-This could lead to an infinite loop.`;return t},buildTokenNameError:function(r){return"deprecated"},buildEmptyAlternationError:function(r){var e="Ambiguous empty alternative: <"+(r.emptyChoiceIdx+1)+">"+(" in <OR"+r.alternation.idx+"> inside <"+r.topLevelRule.name+`> Rule.
-`)+"Only the last alternative may be an empty alternative.";return e},buildTooManyAlternativesError:function(r){var e=`An Alternation cannot have more than 256 alternatives:
-`+("<OR"+r.alternation.idx+"> inside <"+r.topLevelRule.name+`> Rule.
- has `+(r.alternation.definition.length+1)+" alternatives.");return e},buildLeftRecursionError:function(r){var e=r.topLevelRule.name,t=IIe.map(r.leftRecursionPath,function(s){return s.name}),i=e+" --> "+t.concat([e]).join(" --> "),n=`Left Recursion found in grammar.
-`+("rule: <"+e+`> can be invoked from itself (directly or indirectly)
-`)+(`without consuming any Tokens. The grammar path that causes this is: 
- `+i+`
-`)+` To fix this refactor your grammar to remove the left recursion.
-see: https://en.wikipedia.org/wiki/LL_parser#Left_Factoring.`;return n},buildInvalidRuleNameError:function(r){return"deprecated"},buildDuplicateRuleNameError:function(r){var e;r.topLevelRule instanceof Wv.Rule?e=r.topLevelRule.name:e=r.topLevelRule;var t="Duplicate definition, rule: ->"+e+"<- is already defined in the grammar: ->"+r.grammarName+"<-";return t}}});var Vj=w(LA=>{"use strict";var yIe=LA&&LA.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(LA,"__esModule",{value:!0});LA.GastRefResolverVisitor=LA.resolveGrammar=void 0;var wIe=jn(),Wj=Gt(),BIe=$g();function bIe(r,e){var t=new zj(r,e);return t.resolveRefs(),t.errors}LA.resolveGrammar=bIe;var zj=function(r){yIe(e,r);function e(t,i){var n=r.call(this)||this;return n.nameToTopRule=t,n.errMsgProvider=i,n.errors=[],n}return e.prototype.resolveRefs=function(){var t=this;(0,Wj.forEach)((0,Wj.values)(this.nameToTopRule),function(i){t.currTopLevel=i,i.accept(t)})},e.prototype.visitNonTerminal=function(t){var i=this.nameToTopRule[t.nonTerminalName];if(i)t.referencedRule=i;else{var n=this.errMsgProvider.buildRuleNotFoundError(this.currTopLevel,t);this.errors.push({message:n,type:wIe.ParserDefinitionErrorType.UNRESOLVED_SUBRULE_REF,ruleName:this.currTopLevel.name,unresolvedRefName:t.nonTerminalName})}},e}(BIe.GAstVisitor);LA.GastRefResolverVisitor=zj});var Dd=w(Nr=>{"use strict";var mc=Nr&&Nr.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(Nr,"__esModule",{value:!0});Nr.nextPossibleTokensAfter=Nr.possiblePathsFrom=Nr.NextTerminalAfterAtLeastOneSepWalker=Nr.NextTerminalAfterAtLeastOneWalker=Nr.NextTerminalAfterManySepWalker=Nr.NextTerminalAfterManyWalker=Nr.AbstractNextTerminalAfterProductionWalker=Nr.NextAfterTokenWalker=Nr.AbstractNextPossibleTokensWalker=void 0;var Xj=Ay(),Kt=Gt(),QIe=qv(),kt=mn(),Zj=function(r){mc(e,r);function e(t,i){var n=r.call(this)||this;return n.topProd=t,n.path=i,n.possibleTokTypes=[],n.nextProductionName="",n.nextProductionOccurrence=0,n.found=!1,n.isAtEndOfPath=!1,n}return e.prototype.startWalking=function(){if(this.found=!1,this.path.ruleStack[0]!==this.topProd.name)throw Error("The path does not start with the walker's top Rule!");return this.ruleStack=(0,Kt.cloneArr)(this.path.ruleStack).reverse(),this.occurrenceStack=(0,Kt.cloneArr)(this.path.occurrenceStack).reverse(),this.ruleStack.pop(),this.occurrenceStack.pop(),this.updateExpectedNext(),this.walk(this.topProd),this.possibleTokTypes},e.prototype.walk=function(t,i){i===void 0&&(i=[]),this.found||r.prototype.walk.call(this,t,i)},e.prototype.walkProdRef=function(t,i,n){if(t.referencedRule.name===this.nextProductionName&&t.idx===this.nextProductionOccurrence){var s=i.concat(n);this.updateExpectedNext(),this.walk(t.referencedRule,s)}},e.prototype.updateExpectedNext=function(){(0,Kt.isEmpty)(this.ruleStack)?(this.nextProductionName="",this.nextProductionOccurrence=0,this.isAtEndOfPath=!0):(this.nextProductionName=this.ruleStack.pop(),this.nextProductionOccurrence=this.occurrenceStack.pop())},e}(Xj.RestWalker);Nr.AbstractNextPossibleTokensWalker=Zj;var SIe=function(r){mc(e,r);function e(t,i){var n=r.call(this,t,i)||this;return n.path=i,n.nextTerminalName="",n.nextTerminalOccurrence=0,n.nextTerminalName=n.path.lastTok.name,n.nextTerminalOccurrence=n.path.lastTokOccurrence,n}return e.prototype.walkTerminal=function(t,i,n){if(this.isAtEndOfPath&&t.terminalType.name===this.nextTerminalName&&t.idx===this.nextTerminalOccurrence&&!this.found){var s=i.concat(n),o=new kt.Alternative({definition:s});this.possibleTokTypes=(0,QIe.first)(o),this.found=!0}},e}(Zj);Nr.NextAfterTokenWalker=SIe;var Pd=function(r){mc(e,r);function e(t,i){var n=r.call(this)||this;return n.topRule=t,n.occurrence=i,n.result={token:void 0,occurrence:void 0,isEndOfRule:void 0},n}return e.prototype.startWalking=function(){return this.walk(this.topRule),this.result},e}(Xj.RestWalker);Nr.AbstractNextTerminalAfterProductionWalker=Pd;var vIe=function(r){mc(e,r);function e(){return r!==null&&r.apply(this,arguments)||this}return e.prototype.walkMany=function(t,i,n){if(t.idx===this.occurrence){var s=(0,Kt.first)(i.concat(n));this.result.isEndOfRule=s===void 0,s instanceof kt.Terminal&&(this.result.token=s.terminalType,this.result.occurrence=s.idx)}else r.prototype.walkMany.call(this,t,i,n)},e}(Pd);Nr.NextTerminalAfterManyWalker=vIe;var xIe=function(r){mc(e,r);function e(){return r!==null&&r.apply(this,arguments)||this}return e.prototype.walkManySep=function(t,i,n){if(t.idx===this.occurrence){var s=(0,Kt.first)(i.concat(n));this.result.isEndOfRule=s===void 0,s instanceof kt.Terminal&&(this.result.token=s.terminalType,this.result.occurrence=s.idx)}else r.prototype.walkManySep.call(this,t,i,n)},e}(Pd);Nr.NextTerminalAfterManySepWalker=xIe;var PIe=function(r){mc(e,r);function e(){return r!==null&&r.apply(this,arguments)||this}return e.prototype.walkAtLeastOne=function(t,i,n){if(t.idx===this.occurrence){var s=(0,Kt.first)(i.concat(n));this.result.isEndOfRule=s===void 0,s instanceof kt.Terminal&&(this.result.token=s.terminalType,this.result.occurrence=s.idx)}else r.prototype.walkAtLeastOne.call(this,t,i,n)},e}(Pd);Nr.NextTerminalAfterAtLeastOneWalker=PIe;var DIe=function(r){mc(e,r);function e(){return r!==null&&r.apply(this,arguments)||this}return e.prototype.walkAtLeastOneSep=function(t,i,n){if(t.idx===this.occurrence){var s=(0,Kt.first)(i.concat(n));this.result.isEndOfRule=s===void 0,s instanceof kt.Terminal&&(this.result.token=s.terminalType,this.result.occurrence=s.idx)}else r.prototype.walkAtLeastOneSep.call(this,t,i,n)},e}(Pd);Nr.NextTerminalAfterAtLeastOneSepWalker=DIe;function _j(r,e,t){t===void 0&&(t=[]),t=(0,Kt.cloneArr)(t);var i=[],n=0;function s(c){return c.concat((0,Kt.drop)(r,n+1))}function o(c){var u=_j(s(c),e,t);return i.concat(u)}for(;t.length<e&&n<r.length;){var a=r[n];if(a instanceof kt.Alternative)return o(a.definition);if(a instanceof kt.NonTerminal)return o(a.definition);if(a instanceof kt.Option)i=o(a.definition);else if(a instanceof kt.RepetitionMandatory){var l=a.definition.concat([new kt.Repetition({definition:a.definition})]);return o(l)}else if(a instanceof kt.RepetitionMandatoryWithSeparator){var l=[new kt.Alternative({definition:a.definition}),new kt.Repetition({definition:[new kt.Terminal({terminalType:a.separator})].concat(a.definition)})];return o(l)}else if(a instanceof kt.RepetitionWithSeparator){var l=a.definition.concat([new kt.Repetition({definition:[new kt.Terminal({terminalType:a.separator})].concat(a.definition)})]);i=o(l)}else if(a instanceof kt.Repetition){var l=a.definition.concat([new kt.Repetition({definition:a.definition})]);i=o(l)}else{if(a instanceof kt.Alternation)return(0,Kt.forEach)(a.definition,function(c){(0,Kt.isEmpty)(c.definition)===!1&&(i=o(c.definition))}),i;if(a instanceof kt.Terminal)t.push(a.terminalType);else throw Error("non exhaustive match")}n++}return i.push({partialPath:t,suffixDef:(0,Kt.drop)(r,n)}),i}Nr.possiblePathsFrom=_j;function kIe(r,e,t,i){var n="EXIT_NONE_TERMINAL",s=[n],o="EXIT_ALTERNATIVE",a=!1,l=e.length,c=l-i-1,u=[],g=[];for(g.push({idx:-1,def:r,ruleStack:[],occurrenceStack:[]});!(0,Kt.isEmpty)(g);){var f=g.pop();if(f===o){a&&(0,Kt.last)(g).idx<=c&&g.pop();continue}var h=f.def,p=f.idx,C=f.ruleStack,y=f.occurrenceStack;if(!(0,Kt.isEmpty)(h)){var B=h[0];if(B===n){var v={idx:p,def:(0,Kt.drop)(h),ruleStack:(0,Kt.dropRight)(C),occurrenceStack:(0,Kt.dropRight)(y)};g.push(v)}else if(B instanceof kt.Terminal)if(p<l-1){var D=p+1,T=e[D];if(t(T,B.terminalType)){var v={idx:D,def:(0,Kt.drop)(h),ruleStack:C,occurrenceStack:y};g.push(v)}}else if(p===l-1)u.push({nextTokenType:B.terminalType,nextTokenOccurrence:B.idx,ruleStack:C,occurrenceStack:y}),a=!0;else throw Error("non exhaustive match");else if(B instanceof kt.NonTerminal){var H=(0,Kt.cloneArr)(C);H.push(B.nonTerminalName);var j=(0,Kt.cloneArr)(y);j.push(B.idx);var v={idx:p,def:B.definition.concat(s,(0,Kt.drop)(h)),ruleStack:H,occurrenceStack:j};g.push(v)}else if(B instanceof kt.Option){var $={idx:p,def:(0,Kt.drop)(h),ruleStack:C,occurrenceStack:y};g.push($),g.push(o);var V={idx:p,def:B.definition.concat((0,Kt.drop)(h)),ruleStack:C,occurrenceStack:y};g.push(V)}else if(B instanceof kt.RepetitionMandatory){var W=new kt.Repetition({definition:B.definition,idx:B.idx}),_=B.definition.concat([W],(0,Kt.drop)(h)),v={idx:p,def:_,ruleStack:C,occurrenceStack:y};g.push(v)}else if(B instanceof kt.RepetitionMandatoryWithSeparator){var A=new kt.Terminal({terminalType:B.separator}),W=new kt.Repetition({definition:[A].concat(B.definition),idx:B.idx}),_=B.definition.concat([W],(0,Kt.drop)(h)),v={idx:p,def:_,ruleStack:C,occurrenceStack:y};g.push(v)}else if(B instanceof kt.RepetitionWithSeparator){var $={idx:p,def:(0,Kt.drop)(h),ruleStack:C,occurrenceStack:y};g.push($),g.push(o);var A=new kt.Terminal({terminalType:B.separator}),Ae=new kt.Repetition({definition:[A].concat(B.definition),idx:B.idx}),_=B.definition.concat([Ae],(0,Kt.drop)(h)),V={idx:p,def:_,ruleStack:C,occurrenceStack:y};g.push(V)}else if(B instanceof kt.Repetition){var $={idx:p,def:(0,Kt.drop)(h),ruleStack:C,occurrenceStack:y};g.push($),g.push(o);var Ae=new kt.Repetition({definition:B.definition,idx:B.idx}),_=B.definition.concat([Ae],(0,Kt.drop)(h)),V={idx:p,def:_,ruleStack:C,occurrenceStack:y};g.push(V)}else if(B instanceof kt.Alternation)for(var ge=B.definition.length-1;ge>=0;ge--){var re=B.definition[ge],O={idx:p,def:re.definition.concat((0,Kt.drop)(h)),ruleStack:C,occurrenceStack:y};g.push(O),g.push(o)}else if(B instanceof kt.Alternative)g.push({idx:p,def:B.definition.concat((0,Kt.drop)(h)),ruleStack:C,occurrenceStack:y});else if(B instanceof kt.Rule)g.push(RIe(B,p,C,y));else throw Error("non exhaustive match")}}return u}Nr.nextPossibleTokensAfter=kIe;function RIe(r,e,t,i){var n=(0,Kt.cloneArr)(t);n.push(r.name);var s=(0,Kt.cloneArr)(i);return s.push(1),{idx:e,def:r.definition,ruleStack:n,occurrenceStack:s}}});var kd=w(Zt=>{"use strict";var tq=Zt&&Zt.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(Zt,"__esModule",{value:!0});Zt.areTokenCategoriesNotUsed=Zt.isStrictPrefixOfPath=Zt.containsPath=Zt.getLookaheadPathsForOptionalProd=Zt.getLookaheadPathsForOr=Zt.lookAheadSequenceFromAlternatives=Zt.buildSingleAlternativeLookaheadFunction=Zt.buildAlternativesLookAheadFunc=Zt.buildLookaheadFuncForOptionalProd=Zt.buildLookaheadFuncForOr=Zt.getProdType=Zt.PROD_TYPE=void 0;var sr=Gt(),$j=Dd(),FIe=Ay(),hy=_g(),OA=mn(),NIe=$g(),oi;(function(r){r[r.OPTION=0]="OPTION",r[r.REPETITION=1]="REPETITION",r[r.REPETITION_MANDATORY=2]="REPETITION_MANDATORY",r[r.REPETITION_MANDATORY_WITH_SEPARATOR=3]="REPETITION_MANDATORY_WITH_SEPARATOR",r[r.REPETITION_WITH_SEPARATOR=4]="REPETITION_WITH_SEPARATOR",r[r.ALTERNATION=5]="ALTERNATION"})(oi=Zt.PROD_TYPE||(Zt.PROD_TYPE={}));function TIe(r){if(r instanceof OA.Option)return oi.OPTION;if(r instanceof OA.Repetition)return oi.REPETITION;if(r instanceof OA.RepetitionMandatory)return oi.REPETITION_MANDATORY;if(r instanceof OA.RepetitionMandatoryWithSeparator)return oi.REPETITION_MANDATORY_WITH_SEPARATOR;if(r instanceof OA.RepetitionWithSeparator)return oi.REPETITION_WITH_SEPARATOR;if(r instanceof OA.Alternation)return oi.ALTERNATION;throw Error("non exhaustive match")}Zt.getProdType=TIe;function LIe(r,e,t,i,n,s){var o=iq(r,e,t),a=Xv(o)?hy.tokenStructuredMatcherNoCategories:hy.tokenStructuredMatcher;return s(o,i,a,n)}Zt.buildLookaheadFuncForOr=LIe;function OIe(r,e,t,i,n,s){var o=nq(r,e,n,t),a=Xv(o)?hy.tokenStructuredMatcherNoCategories:hy.tokenStructuredMatcher;return s(o[0],a,i)}Zt.buildLookaheadFuncForOptionalProd=OIe;function MIe(r,e,t,i){var n=r.length,s=(0,sr.every)(r,function(l){return(0,sr.every)(l,function(c){return c.length===1})});if(e)return function(l){for(var c=(0,sr.map)(l,function(D){return D.GATE}),u=0;u<n;u++){var g=r[u],f=g.length,h=c[u];if(h!==void 0&&h.call(this)===!1)continue;e:for(var p=0;p<f;p++){for(var C=g[p],y=C.length,B=0;B<y;B++){var v=this.LA(B+1);if(t(v,C[B])===!1)continue e}return u}}};if(s&&!i){var o=(0,sr.map)(r,function(l){return(0,sr.flatten)(l)}),a=(0,sr.reduce)(o,function(l,c,u){return(0,sr.forEach)(c,function(g){(0,sr.has)(l,g.tokenTypeIdx)||(l[g.tokenTypeIdx]=u),(0,sr.forEach)(g.categoryMatches,function(f){(0,sr.has)(l,f)||(l[f]=u)})}),l},[]);return function(){var l=this.LA(1);return a[l.tokenTypeIdx]}}else return function(){for(var l=0;l<n;l++){var c=r[l],u=c.length;e:for(var g=0;g<u;g++){for(var f=c[g],h=f.length,p=0;p<h;p++){var C=this.LA(p+1);if(t(C,f[p])===!1)continue e}return l}}}}Zt.buildAlternativesLookAheadFunc=MIe;function KIe(r,e,t){var i=(0,sr.every)(r,function(c){return c.length===1}),n=r.length;if(i&&!t){var s=(0,sr.flatten)(r);if(s.length===1&&(0,sr.isEmpty)(s[0].categoryMatches)){var o=s[0],a=o.tokenTypeIdx;return function(){return this.LA(1).tokenTypeIdx===a}}else{var l=(0,sr.reduce)(s,function(c,u,g){return c[u.tokenTypeIdx]=!0,(0,sr.forEach)(u.categoryMatches,function(f){c[f]=!0}),c},[]);return function(){var c=this.LA(1);return l[c.tokenTypeIdx]===!0}}}else return function(){e:for(var c=0;c<n;c++){for(var u=r[c],g=u.length,f=0;f<g;f++){var h=this.LA(f+1);if(e(h,u[f])===!1)continue e}return!0}return!1}}Zt.buildSingleAlternativeLookaheadFunction=KIe;var UIe=function(r){tq(e,r);function e(t,i,n){var s=r.call(this)||this;return s.topProd=t,s.targetOccurrence=i,s.targetProdType=n,s}return e.prototype.startWalking=function(){return this.walk(this.topProd),this.restDef},e.prototype.checkIsTarget=function(t,i,n,s){return t.idx===this.targetOccurrence&&this.targetProdType===i?(this.restDef=n.concat(s),!0):!1},e.prototype.walkOption=function(t,i,n){this.checkIsTarget(t,oi.OPTION,i,n)||r.prototype.walkOption.call(this,t,i,n)},e.prototype.walkAtLeastOne=function(t,i,n){this.checkIsTarget(t,oi.REPETITION_MANDATORY,i,n)||r.prototype.walkOption.call(this,t,i,n)},e.prototype.walkAtLeastOneSep=function(t,i,n){this.checkIsTarget(t,oi.REPETITION_MANDATORY_WITH_SEPARATOR,i,n)||r.prototype.walkOption.call(this,t,i,n)},e.prototype.walkMany=function(t,i,n){this.checkIsTarget(t,oi.REPETITION,i,n)||r.prototype.walkOption.call(this,t,i,n)},e.prototype.walkManySep=function(t,i,n){this.checkIsTarget(t,oi.REPETITION_WITH_SEPARATOR,i,n)||r.prototype.walkOption.call(this,t,i,n)},e}(FIe.RestWalker),rq=function(r){tq(e,r);function e(t,i,n){var s=r.call(this)||this;return s.targetOccurrence=t,s.targetProdType=i,s.targetRef=n,s.result=[],s}return e.prototype.checkIsTarget=function(t,i){t.idx===this.targetOccurrence&&this.targetProdType===i&&(this.targetRef===void 0||t===this.targetRef)&&(this.result=t.definition)},e.prototype.visitOption=function(t){this.checkIsTarget(t,oi.OPTION)},e.prototype.visitRepetition=function(t){this.checkIsTarget(t,oi.REPETITION)},e.prototype.visitRepetitionMandatory=function(t){this.checkIsTarget(t,oi.REPETITION_MANDATORY)},e.prototype.visitRepetitionMandatoryWithSeparator=function(t){this.checkIsTarget(t,oi.REPETITION_MANDATORY_WITH_SEPARATOR)},e.prototype.visitRepetitionWithSeparator=function(t){this.checkIsTarget(t,oi.REPETITION_WITH_SEPARATOR)},e.prototype.visitAlternation=function(t){this.checkIsTarget(t,oi.ALTERNATION)},e}(NIe.GAstVisitor);function eq(r){for(var e=new Array(r),t=0;t<r;t++)e[t]=[];return e}function zv(r){for(var e=[""],t=0;t<r.length;t++){for(var i=r[t],n=[],s=0;s<e.length;s++){var o=e[s];n.push(o+"_"+i.tokenTypeIdx);for(var a=0;a<i.categoryMatches.length;a++){var l="_"+i.categoryMatches[a];n.push(o+l)}}e=n}return e}function HIe(r,e,t){for(var i=0;i<r.length;i++)if(i!==t)for(var n=r[i],s=0;s<e.length;s++){var o=e[s];if(n[o]===!0)return!1}return!0}function Vv(r,e){for(var t=(0,sr.map)(r,function(u){return(0,$j.possiblePathsFrom)([u],1)}),i=eq(t.length),n=(0,sr.map)(t,function(u){var g={};return(0,sr.forEach)(u,function(f){var h=zv(f.partialPath);(0,sr.forEach)(h,function(p){g[p]=!0})}),g}),s=t,o=1;o<=e;o++){var a=s;s=eq(a.length);for(var l=function(u){for(var g=a[u],f=0;f<g.length;f++){var h=g[f].partialPath,p=g[f].suffixDef,C=zv(h),y=HIe(n,C,u);if(y||(0,sr.isEmpty)(p)||h.length===e){var B=i[u];if(sq(B,h)===!1){B.push(h);for(var v=0;v<C.length;v++){var D=C[v];n[u][D]=!0}}}else{var T=(0,$j.possiblePathsFrom)(p,o+1,h);s[u]=s[u].concat(T),(0,sr.forEach)(T,function(H){var j=zv(H.partialPath);(0,sr.forEach)(j,function($){n[u][$]=!0})})}}},c=0;c<a.length;c++)l(c)}return i}Zt.lookAheadSequenceFromAlternatives=Vv;function iq(r,e,t,i){var n=new rq(r,oi.ALTERNATION,i);return e.accept(n),Vv(n.result,t)}Zt.getLookaheadPathsForOr=iq;function nq(r,e,t,i){var n=new rq(r,t);e.accept(n);var s=n.result,o=new UIe(e,r,t),a=o.startWalking(),l=new OA.Alternative({definition:s}),c=new OA.Alternative({definition:a});return Vv([l,c],i)}Zt.getLookaheadPathsForOptionalProd=nq;function sq(r,e){e:for(var t=0;t<r.length;t++){var i=r[t];if(i.length===e.length){for(var n=0;n<i.length;n++){var s=e[n],o=i[n],a=s===o||o.categoryMatchesMap[s.tokenTypeIdx]!==void 0;if(a===!1)continue e}return!0}}return!1}Zt.containsPath=sq;function GIe(r,e){return r.length<e.length&&(0,sr.every)(r,function(t,i){var n=e[i];return t===n||n.categoryMatchesMap[t.tokenTypeIdx]})}Zt.isStrictPrefixOfPath=GIe;function Xv(r){return(0,sr.every)(r,function(e){return(0,sr.every)(e,function(t){return(0,sr.every)(t,function(i){return(0,sr.isEmpty)(i.categoryMatches)})})})}Zt.areTokenCategoriesNotUsed=Xv});var rx=w(Vt=>{"use strict";var Zv=Vt&&Vt.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(Vt,"__esModule",{value:!0});Vt.checkPrefixAlternativesAmbiguities=Vt.validateSomeNonEmptyLookaheadPath=Vt.validateTooManyAlts=Vt.RepetionCollector=Vt.validateAmbiguousAlternationAlternatives=Vt.validateEmptyOrAlternative=Vt.getFirstNoneTerminal=Vt.validateNoLeftRecursion=Vt.validateRuleIsOverridden=Vt.validateRuleDoesNotAlreadyExist=Vt.OccurrenceValidationCollector=Vt.identifyProductionForDuplicates=Vt.validateGrammar=void 0;var er=Gt(),Qr=Gt(),To=jn(),_v=vd(),tf=kd(),YIe=Dd(),to=mn(),$v=$g();function jIe(r,e,t,i,n){var s=er.map(r,function(h){return qIe(h,i)}),o=er.map(r,function(h){return ex(h,h,i)}),a=[],l=[],c=[];(0,Qr.every)(o,Qr.isEmpty)&&(a=(0,Qr.map)(r,function(h){return cq(h,i)}),l=(0,Qr.map)(r,function(h){return uq(h,e,i)}),c=hq(r,e,i));var u=zIe(r,t,i),g=(0,Qr.map)(r,function(h){return fq(h,i)}),f=(0,Qr.map)(r,function(h){return lq(h,r,n,i)});return er.flatten(s.concat(c,o,a,l,u,g,f))}Vt.validateGrammar=jIe;function qIe(r,e){var t=new Aq;r.accept(t);var i=t.allProductions,n=er.groupBy(i,oq),s=er.pick(n,function(a){return a.length>1}),o=er.map(er.values(s),function(a){var l=er.first(a),c=e.buildDuplicateFoundError(r,a),u=(0,_v.getProductionDslName)(l),g={message:c,type:To.ParserDefinitionErrorType.DUPLICATE_PRODUCTIONS,ruleName:r.name,dslName:u,occurrence:l.idx},f=aq(l);return f&&(g.parameter=f),g});return o}function oq(r){return(0,_v.getProductionDslName)(r)+"_#_"+r.idx+"_#_"+aq(r)}Vt.identifyProductionForDuplicates=oq;function aq(r){return r instanceof to.Terminal?r.terminalType.name:r instanceof to.NonTerminal?r.nonTerminalName:""}var Aq=function(r){Zv(e,r);function e(){var t=r!==null&&r.apply(this,arguments)||this;return t.allProductions=[],t}return e.prototype.visitNonTerminal=function(t){this.allProductions.push(t)},e.prototype.visitOption=function(t){this.allProductions.push(t)},e.prototype.visitRepetitionWithSeparator=function(t){this.allProductions.push(t)},e.prototype.visitRepetitionMandatory=function(t){this.allProductions.push(t)},e.prototype.visitRepetitionMandatoryWithSeparator=function(t){this.allProductions.push(t)},e.prototype.visitRepetition=function(t){this.allProductions.push(t)},e.prototype.visitAlternation=function(t){this.allProductions.push(t)},e.prototype.visitTerminal=function(t){this.allProductions.push(t)},e}($v.GAstVisitor);Vt.OccurrenceValidationCollector=Aq;function lq(r,e,t,i){var n=[],s=(0,Qr.reduce)(e,function(a,l){return l.name===r.name?a+1:a},0);if(s>1){var o=i.buildDuplicateRuleNameError({topLevelRule:r,grammarName:t});n.push({message:o,type:To.ParserDefinitionErrorType.DUPLICATE_RULE_NAME,ruleName:r.name})}return n}Vt.validateRuleDoesNotAlreadyExist=lq;function JIe(r,e,t){var i=[],n;return er.contains(e,r)||(n="Invalid rule override, rule: ->"+r+"<- cannot be overridden in the grammar: ->"+t+"<-as it is not defined in any of the super grammars ",i.push({message:n,type:To.ParserDefinitionErrorType.INVALID_RULE_OVERRIDE,ruleName:r})),i}Vt.validateRuleIsOverridden=JIe;function ex(r,e,t,i){i===void 0&&(i=[]);var n=[],s=Rd(e.definition);if(er.isEmpty(s))return[];var o=r.name,a=er.contains(s,r);a&&n.push({message:t.buildLeftRecursionError({topLevelRule:r,leftRecursionPath:i}),type:To.ParserDefinitionErrorType.LEFT_RECURSION,ruleName:o});var l=er.difference(s,i.concat([r])),c=er.map(l,function(u){var g=er.cloneArr(i);return g.push(u),ex(r,u,t,g)});return n.concat(er.flatten(c))}Vt.validateNoLeftRecursion=ex;function Rd(r){var e=[];if(er.isEmpty(r))return e;var t=er.first(r);if(t instanceof to.NonTerminal)e.push(t.referencedRule);else if(t instanceof to.Alternative||t instanceof to.Option||t instanceof to.RepetitionMandatory||t instanceof to.RepetitionMandatoryWithSeparator||t instanceof to.RepetitionWithSeparator||t instanceof to.Repetition)e=e.concat(Rd(t.definition));else if(t instanceof to.Alternation)e=er.flatten(er.map(t.definition,function(o){return Rd(o.definition)}));else if(!(t instanceof to.Terminal))throw Error("non exhaustive match");var i=(0,_v.isOptionalProd)(t),n=r.length>1;if(i&&n){var s=er.drop(r);return e.concat(Rd(s))}else return e}Vt.getFirstNoneTerminal=Rd;var tx=function(r){Zv(e,r);function e(){var t=r!==null&&r.apply(this,arguments)||this;return t.alternations=[],t}return e.prototype.visitAlternation=function(t){this.alternations.push(t)},e}($v.GAstVisitor);function cq(r,e){var t=new tx;r.accept(t);var i=t.alternations,n=er.reduce(i,function(s,o){var a=er.dropRight(o.definition),l=er.map(a,function(c,u){var g=(0,YIe.nextPossibleTokensAfter)([c],[],null,1);return er.isEmpty(g)?{message:e.buildEmptyAlternationError({topLevelRule:r,alternation:o,emptyChoiceIdx:u}),type:To.ParserDefinitionErrorType.NONE_LAST_EMPTY_ALT,ruleName:r.name,occurrence:o.idx,alternative:u+1}:null});return s.concat(er.compact(l))},[]);return n}Vt.validateEmptyOrAlternative=cq;function uq(r,e,t){var i=new tx;r.accept(i);var n=i.alternations;n=(0,Qr.reject)(n,function(o){return o.ignoreAmbiguities===!0});var s=er.reduce(n,function(o,a){var l=a.idx,c=a.maxLookahead||e,u=(0,tf.getLookaheadPathsForOr)(l,r,c,a),g=WIe(u,a,r,t),f=pq(u,a,r,t);return o.concat(g,f)},[]);return s}Vt.validateAmbiguousAlternationAlternatives=uq;var gq=function(r){Zv(e,r);function e(){var t=r!==null&&r.apply(this,arguments)||this;return t.allProductions=[],t}return e.prototype.visitRepetitionWithSeparator=function(t){this.allProductions.push(t)},e.prototype.visitRepetitionMandatory=function(t){this.allProductions.push(t)},e.prototype.visitRepetitionMandatoryWithSeparator=function(t){this.allProductions.push(t)},e.prototype.visitRepetition=function(t){this.allProductions.push(t)},e}($v.GAstVisitor);Vt.RepetionCollector=gq;function fq(r,e){var t=new tx;r.accept(t);var i=t.alternations,n=er.reduce(i,function(s,o){return o.definition.length>255&&s.push({message:e.buildTooManyAlternativesError({topLevelRule:r,alternation:o}),type:To.ParserDefinitionErrorType.TOO_MANY_ALTS,ruleName:r.name,occurrence:o.idx}),s},[]);return n}Vt.validateTooManyAlts=fq;function hq(r,e,t){var i=[];return(0,Qr.forEach)(r,function(n){var s=new gq;n.accept(s);var o=s.allProductions;(0,Qr.forEach)(o,function(a){var l=(0,tf.getProdType)(a),c=a.maxLookahead||e,u=a.idx,g=(0,tf.getLookaheadPathsForOptionalProd)(u,n,l,c),f=g[0];if((0,Qr.isEmpty)((0,Qr.flatten)(f))){var h=t.buildEmptyRepetitionError({topLevelRule:n,repetition:a});i.push({message:h,type:To.ParserDefinitionErrorType.NO_NON_EMPTY_LOOKAHEAD,ruleName:n.name})}})}),i}Vt.validateSomeNonEmptyLookaheadPath=hq;function WIe(r,e,t,i){var n=[],s=(0,Qr.reduce)(r,function(a,l,c){return e.definition[c].ignoreAmbiguities===!0||(0,Qr.forEach)(l,function(u){var g=[c];(0,Qr.forEach)(r,function(f,h){c!==h&&(0,tf.containsPath)(f,u)&&e.definition[h].ignoreAmbiguities!==!0&&g.push(h)}),g.length>1&&!(0,tf.containsPath)(n,u)&&(n.push(u),a.push({alts:g,path:u}))}),a},[]),o=er.map(s,function(a){var l=(0,Qr.map)(a.alts,function(u){return u+1}),c=i.buildAlternationAmbiguityError({topLevelRule:t,alternation:e,ambiguityIndices:l,prefixPath:a.path});return{message:c,type:To.ParserDefinitionErrorType.AMBIGUOUS_ALTS,ruleName:t.name,occurrence:e.idx,alternatives:[a.alts]}});return o}function pq(r,e,t,i){var n=[],s=(0,Qr.reduce)(r,function(o,a,l){var c=(0,Qr.map)(a,function(u){return{idx:l,path:u}});return o.concat(c)},[]);return(0,Qr.forEach)(s,function(o){var a=e.definition[o.idx];if(a.ignoreAmbiguities!==!0){var l=o.idx,c=o.path,u=(0,Qr.findAll)(s,function(f){return e.definition[f.idx].ignoreAmbiguities!==!0&&f.idx<l&&(0,tf.isStrictPrefixOfPath)(f.path,c)}),g=(0,Qr.map)(u,function(f){var h=[f.idx+1,l+1],p=e.idx===0?"":e.idx,C=i.buildAlternationPrefixAmbiguityError({topLevelRule:t,alternation:e,ambiguityIndices:h,prefixPath:f.path});return{message:C,type:To.ParserDefinitionErrorType.AMBIGUOUS_PREFIX_ALTS,ruleName:t.name,occurrence:p,alternatives:h}});n=n.concat(g)}}),n}Vt.checkPrefixAlternativesAmbiguities=pq;function zIe(r,e,t){var i=[],n=(0,Qr.map)(e,function(s){return s.name});return(0,Qr.forEach)(r,function(s){var o=s.name;if((0,Qr.contains)(n,o)){var a=t.buildNamespaceConflictError(s);i.push({message:a,type:To.ParserDefinitionErrorType.CONFLICT_TOKENS_RULES_NAMESPACE,ruleName:o})}}),i}});var Cq=w(rf=>{"use strict";Object.defineProperty(rf,"__esModule",{value:!0});rf.validateGrammar=rf.resolveGrammar=void 0;var ix=Gt(),VIe=Vj(),XIe=rx(),dq=xd();function ZIe(r){r=(0,ix.defaults)(r,{errMsgProvider:dq.defaultGrammarResolverErrorProvider});var e={};return(0,ix.forEach)(r.rules,function(t){e[t.name]=t}),(0,VIe.resolveGrammar)(e,r.errMsgProvider)}rf.resolveGrammar=ZIe;function _Ie(r){return r=(0,ix.defaults)(r,{errMsgProvider:dq.defaultGrammarValidatorErrorProvider}),(0,XIe.validateGrammar)(r.rules,r.maxLookahead,r.tokenTypes,r.errMsgProvider,r.grammarName)}rf.validateGrammar=_Ie});var nf=w(In=>{"use strict";var Fd=In&&In.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(In,"__esModule",{value:!0});In.EarlyExitException=In.NotAllInputParsedException=In.NoViableAltException=In.MismatchedTokenException=In.isRecognitionException=void 0;var $Ie=Gt(),mq="MismatchedTokenException",Eq="NoViableAltException",Iq="EarlyExitException",yq="NotAllInputParsedException",wq=[mq,Eq,Iq,yq];Object.freeze(wq);function eye(r){return(0,$Ie.contains)(wq,r.name)}In.isRecognitionException=eye;var py=function(r){Fd(e,r);function e(t,i){var n=this.constructor,s=r.call(this,t)||this;return s.token=i,s.resyncedTokens=[],Object.setPrototypeOf(s,n.prototype),Error.captureStackTrace&&Error.captureStackTrace(s,s.constructor),s}return e}(Error),tye=function(r){Fd(e,r);function e(t,i,n){var s=r.call(this,t,i)||this;return s.previousToken=n,s.name=mq,s}return e}(py);In.MismatchedTokenException=tye;var rye=function(r){Fd(e,r);function e(t,i,n){var s=r.call(this,t,i)||this;return s.previousToken=n,s.name=Eq,s}return e}(py);In.NoViableAltException=rye;var iye=function(r){Fd(e,r);function e(t,i){var n=r.call(this,t,i)||this;return n.name=yq,n}return e}(py);In.NotAllInputParsedException=iye;var nye=function(r){Fd(e,r);function e(t,i,n){var s=r.call(this,t,i)||this;return s.previousToken=n,s.name=Iq,s}return e}(py);In.EarlyExitException=nye});var sx=w(Ki=>{"use strict";Object.defineProperty(Ki,"__esModule",{value:!0});Ki.attemptInRepetitionRecovery=Ki.Recoverable=Ki.InRuleRecoveryException=Ki.IN_RULE_RECOVERY_EXCEPTION=Ki.EOF_FOLLOW_KEY=void 0;var dy=TA(),hs=Gt(),sye=nf(),oye=Jv(),aye=jn();Ki.EOF_FOLLOW_KEY={};Ki.IN_RULE_RECOVERY_EXCEPTION="InRuleRecoveryException";function nx(r){this.name=Ki.IN_RULE_RECOVERY_EXCEPTION,this.message=r}Ki.InRuleRecoveryException=nx;nx.prototype=Error.prototype;var Aye=function(){function r(){}return r.prototype.initRecoverable=function(e){this.firstAfterRepMap={},this.resyncFollows={},this.recoveryEnabled=(0,hs.has)(e,"recoveryEnabled")?e.recoveryEnabled:aye.DEFAULT_PARSER_CONFIG.recoveryEnabled,this.recoveryEnabled&&(this.attemptInRepetitionRecovery=Bq)},r.prototype.getTokenToInsert=function(e){var t=(0,dy.createTokenInstance)(e,"",NaN,NaN,NaN,NaN,NaN,NaN);return t.isInsertedInRecovery=!0,t},r.prototype.canTokenTypeBeInsertedInRecovery=function(e){return!0},r.prototype.tryInRepetitionRecovery=function(e,t,i,n){for(var s=this,o=this.findReSyncTokenType(),a=this.exportLexerState(),l=[],c=!1,u=this.LA(1),g=this.LA(1),f=function(){var h=s.LA(0),p=s.errorMessageProvider.buildMismatchTokenMessage({expected:n,actual:u,previous:h,ruleName:s.getCurrRuleFullName()}),C=new sye.MismatchedTokenException(p,u,s.LA(0));C.resyncedTokens=(0,hs.dropRight)(l),s.SAVE_ERROR(C)};!c;)if(this.tokenMatcher(g,n)){f();return}else if(i.call(this)){f(),e.apply(this,t);return}else this.tokenMatcher(g,o)?c=!0:(g=this.SKIP_TOKEN(),this.addToResyncTokens(g,l));this.importLexerState(a)},r.prototype.shouldInRepetitionRecoveryBeTried=function(e,t,i){return!(i===!1||e===void 0||t===void 0||this.tokenMatcher(this.LA(1),e)||this.isBackTracking()||this.canPerformInRuleRecovery(e,this.getFollowsForInRuleRecovery(e,t)))},r.prototype.getFollowsForInRuleRecovery=function(e,t){var i=this.getCurrentGrammarPath(e,t),n=this.getNextPossibleTokenTypes(i);return n},r.prototype.tryInRuleRecovery=function(e,t){if(this.canRecoverWithSingleTokenInsertion(e,t)){var i=this.getTokenToInsert(e);return i}if(this.canRecoverWithSingleTokenDeletion(e)){var n=this.SKIP_TOKEN();return this.consumeToken(),n}throw new nx("sad sad panda")},r.prototype.canPerformInRuleRecovery=function(e,t){return this.canRecoverWithSingleTokenInsertion(e,t)||this.canRecoverWithSingleTokenDeletion(e)},r.prototype.canRecoverWithSingleTokenInsertion=function(e,t){var i=this;if(!this.canTokenTypeBeInsertedInRecovery(e)||(0,hs.isEmpty)(t))return!1;var n=this.LA(1),s=(0,hs.find)(t,function(o){return i.tokenMatcher(n,o)})!==void 0;return s},r.prototype.canRecoverWithSingleTokenDeletion=function(e){var t=this.tokenMatcher(this.LA(2),e);return t},r.prototype.isInCurrentRuleReSyncSet=function(e){var t=this.getCurrFollowKey(),i=this.getFollowSetFromFollowKey(t);return(0,hs.contains)(i,e)},r.prototype.findReSyncTokenType=function(){for(var e=this.flattenFollowSet(),t=this.LA(1),i=2;;){var n=t.tokenType;if((0,hs.contains)(e,n))return n;t=this.LA(i),i++}},r.prototype.getCurrFollowKey=function(){if(this.RULE_STACK.length===1)return Ki.EOF_FOLLOW_KEY;var e=this.getLastExplicitRuleShortName(),t=this.getLastExplicitRuleOccurrenceIndex(),i=this.getPreviousExplicitRuleShortName();return{ruleName:this.shortRuleNameToFullName(e),idxInCallingRule:t,inRule:this.shortRuleNameToFullName(i)}},r.prototype.buildFullFollowKeyStack=function(){var e=this,t=this.RULE_STACK,i=this.RULE_OCCURRENCE_STACK;return(0,hs.map)(t,function(n,s){return s===0?Ki.EOF_FOLLOW_KEY:{ruleName:e.shortRuleNameToFullName(n),idxInCallingRule:i[s],inRule:e.shortRuleNameToFullName(t[s-1])}})},r.prototype.flattenFollowSet=function(){var e=this,t=(0,hs.map)(this.buildFullFollowKeyStack(),function(i){return e.getFollowSetFromFollowKey(i)});return(0,hs.flatten)(t)},r.prototype.getFollowSetFromFollowKey=function(e){if(e===Ki.EOF_FOLLOW_KEY)return[dy.EOF];var t=e.ruleName+e.idxInCallingRule+oye.IN+e.inRule;return this.resyncFollows[t]},r.prototype.addToResyncTokens=function(e,t){return this.tokenMatcher(e,dy.EOF)||t.push(e),t},r.prototype.reSyncTo=function(e){for(var t=[],i=this.LA(1);this.tokenMatcher(i,e)===!1;)i=this.SKIP_TOKEN(),this.addToResyncTokens(i,t);return(0,hs.dropRight)(t)},r.prototype.attemptInRepetitionRecovery=function(e,t,i,n,s,o,a){},r.prototype.getCurrentGrammarPath=function(e,t){var i=this.getHumanReadableRuleStack(),n=(0,hs.cloneArr)(this.RULE_OCCURRENCE_STACK),s={ruleStack:i,occurrenceStack:n,lastTok:e,lastTokOccurrence:t};return s},r.prototype.getHumanReadableRuleStack=function(){var e=this;return(0,hs.map)(this.RULE_STACK,function(t){return e.shortRuleNameToFullName(t)})},r}();Ki.Recoverable=Aye;function Bq(r,e,t,i,n,s,o){var a=this.getKeyForAutomaticLookahead(i,n),l=this.firstAfterRepMap[a];if(l===void 0){var c=this.getCurrRuleFullName(),u=this.getGAstProductions()[c],g=new s(u,n);l=g.startWalking(),this.firstAfterRepMap[a]=l}var f=l.token,h=l.occurrence,p=l.isEndOfRule;this.RULE_STACK.length===1&&p&&f===void 0&&(f=dy.EOF,h=1),this.shouldInRepetitionRecoveryBeTried(f,h,o)&&this.tryInRepetitionRecovery(r,e,t,f)}Ki.attemptInRepetitionRecovery=Bq});var Cy=w(Jt=>{"use strict";Object.defineProperty(Jt,"__esModule",{value:!0});Jt.getKeyForAutomaticLookahead=Jt.AT_LEAST_ONE_SEP_IDX=Jt.MANY_SEP_IDX=Jt.AT_LEAST_ONE_IDX=Jt.MANY_IDX=Jt.OPTION_IDX=Jt.OR_IDX=Jt.BITS_FOR_ALT_IDX=Jt.BITS_FOR_RULE_IDX=Jt.BITS_FOR_OCCURRENCE_IDX=Jt.BITS_FOR_METHOD_TYPE=void 0;Jt.BITS_FOR_METHOD_TYPE=4;Jt.BITS_FOR_OCCURRENCE_IDX=8;Jt.BITS_FOR_RULE_IDX=12;Jt.BITS_FOR_ALT_IDX=8;Jt.OR_IDX=1<<Jt.BITS_FOR_OCCURRENCE_IDX;Jt.OPTION_IDX=2<<Jt.BITS_FOR_OCCURRENCE_IDX;Jt.MANY_IDX=3<<Jt.BITS_FOR_OCCURRENCE_IDX;Jt.AT_LEAST_ONE_IDX=4<<Jt.BITS_FOR_OCCURRENCE_IDX;Jt.MANY_SEP_IDX=5<<Jt.BITS_FOR_OCCURRENCE_IDX;Jt.AT_LEAST_ONE_SEP_IDX=6<<Jt.BITS_FOR_OCCURRENCE_IDX;function lye(r,e,t){return t|e|r}Jt.getKeyForAutomaticLookahead=lye;var xet=32-Jt.BITS_FOR_ALT_IDX});var Qq=w(my=>{"use strict";Object.defineProperty(my,"__esModule",{value:!0});my.LooksAhead=void 0;var ka=kd(),ro=Gt(),bq=jn(),Ra=Cy(),Ec=vd(),cye=function(){function r(){}return r.prototype.initLooksAhead=function(e){this.dynamicTokensEnabled=(0,ro.has)(e,"dynamicTokensEnabled")?e.dynamicTokensEnabled:bq.DEFAULT_PARSER_CONFIG.dynamicTokensEnabled,this.maxLookahead=(0,ro.has)(e,"maxLookahead")?e.maxLookahead:bq.DEFAULT_PARSER_CONFIG.maxLookahead,this.lookAheadFuncsCache=(0,ro.isES2015MapSupported)()?new Map:[],(0,ro.isES2015MapSupported)()?(this.getLaFuncFromCache=this.getLaFuncFromMap,this.setLaFuncCache=this.setLaFuncCacheUsingMap):(this.getLaFuncFromCache=this.getLaFuncFromObj,this.setLaFuncCache=this.setLaFuncUsingObj)},r.prototype.preComputeLookaheadFunctions=function(e){var t=this;(0,ro.forEach)(e,function(i){t.TRACE_INIT(i.name+" Rule Lookahead",function(){var n=(0,Ec.collectMethods)(i),s=n.alternation,o=n.repetition,a=n.option,l=n.repetitionMandatory,c=n.repetitionMandatoryWithSeparator,u=n.repetitionWithSeparator;(0,ro.forEach)(s,function(g){var f=g.idx===0?"":g.idx;t.TRACE_INIT(""+(0,Ec.getProductionDslName)(g)+f,function(){var h=(0,ka.buildLookaheadFuncForOr)(g.idx,i,g.maxLookahead||t.maxLookahead,g.hasPredicates,t.dynamicTokensEnabled,t.lookAheadBuilderForAlternatives),p=(0,Ra.getKeyForAutomaticLookahead)(t.fullRuleNameToShort[i.name],Ra.OR_IDX,g.idx);t.setLaFuncCache(p,h)})}),(0,ro.forEach)(o,function(g){t.computeLookaheadFunc(i,g.idx,Ra.MANY_IDX,ka.PROD_TYPE.REPETITION,g.maxLookahead,(0,Ec.getProductionDslName)(g))}),(0,ro.forEach)(a,function(g){t.computeLookaheadFunc(i,g.idx,Ra.OPTION_IDX,ka.PROD_TYPE.OPTION,g.maxLookahead,(0,Ec.getProductionDslName)(g))}),(0,ro.forEach)(l,function(g){t.computeLookaheadFunc(i,g.idx,Ra.AT_LEAST_ONE_IDX,ka.PROD_TYPE.REPETITION_MANDATORY,g.maxLookahead,(0,Ec.getProductionDslName)(g))}),(0,ro.forEach)(c,function(g){t.computeLookaheadFunc(i,g.idx,Ra.AT_LEAST_ONE_SEP_IDX,ka.PROD_TYPE.REPETITION_MANDATORY_WITH_SEPARATOR,g.maxLookahead,(0,Ec.getProductionDslName)(g))}),(0,ro.forEach)(u,function(g){t.computeLookaheadFunc(i,g.idx,Ra.MANY_SEP_IDX,ka.PROD_TYPE.REPETITION_WITH_SEPARATOR,g.maxLookahead,(0,Ec.getProductionDslName)(g))})})})},r.prototype.computeLookaheadFunc=function(e,t,i,n,s,o){var a=this;this.TRACE_INIT(""+o+(t===0?"":t),function(){var l=(0,ka.buildLookaheadFuncForOptionalProd)(t,e,s||a.maxLookahead,a.dynamicTokensEnabled,n,a.lookAheadBuilderForOptional),c=(0,Ra.getKeyForAutomaticLookahead)(a.fullRuleNameToShort[e.name],i,t);a.setLaFuncCache(c,l)})},r.prototype.lookAheadBuilderForOptional=function(e,t,i){return(0,ka.buildSingleAlternativeLookaheadFunction)(e,t,i)},r.prototype.lookAheadBuilderForAlternatives=function(e,t,i,n){return(0,ka.buildAlternativesLookAheadFunc)(e,t,i,n)},r.prototype.getKeyForAutomaticLookahead=function(e,t){var i=this.getLastExplicitRuleShortName();return(0,Ra.getKeyForAutomaticLookahead)(i,e,t)},r.prototype.getLaFuncFromCache=function(e){},r.prototype.getLaFuncFromMap=function(e){return this.lookAheadFuncsCache.get(e)},r.prototype.getLaFuncFromObj=function(e){return this.lookAheadFuncsCache[e]},r.prototype.setLaFuncCache=function(e,t){},r.prototype.setLaFuncCacheUsingMap=function(e,t){this.lookAheadFuncsCache.set(e,t)},r.prototype.setLaFuncUsingObj=function(e,t){this.lookAheadFuncsCache[e]=t},r}();my.LooksAhead=cye});var Sq=w(Lo=>{"use strict";Object.defineProperty(Lo,"__esModule",{value:!0});Lo.addNoneTerminalToCst=Lo.addTerminalToCst=Lo.setNodeLocationFull=Lo.setNodeLocationOnlyOffset=void 0;function uye(r,e){isNaN(r.startOffset)===!0?(r.startOffset=e.startOffset,r.endOffset=e.endOffset):r.endOffset<e.endOffset&&(r.endOffset=e.endOffset)}Lo.setNodeLocationOnlyOffset=uye;function gye(r,e){isNaN(r.startOffset)===!0?(r.startOffset=e.startOffset,r.startColumn=e.startColumn,r.startLine=e.startLine,r.endOffset=e.endOffset,r.endColumn=e.endColumn,r.endLine=e.endLine):r.endOffset<e.endOffset&&(r.endOffset=e.endOffset,r.endColumn=e.endColumn,r.endLine=e.endLine)}Lo.setNodeLocationFull=gye;function fye(r,e,t){r.children[t]===void 0?r.children[t]=[e]:r.children[t].push(e)}Lo.addTerminalToCst=fye;function hye(r,e,t){r.children[e]===void 0?r.children[e]=[t]:r.children[e].push(t)}Lo.addNoneTerminalToCst=hye});var ox=w(MA=>{"use strict";Object.defineProperty(MA,"__esModule",{value:!0});MA.defineNameProp=MA.functionName=MA.classNameFromInstance=void 0;var pye=Gt();function dye(r){return xq(r.constructor)}MA.classNameFromInstance=dye;var vq="name";function xq(r){var e=r.name;return e||"anonymous"}MA.functionName=xq;function Cye(r,e){var t=Object.getOwnPropertyDescriptor(r,vq);return(0,pye.isUndefined)(t)||t.configurable?(Object.defineProperty(r,vq,{enumerable:!1,configurable:!0,writable:!1,value:e}),!0):!1}MA.defineNameProp=Cye});var Fq=w(Si=>{"use strict";Object.defineProperty(Si,"__esModule",{value:!0});Si.validateRedundantMethods=Si.validateMissingCstMethods=Si.validateVisitor=Si.CstVisitorDefinitionError=Si.createBaseVisitorConstructorWithDefaults=Si.createBaseSemanticVisitorConstructor=Si.defaultVisit=void 0;var ps=Gt(),Nd=ox();function Pq(r,e){for(var t=(0,ps.keys)(r),i=t.length,n=0;n<i;n++)for(var s=t[n],o=r[s],a=o.length,l=0;l<a;l++){var c=o[l];c.tokenTypeIdx===void 0&&this[c.name](c.children,e)}}Si.defaultVisit=Pq;function mye(r,e){var t=function(){};(0,Nd.defineNameProp)(t,r+"BaseSemantics");var i={visit:function(n,s){if((0,ps.isArray)(n)&&(n=n[0]),!(0,ps.isUndefined)(n))return this[n.name](n.children,s)},validateVisitor:function(){var n=Dq(this,e);if(!(0,ps.isEmpty)(n)){var s=(0,ps.map)(n,function(o){return o.msg});throw Error("Errors Detected in CST Visitor <"+(0,Nd.functionName)(this.constructor)+`>:
-	`+(""+s.join(`
-
-`).replace(/\n/g,`
-	`)))}}};return t.prototype=i,t.prototype.constructor=t,t._RULE_NAMES=e,t}Si.createBaseSemanticVisitorConstructor=mye;function Eye(r,e,t){var i=function(){};(0,Nd.defineNameProp)(i,r+"BaseSemanticsWithDefaults");var n=Object.create(t.prototype);return(0,ps.forEach)(e,function(s){n[s]=Pq}),i.prototype=n,i.prototype.constructor=i,i}Si.createBaseVisitorConstructorWithDefaults=Eye;var ax;(function(r){r[r.REDUNDANT_METHOD=0]="REDUNDANT_METHOD",r[r.MISSING_METHOD=1]="MISSING_METHOD"})(ax=Si.CstVisitorDefinitionError||(Si.CstVisitorDefinitionError={}));function Dq(r,e){var t=kq(r,e),i=Rq(r,e);return t.concat(i)}Si.validateVisitor=Dq;function kq(r,e){var t=(0,ps.map)(e,function(i){if(!(0,ps.isFunction)(r[i]))return{msg:"Missing visitor method: <"+i+"> on "+(0,Nd.functionName)(r.constructor)+" CST Visitor.",type:ax.MISSING_METHOD,methodName:i}});return(0,ps.compact)(t)}Si.validateMissingCstMethods=kq;var Iye=["constructor","visit","validateVisitor"];function Rq(r,e){var t=[];for(var i in r)(0,ps.isFunction)(r[i])&&!(0,ps.contains)(Iye,i)&&!(0,ps.contains)(e,i)&&t.push({msg:"Redundant visitor method: <"+i+"> on "+(0,Nd.functionName)(r.constructor)+` CST Visitor
-There is no Grammar Rule corresponding to this method's name.
-`,type:ax.REDUNDANT_METHOD,methodName:i});return t}Si.validateRedundantMethods=Rq});var Tq=w(Ey=>{"use strict";Object.defineProperty(Ey,"__esModule",{value:!0});Ey.TreeBuilder=void 0;var sf=Sq(),_r=Gt(),Nq=Fq(),yye=jn(),wye=function(){function r(){}return r.prototype.initTreeBuilder=function(e){if(this.CST_STACK=[],this.outputCst=e.outputCst,this.nodeLocationTracking=(0,_r.has)(e,"nodeLocationTracking")?e.nodeLocationTracking:yye.DEFAULT_PARSER_CONFIG.nodeLocationTracking,!this.outputCst)this.cstInvocationStateUpdate=_r.NOOP,this.cstFinallyStateUpdate=_r.NOOP,this.cstPostTerminal=_r.NOOP,this.cstPostNonTerminal=_r.NOOP,this.cstPostRule=_r.NOOP;else if(/full/i.test(this.nodeLocationTracking))this.recoveryEnabled?(this.setNodeLocationFromToken=sf.setNodeLocationFull,this.setNodeLocationFromNode=sf.setNodeLocationFull,this.cstPostRule=_r.NOOP,this.setInitialNodeLocation=this.setInitialNodeLocationFullRecovery):(this.setNodeLocationFromToken=_r.NOOP,this.setNodeLocationFromNode=_r.NOOP,this.cstPostRule=this.cstPostRuleFull,this.setInitialNodeLocation=this.setInitialNodeLocationFullRegular);else if(/onlyOffset/i.test(this.nodeLocationTracking))this.recoveryEnabled?(this.setNodeLocationFromToken=sf.setNodeLocationOnlyOffset,this.setNodeLocationFromNode=sf.setNodeLocationOnlyOffset,this.cstPostRule=_r.NOOP,this.setInitialNodeLocation=this.setInitialNodeLocationOnlyOffsetRecovery):(this.setNodeLocationFromToken=_r.NOOP,this.setNodeLocationFromNode=_r.NOOP,this.cstPostRule=this.cstPostRuleOnlyOffset,this.setInitialNodeLocation=this.setInitialNodeLocationOnlyOffsetRegular);else if(/none/i.test(this.nodeLocationTracking))this.setNodeLocationFromToken=_r.NOOP,this.setNodeLocationFromNode=_r.NOOP,this.cstPostRule=_r.NOOP,this.setInitialNodeLocation=_r.NOOP;else throw Error('Invalid <nodeLocationTracking> config option: "'+e.nodeLocationTracking+'"')},r.prototype.setInitialNodeLocationOnlyOffsetRecovery=function(e){e.location={startOffset:NaN,endOffset:NaN}},r.prototype.setInitialNodeLocationOnlyOffsetRegular=function(e){e.location={startOffset:this.LA(1).startOffset,endOffset:NaN}},r.prototype.setInitialNodeLocationFullRecovery=function(e){e.location={startOffset:NaN,startLine:NaN,startColumn:NaN,endOffset:NaN,endLine:NaN,endColumn:NaN}},r.prototype.setInitialNodeLocationFullRegular=function(e){var t=this.LA(1);e.location={startOffset:t.startOffset,startLine:t.startLine,startColumn:t.startColumn,endOffset:NaN,endLine:NaN,endColumn:NaN}},r.prototype.cstInvocationStateUpdate=function(e,t){var i={name:e,children:{}};this.setInitialNodeLocation(i),this.CST_STACK.push(i)},r.prototype.cstFinallyStateUpdate=function(){this.CST_STACK.pop()},r.prototype.cstPostRuleFull=function(e){var t=this.LA(0),i=e.location;i.startOffset<=t.startOffset?(i.endOffset=t.endOffset,i.endLine=t.endLine,i.endColumn=t.endColumn):(i.startOffset=NaN,i.startLine=NaN,i.startColumn=NaN)},r.prototype.cstPostRuleOnlyOffset=function(e){var t=this.LA(0),i=e.location;i.startOffset<=t.startOffset?i.endOffset=t.endOffset:i.startOffset=NaN},r.prototype.cstPostTerminal=function(e,t){var i=this.CST_STACK[this.CST_STACK.length-1];(0,sf.addTerminalToCst)(i,t,e),this.setNodeLocationFromToken(i.location,t)},r.prototype.cstPostNonTerminal=function(e,t){var i=this.CST_STACK[this.CST_STACK.length-1];(0,sf.addNoneTerminalToCst)(i,t,e),this.setNodeLocationFromNode(i.location,e.location)},r.prototype.getBaseCstVisitorConstructor=function(){if((0,_r.isUndefined)(this.baseCstVisitorConstructor)){var e=(0,Nq.createBaseSemanticVisitorConstructor)(this.className,(0,_r.keys)(this.gastProductionsCache));return this.baseCstVisitorConstructor=e,e}return this.baseCstVisitorConstructor},r.prototype.getBaseCstVisitorConstructorWithDefaults=function(){if((0,_r.isUndefined)(this.baseCstVisitorWithDefaultsConstructor)){var e=(0,Nq.createBaseVisitorConstructorWithDefaults)(this.className,(0,_r.keys)(this.gastProductionsCache),this.getBaseCstVisitorConstructor());return this.baseCstVisitorWithDefaultsConstructor=e,e}return this.baseCstVisitorWithDefaultsConstructor},r.prototype.getLastExplicitRuleShortName=function(){var e=this.RULE_STACK;return e[e.length-1]},r.prototype.getPreviousExplicitRuleShortName=function(){var e=this.RULE_STACK;return e[e.length-2]},r.prototype.getLastExplicitRuleOccurrenceIndex=function(){var e=this.RULE_OCCURRENCE_STACK;return e[e.length-1]},r}();Ey.TreeBuilder=wye});var Oq=w(Iy=>{"use strict";Object.defineProperty(Iy,"__esModule",{value:!0});Iy.LexerAdapter=void 0;var Lq=jn(),Bye=function(){function r(){}return r.prototype.initLexerAdapter=function(){this.tokVector=[],this.tokVectorLength=0,this.currIdx=-1},Object.defineProperty(r.prototype,"input",{get:function(){return this.tokVector},set:function(e){if(this.selfAnalysisDone!==!0)throw Error("Missing <performSelfAnalysis> invocation at the end of the Parser's constructor.");this.reset(),this.tokVector=e,this.tokVectorLength=e.length},enumerable:!1,configurable:!0}),r.prototype.SKIP_TOKEN=function(){return this.currIdx<=this.tokVector.length-2?(this.consumeToken(),this.LA(1)):Lq.END_OF_FILE},r.prototype.LA=function(e){var t=this.currIdx+e;return t<0||this.tokVectorLength<=t?Lq.END_OF_FILE:this.tokVector[t]},r.prototype.consumeToken=function(){this.currIdx++},r.prototype.exportLexerState=function(){return this.currIdx},r.prototype.importLexerState=function(e){this.currIdx=e},r.prototype.resetLexerState=function(){this.currIdx=-1},r.prototype.moveToTerminatedState=function(){this.currIdx=this.tokVector.length-1},r.prototype.getLexerPosition=function(){return this.exportLexerState()},r}();Iy.LexerAdapter=Bye});var Kq=w(yy=>{"use strict";Object.defineProperty(yy,"__esModule",{value:!0});yy.RecognizerApi=void 0;var Mq=Gt(),bye=nf(),Ax=jn(),Qye=xd(),Sye=rx(),vye=mn(),xye=function(){function r(){}return r.prototype.ACTION=function(e){return e.call(this)},r.prototype.consume=function(e,t,i){return this.consumeInternal(t,e,i)},r.prototype.subrule=function(e,t,i){return this.subruleInternal(t,e,i)},r.prototype.option=function(e,t){return this.optionInternal(t,e)},r.prototype.or=function(e,t){return this.orInternal(t,e)},r.prototype.many=function(e,t){return this.manyInternal(e,t)},r.prototype.atLeastOne=function(e,t){return this.atLeastOneInternal(e,t)},r.prototype.CONSUME=function(e,t){return this.consumeInternal(e,0,t)},r.prototype.CONSUME1=function(e,t){return this.consumeInternal(e,1,t)},r.prototype.CONSUME2=function(e,t){return this.consumeInternal(e,2,t)},r.prototype.CONSUME3=function(e,t){return this.consumeInternal(e,3,t)},r.prototype.CONSUME4=function(e,t){return this.consumeInternal(e,4,t)},r.prototype.CONSUME5=function(e,t){return this.consumeInternal(e,5,t)},r.prototype.CONSUME6=function(e,t){return this.consumeInternal(e,6,t)},r.prototype.CONSUME7=function(e,t){return this.consumeInternal(e,7,t)},r.prototype.CONSUME8=function(e,t){return this.consumeInternal(e,8,t)},r.prototype.CONSUME9=function(e,t){return this.consumeInternal(e,9,t)},r.prototype.SUBRULE=function(e,t){return this.subruleInternal(e,0,t)},r.prototype.SUBRULE1=function(e,t){return this.subruleInternal(e,1,t)},r.prototype.SUBRULE2=function(e,t){return this.subruleInternal(e,2,t)},r.prototype.SUBRULE3=function(e,t){return this.subruleInternal(e,3,t)},r.prototype.SUBRULE4=function(e,t){return this.subruleInternal(e,4,t)},r.prototype.SUBRULE5=function(e,t){return this.subruleInternal(e,5,t)},r.prototype.SUBRULE6=function(e,t){return this.subruleInternal(e,6,t)},r.prototype.SUBRULE7=function(e,t){return this.subruleInternal(e,7,t)},r.prototype.SUBRULE8=function(e,t){return this.subruleInternal(e,8,t)},r.prototype.SUBRULE9=function(e,t){return this.subruleInternal(e,9,t)},r.prototype.OPTION=function(e){return this.optionInternal(e,0)},r.prototype.OPTION1=function(e){return this.optionInternal(e,1)},r.prototype.OPTION2=function(e){return this.optionInternal(e,2)},r.prototype.OPTION3=function(e){return this.optionInternal(e,3)},r.prototype.OPTION4=function(e){return this.optionInternal(e,4)},r.prototype.OPTION5=function(e){return this.optionInternal(e,5)},r.prototype.OPTION6=function(e){return this.optionInternal(e,6)},r.prototype.OPTION7=function(e){return this.optionInternal(e,7)},r.prototype.OPTION8=function(e){return this.optionInternal(e,8)},r.prototype.OPTION9=function(e){return this.optionInternal(e,9)},r.prototype.OR=function(e){return this.orInternal(e,0)},r.prototype.OR1=function(e){return this.orInternal(e,1)},r.prototype.OR2=function(e){return this.orInternal(e,2)},r.prototype.OR3=function(e){return this.orInternal(e,3)},r.prototype.OR4=function(e){return this.orInternal(e,4)},r.prototype.OR5=function(e){return this.orInternal(e,5)},r.prototype.OR6=function(e){return this.orInternal(e,6)},r.prototype.OR7=function(e){return this.orInternal(e,7)},r.prototype.OR8=function(e){return this.orInternal(e,8)},r.prototype.OR9=function(e){return this.orInternal(e,9)},r.prototype.MANY=function(e){this.manyInternal(0,e)},r.prototype.MANY1=function(e){this.manyInternal(1,e)},r.prototype.MANY2=function(e){this.manyInternal(2,e)},r.prototype.MANY3=function(e){this.manyInternal(3,e)},r.prototype.MANY4=function(e){this.manyInternal(4,e)},r.prototype.MANY5=function(e){this.manyInternal(5,e)},r.prototype.MANY6=function(e){this.manyInternal(6,e)},r.prototype.MANY7=function(e){this.manyInternal(7,e)},r.prototype.MANY8=function(e){this.manyInternal(8,e)},r.prototype.MANY9=function(e){this.manyInternal(9,e)},r.prototype.MANY_SEP=function(e){this.manySepFirstInternal(0,e)},r.prototype.MANY_SEP1=function(e){this.manySepFirstInternal(1,e)},r.prototype.MANY_SEP2=function(e){this.manySepFirstInternal(2,e)},r.prototype.MANY_SEP3=function(e){this.manySepFirstInternal(3,e)},r.prototype.MANY_SEP4=function(e){this.manySepFirstInternal(4,e)},r.prototype.MANY_SEP5=function(e){this.manySepFirstInternal(5,e)},r.prototype.MANY_SEP6=function(e){this.manySepFirstInternal(6,e)},r.prototype.MANY_SEP7=function(e){this.manySepFirstInternal(7,e)},r.prototype.MANY_SEP8=function(e){this.manySepFirstInternal(8,e)},r.prototype.MANY_SEP9=function(e){this.manySepFirstInternal(9,e)},r.prototype.AT_LEAST_ONE=function(e){this.atLeastOneInternal(0,e)},r.prototype.AT_LEAST_ONE1=function(e){return this.atLeastOneInternal(1,e)},r.prototype.AT_LEAST_ONE2=function(e){this.atLeastOneInternal(2,e)},r.prototype.AT_LEAST_ONE3=function(e){this.atLeastOneInternal(3,e)},r.prototype.AT_LEAST_ONE4=function(e){this.atLeastOneInternal(4,e)},r.prototype.AT_LEAST_ONE5=function(e){this.atLeastOneInternal(5,e)},r.prototype.AT_LEAST_ONE6=function(e){this.atLeastOneInternal(6,e)},r.prototype.AT_LEAST_ONE7=function(e){this.atLeastOneInternal(7,e)},r.prototype.AT_LEAST_ONE8=function(e){this.atLeastOneInternal(8,e)},r.prototype.AT_LEAST_ONE9=function(e){this.atLeastOneInternal(9,e)},r.prototype.AT_LEAST_ONE_SEP=function(e){this.atLeastOneSepFirstInternal(0,e)},r.prototype.AT_LEAST_ONE_SEP1=function(e){this.atLeastOneSepFirstInternal(1,e)},r.prototype.AT_LEAST_ONE_SEP2=function(e){this.atLeastOneSepFirstInternal(2,e)},r.prototype.AT_LEAST_ONE_SEP3=function(e){this.atLeastOneSepFirstInternal(3,e)},r.prototype.AT_LEAST_ONE_SEP4=function(e){this.atLeastOneSepFirstInternal(4,e)},r.prototype.AT_LEAST_ONE_SEP5=function(e){this.atLeastOneSepFirstInternal(5,e)},r.prototype.AT_LEAST_ONE_SEP6=function(e){this.atLeastOneSepFirstInternal(6,e)},r.prototype.AT_LEAST_ONE_SEP7=function(e){this.atLeastOneSepFirstInternal(7,e)},r.prototype.AT_LEAST_ONE_SEP8=function(e){this.atLeastOneSepFirstInternal(8,e)},r.prototype.AT_LEAST_ONE_SEP9=function(e){this.atLeastOneSepFirstInternal(9,e)},r.prototype.RULE=function(e,t,i){if(i===void 0&&(i=Ax.DEFAULT_RULE_CONFIG),(0,Mq.contains)(this.definedRulesNames,e)){var n=Qye.defaultGrammarValidatorErrorProvider.buildDuplicateRuleNameError({topLevelRule:e,grammarName:this.className}),s={message:n,type:Ax.ParserDefinitionErrorType.DUPLICATE_RULE_NAME,ruleName:e};this.definitionErrors.push(s)}this.definedRulesNames.push(e);var o=this.defineRule(e,t,i);return this[e]=o,o},r.prototype.OVERRIDE_RULE=function(e,t,i){i===void 0&&(i=Ax.DEFAULT_RULE_CONFIG);var n=[];n=n.concat((0,Sye.validateRuleIsOverridden)(e,this.definedRulesNames,this.className)),this.definitionErrors=this.definitionErrors.concat(n);var s=this.defineRule(e,t,i);return this[e]=s,s},r.prototype.BACKTRACK=function(e,t){return function(){this.isBackTrackingStack.push(1);var i=this.saveRecogState();try{return e.apply(this,t),!0}catch(n){if((0,bye.isRecognitionException)(n))return!1;throw n}finally{this.reloadRecogState(i),this.isBackTrackingStack.pop()}}},r.prototype.getGAstProductions=function(){return this.gastProductionsCache},r.prototype.getSerializedGastProductions=function(){return(0,vye.serializeGrammar)((0,Mq.values)(this.gastProductionsCache))},r}();yy.RecognizerApi=xye});var Yq=w(By=>{"use strict";Object.defineProperty(By,"__esModule",{value:!0});By.RecognizerEngine=void 0;var Pr=Gt(),qn=Cy(),wy=nf(),Uq=kd(),of=Dd(),Hq=jn(),Pye=sx(),Gq=TA(),Td=_g(),Dye=ox(),kye=function(){function r(){}return r.prototype.initRecognizerEngine=function(e,t){if(this.className=(0,Dye.classNameFromInstance)(this),this.shortRuleNameToFull={},this.fullRuleNameToShort={},this.ruleShortNameIdx=256,this.tokenMatcher=Td.tokenStructuredMatcherNoCategories,this.definedRulesNames=[],this.tokensMap={},this.isBackTrackingStack=[],this.RULE_STACK=[],this.RULE_OCCURRENCE_STACK=[],this.gastProductionsCache={},(0,Pr.has)(t,"serializedGrammar"))throw Error(`The Parser's configuration can no longer contain a <serializedGrammar> property.
-	See: https://chevrotain.io/docs/changes/BREAKING_CHANGES.html#_6-0-0
-	For Further details.`);if((0,Pr.isArray)(e)){if((0,Pr.isEmpty)(e))throw Error(`A Token Vocabulary cannot be empty.
-	Note that the first argument for the parser constructor
-	is no longer a Token vector (since v4.0).`);if(typeof e[0].startOffset=="number")throw Error(`The Parser constructor no longer accepts a token vector as the first argument.
-	See: https://chevrotain.io/docs/changes/BREAKING_CHANGES.html#_4-0-0
-	For Further details.`)}if((0,Pr.isArray)(e))this.tokensMap=(0,Pr.reduce)(e,function(o,a){return o[a.name]=a,o},{});else if((0,Pr.has)(e,"modes")&&(0,Pr.every)((0,Pr.flatten)((0,Pr.values)(e.modes)),Td.isTokenType)){var i=(0,Pr.flatten)((0,Pr.values)(e.modes)),n=(0,Pr.uniq)(i);this.tokensMap=(0,Pr.reduce)(n,function(o,a){return o[a.name]=a,o},{})}else if((0,Pr.isObject)(e))this.tokensMap=(0,Pr.cloneObj)(e);else throw new Error("<tokensDictionary> argument must be An Array of Token constructors, A dictionary of Token constructors or an IMultiModeLexerDefinition");this.tokensMap.EOF=Gq.EOF;var s=(0,Pr.every)((0,Pr.values)(e),function(o){return(0,Pr.isEmpty)(o.categoryMatches)});this.tokenMatcher=s?Td.tokenStructuredMatcherNoCategories:Td.tokenStructuredMatcher,(0,Td.augmentTokenTypes)((0,Pr.values)(this.tokensMap))},r.prototype.defineRule=function(e,t,i){if(this.selfAnalysisDone)throw Error("Grammar rule <"+e+`> may not be defined after the 'performSelfAnalysis' method has been called'
-Make sure that all grammar rule definitions are done before 'performSelfAnalysis' is called.`);var n=(0,Pr.has)(i,"resyncEnabled")?i.resyncEnabled:Hq.DEFAULT_RULE_CONFIG.resyncEnabled,s=(0,Pr.has)(i,"recoveryValueFunc")?i.recoveryValueFunc:Hq.DEFAULT_RULE_CONFIG.recoveryValueFunc,o=this.ruleShortNameIdx<<qn.BITS_FOR_METHOD_TYPE+qn.BITS_FOR_OCCURRENCE_IDX;this.ruleShortNameIdx++,this.shortRuleNameToFull[o]=e,this.fullRuleNameToShort[e]=o;function a(u){try{if(this.outputCst===!0){t.apply(this,u);var g=this.CST_STACK[this.CST_STACK.length-1];return this.cstPostRule(g),g}else return t.apply(this,u)}catch(f){return this.invokeRuleCatch(f,n,s)}finally{this.ruleFinallyStateUpdate()}}var l=function(u,g){return u===void 0&&(u=0),this.ruleInvocationStateUpdate(o,e,u),a.call(this,g)},c="ruleName";return l[c]=e,l.originalGrammarAction=t,l},r.prototype.invokeRuleCatch=function(e,t,i){var n=this.RULE_STACK.length===1,s=t&&!this.isBackTracking()&&this.recoveryEnabled;if((0,wy.isRecognitionException)(e)){var o=e;if(s){var a=this.findReSyncTokenType();if(this.isInCurrentRuleReSyncSet(a))if(o.resyncedTokens=this.reSyncTo(a),this.outputCst){var l=this.CST_STACK[this.CST_STACK.length-1];return l.recoveredNode=!0,l}else return i();else{if(this.outputCst){var l=this.CST_STACK[this.CST_STACK.length-1];l.recoveredNode=!0,o.partialCstResult=l}throw o}}else{if(n)return this.moveToTerminatedState(),i();throw o}}else throw e},r.prototype.optionInternal=function(e,t){var i=this.getKeyForAutomaticLookahead(qn.OPTION_IDX,t);return this.optionInternalLogic(e,t,i)},r.prototype.optionInternalLogic=function(e,t,i){var n=this,s=this.getLaFuncFromCache(i),o,a;if(e.DEF!==void 0){if(o=e.DEF,a=e.GATE,a!==void 0){var l=s;s=function(){return a.call(n)&&l.call(n)}}}else o=e;if(s.call(this)===!0)return o.call(this)},r.prototype.atLeastOneInternal=function(e,t){var i=this.getKeyForAutomaticLookahead(qn.AT_LEAST_ONE_IDX,e);return this.atLeastOneInternalLogic(e,t,i)},r.prototype.atLeastOneInternalLogic=function(e,t,i){var n=this,s=this.getLaFuncFromCache(i),o,a;if(t.DEF!==void 0){if(o=t.DEF,a=t.GATE,a!==void 0){var l=s;s=function(){return a.call(n)&&l.call(n)}}}else o=t;if(s.call(this)===!0)for(var c=this.doSingleRepetition(o);s.call(this)===!0&&c===!0;)c=this.doSingleRepetition(o);else throw this.raiseEarlyExitException(e,Uq.PROD_TYPE.REPETITION_MANDATORY,t.ERR_MSG);this.attemptInRepetitionRecovery(this.atLeastOneInternal,[e,t],s,qn.AT_LEAST_ONE_IDX,e,of.NextTerminalAfterAtLeastOneWalker)},r.prototype.atLeastOneSepFirstInternal=function(e,t){var i=this.getKeyForAutomaticLookahead(qn.AT_LEAST_ONE_SEP_IDX,e);this.atLeastOneSepFirstInternalLogic(e,t,i)},r.prototype.atLeastOneSepFirstInternalLogic=function(e,t,i){var n=this,s=t.DEF,o=t.SEP,a=this.getLaFuncFromCache(i);if(a.call(this)===!0){s.call(this);for(var l=function(){return n.tokenMatcher(n.LA(1),o)};this.tokenMatcher(this.LA(1),o)===!0;)this.CONSUME(o),s.call(this);this.attemptInRepetitionRecovery(this.repetitionSepSecondInternal,[e,o,l,s,of.NextTerminalAfterAtLeastOneSepWalker],l,qn.AT_LEAST_ONE_SEP_IDX,e,of.NextTerminalAfterAtLeastOneSepWalker)}else throw this.raiseEarlyExitException(e,Uq.PROD_TYPE.REPETITION_MANDATORY_WITH_SEPARATOR,t.ERR_MSG)},r.prototype.manyInternal=function(e,t){var i=this.getKeyForAutomaticLookahead(qn.MANY_IDX,e);return this.manyInternalLogic(e,t,i)},r.prototype.manyInternalLogic=function(e,t,i){var n=this,s=this.getLaFuncFromCache(i),o,a;if(t.DEF!==void 0){if(o=t.DEF,a=t.GATE,a!==void 0){var l=s;s=function(){return a.call(n)&&l.call(n)}}}else o=t;for(var c=!0;s.call(this)===!0&&c===!0;)c=this.doSingleRepetition(o);this.attemptInRepetitionRecovery(this.manyInternal,[e,t],s,qn.MANY_IDX,e,of.NextTerminalAfterManyWalker,c)},r.prototype.manySepFirstInternal=function(e,t){var i=this.getKeyForAutomaticLookahead(qn.MANY_SEP_IDX,e);this.manySepFirstInternalLogic(e,t,i)},r.prototype.manySepFirstInternalLogic=function(e,t,i){var n=this,s=t.DEF,o=t.SEP,a=this.getLaFuncFromCache(i);if(a.call(this)===!0){s.call(this);for(var l=function(){return n.tokenMatcher(n.LA(1),o)};this.tokenMatcher(this.LA(1),o)===!0;)this.CONSUME(o),s.call(this);this.attemptInRepetitionRecovery(this.repetitionSepSecondInternal,[e,o,l,s,of.NextTerminalAfterManySepWalker],l,qn.MANY_SEP_IDX,e,of.NextTerminalAfterManySepWalker)}},r.prototype.repetitionSepSecondInternal=function(e,t,i,n,s){for(;i();)this.CONSUME(t),n.call(this);this.attemptInRepetitionRecovery(this.repetitionSepSecondInternal,[e,t,i,n,s],i,qn.AT_LEAST_ONE_SEP_IDX,e,s)},r.prototype.doSingleRepetition=function(e){var t=this.getLexerPosition();e.call(this);var i=this.getLexerPosition();return i>t},r.prototype.orInternal=function(e,t){var i=this.getKeyForAutomaticLookahead(qn.OR_IDX,t),n=(0,Pr.isArray)(e)?e:e.DEF,s=this.getLaFuncFromCache(i),o=s.call(this,n);if(o!==void 0){var a=n[o];return a.ALT.call(this)}this.raiseNoAltException(t,e.ERR_MSG)},r.prototype.ruleFinallyStateUpdate=function(){if(this.RULE_STACK.pop(),this.RULE_OCCURRENCE_STACK.pop(),this.cstFinallyStateUpdate(),this.RULE_STACK.length===0&&this.isAtEndOfInput()===!1){var e=this.LA(1),t=this.errorMessageProvider.buildNotAllInputParsedMessage({firstRedundant:e,ruleName:this.getCurrRuleFullName()});this.SAVE_ERROR(new wy.NotAllInputParsedException(t,e))}},r.prototype.subruleInternal=function(e,t,i){var n;try{var s=i!==void 0?i.ARGS:void 0;return n=e.call(this,t,s),this.cstPostNonTerminal(n,i!==void 0&&i.LABEL!==void 0?i.LABEL:e.ruleName),n}catch(o){this.subruleInternalError(o,i,e.ruleName)}},r.prototype.subruleInternalError=function(e,t,i){throw(0,wy.isRecognitionException)(e)&&e.partialCstResult!==void 0&&(this.cstPostNonTerminal(e.partialCstResult,t!==void 0&&t.LABEL!==void 0?t.LABEL:i),delete e.partialCstResult),e},r.prototype.consumeInternal=function(e,t,i){var n;try{var s=this.LA(1);this.tokenMatcher(s,e)===!0?(this.consumeToken(),n=s):this.consumeInternalError(e,s,i)}catch(o){n=this.consumeInternalRecovery(e,t,o)}return this.cstPostTerminal(i!==void 0&&i.LABEL!==void 0?i.LABEL:e.name,n),n},r.prototype.consumeInternalError=function(e,t,i){var n,s=this.LA(0);throw i!==void 0&&i.ERR_MSG?n=i.ERR_MSG:n=this.errorMessageProvider.buildMismatchTokenMessage({expected:e,actual:t,previous:s,ruleName:this.getCurrRuleFullName()}),this.SAVE_ERROR(new wy.MismatchedTokenException(n,t,s))},r.prototype.consumeInternalRecovery=function(e,t,i){if(this.recoveryEnabled&&i.name==="MismatchedTokenException"&&!this.isBackTracking()){var n=this.getFollowsForInRuleRecovery(e,t);try{return this.tryInRuleRecovery(e,n)}catch(s){throw s.name===Pye.IN_RULE_RECOVERY_EXCEPTION?i:s}}else throw i},r.prototype.saveRecogState=function(){var e=this.errors,t=(0,Pr.cloneArr)(this.RULE_STACK);return{errors:e,lexerState:this.exportLexerState(),RULE_STACK:t,CST_STACK:this.CST_STACK}},r.prototype.reloadRecogState=function(e){this.errors=e.errors,this.importLexerState(e.lexerState),this.RULE_STACK=e.RULE_STACK},r.prototype.ruleInvocationStateUpdate=function(e,t,i){this.RULE_OCCURRENCE_STACK.push(i),this.RULE_STACK.push(e),this.cstInvocationStateUpdate(t,e)},r.prototype.isBackTracking=function(){return this.isBackTrackingStack.length!==0},r.prototype.getCurrRuleFullName=function(){var e=this.getLastExplicitRuleShortName();return this.shortRuleNameToFull[e]},r.prototype.shortRuleNameToFullName=function(e){return this.shortRuleNameToFull[e]},r.prototype.isAtEndOfInput=function(){return this.tokenMatcher(this.LA(1),Gq.EOF)},r.prototype.reset=function(){this.resetLexerState(),this.isBackTrackingStack=[],this.errors=[],this.RULE_STACK=[],this.CST_STACK=[],this.RULE_OCCURRENCE_STACK=[]},r}();By.RecognizerEngine=kye});var qq=w(by=>{"use strict";Object.defineProperty(by,"__esModule",{value:!0});by.ErrorHandler=void 0;var lx=nf(),cx=Gt(),jq=kd(),Rye=jn(),Fye=function(){function r(){}return r.prototype.initErrorHandler=function(e){this._errors=[],this.errorMessageProvider=(0,cx.has)(e,"errorMessageProvider")?e.errorMessageProvider:Rye.DEFAULT_PARSER_CONFIG.errorMessageProvider},r.prototype.SAVE_ERROR=function(e){if((0,lx.isRecognitionException)(e))return e.context={ruleStack:this.getHumanReadableRuleStack(),ruleOccurrenceStack:(0,cx.cloneArr)(this.RULE_OCCURRENCE_STACK)},this._errors.push(e),e;throw Error("Trying to save an Error which is not a RecognitionException")},Object.defineProperty(r.prototype,"errors",{get:function(){return(0,cx.cloneArr)(this._errors)},set:function(e){this._errors=e},enumerable:!1,configurable:!0}),r.prototype.raiseEarlyExitException=function(e,t,i){for(var n=this.getCurrRuleFullName(),s=this.getGAstProductions()[n],o=(0,jq.getLookaheadPathsForOptionalProd)(e,s,t,this.maxLookahead),a=o[0],l=[],c=1;c<=this.maxLookahead;c++)l.push(this.LA(c));var u=this.errorMessageProvider.buildEarlyExitMessage({expectedIterationPaths:a,actual:l,previous:this.LA(0),customUserDescription:i,ruleName:n});throw this.SAVE_ERROR(new lx.EarlyExitException(u,this.LA(1),this.LA(0)))},r.prototype.raiseNoAltException=function(e,t){for(var i=this.getCurrRuleFullName(),n=this.getGAstProductions()[i],s=(0,jq.getLookaheadPathsForOr)(e,n,this.maxLookahead),o=[],a=1;a<=this.maxLookahead;a++)o.push(this.LA(a));var l=this.LA(0),c=this.errorMessageProvider.buildNoViableAltMessage({expectedPathsPerAlt:s,actual:o,previous:l,customUserDescription:t,ruleName:this.getCurrRuleFullName()});throw this.SAVE_ERROR(new lx.NoViableAltException(c,this.LA(1),l))},r}();by.ErrorHandler=Fye});var zq=w(Qy=>{"use strict";Object.defineProperty(Qy,"__esModule",{value:!0});Qy.ContentAssist=void 0;var Jq=Dd(),Wq=Gt(),Nye=function(){function r(){}return r.prototype.initContentAssist=function(){},r.prototype.computeContentAssist=function(e,t){var i=this.gastProductionsCache[e];if((0,Wq.isUndefined)(i))throw Error("Rule ->"+e+"<- does not exist in this grammar.");return(0,Jq.nextPossibleTokensAfter)([i],t,this.tokenMatcher,this.maxLookahead)},r.prototype.getNextPossibleTokenTypes=function(e){var t=(0,Wq.first)(e.ruleStack),i=this.getGAstProductions(),n=i[t],s=new Jq.NextAfterTokenWalker(n,e).startWalking();return s},r}();Qy.ContentAssist=Nye});var rJ=w(xy=>{"use strict";Object.defineProperty(xy,"__esModule",{value:!0});xy.GastRecorder=void 0;var yn=Gt(),Oo=mn(),Tye=Bd(),_q=_g(),$q=TA(),Lye=jn(),Oye=Cy(),vy={description:"This Object indicates the Parser is during Recording Phase"};Object.freeze(vy);var Vq=!0,Xq=Math.pow(2,Oye.BITS_FOR_OCCURRENCE_IDX)-1,eJ=(0,$q.createToken)({name:"RECORDING_PHASE_TOKEN",pattern:Tye.Lexer.NA});(0,_q.augmentTokenTypes)([eJ]);var tJ=(0,$q.createTokenInstance)(eJ,`This IToken indicates the Parser is in Recording Phase
-	See: https://chevrotain.io/docs/guide/internals.html#grammar-recording for details`,-1,-1,-1,-1,-1,-1);Object.freeze(tJ);var Mye={name:`This CSTNode indicates the Parser is in Recording Phase
-	See: https://chevrotain.io/docs/guide/internals.html#grammar-recording for details`,children:{}},Kye=function(){function r(){}return r.prototype.initGastRecorder=function(e){this.recordingProdStack=[],this.RECORDING_PHASE=!1},r.prototype.enableRecording=function(){var e=this;this.RECORDING_PHASE=!0,this.TRACE_INIT("Enable Recording",function(){for(var t=function(n){var s=n>0?n:"";e["CONSUME"+s]=function(o,a){return this.consumeInternalRecord(o,n,a)},e["SUBRULE"+s]=function(o,a){return this.subruleInternalRecord(o,n,a)},e["OPTION"+s]=function(o){return this.optionInternalRecord(o,n)},e["OR"+s]=function(o){return this.orInternalRecord(o,n)},e["MANY"+s]=function(o){this.manyInternalRecord(n,o)},e["MANY_SEP"+s]=function(o){this.manySepFirstInternalRecord(n,o)},e["AT_LEAST_ONE"+s]=function(o){this.atLeastOneInternalRecord(n,o)},e["AT_LEAST_ONE_SEP"+s]=function(o){this.atLeastOneSepFirstInternalRecord(n,o)}},i=0;i<10;i++)t(i);e.consume=function(n,s,o){return this.consumeInternalRecord(s,n,o)},e.subrule=function(n,s,o){return this.subruleInternalRecord(s,n,o)},e.option=function(n,s){return this.optionInternalRecord(s,n)},e.or=function(n,s){return this.orInternalRecord(s,n)},e.many=function(n,s){this.manyInternalRecord(n,s)},e.atLeastOne=function(n,s){this.atLeastOneInternalRecord(n,s)},e.ACTION=e.ACTION_RECORD,e.BACKTRACK=e.BACKTRACK_RECORD,e.LA=e.LA_RECORD})},r.prototype.disableRecording=function(){var e=this;this.RECORDING_PHASE=!1,this.TRACE_INIT("Deleting Recording methods",function(){for(var t=0;t<10;t++){var i=t>0?t:"";delete e["CONSUME"+i],delete e["SUBRULE"+i],delete e["OPTION"+i],delete e["OR"+i],delete e["MANY"+i],delete e["MANY_SEP"+i],delete e["AT_LEAST_ONE"+i],delete e["AT_LEAST_ONE_SEP"+i]}delete e.consume,delete e.subrule,delete e.option,delete e.or,delete e.many,delete e.atLeastOne,delete e.ACTION,delete e.BACKTRACK,delete e.LA})},r.prototype.ACTION_RECORD=function(e){},r.prototype.BACKTRACK_RECORD=function(e,t){return function(){return!0}},r.prototype.LA_RECORD=function(e){return Lye.END_OF_FILE},r.prototype.topLevelRuleRecord=function(e,t){try{var i=new Oo.Rule({definition:[],name:e});return i.name=e,this.recordingProdStack.push(i),t.call(this),this.recordingProdStack.pop(),i}catch(n){if(n.KNOWN_RECORDER_ERROR!==!0)try{n.message=n.message+`
-	 This error was thrown during the "grammar recording phase" For more info see:
-	https://chevrotain.io/docs/guide/internals.html#grammar-recording`}catch{throw n}throw n}},r.prototype.optionInternalRecord=function(e,t){return Ld.call(this,Oo.Option,e,t)},r.prototype.atLeastOneInternalRecord=function(e,t){Ld.call(this,Oo.RepetitionMandatory,t,e)},r.prototype.atLeastOneSepFirstInternalRecord=function(e,t){Ld.call(this,Oo.RepetitionMandatoryWithSeparator,t,e,Vq)},r.prototype.manyInternalRecord=function(e,t){Ld.call(this,Oo.Repetition,t,e)},r.prototype.manySepFirstInternalRecord=function(e,t){Ld.call(this,Oo.RepetitionWithSeparator,t,e,Vq)},r.prototype.orInternalRecord=function(e,t){return Uye.call(this,e,t)},r.prototype.subruleInternalRecord=function(e,t,i){if(Sy(t),!e||(0,yn.has)(e,"ruleName")===!1){var n=new Error("<SUBRULE"+Zq(t)+"> argument is invalid"+(" expecting a Parser method reference but got: <"+JSON.stringify(e)+">")+(`
- inside top level rule: <`+this.recordingProdStack[0].name+">"));throw n.KNOWN_RECORDER_ERROR=!0,n}var s=(0,yn.peek)(this.recordingProdStack),o=e.ruleName,a=new Oo.NonTerminal({idx:t,nonTerminalName:o,label:i==null?void 0:i.LABEL,referencedRule:void 0});return s.definition.push(a),this.outputCst?Mye:vy},r.prototype.consumeInternalRecord=function(e,t,i){if(Sy(t),!(0,_q.hasShortKeyProperty)(e)){var n=new Error("<CONSUME"+Zq(t)+"> argument is invalid"+(" expecting a TokenType reference but got: <"+JSON.stringify(e)+">")+(`
- inside top level rule: <`+this.recordingProdStack[0].name+">"));throw n.KNOWN_RECORDER_ERROR=!0,n}var s=(0,yn.peek)(this.recordingProdStack),o=new Oo.Terminal({idx:t,terminalType:e,label:i==null?void 0:i.LABEL});return s.definition.push(o),tJ},r}();xy.GastRecorder=Kye;function Ld(r,e,t,i){i===void 0&&(i=!1),Sy(t);var n=(0,yn.peek)(this.recordingProdStack),s=(0,yn.isFunction)(e)?e:e.DEF,o=new r({definition:[],idx:t});return i&&(o.separator=e.SEP),(0,yn.has)(e,"MAX_LOOKAHEAD")&&(o.maxLookahead=e.MAX_LOOKAHEAD),this.recordingProdStack.push(o),s.call(this),n.definition.push(o),this.recordingProdStack.pop(),vy}function Uye(r,e){var t=this;Sy(e);var i=(0,yn.peek)(this.recordingProdStack),n=(0,yn.isArray)(r)===!1,s=n===!1?r:r.DEF,o=new Oo.Alternation({definition:[],idx:e,ignoreAmbiguities:n&&r.IGNORE_AMBIGUITIES===!0});(0,yn.has)(r,"MAX_LOOKAHEAD")&&(o.maxLookahead=r.MAX_LOOKAHEAD);var a=(0,yn.some)(s,function(l){return(0,yn.isFunction)(l.GATE)});return o.hasPredicates=a,i.definition.push(o),(0,yn.forEach)(s,function(l){var c=new Oo.Alternative({definition:[]});o.definition.push(c),(0,yn.has)(l,"IGNORE_AMBIGUITIES")?c.ignoreAmbiguities=l.IGNORE_AMBIGUITIES:(0,yn.has)(l,"GATE")&&(c.ignoreAmbiguities=!0),t.recordingProdStack.push(c),l.ALT.call(t),t.recordingProdStack.pop()}),vy}function Zq(r){return r===0?"":""+r}function Sy(r){if(r<0||r>Xq){var e=new Error("Invalid DSL Method idx value: <"+r+`>
-	`+("Idx value must be a none negative value smaller than "+(Xq+1)));throw e.KNOWN_RECORDER_ERROR=!0,e}}});var nJ=w(Py=>{"use strict";Object.defineProperty(Py,"__esModule",{value:!0});Py.PerformanceTracer=void 0;var iJ=Gt(),Hye=jn(),Gye=function(){function r(){}return r.prototype.initPerformanceTracer=function(e){if((0,iJ.has)(e,"traceInitPerf")){var t=e.traceInitPerf,i=typeof t=="number";this.traceInitMaxIdent=i?t:1/0,this.traceInitPerf=i?t>0:t}else this.traceInitMaxIdent=0,this.traceInitPerf=Hye.DEFAULT_PARSER_CONFIG.traceInitPerf;this.traceInitIndent=-1},r.prototype.TRACE_INIT=function(e,t){if(this.traceInitPerf===!0){this.traceInitIndent++;var i=new Array(this.traceInitIndent+1).join("	");this.traceInitIndent<this.traceInitMaxIdent&&console.log(i+"--> <"+e+">");var n=(0,iJ.timer)(t),s=n.time,o=n.value,a=s>10?console.warn:console.log;return this.traceInitIndent<this.traceInitMaxIdent&&a(i+"<-- <"+e+"> time: "+s+"ms"),this.traceInitIndent--,o}else return t()},r}();Py.PerformanceTracer=Gye});var sJ=w(Dy=>{"use strict";Object.defineProperty(Dy,"__esModule",{value:!0});Dy.applyMixins=void 0;function Yye(r,e){e.forEach(function(t){var i=t.prototype;Object.getOwnPropertyNames(i).forEach(function(n){if(n!=="constructor"){var s=Object.getOwnPropertyDescriptor(i,n);s&&(s.get||s.set)?Object.defineProperty(r.prototype,n,s):r.prototype[n]=t.prototype[n]}})})}Dy.applyMixins=Yye});var jn=w(dr=>{"use strict";var AJ=dr&&dr.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(dr,"__esModule",{value:!0});dr.EmbeddedActionsParser=dr.CstParser=dr.Parser=dr.EMPTY_ALT=dr.ParserDefinitionErrorType=dr.DEFAULT_RULE_CONFIG=dr.DEFAULT_PARSER_CONFIG=dr.END_OF_FILE=void 0;var en=Gt(),jye=qj(),oJ=TA(),lJ=xd(),aJ=Cq(),qye=sx(),Jye=Qq(),Wye=Tq(),zye=Oq(),Vye=Kq(),Xye=Yq(),Zye=qq(),_ye=zq(),$ye=rJ(),ewe=nJ(),twe=sJ();dr.END_OF_FILE=(0,oJ.createTokenInstance)(oJ.EOF,"",NaN,NaN,NaN,NaN,NaN,NaN);Object.freeze(dr.END_OF_FILE);dr.DEFAULT_PARSER_CONFIG=Object.freeze({recoveryEnabled:!1,maxLookahead:3,dynamicTokensEnabled:!1,outputCst:!0,errorMessageProvider:lJ.defaultParserErrorProvider,nodeLocationTracking:"none",traceInitPerf:!1,skipValidations:!1});dr.DEFAULT_RULE_CONFIG=Object.freeze({recoveryValueFunc:function(){},resyncEnabled:!0});var rwe;(function(r){r[r.INVALID_RULE_NAME=0]="INVALID_RULE_NAME",r[r.DUPLICATE_RULE_NAME=1]="DUPLICATE_RULE_NAME",r[r.INVALID_RULE_OVERRIDE=2]="INVALID_RULE_OVERRIDE",r[r.DUPLICATE_PRODUCTIONS=3]="DUPLICATE_PRODUCTIONS",r[r.UNRESOLVED_SUBRULE_REF=4]="UNRESOLVED_SUBRULE_REF",r[r.LEFT_RECURSION=5]="LEFT_RECURSION",r[r.NONE_LAST_EMPTY_ALT=6]="NONE_LAST_EMPTY_ALT",r[r.AMBIGUOUS_ALTS=7]="AMBIGUOUS_ALTS",r[r.CONFLICT_TOKENS_RULES_NAMESPACE=8]="CONFLICT_TOKENS_RULES_NAMESPACE",r[r.INVALID_TOKEN_NAME=9]="INVALID_TOKEN_NAME",r[r.NO_NON_EMPTY_LOOKAHEAD=10]="NO_NON_EMPTY_LOOKAHEAD",r[r.AMBIGUOUS_PREFIX_ALTS=11]="AMBIGUOUS_PREFIX_ALTS",r[r.TOO_MANY_ALTS=12]="TOO_MANY_ALTS"})(rwe=dr.ParserDefinitionErrorType||(dr.ParserDefinitionErrorType={}));function iwe(r){return r===void 0&&(r=void 0),function(){return r}}dr.EMPTY_ALT=iwe;var ky=function(){function r(e,t){this.definitionErrors=[],this.selfAnalysisDone=!1;var i=this;if(i.initErrorHandler(t),i.initLexerAdapter(),i.initLooksAhead(t),i.initRecognizerEngine(e,t),i.initRecoverable(t),i.initTreeBuilder(t),i.initContentAssist(),i.initGastRecorder(t),i.initPerformanceTracer(t),(0,en.has)(t,"ignoredIssues"))throw new Error(`The <ignoredIssues> IParserConfig property has been deprecated.
-	Please use the <IGNORE_AMBIGUITIES> flag on the relevant DSL method instead.
-	See: https://chevrotain.io/docs/guide/resolving_grammar_errors.html#IGNORING_AMBIGUITIES
-	For further details.`);this.skipValidations=(0,en.has)(t,"skipValidations")?t.skipValidations:dr.DEFAULT_PARSER_CONFIG.skipValidations}return r.performSelfAnalysis=function(e){throw Error("The **static** `performSelfAnalysis` method has been deprecated.	\nUse the **instance** method with the same name instead.")},r.prototype.performSelfAnalysis=function(){var e=this;this.TRACE_INIT("performSelfAnalysis",function(){var t;e.selfAnalysisDone=!0;var i=e.className;e.TRACE_INIT("toFastProps",function(){(0,en.toFastProperties)(e)}),e.TRACE_INIT("Grammar Recording",function(){try{e.enableRecording(),(0,en.forEach)(e.definedRulesNames,function(s){var o=e[s],a=o.originalGrammarAction,l=void 0;e.TRACE_INIT(s+" Rule",function(){l=e.topLevelRuleRecord(s,a)}),e.gastProductionsCache[s]=l})}finally{e.disableRecording()}});var n=[];if(e.TRACE_INIT("Grammar Resolving",function(){n=(0,aJ.resolveGrammar)({rules:(0,en.values)(e.gastProductionsCache)}),e.definitionErrors=e.definitionErrors.concat(n)}),e.TRACE_INIT("Grammar Validations",function(){if((0,en.isEmpty)(n)&&e.skipValidations===!1){var s=(0,aJ.validateGrammar)({rules:(0,en.values)(e.gastProductionsCache),maxLookahead:e.maxLookahead,tokenTypes:(0,en.values)(e.tokensMap),errMsgProvider:lJ.defaultGrammarValidatorErrorProvider,grammarName:i});e.definitionErrors=e.definitionErrors.concat(s)}}),(0,en.isEmpty)(e.definitionErrors)&&(e.recoveryEnabled&&e.TRACE_INIT("computeAllProdsFollows",function(){var s=(0,jye.computeAllProdsFollows)((0,en.values)(e.gastProductionsCache));e.resyncFollows=s}),e.TRACE_INIT("ComputeLookaheadFunctions",function(){e.preComputeLookaheadFunctions((0,en.values)(e.gastProductionsCache))})),!r.DEFER_DEFINITION_ERRORS_HANDLING&&!(0,en.isEmpty)(e.definitionErrors))throw t=(0,en.map)(e.definitionErrors,function(s){return s.message}),new Error(`Parser Definition Errors detected:
- `+t.join(`
--------------------------------
-`))})},r.DEFER_DEFINITION_ERRORS_HANDLING=!1,r}();dr.Parser=ky;(0,twe.applyMixins)(ky,[qye.Recoverable,Jye.LooksAhead,Wye.TreeBuilder,zye.LexerAdapter,Xye.RecognizerEngine,Vye.RecognizerApi,Zye.ErrorHandler,_ye.ContentAssist,$ye.GastRecorder,ewe.PerformanceTracer]);var nwe=function(r){AJ(e,r);function e(t,i){i===void 0&&(i=dr.DEFAULT_PARSER_CONFIG);var n=this,s=(0,en.cloneObj)(i);return s.outputCst=!0,n=r.call(this,t,s)||this,n}return e}(ky);dr.CstParser=nwe;var swe=function(r){AJ(e,r);function e(t,i){i===void 0&&(i=dr.DEFAULT_PARSER_CONFIG);var n=this,s=(0,en.cloneObj)(i);return s.outputCst=!1,n=r.call(this,t,s)||this,n}return e}(ky);dr.EmbeddedActionsParser=swe});var uJ=w(Ry=>{"use strict";Object.defineProperty(Ry,"__esModule",{value:!0});Ry.createSyntaxDiagramsCode=void 0;var cJ=Dv();function owe(r,e){var t=e===void 0?{}:e,i=t.resourceBase,n=i===void 0?"https://unpkg.com/chevrotain@"+cJ.VERSION+"/diagrams/":i,s=t.css,o=s===void 0?"https://unpkg.com/chevrotain@"+cJ.VERSION+"/diagrams/diagrams.css":s,a=`
-<!-- This is a generated file -->
-<!DOCTYPE html>
-<meta charset="utf-8">
-<style>
-  body {
-    background-color: hsl(30, 20%, 95%)
-  }
-</style>
-
-`,l=`
-<link rel='stylesheet' href='`+o+`'>
-`,c=`
-<script src='`+n+`vendor/railroad-diagrams.js'><\/script>
-<script src='`+n+`src/diagrams_builder.js'><\/script>
-<script src='`+n+`src/diagrams_behavior.js'><\/script>
-<script src='`+n+`src/main.js'><\/script>
-`,u=`
-<div id="diagrams" align="center"></div>    
-`,g=`
-<script>
-    window.serializedGrammar = `+JSON.stringify(r,null,"  ")+`;
-<\/script>
-`,f=`
-<script>
-    var diagramsDiv = document.getElementById("diagrams");
-    main.drawDiagramsFromSerializedGrammar(serializedGrammar, diagramsDiv);
-<\/script>
-`;return a+l+c+u+g+f}Ry.createSyntaxDiagramsCode=owe});var hJ=w(We=>{"use strict";Object.defineProperty(We,"__esModule",{value:!0});We.Parser=We.createSyntaxDiagramsCode=We.clearCache=We.GAstVisitor=We.serializeProduction=We.serializeGrammar=We.Terminal=We.Rule=We.RepetitionWithSeparator=We.RepetitionMandatoryWithSeparator=We.RepetitionMandatory=We.Repetition=We.Option=We.NonTerminal=We.Alternative=We.Alternation=We.defaultLexerErrorProvider=We.NoViableAltException=We.NotAllInputParsedException=We.MismatchedTokenException=We.isRecognitionException=We.EarlyExitException=We.defaultParserErrorProvider=We.tokenName=We.tokenMatcher=We.tokenLabel=We.EOF=We.createTokenInstance=We.createToken=We.LexerDefinitionErrorType=We.Lexer=We.EMPTY_ALT=We.ParserDefinitionErrorType=We.EmbeddedActionsParser=We.CstParser=We.VERSION=void 0;var awe=Dv();Object.defineProperty(We,"VERSION",{enumerable:!0,get:function(){return awe.VERSION}});var Fy=jn();Object.defineProperty(We,"CstParser",{enumerable:!0,get:function(){return Fy.CstParser}});Object.defineProperty(We,"EmbeddedActionsParser",{enumerable:!0,get:function(){return Fy.EmbeddedActionsParser}});Object.defineProperty(We,"ParserDefinitionErrorType",{enumerable:!0,get:function(){return Fy.ParserDefinitionErrorType}});Object.defineProperty(We,"EMPTY_ALT",{enumerable:!0,get:function(){return Fy.EMPTY_ALT}});var gJ=Bd();Object.defineProperty(We,"Lexer",{enumerable:!0,get:function(){return gJ.Lexer}});Object.defineProperty(We,"LexerDefinitionErrorType",{enumerable:!0,get:function(){return gJ.LexerDefinitionErrorType}});var af=TA();Object.defineProperty(We,"createToken",{enumerable:!0,get:function(){return af.createToken}});Object.defineProperty(We,"createTokenInstance",{enumerable:!0,get:function(){return af.createTokenInstance}});Object.defineProperty(We,"EOF",{enumerable:!0,get:function(){return af.EOF}});Object.defineProperty(We,"tokenLabel",{enumerable:!0,get:function(){return af.tokenLabel}});Object.defineProperty(We,"tokenMatcher",{enumerable:!0,get:function(){return af.tokenMatcher}});Object.defineProperty(We,"tokenName",{enumerable:!0,get:function(){return af.tokenName}});var Awe=xd();Object.defineProperty(We,"defaultParserErrorProvider",{enumerable:!0,get:function(){return Awe.defaultParserErrorProvider}});var Od=nf();Object.defineProperty(We,"EarlyExitException",{enumerable:!0,get:function(){return Od.EarlyExitException}});Object.defineProperty(We,"isRecognitionException",{enumerable:!0,get:function(){return Od.isRecognitionException}});Object.defineProperty(We,"MismatchedTokenException",{enumerable:!0,get:function(){return Od.MismatchedTokenException}});Object.defineProperty(We,"NotAllInputParsedException",{enumerable:!0,get:function(){return Od.NotAllInputParsedException}});Object.defineProperty(We,"NoViableAltException",{enumerable:!0,get:function(){return Od.NoViableAltException}});var lwe=Uv();Object.defineProperty(We,"defaultLexerErrorProvider",{enumerable:!0,get:function(){return lwe.defaultLexerErrorProvider}});var Mo=mn();Object.defineProperty(We,"Alternation",{enumerable:!0,get:function(){return Mo.Alternation}});Object.defineProperty(We,"Alternative",{enumerable:!0,get:function(){return Mo.Alternative}});Object.defineProperty(We,"NonTerminal",{enumerable:!0,get:function(){return Mo.NonTerminal}});Object.defineProperty(We,"Option",{enumerable:!0,get:function(){return Mo.Option}});Object.defineProperty(We,"Repetition",{enumerable:!0,get:function(){return Mo.Repetition}});Object.defineProperty(We,"RepetitionMandatory",{enumerable:!0,get:function(){return Mo.RepetitionMandatory}});Object.defineProperty(We,"RepetitionMandatoryWithSeparator",{enumerable:!0,get:function(){return Mo.RepetitionMandatoryWithSeparator}});Object.defineProperty(We,"RepetitionWithSeparator",{enumerable:!0,get:function(){return Mo.RepetitionWithSeparator}});Object.defineProperty(We,"Rule",{enumerable:!0,get:function(){return Mo.Rule}});Object.defineProperty(We,"Terminal",{enumerable:!0,get:function(){return Mo.Terminal}});var fJ=mn();Object.defineProperty(We,"serializeGrammar",{enumerable:!0,get:function(){return fJ.serializeGrammar}});Object.defineProperty(We,"serializeProduction",{enumerable:!0,get:function(){return fJ.serializeProduction}});var cwe=$g();Object.defineProperty(We,"GAstVisitor",{enumerable:!0,get:function(){return cwe.GAstVisitor}});function uwe(){console.warn(`The clearCache function was 'soft' removed from the Chevrotain API.
-	 It performs no action other than printing this message.
-	 Please avoid using it as it will be completely removed in the future`)}We.clearCache=uwe;var gwe=uJ();Object.defineProperty(We,"createSyntaxDiagramsCode",{enumerable:!0,get:function(){return gwe.createSyntaxDiagramsCode}});var fwe=function(){function r(){throw new Error(`The Parser class has been deprecated, use CstParser or EmbeddedActionsParser instead.	
-See: https://chevrotain.io/docs/changes/BREAKING_CHANGES.html#_7-0-0`)}return r}();We.Parser=fwe});var CJ=w((Jet,dJ)=>{var Ny=hJ(),Fa=Ny.createToken,pJ=Ny.tokenMatcher,ux=Ny.Lexer,hwe=Ny.EmbeddedActionsParser;dJ.exports=r=>{let e=Fa({name:"LogicalOperator",pattern:ux.NA}),t=Fa({name:"Or",pattern:/\|/,categories:e}),i=Fa({name:"Xor",pattern:/\^/,categories:e}),n=Fa({name:"And",pattern:/&/,categories:e}),s=Fa({name:"Not",pattern:/!/}),o=Fa({name:"LParen",pattern:/\(/}),a=Fa({name:"RParen",pattern:/\)/}),l=Fa({name:"Query",pattern:r}),u=[Fa({name:"WhiteSpace",pattern:/\s+/,group:ux.SKIPPED}),t,i,n,o,a,s,e,l],g=new ux(u);class f extends hwe{constructor(p){super(u),this.RULE("expression",()=>this.SUBRULE(this.logicalExpression)),this.RULE("logicalExpression",()=>{let y=this.SUBRULE(this.atomicExpression);return this.MANY(()=>{let B=y,v=this.CONSUME(e),D=this.SUBRULE2(this.atomicExpression);pJ(v,t)?y=T=>B(T)||D(T):pJ(v,i)?y=T=>!!(B(T)^D(T)):y=T=>B(T)&&D(T)}),y}),this.RULE("atomicExpression",()=>this.OR([{ALT:()=>this.SUBRULE(this.parenthesisExpression)},{ALT:()=>{let{image:C}=this.CONSUME(l);return y=>y(C)}},{ALT:()=>{this.CONSUME(s);let C=this.SUBRULE(this.atomicExpression);return y=>!C(y)}}])),this.RULE("parenthesisExpression",()=>{let C;return this.CONSUME(o),C=this.SUBRULE(this.expression),this.CONSUME(a),C}),this.performSelfAnalysis()}}return{TinylogicLexer:g,TinylogicParser:f}}});var mJ=w(Ty=>{var pwe=CJ();Ty.makeParser=(r=/[a-z]+/)=>{let{TinylogicLexer:e,TinylogicParser:t}=pwe(r),i=new t;return(n,s)=>{let o=e.tokenize(n);return i.input=o.tokens,i.expression()(s)}};Ty.parse=Ty.makeParser()});var IJ=w((zet,EJ)=>{"use strict";EJ.exports={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]}});var gx=w((Vet,wJ)=>{var Md=IJ(),yJ={};for(let r of Object.keys(Md))yJ[Md[r]]=r;var st={rgb:{channels:3,labels:"rgb"},hsl:{channels:3,labels:"hsl"},hsv:{channels:3,labels:"hsv"},hwb:{channels:3,labels:"hwb"},cmyk:{channels:4,labels:"cmyk"},xyz:{channels:3,labels:"xyz"},lab:{channels:3,labels:"lab"},lch:{channels:3,labels:"lch"},hex:{channels:1,labels:["hex"]},keyword:{channels:1,labels:["keyword"]},ansi16:{channels:1,labels:["ansi16"]},ansi256:{channels:1,labels:["ansi256"]},hcg:{channels:3,labels:["h","c","g"]},apple:{channels:3,labels:["r16","g16","b16"]},gray:{channels:1,labels:["gray"]}};wJ.exports=st;for(let r of Object.keys(st)){if(!("channels"in st[r]))throw new Error("missing channels property: "+r);if(!("labels"in st[r]))throw new Error("missing channel labels property: "+r);if(st[r].labels.length!==st[r].channels)throw new Error("channel and label counts mismatch: "+r);let{channels:e,labels:t}=st[r];delete st[r].channels,delete st[r].labels,Object.defineProperty(st[r],"channels",{value:e}),Object.defineProperty(st[r],"labels",{value:t})}st.rgb.hsl=function(r){let e=r[0]/255,t=r[1]/255,i=r[2]/255,n=Math.min(e,t,i),s=Math.max(e,t,i),o=s-n,a,l;s===n?a=0:e===s?a=(t-i)/o:t===s?a=2+(i-e)/o:i===s&&(a=4+(e-t)/o),a=Math.min(a*60,360),a<0&&(a+=360);let c=(n+s)/2;return s===n?l=0:c<=.5?l=o/(s+n):l=o/(2-s-n),[a,l*100,c*100]};st.rgb.hsv=function(r){let e,t,i,n,s,o=r[0]/255,a=r[1]/255,l=r[2]/255,c=Math.max(o,a,l),u=c-Math.min(o,a,l),g=function(f){return(c-f)/6/u+1/2};return u===0?(n=0,s=0):(s=u/c,e=g(o),t=g(a),i=g(l),o===c?n=i-t:a===c?n=1/3+e-i:l===c&&(n=2/3+t-e),n<0?n+=1:n>1&&(n-=1)),[n*360,s*100,c*100]};st.rgb.hwb=function(r){let e=r[0],t=r[1],i=r[2],n=st.rgb.hsl(r)[0],s=1/255*Math.min(e,Math.min(t,i));return i=1-1/255*Math.max(e,Math.max(t,i)),[n,s*100,i*100]};st.rgb.cmyk=function(r){let e=r[0]/255,t=r[1]/255,i=r[2]/255,n=Math.min(1-e,1-t,1-i),s=(1-e-n)/(1-n)||0,o=(1-t-n)/(1-n)||0,a=(1-i-n)/(1-n)||0;return[s*100,o*100,a*100,n*100]};function dwe(r,e){return(r[0]-e[0])**2+(r[1]-e[1])**2+(r[2]-e[2])**2}st.rgb.keyword=function(r){let e=yJ[r];if(e)return e;let t=1/0,i;for(let n of Object.keys(Md)){let s=Md[n],o=dwe(r,s);o<t&&(t=o,i=n)}return i};st.keyword.rgb=function(r){return Md[r]};st.rgb.xyz=function(r){let e=r[0]/255,t=r[1]/255,i=r[2]/255;e=e>.04045?((e+.055)/1.055)**2.4:e/12.92,t=t>.04045?((t+.055)/1.055)**2.4:t/12.92,i=i>.04045?((i+.055)/1.055)**2.4:i/12.92;let n=e*.4124+t*.3576+i*.1805,s=e*.2126+t*.7152+i*.0722,o=e*.0193+t*.1192+i*.9505;return[n*100,s*100,o*100]};st.rgb.lab=function(r){let e=st.rgb.xyz(r),t=e[0],i=e[1],n=e[2];t/=95.047,i/=100,n/=108.883,t=t>.008856?t**(1/3):7.787*t+16/116,i=i>.008856?i**(1/3):7.787*i+16/116,n=n>.008856?n**(1/3):7.787*n+16/116;let s=116*i-16,o=500*(t-i),a=200*(i-n);return[s,o,a]};st.hsl.rgb=function(r){let e=r[0]/360,t=r[1]/100,i=r[2]/100,n,s,o;if(t===0)return o=i*255,[o,o,o];i<.5?n=i*(1+t):n=i+t-i*t;let a=2*i-n,l=[0,0,0];for(let c=0;c<3;c++)s=e+1/3*-(c-1),s<0&&s++,s>1&&s--,6*s<1?o=a+(n-a)*6*s:2*s<1?o=n:3*s<2?o=a+(n-a)*(2/3-s)*6:o=a,l[c]=o*255;return l};st.hsl.hsv=function(r){let e=r[0],t=r[1]/100,i=r[2]/100,n=t,s=Math.max(i,.01);i*=2,t*=i<=1?i:2-i,n*=s<=1?s:2-s;let o=(i+t)/2,a=i===0?2*n/(s+n):2*t/(i+t);return[e,a*100,o*100]};st.hsv.rgb=function(r){let e=r[0]/60,t=r[1]/100,i=r[2]/100,n=Math.floor(e)%6,s=e-Math.floor(e),o=255*i*(1-t),a=255*i*(1-t*s),l=255*i*(1-t*(1-s));switch(i*=255,n){case 0:return[i,l,o];case 1:return[a,i,o];case 2:return[o,i,l];case 3:return[o,a,i];case 4:return[l,o,i];case 5:return[i,o,a]}};st.hsv.hsl=function(r){let e=r[0],t=r[1]/100,i=r[2]/100,n=Math.max(i,.01),s,o;o=(2-t)*i;let a=(2-t)*n;return s=t*n,s/=a<=1?a:2-a,s=s||0,o/=2,[e,s*100,o*100]};st.hwb.rgb=function(r){let e=r[0]/360,t=r[1]/100,i=r[2]/100,n=t+i,s;n>1&&(t/=n,i/=n);let o=Math.floor(6*e),a=1-i;s=6*e-o,(o&1)!==0&&(s=1-s);let l=t+s*(a-t),c,u,g;switch(o){default:case 6:case 0:c=a,u=l,g=t;break;case 1:c=l,u=a,g=t;break;case 2:c=t,u=a,g=l;break;case 3:c=t,u=l,g=a;break;case 4:c=l,u=t,g=a;break;case 5:c=a,u=t,g=l;break}return[c*255,u*255,g*255]};st.cmyk.rgb=function(r){let e=r[0]/100,t=r[1]/100,i=r[2]/100,n=r[3]/100,s=1-Math.min(1,e*(1-n)+n),o=1-Math.min(1,t*(1-n)+n),a=1-Math.min(1,i*(1-n)+n);return[s*255,o*255,a*255]};st.xyz.rgb=function(r){let e=r[0]/100,t=r[1]/100,i=r[2]/100,n,s,o;return n=e*3.2406+t*-1.5372+i*-.4986,s=e*-.9689+t*1.8758+i*.0415,o=e*.0557+t*-.204+i*1.057,n=n>.0031308?1.055*n**(1/2.4)-.055:n*12.92,s=s>.0031308?1.055*s**(1/2.4)-.055:s*12.92,o=o>.0031308?1.055*o**(1/2.4)-.055:o*12.92,n=Math.min(Math.max(0,n),1),s=Math.min(Math.max(0,s),1),o=Math.min(Math.max(0,o),1),[n*255,s*255,o*255]};st.xyz.lab=function(r){let e=r[0],t=r[1],i=r[2];e/=95.047,t/=100,i/=108.883,e=e>.008856?e**(1/3):7.787*e+16/116,t=t>.008856?t**(1/3):7.787*t+16/116,i=i>.008856?i**(1/3):7.787*i+16/116;let n=116*t-16,s=500*(e-t),o=200*(t-i);return[n,s,o]};st.lab.xyz=function(r){let e=r[0],t=r[1],i=r[2],n,s,o;s=(e+16)/116,n=t/500+s,o=s-i/200;let a=s**3,l=n**3,c=o**3;return s=a>.008856?a:(s-16/116)/7.787,n=l>.008856?l:(n-16/116)/7.787,o=c>.008856?c:(o-16/116)/7.787,n*=95.047,s*=100,o*=108.883,[n,s,o]};st.lab.lch=function(r){let e=r[0],t=r[1],i=r[2],n;n=Math.atan2(i,t)*360/2/Math.PI,n<0&&(n+=360);let o=Math.sqrt(t*t+i*i);return[e,o,n]};st.lch.lab=function(r){let e=r[0],t=r[1],n=r[2]/360*2*Math.PI,s=t*Math.cos(n),o=t*Math.sin(n);return[e,s,o]};st.rgb.ansi16=function(r,e=null){let[t,i,n]=r,s=e===null?st.rgb.hsv(r)[2]:e;if(s=Math.round(s/50),s===0)return 30;let o=30+(Math.round(n/255)<<2|Math.round(i/255)<<1|Math.round(t/255));return s===2&&(o+=60),o};st.hsv.ansi16=function(r){return st.rgb.ansi16(st.hsv.rgb(r),r[2])};st.rgb.ansi256=function(r){let e=r[0],t=r[1],i=r[2];return e===t&&t===i?e<8?16:e>248?231:Math.round((e-8)/247*24)+232:16+36*Math.round(e/255*5)+6*Math.round(t/255*5)+Math.round(i/255*5)};st.ansi16.rgb=function(r){let e=r%10;if(e===0||e===7)return r>50&&(e+=3.5),e=e/10.5*255,[e,e,e];let t=(~~(r>50)+1)*.5,i=(e&1)*t*255,n=(e>>1&1)*t*255,s=(e>>2&1)*t*255;return[i,n,s]};st.ansi256.rgb=function(r){if(r>=232){let s=(r-232)*10+8;return[s,s,s]}r-=16;let e,t=Math.floor(r/36)/5*255,i=Math.floor((e=r%36)/6)/5*255,n=e%6/5*255;return[t,i,n]};st.rgb.hex=function(r){let t=(((Math.round(r[0])&255)<<16)+((Math.round(r[1])&255)<<8)+(Math.round(r[2])&255)).toString(16).toUpperCase();return"000000".substring(t.length)+t};st.hex.rgb=function(r){let e=r.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);if(!e)return[0,0,0];let t=e[0];e[0].length===3&&(t=t.split("").map(a=>a+a).join(""));let i=parseInt(t,16),n=i>>16&255,s=i>>8&255,o=i&255;return[n,s,o]};st.rgb.hcg=function(r){let e=r[0]/255,t=r[1]/255,i=r[2]/255,n=Math.max(Math.max(e,t),i),s=Math.min(Math.min(e,t),i),o=n-s,a,l;return o<1?a=s/(1-o):a=0,o<=0?l=0:n===e?l=(t-i)/o%6:n===t?l=2+(i-e)/o:l=4+(e-t)/o,l/=6,l%=1,[l*360,o*100,a*100]};st.hsl.hcg=function(r){let e=r[1]/100,t=r[2]/100,i=t<.5?2*e*t:2*e*(1-t),n=0;return i<1&&(n=(t-.5*i)/(1-i)),[r[0],i*100,n*100]};st.hsv.hcg=function(r){let e=r[1]/100,t=r[2]/100,i=e*t,n=0;return i<1&&(n=(t-i)/(1-i)),[r[0],i*100,n*100]};st.hcg.rgb=function(r){let e=r[0]/360,t=r[1]/100,i=r[2]/100;if(t===0)return[i*255,i*255,i*255];let n=[0,0,0],s=e%1*6,o=s%1,a=1-o,l=0;switch(Math.floor(s)){case 0:n[0]=1,n[1]=o,n[2]=0;break;case 1:n[0]=a,n[1]=1,n[2]=0;break;case 2:n[0]=0,n[1]=1,n[2]=o;break;case 3:n[0]=0,n[1]=a,n[2]=1;break;case 4:n[0]=o,n[1]=0,n[2]=1;break;default:n[0]=1,n[1]=0,n[2]=a}return l=(1-t)*i,[(t*n[0]+l)*255,(t*n[1]+l)*255,(t*n[2]+l)*255]};st.hcg.hsv=function(r){let e=r[1]/100,t=r[2]/100,i=e+t*(1-e),n=0;return i>0&&(n=e/i),[r[0],n*100,i*100]};st.hcg.hsl=function(r){let e=r[1]/100,i=r[2]/100*(1-e)+.5*e,n=0;return i>0&&i<.5?n=e/(2*i):i>=.5&&i<1&&(n=e/(2*(1-i))),[r[0],n*100,i*100]};st.hcg.hwb=function(r){let e=r[1]/100,t=r[2]/100,i=e+t*(1-e);return[r[0],(i-e)*100,(1-i)*100]};st.hwb.hcg=function(r){let e=r[1]/100,i=1-r[2]/100,n=i-e,s=0;return n<1&&(s=(i-n)/(1-n)),[r[0],n*100,s*100]};st.apple.rgb=function(r){return[r[0]/65535*255,r[1]/65535*255,r[2]/65535*255]};st.rgb.apple=function(r){return[r[0]/255*65535,r[1]/255*65535,r[2]/255*65535]};st.gray.rgb=function(r){return[r[0]/100*255,r[0]/100*255,r[0]/100*255]};st.gray.hsl=function(r){return[0,0,r[0]]};st.gray.hsv=st.gray.hsl;st.gray.hwb=function(r){return[0,100,r[0]]};st.gray.cmyk=function(r){return[0,0,0,r[0]]};st.gray.lab=function(r){return[r[0],0,0]};st.gray.hex=function(r){let e=Math.round(r[0]/100*255)&255,i=((e<<16)+(e<<8)+e).toString(16).toUpperCase();return"000000".substring(i.length)+i};st.rgb.gray=function(r){return[(r[0]+r[1]+r[2])/3/255*100]}});var bJ=w((Xet,BJ)=>{var Ly=gx();function Cwe(){let r={},e=Object.keys(Ly);for(let t=e.length,i=0;i<t;i++)r[e[i]]={distance:-1,parent:null};return r}function mwe(r){let e=Cwe(),t=[r];for(e[r].distance=0;t.length;){let i=t.pop(),n=Object.keys(Ly[i]);for(let s=n.length,o=0;o<s;o++){let a=n[o],l=e[a];l.distance===-1&&(l.distance=e[i].distance+1,l.parent=i,t.unshift(a))}}return e}function Ewe(r,e){return function(t){return e(r(t))}}function Iwe(r,e){let t=[e[r].parent,r],i=Ly[e[r].parent][r],n=e[r].parent;for(;e[n].parent;)t.unshift(e[n].parent),i=Ewe(Ly[e[n].parent][n],i),n=e[n].parent;return i.conversion=t,i}BJ.exports=function(r){let e=mwe(r),t={},i=Object.keys(e);for(let n=i.length,s=0;s<n;s++){let o=i[s];e[o].parent!==null&&(t[o]=Iwe(o,e))}return t}});var SJ=w((Zet,QJ)=>{var fx=gx(),ywe=bJ(),Af={},wwe=Object.keys(fx);function Bwe(r){let e=function(...t){let i=t[0];return i==null?i:(i.length>1&&(t=i),r(t))};return"conversion"in r&&(e.conversion=r.conversion),e}function bwe(r){let e=function(...t){let i=t[0];if(i==null)return i;i.length>1&&(t=i);let n=r(t);if(typeof n=="object")for(let s=n.length,o=0;o<s;o++)n[o]=Math.round(n[o]);return n};return"conversion"in r&&(e.conversion=r.conversion),e}wwe.forEach(r=>{Af[r]={},Object.defineProperty(Af[r],"channels",{value:fx[r].channels}),Object.defineProperty(Af[r],"labels",{value:fx[r].labels});let e=ywe(r);Object.keys(e).forEach(i=>{let n=e[i];Af[r][i]=bwe(n),Af[r][i].raw=Bwe(n)})});QJ.exports=Af});var RJ=w((_et,kJ)=>{"use strict";var vJ=(r,e)=>(...t)=>`\x1B[${r(...t)+e}m`,xJ=(r,e)=>(...t)=>{let i=r(...t);return`\x1B[${38+e};5;${i}m`},PJ=(r,e)=>(...t)=>{let i=r(...t);return`\x1B[${38+e};2;${i[0]};${i[1]};${i[2]}m`},Oy=r=>r,DJ=(r,e,t)=>[r,e,t],lf=(r,e,t)=>{Object.defineProperty(r,e,{get:()=>{let i=t();return Object.defineProperty(r,e,{value:i,enumerable:!0,configurable:!0}),i},enumerable:!0,configurable:!0})},hx,cf=(r,e,t,i)=>{hx===void 0&&(hx=SJ());let n=i?10:0,s={};for(let[o,a]of Object.entries(hx)){let l=o==="ansi16"?"ansi":o;o===e?s[l]=r(t,n):typeof a=="object"&&(s[l]=r(a[e],n))}return s};function Qwe(){let r=new Map,e={modifier:{reset:[0,0],bold:[1,22],dim:[2,22],italic:[3,23],underline:[4,24],inverse:[7,27],hidden:[8,28],strikethrough:[9,29]},color:{black:[30,39],red:[31,39],green:[32,39],yellow:[33,39],blue:[34,39],magenta:[35,39],cyan:[36,39],white:[37,39],blackBright:[90,39],redBright:[91,39],greenBright:[92,39],yellowBright:[93,39],blueBright:[94,39],magentaBright:[95,39],cyanBright:[96,39],whiteBright:[97,39]},bgColor:{bgBlack:[40,49],bgRed:[41,49],bgGreen:[42,49],bgYellow:[43,49],bgBlue:[44,49],bgMagenta:[45,49],bgCyan:[46,49],bgWhite:[47,49],bgBlackBright:[100,49],bgRedBright:[101,49],bgGreenBright:[102,49],bgYellowBright:[103,49],bgBlueBright:[104,49],bgMagentaBright:[105,49],bgCyanBright:[106,49],bgWhiteBright:[107,49]}};e.color.gray=e.color.blackBright,e.bgColor.bgGray=e.bgColor.bgBlackBright,e.color.grey=e.color.blackBright,e.bgColor.bgGrey=e.bgColor.bgBlackBright;for(let[t,i]of Object.entries(e)){for(let[n,s]of Object.entries(i))e[n]={open:`\x1B[${s[0]}m`,close:`\x1B[${s[1]}m`},i[n]=e[n],r.set(s[0],s[1]);Object.defineProperty(e,t,{value:i,enumerable:!1})}return Object.defineProperty(e,"codes",{value:r,enumerable:!1}),e.color.close="\x1B[39m",e.bgColor.close="\x1B[49m",lf(e.color,"ansi",()=>cf(vJ,"ansi16",Oy,!1)),lf(e.color,"ansi256",()=>cf(xJ,"ansi256",Oy,!1)),lf(e.color,"ansi16m",()=>cf(PJ,"rgb",DJ,!1)),lf(e.bgColor,"ansi",()=>cf(vJ,"ansi16",Oy,!0)),lf(e.bgColor,"ansi256",()=>cf(xJ,"ansi256",Oy,!0)),lf(e.bgColor,"ansi16m",()=>cf(PJ,"rgb",DJ,!0)),e}Object.defineProperty(kJ,"exports",{enumerable:!0,get:Qwe})});var NJ=w(($et,FJ)=>{"use strict";FJ.exports=(r,e=process.argv)=>{let t=r.startsWith("-")?"":r.length===1?"-":"--",i=e.indexOf(t+r),n=e.indexOf("--");return i!==-1&&(n===-1||i<n)}});var OJ=w((ett,LJ)=>{"use strict";var Swe=J("os"),TJ=J("tty"),ds=NJ(),{env:ai}=process,KA;ds("no-color")||ds("no-colors")||ds("color=false")||ds("color=never")?KA=0:(ds("color")||ds("colors")||ds("color=true")||ds("color=always"))&&(KA=1);"FORCE_COLOR"in ai&&(ai.FORCE_COLOR==="true"?KA=1:ai.FORCE_COLOR==="false"?KA=0:KA=ai.FORCE_COLOR.length===0?1:Math.min(parseInt(ai.FORCE_COLOR,10),3));function px(r){return r===0?!1:{level:r,hasBasic:!0,has256:r>=2,has16m:r>=3}}function dx(r,e){if(KA===0)return 0;if(ds("color=16m")||ds("color=full")||ds("color=truecolor"))return 3;if(ds("color=256"))return 2;if(r&&!e&&KA===void 0)return 0;let t=KA||0;if(ai.TERM==="dumb")return t;if(process.platform==="win32"){let i=Swe.release().split(".");return Number(i[0])>=10&&Number(i[2])>=10586?Number(i[2])>=14931?3:2:1}if("CI"in ai)return["TRAVIS","CIRCLECI","APPVEYOR","GITLAB_CI"].some(i=>i in ai)||ai.CI_NAME==="codeship"?1:t;if("TEAMCITY_VERSION"in ai)return/^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(ai.TEAMCITY_VERSION)?1:0;if("GITHUB_ACTIONS"in ai)return 1;if(ai.COLORTERM==="truecolor")return 3;if("TERM_PROGRAM"in ai){let i=parseInt((ai.TERM_PROGRAM_VERSION||"").split(".")[0],10);switch(ai.TERM_PROGRAM){case"iTerm.app":return i>=3?3:2;case"Apple_Terminal":return 2}}return/-256(color)?$/i.test(ai.TERM)?2:/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(ai.TERM)||"COLORTERM"in ai?1:t}function vwe(r){let e=dx(r,r&&r.isTTY);return px(e)}LJ.exports={supportsColor:vwe,stdout:px(dx(!0,TJ.isatty(1))),stderr:px(dx(!0,TJ.isatty(2)))}});var KJ=w((ttt,MJ)=>{"use strict";var xwe=(r,e,t)=>{let i=r.indexOf(e);if(i===-1)return r;let n=e.length,s=0,o="";do o+=r.substr(s,i-s)+e+t,s=i+n,i=r.indexOf(e,s);while(i!==-1);return o+=r.substr(s),o},Pwe=(r,e,t,i)=>{let n=0,s="";do{let o=r[i-1]==="\r";s+=r.substr(n,(o?i-1:i)-n)+e+(o?`\r
-`:`
-`)+t,n=i+1,i=r.indexOf(`
-`,n)}while(i!==-1);return s+=r.substr(n),s};MJ.exports={stringReplaceAll:xwe,stringEncaseCRLFWithFirstIndex:Pwe}});var jJ=w((rtt,YJ)=>{"use strict";var Dwe=/(?:\\(u(?:[a-f\d]{4}|\{[a-f\d]{1,6}\})|x[a-f\d]{2}|.))|(?:\{(~)?(\w+(?:\([^)]*\))?(?:\.\w+(?:\([^)]*\))?)*)(?:[ \t]|(?=\r?\n)))|(\})|((?:.|[\r\n\f])+?)/gi,UJ=/(?:^|\.)(\w+)(?:\(([^)]*)\))?/g,kwe=/^(['"])((?:\\.|(?!\1)[^\\])*)\1$/,Rwe=/\\(u(?:[a-f\d]{4}|\{[a-f\d]{1,6}\})|x[a-f\d]{2}|.)|([^\\])/gi,Fwe=new Map([["n",`
-`],["r","\r"],["t","	"],["b","\b"],["f","\f"],["v","\v"],["0","\0"],["\\","\\"],["e","\x1B"],["a","\x07"]]);function GJ(r){let e=r[0]==="u",t=r[1]==="{";return e&&!t&&r.length===5||r[0]==="x"&&r.length===3?String.fromCharCode(parseInt(r.slice(1),16)):e&&t?String.fromCodePoint(parseInt(r.slice(2,-1),16)):Fwe.get(r)||r}function Nwe(r,e){let t=[],i=e.trim().split(/\s*,\s*/g),n;for(let s of i){let o=Number(s);if(!Number.isNaN(o))t.push(o);else if(n=s.match(kwe))t.push(n[2].replace(Rwe,(a,l,c)=>l?GJ(l):c));else throw new Error(`Invalid Chalk template style argument: ${s} (in style '${r}')`)}return t}function Twe(r){UJ.lastIndex=0;let e=[],t;for(;(t=UJ.exec(r))!==null;){let i=t[1];if(t[2]){let n=Nwe(i,t[2]);e.push([i].concat(n))}else e.push([i])}return e}function HJ(r,e){let t={};for(let n of e)for(let s of n.styles)t[s[0]]=n.inverse?null:s.slice(1);let i=r;for(let[n,s]of Object.entries(t))if(!!Array.isArray(s)){if(!(n in i))throw new Error(`Unknown Chalk style: ${n}`);i=s.length>0?i[n](...s):i[n]}return i}YJ.exports=(r,e)=>{let t=[],i=[],n=[];if(e.replace(Dwe,(s,o,a,l,c,u)=>{if(o)n.push(GJ(o));else if(l){let g=n.join("");n=[],i.push(t.length===0?g:HJ(r,t)(g)),t.push({inverse:a,styles:Twe(l)})}else if(c){if(t.length===0)throw new Error("Found extraneous } in Chalk template literal");i.push(HJ(r,t)(n.join(""))),n=[],t.pop()}else n.push(u)}),i.push(n.join("")),t.length>0){let s=`Chalk template literal is missing ${t.length} closing bracket${t.length===1?"":"s"} (\`}\`)`;throw new Error(s)}return i.join("")}});var wx=w((itt,zJ)=>{"use strict";var Kd=RJ(),{stdout:mx,stderr:Ex}=OJ(),{stringReplaceAll:Lwe,stringEncaseCRLFWithFirstIndex:Owe}=KJ(),qJ=["ansi","ansi","ansi256","ansi16m"],uf=Object.create(null),Mwe=(r,e={})=>{if(e.level>3||e.level<0)throw new Error("The `level` option should be an integer from 0 to 3");let t=mx?mx.level:0;r.level=e.level===void 0?t:e.level},Ix=class{constructor(e){return JJ(e)}},JJ=r=>{let e={};return Mwe(e,r),e.template=(...t)=>Hwe(e.template,...t),Object.setPrototypeOf(e,My.prototype),Object.setPrototypeOf(e.template,e),e.template.constructor=()=>{throw new Error("`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.")},e.template.Instance=Ix,e.template};function My(r){return JJ(r)}for(let[r,e]of Object.entries(Kd))uf[r]={get(){let t=Ky(this,yx(e.open,e.close,this._styler),this._isEmpty);return Object.defineProperty(this,r,{value:t}),t}};uf.visible={get(){let r=Ky(this,this._styler,!0);return Object.defineProperty(this,"visible",{value:r}),r}};var WJ=["rgb","hex","keyword","hsl","hsv","hwb","ansi","ansi256"];for(let r of WJ)uf[r]={get(){let{level:e}=this;return function(...t){let i=yx(Kd.color[qJ[e]][r](...t),Kd.color.close,this._styler);return Ky(this,i,this._isEmpty)}}};for(let r of WJ){let e="bg"+r[0].toUpperCase()+r.slice(1);uf[e]={get(){let{level:t}=this;return function(...i){let n=yx(Kd.bgColor[qJ[t]][r](...i),Kd.bgColor.close,this._styler);return Ky(this,n,this._isEmpty)}}}}var Kwe=Object.defineProperties(()=>{},{...uf,level:{enumerable:!0,get(){return this._generator.level},set(r){this._generator.level=r}}}),yx=(r,e,t)=>{let i,n;return t===void 0?(i=r,n=e):(i=t.openAll+r,n=e+t.closeAll),{open:r,close:e,openAll:i,closeAll:n,parent:t}},Ky=(r,e,t)=>{let i=(...n)=>Uwe(i,n.length===1?""+n[0]:n.join(" "));return i.__proto__=Kwe,i._generator=r,i._styler=e,i._isEmpty=t,i},Uwe=(r,e)=>{if(r.level<=0||!e)return r._isEmpty?"":e;let t=r._styler;if(t===void 0)return e;let{openAll:i,closeAll:n}=t;if(e.indexOf("\x1B")!==-1)for(;t!==void 0;)e=Lwe(e,t.close,t.open),t=t.parent;let s=e.indexOf(`
-`);return s!==-1&&(e=Owe(e,n,i,s)),i+e+n},Cx,Hwe=(r,...e)=>{let[t]=e;if(!Array.isArray(t))return e.join(" ");let i=e.slice(1),n=[t.raw[0]];for(let s=1;s<t.length;s++)n.push(String(i[s-1]).replace(/[{}\\]/g,"\\$&"),String(t.raw[s]));return Cx===void 0&&(Cx=jJ()),Cx(r,n.join(""))};Object.defineProperties(My.prototype,uf);var Ud=My();Ud.supportsColor=mx;Ud.stderr=My({level:Ex?Ex.level:0});Ud.stderr.supportsColor=Ex;Ud.Level={None:0,Basic:1,Ansi256:2,TrueColor:3,0:"None",1:"Basic",2:"Ansi256",3:"TrueColor"};zJ.exports=Ud});var Uy=w(Cs=>{"use strict";Cs.isInteger=r=>typeof r=="number"?Number.isInteger(r):typeof r=="string"&&r.trim()!==""?Number.isInteger(Number(r)):!1;Cs.find=(r,e)=>r.nodes.find(t=>t.type===e);Cs.exceedsLimit=(r,e,t=1,i)=>i===!1||!Cs.isInteger(r)||!Cs.isInteger(e)?!1:(Number(e)-Number(r))/Number(t)>=i;Cs.escapeNode=(r,e=0,t)=>{let i=r.nodes[e];!i||(t&&i.type===t||i.type==="open"||i.type==="close")&&i.escaped!==!0&&(i.value="\\"+i.value,i.escaped=!0)};Cs.encloseBrace=r=>r.type!=="brace"?!1:r.commas>>0+r.ranges>>0===0?(r.invalid=!0,!0):!1;Cs.isInvalidBrace=r=>r.type!=="brace"?!1:r.invalid===!0||r.dollar?!0:r.commas>>0+r.ranges>>0===0||r.open!==!0||r.close!==!0?(r.invalid=!0,!0):!1;Cs.isOpenOrClose=r=>r.type==="open"||r.type==="close"?!0:r.open===!0||r.close===!0;Cs.reduce=r=>r.reduce((e,t)=>(t.type==="text"&&e.push(t.value),t.type==="range"&&(t.type="text"),e),[]);Cs.flatten=(...r)=>{let e=[],t=i=>{for(let n=0;n<i.length;n++){let s=i[n];Array.isArray(s)?t(s,e):s!==void 0&&e.push(s)}return e};return t(r),e}});var Hy=w((stt,XJ)=>{"use strict";var VJ=Uy();XJ.exports=(r,e={})=>{let t=(i,n={})=>{let s=e.escapeInvalid&&VJ.isInvalidBrace(n),o=i.invalid===!0&&e.escapeInvalid===!0,a="";if(i.value)return(s||o)&&VJ.isOpenOrClose(i)?"\\"+i.value:i.value;if(i.value)return i.value;if(i.nodes)for(let l of i.nodes)a+=t(l);return a};return t(r)}});var _J=w((ott,ZJ)=>{"use strict";ZJ.exports=function(r){return typeof r=="number"?r-r===0:typeof r=="string"&&r.trim()!==""?Number.isFinite?Number.isFinite(+r):isFinite(+r):!1}});var a3=w((att,o3)=>{"use strict";var $J=_J(),Ic=(r,e,t)=>{if($J(r)===!1)throw new TypeError("toRegexRange: expected the first argument to be a number");if(e===void 0||r===e)return String(r);if($J(e)===!1)throw new TypeError("toRegexRange: expected the second argument to be a number.");let i={relaxZeros:!0,...t};typeof i.strictZeros=="boolean"&&(i.relaxZeros=i.strictZeros===!1);let n=String(i.relaxZeros),s=String(i.shorthand),o=String(i.capture),a=String(i.wrap),l=r+":"+e+"="+n+s+o+a;if(Ic.cache.hasOwnProperty(l))return Ic.cache[l].result;let c=Math.min(r,e),u=Math.max(r,e);if(Math.abs(c-u)===1){let C=r+"|"+e;return i.capture?`(${C})`:i.wrap===!1?C:`(?:${C})`}let g=s3(r)||s3(e),f={min:r,max:e,a:c,b:u},h=[],p=[];if(g&&(f.isPadded=g,f.maxLen=String(f.max).length),c<0){let C=u<0?Math.abs(u):1;p=e3(C,Math.abs(c),f,i),c=f.a=0}return u>=0&&(h=e3(c,u,f,i)),f.negatives=p,f.positives=h,f.result=Gwe(p,h,i),i.capture===!0?f.result=`(${f.result})`:i.wrap!==!1&&h.length+p.length>1&&(f.result=`(?:${f.result})`),Ic.cache[l]=f,f.result};function Gwe(r,e,t){let i=Bx(r,e,"-",!1,t)||[],n=Bx(e,r,"",!1,t)||[],s=Bx(r,e,"-?",!0,t)||[];return i.concat(s).concat(n).join("|")}function Ywe(r,e){let t=1,i=1,n=r3(r,t),s=new Set([e]);for(;r<=n&&n<=e;)s.add(n),t+=1,n=r3(r,t);for(n=i3(e+1,i)-1;r<n&&n<=e;)s.add(n),i+=1,n=i3(e+1,i)-1;return s=[...s],s.sort(Jwe),s}function jwe(r,e,t){if(r===e)return{pattern:r,count:[],digits:0};let i=qwe(r,e),n=i.length,s="",o=0;for(let a=0;a<n;a++){let[l,c]=i[a];l===c?s+=l:l!=="0"||c!=="9"?s+=Wwe(l,c,t):o++}return o&&(s+=t.shorthand===!0?"\\d":"[0-9]"),{pattern:s,count:[o],digits:n}}function e3(r,e,t,i){let n=Ywe(r,e),s=[],o=r,a;for(let l=0;l<n.length;l++){let c=n[l],u=jwe(String(o),String(c),i),g="";if(!t.isPadded&&a&&a.pattern===u.pattern){a.count.length>1&&a.count.pop(),a.count.push(u.count[0]),a.string=a.pattern+n3(a.count),o=c+1;continue}t.isPadded&&(g=zwe(c,t,i)),u.string=g+u.pattern+n3(u.count),s.push(u),o=c+1,a=u}return s}function Bx(r,e,t,i,n){let s=[];for(let o of r){let{string:a}=o;!i&&!t3(e,"string",a)&&s.push(t+a),i&&t3(e,"string",a)&&s.push(t+a)}return s}function qwe(r,e){let t=[];for(let i=0;i<r.length;i++)t.push([r[i],e[i]]);return t}function Jwe(r,e){return r>e?1:e>r?-1:0}function t3(r,e,t){return r.some(i=>i[e]===t)}function r3(r,e){return Number(String(r).slice(0,-e)+"9".repeat(e))}function i3(r,e){return r-r%Math.pow(10,e)}function n3(r){let[e=0,t=""]=r;return t||e>1?`{${e+(t?","+t:"")}}`:""}function Wwe(r,e,t){return`[${r}${e-r===1?"":"-"}${e}]`}function s3(r){return/^-?(0+)\d/.test(r)}function zwe(r,e,t){if(!e.isPadded)return r;let i=Math.abs(e.maxLen-String(r).length),n=t.relaxZeros!==!1;switch(i){case 0:return"";case 1:return n?"0?":"0";case 2:return n?"0{0,2}":"00";default:return n?`0{0,${i}}`:`0{${i}}`}}Ic.cache={};Ic.clearCache=()=>Ic.cache={};o3.exports=Ic});var Sx=w((Att,p3)=>{"use strict";var Vwe=J("util"),c3=a3(),A3=r=>r!==null&&typeof r=="object"&&!Array.isArray(r),Xwe=r=>e=>r===!0?Number(e):String(e),bx=r=>typeof r=="number"||typeof r=="string"&&r!=="",Hd=r=>Number.isInteger(+r),Qx=r=>{let e=`${r}`,t=-1;if(e[0]==="-"&&(e=e.slice(1)),e==="0")return!1;for(;e[++t]==="0";);return t>0},Zwe=(r,e,t)=>typeof r=="string"||typeof e=="string"?!0:t.stringify===!0,_we=(r,e,t)=>{if(e>0){let i=r[0]==="-"?"-":"";i&&(r=r.slice(1)),r=i+r.padStart(i?e-1:e,"0")}return t===!1?String(r):r},l3=(r,e)=>{let t=r[0]==="-"?"-":"";for(t&&(r=r.slice(1),e--);r.length<e;)r="0"+r;return t?"-"+r:r},$we=(r,e)=>{r.negatives.sort((o,a)=>o<a?-1:o>a?1:0),r.positives.sort((o,a)=>o<a?-1:o>a?1:0);let t=e.capture?"":"?:",i="",n="",s;return r.positives.length&&(i=r.positives.join("|")),r.negatives.length&&(n=`-(${t}${r.negatives.join("|")})`),i&&n?s=`${i}|${n}`:s=i||n,e.wrap?`(${t}${s})`:s},u3=(r,e,t,i)=>{if(t)return c3(r,e,{wrap:!1,...i});let n=String.fromCharCode(r);if(r===e)return n;let s=String.fromCharCode(e);return`[${n}-${s}]`},g3=(r,e,t)=>{if(Array.isArray(r)){let i=t.wrap===!0,n=t.capture?"":"?:";return i?`(${n}${r.join("|")})`:r.join("|")}return c3(r,e,t)},f3=(...r)=>new RangeError("Invalid range arguments: "+Vwe.inspect(...r)),h3=(r,e,t)=>{if(t.strictRanges===!0)throw f3([r,e]);return[]},eBe=(r,e)=>{if(e.strictRanges===!0)throw new TypeError(`Expected step "${r}" to be a number`);return[]},tBe=(r,e,t=1,i={})=>{let n=Number(r),s=Number(e);if(!Number.isInteger(n)||!Number.isInteger(s)){if(i.strictRanges===!0)throw f3([r,e]);return[]}n===0&&(n=0),s===0&&(s=0);let o=n>s,a=String(r),l=String(e),c=String(t);t=Math.max(Math.abs(t),1);let u=Qx(a)||Qx(l)||Qx(c),g=u?Math.max(a.length,l.length,c.length):0,f=u===!1&&Zwe(r,e,i)===!1,h=i.transform||Xwe(f);if(i.toRegex&&t===1)return u3(l3(r,g),l3(e,g),!0,i);let p={negatives:[],positives:[]},C=v=>p[v<0?"negatives":"positives"].push(Math.abs(v)),y=[],B=0;for(;o?n>=s:n<=s;)i.toRegex===!0&&t>1?C(n):y.push(_we(h(n,B),g,f)),n=o?n-t:n+t,B++;return i.toRegex===!0?t>1?$we(p,i):g3(y,null,{wrap:!1,...i}):y},rBe=(r,e,t=1,i={})=>{if(!Hd(r)&&r.length>1||!Hd(e)&&e.length>1)return h3(r,e,i);let n=i.transform||(f=>String.fromCharCode(f)),s=`${r}`.charCodeAt(0),o=`${e}`.charCodeAt(0),a=s>o,l=Math.min(s,o),c=Math.max(s,o);if(i.toRegex&&t===1)return u3(l,c,!1,i);let u=[],g=0;for(;a?s>=o:s<=o;)u.push(n(s,g)),s=a?s-t:s+t,g++;return i.toRegex===!0?g3(u,null,{wrap:!1,options:i}):u},Gy=(r,e,t,i={})=>{if(e==null&&bx(r))return[r];if(!bx(r)||!bx(e))return h3(r,e,i);if(typeof t=="function")return Gy(r,e,1,{transform:t});if(A3(t))return Gy(r,e,0,t);let n={...i};return n.capture===!0&&(n.wrap=!0),t=t||n.step||1,Hd(t)?Hd(r)&&Hd(e)?tBe(r,e,t,n):rBe(r,e,Math.max(Math.abs(t),1),n):t!=null&&!A3(t)?eBe(t,n):Gy(r,e,1,t)};p3.exports=Gy});var m3=w((ltt,C3)=>{"use strict";var iBe=Sx(),d3=Uy(),nBe=(r,e={})=>{let t=(i,n={})=>{let s=d3.isInvalidBrace(n),o=i.invalid===!0&&e.escapeInvalid===!0,a=s===!0||o===!0,l=e.escapeInvalid===!0?"\\":"",c="";if(i.isOpen===!0||i.isClose===!0)return l+i.value;if(i.type==="open")return a?l+i.value:"(";if(i.type==="close")return a?l+i.value:")";if(i.type==="comma")return i.prev.type==="comma"?"":a?i.value:"|";if(i.value)return i.value;if(i.nodes&&i.ranges>0){let u=d3.reduce(i.nodes),g=iBe(...u,{...e,wrap:!1,toRegex:!0});if(g.length!==0)return u.length>1&&g.length>1?`(${g})`:g}if(i.nodes)for(let u of i.nodes)c+=t(u,i);return c};return t(r)};C3.exports=nBe});var y3=w((ctt,I3)=>{"use strict";var sBe=Sx(),E3=Hy(),gf=Uy(),yc=(r="",e="",t=!1)=>{let i=[];if(r=[].concat(r),e=[].concat(e),!e.length)return r;if(!r.length)return t?gf.flatten(e).map(n=>`{${n}}`):e;for(let n of r)if(Array.isArray(n))for(let s of n)i.push(yc(s,e,t));else for(let s of e)t===!0&&typeof s=="string"&&(s=`{${s}}`),i.push(Array.isArray(s)?yc(n,s,t):n+s);return gf.flatten(i)},oBe=(r,e={})=>{let t=e.rangeLimit===void 0?1e3:e.rangeLimit,i=(n,s={})=>{n.queue=[];let o=s,a=s.queue;for(;o.type!=="brace"&&o.type!=="root"&&o.parent;)o=o.parent,a=o.queue;if(n.invalid||n.dollar){a.push(yc(a.pop(),E3(n,e)));return}if(n.type==="brace"&&n.invalid!==!0&&n.nodes.length===2){a.push(yc(a.pop(),["{}"]));return}if(n.nodes&&n.ranges>0){let g=gf.reduce(n.nodes);if(gf.exceedsLimit(...g,e.step,t))throw new RangeError("expanded array length exceeds range limit. Use options.rangeLimit to increase or disable the limit.");let f=sBe(...g,e);f.length===0&&(f=E3(n,e)),a.push(yc(a.pop(),f)),n.nodes=[];return}let l=gf.encloseBrace(n),c=n.queue,u=n;for(;u.type!=="brace"&&u.type!=="root"&&u.parent;)u=u.parent,c=u.queue;for(let g=0;g<n.nodes.length;g++){let f=n.nodes[g];if(f.type==="comma"&&n.type==="brace"){g===1&&c.push(""),c.push("");continue}if(f.type==="close"){a.push(yc(a.pop(),c,l));continue}if(f.value&&f.type!=="open"){c.push(yc(c.pop(),f.value));continue}f.nodes&&i(f,n)}return c};return gf.flatten(i(r))};I3.exports=oBe});var B3=w((utt,w3)=>{"use strict";w3.exports={MAX_LENGTH:1024*64,CHAR_0:"0",CHAR_9:"9",CHAR_UPPERCASE_A:"A",CHAR_LOWERCASE_A:"a",CHAR_UPPERCASE_Z:"Z",CHAR_LOWERCASE_Z:"z",CHAR_LEFT_PARENTHESES:"(",CHAR_RIGHT_PARENTHESES:")",CHAR_ASTERISK:"*",CHAR_AMPERSAND:"&",CHAR_AT:"@",CHAR_BACKSLASH:"\\",CHAR_BACKTICK:"`",CHAR_CARRIAGE_RETURN:"\r",CHAR_CIRCUMFLEX_ACCENT:"^",CHAR_COLON:":",CHAR_COMMA:",",CHAR_DOLLAR:"$",CHAR_DOT:".",CHAR_DOUBLE_QUOTE:'"',CHAR_EQUAL:"=",CHAR_EXCLAMATION_MARK:"!",CHAR_FORM_FEED:"\f",CHAR_FORWARD_SLASH:"/",CHAR_HASH:"#",CHAR_HYPHEN_MINUS:"-",CHAR_LEFT_ANGLE_BRACKET:"<",CHAR_LEFT_CURLY_BRACE:"{",CHAR_LEFT_SQUARE_BRACKET:"[",CHAR_LINE_FEED:`
-`,CHAR_NO_BREAK_SPACE:"\xA0",CHAR_PERCENT:"%",CHAR_PLUS:"+",CHAR_QUESTION_MARK:"?",CHAR_RIGHT_ANGLE_BRACKET:">",CHAR_RIGHT_CURLY_BRACE:"}",CHAR_RIGHT_SQUARE_BRACKET:"]",CHAR_SEMICOLON:";",CHAR_SINGLE_QUOTE:"'",CHAR_SPACE:" ",CHAR_TAB:"	",CHAR_UNDERSCORE:"_",CHAR_VERTICAL_LINE:"|",CHAR_ZERO_WIDTH_NOBREAK_SPACE:"\uFEFF"}});var x3=w((gtt,v3)=>{"use strict";var aBe=Hy(),{MAX_LENGTH:b3,CHAR_BACKSLASH:vx,CHAR_BACKTICK:ABe,CHAR_COMMA:lBe,CHAR_DOT:cBe,CHAR_LEFT_PARENTHESES:uBe,CHAR_RIGHT_PARENTHESES:gBe,CHAR_LEFT_CURLY_BRACE:fBe,CHAR_RIGHT_CURLY_BRACE:hBe,CHAR_LEFT_SQUARE_BRACKET:Q3,CHAR_RIGHT_SQUARE_BRACKET:S3,CHAR_DOUBLE_QUOTE:pBe,CHAR_SINGLE_QUOTE:dBe,CHAR_NO_BREAK_SPACE:CBe,CHAR_ZERO_WIDTH_NOBREAK_SPACE:mBe}=B3(),EBe=(r,e={})=>{if(typeof r!="string")throw new TypeError("Expected a string");let t=e||{},i=typeof t.maxLength=="number"?Math.min(b3,t.maxLength):b3;if(r.length>i)throw new SyntaxError(`Input length (${r.length}), exceeds max characters (${i})`);let n={type:"root",input:r,nodes:[]},s=[n],o=n,a=n,l=0,c=r.length,u=0,g=0,f,h={},p=()=>r[u++],C=y=>{if(y.type==="text"&&a.type==="dot"&&(a.type="text"),a&&a.type==="text"&&y.type==="text"){a.value+=y.value;return}return o.nodes.push(y),y.parent=o,y.prev=a,a=y,y};for(C({type:"bos"});u<c;)if(o=s[s.length-1],f=p(),!(f===mBe||f===CBe)){if(f===vx){C({type:"text",value:(e.keepEscaping?f:"")+p()});continue}if(f===S3){C({type:"text",value:"\\"+f});continue}if(f===Q3){l++;let y=!0,B;for(;u<c&&(B=p());){if(f+=B,B===Q3){l++;continue}if(B===vx){f+=p();continue}if(B===S3&&(l--,l===0))break}C({type:"text",value:f});continue}if(f===uBe){o=C({type:"paren",nodes:[]}),s.push(o),C({type:"text",value:f});continue}if(f===gBe){if(o.type!=="paren"){C({type:"text",value:f});continue}o=s.pop(),C({type:"text",value:f}),o=s[s.length-1];continue}if(f===pBe||f===dBe||f===ABe){let y=f,B;for(e.keepQuotes!==!0&&(f="");u<c&&(B=p());){if(B===vx){f+=B+p();continue}if(B===y){e.keepQuotes===!0&&(f+=B);break}f+=B}C({type:"text",value:f});continue}if(f===fBe){g++;let B={type:"brace",open:!0,close:!1,dollar:a.value&&a.value.slice(-1)==="$"||o.dollar===!0,depth:g,commas:0,ranges:0,nodes:[]};o=C(B),s.push(o),C({type:"open",value:f});continue}if(f===hBe){if(o.type!=="brace"){C({type:"text",value:f});continue}let y="close";o=s.pop(),o.close=!0,C({type:y,value:f}),g--,o=s[s.length-1];continue}if(f===lBe&&g>0){if(o.ranges>0){o.ranges=0;let y=o.nodes.shift();o.nodes=[y,{type:"text",value:aBe(o)}]}C({type:"comma",value:f}),o.commas++;continue}if(f===cBe&&g>0&&o.commas===0){let y=o.nodes;if(g===0||y.length===0){C({type:"text",value:f});continue}if(a.type==="dot"){if(o.range=[],a.value+=f,a.type="range",o.nodes.length!==3&&o.nodes.length!==5){o.invalid=!0,o.ranges=0,a.type="text";continue}o.ranges++,o.args=[];continue}if(a.type==="range"){y.pop();let B=y[y.length-1];B.value+=a.value+f,a=B,o.ranges--;continue}C({type:"dot",value:f});continue}C({type:"text",value:f})}do if(o=s.pop(),o.type!=="root"){o.nodes.forEach(v=>{v.nodes||(v.type==="open"&&(v.isOpen=!0),v.type==="close"&&(v.isClose=!0),v.nodes||(v.type="text"),v.invalid=!0)});let y=s[s.length-1],B=y.nodes.indexOf(o);y.nodes.splice(B,1,...o.nodes)}while(s.length>0);return C({type:"eos"}),n};v3.exports=EBe});var k3=w((ftt,D3)=>{"use strict";var P3=Hy(),IBe=m3(),yBe=y3(),wBe=x3(),Jn=(r,e={})=>{let t=[];if(Array.isArray(r))for(let i of r){let n=Jn.create(i,e);Array.isArray(n)?t.push(...n):t.push(n)}else t=[].concat(Jn.create(r,e));return e&&e.expand===!0&&e.nodupes===!0&&(t=[...new Set(t)]),t};Jn.parse=(r,e={})=>wBe(r,e);Jn.stringify=(r,e={})=>P3(typeof r=="string"?Jn.parse(r,e):r,e);Jn.compile=(r,e={})=>(typeof r=="string"&&(r=Jn.parse(r,e)),IBe(r,e));Jn.expand=(r,e={})=>{typeof r=="string"&&(r=Jn.parse(r,e));let t=yBe(r,e);return e.noempty===!0&&(t=t.filter(Boolean)),e.nodupes===!0&&(t=[...new Set(t)]),t};Jn.create=(r,e={})=>r===""||r.length<3?[r]:e.expand!==!0?Jn.compile(r,e):Jn.expand(r,e);D3.exports=Jn});var Gd=w((htt,L3)=>{"use strict";var BBe=J("path"),Ko="\\\\/",R3=`[^${Ko}]`,Na="\\.",bBe="\\+",QBe="\\?",Yy="\\/",SBe="(?=.)",F3="[^/]",xx=`(?:${Yy}|$)`,N3=`(?:^|${Yy})`,Px=`${Na}{1,2}${xx}`,vBe=`(?!${Na})`,xBe=`(?!${N3}${Px})`,PBe=`(?!${Na}{0,1}${xx})`,DBe=`(?!${Px})`,kBe=`[^.${Yy}]`,RBe=`${F3}*?`,T3={DOT_LITERAL:Na,PLUS_LITERAL:bBe,QMARK_LITERAL:QBe,SLASH_LITERAL:Yy,ONE_CHAR:SBe,QMARK:F3,END_ANCHOR:xx,DOTS_SLASH:Px,NO_DOT:vBe,NO_DOTS:xBe,NO_DOT_SLASH:PBe,NO_DOTS_SLASH:DBe,QMARK_NO_DOT:kBe,STAR:RBe,START_ANCHOR:N3},FBe={...T3,SLASH_LITERAL:`[${Ko}]`,QMARK:R3,STAR:`${R3}*?`,DOTS_SLASH:`${Na}{1,2}(?:[${Ko}]|$)`,NO_DOT:`(?!${Na})`,NO_DOTS:`(?!(?:^|[${Ko}])${Na}{1,2}(?:[${Ko}]|$))`,NO_DOT_SLASH:`(?!${Na}{0,1}(?:[${Ko}]|$))`,NO_DOTS_SLASH:`(?!${Na}{1,2}(?:[${Ko}]|$))`,QMARK_NO_DOT:`[^.${Ko}]`,START_ANCHOR:`(?:^|[${Ko}])`,END_ANCHOR:`(?:[${Ko}]|$)`},NBe={alnum:"a-zA-Z0-9",alpha:"a-zA-Z",ascii:"\\x00-\\x7F",blank:" \\t",cntrl:"\\x00-\\x1F\\x7F",digit:"0-9",graph:"\\x21-\\x7E",lower:"a-z",print:"\\x20-\\x7E ",punct:"\\-!\"#$%&'()\\*+,./:;<=>?@[\\]^_`{|}~",space:" \\t\\r\\n\\v\\f",upper:"A-Z",word:"A-Za-z0-9_",xdigit:"A-Fa-f0-9"};L3.exports={MAX_LENGTH:1024*64,POSIX_REGEX_SOURCE:NBe,REGEX_BACKSLASH:/\\(?![*+?^${}(|)[\]])/g,REGEX_NON_SPECIAL_CHARS:/^[^@![\].,$*+?^{}()|\\/]+/,REGEX_SPECIAL_CHARS:/[-*+?.^${}(|)[\]]/,REGEX_SPECIAL_CHARS_BACKREF:/(\\?)((\W)(\3*))/g,REGEX_SPECIAL_CHARS_GLOBAL:/([-*+?.^${}(|)[\]])/g,REGEX_REMOVE_BACKSLASH:/(?:\[.*?[^\\]\]|\\(?=.))/g,REPLACEMENTS:{"***":"*","**/**":"**","**/**/**":"**"},CHAR_0:48,CHAR_9:57,CHAR_UPPERCASE_A:65,CHAR_LOWERCASE_A:97,CHAR_UPPERCASE_Z:90,CHAR_LOWERCASE_Z:122,CHAR_LEFT_PARENTHESES:40,CHAR_RIGHT_PARENTHESES:41,CHAR_ASTERISK:42,CHAR_AMPERSAND:38,CHAR_AT:64,CHAR_BACKWARD_SLASH:92,CHAR_CARRIAGE_RETURN:13,CHAR_CIRCUMFLEX_ACCENT:94,CHAR_COLON:58,CHAR_COMMA:44,CHAR_DOT:46,CHAR_DOUBLE_QUOTE:34,CHAR_EQUAL:61,CHAR_EXCLAMATION_MARK:33,CHAR_FORM_FEED:12,CHAR_FORWARD_SLASH:47,CHAR_GRAVE_ACCENT:96,CHAR_HASH:35,CHAR_HYPHEN_MINUS:45,CHAR_LEFT_ANGLE_BRACKET:60,CHAR_LEFT_CURLY_BRACE:123,CHAR_LEFT_SQUARE_BRACKET:91,CHAR_LINE_FEED:10,CHAR_NO_BREAK_SPACE:160,CHAR_PERCENT:37,CHAR_PLUS:43,CHAR_QUESTION_MARK:63,CHAR_RIGHT_ANGLE_BRACKET:62,CHAR_RIGHT_CURLY_BRACE:125,CHAR_RIGHT_SQUARE_BRACKET:93,CHAR_SEMICOLON:59,CHAR_SINGLE_QUOTE:39,CHAR_SPACE:32,CHAR_TAB:9,CHAR_UNDERSCORE:95,CHAR_VERTICAL_LINE:124,CHAR_ZERO_WIDTH_NOBREAK_SPACE:65279,SEP:BBe.sep,extglobChars(r){return{"!":{type:"negate",open:"(?:(?!(?:",close:`))${r.STAR})`},"?":{type:"qmark",open:"(?:",close:")?"},"+":{type:"plus",open:"(?:",close:")+"},"*":{type:"star",open:"(?:",close:")*"},"@":{type:"at",open:"(?:",close:")"}}},globChars(r){return r===!0?FBe:T3}}});var Yd=w(wn=>{"use strict";var TBe=J("path"),LBe=process.platform==="win32",{REGEX_BACKSLASH:OBe,REGEX_REMOVE_BACKSLASH:MBe,REGEX_SPECIAL_CHARS:KBe,REGEX_SPECIAL_CHARS_GLOBAL:UBe}=Gd();wn.isObject=r=>r!==null&&typeof r=="object"&&!Array.isArray(r);wn.hasRegexChars=r=>KBe.test(r);wn.isRegexChar=r=>r.length===1&&wn.hasRegexChars(r);wn.escapeRegex=r=>r.replace(UBe,"\\$1");wn.toPosixSlashes=r=>r.replace(OBe,"/");wn.removeBackslashes=r=>r.replace(MBe,e=>e==="\\"?"":e);wn.supportsLookbehinds=()=>{let r=process.version.slice(1).split(".").map(Number);return r.length===3&&r[0]>=9||r[0]===8&&r[1]>=10};wn.isWindows=r=>r&&typeof r.windows=="boolean"?r.windows:LBe===!0||TBe.sep==="\\";wn.escapeLast=(r,e,t)=>{let i=r.lastIndexOf(e,t);return i===-1?r:r[i-1]==="\\"?wn.escapeLast(r,e,i-1):`${r.slice(0,i)}\\${r.slice(i)}`};wn.removePrefix=(r,e={})=>{let t=r;return t.startsWith("./")&&(t=t.slice(2),e.prefix="./"),t};wn.wrapOutput=(r,e={},t={})=>{let i=t.contains?"":"^",n=t.contains?"":"$",s=`${i}(?:${r})${n}`;return e.negated===!0&&(s=`(?:^(?!${s}).*$)`),s}});var j3=w((dtt,Y3)=>{"use strict";var O3=Yd(),{CHAR_ASTERISK:Dx,CHAR_AT:HBe,CHAR_BACKWARD_SLASH:jd,CHAR_COMMA:GBe,CHAR_DOT:kx,CHAR_EXCLAMATION_MARK:Rx,CHAR_FORWARD_SLASH:G3,CHAR_LEFT_CURLY_BRACE:Fx,CHAR_LEFT_PARENTHESES:Nx,CHAR_LEFT_SQUARE_BRACKET:YBe,CHAR_PLUS:jBe,CHAR_QUESTION_MARK:M3,CHAR_RIGHT_CURLY_BRACE:qBe,CHAR_RIGHT_PARENTHESES:K3,CHAR_RIGHT_SQUARE_BRACKET:JBe}=Gd(),U3=r=>r===G3||r===jd,H3=r=>{r.isPrefix!==!0&&(r.depth=r.isGlobstar?1/0:1)},WBe=(r,e)=>{let t=e||{},i=r.length-1,n=t.parts===!0||t.scanToEnd===!0,s=[],o=[],a=[],l=r,c=-1,u=0,g=0,f=!1,h=!1,p=!1,C=!1,y=!1,B=!1,v=!1,D=!1,T=!1,H=!1,j=0,$,V,W={value:"",depth:0,isGlob:!1},_=()=>c>=i,A=()=>l.charCodeAt(c+1),Ae=()=>($=V,l.charCodeAt(++c));for(;c<i;){V=Ae();let ue;if(V===jd){v=W.backslashes=!0,V=Ae(),V===Fx&&(B=!0);continue}if(B===!0||V===Fx){for(j++;_()!==!0&&(V=Ae());){if(V===jd){v=W.backslashes=!0,Ae();continue}if(V===Fx){j++;continue}if(B!==!0&&V===kx&&(V=Ae())===kx){if(f=W.isBrace=!0,p=W.isGlob=!0,H=!0,n===!0)continue;break}if(B!==!0&&V===GBe){if(f=W.isBrace=!0,p=W.isGlob=!0,H=!0,n===!0)continue;break}if(V===qBe&&(j--,j===0)){B=!1,f=W.isBrace=!0,H=!0;break}}if(n===!0)continue;break}if(V===G3){if(s.push(c),o.push(W),W={value:"",depth:0,isGlob:!1},H===!0)continue;if($===kx&&c===u+1){u+=2;continue}g=c+1;continue}if(t.noext!==!0&&(V===jBe||V===HBe||V===Dx||V===M3||V===Rx)===!0&&A()===Nx){if(p=W.isGlob=!0,C=W.isExtglob=!0,H=!0,V===Rx&&c===u&&(T=!0),n===!0){for(;_()!==!0&&(V=Ae());){if(V===jd){v=W.backslashes=!0,V=Ae();continue}if(V===K3){p=W.isGlob=!0,H=!0;break}}continue}break}if(V===Dx){if($===Dx&&(y=W.isGlobstar=!0),p=W.isGlob=!0,H=!0,n===!0)continue;break}if(V===M3){if(p=W.isGlob=!0,H=!0,n===!0)continue;break}if(V===YBe){for(;_()!==!0&&(ue=Ae());){if(ue===jd){v=W.backslashes=!0,Ae();continue}if(ue===JBe){h=W.isBracket=!0,p=W.isGlob=!0,H=!0;break}}if(n===!0)continue;break}if(t.nonegate!==!0&&V===Rx&&c===u){D=W.negated=!0,u++;continue}if(t.noparen!==!0&&V===Nx){if(p=W.isGlob=!0,n===!0){for(;_()!==!0&&(V=Ae());){if(V===Nx){v=W.backslashes=!0,V=Ae();continue}if(V===K3){H=!0;break}}continue}break}if(p===!0){if(H=!0,n===!0)continue;break}}t.noext===!0&&(C=!1,p=!1);let ge=l,re="",O="";u>0&&(re=l.slice(0,u),l=l.slice(u),g-=u),ge&&p===!0&&g>0?(ge=l.slice(0,g),O=l.slice(g)):p===!0?(ge="",O=l):ge=l,ge&&ge!==""&&ge!=="/"&&ge!==l&&U3(ge.charCodeAt(ge.length-1))&&(ge=ge.slice(0,-1)),t.unescape===!0&&(O&&(O=O3.removeBackslashes(O)),ge&&v===!0&&(ge=O3.removeBackslashes(ge)));let F={prefix:re,input:r,start:u,base:ge,glob:O,isBrace:f,isBracket:h,isGlob:p,isExtglob:C,isGlobstar:y,negated:D,negatedExtglob:T};if(t.tokens===!0&&(F.maxDepth=0,U3(V)||o.push(W),F.tokens=o),t.parts===!0||t.tokens===!0){let ue;for(let pe=0;pe<s.length;pe++){let ke=ue?ue+1:u,Fe=s[pe],Ne=r.slice(ke,Fe);t.tokens&&(pe===0&&u!==0?(o[pe].isPrefix=!0,o[pe].value=re):o[pe].value=Ne,H3(o[pe]),F.maxDepth+=o[pe].depth),(pe!==0||Ne!=="")&&a.push(Ne),ue=Fe}if(ue&&ue+1<r.length){let pe=r.slice(ue+1);a.push(pe),t.tokens&&(o[o.length-1].value=pe,H3(o[o.length-1]),F.maxDepth+=o[o.length-1].depth)}F.slashes=s,F.parts=a}return F};Y3.exports=WBe});var W3=w((Ctt,J3)=>{"use strict";var jy=Gd(),Wn=Yd(),{MAX_LENGTH:qy,POSIX_REGEX_SOURCE:zBe,REGEX_NON_SPECIAL_CHARS:VBe,REGEX_SPECIAL_CHARS_BACKREF:XBe,REPLACEMENTS:q3}=jy,ZBe=(r,e)=>{if(typeof e.expandRange=="function")return e.expandRange(...r,e);r.sort();let t=`[${r.join("-")}]`;try{new RegExp(t)}catch{return r.map(n=>Wn.escapeRegex(n)).join("..")}return t},ff=(r,e)=>`Missing ${r}: "${e}" - use "\\\\${e}" to match literal characters`,Tx=(r,e)=>{if(typeof r!="string")throw new TypeError("Expected a string");r=q3[r]||r;let t={...e},i=typeof t.maxLength=="number"?Math.min(qy,t.maxLength):qy,n=r.length;if(n>i)throw new SyntaxError(`Input length: ${n}, exceeds maximum allowed length: ${i}`);let s={type:"bos",value:"",output:t.prepend||""},o=[s],a=t.capture?"":"?:",l=Wn.isWindows(e),c=jy.globChars(l),u=jy.extglobChars(c),{DOT_LITERAL:g,PLUS_LITERAL:f,SLASH_LITERAL:h,ONE_CHAR:p,DOTS_SLASH:C,NO_DOT:y,NO_DOT_SLASH:B,NO_DOTS_SLASH:v,QMARK:D,QMARK_NO_DOT:T,STAR:H,START_ANCHOR:j}=c,$=Y=>`(${a}(?:(?!${j}${Y.dot?C:g}).)*?)`,V=t.dot?"":y,W=t.dot?D:T,_=t.bash===!0?$(t):H;t.capture&&(_=`(${_})`),typeof t.noext=="boolean"&&(t.noextglob=t.noext);let A={input:r,index:-1,start:0,dot:t.dot===!0,consumed:"",output:"",prefix:"",backtrack:!1,negated:!1,brackets:0,braces:0,parens:0,quotes:0,globstar:!1,tokens:o};r=Wn.removePrefix(r,A),n=r.length;let Ae=[],ge=[],re=[],O=s,F,ue=()=>A.index===n-1,pe=A.peek=(Y=1)=>r[A.index+Y],ke=A.advance=()=>r[++A.index]||"",Fe=()=>r.slice(A.index+1),Ne=(Y="",he=0)=>{A.consumed+=Y,A.index+=he},oe=Y=>{A.output+=Y.output!=null?Y.output:Y.value,Ne(Y.value)},le=()=>{let Y=1;for(;pe()==="!"&&(pe(2)!=="("||pe(3)==="?");)ke(),A.start++,Y++;return Y%2===0?!1:(A.negated=!0,A.start++,!0)},Be=Y=>{A[Y]++,re.push(Y)},fe=Y=>{A[Y]--,re.pop()},ae=Y=>{if(O.type==="globstar"){let he=A.braces>0&&(Y.type==="comma"||Y.type==="brace"),ie=Y.extglob===!0||Ae.length&&(Y.type==="pipe"||Y.type==="paren");Y.type!=="slash"&&Y.type!=="paren"&&!he&&!ie&&(A.output=A.output.slice(0,-O.output.length),O.type="star",O.value="*",O.output=_,A.output+=O.output)}if(Ae.length&&Y.type!=="paren"&&(Ae[Ae.length-1].inner+=Y.value),(Y.value||Y.output)&&oe(Y),O&&O.type==="text"&&Y.type==="text"){O.value+=Y.value,O.output=(O.output||"")+Y.value;return}Y.prev=O,o.push(Y),O=Y},qe=(Y,he)=>{let ie={...u[he],conditions:1,inner:""};ie.prev=O,ie.parens=A.parens,ie.output=A.output;let de=(t.capture?"(":"")+ie.open;Be("parens"),ae({type:Y,value:he,output:A.output?"":p}),ae({type:"paren",extglob:!0,value:ke(),output:de}),Ae.push(ie)},ne=Y=>{let he=Y.close+(t.capture?")":""),ie;if(Y.type==="negate"){let de=_;if(Y.inner&&Y.inner.length>1&&Y.inner.includes("/")&&(de=$(t)),(de!==_||ue()||/^\)+$/.test(Fe()))&&(he=Y.close=`)$))${de}`),Y.inner.includes("*")&&(ie=Fe())&&/^\.[^\\/.]+$/.test(ie)){let _e=Tx(ie,{...e,fastpaths:!1}).output;he=Y.close=`)${_e})${de})`}Y.prev.type==="bos"&&(A.negatedExtglob=!0)}ae({type:"paren",extglob:!0,value:F,output:he}),fe("parens")};if(t.fastpaths!==!1&&!/(^[*!]|[/()[\]{}"])/.test(r)){let Y=!1,he=r.replace(XBe,(ie,de,_e,Pt,It,Or)=>Pt==="\\"?(Y=!0,ie):Pt==="?"?de?de+Pt+(It?D.repeat(It.length):""):Or===0?W+(It?D.repeat(It.length):""):D.repeat(_e.length):Pt==="."?g.repeat(_e.length):Pt==="*"?de?de+Pt+(It?_:""):_:de?ie:`\\${ie}`);return Y===!0&&(t.unescape===!0?he=he.replace(/\\/g,""):he=he.replace(/\\+/g,ie=>ie.length%2===0?"\\\\":ie?"\\":"")),he===r&&t.contains===!0?(A.output=r,A):(A.output=Wn.wrapOutput(he,A,e),A)}for(;!ue();){if(F=ke(),F==="\0")continue;if(F==="\\"){let ie=pe();if(ie==="/"&&t.bash!==!0||ie==="."||ie===";")continue;if(!ie){F+="\\",ae({type:"text",value:F});continue}let de=/^\\+/.exec(Fe()),_e=0;if(de&&de[0].length>2&&(_e=de[0].length,A.index+=_e,_e%2!==0&&(F+="\\")),t.unescape===!0?F=ke():F+=ke(),A.brackets===0){ae({type:"text",value:F});continue}}if(A.brackets>0&&(F!=="]"||O.value==="["||O.value==="[^")){if(t.posix!==!1&&F===":"){let ie=O.value.slice(1);if(ie.includes("[")&&(O.posix=!0,ie.includes(":"))){let de=O.value.lastIndexOf("["),_e=O.value.slice(0,de),Pt=O.value.slice(de+2),It=zBe[Pt];if(It){O.value=_e+It,A.backtrack=!0,ke(),!s.output&&o.indexOf(O)===1&&(s.output=p);continue}}}(F==="["&&pe()!==":"||F==="-"&&pe()==="]")&&(F=`\\${F}`),F==="]"&&(O.value==="["||O.value==="[^")&&(F=`\\${F}`),t.posix===!0&&F==="!"&&O.value==="["&&(F="^"),O.value+=F,oe({value:F});continue}if(A.quotes===1&&F!=='"'){F=Wn.escapeRegex(F),O.value+=F,oe({value:F});continue}if(F==='"'){A.quotes=A.quotes===1?0:1,t.keepQuotes===!0&&ae({type:"text",value:F});continue}if(F==="("){Be("parens"),ae({type:"paren",value:F});continue}if(F===")"){if(A.parens===0&&t.strictBrackets===!0)throw new SyntaxError(ff("opening","("));let ie=Ae[Ae.length-1];if(ie&&A.parens===ie.parens+1){ne(Ae.pop());continue}ae({type:"paren",value:F,output:A.parens?")":"\\)"}),fe("parens");continue}if(F==="["){if(t.nobracket===!0||!Fe().includes("]")){if(t.nobracket!==!0&&t.strictBrackets===!0)throw new SyntaxError(ff("closing","]"));F=`\\${F}`}else Be("brackets");ae({type:"bracket",value:F});continue}if(F==="]"){if(t.nobracket===!0||O&&O.type==="bracket"&&O.value.length===1){ae({type:"text",value:F,output:`\\${F}`});continue}if(A.brackets===0){if(t.strictBrackets===!0)throw new SyntaxError(ff("opening","["));ae({type:"text",value:F,output:`\\${F}`});continue}fe("brackets");let ie=O.value.slice(1);if(O.posix!==!0&&ie[0]==="^"&&!ie.includes("/")&&(F=`/${F}`),O.value+=F,oe({value:F}),t.literalBrackets===!1||Wn.hasRegexChars(ie))continue;let de=Wn.escapeRegex(O.value);if(A.output=A.output.slice(0,-O.value.length),t.literalBrackets===!0){A.output+=de,O.value=de;continue}O.value=`(${a}${de}|${O.value})`,A.output+=O.value;continue}if(F==="{"&&t.nobrace!==!0){Be("braces");let ie={type:"brace",value:F,output:"(",outputIndex:A.output.length,tokensIndex:A.tokens.length};ge.push(ie),ae(ie);continue}if(F==="}"){let ie=ge[ge.length-1];if(t.nobrace===!0||!ie){ae({type:"text",value:F,output:F});continue}let de=")";if(ie.dots===!0){let _e=o.slice(),Pt=[];for(let It=_e.length-1;It>=0&&(o.pop(),_e[It].type!=="brace");It--)_e[It].type!=="dots"&&Pt.unshift(_e[It].value);de=ZBe(Pt,t),A.backtrack=!0}if(ie.comma!==!0&&ie.dots!==!0){let _e=A.output.slice(0,ie.outputIndex),Pt=A.tokens.slice(ie.tokensIndex);ie.value=ie.output="\\{",F=de="\\}",A.output=_e;for(let It of Pt)A.output+=It.output||It.value}ae({type:"brace",value:F,output:de}),fe("braces"),ge.pop();continue}if(F==="|"){Ae.length>0&&Ae[Ae.length-1].conditions++,ae({type:"text",value:F});continue}if(F===","){let ie=F,de=ge[ge.length-1];de&&re[re.length-1]==="braces"&&(de.comma=!0,ie="|"),ae({type:"comma",value:F,output:ie});continue}if(F==="/"){if(O.type==="dot"&&A.index===A.start+1){A.start=A.index+1,A.consumed="",A.output="",o.pop(),O=s;continue}ae({type:"slash",value:F,output:h});continue}if(F==="."){if(A.braces>0&&O.type==="dot"){O.value==="."&&(O.output=g);let ie=ge[ge.length-1];O.type="dots",O.output+=F,O.value+=F,ie.dots=!0;continue}if(A.braces+A.parens===0&&O.type!=="bos"&&O.type!=="slash"){ae({type:"text",value:F,output:g});continue}ae({type:"dot",value:F,output:g});continue}if(F==="?"){if(!(O&&O.value==="(")&&t.noextglob!==!0&&pe()==="("&&pe(2)!=="?"){qe("qmark",F);continue}if(O&&O.type==="paren"){let de=pe(),_e=F;if(de==="<"&&!Wn.supportsLookbehinds())throw new Error("Node.js v10 or higher is required for regex lookbehinds");(O.value==="("&&!/[!=<:]/.test(de)||de==="<"&&!/<([!=]|\w+>)/.test(Fe()))&&(_e=`\\${F}`),ae({type:"text",value:F,output:_e});continue}if(t.dot!==!0&&(O.type==="slash"||O.type==="bos")){ae({type:"qmark",value:F,output:T});continue}ae({type:"qmark",value:F,output:D});continue}if(F==="!"){if(t.noextglob!==!0&&pe()==="("&&(pe(2)!=="?"||!/[!=<:]/.test(pe(3)))){qe("negate",F);continue}if(t.nonegate!==!0&&A.index===0){le();continue}}if(F==="+"){if(t.noextglob!==!0&&pe()==="("&&pe(2)!=="?"){qe("plus",F);continue}if(O&&O.value==="("||t.regex===!1){ae({type:"plus",value:F,output:f});continue}if(O&&(O.type==="bracket"||O.type==="paren"||O.type==="brace")||A.parens>0){ae({type:"plus",value:F});continue}ae({type:"plus",value:f});continue}if(F==="@"){if(t.noextglob!==!0&&pe()==="("&&pe(2)!=="?"){ae({type:"at",extglob:!0,value:F,output:""});continue}ae({type:"text",value:F});continue}if(F!=="*"){(F==="$"||F==="^")&&(F=`\\${F}`);let ie=VBe.exec(Fe());ie&&(F+=ie[0],A.index+=ie[0].length),ae({type:"text",value:F});continue}if(O&&(O.type==="globstar"||O.star===!0)){O.type="star",O.star=!0,O.value+=F,O.output=_,A.backtrack=!0,A.globstar=!0,Ne(F);continue}let Y=Fe();if(t.noextglob!==!0&&/^\([^?]/.test(Y)){qe("star",F);continue}if(O.type==="star"){if(t.noglobstar===!0){Ne(F);continue}let ie=O.prev,de=ie.prev,_e=ie.type==="slash"||ie.type==="bos",Pt=de&&(de.type==="star"||de.type==="globstar");if(t.bash===!0&&(!_e||Y[0]&&Y[0]!=="/")){ae({type:"star",value:F,output:""});continue}let It=A.braces>0&&(ie.type==="comma"||ie.type==="brace"),Or=Ae.length&&(ie.type==="pipe"||ie.type==="paren");if(!_e&&ie.type!=="paren"&&!It&&!Or){ae({type:"star",value:F,output:""});continue}for(;Y.slice(0,3)==="/**";){let ii=r[A.index+4];if(ii&&ii!=="/")break;Y=Y.slice(3),Ne("/**",3)}if(ie.type==="bos"&&ue()){O.type="globstar",O.value+=F,O.output=$(t),A.output=O.output,A.globstar=!0,Ne(F);continue}if(ie.type==="slash"&&ie.prev.type!=="bos"&&!Pt&&ue()){A.output=A.output.slice(0,-(ie.output+O.output).length),ie.output=`(?:${ie.output}`,O.type="globstar",O.output=$(t)+(t.strictSlashes?")":"|$)"),O.value+=F,A.globstar=!0,A.output+=ie.output+O.output,Ne(F);continue}if(ie.type==="slash"&&ie.prev.type!=="bos"&&Y[0]==="/"){let ii=Y[1]!==void 0?"|$":"";A.output=A.output.slice(0,-(ie.output+O.output).length),ie.output=`(?:${ie.output}`,O.type="globstar",O.output=`${$(t)}${h}|${h}${ii})`,O.value+=F,A.output+=ie.output+O.output,A.globstar=!0,Ne(F+ke()),ae({type:"slash",value:"/",output:""});continue}if(ie.type==="bos"&&Y[0]==="/"){O.type="globstar",O.value+=F,O.output=`(?:^|${h}|${$(t)}${h})`,A.output=O.output,A.globstar=!0,Ne(F+ke()),ae({type:"slash",value:"/",output:""});continue}A.output=A.output.slice(0,-O.output.length),O.type="globstar",O.output=$(t),O.value+=F,A.output+=O.output,A.globstar=!0,Ne(F);continue}let he={type:"star",value:F,output:_};if(t.bash===!0){he.output=".*?",(O.type==="bos"||O.type==="slash")&&(he.output=V+he.output),ae(he);continue}if(O&&(O.type==="bracket"||O.type==="paren")&&t.regex===!0){he.output=F,ae(he);continue}(A.index===A.start||O.type==="slash"||O.type==="dot")&&(O.type==="dot"?(A.output+=B,O.output+=B):t.dot===!0?(A.output+=v,O.output+=v):(A.output+=V,O.output+=V),pe()!=="*"&&(A.output+=p,O.output+=p)),ae(he)}for(;A.brackets>0;){if(t.strictBrackets===!0)throw new SyntaxError(ff("closing","]"));A.output=Wn.escapeLast(A.output,"["),fe("brackets")}for(;A.parens>0;){if(t.strictBrackets===!0)throw new SyntaxError(ff("closing",")"));A.output=Wn.escapeLast(A.output,"("),fe("parens")}for(;A.braces>0;){if(t.strictBrackets===!0)throw new SyntaxError(ff("closing","}"));A.output=Wn.escapeLast(A.output,"{"),fe("braces")}if(t.strictSlashes!==!0&&(O.type==="star"||O.type==="bracket")&&ae({type:"maybe_slash",value:"",output:`${h}?`}),A.backtrack===!0){A.output="";for(let Y of A.tokens)A.output+=Y.output!=null?Y.output:Y.value,Y.suffix&&(A.output+=Y.suffix)}return A};Tx.fastpaths=(r,e)=>{let t={...e},i=typeof t.maxLength=="number"?Math.min(qy,t.maxLength):qy,n=r.length;if(n>i)throw new SyntaxError(`Input length: ${n}, exceeds maximum allowed length: ${i}`);r=q3[r]||r;let s=Wn.isWindows(e),{DOT_LITERAL:o,SLASH_LITERAL:a,ONE_CHAR:l,DOTS_SLASH:c,NO_DOT:u,NO_DOTS:g,NO_DOTS_SLASH:f,STAR:h,START_ANCHOR:p}=jy.globChars(s),C=t.dot?g:u,y=t.dot?f:u,B=t.capture?"":"?:",v={negated:!1,prefix:""},D=t.bash===!0?".*?":h;t.capture&&(D=`(${D})`);let T=V=>V.noglobstar===!0?D:`(${B}(?:(?!${p}${V.dot?c:o}).)*?)`,H=V=>{switch(V){case"*":return`${C}${l}${D}`;case".*":return`${o}${l}${D}`;case"*.*":return`${C}${D}${o}${l}${D}`;case"*/*":return`${C}${D}${a}${l}${y}${D}`;case"**":return C+T(t);case"**/*":return`(?:${C}${T(t)}${a})?${y}${l}${D}`;case"**/*.*":return`(?:${C}${T(t)}${a})?${y}${D}${o}${l}${D}`;case"**/.*":return`(?:${C}${T(t)}${a})?${o}${l}${D}`;default:{let W=/^(.*?)\.(\w+)$/.exec(V);if(!W)return;let _=H(W[1]);return _?_+o+W[2]:void 0}}},j=Wn.removePrefix(r,v),$=H(j);return $&&t.strictSlashes!==!0&&($+=`${a}?`),$};J3.exports=Tx});var V3=w((mtt,z3)=>{"use strict";var _Be=J("path"),$Be=j3(),Lx=W3(),Ox=Yd(),e0e=Gd(),t0e=r=>r&&typeof r=="object"&&!Array.isArray(r),Gr=(r,e,t=!1)=>{if(Array.isArray(r)){let u=r.map(f=>Gr(f,e,t));return f=>{for(let h of u){let p=h(f);if(p)return p}return!1}}let i=t0e(r)&&r.tokens&&r.input;if(r===""||typeof r!="string"&&!i)throw new TypeError("Expected pattern to be a non-empty string");let n=e||{},s=Ox.isWindows(e),o=i?Gr.compileRe(r,e):Gr.makeRe(r,e,!1,!0),a=o.state;delete o.state;let l=()=>!1;if(n.ignore){let u={...e,ignore:null,onMatch:null,onResult:null};l=Gr(n.ignore,u,t)}let c=(u,g=!1)=>{let{isMatch:f,match:h,output:p}=Gr.test(u,o,e,{glob:r,posix:s}),C={glob:r,state:a,regex:o,posix:s,input:u,output:p,match:h,isMatch:f};return typeof n.onResult=="function"&&n.onResult(C),f===!1?(C.isMatch=!1,g?C:!1):l(u)?(typeof n.onIgnore=="function"&&n.onIgnore(C),C.isMatch=!1,g?C:!1):(typeof n.onMatch=="function"&&n.onMatch(C),g?C:!0)};return t&&(c.state=a),c};Gr.test=(r,e,t,{glob:i,posix:n}={})=>{if(typeof r!="string")throw new TypeError("Expected input to be a string");if(r==="")return{isMatch:!1,output:""};let s=t||{},o=s.format||(n?Ox.toPosixSlashes:null),a=r===i,l=a&&o?o(r):r;return a===!1&&(l=o?o(r):r,a=l===i),(a===!1||s.capture===!0)&&(s.matchBase===!0||s.basename===!0?a=Gr.matchBase(r,e,t,n):a=e.exec(l)),{isMatch:Boolean(a),match:a,output:l}};Gr.matchBase=(r,e,t,i=Ox.isWindows(t))=>(e instanceof RegExp?e:Gr.makeRe(e,t)).test(_Be.basename(r));Gr.isMatch=(r,e,t)=>Gr(e,t)(r);Gr.parse=(r,e)=>Array.isArray(r)?r.map(t=>Gr.parse(t,e)):Lx(r,{...e,fastpaths:!1});Gr.scan=(r,e)=>$Be(r,e);Gr.compileRe=(r,e,t=!1,i=!1)=>{if(t===!0)return r.output;let n=e||{},s=n.contains?"":"^",o=n.contains?"":"$",a=`${s}(?:${r.output})${o}`;r&&r.negated===!0&&(a=`^(?!${a}).*$`);let l=Gr.toRegex(a,e);return i===!0&&(l.state=r),l};Gr.makeRe=(r,e={},t=!1,i=!1)=>{if(!r||typeof r!="string")throw new TypeError("Expected a non-empty string");let n={negated:!1,fastpaths:!0};return e.fastpaths!==!1&&(r[0]==="."||r[0]==="*")&&(n.output=Lx.fastpaths(r,e)),n.output||(n=Lx(r,e)),Gr.compileRe(n,e,t,i)};Gr.toRegex=(r,e)=>{try{let t=e||{};return new RegExp(r,t.flags||(t.nocase?"i":""))}catch(t){if(e&&e.debug===!0)throw t;return/$^/}};Gr.constants=e0e;z3.exports=Gr});var Mx=w((Ett,X3)=>{"use strict";X3.exports=V3()});var Bn=w((Itt,eW)=>{"use strict";var _3=J("util"),$3=k3(),Uo=Mx(),Kx=Yd(),Z3=r=>r===""||r==="./",Sr=(r,e,t)=>{e=[].concat(e),r=[].concat(r);let i=new Set,n=new Set,s=new Set,o=0,a=u=>{s.add(u.output),t&&t.onResult&&t.onResult(u)};for(let u=0;u<e.length;u++){let g=Uo(String(e[u]),{...t,onResult:a},!0),f=g.state.negated||g.state.negatedExtglob;f&&o++;for(let h of r){let p=g(h,!0);!(f?!p.isMatch:p.isMatch)||(f?i.add(p.output):(i.delete(p.output),n.add(p.output)))}}let c=(o===e.length?[...s]:[...n]).filter(u=>!i.has(u));if(t&&c.length===0){if(t.failglob===!0)throw new Error(`No matches found for "${e.join(", ")}"`);if(t.nonull===!0||t.nullglob===!0)return t.unescape?e.map(u=>u.replace(/\\/g,"")):e}return c};Sr.match=Sr;Sr.matcher=(r,e)=>Uo(r,e);Sr.isMatch=(r,e,t)=>Uo(e,t)(r);Sr.any=Sr.isMatch;Sr.not=(r,e,t={})=>{e=[].concat(e).map(String);let i=new Set,n=[],o=Sr(r,e,{...t,onResult:a=>{t.onResult&&t.onResult(a),n.push(a.output)}});for(let a of n)o.includes(a)||i.add(a);return[...i]};Sr.contains=(r,e,t)=>{if(typeof r!="string")throw new TypeError(`Expected a string: "${_3.inspect(r)}"`);if(Array.isArray(e))return e.some(i=>Sr.contains(r,i,t));if(typeof e=="string"){if(Z3(r)||Z3(e))return!1;if(r.includes(e)||r.startsWith("./")&&r.slice(2).includes(e))return!0}return Sr.isMatch(r,e,{...t,contains:!0})};Sr.matchKeys=(r,e,t)=>{if(!Kx.isObject(r))throw new TypeError("Expected the first argument to be an object");let i=Sr(Object.keys(r),e,t),n={};for(let s of i)n[s]=r[s];return n};Sr.some=(r,e,t)=>{let i=[].concat(r);for(let n of[].concat(e)){let s=Uo(String(n),t);if(i.some(o=>s(o)))return!0}return!1};Sr.every=(r,e,t)=>{let i=[].concat(r);for(let n of[].concat(e)){let s=Uo(String(n),t);if(!i.every(o=>s(o)))return!1}return!0};Sr.all=(r,e,t)=>{if(typeof r!="string")throw new TypeError(`Expected a string: "${_3.inspect(r)}"`);return[].concat(e).every(i=>Uo(i,t)(r))};Sr.capture=(r,e,t)=>{let i=Kx.isWindows(t),s=Uo.makeRe(String(r),{...t,capture:!0}).exec(i?Kx.toPosixSlashes(e):e);if(s)return s.slice(1).map(o=>o===void 0?"":o)};Sr.makeRe=(...r)=>Uo.makeRe(...r);Sr.scan=(...r)=>Uo.scan(...r);Sr.parse=(r,e)=>{let t=[];for(let i of[].concat(r||[]))for(let n of $3(String(i),e))t.push(Uo.parse(n,e));return t};Sr.braces=(r,e)=>{if(typeof r!="string")throw new TypeError("Expected a string");return e&&e.nobrace===!0||!/\{.*\}/.test(r)?[r]:$3(r,e)};Sr.braceExpand=(r,e)=>{if(typeof r!="string")throw new TypeError("Expected a string");return Sr.braces(r,{...e,expand:!0})};eW.exports=Sr});var rW=w((ytt,tW)=>{"use strict";tW.exports=({onlyFirst:r=!1}={})=>{let e=["[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)","(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))"].join("|");return new RegExp(e,r?void 0:"g")}});var nW=w((wtt,iW)=>{"use strict";var r0e=rW();iW.exports=r=>typeof r=="string"?r.replace(r0e(),""):r});var mW=w((Ftt,CW)=>{"use strict";CW.exports=(...r)=>[...new Set([].concat(...r))]});var sP=w((Ntt,yW)=>{"use strict";var p0e=J("stream"),EW=p0e.PassThrough,d0e=Array.prototype.slice;yW.exports=C0e;function C0e(){let r=[],e=!1,t=d0e.call(arguments),i=t[t.length-1];i&&!Array.isArray(i)&&i.pipe==null?t.pop():i={};let n=i.end!==!1;i.objectMode==null&&(i.objectMode=!0),i.highWaterMark==null&&(i.highWaterMark=64*1024);let s=EW(i);function o(){for(let c=0,u=arguments.length;c<u;c++)r.push(IW(arguments[c],i));return a(),this}function a(){if(e)return;e=!0;let c=r.shift();if(!c){process.nextTick(l);return}Array.isArray(c)||(c=[c]);let u=c.length+1;function g(){--u>0||(e=!1,a())}function f(h){function p(){h.removeListener("merge2UnpipeEnd",p),h.removeListener("end",p),g()}if(h._readableState.endEmitted)return g();h.on("merge2UnpipeEnd",p),h.on("end",p),h.pipe(s,{end:!1}),h.resume()}for(let h=0;h<c.length;h++)f(c[h]);g()}function l(){return e=!1,s.emit("queueDrain"),n&&s.end()}return s.setMaxListeners(0),s.add=o,s.on("unpipe",function(c){c.emit("merge2UnpipeEnd")}),t.length&&o.apply(null,t),s}function IW(r,e){if(Array.isArray(r))for(let t=0,i=r.length;t<i;t++)r[t]=IW(r[t],e);else{if(!r._readableState&&r.pipe&&(r=r.pipe(EW(e))),!r._readableState||!r.pause||!r.pipe)throw new Error("Only readable stream can be merged.");r.pause()}return r}});var wW=w(Zy=>{"use strict";Object.defineProperty(Zy,"__esModule",{value:!0});function m0e(r){return r.reduce((e,t)=>[].concat(e,t),[])}Zy.flatten=m0e;function E0e(r,e){let t=[[]],i=0;for(let n of r)e(n)?(i++,t[i]=[]):t[i].push(n);return t}Zy.splitWhen=E0e});var BW=w(oP=>{"use strict";Object.defineProperty(oP,"__esModule",{value:!0});function I0e(r){return r.code==="ENOENT"}oP.isEnoentCodeError=I0e});var bW=w(AP=>{"use strict";Object.defineProperty(AP,"__esModule",{value:!0});var aP=class{constructor(e,t){this.name=e,this.isBlockDevice=t.isBlockDevice.bind(t),this.isCharacterDevice=t.isCharacterDevice.bind(t),this.isDirectory=t.isDirectory.bind(t),this.isFIFO=t.isFIFO.bind(t),this.isFile=t.isFile.bind(t),this.isSocket=t.isSocket.bind(t),this.isSymbolicLink=t.isSymbolicLink.bind(t)}};function y0e(r,e){return new aP(r,e)}AP.createDirentFromStats=y0e});var QW=w(yf=>{"use strict";Object.defineProperty(yf,"__esModule",{value:!0});var w0e=J("path"),B0e=2,b0e=/(\\?)([()*?[\]{|}]|^!|[!+@](?=\())/g;function Q0e(r){return r.replace(/\\/g,"/")}yf.unixify=Q0e;function S0e(r,e){return w0e.resolve(r,e)}yf.makeAbsolute=S0e;function v0e(r){return r.replace(b0e,"\\$2")}yf.escape=v0e;function x0e(r){if(r.charAt(0)==="."){let e=r.charAt(1);if(e==="/"||e==="\\")return r.slice(B0e)}return r}yf.removeLeadingDotSegment=x0e});var vW=w((Ktt,SW)=>{SW.exports=function(e){if(typeof e!="string"||e==="")return!1;for(var t;t=/(\\).|([@?!+*]\(.*\))/g.exec(e);){if(t[2])return!0;e=e.slice(t.index+t[0].length)}return!1}});var DW=w((Utt,PW)=>{var P0e=vW(),xW={"{":"}","(":")","[":"]"},D0e=function(r){if(r[0]==="!")return!0;for(var e=0,t=-2,i=-2,n=-2,s=-2,o=-2;e<r.length;){if(r[e]==="*"||r[e+1]==="?"&&/[\].+)]/.test(r[e])||i!==-1&&r[e]==="["&&r[e+1]!=="]"&&(i<e&&(i=r.indexOf("]",e)),i>e&&(o===-1||o>i||(o=r.indexOf("\\",e),o===-1||o>i)))||n!==-1&&r[e]==="{"&&r[e+1]!=="}"&&(n=r.indexOf("}",e),n>e&&(o=r.indexOf("\\",e),o===-1||o>n))||s!==-1&&r[e]==="("&&r[e+1]==="?"&&/[:!=]/.test(r[e+2])&&r[e+3]!==")"&&(s=r.indexOf(")",e),s>e&&(o=r.indexOf("\\",e),o===-1||o>s))||t!==-1&&r[e]==="("&&r[e+1]!=="|"&&(t<e&&(t=r.indexOf("|",e)),t!==-1&&r[t+1]!==")"&&(s=r.indexOf(")",t),s>t&&(o=r.indexOf("\\",t),o===-1||o>s))))return!0;if(r[e]==="\\"){var a=r[e+1];e+=2;var l=xW[a];if(l){var c=r.indexOf(l,e);c!==-1&&(e=c+1)}if(r[e]==="!")return!0}else e++}return!1},k0e=function(r){if(r[0]==="!")return!0;for(var e=0;e<r.length;){if(/[*?{}()[\]]/.test(r[e]))return!0;if(r[e]==="\\"){var t=r[e+1];e+=2;var i=xW[t];if(i){var n=r.indexOf(i,e);n!==-1&&(e=n+1)}if(r[e]==="!")return!0}else e++}return!1};PW.exports=function(e,t){if(typeof e!="string"||e==="")return!1;if(P0e(e))return!0;var i=D0e;return t&&t.strict===!1&&(i=k0e),i(e)}});var RW=w((Htt,kW)=>{"use strict";var R0e=DW(),F0e=J("path").posix.dirname,N0e=J("os").platform()==="win32",lP="/",T0e=/\\/g,L0e=/[\{\[].*[\}\]]$/,O0e=/(^|[^\\])([\{\[]|\([^\)]+$)/,M0e=/\\([\!\*\?\|\[\]\(\)\{\}])/g;kW.exports=function(e,t){var i=Object.assign({flipBackslashes:!0},t);i.flipBackslashes&&N0e&&e.indexOf(lP)<0&&(e=e.replace(T0e,lP)),L0e.test(e)&&(e+=lP),e+="a";do e=F0e(e);while(R0e(e)||O0e.test(e));return e.replace(M0e,"$1")}});var HW=w($r=>{"use strict";Object.defineProperty($r,"__esModule",{value:!0});var K0e=J("path"),U0e=RW(),FW=Bn(),H0e=Mx(),NW="**",G0e="\\",Y0e=/[*?]|^!/,j0e=/\[.*]/,q0e=/(?:^|[^!*+?@])\(.*\|.*\)/,J0e=/[!*+?@]\(.*\)/,W0e=/{.*(?:,|\.\.).*}/;function TW(r,e={}){return!LW(r,e)}$r.isStaticPattern=TW;function LW(r,e={}){return!!(e.caseSensitiveMatch===!1||r.includes(G0e)||Y0e.test(r)||j0e.test(r)||q0e.test(r)||e.extglob!==!1&&J0e.test(r)||e.braceExpansion!==!1&&W0e.test(r))}$r.isDynamicPattern=LW;function z0e(r){return _y(r)?r.slice(1):r}$r.convertToPositivePattern=z0e;function V0e(r){return"!"+r}$r.convertToNegativePattern=V0e;function _y(r){return r.startsWith("!")&&r[1]!=="("}$r.isNegativePattern=_y;function OW(r){return!_y(r)}$r.isPositivePattern=OW;function X0e(r){return r.filter(_y)}$r.getNegativePatterns=X0e;function Z0e(r){return r.filter(OW)}$r.getPositivePatterns=Z0e;function _0e(r){return U0e(r,{flipBackslashes:!1})}$r.getBaseDirectory=_0e;function $0e(r){return r.includes(NW)}$r.hasGlobStar=$0e;function MW(r){return r.endsWith("/"+NW)}$r.endsWithSlashGlobStar=MW;function ebe(r){let e=K0e.basename(r);return MW(r)||TW(e)}$r.isAffectDepthOfReadingPattern=ebe;function tbe(r){return r.reduce((e,t)=>e.concat(KW(t)),[])}$r.expandPatternsWithBraceExpansion=tbe;function KW(r){return FW.braces(r,{expand:!0,nodupes:!0})}$r.expandBraceExpansion=KW;function rbe(r,e){let t=H0e.scan(r,Object.assign(Object.assign({},e),{parts:!0}));return t.parts.length===0?[r]:t.parts}$r.getPatternParts=rbe;function UW(r,e){return FW.makeRe(r,e)}$r.makeRe=UW;function ibe(r,e){return r.map(t=>UW(t,e))}$r.convertPatternsToRe=ibe;function nbe(r,e){return e.some(t=>t.test(r))}$r.matchAny=nbe});var YW=w(cP=>{"use strict";Object.defineProperty(cP,"__esModule",{value:!0});var sbe=sP();function obe(r){let e=sbe(r);return r.forEach(t=>{t.once("error",i=>e.emit("error",i))}),e.once("close",()=>GW(r)),e.once("end",()=>GW(r)),e}cP.merge=obe;function GW(r){r.forEach(e=>e.emit("close"))}});var jW=w($y=>{"use strict";Object.defineProperty($y,"__esModule",{value:!0});function abe(r){return typeof r=="string"}$y.isString=abe;function Abe(r){return r===""}$y.isEmpty=Abe});var Oa=w(La=>{"use strict";Object.defineProperty(La,"__esModule",{value:!0});var lbe=wW();La.array=lbe;var cbe=BW();La.errno=cbe;var ube=bW();La.fs=ube;var gbe=QW();La.path=gbe;var fbe=HW();La.pattern=fbe;var hbe=YW();La.stream=hbe;var pbe=jW();La.string=pbe});var VW=w(Ma=>{"use strict";Object.defineProperty(Ma,"__esModule",{value:!0});var bc=Oa();function dbe(r,e){let t=qW(r),i=JW(r,e.ignore),n=t.filter(l=>bc.pattern.isStaticPattern(l,e)),s=t.filter(l=>bc.pattern.isDynamicPattern(l,e)),o=uP(n,i,!1),a=uP(s,i,!0);return o.concat(a)}Ma.generate=dbe;function uP(r,e,t){let i=WW(r);return"."in i?[gP(".",r,e,t)]:zW(i,e,t)}Ma.convertPatternsToTasks=uP;function qW(r){return bc.pattern.getPositivePatterns(r)}Ma.getPositivePatterns=qW;function JW(r,e){return bc.pattern.getNegativePatterns(r).concat(e).map(bc.pattern.convertToPositivePattern)}Ma.getNegativePatternsAsPositive=JW;function WW(r){let e={};return r.reduce((t,i)=>{let n=bc.pattern.getBaseDirectory(i);return n in t?t[n].push(i):t[n]=[i],t},e)}Ma.groupPatternsByBaseDirectory=WW;function zW(r,e,t){return Object.keys(r).map(i=>gP(i,r[i],e,t))}Ma.convertPatternGroupsToTasks=zW;function gP(r,e,t,i){return{dynamic:i,positive:e,negative:t,base:r,patterns:[].concat(e,t.map(bc.pattern.convertToNegativePattern))}}Ma.convertPatternGroupToTask=gP});var ZW=w(ew=>{"use strict";Object.defineProperty(ew,"__esModule",{value:!0});ew.read=void 0;function Cbe(r,e,t){e.fs.lstat(r,(i,n)=>{if(i!==null){XW(t,i);return}if(!n.isSymbolicLink()||!e.followSymbolicLink){fP(t,n);return}e.fs.stat(r,(s,o)=>{if(s!==null){if(e.throwErrorOnBrokenSymbolicLink){XW(t,s);return}fP(t,n);return}e.markSymbolicLink&&(o.isSymbolicLink=()=>!0),fP(t,o)})})}ew.read=Cbe;function XW(r,e){r(e)}function fP(r,e){r(null,e)}});var _W=w(tw=>{"use strict";Object.defineProperty(tw,"__esModule",{value:!0});tw.read=void 0;function mbe(r,e){let t=e.fs.lstatSync(r);if(!t.isSymbolicLink()||!e.followSymbolicLink)return t;try{let i=e.fs.statSync(r);return e.markSymbolicLink&&(i.isSymbolicLink=()=>!0),i}catch(i){if(!e.throwErrorOnBrokenSymbolicLink)return t;throw i}}tw.read=mbe});var $W=w(UA=>{"use strict";Object.defineProperty(UA,"__esModule",{value:!0});UA.createFileSystemAdapter=UA.FILE_SYSTEM_ADAPTER=void 0;var rw=J("fs");UA.FILE_SYSTEM_ADAPTER={lstat:rw.lstat,stat:rw.stat,lstatSync:rw.lstatSync,statSync:rw.statSync};function Ebe(r){return r===void 0?UA.FILE_SYSTEM_ADAPTER:Object.assign(Object.assign({},UA.FILE_SYSTEM_ADAPTER),r)}UA.createFileSystemAdapter=Ebe});var e4=w(pP=>{"use strict";Object.defineProperty(pP,"__esModule",{value:!0});var Ibe=$W(),hP=class{constructor(e={}){this._options=e,this.followSymbolicLink=this._getValue(this._options.followSymbolicLink,!0),this.fs=Ibe.createFileSystemAdapter(this._options.fs),this.markSymbolicLink=this._getValue(this._options.markSymbolicLink,!1),this.throwErrorOnBrokenSymbolicLink=this._getValue(this._options.throwErrorOnBrokenSymbolicLink,!0)}_getValue(e,t){return e!=null?e:t}};pP.default=hP});var Qc=w(HA=>{"use strict";Object.defineProperty(HA,"__esModule",{value:!0});HA.statSync=HA.stat=HA.Settings=void 0;var t4=ZW(),ybe=_W(),dP=e4();HA.Settings=dP.default;function wbe(r,e,t){if(typeof e=="function"){t4.read(r,CP(),e);return}t4.read(r,CP(e),t)}HA.stat=wbe;function Bbe(r,e){let t=CP(e);return ybe.read(r,t)}HA.statSync=Bbe;function CP(r={}){return r instanceof dP.default?r:new dP.default(r)}});var i4=w((_tt,r4)=>{r4.exports=bbe;function bbe(r,e){var t,i,n,s=!0;Array.isArray(r)?(t=[],i=r.length):(n=Object.keys(r),t={},i=n.length);function o(l){function c(){e&&e(l,t),e=null}s?process.nextTick(c):c()}function a(l,c,u){t[l]=u,(--i===0||c)&&o(c)}i?n?n.forEach(function(l){r[l](function(c,u){a(l,c,u)})}):r.forEach(function(l,c){l(function(u,g){a(c,u,g)})}):o(null),s=!1}});var mP=w(nw=>{"use strict";Object.defineProperty(nw,"__esModule",{value:!0});nw.IS_SUPPORT_READDIR_WITH_FILE_TYPES=void 0;var iw=process.versions.node.split(".");if(iw[0]===void 0||iw[1]===void 0)throw new Error(`Unexpected behavior. The 'process.versions.node' variable has invalid value: ${process.versions.node}`);var n4=Number.parseInt(iw[0],10),Qbe=Number.parseInt(iw[1],10),s4=10,Sbe=10,vbe=n4>s4,xbe=n4===s4&&Qbe>=Sbe;nw.IS_SUPPORT_READDIR_WITH_FILE_TYPES=vbe||xbe});var o4=w(sw=>{"use strict";Object.defineProperty(sw,"__esModule",{value:!0});sw.createDirentFromStats=void 0;var EP=class{constructor(e,t){this.name=e,this.isBlockDevice=t.isBlockDevice.bind(t),this.isCharacterDevice=t.isCharacterDevice.bind(t),this.isDirectory=t.isDirectory.bind(t),this.isFIFO=t.isFIFO.bind(t),this.isFile=t.isFile.bind(t),this.isSocket=t.isSocket.bind(t),this.isSymbolicLink=t.isSymbolicLink.bind(t)}};function Pbe(r,e){return new EP(r,e)}sw.createDirentFromStats=Pbe});var IP=w(ow=>{"use strict";Object.defineProperty(ow,"__esModule",{value:!0});ow.fs=void 0;var Dbe=o4();ow.fs=Dbe});var yP=w(aw=>{"use strict";Object.defineProperty(aw,"__esModule",{value:!0});aw.joinPathSegments=void 0;function kbe(r,e,t){return r.endsWith(t)?r+e:r+t+e}aw.joinPathSegments=kbe});var g4=w(GA=>{"use strict";Object.defineProperty(GA,"__esModule",{value:!0});GA.readdir=GA.readdirWithFileTypes=GA.read=void 0;var Rbe=Qc(),a4=i4(),Fbe=mP(),A4=IP(),l4=yP();function Nbe(r,e,t){if(!e.stats&&Fbe.IS_SUPPORT_READDIR_WITH_FILE_TYPES){c4(r,e,t);return}u4(r,e,t)}GA.read=Nbe;function c4(r,e,t){e.fs.readdir(r,{withFileTypes:!0},(i,n)=>{if(i!==null){Aw(t,i);return}let s=n.map(a=>({dirent:a,name:a.name,path:l4.joinPathSegments(r,a.name,e.pathSegmentSeparator)}));if(!e.followSymbolicLinks){wP(t,s);return}let o=s.map(a=>Tbe(a,e));a4(o,(a,l)=>{if(a!==null){Aw(t,a);return}wP(t,l)})})}GA.readdirWithFileTypes=c4;function Tbe(r,e){return t=>{if(!r.dirent.isSymbolicLink()){t(null,r);return}e.fs.stat(r.path,(i,n)=>{if(i!==null){if(e.throwErrorOnBrokenSymbolicLink){t(i);return}t(null,r);return}r.dirent=A4.fs.createDirentFromStats(r.name,n),t(null,r)})}}function u4(r,e,t){e.fs.readdir(r,(i,n)=>{if(i!==null){Aw(t,i);return}let s=n.map(o=>{let a=l4.joinPathSegments(r,o,e.pathSegmentSeparator);return l=>{Rbe.stat(a,e.fsStatSettings,(c,u)=>{if(c!==null){l(c);return}let g={name:o,path:a,dirent:A4.fs.createDirentFromStats(o,u)};e.stats&&(g.stats=u),l(null,g)})}});a4(s,(o,a)=>{if(o!==null){Aw(t,o);return}wP(t,a)})})}GA.readdir=u4;function Aw(r,e){r(e)}function wP(r,e){r(null,e)}});var C4=w(YA=>{"use strict";Object.defineProperty(YA,"__esModule",{value:!0});YA.readdir=YA.readdirWithFileTypes=YA.read=void 0;var Lbe=Qc(),Obe=mP(),f4=IP(),h4=yP();function Mbe(r,e){return!e.stats&&Obe.IS_SUPPORT_READDIR_WITH_FILE_TYPES?p4(r,e):d4(r,e)}YA.read=Mbe;function p4(r,e){return e.fs.readdirSync(r,{withFileTypes:!0}).map(i=>{let n={dirent:i,name:i.name,path:h4.joinPathSegments(r,i.name,e.pathSegmentSeparator)};if(n.dirent.isSymbolicLink()&&e.followSymbolicLinks)try{let s=e.fs.statSync(n.path);n.dirent=f4.fs.createDirentFromStats(n.name,s)}catch(s){if(e.throwErrorOnBrokenSymbolicLink)throw s}return n})}YA.readdirWithFileTypes=p4;function d4(r,e){return e.fs.readdirSync(r).map(i=>{let n=h4.joinPathSegments(r,i,e.pathSegmentSeparator),s=Lbe.statSync(n,e.fsStatSettings),o={name:i,path:n,dirent:f4.fs.createDirentFromStats(i,s)};return e.stats&&(o.stats=s),o})}YA.readdir=d4});var m4=w(jA=>{"use strict";Object.defineProperty(jA,"__esModule",{value:!0});jA.createFileSystemAdapter=jA.FILE_SYSTEM_ADAPTER=void 0;var wf=J("fs");jA.FILE_SYSTEM_ADAPTER={lstat:wf.lstat,stat:wf.stat,lstatSync:wf.lstatSync,statSync:wf.statSync,readdir:wf.readdir,readdirSync:wf.readdirSync};function Kbe(r){return r===void 0?jA.FILE_SYSTEM_ADAPTER:Object.assign(Object.assign({},jA.FILE_SYSTEM_ADAPTER),r)}jA.createFileSystemAdapter=Kbe});var E4=w(bP=>{"use strict";Object.defineProperty(bP,"__esModule",{value:!0});var Ube=J("path"),Hbe=Qc(),Gbe=m4(),BP=class{constructor(e={}){this._options=e,this.followSymbolicLinks=this._getValue(this._options.followSymbolicLinks,!1),this.fs=Gbe.createFileSystemAdapter(this._options.fs),this.pathSegmentSeparator=this._getValue(this._options.pathSegmentSeparator,Ube.sep),this.stats=this._getValue(this._options.stats,!1),this.throwErrorOnBrokenSymbolicLink=this._getValue(this._options.throwErrorOnBrokenSymbolicLink,!0),this.fsStatSettings=new Hbe.Settings({followSymbolicLink:this.followSymbolicLinks,fs:this.fs,throwErrorOnBrokenSymbolicLink:this.throwErrorOnBrokenSymbolicLink})}_getValue(e,t){return e!=null?e:t}};bP.default=BP});var lw=w(qA=>{"use strict";Object.defineProperty(qA,"__esModule",{value:!0});qA.Settings=qA.scandirSync=qA.scandir=void 0;var I4=g4(),Ybe=C4(),QP=E4();qA.Settings=QP.default;function jbe(r,e,t){if(typeof e=="function"){I4.read(r,SP(),e);return}I4.read(r,SP(e),t)}qA.scandir=jbe;function qbe(r,e){let t=SP(e);return Ybe.read(r,t)}qA.scandirSync=qbe;function SP(r={}){return r instanceof QP.default?r:new QP.default(r)}});var w4=w((Art,y4)=>{"use strict";function Jbe(r){var e=new r,t=e;function i(){var s=e;return s.next?e=s.next:(e=new r,t=e),s.next=null,s}function n(s){t.next=s,t=s}return{get:i,release:n}}y4.exports=Jbe});var b4=w((lrt,vP)=>{"use strict";var Wbe=w4();function B4(r,e,t){if(typeof r=="function"&&(t=e,e=r,r=null),t<1)throw new Error("fastqueue concurrency must be greater than 1");var i=Wbe(zbe),n=null,s=null,o=0,a=null,l={push:C,drain:Is,saturated:Is,pause:u,paused:!1,concurrency:t,running:c,resume:h,idle:p,length:g,getQueue:f,unshift:y,empty:Is,kill:v,killAndDrain:D,error:T};return l;function c(){return o}function u(){l.paused=!0}function g(){for(var H=n,j=0;H;)H=H.next,j++;return j}function f(){for(var H=n,j=[];H;)j.push(H.value),H=H.next;return j}function h(){if(!!l.paused){l.paused=!1;for(var H=0;H<l.concurrency;H++)o++,B()}}function p(){return o===0&&l.length()===0}function C(H,j){var $=i.get();$.context=r,$.release=B,$.value=H,$.callback=j||Is,$.errorHandler=a,o===l.concurrency||l.paused?s?(s.next=$,s=$):(n=$,s=$,l.saturated()):(o++,e.call(r,$.value,$.worked))}function y(H,j){var $=i.get();$.context=r,$.release=B,$.value=H,$.callback=j||Is,o===l.concurrency||l.paused?n?($.next=n,n=$):(n=$,s=$,l.saturated()):(o++,e.call(r,$.value,$.worked))}function B(H){H&&i.release(H);var j=n;j?l.paused?o--:(s===n&&(s=null),n=j.next,j.next=null,e.call(r,j.value,j.worked),s===null&&l.empty()):--o===0&&l.drain()}function v(){n=null,s=null,l.drain=Is}function D(){n=null,s=null,l.drain(),l.drain=Is}function T(H){a=H}}function Is(){}function zbe(){this.value=null,this.callback=Is,this.next=null,this.release=Is,this.context=null,this.errorHandler=null;var r=this;this.worked=function(t,i){var n=r.callback,s=r.errorHandler,o=r.value;r.value=null,r.callback=Is,r.errorHandler&&s(t,o),n.call(r.context,t,i),r.release(r)}}function Vbe(r,e,t){typeof r=="function"&&(t=e,e=r,r=null);function i(u,g){e.call(this,u).then(function(f){g(null,f)},g)}var n=B4(r,i,t),s=n.push,o=n.unshift;return n.push=a,n.unshift=l,n.drained=c,n;function a(u){var g=new Promise(function(f,h){s(u,function(p,C){if(p){h(p);return}f(C)})});return g.catch(Is),g}function l(u){var g=new Promise(function(f,h){o(u,function(p,C){if(p){h(p);return}f(C)})});return g.catch(Is),g}function c(){var u=n.drain,g=new Promise(function(f){n.drain=function(){u(),f()}});return g}}vP.exports=B4;vP.exports.promise=Vbe});var cw=w(Yo=>{"use strict";Object.defineProperty(Yo,"__esModule",{value:!0});Yo.joinPathSegments=Yo.replacePathSegmentSeparator=Yo.isAppliedFilter=Yo.isFatalError=void 0;function Xbe(r,e){return r.errorFilter===null?!0:!r.errorFilter(e)}Yo.isFatalError=Xbe;function Zbe(r,e){return r===null||r(e)}Yo.isAppliedFilter=Zbe;function _be(r,e){return r.split(/[/\\]/).join(e)}Yo.replacePathSegmentSeparator=_be;function $be(r,e,t){return r===""?e:r.endsWith(t)?r+e:r+t+e}Yo.joinPathSegments=$be});var DP=w(PP=>{"use strict";Object.defineProperty(PP,"__esModule",{value:!0});var eQe=cw(),xP=class{constructor(e,t){this._root=e,this._settings=t,this._root=eQe.replacePathSegmentSeparator(e,t.pathSegmentSeparator)}};PP.default=xP});var FP=w(RP=>{"use strict";Object.defineProperty(RP,"__esModule",{value:!0});var tQe=J("events"),rQe=lw(),iQe=b4(),uw=cw(),nQe=DP(),kP=class extends nQe.default{constructor(e,t){super(e,t),this._settings=t,this._scandir=rQe.scandir,this._emitter=new tQe.EventEmitter,this._queue=iQe(this._worker.bind(this),this._settings.concurrency),this._isFatalError=!1,this._isDestroyed=!1,this._queue.drain=()=>{this._isFatalError||this._emitter.emit("end")}}read(){return this._isFatalError=!1,this._isDestroyed=!1,setImmediate(()=>{this._pushToQueue(this._root,this._settings.basePath)}),this._emitter}get isDestroyed(){return this._isDestroyed}destroy(){if(this._isDestroyed)throw new Error("The reader is already destroyed");this._isDestroyed=!0,this._queue.killAndDrain()}onEntry(e){this._emitter.on("entry",e)}onError(e){this._emitter.once("error",e)}onEnd(e){this._emitter.once("end",e)}_pushToQueue(e,t){let i={directory:e,base:t};this._queue.push(i,n=>{n!==null&&this._handleError(n)})}_worker(e,t){this._scandir(e.directory,this._settings.fsScandirSettings,(i,n)=>{if(i!==null){t(i,void 0);return}for(let s of n)this._handleEntry(s,e.base);t(null,void 0)})}_handleError(e){this._isDestroyed||!uw.isFatalError(this._settings,e)||(this._isFatalError=!0,this._isDestroyed=!0,this._emitter.emit("error",e))}_handleEntry(e,t){if(this._isDestroyed||this._isFatalError)return;let i=e.path;t!==void 0&&(e.path=uw.joinPathSegments(t,e.name,this._settings.pathSegmentSeparator)),uw.isAppliedFilter(this._settings.entryFilter,e)&&this._emitEntry(e),e.dirent.isDirectory()&&uw.isAppliedFilter(this._settings.deepFilter,e)&&this._pushToQueue(i,e.path)}_emitEntry(e){this._emitter.emit("entry",e)}};RP.default=kP});var Q4=w(TP=>{"use strict";Object.defineProperty(TP,"__esModule",{value:!0});var sQe=FP(),NP=class{constructor(e,t){this._root=e,this._settings=t,this._reader=new sQe.default(this._root,this._settings),this._storage=new Set}read(e){this._reader.onError(t=>{oQe(e,t)}),this._reader.onEntry(t=>{this._storage.add(t)}),this._reader.onEnd(()=>{aQe(e,[...this._storage])}),this._reader.read()}};TP.default=NP;function oQe(r,e){r(e)}function aQe(r,e){r(null,e)}});var S4=w(OP=>{"use strict";Object.defineProperty(OP,"__esModule",{value:!0});var AQe=J("stream"),lQe=FP(),LP=class{constructor(e,t){this._root=e,this._settings=t,this._reader=new lQe.default(this._root,this._settings),this._stream=new AQe.Readable({objectMode:!0,read:()=>{},destroy:()=>{this._reader.isDestroyed||this._reader.destroy()}})}read(){return this._reader.onError(e=>{this._stream.emit("error",e)}),this._reader.onEntry(e=>{this._stream.push(e)}),this._reader.onEnd(()=>{this._stream.push(null)}),this._reader.read(),this._stream}};OP.default=LP});var v4=w(KP=>{"use strict";Object.defineProperty(KP,"__esModule",{value:!0});var cQe=lw(),gw=cw(),uQe=DP(),MP=class extends uQe.default{constructor(){super(...arguments),this._scandir=cQe.scandirSync,this._storage=new Set,this._queue=new Set}read(){return this._pushToQueue(this._root,this._settings.basePath),this._handleQueue(),[...this._storage]}_pushToQueue(e,t){this._queue.add({directory:e,base:t})}_handleQueue(){for(let e of this._queue.values())this._handleDirectory(e.directory,e.base)}_handleDirectory(e,t){try{let i=this._scandir(e,this._settings.fsScandirSettings);for(let n of i)this._handleEntry(n,t)}catch(i){this._handleError(i)}}_handleError(e){if(!!gw.isFatalError(this._settings,e))throw e}_handleEntry(e,t){let i=e.path;t!==void 0&&(e.path=gw.joinPathSegments(t,e.name,this._settings.pathSegmentSeparator)),gw.isAppliedFilter(this._settings.entryFilter,e)&&this._pushToStorage(e),e.dirent.isDirectory()&&gw.isAppliedFilter(this._settings.deepFilter,e)&&this._pushToQueue(i,e.path)}_pushToStorage(e){this._storage.add(e)}};KP.default=MP});var x4=w(HP=>{"use strict";Object.defineProperty(HP,"__esModule",{value:!0});var gQe=v4(),UP=class{constructor(e,t){this._root=e,this._settings=t,this._reader=new gQe.default(this._root,this._settings)}read(){return this._reader.read()}};HP.default=UP});var P4=w(YP=>{"use strict";Object.defineProperty(YP,"__esModule",{value:!0});var fQe=J("path"),hQe=lw(),GP=class{constructor(e={}){this._options=e,this.basePath=this._getValue(this._options.basePath,void 0),this.concurrency=this._getValue(this._options.concurrency,Number.POSITIVE_INFINITY),this.deepFilter=this._getValue(this._options.deepFilter,null),this.entryFilter=this._getValue(this._options.entryFilter,null),this.errorFilter=this._getValue(this._options.errorFilter,null),this.pathSegmentSeparator=this._getValue(this._options.pathSegmentSeparator,fQe.sep),this.fsScandirSettings=new hQe.Settings({followSymbolicLinks:this._options.followSymbolicLinks,fs:this._options.fs,pathSegmentSeparator:this._options.pathSegmentSeparator,stats:this._options.stats,throwErrorOnBrokenSymbolicLink:this._options.throwErrorOnBrokenSymbolicLink})}_getValue(e,t){return e!=null?e:t}};YP.default=GP});var qP=w(jo=>{"use strict";Object.defineProperty(jo,"__esModule",{value:!0});jo.Settings=jo.walkStream=jo.walkSync=jo.walk=void 0;var D4=Q4(),pQe=S4(),dQe=x4(),jP=P4();jo.Settings=jP.default;function CQe(r,e,t){if(typeof e=="function"){new D4.default(r,fw()).read(e);return}new D4.default(r,fw(e)).read(t)}jo.walk=CQe;function mQe(r,e){let t=fw(e);return new dQe.default(r,t).read()}jo.walkSync=mQe;function EQe(r,e){let t=fw(e);return new pQe.default(r,t).read()}jo.walkStream=EQe;function fw(r={}){return r instanceof jP.default?r:new jP.default(r)}});var zP=w(WP=>{"use strict";Object.defineProperty(WP,"__esModule",{value:!0});var IQe=J("path"),yQe=Qc(),k4=Oa(),JP=class{constructor(e){this._settings=e,this._fsStatSettings=new yQe.Settings({followSymbolicLink:this._settings.followSymbolicLinks,fs:this._settings.fs,throwErrorOnBrokenSymbolicLink:this._settings.followSymbolicLinks})}_getFullEntryPath(e){return IQe.resolve(this._settings.cwd,e)}_makeEntry(e,t){let i={name:t,path:t,dirent:k4.fs.createDirentFromStats(t,e)};return this._settings.stats&&(i.stats=e),i}_isFatalError(e){return!k4.errno.isEnoentCodeError(e)&&!this._settings.suppressErrors}};WP.default=JP});var ZP=w(XP=>{"use strict";Object.defineProperty(XP,"__esModule",{value:!0});var wQe=J("stream"),BQe=Qc(),bQe=qP(),QQe=zP(),VP=class extends QQe.default{constructor(){super(...arguments),this._walkStream=bQe.walkStream,this._stat=BQe.stat}dynamic(e,t){return this._walkStream(e,t)}static(e,t){let i=e.map(this._getFullEntryPath,this),n=new wQe.PassThrough({objectMode:!0});n._write=(s,o,a)=>this._getEntry(i[s],e[s],t).then(l=>{l!==null&&t.entryFilter(l)&&n.push(l),s===i.length-1&&n.end(),a()}).catch(a);for(let s=0;s<i.length;s++)n.write(s);return n}_getEntry(e,t,i){return this._getStat(e).then(n=>this._makeEntry(n,t)).catch(n=>{if(i.errorFilter(n))return null;throw n})}_getStat(e){return new Promise((t,i)=>{this._stat(e,this._fsStatSettings,(n,s)=>n===null?t(s):i(n))})}};XP.default=VP});var R4=w($P=>{"use strict";Object.defineProperty($P,"__esModule",{value:!0});var Bf=Oa(),_P=class{constructor(e,t,i){this._patterns=e,this._settings=t,this._micromatchOptions=i,this._storage=[],this._fillStorage()}_fillStorage(){let e=Bf.pattern.expandPatternsWithBraceExpansion(this._patterns);for(let t of e){let i=this._getPatternSegments(t),n=this._splitSegmentsIntoSections(i);this._storage.push({complete:n.length<=1,pattern:t,segments:i,sections:n})}}_getPatternSegments(e){return Bf.pattern.getPatternParts(e,this._micromatchOptions).map(i=>Bf.pattern.isDynamicPattern(i,this._settings)?{dynamic:!0,pattern:i,patternRe:Bf.pattern.makeRe(i,this._micromatchOptions)}:{dynamic:!1,pattern:i})}_splitSegmentsIntoSections(e){return Bf.array.splitWhen(e,t=>t.dynamic&&Bf.pattern.hasGlobStar(t.pattern))}};$P.default=_P});var F4=w(tD=>{"use strict";Object.defineProperty(tD,"__esModule",{value:!0});var SQe=R4(),eD=class extends SQe.default{match(e){let t=e.split("/"),i=t.length,n=this._storage.filter(s=>!s.complete||s.segments.length>i);for(let s of n){let o=s.sections[0];if(!s.complete&&i>o.length||t.every((l,c)=>{let u=s.segments[c];return!!(u.dynamic&&u.patternRe.test(l)||!u.dynamic&&u.pattern===l)}))return!0}return!1}};tD.default=eD});var N4=w(iD=>{"use strict";Object.defineProperty(iD,"__esModule",{value:!0});var hw=Oa(),vQe=F4(),rD=class{constructor(e,t){this._settings=e,this._micromatchOptions=t}getFilter(e,t,i){let n=this._getMatcher(t),s=this._getNegativePatternsRe(i);return o=>this._filter(e,o,n,s)}_getMatcher(e){return new vQe.default(e,this._settings,this._micromatchOptions)}_getNegativePatternsRe(e){let t=e.filter(hw.pattern.isAffectDepthOfReadingPattern);return hw.pattern.convertPatternsToRe(t,this._micromatchOptions)}_filter(e,t,i,n){let s=this._getEntryLevel(e,t.path);if(this._isSkippedByDeep(s)||this._isSkippedSymbolicLink(t))return!1;let o=hw.path.removeLeadingDotSegment(t.path);return this._isSkippedByPositivePatterns(o,i)?!1:this._isSkippedByNegativePatterns(o,n)}_isSkippedByDeep(e){return e>=this._settings.deep}_isSkippedSymbolicLink(e){return!this._settings.followSymbolicLinks&&e.dirent.isSymbolicLink()}_getEntryLevel(e,t){let i=e.split("/").length;return t.split("/").length-(e===""?0:i)}_isSkippedByPositivePatterns(e,t){return!this._settings.baseNameMatch&&!t.match(e)}_isSkippedByNegativePatterns(e,t){return!hw.pattern.matchAny(e,t)}};iD.default=rD});var T4=w(sD=>{"use strict";Object.defineProperty(sD,"__esModule",{value:!0});var Zd=Oa(),nD=class{constructor(e,t){this._settings=e,this._micromatchOptions=t,this.index=new Map}getFilter(e,t){let i=Zd.pattern.convertPatternsToRe(e,this._micromatchOptions),n=Zd.pattern.convertPatternsToRe(t,this._micromatchOptions);return s=>this._filter(s,i,n)}_filter(e,t,i){if(this._settings.unique){if(this._isDuplicateEntry(e))return!1;this._createIndexRecord(e)}if(this._onlyFileFilter(e)||this._onlyDirectoryFilter(e)||this._isSkippedByAbsoluteNegativePatterns(e,i))return!1;let n=this._settings.baseNameMatch?e.name:e.path;return this._isMatchToPatterns(n,t)&&!this._isMatchToPatterns(e.path,i)}_isDuplicateEntry(e){return this.index.has(e.path)}_createIndexRecord(e){this.index.set(e.path,void 0)}_onlyFileFilter(e){return this._settings.onlyFiles&&!e.dirent.isFile()}_onlyDirectoryFilter(e){return this._settings.onlyDirectories&&!e.dirent.isDirectory()}_isSkippedByAbsoluteNegativePatterns(e,t){if(!this._settings.absolute)return!1;let i=Zd.path.makeAbsolute(this._settings.cwd,e.path);return this._isMatchToPatterns(i,t)}_isMatchToPatterns(e,t){let i=Zd.path.removeLeadingDotSegment(e);return Zd.pattern.matchAny(i,t)}};sD.default=nD});var L4=w(aD=>{"use strict";Object.defineProperty(aD,"__esModule",{value:!0});var xQe=Oa(),oD=class{constructor(e){this._settings=e}getFilter(){return e=>this._isNonFatalError(e)}_isNonFatalError(e){return xQe.errno.isEnoentCodeError(e)||this._settings.suppressErrors}};aD.default=oD});var M4=w(lD=>{"use strict";Object.defineProperty(lD,"__esModule",{value:!0});var O4=Oa(),AD=class{constructor(e){this._settings=e}getTransformer(){return e=>this._transform(e)}_transform(e){let t=e.path;return this._settings.absolute&&(t=O4.path.makeAbsolute(this._settings.cwd,t),t=O4.path.unixify(t)),this._settings.markDirectories&&e.dirent.isDirectory()&&(t+="/"),this._settings.objectMode?Object.assign(Object.assign({},e),{path:t}):t}};lD.default=AD});var pw=w(uD=>{"use strict";Object.defineProperty(uD,"__esModule",{value:!0});var PQe=J("path"),DQe=N4(),kQe=T4(),RQe=L4(),FQe=M4(),cD=class{constructor(e){this._settings=e,this.errorFilter=new RQe.default(this._settings),this.entryFilter=new kQe.default(this._settings,this._getMicromatchOptions()),this.deepFilter=new DQe.default(this._settings,this._getMicromatchOptions()),this.entryTransformer=new FQe.default(this._settings)}_getRootDirectory(e){return PQe.resolve(this._settings.cwd,e.base)}_getReaderOptions(e){let t=e.base==="."?"":e.base;return{basePath:t,pathSegmentSeparator:"/",concurrency:this._settings.concurrency,deepFilter:this.deepFilter.getFilter(t,e.positive,e.negative),entryFilter:this.entryFilter.getFilter(e.positive,e.negative),errorFilter:this.errorFilter.getFilter(),followSymbolicLinks:this._settings.followSymbolicLinks,fs:this._settings.fs,stats:this._settings.stats,throwErrorOnBrokenSymbolicLink:this._settings.throwErrorOnBrokenSymbolicLink,transform:this.entryTransformer.getTransformer()}}_getMicromatchOptions(){return{dot:this._settings.dot,matchBase:this._settings.baseNameMatch,nobrace:!this._settings.braceExpansion,nocase:!this._settings.caseSensitiveMatch,noext:!this._settings.extglob,noglobstar:!this._settings.globstar,posix:!0,strictSlashes:!1}}};uD.default=cD});var K4=w(fD=>{"use strict";Object.defineProperty(fD,"__esModule",{value:!0});var NQe=ZP(),TQe=pw(),gD=class extends TQe.default{constructor(){super(...arguments),this._reader=new NQe.default(this._settings)}read(e){let t=this._getRootDirectory(e),i=this._getReaderOptions(e),n=[];return new Promise((s,o)=>{let a=this.api(t,e,i);a.once("error",o),a.on("data",l=>n.push(i.transform(l))),a.once("end",()=>s(n))})}api(e,t,i){return t.dynamic?this._reader.dynamic(e,i):this._reader.static(t.patterns,i)}};fD.default=gD});var U4=w(pD=>{"use strict";Object.defineProperty(pD,"__esModule",{value:!0});var LQe=J("stream"),OQe=ZP(),MQe=pw(),hD=class extends MQe.default{constructor(){super(...arguments),this._reader=new OQe.default(this._settings)}read(e){let t=this._getRootDirectory(e),i=this._getReaderOptions(e),n=this.api(t,e,i),s=new LQe.Readable({objectMode:!0,read:()=>{}});return n.once("error",o=>s.emit("error",o)).on("data",o=>s.emit("data",i.transform(o))).once("end",()=>s.emit("end")),s.once("close",()=>n.destroy()),s}api(e,t,i){return t.dynamic?this._reader.dynamic(e,i):this._reader.static(t.patterns,i)}};pD.default=hD});var H4=w(CD=>{"use strict";Object.defineProperty(CD,"__esModule",{value:!0});var KQe=Qc(),UQe=qP(),HQe=zP(),dD=class extends HQe.default{constructor(){super(...arguments),this._walkSync=UQe.walkSync,this._statSync=KQe.statSync}dynamic(e,t){return this._walkSync(e,t)}static(e,t){let i=[];for(let n of e){let s=this._getFullEntryPath(n),o=this._getEntry(s,n,t);o===null||!t.entryFilter(o)||i.push(o)}return i}_getEntry(e,t,i){try{let n=this._getStat(e);return this._makeEntry(n,t)}catch(n){if(i.errorFilter(n))return null;throw n}}_getStat(e){return this._statSync(e,this._fsStatSettings)}};CD.default=dD});var G4=w(ED=>{"use strict";Object.defineProperty(ED,"__esModule",{value:!0});var GQe=H4(),YQe=pw(),mD=class extends YQe.default{constructor(){super(...arguments),this._reader=new GQe.default(this._settings)}read(e){let t=this._getRootDirectory(e),i=this._getReaderOptions(e);return this.api(t,e,i).map(i.transform)}api(e,t,i){return t.dynamic?this._reader.dynamic(e,i):this._reader.static(t.patterns,i)}};ED.default=mD});var Y4=w(_d=>{"use strict";Object.defineProperty(_d,"__esModule",{value:!0});var bf=J("fs"),jQe=J("os"),qQe=jQe.cpus().length;_d.DEFAULT_FILE_SYSTEM_ADAPTER={lstat:bf.lstat,lstatSync:bf.lstatSync,stat:bf.stat,statSync:bf.statSync,readdir:bf.readdir,readdirSync:bf.readdirSync};var ID=class{constructor(e={}){this._options=e,this.absolute=this._getValue(this._options.absolute,!1),this.baseNameMatch=this._getValue(this._options.baseNameMatch,!1),this.braceExpansion=this._getValue(this._options.braceExpansion,!0),this.caseSensitiveMatch=this._getValue(this._options.caseSensitiveMatch,!0),this.concurrency=this._getValue(this._options.concurrency,qQe),this.cwd=this._getValue(this._options.cwd,process.cwd()),this.deep=this._getValue(this._options.deep,1/0),this.dot=this._getValue(this._options.dot,!1),this.extglob=this._getValue(this._options.extglob,!0),this.followSymbolicLinks=this._getValue(this._options.followSymbolicLinks,!0),this.fs=this._getFileSystemMethods(this._options.fs),this.globstar=this._getValue(this._options.globstar,!0),this.ignore=this._getValue(this._options.ignore,[]),this.markDirectories=this._getValue(this._options.markDirectories,!1),this.objectMode=this._getValue(this._options.objectMode,!1),this.onlyDirectories=this._getValue(this._options.onlyDirectories,!1),this.onlyFiles=this._getValue(this._options.onlyFiles,!0),this.stats=this._getValue(this._options.stats,!1),this.suppressErrors=this._getValue(this._options.suppressErrors,!1),this.throwErrorOnBrokenSymbolicLink=this._getValue(this._options.throwErrorOnBrokenSymbolicLink,!1),this.unique=this._getValue(this._options.unique,!0),this.onlyDirectories&&(this.onlyFiles=!1),this.stats&&(this.objectMode=!0)}_getValue(e,t){return e===void 0?t:e}_getFileSystemMethods(e={}){return Object.assign(Object.assign({},_d.DEFAULT_FILE_SYSTEM_ADAPTER),e)}};_d.default=ID});var dw=w((Frt,q4)=>{"use strict";var j4=VW(),JQe=K4(),WQe=U4(),zQe=G4(),yD=Y4(),Sc=Oa();async function wD(r,e){Qf(r);let t=BD(r,JQe.default,e),i=await Promise.all(t);return Sc.array.flatten(i)}(function(r){function e(o,a){Qf(o);let l=BD(o,zQe.default,a);return Sc.array.flatten(l)}r.sync=e;function t(o,a){Qf(o);let l=BD(o,WQe.default,a);return Sc.stream.merge(l)}r.stream=t;function i(o,a){Qf(o);let l=[].concat(o),c=new yD.default(a);return j4.generate(l,c)}r.generateTasks=i;function n(o,a){Qf(o);let l=new yD.default(a);return Sc.pattern.isDynamicPattern(o,l)}r.isDynamicPattern=n;function s(o){return Qf(o),Sc.path.escape(o)}r.escapePath=s})(wD||(wD={}));function BD(r,e,t){let i=[].concat(r),n=new yD.default(t),s=j4.generate(i,n),o=new e(n);return s.map(o.read,o)}function Qf(r){if(![].concat(r).every(i=>Sc.string.isString(i)&&!Sc.string.isEmpty(i)))throw new TypeError("Patterns must be a string (non empty) or an array of strings")}q4.exports=wD});var W4=w(vc=>{"use strict";var{promisify:VQe}=J("util"),J4=J("fs");async function bD(r,e,t){if(typeof t!="string")throw new TypeError(`Expected a string, got ${typeof t}`);try{return(await VQe(J4[r])(t))[e]()}catch(i){if(i.code==="ENOENT")return!1;throw i}}function QD(r,e,t){if(typeof t!="string")throw new TypeError(`Expected a string, got ${typeof t}`);try{return J4[r](t)[e]()}catch(i){if(i.code==="ENOENT")return!1;throw i}}vc.isFile=bD.bind(null,"stat","isFile");vc.isDirectory=bD.bind(null,"stat","isDirectory");vc.isSymlink=bD.bind(null,"lstat","isSymbolicLink");vc.isFileSync=QD.bind(null,"statSync","isFile");vc.isDirectorySync=QD.bind(null,"statSync","isDirectory");vc.isSymlinkSync=QD.bind(null,"lstatSync","isSymbolicLink")});var _4=w((Trt,SD)=>{"use strict";var xc=J("path"),z4=W4(),V4=r=>r.length>1?`{${r.join(",")}}`:r[0],X4=(r,e)=>{let t=r[0]==="!"?r.slice(1):r;return xc.isAbsolute(t)?t:xc.join(e,t)},XQe=(r,e)=>xc.extname(r)?`**/${r}`:`**/${r}.${V4(e)}`,Z4=(r,e)=>{if(e.files&&!Array.isArray(e.files))throw new TypeError(`Expected \`files\` to be of type \`Array\` but received type \`${typeof e.files}\``);if(e.extensions&&!Array.isArray(e.extensions))throw new TypeError(`Expected \`extensions\` to be of type \`Array\` but received type \`${typeof e.extensions}\``);return e.files&&e.extensions?e.files.map(t=>xc.posix.join(r,XQe(t,e.extensions))):e.files?e.files.map(t=>xc.posix.join(r,`**/${t}`)):e.extensions?[xc.posix.join(r,`**/*.${V4(e.extensions)}`)]:[xc.posix.join(r,"**")]};SD.exports=async(r,e)=>{if(e={cwd:process.cwd(),...e},typeof e.cwd!="string")throw new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof e.cwd}\``);let t=await Promise.all([].concat(r).map(async i=>await z4.isDirectory(X4(i,e.cwd))?Z4(i,e):i));return[].concat.apply([],t)};SD.exports.sync=(r,e)=>{if(e={cwd:process.cwd(),...e},typeof e.cwd!="string")throw new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof e.cwd}\``);let t=[].concat(r).map(i=>z4.isDirectorySync(X4(i,e.cwd))?Z4(i,e):i);return[].concat.apply([],t)}});var o8=w((Lrt,s8)=>{function $4(r){return Array.isArray(r)?r:[r]}var i8="",e8=" ",vD="\\",ZQe=/^\s+$/,_Qe=/^\\!/,$Qe=/^\\#/,eSe=/\r?\n/g,tSe=/^\.*\/|^\.+$/,xD="/",t8=typeof Symbol<"u"?Symbol.for("node-ignore"):"node-ignore",rSe=(r,e,t)=>Object.defineProperty(r,e,{value:t}),iSe=/([0-z])-([0-z])/g,nSe=r=>r.replace(iSe,(e,t,i)=>t.charCodeAt(0)<=i.charCodeAt(0)?e:i8),sSe=r=>{let{length:e}=r;return r.slice(0,e-e%2)},oSe=[[/\\?\s+$/,r=>r.indexOf("\\")===0?e8:i8],[/\\\s/g,()=>e8],[/[\\$.|*+(){^]/g,r=>`\\${r}`],[/(?!\\)\?/g,()=>"[^/]"],[/^\//,()=>"^"],[/\//g,()=>"\\/"],[/^\^*\\\*\\\*\\\//,()=>"^(?:.*\\/)?"],[/^(?=[^^])/,function(){return/\/(?!$)/.test(this)?"^":"(?:^|\\/)"}],[/\\\/\\\*\\\*(?=\\\/|$)/g,(r,e,t)=>e+6<t.length?"(?:\\/[^\\/]+)*":"\\/.+"],[/(^|[^\\]+)\\\*(?=.+)/g,(r,e)=>`${e}[^\\/]*`],[/\\\\\\(?=[$.|*+(){^])/g,()=>vD],[/\\\\/g,()=>vD],[/(\\)?\[([^\]/]*?)(\\*)($|\])/g,(r,e,t,i,n)=>e===vD?`\\[${t}${sSe(i)}${n}`:n==="]"&&i.length%2===0?`[${nSe(t)}${i}]`:"[]"],[/(?:[^*])$/,r=>/\/$/.test(r)?`${r}$`:`${r}(?=$|\\/$)`],[/(\^|\\\/)?\\\*$/,(r,e)=>`${e?`${e}[^/]+`:"[^/]*"}(?=$|\\/$)`]],r8=Object.create(null),aSe=(r,e)=>{let t=r8[r];return t||(t=oSe.reduce((i,n)=>i.replace(n[0],n[1].bind(r)),r),r8[r]=t),e?new RegExp(t,"i"):new RegExp(t)},kD=r=>typeof r=="string",ASe=r=>r&&kD(r)&&!ZQe.test(r)&&r.indexOf("#")!==0,lSe=r=>r.split(eSe),PD=class{constructor(e,t,i,n){this.origin=e,this.pattern=t,this.negative=i,this.regex=n}},cSe=(r,e)=>{let t=r,i=!1;r.indexOf("!")===0&&(i=!0,r=r.substr(1)),r=r.replace(_Qe,"!").replace($Qe,"#");let n=aSe(r,e);return new PD(t,r,i,n)},uSe=(r,e)=>{throw new e(r)},Ka=(r,e,t)=>kD(r)?r?Ka.isNotRelative(r)?t(`path should be a \`path.relative()\`d string, but got "${e}"`,RangeError):!0:t("path must not be empty",TypeError):t(`path must be a string, but got \`${e}\``,TypeError),n8=r=>tSe.test(r);Ka.isNotRelative=n8;Ka.convert=r=>r;var DD=class{constructor({ignorecase:e=!0}={}){rSe(this,t8,!0),this._rules=[],this._ignorecase=e,this._initCache()}_initCache(){this._ignoreCache=Object.create(null),this._testCache=Object.create(null)}_addPattern(e){if(e&&e[t8]){this._rules=this._rules.concat(e._rules),this._added=!0;return}if(ASe(e)){let t=cSe(e,this._ignorecase);this._added=!0,this._rules.push(t)}}add(e){return this._added=!1,$4(kD(e)?lSe(e):e).forEach(this._addPattern,this),this._added&&this._initCache(),this}addPattern(e){return this.add(e)}_testOne(e,t){let i=!1,n=!1;return this._rules.forEach(s=>{let{negative:o}=s;if(n===o&&i!==n||o&&!i&&!n&&!t)return;s.regex.test(e)&&(i=!o,n=o)}),{ignored:i,unignored:n}}_test(e,t,i,n){let s=e&&Ka.convert(e);return Ka(s,e,uSe),this._t(s,t,i,n)}_t(e,t,i,n){if(e in t)return t[e];if(n||(n=e.split(xD)),n.pop(),!n.length)return t[e]=this._testOne(e,i);let s=this._t(n.join(xD)+xD,t,i,n);return t[e]=s.ignored?s:this._testOne(e,i)}ignores(e){return this._test(e,this._ignoreCache,!1).ignored}createFilter(){return e=>!this.ignores(e)}filter(e){return $4(e).filter(this.createFilter())}test(e){return this._test(e,this._testCache,!0)}},Cw=r=>new DD(r),gSe=()=>!1,fSe=r=>Ka(r&&Ka.convert(r),r,gSe);Cw.isPathValid=fSe;Cw.default=Cw;s8.exports=Cw;if(typeof process<"u"&&(process.env&&process.env.IGNORE_TEST_WIN32||process.platform==="win32")){let r=t=>/^\\\\\?\\/.test(t)||/["<>|\u0000-\u001F]+/u.test(t)?t:t.replace(/\\/g,"/");Ka.convert=r;let e=/^[a-z]:\//i;Ka.isNotRelative=t=>e.test(t)||n8(t)}});var A8=w((Ort,a8)=>{"use strict";a8.exports=r=>{let e=/^\\\\\?\\/.test(r),t=/[^\u0000-\u0080]+/.test(r);return e||t?r:r.replace(/\\/g,"/")}});var p8=w((Mrt,RD)=>{"use strict";var{promisify:hSe}=J("util"),l8=J("fs"),Ua=J("path"),c8=dw(),pSe=o8(),$d=A8(),u8=["**/node_modules/**","**/flow-typed/**","**/coverage/**","**/.git"],dSe=hSe(l8.readFile),CSe=r=>e=>e.startsWith("!")?"!"+Ua.posix.join(r,e.slice(1)):Ua.posix.join(r,e),mSe=(r,e)=>{let t=$d(Ua.relative(e.cwd,Ua.dirname(e.fileName)));return r.split(/\r?\n/).filter(Boolean).filter(i=>!i.startsWith("#")).map(CSe(t))},g8=r=>{let e=pSe();for(let t of r)e.add(mSe(t.content,{cwd:t.cwd,fileName:t.filePath}));return e},ESe=(r,e)=>{if(r=$d(r),Ua.isAbsolute(e)){if($d(e).startsWith(r))return e;throw new Error(`Path ${e} is not in cwd ${r}`)}return Ua.join(r,e)},f8=(r,e)=>t=>r.ignores($d(Ua.relative(e,ESe(e,t.path||t)))),ISe=async(r,e)=>{let t=Ua.join(e,r),i=await dSe(t,"utf8");return{cwd:e,filePath:t,content:i}},ySe=(r,e)=>{let t=Ua.join(e,r),i=l8.readFileSync(t,"utf8");return{cwd:e,filePath:t,content:i}},h8=({ignore:r=[],cwd:e=$d(process.cwd())}={})=>({ignore:r,cwd:e});RD.exports=async r=>{r=h8(r);let e=await c8("**/.gitignore",{ignore:u8.concat(r.ignore),cwd:r.cwd}),t=await Promise.all(e.map(n=>ISe(n,r.cwd))),i=g8(t);return f8(i,r.cwd)};RD.exports.sync=r=>{r=h8(r);let t=c8.sync("**/.gitignore",{ignore:u8.concat(r.ignore),cwd:r.cwd}).map(n=>ySe(n,r.cwd)),i=g8(t);return f8(i,r.cwd)}});var C8=w((Krt,d8)=>{"use strict";var{Transform:wSe}=J("stream"),mw=class extends wSe{constructor(){super({objectMode:!0})}},FD=class extends mw{constructor(e){super(),this._filter=e}_transform(e,t,i){this._filter(e)&&this.push(e),i()}},ND=class extends mw{constructor(){super(),this._pushed=new Set}_transform(e,t,i){this._pushed.has(e)||(this.push(e),this._pushed.add(e)),i()}};d8.exports={FilterStream:FD,UniqueStream:ND}});var MD=w((Urt,Pc)=>{"use strict";var E8=J("fs"),Ew=mW(),BSe=sP(),Iw=dw(),yw=_4(),TD=p8(),{FilterStream:bSe,UniqueStream:QSe}=C8(),I8=()=>!1,m8=r=>r[0]==="!",SSe=r=>{if(!r.every(e=>typeof e=="string"))throw new TypeError("Patterns must be a string or an array of strings")},vSe=(r={})=>{if(!r.cwd)return;let e;try{e=E8.statSync(r.cwd)}catch{return}if(!e.isDirectory())throw new Error("The `cwd` option must be a path to a directory")},xSe=r=>r.stats instanceof E8.Stats?r.path:r,ww=(r,e)=>{r=Ew([].concat(r)),SSe(r),vSe(e);let t=[];e={ignore:[],expandDirectories:!0,...e};for(let[i,n]of r.entries()){if(m8(n))continue;let s=r.slice(i).filter(a=>m8(a)).map(a=>a.slice(1)),o={...e,ignore:e.ignore.concat(s)};t.push({pattern:n,options:o})}return t},PSe=(r,e)=>{let t={};return r.options.cwd&&(t.cwd=r.options.cwd),Array.isArray(r.options.expandDirectories)?t={...t,files:r.options.expandDirectories}:typeof r.options.expandDirectories=="object"&&(t={...t,...r.options.expandDirectories}),e(r.pattern,t)},LD=(r,e)=>r.options.expandDirectories?PSe(r,e):[r.pattern],y8=r=>r&&r.gitignore?TD.sync({cwd:r.cwd,ignore:r.ignore}):I8,OD=r=>e=>{let{options:t}=r;return t.ignore&&Array.isArray(t.ignore)&&t.expandDirectories&&(t.ignore=yw.sync(t.ignore)),{pattern:e,options:t}};Pc.exports=async(r,e)=>{let t=ww(r,e),i=async()=>e&&e.gitignore?TD({cwd:e.cwd,ignore:e.ignore}):I8,n=async()=>{let l=await Promise.all(t.map(async c=>{let u=await LD(c,yw);return Promise.all(u.map(OD(c)))}));return Ew(...l)},[s,o]=await Promise.all([i(),n()]),a=await Promise.all(o.map(l=>Iw(l.pattern,l.options)));return Ew(...a).filter(l=>!s(xSe(l)))};Pc.exports.sync=(r,e)=>{let t=ww(r,e),i=[];for(let o of t){let a=LD(o,yw.sync).map(OD(o));i.push(...a)}let n=y8(e),s=[];for(let o of i)s=Ew(s,Iw.sync(o.pattern,o.options));return s.filter(o=>!n(o))};Pc.exports.stream=(r,e)=>{let t=ww(r,e),i=[];for(let a of t){let l=LD(a,yw.sync).map(OD(a));i.push(...l)}let n=y8(e),s=new bSe(a=>!n(a)),o=new QSe;return BSe(i.map(a=>Iw.stream(a.pattern,a.options))).pipe(s).pipe(o)};Pc.exports.generateGlobTasks=ww;Pc.exports.hasMagic=(r,e)=>[].concat(r).some(t=>Iw.isDynamicPattern(t,e));Pc.exports.gitignore=TD});var vn=w((iit,L8)=>{function GSe(r){var e=typeof r;return r!=null&&(e=="object"||e=="function")}L8.exports=GSe});var WD=w((nit,O8)=>{var YSe=typeof global=="object"&&global&&global.Object===Object&&global;O8.exports=YSe});var ys=w((sit,M8)=>{var jSe=WD(),qSe=typeof self=="object"&&self&&self.Object===Object&&self,JSe=jSe||qSe||Function("return this")();M8.exports=JSe});var U8=w((oit,K8)=>{var WSe=ys(),zSe=function(){return WSe.Date.now()};K8.exports=zSe});var G8=w((ait,H8)=>{var VSe=/\s/;function XSe(r){for(var e=r.length;e--&&VSe.test(r.charAt(e)););return e}H8.exports=XSe});var j8=w((Ait,Y8)=>{var ZSe=G8(),_Se=/^\s+/;function $Se(r){return r&&r.slice(0,ZSe(r)+1).replace(_Se,"")}Y8.exports=$Se});var Rc=w((lit,q8)=>{var eve=ys(),tve=eve.Symbol;q8.exports=tve});var V8=w((cit,z8)=>{var J8=Rc(),W8=Object.prototype,rve=W8.hasOwnProperty,ive=W8.toString,uC=J8?J8.toStringTag:void 0;function nve(r){var e=rve.call(r,uC),t=r[uC];try{r[uC]=void 0;var i=!0}catch{}var n=ive.call(r);return i&&(e?r[uC]=t:delete r[uC]),n}z8.exports=nve});var Z8=w((uit,X8)=>{var sve=Object.prototype,ove=sve.toString;function ave(r){return ove.call(r)}X8.exports=ave});var Fc=w((git,ez)=>{var _8=Rc(),Ave=V8(),lve=Z8(),cve="[object Null]",uve="[object Undefined]",$8=_8?_8.toStringTag:void 0;function gve(r){return r==null?r===void 0?uve:cve:$8&&$8 in Object(r)?Ave(r):lve(r)}ez.exports=gve});var Wo=w((fit,tz)=>{function fve(r){return r!=null&&typeof r=="object"}tz.exports=fve});var gC=w((hit,rz)=>{var hve=Fc(),pve=Wo(),dve="[object Symbol]";function Cve(r){return typeof r=="symbol"||pve(r)&&hve(r)==dve}rz.exports=Cve});var oz=w((pit,sz)=>{var mve=j8(),iz=vn(),Eve=gC(),nz=0/0,Ive=/^[-+]0x[0-9a-f]+$/i,yve=/^0b[01]+$/i,wve=/^0o[0-7]+$/i,Bve=parseInt;function bve(r){if(typeof r=="number")return r;if(Eve(r))return nz;if(iz(r)){var e=typeof r.valueOf=="function"?r.valueOf():r;r=iz(e)?e+"":e}if(typeof r!="string")return r===0?r:+r;r=mve(r);var t=yve.test(r);return t||wve.test(r)?Bve(r.slice(2),t?2:8):Ive.test(r)?nz:+r}sz.exports=bve});var lz=w((dit,Az)=>{var Qve=vn(),zD=U8(),az=oz(),Sve="Expected a function",vve=Math.max,xve=Math.min;function Pve(r,e,t){var i,n,s,o,a,l,c=0,u=!1,g=!1,f=!0;if(typeof r!="function")throw new TypeError(Sve);e=az(e)||0,Qve(t)&&(u=!!t.leading,g="maxWait"in t,s=g?vve(az(t.maxWait)||0,e):s,f="trailing"in t?!!t.trailing:f);function h(j){var $=i,V=n;return i=n=void 0,c=j,o=r.apply(V,$),o}function p(j){return c=j,a=setTimeout(B,e),u?h(j):o}function C(j){var $=j-l,V=j-c,W=e-$;return g?xve(W,s-V):W}function y(j){var $=j-l,V=j-c;return l===void 0||$>=e||$<0||g&&V>=s}function B(){var j=zD();if(y(j))return v(j);a=setTimeout(B,C(j))}function v(j){return a=void 0,f&&i?h(j):(i=n=void 0,o)}function D(){a!==void 0&&clearTimeout(a),c=0,i=l=n=a=void 0}function T(){return a===void 0?o:v(zD())}function H(){var j=zD(),$=y(j);if(i=arguments,n=this,l=j,$){if(a===void 0)return p(l);if(g)return clearTimeout(a),a=setTimeout(B,e),h(l)}return a===void 0&&(a=setTimeout(B,e)),o}return H.cancel=D,H.flush=T,H}Az.exports=Pve});var uz=w((Cit,cz)=>{var Dve=lz(),kve=vn(),Rve="Expected a function";function Fve(r,e,t){var i=!0,n=!0;if(typeof r!="function")throw new TypeError(Rve);return kve(t)&&(i="leading"in t?!!t.leading:i,n="trailing"in t?!!t.trailing:n),Dve(r,e,{leading:i,maxWait:e,trailing:n})}cz.exports=Fve});var Ya=w((Ga,jw)=>{"use strict";Object.defineProperty(Ga,"__esModule",{value:!0});var Iz=["Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Uint16Array","Int32Array","Uint32Array","Float32Array","Float64Array","BigInt64Array","BigUint64Array"];function Jve(r){return Iz.includes(r)}var Wve=["Function","Generator","AsyncGenerator","GeneratorFunction","AsyncGeneratorFunction","AsyncFunction","Observable","Array","Buffer","Object","RegExp","Date","Error","Map","Set","WeakMap","WeakSet","ArrayBuffer","SharedArrayBuffer","DataView","Promise","URL","FormData","URLSearchParams","HTMLElement",...Iz];function zve(r){return Wve.includes(r)}var Vve=["null","undefined","string","number","bigint","boolean","symbol"];function Xve(r){return Vve.includes(r)}function Lf(r){return e=>typeof e===r}var{toString:yz}=Object.prototype,CC=r=>{let e=yz.call(r).slice(8,-1);if(/HTML\w+Element/.test(e)&&X.domElement(r))return"HTMLElement";if(zve(e))return e},lr=r=>e=>CC(e)===r;function X(r){if(r===null)return"null";switch(typeof r){case"undefined":return"undefined";case"string":return"string";case"number":return"number";case"boolean":return"boolean";case"function":return"Function";case"bigint":return"bigint";case"symbol":return"symbol";default:}if(X.observable(r))return"Observable";if(X.array(r))return"Array";if(X.buffer(r))return"Buffer";let e=CC(r);if(e)return e;if(r instanceof String||r instanceof Boolean||r instanceof Number)throw new TypeError("Please don't use object wrappers for primitive types");return"Object"}X.undefined=Lf("undefined");X.string=Lf("string");var Zve=Lf("number");X.number=r=>Zve(r)&&!X.nan(r);X.bigint=Lf("bigint");X.function_=Lf("function");X.null_=r=>r===null;X.class_=r=>X.function_(r)&&r.toString().startsWith("class ");X.boolean=r=>r===!0||r===!1;X.symbol=Lf("symbol");X.numericString=r=>X.string(r)&&!X.emptyStringOrWhitespace(r)&&!Number.isNaN(Number(r));X.array=(r,e)=>Array.isArray(r)?X.function_(e)?r.every(e):!0:!1;X.buffer=r=>{var e,t,i,n;return(n=(i=(t=(e=r)===null||e===void 0?void 0:e.constructor)===null||t===void 0?void 0:t.isBuffer)===null||i===void 0?void 0:i.call(t,r))!==null&&n!==void 0?n:!1};X.nullOrUndefined=r=>X.null_(r)||X.undefined(r);X.object=r=>!X.null_(r)&&(typeof r=="object"||X.function_(r));X.iterable=r=>{var e;return X.function_((e=r)===null||e===void 0?void 0:e[Symbol.iterator])};X.asyncIterable=r=>{var e;return X.function_((e=r)===null||e===void 0?void 0:e[Symbol.asyncIterator])};X.generator=r=>X.iterable(r)&&X.function_(r.next)&&X.function_(r.throw);X.asyncGenerator=r=>X.asyncIterable(r)&&X.function_(r.next)&&X.function_(r.throw);X.nativePromise=r=>lr("Promise")(r);var _ve=r=>{var e,t;return X.function_((e=r)===null||e===void 0?void 0:e.then)&&X.function_((t=r)===null||t===void 0?void 0:t.catch)};X.promise=r=>X.nativePromise(r)||_ve(r);X.generatorFunction=lr("GeneratorFunction");X.asyncGeneratorFunction=r=>CC(r)==="AsyncGeneratorFunction";X.asyncFunction=r=>CC(r)==="AsyncFunction";X.boundFunction=r=>X.function_(r)&&!r.hasOwnProperty("prototype");X.regExp=lr("RegExp");X.date=lr("Date");X.error=lr("Error");X.map=r=>lr("Map")(r);X.set=r=>lr("Set")(r);X.weakMap=r=>lr("WeakMap")(r);X.weakSet=r=>lr("WeakSet")(r);X.int8Array=lr("Int8Array");X.uint8Array=lr("Uint8Array");X.uint8ClampedArray=lr("Uint8ClampedArray");X.int16Array=lr("Int16Array");X.uint16Array=lr("Uint16Array");X.int32Array=lr("Int32Array");X.uint32Array=lr("Uint32Array");X.float32Array=lr("Float32Array");X.float64Array=lr("Float64Array");X.bigInt64Array=lr("BigInt64Array");X.bigUint64Array=lr("BigUint64Array");X.arrayBuffer=lr("ArrayBuffer");X.sharedArrayBuffer=lr("SharedArrayBuffer");X.dataView=lr("DataView");X.directInstanceOf=(r,e)=>Object.getPrototypeOf(r)===e.prototype;X.urlInstance=r=>lr("URL")(r);X.urlString=r=>{if(!X.string(r))return!1;try{return new URL(r),!0}catch{return!1}};X.truthy=r=>Boolean(r);X.falsy=r=>!r;X.nan=r=>Number.isNaN(r);X.primitive=r=>X.null_(r)||Xve(typeof r);X.integer=r=>Number.isInteger(r);X.safeInteger=r=>Number.isSafeInteger(r);X.plainObject=r=>{if(yz.call(r)!=="[object Object]")return!1;let e=Object.getPrototypeOf(r);return e===null||e===Object.getPrototypeOf({})};X.typedArray=r=>Jve(CC(r));var $ve=r=>X.safeInteger(r)&&r>=0;X.arrayLike=r=>!X.nullOrUndefined(r)&&!X.function_(r)&&$ve(r.length);X.inRange=(r,e)=>{if(X.number(e))return r>=Math.min(0,e)&&r<=Math.max(e,0);if(X.array(e)&&e.length===2)return r>=Math.min(...e)&&r<=Math.max(...e);throw new TypeError(`Invalid range: ${JSON.stringify(e)}`)};var exe=1,txe=["innerHTML","ownerDocument","style","attributes","nodeValue"];X.domElement=r=>X.object(r)&&r.nodeType===exe&&X.string(r.nodeName)&&!X.plainObject(r)&&txe.every(e=>e in r);X.observable=r=>{var e,t,i,n;return r?r===((t=(e=r)[Symbol.observable])===null||t===void 0?void 0:t.call(e))||r===((n=(i=r)["@@observable"])===null||n===void 0?void 0:n.call(i)):!1};X.nodeStream=r=>X.object(r)&&X.function_(r.pipe)&&!X.observable(r);X.infinite=r=>r===1/0||r===-1/0;var wz=r=>e=>X.integer(e)&&Math.abs(e%2)===r;X.evenInteger=wz(0);X.oddInteger=wz(1);X.emptyArray=r=>X.array(r)&&r.length===0;X.nonEmptyArray=r=>X.array(r)&&r.length>0;X.emptyString=r=>X.string(r)&&r.length===0;X.nonEmptyString=r=>X.string(r)&&r.length>0;var rxe=r=>X.string(r)&&!/\S/.test(r);X.emptyStringOrWhitespace=r=>X.emptyString(r)||rxe(r);X.emptyObject=r=>X.object(r)&&!X.map(r)&&!X.set(r)&&Object.keys(r).length===0;X.nonEmptyObject=r=>X.object(r)&&!X.map(r)&&!X.set(r)&&Object.keys(r).length>0;X.emptySet=r=>X.set(r)&&r.size===0;X.nonEmptySet=r=>X.set(r)&&r.size>0;X.emptyMap=r=>X.map(r)&&r.size===0;X.nonEmptyMap=r=>X.map(r)&&r.size>0;X.propertyKey=r=>X.any([X.string,X.number,X.symbol],r);X.formData=r=>lr("FormData")(r);X.urlSearchParams=r=>lr("URLSearchParams")(r);var Bz=(r,e,t)=>{if(!X.function_(e))throw new TypeError(`Invalid predicate: ${JSON.stringify(e)}`);if(t.length===0)throw new TypeError("Invalid number of values");return r.call(t,e)};X.any=(r,...e)=>(X.array(r)?r:[r]).some(i=>Bz(Array.prototype.some,i,e));X.all=(r,...e)=>Bz(Array.prototype.every,r,e);var Ye=(r,e,t,i={})=>{if(!r){let{multipleValues:n}=i,s=n?`received values of types ${[...new Set(t.map(o=>`\`${X(o)}\``))].join(", ")}`:`received value of type \`${X(t)}\``;throw new TypeError(`Expected value which is \`${e}\`, ${s}.`)}};Ga.assert={undefined:r=>Ye(X.undefined(r),"undefined",r),string:r=>Ye(X.string(r),"string",r),number:r=>Ye(X.number(r),"number",r),bigint:r=>Ye(X.bigint(r),"bigint",r),function_:r=>Ye(X.function_(r),"Function",r),null_:r=>Ye(X.null_(r),"null",r),class_:r=>Ye(X.class_(r),"Class",r),boolean:r=>Ye(X.boolean(r),"boolean",r),symbol:r=>Ye(X.symbol(r),"symbol",r),numericString:r=>Ye(X.numericString(r),"string with a number",r),array:(r,e)=>{Ye(X.array(r),"Array",r),e&&r.forEach(e)},buffer:r=>Ye(X.buffer(r),"Buffer",r),nullOrUndefined:r=>Ye(X.nullOrUndefined(r),"null or undefined",r),object:r=>Ye(X.object(r),"Object",r),iterable:r=>Ye(X.iterable(r),"Iterable",r),asyncIterable:r=>Ye(X.asyncIterable(r),"AsyncIterable",r),generator:r=>Ye(X.generator(r),"Generator",r),asyncGenerator:r=>Ye(X.asyncGenerator(r),"AsyncGenerator",r),nativePromise:r=>Ye(X.nativePromise(r),"native Promise",r),promise:r=>Ye(X.promise(r),"Promise",r),generatorFunction:r=>Ye(X.generatorFunction(r),"GeneratorFunction",r),asyncGeneratorFunction:r=>Ye(X.asyncGeneratorFunction(r),"AsyncGeneratorFunction",r),asyncFunction:r=>Ye(X.asyncFunction(r),"AsyncFunction",r),boundFunction:r=>Ye(X.boundFunction(r),"Function",r),regExp:r=>Ye(X.regExp(r),"RegExp",r),date:r=>Ye(X.date(r),"Date",r),error:r=>Ye(X.error(r),"Error",r),map:r=>Ye(X.map(r),"Map",r),set:r=>Ye(X.set(r),"Set",r),weakMap:r=>Ye(X.weakMap(r),"WeakMap",r),weakSet:r=>Ye(X.weakSet(r),"WeakSet",r),int8Array:r=>Ye(X.int8Array(r),"Int8Array",r),uint8Array:r=>Ye(X.uint8Array(r),"Uint8Array",r),uint8ClampedArray:r=>Ye(X.uint8ClampedArray(r),"Uint8ClampedArray",r),int16Array:r=>Ye(X.int16Array(r),"Int16Array",r),uint16Array:r=>Ye(X.uint16Array(r),"Uint16Array",r),int32Array:r=>Ye(X.int32Array(r),"Int32Array",r),uint32Array:r=>Ye(X.uint32Array(r),"Uint32Array",r),float32Array:r=>Ye(X.float32Array(r),"Float32Array",r),float64Array:r=>Ye(X.float64Array(r),"Float64Array",r),bigInt64Array:r=>Ye(X.bigInt64Array(r),"BigInt64Array",r),bigUint64Array:r=>Ye(X.bigUint64Array(r),"BigUint64Array",r),arrayBuffer:r=>Ye(X.arrayBuffer(r),"ArrayBuffer",r),sharedArrayBuffer:r=>Ye(X.sharedArrayBuffer(r),"SharedArrayBuffer",r),dataView:r=>Ye(X.dataView(r),"DataView",r),urlInstance:r=>Ye(X.urlInstance(r),"URL",r),urlString:r=>Ye(X.urlString(r),"string with a URL",r),truthy:r=>Ye(X.truthy(r),"truthy",r),falsy:r=>Ye(X.falsy(r),"falsy",r),nan:r=>Ye(X.nan(r),"NaN",r),primitive:r=>Ye(X.primitive(r),"primitive",r),integer:r=>Ye(X.integer(r),"integer",r),safeInteger:r=>Ye(X.safeInteger(r),"integer",r),plainObject:r=>Ye(X.plainObject(r),"plain object",r),typedArray:r=>Ye(X.typedArray(r),"TypedArray",r),arrayLike:r=>Ye(X.arrayLike(r),"array-like",r),domElement:r=>Ye(X.domElement(r),"HTMLElement",r),observable:r=>Ye(X.observable(r),"Observable",r),nodeStream:r=>Ye(X.nodeStream(r),"Node.js Stream",r),infinite:r=>Ye(X.infinite(r),"infinite number",r),emptyArray:r=>Ye(X.emptyArray(r),"empty array",r),nonEmptyArray:r=>Ye(X.nonEmptyArray(r),"non-empty array",r),emptyString:r=>Ye(X.emptyString(r),"empty string",r),nonEmptyString:r=>Ye(X.nonEmptyString(r),"non-empty string",r),emptyStringOrWhitespace:r=>Ye(X.emptyStringOrWhitespace(r),"empty string or whitespace",r),emptyObject:r=>Ye(X.emptyObject(r),"empty object",r),nonEmptyObject:r=>Ye(X.nonEmptyObject(r),"non-empty object",r),emptySet:r=>Ye(X.emptySet(r),"empty set",r),nonEmptySet:r=>Ye(X.nonEmptySet(r),"non-empty set",r),emptyMap:r=>Ye(X.emptyMap(r),"empty map",r),nonEmptyMap:r=>Ye(X.nonEmptyMap(r),"non-empty map",r),propertyKey:r=>Ye(X.propertyKey(r),"PropertyKey",r),formData:r=>Ye(X.formData(r),"FormData",r),urlSearchParams:r=>Ye(X.urlSearchParams(r),"URLSearchParams",r),evenInteger:r=>Ye(X.evenInteger(r),"even integer",r),oddInteger:r=>Ye(X.oddInteger(r),"odd integer",r),directInstanceOf:(r,e)=>Ye(X.directInstanceOf(r,e),"T",r),inRange:(r,e)=>Ye(X.inRange(r,e),"in range",r),any:(r,...e)=>Ye(X.any(r,...e),"predicate returns truthy for any value",e,{multipleValues:!0}),all:(r,...e)=>Ye(X.all(r,...e),"predicate returns truthy for all values",e,{multipleValues:!0})};Object.defineProperties(X,{class:{value:X.class_},function:{value:X.function_},null:{value:X.null_}});Object.defineProperties(Ga.assert,{class:{value:Ga.assert.class_},function:{value:Ga.assert.function_},null:{value:Ga.assert.null_}});Ga.default=X;jw.exports=X;jw.exports.default=X;jw.exports.assert=Ga.assert});var bz=w((rnt,dk)=>{"use strict";var qw=class extends Error{constructor(e){super(e||"Promise was canceled"),this.name="CancelError"}get isCanceled(){return!0}},Of=class{static fn(e){return(...t)=>new Of((i,n,s)=>{t.push(s),e(...t).then(i,n)})}constructor(e){this._cancelHandlers=[],this._isPending=!0,this._isCanceled=!1,this._rejectOnCancel=!0,this._promise=new Promise((t,i)=>{this._reject=i;let n=a=>{this._isPending=!1,t(a)},s=a=>{this._isPending=!1,i(a)},o=a=>{if(!this._isPending)throw new Error("The `onCancel` handler was attached after the promise settled.");this._cancelHandlers.push(a)};return Object.defineProperties(o,{shouldReject:{get:()=>this._rejectOnCancel,set:a=>{this._rejectOnCancel=a}}}),e(n,s,o)})}then(e,t){return this._promise.then(e,t)}catch(e){return this._promise.catch(e)}finally(e){return this._promise.finally(e)}cancel(e){if(!(!this._isPending||this._isCanceled)){if(this._cancelHandlers.length>0)try{for(let t of this._cancelHandlers)t()}catch(t){this._reject(t)}this._isCanceled=!0,this._rejectOnCancel&&this._reject(new qw(e))}}get isCanceled(){return this._isCanceled}};Object.setPrototypeOf(Of.prototype,Promise.prototype);dk.exports=Of;dk.exports.CancelError=qw});var Qz=w((mk,Ek)=>{"use strict";Object.defineProperty(mk,"__esModule",{value:!0});var ixe=J("tls"),Ck=(r,e)=>{let t;typeof e=="function"?t={connect:e}:t=e;let i=typeof t.connect=="function",n=typeof t.secureConnect=="function",s=typeof t.close=="function",o=()=>{i&&t.connect(),r instanceof ixe.TLSSocket&&n&&(r.authorized?t.secureConnect():r.authorizationError||r.once("secureConnect",t.secureConnect)),s&&r.once("close",t.close)};r.writable&&!r.connecting?o():r.connecting?r.once("connect",o):r.destroyed&&s&&t.close(r._hadError)};mk.default=Ck;Ek.exports=Ck;Ek.exports.default=Ck});var Sz=w((yk,wk)=>{"use strict";Object.defineProperty(yk,"__esModule",{value:!0});var nxe=Qz(),sxe=Number(process.versions.node.split(".")[0]),Ik=r=>{let e={start:Date.now(),socket:void 0,lookup:void 0,connect:void 0,secureConnect:void 0,upload:void 0,response:void 0,end:void 0,error:void 0,abort:void 0,phases:{wait:void 0,dns:void 0,tcp:void 0,tls:void 0,request:void 0,firstByte:void 0,download:void 0,total:void 0}};r.timings=e;let t=o=>{let a=o.emit.bind(o);o.emit=(l,...c)=>(l==="error"&&(e.error=Date.now(),e.phases.total=e.error-e.start,o.emit=a),a(l,...c))};t(r),r.prependOnceListener("abort",()=>{e.abort=Date.now(),(!e.response||sxe>=13)&&(e.phases.total=Date.now()-e.start)});let i=o=>{e.socket=Date.now(),e.phases.wait=e.socket-e.start;let a=()=>{e.lookup=Date.now(),e.phases.dns=e.lookup-e.socket};o.prependOnceListener("lookup",a),nxe.default(o,{connect:()=>{e.connect=Date.now(),e.lookup===void 0&&(o.removeListener("lookup",a),e.lookup=e.connect,e.phases.dns=e.lookup-e.socket),e.phases.tcp=e.connect-e.lookup},secureConnect:()=>{e.secureConnect=Date.now(),e.phases.tls=e.secureConnect-e.connect}})};r.socket?i(r.socket):r.prependOnceListener("socket",i);let n=()=>{var o;e.upload=Date.now(),e.phases.request=e.upload-(o=e.secureConnect,o!=null?o:e.connect)};return(()=>typeof r.writableFinished=="boolean"?r.writableFinished:r.finished&&r.outputSize===0&&(!r.socket||r.socket.writableLength===0))()?n():r.prependOnceListener("finish",n),r.prependOnceListener("response",o=>{e.response=Date.now(),e.phases.firstByte=e.response-e.upload,o.timings=e,t(o),o.prependOnceListener("end",()=>{e.end=Date.now(),e.phases.download=e.end-e.response,e.phases.total=e.end-e.start})}),e};yk.default=Ik;wk.exports=Ik;wk.exports.default=Ik});var Fz=w((int,Qk)=>{"use strict";var{V4MAPPED:oxe,ADDRCONFIG:axe,ALL:Rz,promises:{Resolver:vz},lookup:Axe}=J("dns"),{promisify:Bk}=J("util"),lxe=J("os"),Mf=Symbol("cacheableLookupCreateConnection"),bk=Symbol("cacheableLookupInstance"),xz=Symbol("expires"),cxe=typeof Rz=="number",Pz=r=>{if(!(r&&typeof r.createConnection=="function"))throw new Error("Expected an Agent instance as the first argument")},uxe=r=>{for(let e of r)e.family!==6&&(e.address=`::ffff:${e.address}`,e.family=6)},Dz=()=>{let r=!1,e=!1;for(let t of Object.values(lxe.networkInterfaces()))for(let i of t)if(!i.internal&&(i.family==="IPv6"?e=!0:r=!0,r&&e))return{has4:r,has6:e};return{has4:r,has6:e}},gxe=r=>Symbol.iterator in r,kz={ttl:!0},fxe={all:!0},Jw=class{constructor({cache:e=new Map,maxTtl:t=1/0,fallbackDuration:i=3600,errorTtl:n=.15,resolver:s=new vz,lookup:o=Axe}={}){if(this.maxTtl=t,this.errorTtl=n,this._cache=e,this._resolver=s,this._dnsLookup=Bk(o),this._resolver instanceof vz?(this._resolve4=this._resolver.resolve4.bind(this._resolver),this._resolve6=this._resolver.resolve6.bind(this._resolver)):(this._resolve4=Bk(this._resolver.resolve4.bind(this._resolver)),this._resolve6=Bk(this._resolver.resolve6.bind(this._resolver))),this._iface=Dz(),this._pending={},this._nextRemovalTime=!1,this._hostnamesToFallback=new Set,i<1)this._fallback=!1;else{this._fallback=!0;let a=setInterval(()=>{this._hostnamesToFallback.clear()},i*1e3);a.unref&&a.unref()}this.lookup=this.lookup.bind(this),this.lookupAsync=this.lookupAsync.bind(this)}set servers(e){this.clear(),this._resolver.setServers(e)}get servers(){return this._resolver.getServers()}lookup(e,t,i){if(typeof t=="function"?(i=t,t={}):typeof t=="number"&&(t={family:t}),!i)throw new Error("Callback must be a function.");this.lookupAsync(e,t).then(n=>{t.all?i(null,n):i(null,n.address,n.family,n.expires,n.ttl)},i)}async lookupAsync(e,t={}){typeof t=="number"&&(t={family:t});let i=await this.query(e);if(t.family===6){let n=i.filter(s=>s.family===6);t.hints&oxe&&(cxe&&t.hints&Rz||n.length===0)?uxe(i):i=n}else t.family===4&&(i=i.filter(n=>n.family===4));if(t.hints&axe){let{_iface:n}=this;i=i.filter(s=>s.family===6?n.has6:n.has4)}if(i.length===0){let n=new Error(`cacheableLookup ENOTFOUND ${e}`);throw n.code="ENOTFOUND",n.hostname=e,n}return t.all?i:i[0]}async query(e){let t=await this._cache.get(e);if(!t){let i=this._pending[e];if(i)t=await i;else{let n=this.queryAndCache(e);this._pending[e]=n,t=await n}}return t=t.map(i=>({...i})),t}async _resolve(e){let t=async c=>{try{return await c}catch(u){if(u.code==="ENODATA"||u.code==="ENOTFOUND")return[];throw u}},[i,n]=await Promise.all([this._resolve4(e,kz),this._resolve6(e,kz)].map(c=>t(c))),s=0,o=0,a=0,l=Date.now();for(let c of i)c.family=4,c.expires=l+c.ttl*1e3,s=Math.max(s,c.ttl);for(let c of n)c.family=6,c.expires=l+c.ttl*1e3,o=Math.max(o,c.ttl);return i.length>0?n.length>0?a=Math.min(s,o):a=s:a=o,{entries:[...i,...n],cacheTtl:a}}async _lookup(e){try{return{entries:await this._dnsLookup(e,{all:!0}),cacheTtl:0}}catch{return{entries:[],cacheTtl:0}}}async _set(e,t,i){if(this.maxTtl>0&&i>0){i=Math.min(i,this.maxTtl)*1e3,t[xz]=Date.now()+i;try{await this._cache.set(e,t,i)}catch(n){this.lookupAsync=async()=>{let s=new Error("Cache Error. Please recreate the CacheableLookup instance.");throw s.cause=n,s}}gxe(this._cache)&&this._tick(i)}}async queryAndCache(e){if(this._hostnamesToFallback.has(e))return this._dnsLookup(e,fxe);try{let t=await this._resolve(e);t.entries.length===0&&this._fallback&&(t=await this._lookup(e),t.entries.length!==0&&this._hostnamesToFallback.add(e));let i=t.entries.length===0?this.errorTtl:t.cacheTtl;return await this._set(e,t.entries,i),delete this._pending[e],t.entries}catch(t){throw delete this._pending[e],t}}_tick(e){let t=this._nextRemovalTime;(!t||e<t)&&(clearTimeout(this._removalTimeout),this._nextRemovalTime=e,this._removalTimeout=setTimeout(()=>{this._nextRemovalTime=!1;let i=1/0,n=Date.now();for(let[s,o]of this._cache){let a=o[xz];n>=a?this._cache.delete(s):a<i&&(i=a)}i!==1/0&&this._tick(i-n)},e),this._removalTimeout.unref&&this._removalTimeout.unref())}install(e){if(Pz(e),Mf in e)throw new Error("CacheableLookup has been already installed");e[Mf]=e.createConnection,e[bk]=this,e.createConnection=(t,i)=>("lookup"in t||(t.lookup=this.lookup),e[Mf](t,i))}uninstall(e){if(Pz(e),e[Mf]){if(e[bk]!==this)throw new Error("The agent is not owned by this CacheableLookup instance");e.createConnection=e[Mf],delete e[Mf],delete e[bk]}}updateInterfaceInfo(){let{_iface:e}=this;this._iface=Dz(),(e.has4&&!this._iface.has4||e.has6&&!this._iface.has6)&&this._cache.clear()}clear(e){if(e){this._cache.delete(e);return}this._cache.clear()}};Qk.exports=Jw;Qk.exports.default=Jw});var Lz=w((nnt,Sk)=>{"use strict";var hxe=typeof URL>"u"?J("url").URL:URL,pxe="text/plain",dxe="us-ascii",Nz=(r,e)=>e.some(t=>t instanceof RegExp?t.test(r):t===r),Cxe=(r,{stripHash:e})=>{let t=r.match(/^data:([^,]*?),([^#]*?)(?:#(.*))?$/);if(!t)throw new Error(`Invalid URL: ${r}`);let i=t[1].split(";"),n=t[2],s=e?"":t[3],o=!1;i[i.length-1]==="base64"&&(i.pop(),o=!0);let a=(i.shift()||"").toLowerCase(),c=[...i.map(u=>{let[g,f=""]=u.split("=").map(h=>h.trim());return g==="charset"&&(f=f.toLowerCase(),f===dxe)?"":`${g}${f?`=${f}`:""}`}).filter(Boolean)];return o&&c.push("base64"),(c.length!==0||a&&a!==pxe)&&c.unshift(a),`data:${c.join(";")},${o?n.trim():n}${s?`#${s}`:""}`},Tz=(r,e)=>{if(e={defaultProtocol:"http:",normalizeProtocol:!0,forceHttp:!1,forceHttps:!1,stripAuthentication:!0,stripHash:!1,stripWWW:!0,removeQueryParameters:[/^utm_\w+/i],removeTrailingSlash:!0,removeDirectoryIndex:!1,sortQueryParameters:!0,...e},Reflect.has(e,"normalizeHttps"))throw new Error("options.normalizeHttps is renamed to options.forceHttp");if(Reflect.has(e,"normalizeHttp"))throw new Error("options.normalizeHttp is renamed to options.forceHttps");if(Reflect.has(e,"stripFragment"))throw new Error("options.stripFragment is renamed to options.stripHash");if(r=r.trim(),/^data:/i.test(r))return Cxe(r,e);let t=r.startsWith("//");!t&&/^\.*\//.test(r)||(r=r.replace(/^(?!(?:\w+:)?\/\/)|^\/\//,e.defaultProtocol));let n=new hxe(r);if(e.forceHttp&&e.forceHttps)throw new Error("The `forceHttp` and `forceHttps` options cannot be used together");if(e.forceHttp&&n.protocol==="https:"&&(n.protocol="http:"),e.forceHttps&&n.protocol==="http:"&&(n.protocol="https:"),e.stripAuthentication&&(n.username="",n.password=""),e.stripHash&&(n.hash=""),n.pathname&&(n.pathname=n.pathname.replace(/((?!:).|^)\/{2,}/g,(s,o)=>/^(?!\/)/g.test(o)?`${o}/`:"/")),n.pathname&&(n.pathname=decodeURI(n.pathname)),e.removeDirectoryIndex===!0&&(e.removeDirectoryIndex=[/^index\.[a-z]+$/]),Array.isArray(e.removeDirectoryIndex)&&e.removeDirectoryIndex.length>0){let s=n.pathname.split("/"),o=s[s.length-1];Nz(o,e.removeDirectoryIndex)&&(s=s.slice(0,s.length-1),n.pathname=s.slice(1).join("/")+"/")}if(n.hostname&&(n.hostname=n.hostname.replace(/\.$/,""),e.stripWWW&&/^www\.([a-z\-\d]{2,63})\.([a-z.]{2,5})$/.test(n.hostname)&&(n.hostname=n.hostname.replace(/^www\./,""))),Array.isArray(e.removeQueryParameters))for(let s of[...n.searchParams.keys()])Nz(s,e.removeQueryParameters)&&n.searchParams.delete(s);return e.sortQueryParameters&&n.searchParams.sort(),e.removeTrailingSlash&&(n.pathname=n.pathname.replace(/\/$/,"")),r=n.toString(),(e.removeTrailingSlash||n.pathname==="/")&&n.hash===""&&(r=r.replace(/\/$/,"")),t&&!e.normalizeProtocol&&(r=r.replace(/^http:\/\//,"//")),e.stripProtocol&&(r=r.replace(/^(?:https?:)?\/\//,"")),r};Sk.exports=Tz;Sk.exports.default=Tz});var Kz=w((snt,Mz)=>{Mz.exports=Oz;function Oz(r,e){if(r&&e)return Oz(r)(e);if(typeof r!="function")throw new TypeError("need wrapper function");return Object.keys(r).forEach(function(i){t[i]=r[i]}),t;function t(){for(var i=new Array(arguments.length),n=0;n<i.length;n++)i[n]=arguments[n];var s=r.apply(this,i),o=i[i.length-1];return typeof s=="function"&&s!==o&&Object.keys(o).forEach(function(a){s[a]=o[a]}),s}}});var xk=w((ont,vk)=>{var Uz=Kz();vk.exports=Uz(Ww);vk.exports.strict=Uz(Hz);Ww.proto=Ww(function(){Object.defineProperty(Function.prototype,"once",{value:function(){return Ww(this)},configurable:!0}),Object.defineProperty(Function.prototype,"onceStrict",{value:function(){return Hz(this)},configurable:!0})});function Ww(r){var e=function(){return e.called?e.value:(e.called=!0,e.value=r.apply(this,arguments))};return e.called=!1,e}function Hz(r){var e=function(){if(e.called)throw new Error(e.onceError);return e.called=!0,e.value=r.apply(this,arguments)},t=r.name||"Function wrapped with `once`";return e.onceError=t+" shouldn't be called more than once",e.called=!1,e}});var Pk=w((ant,Yz)=>{var mxe=xk(),Exe=function(){},Ixe=function(r){return r.setHeader&&typeof r.abort=="function"},yxe=function(r){return r.stdio&&Array.isArray(r.stdio)&&r.stdio.length===3},Gz=function(r,e,t){if(typeof e=="function")return Gz(r,null,e);e||(e={}),t=mxe(t||Exe);var i=r._writableState,n=r._readableState,s=e.readable||e.readable!==!1&&r.readable,o=e.writable||e.writable!==!1&&r.writable,a=function(){r.writable||l()},l=function(){o=!1,s||t.call(r)},c=function(){s=!1,o||t.call(r)},u=function(p){t.call(r,p?new Error("exited with error code: "+p):null)},g=function(p){t.call(r,p)},f=function(){if(s&&!(n&&n.ended))return t.call(r,new Error("premature close"));if(o&&!(i&&i.ended))return t.call(r,new Error("premature close"))},h=function(){r.req.on("finish",l)};return Ixe(r)?(r.on("complete",l),r.on("abort",f),r.req?h():r.on("request",h)):o&&!i&&(r.on("end",a),r.on("close",a)),yxe(r)&&r.on("exit",u),r.on("end",c),r.on("finish",l),e.error!==!1&&r.on("error",g),r.on("close",f),function(){r.removeListener("complete",l),r.removeListener("abort",f),r.removeListener("request",h),r.req&&r.req.removeListener("finish",l),r.removeListener("end",a),r.removeListener("close",a),r.removeListener("finish",l),r.removeListener("exit",u),r.removeListener("end",c),r.removeListener("error",g),r.removeListener("close",f)}};Yz.exports=Gz});var Jz=w((Ant,qz)=>{var wxe=xk(),Bxe=Pk(),Dk=J("fs"),mC=function(){},bxe=/^v?\.0/.test(process.version),zw=function(r){return typeof r=="function"},Qxe=function(r){return!bxe||!Dk?!1:(r instanceof(Dk.ReadStream||mC)||r instanceof(Dk.WriteStream||mC))&&zw(r.close)},Sxe=function(r){return r.setHeader&&zw(r.abort)},vxe=function(r,e,t,i){i=wxe(i);var n=!1;r.on("close",function(){n=!0}),Bxe(r,{readable:e,writable:t},function(o){if(o)return i(o);n=!0,i()});var s=!1;return function(o){if(!n&&!s){if(s=!0,Qxe(r))return r.close(mC);if(Sxe(r))return r.abort();if(zw(r.destroy))return r.destroy();i(o||new Error("stream was destroyed"))}}},jz=function(r){r()},xxe=function(r,e){return r.pipe(e)},Pxe=function(){var r=Array.prototype.slice.call(arguments),e=zw(r[r.length-1]||mC)&&r.pop()||mC;if(Array.isArray(r[0])&&(r=r[0]),r.length<2)throw new Error("pump requires two streams per minimum");var t,i=r.map(function(n,s){var o=s<r.length-1,a=s>0;return vxe(n,o,a,function(l){t||(t=l),l&&i.forEach(jz),!o&&(i.forEach(jz),e(t))})});return r.reduce(xxe)};qz.exports=Pxe});var zz=w((lnt,Wz)=>{"use strict";var{PassThrough:Dxe}=J("stream");Wz.exports=r=>{r={...r};let{array:e}=r,{encoding:t}=r,i=t==="buffer",n=!1;e?n=!(t||i):t=t||"utf8",i&&(t=null);let s=new Dxe({objectMode:n});t&&s.setEncoding(t);let o=0,a=[];return s.on("data",l=>{a.push(l),n?o=a.length:o+=l.length}),s.getBufferedValue=()=>e?a:i?Buffer.concat(a,o):a.join(""),s.getBufferedLength=()=>o,s}});var Vz=w((cnt,Kf)=>{"use strict";var kxe=Jz(),Rxe=zz(),Vw=class extends Error{constructor(){super("maxBuffer exceeded"),this.name="MaxBufferError"}};async function Xw(r,e){if(!r)return Promise.reject(new Error("Expected a stream"));e={maxBuffer:1/0,...e};let{maxBuffer:t}=e,i;return await new Promise((n,s)=>{let o=a=>{a&&(a.bufferedData=i.getBufferedValue()),s(a)};i=kxe(r,Rxe(e),a=>{if(a){o(a);return}n()}),i.on("data",()=>{i.getBufferedLength()>t&&o(new Vw)})}),i.getBufferedValue()}Kf.exports=Xw;Kf.exports.default=Xw;Kf.exports.buffer=(r,e)=>Xw(r,{...e,encoding:"buffer"});Kf.exports.array=(r,e)=>Xw(r,{...e,array:!0});Kf.exports.MaxBufferError=Vw});var Zz=w((gnt,Xz)=>{"use strict";var Fxe=new Set([200,203,204,206,300,301,404,405,410,414,501]),Nxe=new Set([200,203,204,300,301,302,303,307,308,404,405,410,414,501]),Txe=new Set([500,502,503,504]),Lxe={date:!0,connection:!0,"keep-alive":!0,"proxy-authenticate":!0,"proxy-authorization":!0,te:!0,trailer:!0,"transfer-encoding":!0,upgrade:!0},Oxe={"content-length":!0,"content-encoding":!0,"transfer-encoding":!0,"content-range":!0};function Lc(r){let e=parseInt(r,10);return isFinite(e)?e:0}function Mxe(r){return r?Txe.has(r.status):!0}function kk(r){let e={};if(!r)return e;let t=r.trim().split(/\s*,\s*/);for(let i of t){let[n,s]=i.split(/\s*=\s*/,2);e[n]=s===void 0?!0:s.replace(/^"|"$/g,"")}return e}function Kxe(r){let e=[];for(let t in r){let i=r[t];e.push(i===!0?t:t+"="+i)}if(!!e.length)return e.join(", ")}Xz.exports=class{constructor(e,t,{shared:i,cacheHeuristic:n,immutableMinTimeToLive:s,ignoreCargoCult:o,_fromObject:a}={}){if(a){this._fromObject(a);return}if(!t||!t.headers)throw Error("Response headers missing");this._assertRequestHasHeaders(e),this._responseTime=this.now(),this._isShared=i!==!1,this._cacheHeuristic=n!==void 0?n:.1,this._immutableMinTtl=s!==void 0?s:24*3600*1e3,this._status="status"in t?t.status:200,this._resHeaders=t.headers,this._rescc=kk(t.headers["cache-control"]),this._method="method"in e?e.method:"GET",this._url=e.url,this._host=e.headers.host,this._noAuthorization=!e.headers.authorization,this._reqHeaders=t.headers.vary?e.headers:null,this._reqcc=kk(e.headers["cache-control"]),o&&"pre-check"in this._rescc&&"post-check"in this._rescc&&(delete this._rescc["pre-check"],delete this._rescc["post-check"],delete this._rescc["no-cache"],delete this._rescc["no-store"],delete this._rescc["must-revalidate"],this._resHeaders=Object.assign({},this._resHeaders,{"cache-control":Kxe(this._rescc)}),delete this._resHeaders.expires,delete this._resHeaders.pragma),t.headers["cache-control"]==null&&/no-cache/.test(t.headers.pragma)&&(this._rescc["no-cache"]=!0)}now(){return Date.now()}storable(){return!!(!this._reqcc["no-store"]&&(this._method==="GET"||this._method==="HEAD"||this._method==="POST"&&this._hasExplicitExpiration())&&Nxe.has(this._status)&&!this._rescc["no-store"]&&(!this._isShared||!this._rescc.private)&&(!this._isShared||this._noAuthorization||this._allowsStoringAuthenticated())&&(this._resHeaders.expires||this._rescc["max-age"]||this._isShared&&this._rescc["s-maxage"]||this._rescc.public||Fxe.has(this._status)))}_hasExplicitExpiration(){return this._isShared&&this._rescc["s-maxage"]||this._rescc["max-age"]||this._resHeaders.expires}_assertRequestHasHeaders(e){if(!e||!e.headers)throw Error("Request headers missing")}satisfiesWithoutRevalidation(e){this._assertRequestHasHeaders(e);let t=kk(e.headers["cache-control"]);return t["no-cache"]||/no-cache/.test(e.headers.pragma)||t["max-age"]&&this.age()>t["max-age"]||t["min-fresh"]&&this.timeToLive()<1e3*t["min-fresh"]||this.stale()&&!(t["max-stale"]&&!this._rescc["must-revalidate"]&&(t["max-stale"]===!0||t["max-stale"]>this.age()-this.maxAge()))?!1:this._requestMatches(e,!1)}_requestMatches(e,t){return(!this._url||this._url===e.url)&&this._host===e.headers.host&&(!e.method||this._method===e.method||t&&e.method==="HEAD")&&this._varyMatches(e)}_allowsStoringAuthenticated(){return this._rescc["must-revalidate"]||this._rescc.public||this._rescc["s-maxage"]}_varyMatches(e){if(!this._resHeaders.vary)return!0;if(this._resHeaders.vary==="*")return!1;let t=this._resHeaders.vary.trim().toLowerCase().split(/\s*,\s*/);for(let i of t)if(e.headers[i]!==this._reqHeaders[i])return!1;return!0}_copyWithoutHopByHopHeaders(e){let t={};for(let i in e)Lxe[i]||(t[i]=e[i]);if(e.connection){let i=e.connection.trim().split(/\s*,\s*/);for(let n of i)delete t[n]}if(t.warning){let i=t.warning.split(/,/).filter(n=>!/^\s*1[0-9][0-9]/.test(n));i.length?t.warning=i.join(",").trim():delete t.warning}return t}responseHeaders(){let e=this._copyWithoutHopByHopHeaders(this._resHeaders),t=this.age();return t>3600*24&&!this._hasExplicitExpiration()&&this.maxAge()>3600*24&&(e.warning=(e.warning?`${e.warning}, `:"")+'113 - "rfc7234 5.5.4"'),e.age=`${Math.round(t)}`,e.date=new Date(this.now()).toUTCString(),e}date(){let e=Date.parse(this._resHeaders.date);return isFinite(e)?e:this._responseTime}age(){let e=this._ageValue(),t=(this.now()-this._responseTime)/1e3;return e+t}_ageValue(){return Lc(this._resHeaders.age)}maxAge(){if(!this.storable()||this._rescc["no-cache"]||this._isShared&&this._resHeaders["set-cookie"]&&!this._rescc.public&&!this._rescc.immutable||this._resHeaders.vary==="*")return 0;if(this._isShared){if(this._rescc["proxy-revalidate"])return 0;if(this._rescc["s-maxage"])return Lc(this._rescc["s-maxage"])}if(this._rescc["max-age"])return Lc(this._rescc["max-age"]);let e=this._rescc.immutable?this._immutableMinTtl:0,t=this.date();if(this._resHeaders.expires){let i=Date.parse(this._resHeaders.expires);return Number.isNaN(i)||i<t?0:Math.max(e,(i-t)/1e3)}if(this._resHeaders["last-modified"]){let i=Date.parse(this._resHeaders["last-modified"]);if(isFinite(i)&&t>i)return Math.max(e,(t-i)/1e3*this._cacheHeuristic)}return e}timeToLive(){let e=this.maxAge()-this.age(),t=e+Lc(this._rescc["stale-if-error"]),i=e+Lc(this._rescc["stale-while-revalidate"]);return Math.max(0,e,t,i)*1e3}stale(){return this.maxAge()<=this.age()}_useStaleIfError(){return this.maxAge()+Lc(this._rescc["stale-if-error"])>this.age()}useStaleWhileRevalidate(){return this.maxAge()+Lc(this._rescc["stale-while-revalidate"])>this.age()}static fromObject(e){return new this(void 0,void 0,{_fromObject:e})}_fromObject(e){if(this._responseTime)throw Error("Reinitialized");if(!e||e.v!==1)throw Error("Invalid serialization");this._responseTime=e.t,this._isShared=e.sh,this._cacheHeuristic=e.ch,this._immutableMinTtl=e.imm!==void 0?e.imm:24*3600*1e3,this._status=e.st,this._resHeaders=e.resh,this._rescc=e.rescc,this._method=e.m,this._url=e.u,this._host=e.h,this._noAuthorization=e.a,this._reqHeaders=e.reqh,this._reqcc=e.reqcc}toObject(){return{v:1,t:this._responseTime,sh:this._isShared,ch:this._cacheHeuristic,imm:this._immutableMinTtl,st:this._status,resh:this._resHeaders,rescc:this._rescc,m:this._method,u:this._url,h:this._host,a:this._noAuthorization,reqh:this._reqHeaders,reqcc:this._reqcc}}revalidationHeaders(e){this._assertRequestHasHeaders(e);let t=this._copyWithoutHopByHopHeaders(e.headers);if(delete t["if-range"],!this._requestMatches(e,!0)||!this.storable())return delete t["if-none-match"],delete t["if-modified-since"],t;if(this._resHeaders.etag&&(t["if-none-match"]=t["if-none-match"]?`${t["if-none-match"]}, ${this._resHeaders.etag}`:this._resHeaders.etag),t["accept-ranges"]||t["if-match"]||t["if-unmodified-since"]||this._method&&this._method!="GET"){if(delete t["if-modified-since"],t["if-none-match"]){let n=t["if-none-match"].split(/,/).filter(s=>!/^\s*W\//.test(s));n.length?t["if-none-match"]=n.join(",").trim():delete t["if-none-match"]}}else this._resHeaders["last-modified"]&&!t["if-modified-since"]&&(t["if-modified-since"]=this._resHeaders["last-modified"]);return t}revalidatedPolicy(e,t){if(this._assertRequestHasHeaders(e),this._useStaleIfError()&&Mxe(t))return{modified:!1,matches:!1,policy:this};if(!t||!t.headers)throw Error("Response headers missing");let i=!1;if(t.status!==void 0&&t.status!=304?i=!1:t.headers.etag&&!/^\s*W\//.test(t.headers.etag)?i=this._resHeaders.etag&&this._resHeaders.etag.replace(/^\s*W\//,"")===t.headers.etag:this._resHeaders.etag&&t.headers.etag?i=this._resHeaders.etag.replace(/^\s*W\//,"")===t.headers.etag.replace(/^\s*W\//,""):this._resHeaders["last-modified"]?i=this._resHeaders["last-modified"]===t.headers["last-modified"]:!this._resHeaders.etag&&!this._resHeaders["last-modified"]&&!t.headers.etag&&!t.headers["last-modified"]&&(i=!0),!i)return{policy:new this.constructor(e,t),modified:t.status!=304,matches:!1};let n={};for(let o in this._resHeaders)n[o]=o in t.headers&&!Oxe[o]?t.headers[o]:this._resHeaders[o];let s=Object.assign({},t,{status:this._status,method:this._method,headers:n});return{policy:new this.constructor(e,s,{shared:this._isShared,cacheHeuristic:this._cacheHeuristic,immutableMinTimeToLive:this._immutableMinTtl}),modified:!1,matches:!0}}}});var Zw=w((fnt,_z)=>{"use strict";_z.exports=r=>{let e={};for(let[t,i]of Object.entries(r))e[t.toLowerCase()]=i;return e}});var e5=w((hnt,$z)=>{"use strict";var Uxe=J("stream").Readable,Hxe=Zw(),Rk=class extends Uxe{constructor(e,t,i,n){if(typeof e!="number")throw new TypeError("Argument `statusCode` should be a number");if(typeof t!="object")throw new TypeError("Argument `headers` should be an object");if(!(i instanceof Buffer))throw new TypeError("Argument `body` should be a buffer");if(typeof n!="string")throw new TypeError("Argument `url` should be a string");super(),this.statusCode=e,this.headers=Hxe(t),this.body=i,this.url=n}_read(){this.push(this.body),this.push(null)}};$z.exports=Rk});var r5=w((pnt,t5)=>{"use strict";var Gxe=["destroy","setTimeout","socket","headers","trailers","rawHeaders","statusCode","httpVersion","httpVersionMinor","httpVersionMajor","rawTrailers","statusMessage"];t5.exports=(r,e)=>{let t=new Set(Object.keys(r).concat(Gxe));for(let i of t)i in e||(e[i]=typeof r[i]=="function"?r[i].bind(r):r[i])}});var n5=w((dnt,i5)=>{"use strict";var Yxe=J("stream").PassThrough,jxe=r5(),qxe=r=>{if(!(r&&r.pipe))throw new TypeError("Parameter `response` must be a response stream.");let e=new Yxe;return jxe(r,e),r.pipe(e)};i5.exports=qxe});var s5=w(Fk=>{Fk.stringify=function r(e){if(typeof e>"u")return e;if(e&&Buffer.isBuffer(e))return JSON.stringify(":base64:"+e.toString("base64"));if(e&&e.toJSON&&(e=e.toJSON()),e&&typeof e=="object"){var t="",i=Array.isArray(e);t=i?"[":"{";var n=!0;for(var s in e){var o=typeof e[s]=="function"||!i&&typeof e[s]>"u";Object.hasOwnProperty.call(e,s)&&!o&&(n||(t+=","),n=!1,i?e[s]==null?t+="null":t+=r(e[s]):e[s]!==void 0&&(t+=r(s)+":"+r(e[s])))}return t+=i?"]":"}",t}else return typeof e=="string"?JSON.stringify(/^:/.test(e)?":"+e:e):typeof e>"u"?"null":JSON.stringify(e)};Fk.parse=function(r){return JSON.parse(r,function(e,t){return typeof t=="string"?/^:base64:/.test(t)?Buffer.from(t.substring(8),"base64"):/^:/.test(t)?t.substring(1):t:t})}});var A5=w((mnt,a5)=>{"use strict";var Jxe=J("events"),o5=s5(),Wxe=r=>{let e={redis:"@keyv/redis",mongodb:"@keyv/mongo",mongo:"@keyv/mongo",sqlite:"@keyv/sqlite",postgresql:"@keyv/postgres",postgres:"@keyv/postgres",mysql:"@keyv/mysql"};if(r.adapter||r.uri){let t=r.adapter||/^[^:]*/.exec(r.uri)[0];return new(J(e[t]))(r)}return new Map},Nk=class extends Jxe{constructor(e,t){if(super(),this.opts=Object.assign({namespace:"keyv",serialize:o5.stringify,deserialize:o5.parse},typeof e=="string"?{uri:e}:e,t),!this.opts.store){let i=Object.assign({},this.opts);this.opts.store=Wxe(i)}typeof this.opts.store.on=="function"&&this.opts.store.on("error",i=>this.emit("error",i)),this.opts.store.namespace=this.opts.namespace}_getKeyPrefix(e){return`${this.opts.namespace}:${e}`}get(e,t){e=this._getKeyPrefix(e);let{store:i}=this.opts;return Promise.resolve().then(()=>i.get(e)).then(n=>typeof n=="string"?this.opts.deserialize(n):n).then(n=>{if(n!==void 0){if(typeof n.expires=="number"&&Date.now()>n.expires){this.delete(e);return}return t&&t.raw?n:n.value}})}set(e,t,i){e=this._getKeyPrefix(e),typeof i>"u"&&(i=this.opts.ttl),i===0&&(i=void 0);let{store:n}=this.opts;return Promise.resolve().then(()=>{let s=typeof i=="number"?Date.now()+i:null;return t={value:t,expires:s},this.opts.serialize(t)}).then(s=>n.set(e,s,i)).then(()=>!0)}delete(e){e=this._getKeyPrefix(e);let{store:t}=this.opts;return Promise.resolve().then(()=>t.delete(e))}clear(){let{store:e}=this.opts;return Promise.resolve().then(()=>e.clear())}};a5.exports=Nk});var u5=w((Int,c5)=>{"use strict";var zxe=J("events"),_w=J("url"),Vxe=Lz(),Xxe=Vz(),Tk=Zz(),l5=e5(),Zxe=Zw(),_xe=n5(),$xe=A5(),ao=class{constructor(e,t){if(typeof e!="function")throw new TypeError("Parameter `request` must be a function");return this.cache=new $xe({uri:typeof t=="string"&&t,store:typeof t!="string"&&t,namespace:"cacheable-request"}),this.createCacheableRequest(e)}createCacheableRequest(e){return(t,i)=>{let n;if(typeof t=="string")n=Lk(_w.parse(t)),t={};else if(t instanceof _w.URL)n=Lk(_w.parse(t.toString())),t={};else{let[g,...f]=(t.path||"").split("?"),h=f.length>0?`?${f.join("?")}`:"";n=Lk({...t,pathname:g,search:h})}t={headers:{},method:"GET",cache:!0,strictTtl:!1,automaticFailover:!1,...t,...ePe(n)},t.headers=Zxe(t.headers);let s=new zxe,o=Vxe(_w.format(n),{stripWWW:!1,removeTrailingSlash:!1,stripAuthentication:!1}),a=`${t.method}:${o}`,l=!1,c=!1,u=g=>{c=!0;let f=!1,h,p=new Promise(y=>{h=()=>{f||(f=!0,y())}}),C=y=>{if(l&&!g.forceRefresh){y.status=y.statusCode;let v=Tk.fromObject(l.cachePolicy).revalidatedPolicy(g,y);if(!v.modified){let D=v.policy.responseHeaders();y=new l5(l.statusCode,D,l.body,l.url),y.cachePolicy=v.policy,y.fromCache=!0}}y.fromCache||(y.cachePolicy=new Tk(g,y,g),y.fromCache=!1);let B;g.cache&&y.cachePolicy.storable()?(B=_xe(y),(async()=>{try{let v=Xxe.buffer(y);if(await Promise.race([p,new Promise(j=>y.once("end",j))]),f)return;let D=await v,T={cachePolicy:y.cachePolicy.toObject(),url:y.url,statusCode:y.fromCache?l.statusCode:y.statusCode,body:D},H=g.strictTtl?y.cachePolicy.timeToLive():void 0;g.maxTtl&&(H=H?Math.min(H,g.maxTtl):g.maxTtl),await this.cache.set(a,T,H)}catch(v){s.emit("error",new ao.CacheError(v))}})()):g.cache&&l&&(async()=>{try{await this.cache.delete(a)}catch(v){s.emit("error",new ao.CacheError(v))}})(),s.emit("response",B||y),typeof i=="function"&&i(B||y)};try{let y=e(g,C);y.once("error",h),y.once("abort",h),s.emit("request",y)}catch(y){s.emit("error",new ao.RequestError(y))}};return(async()=>{let g=async h=>{await Promise.resolve();let p=h.cache?await this.cache.get(a):void 0;if(typeof p>"u")return u(h);let C=Tk.fromObject(p.cachePolicy);if(C.satisfiesWithoutRevalidation(h)&&!h.forceRefresh){let y=C.responseHeaders(),B=new l5(p.statusCode,y,p.body,p.url);B.cachePolicy=C,B.fromCache=!0,s.emit("response",B),typeof i=="function"&&i(B)}else l=p,h.headers=C.revalidationHeaders(h),u(h)},f=h=>s.emit("error",new ao.CacheError(h));this.cache.once("error",f),s.on("response",()=>this.cache.removeListener("error",f));try{await g(t)}catch(h){t.automaticFailover&&!c&&u(t),s.emit("error",new ao.CacheError(h))}})(),s}}};function ePe(r){let e={...r};return e.path=`${r.pathname||"/"}${r.search||""}`,delete e.pathname,delete e.search,e}function Lk(r){return{protocol:r.protocol,auth:r.auth,hostname:r.hostname||r.host||"localhost",port:r.port,pathname:r.pathname,search:r.search}}ao.RequestError=class extends Error{constructor(r){super(r.message),this.name="RequestError",Object.assign(this,r)}};ao.CacheError=class extends Error{constructor(r){super(r.message),this.name="CacheError",Object.assign(this,r)}};c5.exports=ao});var f5=w((Bnt,g5)=>{"use strict";var tPe=["aborted","complete","headers","httpVersion","httpVersionMinor","httpVersionMajor","method","rawHeaders","rawTrailers","setTimeout","socket","statusCode","statusMessage","trailers","url"];g5.exports=(r,e)=>{if(e._readableState.autoDestroy)throw new Error("The second stream must have the `autoDestroy` option set to `false`");let t=new Set(Object.keys(r).concat(tPe)),i={};for(let n of t)n in e||(i[n]={get(){let s=r[n];return typeof s=="function"?s.bind(r):s},set(s){r[n]=s},enumerable:!0,configurable:!1});return Object.defineProperties(e,i),r.once("aborted",()=>{e.destroy(),e.emit("aborted")}),r.once("close",()=>{r.complete&&e.readable?e.once("end",()=>{e.emit("close")}):e.emit("close")}),e}});var p5=w((bnt,h5)=>{"use strict";var{Transform:rPe,PassThrough:iPe}=J("stream"),Ok=J("zlib"),nPe=f5();h5.exports=r=>{let e=(r.headers["content-encoding"]||"").toLowerCase();if(!["gzip","deflate","br"].includes(e))return r;let t=e==="br";if(t&&typeof Ok.createBrotliDecompress!="function")return r.destroy(new Error("Brotli is not supported on Node.js < 12")),r;let i=!0,n=new rPe({transform(a,l,c){i=!1,c(null,a)},flush(a){a()}}),s=new iPe({autoDestroy:!1,destroy(a,l){r.destroy(),l(a)}}),o=t?Ok.createBrotliDecompress():Ok.createUnzip();return o.once("error",a=>{if(i&&!r.readable){s.end();return}s.destroy(a)}),nPe(r,s),r.pipe(n).pipe(o).pipe(s),s}});var Kk=w((Qnt,d5)=>{"use strict";var Mk=class{constructor(e={}){if(!(e.maxSize&&e.maxSize>0))throw new TypeError("`maxSize` must be a number greater than 0");this.maxSize=e.maxSize,this.onEviction=e.onEviction,this.cache=new Map,this.oldCache=new Map,this._size=0}_set(e,t){if(this.cache.set(e,t),this._size++,this._size>=this.maxSize){if(this._size=0,typeof this.onEviction=="function")for(let[i,n]of this.oldCache.entries())this.onEviction(i,n);this.oldCache=this.cache,this.cache=new Map}}get(e){if(this.cache.has(e))return this.cache.get(e);if(this.oldCache.has(e)){let t=this.oldCache.get(e);return this.oldCache.delete(e),this._set(e,t),t}}set(e,t){return this.cache.has(e)?this.cache.set(e,t):this._set(e,t),this}has(e){return this.cache.has(e)||this.oldCache.has(e)}peek(e){if(this.cache.has(e))return this.cache.get(e);if(this.oldCache.has(e))return this.oldCache.get(e)}delete(e){let t=this.cache.delete(e);return t&&this._size--,this.oldCache.delete(e)||t}clear(){this.cache.clear(),this.oldCache.clear(),this._size=0}*keys(){for(let[e]of this)yield e}*values(){for(let[,e]of this)yield e}*[Symbol.iterator](){for(let e of this.cache)yield e;for(let e of this.oldCache){let[t]=e;this.cache.has(t)||(yield e)}}get size(){let e=0;for(let t of this.oldCache.keys())this.cache.has(t)||e++;return Math.min(this._size+e,this.maxSize)}};d5.exports=Mk});var Hk=w((Snt,I5)=>{"use strict";var sPe=J("events"),oPe=J("tls"),aPe=J("http2"),APe=Kk(),on=Symbol("currentStreamsCount"),C5=Symbol("request"),Bs=Symbol("cachedOriginSet"),Uf=Symbol("gracefullyClosing"),lPe=["maxDeflateDynamicTableSize","maxSessionMemory","maxHeaderListPairs","maxOutstandingPings","maxReservedRemoteStreams","maxSendHeaderBlockLength","paddingStrategy","localAddress","path","rejectUnauthorized","minDHSize","ca","cert","clientCertEngine","ciphers","key","pfx","servername","minVersion","maxVersion","secureProtocol","crl","honorCipherOrder","ecdhCurve","dhparam","secureOptions","sessionIdContext"],cPe=(r,e,t)=>{let i=0,n=r.length;for(;i<n;){let s=i+n>>>1;t(r[s],e)?i=s+1:n=s}return i},uPe=(r,e)=>r.remoteSettings.maxConcurrentStreams>e.remoteSettings.maxConcurrentStreams,Uk=(r,e)=>{for(let t of r)t[Bs].length<e[Bs].length&&t[Bs].every(i=>e[Bs].includes(i))&&t[on]+e[on]<=e.remoteSettings.maxConcurrentStreams&&E5(t)},gPe=(r,e)=>{for(let t of r)e[Bs].length<t[Bs].length&&e[Bs].every(i=>t[Bs].includes(i))&&e[on]+t[on]<=t.remoteSettings.maxConcurrentStreams&&E5(e)},m5=({agent:r,isFree:e})=>{let t={};for(let i in r.sessions){let s=r.sessions[i].filter(o=>{let a=o[zo.kCurrentStreamsCount]<o.remoteSettings.maxConcurrentStreams;return e?a:!a});s.length!==0&&(t[i]=s)}return t},E5=r=>{r[Uf]=!0,r[on]===0&&r.close()},zo=class extends sPe{constructor({timeout:e=6e4,maxSessions:t=1/0,maxFreeSessions:i=10,maxCachedTlsSessions:n=100}={}){super(),this.sessions={},this.queue={},this.timeout=e,this.maxSessions=t,this.maxFreeSessions=i,this._freeSessionsCount=0,this._sessionsCount=0,this.settings={enablePush:!1},this.tlsSessionCache=new APe({maxSize:n})}static normalizeOrigin(e,t){return typeof e=="string"&&(e=new URL(e)),t&&e.hostname!==t&&(e.hostname=t),e.origin}normalizeOptions(e){let t="";if(e)for(let i of lPe)e[i]&&(t+=`:${e[i]}`);return t}_tryToCreateNewSession(e,t){if(!(e in this.queue)||!(t in this.queue[e]))return;let i=this.queue[e][t];this._sessionsCount<this.maxSessions&&!i.completed&&(i.completed=!0,i())}getSession(e,t,i){return new Promise((n,s)=>{Array.isArray(i)?(i=[...i],n()):i=[{resolve:n,reject:s}];let o=this.normalizeOptions(t),a=zo.normalizeOrigin(e,t&&t.servername);if(a===void 0){for(let{reject:u}of i)u(new TypeError("The `origin` argument needs to be a string or an URL object"));return}if(o in this.sessions){let u=this.sessions[o],g=-1,f=-1,h;for(let p of u){let C=p.remoteSettings.maxConcurrentStreams;if(C<g)break;if(p[Bs].includes(a)){let y=p[on];if(y>=C||p[Uf]||p.destroyed)continue;h||(g=C),y>f&&(h=p,f=y)}}if(h){if(i.length!==1){for(let{reject:p}of i){let C=new Error(`Expected the length of listeners to be 1, got ${i.length}.
-Please report this to https://github.com/szmarczak/http2-wrapper/`);p(C)}return}i[0].resolve(h);return}}if(o in this.queue){if(a in this.queue[o]){this.queue[o][a].listeners.push(...i),this._tryToCreateNewSession(o,a);return}}else this.queue[o]={};let l=()=>{o in this.queue&&this.queue[o][a]===c&&(delete this.queue[o][a],Object.keys(this.queue[o]).length===0&&delete this.queue[o])},c=()=>{let u=`${a}:${o}`,g=!1;try{let f=aPe.connect(e,{createConnection:this.createConnection,settings:this.settings,session:this.tlsSessionCache.get(u),...t});f[on]=0,f[Uf]=!1;let h=()=>f[on]<f.remoteSettings.maxConcurrentStreams,p=!0;f.socket.once("session",y=>{this.tlsSessionCache.set(u,y)}),f.once("error",y=>{for(let{reject:B}of i)B(y);this.tlsSessionCache.delete(u)}),f.setTimeout(this.timeout,()=>{f.destroy()}),f.once("close",()=>{if(g){p&&this._freeSessionsCount--,this._sessionsCount--;let y=this.sessions[o];y.splice(y.indexOf(f),1),y.length===0&&delete this.sessions[o]}else{let y=new Error("Session closed without receiving a SETTINGS frame");y.code="HTTP2WRAPPER_NOSETTINGS";for(let{reject:B}of i)B(y);l()}this._tryToCreateNewSession(o,a)});let C=()=>{if(!(!(o in this.queue)||!h())){for(let y of f[Bs])if(y in this.queue[o]){let{listeners:B}=this.queue[o][y];for(;B.length!==0&&h();)B.shift().resolve(f);let v=this.queue[o];if(v[y].listeners.length===0&&(delete v[y],Object.keys(v).length===0)){delete this.queue[o];break}if(!h())break}}};f.on("origin",()=>{f[Bs]=f.originSet,h()&&(C(),Uk(this.sessions[o],f))}),f.once("remoteSettings",()=>{if(f.ref(),f.unref(),this._sessionsCount++,c.destroyed){let y=new Error("Agent has been destroyed");for(let B of i)B.reject(y);f.destroy();return}f[Bs]=f.originSet;{let y=this.sessions;if(o in y){let B=y[o];B.splice(cPe(B,f,uPe),0,f)}else y[o]=[f]}this._freeSessionsCount+=1,g=!0,this.emit("session",f),C(),l(),f[on]===0&&this._freeSessionsCount>this.maxFreeSessions&&f.close(),i.length!==0&&(this.getSession(a,t,i),i.length=0),f.on("remoteSettings",()=>{C(),Uk(this.sessions[o],f)})}),f[C5]=f.request,f.request=(y,B)=>{if(f[Uf])throw new Error("The session is gracefully closing. No new streams are allowed.");let v=f[C5](y,B);return f.ref(),++f[on],f[on]===f.remoteSettings.maxConcurrentStreams&&this._freeSessionsCount--,v.once("close",()=>{if(p=h(),--f[on],!f.destroyed&&!f.closed&&(gPe(this.sessions[o],f),h()&&!f.closed)){p||(this._freeSessionsCount++,p=!0);let D=f[on]===0;D&&f.unref(),D&&(this._freeSessionsCount>this.maxFreeSessions||f[Uf])?f.close():(Uk(this.sessions[o],f),C())}}),v}}catch(f){for(let h of i)h.reject(f);l()}};c.listeners=i,c.completed=!1,c.destroyed=!1,this.queue[o][a]=c,this._tryToCreateNewSession(o,a)})}request(e,t,i,n){return new Promise((s,o)=>{this.getSession(e,t,[{reject:o,resolve:a=>{try{s(a.request(i,n))}catch(l){o(l)}}}])})}createConnection(e,t){return zo.connect(e,t)}static connect(e,t){t.ALPNProtocols=["h2"];let i=e.port||443,n=e.hostname||e.host;return typeof t.servername>"u"&&(t.servername=n),oPe.connect(i,n,t)}closeFreeSessions(){for(let e of Object.values(this.sessions))for(let t of e)t[on]===0&&t.close()}destroy(e){for(let t of Object.values(this.sessions))for(let i of t)i.destroy(e);for(let t of Object.values(this.queue))for(let i of Object.values(t))i.destroyed=!0;this.queue={}}get freeSessions(){return m5({agent:this,isFree:!0})}get busySessions(){return m5({agent:this,isFree:!1})}};zo.kCurrentStreamsCount=on;zo.kGracefullyClosing=Uf;I5.exports={Agent:zo,globalAgent:new zo}});var Yk=w((vnt,y5)=>{"use strict";var{Readable:fPe}=J("stream"),Gk=class extends fPe{constructor(e,t){super({highWaterMark:t,autoDestroy:!1}),this.statusCode=null,this.statusMessage="",this.httpVersion="2.0",this.httpVersionMajor=2,this.httpVersionMinor=0,this.headers={},this.trailers={},this.req=null,this.aborted=!1,this.complete=!1,this.upgrade=null,this.rawHeaders=[],this.rawTrailers=[],this.socket=e,this.connection=e,this._dumped=!1}_destroy(e){this.req._request.destroy(e)}setTimeout(e,t){return this.req.setTimeout(e,t),this}_dump(){this._dumped||(this._dumped=!0,this.removeAllListeners("data"),this.resume())}_read(){this.req&&this.req._request.resume()}};y5.exports=Gk});var jk=w((xnt,w5)=>{"use strict";w5.exports=r=>{let e={protocol:r.protocol,hostname:typeof r.hostname=="string"&&r.hostname.startsWith("[")?r.hostname.slice(1,-1):r.hostname,host:r.host,hash:r.hash,search:r.search,pathname:r.pathname,href:r.href,path:`${r.pathname||""}${r.search||""}`};return typeof r.port=="string"&&r.port.length!==0&&(e.port=Number(r.port)),(r.username||r.password)&&(e.auth=`${r.username||""}:${r.password||""}`),e}});var b5=w((Pnt,B5)=>{"use strict";B5.exports=(r,e,t)=>{for(let i of t)r.on(i,(...n)=>e.emit(i,...n))}});var S5=w((Dnt,Q5)=>{"use strict";Q5.exports=r=>{switch(r){case":method":case":scheme":case":authority":case":path":return!0;default:return!1}}});var x5=w((Rnt,v5)=>{"use strict";var Hf=(r,e,t)=>{v5.exports[e]=class extends r{constructor(...n){super(typeof t=="string"?t:t(n)),this.name=`${super.name} [${e}]`,this.code=e}}};Hf(TypeError,"ERR_INVALID_ARG_TYPE",r=>{let e=r[0].includes(".")?"property":"argument",t=r[1],i=Array.isArray(t);return i&&(t=`${t.slice(0,-1).join(", ")} or ${t.slice(-1)}`),`The "${r[0]}" ${e} must be ${i?"one of":"of"} type ${t}. Received ${typeof r[2]}`});Hf(TypeError,"ERR_INVALID_PROTOCOL",r=>`Protocol "${r[0]}" not supported. Expected "${r[1]}"`);Hf(Error,"ERR_HTTP_HEADERS_SENT",r=>`Cannot ${r[0]} headers after they are sent to the client`);Hf(TypeError,"ERR_INVALID_HTTP_TOKEN",r=>`${r[0]} must be a valid HTTP token [${r[1]}]`);Hf(TypeError,"ERR_HTTP_INVALID_HEADER_VALUE",r=>`Invalid value "${r[0]} for header "${r[1]}"`);Hf(TypeError,"ERR_INVALID_CHAR",r=>`Invalid character in ${r[0]} [${r[1]}]`)});var Vk=w((Fnt,T5)=>{"use strict";var hPe=J("http2"),{Writable:pPe}=J("stream"),{Agent:P5,globalAgent:dPe}=Hk(),CPe=Yk(),mPe=jk(),EPe=b5(),IPe=S5(),{ERR_INVALID_ARG_TYPE:qk,ERR_INVALID_PROTOCOL:yPe,ERR_HTTP_HEADERS_SENT:D5,ERR_INVALID_HTTP_TOKEN:wPe,ERR_HTTP_INVALID_HEADER_VALUE:BPe,ERR_INVALID_CHAR:bPe}=x5(),{HTTP2_HEADER_STATUS:k5,HTTP2_HEADER_METHOD:R5,HTTP2_HEADER_PATH:F5,HTTP2_METHOD_CONNECT:QPe}=hPe.constants,Ui=Symbol("headers"),Jk=Symbol("origin"),Wk=Symbol("session"),N5=Symbol("options"),$w=Symbol("flushedHeaders"),EC=Symbol("jobs"),SPe=/^[\^`\-\w!#$%&*+.|~]+$/,vPe=/[^\t\u0020-\u007E\u0080-\u00FF]/,zk=class extends pPe{constructor(e,t,i){super({autoDestroy:!1});let n=typeof e=="string"||e instanceof URL;if(n&&(e=mPe(e instanceof URL?e:new URL(e))),typeof t=="function"||t===void 0?(i=t,t=n?e:{...e}):t={...e,...t},t.h2session)this[Wk]=t.h2session;else if(t.agent===!1)this.agent=new P5({maxFreeSessions:0});else if(typeof t.agent>"u"||t.agent===null)typeof t.createConnection=="function"?(this.agent=new P5({maxFreeSessions:0}),this.agent.createConnection=t.createConnection):this.agent=dPe;else if(typeof t.agent.request=="function")this.agent=t.agent;else throw new qk("options.agent",["Agent-like Object","undefined","false"],t.agent);if(t.protocol&&t.protocol!=="https:")throw new yPe(t.protocol,"https:");let s=t.port||t.defaultPort||this.agent&&this.agent.defaultPort||443,o=t.hostname||t.host||"localhost";delete t.hostname,delete t.host,delete t.port;let{timeout:a}=t;if(t.timeout=void 0,this[Ui]=Object.create(null),this[EC]=[],this.socket=null,this.connection=null,this.method=t.method||"GET",this.path=t.path,this.res=null,this.aborted=!1,this.reusedSocket=!1,t.headers)for(let[l,c]of Object.entries(t.headers))this.setHeader(l,c);t.auth&&!("authorization"in this[Ui])&&(this[Ui].authorization="Basic "+Buffer.from(t.auth).toString("base64")),t.session=t.tlsSession,t.path=t.socketPath,this[N5]=t,s===443?(this[Jk]=`https://${o}`,":authority"in this[Ui]||(this[Ui][":authority"]=o)):(this[Jk]=`https://${o}:${s}`,":authority"in this[Ui]||(this[Ui][":authority"]=`${o}:${s}`)),a&&this.setTimeout(a),i&&this.once("response",i),this[$w]=!1}get method(){return this[Ui][R5]}set method(e){e&&(this[Ui][R5]=e.toUpperCase())}get path(){return this[Ui][F5]}set path(e){e&&(this[Ui][F5]=e)}get _mustNotHaveABody(){return this.method==="GET"||this.method==="HEAD"||this.method==="DELETE"}_write(e,t,i){if(this._mustNotHaveABody){i(new Error("The GET, HEAD and DELETE methods must NOT have a body"));return}this.flushHeaders();let n=()=>this._request.write(e,t,i);this._request?n():this[EC].push(n)}_final(e){if(this.destroyed)return;this.flushHeaders();let t=()=>{if(this._mustNotHaveABody){e();return}this._request.end(e)};this._request?t():this[EC].push(t)}abort(){this.res&&this.res.complete||(this.aborted||process.nextTick(()=>this.emit("abort")),this.aborted=!0,this.destroy())}_destroy(e,t){this.res&&this.res._dump(),this._request&&this._request.destroy(),t(e)}async flushHeaders(){if(this[$w]||this.destroyed)return;this[$w]=!0;let e=this.method===QPe,t=i=>{if(this._request=i,this.destroyed){i.destroy();return}e||EPe(i,this,["timeout","continue","close","error"]);let n=o=>(...a)=>{!this.writable&&!this.destroyed?o(...a):this.once("finish",()=>{o(...a)})};i.once("response",n((o,a,l)=>{let c=new CPe(this.socket,i.readableHighWaterMark);this.res=c,c.req=this,c.statusCode=o[k5],c.headers=o,c.rawHeaders=l,c.once("end",()=>{this.aborted?(c.aborted=!0,c.emit("aborted")):(c.complete=!0,c.socket=null,c.connection=null)}),e?(c.upgrade=!0,this.emit("connect",c,i,Buffer.alloc(0))?this.emit("close"):i.destroy()):(i.on("data",u=>{!c._dumped&&!c.push(u)&&i.pause()}),i.once("end",()=>{c.push(null)}),this.emit("response",c)||c._dump())})),i.once("headers",n(o=>this.emit("information",{statusCode:o[k5]}))),i.once("trailers",n((o,a,l)=>{let{res:c}=this;c.trailers=o,c.rawTrailers=l}));let{socket:s}=i.session;this.socket=s,this.connection=s;for(let o of this[EC])o();this.emit("socket",this.socket)};if(this[Wk])try{t(this[Wk].request(this[Ui]))}catch(i){this.emit("error",i)}else{this.reusedSocket=!0;try{t(await this.agent.request(this[Jk],this[N5],this[Ui]))}catch(i){this.emit("error",i)}}}getHeader(e){if(typeof e!="string")throw new qk("name","string",e);return this[Ui][e.toLowerCase()]}get headersSent(){return this[$w]}removeHeader(e){if(typeof e!="string")throw new qk("name","string",e);if(this.headersSent)throw new D5("remove");delete this[Ui][e.toLowerCase()]}setHeader(e,t){if(this.headersSent)throw new D5("set");if(typeof e!="string"||!SPe.test(e)&&!IPe(e))throw new wPe("Header name",e);if(typeof t>"u")throw new BPe(t,e);if(vPe.test(t))throw new bPe("header content",e);this[Ui][e.toLowerCase()]=t}setNoDelay(){}setSocketKeepAlive(){}setTimeout(e,t){let i=()=>this._request.setTimeout(e,t);return this._request?i():this[EC].push(i),this}get maxHeadersCount(){if(!this.destroyed&&this._request)return this._request.session.localSettings.maxHeaderListSize}set maxHeadersCount(e){}};T5.exports=zk});var O5=w((Nnt,L5)=>{"use strict";var xPe=J("tls");L5.exports=(r={})=>new Promise((e,t)=>{let i=xPe.connect(r,()=>{r.resolveSocket?(i.off("error",t),e({alpnProtocol:i.alpnProtocol,socket:i})):(i.destroy(),e({alpnProtocol:i.alpnProtocol}))});i.on("error",t)})});var K5=w((Tnt,M5)=>{"use strict";var PPe=J("net");M5.exports=r=>{let e=r.host,t=r.headers&&r.headers.host;return t&&(t.startsWith("[")?t.indexOf("]")===-1?e=t:e=t.slice(1,-1):e=t.split(":",1)[0]),PPe.isIP(e)?"":e}});var G5=w((Lnt,Zk)=>{"use strict";var U5=J("http"),Xk=J("https"),DPe=O5(),kPe=Kk(),RPe=Vk(),FPe=K5(),NPe=jk(),eB=new kPe({maxSize:100}),IC=new Map,H5=(r,e,t)=>{e._httpMessage={shouldKeepAlive:!0};let i=()=>{r.emit("free",e,t)};e.on("free",i);let n=()=>{r.removeSocket(e,t)};e.on("close",n);let s=()=>{r.removeSocket(e,t),e.off("close",n),e.off("free",i),e.off("agentRemove",s)};e.on("agentRemove",s),r.emit("free",e,t)},TPe=async r=>{let e=`${r.host}:${r.port}:${r.ALPNProtocols.sort()}`;if(!eB.has(e)){if(IC.has(e))return(await IC.get(e)).alpnProtocol;let{path:t,agent:i}=r;r.path=r.socketPath;let n=DPe(r);IC.set(e,n);try{let{socket:s,alpnProtocol:o}=await n;if(eB.set(e,o),r.path=t,o==="h2")s.destroy();else{let{globalAgent:a}=Xk,l=Xk.Agent.prototype.createConnection;i?i.createConnection===l?H5(i,s,r):s.destroy():a.createConnection===l?H5(a,s,r):s.destroy()}return IC.delete(e),o}catch(s){throw IC.delete(e),s}}return eB.get(e)};Zk.exports=async(r,e,t)=>{if((typeof r=="string"||r instanceof URL)&&(r=NPe(new URL(r))),typeof e=="function"&&(t=e,e=void 0),e={ALPNProtocols:["h2","http/1.1"],...r,...e,resolveSocket:!0},!Array.isArray(e.ALPNProtocols)||e.ALPNProtocols.length===0)throw new Error("The `ALPNProtocols` option must be an Array with at least one entry");e.protocol=e.protocol||"https:";let i=e.protocol==="https:";e.host=e.hostname||e.host||"localhost",e.session=e.tlsSession,e.servername=e.servername||FPe(e),e.port=e.port||(i?443:80),e._defaultAgent=i?Xk.globalAgent:U5.globalAgent;let n=e.agent;if(n){if(n.addRequest)throw new Error("The `options.agent` object can contain only `http`, `https` or `http2` properties");e.agent=n[i?"https":"http"]}return i&&await TPe(e)==="h2"?(n&&(e.agent=n.http2),new RPe(e,t)):U5.request(e,t)};Zk.exports.protocolCache=eB});var j5=w((Ont,Y5)=>{"use strict";var LPe=J("http2"),OPe=Hk(),_k=Vk(),MPe=Yk(),KPe=G5(),UPe=(r,e,t)=>new _k(r,e,t),HPe=(r,e,t)=>{let i=new _k(r,e,t);return i.end(),i};Y5.exports={...LPe,ClientRequest:_k,IncomingMessage:MPe,...OPe,request:UPe,get:HPe,auto:KPe}});var eR=w($k=>{"use strict";Object.defineProperty($k,"__esModule",{value:!0});var q5=Ya();$k.default=r=>q5.default.nodeStream(r)&&q5.default.function_(r.getBoundary)});var V5=w(tR=>{"use strict";Object.defineProperty(tR,"__esModule",{value:!0});var W5=J("fs"),z5=J("util"),J5=Ya(),GPe=eR(),YPe=z5.promisify(W5.stat);tR.default=async(r,e)=>{if(e&&"content-length"in e)return Number(e["content-length"]);if(!r)return 0;if(J5.default.string(r))return Buffer.byteLength(r);if(J5.default.buffer(r))return r.length;if(GPe.default(r))return z5.promisify(r.getLength.bind(r))();if(r instanceof W5.ReadStream){let{size:t}=await YPe(r.path);return t===0?void 0:t}}});var iR=w(rR=>{"use strict";Object.defineProperty(rR,"__esModule",{value:!0});function jPe(r,e,t){let i={};for(let n of t)i[n]=(...s)=>{e.emit(n,...s)},r.on(n,i[n]);return()=>{for(let n of t)r.off(n,i[n])}}rR.default=jPe});var X5=w(nR=>{"use strict";Object.defineProperty(nR,"__esModule",{value:!0});nR.default=()=>{let r=[];return{once(e,t,i){e.once(t,i),r.push({origin:e,event:t,fn:i})},unhandleAll(){for(let e of r){let{origin:t,event:i,fn:n}=e;t.removeListener(i,n)}r.length=0}}}});var _5=w(yC=>{"use strict";Object.defineProperty(yC,"__esModule",{value:!0});yC.TimeoutError=void 0;var qPe=J("net"),JPe=X5(),Z5=Symbol("reentry"),WPe=()=>{},tB=class extends Error{constructor(e,t){super(`Timeout awaiting '${t}' for ${e}ms`),this.event=t,this.name="TimeoutError",this.code="ETIMEDOUT"}};yC.TimeoutError=tB;yC.default=(r,e,t)=>{if(Z5 in r)return WPe;r[Z5]=!0;let i=[],{once:n,unhandleAll:s}=JPe.default(),o=(g,f,h)=>{var p;let C=setTimeout(f,g,g,h);(p=C.unref)===null||p===void 0||p.call(C);let y=()=>{clearTimeout(C)};return i.push(y),y},{host:a,hostname:l}=t,c=(g,f)=>{r.destroy(new tB(g,f))},u=()=>{for(let g of i)g();s()};if(r.once("error",g=>{if(u(),r.listenerCount("error")===0)throw g}),r.once("close",u),n(r,"response",g=>{n(g,"end",u)}),typeof e.request<"u"&&o(e.request,c,"request"),typeof e.socket<"u"){let g=()=>{c(e.socket,"socket")};r.setTimeout(e.socket,g),i.push(()=>{r.removeListener("timeout",g)})}return n(r,"socket",g=>{var f;let{socketPath:h}=r;if(g.connecting){let p=Boolean(h!=null?h:qPe.isIP((f=l!=null?l:a)!==null&&f!==void 0?f:"")!==0);if(typeof e.lookup<"u"&&!p&&typeof g.address().address>"u"){let C=o(e.lookup,c,"lookup");n(g,"lookup",C)}if(typeof e.connect<"u"){let C=()=>o(e.connect,c,"connect");p?n(g,"connect",C()):n(g,"lookup",y=>{y===null&&n(g,"connect",C())})}typeof e.secureConnect<"u"&&t.protocol==="https:"&&n(g,"connect",()=>{let C=o(e.secureConnect,c,"secureConnect");n(g,"secureConnect",C)})}if(typeof e.send<"u"){let p=()=>o(e.send,c,"send");g.connecting?n(g,"connect",()=>{n(r,"upload-complete",p())}):n(r,"upload-complete",p())}}),typeof e.response<"u"&&n(r,"upload-complete",()=>{let g=o(e.response,c,"response");n(r,"response",g)}),u}});var e6=w(sR=>{"use strict";Object.defineProperty(sR,"__esModule",{value:!0});var $5=Ya();sR.default=r=>{r=r;let e={protocol:r.protocol,hostname:$5.default.string(r.hostname)&&r.hostname.startsWith("[")?r.hostname.slice(1,-1):r.hostname,host:r.host,hash:r.hash,search:r.search,pathname:r.pathname,href:r.href,path:`${r.pathname||""}${r.search||""}`};return $5.default.string(r.port)&&r.port.length>0&&(e.port=Number(r.port)),(r.username||r.password)&&(e.auth=`${r.username||""}:${r.password||""}`),e}});var t6=w(oR=>{"use strict";Object.defineProperty(oR,"__esModule",{value:!0});var zPe=J("url"),VPe=["protocol","host","hostname","port","pathname","search"];oR.default=(r,e)=>{var t,i;if(e.path){if(e.pathname)throw new TypeError("Parameters `path` and `pathname` are mutually exclusive.");if(e.search)throw new TypeError("Parameters `path` and `search` are mutually exclusive.");if(e.searchParams)throw new TypeError("Parameters `path` and `searchParams` are mutually exclusive.")}if(e.search&&e.searchParams)throw new TypeError("Parameters `search` and `searchParams` are mutually exclusive.");if(!r){if(!e.protocol)throw new TypeError("No URL protocol specified");r=`${e.protocol}//${(i=(t=e.hostname)!==null&&t!==void 0?t:e.host)!==null&&i!==void 0?i:""}`}let n=new zPe.URL(r);if(e.path){let s=e.path.indexOf("?");s===-1?e.pathname=e.path:(e.pathname=e.path.slice(0,s),e.search=e.path.slice(s+1)),delete e.path}for(let s of VPe)e[s]&&(n[s]=e[s].toString());return n}});var r6=w(AR=>{"use strict";Object.defineProperty(AR,"__esModule",{value:!0});var aR=class{constructor(){this.weakMap=new WeakMap,this.map=new Map}set(e,t){typeof e=="object"?this.weakMap.set(e,t):this.map.set(e,t)}get(e){return typeof e=="object"?this.weakMap.get(e):this.map.get(e)}has(e){return typeof e=="object"?this.weakMap.has(e):this.map.has(e)}};AR.default=aR});var cR=w(lR=>{"use strict";Object.defineProperty(lR,"__esModule",{value:!0});var XPe=async r=>{let e=[],t=0;for await(let i of r)e.push(i),t+=Buffer.byteLength(i);return Buffer.isBuffer(e[0])?Buffer.concat(e,t):Buffer.from(e.join(""))};lR.default=XPe});var n6=w(Oc=>{"use strict";Object.defineProperty(Oc,"__esModule",{value:!0});Oc.dnsLookupIpVersionToFamily=Oc.isDnsLookupIpVersion=void 0;var i6={auto:0,ipv4:4,ipv6:6};Oc.isDnsLookupIpVersion=r=>r in i6;Oc.dnsLookupIpVersionToFamily=r=>{if(Oc.isDnsLookupIpVersion(r))return i6[r];throw new Error("Invalid DNS lookup IP version")}});var uR=w(rB=>{"use strict";Object.defineProperty(rB,"__esModule",{value:!0});rB.isResponseOk=void 0;rB.isResponseOk=r=>{let{statusCode:e}=r,t=r.request.options.followRedirect?299:399;return e>=200&&e<=t||e===304}});var o6=w(gR=>{"use strict";Object.defineProperty(gR,"__esModule",{value:!0});var s6=new Set;gR.default=r=>{s6.has(r)||(s6.add(r),process.emitWarning(`Got: ${r}`,{type:"DeprecationWarning"}))}});var a6=w(fR=>{"use strict";Object.defineProperty(fR,"__esModule",{value:!0});var mr=Ya(),ZPe=(r,e)=>{if(mr.default.null_(r.encoding))throw new TypeError("To get a Buffer, set `options.responseType` to `buffer` instead");mr.assert.any([mr.default.string,mr.default.undefined],r.encoding),mr.assert.any([mr.default.boolean,mr.default.undefined],r.resolveBodyOnly),mr.assert.any([mr.default.boolean,mr.default.undefined],r.methodRewriting),mr.assert.any([mr.default.boolean,mr.default.undefined],r.isStream),mr.assert.any([mr.default.string,mr.default.undefined],r.responseType),r.responseType===void 0&&(r.responseType="text");let{retry:t}=r;if(e?r.retry={...e.retry}:r.retry={calculateDelay:i=>i.computedValue,limit:0,methods:[],statusCodes:[],errorCodes:[],maxRetryAfter:void 0},mr.default.object(t)?(r.retry={...r.retry,...t},r.retry.methods=[...new Set(r.retry.methods.map(i=>i.toUpperCase()))],r.retry.statusCodes=[...new Set(r.retry.statusCodes)],r.retry.errorCodes=[...new Set(r.retry.errorCodes)]):mr.default.number(t)&&(r.retry.limit=t),mr.default.undefined(r.retry.maxRetryAfter)&&(r.retry.maxRetryAfter=Math.min(...[r.timeout.request,r.timeout.connect].filter(mr.default.number))),mr.default.object(r.pagination)){e&&(r.pagination={...e.pagination,...r.pagination});let{pagination:i}=r;if(!mr.default.function_(i.transform))throw new Error("`options.pagination.transform` must be implemented");if(!mr.default.function_(i.shouldContinue))throw new Error("`options.pagination.shouldContinue` must be implemented");if(!mr.default.function_(i.filter))throw new TypeError("`options.pagination.filter` must be implemented");if(!mr.default.function_(i.paginate))throw new Error("`options.pagination.paginate` must be implemented")}return r.responseType==="json"&&r.headers.accept===void 0&&(r.headers.accept="application/json"),r};fR.default=ZPe});var A6=w(wC=>{"use strict";Object.defineProperty(wC,"__esModule",{value:!0});wC.retryAfterStatusCodes=void 0;wC.retryAfterStatusCodes=new Set([413,429,503]);var _Pe=({attemptCount:r,retryOptions:e,error:t,retryAfter:i})=>{if(r>e.limit)return 0;let n=e.methods.includes(t.options.method),s=e.errorCodes.includes(t.code),o=t.response&&e.statusCodes.includes(t.response.statusCode);if(!n||!s&&!o)return 0;if(t.response){if(i)return e.maxRetryAfter===void 0||i>e.maxRetryAfter?0:i;if(t.response.statusCode===413)return 0}let a=Math.random()*100;return 2**(r-1)*1e3+a};wC.default=_Pe});var QC=w(Yt=>{"use strict";Object.defineProperty(Yt,"__esModule",{value:!0});Yt.UnsupportedProtocolError=Yt.ReadError=Yt.TimeoutError=Yt.UploadError=Yt.CacheError=Yt.HTTPError=Yt.MaxRedirectsError=Yt.RequestError=Yt.setNonEnumerableProperties=Yt.knownHookEvents=Yt.withoutBody=Yt.kIsNormalizedAlready=void 0;var l6=J("util"),c6=J("stream"),$Pe=J("fs"),VA=J("url"),u6=J("http"),hR=J("http"),eDe=J("https"),tDe=Sz(),rDe=Fz(),g6=u5(),iDe=p5(),nDe=j5(),sDe=Zw(),Ee=Ya(),oDe=V5(),f6=eR(),aDe=iR(),h6=_5(),ADe=e6(),p6=t6(),lDe=r6(),cDe=cR(),d6=n6(),uDe=uR(),XA=o6(),gDe=a6(),fDe=A6(),pR,Pi=Symbol("request"),sB=Symbol("response"),Gf=Symbol("responseSize"),Yf=Symbol("downloadedSize"),jf=Symbol("bodySize"),qf=Symbol("uploadedSize"),iB=Symbol("serverResponsesPiped"),C6=Symbol("unproxyEvents"),m6=Symbol("isFromCache"),dR=Symbol("cancelTimeouts"),E6=Symbol("startedReading"),Jf=Symbol("stopReading"),nB=Symbol("triggerRead"),ZA=Symbol("body"),BC=Symbol("jobs"),I6=Symbol("originalResponse"),y6=Symbol("retryTimeout");Yt.kIsNormalizedAlready=Symbol("isNormalizedAlready");var hDe=Ee.default.string(process.versions.brotli);Yt.withoutBody=new Set(["GET","HEAD"]);Yt.knownHookEvents=["init","beforeRequest","beforeRedirect","beforeError","beforeRetry","afterResponse"];function pDe(r){for(let e in r){let t=r[e];if(!Ee.default.string(t)&&!Ee.default.number(t)&&!Ee.default.boolean(t)&&!Ee.default.null_(t)&&!Ee.default.undefined(t))throw new TypeError(`The \`searchParams\` value '${String(t)}' must be a string, number, boolean or null`)}}function dDe(r){return Ee.default.object(r)&&!("statusCode"in r)}var CR=new lDe.default,CDe=async r=>new Promise((e,t)=>{let i=n=>{t(n)};r.pending||e(),r.once("error",i),r.once("ready",()=>{r.off("error",i),e()})}),mDe=new Set([300,301,302,303,304,307,308]),EDe=["context","body","json","form"];Yt.setNonEnumerableProperties=(r,e)=>{let t={};for(let i of r)if(!!i)for(let n of EDe)n in i&&(t[n]={writable:!0,configurable:!0,enumerable:!1,value:i[n]});Object.defineProperties(e,t)};var ei=class extends Error{constructor(e,t,i){var n;if(super(e),Error.captureStackTrace(this,this.constructor),this.name="RequestError",this.code=t.code,i instanceof gB?(Object.defineProperty(this,"request",{enumerable:!1,value:i}),Object.defineProperty(this,"response",{enumerable:!1,value:i[sB]}),Object.defineProperty(this,"options",{enumerable:!1,value:i.options})):Object.defineProperty(this,"options",{enumerable:!1,value:i}),this.timings=(n=this.request)===null||n===void 0?void 0:n.timings,Ee.default.string(t.stack)&&Ee.default.string(this.stack)){let s=this.stack.indexOf(this.message)+this.message.length,o=this.stack.slice(s).split(`
-`).reverse(),a=t.stack.slice(t.stack.indexOf(t.message)+t.message.length).split(`
-`).reverse();for(;a.length!==0&&a[0]===o[0];)o.shift();this.stack=`${this.stack.slice(0,s)}${o.reverse().join(`
-`)}${a.reverse().join(`
-`)}`}}};Yt.RequestError=ei;var oB=class extends ei{constructor(e){super(`Redirected ${e.options.maxRedirects} times. Aborting.`,{},e),this.name="MaxRedirectsError"}};Yt.MaxRedirectsError=oB;var aB=class extends ei{constructor(e){super(`Response code ${e.statusCode} (${e.statusMessage})`,{},e.request),this.name="HTTPError"}};Yt.HTTPError=aB;var AB=class extends ei{constructor(e,t){super(e.message,e,t),this.name="CacheError"}};Yt.CacheError=AB;var lB=class extends ei{constructor(e,t){super(e.message,e,t),this.name="UploadError"}};Yt.UploadError=lB;var cB=class extends ei{constructor(e,t,i){super(e.message,e,i),this.name="TimeoutError",this.event=e.event,this.timings=t}};Yt.TimeoutError=cB;var bC=class extends ei{constructor(e,t){super(e.message,e,t),this.name="ReadError"}};Yt.ReadError=bC;var uB=class extends ei{constructor(e){super(`Unsupported protocol "${e.url.protocol}"`,{},e),this.name="UnsupportedProtocolError"}};Yt.UnsupportedProtocolError=uB;var IDe=["socket","connect","continue","information","upgrade","timeout"],gB=class extends c6.Duplex{constructor(e,t={},i){super({autoDestroy:!1,highWaterMark:0}),this[Yf]=0,this[qf]=0,this.requestInitialized=!1,this[iB]=new Set,this.redirects=[],this[Jf]=!1,this[nB]=!1,this[BC]=[],this.retryCount=0,this._progressCallbacks=[];let n=()=>this._unlockWrite(),s=()=>this._lockWrite();this.on("pipe",c=>{c.prependListener("data",n),c.on("data",s),c.prependListener("end",n),c.on("end",s)}),this.on("unpipe",c=>{c.off("data",n),c.off("data",s),c.off("end",n),c.off("end",s)}),this.on("pipe",c=>{c instanceof hR.IncomingMessage&&(this.options.headers={...c.headers,...this.options.headers})});let{json:o,body:a,form:l}=t;if((o||a||l)&&this._lockWrite(),Yt.kIsNormalizedAlready in t)this.options=t;else try{this.options=this.constructor.normalizeArguments(e,t,i)}catch(c){Ee.default.nodeStream(t.body)&&t.body.destroy(),this.destroy(c);return}(async()=>{var c;try{this.options.body instanceof $Pe.ReadStream&&await CDe(this.options.body);let{url:u}=this.options;if(!u)throw new TypeError("Missing `url` property");if(this.requestUrl=u.toString(),decodeURI(this.requestUrl),await this._finalizeBody(),await this._makeRequest(),this.destroyed){(c=this[Pi])===null||c===void 0||c.destroy();return}for(let g of this[BC])g();this[BC].length=0,this.requestInitialized=!0}catch(u){if(u instanceof ei){this._beforeError(u);return}this.destroyed||this.destroy(u)}})()}static normalizeArguments(e,t,i){var n,s,o,a,l;let c=t;if(Ee.default.object(e)&&!Ee.default.urlInstance(e))t={...i,...e,...t};else{if(e&&t&&t.url!==void 0)throw new TypeError("The `url` option is mutually exclusive with the `input` argument");t={...i,...t},e!==void 0&&(t.url=e),Ee.default.urlInstance(t.url)&&(t.url=new VA.URL(t.url.toString()))}if(t.cache===!1&&(t.cache=void 0),t.dnsCache===!1&&(t.dnsCache=void 0),Ee.assert.any([Ee.default.string,Ee.default.undefined],t.method),Ee.assert.any([Ee.default.object,Ee.default.undefined],t.headers),Ee.assert.any([Ee.default.string,Ee.default.urlInstance,Ee.default.undefined],t.prefixUrl),Ee.assert.any([Ee.default.object,Ee.default.undefined],t.cookieJar),Ee.assert.any([Ee.default.object,Ee.default.string,Ee.default.undefined],t.searchParams),Ee.assert.any([Ee.default.object,Ee.default.string,Ee.default.undefined],t.cache),Ee.assert.any([Ee.default.object,Ee.default.number,Ee.default.undefined],t.timeout),Ee.assert.any([Ee.default.object,Ee.default.undefined],t.context),Ee.assert.any([Ee.default.object,Ee.default.undefined],t.hooks),Ee.assert.any([Ee.default.boolean,Ee.default.undefined],t.decompress),Ee.assert.any([Ee.default.boolean,Ee.default.undefined],t.ignoreInvalidCookies),Ee.assert.any([Ee.default.boolean,Ee.default.undefined],t.followRedirect),Ee.assert.any([Ee.default.number,Ee.default.undefined],t.maxRedirects),Ee.assert.any([Ee.default.boolean,Ee.default.undefined],t.throwHttpErrors),Ee.assert.any([Ee.default.boolean,Ee.default.undefined],t.http2),Ee.assert.any([Ee.default.boolean,Ee.default.undefined],t.allowGetBody),Ee.assert.any([Ee.default.string,Ee.default.undefined],t.localAddress),Ee.assert.any([d6.isDnsLookupIpVersion,Ee.default.undefined],t.dnsLookupIpVersion),Ee.assert.any([Ee.default.object,Ee.default.undefined],t.https),Ee.assert.any([Ee.default.boolean,Ee.default.undefined],t.rejectUnauthorized),t.https&&(Ee.assert.any([Ee.default.boolean,Ee.default.undefined],t.https.rejectUnauthorized),Ee.assert.any([Ee.default.function_,Ee.default.undefined],t.https.checkServerIdentity),Ee.assert.any([Ee.default.string,Ee.default.object,Ee.default.array,Ee.default.undefined],t.https.certificateAuthority),Ee.assert.any([Ee.default.string,Ee.default.object,Ee.default.array,Ee.default.undefined],t.https.key),Ee.assert.any([Ee.default.string,Ee.default.object,Ee.default.array,Ee.default.undefined],t.https.certificate),Ee.assert.any([Ee.default.string,Ee.default.undefined],t.https.passphrase),Ee.assert.any([Ee.default.string,Ee.default.buffer,Ee.default.array,Ee.default.undefined],t.https.pfx)),Ee.assert.any([Ee.default.object,Ee.default.undefined],t.cacheOptions),Ee.default.string(t.method)?t.method=t.method.toUpperCase():t.method="GET",t.headers===(i==null?void 0:i.headers)?t.headers={...t.headers}:t.headers=sDe({...i==null?void 0:i.headers,...t.headers}),"slashes"in t)throw new TypeError("The legacy `url.Url` has been deprecated. Use `URL` instead.");if("auth"in t)throw new TypeError("Parameter `auth` is deprecated. Use `username` / `password` instead.");if("searchParams"in t&&t.searchParams&&t.searchParams!==(i==null?void 0:i.searchParams)){let h;if(Ee.default.string(t.searchParams)||t.searchParams instanceof VA.URLSearchParams)h=new VA.URLSearchParams(t.searchParams);else{pDe(t.searchParams),h=new VA.URLSearchParams;for(let p in t.searchParams){let C=t.searchParams[p];C===null?h.append(p,""):C!==void 0&&h.append(p,C)}}(n=i==null?void 0:i.searchParams)===null||n===void 0||n.forEach((p,C)=>{h.has(C)||h.append(C,p)}),t.searchParams=h}if(t.username=(s=t.username)!==null&&s!==void 0?s:"",t.password=(o=t.password)!==null&&o!==void 0?o:"",Ee.default.undefined(t.prefixUrl)?t.prefixUrl=(a=i==null?void 0:i.prefixUrl)!==null&&a!==void 0?a:"":(t.prefixUrl=t.prefixUrl.toString(),t.prefixUrl!==""&&!t.prefixUrl.endsWith("/")&&(t.prefixUrl+="/")),Ee.default.string(t.url)){if(t.url.startsWith("/"))throw new Error("`input` must not start with a slash when using `prefixUrl`");t.url=p6.default(t.prefixUrl+t.url,t)}else(Ee.default.undefined(t.url)&&t.prefixUrl!==""||t.protocol)&&(t.url=p6.default(t.prefixUrl,t));if(t.url){"port"in t&&delete t.port;let{prefixUrl:h}=t;Object.defineProperty(t,"prefixUrl",{set:C=>{let y=t.url;if(!y.href.startsWith(C))throw new Error(`Cannot change \`prefixUrl\` from ${h} to ${C}: ${y.href}`);t.url=new VA.URL(C+y.href.slice(h.length)),h=C},get:()=>h});let{protocol:p}=t.url;if(p==="unix:"&&(p="http:",t.url=new VA.URL(`http://unix${t.url.pathname}${t.url.search}`)),t.searchParams&&(t.url.search=t.searchParams.toString()),p!=="http:"&&p!=="https:")throw new uB(t);t.username===""?t.username=t.url.username:t.url.username=t.username,t.password===""?t.password=t.url.password:t.url.password=t.password}let{cookieJar:u}=t;if(u){let{setCookie:h,getCookieString:p}=u;Ee.assert.function_(h),Ee.assert.function_(p),h.length===4&&p.length===0&&(h=l6.promisify(h.bind(t.cookieJar)),p=l6.promisify(p.bind(t.cookieJar)),t.cookieJar={setCookie:h,getCookieString:p})}let{cache:g}=t;if(g&&(CR.has(g)||CR.set(g,new g6((h,p)=>{let C=h[Pi](h,p);return Ee.default.promise(C)&&(C.once=(y,B)=>{if(y==="error")C.catch(B);else if(y==="abort")(async()=>{try{(await C).once("abort",B)}catch{}})();else throw new Error(`Unknown HTTP2 promise event: ${y}`);return C}),C},g))),t.cacheOptions={...t.cacheOptions},t.dnsCache===!0)pR||(pR=new rDe.default),t.dnsCache=pR;else if(!Ee.default.undefined(t.dnsCache)&&!t.dnsCache.lookup)throw new TypeError(`Parameter \`dnsCache\` must be a CacheableLookup instance or a boolean, got ${Ee.default(t.dnsCache)}`);Ee.default.number(t.timeout)?t.timeout={request:t.timeout}:i&&t.timeout!==i.timeout?t.timeout={...i.timeout,...t.timeout}:t.timeout={...t.timeout},t.context||(t.context={});let f=t.hooks===(i==null?void 0:i.hooks);t.hooks={...t.hooks};for(let h of Yt.knownHookEvents)if(h in t.hooks)if(Ee.default.array(t.hooks[h]))t.hooks[h]=[...t.hooks[h]];else throw new TypeError(`Parameter \`${h}\` must be an Array, got ${Ee.default(t.hooks[h])}`);else t.hooks[h]=[];if(i&&!f)for(let h of Yt.knownHookEvents)i.hooks[h].length>0&&(t.hooks[h]=[...i.hooks[h],...t.hooks[h]]);if("family"in t&&XA.default('"options.family" was never documented, please use "options.dnsLookupIpVersion"'),i!=null&&i.https&&(t.https={...i.https,...t.https}),"rejectUnauthorized"in t&&XA.default('"options.rejectUnauthorized" is now deprecated, please use "options.https.rejectUnauthorized"'),"checkServerIdentity"in t&&XA.default('"options.checkServerIdentity" was never documented, please use "options.https.checkServerIdentity"'),"ca"in t&&XA.default('"options.ca" was never documented, please use "options.https.certificateAuthority"'),"key"in t&&XA.default('"options.key" was never documented, please use "options.https.key"'),"cert"in t&&XA.default('"options.cert" was never documented, please use "options.https.certificate"'),"passphrase"in t&&XA.default('"options.passphrase" was never documented, please use "options.https.passphrase"'),"pfx"in t&&XA.default('"options.pfx" was never documented, please use "options.https.pfx"'),"followRedirects"in t)throw new TypeError("The `followRedirects` option does not exist. Use `followRedirect` instead.");if(t.agent){for(let h in t.agent)if(h!=="http"&&h!=="https"&&h!=="http2")throw new TypeError(`Expected the \`options.agent\` properties to be \`http\`, \`https\` or \`http2\`, got \`${h}\``)}return t.maxRedirects=(l=t.maxRedirects)!==null&&l!==void 0?l:0,Yt.setNonEnumerableProperties([i,c],t),gDe.default(t,i)}_lockWrite(){let e=()=>{throw new TypeError("The payload has been already provided")};this.write=e,this.end=e}_unlockWrite(){this.write=super.write,this.end=super.end}async _finalizeBody(){let{options:e}=this,{headers:t}=e,i=!Ee.default.undefined(e.form),n=!Ee.default.undefined(e.json),s=!Ee.default.undefined(e.body),o=i||n||s,a=Yt.withoutBody.has(e.method)&&!(e.method==="GET"&&e.allowGetBody);if(this._cannotHaveBody=a,o){if(a)throw new TypeError(`The \`${e.method}\` method cannot be used with a body`);if([s,i,n].filter(l=>l).length>1)throw new TypeError("The `body`, `json` and `form` options are mutually exclusive");if(s&&!(e.body instanceof c6.Readable)&&!Ee.default.string(e.body)&&!Ee.default.buffer(e.body)&&!f6.default(e.body))throw new TypeError("The `body` option must be a stream.Readable, string or Buffer");if(i&&!Ee.default.object(e.form))throw new TypeError("The `form` option must be an Object");{let l=!Ee.default.string(t["content-type"]);s?(f6.default(e.body)&&l&&(t["content-type"]=`multipart/form-data; boundary=${e.body.getBoundary()}`),this[ZA]=e.body):i?(l&&(t["content-type"]="application/x-www-form-urlencoded"),this[ZA]=new VA.URLSearchParams(e.form).toString()):(l&&(t["content-type"]="application/json"),this[ZA]=e.stringifyJson(e.json));let c=await oDe.default(this[ZA],e.headers);Ee.default.undefined(t["content-length"])&&Ee.default.undefined(t["transfer-encoding"])&&!a&&!Ee.default.undefined(c)&&(t["content-length"]=String(c))}}else a?this._lockWrite():this._unlockWrite();this[jf]=Number(t["content-length"])||void 0}async _onResponseBase(e){let{options:t}=this,{url:i}=t;this[I6]=e,t.decompress&&(e=iDe(e));let n=e.statusCode,s=e;s.statusMessage=s.statusMessage?s.statusMessage:u6.STATUS_CODES[n],s.url=t.url.toString(),s.requestUrl=this.requestUrl,s.redirectUrls=this.redirects,s.request=this,s.isFromCache=e.fromCache||!1,s.ip=this.ip,s.retryCount=this.retryCount,this[m6]=s.isFromCache,this[Gf]=Number(e.headers["content-length"])||void 0,this[sB]=e,e.once("end",()=>{this[Gf]=this[Yf],this.emit("downloadProgress",this.downloadProgress)}),e.once("error",a=>{e.destroy(),this._beforeError(new bC(a,this))}),e.once("aborted",()=>{this._beforeError(new bC({name:"Error",message:"The server aborted pending request",code:"ECONNRESET"},this))}),this.emit("downloadProgress",this.downloadProgress);let o=e.headers["set-cookie"];if(Ee.default.object(t.cookieJar)&&o){let a=o.map(async l=>t.cookieJar.setCookie(l,i.toString()));t.ignoreInvalidCookies&&(a=a.map(async l=>l.catch(()=>{})));try{await Promise.all(a)}catch(l){this._beforeError(l);return}}if(t.followRedirect&&e.headers.location&&mDe.has(n)){if(e.resume(),this[Pi]&&(this[dR](),delete this[Pi],this[C6]()),(n===303&&t.method!=="GET"&&t.method!=="HEAD"||!t.methodRewriting)&&(t.method="GET","body"in t&&delete t.body,"json"in t&&delete t.json,"form"in t&&delete t.form,this[ZA]=void 0,delete t.headers["content-length"]),this.redirects.length>=t.maxRedirects){this._beforeError(new oB(this));return}try{let l=Buffer.from(e.headers.location,"binary").toString(),c=new VA.URL(l,i),u=c.toString();decodeURI(u),c.hostname!==i.hostname||c.port!==i.port?("host"in t.headers&&delete t.headers.host,"cookie"in t.headers&&delete t.headers.cookie,"authorization"in t.headers&&delete t.headers.authorization,(t.username||t.password)&&(t.username="",t.password="")):(c.username=t.username,c.password=t.password),this.redirects.push(u),t.url=c;for(let g of t.hooks.beforeRedirect)await g(t,s);this.emit("redirect",s,t),await this._makeRequest()}catch(l){this._beforeError(l);return}return}if(t.isStream&&t.throwHttpErrors&&!uDe.isResponseOk(s)){this._beforeError(new aB(s));return}e.on("readable",()=>{this[nB]&&this._read()}),this.on("resume",()=>{e.resume()}),this.on("pause",()=>{e.pause()}),e.once("end",()=>{this.push(null)}),this.emit("response",e);for(let a of this[iB])if(!a.headersSent){for(let l in e.headers){let c=t.decompress?l!=="content-encoding":!0,u=e.headers[l];c&&a.setHeader(l,u)}a.statusCode=n}}async _onResponse(e){try{await this._onResponseBase(e)}catch(t){this._beforeError(t)}}_onRequest(e){let{options:t}=this,{timeout:i,url:n}=t;tDe.default(e),this[dR]=h6.default(e,i,n);let s=t.cache?"cacheableResponse":"response";e.once(s,l=>{this._onResponse(l)}),e.once("error",l=>{var c;e.destroy(),(c=e.res)===null||c===void 0||c.removeAllListeners("end"),l=l instanceof h6.TimeoutError?new cB(l,this.timings,this):new ei(l.message,l,this),this._beforeError(l)}),this[C6]=aDe.default(e,this,IDe),this[Pi]=e,this.emit("uploadProgress",this.uploadProgress);let o=this[ZA],a=this.redirects.length===0?this:e;Ee.default.nodeStream(o)?(o.pipe(a),o.once("error",l=>{this._beforeError(new lB(l,this))})):(this._unlockWrite(),Ee.default.undefined(o)?(this._cannotHaveBody||this._noPipe)&&(a.end(),this._lockWrite()):(this._writeRequest(o,void 0,()=>{}),a.end(),this._lockWrite())),this.emit("request",e)}async _createCacheableRequest(e,t){return new Promise((i,n)=>{Object.assign(t,ADe.default(e)),delete t.url;let s,o=CR.get(t.cache)(t,async a=>{a._readableState.autoDestroy=!1,s&&(await s).emit("cacheableResponse",a),i(a)});t.url=e,o.once("error",n),o.once("request",async a=>{s=a,i(s)})})}async _makeRequest(){var e,t,i,n,s;let{options:o}=this,{headers:a}=o;for(let B in a)if(Ee.default.undefined(a[B]))delete a[B];else if(Ee.default.null_(a[B]))throw new TypeError(`Use \`undefined\` instead of \`null\` to delete the \`${B}\` header`);if(o.decompress&&Ee.default.undefined(a["accept-encoding"])&&(a["accept-encoding"]=hDe?"gzip, deflate, br":"gzip, deflate"),o.cookieJar){let B=await o.cookieJar.getCookieString(o.url.toString());Ee.default.nonEmptyString(B)&&(o.headers.cookie=B)}for(let B of o.hooks.beforeRequest){let v=await B(o);if(!Ee.default.undefined(v)){o.request=()=>v;break}}o.body&&this[ZA]!==o.body&&(this[ZA]=o.body);let{agent:l,request:c,timeout:u,url:g}=o;if(o.dnsCache&&!("lookup"in o)&&(o.lookup=o.dnsCache.lookup),g.hostname==="unix"){let B=/(?<socketPath>.+?):(?<path>.+)/.exec(`${g.pathname}${g.search}`);if(B!=null&&B.groups){let{socketPath:v,path:D}=B.groups;Object.assign(o,{socketPath:v,path:D,host:""})}}let f=g.protocol==="https:",h;o.http2?h=nDe.auto:h=f?eDe.request:u6.request;let p=(e=o.request)!==null&&e!==void 0?e:h,C=o.cache?this._createCacheableRequest:p;l&&!o.http2&&(o.agent=l[f?"https":"http"]),o[Pi]=p,delete o.request,delete o.timeout;let y=o;if(y.shared=(t=o.cacheOptions)===null||t===void 0?void 0:t.shared,y.cacheHeuristic=(i=o.cacheOptions)===null||i===void 0?void 0:i.cacheHeuristic,y.immutableMinTimeToLive=(n=o.cacheOptions)===null||n===void 0?void 0:n.immutableMinTimeToLive,y.ignoreCargoCult=(s=o.cacheOptions)===null||s===void 0?void 0:s.ignoreCargoCult,o.dnsLookupIpVersion!==void 0)try{y.family=d6.dnsLookupIpVersionToFamily(o.dnsLookupIpVersion)}catch{throw new Error("Invalid `dnsLookupIpVersion` option value")}o.https&&("rejectUnauthorized"in o.https&&(y.rejectUnauthorized=o.https.rejectUnauthorized),o.https.checkServerIdentity&&(y.checkServerIdentity=o.https.checkServerIdentity),o.https.certificateAuthority&&(y.ca=o.https.certificateAuthority),o.https.certificate&&(y.cert=o.https.certificate),o.https.key&&(y.key=o.https.key),o.https.passphrase&&(y.passphrase=o.https.passphrase),o.https.pfx&&(y.pfx=o.https.pfx));try{let B=await C(g,y);Ee.default.undefined(B)&&(B=h(g,y)),o.request=c,o.timeout=u,o.agent=l,o.https&&("rejectUnauthorized"in o.https&&delete y.rejectUnauthorized,o.https.checkServerIdentity&&delete y.checkServerIdentity,o.https.certificateAuthority&&delete y.ca,o.https.certificate&&delete y.cert,o.https.key&&delete y.key,o.https.passphrase&&delete y.passphrase,o.https.pfx&&delete y.pfx),dDe(B)?this._onRequest(B):this.writable?(this.once("finish",()=>{this._onResponse(B)}),this._unlockWrite(),this.end(),this._lockWrite()):this._onResponse(B)}catch(B){throw B instanceof g6.CacheError?new AB(B,this):new ei(B.message,B,this)}}async _error(e){try{for(let t of this.options.hooks.beforeError)e=await t(e)}catch(t){e=new ei(t.message,t,this)}this.destroy(e)}_beforeError(e){if(this[Jf])return;let{options:t}=this,i=this.retryCount+1;this[Jf]=!0,e instanceof ei||(e=new ei(e.message,e,this));let n=e,{response:s}=n;(async()=>{if(s&&!s.body){s.setEncoding(this._readableState.encoding);try{s.rawBody=await cDe.default(s),s.body=s.rawBody.toString()}catch{}}if(this.listenerCount("retry")!==0){let o;try{let a;s&&"retry-after"in s.headers&&(a=Number(s.headers["retry-after"]),Number.isNaN(a)?(a=Date.parse(s.headers["retry-after"])-Date.now(),a<=0&&(a=1)):a*=1e3),o=await t.retry.calculateDelay({attemptCount:i,retryOptions:t.retry,error:n,retryAfter:a,computedValue:fDe.default({attemptCount:i,retryOptions:t.retry,error:n,retryAfter:a,computedValue:0})})}catch(a){this._error(new ei(a.message,a,this));return}if(o){let a=async()=>{try{for(let l of this.options.hooks.beforeRetry)await l(this.options,n,i)}catch(l){this._error(new ei(l.message,e,this));return}this.destroyed||(this.destroy(),this.emit("retry",i,e))};this[y6]=setTimeout(a,o);return}}this._error(n)})()}_read(){this[nB]=!0;let e=this[sB];if(e&&!this[Jf]){e.readableLength&&(this[nB]=!1);let t;for(;(t=e.read())!==null;){this[Yf]+=t.length,this[E6]=!0;let i=this.downloadProgress;i.percent<1&&this.emit("downloadProgress",i),this.push(t)}}}_write(e,t,i){let n=()=>{this._writeRequest(e,t,i)};this.requestInitialized?n():this[BC].push(n)}_writeRequest(e,t,i){this[Pi].destroyed||(this._progressCallbacks.push(()=>{this[qf]+=Buffer.byteLength(e,t);let n=this.uploadProgress;n.percent<1&&this.emit("uploadProgress",n)}),this[Pi].write(e,t,n=>{!n&&this._progressCallbacks.length>0&&this._progressCallbacks.shift()(),i(n)}))}_final(e){let t=()=>{for(;this._progressCallbacks.length!==0;)this._progressCallbacks.shift()();if(!(Pi in this)){e();return}if(this[Pi].destroyed){e();return}this[Pi].end(i=>{i||(this[jf]=this[qf],this.emit("uploadProgress",this.uploadProgress),this[Pi].emit("upload-complete")),e(i)})};this.requestInitialized?t():this[BC].push(t)}_destroy(e,t){var i;this[Jf]=!0,clearTimeout(this[y6]),Pi in this&&(this[dR](),!((i=this[sB])===null||i===void 0)&&i.complete||this[Pi].destroy()),e!==null&&!Ee.default.undefined(e)&&!(e instanceof ei)&&(e=new ei(e.message,e,this)),t(e)}get _isAboutToError(){return this[Jf]}get ip(){var e;return(e=this.socket)===null||e===void 0?void 0:e.remoteAddress}get aborted(){var e,t,i;return((t=(e=this[Pi])===null||e===void 0?void 0:e.destroyed)!==null&&t!==void 0?t:this.destroyed)&&!(!((i=this[I6])===null||i===void 0)&&i.complete)}get socket(){var e,t;return(t=(e=this[Pi])===null||e===void 0?void 0:e.socket)!==null&&t!==void 0?t:void 0}get downloadProgress(){let e;return this[Gf]?e=this[Yf]/this[Gf]:this[Gf]===this[Yf]?e=1:e=0,{percent:e,transferred:this[Yf],total:this[Gf]}}get uploadProgress(){let e;return this[jf]?e=this[qf]/this[jf]:this[jf]===this[qf]?e=1:e=0,{percent:e,transferred:this[qf],total:this[jf]}}get timings(){var e;return(e=this[Pi])===null||e===void 0?void 0:e.timings}get isFromCache(){return this[m6]}pipe(e,t){if(this[E6])throw new Error("Failed to pipe. The response has been emitted already.");return e instanceof hR.ServerResponse&&this[iB].add(e),super.pipe(e,t)}unpipe(e){return e instanceof hR.ServerResponse&&this[iB].delete(e),super.unpipe(e),this}};Yt.default=gB});var SC=w(Ao=>{"use strict";var yDe=Ao&&Ao.__createBinding||(Object.create?function(r,e,t,i){i===void 0&&(i=t),Object.defineProperty(r,i,{enumerable:!0,get:function(){return e[t]}})}:function(r,e,t,i){i===void 0&&(i=t),r[i]=e[t]}),wDe=Ao&&Ao.__exportStar||function(r,e){for(var t in r)t!=="default"&&!Object.prototype.hasOwnProperty.call(e,t)&&yDe(e,r,t)};Object.defineProperty(Ao,"__esModule",{value:!0});Ao.CancelError=Ao.ParseError=void 0;var w6=QC(),mR=class extends w6.RequestError{constructor(e,t){let{options:i}=t.request;super(`${e.message} in "${i.url.toString()}"`,e,t.request),this.name="ParseError"}};Ao.ParseError=mR;var ER=class extends w6.RequestError{constructor(e){super("Promise was canceled",{},e),this.name="CancelError"}get isCanceled(){return!0}};Ao.CancelError=ER;wDe(QC(),Ao)});var b6=w(IR=>{"use strict";Object.defineProperty(IR,"__esModule",{value:!0});var B6=SC(),BDe=(r,e,t,i)=>{let{rawBody:n}=r;try{if(e==="text")return n.toString(i);if(e==="json")return n.length===0?"":t(n.toString());if(e==="buffer")return n;throw new B6.ParseError({message:`Unknown body type '${e}'`,name:"Error"},r)}catch(s){throw new B6.ParseError(s,r)}};IR.default=BDe});var yR=w(_A=>{"use strict";var bDe=_A&&_A.__createBinding||(Object.create?function(r,e,t,i){i===void 0&&(i=t),Object.defineProperty(r,i,{enumerable:!0,get:function(){return e[t]}})}:function(r,e,t,i){i===void 0&&(i=t),r[i]=e[t]}),QDe=_A&&_A.__exportStar||function(r,e){for(var t in r)t!=="default"&&!Object.prototype.hasOwnProperty.call(e,t)&&bDe(e,r,t)};Object.defineProperty(_A,"__esModule",{value:!0});var SDe=J("events"),vDe=Ya(),xDe=bz(),fB=SC(),Q6=b6(),S6=QC(),PDe=iR(),DDe=cR(),v6=uR(),kDe=["request","response","redirect","uploadProgress","downloadProgress"];function x6(r){let e,t,i=new SDe.EventEmitter,n=new xDe((o,a,l)=>{let c=u=>{let g=new S6.default(void 0,r);g.retryCount=u,g._noPipe=!0,l(()=>g.destroy()),l.shouldReject=!1,l(()=>a(new fB.CancelError(g))),e=g,g.once("response",async p=>{var C;if(p.retryCount=u,p.request.aborted)return;let y;try{y=await DDe.default(g),p.rawBody=y}catch{return}if(g._isAboutToError)return;let B=((C=p.headers["content-encoding"])!==null&&C!==void 0?C:"").toLowerCase(),v=["gzip","deflate","br"].includes(B),{options:D}=g;if(v&&!D.decompress)p.body=y;else try{p.body=Q6.default(p,D.responseType,D.parseJson,D.encoding)}catch(T){if(p.body=y.toString(),v6.isResponseOk(p)){g._beforeError(T);return}}try{for(let[T,H]of D.hooks.afterResponse.entries())p=await H(p,async j=>{let $=S6.default.normalizeArguments(void 0,{...j,retry:{calculateDelay:()=>0},throwHttpErrors:!1,resolveBodyOnly:!1},D);$.hooks.afterResponse=$.hooks.afterResponse.slice(0,T);for(let W of $.hooks.beforeRetry)await W($);let V=x6($);return l(()=>{V.catch(()=>{}),V.cancel()}),V})}catch(T){g._beforeError(new fB.RequestError(T.message,T,g));return}if(!v6.isResponseOk(p)){g._beforeError(new fB.HTTPError(p));return}t=p,o(g.options.resolveBodyOnly?p.body:p)});let f=p=>{if(n.isCanceled)return;let{options:C}=g;if(p instanceof fB.HTTPError&&!C.throwHttpErrors){let{response:y}=p;o(g.options.resolveBodyOnly?y.body:y);return}a(p)};g.once("error",f);let h=g.options.body;g.once("retry",(p,C)=>{var y,B;if(h===((y=C.request)===null||y===void 0?void 0:y.options.body)&&vDe.default.nodeStream((B=C.request)===null||B===void 0?void 0:B.options.body)){f(C);return}c(p)}),PDe.default(g,i,kDe)};c(0)});n.on=(o,a)=>(i.on(o,a),n);let s=o=>{let a=(async()=>{await n;let{options:l}=t.request;return Q6.default(t,o,l.parseJson,l.encoding)})();return Object.defineProperties(a,Object.getOwnPropertyDescriptors(n)),a};return n.json=()=>{let{headers:o}=e.options;return!e.writableFinished&&o.accept===void 0&&(o.accept="application/json"),s("json")},n.buffer=()=>s("buffer"),n.text=()=>s("text"),n}_A.default=x6;QDe(SC(),_A)});var P6=w(wR=>{"use strict";Object.defineProperty(wR,"__esModule",{value:!0});var RDe=SC();function FDe(r,...e){let t=(async()=>{if(r instanceof RDe.RequestError)try{for(let n of e)if(n)for(let s of n)r=await s(r)}catch(n){r=n}throw r})(),i=()=>t;return t.json=i,t.text=i,t.buffer=i,t.on=i,t}wR.default=FDe});var R6=w(BR=>{"use strict";Object.defineProperty(BR,"__esModule",{value:!0});var D6=Ya();function k6(r){for(let e of Object.values(r))(D6.default.plainObject(e)||D6.default.array(e))&&k6(e);return Object.freeze(r)}BR.default=k6});var N6=w(F6=>{"use strict";Object.defineProperty(F6,"__esModule",{value:!0})});var bR=w(Qs=>{"use strict";var NDe=Qs&&Qs.__createBinding||(Object.create?function(r,e,t,i){i===void 0&&(i=t),Object.defineProperty(r,i,{enumerable:!0,get:function(){return e[t]}})}:function(r,e,t,i){i===void 0&&(i=t),r[i]=e[t]}),TDe=Qs&&Qs.__exportStar||function(r,e){for(var t in r)t!=="default"&&!Object.prototype.hasOwnProperty.call(e,t)&&NDe(e,r,t)};Object.defineProperty(Qs,"__esModule",{value:!0});Qs.defaultHandler=void 0;var T6=Ya(),bs=yR(),LDe=P6(),pB=QC(),ODe=R6(),MDe={RequestError:bs.RequestError,CacheError:bs.CacheError,ReadError:bs.ReadError,HTTPError:bs.HTTPError,MaxRedirectsError:bs.MaxRedirectsError,TimeoutError:bs.TimeoutError,ParseError:bs.ParseError,CancelError:bs.CancelError,UnsupportedProtocolError:bs.UnsupportedProtocolError,UploadError:bs.UploadError},KDe=async r=>new Promise(e=>{setTimeout(e,r)}),{normalizeArguments:hB}=pB.default,L6=(...r)=>{let e;for(let t of r)e=hB(void 0,t,e);return e},UDe=r=>r.isStream?new pB.default(void 0,r):bs.default(r),HDe=r=>"defaults"in r&&"options"in r.defaults,GDe=["get","post","put","patch","head","delete"];Qs.defaultHandler=(r,e)=>e(r);var O6=(r,e)=>{if(r)for(let t of r)t(e)},M6=r=>{r._rawHandlers=r.handlers,r.handlers=r.handlers.map(i=>(n,s)=>{let o,a=i(n,l=>(o=s(l),o));if(a!==o&&!n.isStream&&o){let l=a,{then:c,catch:u,finally:g}=l;Object.setPrototypeOf(l,Object.getPrototypeOf(o)),Object.defineProperties(l,Object.getOwnPropertyDescriptors(o)),l.then=c,l.catch=u,l.finally=g}return a});let e=(i,n={},s)=>{var o,a;let l=0,c=u=>r.handlers[l++](u,l===r.handlers.length?UDe:c);if(T6.default.plainObject(i)){let u={...i,...n};pB.setNonEnumerableProperties([i,n],u),n=u,i=void 0}try{let u;try{O6(r.options.hooks.init,n),O6((o=n.hooks)===null||o===void 0?void 0:o.init,n)}catch(f){u=f}let g=hB(i,n,s!=null?s:r.options);if(g[pB.kIsNormalizedAlready]=!0,u)throw new bs.RequestError(u.message,u,g);return c(g)}catch(u){if(n.isStream)throw u;return LDe.default(u,r.options.hooks.beforeError,(a=n.hooks)===null||a===void 0?void 0:a.beforeError)}};e.extend=(...i)=>{let n=[r.options],s=[...r._rawHandlers],o;for(let a of i)HDe(a)?(n.push(a.defaults.options),s.push(...a.defaults._rawHandlers),o=a.defaults.mutableDefaults):(n.push(a),"handlers"in a&&s.push(...a.handlers),o=a.mutableDefaults);return s=s.filter(a=>a!==Qs.defaultHandler),s.length===0&&s.push(Qs.defaultHandler),M6({options:L6(...n),handlers:s,mutableDefaults:Boolean(o)})};let t=async function*(i,n){let s=hB(i,n,r.options);s.resolveBodyOnly=!1;let o=s.pagination;if(!T6.default.object(o))throw new TypeError("`options.pagination` must be implemented");let a=[],{countLimit:l}=o,c=0;for(;c<o.requestLimit;){c!==0&&await KDe(o.backoff);let u=await e(void 0,void 0,s),g=await o.transform(u),f=[];for(let p of g)if(o.filter(p,a,f)&&(!o.shouldContinue(p,a,f)||(yield p,o.stackAllItems&&a.push(p),f.push(p),--l<=0)))return;let h=o.paginate(u,a,f);if(h===!1)return;h===u.request.options?s=u.request.options:h!==void 0&&(s=hB(void 0,h,s)),c++}};e.paginate=t,e.paginate.all=async(i,n)=>{let s=[];for await(let o of t(i,n))s.push(o);return s},e.paginate.each=t,e.stream=(i,n)=>e(i,{...n,isStream:!0});for(let i of GDe)e[i]=(n,s)=>e(n,{...s,method:i}),e.stream[i]=(n,s)=>e(n,{...s,method:i,isStream:!0});return Object.assign(e,MDe),Object.defineProperty(e,"defaults",{value:r.mutableDefaults?r:ODe.default(r),writable:r.mutableDefaults,configurable:r.mutableDefaults,enumerable:!0}),e.mergeOptions=L6,e};Qs.default=M6;TDe(N6(),Qs)});var CB=w((ja,dB)=>{"use strict";var YDe=ja&&ja.__createBinding||(Object.create?function(r,e,t,i){i===void 0&&(i=t),Object.defineProperty(r,i,{enumerable:!0,get:function(){return e[t]}})}:function(r,e,t,i){i===void 0&&(i=t),r[i]=e[t]}),K6=ja&&ja.__exportStar||function(r,e){for(var t in r)t!=="default"&&!Object.prototype.hasOwnProperty.call(e,t)&&YDe(e,r,t)};Object.defineProperty(ja,"__esModule",{value:!0});var jDe=J("url"),U6=bR(),qDe={options:{method:"GET",retry:{limit:2,methods:["GET","PUT","HEAD","DELETE","OPTIONS","TRACE"],statusCodes:[408,413,429,500,502,503,504,521,522,524],errorCodes:["ETIMEDOUT","ECONNRESET","EADDRINUSE","ECONNREFUSED","EPIPE","ENOTFOUND","ENETUNREACH","EAI_AGAIN"],maxRetryAfter:void 0,calculateDelay:({computedValue:r})=>r},timeout:{},headers:{"user-agent":"got (https://github.com/sindresorhus/got)"},hooks:{init:[],beforeRequest:[],beforeRedirect:[],beforeRetry:[],beforeError:[],afterResponse:[]},cache:void 0,dnsCache:void 0,decompress:!0,throwHttpErrors:!0,followRedirect:!0,isStream:!1,responseType:"text",resolveBodyOnly:!1,maxRedirects:10,prefixUrl:"",methodRewriting:!0,ignoreInvalidCookies:!1,context:{},http2:!1,allowGetBody:!1,https:void 0,pagination:{transform:r=>r.request.options.responseType==="json"?r.body:JSON.parse(r.body),paginate:r=>{if(!Reflect.has(r.headers,"link"))return!1;let e=r.headers.link.split(","),t;for(let i of e){let n=i.split(";");if(n[1].includes("next")){t=n[0].trimStart().trim(),t=t.slice(1,-1);break}}return t?{url:new jDe.URL(t)}:!1},filter:()=>!0,shouldContinue:()=>!0,countLimit:1/0,backoff:0,requestLimit:1e4,stackAllItems:!0},parseJson:r=>JSON.parse(r),stringifyJson:r=>JSON.stringify(r),cacheOptions:{}},handlers:[U6.defaultHandler],mutableDefaults:!1},QR=U6.default(qDe);ja.default=QR;dB.exports=QR;dB.exports.default=QR;dB.exports.__esModule=!0;K6(bR(),ja);K6(yR(),ja)});var j6=w(Wf=>{"use strict";var ost=J("net"),JDe=J("tls"),SR=J("http"),H6=J("https"),WDe=J("events"),ast=J("assert"),zDe=J("util");Wf.httpOverHttp=VDe;Wf.httpsOverHttp=XDe;Wf.httpOverHttps=ZDe;Wf.httpsOverHttps=_De;function VDe(r){var e=new qa(r);return e.request=SR.request,e}function XDe(r){var e=new qa(r);return e.request=SR.request,e.createSocket=G6,e.defaultPort=443,e}function ZDe(r){var e=new qa(r);return e.request=H6.request,e}function _De(r){var e=new qa(r);return e.request=H6.request,e.createSocket=G6,e.defaultPort=443,e}function qa(r){var e=this;e.options=r||{},e.proxyOptions=e.options.proxy||{},e.maxSockets=e.options.maxSockets||SR.Agent.defaultMaxSockets,e.requests=[],e.sockets=[],e.on("free",function(i,n,s,o){for(var a=Y6(n,s,o),l=0,c=e.requests.length;l<c;++l){var u=e.requests[l];if(u.host===a.host&&u.port===a.port){e.requests.splice(l,1),u.request.onSocket(i);return}}i.destroy(),e.removeSocket(i)})}zDe.inherits(qa,WDe.EventEmitter);qa.prototype.addRequest=function(e,t,i,n){var s=this,o=vR({request:e},s.options,Y6(t,i,n));if(s.sockets.length>=this.maxSockets){s.requests.push(o);return}s.createSocket(o,function(a){a.on("free",l),a.on("close",c),a.on("agentRemove",c),e.onSocket(a);function l(){s.emit("free",a,o)}function c(u){s.removeSocket(a),a.removeListener("free",l),a.removeListener("close",c),a.removeListener("agentRemove",c)}})};qa.prototype.createSocket=function(e,t){var i=this,n={};i.sockets.push(n);var s=vR({},i.proxyOptions,{method:"CONNECT",path:e.host+":"+e.port,agent:!1,headers:{host:e.host+":"+e.port}});e.localAddress&&(s.localAddress=e.localAddress),s.proxyAuth&&(s.headers=s.headers||{},s.headers["Proxy-Authorization"]="Basic "+new Buffer(s.proxyAuth).toString("base64")),$A("making CONNECT request");var o=i.request(s);o.useChunkedEncodingByDefault=!1,o.once("response",a),o.once("upgrade",l),o.once("connect",c),o.once("error",u),o.end();function a(g){g.upgrade=!0}function l(g,f,h){process.nextTick(function(){c(g,f,h)})}function c(g,f,h){if(o.removeAllListeners(),f.removeAllListeners(),g.statusCode!==200){$A("tunneling socket could not be established, statusCode=%d",g.statusCode),f.destroy();var p=new Error("tunneling socket could not be established, statusCode="+g.statusCode);p.code="ECONNRESET",e.request.emit("error",p),i.removeSocket(n);return}if(h.length>0){$A("got illegal response body from proxy"),f.destroy();var p=new Error("got illegal response body from proxy");p.code="ECONNRESET",e.request.emit("error",p),i.removeSocket(n);return}return $A("tunneling connection has established"),i.sockets[i.sockets.indexOf(n)]=f,t(f)}function u(g){o.removeAllListeners(),$A(`tunneling socket could not be established, cause=%s
-`,g.message,g.stack);var f=new Error("tunneling socket could not be established, cause="+g.message);f.code="ECONNRESET",e.request.emit("error",f),i.removeSocket(n)}};qa.prototype.removeSocket=function(e){var t=this.sockets.indexOf(e);if(t!==-1){this.sockets.splice(t,1);var i=this.requests.shift();i&&this.createSocket(i,function(n){i.request.onSocket(n)})}};function G6(r,e){var t=this;qa.prototype.createSocket.call(t,r,function(i){var n=r.request.getHeader("host"),s=vR({},t.options,{socket:i,servername:n?n.replace(/:.*$/,""):r.host}),o=JDe.connect(0,s);t.sockets[t.sockets.indexOf(i)]=o,e(o)})}function Y6(r,e,t){return typeof r=="string"?{host:r,port:e,localAddress:t}:r}function vR(r){for(var e=1,t=arguments.length;e<t;++e){var i=arguments[e];if(typeof i=="object")for(var n=Object.keys(i),s=0,o=n.length;s<o;++s){var a=n[s];i[a]!==void 0&&(r[a]=i[a])}}return r}var $A;process.env.NODE_DEBUG&&/\btunnel\b/.test(process.env.NODE_DEBUG)?$A=function(){var r=Array.prototype.slice.call(arguments);typeof r[0]=="string"?r[0]="TUNNEL: "+r[0]:r.unshift("TUNNEL:"),console.error.apply(console,r)}:$A=function(){};Wf.debug=$A});var J6=w((lst,q6)=>{q6.exports=j6()});var iV=w((IB,FR)=>{var rV=Object.assign({},J("fs")),RR=function(){var r=typeof document<"u"&&document.currentScript?document.currentScript.src:void 0;return typeof __filename<"u"&&(r=r||__filename),function(e){e=e||{};var t=typeof e<"u"?e:{},i,n;t.ready=new Promise(function(d,E){i=d,n=E});var s={},o;for(o in t)t.hasOwnProperty(o)&&(s[o]=t[o]);var a=[],l="./this.program",c=function(d,E){throw E},u=!1,g=!0,f="";function h(d){return t.locateFile?t.locateFile(d,f):f+d}var p,C,y,B;g&&(u?f=J("path").dirname(f)+"/":f=__dirname+"/",p=function(E,I){var k=Ca(E);return k?I?k:k.toString():(y||(y=rV),B||(B=J("path")),E=B.normalize(E),y.readFileSync(E,I?null:"utf8"))},C=function(E){var I=p(E,!0);return I.buffer||(I=new Uint8Array(I)),re(I.buffer),I},process.argv.length>1&&(l=process.argv[1].replace(/\\/g,"/")),a=process.argv.slice(2),c=function(d){process.exit(d)},t.inspect=function(){return"[Emscripten Module object]"});var v=t.print||console.log.bind(console),D=t.printErr||console.warn.bind(console);for(o in s)s.hasOwnProperty(o)&&(t[o]=s[o]);s=null,t.arguments&&(a=t.arguments),t.thisProgram&&(l=t.thisProgram),t.quit&&(c=t.quit);var T=16;function H(d,E){return E||(E=T),Math.ceil(d/E)*E}var j=0,$=function(d){j=d},V;t.wasmBinary&&(V=t.wasmBinary);var W=t.noExitRuntime||!0;typeof WebAssembly!="object"&&wr("no native wasm support detected");function _(d,E,I){switch(E=E||"i8",E.charAt(E.length-1)==="*"&&(E="i32"),E){case"i1":return ne[d>>0];case"i8":return ne[d>>0];case"i16":return he[d>>1];case"i32":return de[d>>2];case"i64":return de[d>>2];case"float":return Pt[d>>2];case"double":return It[d>>3];default:wr("invalid type for getValue: "+E)}return null}var A,Ae=!1,ge;function re(d,E){d||wr("Assertion failed: "+E)}function O(d){var E=t["_"+d];return re(E,"Cannot call unknown function "+d+", make sure it is exported"),E}function F(d,E,I,k,L){var Z={string:function(it){var Et=0;if(it!=null&&it!==0){var be=(it.length<<2)+1;Et=b(be),oe(it,Et,be)}return Et},array:function(it){var Et=b(it.length);return fe(it,Et),Et}};function te(it){return E==="string"?Fe(it):E==="boolean"?Boolean(it):it}var we=O(d),me=[],Je=0;if(k)for(var nt=0;nt<k.length;nt++){var wt=Z[I[nt]];wt?(Je===0&&(Je=YE()),me[nt]=wt(k[nt])):me[nt]=k[nt]}var lt=we.apply(null,me);return lt=te(lt),Je!==0&&jE(Je),lt}function ue(d,E,I,k){I=I||[];var L=I.every(function(te){return te==="number"}),Z=E!=="string";return Z&&L&&!k?O(d):function(){return F(d,E,I,arguments,k)}}var pe=typeof TextDecoder<"u"?new TextDecoder("utf8"):void 0;function ke(d,E,I){for(var k=E+I,L=E;d[L]&&!(L>=k);)++L;if(L-E>16&&d.subarray&&pe)return pe.decode(d.subarray(E,L));for(var Z="";E<L;){var te=d[E++];if(!(te&128)){Z+=String.fromCharCode(te);continue}var we=d[E++]&63;if((te&224)==192){Z+=String.fromCharCode((te&31)<<6|we);continue}var me=d[E++]&63;if((te&240)==224?te=(te&15)<<12|we<<6|me:te=(te&7)<<18|we<<12|me<<6|d[E++]&63,te<65536)Z+=String.fromCharCode(te);else{var Je=te-65536;Z+=String.fromCharCode(55296|Je>>10,56320|Je&1023)}}return Z}function Fe(d,E){return d?ke(Y,d,E):""}function Ne(d,E,I,k){if(!(k>0))return 0;for(var L=I,Z=I+k-1,te=0;te<d.length;++te){var we=d.charCodeAt(te);if(we>=55296&&we<=57343){var me=d.charCodeAt(++te);we=65536+((we&1023)<<10)|me&1023}if(we<=127){if(I>=Z)break;E[I++]=we}else if(we<=2047){if(I+1>=Z)break;E[I++]=192|we>>6,E[I++]=128|we&63}else if(we<=65535){if(I+2>=Z)break;E[I++]=224|we>>12,E[I++]=128|we>>6&63,E[I++]=128|we&63}else{if(I+3>=Z)break;E[I++]=240|we>>18,E[I++]=128|we>>12&63,E[I++]=128|we>>6&63,E[I++]=128|we&63}}return E[I]=0,I-L}function oe(d,E,I){return Ne(d,Y,E,I)}function le(d){for(var E=0,I=0;I<d.length;++I){var k=d.charCodeAt(I);k>=55296&&k<=57343&&(k=65536+((k&1023)<<10)|d.charCodeAt(++I)&1023),k<=127?++E:k<=2047?E+=2:k<=65535?E+=3:E+=4}return E}function Be(d){var E=le(d)+1,I=dt(E);return I&&Ne(d,ne,I,E),I}function fe(d,E){ne.set(d,E)}function ae(d,E){return d%E>0&&(d+=E-d%E),d}var qe,ne,Y,he,ie,de,_e,Pt,It;function Or(d){qe=d,t.HEAP8=ne=new Int8Array(d),t.HEAP16=he=new Int16Array(d),t.HEAP32=de=new Int32Array(d),t.HEAPU8=Y=new Uint8Array(d),t.HEAPU16=ie=new Uint16Array(d),t.HEAPU32=_e=new Uint32Array(d),t.HEAPF32=Pt=new Float32Array(d),t.HEAPF64=It=new Float64Array(d)}var ii=t.INITIAL_MEMORY||16777216,gi,hr=[],fi=[],ni=[],Ks=!1;function pr(){if(t.preRun)for(typeof t.preRun=="function"&&(t.preRun=[t.preRun]);t.preRun.length;)fa(t.preRun.shift());wo(hr)}function Ii(){Ks=!0,!t.noFSInit&&!S.init.initialized&&S.init(),ns.init(),wo(fi)}function rs(){if(t.postRun)for(typeof t.postRun=="function"&&(t.postRun=[t.postRun]);t.postRun.length;)cg(t.postRun.shift());wo(ni)}function fa(d){hr.unshift(d)}function dA(d){fi.unshift(d)}function cg(d){ni.unshift(d)}var is=0,CA=null,ha=null;function wp(d){return d}function mA(d){is++,t.monitorRunDependencies&&t.monitorRunDependencies(is)}function EA(d){if(is--,t.monitorRunDependencies&&t.monitorRunDependencies(is),is==0&&(CA!==null&&(clearInterval(CA),CA=null),ha)){var E=ha;ha=null,E()}}t.preloadedImages={},t.preloadedAudios={};function wr(d){t.onAbort&&t.onAbort(d),d+="",D(d),Ae=!0,ge=1,d="abort("+d+"). Build with -s ASSERTIONS=1 for more info.";var E=new WebAssembly.RuntimeError(d);throw n(E),E}var Tl="data:application/octet-stream;base64,";function ug(d){return d.startsWith(Tl)}var yo="data:application/octet-stream;base64,AGFzbQEAAAABlAInYAF/AX9gA39/fwF/YAF/AGACf38Bf2ACf38AYAV/f39/fwF/YAR/f39/AX9gA39/fwBgBH9+f38Bf2AAAX9gBX9/f35/AX5gA39+fwF/YAF/AX5gAn9+AX9gBH9/fn8BfmADf35/AX5gA39/fgF/YAR/f35/AX9gBn9/f39/fwF/YAR/f39/AGADf39+AX5gAn5/AX9gA398fwBgBH9/f38BfmADf39/AX5gBn98f39/fwF/YAV/f35/fwF/YAV/fn9/fwF/YAV/f39/fwBgAn9+AGACf38BfmACf3wAYAh/fn5/f39+fwF/YAV/f39+fwBgAABgBX5+f35/AX5gBX9/f39/AX5gAnx/AXxgAn9+AX4CeRQBYQFhAAIBYQFiAAABYQFjAAMBYQFkAAYBYQFlAAEBYQFmAAABYQFnAAYBYQFoAAABYQFpAAMBYQFqAAMBYQFrAAMBYQFsAAEBYQFtAAABYQFuAAUBYQFvAAEBYQFwAAMBYQFxAAEBYQFyAAABYQFzAAMBYQF0AAADggKAAgcCAgQAAQECAgANBA4EBwICAhwLEw0AFA0dAAAMDAIHHgwQAgIDAwICAQAIAAcIFBUEBgAADAAECAgDAQYAAgIBBgAfFwEBAwITAiAPBgIFEQMFAxgBCAIBAAAHBQEYABoSAQIABwQDIREIAyIGAAEBAwMAIwUbASQHAQsVAQMABQMEAA0bFw0BBAALCwMDDAwAAwAHJQMBAAgaAQECBQMBAgMDAAcHBwICAgImEQsICAsECQoJAgAAAAAAAAkFAAUFBQEGAwYGBgUSBgYBARIBAAIJBgABDgABAQ8ACQEEGQkJCQAAAAMECgoBAQIQAAAAAgEDAwAEAQoFAA4ACQAEBQFwAR8fBQcBAYACgIACBgkBfwFB0KDBAgsHvgI8AXUCAAF2AIABAXcAkwIBeADjAQF5APEBAXoA0QEBQQDQAQFCAM8BAUMAzgEBRADMAQFFAMsBAUYAyQEBRwCSAgFIAJECAUkAjwIBSgCKAgFLAOkBAUwA4gEBTQDhAQFOADwBTwD8AQFQAPkBAVEA+AEBUgDwAQFTAPoBAVQA4AEBVQAVAVYAGAFXAMcBAVgAzQEBWQDfAQFaAN4BAV8A3QEBJADkAQJhYQDcAQJiYQDbAQJjYQDaAQJkYQDZAQJlYQDYAQJmYQDXAQJnYQDqAQJoYQCcAQJpYQDWAQJqYQDVAQJrYQDUAQJsYQAvAm1hABsCbmEAygECb2EASAJwYQEAAnFhAGcCcmEA0wECc2EA6AECdGEA0gECdWEA9wECdmEA9gECd2EA9QECeGEA5wECeWEA5gECemEA5QEJQQEAQQELHsgBkAKNAo4CjAKLArcBiQKIAocChgKFAoQCgwKCAoECgAL/Af4B/QH7AVv0AfMB8gHvAe4B7QHsAesBCu+QCYACQAEBfyMAQRBrIgMgADYCDCADIAE2AgggAyACNgIEIAMoAgwEQCADKAIMIAMoAgg2AgAgAygCDCADKAIENgIECwvMDAEHfwJAIABFDQAgAEEIayIDIABBBGsoAgAiAUF4cSIAaiEFAkAgAUEBcQ0AIAFBA3FFDQEgAyADKAIAIgFrIgNB9JsBKAIASQ0BIAAgAWohACADQfibASgCAEcEQCABQf8BTQRAIAMoAggiAiABQQN2IgRBA3RBjJwBakYaIAIgAygCDCIBRgRAQeSbAUHkmwEoAgBBfiAEd3E2AgAMAwsgAiABNgIMIAEgAjYCCAwCCyADKAIYIQYCQCADIAMoAgwiAUcEQCADKAIIIgIgATYCDCABIAI2AggMAQsCQCADQRRqIgIoAgAiBA0AIANBEGoiAigCACIEDQBBACEBDAELA0AgAiEHIAQiAUEUaiICKAIAIgQNACABQRBqIQIgASgCECIEDQALIAdBADYCAAsgBkUNAQJAIAMgAygCHCICQQJ0QZSeAWoiBCgCAEYEQCAEIAE2AgAgAQ0BQeibAUHomwEoAgBBfiACd3E2AgAMAwsgBkEQQRQgBigCECADRhtqIAE2AgAgAUUNAgsgASAGNgIYIAMoAhAiAgRAIAEgAjYCECACIAE2AhgLIAMoAhQiAkUNASABIAI2AhQgAiABNgIYDAELIAUoAgQiAUEDcUEDRw0AQeybASAANgIAIAUgAUF+cTYCBCADIABBAXI2AgQgACADaiAANgIADwsgAyAFTw0AIAUoAgQiAUEBcUUNAAJAIAFBAnFFBEAgBUH8mwEoAgBGBEBB/JsBIAM2AgBB8JsBQfCbASgCACAAaiIANgIAIAMgAEEBcjYCBCADQfibASgCAEcNA0HsmwFBADYCAEH4mwFBADYCAA8LIAVB+JsBKAIARgRAQfibASADNgIAQeybAUHsmwEoAgAgAGoiADYCACADIABBAXI2AgQgACADaiAANgIADwsgAUF4cSAAaiEAAkAgAUH/AU0EQCAFKAIIIgIgAUEDdiIEQQN0QYycAWpGGiACIAUoAgwiAUYEQEHkmwFB5JsBKAIAQX4gBHdxNgIADAILIAIgATYCDCABIAI2AggMAQsgBSgCGCEGAkAgBSAFKAIMIgFHBEAgBSgCCCICQfSbASgCAEkaIAIgATYCDCABIAI2AggMAQsCQCAFQRRqIgIoAgAiBA0AIAVBEGoiAigCACIEDQBBACEBDAELA0AgAiEHIAQiAUEUaiICKAIAIgQNACABQRBqIQIgASgCECIEDQALIAdBADYCAAsgBkUNAAJAIAUgBSgCHCICQQJ0QZSeAWoiBCgCAEYEQCAEIAE2AgAgAQ0BQeibAUHomwEoAgBBfiACd3E2AgAMAgsgBkEQQRQgBigCECAFRhtqIAE2AgAgAUUNAQsgASAGNgIYIAUoAhAiAgRAIAEgAjYCECACIAE2AhgLIAUoAhQiAkUNACABIAI2AhQgAiABNgIYCyADIABBAXI2AgQgACADaiAANgIAIANB+JsBKAIARw0BQeybASAANgIADwsgBSABQX5xNgIEIAMgAEEBcjYCBCAAIANqIAA2AgALIABB/wFNBEAgAEEDdiIBQQN0QYycAWohAAJ/QeSbASgCACICQQEgAXQiAXFFBEBB5JsBIAEgAnI2AgAgAAwBCyAAKAIICyECIAAgAzYCCCACIAM2AgwgAyAANgIMIAMgAjYCCA8LQR8hAiADQgA3AhAgAEH///8HTQRAIABBCHYiASABQYD+P2pBEHZBCHEiAXQiAiACQYDgH2pBEHZBBHEiAnQiBCAEQYCAD2pBEHZBAnEiBHRBD3YgASACciAEcmsiAUEBdCAAIAFBFWp2QQFxckEcaiECCyADIAI2AhwgAkECdEGUngFqIQECQAJAAkBB6JsBKAIAIgRBASACdCIHcUUEQEHomwEgBCAHcjYCACABIAM2AgAgAyABNgIYDAELIABBAEEZIAJBAXZrIAJBH0YbdCECIAEoAgAhAQNAIAEiBCgCBEF4cSAARg0CIAJBHXYhASACQQF0IQIgBCABQQRxaiIHQRBqKAIAIgENAAsgByADNgIQIAMgBDYCGAsgAyADNgIMIAMgAzYCCAwBCyAEKAIIIgAgAzYCDCAEIAM2AgggA0EANgIYIAMgBDYCDCADIAA2AggLQYScAUGEnAEoAgBBAWsiAEF/IAAbNgIACwtCAQF/IwBBEGsiASQAIAEgADYCDCABKAIMBEAgASgCDC0AAUEBcQRAIAEoAgwoAgQQFQsgASgCDBAVCyABQRBqJAALQwEBfyMAQRBrIgIkACACIAA2AgwgAiABNgIIIAIoAgwCfyMAQRBrIgAgAigCCDYCDCAAKAIMQQxqCxBFIAJBEGokAAuiLgEMfyMAQRBrIgwkAAJAAkACQAJAAkACQAJAAkACQAJAAkACQCAAQfQBTQRAQeSbASgCACIFQRAgAEELakF4cSAAQQtJGyIIQQN2IgJ2IgFBA3EEQCABQX9zQQFxIAJqIgNBA3QiAUGUnAFqKAIAIgRBCGohAAJAIAQoAggiAiABQYycAWoiAUYEQEHkmwEgBUF+IAN3cTYCAAwBCyACIAE2AgwgASACNgIICyAEIANBA3QiAUEDcjYCBCABIARqIgEgASgCBEEBcjYCBAwNCyAIQeybASgCACIKTQ0BIAEEQAJAQQIgAnQiAEEAIABrciABIAJ0cSIAQQAgAGtxQQFrIgAgAEEMdkEQcSICdiIBQQV2QQhxIgAgAnIgASAAdiIBQQJ2QQRxIgByIAEgAHYiAUEBdkECcSIAciABIAB2IgFBAXZBAXEiAHIgASAAdmoiA0EDdCIAQZScAWooAgAiBCgCCCIBIABBjJwBaiIARgRAQeSbASAFQX4gA3dxIgU2AgAMAQsgASAANgIMIAAgATYCCAsgBEEIaiEAIAQgCEEDcjYCBCAEIAhqIgIgA0EDdCIBIAhrIgNBAXI2AgQgASAEaiADNgIAIAoEQCAKQQN2IgFBA3RBjJwBaiEHQfibASgCACEEAn8gBUEBIAF0IgFxRQRAQeSbASABIAVyNgIAIAcMAQsgBygCCAshASAHIAQ2AgggASAENgIMIAQgBzYCDCAEIAE2AggLQfibASACNgIAQeybASADNgIADA0LQeibASgCACIGRQ0BIAZBACAGa3FBAWsiACAAQQx2QRBxIgJ2IgFBBXZBCHEiACACciABIAB2IgFBAnZBBHEiAHIgASAAdiIBQQF2QQJxIgByIAEgAHYiAUEBdkEBcSIAciABIAB2akECdEGUngFqKAIAIgEoAgRBeHEgCGshAyABIQIDQAJAIAIoAhAiAEUEQCACKAIUIgBFDQELIAAoAgRBeHEgCGsiAiADIAIgA0kiAhshAyAAIAEgAhshASAAIQIMAQsLIAEgCGoiCSABTQ0CIAEoAhghCyABIAEoAgwiBEcEQCABKAIIIgBB9JsBKAIASRogACAENgIMIAQgADYCCAwMCyABQRRqIgIoAgAiAEUEQCABKAIQIgBFDQQgAUEQaiECCwNAIAIhByAAIgRBFGoiAigCACIADQAgBEEQaiECIAQoAhAiAA0ACyAHQQA2AgAMCwtBfyEIIABBv39LDQAgAEELaiIAQXhxIQhB6JsBKAIAIglFDQBBACAIayEDAkACQAJAAn9BACAIQYACSQ0AGkEfIAhB////B0sNABogAEEIdiIAIABBgP4/akEQdkEIcSICdCIAIABBgOAfakEQdkEEcSIBdCIAIABBgIAPakEQdkECcSIAdEEPdiABIAJyIAByayIAQQF0IAggAEEVanZBAXFyQRxqCyIFQQJ0QZSeAWooAgAiAkUEQEEAIQAMAQtBACEAIAhBAEEZIAVBAXZrIAVBH0YbdCEBA0ACQCACKAIEQXhxIAhrIgcgA08NACACIQQgByIDDQBBACEDIAIhAAwDCyAAIAIoAhQiByAHIAIgAUEddkEEcWooAhAiAkYbIAAgBxshACABQQF0IQEgAg0ACwsgACAEckUEQEECIAV0IgBBACAAa3IgCXEiAEUNAyAAQQAgAGtxQQFrIgAgAEEMdkEQcSICdiIBQQV2QQhxIgAgAnIgASAAdiIBQQJ2QQRxIgByIAEgAHYiAUEBdkECcSIAciABIAB2IgFBAXZBAXEiAHIgASAAdmpBAnRBlJ4BaigCACEACyAARQ0BCwNAIAAoAgRBeHEgCGsiASADSSECIAEgAyACGyEDIAAgBCACGyEEIAAoAhAiAQR/IAEFIAAoAhQLIgANAAsLIARFDQAgA0HsmwEoAgAgCGtPDQAgBCAIaiIGIARNDQEgBCgCGCEFIAQgBCgCDCIBRwRAIAQoAggiAEH0mwEoAgBJGiAAIAE2AgwgASAANgIIDAoLIARBFGoiAigCACIARQRAIAQoAhAiAEUNBCAEQRBqIQILA0AgAiEHIAAiAUEUaiICKAIAIgANACABQRBqIQIgASgCECIADQALIAdBADYCAAwJCyAIQeybASgCACICTQRAQfibASgCACEDAkAgAiAIayIBQRBPBEBB7JsBIAE2AgBB+JsBIAMgCGoiADYCACAAIAFBAXI2AgQgAiADaiABNgIAIAMgCEEDcjYCBAwBC0H4mwFBADYCAEHsmwFBADYCACADIAJBA3I2AgQgAiADaiIAIAAoAgRBAXI2AgQLIANBCGohAAwLCyAIQfCbASgCACIGSQRAQfCbASAGIAhrIgE2AgBB/JsBQfybASgCACICIAhqIgA2AgAgACABQQFyNgIEIAIgCEEDcjYCBCACQQhqIQAMCwtBACEAIAhBL2oiCQJ/QbyfASgCAARAQcSfASgCAAwBC0HInwFCfzcCAEHAnwFCgKCAgICABDcCAEG8nwEgDEEMakFwcUHYqtWqBXM2AgBB0J8BQQA2AgBBoJ8BQQA2AgBBgCALIgFqIgVBACABayIHcSICIAhNDQpBnJ8BKAIAIgQEQEGUnwEoAgAiAyACaiIBIANNDQsgASAESw0LC0GgnwEtAABBBHENBQJAAkBB/JsBKAIAIgMEQEGknwEhAANAIAMgACgCACIBTwRAIAEgACgCBGogA0sNAwsgACgCCCIADQALC0EAED4iAUF/Rg0GIAIhBUHAnwEoAgAiA0EBayIAIAFxBEAgAiABayAAIAFqQQAgA2txaiEFCyAFIAhNDQYgBUH+////B0sNBkGcnwEoAgAiBARAQZSfASgCACIDIAVqIgAgA00NByAAIARLDQcLIAUQPiIAIAFHDQEMCAsgBSAGayAHcSIFQf7///8HSw0FIAUQPiIBIAAoAgAgACgCBGpGDQQgASEACwJAIABBf0YNACAIQTBqIAVNDQBBxJ8BKAIAIgEgCSAFa2pBACABa3EiAUH+////B0sEQCAAIQEMCAsgARA+QX9HBEAgASAFaiEFIAAhAQwIC0EAIAVrED4aDAULIAAiAUF/Rw0GDAQLAAtBACEEDAcLQQAhAQwFCyABQX9HDQILQaCfAUGgnwEoAgBBBHI2AgALIAJB/v///wdLDQEgAhA+IQFBABA+IQAgAUF/Rg0BIABBf0YNASAAIAFNDQEgACABayIFIAhBKGpNDQELQZSfAUGUnwEoAgAgBWoiADYCAEGYnwEoAgAgAEkEQEGYnwEgADYCAAsCQAJAAkBB/JsBKAIAIgcEQEGknwEhAANAIAEgACgCACIDIAAoAgQiAmpGDQIgACgCCCIADQALDAILQfSbASgCACIAQQAgACABTRtFBEBB9JsBIAE2AgALQQAhAEGonwEgBTYCAEGknwEgATYCAEGEnAFBfzYCAEGInAFBvJ8BKAIANgIAQbCfAUEANgIAA0AgAEEDdCIDQZScAWogA0GMnAFqIgI2AgAgA0GYnAFqIAI2AgAgAEEBaiIAQSBHDQALQfCbASAFQShrIgNBeCABa0EHcUEAIAFBCGpBB3EbIgBrIgI2AgBB/JsBIAAgAWoiADYCACAAIAJBAXI2AgQgASADakEoNgIEQYCcAUHMnwEoAgA2AgAMAgsgAC0ADEEIcQ0AIAMgB0sNACABIAdNDQAgACACIAVqNgIEQfybASAHQXggB2tBB3FBACAHQQhqQQdxGyIAaiICNgIAQfCbAUHwmwEoAgAgBWoiASAAayIANgIAIAIgAEEBcjYCBCABIAdqQSg2AgRBgJwBQcyfASgCADYCAAwBC0H0mwEoAgAgAUsEQEH0mwEgATYCAAsgASAFaiECQaSfASEAAkACQAJAAkACQAJAA0AgAiAAKAIARwRAIAAoAggiAA0BDAILCyAALQAMQQhxRQ0BC0GknwEhAANAIAcgACgCACICTwRAIAIgACgCBGoiBCAHSw0DCyAAKAIIIQAMAAsACyAAIAE2AgAgACAAKAIEIAVqNgIEIAFBeCABa0EHcUEAIAFBCGpBB3EbaiIJIAhBA3I2AgQgAkF4IAJrQQdxQQAgAkEIakEHcRtqIgUgCCAJaiIGayECIAUgB0YEQEH8mwEgBjYCAEHwmwFB8JsBKAIAIAJqIgA2AgAgBiAAQQFyNgIEDAMLIAVB+JsBKAIARgRAQfibASAGNgIAQeybAUHsmwEoAgAgAmoiADYCACAGIABBAXI2AgQgACAGaiAANgIADAMLIAUoAgQiAEEDcUEBRgRAIABBeHEhBwJAIABB/wFNBEAgBSgCCCIDIABBA3YiAEEDdEGMnAFqRhogAyAFKAIMIgFGBEBB5JsBQeSbASgCAEF+IAB3cTYCAAwCCyADIAE2AgwgASADNgIIDAELIAUoAhghCAJAIAUgBSgCDCIBRwRAIAUoAggiACABNgIMIAEgADYCCAwBCwJAIAVBFGoiACgCACIDDQAgBUEQaiIAKAIAIgMNAEEAIQEMAQsDQCAAIQQgAyIBQRRqIgAoAgAiAw0AIAFBEGohACABKAIQIgMNAAsgBEEANgIACyAIRQ0AAkAgBSAFKAIcIgNBAnRBlJ4BaiIAKAIARgRAIAAgATYCACABDQFB6JsBQeibASgCAEF+IAN3cTYCAAwCCyAIQRBBFCAIKAIQIAVGG2ogATYCACABRQ0BCyABIAg2AhggBSgCECIABEAgASAANgIQIAAgATYCGAsgBSgCFCIARQ0AIAEgADYCFCAAIAE2AhgLIAUgB2ohBSACIAdqIQILIAUgBSgCBEF+cTYCBCAGIAJBAXI2AgQgAiAGaiACNgIAIAJB/wFNBEAgAkEDdiIAQQN0QYycAWohAgJ/QeSbASgCACIBQQEgAHQiAHFFBEBB5JsBIAAgAXI2AgAgAgwBCyACKAIICyEAIAIgBjYCCCAAIAY2AgwgBiACNgIMIAYgADYCCAwDC0EfIQAgAkH///8HTQRAIAJBCHYiACAAQYD+P2pBEHZBCHEiA3QiACAAQYDgH2pBEHZBBHEiAXQiACAAQYCAD2pBEHZBAnEiAHRBD3YgASADciAAcmsiAEEBdCACIABBFWp2QQFxckEcaiEACyAGIAA2AhwgBkIANwIQIABBAnRBlJ4BaiEEAkBB6JsBKAIAIgNBASAAdCIBcUUEQEHomwEgASADcjYCACAEIAY2AgAgBiAENgIYDAELIAJBAEEZIABBAXZrIABBH0YbdCEAIAQoAgAhAQNAIAEiAygCBEF4cSACRg0DIABBHXYhASAAQQF0IQAgAyABQQRxaiIEKAIQIgENAAsgBCAGNgIQIAYgAzYCGAsgBiAGNgIMIAYgBjYCCAwCC0HwmwEgBUEoayIDQXggAWtBB3FBACABQQhqQQdxGyIAayICNgIAQfybASAAIAFqIgA2AgAgACACQQFyNgIEIAEgA2pBKDYCBEGAnAFBzJ8BKAIANgIAIAcgBEEnIARrQQdxQQAgBEEna0EHcRtqQS9rIgAgACAHQRBqSRsiAkEbNgIEIAJBrJ8BKQIANwIQIAJBpJ8BKQIANwIIQayfASACQQhqNgIAQaifASAFNgIAQaSfASABNgIAQbCfAUEANgIAIAJBGGohAANAIABBBzYCBCAAQQhqIQEgAEEEaiEAIAEgBEkNAAsgAiAHRg0DIAIgAigCBEF+cTYCBCAHIAIgB2siBEEBcjYCBCACIAQ2AgAgBEH/AU0EQCAEQQN2IgBBA3RBjJwBaiECAn9B5JsBKAIAIgFBASAAdCIAcUUEQEHkmwEgACABcjYCACACDAELIAIoAggLIQAgAiAHNgIIIAAgBzYCDCAHIAI2AgwgByAANgIIDAQLQR8hACAHQgA3AhAgBEH///8HTQRAIARBCHYiACAAQYD+P2pBEHZBCHEiAnQiACAAQYDgH2pBEHZBBHEiAXQiACAAQYCAD2pBEHZBAnEiAHRBD3YgASACciAAcmsiAEEBdCAEIABBFWp2QQFxckEcaiEACyAHIAA2AhwgAEECdEGUngFqIQMCQEHomwEoAgAiAkEBIAB0IgFxRQRAQeibASABIAJyNgIAIAMgBzYCACAHIAM2AhgMAQsgBEEAQRkgAEEBdmsgAEEfRht0IQAgAygCACEBA0AgASICKAIEQXhxIARGDQQgAEEddiEBIABBAXQhACACIAFBBHFqIgMoAhAiAQ0ACyADIAc2AhAgByACNgIYCyAHIAc2AgwgByAHNgIIDAMLIAMoAggiACAGNgIMIAMgBjYCCCAGQQA2AhggBiADNgIMIAYgADYCCAsgCUEIaiEADAULIAIoAggiACAHNgIMIAIgBzYCCCAHQQA2AhggByACNgIMIAcgADYCCAtB8JsBKAIAIgAgCE0NAEHwmwEgACAIayIBNgIAQfybAUH8mwEoAgAiAiAIaiIANgIAIAAgAUEBcjYCBCACIAhBA3I2AgQgAkEIaiEADAMLQbSbAUEwNgIAQQAhAAwCCwJAIAVFDQACQCAEKAIcIgJBAnRBlJ4BaiIAKAIAIARGBEAgACABNgIAIAENAUHomwEgCUF+IAJ3cSIJNgIADAILIAVBEEEUIAUoAhAgBEYbaiABNgIAIAFFDQELIAEgBTYCGCAEKAIQIgAEQCABIAA2AhAgACABNgIYCyAEKAIUIgBFDQAgASAANgIUIAAgATYCGAsCQCADQQ9NBEAgBCADIAhqIgBBA3I2AgQgACAEaiIAIAAoAgRBAXI2AgQMAQsgBCAIQQNyNgIEIAYgA0EBcjYCBCADIAZqIAM2AgAgA0H/AU0EQCADQQN2IgBBA3RBjJwBaiECAn9B5JsBKAIAIgFBASAAdCIAcUUEQEHkmwEgACABcjYCACACDAELIAIoAggLIQAgAiAGNgIIIAAgBjYCDCAGIAI2AgwgBiAANgIIDAELQR8hACADQf///wdNBEAgA0EIdiIAIABBgP4/akEQdkEIcSICdCIAIABBgOAfakEQdkEEcSIBdCIAIABBgIAPakEQdkECcSIAdEEPdiABIAJyIAByayIAQQF0IAMgAEEVanZBAXFyQRxqIQALIAYgADYCHCAGQgA3AhAgAEECdEGUngFqIQICQAJAIAlBASAAdCIBcUUEQEHomwEgASAJcjYCACACIAY2AgAgBiACNgIYDAELIANBAEEZIABBAXZrIABBH0YbdCEAIAIoAgAhCANAIAgiASgCBEF4cSADRg0CIABBHXYhAiAAQQF0IQAgASACQQRxaiICKAIQIggNAAsgAiAGNgIQIAYgATYCGAsgBiAGNgIMIAYgBjYCCAwBCyABKAIIIgAgBjYCDCABIAY2AgggBkEANgIYIAYgATYCDCAGIAA2AggLIARBCGohAAwBCwJAIAtFDQACQCABKAIcIgJBAnRBlJ4BaiIAKAIAIAFGBEAgACAENgIAIAQNAUHomwEgBkF+IAJ3cTYCAAwCCyALQRBBFCALKAIQIAFGG2ogBDYCACAERQ0BCyAEIAs2AhggASgCECIABEAgBCAANgIQIAAgBDYCGAsgASgCFCIARQ0AIAQgADYCFCAAIAQ2AhgLAkAgA0EPTQRAIAEgAyAIaiIAQQNyNgIEIAAgAWoiACAAKAIEQQFyNgIEDAELIAEgCEEDcjYCBCAJIANBAXI2AgQgAyAJaiADNgIAIAoEQCAKQQN2IgBBA3RBjJwBaiEEQfibASgCACECAn9BASAAdCIAIAVxRQRAQeSbASAAIAVyNgIAIAQMAQsgBCgCCAshACAEIAI2AgggACACNgIMIAIgBDYCDCACIAA2AggLQfibASAJNgIAQeybASADNgIACyABQQhqIQALIAxBEGokACAAC4MEAQN/IAJBgARPBEAgACABIAIQCxogAA8LIAAgAmohAwJAIAAgAXNBA3FFBEACQCAAQQNxRQRAIAAhAgwBCyACQQFIBEAgACECDAELIAAhAgNAIAIgAS0AADoAACABQQFqIQEgAkEBaiICQQNxRQ0BIAIgA0kNAAsLAkAgA0F8cSIEQcAASQ0AIAIgBEFAaiIFSw0AA0AgAiABKAIANgIAIAIgASgCBDYCBCACIAEoAgg2AgggAiABKAIMNgIMIAIgASgCEDYCECACIAEoAhQ2AhQgAiABKAIYNgIYIAIgASgCHDYCHCACIAEoAiA2AiAgAiABKAIkNgIkIAIgASgCKDYCKCACIAEoAiw2AiwgAiABKAIwNgIwIAIgASgCNDYCNCACIAEoAjg2AjggAiABKAI8NgI8IAFBQGshASACQUBrIgIgBU0NAAsLIAIgBE8NAQNAIAIgASgCADYCACABQQRqIQEgAkEEaiICIARJDQALDAELIANBBEkEQCAAIQIMAQsgACADQQRrIgRLBEAgACECDAELIAAhAgNAIAIgAS0AADoAACACIAEtAAE6AAEgAiABLQACOgACIAIgAS0AAzoAAyABQQRqIQEgAkEEaiICIARNDQALCyACIANJBEADQCACIAEtAAA6AAAgAUEBaiEBIAJBAWoiAiADRw0ACwsgAAvBGAECfyMAQRBrIgQkACAEIAA2AgwgBCABNgIIIAQgAjYCBCAEKAIMIQAgBCgCCCECIAQoAgQhAyMAQSBrIgEkACABIAA2AhggASACNgIUIAEgAzYCEAJAIAEoAhRFBEAgAUEANgIcDAELIAFBATYCDCABLQAMBEAgASgCFCECIAEoAhAhAyMAQSBrIgAgASgCGDYCHCAAIAI2AhggACADNgIUIAAgACgCHDYCECAAIAAoAhBBf3M2AhADQCAAKAIUBH8gACgCGEEDcUEARwVBAAtBAXEEQCAAKAIQIQIgACAAKAIYIgNBAWo2AhggACADLQAAIAJzQf8BcUECdEGgGWooAgAgACgCEEEIdnM2AhAgACAAKAIUQQFrNgIUDAELCyAAIAAoAhg2AgwDQCAAKAIUQSBPBEAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGgGWooAgAgACgCEEEQdkH/AXFBAnRBoCFqKAIAIAAoAhBB/wFxQQJ0QaAxaigCACAAKAIQQQh2Qf8BcUECdEGgKWooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGgGWooAgAgACgCEEEQdkH/AXFBAnRBoCFqKAIAIAAoAhBB/wFxQQJ0QaAxaigCACAAKAIQQQh2Qf8BcUECdEGgKWooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGgGWooAgAgACgCEEEQdkH/AXFBAnRBoCFqKAIAIAAoAhBB/wFxQQJ0QaAxaigCACAAKAIQQQh2Qf8BcUECdEGgKWooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGgGWooAgAgACgCEEEQdkH/AXFBAnRBoCFqKAIAIAAoAhBB/wFxQQJ0QaAxaigCACAAKAIQQQh2Qf8BcUECdEGgKWooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGgGWooAgAgACgCEEEQdkH/AXFBAnRBoCFqKAIAIAAoAhBB/wFxQQJ0QaAxaigCACAAKAIQQQh2Qf8BcUECdEGgKWooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGgGWooAgAgACgCEEEQdkH/AXFBAnRBoCFqKAIAIAAoAhBB/wFxQQJ0QaAxaigCACAAKAIQQQh2Qf8BcUECdEGgKWooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGgGWooAgAgACgCEEEQdkH/AXFBAnRBoCFqKAIAIAAoAhBB/wFxQQJ0QaAxaigCACAAKAIQQQh2Qf8BcUECdEGgKWooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGgGWooAgAgACgCEEEQdkH/AXFBAnRBoCFqKAIAIAAoAhBB/wFxQQJ0QaAxaigCACAAKAIQQQh2Qf8BcUECdEGgKWooAgBzc3M2AhAgACAAKAIUQSBrNgIUDAELCwNAIAAoAhRBBE8EQCAAIAAoAgwiAkEEajYCDCAAIAIoAgAgACgCEHM2AhAgACAAKAIQQRh2QQJ0QaAZaigCACAAKAIQQRB2Qf8BcUECdEGgIWooAgAgACgCEEH/AXFBAnRBoDFqKAIAIAAoAhBBCHZB/wFxQQJ0QaApaigCAHNzczYCECAAIAAoAhRBBGs2AhQMAQsLIAAgACgCDDYCGCAAKAIUBEADQCAAKAIQIQIgACAAKAIYIgNBAWo2AhggACADLQAAIAJzQf8BcUECdEGgGWooAgAgACgCEEEIdnM2AhAgACAAKAIUQQFrIgI2AhQgAg0ACwsgACAAKAIQQX9zNgIQIAEgACgCEDYCHAwBCyABKAIUIQIgASgCECEDIwBBIGsiACABKAIYNgIcIAAgAjYCGCAAIAM2AhQgACAAKAIcQQh2QYD+A3EgACgCHEEYdmogACgCHEGA/gNxQQh0aiAAKAIcQf8BcUEYdGo2AhAgACAAKAIQQX9zNgIQA0AgACgCFAR/IAAoAhhBA3FBAEcFQQALQQFxBEAgACgCEEEYdiECIAAgACgCGCIDQQFqNgIYIAAgAy0AACACc0ECdEGgOWooAgAgACgCEEEIdHM2AhAgACAAKAIUQQFrNgIUDAELCyAAIAAoAhg2AgwDQCAAKAIUQSBPBEAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGg0QBqKAIAIAAoAhBBEHZB/wFxQQJ0QaDJAGooAgAgACgCEEH/AXFBAnRBoDlqKAIAIAAoAhBBCHZB/wFxQQJ0QaDBAGooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGg0QBqKAIAIAAoAhBBEHZB/wFxQQJ0QaDJAGooAgAgACgCEEH/AXFBAnRBoDlqKAIAIAAoAhBBCHZB/wFxQQJ0QaDBAGooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGg0QBqKAIAIAAoAhBBEHZB/wFxQQJ0QaDJAGooAgAgACgCEEH/AXFBAnRBoDlqKAIAIAAoAhBBCHZB/wFxQQJ0QaDBAGooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGg0QBqKAIAIAAoAhBBEHZB/wFxQQJ0QaDJAGooAgAgACgCEEH/AXFBAnRBoDlqKAIAIAAoAhBBCHZB/wFxQQJ0QaDBAGooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGg0QBqKAIAIAAoAhBBEHZB/wFxQQJ0QaDJAGooAgAgACgCEEH/AXFBAnRBoDlqKAIAIAAoAhBBCHZB/wFxQQJ0QaDBAGooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGg0QBqKAIAIAAoAhBBEHZB/wFxQQJ0QaDJAGooAgAgACgCEEH/AXFBAnRBoDlqKAIAIAAoAhBBCHZB/wFxQQJ0QaDBAGooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGg0QBqKAIAIAAoAhBBEHZB/wFxQQJ0QaDJAGooAgAgACgCEEH/AXFBAnRBoDlqKAIAIAAoAhBBCHZB/wFxQQJ0QaDBAGooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGg0QBqKAIAIAAoAhBBEHZB/wFxQQJ0QaDJAGooAgAgACgCEEH/AXFBAnRBoDlqKAIAIAAoAhBBCHZB/wFxQQJ0QaDBAGooAgBzc3M2AhAgACAAKAIUQSBrNgIUDAELCwNAIAAoAhRBBE8EQCAAIAAoAgwiAkEEajYCDCAAIAIoAgAgACgCEHM2AhAgACAAKAIQQRh2QQJ0QaDRAGooAgAgACgCEEEQdkH/AXFBAnRBoMkAaigCACAAKAIQQf8BcUECdEGgOWooAgAgACgCEEEIdkH/AXFBAnRBoMEAaigCAHNzczYCECAAIAAoAhRBBGs2AhQMAQsLIAAgACgCDDYCGCAAKAIUBEADQCAAKAIQQRh2IQIgACAAKAIYIgNBAWo2AhggACADLQAAIAJzQQJ0QaA5aigCACAAKAIQQQh0czYCECAAIAAoAhRBAWsiAjYCFCACDQALCyAAIAAoAhBBf3M2AhAgASAAKAIQQQh2QYD+A3EgACgCEEEYdmogACgCEEGA/gNxQQh0aiAAKAIQQf8BcUEYdGo2AhwLIAEoAhwhACABQSBqJAAgBEEQaiQAIAAL7AIBAn8jAEEQayIBJAAgASAANgIMAkAgASgCDEUNACABKAIMKAIwBEAgASgCDCIAIAAoAjBBAWs2AjALIAEoAgwoAjANACABKAIMKAIgBEAgASgCDEEBNgIgIAEoAgwQLxoLIAEoAgwoAiRBAUYEQCABKAIMEGILAkAgASgCDCgCLEUNACABKAIMLQAoQQFxDQAgASgCDCECIwBBEGsiACABKAIMKAIsNgIMIAAgAjYCCCAAQQA2AgQDQCAAKAIEIAAoAgwoAkRJBEAgACgCDCgCTCAAKAIEQQJ0aigCACAAKAIIRgRAIAAoAgwoAkwgACgCBEECdGogACgCDCgCTCAAKAIMKAJEQQFrQQJ0aigCADYCACAAKAIMIgAgACgCREEBazYCRAUgACAAKAIEQQFqNgIEDAILCwsLIAEoAgxBAEIAQQUQIBogASgCDCgCAARAIAEoAgwoAgAQGwsgASgCDBAVCyABQRBqJAALnwIBAn8jAEEQayIBJAAgASAANgIMIAEgASgCDCgCHDYCBCABKAIEIQIjAEEQayIAJAAgACACNgIMIAAoAgwQvAEgAEEQaiQAIAEgASgCBCgCFDYCCCABKAIIIAEoAgwoAhBLBEAgASABKAIMKAIQNgIICwJAIAEoAghFDQAgASgCDCgCDCABKAIEKAIQIAEoAggQGRogASgCDCIAIAEoAgggACgCDGo2AgwgASgCBCIAIAEoAgggACgCEGo2AhAgASgCDCIAIAEoAgggACgCFGo2AhQgASgCDCIAIAAoAhAgASgCCGs2AhAgASgCBCIAIAAoAhQgASgCCGs2AhQgASgCBCgCFA0AIAEoAgQgASgCBCgCCDYCEAsgAUEQaiQAC2ABAX8jAEEQayIBJAAgASAANgIIIAEgASgCCEICEB42AgQCQCABKAIERQRAIAFBADsBDgwBCyABIAEoAgQtAAAgASgCBC0AAUEIdGo7AQ4LIAEvAQ4hACABQRBqJAAgAAvpAQEBfyMAQSBrIgIkACACIAA2AhwgAiABNwMQIAIpAxAhASMAQSBrIgAgAigCHDYCGCAAIAE3AxACQAJAAkAgACgCGC0AAEEBcUUNACAAKQMQIAAoAhgpAxAgACkDEHxWDQAgACgCGCkDCCAAKAIYKQMQIAApAxB8Wg0BCyAAKAIYQQA6AAAgAEEANgIcDAELIAAgACgCGCgCBCAAKAIYKQMQp2o2AgwgACAAKAIMNgIcCyACIAAoAhw2AgwgAigCDARAIAIoAhwiACACKQMQIAApAxB8NwMQCyACKAIMIQAgAkEgaiQAIAALbwEBfyMAQRBrIgIkACACIAA2AgggAiABOwEGIAIgAigCCEICEB42AgACQCACKAIARQRAIAJBfzYCDAwBCyACKAIAIAIvAQY6AAAgAigCACACLwEGQQh2OgABIAJBADYCDAsgAigCDBogAkEQaiQAC7YCAQF/IwBBMGsiBCQAIAQgADYCJCAEIAE2AiAgBCACNwMYIAQgAzYCFAJAIAQoAiQpAxhCASAEKAIUrYaDUARAIAQoAiRBDGpBHEEAEBQgBEJ/NwMoDAELAkAgBCgCJCgCAEUEQCAEIAQoAiQoAgggBCgCICAEKQMYIAQoAhQgBCgCJCgCBBEOADcDCAwBCyAEIAQoAiQoAgAgBCgCJCgCCCAEKAIgIAQpAxggBCgCFCAEKAIkKAIEEQoANwMICyAEKQMIQgBTBEACQCAEKAIUQQRGDQAgBCgCFEEORg0AAkAgBCgCJCAEQghBBBAgQgBTBEAgBCgCJEEMakEUQQAQFAwBCyAEKAIkQQxqIAQoAgAgBCgCBBAUCwsLIAQgBCkDCDcDKAsgBCkDKCECIARBMGokACACC48BAQF/IwBBEGsiAiQAIAIgADYCCCACIAE2AgQgAiACKAIIQgQQHjYCAAJAIAIoAgBFBEAgAkF/NgIMDAELIAIoAgAgAigCBDoAACACKAIAIAIoAgRBCHY6AAEgAigCACACKAIEQRB2OgACIAIoAgAgAigCBEEYdjoAAyACQQA2AgwLIAIoAgwaIAJBEGokAAsXACAALQAAQSBxRQRAIAEgAiAAEHEaCwtQAQF/IwBBEGsiASQAIAEgADYCDANAIAEoAgwEQCABIAEoAgwoAgA2AgggASgCDCgCDBAVIAEoAgwQFSABIAEoAgg2AgwMAQsLIAFBEGokAAs+AQF/IwBBEGsiASQAIAEgADYCDCABKAIMBEAgASgCDCgCABAVIAEoAgwoAgwQFSABKAIMEBULIAFBEGokAAt9AQF/IwBBEGsiASQAIAEgADYCDCABKAIMBEAgAUIANwMAA0AgASkDACABKAIMKQMIWkUEQCABKAIMKAIAIAEpAwCnQQR0ahB3IAEgASkDAEIBfDcDAAwBCwsgASgCDCgCABAVIAEoAgwoAigQJCABKAIMEBULIAFBEGokAAtuAQF/IwBBgAJrIgUkAAJAIARBgMAEcQ0AIAIgA0wNACAFIAFB/wFxIAIgA2siAkGAAiACQYACSSIBGxAzIAFFBEADQCAAIAVBgAIQIiACQYACayICQf8BSw0ACwsgACAFIAIQIgsgBUGAAmokAAvRAQEBfyMAQTBrIgMkACADIAA2AiggAyABNwMgIAMgAjYCHAJAIAMoAigtAChBAXEEQCADQX82AiwMAQsCQCADKAIoKAIgBEAgAygCHEUNASADKAIcQQFGDQEgAygCHEECRg0BCyADKAIoQQxqQRJBABAUIANBfzYCLAwBCyADIAMpAyA3AwggAyADKAIcNgIQIAMoAiggA0EIakIQQQYQIEIAUwRAIANBfzYCLAwBCyADKAIoQQA6ADQgA0EANgIsCyADKAIsIQAgA0EwaiQAIAALmBcBAn8jAEEwayIEJAAgBCAANgIsIAQgATYCKCAEIAI2AiQgBCADNgIgIARBADYCFAJAIAQoAiwoAoQBQQBKBEAgBCgCLCgCACgCLEECRgRAIwBBEGsiACAEKAIsNgIIIABB/4D/n382AgQgAEEANgIAAkADQCAAKAIAQR9MBEACQCAAKAIEQQFxRQ0AIAAoAghBlAFqIAAoAgBBAnRqLwEARQ0AIABBADYCDAwDCyAAIAAoAgBBAWo2AgAgACAAKAIEQQF2NgIEDAELCwJAAkAgACgCCC8BuAENACAAKAIILwG8AQ0AIAAoAggvAcgBRQ0BCyAAQQE2AgwMAQsgAEEgNgIAA0AgACgCAEGAAkgEQCAAKAIIQZQBaiAAKAIAQQJ0ai8BAARAIABBATYCDAwDBSAAIAAoAgBBAWo2AgAMAgsACwsgAEEANgIMCyAAKAIMIQAgBCgCLCgCACAANgIsCyAEKAIsIAQoAixBmBZqEHogBCgCLCAEKAIsQaQWahB6IAQoAiwhASMAQRBrIgAkACAAIAE2AgwgACgCDCAAKAIMQZQBaiAAKAIMKAKcFhC6ASAAKAIMIAAoAgxBiBNqIAAoAgwoAqgWELoBIAAoAgwgACgCDEGwFmoQeiAAQRI2AggDQAJAIAAoAghBA0gNACAAKAIMQfwUaiAAKAIILQDgbEECdGovAQINACAAIAAoAghBAWs2AggMAQsLIAAoAgwiASABKAKoLSAAKAIIQQNsQRFqajYCqC0gACgCCCEBIABBEGokACAEIAE2AhQgBCAEKAIsKAKoLUEKakEDdjYCHCAEIAQoAiwoAqwtQQpqQQN2NgIYIAQoAhggBCgCHE0EQCAEIAQoAhg2AhwLDAELIAQgBCgCJEEFaiIANgIYIAQgADYCHAsCQAJAIAQoAhwgBCgCJEEEakkNACAEKAIoRQ0AIAQoAiwgBCgCKCAEKAIkIAQoAiAQXQwBCwJAAkAgBCgCLCgCiAFBBEcEQCAEKAIYIAQoAhxHDQELIARBAzYCEAJAIAQoAiwoArwtQRAgBCgCEGtKBEAgBCAEKAIgQQJqNgIMIAQoAiwiACAALwG4LSAEKAIMQf//A3EgBCgCLCgCvC10cjsBuC0gBCgCLC8BuC1B/wFxIQEgBCgCLCgCCCECIAQoAiwiAygCFCEAIAMgAEEBajYCFCAAIAJqIAE6AAAgBCgCLC8BuC1BCHYhASAEKAIsKAIIIQIgBCgCLCIDKAIUIQAgAyAAQQFqNgIUIAAgAmogAToAACAEKAIsIAQoAgxB//8DcUEQIAQoAiwoArwta3U7AbgtIAQoAiwiACAAKAK8LSAEKAIQQRBrajYCvC0MAQsgBCgCLCIAIAAvAbgtIAQoAiBBAmpB//8DcSAEKAIsKAK8LXRyOwG4LSAEKAIsIgAgBCgCECAAKAK8LWo2ArwtCyAEKAIsQZDgAEGQ6QAQuwEMAQsgBEEDNgIIAkAgBCgCLCgCvC1BECAEKAIIa0oEQCAEIAQoAiBBBGo2AgQgBCgCLCIAIAAvAbgtIAQoAgRB//8DcSAEKAIsKAK8LXRyOwG4LSAEKAIsLwG4LUH/AXEhASAEKAIsKAIIIQIgBCgCLCIDKAIUIQAgAyAAQQFqNgIUIAAgAmogAToAACAEKAIsLwG4LUEIdiEBIAQoAiwoAgghAiAEKAIsIgMoAhQhACADIABBAWo2AhQgACACaiABOgAAIAQoAiwgBCgCBEH//wNxQRAgBCgCLCgCvC1rdTsBuC0gBCgCLCIAIAAoArwtIAQoAghBEGtqNgK8LQwBCyAEKAIsIgAgAC8BuC0gBCgCIEEEakH//wNxIAQoAiwoArwtdHI7AbgtIAQoAiwiACAEKAIIIAAoArwtajYCvC0LIAQoAiwhASAEKAIsKAKcFkEBaiECIAQoAiwoAqgWQQFqIQMgBCgCFEEBaiEFIwBBQGoiACQAIAAgATYCPCAAIAI2AjggACADNgI0IAAgBTYCMCAAQQU2AigCQCAAKAI8KAK8LUEQIAAoAihrSgRAIAAgACgCOEGBAms2AiQgACgCPCIBIAEvAbgtIAAoAiRB//8DcSAAKAI8KAK8LXRyOwG4LSAAKAI8LwG4LUH/AXEhAiAAKAI8KAIIIQMgACgCPCIFKAIUIQEgBSABQQFqNgIUIAEgA2ogAjoAACAAKAI8LwG4LUEIdiECIAAoAjwoAgghAyAAKAI8IgUoAhQhASAFIAFBAWo2AhQgASADaiACOgAAIAAoAjwgACgCJEH//wNxQRAgACgCPCgCvC1rdTsBuC0gACgCPCIBIAEoArwtIAAoAihBEGtqNgK8LQwBCyAAKAI8IgEgAS8BuC0gACgCOEGBAmtB//8DcSAAKAI8KAK8LXRyOwG4LSAAKAI8IgEgACgCKCABKAK8LWo2ArwtCyAAQQU2AiACQCAAKAI8KAK8LUEQIAAoAiBrSgRAIAAgACgCNEEBazYCHCAAKAI8IgEgAS8BuC0gACgCHEH//wNxIAAoAjwoArwtdHI7AbgtIAAoAjwvAbgtQf8BcSECIAAoAjwoAgghAyAAKAI8IgUoAhQhASAFIAFBAWo2AhQgASADaiACOgAAIAAoAjwvAbgtQQh2IQIgACgCPCgCCCEDIAAoAjwiBSgCFCEBIAUgAUEBajYCFCABIANqIAI6AAAgACgCPCAAKAIcQf//A3FBECAAKAI8KAK8LWt1OwG4LSAAKAI8IgEgASgCvC0gACgCIEEQa2o2ArwtDAELIAAoAjwiASABLwG4LSAAKAI0QQFrQf//A3EgACgCPCgCvC10cjsBuC0gACgCPCIBIAAoAiAgASgCvC1qNgK8LQsgAEEENgIYAkAgACgCPCgCvC1BECAAKAIYa0oEQCAAIAAoAjBBBGs2AhQgACgCPCIBIAEvAbgtIAAoAhRB//8DcSAAKAI8KAK8LXRyOwG4LSAAKAI8LwG4LUH/AXEhAiAAKAI8KAIIIQMgACgCPCIFKAIUIQEgBSABQQFqNgIUIAEgA2ogAjoAACAAKAI8LwG4LUEIdiECIAAoAjwoAgghAyAAKAI8IgUoAhQhASAFIAFBAWo2AhQgASADaiACOgAAIAAoAjwgACgCFEH//wNxQRAgACgCPCgCvC1rdTsBuC0gACgCPCIBIAEoArwtIAAoAhhBEGtqNgK8LQwBCyAAKAI8IgEgAS8BuC0gACgCMEEEa0H//wNxIAAoAjwoArwtdHI7AbgtIAAoAjwiASAAKAIYIAEoArwtajYCvC0LIABBADYCLANAIAAoAiwgACgCMEgEQCAAQQM2AhACQCAAKAI8KAK8LUEQIAAoAhBrSgRAIAAgACgCPEH8FGogACgCLC0A4GxBAnRqLwECNgIMIAAoAjwiASABLwG4LSAAKAIMQf//A3EgACgCPCgCvC10cjsBuC0gACgCPC8BuC1B/wFxIQIgACgCPCgCCCEDIAAoAjwiBSgCFCEBIAUgAUEBajYCFCABIANqIAI6AAAgACgCPC8BuC1BCHYhAiAAKAI8KAIIIQMgACgCPCIFKAIUIQEgBSABQQFqNgIUIAEgA2ogAjoAACAAKAI8IAAoAgxB//8DcUEQIAAoAjwoArwta3U7AbgtIAAoAjwiASABKAK8LSAAKAIQQRBrajYCvC0MAQsgACgCPCIBIAEvAbgtIAAoAjxB/BRqIAAoAiwtAOBsQQJ0ai8BAiAAKAI8KAK8LXRyOwG4LSAAKAI8IgEgACgCECABKAK8LWo2ArwtCyAAIAAoAixBAWo2AiwMAQsLIAAoAjwgACgCPEGUAWogACgCOEEBaxC5ASAAKAI8IAAoAjxBiBNqIAAoAjRBAWsQuQEgAEFAayQAIAQoAiwgBCgCLEGUAWogBCgCLEGIE2oQuwELCyAEKAIsEL4BIAQoAiAEQCAEKAIsEL0BCyAEQTBqJAAL1AEBAX8jAEEgayICJAAgAiAANgIYIAIgATcDECACIAIoAhhFOgAPAkAgAigCGEUEQCACIAIpAxCnEBgiADYCGCAARQRAIAJBADYCHAwCCwsgAkEYEBgiADYCCCAARQRAIAItAA9BAXEEQCACKAIYEBULIAJBADYCHAwBCyACKAIIQQE6AAAgAigCCCACKAIYNgIEIAIoAgggAikDEDcDCCACKAIIQgA3AxAgAigCCCACLQAPQQFxOgABIAIgAigCCDYCHAsgAigCHCEAIAJBIGokACAAC3gBAX8jAEEQayIBJAAgASAANgIIIAEgASgCCEIEEB42AgQCQCABKAIERQRAIAFBADYCDAwBCyABIAEoAgQtAAAgASgCBC0AASABKAIELQACIAEoAgQtAANBCHRqQQh0akEIdGo2AgwLIAEoAgwhACABQRBqJAAgAAuHAwEBfyMAQTBrIgMkACADIAA2AiQgAyABNgIgIAMgAjcDGAJAIAMoAiQtAChBAXEEQCADQn83AygMAQsCQAJAIAMoAiQoAiBFDQAgAykDGEL///////////8AVg0AIAMpAxhQDQEgAygCIA0BCyADKAIkQQxqQRJBABAUIANCfzcDKAwBCyADKAIkLQA1QQFxBEAgA0J/NwMoDAELAn8jAEEQayIAIAMoAiQ2AgwgACgCDC0ANEEBcQsEQCADQgA3AygMAQsgAykDGFAEQCADQgA3AygMAQsgA0IANwMQA0AgAykDECADKQMYVARAIAMgAygCJCADKAIgIAMpAxCnaiADKQMYIAMpAxB9QQEQICICNwMIIAJCAFMEQCADKAIkQQE6ADUgAykDEFAEQCADQn83AygMBAsgAyADKQMQNwMoDAMLIAMpAwhQBEAgAygCJEEBOgA0BSADIAMpAwggAykDEHw3AxAMAgsLCyADIAMpAxA3AygLIAMpAyghAiADQTBqJAAgAgthAQF/IwBBEGsiAiAANgIIIAIgATcDAAJAIAIpAwAgAigCCCkDCFYEQCACKAIIQQA6AAAgAkF/NgIMDAELIAIoAghBAToAACACKAIIIAIpAwA3AxAgAkEANgIMCyACKAIMC+8BAQF/IwBBIGsiAiQAIAIgADYCGCACIAE3AxAgAiACKAIYQggQHjYCDAJAIAIoAgxFBEAgAkF/NgIcDAELIAIoAgwgAikDEEL/AYM8AAAgAigCDCACKQMQQgiIQv8BgzwAASACKAIMIAIpAxBCEIhC/wGDPAACIAIoAgwgAikDEEIYiEL/AYM8AAMgAigCDCACKQMQQiCIQv8BgzwABCACKAIMIAIpAxBCKIhC/wGDPAAFIAIoAgwgAikDEEIwiEL/AYM8AAYgAigCDCACKQMQQjiIQv8BgzwAByACQQA2AhwLIAIoAhwaIAJBIGokAAt/AQN/IAAhAQJAIABBA3EEQANAIAEtAABFDQIgAUEBaiIBQQNxDQALCwNAIAEiAkEEaiEBIAIoAgAiA0F/cyADQYGChAhrcUGAgYKEeHFFDQALIANB/wFxRQRAIAIgAGsPCwNAIAItAAEhAyACQQFqIgEhAiADDQALCyABIABrC6YBAQF/IwBBEGsiASQAIAEgADYCCAJAIAEoAggoAiBFBEAgASgCCEEMakESQQAQFCABQX82AgwMAQsgASgCCCIAIAAoAiBBAWs2AiAgASgCCCgCIEUEQCABKAIIQQBCAEECECAaIAEoAggoAgAEQCABKAIIKAIAEC9BAEgEQCABKAIIQQxqQRRBABAUCwsLIAFBADYCDAsgASgCDCEAIAFBEGokACAACzYBAX8jAEEQayIBIAA2AgwCfiABKAIMLQAAQQFxBEAgASgCDCkDCCABKAIMKQMQfQwBC0IACwuyAQIBfwF+IwBBEGsiASQAIAEgADYCBCABIAEoAgRCCBAeNgIAAkAgASgCAEUEQCABQgA3AwgMAQsgASABKAIALQAArSABKAIALQAHrUI4hiABKAIALQAGrUIwhnwgASgCAC0ABa1CKIZ8IAEoAgAtAAStQiCGfCABKAIALQADrUIYhnwgASgCAC0AAq1CEIZ8IAEoAgAtAAGtQgiGfHw3AwgLIAEpAwghAiABQRBqJAAgAgvcAQEBfyMAQRBrIgEkACABIAA2AgwgASgCDARAIAEoAgwoAigEQCABKAIMKAIoQQA2AiggASgCDCgCKEIANwMgIAEoAgwCfiABKAIMKQMYIAEoAgwpAyBWBEAgASgCDCkDGAwBCyABKAIMKQMgCzcDGAsgASABKAIMKQMYNwMAA0AgASkDACABKAIMKQMIWkUEQCABKAIMKAIAIAEpAwCnQQR0aigCABAVIAEgASkDAEIBfDcDAAwBCwsgASgCDCgCABAVIAEoAgwoAgQQFSABKAIMEBULIAFBEGokAAvwAgICfwF+AkAgAkUNACAAIAJqIgNBAWsgAToAACAAIAE6AAAgAkEDSQ0AIANBAmsgAToAACAAIAE6AAEgA0EDayABOgAAIAAgAToAAiACQQdJDQAgA0EEayABOgAAIAAgAToAAyACQQlJDQAgAEEAIABrQQNxIgRqIgMgAUH/AXFBgYKECGwiADYCACADIAIgBGtBfHEiAmoiAUEEayAANgIAIAJBCUkNACADIAA2AgggAyAANgIEIAFBCGsgADYCACABQQxrIAA2AgAgAkEZSQ0AIAMgADYCGCADIAA2AhQgAyAANgIQIAMgADYCDCABQRBrIAA2AgAgAUEUayAANgIAIAFBGGsgADYCACABQRxrIAA2AgAgAiADQQRxQRhyIgFrIgJBIEkNACAArUKBgICAEH4hBSABIANqIQEDQCABIAU3AxggASAFNwMQIAEgBTcDCCABIAU3AwAgAUEgaiEBIAJBIGsiAkEfSw0ACwsLawEBfyMAQSBrIgIgADYCHCACQgEgAigCHK2GNwMQIAJBDGogATYCAANAIAIgAigCDCIAQQRqNgIMIAIgACgCADYCCCACKAIIQQBIRQRAIAIgAikDEEIBIAIoAgithoQ3AxAMAQsLIAIpAxALYAIBfwF+IwBBEGsiASQAIAEgADYCBAJAIAEoAgQoAiRBAUcEQCABKAIEQQxqQRJBABAUIAFCfzcDCAwBCyABIAEoAgRBAEIAQQ0QIDcDCAsgASkDCCECIAFBEGokACACC6UCAQJ/IwBBIGsiAyQAIAMgADYCGCADIAE2AhQgAyACNwMIIAMoAhgoAgAhASADKAIUIQQgAykDCCECIwBBIGsiACQAIAAgATYCFCAAIAQ2AhAgACACNwMIAkACQCAAKAIUKAIkQQFGBEAgACkDCEL///////////8AWA0BCyAAKAIUQQxqQRJBABAUIABCfzcDGAwBCyAAIAAoAhQgACgCECAAKQMIQQsQIDcDGAsgACkDGCECIABBIGokACADIAI3AwACQCACQgBTBEAgAygCGEEIaiADKAIYKAIAEBcgA0F/NgIcDAELIAMpAwAgAykDCFIEQCADKAIYQQhqQQZBGxAUIANBfzYCHAwBCyADQQA2AhwLIAMoAhwhACADQSBqJAAgAAsxAQF/IwBBEGsiASQAIAEgADYCDCABKAIMBEAgASgCDBBSIAEoAgwQFQsgAUEQaiQACy8BAX8jAEEQayIBJAAgASAANgIMIAEoAgwoAggQFSABKAIMQQA2AgggAUEQaiQAC80BAQF/IwBBEGsiAiQAIAIgADYCCCACIAE2AgQCQCACKAIILQAoQQFxBEAgAkF/NgIMDAELIAIoAgRFBEAgAigCCEEMakESQQAQFCACQX82AgwMAQsgAigCBBA7IAIoAggoAgAEQCACKAIIKAIAIAIoAgQQOUEASARAIAIoAghBDGogAigCCCgCABAXIAJBfzYCDAwCCwsgAigCCCACKAIEQjhBAxAgQgBTBEAgAkF/NgIMDAELIAJBADYCDAsgAigCDCEAIAJBEGokACAAC98EAQF/IwBBIGsiAiAANgIYIAIgATYCFAJAIAIoAhhFBEAgAkEBNgIcDAELIAIgAigCGCgCADYCDAJAIAIoAhgoAggEQCACIAIoAhgoAgg2AhAMAQsgAkEBNgIQIAJBADYCCANAAkAgAigCCCACKAIYLwEETw0AAkAgAigCDCACKAIIai0AAEEfSwRAIAIoAgwgAigCCGotAABBgAFJDQELIAIoAgwgAigCCGotAABBDUYNACACKAIMIAIoAghqLQAAQQpGDQAgAigCDCACKAIIai0AAEEJRgRADAELIAJBAzYCEAJAIAIoAgwgAigCCGotAABB4AFxQcABRgRAIAJBATYCAAwBCwJAIAIoAgwgAigCCGotAABB8AFxQeABRgRAIAJBAjYCAAwBCwJAIAIoAgwgAigCCGotAABB+AFxQfABRgRAIAJBAzYCAAwBCyACQQQ2AhAMBAsLCyACKAIYLwEEIAIoAgggAigCAGpNBEAgAkEENgIQDAILIAJBATYCBANAIAIoAgQgAigCAE0EQCACKAIMIAIoAgggAigCBGpqLQAAQcABcUGAAUcEQCACQQQ2AhAMBgUgAiACKAIEQQFqNgIEDAILAAsLIAIgAigCACACKAIIajYCCAsgAiACKAIIQQFqNgIIDAELCwsgAigCGCACKAIQNgIIIAIoAhQEQAJAIAIoAhRBAkcNACACKAIQQQNHDQAgAkECNgIQIAIoAhhBAjYCCAsCQCACKAIUIAIoAhBGDQAgAigCEEEBRg0AIAJBBTYCHAwCCwsgAiACKAIQNgIcCyACKAIcC2oBAX8jAEEQayIBIAA2AgwgASgCDEIANwMAIAEoAgxBADYCCCABKAIMQn83AxAgASgCDEEANgIsIAEoAgxBfzYCKCABKAIMQgA3AxggASgCDEIANwMgIAEoAgxBADsBMCABKAIMQQA7ATILjQUBA38jAEEQayIBJAAgASAANgIMIAEoAgwEQCABKAIMKAIABEAgASgCDCgCABAvGiABKAIMKAIAEBsLIAEoAgwoAhwQFSABKAIMKAIgECQgASgCDCgCJBAkIAEoAgwoAlAhAiMAQRBrIgAkACAAIAI2AgwgACgCDARAIAAoAgwoAhAEQCAAQQA2AggDQCAAKAIIIAAoAgwoAgBJBEAgACgCDCgCECAAKAIIQQJ0aigCAARAIAAoAgwoAhAgACgCCEECdGooAgAhAyMAQRBrIgIkACACIAM2AgwDQCACKAIMBEAgAiACKAIMKAIYNgIIIAIoAgwQFSACIAIoAgg2AgwMAQsLIAJBEGokAAsgACAAKAIIQQFqNgIIDAELCyAAKAIMKAIQEBULIAAoAgwQFQsgAEEQaiQAIAEoAgwoAkAEQCABQgA3AwADQCABKQMAIAEoAgwpAzBUBEAgASgCDCgCQCABKQMAp0EEdGoQdyABIAEpAwBCAXw3AwAMAQsLIAEoAgwoAkAQFQsgAUIANwMAA0AgASkDACABKAIMKAJErVQEQCABKAIMKAJMIAEpAwCnQQJ0aigCACECIwBBEGsiACQAIAAgAjYCDCAAKAIMQQE6ACgCfyMAQRBrIgIgACgCDEEMajYCDCACKAIMKAIARQsEQCAAKAIMQQxqQQhBABAUCyAAQRBqJAAgASABKQMAQgF8NwMADAELCyABKAIMKAJMEBUgASgCDCgCVCECIwBBEGsiACQAIAAgAjYCDCAAKAIMBEAgACgCDCgCCARAIAAoAgwoAgwgACgCDCgCCBECAAsgACgCDBAVCyAAQRBqJAAgASgCDEEIahA4IAEoAgwQFQsgAUEQaiQAC48OAQF/IwBBEGsiAyQAIAMgADYCDCADIAE2AgggAyACNgIEIAMoAgghASADKAIEIQIjAEEgayIAIAMoAgw2AhggACABNgIUIAAgAjYCECAAIAAoAhhBEHY2AgwgACAAKAIYQf//A3E2AhgCQCAAKAIQQQFGBEAgACAAKAIULQAAIAAoAhhqNgIYIAAoAhhB8f8DTwRAIAAgACgCGEHx/wNrNgIYCyAAIAAoAhggACgCDGo2AgwgACgCDEHx/wNPBEAgACAAKAIMQfH/A2s2AgwLIAAgACgCGCAAKAIMQRB0cjYCHAwBCyAAKAIURQRAIABBATYCHAwBCyAAKAIQQRBJBEADQCAAIAAoAhAiAUEBazYCECABBEAgACAAKAIUIgFBAWo2AhQgACABLQAAIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDAwBCwsgACgCGEHx/wNPBEAgACAAKAIYQfH/A2s2AhgLIAAgACgCDEHx/wNwNgIMIAAgACgCGCAAKAIMQRB0cjYCHAwBCwNAIAAoAhBBsCtPBEAgACAAKAIQQbArazYCECAAQdsCNgIIA0AgACAAKAIULQAAIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDCAAIAAoAhQtAAEgACgCGGo2AhggACAAKAIYIAAoAgxqNgIMIAAgACgCFC0AAiAAKAIYajYCGCAAIAAoAhggACgCDGo2AgwgACAAKAIULQADIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDCAAIAAoAhQtAAQgACgCGGo2AhggACAAKAIYIAAoAgxqNgIMIAAgACgCFC0ABSAAKAIYajYCGCAAIAAoAhggACgCDGo2AgwgACAAKAIULQAGIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDCAAIAAoAhQtAAcgACgCGGo2AhggACAAKAIYIAAoAgxqNgIMIAAgACgCFC0ACCAAKAIYajYCGCAAIAAoAhggACgCDGo2AgwgACAAKAIULQAJIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDCAAIAAoAhQtAAogACgCGGo2AhggACAAKAIYIAAoAgxqNgIMIAAgACgCFC0ACyAAKAIYajYCGCAAIAAoAhggACgCDGo2AgwgACAAKAIULQAMIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDCAAIAAoAhQtAA0gACgCGGo2AhggACAAKAIYIAAoAgxqNgIMIAAgACgCFC0ADiAAKAIYajYCGCAAIAAoAhggACgCDGo2AgwgACAAKAIULQAPIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDCAAIAAoAhRBEGo2AhQgACAAKAIIQQFrIgE2AgggAQ0ACyAAIAAoAhhB8f8DcDYCGCAAIAAoAgxB8f8DcDYCDAwBCwsgACgCEARAA0AgACgCEEEQTwRAIAAgACgCEEEQazYCECAAIAAoAhQtAAAgACgCGGo2AhggACAAKAIYIAAoAgxqNgIMIAAgACgCFC0AASAAKAIYajYCGCAAIAAoAhggACgCDGo2AgwgACAAKAIULQACIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDCAAIAAoAhQtAAMgACgCGGo2AhggACAAKAIYIAAoAgxqNgIMIAAgACgCFC0ABCAAKAIYajYCGCAAIAAoAhggACgCDGo2AgwgACAAKAIULQAFIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDCAAIAAoAhQtAAYgACgCGGo2AhggACAAKAIYIAAoAgxqNgIMIAAgACgCFC0AByAAKAIYajYCGCAAIAAoAhggACgCDGo2AgwgACAAKAIULQAIIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDCAAIAAoAhQtAAkgACgCGGo2AhggACAAKAIYIAAoAgxqNgIMIAAgACgCFC0ACiAAKAIYajYCGCAAIAAoAhggACgCDGo2AgwgACAAKAIULQALIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDCAAIAAoAhQtAAwgACgCGGo2AhggACAAKAIYIAAoAgxqNgIMIAAgACgCFC0ADSAAKAIYajYCGCAAIAAoAhggACgCDGo2AgwgACAAKAIULQAOIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDCAAIAAoAhQtAA8gACgCGGo2AhggACAAKAIYIAAoAgxqNgIMIAAgACgCFEEQajYCFAwBCwsDQCAAIAAoAhAiAUEBazYCECABBEAgACAAKAIUIgFBAWo2AhQgACABLQAAIAAoAhhqNgIYIAAgACgCGCAAKAIMajYCDAwBCwsgACAAKAIYQfH/A3A2AhggACAAKAIMQfH/A3A2AgwLIAAgACgCGCAAKAIMQRB0cjYCHAsgACgCHCEAIANBEGokACAAC1IBAn9BkJcBKAIAIgEgAEEDakF8cSICaiEAAkAgAkEAIAAgAU0bDQAgAD8AQRB0SwRAIAAQDEUNAQtBkJcBIAA2AgAgAQ8LQbSbAUEwNgIAQX8LvAIBAX8jAEEgayIEJAAgBCAANgIYIAQgATcDECAEIAI2AgwgBCADNgIIIAQoAghFBEAgBCAEKAIYQQhqNgIICwJAIAQpAxAgBCgCGCkDMFoEQCAEKAIIQRJBABAUIARBADYCHAwBCwJAIAQoAgxBCHFFBEAgBCgCGCgCQCAEKQMQp0EEdGooAgQNAQsgBCgCGCgCQCAEKQMQp0EEdGooAgBFBEAgBCgCCEESQQAQFCAEQQA2AhwMAgsCQCAEKAIYKAJAIAQpAxCnQQR0ai0ADEEBcUUNACAEKAIMQQhxDQAgBCgCCEEXQQAQFCAEQQA2AhwMAgsgBCAEKAIYKAJAIAQpAxCnQQR0aigCADYCHAwBCyAEIAQoAhgoAkAgBCkDEKdBBHRqKAIENgIcCyAEKAIcIQAgBEEgaiQAIAALhAEBAX8jAEEQayIBJAAgASAANgIIIAFB2AAQGCIANgIEAkAgAEUEQCABQQA2AgwMAQsCQCABKAIIBEAgASgCBCABKAIIQdgAEBkaDAELIAEoAgQQUwsgASgCBEEANgIAIAEoAgRBAToABSABIAEoAgQ2AgwLIAEoAgwhACABQRBqJAAgAAtvAQF/IwBBIGsiAyQAIAMgADYCGCADIAE2AhQgAyACNgIQIAMgAygCGCADKAIQrRAeNgIMAkAgAygCDEUEQCADQX82AhwMAQsgAygCDCADKAIUIAMoAhAQGRogA0EANgIcCyADKAIcGiADQSBqJAALogEBAX8jAEEgayIEJAAgBCAANgIYIAQgATcDECAEIAI2AgwgBCADNgIIIAQgBCgCDCAEKQMQECkiADYCBAJAIABFBEAgBCgCCEEOQQAQFCAEQQA2AhwMAQsgBCgCGCAEKAIEKAIEIAQpAxAgBCgCCBBkQQBIBEAgBCgCBBAWIARBADYCHAwBCyAEIAQoAgQ2AhwLIAQoAhwhACAEQSBqJAAgAAugAQEBfyMAQSBrIgMkACADIAA2AhQgAyABNgIQIAMgAjcDCCADIAMoAhA2AgQCQCADKQMIQghUBEAgA0J/NwMYDAELIwBBEGsiACADKAIUNgIMIAAoAgwoAgAhACADKAIEIAA2AgAjAEEQayIAIAMoAhQ2AgwgACgCDCgCBCEAIAMoAgQgADYCBCADQgg3AxgLIAMpAxghAiADQSBqJAAgAguDAQIDfwF+AkAgAEKAgICAEFQEQCAAIQUMAQsDQCABQQFrIgEgACAAQgqAIgVCCn59p0EwcjoAACAAQv////+fAVYhAiAFIQAgAg0ACwsgBaciAgRAA0AgAUEBayIBIAIgAkEKbiIDQQpsa0EwcjoAACACQQlLIQQgAyECIAQNAAsLIAELPwEBfyMAQRBrIgIgADYCDCACIAE2AgggAigCDARAIAIoAgwgAigCCCgCADYCACACKAIMIAIoAggoAgQ2AgQLC9IIAQJ/IwBBIGsiBCQAIAQgADYCGCAEIAE2AhQgBCACNgIQIAQgAzYCDAJAIAQoAhhFBEAgBCgCFARAIAQoAhRBADYCAAsgBEGVFTYCHAwBCyAEKAIQQcAAcUUEQCAEKAIYKAIIRQRAIAQoAhhBABA6GgsCQAJAAkAgBCgCEEGAAXFFDQAgBCgCGCgCCEEBRg0AIAQoAhgoAghBAkcNAQsgBCgCGCgCCEEERw0BCyAEKAIYKAIMRQRAIAQoAhgoAgAhASAEKAIYLwEEIQIgBCgCGEEQaiEDIAQoAgwhBSMAQTBrIgAkACAAIAE2AiggACACNgIkIAAgAzYCICAAIAU2AhwgACAAKAIoNgIYAkAgACgCJEUEQCAAKAIgBEAgACgCIEEANgIACyAAQQA2AiwMAQsgAEEBNgIQIABBADYCDANAIAAoAgwgACgCJEkEQCMAQRBrIgEgACgCGCAAKAIMai0AAEEBdEGgFWovAQA2AggCQCABKAIIQYABSQRAIAFBATYCDAwBCyABKAIIQYAQSQRAIAFBAjYCDAwBCyABKAIIQYCABEkEQCABQQM2AgwMAQsgAUEENgIMCyAAIAEoAgwgACgCEGo2AhAgACAAKAIMQQFqNgIMDAELCyAAIAAoAhAQGCIBNgIUIAFFBEAgACgCHEEOQQAQFCAAQQA2AiwMAQsgAEEANgIIIABBADYCDANAIAAoAgwgACgCJEkEQCAAKAIUIAAoAghqIQIjAEEQayIBIAAoAhggACgCDGotAABBAXRBoBVqLwEANgIIIAEgAjYCBAJAIAEoAghBgAFJBEAgASgCBCABKAIIOgAAIAFBATYCDAwBCyABKAIIQYAQSQRAIAEoAgQgASgCCEEGdkEfcUHAAXI6AAAgASgCBCABKAIIQT9xQYABcjoAASABQQI2AgwMAQsgASgCCEGAgARJBEAgASgCBCABKAIIQQx2QQ9xQeABcjoAACABKAIEIAEoAghBBnZBP3FBgAFyOgABIAEoAgQgASgCCEE/cUGAAXI6AAIgAUEDNgIMDAELIAEoAgQgASgCCEESdkEHcUHwAXI6AAAgASgCBCABKAIIQQx2QT9xQYABcjoAASABKAIEIAEoAghBBnZBP3FBgAFyOgACIAEoAgQgASgCCEE/cUGAAXI6AAMgAUEENgIMCyAAIAEoAgwgACgCCGo2AgggACAAKAIMQQFqNgIMDAELCyAAKAIUIAAoAhBBAWtqQQA6AAAgACgCIARAIAAoAiAgACgCEEEBazYCAAsgACAAKAIUNgIsCyAAKAIsIQEgAEEwaiQAIAQoAhggATYCDCABRQRAIARBADYCHAwECwsgBCgCFARAIAQoAhQgBCgCGCgCEDYCAAsgBCAEKAIYKAIMNgIcDAILCyAEKAIUBEAgBCgCFCAEKAIYLwEENgIACyAEIAQoAhgoAgA2AhwLIAQoAhwhACAEQSBqJAAgAAs5AQF/IwBBEGsiASAANgIMQQAhACABKAIMLQAAQQFxBH8gASgCDCkDECABKAIMKQMIUQVBAAtBAXEL7wIBAX8jAEEQayIBJAAgASAANgIIAkAgASgCCC0AKEEBcQRAIAFBfzYCDAwBCyABKAIIKAIkQQNGBEAgASgCCEEMakEXQQAQFCABQX82AgwMAQsCQCABKAIIKAIgBEACfyMAQRBrIgAgASgCCDYCDCAAKAIMKQMYQsAAg1ALBEAgASgCCEEMakEdQQAQFCABQX82AgwMAwsMAQsgASgCCCgCAARAIAEoAggoAgAQSEEASARAIAEoAghBDGogASgCCCgCABAXIAFBfzYCDAwDCwsgASgCCEEAQgBBABAgQgBTBEAgASgCCCgCAARAIAEoAggoAgAQLxoLIAFBfzYCDAwCCwsgASgCCEEAOgA0IAEoAghBADoANSMAQRBrIgAgASgCCEEMajYCDCAAKAIMBEAgACgCDEEANgIAIAAoAgxBADYCBAsgASgCCCIAIAAoAiBBAWo2AiAgAUEANgIMCyABKAIMIQAgAUEQaiQAIAALdQIBfwF+IwBBEGsiASQAIAEgADYCBAJAIAEoAgQtAChBAXEEQCABQn83AwgMAQsgASgCBCgCIEUEQCABKAIEQQxqQRJBABAUIAFCfzcDCAwBCyABIAEoAgRBAEIAQQcQIDcDCAsgASkDCCECIAFBEGokACACC50BAQF/IwBBEGsiASAANgIIAkACQAJAIAEoAghFDQAgASgCCCgCIEUNACABKAIIKAIkDQELIAFBATYCDAwBCyABIAEoAggoAhw2AgQCQAJAIAEoAgRFDQAgASgCBCgCACABKAIIRw0AIAEoAgQoAgRBtP4ASQ0AIAEoAgQoAgRB0/4ATQ0BCyABQQE2AgwMAQsgAUEANgIMCyABKAIMC4ABAQN/IwBBEGsiAiAANgIMIAIgATYCCCACKAIIQQh2IQEgAigCDCgCCCEDIAIoAgwiBCgCFCEAIAQgAEEBajYCFCAAIANqIAE6AAAgAigCCEH/AXEhASACKAIMKAIIIQMgAigCDCICKAIUIQAgAiAAQQFqNgIUIAAgA2ogAToAAAuZBQEBfyMAQUBqIgQkACAEIAA2AjggBCABNwMwIAQgAjYCLCAEIAM2AiggBEHIABAYIgA2AiQCQCAARQRAIARBADYCPAwBCyAEKAIkQgA3AzggBCgCJEIANwMYIAQoAiRCADcDMCAEKAIkQQA2AgAgBCgCJEEANgIEIAQoAiRCADcDCCAEKAIkQgA3AxAgBCgCJEEANgIoIAQoAiRCADcDIAJAIAQpAzBQBEBBCBAYIQAgBCgCJCAANgIEIABFBEAgBCgCJBAVIAQoAihBDkEAEBQgBEEANgI8DAMLIAQoAiQoAgRCADcDAAwBCyAEKAIkIAQpAzBBABDCAUEBcUUEQCAEKAIoQQ5BABAUIAQoAiQQMiAEQQA2AjwMAgsgBEIANwMIIARCADcDGCAEQgA3AxADQCAEKQMYIAQpAzBUBEAgBCgCOCAEKQMYp0EEdGopAwhQRQRAIAQoAjggBCkDGKdBBHRqKAIARQRAIAQoAihBEkEAEBQgBCgCJBAyIARBADYCPAwFCyAEKAIkKAIAIAQpAxCnQQR0aiAEKAI4IAQpAxinQQR0aigCADYCACAEKAIkKAIAIAQpAxCnQQR0aiAEKAI4IAQpAxinQQR0aikDCDcDCCAEKAIkKAIEIAQpAxinQQN0aiAEKQMINwMAIAQgBCgCOCAEKQMYp0EEdGopAwggBCkDCHw3AwggBCAEKQMQQgF8NwMQCyAEIAQpAxhCAXw3AxgMAQsLIAQoAiQgBCkDEDcDCCAEKAIkIAQoAiwEfkIABSAEKAIkKQMICzcDGCAEKAIkKAIEIAQoAiQpAwinQQN0aiAEKQMINwMAIAQoAiQgBCkDCDcDMAsgBCAEKAIkNgI8CyAEKAI8IQAgBEFAayQAIAALngEBAX8jAEEgayIEJAAgBCAANgIYIAQgATcDECAEIAI2AgwgBCADNgIIIAQgBCgCGCAEKQMQIAQoAgwgBCgCCBA/IgA2AgQCQCAARQRAIARBADYCHAwBCyAEIAQoAgQoAjBBACAEKAIMIAQoAggQRiIANgIAIABFBEAgBEEANgIcDAELIAQgBCgCADYCHAsgBCgCHCEAIARBIGokACAAC5wIAQt/IABFBEAgARAYDwsgAUFATwRAQbSbAUEwNgIAQQAPCwJ/QRAgAUELakF4cSABQQtJGyEGIABBCGsiBSgCBCIJQXhxIQQCQCAJQQNxRQRAQQAgBkGAAkkNAhogBkEEaiAETQRAIAUhAiAEIAZrQcSfASgCAEEBdE0NAgtBAAwCCyAEIAVqIQcCQCAEIAZPBEAgBCAGayIDQRBJDQEgBSAJQQFxIAZyQQJyNgIEIAUgBmoiAiADQQNyNgIEIAcgBygCBEEBcjYCBCACIAMQxgEMAQsgB0H8mwEoAgBGBEBB8JsBKAIAIARqIgQgBk0NAiAFIAlBAXEgBnJBAnI2AgQgBSAGaiIDIAQgBmsiAkEBcjYCBEHwmwEgAjYCAEH8mwEgAzYCAAwBCyAHQfibASgCAEYEQEHsmwEoAgAgBGoiAyAGSQ0CAkAgAyAGayICQRBPBEAgBSAJQQFxIAZyQQJyNgIEIAUgBmoiBCACQQFyNgIEIAMgBWoiAyACNgIAIAMgAygCBEF+cTYCBAwBCyAFIAlBAXEgA3JBAnI2AgQgAyAFaiICIAIoAgRBAXI2AgRBACECQQAhBAtB+JsBIAQ2AgBB7JsBIAI2AgAMAQsgBygCBCIDQQJxDQEgA0F4cSAEaiIKIAZJDQEgCiAGayEMAkAgA0H/AU0EQCAHKAIIIgQgA0EDdiICQQN0QYycAWpGGiAEIAcoAgwiA0YEQEHkmwFB5JsBKAIAQX4gAndxNgIADAILIAQgAzYCDCADIAQ2AggMAQsgBygCGCELAkAgByAHKAIMIghHBEAgBygCCCICQfSbASgCAEkaIAIgCDYCDCAIIAI2AggMAQsCQCAHQRRqIgQoAgAiAg0AIAdBEGoiBCgCACICDQBBACEIDAELA0AgBCEDIAIiCEEUaiIEKAIAIgINACAIQRBqIQQgCCgCECICDQALIANBADYCAAsgC0UNAAJAIAcgBygCHCIDQQJ0QZSeAWoiAigCAEYEQCACIAg2AgAgCA0BQeibAUHomwEoAgBBfiADd3E2AgAMAgsgC0EQQRQgCygCECAHRhtqIAg2AgAgCEUNAQsgCCALNgIYIAcoAhAiAgRAIAggAjYCECACIAg2AhgLIAcoAhQiAkUNACAIIAI2AhQgAiAINgIYCyAMQQ9NBEAgBSAJQQFxIApyQQJyNgIEIAUgCmoiAiACKAIEQQFyNgIEDAELIAUgCUEBcSAGckECcjYCBCAFIAZqIgMgDEEDcjYCBCAFIApqIgIgAigCBEEBcjYCBCADIAwQxgELIAUhAgsgAgsiAgRAIAJBCGoPCyABEBgiBUUEQEEADwsgBSAAQXxBeCAAQQRrKAIAIgJBA3EbIAJBeHFqIgIgASABIAJLGxAZGiAAEBUgBQtDAQN/AkAgAkUNAANAIAAtAAAiBCABLQAAIgVGBEAgAUEBaiEBIABBAWohACACQQFrIgINAQwCCwsgBCAFayEDCyADC4wDAQF/IwBBIGsiBCQAIAQgADYCGCAEIAE7ARYgBCACNgIQIAQgAzYCDAJAIAQvARZFBEAgBEEANgIcDAELAkACQAJAAkAgBCgCEEGAMHEiAARAIABBgBBGDQEgAEGAIEYNAgwDCyAEQQA2AgQMAwsgBEECNgIEDAILIARBBDYCBAwBCyAEKAIMQRJBABAUIARBADYCHAwBCyAEQRQQGCIANgIIIABFBEAgBCgCDEEOQQAQFCAEQQA2AhwMAQsgBC8BFkEBahAYIQAgBCgCCCAANgIAIABFBEAgBCgCCBAVIARBADYCHAwBCyAEKAIIKAIAIAQoAhggBC8BFhAZGiAEKAIIKAIAIAQvARZqQQA6AAAgBCgCCCAELwEWOwEEIAQoAghBADYCCCAEKAIIQQA2AgwgBCgCCEEANgIQIAQoAgQEQCAEKAIIIAQoAgQQOkEFRgRAIAQoAggQJCAEKAIMQRJBABAUIARBADYCHAwCCwsgBCAEKAIINgIcCyAEKAIcIQAgBEEgaiQAIAALNwEBfyMAQRBrIgEgADYCCAJAIAEoAghFBEAgAUEAOwEODAELIAEgASgCCC8BBDsBDgsgAS8BDguJAgEBfyMAQRBrIgEkACABIAA2AgwCQCABKAIMLQAFQQFxBEAgASgCDCgCAEECcUUNAQsgASgCDCgCMBAkIAEoAgxBADYCMAsCQCABKAIMLQAFQQFxBEAgASgCDCgCAEEIcUUNAQsgASgCDCgCNBAjIAEoAgxBADYCNAsCQCABKAIMLQAFQQFxBEAgASgCDCgCAEEEcUUNAQsgASgCDCgCOBAkIAEoAgxBADYCOAsCQCABKAIMLQAFQQFxBEAgASgCDCgCAEGAAXFFDQELIAEoAgwoAlQEQCABKAIMKAJUQQAgASgCDCgCVBAuEDMLIAEoAgwoAlQQFSABKAIMQQA2AlQLIAFBEGokAAvxAQEBfyMAQRBrIgEgADYCDCABKAIMQQA2AgAgASgCDEEAOgAEIAEoAgxBADoABSABKAIMQQE6AAYgASgCDEG/BjsBCCABKAIMQQo7AQogASgCDEEAOwEMIAEoAgxBfzYCECABKAIMQQA2AhQgASgCDEEANgIYIAEoAgxCADcDICABKAIMQgA3AyggASgCDEEANgIwIAEoAgxBADYCNCABKAIMQQA2AjggASgCDEEANgI8IAEoAgxBADsBQCABKAIMQYCA2I14NgJEIAEoAgxCADcDSCABKAIMQQA7AVAgASgCDEEAOwFSIAEoAgxBADYCVAvSEwEBfyMAQbABayIDJAAgAyAANgKoASADIAE2AqQBIAMgAjYCoAEgA0EANgKQASADIAMoAqQBKAIwQQAQOjYClAEgAyADKAKkASgCOEEAEDo2ApgBAkACQAJAAkAgAygClAFBAkYEQCADKAKYAUEBRg0BCyADKAKUAUEBRgRAIAMoApgBQQJGDQELIAMoApQBQQJHDQEgAygCmAFBAkcNAQsgAygCpAEiACAALwEMQYAQcjsBDAwBCyADKAKkASIAIAAvAQxB/+8DcTsBDCADKAKUAUECRgRAIANB9eABIAMoAqQBKAIwIAMoAqgBQQhqEI4BNgKQASADKAKQAUUEQCADQX82AqwBDAMLCwJAIAMoAqABQYACcQ0AIAMoApgBQQJHDQAgA0H1xgEgAygCpAEoAjggAygCqAFBCGoQjgE2AkggAygCSEUEQCADKAKQARAjIANBfzYCrAEMAwsgAygCSCADKAKQATYCACADIAMoAkg2ApABCwsCQCADKAKkAS8BUkUEQCADKAKkASIAIAAvAQxB/v8DcTsBDAwBCyADKAKkASIAIAAvAQxBAXI7AQwLIAMgAygCpAEgAygCoAEQZUEBcToAhgEgAyADKAKgAUGACnFBgApHBH8gAy0AhgEFQQELQQFxOgCHASADAn9BASADKAKkAS8BUkGBAkYNABpBASADKAKkAS8BUkGCAkYNABogAygCpAEvAVJBgwJGC0EBcToAhQEgAy0AhwFBAXEEQCADIANBIGpCHBApNgIcIAMoAhxFBEAgAygCqAFBCGpBDkEAEBQgAygCkAEQIyADQX82AqwBDAILAkAgAygCoAFBgAJxBEACQCADKAKgAUGACHENACADKAKkASkDIEL/////D1YNACADKAKkASkDKEL/////D1gNAgsgAygCHCADKAKkASkDKBAtIAMoAhwgAygCpAEpAyAQLQwBCwJAAkAgAygCoAFBgAhxDQAgAygCpAEpAyBC/////w9WDQAgAygCpAEpAyhC/////w9WDQAgAygCpAEpA0hC/////w9YDQELIAMoAqQBKQMoQv////8PWgRAIAMoAhwgAygCpAEpAygQLQsgAygCpAEpAyBC/////w9aBEAgAygCHCADKAKkASkDIBAtCyADKAKkASkDSEL/////D1oEQCADKAIcIAMoAqQBKQNIEC0LCwsCfyMAQRBrIgAgAygCHDYCDCAAKAIMLQAAQQFxRQsEQCADKAKoAUEIakEUQQAQFCADKAIcEBYgAygCkAEQIyADQX82AqwBDAILIANBAQJ/IwBBEGsiACADKAIcNgIMAn4gACgCDC0AAEEBcQRAIAAoAgwpAxAMAQtCAAunQf//A3ELIANBIGpBgAYQVTYCjAEgAygCHBAWIAMoAowBIAMoApABNgIAIAMgAygCjAE2ApABCyADLQCFAUEBcQRAIAMgA0EVakIHECk2AhAgAygCEEUEQCADKAKoAUEIakEOQQAQFCADKAKQARAjIANBfzYCrAEMAgsgAygCEEECEB8gAygCEEG9EkECEEEgAygCECADKAKkAS8BUkH/AXEQlgEgAygCECADKAKkASgCEEH//wNxEB8CfyMAQRBrIgAgAygCEDYCDCAAKAIMLQAAQQFxRQsEQCADKAKoAUEIakEUQQAQFCADKAIQEBYgAygCkAEQIyADQX82AqwBDAILIANBgbICQQcgA0EVakGABhBVNgIMIAMoAhAQFiADKAIMIAMoApABNgIAIAMgAygCDDYCkAELIAMgA0HQAGpCLhApIgA2AkwgAEUEQCADKAKoAUEIakEOQQAQFCADKAKQARAjIANBfzYCrAEMAQsgAygCTEHxEkH2EiADKAKgAUGAAnEbQQQQQSADKAKgAUGAAnFFBEAgAygCTCADLQCGAUEBcQR/QS0FIAMoAqQBLwEIC0H//wNxEB8LIAMoAkwgAy0AhgFBAXEEf0EtBSADKAKkAS8BCgtB//8DcRAfIAMoAkwgAygCpAEvAQwQHwJAIAMtAIUBQQFxBEAgAygCTEHjABAfDAELIAMoAkwgAygCpAEoAhBB//8DcRAfCyADKAKkASgCFCADQZ4BaiADQZwBahCNASADKAJMIAMvAZ4BEB8gAygCTCADLwGcARAfAkACQCADLQCFAUEBcUUNACADKAKkASkDKEIUWg0AIAMoAkxBABAhDAELIAMoAkwgAygCpAEoAhgQIQsCQAJAIAMoAqABQYACcUGAAkcNACADKAKkASkDIEL/////D1QEQCADKAKkASkDKEL/////D1QNAQsgAygCTEF/ECEgAygCTEF/ECEMAQsCQCADKAKkASkDIEL/////D1QEQCADKAJMIAMoAqQBKQMgpxAhDAELIAMoAkxBfxAhCwJAIAMoAqQBKQMoQv////8PVARAIAMoAkwgAygCpAEpAyinECEMAQsgAygCTEF/ECELCyADKAJMIAMoAqQBKAIwEFFB//8DcRAfIAMgAygCpAEoAjQgAygCoAEQkgFB//8DcSADKAKQAUGABhCSAUH//wNxajYCiAEgAygCTCADKAKIAUH//wNxEB8gAygCoAFBgAJxRQRAIAMoAkwgAygCpAEoAjgQUUH//wNxEB8gAygCTCADKAKkASgCPEH//wNxEB8gAygCTCADKAKkAS8BQBAfIAMoAkwgAygCpAEoAkQQIQJAIAMoAqQBKQNIQv////8PVARAIAMoAkwgAygCpAEpA0inECEMAQsgAygCTEF/ECELCwJ/IwBBEGsiACADKAJMNgIMIAAoAgwtAABBAXFFCwRAIAMoAqgBQQhqQRRBABAUIAMoAkwQFiADKAKQARAjIANBfzYCrAEMAQsgAygCqAEgA0HQAGoCfiMAQRBrIgAgAygCTDYCDAJ+IAAoAgwtAABBAXEEQCAAKAIMKQMQDAELQgALCxA2QQBIBEAgAygCTBAWIAMoApABECMgA0F/NgKsAQwBCyADKAJMEBYgAygCpAEoAjAEQCADKAKoASADKAKkASgCMBCFAUEASARAIAMoApABECMgA0F/NgKsAQwCCwsgAygCkAEEQCADKAKoASADKAKQAUGABhCRAUEASARAIAMoApABECMgA0F/NgKsAQwCCwsgAygCkAEQIyADKAKkASgCNARAIAMoAqgBIAMoAqQBKAI0IAMoAqABEJEBQQBIBEAgA0F/NgKsAQwCCwsgAygCoAFBgAJxRQRAIAMoAqQBKAI4BEAgAygCqAEgAygCpAEoAjgQhQFBAEgEQCADQX82AqwBDAMLCwsgAyADLQCHAUEBcTYCrAELIAMoAqwBIQAgA0GwAWokACAAC+ACAQF/IwBBIGsiBCQAIAQgADsBGiAEIAE7ARggBCACNgIUIAQgAzYCECAEQRAQGCIANgIMAkAgAEUEQCAEQQA2AhwMAQsgBCgCDEEANgIAIAQoAgwgBCgCEDYCBCAEKAIMIAQvARo7AQggBCgCDCAELwEYOwEKAkAgBC8BGARAIAQoAhQhASAELwEYIQIjAEEgayIAJAAgACABNgIYIAAgAjYCFCAAQQA2AhACQCAAKAIURQRAIABBADYCHAwBCyAAIAAoAhQQGDYCDCAAKAIMRQRAIAAoAhBBDkEAEBQgAEEANgIcDAELIAAoAgwgACgCGCAAKAIUEBkaIAAgACgCDDYCHAsgACgCHCEBIABBIGokACABIQAgBCgCDCAANgIMIABFBEAgBCgCDBAVIARBADYCHAwDCwwBCyAEKAIMQQA2AgwLIAQgBCgCDDYCHAsgBCgCHCEAIARBIGokACAAC5EBAQV/IAAoAkxBAE4hAyAAKAIAQQFxIgRFBEAgACgCNCIBBEAgASAAKAI4NgI4CyAAKAI4IgIEQCACIAE2AjQLIABBrKABKAIARgRAQaygASACNgIACwsgABClASEBIAAgACgCDBEAACECIAAoAmAiBQRAIAUQFQsCQCAERQRAIAAQFQwBCyADRQ0ACyABIAJyC/kBAQF/IwBBIGsiAiQAIAIgADYCHCACIAE5AxACQCACKAIcRQ0AIAICfAJ8IAIrAxBEAAAAAAAAAABkBEAgAisDEAwBC0QAAAAAAAAAAAtEAAAAAAAA8D9jBEACfCACKwMQRAAAAAAAAAAAZARAIAIrAxAMAQtEAAAAAAAAAAALDAELRAAAAAAAAPA/CyACKAIcKwMoIAIoAhwrAyChoiACKAIcKwMgoDkDCCACKAIcKwMQIAIrAwggAigCHCsDGKFjRQ0AIAIoAhwoAgAgAisDCCACKAIcKAIMIAIoAhwoAgQRFgAgAigCHCACKwMIOQMYCyACQSBqJAAL4QUCAn8BfiMAQTBrIgQkACAEIAA2AiQgBCABNgIgIAQgAjYCHCAEIAM2AhgCQCAEKAIkRQRAIARCfzcDKAwBCyAEKAIgRQRAIAQoAhhBEkEAEBQgBEJ/NwMoDAELIAQoAhxBgyBxBEAgBEEVQRYgBCgCHEEBcRs2AhQgBEIANwMAA0AgBCkDACAEKAIkKQMwVARAIAQgBCgCJCAEKQMAIAQoAhwgBCgCGBBNNgIQIAQoAhAEQCAEKAIcQQJxBEAgBAJ/IAQoAhAiARAuQQFqIQADQEEAIABFDQEaIAEgAEEBayIAaiICLQAAQS9HDQALIAILNgIMIAQoAgwEQCAEIAQoAgxBAWo2AhALCyAEKAIgIAQoAhAgBCgCFBEDAEUEQCMAQRBrIgAgBCgCGDYCDCAAKAIMBEAgACgCDEEANgIAIAAoAgxBADYCBAsgBCAEKQMANwMoDAULCyAEIAQpAwBCAXw3AwAMAQsLIAQoAhhBCUEAEBQgBEJ/NwMoDAELIAQoAiQoAlAhASAEKAIgIQIgBCgCHCEDIAQoAhghBSMAQTBrIgAkACAAIAE2AiQgACACNgIgIAAgAzYCHCAAIAU2AhgCQAJAIAAoAiQEQCAAKAIgDQELIAAoAhhBEkEAEBQgAEJ/NwMoDAELIAAoAiQpAwhCAFIEQCAAIAAoAiAQczYCFCAAIAAoAhQgACgCJCgCAHA2AhAgACAAKAIkKAIQIAAoAhBBAnRqKAIANgIMA0ACQCAAKAIMRQ0AIAAoAiAgACgCDCgCABBbBEAgACAAKAIMKAIYNgIMDAIFIAAoAhxBCHEEQCAAKAIMKQMIQn9SBEAgACAAKAIMKQMINwMoDAYLDAILIAAoAgwpAxBCf1IEQCAAIAAoAgwpAxA3AygMBQsLCwsLIAAoAhhBCUEAEBQgAEJ/NwMoCyAAKQMoIQYgAEEwaiQAIAQgBjcDKAsgBCkDKCEGIARBMGokACAGC9QDAQF/IwBBIGsiAyQAIAMgADYCGCADIAE2AhQgAyACNgIQAkACQCADKAIYBEAgAygCFA0BCyADKAIQQRJBABAUIANBADoAHwwBCyADKAIYKQMIQgBSBEAgAyADKAIUEHM2AgwgAyADKAIMIAMoAhgoAgBwNgIIIANBADYCACADIAMoAhgoAhAgAygCCEECdGooAgA2AgQDQCADKAIEBEACQCADKAIEKAIcIAMoAgxHDQAgAygCFCADKAIEKAIAEFsNAAJAIAMoAgQpAwhCf1EEQAJAIAMoAgAEQCADKAIAIAMoAgQoAhg2AhgMAQsgAygCGCgCECADKAIIQQJ0aiADKAIEKAIYNgIACyADKAIEEBUgAygCGCIAIAApAwhCAX03AwgCQCADKAIYIgApAwi6IAAoAgC4RHsUrkfheoQ/omNFDQAgAygCGCgCAEGAAk0NACADKAIYIAMoAhgoAgBBAXYgAygCEBBaQQFxRQRAIANBADoAHwwICwsMAQsgAygCBEJ/NwMQCyADQQE6AB8MBAsgAyADKAIENgIAIAMgAygCBCgCGDYCBAwBCwsLIAMoAhBBCUEAEBQgA0EAOgAfCyADLQAfQQFxIQAgA0EgaiQAIAAL3wIBAX8jAEEwayIDJAAgAyAANgIoIAMgATYCJCADIAI2AiACQCADKAIkIAMoAigoAgBGBEAgA0EBOgAvDAELIAMgAygCJEEEEH8iADYCHCAARQRAIAMoAiBBDkEAEBQgA0EAOgAvDAELIAMoAigpAwhCAFIEQCADQQA2AhgDQCADKAIYIAMoAigoAgBPRQRAIAMgAygCKCgCECADKAIYQQJ0aigCADYCFANAIAMoAhQEQCADIAMoAhQoAhg2AhAgAyADKAIUKAIcIAMoAiRwNgIMIAMoAhQgAygCHCADKAIMQQJ0aigCADYCGCADKAIcIAMoAgxBAnRqIAMoAhQ2AgAgAyADKAIQNgIUDAELCyADIAMoAhhBAWo2AhgMAQsLCyADKAIoKAIQEBUgAygCKCADKAIcNgIQIAMoAiggAygCJDYCACADQQE6AC8LIAMtAC9BAXEhACADQTBqJAAgAAtNAQJ/IAEtAAAhAgJAIAAtAAAiA0UNACACIANHDQADQCABLQABIQIgAC0AASIDRQ0BIAFBAWohASAAQQFqIQAgAiADRg0ACwsgAyACawvRCQECfyMAQSBrIgEkACABIAA2AhwgASABKAIcKAIsNgIQA0AgASABKAIcKAI8IAEoAhwoAnRrIAEoAhwoAmxrNgIUIAEoAhwoAmwgASgCECABKAIcKAIsQYYCa2pPBEAgASgCHCgCOCABKAIcKAI4IAEoAhBqIAEoAhAgASgCFGsQGRogASgCHCIAIAAoAnAgASgCEGs2AnAgASgCHCIAIAAoAmwgASgCEGs2AmwgASgCHCIAIAAoAlwgASgCEGs2AlwjAEEgayIAIAEoAhw2AhwgACAAKAIcKAIsNgIMIAAgACgCHCgCTDYCGCAAIAAoAhwoAkQgACgCGEEBdGo2AhADQCAAIAAoAhBBAmsiAjYCECAAIAIvAQA2AhQgACgCEAJ/IAAoAhQgACgCDE8EQCAAKAIUIAAoAgxrDAELQQALOwEAIAAgACgCGEEBayICNgIYIAINAAsgACAAKAIMNgIYIAAgACgCHCgCQCAAKAIYQQF0ajYCEANAIAAgACgCEEECayICNgIQIAAgAi8BADYCFCAAKAIQAn8gACgCFCAAKAIMTwRAIAAoAhQgACgCDGsMAQtBAAs7AQAgACAAKAIYQQFrIgI2AhggAg0ACyABIAEoAhAgASgCFGo2AhQLIAEoAhwoAgAoAgQEQCABIAEoAhwoAgAgASgCHCgCdCABKAIcKAI4IAEoAhwoAmxqaiABKAIUEHY2AhggASgCHCIAIAEoAhggACgCdGo2AnQgASgCHCgCdCABKAIcKAK0LWpBA08EQCABIAEoAhwoAmwgASgCHCgCtC1rNgIMIAEoAhwgASgCHCgCOCABKAIMai0AADYCSCABKAIcIAEoAhwoAlQgASgCHCgCOCABKAIMQQFqai0AACABKAIcKAJIIAEoAhwoAlh0c3E2AkgDQCABKAIcKAK0LQRAIAEoAhwgASgCHCgCVCABKAIcKAI4IAEoAgxBAmpqLQAAIAEoAhwoAkggASgCHCgCWHRzcTYCSCABKAIcKAJAIAEoAgwgASgCHCgCNHFBAXRqIAEoAhwoAkQgASgCHCgCSEEBdGovAQA7AQAgASgCHCgCRCABKAIcKAJIQQF0aiABKAIMOwEAIAEgASgCDEEBajYCDCABKAIcIgAgACgCtC1BAWs2ArQtIAEoAhwoAnQgASgCHCgCtC1qQQNPDQELCwsgASgCHCgCdEGGAkkEfyABKAIcKAIAKAIEQQBHBUEAC0EBcQ0BCwsgASgCHCgCwC0gASgCHCgCPEkEQCABIAEoAhwoAmwgASgCHCgCdGo2AggCQCABKAIcKALALSABKAIISQRAIAEgASgCHCgCPCABKAIIazYCBCABKAIEQYICSwRAIAFBggI2AgQLIAEoAhwoAjggASgCCGpBACABKAIEEDMgASgCHCABKAIIIAEoAgRqNgLALQwBCyABKAIcKALALSABKAIIQYICakkEQCABIAEoAghBggJqIAEoAhwoAsAtazYCBCABKAIEIAEoAhwoAjwgASgCHCgCwC1rSwRAIAEgASgCHCgCPCABKAIcKALALWs2AgQLIAEoAhwoAjggASgCHCgCwC1qQQAgASgCBBAzIAEoAhwiACABKAIEIAAoAsAtajYCwC0LCwsgAUEgaiQAC4YFAQF/IwBBIGsiBCQAIAQgADYCHCAEIAE2AhggBCACNgIUIAQgAzYCECAEQQM2AgwCQCAEKAIcKAK8LUEQIAQoAgxrSgRAIAQgBCgCEDYCCCAEKAIcIgAgAC8BuC0gBCgCCEH//wNxIAQoAhwoArwtdHI7AbgtIAQoAhwvAbgtQf8BcSEBIAQoAhwoAgghAiAEKAIcIgMoAhQhACADIABBAWo2AhQgACACaiABOgAAIAQoAhwvAbgtQQh2IQEgBCgCHCgCCCECIAQoAhwiAygCFCEAIAMgAEEBajYCFCAAIAJqIAE6AAAgBCgCHCAEKAIIQf//A3FBECAEKAIcKAK8LWt1OwG4LSAEKAIcIgAgACgCvC0gBCgCDEEQa2o2ArwtDAELIAQoAhwiACAALwG4LSAEKAIQQf//A3EgBCgCHCgCvC10cjsBuC0gBCgCHCIAIAQoAgwgACgCvC1qNgK8LQsgBCgCHBC9ASAEKAIUQf8BcSEBIAQoAhwoAgghAiAEKAIcIgMoAhQhACADIABBAWo2AhQgACACaiABOgAAIAQoAhRB//8DcUEIdiEBIAQoAhwoAgghAiAEKAIcIgMoAhQhACADIABBAWo2AhQgACACaiABOgAAIAQoAhRBf3NB/wFxIQEgBCgCHCgCCCECIAQoAhwiAygCFCEAIAMgAEEBajYCFCAAIAJqIAE6AAAgBCgCFEF/c0H//wNxQQh2IQEgBCgCHCgCCCECIAQoAhwiAygCFCEAIAMgAEEBajYCFCAAIAJqIAE6AAAgBCgCHCgCCCAEKAIcKAIUaiAEKAIYIAQoAhQQGRogBCgCHCIAIAQoAhQgACgCFGo2AhQgBEEgaiQAC6sBAQF/IwBBEGsiASQAIAEgADYCDCABKAIMKAIIBEAgASgCDCgCCBAbIAEoAgxBADYCCAsCQCABKAIMKAIERQ0AIAEoAgwoAgQoAgBBAXFFDQAgASgCDCgCBCgCEEF+Rw0AIAEoAgwoAgQiACAAKAIAQX5xNgIAIAEoAgwoAgQoAgBFBEAgASgCDCgCBBA3IAEoAgxBADYCBAsLIAEoAgxBADoADCABQRBqJAAL8QMBAX8jAEHQAGsiCCQAIAggADYCSCAIIAE3A0AgCCACNwM4IAggAzYCNCAIIAQ6ADMgCCAFNgIsIAggBjcDICAIIAc2AhwCQAJAAkAgCCgCSEUNACAIKQNAIAgpA0AgCCkDOHxWDQAgCCgCLA0BIAgpAyBQDQELIAgoAhxBEkEAEBQgCEEANgJMDAELIAhBgAEQGCIANgIYIABFBEAgCCgCHEEOQQAQFCAIQQA2AkwMAQsgCCgCGCAIKQNANwMAIAgoAhggCCkDQCAIKQM4fDcDCCAIKAIYQShqEDsgCCgCGCAILQAzOgBgIAgoAhggCCgCLDYCECAIKAIYIAgpAyA3AxgjAEEQayIAIAgoAhhB5ABqNgIMIAAoAgxBADYCACAAKAIMQQA2AgQgACgCDEEANgIIIwBBEGsiACAIKAJINgIMIAAoAgwpAxhC/4EBgyEBIAhBfzYCCCAIQQc2AgQgCEEONgIAQRAgCBA0IAGEIQEgCCgCGCABNwNwIAgoAhggCCgCGCkDcELAAINCAFI6AHggCCgCNARAIAgoAhhBKGogCCgCNCAIKAIcEIQBQQBIBEAgCCgCGBAVIAhBADYCTAwCCwsgCCAIKAJIQQEgCCgCGCAIKAIcEIEBNgJMCyAIKAJMIQAgCEHQAGokACAAC9MEAQJ/IwBBMGsiAyQAIAMgADYCJCADIAE3AxggAyACNgIUAkAgAygCJCgCQCADKQMYp0EEdGooAgBFBEAgAygCFEEUQQAQFCADQgA3AygMAQsgAyADKAIkKAJAIAMpAxinQQR0aigCACkDSDcDCCADKAIkKAIAIAMpAwhBABAnQQBIBEAgAygCFCADKAIkKAIAEBcgA0IANwMoDAELIAMoAiQoAgAhAiADKAIUIQQjAEEwayIAJAAgACACNgIoIABBgAI7ASYgACAENgIgIAAgAC8BJkGAAnFBAEc6ABsgAEEeQS4gAC0AG0EBcRs2AhwCQCAAKAIoQRpBHCAALQAbQQFxG6xBARAnQQBIBEAgACgCICAAKAIoEBcgAEF/NgIsDAELIAAgACgCKEEEQQYgAC0AG0EBcRusIABBDmogACgCIBBCIgI2AgggAkUEQCAAQX82AiwMAQsgAEEANgIUA0AgACgCFEECQQMgAC0AG0EBcRtIBEAgACAAKAIIEB1B//8DcSAAKAIcajYCHCAAIAAoAhRBAWo2AhQMAQsLIAAoAggQR0EBcUUEQCAAKAIgQRRBABAUIAAoAggQFiAAQX82AiwMAQsgACgCCBAWIAAgACgCHDYCLAsgACgCLCECIABBMGokACADIAIiADYCBCAAQQBIBEAgA0IANwMoDAELIAMpAwggAygCBK18Qv///////////wBWBEAgAygCFEEEQRYQFCADQgA3AygMAQsgAyADKQMIIAMoAgStfDcDKAsgAykDKCEBIANBMGokACABC20BAX8jAEEgayIEJAAgBCAANgIYIAQgATYCFCAEIAI2AhAgBCADNgIMAkAgBCgCGEUEQCAEQQA2AhwMAQsgBCAEKAIUIAQoAhAgBCgCDCAEKAIYQQhqEIEBNgIcCyAEKAIcIQAgBEEgaiQAIAALVQEBfyMAQRBrIgEkACABIAA2AgwCQAJAIAEoAgwoAiRBAUYNACABKAIMKAIkQQJGDQAMAQsgASgCDEEAQgBBChAgGiABKAIMQQA2AiQLIAFBEGokAAv/AgEBfyMAQTBrIgUkACAFIAA2AiggBSABNgIkIAUgAjYCICAFIAM6AB8gBSAENgIYAkACQCAFKAIgDQAgBS0AH0EBcQ0AIAVBADYCLAwBCyAFIAUoAiAgBS0AH0EBcWoQGDYCFCAFKAIURQRAIAUoAhhBDkEAEBQgBUEANgIsDAELAkAgBSgCKARAIAUgBSgCKCAFKAIgrRAeNgIQIAUoAhBFBEAgBSgCGEEOQQAQFCAFKAIUEBUgBUEANgIsDAMLIAUoAhQgBSgCECAFKAIgEBkaDAELIAUoAiQgBSgCFCAFKAIgrSAFKAIYEGRBAEgEQCAFKAIUEBUgBUEANgIsDAILCyAFLQAfQQFxBEAgBSgCFCAFKAIgakEAOgAAIAUgBSgCFDYCDANAIAUoAgwgBSgCFCAFKAIgakkEQCAFKAIMLQAARQRAIAUoAgxBIDoAAAsgBSAFKAIMQQFqNgIMDAELCwsgBSAFKAIUNgIsCyAFKAIsIQAgBUEwaiQAIAALwgEBAX8jAEEwayIEJAAgBCAANgIoIAQgATYCJCAEIAI3AxggBCADNgIUAkAgBCkDGEL///////////8AVgRAIAQoAhRBFEEAEBQgBEF/NgIsDAELIAQgBCgCKCAEKAIkIAQpAxgQKyICNwMIIAJCAFMEQCAEKAIUIAQoAigQFyAEQX82AiwMAQsgBCkDCCAEKQMYUwRAIAQoAhRBEUEAEBQgBEF/NgIsDAELIARBADYCLAsgBCgCLCEAIARBMGokACAAC3cBAX8jAEEQayICIAA2AgggAiABNgIEAkACQAJAIAIoAggpAyhC/////w9aDQAgAigCCCkDIEL/////D1oNACACKAIEQYAEcUUNASACKAIIKQNIQv////8PVA0BCyACQQE6AA8MAQsgAkEAOgAPCyACLQAPQQFxC/4BAQF/IwBBIGsiBSQAIAUgADYCGCAFIAE2AhQgBSACOwESIAVBADsBECAFIAM2AgwgBSAENgIIIAVBADYCBAJAA0AgBSgCGARAAkAgBSgCGC8BCCAFLwESRw0AIAUoAhgoAgQgBSgCDHFBgAZxRQ0AIAUoAgQgBS8BEEgEQCAFIAUoAgRBAWo2AgQMAQsgBSgCFARAIAUoAhQgBSgCGC8BCjsBAAsgBSgCGC8BCgRAIAUgBSgCGCgCDDYCHAwECyAFQZAVNgIcDAMLIAUgBSgCGCgCADYCGAwBCwsgBSgCCEEJQQAQFCAFQQA2AhwLIAUoAhwhACAFQSBqJAAgAAumAQEBfyMAQRBrIgIkACACIAA2AgggAiABNgIEAkAgAigCCC0AKEEBcQRAIAJBfzYCDAwBCyACKAIIKAIABEAgAigCCCgCACACKAIEEGdBAEgEQCACKAIIQQxqIAIoAggoAgAQFyACQX82AgwMAgsLIAIoAgggAkEEakIEQRMQIEIAUwRAIAJBfzYCDAwBCyACQQA2AgwLIAIoAgwhACACQRBqJAAgAAuNCAIBfwF+IwBBkAFrIgMkACADIAA2AoQBIAMgATYCgAEgAyACNgJ8IAMQUwJAIAMoAoABKQMIQgBSBEAgAyADKAKAASgCACgCACkDSDcDYCADIAMoAoABKAIAKAIAKQNINwNoDAELIANCADcDYCADQgA3A2gLIANCADcDcAJAA0AgAykDcCADKAKAASkDCFQEQCADKAKAASgCACADKQNwp0EEdGooAgApA0ggAykDaFQEQCADIAMoAoABKAIAIAMpA3CnQQR0aigCACkDSDcDaAsgAykDaCADKAKAASkDIFYEQCADKAJ8QRNBABAUIANCfzcDiAEMAwsgAyADKAKAASgCACADKQNwp0EEdGooAgApA0ggAygCgAEoAgAgAykDcKdBBHRqKAIAKQMgfCADKAKAASgCACADKQNwp0EEdGooAgAoAjAQUUH//wNxrXxCHnw3A1ggAykDWCADKQNgVgRAIAMgAykDWDcDYAsgAykDYCADKAKAASkDIFYEQCADKAJ8QRNBABAUIANCfzcDiAEMAwsgAygChAEoAgAgAygCgAEoAgAgAykDcKdBBHRqKAIAKQNIQQAQJ0EASARAIAMoAnwgAygChAEoAgAQFyADQn83A4gBDAMLIAMgAygChAEoAgBBAEEBIAMoAnwQjAFCf1EEQCADEFIgA0J/NwOIAQwDCwJ/IAMoAoABKAIAIAMpA3CnQQR0aigCACEBIwBBEGsiACQAIAAgATYCCCAAIAM2AgQCQAJAAkAgACgCCC8BCiAAKAIELwEKSA0AIAAoAggoAhAgACgCBCgCEEcNACAAKAIIKAIUIAAoAgQoAhRHDQAgACgCCCgCMCAAKAIEKAIwEIYBDQELIABBfzYCDAwBCwJAAkAgACgCCCgCGCAAKAIEKAIYRw0AIAAoAggpAyAgACgCBCkDIFINACAAKAIIKQMoIAAoAgQpAyhRDQELAkACQCAAKAIELwEMQQhxRQ0AIAAoAgQoAhgNACAAKAIEKQMgQgBSDQAgACgCBCkDKFANAQsgAEF/NgIMDAILCyAAQQA2AgwLIAAoAgwhASAAQRBqJAAgAQsEQCADKAJ8QRVBABAUIAMQUiADQn83A4gBDAMFIAMoAoABKAIAIAMpA3CnQQR0aigCACgCNCADKAI0EJUBIQAgAygCgAEoAgAgAykDcKdBBHRqKAIAIAA2AjQgAygCgAEoAgAgAykDcKdBBHRqKAIAQQE6AAQgA0EANgI0IAMQUiADIAMpA3BCAXw3A3AMAgsACwsgAwJ+IAMpA2AgAykDaH1C////////////AFQEQCADKQNgIAMpA2h9DAELQv///////////wALNwOIAQsgAykDiAEhBCADQZABaiQAIAQL1AQBAX8jAEEgayIDJAAgAyAANgIYIAMgATYCFCADIAI2AhAgAygCECEBIwBBEGsiACQAIAAgATYCCCAAQdgAEBg2AgQCQCAAKAIERQRAIAAoAghBDkEAEBQgAEEANgIMDAELIAAoAgghAiMAQRBrIgEkACABIAI2AgggAUEYEBgiAjYCBAJAIAJFBEAgASgCCEEOQQAQFCABQQA2AgwMAQsgASgCBEEANgIAIAEoAgRCADcDCCABKAIEQQA2AhAgASABKAIENgIMCyABKAIMIQIgAUEQaiQAIAAoAgQgAjYCUCACRQRAIAAoAgQQFSAAQQA2AgwMAQsgACgCBEEANgIAIAAoAgRBADYCBCMAQRBrIgEgACgCBEEIajYCDCABKAIMQQA2AgAgASgCDEEANgIEIAEoAgxBADYCCCAAKAIEQQA2AhggACgCBEEANgIUIAAoAgRBADYCHCAAKAIEQQA2AiQgACgCBEEANgIgIAAoAgRBADoAKCAAKAIEQgA3AzggACgCBEIANwMwIAAoAgRBADYCQCAAKAIEQQA2AkggACgCBEEANgJEIAAoAgRBADYCTCAAKAIEQQA2AlQgACAAKAIENgIMCyAAKAIMIQEgAEEQaiQAIAMgASIANgIMAkAgAEUEQCADQQA2AhwMAQsgAygCDCADKAIYNgIAIAMoAgwgAygCFDYCBCADKAIUQRBxBEAgAygCDCIAIAAoAhRBAnI2AhQgAygCDCIAIAAoAhhBAnI2AhgLIAMgAygCDDYCHAsgAygCHCEAIANBIGokACAAC9UBAQF/IwBBIGsiBCQAIAQgADYCGCAEIAE3AxAgBCACNgIMIAQgAzYCCAJAAkAgBCkDEEL///////////8AVwRAIAQpAxBCgICAgICAgICAf1kNAQsgBCgCCEEEQT0QFCAEQX82AhwMAQsCfyAEKQMQIQEgBCgCDCEAIAQoAhgiAigCTEF/TARAIAIgASAAEKABDAELIAIgASAAEKABC0EASARAIAQoAghBBEG0mwEoAgAQFCAEQX82AhwMAQsgBEEANgIcCyAEKAIcIQAgBEEgaiQAIAALJABBACAAEAUiACAAQRtGGyIABH9BtJsBIAA2AgBBAAVBAAsaC3ABAX8jAEEQayIDJAAgAwJ/IAFBwABxRQRAQQAgAUGAgIQCcUGAgIQCRw0BGgsgAyACQQRqNgIMIAIoAgALNgIAIAAgAUGAgAJyIAMQECIAQYFgTwRAQbSbAUEAIABrNgIAQX8hAAsgA0EQaiQAIAALMwEBfwJ/IAAQByIBQWFGBEAgABARIQELIAFBgWBPCwR/QbSbAUEAIAFrNgIAQX8FIAELC2kBAn8CQCAAKAIUIAAoAhxNDQAgAEEAQQAgACgCJBEBABogACgCFA0AQX8PCyAAKAIEIgEgACgCCCICSQRAIAAgASACa6xBASAAKAIoEQ8AGgsgAEEANgIcIABCADcDECAAQgA3AgRBAAvaAwEGfyMAQRBrIgUkACAFIAI2AgwjAEGgAWsiBCQAIARBCGpBkIcBQZABEBkaIAQgADYCNCAEIAA2AhwgBEF+IABrIgNB/////wcgA0H/////B0kbIgY2AjggBCAAIAZqIgA2AiQgBCAANgIYIARBCGohACMAQdABayIDJAAgAyACNgLMASADQaABakEAQSgQMyADIAMoAswBNgLIAQJAQQAgASADQcgBaiADQdAAaiADQaABahBwQQBIDQAgACgCTEEATiEHIAAoAgAhAiAALABKQQBMBEAgACACQV9xNgIACyACQSBxIQgCfyAAKAIwBEAgACABIANByAFqIANB0ABqIANBoAFqEHAMAQsgAEHQADYCMCAAIANB0ABqNgIQIAAgAzYCHCAAIAM2AhQgACgCLCECIAAgAzYCLCAAIAEgA0HIAWogA0HQAGogA0GgAWoQcCACRQ0AGiAAQQBBACAAKAIkEQEAGiAAQQA2AjAgACACNgIsIABBADYCHCAAQQA2AhAgACgCFBogAEEANgIUQQALGiAAIAAoAgAgCHI2AgAgB0UNAAsgA0HQAWokACAGBEAgBCgCHCIAIAAgBCgCGEZrQQA6AAALIARBoAFqJAAgBUEQaiQAC4wSAg9/AX4jAEHQAGsiBSQAIAUgATYCTCAFQTdqIRMgBUE4aiEQQQAhAQNAAkAgDUEASA0AQf////8HIA1rIAFIBEBBtJsBQT02AgBBfyENDAELIAEgDWohDQsgBSgCTCIHIQECQAJAAkACQAJAAkACQAJAIAUCfwJAIActAAAiBgRAA0ACQAJAIAZB/wFxIgZFBEAgASEGDAELIAZBJUcNASABIQYDQCABLQABQSVHDQEgBSABQQJqIgg2AkwgBkEBaiEGIAEtAAIhDiAIIQEgDkElRg0ACwsgBiAHayEBIAAEQCAAIAcgARAiCyABDQ0gBSgCTCEBIAUoAkwsAAFBMGtBCk8NAyABLQACQSRHDQMgASwAAUEwayEPQQEhESABQQNqDAQLIAUgAUEBaiIINgJMIAEtAAEhBiAIIQEMAAsACyANIQsgAA0IIBFFDQJBASEBA0AgBCABQQJ0aigCACIABEAgAyABQQN0aiAAIAIQqAFBASELIAFBAWoiAUEKRw0BDAoLC0EBIQsgAUEKTw0IA0AgBCABQQJ0aigCAA0IIAFBAWoiAUEKRw0ACwwIC0F/IQ8gAUEBagsiATYCTEEAIQgCQCABLAAAIgxBIGsiBkEfSw0AQQEgBnQiBkGJ0QRxRQ0AA0ACQCAFIAFBAWoiCDYCTCABLAABIgxBIGsiAUEgTw0AQQEgAXQiAUGJ0QRxRQ0AIAEgBnIhBiAIIQEMAQsLIAghASAGIQgLAkAgDEEqRgRAIAUCfwJAIAEsAAFBMGtBCk8NACAFKAJMIgEtAAJBJEcNACABLAABQQJ0IARqQcABa0EKNgIAIAEsAAFBA3QgA2pBgANrKAIAIQpBASERIAFBA2oMAQsgEQ0IQQAhEUEAIQogAARAIAIgAigCACIBQQRqNgIAIAEoAgAhCgsgBSgCTEEBagsiATYCTCAKQX9KDQFBACAKayEKIAhBgMAAciEIDAELIAVBzABqEKcBIgpBAEgNBiAFKAJMIQELQX8hCQJAIAEtAABBLkcNACABLQABQSpGBEACQCABLAACQTBrQQpPDQAgBSgCTCIBLQADQSRHDQAgASwAAkECdCAEakHAAWtBCjYCACABLAACQQN0IANqQYADaygCACEJIAUgAUEEaiIBNgJMDAILIBENByAABH8gAiACKAIAIgFBBGo2AgAgASgCAAVBAAshCSAFIAUoAkxBAmoiATYCTAwBCyAFIAFBAWo2AkwgBUHMAGoQpwEhCSAFKAJMIQELQQAhBgNAIAYhEkF/IQsgASwAAEHBAGtBOUsNByAFIAFBAWoiDDYCTCABLAAAIQYgDCEBIAYgEkE6bGpB74IBai0AACIGQQFrQQhJDQALIAZBE0YNAiAGRQ0GIA9BAE4EQCAEIA9BAnRqIAY2AgAgBSADIA9BA3RqKQMANwNADAQLIAANAQtBACELDAULIAVBQGsgBiACEKgBIAUoAkwhDAwCCyAPQX9KDQMLQQAhASAARQ0ECyAIQf//e3EiDiAIIAhBgMAAcRshBkEAIQtBpAghDyAQIQgCQAJAAkACfwJAAkACQAJAAn8CQAJAAkACQAJAAkACQCAMQQFrLAAAIgFBX3EgASABQQ9xQQNGGyABIBIbIgFB2ABrDiEEEhISEhISEhIOEg8GDg4OEgYSEhISAgUDEhIJEgESEgQACwJAIAFBwQBrDgcOEgsSDg4OAAsgAUHTAEYNCQwRCyAFKQNAIRRBpAgMBQtBACEBAkACQAJAAkACQAJAAkAgEkH/AXEOCAABAgMEFwUGFwsgBSgCQCANNgIADBYLIAUoAkAgDTYCAAwVCyAFKAJAIA2sNwMADBQLIAUoAkAgDTsBAAwTCyAFKAJAIA06AAAMEgsgBSgCQCANNgIADBELIAUoAkAgDaw3AwAMEAsgCUEIIAlBCEsbIQkgBkEIciEGQfgAIQELIBAhByABQSBxIQ4gBSkDQCIUUEUEQANAIAdBAWsiByAUp0EPcUGAhwFqLQAAIA5yOgAAIBRCD1YhDCAUQgSIIRQgDA0ACwsgBSkDQFANAyAGQQhxRQ0DIAFBBHZBpAhqIQ9BAiELDAMLIBAhASAFKQNAIhRQRQRAA0AgAUEBayIBIBSnQQdxQTByOgAAIBRCB1YhByAUQgOIIRQgBw0ACwsgASEHIAZBCHFFDQIgCSAQIAdrIgFBAWogASAJSBshCQwCCyAFKQNAIhRCf1cEQCAFQgAgFH0iFDcDQEEBIQtBpAgMAQsgBkGAEHEEQEEBIQtBpQgMAQtBpghBpAggBkEBcSILGwshDyAUIBAQRCEHCyAGQf//e3EgBiAJQX9KGyEGAkAgBSkDQCIUQgBSDQAgCQ0AQQAhCSAQIQcMCgsgCSAUUCAQIAdraiIBIAEgCUgbIQkMCQsgBSgCQCIBQdgSIAEbIgdBACAJEKsBIgEgByAJaiABGyEIIA4hBiABIAdrIAkgARshCQwICyAJBEAgBSgCQAwCC0EAIQEgAEEgIApBACAGECYMAgsgBUEANgIMIAUgBSkDQD4CCCAFIAVBCGo2AkBBfyEJIAVBCGoLIQhBACEBAkADQCAIKAIAIgdFDQECQCAFQQRqIAcQqgEiB0EASCIODQAgByAJIAFrSw0AIAhBBGohCCAJIAEgB2oiAUsNAQwCCwtBfyELIA4NBQsgAEEgIAogASAGECYgAUUEQEEAIQEMAQtBACEIIAUoAkAhDANAIAwoAgAiB0UNASAFQQRqIAcQqgEiByAIaiIIIAFKDQEgACAFQQRqIAcQIiAMQQRqIQwgASAISw0ACwsgAEEgIAogASAGQYDAAHMQJiAKIAEgASAKSBshAQwFCyAAIAUrA0AgCiAJIAYgAUEXERkAIQEMBAsgBSAFKQNAPAA3QQEhCSATIQcgDiEGDAILQX8hCwsgBUHQAGokACALDwsgAEEgIAsgCCAHayIOIAkgCSAOSBsiDGoiCCAKIAggCkobIgEgCCAGECYgACAPIAsQIiAAQTAgASAIIAZBgIAEcxAmIABBMCAMIA5BABAmIAAgByAOECIgAEEgIAEgCCAGQYDAAHMQJgwACwALkAIBA38CQCABIAIoAhAiBAR/IAQFQQAhBAJ/IAIgAi0ASiIDQQFrIANyOgBKIAIoAgAiA0EIcQRAIAIgA0EgcjYCAEF/DAELIAJCADcCBCACIAIoAiwiAzYCHCACIAM2AhQgAiADIAIoAjBqNgIQQQALDQEgAigCEAsgAigCFCIFa0sEQCACIAAgASACKAIkEQEADwsCfyACLABLQX9KBEAgASEEA0AgASAEIgNFDQIaIAAgA0EBayIEai0AAEEKRw0ACyACIAAgAyACKAIkEQEAIgQgA0kNAiAAIANqIQAgAigCFCEFIAEgA2sMAQsgAQshBCAFIAAgBBAZGiACIAIoAhQgBGo2AhQgASEECyAEC0gCAX8BfiMAQRBrIgMkACADIAA2AgwgAyABNgIIIAMgAjYCBCADKAIMIAMoAgggAygCBCADKAIMQQhqEFghBCADQRBqJAAgBAt3AQF/IwBBEGsiASAANgIIIAFChSo3AwACQCABKAIIRQRAIAFBADYCDAwBCwNAIAEoAggtAAAEQCABIAEoAggtAACtIAEpAwBCIX58Qv////8PgzcDACABIAEoAghBAWo2AggMAQsLIAEgASkDAD4CDAsgASgCDAuHBQEBfyMAQTBrIgUkACAFIAA2AiggBSABNgIkIAUgAjcDGCAFIAM2AhQgBSAENgIQAkACQAJAIAUoAihFDQAgBSgCJEUNACAFKQMYQv///////////wBYDQELIAUoAhBBEkEAEBQgBUEAOgAvDAELIAUoAigoAgBFBEAgBSgCKEGAAiAFKAIQEFpBAXFFBEAgBUEAOgAvDAILCyAFIAUoAiQQczYCDCAFIAUoAgwgBSgCKCgCAHA2AgggBSAFKAIoKAIQIAUoAghBAnRqKAIANgIEA0ACQCAFKAIERQ0AAkAgBSgCBCgCHCAFKAIMRw0AIAUoAiQgBSgCBCgCABBbDQACQAJAIAUoAhRBCHEEQCAFKAIEKQMIQn9SDQELIAUoAgQpAxBCf1ENAQsgBSgCEEEKQQAQFCAFQQA6AC8MBAsMAQsgBSAFKAIEKAIYNgIEDAELCyAFKAIERQRAIAVBIBAYIgA2AgQgAEUEQCAFKAIQQQ5BABAUIAVBADoALwwCCyAFKAIEIAUoAiQ2AgAgBSgCBCAFKAIoKAIQIAUoAghBAnRqKAIANgIYIAUoAigoAhAgBSgCCEECdGogBSgCBDYCACAFKAIEIAUoAgw2AhwgBSgCBEJ/NwMIIAUoAigiACAAKQMIQgF8NwMIAkAgBSgCKCIAKQMIuiAAKAIAuEQAAAAAAADoP6JkRQ0AIAUoAigoAgBBgICAgHhPDQAgBSgCKCAFKAIoKAIAQQF0IAUoAhAQWkEBcUUEQCAFQQA6AC8MAwsLCyAFKAIUQQhxBEAgBSgCBCAFKQMYNwMICyAFKAIEIAUpAxg3AxAgBUEBOgAvCyAFLQAvQQFxIQAgBUEwaiQAIAAL1BEBAX8jAEGwAWsiBiQAIAYgADYCqAEgBiABNgKkASAGIAI2AqABIAYgAzYCnAEgBiAENgKYASAGIAU2ApQBIAZBADYCkAEDQCAGKAKQAUEPS0UEQCAGQSBqIAYoApABQQF0akEAOwEAIAYgBigCkAFBAWo2ApABDAELCyAGQQA2AowBA0AgBigCjAEgBigCoAFPRQRAIAZBIGogBigCpAEgBigCjAFBAXRqLwEAQQF0aiIAIAAvAQBBAWo7AQAgBiAGKAKMAUEBajYCjAEMAQsLIAYgBigCmAEoAgA2AoABIAZBDzYChAEDQAJAIAYoAoQBQQFJDQAgBkEgaiAGKAKEAUEBdGovAQANACAGIAYoAoQBQQFrNgKEAQwBCwsgBigCgAEgBigChAFLBEAgBiAGKAKEATYCgAELAkAgBigChAFFBEAgBkHAADoAWCAGQQE6AFkgBkEAOwFaIAYoApwBIgEoAgAhACABIABBBGo2AgAgACAGQdgAaigBADYBACAGKAKcASIBKAIAIQAgASAAQQRqNgIAIAAgBkHYAGooAQA2AQAgBigCmAFBATYCACAGQQA2AqwBDAELIAZBATYCiAEDQAJAIAYoAogBIAYoAoQBTw0AIAZBIGogBigCiAFBAXRqLwEADQAgBiAGKAKIAUEBajYCiAEMAQsLIAYoAoABIAYoAogBSQRAIAYgBigCiAE2AoABCyAGQQE2AnQgBkEBNgKQAQNAIAYoApABQQ9NBEAgBiAGKAJ0QQF0NgJ0IAYgBigCdCAGQSBqIAYoApABQQF0ai8BAGs2AnQgBigCdEEASARAIAZBfzYCrAEMAwUgBiAGKAKQAUEBajYCkAEMAgsACwsCQCAGKAJ0QQBMDQAgBigCqAEEQCAGKAKEAUEBRg0BCyAGQX82AqwBDAELIAZBADsBAiAGQQE2ApABA0AgBigCkAFBD09FBEAgBigCkAFBAWpBAXQgBmogBigCkAFBAXQgBmovAQAgBkEgaiAGKAKQAUEBdGovAQBqOwEAIAYgBigCkAFBAWo2ApABDAELCyAGQQA2AowBA0AgBigCjAEgBigCoAFJBEAgBigCpAEgBigCjAFBAXRqLwEABEAgBigClAEhASAGKAKkASAGKAKMASICQQF0ai8BAEEBdCAGaiIDLwEAIQAgAyAAQQFqOwEAIABB//8DcUEBdCABaiACOwEACyAGIAYoAowBQQFqNgKMAQwBCwsCQAJAAkACQCAGKAKoAQ4CAAECCyAGIAYoApQBIgA2AkwgBiAANgJQIAZBFDYCSAwCCyAGQYDwADYCUCAGQcDwADYCTCAGQYECNgJIDAELIAZBgPEANgJQIAZBwPEANgJMIAZBADYCSAsgBkEANgJsIAZBADYCjAEgBiAGKAKIATYCkAEgBiAGKAKcASgCADYCVCAGIAYoAoABNgJ8IAZBADYCeCAGQX82AmAgBkEBIAYoAoABdDYCcCAGIAYoAnBBAWs2AlwCQAJAIAYoAqgBQQFGBEAgBigCcEHUBksNAQsgBigCqAFBAkcNASAGKAJwQdAETQ0BCyAGQQE2AqwBDAELA0AgBiAGKAKQASAGKAJ4azoAWQJAIAYoAkggBigClAEgBigCjAFBAXRqLwEAQQFqSwRAIAZBADoAWCAGIAYoApQBIAYoAowBQQF0ai8BADsBWgwBCwJAIAYoApQBIAYoAowBQQF0ai8BACAGKAJITwRAIAYgBigCTCAGKAKUASAGKAKMAUEBdGovAQAgBigCSGtBAXRqLwEAOgBYIAYgBigCUCAGKAKUASAGKAKMAUEBdGovAQAgBigCSGtBAXRqLwEAOwFaDAELIAZB4AA6AFggBkEAOwFaCwsgBkEBIAYoApABIAYoAnhrdDYCaCAGQQEgBigCfHQ2AmQgBiAGKAJkNgKIAQNAIAYgBigCZCAGKAJoazYCZCAGKAJUIAYoAmQgBigCbCAGKAJ4dmpBAnRqIAZB2ABqKAEANgEAIAYoAmQNAAsgBkEBIAYoApABQQFrdDYCaANAIAYoAmwgBigCaHEEQCAGIAYoAmhBAXY2AmgMAQsLAkAgBigCaARAIAYgBigCbCAGKAJoQQFrcTYCbCAGIAYoAmggBigCbGo2AmwMAQsgBkEANgJsCyAGIAYoAowBQQFqNgKMASAGQSBqIAYoApABQQF0aiIBLwEAQQFrIQAgASAAOwEAAkAgAEH//wNxRQRAIAYoApABIAYoAoQBRg0BIAYgBigCpAEgBigClAEgBigCjAFBAXRqLwEAQQF0ai8BADYCkAELAkAgBigCkAEgBigCgAFNDQAgBigCYCAGKAJsIAYoAlxxRg0AIAYoAnhFBEAgBiAGKAKAATYCeAsgBiAGKAJUIAYoAogBQQJ0ajYCVCAGIAYoApABIAYoAnhrNgJ8IAZBASAGKAJ8dDYCdANAAkAgBigChAEgBigCfCAGKAJ4ak0NACAGIAYoAnQgBkEgaiAGKAJ8IAYoAnhqQQF0ai8BAGs2AnQgBigCdEEATA0AIAYgBigCfEEBajYCfCAGIAYoAnRBAXQ2AnQMAQsLIAYgBigCcEEBIAYoAnx0ajYCcAJAAkAgBigCqAFBAUYEQCAGKAJwQdQGSw0BCyAGKAKoAUECRw0BIAYoAnBB0ARNDQELIAZBATYCrAEMBAsgBiAGKAJsIAYoAlxxNgJgIAYoApwBKAIAIAYoAmBBAnRqIAYoAnw6AAAgBigCnAEoAgAgBigCYEECdGogBigCgAE6AAEgBigCnAEoAgAgBigCYEECdGogBigCVCAGKAKcASgCAGtBAnU7AQILDAELCyAGKAJsBEAgBkHAADoAWCAGIAYoApABIAYoAnhrOgBZIAZBADsBWiAGKAJUIAYoAmxBAnRqIAZB2ABqKAEANgEACyAGKAKcASIAIAAoAgAgBigCcEECdGo2AgAgBigCmAEgBigCgAE2AgAgBkEANgKsAQsgBigCrAEhACAGQbABaiQAIAALsQIBAX8jAEEgayIDJAAgAyAANgIYIAMgATYCFCADIAI2AhAgAyADKAIYKAIENgIMIAMoAgwgAygCEEsEQCADIAMoAhA2AgwLAkAgAygCDEUEQCADQQA2AhwMAQsgAygCGCIAIAAoAgQgAygCDGs2AgQgAygCFCADKAIYKAIAIAMoAgwQGRoCQCADKAIYKAIcKAIYQQFGBEAgAygCGCgCMCADKAIUIAMoAgwQPSEAIAMoAhggADYCMAwBCyADKAIYKAIcKAIYQQJGBEAgAygCGCgCMCADKAIUIAMoAgwQGiEAIAMoAhggADYCMAsLIAMoAhgiACADKAIMIAAoAgBqNgIAIAMoAhgiACADKAIMIAAoAghqNgIIIAMgAygCDDYCHAsgAygCHCEAIANBIGokACAACzYBAX8jAEEQayIBJAAgASAANgIMIAEoAgwQXiABKAIMKAIAEDcgASgCDCgCBBA3IAFBEGokAAvtAQEBfyMAQRBrIgEgADYCCAJAAkACQCABKAIIRQ0AIAEoAggoAiBFDQAgASgCCCgCJA0BCyABQQE2AgwMAQsgASABKAIIKAIcNgIEAkACQCABKAIERQ0AIAEoAgQoAgAgASgCCEcNACABKAIEKAIEQSpGDQEgASgCBCgCBEE5Rg0BIAEoAgQoAgRBxQBGDQEgASgCBCgCBEHJAEYNASABKAIEKAIEQdsARg0BIAEoAgQoAgRB5wBGDQEgASgCBCgCBEHxAEYNASABKAIEKAIEQZoFRg0BCyABQQE2AgwMAQsgAUEANgIMCyABKAIMC9IEAQF/IwBBIGsiAyAANgIcIAMgATYCGCADIAI2AhQgAyADKAIcQdwWaiADKAIUQQJ0aigCADYCECADIAMoAhRBAXQ2AgwDQAJAIAMoAgwgAygCHCgC0ChKDQACQCADKAIMIAMoAhwoAtAoTg0AIAMoAhggAygCHCADKAIMQQJ0akHgFmooAgBBAnRqLwEAIAMoAhggAygCHEHcFmogAygCDEECdGooAgBBAnRqLwEATgRAIAMoAhggAygCHCADKAIMQQJ0akHgFmooAgBBAnRqLwEAIAMoAhggAygCHEHcFmogAygCDEECdGooAgBBAnRqLwEARw0BIAMoAhwgAygCDEECdGpB4BZqKAIAIAMoAhxB2Chqai0AACADKAIcQdwWaiADKAIMQQJ0aigCACADKAIcQdgoamotAABKDQELIAMgAygCDEEBajYCDAsgAygCGCADKAIQQQJ0ai8BACADKAIYIAMoAhxB3BZqIAMoAgxBAnRqKAIAQQJ0ai8BAEgNAAJAIAMoAhggAygCEEECdGovAQAgAygCGCADKAIcQdwWaiADKAIMQQJ0aigCAEECdGovAQBHDQAgAygCECADKAIcQdgoamotAAAgAygCHEHcFmogAygCDEECdGooAgAgAygCHEHYKGpqLQAASg0ADAELIAMoAhxB3BZqIAMoAhRBAnRqIAMoAhxB3BZqIAMoAgxBAnRqKAIANgIAIAMgAygCDDYCFCADIAMoAgxBAXQ2AgwMAQsLIAMoAhxB3BZqIAMoAhRBAnRqIAMoAhA2AgAL1xMBA38jAEEwayICJAAgAiAANgIsIAIgATYCKCACIAIoAigoAgA2AiQgAiACKAIoKAIIKAIANgIgIAIgAigCKCgCCCgCDDYCHCACQX82AhAgAigCLEEANgLQKCACKAIsQb0ENgLUKCACQQA2AhgDQCACKAIYIAIoAhxIBEACQCACKAIkIAIoAhhBAnRqLwEABEAgAiACKAIYIgE2AhAgAigCLEHcFmohAyACKAIsIgQoAtAoQQFqIQAgBCAANgLQKCAAQQJ0IANqIAE2AgAgAigCGCACKAIsQdgoampBADoAAAwBCyACKAIkIAIoAhhBAnRqQQA7AQILIAIgAigCGEEBajYCGAwBCwsDQCACKAIsKALQKEECSARAAkAgAigCEEECSARAIAIgAigCEEEBaiIANgIQDAELQQAhAAsgAigCLEHcFmohAyACKAIsIgQoAtAoQQFqIQEgBCABNgLQKCABQQJ0IANqIAA2AgAgAiAANgIMIAIoAiQgAigCDEECdGpBATsBACACKAIMIAIoAixB2ChqakEAOgAAIAIoAiwiACAAKAKoLUEBazYCqC0gAigCIARAIAIoAiwiACAAKAKsLSACKAIgIAIoAgxBAnRqLwECazYCrC0LDAELCyACKAIoIAIoAhA2AgQgAiACKAIsKALQKEECbTYCGANAIAIoAhhBAU4EQCACKAIsIAIoAiQgAigCGBB5IAIgAigCGEEBazYCGAwBCwsgAiACKAIcNgIMA0AgAiACKAIsKALgFjYCGCACKAIsQdwWaiEBIAIoAiwiAygC0CghACADIABBAWs2AtAoIAIoAiwgAEECdCABaigCADYC4BYgAigCLCACKAIkQQEQeSACIAIoAiwoAuAWNgIUIAIoAhghASACKAIsQdwWaiEDIAIoAiwiBCgC1ChBAWshACAEIAA2AtQoIABBAnQgA2ogATYCACACKAIUIQEgAigCLEHcFmohAyACKAIsIgQoAtQoQQFrIQAgBCAANgLUKCAAQQJ0IANqIAE2AgAgAigCJCACKAIMQQJ0aiACKAIkIAIoAhhBAnRqLwEAIAIoAiQgAigCFEECdGovAQBqOwEAIAIoAgwgAigCLEHYKGpqAn8gAigCGCACKAIsQdgoamotAAAgAigCFCACKAIsQdgoamotAABOBEAgAigCGCACKAIsQdgoamotAAAMAQsgAigCFCACKAIsQdgoamotAAALQQFqOgAAIAIoAiQgAigCFEECdGogAigCDCIAOwECIAIoAiQgAigCGEECdGogADsBAiACIAIoAgwiAEEBajYCDCACKAIsIAA2AuAWIAIoAiwgAigCJEEBEHkgAigCLCgC0ChBAk4NAAsgAigCLCgC4BYhASACKAIsQdwWaiEDIAIoAiwiBCgC1ChBAWshACAEIAA2AtQoIABBAnQgA2ogATYCACACKAIoIQEjAEFAaiIAIAIoAiw2AjwgACABNgI4IAAgACgCOCgCADYCNCAAIAAoAjgoAgQ2AjAgACAAKAI4KAIIKAIANgIsIAAgACgCOCgCCCgCBDYCKCAAIAAoAjgoAggoAgg2AiQgACAAKAI4KAIIKAIQNgIgIABBADYCBCAAQQA2AhADQCAAKAIQQQ9MBEAgACgCPEG8FmogACgCEEEBdGpBADsBACAAIAAoAhBBAWo2AhAMAQsLIAAoAjQgACgCPEHcFmogACgCPCgC1ChBAnRqKAIAQQJ0akEAOwECIAAgACgCPCgC1ChBAWo2AhwDQCAAKAIcQb0ESARAIAAgACgCPEHcFmogACgCHEECdGooAgA2AhggACAAKAI0IAAoAjQgACgCGEECdGovAQJBAnRqLwECQQFqNgIQIAAoAhAgACgCIEoEQCAAIAAoAiA2AhAgACAAKAIEQQFqNgIECyAAKAI0IAAoAhhBAnRqIAAoAhA7AQIgACgCGCAAKAIwTARAIAAoAjwgACgCEEEBdGpBvBZqIgEgAS8BAEEBajsBACAAQQA2AgwgACgCGCAAKAIkTgRAIAAgACgCKCAAKAIYIAAoAiRrQQJ0aigCADYCDAsgACAAKAI0IAAoAhhBAnRqLwEAOwEKIAAoAjwiASABKAKoLSAALwEKIAAoAhAgACgCDGpsajYCqC0gACgCLARAIAAoAjwiASABKAKsLSAALwEKIAAoAiwgACgCGEECdGovAQIgACgCDGpsajYCrC0LCyAAIAAoAhxBAWo2AhwMAQsLAkAgACgCBEUNAANAIAAgACgCIEEBazYCEANAIAAoAjxBvBZqIAAoAhBBAXRqLwEARQRAIAAgACgCEEEBazYCEAwBCwsgACgCPCAAKAIQQQF0akG8FmoiASABLwEAQQFrOwEAIAAoAjwgACgCEEEBdGpBvhZqIgEgAS8BAEECajsBACAAKAI8IAAoAiBBAXRqQbwWaiIBIAEvAQBBAWs7AQAgACAAKAIEQQJrNgIEIAAoAgRBAEoNAAsgACAAKAIgNgIQA0AgACgCEEUNASAAIAAoAjxBvBZqIAAoAhBBAXRqLwEANgIYA0AgACgCGARAIAAoAjxB3BZqIQEgACAAKAIcQQFrIgM2AhwgACADQQJ0IAFqKAIANgIUIAAoAhQgACgCMEoNASAAKAI0IAAoAhRBAnRqLwECIAAoAhBHBEAgACgCPCIBIAEoAqgtIAAoAjQgACgCFEECdGovAQAgACgCECAAKAI0IAAoAhRBAnRqLwECa2xqNgKoLSAAKAI0IAAoAhRBAnRqIAAoAhA7AQILIAAgACgCGEEBazYCGAwBCwsgACAAKAIQQQFrNgIQDAALAAsgAigCJCEBIAIoAhAhAyACKAIsQbwWaiEEIwBBQGoiACQAIAAgATYCPCAAIAM2AjggACAENgI0IABBADYCDCAAQQE2AggDQCAAKAIIQQ9MBEAgACAAKAIMIAAoAjQgACgCCEEBa0EBdGovAQBqQQF0NgIMIABBEGogACgCCEEBdGogACgCDDsBACAAIAAoAghBAWo2AggMAQsLIABBADYCBANAIAAoAgQgACgCOEwEQCAAIAAoAjwgACgCBEECdGovAQI2AgAgACgCAARAIABBEGogACgCAEEBdGoiAS8BACEDIAEgA0EBajsBACAAKAIAIQQjAEEQayIBIAM2AgwgASAENgIIIAFBADYCBANAIAEgASgCBCABKAIMQQFxcjYCBCABIAEoAgxBAXY2AgwgASABKAIEQQF0NgIEIAEgASgCCEEBayIDNgIIIANBAEoNAAsgASgCBEEBdiEBIAAoAjwgACgCBEECdGogATsBAAsgACAAKAIEQQFqNgIEDAELCyAAQUBrJAAgAkEwaiQAC04BAX8jAEEQayICIAA7AQogAiABNgIEAkAgAi8BCkEBRgRAIAIoAgRBAUYEQCACQQA2AgwMAgsgAkEENgIMDAELIAJBADYCDAsgAigCDAvOAgEBfyMAQTBrIgUkACAFIAA2AiwgBSABNgIoIAUgAjYCJCAFIAM3AxggBSAENgIUIAVCADcDCANAIAUpAwggBSkDGFQEQCAFIAUoAiQgBSkDCKdqLQAAOgAHIAUoAhRFBEAgBSAFKAIsKAIUQQJyOwESIAUgBS8BEiAFLwESQQFzbEEIdjsBEiAFIAUtAAcgBS8BEkH/AXFzOgAHCyAFKAIoBEAgBSgCKCAFKQMIp2ogBS0ABzoAAAsgBSgCLCgCDEF/cyAFQQdqQQEQGkF/cyEAIAUoAiwgADYCDCAFKAIsIAUoAiwoAhAgBSgCLCgCDEH/AXFqQYWIosAAbEEBajYCECAFIAUoAiwoAhBBGHY6AAcgBSgCLCgCFEF/cyAFQQdqQQEQGkF/cyEAIAUoAiwgADYCFCAFIAUpAwhCAXw3AwgMAQsLIAVBMGokAAttAQF/IwBBIGsiBCQAIAQgADYCGCAEIAE2AhQgBCACNwMIIAQgAzYCBAJAIAQoAhhFBEAgBEEANgIcDAELIAQgBCgCFCAEKQMIIAQoAgQgBCgCGEEIahDEATYCHAsgBCgCHCEAIARBIGokACAAC6cDAQF/IwBBIGsiBCQAIAQgADYCGCAEIAE3AxAgBCACNgIMIAQgAzYCCCAEIAQoAhggBCkDECAEKAIMQQAQPyIANgIAAkAgAEUEQCAEQX82AhwMAQsgBCAEKAIYIAQpAxAgBCgCDBDFASIANgIEIABFBEAgBEF/NgIcDAELAkACQCAEKAIMQQhxDQAgBCgCGCgCQCAEKQMQp0EEdGooAghFDQAgBCgCGCgCQCAEKQMQp0EEdGooAgggBCgCCBA5QQBIBEAgBCgCGEEIakEPQQAQFCAEQX82AhwMAwsMAQsgBCgCCBA7IAQoAgggBCgCACgCGDYCLCAEKAIIIAQoAgApAyg3AxggBCgCCCAEKAIAKAIUNgIoIAQoAgggBCgCACkDIDcDICAEKAIIIAQoAgAoAhA7ATAgBCgCCCAEKAIALwFSOwEyIAQoAghBIEEAIAQoAgAtAAZBAXEbQdwBcq03AwALIAQoAgggBCkDEDcDECAEKAIIIAQoAgQ2AgggBCgCCCIAIAApAwBCA4Q3AwAgBEEANgIcCyAEKAIcIQAgBEEgaiQAIAALWQIBfwF+AkACf0EAIABFDQAaIACtIAGtfiIDpyICIAAgAXJBgIAESQ0AGkF/IAIgA0IgiKcbCyICEBgiAEUNACAAQQRrLQAAQQNxRQ0AIABBACACEDMLIAALAwABC+oBAgF/AX4jAEEgayIEJAAgBCAANgIYIAQgATYCFCAEIAI2AhAgBCADNgIMIAQgBCgCDBCCASIANgIIAkAgAEUEQCAEQQA2AhwMAQsjAEEQayIAIAQoAhg2AgwgACgCDCIAIAAoAjBBAWo2AjAgBCgCCCAEKAIYNgIAIAQoAgggBCgCFDYCBCAEKAIIIAQoAhA2AgggBCgCGCAEKAIQQQBCAEEOIAQoAhQRCgAhBSAEKAIIIAU3AxggBCgCCCkDGEIAUwRAIAQoAghCPzcDGAsgBCAEKAIINgIcCyAEKAIcIQAgBEEgaiQAIAAL6gEBAX8jAEEQayIBJAAgASAANgIIIAFBOBAYIgA2AgQCQCAARQRAIAEoAghBDkEAEBQgAUEANgIMDAELIAEoAgRBADYCACABKAIEQQA2AgQgASgCBEEANgIIIAEoAgRBADYCICABKAIEQQA2AiQgASgCBEEAOgAoIAEoAgRBADYCLCABKAIEQQE2AjAjAEEQayIAIAEoAgRBDGo2AgwgACgCDEEANgIAIAAoAgxBADYCBCAAKAIMQQA2AgggASgCBEEAOgA0IAEoAgRBADoANSABIAEoAgQ2AgwLIAEoAgwhACABQRBqJAAgAAuwAQIBfwF+IwBBIGsiAyQAIAMgADYCGCADIAE2AhQgAyACNgIQIAMgAygCEBCCASIANgIMAkAgAEUEQCADQQA2AhwMAQsgAygCDCADKAIYNgIEIAMoAgwgAygCFDYCCCADKAIUQQBCAEEOIAMoAhgRDgAhBCADKAIMIAQ3AxggAygCDCkDGEIAUwRAIAMoAgxCPzcDGAsgAyADKAIMNgIcCyADKAIcIQAgA0EgaiQAIAALwwIBAX8jAEEQayIDIAA2AgwgAyABNgIIIAMgAjYCBCADKAIIKQMAQgKDQgBSBEAgAygCDCADKAIIKQMQNwMQCyADKAIIKQMAQgSDQgBSBEAgAygCDCADKAIIKQMYNwMYCyADKAIIKQMAQgiDQgBSBEAgAygCDCADKAIIKQMgNwMgCyADKAIIKQMAQhCDQgBSBEAgAygCDCADKAIIKAIoNgIoCyADKAIIKQMAQiCDQgBSBEAgAygCDCADKAIIKAIsNgIsCyADKAIIKQMAQsAAg0IAUgRAIAMoAgwgAygCCC8BMDsBMAsgAygCCCkDAEKAAYNCAFIEQCADKAIMIAMoAggvATI7ATILIAMoAggpAwBCgAKDQgBSBEAgAygCDCADKAIIKAI0NgI0CyADKAIMIgAgAygCCCkDACAAKQMAhDcDAEEAC10BAX8jAEEQayICJAAgAiAANgIIIAIgATYCBAJAIAIoAgRFBEAgAkEANgIMDAELIAIgAigCCCACKAIEKAIAIAIoAgQvAQStEDY2AgwLIAIoAgwhACACQRBqJAAgAAuPAQEBfyMAQRBrIgIkACACIAA2AgggAiABNgIEAkACQCACKAIIBEAgAigCBA0BCyACIAIoAgggAigCBEY2AgwMAQsgAigCCC8BBCACKAIELwEERwRAIAJBADYCDAwBCyACIAIoAggoAgAgAigCBCgCACACKAIILwEEEE9FNgIMCyACKAIMIQAgAkEQaiQAIAALVQEBfyMAQRBrIgEkACABIAA2AgwgAUEAQQBBABAaNgIIIAEoAgwEQCABIAEoAgggASgCDCgCACABKAIMLwEEEBo2AggLIAEoAgghACABQRBqJAAgAAufAgEBfyMAQUBqIgUkACAFIAA3AzAgBSABNwMoIAUgAjYCJCAFIAM3AxggBSAENgIUIAUCfyAFKQMYQhBUBEAgBSgCFEESQQAQFEEADAELIAUoAiQLNgIEAkAgBSgCBEUEQCAFQn83AzgMAQsCQAJAAkACQAJAIAUoAgQoAggOAwIAAQMLIAUgBSkDMCAFKAIEKQMAfDcDCAwDCyAFIAUpAyggBSgCBCkDAHw3AwgMAgsgBSAFKAIEKQMANwMIDAELIAUoAhRBEkEAEBQgBUJ/NwM4DAELAkAgBSkDCEIAWQRAIAUpAwggBSkDKFgNAQsgBSgCFEESQQAQFCAFQn83AzgMAQsgBSAFKQMINwM4CyAFKQM4IQAgBUFAayQAIAALoAEBAX8jAEEgayIFJAAgBSAANgIYIAUgATYCFCAFIAI7ARIgBSADOgARIAUgBDYCDCAFIAUoAhggBSgCFCAFLwESIAUtABFBAXEgBSgCDBBjIgA2AggCQCAARQRAIAVBADYCHAwBCyAFIAUoAgggBS8BEkEAIAUoAgwQUDYCBCAFKAIIEBUgBSAFKAIENgIcCyAFKAIcIQAgBUEgaiQAIAALpgEBAX8jAEEgayIFJAAgBSAANgIYIAUgATcDECAFIAI2AgwgBSADNgIIIAUgBDYCBCAFIAUoAhggBSkDECAFKAIMQQAQPyIANgIAAkAgAEUEQCAFQX82AhwMAQsgBSgCCARAIAUoAgggBSgCAC8BCEEIdjoAAAsgBSgCBARAIAUoAgQgBSgCACgCRDYCAAsgBUEANgIcCyAFKAIcIQAgBUEgaiQAIAALjQIBAX8jAEEwayIDJAAgAyAANgIoIAMgATsBJiADIAI2AiAgAyADKAIoKAI0IANBHmogAy8BJkGABkEAEGY2AhACQCADKAIQRQ0AIAMvAR5BBUkNAAJAIAMoAhAtAABBAUYNAAwBCyADIAMoAhAgAy8BHq0QKSIANgIUIABFBEAMAQsgAygCFBCXARogAyADKAIUECo2AhggAygCIBCHASADKAIYRgRAIAMgAygCFBAwPQEOIAMgAygCFCADLwEOrRAeIAMvAQ5BgBBBABBQNgIIIAMoAggEQCADKAIgECQgAyADKAIINgIgCwsgAygCFBAWCyADIAMoAiA2AiwgAygCLCEAIANBMGokACAAC9oXAgF/AX4jAEGAAWsiBSQAIAUgADYCdCAFIAE2AnAgBSACNgJsIAUgAzoAayAFIAQ2AmQgBSAFKAJsQQBHOgAdIAVBHkEuIAUtAGtBAXEbNgIoAkACQCAFKAJsBEAgBSgCbBAwIAUoAiitVARAIAUoAmRBE0EAEBQgBUJ/NwN4DAMLDAELIAUgBSgCcCAFKAIorSAFQTBqIAUoAmQQQiIANgJsIABFBEAgBUJ/NwN4DAILCyAFKAJsQgQQHiEAQfESQfYSIAUtAGtBAXEbKAAAIAAoAABHBEAgBSgCZEETQQAQFCAFLQAdQQFxRQRAIAUoAmwQFgsgBUJ/NwN4DAELIAUoAnQQUwJAIAUtAGtBAXFFBEAgBSgCbBAdIQAgBSgCdCAAOwEIDAELIAUoAnRBADsBCAsgBSgCbBAdIQAgBSgCdCAAOwEKIAUoAmwQHSEAIAUoAnQgADsBDCAFKAJsEB1B//8DcSEAIAUoAnQgADYCECAFIAUoAmwQHTsBLiAFIAUoAmwQHTsBLCAFLwEuIQEgBS8BLCECIwBBMGsiACQAIAAgATsBLiAAIAI7ASwgAEIANwIAIABBADYCKCAAQgA3AiAgAEIANwIYIABCADcCECAAQgA3AgggAEEANgIgIAAgAC8BLEEJdkHQAGo2AhQgACAALwEsQQV2QQ9xQQFrNgIQIAAgAC8BLEEfcTYCDCAAIAAvAS5BC3Y2AgggACAALwEuQQV2QT9xNgIEIAAgAC8BLkEBdEE+cTYCACAAEBMhASAAQTBqJAAgASEAIAUoAnQgADYCFCAFKAJsECohACAFKAJ0IAA2AhggBSgCbBAqrSEGIAUoAnQgBjcDICAFKAJsECqtIQYgBSgCdCAGNwMoIAUgBSgCbBAdOwEiIAUgBSgCbBAdOwEeAkAgBS0Aa0EBcQRAIAVBADsBICAFKAJ0QQA2AjwgBSgCdEEAOwFAIAUoAnRBADYCRCAFKAJ0QgA3A0gMAQsgBSAFKAJsEB07ASAgBSgCbBAdQf//A3EhACAFKAJ0IAA2AjwgBSgCbBAdIQAgBSgCdCAAOwFAIAUoAmwQKiEAIAUoAnQgADYCRCAFKAJsECqtIQYgBSgCdCAGNwNICwJ/IwBBEGsiACAFKAJsNgIMIAAoAgwtAABBAXFFCwRAIAUoAmRBFEEAEBQgBS0AHUEBcUUEQCAFKAJsEBYLIAVCfzcDeAwBCwJAIAUoAnQvAQxBAXEEQCAFKAJ0LwEMQcAAcQRAIAUoAnRB//8DOwFSDAILIAUoAnRBATsBUgwBCyAFKAJ0QQA7AVILIAUoAnRBADYCMCAFKAJ0QQA2AjQgBSgCdEEANgI4IAUgBS8BICAFLwEiIAUvAR5qajYCJAJAIAUtAB1BAXEEQCAFKAJsEDAgBSgCJK1UBEAgBSgCZEEVQQAQFCAFQn83A3gMAwsMAQsgBSgCbBAWIAUgBSgCcCAFKAIkrUEAIAUoAmQQQiIANgJsIABFBEAgBUJ/NwN4DAILCyAFLwEiBEAgBSgCbCAFKAJwIAUvASJBASAFKAJkEIkBIQAgBSgCdCAANgIwIAUoAnQoAjBFBEACfyMAQRBrIgAgBSgCZDYCDCAAKAIMKAIAQRFGCwRAIAUoAmRBFUEAEBQLIAUtAB1BAXFFBEAgBSgCbBAWCyAFQn83A3gMAgsgBSgCdC8BDEGAEHEEQCAFKAJ0KAIwQQIQOkEFRgRAIAUoAmRBFUEAEBQgBS0AHUEBcUUEQCAFKAJsEBYLIAVCfzcDeAwDCwsLIAUvAR4EQCAFIAUoAmwgBSgCcCAFLwEeQQAgBSgCZBBjNgIYIAUoAhhFBEAgBS0AHUEBcUUEQCAFKAJsEBYLIAVCfzcDeAwCCyAFKAIYIAUvAR5BgAJBgAQgBS0Aa0EBcRsgBSgCdEE0aiAFKAJkEJQBQQFxRQRAIAUoAhgQFSAFLQAdQQFxRQRAIAUoAmwQFgsgBUJ/NwN4DAILIAUoAhgQFSAFLQBrQQFxBEAgBSgCdEEBOgAECwsgBS8BIARAIAUoAmwgBSgCcCAFLwEgQQAgBSgCZBCJASEAIAUoAnQgADYCOCAFKAJ0KAI4RQRAIAUtAB1BAXFFBEAgBSgCbBAWCyAFQn83A3gMAgsgBSgCdC8BDEGAEHEEQCAFKAJ0KAI4QQIQOkEFRgRAIAUoAmRBFUEAEBQgBS0AHUEBcUUEQCAFKAJsEBYLIAVCfzcDeAwDCwsLIAUoAnRB9eABIAUoAnQoAjAQiwEhACAFKAJ0IAA2AjAgBSgCdEH1xgEgBSgCdCgCOBCLASEAIAUoAnQgADYCOAJAAkAgBSgCdCkDKEL/////D1ENACAFKAJ0KQMgQv////8PUQ0AIAUoAnQpA0hC/////w9SDQELIAUgBSgCdCgCNCAFQRZqQQFBgAJBgAQgBS0Aa0EBcRsgBSgCZBBmNgIMIAUoAgxFBEAgBS0AHUEBcUUEQCAFKAJsEBYLIAVCfzcDeAwCCyAFIAUoAgwgBS8BFq0QKSIANgIQIABFBEAgBSgCZEEOQQAQFCAFLQAdQQFxRQRAIAUoAmwQFgsgBUJ/NwN4DAILAkAgBSgCdCkDKEL/////D1EEQCAFKAIQEDEhBiAFKAJ0IAY3AygMAQsgBS0Aa0EBcQRAIAUoAhAhASMAQSBrIgAkACAAIAE2AhggAEIINwMQIAAgACgCGCkDECAAKQMQfDcDCAJAIAApAwggACgCGCkDEFQEQCAAKAIYQQA6AAAgAEF/NgIcDAELIAAgACgCGCAAKQMIECw2AhwLIAAoAhwaIABBIGokAAsLIAUoAnQpAyBC/////w9RBEAgBSgCEBAxIQYgBSgCdCAGNwMgCyAFLQBrQQFxRQRAIAUoAnQpA0hC/////w9RBEAgBSgCEBAxIQYgBSgCdCAGNwNICyAFKAJ0KAI8Qf//A0YEQCAFKAIQECohACAFKAJ0IAA2AjwLCyAFKAIQEEdBAXFFBEAgBSgCZEEVQQAQFCAFKAIQEBYgBS0AHUEBcUUEQCAFKAJsEBYLIAVCfzcDeAwCCyAFKAIQEBYLAn8jAEEQayIAIAUoAmw2AgwgACgCDC0AAEEBcUULBEAgBSgCZEEUQQAQFCAFLQAdQQFxRQRAIAUoAmwQFgsgBUJ/NwN4DAELIAUtAB1BAXFFBEAgBSgCbBAWCyAFKAJ0KQNIQv///////////wBWBEAgBSgCZEEEQRYQFCAFQn83A3gMAQsCfyAFKAJ0IQEgBSgCZCECIwBBIGsiACQAIAAgATYCGCAAIAI2AhQCQCAAKAIYKAIQQeMARwRAIABBAToAHwwBCyAAIAAoAhgoAjQgAEESakGBsgJBgAZBABBmNgIIAkAgACgCCARAIAAvARJBB08NAQsgACgCFEEVQQAQFCAAQQA6AB8MAQsgACAAKAIIIAAvARKtECkiATYCDCABRQRAIAAoAhRBFEEAEBQgAEEAOgAfDAELIABBAToABwJAAkACQCAAKAIMEB1BAWsOAgIAAQsgACgCGCkDKEIUVARAIABBADoABwsMAQsgACgCFEEYQQAQFCAAKAIMEBYgAEEAOgAfDAELIAAoAgxCAhAeLwAAQcGKAUcEQCAAKAIUQRhBABAUIAAoAgwQFiAAQQA6AB8MAQsCQAJAAkACQAJAIAAoAgwQlwFBAWsOAwABAgMLIABBgQI7AQQMAwsgAEGCAjsBBAwCCyAAQYMCOwEEDAELIAAoAhRBGEEAEBQgACgCDBAWIABBADoAHwwBCyAALwESQQdHBEAgACgCFEEVQQAQFCAAKAIMEBYgAEEAOgAfDAELIAAoAhggAC0AB0EBcToABiAAKAIYIAAvAQQ7AVIgACgCDBAdQf//A3EhASAAKAIYIAE2AhAgACgCDBAWIABBAToAHwsgAC0AH0EBcSEBIABBIGokACABQQFxRQsEQCAFQn83A3gMAQsgBSgCdCgCNBCTASEAIAUoAnQgADYCNCAFIAUoAiggBSgCJGqtNwN4CyAFKQN4IQYgBUGAAWokACAGC80BAQF/IwBBEGsiAyQAIAMgADYCDCADIAE2AgggAyACNgIEIAMgA0EMakG4mwEQEjYCAAJAIAMoAgBFBEAgAygCBEEhOwEAIAMoAghBADsBAAwBCyADKAIAKAIUQdAASARAIAMoAgBB0AA2AhQLIAMoAgQgAygCACgCDCADKAIAKAIUQQl0IAMoAgAoAhBBBXRqQeC/AmtqOwEAIAMoAgggAygCACgCCEELdCADKAIAKAIEQQV0aiADKAIAKAIAQQF1ajsBAAsgA0EQaiQAC4MDAQF/IwBBIGsiAyQAIAMgADsBGiADIAE2AhQgAyACNgIQIAMgAygCFCADQQhqQcAAQQAQRiIANgIMAkAgAEUEQCADQQA2AhwMAQsgAygCCEEFakH//wNLBEAgAygCEEESQQAQFCADQQA2AhwMAQsgA0EAIAMoAghBBWqtECkiADYCBCAARQRAIAMoAhBBDkEAEBQgA0EANgIcDAELIAMoAgRBARCWASADKAIEIAMoAhQQhwEQISADKAIEIAMoAgwgAygCCBBBAn8jAEEQayIAIAMoAgQ2AgwgACgCDC0AAEEBcUULBEAgAygCEEEUQQAQFCADKAIEEBYgA0EANgIcDAELIAMgAy8BGgJ/IwBBEGsiACADKAIENgIMAn4gACgCDC0AAEEBcQRAIAAoAgwpAxAMAQtCAAunQf//A3ELAn8jAEEQayIAIAMoAgQ2AgwgACgCDCgCBAtBgAYQVTYCACADKAIEEBYgAyADKAIANgIcCyADKAIcIQAgA0EgaiQAIAALtAIBAX8jAEEwayIDJAAgAyAANgIoIAMgATcDICADIAI2AhwCQCADKQMgUARAIANBAToALwwBCyADIAMoAigpAxAgAykDIHw3AwgCQCADKQMIIAMpAyBaBEAgAykDCEL/////AFgNAQsgAygCHEEOQQAQFCADQQA6AC8MAQsgAyADKAIoKAIAIAMpAwinQQR0EE4iADYCBCAARQRAIAMoAhxBDkEAEBQgA0EAOgAvDAELIAMoAiggAygCBDYCACADIAMoAigpAwg3AxADQCADKQMQIAMpAwhaRQRAIAMoAigoAgAgAykDEKdBBHRqELUBIAMgAykDEEIBfDcDEAwBCwsgAygCKCADKQMIIgE3AxAgAygCKCABNwMIIANBAToALwsgAy0AL0EBcSEAIANBMGokACAAC8wBAQF/IwBBIGsiAiQAIAIgADcDECACIAE2AgwgAkEwEBgiATYCCAJAIAFFBEAgAigCDEEOQQAQFCACQQA2AhwMAQsgAigCCEEANgIAIAIoAghCADcDECACKAIIQgA3AwggAigCCEIANwMgIAIoAghCADcDGCACKAIIQQA2AiggAigCCEEAOgAsIAIoAgggAikDECACKAIMEI8BQQFxRQRAIAIoAggQJSACQQA2AhwMAQsgAiACKAIINgIcCyACKAIcIQEgAkEgaiQAIAEL1gIBAX8jAEEgayIDJAAgAyAANgIYIAMgATYCFCADIAI2AhAgAyADQQxqQgQQKTYCCAJAIAMoAghFBEAgA0F/NgIcDAELA0AgAygCFARAIAMoAhQoAgQgAygCEHFBgAZxBEAgAygCCEIAECwaIAMoAgggAygCFC8BCBAfIAMoAgggAygCFC8BChAfAn8jAEEQayIAIAMoAgg2AgwgACgCDC0AAEEBcUULBEAgAygCGEEIakEUQQAQFCADKAIIEBYgA0F/NgIcDAQLIAMoAhggA0EMakIEEDZBAEgEQCADKAIIEBYgA0F/NgIcDAQLIAMoAhQvAQoEQCADKAIYIAMoAhQoAgwgAygCFC8BCq0QNkEASARAIAMoAggQFiADQX82AhwMBQsLCyADIAMoAhQoAgA2AhQMAQsLIAMoAggQFiADQQA2AhwLIAMoAhwhACADQSBqJAAgAAtoAQF/IwBBEGsiAiAANgIMIAIgATYCCCACQQA7AQYDQCACKAIMBEAgAigCDCgCBCACKAIIcUGABnEEQCACIAIoAgwvAQogAi8BBkEEamo7AQYLIAIgAigCDCgCADYCDAwBCwsgAi8BBgvwAQEBfyMAQRBrIgEkACABIAA2AgwgASABKAIMNgIIIAFBADYCBANAIAEoAgwEQAJAAkAgASgCDC8BCEH1xgFGDQAgASgCDC8BCEH14AFGDQAgASgCDC8BCEGBsgJGDQAgASgCDC8BCEEBRw0BCyABIAEoAgwoAgA2AgAgASgCCCABKAIMRgRAIAEgASgCADYCCAsgASgCDEEANgIAIAEoAgwQIyABKAIEBEAgASgCBCABKAIANgIACyABIAEoAgA2AgwMAgsgASABKAIMNgIEIAEgASgCDCgCADYCDAwBCwsgASgCCCEAIAFBEGokACAAC7IEAQF/IwBBQGoiBSQAIAUgADYCOCAFIAE7ATYgBSACNgIwIAUgAzYCLCAFIAQ2AiggBSAFKAI4IAUvATatECkiADYCJAJAIABFBEAgBSgCKEEOQQAQFCAFQQA6AD8MAQsgBUEANgIgIAVBADYCGANAAn8jAEEQayIAIAUoAiQ2AgwgACgCDC0AAEEBcQsEfyAFKAIkEDBCBFoFQQALQQFxBEAgBSAFKAIkEB07ARYgBSAFKAIkEB07ARQgBSAFKAIkIAUvARStEB42AhAgBSgCEEUEQCAFKAIoQRVBABAUIAUoAiQQFiAFKAIYECMgBUEAOgA/DAMLIAUgBS8BFiAFLwEUIAUoAhAgBSgCMBBVIgA2AhwgAEUEQCAFKAIoQQ5BABAUIAUoAiQQFiAFKAIYECMgBUEAOgA/DAMLAkAgBSgCGARAIAUoAiAgBSgCHDYCACAFIAUoAhw2AiAMAQsgBSAFKAIcIgA2AiAgBSAANgIYCwwBCwsgBSgCJBBHQQFxRQRAIAUgBSgCJBAwPgIMIAUgBSgCJCAFKAIMrRAeNgIIAkACQCAFKAIMQQRPDQAgBSgCCEUNACAFKAIIQZEVIAUoAgwQT0UNAQsgBSgCKEEVQQAQFCAFKAIkEBYgBSgCGBAjIAVBADoAPwwCCwsgBSgCJBAWAkAgBSgCLARAIAUoAiwgBSgCGDYCAAwBCyAFKAIYECMLIAVBAToAPwsgBS0AP0EBcSEAIAVBQGskACAAC+8CAQF/IwBBIGsiAiQAIAIgADYCGCACIAE2AhQCQCACKAIYRQRAIAIgAigCFDYCHAwBCyACIAIoAhg2AggDQCACKAIIKAIABEAgAiACKAIIKAIANgIIDAELCwNAIAIoAhQEQCACIAIoAhQoAgA2AhAgAkEANgIEIAIgAigCGDYCDANAAkAgAigCDEUNAAJAIAIoAgwvAQggAigCFC8BCEcNACACKAIMLwEKIAIoAhQvAQpHDQAgAigCDC8BCgRAIAIoAgwoAgwgAigCFCgCDCACKAIMLwEKEE8NAQsgAigCDCIAIAAoAgQgAigCFCgCBEGABnFyNgIEIAJBATYCBAwBCyACIAIoAgwoAgA2AgwMAQsLIAIoAhRBADYCAAJAIAIoAgQEQCACKAIUECMMAQsgAigCCCACKAIUIgA2AgAgAiAANgIICyACIAIoAhA2AhQMAQsLIAIgAigCGDYCHAsgAigCHCEAIAJBIGokACAAC18BAX8jAEEQayICJAAgAiAANgIIIAIgAToAByACIAIoAghCARAeNgIAAkAgAigCAEUEQCACQX82AgwMAQsgAigCACACLQAHOgAAIAJBADYCDAsgAigCDBogAkEQaiQAC1QBAX8jAEEQayIBJAAgASAANgIIIAEgASgCCEIBEB42AgQCQCABKAIERQRAIAFBADoADwwBCyABIAEoAgQtAAA6AA8LIAEtAA8hACABQRBqJAAgAAucBgECfyMAQSBrIgIkACACIAA2AhggAiABNwMQAkAgAikDECACKAIYKQMwWgRAIAIoAhhBCGpBEkEAEBQgAkF/NgIcDAELIAIoAhgoAhhBAnEEQCACKAIYQQhqQRlBABAUIAJBfzYCHAwBCyACIAIoAhggAikDEEEAIAIoAhhBCGoQTSIANgIMIABFBEAgAkF/NgIcDAELIAIoAhgoAlAgAigCDCACKAIYQQhqEFlBAXFFBEAgAkF/NgIcDAELAn8gAigCGCEDIAIpAxAhASMAQTBrIgAkACAAIAM2AiggACABNwMgIABBATYCHAJAIAApAyAgACgCKCkDMFoEQCAAKAIoQQhqQRJBABAUIABBfzYCLAwBCwJAIAAoAhwNACAAKAIoKAJAIAApAyCnQQR0aigCBEUNACAAKAIoKAJAIAApAyCnQQR0aigCBCgCAEECcUUNAAJAIAAoAigoAkAgACkDIKdBBHRqKAIABEAgACAAKAIoIAApAyBBCCAAKAIoQQhqEE0iAzYCDCADRQRAIABBfzYCLAwECyAAIAAoAiggACgCDEEAQQAQWDcDEAJAIAApAxBCAFMNACAAKQMQIAApAyBRDQAgACgCKEEIakEKQQAQFCAAQX82AiwMBAsMAQsgAEEANgIMCyAAIAAoAiggACkDIEEAIAAoAihBCGoQTSIDNgIIIANFBEAgAEF/NgIsDAILIAAoAgwEQCAAKAIoKAJQIAAoAgwgACkDIEEAIAAoAihBCGoQdEEBcUUEQCAAQX82AiwMAwsLIAAoAigoAlAgACgCCCAAKAIoQQhqEFlBAXFFBEAgACgCKCgCUCAAKAIMQQAQWRogAEF/NgIsDAILCyAAKAIoKAJAIAApAyCnQQR0aigCBBA3IAAoAigoAkAgACkDIKdBBHRqQQA2AgQgACgCKCgCQCAAKQMgp0EEdGoQXiAAQQA2AiwLIAAoAiwhAyAAQTBqJAAgAwsEQCACQX82AhwMAQsgAigCGCgCQCACKQMQp0EEdGpBAToADCACQQA2AhwLIAIoAhwhACACQSBqJAAgAAulBAEBfyMAQTBrIgUkACAFIAA2AiggBSABNwMgIAUgAjYCHCAFIAM6ABsgBSAENgIUAkAgBSgCKCAFKQMgQQBBABA/RQRAIAVBfzYCLAwBCyAFKAIoKAIYQQJxBEAgBSgCKEEIakEZQQAQFCAFQX82AiwMAQsgBSAFKAIoKAJAIAUpAyCnQQR0ajYCECAFAn8gBSgCECgCAARAIAUoAhAoAgAvAQhBCHYMAQtBAws6AAsgBQJ/IAUoAhAoAgAEQCAFKAIQKAIAKAJEDAELQYCA2I14CzYCBEEBIQAgBSAFLQAbIAUtAAtGBH8gBSgCFCAFKAIERwVBAQtBAXE2AgwCQCAFKAIMBEAgBSgCECgCBEUEQCAFKAIQKAIAEEAhACAFKAIQIAA2AgQgAEUEQCAFKAIoQQhqQQ5BABAUIAVBfzYCLAwECwsgBSgCECgCBCAFKAIQKAIELwEIQf8BcSAFLQAbQQh0cjsBCCAFKAIQKAIEIAUoAhQ2AkQgBSgCECgCBCIAIAAoAgBBEHI2AgAMAQsgBSgCECgCBARAIAUoAhAoAgQiACAAKAIAQW9xNgIAAkAgBSgCECgCBCgCAEUEQCAFKAIQKAIEEDcgBSgCEEEANgIEDAELIAUoAhAoAgQgBSgCECgCBC8BCEH/AXEgBS0AC0EIdHI7AQggBSgCECgCBCAFKAIENgJECwsLIAVBADYCLAsgBSgCLCEAIAVBMGokACAAC90PAgF/AX4jAEFAaiIEJAAgBCAANgI0IARCfzcDKCAEIAE2AiQgBCACNgIgIAQgAzYCHAJAIAQoAjQoAhhBAnEEQCAEKAI0QQhqQRlBABAUIARCfzcDOAwBCyAEIAQoAjQpAzA3AxAgBCkDKEJ/UQRAIARCfzcDCCAEKAIcQYDAAHEEQCAEIAQoAjQgBCgCJCAEKAIcQQAQWDcDCAsgBCkDCEJ/UQRAIAQoAjQhASMAQUBqIgAkACAAIAE2AjQCQCAAKAI0KQM4IAAoAjQpAzBCAXxYBEAgACAAKAI0KQM4NwMYIAAgACkDGEIBhjcDEAJAIAApAxBCEFQEQCAAQhA3AxAMAQsgACkDEEKACFYEQCAAQoAINwMQCwsgACAAKQMQIAApAxh8NwMYIAAgACkDGKdBBHStNwMIIAApAwggACgCNCkDOKdBBHStVARAIAAoAjRBCGpBDkEAEBQgAEJ/NwM4DAILIAAgACgCNCgCQCAAKQMYp0EEdBBONgIkIAAoAiRFBEAgACgCNEEIakEOQQAQFCAAQn83AzgMAgsgACgCNCAAKAIkNgJAIAAoAjQgACkDGDcDOAsgACgCNCIBKQMwIQUgASAFQgF8NwMwIAAgBTcDKCAAKAI0KAJAIAApAyinQQR0ahC1ASAAIAApAyg3AzgLIAApAzghBSAAQUBrJAAgBCAFNwMIIAVCAFMEQCAEQn83AzgMAwsLIAQgBCkDCDcDKAsCQCAEKAIkRQ0AIAQoAjQhASAEKQMoIQUgBCgCJCECIAQoAhwhAyMAQUBqIgAkACAAIAE2AjggACAFNwMwIAAgAjYCLCAAIAM2AigCQCAAKQMwIAAoAjgpAzBaBEAgACgCOEEIakESQQAQFCAAQX82AjwMAQsgACgCOCgCGEECcQRAIAAoAjhBCGpBGUEAEBQgAEF/NgI8DAELAkACQCAAKAIsRQ0AIAAoAiwsAABFDQAgACAAKAIsIAAoAiwQLkH//wNxIAAoAiggACgCOEEIahBQIgE2AiAgAUUEQCAAQX82AjwMAwsCQCAAKAIoQYAwcQ0AIAAoAiBBABA6QQNHDQAgACgCIEECNgIICwwBCyAAQQA2AiALIAAgACgCOCAAKAIsQQBBABBYIgU3AxACQCAFQgBTDQAgACkDECAAKQMwUQ0AIAAoAiAQJCAAKAI4QQhqQQpBABAUIABBfzYCPAwBCwJAIAApAxBCAFMNACAAKQMQIAApAzBSDQAgACgCIBAkIABBADYCPAwBCyAAIAAoAjgoAkAgACkDMKdBBHRqNgIkAkAgACgCJCgCAARAIAAgACgCJCgCACgCMCAAKAIgEIYBQQBHOgAfDAELIABBADoAHwsCQCAALQAfQQFxDQAgACgCJCgCBA0AIAAoAiQoAgAQQCEBIAAoAiQgATYCBCABRQRAIAAoAjhBCGpBDkEAEBQgACgCIBAkIABBfzYCPAwCCwsgAAJ/IAAtAB9BAXEEQCAAKAIkKAIAKAIwDAELIAAoAiALQQBBACAAKAI4QQhqEEYiATYCCCABRQRAIAAoAiAQJCAAQX82AjwMAQsCQCAAKAIkKAIEBEAgACAAKAIkKAIEKAIwNgIEDAELAkAgACgCJCgCAARAIAAgACgCJCgCACgCMDYCBAwBCyAAQQA2AgQLCwJAIAAoAgQEQCAAIAAoAgRBAEEAIAAoAjhBCGoQRiIBNgIMIAFFBEAgACgCIBAkIABBfzYCPAwDCwwBCyAAQQA2AgwLIAAoAjgoAlAgACgCCCAAKQMwQQAgACgCOEEIahB0QQFxRQRAIAAoAiAQJCAAQX82AjwMAQsgACgCDARAIAAoAjgoAlAgACgCDEEAEFkaCwJAIAAtAB9BAXEEQCAAKAIkKAIEBEAgACgCJCgCBCgCAEECcQRAIAAoAiQoAgQoAjAQJCAAKAIkKAIEIgEgASgCAEF9cTYCAAJAIAAoAiQoAgQoAgBFBEAgACgCJCgCBBA3IAAoAiRBADYCBAwBCyAAKAIkKAIEIAAoAiQoAgAoAjA2AjALCwsgACgCIBAkDAELIAAoAiQoAgQoAgBBAnEEQCAAKAIkKAIEKAIwECQLIAAoAiQoAgQiASABKAIAQQJyNgIAIAAoAiQoAgQgACgCIDYCMAsgAEEANgI8CyAAKAI8IQEgAEFAayQAIAFFDQAgBCgCNCkDMCAEKQMQUgRAIAQoAjQoAkAgBCkDKKdBBHRqEHcgBCgCNCAEKQMQNwMwCyAEQn83AzgMAQsgBCgCNCgCQCAEKQMop0EEdGoQXgJAIAQoAjQoAkAgBCkDKKdBBHRqKAIARQ0AIAQoAjQoAkAgBCkDKKdBBHRqKAIEBEAgBCgCNCgCQCAEKQMop0EEdGooAgQoAgBBAXENAQsgBCgCNCgCQCAEKQMop0EEdGooAgRFBEAgBCgCNCgCQCAEKQMop0EEdGooAgAQQCEAIAQoAjQoAkAgBCkDKKdBBHRqIAA2AgQgAEUEQCAEKAI0QQhqQQ5BABAUIARCfzcDOAwDCwsgBCgCNCgCQCAEKQMop0EEdGooAgRBfjYCECAEKAI0KAJAIAQpAyinQQR0aigCBCIAIAAoAgBBAXI2AgALIAQoAjQoAkAgBCkDKKdBBHRqIAQoAiA2AgggBCAEKQMoNwM4CyAEKQM4IQUgBEFAayQAIAULqgEBAX8jAEEwayICJAAgAiAANgIoIAIgATcDICACQQA2AhwCQAJAIAIoAigoAiRBAUYEQCACKAIcRQ0BIAIoAhxBAUYNASACKAIcQQJGDQELIAIoAihBDGpBEkEAEBQgAkF/NgIsDAELIAIgAikDIDcDCCACIAIoAhw2AhAgAkF/QQAgAigCKCACQQhqQhBBDBAgQgBTGzYCLAsgAigCLCEAIAJBMGokACAAC6UyAwZ/AX4BfCMAQeAAayIEJAAgBCAANgJYIAQgATYCVCAEIAI2AlACQAJAIAQoAlRBAE4EQCAEKAJYDQELIAQoAlBBEkEAEBQgBEEANgJcDAELIAQgBCgCVDYCTCMAQRBrIgAgBCgCWDYCDCAEIAAoAgwpAxg3A0BB4JoBKQMAQn9RBEAgBEF/NgIUIARBAzYCECAEQQc2AgwgBEEGNgIIIARBAjYCBCAEQQE2AgBB4JoBQQAgBBA0NwMAIARBfzYCNCAEQQ82AjAgBEENNgIsIARBDDYCKCAEQQo2AiQgBEEJNgIgQeiaAUEIIARBIGoQNDcDAAtB4JoBKQMAIAQpA0BB4JoBKQMAg1IEQCAEKAJQQRxBABAUIARBADYCXAwBC0HomgEpAwAgBCkDQEHomgEpAwCDUgRAIAQgBCgCTEEQcjYCTAsgBCgCTEEYcUEYRgRAIAQoAlBBGUEAEBQgBEEANgJcDAELIAQoAlghASAEKAJQIQIjAEHQAGsiACQAIAAgATYCSCAAIAI2AkQgAEEIahA7AkAgACgCSCAAQQhqEDkEQCMAQRBrIgEgACgCSDYCDCAAIAEoAgxBDGo2AgQjAEEQayIBIAAoAgQ2AgwCQCABKAIMKAIAQQVHDQAjAEEQayIBIAAoAgQ2AgwgASgCDCgCBEEsRw0AIABBADYCTAwCCyAAKAJEIAAoAgQQRSAAQX82AkwMAQsgAEEBNgJMCyAAKAJMIQEgAEHQAGokACAEIAE2AjwCQAJAAkAgBCgCPEEBag4CAAECCyAEQQA2AlwMAgsgBCgCTEEBcUUEQCAEKAJQQQlBABAUIARBADYCXAwCCyAEIAQoAlggBCgCTCAEKAJQEGk2AlwMAQsgBCgCTEECcQRAIAQoAlBBCkEAEBQgBEEANgJcDAELIAQoAlgQSEEASARAIAQoAlAgBCgCWBAXIARBADYCXAwBCwJAIAQoAkxBCHEEQCAEIAQoAlggBCgCTCAEKAJQEGk2AjgMAQsgBCgCWCEAIAQoAkwhASAEKAJQIQIjAEHwAGsiAyQAIAMgADYCaCADIAE2AmQgAyACNgJgIANBIGoQOwJAIAMoAmggA0EgahA5QQBIBEAgAygCYCADKAJoEBcgA0EANgJsDAELIAMpAyBCBINQBEAgAygCYEEEQYoBEBQgA0EANgJsDAELIAMgAykDODcDGCADIAMoAmggAygCZCADKAJgEGkiADYCXCAARQRAIANBADYCbAwBCwJAIAMpAxhQRQ0AIAMoAmgQngFBAXFFDQAgAyADKAJcNgJsDAELIAMoAlwhACADKQMYIQkjAEHgAGsiAiQAIAIgADYCWCACIAk3A1ACQCACKQNQQhZUBEAgAigCWEEIakETQQAQFCACQQA2AlwMAQsgAgJ+IAIpA1BCqoAEVARAIAIpA1AMAQtCqoAECzcDMCACKAJYKAIAQgAgAikDMH1BAhAnQQBIBEAjAEEQayIAIAIoAlgoAgA2AgwgAiAAKAIMQQxqNgIIAkACfyMAQRBrIgAgAigCCDYCDCAAKAIMKAIAQQRGCwRAIwBBEGsiACACKAIINgIMIAAoAgwoAgRBFkYNAQsgAigCWEEIaiACKAIIEEUgAkEANgJcDAILCyACIAIoAlgoAgAQSSIJNwM4IAlCAFMEQCACKAJYQQhqIAIoAlgoAgAQFyACQQA2AlwMAQsgAiACKAJYKAIAIAIpAzBBACACKAJYQQhqEEIiADYCDCAARQRAIAJBADYCXAwBCyACQn83AyAgAkEANgJMIAIpAzBCqoAEWgRAIAIoAgxCFBAsGgsgAkEQakETQQAQFCACIAIoAgxCABAeNgJEA0ACQCACKAJEIQEgAigCDBAwQhJ9pyEFIwBBIGsiACQAIAAgATYCGCAAIAU2AhQgAEHsEjYCECAAQQQ2AgwCQAJAIAAoAhQgACgCDE8EQCAAKAIMDQELIABBADYCHAwBCyAAIAAoAhhBAWs2AggDQAJAIAAgACgCCEEBaiAAKAIQLQAAIAAoAhggACgCCGsgACgCFCAAKAIMa2oQqwEiATYCCCABRQ0AIAAoAghBAWogACgCEEEBaiAAKAIMQQFrEE8NASAAIAAoAgg2AhwMAgsLIABBADYCHAsgACgCHCEBIABBIGokACACIAE2AkQgAUUNACACKAIMIAIoAkQCfyMAQRBrIgAgAigCDDYCDCAAKAIMKAIEC2usECwaIAIoAlghASACKAIMIQUgAikDOCEJIwBB8ABrIgAkACAAIAE2AmggACAFNgJkIAAgCTcDWCAAIAJBEGo2AlQjAEEQayIBIAAoAmQ2AgwgAAJ+IAEoAgwtAABBAXEEQCABKAIMKQMQDAELQgALNwMwAkAgACgCZBAwQhZUBEAgACgCVEETQQAQFCAAQQA2AmwMAQsgACgCZEIEEB4oAABB0JaVMEcEQCAAKAJUQRNBABAUIABBADYCbAwBCwJAAkAgACkDMEIUVA0AIwBBEGsiASAAKAJkNgIMIAEoAgwoAgQgACkDMKdqQRRrKAAAQdCWmThHDQAgACgCZCAAKQMwQhR9ECwaIAAoAmgoAgAhBSAAKAJkIQYgACkDWCEJIAAoAmgoAhQhByAAKAJUIQgjAEGwAWsiASQAIAEgBTYCqAEgASAGNgKkASABIAk3A5gBIAEgBzYClAEgASAINgKQASMAQRBrIgUgASgCpAE2AgwgAQJ+IAUoAgwtAABBAXEEQCAFKAIMKQMQDAELQgALNwMYIAEoAqQBQgQQHhogASABKAKkARAdQf//A3E2AhAgASABKAKkARAdQf//A3E2AgggASABKAKkARAxNwM4AkAgASkDOEL///////////8AVgRAIAEoApABQQRBFhAUIAFBADYCrAEMAQsgASkDOEI4fCABKQMYIAEpA5gBfFYEQCABKAKQAUEVQQAQFCABQQA2AqwBDAELAkACQCABKQM4IAEpA5gBVA0AIAEpAzhCOHwgASkDmAECfiMAQRBrIgUgASgCpAE2AgwgBSgCDCkDCAt8Vg0AIAEoAqQBIAEpAzggASkDmAF9ECwaIAFBADoAFwwBCyABKAKoASABKQM4QQAQJ0EASARAIAEoApABIAEoAqgBEBcgAUEANgKsAQwCCyABIAEoAqgBQjggAUFAayABKAKQARBCIgU2AqQBIAVFBEAgAUEANgKsAQwCCyABQQE6ABcLIAEoAqQBQgQQHigAAEHQlpkwRwRAIAEoApABQRVBABAUIAEtABdBAXEEQCABKAKkARAWCyABQQA2AqwBDAELIAEgASgCpAEQMTcDMAJAIAEoApQBQQRxRQ0AIAEpAzAgASkDOHxCDHwgASkDmAEgASkDGHxRDQAgASgCkAFBFUEAEBQgAS0AF0EBcQRAIAEoAqQBEBYLIAFBADYCrAEMAQsgASgCpAFCBBAeGiABIAEoAqQBECo2AgwgASABKAKkARAqNgIEIAEoAhBB//8DRgRAIAEgASgCDDYCEAsgASgCCEH//wNGBEAgASABKAIENgIICwJAIAEoApQBQQRxRQ0AIAEoAgggASgCBEYEQCABKAIQIAEoAgxGDQELIAEoApABQRVBABAUIAEtABdBAXEEQCABKAKkARAWCyABQQA2AqwBDAELAkAgASgCEEUEQCABKAIIRQ0BCyABKAKQAUEBQQAQFCABLQAXQQFxBEAgASgCpAEQFgsgAUEANgKsAQwBCyABIAEoAqQBEDE3AyggASABKAKkARAxNwMgIAEpAyggASkDIFIEQCABKAKQAUEBQQAQFCABLQAXQQFxBEAgASgCpAEQFgsgAUEANgKsAQwBCyABIAEoAqQBEDE3AzAgASABKAKkARAxNwOAAQJ/IwBBEGsiBSABKAKkATYCDCAFKAIMLQAAQQFxRQsEQCABKAKQAUEUQQAQFCABLQAXQQFxBEAgASgCpAEQFgsgAUEANgKsAQwBCyABLQAXQQFxBEAgASgCpAEQFgsCQCABKQOAAUL///////////8AWARAIAEpA4ABIAEpA4ABIAEpAzB8WA0BCyABKAKQAUEEQRYQFCABQQA2AqwBDAELIAEpA4ABIAEpAzB8IAEpA5gBIAEpAzh8VgRAIAEoApABQRVBABAUIAFBADYCrAEMAQsCQCABKAKUAUEEcUUNACABKQOAASABKQMwfCABKQOYASABKQM4fFENACABKAKQAUEVQQAQFCABQQA2AqwBDAELIAEpAyggASkDMEIugFYEQCABKAKQAUEVQQAQFCABQQA2AqwBDAELIAEgASkDKCABKAKQARCQASIFNgKMASAFRQRAIAFBADYCrAEMAQsgASgCjAFBAToALCABKAKMASABKQMwNwMYIAEoAowBIAEpA4ABNwMgIAEgASgCjAE2AqwBCyABKAKsASEFIAFBsAFqJAAgACAFNgJQDAELIAAoAmQgACkDMBAsGiAAKAJkIQUgACkDWCEJIAAoAmgoAhQhBiAAKAJUIQcjAEHQAGsiASQAIAEgBTYCSCABIAk3A0AgASAGNgI8IAEgBzYCOAJAIAEoAkgQMEIWVARAIAEoAjhBFUEAEBQgAUEANgJMDAELIwBBEGsiBSABKAJINgIMIAECfiAFKAIMLQAAQQFxBEAgBSgCDCkDEAwBC0IACzcDCCABKAJIQgQQHhogASgCSBAqBEAgASgCOEEBQQAQFCABQQA2AkwMAQsgASABKAJIEB1B//8Dca03AyggASABKAJIEB1B//8Dca03AyAgASkDICABKQMoUgRAIAEoAjhBE0EAEBQgAUEANgJMDAELIAEgASgCSBAqrTcDGCABIAEoAkgQKq03AxAgASkDECABKQMQIAEpAxh8VgRAIAEoAjhBBEEWEBQgAUEANgJMDAELIAEpAxAgASkDGHwgASkDQCABKQMIfFYEQCABKAI4QRVBABAUIAFBADYCTAwBCwJAIAEoAjxBBHFFDQAgASkDECABKQMYfCABKQNAIAEpAwh8UQ0AIAEoAjhBFUEAEBQgAUEANgJMDAELIAEgASkDICABKAI4EJABIgU2AjQgBUUEQCABQQA2AkwMAQsgASgCNEEAOgAsIAEoAjQgASkDGDcDGCABKAI0IAEpAxA3AyAgASABKAI0NgJMCyABKAJMIQUgAUHQAGokACAAIAU2AlALIAAoAlBFBEAgAEEANgJsDAELIAAoAmQgACkDMEIUfBAsGiAAIAAoAmQQHTsBTiAAKAJQKQMgIAAoAlApAxh8IAApA1ggACkDMHxWBEAgACgCVEEVQQAQFCAAKAJQECUgAEEANgJsDAELAkAgAC8BTkUEQCAAKAJoKAIEQQRxRQ0BCyAAKAJkIAApAzBCFnwQLBogACAAKAJkEDA3AyACQCAAKQMgIAAvAU6tWgRAIAAoAmgoAgRBBHFFDQEgACkDICAALwFOrVENAQsgACgCVEEVQQAQFCAAKAJQECUgAEEANgJsDAILIAAvAU4EQCAAKAJkIAAvAU6tEB4gAC8BTkEAIAAoAlQQUCEBIAAoAlAgATYCKCABRQRAIAAoAlAQJSAAQQA2AmwMAwsLCwJAIAAoAlApAyAgACkDWFoEQCAAKAJkIAAoAlApAyAgACkDWH0QLBogACAAKAJkIAAoAlApAxgQHiIBNgIcIAFFBEAgACgCVEEVQQAQFCAAKAJQECUgAEEANgJsDAMLIAAgACgCHCAAKAJQKQMYECkiATYCLCABRQRAIAAoAlRBDkEAEBQgACgCUBAlIABBADYCbAwDCwwBCyAAQQA2AiwgACgCaCgCACAAKAJQKQMgQQAQJ0EASARAIAAoAlQgACgCaCgCABAXIAAoAlAQJSAAQQA2AmwMAgsgACgCaCgCABBJIAAoAlApAyBSBEAgACgCVEETQQAQFCAAKAJQECUgAEEANgJsDAILCyAAIAAoAlApAxg3AzggAEIANwNAA0ACQCAAKQM4UA0AIABBADoAGyAAKQNAIAAoAlApAwhRBEAgACgCUC0ALEEBcQ0BIAApAzhCLlQNASAAKAJQQoCABCAAKAJUEI8BQQFxRQRAIAAoAlAQJSAAKAIsEBYgAEEANgJsDAQLIABBAToAGwsjAEEQayIBJAAgAUHYABAYIgU2AggCQCAFRQRAIAFBADYCDAwBCyABKAIIEFMgASABKAIINgIMCyABKAIMIQUgAUEQaiQAIAUhASAAKAJQKAIAIAApA0CnQQR0aiABNgIAAkAgAQRAIAAgACgCUCgCACAAKQNAp0EEdGooAgAgACgCaCgCACAAKAIsQQAgACgCVBCMASIJNwMQIAlCAFkNAQsCQCAALQAbQQFxRQ0AIwBBEGsiASAAKAJUNgIMIAEoAgwoAgBBE0cNACAAKAJUQRVBABAUCyAAKAJQECUgACgCLBAWIABBADYCbAwDCyAAIAApA0BCAXw3A0AgACAAKQM4IAApAxB9NwM4DAELCwJAIAApA0AgACgCUCkDCFEEQCAAKQM4UA0BCyAAKAJUQRVBABAUIAAoAiwQFiAAKAJQECUgAEEANgJsDAELIAAoAmgoAgRBBHEEQAJAIAAoAiwEQCAAIAAoAiwQR0EBcToADwwBCyAAIAAoAmgoAgAQSTcDACAAKQMAQgBTBEAgACgCVCAAKAJoKAIAEBcgACgCUBAlIABBADYCbAwDCyAAIAApAwAgACgCUCkDICAAKAJQKQMYfFE6AA8LIAAtAA9BAXFFBEAgACgCVEEVQQAQFCAAKAIsEBYgACgCUBAlIABBADYCbAwCCwsgACgCLBAWIAAgACgCUDYCbAsgACgCbCEBIABB8ABqJAAgAiABNgJIIAEEQAJAIAIoAkwEQCACKQMgQgBXBEAgAiACKAJYIAIoAkwgAkEQahBoNwMgCyACIAIoAlggAigCSCACQRBqEGg3AygCQCACKQMgIAIpAyhTBEAgAigCTBAlIAIgAigCSDYCTCACIAIpAyg3AyAMAQsgAigCSBAlCwwBCyACIAIoAkg2AkwCQCACKAJYKAIEQQRxBEAgAiACKAJYIAIoAkwgAkEQahBoNwMgDAELIAJCADcDIAsLIAJBADYCSAsgAiACKAJEQQFqNgJEIAIoAgwgAigCRAJ/IwBBEGsiACACKAIMNgIMIAAoAgwoAgQLa6wQLBoMAQsLIAIoAgwQFiACKQMgQgBTBEAgAigCWEEIaiACQRBqEEUgAigCTBAlIAJBADYCXAwBCyACIAIoAkw2AlwLIAIoAlwhACACQeAAaiQAIAMgADYCWCAARQRAIAMoAmAgAygCXEEIahBFIwBBEGsiACADKAJoNgIMIAAoAgwiACAAKAIwQQFqNgIwIAMoAlwQPCADQQA2AmwMAQsgAygCXCADKAJYKAIANgJAIAMoAlwgAygCWCkDCDcDMCADKAJcIAMoAlgpAxA3AzggAygCXCADKAJYKAIoNgIgIAMoAlgQFSADKAJcKAJQIQAgAygCXCkDMCEJIAMoAlxBCGohAiMAQSBrIgEkACABIAA2AhggASAJNwMQIAEgAjYCDAJAIAEpAxBQBEAgAUEBOgAfDAELIwBBIGsiACABKQMQNwMQIAAgACkDELpEAAAAAAAA6D+jOQMIAkAgACsDCEQAAOD////vQWQEQCAAQX82AgQMAQsgAAJ/IAArAwgiCkQAAAAAAADwQWMgCkQAAAAAAAAAAGZxBEAgCqsMAQtBAAs2AgQLAkAgACgCBEGAgICAeEsEQCAAQYCAgIB4NgIcDAELIAAgACgCBEEBazYCBCAAIAAoAgQgACgCBEEBdnI2AgQgACAAKAIEIAAoAgRBAnZyNgIEIAAgACgCBCAAKAIEQQR2cjYCBCAAIAAoAgQgACgCBEEIdnI2AgQgACAAKAIEIAAoAgRBEHZyNgIEIAAgACgCBEEBajYCBCAAIAAoAgQ2AhwLIAEgACgCHDYCCCABKAIIIAEoAhgoAgBNBEAgAUEBOgAfDAELIAEoAhggASgCCCABKAIMEFpBAXFFBEAgAUEAOgAfDAELIAFBAToAHwsgAS0AHxogAUEgaiQAIANCADcDEANAIAMpAxAgAygCXCkDMFQEQCADIAMoAlwoAkAgAykDEKdBBHRqKAIAKAIwQQBBACADKAJgEEY2AgwgAygCDEUEQCMAQRBrIgAgAygCaDYCDCAAKAIMIgAgACgCMEEBajYCMCADKAJcEDwgA0EANgJsDAMLIAMoAlwoAlAgAygCDCADKQMQQQggAygCXEEIahB0QQFxRQRAAkAgAygCXCgCCEEKRgRAIAMoAmRBBHFFDQELIAMoAmAgAygCXEEIahBFIwBBEGsiACADKAJoNgIMIAAoAgwiACAAKAIwQQFqNgIwIAMoAlwQPCADQQA2AmwMBAsLIAMgAykDEEIBfDcDEAwBCwsgAygCXCADKAJcKAIUNgIYIAMgAygCXDYCbAsgAygCbCEAIANB8ABqJAAgBCAANgI4CyAEKAI4RQRAIAQoAlgQLxogBEEANgJcDAELIAQgBCgCODYCXAsgBCgCXCEAIARB4ABqJAAgAAuOAQEBfyMAQRBrIgIkACACIAA2AgwgAiABNgIIIAJBADYCBCACKAIIBEAjAEEQayIAIAIoAgg2AgwgAiAAKAIMKAIANgIEIAIoAggQrAFBAUYEQCMAQRBrIgAgAigCCDYCDEG0mwEgACgCDCgCBDYCAAsLIAIoAgwEQCACKAIMIAIoAgQ2AgALIAJBEGokAAuVAQEBfyMAQRBrIgEkACABIAA2AggCQAJ/IwBBEGsiACABKAIINgIMIAAoAgwpAxhCgIAQg1ALBEAgASgCCCgCAARAIAEgASgCCCgCABCeAUEBcToADwwCCyABQQE6AA8MAQsgASABKAIIQQBCAEESECA+AgQgASABKAIEQQBHOgAPCyABLQAPQQFxIQAgAUEQaiQAIAALfwEBfyMAQSBrIgMkACADIAA2AhggAyABNwMQIANBADYCDCADIAI2AggCQCADKQMQQv///////////wBWBEAgAygCCEEEQT0QFCADQX82AhwMAQsgAyADKAIYIAMpAxAgAygCDCADKAIIEGo2AhwLIAMoAhwhACADQSBqJAAgAAt9ACACQQFGBEAgASAAKAIIIAAoAgRrrH0hAQsCQCAAKAIUIAAoAhxLBEAgAEEAQQAgACgCJBEBABogACgCFEUNAQsgAEEANgIcIABCADcDECAAIAEgAiAAKAIoEQ8AQgBTDQAgAEIANwIEIAAgACgCAEFvcTYCAEEADwtBfwvhAgECfyMAQSBrIgMkAAJ/AkACQEGnEiABLAAAEKIBRQRAQbSbAUEcNgIADAELQZgJEBgiAg0BC0EADAELIAJBAEGQARAzIAFBKxCiAUUEQCACQQhBBCABLQAAQfIARhs2AgALAkAgAS0AAEHhAEcEQCACKAIAIQEMAQsgAEEDQQAQBCIBQYAIcUUEQCADIAFBgAhyNgIQIABBBCADQRBqEAQaCyACIAIoAgBBgAFyIgE2AgALIAJB/wE6AEsgAkGACDYCMCACIAA2AjwgAiACQZgBajYCLAJAIAFBCHENACADIANBGGo2AgAgAEGTqAEgAxAODQAgAkEKOgBLCyACQRo2AiggAkEbNgIkIAJBHDYCICACQR02AgxB6J8BKAIARQRAIAJBfzYCTAsgAkGsoAEoAgA2AjhBrKABKAIAIgAEQCAAIAI2AjQLQaygASACNgIAIAILIQAgA0EgaiQAIAAL8AEBAn8CfwJAIAFB/wFxIgMEQCAAQQNxBEADQCAALQAAIgJFDQMgAiABQf8BcUYNAyAAQQFqIgBBA3ENAAsLAkAgACgCACICQX9zIAJBgYKECGtxQYCBgoR4cQ0AIANBgYKECGwhAwNAIAIgA3MiAkF/cyACQYGChAhrcUGAgYKEeHENASAAKAIEIQIgAEEEaiEAIAJBgYKECGsgAkF/c3FBgIGChHhxRQ0ACwsDQCAAIgItAAAiAwRAIAJBAWohACADIAFB/wFxRw0BCwsgAgwCCyAAEC4gAGoMAQsgAAsiAEEAIAAtAAAgAUH/AXFGGwsYACAAKAJMQX9MBEAgABCkAQ8LIAAQpAELYAIBfgJ/IAAoAighAkEBIQMgAEIAIAAtAABBgAFxBH9BAkEBIAAoAhQgACgCHEsbBUEBCyACEQ8AIgFCAFkEfiAAKAIUIAAoAhxrrCABIAAoAgggACgCBGusfXwFIAELC2sBAX8gAARAIAAoAkxBf0wEQCAAEG4PCyAAEG4PC0GwoAEoAgAEQEGwoAEoAgAQpQEhAQtBrKABKAIAIgAEQANAIAAoAkwaIAAoAhQgACgCHEsEQCAAEG4gAXIhAQsgACgCOCIADQALCyABCyIAIAAgARACIgBBgWBPBH9BtJsBQQAgAGs2AgBBfwUgAAsLUwEDfwJAIAAoAgAsAABBMGtBCk8NAANAIAAoAgAiAiwAACEDIAAgAkEBajYCACABIANqQTBrIQEgAiwAAUEwa0EKTw0BIAFBCmwhAQwACwALIAELuwIAAkAgAUEUSw0AAkACQAJAAkACQAJAAkACQAJAAkAgAUEJaw4KAAECAwQFBgcICQoLIAIgAigCACIBQQRqNgIAIAAgASgCADYCAA8LIAIgAigCACIBQQRqNgIAIAAgATQCADcDAA8LIAIgAigCACIBQQRqNgIAIAAgATUCADcDAA8LIAIgAigCAEEHakF4cSIBQQhqNgIAIAAgASkDADcDAA8LIAIgAigCACIBQQRqNgIAIAAgATIBADcDAA8LIAIgAigCACIBQQRqNgIAIAAgATMBADcDAA8LIAIgAigCACIBQQRqNgIAIAAgATAAADcDAA8LIAIgAigCACIBQQRqNgIAIAAgATEAADcDAA8LIAIgAigCAEEHakF4cSIBQQhqNgIAIAAgASsDADkDAA8LIAAgAkEYEQQACwt/AgF/AX4gAL0iA0I0iKdB/w9xIgJB/w9HBHwgAkUEQCABIABEAAAAAAAAAABhBH9BAAUgAEQAAAAAAADwQ6IgARCpASEAIAEoAgBBQGoLNgIAIAAPCyABIAJB/gdrNgIAIANC/////////4eAf4NCgICAgICAgPA/hL8FIAALC5sCACAARQRAQQAPCwJ/AkAgAAR/IAFB/wBNDQECQEGQmQEoAgAoAgBFBEAgAUGAf3FBgL8DRg0DDAELIAFB/w9NBEAgACABQT9xQYABcjoAASAAIAFBBnZBwAFyOgAAQQIMBAsgAUGAsANPQQAgAUGAQHFBgMADRxtFBEAgACABQT9xQYABcjoAAiAAIAFBDHZB4AFyOgAAIAAgAUEGdkE/cUGAAXI6AAFBAwwECyABQYCABGtB//8/TQRAIAAgAUE/cUGAAXI6AAMgACABQRJ2QfABcjoAACAAIAFBBnZBP3FBgAFyOgACIAAgAUEMdkE/cUGAAXI6AAFBBAwECwtBtJsBQRk2AgBBfwVBAQsMAQsgACABOgAAQQELC+MBAQJ/IAJBAEchAwJAAkACQCAAQQNxRQ0AIAJFDQAgAUH/AXEhBANAIAAtAAAgBEYNAiACQQFrIgJBAEchAyAAQQFqIgBBA3FFDQEgAg0ACwsgA0UNAQsCQCAALQAAIAFB/wFxRg0AIAJBBEkNACABQf8BcUGBgoQIbCEDA0AgACgCACADcyIEQX9zIARBgYKECGtxQYCBgoR4cQ0BIABBBGohACACQQRrIgJBA0sNAAsLIAJFDQAgAUH/AXEhAQNAIAEgAC0AAEYEQCAADwsgAEEBaiEAIAJBAWsiAg0ACwtBAAtaAQF/IwBBEGsiASAANgIIAkACQCABKAIIKAIAQQBOBEAgASgCCCgCAEGAFCgCAEgNAQsgAUEANgIMDAELIAEgASgCCCgCAEECdEGQFGooAgA2AgwLIAEoAgwL+QIBAX8jAEEgayIEJAAgBCAANgIYIAQgATcDECAEIAI2AgwgBCADNgIIIAQgBCgCGCAEKAIYIAQpAxAgBCgCDCAEKAIIEK4BIgA2AgACQCAARQRAIARBADYCHAwBCyAEKAIAEEhBAEgEQCAEKAIYQQhqIAQoAgAQFyAEKAIAEBsgBEEANgIcDAELIAQoAhghAiMAQRBrIgAkACAAIAI2AgggAEEYEBgiAjYCBAJAIAJFBEAgACgCCEEIakEOQQAQFCAAQQA2AgwMAQsgACgCBCAAKAIINgIAIwBBEGsiAiAAKAIEQQRqNgIMIAIoAgxBADYCACACKAIMQQA2AgQgAigCDEEANgIIIAAoAgRBADoAECAAKAIEQQA2AhQgACAAKAIENgIMCyAAKAIMIQIgAEEQaiQAIAQgAjYCBCACRQRAIAQoAgAQGyAEQQA2AhwMAQsgBCgCBCAEKAIANgIUIAQgBCgCBDYCHAsgBCgCHCEAIARBIGokACAAC7cOAgN/AX4jAEHAAWsiBSQAIAUgADYCuAEgBSABNgK0ASAFIAI3A6gBIAUgAzYCpAEgBUIANwOYASAFQgA3A5ABIAUgBDYCjAECQCAFKAK4AUUEQCAFQQA2ArwBDAELAkAgBSgCtAEEQCAFKQOoASAFKAK0ASkDMFQNAQsgBSgCuAFBCGpBEkEAEBQgBUEANgK8AQwBCwJAIAUoAqQBQQhxDQAgBSgCtAEoAkAgBSkDqAGnQQR0aigCCEUEQCAFKAK0ASgCQCAFKQOoAadBBHRqLQAMQQFxRQ0BCyAFKAK4AUEIakEPQQAQFCAFQQA2ArwBDAELIAUoArQBIAUpA6gBIAUoAqQBQQhyIAVByABqEH5BAEgEQCAFKAK4AUEIakEUQQAQFCAFQQA2ArwBDAELIAUoAqQBQSBxBEAgBSAFKAKkAUEEcjYCpAELAkAgBSkDmAFQBEAgBSkDkAFQDQELIAUoAqQBQQRxRQ0AIAUoArgBQQhqQRJBABAUIAVBADYCvAEMAQsCQCAFKQOYAVAEQCAFKQOQAVANAQsgBSkDmAEgBSkDmAEgBSkDkAF8WARAIAUpA2AgBSkDmAEgBSkDkAF8Wg0BCyAFKAK4AUEIakESQQAQFCAFQQA2ArwBDAELIAUpA5ABUARAIAUgBSkDYCAFKQOYAX03A5ABCyAFIAUpA5ABIAUpA2BUOgBHIAUgBSgCpAFBIHEEf0EABSAFLwF6QQBHC0EBcToARSAFIAUoAqQBQQRxBH9BAAUgBS8BeEEARwtBAXE6AEQgBQJ/IAUoAqQBQQRxBEBBACAFLwF4DQEaCyAFLQBHQX9zC0EBcToARiAFLQBFQQFxBEAgBSgCjAFFBEAgBSAFKAK4ASgCHDYCjAELIAUoAowBRQRAIAUoArgBQQhqQRpBABAUIAVBADYCvAEMAgsLIAUpA2hQBEAgBSAFKAK4AUEAQgBBABB9NgK8AQwBCwJAAkAgBS0AR0EBcUUNACAFLQBFQQFxDQAgBS0AREEBcQ0AIAUgBSkDkAE3AyAgBSAFKQOQATcDKCAFQQA7ATggBSAFKAJwNgIwIAVC3AA3AwggBSAFKAK0ASgCACAFKQOYASAFKQOQASAFQQhqQQAgBSgCtAEgBSkDqAEgBSgCuAFBCGoQXyIANgKIAQwBCyAFIAUoArQBIAUpA6gBIAUoAqQBIAUoArgBQQhqED8iADYCBCAARQRAIAVBADYCvAEMAgsgBSAFKAK0ASgCAEIAIAUpA2ggBUHIAGogBSgCBC8BDEEBdkEDcSAFKAK0ASAFKQOoASAFKAK4AUEIahBfIgA2AogBCyAARQRAIAVBADYCvAEMAQsCfyAFKAKIASEAIAUoArQBIQMjAEEQayIBJAAgASAANgIMIAEgAzYCCCABKAIMIAEoAgg2AiwgASgCCCEDIAEoAgwhBCMAQSBrIgAkACAAIAM2AhggACAENgIUAkAgACgCGCgCSCAAKAIYKAJEQQFqTQRAIAAgACgCGCgCSEEKajYCDCAAIAAoAhgoAkwgACgCDEECdBBONgIQIAAoAhBFBEAgACgCGEEIakEOQQAQFCAAQX82AhwMAgsgACgCGCAAKAIMNgJIIAAoAhggACgCEDYCTAsgACgCFCEEIAAoAhgoAkwhBiAAKAIYIgcoAkQhAyAHIANBAWo2AkQgA0ECdCAGaiAENgIAIABBADYCHAsgACgCHCEDIABBIGokACABQRBqJAAgA0EASAsEQCAFKAKIARAbIAVBADYCvAEMAQsgBS0ARUEBcQRAIAUgBS8BekEAEHsiADYCACAARQRAIAUoArgBQQhqQRhBABAUIAVBADYCvAEMAgsgBSAFKAK4ASAFKAKIASAFLwF6QQAgBSgCjAEgBSgCABEFADYChAEgBSgCiAEQGyAFKAKEAUUEQCAFQQA2ArwBDAILIAUgBSgChAE2AogBCyAFLQBEQQFxBEAgBSAFKAK4ASAFKAKIASAFLwF4ELABNgKEASAFKAKIARAbIAUoAoQBRQRAIAVBADYCvAEMAgsgBSAFKAKEATYCiAELIAUtAEZBAXEEQCAFIAUoArgBIAUoAogBQQEQrwE2AoQBIAUoAogBEBsgBSgChAFFBEAgBUEANgK8AQwCCyAFIAUoAoQBNgKIAQsCQCAFLQBHQQFxRQ0AIAUtAEVBAXFFBEAgBS0AREEBcUUNAQsgBSgCuAEhASAFKAKIASEDIAUpA5gBIQIgBSkDkAEhCCMAQSBrIgAkACAAIAE2AhwgACADNgIYIAAgAjcDECAAIAg3AwggACgCGCAAKQMQIAApAwhBAEEAQQBCACAAKAIcQQhqEF8hASAAQSBqJAAgBSABNgKEASAFKAKIARAbIAUoAoQBRQRAIAVBADYCvAEMAgsgBSAFKAKEATYCiAELIAUgBSgCiAE2ArwBCyAFKAK8ASEAIAVBwAFqJAAgAAuEAgEBfyMAQSBrIgMkACADIAA2AhggAyABNgIUIAMgAjYCEAJAIAMoAhRFBEAgAygCGEEIakESQQAQFCADQQA2AhwMAQsgA0E4EBgiADYCDCAARQRAIAMoAhhBCGpBDkEAEBQgA0EANgIcDAELIwBBEGsiACADKAIMQQhqNgIMIAAoAgxBADYCACAAKAIMQQA2AgQgACgCDEEANgIIIAMoAgwgAygCEDYCACADKAIMQQA2AgQgAygCDEIANwMoQQBBAEEAEBohACADKAIMIAA2AjAgAygCDEIANwMYIAMgAygCGCADKAIUQRQgAygCDBBhNgIcCyADKAIcIQAgA0EgaiQAIAALQwEBfyMAQRBrIgMkACADIAA2AgwgAyABNgIIIAMgAjYCBCADKAIMIAMoAgggAygCBEEAQQAQsgEhACADQRBqJAAgAAtJAQF/IwBBEGsiASQAIAEgADYCDCABKAIMBEAgASgCDCgCrEAgASgCDCgCqEAoAgQRAgAgASgCDBA4IAEoAgwQFQsgAUEQaiQAC5QFAQF/IwBBMGsiBSQAIAUgADYCKCAFIAE2AiQgBSACNgIgIAUgAzoAHyAFIAQ2AhggBUEANgIMAkAgBSgCJEUEQCAFKAIoQQhqQRJBABAUIAVBADYCLAwBCyAFIAUoAiAgBS0AH0EBcRCzASIANgIMIABFBEAgBSgCKEEIakEQQQAQFCAFQQA2AiwMAQsgBSgCICEBIAUtAB9BAXEhAiAFKAIYIQMgBSgCDCEEIwBBIGsiACQAIAAgATYCGCAAIAI6ABcgACADNgIQIAAgBDYCDCAAQbDAABAYIgE2AggCQCABRQRAIABBADYCHAwBCyMAQRBrIgEgACgCCDYCDCABKAIMQQA2AgAgASgCDEEANgIEIAEoAgxBADYCCCAAKAIIAn8gAC0AF0EBcQRAIAAoAhhBf0cEfyAAKAIYQX5GBUEBC0EBcQwBC0EAC0EARzoADiAAKAIIIAAoAgw2AqhAIAAoAgggACgCGDYCFCAAKAIIIAAtABdBAXE6ABAgACgCCEEAOgAMIAAoAghBADoADSAAKAIIQQA6AA8gACgCCCgCqEAoAgAhAQJ/AkAgACgCGEF/RwRAIAAoAhhBfkcNAQtBCAwBCyAAKAIYC0H//wNxIAAoAhAgACgCCCABEQEAIQEgACgCCCABNgKsQCABRQRAIAAoAggQOCAAKAIIEBUgAEEANgIcDAELIAAgACgCCDYCHAsgACgCHCEBIABBIGokACAFIAE2AhQgAUUEQCAFKAIoQQhqQQ5BABAUIAVBADYCLAwBCyAFIAUoAiggBSgCJEETIAUoAhQQYSIANgIQIABFBEAgBSgCFBCxASAFQQA2AiwMAQsgBSAFKAIQNgIsCyAFKAIsIQAgBUEwaiQAIAALzAEBAX8jAEEgayICIAA2AhggAiABOgAXIAICfwJAIAIoAhhBf0cEQCACKAIYQX5HDQELQQgMAQsgAigCGAs7AQ4gAkEANgIQAkADQCACKAIQQdSXASgCAEkEQCACKAIQQQxsQdiXAWovAQAgAi8BDkYEQCACLQAXQQFxBEAgAiACKAIQQQxsQdiXAWooAgQ2AhwMBAsgAiACKAIQQQxsQdiXAWooAgg2AhwMAwUgAiACKAIQQQFqNgIQDAILAAsLIAJBADYCHAsgAigCHAvkAQEBfyMAQSBrIgMkACADIAA6ABsgAyABNgIUIAMgAjYCECADQcgAEBgiADYCDAJAIABFBEAgAygCEEEBQbSbASgCABAUIANBADYCHAwBCyADKAIMIAMoAhA2AgAgAygCDCADLQAbQQFxOgAEIAMoAgwgAygCFDYCCAJAIAMoAgwoAghBAU4EQCADKAIMKAIIQQlMDQELIAMoAgxBCTYCCAsgAygCDEEAOgAMIAMoAgxBADYCMCADKAIMQQA2AjQgAygCDEEANgI4IAMgAygCDDYCHAsgAygCHCEAIANBIGokACAACzgBAX8jAEEQayIBIAA2AgwgASgCDEEANgIAIAEoAgxBADYCBCABKAIMQQA2AgggASgCDEEAOgAMC+MIAQF/IwBBQGoiAiAANgI4IAIgATYCNCACIAIoAjgoAnw2AjAgAiACKAI4KAI4IAIoAjgoAmxqNgIsIAIgAigCOCgCeDYCICACIAIoAjgoApABNgIcIAICfyACKAI4KAJsIAIoAjgoAixBhgJrSwRAIAIoAjgoAmwgAigCOCgCLEGGAmtrDAELQQALNgIYIAIgAigCOCgCQDYCFCACIAIoAjgoAjQ2AhAgAiACKAI4KAI4IAIoAjgoAmxqQYICajYCDCACIAIoAiwgAigCIEEBa2otAAA6AAsgAiACKAIsIAIoAiBqLQAAOgAKIAIoAjgoAnggAigCOCgCjAFPBEAgAiACKAIwQQJ2NgIwCyACKAIcIAIoAjgoAnRLBEAgAiACKAI4KAJ0NgIcCwNAAkAgAiACKAI4KAI4IAIoAjRqNgIoAkAgAigCKCACKAIgai0AACACLQAKRw0AIAIoAiggAigCIEEBa2otAAAgAi0AC0cNACACKAIoLQAAIAIoAiwtAABHDQAgAiACKAIoIgBBAWo2AiggAC0AASACKAIsLQABRwRADAELIAIgAigCLEECajYCLCACIAIoAihBAWo2AigDQCACIAIoAiwiAEEBajYCLCAALQABIQEgAiACKAIoIgBBAWo2AigCf0EAIAAtAAEgAUcNABogAiACKAIsIgBBAWo2AiwgAC0AASEBIAIgAigCKCIAQQFqNgIoQQAgAC0AASABRw0AGiACIAIoAiwiAEEBajYCLCAALQABIQEgAiACKAIoIgBBAWo2AihBACAALQABIAFHDQAaIAIgAigCLCIAQQFqNgIsIAAtAAEhASACIAIoAigiAEEBajYCKEEAIAAtAAEgAUcNABogAiACKAIsIgBBAWo2AiwgAC0AASEBIAIgAigCKCIAQQFqNgIoQQAgAC0AASABRw0AGiACIAIoAiwiAEEBajYCLCAALQABIQEgAiACKAIoIgBBAWo2AihBACAALQABIAFHDQAaIAIgAigCLCIAQQFqNgIsIAAtAAEhASACIAIoAigiAEEBajYCKEEAIAAtAAEgAUcNABogAiACKAIsIgBBAWo2AiwgAC0AASEBIAIgAigCKCIAQQFqNgIoQQAgAC0AASABRw0AGiACKAIsIAIoAgxJC0EBcQ0ACyACQYICIAIoAgwgAigCLGtrNgIkIAIgAigCDEGCAms2AiwgAigCJCACKAIgSgRAIAIoAjggAigCNDYCcCACIAIoAiQ2AiAgAigCJCACKAIcTg0CIAIgAigCLCACKAIgQQFrai0AADoACyACIAIoAiwgAigCIGotAAA6AAoLCyACIAIoAhQgAigCNCACKAIQcUEBdGovAQAiATYCNEEAIQAgASACKAIYSwR/IAIgAigCMEEBayIANgIwIABBAEcFQQALQQFxDQELCwJAIAIoAiAgAigCOCgCdE0EQCACIAIoAiA2AjwMAQsgAiACKAI4KAJ0NgI8CyACKAI8C5IQAQF/IwBBMGsiAiQAIAIgADYCKCACIAE2AiQgAgJ/IAIoAigoAiwgAigCKCgCDEEFa0kEQCACKAIoKAIsDAELIAIoAigoAgxBBWsLNgIgIAJBADYCECACIAIoAigoAgAoAgQ2AgwDQAJAIAJB//8DNgIcIAIgAigCKCgCvC1BKmpBA3U2AhQgAigCKCgCACgCECACKAIUSQ0AIAIgAigCKCgCACgCECACKAIUazYCFCACIAIoAigoAmwgAigCKCgCXGs2AhggAigCHCACKAIYIAIoAigoAgAoAgRqSwRAIAIgAigCGCACKAIoKAIAKAIEajYCHAsgAigCHCACKAIUSwRAIAIgAigCFDYCHAsCQCACKAIcIAIoAiBPDQACQCACKAIcRQRAIAIoAiRBBEcNAQsgAigCJEUNACACKAIcIAIoAhggAigCKCgCACgCBGpGDQELDAELQQAhACACIAIoAiRBBEYEfyACKAIcIAIoAhggAigCKCgCACgCBGpGBUEAC0EBcTYCECACKAIoQQBBACACKAIQEF0gAigCKCgCCCACKAIoKAIUQQRraiACKAIcOgAAIAIoAigoAgggAigCKCgCFEEDa2ogAigCHEEIdjoAACACKAIoKAIIIAIoAigoAhRBAmtqIAIoAhxBf3M6AAAgAigCKCgCCCACKAIoKAIUQQFraiACKAIcQX9zQQh2OgAAIAIoAigoAgAQHCACKAIYBEAgAigCGCACKAIcSwRAIAIgAigCHDYCGAsgAigCKCgCACgCDCACKAIoKAI4IAIoAigoAlxqIAIoAhgQGRogAigCKCgCACIAIAIoAhggACgCDGo2AgwgAigCKCgCACIAIAAoAhAgAigCGGs2AhAgAigCKCgCACIAIAIoAhggACgCFGo2AhQgAigCKCIAIAIoAhggACgCXGo2AlwgAiACKAIcIAIoAhhrNgIcCyACKAIcBEAgAigCKCgCACACKAIoKAIAKAIMIAIoAhwQdhogAigCKCgCACIAIAIoAhwgACgCDGo2AgwgAigCKCgCACIAIAAoAhAgAigCHGs2AhAgAigCKCgCACIAIAIoAhwgACgCFGo2AhQLIAIoAhBFDQELCyACIAIoAgwgAigCKCgCACgCBGs2AgwgAigCDARAAkAgAigCDCACKAIoKAIsTwRAIAIoAihBAjYCsC0gAigCKCgCOCACKAIoKAIAKAIAIAIoAigoAixrIAIoAigoAiwQGRogAigCKCACKAIoKAIsNgJsDAELIAIoAgwgAigCKCgCPCACKAIoKAJsa08EQCACKAIoIgAgACgCbCACKAIoKAIsazYCbCACKAIoKAI4IAIoAigoAjggAigCKCgCLGogAigCKCgCbBAZGiACKAIoKAKwLUECSQRAIAIoAigiACAAKAKwLUEBajYCsC0LCyACKAIoKAI4IAIoAigoAmxqIAIoAigoAgAoAgAgAigCDGsgAigCDBAZGiACKAIoIgAgAigCDCAAKAJsajYCbAsgAigCKCACKAIoKAJsNgJcIAIoAigiAQJ/IAIoAgwgAigCKCgCLCACKAIoKAK0LWtLBEAgAigCKCgCLCACKAIoKAK0LWsMAQsgAigCDAsgASgCtC1qNgK0LQsgAigCKCgCwC0gAigCKCgCbEkEQCACKAIoIAIoAigoAmw2AsAtCwJAIAIoAhAEQCACQQM2AiwMAQsCQCACKAIkRQ0AIAIoAiRBBEYNACACKAIoKAIAKAIEDQAgAigCKCgCbCACKAIoKAJcRw0AIAJBATYCLAwBCyACIAIoAigoAjwgAigCKCgCbGtBAWs2AhQCQCACKAIoKAIAKAIEIAIoAhRNDQAgAigCKCgCXCACKAIoKAIsSA0AIAIoAigiACAAKAJcIAIoAigoAixrNgJcIAIoAigiACAAKAJsIAIoAigoAixrNgJsIAIoAigoAjggAigCKCgCOCACKAIoKAIsaiACKAIoKAJsEBkaIAIoAigoArAtQQJJBEAgAigCKCIAIAAoArAtQQFqNgKwLQsgAiACKAIoKAIsIAIoAhRqNgIUCyACKAIUIAIoAigoAgAoAgRLBEAgAiACKAIoKAIAKAIENgIUCyACKAIUBEAgAigCKCgCACACKAIoKAI4IAIoAigoAmxqIAIoAhQQdhogAigCKCIAIAIoAhQgACgCbGo2AmwLIAIoAigoAsAtIAIoAigoAmxJBEAgAigCKCACKAIoKAJsNgLALQsgAiACKAIoKAK8LUEqakEDdTYCFCACIAIoAigoAgwgAigCFGtB//8DSwR/Qf//AwUgAigCKCgCDCACKAIUaws2AhQgAgJ/IAIoAhQgAigCKCgCLEsEQCACKAIoKAIsDAELIAIoAhQLNgIgIAIgAigCKCgCbCACKAIoKAJcazYCGAJAIAIoAhggAigCIEkEQCACKAIYRQRAIAIoAiRBBEcNAgsgAigCJEUNASACKAIoKAIAKAIEDQEgAigCGCACKAIUSw0BCyACAn8gAigCGCACKAIUSwRAIAIoAhQMAQsgAigCGAs2AhwgAgJ/QQAgAigCJEEERw0AGkEAIAIoAigoAgAoAgQNABogAigCHCACKAIYRgtBAXE2AhAgAigCKCACKAIoKAI4IAIoAigoAlxqIAIoAhwgAigCEBBdIAIoAigiACACKAIcIAAoAlxqNgJcIAIoAigoAgAQHAsgAkECQQAgAigCEBs2AiwLIAIoAiwhACACQTBqJAAgAAuyAgEBfyMAQRBrIgEkACABIAA2AggCQCABKAIIEHgEQCABQX42AgwMAQsgASABKAIIKAIcKAIENgIEIAEoAggoAhwoAggEQCABKAIIKAIoIAEoAggoAhwoAgggASgCCCgCJBEEAAsgASgCCCgCHCgCRARAIAEoAggoAiggASgCCCgCHCgCRCABKAIIKAIkEQQACyABKAIIKAIcKAJABEAgASgCCCgCKCABKAIIKAIcKAJAIAEoAggoAiQRBAALIAEoAggoAhwoAjgEQCABKAIIKAIoIAEoAggoAhwoAjggASgCCCgCJBEEAAsgASgCCCgCKCABKAIIKAIcIAEoAggoAiQRBAAgASgCCEEANgIcIAFBfUEAIAEoAgRB8QBGGzYCDAsgASgCDCEAIAFBEGokACAAC+sXAQJ/IwBB8ABrIgMgADYCbCADIAE2AmggAyACNgJkIANBfzYCXCADIAMoAmgvAQI2AlQgA0EANgJQIANBBzYCTCADQQQ2AkggAygCVEUEQCADQYoBNgJMIANBAzYCSAsgA0EANgJgA0AgAygCYCADKAJkSkUEQCADIAMoAlQ2AlggAyADKAJoIAMoAmBBAWpBAnRqLwECNgJUIAMgAygCUEEBaiIANgJQAkACQCADKAJMIABMDQAgAygCWCADKAJURw0ADAELAkAgAygCUCADKAJISARAA0AgAyADKAJsQfwUaiADKAJYQQJ0ai8BAjYCRAJAIAMoAmwoArwtQRAgAygCRGtKBEAgAyADKAJsQfwUaiADKAJYQQJ0ai8BADYCQCADKAJsIgAgAC8BuC0gAygCQEH//wNxIAMoAmwoArwtdHI7AbgtIAMoAmwvAbgtQf8BcSEBIAMoAmwoAgghAiADKAJsIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAmwvAbgtQQh2IQEgAygCbCgCCCECIAMoAmwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCbCADKAJAQf//A3FBECADKAJsKAK8LWt1OwG4LSADKAJsIgAgACgCvC0gAygCREEQa2o2ArwtDAELIAMoAmwiACAALwG4LSADKAJsQfwUaiADKAJYQQJ0ai8BACADKAJsKAK8LXRyOwG4LSADKAJsIgAgAygCRCAAKAK8LWo2ArwtCyADIAMoAlBBAWsiADYCUCAADQALDAELAkAgAygCWARAIAMoAlggAygCXEcEQCADIAMoAmxB/BRqIAMoAlhBAnRqLwECNgI8AkAgAygCbCgCvC1BECADKAI8a0oEQCADIAMoAmxB/BRqIAMoAlhBAnRqLwEANgI4IAMoAmwiACAALwG4LSADKAI4Qf//A3EgAygCbCgCvC10cjsBuC0gAygCbC8BuC1B/wFxIQEgAygCbCgCCCECIAMoAmwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCbC8BuC1BCHYhASADKAJsKAIIIQIgAygCbCIEKAIUIQAgBCAAQQFqNgIUIAAgAmogAToAACADKAJsIAMoAjhB//8DcUEQIAMoAmwoArwta3U7AbgtIAMoAmwiACAAKAK8LSADKAI8QRBrajYCvC0MAQsgAygCbCIAIAAvAbgtIAMoAmxB/BRqIAMoAlhBAnRqLwEAIAMoAmwoArwtdHI7AbgtIAMoAmwiACADKAI8IAAoArwtajYCvC0LIAMgAygCUEEBazYCUAsgAyADKAJsLwG+FTYCNAJAIAMoAmwoArwtQRAgAygCNGtKBEAgAyADKAJsLwG8FTYCMCADKAJsIgAgAC8BuC0gAygCMEH//wNxIAMoAmwoArwtdHI7AbgtIAMoAmwvAbgtQf8BcSEBIAMoAmwoAgghAiADKAJsIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAmwvAbgtQQh2IQEgAygCbCgCCCECIAMoAmwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCbCADKAIwQf//A3FBECADKAJsKAK8LWt1OwG4LSADKAJsIgAgACgCvC0gAygCNEEQa2o2ArwtDAELIAMoAmwiACAALwG4LSADKAJsLwG8FSADKAJsKAK8LXRyOwG4LSADKAJsIgAgAygCNCAAKAK8LWo2ArwtCyADQQI2AiwCQCADKAJsKAK8LUEQIAMoAixrSgRAIAMgAygCUEEDazYCKCADKAJsIgAgAC8BuC0gAygCKEH//wNxIAMoAmwoArwtdHI7AbgtIAMoAmwvAbgtQf8BcSEBIAMoAmwoAgghAiADKAJsIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAmwvAbgtQQh2IQEgAygCbCgCCCECIAMoAmwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCbCADKAIoQf//A3FBECADKAJsKAK8LWt1OwG4LSADKAJsIgAgACgCvC0gAygCLEEQa2o2ArwtDAELIAMoAmwiACAALwG4LSADKAJQQQNrQf//A3EgAygCbCgCvC10cjsBuC0gAygCbCIAIAMoAiwgACgCvC1qNgK8LQsMAQsCQCADKAJQQQpMBEAgAyADKAJsLwHCFTYCJAJAIAMoAmwoArwtQRAgAygCJGtKBEAgAyADKAJsLwHAFTYCICADKAJsIgAgAC8BuC0gAygCIEH//wNxIAMoAmwoArwtdHI7AbgtIAMoAmwvAbgtQf8BcSEBIAMoAmwoAgghAiADKAJsIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAmwvAbgtQQh2IQEgAygCbCgCCCECIAMoAmwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCbCADKAIgQf//A3FBECADKAJsKAK8LWt1OwG4LSADKAJsIgAgACgCvC0gAygCJEEQa2o2ArwtDAELIAMoAmwiACAALwG4LSADKAJsLwHAFSADKAJsKAK8LXRyOwG4LSADKAJsIgAgAygCJCAAKAK8LWo2ArwtCyADQQM2AhwCQCADKAJsKAK8LUEQIAMoAhxrSgRAIAMgAygCUEEDazYCGCADKAJsIgAgAC8BuC0gAygCGEH//wNxIAMoAmwoArwtdHI7AbgtIAMoAmwvAbgtQf8BcSEBIAMoAmwoAgghAiADKAJsIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAmwvAbgtQQh2IQEgAygCbCgCCCECIAMoAmwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCbCADKAIYQf//A3FBECADKAJsKAK8LWt1OwG4LSADKAJsIgAgACgCvC0gAygCHEEQa2o2ArwtDAELIAMoAmwiACAALwG4LSADKAJQQQNrQf//A3EgAygCbCgCvC10cjsBuC0gAygCbCIAIAMoAhwgACgCvC1qNgK8LQsMAQsgAyADKAJsLwHGFTYCFAJAIAMoAmwoArwtQRAgAygCFGtKBEAgAyADKAJsLwHEFTYCECADKAJsIgAgAC8BuC0gAygCEEH//wNxIAMoAmwoArwtdHI7AbgtIAMoAmwvAbgtQf8BcSEBIAMoAmwoAgghAiADKAJsIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAmwvAbgtQQh2IQEgAygCbCgCCCECIAMoAmwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCbCADKAIQQf//A3FBECADKAJsKAK8LWt1OwG4LSADKAJsIgAgACgCvC0gAygCFEEQa2o2ArwtDAELIAMoAmwiACAALwG4LSADKAJsLwHEFSADKAJsKAK8LXRyOwG4LSADKAJsIgAgAygCFCAAKAK8LWo2ArwtCyADQQc2AgwCQCADKAJsKAK8LUEQIAMoAgxrSgRAIAMgAygCUEELazYCCCADKAJsIgAgAC8BuC0gAygCCEH//wNxIAMoAmwoArwtdHI7AbgtIAMoAmwvAbgtQf8BcSEBIAMoAmwoAgghAiADKAJsIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAmwvAbgtQQh2IQEgAygCbCgCCCECIAMoAmwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCbCADKAIIQf//A3FBECADKAJsKAK8LWt1OwG4LSADKAJsIgAgACgCvC0gAygCDEEQa2o2ArwtDAELIAMoAmwiACAALwG4LSADKAJQQQtrQf//A3EgAygCbCgCvC10cjsBuC0gAygCbCIAIAMoAgwgACgCvC1qNgK8LQsLCwsgA0EANgJQIAMgAygCWDYCXAJAIAMoAlRFBEAgA0GKATYCTCADQQM2AkgMAQsCQCADKAJYIAMoAlRGBEAgA0EGNgJMIANBAzYCSAwBCyADQQc2AkwgA0EENgJICwsLIAMgAygCYEEBajYCYAwBCwsLkQQBAX8jAEEwayIDIAA2AiwgAyABNgIoIAMgAjYCJCADQX82AhwgAyADKAIoLwECNgIUIANBADYCECADQQc2AgwgA0EENgIIIAMoAhRFBEAgA0GKATYCDCADQQM2AggLIAMoAiggAygCJEEBakECdGpB//8DOwECIANBADYCIANAIAMoAiAgAygCJEpFBEAgAyADKAIUNgIYIAMgAygCKCADKAIgQQFqQQJ0ai8BAjYCFCADIAMoAhBBAWoiADYCEAJAAkAgAygCDCAATA0AIAMoAhggAygCFEcNAAwBCwJAIAMoAhAgAygCCEgEQCADKAIsQfwUaiADKAIYQQJ0aiIAIAMoAhAgAC8BAGo7AQAMAQsCQCADKAIYBEAgAygCGCADKAIcRwRAIAMoAiwgAygCGEECdGpB/BRqIgAgAC8BAEEBajsBAAsgAygCLCIAIABBvBVqLwEAQQFqOwG8FQwBCwJAIAMoAhBBCkwEQCADKAIsIgAgAEHAFWovAQBBAWo7AcAVDAELIAMoAiwiACAAQcQVai8BAEEBajsBxBULCwsgA0EANgIQIAMgAygCGDYCHAJAIAMoAhRFBEAgA0GKATYCDCADQQM2AggMAQsCQCADKAIYIAMoAhRGBEAgA0EGNgIMIANBAzYCCAwBCyADQQc2AgwgA0EENgIICwsLIAMgAygCIEEBajYCIAwBCwsLpxIBAn8jAEHQAGsiAyAANgJMIAMgATYCSCADIAI2AkQgA0EANgI4IAMoAkwoAqAtBEADQCADIAMoAkwoAqQtIAMoAjhBAXRqLwEANgJAIAMoAkwoApgtIQAgAyADKAI4IgFBAWo2AjggAyAAIAFqLQAANgI8AkAgAygCQEUEQCADIAMoAkggAygCPEECdGovAQI2AiwCQCADKAJMKAK8LUEQIAMoAixrSgRAIAMgAygCSCADKAI8QQJ0ai8BADYCKCADKAJMIgAgAC8BuC0gAygCKEH//wNxIAMoAkwoArwtdHI7AbgtIAMoAkwvAbgtQf8BcSEBIAMoAkwoAgghAiADKAJMIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAkwvAbgtQQh2IQEgAygCTCgCCCECIAMoAkwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCTCADKAIoQf//A3FBECADKAJMKAK8LWt1OwG4LSADKAJMIgAgACgCvC0gAygCLEEQa2o2ArwtDAELIAMoAkwiACAALwG4LSADKAJIIAMoAjxBAnRqLwEAIAMoAkwoArwtdHI7AbgtIAMoAkwiACADKAIsIAAoArwtajYCvC0LDAELIAMgAygCPC0A0F02AjQgAyADKAJIIAMoAjRBgQJqQQJ0ai8BAjYCJAJAIAMoAkwoArwtQRAgAygCJGtKBEAgAyADKAJIIAMoAjRBgQJqQQJ0ai8BADYCICADKAJMIgAgAC8BuC0gAygCIEH//wNxIAMoAkwoArwtdHI7AbgtIAMoAkwvAbgtQf8BcSEBIAMoAkwoAgghAiADKAJMIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAkwvAbgtQQh2IQEgAygCTCgCCCECIAMoAkwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCTCADKAIgQf//A3FBECADKAJMKAK8LWt1OwG4LSADKAJMIgAgACgCvC0gAygCJEEQa2o2ArwtDAELIAMoAkwiACAALwG4LSADKAJIIAMoAjRBgQJqQQJ0ai8BACADKAJMKAK8LXRyOwG4LSADKAJMIgAgAygCJCAAKAK8LWo2ArwtCyADIAMoAjRBAnRBkOoAaigCADYCMCADKAIwBEAgAyADKAI8IAMoAjRBAnRBgO0AaigCAGs2AjwgAyADKAIwNgIcAkAgAygCTCgCvC1BECADKAIca0oEQCADIAMoAjw2AhggAygCTCIAIAAvAbgtIAMoAhhB//8DcSADKAJMKAK8LXRyOwG4LSADKAJMLwG4LUH/AXEhASADKAJMKAIIIQIgAygCTCIEKAIUIQAgBCAAQQFqNgIUIAAgAmogAToAACADKAJMLwG4LUEIdiEBIAMoAkwoAgghAiADKAJMIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAkwgAygCGEH//wNxQRAgAygCTCgCvC1rdTsBuC0gAygCTCIAIAAoArwtIAMoAhxBEGtqNgK8LQwBCyADKAJMIgAgAC8BuC0gAygCPEH//wNxIAMoAkwoArwtdHI7AbgtIAMoAkwiACADKAIcIAAoArwtajYCvC0LCyADIAMoAkBBAWs2AkAgAwJ/IAMoAkBBgAJJBEAgAygCQC0A0FkMAQsgAygCQEEHdkGAAmotANBZCzYCNCADIAMoAkQgAygCNEECdGovAQI2AhQCQCADKAJMKAK8LUEQIAMoAhRrSgRAIAMgAygCRCADKAI0QQJ0ai8BADYCECADKAJMIgAgAC8BuC0gAygCEEH//wNxIAMoAkwoArwtdHI7AbgtIAMoAkwvAbgtQf8BcSEBIAMoAkwoAgghAiADKAJMIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAkwvAbgtQQh2IQEgAygCTCgCCCECIAMoAkwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCTCADKAIQQf//A3FBECADKAJMKAK8LWt1OwG4LSADKAJMIgAgACgCvC0gAygCFEEQa2o2ArwtDAELIAMoAkwiACAALwG4LSADKAJEIAMoAjRBAnRqLwEAIAMoAkwoArwtdHI7AbgtIAMoAkwiACADKAIUIAAoArwtajYCvC0LIAMgAygCNEECdEGQ6wBqKAIANgIwIAMoAjAEQCADIAMoAkAgAygCNEECdEGA7gBqKAIAazYCQCADIAMoAjA2AgwCQCADKAJMKAK8LUEQIAMoAgxrSgRAIAMgAygCQDYCCCADKAJMIgAgAC8BuC0gAygCCEH//wNxIAMoAkwoArwtdHI7AbgtIAMoAkwvAbgtQf8BcSEBIAMoAkwoAgghAiADKAJMIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAkwvAbgtQQh2IQEgAygCTCgCCCECIAMoAkwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCTCADKAIIQf//A3FBECADKAJMKAK8LWt1OwG4LSADKAJMIgAgACgCvC0gAygCDEEQa2o2ArwtDAELIAMoAkwiACAALwG4LSADKAJAQf//A3EgAygCTCgCvC10cjsBuC0gAygCTCIAIAMoAgwgACgCvC1qNgK8LQsLCyADKAI4IAMoAkwoAqAtSQ0ACwsgAyADKAJILwGCCDYCBAJAIAMoAkwoArwtQRAgAygCBGtKBEAgAyADKAJILwGACDYCACADKAJMIgAgAC8BuC0gAygCAEH//wNxIAMoAkwoArwtdHI7AbgtIAMoAkwvAbgtQf8BcSEBIAMoAkwoAgghAiADKAJMIgQoAhQhACAEIABBAWo2AhQgACACaiABOgAAIAMoAkwvAbgtQQh2IQEgAygCTCgCCCECIAMoAkwiBCgCFCEAIAQgAEEBajYCFCAAIAJqIAE6AAAgAygCTCADKAIAQf//A3FBECADKAJMKAK8LWt1OwG4LSADKAJMIgAgACgCvC0gAygCBEEQa2o2ArwtDAELIAMoAkwiACAALwG4LSADKAJILwGACCADKAJMKAK8LXRyOwG4LSADKAJMIgAgAygCBCAAKAK8LWo2ArwtCwuXAgEEfyMAQRBrIgEgADYCDAJAIAEoAgwoArwtQRBGBEAgASgCDC8BuC1B/wFxIQIgASgCDCgCCCEDIAEoAgwiBCgCFCEAIAQgAEEBajYCFCAAIANqIAI6AAAgASgCDC8BuC1BCHYhAiABKAIMKAIIIQMgASgCDCIEKAIUIQAgBCAAQQFqNgIUIAAgA2ogAjoAACABKAIMQQA7AbgtIAEoAgxBADYCvC0MAQsgASgCDCgCvC1BCE4EQCABKAIMLwG4LSECIAEoAgwoAgghAyABKAIMIgQoAhQhACAEIABBAWo2AhQgACADaiACOgAAIAEoAgwiACAALwG4LUEIdjsBuC0gASgCDCIAIAAoArwtQQhrNgK8LQsLC+8BAQR/IwBBEGsiASAANgIMAkAgASgCDCgCvC1BCEoEQCABKAIMLwG4LUH/AXEhAiABKAIMKAIIIQMgASgCDCIEKAIUIQAgBCAAQQFqNgIUIAAgA2ogAjoAACABKAIMLwG4LUEIdiECIAEoAgwoAgghAyABKAIMIgQoAhQhACAEIABBAWo2AhQgACADaiACOgAADAELIAEoAgwoArwtQQBKBEAgASgCDC8BuC0hAiABKAIMKAIIIQMgASgCDCIEKAIUIQAgBCAAQQFqNgIUIAAgA2ogAjoAAAsLIAEoAgxBADsBuC0gASgCDEEANgK8LQv8AQEBfyMAQRBrIgEgADYCDCABQQA2AggDQCABKAIIQZ4CTkUEQCABKAIMQZQBaiABKAIIQQJ0akEAOwEAIAEgASgCCEEBajYCCAwBCwsgAUEANgIIA0AgASgCCEEeTkUEQCABKAIMQYgTaiABKAIIQQJ0akEAOwEAIAEgASgCCEEBajYCCAwBCwsgAUEANgIIA0AgASgCCEETTkUEQCABKAIMQfwUaiABKAIIQQJ0akEAOwEAIAEgASgCCEEBajYCCAwBCwsgASgCDEEBOwGUCSABKAIMQQA2AqwtIAEoAgxBADYCqC0gASgCDEEANgKwLSABKAIMQQA2AqAtCyIBAX8jAEEQayIBJAAgASAANgIMIAEoAgwQFSABQRBqJAAL6QEBAX8jAEEwayICIAA2AiQgAiABNwMYIAJCADcDECACIAIoAiQpAwhCAX03AwgCQANAIAIpAxAgAikDCFQEQCACIAIpAxAgAikDCCACKQMQfUIBiHw3AwACQCACKAIkKAIEIAIpAwCnQQN0aikDACACKQMYVgRAIAIgAikDAEIBfTcDCAwBCwJAIAIpAwAgAigCJCkDCFIEQCACKAIkKAIEIAIpAwBCAXynQQN0aikDACACKQMYWA0BCyACIAIpAwA3AygMBAsgAiACKQMAQgF8NwMQCwwBCwsgAiACKQMQNwMoCyACKQMoC6cBAQF/IwBBMGsiBCQAIAQgADYCKCAEIAE2AiQgBCACNwMYIAQgAzYCFCAEIAQoAigpAzggBCgCKCkDMCAEKAIkIAQpAxggBCgCFBCIATcDCAJAIAQpAwhCAFMEQCAEQX82AiwMAQsgBCgCKCAEKQMINwM4IAQoAiggBCgCKCkDOBDAASECIAQoAiggAjcDQCAEQQA2AiwLIAQoAiwhACAEQTBqJAAgAAvrAQEBfyMAQSBrIgMkACADIAA2AhggAyABNwMQIAMgAjYCDAJAIAMpAxAgAygCGCkDEFQEQCADQQE6AB8MAQsgAyADKAIYKAIAIAMpAxBCBIanEE4iADYCCCAARQRAIAMoAgxBDkEAEBQgA0EAOgAfDAELIAMoAhggAygCCDYCACADIAMoAhgoAgQgAykDEEIBfEIDhqcQTiIANgIEIABFBEAgAygCDEEOQQAQFCADQQA6AB8MAQsgAygCGCADKAIENgIEIAMoAhggAykDEDcDECADQQE6AB8LIAMtAB9BAXEhACADQSBqJAAgAAvOAgEBfyMAQTBrIgQkACAEIAA2AiggBCABNwMgIAQgAjYCHCAEIAM2AhgCQAJAIAQoAigNACAEKQMgUA0AIAQoAhhBEkEAEBQgBEEANgIsDAELIAQgBCgCKCAEKQMgIAQoAhwgBCgCGBBMIgA2AgwgAEUEQCAEQQA2AiwMAQsgBEEYEBgiADYCFCAARQRAIAQoAhhBDkEAEBQgBCgCDBAyIARBADYCLAwBCyAEKAIUIAQoAgw2AhAgBCgCFEEANgIUQQAQASEAIAQoAhQgADYCDCMAQRBrIgAgBCgCFDYCDCAAKAIMQQA2AgAgACgCDEEANgIEIAAoAgxBADYCCCAEQQIgBCgCFCAEKAIYEIMBIgA2AhAgAEUEQCAEKAIUKAIQEDIgBCgCFBAVIARBADYCLAwBCyAEIAQoAhA2AiwLIAQoAiwhACAEQTBqJAAgAAupAQEBfyMAQTBrIgQkACAEIAA2AiggBCABNwMgIAQgAjYCHCAEIAM2AhgCQCAEKAIoRQRAIAQpAyBCAFIEQCAEKAIYQRJBABAUIARBADYCLAwCCyAEQQBCACAEKAIcIAQoAhgQwwE2AiwMAQsgBCAEKAIoNgIIIAQgBCkDIDcDECAEIARBCGpCASAEKAIcIAQoAhgQwwE2AiwLIAQoAiwhACAEQTBqJAAgAAtGAQF/IwBBIGsiAyQAIAMgADYCHCADIAE3AxAgAyACNgIMIAMoAhwgAykDECADKAIMIAMoAhxBCGoQTSEAIANBIGokACAAC4sMAQZ/IAAgAWohBQJAAkAgACgCBCICQQFxDQAgAkEDcUUNASAAKAIAIgIgAWohAQJAIAAgAmsiAEH4mwEoAgBHBEAgAkH/AU0EQCAAKAIIIgQgAkEDdiICQQN0QYycAWpGGiAAKAIMIgMgBEcNAkHkmwFB5JsBKAIAQX4gAndxNgIADAMLIAAoAhghBgJAIAAgACgCDCIDRwRAIAAoAggiAkH0mwEoAgBJGiACIAM2AgwgAyACNgIIDAELAkAgAEEUaiICKAIAIgQNACAAQRBqIgIoAgAiBA0AQQAhAwwBCwNAIAIhByAEIgNBFGoiAigCACIEDQAgA0EQaiECIAMoAhAiBA0ACyAHQQA2AgALIAZFDQICQCAAIAAoAhwiBEECdEGUngFqIgIoAgBGBEAgAiADNgIAIAMNAUHomwFB6JsBKAIAQX4gBHdxNgIADAQLIAZBEEEUIAYoAhAgAEYbaiADNgIAIANFDQMLIAMgBjYCGCAAKAIQIgIEQCADIAI2AhAgAiADNgIYCyAAKAIUIgJFDQIgAyACNgIUIAIgAzYCGAwCCyAFKAIEIgJBA3FBA0cNAUHsmwEgATYCACAFIAJBfnE2AgQgACABQQFyNgIEIAUgATYCAA8LIAQgAzYCDCADIAQ2AggLAkAgBSgCBCICQQJxRQRAIAVB/JsBKAIARgRAQfybASAANgIAQfCbAUHwmwEoAgAgAWoiATYCACAAIAFBAXI2AgQgAEH4mwEoAgBHDQNB7JsBQQA2AgBB+JsBQQA2AgAPCyAFQfibASgCAEYEQEH4mwEgADYCAEHsmwFB7JsBKAIAIAFqIgE2AgAgACABQQFyNgIEIAAgAWogATYCAA8LIAJBeHEgAWohAQJAIAJB/wFNBEAgBSgCCCIEIAJBA3YiAkEDdEGMnAFqRhogBCAFKAIMIgNGBEBB5JsBQeSbASgCAEF+IAJ3cTYCAAwCCyAEIAM2AgwgAyAENgIIDAELIAUoAhghBgJAIAUgBSgCDCIDRwRAIAUoAggiAkH0mwEoAgBJGiACIAM2AgwgAyACNgIIDAELAkAgBUEUaiIEKAIAIgINACAFQRBqIgQoAgAiAg0AQQAhAwwBCwNAIAQhByACIgNBFGoiBCgCACICDQAgA0EQaiEEIAMoAhAiAg0ACyAHQQA2AgALIAZFDQACQCAFIAUoAhwiBEECdEGUngFqIgIoAgBGBEAgAiADNgIAIAMNAUHomwFB6JsBKAIAQX4gBHdxNgIADAILIAZBEEEUIAYoAhAgBUYbaiADNgIAIANFDQELIAMgBjYCGCAFKAIQIgIEQCADIAI2AhAgAiADNgIYCyAFKAIUIgJFDQAgAyACNgIUIAIgAzYCGAsgACABQQFyNgIEIAAgAWogATYCACAAQfibASgCAEcNAUHsmwEgATYCAA8LIAUgAkF+cTYCBCAAIAFBAXI2AgQgACABaiABNgIACyABQf8BTQRAIAFBA3YiAkEDdEGMnAFqIQECf0HkmwEoAgAiA0EBIAJ0IgJxRQRAQeSbASACIANyNgIAIAEMAQsgASgCCAshAiABIAA2AgggAiAANgIMIAAgATYCDCAAIAI2AggPC0EfIQIgAEIANwIQIAFB////B00EQCABQQh2IgIgAkGA/j9qQRB2QQhxIgR0IgIgAkGA4B9qQRB2QQRxIgN0IgIgAkGAgA9qQRB2QQJxIgJ0QQ92IAMgBHIgAnJrIgJBAXQgASACQRVqdkEBcXJBHGohAgsgACACNgIcIAJBAnRBlJ4BaiEHAkACQEHomwEoAgAiBEEBIAJ0IgNxRQRAQeibASADIARyNgIAIAcgADYCACAAIAc2AhgMAQsgAUEAQRkgAkEBdmsgAkEfRht0IQIgBygCACEDA0AgAyIEKAIEQXhxIAFGDQIgAkEddiEDIAJBAXQhAiAEIANBBHFqIgdBEGooAgAiAw0ACyAHIAA2AhAgACAENgIYCyAAIAA2AgwgACAANgIIDwsgBCgCCCIBIAA2AgwgBCAANgIIIABBADYCGCAAIAQ2AgwgACABNgIICwsGAEG0mwELtQkBAX8jAEHgwABrIgUkACAFIAA2AtRAIAUgATYC0EAgBSACNgLMQCAFIAM3A8BAIAUgBDYCvEAgBSAFKALQQDYCuEACQAJAAkACQAJAAkACQAJAAkACQAJAAkAgBSgCvEAOEQMEAAYBAgUJCgoKCgoKCAoHCgsgBUIANwPYQAwKCyAFIAUoArhAQeQAaiAFKALMQCAFKQPAQBBDNwPYQAwJCyAFKAK4QBAVIAVCADcD2EAMCAsgBSgCuEAoAhAEQCAFIAUoArhAKAIQIAUoArhAKQMYIAUoArhAQeQAahBgIgM3A5hAIANQBEAgBUJ/NwPYQAwJCyAFKAK4QCkDCCAFKAK4QCkDCCAFKQOYQHxWBEAgBSgCuEBB5ABqQRVBABAUIAVCfzcD2EAMCQsgBSgCuEAiACAFKQOYQCAAKQMAfDcDACAFKAK4QCIAIAUpA5hAIAApAwh8NwMIIAUoArhAQQA2AhALIAUoArhALQB4QQFxRQRAIAVCADcDqEADQCAFKQOoQCAFKAK4QCkDAFQEQCAFIAUoArhAKQMAIAUpA6hAfUKAwABWBH5CgMAABSAFKAK4QCkDACAFKQOoQH0LNwOgQCAFIAUoAtRAIAVBEGogBSkDoEAQKyIDNwOwQCADQgBTBEAgBSgCuEBB5ABqIAUoAtRAEBcgBUJ/NwPYQAwLCyAFKQOwQFAEQCAFKAK4QEHkAGpBEUEAEBQgBUJ/NwPYQAwLBSAFIAUpA7BAIAUpA6hAfDcDqEAMAgsACwsLIAUoArhAIAUoArhAKQMANwMgIAVCADcD2EAMBwsgBSkDwEAgBSgCuEApAwggBSgCuEApAyB9VgRAIAUgBSgCuEApAwggBSgCuEApAyB9NwPAQAsgBSkDwEBQBEAgBUIANwPYQAwHCyAFKAK4QC0AeEEBcQRAIAUoAtRAIAUoArhAKQMgQQAQJ0EASARAIAUoArhAQeQAaiAFKALUQBAXIAVCfzcD2EAMCAsLIAUgBSgC1EAgBSgCzEAgBSkDwEAQKyIDNwOwQCADQgBTBEAgBSgCuEBB5ABqQRFBABAUIAVCfzcD2EAMBwsgBSgCuEAiACAFKQOwQCAAKQMgfDcDICAFKQOwQFAEQCAFKAK4QCkDICAFKAK4QCkDCFQEQCAFKAK4QEHkAGpBEUEAEBQgBUJ/NwPYQAwICwsgBSAFKQOwQDcD2EAMBgsgBSAFKAK4QCkDICAFKAK4QCkDAH0gBSgCuEApAwggBSgCuEApAwB9IAUoAsxAIAUpA8BAIAUoArhAQeQAahCIATcDCCAFKQMIQgBTBEAgBUJ/NwPYQAwGCyAFKAK4QCAFKQMIIAUoArhAKQMAfDcDICAFQgA3A9hADAULIAUgBSgCzEA2AgQgBSgCBCAFKAK4QEEoaiAFKAK4QEHkAGoQhAFBAEgEQCAFQn83A9hADAULIAVCADcD2EAMBAsgBSAFKAK4QCwAYKw3A9hADAMLIAUgBSgCuEApA3A3A9hADAILIAUgBSgCuEApAyAgBSgCuEApAwB9NwPYQAwBCyAFKAK4QEHkAGpBHEEAEBQgBUJ/NwPYQAsgBSkD2EAhAyAFQeDAAGokACADCwgAQQFBDBB/CyIBAX8jAEEQayIBIAA2AgwgASgCDCIAIAAoAjBBAWo2AjALBwAgACgCLAsHACAAKAIoCxgBAX8jAEEQayIBIAA2AgwgASgCDEEMagsHACAAKAIYCwcAIAAoAhALBwAgACgCCAtFAEGgmwFCADcDAEGYmwFCADcDAEGQmwFCADcDAEGImwFCADcDAEGAmwFCADcDAEH4mgFCADcDAEHwmgFCADcDAEHwmgELFAAgACABrSACrUIghoQgAyAEEH4LEwEBfiAAEEkiAUIgiKcQACABpwsVACAAIAGtIAKtQiCGhCADIAQQxAELFAAgACABIAKtIAOtQiCGhCAEEH0LrQQBAX8jAEEgayIFJAAgBSAANgIYIAUgAa0gAq1CIIaENwMQIAUgAzYCDCAFIAQ2AggCQAJAIAUpAxAgBSgCGCkDMFQEQCAFKAIIQQlNDQELIAUoAhhBCGpBEkEAEBQgBUF/NgIcDAELIAUoAhgoAhhBAnEEQCAFKAIYQQhqQRlBABAUIAVBfzYCHAwBCwJ/IAUoAgwhASMAQRBrIgAkACAAIAE2AgggAEEBOgAHAkAgACgCCEUEQCAAQQE6AA8MAQsgACAAKAIIIAAtAAdBAXEQswFBAEc6AA8LIAAtAA9BAXEhASAAQRBqJAAgAUULBEAgBSgCGEEIakEQQQAQFCAFQX82AhwMAQsgBSAFKAIYKAJAIAUpAxCnQQR0ajYCBCAFIAUoAgQoAgAEfyAFKAIEKAIAKAIQBUF/CzYCAAJAIAUoAgwgBSgCAEYEQCAFKAIEKAIEBEAgBSgCBCgCBCIAIAAoAgBBfnE2AgAgBSgCBCgCBEEAOwFQIAUoAgQoAgQoAgBFBEAgBSgCBCgCBBA3IAUoAgRBADYCBAsLDAELIAUoAgQoAgRFBEAgBSgCBCgCABBAIQAgBSgCBCAANgIEIABFBEAgBSgCGEEIakEOQQAQFCAFQX82AhwMAwsLIAUoAgQoAgQgBSgCDDYCECAFKAIEKAIEIAUoAgg7AVAgBSgCBCgCBCIAIAAoAgBBAXI2AgALIAVBADYCHAsgBSgCHCEAIAVBIGokACAACxcBAX4gACABIAIQciIDQiCIpxAAIAOnCx8BAX4gACABIAKtIAOtQiCGhBArIgRCIIinEAAgBKcLrgECAX8BfgJ/IwBBIGsiAiAANgIUIAIgATYCEAJAIAIoAhRFBEAgAkJ/NwMYDAELIAIoAhBBCHEEQCACIAIoAhQpAzA3AwgDQCACKQMIQgBSBH8gAigCFCgCQCACKQMIQgF9p0EEdGooAgAFQQELRQRAIAIgAikDCEIBfTcDCAwBCwsgAiACKQMINwMYDAELIAIgAigCFCkDMDcDGAsgAikDGCIDQiCIpwsQACADpwsTACAAIAGtIAKtQiCGhCADEMUBC4gCAgF/AX4CfyMAQSBrIgQkACAEIAA2AhQgBCABNgIQIAQgAq0gA61CIIaENwMIAkAgBCgCFEUEQCAEQn83AxgMAQsgBCgCFCgCBARAIARCfzcDGAwBCyAEKQMIQv///////////wBWBEAgBCgCFEEEakESQQAQFCAEQn83AxgMAQsCQCAEKAIULQAQQQFxRQRAIAQpAwhQRQ0BCyAEQgA3AxgMAQsgBCAEKAIUKAIUIAQoAhAgBCkDCBArIgU3AwAgBUIAUwRAIAQoAhRBBGogBCgCFCgCFBAXIARCfzcDGAwBCyAEIAQpAwA3AxgLIAQpAxghBSAEQSBqJAAgBUIgiKcLEAAgBacLTwEBfyMAQSBrIgQkACAEIAA2AhwgBCABrSACrUIghoQ3AxAgBCADNgIMIAQoAhwgBCkDECAEKAIMIAQoAhwoAhwQrQEhACAEQSBqJAAgAAvZAwEBfyMAQSBrIgUkACAFIAA2AhggBSABrSACrUIghoQ3AxAgBSADNgIMIAUgBDYCCAJAIAUoAhggBSkDEEEAQQAQP0UEQCAFQX82AhwMAQsgBSgCGCgCGEECcQRAIAUoAhhBCGpBGUEAEBQgBUF/NgIcDAELIAUoAhgoAkAgBSkDEKdBBHRqKAIIBEAgBSgCGCgCQCAFKQMQp0EEdGooAgggBSgCDBBnQQBIBEAgBSgCGEEIakEPQQAQFCAFQX82AhwMAgsgBUEANgIcDAELIAUgBSgCGCgCQCAFKQMQp0EEdGo2AgQgBSAFKAIEKAIABH8gBSgCDCAFKAIEKAIAKAIURwVBAQtBAXE2AgACQCAFKAIABEAgBSgCBCgCBEUEQCAFKAIEKAIAEEAhACAFKAIEIAA2AgQgAEUEQCAFKAIYQQhqQQ5BABAUIAVBfzYCHAwECwsgBSgCBCgCBCAFKAIMNgIUIAUoAgQoAgQiACAAKAIAQSByNgIADAELIAUoAgQoAgQEQCAFKAIEKAIEIgAgACgCAEFfcTYCACAFKAIEKAIEKAIARQRAIAUoAgQoAgQQNyAFKAIEQQA2AgQLCwsgBUEANgIcCyAFKAIcIQAgBUEgaiQAIAALFwAgACABrSACrUIghoQgAyAEIAUQmQELEgAgACABrSACrUIghoQgAxAnC48BAgF/AX4CfyMAQSBrIgQkACAEIAA2AhQgBCABNgIQIAQgAjYCDCAEIAM2AggCQAJAIAQoAhAEQCAEKAIMDQELIAQoAhRBCGpBEkEAEBQgBEJ/NwMYDAELIAQgBCgCFCAEKAIQIAQoAgwgBCgCCBCaATcDGAsgBCkDGCEFIARBIGokACAFQiCIpwsQACAFpwuFBQIBfwF+An8jAEEwayIDJAAgAyAANgIkIAMgATYCICADIAI2AhwCQCADKAIkKAIYQQJxBEAgAygCJEEIakEZQQAQFCADQn83AygMAQsgAygCIEUEQCADKAIkQQhqQRJBABAUIANCfzcDKAwBCyADQQA2AgwgAyADKAIgEC42AhggAygCICADKAIYQQFraiwAAEEvRwRAIAMgAygCGEECahAYIgA2AgwgAEUEQCADKAIkQQhqQQ5BABAUIANCfzcDKAwCCwJAAkAgAygCDCIBIAMoAiAiAHNBA3ENACAAQQNxBEADQCABIAAtAAAiAjoAACACRQ0DIAFBAWohASAAQQFqIgBBA3ENAAsLIAAoAgAiAkF/cyACQYGChAhrcUGAgYKEeHENAANAIAEgAjYCACAAKAIEIQIgAUEEaiEBIABBBGohACACQYGChAhrIAJBf3NxQYCBgoR4cUUNAAsLIAEgAC0AACICOgAAIAJFDQADQCABIAAtAAEiAjoAASABQQFqIQEgAEEBaiEAIAINAAsLIAMoAgwgAygCGGpBLzoAACADKAIMIAMoAhhBAWpqQQA6AAALIAMgAygCJEEAQgBBABB9IgA2AgggAEUEQCADKAIMEBUgA0J/NwMoDAELIAMgAygCJAJ/IAMoAgwEQCADKAIMDAELIAMoAiALIAMoAgggAygCHBCaATcDECADKAIMEBUCQCADKQMQQgBTBEAgAygCCBAbDAELIAMoAiQgAykDEEEAQQNBgID8jwQQmQFBAEgEQCADKAIkIAMpAxAQmAEaIANCfzcDKAwCCwsgAyADKQMQNwMoCyADKQMoIQQgA0EwaiQAIARCIIinCxAAIASnCxEAIAAgAa0gAq1CIIaEEJgBCxcAIAAgAa0gAq1CIIaEIAMgBCAFEIoBC38CAX8BfiMAQSBrIgMkACADIAA2AhggAyABNgIUIAMgAjYCECADIAMoAhggAygCFCADKAIQEHIiBDcDCAJAIARCAFMEQCADQQA2AhwMAQsgAyADKAIYIAMpAwggAygCECADKAIYKAIcEK0BNgIcCyADKAIcIQAgA0EgaiQAIAALEAAjACAAa0FwcSIAJAAgAAsGACAAJAALBAAjAAuCAQIBfwF+IwBBIGsiBCQAIAQgADYCGCAEIAE2AhQgBCACNgIQIAQgAzYCDCAEIAQoAhggBCgCFCAEKAIQEHIiBTcDAAJAIAVCAFMEQCAEQX82AhwMAQsgBCAEKAIYIAQpAwAgBCgCECAEKAIMEH42AhwLIAQoAhwhACAEQSBqJAAgAAvQRQMGfwF+AnwjAEHgAGsiASQAIAEgADYCWAJAIAEoAlhFBEAgAUF/NgJcDAELIwBBIGsiACABKAJYNgIcIAAgAUFAazYCGCAAQQA2AhQgAEIANwMAAkAgACgCHC0AKEEBcUUEQCAAKAIcKAIYIAAoAhwoAhRGDQELIABBATYCFAsgAEIANwMIA0AgACkDCCAAKAIcKQMwVARAAkACQCAAKAIcKAJAIAApAwinQQR0aigCCA0AIAAoAhwoAkAgACkDCKdBBHRqLQAMQQFxDQAgACgCHCgCQCAAKQMIp0EEdGooAgRFDQEgACgCHCgCQCAAKQMIp0EEdGooAgQoAgBFDQELIABBATYCFAsgACgCHCgCQCAAKQMIp0EEdGotAAxBAXFFBEAgACAAKQMAQgF8NwMACyAAIAApAwhCAXw3AwgMAQsLIAAoAhgEQCAAKAIYIAApAwA3AwALIAEgACgCFDYCJCABKQNAUARAAkAgASgCWCgCBEEIcUUEQCABKAIkRQ0BCwJ/IAEoAlgoAgAhAiMAQRBrIgAkACAAIAI2AggCQCAAKAIIKAIkQQNGBEAgAEEANgIMDAELIAAoAggoAiAEQCAAKAIIEC9BAEgEQCAAQX82AgwMAgsLIAAoAggoAiQEQCAAKAIIEGILIAAoAghBAEIAQQ8QIEIAUwRAIABBfzYCDAwBCyAAKAIIQQM2AiQgAEEANgIMCyAAKAIMIQIgAEEQaiQAIAJBAEgLBEACQAJ/IwBBEGsiACABKAJYKAIANgIMIwBBEGsiAiAAKAIMQQxqNgIMIAIoAgwoAgBBFkYLBEAjAEEQayIAIAEoAlgoAgA2AgwjAEEQayICIAAoAgxBDGo2AgwgAigCDCgCBEEsRg0BCyABKAJYQQhqIAEoAlgoAgAQFyABQX82AlwMBAsLCyABKAJYEDwgAUEANgJcDAELIAEoAiRFBEAgASgCWBA8IAFBADYCXAwBCyABKQNAIAEoAlgpAzBWBEAgASgCWEEIakEUQQAQFCABQX82AlwMAQsgASABKQNAp0EDdBAYIgA2AiggAEUEQCABQX82AlwMAQsgAUJ/NwM4IAFCADcDSCABQgA3A1ADQCABKQNQIAEoAlgpAzBUBEACQCABKAJYKAJAIAEpA1CnQQR0aigCAEUNAAJAIAEoAlgoAkAgASkDUKdBBHRqKAIIDQAgASgCWCgCQCABKQNQp0EEdGotAAxBAXENACABKAJYKAJAIAEpA1CnQQR0aigCBEUNASABKAJYKAJAIAEpA1CnQQR0aigCBCgCAEUNAQsgAQJ+IAEpAzggASgCWCgCQCABKQNQp0EEdGooAgApA0hUBEAgASkDOAwBCyABKAJYKAJAIAEpA1CnQQR0aigCACkDSAs3AzgLIAEoAlgoAkAgASkDUKdBBHRqLQAMQQFxRQRAIAEpA0ggASkDQFoEQCABKAIoEBUgASgCWEEIakEUQQAQFCABQX82AlwMBAsgASgCKCABKQNIp0EDdGogASkDUDcDACABIAEpA0hCAXw3A0gLIAEgASkDUEIBfDcDUAwBCwsgASkDSCABKQNAVARAIAEoAigQFSABKAJYQQhqQRRBABAUIAFBfzYCXAwBCwJAAn8jAEEQayIAIAEoAlgoAgA2AgwgACgCDCkDGEKAgAiDUAsEQCABQgA3AzgMAQsgASkDOEJ/UQRAIAFCfzcDGCABQgA3AzggAUIANwNQA0AgASkDUCABKAJYKQMwVARAIAEoAlgoAkAgASkDUKdBBHRqKAIABEAgASgCWCgCQCABKQNQp0EEdGooAgApA0ggASkDOFoEQCABIAEoAlgoAkAgASkDUKdBBHRqKAIAKQNINwM4IAEgASkDUDcDGAsLIAEgASkDUEIBfDcDUAwBCwsgASkDGEJ/UgRAIAEoAlghAiABKQMYIQcgASgCWEEIaiEDIwBBMGsiACQAIAAgAjYCJCAAIAc3AxggACADNgIUIAAgACgCJCAAKQMYIAAoAhQQYCIHNwMIAkAgB1AEQCAAQgA3AygMAQsgACAAKAIkKAJAIAApAxinQQR0aigCADYCBAJAIAApAwggACkDCCAAKAIEKQMgfFgEQCAAKQMIIAAoAgQpAyB8Qv///////////wBYDQELIAAoAhRBBEEWEBQgAEIANwMoDAELIAAgACgCBCkDICAAKQMIfDcDCCAAKAIELwEMQQhxBEAgACgCJCgCACAAKQMIQQAQJ0EASARAIAAoAhQgACgCJCgCABAXIABCADcDKAwCCyAAKAIkKAIAIABCBBArQgRSBEAgACgCFCAAKAIkKAIAEBcgAEIANwMoDAILIAAoAABB0JadwABGBEAgACAAKQMIQgR8NwMICyAAIAApAwhCDHw3AwggACgCBEEAEGVBAXEEQCAAIAApAwhCCHw3AwgLIAApAwhC////////////AFYEQCAAKAIUQQRBFhAUIABCADcDKAwCCwsgACAAKQMINwMoCyAAKQMoIQcgAEEwaiQAIAEgBzcDOCAHUARAIAEoAigQFSABQX82AlwMBAsLCyABKQM4QgBSBEACfyABKAJYKAIAIQIgASkDOCEHIwBBEGsiACQAIAAgAjYCCCAAIAc3AwACQCAAKAIIKAIkQQFGBEAgACgCCEEMakESQQAQFCAAQX82AgwMAQsgACgCCEEAIAApAwBBERAgQgBTBEAgAEF/NgIMDAELIAAoAghBATYCJCAAQQA2AgwLIAAoAgwhAiAAQRBqJAAgAkEASAsEQCABQgA3AzgLCwsgASkDOFAEQAJ/IAEoAlgoAgAhAiMAQRBrIgAkACAAIAI2AggCQCAAKAIIKAIkQQFGBEAgACgCCEEMakESQQAQFCAAQX82AgwMAQsgACgCCEEAQgBBCBAgQgBTBEAgAEF/NgIMDAELIAAoAghBATYCJCAAQQA2AgwLIAAoAgwhAiAAQRBqJAAgAkEASAsEQCABKAJYQQhqIAEoAlgoAgAQFyABKAIoEBUgAUF/NgJcDAILCyABKAJYKAJUIQIjAEEQayIAJAAgACACNgIMIAAoAgwEQCAAKAIMRAAAAAAAAAAAOQMYIAAoAgwoAgBEAAAAAAAAAAAgACgCDCgCDCAAKAIMKAIEERYACyAAQRBqJAAgAUEANgIsIAFCADcDSANAAkAgASkDSCABKQNAWg0AIAEoAlgoAlQhAiABKQNIIge6IAEpA0C6IgijIQkjAEEgayIAJAAgACACNgIcIAAgCTkDECAAIAdCAXy6IAijOQMIIAAoAhwEQCAAKAIcIAArAxA5AyAgACgCHCAAKwMIOQMoIAAoAhxEAAAAAAAAAAAQVwsgAEEgaiQAIAEgASgCKCABKQNIp0EDdGopAwA3A1AgASABKAJYKAJAIAEpA1CnQQR0ajYCEAJAAkAgASgCECgCAEUNACABKAIQKAIAKQNIIAEpAzhaDQAMAQsgAQJ/QQEgASgCECgCCA0AGiABKAIQKAIEBEBBASABKAIQKAIEKAIAQQFxDQEaCyABKAIQKAIEBH8gASgCECgCBCgCAEHAAHFBAEcFQQALC0EBcTYCFCABKAIQKAIERQRAIAEoAhAoAgAQQCEAIAEoAhAgADYCBCAARQRAIAEoAlhBCGpBDkEAEBQgAUEBNgIsDAMLCyABIAEoAhAoAgQ2AgwCfyABKAJYIQIgASkDUCEHIwBBMGsiACQAIAAgAjYCKCAAIAc3AyACQCAAKQMgIAAoAigpAzBaBEAgACgCKEEIakESQQAQFCAAQX82AiwMAQsgACAAKAIoKAJAIAApAyCnQQR0ajYCHAJAIAAoAhwoAgAEQCAAKAIcKAIALQAEQQFxRQ0BCyAAQQA2AiwMAQsgACgCHCgCACkDSEIafEL///////////8AVgRAIAAoAihBCGpBBEEWEBQgAEF/NgIsDAELIAAoAigoAgAgACgCHCgCACkDSEIafEEAECdBAEgEQCAAKAIoQQhqIAAoAigoAgAQFyAAQX82AiwMAQsgACAAKAIoKAIAQgQgAEEYaiAAKAIoQQhqEEIiAjYCFCACRQRAIABBfzYCLAwBCyAAIAAoAhQQHTsBEiAAIAAoAhQQHTsBECAAKAIUEEdBAXFFBEAgACgCFBAWIAAoAihBCGpBFEEAEBQgAEF/NgIsDAELIAAoAhQQFiAALwEQBEAgACgCKCgCACAALwESrUEBECdBAEgEQCAAKAIoQQhqQQRBtJsBKAIAEBQgAEF/NgIsDAILIABBACAAKAIoKAIAIAAvARBBACAAKAIoQQhqEGM2AgggACgCCEUEQCAAQX82AiwMAgsgACgCCCAALwEQQYACIABBDGogACgCKEEIahCUAUEBcUUEQCAAKAIIEBUgAEF/NgIsDAILIAAoAggQFSAAKAIMBEAgACAAKAIMEJMBNgIMIAAoAhwoAgAoAjQgACgCDBCVASECIAAoAhwoAgAgAjYCNAsLIAAoAhwoAgBBAToABAJAIAAoAhwoAgRFDQAgACgCHCgCBC0ABEEBcQ0AIAAoAhwoAgQgACgCHCgCACgCNDYCNCAAKAIcKAIEQQE6AAQLIABBADYCLAsgACgCLCECIABBMGokACACQQBICwRAIAFBATYCLAwCCyABIAEoAlgoAgAQNSIHNwMwIAdCAFMEQCABQQE2AiwMAgsgASgCDCABKQMwNwNIAkAgASgCFARAIAFBADYCCCABKAIQKAIIRQRAIAEgASgCWCABKAJYIAEpA1BBCEEAEK4BIgA2AgggAEUEQCABQQE2AiwMBQsLAn8gASgCWCECAn8gASgCCARAIAEoAggMAQsgASgCECgCCAshAyABKAIMIQQjAEGgAWsiACQAIAAgAjYCmAEgACADNgKUASAAIAQ2ApABAkAgACgClAEgAEE4ahA5QQBIBEAgACgCmAFBCGogACgClAEQFyAAQX82ApwBDAELIAApAzhCwACDUARAIAAgACkDOELAAIQ3AzggAEEAOwFoCwJAAkAgACgCkAEoAhBBf0cEQCAAKAKQASgCEEF+Rw0BCyAALwFoRQ0AIAAoApABIAAvAWg2AhAMAQsCQAJAIAAoApABKAIQDQAgACkDOEIEg1ANACAAIAApAzhCCIQ3AzggACAAKQNQNwNYDAELIAAgACkDOEL3////D4M3AzgLCyAAKQM4QoABg1AEQCAAIAApAzhCgAGENwM4IABBADsBagsgAEGAAjYCJAJAIAApAzhCBINQBEAgACAAKAIkQYAIcjYCJCAAQn83A3AMAQsgACgCkAEgACkDUDcDKCAAIAApA1A3A3ACQCAAKQM4QgiDUARAAkACQAJAAkACQAJ/AkAgACgCkAEoAhBBf0cEQCAAKAKQASgCEEF+Rw0BC0EIDAELIAAoApABKAIQC0H//wNxDg0CAwMDAwMDAwEDAwMAAwsgAEKUwuTzDzcDEAwDCyAAQoODsP8PNwMQDAILIABC/////w83AxAMAQsgAEIANwMQCyAAKQNQIAApAxBWBEAgACAAKAIkQYAIcjYCJAsMAQsgACgCkAEgACkDWDcDIAsLIAAgACgCmAEoAgAQNSIHNwOIASAHQgBTBEAgACgCmAFBCGogACgCmAEoAgAQFyAAQX82ApwBDAELIAAoApABIgIgAi8BDEH3/wNxOwEMIAAgACgCmAEgACgCkAEgACgCJBBUIgI2AiggAkEASARAIABBfzYCnAEMAQsgACAALwFoAn8CQCAAKAKQASgCEEF/RwRAIAAoApABKAIQQX5HDQELQQgMAQsgACgCkAEoAhALQf//A3FHOgAiIAAgAC0AIkEBcQR/IAAvAWhBAEcFQQALQQFxOgAhIAAgAC8BaAR/IAAtACEFQQELQQFxOgAgIAAgAC0AIkEBcQR/IAAoApABKAIQQQBHBUEAC0EBcToAHyAAAn9BASAALQAiQQFxDQAaQQEgACgCkAEoAgBBgAFxDQAaIAAoApABLwFSIAAvAWpHC0EBcToAHiAAIAAtAB5BAXEEfyAALwFqQQBHBUEAC0EBcToAHSAAIAAtAB5BAXEEfyAAKAKQAS8BUkEARwVBAAtBAXE6ABwgACAAKAKUATYCNCMAQRBrIgIgACgCNDYCDCACKAIMIgIgAigCMEEBajYCMCAALQAdQQFxBEAgACAALwFqQQAQeyICNgIMIAJFBEAgACgCmAFBCGpBGEEAEBQgACgCNBAbIABBfzYCnAEMAgsgACAAKAKYASAAKAI0IAAvAWpBACAAKAKYASgCHCAAKAIMEQUAIgI2AjAgAkUEQCAAKAI0EBsgAEF/NgKcAQwCCyAAKAI0EBsgACAAKAIwNgI0CyAALQAhQQFxBEAgACAAKAKYASAAKAI0IAAvAWgQsAEiAjYCMCACRQRAIAAoAjQQGyAAQX82ApwBDAILIAAoAjQQGyAAIAAoAjA2AjQLIAAtACBBAXEEQCAAIAAoApgBIAAoAjRBABCvASICNgIwIAJFBEAgACgCNBAbIABBfzYCnAEMAgsgACgCNBAbIAAgACgCMDYCNAsgAC0AH0EBcQRAIAAoApgBIQMgACgCNCEEIAAoApABKAIQIQUgACgCkAEvAVAhBiMAQRBrIgIkACACIAM2AgwgAiAENgIIIAIgBTYCBCACIAY2AgAgAigCDCACKAIIIAIoAgRBASACKAIAELIBIQMgAkEQaiQAIAAgAyICNgIwIAJFBEAgACgCNBAbIABBfzYCnAEMAgsgACgCNBAbIAAgACgCMDYCNAsgAC0AHEEBcQRAIABBADYCBAJAIAAoApABKAJUBEAgACAAKAKQASgCVDYCBAwBCyAAKAKYASgCHARAIAAgACgCmAEoAhw2AgQLCyAAIAAoApABLwFSQQEQeyICNgIIIAJFBEAgACgCmAFBCGpBGEEAEBQgACgCNBAbIABBfzYCnAEMAgsgACAAKAKYASAAKAI0IAAoApABLwFSQQEgACgCBCAAKAIIEQUAIgI2AjAgAkUEQCAAKAI0EBsgAEF/NgKcAQwCCyAAKAI0EBsgACAAKAIwNgI0CyAAIAAoApgBKAIAEDUiBzcDgAEgB0IAUwRAIAAoApgBQQhqIAAoApgBKAIAEBcgAEF/NgKcAQwBCyAAKAKYASEDIAAoAjQhBCAAKQNwIQcjAEHAwABrIgIkACACIAM2ArhAIAIgBDYCtEAgAiAHNwOoQAJAIAIoArRAEEhBAEgEQCACKAK4QEEIaiACKAK0QBAXIAJBfzYCvEAMAQsgAkEANgIMIAJCADcDEANAAkAgAiACKAK0QCACQSBqQoDAABArIgc3AxggB0IAVw0AIAIoArhAIAJBIGogAikDGBA2QQBIBEAgAkF/NgIMBSACKQMYQoDAAFINAiACKAK4QCgCVEUNAiACKQOoQEIAVw0CIAIgAikDGCACKQMQfDcDECACKAK4QCgCVCACKQMQuSACKQOoQLmjEFcMAgsLCyACKQMYQgBTBEAgAigCuEBBCGogAigCtEAQFyACQX82AgwLIAIoArRAEC8aIAIgAigCDDYCvEALIAIoArxAIQMgAkHAwABqJAAgACADNgIsIAAoAjQgAEE4ahA5QQBIBEAgACgCmAFBCGogACgCNBAXIABBfzYCLAsgACgCNCEDIwBBEGsiAiQAIAIgAzYCCAJAA0AgAigCCARAIAIoAggpAxhCgIAEg0IAUgRAIAIgAigCCEEAQgBBEBAgNwMAIAIpAwBCAFMEQCACQf8BOgAPDAQLIAIpAwBCA1UEQCACKAIIQQxqQRRBABAUIAJB/wE6AA8MBAsgAiACKQMAPAAPDAMFIAIgAigCCCgCADYCCAwCCwALCyACQQA6AA8LIAIsAA8hAyACQRBqJAAgACADIgI6ACMgAkEYdEEYdUEASARAIAAoApgBQQhqIAAoAjQQFyAAQX82AiwLIAAoAjQQGyAAKAIsQQBIBEAgAEF/NgKcAQwBCyAAIAAoApgBKAIAEDUiBzcDeCAHQgBTBEAgACgCmAFBCGogACgCmAEoAgAQFyAAQX82ApwBDAELIAAoApgBKAIAIAApA4gBEJsBQQBIBEAgACgCmAFBCGogACgCmAEoAgAQFyAAQX82ApwBDAELIAApAzhC5ACDQuQAUgRAIAAoApgBQQhqQRRBABAUIABBfzYCnAEMAQsgACgCkAEoAgBBIHFFBEACQCAAKQM4QhCDQgBSBEAgACgCkAEgACgCYDYCFAwBCyAAKAKQAUEUahABGgsLIAAoApABIAAvAWg2AhAgACgCkAEgACgCZDYCGCAAKAKQASAAKQNQNwMoIAAoApABIAApA3ggACkDgAF9NwMgIAAoApABIAAoApABLwEMQfn/A3EgAC0AI0EBdHI7AQwgACgCkAEhAyAAKAIkQYAIcUEARyEEIwBBEGsiAiQAIAIgAzYCDCACIAQ6AAsCQCACKAIMKAIQQQ5GBEAgAigCDEE/OwEKDAELIAIoAgwoAhBBDEYEQCACKAIMQS47AQoMAQsCQCACLQALQQFxRQRAIAIoAgxBABBlQQFxRQ0BCyACKAIMQS07AQoMAQsCQCACKAIMKAIQQQhHBEAgAigCDC8BUkEBRw0BCyACKAIMQRQ7AQoMAQsgAiACKAIMKAIwEFEiAzsBCCADQf//A3EEQCACKAIMKAIwKAIAIAIvAQhBAWtqLQAAQS9GBEAgAigCDEEUOwEKDAILCyACKAIMQQo7AQoLIAJBEGokACAAIAAoApgBIAAoApABIAAoAiQQVCICNgIsIAJBAEgEQCAAQX82ApwBDAELIAAoAiggACgCLEcEQCAAKAKYAUEIakEUQQAQFCAAQX82ApwBDAELIAAoApgBKAIAIAApA3gQmwFBAEgEQCAAKAKYAUEIaiAAKAKYASgCABAXIABBfzYCnAEMAQsgAEEANgKcAQsgACgCnAEhAiAAQaABaiQAIAJBAEgLBEAgAUEBNgIsIAEoAggEQCABKAIIEBsLDAQLIAEoAggEQCABKAIIEBsLDAELIAEoAgwiACAALwEMQff/A3E7AQwgASgCWCABKAIMQYACEFRBAEgEQCABQQE2AiwMAwsgASABKAJYIAEpA1AgASgCWEEIahBgIgc3AwAgB1AEQCABQQE2AiwMAwsgASgCWCgCACABKQMAQQAQJ0EASARAIAEoAlhBCGogASgCWCgCABAXIAFBATYCLAwDCwJ/IAEoAlghAiABKAIMKQMgIQcjAEGgwABrIgAkACAAIAI2AphAIAAgBzcDkEAgACAAKQOQQLo5AwACQANAIAApA5BAUEUEQCAAIAApA5BAQoDAAFYEfkKAwAAFIAApA5BACz4CDCAAKAKYQCgCACAAQRBqIAAoAgytIAAoAphAQQhqEGRBAEgEQCAAQX82ApxADAMLIAAoAphAIABBEGogACgCDK0QNkEASARAIABBfzYCnEAMAwUgACAAKQOQQCAANQIMfTcDkEAgACgCmEAoAlQgACsDACAAKQOQQLqhIAArAwCjEFcMAgsACwsgAEEANgKcQAsgACgCnEAhAiAAQaDAAGokACACQQBICwRAIAFBATYCLAwDCwsLIAEgASkDSEIBfDcDSAwBCwsgASgCLEUEQAJ/IAEoAlghACABKAIoIQMgASkDQCEHIwBBMGsiAiQAIAIgADYCKCACIAM2AiQgAiAHNwMYIAIgAigCKCgCABA1Igc3AxACQCAHQgBTBEAgAkF/NgIsDAELIAIoAighAyACKAIkIQQgAikDGCEHIwBBwAFrIgAkACAAIAM2ArQBIAAgBDYCsAEgACAHNwOoASAAIAAoArQBKAIAEDUiBzcDIAJAIAdCAFMEQCAAKAK0AUEIaiAAKAK0ASgCABAXIABCfzcDuAEMAQsgACAAKQMgNwOgASAAQQA6ABcgAEIANwMYA0AgACkDGCAAKQOoAVQEQCAAIAAoArQBKAJAIAAoArABIAApAxinQQN0aikDAKdBBHRqNgIMIAAgACgCtAECfyAAKAIMKAIEBEAgACgCDCgCBAwBCyAAKAIMKAIAC0GABBBUIgM2AhAgA0EASARAIABCfzcDuAEMAwsgACgCEARAIABBAToAFwsgACAAKQMYQgF8NwMYDAELCyAAIAAoArQBKAIAEDUiBzcDICAHQgBTBEAgACgCtAFBCGogACgCtAEoAgAQFyAAQn83A7gBDAELIAAgACkDICAAKQOgAX03A5gBAkAgACkDoAFC/////w9YBEAgACkDqAFC//8DWA0BCyAAQQE6ABcLIAAgAEEwakLiABApIgM2AiwgA0UEQCAAKAK0AUEIakEOQQAQFCAAQn83A7gBDAELIAAtABdBAXEEQCAAKAIsQecSQQQQQSAAKAIsQiwQLSAAKAIsQS0QHyAAKAIsQS0QHyAAKAIsQQAQISAAKAIsQQAQISAAKAIsIAApA6gBEC0gACgCLCAAKQOoARAtIAAoAiwgACkDmAEQLSAAKAIsIAApA6ABEC0gACgCLEHiEkEEEEEgACgCLEEAECEgACgCLCAAKQOgASAAKQOYAXwQLSAAKAIsQQEQIQsgACgCLEHsEkEEEEEgACgCLEEAECEgACgCLCAAKQOoAUL//wNaBH5C//8DBSAAKQOoAQunQf//A3EQHyAAKAIsIAApA6gBQv//A1oEfkL//wMFIAApA6gBC6dB//8DcRAfIAAoAiwgACkDmAFC/////w9aBH9BfwUgACkDmAGnCxAhIAAoAiwgACkDoAFC/////w9aBH9BfwUgACkDoAGnCxAhIAACfyAAKAK0AS0AKEEBcQRAIAAoArQBKAIkDAELIAAoArQBKAIgCzYClAEgACgCLAJ/IAAoApQBBEAgACgClAEvAQQMAQtBAAtB//8DcRAfAn8jAEEQayIDIAAoAiw2AgwgAygCDC0AAEEBcUULBEAgACgCtAFBCGpBFEEAEBQgACgCLBAWIABCfzcDuAEMAQsgACgCtAECfyMAQRBrIgMgACgCLDYCDCADKAIMKAIECwJ+IwBBEGsiAyAAKAIsNgIMAn4gAygCDC0AAEEBcQRAIAMoAgwpAxAMAQtCAAsLEDZBAEgEQCAAKAIsEBYgAEJ/NwO4AQwBCyAAKAIsEBYgACgClAEEQCAAKAK0ASAAKAKUASgCACAAKAKUAS8BBK0QNkEASARAIABCfzcDuAEMAgsLIAAgACkDmAE3A7gBCyAAKQO4ASEHIABBwAFqJAAgAiAHNwMAIAdCAFMEQCACQX82AiwMAQsgAiACKAIoKAIAEDUiBzcDCCAHQgBTBEAgAkF/NgIsDAELIAJBADYCLAsgAigCLCEAIAJBMGokACAAQQBICwRAIAFBATYCLAsLIAEoAigQFSABKAIsRQRAAn8gASgCWCgCACECIwBBEGsiACQAIAAgAjYCCAJAIAAoAggoAiRBAUcEQCAAKAIIQQxqQRJBABAUIABBfzYCDAwBCyAAKAIIKAIgQQFLBEAgACgCCEEMakEdQQAQFCAAQX82AgwMAQsgACgCCCgCIARAIAAoAggQL0EASARAIABBfzYCDAwCCwsgACgCCEEAQgBBCRAgQgBTBEAgACgCCEECNgIkIABBfzYCDAwBCyAAKAIIQQA2AiQgAEEANgIMCyAAKAIMIQIgAEEQaiQAIAILBEAgASgCWEEIaiABKAJYKAIAEBcgAUEBNgIsCwsgASgCWCgCVCECIwBBEGsiACQAIAAgAjYCDCAAKAIMRAAAAAAAAPA/EFcgAEEQaiQAIAEoAiwEQCABKAJYKAIAEGIgAUF/NgJcDAELIAEoAlgQPCABQQA2AlwLIAEoAlwhACABQeAAaiQAIAAL0g4CB38CfiMAQTBrIgMkACADIAA2AiggAyABNgIkIAMgAjYCICMAQRBrIgAgA0EIajYCDCAAKAIMQQA2AgAgACgCDEEANgIEIAAoAgxBADYCCCADKAIoIQAjAEEgayIEJAAgBCAANgIYIARCADcDECAEQn83AwggBCADQQhqNgIEAkACQCAEKAIYBEAgBCkDCEJ/WQ0BCyAEKAIEQRJBABAUIARBADYCHAwBCyAEKAIYIQAgBCkDECEKIAQpAwghCyAEKAIEIQEjAEGgAWsiAiQAIAIgADYCmAEgAkEANgKUASACIAo3A4gBIAIgCzcDgAEgAkEANgJ8IAIgATYCeAJAAkAgAigClAENACACKAKYAQ0AIAIoAnhBEkEAEBQgAkEANgKcAQwBCyACKQOAAUIAUwRAIAJCADcDgAELAkAgAikDiAFC////////////AFgEQCACKQOIASACKQOIASACKQOAAXxYDQELIAIoAnhBEkEAEBQgAkEANgKcAQwBCyACQYgBEBgiADYCdCAARQRAIAIoAnhBDkEAEBQgAkEANgKcAQwBCyACKAJ0QQA2AhggAigCmAEEQCACKAKYASIAEC5BAWoiARAYIgUEfyAFIAAgARAZBUEACyEAIAIoAnQgADYCGCAARQRAIAIoAnhBDkEAEBQgAigCdBAVIAJBADYCnAEMAgsLIAIoAnQgAigClAE2AhwgAigCdCACKQOIATcDaCACKAJ0IAIpA4ABNwNwAkAgAigCfARAIAIoAnQiACACKAJ8IgEpAwA3AyAgACABKQMwNwNQIAAgASkDKDcDSCAAIAEpAyA3A0AgACABKQMYNwM4IAAgASkDEDcDMCAAIAEpAwg3AyggAigCdEEANgIoIAIoAnQiACAAKQMgQv7///8PgzcDIAwBCyACKAJ0QSBqEDsLIAIoAnQpA3BCAFIEQCACKAJ0IAIoAnQpA3A3AzggAigCdCIAIAApAyBCBIQ3AyALIwBBEGsiACACKAJ0QdgAajYCDCAAKAIMQQA2AgAgACgCDEEANgIEIAAoAgxBADYCCCACKAJ0QQA2AoABIAIoAnRBADYChAEjAEEQayIAIAIoAnQ2AgwgACgCDEEANgIAIAAoAgxBADYCBCAAKAIMQQA2AgggAkF/NgIEIAJBBzYCAEEOIAIQNEI/hCEKIAIoAnQgCjcDEAJAIAIoAnQoAhgEQCACIAIoAnQoAhggAkEYahCmAUEATjoAFyACLQAXQQFxRQRAAkAgAigCdCkDaFBFDQAgAigCdCkDcFBFDQAgAigCdEL//wM3AxALCwwBCwJAIAIoAnQoAhwiACgCTEEASA0ACyAAKAI8IQBBACEFIwBBIGsiBiQAAn8CQCAAIAJBGGoiCRAKIgFBeEYEQCMAQSBrIgckACAAIAdBCGoQCSIIBH9BtJsBIAg2AgBBAAVBAQshCCAHQSBqJAAgCA0BCyABQYFgTwR/QbSbAUEAIAFrNgIAQX8FIAELDAELA0AgBSAGaiIBIAVBxxJqLQAAOgAAIAVBDkchByAFQQFqIQUgBw0ACwJAIAAEQEEPIQUgACEBA0AgAUEKTwRAIAVBAWohBSABQQpuIQEMAQsLIAUgBmpBADoAAANAIAYgBUEBayIFaiAAIABBCm4iAUEKbGtBMHI6AAAgAEEJSyEHIAEhACAHDQALDAELIAFBMDoAACAGQQA6AA8LIAYgCRACIgBBgWBPBH9BtJsBQQAgAGs2AgBBfwUgAAsLIQAgBkEgaiQAIAIgAEEATjoAFwsCQCACLQAXQQFxRQRAIAIoAnRB2ABqQQVBtJsBKAIAEBQMAQsgAigCdCkDIEIQg1AEQCACKAJ0IAIoAlg2AkggAigCdCIAIAApAyBCEIQ3AyALIAIoAiRBgOADcUGAgAJGBEAgAigCdEL/gQE3AxAgAikDQCACKAJ0KQNoIAIoAnQpA3B8VARAIAIoAnhBEkEAEBQgAigCdCgCGBAVIAIoAnQQFSACQQA2ApwBDAMLIAIoAnQpA3BQBEAgAigCdCACKQNAIAIoAnQpA2h9NwM4IAIoAnQiACAAKQMgQgSENwMgAkAgAigCdCgCGEUNACACKQOIAVBFDQAgAigCdEL//wM3AxALCwsLIAIoAnQiACAAKQMQQoCAEIQ3AxAgAkEeIAIoAnQgAigCeBCDASIANgJwIABFBEAgAigCdCgCGBAVIAIoAnQQFSACQQA2ApwBDAELIAIgAigCcDYCnAELIAIoApwBIQAgAkGgAWokACAEIAA2AhwLIAQoAhwhACAEQSBqJAAgAyAANgIYAkAgAEUEQCADKAIgIANBCGoQnQEgA0EIahA4IANBADYCLAwBCyADIAMoAhggAygCJCADQQhqEJwBIgA2AhwgAEUEQCADKAIYEBsgAygCICADQQhqEJ0BIANBCGoQOCADQQA2AiwMAQsgA0EIahA4IAMgAygCHDYCLAsgAygCLCEAIANBMGokACAAC5IfAQZ/IwBB4ABrIgQkACAEIAA2AlQgBCABNgJQIAQgAjcDSCAEIAM2AkQgBCAEKAJUNgJAIAQgBCgCUDYCPAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAIAQoAkQOEwYHAgwEBQoOAQMJEAsPDQgREQARCyAEQgA3A1gMEQsgBCgCQCgCGEUEQCAEKAJAQRxBABAUIARCfzcDWAwRCyAEKAJAIQAjAEGAAWsiASQAIAEgADYCeCABIAEoAngoAhgQLkEIahAYIgA2AnQCQCAARQRAIAEoAnhBDkEAEBQgAUF/NgJ8DAELAkAgASgCeCgCGCABQRBqEKYBRQRAIAEgASgCHDYCbAwBCyABQX82AmwLIAEoAnQhACABIAEoAngoAhg2AgAgAEGrEiABEG8gASgCdCEDIAEoAmwhByMAQTBrIgAkACAAIAM2AiggACAHNgIkIABBADYCECAAIAAoAiggACgCKBAuajYCGCAAIAAoAhhBAWs2AhwDQCAAKAIcIAAoAihPBH8gACgCHCwAAEHYAEYFQQALQQFxBEAgACAAKAIQQQFqNgIQIAAgACgCHEEBazYCHAwBCwsCQCAAKAIQRQRAQbSbAUEcNgIAIABBfzYCLAwBCyAAIAAoAhxBAWo2AhwDQCMAQRBrIgckAAJAAn8jAEEQayIDJAAgAyAHQQhqNgIIIANBBDsBBiADQegLQQBBABBsIgU2AgACQCAFQQBIBEAgA0EAOgAPDAELAn8gAygCACEGIAMoAgghCCADLwEGIQkjAEEQayIFJAAgBSAJNgIMIAUgCDYCCCAGIAVBCGpBASAFQQRqEAYiBgR/QbSbASAGNgIAQX8FQQALIQYgBSgCBCEIIAVBEGokACADLwEGQX8gCCAGG0cLBEAgAygCABBrIANBADoADwwBCyADKAIAEGsgA0EBOgAPCyADLQAPQQFxIQUgA0EQaiQAIAULBEAgByAHKAIINgIMDAELQcCgAS0AAEEBcUUEQEEAEAEhBgJAQciZASgCACIDRQRAQcyZASgCACAGNgIADAELQdCZAUEDQQNBASADQQdGGyADQR9GGzYCAEG8oAFBADYCAEHMmQEoAgAhBSADQQFOBEAgBq0hAkEAIQYDQCAFIAZBAnRqIAJCrf7V5NSF/ajYAH5CAXwiAkIgiD4CACAGQQFqIgYgA0cNAAsLIAUgBSgCAEEBcjYCAAsLQcyZASgCACEDAkBByJkBKAIAIgVFBEAgAyADKAIAQe2cmY4EbEG54ABqQf////8HcSIDNgIADAELIANB0JkBKAIAIgZBAnRqIgggCCgCACADQbygASgCACIIQQJ0aigCAGoiAzYCAEG8oAFBACAIQQFqIgggBSAIRhs2AgBB0JkBQQAgBkEBaiIGIAUgBkYbNgIAIANBAXYhAwsgByADNgIMCyAHKAIMIQMgB0EQaiQAIAAgAzYCDCAAIAAoAhw2AhQDQCAAKAIUIAAoAhhJBEAgACAAKAIMQSRwOgALAn8gACwAC0EKSARAIAAsAAtBMGoMAQsgACwAC0HXAGoLIQMgACAAKAIUIgdBAWo2AhQgByADOgAAIAAgACgCDEEkbjYCDAwBCwsgACgCKCEDIAAgACgCJEF/RgR/QbYDBSAAKAIkCzYCACAAIANBwoEgIAAQbCIDNgIgIANBAE4EQCAAKAIkQX9HBEAgACgCKCAAKAIkEA8iA0GBYE8Ef0G0mwFBACADazYCAEEABSADCxoLIAAgACgCIDYCLAwCC0G0mwEoAgBBFEYNAAsgAEF/NgIsCyAAKAIsIQMgAEEwaiQAIAEgAyIANgJwIABBf0YEQCABKAJ4QQxBtJsBKAIAEBQgASgCdBAVIAFBfzYCfAwBCyABIAEoAnBBoxIQoQEiADYCaCAARQRAIAEoAnhBDEG0mwEoAgAQFCABKAJwEGsgASgCdBBtGiABKAJ0EBUgAUF/NgJ8DAELIAEoAnggASgCaDYChAEgASgCeCABKAJ0NgKAASABQQA2AnwLIAEoAnwhACABQYABaiQAIAQgAKw3A1gMEAsgBCgCQCgCGARAIAQoAkAoAhwQVhogBCgCQEEANgIcCyAEQgA3A1gMDwsgBCgCQCgChAEQVkEASARAIAQoAkBBADYChAEgBCgCQEEGQbSbASgCABAUCyAEKAJAQQA2AoQBIAQoAkAoAoABIAQoAkAoAhgQCCIAQYFgTwR/QbSbAUEAIABrNgIAQX8FIAALQQBIBEAgBCgCQEECQbSbASgCABAUIARCfzcDWAwPCyAEKAJAKAKAARAVIAQoAkBBADYCgAEgBEIANwNYDA4LIAQgBCgCQCAEKAJQIAQpA0gQQzcDWAwNCyAEKAJAKAIYEBUgBCgCQCgCgAEQFSAEKAJAKAIcBEAgBCgCQCgCHBBWGgsgBCgCQBAVIARCADcDWAwMCyAEKAJAKAIYBEAgBCgCQCgCGCEBIwBBIGsiACQAIAAgATYCGCAAQQA6ABcgAEGAgCA2AgwCQCAALQAXQQFxBEAgACAAKAIMQQJyNgIMDAELIAAgACgCDDYCDAsgACgCGCEBIAAoAgwhAyAAQbYDNgIAIAAgASADIAAQbCIBNgIQAkAgAUEASARAIABBADYCHAwBCyAAIAAoAhBBoxJBoBIgAC0AF0EBcRsQoQEiATYCCCABRQRAIABBADYCHAwBCyAAIAAoAgg2AhwLIAAoAhwhASAAQSBqJAAgBCgCQCABNgIcIAFFBEAgBCgCQEELQbSbASgCABAUIARCfzcDWAwNCwsgBCgCQCkDaEIAUgRAIAQoAkAoAhwgBCgCQCkDaCAEKAJAEJ8BQQBIBEAgBEJ/NwNYDA0LCyAEKAJAQgA3A3ggBEIANwNYDAsLAkAgBCgCQCkDcEIAUgRAIAQgBCgCQCkDcCAEKAJAKQN4fTcDMCAEKQMwIAQpA0hWBEAgBCAEKQNINwMwCwwBCyAEIAQpA0g3AzALIAQpAzBC/////w9WBEAgBEL/////DzcDMAsgBAJ/IAQoAjwhByAEKQMwpyEAIAQoAkAoAhwiAygCTBogAyADLQBKIgFBAWsgAXI6AEogAygCCCADKAIEIgVrIgFBAUgEfyAABSAHIAUgASAAIAAgAUsbIgEQGRogAyADKAIEIAFqNgIEIAEgB2ohByAAIAFrCyIBBEADQAJAAn8gAyADLQBKIgVBAWsgBXI6AEogAygCFCADKAIcSwRAIANBAEEAIAMoAiQRAQAaCyADQQA2AhwgA0IANwMQIAMoAgAiBUEEcQRAIAMgBUEgcjYCAEF/DAELIAMgAygCLCADKAIwaiIGNgIIIAMgBjYCBCAFQRt0QR91C0UEQCADIAcgASADKAIgEQEAIgVBAWpBAUsNAQsgACABawwDCyAFIAdqIQcgASAFayIBDQALCyAACyIANgIsIABFBEACfyAEKAJAKAIcIgAoAkxBf0wEQCAAKAIADAELIAAoAgALQQV2QQFxBEAgBCgCQEEFQbSbASgCABAUIARCfzcDWAwMCwsgBCgCQCIAIAApA3ggBCgCLK18NwN4IAQgBCgCLK03A1gMCgsgBCgCQCgCGBBtQQBIBEAgBCgCQEEWQbSbASgCABAUIARCfzcDWAwKCyAEQgA3A1gMCQsgBCgCQCgChAEEQCAEKAJAKAKEARBWGiAEKAJAQQA2AoQBCyAEKAJAKAKAARBtGiAEKAJAKAKAARAVIAQoAkBBADYCgAEgBEIANwNYDAgLIAQCfyAEKQNIQhBUBEAgBCgCQEESQQAQFEEADAELIAQoAlALNgIYIAQoAhhFBEAgBEJ/NwNYDAgLIARBATYCHAJAAkACQAJAAkAgBCgCGCgCCA4DAAIBAwsgBCAEKAIYKQMANwMgDAMLAkAgBCgCQCkDcFAEQCAEKAJAKAIcIAQoAhgpAwBBAiAEKAJAEGpBAEgEQCAEQn83A1gMDQsgBCAEKAJAKAIcEKMBIgI3AyAgAkIAUwRAIAQoAkBBBEG0mwEoAgAQFCAEQn83A1gMDQsgBCAEKQMgIAQoAkApA2h9NwMgIARBADYCHAwBCyAEIAQoAkApA3AgBCgCGCkDAHw3AyALDAILIAQgBCgCQCkDeCAEKAIYKQMAfDcDIAwBCyAEKAJAQRJBABAUIARCfzcDWAwICwJAAkAgBCkDIEIAUw0AIAQoAkApA3BCAFIEQCAEKQMgIAQoAkApA3BWDQELIAQoAkApA2ggBCkDICAEKAJAKQNofFgNAQsgBCgCQEESQQAQFCAEQn83A1gMCAsgBCgCQCAEKQMgNwN4IAQoAhwEQCAEKAJAKAIcIAQoAkApA3ggBCgCQCkDaHwgBCgCQBCfAUEASARAIARCfzcDWAwJCwsgBEIANwNYDAcLIAQCfyAEKQNIQhBUBEAgBCgCQEESQQAQFEEADAELIAQoAlALNgIUIAQoAhRFBEAgBEJ/NwNYDAcLIAQoAkAoAoQBIAQoAhQpAwAgBCgCFCgCCCAEKAJAEGpBAEgEQCAEQn83A1gMBwsgBEIANwNYDAYLIAQpA0hCOFQEQCAEQn83A1gMBgsCfyMAQRBrIgAgBCgCQEHYAGo2AgwgACgCDCgCAAsEQCAEKAJAAn8jAEEQayIAIAQoAkBB2ABqNgIMIAAoAgwoAgALAn8jAEEQayIAIAQoAkBB2ABqNgIMIAAoAgwoAgQLEBQgBEJ/NwNYDAYLIAQoAlAiACAEKAJAIgEpACA3AAAgACABKQBQNwAwIAAgASkASDcAKCAAIAEpAEA3ACAgACABKQA4NwAYIAAgASkAMDcAECAAIAEpACg3AAggBEI4NwNYDAULIAQgBCgCQCkDEDcDWAwECyAEIAQoAkApA3g3A1gMAwsgBCAEKAJAKAKEARCjATcDCCAEKQMIQgBTBEAgBCgCQEEeQbSbASgCABAUIARCfzcDWAwDCyAEIAQpAwg3A1gMAgsgBCgCQCgChAEiACgCTEEAThogACAAKAIAQU9xNgIAIAQCfyAEKAJQIQEgBCkDSKciACAAAn8gBCgCQCgChAEiAygCTEF/TARAIAEgACADEHEMAQsgASAAIAMQcQsiAUYNABogAQs2AgQCQCAEKQNIIAQoAgStUQRAAn8gBCgCQCgChAEiACgCTEF/TARAIAAoAgAMAQsgACgCAAtBBXZBAXFFDQELIAQoAkBBBkG0mwEoAgAQFCAEQn83A1gMAgsgBCAEKAIErTcDWAwBCyAEKAJAQRxBABAUIARCfzcDWAsgBCkDWCECIARB4ABqJAAgAgsJACAAKAI8EAUL5AEBBH8jAEEgayIDJAAgAyABNgIQIAMgAiAAKAIwIgRBAEdrNgIUIAAoAiwhBSADIAQ2AhwgAyAFNgIYQX8hBAJAAkAgACgCPCADQRBqQQIgA0EMahAGIgUEf0G0mwEgBTYCAEF/BUEAC0UEQCADKAIMIgRBAEoNAQsgACAAKAIAIARBMHFBEHNyNgIADAELIAQgAygCFCIGTQ0AIAAgACgCLCIFNgIEIAAgBSAEIAZrajYCCCAAKAIwBEAgACAFQQFqNgIEIAEgAmpBAWsgBS0AADoAAAsgAiEECyADQSBqJAAgBAv0AgEHfyMAQSBrIgMkACADIAAoAhwiBTYCECAAKAIUIQQgAyACNgIcIAMgATYCGCADIAQgBWsiATYCFCABIAJqIQVBAiEHIANBEGohAQJ/AkACQCAAKAI8IANBEGpBAiADQQxqEAMiBAR/QbSbASAENgIAQX8FQQALRQRAA0AgBSADKAIMIgRGDQIgBEF/TA0DIAEgBCABKAIEIghLIgZBA3RqIgkgBCAIQQAgBhtrIgggCSgCAGo2AgAgAUEMQQQgBhtqIgkgCSgCACAIazYCACAFIARrIQUgACgCPCABQQhqIAEgBhsiASAHIAZrIgcgA0EMahADIgQEf0G0mwEgBDYCAEF/BUEAC0UNAAsLIAVBf0cNAQsgACAAKAIsIgE2AhwgACABNgIUIAAgASAAKAIwajYCECACDAELIABBADYCHCAAQgA3AxAgACAAKAIAQSByNgIAQQAgB0ECRg0AGiACIAEoAgRrCyEAIANBIGokACAAC1IBAX8jAEEQayIDJAAgACgCPCABpyABQiCIpyACQf8BcSADQQhqEA0iAAR/QbSbASAANgIAQX8FQQALIQAgAykDCCEBIANBEGokAEJ/IAEgABsL1QQBBX8jAEGwAWsiASQAIAEgADYCqAEgASgCqAEQOAJAAkAgASgCqAEoAgBBAE4EQCABKAKoASgCAEGAFCgCAEgNAQsgASABKAKoASgCADYCECABQSBqQY8SIAFBEGoQbyABQQA2AqQBIAEgAUEgajYCoAEMAQsgASABKAKoASgCAEECdEGAE2ooAgA2AqQBAkACQAJAAkAgASgCqAEoAgBBAnRBkBRqKAIAQQFrDgIAAQILIAEoAqgBKAIEIQJBkJkBKAIAIQRBACEAAkACQANAIAIgAEGgiAFqLQAARwRAQdcAIQMgAEEBaiIAQdcARw0BDAILCyAAIgMNAEGAiQEhAgwBC0GAiQEhAANAIAAtAAAhBSAAQQFqIgIhACAFDQAgAiEAIANBAWsiAw0ACwsgBCgCFBogASACNgKgAQwCCyMAQRBrIgAgASgCqAEoAgQ2AgwgAUEAIAAoAgxrQQJ0QajZAGooAgA2AqABDAELIAFBADYCoAELCwJAIAEoAqABRQRAIAEgASgCpAE2AqwBDAELIAEgASgCoAEQLgJ/IAEoAqQBBEAgASgCpAEQLkECagwBC0EAC2pBAWoQGCIANgIcIABFBEAgAUG4EygCADYCrAEMAQsgASgCHCEAAn8gASgCpAEEQCABKAKkAQwBC0H6EgshA0HfEkH6EiABKAKkARshAiABIAEoAqABNgIIIAEgAjYCBCABIAM2AgAgAEG+CiABEG8gASgCqAEgASgCHDYCCCABIAEoAhw2AqwBCyABKAKsASEAIAFBsAFqJAAgAAsIAEEBQTgQfwszAQF/IAAoAhQiAyABIAIgACgCECADayIBIAEgAksbIgEQGRogACAAKAIUIAFqNgIUIAILjwUCBn4BfyABIAEoAgBBD2pBcHEiAUEQajYCACAAAnwgASkDACEDIAEpAwghBiMAQSBrIggkAAJAIAZC////////////AIMiBEKAgICAgIDAgDx9IARCgICAgICAwP/DAH1UBEAgBkIEhiADQjyIhCEEIANC//////////8PgyIDQoGAgICAgICACFoEQCAEQoGAgICAgICAwAB8IQIMAgsgBEKAgICAgICAgEB9IQIgA0KAgICAgICAgAiFQgBSDQEgAiAEQgGDfCECDAELIANQIARCgICAgICAwP//AFQgBEKAgICAgIDA//8AURtFBEAgBkIEhiADQjyIhEL/////////A4NCgICAgICAgPz/AIQhAgwBC0KAgICAgICA+P8AIQIgBEL///////+//8MAVg0AQgAhAiAEQjCIpyIAQZH3AEkNACADIQIgBkL///////8/g0KAgICAgIDAAIQiBSEHAkAgAEGB9wBrIgFBwABxBEAgAiABQUBqrYYhB0IAIQIMAQsgAUUNACAHIAGtIgSGIAJBwAAgAWutiIQhByACIASGIQILIAggAjcDECAIIAc3AxgCQEGB+AAgAGsiAEHAAHEEQCAFIABBQGqtiCEDQgAhBQwBCyAARQ0AIAVBwAAgAGuthiADIACtIgKIhCEDIAUgAoghBQsgCCADNwMAIAggBTcDCCAIKQMIQgSGIAgpAwAiA0I8iIQhAiAIKQMQIAgpAxiEQgBSrSADQv//////////D4OEIgNCgYCAgICAgIAIWgRAIAJCAXwhAgwBCyADQoCAgICAgICACIVCAFINACACQgGDIAJ8IQILIAhBIGokACACIAZCgICAgICAgICAf4OEvws5AwALrRcDEn8CfgF8IwBBsARrIgkkACAJQQA2AiwCQCABvSIYQn9XBEBBASESQa4IIRMgAZoiAb0hGAwBCyAEQYAQcQRAQQEhEkGxCCETDAELQbQIQa8IIARBAXEiEhshEyASRSEXCwJAIBhCgICAgICAgPj/AINCgICAgICAgPj/AFEEQCAAQSAgAiASQQNqIg0gBEH//3txECYgACATIBIQIiAAQeQLQbUSIAVBIHEiAxtBjw1BuRIgAxsgASABYhtBAxAiDAELIAlBEGohEAJAAn8CQCABIAlBLGoQqQEiASABoCIBRAAAAAAAAAAAYgRAIAkgCSgCLCIGQQFrNgIsIAVBIHIiFEHhAEcNAQwDCyAFQSByIhRB4QBGDQIgCSgCLCELQQYgAyADQQBIGwwBCyAJIAZBHWsiCzYCLCABRAAAAAAAALBBoiEBQQYgAyADQQBIGwshCiAJQTBqIAlB0AJqIAtBAEgbIg4hBwNAIAcCfyABRAAAAAAAAPBBYyABRAAAAAAAAAAAZnEEQCABqwwBC0EACyIDNgIAIAdBBGohByABIAO4oUQAAAAAZc3NQaIiAUQAAAAAAAAAAGINAAsCQCALQQFIBEAgCyEDIAchBiAOIQgMAQsgDiEIIAshAwNAIANBHSADQR1IGyEMAkAgB0EEayIGIAhJDQAgDK0hGUIAIRgDQCAGIAY1AgAgGYYgGHwiGCAYQoCU69wDgCIYQoCU69wDfn0+AgAgCCAGQQRrIgZNBEAgGEL/////D4MhGAwBCwsgGKciA0UNACAIQQRrIgggAzYCAAsDQCAIIAciBkkEQCAGQQRrIgcoAgBFDQELCyAJIAkoAiwgDGsiAzYCLCAGIQcgA0EASg0ACwsgCkEZakEJbSEHIANBf0wEQCAHQQFqIQ0gFEHmAEYhFQNAQQlBACADayADQXdIGyEWAkAgBiAISwRAQYCU69wDIBZ2IQ9BfyAWdEF/cyERQQAhAyAIIQcDQCAHIAMgBygCACIMIBZ2ajYCACAMIBFxIA9sIQMgB0EEaiIHIAZJDQALIAggCEEEaiAIKAIAGyEIIANFDQEgBiADNgIAIAZBBGohBgwBCyAIIAhBBGogCCgCABshCAsgCSAJKAIsIBZqIgM2AiwgDiAIIBUbIgcgDUECdGogBiAGIAdrQQJ1IA1KGyEGIANBAEgNAAsLQQAhBwJAIAYgCE0NACAOIAhrQQJ1QQlsIQcgCCgCACIMQQpJDQBB5AAhAwNAIAdBAWohByADIAxLDQEgA0EKbCEDDAALAAsgCkEAIAcgFEHmAEYbayAUQecARiAKQQBHcWsiAyAGIA5rQQJ1QQlsQQlrSARAIANBgMgAaiIRQQltIgxBAnQgCUEwakEEciAJQdQCaiALQQBIG2pBgCBrIQ1BCiEDAkAgESAMQQlsayIMQQdKDQBB5AAhAwNAIAxBAWoiDEEIRg0BIANBCmwhAwwACwALAkAgDSgCACIRIBEgA24iDCADbGsiD0EBIA1BBGoiCyAGRhtFDQBEAAAAAAAA4D9EAAAAAAAA8D9EAAAAAAAA+D8gBiALRhtEAAAAAAAA+D8gDyADQQF2IgtGGyALIA9LGyEaRAEAAAAAAEBDRAAAAAAAAEBDIAxBAXEbIQECQCAXDQAgEy0AAEEtRw0AIBqaIRogAZohAQsgDSARIA9rIgs2AgAgASAaoCABYQ0AIA0gAyALaiIDNgIAIANBgJTr3ANPBEADQCANQQA2AgAgCCANQQRrIg1LBEAgCEEEayIIQQA2AgALIA0gDSgCAEEBaiIDNgIAIANB/5Pr3ANLDQALCyAOIAhrQQJ1QQlsIQcgCCgCACILQQpJDQBB5AAhAwNAIAdBAWohByADIAtLDQEgA0EKbCEDDAALAAsgDUEEaiIDIAYgAyAGSRshBgsDQCAGIgsgCE0iDEUEQCALQQRrIgYoAgBFDQELCwJAIBRB5wBHBEAgBEEIcSEPDAELIAdBf3NBfyAKQQEgChsiBiAHSiAHQXtKcSIDGyAGaiEKQX9BfiADGyAFaiEFIARBCHEiDw0AQXchBgJAIAwNACALQQRrKAIAIgNFDQBBACEGIANBCnANAEEAIQxB5AAhBgNAIAMgBnBFBEAgDEEBaiEMIAZBCmwhBgwBCwsgDEF/cyEGCyALIA5rQQJ1QQlsIQMgBUFfcUHGAEYEQEEAIQ8gCiADIAZqQQlrIgNBACADQQBKGyIDIAMgCkobIQoMAQtBACEPIAogAyAHaiAGakEJayIDQQAgA0EAShsiAyADIApKGyEKCyAKIA9yQQBHIREgAEEgIAIgBUFfcSIMQcYARgR/IAdBACAHQQBKGwUgECAHIAdBH3UiA2ogA3OtIBAQRCIGa0EBTARAA0AgBkEBayIGQTA6AAAgECAGa0ECSA0ACwsgBkECayIVIAU6AAAgBkEBa0EtQSsgB0EASBs6AAAgECAVawsgCiASaiARampBAWoiDSAEECYgACATIBIQIiAAQTAgAiANIARBgIAEcxAmAkACQAJAIAxBxgBGBEAgCUEQakEIciEDIAlBEGpBCXIhByAOIAggCCAOSxsiBSEIA0AgCDUCACAHEEQhBgJAIAUgCEcEQCAGIAlBEGpNDQEDQCAGQQFrIgZBMDoAACAGIAlBEGpLDQALDAELIAYgB0cNACAJQTA6ABggAyEGCyAAIAYgByAGaxAiIAhBBGoiCCAOTQ0AC0EAIQYgEUUNAiAAQdYSQQEQIiAIIAtPDQEgCkEBSA0BA0AgCDUCACAHEEQiBiAJQRBqSwRAA0AgBkEBayIGQTA6AAAgBiAJQRBqSw0ACwsgACAGIApBCSAKQQlIGxAiIApBCWshBiAIQQRqIgggC08NAyAKQQlKIQMgBiEKIAMNAAsMAgsCQCAKQQBIDQAgCyAIQQRqIAggC0kbIQUgCUEQakEJciELIAlBEGpBCHIhAyAIIQcDQCALIAc1AgAgCxBEIgZGBEAgCUEwOgAYIAMhBgsCQCAHIAhHBEAgBiAJQRBqTQ0BA0AgBkEBayIGQTA6AAAgBiAJQRBqSw0ACwwBCyAAIAZBARAiIAZBAWohBkEAIApBAEwgDxsNACAAQdYSQQEQIgsgACAGIAsgBmsiBiAKIAYgCkgbECIgCiAGayEKIAdBBGoiByAFTw0BIApBf0oNAAsLIABBMCAKQRJqQRJBABAmIAAgFSAQIBVrECIMAgsgCiEGCyAAQTAgBkEJakEJQQAQJgsMAQsgE0EJaiATIAVBIHEiCxshCgJAIANBC0sNAEEMIANrIgZFDQBEAAAAAAAAIEAhGgNAIBpEAAAAAAAAMECiIRogBkEBayIGDQALIAotAABBLUYEQCAaIAGaIBqhoJohAQwBCyABIBqgIBqhIQELIBAgCSgCLCIGIAZBH3UiBmogBnOtIBAQRCIGRgRAIAlBMDoADyAJQQ9qIQYLIBJBAnIhDiAJKAIsIQcgBkECayIMIAVBD2o6AAAgBkEBa0EtQSsgB0EASBs6AAAgBEEIcSEHIAlBEGohCANAIAgiBQJ/IAGZRAAAAAAAAOBBYwRAIAGqDAELQYCAgIB4CyIGQYCHAWotAAAgC3I6AAAgASAGt6FEAAAAAAAAMECiIQECQCAFQQFqIgggCUEQamtBAUcNAAJAIAFEAAAAAAAAAABiDQAgA0EASg0AIAdFDQELIAVBLjoAASAFQQJqIQgLIAFEAAAAAAAAAABiDQALIABBICACIA4CfwJAIANFDQAgCCAJa0ESayADTg0AIAMgEGogDGtBAmoMAQsgECAJQRBqIAxqayAIagsiA2oiDSAEECYgACAKIA4QIiAAQTAgAiANIARBgIAEcxAmIAAgCUEQaiAIIAlBEGprIgUQIiAAQTAgAyAFIBAgDGsiA2prQQBBABAmIAAgDCADECILIABBICACIA0gBEGAwABzECYgCUGwBGokACACIA0gAiANShsLBgBB4J8BCwYAQdyfAQsGAEHUnwELGAEBfyMAQRBrIgEgADYCDCABKAIMQQRqCxgBAX8jAEEQayIBIAA2AgwgASgCDEEIagtpAQF/IwBBEGsiASQAIAEgADYCDCABKAIMKAIUBEAgASgCDCgCFBAbCyABQQA2AgggASgCDCgCBARAIAEgASgCDCgCBDYCCAsgASgCDEEEahA4IAEoAgwQFSABKAIIIQAgAUEQaiQAIAALqQEBA38CQCAALQAAIgJFDQADQCABLQAAIgRFBEAgAiEDDAILAkAgAiAERg0AIAJBIHIgAiACQcEAa0EaSRsgAS0AACICQSByIAIgAkHBAGtBGkkbRg0AIAAtAAAhAwwCCyABQQFqIQEgAC0AASECIABBAWohACACDQALCyADQf8BcSIAQSByIAAgAEHBAGtBGkkbIAEtAAAiAEEgciAAIABBwQBrQRpJG2sLiAEBAX8jAEEQayICJAAgAiAANgIMIAIgATYCCCMAQRBrIgAgAigCDDYCDCAAKAIMQQA2AgAgACgCDEEANgIEIAAoAgxBADYCCCACKAIMIAIoAgg2AgACQCACKAIMEKwBQQFGBEAgAigCDEG0mwEoAgA2AgQMAQsgAigCDEEANgIECyACQRBqJAAL2AkBAX8jAEGwAWsiBSQAIAUgADYCpAEgBSABNgKgASAFIAI2ApwBIAUgAzcDkAEgBSAENgKMASAFIAUoAqABNgKIAQJAAkACQAJAAkACQAJAAkACQAJAAkAgBSgCjAEODwABAgMEBQcICQkJCQkJBgkLIAUoAogBQgA3AyAgBUIANwOoAQwJCyAFIAUoAqQBIAUoApwBIAUpA5ABECsiAzcDgAEgA0IAUwRAIAUoAogBQQhqIAUoAqQBEBcgBUJ/NwOoAQwJCwJAIAUpA4ABUARAIAUoAogBKQMoIAUoAogBKQMgUQRAIAUoAogBQQE2AgQgBSgCiAEgBSgCiAEpAyA3AxggBSgCiAEoAgAEQCAFKAKkASAFQcgAahA5QQBIBEAgBSgCiAFBCGogBSgCpAEQFyAFQn83A6gBDA0LAkAgBSkDSEIgg1ANACAFKAJ0IAUoAogBKAIwRg0AIAUoAogBQQhqQQdBABAUIAVCfzcDqAEMDQsCQCAFKQNIQgSDUA0AIAUpA2AgBSgCiAEpAxhRDQAgBSgCiAFBCGpBFUEAEBQgBUJ/NwOoAQwNCwsLDAELAkAgBSgCiAEoAgQNACAFKAKIASkDICAFKAKIASkDKFYNACAFIAUoAogBKQMoIAUoAogBKQMgfTcDQANAIAUpA0AgBSkDgAFUBEAgBSAFKQOAASAFKQNAfUL/////D1YEfkL/////DwUgBSkDgAEgBSkDQH0LNwM4IAUoAogBKAIwIAUoApwBIAUpA0CnaiAFKQM4pxAaIQAgBSgCiAEgADYCMCAFKAKIASIAIAUpAzggACkDKHw3AyggBSAFKQM4IAUpA0B8NwNADAELCwsLIAUoAogBIgAgBSkDgAEgACkDIHw3AyAgBSAFKQOAATcDqAEMCAsgBUIANwOoAQwHCyAFIAUoApwBNgI0IAUoAogBKAIEBEAgBSgCNCAFKAKIASkDGDcDGCAFKAI0IAUoAogBKAIwNgIsIAUoAjQgBSgCiAEpAxg3AyAgBSgCNEEAOwEwIAUoAjRBADsBMiAFKAI0IgAgACkDAELsAYQ3AwALIAVCADcDqAEMBgsgBSAFKAKIAUEIaiAFKAKcASAFKQOQARBDNwOoAQwFCyAFKAKIARAVIAVCADcDqAEMBAsjAEEQayIAIAUoAqQBNgIMIAUgACgCDCkDGDcDKCAFKQMoQgBTBEAgBSgCiAFBCGogBSgCpAEQFyAFQn83A6gBDAQLIAUpAyghAyAFQX82AhggBUEQNgIUIAVBDzYCECAFQQ02AgwgBUEMNgIIIAVBCjYCBCAFQQk2AgAgBUEIIAUQNEJ/hSADgzcDqAEMAwsgBQJ/IAUpA5ABQhBUBEAgBSgCiAFBCGpBEkEAEBRBAAwBCyAFKAKcAQs2AhwgBSgCHEUEQCAFQn83A6gBDAMLAkAgBSgCpAEgBSgCHCkDACAFKAIcKAIIECdBAE4EQCAFIAUoAqQBEEkiAzcDICADQgBZDQELIAUoAogBQQhqIAUoAqQBEBcgBUJ/NwOoAQwDCyAFKAKIASAFKQMgNwMgIAVCADcDqAEMAgsgBSAFKAKIASkDIDcDqAEMAQsgBSgCiAFBCGpBHEEAEBQgBUJ/NwOoAQsgBSkDqAEhAyAFQbABaiQAIAMLnAwBAX8jAEEwayIFJAAgBSAANgIkIAUgATYCICAFIAI2AhwgBSADNwMQIAUgBDYCDCAFIAUoAiA2AggCQAJAAkACQAJAAkACQAJAAkACQCAFKAIMDhEAAQIDBQYICAgICAgICAcIBAgLIAUoAghCADcDGCAFKAIIQQA6AAwgBSgCCEEAOgANIAUoAghBADoADyAFKAIIQn83AyAgBSgCCCgCrEAgBSgCCCgCqEAoAgwRAABBAXFFBEAgBUJ/NwMoDAkLIAVCADcDKAwICyAFKAIkIQEgBSgCCCECIAUoAhwhBCAFKQMQIQMjAEFAaiIAJAAgACABNgI0IAAgAjYCMCAAIAQ2AiwgACADNwMgAkACfyMAQRBrIgEgACgCMDYCDCABKAIMKAIACwRAIABCfzcDOAwBCwJAIAApAyBQRQRAIAAoAjAtAA1BAXFFDQELIABCADcDOAwBCyAAQgA3AwggAEEAOgAbA0AgAC0AG0EBcQR/QQAFIAApAwggACkDIFQLQQFxBEAgACAAKQMgIAApAwh9NwMAIAAgACgCMCgCrEAgACgCLCAAKQMIp2ogACAAKAIwKAKoQCgCHBEBADYCHCAAKAIcQQJHBEAgACAAKQMAIAApAwh8NwMICwJAAkACQAJAIAAoAhxBAWsOAwACAQMLIAAoAjBBAToADQJAIAAoAjAtAAxBAXENAAsgACgCMCkDIEIAUwRAIAAoAjBBFEEAEBQgAEEBOgAbDAMLAkAgACgCMC0ADkEBcUUNACAAKAIwKQMgIAApAwhWDQAgACgCMEEBOgAPIAAoAjAgACgCMCkDIDcDGCAAKAIsIAAoAjBBKGogACgCMCkDGKcQGRogACAAKAIwKQMYNwM4DAYLIABBAToAGwwCCyAAKAIwLQAMQQFxBEAgAEEBOgAbDAILIAAgACgCNCAAKAIwQShqQoDAABArIgM3AxAgA0IAUwRAIAAoAjAgACgCNBAXIABBAToAGwwCCwJAIAApAxBQBEAgACgCMEEBOgAMIAAoAjAoAqxAIAAoAjAoAqhAKAIYEQIAIAAoAjApAyBCAFMEQCAAKAIwQgA3AyALDAELAkAgACgCMCkDIEIAWQRAIAAoAjBBADoADgwBCyAAKAIwIAApAxA3AyALIAAoAjAoAqxAIAAoAjBBKGogACkDECAAKAIwKAKoQCgCFBEQABoLDAELAn8jAEEQayIBIAAoAjA2AgwgASgCDCgCAEULBEAgACgCMEEUQQAQFAsgAEEBOgAbCwwBCwsgACkDCEIAUgRAIAAoAjBBADoADiAAKAIwIgEgACkDCCABKQMYfDcDGCAAIAApAwg3AzgMAQsgAEF/QQACfyMAQRBrIgEgACgCMDYCDCABKAIMKAIACxusNwM4CyAAKQM4IQMgAEFAayQAIAUgAzcDKAwHCyAFKAIIKAKsQCAFKAIIKAKoQCgCEBEAAEEBcUUEQCAFQn83AygMBwsgBUIANwMoDAYLIAUgBSgCHDYCBAJAIAUoAggtABBBAXEEQCAFKAIILQANQQFxBEAgBSgCBCAFKAIILQAPQQFxBH9BAAUCfwJAIAUoAggoAhRBf0cEQCAFKAIIKAIUQX5HDQELQQgMAQsgBSgCCCgCFAtB//8DcQs7ATAgBSgCBCAFKAIIKQMYNwMgIAUoAgQiACAAKQMAQsgAhDcDAAwCCyAFKAIEIgAgACkDAEK3////D4M3AwAMAQsgBSgCBEEAOwEwIAUoAgQiACAAKQMAQsAAhDcDAAJAIAUoAggtAA1BAXEEQCAFKAIEIAUoAggpAxg3AxggBSgCBCIAIAApAwBCBIQ3AwAMAQsgBSgCBCIAIAApAwBC+////w+DNwMACwsgBUIANwMoDAULIAUgBSgCCC0AD0EBcQR/QQAFIAUoAggoAqxAIAUoAggoAqhAKAIIEQAAC6w3AygMBAsgBSAFKAIIIAUoAhwgBSkDEBBDNwMoDAMLIAUoAggQsQEgBUIANwMoDAILIAVBfzYCACAFQRAgBRA0Qj+ENwMoDAELIAUoAghBFEEAEBQgBUJ/NwMoCyAFKQMoIQMgBUEwaiQAIAMLPAEBfyMAQRBrIgMkACADIAA7AQ4gAyABNgIIIAMgAjYCBEEAIAMoAgggAygCBBC0ASEAIANBEGokACAAC46nAQEEfyMAQSBrIgUkACAFIAA2AhggBSABNgIUIAUgAjYCECAFIAUoAhg2AgwgBSgCDCAFKAIQKQMAQv////8PVgR+Qv////8PBSAFKAIQKQMACz4CICAFKAIMIAUoAhQ2AhwCQCAFKAIMLQAEQQFxBEAgBSgCDEEQaiEBQQRBACAFKAIMLQAMQQFxGyECIwBBQGoiACQAIAAgATYCOCAAIAI2AjQCQAJAAkAgACgCOBB4DQAgACgCNEEFSg0AIAAoAjRBAE4NAQsgAEF+NgI8DAELIAAgACgCOCgCHDYCLAJAAkAgACgCOCgCDEUNACAAKAI4KAIEBEAgACgCOCgCAEUNAQsgACgCLCgCBEGaBUcNASAAKAI0QQRGDQELIAAoAjhBsNkAKAIANgIYIABBfjYCPAwBCyAAKAI4KAIQRQRAIAAoAjhBvNkAKAIANgIYIABBezYCPAwBCyAAIAAoAiwoAig2AjAgACgCLCAAKAI0NgIoAkAgACgCLCgCFARAIAAoAjgQHCAAKAI4KAIQRQRAIAAoAixBfzYCKCAAQQA2AjwMAwsMAQsCQCAAKAI4KAIEDQAgACgCNEEBdEEJQQAgACgCNEEEShtrIAAoAjBBAXRBCUEAIAAoAjBBBEoba0oNACAAKAI0QQRGDQAgACgCOEG82QAoAgA2AhggAEF7NgI8DAILCwJAIAAoAiwoAgRBmgVHDQAgACgCOCgCBEUNACAAKAI4QbzZACgCADYCGCAAQXs2AjwMAQsgACgCLCgCBEEqRgRAIAAgACgCLCgCMEEEdEH4AGtBCHQ2AigCQAJAIAAoAiwoAogBQQJIBEAgACgCLCgChAFBAk4NAQsgAEEANgIkDAELAkAgACgCLCgChAFBBkgEQCAAQQE2AiQMAQsCQCAAKAIsKAKEAUEGRgRAIABBAjYCJAwBCyAAQQM2AiQLCwsgACAAKAIoIAAoAiRBBnRyNgIoIAAoAiwoAmwEQCAAIAAoAihBIHI2AigLIAAgACgCKEEfIAAoAihBH3BrajYCKCAAKAIsIAAoAigQSyAAKAIsKAJsBEAgACgCLCAAKAI4KAIwQRB2EEsgACgCLCAAKAI4KAIwQf//A3EQSwtBAEEAQQAQPSEBIAAoAjggATYCMCAAKAIsQfEANgIEIAAoAjgQHCAAKAIsKAIUBEAgACgCLEF/NgIoIABBADYCPAwCCwsgACgCLCgCBEE5RgRAQQBBAEEAEBohASAAKAI4IAE2AjAgACgCLCgCCCECIAAoAiwiAygCFCEBIAMgAUEBajYCFCABIAJqQR86AAAgACgCLCgCCCECIAAoAiwiAygCFCEBIAMgAUEBajYCFCABIAJqQYsBOgAAIAAoAiwoAgghAiAAKAIsIgMoAhQhASADIAFBAWo2AhQgASACakEIOgAAAkAgACgCLCgCHEUEQCAAKAIsKAIIIQIgACgCLCIDKAIUIQEgAyABQQFqNgIUIAEgAmpBADoAACAAKAIsKAIIIQIgACgCLCIDKAIUIQEgAyABQQFqNgIUIAEgAmpBADoAACAAKAIsKAIIIQIgACgCLCIDKAIUIQEgAyABQQFqNgIUIAEgAmpBADoAACAAKAIsKAIIIQIgACgCLCIDKAIUIQEgAyABQQFqNgIUIAEgAmpBADoAACAAKAIsKAIIIQIgACgCLCIDKAIUIQEgAyABQQFqNgIUIAEgAmpBADoAACAAKAIsKAKEAUEJRgR/QQIFQQRBACAAKAIsKAKIAUECSAR/IAAoAiwoAoQBQQJIBUEBC0EBcRsLIQIgACgCLCgCCCEDIAAoAiwiBCgCFCEBIAQgAUEBajYCFCABIANqIAI6AAAgACgCLCgCCCECIAAoAiwiAygCFCEBIAMgAUEBajYCFCABIAJqQQM6AAAgACgCLEHxADYCBCAAKAI4EBwgACgCLCgCFARAIAAoAixBfzYCKCAAQQA2AjwMBAsMAQsgACgCLCgCHCgCAEVFQQJBACAAKAIsKAIcKAIsG2pBBEEAIAAoAiwoAhwoAhAbakEIQQAgACgCLCgCHCgCHBtqQRBBACAAKAIsKAIcKAIkG2ohAiAAKAIsKAIIIQMgACgCLCIEKAIUIQEgBCABQQFqNgIUIAEgA2ogAjoAACAAKAIsKAIcKAIEQf8BcSECIAAoAiwoAgghAyAAKAIsIgQoAhQhASAEIAFBAWo2AhQgASADaiACOgAAIAAoAiwoAhwoAgRBCHZB/wFxIQIgACgCLCgCCCEDIAAoAiwiBCgCFCEBIAQgAUEBajYCFCABIANqIAI6AAAgACgCLCgCHCgCBEEQdkH/AXEhAiAAKAIsKAIIIQMgACgCLCIEKAIUIQEgBCABQQFqNgIUIAEgA2ogAjoAACAAKAIsKAIcKAIEQRh2IQIgACgCLCgCCCEDIAAoAiwiBCgCFCEBIAQgAUEBajYCFCABIANqIAI6AAAgACgCLCgChAFBCUYEf0ECBUEEQQAgACgCLCgCiAFBAkgEfyAAKAIsKAKEAUECSAVBAQtBAXEbCyECIAAoAiwoAgghAyAAKAIsIgQoAhQhASAEIAFBAWo2AhQgASADaiACOgAAIAAoAiwoAhwoAgxB/wFxIQIgACgCLCgCCCEDIAAoAiwiBCgCFCEBIAQgAUEBajYCFCABIANqIAI6AAAgACgCLCgCHCgCEARAIAAoAiwoAhwoAhRB/wFxIQIgACgCLCgCCCEDIAAoAiwiBCgCFCEBIAQgAUEBajYCFCABIANqIAI6AAAgACgCLCgCHCgCFEEIdkH/AXEhAiAAKAIsKAIIIQMgACgCLCIEKAIUIQEgBCABQQFqNgIUIAEgA2ogAjoAAAsgACgCLCgCHCgCLARAIAAoAjgoAjAgACgCLCgCCCAAKAIsKAIUEBohASAAKAI4IAE2AjALIAAoAixBADYCICAAKAIsQcUANgIECwsgACgCLCgCBEHFAEYEQCAAKAIsKAIcKAIQBEAgACAAKAIsKAIUNgIgIAAgACgCLCgCHCgCFEH//wNxIAAoAiwoAiBrNgIcA0AgACgCLCgCDCAAKAIsKAIUIAAoAhxqSQRAIAAgACgCLCgCDCAAKAIsKAIUazYCGCAAKAIsKAIIIAAoAiwoAhRqIAAoAiwoAhwoAhAgACgCLCgCIGogACgCGBAZGiAAKAIsIAAoAiwoAgw2AhQCQCAAKAIsKAIcKAIsRQ0AIAAoAiwoAhQgACgCIE0NACAAKAI4KAIwIAAoAiwoAgggACgCIGogACgCLCgCFCAAKAIgaxAaIQEgACgCOCABNgIwCyAAKAIsIgEgACgCGCABKAIgajYCICAAKAI4EBwgACgCLCgCFARAIAAoAixBfzYCKCAAQQA2AjwMBQUgAEEANgIgIAAgACgCHCAAKAIYazYCHAwCCwALCyAAKAIsKAIIIAAoAiwoAhRqIAAoAiwoAhwoAhAgACgCLCgCIGogACgCHBAZGiAAKAIsIgEgACgCHCABKAIUajYCFAJAIAAoAiwoAhwoAixFDQAgACgCLCgCFCAAKAIgTQ0AIAAoAjgoAjAgACgCLCgCCCAAKAIgaiAAKAIsKAIUIAAoAiBrEBohASAAKAI4IAE2AjALIAAoAixBADYCIAsgACgCLEHJADYCBAsgACgCLCgCBEHJAEYEQCAAKAIsKAIcKAIcBEAgACAAKAIsKAIUNgIUA0AgACgCLCgCFCAAKAIsKAIMRgRAAkAgACgCLCgCHCgCLEUNACAAKAIsKAIUIAAoAhRNDQAgACgCOCgCMCAAKAIsKAIIIAAoAhRqIAAoAiwoAhQgACgCFGsQGiEBIAAoAjggATYCMAsgACgCOBAcIAAoAiwoAhQEQCAAKAIsQX82AiggAEEANgI8DAULIABBADYCFAsgACgCLCgCHCgCHCECIAAoAiwiAygCICEBIAMgAUEBajYCICAAIAEgAmotAAA2AhAgACgCECECIAAoAiwoAgghAyAAKAIsIgQoAhQhASAEIAFBAWo2AhQgASADaiACOgAAIAAoAhANAAsCQCAAKAIsKAIcKAIsRQ0AIAAoAiwoAhQgACgCFE0NACAAKAI4KAIwIAAoAiwoAgggACgCFGogACgCLCgCFCAAKAIUaxAaIQEgACgCOCABNgIwCyAAKAIsQQA2AiALIAAoAixB2wA2AgQLIAAoAiwoAgRB2wBGBEAgACgCLCgCHCgCJARAIAAgACgCLCgCFDYCDANAIAAoAiwoAhQgACgCLCgCDEYEQAJAIAAoAiwoAhwoAixFDQAgACgCLCgCFCAAKAIMTQ0AIAAoAjgoAjAgACgCLCgCCCAAKAIMaiAAKAIsKAIUIAAoAgxrEBohASAAKAI4IAE2AjALIAAoAjgQHCAAKAIsKAIUBEAgACgCLEF/NgIoIABBADYCPAwFCyAAQQA2AgwLIAAoAiwoAhwoAiQhAiAAKAIsIgMoAiAhASADIAFBAWo2AiAgACABIAJqLQAANgIIIAAoAgghAiAAKAIsKAIIIQMgACgCLCIEKAIUIQEgBCABQQFqNgIUIAEgA2ogAjoAACAAKAIIDQALAkAgACgCLCgCHCgCLEUNACAAKAIsKAIUIAAoAgxNDQAgACgCOCgCMCAAKAIsKAIIIAAoAgxqIAAoAiwoAhQgACgCDGsQGiEBIAAoAjggATYCMAsLIAAoAixB5wA2AgQLIAAoAiwoAgRB5wBGBEAgACgCLCgCHCgCLARAIAAoAiwoAgwgACgCLCgCFEECakkEQCAAKAI4EBwgACgCLCgCFARAIAAoAixBfzYCKCAAQQA2AjwMBAsLIAAoAjgoAjBB/wFxIQIgACgCLCgCCCEDIAAoAiwiBCgCFCEBIAQgAUEBajYCFCABIANqIAI6AAAgACgCOCgCMEEIdkH/AXEhAiAAKAIsKAIIIQMgACgCLCIEKAIUIQEgBCABQQFqNgIUIAEgA2ogAjoAAEEAQQBBABAaIQEgACgCOCABNgIwCyAAKAIsQfEANgIEIAAoAjgQHCAAKAIsKAIUBEAgACgCLEF/NgIoIABBADYCPAwCCwsCQAJAIAAoAjgoAgQNACAAKAIsKAJ0DQAgACgCNEUNASAAKAIsKAIEQZoFRg0BCyAAAn8gACgCLCgChAFFBEAgACgCLCAAKAI0ELcBDAELAn8gACgCLCgCiAFBAkYEQCAAKAIsIQIgACgCNCEDIwBBIGsiASQAIAEgAjYCGCABIAM2AhQCQANAAkAgASgCGCgCdEUEQCABKAIYEFwgASgCGCgCdEUEQCABKAIURQRAIAFBADYCHAwFCwwCCwsgASgCGEEANgJgIAEgASgCGCICKAI4IAIoAmxqLQAAOgAPIAEoAhgiAigCpC0gAigCoC1BAXRqQQA7AQAgAS0ADyEDIAEoAhgiAigCmC0hBCACIAIoAqAtIgJBAWo2AqAtIAIgBGogAzoAACABKAIYIAEtAA9BAnRqIgIgAi8BlAFBAWo7AZQBIAEgASgCGCgCoC0gASgCGCgCnC1BAWtGNgIQIAEoAhgiAiACKAJ0QQFrNgJ0IAEoAhgiAiACKAJsQQFqNgJsIAEoAhAEQCABKAIYAn8gASgCGCgCXEEATgRAIAEoAhgoAjggASgCGCgCXGoMAQtBAAsgASgCGCgCbCABKAIYKAJca0EAECggASgCGCABKAIYKAJsNgJcIAEoAhgoAgAQHCABKAIYKAIAKAIQRQRAIAFBADYCHAwECwsMAQsLIAEoAhhBADYCtC0gASgCFEEERgRAIAEoAhgCfyABKAIYKAJcQQBOBEAgASgCGCgCOCABKAIYKAJcagwBC0EACyABKAIYKAJsIAEoAhgoAlxrQQEQKCABKAIYIAEoAhgoAmw2AlwgASgCGCgCABAcIAEoAhgoAgAoAhBFBEAgAUECNgIcDAILIAFBAzYCHAwBCyABKAIYKAKgLQRAIAEoAhgCfyABKAIYKAJcQQBOBEAgASgCGCgCOCABKAIYKAJcagwBC0EACyABKAIYKAJsIAEoAhgoAlxrQQAQKCABKAIYIAEoAhgoAmw2AlwgASgCGCgCABAcIAEoAhgoAgAoAhBFBEAgAUEANgIcDAILCyABQQE2AhwLIAEoAhwhAiABQSBqJAAgAgwBCwJ/IAAoAiwoAogBQQNGBEAgACgCLCECIAAoAjQhAyMAQTBrIgEkACABIAI2AiggASADNgIkAkADQAJAIAEoAigoAnRBggJNBEAgASgCKBBcAkAgASgCKCgCdEGCAksNACABKAIkDQAgAUEANgIsDAQLIAEoAigoAnRFDQELIAEoAihBADYCYAJAIAEoAigoAnRBA0kNACABKAIoKAJsRQ0AIAEgASgCKCgCOCABKAIoKAJsakEBazYCGCABIAEoAhgtAAA2AhwgASgCHCECIAEgASgCGCIDQQFqNgIYAkAgAy0AASACRw0AIAEoAhwhAiABIAEoAhgiA0EBajYCGCADLQABIAJHDQAgASgCHCECIAEgASgCGCIDQQFqNgIYIAMtAAEgAkcNACABIAEoAigoAjggASgCKCgCbGpBggJqNgIUA0AgASgCHCECIAEgASgCGCIDQQFqNgIYAn9BACADLQABIAJHDQAaIAEoAhwhAiABIAEoAhgiA0EBajYCGEEAIAMtAAEgAkcNABogASgCHCECIAEgASgCGCIDQQFqNgIYQQAgAy0AASACRw0AGiABKAIcIQIgASABKAIYIgNBAWo2AhhBACADLQABIAJHDQAaIAEoAhwhAiABIAEoAhgiA0EBajYCGEEAIAMtAAEgAkcNABogASgCHCECIAEgASgCGCIDQQFqNgIYQQAgAy0AASACRw0AGiABKAIcIQIgASABKAIYIgNBAWo2AhhBACADLQABIAJHDQAaIAEoAhwhAiABIAEoAhgiA0EBajYCGEEAIAMtAAEgAkcNABogASgCGCABKAIUSQtBAXENAAsgASgCKEGCAiABKAIUIAEoAhhrazYCYCABKAIoKAJgIAEoAigoAnRLBEAgASgCKCABKAIoKAJ0NgJgCwsLAkAgASgCKCgCYEEDTwRAIAEgASgCKCgCYEEDazoAEyABQQE7ARAgASgCKCICKAKkLSACKAKgLUEBdGogAS8BEDsBACABLQATIQMgASgCKCICKAKYLSEEIAIgAigCoC0iAkEBajYCoC0gAiAEaiADOgAAIAEgAS8BEEEBazsBECABKAIoIAEtABNB0N0Aai0AAEECdGpBmAlqIgIgAi8BAEEBajsBACABKAIoQYgTagJ/IAEvARBBgAJJBEAgAS8BEC0A0FkMAQsgAS8BEEEHdkGAAmotANBZC0ECdGoiAiACLwEAQQFqOwEAIAEgASgCKCgCoC0gASgCKCgCnC1BAWtGNgIgIAEoAigiAiACKAJ0IAEoAigoAmBrNgJ0IAEoAigiAiABKAIoKAJgIAIoAmxqNgJsIAEoAihBADYCYAwBCyABIAEoAigiAigCOCACKAJsai0AADoADyABKAIoIgIoAqQtIAIoAqAtQQF0akEAOwEAIAEtAA8hAyABKAIoIgIoApgtIQQgAiACKAKgLSICQQFqNgKgLSACIARqIAM6AAAgASgCKCABLQAPQQJ0aiICIAIvAZQBQQFqOwGUASABIAEoAigoAqAtIAEoAigoApwtQQFrRjYCICABKAIoIgIgAigCdEEBazYCdCABKAIoIgIgAigCbEEBajYCbAsgASgCIARAIAEoAigCfyABKAIoKAJcQQBOBEAgASgCKCgCOCABKAIoKAJcagwBC0EACyABKAIoKAJsIAEoAigoAlxrQQAQKCABKAIoIAEoAigoAmw2AlwgASgCKCgCABAcIAEoAigoAgAoAhBFBEAgAUEANgIsDAQLCwwBCwsgASgCKEEANgK0LSABKAIkQQRGBEAgASgCKAJ/IAEoAigoAlxBAE4EQCABKAIoKAI4IAEoAigoAlxqDAELQQALIAEoAigoAmwgASgCKCgCXGtBARAoIAEoAiggASgCKCgCbDYCXCABKAIoKAIAEBwgASgCKCgCACgCEEUEQCABQQI2AiwMAgsgAUEDNgIsDAELIAEoAigoAqAtBEAgASgCKAJ/IAEoAigoAlxBAE4EQCABKAIoKAI4IAEoAigoAlxqDAELQQALIAEoAigoAmwgASgCKCgCXGtBABAoIAEoAiggASgCKCgCbDYCXCABKAIoKAIAEBwgASgCKCgCACgCEEUEQCABQQA2AiwMAgsLIAFBATYCLAsgASgCLCECIAFBMGokACACDAELIAAoAiwgACgCNCAAKAIsKAKEAUEMbEGA7wBqKAIIEQMACwsLNgIEAkAgACgCBEECRwRAIAAoAgRBA0cNAQsgACgCLEGaBTYCBAsCQCAAKAIEBEAgACgCBEECRw0BCyAAKAI4KAIQRQRAIAAoAixBfzYCKAsgAEEANgI8DAILIAAoAgRBAUYEQAJAIAAoAjRBAUYEQCAAKAIsIQIjAEEgayIBJAAgASACNgIcIAFBAzYCGAJAIAEoAhwoArwtQRAgASgCGGtKBEAgAUECNgIUIAEoAhwiAiACLwG4LSABKAIUQf//A3EgASgCHCgCvC10cjsBuC0gASgCHC8BuC1B/wFxIQMgASgCHCgCCCEEIAEoAhwiBigCFCECIAYgAkEBajYCFCACIARqIAM6AAAgASgCHC8BuC1BCHYhAyABKAIcKAIIIQQgASgCHCIGKAIUIQIgBiACQQFqNgIUIAIgBGogAzoAACABKAIcIAEoAhRB//8DcUEQIAEoAhwoArwta3U7AbgtIAEoAhwiAiACKAK8LSABKAIYQRBrajYCvC0MAQsgASgCHCICIAIvAbgtQQIgASgCHCgCvC10cjsBuC0gASgCHCICIAEoAhggAigCvC1qNgK8LQsgAUGS6AAvAQA2AhACQCABKAIcKAK8LUEQIAEoAhBrSgRAIAFBkOgALwEANgIMIAEoAhwiAiACLwG4LSABKAIMQf//A3EgASgCHCgCvC10cjsBuC0gASgCHC8BuC1B/wFxIQMgASgCHCgCCCEEIAEoAhwiBigCFCECIAYgAkEBajYCFCACIARqIAM6AAAgASgCHC8BuC1BCHYhAyABKAIcKAIIIQQgASgCHCIGKAIUIQIgBiACQQFqNgIUIAIgBGogAzoAACABKAIcIAEoAgxB//8DcUEQIAEoAhwoArwta3U7AbgtIAEoAhwiAiACKAK8LSABKAIQQRBrajYCvC0MAQsgASgCHCICIAIvAbgtQZDoAC8BACABKAIcKAK8LXRyOwG4LSABKAIcIgIgASgCECACKAK8LWo2ArwtCyABKAIcELwBIAFBIGokAAwBCyAAKAI0QQVHBEAgACgCLEEAQQBBABBdIAAoAjRBA0YEQCAAKAIsKAJEIAAoAiwoAkxBAWtBAXRqQQA7AQAgACgCLCgCREEAIAAoAiwoAkxBAWtBAXQQMyAAKAIsKAJ0RQRAIAAoAixBADYCbCAAKAIsQQA2AlwgACgCLEEANgK0LQsLCwsgACgCOBAcIAAoAjgoAhBFBEAgACgCLEF/NgIoIABBADYCPAwDCwsLIAAoAjRBBEcEQCAAQQA2AjwMAQsgACgCLCgCGEEATARAIABBATYCPAwBCwJAIAAoAiwoAhhBAkYEQCAAKAI4KAIwQf8BcSECIAAoAiwoAgghAyAAKAIsIgQoAhQhASAEIAFBAWo2AhQgASADaiACOgAAIAAoAjgoAjBBCHZB/wFxIQIgACgCLCgCCCEDIAAoAiwiBCgCFCEBIAQgAUEBajYCFCABIANqIAI6AAAgACgCOCgCMEEQdkH/AXEhAiAAKAIsKAIIIQMgACgCLCIEKAIUIQEgBCABQQFqNgIUIAEgA2ogAjoAACAAKAI4KAIwQRh2IQIgACgCLCgCCCEDIAAoAiwiBCgCFCEBIAQgAUEBajYCFCABIANqIAI6AAAgACgCOCgCCEH/AXEhAiAAKAIsKAIIIQMgACgCLCIEKAIUIQEgBCABQQFqNgIUIAEgA2ogAjoAACAAKAI4KAIIQQh2Qf8BcSECIAAoAiwoAgghAyAAKAIsIgQoAhQhASAEIAFBAWo2AhQgASADaiACOgAAIAAoAjgoAghBEHZB/wFxIQIgACgCLCgCCCEDIAAoAiwiBCgCFCEBIAQgAUEBajYCFCABIANqIAI6AAAgACgCOCgCCEEYdiECIAAoAiwoAgghAyAAKAIsIgQoAhQhASAEIAFBAWo2AhQgASADaiACOgAADAELIAAoAiwgACgCOCgCMEEQdhBLIAAoAiwgACgCOCgCMEH//wNxEEsLIAAoAjgQHCAAKAIsKAIYQQBKBEAgACgCLEEAIAAoAiwoAhhrNgIYCyAAIAAoAiwoAhRFNgI8CyAAKAI8IQEgAEFAayQAIAUgATYCCAwBCyAFKAIMQRBqIQEjAEHgAGsiACQAIAAgATYCWCAAQQI2AlQCQAJAAkAgACgCWBBKDQAgACgCWCgCDEUNACAAKAJYKAIADQEgACgCWCgCBEUNAQsgAEF+NgJcDAELIAAgACgCWCgCHDYCUCAAKAJQKAIEQb/+AEYEQCAAKAJQQcD+ADYCBAsgACAAKAJYKAIMNgJIIAAgACgCWCgCEDYCQCAAIAAoAlgoAgA2AkwgACAAKAJYKAIENgJEIAAgACgCUCgCPDYCPCAAIAAoAlAoAkA2AjggACAAKAJENgI0IAAgACgCQDYCMCAAQQA2AhADQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQCAAKAJQKAIEQbT+AGsOHwABAgMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR4fCyAAKAJQKAIMRQRAIAAoAlBBwP4ANgIEDCELA0AgACgCOEEQSQRAIAAoAkRFDSEgACAAKAJEQQFrNgJEIAAgACgCTCIBQQFqNgJMIAAgACgCPCABLQAAIAAoAjh0ajYCPCAAIAAoAjhBCGo2AjgMAQsLAkAgACgCUCgCDEECcUUNACAAKAI8QZ+WAkcNACAAKAJQKAIoRQRAIAAoAlBBDzYCKAtBAEEAQQAQGiEBIAAoAlAgATYCHCAAIAAoAjw6AAwgACAAKAI8QQh2OgANIAAoAlAoAhwgAEEMakECEBohASAAKAJQIAE2AhwgAEEANgI8IABBADYCOCAAKAJQQbX+ADYCBAwhCyAAKAJQQQA2AhQgACgCUCgCJARAIAAoAlAoAiRBfzYCMAsCQCAAKAJQKAIMQQFxBEAgACgCPEH/AXFBCHQgACgCPEEIdmpBH3BFDQELIAAoAlhBmgw2AhggACgCUEHR/gA2AgQMIQsgACgCPEEPcUEIRwRAIAAoAlhBmw82AhggACgCUEHR/gA2AgQMIQsgACAAKAI8QQR2NgI8IAAgACgCOEEEazYCOCAAIAAoAjxBD3FBCGo2AhQgACgCUCgCKEUEQCAAKAJQIAAoAhQ2AigLAkAgACgCFEEPTQRAIAAoAhQgACgCUCgCKE0NAQsgACgCWEGTDTYCGCAAKAJQQdH+ADYCBAwhCyAAKAJQQQEgACgCFHQ2AhhBAEEAQQAQPSEBIAAoAlAgATYCHCAAKAJYIAE2AjAgACgCUEG9/gBBv/4AIAAoAjxBgARxGzYCBCAAQQA2AjwgAEEANgI4DCALA0AgACgCOEEQSQRAIAAoAkRFDSAgACAAKAJEQQFrNgJEIAAgACgCTCIBQQFqNgJMIAAgACgCPCABLQAAIAAoAjh0ajYCPCAAIAAoAjhBCGo2AjgMAQsLIAAoAlAgACgCPDYCFCAAKAJQKAIUQf8BcUEIRwRAIAAoAlhBmw82AhggACgCUEHR/gA2AgQMIAsgACgCUCgCFEGAwANxBEAgACgCWEGgCTYCGCAAKAJQQdH+ADYCBAwgCyAAKAJQKAIkBEAgACgCUCgCJCAAKAI8QQh2QQFxNgIACwJAIAAoAlAoAhRBgARxRQ0AIAAoAlAoAgxBBHFFDQAgACAAKAI8OgAMIAAgACgCPEEIdjoADSAAKAJQKAIcIABBDGpBAhAaIQEgACgCUCABNgIcCyAAQQA2AjwgAEEANgI4IAAoAlBBtv4ANgIECwNAIAAoAjhBIEkEQCAAKAJERQ0fIAAgACgCREEBazYCRCAAIAAoAkwiAUEBajYCTCAAIAAoAjwgAS0AACAAKAI4dGo2AjwgACAAKAI4QQhqNgI4DAELCyAAKAJQKAIkBEAgACgCUCgCJCAAKAI8NgIECwJAIAAoAlAoAhRBgARxRQ0AIAAoAlAoAgxBBHFFDQAgACAAKAI8OgAMIAAgACgCPEEIdjoADSAAIAAoAjxBEHY6AA4gACAAKAI8QRh2OgAPIAAoAlAoAhwgAEEMakEEEBohASAAKAJQIAE2AhwLIABBADYCPCAAQQA2AjggACgCUEG3/gA2AgQLA0AgACgCOEEQSQRAIAAoAkRFDR4gACAAKAJEQQFrNgJEIAAgACgCTCIBQQFqNgJMIAAgACgCPCABLQAAIAAoAjh0ajYCPCAAIAAoAjhBCGo2AjgMAQsLIAAoAlAoAiQEQCAAKAJQKAIkIAAoAjxB/wFxNgIIIAAoAlAoAiQgACgCPEEIdjYCDAsCQCAAKAJQKAIUQYAEcUUNACAAKAJQKAIMQQRxRQ0AIAAgACgCPDoADCAAIAAoAjxBCHY6AA0gACgCUCgCHCAAQQxqQQIQGiEBIAAoAlAgATYCHAsgAEEANgI8IABBADYCOCAAKAJQQbj+ADYCBAsCQCAAKAJQKAIUQYAIcQRAA0AgACgCOEEQSQRAIAAoAkRFDR8gACAAKAJEQQFrNgJEIAAgACgCTCIBQQFqNgJMIAAgACgCPCABLQAAIAAoAjh0ajYCPCAAIAAoAjhBCGo2AjgMAQsLIAAoAlAgACgCPDYCRCAAKAJQKAIkBEAgACgCUCgCJCAAKAI8NgIUCwJAIAAoAlAoAhRBgARxRQ0AIAAoAlAoAgxBBHFFDQAgACAAKAI8OgAMIAAgACgCPEEIdjoADSAAKAJQKAIcIABBDGpBAhAaIQEgACgCUCABNgIcCyAAQQA2AjwgAEEANgI4DAELIAAoAlAoAiQEQCAAKAJQKAIkQQA2AhALCyAAKAJQQbn+ADYCBAsgACgCUCgCFEGACHEEQCAAIAAoAlAoAkQ2AiwgACgCLCAAKAJESwRAIAAgACgCRDYCLAsgACgCLARAAkAgACgCUCgCJEUNACAAKAJQKAIkKAIQRQ0AIAAgACgCUCgCJCgCFCAAKAJQKAJEazYCFCAAKAJQKAIkKAIQIAAoAhRqIAAoAkwCfyAAKAJQKAIkKAIYIAAoAhQgACgCLGpJBEAgACgCUCgCJCgCGCAAKAIUawwBCyAAKAIsCxAZGgsCQCAAKAJQKAIUQYAEcUUNACAAKAJQKAIMQQRxRQ0AIAAoAlAoAhwgACgCTCAAKAIsEBohASAAKAJQIAE2AhwLIAAgACgCRCAAKAIsazYCRCAAIAAoAiwgACgCTGo2AkwgACgCUCIBIAEoAkQgACgCLGs2AkQLIAAoAlAoAkQNGwsgACgCUEEANgJEIAAoAlBBuv4ANgIECwJAIAAoAlAoAhRBgBBxBEAgACgCREUNGyAAQQA2AiwDQCAAKAJMIQEgACAAKAIsIgJBAWo2AiwgACABIAJqLQAANgIUAkAgACgCUCgCJEUNACAAKAJQKAIkKAIcRQ0AIAAoAlAoAkQgACgCUCgCJCgCIE8NACAAKAIUIQIgACgCUCgCJCgCHCEDIAAoAlAiBCgCRCEBIAQgAUEBajYCRCABIANqIAI6AAALIAAoAhQEfyAAKAIsIAAoAkRJBUEAC0EBcQ0ACwJAIAAoAlAoAhRBgARxRQ0AIAAoAlAoAgxBBHFFDQAgACgCUCgCHCAAKAJMIAAoAiwQGiEBIAAoAlAgATYCHAsgACAAKAJEIAAoAixrNgJEIAAgACgCLCAAKAJMajYCTCAAKAIUDRsMAQsgACgCUCgCJARAIAAoAlAoAiRBADYCHAsLIAAoAlBBADYCRCAAKAJQQbv+ADYCBAsCQCAAKAJQKAIUQYAgcQRAIAAoAkRFDRogAEEANgIsA0AgACgCTCEBIAAgACgCLCICQQFqNgIsIAAgASACai0AADYCFAJAIAAoAlAoAiRFDQAgACgCUCgCJCgCJEUNACAAKAJQKAJEIAAoAlAoAiQoAihPDQAgACgCFCECIAAoAlAoAiQoAiQhAyAAKAJQIgQoAkQhASAEIAFBAWo2AkQgASADaiACOgAACyAAKAIUBH8gACgCLCAAKAJESQVBAAtBAXENAAsCQCAAKAJQKAIUQYAEcUUNACAAKAJQKAIMQQRxRQ0AIAAoAlAoAhwgACgCTCAAKAIsEBohASAAKAJQIAE2AhwLIAAgACgCRCAAKAIsazYCRCAAIAAoAiwgACgCTGo2AkwgACgCFA0aDAELIAAoAlAoAiQEQCAAKAJQKAIkQQA2AiQLCyAAKAJQQbz+ADYCBAsgACgCUCgCFEGABHEEQANAIAAoAjhBEEkEQCAAKAJERQ0aIAAgACgCREEBazYCRCAAIAAoAkwiAUEBajYCTCAAIAAoAjwgAS0AACAAKAI4dGo2AjwgACAAKAI4QQhqNgI4DAELCwJAIAAoAlAoAgxBBHFFDQAgACgCPCAAKAJQKAIcQf//A3FGDQAgACgCWEH7DDYCGCAAKAJQQdH+ADYCBAwaCyAAQQA2AjwgAEEANgI4CyAAKAJQKAIkBEAgACgCUCgCJCAAKAJQKAIUQQl1QQFxNgIsIAAoAlAoAiRBATYCMAtBAEEAQQAQGiEBIAAoAlAgATYCHCAAKAJYIAE2AjAgACgCUEG//gA2AgQMGAsDQCAAKAI4QSBJBEAgACgCREUNGCAAIAAoAkRBAWs2AkQgACAAKAJMIgFBAWo2AkwgACAAKAI8IAEtAAAgACgCOHRqNgI8IAAgACgCOEEIajYCOAwBCwsgACgCUCAAKAI8QQh2QYD+A3EgACgCPEEYdmogACgCPEGA/gNxQQh0aiAAKAI8Qf8BcUEYdGoiATYCHCAAKAJYIAE2AjAgAEEANgI8IABBADYCOCAAKAJQQb7+ADYCBAsgACgCUCgCEEUEQCAAKAJYIAAoAkg2AgwgACgCWCAAKAJANgIQIAAoAlggACgCTDYCACAAKAJYIAAoAkQ2AgQgACgCUCAAKAI8NgI8IAAoAlAgACgCODYCQCAAQQI2AlwMGAtBAEEAQQAQPSEBIAAoAlAgATYCHCAAKAJYIAE2AjAgACgCUEG//gA2AgQLIAAoAlRBBUYNFCAAKAJUQQZGDRQLIAAoAlAoAggEQCAAIAAoAjwgACgCOEEHcXY2AjwgACAAKAI4IAAoAjhBB3FrNgI4IAAoAlBBzv4ANgIEDBULA0AgACgCOEEDSQRAIAAoAkRFDRUgACAAKAJEQQFrNgJEIAAgACgCTCIBQQFqNgJMIAAgACgCPCABLQAAIAAoAjh0ajYCPCAAIAAoAjhBCGo2AjgMAQsLIAAoAlAgACgCPEEBcTYCCCAAIAAoAjxBAXY2AjwgACAAKAI4QQFrNgI4AkACQAJAAkACQCAAKAI8QQNxDgQAAQIDBAsgACgCUEHB/gA2AgQMAwsjAEEQayIBIAAoAlA2AgwgASgCDEGw8gA2AlAgASgCDEEJNgJYIAEoAgxBsIIBNgJUIAEoAgxBBTYCXCAAKAJQQcf+ADYCBCAAKAJUQQZGBEAgACAAKAI8QQJ2NgI8IAAgACgCOEECazYCOAwXCwwCCyAAKAJQQcT+ADYCBAwBCyAAKAJYQfANNgIYIAAoAlBB0f4ANgIECyAAIAAoAjxBAnY2AjwgACAAKAI4QQJrNgI4DBQLIAAgACgCPCAAKAI4QQdxdjYCPCAAIAAoAjggACgCOEEHcWs2AjgDQCAAKAI4QSBJBEAgACgCREUNFCAAIAAoAkRBAWs2AkQgACAAKAJMIgFBAWo2AkwgACAAKAI8IAEtAAAgACgCOHRqNgI8IAAgACgCOEEIajYCOAwBCwsgACgCPEH//wNxIAAoAjxBEHZB//8Dc0cEQCAAKAJYQaEKNgIYIAAoAlBB0f4ANgIEDBQLIAAoAlAgACgCPEH//wNxNgJEIABBADYCPCAAQQA2AjggACgCUEHC/gA2AgQgACgCVEEGRg0SCyAAKAJQQcP+ADYCBAsgACAAKAJQKAJENgIsIAAoAiwEQCAAKAIsIAAoAkRLBEAgACAAKAJENgIsCyAAKAIsIAAoAkBLBEAgACAAKAJANgIsCyAAKAIsRQ0RIAAoAkggACgCTCAAKAIsEBkaIAAgACgCRCAAKAIsazYCRCAAIAAoAiwgACgCTGo2AkwgACAAKAJAIAAoAixrNgJAIAAgACgCLCAAKAJIajYCSCAAKAJQIgEgASgCRCAAKAIsazYCRAwSCyAAKAJQQb/+ADYCBAwRCwNAIAAoAjhBDkkEQCAAKAJERQ0RIAAgACgCREEBazYCRCAAIAAoAkwiAUEBajYCTCAAIAAoAjwgAS0AACAAKAI4dGo2AjwgACAAKAI4QQhqNgI4DAELCyAAKAJQIAAoAjxBH3FBgQJqNgJkIAAgACgCPEEFdjYCPCAAIAAoAjhBBWs2AjggACgCUCAAKAI8QR9xQQFqNgJoIAAgACgCPEEFdjYCPCAAIAAoAjhBBWs2AjggACgCUCAAKAI8QQ9xQQRqNgJgIAAgACgCPEEEdjYCPCAAIAAoAjhBBGs2AjgCQCAAKAJQKAJkQZ4CTQRAIAAoAlAoAmhBHk0NAQsgACgCWEH9CTYCGCAAKAJQQdH+ADYCBAwRCyAAKAJQQQA2AmwgACgCUEHF/gA2AgQLA0AgACgCUCgCbCAAKAJQKAJgSQRAA0AgACgCOEEDSQRAIAAoAkRFDRIgACAAKAJEQQFrNgJEIAAgACgCTCIBQQFqNgJMIAAgACgCPCABLQAAIAAoAjh0ajYCPCAAIAAoAjhBCGo2AjgMAQsLIAAoAjxBB3EhAiAAKAJQQfQAaiEDIAAoAlAiBCgCbCEBIAQgAUEBajYCbCABQQF0QYDyAGovAQBBAXQgA2ogAjsBACAAIAAoAjxBA3Y2AjwgACAAKAI4QQNrNgI4DAELCwNAIAAoAlAoAmxBE0kEQCAAKAJQQfQAaiECIAAoAlAiAygCbCEBIAMgAUEBajYCbCABQQF0QYDyAGovAQBBAXQgAmpBADsBAAwBCwsgACgCUCAAKAJQQbQKajYCcCAAKAJQIAAoAlAoAnA2AlAgACgCUEEHNgJYIABBACAAKAJQQfQAakETIAAoAlBB8ABqIAAoAlBB2ABqIAAoAlBB9AVqEHU2AhAgACgCEARAIAAoAlhBhwk2AhggACgCUEHR/gA2AgQMEAsgACgCUEEANgJsIAAoAlBBxv4ANgIECwNAAkAgACgCUCgCbCAAKAJQKAJkIAAoAlAoAmhqTw0AA0ACQCAAIAAoAlAoAlAgACgCPEEBIAAoAlAoAlh0QQFrcUECdGooAQA2ASAgAC0AISAAKAI4TQ0AIAAoAkRFDREgACAAKAJEQQFrNgJEIAAgACgCTCIBQQFqNgJMIAAgACgCPCABLQAAIAAoAjh0ajYCPCAAIAAoAjhBCGo2AjgMAQsLAkAgAC8BIkEQSQRAIAAgACgCPCAALQAhdjYCPCAAIAAoAjggAC0AIWs2AjggAC8BIiECIAAoAlBB9ABqIQMgACgCUCIEKAJsIQEgBCABQQFqNgJsIAFBAXQgA2ogAjsBAAwBCwJAIAAvASJBEEYEQANAIAAoAjggAC0AIUECakkEQCAAKAJERQ0UIAAgACgCREEBazYCRCAAIAAoAkwiAUEBajYCTCAAIAAoAjwgAS0AACAAKAI4dGo2AjwgACAAKAI4QQhqNgI4DAELCyAAIAAoAjwgAC0AIXY2AjwgACAAKAI4IAAtACFrNgI4IAAoAlAoAmxFBEAgACgCWEHPCTYCGCAAKAJQQdH+ADYCBAwECyAAIAAoAlAgACgCUCgCbEEBdGovAXI2AhQgACAAKAI8QQNxQQNqNgIsIAAgACgCPEECdjYCPCAAIAAoAjhBAms2AjgMAQsCQCAALwEiQRFGBEADQCAAKAI4IAAtACFBA2pJBEAgACgCREUNFSAAIAAoAkRBAWs2AkQgACAAKAJMIgFBAWo2AkwgACAAKAI8IAEtAAAgACgCOHRqNgI8IAAgACgCOEEIajYCOAwBCwsgACAAKAI8IAAtACF2NgI8IAAgACgCOCAALQAhazYCOCAAQQA2AhQgACAAKAI8QQdxQQNqNgIsIAAgACgCPEEDdjYCPCAAIAAoAjhBA2s2AjgMAQsDQCAAKAI4IAAtACFBB2pJBEAgACgCREUNFCAAIAAoAkRBAWs2AkQgACAAKAJMIgFBAWo2AkwgACAAKAI8IAEtAAAgACgCOHRqNgI8IAAgACgCOEEIajYCOAwBCwsgACAAKAI8IAAtACF2NgI8IAAgACgCOCAALQAhazYCOCAAQQA2AhQgACAAKAI8Qf8AcUELajYCLCAAIAAoAjxBB3Y2AjwgACAAKAI4QQdrNgI4CwsgACgCUCgCbCAAKAIsaiAAKAJQKAJkIAAoAlAoAmhqSwRAIAAoAlhBzwk2AhggACgCUEHR/gA2AgQMAgsDQCAAIAAoAiwiAUEBazYCLCABBEAgACgCFCECIAAoAlBB9ABqIQMgACgCUCIEKAJsIQEgBCABQQFqNgJsIAFBAXQgA2ogAjsBAAwBCwsLDAELCyAAKAJQKAIEQdH+AEYNDiAAKAJQLwH0BEUEQCAAKAJYQfULNgIYIAAoAlBB0f4ANgIEDA8LIAAoAlAgACgCUEG0Cmo2AnAgACgCUCAAKAJQKAJwNgJQIAAoAlBBCTYCWCAAQQEgACgCUEH0AGogACgCUCgCZCAAKAJQQfAAaiAAKAJQQdgAaiAAKAJQQfQFahB1NgIQIAAoAhAEQCAAKAJYQesINgIYIAAoAlBB0f4ANgIEDA8LIAAoAlAgACgCUCgCcDYCVCAAKAJQQQY2AlwgAEECIAAoAlBB9ABqIAAoAlAoAmRBAXRqIAAoAlAoAmggACgCUEHwAGogACgCUEHcAGogACgCUEH0BWoQdTYCECAAKAIQBEAgACgCWEG5CTYCGCAAKAJQQdH+ADYCBAwPCyAAKAJQQcf+ADYCBCAAKAJUQQZGDQ0LIAAoAlBByP4ANgIECwJAIAAoAkRBBkkNACAAKAJAQYICSQ0AIAAoAlggACgCSDYCDCAAKAJYIAAoAkA2AhAgACgCWCAAKAJMNgIAIAAoAlggACgCRDYCBCAAKAJQIAAoAjw2AjwgACgCUCAAKAI4NgJAIAAoAjAhAiMAQeAAayIBIAAoAlg2AlwgASACNgJYIAEgASgCXCgCHDYCVCABIAEoAlwoAgA2AlAgASABKAJQIAEoAlwoAgRBBWtqNgJMIAEgASgCXCgCDDYCSCABIAEoAkggASgCWCABKAJcKAIQa2s2AkQgASABKAJIIAEoAlwoAhBBgQJrajYCQCABIAEoAlQoAiw2AjwgASABKAJUKAIwNgI4IAEgASgCVCgCNDYCNCABIAEoAlQoAjg2AjAgASABKAJUKAI8NgIsIAEgASgCVCgCQDYCKCABIAEoAlQoAlA2AiQgASABKAJUKAJUNgIgIAFBASABKAJUKAJYdEEBazYCHCABQQEgASgCVCgCXHRBAWs2AhgDQCABKAIoQQ9JBEAgASABKAJQIgJBAWo2AlAgASABKAIsIAItAAAgASgCKHRqNgIsIAEgASgCKEEIajYCKCABIAEoAlAiAkEBajYCUCABIAEoAiwgAi0AACABKAIodGo2AiwgASABKAIoQQhqNgIoCyABIAEoAiQgASgCLCABKAIccUECdGooAQA2ARACQAJAA0AgASABLQARNgIMIAEgASgCLCABKAIMdjYCLCABIAEoAiggASgCDGs2AiggASABLQAQNgIMIAEoAgxFBEAgAS8BEiECIAEgASgCSCIDQQFqNgJIIAMgAjoAAAwCCyABKAIMQRBxBEAgASABLwESNgIIIAEgASgCDEEPcTYCDCABKAIMBEAgASgCKCABKAIMSQRAIAEgASgCUCICQQFqNgJQIAEgASgCLCACLQAAIAEoAih0ajYCLCABIAEoAihBCGo2AigLIAEgASgCCCABKAIsQQEgASgCDHRBAWtxajYCCCABIAEoAiwgASgCDHY2AiwgASABKAIoIAEoAgxrNgIoCyABKAIoQQ9JBEAgASABKAJQIgJBAWo2AlAgASABKAIsIAItAAAgASgCKHRqNgIsIAEgASgCKEEIajYCKCABIAEoAlAiAkEBajYCUCABIAEoAiwgAi0AACABKAIodGo2AiwgASABKAIoQQhqNgIoCyABIAEoAiAgASgCLCABKAIYcUECdGooAQA2ARACQANAIAEgAS0AETYCDCABIAEoAiwgASgCDHY2AiwgASABKAIoIAEoAgxrNgIoIAEgAS0AEDYCDCABKAIMQRBxBEAgASABLwESNgIEIAEgASgCDEEPcTYCDCABKAIoIAEoAgxJBEAgASABKAJQIgJBAWo2AlAgASABKAIsIAItAAAgASgCKHRqNgIsIAEgASgCKEEIajYCKCABKAIoIAEoAgxJBEAgASABKAJQIgJBAWo2AlAgASABKAIsIAItAAAgASgCKHRqNgIsIAEgASgCKEEIajYCKAsLIAEgASgCBCABKAIsQQEgASgCDHRBAWtxajYCBCABIAEoAiwgASgCDHY2AiwgASABKAIoIAEoAgxrNgIoIAEgASgCSCABKAJEazYCDAJAIAEoAgQgASgCDEsEQCABIAEoAgQgASgCDGs2AgwgASgCDCABKAI4SwRAIAEoAlQoAsQ3BEAgASgCXEHdDDYCGCABKAJUQdH+ADYCBAwKCwsgASABKAIwNgIAAkAgASgCNEUEQCABIAEoAgAgASgCPCABKAIMa2o2AgAgASgCDCABKAIISQRAIAEgASgCCCABKAIMazYCCANAIAEgASgCACICQQFqNgIAIAItAAAhAiABIAEoAkgiA0EBajYCSCADIAI6AAAgASABKAIMQQFrIgI2AgwgAg0ACyABIAEoAkggASgCBGs2AgALDAELAkAgASgCNCABKAIMSQRAIAEgASgCACABKAI8IAEoAjRqIAEoAgxrajYCACABIAEoAgwgASgCNGs2AgwgASgCDCABKAIISQRAIAEgASgCCCABKAIMazYCCANAIAEgASgCACICQQFqNgIAIAItAAAhAiABIAEoAkgiA0EBajYCSCADIAI6AAAgASABKAIMQQFrIgI2AgwgAg0ACyABIAEoAjA2AgAgASgCNCABKAIISQRAIAEgASgCNDYCDCABIAEoAgggASgCDGs2AggDQCABIAEoAgAiAkEBajYCACACLQAAIQIgASABKAJIIgNBAWo2AkggAyACOgAAIAEgASgCDEEBayICNgIMIAINAAsgASABKAJIIAEoAgRrNgIACwsMAQsgASABKAIAIAEoAjQgASgCDGtqNgIAIAEoAgwgASgCCEkEQCABIAEoAgggASgCDGs2AggDQCABIAEoAgAiAkEBajYCACACLQAAIQIgASABKAJIIgNBAWo2AkggAyACOgAAIAEgASgCDEEBayICNgIMIAINAAsgASABKAJIIAEoAgRrNgIACwsLA0AgASgCCEECSwRAIAEgASgCACICQQFqNgIAIAItAAAhAiABIAEoAkgiA0EBajYCSCADIAI6AAAgASABKAIAIgJBAWo2AgAgAi0AACECIAEgASgCSCIDQQFqNgJIIAMgAjoAACABIAEoAgAiAkEBajYCACACLQAAIQIgASABKAJIIgNBAWo2AkggAyACOgAAIAEgASgCCEEDazYCCAwBCwsMAQsgASABKAJIIAEoAgRrNgIAA0AgASABKAIAIgJBAWo2AgAgAi0AACECIAEgASgCSCIDQQFqNgJIIAMgAjoAACABIAEoAgAiAkEBajYCACACLQAAIQIgASABKAJIIgNBAWo2AkggAyACOgAAIAEgASgCACICQQFqNgIAIAItAAAhAiABIAEoAkgiA0EBajYCSCADIAI6AAAgASABKAIIQQNrNgIIIAEoAghBAksNAAsLIAEoAggEQCABIAEoAgAiAkEBajYCACACLQAAIQIgASABKAJIIgNBAWo2AkggAyACOgAAIAEoAghBAUsEQCABIAEoAgAiAkEBajYCACACLQAAIQIgASABKAJIIgNBAWo2AkggAyACOgAACwsMAgsgASgCDEHAAHFFBEAgASABKAIgIAEvARIgASgCLEEBIAEoAgx0QQFrcWpBAnRqKAEANgEQDAELCyABKAJcQYUPNgIYIAEoAlRB0f4ANgIEDAQLDAILIAEoAgxBwABxRQRAIAEgASgCJCABLwESIAEoAixBASABKAIMdEEBa3FqQQJ0aigBADYBEAwBCwsgASgCDEEgcQRAIAEoAlRBv/4ANgIEDAILIAEoAlxB6Q42AhggASgCVEHR/gA2AgQMAQsgASgCUCABKAJMSQR/IAEoAkggASgCQEkFQQALQQFxDQELCyABIAEoAihBA3Y2AgggASABKAJQIAEoAghrNgJQIAEgASgCKCABKAIIQQN0azYCKCABIAEoAixBASABKAIodEEBa3E2AiwgASgCXCABKAJQNgIAIAEoAlwgASgCSDYCDCABKAJcAn8gASgCUCABKAJMSQRAIAEoAkwgASgCUGtBBWoMAQtBBSABKAJQIAEoAkxraws2AgQgASgCXAJ/IAEoAkggASgCQEkEQCABKAJAIAEoAkhrQYECagwBC0GBAiABKAJIIAEoAkBraws2AhAgASgCVCABKAIsNgI8IAEoAlQgASgCKDYCQCAAIAAoAlgoAgw2AkggACAAKAJYKAIQNgJAIAAgACgCWCgCADYCTCAAIAAoAlgoAgQ2AkQgACAAKAJQKAI8NgI8IAAgACgCUCgCQDYCOCAAKAJQKAIEQb/+AEYEQCAAKAJQQX82Asg3CwwNCyAAKAJQQQA2Asg3A0ACQCAAIAAoAlAoAlAgACgCPEEBIAAoAlAoAlh0QQFrcUECdGooAQA2ASAgAC0AISAAKAI4TQ0AIAAoAkRFDQ0gACAAKAJEQQFrNgJEIAAgACgCTCIBQQFqNgJMIAAgACgCPCABLQAAIAAoAjh0ajYCPCAAIAAoAjhBCGo2AjgMAQsLAkAgAC0AIEUNACAALQAgQfABcQ0AIAAgACgBIDYBGANAAkAgACAAKAJQKAJQIAAvARogACgCPEEBIAAtABkgAC0AGGp0QQFrcSAALQAZdmpBAnRqKAEANgEgIAAoAjggAC0AGSAALQAhak8NACAAKAJERQ0OIAAgACgCREEBazYCRCAAIAAoAkwiAUEBajYCTCAAIAAoAjwgAS0AACAAKAI4dGo2AjwgACAAKAI4QQhqNgI4DAELCyAAIAAoAjwgAC0AGXY2AjwgACAAKAI4IAAtABlrNgI4IAAoAlAiASAALQAZIAEoAsg3ajYCyDcLIAAgACgCPCAALQAhdjYCPCAAIAAoAjggAC0AIWs2AjggACgCUCIBIAAtACEgASgCyDdqNgLINyAAKAJQIAAvASI2AkQgAC0AIEUEQCAAKAJQQc3+ADYCBAwNCyAALQAgQSBxBEAgACgCUEF/NgLINyAAKAJQQb/+ADYCBAwNCyAALQAgQcAAcQRAIAAoAlhB6Q42AhggACgCUEHR/gA2AgQMDQsgACgCUCAALQAgQQ9xNgJMIAAoAlBByf4ANgIECyAAKAJQKAJMBEADQCAAKAI4IAAoAlAoAkxJBEAgACgCREUNDSAAIAAoAkRBAWs2AkQgACAAKAJMIgFBAWo2AkwgACAAKAI8IAEtAAAgACgCOHRqNgI8IAAgACgCOEEIajYCOAwBCwsgACgCUCIBIAEoAkQgACgCPEEBIAAoAlAoAkx0QQFrcWo2AkQgACAAKAI8IAAoAlAoAkx2NgI8IAAgACgCOCAAKAJQKAJMazYCOCAAKAJQIgEgACgCUCgCTCABKALIN2o2Asg3CyAAKAJQIAAoAlAoAkQ2Asw3IAAoAlBByv4ANgIECwNAAkAgACAAKAJQKAJUIAAoAjxBASAAKAJQKAJcdEEBa3FBAnRqKAEANgEgIAAtACEgACgCOE0NACAAKAJERQ0LIAAgACgCREEBazYCRCAAIAAoAkwiAUEBajYCTCAAIAAoAjwgAS0AACAAKAI4dGo2AjwgACAAKAI4QQhqNgI4DAELCyAALQAgQfABcUUEQCAAIAAoASA2ARgDQAJAIAAgACgCUCgCVCAALwEaIAAoAjxBASAALQAZIAAtABhqdEEBa3EgAC0AGXZqQQJ0aigBADYBICAAKAI4IAAtABkgAC0AIWpPDQAgACgCREUNDCAAIAAoAkRBAWs2AkQgACAAKAJMIgFBAWo2AkwgACAAKAI8IAEtAAAgACgCOHRqNgI8IAAgACgCOEEIajYCOAwBCwsgACAAKAI8IAAtABl2NgI8IAAgACgCOCAALQAZazYCOCAAKAJQIgEgAC0AGSABKALIN2o2Asg3CyAAIAAoAjwgAC0AIXY2AjwgACAAKAI4IAAtACFrNgI4IAAoAlAiASAALQAhIAEoAsg3ajYCyDcgAC0AIEHAAHEEQCAAKAJYQYUPNgIYIAAoAlBB0f4ANgIEDAsLIAAoAlAgAC8BIjYCSCAAKAJQIAAtACBBD3E2AkwgACgCUEHL/gA2AgQLIAAoAlAoAkwEQANAIAAoAjggACgCUCgCTEkEQCAAKAJERQ0LIAAgACgCREEBazYCRCAAIAAoAkwiAUEBajYCTCAAIAAoAjwgAS0AACAAKAI4dGo2AjwgACAAKAI4QQhqNgI4DAELCyAAKAJQIgEgASgCSCAAKAI8QQEgACgCUCgCTHRBAWtxajYCSCAAIAAoAjwgACgCUCgCTHY2AjwgACAAKAI4IAAoAlAoAkxrNgI4IAAoAlAiASAAKAJQKAJMIAEoAsg3ajYCyDcLIAAoAlBBzP4ANgIECyAAKAJARQ0HIAAgACgCMCAAKAJAazYCLAJAIAAoAlAoAkggACgCLEsEQCAAIAAoAlAoAkggACgCLGs2AiwgACgCLCAAKAJQKAIwSwRAIAAoAlAoAsQ3BEAgACgCWEHdDDYCGCAAKAJQQdH+ADYCBAwMCwsCQCAAKAIsIAAoAlAoAjRLBEAgACAAKAIsIAAoAlAoAjRrNgIsIAAgACgCUCgCOCAAKAJQKAIsIAAoAixrajYCKAwBCyAAIAAoAlAoAjggACgCUCgCNCAAKAIsa2o2AigLIAAoAiwgACgCUCgCREsEQCAAIAAoAlAoAkQ2AiwLDAELIAAgACgCSCAAKAJQKAJIazYCKCAAIAAoAlAoAkQ2AiwLIAAoAiwgACgCQEsEQCAAIAAoAkA2AiwLIAAgACgCQCAAKAIsazYCQCAAKAJQIgEgASgCRCAAKAIsazYCRANAIAAgACgCKCIBQQFqNgIoIAEtAAAhASAAIAAoAkgiAkEBajYCSCACIAE6AAAgACAAKAIsQQFrIgE2AiwgAQ0ACyAAKAJQKAJERQRAIAAoAlBByP4ANgIECwwICyAAKAJARQ0GIAAoAlAoAkQhASAAIAAoAkgiAkEBajYCSCACIAE6AAAgACAAKAJAQQFrNgJAIAAoAlBByP4ANgIEDAcLIAAoAlAoAgwEQANAIAAoAjhBIEkEQCAAKAJERQ0IIAAgACgCREEBazYCRCAAIAAoAkwiAUEBajYCTCAAIAAoAjwgAS0AACAAKAI4dGo2AjwgACAAKAI4QQhqNgI4DAELCyAAIAAoAjAgACgCQGs2AjAgACgCWCIBIAAoAjAgASgCFGo2AhQgACgCUCIBIAAoAjAgASgCIGo2AiACQCAAKAJQKAIMQQRxRQ0AIAAoAjBFDQACfyAAKAJQKAIUBEAgACgCUCgCHCAAKAJIIAAoAjBrIAAoAjAQGgwBCyAAKAJQKAIcIAAoAkggACgCMGsgACgCMBA9CyEBIAAoAlAgATYCHCAAKAJYIAE2AjALIAAgACgCQDYCMAJAIAAoAlAoAgxBBHFFDQACfyAAKAJQKAIUBEAgACgCPAwBCyAAKAI8QQh2QYD+A3EgACgCPEEYdmogACgCPEGA/gNxQQh0aiAAKAI8Qf8BcUEYdGoLIAAoAlAoAhxGDQAgACgCWEHIDDYCGCAAKAJQQdH+ADYCBAwICyAAQQA2AjwgAEEANgI4CyAAKAJQQc/+ADYCBAsCQCAAKAJQKAIMRQ0AIAAoAlAoAhRFDQADQCAAKAI4QSBJBEAgACgCREUNByAAIAAoAkRBAWs2AkQgACAAKAJMIgFBAWo2AkwgACAAKAI8IAEtAAAgACgCOHRqNgI8IAAgACgCOEEIajYCOAwBCwsgACgCPCAAKAJQKAIgRwRAIAAoAlhBsQw2AhggACgCUEHR/gA2AgQMBwsgAEEANgI8IABBADYCOAsgACgCUEHQ/gA2AgQLIABBATYCEAwDCyAAQX02AhAMAgsgAEF8NgJcDAMLIABBfjYCXAwCCwsgACgCWCAAKAJINgIMIAAoAlggACgCQDYCECAAKAJYIAAoAkw2AgAgACgCWCAAKAJENgIEIAAoAlAgACgCPDYCPCAAKAJQIAAoAjg2AkACQAJAIAAoAlAoAiwNACAAKAIwIAAoAlgoAhBGDQEgACgCUCgCBEHR/gBPDQEgACgCUCgCBEHO/gBJDQAgACgCVEEERg0BCwJ/IAAoAlghAiAAKAJYKAIMIQMgACgCMCAAKAJYKAIQayEEIwBBIGsiASQAIAEgAjYCGCABIAM2AhQgASAENgIQIAEgASgCGCgCHDYCDAJAIAEoAgwoAjhFBEAgASgCGCgCKEEBIAEoAgwoAih0QQEgASgCGCgCIBEBACECIAEoAgwgAjYCOCABKAIMKAI4RQRAIAFBATYCHAwCCwsgASgCDCgCLEUEQCABKAIMQQEgASgCDCgCKHQ2AiwgASgCDEEANgI0IAEoAgxBADYCMAsCQCABKAIQIAEoAgwoAixPBEAgASgCDCgCOCABKAIUIAEoAgwoAixrIAEoAgwoAiwQGRogASgCDEEANgI0IAEoAgwgASgCDCgCLDYCMAwBCyABIAEoAgwoAiwgASgCDCgCNGs2AgggASgCCCABKAIQSwRAIAEgASgCEDYCCAsgASgCDCgCOCABKAIMKAI0aiABKAIUIAEoAhBrIAEoAggQGRogASABKAIQIAEoAghrNgIQAkAgASgCEARAIAEoAgwoAjggASgCFCABKAIQayABKAIQEBkaIAEoAgwgASgCEDYCNCABKAIMIAEoAgwoAiw2AjAMAQsgASgCDCICIAEoAgggAigCNGo2AjQgASgCDCgCNCABKAIMKAIsRgRAIAEoAgxBADYCNAsgASgCDCgCMCABKAIMKAIsSQRAIAEoAgwiAiABKAIIIAIoAjBqNgIwCwsLIAFBADYCHAsgASgCHCECIAFBIGokACACCwRAIAAoAlBB0v4ANgIEIABBfDYCXAwCCwsgACAAKAI0IAAoAlgoAgRrNgI0IAAgACgCMCAAKAJYKAIQazYCMCAAKAJYIgEgACgCNCABKAIIajYCCCAAKAJYIgEgACgCMCABKAIUajYCFCAAKAJQIgEgACgCMCABKAIgajYCIAJAIAAoAlAoAgxBBHFFDQAgACgCMEUNAAJ/IAAoAlAoAhQEQCAAKAJQKAIcIAAoAlgoAgwgACgCMGsgACgCMBAaDAELIAAoAlAoAhwgACgCWCgCDCAAKAIwayAAKAIwED0LIQEgACgCUCABNgIcIAAoAlggATYCMAsgACgCWCAAKAJQKAJAQcAAQQAgACgCUCgCCBtqQYABQQAgACgCUCgCBEG//gBGG2pBgAJBACAAKAJQKAIEQcf+AEcEfyAAKAJQKAIEQcL+AEYFQQELQQFxG2o2AiwCQAJAIAAoAjRFBEAgACgCMEUNAQsgACgCVEEERw0BCyAAKAIQDQAgAEF7NgIQCyAAIAAoAhA2AlwLIAAoAlwhASAAQeAAaiQAIAUgATYCCAsgBSgCECIAIAApAwAgBSgCDDUCIH03AwACQAJAAkACQAJAIAUoAghBBWoOBwIDAwMDAAEDCyAFQQA2AhwMAwsgBUEBNgIcDAILIAUoAgwoAhRFBEAgBUEDNgIcDAILCyAFKAIMKAIAQQ0gBSgCCBAUIAVBAjYCHAsgBSgCHCEAIAVBIGokACAACyQBAX8jAEEQayIBIAA2AgwgASABKAIMNgIIIAEoAghBAToADAuXAQEBfyMAQSBrIgMkACADIAA2AhggAyABNgIUIAMgAjcDCCADIAMoAhg2AgQCQAJAIAMpAwhC/////w9YBEAgAygCBCgCFEUNAQsgAygCBCgCAEESQQAQFCADQQA6AB8MAQsgAygCBCADKQMIPgIUIAMoAgQgAygCFDYCECADQQE6AB8LIAMtAB9BAXEhACADQSBqJAAgAAukAgECfyMAQRBrIgEkACABIAA2AgggASABKAIINgIEAkAgASgCBC0ABEEBcQRAIAEgASgCBEEQahC4ATYCAAwBCyABKAIEQRBqIQIjAEEQayIAJAAgACACNgIIAkAgACgCCBBKBEAgAEF+NgIMDAELIAAgACgCCCgCHDYCBCAAKAIEKAI4BEAgACgCCCgCKCAAKAIEKAI4IAAoAggoAiQRBAALIAAoAggoAiggACgCCCgCHCAAKAIIKAIkEQQAIAAoAghBADYCHCAAQQA2AgwLIAAoAgwhAiAAQRBqJAAgASACNgIACwJAIAEoAgAEQCABKAIEKAIAQQ0gASgCABAUIAFBADoADwwBCyABQQE6AA8LIAEtAA9BAXEhACABQRBqJAAgAAuyGAEFfyMAQRBrIgQkACAEIAA2AgggBCAEKAIINgIEIAQoAgRBADYCFCAEKAIEQQA2AhAgBCgCBEEANgIgIAQoAgRBADYCHAJAIAQoAgQtAARBAXEEQCAEKAIEQRBqIQEgBCgCBCgCCCECIwBBMGsiACQAIAAgATYCKCAAIAI2AiQgAEEINgIgIABBcTYCHCAAQQk2AhggAEEANgIUIABBwBI2AhAgAEE4NgIMIABBATYCBAJAAkACQCAAKAIQRQ0AIAAoAhAsAABB+O4ALAAARw0AIAAoAgxBOEYNAQsgAEF6NgIsDAELIAAoAihFBEAgAEF+NgIsDAELIAAoAihBADYCGCAAKAIoKAIgRQRAIAAoAihBBTYCICAAKAIoQQA2AigLIAAoAigoAiRFBEAgACgCKEEGNgIkCyAAKAIkQX9GBEAgAEEGNgIkCwJAIAAoAhxBAEgEQCAAQQA2AgQgAEEAIAAoAhxrNgIcDAELIAAoAhxBD0oEQCAAQQI2AgQgACAAKAIcQRBrNgIcCwsCQAJAIAAoAhhBAUgNACAAKAIYQQlKDQAgACgCIEEIRw0AIAAoAhxBCEgNACAAKAIcQQ9KDQAgACgCJEEASA0AIAAoAiRBCUoNACAAKAIUQQBIDQAgACgCFEEESg0AIAAoAhxBCEcNASAAKAIEQQFGDQELIABBfjYCLAwBCyAAKAIcQQhGBEAgAEEJNgIcCyAAIAAoAigoAihBAUHELSAAKAIoKAIgEQEANgIIIAAoAghFBEAgAEF8NgIsDAELIAAoAiggACgCCDYCHCAAKAIIIAAoAig2AgAgACgCCEEqNgIEIAAoAgggACgCBDYCGCAAKAIIQQA2AhwgACgCCCAAKAIcNgIwIAAoAghBASAAKAIIKAIwdDYCLCAAKAIIIAAoAggoAixBAWs2AjQgACgCCCAAKAIYQQdqNgJQIAAoAghBASAAKAIIKAJQdDYCTCAAKAIIIAAoAggoAkxBAWs2AlQgACgCCCAAKAIIKAJQQQJqQQNuNgJYIAAoAigoAiggACgCCCgCLEECIAAoAigoAiARAQAhASAAKAIIIAE2AjggACgCKCgCKCAAKAIIKAIsQQIgACgCKCgCIBEBACEBIAAoAgggATYCQCAAKAIoKAIoIAAoAggoAkxBAiAAKAIoKAIgEQEAIQEgACgCCCABNgJEIAAoAghBADYCwC0gACgCCEEBIAAoAhhBBmp0NgKcLSAAIAAoAigoAiggACgCCCgCnC1BBCAAKAIoKAIgEQEANgIAIAAoAgggACgCADYCCCAAKAIIIAAoAggoApwtQQJ0NgIMAkACQCAAKAIIKAI4RQ0AIAAoAggoAkBFDQAgACgCCCgCREUNACAAKAIIKAIIDQELIAAoAghBmgU2AgQgACgCKEG42QAoAgA2AhggACgCKBC4ARogAEF8NgIsDAELIAAoAgggACgCACAAKAIIKAKcLUEBdkEBdGo2AqQtIAAoAgggACgCCCgCCCAAKAIIKAKcLUEDbGo2ApgtIAAoAgggACgCJDYChAEgACgCCCAAKAIUNgKIASAAKAIIIAAoAiA6ACQgACgCKCEBIwBBEGsiAyQAIAMgATYCDCADKAIMIQIjAEEQayIBJAAgASACNgIIAkAgASgCCBB4BEAgAUF+NgIMDAELIAEoAghBADYCFCABKAIIQQA2AgggASgCCEEANgIYIAEoAghBAjYCLCABIAEoAggoAhw2AgQgASgCBEEANgIUIAEoAgQgASgCBCgCCDYCECABKAIEKAIYQQBIBEAgASgCBEEAIAEoAgQoAhhrNgIYCyABKAIEIAEoAgQoAhhBAkYEf0E5BUEqQfEAIAEoAgQoAhgbCzYCBAJ/IAEoAgQoAhhBAkYEQEEAQQBBABAaDAELQQBBAEEAED0LIQIgASgCCCACNgIwIAEoAgRBADYCKCABKAIEIQUjAEEQayICJAAgAiAFNgIMIAIoAgwgAigCDEGUAWo2ApgWIAIoAgxB0N8ANgKgFiACKAIMIAIoAgxBiBNqNgKkFiACKAIMQeTfADYCrBYgAigCDCACKAIMQfwUajYCsBYgAigCDEH43wA2ArgWIAIoAgxBADsBuC0gAigCDEEANgK8LSACKAIMEL4BIAJBEGokACABQQA2AgwLIAEoAgwhAiABQRBqJAAgAyACNgIIIAMoAghFBEAgAygCDCgCHCECIwBBEGsiASQAIAEgAjYCDCABKAIMIAEoAgwoAixBAXQ2AjwgASgCDCgCRCABKAIMKAJMQQFrQQF0akEAOwEAIAEoAgwoAkRBACABKAIMKAJMQQFrQQF0EDMgASgCDCABKAIMKAKEAUEMbEGA7wBqLwECNgKAASABKAIMIAEoAgwoAoQBQQxsQYDvAGovAQA2AowBIAEoAgwgASgCDCgChAFBDGxBgO8Aai8BBDYCkAEgASgCDCABKAIMKAKEAUEMbEGA7wBqLwEGNgJ8IAEoAgxBADYCbCABKAIMQQA2AlwgASgCDEEANgJ0IAEoAgxBADYCtC0gASgCDEECNgJ4IAEoAgxBAjYCYCABKAIMQQA2AmggASgCDEEANgJIIAFBEGokAAsgAygCCCEBIANBEGokACAAIAE2AiwLIAAoAiwhASAAQTBqJAAgBCABNgIADAELIAQoAgRBEGohASMAQSBrIgAkACAAIAE2AhggAEFxNgIUIABBwBI2AhAgAEE4NgIMAkACQAJAIAAoAhBFDQAgACgCECwAAEHAEiwAAEcNACAAKAIMQThGDQELIABBejYCHAwBCyAAKAIYRQRAIABBfjYCHAwBCyAAKAIYQQA2AhggACgCGCgCIEUEQCAAKAIYQQU2AiAgACgCGEEANgIoCyAAKAIYKAIkRQRAIAAoAhhBBjYCJAsgACAAKAIYKAIoQQFB0DcgACgCGCgCIBEBADYCBCAAKAIERQRAIABBfDYCHAwBCyAAKAIYIAAoAgQ2AhwgACgCBCAAKAIYNgIAIAAoAgRBADYCOCAAKAIEQbT+ADYCBCAAKAIYIQIgACgCFCEDIwBBIGsiASQAIAEgAjYCGCABIAM2AhQCQCABKAIYEEoEQCABQX42AhwMAQsgASABKAIYKAIcNgIMAkAgASgCFEEASARAIAFBADYCECABQQAgASgCFGs2AhQMAQsgASABKAIUQQR1QQVqNgIQIAEoAhRBMEgEQCABIAEoAhRBD3E2AhQLCwJAIAEoAhRFDQAgASgCFEEITgRAIAEoAhRBD0wNAQsgAUF+NgIcDAELAkAgASgCDCgCOEUNACABKAIMKAIoIAEoAhRGDQAgASgCGCgCKCABKAIMKAI4IAEoAhgoAiQRBAAgASgCDEEANgI4CyABKAIMIAEoAhA2AgwgASgCDCABKAIUNgIoIAEoAhghAiMAQRBrIgMkACADIAI2AggCQCADKAIIEEoEQCADQX42AgwMAQsgAyADKAIIKAIcNgIEIAMoAgRBADYCLCADKAIEQQA2AjAgAygCBEEANgI0IAMoAgghBSMAQRBrIgIkACACIAU2AggCQCACKAIIEEoEQCACQX42AgwMAQsgAiACKAIIKAIcNgIEIAIoAgRBADYCICACKAIIQQA2AhQgAigCCEEANgIIIAIoAghBADYCGCACKAIEKAIMBEAgAigCCCACKAIEKAIMQQFxNgIwCyACKAIEQbT+ADYCBCACKAIEQQA2AgggAigCBEEANgIQIAIoAgRBgIACNgIYIAIoAgRBADYCJCACKAIEQQA2AjwgAigCBEEANgJAIAIoAgQgAigCBEG0CmoiBTYCcCACKAIEIAU2AlQgAigCBCAFNgJQIAIoAgRBATYCxDcgAigCBEF/NgLINyACQQA2AgwLIAIoAgwhBSACQRBqJAAgAyAFNgIMCyADKAIMIQIgA0EQaiQAIAEgAjYCHAsgASgCHCECIAFBIGokACAAIAI2AgggACgCCARAIAAoAhgoAiggACgCBCAAKAIYKAIkEQQAIAAoAhhBADYCHAsgACAAKAIINgIcCyAAKAIcIQEgAEEgaiQAIAQgATYCAAsCQCAEKAIABEAgBCgCBCgCAEENIAQoAgAQFCAEQQA6AA8MAQsgBEEBOgAPCyAELQAPQQFxIQAgBEEQaiQAIAALbwEBfyMAQRBrIgEgADYCCCABIAEoAgg2AgQCQCABKAIELQAEQQFxRQRAIAFBADYCDAwBCyABKAIEKAIIQQNIBEAgAUECNgIMDAELIAEoAgQoAghBB0oEQCABQQE2AgwMAQsgAUEANgIMCyABKAIMCywBAX8jAEEQayIBJAAgASAANgIMIAEgASgCDDYCCCABKAIIEBUgAUEQaiQACzwBAX8jAEEQayIDJAAgAyAAOwEOIAMgATYCCCADIAI2AgRBASADKAIIIAMoAgQQtAEhACADQRBqJAAgAAvBEAECfyMAQSBrIgIkACACIAA2AhggAiABNgIUAkADQAJAIAIoAhgoAnRBhgJJBEAgAigCGBBcAkAgAigCGCgCdEGGAk8NACACKAIUDQAgAkEANgIcDAQLIAIoAhgoAnRFDQELIAJBADYCECACKAIYKAJ0QQNPBEAgAigCGCACKAIYKAJUIAIoAhgoAjggAigCGCgCbEECamotAAAgAigCGCgCSCACKAIYKAJYdHNxNgJIIAIoAhgoAkAgAigCGCgCbCACKAIYKAI0cUEBdGogAigCGCgCRCACKAIYKAJIQQF0ai8BACIAOwEAIAIgAEH//wNxNgIQIAIoAhgoAkQgAigCGCgCSEEBdGogAigCGCgCbDsBAAsgAigCGCACKAIYKAJgNgJ4IAIoAhggAigCGCgCcDYCZCACKAIYQQI2AmACQCACKAIQRQ0AIAIoAhgoAnggAigCGCgCgAFPDQAgAigCGCgCLEGGAmsgAigCGCgCbCACKAIQa0kNACACKAIYIAIoAhAQtgEhACACKAIYIAA2AmACQCACKAIYKAJgQQVLDQAgAigCGCgCiAFBAUcEQCACKAIYKAJgQQNHDQEgAigCGCgCbCACKAIYKAJwa0GAIE0NAQsgAigCGEECNgJgCwsCQAJAIAIoAhgoAnhBA0kNACACKAIYKAJgIAIoAhgoAnhLDQAgAiACKAIYIgAoAmwgACgCdGpBA2s2AgggAiACKAIYKAJ4QQNrOgAHIAIgAigCGCIAKAJsIAAoAmRBf3NqOwEEIAIoAhgiACgCpC0gACgCoC1BAXRqIAIvAQQ7AQAgAi0AByEBIAIoAhgiACgCmC0hAyAAIAAoAqAtIgBBAWo2AqAtIAAgA2ogAToAACACIAIvAQRBAWs7AQQgAigCGCACLQAHQdDdAGotAABBAnRqQZgJaiIAIAAvAQBBAWo7AQAgAigCGEGIE2oCfyACLwEEQYACSQRAIAIvAQQtANBZDAELIAIvAQRBB3ZBgAJqLQDQWQtBAnRqIgAgAC8BAEEBajsBACACIAIoAhgoAqAtIAIoAhgoApwtQQFrRjYCDCACKAIYIgAgACgCdCACKAIYKAJ4QQFrazYCdCACKAIYIgAgACgCeEECazYCeANAIAIoAhgiASgCbEEBaiEAIAEgADYCbCAAIAIoAghNBEAgAigCGCACKAIYKAJUIAIoAhgoAjggAigCGCgCbEECamotAAAgAigCGCgCSCACKAIYKAJYdHNxNgJIIAIoAhgoAkAgAigCGCgCbCACKAIYKAI0cUEBdGogAigCGCgCRCACKAIYKAJIQQF0ai8BACIAOwEAIAIgAEH//wNxNgIQIAIoAhgoAkQgAigCGCgCSEEBdGogAigCGCgCbDsBAAsgAigCGCIBKAJ4QQFrIQAgASAANgJ4IAANAAsgAigCGEEANgJoIAIoAhhBAjYCYCACKAIYIgAgACgCbEEBajYCbCACKAIMBEAgAigCGAJ/IAIoAhgoAlxBAE4EQCACKAIYKAI4IAIoAhgoAlxqDAELQQALIAIoAhgoAmwgAigCGCgCXGtBABAoIAIoAhggAigCGCgCbDYCXCACKAIYKAIAEBwgAigCGCgCACgCEEUEQCACQQA2AhwMBgsLDAELAkAgAigCGCgCaARAIAIgAigCGCIAKAI4IAAoAmxqQQFrLQAAOgADIAIoAhgiACgCpC0gACgCoC1BAXRqQQA7AQAgAi0AAyEBIAIoAhgiACgCmC0hAyAAIAAoAqAtIgBBAWo2AqAtIAAgA2ogAToAACACKAIYIAItAANBAnRqIgAgAC8BlAFBAWo7AZQBIAIgAigCGCgCoC0gAigCGCgCnC1BAWtGNgIMIAIoAgwEQCACKAIYAn8gAigCGCgCXEEATgRAIAIoAhgoAjggAigCGCgCXGoMAQtBAAsgAigCGCgCbCACKAIYKAJca0EAECggAigCGCACKAIYKAJsNgJcIAIoAhgoAgAQHAsgAigCGCIAIAAoAmxBAWo2AmwgAigCGCIAIAAoAnRBAWs2AnQgAigCGCgCACgCEEUEQCACQQA2AhwMBgsMAQsgAigCGEEBNgJoIAIoAhgiACAAKAJsQQFqNgJsIAIoAhgiACAAKAJ0QQFrNgJ0CwsMAQsLIAIoAhgoAmgEQCACIAIoAhgiACgCOCAAKAJsakEBay0AADoAAiACKAIYIgAoAqQtIAAoAqAtQQF0akEAOwEAIAItAAIhASACKAIYIgAoApgtIQMgACAAKAKgLSIAQQFqNgKgLSAAIANqIAE6AAAgAigCGCACLQACQQJ0aiIAIAAvAZQBQQFqOwGUASACIAIoAhgoAqAtIAIoAhgoApwtQQFrRjYCDCACKAIYQQA2AmgLIAIoAhgCfyACKAIYKAJsQQJJBEAgAigCGCgCbAwBC0ECCzYCtC0gAigCFEEERgRAIAIoAhgCfyACKAIYKAJcQQBOBEAgAigCGCgCOCACKAIYKAJcagwBC0EACyACKAIYKAJsIAIoAhgoAlxrQQEQKCACKAIYIAIoAhgoAmw2AlwgAigCGCgCABAcIAIoAhgoAgAoAhBFBEAgAkECNgIcDAILIAJBAzYCHAwBCyACKAIYKAKgLQRAIAIoAhgCfyACKAIYKAJcQQBOBEAgAigCGCgCOCACKAIYKAJcagwBC0EACyACKAIYKAJsIAIoAhgoAlxrQQAQKCACKAIYIAIoAhgoAmw2AlwgAigCGCgCABAcIAIoAhgoAgAoAhBFBEAgAkEANgIcDAILCyACQQE2AhwLIAIoAhwhACACQSBqJAAgAAuVDQECfyMAQSBrIgIkACACIAA2AhggAiABNgIUAkADQAJAIAIoAhgoAnRBhgJJBEAgAigCGBBcAkAgAigCGCgCdEGGAk8NACACKAIUDQAgAkEANgIcDAQLIAIoAhgoAnRFDQELIAJBADYCECACKAIYKAJ0QQNPBEAgAigCGCACKAIYKAJUIAIoAhgoAjggAigCGCgCbEECamotAAAgAigCGCgCSCACKAIYKAJYdHNxNgJIIAIoAhgoAkAgAigCGCgCbCACKAIYKAI0cUEBdGogAigCGCgCRCACKAIYKAJIQQF0ai8BACIAOwEAIAIgAEH//wNxNgIQIAIoAhgoAkQgAigCGCgCSEEBdGogAigCGCgCbDsBAAsCQCACKAIQRQ0AIAIoAhgoAixBhgJrIAIoAhgoAmwgAigCEGtJDQAgAigCGCACKAIQELYBIQAgAigCGCAANgJgCwJAIAIoAhgoAmBBA08EQCACIAIoAhgoAmBBA2s6AAsgAiACKAIYIgAoAmwgACgCcGs7AQggAigCGCIAKAKkLSAAKAKgLUEBdGogAi8BCDsBACACLQALIQEgAigCGCIAKAKYLSEDIAAgACgCoC0iAEEBajYCoC0gACADaiABOgAAIAIgAi8BCEEBazsBCCACKAIYIAItAAtB0N0Aai0AAEECdGpBmAlqIgAgAC8BAEEBajsBACACKAIYQYgTagJ/IAIvAQhBgAJJBEAgAi8BCC0A0FkMAQsgAi8BCEEHdkGAAmotANBZC0ECdGoiACAALwEAQQFqOwEAIAIgAigCGCgCoC0gAigCGCgCnC1BAWtGNgIMIAIoAhgiACAAKAJ0IAIoAhgoAmBrNgJ0AkACQCACKAIYKAJgIAIoAhgoAoABSw0AIAIoAhgoAnRBA0kNACACKAIYIgAgACgCYEEBazYCYANAIAIoAhgiACAAKAJsQQFqNgJsIAIoAhggAigCGCgCVCACKAIYKAI4IAIoAhgoAmxBAmpqLQAAIAIoAhgoAkggAigCGCgCWHRzcTYCSCACKAIYKAJAIAIoAhgoAmwgAigCGCgCNHFBAXRqIAIoAhgoAkQgAigCGCgCSEEBdGovAQAiADsBACACIABB//8DcTYCECACKAIYKAJEIAIoAhgoAkhBAXRqIAIoAhgoAmw7AQAgAigCGCIBKAJgQQFrIQAgASAANgJgIAANAAsgAigCGCIAIAAoAmxBAWo2AmwMAQsgAigCGCIAIAIoAhgoAmAgACgCbGo2AmwgAigCGEEANgJgIAIoAhggAigCGCgCOCACKAIYKAJsai0AADYCSCACKAIYIAIoAhgoAlQgAigCGCgCOCACKAIYKAJsQQFqai0AACACKAIYKAJIIAIoAhgoAlh0c3E2AkgLDAELIAIgAigCGCIAKAI4IAAoAmxqLQAAOgAHIAIoAhgiACgCpC0gACgCoC1BAXRqQQA7AQAgAi0AByEBIAIoAhgiACgCmC0hAyAAIAAoAqAtIgBBAWo2AqAtIAAgA2ogAToAACACKAIYIAItAAdBAnRqIgAgAC8BlAFBAWo7AZQBIAIgAigCGCgCoC0gAigCGCgCnC1BAWtGNgIMIAIoAhgiACAAKAJ0QQFrNgJ0IAIoAhgiACAAKAJsQQFqNgJsCyACKAIMBEAgAigCGAJ/IAIoAhgoAlxBAE4EQCACKAIYKAI4IAIoAhgoAlxqDAELQQALIAIoAhgoAmwgAigCGCgCXGtBABAoIAIoAhggAigCGCgCbDYCXCACKAIYKAIAEBwgAigCGCgCACgCEEUEQCACQQA2AhwMBAsLDAELCyACKAIYAn8gAigCGCgCbEECSQRAIAIoAhgoAmwMAQtBAgs2ArQtIAIoAhRBBEYEQCACKAIYAn8gAigCGCgCXEEATgRAIAIoAhgoAjggAigCGCgCXGoMAQtBAAsgAigCGCgCbCACKAIYKAJca0EBECggAigCGCACKAIYKAJsNgJcIAIoAhgoAgAQHCACKAIYKAIAKAIQRQRAIAJBAjYCHAwCCyACQQM2AhwMAQsgAigCGCgCoC0EQCACKAIYAn8gAigCGCgCXEEATgRAIAIoAhgoAjggAigCGCgCXGoMAQtBAAsgAigCGCgCbCACKAIYKAJca0EAECggAigCGCACKAIYKAJsNgJcIAIoAhgoAgAQHCACKAIYKAIAKAIQRQRAIAJBADYCHAwCCwsgAkEBNgIcCyACKAIcIQAgAkEgaiQAIAALBwAgAC8BMAspAQF/IwBBEGsiAiQAIAIgADYCDCACIAE2AgggAigCCBAVIAJBEGokAAs6AQF/IwBBEGsiAyQAIAMgADYCDCADIAE2AgggAyACNgIEIAMoAgggAygCBGwQGCEAIANBEGokACAAC84FAQF/IwBB0ABrIgUkACAFIAA2AkQgBSABNgJAIAUgAjYCPCAFIAM3AzAgBSAENgIsIAUgBSgCQDYCKAJAAkACQAJAAkACQAJAAkACQCAFKAIsDg8AAQIDBQYHBwcHBwcHBwQHCwJ/IAUoAkQhASAFKAIoIQIjAEHgAGsiACQAIAAgATYCWCAAIAI2AlQgACAAKAJYIABByABqQgwQKyIDNwMIAkAgA0IAUwRAIAAoAlQgACgCWBAXIABBfzYCXAwBCyAAKQMIQgxSBEAgACgCVEERQQAQFCAAQX82AlwMAQsgACgCVCAAQcgAaiAAQcgAakIMQQAQfCAAKAJYIABBEGoQOUEASARAIABBADYCXAwBCyAAKAI4IABBBmogAEEEahCNAQJAIAAtAFMgACgCPEEYdkYNACAALQBTIAAvAQZBCHZGDQAgACgCVEEbQQAQFCAAQX82AlwMAQsgAEEANgJcCyAAKAJcIQEgAEHgAGokACABQQBICwRAIAVCfzcDSAwICyAFQgA3A0gMBwsgBSAFKAJEIAUoAjwgBSkDMBArIgM3AyAgA0IAUwRAIAUoAiggBSgCRBAXIAVCfzcDSAwHCyAFKAJAIAUoAjwgBSgCPCAFKQMgQQAQfCAFIAUpAyA3A0gMBgsgBUIANwNIDAULIAUgBSgCPDYCHCAFKAIcQQA7ATIgBSgCHCIAIAApAwBCgAGENwMAIAUoAhwpAwBCCINCAFIEQCAFKAIcIgAgACkDIEIMfTcDIAsgBUIANwNIDAQLIAVBfzYCFCAFQQU2AhAgBUEENgIMIAVBAzYCCCAFQQI2AgQgBUEBNgIAIAVBACAFEDQ3A0gMAwsgBSAFKAIoIAUoAjwgBSkDMBBDNwNIDAILIAUoAigQvwEgBUIANwNIDAELIAUoAihBEkEAEBQgBUJ/NwNICyAFKQNIIQMgBUHQAGokACADC+4CAQF/IwBBIGsiBSQAIAUgADYCGCAFIAE2AhQgBSACOwESIAUgAzYCDCAFIAQ2AggCQAJAAkAgBSgCCEUNACAFKAIURQ0AIAUvARJBAUYNAQsgBSgCGEEIakESQQAQFCAFQQA2AhwMAQsgBSgCDEEBcQRAIAUoAhhBCGpBGEEAEBQgBUEANgIcDAELIAVBGBAYIgA2AgQgAEUEQCAFKAIYQQhqQQ5BABAUIAVBADYCHAwBCyMAQRBrIgAgBSgCBDYCDCAAKAIMQQA2AgAgACgCDEEANgIEIAAoAgxBADYCCCAFKAIEQfis0ZEBNgIMIAUoAgRBic+VmgI2AhAgBSgCBEGQ8dmiAzYCFCAFKAIEQQAgBSgCCCAFKAIIEC6tQQEQfCAFIAUoAhggBSgCFEEDIAUoAgQQYSIANgIAIABFBEAgBSgCBBC/ASAFQQA2AhwMAQsgBSAFKAIANgIcCyAFKAIcIQAgBUEgaiQAIAALBwAgACgCIAu9GAECfyMAQfAAayIEJAAgBCAANgJkIAQgATYCYCAEIAI3A1ggBCADNgJUIAQgBCgCZDYCUAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkAgBCgCVA4UBgcCDAQFCg8AAwkRCxAOCBIBEg0SC0EAQgBBACAEKAJQEEwhACAEKAJQIAA2AhQgAEUEQCAEQn83A2gMEwsgBCgCUCgCFEIANwM4IAQoAlAoAhRCADcDQCAEQgA3A2gMEgsgBCgCUCgCECEBIAQpA1ghAiAEKAJQIQMjAEFAaiIAJAAgACABNgI4IAAgAjcDMCAAIAM2AiwCQCAAKQMwUARAIABBAEIAQQEgACgCLBBMNgI8DAELIAApAzAgACgCOCkDMFYEQCAAKAIsQRJBABAUIABBADYCPAwBCyAAKAI4KAIoBEAgACgCLEEdQQAQFCAAQQA2AjwMAQsgACAAKAI4IAApAzAQwAE3AyAgACAAKQMwIAAoAjgoAgQgACkDIKdBA3RqKQMAfTcDGCAAKQMYUARAIAAgACkDIEIBfTcDICAAIAAoAjgoAgAgACkDIKdBBHRqKQMINwMYCyAAIAAoAjgoAgAgACkDIKdBBHRqKQMIIAApAxh9NwMQIAApAxAgACkDMFYEQCAAKAIsQRxBABAUIABBADYCPAwBCyAAIAAoAjgoAgAgACkDIEIBfEEAIAAoAiwQTCIBNgIMIAFFBEAgAEEANgI8DAELIAAoAgwoAgAgACgCDCkDCEIBfadBBHRqIAApAxg3AwggACgCDCgCBCAAKAIMKQMIp0EDdGogACkDMDcDACAAKAIMIAApAzA3AzAgACgCDAJ+IAAoAjgpAxggACgCDCkDCEIBfVQEQCAAKAI4KQMYDAELIAAoAgwpAwhCAX0LNwMYIAAoAjggACgCDDYCKCAAKAIMIAAoAjg2AiggACgCOCAAKAIMKQMINwMgIAAoAgwgACkDIEIBfDcDICAAIAAoAgw2AjwLIAAoAjwhASAAQUBrJAAgASEAIAQoAlAgADYCFCAARQRAIARCfzcDaAwSCyAEKAJQKAIUIAQpA1g3AzggBCgCUCgCFCAEKAJQKAIUKQMINwNAIARCADcDaAwRCyAEQgA3A2gMEAsgBCgCUCgCEBAyIAQoAlAgBCgCUCgCFDYCECAEKAJQQQA2AhQgBEIANwNoDA8LIAQgBCgCUCAEKAJgIAQpA1gQQzcDaAwOCyAEKAJQKAIQEDIgBCgCUCgCFBAyIAQoAlAQFSAEQgA3A2gMDQsgBCgCUCgCEEIANwM4IAQoAlAoAhBCADcDQCAEQgA3A2gMDAsgBCkDWEL///////////8AVgRAIAQoAlBBEkEAEBQgBEJ/NwNoDAwLIAQoAlAoAhAhASAEKAJgIQMgBCkDWCECIwBBQGoiACQAIAAgATYCNCAAIAM2AjAgACACNwMoIAACfiAAKQMoIAAoAjQpAzAgACgCNCkDOH1UBEAgACkDKAwBCyAAKAI0KQMwIAAoAjQpAzh9CzcDKAJAIAApAyhQBEAgAEIANwM4DAELIAApAyhC////////////AFYEQCAAQn83AzgMAQsgACAAKAI0KQNANwMYIAAgACgCNCkDOCAAKAI0KAIEIAApAxinQQN0aikDAH03AxAgAEIANwMgA0AgACkDICAAKQMoVARAIAACfiAAKQMoIAApAyB9IAAoAjQoAgAgACkDGKdBBHRqKQMIIAApAxB9VARAIAApAyggACkDIH0MAQsgACgCNCgCACAAKQMYp0EEdGopAwggACkDEH0LNwMIIAAoAjAgACkDIKdqIAAoAjQoAgAgACkDGKdBBHRqKAIAIAApAxCnaiAAKQMIpxAZGiAAKQMIIAAoAjQoAgAgACkDGKdBBHRqKQMIIAApAxB9UQRAIAAgACkDGEIBfDcDGAsgACAAKQMIIAApAyB8NwMgIABCADcDEAwBCwsgACgCNCIBIAApAyAgASkDOHw3AzggACgCNCAAKQMYNwNAIAAgACkDIDcDOAsgACkDOCECIABBQGskACAEIAI3A2gMCwsgBEEAQgBBACAEKAJQEEw2AkwgBCgCTEUEQCAEQn83A2gMCwsgBCgCUCgCEBAyIAQoAlAgBCgCTDYCECAEQgA3A2gMCgsgBCgCUCgCFBAyIAQoAlBBADYCFCAEQgA3A2gMCQsgBCAEKAJQKAIQIAQoAmAgBCkDWCAEKAJQEMEBrDcDaAwICyAEIAQoAlAoAhQgBCgCYCAEKQNYIAQoAlAQwQGsNwNoDAcLIAQpA1hCOFQEQCAEKAJQQRJBABAUIARCfzcDaAwHCyAEIAQoAmA2AkggBCgCSBA7IAQoAkggBCgCUCgCDDYCKCAEKAJIIAQoAlAoAhApAzA3AxggBCgCSCAEKAJIKQMYNwMgIAQoAkhBADsBMCAEKAJIQQA7ATIgBCgCSELcATcDACAEQjg3A2gMBgsgBCgCUCAEKAJgKAIANgIMIARCADcDaAwFCyAEQX82AkAgBEETNgI8IARBCzYCOCAEQQ02AjQgBEEMNgIwIARBCjYCLCAEQQ82AiggBEEJNgIkIARBETYCICAEQQg2AhwgBEEHNgIYIARBBjYCFCAEQQU2AhAgBEEENgIMIARBAzYCCCAEQQI2AgQgBEEBNgIAIARBACAEEDQ3A2gMBAsgBCgCUCgCECkDOEL///////////8AVgRAIAQoAlBBHkE9EBQgBEJ/NwNoDAQLIAQgBCgCUCgCECkDODcDaAwDCyAEKAJQKAIUKQM4Qv///////////wBWBEAgBCgCUEEeQT0QFCAEQn83A2gMAwsgBCAEKAJQKAIUKQM4NwNoDAILIAQpA1hC////////////AFYEQCAEKAJQQRJBABAUIARCfzcDaAwCCyAEKAJQKAIUIQEgBCgCYCEDIAQpA1ghAiAEKAJQIQUjAEHgAGsiACQAIAAgATYCVCAAIAM2AlAgACACNwNIIAAgBTYCRAJAIAApA0ggACgCVCkDOCAAKQNIfEL//wN8VgRAIAAoAkRBEkEAEBQgAEJ/NwNYDAELIAAgACgCVCgCBCAAKAJUKQMIp0EDdGopAwA3AyAgACkDICAAKAJUKQM4IAApA0h8VARAIAAgACgCVCkDCCAAKQNIIAApAyAgACgCVCkDOH19Qv//A3xCEIh8NwMYIAApAxggACgCVCkDEFYEQCAAIAAoAlQpAxA3AxAgACkDEFAEQCAAQhA3AxALA0AgACkDECAAKQMYVARAIAAgACkDEEIBhjcDEAwBCwsgACgCVCAAKQMQIAAoAkQQwgFBAXFFBEAgACgCREEOQQAQFCAAQn83A1gMAwsLA0AgACgCVCkDCCAAKQMYVARAQYCABBAYIQEgACgCVCgCACAAKAJUKQMIp0EEdGogATYCACABBEAgACgCVCgCACAAKAJUKQMIp0EEdGpCgIAENwMIIAAoAlQiASABKQMIQgF8NwMIIAAgACkDIEKAgAR8NwMgIAAoAlQoAgQgACgCVCkDCKdBA3RqIAApAyA3AwAMAgUgACgCREEOQQAQFCAAQn83A1gMBAsACwsLIAAgACgCVCkDQDcDMCAAIAAoAlQpAzggACgCVCgCBCAAKQMwp0EDdGopAwB9NwMoIABCADcDOANAIAApAzggACkDSFQEQCAAAn4gACkDSCAAKQM4fSAAKAJUKAIAIAApAzCnQQR0aikDCCAAKQMofVQEQCAAKQNIIAApAzh9DAELIAAoAlQoAgAgACkDMKdBBHRqKQMIIAApAyh9CzcDCCAAKAJUKAIAIAApAzCnQQR0aigCACAAKQMop2ogACgCUCAAKQM4p2ogACkDCKcQGRogACkDCCAAKAJUKAIAIAApAzCnQQR0aikDCCAAKQMofVEEQCAAIAApAzBCAXw3AzALIAAgACkDCCAAKQM4fDcDOCAAQgA3AygMAQsLIAAoAlQiASAAKQM4IAEpAzh8NwM4IAAoAlQgACkDMDcDQCAAKAJUKQM4IAAoAlQpAzBWBEAgACgCVCAAKAJUKQM4NwMwCyAAIAApAzg3A1gLIAApA1ghAiAAQeAAaiQAIAQgAjcDaAwBCyAEKAJQQRxBABAUIARCfzcDaAsgBCkDaCECIARB8ABqJAAgAgsHACAAKAIACxgAQaibAUIANwIAQbCbAUEANgIAQaibAQuGAQIEfwF+IwBBEGsiASQAAkAgACkDMFAEQAwBCwNAAkAgACAFQQAgAUEPaiABQQhqEIoBIgRBf0YNACABLQAPQQNHDQAgAiABKAIIQYCAgIB/cUGAgICAekZqIQILQX8hAyAEQX9GDQEgAiEDIAVCAXwiBSAAKQMwVA0ACwsgAUEQaiQAIAMLC4GNASMAQYAIC4EMaW5zdWZmaWNpZW50IG1lbW9yeQBuZWVkIGRpY3Rpb25hcnkALSsgICAwWDB4AC0wWCswWCAwWC0weCsweCAweABaaXAgYXJjaGl2ZSBpbmNvbnNpc3RlbnQASW52YWxpZCBhcmd1bWVudABpbnZhbGlkIGxpdGVyYWwvbGVuZ3RocyBzZXQAaW52YWxpZCBjb2RlIGxlbmd0aHMgc2V0AHVua25vd24gaGVhZGVyIGZsYWdzIHNldABpbnZhbGlkIGRpc3RhbmNlcyBzZXQAaW52YWxpZCBiaXQgbGVuZ3RoIHJlcGVhdABGaWxlIGFscmVhZHkgZXhpc3RzAHRvbyBtYW55IGxlbmd0aCBvciBkaXN0YW5jZSBzeW1ib2xzAGludmFsaWQgc3RvcmVkIGJsb2NrIGxlbmd0aHMAJXMlcyVzAGJ1ZmZlciBlcnJvcgBObyBlcnJvcgBzdHJlYW0gZXJyb3IAVGVsbCBlcnJvcgBJbnRlcm5hbCBlcnJvcgBTZWVrIGVycm9yAFdyaXRlIGVycm9yAGZpbGUgZXJyb3IAUmVhZCBlcnJvcgBabGliIGVycm9yAGRhdGEgZXJyb3IAQ1JDIGVycm9yAGluY29tcGF0aWJsZSB2ZXJzaW9uAG5hbgAvZGV2L3VyYW5kb20AaW52YWxpZCBjb2RlIC0tIG1pc3NpbmcgZW5kLW9mLWJsb2NrAGluY29ycmVjdCBoZWFkZXIgY2hlY2sAaW5jb3JyZWN0IGxlbmd0aCBjaGVjawBpbmNvcnJlY3QgZGF0YSBjaGVjawBpbnZhbGlkIGRpc3RhbmNlIHRvbyBmYXIgYmFjawBoZWFkZXIgY3JjIG1pc21hdGNoAGluZgBpbnZhbGlkIHdpbmRvdyBzaXplAFJlYWQtb25seSBhcmNoaXZlAE5vdCBhIHppcCBhcmNoaXZlAFJlc291cmNlIHN0aWxsIGluIHVzZQBNYWxsb2MgZmFpbHVyZQBpbnZhbGlkIGJsb2NrIHR5cGUARmFpbHVyZSB0byBjcmVhdGUgdGVtcG9yYXJ5IGZpbGUAQ2FuJ3Qgb3BlbiBmaWxlAE5vIHN1Y2ggZmlsZQBQcmVtYXR1cmUgZW5kIG9mIGZpbGUAQ2FuJ3QgcmVtb3ZlIGZpbGUAaW52YWxpZCBsaXRlcmFsL2xlbmd0aCBjb2RlAGludmFsaWQgZGlzdGFuY2UgY29kZQB1bmtub3duIGNvbXByZXNzaW9uIG1ldGhvZABzdHJlYW0gZW5kAENvbXByZXNzZWQgZGF0YSBpbnZhbGlkAE11bHRpLWRpc2sgemlwIGFyY2hpdmVzIG5vdCBzdXBwb3J0ZWQAT3BlcmF0aW9uIG5vdCBzdXBwb3J0ZWQARW5jcnlwdGlvbiBtZXRob2Qgbm90IHN1cHBvcnRlZABDb21wcmVzc2lvbiBtZXRob2Qgbm90IHN1cHBvcnRlZABFbnRyeSBoYXMgYmVlbiBkZWxldGVkAENvbnRhaW5pbmcgemlwIGFyY2hpdmUgd2FzIGNsb3NlZABDbG9zaW5nIHppcCBhcmNoaXZlIGZhaWxlZABSZW5hbWluZyB0ZW1wb3JhcnkgZmlsZSBmYWlsZWQARW50cnkgaGFzIGJlZW4gY2hhbmdlZABObyBwYXNzd29yZCBwcm92aWRlZABXcm9uZyBwYXNzd29yZCBwcm92aWRlZABVbmtub3duIGVycm9yICVkAHJiAHIrYgByd2EAJXMuWFhYWFhYAE5BTgBJTkYAQUUAMS4yLjExAC9wcm9jL3NlbGYvZmQvAC4AKG51bGwpADogAFBLBgcAUEsGBgBQSwUGAFBLAwQAUEsBAgAAAAAAAFIFAADZBwAArAgAAJEIAACCBQAApAUAAI0FAADFBQAAbwgAADQHAADpBAAAJAcAAAMHAACvBQAA4QYAAMsIAAA3CAAAQQcAAFoEAAC5BgAAcwUAAEEEAABXBwAAWAgAABcIAACnBgAA4ggAAPcIAAD/BwAAywYAAGgFAADBBwAAIABBmBQLEQEAAAABAAAAAQAAAAEAAAABAEG8FAsJAQAAAAEAAAACAEHoFAsBAQBBiBULAQEAQaIVC6REOiY7JmUmZiZjJmAmIiDYJcsl2SVCJkAmaiZrJjwmuiXEJZUhPCC2AKcArCWoIZEhkyGSIZAhHyKUIbIlvCUgACEAIgAjACQAJQAmACcAKAApACoAKwAsAC0ALgAvADAAMQAyADMANAA1ADYANwA4ADkAOgA7ADwAPQA+AD8AQABBAEIAQwBEAEUARgBHAEgASQBKAEsATABNAE4ATwBQAFEAUgBTAFQAVQBWAFcAWABZAFoAWwBcAF0AXgBfAGAAYQBiAGMAZABlAGYAZwBoAGkAagBrAGwAbQBuAG8AcABxAHIAcwB0AHUAdgB3AHgAeQB6AHsAfAB9AH4AAiPHAPwA6QDiAOQA4ADlAOcA6gDrAOgA7wDuAOwAxADFAMkA5gDGAPQA9gDyAPsA+QD/ANYA3ACiAKMApQCnIJIB4QDtAPMA+gDxANEAqgC6AL8AECOsAL0AvAChAKsAuwCRJZIlkyUCJSQlYSViJVYlVSVjJVElVyVdJVwlWyUQJRQlNCUsJRwlACU8JV4lXyVaJVQlaSVmJWAlUCVsJWclaCVkJWUlWSVYJVIlUyVrJWolGCUMJYglhCWMJZAlgCWxA98AkwPAA6MDwwO1AMQDpgOYA6kDtAMeIsYDtQMpImEisQBlImQiICMhI/cASCKwABkitwAaIn8gsgCgJaAAAAAAAJYwB3csYQ7uulEJmRnEbQeP9GpwNaVj6aOVZJ4yiNsOpLjceR7p1eCI2dKXK0y2Cb18sX4HLbjnkR2/kGQQtx3yILBqSHG5895BvoR91Noa6+TdbVG11PTHhdODVphsE8Coa2R6+WL97Mllik9cARTZbAZjYz0P+vUNCI3IIG47XhBpTORBYNVycWei0eQDPEfUBEv9hQ3Sa7UKpfqotTVsmLJC1sm720D5vKzjbNgydVzfRc8N1txZPdGrrDDZJjoA3lGAUdfIFmHQv7X0tCEjxLNWmZW6zw+lvbieuAIoCIgFX7LZDMYk6Quxh3xvLxFMaFirHWHBPS1mtpBB3HYGcdsBvCDSmCoQ1e+JhbFxH7W2BqXkv58z1LjooskHeDT5AA+OqAmWGJgO4bsNan8tPW0Il2xkkQFcY+b0UWtrYmFsHNgwZYVOAGLy7ZUGbHulARvB9AiCV8QP9cbZsGVQ6bcS6ri+i3yIufzfHd1iSS3aFfN804xlTNT7WGGyTc5RtTp0ALyj4jC71EGl30rXldg9bcTRpPv01tNq6WlD/NluNEaIZ63QuGDacy0EROUdAzNfTAqqyXwN3TxxBVCqQQInEBALvoYgDMkltWhXs4VvIAnUZrmf5GHODvneXpjJ2SkimNCwtKjXxxc9s1mBDbQuO1y9t61susAgg7jttrO/mgzitgOa0rF0OUfV6q930p0VJtsEgxbccxILY+OEO2SUPmptDahaanoLzw7knf8JkyeuAAqxngd9RJMP8NKjCIdo8gEe/sIGaV1XYvfLZ2WAcTZsGecGa252G9T+4CvTiVp62hDMSt1nb9+5+fnvvo5DvrcX1Y6wYOij1tZ+k9GhxMLYOFLy30/xZ7vRZ1e8pt0GtT9LNrJI2isN2EwbCq/2SgM2YHoEQcPvYN9V32eo745uMXm+aUaMs2HLGoNmvKDSbyU24mhSlXcMzANHC7u5FgIiLyYFVb47usUoC72yklq0KwRqs1yn/9fCMc/QtYue2Swdrt5bsMJkmybyY+yco2p1CpNtAqkGCZw/Ng7rhWcHchNXAAWCSr+VFHq44q4rsXs4G7YMm47Skg2+1eW379x8Id/bC9TS04ZC4tTx+LPdaG6D2h/NFr6BWya59uF3sG93R7cY5loIiHBqD//KOwZmXAsBEf+eZY9prmL40/9rYUXPbBZ44gqg7tIN11SDBE7CswM5YSZnp/cWYNBNR2lJ23duPkpq0a7cWtbZZgvfQPA72DdTrrypxZ673n/Pskfp/7UwHPK9vYrCusowk7NTpqO0JAU20LqTBtfNKVfeVL9n2SMuemazuEphxAIbaF2UK28qN74LtKGODMMb3wVaje8CLQAAAABBMRsZgmI2MsNTLSsExWxkRfR3fYanWlbHlkFPCIrZyEm7wtGK6O/6y9n04wxPtaxNfq61ji2Dns8cmIdREsJKECPZU9Nw9HiSQe9hVdeuLhTmtTfXtZgcloSDBVmYG4IYqQCb2/otsJrLNqldXXfmHGxs/98/QdSeDlrNoiSEleMVn4wgRrKnYXepvqbh6PHn0PPoJIPew2Wyxdqqrl1d659GRCjMa29p/XB2rmsxOe9aKiAsCQcLbTgcEvM2Rt+yB13GcVRw7TBla/T38yq7tsIxonWRHIk0oAeQ+7yfF7qNhA553qklOO+yPP9583O+SOhqfRvFQTwq3lgFT3nwRH5i6YctT8LGHFTbAYoVlEC7Do2D6COmwtk4vw3FoDhM9Lshj6eWCs6WjRMJAMxcSDHXRYti+m7KU+F3VF27uhVsoKPWP42Ilw6WkVCY194RqczH0vrh7JPL+vVc12JyHeZ5a961VECfhE9ZWBIOFhkjFQ/acDgkm0EjPadr/WXmWuZ8JQnLV2Q40E6jrpEB4p+KGCHMpzNg/bwqr+Ekre7QP7QtgxKfbLIJhqskSMnqFVPQKUZ++2h3ZeL2eT8vt0gkNnQbCR01KhIE8rxTS7ONSFJw3mV5Me9+YP7z5ue/wv3+fJHQ1T2gy8z6NoqDuweRmnhUvLE5ZaeoS5iDOwqpmCLJ+rUJiMuuEE9d718ObPRGzT/ZbYwOwnRDElrzAiNB6sFwbMGAQXfYR9c2lwbmLY7FtQClhIQbvBqKQXFbu1pomOh3Q9nZbFoeTy0VX342DJwtGyfdHAA+EgCYuVMxg6CQYq6L0VO1khbF9N1X9O/ElKfC79WW2fbpvAeuqI0ct2veMZwq7yqF7XlryqxIcNNvG134LipG4eE23magB8V/Y1ToVCJl803l87ICpMKpG2eRhDAmoJ8puK7F5Pmf3v06zPPWe/3oz7xrqYD9WrKZPgmfsn84hKuwJBws8RUHNTJGKh5zdzEHtOFwSPXQa1E2g0Z6d7JdY07X+ssP5uHSzLXM+Y2E1+BKEpavCyONtshwoJ2JQbuERl0jAwdsOBrEPxUxhQ4OKEKYT2cDqVR+wPp5VYHLYkwfxTiBXvQjmJ2nDrPclhWqGwBU5VoxT/yZYmLX2FN5zhdP4UlWfvpQlS3Xe9QczGITio0tUruWNJHoux/Q2aAG7PN+Xq3CZUdukUhsL6BTdeg2EjqpBwkjalQkCCtlPxHkeaeWpUi8j2YbkaQnKoq94LzL8qGN0Oti3v3AI+/m2b3hvBT80KcNP4OKJn6ykT+5JNBw+BXLaTtG5kJ6d/1btWtl3PRafsU3CVPudjhI97GuCbjwnxKhM8w/inL9JJMAAAAAN2rCAW7UhANZvkYC3KgJB+vCywayfI0EhRZPBbhREw6PO9EP1oWXDeHvVQxk+RoJU5PYCAotngo9R1wLcKMmHEfJ5B0ed6IfKR1gHqwLLxubYe0awt+rGPW1aRnI8jUS/5j3E6YmsRGRTHMQFFo8FSMw/hR6jrgWTeR6F+BGTTjXLI85jpLJO7n4Czo87kQ/C4SGPlI6wDxlUAI9WBdeNm99nDc2w9o1AakYNIS/VzGz1ZUw6mvTMt0BETOQ5Wskp4+pJf4x7yfJWy0mTE1iI3snoCIimeYgFfMkISi0eCof3rorRmD8KXEKPij0HHEtw3azLJrI9S6tojcvwI2acPfnWHGuWR5zmTPcchwlk3crT1F2cvEXdEWb1XV43Il+T7ZLfxYIDX0hYs98pHSAeZMeQnjKoAR6/crGe7AuvGyHRH5t3vo4b+mQ+m5shrVrW+x3agJSMWg1OPNpCH+vYj8VbWNmqythUcHpYNTXpmXjvWRkugMiZo1p4Gcgy9dIF6EVSU4fU0t5dZFK/GPeT8sJHE6St1pMpd2YTZiaxEav8AZH9k5ARcEkgkREMs1Bc1gPQCrmSUIdjItDUGjxVGcCM1U+vHVXCda3VozA+FO7qjpS4hR8UNV+vlHoOeJa31MgW4btZlmxh6RYNJHrXQP7KVxaRW9ebS+tX4AbNeG3cffg7s+x4tmlc+Ncszzma9n+5zJnuOUFDXrkOEom7w8g5O5WnqLsYfRg7eTiL+jTiO3pijar671caerwuBP9x9LR/J5sl/6pBlX/LBAa+ht62PtCxJ75da5c+EjpAPN/g8LyJj2E8BFXRvGUQQn0oyvL9fqVjffN/0/2YF142Vc3utgOifzaOeM+27z1cd6Ln7Pf0iH13eVLN9zYDGvX72ap1rbY79SBsi3VBKRi0DPOoNFqcObTXRok0hD+XsUnlJzEfiraxklAGMfMVlfC+zyVw6KC08GV6BHAqK9Ny5/Fj8rGe8nI8RELyXQHRMxDbYbNGtPAzy25As5Alq+Rd/xtkC5CK5IZKOmTnD6mlqtUZJfy6iKVxYDglPjHvJ/PrX6elhM4nKF5+p0kb7WYEwV3mUq7MZt90fOaMDWJjQdfS4xe4Q2OaYvPj+ydgIrb90KLgkkEibUjxoiIZJqDvw5YguawHoDR2tyBVMyThGOmUYU6GBeHDXLVhqDQ4qmXuiCozgRmqvlupKt8eOuuSxIprxKsb60lxq2sGIHxpy/rM6Z2VXWkQT+3pcQp+KDzQzqhqv18o52XvqLQc8S15xkGtL6nQLaJzYK3DNvNsjuxD7NiD0mxVWWLsGgi17tfSBW6BvZTuDGckbm0it68g+AcvdpeWr/tNJi+AAAAAGVnvLiLyAmq7q+1EleXYo8y8N433F9rJbk4153vKLTFik8IfWTgvW8BhwHXuL/WSt3YavIzd9/gVhBjWJ9XGVD6MKXoFJ8Q+nH4rELIwHvfrafHZ0MIcnUmb87NcH+tlRUYES37t6Q/ntAYhyfozxpCj3OirCDGsMlHegg+rzKgW8iOGLVnOwrQAIeyaThQLwxf7Jfi8FmFh5flPdGHhmW04DrdWk+Pzz8oM3eGEOTq43dYUg3Y7UBov1H4ofgr8MSfl0gqMCJaT1ee4vZvSX+TCPXHfadA1RjA/G1O0J81K7cjjcUYlp+gfyonGUf9unwgQQKSj/QQ9+hIqD1YFJtYP6gjtpAdMdP3oYlqz3YUD6jKrOEHf76EYMMG0nCgXrcXHOZZuKn0PN8VTIXnwtHggH5pDi/Le2tId8OiDw3Lx2ixcynHBGFMoLjZ9ZhvRJD/0/x+UGbuGzfaVk0nuQ4oQAW2xu+wpKOIDBwasNuBf9dnOZF40iv0H26TA/cmO2aQmoOIPy+R7ViTKVRgRLQxB/gM36hNHrrP8abs35L+ibguRmcXm1QCcCfsu0jwcd4vTMkwgPnbVedFY5ygP2v5x4PTF2g2wXIPinnLN13krlDhXED/VE4lmOj2c4iLrhbvNxb4QIIEnSc+vCQf6SFBeFWZr9fgi8qwXDM7tlntXtHlVbB+UEfVGez/bCE7YglGh9rn6TLIgo6OcNSe7Six+VGQX1bkgjoxWDqDCY+n5m4zHwjBhg1tpjq1pOFAvcGG/AUvKUkXSk71r/N2IjKWEZ6KeL4rmB3ZlyBLyfR4Lq5IwMAB/dKlZkFqHF6W93k5Kk+Xlp9d8vEj5QUZa01gftf1jtFi5+u23l9SjgnCN+m1etlGAGi8IbzQ6jHfiI9WYzBh+dYiBJ5qmr2mvQfYwQG/Nm60rVMJCBWaTnId/ynOpRGGe7d04ccPzdkQkqi+rCpGERk4I3algHVmxtgQAXpg/q7PcpvJc8oi8aRXR5YY76k5rf3MXhFFBu5NdmOJ8c6NJkTc6EH4ZFF5L/k0HpNB2rEmU7/WmuvpxvmzjKFFC2IO8BkHaUyhvlGbPNs2J4Q1mZKWUP4uLpm5VCb83uieEnFdjHcW4TTOLjapq0mKEUXmPwMggYO7dpHg4xP2XFv9WelJmD5V8SEGgmxEYT7Uqs6Lxs+pN344QX/WXSbDbrOJdnzW7srEb9YdWQqxoeHkHhTzgXmoS9dpyxOyDnerXKHCuTnGfgGA/qmc5ZkVJAs2oDZuURyOpxZmhsJx2j4s3m8sSbnTlPCBBAmV5rixe0kNox4usRtIPtJDLVlu+8P22+mmkWdRH6mwzHrODHSUYblm8QYF3gAAAAB3BzCW7g5hLJkJUboHbcQZcGr0j+ljpTWeZJWjDtuIMnncuKTg1ekel9LZiAm2TCt+sXy957gtB5C/HZEdtxBkarAg8vO5cUiEvkHeGtrUfW3d5Ov01LVRg9OFxxNsmFZka6jA/WL5eoplyewUAVxPYwZs2foPPWONCA31O24gyExpEF7VYEHkomdxcjwD5NFLBNRH0g2F/aUKtWs1taj6QrKYbNu7ydasvPlAMths40XfXHXc1g3Pq9E9WSbZMKxR3gA6yNdRgL/QYRYhtPS1VrPEI8+6lZm4vaUPKAK4nl8FiAjGDNmysQvpJC9vfIdYaEwRwWEdq7ZmLT123EGQAdtxBpjSILzv1RAqcbGFiQa2tR+fv+Sl6LjUM3gHyaIPAPk0lgmojuEOmBh/ag27CG09LZFkbJfmY1wBa2tR9BxsYWKFZTDY8mIATmwGle0bAaV7ggj0wfUPxFdlsNnGErfpUIu+uOr8uYh8Yt0d3xXaLUmM03zz+9RMZU2yYVg6tVHOo7wAdNS7MOJK36VBPdiV16TRxG3T1vT7Q2npajRu2fytZ4hG2mC40EQELXMzAx3lqgpMX90NfMlQBXE8JwJBqr4LEBDJDCCGV2i1JSBvhbO5ZtQJzmHkn17e+Q4p2cmYsNCYIsfXqLRZsz0XLrQNgbe9XDvAumyt7biDIJq/s7YDtuIMdLHSmurVRzmd0nevBNsmFXPcFoPjYwsSlGQ7hA1taj56alqo5A7PC5MJ/50KAK4nfQeesfAPk0SHCKPSHgHyaGkGwv73YlddgGVnyxlsNnFuawbn/tQbdonTK+AQ2npaZ91KzPm532+Ovu/5F7e+Q2CwjtXW1qPoodGTfjjYwsRP3/JS0btn8aa8V2c/tQbdSLI2S9gNK9qvChtMNgNK9kEEemDfYO/DqGffVTFuju9Gab55y2GzjLxmgxolb9KgUmjiNswMd5W7C0cDIgIWuVUFJi/Fuju+sr0LKCu0WpJcs2oEwtf/p7XQzzEs2Z6LW96uHZtkwrDsY/ImdWqjnAJtkwqcCQap6w42P3IHZ4UFAFcTlb9KguK4ehR7sSuuDLYbOJLSjpvl1b4NfNzvtwvb3yGG09LU8dTiQmjds/gf2oNugb4Wzfa5JltvsHfhGLdHd4gIWub/D2pwZgY7yhEBC1yPZZ7/+GKuaWFr/9MWbM9FoArieNcN0u5OBINUOQOzwqdnJmHQYBb3SWlHTT5ud9uu0WpK2dZa3EDfC2Y32DvwqbyuU967nsVHss9/MLX/6b298hzKusKKU7OTMCS0o6a60DYFzdcGk1TeVykj2We/s2Z6LsRhSrhdaBsCKm8rlLQLvjfDDI6hWgXfGy0C740AAAAAGRsxQTI2YoIrLVPDZGzFBH139EVWWqeGT0GWx8jZigjRwrtJ+u/oiuP02custU8Mta5+TZ6DLY6HmBzPSsISUVPZIxB49HDTYe9Bki6u11U3teYUHJi11wWDhJaCG5hZmwCpGLAt+tupNsua5nddXf9sbBzUQT/fzVoOnpWEJKKMnxXjp7JGIL6pd2Hx6OGm6PPQ58PegyTaxbJlXV2uqkRGn+tva8wodnD9aTkxa64gKlrvCwcJLBIcOG3fRjbzxl0Hsu1wVHH0a2Uwuyrz96IxwraJHJF1kAegNBefvPsOhI26JaneeTyy7zhz83n/auhIvkHFG31Y3io88HlPBelifkTCTy2H21QcxpQVigGNDrtApiPog7842cI4oMUNIbv0TAqWp48TjZbOXMwACUXXMUhu+mKLd+FTyrq7XVSjoGwViI0/1pGWDpfe15hQx8ypEezh+tL1+suTcmLXXGt55h1AVLXeWU+EnxYOElgPFSMZJDhw2j0jQZtl/WunfOZa5lfLCSVO0DhkAZGuoxiKn+Izp8whKrz9YK0k4a+0P9DunxKDLYYJsmzJSCSr0FMV6vt+RiniZXdoLz959jYkSLcdCRt0BBIqNUtTvPJSSI2zeWXecGB+7zHn5vP+/v3Cv9XQkXzMy6A9g4o2+pqRB7uxvFR4qKdlOTuDmEsimKkKCbX6yRCuy4hf711PRvRsDm3ZP810wg6M81oSQ+pBIwLBbHDB2HdBgJc210eOLeYGpQC1xbwbhIRxQYoaaFq7W0N36JhabNnZFS1PHgw2fl8nGy2cPgAc3bmYABKggzFTi65ikJK1U9Hd9MUWxO/0V+/Cp5T22ZbVrge86bccjaicMd5rhSrvKspree3TcEis+F0bb+FGKi5m3jbhf8UHoFToVGNN82UiArLz5RupwqQwhJFnKZ+gJuTFrrj93p/51vPMOs/o/XuAqWu8mbJa/bKfCT6rhDh/LBwksDUHFfEeKkYyBzF3c0hw4bRRa9D1ekaDNmNdsnfL+tdO0uHmD/nMtczg14SNr5YSSraNIwudoHDIhLtBiQMjXUYaOGwHMRU/xCgODoVnT5hCflSpA1V5+sBMYsuBgTjFH5gj9F6zDqedqhWW3OVUABv8TzFa12Jimc55U9hJ4U8XUPp+VnvXLZVizBzULY2KEzSWu1Ifu+iRBqDZ0F5+8+xHZcKtbEiRbnVToC86EjboIwkHqQgkVGoRP2Urlqd55I+8SKWkkRtmvYoqJ/LLvODr0I2hwP3eYtnm7yMUvOG9DafQ/CaKgz8/kbJ+cNAkuWnLFfhC5kY7W/13etxla7XFflr07lMJN/dIOHa4Ca6xoRKf8Io/zDOTJP1yAAAAAAHCajcDhNRuAka+WQcJqNwGy8LrBI18sgVPFoUOE1G4D9E7jw2XhdYMVe/hCRr5ZAjYk1MKni0KC1xHPRwmo3Ad5MlHH6J3Hh5gHSkbLwusGu1hmxir38IZabX1EjXyyBP3mP8RsSamEHNMkRU8WhQU/jAjFriOehd65E04TUbgOY8s1zvJko46C/i5P0TuPD6GhAs8wDpSPQJQZTZeF1g3nH1vNdrDNjQYqQExV7+EMJXVszLTa+ozEQHdJGvlkCWpj6cn7zH+Ji1bySNiTUwioCd7IOaZIiEk8xUqeLQoK7reHyn8YEYoPgpxLXEc9CyzdsMu9ciaLzeirXCajcBxWOf3cx5ZrnLcM5l3kyUcdlFPK3QX8XJ11ZtFfonceH9Ltk99DQgWfM9iIXmAdKR4Qh6TegSgynvGyv1svC6wbX5Eh284+t5u+pDpa7WGbGp37FtoMVICafM4NWKvfwhjbRU/YSurZmDpwVFlptfUZGS942YiA7pn4GmNSNfLIEkVoRdLUx9OSpF1eU/eY/xOHAnLTFq3kk2Y3aVGxJqYRwbwr0VATvZEgiTBQc0yREAPWHNCSeYqQ4uMHVTxaFBVMwJnV3W8Pla31glT+MCMUjqqu1B8FOJRvn7VWuI56FsgU99ZZu2GWKSHsV3rkTRcKfsDXm9FWl+tL23hNRuA4Pdxt+Kxz+7jc6XZ5jyzXOf+2WvluGcy5HoNBe8mSjju5CAP7KKeVu1g9GHoL+Lk6e2I0+urNorqaVy9/RO48PzR0sf+l2ye/1UGqfoaECz72Hob+Z7EQvhcrnXzAOlI8sKDf/CEPSbxRlcR9AlBlPXLK6P3jZX69k//zdl4XWDYujdX2vyJDts+4znecfW837Ofi931IdLcN0vl12sM2NapZu/U79i21S2ygdBipATRoM4z0+ZwatIkGl3FXv4QxJyUJ8baKn7HGEBJwldWzMOVPPvB04KiwBHolctNr6jKj8WfyMl7xskLEfHMRAd0zYZtQ8/A0xrOArktka+WQJBt/HeSK0Iuk+koGZamPpyXZFSrlSLq8pTggMWfvMf4nn6tz5w4E5ad+nmhmLVvJJl3BRObMbtKmvPRfY2JNTCMS18Hjg3hXo/Pi2mKgJ3si0L324kESYKIxiO1g5pkiIJYDr+AHrDmgdza0YSTzFSFUaZjhxcYOobVcg2p4tCgqCC6l6pmBM6rpG75rut4fK8pEkutb6wSrK3GJafxgRimM+svpHVVdqW3P0Gg+CnEoTpD86N8/aqivpedtcRz0LQGGee2QKe+t4LNibLN2wyzD7E7sUkPYrCLZVW71yJouhVIX7hT9ga5kZwxvN6KtL0c4IO/Wl7avpg07QAAAAC4vGdlqgnIixK1r+6PYpdXN97wMiVrX9yd1zi5xbQo730IT4pvveBk1wGHAUrWv7jyatjd4N93M1hjEFZQGVef6KUw+voQnxRCrPhx33vAyGfHp611cghDzc5vJpWtf3AtERgVP6S3+4cY0J4az+gnonOPQrDGIKwIekfJoDKvPhiOyFsKO2e1socA0C9QOGmX7F8MhVnw4j3ll4dlhofR3TrgtM+PT1p3Myg/6uQQhlJYd+NA7dgN+FG/aPAr+KFIl5/EWiIwKuKeV09/SW/2x/UIk9VAp31t/MAYNZ/QTo0jtyuflhjFJyp/oLr9RxkCQSB8EPSPkqhI6PebFFg9I6g/WDEdkLaJoffTFHbPaqzKqA++fwfhBsNghF6gcNLmHBe39Km4WUwV3zzRwueFaX6A4HvLLw7Dd0hryw0PonOxaMdhBMcp2bigTERvmPX80/+Q7mZQflbaNxsOuSdNtgVAKKSw78YcDIijgduwGjln138r0niRk24f9Dsm9wODmpBmkS8/iCmTWO20RGBUDPgHMR5NqN+m8c+6/pLf7EYuuIlUmxdn7CdwAnHwSLvJTC/e2/mAMGNF51VrP6Cc04PH+cE2aBd5ig9y5F03y1zhUK5OVP9A9uiYJa6LiHMWN+8WBIJA+Lw+J50h6R8kmVV4QYvg168zXLDK7Vm2O1Xl0V5HUH6w/+wZ1WI7IWzah0YJyDLp53COjoIo7Z7UkFH5sYLkVl86WDE6p48Jgx8zbuYNhsEItTqmbb1A4aQF/IbBF0kpL6/1TkoyInbzip4Rlpgrvnggl9kdePTJS8BIri7S/QHAakFmpfeWXhxPKjl5XZ+Wl+Uj8fJNaxkF9dd+YOdi0Y5f3rbrwgmOUnq16TdoAEbZ0LwhvIjfMeowY1aPItb5YZpqngQHvaa9vwHB2K20bjYVCAlTHXJOmqXOKf+3e4YRD8fhdJIQ2c0qrL6oOBkRRoCldiPYxmZ1YHoBEHLPrv7Kc8mbV6TxIu8Ylkf9rTmpRRFezHZN7gbO8Ylj3EQmjWT4Qej5L3lRQZMeNFMmsdrrmta/s/nG6QtFoYwZ8A5ioUxpBzybUb6EJzbblpKZNS4u/lAmVLmZnuje/IxdcRI04RZ3qTYuzhGKSasDP+ZFu4OBIOPgkXZbXPYTSelZ/fFVPphsggYh1D5hRMaLzqp+N6nP1n9BOG7DJl18domzxMru1lkd1m/hobEK8xQe5EuoeYETy2nXq3cOsrnCoVwBfsY5nKn+gCQVmeU2oDYLjhxRboZmFqc+2nHCLG/eLJTTuUkJBIHwsbjmlaMNSXsbsS4eQ9I+SPtuWS3p2/bDUWeRpsywqR90DM56ZrlhlN4FBvEUBAAAtgcAAHoJAACZBQAAWwUAALoFAAAABAAARQUAAM8FAAB6CQBB0dkAC7YQAQIDBAQFBQYGBgYHBwcHCAgICAgICAgJCQkJCQkJCQoKCgoKCgoKCgoKCgoKCgoLCwsLCwsLCwsLCwsLCwsLDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwNDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PAAAQERISExMUFBQUFRUVFRYWFhYWFhYWFxcXFxcXFxcYGBgYGBgYGBgYGBgYGBgYGRkZGRkZGRkZGRkZGRkZGRoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxscHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHQABAgMEBQYHCAgJCQoKCwsMDAwMDQ0NDQ4ODg4PDw8PEBAQEBAQEBARERERERERERISEhISEhISExMTExMTExMUFBQUFBQUFBQUFBQUFBQUFRUVFRUVFRUVFRUVFRUVFRYWFhYWFhYWFhYWFhYWFhYXFxcXFxcXFxcXFxcXFxcXGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxwQMAAAEDUAAAEBAAAeAQAADwAAAJA0AACQNQAAAAAAAB4AAAAPAAAAAAAAABA2AAAAAAAAEwAAAAcAAAAAAAAADAAIAIwACABMAAgAzAAIACwACACsAAgAbAAIAOwACAAcAAgAnAAIAFwACADcAAgAPAAIALwACAB8AAgA/AAIAAIACACCAAgAQgAIAMIACAAiAAgAogAIAGIACADiAAgAEgAIAJIACABSAAgA0gAIADIACACyAAgAcgAIAPIACAAKAAgAigAIAEoACADKAAgAKgAIAKoACABqAAgA6gAIABoACACaAAgAWgAIANoACAA6AAgAugAIAHoACAD6AAgABgAIAIYACABGAAgAxgAIACYACACmAAgAZgAIAOYACAAWAAgAlgAIAFYACADWAAgANgAIALYACAB2AAgA9gAIAA4ACACOAAgATgAIAM4ACAAuAAgArgAIAG4ACADuAAgAHgAIAJ4ACABeAAgA3gAIAD4ACAC+AAgAfgAIAP4ACAABAAgAgQAIAEEACADBAAgAIQAIAKEACABhAAgA4QAIABEACACRAAgAUQAIANEACAAxAAgAsQAIAHEACADxAAgACQAIAIkACABJAAgAyQAIACkACACpAAgAaQAIAOkACAAZAAgAmQAIAFkACADZAAgAOQAIALkACAB5AAgA+QAIAAUACACFAAgARQAIAMUACAAlAAgApQAIAGUACADlAAgAFQAIAJUACABVAAgA1QAIADUACAC1AAgAdQAIAPUACAANAAgAjQAIAE0ACADNAAgALQAIAK0ACABtAAgA7QAIAB0ACACdAAgAXQAIAN0ACAA9AAgAvQAIAH0ACAD9AAgAEwAJABMBCQCTAAkAkwEJAFMACQBTAQkA0wAJANMBCQAzAAkAMwEJALMACQCzAQkAcwAJAHMBCQDzAAkA8wEJAAsACQALAQkAiwAJAIsBCQBLAAkASwEJAMsACQDLAQkAKwAJACsBCQCrAAkAqwEJAGsACQBrAQkA6wAJAOsBCQAbAAkAGwEJAJsACQCbAQkAWwAJAFsBCQDbAAkA2wEJADsACQA7AQkAuwAJALsBCQB7AAkAewEJAPsACQD7AQkABwAJAAcBCQCHAAkAhwEJAEcACQBHAQkAxwAJAMcBCQAnAAkAJwEJAKcACQCnAQkAZwAJAGcBCQDnAAkA5wEJABcACQAXAQkAlwAJAJcBCQBXAAkAVwEJANcACQDXAQkANwAJADcBCQC3AAkAtwEJAHcACQB3AQkA9wAJAPcBCQAPAAkADwEJAI8ACQCPAQkATwAJAE8BCQDPAAkAzwEJAC8ACQAvAQkArwAJAK8BCQBvAAkAbwEJAO8ACQDvAQkAHwAJAB8BCQCfAAkAnwEJAF8ACQBfAQkA3wAJAN8BCQA/AAkAPwEJAL8ACQC/AQkAfwAJAH8BCQD/AAkA/wEJAAAABwBAAAcAIAAHAGAABwAQAAcAUAAHADAABwBwAAcACAAHAEgABwAoAAcAaAAHABgABwBYAAcAOAAHAHgABwAEAAcARAAHACQABwBkAAcAFAAHAFQABwA0AAcAdAAHAAMACACDAAgAQwAIAMMACAAjAAgAowAIAGMACADjAAgAAAAFABAABQAIAAUAGAAFAAQABQAUAAUADAAFABwABQACAAUAEgAFAAoABQAaAAUABgAFABYABQAOAAUAHgAFAAEABQARAAUACQAFABkABQAFAAUAFQAFAA0ABQAdAAUAAwAFABMABQALAAUAGwAFAAcABQAXAAUAQbDqAAtNAQAAAAEAAAABAAAAAQAAAAIAAAACAAAAAgAAAAIAAAADAAAAAwAAAAMAAAADAAAABAAAAAQAAAAEAAAABAAAAAUAAAAFAAAABQAAAAUAQaDrAAtlAQAAAAEAAAACAAAAAgAAAAMAAAADAAAABAAAAAQAAAAFAAAABQAAAAYAAAAGAAAABwAAAAcAAAAIAAAACAAAAAkAAAAJAAAACgAAAAoAAAALAAAACwAAAAwAAAAMAAAADQAAAA0AQdDsAAsjAgAAAAMAAAAHAAAAAAAAABAREgAIBwkGCgULBAwDDQIOAQ8AQYTtAAtpAQAAAAIAAAADAAAABAAAAAUAAAAGAAAABwAAAAgAAAAKAAAADAAAAA4AAAAQAAAAFAAAABgAAAAcAAAAIAAAACgAAAAwAAAAOAAAAEAAAABQAAAAYAAAAHAAAACAAAAAoAAAAMAAAADgAEGE7gALegEAAAACAAAAAwAAAAQAAAAGAAAACAAAAAwAAAAQAAAAGAAAACAAAAAwAAAAQAAAAGAAAACAAAAAwAAAAAABAACAAQAAAAIAAAADAAAABAAAAAYAAAAIAAAADAAAABAAAAAYAAAAIAAAADAAAABAAAAAYAAAMS4yLjExAEGI7wALbQcAAAAEAAQACAAEAAgAAAAEAAUAEAAIAAgAAAAEAAYAIAAgAAgAAAAEAAQAEAAQAAkAAAAIABAAIAAgAAkAAAAIABAAgACAAAkAAAAIACAAgAAAAQkAAAAgAIAAAgEABAkAAAAgAAIBAgEAEAkAQYDwAAulAgMABAAFAAYABwAIAAkACgALAA0ADwARABMAFwAbAB8AIwArADMAOwBDAFMAYwBzAIMAowDDAOMAAgEAAAAAAAAQABAAEAAQABAAEAAQABAAEQARABEAEQASABIAEgASABMAEwATABMAFAAUABQAFAAVABUAFQAVABAATQDKAAAAAQACAAMABAAFAAcACQANABEAGQAhADEAQQBhAIEAwQABAYEBAQIBAwEEAQYBCAEMARABGAEgATABQAFgAAAAABAAEAAQABAAEQARABIAEgATABMAFAAUABUAFQAWABYAFwAXABgAGAAZABkAGgAaABsAGwAcABwAHQAdAEAAQAAQABEAEgAAAAgABwAJAAYACgAFAAsABAAMAAMADQACAA4AAQAPAEGw8gALwRFgBwAAAAhQAAAIEAAUCHMAEgcfAAAIcAAACDAAAAnAABAHCgAACGAAAAggAAAJoAAACAAAAAiAAAAIQAAACeAAEAcGAAAIWAAACBgAAAmQABMHOwAACHgAAAg4AAAJ0AARBxEAAAhoAAAIKAAACbAAAAgIAAAIiAAACEgAAAnwABAHBAAACFQAAAgUABUI4wATBysAAAh0AAAINAAACcgAEQcNAAAIZAAACCQAAAmoAAAIBAAACIQAAAhEAAAJ6AAQBwgAAAhcAAAIHAAACZgAFAdTAAAIfAAACDwAAAnYABIHFwAACGwAAAgsAAAJuAAACAwAAAiMAAAITAAACfgAEAcDAAAIUgAACBIAFQijABMHIwAACHIAAAgyAAAJxAARBwsAAAhiAAAIIgAACaQAAAgCAAAIggAACEIAAAnkABAHBwAACFoAAAgaAAAJlAAUB0MAAAh6AAAIOgAACdQAEgcTAAAIagAACCoAAAm0AAAICgAACIoAAAhKAAAJ9AAQBwUAAAhWAAAIFgBACAAAEwczAAAIdgAACDYAAAnMABEHDwAACGYAAAgmAAAJrAAACAYAAAiGAAAIRgAACewAEAcJAAAIXgAACB4AAAmcABQHYwAACH4AAAg+AAAJ3AASBxsAAAhuAAAILgAACbwAAAgOAAAIjgAACE4AAAn8AGAHAAAACFEAAAgRABUIgwASBx8AAAhxAAAIMQAACcIAEAcKAAAIYQAACCEAAAmiAAAIAQAACIEAAAhBAAAJ4gAQBwYAAAhZAAAIGQAACZIAEwc7AAAIeQAACDkAAAnSABEHEQAACGkAAAgpAAAJsgAACAkAAAiJAAAISQAACfIAEAcEAAAIVQAACBUAEAgCARMHKwAACHUAAAg1AAAJygARBw0AAAhlAAAIJQAACaoAAAgFAAAIhQAACEUAAAnqABAHCAAACF0AAAgdAAAJmgAUB1MAAAh9AAAIPQAACdoAEgcXAAAIbQAACC0AAAm6AAAIDQAACI0AAAhNAAAJ+gAQBwMAAAhTAAAIEwAVCMMAEwcjAAAIcwAACDMAAAnGABEHCwAACGMAAAgjAAAJpgAACAMAAAiDAAAIQwAACeYAEAcHAAAIWwAACBsAAAmWABQHQwAACHsAAAg7AAAJ1gASBxMAAAhrAAAIKwAACbYAAAgLAAAIiwAACEsAAAn2ABAHBQAACFcAAAgXAEAIAAATBzMAAAh3AAAINwAACc4AEQcPAAAIZwAACCcAAAmuAAAIBwAACIcAAAhHAAAJ7gAQBwkAAAhfAAAIHwAACZ4AFAdjAAAIfwAACD8AAAneABIHGwAACG8AAAgvAAAJvgAACA8AAAiPAAAITwAACf4AYAcAAAAIUAAACBAAFAhzABIHHwAACHAAAAgwAAAJwQAQBwoAAAhgAAAIIAAACaEAAAgAAAAIgAAACEAAAAnhABAHBgAACFgAAAgYAAAJkQATBzsAAAh4AAAIOAAACdEAEQcRAAAIaAAACCgAAAmxAAAICAAACIgAAAhIAAAJ8QAQBwQAAAhUAAAIFAAVCOMAEwcrAAAIdAAACDQAAAnJABEHDQAACGQAAAgkAAAJqQAACAQAAAiEAAAIRAAACekAEAcIAAAIXAAACBwAAAmZABQHUwAACHwAAAg8AAAJ2QASBxcAAAhsAAAILAAACbkAAAgMAAAIjAAACEwAAAn5ABAHAwAACFIAAAgSABUIowATByMAAAhyAAAIMgAACcUAEQcLAAAIYgAACCIAAAmlAAAIAgAACIIAAAhCAAAJ5QAQBwcAAAhaAAAIGgAACZUAFAdDAAAIegAACDoAAAnVABIHEwAACGoAAAgqAAAJtQAACAoAAAiKAAAISgAACfUAEAcFAAAIVgAACBYAQAgAABMHMwAACHYAAAg2AAAJzQARBw8AAAhmAAAIJgAACa0AAAgGAAAIhgAACEYAAAntABAHCQAACF4AAAgeAAAJnQAUB2MAAAh+AAAIPgAACd0AEgcbAAAIbgAACC4AAAm9AAAIDgAACI4AAAhOAAAJ/QBgBwAAAAhRAAAIEQAVCIMAEgcfAAAIcQAACDEAAAnDABAHCgAACGEAAAghAAAJowAACAEAAAiBAAAIQQAACeMAEAcGAAAIWQAACBkAAAmTABMHOwAACHkAAAg5AAAJ0wARBxEAAAhpAAAIKQAACbMAAAgJAAAIiQAACEkAAAnzABAHBAAACFUAAAgVABAIAgETBysAAAh1AAAINQAACcsAEQcNAAAIZQAACCUAAAmrAAAIBQAACIUAAAhFAAAJ6wAQBwgAAAhdAAAIHQAACZsAFAdTAAAIfQAACD0AAAnbABIHFwAACG0AAAgtAAAJuwAACA0AAAiNAAAITQAACfsAEAcDAAAIUwAACBMAFQjDABMHIwAACHMAAAgzAAAJxwARBwsAAAhjAAAIIwAACacAAAgDAAAIgwAACEMAAAnnABAHBwAACFsAAAgbAAAJlwAUB0MAAAh7AAAIOwAACdcAEgcTAAAIawAACCsAAAm3AAAICwAACIsAAAhLAAAJ9wAQBwUAAAhXAAAIFwBACAAAEwczAAAIdwAACDcAAAnPABEHDwAACGcAAAgnAAAJrwAACAcAAAiHAAAIRwAACe8AEAcJAAAIXwAACB8AAAmfABQHYwAACH8AAAg/AAAJ3wASBxsAAAhvAAAILwAACb8AAAgPAAAIjwAACE8AAAn/ABAFAQAXBQEBEwURABsFARARBQUAGQUBBBUFQQAdBQFAEAUDABgFAQIUBSEAHAUBIBIFCQAaBQEIFgWBAEAFAAAQBQIAFwWBARMFGQAbBQEYEQUHABkFAQYVBWEAHQUBYBAFBAAYBQEDFAUxABwFATASBQ0AGgUBDBYFwQBABQAAEQAKABEREQAAAAAFAAAAAAAACQAAAAALAAAAAAAAAAARAA8KERERAwoHAAEACQsLAAAJBgsAAAsABhEAAAAREREAQYGEAQshCwAAAAAAAAAAEQAKChEREQAKAAACAAkLAAAACQALAAALAEG7hAELAQwAQceEAQsVDAAAAAAMAAAAAAkMAAAAAAAMAAAMAEH1hAELAQ4AQYGFAQsVDQAAAAQNAAAAAAkOAAAAAAAOAAAOAEGvhQELARAAQbuFAQseDwAAAAAPAAAAAAkQAAAAAAAQAAAQAAASAAAAEhISAEHyhQELDhIAAAASEhIAAAAAAAAJAEGjhgELAQsAQa+GAQsVCgAAAAAKAAAAAAkLAAAAAAALAAALAEHdhgELAQwAQemGAQsnDAAAAAAMAAAAAAkMAAAAAAAMAAAMAAAwMTIzNDU2Nzg5QUJDREVGAEG0hwELARkAQduHAQsF//////8AQaCIAQtXGRJEOwI/LEcUPTMwChsGRktFNw9JDo4XA0AdPGkrNh9KLRwBICUpIQgMFRYiLhA4Pgs0MRhkdHV2L0EJfzkRI0MyQomKiwUEJignDSoeNYwHGkiTE5SVAEGAiQELig5JbGxlZ2FsIGJ5dGUgc2VxdWVuY2UARG9tYWluIGVycm9yAFJlc3VsdCBub3QgcmVwcmVzZW50YWJsZQBOb3QgYSB0dHkAUGVybWlzc2lvbiBkZW5pZWQAT3BlcmF0aW9uIG5vdCBwZXJtaXR0ZWQATm8gc3VjaCBmaWxlIG9yIGRpcmVjdG9yeQBObyBzdWNoIHByb2Nlc3MARmlsZSBleGlzdHMAVmFsdWUgdG9vIGxhcmdlIGZvciBkYXRhIHR5cGUATm8gc3BhY2UgbGVmdCBvbiBkZXZpY2UAT3V0IG9mIG1lbW9yeQBSZXNvdXJjZSBidXN5AEludGVycnVwdGVkIHN5c3RlbSBjYWxsAFJlc291cmNlIHRlbXBvcmFyaWx5IHVuYXZhaWxhYmxlAEludmFsaWQgc2VlawBDcm9zcy1kZXZpY2UgbGluawBSZWFkLW9ubHkgZmlsZSBzeXN0ZW0ARGlyZWN0b3J5IG5vdCBlbXB0eQBDb25uZWN0aW9uIHJlc2V0IGJ5IHBlZXIAT3BlcmF0aW9uIHRpbWVkIG91dABDb25uZWN0aW9uIHJlZnVzZWQASG9zdCBpcyBkb3duAEhvc3QgaXMgdW5yZWFjaGFibGUAQWRkcmVzcyBpbiB1c2UAQnJva2VuIHBpcGUASS9PIGVycm9yAE5vIHN1Y2ggZGV2aWNlIG9yIGFkZHJlc3MAQmxvY2sgZGV2aWNlIHJlcXVpcmVkAE5vIHN1Y2ggZGV2aWNlAE5vdCBhIGRpcmVjdG9yeQBJcyBhIGRpcmVjdG9yeQBUZXh0IGZpbGUgYnVzeQBFeGVjIGZvcm1hdCBlcnJvcgBJbnZhbGlkIGFyZ3VtZW50AEFyZ3VtZW50IGxpc3QgdG9vIGxvbmcAU3ltYm9saWMgbGluayBsb29wAEZpbGVuYW1lIHRvbyBsb25nAFRvbyBtYW55IG9wZW4gZmlsZXMgaW4gc3lzdGVtAE5vIGZpbGUgZGVzY3JpcHRvcnMgYXZhaWxhYmxlAEJhZCBmaWxlIGRlc2NyaXB0b3IATm8gY2hpbGQgcHJvY2VzcwBCYWQgYWRkcmVzcwBGaWxlIHRvbyBsYXJnZQBUb28gbWFueSBsaW5rcwBObyBsb2NrcyBhdmFpbGFibGUAUmVzb3VyY2UgZGVhZGxvY2sgd291bGQgb2NjdXIAU3RhdGUgbm90IHJlY292ZXJhYmxlAFByZXZpb3VzIG93bmVyIGRpZWQAT3BlcmF0aW9uIGNhbmNlbGVkAEZ1bmN0aW9uIG5vdCBpbXBsZW1lbnRlZABObyBtZXNzYWdlIG9mIGRlc2lyZWQgdHlwZQBJZGVudGlmaWVyIHJlbW92ZWQARGV2aWNlIG5vdCBhIHN0cmVhbQBObyBkYXRhIGF2YWlsYWJsZQBEZXZpY2UgdGltZW91dABPdXQgb2Ygc3RyZWFtcyByZXNvdXJjZXMATGluayBoYXMgYmVlbiBzZXZlcmVkAFByb3RvY29sIGVycm9yAEJhZCBtZXNzYWdlAEZpbGUgZGVzY3JpcHRvciBpbiBiYWQgc3RhdGUATm90IGEgc29ja2V0AERlc3RpbmF0aW9uIGFkZHJlc3MgcmVxdWlyZWQATWVzc2FnZSB0b28gbGFyZ2UAUHJvdG9jb2wgd3JvbmcgdHlwZSBmb3Igc29ja2V0AFByb3RvY29sIG5vdCBhdmFpbGFibGUAUHJvdG9jb2wgbm90IHN1cHBvcnRlZABTb2NrZXQgdHlwZSBub3Qgc3VwcG9ydGVkAE5vdCBzdXBwb3J0ZWQAUHJvdG9jb2wgZmFtaWx5IG5vdCBzdXBwb3J0ZWQAQWRkcmVzcyBmYW1pbHkgbm90IHN1cHBvcnRlZCBieSBwcm90b2NvbABBZGRyZXNzIG5vdCBhdmFpbGFibGUATmV0d29yayBpcyBkb3duAE5ldHdvcmsgdW5yZWFjaGFibGUAQ29ubmVjdGlvbiByZXNldCBieSBuZXR3b3JrAENvbm5lY3Rpb24gYWJvcnRlZABObyBidWZmZXIgc3BhY2UgYXZhaWxhYmxlAFNvY2tldCBpcyBjb25uZWN0ZWQAU29ja2V0IG5vdCBjb25uZWN0ZWQAQ2Fubm90IHNlbmQgYWZ0ZXIgc29ja2V0IHNodXRkb3duAE9wZXJhdGlvbiBhbHJlYWR5IGluIHByb2dyZXNzAE9wZXJhdGlvbiBpbiBwcm9ncmVzcwBTdGFsZSBmaWxlIGhhbmRsZQBSZW1vdGUgSS9PIGVycm9yAFF1b3RhIGV4Y2VlZGVkAE5vIG1lZGl1bSBmb3VuZABXcm9uZyBtZWRpdW0gdHlwZQBObyBlcnJvciBpbmZvcm1hdGlvbgBBkJcBC1JQUFAACgAAAAsAAAAMAAAADQAAAA4AAAAPAAAAEAAAABEAAAASAAAACwAAAAwAAAANAAAADgAAAA8AAAAQAAAAEQAAAAEAAAAIAAAAlEsAALRLAEGQmQELAgxQAEHImQELCR8AAADkTAAAAwBB5JkBC4wBLfRRWM+MscBG9rXLKTEDxwRbcDC0Xf0geH+LmthZKVBoSImrp1YDbP+3zYg/1He0K6WjcPG65Kj8QYP92W/hinovLXSWBx8NCV4Ddixw90ClLKdvV0GoqnTfoFhkA0rHxDxTrq9fGAQVseNtKIarDKS/Q/DpUIE5VxZSN/////////////////////8=";ug(yo)||(yo=h(yo));function gg(d){try{if(d==yo&&V)return new Uint8Array(V);var E=Ca(d);if(E)return E;if(C)return C(d);throw"sync fetching of the wasm failed: you can preload it to Module['wasmBinary'] manually, or emcc.py will do that for you when generating HTML (but not JS)"}catch(I){wr(I)}}function Bp(d,E){var I,k,L;try{L=gg(d),k=new WebAssembly.Module(L),I=new WebAssembly.Instance(k,E)}catch(te){var Z=te.toString();throw D("failed to compile wasm module: "+Z),(Z.includes("imported Memory")||Z.includes("memory import"))&&D("Memory size incompatibility issues may be due to changing INITIAL_MEMORY at runtime to something too large. Use ALLOW_MEMORY_GROWTH to allow any size memory (and also make sure not to set INITIAL_MEMORY at runtime to something smaller than it was at compile time)."),te}return[I,k]}function bp(){var d={a:ma};function E(L,Z){var te=L.exports;t.asm=te,A=t.asm.u,Or(A.buffer),gi=t.asm.pa,dA(t.asm.v),EA("wasm-instantiate")}if(mA("wasm-instantiate"),t.instantiateWasm)try{var I=t.instantiateWasm(d,E);return I}catch(L){return D("Module.instantiateWasm callback failed with error: "+L),!1}var k=Bp(yo,d);return E(k[0]),t.asm}var vr,se;function wo(d){for(;d.length>0;){var E=d.shift();if(typeof E=="function"){E(t);continue}var I=E.func;typeof I=="number"?E.arg===void 0?gi.get(I)():gi.get(I)(E.arg):I(E.arg===void 0?null:E.arg)}}function Fn(d,E){var I=new Date(de[d>>2]*1e3);de[E>>2]=I.getUTCSeconds(),de[E+4>>2]=I.getUTCMinutes(),de[E+8>>2]=I.getUTCHours(),de[E+12>>2]=I.getUTCDate(),de[E+16>>2]=I.getUTCMonth(),de[E+20>>2]=I.getUTCFullYear()-1900,de[E+24>>2]=I.getUTCDay(),de[E+36>>2]=0,de[E+32>>2]=0;var k=Date.UTC(I.getUTCFullYear(),0,1,0,0,0,0),L=(I.getTime()-k)/(1e3*60*60*24)|0;return de[E+28>>2]=L,Fn.GMTString||(Fn.GMTString=Be("GMT")),de[E+40>>2]=Fn.GMTString,E}function fg(d,E){return Fn(d,E)}var bt={splitPath:function(d){var E=/^(\/?|)([\s\S]*?)((?:\.{1,2}|[^\/]+?|)(\.[^.\/]*|))(?:[\/]*)$/;return E.exec(d).slice(1)},normalizeArray:function(d,E){for(var I=0,k=d.length-1;k>=0;k--){var L=d[k];L==="."?d.splice(k,1):L===".."?(d.splice(k,1),I++):I&&(d.splice(k,1),I--)}if(E)for(;I;I--)d.unshift("..");return d},normalize:function(d){var E=d.charAt(0)==="/",I=d.substr(-1)==="/";return d=bt.normalizeArray(d.split("/").filter(function(k){return!!k}),!E).join("/"),!d&&!E&&(d="."),d&&I&&(d+="/"),(E?"/":"")+d},dirname:function(d){var E=bt.splitPath(d),I=E[0],k=E[1];return!I&&!k?".":(k&&(k=k.substr(0,k.length-1)),I+k)},basename:function(d){if(d==="/")return"/";d=bt.normalize(d),d=d.replace(/\/$/,"");var E=d.lastIndexOf("/");return E===-1?d:d.substr(E+1)},extname:function(d){return bt.splitPath(d)[3]},join:function(){var d=Array.prototype.slice.call(arguments,0);return bt.normalize(d.join("/"))},join2:function(d,E){return bt.normalize(d+"/"+E)}};function Ll(){if(typeof crypto=="object"&&typeof crypto.getRandomValues=="function"){var d=new Uint8Array(1);return function(){return crypto.getRandomValues(d),d[0]}}else if(g)try{var E=J("crypto");return function(){return E.randomBytes(1)[0]}}catch{}return function(){wr("randomDevice")}}var Nn={resolve:function(){for(var d="",E=!1,I=arguments.length-1;I>=-1&&!E;I--){var k=I>=0?arguments[I]:S.cwd();if(typeof k!="string")throw new TypeError("Arguments to path.resolve must be strings");if(!k)return"";d=k+"/"+d,E=k.charAt(0)==="/"}return d=bt.normalizeArray(d.split("/").filter(function(L){return!!L}),!E).join("/"),(E?"/":"")+d||"."},relative:function(d,E){d=Nn.resolve(d).substr(1),E=Nn.resolve(E).substr(1);function I(Je){for(var nt=0;nt<Je.length&&Je[nt]==="";nt++);for(var wt=Je.length-1;wt>=0&&Je[wt]==="";wt--);return nt>wt?[]:Je.slice(nt,wt-nt+1)}for(var k=I(d.split("/")),L=I(E.split("/")),Z=Math.min(k.length,L.length),te=Z,we=0;we<Z;we++)if(k[we]!==L[we]){te=we;break}for(var me=[],we=te;we<k.length;we++)me.push("..");return me=me.concat(L.slice(te)),me.join("/")}},ns={ttys:[],init:function(){},shutdown:function(){},register:function(d,E){ns.ttys[d]={input:[],output:[],ops:E},S.registerDevice(d,ns.stream_ops)},stream_ops:{open:function(d){var E=ns.ttys[d.node.rdev];if(!E)throw new S.ErrnoError(43);d.tty=E,d.seekable=!1},close:function(d){d.tty.ops.flush(d.tty)},flush:function(d){d.tty.ops.flush(d.tty)},read:function(d,E,I,k,L){if(!d.tty||!d.tty.ops.get_char)throw new S.ErrnoError(60);for(var Z=0,te=0;te<k;te++){var we;try{we=d.tty.ops.get_char(d.tty)}catch{throw new S.ErrnoError(29)}if(we===void 0&&Z===0)throw new S.ErrnoError(6);if(we==null)break;Z++,E[I+te]=we}return Z&&(d.node.timestamp=Date.now()),Z},write:function(d,E,I,k,L){if(!d.tty||!d.tty.ops.put_char)throw new S.ErrnoError(60);try{for(var Z=0;Z<k;Z++)d.tty.ops.put_char(d.tty,E[I+Z])}catch{throw new S.ErrnoError(29)}return k&&(d.node.timestamp=Date.now()),Z}},default_tty_ops:{get_char:function(d){if(!d.input.length){var E=null;if(g){var I=256,k=Buffer.alloc?Buffer.alloc(I):new Buffer(I),L=0;try{L=y.readSync(process.stdin.fd,k,0,I,null)}catch(Z){if(Z.toString().includes("EOF"))L=0;else throw Z}L>0?E=k.slice(0,L).toString("utf-8"):E=null}else typeof window<"u"&&typeof window.prompt=="function"?(E=window.prompt("Input: "),E!==null&&(E+=`
-`)):typeof readline=="function"&&(E=readline(),E!==null&&(E+=`
-`));if(!E)return null;d.input=yA(E,!0)}return d.input.shift()},put_char:function(d,E){E===null||E===10?(v(ke(d.output,0)),d.output=[]):E!=0&&d.output.push(E)},flush:function(d){d.output&&d.output.length>0&&(v(ke(d.output,0)),d.output=[])}},default_tty1_ops:{put_char:function(d,E){E===null||E===10?(D(ke(d.output,0)),d.output=[]):E!=0&&d.output.push(E)},flush:function(d){d.output&&d.output.length>0&&(D(ke(d.output,0)),d.output=[])}}};function ss(d){for(var E=H(d,65536),I=dt(E);d<E;)ne[I+d++]=0;return I}var gt={ops_table:null,mount:function(d){return gt.createNode(null,"/",16895,0)},createNode:function(d,E,I,k){if(S.isBlkdev(I)||S.isFIFO(I))throw new S.ErrnoError(63);gt.ops_table||(gt.ops_table={dir:{node:{getattr:gt.node_ops.getattr,setattr:gt.node_ops.setattr,lookup:gt.node_ops.lookup,mknod:gt.node_ops.mknod,rename:gt.node_ops.rename,unlink:gt.node_ops.unlink,rmdir:gt.node_ops.rmdir,readdir:gt.node_ops.readdir,symlink:gt.node_ops.symlink},stream:{llseek:gt.stream_ops.llseek}},file:{node:{getattr:gt.node_ops.getattr,setattr:gt.node_ops.setattr},stream:{llseek:gt.stream_ops.llseek,read:gt.stream_ops.read,write:gt.stream_ops.write,allocate:gt.stream_ops.allocate,mmap:gt.stream_ops.mmap,msync:gt.stream_ops.msync}},link:{node:{getattr:gt.node_ops.getattr,setattr:gt.node_ops.setattr,readlink:gt.node_ops.readlink},stream:{}},chrdev:{node:{getattr:gt.node_ops.getattr,setattr:gt.node_ops.setattr},stream:S.chrdev_stream_ops}});var L=S.createNode(d,E,I,k);return S.isDir(L.mode)?(L.node_ops=gt.ops_table.dir.node,L.stream_ops=gt.ops_table.dir.stream,L.contents={}):S.isFile(L.mode)?(L.node_ops=gt.ops_table.file.node,L.stream_ops=gt.ops_table.file.stream,L.usedBytes=0,L.contents=null):S.isLink(L.mode)?(L.node_ops=gt.ops_table.link.node,L.stream_ops=gt.ops_table.link.stream):S.isChrdev(L.mode)&&(L.node_ops=gt.ops_table.chrdev.node,L.stream_ops=gt.ops_table.chrdev.stream),L.timestamp=Date.now(),d&&(d.contents[E]=L,d.timestamp=L.timestamp),L},getFileDataAsTypedArray:function(d){return d.contents?d.contents.subarray?d.contents.subarray(0,d.usedBytes):new Uint8Array(d.contents):new Uint8Array(0)},expandFileStorage:function(d,E){var I=d.contents?d.contents.length:0;if(!(I>=E)){var k=1024*1024;E=Math.max(E,I*(I<k?2:1.125)>>>0),I!=0&&(E=Math.max(E,256));var L=d.contents;d.contents=new Uint8Array(E),d.usedBytes>0&&d.contents.set(L.subarray(0,d.usedBytes),0)}},resizeFileStorage:function(d,E){if(d.usedBytes!=E)if(E==0)d.contents=null,d.usedBytes=0;else{var I=d.contents;d.contents=new Uint8Array(E),I&&d.contents.set(I.subarray(0,Math.min(E,d.usedBytes))),d.usedBytes=E}},node_ops:{getattr:function(d){var E={};return E.dev=S.isChrdev(d.mode)?d.id:1,E.ino=d.id,E.mode=d.mode,E.nlink=1,E.uid=0,E.gid=0,E.rdev=d.rdev,S.isDir(d.mode)?E.size=4096:S.isFile(d.mode)?E.size=d.usedBytes:S.isLink(d.mode)?E.size=d.link.length:E.size=0,E.atime=new Date(d.timestamp),E.mtime=new Date(d.timestamp),E.ctime=new Date(d.timestamp),E.blksize=4096,E.blocks=Math.ceil(E.size/E.blksize),E},setattr:function(d,E){E.mode!==void 0&&(d.mode=E.mode),E.timestamp!==void 0&&(d.timestamp=E.timestamp),E.size!==void 0&&gt.resizeFileStorage(d,E.size)},lookup:function(d,E){throw S.genericErrors[44]},mknod:function(d,E,I,k){return gt.createNode(d,E,I,k)},rename:function(d,E,I){if(S.isDir(d.mode)){var k;try{k=S.lookupNode(E,I)}catch{}if(k)for(var L in k.contents)throw new S.ErrnoError(55)}delete d.parent.contents[d.name],d.parent.timestamp=Date.now(),d.name=I,E.contents[I]=d,E.timestamp=d.parent.timestamp,d.parent=E},unlink:function(d,E){delete d.contents[E],d.timestamp=Date.now()},rmdir:function(d,E){var I=S.lookupNode(d,E);for(var k in I.contents)throw new S.ErrnoError(55);delete d.contents[E],d.timestamp=Date.now()},readdir:function(d){var E=[".",".."];for(var I in d.contents)!d.contents.hasOwnProperty(I)||E.push(I);return E},symlink:function(d,E,I){var k=gt.createNode(d,E,41471,0);return k.link=I,k},readlink:function(d){if(!S.isLink(d.mode))throw new S.ErrnoError(28);return d.link}},stream_ops:{read:function(d,E,I,k,L){var Z=d.node.contents;if(L>=d.node.usedBytes)return 0;var te=Math.min(d.node.usedBytes-L,k);if(te>8&&Z.subarray)E.set(Z.subarray(L,L+te),I);else for(var we=0;we<te;we++)E[I+we]=Z[L+we];return te},write:function(d,E,I,k,L,Z){if(E.buffer===ne.buffer&&(Z=!1),!k)return 0;var te=d.node;if(te.timestamp=Date.now(),E.subarray&&(!te.contents||te.contents.subarray)){if(Z)return te.contents=E.subarray(I,I+k),te.usedBytes=k,k;if(te.usedBytes===0&&L===0)return te.contents=E.slice(I,I+k),te.usedBytes=k,k;if(L+k<=te.usedBytes)return te.contents.set(E.subarray(I,I+k),L),k}if(gt.expandFileStorage(te,L+k),te.contents.subarray&&E.subarray)te.contents.set(E.subarray(I,I+k),L);else for(var we=0;we<k;we++)te.contents[L+we]=E[I+we];return te.usedBytes=Math.max(te.usedBytes,L+k),k},llseek:function(d,E,I){var k=E;if(I===1?k+=d.position:I===2&&S.isFile(d.node.mode)&&(k+=d.node.usedBytes),k<0)throw new S.ErrnoError(28);return k},allocate:function(d,E,I){gt.expandFileStorage(d.node,E+I),d.node.usedBytes=Math.max(d.node.usedBytes,E+I)},mmap:function(d,E,I,k,L,Z){if(E!==0)throw new S.ErrnoError(28);if(!S.isFile(d.node.mode))throw new S.ErrnoError(43);var te,we,me=d.node.contents;if(!(Z&2)&&me.buffer===qe)we=!1,te=me.byteOffset;else{if((k>0||k+I<me.length)&&(me.subarray?me=me.subarray(k,k+I):me=Array.prototype.slice.call(me,k,k+I)),we=!0,te=ss(I),!te)throw new S.ErrnoError(48);ne.set(me,te)}return{ptr:te,allocated:we}},msync:function(d,E,I,k,L){if(!S.isFile(d.node.mode))throw new S.ErrnoError(43);if(L&2)return 0;var Z=gt.stream_ops.write(d,E,0,k,I,!1);return 0}}},Bo={EPERM:63,ENOENT:44,ESRCH:71,EINTR:27,EIO:29,ENXIO:60,E2BIG:1,ENOEXEC:45,EBADF:8,ECHILD:12,EAGAIN:6,EWOULDBLOCK:6,ENOMEM:48,EACCES:2,EFAULT:21,ENOTBLK:105,EBUSY:10,EEXIST:20,EXDEV:75,ENODEV:43,ENOTDIR:54,EISDIR:31,EINVAL:28,ENFILE:41,EMFILE:33,ENOTTY:59,ETXTBSY:74,EFBIG:22,ENOSPC:51,ESPIPE:70,EROFS:69,EMLINK:34,EPIPE:64,EDOM:18,ERANGE:68,ENOMSG:49,EIDRM:24,ECHRNG:106,EL2NSYNC:156,EL3HLT:107,EL3RST:108,ELNRNG:109,EUNATCH:110,ENOCSI:111,EL2HLT:112,EDEADLK:16,ENOLCK:46,EBADE:113,EBADR:114,EXFULL:115,ENOANO:104,EBADRQC:103,EBADSLT:102,EDEADLOCK:16,EBFONT:101,ENOSTR:100,ENODATA:116,ETIME:117,ENOSR:118,ENONET:119,ENOPKG:120,EREMOTE:121,ENOLINK:47,EADV:122,ESRMNT:123,ECOMM:124,EPROTO:65,EMULTIHOP:36,EDOTDOT:125,EBADMSG:9,ENOTUNIQ:126,EBADFD:127,EREMCHG:128,ELIBACC:129,ELIBBAD:130,ELIBSCN:131,ELIBMAX:132,ELIBEXEC:133,ENOSYS:52,ENOTEMPTY:55,ENAMETOOLONG:37,ELOOP:32,EOPNOTSUPP:138,EPFNOSUPPORT:139,ECONNRESET:15,ENOBUFS:42,EAFNOSUPPORT:5,EPROTOTYPE:67,ENOTSOCK:57,ENOPROTOOPT:50,ESHUTDOWN:140,ECONNREFUSED:14,EADDRINUSE:3,ECONNABORTED:13,ENETUNREACH:40,ENETDOWN:38,ETIMEDOUT:73,EHOSTDOWN:142,EHOSTUNREACH:23,EINPROGRESS:26,EALREADY:7,EDESTADDRREQ:17,EMSGSIZE:35,EPROTONOSUPPORT:66,ESOCKTNOSUPPORT:137,EADDRNOTAVAIL:4,ENETRESET:39,EISCONN:30,ENOTCONN:53,ETOOMANYREFS:141,EUSERS:136,EDQUOT:19,ESTALE:72,ENOTSUP:138,ENOMEDIUM:148,EILSEQ:25,EOVERFLOW:61,ECANCELED:11,ENOTRECOVERABLE:56,EOWNERDEAD:62,ESTRPIPE:135},At={isWindows:!1,staticInit:function(){At.isWindows=!!process.platform.match(/^win/);var d={fs:Le.constants};d.fs&&(d=d.fs),At.flagsForNodeMap={1024:d.O_APPEND,64:d.O_CREAT,128:d.O_EXCL,256:d.O_NOCTTY,0:d.O_RDONLY,2:d.O_RDWR,4096:d.O_SYNC,512:d.O_TRUNC,1:d.O_WRONLY}},bufferFrom:function(d){return Buffer.alloc?Buffer.from(d):new Buffer(d)},convertNodeCode:function(d){var E=d.code;return Bo[E]},mount:function(d){return At.createNode(null,"/",At.getMode(d.opts.root),0)},createNode:function(d,E,I,k){if(!S.isDir(I)&&!S.isFile(I)&&!S.isLink(I))throw new S.ErrnoError(28);var L=S.createNode(d,E,I);return L.node_ops=At.node_ops,L.stream_ops=At.stream_ops,L},getMode:function(d){var E;try{E=Le.lstatSync(d),At.isWindows&&(E.mode=E.mode|(E.mode&292)>>2)}catch(I){throw I.code?new S.ErrnoError(At.convertNodeCode(I)):I}return E.mode},realPath:function(d){for(var E=[];d.parent!==d;)E.push(d.name),d=d.parent;return E.push(d.mount.opts.root),E.reverse(),bt.join.apply(null,E)},flagsForNode:function(d){d&=-2097153,d&=-2049,d&=-32769,d&=-524289;var E=0;for(var I in At.flagsForNodeMap)d&I&&(E|=At.flagsForNodeMap[I],d^=I);if(d)throw new S.ErrnoError(28);return E},node_ops:{getattr:function(d){var E=At.realPath(d),I;try{I=Le.lstatSync(E)}catch(k){throw k.code?new S.ErrnoError(At.convertNodeCode(k)):k}return At.isWindows&&!I.blksize&&(I.blksize=4096),At.isWindows&&!I.blocks&&(I.blocks=(I.size+I.blksize-1)/I.blksize|0),{dev:I.dev,ino:I.ino,mode:I.mode,nlink:I.nlink,uid:I.uid,gid:I.gid,rdev:I.rdev,size:I.size,atime:I.atime,mtime:I.mtime,ctime:I.ctime,blksize:I.blksize,blocks:I.blocks}},setattr:function(d,E){var I=At.realPath(d);try{if(E.mode!==void 0&&(Le.chmodSync(I,E.mode),d.mode=E.mode),E.timestamp!==void 0){var k=new Date(E.timestamp);Le.utimesSync(I,k,k)}E.size!==void 0&&Le.truncateSync(I,E.size)}catch(L){throw L.code?new S.ErrnoError(At.convertNodeCode(L)):L}},lookup:function(d,E){var I=bt.join2(At.realPath(d),E),k=At.getMode(I);return At.createNode(d,E,k)},mknod:function(d,E,I,k){var L=At.createNode(d,E,I,k),Z=At.realPath(L);try{S.isDir(L.mode)?Le.mkdirSync(Z,L.mode):Le.writeFileSync(Z,"",{mode:L.mode})}catch(te){throw te.code?new S.ErrnoError(At.convertNodeCode(te)):te}return L},rename:function(d,E,I){var k=At.realPath(d),L=bt.join2(At.realPath(E),I);try{Le.renameSync(k,L)}catch(Z){throw Z.code?new S.ErrnoError(At.convertNodeCode(Z)):Z}d.name=I},unlink:function(d,E){var I=bt.join2(At.realPath(d),E);try{Le.unlinkSync(I)}catch(k){throw k.code?new S.ErrnoError(At.convertNodeCode(k)):k}},rmdir:function(d,E){var I=bt.join2(At.realPath(d),E);try{Le.rmdirSync(I)}catch(k){throw k.code?new S.ErrnoError(At.convertNodeCode(k)):k}},readdir:function(d){var E=At.realPath(d);try{return Le.readdirSync(E)}catch(I){throw I.code?new S.ErrnoError(At.convertNodeCode(I)):I}},symlink:function(d,E,I){var k=bt.join2(At.realPath(d),E);try{Le.symlinkSync(I,k)}catch(L){throw L.code?new S.ErrnoError(At.convertNodeCode(L)):L}},readlink:function(d){var E=At.realPath(d);try{return E=Le.readlinkSync(E),E=dg.relative(dg.resolve(d.mount.opts.root),E),E}catch(I){throw I.code?new S.ErrnoError(At.convertNodeCode(I)):I}}},stream_ops:{open:function(d){var E=At.realPath(d.node);try{S.isFile(d.node.mode)&&(d.nfd=Le.openSync(E,At.flagsForNode(d.flags)))}catch(I){throw I.code?new S.ErrnoError(At.convertNodeCode(I)):I}},close:function(d){try{S.isFile(d.node.mode)&&d.nfd&&Le.closeSync(d.nfd)}catch(E){throw E.code?new S.ErrnoError(At.convertNodeCode(E)):E}},read:function(d,E,I,k,L){if(k===0)return 0;try{return Le.readSync(d.nfd,At.bufferFrom(E.buffer),I,k,L)}catch(Z){throw new S.ErrnoError(At.convertNodeCode(Z))}},write:function(d,E,I,k,L){try{return Le.writeSync(d.nfd,At.bufferFrom(E.buffer),I,k,L)}catch(Z){throw new S.ErrnoError(At.convertNodeCode(Z))}},llseek:function(d,E,I){var k=E;if(I===1)k+=d.position;else if(I===2&&S.isFile(d.node.mode))try{var L=Le.fstatSync(d.nfd);k+=L.size}catch(Z){throw new S.ErrnoError(At.convertNodeCode(Z))}if(k<0)throw new S.ErrnoError(28);return k},mmap:function(d,E,I,k,L,Z){if(E!==0)throw new S.ErrnoError(28);if(!S.isFile(d.node.mode))throw new S.ErrnoError(43);var te=ss(I);return At.stream_ops.read(d,ne,te,I,k),{ptr:te,allocated:!0}},msync:function(d,E,I,k,L){if(!S.isFile(d.node.mode))throw new S.ErrnoError(43);if(L&2)return 0;var Z=At.stream_ops.write(d,E,0,k,I,!1);return 0}}},ln={lookupPath:function(d){return{path:d,node:{mode:At.getMode(d)}}},createStandardStreams:function(){S.streams[0]={fd:0,nfd:0,position:0,path:"",flags:0,tty:!0,seekable:!1};for(var d=1;d<3;d++)S.streams[d]={fd:d,nfd:d,position:0,path:"",flags:577,tty:!0,seekable:!1}},cwd:function(){return process.cwd()},chdir:function(){process.chdir.apply(void 0,arguments)},mknod:function(d,E){S.isDir(d)?Le.mkdirSync(d,E):Le.writeFileSync(d,"",{mode:E})},mkdir:function(){Le.mkdirSync.apply(void 0,arguments)},symlink:function(){Le.symlinkSync.apply(void 0,arguments)},rename:function(){Le.renameSync.apply(void 0,arguments)},rmdir:function(){Le.rmdirSync.apply(void 0,arguments)},readdir:function(){Le.readdirSync.apply(void 0,arguments)},unlink:function(){Le.unlinkSync.apply(void 0,arguments)},readlink:function(){return Le.readlinkSync.apply(void 0,arguments)},stat:function(){return Le.statSync.apply(void 0,arguments)},lstat:function(){return Le.lstatSync.apply(void 0,arguments)},chmod:function(){Le.chmodSync.apply(void 0,arguments)},fchmod:function(){Le.fchmodSync.apply(void 0,arguments)},chown:function(){Le.chownSync.apply(void 0,arguments)},fchown:function(){Le.fchownSync.apply(void 0,arguments)},truncate:function(){Le.truncateSync.apply(void 0,arguments)},ftruncate:function(d,E){if(E<0)throw new S.ErrnoError(28);Le.ftruncateSync.apply(void 0,arguments)},utime:function(){Le.utimesSync.apply(void 0,arguments)},open:function(d,E,I,k){typeof E=="string"&&(E=Hs.modeStringToFlags(E));var L=Le.openSync(d,At.flagsForNode(E),I),Z=k!=null?k:S.nextfd(L),te={fd:Z,nfd:L,position:0,path:d,flags:E,seekable:!0};return S.streams[Z]=te,te},close:function(d){d.stream_ops||Le.closeSync(d.nfd),S.closeStream(d.fd)},llseek:function(d,E,I){if(d.stream_ops)return Hs.llseek(d,E,I);var k=E;if(I===1)k+=d.position;else if(I===2)k+=Le.fstatSync(d.nfd).size;else if(I!==0)throw new S.ErrnoError(Bo.EINVAL);if(k<0)throw new S.ErrnoError(Bo.EINVAL);return d.position=k,k},read:function(d,E,I,k,L){if(d.stream_ops)return Hs.read(d,E,I,k,L);var Z=typeof L<"u";!Z&&d.seekable&&(L=d.position);var te=Le.readSync(d.nfd,At.bufferFrom(E.buffer),I,k,L);return Z||(d.position+=te),te},write:function(d,E,I,k,L){if(d.stream_ops)return Hs.write(d,E,I,k,L);d.flags&+"1024"&&S.llseek(d,0,+"2");var Z=typeof L<"u";!Z&&d.seekable&&(L=d.position);var te=Le.writeSync(d.nfd,At.bufferFrom(E.buffer),I,k,L);return Z||(d.position+=te),te},allocate:function(){throw new S.ErrnoError(Bo.EOPNOTSUPP)},mmap:function(d,E,I,k,L,Z){if(d.stream_ops)return Hs.mmap(d,E,I,k,L,Z);if(E!==0)throw new S.ErrnoError(28);var te=ss(I);return S.read(d,ne,te,I,k),{ptr:te,allocated:!0}},msync:function(d,E,I,k,L){return d.stream_ops?Hs.msync(d,E,I,k,L):(L&2||S.write(d,E,0,k,I),0)},munmap:function(){return 0},ioctl:function(){throw new S.ErrnoError(Bo.ENOTTY)}},S={root:null,mounts:[],devices:{},streams:[],nextInode:1,nameTable:null,currentPath:"/",initialized:!1,ignorePermissions:!0,trackingDelegate:{},tracking:{openFlags:{READ:1,WRITE:2}},ErrnoError:null,genericErrors:{},filesystems:null,syncFSRequests:0,lookupPath:function(d,E){if(d=Nn.resolve(S.cwd(),d),E=E||{},!d)return{path:"",node:null};var I={follow_mount:!0,recurse_count:0};for(var k in I)E[k]===void 0&&(E[k]=I[k]);if(E.recurse_count>8)throw new S.ErrnoError(32);for(var L=bt.normalizeArray(d.split("/").filter(function(lt){return!!lt}),!1),Z=S.root,te="/",we=0;we<L.length;we++){var me=we===L.length-1;if(me&&E.parent)break;if(Z=S.lookupNode(Z,L[we]),te=bt.join2(te,L[we]),S.isMountpoint(Z)&&(!me||me&&E.follow_mount)&&(Z=Z.mounted.root),!me||E.follow)for(var Je=0;S.isLink(Z.mode);){var nt=S.readlink(te);te=Nn.resolve(bt.dirname(te),nt);var wt=S.lookupPath(te,{recurse_count:E.recurse_count});if(Z=wt.node,Je++>40)throw new S.ErrnoError(32)}}return{path:te,node:Z}},getPath:function(d){for(var E;;){if(S.isRoot(d)){var I=d.mount.mountpoint;return E?I[I.length-1]!=="/"?I+"/"+E:I+E:I}E=E?d.name+"/"+E:d.name,d=d.parent}},hashName:function(d,E){for(var I=0,k=0;k<E.length;k++)I=(I<<5)-I+E.charCodeAt(k)|0;return(d+I>>>0)%S.nameTable.length},hashAddNode:function(d){var E=S.hashName(d.parent.id,d.name);d.name_next=S.nameTable[E],S.nameTable[E]=d},hashRemoveNode:function(d){var E=S.hashName(d.parent.id,d.name);if(S.nameTable[E]===d)S.nameTable[E]=d.name_next;else for(var I=S.nameTable[E];I;){if(I.name_next===d){I.name_next=d.name_next;break}I=I.name_next}},lookupNode:function(d,E){var I=S.mayLookup(d);if(I)throw new S.ErrnoError(I,d);for(var k=S.hashName(d.id,E),L=S.nameTable[k];L;L=L.name_next){var Z=L.name;if(L.parent.id===d.id&&Z===E)return L}return S.lookup(d,E)},createNode:function(d,E,I,k){var L=new S.FSNode(d,E,I,k);return S.hashAddNode(L),L},destroyNode:function(d){S.hashRemoveNode(d)},isRoot:function(d){return d===d.parent},isMountpoint:function(d){return!!d.mounted},isFile:function(d){return(d&61440)===32768},isDir:function(d){return(d&61440)===16384},isLink:function(d){return(d&61440)===40960},isChrdev:function(d){return(d&61440)===8192},isBlkdev:function(d){return(d&61440)===24576},isFIFO:function(d){return(d&61440)===4096},isSocket:function(d){return(d&49152)===49152},flagModes:{r:0,"r+":2,w:577,"w+":578,a:1089,"a+":1090},modeStringToFlags:function(d){var E=S.flagModes[d];if(typeof E>"u")throw new Error("Unknown file open mode: "+d);return E},flagsToPermissionString:function(d){var E=["r","w","rw"][d&3];return d&512&&(E+="w"),E},nodePermissions:function(d,E){return S.ignorePermissions?0:E.includes("r")&&!(d.mode&292)||E.includes("w")&&!(d.mode&146)||E.includes("x")&&!(d.mode&73)?2:0},mayLookup:function(d){var E=S.nodePermissions(d,"x");return E||(d.node_ops.lookup?0:2)},mayCreate:function(d,E){try{var I=S.lookupNode(d,E);return 20}catch{}return S.nodePermissions(d,"wx")},mayDelete:function(d,E,I){var k;try{k=S.lookupNode(d,E)}catch(Z){return Z.errno}var L=S.nodePermissions(d,"wx");if(L)return L;if(I){if(!S.isDir(k.mode))return 54;if(S.isRoot(k)||S.getPath(k)===S.cwd())return 10}else if(S.isDir(k.mode))return 31;return 0},mayOpen:function(d,E){return d?S.isLink(d.mode)?32:S.isDir(d.mode)&&(S.flagsToPermissionString(E)!=="r"||E&512)?31:S.nodePermissions(d,S.flagsToPermissionString(E)):44},MAX_OPEN_FDS:4096,nextfd:function(d,E){d=d||0,E=E||S.MAX_OPEN_FDS;for(var I=d;I<=E;I++)if(!S.streams[I])return I;throw new S.ErrnoError(33)},getStream:function(d){return S.streams[d]},createStream:function(d,E,I){S.FSStream||(S.FSStream=function(){},S.FSStream.prototype={object:{get:function(){return this.node},set:function(te){this.node=te}},isRead:{get:function(){return(this.flags&2097155)!==1}},isWrite:{get:function(){return(this.flags&2097155)!==0}},isAppend:{get:function(){return this.flags&1024}}});var k=new S.FSStream;for(var L in d)k[L]=d[L];d=k;var Z=S.nextfd(E,I);return d.fd=Z,S.streams[Z]=d,d},closeStream:function(d){S.streams[d]=null},chrdev_stream_ops:{open:function(d){var E=S.getDevice(d.node.rdev);d.stream_ops=E.stream_ops,d.stream_ops.open&&d.stream_ops.open(d)},llseek:function(){throw new S.ErrnoError(70)}},major:function(d){return d>>8},minor:function(d){return d&255},makedev:function(d,E){return d<<8|E},registerDevice:function(d,E){S.devices[d]={stream_ops:E}},getDevice:function(d){return S.devices[d]},getMounts:function(d){for(var E=[],I=[d];I.length;){var k=I.pop();E.push(k),I.push.apply(I,k.mounts)}return E},syncfs:function(d,E){typeof d=="function"&&(E=d,d=!1),S.syncFSRequests++,S.syncFSRequests>1&&D("warning: "+S.syncFSRequests+" FS.syncfs operations in flight at once, probably just doing extra work");var I=S.getMounts(S.root.mount),k=0;function L(te){return S.syncFSRequests--,E(te)}function Z(te){if(te)return Z.errored?void 0:(Z.errored=!0,L(te));++k>=I.length&&L(null)}I.forEach(function(te){if(!te.type.syncfs)return Z(null);te.type.syncfs(te,d,Z)})},mount:function(d,E,I){var k=I==="/",L=!I,Z;if(k&&S.root)throw new S.ErrnoError(10);if(!k&&!L){var te=S.lookupPath(I,{follow_mount:!1});if(I=te.path,Z=te.node,S.isMountpoint(Z))throw new S.ErrnoError(10);if(!S.isDir(Z.mode))throw new S.ErrnoError(54)}var we={type:d,opts:E,mountpoint:I,mounts:[]},me=d.mount(we);return me.mount=we,we.root=me,k?S.root=me:Z&&(Z.mounted=we,Z.mount&&Z.mount.mounts.push(we)),me},unmount:function(d){var E=S.lookupPath(d,{follow_mount:!1});if(!S.isMountpoint(E.node))throw new S.ErrnoError(28);var I=E.node,k=I.mounted,L=S.getMounts(k);Object.keys(S.nameTable).forEach(function(te){for(var we=S.nameTable[te];we;){var me=we.name_next;L.includes(we.mount)&&S.destroyNode(we),we=me}}),I.mounted=null;var Z=I.mount.mounts.indexOf(k);I.mount.mounts.splice(Z,1)},lookup:function(d,E){return d.node_ops.lookup(d,E)},mknod:function(d,E,I){var k=S.lookupPath(d,{parent:!0}),L=k.node,Z=bt.basename(d);if(!Z||Z==="."||Z==="..")throw new S.ErrnoError(28);var te=S.mayCreate(L,Z);if(te)throw new S.ErrnoError(te);if(!L.node_ops.mknod)throw new S.ErrnoError(63);return L.node_ops.mknod(L,Z,E,I)},create:function(d,E){return E=E!==void 0?E:438,E&=4095,E|=32768,S.mknod(d,E,0)},mkdir:function(d,E){return E=E!==void 0?E:511,E&=1023,E|=16384,S.mknod(d,E,0)},mkdirTree:function(d,E){for(var I=d.split("/"),k="",L=0;L<I.length;++L)if(!!I[L]){k+="/"+I[L];try{S.mkdir(k,E)}catch(Z){if(Z.errno!=20)throw Z}}},mkdev:function(d,E,I){return typeof I>"u"&&(I=E,E=438),E|=8192,S.mknod(d,E,I)},symlink:function(d,E){if(!Nn.resolve(d))throw new S.ErrnoError(44);var I=S.lookupPath(E,{parent:!0}),k=I.node;if(!k)throw new S.ErrnoError(44);var L=bt.basename(E),Z=S.mayCreate(k,L);if(Z)throw new S.ErrnoError(Z);if(!k.node_ops.symlink)throw new S.ErrnoError(63);return k.node_ops.symlink(k,L,d)},rename:function(d,E){var I=bt.dirname(d),k=bt.dirname(E),L=bt.basename(d),Z=bt.basename(E),te,we,me;if(te=S.lookupPath(d,{parent:!0}),we=te.node,te=S.lookupPath(E,{parent:!0}),me=te.node,!we||!me)throw new S.ErrnoError(44);if(we.mount!==me.mount)throw new S.ErrnoError(75);var Je=S.lookupNode(we,L),nt=Nn.relative(d,k);if(nt.charAt(0)!==".")throw new S.ErrnoError(28);if(nt=Nn.relative(E,I),nt.charAt(0)!==".")throw new S.ErrnoError(55);var wt;try{wt=S.lookupNode(me,Z)}catch{}if(Je!==wt){var lt=S.isDir(Je.mode),it=S.mayDelete(we,L,lt);if(it)throw new S.ErrnoError(it);if(it=wt?S.mayDelete(me,Z,lt):S.mayCreate(me,Z),it)throw new S.ErrnoError(it);if(!we.node_ops.rename)throw new S.ErrnoError(63);if(S.isMountpoint(Je)||wt&&S.isMountpoint(wt))throw new S.ErrnoError(10);if(me!==we&&(it=S.nodePermissions(we,"w"),it))throw new S.ErrnoError(it);try{S.trackingDelegate.willMovePath&&S.trackingDelegate.willMovePath(d,E)}catch(Et){D("FS.trackingDelegate['willMovePath']('"+d+"', '"+E+"') threw an exception: "+Et.message)}S.hashRemoveNode(Je);try{we.node_ops.rename(Je,me,Z)}catch(Et){throw Et}finally{S.hashAddNode(Je)}try{S.trackingDelegate.onMovePath&&S.trackingDelegate.onMovePath(d,E)}catch(Et){D("FS.trackingDelegate['onMovePath']('"+d+"', '"+E+"') threw an exception: "+Et.message)}}},rmdir:function(d){var E=S.lookupPath(d,{parent:!0}),I=E.node,k=bt.basename(d),L=S.lookupNode(I,k),Z=S.mayDelete(I,k,!0);if(Z)throw new S.ErrnoError(Z);if(!I.node_ops.rmdir)throw new S.ErrnoError(63);if(S.isMountpoint(L))throw new S.ErrnoError(10);try{S.trackingDelegate.willDeletePath&&S.trackingDelegate.willDeletePath(d)}catch(te){D("FS.trackingDelegate['willDeletePath']('"+d+"') threw an exception: "+te.message)}I.node_ops.rmdir(I,k),S.destroyNode(L);try{S.trackingDelegate.onDeletePath&&S.trackingDelegate.onDeletePath(d)}catch(te){D("FS.trackingDelegate['onDeletePath']('"+d+"') threw an exception: "+te.message)}},readdir:function(d){var E=S.lookupPath(d,{follow:!0}),I=E.node;if(!I.node_ops.readdir)throw new S.ErrnoError(54);return I.node_ops.readdir(I)},unlink:function(d){var E=S.lookupPath(d,{parent:!0}),I=E.node,k=bt.basename(d),L=S.lookupNode(I,k),Z=S.mayDelete(I,k,!1);if(Z)throw new S.ErrnoError(Z);if(!I.node_ops.unlink)throw new S.ErrnoError(63);if(S.isMountpoint(L))throw new S.ErrnoError(10);try{S.trackingDelegate.willDeletePath&&S.trackingDelegate.willDeletePath(d)}catch(te){D("FS.trackingDelegate['willDeletePath']('"+d+"') threw an exception: "+te.message)}I.node_ops.unlink(I,k),S.destroyNode(L);try{S.trackingDelegate.onDeletePath&&S.trackingDelegate.onDeletePath(d)}catch(te){D("FS.trackingDelegate['onDeletePath']('"+d+"') threw an exception: "+te.message)}},readlink:function(d){var E=S.lookupPath(d),I=E.node;if(!I)throw new S.ErrnoError(44);if(!I.node_ops.readlink)throw new S.ErrnoError(28);return Nn.resolve(S.getPath(I.parent),I.node_ops.readlink(I))},stat:function(d,E){var I=S.lookupPath(d,{follow:!E}),k=I.node;if(!k)throw new S.ErrnoError(44);if(!k.node_ops.getattr)throw new S.ErrnoError(63);return k.node_ops.getattr(k)},lstat:function(d){return S.stat(d,!0)},chmod:function(d,E,I){var k;if(typeof d=="string"){var L=S.lookupPath(d,{follow:!I});k=L.node}else k=d;if(!k.node_ops.setattr)throw new S.ErrnoError(63);k.node_ops.setattr(k,{mode:E&4095|k.mode&-4096,timestamp:Date.now()})},lchmod:function(d,E){S.chmod(d,E,!0)},fchmod:function(d,E){var I=S.getStream(d);if(!I)throw new S.ErrnoError(8);S.chmod(I.node,E)},chown:function(d,E,I,k){var L;if(typeof d=="string"){var Z=S.lookupPath(d,{follow:!k});L=Z.node}else L=d;if(!L.node_ops.setattr)throw new S.ErrnoError(63);L.node_ops.setattr(L,{timestamp:Date.now()})},lchown:function(d,E,I){S.chown(d,E,I,!0)},fchown:function(d,E,I){var k=S.getStream(d);if(!k)throw new S.ErrnoError(8);S.chown(k.node,E,I)},truncate:function(d,E){if(E<0)throw new S.ErrnoError(28);var I;if(typeof d=="string"){var k=S.lookupPath(d,{follow:!0});I=k.node}else I=d;if(!I.node_ops.setattr)throw new S.ErrnoError(63);if(S.isDir(I.mode))throw new S.ErrnoError(31);if(!S.isFile(I.mode))throw new S.ErrnoError(28);var L=S.nodePermissions(I,"w");if(L)throw new S.ErrnoError(L);I.node_ops.setattr(I,{size:E,timestamp:Date.now()})},ftruncate:function(d,E){var I=S.getStream(d);if(!I)throw new S.ErrnoError(8);if((I.flags&2097155)===0)throw new S.ErrnoError(28);S.truncate(I.node,E)},utime:function(d,E,I){var k=S.lookupPath(d,{follow:!0}),L=k.node;L.node_ops.setattr(L,{timestamp:Math.max(E,I)})},open:function(d,E,I,k,L){if(d==="")throw new S.ErrnoError(44);E=typeof E=="string"?S.modeStringToFlags(E):E,I=typeof I>"u"?438:I,E&64?I=I&4095|32768:I=0;var Z;if(typeof d=="object")Z=d;else{d=bt.normalize(d);try{var te=S.lookupPath(d,{follow:!(E&131072)});Z=te.node}catch{}}var we=!1;if(E&64)if(Z){if(E&128)throw new S.ErrnoError(20)}else Z=S.mknod(d,I,0),we=!0;if(!Z)throw new S.ErrnoError(44);if(S.isChrdev(Z.mode)&&(E&=-513),E&65536&&!S.isDir(Z.mode))throw new S.ErrnoError(54);if(!we){var me=S.mayOpen(Z,E);if(me)throw new S.ErrnoError(me)}E&512&&S.truncate(Z,0),E&=-131713;var Je=S.createStream({node:Z,path:S.getPath(Z),flags:E,seekable:!0,position:0,stream_ops:Z.stream_ops,ungotten:[],error:!1},k,L);Je.stream_ops.open&&Je.stream_ops.open(Je),t.logReadFiles&&!(E&1)&&(S.readFiles||(S.readFiles={}),d in S.readFiles||(S.readFiles[d]=1,D("FS.trackingDelegate error on read file: "+d)));try{if(S.trackingDelegate.onOpenFile){var nt=0;(E&2097155)!==1&&(nt|=S.tracking.openFlags.READ),(E&2097155)!==0&&(nt|=S.tracking.openFlags.WRITE),S.trackingDelegate.onOpenFile(d,nt)}}catch(wt){D("FS.trackingDelegate['onOpenFile']('"+d+"', flags) threw an exception: "+wt.message)}return Je},close:function(d){if(S.isClosed(d))throw new S.ErrnoError(8);d.getdents&&(d.getdents=null);try{d.stream_ops.close&&d.stream_ops.close(d)}catch(E){throw E}finally{S.closeStream(d.fd)}d.fd=null},isClosed:function(d){return d.fd===null},llseek:function(d,E,I){if(S.isClosed(d))throw new S.ErrnoError(8);if(!d.seekable||!d.stream_ops.llseek)throw new S.ErrnoError(70);if(I!=0&&I!=1&&I!=2)throw new S.ErrnoError(28);return d.position=d.stream_ops.llseek(d,E,I),d.ungotten=[],d.position},read:function(d,E,I,k,L){if(k<0||L<0)throw new S.ErrnoError(28);if(S.isClosed(d))throw new S.ErrnoError(8);if((d.flags&2097155)===1)throw new S.ErrnoError(8);if(S.isDir(d.node.mode))throw new S.ErrnoError(31);if(!d.stream_ops.read)throw new S.ErrnoError(28);var Z=typeof L<"u";if(!Z)L=d.position;else if(!d.seekable)throw new S.ErrnoError(70);var te=d.stream_ops.read(d,E,I,k,L);return Z||(d.position+=te),te},write:function(d,E,I,k,L,Z){if(k<0||L<0)throw new S.ErrnoError(28);if(S.isClosed(d))throw new S.ErrnoError(8);if((d.flags&2097155)===0)throw new S.ErrnoError(8);if(S.isDir(d.node.mode))throw new S.ErrnoError(31);if(!d.stream_ops.write)throw new S.ErrnoError(28);d.seekable&&d.flags&1024&&S.llseek(d,0,2);var te=typeof L<"u";if(!te)L=d.position;else if(!d.seekable)throw new S.ErrnoError(70);var we=d.stream_ops.write(d,E,I,k,L,Z);te||(d.position+=we);try{d.path&&S.trackingDelegate.onWriteToFile&&S.trackingDelegate.onWriteToFile(d.path)}catch(me){D("FS.trackingDelegate['onWriteToFile']('"+d.path+"') threw an exception: "+me.message)}return we},allocate:function(d,E,I){if(S.isClosed(d))throw new S.ErrnoError(8);if(E<0||I<=0)throw new S.ErrnoError(28);if((d.flags&2097155)===0)throw new S.ErrnoError(8);if(!S.isFile(d.node.mode)&&!S.isDir(d.node.mode))throw new S.ErrnoError(43);if(!d.stream_ops.allocate)throw new S.ErrnoError(138);d.stream_ops.allocate(d,E,I)},mmap:function(d,E,I,k,L,Z){if((L&2)!==0&&(Z&2)===0&&(d.flags&2097155)!==2)throw new S.ErrnoError(2);if((d.flags&2097155)===1)throw new S.ErrnoError(2);if(!d.stream_ops.mmap)throw new S.ErrnoError(43);return d.stream_ops.mmap(d,E,I,k,L,Z)},msync:function(d,E,I,k,L){return!d||!d.stream_ops.msync?0:d.stream_ops.msync(d,E,I,k,L)},munmap:function(d){return 0},ioctl:function(d,E,I){if(!d.stream_ops.ioctl)throw new S.ErrnoError(59);return d.stream_ops.ioctl(d,E,I)},readFile:function(d,E){if(E=E||{},E.flags=E.flags||0,E.encoding=E.encoding||"binary",E.encoding!=="utf8"&&E.encoding!=="binary")throw new Error('Invalid encoding type "'+E.encoding+'"');var I,k=S.open(d,E.flags),L=S.stat(d),Z=L.size,te=new Uint8Array(Z);return S.read(k,te,0,Z,0),E.encoding==="utf8"?I=ke(te,0):E.encoding==="binary"&&(I=te),S.close(k),I},writeFile:function(d,E,I){I=I||{},I.flags=I.flags||577;var k=S.open(d,I.flags,I.mode);if(typeof E=="string"){var L=new Uint8Array(le(E)+1),Z=Ne(E,L,0,L.length);S.write(k,L,0,Z,void 0,I.canOwn)}else if(ArrayBuffer.isView(E))S.write(k,E,0,E.byteLength,void 0,I.canOwn);else throw new Error("Unsupported data type");S.close(k)},cwd:function(){return S.currentPath},chdir:function(d){var E=S.lookupPath(d,{follow:!0});if(E.node===null)throw new S.ErrnoError(44);if(!S.isDir(E.node.mode))throw new S.ErrnoError(54);var I=S.nodePermissions(E.node,"x");if(I)throw new S.ErrnoError(I);S.currentPath=E.path},createDefaultDirectories:function(){S.mkdir("/tmp"),S.mkdir("/home"),S.mkdir("/home/web_user")},createDefaultDevices:function(){S.mkdir("/dev"),S.registerDevice(S.makedev(1,3),{read:function(){return 0},write:function(E,I,k,L,Z){return L}}),S.mkdev("/dev/null",S.makedev(1,3)),ns.register(S.makedev(5,0),ns.default_tty_ops),ns.register(S.makedev(6,0),ns.default_tty1_ops),S.mkdev("/dev/tty",S.makedev(5,0)),S.mkdev("/dev/tty1",S.makedev(6,0));var d=Ll();S.createDevice("/dev","random",d),S.createDevice("/dev","urandom",d),S.mkdir("/dev/shm"),S.mkdir("/dev/shm/tmp")},createSpecialDirectories:function(){S.mkdir("/proc");var d=S.mkdir("/proc/self");S.mkdir("/proc/self/fd"),S.mount({mount:function(){var E=S.createNode(d,"fd",16895,73);return E.node_ops={lookup:function(I,k){var L=+k,Z=S.getStream(L);if(!Z)throw new S.ErrnoError(8);var te={parent:null,mount:{mountpoint:"fake"},node_ops:{readlink:function(){return Z.path}}};return te.parent=te,te}},E}},{},"/proc/self/fd")},createStandardStreams:function(){t.stdin?S.createDevice("/dev","stdin",t.stdin):S.symlink("/dev/tty","/dev/stdin"),t.stdout?S.createDevice("/dev","stdout",null,t.stdout):S.symlink("/dev/tty","/dev/stdout"),t.stderr?S.createDevice("/dev","stderr",null,t.stderr):S.symlink("/dev/tty1","/dev/stderr");var d=S.open("/dev/stdin",0),E=S.open("/dev/stdout",1),I=S.open("/dev/stderr",1)},ensureErrnoError:function(){S.ErrnoError||(S.ErrnoError=function(E,I){this.node=I,this.setErrno=function(k){this.errno=k},this.setErrno(E),this.message="FS error"},S.ErrnoError.prototype=new Error,S.ErrnoError.prototype.constructor=S.ErrnoError,[44].forEach(function(d){S.genericErrors[d]=new S.ErrnoError(d),S.genericErrors[d].stack="<generic error, no stack>"}))},staticInit:function(){S.ensureErrnoError(),S.nameTable=new Array(4096),S.mount(gt,{},"/"),S.createDefaultDirectories(),S.createDefaultDevices(),S.createSpecialDirectories(),S.filesystems={MEMFS:gt,NODEFS:At}},init:function(d,E,I){S.init.initialized=!0,S.ensureErrnoError(),t.stdin=d||t.stdin,t.stdout=E||t.stdout,t.stderr=I||t.stderr,S.createStandardStreams()},quit:function(){S.init.initialized=!1;var d=t._fflush;d&&d(0);for(var E=0;E<S.streams.length;E++){var I=S.streams[E];!I||S.close(I)}},getMode:function(d,E){var I=0;return d&&(I|=365),E&&(I|=146),I},findObject:function(d,E){var I=S.analyzePath(d,E);return I.exists?I.object:null},analyzePath:function(d,E){try{var I=S.lookupPath(d,{follow:!E});d=I.path}catch{}var k={isRoot:!1,exists:!1,error:0,name:null,path:null,object:null,parentExists:!1,parentPath:null,parentObject:null};try{var I=S.lookupPath(d,{parent:!0});k.parentExists=!0,k.parentPath=I.path,k.parentObject=I.node,k.name=bt.basename(d),I=S.lookupPath(d,{follow:!E}),k.exists=!0,k.path=I.path,k.object=I.node,k.name=I.node.name,k.isRoot=I.path==="/"}catch(L){k.error=L.errno}return k},createPath:function(d,E,I,k){d=typeof d=="string"?d:S.getPath(d);for(var L=E.split("/").reverse();L.length;){var Z=L.pop();if(!!Z){var te=bt.join2(d,Z);try{S.mkdir(te)}catch{}d=te}}return te},createFile:function(d,E,I,k,L){var Z=bt.join2(typeof d=="string"?d:S.getPath(d),E),te=S.getMode(k,L);return S.create(Z,te)},createDataFile:function(d,E,I,k,L,Z){var te=E?bt.join2(typeof d=="string"?d:S.getPath(d),E):d,we=S.getMode(k,L),me=S.create(te,we);if(I){if(typeof I=="string"){for(var Je=new Array(I.length),nt=0,wt=I.length;nt<wt;++nt)Je[nt]=I.charCodeAt(nt);I=Je}S.chmod(me,we|146);var lt=S.open(me,577);S.write(lt,I,0,I.length,0,Z),S.close(lt),S.chmod(me,we)}return me},createDevice:function(d,E,I,k){var L=bt.join2(typeof d=="string"?d:S.getPath(d),E),Z=S.getMode(!!I,!!k);S.createDevice.major||(S.createDevice.major=64);var te=S.makedev(S.createDevice.major++,0);return S.registerDevice(te,{open:function(we){we.seekable=!1},close:function(we){k&&k.buffer&&k.buffer.length&&k(10)},read:function(we,me,Je,nt,wt){for(var lt=0,it=0;it<nt;it++){var Et;try{Et=I()}catch{throw new S.ErrnoError(29)}if(Et===void 0&&lt===0)throw new S.ErrnoError(6);if(Et==null)break;lt++,me[Je+it]=Et}return lt&&(we.node.timestamp=Date.now()),lt},write:function(we,me,Je,nt,wt){for(var lt=0;lt<nt;lt++)try{k(me[Je+lt])}catch{throw new S.ErrnoError(29)}return nt&&(we.node.timestamp=Date.now()),lt}}),S.mkdev(L,Z,te)},forceLoadFile:function(d){if(d.isDevice||d.isFolder||d.link||d.contents)return!0;if(typeof XMLHttpRequest<"u")throw new Error("Lazy loading should have been performed (contents set) in createLazyFile, but it was not. Lazy loading only works in web workers. Use --embed-file or --preload-file in emcc on the main thread.");if(p)try{d.contents=yA(p(d.url),!0),d.usedBytes=d.contents.length}catch{throw new S.ErrnoError(29)}else throw new Error("Cannot load without read() or XMLHttpRequest.")},createLazyFile:function(d,E,I,k,L){function Z(){this.lengthKnown=!1,this.chunks=[]}if(Z.prototype.get=function(lt){if(!(lt>this.length-1||lt<0)){var it=lt%this.chunkSize,Et=lt/this.chunkSize|0;return this.getter(Et)[it]}},Z.prototype.setDataGetter=function(lt){this.getter=lt},Z.prototype.cacheLength=function(){var lt=new XMLHttpRequest;if(lt.open("HEAD",I,!1),lt.send(null),!(lt.status>=200&&lt.status<300||lt.status===304))throw new Error("Couldn't load "+I+". Status: "+lt.status);var it=Number(lt.getResponseHeader("Content-length")),Et,be=(Et=lt.getResponseHeader("Accept-Ranges"))&&Et==="bytes",On=(Et=lt.getResponseHeader("Content-Encoding"))&&Et==="gzip",Ri=1024*1024;be||(Ri=it);var SA=function(os,Ea){if(os>Ea)throw new Error("invalid range ("+os+", "+Ea+") or no bytes requested!");if(Ea>it-1)throw new Error("only "+it+" bytes available! programmer error!");var Kr=new XMLHttpRequest;if(Kr.open("GET",I,!1),it!==Ri&&Kr.setRequestHeader("Range","bytes="+os+"-"+Ea),typeof Uint8Array<"u"&&(Kr.responseType="arraybuffer"),Kr.overrideMimeType&&Kr.overrideMimeType("text/plain; charset=x-user-defined"),Kr.send(null),!(Kr.status>=200&&Kr.status<300||Kr.status===304))throw new Error("Couldn't load "+I+". Status: "+Kr.status);return Kr.response!==void 0?new Uint8Array(Kr.response||[]):yA(Kr.responseText||"",!0)},Mr=this;Mr.setDataGetter(function(os){var Ea=os*Ri,Kr=(os+1)*Ri-1;if(Kr=Math.min(Kr,it-1),typeof Mr.chunks[os]>"u"&&(Mr.chunks[os]=SA(Ea,Kr)),typeof Mr.chunks[os]>"u")throw new Error("doXHR failed!");return Mr.chunks[os]}),(On||!it)&&(Ri=it=1,it=this.getter(0).length,Ri=it,v("LazyFiles on gzip forces download of the whole file when length is accessed")),this._length=it,this._chunkSize=Ri,this.lengthKnown=!0},typeof XMLHttpRequest<"u"){if(!u)throw"Cannot do synchronous binary XHRs outside webworkers in modern browsers. Use --embed-file or --preload-file in emcc";var te=new Z;Object.defineProperties(te,{length:{get:function(){return this.lengthKnown||this.cacheLength(),this._length}},chunkSize:{get:function(){return this.lengthKnown||this.cacheLength(),this._chunkSize}}});var we={isDevice:!1,contents:te}}else var we={isDevice:!1,url:I};var me=S.createFile(d,E,we,k,L);we.contents?me.contents=we.contents:we.url&&(me.contents=null,me.url=we.url),Object.defineProperties(me,{usedBytes:{get:function(){return this.contents.length}}});var Je={},nt=Object.keys(me.stream_ops);return nt.forEach(function(wt){var lt=me.stream_ops[wt];Je[wt]=function(){return S.forceLoadFile(me),lt.apply(null,arguments)}}),Je.read=function(lt,it,Et,be,On){S.forceLoadFile(me);var Ri=lt.node.contents;if(On>=Ri.length)return 0;var SA=Math.min(Ri.length-On,be);if(Ri.slice)for(var Mr=0;Mr<SA;Mr++)it[Et+Mr]=Ri[On+Mr];else for(var Mr=0;Mr<SA;Mr++)it[Et+Mr]=Ri.get(On+Mr);return SA},me.stream_ops=Je,me},createPreloadedFile:function(d,E,I,k,L,Z,te,we,me,Je){Browser.init();var nt=E?Nn.resolve(bt.join2(d,E)):d,wt="cp "+nt;function lt(it){function Et(On){Je&&Je(),we||S.createDataFile(d,E,On,k,L,me),Z&&Z(),EA(wt)}var be=!1;t.preloadPlugins.forEach(function(On){be||On.canHandle(nt)&&(On.handle(it,nt,Et,function(){te&&te(),EA(wt)}),be=!0)}),be||Et(it)}mA(wt),typeof I=="string"?Browser.asyncLoad(I,function(it){lt(it)},te):lt(I)},indexedDB:function(){return window.indexedDB||window.mozIndexedDB||window.webkitIndexedDB||window.msIndexedDB},DB_NAME:function(){return"EM_FS_"+window.location.pathname},DB_VERSION:20,DB_STORE_NAME:"FILE_DATA",saveFilesToDB:function(d,E,I){E=E||function(){},I=I||function(){};var k=S.indexedDB();try{var L=k.open(S.DB_NAME(),S.DB_VERSION)}catch(Z){return I(Z)}L.onupgradeneeded=function(){v("creating db");var te=L.result;te.createObjectStore(S.DB_STORE_NAME)},L.onsuccess=function(){var te=L.result,we=te.transaction([S.DB_STORE_NAME],"readwrite"),me=we.objectStore(S.DB_STORE_NAME),Je=0,nt=0,wt=d.length;function lt(){nt==0?E():I()}d.forEach(function(it){var Et=me.put(S.analyzePath(it).object.contents,it);Et.onsuccess=function(){Je++,Je+nt==wt&&lt()},Et.onerror=function(){nt++,Je+nt==wt&&lt()}}),we.onerror=I},L.onerror=I},loadFilesFromDB:function(d,E,I){E=E||function(){},I=I||function(){};var k=S.indexedDB();try{var L=k.open(S.DB_NAME(),S.DB_VERSION)}catch(Z){return I(Z)}L.onupgradeneeded=I,L.onsuccess=function(){var te=L.result;try{var we=te.transaction([S.DB_STORE_NAME],"readonly")}catch(it){I(it);return}var me=we.objectStore(S.DB_STORE_NAME),Je=0,nt=0,wt=d.length;function lt(){nt==0?E():I()}d.forEach(function(it){var Et=me.get(it);Et.onsuccess=function(){S.analyzePath(it).exists&&S.unlink(it),S.createDataFile(bt.dirname(it),bt.basename(it),Et.result,!0,!0,!0),Je++,Je+nt==wt&&lt()},Et.onerror=function(){nt++,Je+nt==wt&&lt()}}),we.onerror=I},L.onerror=I}},Lt={mappings:{},DEFAULT_POLLMASK:5,umask:511,calculateAt:function(d,E,I){if(E[0]==="/")return E;var k;if(d===-100)k=S.cwd();else{var L=S.getStream(d);if(!L)throw new S.ErrnoError(8);k=L.path}if(E.length==0){if(!I)throw new S.ErrnoError(44);return k}return bt.join2(k,E)},doStat:function(d,E,I){try{var k=d(E)}catch(L){if(L&&L.node&&bt.normalize(E)!==bt.normalize(S.getPath(L.node)))return-54;throw L}return de[I>>2]=k.dev,de[I+4>>2]=0,de[I+8>>2]=k.ino,de[I+12>>2]=k.mode,de[I+16>>2]=k.nlink,de[I+20>>2]=k.uid,de[I+24>>2]=k.gid,de[I+28>>2]=k.rdev,de[I+32>>2]=0,se=[k.size>>>0,(vr=k.size,+Math.abs(vr)>=1?vr>0?(Math.min(+Math.floor(vr/4294967296),4294967295)|0)>>>0:~~+Math.ceil((vr-+(~~vr>>>0))/4294967296)>>>0:0)],de[I+40>>2]=se[0],de[I+44>>2]=se[1],de[I+48>>2]=4096,de[I+52>>2]=k.blocks,de[I+56>>2]=k.atime.getTime()/1e3|0,de[I+60>>2]=0,de[I+64>>2]=k.mtime.getTime()/1e3|0,de[I+68>>2]=0,de[I+72>>2]=k.ctime.getTime()/1e3|0,de[I+76>>2]=0,se=[k.ino>>>0,(vr=k.ino,+Math.abs(vr)>=1?vr>0?(Math.min(+Math.floor(vr/4294967296),4294967295)|0)>>>0:~~+Math.ceil((vr-+(~~vr>>>0))/4294967296)>>>0:0)],de[I+80>>2]=se[0],de[I+84>>2]=se[1],0},doMsync:function(d,E,I,k,L){var Z=Y.slice(d,d+I);S.msync(E,Z,L,I,k)},doMkdir:function(d,E){return d=bt.normalize(d),d[d.length-1]==="/"&&(d=d.substr(0,d.length-1)),S.mkdir(d,E,0),0},doMknod:function(d,E,I){switch(E&61440){case 32768:case 8192:case 24576:case 4096:case 49152:break;default:return-28}return S.mknod(d,E,I),0},doReadlink:function(d,E,I){if(I<=0)return-28;var k=S.readlink(d),L=Math.min(I,le(k)),Z=ne[E+L];return oe(k,E,I+1),ne[E+L]=Z,L},doAccess:function(d,E){if(E&-8)return-28;var I,k=S.lookupPath(d,{follow:!0});if(I=k.node,!I)return-44;var L="";return E&4&&(L+="r"),E&2&&(L+="w"),E&1&&(L+="x"),L&&S.nodePermissions(I,L)?-2:0},doDup:function(d,E,I){var k=S.getStream(I);return k&&S.close(k),S.open(d,E,0,I,I).fd},doReadv:function(d,E,I,k){for(var L=0,Z=0;Z<I;Z++){var te=de[E+Z*8>>2],we=de[E+(Z*8+4)>>2],me=S.read(d,ne,te,we,k);if(me<0)return-1;if(L+=me,me<we)break}return L},doWritev:function(d,E,I,k){for(var L=0,Z=0;Z<I;Z++){var te=de[E+Z*8>>2],we=de[E+(Z*8+4)>>2],me=S.write(d,ne,te,we,k);if(me<0)return-1;L+=me}return L},varargs:void 0,get:function(){Lt.varargs+=4;var d=de[Lt.varargs-4>>2];return d},getStr:function(d){var E=Fe(d);return E},getStreamFromFD:function(d){var E=S.getStream(d);if(!E)throw new S.ErrnoError(8);return E},get64:function(d,E){return d}};function hg(d,E){try{return d=Lt.getStr(d),S.chmod(d,E),0}catch(I){return(typeof S>"u"||!(I instanceof S.ErrnoError))&&wr(I),-I.errno}}function Ol(d){return de[Ft()>>2]=d,d}function Qp(d,E,I){Lt.varargs=I;try{var k=Lt.getStreamFromFD(d);switch(E){case 0:{var L=Lt.get();if(L<0)return-28;var Z;return Z=S.open(k.path,k.flags,0,L),Z.fd}case 1:case 2:return 0;case 3:return k.flags;case 4:{var L=Lt.get();return k.flags|=L,0}case 12:{var L=Lt.get(),te=0;return he[L+te>>1]=2,0}case 13:case 14:return 0;case 16:case 8:return-28;case 9:return Ol(28),-1;default:return-28}}catch(we){return(typeof S>"u"||!(we instanceof S.ErrnoError))&&wr(we),-we.errno}}function Sp(d,E){try{var I=Lt.getStreamFromFD(d);return Lt.doStat(S.stat,I.path,E)}catch(k){return(typeof S>"u"||!(k instanceof S.ErrnoError))&&wr(k),-k.errno}}function vp(d,E,I){Lt.varargs=I;try{var k=Lt.getStreamFromFD(d);switch(E){case 21509:case 21505:return k.tty?0:-59;case 21510:case 21511:case 21512:case 21506:case 21507:case 21508:return k.tty?0:-59;case 21519:{if(!k.tty)return-59;var L=Lt.get();return de[L>>2]=0,0}case 21520:return k.tty?-28:-59;case 21531:{var L=Lt.get();return S.ioctl(k,E,L)}case 21523:return k.tty?0:-59;case 21524:return k.tty?0:-59;default:wr("bad ioctl syscall "+E)}}catch(Z){return(typeof S>"u"||!(Z instanceof S.ErrnoError))&&wr(Z),-Z.errno}}function xp(d,E,I){Lt.varargs=I;try{var k=Lt.getStr(d),L=I?Lt.get():0,Z=S.open(k,E,L);return Z.fd}catch(te){return(typeof S>"u"||!(te instanceof S.ErrnoError))&&wr(te),-te.errno}}function Pp(d,E){try{return d=Lt.getStr(d),E=Lt.getStr(E),S.rename(d,E),0}catch(I){return(typeof S>"u"||!(I instanceof S.ErrnoError))&&wr(I),-I.errno}}function G(d){try{return d=Lt.getStr(d),S.rmdir(d),0}catch(E){return(typeof S>"u"||!(E instanceof S.ErrnoError))&&wr(E),-E.errno}}function yt(d,E){try{return d=Lt.getStr(d),Lt.doStat(S.stat,d,E)}catch(I){return(typeof S>"u"||!(I instanceof S.ErrnoError))&&wr(I),-I.errno}}function IA(d){try{return d=Lt.getStr(d),S.unlink(d),0}catch(E){return(typeof S>"u"||!(E instanceof S.ErrnoError))&&wr(E),-E.errno}}function zi(d,E,I){Y.copyWithin(d,E,E+I)}function Ml(d){try{return A.grow(d-qe.byteLength+65535>>>16),Or(A.buffer),1}catch{}}function Xe(d){var E=Y.length;d=d>>>0;var I=2147483648;if(d>I)return!1;for(var k=1;k<=4;k*=2){var L=E*(1+.2/k);L=Math.min(L,d+100663296);var Z=Math.min(I,ae(Math.max(d,L),65536)),te=Ml(Z);if(te)return!0}return!1}function pa(d){try{var E=Lt.getStreamFromFD(d);return S.close(E),0}catch(I){return(typeof S>"u"||!(I instanceof S.ErrnoError))&&wr(I),I.errno}}function pg(d,E){try{var I=Lt.getStreamFromFD(d),k=I.tty?2:S.isDir(I.mode)?3:S.isLink(I.mode)?7:4;return ne[E>>0]=k,0}catch(L){return(typeof S>"u"||!(L instanceof S.ErrnoError))&&wr(L),L.errno}}function OE(d,E,I,k){try{var L=Lt.getStreamFromFD(d),Z=Lt.doReadv(L,E,I);return de[k>>2]=Z,0}catch(te){return(typeof S>"u"||!(te instanceof S.ErrnoError))&&wr(te),te.errno}}function Dp(d,E,I,k,L){try{var Z=Lt.getStreamFromFD(d),te=4294967296,we=I*te+(E>>>0),me=9007199254740992;return we<=-me||we>=me?-61:(S.llseek(Z,we,k),se=[Z.position>>>0,(vr=Z.position,+Math.abs(vr)>=1?vr>0?(Math.min(+Math.floor(vr/4294967296),4294967295)|0)>>>0:~~+Math.ceil((vr-+(~~vr>>>0))/4294967296)>>>0:0)],de[L>>2]=se[0],de[L+4>>2]=se[1],Z.getdents&&we===0&&k===0&&(Z.getdents=null),0)}catch(Je){return(typeof S>"u"||!(Je instanceof S.ErrnoError))&&wr(Je),Je.errno}}function ME(d,E,I,k){try{var L=Lt.getStreamFromFD(d),Z=Lt.doWritev(L,E,I);return de[k>>2]=Z,0}catch(te){return(typeof S>"u"||!(te instanceof S.ErrnoError))&&wr(te),te.errno}}function ar(d){$(d)}function Tn(d){var E=Date.now()/1e3|0;return d&&(de[d>>2]=E),E}function Kl(){if(Kl.called)return;Kl.called=!0;var d=new Date().getFullYear(),E=new Date(d,0,1),I=new Date(d,6,1),k=E.getTimezoneOffset(),L=I.getTimezoneOffset(),Z=Math.max(k,L);de[iS()>>2]=Z*60,de[rS()>>2]=Number(k!=L);function te(wt){var lt=wt.toTimeString().match(/\(([A-Za-z ]+)\)$/);return lt?lt[1]:"GMT"}var we=te(E),me=te(I),Je=Be(we),nt=Be(me);L<k?(de[wg()>>2]=Je,de[wg()+4>>2]=nt):(de[wg()>>2]=nt,de[wg()+4>>2]=Je)}function kp(d){Kl();var E=Date.UTC(de[d+20>>2]+1900,de[d+16>>2],de[d+12>>2],de[d+8>>2],de[d+4>>2],de[d>>2],0),I=new Date(E);de[d+24>>2]=I.getUTCDay();var k=Date.UTC(I.getUTCFullYear(),0,1,0,0,0,0),L=(I.getTime()-k)/(1e3*60*60*24)|0;return de[d+28>>2]=L,I.getTime()/1e3|0}var Us=function(d,E,I,k){d||(d=this),this.parent=d,this.mount=d.mount,this.mounted=null,this.id=S.nextInode++,this.name=E,this.mode=I,this.node_ops={},this.stream_ops={},this.rdev=k},da=365,cn=146;if(Object.defineProperties(Us.prototype,{read:{get:function(){return(this.mode&da)===da},set:function(d){d?this.mode|=da:this.mode&=~da}},write:{get:function(){return(this.mode&cn)===cn},set:function(d){d?this.mode|=cn:this.mode&=~cn}},isFolder:{get:function(){return S.isDir(this.mode)}},isDevice:{get:function(){return S.isChrdev(this.mode)}}}),S.FSNode=Us,S.staticInit(),g){var Le=rV,dg=J("path");At.staticInit()}if(g){var Ul=function(d){return function(){try{return d.apply(this,arguments)}catch(E){throw E.code?new S.ErrnoError(Bo[E.code]):E}}},Hs=Object.assign({},S);for(var Hl in ln)S[Hl]=Ul(ln[Hl])}else throw new Error("NODERAWFS is currently only supported on Node.js environment.");function yA(d,E,I){var k=I>0?I:le(d)+1,L=new Array(k),Z=Ne(d,L,0,L.length);return E&&(L.length=Z),L}var Cg=typeof atob=="function"?atob:function(d){var E="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",I="",k,L,Z,te,we,me,Je,nt=0;d=d.replace(/[^A-Za-z0-9\+\/\=]/g,"");do te=E.indexOf(d.charAt(nt++)),we=E.indexOf(d.charAt(nt++)),me=E.indexOf(d.charAt(nt++)),Je=E.indexOf(d.charAt(nt++)),k=te<<2|we>>4,L=(we&15)<<4|me>>2,Z=(me&3)<<6|Je,I=I+String.fromCharCode(k),me!==64&&(I=I+String.fromCharCode(L)),Je!==64&&(I=I+String.fromCharCode(Z));while(nt<d.length);return I};function mg(d){if(typeof g=="boolean"&&g){var E;try{E=Buffer.from(d,"base64")}catch{E=new Buffer(d,"base64")}return new Uint8Array(E.buffer,E.byteOffset,E.byteLength)}try{for(var I=Cg(d),k=new Uint8Array(I.length),L=0;L<I.length;++L)k[L]=I.charCodeAt(L);return k}catch{throw new Error("Converting base64 string to bytes failed.")}}function Ca(d){if(!!ug(d))return mg(d.slice(Tl.length))}var ma={s:fg,p:hg,e:Qp,k:Sp,o:vp,q:xp,i:Pp,r:G,c:yt,h:IA,l:zi,m:Xe,f:pa,j:pg,g:OE,n:Dp,d:ME,a:ar,b:Tn,t:kp},rt=bp(),bo=t.___wasm_call_ctors=rt.v,wA=t._zip_ext_count_symlinks=rt.w,Gl=t._zip_file_get_external_attributes=rt.x,Gs=t._zipstruct_stat=rt.y,Yl=t._zipstruct_statS=rt.z,KE=t._zipstruct_stat_name=rt.A,Rp=t._zipstruct_stat_index=rt.B,Eg=t._zipstruct_stat_size=rt.C,Fp=t._zipstruct_stat_mtime=rt.D,UE=t._zipstruct_stat_crc=rt.E,jl=t._zipstruct_error=rt.F,HE=t._zipstruct_errorS=rt.G,Ig=t._zipstruct_error_code_zip=rt.H,BA=t._zipstruct_stat_comp_size=rt.I,Rr=t._zipstruct_stat_comp_method=rt.J,GE=t._zip_close=rt.K,Ys=t._zip_delete=rt.L,js=t._zip_dir_add=rt.M,yg=t._zip_discard=rt.N,bA=t._zip_error_init_with_code=rt.O,R=t._zip_get_error=rt.P,q=t._zip_file_get_error=rt.Q,Ce=t._zip_error_strerror=rt.R,Ke=t._zip_fclose=rt.S,Re=t._zip_file_add=rt.T,ze=t._free=rt.U,dt=t._malloc=rt.V,Ft=t.___errno_location=rt.W,Ln=t._zip_source_error=rt.X,JQ=t._zip_source_seek=rt.Y,k1=t._zip_file_set_external_attributes=rt.Z,R1=t._zip_file_set_mtime=rt._,WQ=t._zip_fopen=rt.$,F1=t._zip_fopen_index=rt.aa,N1=t._zip_fread=rt.ba,zQ=t._zip_get_name=rt.ca,T1=t._zip_get_num_entries=rt.da,L1=t._zip_source_read=rt.ea,VQ=t._zip_name_locate=rt.fa,O1=t._zip_open=rt.ga,M1=t._zip_open_from_source=rt.ha,XQ=t._zip_set_file_compression=rt.ia,K1=t._zip_source_buffer=rt.ja,U1=t._zip_source_buffer_create=rt.ka,H1=t._zip_source_close=rt.la,G1=t._zip_source_free=rt.ma,ZQ=t._zip_source_keep=rt.na,_Q=t._zip_source_open=rt.oa,$Q=t._zip_source_set_mtime=rt.qa,eS=t._zip_source_tell=rt.ra,tS=t._zip_stat=rt.sa,Y1=t._zip_stat_index=rt.ta,wg=t.__get_tzname=rt.ua,rS=t.__get_daylight=rt.va,iS=t.__get_timezone=rt.wa,YE=t.stackSave=rt.xa,jE=t.stackRestore=rt.ya,b=t.stackAlloc=rt.za;t.cwrap=ue,t.getValue=_;var Me;ha=function d(){Me||QA(),Me||(ha=d)};function QA(d){if(d=d||a,is>0||(pr(),is>0))return;function E(){Me||(Me=!0,t.calledRun=!0,!Ae&&(Ii(),i(t),t.onRuntimeInitialized&&t.onRuntimeInitialized(),rs()))}t.setStatus?(t.setStatus("Running..."),setTimeout(function(){setTimeout(function(){t.setStatus("")},1),E()},1)):E()}if(t.run=QA,t.preInit)for(typeof t.preInit=="function"&&(t.preInit=[t.preInit]);t.preInit.length>0;)t.preInit.pop()();return QA(),e}}();typeof IB=="object"&&typeof FR=="object"?FR.exports=RR:typeof define=="function"&&define.amd?define([],function(){return RR}):typeof IB=="object"&&(IB.createModule=RR)});var vV=w((jst,SV)=>{function dke(r,e){for(var t=-1,i=r==null?0:r.length,n=Array(i);++t<i;)n[t]=e(r[t],t,r);return n}SV.exports=dke});var vs=w((qst,xV)=>{var Cke=Array.isArray;xV.exports=Cke});var NV=w((Jst,FV)=>{var PV=Rc(),mke=vV(),Eke=vs(),Ike=gC(),yke=1/0,DV=PV?PV.prototype:void 0,kV=DV?DV.toString:void 0;function RV(r){if(typeof r=="string")return r;if(Eke(r))return mke(r,RV)+"";if(Ike(r))return kV?kV.call(r):"";var e=r+"";return e=="0"&&1/r==-yke?"-0":e}FV.exports=RV});var Vf=w((Wst,TV)=>{var wke=NV();function Bke(r){return r==null?"":wke(r)}TV.exports=Bke});var HR=w((zst,LV)=>{function bke(r,e,t){var i=-1,n=r.length;e<0&&(e=-e>n?0:n+e),t=t>n?n:t,t<0&&(t+=n),n=e>t?0:t-e>>>0,e>>>=0;for(var s=Array(n);++i<n;)s[i]=r[i+e];return s}LV.exports=bke});var MV=w((Vst,OV)=>{var Qke=HR();function Ske(r,e,t){var i=r.length;return t=t===void 0?i:t,!e&&t>=i?r:Qke(r,e,t)}OV.exports=Ske});var GR=w((Xst,KV)=>{var vke="\\ud800-\\udfff",xke="\\u0300-\\u036f",Pke="\\ufe20-\\ufe2f",Dke="\\u20d0-\\u20ff",kke=xke+Pke+Dke,Rke="\\ufe0e\\ufe0f",Fke="\\u200d",Nke=RegExp("["+Fke+vke+kke+Rke+"]");function Tke(r){return Nke.test(r)}KV.exports=Tke});var HV=w((Zst,UV)=>{function Lke(r){return r.split("")}UV.exports=Lke});var VV=w((_st,zV)=>{var GV="\\ud800-\\udfff",Oke="\\u0300-\\u036f",Mke="\\ufe20-\\ufe2f",Kke="\\u20d0-\\u20ff",Uke=Oke+Mke+Kke,Hke="\\ufe0e\\ufe0f",Gke="["+GV+"]",YR="["+Uke+"]",jR="\\ud83c[\\udffb-\\udfff]",Yke="(?:"+YR+"|"+jR+")",YV="[^"+GV+"]",jV="(?:\\ud83c[\\udde6-\\uddff]){2}",qV="[\\ud800-\\udbff][\\udc00-\\udfff]",jke="\\u200d",JV=Yke+"?",WV="["+Hke+"]?",qke="(?:"+jke+"(?:"+[YV,jV,qV].join("|")+")"+WV+JV+")*",Jke=WV+JV+qke,Wke="(?:"+[YV+YR+"?",YR,jV,qV,Gke].join("|")+")",zke=RegExp(jR+"(?="+jR+")|"+Wke+Jke,"g");function Vke(r){return r.match(zke)||[]}zV.exports=Vke});var ZV=w(($st,XV)=>{var Xke=HV(),Zke=GR(),_ke=VV();function $ke(r){return Zke(r)?_ke(r):Xke(r)}XV.exports=$ke});var $V=w((eot,_V)=>{var eRe=MV(),tRe=GR(),rRe=ZV(),iRe=Vf();function nRe(r){return function(e){e=iRe(e);var t=tRe(e)?rRe(e):void 0,i=t?t[0]:e.charAt(0),n=t?eRe(t,1).join(""):e.slice(1);return i[r]()+n}}_V.exports=nRe});var t9=w((tot,e9)=>{var sRe=$V(),oRe=sRe("toUpperCase");e9.exports=oRe});var PB=w((rot,r9)=>{var aRe=Vf(),ARe=t9();function lRe(r){return ARe(aRe(r).toLowerCase())}r9.exports=lRe});var i9=w((iot,DB)=>{function cRe(){var r=0,e=1,t=2,i=3,n=4,s=5,o=6,a=7,l=8,c=9,u=10,g=11,f=12,h=13,p=14,C=15,y=16,B=17,v=0,D=1,T=2,H=3,j=4;function $(A,Ae){return 55296<=A.charCodeAt(Ae)&&A.charCodeAt(Ae)<=56319&&56320<=A.charCodeAt(Ae+1)&&A.charCodeAt(Ae+1)<=57343}function V(A,Ae){Ae===void 0&&(Ae=0);var ge=A.charCodeAt(Ae);if(55296<=ge&&ge<=56319&&Ae<A.length-1){var re=ge,O=A.charCodeAt(Ae+1);return 56320<=O&&O<=57343?(re-55296)*1024+(O-56320)+65536:re}if(56320<=ge&&ge<=57343&&Ae>=1){var re=A.charCodeAt(Ae-1),O=ge;return 55296<=re&&re<=56319?(re-55296)*1024+(O-56320)+65536:O}return ge}function W(A,Ae,ge){var re=[A].concat(Ae).concat([ge]),O=re[re.length-2],F=ge,ue=re.lastIndexOf(p);if(ue>1&&re.slice(1,ue).every(function(Fe){return Fe==i})&&[i,h,B].indexOf(A)==-1)return T;var pe=re.lastIndexOf(n);if(pe>0&&re.slice(1,pe).every(function(Fe){return Fe==n})&&[f,n].indexOf(O)==-1)return re.filter(function(Fe){return Fe==n}).length%2==1?H:j;if(O==r&&F==e)return v;if(O==t||O==r||O==e)return F==p&&Ae.every(function(Fe){return Fe==i})?T:D;if(F==t||F==r||F==e)return D;if(O==o&&(F==o||F==a||F==c||F==u))return v;if((O==c||O==a)&&(F==a||F==l))return v;if((O==u||O==l)&&F==l)return v;if(F==i||F==C)return v;if(F==s)return v;if(O==f)return v;var ke=re.indexOf(i)!=-1?re.lastIndexOf(i)-1:re.length-2;return[h,B].indexOf(re[ke])!=-1&&re.slice(ke+1,-1).every(function(Fe){return Fe==i})&&F==p||O==C&&[y,B].indexOf(F)!=-1?v:Ae.indexOf(n)!=-1?T:O==n&&F==n?v:D}this.nextBreak=function(A,Ae){if(Ae===void 0&&(Ae=0),Ae<0)return 0;if(Ae>=A.length-1)return A.length;for(var ge=_(V(A,Ae)),re=[],O=Ae+1;O<A.length;O++)if(!$(A,O-1)){var F=_(V(A,O));if(W(ge,re,F))return O;re.push(F)}return A.length},this.splitGraphemes=function(A){for(var Ae=[],ge=0,re;(re=this.nextBreak(A,ge))<A.length;)Ae.push(A.slice(ge,re)),ge=re;return ge<A.length&&Ae.push(A.slice(ge)),Ae},this.iterateGraphemes=function(A){var Ae=0,ge={next:function(){var re,O;return(O=this.nextBreak(A,Ae))<A.length?(re=A.slice(Ae,O),Ae=O,{value:re,done:!1}):Ae<A.length?(re=A.slice(Ae),Ae=A.length,{value:re,done:!1}):{value:void 0,done:!0}}.bind(this)};return typeof Symbol<"u"&&Symbol.iterator&&(ge[Symbol.iterator]=function(){return ge}),ge},this.countGraphemes=function(A){for(var Ae=0,ge=0,re;(re=this.nextBreak(A,ge))<A.length;)ge=re,Ae++;return ge<A.length&&Ae++,Ae};function _(A){return 1536<=A&&A<=1541||A==1757||A==1807||A==2274||A==3406||A==69821||70082<=A&&A<=70083||A==72250||72326<=A&&A<=72329||A==73030?f:A==13?r:A==10?e:0<=A&&A<=9||11<=A&&A<=12||14<=A&&A<=31||127<=A&&A<=159||A==173||A==1564||A==6158||A==8203||8206<=A&&A<=8207||A==8232||A==8233||8234<=A&&A<=8238||8288<=A&&A<=8292||A==8293||8294<=A&&A<=8303||55296<=A&&A<=57343||A==65279||65520<=A&&A<=65528||65529<=A&&A<=65531||113824<=A&&A<=113827||119155<=A&&A<=119162||A==917504||A==917505||917506<=A&&A<=917535||917632<=A&&A<=917759||918e3<=A&&A<=921599?t:768<=A&&A<=879||1155<=A&&A<=1159||1160<=A&&A<=1161||1425<=A&&A<=1469||A==1471||1473<=A&&A<=1474||1476<=A&&A<=1477||A==1479||1552<=A&&A<=1562||1611<=A&&A<=1631||A==1648||1750<=A&&A<=1756||1759<=A&&A<=1764||1767<=A&&A<=1768||1770<=A&&A<=1773||A==1809||1840<=A&&A<=1866||1958<=A&&A<=1968||2027<=A&&A<=2035||2070<=A&&A<=2073||2075<=A&&A<=2083||2085<=A&&A<=2087||2089<=A&&A<=2093||2137<=A&&A<=2139||2260<=A&&A<=2273||2275<=A&&A<=2306||A==2362||A==2364||2369<=A&&A<=2376||A==2381||2385<=A&&A<=2391||2402<=A&&A<=2403||A==2433||A==2492||A==2494||2497<=A&&A<=2500||A==2509||A==2519||2530<=A&&A<=2531||2561<=A&&A<=2562||A==2620||2625<=A&&A<=2626||2631<=A&&A<=2632||2635<=A&&A<=2637||A==2641||2672<=A&&A<=2673||A==2677||2689<=A&&A<=2690||A==2748||2753<=A&&A<=2757||2759<=A&&A<=2760||A==2765||2786<=A&&A<=2787||2810<=A&&A<=2815||A==2817||A==2876||A==2878||A==2879||2881<=A&&A<=2884||A==2893||A==2902||A==2903||2914<=A&&A<=2915||A==2946||A==3006||A==3008||A==3021||A==3031||A==3072||3134<=A&&A<=3136||3142<=A&&A<=3144||3146<=A&&A<=3149||3157<=A&&A<=3158||3170<=A&&A<=3171||A==3201||A==3260||A==3263||A==3266||A==3270||3276<=A&&A<=3277||3285<=A&&A<=3286||3298<=A&&A<=3299||3328<=A&&A<=3329||3387<=A&&A<=3388||A==3390||3393<=A&&A<=3396||A==3405||A==3415||3426<=A&&A<=3427||A==3530||A==3535||3538<=A&&A<=3540||A==3542||A==3551||A==3633||3636<=A&&A<=3642||3655<=A&&A<=3662||A==3761||3764<=A&&A<=3769||3771<=A&&A<=3772||3784<=A&&A<=3789||3864<=A&&A<=3865||A==3893||A==3895||A==3897||3953<=A&&A<=3966||3968<=A&&A<=3972||3974<=A&&A<=3975||3981<=A&&A<=3991||3993<=A&&A<=4028||A==4038||4141<=A&&A<=4144||4146<=A&&A<=4151||4153<=A&&A<=4154||4157<=A&&A<=4158||4184<=A&&A<=4185||4190<=A&&A<=4192||4209<=A&&A<=4212||A==4226||4229<=A&&A<=4230||A==4237||A==4253||4957<=A&&A<=4959||5906<=A&&A<=5908||5938<=A&&A<=5940||5970<=A&&A<=5971||6002<=A&&A<=6003||6068<=A&&A<=6069||6071<=A&&A<=6077||A==6086||6089<=A&&A<=6099||A==6109||6155<=A&&A<=6157||6277<=A&&A<=6278||A==6313||6432<=A&&A<=6434||6439<=A&&A<=6440||A==6450||6457<=A&&A<=6459||6679<=A&&A<=6680||A==6683||A==6742||6744<=A&&A<=6750||A==6752||A==6754||6757<=A&&A<=6764||6771<=A&&A<=6780||A==6783||6832<=A&&A<=6845||A==6846||6912<=A&&A<=6915||A==6964||6966<=A&&A<=6970||A==6972||A==6978||7019<=A&&A<=7027||7040<=A&&A<=7041||7074<=A&&A<=7077||7080<=A&&A<=7081||7083<=A&&A<=7085||A==7142||7144<=A&&A<=7145||A==7149||7151<=A&&A<=7153||7212<=A&&A<=7219||7222<=A&&A<=7223||7376<=A&&A<=7378||7380<=A&&A<=7392||7394<=A&&A<=7400||A==7405||A==7412||7416<=A&&A<=7417||7616<=A&&A<=7673||7675<=A&&A<=7679||A==8204||8400<=A&&A<=8412||8413<=A&&A<=8416||A==8417||8418<=A&&A<=8420||8421<=A&&A<=8432||11503<=A&&A<=11505||A==11647||11744<=A&&A<=11775||12330<=A&&A<=12333||12334<=A&&A<=12335||12441<=A&&A<=12442||A==42607||42608<=A&&A<=42610||42612<=A&&A<=42621||42654<=A&&A<=42655||42736<=A&&A<=42737||A==43010||A==43014||A==43019||43045<=A&&A<=43046||43204<=A&&A<=43205||43232<=A&&A<=43249||43302<=A&&A<=43309||43335<=A&&A<=43345||43392<=A&&A<=43394||A==43443||43446<=A&&A<=43449||A==43452||A==43493||43561<=A&&A<=43566||43569<=A&&A<=43570||43573<=A&&A<=43574||A==43587||A==43596||A==43644||A==43696||43698<=A&&A<=43700||43703<=A&&A<=43704||43710<=A&&A<=43711||A==43713||43756<=A&&A<=43757||A==43766||A==44005||A==44008||A==44013||A==64286||65024<=A&&A<=65039||65056<=A&&A<=65071||65438<=A&&A<=65439||A==66045||A==66272||66422<=A&&A<=66426||68097<=A&&A<=68099||68101<=A&&A<=68102||68108<=A&&A<=68111||68152<=A&&A<=68154||A==68159||68325<=A&&A<=68326||A==69633||69688<=A&&A<=69702||69759<=A&&A<=69761||69811<=A&&A<=69814||69817<=A&&A<=69818||69888<=A&&A<=69890||69927<=A&&A<=69931||69933<=A&&A<=69940||A==70003||70016<=A&&A<=70017||70070<=A&&A<=70078||70090<=A&&A<=70092||70191<=A&&A<=70193||A==70196||70198<=A&&A<=70199||A==70206||A==70367||70371<=A&&A<=70378||70400<=A&&A<=70401||A==70460||A==70462||A==70464||A==70487||70502<=A&&A<=70508||70512<=A&&A<=70516||70712<=A&&A<=70719||70722<=A&&A<=70724||A==70726||A==70832||70835<=A&&A<=70840||A==70842||A==70845||70847<=A&&A<=70848||70850<=A&&A<=70851||A==71087||71090<=A&&A<=71093||71100<=A&&A<=71101||71103<=A&&A<=71104||71132<=A&&A<=71133||71219<=A&&A<=71226||A==71229||71231<=A&&A<=71232||A==71339||A==71341||71344<=A&&A<=71349||A==71351||71453<=A&&A<=71455||71458<=A&&A<=71461||71463<=A&&A<=71467||72193<=A&&A<=72198||72201<=A&&A<=72202||72243<=A&&A<=72248||72251<=A&&A<=72254||A==72263||72273<=A&&A<=72278||72281<=A&&A<=72283||72330<=A&&A<=72342||72344<=A&&A<=72345||72752<=A&&A<=72758||72760<=A&&A<=72765||A==72767||72850<=A&&A<=72871||72874<=A&&A<=72880||72882<=A&&A<=72883||72885<=A&&A<=72886||73009<=A&&A<=73014||A==73018||73020<=A&&A<=73021||73023<=A&&A<=73029||A==73031||92912<=A&&A<=92916||92976<=A&&A<=92982||94095<=A&&A<=94098||113821<=A&&A<=113822||A==119141||119143<=A&&A<=119145||119150<=A&&A<=119154||119163<=A&&A<=119170||119173<=A&&A<=119179||119210<=A&&A<=119213||119362<=A&&A<=119364||121344<=A&&A<=121398||121403<=A&&A<=121452||A==121461||A==121476||121499<=A&&A<=121503||121505<=A&&A<=121519||122880<=A&&A<=122886||122888<=A&&A<=122904||122907<=A&&A<=122913||122915<=A&&A<=122916||122918<=A&&A<=122922||125136<=A&&A<=125142||125252<=A&&A<=125258||917536<=A&&A<=917631||917760<=A&&A<=917999?i:127462<=A&&A<=127487?n:A==2307||A==2363||2366<=A&&A<=2368||2377<=A&&A<=2380||2382<=A&&A<=2383||2434<=A&&A<=2435||2495<=A&&A<=2496||2503<=A&&A<=2504||2507<=A&&A<=2508||A==2563||2622<=A&&A<=2624||A==2691||2750<=A&&A<=2752||A==2761||2763<=A&&A<=2764||2818<=A&&A<=2819||A==2880||2887<=A&&A<=2888||2891<=A&&A<=2892||A==3007||3009<=A&&A<=3010||3014<=A&&A<=3016||3018<=A&&A<=3020||3073<=A&&A<=3075||3137<=A&&A<=3140||3202<=A&&A<=3203||A==3262||3264<=A&&A<=3265||3267<=A&&A<=3268||3271<=A&&A<=3272||3274<=A&&A<=3275||3330<=A&&A<=3331||3391<=A&&A<=3392||3398<=A&&A<=3400||3402<=A&&A<=3404||3458<=A&&A<=3459||3536<=A&&A<=3537||3544<=A&&A<=3550||3570<=A&&A<=3571||A==3635||A==3763||3902<=A&&A<=3903||A==3967||A==4145||4155<=A&&A<=4156||4182<=A&&A<=4183||A==4228||A==6070||6078<=A&&A<=6085||6087<=A&&A<=6088||6435<=A&&A<=6438||6441<=A&&A<=6443||6448<=A&&A<=6449||6451<=A&&A<=6456||6681<=A&&A<=6682||A==6741||A==6743||6765<=A&&A<=6770||A==6916||A==6965||A==6971||6973<=A&&A<=6977||6979<=A&&A<=6980||A==7042||A==7073||7078<=A&&A<=7079||A==7082||A==7143||7146<=A&&A<=7148||A==7150||7154<=A&&A<=7155||7204<=A&&A<=7211||7220<=A&&A<=7221||A==7393||7410<=A&&A<=7411||A==7415||43043<=A&&A<=43044||A==43047||43136<=A&&A<=43137||43188<=A&&A<=43203||43346<=A&&A<=43347||A==43395||43444<=A&&A<=43445||43450<=A&&A<=43451||43453<=A&&A<=43456||43567<=A&&A<=43568||43571<=A&&A<=43572||A==43597||A==43755||43758<=A&&A<=43759||A==43765||44003<=A&&A<=44004||44006<=A&&A<=44007||44009<=A&&A<=44010||A==44012||A==69632||A==69634||A==69762||69808<=A&&A<=69810||69815<=A&&A<=69816||A==69932||A==70018||70067<=A&&A<=70069||70079<=A&&A<=70080||70188<=A&&A<=70190||70194<=A&&A<=70195||A==70197||70368<=A&&A<=70370||70402<=A&&A<=70403||A==70463||70465<=A&&A<=70468||70471<=A&&A<=70472||70475<=A&&A<=70477||70498<=A&&A<=70499||70709<=A&&A<=70711||70720<=A&&A<=70721||A==70725||70833<=A&&A<=70834||A==70841||70843<=A&&A<=70844||A==70846||A==70849||71088<=A&&A<=71089||71096<=A&&A<=71099||A==71102||71216<=A&&A<=71218||71227<=A&&A<=71228||A==71230||A==71340||71342<=A&&A<=71343||A==71350||71456<=A&&A<=71457||A==71462||72199<=A&&A<=72200||A==72249||72279<=A&&A<=72280||A==72343||A==72751||A==72766||A==72873||A==72881||A==72884||94033<=A&&A<=94078||A==119142||A==119149?s:4352<=A&&A<=4447||43360<=A&&A<=43388?o:4448<=A&&A<=4519||55216<=A&&A<=55238?a:4520<=A&&A<=4607||55243<=A&&A<=55291?l:A==44032||A==44060||A==44088||A==44116||A==44144||A==44172||A==44200||A==44228||A==44256||A==44284||A==44312||A==44340||A==44368||A==44396||A==44424||A==44452||A==44480||A==44508||A==44536||A==44564||A==44592||A==44620||A==44648||A==44676||A==44704||A==44732||A==44760||A==44788||A==44816||A==44844||A==44872||A==44900||A==44928||A==44956||A==44984||A==45012||A==45040||A==45068||A==45096||A==45124||A==45152||A==45180||A==45208||A==45236||A==45264||A==45292||A==45320||A==45348||A==45376||A==45404||A==45432||A==45460||A==45488||A==45516||A==45544||A==45572||A==45600||A==45628||A==45656||A==45684||A==45712||A==45740||A==45768||A==45796||A==45824||A==45852||A==45880||A==45908||A==45936||A==45964||A==45992||A==46020||A==46048||A==46076||A==46104||A==46132||A==46160||A==46188||A==46216||A==46244||A==46272||A==46300||A==46328||A==46356||A==46384||A==46412||A==46440||A==46468||A==46496||A==46524||A==46552||A==46580||A==46608||A==46636||A==46664||A==46692||A==46720||A==46748||A==46776||A==46804||A==46832||A==46860||A==46888||A==46916||A==46944||A==46972||A==47e3||A==47028||A==47056||A==47084||A==47112||A==47140||A==47168||A==47196||A==47224||A==47252||A==47280||A==47308||A==47336||A==47364||A==47392||A==47420||A==47448||A==47476||A==47504||A==47532||A==47560||A==47588||A==47616||A==47644||A==47672||A==47700||A==47728||A==47756||A==47784||A==47812||A==47840||A==47868||A==47896||A==47924||A==47952||A==47980||A==48008||A==48036||A==48064||A==48092||A==48120||A==48148||A==48176||A==48204||A==48232||A==48260||A==48288||A==48316||A==48344||A==48372||A==48400||A==48428||A==48456||A==48484||A==48512||A==48540||A==48568||A==48596||A==48624||A==48652||A==48680||A==48708||A==48736||A==48764||A==48792||A==48820||A==48848||A==48876||A==48904||A==48932||A==48960||A==48988||A==49016||A==49044||A==49072||A==49100||A==49128||A==49156||A==49184||A==49212||A==49240||A==49268||A==49296||A==49324||A==49352||A==49380||A==49408||A==49436||A==49464||A==49492||A==49520||A==49548||A==49576||A==49604||A==49632||A==49660||A==49688||A==49716||A==49744||A==49772||A==49800||A==49828||A==49856||A==49884||A==49912||A==49940||A==49968||A==49996||A==50024||A==50052||A==50080||A==50108||A==50136||A==50164||A==50192||A==50220||A==50248||A==50276||A==50304||A==50332||A==50360||A==50388||A==50416||A==50444||A==50472||A==50500||A==50528||A==50556||A==50584||A==50612||A==50640||A==50668||A==50696||A==50724||A==50752||A==50780||A==50808||A==50836||A==50864||A==50892||A==50920||A==50948||A==50976||A==51004||A==51032||A==51060||A==51088||A==51116||A==51144||A==51172||A==51200||A==51228||A==51256||A==51284||A==51312||A==51340||A==51368||A==51396||A==51424||A==51452||A==51480||A==51508||A==51536||A==51564||A==51592||A==51620||A==51648||A==51676||A==51704||A==51732||A==51760||A==51788||A==51816||A==51844||A==51872||A==51900||A==51928||A==51956||A==51984||A==52012||A==52040||A==52068||A==52096||A==52124||A==52152||A==52180||A==52208||A==52236||A==52264||A==52292||A==52320||A==52348||A==52376||A==52404||A==52432||A==52460||A==52488||A==52516||A==52544||A==52572||A==52600||A==52628||A==52656||A==52684||A==52712||A==52740||A==52768||A==52796||A==52824||A==52852||A==52880||A==52908||A==52936||A==52964||A==52992||A==53020||A==53048||A==53076||A==53104||A==53132||A==53160||A==53188||A==53216||A==53244||A==53272||A==53300||A==53328||A==53356||A==53384||A==53412||A==53440||A==53468||A==53496||A==53524||A==53552||A==53580||A==53608||A==53636||A==53664||A==53692||A==53720||A==53748||A==53776||A==53804||A==53832||A==53860||A==53888||A==53916||A==53944||A==53972||A==54e3||A==54028||A==54056||A==54084||A==54112||A==54140||A==54168||A==54196||A==54224||A==54252||A==54280||A==54308||A==54336||A==54364||A==54392||A==54420||A==54448||A==54476||A==54504||A==54532||A==54560||A==54588||A==54616||A==54644||A==54672||A==54700||A==54728||A==54756||A==54784||A==54812||A==54840||A==54868||A==54896||A==54924||A==54952||A==54980||A==55008||A==55036||A==55064||A==55092||A==55120||A==55148||A==55176?c:44033<=A&&A<=44059||44061<=A&&A<=44087||44089<=A&&A<=44115||44117<=A&&A<=44143||44145<=A&&A<=44171||44173<=A&&A<=44199||44201<=A&&A<=44227||44229<=A&&A<=44255||44257<=A&&A<=44283||44285<=A&&A<=44311||44313<=A&&A<=44339||44341<=A&&A<=44367||44369<=A&&A<=44395||44397<=A&&A<=44423||44425<=A&&A<=44451||44453<=A&&A<=44479||44481<=A&&A<=44507||44509<=A&&A<=44535||44537<=A&&A<=44563||44565<=A&&A<=44591||44593<=A&&A<=44619||44621<=A&&A<=44647||44649<=A&&A<=44675||44677<=A&&A<=44703||44705<=A&&A<=44731||44733<=A&&A<=44759||44761<=A&&A<=44787||44789<=A&&A<=44815||44817<=A&&A<=44843||44845<=A&&A<=44871||44873<=A&&A<=44899||44901<=A&&A<=44927||44929<=A&&A<=44955||44957<=A&&A<=44983||44985<=A&&A<=45011||45013<=A&&A<=45039||45041<=A&&A<=45067||45069<=A&&A<=45095||45097<=A&&A<=45123||45125<=A&&A<=45151||45153<=A&&A<=45179||45181<=A&&A<=45207||45209<=A&&A<=45235||45237<=A&&A<=45263||45265<=A&&A<=45291||45293<=A&&A<=45319||45321<=A&&A<=45347||45349<=A&&A<=45375||45377<=A&&A<=45403||45405<=A&&A<=45431||45433<=A&&A<=45459||45461<=A&&A<=45487||45489<=A&&A<=45515||45517<=A&&A<=45543||45545<=A&&A<=45571||45573<=A&&A<=45599||45601<=A&&A<=45627||45629<=A&&A<=45655||45657<=A&&A<=45683||45685<=A&&A<=45711||45713<=A&&A<=45739||45741<=A&&A<=45767||45769<=A&&A<=45795||45797<=A&&A<=45823||45825<=A&&A<=45851||45853<=A&&A<=45879||45881<=A&&A<=45907||45909<=A&&A<=45935||45937<=A&&A<=45963||45965<=A&&A<=45991||45993<=A&&A<=46019||46021<=A&&A<=46047||46049<=A&&A<=46075||46077<=A&&A<=46103||46105<=A&&A<=46131||46133<=A&&A<=46159||46161<=A&&A<=46187||46189<=A&&A<=46215||46217<=A&&A<=46243||46245<=A&&A<=46271||46273<=A&&A<=46299||46301<=A&&A<=46327||46329<=A&&A<=46355||46357<=A&&A<=46383||46385<=A&&A<=46411||46413<=A&&A<=46439||46441<=A&&A<=46467||46469<=A&&A<=46495||46497<=A&&A<=46523||46525<=A&&A<=46551||46553<=A&&A<=46579||46581<=A&&A<=46607||46609<=A&&A<=46635||46637<=A&&A<=46663||46665<=A&&A<=46691||46693<=A&&A<=46719||46721<=A&&A<=46747||46749<=A&&A<=46775||46777<=A&&A<=46803||46805<=A&&A<=46831||46833<=A&&A<=46859||46861<=A&&A<=46887||46889<=A&&A<=46915||46917<=A&&A<=46943||46945<=A&&A<=46971||46973<=A&&A<=46999||47001<=A&&A<=47027||47029<=A&&A<=47055||47057<=A&&A<=47083||47085<=A&&A<=47111||47113<=A&&A<=47139||47141<=A&&A<=47167||47169<=A&&A<=47195||47197<=A&&A<=47223||47225<=A&&A<=47251||47253<=A&&A<=47279||47281<=A&&A<=47307||47309<=A&&A<=47335||47337<=A&&A<=47363||47365<=A&&A<=47391||47393<=A&&A<=47419||47421<=A&&A<=47447||47449<=A&&A<=47475||47477<=A&&A<=47503||47505<=A&&A<=47531||47533<=A&&A<=47559||47561<=A&&A<=47587||47589<=A&&A<=47615||47617<=A&&A<=47643||47645<=A&&A<=47671||47673<=A&&A<=47699||47701<=A&&A<=47727||47729<=A&&A<=47755||47757<=A&&A<=47783||47785<=A&&A<=47811||47813<=A&&A<=47839||47841<=A&&A<=47867||47869<=A&&A<=47895||47897<=A&&A<=47923||47925<=A&&A<=47951||47953<=A&&A<=47979||47981<=A&&A<=48007||48009<=A&&A<=48035||48037<=A&&A<=48063||48065<=A&&A<=48091||48093<=A&&A<=48119||48121<=A&&A<=48147||48149<=A&&A<=48175||48177<=A&&A<=48203||48205<=A&&A<=48231||48233<=A&&A<=48259||48261<=A&&A<=48287||48289<=A&&A<=48315||48317<=A&&A<=48343||48345<=A&&A<=48371||48373<=A&&A<=48399||48401<=A&&A<=48427||48429<=A&&A<=48455||48457<=A&&A<=48483||48485<=A&&A<=48511||48513<=A&&A<=48539||48541<=A&&A<=48567||48569<=A&&A<=48595||48597<=A&&A<=48623||48625<=A&&A<=48651||48653<=A&&A<=48679||48681<=A&&A<=48707||48709<=A&&A<=48735||48737<=A&&A<=48763||48765<=A&&A<=48791||48793<=A&&A<=48819||48821<=A&&A<=48847||48849<=A&&A<=48875||48877<=A&&A<=48903||48905<=A&&A<=48931||48933<=A&&A<=48959||48961<=A&&A<=48987||48989<=A&&A<=49015||49017<=A&&A<=49043||49045<=A&&A<=49071||49073<=A&&A<=49099||49101<=A&&A<=49127||49129<=A&&A<=49155||49157<=A&&A<=49183||49185<=A&&A<=49211||49213<=A&&A<=49239||49241<=A&&A<=49267||49269<=A&&A<=49295||49297<=A&&A<=49323||49325<=A&&A<=49351||49353<=A&&A<=49379||49381<=A&&A<=49407||49409<=A&&A<=49435||49437<=A&&A<=49463||49465<=A&&A<=49491||49493<=A&&A<=49519||49521<=A&&A<=49547||49549<=A&&A<=49575||49577<=A&&A<=49603||49605<=A&&A<=49631||49633<=A&&A<=49659||49661<=A&&A<=49687||49689<=A&&A<=49715||49717<=A&&A<=49743||49745<=A&&A<=49771||49773<=A&&A<=49799||49801<=A&&A<=49827||49829<=A&&A<=49855||49857<=A&&A<=49883||49885<=A&&A<=49911||49913<=A&&A<=49939||49941<=A&&A<=49967||49969<=A&&A<=49995||49997<=A&&A<=50023||50025<=A&&A<=50051||50053<=A&&A<=50079||50081<=A&&A<=50107||50109<=A&&A<=50135||50137<=A&&A<=50163||50165<=A&&A<=50191||50193<=A&&A<=50219||50221<=A&&A<=50247||50249<=A&&A<=50275||50277<=A&&A<=50303||50305<=A&&A<=50331||50333<=A&&A<=50359||50361<=A&&A<=50387||50389<=A&&A<=50415||50417<=A&&A<=50443||50445<=A&&A<=50471||50473<=A&&A<=50499||50501<=A&&A<=50527||50529<=A&&A<=50555||50557<=A&&A<=50583||50585<=A&&A<=50611||50613<=A&&A<=50639||50641<=A&&A<=50667||50669<=A&&A<=50695||50697<=A&&A<=50723||50725<=A&&A<=50751||50753<=A&&A<=50779||50781<=A&&A<=50807||50809<=A&&A<=50835||50837<=A&&A<=50863||50865<=A&&A<=50891||50893<=A&&A<=50919||50921<=A&&A<=50947||50949<=A&&A<=50975||50977<=A&&A<=51003||51005<=A&&A<=51031||51033<=A&&A<=51059||51061<=A&&A<=51087||51089<=A&&A<=51115||51117<=A&&A<=51143||51145<=A&&A<=51171||51173<=A&&A<=51199||51201<=A&&A<=51227||51229<=A&&A<=51255||51257<=A&&A<=51283||51285<=A&&A<=51311||51313<=A&&A<=51339||51341<=A&&A<=51367||51369<=A&&A<=51395||51397<=A&&A<=51423||51425<=A&&A<=51451||51453<=A&&A<=51479||51481<=A&&A<=51507||51509<=A&&A<=51535||51537<=A&&A<=51563||51565<=A&&A<=51591||51593<=A&&A<=51619||51621<=A&&A<=51647||51649<=A&&A<=51675||51677<=A&&A<=51703||51705<=A&&A<=51731||51733<=A&&A<=51759||51761<=A&&A<=51787||51789<=A&&A<=51815||51817<=A&&A<=51843||51845<=A&&A<=51871||51873<=A&&A<=51899||51901<=A&&A<=51927||51929<=A&&A<=51955||51957<=A&&A<=51983||51985<=A&&A<=52011||52013<=A&&A<=52039||52041<=A&&A<=52067||52069<=A&&A<=52095||52097<=A&&A<=52123||52125<=A&&A<=52151||52153<=A&&A<=52179||52181<=A&&A<=52207||52209<=A&&A<=52235||52237<=A&&A<=52263||52265<=A&&A<=52291||52293<=A&&A<=52319||52321<=A&&A<=52347||52349<=A&&A<=52375||52377<=A&&A<=52403||52405<=A&&A<=52431||52433<=A&&A<=52459||52461<=A&&A<=52487||52489<=A&&A<=52515||52517<=A&&A<=52543||52545<=A&&A<=52571||52573<=A&&A<=52599||52601<=A&&A<=52627||52629<=A&&A<=52655||52657<=A&&A<=52683||52685<=A&&A<=52711||52713<=A&&A<=52739||52741<=A&&A<=52767||52769<=A&&A<=52795||52797<=A&&A<=52823||52825<=A&&A<=52851||52853<=A&&A<=52879||52881<=A&&A<=52907||52909<=A&&A<=52935||52937<=A&&A<=52963||52965<=A&&A<=52991||52993<=A&&A<=53019||53021<=A&&A<=53047||53049<=A&&A<=53075||53077<=A&&A<=53103||53105<=A&&A<=53131||53133<=A&&A<=53159||53161<=A&&A<=53187||53189<=A&&A<=53215||53217<=A&&A<=53243||53245<=A&&A<=53271||53273<=A&&A<=53299||53301<=A&&A<=53327||53329<=A&&A<=53355||53357<=A&&A<=53383||53385<=A&&A<=53411||53413<=A&&A<=53439||53441<=A&&A<=53467||53469<=A&&A<=53495||53497<=A&&A<=53523||53525<=A&&A<=53551||53553<=A&&A<=53579||53581<=A&&A<=53607||53609<=A&&A<=53635||53637<=A&&A<=53663||53665<=A&&A<=53691||53693<=A&&A<=53719||53721<=A&&A<=53747||53749<=A&&A<=53775||53777<=A&&A<=53803||53805<=A&&A<=53831||53833<=A&&A<=53859||53861<=A&&A<=53887||53889<=A&&A<=53915||53917<=A&&A<=53943||53945<=A&&A<=53971||53973<=A&&A<=53999||54001<=A&&A<=54027||54029<=A&&A<=54055||54057<=A&&A<=54083||54085<=A&&A<=54111||54113<=A&&A<=54139||54141<=A&&A<=54167||54169<=A&&A<=54195||54197<=A&&A<=54223||54225<=A&&A<=54251||54253<=A&&A<=54279||54281<=A&&A<=54307||54309<=A&&A<=54335||54337<=A&&A<=54363||54365<=A&&A<=54391||54393<=A&&A<=54419||54421<=A&&A<=54447||54449<=A&&A<=54475||54477<=A&&A<=54503||54505<=A&&A<=54531||54533<=A&&A<=54559||54561<=A&&A<=54587||54589<=A&&A<=54615||54617<=A&&A<=54643||54645<=A&&A<=54671||54673<=A&&A<=54699||54701<=A&&A<=54727||54729<=A&&A<=54755||54757<=A&&A<=54783||54785<=A&&A<=54811||54813<=A&&A<=54839||54841<=A&&A<=54867||54869<=A&&A<=54895||54897<=A&&A<=54923||54925<=A&&A<=54951||54953<=A&&A<=54979||54981<=A&&A<=55007||55009<=A&&A<=55035||55037<=A&&A<=55063||55065<=A&&A<=55091||55093<=A&&A<=55119||55121<=A&&A<=55147||55149<=A&&A<=55175||55177<=A&&A<=55203?u:A==9757||A==9977||9994<=A&&A<=9997||A==127877||127938<=A&&A<=127940||A==127943||127946<=A&&A<=127948||128066<=A&&A<=128067||128070<=A&&A<=128080||A==128110||128112<=A&&A<=128120||A==128124||128129<=A&&A<=128131||128133<=A&&A<=128135||A==128170||128372<=A&&A<=128373||A==128378||A==128400||128405<=A&&A<=128406||128581<=A&&A<=128583||128587<=A&&A<=128591||A==128675||128692<=A&&A<=128694||A==128704||A==128716||129304<=A&&A<=129308||129310<=A&&A<=129311||A==129318||129328<=A&&A<=129337||129341<=A&&A<=129342||129489<=A&&A<=129501?h:127995<=A&&A<=127999?p:A==8205?C:A==9792||A==9794||9877<=A&&A<=9878||A==9992||A==10084||A==127752||A==127806||A==127859||A==127891||A==127908||A==127912||A==127979||A==127981||A==128139||128187<=A&&A<=128188||A==128295||A==128300||A==128488||A==128640||A==128658?y:128102<=A&&A<=128105?B:g}return this}typeof DB<"u"&&DB.exports&&(DB.exports=cRe)});var s9=w((not,n9)=>{var uRe=/^(.*?)(\x1b\[[^m]+m|\x1b\]8;;.*?(\x1b\\|\u0007))/,kB;function gRe(){if(kB)return kB;if(typeof Intl.Segmenter<"u"){let r=new Intl.Segmenter("en",{granularity:"grapheme"});return kB=e=>Array.from(r.segment(e),({segment:t})=>t)}else{let r=i9(),e=new r;return kB=t=>e.splitGraphemes(t)}}n9.exports=(r,e=0,t=r.length)=>{if(e<0||t<0)throw new RangeError("Negative indices aren't supported by this implementation");let i=t-e,n="",s=0,o=0;for(;r.length>0;){let a=r.match(uRe)||[r,r,void 0],l=gRe()(a[1]),c=Math.min(e-s,l.length);l=l.slice(c);let u=Math.min(i-o,l.length);n+=l.slice(0,u).join(""),s+=c,o+=u,typeof a[2]<"u"&&(n+=a[2]),r=r.slice(a[0].length)}return n}});var Xf=w((bot,y9)=>{"use strict";var I9=new Map([["C","cwd"],["f","file"],["z","gzip"],["P","preservePaths"],["U","unlink"],["strip-components","strip"],["stripComponents","strip"],["keep-newer","newer"],["keepNewer","newer"],["keep-newer-files","newer"],["keepNewerFiles","newer"],["k","keep"],["keep-existing","keep"],["keepExisting","keep"],["m","noMtime"],["no-mtime","noMtime"],["p","preserveOwner"],["L","follow"],["h","follow"]]);y9.exports=r=>r?Object.keys(r).map(e=>[I9.has(e)?I9.get(e):e,r[e]]).reduce((e,t)=>(e[t[0]]=t[1],e),Object.create(null)):{}});var _f=w((Qot,D9)=>{"use strict";var w9=typeof process=="object"&&process?process:{stdout:null,stderr:null},QRe=J("events"),B9=J("stream"),b9=J("string_decoder").StringDecoder,Wa=Symbol("EOF"),za=Symbol("maybeEmitEnd"),rl=Symbol("emittedEnd"),OB=Symbol("emittingEnd"),NC=Symbol("emittedError"),MB=Symbol("closed"),Q9=Symbol("read"),KB=Symbol("flush"),S9=Symbol("flushChunk"),xn=Symbol("encoding"),Va=Symbol("decoder"),UB=Symbol("flowing"),TC=Symbol("paused"),Zf=Symbol("resume"),Ci=Symbol("bufferLength"),XR=Symbol("bufferPush"),ZR=Symbol("bufferShift"),Hi=Symbol("objectMode"),Gi=Symbol("destroyed"),_R=Symbol("emitData"),v9=Symbol("emitEnd"),$R=Symbol("emitEnd2"),Xa=Symbol("async"),LC=r=>Promise.resolve().then(r),x9=global._MP_NO_ITERATOR_SYMBOLS_!=="1",SRe=x9&&Symbol.asyncIterator||Symbol("asyncIterator not implemented"),vRe=x9&&Symbol.iterator||Symbol("iterator not implemented"),xRe=r=>r==="end"||r==="finish"||r==="prefinish",PRe=r=>r instanceof ArrayBuffer||typeof r=="object"&&r.constructor&&r.constructor.name==="ArrayBuffer"&&r.byteLength>=0,DRe=r=>!Buffer.isBuffer(r)&&ArrayBuffer.isView(r),HB=class{constructor(e,t,i){this.src=e,this.dest=t,this.opts=i,this.ondrain=()=>e[Zf](),t.on("drain",this.ondrain)}unpipe(){this.dest.removeListener("drain",this.ondrain)}proxyErrors(){}end(){this.unpipe(),this.opts.end&&this.dest.end()}},eF=class extends HB{unpipe(){this.src.removeListener("error",this.proxyErrors),super.unpipe()}constructor(e,t,i){super(e,t,i),this.proxyErrors=n=>t.emit("error",n),e.on("error",this.proxyErrors)}};D9.exports=class P9 extends B9{constructor(e){super(),this[UB]=!1,this[TC]=!1,this.pipes=[],this.buffer=[],this[Hi]=e&&e.objectMode||!1,this[Hi]?this[xn]=null:this[xn]=e&&e.encoding||null,this[xn]==="buffer"&&(this[xn]=null),this[Xa]=e&&!!e.async||!1,this[Va]=this[xn]?new b9(this[xn]):null,this[Wa]=!1,this[rl]=!1,this[OB]=!1,this[MB]=!1,this[NC]=null,this.writable=!0,this.readable=!0,this[Ci]=0,this[Gi]=!1}get bufferLength(){return this[Ci]}get encoding(){return this[xn]}set encoding(e){if(this[Hi])throw new Error("cannot set encoding in objectMode");if(this[xn]&&e!==this[xn]&&(this[Va]&&this[Va].lastNeed||this[Ci]))throw new Error("cannot change encoding");this[xn]!==e&&(this[Va]=e?new b9(e):null,this.buffer.length&&(this.buffer=this.buffer.map(t=>this[Va].write(t)))),this[xn]=e}setEncoding(e){this.encoding=e}get objectMode(){return this[Hi]}set objectMode(e){this[Hi]=this[Hi]||!!e}get async(){return this[Xa]}set async(e){this[Xa]=this[Xa]||!!e}write(e,t,i){if(this[Wa])throw new Error("write after end");if(this[Gi])return this.emit("error",Object.assign(new Error("Cannot call write after a stream was destroyed"),{code:"ERR_STREAM_DESTROYED"})),!0;typeof t=="function"&&(i=t,t="utf8"),t||(t="utf8");let n=this[Xa]?LC:s=>s();return!this[Hi]&&!Buffer.isBuffer(e)&&(DRe(e)?e=Buffer.from(e.buffer,e.byteOffset,e.byteLength):PRe(e)?e=Buffer.from(e):typeof e!="string"&&(this.objectMode=!0)),this[Hi]?(this.flowing&&this[Ci]!==0&&this[KB](!0),this.flowing?this.emit("data",e):this[XR](e),this[Ci]!==0&&this.emit("readable"),i&&n(i),this.flowing):e.length?(typeof e=="string"&&!(t===this[xn]&&!this[Va].lastNeed)&&(e=Buffer.from(e,t)),Buffer.isBuffer(e)&&this[xn]&&(e=this[Va].write(e)),this.flowing&&this[Ci]!==0&&this[KB](!0),this.flowing?this.emit("data",e):this[XR](e),this[Ci]!==0&&this.emit("readable"),i&&n(i),this.flowing):(this[Ci]!==0&&this.emit("readable"),i&&n(i),this.flowing)}read(e){if(this[Gi])return null;if(this[Ci]===0||e===0||e>this[Ci])return this[za](),null;this[Hi]&&(e=null),this.buffer.length>1&&!this[Hi]&&(this.encoding?this.buffer=[this.buffer.join("")]:this.buffer=[Buffer.concat(this.buffer,this[Ci])]);let t=this[Q9](e||null,this.buffer[0]);return this[za](),t}[Q9](e,t){return e===t.length||e===null?this[ZR]():(this.buffer[0]=t.slice(e),t=t.slice(0,e),this[Ci]-=e),this.emit("data",t),!this.buffer.length&&!this[Wa]&&this.emit("drain"),t}end(e,t,i){return typeof e=="function"&&(i=e,e=null),typeof t=="function"&&(i=t,t="utf8"),e&&this.write(e,t),i&&this.once("end",i),this[Wa]=!0,this.writable=!1,(this.flowing||!this[TC])&&this[za](),this}[Zf](){this[Gi]||(this[TC]=!1,this[UB]=!0,this.emit("resume"),this.buffer.length?this[KB]():this[Wa]?this[za]():this.emit("drain"))}resume(){return this[Zf]()}pause(){this[UB]=!1,this[TC]=!0}get destroyed(){return this[Gi]}get flowing(){return this[UB]}get paused(){return this[TC]}[XR](e){this[Hi]?this[Ci]+=1:this[Ci]+=e.length,this.buffer.push(e)}[ZR](){return this.buffer.length&&(this[Hi]?this[Ci]-=1:this[Ci]-=this.buffer[0].length),this.buffer.shift()}[KB](e){do;while(this[S9](this[ZR]()));!e&&!this.buffer.length&&!this[Wa]&&this.emit("drain")}[S9](e){return e?(this.emit("data",e),this.flowing):!1}pipe(e,t){if(this[Gi])return;let i=this[rl];return t=t||{},e===w9.stdout||e===w9.stderr?t.end=!1:t.end=t.end!==!1,t.proxyErrors=!!t.proxyErrors,i?t.end&&e.end():(this.pipes.push(t.proxyErrors?new eF(this,e,t):new HB(this,e,t)),this[Xa]?LC(()=>this[Zf]()):this[Zf]()),e}unpipe(e){let t=this.pipes.find(i=>i.dest===e);t&&(this.pipes.splice(this.pipes.indexOf(t),1),t.unpipe())}addListener(e,t){return this.on(e,t)}on(e,t){let i=super.on(e,t);return e==="data"&&!this.pipes.length&&!this.flowing?this[Zf]():e==="readable"&&this[Ci]!==0?super.emit("readable"):xRe(e)&&this[rl]?(super.emit(e),this.removeAllListeners(e)):e==="error"&&this[NC]&&(this[Xa]?LC(()=>t.call(this,this[NC])):t.call(this,this[NC])),i}get emittedEnd(){return this[rl]}[za](){!this[OB]&&!this[rl]&&!this[Gi]&&this.buffer.length===0&&this[Wa]&&(this[OB]=!0,this.emit("end"),this.emit("prefinish"),this.emit("finish"),this[MB]&&this.emit("close"),this[OB]=!1)}emit(e,t,...i){if(e!=="error"&&e!=="close"&&e!==Gi&&this[Gi])return;if(e==="data")return t?this[Xa]?LC(()=>this[_R](t)):this[_R](t):!1;if(e==="end")return this[v9]();if(e==="close"){if(this[MB]=!0,!this[rl]&&!this[Gi])return;let s=super.emit("close");return this.removeAllListeners("close"),s}else if(e==="error"){this[NC]=t;let s=super.emit("error",t);return this[za](),s}else if(e==="resume"){let s=super.emit("resume");return this[za](),s}else if(e==="finish"||e==="prefinish"){let s=super.emit(e);return this.removeAllListeners(e),s}let n=super.emit(e,t,...i);return this[za](),n}[_R](e){for(let i of this.pipes)i.dest.write(e)===!1&&this.pause();let t=super.emit("data",e);return this[za](),t}[v9](){this[rl]||(this[rl]=!0,this.readable=!1,this[Xa]?LC(()=>this[$R]()):this[$R]())}[$R](){if(this[Va]){let t=this[Va].end();if(t){for(let i of this.pipes)i.dest.write(t);super.emit("data",t)}}for(let t of this.pipes)t.end();let e=super.emit("end");return this.removeAllListeners("end"),e}collect(){let e=[];this[Hi]||(e.dataLength=0);let t=this.promise();return this.on("data",i=>{e.push(i),this[Hi]||(e.dataLength+=i.length)}),t.then(()=>e)}concat(){return this[Hi]?Promise.reject(new Error("cannot concat in objectMode")):this.collect().then(e=>this[Hi]?Promise.reject(new Error("cannot concat in objectMode")):this[xn]?e.join(""):Buffer.concat(e,e.dataLength))}promise(){return new Promise((e,t)=>{this.on(Gi,()=>t(new Error("stream destroyed"))),this.on("error",i=>t(i)),this.on("end",()=>e())})}[SRe](){return{next:()=>{let t=this.read();if(t!==null)return Promise.resolve({done:!1,value:t});if(this[Wa])return Promise.resolve({done:!0});let i=null,n=null,s=c=>{this.removeListener("data",o),this.removeListener("end",a),n(c)},o=c=>{this.removeListener("error",s),this.removeListener("end",a),this.pause(),i({value:c,done:!!this[Wa]})},a=()=>{this.removeListener("error",s),this.removeListener("data",o),i({done:!0})},l=()=>s(new Error("stream destroyed"));return new Promise((c,u)=>{n=u,i=c,this.once(Gi,l),this.once("error",s),this.once("end",a),this.once("data",o)})}}}[vRe](){return{next:()=>{let t=this.read();return{value:t,done:t===null}}}}destroy(e){return this[Gi]?(e?this.emit("error",e):this.emit(Gi),this):(this[Gi]=!0,this.buffer.length=0,this[Ci]=0,typeof this.close=="function"&&!this[MB]&&this.close(),e?this.emit("error",e):this.emit(Gi),this)}static isStream(e){return!!e&&(e instanceof P9||e instanceof B9||e instanceof QRe&&(typeof e.pipe=="function"||typeof e.write=="function"&&typeof e.end=="function"))}}});var R9=w((Sot,k9)=>{var kRe=J("zlib").constants||{ZLIB_VERNUM:4736};k9.exports=Object.freeze(Object.assign(Object.create(null),{Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_MEM_ERROR:-4,Z_BUF_ERROR:-5,Z_VERSION_ERROR:-6,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,DEFLATE:1,INFLATE:2,GZIP:3,GUNZIP:4,DEFLATERAW:5,INFLATERAW:6,UNZIP:7,BROTLI_DECODE:8,BROTLI_ENCODE:9,Z_MIN_WINDOWBITS:8,Z_MAX_WINDOWBITS:15,Z_DEFAULT_WINDOWBITS:15,Z_MIN_CHUNK:64,Z_MAX_CHUNK:1/0,Z_DEFAULT_CHUNK:16384,Z_MIN_MEMLEVEL:1,Z_MAX_MEMLEVEL:9,Z_DEFAULT_MEMLEVEL:8,Z_MIN_LEVEL:-1,Z_MAX_LEVEL:9,Z_DEFAULT_LEVEL:-1,BROTLI_OPERATION_PROCESS:0,BROTLI_OPERATION_FLUSH:1,BROTLI_OPERATION_FINISH:2,BROTLI_OPERATION_EMIT_METADATA:3,BROTLI_MODE_GENERIC:0,BROTLI_MODE_TEXT:1,BROTLI_MODE_FONT:2,BROTLI_DEFAULT_MODE:0,BROTLI_MIN_QUALITY:0,BROTLI_MAX_QUALITY:11,BROTLI_DEFAULT_QUALITY:11,BROTLI_MIN_WINDOW_BITS:10,BROTLI_MAX_WINDOW_BITS:24,BROTLI_LARGE_MAX_WINDOW_BITS:30,BROTLI_DEFAULT_WINDOW:22,BROTLI_MIN_INPUT_BLOCK_BITS:16,BROTLI_MAX_INPUT_BLOCK_BITS:24,BROTLI_PARAM_MODE:0,BROTLI_PARAM_QUALITY:1,BROTLI_PARAM_LGWIN:2,BROTLI_PARAM_LGBLOCK:3,BROTLI_PARAM_DISABLE_LITERAL_CONTEXT_MODELING:4,BROTLI_PARAM_SIZE_HINT:5,BROTLI_PARAM_LARGE_WINDOW:6,BROTLI_PARAM_NPOSTFIX:7,BROTLI_PARAM_NDIRECT:8,BROTLI_DECODER_RESULT_ERROR:0,BROTLI_DECODER_RESULT_SUCCESS:1,BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT:2,BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT:3,BROTLI_DECODER_PARAM_DISABLE_RING_BUFFER_REALLOCATION:0,BROTLI_DECODER_PARAM_LARGE_WINDOW:1,BROTLI_DECODER_NO_ERROR:0,BROTLI_DECODER_SUCCESS:1,BROTLI_DECODER_NEEDS_MORE_INPUT:2,BROTLI_DECODER_NEEDS_MORE_OUTPUT:3,BROTLI_DECODER_ERROR_FORMAT_EXUBERANT_NIBBLE:-1,BROTLI_DECODER_ERROR_FORMAT_RESERVED:-2,BROTLI_DECODER_ERROR_FORMAT_EXUBERANT_META_NIBBLE:-3,BROTLI_DECODER_ERROR_FORMAT_SIMPLE_HUFFMAN_ALPHABET:-4,BROTLI_DECODER_ERROR_FORMAT_SIMPLE_HUFFMAN_SAME:-5,BROTLI_DECODER_ERROR_FORMAT_CL_SPACE:-6,BROTLI_DECODER_ERROR_FORMAT_HUFFMAN_SPACE:-7,BROTLI_DECODER_ERROR_FORMAT_CONTEXT_MAP_REPEAT:-8,BROTLI_DECODER_ERROR_FORMAT_BLOCK_LENGTH_1:-9,BROTLI_DECODER_ERROR_FORMAT_BLOCK_LENGTH_2:-10,BROTLI_DECODER_ERROR_FORMAT_TRANSFORM:-11,BROTLI_DECODER_ERROR_FORMAT_DICTIONARY:-12,BROTLI_DECODER_ERROR_FORMAT_WINDOW_BITS:-13,BROTLI_DECODER_ERROR_FORMAT_PADDING_1:-14,BROTLI_DECODER_ERROR_FORMAT_PADDING_2:-15,BROTLI_DECODER_ERROR_FORMAT_DISTANCE:-16,BROTLI_DECODER_ERROR_DICTIONARY_NOT_SET:-19,BROTLI_DECODER_ERROR_INVALID_ARGUMENTS:-20,BROTLI_DECODER_ERROR_ALLOC_CONTEXT_MODES:-21,BROTLI_DECODER_ERROR_ALLOC_TREE_GROUPS:-22,BROTLI_DECODER_ERROR_ALLOC_CONTEXT_MAP:-25,BROTLI_DECODER_ERROR_ALLOC_RING_BUFFER_1:-26,BROTLI_DECODER_ERROR_ALLOC_RING_BUFFER_2:-27,BROTLI_DECODER_ERROR_ALLOC_BLOCK_TYPE_TREES:-30,BROTLI_DECODER_ERROR_UNREACHABLE:-31},kRe))});var dF=w(Xn=>{"use strict";var sF=J("assert"),il=J("buffer").Buffer,T9=J("zlib"),Uc=Xn.constants=R9(),RRe=_f(),F9=il.concat,Hc=Symbol("_superWrite"),eh=class extends Error{constructor(e){super("zlib: "+e.message),this.code=e.code,this.errno=e.errno,this.code||(this.code="ZLIB_ERROR"),this.message="zlib: "+e.message,Error.captureStackTrace(this,this.constructor)}get name(){return"ZlibError"}},FRe=Symbol("opts"),OC=Symbol("flushFlag"),N9=Symbol("finishFlushFlag"),pF=Symbol("fullFlushFlag"),cr=Symbol("handle"),GB=Symbol("onError"),$f=Symbol("sawError"),tF=Symbol("level"),rF=Symbol("strategy"),iF=Symbol("ended"),vot=Symbol("_defaultFullFlush"),YB=class extends RRe{constructor(e,t){if(!e||typeof e!="object")throw new TypeError("invalid options for ZlibBase constructor");super(e),this[$f]=!1,this[iF]=!1,this[FRe]=e,this[OC]=e.flush,this[N9]=e.finishFlush;try{this[cr]=new T9[t](e)}catch(i){throw new eh(i)}this[GB]=i=>{this[$f]||(this[$f]=!0,this.close(),this.emit("error",i))},this[cr].on("error",i=>this[GB](new eh(i))),this.once("end",()=>this.close)}close(){this[cr]&&(this[cr].close(),this[cr]=null,this.emit("close"))}reset(){if(!this[$f])return sF(this[cr],"zlib binding closed"),this[cr].reset()}flush(e){this.ended||(typeof e!="number"&&(e=this[pF]),this.write(Object.assign(il.alloc(0),{[OC]:e})))}end(e,t,i){return e&&this.write(e,t),this.flush(this[N9]),this[iF]=!0,super.end(null,null,i)}get ended(){return this[iF]}write(e,t,i){if(typeof t=="function"&&(i=t,t="utf8"),typeof e=="string"&&(e=il.from(e,t)),this[$f])return;sF(this[cr],"zlib binding closed");let n=this[cr]._handle,s=n.close;n.close=()=>{};let o=this[cr].close;this[cr].close=()=>{},il.concat=c=>c;let a;try{let c=typeof e[OC]=="number"?e[OC]:this[OC];a=this[cr]._processChunk(e,c),il.concat=F9}catch(c){il.concat=F9,this[GB](new eh(c))}finally{this[cr]&&(this[cr]._handle=n,n.close=s,this[cr].close=o,this[cr].removeAllListeners("error"))}this[cr]&&this[cr].on("error",c=>this[GB](new eh(c)));let l;if(a)if(Array.isArray(a)&&a.length>0){l=this[Hc](il.from(a[0]));for(let c=1;c<a.length;c++)l=this[Hc](a[c])}else l=this[Hc](il.from(a));return i&&i(),l}[Hc](e){return super.write(e)}},Za=class extends YB{constructor(e,t){e=e||{},e.flush=e.flush||Uc.Z_NO_FLUSH,e.finishFlush=e.finishFlush||Uc.Z_FINISH,super(e,t),this[pF]=Uc.Z_FULL_FLUSH,this[tF]=e.level,this[rF]=e.strategy}params(e,t){if(!this[$f]){if(!this[cr])throw new Error("cannot switch params when binding is closed");if(!this[cr].params)throw new Error("not supported in this implementation");if(this[tF]!==e||this[rF]!==t){this.flush(Uc.Z_SYNC_FLUSH),sF(this[cr],"zlib binding closed");let i=this[cr].flush;this[cr].flush=(n,s)=>{this.flush(n),s()};try{this[cr].params(e,t)}finally{this[cr].flush=i}this[cr]&&(this[tF]=e,this[rF]=t)}}}},oF=class extends Za{constructor(e){super(e,"Deflate")}},aF=class extends Za{constructor(e){super(e,"Inflate")}},nF=Symbol("_portable"),AF=class extends Za{constructor(e){super(e,"Gzip"),this[nF]=e&&!!e.portable}[Hc](e){return this[nF]?(this[nF]=!1,e[9]=255,super[Hc](e)):super[Hc](e)}},lF=class extends Za{constructor(e){super(e,"Gunzip")}},cF=class extends Za{constructor(e){super(e,"DeflateRaw")}},uF=class extends Za{constructor(e){super(e,"InflateRaw")}},gF=class extends Za{constructor(e){super(e,"Unzip")}},jB=class extends YB{constructor(e,t){e=e||{},e.flush=e.flush||Uc.BROTLI_OPERATION_PROCESS,e.finishFlush=e.finishFlush||Uc.BROTLI_OPERATION_FINISH,super(e,t),this[pF]=Uc.BROTLI_OPERATION_FLUSH}},fF=class extends jB{constructor(e){super(e,"BrotliCompress")}},hF=class extends jB{constructor(e){super(e,"BrotliDecompress")}};Xn.Deflate=oF;Xn.Inflate=aF;Xn.Gzip=AF;Xn.Gunzip=lF;Xn.DeflateRaw=cF;Xn.InflateRaw=uF;Xn.Unzip=gF;typeof T9.BrotliCompress=="function"?(Xn.BrotliCompress=fF,Xn.BrotliDecompress=hF):Xn.BrotliCompress=Xn.BrotliDecompress=class{constructor(){throw new Error("Brotli is not supported in this version of Node.js")}}});var th=w((Dot,L9)=>{var NRe=process.env.TESTING_TAR_FAKE_PLATFORM||process.platform;L9.exports=NRe!=="win32"?r=>r:r=>r&&r.replace(/\\/g,"/")});var qB=w((Rot,O9)=>{"use strict";var TRe=_f(),CF=th(),mF=Symbol("slurp");O9.exports=class extends TRe{constructor(e,t,i){switch(super(),this.pause(),this.extended=t,this.globalExtended=i,this.header=e,this.startBlockSize=512*Math.ceil(e.size/512),this.blockRemain=this.startBlockSize,this.remain=e.size,this.type=e.type,this.meta=!1,this.ignore=!1,this.type){case"File":case"OldFile":case"Link":case"SymbolicLink":case"CharacterDevice":case"BlockDevice":case"Directory":case"FIFO":case"ContiguousFile":case"GNUDumpDir":break;case"NextFileHasLongLinkpath":case"NextFileHasLongPath":case"OldGnuLongPath":case"GlobalExtendedHeader":case"ExtendedHeader":case"OldExtendedHeader":this.meta=!0;break;default:this.ignore=!0}this.path=CF(e.path),this.mode=e.mode,this.mode&&(this.mode=this.mode&4095),this.uid=e.uid,this.gid=e.gid,this.uname=e.uname,this.gname=e.gname,this.size=e.size,this.mtime=e.mtime,this.atime=e.atime,this.ctime=e.ctime,this.linkpath=CF(e.linkpath),this.uname=e.uname,this.gname=e.gname,t&&this[mF](t),i&&this[mF](i,!0)}write(e){let t=e.length;if(t>this.blockRemain)throw new Error("writing more to entry than is appropriate");let i=this.remain,n=this.blockRemain;return this.remain=Math.max(0,i-t),this.blockRemain=Math.max(0,n-t),this.ignore?!0:i>=t?super.write(e):super.write(e.slice(0,i))}[mF](e,t){for(let i in e)e[i]!==null&&e[i]!==void 0&&!(t&&i==="path")&&(this[i]=i==="path"||i==="linkpath"?CF(e[i]):e[i])}}});var EF=w(JB=>{"use strict";JB.name=new Map([["0","File"],["","OldFile"],["1","Link"],["2","SymbolicLink"],["3","CharacterDevice"],["4","BlockDevice"],["5","Directory"],["6","FIFO"],["7","ContiguousFile"],["g","GlobalExtendedHeader"],["x","ExtendedHeader"],["A","SolarisACL"],["D","GNUDumpDir"],["I","Inode"],["K","NextFileHasLongLinkpath"],["L","NextFileHasLongPath"],["M","ContinuationFile"],["N","OldGnuLongPath"],["S","SparseFile"],["V","TapeVolumeHeader"],["X","OldExtendedHeader"]]);JB.code=new Map(Array.from(JB.name).map(r=>[r[1],r[0]]))});var H9=w((Not,U9)=>{"use strict";var LRe=(r,e)=>{if(Number.isSafeInteger(r))r<0?MRe(r,e):ORe(r,e);else throw Error("cannot encode number outside of javascript safe integer range");return e},ORe=(r,e)=>{e[0]=128;for(var t=e.length;t>1;t--)e[t-1]=r&255,r=Math.floor(r/256)},MRe=(r,e)=>{e[0]=255;var t=!1;r=r*-1;for(var i=e.length;i>1;i--){var n=r&255;r=Math.floor(r/256),t?e[i-1]=M9(n):n===0?e[i-1]=0:(t=!0,e[i-1]=K9(n))}},KRe=r=>{let e=r[0],t=e===128?HRe(r.slice(1,r.length)):e===255?URe(r):null;if(t===null)throw Error("invalid base256 encoding");if(!Number.isSafeInteger(t))throw Error("parsed number outside of javascript safe integer range");return t},URe=r=>{for(var e=r.length,t=0,i=!1,n=e-1;n>-1;n--){var s=r[n],o;i?o=M9(s):s===0?o=s:(i=!0,o=K9(s)),o!==0&&(t-=o*Math.pow(256,e-n-1))}return t},HRe=r=>{for(var e=r.length,t=0,i=e-1;i>-1;i--){var n=r[i];n!==0&&(t+=n*Math.pow(256,e-i-1))}return t},M9=r=>(255^r)&255,K9=r=>(255^r)+1&255;U9.exports={encode:LRe,parse:KRe}});var ih=w((Tot,Y9)=>{"use strict";var IF=EF(),rh=J("path").posix,G9=H9(),yF=Symbol("slurp"),Zn=Symbol("type"),bF=class{constructor(e,t,i,n){this.cksumValid=!1,this.needPax=!1,this.nullBlock=!1,this.block=null,this.path=null,this.mode=null,this.uid=null,this.gid=null,this.size=null,this.mtime=null,this.cksum=null,this[Zn]="0",this.linkpath=null,this.uname=null,this.gname=null,this.devmaj=0,this.devmin=0,this.atime=null,this.ctime=null,Buffer.isBuffer(e)?this.decode(e,t||0,i,n):e&&this.set(e)}decode(e,t,i,n){if(t||(t=0),!e||!(e.length>=t+512))throw new Error("need 512 bytes for header");if(this.path=Gc(e,t,100),this.mode=nl(e,t+100,8),this.uid=nl(e,t+108,8),this.gid=nl(e,t+116,8),this.size=nl(e,t+124,12),this.mtime=wF(e,t+136,12),this.cksum=nl(e,t+148,12),this[yF](i),this[yF](n,!0),this[Zn]=Gc(e,t+156,1),this[Zn]===""&&(this[Zn]="0"),this[Zn]==="0"&&this.path.substr(-1)==="/"&&(this[Zn]="5"),this[Zn]==="5"&&(this.size=0),this.linkpath=Gc(e,t+157,100),e.slice(t+257,t+265).toString()==="ustar\x0000")if(this.uname=Gc(e,t+265,32),this.gname=Gc(e,t+297,32),this.devmaj=nl(e,t+329,8),this.devmin=nl(e,t+337,8),e[t+475]!==0){let o=Gc(e,t+345,155);this.path=o+"/"+this.path}else{let o=Gc(e,t+345,130);o&&(this.path=o+"/"+this.path),this.atime=wF(e,t+476,12),this.ctime=wF(e,t+488,12)}let s=8*32;for(let o=t;o<t+148;o++)s+=e[o];for(let o=t+156;o<t+512;o++)s+=e[o];this.cksumValid=s===this.cksum,this.cksum===null&&s===8*32&&(this.nullBlock=!0)}[yF](e,t){for(let i in e)e[i]!==null&&e[i]!==void 0&&!(t&&i==="path")&&(this[i]=e[i])}encode(e,t){if(e||(e=this.block=Buffer.alloc(512),t=0),t||(t=0),!(e.length>=t+512))throw new Error("need 512 bytes for header");let i=this.ctime||this.atime?130:155,n=GRe(this.path||"",i),s=n[0],o=n[1];this.needPax=n[2],this.needPax=Yc(e,t,100,s)||this.needPax,this.needPax=sl(e,t+100,8,this.mode)||this.needPax,this.needPax=sl(e,t+108,8,this.uid)||this.needPax,this.needPax=sl(e,t+116,8,this.gid)||this.needPax,this.needPax=sl(e,t+124,12,this.size)||this.needPax,this.needPax=BF(e,t+136,12,this.mtime)||this.needPax,e[t+156]=this[Zn].charCodeAt(0),this.needPax=Yc(e,t+157,100,this.linkpath)||this.needPax,e.write("ustar\x0000",t+257,8),this.needPax=Yc(e,t+265,32,this.uname)||this.needPax,this.needPax=Yc(e,t+297,32,this.gname)||this.needPax,this.needPax=sl(e,t+329,8,this.devmaj)||this.needPax,this.needPax=sl(e,t+337,8,this.devmin)||this.needPax,this.needPax=Yc(e,t+345,i,o)||this.needPax,e[t+475]!==0?this.needPax=Yc(e,t+345,155,o)||this.needPax:(this.needPax=Yc(e,t+345,130,o)||this.needPax,this.needPax=BF(e,t+476,12,this.atime)||this.needPax,this.needPax=BF(e,t+488,12,this.ctime)||this.needPax);let a=8*32;for(let l=t;l<t+148;l++)a+=e[l];for(let l=t+156;l<t+512;l++)a+=e[l];return this.cksum=a,sl(e,t+148,8,this.cksum),this.cksumValid=!0,this.needPax}set(e){for(let t in e)e[t]!==null&&e[t]!==void 0&&(this[t]=e[t])}get type(){return IF.name.get(this[Zn])||this[Zn]}get typeKey(){return this[Zn]}set type(e){IF.code.has(e)?this[Zn]=IF.code.get(e):this[Zn]=e}},GRe=(r,e)=>{let i=r,n="",s,o=rh.parse(r).root||".";if(Buffer.byteLength(i)<100)s=[i,n,!1];else{n=rh.dirname(i),i=rh.basename(i);do Buffer.byteLength(i)<=100&&Buffer.byteLength(n)<=e?s=[i,n,!1]:Buffer.byteLength(i)>100&&Buffer.byteLength(n)<=e?s=[i.substr(0,100-1),n,!0]:(i=rh.join(rh.basename(n),i),n=rh.dirname(n));while(n!==o&&!s);s||(s=[r.substr(0,100-1),"",!0])}return s},Gc=(r,e,t)=>r.slice(e,e+t).toString("utf8").replace(/\0.*/,""),wF=(r,e,t)=>YRe(nl(r,e,t)),YRe=r=>r===null?null:new Date(r*1e3),nl=(r,e,t)=>r[e]&128?G9.parse(r.slice(e,e+t)):qRe(r,e,t),jRe=r=>isNaN(r)?null:r,qRe=(r,e,t)=>jRe(parseInt(r.slice(e,e+t).toString("utf8").replace(/\0.*$/,"").trim(),8)),JRe={12:8589934591,8:2097151},sl=(r,e,t,i)=>i===null?!1:i>JRe[t]||i<0?(G9.encode(i,r.slice(e,e+t)),!0):(WRe(r,e,t,i),!1),WRe=(r,e,t,i)=>r.write(zRe(i,t),e,t,"ascii"),zRe=(r,e)=>VRe(Math.floor(r).toString(8),e),VRe=(r,e)=>(r.length===e-1?r:new Array(e-r.length-1).join("0")+r+" ")+"\0",BF=(r,e,t,i)=>i===null?!1:sl(r,e,t,i.getTime()/1e3),XRe=new Array(156).join("\0"),Yc=(r,e,t,i)=>i===null?!1:(r.write(i+XRe,e,t,"utf8"),i.length!==Buffer.byteLength(i)||i.length>t);Y9.exports=bF});var WB=w((Lot,j9)=>{"use strict";var ZRe=ih(),_Re=J("path"),MC=class{constructor(e,t){this.atime=e.atime||null,this.charset=e.charset||null,this.comment=e.comment||null,this.ctime=e.ctime||null,this.gid=e.gid||null,this.gname=e.gname||null,this.linkpath=e.linkpath||null,this.mtime=e.mtime||null,this.path=e.path||null,this.size=e.size||null,this.uid=e.uid||null,this.uname=e.uname||null,this.dev=e.dev||null,this.ino=e.ino||null,this.nlink=e.nlink||null,this.global=t||!1}encode(){let e=this.encodeBody();if(e==="")return null;let t=Buffer.byteLength(e),i=512*Math.ceil(1+t/512),n=Buffer.allocUnsafe(i);for(let s=0;s<512;s++)n[s]=0;new ZRe({path:("PaxHeader/"+_Re.basename(this.path)).slice(0,99),mode:this.mode||420,uid:this.uid||null,gid:this.gid||null,size:t,mtime:this.mtime||null,type:this.global?"GlobalExtendedHeader":"ExtendedHeader",linkpath:"",uname:this.uname||"",gname:this.gname||"",devmaj:0,devmin:0,atime:this.atime||null,ctime:this.ctime||null}).encode(n),n.write(e,512,t,"utf8");for(let s=t+512;s<n.length;s++)n[s]=0;return n}encodeBody(){return this.encodeField("path")+this.encodeField("ctime")+this.encodeField("atime")+this.encodeField("dev")+this.encodeField("ino")+this.encodeField("nlink")+this.encodeField("charset")+this.encodeField("comment")+this.encodeField("gid")+this.encodeField("gname")+this.encodeField("linkpath")+this.encodeField("mtime")+this.encodeField("size")+this.encodeField("uid")+this.encodeField("uname")}encodeField(e){if(this[e]===null||this[e]===void 0)return"";let t=this[e]instanceof Date?this[e].getTime()/1e3:this[e],i=" "+(e==="dev"||e==="ino"||e==="nlink"?"SCHILY.":"")+e+"="+t+`
-`,n=Buffer.byteLength(i),s=Math.floor(Math.log(n)/Math.log(10))+1;return n+s>=Math.pow(10,s)&&(s+=1),s+n+i}};MC.parse=(r,e,t)=>new MC($Re(eFe(r),e),t);var $Re=(r,e)=>e?Object.keys(r).reduce((t,i)=>(t[i]=r[i],t),e):r,eFe=r=>r.replace(/\n$/,"").split(`
-`).reduce(tFe,Object.create(null)),tFe=(r,e)=>{let t=parseInt(e,10);if(t!==Buffer.byteLength(e)+1)return r;e=e.substr((t+" ").length);let i=e.split("="),n=i.shift().replace(/^SCHILY\.(dev|ino|nlink)/,"$1");if(!n)return r;let s=i.join("=");return r[n]=/^([A-Z]+\.)?([mac]|birth|creation)time$/.test(n)?new Date(s*1e3):/^[0-9]+$/.test(s)?+s:s,r};j9.exports=MC});var nh=w((Oot,q9)=>{q9.exports=r=>{let e=r.length-1,t=-1;for(;e>-1&&r.charAt(e)==="/";)t=e,e--;return t===-1?r:r.slice(0,t)}});var zB=w((Mot,J9)=>{"use strict";J9.exports=r=>class extends r{warn(e,t,i={}){this.file&&(i.file=this.file),this.cwd&&(i.cwd=this.cwd),i.code=t instanceof Error&&t.code||e,i.tarCode=e,!this.strict&&i.recoverable!==!1?(t instanceof Error&&(i=Object.assign(t,i),t=t.message),this.emit("warn",i.tarCode,t,i)):t instanceof Error?this.emit("error",Object.assign(t,i)):this.emit("error",Object.assign(new Error(`${e}: ${t}`),i))}}});var SF=w((Uot,W9)=>{"use strict";var VB=["|","<",">","?",":"],QF=VB.map(r=>String.fromCharCode(61440+r.charCodeAt(0))),rFe=new Map(VB.map((r,e)=>[r,QF[e]])),iFe=new Map(QF.map((r,e)=>[r,VB[e]]));W9.exports={encode:r=>VB.reduce((e,t)=>e.split(t).join(rFe.get(t)),r),decode:r=>QF.reduce((e,t)=>e.split(t).join(iFe.get(t)),r)}});var vF=w((Hot,V9)=>{var{isAbsolute:nFe,parse:z9}=J("path").win32;V9.exports=r=>{let e="",t=z9(r);for(;nFe(r)||t.root;){let i=r.charAt(0)==="/"&&r.slice(0,4)!=="//?/"?"/":t.root;r=r.substr(i.length),e+=i,t=z9(r)}return[e,r]}});var Z9=w((Got,X9)=>{"use strict";X9.exports=(r,e,t)=>(r&=4095,t&&(r=(r|384)&-19),e&&(r&256&&(r|=64),r&32&&(r|=8),r&4&&(r|=1)),r)});var OF=w((qot,u7)=>{"use strict";var n7=_f(),s7=WB(),o7=ih(),Zo=J("fs"),_9=J("path"),Xo=th(),sFe=nh(),a7=(r,e)=>e?(r=Xo(r).replace(/^\.(\/|$)/,""),sFe(e)+"/"+r):Xo(r),oFe=16*1024*1024,$9=Symbol("process"),e7=Symbol("file"),t7=Symbol("directory"),PF=Symbol("symlink"),r7=Symbol("hardlink"),KC=Symbol("header"),XB=Symbol("read"),DF=Symbol("lstat"),ZB=Symbol("onlstat"),kF=Symbol("onread"),RF=Symbol("onreadlink"),FF=Symbol("openfile"),NF=Symbol("onopenfile"),ol=Symbol("close"),_B=Symbol("mode"),TF=Symbol("awaitDrain"),xF=Symbol("ondrain"),_o=Symbol("prefix"),i7=Symbol("hadError"),A7=zB(),aFe=SF(),l7=vF(),c7=Z9(),$B=A7(class extends n7{constructor(e,t){if(t=t||{},super(t),typeof e!="string")throw new TypeError("path is required");this.path=Xo(e),this.portable=!!t.portable,this.myuid=process.getuid&&process.getuid()||0,this.myuser=process.env.USER||"",this.maxReadSize=t.maxReadSize||oFe,this.linkCache=t.linkCache||new Map,this.statCache=t.statCache||new Map,this.preservePaths=!!t.preservePaths,this.cwd=Xo(t.cwd||process.cwd()),this.strict=!!t.strict,this.noPax=!!t.noPax,this.noMtime=!!t.noMtime,this.mtime=t.mtime||null,this.prefix=t.prefix?Xo(t.prefix):null,this.fd=null,this.blockLen=null,this.blockRemain=null,this.buf=null,this.offset=null,this.length=null,this.pos=null,this.remain=null,typeof t.onwarn=="function"&&this.on("warn",t.onwarn);let i=!1;if(!this.preservePaths){let[n,s]=l7(this.path);n&&(this.path=s,i=n)}this.win32=!!t.win32||process.platform==="win32",this.win32&&(this.path=aFe.decode(this.path.replace(/\\/g,"/")),e=e.replace(/\\/g,"/")),this.absolute=Xo(t.absolute||_9.resolve(this.cwd,e)),this.path===""&&(this.path="./"),i&&this.warn("TAR_ENTRY_INFO",`stripping ${i} from absolute path`,{entry:this,path:i+this.path}),this.statCache.has(this.absolute)?this[ZB](this.statCache.get(this.absolute)):this[DF]()}emit(e,...t){return e==="error"&&(this[i7]=!0),super.emit(e,...t)}[DF](){Zo.lstat(this.absolute,(e,t)=>{if(e)return this.emit("error",e);this[ZB](t)})}[ZB](e){this.statCache.set(this.absolute,e),this.stat=e,e.isFile()||(e.size=0),this.type=lFe(e),this.emit("stat",e),this[$9]()}[$9](){switch(this.type){case"File":return this[e7]();case"Directory":return this[t7]();case"SymbolicLink":return this[PF]();default:return this.end()}}[_B](e){return c7(e,this.type==="Directory",this.portable)}[_o](e){return a7(e,this.prefix)}[KC](){this.type==="Directory"&&this.portable&&(this.noMtime=!0),this.header=new o7({path:this[_o](this.path),linkpath:this.type==="Link"?this[_o](this.linkpath):this.linkpath,mode:this[_B](this.stat.mode),uid:this.portable?null:this.stat.uid,gid:this.portable?null:this.stat.gid,size:this.stat.size,mtime:this.noMtime?null:this.mtime||this.stat.mtime,type:this.type,uname:this.portable?null:this.stat.uid===this.myuid?this.myuser:"",atime:this.portable?null:this.stat.atime,ctime:this.portable?null:this.stat.ctime}),this.header.encode()&&!this.noPax&&super.write(new s7({atime:this.portable?null:this.header.atime,ctime:this.portable?null:this.header.ctime,gid:this.portable?null:this.header.gid,mtime:this.noMtime?null:this.mtime||this.header.mtime,path:this[_o](this.path),linkpath:this.type==="Link"?this[_o](this.linkpath):this.linkpath,size:this.header.size,uid:this.portable?null:this.header.uid,uname:this.portable?null:this.header.uname,dev:this.portable?null:this.stat.dev,ino:this.portable?null:this.stat.ino,nlink:this.portable?null:this.stat.nlink}).encode()),super.write(this.header.block)}[t7](){this.path.substr(-1)!=="/"&&(this.path+="/"),this.stat.size=0,this[KC](),this.end()}[PF](){Zo.readlink(this.absolute,(e,t)=>{if(e)return this.emit("error",e);this[RF](t)})}[RF](e){this.linkpath=Xo(e),this[KC](),this.end()}[r7](e){this.type="Link",this.linkpath=Xo(_9.relative(this.cwd,e)),this.stat.size=0,this[KC](),this.end()}[e7](){if(this.stat.nlink>1){let e=this.stat.dev+":"+this.stat.ino;if(this.linkCache.has(e)){let t=this.linkCache.get(e);if(t.indexOf(this.cwd)===0)return this[r7](t)}this.linkCache.set(e,this.absolute)}if(this[KC](),this.stat.size===0)return this.end();this[FF]()}[FF](){Zo.open(this.absolute,"r",(e,t)=>{if(e)return this.emit("error",e);this[NF](t)})}[NF](e){if(this.fd=e,this[i7])return this[ol]();this.blockLen=512*Math.ceil(this.stat.size/512),this.blockRemain=this.blockLen;let t=Math.min(this.blockLen,this.maxReadSize);this.buf=Buffer.allocUnsafe(t),this.offset=0,this.pos=0,this.remain=this.stat.size,this.length=this.buf.length,this[XB]()}[XB](){let{fd:e,buf:t,offset:i,length:n,pos:s}=this;Zo.read(e,t,i,n,s,(o,a)=>{if(o)return this[ol](()=>this.emit("error",o));this[kF](a)})}[ol](e){Zo.close(this.fd,e)}[kF](e){if(e<=0&&this.remain>0){let n=new Error("encountered unexpected EOF");return n.path=this.absolute,n.syscall="read",n.code="EOF",this[ol](()=>this.emit("error",n))}if(e>this.remain){let n=new Error("did not encounter expected EOF");return n.path=this.absolute,n.syscall="read",n.code="EOF",this[ol](()=>this.emit("error",n))}if(e===this.remain)for(let n=e;n<this.length&&e<this.blockRemain;n++)this.buf[n+this.offset]=0,e++,this.remain++;let t=this.offset===0&&e===this.buf.length?this.buf:this.buf.slice(this.offset,this.offset+e);this.write(t)?this[xF]():this[TF](()=>this[xF]())}[TF](e){this.once("drain",e)}write(e){if(this.blockRemain<e.length){let t=new Error("writing more data than expected");return t.path=this.absolute,this.emit("error",t)}return this.remain-=e.length,this.blockRemain-=e.length,this.pos+=e.length,this.offset+=e.length,super.write(e)}[xF](){if(!this.remain)return this.blockRemain&&super.write(Buffer.alloc(this.blockRemain)),this[ol](e=>e?this.emit("error",e):this.end());this.offset>=this.length&&(this.buf=Buffer.allocUnsafe(Math.min(this.blockRemain,this.buf.length)),this.offset=0),this.length=this.buf.length-this.offset,this[XB]()}}),LF=class extends $B{[DF](){this[ZB](Zo.lstatSync(this.absolute))}[PF](){this[RF](Zo.readlinkSync(this.absolute))}[FF](){this[NF](Zo.openSync(this.absolute,"r"))}[XB](){let e=!0;try{let{fd:t,buf:i,offset:n,length:s,pos:o}=this,a=Zo.readSync(t,i,n,s,o);this[kF](a),e=!1}finally{if(e)try{this[ol](()=>{})}catch{}}}[TF](e){e()}[ol](e){Zo.closeSync(this.fd),e()}},AFe=A7(class extends n7{constructor(e,t){t=t||{},super(t),this.preservePaths=!!t.preservePaths,this.portable=!!t.portable,this.strict=!!t.strict,this.noPax=!!t.noPax,this.noMtime=!!t.noMtime,this.readEntry=e,this.type=e.type,this.type==="Directory"&&this.portable&&(this.noMtime=!0),this.prefix=t.prefix||null,this.path=Xo(e.path),this.mode=this[_B](e.mode),this.uid=this.portable?null:e.uid,this.gid=this.portable?null:e.gid,this.uname=this.portable?null:e.uname,this.gname=this.portable?null:e.gname,this.size=e.size,this.mtime=this.noMtime?null:t.mtime||e.mtime,this.atime=this.portable?null:e.atime,this.ctime=this.portable?null:e.ctime,this.linkpath=Xo(e.linkpath),typeof t.onwarn=="function"&&this.on("warn",t.onwarn);let i=!1;if(!this.preservePaths){let[n,s]=l7(this.path);n&&(this.path=s,i=n)}this.remain=e.size,this.blockRemain=e.startBlockSize,this.header=new o7({path:this[_o](this.path),linkpath:this.type==="Link"?this[_o](this.linkpath):this.linkpath,mode:this.mode,uid:this.portable?null:this.uid,gid:this.portable?null:this.gid,size:this.size,mtime:this.noMtime?null:this.mtime,type:this.type,uname:this.portable?null:this.uname,atime:this.portable?null:this.atime,ctime:this.portable?null:this.ctime}),i&&this.warn("TAR_ENTRY_INFO",`stripping ${i} from absolute path`,{entry:this,path:i+this.path}),this.header.encode()&&!this.noPax&&super.write(new s7({atime:this.portable?null:this.atime,ctime:this.portable?null:this.ctime,gid:this.portable?null:this.gid,mtime:this.noMtime?null:this.mtime,path:this[_o](this.path),linkpath:this.type==="Link"?this[_o](this.linkpath):this.linkpath,size:this.size,uid:this.portable?null:this.uid,uname:this.portable?null:this.uname,dev:this.portable?null:this.readEntry.dev,ino:this.portable?null:this.readEntry.ino,nlink:this.portable?null:this.readEntry.nlink}).encode()),super.write(this.header.block),e.pipe(this)}[_o](e){return a7(e,this.prefix)}[_B](e){return c7(e,this.type==="Directory",this.portable)}write(e){let t=e.length;if(t>this.blockRemain)throw new Error("writing more to entry than is appropriate");return this.blockRemain-=t,super.write(e)}end(){return this.blockRemain&&super.write(Buffer.alloc(this.blockRemain)),super.end()}});$B.Sync=LF;$B.Tar=AFe;var lFe=r=>r.isFile()?"File":r.isDirectory()?"Directory":r.isSymbolicLink()?"SymbolicLink":"Unsupported";u7.exports=$B});var A0=w((Wot,m7)=>{"use strict";var o0=class{constructor(e,t){this.path=e||"./",this.absolute=t,this.entry=null,this.stat=null,this.readdir=null,this.pending=!1,this.ignore=!1,this.piped=!1}},cFe=_f(),uFe=dF(),gFe=qB(),JF=OF(),fFe=JF.Sync,hFe=JF.Tar,pFe=WI(),g7=Buffer.alloc(1024),r0=Symbol("onStat"),e0=Symbol("ended"),$o=Symbol("queue"),sh=Symbol("current"),jc=Symbol("process"),t0=Symbol("processing"),f7=Symbol("processJob"),ea=Symbol("jobs"),MF=Symbol("jobDone"),i0=Symbol("addFSEntry"),h7=Symbol("addTarEntry"),GF=Symbol("stat"),YF=Symbol("readdir"),n0=Symbol("onreaddir"),s0=Symbol("pipe"),p7=Symbol("entry"),KF=Symbol("entryOpt"),jF=Symbol("writeEntryClass"),C7=Symbol("write"),UF=Symbol("ondrain"),a0=J("fs"),d7=J("path"),dFe=zB(),HF=th(),WF=dFe(class extends cFe{constructor(e){super(e),e=e||Object.create(null),this.opt=e,this.file=e.file||"",this.cwd=e.cwd||process.cwd(),this.maxReadSize=e.maxReadSize,this.preservePaths=!!e.preservePaths,this.strict=!!e.strict,this.noPax=!!e.noPax,this.prefix=HF(e.prefix||""),this.linkCache=e.linkCache||new Map,this.statCache=e.statCache||new Map,this.readdirCache=e.readdirCache||new Map,this[jF]=JF,typeof e.onwarn=="function"&&this.on("warn",e.onwarn),this.portable=!!e.portable,this.zip=null,e.gzip?(typeof e.gzip!="object"&&(e.gzip={}),this.portable&&(e.gzip.portable=!0),this.zip=new uFe.Gzip(e.gzip),this.zip.on("data",t=>super.write(t)),this.zip.on("end",t=>super.end()),this.zip.on("drain",t=>this[UF]()),this.on("resume",t=>this.zip.resume())):this.on("drain",this[UF]),this.noDirRecurse=!!e.noDirRecurse,this.follow=!!e.follow,this.noMtime=!!e.noMtime,this.mtime=e.mtime||null,this.filter=typeof e.filter=="function"?e.filter:t=>!0,this[$o]=new pFe,this[ea]=0,this.jobs=+e.jobs||4,this[t0]=!1,this[e0]=!1}[C7](e){return super.write(e)}add(e){return this.write(e),this}end(e){return e&&this.write(e),this[e0]=!0,this[jc](),this}write(e){if(this[e0])throw new Error("write after end");return e instanceof gFe?this[h7](e):this[i0](e),this.flowing}[h7](e){let t=HF(d7.resolve(this.cwd,e.path));if(!this.filter(e.path,e))e.resume();else{let i=new o0(e.path,t,!1);i.entry=new hFe(e,this[KF](i)),i.entry.on("end",n=>this[MF](i)),this[ea]+=1,this[$o].push(i)}this[jc]()}[i0](e){let t=HF(d7.resolve(this.cwd,e));this[$o].push(new o0(e,t)),this[jc]()}[GF](e){e.pending=!0,this[ea]+=1;let t=this.follow?"stat":"lstat";a0[t](e.absolute,(i,n)=>{e.pending=!1,this[ea]-=1,i?this.emit("error",i):this[r0](e,n)})}[r0](e,t){this.statCache.set(e.absolute,t),e.stat=t,this.filter(e.path,t)||(e.ignore=!0),this[jc]()}[YF](e){e.pending=!0,this[ea]+=1,a0.readdir(e.absolute,(t,i)=>{if(e.pending=!1,this[ea]-=1,t)return this.emit("error",t);this[n0](e,i)})}[n0](e,t){this.readdirCache.set(e.absolute,t),e.readdir=t,this[jc]()}[jc](){if(!this[t0]){this[t0]=!0;for(let e=this[$o].head;e!==null&&this[ea]<this.jobs;e=e.next)if(this[f7](e.value),e.value.ignore){let t=e.next;this[$o].removeNode(e),e.next=t}this[t0]=!1,this[e0]&&!this[$o].length&&this[ea]===0&&(this.zip?this.zip.end(g7):(super.write(g7),super.end()))}}get[sh](){return this[$o]&&this[$o].head&&this[$o].head.value}[MF](e){this[$o].shift(),this[ea]-=1,this[jc]()}[f7](e){if(!e.pending){if(e.entry){e===this[sh]&&!e.piped&&this[s0](e);return}if(e.stat||(this.statCache.has(e.absolute)?this[r0](e,this.statCache.get(e.absolute)):this[GF](e)),!!e.stat&&!e.ignore&&!(!this.noDirRecurse&&e.stat.isDirectory()&&!e.readdir&&(this.readdirCache.has(e.absolute)?this[n0](e,this.readdirCache.get(e.absolute)):this[YF](e),!e.readdir))){if(e.entry=this[p7](e),!e.entry){e.ignore=!0;return}e===this[sh]&&!e.piped&&this[s0](e)}}}[KF](e){return{onwarn:(t,i,n)=>this.warn(t,i,n),noPax:this.noPax,cwd:this.cwd,absolute:e.absolute,preservePaths:this.preservePaths,maxReadSize:this.maxReadSize,strict:this.strict,portable:this.portable,linkCache:this.linkCache,statCache:this.statCache,noMtime:this.noMtime,mtime:this.mtime,prefix:this.prefix}}[p7](e){this[ea]+=1;try{return new this[jF](e.path,this[KF](e)).on("end",()=>this[MF](e)).on("error",t=>this.emit("error",t))}catch(t){this.emit("error",t)}}[UF](){this[sh]&&this[sh].entry&&this[sh].entry.resume()}[s0](e){e.piped=!0,e.readdir&&e.readdir.forEach(n=>{let s=e.path,o=s==="./"?"":s.replace(/\/*$/,"/");this[i0](o+n)});let t=e.entry,i=this.zip;i?t.on("data",n=>{i.write(n)||t.pause()}):t.on("data",n=>{super.write(n)||t.pause()})}pause(){return this.zip&&this.zip.pause(),super.pause()}}),qF=class extends WF{constructor(e){super(e),this[jF]=fFe}pause(){}resume(){}[GF](e){let t=this.follow?"statSync":"lstatSync";this[r0](e,a0[t](e.absolute))}[YF](e,t){this[n0](e,a0.readdirSync(e.absolute))}[s0](e){let t=e.entry,i=this.zip;e.readdir&&e.readdir.forEach(n=>{let s=e.path,o=s==="./"?"":s.replace(/\/*$/,"/");this[i0](o+n)}),i?t.on("data",n=>{i.write(n)}):t.on("data",n=>{super[C7](n)})}};WF.Sync=qF;m7.exports=WF});var fh=w(HC=>{"use strict";var CFe=_f(),mFe=J("events").EventEmitter,Pn=J("fs"),XF=Pn.writev;if(!XF){let r=process.binding("fs"),e=r.FSReqWrap||r.FSReqCallback;XF=(t,i,n,s)=>{let o=(l,c)=>s(l,c,i),a=new e;a.oncomplete=o,r.writeBuffers(t,i,n,a)}}var uh=Symbol("_autoClose"),lo=Symbol("_close"),UC=Symbol("_ended"),rr=Symbol("_fd"),E7=Symbol("_finished"),Al=Symbol("_flags"),zF=Symbol("_flush"),ZF=Symbol("_handleChunk"),_F=Symbol("_makeBuf"),f0=Symbol("_mode"),l0=Symbol("_needDrain"),lh=Symbol("_onerror"),gh=Symbol("_onopen"),VF=Symbol("_onread"),ah=Symbol("_onwrite"),ll=Symbol("_open"),_a=Symbol("_path"),qc=Symbol("_pos"),ta=Symbol("_queue"),Ah=Symbol("_read"),I7=Symbol("_readSize"),al=Symbol("_reading"),c0=Symbol("_remain"),y7=Symbol("_size"),u0=Symbol("_write"),oh=Symbol("_writing"),g0=Symbol("_defaultFlag"),ch=Symbol("_errored"),h0=class extends CFe{constructor(e,t){if(t=t||{},super(t),this.readable=!0,this.writable=!1,typeof e!="string")throw new TypeError("path must be a string");this[ch]=!1,this[rr]=typeof t.fd=="number"?t.fd:null,this[_a]=e,this[I7]=t.readSize||16*1024*1024,this[al]=!1,this[y7]=typeof t.size=="number"?t.size:1/0,this[c0]=this[y7],this[uh]=typeof t.autoClose=="boolean"?t.autoClose:!0,typeof this[rr]=="number"?this[Ah]():this[ll]()}get fd(){return this[rr]}get path(){return this[_a]}write(){throw new TypeError("this is a readable stream")}end(){throw new TypeError("this is a readable stream")}[ll](){Pn.open(this[_a],"r",(e,t)=>this[gh](e,t))}[gh](e,t){e?this[lh](e):(this[rr]=t,this.emit("open",t),this[Ah]())}[_F](){return Buffer.allocUnsafe(Math.min(this[I7],this[c0]))}[Ah](){if(!this[al]){this[al]=!0;let e=this[_F]();if(e.length===0)return process.nextTick(()=>this[VF](null,0,e));Pn.read(this[rr],e,0,e.length,null,(t,i,n)=>this[VF](t,i,n))}}[VF](e,t,i){this[al]=!1,e?this[lh](e):this[ZF](t,i)&&this[Ah]()}[lo](){if(this[uh]&&typeof this[rr]=="number"){let e=this[rr];this[rr]=null,Pn.close(e,t=>t?this.emit("error",t):this.emit("close"))}}[lh](e){this[al]=!0,this[lo](),this.emit("error",e)}[ZF](e,t){let i=!1;return this[c0]-=e,e>0&&(i=super.write(e<t.length?t.slice(0,e):t)),(e===0||this[c0]<=0)&&(i=!1,this[lo](),super.end()),i}emit(e,t){switch(e){case"prefinish":case"finish":break;case"drain":typeof this[rr]=="number"&&this[Ah]();break;case"error":return this[ch]?void 0:(this[ch]=!0,super.emit(e,t));default:return super.emit(e,t)}}},$F=class extends h0{[ll](){let e=!0;try{this[gh](null,Pn.openSync(this[_a],"r")),e=!1}finally{e&&this[lo]()}}[Ah](){let e=!0;try{if(!this[al]){this[al]=!0;do{let t=this[_F](),i=t.length===0?0:Pn.readSync(this[rr],t,0,t.length,null);if(!this[ZF](i,t))break}while(!0);this[al]=!1}e=!1}finally{e&&this[lo]()}}[lo](){if(this[uh]&&typeof this[rr]=="number"){let e=this[rr];this[rr]=null,Pn.closeSync(e),this.emit("close")}}},p0=class extends mFe{constructor(e,t){t=t||{},super(t),this.readable=!1,this.writable=!0,this[ch]=!1,this[oh]=!1,this[UC]=!1,this[l0]=!1,this[ta]=[],this[_a]=e,this[rr]=typeof t.fd=="number"?t.fd:null,this[f0]=t.mode===void 0?438:t.mode,this[qc]=typeof t.start=="number"?t.start:null,this[uh]=typeof t.autoClose=="boolean"?t.autoClose:!0;let i=this[qc]!==null?"r+":"w";this[g0]=t.flags===void 0,this[Al]=this[g0]?i:t.flags,this[rr]===null&&this[ll]()}emit(e,t){if(e==="error"){if(this[ch])return;this[ch]=!0}return super.emit(e,t)}get fd(){return this[rr]}get path(){return this[_a]}[lh](e){this[lo](),this[oh]=!0,this.emit("error",e)}[ll](){Pn.open(this[_a],this[Al],this[f0],(e,t)=>this[gh](e,t))}[gh](e,t){this[g0]&&this[Al]==="r+"&&e&&e.code==="ENOENT"?(this[Al]="w",this[ll]()):e?this[lh](e):(this[rr]=t,this.emit("open",t),this[zF]())}end(e,t){return e&&this.write(e,t),this[UC]=!0,!this[oh]&&!this[ta].length&&typeof this[rr]=="number"&&this[ah](null,0),this}write(e,t){return typeof e=="string"&&(e=Buffer.from(e,t)),this[UC]?(this.emit("error",new Error("write() after end()")),!1):this[rr]===null||this[oh]||this[ta].length?(this[ta].push(e),this[l0]=!0,!1):(this[oh]=!0,this[u0](e),!0)}[u0](e){Pn.write(this[rr],e,0,e.length,this[qc],(t,i)=>this[ah](t,i))}[ah](e,t){e?this[lh](e):(this[qc]!==null&&(this[qc]+=t),this[ta].length?this[zF]():(this[oh]=!1,this[UC]&&!this[E7]?(this[E7]=!0,this[lo](),this.emit("finish")):this[l0]&&(this[l0]=!1,this.emit("drain"))))}[zF](){if(this[ta].length===0)this[UC]&&this[ah](null,0);else if(this[ta].length===1)this[u0](this[ta].pop());else{let e=this[ta];this[ta]=[],XF(this[rr],e,this[qc],(t,i)=>this[ah](t,i))}}[lo](){if(this[uh]&&typeof this[rr]=="number"){let e=this[rr];this[rr]=null,Pn.close(e,t=>t?this.emit("error",t):this.emit("close"))}}},eN=class extends p0{[ll](){let e;if(this[g0]&&this[Al]==="r+")try{e=Pn.openSync(this[_a],this[Al],this[f0])}catch(t){if(t.code==="ENOENT")return this[Al]="w",this[ll]();throw t}else e=Pn.openSync(this[_a],this[Al],this[f0]);this[gh](null,e)}[lo](){if(this[uh]&&typeof this[rr]=="number"){let e=this[rr];this[rr]=null,Pn.closeSync(e),this.emit("close")}}[u0](e){let t=!0;try{this[ah](null,Pn.writeSync(this[rr],e,0,e.length,this[qc])),t=!1}finally{if(t)try{this[lo]()}catch{}}}};HC.ReadStream=h0;HC.ReadStreamSync=$F;HC.WriteStream=p0;HC.WriteStreamSync=eN});var w0=w((Xot,x7)=>{"use strict";var EFe=zB(),IFe=ih(),yFe=J("events"),wFe=WI(),BFe=1024*1024,bFe=qB(),w7=WB(),QFe=dF(),tN=Buffer.from([31,139]),xs=Symbol("state"),Jc=Symbol("writeEntry"),$a=Symbol("readEntry"),rN=Symbol("nextEntry"),B7=Symbol("processEntry"),Ps=Symbol("extendedHeader"),GC=Symbol("globalExtendedHeader"),cl=Symbol("meta"),b7=Symbol("emitMeta"),Er=Symbol("buffer"),eA=Symbol("queue"),Wc=Symbol("ended"),Q7=Symbol("emittedEnd"),zc=Symbol("emit"),Dn=Symbol("unzip"),d0=Symbol("consumeChunk"),C0=Symbol("consumeChunkSub"),iN=Symbol("consumeBody"),S7=Symbol("consumeMeta"),v7=Symbol("consumeHeader"),m0=Symbol("consuming"),nN=Symbol("bufferConcat"),sN=Symbol("maybeEnd"),YC=Symbol("writing"),ul=Symbol("aborted"),E0=Symbol("onDone"),Vc=Symbol("sawValidEntry"),I0=Symbol("sawNullBlock"),y0=Symbol("sawEOF"),SFe=r=>!0;x7.exports=EFe(class extends yFe{constructor(e){e=e||{},super(e),this.file=e.file||"",this[Vc]=null,this.on(E0,t=>{(this[xs]==="begin"||this[Vc]===!1)&&this.warn("TAR_BAD_ARCHIVE","Unrecognized archive format")}),e.ondone?this.on(E0,e.ondone):this.on(E0,t=>{this.emit("prefinish"),this.emit("finish"),this.emit("end"),this.emit("close")}),this.strict=!!e.strict,this.maxMetaEntrySize=e.maxMetaEntrySize||BFe,this.filter=typeof e.filter=="function"?e.filter:SFe,this.writable=!0,this.readable=!1,this[eA]=new wFe,this[Er]=null,this[$a]=null,this[Jc]=null,this[xs]="begin",this[cl]="",this[Ps]=null,this[GC]=null,this[Wc]=!1,this[Dn]=null,this[ul]=!1,this[I0]=!1,this[y0]=!1,typeof e.onwarn=="function"&&this.on("warn",e.onwarn),typeof e.onentry=="function"&&this.on("entry",e.onentry)}[v7](e,t){this[Vc]===null&&(this[Vc]=!1);let i;try{i=new IFe(e,t,this[Ps],this[GC])}catch(n){return this.warn("TAR_ENTRY_INVALID",n)}if(i.nullBlock)this[I0]?(this[y0]=!0,this[xs]==="begin"&&(this[xs]="header"),this[zc]("eof")):(this[I0]=!0,this[zc]("nullBlock"));else if(this[I0]=!1,!i.cksumValid)this.warn("TAR_ENTRY_INVALID","checksum failure",{header:i});else if(!i.path)this.warn("TAR_ENTRY_INVALID","path is required",{header:i});else{let n=i.type;if(/^(Symbolic)?Link$/.test(n)&&!i.linkpath)this.warn("TAR_ENTRY_INVALID","linkpath required",{header:i});else if(!/^(Symbolic)?Link$/.test(n)&&i.linkpath)this.warn("TAR_ENTRY_INVALID","linkpath forbidden",{header:i});else{let s=this[Jc]=new bFe(i,this[Ps],this[GC]);if(!this[Vc])if(s.remain){let o=()=>{s.invalid||(this[Vc]=!0)};s.on("end",o)}else this[Vc]=!0;s.meta?s.size>this.maxMetaEntrySize?(s.ignore=!0,this[zc]("ignoredEntry",s),this[xs]="ignore",s.resume()):s.size>0&&(this[cl]="",s.on("data",o=>this[cl]+=o),this[xs]="meta"):(this[Ps]=null,s.ignore=s.ignore||!this.filter(s.path,s),s.ignore?(this[zc]("ignoredEntry",s),this[xs]=s.remain?"ignore":"header",s.resume()):(s.remain?this[xs]="body":(this[xs]="header",s.end()),this[$a]?this[eA].push(s):(this[eA].push(s),this[rN]())))}}}[B7](e){let t=!0;return e?Array.isArray(e)?this.emit.apply(this,e):(this[$a]=e,this.emit("entry",e),e.emittedEnd||(e.on("end",i=>this[rN]()),t=!1)):(this[$a]=null,t=!1),t}[rN](){do;while(this[B7](this[eA].shift()));if(!this[eA].length){let e=this[$a];!e||e.flowing||e.size===e.remain?this[YC]||this.emit("drain"):e.once("drain",i=>this.emit("drain"))}}[iN](e,t){let i=this[Jc],n=i.blockRemain,s=n>=e.length&&t===0?e:e.slice(t,t+n);return i.write(s),i.blockRemain||(this[xs]="header",this[Jc]=null,i.end()),s.length}[S7](e,t){let i=this[Jc],n=this[iN](e,t);return this[Jc]||this[b7](i),n}[zc](e,t,i){!this[eA].length&&!this[$a]?this.emit(e,t,i):this[eA].push([e,t,i])}[b7](e){switch(this[zc]("meta",this[cl]),e.type){case"ExtendedHeader":case"OldExtendedHeader":this[Ps]=w7.parse(this[cl],this[Ps],!1);break;case"GlobalExtendedHeader":this[GC]=w7.parse(this[cl],this[GC],!0);break;case"NextFileHasLongPath":case"OldGnuLongPath":this[Ps]=this[Ps]||Object.create(null),this[Ps].path=this[cl].replace(/\0.*/,"");break;case"NextFileHasLongLinkpath":this[Ps]=this[Ps]||Object.create(null),this[Ps].linkpath=this[cl].replace(/\0.*/,"");break;default:throw new Error("unknown meta: "+e.type)}}abort(e){this[ul]=!0,this.emit("abort",e),this.warn("TAR_ABORT",e,{recoverable:!1})}write(e){if(this[ul])return;if(this[Dn]===null&&e){if(this[Er]&&(e=Buffer.concat([this[Er],e]),this[Er]=null),e.length<tN.length)return this[Er]=e,!0;for(let i=0;this[Dn]===null&&i<tN.length;i++)e[i]!==tN[i]&&(this[Dn]=!1);if(this[Dn]===null){let i=this[Wc];this[Wc]=!1,this[Dn]=new QFe.Unzip,this[Dn].on("data",s=>this[d0](s)),this[Dn].on("error",s=>this.abort(s)),this[Dn].on("end",s=>{this[Wc]=!0,this[d0]()}),this[YC]=!0;let n=this[Dn][i?"end":"write"](e);return this[YC]=!1,n}}this[YC]=!0,this[Dn]?this[Dn].write(e):this[d0](e),this[YC]=!1;let t=this[eA].length?!1:this[$a]?this[$a].flowing:!0;return!t&&!this[eA].length&&this[$a].once("drain",i=>this.emit("drain")),t}[nN](e){e&&!this[ul]&&(this[Er]=this[Er]?Buffer.concat([this[Er],e]):e)}[sN](){if(this[Wc]&&!this[Q7]&&!this[ul]&&!this[m0]){this[Q7]=!0;let e=this[Jc];if(e&&e.blockRemain){let t=this[Er]?this[Er].length:0;this.warn("TAR_BAD_ARCHIVE",`Truncated input (needed ${e.blockRemain} more bytes, only ${t} available)`,{entry:e}),this[Er]&&e.write(this[Er]),e.end()}this[zc](E0)}}[d0](e){if(this[m0])this[nN](e);else if(!e&&!this[Er])this[sN]();else{if(this[m0]=!0,this[Er]){this[nN](e);let t=this[Er];this[Er]=null,this[C0](t)}else this[C0](e);for(;this[Er]&&this[Er].length>=512&&!this[ul]&&!this[y0];){let t=this[Er];this[Er]=null,this[C0](t)}this[m0]=!1}(!this[Er]||this[Wc])&&this[sN]()}[C0](e){let t=0,i=e.length;for(;t+512<=i&&!this[ul]&&!this[y0];)switch(this[xs]){case"begin":case"header":this[v7](e,t),t+=512;break;case"ignore":case"body":t+=this[iN](e,t);break;case"meta":t+=this[S7](e,t);break;default:throw new Error("invalid state: "+this[xs])}t<i&&(this[Er]?this[Er]=Buffer.concat([e.slice(t),this[Er]]):this[Er]=e.slice(t))}end(e){this[ul]||(this[Dn]?this[Dn].end(e):(this[Wc]=!0,this.write(e)))}})});var B0=w((Zot,R7)=>{"use strict";var vFe=Xf(),D7=w0(),hh=J("fs"),xFe=fh(),P7=J("path"),oN=nh();R7.exports=(r,e,t)=>{typeof r=="function"?(t=r,e=null,r={}):Array.isArray(r)&&(e=r,r={}),typeof e=="function"&&(t=e,e=null),e?e=Array.from(e):e=[];let i=vFe(r);if(i.sync&&typeof t=="function")throw new TypeError("callback not supported for sync tar functions");if(!i.file&&typeof t=="function")throw new TypeError("callback only supported with file option");return e.length&&DFe(i,e),i.noResume||PFe(i),i.file&&i.sync?kFe(i):i.file?RFe(i,t):k7(i)};var PFe=r=>{let e=r.onentry;r.onentry=e?t=>{e(t),t.resume()}:t=>t.resume()},DFe=(r,e)=>{let t=new Map(e.map(s=>[oN(s),!0])),i=r.filter,n=(s,o)=>{let a=o||P7.parse(s).root||".",l=s===a?!1:t.has(s)?t.get(s):n(P7.dirname(s),a);return t.set(s,l),l};r.filter=i?(s,o)=>i(s,o)&&n(oN(s)):s=>n(oN(s))},kFe=r=>{let e=k7(r),t=r.file,i=!0,n;try{let s=hh.statSync(t),o=r.maxReadSize||16*1024*1024;if(s.size<o)e.end(hh.readFileSync(t));else{let a=0,l=Buffer.allocUnsafe(o);for(n=hh.openSync(t,"r");a<s.size;){let c=hh.readSync(n,l,0,o,a);a+=c,e.write(l.slice(0,c))}e.end()}i=!1}finally{if(i&&n)try{hh.closeSync(n)}catch{}}},RFe=(r,e)=>{let t=new D7(r),i=r.maxReadSize||16*1024*1024,n=r.file,s=new Promise((o,a)=>{t.on("error",a),t.on("end",o),hh.stat(n,(l,c)=>{if(l)a(l);else{let u=new xFe.ReadStream(n,{readSize:i,size:c.size});u.on("error",a),u.pipe(t)}})});return e?s.then(e,e):s},k7=r=>new D7(r)});var M7=w((_ot,O7)=>{"use strict";var FFe=Xf(),b0=A0(),F7=fh(),N7=B0(),T7=J("path");O7.exports=(r,e,t)=>{if(typeof e=="function"&&(t=e),Array.isArray(r)&&(e=r,r={}),!e||!Array.isArray(e)||!e.length)throw new TypeError("no files or directories specified");e=Array.from(e);let i=FFe(r);if(i.sync&&typeof t=="function")throw new TypeError("callback not supported for sync tar functions");if(!i.file&&typeof t=="function")throw new TypeError("callback only supported with file option");return i.file&&i.sync?NFe(i,e):i.file?TFe(i,e,t):i.sync?LFe(i,e):OFe(i,e)};var NFe=(r,e)=>{let t=new b0.Sync(r),i=new F7.WriteStreamSync(r.file,{mode:r.mode||438});t.pipe(i),L7(t,e)},TFe=(r,e,t)=>{let i=new b0(r),n=new F7.WriteStream(r.file,{mode:r.mode||438});i.pipe(n);let s=new Promise((o,a)=>{n.on("error",a),n.on("close",o),i.on("error",a)});return aN(i,e),t?s.then(t,t):s},L7=(r,e)=>{e.forEach(t=>{t.charAt(0)==="@"?N7({file:T7.resolve(r.cwd,t.substr(1)),sync:!0,noResume:!0,onentry:i=>r.add(i)}):r.add(t)}),r.end()},aN=(r,e)=>{for(;e.length;){let t=e.shift();if(t.charAt(0)==="@")return N7({file:T7.resolve(r.cwd,t.substr(1)),noResume:!0,onentry:i=>r.add(i)}).then(i=>aN(r,e));r.add(t)}r.end()},LFe=(r,e)=>{let t=new b0.Sync(r);return L7(t,e),t},OFe=(r,e)=>{let t=new b0(r);return aN(t,e),t}});var AN=w(($ot,q7)=>{"use strict";var MFe=Xf(),K7=A0(),_n=J("fs"),U7=fh(),H7=B0(),G7=J("path"),Y7=ih();q7.exports=(r,e,t)=>{let i=MFe(r);if(!i.file)throw new TypeError("file is required");if(i.gzip)throw new TypeError("cannot append to compressed archives");if(!e||!Array.isArray(e)||!e.length)throw new TypeError("no files or directories specified");return e=Array.from(e),i.sync?KFe(i,e):HFe(i,e,t)};var KFe=(r,e)=>{let t=new K7.Sync(r),i=!0,n,s;try{try{n=_n.openSync(r.file,"r+")}catch(l){if(l.code==="ENOENT")n=_n.openSync(r.file,"w+");else throw l}let o=_n.fstatSync(n),a=Buffer.alloc(512);e:for(s=0;s<o.size;s+=512){for(let u=0,g=0;u<512;u+=g){if(g=_n.readSync(n,a,u,a.length-u,s+u),s===0&&a[0]===31&&a[1]===139)throw new Error("cannot append to compressed archives");if(!g)break e}let l=new Y7(a);if(!l.cksumValid)break;let c=512*Math.ceil(l.size/512);if(s+c+512>o.size)break;s+=c,r.mtimeCache&&r.mtimeCache.set(l.path,l.mtime)}i=!1,UFe(r,t,s,n,e)}finally{if(i)try{_n.closeSync(n)}catch{}}},UFe=(r,e,t,i,n)=>{let s=new U7.WriteStreamSync(r.file,{fd:i,start:t});e.pipe(s),GFe(e,n)},HFe=(r,e,t)=>{e=Array.from(e);let i=new K7(r),n=(o,a,l)=>{let c=(p,C)=>{p?_n.close(o,y=>l(p)):l(null,C)},u=0;if(a===0)return c(null,0);let g=0,f=Buffer.alloc(512),h=(p,C)=>{if(p)return c(p);if(g+=C,g<512&&C)return _n.read(o,f,g,f.length-g,u+g,h);if(u===0&&f[0]===31&&f[1]===139)return c(new Error("cannot append to compressed archives"));if(g<512)return c(null,u);let y=new Y7(f);if(!y.cksumValid)return c(null,u);let B=512*Math.ceil(y.size/512);if(u+B+512>a||(u+=B+512,u>=a))return c(null,u);r.mtimeCache&&r.mtimeCache.set(y.path,y.mtime),g=0,_n.read(o,f,0,512,u,h)};_n.read(o,f,0,512,u,h)},s=new Promise((o,a)=>{i.on("error",a);let l="r+",c=(u,g)=>{if(u&&u.code==="ENOENT"&&l==="r+")return l="w+",_n.open(r.file,l,c);if(u)return a(u);_n.fstat(g,(f,h)=>{if(f)return _n.close(g,()=>a(f));n(g,h.size,(p,C)=>{if(p)return a(p);let y=new U7.WriteStream(r.file,{fd:g,start:C});i.pipe(y),y.on("error",a),y.on("close",o),j7(i,e)})})};_n.open(r.file,l,c)});return t?s.then(t,t):s},GFe=(r,e)=>{e.forEach(t=>{t.charAt(0)==="@"?H7({file:G7.resolve(r.cwd,t.substr(1)),sync:!0,noResume:!0,onentry:i=>r.add(i)}):r.add(t)}),r.end()},j7=(r,e)=>{for(;e.length;){let t=e.shift();if(t.charAt(0)==="@")return H7({file:G7.resolve(r.cwd,t.substr(1)),noResume:!0,onentry:i=>r.add(i)}).then(i=>j7(r,e));r.add(t)}r.end()}});var W7=w((eat,J7)=>{"use strict";var YFe=Xf(),jFe=AN();J7.exports=(r,e,t)=>{let i=YFe(r);if(!i.file)throw new TypeError("file is required");if(i.gzip)throw new TypeError("cannot append to compressed archives");if(!e||!Array.isArray(e)||!e.length)throw new TypeError("no files or directories specified");return e=Array.from(e),qFe(i),jFe(i,e,t)};var qFe=r=>{let e=r.filter;r.mtimeCache||(r.mtimeCache=new Map),r.filter=e?(t,i)=>e(t,i)&&!(r.mtimeCache.get(t)>i.mtime):(t,i)=>!(r.mtimeCache.get(t)>i.mtime)}});var X7=w((tat,V7)=>{var{promisify:z7}=J("util"),gl=J("fs"),JFe=r=>{if(!r)r={mode:511,fs:gl};else if(typeof r=="object")r={mode:511,fs:gl,...r};else if(typeof r=="number")r={mode:r,fs:gl};else if(typeof r=="string")r={mode:parseInt(r,8),fs:gl};else throw new TypeError("invalid options argument");return r.mkdir=r.mkdir||r.fs.mkdir||gl.mkdir,r.mkdirAsync=z7(r.mkdir),r.stat=r.stat||r.fs.stat||gl.stat,r.statAsync=z7(r.stat),r.statSync=r.statSync||r.fs.statSync||gl.statSync,r.mkdirSync=r.mkdirSync||r.fs.mkdirSync||gl.mkdirSync,r};V7.exports=JFe});var _7=w((rat,Z7)=>{var WFe=process.env.__TESTING_MKDIRP_PLATFORM__||process.platform,{resolve:zFe,parse:VFe}=J("path"),XFe=r=>{if(/\0/.test(r))throw Object.assign(new TypeError("path must be a string without null bytes"),{path:r,code:"ERR_INVALID_ARG_VALUE"});if(r=zFe(r),WFe==="win32"){let e=/[*|"<>?:]/,{root:t}=VFe(r);if(e.test(r.substr(t.length)))throw Object.assign(new Error("Illegal characters in path."),{path:r,code:"EINVAL"})}return r};Z7.exports=XFe});var iX=w((iat,rX)=>{var{dirname:$7}=J("path"),eX=(r,e,t=void 0)=>t===e?Promise.resolve():r.statAsync(e).then(i=>i.isDirectory()?t:void 0,i=>i.code==="ENOENT"?eX(r,$7(e),e):void 0),tX=(r,e,t=void 0)=>{if(t!==e)try{return r.statSync(e).isDirectory()?t:void 0}catch(i){return i.code==="ENOENT"?tX(r,$7(e),e):void 0}};rX.exports={findMade:eX,findMadeSync:tX}});var uN=w((nat,sX)=>{var{dirname:nX}=J("path"),lN=(r,e,t)=>{e.recursive=!1;let i=nX(r);return i===r?e.mkdirAsync(r,e).catch(n=>{if(n.code!=="EISDIR")throw n}):e.mkdirAsync(r,e).then(()=>t||r,n=>{if(n.code==="ENOENT")return lN(i,e).then(s=>lN(r,e,s));if(n.code!=="EEXIST"&&n.code!=="EROFS")throw n;return e.statAsync(r).then(s=>{if(s.isDirectory())return t;throw n},()=>{throw n})})},cN=(r,e,t)=>{let i=nX(r);if(e.recursive=!1,i===r)try{return e.mkdirSync(r,e)}catch(n){if(n.code!=="EISDIR")throw n;return}try{return e.mkdirSync(r,e),t||r}catch(n){if(n.code==="ENOENT")return cN(r,e,cN(i,e,t));if(n.code!=="EEXIST"&&n.code!=="EROFS")throw n;try{if(!e.statSync(r).isDirectory())throw n}catch{throw n}}};sX.exports={mkdirpManual:lN,mkdirpManualSync:cN}});var AX=w((sat,aX)=>{var{dirname:oX}=J("path"),{findMade:ZFe,findMadeSync:_Fe}=iX(),{mkdirpManual:$Fe,mkdirpManualSync:eNe}=uN(),tNe=(r,e)=>(e.recursive=!0,oX(r)===r?e.mkdirAsync(r,e):ZFe(e,r).then(i=>e.mkdirAsync(r,e).then(()=>i).catch(n=>{if(n.code==="ENOENT")return $Fe(r,e);throw n}))),rNe=(r,e)=>{if(e.recursive=!0,oX(r)===r)return e.mkdirSync(r,e);let i=_Fe(e,r);try{return e.mkdirSync(r,e),i}catch(n){if(n.code==="ENOENT")return eNe(r,e);throw n}};aX.exports={mkdirpNative:tNe,mkdirpNativeSync:rNe}});var gX=w((oat,uX)=>{var lX=J("fs"),iNe=process.env.__TESTING_MKDIRP_NODE_VERSION__||process.version,gN=iNe.replace(/^v/,"").split("."),cX=+gN[0]>10||+gN[0]==10&&+gN[1]>=12,nNe=cX?r=>r.mkdir===lX.mkdir:()=>!1,sNe=cX?r=>r.mkdirSync===lX.mkdirSync:()=>!1;uX.exports={useNative:nNe,useNativeSync:sNe}});var mX=w((aat,CX)=>{var ph=X7(),dh=_7(),{mkdirpNative:fX,mkdirpNativeSync:hX}=AX(),{mkdirpManual:pX,mkdirpManualSync:dX}=uN(),{useNative:oNe,useNativeSync:aNe}=gX(),Ch=(r,e)=>(r=dh(r),e=ph(e),oNe(e)?fX(r,e):pX(r,e)),ANe=(r,e)=>(r=dh(r),e=ph(e),aNe(e)?hX(r,e):dX(r,e));Ch.sync=ANe;Ch.native=(r,e)=>fX(dh(r),ph(e));Ch.manual=(r,e)=>pX(dh(r),ph(e));Ch.nativeSync=(r,e)=>hX(dh(r),ph(e));Ch.manualSync=(r,e)=>dX(dh(r),ph(e));CX.exports=Ch});var QX=w((Aat,bX)=>{"use strict";var Ds=J("fs"),Xc=J("path"),lNe=Ds.lchown?"lchown":"chown",cNe=Ds.lchownSync?"lchownSync":"chownSync",IX=Ds.lchown&&!process.version.match(/v1[1-9]+\./)&&!process.version.match(/v10\.[6-9]/),EX=(r,e,t)=>{try{return Ds[cNe](r,e,t)}catch(i){if(i.code!=="ENOENT")throw i}},uNe=(r,e,t)=>{try{return Ds.chownSync(r,e,t)}catch(i){if(i.code!=="ENOENT")throw i}},gNe=IX?(r,e,t,i)=>n=>{!n||n.code!=="EISDIR"?i(n):Ds.chown(r,e,t,i)}:(r,e,t,i)=>i,fN=IX?(r,e,t)=>{try{return EX(r,e,t)}catch(i){if(i.code!=="EISDIR")throw i;uNe(r,e,t)}}:(r,e,t)=>EX(r,e,t),fNe=process.version,yX=(r,e,t)=>Ds.readdir(r,e,t),hNe=(r,e)=>Ds.readdirSync(r,e);/^v4\./.test(fNe)&&(yX=(r,e,t)=>Ds.readdir(r,t));var Q0=(r,e,t,i)=>{Ds[lNe](r,e,t,gNe(r,e,t,n=>{i(n&&n.code!=="ENOENT"?n:null)}))},wX=(r,e,t,i,n)=>{if(typeof e=="string")return Ds.lstat(Xc.resolve(r,e),(s,o)=>{if(s)return n(s.code!=="ENOENT"?s:null);o.name=e,wX(r,o,t,i,n)});if(e.isDirectory())hN(Xc.resolve(r,e.name),t,i,s=>{if(s)return n(s);let o=Xc.resolve(r,e.name);Q0(o,t,i,n)});else{let s=Xc.resolve(r,e.name);Q0(s,t,i,n)}},hN=(r,e,t,i)=>{yX(r,{withFileTypes:!0},(n,s)=>{if(n){if(n.code==="ENOENT")return i();if(n.code!=="ENOTDIR"&&n.code!=="ENOTSUP")return i(n)}if(n||!s.length)return Q0(r,e,t,i);let o=s.length,a=null,l=c=>{if(!a){if(c)return i(a=c);if(--o===0)return Q0(r,e,t,i)}};s.forEach(c=>wX(r,c,e,t,l))})},pNe=(r,e,t,i)=>{if(typeof e=="string")try{let n=Ds.lstatSync(Xc.resolve(r,e));n.name=e,e=n}catch(n){if(n.code==="ENOENT")return;throw n}e.isDirectory()&&BX(Xc.resolve(r,e.name),t,i),fN(Xc.resolve(r,e.name),t,i)},BX=(r,e,t)=>{let i;try{i=hNe(r,{withFileTypes:!0})}catch(n){if(n.code==="ENOENT")return;if(n.code==="ENOTDIR"||n.code==="ENOTSUP")return fN(r,e,t);throw n}return i&&i.length&&i.forEach(n=>pNe(r,n,e,t)),fN(r,e,t)};bX.exports=hN;hN.sync=BX});var PX=w((lat,pN)=>{"use strict";var SX=mX(),ks=J("fs"),S0=J("path"),vX=QX(),co=th(),v0=class extends Error{constructor(e,t){super("Cannot extract through symbolic link"),this.path=t,this.symlink=e}get name(){return"SylinkError"}},x0=class extends Error{constructor(e,t){super(t+": Cannot cd into '"+e+"'"),this.path=e,this.code=t}get name(){return"CwdError"}},P0=(r,e)=>r.get(co(e)),jC=(r,e,t)=>r.set(co(e),t),dNe=(r,e)=>{ks.stat(r,(t,i)=>{(t||!i.isDirectory())&&(t=new x0(r,t&&t.code||"ENOTDIR")),e(t)})};pN.exports=(r,e,t)=>{r=co(r);let i=e.umask,n=e.mode|448,s=(n&i)!==0,o=e.uid,a=e.gid,l=typeof o=="number"&&typeof a=="number"&&(o!==e.processUid||a!==e.processGid),c=e.preserve,u=e.unlink,g=e.cache,f=co(e.cwd),h=(y,B)=>{y?t(y):(jC(g,r,!0),B&&l?vX(B,o,a,v=>h(v)):s?ks.chmod(r,n,t):t())};if(g&&P0(g,r)===!0)return h();if(r===f)return dNe(r,h);if(c)return SX(r,{mode:n}).then(y=>h(null,y),h);let C=co(S0.relative(f,r)).split("/");D0(f,C,n,g,u,f,null,h)};var D0=(r,e,t,i,n,s,o,a)=>{if(!e.length)return a(null,o);let l=e.shift(),c=co(S0.resolve(r+"/"+l));if(P0(i,c))return D0(c,e,t,i,n,s,o,a);ks.mkdir(c,t,xX(c,e,t,i,n,s,o,a))},xX=(r,e,t,i,n,s,o,a)=>l=>{l?ks.lstat(r,(c,u)=>{if(c)c.path=c.path&&co(c.path),a(c);else if(u.isDirectory())D0(r,e,t,i,n,s,o,a);else if(n)ks.unlink(r,g=>{if(g)return a(g);ks.mkdir(r,t,xX(r,e,t,i,n,s,o,a))});else{if(u.isSymbolicLink())return a(new v0(r,r+"/"+e.join("/")));a(l)}}):(o=o||r,D0(r,e,t,i,n,s,o,a))},CNe=r=>{let e=!1,t="ENOTDIR";try{e=ks.statSync(r).isDirectory()}catch(i){t=i.code}finally{if(!e)throw new x0(r,t)}};pN.exports.sync=(r,e)=>{r=co(r);let t=e.umask,i=e.mode|448,n=(i&t)!==0,s=e.uid,o=e.gid,a=typeof s=="number"&&typeof o=="number"&&(s!==e.processUid||o!==e.processGid),l=e.preserve,c=e.unlink,u=e.cache,g=co(e.cwd),f=y=>{jC(u,r,!0),y&&a&&vX.sync(y,s,o),n&&ks.chmodSync(r,i)};if(u&&P0(u,r)===!0)return f();if(r===g)return CNe(g),f();if(l)return f(SX.sync(r,i));let p=co(S0.relative(g,r)).split("/"),C=null;for(let y=p.shift(),B=g;y&&(B+="/"+y);y=p.shift())if(B=co(S0.resolve(B)),!P0(u,B))try{ks.mkdirSync(B,i),C=C||B,jC(u,B,!0)}catch{let D=ks.lstatSync(B);if(D.isDirectory()){jC(u,B,!0);continue}else if(c){ks.unlinkSync(B),ks.mkdirSync(B,i),C=C||B,jC(u,B,!0);continue}else if(D.isSymbolicLink())return new v0(B,B+"/"+p.join("/"))}return f(C)}});var CN=w((cat,DX)=>{var dN=Object.create(null),{hasOwnProperty:mNe}=Object.prototype;DX.exports=r=>(mNe.call(dN,r)||(dN[r]=r.normalize("NFKD")),dN[r])});var NX=w((uat,FX)=>{var kX=J("assert"),ENe=CN(),INe=nh(),{join:RX}=J("path"),yNe=process.env.TESTING_TAR_FAKE_PLATFORM||process.platform,wNe=yNe==="win32";FX.exports=()=>{let r=new Map,e=new Map,t=c=>c.split("/").slice(0,-1).reduce((g,f)=>(g.length&&(f=RX(g[g.length-1],f)),g.push(f||"/"),g),[]),i=new Set,n=c=>{let u=e.get(c);if(!u)throw new Error("function does not have any path reservations");return{paths:u.paths.map(g=>r.get(g)),dirs:[...u.dirs].map(g=>r.get(g))}},s=c=>{let{paths:u,dirs:g}=n(c);return u.every(f=>f[0]===c)&&g.every(f=>f[0]instanceof Set&&f[0].has(c))},o=c=>i.has(c)||!s(c)?!1:(i.add(c),c(()=>a(c)),!0),a=c=>{if(!i.has(c))return!1;let{paths:u,dirs:g}=e.get(c),f=new Set;return u.forEach(h=>{let p=r.get(h);kX.equal(p[0],c),p.length===1?r.delete(h):(p.shift(),typeof p[0]=="function"?f.add(p[0]):p[0].forEach(C=>f.add(C)))}),g.forEach(h=>{let p=r.get(h);kX(p[0]instanceof Set),p[0].size===1&&p.length===1?r.delete(h):p[0].size===1?(p.shift(),f.add(p[0])):p[0].delete(c)}),i.delete(c),f.forEach(h=>o(h)),!0};return{check:s,reserve:(c,u)=>{c=wNe?["win32 parallelization disabled"]:c.map(f=>ENe(INe(RX(f))).toLowerCase());let g=new Set(c.map(f=>t(f)).reduce((f,h)=>f.concat(h)));return e.set(u,{dirs:g,paths:c}),c.forEach(f=>{let h=r.get(f);h?h.push(u):r.set(f,[u])}),g.forEach(f=>{let h=r.get(f);h?h[h.length-1]instanceof Set?h[h.length-1].add(u):h.push(new Set([u])):r.set(f,[new Set([u])])}),o(u)}}}});var OX=w((gat,LX)=>{var BNe=process.env.__FAKE_PLATFORM__||process.platform,bNe=BNe==="win32",QNe=global.__FAKE_TESTING_FS__||J("fs"),{O_CREAT:SNe,O_TRUNC:vNe,O_WRONLY:xNe,UV_FS_O_FILEMAP:TX=0}=QNe.constants,PNe=bNe&&!!TX,DNe=512*1024,kNe=TX|vNe|SNe|xNe;LX.exports=PNe?r=>r<DNe?kNe:"w":()=>"w"});var SN=w((fat,ZX)=>{"use strict";var RNe=J("assert"),FNe=w0(),jt=J("fs"),NNe=fh(),tA=J("path"),zX=PX(),MX=SF(),TNe=NX(),LNe=vF(),$n=th(),ONe=nh(),MNe=CN(),KX=Symbol("onEntry"),IN=Symbol("checkFs"),UX=Symbol("checkFs2"),F0=Symbol("pruneCache"),yN=Symbol("isReusable"),Rs=Symbol("makeFs"),wN=Symbol("file"),BN=Symbol("directory"),N0=Symbol("link"),HX=Symbol("symlink"),GX=Symbol("hardlink"),YX=Symbol("unsupported"),jX=Symbol("checkPath"),fl=Symbol("mkdir"),Yi=Symbol("onError"),k0=Symbol("pending"),qX=Symbol("pend"),mh=Symbol("unpend"),mN=Symbol("ended"),EN=Symbol("maybeClose"),bN=Symbol("skip"),qC=Symbol("doChown"),JC=Symbol("uid"),WC=Symbol("gid"),zC=Symbol("checkedCwd"),VX=J("crypto"),XX=OX(),KNe=process.env.TESTING_TAR_FAKE_PLATFORM||process.platform,VC=KNe==="win32",UNe=(r,e)=>{if(!VC)return jt.unlink(r,e);let t=r+".DELETE."+VX.randomBytes(16).toString("hex");jt.rename(r,t,i=>{if(i)return e(i);jt.unlink(t,e)})},HNe=r=>{if(!VC)return jt.unlinkSync(r);let e=r+".DELETE."+VX.randomBytes(16).toString("hex");jt.renameSync(r,e),jt.unlinkSync(e)},JX=(r,e,t)=>r===r>>>0?r:e===e>>>0?e:t,WX=r=>MNe(ONe($n(r))).toLowerCase(),GNe=(r,e)=>{e=WX(e);for(let t of r.keys()){let i=WX(t);(i===e||i.indexOf(e+"/")===0)&&r.delete(t)}},YNe=r=>{for(let e of r.keys())r.delete(e)},XC=class extends FNe{constructor(e){if(e||(e={}),e.ondone=t=>{this[mN]=!0,this[EN]()},super(e),this[zC]=!1,this.reservations=TNe(),this.transform=typeof e.transform=="function"?e.transform:null,this.writable=!0,this.readable=!1,this[k0]=0,this[mN]=!1,this.dirCache=e.dirCache||new Map,typeof e.uid=="number"||typeof e.gid=="number"){if(typeof e.uid!="number"||typeof e.gid!="number")throw new TypeError("cannot set owner without number uid and gid");if(e.preserveOwner)throw new TypeError("cannot preserve owner in archive and also set owner explicitly");this.uid=e.uid,this.gid=e.gid,this.setOwner=!0}else this.uid=null,this.gid=null,this.setOwner=!1;e.preserveOwner===void 0&&typeof e.uid!="number"?this.preserveOwner=process.getuid&&process.getuid()===0:this.preserveOwner=!!e.preserveOwner,this.processUid=(this.preserveOwner||this.setOwner)&&process.getuid?process.getuid():null,this.processGid=(this.preserveOwner||this.setOwner)&&process.getgid?process.getgid():null,this.forceChown=e.forceChown===!0,this.win32=!!e.win32||VC,this.newer=!!e.newer,this.keep=!!e.keep,this.noMtime=!!e.noMtime,this.preservePaths=!!e.preservePaths,this.unlink=!!e.unlink,this.cwd=$n(tA.resolve(e.cwd||process.cwd())),this.strip=+e.strip||0,this.processUmask=e.noChmod?0:process.umask(),this.umask=typeof e.umask=="number"?e.umask:this.processUmask,this.dmode=e.dmode||511&~this.umask,this.fmode=e.fmode||438&~this.umask,this.on("entry",t=>this[KX](t))}warn(e,t,i={}){return(e==="TAR_BAD_ARCHIVE"||e==="TAR_ABORT")&&(i.recoverable=!1),super.warn(e,t,i)}[EN](){this[mN]&&this[k0]===0&&(this.emit("prefinish"),this.emit("finish"),this.emit("end"),this.emit("close"))}[jX](e){if(this.strip){let t=$n(e.path).split("/");if(t.length<this.strip)return!1;if(e.path=t.slice(this.strip).join("/"),e.type==="Link"){let i=$n(e.linkpath).split("/");if(i.length>=this.strip)e.linkpath=i.slice(this.strip).join("/");else return!1}}if(!this.preservePaths){let t=$n(e.path),i=t.split("/");if(i.includes("..")||VC&&/^[a-z]:\.\.$/i.test(i[0]))return this.warn("TAR_ENTRY_ERROR","path contains '..'",{entry:e,path:t}),!1;let[n,s]=LNe(t);n&&(e.path=s,this.warn("TAR_ENTRY_INFO",`stripping ${n} from absolute path`,{entry:e,path:t}))}if(tA.isAbsolute(e.path)?e.absolute=$n(tA.resolve(e.path)):e.absolute=$n(tA.resolve(this.cwd,e.path)),!this.preservePaths&&e.absolute.indexOf(this.cwd+"/")!==0&&e.absolute!==this.cwd)return this.warn("TAR_ENTRY_ERROR","path escaped extraction target",{entry:e,path:$n(e.path),resolvedPath:e.absolute,cwd:this.cwd}),!1;if(e.absolute===this.cwd&&e.type!=="Directory"&&e.type!=="GNUDumpDir")return!1;if(this.win32){let{root:t}=tA.win32.parse(e.absolute);e.absolute=t+MX.encode(e.absolute.substr(t.length));let{root:i}=tA.win32.parse(e.path);e.path=i+MX.encode(e.path.substr(i.length))}return!0}[KX](e){if(!this[jX](e))return e.resume();switch(RNe.equal(typeof e.absolute,"string"),e.type){case"Directory":case"GNUDumpDir":e.mode&&(e.mode=e.mode|448);case"File":case"OldFile":case"ContiguousFile":case"Link":case"SymbolicLink":return this[IN](e);case"CharacterDevice":case"BlockDevice":case"FIFO":default:return this[YX](e)}}[Yi](e,t){e.name==="CwdError"?this.emit("error",e):(this.warn("TAR_ENTRY_ERROR",e,{entry:t}),this[mh](),t.resume())}[fl](e,t,i){zX($n(e),{uid:this.uid,gid:this.gid,processUid:this.processUid,processGid:this.processGid,umask:this.processUmask,preserve:this.preservePaths,unlink:this.unlink,cache:this.dirCache,cwd:this.cwd,mode:t,noChmod:this.noChmod},i)}[qC](e){return this.forceChown||this.preserveOwner&&(typeof e.uid=="number"&&e.uid!==this.processUid||typeof e.gid=="number"&&e.gid!==this.processGid)||typeof this.uid=="number"&&this.uid!==this.processUid||typeof this.gid=="number"&&this.gid!==this.processGid}[JC](e){return JX(this.uid,e.uid,this.processUid)}[WC](e){return JX(this.gid,e.gid,this.processGid)}[wN](e,t){let i=e.mode&4095||this.fmode,n=new NNe.WriteStream(e.absolute,{flags:XX(e.size),mode:i,autoClose:!1});n.on("error",l=>{n.fd&&jt.close(n.fd,()=>{}),n.write=()=>!0,this[Yi](l,e),t()});let s=1,o=l=>{if(l){n.fd&&jt.close(n.fd,()=>{}),this[Yi](l,e),t();return}--s===0&&jt.close(n.fd,c=>{c?this[Yi](c,e):this[mh](),t()})};n.on("finish",l=>{let c=e.absolute,u=n.fd;if(e.mtime&&!this.noMtime){s++;let g=e.atime||new Date,f=e.mtime;jt.futimes(u,g,f,h=>h?jt.utimes(c,g,f,p=>o(p&&h)):o())}if(this[qC](e)){s++;let g=this[JC](e),f=this[WC](e);jt.fchown(u,g,f,h=>h?jt.chown(c,g,f,p=>o(p&&h)):o())}o()});let a=this.transform&&this.transform(e)||e;a!==e&&(a.on("error",l=>{this[Yi](l,e),t()}),e.pipe(a)),a.pipe(n)}[BN](e,t){let i=e.mode&4095||this.dmode;this[fl](e.absolute,i,n=>{if(n){this[Yi](n,e),t();return}let s=1,o=a=>{--s===0&&(t(),this[mh](),e.resume())};e.mtime&&!this.noMtime&&(s++,jt.utimes(e.absolute,e.atime||new Date,e.mtime,o)),this[qC](e)&&(s++,jt.chown(e.absolute,this[JC](e),this[WC](e),o)),o()})}[YX](e){e.unsupported=!0,this.warn("TAR_ENTRY_UNSUPPORTED",`unsupported entry type: ${e.type}`,{entry:e}),e.resume()}[HX](e,t){this[N0](e,e.linkpath,"symlink",t)}[GX](e,t){let i=$n(tA.resolve(this.cwd,e.linkpath));this[N0](e,i,"link",t)}[qX](){this[k0]++}[mh](){this[k0]--,this[EN]()}[bN](e){this[mh](),e.resume()}[yN](e,t){return e.type==="File"&&!this.unlink&&t.isFile()&&t.nlink<=1&&!VC}[IN](e){this[qX]();let t=[e.path];e.linkpath&&t.push(e.linkpath),this.reservations.reserve(t,i=>this[UX](e,i))}[F0](e){e.type==="SymbolicLink"?YNe(this.dirCache):e.type!=="Directory"&&GNe(this.dirCache,e.absolute)}[UX](e,t){this[F0](e);let i=a=>{this[F0](e),t(a)},n=()=>{this[fl](this.cwd,this.dmode,a=>{if(a){this[Yi](a,e),i();return}this[zC]=!0,s()})},s=()=>{if(e.absolute!==this.cwd){let a=$n(tA.dirname(e.absolute));if(a!==this.cwd)return this[fl](a,this.dmode,l=>{if(l){this[Yi](l,e),i();return}o()})}o()},o=()=>{jt.lstat(e.absolute,(a,l)=>{if(l&&(this.keep||this.newer&&l.mtime>e.mtime)){this[bN](e),i();return}if(a||this[yN](e,l))return this[Rs](null,e,i);if(l.isDirectory()){if(e.type==="Directory"){let c=!this.noChmod&&e.mode&&(l.mode&4095)!==e.mode,u=g=>this[Rs](g,e,i);return c?jt.chmod(e.absolute,e.mode,u):u()}if(e.absolute!==this.cwd)return jt.rmdir(e.absolute,c=>this[Rs](c,e,i))}if(e.absolute===this.cwd)return this[Rs](null,e,i);UNe(e.absolute,c=>this[Rs](c,e,i))})};this[zC]?s():n()}[Rs](e,t,i){if(e){this[Yi](e,t),i();return}switch(t.type){case"File":case"OldFile":case"ContiguousFile":return this[wN](t,i);case"Link":return this[GX](t,i);case"SymbolicLink":return this[HX](t,i);case"Directory":case"GNUDumpDir":return this[BN](t,i)}}[N0](e,t,i,n){jt[i](t,e.absolute,s=>{s?this[Yi](s,e):(this[mh](),e.resume()),n()})}},R0=r=>{try{return[null,r()]}catch(e){return[e,null]}},QN=class extends XC{[Rs](e,t){return super[Rs](e,t,()=>{})}[IN](e){if(this[F0](e),!this[zC]){let s=this[fl](this.cwd,this.dmode);if(s)return this[Yi](s,e);this[zC]=!0}if(e.absolute!==this.cwd){let s=$n(tA.dirname(e.absolute));if(s!==this.cwd){let o=this[fl](s,this.dmode);if(o)return this[Yi](o,e)}}let[t,i]=R0(()=>jt.lstatSync(e.absolute));if(i&&(this.keep||this.newer&&i.mtime>e.mtime))return this[bN](e);if(t||this[yN](e,i))return this[Rs](null,e);if(i.isDirectory()){if(e.type==="Directory"){let o=!this.noChmod&&e.mode&&(i.mode&4095)!==e.mode,[a]=o?R0(()=>{jt.chmodSync(e.absolute,e.mode)}):[];return this[Rs](a,e)}let[s]=R0(()=>jt.rmdirSync(e.absolute));this[Rs](s,e)}let[n]=e.absolute===this.cwd?[]:R0(()=>HNe(e.absolute));this[Rs](n,e)}[wN](e,t){let i=e.mode&4095||this.fmode,n=a=>{let l;try{jt.closeSync(s)}catch(c){l=c}(a||l)&&this[Yi](a||l,e),t()},s;try{s=jt.openSync(e.absolute,XX(e.size),i)}catch(a){return n(a)}let o=this.transform&&this.transform(e)||e;o!==e&&(o.on("error",a=>this[Yi](a,e)),e.pipe(o)),o.on("data",a=>{try{jt.writeSync(s,a,0,a.length)}catch(l){n(l)}}),o.on("end",a=>{let l=null;if(e.mtime&&!this.noMtime){let c=e.atime||new Date,u=e.mtime;try{jt.futimesSync(s,c,u)}catch(g){try{jt.utimesSync(e.absolute,c,u)}catch{l=g}}}if(this[qC](e)){let c=this[JC](e),u=this[WC](e);try{jt.fchownSync(s,c,u)}catch(g){try{jt.chownSync(e.absolute,c,u)}catch{l=l||g}}}n(l)})}[BN](e,t){let i=e.mode&4095||this.dmode,n=this[fl](e.absolute,i);if(n){this[Yi](n,e),t();return}if(e.mtime&&!this.noMtime)try{jt.utimesSync(e.absolute,e.atime||new Date,e.mtime)}catch{}if(this[qC](e))try{jt.chownSync(e.absolute,this[JC](e),this[WC](e))}catch{}t(),e.resume()}[fl](e,t){try{return zX.sync($n(e),{uid:this.uid,gid:this.gid,processUid:this.processUid,processGid:this.processGid,umask:this.processUmask,preserve:this.preservePaths,unlink:this.unlink,cache:this.dirCache,cwd:this.cwd,mode:t})}catch(i){return i}}[N0](e,t,i,n){try{jt[i+"Sync"](t,e.absolute),n(),e.resume()}catch(s){return this[Yi](s,e)}}};XC.Sync=QN;ZX.exports=XC});var rZ=w((hat,tZ)=>{"use strict";var jNe=Xf(),T0=SN(),$X=J("fs"),eZ=fh(),_X=J("path"),vN=nh();tZ.exports=(r,e,t)=>{typeof r=="function"?(t=r,e=null,r={}):Array.isArray(r)&&(e=r,r={}),typeof e=="function"&&(t=e,e=null),e?e=Array.from(e):e=[];let i=jNe(r);if(i.sync&&typeof t=="function")throw new TypeError("callback not supported for sync tar functions");if(!i.file&&typeof t=="function")throw new TypeError("callback only supported with file option");return e.length&&qNe(i,e),i.file&&i.sync?JNe(i):i.file?WNe(i,t):i.sync?zNe(i):VNe(i)};var qNe=(r,e)=>{let t=new Map(e.map(s=>[vN(s),!0])),i=r.filter,n=(s,o)=>{let a=o||_X.parse(s).root||".",l=s===a?!1:t.has(s)?t.get(s):n(_X.dirname(s),a);return t.set(s,l),l};r.filter=i?(s,o)=>i(s,o)&&n(vN(s)):s=>n(vN(s))},JNe=r=>{let e=new T0.Sync(r),t=r.file,i=$X.statSync(t),n=r.maxReadSize||16*1024*1024;new eZ.ReadStreamSync(t,{readSize:n,size:i.size}).pipe(e)},WNe=(r,e)=>{let t=new T0(r),i=r.maxReadSize||16*1024*1024,n=r.file,s=new Promise((o,a)=>{t.on("error",a),t.on("close",o),$X.stat(n,(l,c)=>{if(l)a(l);else{let u=new eZ.ReadStream(n,{readSize:i,size:c.size});u.on("error",a),u.pipe(t)}})});return e?s.then(e,e):s},zNe=r=>new T0.Sync(r),VNe=r=>new T0(r)});var iZ=w(ci=>{"use strict";ci.c=ci.create=M7();ci.r=ci.replace=AN();ci.t=ci.list=B0();ci.u=ci.update=W7();ci.x=ci.extract=rZ();ci.Pack=A0();ci.Unpack=SN();ci.Parse=w0();ci.ReadEntry=qB();ci.WriteEntry=OF();ci.Header=ih();ci.Pax=WB();ci.types=EF()});var aZ=w((Cat,oZ)=>{var xN;oZ.exports.getContent=()=>(typeof xN>"u"&&(xN=J("zlib").brotliDecompressSync(Buffer.from("W80md0A2YYfUVroNAQCzZi6n8ONOtg37z+G2gFInPPwJ5Nw/Ckq3IRD1T9PE2k53VFXNTCpDXAKzLS1jAOxT/c0RVbMCR1AlD6onK1sjpYsrejvNwiBFoSN3LsnZENigYYlCkvQMuXjnFXgXqrRZZUFTAtmKaYmCVosqJhaVuC2v0BLqr9S8BgpHPCSDuqCSU+kKTag0ydtT8GCNhgcLcQvcSRONhE7y06c2s7q6hlJkf9+H7J8sE7x+HfKnpILLNFeOl6DqbzgcHyeN7E/I0Vewf2DG73801dzyJR8DCoxbLwSGZFqOoVMu2TLv7ZFXPvn1v95S3//8fBmdRZiwZDWGi+QFrjo4ulaud3jZJipzHnl12BVyWgZaVmwUt1K11ze7w+GAIWkBVLGu0DcwZnOH1OrSVsg6iuSj1r5iJv5rpnm6ZoKpwF8+s8su6Ylg19Oy3QQB5UR0TcTmTyU5q7i/b9nXbzflXhOGCSc6KzkRJ1AqokAtTc3XN0cEGxpymyUl2wfsg2YkQCmlK5tWlD7I5U/tv359GibRhg2+UhVkUrudKx0QOEWsedLa4uUA/mml5enqdlDxhyfGZ5oPhXflzZpxiBQbbs6hgWptsX7If+zOCNYPWbogwn9VLT1dNRNWq754MGDvmUoqOvDGydsRoX3cxutW/P29Wn39bqktU5tnrzSeDLKiDUicANuJqVZZlO4MDKG5U25TJPUf3XAQO1zL/+BCp/dI58ysai0ckfF+yPNCFg+DDy1J4S6Ppqm+W/zsbdnXr2lZTlVcOHuc5Xm0mOuAHLcXOV7cw/TCxIg2kVjcpg1hTpOU0Bsdz9jPmvEoLMLxMu3f0z21/B4yPmCEbLIS0gO0600j7RyLnFpZplAeDnA2HyLe6XZmTymDLMHj2+v65eI3T0JdXvkpxORRFJi6A/5BVjw9nHGcSPGjbIs/Hv4CKjp4fFVd3emsVDph8QYoTYzIOhMRnih/2v9y8T7BnztDlqeqS6KFEC5hOUN2hDyXFF4G23LScga2m6MhTMAPsC8lzqfjYXf3u5C29Pik0diaeAxy4hBzC6bIxpTQmmKoHzW2Px46SEV9PL5ZBhgVbEAquhHmaFSo+FtpMVP7Px7+xixd/hEAIYm25ASi2cS5tZ4GhChbaZ15Mv3/2mu/XLwfaJjzWIKtjrRhRqxA3MU4heg18cQvbqvc82sTr30SOs1S710lKb+y6B30Rvz/7820vocBII2kcmrjzZojkWCWb2smc8QxdwvvvYgQIwKACJNZIjKpr0xKbCVJsVvFqj7n3vsCL14AyYChGgBZajKl6iXpO5bURm2s1FXf29G8nZn2cJDSd/y+etaD4R/+4R/M5///90ut8ubc9/+PCIAgIVJFKVMnlaredzsiAFJLqpd1tZv/3fvuUfz3/u8EYqkkIgKdRACYFkHytAgQp1Nk5ns/guT/QUgZgKiqAMSsAihlNaVcDqVWzVHl7JWkZNQ2y7abY2d21+yLY7ZhanaVZl8NcxxnHG9MZ1xv/s9U0+UMSEFLKjzyonQp6hxi0fDOuU6paSLx5w+WmJkFDrsLkthFkHYBngVAp2cAJBVwdwB4AaTTpRBsVzYJKsRLgXIIofdzFWLpPqaiclO6dNe5al00LorePM+3+qbtuU/8U0+xKBByjOqDQur+rFWsPQ5IdhfhcMkuhI4wMUrm/+n+PfAukPjTKOb51a1z5w5jB5hb/5+K6l9d/jGvYWe6GZoiDnCiOEAcIC5ciSgiTrT2jTeH3MRi1DVaIIQY5nGiSNWHvXP//c4rjjUJdfTBwsI9bzAYTHFQ6iJ7OQIKDjyI1AMBAQEGBgYBCwwsNQBWfADp6vr+3zt7AHnst2DAgIAAgwCDSLWqAIMAq3IrAwMDA4NInX5u2tf/ezUbJO+/PDbooHkII7AMCgRWoECGCsRDYAUyKKhAQQVlqKCCChQc+7948k9v7wnc3X0YDAqFQiFQCAQCgUAhUCgMBoPCoFAoFObnFv1Dvz1XyN3dJ0a06GQRCASCbBCIFojODwKBQJCfFghECUSJEkeUGIjSpt5TGMp3548hMsusmSgAUKZjLpEm0K3+L65kXRD55W6bICAltNBrQk0ApYp06VWaypaZGV0heWX+f1v/v5xpGbyV5hkTc0SsxCjUIYy9QQVM1Pvyq35VwhcD72b//Q0tDIOU3X3vnOm0ECyIBbcgBZJgFqC4tv7kNzLThrnJdRbDy6Kz+E79yjvLVK9GWC4DBafr0bUQqpqiGsGOvxODtSxLxCMHyxJHY3lwAZQU3a5fpai0ODTLWl1axdpxYdkvrvWj57f9c/aFF2TmPC3DYDRsUi5C2/Qnlcth23eBbI2P2iIc8R8Ltze6llHgIlGXAf5sPonfMlrDY60cmiv6tp74cbmVvJmtKlamqYIc5hj57Jd/EjTKkWAdJ3caV+1PBgpAHXuC10WKwl8XjbDIS7bQhAxQRatzvPH9GRkcnHVbP1LDTuxoLqHE8yBj0Gwt9qfac4BKq1hQ/oLnkEDc9Xk75i30/IePrvOpDqHdV/tdfTYPTsvYG72ugg7ASZiV4XlPiTNxI5v+pJNXLvAs5nOQ4Tk5Hde8qnnc+THp61PUId4cPEUuf32dtYBD8PgpevnbW4MKeaqWB3IUxa//j5YBIHNb3DKi9NTKF9sJffp34wN+pNQeW8POK9+/iG1orcHf3PjYxOn9DZveNufp/M+BlTOk8+bq2fNX8dqVP5x9FGOPie9CUf7lDfWZCXiU6OCo7kf5abQbVfmLWjbI+LKMmC9R8EJ/Xt8ogMF/60VZIa3guYLCTYOir5/WdTMTqrTFzTxQpy1vh7S6320u3ReqVKd0XIlFIdXqGMOVprnnWu/hgGFf1tMv8rt0F+oDxeg2Rr4mrUDIgMWAAlOtpf49WeN42s095vLQFyQ0+rcmjJ/Y8ONLeKd+7fhEdAUOfVmb10ClmWw8TTUPTZluqGadwwdQHIL803QTtBQzB03BwtNWFFhFuqn3NJf2YxWXq7hc5eWKl08+beO+oHF7E4kbzF2Wn5KgOugNt9oNOYoAbD+BRUHvodTYUfBWC8bRJFgfphaURynB+qjfH/M6MA9FPLRwfSlCQFkkiQp2bJxx/Vrsn4OGsHRdWj/BYtznl9HzSPQGX54DEkHqVSSGpky8ueEDh/R3/i5X7qnIc0/916CD2VGDlsmc4yNeafMBNZXg1mZXiFcNhFObmuP3eoDoalQZQZTtNEpi3FJe54LfjC9485ERfuq+6OwWwDIfqITpi5ldffSi4fmO0JE4uHm67m/qPfvBtYRDE/M7x8XFKausEI0ILx+COHfTgtt/mCO4zg5/1aGy6EjIazGXujyMyGkpESl+EFNoekszvRUqfSRDd2O9P4myoWqs+pO4dFSNVWOFTGQjnTG1eImDKkR56siAGIXWuIrkO5FGU0Lpp3B0qMaqKHMqi7a4oi99UHFdsVFcEEmR70XFdjlvmuQxiBTkfkymb4s9wwQgolJa6rShaRmhojEzXMGtrqmEObU7jn75bfcEnPJUnsp90RvJFWzpmMUPm4/shtltNMVqiO0F8e6nscfb/3YS6bzpHmtke+DU8xFrQaeaJKHF+hlk3jrrF3sy3+k4/bpf+KcWDWLtuiGzHiHF3WN/ahSmyX4AtcfxE3T/IfOzq94s9b472Qaxtcnrh6ss0Al6tI5ngCxHjyg8iLcSGfas2SBI99za9i8AgRX9roi3WFL6tj9V8Md73urw4e4TUL12yEQT5Shbvjq1fB1B1i5HcE9M4mBf0uV9DfUUMyMOqUjPSUEdap5OolcrcRhJjincgCOE9MM90C2YlWSnkFuabnm2r79V4unbVS8Gg58QouK3xv7PC+0ThqXN62eHCw1syXj362oZ+Jrq1aOyehJ0HJ74Im49CTnPyc4ZldDPrR4wetOBFSWlfnooXWzRG+1tCtk5dGCarqynd9foEGQte5o+62VP4nJf0jNvdPGTFJd8uNPhC2fxEMCp8e3Dz5z1/sea8uKKKMDHfRgAmtlHNLYsRpkO3U9Q7zdcSjaonP+TedDQohBcwGf2b1HveSCKlEtkhOlheebsTYmLy1oeiJB0RSJU94oSsT8OPyXl9PjzKaRuCI8SwS1Un96HxzF7t9sUv0wScYPePGUe0++bWB8Znq9fpSojmQN6NhAb7WHpgVdGzjGCEwImabB7rht+YLaBkVw1ZloSLys8vKb+S26VkK8WPJgq5lXhCu4QTCOzU485Wm+47gxxfODo0kV9POHgQmjYnRMhpfvWuy3YEOgQhvouBNna3j3d45jDgnmaDWQmJmLUdyTbKTrhSKfMrsL7aLpJKJDucOwYeT/cTZM3VFAx0dLWztg+ZF7DbTbLG7Cpy9fXDrcaBaPxlh6TIuGMBrhhv6AhUF5dii31neHxsLtP5bTVMdAv4mhIlb6bdMUSC1cys7gAKesle2gnzkXsCH0BS/eUTLYyZUuScGrPW8npJVzklHvtY/f9C3sd0uijnWKqW54vjoxleTm4VB9ROZ9EJiZzkEiVSLTF4Ck9DL5Zz3Ocd/RoujbxfNmIQl+EvpRSGdrK/JpJ71y/+2lInAbCqU99vzf3Ex96e9CLRtg+HXcOOjyPsa/833BuD/d3c5/Fuj6Y7VdHKV6Hcif4Nk43DKSbLDfCCsuylRuL8iMgkzj173wIgRUnkTiyQwJ+t7Y+J5+/jDFcF6hHNV5bOhI2Ds2Hj8mfnJCt5gP2gbrtmNVtRpUSlLrztBQNHMJn1g2JYsEApS3h2xpRJzMXH1OOLpeaSKPZaSe53PLhSrMYtg7Hw55GcO8h3HxPibgMKwKkEI8aA0Y54umZRUksul87QOFIS3Qr54YmFovtSUurmp0k/KhIy4MXpiGwwLbmKqDPh7EsMZMcjFJ8KMyAOnvyJRRh5cJCmCSF53IrHz9LO5b6R29hDqRNw/afFY3xFdMbturtuF+clTW9hKePO/AXGWiCYXcWS7FSq0SH+ZkZPSddnDRG35u0J8H7woyZtq0njHqg4ATxpzeX3a8s61lUcroxWGMGV+G0KMfbHyCX3W/EhKCZwlXbithQB3JBtxQ+FeSXi5SY9DqbXuVxjEbAJYGfZE/JCtz6AjkWHLWCNJDxz8ILdYl0NImjbBEUAYT1UFaf9hSOqASObaMzGwOYaEQF+YFhKJ5E6J8LPkTk4YmNJSMPd82iJHCL5TYdFpqr7RddSz/3pTZck5vPjb6vIArS2VsHf4MoprOT9fPbzg6CPHlkOHRgEWeNep48F/5ifu7Y4xPBCQMnEtT7/eyFroPGmV3urwSUZ1b6tGENh7NMjUoJd+bN5hSHcQL/vikIqTMBj9pBYCK5s2MBzuuxG0jOicdl8YdA+EZ0eAJ+JZ2ET1raZeGJKqsqgQqeXYPIclwfF+IBAFGqRNmzJhGwXKNKpUlhh0dNEsL+qOIeKz74FGqeFdvL/c5jtUNfWKfdffmzzuDuUSbL8x+BLqSUgO/eGZhIiddXcBD+NYjesfknd7v1EYuyZRjlRIhWSJ/DjqUesWW32+ihzjkIiidA5aLzJljjTO52+6GoarbA3FJTSU+ffA5RxEC1wmdvvt4AVGcUPxqLH+noebzAWT5i4YsyALnbRRxRlUuXEWupk8/BRnWALbsDQSmeKpMSXFWoTJONX6Yr4wR2uiM+BDSPwkuhHI9ZYx1mnsFBt8fbb0ZLJRnhl1gWsfxzfk1D9/bufMRHArOoInqjPOV5AHoP6V90Ev2GMxydocvXbJ+95nT+aBg9DO7KGEZBIK4qE7u5TXl8U0sJQOQ9Tz5nlB8DvT2ecVd0BQSkKEiBv0s9dJ0UXcfgpYRhHx3tesDOTb19tSSWam2pkBAlnTDt8cuHv/6gfG14w6lwt3OL1ryhRkGJnoLeJ9x6o4eATt6QiSTYf4vc/Zcr2yZYSo/KdE1AqH7BTmxfJeCU70rqSN2sc9tBK5XEPZEEG9beaW5ZwTU+M9RYfESJuUs7B6oBt8BUELaDReJYYQnA/MhnB+rOpD0l3YJIx2d5c1BsUdO0ZwOtLUrZJvK/pAi61frWoe8HR8baIaFxi8Haku/YLSH0ll5vadFaqkBLqeRItaKh8bDgEttTbH+yL1l43vkSPo8rd9hla6VnQNoAMtxDnui9gUwxyvFzYGuhDVU0TXkC/e+7B8xMOGCfSH/YGCCa/LpEbNbzTfHLIDWbQSjjLtriLIH20s6kI+VYuuRQU6YzbVF9b1dWB34E8WGIKiMMCs9YCMVHhahQxwGJwtbVtv3KHb2AeIjd3lPe47W6jC8qqkPf8+3Z3PHg2+SoVAcGdApAaJl3U7O8q6Gv2Fu1klLEK+pI3bmoxuJJi5qYSOJIsUxh/ZuLeagfucs2VahdQKYux9od5kOuQhQVbjSqUKvFpRPft6tnSLyhDCDIpY1tFbYfBgPzq2MqiWqDVbahWZsKEnbJadHUNem5xDk6KcXVhC9uzgjVekC968kcGGcnUj9TAAiEGDYW9I7SeehGB8Dt/z0VJOclY4PwDYwTfvKQIgOJnvdNiAwYsaKTfyLOeICRu383o6OuXwDvBwa+6cO5s5q7FHre/3g3AyrCCajCMviOiGoSc5VUppYufK/ZIZqk7LqDKgMSFm2nT46dEGwdoJWyq3rFRAWwCdmcp46E5ObgPkeeDCVJFxYYrXXn2EpOUnTaYdMrHTOzgehG3rTbbuOotMHE+x88FyZLqMWTcmEygqB3FzZt1EpW8iPdxWHmRRRpflorK4gOBxbbRJndw/KJ8w1EIjBUXvNZXmEh1Iwe13+xOSnNSK1TQKjGddF7f9mnbcD7Wy/9qT+NnXb/5yaEHOV6UXC8zfkgWXuhHoxYNlEepC1YuM00/a1dIPVsfEqCyWKrIuWBdfqAepNb+dWiEEIXtd5i9hJcfeAlEp2X552q0ajRlicI9lUnl3Kmh5BOKXl7Xr4y6hlxVNVE+rroi0hfCuaEW+t/Ffxz51+48FENX/SCNofRvJqah66QXt7VN/YIM1pa7QEQ6ZOau4tIUmyLS8KjnZBD87DU0tS2VaRvAytTZbqY7bFDqxL0X04qVLsFr/8jZRpBCfdy20M5SeGI9FL7Y2CRiUiHhZoUVXvGiJf7eXxJmURXZIykqXhsnCkc/bUEeLsjqQCRiZLYAPO80A222Y87M5xe3cGIwGh4VPaDSQR/9fEjkZbb41/3cIRyZIttLAPp/pZtBGwHikbvrrp42FcjbFfbgiNKSpcHQgmAkXFh7cy0+wkmvSecIKif4Elm4dM5EfC81KUKJNcUD+YBJ2w6DEhPZNJIY7BdwqQagOdsqekqn/3S4aFtcwOnKKC5GvG2gKGiVDONOBOYHjCyuOjhRC58hST+J0rW0DCmEcUuqpAQsHR7uFl38Oy3pfvNut8TDSTMcV2gX6YP+gW0c4tCcekBswj/vNuiNIMP8I0/77zWcsm8lQCCnNholRXnyzxYACiYJNFwr1oHl0e34yQk9TEDb386Ung2Q+pcXim0kdlBz2uT3qayXmkzM8vg+ZC+0dXzTUXLG0nc+/7ij5sPvkOrtjeO+mlJe0mvfy7znf8orE1rt6ov5vPd34raxo4xRDt8RVvRkenGL/j6QIfxetvZLOqo0bEad2R2HZY2ntAJB/jIF8kYtKQLmTVGRa7Ts25V4bHlaPH7P0LO6kgSo6fXw3cvtusHj1xPueGT9KJRdTC0GOEij5kd/L01Djht3Jkbnsov02igKpaSpVotf6LsyU83/y6Mnk3uIsFU66JUrN1bwmMxP8llcqVqd3BnqUF2HZc+NrPnHC02ws9BjLSOfyrgVZ4c5HnnryOUOkfJUIJ8uIj0MknIakaIHLfaqxOJBHvMP4Lq5O1Y3PhT6WzG4Eyq51nPRf7ajR7545T4gsK8BpcvMcr2+z07GvyjzSde11fW3JeM7yvqWuzexRkQlT7MIHOtD9zm14Cb6ZtSR4G63eOwXN8d1+bw6ZzeBrMkv+Azdl9yxAhkG8ITOuLPfaMhfpIx5+Pq7LCiQYhJlMvvkNvL8hUPRqyFZgGa3ZGi61nanGSd4tlpRZDNp9l/WLdSc+GaRc2Qvqb1g6gdBQs/SaQojgZRSgRHfrKFkUqGGhftGzhLlVkkV0GChIsLgjKbZiJQDUFwJeTUVxmWDWJUpFBQGIYWBue/8wb28r1yUdKuRjXlH/8k4kjmY/InCjHf93gIGe2nUYEqfcyxRM91wQMIWfoqRN/JiO3tiRwHhlNj3gqqIvSy2DyFYpRgizVIUSsdEOkJOUU/XUbkbiEtPxLpFHgmw1+fe/Ap0cOlDUbhhM7K8hT9JTnaRusV04vGLwg1Y2AWLtIUnbLrRIj4JIG6gdaFZoxifSQJGbVCjWc0RoLEgwcbiCxPPQkmGdGuh5d3nQpERjypkAo+M0kYQhlLSu3/TkSGnEgKsj0VBeKe0TATFTla4kx2RBQ5V3mBs6HR/GYAdPeJw+4w+MfLuT1ZoEfcoS08hUVoY1mRTILc4TyXU5xte0wLMLwO5DA+M6kbDP5IwgDLtLMYfvCYjyNmeUjXdH2CtIkY4j73XJiHaN4KR2m2Yezlw9Rgi2mSFWDinpOu9DhKrjM/fQ5ruUA4RqtjQueRkoagHFDtXR9SNkHIdTx1E1jWA+JBmkAMvrZvwHIAjw5iwUU2WY76LegdpXyJ9Ku/tvchfe1jRnmNInjUH8FHHMFHFUH0nR8E4xAoOMwJrdjMZ3gxe4rjgR7J0UGUajUDjqPs+9j4/pPYhWaXIHldhPaVOKzzOW5VcT3gIzk6mOZh7RCYo/rtQwwdHAg1CZTcs5yvDy8mILDzs5mxN/EAIF0x+cI3kSabuIpo4sGpk+4KHyaHYSoYB0MWQxfuDabFSVP3GAox8QZPDd58muzd4HBm2QrFIcNpNllh236GEuiBYw/kS36EsOUbvF+nhEcQ6n7ynmp/gvUn65ODj0/Z1vAJD3AOoGUnCDLPs5vX4jm3VQBrdQF0qh5Q1SRIDuhMLtxZwocJVUuJbuJYpkn2OlOHvRnXrv2UOinqTloW3em0SZa+TPQG1wiGyZOHVx94hA+b5PtJgVa5kr4NyKN8ckDwBHCS7nqhhf0nI8QTjYxX2j0o3oFRHIgAyhf5AGzVBiAvfjAtJoZzgABgTR5g9/lk+a1lF3DGA0hgAE+KSEho889h7aDOMS30oEpTRZN15hcd+vOnLiZNElA/VP/qNAqczScCMxQfjF+YmAnyr5Os/N1x8P11yGAY6jDxsHuiAUiR16Pv0JFmwlxFHzb3NQ9KoWcGJD/YEIlpLnXUlN1r62FQn1AtVgTok/zMvdPFQShxhE+xpUmGE2gmF1ZEaEKwXNodnFioUHI/H2hPv3ozUQAe8wGc/vnWlj0tG+4aCEgOpKwPF/kmZ7V+Z9NBhw5o6nXv1Y9EwmbpDUJymbo4yBfVBBLnjlxocFQL4vG/ykkacIf5qeFI5mAGgv9ts7mhAsHlsTuyLohsgdbo3KX++YRMYk91FZALNrhk7JzhVH3dOJ544Y5ewA9MmS/2E7QtDIyoccs78PNtfhkXDXPvVLmrTRP0lnIiqx9NI7/KlbwD5SbK1WJM745zQRfPna9jdtZ3SpE82CkW+0N8cqNyzKTxKxIcwiTx3Rj9AtBQ5SEVaNnATvpBYw0QDkKcHGo1VImV4/Yx2uHr/9MjuWyIr0qMDPqE+6mIWllQmdJcjxx+QA2xEsaavQQvnik9UX8sbmI3SLW5c06bCGVHCmGIfdYPNhA0kkUDT3Nqube0Gbd2GE55uaORoV1OS0pO0wJkjiwJtS1QqKWW1jjC2S+ebq3PtFrFp1UH+4id14OhOE7Wzr4STjdNfQq0eQlikrSXc27TPG7eEYpBJKHJPqVnH8+tCvpt4LFUf3TrrVwrO1fTzpswTZ8VSfZZMuFtmNuvrG+zlZdl7iWx9IQp1RmU5Z8c6yj4pAlrA6W9XiSruNmRf/a7Qwhj+X0ZnAJ+l0xt/Ot7AsW0RiYh0huEVxXi3Mg+3t9F7w0ycwK6bHyxM9nuFKuPDY+Yos+jOTl1dXoO76ShqVv/WdU/GivT3A2na9nLjLnVYjX1GFc70TmSqLMnNVfoiDL1sWjqkF/FfMlcUMgpm31ZuNmWee9y7CR8uDlxub2L86aWPkPi1ErMI5mp452adKhZvVfLLp1Cu7OwQpkh3RNf8tIILKxhmkVthMjsV1G9+csiLCIWl50uFGzhtqfrq2jECS/S+LIvOx5ikjcJFdQu+x5aFLtOGA8/DLbJ5aszRhSTf1WKcCek7lu5smoTz8GsgyAa4p2pjd+A0zXcAnVuTlPAIvsq3BFy9rkYcFgfxb4DoJJ/lSV4D+/NXdcy7dEKO59S0DbQscKazsocnvEk7x7SYJgXbLEOhXVTPr/J01FLGcNn5ok+V/I1q+XBHT1fd1iGx3ObU3jX0EXKbluH8HktkZHubVoYjBZG0t/679h0PPr493/04QXjecLj9/AKuT/rrJ+p33NW+D4J1UfH8XW1RStO6XKHsXqoLpMZuUWTaQVF9HZjvgrtO4PLdbBYHGRWJtdEMySullGL0gb0PyN3T4nFtnhlRKOgW/Fqz/73cJoNtV72ZeAgwGlzsqC/kG+C6nOpqMlY+41ZU9jk7vxX8eMVJkXjKogMF3RAoSr1PNBSWfKXHm6WJZJ0vuAZXdaVhX6kZ7pCrm33ejrhupg6ZtEmNtxBtDLtYQa0Tc5xkSZ8Ll2oauVZ8ijsGixio8djR3T3ryeVvzHT1s3ix7r18T5bM1AimsqAMrzx8G0aRTPfbEx9ttrNO0i1RvlfDPjiCVfEZPhiDbs72i2k5J6xBGHy7kfGgan9Ul7Ecm9D6Szp6KCUxRF9iwCFFoCniX1ULYV7QouS91uYBj+P9OPfPdgldLGkR72mTRno28maQg4mbslvk/YrOunhC7mrC8wusEZ0ihl4FoUE+4LLpZKI1PEJHqW0QeZS1YMQC8zerKXf8fMQ9fOSScPHQp4KzR7tQkKKLoCwA3JZGV+PY0uyOAdYl59skgqDzg8A0YZ/cq6C7Qq7MgYtHSAzhmFdfy3Nh1TSujkGeHlfH4kdfO4fl7t6Z8uQ4x7zlKjCI1C2kE64GIHkFqBqlJTRn4gbRgapPeURVW1/51ykpmhVbJB9/h85kN4K58fJxNV+qDQlW1+R9TaYOez1H/M3/JroWCq5F4DKdPlFiDA7qxZkSwnplui7emRjGFZuczUmIkRCAxOqWq1nod8itqgNpSgDpULWx6OMG4PrSGjcIi41dGy7p01BJATA26gTfiSJi1e1koU9gFVCN5qIJcNZZwXTCui0xDs5pu1VyXc7tHG82dQX8QX45HN5amVnSmGuPLuooW5grRbH6VhjFl5qgINUMsDi2mRYJGIBGyMheNsh+7WjDV7tCBPM1RFcz5Dph2bwJhRCOFY1DRSqA8qRHC3cIxIcqc48UNc3D0cKoj+rcd8/SEnVE/O1zvb/B3QXXLm/OnwSNRwAWhM95gHB/98EEONfmpuX8ZdZ4s9y5znE7P4gwojBNPIxVeQUrCqOD1cEsYieE0CedwXj+g1YEAGzSx56DhOxfbNK2y1Ue0kh9h0PLqbuf3/wPX7fxC8IsoVtubbcGV0iTUewkogecr4vHTLqdGm7aFsd32aRyrRhSw5Uy3QvbUdDXoiXnzXlJGXvAXs7ZC+VD/YXqwzOD3RtkRwujC138D5G1cAOLV3P7kxNkVMN+Hp9k3udckpulA4IeOYwAto9uhbs9LjscejbjtnMrFJyahIEJq68CFOqtlGdMR1g5awntUZBL9d7RiDQGPsfCXAPfDyoMx7tw4zkRDDUFT5Fs3t6enc+311ztjf0r/jJADCLj9ZDJ8fxxw0vMx7mVstlzrZz+e2Mt4k1xHu+ybBLSmZ5KhYDbIxOYEiGqTmdG0F2oy+iM5udRl2vO5GCwQJl79pVGBbtNTWDo2EVLWnFFdc8UwulLelsiKP0pSs8S79FxftVCgd627POflDw8CHzuzlvHtLnPEn1SYUh8/w9Q4KKzuW+GlZ001o7LXPqdFyNOT17GeaYbk0rtO6+9O4FX2TiNUZuI6VTHc1Bk8aqjxrn3dppzpzLQ42Pav6gjp9dJnulQNHyMtecHsrwRxGJtCZY1+KIcHvly6WvS7GjjC/hhjJq7orFHp+eXh+jgxt70qTOSeX725RbFeoUbm7UV4n26s60+Vf0K0DLmHDt4jAWv2mSxiup+bufnhIpoWqdvWD4NKZOTzhAcIShuOQM6/72pk8H0oWqlPC6oCihVyJSbBZBzenEZhVuJwxPnxe6/t5RFdtwKxcmWniANKrpsxjRjd7tl6AjgIcg8ZMC9gNEjO1TqDuIVsPQ8qHnv9uh2ztTiApPjO6/KJXwbCpjUBmIY+tThejmz7lUSBEaXvShX3woLn3x2p0QJMHVNO/99PTslPIiiqSXrNogrM6cTjxVaeXDGZ62C+HWRSw1fUrjQGXiec6yL9/PJiT6+Zegt4/GOlFS0/Cz6NO3sUuFIiIaI3NQnZozBqeTPkcR6KAPvSyPgVPnoXBaKD07VYFyHbqerMhOJe+xcD7czk0ZQRduL7Xey9FCM4AmslfJj6roA4+MSpinqtY7X4VWlIeJmDmKVPoTemj9TPb8JsWK18a1p/HZudsRBKpXj0OIEvGjAnv0Ey9tV6rFmpUA/ijoOqJNs1Lz92kQ3EiLRwP41JyjgF1G5kSIzpEwxa2R2HWhflh7r64+4/cE3pPwKYoQjTQ7GHMWazBe+N1xwyjEHA0IFRUEeIk/EK4vWSW0xTS+4ATjhN1DMlxGUPewjMfoTKXyDAExOzEqOkEOnhX1ZJsuE4x/8UAiYBy6jk3wCeQDxoMFozTWVvYtAz+EMWZKgydPlyiIU57IFIkHHh2fvQADoLANk939DcR8Pt+8AgEn1JLD49uFXX8oJBJw0Q/j+WIVsWIAop4r4X9PfPjqYrU+vQpBM1R6Jlx0Dh/BqQi+S34E29bgv9AdXbxb1uCR1+CsNQgbmMsZXQ8u/KqA5Il0eH+4y8k3+4GUmu/yrrXNoGfpHdSvGTqP0HxHxNnYlcxsk3ZV0NYM53Cj72+D9vcrtii8jILm6/fp04Mlu30rLFx5fCsRyspD5QYMN5v91ILpJdbMae3y2rzpL1+DqewO1rIbWF7ynjW86fsswUKTtvCldjvLMa+whZJ96j3v9yzzfb/npv1CGC99v2t/DyGFRA2VpcLvMPNtct4LX5Jq/sw0eN7oB8GfR+r+qbK9y0YD+sw1vJfghmFoRlsV7CijpxXHTbUTGOKwpI64uTB3a2nrG0e9i/JptknXOhM3/39oxYNe5tje/JKbZalfiurRiIUrLtR/VyNnflD8kA/7Epyzeip1VRPOfSdp55m258wOBfMln5RbM9YZl8xMIWCZ6RqUshVq2am2UN3yRdNFBafQF5hxk4I+ApW8GIVWPhemwlo6VVqpVK3+8aTdwc1L3dTmrNzeV/gEjKMylWOt3489yVFnYWFQBrFbxsJbpZUPx+Vbb5n6n+pn8++qX+UzU+OSvP/Yl744LKWHb+/cZ+ebjU16ztX7fu78ziq/kHdv4XIYcHxNiHSvXd5jQ9Qu396Md7kuAfptdd26KBJpidlldEgGXr5iyX+wQEeEyuOAPPERPD8yoOBSdpEUP7hAeCVF9a6hseyeMJGAocPtkEmwOCaqtb3Qpn0KJYEXMEBE9TiJGQ7jFXsH3hyBbqP96RUy4bCjZFmE9RNcG/zueFXZbTRtEpFJ8w/qLy5eMxWwNouJUg8iefZ1f09IEoHVQ3U9gNqjssDzQf4jbleT7SZNZAl2eZJEwvLG/P9ovGtKxFLoeJMczKgHlwncjZi1aiIlUSLefJhj2bmMTjkia0ObMvGqBI1PcMhHDXh66ptlpoQBwZLleKiMvfRE2mC0sn8j8O+zXVjfgew4wnsrnUZTfE7Ir4p9l7wJOSiV4vUDNQzThd7pUW5FKcJQfS/WA3vLQORCUhVEEq5UkneKWIMwk0r3GwsilpW2x6C1tnQEh/R8EjPCJjC4yeOifedoHaURO7R1UGNI7DKmL/rpW+n/+jTGIjX+QmQALorgvXB76iFmOx01x1Nq+4zRcrig9+yRsLjPDRz78hQn82mETAwT1+CgTko2se4MkHQUS/rHR5HkyNJ26/EEj4UxTabDMQKrcrVnuPwQDAOOV+sHJmhd9PVHkfA9Q6l1jeatpWgKQM8LTdhHYor9m5SLEXJKik7tqJeSYIJgY65oV8d78fCcr36O7UOUupFmB6jYp5NqpGbRqRGGosHWZIJENFg79QV/yNJZcPuV5y8+moGBjYaaCp79gW89D74gYHRA4US1FK/fgJ98JFB+vxK+5CWXeYMR2HvAN7amCGH5JDVDDAl0iv7E2ySpXdC5ck0lkiyp3DtHT0/cNYm8HU38pIpan2LGVb7WLvFawre752DEeaj3bu86h25W5QVyye5Mq4qngj2tQOoPToQvxZ0wWWoLHSd/jXjggrWC85hQGoMyFXzSkd0/5D94WzEPfCa8hPzn76nX+9UXkp95+yRUcalR+jaPIKyrU6s69SuW/YPHtLYZ7NHR79QKb3bhle4WJqqYl+p5bzV4v3wyEJ0oxPvKRg2DrDBq3Ye7+ge1Ss7xYUE5k3rkYf2hOeOnY7X0MKdWNta+oY33uqWlKkH4YRghTcuwTCHBXUEkmNU9MsNY/katUSDsxJwN1XQKHmEMm8ATANTdXIu0jROYa09xGb09Pfmy7LTZ7B3WGMnb6zdyA7f7rE/nUbqsYTjlm5RXq1SfQlnyzIrrzysV/adD5tp19VILYjhIZ0BBQMDrAjVPw0oWIs2EtbVRx5FWcBsPRG3Zt/w5otObPUbM6vmUvwhzaLXw3mmFyewo59r2OZYVmTVHFObGF77+1GqNJVa0CvEYpgTmeBGiz8R5B/EgwDsZNojvMgoypbb3JhqK3uYnK0LJ0BwU3jG/YKrFtboXC49i2n7Qzv5XioOJxOt4T9mPmvvCic5patdw3rg5fyhrPBp7G0EoHoEKQBjM4ZzeuTlCCzDCQVfwKxH2zRIPCmICZ0+lwTXOOrqJNVvcHimC7+m/fJRbElipZc/CqvtTyQeENfgMHs/UNsO/Dlv6xienLBnXL3KfrXr7mPtfPOW3K+SNvYMBsprnuALJesLUq25t0/b3PscXS6ws3UoN4xi2/0YZKldz2DKp0u5GTCtL9zMSH5WDXXxdzpQFD4zQsV1Wh3Yt6KgJELbKhyGryFJb2g4vef3JGGf/C1TZ2bDpjk8ZcNyhxpL+N/y8fzspv913WAvlWQ93KFdW0yIdUltn7Vas9Hs01ME78AZkmqn/FEM3bx0D8kOGMRB9U6JHyn9DI3syvr8+YzYi8gtJozGBun9SS83lAAt90hDVQlm7tKg5oSd2mjleSfc3FPVl8z7l+Z6so51S33j8aLXJ3FEDMpKg0eyku3IAI0hQnKW0Hqkv1bI5gjX6Jw0PcddqlcziOErymwsuan1eQVk+HY4yXuDqvi6SQMUoXJ/uD1ngygGJdXnZefR6LQKKhyiwGocLADYoPAau4WE42j04I4KP9EfwNVmDaJDnmIyZMIkEnZwKKZNfw/bypd1+htkRxlmhrLMy8sfiZDfRdQwdGuULjM7jVaj/8+Ba4fmbDCja6fuZjvaGqsMWkqAMsLUaLMTKCT9NKV3a2JSyxkVuBmGXEziHkzh78Cl8xZEdwldeFI97n6YKag/Gyqkj+roH2D2Pi13ciG9V5wrViClGAAByRxBxE3s9yK/VABVnjwh10iRGPdcoCdvB8C049omcaiCumkCUx5gL8A+JXJ3ul6YB/kh/Y90Hmsb0rpC8W2IE0wz4Ju0Ozl1aAijdWgbRJR8k2NaAsOLaQaIh6lZyyPZPD40pdrUWVaubzPb+zZl2DqC+cJbtf5qptLD0qIv/TBeN3wzBAlU/Tl3dubRjy/7aBfaBdu225xDvm85tWMoizdN+XJT392yoDWyNvfRUU4yoSDcLUazOydeGytslwbUrDihQ6eDU8hn2cwdoJ9iimVhT5eAXHDCnBzdtwyOrn09js/QnPhjjxTGkV1LiW3/ZEWQDX6vHrtab1fbj5a5ZFAIoDwgAkizgUeSqI4O4F7HIePuIas5SqkyZi32bYStsHX1OUsRKIqjMfXdJ79auyZWHo06lVcjJBPr1QSbkb9pHjzrmvqYKcwiMbwwd4ERmoJ187r7luirU5Qg4mJZ6fjHPUwo9EvFAUh6Sy7dg+GkiJXD9B8get3S31COOfreWtjeg80JW5acBCJL41dkHUWT1mK9jIiQjP4mwZmwNqP5GNuw+ai1eOQOJjpOosWSNs5GLTgero5vYsBQx7K04CDBiYLHRcF/mGyJd1Cvm5WXYcK7Yjoab/WLvalhXJVnwME5891jLIj/Vo6YIvdJ3IqWWpHjVo3iR7fk2VbKQRNZT4B2NZW24gzuyAFGtmQe1Vt3B4YSg8ixSGr6RF4cZ/xd+L/pNDA82sZIt6fGFG/bLLLWtT0hU2f8cUtEpqqQteoLKwv7rrm6PiO+8B5Te9qtnRunV7zKJfQgV11Wz5q9hMCv17fb7LX3MBD5r2d6KI/BDsnM8eH0OwEOOC2mTUoSyHcoevkeKQi/9sveYMT+ZH8tlI9Lxh0VAuwwWoXy+wbxtB6lo+yY6MeQJDIbUpIKfYKNNFW9xywa0PouZaZtS9yb/cToBoIh3Q39aIfnO82XnAd6Z3n3NrPIfjn7ZCYuRN+vzdvbZe6U/D88GeHfQuuwqqNIWI9W4oC8uUxmfY5Y976JtIor+FJiTxIkBxHtt3htbJGHoY+DRc7CsfhgGeWEXxOKNqmHuwdy71okbnf1bw3H5fsIMtli0anfYj7tWHTt6R4/ys4GMbodkefGKE46M1/65MfAViu9GnW/TW6/eBu6snrtw5lC/nYgIaOjid236ZDGWrGdDNfiIoN2TSgp9KaauwB9NoBDvHvbPpyyNmyf92MqrRIbvL3rQMb9tsh2f0Pq8tu39kvp3uNP9judfhkT6dIqESF9S0H9I0aqcp4g5EBkUjVURtPv7y8DBlyHJoJ33sa2h0HhPMd8XY/rj6bGQT6juCmlvQUla0lZfmhAQuoVhDG9egR4hC2+JSxgNYeie7eGtT3q5mBgrnP0Ufw/VJqDeWN52MGhDBHYQRVHThgfPkBUnn+4pv6qP+J/3F66hqevikfxwPRMyGeFuwpD0PMLZh2LVFTYiqMyXMccT3wE7Bm7Q9WxKkYXPLr1vTci2jU+zz2wjxzKdc25xiZcCVL4JayFEir6i5uBLv9ARcMyqk+KElfYd+bJsFys4JieuHn2YEBpg7YcwKVKhC+tyuqmOV+C2P5Fvvpuv+8RouXrzo/8SP/AOb3GLB3zD33hTZYFBZ+r8eZLYylT1ZgaVOrxXpI72ot+X02ECeW5Zll5QhxHNiJkghnLlblXHKWTmwcezDwkrAPef0VU3tvvGBT/PILEwLOikDd9DNO6cUx9drAt7hBDnamEfx/BLJDUEi+un6ULD12s1ufXQiSUQPIZtEoIDEU91GZc1oBSCpGxYVvpULda2hf2rpDKLwFZHMyCuJiXN9If10p8NocNTV4izMBlBlyhSkBXOTl6U8ajnSVpew1B3jHlW4UUsGoZdcJ4cty5MI5ZXf7GSWG8JU0HqiurkR3WjMs5ehx+4Dlve163Gni2thM8SkNX6/nouMUwmETfJ+z4oUc+EYByhlH0+6mmU5uQDldphM4PHTYOjvzyUqd+XFDV1IZFg7gOAFCKlg80UK41oAH1clF2SgmNGqiccDtsokexxJaMKQ9F0xwaeeSTbJ6YmKw31fZiZUhO8AQrDzUhnx9hBlgLgZo3uBJRIXzksFDZCm2E6ZVxeET6fXYVJJbl8IpQ7EHKOyZp/WsfGZI5ur1uO4JuVx2sG54BxSMIGUkVBEj0t0yo6WxXi6+VXXVtr1jXxlq+uazKsXtM+i6SFeeZT1RKG4m6RIL4NY6VChZkwzNGbuWFGENfeu7NPzMTJCvXfvt5YorxTg2W58iX7DbjTzx342Dfxq6f6VQ/uf/utOOYCrS/5kBHzwfQ36QM841H03c6rPdpoDv46P82fT/+RYdHvXo7mX+scKWTU/qwAa4//5V2svTDi7bgVJph3euxFrOlF1p592+QcR+453wRkuIWtgb4epReU5v0VPjrNd8C5RfYXgt6/CMVvE77+dg/uLjFjsFgotmVm0GRYmBbqerj8CxBqmq+GY+8FcKkWP8BY5l8zvseCzesqhUdP/JG26w1PO7YRSu6aXp5Y2UpukRB57nrxzij4wPC6HVzt2hIa2gMRVrk5uvGl5i6P+x/cYk/XTz3zwrqjJkan5NQTra37c9c7Hj9TWq2ckD3+PmN1sOy/ijw5fgKQ+TsRE74aBa6RIxviv9Ucyd+7CgDQF/xLgzjjmgeePn96nuzI7PkHeHdPye7uvz+GHoeZSveXqH2s0QaKlMz/a1BDN0nLT77Gm/dg/msaP+BbNpE8I6vzDfOOkzGt+PgEfaevf/RA2On/avGDTbAOm5r26HCmjIoO8/xkpUMnackRvG/xwDghz9Ro4P/XM+DE8gFdKEBAf/L7CnN1/75D/Wjzn+wAKDWa7AH9hoMH+PQy9F4PX57Atwfz08HgwRwH5tQKZxg9gYsH+O915rcZ38z1AyYP5q9B8P8SRrDYAn5WuAPGDGdH2Bj5TBhLK+uKiOI7gBxDq8yKw7PHmgkGBYbcUC1kQACE4QnWAJ6RjPdqMMSa95h4JssNW57gI4ShBKAi5R40PMAE5N1Iy4rP3AJCWHfQdfhF1Aw2PsFykOYMFN+qYSUE1M7vTIwVWOkWmhPgJ4SZNCf4zgDDhnwmeD6ZjJmwGOlwDQcAAJgroIukXGI9OrIhkh0JrRCgiQyMDYRFsLKU2jesAJCZ7SowMQCAm8cKw4YVsIEVQpp4xuhZtBP0YMvAZBfZlYqCbUzwefMv8neONQPxDgXh2FFKxg/8J5I8cMOE44BzJtVYYYlDjgRdxr8wLBFyWJIgj4Kux6cLlV4DvPJIzOhmppKxMs3gVY7rWdCtPIbhRuM9kqwRvDQ+TbFEcdMLDoz/gVLtaUCSDW4GwUGxQehZccChQYn4itwJDsbNhV403iFJyy4UHCIunWmB0COL/VHjDlkcPmv8jiw+jxq3yKI/avwGW3wdNW5gi++jxq+wxc9R4xOyGD6r65DF8ajxC2xxOmr8DFucjxrXsMV4VLxzuhnBUTc/DT7D6P3WsEPyR2XgpdrTdrr9aVAUo+7W8A3hbS0owmj7RfCjGG1/GvwIo+2t4Yczf1wJvhajj4+Cr2H08c3gq3NSZZhynY0hPdsC5xP9ZLvCn7N0lgnOL7qPrcXZ2MqWcVYy+hle72Wm2T8OvysedxTF5h+/T+SfZyO/98L//1LXgBVCu48drKRz1l3ENy52CAK5wCOoUGGZFXlAi4lDWELzda+4xVFqqLlq8v7/KOx/7wyk2pUGCkpihcOip5G9gIjS8YpipBieDx6n0AYzShLqfIwiEi6rJFZ2Kn4JhXp1ydrRvBklg2KngQjgvAwVQtDd9Ew0hQwmDqS7tWy0hOnfrgkDVYu77D3hsqfPZpB1O64LqMM/lkKl9bCPhw2p6n8WW1Ch3QQ/3NkFzoB1DgwsLA8CcaYjO6zKlpf3Yo1Th7AKpZmGYBerelb2cYE8XdrBxsHFWpanrDnK/+8VFCga4nIIzBUsEpQIzBRDahQ4pp3ADiTpTlFoCYW6l2CQlnTKIk40FRYJilrwIAiNA5aQftjBFlBko4YmTlh1Efhb9cHLEMKmkJ7NQRRygaNIIPoRz6RqCFNBf6OkN9FSTTpXYYRy//468f2lroHPQURZWD4Emsh0tUfIJWbwoD1G+wIe2ppdsObo8ScO8akGndA/nyYJ3cCh9CvsY3wjAo1lUHROijdds3LkEAREOMoF7hFCaANoLEPwc1BpNn7FLNBaaoCkEV6uIIZLW0UB/iRHTDTDD+SR73ChqBlFd6pwAwOnKCaQfzwLdT8cqZd1KDbjz1LtsyhV+FyBq1ZwoBvtoUwcPotQWHYN9wjG0yhawvtqbkzOQwDvUc3wvjBziEr/uiYJ26mwaRF4M515OdbuAMUR5UzPxol0KnowfJ69hiHJdln60tBaoP37CwmmznGJGZWwCvlslRCj38hOWHeHQK9tPhXIZob4AT58eYg60+t/VffqscJOpCvrZuCbdJOOMUWjreNXkhLLea4EkL4+bDyMRYfjv7anDLjA6QVEM29LYjgsqQyvGCqQZvpxy4ifwc6rHnhNLCJR0q/D7XO+5wKr8ARsocqTkQDO7cjOgdOrKkEFijwvz+Gq1TIaMbwaD4woXM1msyg5hIOIXNbQuLUmvnm6exGp3shlPNkkDYpFtgkQOS8RhuzpEDS8fNolKSm+PxoR3E3w8HOeSEJbBRSRkpfjrWtyPV/seAol2d4KsAwpj7gYba2tX6I6Z2FWJGAWelyCqWrmHXirvuqGJMYsFVQYFX0CQkZWcIMYP+1EELkTJMLx7ZwhURYc37+rsEDOKBkpoJBJ2JRYCn5rK23P9bXZE8GqSZBNXBikWl5PUTot6YRn2W4b8i4kIfQ1MZHUO6EDroUrBthV55OLHQSfxG7OwCHcPgJo12pTdaSSX9jQZwu34wTHmYD7LmZg/66wZCZdiMtxIioUYjFA0s/E2HbOuADDIDUD1pYr6pro2CgRDm6SwR00QK3ejNxc4K4DfFdeUCioRZvVKObKCAGUq15f9Uf+eQyC+kAN+BtztKHnlgvrXyxIf69wgO3caOo3tCRqiRJL3bYVa0wvjZtyMB2vecxuUsqMyHmd/+HRy5BOnw3i0g+ksn6hOTFnuXSnx0Fh1sT3Wy/+bZhKG2+E5v78uHI/QKdTdovgkBMODyUkCIMQaS016lESSSXWjieCeHDet/d2o4EIRAwJpuKcvYMFCjqfJ1CQgvPBwxROe1lck3NWFJa8vZh0B8/bqaDq853rfsmKcs5KBB50QUtL7txYXbPf0KakMKKI4gmPb4QjT3SALfy8Bs7CVj3srSKEKpKsMeiiYWajgFU6EVGVGg+prIMGUPBcYASBfUgbF9FTKCjMVOgRoSPJOO6TYLRiXeq9EdLpq84qDlseWirrzYZ2FvLYmAUv65BWSBCD7NVPr8gRgppgalA4ubdjLCMRlcA2nIqQCVkz2beSD1rLPNYNZmxA0epHrL2gLGvvCIyyXVZb3xABptdbL+nKc4JeRX1BAi9kvFyTuoVp8kIXR8PWk4i53H5vFrSnj7W4unGkgmISFAkKPZMxuBNz4CW0UxcbK9cCdN0Jk32l4y4TGYRygi+NpglV0d4PUjdELtJGA/0ZnWPUOyiqxCRegxJtEQ+6Xjk4tICFFy7dtaAh6ciUOi2pxj/TUq/v4I9yRwItiUURCPBIjRLO33Uo4IlOFRc4g/PvsvuwoCD6vfvcxiolEWZ4/f2SZa81+/8rMxsHPQ3zkrNePt83bw240oCyt/cMo4zucgrmDjRAu/Rhqwoie5h8anuT7cXC1g197LmHR8rzac8MN5Sq8GB8s5UI5edPGWg6jQzK+1cbHrAc2u9fCcdk8vr6qvfc2B4SFeWvBwvUkGEXATMUo3oLh+KhRn9rxEwkVOR2/3qcA7fuwGAxNblnb633DQIdgTXxBHfP807udAJDjx4mhjhe/n6Omwxw+ZlHCDRlwvieuoL9HBBkQP65WHAIssv/dwROy+y65AnuGnwi0r8NL4KXnr6aibThCmbwBLQaCJtpu4K4VFXMQ1+/QulkXgAX/gpGKkelnNUl3j7Dc3F2wN50GyMyzp+W1F0eWD/K0E+WtkGxxC7sK1EUm+FAAJ712OEqMPuJNM2CAj18NOA8p2yq3iqAJDLRkBH/sD2lGmakCnZaG4UCj5YQ/V/HgBnFCKeRUUt6Iib6Z9zSYcXNHR7Z1CcBZdE3D8Mmq+lOrMKBvxrxWnZSSLlLSFKWJXjG8rmgsQ9rbacs3umCsqJqo9wOItPZ6XQ3GfWoMGLcgpqcZZJqtIdVYbsv4/yM+d01si5m+v7xDKxCC+sOX5yoycs+vPtzFrimsS3DM4Hiu1ZGD8s0ieS2VcN56JrT+5ezLONAT9BEluLTdyiYohYH2AV9IjCoHbnrDp4FY2f0KN/NVJyOi2kKud2GUaE2CgqaIraIhys7v2pdUNu/xT4BIsq4IfWK+TOxA9E+l4EmTkgiaNGGbym3AqWDI15rnS+DmduqCwwSwokUZ6WtanVk2wpoprMZlaCIV5EfgowleRIMuYfYl3MTzUzRRJXojehHqK+3HyErkDe+MAmBQ4XiVh1BP3XtKtau9ejs6VBAEbNYOTssIQFlO+i6g4+6+9v/8pVfVW2FDBrMtY61EnORwcHyMdJudSzAUNvQKcOhiJXoukatqQbEdvGy2uWWNjFjlIkDFKWGEf+jr/ONh5iI8+ciwIj4TIFBcTibD08TuloAssRXxLAVwGilBAytag/ICQTOEKvU2uYdafHdFtQQDyfpwf2OZjP/3hplJ/NfYgmBfk/A14vJVLlbiEmPcwjreJKlx7usV4gl/tIqC0FkpGx+SvBscjM0mlyoKvg7pnNQVFjE847TGpOFu+NiaB2FDDb+CgJtyks0iM0lpiDlcDmgdEmDg7byfUZ+oaHdn4AYv6syQxXvRKX8JFAEjLT6YPgFx9W5L1lZSbvJ8OY3BVhgIevZWFEWK2ppPRi1+tvY0UcGtcmqbmAoIrn0KHRv91nlAkVaGLUdCZclEY81W65ka1xHqvIVOCpdBgUEFg3p57LJeA5C7YfO0KvxnkIICvRvOyp9tZDHd6H7isCoVPevrtulvmc4RTH4uZ3GLM8zC+cjcBqhs0xx8NOvHkxX9GTNINrJtRkaqcYBbI20mCgV12pi2cxp0lYCw9mNUZnSszXUHOBfOygkhtZuAmpFVt0vvQbiAv6Kg2bxFfVMCEMWcQpP0vLOY4EmzQMRPWMheWuKuPDdTlE2glGDzy3VJCOdCf8T6wqnWDg167r+9pp1UGWkNkrbDiNB5zI+snEV/Sym8nlkSOV/loqibbWQ1PeYdMAtBeSIPHNZOlUrS+UIcnj3uUbgsPMOH2sZZWgQATnqYnicvzz26lvb0qZ+f3VqBI5dAOTAUZPIUCSh5d4LlALQmTjQOrYWdFnKNr7XInt9MDSfomCCx1oxDZ+FXQnTF1wfk9zPqVGzYwXoNVvV2GLYtfQukh0TwTsDT4RWA+I3DNnOgJsFllIx4PlgUKwJPZIpj4rm+cFKosRBhzfhkKZ3V0DIP/rkRr9ljBCD7BLDVmMZXEixNIQNcRWx/YkDQvPXdXm8VglgwYO9KvIt4uQCZVk6ZrQehQ+OxH6phEr1SXQVHaDw6muBAD6mLp8Av39UOijuGbgocWCPeYNOHA7Sr5gA8fArJgBegaooQwQffAauSgKg9fGNSp+h8VkExMgOyoHY6wTKCQfxAvH7X0c6uJAKVCRApT1AFQypSAG+FU7VzH5gbUbJF/SFW9TdvSGWfNoONj4qPkfOTyN7HT3ASyUVB3yguTjWX8Y/lzj3L5LFp7mE7sv+pAIuFZGXDK2I5a1+Steah/lbhsrofdmhHieK/YKfTnSGaV0pvJUdTwdrVYeuIXHn2vjR8es9DCXjCCGdNB30NEcU0oA0fGUdOywSBM+Ki8yEexjdKgfVsf1BdTd1eZwnUTKwNh4SyX5a4mCF1CjGJA+cFasC/P4hAmnm6vl6RqP1BjSM4xpBEJFwi/Hdj7VlmocJVaVssf08PudqPBspdtvgC3LcGUWgOw0FFE0LUUhRJuADshkz6MUisLIPjLmf8+/Lj/3+fU/tUASjX9eJoltP+WlZHr5Pio/gqPv7sSASZckpa1ZvS4AuYZgboS5IH6bFwxJeh0qPsyaDMs4C/WipikNjlHmM1Ie1RX+JFRJUoP5vqTp+hwpD5s1iLndUpeggMngEgia4d07vd8EwQl4HlNIQNi2F+HXySt8PG5KswI2KEVjVAC5PYgWrgyi5ehPSXyaGW4QA02TdedUUAmns4FP+3nAgFumS7R0q0r+HExNjMTqKTofBIgItsodjtFqGIzMruyxRQVLXuXG1GSGEZITEKxEkuiCPGxhqWkgT+sTRhNC6OyXGxEnjgxh+lVr/s1QWu6IsBN05LlrEB96F4ep5JQvqTSxnDqXI0qQBIs10S8+6LqRyLqPZNr4eUoCXogglLbeHIjggP56IzbjnlBsgLwUkegjdXwiRV7FseORFNu/4bXuzpGIMpGRT0jsWXOiD2o9TYgoC7C/lPEH4sJhKys23eczs6Rtd9cSpUuI9kccrV7S8TEhOguR4EiS8X4XKpkLKGTj5vLldisNVhsAK/DMQRKHHCQzqG+AKVE3tIdn6jP0O1EfafjQEcLhjWDETEhnjkzhrBGruevWyiflmqbI2MHlZ1H4J4tRtaTFjRIHR7nOqicAkywOfqvvHY3QMQBiIvmhMPcXQLgRLBJLigHe+3sxVdD54sQ7YaQDakEjEKUpT+VVcqDdGDO9AqIMMqR+j0aQ5OFAJspZ98ei0Dx5oEsw0Y/EEnYOFZvOXtAc7XYMrLYOFNsXip6BX5HspkqZj4XFwTeesVluQQQqrrzpYMZkCyQbLAOcE7SLOoaTGEc8mLmtagSq08nzO+nw5RH6BN0C+ATnJSsFrh5r037v/RAkUS90EkUUWQYEE3BBka00kwS5XGb70eex24V0cpOAY4z0EKT0WC6fNyPAsWNiGPaUcszcRB0igChglLhsbrG0i5JZjJLBh9vbiHqCOhOxI8mQU9HolbR3z1MoQPpXjiEDp4B6EQKCIM8IEBIUstLuz0RRe5eR3lEVN5YJOEa1/ovhMjrwl7V8p+PV68Y6kPraVlQKK9Oe7tXSD/o6zejEE9goR0Yd/RxcpkBkBE2YPuglPBHUdLWMVCUTiU+UNUToEIMyp4VnqV+BaFB585X57QXmebS+bET4lutk3ZHuCyGgV/aTedss1R+L8A6r723n+dkF+zyT/4xEQQyFa0jziu5+qJ+Irw9uClkmPaOeAjCLqCsjDUBJS5duTS8pnidoCrTLtctnb5X+8rir+zn8U9GN7onQ0Xj8huGbMWynpf7KMoB7IIQIXMjy98TpXSSChWi3vyXT1xRyH4tSThKwOjgA9TcHgEzs8GlZea+IbLK9aoqnGz+v3niX+s/LHdb86RYdmHei39XECY34LCnoW7YxsGD7uWRFkqFRRqyZ4ViJMivYZ5ySYMpoo4PK6AgzuVhSr7n8UbvS9e+XEWCW/pilFyeZsvw5MhHJj//EPmO8/vdMP1IN60K6bHv07Oq26d7sg11HxjHrVmierGPbFnIatxrEcj6ZYpzkMOO5LlIKYquVymUGqWL20Tg7lGIG6pwa19IThbxzqfyjhZf0DFmtHxgVQ+zcwn1KWuWtwVNm3hK5nFeJobpJZcNuiP61sm+iV/FMsJKPNfZ5fr58F29KBg7qrXEqNsd+Z5ihnVoqzQTSTNprMBxt7OFlOC5iLfDTd1zXCLVzrfWoDOGaaRriqvajR8oF6UenMER+n88c+IswlNhGGjIXG2QaOfcM1C7XHI5foPMQGp3NaOz8Teu9FIArT2oQGKtuAo9BvApL6m/wpSx8XCIUYTQRXRE06AjjCEoFN/g92eEKIIGEDlyheO0vOAa8jbDmwbyaMjNWap0AYYRMbPzHclUNDcEfqaG3yWY08eemRbmSvcgdQe5HT8ZPQp9wzPrmBAsx3ea7qMJYDw19sA99BOC5QDM9lVmYKGRXsEUbmyyIhjGLM9GmscwMQ8TT2A+pDfTzHwlYg70i4+6DcALy/IGexalVhPOZ3+lO/ciUTyypIyBtW5ZKPyo1svRcAOSNLjjuaq3GHsHdTqE9SXb8Y7XT6xDKl9ql6XqZfbHWk7PSqYTTH4VEBfllTah1vrV2gljs9vUMYppzhfjpXgxZvlssEgcfD+WFPhdMViqkkt/Z+svOjt16tLRycFT0EB4hS1Tkf4yLFr+k70kxFyTzLK2+t9M/sHewdQtDLhDka0DxZ5H/HU6HIDwn7Fi/OTXo6HSwVfrd6wi1OjnOXm524jopdvt3457ieWrSfv/ZbitOjJCwQUhNJs8LvjhNEyBPCIqXDjhGg3JaQizxDtjoa7oY7lxPxNUKXmILdtaCa4/Vpz4CIQM9+/9B5CxWxgZ3feZ5G1sRMmiyDU9ablmms6N6N5bq1Fdj3gJiNQgS/6CGL+LtZMoUlR9DafIocyYDYI0In5NNmwvHRuEvR8o2y+N1uKc9MwNvXcvr0zFdwdEQEB5tY4rPNXLPPI+PAVVcJ78dKNfIGtikwQ1mCWJLZfM5lPJVE6mSupCtP/dAioh+5AkhmBIKPlNMB9N7LP2CgVsAqyl3y8yMMkIpPeXj3UyuW0+oVR5YU9eg9Htppip5dt1VTejqZWRxxXuh/HWgZXAaCY2ucqYb+4r99nkvKnEbt0ukTniF/i7f9YCu4xA8sr6z67VoGpypPGdJbL0q7tE1peQsz6u/c3FNX/HWZsTlnHQon61qyHaSg/nHquAIxijYv7+vv54lS4yz+Q4CrSii9cssQE8O9UnEgI5i0wnottEhT5SeE/o1QE59D2hL4dW3Ae68Tb+Pt/DAxuV/jeHaPMuRanrnyDu2zzcVBX6NbprWNviBJzrYItZYYX7R7/EKDa5LGygvCpS6wF271Iq8XBPo7k6INVl/PC/KRygMrmoQtdzELkiwz/jmfWhbVRkUU3doDwiPn8Y2gR3BzeUSLLh52tna/ZWtaYvV4ShgukVUHsAQBnZvsKQLogZYQBP0u/cpipEpLUT2TPwJRTmC0h/EasV0IlxPNQjP7eVoLhsreFmanAdTnO2mycYYJmsx23ShfNKevLDvXzu1g0NCkJDr9UQt9aNJhoL4zWCGWKVzBLpL/cNPcpLWvpwyfj98cowReAVMWQTjDdwqKV0JKYA4T0LK9KTmQhm2vXQjQIgf7J1OljgjIOVKqDcOcTpl4jMU9xnWuPMhB3k7WDU18XuFrW7RVXhZEi/LL8QKd71pkx3sb/155iW1X7fWF3Q2RNy3SSXnyjo1/4ovUg3zw+vpc+upwtY8ArCwmVpMiLXoeRXQYfGhXhnVaa2zf/GXpDyIt7jVvx1cmSev2UqTL22EO5J+rxeh1cvL9zknHK8vyD+WlTGRidKIkAWda2bZVdSgHNohw3meWd9fjq2vBEH38qCdcg9Jd+i1qMTaNm1jcxQcTMtnBB3txaZ6TU7t0u+mdtxo0AjOZbeB9A/KqXjhmLpY7Gjo7gyjU+rKp5potJXSeJv7qGtCW8rJp7D/rrosTf9SOJu2u9/WkrSCLXfg0w9LG7/dPH1bnH7P8zeP70Uj+o/Qz0lxlxwyNap7nNz+ihQRPGbJoyAO25rJmD4JeziVGrppIz+86FXBVk2qZuzv7AeCtgJ4ezaJknzMa38tpOXznPt5nf3yLbVSz3YSYC786FgCN3wEF3rtrQvj1MkC4ErLvtZz2BDtLVvJq5NT3hxhq0z+Uv8UGl/rosP/d6ld53NiFGfJ14Xn79ZSu5mskLm7BUV+e9phy8Vodrj6PTJ5hddECl6ivaYxYAz8N379hopDl+TOMg7h2NiGL59f78sdrGt23748c8my5Ll5fdxQpL69d3E5b1SivsQhF3cjvEQccRn4F3zeeyKsR4sO0DaYmBSqrKuZfChOLK5N7gWzUGn0e03RI9MgSPxUqpSfPPSMp8qOmdXNydUZXa0q+BS6pb4fYw1MvrqQk/Jo1H942zpyQQNgAlEyg2pVA5ZW2O15xDtXx0vz+iC8Qce9PAuVXQIDCpGujnX24jkbEsngsIgQEgElQngqqzJzZdAGqGY/3TImXRW/r74S4i9IeRvumtWZDpZgywt1E5pCaCXMKqDLRXS4r4+vn8UCYYUajM9FdZsehUZ+kttL0Po6FDiQaT7FLaRc1sqsiprH3y+WGJkTzb/Y6L2LtgiiqFsfvIIJW3agInKQpQcXMZQHQMEb0Awdod0J2HzCzpHBNL1sOzRTuB9jVh3j+ddLtSci14ueFJZbNZJ/Q5+Wj7L+3QoM1TQejic+bposBNlcln5txFVXB/NLcBWzqq2twYO7H2wvLrDk2dH33w9f1ZUV+3A+gyuTMpmtG9Gd/Ylo6VJ6WufDOE40u9AIngc4kCNMHbtHTlQRoxUfLGre1SqArB30GTFjsLtGUvb5p/2vicMRpuGWYHEbfMyIXVxuLe3PoWR9KZwU2d8davm6bxHH0FvGPwn3yTR9eNB7tkggOd3O2qpxn6YAZ9yoJ4/d6/Ta0ieDN8VajtInUGbvFDq2SO69vwI+4UeMdYcjhPh9AF005+hpu0xsQzBNXWksSusSu89sYD3ycWSluvB0jsdYHOg/G+nnH2LEU7y/7PvLDLOU3tXEx9K6zr1Zw46KGXFae8uRCs5AkC17QoHybgL9rrEEpsCOWP3JOror9DD/rOz7DanWO2DHpbvWSHNez356NcLBVM4zhsQemlkdcqjaDO3pOGTdWW8WXkinjQrmd2xQK+T+++TvUsL6iTxuI+RIJHpELkb5CBamFyL74jPZNrk4jmvZJPf0+RQtvnymvrmzCkgTAf1ZyiDmbm7rG3wg1fHsE0TkCmoRpnTifV9DuOnqsu2fKQmvHSYXw1AGbqzy/Fwb43Aa56DoNIVH1E+O3/DpH38cwSzsuBgrk3VfWTSz1iZNsTPsS6BvO66O4EjYRQttKSgDyaMTdxPtqEqTYxQt6P0pxxVJ21GXfl0o9w+c8koAxOeoHUJuK/K7F/hRg9wul9M+DMOuoI+/ME8CwRe0PwCr5gUN+CnRly2qxbK3SP+FzUvmgMAbZl/rbp4NNHeMbZ00vHttocHr4CZTEKvh+dfmaFFWJloJEOqzRlz1/66tZd8drk7o9+e08tPBjxj/XNokVtaDRPol4zWnHB9h6fQNk5JyzdMpqvFF1Afg20VlfjpQCmg55OgqJqMygORn5ccGBQrbv2Gg4UagQMVJXmjVng/dWU3IQYWachlpK4722UAjPBeJ3FBKUnKOUoFVawNcefHba/neUP51GFnU3lRQejohgnhXk5X9D7nwQDjLY/xqI0K5U/6H1KDnQup4d4Wd0RqjBbCm0YCVtCIzgz3dzdR7CZpxuouyt478FdC8OoPadLuUuGntPPoHdxbvsdtoToaKfwO9KhnIiTqGcaquIQPz1YdRy4vfZSb+eBYTwnKkvtpnnoOi8j8yUu+YzFriJHV5AChrvr3uhymIJ47RLzTXT33M6/ln9a5+nTOSna5aobkY9pT3nvaCZ2JCL42vnBC9cm7djoIoRG3sU84e2U6XqLxBwzXbEKI3rsglS3TYmuQyXy/sMvugFayiWe2Ttz1l3kVSGheIY59S/Iv9+1cVdZLeRidM1SHB+ebDq6rmzkUMeAjS/zxkZ43xWv7615MTgzWRtEGB69FieOjYhq99N0iGEIxVpWSm1eeq35/X+4/8dWGpIBPdi/Bm2ZPnfa++MEvymLRxy7D26Sz4iiIjFx6Xi0nSJn9GKYfyMhgrsFXs/XLvbda9I1LEYWJt9tpd3NXg5UZy+eIkgY9LJJoFpeToiAgkIR1KMReSkJFLB2vQ2Xs0mwKhUudW+gZRY4MbrsuIwRMzOjz6zyKi4gqAWntGyl/3smAX7DuweB4YtbEFUd/mikHmFAVbHC5NGRNgVinAG2WHST8AmR/BqYfZt3RmcOiKfUprlRrdGi+2Uy6fAWZWTCuYXaS6mIwHPAfnuGJHQhkJuzpM6cFUxQQUXqYEuQHuVXaAucEZEBhm2Q4MTghe+Utn3Ruk15xYyyzjiXDUWw3cPsCyVwCJRVR5ktdJ6WtM6M4iwFBJpxAPwsqNV9XGc1amKcYDSg46Xw804Khnso0T4nlODKDI+rnRdd4Id2pse9xnCUfTJsVBCz3X8dLPY5yj4qGZc3PRKifyzyLvna7Np18spedOF8FFDa0ZHR0mwYeOGophq38KNIBWExIL3FhwaYHbuzStvvPerR2Ceq6dIQISnaOnSvVc6vAFERrNIfX2e5+K6L2DaRFq/Glb4MrD/0NFUGpPkdNgH/hkh8epbsCPb6q35FvzHi8o/TuDJuynfFf5JtUZKd57gcUwQQX50UR7fZdWY/koMrVE7hGbU9y6k4DSXIUBI7HQHWj4J20Jo2uBdbiU7ASheYhCW7yDipVNQCE2pGQ9cYm/yV7OLcXa+J8znRS821SKLdaJH2IIRh9SudfdIZPGLRYRKW1EdpU1ESmzcHD8HB328Csi1TTTIAHphm8QmXb3xQRMLFbrkruPlNWnkAlgWHx6l+JGv+M5e6k9vCZdCdC0zrcIae6+755jQWHrrXGXRZ9WNtAtpMjffcCZjFUWZZlFjr2bYCu9ilPTJKoGU1IVhU3MdgbpOL0DjfCZLWC/avhT0giDnav44dVsxvXFAAKedCYBpM+4MlBUwkxotONY8fpVFzeEWu27SrqMa93xdmTzUR3v/AB3hWWEcPYQweQCHB6rhfp9I/OdJp1POhMluKjg3/R8Ud+VvsGlpi2uF+pNNprsBrY4mXWk0U7oPqbHD6TjzjFk1xSaqjHgKTOSFzPEcdnLMyoiWR5uY1+T6PgDe5pfWU+XRPHaH6705ePWq/p8zEwbJpb7n+IzLOUVTlsBJgjkbbauaatr0eSXsKrNMzCrJNFu1AvCYSbDe9HmdXpT62JJPcVxdP/ny0jJm6Wt9+UrTnzB/Vd1tRljMgxYYnh8vKTj/MELB2mq19NIH0kl4tTHAy/Uqpd4OT9G0C+pVCTGDpnoUYVJ8WR6JKdf7bxkDk6tBoLnzcK76AqFRb+CPmb7zd8Y+bDv/PyZzKObUxweV5/0GSIPPEIOYoNlq6hX3JdYFYGoQaDFNrwucWxhunf3Wo+oWlrdu+K3H7hamW3i+ddMtzLeu+K0XDrfoZqcnxrjmlR7nVZaVkHCS6nVZT3Fxd3t+B0ELFEdEiE1vsj9H5Nbhtx52j5DXuXX5tx65RxhxbmF/66ZbqLdu/q3Hh1tY37r1t16obuH1LbraZrGrSvbyZKvVq/R9SyKW8L1ZUj6EEJXDH26IJ27zppfP0jdbL7Aq4SJYQttkawlrJxvFxJ3fR/EtKRwfEY9oYB7Gxc7bJYqx7A4SSTzf5DVqfwlkgsfTwkUTomRehSC5SKaFCY8xNykZKYCYum6RDHRERhFf0tIHFJLDF7GkmsK4CYQU9C/RH6iXsNGTSESLGU0ZQXRLO/gcQvyn8qrzoZsIvCD6pPy+lTRypuPTC2m6lmSubCKHV36QPsl2K5SVpy1U9rbHOsuUmfO71T1MSXxmpDtgqZPHBcaMnlpNxa6L9aRTe8vQ4362DZj60wTZVR3X+mhR4nV0P3VP2A8geQelJr4Kb7+RBD13LQslELgLdu7xk/P2q8Xl+KOjTDadDhc5XORgCsfFoe5Q7Hd/PbgBzwojgm0fcz9hfBe4qtcMK0Ii/4iOQkeJ+iZJzD4i3PaDwcHKvRHMz4tiFaXykCPVqtJYlGV2CLUp7KsDszg6DrSIt+LtR3XbnDXiB3wZGZoUsqQir5mS409T/ZjdGNTijg/ionAtVhO/ppaEA+8+vIVngkSVJXr1RFJDC+uvp0KA2SvBn9j9/Ofzy8rWM/E2Z7+nw9LNDj/IudVGDBKjDbJ+mdCF1U5CmOuHU6fY9n0qXvU4n+Lkoafbc0QS3SSA3EPqJyaXtvI0mHlfB3USRh4C9Eg9u6vnbp71yHGZ2mJ6ePSHLUsQM8LWIjyiZ6bX8+6T8jnZqT7XO+TDPG5Gzy9tePHHEr7VlgGDcpFICRzJBx5ow5iRx6+uI77cZqOvJ61fpWNaWeZDKhG8WzcJo1rP92e0jMI1Vdskk6A1LvpbEAB0ybhQcmfSV6eDk4D5AzJ+DJHgFmAGTFAsFGoxBsU4MfNR7y4CQu01koVAVf8DIuSxPm8NqCLdint+l6zq0zkH4nkGinkIdiw8GQ13ioiAshHuCwZeU+HMELbBmRYkyeilVyMw+0BrDF+j46vUIY9rko6Ai3EsaZA598eEYG46U6PxBEmduVu+dmp0BQnhv8j/PG0v9n4eOuAo38BkXryZL74CDcHRHWiIEDZvmUs4Yw6p4nxGd+EDX7Fkfy79fKWn+6qAnuhJN9fyf13bZkLFuGoozTu326pw2kPn/f1yuAUGd7OkrWWYPH56Htz4+iyE28srFYef2CPMxHatRzaKNh3z6AGpHWCNbSxYd44DwlN6OyM/D2DiAxTLEGbY4dFX09we84Bm3BDRIGR5qAad6e3Lf1AqnRVvSRUjRDw9kERlsiidiWVfW/2v5FWo6KYr2QVsWagbiqfY/cFzXhQuPTbTK48SjWKKsrk8Ev3zNekI+A11fPV/Rta5P640xo9mxedwmVTEYhRJpd0FZkKQKQyUQJIfjqnQlWvHJV9AGNhxs3apvjiel3OCQ+wlCQSeN4R9KiBBycfDSexlb50kcYljn/yVxS/f2V46yuQEuiEPZIEN4Z6kEOgwaTjRgD+jScXNbg4TkpSsx5V6QSpqrPUrogb0LVweJuz0ORF8gr1McDju1AbeqgshWEH6BoNFBCELBQxWMqBCfQaAlTiATdknzFcKDrLJY1vCrpoV7lfw9wut/901nQTch5/iYb8b4pU6HqafUqQSEL4Z557JWB0wnLkn4ci6yAP/glXGg9ashCwbGaFLhfOi1pgcyC9nmQVzZP7DVSyx39P3v4kSEzlCLxY45JDj/dVLCYeI5Sqml8NgdPSdCmehCyZkUY6S3plAsUMntHx7Z9OHnmBER/PDvhNPwrEO8Bi97BykXMOrbIYSeEZM9SJsIWl1XrzzU+CBMoetULlAVOnsZ1vFKgyloAj50ptnYeLdca1CKJbJsMuIRxSymBYaYCtWFgtqJlzrIZ4VVatERxSrx8N36iOoARnOSg58Xdbt/ZKBqmf4kUSqnZXFQjde83K84EyxBmozQFRtdAUgc0Lflah/kELB0YYhJDCP/zpZ4f0dyu0IVeGzE16rfbgfjqSKkg2YnIiLhfu0Yx9KBrt8isgzojffEDgcmqmANnbjfDPSEk6yKOgkaRrEkkvHSURlKunMWbFo0lRs3RQufQ3Mlw7j1YWwt2E1yAa6EYMVd2edMG6mUa6Dv4u6RLLatiidqvMbT2hSljq0XEmLmIWj6QTXDHeT60IzsrRzOZzP8OoROWj6m6i/8lmvweBPHhuM1GskaTs3j9KvOkw0gmfBkV2+G8JLvsddq+tG8U3IA72KKeYqbRPqKcOErFJOlm3AHdKzsXJyUtz6SltpoLhMlhaENQzq8qJ701lHikiuCKxEwyxc6gk8PEKlAcqqHun+PYGZVTEK3tTYkSla/X+x2htg3VKo/BmLa1J2HERSuQTb6K69Oe2KHbQBs0pJVyod7TYHe02FjEuAg2EW7kmcwfwbhDLz7359/E4XjLO4T6mppkHl+yHUf5gSLnBRtSyKhSmLC9jLgX5MTTngUjOtYxj8e0V4AAP2/RMrKvxhHU/pPah8P6zyqDLq8qHcC14xlGshJIOai2GufI1DVcMm0ASRDuZ89AFldzHqM4nyjrq/XBIJT/p6xaxY95cGwcrixFg+jc5lHl0ilw73PIFMNknbibGYnhC0ucpHBkzLc2tlDeHS7oOpj7VNQ9XdY1ulV97SAyBUu+glwYoZr9CFZizeAExyUt3AnxyxliVAdqXT8gyIsi0D5X6c22HeTXgXlgRLMOIb9Z22ufJfxrdJuXDMIMCRnPEkOEqZkBhrdi6h0hfwknhaUJp7YLWFW6M60hLFg6M3w2nrexjJmGapp0cuLMGtGQw/H4mAI1OXZMAVIDg1jbYKYwYZF+2b4zfVREiDE66U2tvLejU+zYiOxCAdNOjHLxBhiR9m9PgFdT1bU1qP1xSeuoqofYoY+FjKF7g6lS1LRr3Oo9erPRnZcQuRkPQzmln+ty22X9dwJmlEFXF40aUxeyLcmdrw14GCMNOkX1COJaaqQlnxdIJFVYGqYj6hNSPwEa5JUZc+HKtNA282J/xVn/tTCP5tz84zvcKCNDYau4DxeMQXAftLgtHn+BvovZvLGX3OwjG/zXCODbtWG2jdHKdtG53qLRxwvznO+2Rvfm3Ficw/fcq+PzyKfjONw0X+ct9ZI4m5QAePHlBgWxU+55/xfhDoT7+DC1GiM68ub4/Ec7L720kQqAfuK/QEOpmHMFGsn7R1gy8S+M1t+3RRfS8ShgWvISM5Qb3oi4YwT28YWGvQCQkD5SOo0boqjFhSXaRAyS/PRSbj4MBnSvjpnGBJ13Ns0AYmoCCkQvlIAPXecpXRTWS6x6sYlxzwmzQ0/z+wKP5EoazrWdhIHTIIap+zF/0uYpDFehgC3qQBdz4uZDKDjJXbJSx7dAYAanTm1y4b7DPsnvmpA7rCxG6LJ/5m4QzPiPSRB7Xd1NTzS9zyCjrfXaphOZJ6jkytxfsdsLaLcJTvGOdD2bEAHOfsbW1ceDySA4avb6QS/FOR8bHBunN15VlrVLmWJMxpUiUqCJ2MtRqS25ag4yvgeMhwv3d+LMhK41zwG7hMapVKPhBW9hlSHjUhvE6C/JjMgnPt8RGdSPcmPWzy2WxTa4jFcdnYXEWNVtnVjBtU2+mT5712x7fHVymD0N5gLvG0CW8541J00ysVWQnvnCxIaFjeeeF/wh7+9ctrFmPJwbHFNfhtzYfDuBvNXjrpZhJxwzH59icRlBJ+RO+PJNQQXxmzzJD+nEKEgxZcF7VDLUv4MOj2OgJ9YSCJCoMp+tYMm1ZDOOhcdo5+b1jEy70UwgcT5vqFd9xwUeDvd0Lb1KDdUyIHfd407hPOvUC4LddeugzBKLg1Qy92deOEX6lLLJPQc29nh7bljrm/ZaxhT5GucPGp/0gEvlFEmCn6ebac22xPfLgDIbHsnvYV746piJD2NozaOclyQrbRvmVS7ap4Tg3ay9wp6mU+OUTdMFd72sRNtK6r/DobRXnUfM8HYvpunUvgAvsGGq6uVjaPNuG+/28CL/bLVVWre1JJZr5x6xbS8zOtgor5TStvgQOyuMN6KSIL4s7Hlb2JDBvO3rB1ezx2WIo98Z5o6MKF0JGpIf7nfIJ4TJAh/mllgWZV6SGR5+hbKG38Dr5R9f1vLZH/5C+JbNHUjb7eMuLxCGtxvdOQRLis3a3p8e0oi4Awoo2H+9cxrNaQ8s3MZ+n+yp0NnJd8XZxx5i/FisGANJsl2bGXBZtmTOwWNoA0kR55RkVpTN+HHZS9ajeNvQl0tSZZ3baHxFXc6KPFhhLupqcBHWNhimkcmI1TFwUdf67iRntF5rG9wttOthGEN+v/fMuRKOER+LriKkbs6RcyGzfUS3w05bUWFRR3TRLnexgdv+ygIRLKgPvvnGGZ3GbIu0mAXrMH0s3oGIul4ZrycoUavbtyX75hX14osQ5zfsi+ZHtFvPAwztQskUFembjAhYJcgkNxXyA6Mkk3DcLMvFj1NWoii5EShG1+42K7K5yYpqcD0/ljQGZja3nm8a3v3RLELRyBUj5+Fj0uSYZTLyJ5kYMv154X9H8LN8iI6LFR3KFoxRSxgRETqKWhDwXJx7hzeIxI0AIjRgl3qLYAIhRx0FvMNBZJSnC090SPw5mNJOj/FV/GdBJLAG0+qxCYdAK3pzz04isjC9k9VZhqYkVTSNRa6iaX+M6SoCAmFBWYiqGKGUvssRihIz50Zm8mjMSzxsw0ZSOBjIBUFc8PtFw6IRWOwPpNZ/lRpx/IhItB5p9cujh23sKM5Vg7wmMJ32Z0X0SmKi4mBpj568edMNF2Z8nkGKm6YUnndcnJAH55adJRL70KMvjKWhMYRPDDKe/YRBn6h6sIfneGehG3sE9iUTPi+CRv3keu0vzHHO9i9/udln9z6Q4tonEF2/Go9GZ/9wb/MdTL22F3lFFtfqPq/hqvzfE69YndI9L4xhrCvIvG5JbJZymMaF/RAhwag+b3mteJEcb8z/pry5ssioR+Xug142UtAz5so+2enqyoIiMDC0XPm/mYdKRzghM/q0vZ1bTge8Mi8UN+kHLvoGUD7xoLdb1EdUSE6T0kzOeu9tNIJzieqD6CvOqICpw6nekNrovUDtLsvWaM+CthPoegLLada3wqIOQGGfygbqQ+3xwtLa3F6CNahNtGpZTdkb4STCJ6rE0cxpGnEzO/SDFFZKQwVtrs6sM8nZGmFp4O13Uzjt3ErHWRj3FE7dPJUbSiljITKxXQMqNo2e7NhqISg3O+PSqEKxQzhyjqSknXI4qfVgVqlU5+bT5UQzS2mKSkGH3IcRDNVPo+EL2zQczITwyxjpEhl+KumHNiP58PIX5imai3bbJ28rLw7qYQP1GcCEQKtTyaKiCH9000H4o0lONuk0+1T3n5VSvd3GP2Qm2UsLRaGBkrmMyaXPJnJ4SBzkd9FYdN8NntpDKK5F1KZGRdhqMmaazG+E273hIasAbPCy3inIlgkpoqDSiz9e5B4nh6Sh8CdXR3Y/xswHH0pZQNSSxc7QQMZYETdE984qMjVAfCOA14Nx2DO9aodU78NT+dff6GqE76bBz+Xp7H//tho2HobInEqUO6qw5hq7424bh8LxGi1lQmyK2sZvJzAep6TbNK3D9CkSRzN1QOfhqf0CGMIpdJ5I4E/Y5m5vCYTlqZoh+9L7l09PwUFRY/wyII3KaZNTdEUsjYc7R2/rMnlbjznEgVTVOfYBVnbY2B4yDGOkNCYqZmpFbsZD2LxLRM1nyu1yJ2EzQ8S0sMXAWOBT/DOWbbAdFoR2AYXcrUSRtoOVoWN8PRWVNFU7oZZwbJKKUBIhkHlUnXCWGl1D8UWkjUsnCBxMDR+Eo2DBd0sEALiNURbY7oNm4w7osgnakHPaY1Sa3XBWAnwRhDx08nAhMbuTlEwf6cV6jtv3tW5p35g1cMLZxk0XbzE08iuXoWz/3lZ/60qGCthynacSvus3zVuHbx8nDeiSRTefTmU5fzN/oWbTpqHv0EoM9vkPj2h90Dp6Icu7L5FHi/UG4s/xECmHfFvJmGF8eSzeIGEoaU55NeeRL1L60rMKn9EojqDwjSbF73MnzFZswvb7sddGy9mkgD15EhYVa2ofRFzh0yU+RzetUkOGVpoYkCKXAkz7pd6KYwtGR4WX/Rw2Tu3cpcT0eDxDux/I1JLlhVH8TYBDbKis0kB6WpHO9ZejIgle8M29rrKcD5000afyXCsMD7KdzI476WbdC+HAXFOvmBUzl90wegC4MLLHNEy6FxVSzH7Dy7P+yiDHCGkSRuaVyd7063bUkz7qkl0ofO6ziqi6AgiyNbJQJnFln5hyAyVbKPjMbOlRnqHSlPESXXAewQXGyZXtm6iISLpE4IaiJaX6T0qaKeolSLAtyxP34bkpxXH+qe2k+xSrm4vc+1NsV8sfePGkgtdhFlVAuOuF0+ltDioOOfW5nx3DaBMuahDbRr1INnlFWyotA3pqejFrdnjTAHfjqSwZ91wOlgD48+g0BHQv7lKHFDAWajhbIhPUuYUm9bCeauRqJpbteFz1xWhmyp5FUe3g5DIU57qZcxP4fjV4pimQj/fK2JRI0csNP+RCNp6Ntk4PCYUFBJxlIOgLmIpWPTJUsjAXZEl8SwVuCGDmqhUWat0Ew5n5Uthp6OKunkDLn80bzxHAXXSco6KZTVLyFVBqc0OiHVDKenKMUqbKZkJHH4EHB0LejpkptrY697haxtYW3VdYyr7+5k4Ne1jXOW46w7zK5ruxzkRg9odwp9XOTLx2kAC/KMMlX2RfHjLKJTW0JAcrLtuBcH2pQVqh5ygW0wbiL5ZcUgfXgw3pTer+yRDMybU6NyNgtQxSVQriWoRrxTlh+NPPeOF1eKcpzykPgOldCf5pIC16N+N/E9Kt4/zh4JuY4yxMh3feQ/tWH9MTEU6fwhHXvZVgso/CW606dKWy10KUch73YVxS3CSwvShfWmcOdHiTCyjw/YeYjyvL76s3xrl0NiOUyIIkukr3YePnMZQu/Wa7V/NR/8hWrFv71KxNzLceM4gPmlANIWCAg/P8ozJHvhdtTSJJLUQWbZcIIJLRfJlXy9UShkH4aC8dyKXFnoIq8Krn/oDFbClVBklKzGRS5Q4buhBMlNfoCt9YA2DlG+Ub0WS7QF2lk6PLHsymDBDiCMkajfH82G3jSaP7Z0Ds8JNTnvJs9HczFICJXQVuz8xbAcAQWLsGblRCI9R2wSiFwjUmEsZJhaSFeC4J7HRTck80U97lOAgnyBvtk6Cggv519sHcuYRzLwoMhk1ZeYlFohBx+OE/iziYzwnV1jvQWKEzy/6ImEv6EEGf6CxoDlp4UwoIAyQM9x2Sv/ap+tPkrigFpx75pc65dF0GYHMt4vc0csHg4u6Ll7xiKmTcrc331OE1syLHkit1OEI5UWinlSOfo4Sb/A7mfVPHL0llHkARW61YzVhsHPZ3YPucEsApmhJGDeBDJ+CAMmNdJy4Wjnbu2Y6iu8TC7gLsslvhHE1Tntso5lXSgtb9fHN/1u3NMCwN8EsbIxKi5f1sPtWXs+RQUqNl8MubsVr/Vw45LpkUcHzPQ/NXFtOJg/a4RI2NkBCeybfVZqei8k2Ec41hJ6JkMTML7GcM8Tbj9ad2RtfqKIH/oE9za1IdWP6ycPCSBRBnT+BLGWMWL4FmIO2FjEo570EgkBVXA7AA4hEMwM7e/OmK/35Whu38fxhJWfbOY2/Ta5KP0hzGfw4g+lkyRISwQdpxBiN2OUMi5Ux8bZ8l36jcSxAElmxnfBzr8dvld6LsujPT2aRAFxg0l3iyBm/tQwJZdIrBDD69L8+pJCFBnXdJku4sMA2NkOj3KF2L9YkhA0j8GlHUPtucVqa7x0IVjIuSAXpL6aKnX4PdZTws4Y5k1fTPYEe3k26Z6cPt3d3O0ED49MN8yTjtRr6ifkrtMShikQALSsHas4u8YMJNGiDgrNBT0qTqx3yniKM7m1Gqg3YAmi3SOvRA+eK5oofH3VX4Rj7NlN+rSDOgppq3rB7yANIjiE3nq12L2FUeQtP6qzOnxQFNBA0ZNzaIH5514uEucQV97igjbd8YBfcyYjUsQbvvHViYT7gE+aF98R6Bj9znjSXT5nAZZHZD50TDLMrQZvT99woCwg2z4BSNvCPmqFWVLnLQ1DsSuLE3+/DWxLwe2jc+UZFalAXRD7LauFrpTboYhZi2QrEEKwfRLe8bl9o5HbppbZylz37yanGzHIgh9hLUdvWTmyR08jAuuejQ6ZjsEr8JPNlE2tib2JhfRjr76FrshadWLFAURgNYDeaXw37e3GwYuT3bqI58qWDVRxsKWEULXhKyeGP2Na+EX6x/iYfui1n3Pwutz5QRdoe80lZKc95GPz+hR5WSj0ko4ruOo8C6FxpqmQze1/BVvN7dmtLkzQhPd4++dHk59yx5eSehHQNrA6P8NaqdDJXXVD93kHz/6OhZjCFgEB1zyXCIKYFHydTYhyz/Z8SgigYM8/aU7YDQ6Bo8jlLtoHmE/U4uAt7swkP4c9uNDPYhDH4oAEqb+A1N62FQqjRzPjgmQwPbCODjkp3STWuEdNCyfp03boaV8b6iXzCBwoc4t96dMffqGGbWXEPaT5EM5MrU/AhcUllH1xhpxxRAiRfyePxJpwNEvQtHGTmGGdZGA8AnwkAqMyAlR4Ppi1npreetIW7lwRvicKSzWJgYaCkq27D6eSzSZilwvTiXjJXtoyLKzNf976Pu7O9fpBZ7+LMTJtLcw7N34erJTtUUcPKHbtbAePQoALvLNBYatbbE+4p3fxUEiYWxgUZpRwagOa2mXy8Cl1LBuyoaHwLCAIk1SwLEjLJE0gr2RHEtpX+snSFkG0f/iEHSLSoqJQdqTHoI65DKna8kitIA+adiMXU75b0dOOecQI22G1Vu5cJFWkXOZ90mRl+vDAlkQ4goByQ2SFPnGObY18KjaTzz4K1BoAcJFvn41I2YrQV4qq+0pFxvGObK3yq91ZSd9hICOI4NBLTnsVxjiGnonTaWpZ84XMB2LNH7vkg+IgnNoZVcX3kqhasUz44+LjzUUkif9edB2w39OvUUd3H5KVhvFGj5nlbk8YQd/YQOu2PgKyBXXMesRuDonj7hKX5t1OItvpDrz7//YuQAQGBN0EAVZeajdloGwul+aKAN5dCDgQsJzyE2NTMjmdFyJ5UKIyQTrnWVz3HQo166mRFrbWLsytezgoJE1dH8nKPNYkJnlBVSHJou82AkvgpGRHc28yyxUwmjLqi5JjGdGK0Osd7As9Od+PIovxm68EUru7i+BlrcRBNy+dKtHYtG1MiQk0GNvVigjz0JNYBqLHTvgkFTgNbpGd2SG6BYmog9pZyEDDBhKh02EvN+P9xGrtRmA8AvrZXn7ApfECdNQyk5f1+Sj6BiK+EXJRsIU0GnhLe3Wcl2grMEHT+fOXb1mPki4NMQUTuALJwfr19ZTDtswy0KG2eHdtwbYZWGVeUEKfuhQpPQ9b1Bh6610wTOe2wCmCl1YZXEkWxFrDgv2FAoVcr4AatFQlMvWnAevzfCGieN01i+muDbP6JHordm+iOX3vHkCRwdLWAW2aldZF8ih8OgGiE6U0xxwtht+BFXIoI4LbgUcBnoGaZtsNc6kB5QEwJSJE0yb8hOWhY2N60adAnzhG68YGBOuZog7zamxVU3xLRbKilhzIUrAe1J1lYXyYuDuLIfxa0NbB0Iuu2fHKAX5HLBaeSvruJ3u6KdfN9jWPeYhsbBWjfdTHzZBawQ4FthvMgxLBl7diFGIald11E4zsPmwncliVFkNNe/2uN04qMb7PklN0fENKDSISlCTzN9q5pbN+XRc2lwmlO1rUw/WkIWsosdVaPWexlQBoWGWwiErMOFRLnO1Ax9QR1NhTbzMxVpSOrj1uDBC1sw/BiCnfwViDIuD5GndnSpmBSHl6Ee7XHT7BlYK1KrNYcyN6oJP1NOxZlUeLINXilGAr+wInSjhbMNceMkrYZP4XsxMbAyiyUpLEuiDsmFDgwiC1FMcEsiYwEzaqVScawm4k8RqMKdvBXi/GeebAKD7kZDN1jr0wFDl4EOxL1qqZivK7Pk/gVLJAzbSBKgDqyyxzberWTNnl2zvp6zTwcmtwYjoaU1ReKxARpMNJ4o8ary9DMhWx0VwZPxuYEipVipn/HiWJ/O6jDtcU0pjLiAdXjdsnkGix2VK0QhU7y2hPvgXbZNvCcoSLS7cWT0V24h3TjlV3tNbFdXwei0mQTTFaEqgNDrQK2P3BQlG4+pPQ2JNWrnauDlt9nW9jTQiMbTtsKxgl7oBh0tCDR3SgP/Bk2068vwjEOzoUc4zrWc2oLrTjaVr1JamOqY41MZoTjOvHuh4fjKKz4FUB6E48ktloq5BT2wC3F+HPI9dGmBakya0QWkNuI4FOJYCMXN8RcUMTQFkUGGQjnaV0WNt8maRHDfhPK4v961oNR/8cHuz3DG2VoxzsVCykV3AUxSix8/q9FXjVWGQaqQjlRapuyaOD2Gf6joJaY4mZBL1Zsa/f6pP8uc/URgIspWpydt03RlEL7oiLY4GJttSgFvwQyMbMQRQ/yFtuDu0GhCe5RM7C7jAKCTQ3Vfw6RteupekojRBvbXTsMQnp1DMcMi85ExFoNTCeoGf8j9imgQsD8xj76yi9gdpFTuiY7oiYjfDpd2WUz/JlfW1I5MLY8WJFr/e20Zhsele0SNMJFJL7rBXdQefUKcuY4x+nfRJf17Hd78WPj+eO8MHzmDfEEu6XLrYQyTudUzzv2edDYO7AEqRqA+kLp77niWapBbQt6YjuqLJ3R3eMbDXGfjvXDBB8J9EPbYJ0fXVopGwaNazaFJqUovIpRUNycTGr805P6usapc/jh1j8BZDZo/uwWjMzBtuYT6d4FublW5Z+lrrC4OkuALZLKHUHV8/sYUjokzrpOunsAawHWYjbuZNeV3bTDS3GUlGRc/r6sVdAqXTx7XGfGJ3ZwWurljBxLHJ0ggaftNhHJTP1rb/RkfyaZS6YtI+R8ySIld/Y2Gup6gKXqh8r+6GGkil1y71jv1AGj8hVT6QzFphFXANM8PCmyGGG3RUVjaMq3OHUR867m7OJQ1RDqySYVqZLykIg4x4a39eQiuVFHb7NGH12yJUgr079DP7sSQlWOq7cRNsXzUVsOgVCySxmqg+jr/VUA0wxZm9v3Y5tDg3oOi6CN08K4tp6s5kdKxBzEdJtHDzkPut3ASPxdhTvpmKRPTOmkwXFZpQOrKUIczDWQXN0c/SdQLEqB4bN7noGyjJXMjeSWC4YTgm6An4cqptZ60DCdDmvM2PzGJm97fvDCBsc4orvlVHm2oWO1tYHP4eZjA07J9dBkR12Fsz7I1WMQulQlZEE4vJ4DdIihxPviaRftelIx9z7np2YMdI9nyAb2huVj0u6WtgCnmqXCU2+VwVFXF4i0T2+nxh+pND9hqrbGzO01SYGqlwXB7aEqIktgARabQkU3R8crh0bQd5D5chtH6VzdH0tcANcus5O271YF6nTNoZOrxha0cmZoTrO4S2hvDS1/LTLc2jA9Y7GaXJDZMZW4KH99TmrqXJdX0HCjWBxPwG2gROhijuyDDIsnDIQ5Q5Z8FVA+JUBLneehCWVSn3xma1Anr4nEC73cZRuM0mxla2yRBUjx/hzUscSu0Pxqsk5QzPtVTI7iYzpoKx3nbkpe1riTOv8gg6hU3LgtPVpf81n1/BvNW20VaqoY+G1IVrtknUS29suUd7f4c0lg8CmDFqBVj3mO8EQlsMT9W50kJfG6zOKtRh82RpTbJ+aUncTcWOSaScEWWyOhjOch0rJOModfbiQrE9RlVmPYtc4KwtPMAehODKxU5UKncVeaGBOl5CnC4fyCOKnJD/qjWFjQuyvKni7k6S/lyK6/eG4ZEWwn262ctx38ALJa340+aLHXZHjw/povmB/zgleYoYCZ7OGkRCaWXxV8HdNSoYcPycnaySXlc3YPmPCdyE6JRgh7pQ3hA8Kl5DgsHjhXMt0eZ2l9YJwNuMSWNLr1Dge5fpcgqCiMTAcGUMKcS7SFnHmmh7UhD476J6kY4FFFMLHOVHRIibZtczedwXRe9JamrlnSUUsCtfQUGdGm9ac6PtFZHtuh9xWe0cAHLMzm2iYE8s050H3QCJ3r7mLu/TYpOZIB1wy0PuiYSrSfcSLDl5RcmhJ5wCxnBhGWtOKntAyORZmFY2PaExYHZAIPPH0z7yTl/lrUdf8q8z+ujDcvzT97mRQIsLDrc1+LyVZAbwigG2sIi89+cb1drHONa52pnuSRxAZbWR9VSHJsnDHB3weEQXkvaeSN1O3EqJE30On7g/Mn1g6oVgPerpu0P0NXv/QPx7BwQq6yVdv3xEkT2tBHUqByZLcVEGxM6VWtG/kJywvSaTJ1aCHzvRbLfQgQHRZ4qJzFxT4os90KSYhZrJ2h/vls3OCfcjvLLWDQVIc0jygydshjJMZ49xsqfEJHqA8jQM3fObPFJuI/7z9aSSUeJDFokWzvd70FAnMfNCdDRilf+O5i1uB0SLQmZgZ9osr4lyGqYiVGjMeP/lr1W+AMPDiUKryN2IfUmO9Wle7VMR79gczlKG9HIbuuQ1+hgtCQ2io1xHlQEU0mwFykInRyjZ3g+ACQzWoxmiA24HfhNmkpx7yB0xNFwS7N35FK9tRygQiRSkcMKAJBq4ELfGDThJCVoDnXhwJNkKOWQHeRuYd4rkUcLHSWTMOuuE7n0txIbil1O7ixy/Zu7bHeAAvKvTqBNxVdZEdymOEy2dY5Mhy22bctuUwznNhFEzJ6q8IQJK04+AzEyxNmD0X1ORw3dNuhz8wWqbfUXSS77UtiCGdOsLXwkiMNv0/kDeFEeNoE2yhD712bzuCM3TzIp1Ax6B1+EUmTO+T1dgWYnG5J8yfOyChAsK+zodT4xwN0ZhrFPlaEjeuqkxC+13w+HNxu9Tuz9t8qmEesae0aA8SoP3PKyKEhYVT7gtXQkis1/a88C7uxhkkz9r4JLiL08ZH5mT+F5wr1zPbjDufOffoWXwuKiH8WVFNUioXb62rqZ9zHZnE1lYkdEXy/g7vlcsHlBdRwDu5N4an45UXjWqUoN5fw+3TYZCHFMY0FEnmYi2MsrBrlsFcKNaY7L0OdEM8qVlj1jH5YkgvQCvXLivvyWlRtYr+5hB8I5qCx/Iwk4EPJDI3vhESbV0VzaW7jd7xy3X0i/Zd3HpYAf2WbmV4Oh7/ojpM+nquG8VPQ+tqZ5j73kGnLQSNGbi7JQDEWsNfg50rKr/6eq0k3D9vFBybO37ZOWdQcw1qBqgNgRPnx+Tdr8MRZo75dX4mAfoLe8OddhsFmYnPmdS4Xp8M060i5r6NeX4xjRIgK6k/i8yZlI8Tmt4NMS5UrVdJozHm2LwsBqrZKq89dD+4EDV1VuGJJNkJ7XLBYqNItYiM2Cqgwr6xU9GwiYMkN6509FPoll5za34PcAyku7tkF1brsyL0uPbT2RrDRksK3WmVlUHdo2l71F3lqblTnvuVknQwvo8NAc4jmZAx4pUuNtFiOhmUU2zPwbBe+QtA4HhQIkWGT0Z1qs1eRudOuaHc61+Gb5jUuYdQrm31I7iyV3nLaVjYkt54kbLFk22tQgGwYBsvdsmBxYj3KFBze9V17ZKpQE19hxDRX78nUY/ukchRdI9D5YyLLFIRJPTStcdPVjSdK6XdGwIIbrNUXk9JIb85kvVVG75polg+owtP3IV6s4qRC7nGOBdiuzGzXzylOyjBzGJMIBQBIwu479sbX3ggj17W39GQZ5svrU92Ch3/yZzMLbwjaoRtmFFNLjDwchV3L5VCM6djkMQsWY4rE3DWC8YD8wPyY1WsOlom2z1i+TrEluJur6uT7x2rBaQvsIvaczsTfOqHUv169G1YXa0+b4d5turxKxz9nKT9KPqGwd/LlzXf50hyEv7QcNa97B3uEfLLy2Pdb+/w2OIpKJs+WR7jCsR0Gc+btk2sDlebXNf/Ka66gvDheLhf/9PcWx8vRx2L2L5NJ5nI26njG/Iij7qXeqTXWcr8Xorr0zed7tgyVtESSzK2Y1Gxs6khDYhKPfAkbydxkWu32xSXcHHZRExuaTAGzsv+hCRfw6XAVlEjvxvN0trna97ZigCpv6ZyP3CxVKF2nEA5pQt14Wri8d5x93bZWevkVxPE45Yv6qaOUFLKJpOJtTkPiECkgUnzrinzM8rAaX7kHeUE01KrSxfxJxbfrMy81hZjBVzTAucyMvgZzPEIJTEvFBhxS8ImoKJbyOr9U+KnrjCySFBIg3n8AjcuIzYcvewWDbOTnmXBFQuCDZwIXuKCVKH3XLaodcnCFVqTJiMPFRZCZr5GJEdf7AgspTwuUBkVoKYHVDZodfgg9qOo3o31mDnBnJrn1ofZYAIthsH29Gh9C2MbIn3PqLFmGIQzrS3pE2cCksHiumrvA72IBpV3u41V6pQ56IgeGigdVawZ5ItOyqpVn8e2sf8txTK1OuRZE2nA2H5j8dCVtK6C5qEdStMURv7CsyvbxwP40iv/8lKY9dLBGInJRT8hfPpB94l06+kZUHg4xmMeuQJIOtatMiCeZ8/Qz6r1Uh6+ATrn1L7fsjBKcg0CTD52e3Fed4oHE2PSX18WrYkRwonvH5xHjY1eUsnJNm0HrlcjT8ERbjNUojkxQQzbHC4axLDfIe0RV31hnP0lwXy/vekZQvG+aFqc609cmjIQE2pflVw6ebTpJS4xKUxgydwgeWLzs5vhTi5BcoLyy7D8Iw5/SoSwWInVErE994OmqkxWofS+cejk+IjAQoCClNGYPDxddWZWnTv1jWbt5uCjyLhkqg2Tg4M7HNFJMtmuQUmuyJI46JPFqBH3rKWEsjPInqWxspb0ywotnhK4Z/gjJ8UReB9YH9Haz3KFtX/zTvayCC1WSkyLEzM2P8biucxeZdS2txtodQ2nfITAdrKtfas36PrFFRww6XE23U7yAhysHHeyXnFeouBsmx/ES7OMqZBrYUUhtkBT0GE06XqpDGFjLLS9VWsdn3A+HDNgbYeVhDgswagKx69fO5Vjkdn6VVuOZd+UL1QQHVRidIA5tDgzr7NNznLDnN/H0WIBP3jhU6N4SFwztBRHhS/uSGZXyR91mI04rtBckh7Wily5HTTF3lCG2yTEsPI99Ce4XyVLZbbAkXPtwrYGwXM8aR1i6Un6IrAa1eel1UQ92t3UMd3CH2zoJpUtqIvZFxpEPwae9igpPnK5AuAxatM5gydVIw+G6Ozj+xzOeKZRFTzKbDnh+4OVrC6wGeodrgG2ErCSA0QBc5s5MA/W4OCBmCjuUNx/iWzMpLY9SyAz14uxRraM1zDbR3XEHNYs+xQeQtz0Qr4FoRwtvWTka3dnLGNMi/ReYDWdG8ApR/meHNyLGVBJyA4FoU3Xa/JAE71mkjBbKPzWirEJ4C3ifS9CKfbiEiweu+cjQnoC+UgUeaDaHELkOFMmUORzgZfbLbp87XQ0CBEt0pkFfehJ5qA7wYKepAxfTzX5+2asDz/m53pB9wYMPrwUU/uLJjIhPlMLQbYkr7dXAUuT/uQhuJbmDZurfl+N6vbVlS3tH3WD7KZL2zAjPU8pS4RMv8/JVy9y3gP3Kw44EwMLQun1h2QIvlCbLBKslTTwxXXhQDmmE28vQmLE8rDf+SrUX4+urWREqVeVacrbq6eaBHvVxnf+4zmxj5Y5PvKPbB7UgT1dA2bmM4U35C/HKOetGIoT7MSQYLfEmbbXtRsa2LboZYyVJw5tbu6rxc68Y51Y8My52faCQvp7zX4YyMjzK/XtGh/U6J4lKfSAHaUIklMIn/eOJmr7Hu4XqH0V1qvVDaN4EQQWPoGL5fe/9/ci29fVHSt9EtsH5CWl5Y9VsAweZHLjLwwm1LzYXUjaP14pKATuxZcM5eV5Kv44hpc7rwuyDHLxXVcE6A/gsk+b7Te9Z2KyO+oe18uzhg4KdZGhzWDl7L1RYwXdzcDhFXt2LcVYHYEBd8S5rQT9jy31E2ZiLafe9PEGboo5Zq6fneWmM3wFlMx19bXns7x2RpYQynYwdfrkRCsEQkNnFrNXrU9+GY9h5fQqa0JvcjBEmP6KlAgfDigRuM3m54K3QsqmX+/aWUor4NYTjSgf23oNpB5xhYu5SCpzX/jAzg6q87cD/TU1hPruFHKOg6/KRcegiPxg9IYPhMgcxlkOXbw4Vl2QK/on4H45X/JVUcVazRAbWyPhoRz81qp3cPyzOoimympWk7DK+DT2ehp6dq6b3UEslZdvZAR8ldF5j3ZQ3nI2j0cpqsWOboRsgb7QObjU9dJv9mKCSQ85urdkbLOIouBWszgpRJ6expj+FXmngG9XjbmYvhgOEhJMWHOly3k1VLVNV/8S/odUF/ONxOnFuJdUsamrQniG5GKutego9zauWLOhbOdqb9xKpqYROMK6ZGPJrWoaOiPyoyqbdknohYrUUA7eZaZEIJwqTb1iY1kpK9mhTI1ob9GgVI1dr6gBC6/5Ry/5xy+O3y13vPug1Bf30gr8lEHaOAsEgTpvAX2GyGopyon+LdVUhpqO1s+KPawZYEKzsT4VNHgdj/eDINH6rddICCE11QpOnPxWGij7wne2p+glXV2bOMVN3Z1ZcavlXgllQb65Zd0ymEiKo/pEa9Ih3WyZkDx5wG+KQXRq1T+r32nl/ePC2hlHxRD6UzmMFdLJvROhAla+eoboc1aLwdLJiqyhsZFoWzyixVtBKEpN6ippvIvNE6R9WccodrxLoqR7fiBXSXLdzzZWRhOMPrnQxabgSNwetPZcQr6Cd01ro6VbbgUFX9an63u+dZT0oCZPn1HQQkPZ+Ypy3UupN5Cy0SyKACaCd86/jA9C9XwMJ17iEyCpKadL+ItFlrLTypdTb6Qdo8/77Vlyr2gH7ZTGAz+aqzy5DLv55xp9HhqH9UH5+sE0vT329Ef+zEjENBmmhaQ0ByIWLGD5jI1pLKsOeYZwm18ZPhikCif7NOebXz8t7SspgVupY3C74AWg+Nj7kNuVn4NTjMhQb310pWzt/JPhQFlv/3alu72I+/ZwItAfHrPcRrAOWCbenqC5waknLkaDdom8GhUWNLYMBYhQc7qh06fCVQ8FsmJDegQyOPzrB4mu2UHBdhZ1dwy/JbZAYxmgLOfIG8t+hEZWigfdlSeLmHqhuLU5iYevfnaBIcePJknp9kMWN/+udGMmBKP+ELklxuKPt8m9pGKEDnk0pl4WLrsexCAcfqPNKPnhgQO39G8RHiqzsnytyDEIEAqtwUvZVJK1pfFSXtOceJuD2KZM45CYsAj7nVcsaXvZKAw1P1p7u+hnQzFCtXZg8fH8aOe4/p34IO7+sjKF/X9hc2qW+I/3hlt4/yPQFsqlc4VNWm1xUmuPhspPHFzApYb+2O+3VShRms/u/Ok9S9OeKSefm73dfjV7tH9TxMTeiaekM4pPJ8sjjEWbCANwpDOlV1adFHNJYFwI/maHRFJbOMU4vg940xWekB04tX/h7Z1XQJN3EMf9n0oYBc1svkQpksGPDhJJ8yE7pDxkwxCzPwpEhQsdUCXWJLsRGliMxdDOwT5qr8JhUNIc4mBXm88bKDmerohHJ4Wx1XBe5M2jaOHCxeDdWkWMZxHHl7fD0OQPawcuGU9hK8NuB/CrML8NjPHDfDxCmCXyeXtxQYDkdb2FWZpfbiyvFYdIZKi1LBNS8fbmUFiZpI36dbyqwh1DnCurcMPn9OWpxMzqU/1ot5ER6xQ34eqBgVSf24bGQrNBxFqxwc5v02Idos9VxXj2KlOYWzQ9CO8gxoYM6XazvwLUKU5R/e6N0rRM5HjB1eQEyoFDdO6KIOUyWjvMfob0ldCidJnu6BYjmFk3YDZZrmuTj/uGOopmIAzpbZFDHzVVB9p94OctR63IrcriTiKfYygApgp0NTeuuVtbEOFYWwSHpEs7WzpENbG5cQIEASe+/eGXlC4OSzwWSbJUA+GBKVxfPViDVMHM7iUceJSu6qRXIHAxhpnvEaZoeyfGaLOq/b51ddCTtua6P03C15nw4JmVdnvwqeMMo5ZF2Au4DW5XFEhBlHNTjriv7HZC+JjwbtR7z7g+bv8qIyY6zz2IriZ4JB0r3ZGHOVbs7wFjeeicOxdkbHEtYOGAe7mEIHCdh/Eh1akvVreEBx586tKOheg1OI0djwqJM6miurF3kAsAfiq06QyLRPHnP27QegNqpQ9mS1w84v/GsOzaVtMYDRlvBKLvI8Ey2n7eO+OCKFjjiimocIgA5hxFjlUoGHoLy4tRPxkh5qEqqMOKW3SYNUbhEk3tPJMq8PwePEOGunP2Fo0DCkIwuCAoo99zTL5JI7x+f8XI73kArKszo3gNQWt2r2ERhYv2QUzka3+VKutFKwjfFVpn7r9jpk2Xw6XD0ywE5+VgTe7Wq3EmrCZIlSm4uS3H7eEhfX67IUbR2R/Y4rITQIYyLTzQUGfeEV2AmOgs5Tj6iDJ2Mnn7aI71qiEHqwK2LkkB2pqIPclt5iguFsqU+Zk0Pb33C5GXKETTLCF55DsF18iK/LThDBg315OfxYTvNJZltE5bHvervfRI7Fn8DcIxskXMvkGFAqAyTTIXhMNih9r6tfIgnSToHfwjj/Dt/TUxifAdzFJvI0DiZxW2MkeIbmkUWwp7Kxzu9OO/kVHcwcEx0kTjL80tYAorDwfPMrPEe2ZxXl8sCDM1kHGVrtLL6d3e1lFKV8n2FQg8t7qtezFax8DdXffFRJ58ZOwiosGnZvo7zs9O6cWHNlkkGts5NVObky5XkfGCKeHN4iaHXATiwIfXy7qAFT/eJc/NsajHOjaA1hz20GcErdFVU6jao3AV0nLTx4hxj3UvwwBtb6dq7aIwoj4zzrTUZKgveyWTDSBbXpTjMolkJ1bu5hoWiCJoTWmNp9iWufS+IJ+2vibgk66vFAVqnBWfc4tXX8eo8Fxf+NVeUY9jCoq8maiYVBzvkiAIC8VWmkDv2Tc2fs2bYVmR+WDi81hoc9Rovgp1eA2+eGB5Cw7PbHLo8pf7UfjZn1mvthwoKKRpuUahIz+gx9gp381S3wbTKe05V6PrsqI4G5O5V0KaKKwKFEiJj7QRtQ7Ci7UcEPanMf6arYvEER6fsO/T463HyIBLtQ/ylTPHxmjSXK1llvCmsxk8cN7/IYMv0xfNlMwXTisveqWIUsv5HkZDKnsrnEFVx4Grulky+XYd3NoT+aFhzTUGGj0C8F2GoQX9GJv71EpBSR4CneHTt2vM6kqg4QxM3dH7BdjvctEHz81UWpMPUdrHgpqpUG7q21Qu1udT3iPXdJprCNkVp91d9eCrFiOlKZlJxeroFWLgaKf85zAx3JU+K4VJTKes4YTU2ihL2j2kzD+WdLemw2ESrD/+nX1zOK8fP/LKHZlcosPld/bt/CMudDZ7eSZnwgt8oMV6Mt4+RYM99wnM2n61DfW962yeHCXDrXjKFs2oeKe2eZRUZp8Yqy6Gt/RlRkRe8VnXQlk6mhx0dU3OhWjwf828QqdTyQEDFLmhIHoWNy5w4n/x9YFVYgp5TRkmkX9h2uvKLRPiMj3I7oEgjDiv9dqfEmW7l56bsD7EPDzoTA1PPDaO5YM1KQVghgV0eMe0yYdDeLEJhvN7SLbzxYyluoQnSZr3zBmbuC1eyv0uHK52rixaxXh7xDbmZp5JJIzuC7mJ+NqX2tke0/Qhe8UHON+OIRI+VVdmPazLKYr5y/jo8Qgz3ZLwF+kL+Z6MYdNIHkthNPwJ31TRmT8xOhmt4+Z2DKvgYr2uQRHh2wrXWRAAhliCwP454uEmo02+90K1cHwWZjejFtxcAGvAYzmTLxt6bldnPDOhcmeyuKoBb8+9nNs1ZbQ4gNn3j4r2tlbJ0u/2aFyw+/KrtQMXnV/2rd+umyX9hge8199+nYw3lDfgitKZeJEt0MXrUixiZuWRZcqq/xJ7JrXL6ZFy6XNhrZGDn7Ju7qHhlP9FOr3UrmDiqEhKe7AG6xaH/mlmBth2k9bsfExCFpu5ncONbdeuRmTh6qLwY0TYJ9CIZTKjfgF9LllY+JSsDjvAci4d/MkmzlJ3fQHEncexdESH+0UUoILnkaE4jBoXcllXjIvJshRh4szPGFQ8k6hnTWEvO4iybboKI+ZXvimlU8daD67cYMvqYpZm8p1eN+1onzw9GAARIASNz9mL3c2ISW1GXf+41ruhYs4Uw/zGGEhAXJXrVOtjpi2Fe9BeyiHXzbqpwVsiXLZGhDGneNrV3O7XtJYHq3PKvL+P1BN/ZJ2HqDgyL1BkZN+PDXhrxRe1jL+Yv18FItrjfhcXj5wpiosjJJeBMUYc6v+AKxx4os1ZZkPLjCEqvBUjrxeuutQp9iXsOqqFV02BU+bf3QXlP8heOGty2EWwzn+BJUQXMx8fFIjaooRnlfVkTRmWOstpjIelvueBXvdWUxZphCP5BTp8CyeClxEfJshwuonnRDDy2EkgjSUwHXEsd3fEz7EUQYSpDhYOmPeUpM1Dln1Y/k5/ZPaYRO4wH+dKspbiVOtYHky9zMcxE8dzyaltCd2nKwIezY60w41I7KzlagOO1NRiR7PCa9JYI0dp5qAeLobsgQSbXj0QX+4wF4kzqpIObZtKEpjimLZNPnlCKguK05UzHOqcuJlXyxNjPM1qkytlAYEycozGINtWoYeGucFQM1MU+XHefpmaTiDJ00EUFRRpA8i0Jozj1UDJ9qBhdhsOgb8H7X9MgTonu7bnepv0L4tscbtxCTZwejKLyrfqYXQS5CDWqwtKs05QUZrqnTzxu0N6W8qYaVuLg82UY+o3HaH1BYHxM2ZclmfrwgTkLThG1QELadOka89ci5tVvjmhpXRFltqJiALlY0OGqIEJa+V5CKYNVR/Y4VmL5Kj9ueMWowQ+M4Qcq0kOqm7O2udyvG0Ilg2AqENspkwNEltqwNgXlqMRxLEImYsH4Hq1r6UWEMXrWoMqH1cAPNVhzlTse7PzRv1xytVqWuG7q2PNLN1sfqxunwH5oytdWp4LIwtkPNBCFSXmiMlpA/5Tom1udYX17CWrS3+T++KVPcKwYfumevZAPwqEtXeGGnHmCbtxT00aJ379t/zg10YWdr0p+sLRJ3gCGbSFPXyT8GaeMGcghnRK2moghSLsBUs3cG3aJ2uHd80t9DR9tV+2EEyXoNrfH0nq0CRElJ32nKhjOuGSg1/DnAV+bI7DKRCnHzITLb6BQq0Ceq7tQ7pSqlF/CzvZtnE/qrM3p29lomTJPLTZpzBFVdfVpcc8xYzLYPJbqr6bAekgK0nUhiPOQx7/+yQCyXGnljhsarVHNfc5PENt3NSgCbBAme3IvWBZYn+K0fcOY0KcAvcX9lPs5NKXbUowuQeJcxCdIcmyW8U6c6se3xJSZke2A7WJMAFafk6Rc2J5qCp3b73LSI2mG1MNGKidkOguSYvcdZLvwsWu3C4JelDFmWLV26q9wllQppB1rOssDcgKTQx5Xopw9WHZc4+4CWucmW9+a4GBbjqQu80Ec7PchOCl1kAGKofBgjiN2G1bT6kPt57Yf+q06wsZqeUyGxINeArHLfXB5MXYCpb8aKkTMNRFebSrT9GPQBcsY13yPc3iYBg1B7BgzkIj1LjwdbzAzmIW1srj32e0KVzk+GK8TDAI8W9FGDuqINzNg9Ne3gvFQg/19K9lT2Nl6ad5HD5Zv34tstMC9gEsm0tN8bnxTFyw1txvxC1skXZK8GIdtOnskgOiObU8he0vWGTkHX953FEIhc0gADf+87lf6CPHNTMned2pnJTSD/Dkk2B0mlP9ax0Fm03UlnNUmMJBrREhGu8yEcf+Ug/94kGRdIV/xBNJlGgwb6UgQfIWVB528K7f5IQOqpZXBm39ChO2fvgW9sGa2abyaVxNzcp0pmExGUl3g+XT67uB1zuU+idIa7ya4BecTMrbqc48rVgtzR6pnwbfalNeZS3fwAu66HA7FhrEhfQQl1PZrs63jcX8JZ+zWGHkz12IZekHsALYCJWdnywdLatKLMwJs98E8Muwo6U15wuPeTTbrGQaP22N41uO0gbKpFs+pX5JK33QRuY2l71byca487s9Pdez0Af+0aMsEo7ejhBUXPgLBw3ywFN0Fo6tQ0s+hHenWsX2yC9vNJEo3LSKiaJ+innLrsoXZh1/pRP7zVFn8BuapFxgkkbNPyWLWDNIpaqph67mDyZ4yo9+8zhr1vZTKjxHQYZC/Z4Sy0F3aw0C7/PvqBiZouqU7Xw3DsxlhOSb56yvR5j7cvJffsJ8xxcu1UJ1/7V9metFz8rvpyCF55paGIBefCfudIW7szzhFCl8hvccoACeTE0bZsP/piK7FYycPfarFdTMRNRDXliwkN5/AwIi8nMeLFPnYRoED1GhpbM9Jf2xTXBUHcaOSPcOixsxmCwFW5OqksT7pJ+7MkUMR8Yx7pRMiSWWBCa1/yYE+4Kx5qAU+8l7bU+QCHVMOF24YPr8PrlMF7WEpSYj5eR+ygCo/URZFrRfK7HcyI9Ewur75vXlw5oZsNeFw1QfreXsh6ny7PTnzNO5YvuyuDL0gkkOFrkLM5AxaTMdV5NOcNXnrournYv1rlxA8LIodJypO5Kz8RXVrakh+cUhB+F57bFAqmaH1ImW7lw8n1XMmvDdr/38x2i1kcO81Y9xpmJO1e8UMe03v4aSB63pf7w2XVroJKA37Lm2/NPpAHo6VDh9q1K49FVlrr4R1hIAgnl+L37k/0IzCpu/2xUgCpr2Q8HzZpEKRZ7KjMcBOa3OFI96NAKHU1+Q2IeE0GD4Pc9bALbVxffjfiyJ3/pne9+/pgvQJ5koI64LWRqn1YXjZJjI7t+hTmyz6xDxUXFpPk5EGVFZLnwN+cBv8CUUVN0fBojxaWZXkxaqdjNFvSL4zTstajv7q1Md7+gZ8SBHuQUuT/KofYyUTBvijSueHyMbIWdKSvZNicgcyGTdoJtnBQlC117L693oqmn3iCcVMe1W8aCG1mIYti2/F91GrSrv8TYcYN5NycUign0p3tZPtiIddDHhoJu707u60CDrMQawOVc4NrrNh1Q7JOYzzkzXY/oZ4a6iuOtbcuLDfYg3PiTEsCOL5/auveU3dnBAKv16uZR++LNmPefkDdxmg2+obx2dLbBYErrC8k2XCiQ3cNxlp4Tp7vuqq5qk5b8Vl1372dhiT7MQE0zGoOX1Hx5uLijAezSOCD+vOtAcM34LRyDsO4u325meCeMzs/LtdsTMIa8c2EfMnMlEKosNtQZPnfQ6JPwtmMmKHDlCcHDeiwQrc5x58V12JTZnwhNO6I0DX/L5oFG82VQN7ek37wO/p/rHtj3wvxu50mrmBpFlnYOcxG4wI5WpEk5xSKejqVscfeXR/ed1N5l+AQG+YXLJpfqUckg3r7h+Mulcto0mhprGQRAsaaTun3eF/nskfK6kgQYdul9hwfrX1clPW+PMubF1ip3Ex046mmEfKeETr8LRG+fgnCutpeMl9sgbcTxhfnYkcowwY3cJso5Eq0xzyuTQMuMuX2dRF7ukK+284YaZ2ijI2Wb+nq3xWm+fVcIL1ttnfY9Mo7Yyqe+ewzb3wZP5ksL3ogiypSEYFS9Poui1svcS00D4zfGBSoSIcWGnSG6IaJyS6H0Pmg2zcWx4r6k+kRQtCMj822N5jAlLLWss1B+BgURK2FyZp+DfGLHcxq9+4zKC8joj+b6jbmTRG4OjcFjkI3kXQjeimGLo+5c9rgcLyDHzxh/s6HpLIPHhJQBGizTiHdPyLIBg7VNCv0aIKSYScbxTVAkQ6lICQFd/hnEzJ4AMO7zL/jJr98g/PeSrD93wXtMSBUERa8hsVr+L/nh2/WLVwQG7i8z1KOvox1Ikmx5b54YNVFRoJBCZPsvdi5Of4jkNDj3mzRNQCVXY2XfSt3dXZEM2/YrAQODXo/ZV9ecpsl8lal1rcLzBjPuhjmE4oW5ApOtaZ7mpmYrlnTOyqByjsc4Ji2jWK5JpJcNY+nN7FlCwlmiHJ5mrcLzaeV4mB+R14+ZoWrGC2cmJ0GafvcfNZ+ol+x3rHBXgnFkqEbOar0w4Uhr1uTVCCyKjEmbOZs9FmU0qzDxkdMnMagcUAK2GAwoGdq6dnpki2F3HPnFdywE1m7EinBtGzb+83HcbVIcM2ogu28MF8dgeN2yyJsbt7tH6mWZtp6q5NgbDpIc7k+4Nuq7EfBBACzlQNlpqdmNeRDWAxF3lSpDOteX2cdvmuBY4mqx2+KynVnrkcmCkQFf7DnZu6/ta0rdxlXqzEBfnDnvbf27x1LRMO5gTbmFsTJQiq6pmATEThE15FcoxCRC7oqG9GTBDwUPEGRQhcRP2MGwp4zPCYhHudxVhao7Y+P5YwQtItelkjqtm0sBuDeUqhLo+9q8gs5bK+o53dpXQzQa/pEXfwWBI+6UQPcD1U5J848tskFIjgoaUYK00XlEJqF8Mm3+tLomBEMmDiK9d5ShRIKdnKt8E2eRpa22RxBonsWG9jrWBRU1+rSHU8Wr2hUFLDbMcCM9DpimDNLqJFX+qebqqrLaRwmryWITtUKkgyeO3NaK+2V6DiRU8JCPdJc/bsxlk6h+Zeq7Rbxj3YkXScRUpyJUKhAgXIxGpR3w0ZuJgyL0wpPp0BuglATHMXnUoHxTRqNfCjbxi+0mf2agNIzsOoeqwTwZ++Y4Xd9bQp7uPjhW047+IgHMj61fbbRXCA4XyS1qgzsmnFzOlrdkvNodDRhctgzgcEqNfMZE8jJRpsWKQSKXl+mjwu43f0s1nJbkc4jPHxGzAdfg3xn2/ulCqasI9MVJn8x/WmHJvDXCH90Vujx6AksNs6dkkOoyxVSeXl/BM+KmXlLfaOHjGUIJiSH2REFWTeD+wl3grS2bBTuHRePm6WCEX/nv18u78w21WeoQrJ1DKn0K3wgaTBiFFvOlDyxvR1V0LOuwNHmzOREKDiK3rlb9YMQB2BM3rys6Ww/T3BnO5UpbRal6Fkyp6jyHd1t5LTZHR8NZpoFWmSEU9xbh5/5aDrAJkZ4LwOc1V9WHSJkwNzDHwNdHdlvbw3KI/cHUBvEbC0i7F+bFFJzpxwIuqHL8CCg3PkHE+wgQqfNu+cn69zh5EZV7f92a5idAKmfN/wXdgAMBxoowL7vP6267x9lNsFnRt+WUjud8LEFnNLLIBklFVFaRBDxif2zAy8BY/rHj3CNX6EZTOm7svZjAJTldA0zpdIPdBajZC88iImY8gG2K38j9wvwgxGUNmEVMFMm9qV+SA/cDSHWmIYCKUSQtbUDZXl7utPPDuMT+6TeO+ZSmHFbf5LLKmhl8BoyX3NV7eNuMRGZnRflVbYpKS68t/RmhQzIlGM1nqO1ymIRno//5zFUHw77Irv0fUKNW/8ZBmaJBy+WMGrgDIVqhUprZoYBAC/LPSN2uEbEJX4gIDKucPWipa/MsQaXnVjrT06+peBOCeY7sM7X6mAt4lBkCqPTxkGtltMPb9gyqMnJA20MlHPYg4U/whrqt4VfYZWLuYfCcho5myGorrPb18RZag1GBaIz60/7RE+mYFa1bo00oIKoTLpNvbPxYuN6dlrjyhJSxt1y4v9baWwwoOoTi9Ek7VnPAbgjO+yMsnDS5rfoNQzet1fd56GuVELqjDhuezzXNRkdsqtCaYHI2QxsuaTYvAorq6E1hFJe6PMnb3aGysuWEgblnjUDA1ECBlbGCKjKUa/gJ1nQwJe+Mel8VXjuy6nUy/TXNZ8yNr93+w9LA7sJPzEhAySSxbYPtETZA72WN+DPuPfarIst7wRLIk+Y/1/AkQCV5BcKvojX5gWY+0mH4BEA6DdogAgVOJASjEjnNp6udjB+3k+rrBdRZdj3Sonh1hGA0T7Pk/iPlIMRTLDVZHmb/a1YpPXu35wMUJL9+klTb+z5EtQr1ixN7ep1Lovb0prFMaGyn9v3/+Z2DPg7lzjGI2jeJCetU3T0sZjin+6wS1z9UiG3+/Bjm6jMglZw00bjuVU2DlfEfwKuMSoSnAPolc3T0fzggWF3Y+xQSIqMB6ZHg7XQYF6kK7mt9Nue/gAhA/mQryAyuGdYA5COCU9mMAihMydjjxIB62KDGnRfK4a99lRFiEwsqW//cMuOBHu50fCNqZTP/mkNp+vwWEsbolO2fSYeYsS0CcuEXg6jO511+MLs1Qt0UqKU3hs3vfl9knx5cpdLzQ3PSLCQR89eHF6Pd02ysPbAr275/WZX+Ngj6YcLmYNu8y8q9L1uZ7ZUOZZ43eTQIpmmj/bHeic7gvrX/JzuiOxDSQSGkceg6DrUNWQ9ve386ZhrnzLuEH7/cds+OzD/hvn5sfAnoPs6Ijs0ToJFob2ln5/LOjMlZm5VK/Xc4oM/wzqcTjoG1sp6m0VeoeYcG4YxBMk1yOwNIFP9qLLT8PTCUTFreVhd0TQ+Ofc8sSsh1CeX2vjmCaiLMgVICiu8rtRZB5KRLWVfPFqI0DpbJay6ONlhbHrLPXTywXd77zOV3ImexDs98koe7fC6NR9mWx8kQwKmEdFP0s1+4mFz7DxrE4jBAPnb2ocNpUqV/gUdAU/SUifYFJNpJc3Nqj94ESvdjmhiGTa5XhMRAGhSr0XVuyq/l7lYCiNtchdB+Zq3PGlthrlASlLoPNF3P9psY5hGiR1cC5gAEDVkz1GRI/GOFtehfg7SQ47GDIHDSlddNfkhLxH9HIUvae2EjYoXVNBmJnO+lPb/sfFcHY9I04PJ9T2YZCtBhMNBaXwfFIgRJCk0Zjc0Yy7Ujjnh7ubvcH0oDYCvOpCnJXkf14UfEAbWW4C3HfprBuMi98JZcbM5n+cgM8q7FcGDRTc3qYCqTp4lOaPrRpoe08sLTTJf/Oe/COCTJ9M+Ki/7BLYEYSYxEfueRb+J13lCAac/uD56dX44GvaGGjoVX42DaEg2nsgj+zFyGNG7O0tq7P5PIwUQ42TM/Z/ZeGzKFl+uFNmRrf/uO0N8jO8XmbZvFMu36pM4dBr5apv/45BCFGcJDEUwR3b9CNIv3hb8jrY0Ic5r4fGQ40gSfrHjLuOs6Y2GG0IpLT/LafiEQ/ksf0cIbWVuKv6FuxOvB0CQNuD6F40Irc/M5QKIWVHgfcY8lwwA3QK+F/5Kej+Qx0L3HPdbilN5tYe4VG127SIV6FmTsGQEknZUTPi6S+dkksOAtbIKnk7QQ+O6589eJKmazi/rFCTAUbP9GqfrgPZbT+XXDkb4jREtg8IRSx67lJUj4Ro2vZVLBHdDjnkplH8xNKMqVAtKr488aNpb9xnfvMcGz73MbePrpj3MmHb6P5I6jNCdHSnIjDKZb26ZZNd7OIJwsgeHtcdOuIYGLM1yTA0isO7h5csl7oiQI0eriE3zKW9Yz0iFl+6GcHW065y8KrW/d/JiepvcxH9Ew3sZRgDdGcQqy0lYAbTJLsJX42eGXhErKyu1BlV2FvfHbhyZMo1vIAaTEi3JTlnCi0yYoHg881p06og6AFGkBwRQXZG5lCwhh8xUBvLNUC2bAHyxY/Igm8QWGIHuDLA1mqORrg+AicyMY7M8ql2Xz2W8fim4x05vv7+UrxPZVOAIo4MXvPGW8xkz3uN4svBpcAJWcM8VKybyRocX8vfACvhlqVALRFqUbI5z6POePefm7y5PKhEqC8nwFxDJr9aa2DLc3NDbgaGek4DGD2sHQyXDD9vRcmVte1EE4Ay6Zg/SNoZvwiwnuL72biKgV0Ces4w3YuuRI7zwlFMc+YU82JPjQs8smxarBAaWqAvuKADlxQo0Oq/xEe49Y51AFE06TAdh71WYR4JRMk7dQgW/MvzjATBtrrKAPvKDkQzt6rNdGuUFB9x0pIWmVB3p2qshFB6+t6mvfGF6Lgo3rXctr3THj7bIfeElkHo1bHG8SrUpxkClp/WjW/I5hF8NqJc7hsQmiuDF5FeYcFU7rJitBQjbQB4hz8ekocezQ53RrRniLNcPTXi8eQ6GGNMcSmSuWL1mD9ZS9fOEu5OgBB/XxibLoPnvhA7jb3eLn1dmSy6azFrjUGM6Zq4sdT7tKIb1cn3HCw5z9odi7lqiTTCvl5xDOTIiw0Ruifk2IykZtl2YMIeQf14J4YyXLP3hOmWUW7AYkYpqxxga8p97dWaSheL/Ci7PxudbZ3xMWF14d6SJam2vBdwx/ftP274g9AN6+75ffImIwSE2xSS4LN3yA4RK6m5xPjIwO+YgQsfWXkbM2RsQw3hxr/iuF2cCn5O3YRJk3EvTApmgyOnwtiY6jxKaTwOWmM0fJKGOTGNWLjFnnp5kdvTMvl09UH41luyJ769VLabOe8RUvuSsyk9NmySU088Idwlyy5ce28CvSlk2gWPi4OLHH0xlSNYCdlsuKQfmqExVTwOdPtYSl7ntj52/Q6B0yIOCEp0AtxfzS4y4fhZlHTDBwk+xv8+AjWQXGQWMBAmdTEhN0K3i8gHJKWl15RETNiJ9QOE5J5o6BN+i65zkJ4/LAOd1MenRFquvgKe2WLG2uRPsybI93wUfTXOpR4izTD7qM7P1gmS2I7lVV44u24q2bI2koAB7GTe/jk7qJzsAPuJhd6NVE2gkcFDOxp78q5VCfet7b5I12lYBjzIWmjV5mPlyibjn2A4tjl3YfLA2lcZwfZRyNcxc5Jcdycc5ni17vkGbYyy1NoRVKbgB0w8IqvhHluHIYb4Tvt4kqK5bzrxRQLI0Vmm0wSIfZ/0jw9EKyfXNwxWan+bKv3uZGTiIKm8SWHDphDy8FQL1dwfOjImarweSWLKoYc6lE2O5bggHK8fJ4VZrnqpA9em0XBH4yL0mECZ1oFjb2zH76Qs6RYWsXV3kp6tth5YKUhYXdD9uzqbvWqFXJ+6ECDsWwxPdgIE19UQ1A2K4spgteolm/X8hCkUwUGhIZv4uRVlptL0O5I9Cj5f4tdchR+qLYuTbNBjtqwly4z0mJ6ecNRBusZLh0IYK7zKS36IZZGO7A/vwOdMNs2YbkwPMaVpkEu4VGEknLREMYthbgshNZ5vk5lN2W9ZjpGxGgqzwYLPydW+Erl+5GvLlhVBMCaJ8xbFHlTRKOEcjHv4E90YQqZUyJE0/LogD5ka/iHsKIWOWLi4ClH1lnnWoxtag/t8wZEJDY/Rxehl3GIY632IcwFtmtBediitCY7xdKRoPo2LL9fBJdkBroQ741g08E997+GNGsu8c6cYkRL6D4lqIq3SAnY6M+V4/BFxedNqdHTrq2oMEM90Z7hovzhmMmMz7z9ssG2RDxQO5g517KO5IjIWPktrpm/xgjs9EX0/PhhZ8m75uMqLezElNlFjoHNsIHwP9vnU7jv2yuQmOWz3rKEdnFNRm29Wy6J2k7nnvRdisD19uzudo8A3qUEFUbssL8N0ETumMaDlRsOk8BeO4lkjFeycWzMSzBCUWWLFt9UIB7XIEAhZM62hoOwnO20q7ecfC7OPbeNb1tAoyLubkZZpvYV/X2McOJldklF0fkZFTjYewVp2cuPUKi8v2CXyKOPQw+EvxoZNYtDqogZFNPo4a2krJvZzrzSSQuWzEwX0nhK60JTc+vsxiUckxu+5yUz5X8kTw+9YXYmy8atb1vh6uGZFxgvdWrjyvRSPLCRphQTJVdPx3+2V1yuCw6IZXZzaTcRLyXbIHvKYpZMIUe5R3NppH2v8dg5mcVZ34T2xJht2eGWIxurDruYN92y8Kkd1zAbzeWAoRmm8nLZ7VSgmMeCws+KrbsWjLsaxRXfsVTam/pG7bnd6KzutLmRK31Ky0d0OcC98bbUZZWTtwzVxhtes5WrspiJW64a9qdj818+XReLe+Ez4wUZSvVwF8uNIkmQEcrfkC5v3EfcJBxL3xLqn+GR7GXERSKcGVCtBjF+4dOBY6XkeFuLSCSzGP2G7xz2WP2BajtjqpnFJekyI31oNao1RP3+3H6c5rF3zkvrIRO1nRtr/pAna1tCJWf8Iwzvm0C5D91lPMcVBx1yk/BGh91GKJw9CoXl/NJRhc+8SPveqzdoaNTqrYbUKI3Iz7UwcH1i6qtCtM09t5oIRvUQXONyBt00CtcRGrcbAv0IgW8R/g6wh2Isq1SmPuTGIcsmZTrLWCvETsGmYeerxcm5gViA5URCnw7Oyw7mV8v1zWYTBU9BtiXMr7Zn7s/+e1OrCahDbXUKXH3q75PmgSZeHFyItBuYt+dtjZzS9A/Fr3szLqksIxFKcYrvxV/Nphd0z7wSBJEtLHmmDdbUJ0hsFlUVVaEw/7Q2g1SvEOhWWOy7I454uL8/9MNS68f6I88hr3oIoIWPmcEkm007viUtb2O2EU8Ok5uUs176i7lU94qmSGjHS0N2AFbkq0cwVFwxMoPmY09HLuMTcCk6KaZmcA0IZM65L6BSEr1+T9ZnyOuCMKQbO7MU1mMmqIUNhRj0PsOwUESZegKhIqaAXhu0LR3IFadBC4fTifoVvZYTRvSZv5QYC/Hg+V/UB4Ki5qK3QAunus/LDHzq0+yU6MiOTDbz94DMZs5NEcTVVW0CtvCIoKWbCTB/gzV0A7V8c32JOhshxc2Io+5lA2yJZzlFr4xvTeOPYNzNSU2bCFWvKJ5nRh0Y56ASNSaopM5qyjqhe9vFGovMz7ZD/Z+kIhpE/lLJHm+6lVz2D+/i80tc1xMtGd8LrOSeqTytKmbCmrWG1D6WB4xJe2ErS0of4tnnpJ9PQv4Vqmpx1pKaADN9UK0qjhS2w3Enz6ENb2UhW/X00AazkQ9x/znpfnLSX+wNZk4hn804izyb9EPcfU56/4FLPjNnRxbPbSWRawbryWz4Q1w+J91Okj1hmdlCNxuvrl49G/chzp+TrifHnKRLdcXHO1yGkUi0EEiuUMQcmmWed/US+67s5U4NmsYcuB2s7M2tVXIxNxePEOOl+rFHU5Kmke3f3buyMij+zGlqITNdgbkVqM/wFKfB7B84TzqH5HjFeLdHK4Yf5tONURnZjZpG7j1BA3OB5mtVQKmEkTirxHFNTp2cuamJOzeK0DaKy1swDtiD1XvZ8tChMNLFJ8NMAnbvLKgqWXywCOjcCW7Jby6/egF6bkHyYjiJLpWnR2Xe2wYWxi8hF4h+ZS5cUNuv4pwGPi/k+hIWP3fhCvFlEONYHPiR/8DuYp3P2/Ad/5E2x6UsnMiu4tbOEWhFLuUKV/TKXPAFOXpasveyWCl4z6eboliJOes69MZSrvzhk6aQCeeG3zqpzVDbamCY+IhE8pdsEOcmnoI02UCbA1sV/VHl2orqr2TWw9UtI7POTSilTlUULKvmFdlMZaZSWU5OPkOpaE5S2UJTTGbKTzyvXrQQhiV4GRATVwFVF4pAmhtcQFEFV39OzOt7Mk9VxIVl5nIVARC2IsQ/xP3npPtJS1NxclS6dRXzmVIV9nPgpad+vzDqev2ZXbMpd+U+bnsXntLhiVy1taJvUnC4lWDl0JpKz7yhTcVlcn22xUMqd9ph2juV3UlqMvn3+rLExY6/jII3JzVtIldd+otxYjOWvOrAxE3pg27m4ZO0bxgnW6iRaiDpa8gfWFmq7aUGfl3f2NGbe4pGgdrrKScHnsboT859UFcUs+EPcfmcdDsJNuCT1lftFBVTNih0H4v0pdZrRJbsz+E+ju8RljKh5HEK3axzrfcm/cl/iPPnpOtJMDkUuZmaWTeobdcg9aHNirN7ofb1/cpWKOtLxB4PWwHND3F8TjpOlBjf1WZ5VXrrw69PcOMpm/hUr6i1KL3HS53PGWLJvDCZXI03DuNNYCGTY9A85i/ffyAPfBvC5zAMI6tYdLx5sIUY68w+nmVa4KC8OFsiTaFsAyQRJeC8XnHdvwmE0xEPLZtsxJAGW35mc7muuJzt+qSHkK85+RUoLT9PY8sO6oIf2Im2WZDiTf2uAaZs2FOPlu0t1J2GDEGq09Vi6M8DY7lSBJN4WtBKQIEh/9Px12Zjj5X7X2O7MlAym2m91i1Xz/DrX/C7DDmluH1ozV8Zn3rP0i4jtoJX2OHRN4wZ4RkZUuIVRTwjK4UUmJMOGjCYnCJLh+f5TOwaZ3dDoANzlkeG972N4qFCcWoE6DbPNpcmtGB49DkFhdlPQdJd31gYx8mZ9o4S+mt9xlrQRkTVytDDF6OILB69pvxyFpD/0nIGO+4g4Cu3CGFQcWXu8XKJJSfYswQqzBeRuyL35ML4bsHEcv+simJgx3xZYjqnP2YRCewjBPmK4f0NodzGmUjuUqiF84XRVFySLXOC/axXYZLT9wpXXUvvQS5jlqxnivP3biHsX8/eHPjNqWGlcYwViYfMSGzsR6ziHImwT8qxWKXy0HseCAPiDYCBw5Dwbe9w11ezAQoAnJ0FIABkSYO7qedCQXNZwjk/GcHNDhL28w26Zw2MHawKEnWfRS23IDeW4O+yYcduxos9Zc87sHks0SuoAgfFVMAIe6yZWJsKYChkfCTznoRDcPwbOP8Tf39ejxsyNL0okc9xDFFob0waKLZCDZM4PKHPPh+K3YqcmUZHfO5CSJ55b8XOYdCYN/VWw9YkGWxEARYAwkdwpYDMwniTtv69NJx3sLeZDsURUbH3VXLCbBGdYh53QGAJ6tkiwLGmPk8aCpdtQSUckgIWV8LMhWj187s4Zd7y/BFZA2lHR39ias8HlVu5oljNVf4nKAmTuuGsdFDA1UMo11LjaxHdccAVnSfTOD9XkXfqBXdJrMJALWNlEuVD5Evtn1X+mKwu6JUrelRmKMzcaUPy+4DAi0bkkP3PAF6GEOhDhg9ANCDHKwTq3Wxhxro36lDminNOGGMTSYkiodr8q1PBVaqmO9NL4gqejgl8mL/m4kqvyc9UdHkfN4RaMI8b7BW0Ofk8HWvxa9yxSrX45os0+XyDjofWnOpp0//CkEKqopWRDMJRET8uKw8zNGnuAglSlTItPJuuImU560P5mJbo/J28bkragL0cRN+fEvWsSFPC5VzkT4h6gPi4dwDV9SmlreATiWXNTNjiko8xBvJmPxFnZ7lzCkRfaqa7BNrg2saTssrhMUvPycK8W42qpdrtzQQpyN4oPwIuNL4cIR41MEDOlAPKA+CpftDiFcuOAIiJGvZkDfwYUt3finxljf8+X1+9Ji14zX58mdoIHUl3TDticVEzdp3f3mldIs65Id/+HTiqEcFaPp++Xwy7f1LK0qGis/Q4HHNJixd0edRcNUXSyXUHhEL7sSHwgNJwhFQoxXJcXPzwy9TMIoL4BXyQjhpcaCSUH95Orw9iq54qSATnQ14EVkLws5hDTNeCEHWIqEWxWT0CrtfYD1npL95jn+xlBS6p7luPMm8Gxu/dbQvljO9eCairyS8h7nStKnHdqupKtPh4w+D3fy2WM9ATfNg4u27+cwPOa7aZ9HqXh5Vi3ZIa143Ih4F7GANdsdQnGFFsjhsK6IoTDjIjGx4N2YHu1lBYE7KrrE3+7ta88fuhqsSsuye+jgQ0ysac7omQFynfnq573cIk/wjhT3hDDtlqMWBJmxP2rgM46hO4I2FSBkKKnBRL5dCRZijuT6u9Urg9SInAOQ4U2qyFTiB5wmmgH3z9Ad+HLVbwhbIHtR3wIatym0uCXxkhUZfmZ6/fUpLz/pSjgi2n7JtYTdgqc8HhUd5dQh1qv31GsWIhtp3hqqel1+9cTwgo4Ue+SQpMr4Z1MiYnMZYKix1DI6aTARS7NPFfu8prTbK1znFJ5x9gCDLI0RFF2aYb8LPrKCNkOPdxZj8hXl8b4chVF0sLZh4SwC+BDEqDWa2ePDX5wuoZeIcUc5LzcrzsRCnOZ4qjQEXEswGCbwFVQAFWiax+WXjY47tAcqp5aFwM47BgkpoSuRxuMDk1Um/6MeLRoYff+KKDV0KpD8j5KRB89mB7GoJ4x1sOcnnMIf05z2HpnZAdBuMHkECZxzxY6FcQpvFUCRO/9380jFQa/ZgAhR8MlX+xOB+IJhQTzdyUaVP9pUgaPW1T/vgcywavXc/5h1i1mFs3L/fOn/uW5fb1GG8VpLSfpUru1ClvyrVcipB9Iomjiv/zkvUJ4BDofACfh+Dj1SIVlipseTXcTYDIPJHUp83WwaBjmZ/AgKK8ZNhevMturwgC0yuu4buT4doQfr6CoD27yhrc62cK/tyo6EnHwLjrXoWohB3kMHhYQlCYSCULuuEdk+CTpK3azRDLDsbTrbekajYgkDFcd8ME09Lz2AtzqIQ+dGws6DHuhukQBsAgVtQHJOSFga5yLPVlV0GW7EQMA6cStqlZRSGJsRtI8Cm4w8DmWIIMIR446tL2Fbnsfc0pqxOZ+ICuqHqZj7Et31suARHUTlkMsW461Z9G19m161F4Fuxo+LcSf3Pw6M97xBxxhayQFGXD9Sw4ho/wU6l1U/Hv6V8XQHH9oj9rg/sofx0Ff7L2LDp9N4BL1rWXMPHtHaNBMC+mEhd6C4cXL7Fw2mg+EWecXmllDErSyiJeS+syWr3uI0sYQQfYPc+vFH5vZCUAuoZdVRDsnlEqp8vs7tR7w8diuYJzTS4M3c7hTTd3RD08+rdYlgt/VsHXIul6zGNy0vGxEVooXphbL9uCtuMLpD+XN7CwTAdOcWWdMCu1whorvVxi13Q2ZkYIsqRA1Sz0iTPRGx5YW5aD6rJI6RD+N2gJR/Q0wP369pgEiJZSj9qswfo1NN4wXVHcmlCSTF7g9wCLMfE5/OOCX/ydUS7bv8LPG4IIMVMIgupqBx0SpD2IJnwTT4GkR9YxxTnV8DRdjf3O3ThdVWI4hknpok0QvtUQ/VQPpcjS+ew9kDu1LqusFU9iYFi4KYUrsUgRVaiazCQz9uVZGelcSlyyFvvhgxVNKcWe91ppqW85+jv7au0Jsv24FpPFzXaVMiU3kfjG8+dI0dm3S81uWLhy1nFzTQqI3jhBzK3FgW5jrh56Zrel5KS8c/aiSkNI7bmWfaEeEh7luFGTjeUKsftrRRJTN/7Ofh2Up27cLujMYDlBrUxddQ7SoH2GRBDzYAoc8H48993nRqEoCjrono62oQMi70sQXoFIKE7jLqm+T6kPu5T9oqUhtJrpGV2xBZmyIZkQqBhR3gj8gNHEUnckeddv4D3IFhq1tQBrG9JPzlYWO8g3xchdt6nVGJIn7WQ1WKZHcty1wweS3WmD4x0toy4W9fdzXHqU/O8KMZ4xy+IjmqcDf8Y7KniHijiYmWqlEWzdE2mmWdha2BgC+WGSnGfElTdvHSz+fUy4d1Ev+x9UYFqQZR/9KK7f3kspJzQveAP5hk9Hiq4Inb/7hyKq6gZbWqSNTuxeb6BAh/njnEyi+lmOwe/BiKxn4fs1asDV7xRY0wRHJniTcSWTCCKYdtZBD9Z383dqjaxIB79m2wZC/P/7j4EnCDilyp8PHglwYKnBQAJqAp6AvxlFc20hnF3JNhmvJND48A+DH8Gq2sitchWCD69791rztBgzhbXLi4Go2aOZ+cG95DcpisQKSZoMltoJ9soUll4882lAkGfYJT3EMGhPrd6xV8G+m2BxedCj6PaJrQSut4oZcmNZCItdb5VR4GGKy5DldlczaUDmuMwJp98fLbNi7nhpwQey7H8DPlgdtgHg8vQuSBfMo7c6S0+gySAB1xFnCmIWTCtxR2OEaBYb/ZS6IeIe9ftYGMAG2sWjdF2U477gM3BtwmZbwUQeqED8KbNGKRczwg5nI2igckILEgS1hRhsB+8vTiKIt8TYRGc2hZ3ysNUHuXhldo3bJP0x33/PCfeZusQ0tXEInMxWR4LKFntZhUSYkn7e0FdGyQGQS/v2GeE0jSKfHFyVRT3dH90lf2iyMOMRJPZkchrxgHTCVtrF9OQpZhK4qmeMaiYA6k/zpVloADparKkTb0P2DmeHOK05EWLAyrYdZCRolpVPyjPdKjc4PNrqzmBckLqN/FvMbNXPl5GF6uOQbtyzzPb3YPChBhaW1X5R3Q1BXTrMuzC0NJk9v/azYn1PBbmss8BCREAvfEFpcqdyiYpAaCBeg6CVZxPKhHmGls3dJukATRJSMzPyUdvu+yzdgMTl3mkLx6YWC8L/yL9g+WJ2Wx07vmUiUP/pTk17f6qEgfP0mkGM23LyhWpgt7BmfIZEjlt3WFKtuWKJh+yMGK/YiHX33TPUSzfR4v6tQzHc8aECUF7DKPxscm2cVCOQfihmFyhrjAAgryrgpQq+YezaFXLenqtotWYhEd2ETBElBDI921GOkbVsfCJyDCsbxshEDuOogTGdQSfIpbRHDqHd2gykgHchR4Q/HvvgfNA6APmryEJj8MLd+X8B09oG8foKP2UyxvXpSvm8j8amgE17SoMgShrZEmZdc+K0/BwgBeOwvAOB39dXjKp+3n5V09E8FNNr8a7EQOsmj/CKzJXmgdjlcaeVhhAkw0nBRAXIQKnsF+IWxJqBkBJpBoR/1QcLqdxuUwx2hfJQy/4rjxBD47l+kf5vxkzIUZwBWwPXArfzUa2r6IXUKsqYddABpDTXJULtx/kwr4bDCHhQ2gbaDgieixsCMdk7lbJ6ayviNGYvwXWFqP/fWUV9pj5mn3ZZ+gLVXB+ZAr+lT/JuD4rj9FfGtNsXUpzjSfPd/nDlC598TARPqYdPbonZsGdwEXqkvpWKzfvWvuCtArf1uIELyQAWO7b6IOaz5IQlVhOBb8K2TzKQHI67CTERdicFpUk7s3yRLw2XNXtfBVQK+dROACRso+ahmL9BYj5ldTuVbpe299dNQohhFmYg70FwsahSKbTV8uIy+GQ+rSHG0jxjFkyDMcOzUq0YgIJOB70DtUI2nF0wdMoONblXZz298gkCtCXDdZcCr6aIyP0cVxnCOFvM2442/gwS9RtSmHmEpW/DvmisuuTSmOZLojMPmBD3RBXkCCdpXi6526hgq4OcvpfkANTehBUel4FHLZ5vSJHDyTOXWajjjMcoUWySL+IzfqJ2eHbf0JwauLxgiLOiDRi8TaQqV2NVW2Rt3qLrx1n/sXBbuRLHPU45FSznjKWO38GQe8aO+Yq531dgac8kegSgg8aHEs6TC6A9ZjZlPVdKFSbn2whWFaY4IIrb3ViVhD3qO6w8dapnvqia5cqQ4WGU2keqnDJEMMRz1+x8CTYsnCFkXPEUlFo5FgWW6V2EHAt4ALiTsucC6SgwgPYm8zfDtG58Fi7UzLLqbJrCKbkl1PmG2/XytsVugtl9BQesH/MFO/kNeyuQPuxTK5P1sOZ1t5z4wi4MUFwzUUvWyR6g1m1wOpA74m2ZnkmRtgE10C0YlY/kl1rVkSF04QN8juRF7YjFOao/km/G6v8uKn5DAwYCGg5DjGDLWvjuLcOBo3sJsHq4a1jYQNeFPoDWNdhtKdJyR5LZe2SUtXe4BPGGjcwlS01cMsFQ50FRJh9KpO1Q34ozv7k7fMx/tuA2pZw2XX1xZql2AtPYnJratbwsxZVi3Zn/FDaxQ1jsftt6/fX4m37PSdi97mvDnR8fpg+F32mJkSBYeJoLeNzUmmRcqJW78SKRnbEkkSzYtFQWs/yom/YBO1Rt1M0qm9Pzylmqe96MPM3VfXlEV2YvO4gUI1mp1TMnzRjsUDudHzg45pVhpTh53hXlxNP3L/l2DXp6wFq2dixQL0BnvF3Mf36/sXWqBnkpkhbTrjcIu/ilUCcO4wI6Ro+buDGoOV2uFdOAvHgyTYU4dfCi3MJ7xxiwddx84IBbrd5DXR4fevjZd2hlxAQRBZjVftLeq/DSoOtdRwv9nyqCBUbwzi6DVAyxM8ohBToH+xi5Q+yQkkzlj4JeUObv7w9OgeJGDp2SyMila5pU6YLVyNPkE1zHUBTGxna7F25d0KRXmVoZozT29z9rfoVbUimXlb1d04cQyhcyRTD7YJaYkZUy3ArR93SW3C8xtcI6YEJ8acIZ2UcLyISNeO1Rt9yyy7FktStWZ/CtvvMDo3SMU8Uc8KPq0hA0kqvbhSXGo90p/PsB/S2p2u9qp0YMmGXV3crSaWi1CyM7Z1vn/IyjRTkpnHlZUc4DdlU5y497SHN3WUCu94fvLm9wOtQT2tkQYZfxi4QM3BmUeZQ6HyetBodM1/dS88Yzb+6Flbx0/4yog9WXFVc4K8nCfbftb89hYngaLVTQaOCKbFq/pplGQDIQEfggG0l3nPXjBEzBcPAMC3cOfuUdj9IyOKtLCOyXNdvUqaIUSKdOlMYDQrkxgqezuj6bOAtFN0VZIFoD2+jS+P9g3ZB//7CmU/SEfly1P4O5/lUE234zXLukTa/F0UanNkscutYXHk3eBYeVBwmB7jd4C6X8Fo7c+KEcHjTriBsrl1bt2VPFChaLFDOF5aFLcHhaMiUCO4FUofc5a+c5hq2uU1+GVB1LzG+1HVf0iLkbREzmxFXRELkRNCL1uqrYzccEuhyrECcGsvAVLqxPHbb2MJxw2tNsm7xju4V/CmZJ2X2ogZ7z2/0jNy52wka7+TFE0ijeV//hnjGpzx39b3fjuJx6WjNzW4sWzRncph3Zaqfx1VaiAy5hZK/9i3WqYGpz20Vcu3hL0kJXXWN0d7S2X3l4PXw60syzFLlwz9mgu3/VhkXB/4OiBEns/cZHaoP+MxsY7WT8ALQJPWaPbHuajBGUreXSav9dr7U3B1HOrss92zZrFf6NDdt2t1kpahG0uy4Coq+hiazlgRPggf0mck0P0P5Ml/qRwO6/WsMTt1nYIZDNsuKcWTUqRnvVCQTI68QNupbWfod0sDjk0hoP3+esmT67ihUXqof0rLKERivnHjakYZy5mieZewgWhD3YIY6q41dQSt6R+BNvsw/fOLzv1YLTAR425cfeD5sTovXB+l88YRIWZtV7xnxCTBa0pDUwxzKGM6R4qzOGWG98XDPCOV5fe66V35s+tud4lfF4Gw9GSokHn2yahVjEqrbm1hKmSnNeJrVXF+HllPTvsSvXpqvhlBWyEaD3RdANOHzCen6Xhh8vW6xAvJzjv3uN77qqzpT6MAmof7znoT4y+g0rczaxAJlMDl7CG5pl4EU/nTAYWYfgz3VAo5Lp/rgv39gYV0fGFLF+GjkeY20CY5DP2BHHEYNXnIChjZO3XseFUAphV6DL4j4+TZwLMfHeJFfbz3GmUXmdu63cJnxpWWOQ1leqEAPysCn0kLpoWyLfRU+TC2yOP95JgKMjHNAxIgTyXpurHgmDIt4+GzxzeQDu4XP6S2+CkFltEkU0+YUbryZj2t3tzc78UDYXwqRvE3yDM+XKEkHh0QNuChQul4U+wFAn4etF4KAGjSKkJpSf0I5h6ZNhGdFM8+I1zSwsXqE09E8vrXGU30o3GtJ2fQ8Z87RPRjs3UTNkHtc90oiswhHP/rkZGS1SFju4xuv54tZ2IF4jT049O9zTXSelhrF5t6lxtT9eDmDfdFrpuuff31kIPJt+JwqTnbztytcQAchQeRgb8QaOIVmUttvKVsZzuDposd/R6U6BMDtiBpFByQ57ibKJjS4nMkZn1uyf2pdrSR60Y6j6JCJIyZFVtJC6+Knx7qrvl7ZZ2M8YP34H6Xaj8n2XTpLM2e3wUmvJ3lw2z+ZYdjQ8REHAKJFOVlkohU51Vw55jN5AGtpWnYgH9uV3RJlHk7cY9qzI+JA0o+8nlciPwG8qZpxNLxF+bOZ6QTMxR6pnH2PfaK6gO7DgZtVaLY8urbCigL/I1UNj/9gp+EJJWA8U7f5BvWIK/o5HQpXmRsMWrrId9g092rreoJolxIxDteAUcJ5fjQ8ZxKWzNa6K15gIQYCkT/XtsLTTsrvo0muJt86ACpRiV97bNDR1CVRo3wkpbYEMW007ZvePowBkn4bnZe7q2XBnIKVSXUj1Sd9J64lCa2CeiWFD5LGH2mqsLfBqFS05GNjjvOr8jDAO2z7bS5mBUxOZ9FlHFdy5RSmjH7Gog7hXul/rblKf+bDlkhXC3R9xONPTTodmtBXwyT3aOgRS0SGPcE0yYAF9QqcksvRLZxO8BVE/gLbDYj1h3k7zGzFeQTL8duSWRsdDxQA4OsNGhh6tgx8dzWa6foUPGs5kWUw0ENxssKWenCmHZOfhQhPXPA2INMQ9GuH6jVrqaGZpwqR1t2L3bxk4Xqd+V+G7oo0JIbG4JdtsDMuW07728QMsO96aQPhhtycamarlspt4JaO790ljMh9eYvT1lu4r74JDgZmfEmU7phwyFWhWaaztu7TOQTsZyivf7IbbNHf4tb3D2Iuy24RIfFqv8lj5H0WGcjBa4GmTwgjN9G4ipFhMrFH/jHCsrIO9NWS1/b8ja9x2whcqOpmP2z3xQFqkaHzB+S0mYPy85p2FSeyeTzifyPk7cRs8rn3z9hn0xgfr7uH6V4leOxQKqqklVqTNacSVeBe1gvW/Pcv21kZFzuikFhdZPuSY+GPbqgcu2X9eaSaWHmbvpZTCXwN0HyWxniq2kTW2cHvpnpDreDfLhJ64b4cCWaZ9RGDRkQnp6J2qNMPfL3KNrXhFH8qe61Xm3M+iB8rkPq5EUR/LfMHGsd5pKWRUZoDwHQfDciShWKURA/D8ga5Lw05Tg8dlcX8e5U6zyItq5DuM/RyIsdw8SY87ARNGvTXkDkGARo6/0AYXOxeMHwKzQmA83UAWPofIfd9PUaH5QbfIRIvsN5aqyTqBjBAqzd2nI+VxY4xyVP7O6E25RxMP60WlbjgfiR8CS0fK9pvdQSfX58lTWI7z8la8qNkNj/gl5rhlfsIiE2/Amu0hdICSYylx5o6ZCpa8ct6/1WJ4/rHoCQVZIQTCS+a6JkK7NNCJzC6J+qKgTYLr/P3Ia55eTp+KB4l9kYLfCncNinZLh8fZaW7dJLN7V9QUBeZ+l3jvQzjmzppuhquK59Ac9LYe0Nd8QMU/VOr4mkSB1R2L++7CzGJUiv0Id8m3i+N0d+Ua0q67fjRpW7mdbbzIsYqw1DONxpKHgHziah3pT+xJK1UG0+0PxbDwkB9JtG/UhUKW4MXnQvPwOYV41lj6yVQXD0YY0+Onec61+ifT/TtbvJL1mMCLoQ53YPmCsTwYtV4MLWkCvvjSNVUoXQxzEFZeBblgofumNpHgQcBdRX7sI4PmztHIBc97C2vsYS+YIqWzas65qbRH7SMTsegdsG1DU7g4kY9RyzDzq11Pnt0NodiFn3c2A7mM/uL3/Ykv71RGuct8xlUnyUEjed38M0b4q0+KpXdcRB+0NOuDZvI/G4nzgFQNpFdVjZ+sAfngoRRyGoCdkTGNTXmQ+Srj70Sp6gplDhZIvPY3XcP/OxUUDVE8Ch3w+uGtKhGIxqwDPcICAUYAWxYlhQqIS5VkE8ofXXlrvT5rdCeRvEFru1kqBYdBQqEEbjDoDxJrtRNRVqpMTgnjL5Njpe81Gn6nWi0iF9PgLND8ZiA6Z2jkV7XvbfLJDXFYl3moiw5HE1JIEutaYZN2GonDyvPEWCAQSu2PtW76Ag+gf9QKHxhFOvxt2uobOgmqBWGHoLqt3YTXcl6nvzRhMroSudfkPLXzWczzyTrUxvNqpBhAXS5HwR3uzt8HyZ2f/3566Kpk1nZHVA+Ko58oWadpomCUlIIfd4y4M5NG1C9GCJ9W8Cs5YBaamp6bOPe0JfpDwz4W55/Hid1b+3APnTAzV7qDD5HDBpLAgYIua4Sywvb0/SP8bH1uB8ohSKPN0OCSCKOVpzoSZ60tA3C+tH+d/rgh4m4kHJs964/NwAEh6B7LTcYx3p0AA6G1Hdwwa0+NjWrQ66vS75WeW+6oh75lW2HDArxJwdyM14XNK4AQs7nKrOJ3GQ7bIPeAneZvStBWMsfBUEupQPkg+jiEnofO+kt2/boN+atqBti73kFWKcqxoZl+ZgM60/n7NbiacDU1fGWPqzp4IfYYoe0Fnw2qENz1OoeIPVlemrWtgc9xXwATHlf5UHm+Kk5tGl3arSRFIO2g15m7if2TVpTeLp5K/vlCwyHLYNKdS20gDvYpeix7a0fXJbrU3flgYFTXEFWINOp1x6JaQsuGzrbAbtgpvBTOxxvQmhlbX7PlaKCtaZmzns/31ytxhzj1/ATj1/awPY+Z5BBL/1NHrmR9U3WNnRFM+Y4tYIA/g3B2gg5TTk3UhU9eZew2hOLD97LFFmhxCOpZWxST6WRDsfHVS+uOuHB1K3akvJOTELGVVNdvHUSwISF6SS013GQAJx0rdo7tNTjHxETovMxWS7juzMXoLG4ZdHUx1YOjkKAQC8dLNqhhdy026AbCswrSwmNN9+4v2BWCf0dDg3hewtf1Vz+aMNcg9oZGCw/wcAToJrZYCd99NnWr45yu9GmtUyjOuHWlZrkqKZJMtSXNMtEs2hvJ/I9cRl6Qw5ydMlsf60zuZ7ZahMc0iTFqnysz0tkakEXy+KADDW3CxeF/JDfgBv+LAn3Qf2p5WD9AbVqO6LPr5cMi60mJgxkULtRpuXU8Pwbzc01ecYywZ0X96WL42965vX8AVKESdE4EFHDS8i2rSVo6SpsGxBHBUIZZ5OBwud4zEiNow7MD+E/lIixzYslqiEUn6J01DCctiqwIVBo2KiatyBtnT5MWJlLnfoQetXWOFfNlIO8WtbysvJzfaLDvvDwEkfTUFkbgS46CbukYqJttx3VZenjNYjkX25GRw1wArSoVvoZVEDtk5UQPP9batE6PJzKaXPM+m1i245mNPJ3Jl7frXx2hk2FHFBT4E9hu54guRTqb29y2Bp7MuijmShb4NvSSHoo+pYRlzV2LUvYc01vUQjBlgKsr2KGZ+IByxA/NbqaVoHZ6qq2X652wSYASVlKPolPvkZCffrRCdN6ekctog4g12Q8j4iRH+OIZ27rRtjmJZ+k6m5w4UcRpC/1cePOoWRhqhsYXBxvih6gEQKM/f3KFU1rmIzbTldGF+nfVxVgmj6yL9BdYkSeP0hyUL9HL+4GD63CwCrM5vELSAJepEMxgAOVOWQ/HLuUu7JuJ0jfrChgjt6s0jgVNds7gSR+CVK2HgRtPYJlMgarZzxZddvIUDHqskttoFdWYN80nFLZbNSDcBDQPfEDc/s35C3Fnmp6zF6E33uk5k0YP+gD5GcOTvVQoBaGRLmLViIvZUg5yHBsFD3QIskYmUdOdG5/Id/nW0ro8s7MhU+OH5xJruE8yeZnw7bfysyQziWZKznkvSn4RrO73VydO6lo0mrN2EZKK8VNcHJbdBKE+XadshQam9WOTq42R+wKKrJ1fJ5Lel4aM4u2YZaQzfonDbZDSvYyokvitvgC8/fgR1pKjimoW/RH4Waj8eUzJk/5jHtEhYZFn8Y+Ozk1af7avDF39gBBlwAoCfYnMfPGatScIS74SBpJDRVdg/BO1Zi7u1NdoFPRnM2O8bbsKXMKGSis+9M+eqTTtApdeFkUwFtyvkiES912zhLgqqKLGGs8FKTca9Ote7iS2KIAOmprkTmbeYfiORdW21eb00qTUzz2QM459yjxt8oGI1dBuz5D3spD3JAM9ny8BAeudNhO0Gu8V8kLaKM+ESTvleIo5lrX44qV3FEzADZsM8kEwnlWIAmdtSUhT7rhEksWJIrXEAfgXfGzHGu+ydnn9wGoKl/37W9YIDaZlh3z7p1X1Da/BpcfQ0ygB8Xx7zlLfntYFF4vLfp5ovufvzlnPWQBf5pWGBqvagVF1crC4ZGVUFuQnHe9Koueas2HBAbMG3TQqrYx6fmxcGmsmSFv7y9s824AAVGThOebS8QMkrrY/oK3psCGx/2WKiQp0xaBt1NDNjzZY5vB5OLYPrkSeKXKL0/iafceGtEKnlTMqAxDJFPZj3c/EK43eEa2NOqvowDrWso1k31EnQUkc1O0zLLsQI//HWsiFtMns9gmHbAixQLVdmZxTzAAT8UIdmVyxBfUj4oSVbWY4mua12CltYskImdll254ZnoCicmqN/od00A/XOFpi2jiiRTj4WtIErVGIrudyhvBqwxzIGyCEK+1AymONC9vG5Rq3Aztu4qBKStMCKr5f2X1FmRRBNtMAbAZ5K0wjzztk7xMslCiOvZU1I8s2J3G/DaveqHVu4jwQd6MWHUDxg8cPkVSG9hkqpZdNHM/PTn9CvlBI5HY3j+bziNvsrGxebLoa4wYXD9+o/63HgaL5TfOyN671/O5pcdoNmsrtHR2PApYMIqQb812Z/yCJIod0R9UazHVR4PbG5cUpPZuXMz9I2pDWn2Ug+rmX3ehI9Cjx3YtsNyrpK8TmgOJ1I2AO6mdjQnAlgejGTaZD+ZIPokZvY549PP18zmjFK0atD6MYFX6O12ceB/72Pz9yVhFhC5yujP3IXocr2A1WN9hwrl7BKJu0Bd2bkGbIarj+L4WtoG5nZ8dgs9rsVAr0zBoNas7wD9THAfHLlXftpQpfT4eZDMmM0u8nFHvE+iAn/Z+nCDVxsX6KbmazqMDBVpiRMdg+1b9+ZLC37B6ZOzCCLdhno5G5fnQeUDtI4AozCpc0L3LJWpEHeY83ilrT6e242ss4/+wHLogqqz2C7evBCRJ5wHn5/zaVrcAIghVX1PnIDaXS1ahySTeAJjvIlag9idsn0vT0PmUJamRRz0YfCNCHtFBjuYAvWbcQkLCdzll8FB1DGQH4P6xeVmmjhqywl8swXL5yFnaVenGukzZ9hfMBgVDXNg73ot6xHRlHHvTWJnGrjn5Ead2nG3LuXDm4NSlhACYnSFEaraNs6xR3ENifxfu9vJf5P6z0536b5GWtu6imeRUaGc9ZLxcISRXMLx89/R58rz+f/yEmwo532p5kbXPjbQh+rca9g99la2Cd1zDl0Ur9o8z7GFLru3trL7KiJRx50jyPVollxUfnGyjts0k/p2hOXJrNsiovNVG1OGVd/eKN9P1twcXdby8k5R+W6/sQ2xTyaX99l89yI/+33rnWZk2zfxd8YA8mn5texiBNmAQ9SV6ws8sUuMKQPZHJZH8fbF5GDmkMWAx9UzKtRINSHWxMg6VTmXNPoVMDRKvGtdFAiaRIyqGUbKrvKHsZp4y0Ued9Z2qiIRRtS+ZROwRncp5lvGA1ePv+xb9lvR9l6KAYdPfhRG4mNacSgLufikmcSl0hYhybaRGCvhEsXW+u78Xywbq7TttiJEEwW5rVInu3B2R2vZsXDKN0PCk9Y3TqNCgWcR+noawP+fI2l+rCpKjh/drlVjA2RuEpC8a6VWhrSR1KQX+Lo/WqsTrx0xWj1yG33z6XFNV/vd2/q//y5pRRyo6M/VoSw+uhORPu9vh2mTrrlH0oNRuhliy1JC2VcZP0FxO32JmyjHeT81JBpLHB2+VKsW5pwwVP2mhvb22zzfuhX/CRVFUztG0HUUn1Dff7SguYfr0DoWnzdVtPx0ttR9j5HtbELPf0dpdtPpnWyxYMTrNx+xipBLUuqUMlyLuSpuQAr9EVWShh4sf8miWilc64w2D2PFSeiCqcLycLe6dDLvun6i4fWE5GgBQm/ihNQeOoWEID0hK6ZHw7rXEY6vKJqb7Peo7UAngWaAUP68y/zfiCWIxjuXCoEMG5e2jw93ZUMK4Vo8Vz/ZrrtpVjzqR6bIwSPYCcAcQLcEt86qM186bjt+8qAVlvrPYGiuEOH9P7aZDs44XxwFaVsu7LdaLSCr76Vrl+vR0w6v/DYbvIzyij6td71kXw4lFbWU/NeJjY6Na5DXpVkvLuRaLSOcutuIN6zKhFZNWv+TTyoLrdRgh8lGISUZBM1YgHda4QodI7/2vSCrFzfz9NjPBeX6dpbCT4IpQOke+05f69MkoMAACwSfNv3yv0P+V/4iikox/uOUrF89crucv+XruJXvCjTSf7ucX/ukkoLoGvFiLyP9nuszCrwzFWuNUVEHnrhxVKp1MZB+dtqMgYKaAV/HjLOt/iKBGnHxnUaICiCCp9G+V0n4asac53NE97EVFTXfj0QTN502Kex0YOe8G6SG2XCDk+OHuYmdW7Y6CcnUA985tOiNQLXlDgl7VVOY4S51Kb8xlsM2GG6jp8ciwZrEoJ0GkSkLufoMNBbqIHZRY/dvfBVv8B0v08SUdXHej09bLdHnxIJ9o2dKuvc9lN+HT6IS73b8llPE3DCnvtdp87a4cQ9PtL6CfV4FO2RY/7oUIEatcEuiXmssl3p1Fp34IM8i6rtsSSVamgrNZlR38kLCCzjf8tEVW6ow3xuSi0+xkg0DU3a1eI7VRpmU7ZCzIw8qAM8Mrkhr3uCl0btEPLtMYZunaU+wcmXryOy462bmIr+PHhSpm0GM1Kg5QffNbuCOKD3dZlVN7lflAjVM9dTO6Hifur87B/ywgrnZRtMtqgBYp5DBm2bjCQHCN4UlyhDohECEt/CDpuWSfZm4cxJPMgjdb4oWU77YhtMLbfXsrgAgHSfHRU5ecwdoK2bqqY+pCf/WsYJmok2OrbT+VR+FVGyfzH5qGM6911niSwosDV1AxGxWK74EqX8kbpEOmkQj3SxPg6YdYNLe28OdWbsKDLlE6OLMiFhCuAmj5gdULiDxCu9xrAgUGtMUtdgwmw7TGosslEULw9GGXX3rBCIaGhD3fHRks6HYb71BnwwOBbeRWusFX9yu0VOxVfxlG6hhA4Veh43eHTJLc5djvdbooPYtHnGd2ioSf0bg3A8ZdvWepb0M38nmT19U1qObSdsfojov71hm3WvXIQ5L14uZWAzqDHuWaPGkhcbJwB8NFi+gcjxurwu34VyBrpZ+7AiUc9IX8JORSN3NbymD6+GYmCOmPbHGmoRpar+Cq71bXOOfTzyFbLxTKO/GoLrwJM6Pls1Jtt7bLRYxtAp3ubbVK2MPJc3Jxngn3TXy//zKPGBiXVHcxeFjRANtbexlQw1rGD0vE8PjMfyjgkhi1IncHBEXNg46cCZVvwNF6vj1Ua2aFTPDl8tt4JXMFdSWhyeBn5RvFB+fwgj9BPbFTnr1maldCC8JJz6hrToHR/clgsyPubvbsWBVeCqfoM/9QRlMFplW+1vHRN1Lxim+UJzeOoZwwhWWtchltm+6Y+seC8AcrLX1VSjGsNSV0jyxu+vQu6YT/BspwH6DCVMKq8oxdL+0CrXSSIYvFS1lplXkCWWLARU8AWqvFzYY4m2zXwcKn3NGsHT+4i+HXNiKa8fzrDx2t983DyeeK+PH/TtoJNI0NZdoLwoKEqz7KsqzRCaP2b7l/eXCnPd0+MwCwRws3605RYwb8L2pZeenpU+J+t9nNLWAX/ph2J80fY9uMZGWtIVb8U61NobXs55WnrFvTlvr9oJ6nohA1Bd+UNeKsxI6cUCJ28aPIlFuJU2cL2yQXu2pXEY1U6Lag+55Z6rWZdg4W4TkslX3/fkXYGp2Snh3oMYgBYWCuaMqhTNoTyIq6/fLPi0KwRSORNLmLIz7EmPGqB2r8T6h6ugDIm9TsbJlj8vPb559s7nb0+Nu5ubjsYMKYPuE+q9Pw1XaqxClGcjdN5kbceWFhgTzQt+c+MOWeYWHWgvmNGeHblTJKjVNWRbfz4Ba+lfU69QUhQmG6M/iK3Hrblv/YJXwecqc8U0i6T9s0fV8gurbQN7kfEyFu1F2Q735EtwlAo3XSeeZxYrzKtDrpgUVbeiVeuxm/4XniEatikgLT93WWDOCa80d3t4H9K3Yk6MWQKISTfGbULKGpopCMWEXAFGrbpW4hBIVHVC6xOz8UPh2tD1+xbcXe7bnfYL5zhHAtUfW4hZgdToxCj4gg/03XsjYKIBn7tpAZdPDMI23GPewmQ8T7570KWNNeB0g0pw1jxKKccmyJNTSz8FAP5vPU4qHTr8OPl2/CDLeJ/yBWwbTdJyc1M5LS7i2Zz+LLws0gUBNrlI5JQSCg+RTk/ChtGO7rVhFYzUM/BGQbPoSagyNvtSHp/m10OS879DYXdVVq+NW9CJ2VAFrv2ohP51PYvo5Pf2EQIksRur7aaEICuURyc5p3Q94PUIwe9Z2VXHo8W2WGEnCOapBOr6rQUR4KKBYTyB5csMBzpOWnFQlMfjCeyEBieslzd0zRshQaI2/PN10gkR5jcVxVxxA0nCir0VIrshQn36ZPoPX4QVXRWcJrtA4I9VAMrWgwVkIMlmO9E0EwJl0UptWSE39bJGMDheaqH0dBEvAzhF26dia234TKU+/FI5xFBvzWwqyu/JN0HM50xlgWKybemp1YXMI6avv//6H5Bjp9hRiP+SXn1wzps3acXRR4gQSRIwIf9ToNYYW8MVDUMPfONxnsDmATS5v8rWRsywlOy0KUK8fQ3kMyH2RlBHh3wE2Ez4EGCREJKDGUUhDKudjqT+ZnWMqyZHOMZl0yw0vYhBJUtxDmSjAeAT0TYiHN2D38yYd26E+0EggoFU6MynuSSq2BTxqooofgCn8CX6VQYOIJwioxZhWm1f+HI1ofL4IAq4rbTHj7qUq+tuRnkDBSgERZTZWIRAX4ysTakInClkGN9ETCMLjJ3l3mjxT4nvOojKLKjBMPISMZa9LpIgHff6ljC8WxUpZQTSDNB5tczk6UXEHphLI5gRe98MWpEu3n2tvwwowLx4rm4TAfDLrfsXu7xSm8YT+jFwJn8G6/7b4siCOyizZDTuIc9GVfsMrQrDsn0V/biLMF1O3G8wnDHwp+Frx6XKU2TMzE4QU5hqBFy83Bu8cCt4pN2rUhcDIL2dH9Ocq8+SbbAvpGBhvmXABh0cSE79kG6OioRJVtY0iUmMelleHHhBubpnzaTksWn29MDWZt1XynHmeqDd66/9ggmATycG9Tmk4wnZE6VAqHijDUJEF5lcl2Zz1mv1x7eHZMOOyohtoWD8Q6CPrxOa0UjoZehi7hR4nuLvCsuIZGM+wkcbiftiP1cvrGleL2BX/9m70OPoaMzr/jDfwSiVzo8S9yCMtsNitaKX44alOsW4KTwJPhi5IKNbOojsgQmuovE/NxrdLOoif4zT8jzHUpdjQfHLmDyxOzTl54OdA3gx3JXAR3SohrCff42UewDGR32+9XFH5R265EB6R5wqVH453+xAYRqNGvbAm3KBc1juUn76nn1BPGx38h3LBzCcGvniFwA21aJJ/7696ZZmAhoW3/EwVtlpFGbBSCyWyuVMV3r//NtUWWQVFEjLQSdjO+9M7hBpaDC37ugakkweflV67sRAq2/Fpqi/2SlIgprBcqFWNmBTb8hGwnkyXhDC02yssYe200OE1xdZtNF+OpBUQdREny1lXZAuW24biwTqM2+a9cDJr9CtPuBo8MeOYPIGfbPMv1xZBn6pSvm1HukoRC40ZglBmtahL5aeOLiElthPcGqrcna/5zT22jvQlvjpLsLstu/v6n90mNJrhZszxKfn08VeY7R8BtCrES3jgmAQzrBv0hPg5z0rPb0HdOq8K+cNvn7n6/gVcV6sNcxiUOIF4dIsIfinvJgXUh5Ec50WqAE0WpW8DEh9sn+MfHM06TAKztgdhl6AQxsDc4ZUrNM0Q4l3VfCU2FBT5ez+XS68XlqnDP0098JM2DuNI7/2Sq+khTO+kTx47Ge3Hf1zy8nC1pxDxPUSBqTMvmvefWa7kyWg2rKPF/5d0FHinbF9ItCVJFjT2eu+BwWxZJ0sXjrnV2mA9qt7Al6X93heToCjWeICKpM5PBeFj6VkkfHvI6utbezGuXO3nlhikrwYlkU8cFmweKFy3AOb1VRicdlCKJamf6Dj5eFEWltpCoxL/go5ChXsMT1jcfdtftrG82ki2FauNK4N+g1Z2REc+84V9e2tP0bI6/nATU8RbBYkblz4ZCoLtKrddDCy5susTBJD/7n+MXcblOE/IEmdHn1mmDWV46ZVDEvyk0LvxIEh+Xl1SgqDZaiz1o4SUv7F2C5nhQZQ0IvvPIB4dTfleX+FpDz45tydc+PK2OqRQhGXf7gnTfxHzB3M/mfxL3e0X9wFux7CVpGPzh9xJ9ey6JUh0C4bD5Bkpsxdob1y6K4l3oCIZYcnNoOk4zk2kaV9B9yPGl9YGKkeSWaWLvpwgZLGTc1h3M2TYhWP9XriKYMV+gVAXwgdlJ/1gsCer6SqdyQJjeHlHatPME5oZ9SCg/FL3gpbLu5cjwOovCtrHPkpzNGxVYo9eDWqszLYcGxmxtvJ6nhk7SeTxTP06q+UQtPciaP7Uriga8ki93bEySEfMl2qIwCxZt+1IDVi34KFpiXeuwO0KheLZ6F5Y/7nWkx05BLTBYtzY3nmhC/0Esqt9v60vyHFYwyauaJlrobdrBRSrC/IgweToFt3LETX/2e0N34DUvUMCwxgWoeBNAWZypvfszzHSms5+/xzA5YhDoRO4OddYe3ExYn9cfSjccpafW7conn4NqWQjnO8lUMzEf55OcacH8iuXr+xLpcy1IyvJq7ikGHWAl4CmNiggxxvFWMz/68hoV85RoUtUy/GLo8tS6zMMzCTM8zPXg5u2wFN1jWpLu2hpxpGfj8ik0wlutuErHM3NtXqOtbiqmm4KnJbdKtFFQ1IQPFnTvfPd5fWsY5LCn+FwqrO2ljdO3T0j7h5md3nkCku8zDnKIBcD8BbG3JvE9p86o9R3/IdXONQDZWsV9mWzica8mIvyU8oqt5WhqR4TmRlYfMaURb+5gfZgDnJfneJCBM5t1wSMZVRC76w2fWRmL5dwbURZ/YZUgQ9F15Y0kYeuarv8S/45w7JdAQIBn/1b5h6reXt2HiXwNaTCI4uwcxilNwTUD5Ebysm0ueJt8TKS4fm+kwcwbvzSZEji07lwzCHj7g6DkOXFEkO1K/tzRiYLLA6tYXjQdzSX+HZZEWcEx3HwDOiHrhchVc7HdcFhhD1eYb6A7b8suH6DTVBweOg5DEHlTdTcKLj8uv/y8jcf+X21qr0I8biuBZ/p23yimzBtozz603HyhSZSdmesOkig2oP4lwoVDw66RNmMN5xaIpMaxkRJ3wfna+dZjnbg6Lc1J4uIzaKshaTlgbN8OaqDaKy4+GzNH8PxyXrY7Lp2ZYagwhJCOLyy26Yb/70kFHMMNO3vPYSFlI7bIEUh2GgHpp8GDZwXkZxFl6B5OxoDSgr3bCac72PHigfI6dArD1E+xuFkDcPA0R21RRcE8KPXSM2AH0bjz/aWKEYQXu63Z6uYTABVLA4ZEUV3tjLdPwlzVuk1wMyxFaBBl2BR3mVpT0iuVVFSbLvtQer7Dgme+0HlP4wpK0kvVktFOl7xcj4Q9CK8VeLP+RJsZTLuaPeTzNAoHZdLzBp2iQVRLG2qPTswg8y7tqLCjoApZ6wbEsvQdmkvsa97G+6tgkkX1nHO6AEQqlteEudasFP1x42hrakjNMnKtVMl/LjKmMnCRffWNyZBGcs6wiygPLp4YlNtM4bhU8YqqpOYCTQTjLm/A8ipabRq2AGqPZDsLsh39LYMF4suVHgB9O/UGDZ4DW6TtvSnhW6xY7UAnAf3MfBWb+3JdU/pGZiP9YlsO2F7FhEUqIiWed4Rqsei7LZjqXztXNP1exiqy6cZXQ5ARtuBFpxszxMLfKNOA40iyARbRhGcOSKCliOxiH2rhML4IWoe0Sl2Bf7DgOoSirbCqMFb6chs8uCNukvt/7L/TjRkVk240xaTa5GvhCjnEETO8L7nA9l9+vWPhlQcWmHQrWmhHhLZ5t3TNW89bffNnu6luDyC4htmLfGezlPYpl7BGaASQ8dyw60WFrpvWxG8GChwkkJYWwdARWCR3UMk0yUak16klOk06O4jcQTRM6OxIMfh4kvojsd8DQl0p6ieSSw6/B4CskQQnycAf160DUTrO9QN5vQM5kJzYdgqr25D/BIo9bcJVE2JiIFKb7c1veIZXVI3hH++0Q0jYJciTLhkj9XhH828pwow/v/B+/xHU5Mbv0LR6gSPxSRDAogNY7HhQGfyjaeuu9eES6izWLuVC4PmcdhUeVFm2fs6xgPLe6dSVR224vXZ+HjFepWWBcVc0np1xQFiReaY2g5nmgoophwSxnXJ6c4mbFDjkixW2UbyEe9jbFdAVcC/vtWmkHcUbSeBxmeOy9zi9YHtac9+t1H9ceX3OiXu+3q6j+q8Ec6qiavj9u8FtdRxH++9Mk/XYKllrpfNeXGuVCGpRfkpeR/c5elZbP7WSaf+aFdb653mIG0noi40AvdVbjHjNzoTsfFC+TplWeYVFc5hbzP9rmXAzKV494TvikZltY6Nou9A6x9083L7NNSbVL/3mrsQ9DPbCTEDXxYr43b2abkKKIVsxKT4Ao00+R8IKCxN6zuUYISuSDRf/cNOBx9Wrcd0vIf1CazGHesi+dsbVzK/uE6tvkGl/dfj5v6vBZ7w6ZjAK1JuQfJoCX4FoogBGbVpk2ld7GFcenUZUTW26c0KAKhUXcbK70CVfG1WmXKMMohs5V4WBaqAl76bB25W83L0MPh684R3ELteZzR9LD1AxkdERlmcPOKG9tdmaUXMBt3QzxqJy4ppK2xmK5Kn/iNYdH3v9priNiZCHxVM0UwHiB2Nr9WWKdieBG+OiFqDou092c6Go2o8n9e+8tzaMcLgN0RC1LVc5ud0GUd+2mG1jtn3xPs6wZT728S8s8LMjpmJpXd5g393d0blKdlRtCp3G13Jqc8HnLcrOh53qTopDAYnITxyniT7TdaA6sZ1pT8eVkGn0SnM6UlHqinF8g+v0UpjkTGa9PnhKyByb+Wh+TgxQfTHw4CenIJEh4kdNrQhagUEe2YUB2Z1W4n4YpBEfum0XAsy1QyC2u1JxpGIdcN2YZ4X1W5wyjgLG9g4YGmrd8FauHvlv7joLx/Be0cOxDSimhc/l9fyGUdGhp5DJgIvFE8Jz2lk+KQreUKf8zG3XI8xZtvc33+hhtz1EpWfmCIDU2BHt/4GKGI1mGIbMROCr1NtPzTJy0Rs0CKJaOlPcDSvBf6TL8qP6djFclnx95BrPBaWPa48ixZpNuUUpXvUyAZBsf8KqLGG9S0BQJvqPIDSRvbhZLVgQ/+kDJZbkGRPyjI9IMlFfF8I/6JPutJQgfaoxA003oi/+6KsSu3Y7hgZuplBJyfMhDunC6qFFfVUaUZ64y82T3tiuM5i1KmTos8bmXWFHpouc4gl47xO702FCyV9MeOfWOBn8R0x/eUhOBtUGcYVBfdTAecrk6NRYQMteYC6iRid1UimfGHPWcQqdMPSle+hDVLv73V2hLKNPuqLlr0j5840ndzI/cSm+aS6Kq/YUkqsHAsC7+tpcrD9VJzjFOiubUTLW6Sql66fGFMukgm67ie+1yl/VFSIjQAApDV8D5g3JMHoAZiWlbobyw72+71MGdKKMWS+WsfoM7GowH+bsXnP5GmMBawnMxUKWM5yR1/clALpLhKenRxGqRz2LJQ3WjczRW+qeSVitV5hGeXhzN1Uyi2/8CNICoX5xFcdLsEyeb+Y9HGZhYFflgnj435xsRklkSfpmibhqrEf/Gq38pvuEpiwY2PqbY0a8bU85fxIB9Pi+uV19e4pnZQ9pMmn53RQsNMkrTDz4EV/LHzqhVhvGcSgaCPWKc8ndMTzv78alpvalvy1U+m2FWfnWjSDmoPQ3/m7GMlE2/yZTZrvXiEIZpwQpBaz/n4ROe91SUns1IVInWXeNl56j9knuqSKifsSeq+yK5e236lsZlDu6ssXQKVAer7p8V80qqA3RfnQtQ4W9XoNraq4QfBbVVau7uCS7GdxiS1F0TuFUXMxZ2GNTewNLEUm6LtAfWuVmhfD7DpV87k+eZUyBNN6tPX3MgK7bhGTR5rRaDZ5uSFIzBhi4qEp97WP/hpgwKCh75HLMuNbpjd8WExA4Hz6M8Yar64i9WE+mKCh93b5fvRDLBzeSX69ZCFR/k5MOjNbmo6rfzGbYxIJJfaavbViAp3DDkdaDCeqRyalK6O8rSVgcihYdtS+Q+6xl7pDjWleTkyZlXK8uJowK9XoPeNSwy+turP2Uyh9tGVg2emOqnJph1f2NYD3ld+LRt7WuSJ5v+A91/FBfPTe4rMk+VU+pvxxK3mtHEc0oGdcr5oqsX9+j31CvLY3XxU9vM5lM/SjCrpvu60yhJX2P+KlRzLfY0QZtiN5tULZxzmU1szRQ+oNI/oPIhUhvo3kYM/g12jlOUmiqbcAujNwbexBPtUOPGUc99u2ZBLlS9hIJtrqyDU1MKVhmkSNPUE8zmtOKQazZKkjnP/KbbMYA5ZwoQtEG1iwhAx5vtcYI+9Vd+d7c5h5N19U1TBlXur3xfLj5zMS5eS9dX74CZn2zP6uLr47BMJaN1MtvaR+P1fOM8rEskxOx6Z9L9z/ijBhy+r09EK5HIXI9xiMCwMQMREqVH79ikhL9Jp7O03z4pjYh3SOTVuhaQyzMssvTFhiNv0wm3Gv3ADh/2Ad1A7bD7Bpkhy5Opqv+nUz15Rj6LJ7UauHldm4s1KgpRPDFfqvIUfnF7x2W1N7M6SZ8yuNC3IVy8WMoHs/qwj+JTrI74UqevvUyRfsZt9VC6SE9blT5U3IeLm6BWB2ZX6q5O/hYjLRXRZBz9lZQ9nLG28qu/Ufgrwjxg3V9xRXO9Jd9pbk85kcixrH0RJ7jbym/Gwp3B/sp3Q38EV1wEPxro93X7C3mDs1M1Gw1I3HVFzChWA8oBafKWN0AcAmfi7+47t22Vh2WfLNhf/Y991twfpvnsbAUa8TyMMTPJqL8Ss3ZMMfLw+Ffe3SWQl8HeH7Bm7Sw5mwd4GLCgLcYa1Iyt6aEuZqG61F+qtAjrnnONlompet16ANg2UimIvAJEHZBRJZMQ/IWNuoKlDudjH0BhhfCe62CbQHs3y+uX5LnTPRQus3Ogr3VY64leLvlqBwhTrLaV6Kws2xHq7UIxFFiSi7KQeXqtmChA4qtd0WbqluD4MVbMRZkrfJNTVCCuKi5CK5YTM0+cbDLVoKOR9nFzaS+yEdXAzjIru794IehuZ9N5Q4yPzwCMNIRq6dttAOqUQU22WVvCzYeu9zRNTSeBWJnhYtJxR1tmuX/Qdu2NnvxgWtn2rSSjaEqmvah1fPW8VTIFCqcV45qTewtG61zQvUhmug8qBdM04tWvNBliDC2ci4HHvEURVK3yCjfd4+RPJts5S7snbU0/2mgSzRb4iJwxNxFto5PPvIa0FPHI0J67LN6SM/2YbwgQhoF6bxS+UbFxAzfpxw1+ewGCfyLJ4V0MeYRXwQh7ArA9caFbWHhZLd0qCoELIVU83ToDm42jwu777r6VjnUkIdQb2yHVdS/+JMzykqvt6UFQeb2yZT+D5dZ3i/JKjvUxM6pydDTtA5NTGWN2yj61SXPI4JRmALl161csPEcAXdljGK/EP+3FzZ+IkGADL6fopwqNLbryd6f+TCOMTpDYL6bE/O/9pK0J7NVLzMdiPKrByWgkkqyQGHrk28zpJBKrqVfOLCu/EUBxYC89S6eXYnBfcwrhFbfmgsXCrPls9+958Gw7utmwTGAHSnQA3XRcVF0nHw86dYerwOXmKkSS33/xUIAeONqe1nia6N4omGfkQw/ZAwJE6J+8bgli/LXC4MjiQgX0CeYU2m9tjXRaNRKll2qM5nmhpQyNFEeBa52v6puiJaS819Y9BIPU6siMvJ66HJYOMKUdabtmOQUEraA5hAdk48UERU7/fqI4mBsvPtoKYm5errWF0CiVUMe5mbr3UJ6nX8pMhmawXo5bSnbp+GZ5kCkmTDBByTBKGJwTmwiuvnSBrCNv5pIm6LYd5zV4AL+sa8uL0EtLR44AF8ryNq8OuIzbESmx6r9EgSvjm6+e9C/VhOkYiJawqREzt46wXkFw34dnNwiiVISwIsRCIL/xCS96Vs/VXNqFbnV9MyHbue6+xJ360p0i5P79Vwv/V1WDD0XTBc9SrfDZD63Lu0vFh4ZSVONcuWgd45AbEi69gX1gu0yPKaND6O677U/Rc1r7NsqqOpNLC3P1+6Ni/5mxfBJ+NYwkIZMh6TD+u29K27ZG5+u9Ht4gsd/znt5fu9j6ZgKw1qNwimTsW53CnWQPaWXC5d6BVuIsTLKb5qFVfLgu/JW/eJjE12jkbet84YzqIT65MxP5vIrmC7/8sn1w4497HdlHvMNlkTHlzo7USpfTYa3L52GMw5M00Fotzd1VC4TEvYhdXModuvRTE8ck9Skv2e1Nl1uuPMQQYcgV0nxg2w/rYWRI1zUXIi5oJ9FmNHp+okh+piKB5LeD+9e8IgHzb7mcFxFNLxGujcws/Xui5v+E+DX0jglSmcvDNT4xsWqqjRhA/Rq4imZDSt3Kl/FI5LIBY9eI4ntDhOIHK+eKOF/Oc8y84e19zpx7iZGEk5Etn11H5KoYdqQiZ9FTsfOWqni+PkRY/mHw7kCrwUaThE95powhIUnZjntLn9doOtLyvDgy65mTAXEAlS0EylXsWMTJ4eNTn6e/cpfDLduOHXu14QK6L8iZHBhMGS1RyfbJuVvRvmLNCx+QaxnVTBhAI8s2NeBGJxobeorg26Z1tq4kT7NBKMkWFMmEeoCRmcJ9VirAgVAc/z/0dGTqXIau9aQeKaMlA5Sti16L1EbCAkyPHwsY+lvU/uzWBzwvK2pEUj9qjbeE3hBzlntMc55/TROkxHY0mYE6bMfeHTGhb8RvLvFNSZVUzMxYfYQCv798wg+diNR8zyzfEJR0/3ysTLme1K/V9La8UNezkVnnV9TuEz8wJNPxkvgfjID8rzJNv1nZcs5r/sqvPrwUeYbMIl8Lyrf9+LpL/TW4TxM5Tx9EkEmRk7xqQPjMFFIxCA3Yb0TZ5oQED2VuLP90gEIcnCHlLpKuraNE6mvzc7qsSowohZ1odhZrSBkHuSutSQB6UJM00/BDUq3x+SuxdhhTVZXqwZzQRYcmiBa7prEiU65mLHT92ayuXHnC0zKY2SA9M+tdtWRD+PT3Qp2fr3hETLkKE2W7Oi6g3lbcr57JWLBth4etbgqR7Qzx25fBytI9MiWcpS/Vjs8GGuP9CDhnI21ONsC3OUtle3GiABoJZiKUE01SLRIR1RpFeyf0L9h6O/7JyS2aVBB+PdhRwoG0sDGIiHQYjcr6SDx8WWkWAivfAwo2lhfTB40LKS+rSqBz6y9fK2SQeBzIGDtfz4eD3/LJK5ItetKYY0yWpz4P0joeD+wDHE+W2TB3DQqvC5Jq6vlNChY4uhAozMxK2l0XZYeRLLXiUlZJI7lQRqhg6qfx7zbmg3ZJys4uxT6zaHEG2oy4gGqseNm1Ap0jWnPMk2M0OcCGMLZNds+Eoshn0Sa9uE9UN87RrmS0RUucjIPCnRXy2orFil2vjHBHKo7xAB+JANNccAOwJAah5q+5ZqmCO1ZF7aT3aG24Q5+lkQCrbqKRFEWBW49Y5VZTC/dd+C6GMGih8UeBf8ywiVt9EnPOT1pdBtG9k8hvj/se9fj7CYZImf5ro4JQiBWZ9QfLsEomCz6YT68JIjtECo8+qrncZNIfEvuvwWfyb9sKgZI5wNqai9CR7OLCRXyS1aoTfsWw/Gih+vQRrXN1UWmiCtHOX8UQMAM7049a4Ws2u+yRASwyPiVuCRLGKGPpPAgnlPEvSVF1zSTvWHInEEjVLSNv4QGkBB8hLX+bUUOi50V5TBiyqDAxbp1cwn8exrEIKKdG1k/yU6jfgLZw5Dtptsuk+mptU70zVh57oTX9NLvH9GhSiQEg/QkiL949xCYe2uQQWl8l1qR/oMwFILpZn1ADIDljsXcr6QlOQx7F4UZqlSH30hK0/ZaefzkKXSdoU5BxU/TzvOse0ZnKh8Wid35av1aX7LDRvCpukiWZlLomb1LPZH7IBNdA1C70fE2HvRtAWldjP35Sr/q1XfUimhTkFrMRhtIc0oeww4Rtp+szdNMkYHfJzhx5IxPES7jtZ1Z9TQwqGZGyR10zeI/fpqu4rraZYM7yHSsift4H4oYu3BlWmeV3X5jSyNDtjdYJmimZcAXx82MooZ9cv8/CyiqQ6NDZWEEn38FsJ2apToeSVt0USumZLZEi+8wX/6eZGNEtrn05C18uYYRh9MTOjWaRJZnzhC5GLtwXgASwnWT0OfLnoNnpVukwmdsaKc6u1/EtYsrrafp+MeWd2LbDEYmIzzuTy0MO7iiQdykqGrKEPcwOBaK170DAMRJpgYY7eAbmRMlWnmYGnTbjXIb7pnj+MyAX0g75DNRy7my79pcdywFo12+/GSP+T9c8F94/T36NOOUOtizPdADvPMAyX+HQezsmpV3BHvsqV7CP5dGPfliRErlxkrzVM+hdWPLJwchzSkaYS1UgeeP0my2pQokuKIRtZLE/aLYvC4J5d0983fXbd7Z2fFN1nENnlqxtvYRleZ9UNvlYeqXmkkikRs0y7J5qNUNJoWF0PW1+H2DYbvxFbujKcRfR2DZWMkLq8kgn5anYn9GPx11i5yyrP/rM70ofisfjnbgK7wr3/PFhAJly05XDfq5DERTKUNspSgmhYjkXM4l8UFdM5XYRU3rXDRlsT7mnluoozdscyjpbJ0rfz0i/XoS90ojUBAV3cAvsgtC26Lrr7Kv4d5WHurZTR4fvc09DcXqVuP/Or0Qk6AvqYV9otzXTXp57B+bMPg8pT7amc9HxdVK4NIGnXOPypF+R9T+YUt7F5YU8RkCK+p9SVELqFkvrnPbBQfXD3VS8trkUPgWrcLWwrq+DTB1QyeRhUTf79iA+yrKkl7BMuzi/gCFxP6FKXaE+PEFiD8qqfroMVxIKAjYCO7a+OxIKUue+n5jQNzhUlWSjnDtCa5m+wpKeKMH0TMs57ok9L9TuMPHm0oicQf8qR6+nm6itnlHshCIFN1VfCt7IDiRSe8et6/Np06jTUy7dRCd8hTZHZ5GksZs9j+re2FwPSlPHSvGOo5jHwZSf/2nO1nEX6+hpGYINdzt04oEeDzQNZaJrupdVGmoy7FKxxDtQTdkPBdf1SscBVmQ9n0EQoA7Pg6bIt41RgmRe3PmWcyX/CgwqqRErr+ZY39jhHLj3CM6JLq+Yz0QAZYhRN6d44roHCyiWID3LwPVvBcstrE98KocbaD/jMk3ysJrOJlMxzwZSlMDusG9f0/bK050+P+riiRKaFdWZgQfxHD/ZQKOnQS4cjXWUv7w/uzsgFDIXDKsrK0GRI2tnRF9KBGIg4FWINEjP4OTgE6Alwqtfxik/b/SG7z+DyWpmrhYqlnodANjfyJRSSzt8CmHt4x322KtQS33TU8ECwoeloEoqlVFu839230NduV7tqekm7pkf7Qk7GsP21AuQuF/MuwiUVo1ZTntZoEGGvZ+CFR1Y4CD11oL9zi/BEbQsO0CgtDF2IXAtnjysS1LbW1N4Lm+MWekxnzPBttBsN/SSxNufUGBjQwukUb6W6pEkGtGNNLRFdcgoI1ncS75DYMdoQz0YusSKrPGgA35oBWreTHIUafyiKGkg4hQt24ZI8xRrPEZxHTrH3WBtunT4oNNdkEtYPsfw5JAHXJ9X7p2ORqTIMU0U2Y043fXJn1INrbxtw7yiMj2QGqJ8xeODNA62jwRBoB1nafLAVaIbF7Oq2S8bLXCxXKNgRma3xPvZT+/uupMMx3Qm6NFiGbUz6Mp7Mv5NEjQZeuBAb11t8GyxJO6bc7UZHGbKxYaJF1q865xu0ztvQiZXon6lN2tWyEcfvnEjvqZA2xu/THWjBKx8PIWKwsizdP+VrHHxbKwveolIn4atw+BkmIT+nKdLECv8iD6juEMXPWByN/PR0rT6wQ7oICabqQ2a4k8qKLv/U0wnf0MIGS/WjhpYRQMIIpA7vkHfsAYtP7ZKWwKu6TBdpvtoSXDQg1bNoIUMVu5cPfGGG29gVZzPMAoi8+XvbdaMkPKwbuaWVzT0AHXLXsyuK36/tAB+hRYaoCqBllt1yw2T7PND06pWpjNZyaqzb1W4TC3GDHBiaqLKB3O+uoGXqyGX3SlbUOaIeQfgmat74Oev/ESVGYsihj10ScjPLvV4RGdrnraZIBQ0iW7aIH+IgHIAROOJo1/DG0A1XCMtUkWh0oZ6ZlpqmlEmLBf6mDCm+iNnT2WLWp1KNhOXUVUNuIpW2AxaUSpSGb3voB8vuJuggdca+99WPhi14L42yzMPp+bRqpSXxj7JewfXDclewyZHGvhjeUmdPP/0xWplfS1ybltbWcEagueklQALnGCoE/bQBgFQoHI+RggBgoIVXJ6zaCtvG1BJgst60CfIHqzCgc3K/QoIuPrMc7VPO/7RWaqPyV9YwMqTd54iu4bjreD4xTRokD0MeMO56WRPr73DnAbhbgx7QxgRv/dOf9Z5a0wwol6RIAwv4xI3yhjIcWQ0bInVzI8DZv34Dnbk4BwzuzqGGcQbhKb5KayFxlL0jd3Dr9lDG25CK0La4ED2R+Z3UrrHnx7Xh/72MxC3/02md2MP8BJuMlnYUNHkH9pr7G/oIxRnCH6/mfCJEx+dx/6Q/CetViByJQwTft8ZPPRJxyC/onMIaoAsh0LxeZsiybG8/JLHUoyh9jPh8FMSX8y/lHAyu9cfEKXenetG95XjTgHHkdmnG/hPcVZebISFseMSaFVXwQz42JLiejkjf/7PlicwPZPFpfm1nYvIvt6UIhOJ5VcSTeDJY0E0ut3OY2aqm5q9sGDkingCgMgt6lqKrQumQStIyZtp4p9uuvSyuzCv53KwSoqH/ahM14jo+6rS4VzVEqaabKTJlyONy3G9XafNwFR7U2Vm09n/je9DYnXQoF9Incp4pbO4JTFsmsBKqBTjPkBeM8MksqrFBate2aeD7h3VB7vCRrqUoWM606VHiZGCZPJmZKhtnWdu07M5lYhm+JWNNI1ldjclp2/A1ibPDSdKn8muuOPqXoRwt3l4JsbZ5iVaCbRGfp9d+BbwHcghd0E+XMSIHDRKggSfQs91iv1AMbn9/q9YCCOXYVWxcr3zLG+HC2F9OF+14G5C/sEzA2EU7YxZY6PpcN6lFtUuuv6TCspeimQAM5yQcor8BEH3QClQyFWA3fRDO8fALyLxvor4TmK7ab/6yqRm9nN7Orz81/N3ZP2RlxOXGn3/OZEJtGq9ktOfRRV+fHdl22llbrMEZ8YnrwCg0qxyHBz+xqdLTT3+XtZvoeE77WTFPmjCyyXhWwTWQiDePg/11qZ0+Adujs1AdlYDS5ytwXrp+coTkxD76uACg5kQFHp1ZR2//FsAHcgguJiUlTdSGgq0OVo0oByVtBw2ylwLYXvhyN3ySfBAbJfB4+Fz8jKrvouHwm6JUkb350Q5z13nlduqTaItWfvQjqTqzgjsdZnzFi3LqabtMaOZfHri4bJN0ZDHWqrA8w8SCQdNO6NuYnDZ+eSq30/Rc0j4HLC6ChMp7ROftX7xk5LCjFfXmYNZm7x7eeM00PFufkFa5frcxoEd6VM4DMOg98hUbP+YKYYzAfIKok9HQh0/EOWX4pqbIjAlrvWkz69DzDaYmn6v1mKkHw/qipdxdAPIa+3RgfCbGGbhySZqkbaL6jZkvIys5sdz0k3NHEgc8DJXsPYPdLdKksjxnyxbxjkQKOoCphC8nqUrR4fwGU97vuXIyaNXGicER+8K3egyBlR3hS3f7zMOEmzFjUlS/Z5oNF0b1SU2Y3IGei+e7bPMGITgsHJozOJnYDoP24LrkOgXIvPLckbHkcViivRPLWVorUCIAzqwE6/9pJ4UQJ658fOQWGsWjfnRfYSAVbWFOkeJs6ZdE4qoF2DYhlHHvaEyqDq8kUo+YuM4ztr3byEfPqBFWpzei1KwCoY7xczJqx89OkJbVWDfprxgTn31O4GWbsLax7DCtvYaexwK2VlYgJDGW/p31bAjg+nWc/wmnhhCyfVU8kVyWFBGJaoLudRqWjVPB4+UFIWkRLzI4akesufBjPc3kXI+yX64ZLC818YV3VKyF3gwqU0jdNsMd5mVLHXYcpyeWjLLrXFCGILqZaazZrxsSRb5plejlEyzrYl3NwoJg1QHjZyiwNQhWrBONsE/3Yl75ojDIvRBEa0w/hISg1BGmA8vOrjrKIbE49toghxJgp4e1x1rES2JfQaaCTJHgTxdjqVcr8JV5tahIrK/eW+35NppFsR0htLwKLK/wqe/gujQ5CJ5ZYL3voAdGouovMMEfYpEFZ5pkWJbkqJ4rRBM5eRCyOageoWsyv97lhKAKCC52bSlcMYqaM3PdWiYax8pARhplJ90PQ7MUl5ztGHM6EtwsM4b17WF/yyyyoO5zh+FNEssneRHPNfvWS3k0UaEL06f7KENZ1SAshH0s/08MdU8Uhg1zQ4dRjfGtXYZoMBKTwx2urr9TGITlouKrhvJxiTmWnCq2uVUavJCbjmsKRn32RFI0NCe15i0lKnnTq04Xu/qo5q1ZHvNw9TViC+K4nQc917WOBChF2OEVSCEX3T9Vonh3HTSmEFySM9LGjrvJmKZ+doWzpgN6CazJ0iyeyKAnWVvzoeUTcKEblZSo6OSmcQOt+BkTHPPSE3MPnPsoCxzh/t566DaHvByv8OATvh8wNCAetRUPoxaD/bMTEmDse7VrYytWuhqOjfFLuYhVzR+3j5PwJ0fhii5vzEBXR2sJ+SglaLm/vGlEEoeYkqZYSfTUkcXTQITUi5MuITkVEImhFrDr+WgFRQVkZB4GEfqcW7bwaJJWUVJHVNWWBfWZVFhczn4Gkgbz9P8bMhg77q5ksXDW5X/VzCRVzFsYi6EgHGs0oZXj9rHavmmDd57bu0s3vu3pueuQXExZb9Ao+MKOrOuXUZprX09Z3mtlYic1POmFPlsq90POjgcPeK3/dNQjPrO/P8vyCsX1gV2OayBcmg5/fPakSOkHlzkCENQ7jBQaCg3fIHRfUaNFquRQLzqq7vLaRyGDd0bPzFGW5dMR0nY0CVoK3463ns2FLevriyaFZ0zXNclH2mXK+vlKFTAesOCIdHF7JuUcC8rq6bTS7g9siZPhnlg3xTWwcw2ZNYLYvVUpwO2YGv/H4aOoCCzL7KVg2tzdgKNWKIXB7IGnJyz9sh0yNSTmfYclBAlFNRNedolRBx/dy0cwHBWtGVZ+3A7W2tfBNJJxrKf/ThZH7TMkVQrV89mCAH7XX3mq56pd5XoYkiHkh9F8J2wnx3QF9tMLoUTqlUW+4yYCPKV7GNlqT2DejwSAtcDQM8EqttVj/Rrc/p7rEeMAswgBysCMcc80xO94wOLZjWB7MjvH9tXbfQro4NsCKntaa8KduOoR3IVKNrEddv1rmSYuo9UPvj9corF2/GXD/S7iM7iFF07MaHkUW3F4UKXBPF8dB8yHX3GOpghPQGR3uygOYNHoRxpy2OqVa2hQ2uQ8ZgHHWSxC8+fMGkPm0eL/GIXTYEfuCOKACMRnerOWXfeON2J6hYsLhyyFF3K48TMqEzbHCzGHN6cdbFuLDrYcsA+WD7hTp9c0JZtN9mmNTodruPCldw6xUwgU5mlOPbyGaTeeJ7X8Nxnx83iP8xTFFB8A3kgEl27fR+APqgPFFxebM0MZ4fhbaTToMfrjJ1IRW51hdpVXnLUnKjjetvBVQzWs5gGs4LkLGwZGqXLe1w4Igc+0yACQD6VrMSXyI3TsPhOBS9uyzibVfi2vCOlZZqGgCtPrOHQQFxMHI6SbaY2IsU5aBDmU4UMzoXTxaIqWkR7FBw3y5/fjG0fkCuVB1jJGahtONgjxiRhYKdLcQ7BkNdxfQSXB9w0amwNHhpM43t7a4E0WOQ3xeKRIbTFI5RvRIFqU7Am5vAKRU/gGKjx51in+tYKw5CfaYZVT0LhaAPKE4lvDV9VJwCjt+Yab7J4CNxbTJvVFMrMn2bPzob/hLp6pArrpBV18i5EniZJ2t89AemRkRNRRidrevQpHuwxWsJTfzCJUVkb4inQp1Ch2uCEkBPIweiSD2Zgn1igg7nnmIIAmJOU3iRbCQKFbXozK48AGpDwTTZECqiIPRBxshwxTZyr5sHk0X1S3JP5xVwVAt71WVi61NtU0PlkmDzzL1eJr96YVi2K8hTa7vVPQ7U/+V0bSyBfVgy/1jQnlmUEN/W2eaUOMzgsrcg6tLKkZKSVr513N6yaIzja/h8ZJQLhjTzwBxFIrAA7UuAVLaBFBYSEFLj3EQiaAeFIABIGADkD+JcU2HgD5FEAXCoA0w6IgwD8IAYMvgVEBKBX8sAtHKBOAP6hCGzCgJtOgDCTFfj0K6C0BAhEHlAQfZOu2BgACABgACAAQJAyqrAsINxVDYT+yzNEB2prGMNanbvHnq+n/k/zXR/eurvPxQEH6cJq0Y1fj96zW/Q4tN3bZfHpD3+7paS3enxid8e2w8UtBn3jsb+7IHcYs/uy1Xv5+uXWwQx1fIIVSfEL3CEDXsEDMo8rOKA2/IMBsuITJkcDfCE0aDwmhB6V4w/BY6b4H0qEgQiiME8C6dAaJRBHUFpCFjSgArJh70kRGZ1Tg6g4KL0gdliA3hAHLDxtYQOORjs4oFc6wOW4A33BNbjzdITrsXa6wHlslP7DRQygKxLB4GlMVePB6InK8GH0SDViB5pThWC6SXDj8eLxAZVhQ/hCNeAl4gsqx58S/0W14gcmQe7xHLHDjeJHxHfMRvzHwwxtcAkfkOV4Vf6RVCj0+IJZjv+JnR+UjN/GL9QRwusFecA7eI9sxN+V/49RuWqqjMMXcKrnjIkXdmqYjKEX9moojOEXlmr4jNEXOKrrjCYXHKr7jAwXUGqIjfEXZmrojJkXTmrEjAEXHmpUjBkXDmoUjJEXJmqojMEX7mq0jBIXGGrSjC0XGWrKjA0XvQxNMcNjMwxh8M9jwYzh8GtjJQwx8CdjVMqR8KdjrMokdIfDjsrkdApntApYMB6nPQw7dOfDZMpMNUfDNWrGMAzDMIyaPCxaHIlDXtcoqJM7C7lT2bS0PmYW9kRmhamKfZ15WKveF5VLrnDFKUipxRr0IVwOU0eMyXrez4OLgIPkOOeLforObp4s4RSNs/fi0rC5ZATgl3kowbDty21p8eHaHgLFLRniEkCk06Qxjt1AF4zrpzmT9skP2cAdmJyCKoqEkXHLrr7lsokZfkVUdVDl8LZQB6xw062DehkZaGu9LacfHpOucvAxkQjE47f297nZfGX4125BmfD5pnYp7TvPp2q/MOgoMUFZK+IkOzcZQycn9K9uRlMaEf8DjHfeVRejLJzSiDGpp7yRDIRzvS363vorGpnY7XIks7YHT+fKsqicSEV5sDfHexO3OHAFqG0uvjIZIewWDzdO/bDeL8sxyBXv4wwDWBszRZLaWFh+mNlMnXYEKSPyDoMjFgmQQ0F07skkHrLZPGkSWoykf2QaSLl8jYx7szTTcSHl2HSRp4cUOkReeMTeAR36KVf913IJd56HZmJtUhD2jr7pk5EkfX6Bu6e/Qoz+9VjPkbAgjSi0x2PZ0Hnhu6t9Q/BpbkQ08qA5XqaQKSmBOpfEZ8UHCa4VlMxv1j6zbV/8mKj/vmzIbY6jzALL6PeSNLwxjGfUxgcW3gozB+k+1bgkW/w9V/Haq4g3dJPJPafWx+9b0Ac8sXzuXBb80ScBH9fBNA3Zn+dugVPzd2djZdAuQlZQh8RGo9AKhep5CM2bF8Wr6AlgCRbiBfa0nnzWZtm86P9DDnNNqcNXXQyzvXNT0q5q2JSp9ZxSLlQjVOChSFkIx8ld6ykSMYWfHlJVSBmCIxLtAxh3+124EkjLG94JzzkN4EA93/eC8/dexHBCPInV9fCZAgMtta+hJ5aofygEvil5uylcUesJSadP6+auKkh3mIjw5NwGIl5jIIm8CE5h34lJhyhSLSSGX0Y8AVmQGQci69JiTrfGe/kXINjUemNcGD9jyhx54WKjdPqXiGGOkdcRLByJfMO4Qdrjbgf8zSBdc0YBOmdyVYj3lPuJ54ehDtOXfwnwFQuywtxqnsw2SFz6gGZD7m1UyEVrxgwTcd4OhKK8YdiG7Ud8YBKZGBNGekODAHAVoST9UkoJ5hztexCWctjpv4Bul5lE8EgLmuJOsNGX4fQloodEoy5ZJPi4KJ3MbjwIataTTjFzsEINVGlCr/ukYxBI70kQ2zmbYlizNeSpmDDs8axAcsdj4ImXzitYRInJmi4yqghaXvawblBGFtGZp2lz147NkAhf+vv+rW9KkOgM2sdQryAZPLKt0Xeyc9exPANp+utmQSoTIJC++exZm1pYV6FOz4hnXNWU/Zewti+j5JmIBBpCbSaJ6acmWbxh5OgTZn1FcbrDMAzDsoZ7pM2kIMZh+rp3CG/0Dm7tonWSzdGYy+Mg2pyyp58wkc8paYQFEh89Q9jz2mf2mvVGwH2H8PNBFZNSusKhagJnpwFtPrTceU5Ft2FZXXrrT6dfx2faFOPi8Ww4JRKmJJvD5Qi4nIe66+Y2lnFcT7L0HiBNgU7pVfy4m0vnCWNlhDP2NO6uzUlcrfeWt4Qtz5BtL6piVw8SfW+5bfsIlwROSy7XGxlCr2DMIvt0vFZFZ1rHHJxT6LnfFMJtIO4JfCyMSkXoPqTPjhnoo9S3keehvMscubIyQAtTOQD51SK5mS2D4+g2jJYFfLZN4xRqAZ7VbrV7i47/bOjYiD46P66Md0RSnD6lS7Lo50yyhKPAkfyC8ARnTc85YPeDigvfGrR+tD1RRdxBRL1rqIzxFh4vx25ydsBEagEgoqGIkFcbHotmRzaGKONDREPIJTCNuVvxy9C9t6Rq68AdFjCifnKV4hlNwKHA1a1ApxGrWGI79KIDZgXfDBMk9HZW7mAUT9GVUqoz6yHiYJBA9PsqsNgKaBInG+tvNmD+bDsgDHtFOjbpnM2r1bmuqO12DJ4xb2JoO1qQAgDSommlI5VP3SfUDObs5JwLwVqrCNT++h5pmZ6oPugU4kZFA4lN/vhVgc+NArUqO7CPNB/1E+ay8ddTudPcBrcu4GlWLR7e8dazrROnq8AeqJ1xXYJAlyRMWbntSr8PpnnyWM/s8sK4/0xnssQhPrkhMU5cJy5dIOOTT3pCiqfDja3i5De7aU4s5he8LpPVog49p7m4VP4HhTGKIbz6nNJXlzLDAELDJVdovA3BOclG6FBowUObi7QJx7QFCqNWcyQdRUidrzdTXZsCFSdyV0b6bOS3iWQ87sv/BpRXKUzzlmAU07tVwioBQaesYakQTGB/CTl1pCB0pEiFWw1tlZDKbXlmWlRqvTRSxO2pRm+I+G07qkB0+cl33xKejnYttZupPmYKa7XrUdnnoNxANn1V0lr8L39BPi3x8ezYyWABaaCUKEm1TCAyBo7Dxi/Z+/XYABJEgAFWE9bs5j7LPI/2WVREdfJLcEeoZ57ysNhdsN/gbR3M0gQt8ZGC30IXeOwVDxNZT4anfv2OjW+nn1Rk5ne7GNtokx42wMPl9cEvTSY9RkQT/9vSxoIxqu/VGT00rmin+CXF7xboDPYrMlV5uV7QQTJGIm0TiDeUS4PyGoL20AnWL6sGEfptZZ+hz0Zn4LhztF95qLIqWoOO6pEkHzJn1paNxvRfpzbJhKyzQ2+UUQBwQnK0vVmfgrTCtDFLU2fiG3wAV032AdhYz/xTwgeVKEE4P6NzRG03q48A5UL7KvtWoUnp4vL+mV+tNagH7GadVlWDYRiGMZGdYyIyaBkzvYeEQ7VGZYGb+57sqxVIaN3UZvPWFR7CtmjBhpco5iv5Dp13ANxFDXA74ZjlnJuFduFHLzRjkoVaxVmoKgml1ly4kbdH198rTyooe05gl+wIztxZofrAA/EeFYhkOlzJ9WXDEcWFEj3jAVuX6Pcm8iuXEAFW8v0+1hUK71ddtcgZ4/6FIgcH5DBPskeFePh3DBiFjtiyMieanvkCeegFZrIhMRUPDH/ph9PgIabbN06IFXzLwaNjWDFgVWvsJb9ajT5o8gW4U9BjXjilm6qkEWtjULwOqrilRvdldyee0mJBs7sekmXhfNDs19VdoT3iXPrifhQkK+x6jmTpilz8n3y7KNpnHNBi92ERKW4hLoUoh+MQQ5UR8MlUr99E4WOoTQ6aWmWPqVKjcuZeWxiXAItdqkjmuqVPdmX8RO8Fy4HJASb8aPdwj4AXzRrVM6IGtmxz5WTgTnoqzCNz2r6zDQp5TUw/Xqe4vyN3uBqjSxd4xaSi+ehSEQkh9AKsDqATL1NRAyW78qlDlQXCO+HVWEsk8dMue4XspphUpgeccQthaAZXMA6YLeDGdrh98gKl7JWTD6T+DaWCM+AAuOUw5soMDZefAUSL3PrVw1qXCswQuEd5sSo1Q2GjibD8TMfpbQk3MVV5jx2b1MI3cyO6yj3gjDEmNysJLeq6IQ/gxc5pLACzOP5/yugZwH91vqxA5ON9sIRlIh+qwS08mjf9SGq3ISu/04He7yx07fpsJ0i4yKr9uVibfmndBVX8GEFiZccY1FkmA9qTQOyTe1USLzO8AIR+ZWwTbCj9U3tEoFgxdm8pcJwZWr5bp+st7OvaBCEQSUQYQ8ICvc7G6uo/syoDQMgfLkpCn0m7hjoZRqtQN+k/4aU7JpFshfc8IWmPPTo0ZDW3g3jbWkxxK6zcj91lgFoeiI9gHtVfqLs9e4eRkYzaCMeaA/4vfAiNgygpJFiZ2TTa/HBQ7KldqqhZoVxB/2JHdo2Xz5PclE6b+T8EZw6cGTfALcH3HDic03Al1azJn3liGrczSNX6IzotfBO+Ge1evlXQ3mOiGlsDmzURB1ZoyMkoEZ4QnYKNNNKThmorM/hI7Z2y9rC3whzEypLb7oGvbJQ9pyFNb4ZB6PKgf5dOSdWNvx88aa7skRfeRc6PDY3PbyVrCpKAkNhK5mM9bDfewbYpvjpu+Rt32u7xWrWTqqzr8l5l3V/tyAlofDfkkBT5XT9wN4gUCeNocHwAXQtnBTT+d/6t3W6YWnAkvjfdKSgPxt9BOnVidvRM/RMN5c3bPPrr5Umz46HpDaNIP6Smg8mz9tiIYO/Uv3ipGPIJ6k6CagCmuMu1inbwNNUOYBiGYaRwvvVO/5hpIzcAFsYqThbqo0wMRUV6V/MBg3H01nRf7AZKqSO/uSOKbR85vnQw8k40yW7lL2mwCVu2j1Q6lkKeMLR4EVXKAWYZ2wVdeeS73rNaTiFDKeZgyinSLGTgHN0gETyUPAkHnE8mab96+d+V61Gr2zleOoxRrpoG2H+tiajOkvRwtp7dYZTqy/zW0Z+3JtW6o8RJbPF6tEtJbqcIwvi9jAbA/n9qMdBKEix/w9AyCRo0IQN2uWEZW+pmpwyvHqFmMzg18+Gqwu709mLA5+xYrrOSgd2eASXYglQK1sii74sgGVegqb9lloKavuancRzN60HHoYFW2Xg4EdUzsYmmP1emNEobXZJx+9Ek4Ile2y1BrklCSAxDgmauifcilq00vbQZsk0q9JV4fk65aWR85TtQr5BTKSmr4x9Uf5HuLb5ZZiXRWPQ+pdP2dlUehMAXCKT8kv46CwdovhxscZgIeS/gWTVL4dknO8yLrelytlIRg7obkhHCZ8BispDMmRZLsT/AJcPO10K3cXXnZcHGQInWlPfdprL8QHEd6PLmcqcinmCHK7j6uKD+KUrs9o3haew5D6tSTPCvsZEbfzHbF5EGeWLF7uZZN2F02Ee+jQUeDAVsnKweKbBO39v8Nt8ccxRFmL0CuDmnJjyRrcQo3em66ajtiXmDPMf5jE95DHMWCIQ6lKofzDmBTJpRaul9JnxdaRbCKkyvIr3uBULJieF8aPrljfiN5xJgxifsl5+ebRv4XPsNXi2RuQtJApng1oIh9gYS3kETUXotElJCq3Rsn1g0HT9W/2oX0zdceQyGBUttTAdxk0UiotEB1wYgHle6pG6hx50gzSC4qc8a7k+xw4ELQUfa65uZM4EJrs5RYqSOUvLfIXq57hQ6Sn62BcqkY1V8m3Zkup06eRwJNCcC2kND5dgo82elBL/ZWl1JqsgSworC/svBGbYO2LlVEtwBU9BsbORwes/GYeK1ATfSLtZbLailozI3dvEkIYkB32vUiFtRZC/cLCdLpQrCVAe/IAQZS0UR18EBkleTRXZhCkgwmq57fe/p7zVR5BDFothBzoKvvUcpt80DUTEHnlItCmzs0tcJD7mcQq+uEmax7OUiwnzf0vts3aBJE4J4sh+jaRKLLFe5wV4bicWbjqpRnXg8pDxBaqZXSHwy2A5Cfw9gNVEMc2Iwir2cz3dLLec/Io9dyOmkjJztXSp5kFv/b+Jp8ehy/V7r4+dqjzWZu/xZqhuJAbepwNMhVJkDWfj0CtzPWt90ag/1RXrsQCfq8PLZH22OZZkpxPfuraDBXF7sOtxTsU+V18PxAigbQYBpGqLSlYnp+eXd4mUvSPJxopxERBuGYRgWZX8uIhu81dVBDfJFzgsnLaQd6oGxX/2oStWo589LMea5uDS/gauhGmk97ZgJ8bkTOOKPxsnmZHEOlFOhPF92yHamoW4LL4JOuAe5ks49qCO0xK0bgvXQbWhLfF/zmMR0yIieASMdr5Z1/KonYMLXTp70QOrFtiPL5BgUthCs+YR3FUQyTAR5WKbyLfqHx01RZ01XhhpEBLNAO6MDPrOecHYtyc2L/MrsuO2RMc72wKC4juW4gBvU3miBjrw8NbTXRRuG+MzSbXTQSdykPW0PDndbUCiAGNMJu7PA1hgNm0dK7Jhe4s3pO5x7VTn6rpUyyYTHfSKh3Mh00n0YQQXJYcrzZdfeU/T/hl1mK3JJ7JwMOV2gvgFvJPQ+MNBG/jLFZuwBGptp6S/BmtgWzBqE5CSI1lNxyNV6SuCHzZDTpdn3SCJNTH0+oSaF8adHGisoZ7KQbJoeeurAfsVyPMxZEvZ6DZQLuKydupKWSk6oRN8404PJgND/B2jXSAPkS8KGOEPZWsiHKU2PNCxVQ4mQtcsuhAnffSXUh2+fdJB5zXr3QurvTLFWQiYOgwRH0GPjZ1503JrViGnIrI3RYWOBUh+V3XZMF1he5TlOCpEOVj32bnMLT09H/Sd5mGGyAhxsRYopOUwuUY463nQ3PX4o1nfHbPKKjvmbuabvJPOOV9QNPMiEPy/FKHXZm649dP+phObqZs1jEmO7EBe7T57DGyWHbBn4zHqcyMZtwRnS5nBDBXFIYzRsrp2qOmrGHiBP5jTbkxv5y6RBem4STcaybKRw/t7xMGfxyp58Bk8nL5fZ1wDGQeY1S2lY++0JRxHAui8QF8kKcBDu6c84gjd7WUrJr/s+eQ7XRkHVg/JzprKMCpECPJ289HQF8ejG1Ojt5trTMBtTowdBqCa+TiyQ36S6Dn3x6i9aynIc/xDp7/V3at5lzGmtCaa+M4/HKPGI5KCCVxolusJAVDtQvPoLOHZI17gLila1OJBFeM4aXMnY+X/hQFJCj2jiktNzeHb+SEBlKqOtnxn1HJ6t4JxsJR4MsVFFTrFAZMTCH3Naay4Nq1qXPLzr4vUkt1Td69d7hHPMrM3/Pp87Rz9Jgmg9oEq/c6a+PMCmRhbzanIs+usMV8fzPuS6lfRSLrFGia4c5JH1SZuE/FqB5eDPTlMSBCTtyiJxB2kjyg1aXJi9q8zChC7cYhUzsBzrf7ZyVifZSdgc9aJR9n38KunrgqJVQ8o0QwW+5pAERfj72fLvCmiCnI9QPg4aNPQYJHKEptpfuw5NC0jLNzgPWoiMgPhE/MtCGmC/Cr+hR6IKPJCU0A+39fa2zNiD0yZqH3VHv/ua5xWijZq4lj6IIzGIYRiGkdzjdXwFSRZl10ObT6VfZGUYpYUwirZK8iEpeqk+7ZreffZTBS5w6S4bQorrOAPKODMc8FOC1xNCntjf9g7FC0I7VV4Wo2XeTyqaHTriguEAPaskkNUOhp+Ib9WMk/A2nR5ulXTmBM5rNY8rw+eyjGv6yNk/cHyw/sPFmtdIUDXNmN+4X0lVUnRiLRH5JSxpImzbwSm7aj4/e3N1jEPk2gZXmoHzzqhnKWeezvzhzQis0cb95p5C1VmlsCS0dvv8f0dIPi74CWUZypDgub79pwnlffZMlVURHpiqMdmqvu3DahWEULO5qvzvI//2p9AZzK5WuQdZlFA4QbuFouTRZquxqwef8z9ERmCneFcn7BrJ5PeTWTt7aUgKQwoFW4zAVPIb8pktWjHK79Pcio2H4YI4NoL2AiZNLwHR//aNjEOvX6Qn7BQIhFcp4te6gvHWealvFaq/BU4dBo7LLyY9jqUTx1uYCfW4igJAmN/EEsbGFj0jVfn2QXqod9JzBKNrrq00w8da57zQgvh2YFLpWt5OmwHlX6mn1fafTjRowDIAsmn+ml+N15NEPaZf9Thvh0QjJO4TcLu5S+Ny0X8ap/tk8PSi5NwTYlllM4PTv23V8xTkr6K4KiQWIH95xm8bAG+Uu+nYGeLf+AiGbrAFAdbNZcnrvUUX27RytPyLn4Sjm7RB4/KY+Fzu+rC2JmHYdm/34Cc0tSkYehrCoODFc4CVVR6dzWWeReSSbdQCgaHK0qtEWh0OfvMnbxX3dZIly8SNjCATJdQ2y805FT3YlpsHqUdqlj6ksBumQPMpYVitaX7R7wi8G1QNDmi5pI0gei0QCgGQW3EfQdI83JuKIvKi6LOuMEp8b7391o51ryrUL4TuAEQozwFR0jp8Qvu8ralAXkR/CSXTpJCgY3b9x91rfTbnaVVx1lKgUS9f3PeeRlcQh2/bsA5wAeOL2aKLmnI1A3Ot5nxib/kW1NlnOPhAFmuh0obkY38RLaD2wXLXzWgeroaMNyezPOZaB87Sgi554sHZOIu/gTHP3PHE8/bMVJ6rXGReafWT7Ryjj4Mks6RHNtwAfLnG4pdw9vGWq0dvZeAQBw7WSI6LbfxelPGmp0Xi57eq3NooQq0wYNib8n8xgxG1mwocD+hWxQIqDuwVCOc71tOw+9k/0BNEE34vumClvoDOZTc+hUQcoIBXTgvtzIXOzefQXziKEPp8UZ5B3pxmCKXFtZFgH7cSxxWA8rRoGNxzupNlU0Fdvy1+hxSkfWy0Ss55Ij8juC2J5rPaAblMa34KHHIVKExmuKJZF+uWw4eEjEAYrc53zMhYrMcdIkdDNcFSseQM4zLiXVytppQF/HnLV234YxiGYRiZy/qCb033YoYMiJxC3cxH+ih9ZxWYOprQFpfAEmAJ42mB7B8kbsvECCuw5dwdT5k+GWBDmztI4+BXtt1nWlCmxI1RlgkVlVu8kb0h15/rkC64nd5uRyklzfIYFvr4+1gbnWzKPbxsEmTTGNyAilonAHumF/fOqtqSwAUI84O8sRLqgP9bHRaM4MAOtyH/snlCapmDevjVsx3VSf20EuEGnWX4NsudN3sn2RzhDUlAMNQ4PH7dz4DlFxy5VKV7HLho7YliJn8ZUDs4/zyz84OnW7iSVKwsVTphoN5gq3Rn0ci9kr+ZSoRksZv11WOhoLnvLw/joosu0/+q22Mu6wv2jawaLV483We9MPARHb6gKEfR1lAnpmIVhtNTrJe5qGRaPwea5p0mqg26U+KJKTUXc1rCrxqv+eZb+m74uDniyWNcaBEKA078AlZ+zchIyqUVJcVzMUKFy2oDMyPtrp+2z90ATLxrTyd+fUJxXM86SCWPxpCkY8h1xqTJ9MxaV4QhXNxSD17a8lYRrgKwSsDXkplZ98UNHQYkQbNQetUtcZ/82aGQ8e9UaDqfdQrocwXGjmST86pkc7DLkEP/zUQ2NB51DtGIsscMhZvRBwzOCPptu2CWEi3VvWcyjC4FJ8SjCWg6TS9EijRPPkJ0H3y30OqDjydajEbg1BG0Nd2LwezyPQHt/QGyL4g4xfvvj60aQKJ7vKTiw+XFZCtq8vr+wjnGJjWtCi+4oSV50QF9ICpEgYBrN5d9y8KPBl0Lo+zfhY4aGJGvAuFA2uolE7ifROQlB1JScO622Of4Z6xRoQ6Nr0FOsL38dcfCpZmRHe1Y1wgb7dOYoAcQ/MsRiyM+ufoyRu5P5c8DwP65KuqIQkmr7mgUVkq9MKF7hJHDQMxsTS8wIOkOgT3ka0q2WxnfXQzsh4D0yU5lkEZUjG/MedUvUKk802ZSlgRWfcYy+g0rtO2bhTCte1h5GYvT3Ile66mo/oyRfI9BF2rZcJkS+pP0dCiQgd7dYvbhHDIgclT2BOXK0yDlGoBhkdJsstcvTkVvHz19o1a/aYyovo0am2fi/PEHE/CsBOapnfTwVtURZV0rN/JTm27brRNENX3O8GBK7hu0jRfQ7pBJa1T06CAdRbBB8BJNeTsLbvB16BQ14XeAkXd+aso/gxLP/0VPDLK0b98isZY8LBpkxU6u2TiOGIl1Yg1iXyUS368TqzVqFYbrzInH2zVUUrP6bdxuMoDjXuUwLLcItSGpAbhZWPyVpwiTArOtu9eqPAv3h3RHkqoKcbQKODHd7HLdRJ7v50mBPILBTnZOT8OIhD91udpQicnWp5sMH9LnvU1CO3WowBQLjEYyu9cGIh2GYRgOu6Vy3JpZ6V4N3gHCTtYyNmnyMbpwj+mvhP8Of3NnIVFI8bH1vit2gB9JZoI9usn+y86+xEwaNeC2F8TUkcKqJrTgAe7FmV+X2+32RdGb+aRaXgkYLpqW/wv8VtforFHmFNwmtAkPBbAigVQs+4FmXmbLdnZeUrRHqYZaXXjtttvO+sRDs5AKPpaCgTjasaQpJkXKaMP5wXp0HLFybJfaRf29OQ3A9uEVNb4GJC7HaUc1KQGTIcvGBEQJzGxmBzRRGXFQiDrl0S6tCiEa9CIQecFAGeiQWVH4BA0mMVPQ8ReoP7+rHtteVL8VXPSddt+BczyWEmzPHrZWIewqF8WGVogGjHihHPRMXeraF+XczrZf2xgAqJ+6ZQ+zaUWiKUx9ktkKpbUJi4InRP/ffa5KzGKCweRb1x+SL6F2/x7IXmbrzYyyZY1iRfKu8QX3nuyYgkDAIafUqcc8M9/DurzSPJuQ0TTvIamk4JWub8rrkfpxhlFqh+bOHRCspvljoh+Ln1Z2GjwK7LjJjywEciU24O1GNlzc3ExgogqAAFe9JoXkupQxmN5yJrnyYWb58fRb9TmwQsCJMSRTxOFwtwmugDBbBgoBydgS7xr6w0UI/eC/DTTcCm2aoa8uUTNC72QjMgEqYhWVAfQHUHGoJVxqmMIQc5K7gQnqj3VeI8MJseB4hEJcDmTiAYEnhSOFVKI/a6FE/Xh9xVHO6hdlIVMyGEQZPxJ9CEeKiHiBWDFKbV7qz6/EbA9BOf1tynOYwTJHBJWcFaFh1QkQ9oflU+b871bMHddmv+emGemhrGxf9ShW2TvSAx2ZyQZxWusqitvX1voRj1MgGoGgp2rVzN5BpMsSSKyygxK8Rvd8f5rJCuYNJvxyYYQ8hfSnvZW+NqrlSeDMVs4cT9J1mxtHvrOMvh+ZRTQEyvsk5JjRl2PVmrbY0moArbDE5am6LVXFQQpo23VisdjBdRduLDs7eacUTuSFFWTd3m9SK6gpDwn/VS4qGYea3v1pdV2x+uXUJJvcopKxRwVn6iMfc6oe19HRdVKjMkVjOsp9n84MPMBZIpxTXJInpRi8W4J3Zf8vD3JCUP88H1ctNT3sAkdmCvUpna++ApW3LFwFwtwU3fzk+ltJ87KDt4FUvDCLVSy7GeI0j+3E96oxBWsxtNf2aJqkhXm8dY1M/7cVMInZhmeatSSSV0eYKpfpf439gsehhCewXXJBo16nwoVrqRLB/5A53tDCOvaZW8KHrY8En7UZaDgnnKoAWfhE79vXzZd0ErcCQGaZ0yWw0lXfv4JBZRX5OfJ+GjPD9OIjPzyscmgF8Ozzijx0RcCcD6LKXY/v2Vwa4g2cSPexHU1MZG9zMbcE4M22QDUkgN9IgVtfA/UQAYAAtFoDOaoAelQlCr734H9HhUkgWELapGRNQr5LGC4MF4YvWPu61z9s2eCc+5uDB3495bw5CqPBv1e4Dxb497JjHwUKAIxfcWrLfORtJO0p6wNsYcDZ89otWck35xWU/dubYzi5/avjZ9zwHcz9M/GvVQffA5P0POWVj5CmH0eizrzO0TwTrHOo5Rr9IUsDZ1SjuEN16I41ojvYnLCTjeicQnSHm/PPPwJ8erwWACTUAIQA/IQCwQNIKABroWjppZDFN9ifcEGvrFg8YMsBUOgKBuWA49dThLg82rguBt9igpm6FBkNaNkNNbmYHJUJRCpVxkJ5snVTbHVDzgky29LJCyq3Fprim7+qBDS0L6V+cPnbm+vi1peYoFSX7rwObMprjVz8dVEmSKTShyehfGPnpqARdYgk8LalvQkql1pN8eGqSsCnzmLRu+oduzazux5Uf0WlLj34z4kOSWtVe+5J1VdYqfTsQSjfendTND6HFAly29LFH1TeWmqKH/6pEv69rEhBOTl1G2BG7yVFzMFKG1iPcQhN8U+hrvuzVSU2HViKWjd0Ka0EObEM152dlaWzF9fFPSfVvVuIiT0KxXd/1aV/PtwkRgNDXWY/ZChlfuTiRWpb9+NNmdgzKo6+pNKruSaxUqi7d1OV7r26KW6YoVd1T5ohV4n94uLdxbb0a+M6sQTV7da3iOzyJPJfZiKz7ERXjI7p7p2nGe3mP1UoPYVqhdKAh3hxtEallUpViPpkVXq2UY293yFfSc51BszL82SVH+rI7ogo6dYdFKYTSh4P8eLshEqNa9WAHNx0Rwi92KgKD8UqV7f0Bsef7T0+P1Sdh/zmto10sefiCdZLfun766jedBYECyneb8Nl//Uyhd/X/LXG7En5ckH7q7SapbI5q4+4E/u0S/UNFtg2vgLLp4FstWD/d79lhyffO7Y6J6yxUbmGRVizuQBvR6vyoeiuUc8z2xIctsnhMMtRYmn2rodJOWSqfGfO+fpGDVLy90D+4dYma3KfjzKICgbcv7gvXi+8HfF9pJTvBfm7bvO5YOBe455aV5dRdA8TWRe53laQj6O+1cHwOFnIJUN6GuPODZfdoESFPfRj6+HvM2IOGkikhwn7H0rMYEMOFASPGpQjemxAEbriApPjeiWDmKP39AufcV6NwXUGnAEAAAwESK8wTcGQHZGAk7x3RYOjeAeRA0zoIEVgr/GIhRUYNswWEKLRJKU7whwTumwPL1gTFP1aAZH4ynpZQw6SM0BS4Yooq6ymBrkx3RA3Qm5FYwVZPkWDA+5APZxhDRrhPLYgj0TxECWrJ8wSMXwB6fbgGRtZ2BBNMiuS2PRh3+D8s0u5L61NUN3zGHXqoPLfcpZDvNsB0AEAxwDwAhAqZwCnAOAGIA1Dtum+GuZHMc8hbb25XTwxfvyl+KtsvQKcmYZwC35s6coGDHPLek9hCqaTXfGD0EQPu77STUFD0ygCze3OINYV7k6nck3hKuQcWbbHx0bedKr5VnrnwwaPjf3WPJIq8U39HNX6b4FVtu/OxO38liDq4SlCTK71o8NQb2tc3Wh63jBbtq/HHQU7j67PrTqoOU8uBkHZnC0zV3u5F42uG11n90sfTLPlD7mKNb5z1itHa/1YLXKcoYFjNnmXNSJ0s90/3NHVf3XfvXWebO5FTFkAz3IEON1riFzPrEwxYHn2CnYojKCGofHWUqdY4E9/ml5VNr1jRzNLcyfZYYdJM97v3aG9Zal228kEvprUWdJRdU51ENiOb8uteW/UYLnulcBjgkKRG7nNbVkxd3nus4OXS5dD7rNHk4Wa18t6641eokb/ehty5269xqrTall3EwDVfX6FzHU+7+mPdT8D4IV54nX5zxtk/Rf67HhhPnmRj6Qiv/01V7nh74VMH8CGTxj/NFYG8KdXA4ZlAAkAsmdMc/ZqgXGFwGRWCbBcgZNGTlP/AhzcegRYF4BmQam+J2URMEeA95aaF/XOdRlBnxys84FiJbNinRcAV1mTsFmzVjCSL065PrguLZs14v50g+ewwakXdV5bmDoJu9fA7gGUXOOufyrKN1MkZfpcqNDH+NHc5YYJsmHCzJmN9asZfbECkPK14X8KFO9inL2VhOguU/1uo8/DpeRI5Vkw8+5PvT0fjr5jckt3I1XnTHVJLiVbuhupYPcuyMWqSEN3o/Umf+ozlufv4vNpNSTm5d2PMe8Xn3/WXWc15p63ZHUpeX2S53W7J11+eEMqfnfFi3Y7UWaXkl9elCfe1f/2DDsiDEdSJl7rGjQmaNGS1ii1JqI6quKBNIGgCyBLYNJRxajQkZBEpziRskZ7IQgiACMVRP9CaPMkVdyTcs9WV6A+gTXP9MKotKaGEAnoSTkk6D5APsEeO9KA0mqKqUm8EkgBMWxB3LJhvVQUUKPYE6h5/coWuNqGZ2yxDgkgYB3d8clGrMCz5VW2uaEIa1K+r4jRoR+Y2gK3p1vCi+ZVR70FKf+NkBrmod1Ho/1sROV6Y+4NoJQh1W0EEaYoEwK6yIp5a3Kt4Xpp+btXrUX3+3/7wxg0bpinhnXSnUBW87fEg1TTWMa/pDh2zn9m/9vL+dxHEzLu1v6P62ZjrkEsBvavtvvY+/HLveg/Tw5Y80b+Faa+6P7s2alTXPIhhZTB6J1I37v9n0QTpJy0lq//jJdXVy74epVRK0M92+Te7UdX9xdb+rkaD5sYBQ9Prj+X+7m2Kj15rl9FLbdlc6j3mDzYODbKff+ezO/awNLur699sZv0+Cvr1lbSwb9NGH6WK5+5/tDI18MzpMRkUh/8a3RHoqn3RYrSKSNIW1dRoPcQvVhUoc7obAYoGWN9Nain8HwhvmPUDeCmuDBEp+C/urWt5Kht+nRmhgL0LdLX92TEci+wwYrZVbVthkcn1J17PoBKiwZYCBAxdERZelgnOkLkM8sDQYLwzGrYZkKBek9hPLP58DaFVDGYrpl9slh5C9TEMm9WeRzIF03uAV81WQ/huXHS1qOHYGuE/3QqOlCyINdQQTCnuYdKwuSrL6GSNW5vsc9KQkKdmXfEsAk6DMXWla+yTXDZ7/JEL2YhnTPZDYhQ54CwyYzgjd5uy+FQX1mhqQf9vvE6kfLI7MIR1h10FJWIICsDEplvbgQJDcsO+vML8plk6dkOQjvwDNU7kXCAzXfyVSOJ6lVQ3KaxiYeCL0HBQkaP8HxUp57Y9i77YcHCuZ5dCAkwaeec3skV1KgeAvZ2GpP4du3P/XhfHfSShW1GQkl/62vkjP3KR9dOyiimPX4KAct1+PorfSboTNVy3l0/oVPKZro0cWv6uap6s/4SPK6M9vh/oJj+qXUn6gq28sFJdVBZlgbEek7kdEweoLAQhsvc5pBtcecJDrvhaXI577tup4lAt5TVkl7MYNTJuiuQRypoNenGCJmAFfbs/JhCKmnp2R3N4freHBaLUaNaVS+cumzqkdzMCgQyuHLU3OSJAFh8dJkLp1GsFulDjZKLKZxtKRuT1S2fglnxQMGrzfX/jpIuZeaTC3mp5ctwJ4QWQTu5ikJ7+H8Qp4rIFuAtbuoVoHg9tNbrQnO0Twp7Io8sCLCIElZ0ccpDJiaRWhZo3CxjPSYqj5T8VJJKxt/waSjSBkcqn2AwsE7csWuGY6a91BAJEnuQhYsRjqngos70EgzLvehg1kUBHKmL5eJ6laifWDKskUMaoUle0uh76iQGDmTpOb/bzwjiAnYhp9WzOoUS+fbMGjkNOBMQsFVDAsuWB6JaB+mUFd9ddzsrFynyOVFx31spfDeaJe49yuwcFSelhhwaGVfP0nGyQ2GhHNYYAGqlD9AKMiCRBxFVaBOxBtOOsI0LiiQw6riSD8R8qcGDx6wX1Dg1IRYVX+rSsMU8PzGCwGGRizYnp42zfhre5mJP7V4bilYYzOCxyM0tigm/lxl/LoOaa7nS53WmaOuETl4z/Ecs9Azeq/qWPEOM7bDYtx/RhdVihwvTNsTq+gusipsb8QKqKTsChl08OTPCjisXd6IN+Dd8iI2VGK5ckZgXlTe6I8BQfCfu0tAzlMtjOECrhlWjFRxBl3+GKkfzdcuZe1ie5NZUhALj2cu2Nb6iUghrPGrkfbV1eoa8aEBaI9NnwWGaeK1H47kUmuLmJsPVppfr0yXSAA10+A+QwVUjcV4vyPUHzTBqDEH5G15NNqWdgtiNHmmHv6n4T0qwKCpbhtR2fdhl6q0sCf/TFh6OLZWLrjEt1pMTlOu8/+v1vZurT7YP6p38oa8bJkl+OUyU1B3T/5WX9sTn/1ftq+S0VZ/fv5U5/zUcooy+Pj8/vt7NfpwarRNkvy9dGf/qp8NT+tD8+Sc/7D5Wl7fm518Pv7kLyH8uP36YTtfZD/LRPRaX3zQy/+Wo73/ntjR8f5SJPr210/82oATaj3aIKHtu6+33euPnbr2a/WX/+9oO3zVTPZXL+SNf79Yf5X8C+vXfJc96Ryn/+5/5LbZH69H0Nv0PgPrGBKUheDTuKWCh/zLA45+N7ASXqxurwAXu5JcdQbLUcq0OKmLgKgNbwFFiXvBRoEsLVvSA9zxlwRRFDxxhNG+jKcb25n48gafe+MUkDZ/tzUEYX+LhuCyXRX4h35TtWx1R+hWNywBiDtyHSNR+0jMMovKWL/6Wt+BBXf/u/V77ZBwHceLKF5chUBxYTfgjjmRKRY5eA8jq09n4SHJnEkuiWK4jveKE8OOf+cDHaL5vaLgUvtSXny+XC7qOfYTTVET2VUaayq8m9WfWR/kJnj1NhFZcDGFUKXFdBZ5ViQBr7sFd3JIFB3Jcj7B7z0gXlOW48+53pGpoHVUxmVrTCKZwlI1jcUbd7fVUnDUXOlju0aqwnk9HYiccb6wYTtgj5RBbGvRS2ACAlZavqIhP74v+LzixO/YJ6CRCNvgAlzwCw69t4TBtU04iSQchBgOxL3OwrOwfIBHeabt4wL1v52BQVtD8cV2RkXdBJmBB1/z1NEfIduOPfTXijLW+PZXbog0t1vY+zOwP/dfTFeZxa2eVkJZUfGNl6srR2vEoAuvW2o2ZKTJHa99ZmAguhwht+CXVmhpzvzbT3Fs3rmiFTVeEC5Cye0K3MONlckbSa4XXBfmBBrff+2vVLcIHN4hCmbixVF8aMZt+XUjj1J7vK7Z8WP97CbAhlEQJzUp9Iqpd4p9UnD7KrWpIoCIrgC6cypq+tgTP5fD81Sw8ogy7DRdWemBWaJihtP1XHidUL5Uw6In+ICuEKINyuePuthqSZxi7s2vi2rnO5P220rYM4cyPRcZz297asysJAqrsloFxIJd5a3YOYSlvgXNutCW+enitPPy8utqJrzl8ZkpAj2N4an3g7PihgcJQYToKf7EwNlXwJFXCoS3YKWL7E+7Nd+fUysGkCQ2Oz20IKZD+CUoUBah55ZSCR/rstNzNd5ue0phfhODfU0zUuZLRtw2+P0gszM7ohOngojICgOAh27qOqbQDp1I0Okmww2jiB/TygZ47nocVL5A7mPRj6/e0G4aEK4UI+uEZt1iYhxdzp7bocNXre2h3Mny9CprtYlyL2zAAfFqv00BqUR/Hu4I+2V/Sw/HpXkwJM/TasNwSS1GqiwI+yju+5KQPZVPv8njuXVG/Ir7fP51Pk1jTXxI0gtfJkNaI7GpBNb6BweAgbxjvi10sMdH2S/onB67Hix8Ym9j87I0U7nHZHJgfE04CxY5AO2NOT4c/6CkFcdZxHz3t1rbyNeAlFWdYp10QB5Xwa5uDD+T6j7LCi7G/Mw49ZVp8ICp/ySlT4ym4HsOir8EO7BFuMvtnmetTqd25T9iR4R0aGB4ysiR4CuwQc600QBFy004mfhfvDE2sQDHIDOay1wIh3yGtQkiTH6Dh0B6+DuTIfYHnlD0/+2emSAib+a0Doe5lEvO6tj4xz4gQb9RWI+iir/qGxD2Ggul/bxTmUfrWFdtUlyP5KNNNP8ZYJg1zoTgKskjs98E2rNUWLGhk9eoX8ryzWfQ5qqwIC+1F4OdMWhva7f9E6Hpr2yHo4TWleE77hx5ZT3umpUjfE7gsMrKS2+jLZA8qzNq4boW03q5Xvv/qh6CqWF80gP9H7gJ0xl1dr73n2DQNdWPHyEQGhU7iRjYmv5EZC6jiPt2Xdvy9O0H7F0qpug8BGN1+eVNsnO4IA4zeEEs/XOhDKIZzfLljh82Z+vLEC5JoRKAsXXaS5wa6MZ6lxPWhzAvh2BWDj7CXES1423eDfWFZ3vydUqg1eIU3MllWRvv2BI0XrtulkTuHbLYB0tAGCbs7zTbYD+z0gwLxQXqGlNUCFbZYInd4XrQK30hMKGnfy3zlWUHiunihLbTYVIgVO//pmKf50gCfom8YeC3ereftkN5hiWzYIVw+QnrEQ9pTrI8LQQY5ZZseon3KFJ5KD3fcw51pGGKwgNoavETyNy5b66kYZiEZlQJWED7mHm937bvTFw7uvBC00HfdmVEeXil63V6VNik6jikIuofFWGBD4QMFauqVQb8j3gcpsJmHisK7tg2zYNHiE9icYX8n8cuSl8aj+T4g5aCPSybR9CIcXisye1KEdimes3XAg5JRsWxNUsNQZN2rn4XJ+PHuv6s8hTvLbi0nKDxGp59X0XPjdxCHTGA3+Wvg1uWx1QaQiQj8E/6HoajbfTMYS2yOK7/s5We7VzHorT6EmvEWePcz574kX1VuMKBKnXhymZX/Q9LY45BrS8hkZBIFhs9URnAnP8aqdSuirmNglZMzUjmmo3fYF1sv9IS2h/V2m51umYGP+0sa7nfKXEHboVd0niar+GohQno5vm8b0v6MPNyD7+bqSJbXAb4m7RXCyNT3Sq0UKIP6bm7lJ7For3Y+XtaX5ym1Gp7BX6zb/Tm4Skla+bJc3YmGqSkOME71zXEkphcX9HEn0s2dJWbV9kYiPCuXL4YPl6Y1k+1QHkDRmCPb70RTYAeYYU6PK3igEeT+o7k5sUVPRAHvWl+CbdTmcbRQ40LQOiCaV+jQPdPpKGMKbQ9yp0NEN4VWs54AO29gFGHak365KaHb4l6B7VFhRh6lXlxU+3IReANCtzncj3S6rs4jx039jaJ/hPcsa6qoXBO8qUkjL88KP6BnmspHraZ8FG4Degi4liHgapDZYSUhWhOebcCPMVFRh0zSZEPDHT92bTV8J1BsE3bD/go1e0zav4UyUBIncSxfwF/ClUYAMcQxlEDV/VXAzfFc04h+LkeaZxdfCVhLoqFz9f2fU+BNZBnYair50j6cLyVdQujtfDNwyAcgxkyaT9MBm11WJpBR6aKnJ24oKwTFs2aKnv3Ghg9mshLAz4B24N2RSdDOe4lkTnenfQ4ZSJCPhpG00/sbiDfL0wrluGT8OVVzBJDfUm8St7bHN/9MAi7uOF3Bepf3Zx1AeSuFbhqJeisttYWiupdKlP/SXa8SjTcCLgykzF2FMK4KMw+MyU9RGRuYzSRxSXIi7ETtIg9ixOnSxInsBlafVu/v9Od1ANQmnOZiXtSJLYOxdPdqUJ9K/AazZBPBgVFZ4XvaMQ9IwQuWRYvr9SPI/Fq8I/E0J+vcZxNMJjbKE6azug3r+p6Wn14WqgubZq7inGKa5oSbnumvGCYYTFdDFBjUqVk3IERyhMcFjVPhL3slifzWquhAefTp5mW66s3zI2g9REPJh0iEbv3COT0AiNu3aCL/78hZQBiJcBDyHlQ5zljuI2l2cMFTBJfKnGmaWvucY0cDzFFePXU+skwQGOJEb1McdBMLwW+DXwlZ5DKYX6OqnrlANVgnTV7jb9DZ0Volw0eCFD//IlqJoHjplOMFEF+sYxxuiPc8eQW2ta+hL6El8uryIC8BX+QOOUFfbcTgZPt7jUWWAxvGP42+vzGerqjqK6x+GCQPJCNehpZl7dWBsL2gzlx+qCIBXpeMYJ+17hdUG8OCcc0USA3RnnFeOe9hHH/49e9WJtDYEdFpZjSzTHRGuxsIeSET6EJhzQ38zWSVE9FvURl3DYQ1Ii4OzWEF9x54OM/E1kWAvpkRooI5mZa3hR3LYyIoLpcEYc+G4BTucvaFQ3tWGuEtlX5qMsiLmlGlK37RbRCMVlUX0ABsZsHAWQvjSZ1Lx58ZbZWlZ2iu7BVsYzTcXHjF3v7YSdiDBQGTz35iTeSHjZfcQbd8zWDjhCXzXONf83VsxW/JHIg6M0bl6XBeU+HhOh939EXxgsgG86VlfVYKav/ysn2Yd26b5v7Ixi+TQ9dE85MXNdZS+at8LTobdfphfuVTkpzw2VUsRdoV3n5sRWGH6MCsICn8SZU/1NdMhRnVDlhMdM1VnaFRk3Dx0hx3fLvt1F5LRks1zDBxd3vq56Zec25qH6ad/BBGGiM0myS7PYy8bbzrLep4nWwdWoHk1E8t2HHd6IRBXNEw4MSVATxx9ZIBnXFfvZYDMGr4YiKk1tuxVNi4vA3ZA+D6eKAodFyGi2Q0CmlCV4c7dyBbg0TswIBpvAUctzz2dgOkkFz+3FWAI9YHZrDThgNTilDvtgAzquVQjitelbJ/+I6NkH1XrdIYrMpeVxp2bDyBnGnjit2fMI5bwzJJYaVPgsJLfMp0JwNasnHoTnRiiIyDgIm19pbK6ICNa6gHQ1tdMrof5JRLsQ50YnpMjy1kx22vvvlTCVBNy19/aEG7c7p/OV2lKuRMsxSDTgBSc5JcsMBYbCTMtFcYy6yx2e1pdJO9JBGOSN2nRiwu7ooMETaD1agDkFaIv9CJysKnDqY96Ky316EitkxJDwPm0YqCgYS0E9L1ypGCKpuLuHKxG6dn3g5KpCr1p+GKsznVPEksd1UwBUW3plEraPS+Q8KX24hBSDF6kiw7xwT1/DtRxgDchDDzTOfKWCovDJMh6o6UY7yXzgNmeaXsSHR2nJ4dywJlr5N2oLfj1UG23RU2UY8/nTAMR9t+jpaDnTlRsjD0AC2rGK4S6tioDX0H2WNnZZwo1EO8OJFaqrQyqWCBlt1XdTBbUT5k6nwk6UKPdeGLJOshE8fHTG4r4/q5ooyHApwmOJ+2h3iY7RXFRAcbJHEI7sMCovM5ltK5pAPOGo4HnsM6b7CMFTCKew43I9miD4XlGxTlTEkBC8FZWp2CV9jDDs/4BbaM2f3bBmQYFGFd0JEuQ5CTYsbURDCDjsA7SgN7iQmE+TTFz7qgjBN76JRibR5aR30aVwcYcZezOSCVzJfVME+45zeGWVxYNGjAQ6R39X5GXSbN+QXSTie4yWkacQmVuMUSCxmnIfcC7o3hsDNunoS95UBTn7QsMhtUxuRNBL2V9VcGAdky5MrYlzdf5WcjJLIXis4RHEyYHTWGT/7JgI+vHwDe3qx6CrgyXh4TSYbX58L3fCYCtoOXCZdqMy1cQMZGGaMzIp2/KvcVs1NXLcjqAb4apFYBvMYAlQDC2O+e78qdHeOsclh/Bxh7k3tsiocCCHR/rrqMrngbCFhqeDPvfoyVmuZzDxo1QMhJ2DE+d4qzkO0t9yBzzsEpZW+0p2HtlmpYATBctCrlkJ6jWkV0rWcp8cNLCX1xwtd69ei8ZNXvYAUeQ5qBX20wqzs0p3S5AD6erKB5K8Jv4C+ro7VSMHjWQ+5BPdtPOAVdxOHqKAGmTkD0kj7um4TfHg/7/dviaa8XPbJSTJUQKds7EhIzSww8Vm63azMh8qTVNwHieNnIRuy7sbvwS54DYA8hD4Fy43Al3dP/pUk7O35fkeNU7lREuaZzeby+Jk72tONWYlL8NrL2QjeejiCfPBeT2sY6Ks+XSLTdHZ5PQupTdvvy+1Wc4KWRUT8yZh9Hl3B2CEYZcr1rJevHu44lHqlxA8fHpHzwgs8TCc8qCCWz/toDHHo9/sgm6A6932+JbS6OBdAPpJROgc1yForFVCFQpuYH8i4bfR6JflkguvtmFYWtQmA9A+YqCN7AB6uldPVmyWuS+ipxuETmITWHiDxcKbPkE5VKgr87fwrXErhD5fPWhX3DjBmwtPtyM083oowGXzjoGgeDOxuoq6x4Fecnpy5BoJwsKmnPJ/xyFFk3cR43xbcUNk59z+gCoYVizw7zcVpZXYn48uuxTTBEJj24dCJ6Jf33kIS6DYu3d9/QJLOgcyWJWFHOjlzuqGKaOyd7VqV/HDnlH/jiALcnRgbAU7CfNAoHyHziCePAT5o5FzhPdi1BLqwl6DmTJ4mofHC9ZnFpGKE/etKKzCWwPsKDZ0wnmXwe4jGoD/HWMaxmTnIkT1Baakvx+gwJdynZyuKLks3w2KaXgpW0RiciPWnz44eVquQa4Wxi+YEHJcIUC9s/SZY8sYvy+c1cRKqNmYRRXpopFEQbFYdokz1JPLPleiNJYq9PODIZwP5GwVAn5AP3hTLVHTdPQd3tUfbMihxIwlkMPAnw/+sYkr9gBe4mvuaOz7lrZSxLXLj947rDx1sQF5pweTkb9XpH9fQX+TrhkuyYnimgMGnhRq9SPafmhDJ9w+mrhirP2t7MmnH6QUkPZ+F/nMSYsKuM2nZt/8P2hQWFCd6nwsNAOR9Y3DJRXMESVok3uizlmdLTfOpnAGx4zbZDEofymYdHeCFHnd0K3T7AVqg0s9sQrrUFLCu7STCryzBSDTdGjIsk0wzawPtWp3wUbKw3i0Md84wLsd87u4Ct8iZ1yjeBefUmcagZbyxwbESpGQl1jRkRkHMN7EPePx4xPvLYNJZ2tq9hnvkGUxxqxfk77cJ3MtcxJTGPOjyGqW8MDS51YlaPqZWBR9HIQwROICqewvs7TOvz38A9RibDumkyqjLLgfQN3BBN3zn9Xvd6tw5J4E6XfawKnEmSlqn5azUyb2O2vkjq+seWQjBK6rfqYfCQVQ+a4BpEmyJDe0XD6EpniHqpgdyjXmkTs2ev3bELOWwNV6ALNTCDuzch8RXg3omxP4cViyPulctYHXe9L3OtY5mcTe17Tb4hjCRQ8ljg7OxTIONe8mCrkZ+0E123VyaUJK22tnkSOJ1JMtFIRdF2jSPEF3IzsdJogllhLIfQ8ksvkDUzqSjrPzUZ+6xqdAePJCVTzrwbJIAF0GxZk+y8Ip/e+1GTC07TtB07UCZWQ3PEFjaZ5Mt6HUVPs54YOpPabagojl/pGRH/VZE3Rct+k8OynuH90q66kQWy+6x4Q7D+D1vR3yb07ETdYnnD/A4HMDmN2Q4t1XtJzDjTIpe5NZQKI57UG07P3JBbReA2g9ZMun+O0c3rx9b2aC/wAXflQ92WgndggIrFD2FPODIkqJfmpbCMAbSpgjvK7Y3LTo8qEUudZPQx+tFuvC+4f6SDHeJh4/4XAEkTglESjxzdOCb0Vm03flJZFyqlWFTsunL/o1uclPeq1YacFrM9+hzUusvTRSoKmaZdBGebfNiI75wLhf/axl7+ggbGkXW46BkxF3Xb+lTsQFdVBi7KWkKzI/9nlCPVnonGzEW5b2tSvKOGHe8dAg+uZ9Y8ISgeUs2GUkkuRvF+t90Zsc1ndtxrbLqFWeEt8hxe/LUZNgulFIgAqHB1hhtG16o6ADetHgx+P4v3HevNxWPI6TFkbFUdq7pxlMTdn+HFNgfvcjUes8mssodRq/OsmaLKue6TdeekX883IV5wAP8GqUBDH8fKH+jTvTVYgruzy6EYw5bfPb8WygvB1UV+Z0SfRBzdPkzrMyNf2czH8/CiGrTgf0cH9yyfXtJaoqvd75brNJ99Qqz7aj7yMH3pfjQoifuzT02YiZ6pnAJ+fYkz7feQ0MaQPxV/qNsUPkAy4TG7cSFKMdhvB/EqVeTDfuw4QvaWsIgsaysTOk6WfYP+ONTm+L2z6KkS8wd7wfIWUpaSvN9P8f/7Vz0kLpPeO0+wLt8Xiuy1uUSIjHT886ILxotKkKstxdmIPKVUdpcLmeTLyL8RFUXL5HTUWVchvaWm5Ex7n+xktKRG04LNqFoTId4Q1IchFV5dIq0yvS1uzmNbmqLXm629c+jpxhFYLBkpa0GlHR97TalUhiSQYCVpZv2p5D0LdUwirE+VvClsrUqib38RmzzoXuu06Qv3lkq+l63YWYT4h6Cxi9I+tltM9/wTm4heJoEdbV/4am1GcjaoPd4Lwj6cgg3bdsVRtvIDTenkZL6cN1PMjB4AMVxSYV6a/+SVodZrrTzMVhfIUVR0YGCTZStkhjn3XjkoISS9JWXBrYfXD3ZPZp7OQ5kR0RWOLwpzMbKmPxRUZsPSZrHmbxp/nIV720DorvZ5xw2vo8zOoCzaeC+L4XeLLC92m/v68IqOfb+hOBlFHUvBNoGwmqmQIL55niIu6fHSM0Pow4smEvuMzrPn/VnwmCRkPRCOiZjb+BQvdxsYvQeTnTgU2L9WQ3eV+VGmkqCG0ktH5MYqL+Dg7eKlDYah8gMQlM3oSns1jowvsG4PvMf8WWFvnseSKHNetM4FOSZ9M9r2xztT6cGDZIjMyg2nnPbAOjmByPzLdunT2HMqP4T/NIoL23zdT3z1HjMPDztsgxQgKJYBvhjSDxCics35dcdTvXRnGdXxeKdmBwbNcZ5v/TxasKPvQQL6JLs3D/eHgQ4BIvWORzf58vxAsJqGgifraHY+jPX2PyjH/KZeNqLNNbjAWZrIJxauOxprFCToJiesu8PNegm3UQqYsqDLJla99SxktbmcXtz3LITBExOoE4NQTKoEOTJd7sT846DjiKnwvpewgywGNnSylATWXYIGKPCnAqTK2Fcsw5JBqcNR68V16cCqYMuekHWBE9KbU3pwzgyVnpyJ7RaB51gbaiifb0Fn4x2VZnueqfsPI9+DTPf3KYUSxujJMQxp6vGllE9fLK+cKJYQKQk/Q+bEbBHSZnLkVjIZPjB7Z87scEFOtEKX8fQ5xsGWzZenrC3tUi503wV/UfB7lzhd1wxnSJoFFq2Pg3LSsBix8HsHYPsh1R8PdpySN/ajye44YTWWUsRtJAL+7DB69Pe5x5AYLjn5H1KI/iowwdizkSGTYh3yxZrWiowb3pZyCoF87BGoIBmXg6pw2FAzKiGetPF4pU8e4Gex8QpVDaRGXWDTmfMBPuitaaeWaPmCV5zVWounC6rRjXrGh9SQviazsEilYXRorsg1XxCfYE7nOz8GCaCJpZXhSQZggziM8UWksZPRe6OR3MmbWY0HnqvvxntunNRmfIgOI/ynEW2sMX2rEO2L23qGOMRydlfcKXoi09fdSyPvuiy24tlW4PbWPSc8zG4aFDjeNhWk2KLSf1bVeh8FpWBejorwff+tbE9GDbOhrlfv1wx90JYlLe9+EVHFoHyfpJw+L1eD1i7nShVnzdX2Y9L9c+hmsk+QaBt919JSop0v3Ay5CfUz3Qf5MXUHpUwatwETDNvdUwvkmmcnsyJDVvLGLkJieSjSkW6aeWz0nSKlIOash/8utLT0LNp6nFVnN5ASSLahRIXJFJoE8SpkIwDU6O0D7TjjncqM+Wd5zK88DO+YNtDqUg4ys6VW7aFND+jKP01MCyOKRTFyxgOLl5GPU9JpMp/i7YVWqJFnv5egXSNKja2HK3MLkJioHeFPuozxZw0syqBBjulNvjcUADoAeogfpvtOwTyi5zmeHkahVi8aMWn4ocpF/LuwPpA/ciL5qsV7e77ZWMncOEeM18lu1YDi1zCfr4b3pwjihVbKIvEuYNaAaflRHSDsIbK5UkkDGw19/b2JmISOJqFNeS0PsBoaKtR4PfO+irtlotmsjSb8UqynAoUo/k+paBBI76DZbDpqsaZ7nJJNHcxqdv4jek6zYUA4q1NEYpQe7e7IRv8lz9d7nifVhEqxsf2QLBjM+Wep3B6WJJ9JCbDGrJA5v0uCr6k+SLmY2nXDGV+mdbZtlcDLnHLwDG2d71RCtiZ+9q8sQ1ZbAByUxhETjodbP16tXi6y+sA/0SnNqLuSoBoRebKVxpZrZn/RoXu0iBgp6nK0ygSNfes2Zq68mAWe/VZpUEoWXfwkPYNJN44akSwnLd9d7AbW+eJ3Jh1+4u/YjyeP+y9me3KBrJ9Zxw+2BXsIHuTTzv1ZHtBiZDQh6Iue4zgFDGdXSzbi5XCJXNCQJCfMbUEUg9Hf1CIujnktT2kvk3yDr4N4S+2wkKejqj9qY6+WPPXpGNGu2J5Owq3fgy8zxnWi7SGf8a9RayXBQDO9KRruVi8Ewl1uWS2zaG5I/sZo3EN6uk7X8uTdTfINvib6hrWeExqvmHoXrRsaXu5sDQN7wu8WSX7066gN3FqShP4POwT58Q0emQDpOdKvw9L5BhNiqb3BwrD5VkSC1S2zCHmPJCufk/RwZkt+NDYWEHfxY30nR8PD7zGitHV6saFqdBgTVlWnx+dyWGra+MPkZfqqnFfQ2KJumto9wAb5jgCa/XZCsRLjVAGyGqAeHraH+1HGkaUIfMwuZCVpn/nGo4M4w+rco6j6PvACEIOUxzxKejy9RkGK9tbFt4veJDqRV4BJ/BU1xptG0ZRnQW/uq1bEIg1BZ+oHJNfO1Sm5fev47YJuLvUK8zBOOo+btIDWytbhfMzCoWYWc8dnsD50KEoF8poV9gYcfJPRUwuxzNerL/lZb9g2CHQysxsh3QDrVXCa4riO4U6G5q/S2xh05bL8RUX1oJ7KhB5Wbxj8TbLWTugrW/6JI29Cvt8OsR+S3jeO6gELvkHPMHZed/WJoeA59ueDKeeQmVcPwaCRyzy8FpgVKqg4QPRuw9NXliLy39C4Luu5ctk9VpY3bwbldkk+ek+aRa2B0p3+fMVo4YwUpuxGpT9O8ZbgjSxxPEXjj1ep8SxWlXbYJ0PvHK6G8FAVvxclVkeqhaWMcFuD/Vii1oDGoqRHO4wc61/Z5hPLjZxm2oji9xRa8eeUzQHvvyur7ubd2Dm8ZrGM5jyYVE/JRTS88rC/CJ0qxPfenhP5l/iBFFzWYGD23oYV9w+BSDHvXVm2PcMA7rIcGVNdCkBrqFR2aqBjSjKY2GCYP4LU77E81h4UTh7n58OwB4U0elE8fGYkGUO0AsQRwOfPqgSzzE3Dn4MyuOTr0tVKz81cVKamICGTkPy6EbNzZE52+62jfkMwiPFjIgl9P36ArTxlTaTPKtFmlJ7yRP/omIjg3mRtVbfUIR05C6Qm6W2Zsh8eLN6KKr7TSB6/85yMkcMASvpnocstvZKznlLWKus2SOl4AcZQ7iwpWXz1Q1mMNaKJBlVzyKtXX6DPjvZakElUg+JTzGsBfg6U9OC1jJjNjUQthNwiKb1OTnV/7TT368cpWgz9ry//h72bz3ez0erOZmuz2Pz2tsUSc3dk8VibxWS/4LvDZoIJj1wbzhRv11VXSSPrdqx4vcIXw2hjqV0aNMrUvIPNJQsh7ZuVMrInjYj561LYGtuE1oWIJ1ENhkzRaFB2Sp+GV921N7b7fXAz+38nzFIMTCgoHvE+h5219y45tfaaGXGt3lu1pzpGinwBZliw1X9K5CmOs8H2CTXuT1abx/+2y5bQiSjVKmiqCyEsDKwUA2PoF48GBr0maOBuf6AvzjjQM2TYaH7rVXxLJl4hsUig/4T6uARVwuiWzqX1WOsH83OSdmEIkV1GbfZwprC0E09mbZ+IbZee9ljw+sBpyMxcQv1wgz9qq78Pvk0Kv3gBj6xotIXrPPFR8z+EsIvQt/U0ede4My/Fd46jED3pBElTnBZtd2gNz1LnbLma3rj9dZAPzb68g5x9W7psv1H6j6/E5CPNgzCdYmIjQZ8siCaddWliloejVEw/+zZyMy2sW5BnJCVxi21AZi3NQurMIlwiKE62D8kxpxHh1+uABhp+yupfToJJtUupKbKIo8YUszUa8fAIygN1nFSgWy6B6iJc8JUPMYwk+oppnC9bI8SJPDfG2ffHv1JRU/jGFtmiQ4izbOj2AsR2PSZAhjd/STTgnNhBxWC+7BUCsPRTz24mmGxv8SoaTzJYdU7AMc4VO5fIyrFtavMM3OSq+pkdc0lXDzxYloSc/pm9eKVrUcPvMjtHZKIk/gyoKxGIFZhAOm9bMaKBMQc23TaVMLj7XUi6JLpon+yyIZxEvchp9PZQzzSCJkvd1JLtE8eHXn0/WUkOJ0wgmzKztJqpmTZd6pvAiyl99NX3ZB89Sd7uq9ezS2QIbts2RhbXsY1Hb6d63mf1tOfah3xWbKulXnZmIPg/VQo+18fM7lDY5japuEjUsWZKrEWcu4RR5Zhjzl71Wqz4p4hAVKNqtkeCrO4yX1VssXwomzJYxYZB7R0OW3HKpSG5E82V2G+uW7LRokbIkw101DBf9Sn/d8+5nagBIKAMoP8zWw1tipLbeepkspL6oWXgwyyeSCykbc0kjliGMLLSnWik/L7FbnrSpkAeFViL1aicEhVOwGKBOi7o11twfPhJ2+RFs7DeTqdCzSBLVTMh6zLTEBZyQF3GSPD4bnaXY1Ym6vpvBpUNP1aukVJZplKtOxsdsUeTW0qKlLPFQMeikXKMdjPnxddS85LltYFtxuxpTFJIVvEtMFMFL+TTmFJV2LVA/mbYvr4k34Fd7QXT3cuYlwZvRfovSckwPlaeQpL2ckjLNCtQ75AGqckQ7pF2qKIbWAQ3naPQxnrH/ry6LsdpPcL6++Hcag/womyCPSZkytM09I0PEshGAs2VDQSvKcDdFSDrF9jUP43PB7lRReX+Vx12nhOh+53BsohoH5tMb8gaEAwMVbPx/6Q+TFRQanVy19akxkgXsDWQmsf7ucO9D7OolPub6oBu2qLz9Hc7gs38m1FNmTe8kYKHDMtv665KCo/+hUGVYmdaDc25V7gdqd6MBuqHdeYTMoqkloGXXISwpod+cVnnIToJKz+AKgIe1nl7ZqkVKkFXBJaAxEUzIsFdcUpWH/OaQ1xrqYpojY2DmIk++akyADaFlW/cUSzMlgsnZMzO+6mNQe3CIo1NaGSctp970DTOxx9n2/LCNUPLNr0XIuDn+wcrx/92ZnNEZeANpgEXaj/vv5zjhgE8+OmTd8djA5Qfd6i8YfI5gYXmCXMtMyZoLvlBcglPwXHJ7IzJUv9cyrlM+1n9Sr+P8ywuCbN5VtJLHTuzvmKwvN5WDJO1feDOistSWtfHVlDZcepw2iVgtc1MStcoVKcaNNConGsZoxXtrXdO6Jy2LiS9e8XqSx+lLq6sE9xuNPVXP5o3W4L2a4begDnEV3c0jhU/ie53yb95KmVNx0z263kiJGRk6JrzOlL25lE0PeHbm+GsGkE9cStU3456fFusJ2SzMdeTeDoPL3BlaB3OxHENj5ZxQiFTp63xPw7gA6ZDcCefKxGTOdRdI0gw7Hkv1EiMACrH0y/sWitO0WEWy5M4NtDmAz7aVSDJcEIruC55sF0YPLQyEhljwz8NvA+yGKS2bJgOd/mO78E+gbALafeHcw6bAy7ubyFBJfVL3i0b5UK5BpWz1qU2l21/+Ot9A3JDbZ4hJp4Q2zW9MKUxmk+TpL9p21c+M8L/2cssRIMGmxU0y2Hnfg6p7eROA2jdG2hZt4ZaEOl2Rp/AaNxJU7sX2fVbeQppWdqSZyImUvAOnbsF40gkfm/dRtklOEBhd+Cq7deJpd8W6sdqX7q66++Vz53P2FwrqY5PddWNzkkOmrkQ+wgKrPoSaCRBOgEapgj2QcxM6bYcMVJ88f9bJ8ovN4eKCK1O0sAc+fevhhGJ7zef5FXYUdcjiZQJrBO+bxHMvxDG/xMWZxenBgRoO4F+G2DTyFKecohxpL941WralaFaSrwzmVjRJ5p7pZFk2TMSUOHtcKejn/bzJkXtMjRghH56UPK4SMQpa1/o4IEoErCEeVx8FmfOtzKNMl1FqNvYKPn4pM83P7+cKRVrzzdaBuv1/uTlBzRxOWHhX5y5vODhEw4xHZfj2i9VjNmwfgdGtmHPEkyiQ8TMMlFsDfoGhOyzxhUOOuffq8/QMuUBKL9hyyU0JfG4xPi+fMHAWnapvLzUTaiPpL5s3JhYg6hgyNNg9Uv37WrXGEeO5xyauH00iUzajW4/dCgJdZtTrmAmZqyFaj1CgPIuMl+p4JwzWbwDeI5EL55IB5MqokoSTA00t0Xza7bFPaoiW6jHSDLZ7J/Di9mN7GPxbnbBsPOMQekCLicy1WV7cgOwGa2Kdwh59sFZHeLbmkwxtPxJpTSUXKa6YJuGRTcDF1UMSIj17nPXwi/X+w0NmR4BkQD2d1p9hCCmqplwCtUcxTVSYTtKSywLZaHebLky34JaWpGSmRLiqUjr49wlo4t6SnBiqN7Pqo609nsKwl3p8H9eTJzVyX6m1T6He5XkFipUKrCq9jJTgt6oqh2twQvGKkc00PmrJtNXuMS7S+PXqwkYWt7YvkN8w5nF+ERk5hiCmF+y/5SYx04PjsuTmfNozI7x5auOlMSYSKEn38DJi2rOwMFjOL0NxfaCfznmVqcV/Gg6fVqxv1WJ/YP4MD03/PoLJDcXsu/FbeNSDGBF4jvjZEyjC0ehK4Vb6laEXUEviVeioLdU/slcOj0NnsyZEcmrmRMg87+l492WDeeqXaNgdt8s3pgKe/eaX2jzBdN6ll0oeokR1qL/cPgQqKj2RVdxsL0AVzmvWdNdu79JMZlJs5aLdCnjfjuRjH5L//mzPrLGvwJFW4NYFPLzJO2ieRdpBoz4a+96RKmrdpVEQERsZvXmgaW7KLLw6lz2ZYzQlJ+KYV4tbFKxEHKHTAaW1/6+vYfzwNx+DmmOWvBI7Ouat9Jy+bLAh+ZQF6OLFPP3bi+ksM9wHAqgE4mosVZEYSmT8tY2EfSSuPScYzQUutUxLlu3nPHIVtc9UaenV6oRpiihq5QqT5ZmLfsdbTLCPNn4VK4ohekVbVba0mmjhKb1TalpPLJOiboo0HSKJHblYXqAhUIeixbloEWkiPvCN6O5/yv4Zrh9LidaPaXITDSJRmSfdUa0v9wp1ryAOX+QdhkMC61qzrwBiuuYOHvTC+fszoKdmYHpXM2gk1gI12mh+4DS9FSoF6la2/Xg+yHvtzw7rSHY3/aWDLTnUpfuXxAah66xMutHR6Jptx4jTii2KKHNlk/uOHzNP0YkifWD7FjDiX6eULk3QafI3JNBH8sVzmnxMauo/RnNQvLhGOOhpE+g47g8ns0nrnXQD/grusatgo5+yugI2Ssh0fgOuV3gdpQqx9gkrJmZ5F743GBNTaoZn3K5M0YqXYlYtakdpbhn+cNWuXKX6Vqs/hA8+roCnMf54lCwMqcrDkxyT14gfgqnLTemhoVVMLqzSNllPAS6qL/B4476Cq9imuwA2stVNnUhHKb6Kceg5OLVbbeKnr3njs4sUdLF99JKjXaGDG5Pe3A7/h0kovxRdcWvM5Rr38ifuNdzvll0cn/CHCSUpcNfUPlbsIXljymS0XuLX7j2MK4Q09rNhUVCxQrLXJWAm5r3dh9W9UQ48hrohtY/HvQHnB+8efr35rWtnlZvTWK98Jd1LOMMmTLL7Y3moAevNg6S0QwdNqCTTEpI6Dp3FX4BjKXXhDfkGTmxB8d83FCls6YYmF2PShiJUz2Kg2gFoRxj6L4vpj5ou4019NkeahAq5+Y+SUGHrfnuyjQFsCs71a+b0VeG3UJTud77BiBBu5lv5Xx4ZD1blr4/pXWF9SeSldAFnhT502tBfwk6pfM4E8BiQy+6Y7HC/Laeu1gYV4FOwD/Tp6CdY6DOFKeVYbBzl0J7AHt8U4Foy+6zwOT3J931flVd/dr7cEZg3hVNG5gt7xf8/bu0AJ/06334VXdBtt8N4ceF9/60O3ShvF6mnRBuSEnlE3hXgnqVCv8gQ0ORG5HtN14Grzb/nwIUZZ1YwB8ZYUyiOw/oVuhQMKeo9arSJ+3FvknzomOf+Mm/99gNVd3+X14TYsXn8mXQ2yrtvV+XTTzk2w3Nb8OlcJsj9H7K6ub2Okr9bgprmgYyn3jZok6GWhUvTew/7dM/zcwnQUE9D457gItQIFORq1XnUG7eyD3T98LAj0I7PUEWr7arvcKl4xMqHRZOCEFVr7KE0aNKtvy7Qcresj6QIFXzIKVGidxw1h1rLG9JyHuDR5ixQcK2Ov4ZcDNGyx/rbroD1uJFd/+X6x+U2VVcjTd51/8jMlraUcMNqDeqfEsgXB3PiQ9T8ZI2jR7hLR0aQoku9vsj6Xxwtv/Z1MXErd+V0hMil8WSPIFzWSnVJ4hmjP8edTtY7u28DaPnWsemUpEwTagmLVVxR40fI+SRDZUsEd8RvpTGhNcIfUaL0FYU4emXIZBoNql8Jtm9hJohUmOL90k8nty/scXZlOaDJEaU8QNex9L1+8SlL07KKbMmAovD9q7vr5yzfJCDNVC3rm/27mHBo7kMlgQ+ePcwJngUXwMDXeJPEj8xz6y8Jd8bQv9LWVovvpTD2C96t9yvLpFdtGJVs1XabvEVudZ9IVXK94bTib6X9Mn9bOSPvatrv0pvgB573YflQu2JuL5KgCMx56ydc3e2QSpeiIAz572aCdJDEp+/cly3W8D8PZSzfURhIjJSdCKreBAf1sgr0BVy0OnDXD/C60KLNtdmbGl3Ebkic216yTpI397vMz8Uby5W3dm+W1Qww4gr8MZqYpGVlGg0pKjTlhJL+m7Jrlx5M0f8sZo8F9zJ+/yrRLALD/6XSPyFucTWJFkxbk0SyD9Wam3aV6hO/v0idpjeTWMjhqp260GeYR0I10by67jzeipy56O9HuQNMHQSmvzb0ZMgr4/xLwdIMfeaXCUu7fZ74vnLz6mXedZFm1uEXi9NczK5nnt8ZNuuKrYyXS80fgd2YXAyoP1TvXgK8R4/wpK76zJYXl+bMWcau70KHuqymo2jjD9p5xVfBqgPQfMlb/ND1+ek/oLt2H7Zz+kaoaUdPfzJE/y7lOFgfYbzU+hPFLtTNOlQ7P0Nvpcj8u7OiC8u5V1xLM/+5Uh/LHaQFPAJvc/ZfUk3uZSOQ2TsaLV7Z9Lp66N6AplFlO9RBPc0y/o+Daizz6fI/GP+BPSouMTpZRzm/eENy85NXOHgFW4+yCeWrx2/G5+YL91wdjjX7Th7buYSq7k20ZyRjzvC6hgyYcORrEKCvjrLLJ3ClYNI4SbromPfZMOk0o+Ub7bg4RbEv9kW9ZXS1c226TEiX91sZ9ub56ywyyFLNzfbYy/M2ucXjuBDMgQ188DCO5qyaw91yBLKWUg/rh6VrgJBkteO5YyGxL9+8oDNQdB+7VSpSBEJr56pe2mIXeFSETudoK6dzxMGQ/tFEoBiy6Wpd0o1YHClE66f7oxTxy5e7wyGqsqf2KNsc3aEzsuQ3IPfvsmLr6mXc9C+m0BGyhu//2yukD0a47rFP6wsFajEm/7TIYcsCN3+FzSS0sApUl2MJG+8YxLrFoAstQ0T+Ho/R5jiW7xoryVHikOIdVIADwXzriOZJYHDMK8PwZnTJFm4Tjs1kVRcW5JnxduWjB3Sj1Z2h+SSJDzEL8V7zhu6qHWlCqmiLcojObQm3s9aIeaVBN5sVcDHW+v/KogBJtHVNQPOmi6SJkJHFZLofuBJ+smxtVk3sdhpjVJpJ8B6NygSdsbmXZcMBLGwMy3ueDHhTgejTGe+XiuFYaWfnfV12188IHMbKOXefsoX/dTo2xoxwDKKxRZP2ue1fdUEtO51qmIM97ru8tPEGLiADjIvoR2/hC9I6AxPblIyqdE40XyGTJS6dVs6y161z6jv/TwCOXVoF6DmMtGyhcPdnYWSjXlLc7Ol9VjUW/yrqO5h/vc//f2X8C9x20n+om4XwXVnXdy1aBAe3QlPeMKTK8dTMHg3fbX4qoJDZARFqS7VlBXbpXTLf6Z4xq2lE1XOKzkK3qx9AVY/ZhVudxQMFQ6Gnif/5IfC1B5ZiWTny2vRiuTk4ejmySDmRtCLojCsWaj2Dm3T9WVp+2WgQaLqpcV+2PwWwXxtDqMnkwzThq2yFA3Rexsc+tHQJBXeEU4YtU0fcjxy99vP7vm28y1avIvoJdQgyy6+vbJjs1T/1tfGXry9+rbQEl38mHpQFDqYCPbiN513bKdkID13RO93QygopQhx9HTvDj8661/F+rNtkX340RhO/GK7Er7uCjEpm2YhO6CEL/fEV57w5cq+SAakZfqgacdl5xCTTkLV+y2I2qjfCCgrIBcbUgNuaDVBayXJ67k/zA8Jrc9tOdOUTN/+wejhzxoGmJvTK68+03lWkpgXQPARCD+UdEU8tYiYjFdf2pkENzbeQNLeKHOxG2/iQdzzXuTMt83XkIpZto9lKw5YXsCbZ462BiAec8s9o204AvKC7sKOO1e2hYSMV88nmRxvRy3EvTr5iuxsbghpgJ1K3gl2vOEK4l7VbvT5c5FeOuKFDzXZ8ZIg7m70VUrWxkU7MISW8j2t9YvlpSP8zdFPXbG1IeS9UiRMPjhqsziQ8jd8go+1fnGtZCzku9vGBj6uPBAY+vjcxh+Qian+PhrqdBEO7AXytd35CYt0gAfk74XnA4UsyktHguK2kgXd+2inFAf0pINr8cVy4FjYEK0i/+CjJK83ZLyQKS55+Lk4caVYCoWTFxdyKQEf+XGtWzxWMpKgn+fWNkUPxJ0qS4JyeJ7LWmYRaeXu5e6XIjTHq4FpzkmzXcGQPQujPxqCUT6giyBuxR8W3/yPcvtiry8i384ssarfkGKnMeTdL6FlgIdYCzCcy8yfnJDpHDgo1dQIIPZKvqgBg0/yi6uRS6fhjDIJnhJ2mYtT6ByxQakly+eX4ZBS97HLgfZCSFhj997dAZbBssyDxD9870kpZ/rfAQaapAeUkWvt+VeP+2a7I1H38rf6CcMb/5rfqh7xpQo/SFOJXXaYlAnOaZydMpdGP3Pny3H07lzObxppmKaJE8Av31YxeofH1LscTS6vT+08cHl/LYFauAPG19/2JnOssrXrUpdMLXnwqKnw0CWtPNmE0i3aiRTvNOFV434B8EDmSdQBnzRl4CctDIu/LV4NvtQhQ1D4K8EyUxNJhMvOa9Rym5QaxFZZosmhpqoUz6CccYKgS1TeuHjT2hmN30mAW8MR8xgcMQZ6tF0nIlQZ3YDI6Ql0wSXCByEnxyIl/VMeQJdFX8xQrOU9T4GonHlxQodzSdI0afOKwBHpWrqpGR8RkGRakB/7IJc8MSNBJEjDvf0hc7U1LZrxBikZXN+NMCblNlaaDB8wmVAVMY3BE0Boz0ol7SO8Zn+h0+04s9GpmR8m46ljzSRggNg44ThH1ombWS8NpUmkT9qsdBvkhJHJp9RJOODd9/0/SitnUnaiTW7yWSVCdX+8DWmi5aQtkufzOa4bubCy1qX7SKICmMbJZ2qjE1ceXroTHig8GQjauZ40SZVtovYOkvWZqq2N2JnhCcf1HhLAZFZ3TNL0IG9DukN48kmAbKtnSdr0urne7Mpckk0VqUSIThugqxQAHB8Foqg+u1wArdk4lHo50iySnVgpQO3jaePoKscBKDqiQO08BDdI5FF+NsZFzpPWni/0SVsexa2heLlBZONVB60VHOqd5hnv2KhVJUXp6lV+GSQ+OJoTSEpBlDwQHzzNNMzoN9sM5tUzChQdKFeIwc9cYTy+4/29+S5ZmzPdcPKy1J1GTggSvKDlcO/Y0ZTh6D6W15ruXc7JdypTrJyNBz2PgGP6c4P7jtRW2gqme7GdCej03QhTsiOWqdvgZQ9q2DAdZKwPopi9MsH6ueiwMaCXTzouq+emZZJc/xZ0OKS9t0nlU2sm50JNJTrzF56Lud8JWLgOtJyO5kSWQW7hTkY8Eoiz0Fw7JjW7FWADcYiza0Lj++NPKeQO/AsKM2bX0FKOl9LM0DfjUnF0ixpjVCB5llHZWRfXRWNeqQ8BC/dIN5HeKzTbsNq7CmL7wrlMIWVW8x7UO0+X2cnzJ7p7uj1va1fSsbktm7QF0Y2Z6hSNgewvqcRPpMTbIRz9+d5Z2lAV474kl3LbDWPtgvL8GmfUnTUL8k65pUgqtLZwO/Zh0xM0gtG59OyvkW7LieqakyLSNTE/u10elOTTXdNKxoSlIZelxmIUqOuvAkf+yi6UFrO89ImM+smPpm0y+lxIJVT5/X5yl+hAAwTTVMS/yW6a1l2JW4guBpef6zicrxh+Xi56sCnFRMxhquoe/8GoawyxHyoCORgs6HGw7udS/JXUtvyU4SVVA/+L0Ln0pvjR7WUvq0RgzO/ghG0QusN7CzfYhYZEWurfkZKFO9bJ0IWJy90/LUP7+b46K1VI7rKX7KtWtj+ZI6iQcqPMKoKmwfQhBOcuWuEwrX6PsfnrvTHmi3dEFPEKgKTc7VMNTgFtfgcX5PpSI4zbgF1c0QomquxjWpMK5FtfsddfESYh8OAy+u5O9//DAS19R8m5oNJhs3XEntHDSobiZW9thHHG/Ps/49OZOlKCDWNY/gkiVWllUKjUSsM5NRO6OnhsoLtwxS/C6Mlk0KGA2c6mHfLBqE8p6wUF75/8/extVdpe4nU0QmcyVYKwpRV1s3b/CtLtR3Ya5e6QpIeXU7xJ9flMvDa2w6nhWaqkz0xzu2RS2Rm0ewY5ZcYN5UrqlhNbbYwhCl1JdMI6wWQJBWASm3kFlBiT1JXwVVraXfNAYHCXksUKmg8t5IWKlKeNaiLhMvTnxED2qPFxRj6WNvj8r0vXHfodaHOl2/elNSeYaly4XgTmMrGEtczZ/m5cG6n0IUzDI5iHYIg7UKp0Alh3jRgKGRyMmeWgZVUqFr+iOBwuLovCHh4SfEYt9sq86Vc/ZPJt4wP8OIC3JN+KxHGExoX1qpz0LlVH4oI/wSsKL931OLwWCFoL/EbFH1ElbSMY9zTFQ5ZdPGB8OZ7RtEqrWWYPILnw+6DIHhEda3QWwFX/MdZhY3edYzxjnKYlSxtdMbWEOemHH02W5y4TgEttE2Y2P47JdPMRvhSnRsqXwOJ8Q99qZClZSxPEnPhUVWhtUMloPiK2FLsfz5VipvadMIW1hHCPQSMg5v0HpE4DjkZyYqXTK6UzTPOYDbLIfjXRmD2Nt9h2kddV/DU/Z+NwhhPSEn48lNwmzGPUlDta0mo6rXzU+s1CQmkCOaJL+k5BurH3oBCP3tyw4keh/2olU1DoNy+uiYts0o10FhusLhJ9DInQQJMwnpWj4t2+ctbwQ2QtQDYTs/lG4SINmns1Tv2KDXVstkpEFGth2gBKxTOSi03tTbkogkGzyIuiJ4szzpbqyLRIPUOADSRIkZklonzZmAbshkqQOsVZY5jUQCejkf2/SLRFkABjz7HhVPYq2II25uFRiWhJk6imeKWga7V1qtUUFs/fgBswHbBScE5WPHNleEhsEUAbls4QX9RqZV1IA03igdWHmxsOQ2pr7jmdDRvZSr2wzkNhVFmv3iSEBTAj4FZq6dAa3C20bY8DGfoUGz3+RgetRDqUQ03TEJZKJ3WSNbY45jsLjC3+t5Qgfa17o0AiEzPRQWAcZadmt3L3OmKt/jSu+YXLdJHGOFVt2fQYYks0oeoBTG9Irs0sp8uj8Wlbu7Ji+rSZbxdwDnUR6j9kFWeJr/pndHNF0njfmw1lLAvj6SpnaoTClqoxMco4idUfQXq5OhAXoXn8RajtorcUL0nEM8aboheGKQ9trHsFn2ynFfxwii1eREy0ahODfEMtA3+upZwToi1S47l+bt9DqkaBxwla6zU7Syfrm6EhgGplK1YBLyF0mdxW09VfqVgihUask02NjMIGZ0Bl3zcHGhjKIJQkgSmLXuZ34Z9DdNfNiKgYyZZEyy7wQmECDqmo02QpsZqCvNvB9EHAajVMvQAWiIBtjsCClVPOIZNlqRk98X7WVT90uVDIuBDWF984Qc48cE+6ylnXHYvrlFwkXSpcH+l4hUy6UY/v3+q/x6/EBPNMW99p1DL+n9NS4mBGnbLp/hKf6vFIARYtMrhB/maBhGBWPfF6XcCH4Ui7Y5i+WeqBVGsquLr/Gx3eSrtK9futHkx7sRW19o93Tmos1C3N37LNKVEHlwThDXALJNaVwbqE0tsEFQZ8sihrClPfiaS5y6QQ3wTtNp6++cB9dDAVd/iXC7FFGDxgkbkiIM1J1iCJU6+VWmQyEOFkXqYgbSkqDlYW6Z5/gXr1SOeLymnECVKUW3FvrPcJD2UhU/EgT2RVpqpuU7Sm0g8iIipwPhXNd9Abod+E53ZspFhr9yBF40Uckuom0JBNxWVjYVZ1s0Q7RW8ddfH4H8HcEI8WXI4Y9egM4/sZgxgiQQ/tAEcKKI2AOK6Ydux2sCGaf3G90YmjGzei4Lhoq/G1UiX7YxndO2Ny9A7RkAmp22pcLm0CQ8XWeYGHxaJUrkRwOAlzlgq53qLlZuTQT7A2DsT20mw2hQx4Lj4l5kiTOFuEwJwgYF2O6GJSy7p5+LWHTOrDNKDYrIcCYb+FFa7qsGQX2kzZpzpfB6rZij0o8wg/ARNQ9XnZ/Qiw4QYdDeFSoOoqupc7kmAtx835ShZJOouG3LJkhmIlqB2NTn0wtFo2K72BoriOW64oji2AGdoBSBFED09FW+gBgzACbloCSR0NbZMEvIIU0ZRW8gMwFnYzM5jmbDNWglYF0om6a9bLPqKSBPp1UoSf6FWMEkSl7kBuk7agE5Cbjfr1k/U2O+YRtqA+nqT3KNhgGEgY72tTqndR4u7eLLlhm9eW2eiPJ4tH7yXadsWUaEezNkAQKIau1D0x1vgehQHX41ui2X4MBAotrEUozx60TuonAYWwB66tVAXAuVK7MU0XJjqV3WDSsIfeJhS1bipxwYt9KZv4gVvTCimOf88MCTolJ9uYgfr32JImOqC8v90q7SCm9HqwXDptKV9HVOGEJrzaM/+LbtUeAizah6dI+0YhqNBg2GnC4SZnImAhKI/ifIcx7yBDmwjFF65S89eEZRr7naXw2UBhRKYu2VGOSeQwmewWy59AF4igDcMi4JxJwbsSAgQHBHAvp7DPrH3iKqQPz0B0Wl930CKyrG6Az9IBrc9gCh0U0CLO13qZ72ebhUSRw2CALvGpDCyJLDvWs5xFEipPiDNR54J21W2UdRV2aUWhEjmt0QrHD0qJvpgMjY/q5pPtX1xkndpTUfLAU9eETwUcIUBB/zUxVipM/GMSQrYefp/Fvjw9Ww7jpepJA810pLm9tG/Sq3R18Ki3X4KqSwo9o7Knkd6h1DCzn+NQMJKFtT/AdDUjv9BbXJICMCO/oYTn/ONAQElROajxBQwj1VnjZh5/jOSylhtTef6mIxQ8qM1aOhbLcY1Ywe0XKaHiFhZQDXVWw6wbXJVHKnyIVBhMGvxVT/XhmJOef2eP9MnMQQ2a6JmIYsShK/HPN4vrX+dctXbUnLXJ/JO2xgGirumZunHhPySBDGTMAPQRH/V3qL7i/a8ywXm/9DZqTUXDB9RPLmZ3qKqdeG0jmmRFbRBWqpuV+SPdRadWwhdYwIQFvxxep0c5s1GJw2CdUClo6+eg8+HRD3q5NDviKWqFeGLkNc4GbASJyjyYve2Co7cf5Kz/kJI4Az81L45EgV4ei1onQ16HF46fq49tJ03i7s92DkTATRA/Sin1ktBvQTXhIpIsAE3kgheyCCXc62EN0tnkelRsWY5vw+tEQJY4t3XpKj3PwfMfvpXm42UgDtGX+Ji3uACkkkyQBiSUq6rL2wmJqt2Zx7A7Athhtgjj6XbMsElwSATTIvpOEX8PhJYtit1oSVi3WM0v1kQP0AstBvGDeeq/Y0CpFan5W5p3Df1FDY8qFwyPkC4uExQ1DVUlsd5SrHSYFKCkfKs7pekcYb7Esw9jG4at5PLfHisoKylmZYXl7PDNmxTZxEaYCOL6TTpOXM9n0WHcPFPWNF9dS4nSVRJPrn/85GvtbKiRKvveGGukpQRCSkAxTm2FJXyAEquXHPxciCn4gCv40M5RvWX+PsfOtdXXB6m1z0yk5KobiqqI1Q9C0S7OPNS61kqrXg35khD8YP5YuEWn8+rsSArIZEE3vHqYI76gS1ZNhwe7/eqlpPSLjPf64fOFV6uvcAQYdOHmbY30bOqIvie66Zse7TLljpQ8OgzWuu8BkwO8DytJxKrxIIw5jyED+rBaOu/TRastD13OidZ/HG9JL7xa7WgKoycZJdeTH78HSn2l0Aqz9eWgiE3ZHJSrSZi/Xs78ietZCCBzKYQzqFovkLAwo/x/XW6n6k0I0yBoouK/ia+Hx/YebvvC1F/FtvKsTaYPB2obzUj+ILjxSr8YI2+l+2IINTm0HhPcDJwiuZU3YcVRsiz12yzx7xRelkT4RpN0iqqBMjV7OMpaxSVK4pZVyFNq/lpMVwfce2/QKxcsgatLfvTDm/RjZAS82zdMPK/4Y6w1gojEiCq88swOurgd5CFJaqQDvP0SEkpW/Rtd7YajchDIHtrQICCSHW2Lm8FXKeJfsouBLeLCZ6bshRuWoJtAQWHBCuIkYhIJaxfDsJRPKER58MALCdOLcBzqBs8auL6l32kG1n/TbyMFrLQW9EwXdJ/G1SAUzESK4BEjydG8NvVwjcjsymUSC7KIQKixYNBvu14VX3K2lpDN/9UrTQ0nO0CyIw3qqKo4HIQ56xl9QLzvlhDElCTnoowDo0TSiOWtzXEnSN1d6EI1V3sgO8KHROjPhRRc6uUwNNz3R+rImV3HlGpi3tf2U+DniGUluYQyjF1M64o4SW0oHd123HHZjmfUmaU2kZqxipHM21xQbKZo+0vAvaB2lcfYUhp1Cp8iTdKalQyxYq64NyNhtiup93DaBtnBQS0dyYIBWS34LYnh+CTm+uPCktQcD5NCj6X4kRGnt64EMTwSt3p7F4Oe6HpbPG4vBiHutEYE5Q73xxulUwaMFkpTmSVKeACPPBMkMsrF+3SXaA3sc2Kaj3R6J88m5CCMOyNZ7Jtcp7aOIwkqwKUbazzkentbO+F+aiA0W5pcso9P8ZRsyBqz+kBztcKOFyrP7q2TwYdk59zHJp67NEpM2LLRCb8aMhc2ntRRkbyFIcDh1+xL8bvFDuSCgXVtmRIFQPoRJewo1YDtBWA59MnO2cVzKJpReCYAkLEmQTOhBJwfWB1tnO3G0yofdEVi3JB2vQk6kiScxKNtpRXdzaJDyi6U//KtyKDaQqJwX0VSVsvWJQsPyACJ8mb1CB3mFVPlrfLoH5EcMFHc2GqjK2E2cUGFqklvhLHrirHO6xjmZW9I5rxk5A0uEF33/addkrOuQLFnVik9jYHbUJoyKUNKlI+amwgCWkkafToXrkFSiCMB7VMWUv3oZWJYYV6U0WjZA0nLQDw0ny7/yYRvO/lJ6w6B6dqiugxJVJn/NLx65dYGUo2aSzALc/6CeB5WiBk8oQOLy8Ovwvho1j6ldBo17VSFAsLrM/PqKv4hzSSMRdVn4hamnzDgRBM0BywLPKKffNFyd/3/EtOivPEoNqunoz6+TZsyceybMaAS8XZYhwzeF4W8kIvojIbhZ3YfvZkwCCE6SjSp9PSvAcp+8+FPChiA0lqB/23Aklor/GsUTDJs4M5ZAzVgWaD8aS7/k5plgRZjSxFiYxuNicu2AGTsioZQK8TPxAE30xyONh8tKQofJjqpdEznd5ZCFNPf1VX5K/a00Akvm76VZvraeg/Lj+K7lfaj8K3eeOgr8l8jxIkbn1Sd+8VxbgN9Nms+Apel3K2wqrhq7lVm5rdJCt2qLqPOjIXruTR1spE9ZPYbptltfEf54fm+VYLJL/DnvduyG2mYB1NQLJ3Prhxrlwvq2Ob+kgncpBsVCxQrP6xiIJRXqn8hd4VC73PnAfpSyPQ5lhkk81svo7y+lxX5hBddzVEtWmHo3bMAQyAr0yBGCJiS+Ejj30DI2+SmE0ZfGgsgUqkHEtDSQSo8f/dDkKAt+vTGUMwqgGOkQ1ZF7FIvCSoFLhx6jbAA5yv/LL2f7xdLb/UnPrru3f+0rfbMsRsYIAq+LDQc7365V1k5hmm05cysghDE+OqyK2ky048irryOMFWMXcGoqAjBnGCYVDbM6cZSpkAkab1crEa7e9MdEJfqmELwRbEh2AKol22BfwS0RNeobAfFVPilqhR8nTgJ+YQk29iU+KXgq7AMrvplnpbFinsVco+CHRYWpunDTePNT4TScoJ1bYRhCDTmQPExaFuH7JQxK5wq5UQFuoUJl9G3JsMygl1fZkcavFTc9oRWpFXpKD7e5Tx7NvdQiz7fOSQa9fzQJS2+7jkdIMx1LNjNhZCSalGcAdWGEW7FmEkvOwoCREdh5QerK/bZEXqBs0SVj1WVarYoJ3NGin+2bdDMjk/BrJx09zv91YNi4PLKNG6Fts5LQU3EHwvkq7DzSoQEdF5DCJnOm6iQRZ23EAbphXcQsqDzXoQk1vkQE7JCZ57GIgyx0KVYCztfZfpzbJz3070I7uxblMfAwgmfK4ElOmdZuA+rrMWFqty/cP2I9g1eCDuXNmeEgYVpOWVAnVC98JlI/LMwZnDrn+ornKhXN86KVuldAmBpHqCLdl3jbQEllmmjzdoGeiSoFO8dDV9q/YPcFBLdelbKQo7LEPtOhQBDaDq1YTLKhrID762x/j4hMC0Zn1fSr0IxJ3xdsnhBnEj/3GstXrbFjIjg9B2NmeFG2WdRwxM37rDuPorSg2XkGc3Dzw8FePfUIW4/UYtaALc4gPVWw3hi3KsfubGnZN8y77j9iFQC3GynKYTD0V1E1LiXqqzPUkjkEv2Q3cm9ZwxwCrrdnjqN9OBzIroQHZwM5FHkDmFI8Bv1ufNFPd66MwAnK9iPfUpQBDesiWLPQTvNuMZjKzrnwYXXKa+9kpdaViI7+TUyiLLNCo+9rEFvSyKlS3x0dMUhdcmSYvjfISp2G+y51c55m4P8iq2bum+5994nE84dkyUU6LHA7tlaVXI7a/jARF8JOkwHkOzAo7y9ZpctevQTY5FVi/E7jRYrjcEDZBslrvX43v5aFDpQ2tg9OL0JaeXdhklU7QZsyVySUE8hUqi3cJGBvINQoG7bVI+y1pZi0ZS2TVoNUU7BeAbIkG1oSxIUdzzNDQbsVCYVovv3Yd98TJCoYdNlqu68hlmKUjHnQSqp1QAMyjnGZYiangV1B8u7TqjFyRUE4KsTDVBUvh1S5bW+5uYslHzZCGNSXyGk1XNz+I9Azrd6agUngJVapqRo1yDvVbSuTYkh28t9c0p24BpLFT68g6yBQ/Q+VE7rpL0K2zbbmEqU+ShS1hO7eNmgRga4pa4mOMPEwu5VKpfXZBvPE3NZnSAkJRGwYOewLJPH+dfrTeh9MSMSo/wdMTQKEa0ERfsci+B9mm0kR834NqtSKVyjLQIqtCLtkgW8L6aU6agx/GIMgEQ7MRCpG2p9yZbjHSFU7VsAi8FYfLfiuwYEjDoSiBoXVSWahn5ZV37wzz+fbtlJoYRZiy1I93MsJ2bbRY+mTGJ3RovmTUzDdyZBva8Vlx1iUbCr0iIYGSQK9T4thGoL/tBlWyVNFWwTKx+oJdDrQiGZyuvAQop7urJNeI9yT8I2bYq6th1S2neyklBTVsH++jFxxWKQe+peJLBOSkrkp24c3dtmhtXAiYw0Ubr1QBSvVjGFqDQPrnvBL8xClzKazTbH7WO96InhSDNHii0MgIWL5QC7+w9CxR08jLNs7nWA3BDpJn7m+hWTXy2Lyp1SgvoIpvIt17c0ZHDsxev+FFpFW89LidBH6dUVf0ednBQLftxBFIuhLmogjjGRo9bW7QXAtfW1QxCAW0TAwQZD19EfRc8Gd8d1j3gk/ubEeu50pcqz5qd4kZwxbo22D3hWBTY85NIGYD9TFqjn8zhq1PCuaziOMx1OnRjrO2n53niKosjLhKzLY+bZDYbHznHh61LQ+j7l2skKObHF0nV14wbAzXxFMDwWJx99P8VPoAkdYKiYNLitEeXHyAtA7cxUoitRx2qgnXuXyRs9qmkqGYTo2pOQJxLjJdUlMBSLJYQQwSvJm8wogaRi0H7uDNc/rYarf5AjBS4VC7xWfQe2smMhSvJTM4A+BrVtbo26fkD1OwNzhL3ICQJmtyWKc+ZGkZIR0xH0Wo78hIVUxtXCyKzO+B9AIU+oow+Bho4M7DabaY7C2TVDydFzu8+et/oPPj1bR0J2oc3JWzwzDB9lf21OA7f9USOzOjjVO1JmyicdXbYP3RP1qCr2tQZV+e7kGHQZ3L8IPwjuA2wdJsFGE7jjKHdxvD0NMlRB+YwqkTcv1gXbE7aD56N3O9ejamXMefDztXmvDzOqj6r8bYKa11gmj26n9VP13SnCCGM6veQNpY+it4yRaryrhwqv0U6H3vqPcoo0+026+S0u6wzOHkDzQJu3UoUDoujGkwugsmDTn5HTf8cdL0h83U95n/Q2SH+RamtqqUW86E/kUEaCmXfHEP9hyBXb2CscruY9ryVfMSy0RneSI6Km0meJPkqYPI17fj6RiNsdSuOP1bu+sZ7ddyior5zydekfhOCG9P/sr9HM5aaom84GWfniJMNBZdCJauUQY/fOuavkc1rN63CEPsko1IKjp5dZHy0f8z/xTh6SEXwI3HAdOR3HkPh7BJnr2tq9IWXLyAIJKXg0FT0hwEYeTWN1mjDwpvW68TiO4KclDlC9yacU0H7Y0IGjKFNB4+RqmKB05vQ5MSmscP/YOKfKVo7vJXOrYcYZDXYfvx2E0kfkDhTwgMJd0eNRH2Sig2iQdS3nAe6gJtrj52TVkDfgHxlC4HsjvYy6a8Um7+uqC/ZKPvoV/QMWSP1whV+QRc/7EFqHPbTEYtTJT+SIrmvrRlR+uSq7wccspajHQbCvfnd4OHfa63fDD9RFfKIkmXOkytECPnwcmDxli5D8quM14p/v0/WbWXr3VYhTos2z0DyvhJK0COInKjPnadvnTPhTtTDYRENfwHXS18Ti2BZlF/X8bLA2fA9jB8nbknhJ0tJn76fYVpM06rvaMl0nqeiPNN++11Pj6Lbl0LhRWOa3olA2oQdBHR8Fl1GocmykjGQ5+Ex7LnpQkgNpYtU9tY5pA3cg78kzVrLsxDR/dfkbm7Ti/K4fSsdZIc1SDJMWKi8NvPE8GyWOrrQwxHladLjGt5QA0/zDLJ1xZTllmSbI8KGudo62GyNpPrUgFgrsjnwc5LKGGgWy3mm4kvBrtjB9sAvxvNxSqWhc11U12q5jQvlkL1OIFIK9zqM8tbOZRfTSF61/s0U7370y6pyoO/anDExa0eDLEWMA5t7A8LcStTVQ8n1RrNGr8ykp05kyGOEelm0efws8UhbbOPvtEuR9tiUxRKhFtC47cWFvLTF3s6kbrFvRs6mr2TxPw5bjqg1HzwBPAQMTVRdRVdX03lxNoOJ1ItQmN4SnAe0wHeQnrojGK5d+botQth/1rAChJzJ8I7G4cyxsVmv8VZ0gyvZtjYUY5VuciF7Gd02KaPCxNdq71+g1oYbuQaQeQKZGwsT9qqujPepweIjl4kofAvsDFWde5HG0IT3NF0N6Of9HmyWenXzJ7w9zpa7TXlLntgGr1+y/jR0SQYnd55hmf7/a0+pdBP/kHhHK6lemjLgJPkre/kTDB1SMvOFHSsXlbkHSscPq4zMuEZNRut2nvo/u+wPPnmyKjMQb4n+IKC3G3Rmy7Xnk24EGh7aC4VMLQb/6EN9lOOTArTQkBNS1vmdTXtfZW1UimxmX9+zOl30NgpyvfzZQNGR7RmbakeyBENwwmxEq69OkXTY8s/fD5UDbJcubY+6vtZcCtWG8K81FjPz8Gy0x4JB6jyl9LUwWsj9OpV+8z4QARmSkqMOYXJz1+KO0V8qsxY/oF5bRHoCl6XZ4ghW0Q59o/um3MHX1KND9DgU4+XZDZCcPJZKigEaSkj2x7f5684Mb3nUjO0z2CCS7pSGsMMjmOgC71QEajo0j85n0vdVn3+/H0Twulj3FD2GAw0OnmpoOi1RoqKm7B8QytvL2HJVQREAwpsLEp7ekB3Y0+eMtMpg0ObqgNwqpJthj1fac8yMysuZuCB/08/0CRjzkxef4zmksXTYav9RyKVMQv1ZLLcC02mI9d8T9LuXAisVxXP7bTEXiuSUx45QUyNFxwMtk+PKNxfduYic16L40334YqzX9SVdbpYG36mbGGa9COd4IZZKqJBathEo+kxZTiJ472MazECXI9zvag6PJWFSFo7dh53Dpm7vIykYICcodgRlC/AMpl1IkZsxcsCOg9Qu28Y5iDVUayxIe7U74XqBYRZAX+338+Xa0rEj3Hu8OjzvRCpso93O4OsZ4sKJEkm7vGOX8kuaBAYbP9hiGKs2p/BCTwBOh8shdMWUF6EwWFBZGxU5GEZLhBGsgP3S7Sn9Ncn7PxSptt/hj4AMliqEomxnnWrmz7DxZxxDzrfoDeL2WJ19XQHAlJXF44yBN8HCIJqF6fhCQx/YFVzaQa84AtjkNjoFC1h4gi5dYfMTD57u1YOVhjkn0M3X5AR1Br8vdY8ZyvU0I6IG1DLd7ygx6Rx4KUdI5VrIKvoqJ4jC9dEtouiBs3pVOyIRNTD1zgHoueufmRND7xaLmqkLZh3BKEvM9r023i1D44IHuu8kok/HssSZcRQG/+7D400miVuRCpxBwwkBah+wqPWSW3oXLyVLPEcnxb+HpFr8ilHvXbnQzyaOLnm6nrLtU2h1wps8PaEdDXXKPAsYEab+9jJUQJh9tfyrx0zpsXv1V02Cml5Mcakny2F8lVKqCrDTeenx2yhldPGnB/GVVQFOlQ9u2czwxJoPKwro+hVQZKPjl98biopqOowtxGqLNw1RcgNFVkE8yx+PPDgyBdMeoNzyiQW7cs5DFhrohVe4JNH4I9ntnPp2SDnvZcHOgSNOP+AuwUvAfQOCI61CkS6wzHaNV8jSp1hej651vy+2bkUMceRWYJsfGtCi7ycCc95oO0mkedBI1A78zSqwDd8oLa/YTB6ujqqjpLf+Qq9N6ET1iO/0Dm1qMio2S9VVvO2gArP/AAsmNSKbTX0oqYI3UZdDw6YplHhF65wAY9jKvwI3RWZh5RIQQ6Qt19RLOx3H4EmosFHZOAlOvMqYnuUevVGizvracX+RVoqYD9bFpTF6kFR8RaMXQQYVtX4tTFcBN/dVi8xwBx1DMwyeRgoo8zvm+M8fUHo8RctNuRmpVFEI5NhxfE7YiHPA33bjFaLYT+qqSGjjM5FC2W5dDzFk8IzMUdBznAJnOag0+JCoZAYSOa3hDHidCLd6/Vr5ggQgpLZhA6OpGsDjdWoRBn4jbtnD6jQ7tGq6UINJqR9NWKYgoDsJ2JhxW9zrxBpqB6SFiAyFcSXycFuhrnJsjFDoB3yyOzUmAC2FN9SJELGVCs7B2pFhDKnzSU6omIFgvwiO+81qnIZXkQzMk9XfkRzI+TVj+VdenHyosXy2rM30lnZ1LFdaBUt06iY06q/EZWnIm8UJB37Qt7HYMd9qgsSa41OBcFHih7naQIrQIIbJgiMiyRL0i29Gm+SsmoeCThHc4YGvtCG8HwPInGGoo+ig0YvF8wmTX+4nk9IV5UClOOZjojoaJjlYy8yi9mjBZKRyAOdB+WyDAupixgcXREDNvsUTKllh1yPqdLIuETzvkyRrp2oynGgXEgFjUoI8h1Wc4uVsWjAdgwNorFRo1J4EKH+zAuvxUy/CtntijZni/1tRwGIOeLly+1auJN2GDG0691gPZxyWtq0ZuSU1nbsStvgkWbFCpgRwUSnGlt4p08kakuuldFazdVaJ3qD6FaUejmjkocYW5GG06Nn1oYwW9+Gp9HmsgelVvD4mIO35CBG8JcEqI+SHKB861QTM32WZGO4nb0qlswyC8z9udHwySplGsIt5Lp4Ou0H22AZbtJP2PAO9yJptHdWqaE6iGNtz7v77ErZL9ITQ0aHgBFtEemwmXjMFP0RYQ8Hwlm5LXF+QCYpOI1wSkH0E70DLOxCU+IfetVF9vtXvdancPTy/PRbTE7am+CYIg9jk1XYgIoohGurECRkCsFYkzLvQxJx5oyYcP3t6vR4D0QnjaVoUXwSMR1EkAyRid4YXwjfH8Q+9ErwiMM5WDEbRWFFuKzQYbNrKE7cAPsZtITdmhxHggnsBKyR8A5GypgoJKUA3cf3xSKfjQgIqBzaMuaZOk2cYY+9CEjptj9RHU3PdiR9P9S+ep2UrxNgF9HTDc+B+wiMANhn9BIcTgkyjzF+faPDuYDsYP9PERGkM/sP3w39QAJLJBVfePcYbhaEnXeM2X4kq7I+Znji6gbe2zMjL9O6BAARsPVBRn3HJxPMqo9cbb/BkQBiivKe6eYxAUpNkK+1PwHoyXH3mpD0vXg+YPng9tTvaZgZNvDo5fEoeyHcgdo/FTSlwsv6MVR7WkLP7wlrS7qEKXJBo/TiWN1j72JTE57+slfiBMOqqUkpi02/xTY25I37B49V4JU4JLb8PBTV/v/DiQa7Zwox7w5gVuNfltE4fX2E0N/ll9qIrv3tXDUsNBwnIHn9Ja5ZZfSV9vcFs9PltN4VpdYA3DBeC1mu7BY6uJTlbINgR/zp04T3BB4GDnIL6eDsxSXBP0fpvod/379xw8nY5j2IWpdWxrcVpaweBOw9Pjrt8YOCedJuoCF0u4YjGs15eoYjoye6qvY9FU4v2U3daLo9wjSVem4hv0MQU9fg38He3G+x6/fZlL07zLcBXTeWevwM7rqhYCEu/8PLDy8Ll78cG+HunY54ZLDEk5G4Mw4jHLDsMLLhtoFgpb0vqkYb7FpjvwyM5kRfntlyze3lTldDv4bZf+E5SXt7J+bFf5qGiWLcdVaXVNWMSsdP9mOXYErfDGDkGtdc9L56EqbGJrd1xw/+y8uBVpQkDwa2/Jm8YNR8aQhLYqAuXHAqtobRdCvs2BiooQJ7sBda7PwlApBhB55YxOBB4BYgjhTp8IHL/2mewPLYKxMOQJq8qQpnfDjMRzzitafF0nxj7aNvta4L7PW0ESTGz4u2yRdAgX8SUBZSJgEJG7OPVS6L8b+PmFtB4XHDdWEc/Wo6vlM4z4q1uSFn1EksgtWTvx108zk7J3MK93Tzb1ORDJuL65PH+FRLdDw6vuCWoq+b1kmWYM5I0kR4lAftM1ce9EHMcCyBWZJR4JnQPnVg2CcE4Q8KpR8cHsGlya8tL85ubGMQ8jx5n8sqG8KREQ0FGV1ywenDgvBEgHuEJrUJI17gGJVJ32BWOVrBsYWR+ADgdosAIgDwmgWhQIaR73E2PNxgdSf4MM4dNfiKIOIJfODREtg7U+P/onDajuAxM9JmuLM5Xb6BJXQFwwToAPBQPFcWTiZGB/I2PYfl036QxZKCd6EEjWrTAuABCPAbAUvwVLANSwssi0A3X/xNyqxXfsxay5C4iMscsYwlZ+W0w6h7fk50OTp9yibjHxTIU5Ps2oFLyVb79+0xTqugLe7CJ304SLvhfnFYVZBjBPKdLiVE4PIQD7HpzEevRBBJ9y9UtGgQXIUDyqa/Ks9wGRdgQCIAmo5w4CoGkZdWPAVx9PgYfKpu+UGBqxcMWFsye8JoXVFPPchECZvMt8YNUHJAzzAZ1GkqT9fz5IkjXdYjd/ypBdbmjJGBdd3lpGq1IyyU2nr13Lxklp4jt5g0RtjikcwmrE2+eJMwFTBvLcQWCQNCKS6gcHROlAQVzUBqDlCQGA410airPSuOT9vkcygOonlVHVjRDSRaRdK8FafyYmp+EMzpRKXNMx8GpwyOqBWJqwexCD+QACJROQQdNYQpFBBmd378nT8Xj3yP4eFUKsgFmJA+RdSHRwx/qM/cYdYPBGbM0BDlnqr+1Sum+QEXFSBPnqK5H37d4z4oL0eQ2LutYE/FNFuB0WEAjhhaj7xhlqTuG4BBIhgDqVimkCCHkQgNCwOF9rJgq0PSQ2nKqmDf5oQfrfIPzsWJ/+vKQI0tNv74qfaksGMU6o/vSRwnWNik6Q+UtoQlB2M9PvGn4KQksP4QbLB/5Rp9SZQiCRCvjnBzi85p2T22fjEDhoTsSl+qzBGgFNaHdMwBnyr6KzSoDL4asc3K7Wkux8hQ+QsJn4i1nyjieD5g83uBrWc/lX9etb7X9g/ZPhwXkKsUUQ6hAmfroNeH/61jDe15AVVplSreccxkFtw0JVrts8F3IZaMsYlaK7Lfn+UWh/4dkOzQ28v/JysbbQomBbToRLXaJAhl119qvfdNLUyPKW9J5AaK5bbAZf1V3z936o+x2xPW1LvsREdmoc02b2LtU/602w8adN0J/zmOKYr/1QFOIcC/38nf4y9p94pH1XN7CJrLCLNH2jiNzP7R0VZz7AUqoPIEH0DIQgU8CJhssDjX37Goztg6sqnF/fGEsR01Qkcx2hDB6E9AGKIUspqatG7GeEDXKXjBk/h+fZCXwUfoY6Tw3D2SSkYjv9BNURDWaqY4JDi3SfMqzaa/e66PE7pMDc3e9BqpTNu27QnTX8YQVYOpPNpWdqeQocD1QxkaxXUIIrCwaVdRqwGC8xo/AGZIy1uCljMsXNeRljbIMJt40D0uTsVpi7+FSxOiiCqlqAEqK2Kuk1CQUlH/+vCtcQH4ayEtPBYErYXKfzZBv3yBZZKgfw7WXYHk2GorVrDskG8qbk2HzgmWoxUDFKmRrpE5uWRsaYysPgVvyGM5sI3eRB4mBbaVw2StUqDJEhaG1Ht2Z68/pCsP19trdv0VGC2ImLOjnlMUHoXXREz3XOX4VMP4fkTKQEVe7bW1rbIRxpVPOX6Vm5rVSZcvs+DWcmYAdn/OviwNkiNX8yPC3GSLzayTZ3S9jLXs7t3pBQZhNlF+qsHahbZe00uizMDYiO94Su+iffDLa7HhxUKKRH35ZiA9qsVPM/lfano2uLutDT7LCO4PrEbFEdTqUr8SP6K1IayAwFbbBoGS6oKfV+qnqsldGNL9dsEEJVC0BaCn9D6IlkMtaoJT/zmko4l6z6IYXpZ2LXbYYHyExtGWk9h93kg+eNpLTYBwUO+fb2YrZnA7XPFvQRxkDbjFvZKkkvr8xQ7AU476xvp+boUlDO9OXUWZ8GjY7tSNGKum8DzqmA+ExNT3X2f0BTBe5pQmKpNEMV26+lwkarU3VEXHEJ+VcyACjrZYsyF5ZcF1yD4IC0E6lTMkUKpSLvZdxjVLRHc2JNBO81ceU8n/x8nbcD4+3BE4y6UaIfs8+4yVS/CZG0uau3Gll4KNRwLNH7fjb0BR6tomwdgwXjUO/XEf/qgfBolMoE4ZaL2ne0Oy+jR/EsOU1JXHiD6F7VbGkhPizX0PJhmZBGOy3QECVTrxJP9eQRLhn1CHef1DmNlJjTh0ebcP/oOo5PwrF3qWnB6L/q0133OjWfvh1cZOcUvxVcoKqQsbl6hb3v4pWO9/YkjZFRN2sz0oLqDKBc5/rs5rjZbjb6bPoTmoCuJZApbRRyomHuMBglMpN/2Y/eKxXegS7HhCGOKllS/V9SvuOPFIOiJfisqbCJr2eIeg926xCJGiteYT1ElOS+J2Xk2Bi+PtYvVAmgClMLZMHqYYXRT16ML2WqmzCJpNz3Yvgx12N47TrCcJV0a0TzlmgFogN/wrVo1WEBibMSpBc8gTCVnkaDWS3E8ann+FSCJJmlZVA2GRjJeiPldTuTjNco7sworqbWXNTwKH3tDl7t721BKP6/01I8ZNNhvvHq4sjjDDtUOTRb3BYa5z6uZPOG0dYgd+862ja8BKs9VANLp3T0fOdr5NzEC79VS8jdVYRpMVzToo4yEA+kayGLcFCvZUvmwWnmxKq20pZXNSP9Uj3T+7Yd7yYqbJSLJGoVPgf0tR2CHYMB5MmNw68fZDo0CSY3maD5JueFk7iUiaEhonXDzN1yDf4dvFlPfnPS9rhJHTh04v+nAM/AhinYj3DoFuNZDOyr4Qo6qvOeFzQIDwv5sCmQnjFBKZM9xRV/qMeXfTJoB4oFkkDcK83v9/OXEEulNaM+rs6S0nVRrMDa+/OzeIcDZqQjuBeMatjpDL7C0pW7vaieDTBfqGb6UllAuPwMOMIipcaK2z3NEXCsFpVUEb0SMkQCwqlywBKWOf4Nn/0DKpwMadr+Hp88DQ1BnJXn1PiIJJhHB5jwSnBQNGA5Wc6NTgTClyXpIFApkad0BkCvBOCoAT+IM9+bGDiUHSFgCZZraPiRGAm4gx6AgAiIuCdwekPNAHxIqgpCVvCCuPCmmkAjKb2Z3pnZ25kX8zY4Olk9Iq/2aDbzlwGCjPI4MlwSU3FsDWkoRW28W7n2qnj+/JnJyxpPcNM8/WKiqU7FoMHl9jg+6ysufnaW+3LDbP+3PZ88pwgcAwPR2EXkeN38DktSCqRGp7GRIystJNkq+5fOPid6NM7XRmuEyiMXWZvB4B4bG0yome8p1o6WIyAa3dlYjM3poyvI2Y7twgToZHkKHCdEgGnX3Bqko0v/QNVC5Osp0SszE2LSesXZsu7Ft6WH4CYvUG+W5QdLUxHvbzYGgkbRkTQCTcqZ0mJv0osTUyMwCa6iR1svrjHP2SexCDKwmQof3RhIaSqAFAvcZijWPVjKBLPh/Ru0lsnj9FdsOd/3QSb284NR5eUjOLhJwQTOEECo2aVome7raDBN5agcEhXMGJkoGSNybfOoctEtdWwqY4KuuWDVkItmojNOZfowlQuAG5kM2IMUCqBt1nXmw/vzJsHz8FP8RtEBfJCxxoAPBkVgzPzUyPXI9GDdAzx183G60YDP3ztlTwxeBGG111/u3BtH722Bb4Dl4FzXPbQFT/OLNe4qrG1nL29bZinl2iMv6CDMIXNUxeK8kYY1qPo55lEKKNIjhByEPccSXB7dDC+m5lLbxaGtLzmFxhFT+en3EbSExIVF/FFs1qZZ9YEQiWhoOMfw1qXRB3V1JlAIVtdOiC4gXt+x244NrJPTGEF2Bkhn3g3obTDEMcARt4ef/Gwe/u8BSDzQSAaWIuPihhpGiepQDe6KdCZETUbLddGjh1kOytxWmv8CXPDSGajlTLR2RF+2lmb9P4pF4vw28OQu2HCqelNlfnjP/oLZB1LRaduizNjG/rK/T9+NFDoLXEXXe4EbSeoKvj9lUdpud8mqsQuLR0nI6Bb7RS/bnIea4hhp9sY8B1M7SxY9yELxVDUTWfVqXD4YXWKZXFksEfzDqYxLDXS1ozuvsxNlRufHsxiV9PaBfez8SVLU8qTezHy9SFk+x6fNNgzlY9cxXeJs3vHLoMFxqi3UbUOtzPWKO2flH5MsxoFLT+kQ9dH+9Dm5+7FLu9vPMh1OjWudXNfHYiNkdKpsCoWVaM+MHlHBlyMj8clIjJQmVOZlFVDAF4lUygbBh2R2cyGWC9FVA8SK1aLEZFj4BGY9m0bzeLynnT6IOyNepyopanHKZhPacHG89Ig/bUCXwdl4z/cp/7Ww89Op2EyNPvxglGp1UPLiswkKcg5Wa5Z8QvxzSWJCqeAbVcPCV0biFVIoJfk68aQ23q30TqN8RbV+PjABKqJ+hAR/43OycJKZvEtmZa37X3SoMukxl6z7p7X3ZKYBbhO49fDb4yS0GdcyIQD8UlwN9wA0itZMA3ezBYp7FSIgB21TYhP3KXUwMialFT4Z3mqHxeqGQn3skPM67DIogcnd10CDvPsPWJveKu7C1f8vhfrYEQTjzWlnHuLw2HTDodGO4hZf2L7qcB4xaJvjn6cZmT2NY5BTo491iDTUQBh4fxDlK6gzRwAMAQeSGsPRA2OLL2Aah7jsus2Dgtk+RYTR1GVB20q4lK7AAxpZMZb4FVvcV6gXHwFRjX7lH3VK8/mrNvPc41vTXAaHzhStYDm1l6zOqyoLpH5DP3qoN/a1fzrXtf4THe0EMSqPr2kEwY4soAwFMLSQp4vDg46a/xAkVLHpbuoCYTg2pmMYHpEtsTi2DQnEVMVxIee61ybg3oT+DbfpWw1sqJzedXzk/GEjqLhTYBr2XmgCSWMfywRbndD+2ZwmlEoNMawQWe3bzv+q023R3UWRwbx6xotdNfgYeLpdSrExg7bM6u1tlYkE06OuMdmCFL2W6RBWCUlCDvzdnpeykZbtpOvYUdcHj93W/7rB0KzgPLmM0LfOrRzsUPxgeB2UZnA+lRkGXKdA6HOCj/SQfhwIMMQQ2dXz4zi2HVdP7Hk64frQ5BXqLf/KVWiN1JZWbglA1okHFSZ2HMDfoBnP7hUaCDsF+G6nLMfsSyktr2iK90z8n8MuJ0gDoQEiwcfwqJ9h5sk3K8gSqxVvQGM2oun1i+wTJnOF1NqyLx0QkAmJ8ZApdLNvXReCBeSGvRobTWz0QU4neKwOF27IuqUHbDOT7fakDmAHxZPbHNCnwSdIosSteuMhaqnSOhN2iN4DpxEaemuabqSynL/JCUWUbDKKG7v3Vzx5JF3cfnYCXXINuX8Mo6gW6MKvIT3Z1bDCfoI0g5eN2Sx9Trm0ffhOwwmfEg4s/z0qXeInMHE0qDIKaYru1IMXKKyO+0Ky0TZ0Jb4r9lXCdUZOZxrogz8PyYkKdGHfBbPEdCmlpsZZ2aKidDg6ldX49mgjXHp7vQiEnVRA1zHNYKrQiMuJIlirDTWKjIDHrHoIviYBFbURtkGnpobrbNfaAYI1uNU2UXCVvjVbP/s7b8FBDxmJpClVNjuH2A1QpBWNBho9CkHelcrjOVQ04umUf4g/7Pg6iB4fD9Cf14azU54cNtCDJsQDqCmt2nN3ntgN88jcVeegAgm3djOwvL1JTiPeALfbQkqmS69uvhFK3Mo040pOmLwNC58LqIqMP06Rt6h1KtQp7yvQgzveX3xMB0VOLrnPDYDoO1fROWEcvZkmotOLMToe6MMeDuAFSqGTTVdM03J94pHb23Gzy/R3DHot1P7HHglijhdmW+lDRcKLIcA6fWAAyYkH9RlqeqE2jMHhRi1ArkbNDUPGqG4hPKLGgEtzQd2ChPOq2Gx/XR5kaM4cN5WzaSWnMXybqizhoI377QkM7Da5ORYCj+5992aepYhR1MRcWx0VgWdO7hBRXK6M5SvKdZzg1BKh4/A1p/2wCtCxFKCP1KRQjpLzX5y42khm5Ktf643m30/vflFy7UJdiAeP7Lth8houoR4tU2O+uJFZLM5Suvo825DsvNnfsUaPUNwvdAgJa9w1bE2lONzVoCwo8sqLBcTjwVQmyPa52Tgp5IpVJvIiCzzKn3uD1id1OMNkRPc65276kY/OawfS5Y4gbWmTMvP3U4fPuyvyXDN9Unc9mfpxhUHS7MGJSzeBUORICsctsG3ocxGjKuJOGzcYU+9rig6xc5KXv5c7KiDtxnFpaD52KZcVdQZt9kszC8eUDtsBmpaWqWiW1l4/ho/j4XO40bqd1K+L1+vfYDn1YAvKtNWoFrMhlKn3g+92TEfpwamIEoaQ1wa69eigpMnTnEEGaDrHRvNFJ42BrExPL9f0y0XtCCoREzkm88ThsgumNq7f7hhuaQ4UiaonjRLH/6MoW8a+s2UmX3TAoNAUEHDQaAygq/kTsPAQ6V9Qz3H1lURvOArmwi2kmozXhN07R2QgigJIs17AQRWTcBBQAJUhb9K2D5M5TbGC5i1qGcWkAEyVIGJnjgXTLOvSFHL5bA1bAWzyhu0gbk8NMoMLCTFdT7tQofZvJcywkrhrQRiIxK44Ck985Yf410iTIy6HhK6k1iSLRxM9zW9SU8nCrW1kHdkmXXBPSkya3jyLbCLXSpVEJIRHk9C1kiiYHCSXMVEKxRmv9Bsm/3AQ8KOpA9wvREKlJo4hFkK1gkw0FaRpiWS0IhJOj/4WaLsH2bSD049wd+6i7AuofiDfvbFQAqh5/1ROeoR9Q6NujGYBbEofpTueVe/cjBVm65QY+OED5SY36+lCpNdL/5kWCT3lkvCzA4ymu2U39YVP/moZNa72VlF+wqEvSOLweuonbHM6pGXpa4Sf7tH+EGxrEY6cWJC3IZKPVhzeT+h47ptcfjJxlSSaABG90n1pYNlMkgCpCRJC4xOUfcFwx2l6PDuit7lAGz2zpwOZbL3twoBiI4V1OfMHXj5WCME1nrlUESxdT2gSF4PtZ/6JLPFB+a37F5GgSg2k0UJ1PTR7ZRrzRCcAg0mENDSHVOc1pTIUTzpk0102cpKEXIXXQhWkT02c7B42Yl5SfU7prC/TNxuHkerWeq7pc4gPw51+XGg1tfFT4a08fqGN7o/pvJBdJLiOGefxtkx00kGPJXWYJJrWnxBg2IgRmufLnJrHep7yjXl0twa76n5qWiInliHyGhbXnHipQ4NoaGaMZte3jghZrujrI3qMomRjq1AEdILUrX99xkD649GIsmrcvHc3vCSG2u4repDvZgbLzFShRWp7wJrT3i2Er+zWWQ7XR3HpG2PjgsumeG/0FglMA92BcKaKRja93vpL3MwP3sjht6160q2Wm6PJKwqZz8R23z4ooT6Gotmj/Gb6Na/+dXmUtVJdtojdkI+L2gTh09YUA438GhyV65jlhnS3ve/8tiC3mVV3HI1IDoan5z8ew9mF20fRTRYrIuhpiRwwaAZGHpGGu1Oe5AWsewnHss7blWKM48/+90X6KxZtiEsZ+hb6aK6Ht0W6k2alCBtdIlaJyJ0OleLlBuefJz38RmuqQdWjoKlvbuowda6h1vX8FP/wwMVxxnGFp9CDMdJRA4MEr4jz5U7aWEVka+GK98PX5EQcK8VScHjG9GmHcEE6WGo89ZQF34Sh/CcRxkwPK29RG/5x2l5TXkw156Ge33fHZsRKBWt0YVXirKGntDoU2qA1sA5xErpU+lB186eu08jwjfhuMrhtGAeGlDsdDcb2JjKlJ8srul9G5NnVMMZy1tS+PgJghzEta+3ZKoV3CJPBP9RFc3hq1KcyNdBzFUrJc3zqKYzZb6IBfL3p7o6iRXH/je2qW63BqCDHAlow7WkujF1S4L+MSI64fVmi4mUqXE2Jwwyi9Q/Tl8bqCdOzNzWPNNx9Im8scK9YFNMjHFXrMTRhVnyLsFS58i8CGOKPm2gf6f8p7vZt6S7gNKocjbVxjr7vvJek5j+TOnkWg/Y6IcKwl0HyigWOT6B1O5H9vTylhMoSjtth7XpzzL5uHpqBXWV6rKSKjVt+pAC8datfVQhbRO5uu5y+R5I/NOZ57JA2il9S+KS9ijTz20hg7Kaq8WxQgbIVV/wfYXJ0JnoNTQ5ANpSvqHk91UdrUfFFJJa1V03uSOnYmrDIMzrUfvOEZxf85yve39w6eStFyYu5eHW/na1yZ2Fhpof+DdqO2PJwGmU//2ZWp4ncOvEVtbTo+sMkBFWfbi9y4mZAfdy0/TvofDH8LbWKkDFsRHtMufPDfUGNT1+aYC0V03DgaR+LnTDAIBAsJ++9+o8VP5nyp/lqPtyhiteBvXuujMbaWVC3ISt5IGXf27EByS4EnEcT21Gpu89udzs8LFFHzdjIbyJjVbYfrVNY0IKJGqmQ+XIqe2fRd8Ph6EuBfFG0BVZyYPsDHwTJdyChwILjO/U021Pf8cVZIRIqTZbBFNZWzMj9hiyz5hC6/FWW1LYpuC6fVdJOs8cgu3VoMjyIvlnjejvaUJ/qBOMr85VZtlHTIBXseJSh+BC1EPFQyfu81SpwSYYvJLQDKqQDsQvAV+uCXfFOmS4BTNgQp+3Qp05G5Az+lAxILrV7nn5K2q4QEwNvaP9X0f71JIBRMzxxQBYo8cgVsLUwLsfJOjlcN3LO/vcV/uKQK3mdFPdpW+JxVojL+UOh5lSJF473DDPwijAfkA3ZkdwuiuVLF087cfrErMf7I/suRO9JKYEdXT3IPAN5LSaPp/hDsQ1/BNV8k/3svj7Ee4jl7etJu0wGLSTsk6eOUjjyyLrv1K7Zj2ffdQ8vY3++hcrP5HRisMo40awtIbIPUMTY9dSd7ELKwhE1tKlUwUyF9g4vSDUpKkzpvbFnX8FW3cMXroPXXy9JsAA9OZewBU7Qo2voRFk+Cyz5LlQCFCoqj3AFKmNX813g4YrABBB0piJx6UxiJYItzGNRnb9TwxtEV7NyY9p0px9fcfmZC60Ca3ripC97DO0n9rf6jjO1zjdSDSpU6VYUiU4BsWbnXdi9W0oFSIWB20bscxrWD8EtSLBkosUsy97dgsP9eTF3MNiUqfvwNZ99+e/Rp5/1X1/fNS+dao+rzK/4uCcLhZgDOwWcaUw1opK0F3Og+vBcghIW4rOGONI61OmJrwDyDUD/+CSv9cvZI3Uv3vLktz1AcPMXLA+1QeNb09EM7z9PWtpxdKjvvrwFfAtukjY9sMRGpmkXYFDC/JsSyQPpzmbBIcu75Mqj/GYxWvJVkKMnrIeiikxrD+rmarHanhDEdPv+dtlQlvPGaFH5D7Od7ClA3hLCQrCIjqWathu4t2Jwl+K+DnLbfK7Sp3Tac3yIhEu1saKq97c4SBoSxDHicilksCuL/kGHgyz6kAv2PB0NuiOmodjdpqoifNAzWEuSGYFe3FkqSWkAq+p2EPELi7pXALPG0De610F7UUXCFsDGcW/vHOyqzklSLsCGjzhVCedwvrihyD22JnHZzqJmPWyUrcBpFOZi1GXAeHyaula5y0zyFN1ONczfroQAbRwgMKv/czoiP+jYWhSB4rqfoeaJ+ckawRCB3QfxuVgY4bAw0FMERQLemEGaHL1Gig/jfh/NM8yD9wz/Dnz0VinA7+X77YEiiHb671WyxLn6qQ4pre1NJMbOMRV5r8iHwwjJkSfoPIUtePgMGnq2IlfPqNmAmAAUAFuLcsW4PXgIf5OgPIujtIl/XdFUjVQebSU3FqtsU3oqA8t0b+oMbHZWntN3U9WlZMruXfT63dBnEl9U5bnf8XOhduxbU8n0gcH3yhoE71bnkyEX1XwJyfjhOJpamHhx2hs3JBL2kxZN14MMYFZZ2INEJr0AU0NpK6YRuCPOoknuPoFajEOs9EUAjwDLUTGGPYljjTieiIcJxgTXUfiDAcxh/NhmgzYpCQwLUPwGErvcVDecYA1HZ9aelKCTidFJilMH7HG1QN9UWoTLeBpQfiCc07L4G28Bqy8DNiS5TCo6AMbNB6Cys4eo2Sahg7g8cIQ8wGKd2zVcQYM3jpyHFlx9fvirB7tyzFrG6tw3j7ENX36KyUmhaJV/DpIMHqC1Z35zWVAJXJIzSiaXnOTLMnERU9jc1GfvPnsb5nL8OR/t+UrgR/nLOly15+4qdGFTZ/aWQBo33syhrcLSHRKlksKv16gxOKEmei6dYYp1tWtHa9ppwlNim+Jdws+cNDJtQMw7h4cQB4zmUTXFpAkV0xY8zL3lWj3JeoOf7LvEYKAujSvK2yM//TmGg9NzCUwY5AnysMmVK8ikV+BZTqhPSrzs2cndl1/WuRVWfao0VUu1AUfyYKOghI9A693Uq3ln1qucNpn30H3h9a1XCEsHJ6JYmcft7jiUI2bsLYD1kTp7TgkDPMl8yCrbsLq50q7Mm2nr+goddeGqja27nlj8XoSflkIXDLMEOc7YtxKWM5klC3I1SBe+euCRmtRrbdPo1LsjnDv5VrvHe1n/dZVjOqvnZRX6ZHf9fRMO04uESJkSILeOjzWv84E8lEsGvsekrNnARmXGfKtL9vu8H0PhUqbe/rQNDSYKPOayFRF13Lk6ZwSlDM17T1/KnUk3lXFDLAJaClVvK4l6n0GRh09EzDeOp5Li1EvTp4Qna0qAI0RuDp4gStiIJ+2jEJ5GTXeDe68EPps9AbADiBpHdaj21PSXBN/QzTLPcH2VQ7MCziLkl8yRiL1dwwNXb3zVuJ2xNkFWTd4oWNajDh45JWtWn0StPnRkhkq+OXRAC12DsMkQ4QpsfI0SWyElwzG9tYeTXjIP5/ifpX1V1DsNWBz08JN/r4PO+vtM8Sno7WOyQX0ADG/mw9BFn8+I19IUSIVF6kJUlguJ8W7/gjVmld1RNbbL8d7xzd/88AggUTpF1dwtxZ2zKWQJkNNLze8FKC4ZduItY6PcVVBvS7VHRu8GexIkEEyoWWdlhpTs5UO53nlqQ+o8rLsGasiM5HaF+pMleGF1dWb9NZlv1kczCvMTkR0XgjNq79azrL/IomzGOVcP0wRO8aGrmKnE2rl6C7NwRnHP4WztiXsxldPLOHFO+5WmAP/cib3eFv1FbfZT9O6xTRPNsHmrkast3qcS1h2jJEOqnyvDDJt3Bqy/7W6A65P4XufOdJL37ff45hc5zfyG5Ba3Dre/sgfX7UJ5EtCy5K7gfdl8LOobSD90wnlbnNxi6mhJCfRmEqHFCm13016cer12vsoRgYmZFfIOTkXJIqjdSMSH3ijb7HZbFX31TU+NWvvgNBb9IZrgyYtX21QR29tPdxbVa9tiiDLdgPl0YZ/UchmH3JSvJy2y/ktbVdccxND0kxbM4hri9+XzfCZGkavPMCWI8uG2OVGnRlgJkDIK0VxQlmhVVb5RHXW6mnc5VgTidqqbyAyyrFsdSyHiJnjiCU37sQ8MlZpTS4+ZYZI/0XaQKWL8JMW0GpvrT6sAOEZ34ZdNk5e7bbeXXxMqqEMY275lj9FOlvHWoKgek8kIWWKF+3HUT7XQCjZDmakJq96qh4patpTmmaa5lXWQJLYqzKA4xduSYiOt/7iJMBhXcaoELyrm8rlsrTb54Sby7E0CqlGlSXhFWhBNglUf+hQurTgR+lTHZLmpmTs4YZJ74rQ/+T6Z7XwzBRRKV2XiGr7Z9joTd0Q+0oQspvIYdS8/8rjT4MCLgtd0yfHl6Q0lSbotrCL26H7gsKU5gr7Kc1R0FId3OAb0OPiTBS3fDOyBgyPmR2pP6gOl16Yi8vTLT4xFllAiq3xV4h4ma36YPLBQIqoWOBhnjP3iD8wDqeR+uvxwdYmWuNDYlgA8FUCB7hw1sG2z/N07P5TNPmsUi6EGxWuii6YdyP4Vv1GqXjdjoNUeyreRibzgObpHdzvXESbQMNA3vAfGqferIJhrWGwH9fJ9nkbtsZ4tX/0rnzleuR0tyDwZj9k5loMB55OFgtptQd0yfcHWnQ3mhTSIYfit0Vyk7zMWUBRTuTXdDuu+uY7bzsizhjK1nI3xuHXnoAm8Ent4HzaHrRfp3zTlpRp9XBWaG/fKhA3GoBRQ+6jhseM36Ckkkdp0AoLi7PlK65jYLDdfiL6Zx3OGQ1Wz9xPV+UC2ZaJw8ayLwcJhkIRGeceM70VPnJluFk9yjHoyHX0fKv4xuuigdzG75Gl8OjA9nnzQsUWrxKP7fpxnaA/ZzExhdasUFVm6Fge8QsKdSfr3TtbfaMgx3J46Bzs/XnX+TYe+8fWQ0nw5aAoDQZwJBOHqzgy2LLf4ZerAJiXhYNKGJycxJ+zUno+wvpFxutXitDdNNGc+7SltYpubcI+o7TbInEurwm65DHfKyRmKqcOs+ErpNyp/NfdyIcHPiAlvUXhG7nGDTx9yeUYNZNllqwYpvSoVcdzFwWenTTWl2/3OjHm1CC8hDamjSgaHpgursbsm+mBvlXgM5hvR4iLyNSmfflNwbk6rbmaayh5uGsPhE3qNHJ/+9rK2w0vWDi9Ye1v99LksaxLNfPbhZKrOuzQ1O9fwMXnzK+Rj0KoJA9OCxmMysHAm3EQlnlZ1WZl5fNSY4N5mkN5msP5mIJn73ChxcwAWb/XAZdiDolTfqkADU3H5dXf1t/x8UPs6mXLgU8XKWL3K/WbsnuSCvL9bZEU0ym4Fc3IhFmkwpHjrrUBkFYDERBLoBMsq7XV+U6XDed5Fza3q3ByGzu0VoPUVpbweUuGjS5kwZs/HTZJv3eGBuPFaBw9A3OdyhQ3DEvDWjjdWmgbYYyr5srwli6RBOgOoZzrH4NwljCTBraXEihEM+z7kDrbymIlxUsiNuj1XQTHm6q9m7qPL+MB5oFaTaJGDpjN0UG5/xjoUKrSndO4sKDYwhA5qgAWMGHoYfZtIUyNAOqi2aOACeRAOmx7q9p0oad6Us4LPmgfrIonjfAlckh7l47MYtid+8mJgTJA7hQxJKGOlEZkdLkHC+4DBFKgvUQ0N/EOBGKQFGuEZFO64ulh3EUPyX16y8a3YqJEXHDOVH29ueJ9epA3LiF2r1jJRN4Vx7vLDqdtjOyhrYBTS1AIir3rr11R0U7EsqsmexGvpafPBqaSKdm35w1fJOpe07y3JG/nIGa5nYZdLbk3JCA/56Kk4VwPsA1c8WVQiQpQ3FtmGd37+LBfbYeWbR8uveHZMfp7vwffgOiZw9amc7N8uXasb9hij5o2CtI76+Vj8ZW6jD4bEcFE6lhg6tz2OddGi+800oMEEdN7C/BRsiDXjmx3aYrKKxIOQ2qXHojBCmvYS41vWHpJCsaNM0wdmg1btvJISc0qKZ+PpI8mleDrkXxfch9kk3bjlNzDbWRMf2kNowyGK7Cbv8lv3niJLfYXs+50yzIcdBKv8W6WMfILfdohR3hDIrterXCJ6t8y62EC3h6A1lxoMcQ0iUwExC52eic3qTCW98PgCbUjO6CJtZoXUkzqntOjRFNSegl7s8YGWaOXV4LRb1WF8FPhOGv4KqxVW8uQ1+IY7QmejlnVaFgRzjQPWxwxYq2Av8k04aAsXicpfa8zBqf58szSyJ0C/J1afI/m113UmFqNjKXdbnPHXSwaiK1KBPucXPr23HPbstnNKbr+ESco0AyFcOHv2S7vCV4wij10vH8r+9e/e+y83oK4Og6HnngSA8V/8JKwwsMBlkh91TG7V8b5kdYOv0BM2MVO4j+WJKb7ELJMB+wQZ67vbgvgtj2HpwcaTM/LRHfmUQkZvs3DpxJyXdMAL/9CA8v5DH9tGuvtjQFex2NY1K9AUhg+YoHSJs7QWQI9pY9B9nJ8UxVAguQ7trPbMw9P28Tho6ajJ/XgdJkyxz0B+ODkhNTCvnuJ/93TPTFJ9PslKyx7yh9MlOrpGIBU/LzxJeEH0PixTwd5XFfmdNFPy35UTlLK67SfxmE9LYJrdq3SvDa4SppjFLoRM7a3Rp6qSEw5B+OtVUOJT0pqFK0qc0MCMPxIHxxHnplJQtxJ4J+M+ehBWaQUbSmkpGUuM2VTcJ6mJCsNhTe5nAETuq4EKNmN0Op/JHKbJyDqDerdSfVzz/tTcshTZpWFpR2Lfwhv624Tm85AGeU72192Uus210AL1upqpzGqoc3gPjzwN2fV6ol3rwLuv7vA45g8QwXVqfjf5L+1KWfKyNEcfURPcI1QSjA2NAatPrYXCNH6wEVJFZ6m8Dsh1XEjvsALo2Qsj0qygN6YGarPKOiEqz1iIEVmHOUEtKsHJdA+ZMaTvofsQ0QPSM1ZSjft17b9g+3QTpEIYDHvCgLt/lLd4fHyG85wgRspR2cGG6ytdLVxlxTFChJGcRZMkn4RbLuV+eFplcLyf1SfUXyE1pDzKVMbYX3Nw3KzkYslLjafGUuqHgLumzUxIUY23XFZmSkStTJ2rWUwJriC9tNdXDhKvU1rNL4inn544m5BsicHh9DYzZM4/wNVVvlqilWjpinItI0P6yC49hI4eTSLSdlF5Awye6yLZLzwtCNPHrKoABbbIaMzy4lN9P1X8cHff0zDXFOmhzydi7ssCI7BM0kKfhJwChNgNspEkff1pww+GsixSwr3Kwesol4TPmcV9mV3WwG6PMMQUp7BdTEegD4Ys7QBIpbZRqgR7HZpVsMe6jfR9j8zQeRixChSs3jYcvtcbbqlSCNYbjm+JjxmCj1DOnHp6hR09/6dRI3UM58xubV1cYI1ozgIUhXUYqICaqrnW/Y9S5VomtfzT2tCyIJKTo34KbFxEvse7rVVkuyFaFuqgU+F1O67YlK8oqV5QWQycdQFsbjzyUtKjYiaqCRpf96Vg9Ovo5SBzK1mOQyS68IpL55vGxZ0BE+ij4BjDX3jXh2JwQ0v1yOBAPtFZbUVvv+cHUokFctiiN1Ur9rzgWpzO5Z8X6UADlzDQHAYkcY6EVZy4+UoENpNOGkj5yzxaRFMEGeqmxiHrRVaqd44kNdQ9p8e97nBV21b6+qnrtqC0OD0cYWvNQROCMg+4/KYlSiIM957qgzSqX+vMMZdDl8zxzMk4BHFfN4jxLmhDQeCK6pBybS7uRfFrxbDWlcjWVabQEaBL4jW+zvDBlO6xPiLJQ5hukOV2T8u4yxkgMg4opI9JaWI6oM06UjvwdJS8ABt5CK35fg93X5yTzoQF77ey0A4fErWJVyod5yKqpnKU1tAVrULXtUAN0PR5TOidMYPWYo7MO/GqUySGXD4s570IKTrtuWs8mb/43AB4b+iBLSeyxHx1i4uXYtswXQRqTpNzSLFYH5AqgFGfBzkrneldl0vYbmWS4eHoYmkswVfRud78SLizKeFD7awpVspCAl9UttZHp/iYodM2KbhM17Ev89CutloSx4kX1TzfNewikeXQL+jjYJAwVSK0i3DUXBD0aF9ifFJh5gcAGeGe0GBy6dT4av9I6z3S4mlVxCwQWHulfxCRf+ftJbvkjLTplegI7f84+A7fKCDm3CcNxW8Xdcg+LqLugMZH42ib0E+jdXJVIdqlYXce7Hu7Arxrji9n9PPYQ8nj1P+eHJnWquNGCt+E18juTQAn06GXiQjqoPHrgEThNOK+G3eYj5RKgg4d58dN1ROLajDVfjmn1Dc14X181n0COxPbP1XJjeBXTQZvLfOx+EqVKgZeUvIO0hi43dOA3ylU0IBOScMX7th6GgeB71NAjAFYHU/T6UdrE1HD4PlawKJPMOdgmu1qTcaZac1o1fB37MZqPKiaSq/IHCG9Jml8VmwU/Gi7ZoedR/MhmtQIrbU7CLkE9dOWV9uNraNEMDcZyoXW2mZzCNugbA0F/NRPnN1w9qTAwmCjHclUDBaZnUdQO39A9YQTpVOizXRIBr72FLYOEWg69SaiutCgdoGBaIaTGgaCsGzqNg9+qo5tSyebsVdtpuiamsyIQKc8bZ/rUinHrZ9Gt23Q01aecKT66XUn99QSvftCanEH2z5Sm339D4Vc6xk17GhH0gno+OwbYwBbTCLqEsAdEeNO5CUSbttO4Mj8LoUF9PIdrQ8oM6hiBBSIEmJoCJSaYLya8aPAWIp5oD4A/MbD+B9AYAD9wFfqMoYGULmVBjDwBDF6xQ6kaNWd4ICHEwW/PfBuwV9JUEA4YILBdiF+k4O2G/iwwHFm/BCHqwstjrHD54k0O4TelbjqkhppkR4TLgXgiRsqkBN+Sp/kyZMMwmaCs6U8SgVFBHBq5X50hec/OoZVGPqvAHtp3GGAF/2ivItVlthDfyvXUtNxBuQz8yzNQS/6RaVhlCtm8WG/QFCIQYsTYk0tvoB54gswAN2PbsWsOoUmvvRrXMMRv7SWifWov8Pbf2bhFJaNLFYKJOKHaGvuUrAlPyS2guQKCqP//DOUAYMGkk/13PWKEqFmuvvtTNbOyuWQBC+H6qjn3z2YvOre60ew6+WrWihb8GWh2987D3qW0GxQXaRFuQaNIrKyGX5MuP6ylGkCEu46vtGVhfNpPbWWjq23oWgn5SuZ31LQJtZe5J8rQQfi2BN8KBds1zHZjR/IeiJHuw0bMWmq9vbAMRzUS3uHRQOPGGewjlE09gzOjv5ahLlVeEICQiF0qLTTonbshR87+eGndMDGN+/R8tFl+rd4fb44X9z5up+2B3D4oNs/wsxMPoT032sAew/wLfSJcp+0cV9ZGlEGEApTVeISPeTdkyRvnTKYNdAUMOJ6aweD5upArYMPga2zp2lnv9HGxDOVRaeyfIyc/uhPMjm6WF3zw7l/XlS7yxC+KTshKQp/NuYVhiwx/UggQP/s0MmBRJd7NVy3sXfxuVaoyrMoVYKytrwHt4IUsO6IQCzaGK/RcZr/ItU4HC7L7wu2Xm32u9dLsyY7A+t/g2Kb3zxUSLCBWRVtrFMJ8Zn8oBDkOconfa6F+W1P9/+JnHVyy/R5n7AFGxzmEXxwiB24XTu9/HJVVy2Q4zuKZS8jKljnBD05tWQZKQwn0p9goo03utctrs2q/d4nE/KO+7ssyGjKabA03vup0WvDMq3ZnPoBi2k/MfXB9YMLe18b/sb+mwvkxtlksL+qvcnZzZ8aIUJ7+vIk9eikvT5kI3IDu743rcrC5WRpcmv3WXuxwIrQVeOCM8Y/W6hGQbev/M2qOn0DJMkWMtDrLsbUYT0p4YzSd/j2bI0mpPb4XAS7CU+kFsB5ajJ2VzCa7gpyEoeJSYMocLhB3190OJ+qnkRrkmUTVvWRtH4Wm4vcFrn4n+XNiEMAiDJM6oxk6ime/2p/m8kfW7LOub/ky/p3u6nNWjKnSKvHZ0VXFFPjYkXCwSkk1rONhHVi/RHXIxu/piFZKLTzJJynvENdg1ukIBR4mhpuWhBoYqWJ/PVFs2DAuP+iYLMnQ0w/7amP6mok/GyXwa0IE+Z1V89E8rFv5HGK328jCgwhV2iuOer7H8o4QnSxXPd682aG3sxBR/Aq6YzMUREF88WPczfqcnR/qw1uW9ZUM4vm30Xv55s7NwK2OI10mSINaKjrD4Vi/RJrGo61vpfgoBTw89DXYHIlXkqaAIBGDogEUv750EpXae4ta95INgOnYY8nU1M06cjxSW+6wdtX18CsWiF9qmD7KRU8aeFs3jdfzbf6V7w91x1mBaEACaWicMnpiv7vLAGlNY2XlfWaCZuFpORPC4MGz/4YpiGeRhXEfU/VQizyXvzMGg5n03+K2/dDDMMIeqOvDT/1+4/Dhndchfs7JKybMGrCng7QcGfvWhpDIgf6gGR18eV5t23MHGVMD9+qcZrXPj+xEJlR+yeWusstQn7NXZNOk84ytNv5a82oQ5DygTWN4TS8pIbrQY3Ax8zUOV9iM0Gqxov8PXMnBqn3ta9cmIyFSg1Dn52As/rXKroQNJqXnTHi2eMpPpDfdu7Ny4dX1H17WBo6iq7QTmEmDBHApA65DIDN3SyiZmzCZyqMpIqRu8iB3lsdYrtnXRk+fUZZcH9naklRRmvb+7zLK0W8xnRyK1I1pcVmmTX05fvlp/QRLZ2moX6CqAn1WOdWAQMY+piTjIRDPa7AWC6peD/mw8EvzuOIxFIfPdpLY+MJjan4Ldeq/dT39XhBEG1KYZJzhQxYqoP5pJCgsmP/USQ393h1e98W6enjI9kMtUbB47GLLWq3xupQAIUjcZI+MR1K6Dr36FAPqliReZn1Nyph+xYFG90udLp2j1bsT6qJbsTQE7LuZ2dxRop6lPmbM13dF1lnBCyeB0kzJllEhs/pJ9lg1xLzDTuVV5kTaJ4H/3ub6bvOBKMkAfCpBTBfCzzPcTH7R+PcxGGHE0LZDQWs2Hat+JL98RkvxraoLNLWXq/oJMQMlHiZFJrbzbX/1AfbguNy9r+tnvohTKZP2aHw1TchUksWuB+Cu27GDcu3ZVL7uyy+aLRkOi9zcD+Qk7KlOOHafnYhufCiQsIg9kmSNmAvRoxaJS3md3uFgGkhr/fLI8FWXKXDwrwjEoRiLwfXPAtNLnsBnOMGmg3Y/YLomEJju3VW1fv+BTDVoXEc5bWRpy0M9pO2CPcdkq23WYryG+TyY8GXN8fXEfJ9mQTIAYAuY8EJjDK49sCDsEAe+p3imMvvx9+hOvGZp1eSyakLHxIm7bR1q6momGzP/NA0t4B1Kn234R6MfLhuR5L7FR3gcuB6ILkS124cpulA89z4p1yWVNb5Bt45knVtrspvRHaiH8RZ2qEQsak9gekbow29qUtZzgmfA9lal4Fax4A34ibG0mCSl8yK1Ac7REPMlgpq/Vb2VB8+i8wGoAALJnodRcFYG8n+s/zdZGUX+xZFYUrtLAN2IM39MzRVrAxHh0xpa/Q3aGcQ9YxJagxXmZh6LLCuXTId8ufBHC1uiQGZtHaWZR7npJGSYjF1se225V+82cyqIbDHlgPuzcRzfK1YN+y2o72lR2CNCZOS38+GtBY5RjgzprK5VVE+52lKEsz3ZRtwKq7Vmq7YtbNAbBVpsHgMG68pdqQafKptQCI+Hr+RJ7kgpZU9YFnNaNgMTzp9uqQrqSoy/k1FI+nVFUUqS/TTvXrq3nNV0vidaUzfJUbWZT+dDowKm3LpqQW9rsqmABLkVpbYUpGgVzZfxhHzZHNdJL+FHEPv84Rlw1xACedPFaooZOTZC29acWr7uzZhOJ1a4XmNrisfLF45YEf13tOOh/rgS383xTFR6+mCFe8i/qLnalf9Xz6mLY2TFT+j1g7PqYWXqn8Ysv6FX/dEKfWsH/SU7RrddHfofiKGu/ZTY+256EeJt1X2yk/lOy25F0yynEQIeThgKj2wbTWHuoD4/0jahEchULhE5g/Go/Sie6ddEpWLILq7Pzg9XYAjbr7ivXPM40vJsgNTx98wUqKdGcrxvGRGHwvse4HhA6CI3ZE4Kfk5pdz79khw69Vdd6ILMPEFATwV3u1RZtKquwTG7Ww/ecVecF4yebenzxHatR+splqPc9qFHx1jISwff+v2wupp19t3n+lq+9ZM35yJAQ9cq2zmFHClshAG+FsX8blHhuvR2H9GMFeEsAWxKY+esuw2iBsa6QRMMS++rCIr1XhzCNSmjlJvCeKuelTm5UVPz52rmhSQ+pMwEIWtYFLcXYk4ybXi0i3pQe6tMy0UrmDq2T2RZgHGGEbxQz5DFObL4TiCVqELpfsPgFJJb8VO3YBkxMIlAQsSEU0c3aDiK2J0J/qcUisKPoqB8n4SAPaGE/4S89Tl+bPYliqi9DLrqG7phcEjwTHq8tRZ30SupitlcU1ADFhu5SZSNeHzstsNVm4oLCYGc1otONMZrK+0flG6mSWP0W+UtIx9oSmwtF6+HsWjqIIsR7oWh78nbpsuSX21ShKt6tF3DnknXbaDhEae7SKF26GlbHJvSpqQ+38yI2hBfppYpFyokkzGu2mDf33Txr59fxn0wH48IjZu0Ae42zaUQQXITiMnRixbs6dfL5117IMBlq9x95Cdzx+OmDeiLJhGlc9cXrbALhk5mc6peY1NkBFYkpXkhUut3DIMzsqya+RUfOZxfKDZuj8clkjo27Z6/pnP7w3bZgKcct/YNUn76290cFa66NNvsI7u3J53cozSY1+ZjzSC3WQzb/78j1WHU2lQy/7uICV+PKyZ5yU1xi90rgE5r1H3vNYdoYTRa+cPao4lrJiUVtqegkq2qkEaevTOjiOsYvPlpWkeo395Z7qa119g8S3ixsTgr0rTecFjhQjn16XAq2d52qym2IuOEbOB5+EkbLRa/YWYsN72S8flTvHld63HP9woCOUftd5eV33ogC+4Eg/WfLygUQKO+ezv3hMJUjnb05F8tnPo+l4Dald05+P9c/mD1bDvYCubuKCHorUTLtcjwx30/EAH8h8EBdIVKb78kIYHTy8ILdX3/gcedyOMa8L3dqW1z55sF8GMANkkLGG/LGHukMd1Bt5VbXdu19uBN+IcDfz8hieZirbYKu0MZJ47KY2JqJkqiGbMeycqxjn6sO01C8HBmhQL6oijwalUv/G9ppe+o8Kp9RGy48Djxj4HljGS6ye7mtbrGZYVmmN4U6oPIyVFcOiVuKp8EXOr75LzOIMERdDLPCOWmI8RERHvAgC75dz9hCM/N4IY/qmB/Knnkl2XXbZEQYCsT0VvUR/nEME6M8GTtJhwNTznE0B6eF6MwBWrzzNvDU+tfw5n9lSo7xiQoFqMYi3SaxSdEVAtSkvSIyc0dDM53L99AfSHHzBVZDyv/giFORph4aUlDkQwzfIPVoGYRt331pMyu7OntHpWbBpa+O2XzTUNYqIMWFD11fvdoskl/0vKICI1tkj58GAdKw1XOYn85dljqImaEn5GfVkzas2VBrAS+ExABoTIsQJdrX2Dag6I841kt5ygaJZkN/ja47XjUwknzobSgVwv6GUtm24HorYinPQNg0ELPUy//IiY1//XtN9cm62ZYdSdm7TiGbFrykbavf+/Vjsbf7UftzHayPl8yGMYT63kjNWhht0CRpLmb+be2ieOGGzPSPKS+jz+mKXb1CNl7ATUskQU5nOLjPDzgdinWOvHOg/x09sGNg/A7m2y9uck/aSNxHN0fYEmhETXq8F7r8NAVKk2ZbzNJs3LDGnGvAenOdWmJp+TtCKurThMAEG+ohNy1aLBaDxKoBuYDyQz4a0IeOFNkM040kkdTBY1/LxkZU7QIsCYt8W6R3j/oY2oUxFMzChMvGfQJ3XMmQHA3Z6SfODRlXXZnHRikVDFmn8uv6bqScACzWm7AYPpiBmPVTCIaLcFRRZS6Ng1SZ1sb7nrH3XPXlxyCaY2AQX4O/6L9ON1l/UH6xhv9B2FC44gaPT97/nti63gaWxdvR8H71aTF4WUPii430MJc2EB4E5NR8MaF2V6/Oo6qazIKdhFTz2noPJY5TZJXOqpBEeCPTsqb1TjNCe91MvoPSYlX1IJ1a6lipPN+ieePgPIrT9pD9NcXCTvDUZnyEIIs60bWJJ+yzH+jCJzkxoP1/YFyqgct7NavzeUQm+ZSqmM0n4KrZ9DgBVBU7TTRFH0jUJjRyWmNEM/SWWIjYffbMs6ki8OtVLU3ZrAMQ0+KxmNVQS3AH001sfmCbyFjColkpzH+OUzb0l6hEsQwjOMCi/elmTTuKgPgwO2XaJgbPmuDApFwSfbRJDPRZQ+pvtEW5zdC5lKsMPIKT2nxvBwkEdE1/0nue1ENC+JDy3M2L1f9mNFhbS2mp4Jhd/rjp5XkF4ZKkOIOQ+0hrTuzKTCHhoU6VcSuL3aAzbV2EyT5qYGr9pBCIu+GA4HzBqezEJyP1G1lxuoF2gDI9sWz1pfPDMejUtjkyhloezQbHEUQZ8gxcPM7hb1O/jhanZBqGZFitW6Os8xmfy6Wel1qqRiBYMHBpPUJq3EiEaWLTHeiswaNa5PuEgPT7Q9rY/oC/tQfj1eCpoZ+/djaZ3SWtXpoYSsHPGortFbmL1AtyaToJVvOyO4h17d6kdKA3nSNXLBx7nvHQ1UbEc03bgWdF79x/1aI3oUDfp4gAkcLjluOEyfjQHTh9EGFFHvTbd3qv2xgBNxtkA6leL6McotcXt14O5l++ToLZs3aKrhw1hURuxApOpEbKUDFyc71I+08DqdaJtlFTYQRWLD1DghSzFStez/L6UxmhmeSDQhPAUkQRvwEYDGeQZAwD9nN5Wvwh0EnMLpE9Q4923C8AkrBB/LXsiEi/G6o1Zzry/Iomaj1l5xGRAJJXxSkeGAvsuK320SYykYhQkrufA6ocRGmr/GLEr1rritxAalxUgIb0zyngJ9WRKcGvETUF0WrtPZlSk9sJ0EfJe4ATHQpwONvj/YIqs56ExTQtZi+cdFFWq9lN654Mp+fddnw+0wI0Nb5hCxeXqqisB1emiCdUhbdPyPX71/9HmxcZJIppKFrYgl9GUiAAsMlx2cdEgWCP9TuZqXWKjBcc1Mgm/j6ymv1KbIlEqMXGbBvGZlHxS5k17IbYMQqtAck9/s9z8ArtgnmFxdQDyWHiT0dYpnE28m/0nXypdig2eG52sWSd1E6+055G14GBPCHbR8C/ahJYjhgeESDgHsFY9c4jgk9qARyM/PUayXtsGk8uaA+hwjsgDH5REFCW99LFj0RoRHNQjDnVS+iEI97rbMxIA+v9wd7D7rJvd9YLjt6IjhqaCd6RaGa4OyPjq2KvbsReS2ET1xdMMWLGaOGQVK5ojQyq+IEqWVHRJFgMdOKziw8OxCvS/K+tmx+XkSVJ21+6F4u9bSxjRaDcbXZEBmmAxJBHo87mWNV3FC5U4XoyFm9xyI7MyN8Dzpd+5KkaVvkBHHJRcDNFvLpz6genAS6nLRt68PqhcAQtgPvvT782cSsdG3/M73hqBR8JhBTN3MojI41zyyOBt4dvR2MZp7Rejv90ddn9aqYqcsQkQSMoZMeuwAP8CEjT3tfOmE3BaS0gAEAIh7fUoTpT0bcRIHgIOahyQzXDthE+sn5qGDTCtYgZUL9AZonFxLnbghkd2nUaJsIquXK2A3TtUJSBPatdhyKjANv8UQCI7MQMeMuvJlKtSnD0VDqGVWhiEWMsCkiHzD4iJu4LlFnA5JtVofhDXlUwFdnxo3XDQsRsDolGUF2DYR1kcgAtbPDDKAjtOEAgjQkMHKDSntf6R5wJWFG2OzRDJRyNW/phCEBKaEgCeXsbDuvCRtj9kLsfTkWc2UcdqTY3lY81smlz+5gbYSq69OE5H+QZ9+NVr8gAlzNryS027xN9+n8lyouSTRNFl3UgkXH4O+IIIYnELBvaDvYUw5RUp1h2ciFYenqguNExrnZxbq0BKk8CrhEZXExqv305pSX1Sx+BoezIvOohwuj3R0nkGgwAHDoLdHSjgHaB1eJaL19DkE4Fy9UOJ+j/rS6JD4PqSbkjKDTz416cakkXa70YdL1dTddcukc5pCPBzGDg+z4iT1WVWnnqNjg40ZvOp9IFRviIABgQjVMfqGe4AvPMQHfzyYBekHi6oLM7nxsoF5rkzl4qLXXj19ug69kVLMfxdTJPnBtZoLcKcbZ4cYjkV9oIbWGHJm5G7Clhmg6MMfxAr4xTNRkUfonMOng2arMessKeCooQ7Qg1WTO4V5hunCyMY0xzuei+v5SSASBjk22RbZgD+d97zvgt1x1LfdTJQuV785E9MJkG+p52wN1reC63m3WrRAsavh0e+tGTb0//3R2VZiKJMvxrCOuPOao6BXIasrDt+5hpazsMPb/KGJ9liBrqGFRZuQjcbROOXFHo4ib/uBz0IF1GYuGc3SrPZ65qnyBPVQhuW0imjs1B8tt8hzzRF1I4+u3jCMA4HhzWGPuR8i62z0N92E5LblBPPNxrFxTEYVLpvdJlwBwjAfAjxD3bQZ4sTak1mtsHpXkKE2bFCHAzh5fkKjtPveXuTvCBoTyRV5qlm+UmVkFQFrczqKyFUzG8oHlaycKMs3MWP0WSKTHrIx26HnpcucAQfqAKwnkxBC7Q+c4lxzPYt5Ogfh6I6Chw2k3Z3gNNxZOIMc9qQHGzVJwmEHiZ/2F953zYifbgwU3oYzr7MhrujN05umN0lXTE8LYg+2eOTq2aQZSzWqSYtri1KLhKIOJSn1F7TAhY2s8iytQZyDRSylUzhbTJ3KNykrT26eriK9yWSlifshi77/YKSXsLx7MOUwGgxpY2k0J3G3rngHVY9dErYWAzuXLdogyG0gWoh4LStSl54/pSxX99Warfe4yqdpBqoyIoCKoQRiLgbSeYyHImLIfL6GKyNmVXl7O23MNbWNqdBsT4UK1RerJargxcvZbPGGNpxyGpHBPFuk9UZLsr6r3d5D7I4YUb8R1e3jUAG5I43tm5vNJpe6dHvawGhB9dNGW74ojUwpx1UO2sAt4DHgRpO52+nwwQ7HuId43V+s4WwRy6+g19rfhpm+XdvapzfT75wJJwlgBVzJ1KTrCrrX2tmXySaAOdGiXBLvRmeUluP0tM5PRScTgbOCXGlRnAFOUbXJTqQ8ZApna9C0ZL2Wg7ij42vaHRtJRa+VaBSBoSdtmNcf7bXkMfcTTV/73ufFab+qj4gRquAwUOl6aEOGtl5Ud4lcgR9FhCuqRDob6RXohVKnLwhL4ILEAqHbNpiJW3ZRtYjn4k5R/go/jw5xM1+4zXyXBr0GTbrIMHnsdzVxkjmS5xRrl69SBA+ySC4OyG6QzzI3IL9H8wDa288UHkbd33A9Q3z1AnZBqb9o1dtGV8QlN3jsNnwKkEBpCamgPAEAUixaaQnZD0A1i5JSw87dlDpKVxtEQ1KnEPWfcWjNthTe8suaO+XRhoQv3i9pSUvp9TS7XWDxhFQb6hH1/uxdtp3tU+nyh1Kals6yM7ldH9bWWhmb2k10LnKv3yJ/fE1+8kJd4dK8JVOzvdalwYLPgOwhiG06V6XkjEZKVIjYme8zk6fPgwj5mzLTv4KrvzKyXb8+URi9MxmRbmO+X/vCcSw72aZrnsj5vjtMSk0fiqZBFrcMNJnmEy/8AxVuHpDnIEFDvB61vgMSKiOwgZu9rJ2iMfgxK3mrDapl8dKuZQfPgje7F/B6unS/dI9I4lsimIyakU3dVPlLfb5pXV1UE0WqmO01TigRBKZwYXyrTbqZ/gGAMcJiQwxxcp11+KiD1PhUAWZJYBu7X5faMsfgqRobMBCE0gJwdkDECiWWcEvZUbKy1h8p0CbR4icX2PcQdBXzYOyXLcQy25bIP0vWau6sCEvw/RTt5M1GmwHgPfPF35Uf5yB2tFkFs5BjlJY5Ls7zbOLD+bThC/lDcnat4wd57cwr4Ntmaf8Z6Q+8th/gfp3kDZ764Ns+t6q+S0GDE6I3ARf5m8g+iRQGHOBwgh1gFj5aJZet0eR8WPSNgwzq5BJoLjiN7AsWgxMycbK2VIoLKRhGy5GbammOYjR1KtsI1Yq3IJJmpMfBWgp3NIAHs2WcxWsTUkVCHwlvyAF1XSuac6RZzM1veYjHBdRk4lnOIYDAI1hzGDCltDHUmUVVIl15lNUTfVlClIywjaGMc5uyE/zVXTuRHAuOr673bp9KkOJiV0xHM0mb4Afu4UqrfLU1ampHJEdad91Z0R07W8mWuZcR5KHpV0LdS61uJeuL8A+FJzMim+Z6m2IZ2iJSl64NSvjC3+0RCOk8XHBU/UM06JWbUW3Rn5ZA8mzRESquD/LYnYkdsUBLeBmZVXZWOQPd1oMtFqsiq4qrjlfjuJzmQjlzKlrRHBybLzVA4eiFjhMuJ3d0u5HCUE4WCaLeBNexIwtdOc5/xbQIG/8sayNsxiQHTAReFMdcXXGOBzKLqwNQNoPOD4ewGv2omE+qSbpQuIAxpc+/IiE6fAl6HVdY18P7TvgpRbYbwb6ZbOrbfVrdtLrp+rQ01fFYAI0a6Qj1Sl3YrtxQ6JgBPLV2vONykrs7o3Rr2W7RGWETUqOX+XFXHYQ31l+1U5FjfccXh+XcwdkjUd+JHZM+m4FHktewTOiwiWenxz/uIUT6MLwCy/C8t1hY6ROhjaWyWFdOb5pK6pZv/lSAyV9V00BoC4+/xdzYRsnTedZElgtlWVLcfmidinOoPjvmwIyiy1svZIZRZAjm3c3bl4JyQna/dpYNXl/SBxX7J3rBGLUrrEaoe3mky136bH7Nbz15KiUKs+46Ez1Oh6nVRhPiLz275uISbHIbhn4pPi9dZcIomlItYeRhXvrlTQEge+FmZxxZPZRj5hnMii6Iqbc+uyfRHeW+a1+hoswCq3+5BybHmAs1Vb9UcMZD91IaQg27y4Nr99E9haPL8wiyoFGwLByl5yo1TFu/Qh/Oe72YaYD8ePX2pLOyyLexa5UzhrfFNzf3lQp2M/+ljZ/st4+SO0SXOz5mPtLpKcm6jrYjsiNhz4Y96kDXUID72hYCfEjZYJlKbyyKJqsBE5vkcKCt9Xl6e+62+ZKBYK0rAqxvgw5dpWU+BsO1sHzt89At9xOnrgd6smyY0GtoAFgmMzlBFXwttWTM+ZV99OBM3LZByvyQBikPRea2lojsCt0NYATTJ0ASGUH8wyFd3lNBcKHCEKr2V7KGB0yyt4wbbgG+QcGfwFCsdHZ+GiT9U395MuQz92j6zleusZEH1o1cPr2QQzIF6pNnzO5lGc8pjiRtM7hDAdxd7XRf8C2ZtlI6wnAc0PH/fl+uyHZnmgaUqSPRX1NDSD6Ce3V1/K8ljkqPfujledGshrIjX4lO4ImpfixJ6/1uqjVqzVHOHxrwmmzUG87csVE3RjBbRiL6xNvrFKeDckKrWoYqbCrFq/473nZ3rBpepIet9iuQ5EatbOYqWg0Zl6G/yrSS3dfSw8m+j3WtE++EEbeLOBvcS/haz7FWrGYIJvG2EDGfNwsbeFo5Zt/tp7vq+zwzmyOiv0sgB18qSkwBMjNtzc+n4GDbMYaaCd7jEpRBBUY9MfihAU0WgX1kRIFHQUrFkGg1kC95ulPqqw00U3MKYKEiwW4R4h+q7EUgKGWPVfOWQu79nGfwv1Q7TlKWLC0blUaWtYAjFZ6zhpolvnx4EPrENSL9x380CI6N+GPTHP6Ap8DKPjvLL3FnEMgPOHPCTObw8YrLqNZdwCI9S3Uy5SyAkIkgROc2cqftfkblp7MfKcybW7KApGo7x34YT6aDPA2qMS3mUtsNuJPDvKx01t8OHLcD++3A+c1dB45ieJnMBAcjvEpjl/b3xT+Lwl0aFNiJp+tTwdMxnKRHxmI/comJbFMpptw/Y1c0SHpV9giC7SSZ0rBS0BjJb/B3c8lx0VQwMZDBhucn09NR0GFnxIbAoaq/xmLlqU2lxEMfbWUVJqYxfQ039HQASVshRP0jUe9ZaZgJpOC/FDtC0FwDncH3sr/BxDAoohfYyjiRXtRYbcCaOqXqydD4OzsUsHdWwTniduU/6hT9k9mclkrPZfnDY++3/X56XMPI6ngtoXMidLHv3cZj6gN54K9wUgfSICk5rpH/Vu8YfbKzg8UwYjnehLsTHnow0SJPg8ms9TnaUQtoKX5A+wOzKyDv4zxyMI60AqGZdE2B/0HxSAPEs0kxWr02vhKJWKM0z/D7Hc1ALUupdwTzsvBj0H0p1vP6Y2SPPAHix8gieRoaLKWLGvY9mmKRtyEdsBlCy/q0E2NkrTfBQs/qw/DO2uTKi1PQQhW2P4Y9ILz+cnBZ+feNejTO3ZBuHNB5/VBa1p7wwvZbRcX/FnnoYhcdpEXZwB0JESk7Xsn5nvVFoQF4CdByQsMmmsG4OuzwKtetJNA6GjTTcwt5m9Jai9qcxhXNO3dxTuOwSlGGuxlycCMYUjIfuAMnOxbKGfEsT8BhhAlJOVgJ6KXTQC7LZR4w5RdIHfbSpotz4jdPmDTiw+8bUivx3K82XXG2BBcU/qxt6YVXv6o5mTqgs514Cesw/ilGt0baY3XnulKpPtyoxIxp+L2VMvHFf0RpFqeQ9OEE3fuvx0TmGtOni6vrG9SOLw0sPr6+fXq+gWtw0cK4cl8z3RJATUj8tM5DR1A220SnH1GXwHP5YroWrCWBzG9BZxsXmxSOPjiDAL87Z5cMmUd610ODK05KA8uX9dounYER9EPMA+KHgPRxnmT275OouaQ9iVe0irmjJjcxbJGYAziSqARB7GHBshBGG8smWxEhwum7LpdfPMDlLDdo4TF2sojX1Pwa22xdYWIqShCdxjMlIFixF13+VqXz1vhfVDfBRNkNyiQNhi4+EmidCtP2K1mWaa+ZH58MGvP2dB2NqrYmk+JGqt2O9uP6u6Ir8SthDsWQl45c9rFYrC+Qhy0nh3LIUF2FmbNy+ljwKosekz/hZadvrXoFvUWVHNQ2y1Oc6mq1GEJY7zlVqmDcvhCuphKZktvV8nL0sX+uYat+7vXB8uPb2I5ttqXvg/mwxJshyvQ0myLhMTEyCNRZlKDHEDmQCUfxIEgS4UB9u0cWCvFpb1kcSTnziGilpWCgklViNmHy/QnRJ34cU6ojwV8+bPv0FzFCfK5iT4re/Y/is1Em5TdYjsW9ohW7Gv3SGINhN0wzdG6OihIqtQ3B1WLL/IKcs9JbmN+6ZQgO5Ynn2RHHP3RLnjdtqKOyLNhjPL0FvHSSHPICGVsFqqzF7oujf4vkumhxAVIPVPg0+JSmOxcp2o5JnyMV8DJX5KVZFDadie2C7nwpUrldfLeECQ/Z8XL8Qbr6ImI1OjOcjAJh4Tf9PKI2a5L/HYiZ5N171acDQ3I6rDYiuhwt/JClY6Obap42ijbazysd/Ir7+mhx6cREVxeGtw28+S206mEPicMLBbRxmgQN7Ldd7TC7W41WKH4Ge/1XOYfSY2HE0/rdRBMfBzwX3luYwzF+cI2Oxiddo6CCGLNWXB8Kcc0wd+nWix8eYvdxRmudaJeEwaE8mUXkNfHXgQtwQKqEXagO2+VPStDLupej1Tacz0MNhu4mkSCOiETfT7/9kE95OZZ4O9HgRVE62ycnY6VUQLIuOZvmR/OljS2qFxWet/shJmDPUgr+jxGiI2uS+tN6oRtjdJUZyYNIBROPMRL1gp9tyOFSCU4JyTOxILokWAZ4HA79qft9avvvfyXtssXq76x8Fdh+wgM896eRxpxf9msJGyEnB74WrYZBf+57Gx0ST5ZKY4PEU8kfcy/b26somyDU50uVnuJ+ad/AKmWOp7B2Cqz/h5ZEDqgOia38kqy+f9iVSEaXJYMV/wY=","base64")).toString()),xN)});var fZ=w((PN,gZ)=>{(function(r,e){typeof PN=="object"?gZ.exports=e():typeof define=="function"&&define.amd?define(e):r.treeify=e()})(PN,function(){function r(n,s){var o=s?"\u2514":"\u251C";return n?o+="\u2500 ":o+="\u2500\u2500\u2510",o}function e(n,s){var o=[];for(var a in n)!n.hasOwnProperty(a)||s&&typeof n[a]=="function"||o.push(a);return o}function t(n,s,o,a,l,c,u){var g="",f=0,h,p,C=a.slice(0);if(C.push([s,o])&&a.length>0&&(a.forEach(function(B,v){v>0&&(g+=(B[1]?" ":"\u2502")+"  "),!p&&B[0]===s&&(p=!0)}),g+=r(n,o)+n,l&&(typeof s!="object"||s instanceof Date)&&(g+=": "+s),p&&(g+=" (circular ref.)"),u(g)),!p&&typeof s=="object"){var y=e(s,c);y.forEach(function(B){h=++f===y.length,t(B,s[B],h,C,l,c,u)})}}var i={};return i.asLines=function(n,s,o,a){var l=typeof o!="function"?o:!1;t(".",n,!1,[],s,l,a||o)},i.asTree=function(n,s,o){var a="";return t(".",n,!1,[],s,o,function(l){a+=l+`
-`}),a},i})});var K0=w((Uat,BZ)=>{var fTe=vs(),hTe=gC(),pTe=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,dTe=/^\w*$/;function CTe(r,e){if(fTe(r))return!1;var t=typeof r;return t=="number"||t=="symbol"||t=="boolean"||r==null||hTe(r)?!0:dTe.test(r)||!pTe.test(r)||e!=null&&r in Object(e)}BZ.exports=CTe});var U0=w((Hat,bZ)=>{var mTe=Fc(),ETe=vn(),ITe="[object AsyncFunction]",yTe="[object Function]",wTe="[object GeneratorFunction]",BTe="[object Proxy]";function bTe(r){if(!ETe(r))return!1;var e=mTe(r);return e==yTe||e==wTe||e==ITe||e==BTe}bZ.exports=bTe});var SZ=w((Gat,QZ)=>{var QTe=ys(),STe=QTe["__core-js_shared__"];QZ.exports=STe});var PZ=w((Yat,xZ)=>{var ON=SZ(),vZ=function(){var r=/[^.]+$/.exec(ON&&ON.keys&&ON.keys.IE_PROTO||"");return r?"Symbol(src)_1."+r:""}();function vTe(r){return!!vZ&&vZ in r}xZ.exports=vTe});var MN=w((jat,DZ)=>{var xTe=Function.prototype,PTe=xTe.toString;function DTe(r){if(r!=null){try{return PTe.call(r)}catch{}try{return r+""}catch{}}return""}DZ.exports=DTe});var RZ=w((qat,kZ)=>{var kTe=U0(),RTe=PZ(),FTe=vn(),NTe=MN(),TTe=/[\\^$.*+?()[\]{}|]/g,LTe=/^\[object .+?Constructor\]$/,OTe=Function.prototype,MTe=Object.prototype,KTe=OTe.toString,UTe=MTe.hasOwnProperty,HTe=RegExp("^"+KTe.call(UTe).replace(TTe,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$");function GTe(r){if(!FTe(r)||RTe(r))return!1;var e=kTe(r)?HTe:LTe;return e.test(NTe(r))}kZ.exports=GTe});var NZ=w((Jat,FZ)=>{function YTe(r,e){return r==null?void 0:r[e]}FZ.exports=YTe});var pl=w((Wat,TZ)=>{var jTe=RZ(),qTe=NZ();function JTe(r,e){var t=qTe(r,e);return jTe(t)?t:void 0}TZ.exports=JTe});var _C=w((zat,LZ)=>{var WTe=pl(),zTe=WTe(Object,"create");LZ.exports=zTe});var KZ=w((Vat,MZ)=>{var OZ=_C();function VTe(){this.__data__=OZ?OZ(null):{},this.size=0}MZ.exports=VTe});var HZ=w((Xat,UZ)=>{function XTe(r){var e=this.has(r)&&delete this.__data__[r];return this.size-=e?1:0,e}UZ.exports=XTe});var YZ=w((Zat,GZ)=>{var ZTe=_C(),_Te="__lodash_hash_undefined__",$Te=Object.prototype,eLe=$Te.hasOwnProperty;function tLe(r){var e=this.__data__;if(ZTe){var t=e[r];return t===_Te?void 0:t}return eLe.call(e,r)?e[r]:void 0}GZ.exports=tLe});var qZ=w((_at,jZ)=>{var rLe=_C(),iLe=Object.prototype,nLe=iLe.hasOwnProperty;function sLe(r){var e=this.__data__;return rLe?e[r]!==void 0:nLe.call(e,r)}jZ.exports=sLe});var WZ=w(($at,JZ)=>{var oLe=_C(),aLe="__lodash_hash_undefined__";function ALe(r,e){var t=this.__data__;return this.size+=this.has(r)?0:1,t[r]=oLe&&e===void 0?aLe:e,this}JZ.exports=ALe});var VZ=w((eAt,zZ)=>{var lLe=KZ(),cLe=HZ(),uLe=YZ(),gLe=qZ(),fLe=WZ();function Eh(r){var e=-1,t=r==null?0:r.length;for(this.clear();++e<t;){var i=r[e];this.set(i[0],i[1])}}Eh.prototype.clear=lLe;Eh.prototype.delete=cLe;Eh.prototype.get=uLe;Eh.prototype.has=gLe;Eh.prototype.set=fLe;zZ.exports=Eh});var ZZ=w((tAt,XZ)=>{function hLe(){this.__data__=[],this.size=0}XZ.exports=hLe});var Ih=w((rAt,_Z)=>{function pLe(r,e){return r===e||r!==r&&e!==e}_Z.exports=pLe});var $C=w((iAt,$Z)=>{var dLe=Ih();function CLe(r,e){for(var t=r.length;t--;)if(dLe(r[t][0],e))return t;return-1}$Z.exports=CLe});var t_=w((nAt,e_)=>{var mLe=$C(),ELe=Array.prototype,ILe=ELe.splice;function yLe(r){var e=this.__data__,t=mLe(e,r);if(t<0)return!1;var i=e.length-1;return t==i?e.pop():ILe.call(e,t,1),--this.size,!0}e_.exports=yLe});var i_=w((sAt,r_)=>{var wLe=$C();function BLe(r){var e=this.__data__,t=wLe(e,r);return t<0?void 0:e[t][1]}r_.exports=BLe});var s_=w((oAt,n_)=>{var bLe=$C();function QLe(r){return bLe(this.__data__,r)>-1}n_.exports=QLe});var a_=w((aAt,o_)=>{var SLe=$C();function vLe(r,e){var t=this.__data__,i=SLe(t,r);return i<0?(++this.size,t.push([r,e])):t[i][1]=e,this}o_.exports=vLe});var em=w((AAt,A_)=>{var xLe=ZZ(),PLe=t_(),DLe=i_(),kLe=s_(),RLe=a_();function yh(r){var e=-1,t=r==null?0:r.length;for(this.clear();++e<t;){var i=r[e];this.set(i[0],i[1])}}yh.prototype.clear=xLe;yh.prototype.delete=PLe;yh.prototype.get=DLe;yh.prototype.has=kLe;yh.prototype.set=RLe;A_.exports=yh});var H0=w((lAt,l_)=>{var FLe=pl(),NLe=ys(),TLe=FLe(NLe,"Map");l_.exports=TLe});var g_=w((cAt,u_)=>{var c_=VZ(),LLe=em(),OLe=H0();function MLe(){this.size=0,this.__data__={hash:new c_,map:new(OLe||LLe),string:new c_}}u_.exports=MLe});var h_=w((uAt,f_)=>{function KLe(r){var e=typeof r;return e=="string"||e=="number"||e=="symbol"||e=="boolean"?r!=="__proto__":r===null}f_.exports=KLe});var tm=w((gAt,p_)=>{var ULe=h_();function HLe(r,e){var t=r.__data__;return ULe(e)?t[typeof e=="string"?"string":"hash"]:t.map}p_.exports=HLe});var C_=w((fAt,d_)=>{var GLe=tm();function YLe(r){var e=GLe(this,r).delete(r);return this.size-=e?1:0,e}d_.exports=YLe});var E_=w((hAt,m_)=>{var jLe=tm();function qLe(r){return jLe(this,r).get(r)}m_.exports=qLe});var y_=w((pAt,I_)=>{var JLe=tm();function WLe(r){return JLe(this,r).has(r)}I_.exports=WLe});var B_=w((dAt,w_)=>{var zLe=tm();function VLe(r,e){var t=zLe(this,r),i=t.size;return t.set(r,e),this.size+=t.size==i?0:1,this}w_.exports=VLe});var G0=w((CAt,b_)=>{var XLe=g_(),ZLe=C_(),_Le=E_(),$Le=y_(),eOe=B_();function wh(r){var e=-1,t=r==null?0:r.length;for(this.clear();++e<t;){var i=r[e];this.set(i[0],i[1])}}wh.prototype.clear=XLe;wh.prototype.delete=ZLe;wh.prototype.get=_Le;wh.prototype.has=$Le;wh.prototype.set=eOe;b_.exports=wh});var v_=w((mAt,S_)=>{var Q_=G0(),tOe="Expected a function";function KN(r,e){if(typeof r!="function"||e!=null&&typeof e!="function")throw new TypeError(tOe);var t=function(){var i=arguments,n=e?e.apply(this,i):i[0],s=t.cache;if(s.has(n))return s.get(n);var o=r.apply(this,i);return t.cache=s.set(n,o)||s,o};return t.cache=new(KN.Cache||Q_),t}KN.Cache=Q_;S_.exports=KN});var P_=w((EAt,x_)=>{var rOe=v_(),iOe=500;function nOe(r){var e=rOe(r,function(i){return t.size===iOe&&t.clear(),i}),t=e.cache;return e}x_.exports=nOe});var k_=w((IAt,D_)=>{var sOe=P_(),oOe=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,aOe=/\\(\\)?/g,AOe=sOe(function(r){var e=[];return r.charCodeAt(0)===46&&e.push(""),r.replace(oOe,function(t,i,n,s){e.push(n?s.replace(aOe,"$1"):i||t)}),e});D_.exports=AOe});var Bh=w((yAt,R_)=>{var lOe=vs(),cOe=K0(),uOe=k_(),gOe=Vf();function fOe(r,e){return lOe(r)?r:cOe(r,e)?[r]:uOe(gOe(r))}R_.exports=fOe});var Zc=w((wAt,F_)=>{var hOe=gC(),pOe=1/0;function dOe(r){if(typeof r=="string"||hOe(r))return r;var e=r+"";return e=="0"&&1/r==-pOe?"-0":e}F_.exports=dOe});var rm=w((BAt,N_)=>{var COe=Bh(),mOe=Zc();function EOe(r,e){e=COe(e,r);for(var t=0,i=e.length;r!=null&&t<i;)r=r[mOe(e[t++])];return t&&t==i?r:void 0}N_.exports=EOe});var UN=w((bAt,T_)=>{var IOe=pl(),yOe=function(){try{var r=IOe(Object,"defineProperty");return r({},"",{}),r}catch{}}();T_.exports=yOe});var bh=w((QAt,O_)=>{var L_=UN();function wOe(r,e,t){e=="__proto__"&&L_?L_(r,e,{configurable:!0,enumerable:!0,value:t,writable:!0}):r[e]=t}O_.exports=wOe});var Y0=w((SAt,M_)=>{var BOe=bh(),bOe=Ih(),QOe=Object.prototype,SOe=QOe.hasOwnProperty;function vOe(r,e,t){var i=r[e];(!(SOe.call(r,e)&&bOe(i,t))||t===void 0&&!(e in r))&&BOe(r,e,t)}M_.exports=vOe});var im=w((vAt,K_)=>{var xOe=9007199254740991,POe=/^(?:0|[1-9]\d*)$/;function DOe(r,e){var t=typeof r;return e=e==null?xOe:e,!!e&&(t=="number"||t!="symbol"&&POe.test(r))&&r>-1&&r%1==0&&r<e}K_.exports=DOe});var HN=w((xAt,H_)=>{var kOe=Y0(),ROe=Bh(),FOe=im(),U_=vn(),NOe=Zc();function TOe(r,e,t,i){if(!U_(r))return r;e=ROe(e,r);for(var n=-1,s=e.length,o=s-1,a=r;a!=null&&++n<s;){var l=NOe(e[n]),c=t;if(l==="__proto__"||l==="constructor"||l==="prototype")return r;if(n!=o){var u=a[l];c=i?i(u,l,a):void 0,c===void 0&&(c=U_(u)?u:FOe(e[n+1])?[]:{})}kOe(a,l,c),a=a[l]}return r}H_.exports=TOe});var Y_=w((PAt,G_)=>{var LOe=rm(),OOe=HN(),MOe=Bh();function KOe(r,e,t){for(var i=-1,n=e.length,s={};++i<n;){var o=e[i],a=LOe(r,o);t(a,o)&&OOe(s,MOe(o,r),a)}return s}G_.exports=KOe});var q_=w((DAt,j_)=>{function UOe(r,e){return r!=null&&e in Object(r)}j_.exports=UOe});var W_=w((kAt,J_)=>{var HOe=Fc(),GOe=Wo(),YOe="[object Arguments]";function jOe(r){return GOe(r)&&HOe(r)==YOe}J_.exports=jOe});var nm=w((RAt,X_)=>{var z_=W_(),qOe=Wo(),V_=Object.prototype,JOe=V_.hasOwnProperty,WOe=V_.propertyIsEnumerable,zOe=z_(function(){return arguments}())?z_:function(r){return qOe(r)&&JOe.call(r,"callee")&&!WOe.call(r,"callee")};X_.exports=zOe});var j0=w((FAt,Z_)=>{var VOe=9007199254740991;function XOe(r){return typeof r=="number"&&r>-1&&r%1==0&&r<=VOe}Z_.exports=XOe});var GN=w((NAt,__)=>{var ZOe=Bh(),_Oe=nm(),$Oe=vs(),eMe=im(),tMe=j0(),rMe=Zc();function iMe(r,e,t){e=ZOe(e,r);for(var i=-1,n=e.length,s=!1;++i<n;){var o=rMe(e[i]);if(!(s=r!=null&&t(r,o)))break;r=r[o]}return s||++i!=n?s:(n=r==null?0:r.length,!!n&&tMe(n)&&eMe(o,n)&&($Oe(r)||_Oe(r)))}__.exports=iMe});var YN=w((TAt,$_)=>{var nMe=q_(),sMe=GN();function oMe(r,e){return r!=null&&sMe(r,e,nMe)}$_.exports=oMe});var t$=w((LAt,e$)=>{var aMe=Y_(),AMe=YN();function lMe(r,e){return aMe(r,e,function(t,i){return AMe(r,i)})}e$.exports=lMe});var q0=w((OAt,r$)=>{function cMe(r,e){for(var t=-1,i=e.length,n=r.length;++t<i;)r[n+t]=e[t];return r}r$.exports=cMe});var o$=w((MAt,s$)=>{var i$=Rc(),uMe=nm(),gMe=vs(),n$=i$?i$.isConcatSpreadable:void 0;function fMe(r){return gMe(r)||uMe(r)||!!(n$&&r&&r[n$])}s$.exports=fMe});var l$=w((KAt,A$)=>{var hMe=q0(),pMe=o$();function a$(r,e,t,i,n){var s=-1,o=r.length;for(t||(t=pMe),n||(n=[]);++s<o;){var a=r[s];e>0&&t(a)?e>1?a$(a,e-1,t,i,n):hMe(n,a):i||(n[n.length]=a)}return n}A$.exports=a$});var u$=w((UAt,c$)=>{var dMe=l$();function CMe(r){var e=r==null?0:r.length;return e?dMe(r,1):[]}c$.exports=CMe});var f$=w((HAt,g$)=>{function mMe(r,e,t){switch(t.length){case 0:return r.call(e);case 1:return r.call(e,t[0]);case 2:return r.call(e,t[0],t[1]);case 3:return r.call(e,t[0],t[1],t[2])}return r.apply(e,t)}g$.exports=mMe});var jN=w((GAt,p$)=>{var EMe=f$(),h$=Math.max;function IMe(r,e,t){return e=h$(e===void 0?r.length-1:e,0),function(){for(var i=arguments,n=-1,s=h$(i.length-e,0),o=Array(s);++n<s;)o[n]=i[e+n];n=-1;for(var a=Array(e+1);++n<e;)a[n]=i[n];return a[e]=t(o),EMe(r,this,a)}}p$.exports=IMe});var C$=w((YAt,d$)=>{function yMe(r){return function(){return r}}d$.exports=yMe});var J0=w((jAt,m$)=>{function wMe(r){return r}m$.exports=wMe});var y$=w((qAt,I$)=>{var BMe=C$(),E$=UN(),bMe=J0(),QMe=E$?function(r,e){return E$(r,"toString",{configurable:!0,enumerable:!1,value:BMe(e),writable:!0})}:bMe;I$.exports=QMe});var B$=w((JAt,w$)=>{var SMe=800,vMe=16,xMe=Date.now;function PMe(r){var e=0,t=0;return function(){var i=xMe(),n=vMe-(i-t);if(t=i,n>0){if(++e>=SMe)return arguments[0]}else e=0;return r.apply(void 0,arguments)}}w$.exports=PMe});var qN=w((WAt,b$)=>{var DMe=y$(),kMe=B$(),RMe=kMe(DMe);b$.exports=RMe});var S$=w((zAt,Q$)=>{var FMe=u$(),NMe=jN(),TMe=qN();function LMe(r){return TMe(NMe(r,void 0,FMe),r+"")}Q$.exports=LMe});var x$=w((VAt,v$)=>{var OMe=t$(),MMe=S$(),KMe=MMe(function(r,e){return r==null?{}:OMe(r,e)});v$.exports=KMe});var K$=w((mct,M$)=>{"use strict";var _N;try{_N=Map}catch{}var $N;try{$N=Set}catch{}function L$(r,e,t){if(!r||typeof r!="object"||typeof r=="function")return r;if(r.nodeType&&"cloneNode"in r)return r.cloneNode(!0);if(r instanceof Date)return new Date(r.getTime());if(r instanceof RegExp)return new RegExp(r);if(Array.isArray(r))return r.map(O$);if(_N&&r instanceof _N)return new Map(Array.from(r.entries()));if($N&&r instanceof $N)return new Set(Array.from(r.values()));if(r instanceof Object){e.push(r);var i=Object.create(r);t.push(i);for(var n in r){var s=e.findIndex(function(o){return o===r[n]});i[n]=s>-1?t[s]:L$(r[n],e,t)}return i}return r}function O$(r){return L$(r,[],[])}M$.exports=O$});var om=w(eT=>{"use strict";Object.defineProperty(eT,"__esModule",{value:!0});eT.default=e1e;var zMe=Object.prototype.toString,VMe=Error.prototype.toString,XMe=RegExp.prototype.toString,ZMe=typeof Symbol<"u"?Symbol.prototype.toString:()=>"",_Me=/^Symbol\((.*)\)(.*)$/;function $Me(r){return r!=+r?"NaN":r===0&&1/r<0?"-0":""+r}function U$(r,e=!1){if(r==null||r===!0||r===!1)return""+r;let t=typeof r;if(t==="number")return $Me(r);if(t==="string")return e?`"${r}"`:r;if(t==="function")return"[Function "+(r.name||"anonymous")+"]";if(t==="symbol")return ZMe.call(r).replace(_Me,"Symbol($1)");let i=zMe.call(r).slice(8,-1);return i==="Date"?isNaN(r.getTime())?""+r:r.toISOString(r):i==="Error"||r instanceof Error?"["+VMe.call(r)+"]":i==="RegExp"?XMe.call(r):null}function e1e(r,e){let t=U$(r,e);return t!==null?t:JSON.stringify(r,function(i,n){let s=U$(this[i],e);return s!==null?s:n},2)}});var iA=w(Ei=>{"use strict";Object.defineProperty(Ei,"__esModule",{value:!0});Ei.default=Ei.array=Ei.object=Ei.boolean=Ei.date=Ei.number=Ei.string=Ei.mixed=void 0;var H$=t1e(om());function t1e(r){return r&&r.__esModule?r:{default:r}}var G$={default:"${path} is invalid",required:"${path} is a required field",oneOf:"${path} must be one of the following values: ${values}",notOneOf:"${path} must not be one of the following values: ${values}",notType:({path:r,type:e,value:t,originalValue:i})=>{let n=i!=null&&i!==t,s=`${r} must be a \`${e}\` type, but the final value was: \`${(0,H$.default)(t,!0)}\``+(n?` (cast from the value \`${(0,H$.default)(i,!0)}\`).`:".");return t===null&&(s+='\n If "null" is intended as an empty value be sure to mark the schema as `.nullable()`'),s},defined:"${path} must be defined"};Ei.mixed=G$;var Y$={length:"${path} must be exactly ${length} characters",min:"${path} must be at least ${min} characters",max:"${path} must be at most ${max} characters",matches:'${path} must match the following: "${regex}"',email:"${path} must be a valid email",url:"${path} must be a valid URL",uuid:"${path} must be a valid UUID",trim:"${path} must be a trimmed string",lowercase:"${path} must be a lowercase string",uppercase:"${path} must be a upper case string"};Ei.string=Y$;var j$={min:"${path} must be greater than or equal to ${min}",max:"${path} must be less than or equal to ${max}",lessThan:"${path} must be less than ${less}",moreThan:"${path} must be greater than ${more}",positive:"${path} must be a positive number",negative:"${path} must be a negative number",integer:"${path} must be an integer"};Ei.number=j$;var q$={min:"${path} field must be later than ${min}",max:"${path} field must be at earlier than ${max}"};Ei.date=q$;var J$={isValue:"${path} field must be ${value}"};Ei.boolean=J$;var W$={noUnknown:"${path} field has unspecified keys: ${unknown}"};Ei.object=W$;var z$={min:"${path} field must have at least ${min} items",max:"${path} field must have less than or equal to ${max} items",length:"${path} must be have ${length} items"};Ei.array=z$;var r1e=Object.assign(Object.create(null),{mixed:G$,string:Y$,number:j$,date:q$,object:W$,array:z$,boolean:J$});Ei.default=r1e});var X$=w((yct,V$)=>{var i1e=Object.prototype,n1e=i1e.hasOwnProperty;function s1e(r,e){return r!=null&&n1e.call(r,e)}V$.exports=s1e});var am=w((wct,Z$)=>{var o1e=X$(),a1e=GN();function A1e(r,e){return r!=null&&a1e(r,e,o1e)}Z$.exports=A1e});var xh=w(eb=>{"use strict";Object.defineProperty(eb,"__esModule",{value:!0});eb.default=void 0;var l1e=r=>r&&r.__isYupSchema__;eb.default=l1e});var $$=w(tb=>{"use strict";Object.defineProperty(tb,"__esModule",{value:!0});tb.default=void 0;var c1e=_$(am()),u1e=_$(xh());function _$(r){return r&&r.__esModule?r:{default:r}}var tT=class{constructor(e,t){if(this.refs=e,this.refs=e,typeof t=="function"){this.fn=t;return}if(!(0,c1e.default)(t,"is"))throw new TypeError("`is:` is required for `when()` conditions");if(!t.then&&!t.otherwise)throw new TypeError("either `then:` or `otherwise:` is required for `when()` conditions");let{is:i,then:n,otherwise:s}=t,o=typeof i=="function"?i:(...a)=>a.every(l=>l===i);this.fn=function(...a){let l=a.pop(),c=a.pop(),u=o(...a)?n:s;if(!!u)return typeof u=="function"?u(c):c.concat(u.resolve(l))}}resolve(e,t){let i=this.refs.map(s=>s.getValue(t==null?void 0:t.value,t==null?void 0:t.parent,t==null?void 0:t.context)),n=this.fn.apply(e,i.concat(e,t));if(n===void 0||n===e)return e;if(!(0,u1e.default)(n))throw new TypeError("conditions must return a schema object");return n.resolve(t)}},g1e=tT;tb.default=g1e});var iT=w(rT=>{"use strict";Object.defineProperty(rT,"__esModule",{value:!0});rT.default=f1e;function f1e(r){return r==null?[]:[].concat(r)}});var _c=w(rb=>{"use strict";Object.defineProperty(rb,"__esModule",{value:!0});rb.default=void 0;var h1e=eee(om()),p1e=eee(iT());function eee(r){return r&&r.__esModule?r:{default:r}}function nT(){return nT=Object.assign||function(r){for(var e=1;e<arguments.length;e++){var t=arguments[e];for(var i in t)Object.prototype.hasOwnProperty.call(t,i)&&(r[i]=t[i])}return r},nT.apply(this,arguments)}var d1e=/\$\{\s*(\w+)\s*\}/g,Ph=class extends Error{static formatError(e,t){let i=t.label||t.path||"this";return i!==t.path&&(t=nT({},t,{path:i})),typeof e=="string"?e.replace(d1e,(n,s)=>(0,h1e.default)(t[s])):typeof e=="function"?e(t):e}static isError(e){return e&&e.name==="ValidationError"}constructor(e,t,i,n){super(),this.name="ValidationError",this.value=t,this.path=i,this.type=n,this.errors=[],this.inner=[],(0,p1e.default)(e).forEach(s=>{Ph.isError(s)?(this.errors.push(...s.errors),this.inner=this.inner.concat(s.inner.length?s.inner:s)):this.errors.push(s)}),this.message=this.errors.length>1?`${this.errors.length} errors occurred`:this.errors[0],Error.captureStackTrace&&Error.captureStackTrace(this,Ph)}};rb.default=Ph});var ib=w(oT=>{"use strict";Object.defineProperty(oT,"__esModule",{value:!0});oT.default=E1e;var sT=C1e(_c());function C1e(r){return r&&r.__esModule?r:{default:r}}var m1e=r=>{let e=!1;return(...t)=>{e||(e=!0,r(...t))}};function E1e(r,e){let{endEarly:t,tests:i,args:n,value:s,errors:o,sort:a,path:l}=r,c=m1e(e),u=i.length,g=[];if(o=o||[],!u)return o.length?c(new sT.default(o,s,l)):c(null,s);for(let f=0;f<i.length;f++){let h=i[f];h(n,function(C){if(C){if(!sT.default.isError(C))return c(C,s);if(t)return C.value=s,c(C,s);g.push(C)}if(--u<=0){if(g.length&&(a&&g.sort(a),o.length&&g.push(...o),o=g),o.length){c(new sT.default(o,s,l),s);return}c(null,s)}})}}});var ree=w((xct,tee)=>{function I1e(r){return function(e,t,i){for(var n=-1,s=Object(e),o=i(e),a=o.length;a--;){var l=o[r?a:++n];if(t(s[l],l,s)===!1)break}return e}}tee.exports=I1e});var aT=w((Pct,iee)=>{var y1e=ree(),w1e=y1e();iee.exports=w1e});var see=w((Dct,nee)=>{function B1e(r,e){for(var t=-1,i=Array(r);++t<r;)i[t]=e(t);return i}nee.exports=B1e});var aee=w((kct,oee)=>{function b1e(){return!1}oee.exports=b1e});var lm=w((Am,Dh)=>{var Q1e=ys(),S1e=aee(),cee=typeof Am=="object"&&Am&&!Am.nodeType&&Am,Aee=cee&&typeof Dh=="object"&&Dh&&!Dh.nodeType&&Dh,v1e=Aee&&Aee.exports===cee,lee=v1e?Q1e.Buffer:void 0,x1e=lee?lee.isBuffer:void 0,P1e=x1e||S1e;Dh.exports=P1e});var gee=w((Rct,uee)=>{var D1e=Fc(),k1e=j0(),R1e=Wo(),F1e="[object Arguments]",N1e="[object Array]",T1e="[object Boolean]",L1e="[object Date]",O1e="[object Error]",M1e="[object Function]",K1e="[object Map]",U1e="[object Number]",H1e="[object Object]",G1e="[object RegExp]",Y1e="[object Set]",j1e="[object String]",q1e="[object WeakMap]",J1e="[object ArrayBuffer]",W1e="[object DataView]",z1e="[object Float32Array]",V1e="[object Float64Array]",X1e="[object Int8Array]",Z1e="[object Int16Array]",_1e="[object Int32Array]",$1e="[object Uint8Array]",eKe="[object Uint8ClampedArray]",tKe="[object Uint16Array]",rKe="[object Uint32Array]",Ir={};Ir[z1e]=Ir[V1e]=Ir[X1e]=Ir[Z1e]=Ir[_1e]=Ir[$1e]=Ir[eKe]=Ir[tKe]=Ir[rKe]=!0;Ir[F1e]=Ir[N1e]=Ir[J1e]=Ir[T1e]=Ir[W1e]=Ir[L1e]=Ir[O1e]=Ir[M1e]=Ir[K1e]=Ir[U1e]=Ir[H1e]=Ir[G1e]=Ir[Y1e]=Ir[j1e]=Ir[q1e]=!1;function iKe(r){return R1e(r)&&k1e(r.length)&&!!Ir[D1e(r)]}uee.exports=iKe});var nb=w((Fct,fee)=>{function nKe(r){return function(e){return r(e)}}fee.exports=nKe});var sb=w((cm,kh)=>{var sKe=WD(),hee=typeof cm=="object"&&cm&&!cm.nodeType&&cm,um=hee&&typeof kh=="object"&&kh&&!kh.nodeType&&kh,oKe=um&&um.exports===hee,AT=oKe&&sKe.process,aKe=function(){try{var r=um&&um.require&&um.require("util").types;return r||AT&&AT.binding&&AT.binding("util")}catch{}}();kh.exports=aKe});var ob=w((Nct,Cee)=>{var AKe=gee(),lKe=nb(),pee=sb(),dee=pee&&pee.isTypedArray,cKe=dee?lKe(dee):AKe;Cee.exports=cKe});var lT=w((Tct,mee)=>{var uKe=see(),gKe=nm(),fKe=vs(),hKe=lm(),pKe=im(),dKe=ob(),CKe=Object.prototype,mKe=CKe.hasOwnProperty;function EKe(r,e){var t=fKe(r),i=!t&&gKe(r),n=!t&&!i&&hKe(r),s=!t&&!i&&!n&&dKe(r),o=t||i||n||s,a=o?uKe(r.length,String):[],l=a.length;for(var c in r)(e||mKe.call(r,c))&&!(o&&(c=="length"||n&&(c=="offset"||c=="parent")||s&&(c=="buffer"||c=="byteLength"||c=="byteOffset")||pKe(c,l)))&&a.push(c);return a}mee.exports=EKe});var ab=w((Lct,Eee)=>{var IKe=Object.prototype;function yKe(r){var e=r&&r.constructor,t=typeof e=="function"&&e.prototype||IKe;return r===t}Eee.exports=yKe});var cT=w((Oct,Iee)=>{function wKe(r,e){return function(t){return r(e(t))}}Iee.exports=wKe});var wee=w((Mct,yee)=>{var BKe=cT(),bKe=BKe(Object.keys,Object);yee.exports=bKe});var bee=w((Kct,Bee)=>{var QKe=ab(),SKe=wee(),vKe=Object.prototype,xKe=vKe.hasOwnProperty;function PKe(r){if(!QKe(r))return SKe(r);var e=[];for(var t in Object(r))xKe.call(r,t)&&t!="constructor"&&e.push(t);return e}Bee.exports=PKe});var gm=w((Uct,Qee)=>{var DKe=U0(),kKe=j0();function RKe(r){return r!=null&&kKe(r.length)&&!DKe(r)}Qee.exports=RKe});var Rh=w((Hct,See)=>{var FKe=lT(),NKe=bee(),TKe=gm();function LKe(r){return TKe(r)?FKe(r):NKe(r)}See.exports=LKe});var uT=w((Gct,vee)=>{var OKe=aT(),MKe=Rh();function KKe(r,e){return r&&OKe(r,e,MKe)}vee.exports=KKe});var Pee=w((Yct,xee)=>{var UKe=em();function HKe(){this.__data__=new UKe,this.size=0}xee.exports=HKe});var kee=w((jct,Dee)=>{function GKe(r){var e=this.__data__,t=e.delete(r);return this.size=e.size,t}Dee.exports=GKe});var Fee=w((qct,Ree)=>{function YKe(r){return this.__data__.get(r)}Ree.exports=YKe});var Tee=w((Jct,Nee)=>{function jKe(r){return this.__data__.has(r)}Nee.exports=jKe});var Oee=w((Wct,Lee)=>{var qKe=em(),JKe=H0(),WKe=G0(),zKe=200;function VKe(r,e){var t=this.__data__;if(t instanceof qKe){var i=t.__data__;if(!JKe||i.length<zKe-1)return i.push([r,e]),this.size=++t.size,this;t=this.__data__=new WKe(i)}return t.set(r,e),this.size=t.size,this}Lee.exports=VKe});var fm=w((zct,Mee)=>{var XKe=em(),ZKe=Pee(),_Ke=kee(),$Ke=Fee(),eUe=Tee(),tUe=Oee();function Fh(r){var e=this.__data__=new XKe(r);this.size=e.size}Fh.prototype.clear=ZKe;Fh.prototype.delete=_Ke;Fh.prototype.get=$Ke;Fh.prototype.has=eUe;Fh.prototype.set=tUe;Mee.exports=Fh});var Uee=w((Vct,Kee)=>{var rUe="__lodash_hash_undefined__";function iUe(r){return this.__data__.set(r,rUe),this}Kee.exports=iUe});var Gee=w((Xct,Hee)=>{function nUe(r){return this.__data__.has(r)}Hee.exports=nUe});var jee=w((Zct,Yee)=>{var sUe=G0(),oUe=Uee(),aUe=Gee();function Ab(r){var e=-1,t=r==null?0:r.length;for(this.__data__=new sUe;++e<t;)this.add(r[e])}Ab.prototype.add=Ab.prototype.push=oUe;Ab.prototype.has=aUe;Yee.exports=Ab});var Jee=w((_ct,qee)=>{function AUe(r,e){for(var t=-1,i=r==null?0:r.length;++t<i;)if(e(r[t],t,r))return!0;return!1}qee.exports=AUe});var zee=w(($ct,Wee)=>{function lUe(r,e){return r.has(e)}Wee.exports=lUe});var gT=w((eut,Vee)=>{var cUe=jee(),uUe=Jee(),gUe=zee(),fUe=1,hUe=2;function pUe(r,e,t,i,n,s){var o=t&fUe,a=r.length,l=e.length;if(a!=l&&!(o&&l>a))return!1;var c=s.get(r),u=s.get(e);if(c&&u)return c==e&&u==r;var g=-1,f=!0,h=t&hUe?new cUe:void 0;for(s.set(r,e),s.set(e,r);++g<a;){var p=r[g],C=e[g];if(i)var y=o?i(C,p,g,e,r,s):i(p,C,g,r,e,s);if(y!==void 0){if(y)continue;f=!1;break}if(h){if(!uUe(e,function(B,v){if(!gUe(h,v)&&(p===B||n(p,B,t,i,s)))return h.push(v)})){f=!1;break}}else if(!(p===C||n(p,C,t,i,s))){f=!1;break}}return s.delete(r),s.delete(e),f}Vee.exports=pUe});var fT=w((tut,Xee)=>{var dUe=ys(),CUe=dUe.Uint8Array;Xee.exports=CUe});var _ee=w((rut,Zee)=>{function mUe(r){var e=-1,t=Array(r.size);return r.forEach(function(i,n){t[++e]=[n,i]}),t}Zee.exports=mUe});var ete=w((iut,$ee)=>{function EUe(r){var e=-1,t=Array(r.size);return r.forEach(function(i){t[++e]=i}),t}$ee.exports=EUe});var ste=w((nut,nte)=>{var tte=Rc(),rte=fT(),IUe=Ih(),yUe=gT(),wUe=_ee(),BUe=ete(),bUe=1,QUe=2,SUe="[object Boolean]",vUe="[object Date]",xUe="[object Error]",PUe="[object Map]",DUe="[object Number]",kUe="[object RegExp]",RUe="[object Set]",FUe="[object String]",NUe="[object Symbol]",TUe="[object ArrayBuffer]",LUe="[object DataView]",ite=tte?tte.prototype:void 0,hT=ite?ite.valueOf:void 0;function OUe(r,e,t,i,n,s,o){switch(t){case LUe:if(r.byteLength!=e.byteLength||r.byteOffset!=e.byteOffset)return!1;r=r.buffer,e=e.buffer;case TUe:return!(r.byteLength!=e.byteLength||!s(new rte(r),new rte(e)));case SUe:case vUe:case DUe:return IUe(+r,+e);case xUe:return r.name==e.name&&r.message==e.message;case kUe:case FUe:return r==e+"";case PUe:var a=wUe;case RUe:var l=i&bUe;if(a||(a=BUe),r.size!=e.size&&!l)return!1;var c=o.get(r);if(c)return c==e;i|=QUe,o.set(r,e);var u=yUe(a(r),a(e),i,n,s,o);return o.delete(r),u;case NUe:if(hT)return hT.call(r)==hT.call(e)}return!1}nte.exports=OUe});var pT=w((sut,ote)=>{var MUe=q0(),KUe=vs();function UUe(r,e,t){var i=e(r);return KUe(r)?i:MUe(i,t(r))}ote.exports=UUe});var Ate=w((out,ate)=>{function HUe(r,e){for(var t=-1,i=r==null?0:r.length,n=0,s=[];++t<i;){var o=r[t];e(o,t,r)&&(s[n++]=o)}return s}ate.exports=HUe});var dT=w((aut,lte)=>{function GUe(){return[]}lte.exports=GUe});var lb=w((Aut,ute)=>{var YUe=Ate(),jUe=dT(),qUe=Object.prototype,JUe=qUe.propertyIsEnumerable,cte=Object.getOwnPropertySymbols,WUe=cte?function(r){return r==null?[]:(r=Object(r),YUe(cte(r),function(e){return JUe.call(r,e)}))}:jUe;ute.exports=WUe});var CT=w((lut,gte)=>{var zUe=pT(),VUe=lb(),XUe=Rh();function ZUe(r){return zUe(r,XUe,VUe)}gte.exports=ZUe});var pte=w((cut,hte)=>{var fte=CT(),_Ue=1,$Ue=Object.prototype,e2e=$Ue.hasOwnProperty;function t2e(r,e,t,i,n,s){var o=t&_Ue,a=fte(r),l=a.length,c=fte(e),u=c.length;if(l!=u&&!o)return!1;for(var g=l;g--;){var f=a[g];if(!(o?f in e:e2e.call(e,f)))return!1}var h=s.get(r),p=s.get(e);if(h&&p)return h==e&&p==r;var C=!0;s.set(r,e),s.set(e,r);for(var y=o;++g<l;){f=a[g];var B=r[f],v=e[f];if(i)var D=o?i(v,B,f,e,r,s):i(B,v,f,r,e,s);if(!(D===void 0?B===v||n(B,v,t,i,s):D)){C=!1;break}y||(y=f=="constructor")}if(C&&!y){var T=r.constructor,H=e.constructor;T!=H&&"constructor"in r&&"constructor"in e&&!(typeof T=="function"&&T instanceof T&&typeof H=="function"&&H instanceof H)&&(C=!1)}return s.delete(r),s.delete(e),C}hte.exports=t2e});var Cte=w((uut,dte)=>{var r2e=pl(),i2e=ys(),n2e=r2e(i2e,"DataView");dte.exports=n2e});var Ete=w((gut,mte)=>{var s2e=pl(),o2e=ys(),a2e=s2e(o2e,"Promise");mte.exports=a2e});var yte=w((fut,Ite)=>{var A2e=pl(),l2e=ys(),c2e=A2e(l2e,"Set");Ite.exports=c2e});var Bte=w((hut,wte)=>{var u2e=pl(),g2e=ys(),f2e=u2e(g2e,"WeakMap");wte.exports=f2e});var hm=w((put,Dte)=>{var mT=Cte(),ET=H0(),IT=Ete(),yT=yte(),wT=Bte(),Pte=Fc(),Nh=MN(),bte="[object Map]",h2e="[object Object]",Qte="[object Promise]",Ste="[object Set]",vte="[object WeakMap]",xte="[object DataView]",p2e=Nh(mT),d2e=Nh(ET),C2e=Nh(IT),m2e=Nh(yT),E2e=Nh(wT),$c=Pte;(mT&&$c(new mT(new ArrayBuffer(1)))!=xte||ET&&$c(new ET)!=bte||IT&&$c(IT.resolve())!=Qte||yT&&$c(new yT)!=Ste||wT&&$c(new wT)!=vte)&&($c=function(r){var e=Pte(r),t=e==h2e?r.constructor:void 0,i=t?Nh(t):"";if(i)switch(i){case p2e:return xte;case d2e:return bte;case C2e:return Qte;case m2e:return Ste;case E2e:return vte}return e});Dte.exports=$c});var Mte=w((dut,Ote)=>{var BT=fm(),I2e=gT(),y2e=ste(),w2e=pte(),kte=hm(),Rte=vs(),Fte=lm(),B2e=ob(),b2e=1,Nte="[object Arguments]",Tte="[object Array]",cb="[object Object]",Q2e=Object.prototype,Lte=Q2e.hasOwnProperty;function S2e(r,e,t,i,n,s){var o=Rte(r),a=Rte(e),l=o?Tte:kte(r),c=a?Tte:kte(e);l=l==Nte?cb:l,c=c==Nte?cb:c;var u=l==cb,g=c==cb,f=l==c;if(f&&Fte(r)){if(!Fte(e))return!1;o=!0,u=!1}if(f&&!u)return s||(s=new BT),o||B2e(r)?I2e(r,e,t,i,n,s):y2e(r,e,l,t,i,n,s);if(!(t&b2e)){var h=u&&Lte.call(r,"__wrapped__"),p=g&&Lte.call(e,"__wrapped__");if(h||p){var C=h?r.value():r,y=p?e.value():e;return s||(s=new BT),n(C,y,t,i,s)}}return f?(s||(s=new BT),w2e(r,e,t,i,n,s)):!1}Ote.exports=S2e});var bT=w((Cut,Hte)=>{var v2e=Mte(),Kte=Wo();function Ute(r,e,t,i,n){return r===e?!0:r==null||e==null||!Kte(r)&&!Kte(e)?r!==r&&e!==e:v2e(r,e,t,i,Ute,n)}Hte.exports=Ute});var Yte=w((mut,Gte)=>{var x2e=fm(),P2e=bT(),D2e=1,k2e=2;function R2e(r,e,t,i){var n=t.length,s=n,o=!i;if(r==null)return!s;for(r=Object(r);n--;){var a=t[n];if(o&&a[2]?a[1]!==r[a[0]]:!(a[0]in r))return!1}for(;++n<s;){a=t[n];var l=a[0],c=r[l],u=a[1];if(o&&a[2]){if(c===void 0&&!(l in r))return!1}else{var g=new x2e;if(i)var f=i(c,u,l,r,e,g);if(!(f===void 0?P2e(u,c,D2e|k2e,i,g):f))return!1}}return!0}Gte.exports=R2e});var QT=w((Eut,jte)=>{var F2e=vn();function N2e(r){return r===r&&!F2e(r)}jte.exports=N2e});var Jte=w((Iut,qte)=>{var T2e=QT(),L2e=Rh();function O2e(r){for(var e=L2e(r),t=e.length;t--;){var i=e[t],n=r[i];e[t]=[i,n,T2e(n)]}return e}qte.exports=O2e});var ST=w((yut,Wte)=>{function M2e(r,e){return function(t){return t==null?!1:t[r]===e&&(e!==void 0||r in Object(t))}}Wte.exports=M2e});var Vte=w((wut,zte)=>{var K2e=Yte(),U2e=Jte(),H2e=ST();function G2e(r){var e=U2e(r);return e.length==1&&e[0][2]?H2e(e[0][0],e[0][1]):function(t){return t===r||K2e(t,r,e)}}zte.exports=G2e});var ub=w((But,Xte)=>{var Y2e=rm();function j2e(r,e,t){var i=r==null?void 0:Y2e(r,e);return i===void 0?t:i}Xte.exports=j2e});var _te=w((but,Zte)=>{var q2e=bT(),J2e=ub(),W2e=YN(),z2e=K0(),V2e=QT(),X2e=ST(),Z2e=Zc(),_2e=1,$2e=2;function eHe(r,e){return z2e(r)&&V2e(e)?X2e(Z2e(r),e):function(t){var i=J2e(t,r);return i===void 0&&i===e?W2e(t,r):q2e(e,i,_2e|$2e)}}Zte.exports=eHe});var ere=w((Qut,$te)=>{function tHe(r){return function(e){return e==null?void 0:e[r]}}$te.exports=tHe});var rre=w((Sut,tre)=>{var rHe=rm();function iHe(r){return function(e){return rHe(e,r)}}tre.exports=iHe});var nre=w((vut,ire)=>{var nHe=ere(),sHe=rre(),oHe=K0(),aHe=Zc();function AHe(r){return oHe(r)?nHe(aHe(r)):sHe(r)}ire.exports=AHe});var vT=w((xut,sre)=>{var lHe=Vte(),cHe=_te(),uHe=J0(),gHe=vs(),fHe=nre();function hHe(r){return typeof r=="function"?r:r==null?uHe:typeof r=="object"?gHe(r)?cHe(r[0],r[1]):lHe(r):fHe(r)}sre.exports=hHe});var xT=w((Put,ore)=>{var pHe=bh(),dHe=uT(),CHe=vT();function mHe(r,e){var t={};return e=CHe(e,3),dHe(r,function(i,n,s){pHe(t,n,e(i,n,s))}),t}ore.exports=mHe});var pm=w((Dut,ure)=>{"use strict";function eu(r){this._maxSize=r,this.clear()}eu.prototype.clear=function(){this._size=0,this._values=Object.create(null)};eu.prototype.get=function(r){return this._values[r]};eu.prototype.set=function(r,e){return this._size>=this._maxSize&&this.clear(),r in this._values||this._size++,this._values[r]=e};var EHe=/[^.^\]^[]+|(?=\[\]|\.\.)/g,cre=/^\d+$/,IHe=/^\d/,yHe=/[~`!#$%\^&*+=\-\[\]\\';,/{}|\\":<>\?]/g,wHe=/^\s*(['"]?)(.*?)(\1)\s*$/,kT=512,are=new eu(kT),Are=new eu(kT),lre=new eu(kT);ure.exports={Cache:eu,split:DT,normalizePath:PT,setter:function(r){var e=PT(r);return Are.get(r)||Are.set(r,function(i,n){for(var s=0,o=e.length,a=i;s<o-1;){var l=e[s];if(l==="__proto__"||l==="constructor"||l==="prototype")return i;a=a[e[s++]]}a[e[s]]=n})},getter:function(r,e){var t=PT(r);return lre.get(r)||lre.set(r,function(n){for(var s=0,o=t.length;s<o;)if(n!=null||!e)n=n[t[s++]];else return;return n})},join:function(r){return r.reduce(function(e,t){return e+(RT(t)||cre.test(t)?"["+t+"]":(e?".":"")+t)},"")},forEach:function(r,e,t){BHe(Array.isArray(r)?r:DT(r),e,t)}};function PT(r){return are.get(r)||are.set(r,DT(r).map(function(e){return e.replace(wHe,"$2")}))}function DT(r){return r.match(EHe)}function BHe(r,e,t){var i=r.length,n,s,o,a;for(s=0;s<i;s++)n=r[s],n&&(SHe(n)&&(n='"'+n+'"'),a=RT(n),o=!a&&/^\d+$/.test(n),e.call(t,n,a,o,s,r))}function RT(r){return typeof r=="string"&&r&&["'",'"'].indexOf(r.charAt(0))!==-1}function bHe(r){return r.match(IHe)&&!r.match(cre)}function QHe(r){return yHe.test(r)}function SHe(r){return!RT(r)&&(bHe(r)||QHe(r))}});var tu=w(Cm=>{"use strict";Object.defineProperty(Cm,"__esModule",{value:!0});Cm.create=xHe;Cm.default=void 0;var vHe=pm(),gb={context:"$",value:"."};function xHe(r,e){return new dm(r,e)}var dm=class{constructor(e,t={}){if(typeof e!="string")throw new TypeError("ref must be a string, got: "+e);if(this.key=e.trim(),e==="")throw new TypeError("ref must be a non-empty string");this.isContext=this.key[0]===gb.context,this.isValue=this.key[0]===gb.value,this.isSibling=!this.isContext&&!this.isValue;let i=this.isContext?gb.context:this.isValue?gb.value:"";this.path=this.key.slice(i.length),this.getter=this.path&&(0,vHe.getter)(this.path,!0),this.map=t.map}getValue(e,t,i){let n=this.isContext?i:this.isValue?e:t;return this.getter&&(n=this.getter(n||{})),this.map&&(n=this.map(n)),n}cast(e,t){return this.getValue(e,t==null?void 0:t.parent,t==null?void 0:t.context)}resolve(){return this}describe(){return{type:"ref",key:this.key}}toString(){return`Ref(${this.key})`}static isRef(e){return e&&e.__isYupRef}};Cm.default=dm;dm.prototype.__isYupRef=!0});var gre=w(NT=>{"use strict";Object.defineProperty(NT,"__esModule",{value:!0});NT.default=RHe;var PHe=FT(xT()),fb=FT(_c()),DHe=FT(tu());function FT(r){return r&&r.__esModule?r:{default:r}}function hb(){return hb=Object.assign||function(r){for(var e=1;e<arguments.length;e++){var t=arguments[e];for(var i in t)Object.prototype.hasOwnProperty.call(t,i)&&(r[i]=t[i])}return r},hb.apply(this,arguments)}function kHe(r,e){if(r==null)return{};var t={},i=Object.keys(r),n,s;for(s=0;s<i.length;s++)n=i[s],!(e.indexOf(n)>=0)&&(t[n]=r[n]);return t}function RHe(r){function e(t,i){let{value:n,path:s="",label:o,options:a,originalValue:l,sync:c}=t,u=kHe(t,["value","path","label","options","originalValue","sync"]),{name:g,test:f,params:h,message:p}=r,{parent:C,context:y}=a;function B(j){return DHe.default.isRef(j)?j.getValue(n,C,y):j}function v(j={}){let $=(0,PHe.default)(hb({value:n,originalValue:l,label:o,path:j.path||s},h,j.params),B),V=new fb.default(fb.default.formatError(j.message||p,$),n,$.path,j.type||g);return V.params=$,V}let D=hb({path:s,parent:C,type:g,createError:v,resolve:B,options:a,originalValue:l},u);if(!c){try{Promise.resolve(f.call(D,n,D)).then(j=>{fb.default.isError(j)?i(j):j?i(null,j):i(v())})}catch(j){i(j)}return}let T;try{var H;if(T=f.call(D,n,D),typeof((H=T)==null?void 0:H.then)=="function")throw new Error(`Validation test of type: "${D.type}" returned a Promise during a synchronous validate. This test will finish after the validate call has returned`)}catch(j){i(j);return}fb.default.isError(T)?i(T):T?i(null,T):i(v())}return e.OPTIONS=r,e}});var TT=w(mm=>{"use strict";Object.defineProperty(mm,"__esModule",{value:!0});mm.getIn=fre;mm.default=void 0;var FHe=pm(),NHe=r=>r.substr(0,r.length-1).substr(1);function fre(r,e,t,i=t){let n,s,o;return e?((0,FHe.forEach)(e,(a,l,c)=>{let u=l?NHe(a):a;if(r=r.resolve({context:i,parent:n,value:t}),r.innerType){let g=c?parseInt(u,10):0;if(t&&g>=t.length)throw new Error(`Yup.reach cannot resolve an array item at index: ${a}, in the path: ${e}. because there is no value at that index. `);n=t,t=t&&t[g],r=r.innerType}if(!c){if(!r.fields||!r.fields[u])throw new Error(`The schema does not contain the path: ${e}. (failed at: ${o} which is a type: "${r._type}")`);n=t,t=t&&t[u],r=r.fields[u]}s=u,o=l?"["+a+"]":"."+a}),{schema:r,parent:n,parentPath:s}):{parent:n,parentPath:e,schema:r}}var THe=(r,e,t,i)=>fre(r,e,t,i).schema,LHe=THe;mm.default=LHe});var pre=w(pb=>{"use strict";Object.defineProperty(pb,"__esModule",{value:!0});pb.default=void 0;var hre=OHe(tu());function OHe(r){return r&&r.__esModule?r:{default:r}}var Em=class{constructor(){this.list=new Set,this.refs=new Map}get size(){return this.list.size+this.refs.size}describe(){let e=[];for(let t of this.list)e.push(t);for(let[,t]of this.refs)e.push(t.describe());return e}toArray(){return Array.from(this.list).concat(Array.from(this.refs.values()))}add(e){hre.default.isRef(e)?this.refs.set(e.key,e):this.list.add(e)}delete(e){hre.default.isRef(e)?this.refs.delete(e.key):this.list.delete(e)}has(e,t){if(this.list.has(e))return!0;let i,n=this.refs.values();for(;i=n.next(),!i.done;)if(t(i.value)===e)return!0;return!1}clone(){let e=new Em;return e.list=new Set(this.list),e.refs=new Map(this.refs),e}merge(e,t){let i=this.clone();return e.list.forEach(n=>i.add(n)),e.refs.forEach(n=>i.add(n)),t.list.forEach(n=>i.delete(n)),t.refs.forEach(n=>i.delete(n)),i}};pb.default=Em});var sA=w(Cb=>{"use strict";Object.defineProperty(Cb,"__esModule",{value:!0});Cb.default=void 0;var dre=nA(K$()),Th=iA(),MHe=nA($$()),Cre=nA(ib()),db=nA(gre()),mre=nA(om()),KHe=nA(tu()),UHe=TT(),HHe=nA(iT()),Ere=nA(_c()),Ire=nA(pre());function nA(r){return r&&r.__esModule?r:{default:r}}function Fs(){return Fs=Object.assign||function(r){for(var e=1;e<arguments.length;e++){var t=arguments[e];for(var i in t)Object.prototype.hasOwnProperty.call(t,i)&&(r[i]=t[i])}return r},Fs.apply(this,arguments)}var uo=class{constructor(e){this.deps=[],this.conditions=[],this._whitelist=new Ire.default,this._blacklist=new Ire.default,this.exclusiveTests=Object.create(null),this.tests=[],this.transforms=[],this.withMutation(()=>{this.typeError(Th.mixed.notType)}),this.type=(e==null?void 0:e.type)||"mixed",this.spec=Fs({strip:!1,strict:!1,abortEarly:!0,recursive:!0,nullable:!1,presence:"optional"},e==null?void 0:e.spec)}get _type(){return this.type}_typeCheck(e){return!0}clone(e){if(this._mutate)return e&&Object.assign(this.spec,e),this;let t=Object.create(Object.getPrototypeOf(this));return t.type=this.type,t._typeError=this._typeError,t._whitelistError=this._whitelistError,t._blacklistError=this._blacklistError,t._whitelist=this._whitelist.clone(),t._blacklist=this._blacklist.clone(),t.exclusiveTests=Fs({},this.exclusiveTests),t.deps=[...this.deps],t.conditions=[...this.conditions],t.tests=[...this.tests],t.transforms=[...this.transforms],t.spec=(0,dre.default)(Fs({},this.spec,e)),t}label(e){var t=this.clone();return t.spec.label=e,t}meta(...e){if(e.length===0)return this.spec.meta;let t=this.clone();return t.spec.meta=Object.assign(t.spec.meta||{},e[0]),t}withMutation(e){let t=this._mutate;this._mutate=!0;let i=e(this);return this._mutate=t,i}concat(e){if(!e||e===this)return this;if(e.type!==this.type&&this.type!=="mixed")throw new TypeError(`You cannot \`concat()\` schema's of different types: ${this.type} and ${e.type}`);let t=this,i=e.clone(),n=Fs({},t.spec,i.spec);return i.spec=n,i._typeError||(i._typeError=t._typeError),i._whitelistError||(i._whitelistError=t._whitelistError),i._blacklistError||(i._blacklistError=t._blacklistError),i._whitelist=t._whitelist.merge(e._whitelist,e._blacklist),i._blacklist=t._blacklist.merge(e._blacklist,e._whitelist),i.tests=t.tests,i.exclusiveTests=t.exclusiveTests,i.withMutation(s=>{e.tests.forEach(o=>{s.test(o.OPTIONS)})}),i}isType(e){return this.spec.nullable&&e===null?!0:this._typeCheck(e)}resolve(e){let t=this;if(t.conditions.length){let i=t.conditions;t=t.clone(),t.conditions=[],t=i.reduce((n,s)=>s.resolve(n,e),t),t=t.resolve(e)}return t}cast(e,t={}){let i=this.resolve(Fs({value:e},t)),n=i._cast(e,t);if(e!==void 0&&t.assert!==!1&&i.isType(n)!==!0){let s=(0,mre.default)(e),o=(0,mre.default)(n);throw new TypeError(`The value of ${t.path||"field"} could not be cast to a value that satisfies the schema type: "${i._type}". 
-
-attempted value: ${s} 
-`+(o!==s?`result of cast: ${o}`:""))}return n}_cast(e,t){let i=e===void 0?e:this.transforms.reduce((n,s)=>s.call(this,n,e,this),e);return i===void 0&&(i=this.getDefault()),i}_validate(e,t={},i){let{sync:n,path:s,from:o=[],originalValue:a=e,strict:l=this.spec.strict,abortEarly:c=this.spec.abortEarly}=t,u=e;l||(u=this._cast(u,Fs({assert:!1},t)));let g={value:u,path:s,options:t,originalValue:a,schema:this,label:this.spec.label,sync:n,from:o},f=[];this._typeError&&f.push(this._typeError),this._whitelistError&&f.push(this._whitelistError),this._blacklistError&&f.push(this._blacklistError),(0,Cre.default)({args:g,value:u,path:s,sync:n,tests:f,endEarly:c},h=>{if(h)return void i(h,u);(0,Cre.default)({tests:this.tests,args:g,path:s,sync:n,value:u,endEarly:c},i)})}validate(e,t,i){let n=this.resolve(Fs({},t,{value:e}));return typeof i=="function"?n._validate(e,t,i):new Promise((s,o)=>n._validate(e,t,(a,l)=>{a?o(a):s(l)}))}validateSync(e,t){let i=this.resolve(Fs({},t,{value:e})),n;return i._validate(e,Fs({},t,{sync:!0}),(s,o)=>{if(s)throw s;n=o}),n}isValid(e,t){return this.validate(e,t).then(()=>!0,i=>{if(Ere.default.isError(i))return!1;throw i})}isValidSync(e,t){try{return this.validateSync(e,t),!0}catch(i){if(Ere.default.isError(i))return!1;throw i}}_getDefault(){let e=this.spec.default;return e==null?e:typeof e=="function"?e.call(this):(0,dre.default)(e)}getDefault(e){return this.resolve(e||{})._getDefault()}default(e){return arguments.length===0?this._getDefault():this.clone({default:e})}strict(e=!0){var t=this.clone();return t.spec.strict=e,t}_isPresent(e){return e!=null}defined(e=Th.mixed.defined){return this.test({message:e,name:"defined",exclusive:!0,test(t){return t!==void 0}})}required(e=Th.mixed.required){return this.clone({presence:"required"}).withMutation(t=>t.test({message:e,name:"required",exclusive:!0,test(i){return this.schema._isPresent(i)}}))}notRequired(){var e=this.clone({presence:"optional"});return e.tests=e.tests.filter(t=>t.OPTIONS.name!=="required"),e}nullable(e=!0){var t=this.clone({nullable:e!==!1});return t}transform(e){var t=this.clone();return t.transforms.push(e),t}test(...e){let t;if(e.length===1?typeof e[0]=="function"?t={test:e[0]}:t=e[0]:e.length===2?t={name:e[0],test:e[1]}:t={name:e[0],message:e[1],test:e[2]},t.message===void 0&&(t.message=Th.mixed.default),typeof t.test!="function")throw new TypeError("`test` is a required parameters");let i=this.clone(),n=(0,db.default)(t),s=t.exclusive||t.name&&i.exclusiveTests[t.name]===!0;if(t.exclusive&&!t.name)throw new TypeError("Exclusive tests must provide a unique `name` identifying the test");return t.name&&(i.exclusiveTests[t.name]=!!t.exclusive),i.tests=i.tests.filter(o=>!(o.OPTIONS.name===t.name&&(s||o.OPTIONS.test===n.OPTIONS.test))),i.tests.push(n),i}when(e,t){!Array.isArray(e)&&typeof e!="string"&&(t=e,e=".");let i=this.clone(),n=(0,HHe.default)(e).map(s=>new KHe.default(s));return n.forEach(s=>{s.isSibling&&i.deps.push(s.key)}),i.conditions.push(new MHe.default(n,t)),i}typeError(e){var t=this.clone();return t._typeError=(0,db.default)({message:e,name:"typeError",test(i){return i!==void 0&&!this.schema.isType(i)?this.createError({params:{type:this.schema._type}}):!0}}),t}oneOf(e,t=Th.mixed.oneOf){var i=this.clone();return e.forEach(n=>{i._whitelist.add(n),i._blacklist.delete(n)}),i._whitelistError=(0,db.default)({message:t,name:"oneOf",test(n){if(n===void 0)return!0;let s=this.schema._whitelist;return s.has(n,this.resolve)?!0:this.createError({params:{values:s.toArray().join(", ")}})}}),i}notOneOf(e,t=Th.mixed.notOneOf){var i=this.clone();return e.forEach(n=>{i._blacklist.add(n),i._whitelist.delete(n)}),i._blacklistError=(0,db.default)({message:t,name:"notOneOf",test(n){let s=this.schema._blacklist;return s.has(n,this.resolve)?this.createError({params:{values:s.toArray().join(", ")}}):!0}}),i}strip(e=!0){let t=this.clone();return t.spec.strip=e,t}describe(){let e=this.clone(),{label:t,meta:i}=e.spec;return{meta:i,label:t,type:e.type,oneOf:e._whitelist.describe(),notOneOf:e._blacklist.describe(),tests:e.tests.map(s=>({name:s.OPTIONS.name,params:s.OPTIONS.params})).filter((s,o,a)=>a.findIndex(l=>l.name===s.name)===o)}}};Cb.default=uo;uo.prototype.__isYupSchema__=!0;for(let r of["validate","validateSync"])uo.prototype[`${r}At`]=function(e,t,i={}){let{parent:n,parentPath:s,schema:o}=(0,UHe.getIn)(this,e,t,i.context);return o[r](n&&n[s],Fs({},i,{parent:n,path:e}))};for(let r of["equals","is"])uo.prototype[r]=uo.prototype.oneOf;for(let r of["not","nope"])uo.prototype[r]=uo.prototype.notOneOf;uo.prototype.optional=uo.prototype.notRequired});var wre=w(Im=>{"use strict";Object.defineProperty(Im,"__esModule",{value:!0});Im.create=yre;Im.default=void 0;var GHe=YHe(sA());function YHe(r){return r&&r.__esModule?r:{default:r}}var LT=GHe.default,jHe=LT;Im.default=jHe;function yre(){return new LT}yre.prototype=LT.prototype});var Lh=w(mb=>{"use strict";Object.defineProperty(mb,"__esModule",{value:!0});mb.default=void 0;var qHe=r=>r==null;mb.default=qHe});var vre=w(wm=>{"use strict";Object.defineProperty(wm,"__esModule",{value:!0});wm.create=Sre;wm.default=void 0;var JHe=Qre(sA()),Bre=iA(),bre=Qre(Lh());function Qre(r){return r&&r.__esModule?r:{default:r}}function Sre(){return new ym}var ym=class extends JHe.default{constructor(){super({type:"boolean"}),this.withMutation(()=>{this.transform(function(e){if(!this.isType(e)){if(/^(true|1)$/i.test(String(e)))return!0;if(/^(false|0)$/i.test(String(e)))return!1}return e})})}_typeCheck(e){return e instanceof Boolean&&(e=e.valueOf()),typeof e=="boolean"}isTrue(e=Bre.boolean.isValue){return this.test({message:e,name:"is-value",exclusive:!0,params:{value:"true"},test(t){return(0,bre.default)(t)||t===!0}})}isFalse(e=Bre.boolean.isValue){return this.test({message:e,name:"is-value",exclusive:!0,params:{value:"false"},test(t){return(0,bre.default)(t)||t===!1}})}};wm.default=ym;Sre.prototype=ym.prototype});var Dre=w(bm=>{"use strict";Object.defineProperty(bm,"__esModule",{value:!0});bm.create=Pre;bm.default=void 0;var ia=iA(),oA=xre(Lh()),WHe=xre(sA());function xre(r){return r&&r.__esModule?r:{default:r}}var zHe=/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/i,VHe=/^((https?|ftp):)?\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i,XHe=/^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$/i,ZHe=r=>(0,oA.default)(r)||r===r.trim(),_He={}.toString();function Pre(){return new Bm}var Bm=class extends WHe.default{constructor(){super({type:"string"}),this.withMutation(()=>{this.transform(function(e){if(this.isType(e)||Array.isArray(e))return e;let t=e!=null&&e.toString?e.toString():e;return t===_He?e:t})})}_typeCheck(e){return e instanceof String&&(e=e.valueOf()),typeof e=="string"}_isPresent(e){return super._isPresent(e)&&!!e.length}length(e,t=ia.string.length){return this.test({message:t,name:"length",exclusive:!0,params:{length:e},test(i){return(0,oA.default)(i)||i.length===this.resolve(e)}})}min(e,t=ia.string.min){return this.test({message:t,name:"min",exclusive:!0,params:{min:e},test(i){return(0,oA.default)(i)||i.length>=this.resolve(e)}})}max(e,t=ia.string.max){return this.test({name:"max",exclusive:!0,message:t,params:{max:e},test(i){return(0,oA.default)(i)||i.length<=this.resolve(e)}})}matches(e,t){let i=!1,n,s;return t&&(typeof t=="object"?{excludeEmptyString:i=!1,message:n,name:s}=t:n=t),this.test({name:s||"matches",message:n||ia.string.matches,params:{regex:e},test:o=>(0,oA.default)(o)||o===""&&i||o.search(e)!==-1})}email(e=ia.string.email){return this.matches(zHe,{name:"email",message:e,excludeEmptyString:!0})}url(e=ia.string.url){return this.matches(VHe,{name:"url",message:e,excludeEmptyString:!0})}uuid(e=ia.string.uuid){return this.matches(XHe,{name:"uuid",message:e,excludeEmptyString:!1})}ensure(){return this.default("").transform(e=>e===null?"":e)}trim(e=ia.string.trim){return this.transform(t=>t!=null?t.trim():t).test({message:e,name:"trim",test:ZHe})}lowercase(e=ia.string.lowercase){return this.transform(t=>(0,oA.default)(t)?t:t.toLowerCase()).test({message:e,name:"string_case",exclusive:!0,test:t=>(0,oA.default)(t)||t===t.toLowerCase()})}uppercase(e=ia.string.uppercase){return this.transform(t=>(0,oA.default)(t)?t:t.toUpperCase()).test({message:e,name:"string_case",exclusive:!0,test:t=>(0,oA.default)(t)||t===t.toUpperCase()})}};bm.default=Bm;Pre.prototype=Bm.prototype});var Fre=w(Sm=>{"use strict";Object.defineProperty(Sm,"__esModule",{value:!0});Sm.create=Rre;Sm.default=void 0;var ru=iA(),iu=kre(Lh()),$He=kre(sA());function kre(r){return r&&r.__esModule?r:{default:r}}var eGe=r=>r!=+r;function Rre(){return new Qm}var Qm=class extends $He.default{constructor(){super({type:"number"}),this.withMutation(()=>{this.transform(function(e){let t=e;if(typeof t=="string"){if(t=t.replace(/\s/g,""),t==="")return NaN;t=+t}return this.isType(t)?t:parseFloat(t)})})}_typeCheck(e){return e instanceof Number&&(e=e.valueOf()),typeof e=="number"&&!eGe(e)}min(e,t=ru.number.min){return this.test({message:t,name:"min",exclusive:!0,params:{min:e},test(i){return(0,iu.default)(i)||i>=this.resolve(e)}})}max(e,t=ru.number.max){return this.test({message:t,name:"max",exclusive:!0,params:{max:e},test(i){return(0,iu.default)(i)||i<=this.resolve(e)}})}lessThan(e,t=ru.number.lessThan){return this.test({message:t,name:"max",exclusive:!0,params:{less:e},test(i){return(0,iu.default)(i)||i<this.resolve(e)}})}moreThan(e,t=ru.number.moreThan){return this.test({message:t,name:"min",exclusive:!0,params:{more:e},test(i){return(0,iu.default)(i)||i>this.resolve(e)}})}positive(e=ru.number.positive){return this.moreThan(0,e)}negative(e=ru.number.negative){return this.lessThan(0,e)}integer(e=ru.number.integer){return this.test({name:"integer",message:e,test:t=>(0,iu.default)(t)||Number.isInteger(t)})}truncate(){return this.transform(e=>(0,iu.default)(e)?e:e|0)}round(e){var t,i=["ceil","floor","round","trunc"];if(e=((t=e)==null?void 0:t.toLowerCase())||"round",e==="trunc")return this.truncate();if(i.indexOf(e.toLowerCase())===-1)throw new TypeError("Only valid options for round() are: "+i.join(", "));return this.transform(n=>(0,iu.default)(n)?n:Math[e](n))}};Sm.default=Qm;Rre.prototype=Qm.prototype});var Nre=w(OT=>{"use strict";Object.defineProperty(OT,"__esModule",{value:!0});OT.default=rGe;var tGe=/^(\d{4}|[+\-]\d{6})(?:-?(\d{2})(?:-?(\d{2}))?)?(?:[ T]?(\d{2}):?(\d{2})(?::?(\d{2})(?:[,\.](\d{1,}))?)?(?:(Z)|([+\-])(\d{2})(?::?(\d{2}))?)?)?$/;function rGe(r){var e=[1,4,5,6,7,10,11],t=0,i,n;if(n=tGe.exec(r)){for(var s=0,o;o=e[s];++s)n[o]=+n[o]||0;n[2]=(+n[2]||1)-1,n[3]=+n[3]||1,n[7]=n[7]?String(n[7]).substr(0,3):0,(n[8]===void 0||n[8]==="")&&(n[9]===void 0||n[9]==="")?i=+new Date(n[1],n[2],n[3],n[4],n[5],n[6],n[7]):(n[8]!=="Z"&&n[9]!==void 0&&(t=n[10]*60+n[11],n[9]==="+"&&(t=0-t)),i=Date.UTC(n[1],n[2],n[3],n[4],n[5]+t,n[6],n[7]))}else i=Date.parse?Date.parse(r):NaN;return i}});var Ore=w(vm=>{"use strict";Object.defineProperty(vm,"__esModule",{value:!0});vm.create=KT;vm.default=void 0;var iGe=Eb(Nre()),Tre=iA(),Lre=Eb(Lh()),nGe=Eb(tu()),sGe=Eb(sA());function Eb(r){return r&&r.__esModule?r:{default:r}}var MT=new Date(""),oGe=r=>Object.prototype.toString.call(r)==="[object Date]";function KT(){return new Oh}var Oh=class extends sGe.default{constructor(){super({type:"date"}),this.withMutation(()=>{this.transform(function(e){return this.isType(e)?e:(e=(0,iGe.default)(e),isNaN(e)?MT:new Date(e))})})}_typeCheck(e){return oGe(e)&&!isNaN(e.getTime())}prepareParam(e,t){let i;if(nGe.default.isRef(e))i=e;else{let n=this.cast(e);if(!this._typeCheck(n))throw new TypeError(`\`${t}\` must be a Date or a value that can be \`cast()\` to a Date`);i=n}return i}min(e,t=Tre.date.min){let i=this.prepareParam(e,"min");return this.test({message:t,name:"min",exclusive:!0,params:{min:e},test(n){return(0,Lre.default)(n)||n>=this.resolve(i)}})}max(e,t=Tre.date.max){var i=this.prepareParam(e,"max");return this.test({message:t,name:"max",exclusive:!0,params:{max:e},test(n){return(0,Lre.default)(n)||n<=this.resolve(i)}})}};vm.default=Oh;Oh.INVALID_DATE=MT;KT.prototype=Oh.prototype;KT.INVALID_DATE=MT});var Kre=w((Yut,Mre)=>{function aGe(r,e,t,i){var n=-1,s=r==null?0:r.length;for(i&&s&&(t=r[++n]);++n<s;)t=e(t,r[n],n,r);return t}Mre.exports=aGe});var Hre=w((jut,Ure)=>{function AGe(r){return function(e){return r==null?void 0:r[e]}}Ure.exports=AGe});var Yre=w((qut,Gre)=>{var lGe=Hre(),cGe={\u00C0:"A",\u00C1:"A",\u00C2:"A",\u00C3:"A",\u00C4:"A",\u00C5:"A",\u00E0:"a",\u00E1:"a",\u00E2:"a",\u00E3:"a",\u00E4:"a",\u00E5:"a",\u00C7:"C",\u00E7:"c",\u00D0:"D",\u00F0:"d",\u00C8:"E",\u00C9:"E",\u00CA:"E",\u00CB:"E",\u00E8:"e",\u00E9:"e",\u00EA:"e",\u00EB:"e",\u00CC:"I",\u00CD:"I",\u00CE:"I",\u00CF:"I",\u00EC:"i",\u00ED:"i",\u00EE:"i",\u00EF:"i",\u00D1:"N",\u00F1:"n",\u00D2:"O",\u00D3:"O",\u00D4:"O",\u00D5:"O",\u00D6:"O",\u00D8:"O",\u00F2:"o",\u00F3:"o",\u00F4:"o",\u00F5:"o",\u00F6:"o",\u00F8:"o",\u00D9:"U",\u00DA:"U",\u00DB:"U",\u00DC:"U",\u00F9:"u",\u00FA:"u",\u00FB:"u",\u00FC:"u",\u00DD:"Y",\u00FD:"y",\u00FF:"y",\u00C6:"Ae",\u00E6:"ae",\u00DE:"Th",\u00FE:"th",\u00DF:"ss",\u0100:"A",\u0102:"A",\u0104:"A",\u0101:"a",\u0103:"a",\u0105:"a",\u0106:"C",\u0108:"C",\u010A:"C",\u010C:"C",\u0107:"c",\u0109:"c",\u010B:"c",\u010D:"c",\u010E:"D",\u0110:"D",\u010F:"d",\u0111:"d",\u0112:"E",\u0114:"E",\u0116:"E",\u0118:"E",\u011A:"E",\u0113:"e",\u0115:"e",\u0117:"e",\u0119:"e",\u011B:"e",\u011C:"G",\u011E:"G",\u0120:"G",\u0122:"G",\u011D:"g",\u011F:"g",\u0121:"g",\u0123:"g",\u0124:"H",\u0126:"H",\u0125:"h",\u0127:"h",\u0128:"I",\u012A:"I",\u012C:"I",\u012E:"I",\u0130:"I",\u0129:"i",\u012B:"i",\u012D:"i",\u012F:"i",\u0131:"i",\u0134:"J",\u0135:"j",\u0136:"K",\u0137:"k",\u0138:"k",\u0139:"L",\u013B:"L",\u013D:"L",\u013F:"L",\u0141:"L",\u013A:"l",\u013C:"l",\u013E:"l",\u0140:"l",\u0142:"l",\u0143:"N",\u0145:"N",\u0147:"N",\u014A:"N",\u0144:"n",\u0146:"n",\u0148:"n",\u014B:"n",\u014C:"O",\u014E:"O",\u0150:"O",\u014D:"o",\u014F:"o",\u0151:"o",\u0154:"R",\u0156:"R",\u0158:"R",\u0155:"r",\u0157:"r",\u0159:"r",\u015A:"S",\u015C:"S",\u015E:"S",\u0160:"S",\u015B:"s",\u015D:"s",\u015F:"s",\u0161:"s",\u0162:"T",\u0164:"T",\u0166:"T",\u0163:"t",\u0165:"t",\u0167:"t",\u0168:"U",\u016A:"U",\u016C:"U",\u016E:"U",\u0170:"U",\u0172:"U",\u0169:"u",\u016B:"u",\u016D:"u",\u016F:"u",\u0171:"u",\u0173:"u",\u0174:"W",\u0175:"w",\u0176:"Y",\u0177:"y",\u0178:"Y",\u0179:"Z",\u017B:"Z",\u017D:"Z",\u017A:"z",\u017C:"z",\u017E:"z",\u0132:"IJ",\u0133:"ij",\u0152:"Oe",\u0153:"oe",\u0149:"'n",\u017F:"s"},uGe=lGe(cGe);Gre.exports=uGe});var qre=w((Jut,jre)=>{var gGe=Yre(),fGe=Vf(),hGe=/[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g,pGe="\\u0300-\\u036f",dGe="\\ufe20-\\ufe2f",CGe="\\u20d0-\\u20ff",mGe=pGe+dGe+CGe,EGe="["+mGe+"]",IGe=RegExp(EGe,"g");function yGe(r){return r=fGe(r),r&&r.replace(hGe,gGe).replace(IGe,"")}jre.exports=yGe});var Wre=w((Wut,Jre)=>{var wGe=/[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g;function BGe(r){return r.match(wGe)||[]}Jre.exports=BGe});var Vre=w((zut,zre)=>{var bGe=/[a-z][A-Z]|[A-Z]{2}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/;function QGe(r){return bGe.test(r)}zre.exports=QGe});var hie=w((Vut,fie)=>{var eie="\\ud800-\\udfff",SGe="\\u0300-\\u036f",vGe="\\ufe20-\\ufe2f",xGe="\\u20d0-\\u20ff",PGe=SGe+vGe+xGe,tie="\\u2700-\\u27bf",rie="a-z\\xdf-\\xf6\\xf8-\\xff",DGe="\\xac\\xb1\\xd7\\xf7",kGe="\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf",RGe="\\u2000-\\u206f",FGe=" \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000",iie="A-Z\\xc0-\\xd6\\xd8-\\xde",NGe="\\ufe0e\\ufe0f",nie=DGe+kGe+RGe+FGe,sie="['\u2019]",Xre="["+nie+"]",TGe="["+PGe+"]",oie="\\d+",LGe="["+tie+"]",aie="["+rie+"]",Aie="[^"+eie+nie+oie+tie+rie+iie+"]",OGe="\\ud83c[\\udffb-\\udfff]",MGe="(?:"+TGe+"|"+OGe+")",KGe="[^"+eie+"]",lie="(?:\\ud83c[\\udde6-\\uddff]){2}",cie="[\\ud800-\\udbff][\\udc00-\\udfff]",Mh="["+iie+"]",UGe="\\u200d",Zre="(?:"+aie+"|"+Aie+")",HGe="(?:"+Mh+"|"+Aie+")",_re="(?:"+sie+"(?:d|ll|m|re|s|t|ve))?",$re="(?:"+sie+"(?:D|LL|M|RE|S|T|VE))?",uie=MGe+"?",gie="["+NGe+"]?",GGe="(?:"+UGe+"(?:"+[KGe,lie,cie].join("|")+")"+gie+uie+")*",YGe="\\d*(?:1st|2nd|3rd|(?![123])\\dth)(?=\\b|[A-Z_])",jGe="\\d*(?:1ST|2ND|3RD|(?![123])\\dTH)(?=\\b|[a-z_])",qGe=gie+uie+GGe,JGe="(?:"+[LGe,lie,cie].join("|")+")"+qGe,WGe=RegExp([Mh+"?"+aie+"+"+_re+"(?="+[Xre,Mh,"$"].join("|")+")",HGe+"+"+$re+"(?="+[Xre,Mh+Zre,"$"].join("|")+")",Mh+"?"+Zre+"+"+_re,Mh+"+"+$re,jGe,YGe,oie,JGe].join("|"),"g");function zGe(r){return r.match(WGe)||[]}fie.exports=zGe});var die=w((Xut,pie)=>{var VGe=Wre(),XGe=Vre(),ZGe=Vf(),_Ge=hie();function $Ge(r,e,t){return r=ZGe(r),e=t?void 0:e,e===void 0?XGe(r)?_Ge(r):VGe(r):r.match(e)||[]}pie.exports=$Ge});var UT=w((Zut,Cie)=>{var eYe=Kre(),tYe=qre(),rYe=die(),iYe="['\u2019]",nYe=RegExp(iYe,"g");function sYe(r){return function(e){return eYe(rYe(tYe(e).replace(nYe,"")),r,"")}}Cie.exports=sYe});var Eie=w((_ut,mie)=>{var oYe=UT(),aYe=oYe(function(r,e,t){return r+(t?"_":"")+e.toLowerCase()});mie.exports=aYe});var yie=w(($ut,Iie)=>{var AYe=PB(),lYe=UT(),cYe=lYe(function(r,e,t){return e=e.toLowerCase(),r+(t?AYe(e):e)});Iie.exports=cYe});var Bie=w((egt,wie)=>{var uYe=bh(),gYe=uT(),fYe=vT();function hYe(r,e){var t={};return e=fYe(e,3),gYe(r,function(i,n,s){uYe(t,e(i,n,s),i)}),t}wie.exports=hYe});var Qie=w((tgt,HT)=>{HT.exports=function(r){return bie(pYe(r),r)};HT.exports.array=bie;function bie(r,e){var t=r.length,i=new Array(t),n={},s=t,o=dYe(e),a=CYe(r);for(e.forEach(function(c){if(!a.has(c[0])||!a.has(c[1]))throw new Error("Unknown node. There is an unknown node in the supplied edges.")});s--;)n[s]||l(r[s],s,new Set);return i;function l(c,u,g){if(g.has(c)){var f;try{f=", node was:"+JSON.stringify(c)}catch{f=""}throw new Error("Cyclic dependency"+f)}if(!a.has(c))throw new Error("Found unknown node. Make sure to provided all involved nodes. Unknown node: "+JSON.stringify(c));if(!n[u]){n[u]=!0;var h=o.get(c)||new Set;if(h=Array.from(h),u=h.length){g.add(c);do{var p=h[--u];l(p,a.get(p),g)}while(u);g.delete(c)}i[--t]=c}}}function pYe(r){for(var e=new Set,t=0,i=r.length;t<i;t++){var n=r[t];e.add(n[0]),e.add(n[1])}return Array.from(e)}function dYe(r){for(var e=new Map,t=0,i=r.length;t<i;t++){var n=r[t];e.has(n[0])||e.set(n[0],new Set),e.has(n[1])||e.set(n[1],new Set),e.get(n[0]).add(n[1])}return e}function CYe(r){for(var e=new Map,t=0,i=r.length;t<i;t++)e.set(r[t],t);return e}});var Sie=w(GT=>{"use strict";Object.defineProperty(GT,"__esModule",{value:!0});GT.default=BYe;var mYe=Ib(am()),EYe=Ib(Qie()),IYe=pm(),yYe=Ib(tu()),wYe=Ib(xh());function Ib(r){return r&&r.__esModule?r:{default:r}}function BYe(r,e=[]){let t=[],i=[];function n(s,o){var a=(0,IYe.split)(s)[0];~i.indexOf(a)||i.push(a),~e.indexOf(`${o}-${a}`)||t.push([o,a])}for(let s in r)if((0,mYe.default)(r,s)){let o=r[s];~i.indexOf(s)||i.push(s),yYe.default.isRef(o)&&o.isSibling?n(o.path,s):(0,wYe.default)(o)&&"deps"in o&&o.deps.forEach(a=>n(a,s))}return EYe.default.array(i,t).reverse()}});var xie=w(YT=>{"use strict";Object.defineProperty(YT,"__esModule",{value:!0});YT.default=bYe;function vie(r,e){let t=1/0;return r.some((i,n)=>{var s;if(((s=e.path)==null?void 0:s.indexOf(i))!==-1)return t=n,!0}),t}function bYe(r){return(e,t)=>vie(r,e)-vie(r,t)}});var Tie=w(Pm=>{"use strict";Object.defineProperty(Pm,"__esModule",{value:!0});Pm.create=Nie;Pm.default=void 0;var Pie=na(am()),Die=na(Eie()),QYe=na(yie()),SYe=na(Bie()),vYe=na(xT()),xYe=pm(),kie=iA(),PYe=na(Sie()),Fie=na(xie()),DYe=na(ib()),kYe=na(_c()),jT=na(sA());function na(r){return r&&r.__esModule?r:{default:r}}function Kh(){return Kh=Object.assign||function(r){for(var e=1;e<arguments.length;e++){var t=arguments[e];for(var i in t)Object.prototype.hasOwnProperty.call(t,i)&&(r[i]=t[i])}return r},Kh.apply(this,arguments)}var Rie=r=>Object.prototype.toString.call(r)==="[object Object]";function RYe(r,e){let t=Object.keys(r.fields);return Object.keys(e).filter(i=>t.indexOf(i)===-1)}var FYe=(0,Fie.default)([]),xm=class extends jT.default{constructor(e){super({type:"object"}),this.fields=Object.create(null),this._sortErrors=FYe,this._nodes=[],this._excludedEdges=[],this.withMutation(()=>{this.transform(function(i){if(typeof i=="string")try{i=JSON.parse(i)}catch{i=null}return this.isType(i)?i:null}),e&&this.shape(e)})}_typeCheck(e){return Rie(e)||typeof e=="function"}_cast(e,t={}){var i;let n=super._cast(e,t);if(n===void 0)return this.getDefault();if(!this._typeCheck(n))return n;let s=this.fields,o=(i=t.stripUnknown)!=null?i:this.spec.noUnknown,a=this._nodes.concat(Object.keys(n).filter(g=>this._nodes.indexOf(g)===-1)),l={},c=Kh({},t,{parent:l,__validating:t.__validating||!1}),u=!1;for(let g of a){let f=s[g],h=(0,Pie.default)(n,g);if(f){let p,C=n[g];c.path=(t.path?`${t.path}.`:"")+g,f=f.resolve({value:C,context:t.context,parent:l});let y="spec"in f?f.spec:void 0,B=y==null?void 0:y.strict;if(y!=null&&y.strip){u=u||g in n;continue}p=!t.__validating||!B?f.cast(n[g],c):n[g],p!==void 0&&(l[g]=p)}else h&&!o&&(l[g]=n[g]);l[g]!==n[g]&&(u=!0)}return u?l:n}_validate(e,t={},i){let n=[],{sync:s,from:o=[],originalValue:a=e,abortEarly:l=this.spec.abortEarly,recursive:c=this.spec.recursive}=t;o=[{schema:this,value:a},...o],t.__validating=!0,t.originalValue=a,t.from=o,super._validate(e,t,(u,g)=>{if(u){if(!kYe.default.isError(u)||l)return void i(u,g);n.push(u)}if(!c||!Rie(g)){i(n[0]||null,g);return}a=a||g;let f=this._nodes.map(h=>(p,C)=>{let y=h.indexOf(".")===-1?(t.path?`${t.path}.`:"")+h:`${t.path||""}["${h}"]`,B=this.fields[h];if(B&&"validate"in B){B.validate(g[h],Kh({},t,{path:y,from:o,strict:!0,parent:g,originalValue:a[h]}),C);return}C(null)});(0,DYe.default)({sync:s,tests:f,value:g,errors:n,endEarly:l,sort:this._sortErrors,path:t.path},i)})}clone(e){let t=super.clone(e);return t.fields=Kh({},this.fields),t._nodes=this._nodes,t._excludedEdges=this._excludedEdges,t._sortErrors=this._sortErrors,t}concat(e){let t=super.concat(e),i=t.fields;for(let[n,s]of Object.entries(this.fields)){let o=i[n];o===void 0?i[n]=s:o instanceof jT.default&&s instanceof jT.default&&(i[n]=s.concat(o))}return t.withMutation(()=>t.shape(i))}getDefaultFromShape(){let e={};return this._nodes.forEach(t=>{let i=this.fields[t];e[t]="default"in i?i.getDefault():void 0}),e}_getDefault(){if("default"in this.spec)return super._getDefault();if(!!this._nodes.length)return this.getDefaultFromShape()}shape(e,t=[]){let i=this.clone(),n=Object.assign(i.fields,e);if(i.fields=n,i._sortErrors=(0,Fie.default)(Object.keys(n)),t.length){Array.isArray(t[0])||(t=[t]);let s=t.map(([o,a])=>`${o}-${a}`);i._excludedEdges=i._excludedEdges.concat(s)}return i._nodes=(0,PYe.default)(n,i._excludedEdges),i}pick(e){let t={};for(let i of e)this.fields[i]&&(t[i]=this.fields[i]);return this.clone().withMutation(i=>(i.fields={},i.shape(t)))}omit(e){let t=this.clone(),i=t.fields;t.fields={};for(let n of e)delete i[n];return t.withMutation(()=>t.shape(i))}from(e,t,i){let n=(0,xYe.getter)(e,!0);return this.transform(s=>{if(s==null)return s;let o=s;return(0,Pie.default)(s,e)&&(o=Kh({},s),i||delete o[e],o[t]=n(s)),o})}noUnknown(e=!0,t=kie.object.noUnknown){typeof e=="string"&&(t=e,e=!0);let i=this.test({name:"noUnknown",exclusive:!0,message:t,test(n){if(n==null)return!0;let s=RYe(this.schema,n);return!e||s.length===0||this.createError({params:{unknown:s.join(", ")}})}});return i.spec.noUnknown=e,i}unknown(e=!0,t=kie.object.noUnknown){return this.noUnknown(!e,t)}transformKeys(e){return this.transform(t=>t&&(0,SYe.default)(t,(i,n)=>e(n)))}camelCase(){return this.transformKeys(QYe.default)}snakeCase(){return this.transformKeys(Die.default)}constantCase(){return this.transformKeys(e=>(0,Die.default)(e).toUpperCase())}describe(){let e=super.describe();return e.fields=(0,vYe.default)(this.fields,t=>t.describe()),e}};Pm.default=xm;function Nie(r){return new xm(r)}Nie.prototype=xm.prototype});var Oie=w(km=>{"use strict";Object.defineProperty(km,"__esModule",{value:!0});km.create=Lie;km.default=void 0;var qT=Uh(Lh()),NYe=Uh(xh()),TYe=Uh(om()),JT=iA(),LYe=Uh(ib()),OYe=Uh(_c()),MYe=Uh(sA());function Uh(r){return r&&r.__esModule?r:{default:r}}function yb(){return yb=Object.assign||function(r){for(var e=1;e<arguments.length;e++){var t=arguments[e];for(var i in t)Object.prototype.hasOwnProperty.call(t,i)&&(r[i]=t[i])}return r},yb.apply(this,arguments)}function Lie(r){return new Dm(r)}var Dm=class extends MYe.default{constructor(e){super({type:"array"}),this.innerType=e,this.withMutation(()=>{this.transform(function(t){if(typeof t=="string")try{t=JSON.parse(t)}catch{t=null}return this.isType(t)?t:null})})}_typeCheck(e){return Array.isArray(e)}get _subType(){return this.innerType}_cast(e,t){let i=super._cast(e,t);if(!this._typeCheck(i)||!this.innerType)return i;let n=!1,s=i.map((o,a)=>{let l=this.innerType.cast(o,yb({},t,{path:`${t.path||""}[${a}]`}));return l!==o&&(n=!0),l});return n?s:i}_validate(e,t={},i){var n,s;let o=[],a=t.sync,l=t.path,c=this.innerType,u=(n=t.abortEarly)!=null?n:this.spec.abortEarly,g=(s=t.recursive)!=null?s:this.spec.recursive,f=t.originalValue!=null?t.originalValue:e;super._validate(e,t,(h,p)=>{if(h){if(!OYe.default.isError(h)||u)return void i(h,p);o.push(h)}if(!g||!c||!this._typeCheck(p)){i(o[0]||null,p);return}f=f||p;let C=new Array(p.length);for(let y=0;y<p.length;y++){let B=p[y],v=`${t.path||""}[${y}]`,D=yb({},t,{path:v,strict:!0,parent:p,index:y,originalValue:f[y]});C[y]=(T,H)=>c.validate(B,D,H)}(0,LYe.default)({sync:a,path:l,value:p,errors:o,endEarly:u,tests:C},i)})}clone(e){let t=super.clone(e);return t.innerType=this.innerType,t}concat(e){let t=super.concat(e);return t.innerType=this.innerType,e.innerType&&(t.innerType=t.innerType?t.innerType.concat(e.innerType):e.innerType),t}of(e){let t=this.clone();if(!(0,NYe.default)(e))throw new TypeError("`array.of()` sub-schema must be a valid yup schema not: "+(0,TYe.default)(e));return t.innerType=e,t}length(e,t=JT.array.length){return this.test({message:t,name:"length",exclusive:!0,params:{length:e},test(i){return(0,qT.default)(i)||i.length===this.resolve(e)}})}min(e,t){return t=t||JT.array.min,this.test({message:t,name:"min",exclusive:!0,params:{min:e},test(i){return(0,qT.default)(i)||i.length>=this.resolve(e)}})}max(e,t){return t=t||JT.array.max,this.test({message:t,name:"max",exclusive:!0,params:{max:e},test(i){return(0,qT.default)(i)||i.length<=this.resolve(e)}})}ensure(){return this.default(()=>[]).transform((e,t)=>this._typeCheck(e)?e:t==null?[]:[].concat(t))}compact(e){let t=e?(i,n,s)=>!e(i,n,s):i=>!!i;return this.transform(i=>i!=null?i.filter(t):i)}describe(){let e=super.describe();return this.innerType&&(e.innerType=this.innerType.describe()),e}nullable(e=!0){return super.nullable(e)}defined(){return super.defined()}required(e){return super.required(e)}};km.default=Dm;Lie.prototype=Dm.prototype});var Mie=w(Rm=>{"use strict";Object.defineProperty(Rm,"__esModule",{value:!0});Rm.create=HYe;Rm.default=void 0;var KYe=UYe(xh());function UYe(r){return r&&r.__esModule?r:{default:r}}function HYe(r){return new wb(r)}var wb=class{constructor(e){this.type="lazy",this.__isYupSchema__=!0,this._resolve=(t,i={})=>{let n=this.builder(t,i);if(!(0,KYe.default)(n))throw new TypeError("lazy() functions must return a valid schema");return n.resolve(i)},this.builder=e}resolve(e){return this._resolve(e.value,e)}cast(e,t){return this._resolve(e,t).cast(e,t)}validate(e,t,i){return this._resolve(e,t).validate(e,t,i)}validateSync(e,t){return this._resolve(e,t).validateSync(e,t)}validateAt(e,t,i){return this._resolve(t,i).validateAt(e,t,i)}validateSyncAt(e,t,i){return this._resolve(t,i).validateSyncAt(e,t,i)}describe(){return null}isValid(e,t){return this._resolve(e,t).isValid(e,t)}isValidSync(e,t){return this._resolve(e,t).isValidSync(e,t)}},GYe=wb;Rm.default=GYe});var Kie=w(WT=>{"use strict";Object.defineProperty(WT,"__esModule",{value:!0});WT.default=qYe;var YYe=jYe(iA());function jYe(r){return r&&r.__esModule?r:{default:r}}function qYe(r){Object.keys(r).forEach(e=>{Object.keys(r[e]).forEach(t=>{YYe.default[e][t]=r[e][t]})})}});var VT=w(yr=>{"use strict";Object.defineProperty(yr,"__esModule",{value:!0});yr.addMethod=_Ye;Object.defineProperty(yr,"MixedSchema",{enumerable:!0,get:function(){return Uie.default}});Object.defineProperty(yr,"mixed",{enumerable:!0,get:function(){return Uie.create}});Object.defineProperty(yr,"BooleanSchema",{enumerable:!0,get:function(){return zT.default}});Object.defineProperty(yr,"bool",{enumerable:!0,get:function(){return zT.create}});Object.defineProperty(yr,"boolean",{enumerable:!0,get:function(){return zT.create}});Object.defineProperty(yr,"StringSchema",{enumerable:!0,get:function(){return Hie.default}});Object.defineProperty(yr,"string",{enumerable:!0,get:function(){return Hie.create}});Object.defineProperty(yr,"NumberSchema",{enumerable:!0,get:function(){return Gie.default}});Object.defineProperty(yr,"number",{enumerable:!0,get:function(){return Gie.create}});Object.defineProperty(yr,"DateSchema",{enumerable:!0,get:function(){return Yie.default}});Object.defineProperty(yr,"date",{enumerable:!0,get:function(){return Yie.create}});Object.defineProperty(yr,"ObjectSchema",{enumerable:!0,get:function(){return jie.default}});Object.defineProperty(yr,"object",{enumerable:!0,get:function(){return jie.create}});Object.defineProperty(yr,"ArraySchema",{enumerable:!0,get:function(){return qie.default}});Object.defineProperty(yr,"array",{enumerable:!0,get:function(){return qie.create}});Object.defineProperty(yr,"ref",{enumerable:!0,get:function(){return JYe.create}});Object.defineProperty(yr,"lazy",{enumerable:!0,get:function(){return WYe.create}});Object.defineProperty(yr,"ValidationError",{enumerable:!0,get:function(){return zYe.default}});Object.defineProperty(yr,"reach",{enumerable:!0,get:function(){return VYe.default}});Object.defineProperty(yr,"isSchema",{enumerable:!0,get:function(){return Jie.default}});Object.defineProperty(yr,"setLocale",{enumerable:!0,get:function(){return XYe.default}});Object.defineProperty(yr,"BaseSchema",{enumerable:!0,get:function(){return ZYe.default}});var Uie=nu(wre()),zT=nu(vre()),Hie=nu(Dre()),Gie=nu(Fre()),Yie=nu(Ore()),jie=nu(Tie()),qie=nu(Oie()),JYe=tu(),WYe=Mie(),zYe=Fm(_c()),VYe=Fm(TT()),Jie=Fm(xh()),XYe=Fm(Kie()),ZYe=Fm(sA());function Fm(r){return r&&r.__esModule?r:{default:r}}function Wie(){if(typeof WeakMap!="function")return null;var r=new WeakMap;return Wie=function(){return r},r}function nu(r){if(r&&r.__esModule)return r;if(r===null||typeof r!="object"&&typeof r!="function")return{default:r};var e=Wie();if(e&&e.has(r))return e.get(r);var t={},i=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var n in r)if(Object.prototype.hasOwnProperty.call(r,n)){var s=i?Object.getOwnPropertyDescriptor(r,n):null;s&&(s.get||s.set)?Object.defineProperty(t,n,s):t[n]=r[n]}return t.default=r,e&&e.set(r,t),t}function _Ye(r,e,t){if(!r||!(0,Jie.default)(r.prototype))throw new TypeError("You must provide a yup schema constructor function");if(typeof e!="string")throw new TypeError("A Method name must be provided");if(typeof t!="function")throw new TypeError("Method function must be provided");r.prototype[e]=t}});var _ie=w((ygt,Tm)=>{"use strict";var tje=process.env.TERM_PROGRAM==="Hyper",rje=process.platform==="win32",Vie=process.platform==="linux",XT={ballotDisabled:"\u2612",ballotOff:"\u2610",ballotOn:"\u2611",bullet:"\u2022",bulletWhite:"\u25E6",fullBlock:"\u2588",heart:"\u2764",identicalTo:"\u2261",line:"\u2500",mark:"\u203B",middot:"\xB7",minus:"\uFF0D",multiplication:"\xD7",obelus:"\xF7",pencilDownRight:"\u270E",pencilRight:"\u270F",pencilUpRight:"\u2710",percent:"%",pilcrow2:"\u2761",pilcrow:"\xB6",plusMinus:"\xB1",section:"\xA7",starsOff:"\u2606",starsOn:"\u2605",upDownArrow:"\u2195"},Xie=Object.assign({},XT,{check:"\u221A",cross:"\xD7",ellipsisLarge:"...",ellipsis:"...",info:"i",question:"?",questionSmall:"?",pointer:">",pointerSmall:"\xBB",radioOff:"( )",radioOn:"(*)",warning:"\u203C"}),Zie=Object.assign({},XT,{ballotCross:"\u2718",check:"\u2714",cross:"\u2716",ellipsisLarge:"\u22EF",ellipsis:"\u2026",info:"\u2139",question:"?",questionFull:"\uFF1F",questionSmall:"\uFE56",pointer:Vie?"\u25B8":"\u276F",pointerSmall:Vie?"\u2023":"\u203A",radioOff:"\u25EF",radioOn:"\u25C9",warning:"\u26A0"});Tm.exports=rje&&!tje?Xie:Zie;Reflect.defineProperty(Tm.exports,"common",{enumerable:!1,value:XT});Reflect.defineProperty(Tm.exports,"windows",{enumerable:!1,value:Xie});Reflect.defineProperty(Tm.exports,"other",{enumerable:!1,value:Zie})});var go=w((wgt,ZT)=>{"use strict";var ije=r=>r!==null&&typeof r=="object"&&!Array.isArray(r),nje=/[\u001b\u009b][[\]#;?()]*(?:(?:(?:[^\W_]*;?[^\W_]*)\u0007)|(?:(?:[0-9]{1,4}(;[0-9]{0,4})*)?[~0-9=<>cf-nqrtyA-PRZ]))/g,$ie=()=>{let r={enabled:!0,visible:!0,styles:{},keys:{}};"FORCE_COLOR"in process.env&&(r.enabled=process.env.FORCE_COLOR!=="0");let e=s=>{let o=s.open=`\x1B[${s.codes[0]}m`,a=s.close=`\x1B[${s.codes[1]}m`,l=s.regex=new RegExp(`\\u001b\\[${s.codes[1]}m`,"g");return s.wrap=(c,u)=>{c.includes(a)&&(c=c.replace(l,a+o));let g=o+c+a;return u?g.replace(/\r*\n/g,`${a}$&${o}`):g},s},t=(s,o,a)=>typeof s=="function"?s(o):s.wrap(o,a),i=(s,o)=>{if(s===""||s==null)return"";if(r.enabled===!1)return s;if(r.visible===!1)return"";let a=""+s,l=a.includes(`
-`),c=o.length;for(c>0&&o.includes("unstyle")&&(o=[...new Set(["unstyle",...o])].reverse());c-- >0;)a=t(r.styles[o[c]],a,l);return a},n=(s,o,a)=>{r.styles[s]=e({name:s,codes:o}),(r.keys[a]||(r.keys[a]=[])).push(s),Reflect.defineProperty(r,s,{configurable:!0,enumerable:!0,set(c){r.alias(s,c)},get(){let c=u=>i(u,c.stack);return Reflect.setPrototypeOf(c,r),c.stack=this.stack?this.stack.concat(s):[s],c}})};return n("reset",[0,0],"modifier"),n("bold",[1,22],"modifier"),n("dim",[2,22],"modifier"),n("italic",[3,23],"modifier"),n("underline",[4,24],"modifier"),n("inverse",[7,27],"modifier"),n("hidden",[8,28],"modifier"),n("strikethrough",[9,29],"modifier"),n("black",[30,39],"color"),n("red",[31,39],"color"),n("green",[32,39],"color"),n("yellow",[33,39],"color"),n("blue",[34,39],"color"),n("magenta",[35,39],"color"),n("cyan",[36,39],"color"),n("white",[37,39],"color"),n("gray",[90,39],"color"),n("grey",[90,39],"color"),n("bgBlack",[40,49],"bg"),n("bgRed",[41,49],"bg"),n("bgGreen",[42,49],"bg"),n("bgYellow",[43,49],"bg"),n("bgBlue",[44,49],"bg"),n("bgMagenta",[45,49],"bg"),n("bgCyan",[46,49],"bg"),n("bgWhite",[47,49],"bg"),n("blackBright",[90,39],"bright"),n("redBright",[91,39],"bright"),n("greenBright",[92,39],"bright"),n("yellowBright",[93,39],"bright"),n("blueBright",[94,39],"bright"),n("magentaBright",[95,39],"bright"),n("cyanBright",[96,39],"bright"),n("whiteBright",[97,39],"bright"),n("bgBlackBright",[100,49],"bgBright"),n("bgRedBright",[101,49],"bgBright"),n("bgGreenBright",[102,49],"bgBright"),n("bgYellowBright",[103,49],"bgBright"),n("bgBlueBright",[104,49],"bgBright"),n("bgMagentaBright",[105,49],"bgBright"),n("bgCyanBright",[106,49],"bgBright"),n("bgWhiteBright",[107,49],"bgBright"),r.ansiRegex=nje,r.hasColor=r.hasAnsi=s=>(r.ansiRegex.lastIndex=0,typeof s=="string"&&s!==""&&r.ansiRegex.test(s)),r.alias=(s,o)=>{let a=typeof o=="string"?r[o]:o;if(typeof a!="function")throw new TypeError("Expected alias to be the name of an existing color (string) or a function");a.stack||(Reflect.defineProperty(a,"name",{value:s}),r.styles[s]=a,a.stack=[s]),Reflect.defineProperty(r,s,{configurable:!0,enumerable:!0,set(l){r.alias(s,l)},get(){let l=c=>i(c,l.stack);return Reflect.setPrototypeOf(l,r),l.stack=this.stack?this.stack.concat(a.stack):a.stack,l}})},r.theme=s=>{if(!ije(s))throw new TypeError("Expected theme to be an object");for(let o of Object.keys(s))r.alias(o,s[o]);return r},r.alias("unstyle",s=>typeof s=="string"&&s!==""?(r.ansiRegex.lastIndex=0,s.replace(r.ansiRegex,"")):""),r.alias("noop",s=>s),r.none=r.clear=r.noop,r.stripColor=r.unstyle,r.symbols=_ie(),r.define=n,r};ZT.exports=$ie();ZT.exports.create=$ie});var ji=w(Tt=>{"use strict";var sje=Object.prototype.toString,Ns=go(),ene=!1,_T=[],tne={yellow:"blue",cyan:"red",green:"magenta",black:"white",blue:"yellow",red:"cyan",magenta:"green",white:"black"};Tt.longest=(r,e)=>r.reduce((t,i)=>Math.max(t,e?i[e].length:i.length),0);Tt.hasColor=r=>!!r&&Ns.hasColor(r);var bb=Tt.isObject=r=>r!==null&&typeof r=="object"&&!Array.isArray(r);Tt.nativeType=r=>sje.call(r).slice(8,-1).toLowerCase().replace(/\s/g,"");Tt.isAsyncFn=r=>Tt.nativeType(r)==="asyncfunction";Tt.isPrimitive=r=>r!=null&&typeof r!="object"&&typeof r!="function";Tt.resolve=(r,e,...t)=>typeof e=="function"?e.call(r,...t):e;Tt.scrollDown=(r=[])=>[...r.slice(1),r[0]];Tt.scrollUp=(r=[])=>[r.pop(),...r];Tt.reorder=(r=[])=>{let e=r.slice();return e.sort((t,i)=>t.index>i.index?1:t.index<i.index?-1:0),e};Tt.swap=(r,e,t)=>{let i=r.length,n=t===i?0:t<0?i-1:t,s=r[e];r[e]=r[n],r[n]=s};Tt.width=(r,e=80)=>{let t=r&&r.columns?r.columns:e;return r&&typeof r.getWindowSize=="function"&&(t=r.getWindowSize()[0]),process.platform==="win32"?t-1:t};Tt.height=(r,e=20)=>{let t=r&&r.rows?r.rows:e;return r&&typeof r.getWindowSize=="function"&&(t=r.getWindowSize()[1]),t};Tt.wordWrap=(r,e={})=>{if(!r)return r;typeof e=="number"&&(e={width:e});let{indent:t="",newline:i=`
-`+t,width:n=80}=e,s=(i+t).match(/[^\S\n]/g)||[];n-=s.length;let o=`.{1,${n}}([\\s\\u200B]+|$)|[^\\s\\u200B]+?([\\s\\u200B]+|$)`,a=r.trim(),l=new RegExp(o,"g"),c=a.match(l)||[];return c=c.map(u=>u.replace(/\n$/,"")),e.padEnd&&(c=c.map(u=>u.padEnd(n," "))),e.padStart&&(c=c.map(u=>u.padStart(n," "))),t+c.join(i)};Tt.unmute=r=>{let e=r.stack.find(i=>Ns.keys.color.includes(i));return e?Ns[e]:r.stack.find(i=>i.slice(2)==="bg")?Ns[e.slice(2)]:i=>i};Tt.pascal=r=>r?r[0].toUpperCase()+r.slice(1):"";Tt.inverse=r=>{if(!r||!r.stack)return r;let e=r.stack.find(i=>Ns.keys.color.includes(i));if(e){let i=Ns["bg"+Tt.pascal(e)];return i?i.black:r}let t=r.stack.find(i=>i.slice(0,2)==="bg");return t?Ns[t.slice(2).toLowerCase()]||r:Ns.none};Tt.complement=r=>{if(!r||!r.stack)return r;let e=r.stack.find(i=>Ns.keys.color.includes(i)),t=r.stack.find(i=>i.slice(0,2)==="bg");if(e&&!t)return Ns[tne[e]||e];if(t){let i=t.slice(2).toLowerCase(),n=tne[i];return n&&Ns["bg"+Tt.pascal(n)]||r}return Ns.none};Tt.meridiem=r=>{let e=r.getHours(),t=r.getMinutes(),i=e>=12?"pm":"am";e=e%12;let n=e===0?12:e,s=t<10?"0"+t:t;return n+":"+s+" "+i};Tt.set=(r={},e="",t)=>e.split(".").reduce((i,n,s,o)=>{let a=o.length-1>s?i[n]||{}:t;return!Tt.isObject(a)&&s<o.length-1&&(a={}),i[n]=a},r);Tt.get=(r={},e="",t)=>{let i=r[e]==null?e.split(".").reduce((n,s)=>n&&n[s],r):r[e];return i==null?t:i};Tt.mixin=(r,e)=>{if(!bb(r))return e;if(!bb(e))return r;for(let t of Object.keys(e)){let i=Object.getOwnPropertyDescriptor(e,t);if(i.hasOwnProperty("value"))if(r.hasOwnProperty(t)&&bb(i.value)){let n=Object.getOwnPropertyDescriptor(r,t);bb(n.value)?r[t]=Tt.merge({},r[t],e[t]):Reflect.defineProperty(r,t,i)}else Reflect.defineProperty(r,t,i);else Reflect.defineProperty(r,t,i)}return r};Tt.merge=(...r)=>{let e={};for(let t of r)Tt.mixin(e,t);return e};Tt.mixinEmitter=(r,e)=>{let t=e.constructor.prototype;for(let i of Object.keys(t)){let n=t[i];typeof n=="function"?Tt.define(r,i,n.bind(e)):Tt.define(r,i,n)}};Tt.onExit=r=>{let e=(t,i)=>{ene||(ene=!0,_T.forEach(n=>n()),t===!0&&process.exit(128+i))};_T.length===0&&(process.once("SIGTERM",e.bind(null,!0,15)),process.once("SIGINT",e.bind(null,!0,2)),process.once("exit",e)),_T.push(r)};Tt.define=(r,e,t)=>{Reflect.defineProperty(r,e,{value:t})};Tt.defineExport=(r,e,t)=>{let i;Reflect.defineProperty(r,e,{enumerable:!0,configurable:!0,set(n){i=n},get(){return i?i():t()}})}});var rne=w(Gh=>{"use strict";Gh.ctrl={a:"first",b:"backward",c:"cancel",d:"deleteForward",e:"last",f:"forward",g:"reset",i:"tab",k:"cutForward",l:"reset",n:"newItem",m:"cancel",j:"submit",p:"search",r:"remove",s:"save",u:"undo",w:"cutLeft",x:"toggleCursor",v:"paste"};Gh.shift={up:"shiftUp",down:"shiftDown",left:"shiftLeft",right:"shiftRight",tab:"prev"};Gh.fn={up:"pageUp",down:"pageDown",left:"pageLeft",right:"pageRight",delete:"deleteForward"};Gh.option={b:"backward",f:"forward",d:"cutRight",left:"cutLeft",up:"altUp",down:"altDown"};Gh.keys={pageup:"pageUp",pagedown:"pageDown",home:"home",end:"end",cancel:"cancel",delete:"deleteForward",backspace:"delete",down:"down",enter:"submit",escape:"cancel",left:"left",space:"space",number:"number",return:"submit",right:"right",tab:"next",up:"up"}});var sne=w((Qgt,nne)=>{"use strict";var ine=J("readline"),oje=rne(),aje=/^(?:\x1b)([a-zA-Z0-9])$/,Aje=/^(?:\x1b+)(O|N|\[|\[\[)(?:(\d+)(?:;(\d+))?([~^$])|(?:1;)?(\d+)?([a-zA-Z]))/,lje={OP:"f1",OQ:"f2",OR:"f3",OS:"f4","[11~":"f1","[12~":"f2","[13~":"f3","[14~":"f4","[[A":"f1","[[B":"f2","[[C":"f3","[[D":"f4","[[E":"f5","[15~":"f5","[17~":"f6","[18~":"f7","[19~":"f8","[20~":"f9","[21~":"f10","[23~":"f11","[24~":"f12","[A":"up","[B":"down","[C":"right","[D":"left","[E":"clear","[F":"end","[H":"home",OA:"up",OB:"down",OC:"right",OD:"left",OE:"clear",OF:"end",OH:"home","[1~":"home","[2~":"insert","[3~":"delete","[4~":"end","[5~":"pageup","[6~":"pagedown","[[5~":"pageup","[[6~":"pagedown","[7~":"home","[8~":"end","[a":"up","[b":"down","[c":"right","[d":"left","[e":"clear","[2$":"insert","[3$":"delete","[5$":"pageup","[6$":"pagedown","[7$":"home","[8$":"end",Oa:"up",Ob:"down",Oc:"right",Od:"left",Oe:"clear","[2^":"insert","[3^":"delete","[5^":"pageup","[6^":"pagedown","[7^":"home","[8^":"end","[Z":"tab"};function cje(r){return["[a","[b","[c","[d","[e","[2$","[3$","[5$","[6$","[7$","[8$","[Z"].includes(r)}function uje(r){return["Oa","Ob","Oc","Od","Oe","[2^","[3^","[5^","[6^","[7^","[8^"].includes(r)}var Qb=(r="",e={})=>{let t,i={name:e.name,ctrl:!1,meta:!1,shift:!1,option:!1,sequence:r,raw:r,...e};if(Buffer.isBuffer(r)?r[0]>127&&r[1]===void 0?(r[0]-=128,r="\x1B"+String(r)):r=String(r):r!==void 0&&typeof r!="string"?r=String(r):r||(r=i.sequence||""),i.sequence=i.sequence||r||i.name,r==="\r")i.raw=void 0,i.name="return";else if(r===`
-`)i.name="enter";else if(r==="	")i.name="tab";else if(r==="\b"||r==="\x7F"||r==="\x1B\x7F"||r==="\x1B\b")i.name="backspace",i.meta=r.charAt(0)==="\x1B";else if(r==="\x1B"||r==="\x1B\x1B")i.name="escape",i.meta=r.length===2;else if(r===" "||r==="\x1B ")i.name="space",i.meta=r.length===2;else if(r<="")i.name=String.fromCharCode(r.charCodeAt(0)+"a".charCodeAt(0)-1),i.ctrl=!0;else if(r.length===1&&r>="0"&&r<="9")i.name="number";else if(r.length===1&&r>="a"&&r<="z")i.name=r;else if(r.length===1&&r>="A"&&r<="Z")i.name=r.toLowerCase(),i.shift=!0;else if(t=aje.exec(r))i.meta=!0,i.shift=/^[A-Z]$/.test(t[1]);else if(t=Aje.exec(r)){let n=[...r];n[0]==="\x1B"&&n[1]==="\x1B"&&(i.option=!0);let s=[t[1],t[2],t[4],t[6]].filter(Boolean).join(""),o=(t[3]||t[5]||1)-1;i.ctrl=!!(o&4),i.meta=!!(o&10),i.shift=!!(o&1),i.code=s,i.name=lje[s],i.shift=cje(s)||i.shift,i.ctrl=uje(s)||i.ctrl}return i};Qb.listen=(r={},e)=>{let{stdin:t}=r;if(!t||t!==process.stdin&&!t.isTTY)throw new Error("Invalid stream passed");let i=ine.createInterface({terminal:!0,input:t});ine.emitKeypressEvents(t,i);let n=(a,l)=>e(a,Qb(a,l),i),s=t.isRaw;return t.isTTY&&t.setRawMode(!0),t.on("keypress",n),i.resume(),()=>{t.isTTY&&t.setRawMode(s),t.removeListener("keypress",n),i.pause(),i.close()}};Qb.action=(r,e,t)=>{let i={...oje,...t};return e.ctrl?(e.action=i.ctrl[e.name],e):e.option&&i.option?(e.action=i.option[e.name],e):e.shift?(e.action=i.shift[e.name],e):(e.action=i.keys[e.name],e)};nne.exports=Qb});var ane=w((Sgt,one)=>{"use strict";one.exports=r=>{r.timers=r.timers||{};let e=r.options.timers;if(!!e)for(let t of Object.keys(e)){let i=e[t];typeof i=="number"&&(i={interval:i}),gje(r,t,i)}};function gje(r,e,t={}){let i=r.timers[e]={name:e,start:Date.now(),ms:0,tick:0},n=t.interval||120;i.frames=t.frames||[],i.loading=!0;let s=setInterval(()=>{i.ms=Date.now()-i.start,i.tick++,r.render()},n);return i.stop=()=>{i.loading=!1,clearInterval(s)},Reflect.defineProperty(i,"interval",{value:s}),r.once("close",()=>i.stop()),i.stop}});var lne=w((vgt,Ane)=>{"use strict";var{define:fje,width:hje}=ji(),$T=class{constructor(e){let t=e.options;fje(this,"_prompt",e),this.type=e.type,this.name=e.name,this.message="",this.header="",this.footer="",this.error="",this.hint="",this.input="",this.cursor=0,this.index=0,this.lines=0,this.tick=0,this.prompt="",this.buffer="",this.width=hje(t.stdout||process.stdout),Object.assign(this,t),this.name=this.name||this.message,this.message=this.message||this.name,this.symbols=e.symbols,this.styles=e.styles,this.required=new Set,this.cancelled=!1,this.submitted=!1}clone(){let e={...this};return e.status=this.status,e.buffer=Buffer.from(e.buffer),delete e.clone,e}set color(e){this._color=e}get color(){let e=this.prompt.styles;if(this.cancelled)return e.cancelled;if(this.submitted)return e.submitted;let t=this._color||e[this.status];return typeof t=="function"?t:e.pending}set loading(e){this._loading=e}get loading(){return typeof this._loading=="boolean"?this._loading:this.loadingChoices?"choices":!1}get status(){return this.cancelled?"cancelled":this.submitted?"submitted":"pending"}};Ane.exports=$T});var une=w((xgt,cne)=>{"use strict";var eL=ji(),Di=go(),tL={default:Di.noop,noop:Di.noop,set inverse(r){this._inverse=r},get inverse(){return this._inverse||eL.inverse(this.primary)},set complement(r){this._complement=r},get complement(){return this._complement||eL.complement(this.primary)},primary:Di.cyan,success:Di.green,danger:Di.magenta,strong:Di.bold,warning:Di.yellow,muted:Di.dim,disabled:Di.gray,dark:Di.dim.gray,underline:Di.underline,set info(r){this._info=r},get info(){return this._info||this.primary},set em(r){this._em=r},get em(){return this._em||this.primary.underline},set heading(r){this._heading=r},get heading(){return this._heading||this.muted.underline},set pending(r){this._pending=r},get pending(){return this._pending||this.primary},set submitted(r){this._submitted=r},get submitted(){return this._submitted||this.success},set cancelled(r){this._cancelled=r},get cancelled(){return this._cancelled||this.danger},set typing(r){this._typing=r},get typing(){return this._typing||this.dim},set placeholder(r){this._placeholder=r},get placeholder(){return this._placeholder||this.primary.dim},set highlight(r){this._highlight=r},get highlight(){return this._highlight||this.inverse}};tL.merge=(r={})=>{r.styles&&typeof r.styles.enabled=="boolean"&&(Di.enabled=r.styles.enabled),r.styles&&typeof r.styles.visible=="boolean"&&(Di.visible=r.styles.visible);let e=eL.merge({},tL,r.styles);delete e.merge;for(let t of Object.keys(Di))e.hasOwnProperty(t)||Reflect.defineProperty(e,t,{get:()=>Di[t]});for(let t of Object.keys(Di.styles))e.hasOwnProperty(t)||Reflect.defineProperty(e,t,{get:()=>Di[t]});return e};cne.exports=tL});var fne=w((Pgt,gne)=>{"use strict";var rL=process.platform==="win32",aA=go(),pje=ji(),iL={...aA.symbols,upDownDoubleArrow:"\u21D5",upDownDoubleArrow2:"\u2B0D",upDownArrow:"\u2195",asterisk:"*",asterism:"\u2042",bulletWhite:"\u25E6",electricArrow:"\u2301",ellipsisLarge:"\u22EF",ellipsisSmall:"\u2026",fullBlock:"\u2588",identicalTo:"\u2261",indicator:aA.symbols.check,leftAngle:"\u2039",mark:"\u203B",minus:"\u2212",multiplication:"\xD7",obelus:"\xF7",percent:"%",pilcrow:"\xB6",pilcrow2:"\u2761",pencilUpRight:"\u2710",pencilDownRight:"\u270E",pencilRight:"\u270F",plus:"+",plusMinus:"\xB1",pointRight:"\u261E",rightAngle:"\u203A",section:"\xA7",hexagon:{off:"\u2B21",on:"\u2B22",disabled:"\u2B22"},ballot:{on:"\u2611",off:"\u2610",disabled:"\u2612"},stars:{on:"\u2605",off:"\u2606",disabled:"\u2606"},folder:{on:"\u25BC",off:"\u25B6",disabled:"\u25B6"},prefix:{pending:aA.symbols.question,submitted:aA.symbols.check,cancelled:aA.symbols.cross},separator:{pending:aA.symbols.pointerSmall,submitted:aA.symbols.middot,cancelled:aA.symbols.middot},radio:{off:rL?"( )":"\u25EF",on:rL?"(*)":"\u25C9",disabled:rL?"(|)":"\u24BE"},numbers:["\u24EA","\u2460","\u2461","\u2462","\u2463","\u2464","\u2465","\u2466","\u2467","\u2468","\u2469","\u246A","\u246B","\u246C","\u246D","\u246E","\u246F","\u2470","\u2471","\u2472","\u2473","\u3251","\u3252","\u3253","\u3254","\u3255","\u3256","\u3257","\u3258","\u3259","\u325A","\u325B","\u325C","\u325D","\u325E","\u325F","\u32B1","\u32B2","\u32B3","\u32B4","\u32B5","\u32B6","\u32B7","\u32B8","\u32B9","\u32BA","\u32BB","\u32BC","\u32BD","\u32BE","\u32BF"]};iL.merge=r=>{let e=pje.merge({},aA.symbols,iL,r.symbols);return delete e.merge,e};gne.exports=iL});var pne=w((Dgt,hne)=>{"use strict";var dje=une(),Cje=fne(),mje=ji();hne.exports=r=>{r.options=mje.merge({},r.options.theme,r.options),r.symbols=Cje.merge(r.options),r.styles=dje.merge(r.options)}});var Ine=w((mne,Ene)=>{"use strict";var dne=process.env.TERM_PROGRAM==="Apple_Terminal",Eje=go(),nL=ji(),fo=Ene.exports=mne,Dr="\x1B[",Cne="\x07",sL=!1,dl=fo.code={bell:Cne,beep:Cne,beginning:`${Dr}G`,down:`${Dr}J`,esc:Dr,getPosition:`${Dr}6n`,hide:`${Dr}?25l`,line:`${Dr}2K`,lineEnd:`${Dr}K`,lineStart:`${Dr}1K`,restorePosition:Dr+(dne?"8":"u"),savePosition:Dr+(dne?"7":"s"),screen:`${Dr}2J`,show:`${Dr}?25h`,up:`${Dr}1J`},su=fo.cursor={get hidden(){return sL},hide(){return sL=!0,dl.hide},show(){return sL=!1,dl.show},forward:(r=1)=>`${Dr}${r}C`,backward:(r=1)=>`${Dr}${r}D`,nextLine:(r=1)=>`${Dr}E`.repeat(r),prevLine:(r=1)=>`${Dr}F`.repeat(r),up:(r=1)=>r?`${Dr}${r}A`:"",down:(r=1)=>r?`${Dr}${r}B`:"",right:(r=1)=>r?`${Dr}${r}C`:"",left:(r=1)=>r?`${Dr}${r}D`:"",to(r,e){return e?`${Dr}${e+1};${r+1}H`:`${Dr}${r+1}G`},move(r=0,e=0){let t="";return t+=r<0?su.left(-r):r>0?su.right(r):"",t+=e<0?su.up(-e):e>0?su.down(e):"",t},restore(r={}){let{after:e,cursor:t,initial:i,input:n,prompt:s,size:o,value:a}=r;if(i=nL.isPrimitive(i)?String(i):"",n=nL.isPrimitive(n)?String(n):"",a=nL.isPrimitive(a)?String(a):"",o){let l=fo.cursor.up(o)+fo.cursor.to(s.length),c=n.length-t;return c>0&&(l+=fo.cursor.left(c)),l}if(a||e){let l=!n&&!!i?-i.length:-n.length+t;return e&&(l-=e.length),n===""&&i&&!s.includes(i)&&(l+=i.length),fo.cursor.move(l)}}},oL=fo.erase={screen:dl.screen,up:dl.up,down:dl.down,line:dl.line,lineEnd:dl.lineEnd,lineStart:dl.lineStart,lines(r){let e="";for(let t=0;t<r;t++)e+=fo.erase.line+(t<r-1?fo.cursor.up(1):"");return r&&(e+=fo.code.beginning),e}};fo.clear=(r="",e=process.stdout.columns)=>{if(!e)return oL.line+su.to(0);let t=s=>[...Eje.unstyle(s)].length,i=r.split(/\r?\n/),n=0;for(let s of i)n+=1+Math.floor(Math.max(t(s)-1,0)/e);return(oL.line+su.prevLine()).repeat(n-1)+oL.line+su.to(0)}});var Yh=w((kgt,wne)=>{"use strict";var Ije=J("events"),yne=go(),aL=sne(),yje=ane(),wje=lne(),Bje=pne(),kn=ji(),ou=Ine(),Lm=class extends Ije{constructor(e={}){super(),this.name=e.name,this.type=e.type,this.options=e,Bje(this),yje(this),this.state=new wje(this),this.initial=[e.initial,e.default].find(t=>t!=null),this.stdout=e.stdout||process.stdout,this.stdin=e.stdin||process.stdin,this.scale=e.scale||1,this.term=this.options.term||process.env.TERM_PROGRAM,this.margin=Qje(this.options.margin),this.setMaxListeners(0),bje(this)}async keypress(e,t={}){this.keypressed=!0;let i=aL.action(e,aL(e,t),this.options.actions);this.state.keypress=i,this.emit("keypress",e,i),this.emit("state",this.state.clone());let n=this.options[i.action]||this[i.action]||this.dispatch;if(typeof n=="function")return await n.call(this,e,i);this.alert()}alert(){delete this.state.alert,this.options.show===!1?this.emit("alert"):this.stdout.write(ou.code.beep)}cursorHide(){this.stdout.write(ou.cursor.hide()),kn.onExit(()=>this.cursorShow())}cursorShow(){this.stdout.write(ou.cursor.show())}write(e){!e||(this.stdout&&this.state.show!==!1&&this.stdout.write(e),this.state.buffer+=e)}clear(e=0){let t=this.state.buffer;this.state.buffer="",!(!t&&!e||this.options.show===!1)&&this.stdout.write(ou.cursor.down(e)+ou.clear(t,this.width))}restore(){if(this.state.closed||this.options.show===!1)return;let{prompt:e,after:t,rest:i}=this.sections(),{cursor:n,initial:s="",input:o="",value:a=""}=this,l=this.state.size=i.length,c={after:t,cursor:n,initial:s,input:o,prompt:e,size:l,value:a},u=ou.cursor.restore(c);u&&this.stdout.write(u)}sections(){let{buffer:e,input:t,prompt:i}=this.state;i=yne.unstyle(i);let n=yne.unstyle(e),s=n.indexOf(i),o=n.slice(0,s),l=n.slice(s).split(`
-`),c=l[0],u=l[l.length-1],f=(i+(t?" "+t:"")).length,h=f<c.length?c.slice(f+1):"";return{header:o,prompt:c,after:h,rest:l.slice(1),last:u}}async submit(){this.state.submitted=!0,this.state.validating=!0,this.options.onSubmit&&await this.options.onSubmit.call(this,this.name,this.value,this);let e=this.state.error||await this.validate(this.value,this.state);if(e!==!0){let t=`
-`+this.symbols.pointer+" ";typeof e=="string"?t+=e.trim():t+="Invalid input",this.state.error=`
-`+this.styles.danger(t),this.state.submitted=!1,await this.render(),await this.alert(),this.state.validating=!1,this.state.error=void 0;return}this.state.validating=!1,await this.render(),await this.close(),this.value=await this.result(this.value),this.emit("submit",this.value)}async cancel(e){this.state.cancelled=this.state.submitted=!0,await this.render(),await this.close(),typeof this.options.onCancel=="function"&&await this.options.onCancel.call(this,this.name,this.value,this),this.emit("cancel",await this.error(e))}async close(){this.state.closed=!0;try{let e=this.sections(),t=Math.ceil(e.prompt.length/this.width);e.rest&&this.write(ou.cursor.down(e.rest.length)),this.write(`
-`.repeat(t))}catch{}this.emit("close")}start(){!this.stop&&this.options.show!==!1&&(this.stop=aL.listen(this,this.keypress.bind(this)),this.once("close",this.stop))}async skip(){return this.skipped=this.options.skip===!0,typeof this.options.skip=="function"&&(this.skipped=await this.options.skip.call(this,this.name,this.value)),this.skipped}async initialize(){let{format:e,options:t,result:i}=this;if(this.format=()=>e.call(this,this.value),this.result=()=>i.call(this,this.value),typeof t.initial=="function"&&(this.initial=await t.initial.call(this,this)),typeof t.onRun=="function"&&await t.onRun.call(this,this),typeof t.onSubmit=="function"){let n=t.onSubmit.bind(this),s=this.submit.bind(this);delete this.options.onSubmit,this.submit=async()=>(await n(this.name,this.value,this),s())}await this.start(),await this.render()}render(){throw new Error("expected prompt to have a custom render method")}run(){return new Promise(async(e,t)=>{if(this.once("submit",e),this.once("cancel",t),await this.skip())return this.render=()=>{},this.submit();await this.initialize(),this.emit("run")})}async element(e,t,i){let{options:n,state:s,symbols:o,timers:a}=this,l=a&&a[e];s.timer=l;let c=n[e]||s[e]||o[e],u=t&&t[e]!=null?t[e]:await c;if(u==="")return u;let g=await this.resolve(u,s,t,i);return!g&&t&&t[e]?this.resolve(c,s,t,i):g}async prefix(){let e=await this.element("prefix")||this.symbols,t=this.timers&&this.timers.prefix,i=this.state;return i.timer=t,kn.isObject(e)&&(e=e[i.status]||e.pending),kn.hasColor(e)?e:(this.styles[i.status]||this.styles.pending)(e)}async message(){let e=await this.element("message");return kn.hasColor(e)?e:this.styles.strong(e)}async separator(){let e=await this.element("separator")||this.symbols,t=this.timers&&this.timers.separator,i=this.state;i.timer=t;let n=e[i.status]||e.pending||i.separator,s=await this.resolve(n,i);return kn.isObject(s)&&(s=s[i.status]||s.pending),kn.hasColor(s)?s:this.styles.muted(s)}async pointer(e,t){let i=await this.element("pointer",e,t);if(typeof i=="string"&&kn.hasColor(i))return i;if(i){let n=this.styles,s=this.index===t,o=s?n.primary:c=>c,a=await this.resolve(i[s?"on":"off"]||i,this.state),l=kn.hasColor(a)?a:o(a);return s?l:" ".repeat(a.length)}}async indicator(e,t){let i=await this.element("indicator",e,t);if(typeof i=="string"&&kn.hasColor(i))return i;if(i){let n=this.styles,s=e.enabled===!0,o=s?n.success:n.dark,a=i[s?"on":"off"]||i;return kn.hasColor(a)?a:o(a)}return""}body(){return null}footer(){if(this.state.status==="pending")return this.element("footer")}header(){if(this.state.status==="pending")return this.element("header")}async hint(){if(this.state.status==="pending"&&!this.isValue(this.state.input)){let e=await this.element("hint");return kn.hasColor(e)?e:this.styles.muted(e)}}error(e){return this.state.submitted?"":e||this.state.error}format(e){return e}result(e){return e}validate(e){return this.options.required===!0?this.isValue(e):!0}isValue(e){return e!=null&&e!==""}resolve(e,...t){return kn.resolve(this,e,...t)}get base(){return Lm.prototype}get style(){return this.styles[this.state.status]}get height(){return this.options.rows||kn.height(this.stdout,25)}get width(){return this.options.columns||kn.width(this.stdout,80)}get size(){return{width:this.width,height:this.height}}set cursor(e){this.state.cursor=e}get cursor(){return this.state.cursor}set input(e){this.state.input=e}get input(){return this.state.input}set value(e){this.state.value=e}get value(){let{input:e,value:t}=this.state,i=[t,e].find(this.isValue.bind(this));return this.isValue(i)?i:this.initial}static get prompt(){return e=>new this(e).run()}};function bje(r){let e=n=>r[n]===void 0||typeof r[n]=="function",t=["actions","choices","initial","margin","roles","styles","symbols","theme","timers","value"],i=["body","footer","error","header","hint","indicator","message","prefix","separator","skip"];for(let n of Object.keys(r.options)){if(t.includes(n)||/^on[A-Z]/.test(n))continue;let s=r.options[n];typeof s=="function"&&e(n)?i.includes(n)||(r[n]=s.bind(r)):typeof r[n]!="function"&&(r[n]=s)}}function Qje(r){typeof r=="number"&&(r=[r,r,r,r]);let e=[].concat(r||[]),t=n=>n%2===0?`
-`:" ",i=[];for(let n=0;n<4;n++){let s=t(n);e[n]?i.push(s.repeat(e[n])):i.push("")}return i}wne.exports=Lm});var Qne=w((Rgt,bne)=>{"use strict";var Sje=ji(),Bne={default(r,e){return e},checkbox(r,e){throw new Error("checkbox role is not implemented yet")},editable(r,e){throw new Error("editable role is not implemented yet")},expandable(r,e){throw new Error("expandable role is not implemented yet")},heading(r,e){return e.disabled="",e.indicator=[e.indicator," "].find(t=>t!=null),e.message=e.message||"",e},input(r,e){throw new Error("input role is not implemented yet")},option(r,e){return Bne.default(r,e)},radio(r,e){throw new Error("radio role is not implemented yet")},separator(r,e){return e.disabled="",e.indicator=[e.indicator," "].find(t=>t!=null),e.message=e.message||r.symbols.line.repeat(5),e},spacer(r,e){return e}};bne.exports=(r,e={})=>{let t=Sje.merge({},Bne,e.roles);return t[r]||t.default}});var Om=w((Fgt,xne)=>{"use strict";var vje=go(),xje=Yh(),Pje=Qne(),Sb=ji(),{reorder:AL,scrollUp:Dje,scrollDown:kje,isObject:Sne,swap:Rje}=Sb,lL=class extends xje{constructor(e){super(e),this.cursorHide(),this.maxSelected=e.maxSelected||1/0,this.multiple=e.multiple||!1,this.initial=e.initial||0,this.delay=e.delay||0,this.longest=0,this.num=""}async initialize(){typeof this.options.initial=="function"&&(this.initial=await this.options.initial.call(this)),await this.reset(!0),await super.initialize()}async reset(){let{choices:e,initial:t,autofocus:i,suggest:n}=this.options;if(this.state._choices=[],this.state.choices=[],this.choices=await Promise.all(await this.toChoices(e)),this.choices.forEach(s=>s.enabled=!1),typeof n!="function"&&this.selectable.length===0)throw new Error("At least one choice must be selectable");Sne(t)&&(t=Object.keys(t)),Array.isArray(t)?(i!=null&&(this.index=this.findIndex(i)),t.forEach(s=>this.enable(this.find(s))),await this.render()):(i!=null&&(t=i),typeof t=="string"&&(t=this.findIndex(t)),typeof t=="number"&&t>-1&&(this.index=Math.max(0,Math.min(t,this.choices.length)),this.enable(this.find(this.index)))),this.isDisabled(this.focused)&&await this.down()}async toChoices(e,t){this.state.loadingChoices=!0;let i=[],n=0,s=async(o,a)=>{typeof o=="function"&&(o=await o.call(this)),o instanceof Promise&&(o=await o);for(let l=0;l<o.length;l++){let c=o[l]=await this.toChoice(o[l],n++,a);i.push(c),c.choices&&await s(c.choices,c)}return i};return s(e,t).then(o=>(this.state.loadingChoices=!1,o))}async toChoice(e,t,i){if(typeof e=="function"&&(e=await e.call(this,this)),e instanceof Promise&&(e=await e),typeof e=="string"&&(e={name:e}),e.normalized)return e;e.normalized=!0;let n=e.value;if(e=Pje(e.role,this.options)(this,e),typeof e.disabled=="string"&&!e.hint&&(e.hint=e.disabled,e.disabled=!0),e.disabled===!0&&e.hint==null&&(e.hint="(disabled)"),e.index!=null)return e;e.name=e.name||e.key||e.title||e.value||e.message,e.message=e.message||e.name||"",e.value=[e.value,e.name].find(this.isValue.bind(this)),e.input="",e.index=t,e.cursor=0,Sb.define(e,"parent",i),e.level=i?i.level+1:1,e.indent==null&&(e.indent=i?i.indent+"  ":e.indent||""),e.path=i?i.path+"."+e.name:e.name,e.enabled=!!(this.multiple&&!this.isDisabled(e)&&(e.enabled||this.isSelected(e))),this.isDisabled(e)||(this.longest=Math.max(this.longest,vje.unstyle(e.message).length));let o={...e};return e.reset=(a=o.input,l=o.value)=>{for(let c of Object.keys(o))e[c]=o[c];e.input=a,e.value=l},n==null&&typeof e.initial=="function"&&(e.input=await e.initial.call(this,this.state,e,t)),e}async onChoice(e,t){this.emit("choice",e,t,this),typeof e.onChoice=="function"&&await e.onChoice.call(this,this.state,e,t)}async addChoice(e,t,i){let n=await this.toChoice(e,t,i);return this.choices.push(n),this.index=this.choices.length-1,this.limit=this.choices.length,n}async newItem(e,t,i){let n={name:"New choice name?",editable:!0,newChoice:!0,...e},s=await this.addChoice(n,t,i);return s.updateChoice=()=>{delete s.newChoice,s.name=s.message=s.input,s.input="",s.cursor=0},this.render()}indent(e){return e.indent==null?e.level>1?"  ".repeat(e.level-1):"":e.indent}dispatch(e,t){if(this.multiple&&this[t.name])return this[t.name]();this.alert()}focus(e,t){return typeof t!="boolean"&&(t=e.enabled),t&&!e.enabled&&this.selected.length>=this.maxSelected?this.alert():(this.index=e.index,e.enabled=t&&!this.isDisabled(e),e)}space(){return this.multiple?(this.toggle(this.focused),this.render()):this.alert()}a(){if(this.maxSelected<this.choices.length)return this.alert();let e=this.selectable.every(t=>t.enabled);return this.choices.forEach(t=>t.enabled=!e),this.render()}i(){return this.choices.length-this.selected.length>this.maxSelected?this.alert():(this.choices.forEach(e=>e.enabled=!e.enabled),this.render())}g(e=this.focused){return this.choices.some(t=>!!t.parent)?(this.toggle(e.parent&&!e.choices?e.parent:e),this.render()):this.a()}toggle(e,t){if(!e.enabled&&this.selected.length>=this.maxSelected)return this.alert();typeof t!="boolean"&&(t=!e.enabled),e.enabled=t,e.choices&&e.choices.forEach(n=>this.toggle(n,t));let i=e.parent;for(;i;){let n=i.choices.filter(s=>this.isDisabled(s));i.enabled=n.every(s=>s.enabled===!0),i=i.parent}return vne(this,this.choices),this.emit("toggle",e,this),e}enable(e){return this.selected.length>=this.maxSelected?this.alert():(e.enabled=!this.isDisabled(e),e.choices&&e.choices.forEach(this.enable.bind(this)),e)}disable(e){return e.enabled=!1,e.choices&&e.choices.forEach(this.disable.bind(this)),e}number(e){this.num+=e;let t=i=>{let n=Number(i);if(n>this.choices.length-1)return this.alert();let s=this.focused,o=this.choices.find(a=>n===a.index);if(!o.enabled&&this.selected.length>=this.maxSelected)return this.alert();if(this.visible.indexOf(o)===-1){let a=AL(this.choices),l=a.indexOf(o);if(s.index>l){let c=a.slice(l,l+this.limit),u=a.filter(g=>!c.includes(g));this.choices=c.concat(u)}else{let c=l-this.limit+1;this.choices=a.slice(c).concat(a.slice(0,c))}}return this.index=this.choices.indexOf(o),this.toggle(this.focused),this.render()};return clearTimeout(this.numberTimeout),new Promise(i=>{let n=this.choices.length,s=this.num,o=(a=!1,l)=>{clearTimeout(this.numberTimeout),a&&(l=t(s)),this.num="",i(l)};if(s==="0"||s.length===1&&Number(s+"0")>n)return o(!0);if(Number(s)>n)return o(!1,this.alert());this.numberTimeout=setTimeout(()=>o(!0),this.delay)})}home(){return this.choices=AL(this.choices),this.index=0,this.render()}end(){let e=this.choices.length-this.limit,t=AL(this.choices);return this.choices=t.slice(e).concat(t.slice(0,e)),this.index=this.limit-1,this.render()}first(){return this.index=0,this.render()}last(){return this.index=this.visible.length-1,this.render()}prev(){return this.visible.length<=1?this.alert():this.up()}next(){return this.visible.length<=1?this.alert():this.down()}right(){return this.cursor>=this.input.length?this.alert():(this.cursor++,this.render())}left(){return this.cursor<=0?this.alert():(this.cursor--,this.render())}up(){let e=this.choices.length,t=this.visible.length,i=this.index;return this.options.scroll===!1&&i===0?this.alert():e>t&&i===0?this.scrollUp():(this.index=(i-1%e+e)%e,this.isDisabled()?this.up():this.render())}down(){let e=this.choices.length,t=this.visible.length,i=this.index;return this.options.scroll===!1&&i===t-1?this.alert():e>t&&i===t-1?this.scrollDown():(this.index=(i+1)%e,this.isDisabled()?this.down():this.render())}scrollUp(e=0){return this.choices=Dje(this.choices),this.index=e,this.isDisabled()?this.up():this.render()}scrollDown(e=this.visible.length-1){return this.choices=kje(this.choices),this.index=e,this.isDisabled()?this.down():this.render()}async shiftUp(){if(this.options.sort===!0){this.sorting=!0,this.swap(this.index-1),await this.up(),this.sorting=!1;return}return this.scrollUp(this.index)}async shiftDown(){if(this.options.sort===!0){this.sorting=!0,this.swap(this.index+1),await this.down(),this.sorting=!1;return}return this.scrollDown(this.index)}pageUp(){return this.visible.length<=1?this.alert():(this.limit=Math.max(this.limit-1,0),this.index=Math.min(this.limit-1,this.index),this._limit=this.limit,this.isDisabled()?this.up():this.render())}pageDown(){return this.visible.length>=this.choices.length?this.alert():(this.index=Math.max(0,this.index),this.limit=Math.min(this.limit+1,this.choices.length),this._limit=this.limit,this.isDisabled()?this.down():this.render())}swap(e){Rje(this.choices,this.index,e)}isDisabled(e=this.focused){return e&&["disabled","collapsed","hidden","completing","readonly"].some(i=>e[i]===!0)?!0:e&&e.role==="heading"}isEnabled(e=this.focused){if(Array.isArray(e))return e.every(t=>this.isEnabled(t));if(e.choices){let t=e.choices.filter(i=>!this.isDisabled(i));return e.enabled&&t.every(i=>this.isEnabled(i))}return e.enabled&&!this.isDisabled(e)}isChoice(e,t){return e.name===t||e.index===Number(t)}isSelected(e){return Array.isArray(this.initial)?this.initial.some(t=>this.isChoice(e,t)):this.isChoice(e,this.initial)}map(e=[],t="value"){return[].concat(e||[]).reduce((i,n)=>(i[n]=this.find(n,t),i),{})}filter(e,t){let n=typeof e=="function"?e:(a,l)=>[a.name,l].includes(e),o=(this.options.multiple?this.state._choices:this.choices).filter(n);return t?o.map(a=>a[t]):o}find(e,t){if(Sne(e))return t?e[t]:e;let n=typeof e=="function"?e:(o,a)=>[o.name,a].includes(e),s=this.choices.find(n);if(s)return t?s[t]:s}findIndex(e){return this.choices.indexOf(this.find(e))}async submit(){let e=this.focused;if(!e)return this.alert();if(e.newChoice)return e.input?(e.updateChoice(),this.render()):this.alert();if(this.choices.some(o=>o.newChoice))return this.alert();let{reorder:t,sort:i}=this.options,n=this.multiple===!0,s=this.selected;return s===void 0?this.alert():(Array.isArray(s)&&t!==!1&&i!==!0&&(s=Sb.reorder(s)),this.value=n?s.map(o=>o.name):s.name,super.submit())}set choices(e=[]){this.state._choices=this.state._choices||[],this.state.choices=e;for(let t of e)this.state._choices.some(i=>i.name===t.name)||this.state._choices.push(t);if(!this._initial&&this.options.initial){this._initial=!0;let t=this.initial;if(typeof t=="string"||typeof t=="number"){let i=this.find(t);i&&(this.initial=i.index,this.focus(i,!0))}}}get choices(){return vne(this,this.state.choices||[])}set visible(e){this.state.visible=e}get visible(){return(this.state.visible||this.choices).slice(0,this.limit)}set limit(e){this.state.limit=e}get limit(){let{state:e,options:t,choices:i}=this,n=e.limit||this._limit||t.limit||i.length;return Math.min(n,this.height)}set value(e){super.value=e}get value(){return typeof super.value!="string"&&super.value===this.initial?this.input:super.value}set index(e){this.state.index=e}get index(){return Math.max(0,this.state?this.state.index:0)}get enabled(){return this.filter(this.isEnabled.bind(this))}get focused(){let e=this.choices[this.index];return e&&this.state.submitted&&this.multiple!==!0&&(e.enabled=!0),e}get selectable(){return this.choices.filter(e=>!this.isDisabled(e))}get selected(){return this.multiple?this.enabled:this.focused}};function vne(r,e){if(e instanceof Promise)return e;if(typeof e=="function"){if(Sb.isAsyncFn(e))return e;e=e.call(r,r)}for(let t of e){if(Array.isArray(t.choices)){let i=t.choices.filter(n=>!r.isDisabled(n));t.enabled=i.every(n=>n.enabled===!0)}r.isDisabled(t)===!0&&delete t.enabled}return e}xne.exports=lL});var Cl=w((Ngt,Pne)=>{"use strict";var Fje=Om(),cL=ji(),uL=class extends Fje{constructor(e){super(e),this.emptyError=this.options.emptyError||"No items were selected"}async dispatch(e,t){if(this.multiple)return this[t.name]?await this[t.name](e,t):await super.dispatch(e,t);this.alert()}separator(){if(this.options.separator)return super.separator();let e=this.styles.muted(this.symbols.ellipsis);return this.state.submitted?super.separator():e}pointer(e,t){return!this.multiple||this.options.pointer?super.pointer(e,t):""}indicator(e,t){return this.multiple?super.indicator(e,t):""}choiceMessage(e,t){let i=this.resolve(e.message,this.state,e,t);return e.role==="heading"&&!cL.hasColor(i)&&(i=this.styles.strong(i)),this.resolve(i,this.state,e,t)}choiceSeparator(){return":"}async renderChoice(e,t){await this.onChoice(e,t);let i=this.index===t,n=await this.pointer(e,t),s=await this.indicator(e,t)+(e.pad||""),o=await this.resolve(e.hint,this.state,e,t);o&&!cL.hasColor(o)&&(o=this.styles.muted(o));let a=this.indent(e),l=await this.choiceMessage(e,t),c=()=>[this.margin[3],a+n+s,l,this.margin[1],o].filter(Boolean).join(" ");return e.role==="heading"?c():e.disabled?(cL.hasColor(l)||(l=this.styles.disabled(l)),c()):(i&&(l=this.styles.em(l)),c())}async renderChoices(){if(this.state.loading==="choices")return this.styles.warning("Loading choices");if(this.state.submitted)return"";let e=this.visible.map(async(s,o)=>await this.renderChoice(s,o)),t=await Promise.all(e);t.length||t.push(this.styles.danger("No matching choices"));let i=this.margin[0]+t.join(`
-`),n;return this.options.choicesHeader&&(n=await this.resolve(this.options.choicesHeader,this.state)),[n,i].filter(Boolean).join(`
-`)}format(){return!this.state.submitted||this.state.cancelled?"":Array.isArray(this.selected)?this.selected.map(e=>this.styles.primary(e.name)).join(", "):this.styles.primary(this.selected.name)}async render(){let{submitted:e,size:t}=this.state,i="",n=await this.header(),s=await this.prefix(),o=await this.separator(),a=await this.message();this.options.promptLine!==!1&&(i=[s,a,o,""].join(" "),this.state.prompt=i);let l=await this.format(),c=await this.error()||await this.hint(),u=await this.renderChoices(),g=await this.footer();l&&(i+=l),c&&!i.includes(c)&&(i+=" "+c),e&&!l&&!u.trim()&&this.multiple&&this.emptyError!=null&&(i+=this.styles.danger(this.emptyError)),this.clear(t),this.write([n,i,u,g].filter(Boolean).join(`
-`)),this.write(this.margin[2]),this.restore()}};Pne.exports=uL});var kne=w((Tgt,Dne)=>{"use strict";var Nje=Cl(),Tje=(r,e)=>{let t=r.toLowerCase();return i=>{let s=i.toLowerCase().indexOf(t),o=e(i.slice(s,s+t.length));return s>=0?i.slice(0,s)+o+i.slice(s+t.length):i}},gL=class extends Nje{constructor(e){super(e),this.cursorShow()}moveCursor(e){this.state.cursor+=e}dispatch(e){return this.append(e)}space(e){return this.options.multiple?super.space(e):this.append(e)}append(e){let{cursor:t,input:i}=this.state;return this.input=i.slice(0,t)+e+i.slice(t),this.moveCursor(1),this.complete()}delete(){let{cursor:e,input:t}=this.state;return t?(this.input=t.slice(0,e-1)+t.slice(e),this.moveCursor(-1),this.complete()):this.alert()}deleteForward(){let{cursor:e,input:t}=this.state;return t[e]===void 0?this.alert():(this.input=`${t}`.slice(0,e)+`${t}`.slice(e+1),this.complete())}number(e){return this.append(e)}async complete(){this.completing=!0,this.choices=await this.suggest(this.input,this.state._choices),this.state.limit=void 0,this.index=Math.min(Math.max(this.visible.length-1,0),this.index),await this.render(),this.completing=!1}suggest(e=this.input,t=this.state._choices){if(typeof this.options.suggest=="function")return this.options.suggest.call(this,e,t);let i=e.toLowerCase();return t.filter(n=>n.message.toLowerCase().includes(i))}pointer(){return""}format(){if(!this.focused)return this.input;if(this.options.multiple&&this.state.submitted)return this.selected.map(e=>this.styles.primary(e.message)).join(", ");if(this.state.submitted){let e=this.value=this.input=this.focused.value;return this.styles.primary(e)}return this.input}async render(){if(this.state.status!=="pending")return super.render();let e=this.options.highlight?this.options.highlight.bind(this):this.styles.placeholder,t=Tje(this.input,e),i=this.choices;this.choices=i.map(n=>({...n,message:t(n.message)})),await super.render(),this.choices=i}submit(){return this.options.multiple&&(this.value=this.selected.map(e=>e.name)),super.submit()}};Dne.exports=gL});var hL=w((Lgt,Rne)=>{"use strict";var fL=ji();Rne.exports=(r,e={})=>{r.cursorHide();let{input:t="",initial:i="",pos:n,showCursor:s=!0,color:o}=e,a=o||r.styles.placeholder,l=fL.inverse(r.styles.primary),c=C=>l(r.styles.black(C)),u=t,g=" ",f=c(g);if(r.blink&&r.blink.off===!0&&(c=C=>C,f=""),s&&n===0&&i===""&&t==="")return c(g);if(s&&n===0&&(t===i||t===""))return c(i[0])+a(i.slice(1));i=fL.isPrimitive(i)?`${i}`:"",t=fL.isPrimitive(t)?`${t}`:"";let h=i&&i.startsWith(t)&&i!==t,p=h?c(i[t.length]):f;if(n!==t.length&&s===!0&&(u=t.slice(0,n)+c(t[n])+t.slice(n+1),p=""),s===!1&&(p=""),h){let C=r.styles.unstyle(u+p);return u+p+a(i.slice(C.length))}return u+p}});var vb=w((Ogt,Fne)=>{"use strict";var Lje=go(),Oje=Cl(),Mje=hL(),pL=class extends Oje{constructor(e){super({...e,multiple:!0}),this.type="form",this.initial=this.options.initial,this.align=[this.options.align,"right"].find(t=>t!=null),this.emptyError="",this.values={}}async reset(e){return await super.reset(),e===!0&&(this._index=this.index),this.index=this._index,this.values={},this.choices.forEach(t=>t.reset&&t.reset()),this.render()}dispatch(e){return!!e&&this.append(e)}append(e){let t=this.focused;if(!t)return this.alert();let{cursor:i,input:n}=t;return t.value=t.input=n.slice(0,i)+e+n.slice(i),t.cursor++,this.render()}delete(){let e=this.focused;if(!e||e.cursor<=0)return this.alert();let{cursor:t,input:i}=e;return e.value=e.input=i.slice(0,t-1)+i.slice(t),e.cursor--,this.render()}deleteForward(){let e=this.focused;if(!e)return this.alert();let{cursor:t,input:i}=e;if(i[t]===void 0)return this.alert();let n=`${i}`.slice(0,t)+`${i}`.slice(t+1);return e.value=e.input=n,this.render()}right(){let e=this.focused;return e?e.cursor>=e.input.length?this.alert():(e.cursor++,this.render()):this.alert()}left(){let e=this.focused;return e?e.cursor<=0?this.alert():(e.cursor--,this.render()):this.alert()}space(e,t){return this.dispatch(e,t)}number(e,t){return this.dispatch(e,t)}next(){let e=this.focused;if(!e)return this.alert();let{initial:t,input:i}=e;return t&&t.startsWith(i)&&i!==t?(e.value=e.input=t,e.cursor=e.value.length,this.render()):super.next()}prev(){let e=this.focused;return e?e.cursor===0?super.prev():(e.value=e.input="",e.cursor=0,this.render()):this.alert()}separator(){return""}format(e){return this.state.submitted?"":super.format(e)}pointer(){return""}indicator(e){return e.input?"\u29BF":"\u2299"}async choiceSeparator(e,t){let i=await this.resolve(e.separator,this.state,e,t)||":";return i?" "+this.styles.disabled(i):""}async renderChoice(e,t){await this.onChoice(e,t);let{state:i,styles:n}=this,{cursor:s,initial:o="",name:a,hint:l,input:c=""}=e,{muted:u,submitted:g,primary:f,danger:h}=n,p=l,C=this.index===t,y=e.validate||(()=>!0),B=await this.choiceSeparator(e,t),v=e.message;this.align==="right"&&(v=v.padStart(this.longest+1," ")),this.align==="left"&&(v=v.padEnd(this.longest+1," "));let D=this.values[a]=c||o,T=c?"success":"dark";await y.call(e,D,this.state)!==!0&&(T="danger");let H=n[T],j=H(await this.indicator(e,t))+(e.pad||""),$=this.indent(e),V=()=>[$,j,v+B,c,p].filter(Boolean).join(" ");if(i.submitted)return v=Lje.unstyle(v),c=g(c),p="",V();if(e.format)c=await e.format.call(this,c,e,t);else{let W=this.styles.muted;c=Mje(this,{input:c,initial:o,pos:s,showCursor:C,color:W})}return this.isValue(c)||(c=this.styles.muted(this.symbols.ellipsis)),e.result&&(this.values[a]=await e.result.call(this,D,e,t)),C&&(v=f(v)),e.error?c+=(c?" ":"")+h(e.error.trim()):e.hint&&(c+=(c?" ":"")+u(e.hint.trim())),V()}async submit(){return this.value=this.values,super.base.submit.call(this)}};Fne.exports=pL});var dL=w((Mgt,Tne)=>{"use strict";var Kje=vb(),Uje=()=>{throw new Error("expected prompt to have a custom authenticate method")},Nne=(r=Uje)=>{class e extends Kje{constructor(i){super(i)}async submit(){this.value=await r.call(this,this.values,this.state),super.base.submit.call(this)}static create(i){return Nne(i)}}return e};Tne.exports=Nne()});var Mne=w((Kgt,One)=>{"use strict";var Hje=dL();function Gje(r,e){return r.username===this.options.username&&r.password===this.options.password}var Lne=(r=Gje)=>{let e=[{name:"username",message:"username"},{name:"password",message:"password",format(i){return this.options.showPassword?i:(this.state.submitted?this.styles.primary:this.styles.muted)(this.symbols.asterisk.repeat(i.length))}}];class t extends Hje.create(r){constructor(n){super({...n,choices:e})}static create(n){return Lne(n)}}return t};One.exports=Lne()});var xb=w((Ugt,Kne)=>{"use strict";var Yje=Yh(),{isPrimitive:jje,hasColor:qje}=ji(),CL=class extends Yje{constructor(e){super(e),this.cursorHide()}async initialize(){let e=await this.resolve(this.initial,this.state);this.input=await this.cast(e),await super.initialize()}dispatch(e){return this.isValue(e)?(this.input=e,this.submit()):this.alert()}format(e){let{styles:t,state:i}=this;return i.submitted?t.success(e):t.primary(e)}cast(e){return this.isTrue(e)}isTrue(e){return/^[ty1]/i.test(e)}isFalse(e){return/^[fn0]/i.test(e)}isValue(e){return jje(e)&&(this.isTrue(e)||this.isFalse(e))}async hint(){if(this.state.status==="pending"){let e=await this.element("hint");return qje(e)?e:this.styles.muted(e)}}async render(){let{input:e,size:t}=this.state,i=await this.prefix(),n=await this.separator(),s=await this.message(),o=this.styles.muted(this.default),a=[i,s,o,n].filter(Boolean).join(" ");this.state.prompt=a;let l=await this.header(),c=this.value=this.cast(e),u=await this.format(c),g=await this.error()||await this.hint(),f=await this.footer();g&&!a.includes(g)&&(u+=" "+g),a+=" "+u,this.clear(t),this.write([l,a,f].filter(Boolean).join(`
-`)),this.restore()}set value(e){super.value=e}get value(){return this.cast(super.value)}};Kne.exports=CL});var Hne=w((Hgt,Une)=>{"use strict";var Jje=xb(),mL=class extends Jje{constructor(e){super(e),this.default=this.options.default||(this.initial?"(Y/n)":"(y/N)")}};Une.exports=mL});var Yne=w((Ggt,Gne)=>{"use strict";var Wje=Cl(),zje=vb(),jh=zje.prototype,EL=class extends Wje{constructor(e){super({...e,multiple:!0}),this.align=[this.options.align,"left"].find(t=>t!=null),this.emptyError="",this.values={}}dispatch(e,t){let i=this.focused,n=i.parent||{};return!i.editable&&!n.editable&&(e==="a"||e==="i")?super[e]():jh.dispatch.call(this,e,t)}append(e,t){return jh.append.call(this,e,t)}delete(e,t){return jh.delete.call(this,e,t)}space(e){return this.focused.editable?this.append(e):super.space()}number(e){return this.focused.editable?this.append(e):super.number(e)}next(){return this.focused.editable?jh.next.call(this):super.next()}prev(){return this.focused.editable?jh.prev.call(this):super.prev()}async indicator(e,t){let i=e.indicator||"",n=e.editable?i:super.indicator(e,t);return await this.resolve(n,this.state,e,t)||""}indent(e){return e.role==="heading"?"":e.editable?" ":"  "}async renderChoice(e,t){return e.indent="",e.editable?jh.renderChoice.call(this,e,t):super.renderChoice(e,t)}error(){return""}footer(){return this.state.error}async validate(){let e=!0;for(let t of this.choices){if(typeof t.validate!="function"||t.role==="heading")continue;let i=t.parent?this.value[t.parent.name]:this.value;if(t.editable?i=t.value===t.name?t.initial||"":t.value:this.isDisabled(t)||(i=t.enabled===!0),e=await t.validate(i,this.state),e!==!0)break}return e!==!0&&(this.state.error=typeof e=="string"?e:"Invalid Input"),e}submit(){if(this.focused.newChoice===!0)return super.submit();if(this.choices.some(e=>e.newChoice))return this.alert();this.value={};for(let e of this.choices){let t=e.parent?this.value[e.parent.name]:this.value;if(e.role==="heading"){this.value[e.name]={};continue}e.editable?t[e.name]=e.value===e.name?e.initial||"":e.value:this.isDisabled(e)||(t[e.name]=e.enabled===!0)}return this.base.submit.call(this)}};Gne.exports=EL});var au=w((Ygt,jne)=>{"use strict";var Vje=Yh(),Xje=hL(),{isPrimitive:Zje}=ji(),IL=class extends Vje{constructor(e){super(e),this.initial=Zje(this.initial)?String(this.initial):"",this.initial&&this.cursorHide(),this.state.prevCursor=0,this.state.clipboard=[]}async keypress(e,t={}){let i=this.state.prevKeypress;return this.state.prevKeypress=t,this.options.multiline===!0&&t.name==="return"&&(!i||i.name!=="return")?this.append(`
-`,t):super.keypress(e,t)}moveCursor(e){this.cursor+=e}reset(){return this.input=this.value="",this.cursor=0,this.render()}dispatch(e,t){if(!e||t.ctrl||t.code)return this.alert();this.append(e)}append(e){let{cursor:t,input:i}=this.state;this.input=`${i}`.slice(0,t)+e+`${i}`.slice(t),this.moveCursor(String(e).length),this.render()}insert(e){this.append(e)}delete(){let{cursor:e,input:t}=this.state;if(e<=0)return this.alert();this.input=`${t}`.slice(0,e-1)+`${t}`.slice(e),this.moveCursor(-1),this.render()}deleteForward(){let{cursor:e,input:t}=this.state;if(t[e]===void 0)return this.alert();this.input=`${t}`.slice(0,e)+`${t}`.slice(e+1),this.render()}cutForward(){let e=this.cursor;if(this.input.length<=e)return this.alert();this.state.clipboard.push(this.input.slice(e)),this.input=this.input.slice(0,e),this.render()}cutLeft(){let e=this.cursor;if(e===0)return this.alert();let t=this.input.slice(0,e),i=this.input.slice(e),n=t.split(" ");this.state.clipboard.push(n.pop()),this.input=n.join(" "),this.cursor=this.input.length,this.input+=i,this.render()}paste(){if(!this.state.clipboard.length)return this.alert();this.insert(this.state.clipboard.pop()),this.render()}toggleCursor(){this.state.prevCursor?(this.cursor=this.state.prevCursor,this.state.prevCursor=0):(this.state.prevCursor=this.cursor,this.cursor=0),this.render()}first(){this.cursor=0,this.render()}last(){this.cursor=this.input.length-1,this.render()}next(){let e=this.initial!=null?String(this.initial):"";if(!e||!e.startsWith(this.input))return this.alert();this.input=this.initial,this.cursor=this.initial.length,this.render()}prev(){if(!this.input)return this.alert();this.reset()}backward(){return this.left()}forward(){return this.right()}right(){return this.cursor>=this.input.length?this.alert():(this.moveCursor(1),this.render())}left(){return this.cursor<=0?this.alert():(this.moveCursor(-1),this.render())}isValue(e){return!!e}async format(e=this.value){let t=await this.resolve(this.initial,this.state);return this.state.submitted?this.styles.submitted(e||t):Xje(this,{input:e,initial:t,pos:this.cursor})}async render(){let e=this.state.size,t=await this.prefix(),i=await this.separator(),n=await this.message(),s=[t,n,i].filter(Boolean).join(" ");this.state.prompt=s;let o=await this.header(),a=await this.format(),l=await this.error()||await this.hint(),c=await this.footer();l&&!a.includes(l)&&(a+=" "+l),s+=" "+a,this.clear(e),this.write([o,s,c].filter(Boolean).join(`
-`)),this.restore()}};jne.exports=IL});var Jne=w((jgt,qne)=>{"use strict";var _je=r=>r.filter((e,t)=>r.lastIndexOf(e)===t),Pb=r=>_je(r).filter(Boolean);qne.exports=(r,e={},t="")=>{let{past:i=[],present:n=""}=e,s,o;switch(r){case"prev":case"undo":return s=i.slice(0,i.length-1),o=i[i.length-1]||"",{past:Pb([t,...s]),present:o};case"next":case"redo":return s=i.slice(1),o=i[0]||"",{past:Pb([...s,t]),present:o};case"save":return{past:Pb([...i,t]),present:""};case"remove":return o=Pb(i.filter(a=>a!==t)),n="",o.length&&(n=o.pop()),{past:o,present:n};default:throw new Error(`Invalid action: "${r}"`)}}});var wL=w((qgt,zne)=>{"use strict";var $je=au(),Wne=Jne(),yL=class extends $je{constructor(e){super(e);let t=this.options.history;if(t&&t.store){let i=t.values||this.initial;this.autosave=!!t.autosave,this.store=t.store,this.data=this.store.get("values")||{past:[],present:i},this.initial=this.data.present||this.data.past[this.data.past.length-1]}}completion(e){return this.store?(this.data=Wne(e,this.data,this.input),this.data.present?(this.input=this.data.present,this.cursor=this.input.length,this.render()):this.alert()):this.alert()}altUp(){return this.completion("prev")}altDown(){return this.completion("next")}prev(){return this.save(),super.prev()}save(){!this.store||(this.data=Wne("save",this.data,this.input),this.store.set("values",this.data))}submit(){return this.store&&this.autosave===!0&&this.save(),super.submit()}};zne.exports=yL});var Xne=w((Jgt,Vne)=>{"use strict";var eqe=au(),BL=class extends eqe{format(){return""}};Vne.exports=BL});var _ne=w((Wgt,Zne)=>{"use strict";var tqe=au(),bL=class extends tqe{constructor(e={}){super(e),this.sep=this.options.separator||/, */,this.initial=e.initial||""}split(e=this.value){return e?String(e).split(this.sep):[]}format(){let e=this.state.submitted?this.styles.primary:t=>t;return this.list.map(e).join(", ")}async submit(e){let t=this.state.error||await this.validate(this.list,this.state);return t!==!0?(this.state.error=t,super.submit()):(this.value=this.list,super.submit())}get list(){return this.split()}};Zne.exports=bL});var ese=w((zgt,$ne)=>{"use strict";var rqe=Cl(),QL=class extends rqe{constructor(e){super({...e,multiple:!0})}};$ne.exports=QL});var vL=w((Vgt,tse)=>{"use strict";var iqe=au(),SL=class extends iqe{constructor(e={}){super({style:"number",...e}),this.min=this.isValue(e.min)?this.toNumber(e.min):-1/0,this.max=this.isValue(e.max)?this.toNumber(e.max):1/0,this.delay=e.delay!=null?e.delay:1e3,this.float=e.float!==!1,this.round=e.round===!0||e.float===!1,this.major=e.major||10,this.minor=e.minor||1,this.initial=e.initial!=null?e.initial:"",this.input=String(this.initial),this.cursor=this.input.length,this.cursorShow()}append(e){return!/[-+.]/.test(e)||e==="."&&this.input.includes(".")?this.alert("invalid number"):super.append(e)}number(e){return super.append(e)}next(){return this.input&&this.input!==this.initial?this.alert():this.isValue(this.initial)?(this.input=this.initial,this.cursor=String(this.initial).length,this.render()):this.alert()}up(e){let t=e||this.minor,i=this.toNumber(this.input);return i>this.max+t?this.alert():(this.input=`${i+t}`,this.render())}down(e){let t=e||this.minor,i=this.toNumber(this.input);return i<this.min-t?this.alert():(this.input=`${i-t}`,this.render())}shiftDown(){return this.down(this.major)}shiftUp(){return this.up(this.major)}format(e=this.input){return typeof this.options.format=="function"?this.options.format.call(this,e):this.styles.info(e)}toNumber(e=""){return this.float?+e:Math.round(+e)}isValue(e){return/^[-+]?[0-9]+((\.)|(\.[0-9]+))?$/.test(e)}submit(){let e=[this.input,this.initial].find(t=>this.isValue(t));return this.value=this.toNumber(e||0),super.submit()}};tse.exports=SL});var ise=w((Xgt,rse)=>{rse.exports=vL()});var sse=w((Zgt,nse)=>{"use strict";var nqe=au(),xL=class extends nqe{constructor(e){super(e),this.cursorShow()}format(e=this.input){return this.keypressed?(this.state.submitted?this.styles.primary:this.styles.muted)(this.symbols.asterisk.repeat(e.length)):""}};nse.exports=xL});var Ase=w((_gt,ase)=>{"use strict";var sqe=go(),oqe=Om(),ose=ji(),PL=class extends oqe{constructor(e={}){super(e),this.widths=[].concat(e.messageWidth||50),this.align=[].concat(e.align||"left"),this.linebreak=e.linebreak||!1,this.edgeLength=e.edgeLength||3,this.newline=e.newline||`
-   `;let t=e.startNumber||1;typeof this.scale=="number"&&(this.scaleKey=!1,this.scale=Array(this.scale).fill(0).map((i,n)=>({name:n+t})))}async reset(){return this.tableized=!1,await super.reset(),this.render()}tableize(){if(this.tableized===!0)return;this.tableized=!0;let e=0;for(let t of this.choices){e=Math.max(e,t.message.length),t.scaleIndex=t.initial||2,t.scale=[];for(let i=0;i<this.scale.length;i++)t.scale.push({index:i})}this.widths[0]=Math.min(this.widths[0],e+3)}async dispatch(e,t){if(this.multiple)return this[t.name]?await this[t.name](e,t):await super.dispatch(e,t);this.alert()}heading(e,t,i){return this.styles.strong(e)}separator(){return this.styles.muted(this.symbols.ellipsis)}right(){let e=this.focused;return e.scaleIndex>=this.scale.length-1?this.alert():(e.scaleIndex++,this.render())}left(){let e=this.focused;return e.scaleIndex<=0?this.alert():(e.scaleIndex--,this.render())}indent(){return""}format(){return this.state.submitted?this.choices.map(t=>this.styles.info(t.index)).join(", "):""}pointer(){return""}renderScaleKey(){return this.scaleKey===!1||this.state.submitted?"":["",...this.scale.map(i=>`   ${i.name} - ${i.message}`)].map(i=>this.styles.muted(i)).join(`
-`)}renderScaleHeading(e){let t=this.scale.map(l=>l.name);typeof this.options.renderScaleHeading=="function"&&(t=this.options.renderScaleHeading.call(this,e));let i=this.scaleLength-t.join("").length,n=Math.round(i/(t.length-1)),o=t.map(l=>this.styles.strong(l)).join(" ".repeat(n)),a=" ".repeat(this.widths[0]);return this.margin[3]+a+this.margin[1]+o}scaleIndicator(e,t,i){if(typeof this.options.scaleIndicator=="function")return this.options.scaleIndicator.call(this,e,t,i);let n=e.scaleIndex===t.index;return t.disabled?this.styles.hint(this.symbols.radio.disabled):n?this.styles.success(this.symbols.radio.on):this.symbols.radio.off}renderScale(e,t){let i=e.scale.map(s=>this.scaleIndicator(e,s,t)),n=this.term==="Hyper"?"":" ";return i.join(n+this.symbols.line.repeat(this.edgeLength))}async renderChoice(e,t){await this.onChoice(e,t);let i=this.index===t,n=await this.pointer(e,t),s=await e.hint;s&&!ose.hasColor(s)&&(s=this.styles.muted(s));let o=p=>this.margin[3]+p.replace(/\s+$/,"").padEnd(this.widths[0]," "),a=this.newline,l=this.indent(e),c=await this.resolve(e.message,this.state,e,t),u=await this.renderScale(e,t),g=this.margin[1]+this.margin[3];this.scaleLength=sqe.unstyle(u).length,this.widths[0]=Math.min(this.widths[0],this.width-this.scaleLength-g.length);let h=ose.wordWrap(c,{width:this.widths[0],newline:a}).split(`
-`).map(p=>o(p)+this.margin[1]);return i&&(u=this.styles.info(u),h=h.map(p=>this.styles.info(p))),h[0]+=u,this.linebreak&&h.push(""),[l+n,h.join(`
-`)].filter(Boolean)}async renderChoices(){if(this.state.submitted)return"";this.tableize();let e=this.visible.map(async(n,s)=>await this.renderChoice(n,s)),t=await Promise.all(e),i=await this.renderScaleHeading();return this.margin[0]+[i,...t.map(n=>n.join(" "))].join(`
-`)}async render(){let{submitted:e,size:t}=this.state,i=await this.prefix(),n=await this.separator(),s=await this.message(),o="";this.options.promptLine!==!1&&(o=[i,s,n,""].join(" "),this.state.prompt=o);let a=await this.header(),l=await this.format(),c=await this.renderScaleKey(),u=await this.error()||await this.hint(),g=await this.renderChoices(),f=await this.footer(),h=this.emptyError;l&&(o+=l),u&&!o.includes(u)&&(o+=" "+u),e&&!l&&!g.trim()&&this.multiple&&h!=null&&(o+=this.styles.danger(h)),this.clear(t),this.write([a,o,c,g,f].filter(Boolean).join(`
-`)),this.state.submitted||this.write(this.margin[2]),this.restore()}submit(){this.value={};for(let e of this.choices)this.value[e.name]=e.scaleIndex;return this.base.submit.call(this)}};ase.exports=PL});var use=w(($gt,cse)=>{"use strict";var lse=go(),aqe=(r="")=>typeof r=="string"?r.replace(/^['"]|['"]$/g,""):"",kL=class{constructor(e){this.name=e.key,this.field=e.field||{},this.value=aqe(e.initial||this.field.initial||""),this.message=e.message||this.name,this.cursor=0,this.input="",this.lines=[]}},Aqe=async(r={},e={},t=i=>i)=>{let i=new Set,n=r.fields||[],s=r.template,o=[],a=[],l=[],c=1;typeof s=="function"&&(s=await s());let u=-1,g=()=>s[++u],f=()=>s[u+1],h=p=>{p.line=c,o.push(p)};for(h({type:"bos",value:""});u<s.length-1;){let p=g();if(/^[^\S\n ]$/.test(p)){h({type:"text",value:p});continue}if(p===`
-`){h({type:"newline",value:p}),c++;continue}if(p==="\\"){p+=g(),h({type:"text",value:p});continue}if((p==="$"||p==="#"||p==="{")&&f()==="{"){let y=g();p+=y;let B={type:"template",open:p,inner:"",close:"",value:p},v;for(;v=g();){if(v==="}"){f()==="}"&&(v+=g()),B.value+=v,B.close=v;break}v===":"?(B.initial="",B.key=B.inner):B.initial!==void 0&&(B.initial+=v),B.value+=v,B.inner+=v}B.template=B.open+(B.initial||B.inner)+B.close,B.key=B.key||B.inner,e.hasOwnProperty(B.key)&&(B.initial=e[B.key]),B=t(B),h(B),l.push(B.key),i.add(B.key);let D=a.find(T=>T.name===B.key);B.field=n.find(T=>T.name===B.key),D||(D=new kL(B),a.push(D)),D.lines.push(B.line-1);continue}let C=o[o.length-1];C.type==="text"&&C.line===c?C.value+=p:h({type:"text",value:p})}return h({type:"eos",value:""}),{input:s,tabstops:o,unique:i,keys:l,items:a}};cse.exports=async r=>{let e=r.options,t=new Set(e.required===!0?[]:e.required||[]),i={...e.values,...e.initial},{tabstops:n,items:s,keys:o}=await Aqe(e,i),a=DL("result",r,e),l=DL("format",r,e),c=DL("validate",r,e,!0),u=r.isValue.bind(r);return async(g={},f=!1)=>{let h=0;g.required=t,g.items=s,g.keys=o,g.output="";let p=async(v,D,T,H)=>{let j=await c(v,D,T,H);return j===!1?"Invalid field "+T.name:j};for(let v of n){let D=v.value,T=v.key;if(v.type!=="template"){D&&(g.output+=D);continue}if(v.type==="template"){let H=s.find(_=>_.name===T);e.required===!0&&g.required.add(H.name);let j=[H.input,g.values[H.value],H.value,D].find(u),V=(H.field||{}).message||v.inner;if(f){let _=await p(g.values[T],g,H,h);if(_&&typeof _=="string"||_===!1){g.invalid.set(T,_);continue}g.invalid.delete(T);let A=await a(g.values[T],g,H,h);g.output+=lse.unstyle(A);continue}H.placeholder=!1;let W=D;D=await l(D,g,H,h),j!==D?(g.values[T]=j,D=r.styles.typing(j),g.missing.delete(V)):(g.values[T]=void 0,j=`<${V}>`,D=r.styles.primary(j),H.placeholder=!0,g.required.has(T)&&g.missing.add(V)),g.missing.has(V)&&g.validating&&(D=r.styles.warning(j)),g.invalid.has(T)&&g.validating&&(D=r.styles.danger(j)),h===g.index&&(W!==D?D=r.styles.underline(D):D=r.styles.heading(lse.unstyle(D))),h++}D&&(g.output+=D)}let C=g.output.split(`
-`).map(v=>" "+v),y=s.length,B=0;for(let v of s)g.invalid.has(v.name)&&v.lines.forEach(D=>{C[D][0]===" "&&(C[D]=g.styles.danger(g.symbols.bullet)+C[D].slice(1))}),r.isValue(g.values[v.name])&&B++;return g.completed=(B/y*100).toFixed(0),g.output=C.join(`
-`),g.output}};function DL(r,e,t,i){return(n,s,o,a)=>typeof o.field[r]=="function"?o.field[r].call(e,n,s,o,a):[i,n].find(l=>e.isValue(l))}});var fse=w((eft,gse)=>{"use strict";var lqe=go(),cqe=use(),uqe=Yh(),RL=class extends uqe{constructor(e){super(e),this.cursorHide(),this.reset(!0)}async initialize(){this.interpolate=await cqe(this),await super.initialize()}async reset(e){this.state.keys=[],this.state.invalid=new Map,this.state.missing=new Set,this.state.completed=0,this.state.values={},e!==!0&&(await this.initialize(),await this.render())}moveCursor(e){let t=this.getItem();this.cursor+=e,t.cursor+=e}dispatch(e,t){if(!t.code&&!t.ctrl&&e!=null&&this.getItem()){this.append(e,t);return}this.alert()}append(e,t){let i=this.getItem(),n=i.input.slice(0,this.cursor),s=i.input.slice(this.cursor);this.input=i.input=`${n}${e}${s}`,this.moveCursor(1),this.render()}delete(){let e=this.getItem();if(this.cursor<=0||!e.input)return this.alert();let t=e.input.slice(this.cursor),i=e.input.slice(0,this.cursor-1);this.input=e.input=`${i}${t}`,this.moveCursor(-1),this.render()}increment(e){return e>=this.state.keys.length-1?0:e+1}decrement(e){return e<=0?this.state.keys.length-1:e-1}first(){this.state.index=0,this.render()}last(){this.state.index=this.state.keys.length-1,this.render()}right(){if(this.cursor>=this.input.length)return this.alert();this.moveCursor(1),this.render()}left(){if(this.cursor<=0)return this.alert();this.moveCursor(-1),this.render()}prev(){this.state.index=this.decrement(this.state.index),this.getItem(),this.render()}next(){this.state.index=this.increment(this.state.index),this.getItem(),this.render()}up(){this.prev()}down(){this.next()}format(e){let t=this.state.completed<100?this.styles.warning:this.styles.success;return this.state.submitted===!0&&this.state.completed!==100&&(t=this.styles.danger),t(`${this.state.completed}% completed`)}async render(){let{index:e,keys:t=[],submitted:i,size:n}=this.state,s=[this.options.newline,`
-`].find(v=>v!=null),o=await this.prefix(),a=await this.separator(),l=await this.message(),c=[o,l,a].filter(Boolean).join(" ");this.state.prompt=c;let u=await this.header(),g=await this.error()||"",f=await this.hint()||"",h=i?"":await this.interpolate(this.state),p=this.state.key=t[e]||"",C=await this.format(p),y=await this.footer();C&&(c+=" "+C),f&&!C&&this.state.completed===0&&(c+=" "+f),this.clear(n);let B=[u,c,h,y,g.trim()];this.write(B.filter(Boolean).join(s)),this.restore()}getItem(e){let{items:t,keys:i,index:n}=this.state,s=t.find(o=>o.name===i[n]);return s&&s.input!=null&&(this.input=s.input,this.cursor=s.cursor),s}async submit(){typeof this.interpolate!="function"&&await this.initialize(),await this.interpolate(this.state,!0);let{invalid:e,missing:t,output:i,values:n}=this.state;if(e.size){let a="";for(let[l,c]of e)a+=`Invalid ${l}: ${c}
-`;return this.state.error=a,super.submit()}if(t.size)return this.state.error="Required: "+[...t.keys()].join(", "),super.submit();let o=lqe.unstyle(i).split(`
-`).map(a=>a.slice(1)).join(`
-`);return this.value={values:n,result:o},super.submit()}};gse.exports=RL});var pse=w((tft,hse)=>{"use strict";var gqe="(Use <shift>+<up/down> to sort)",fqe=Cl(),FL=class extends fqe{constructor(e){super({...e,reorder:!1,sort:!0,multiple:!0}),this.state.hint=[this.options.hint,gqe].find(this.isValue.bind(this))}indicator(){return""}async renderChoice(e,t){let i=await super.renderChoice(e,t),n=this.symbols.identicalTo+" ",s=this.index===t&&this.sorting?this.styles.muted(n):"  ";return this.options.drag===!1&&(s=""),this.options.numbered===!0?s+`${t+1} - `+i:s+i}get selected(){return this.choices}submit(){return this.value=this.choices.map(e=>e.value),super.submit()}};hse.exports=FL});var Cse=w((rft,dse)=>{"use strict";var hqe=Om(),NL=class extends hqe{constructor(e={}){if(super(e),this.emptyError=e.emptyError||"No items were selected",this.term=process.env.TERM_PROGRAM,!this.options.header){let t=["","4 - Strongly Agree","3 - Agree","2 - Neutral","1 - Disagree","0 - Strongly Disagree",""];t=t.map(i=>this.styles.muted(i)),this.state.header=t.join(`
-   `)}}async toChoices(...e){if(this.createdScales)return!1;this.createdScales=!0;let t=await super.toChoices(...e);for(let i of t)i.scale=pqe(5,this.options),i.scaleIdx=2;return t}dispatch(){this.alert()}space(){let e=this.focused,t=e.scale[e.scaleIdx],i=t.selected;return e.scale.forEach(n=>n.selected=!1),t.selected=!i,this.render()}indicator(){return""}pointer(){return""}separator(){return this.styles.muted(this.symbols.ellipsis)}right(){let e=this.focused;return e.scaleIdx>=e.scale.length-1?this.alert():(e.scaleIdx++,this.render())}left(){let e=this.focused;return e.scaleIdx<=0?this.alert():(e.scaleIdx--,this.render())}indent(){return"   "}async renderChoice(e,t){await this.onChoice(e,t);let i=this.index===t,n=this.term==="Hyper",s=n?9:8,o=n?"":" ",a=this.symbols.line.repeat(s),l=" ".repeat(s+(n?0:1)),c=D=>(D?this.styles.success("\u25C9"):"\u25EF")+o,u=t+1+".",g=i?this.styles.heading:this.styles.noop,f=await this.resolve(e.message,this.state,e,t),h=this.indent(e),p=h+e.scale.map((D,T)=>c(T===e.scaleIdx)).join(a),C=D=>D===e.scaleIdx?g(D):D,y=h+e.scale.map((D,T)=>C(T)).join(l),B=()=>[u,f].filter(Boolean).join(" "),v=()=>[B(),p,y," "].filter(Boolean).join(`
-`);return i&&(p=this.styles.cyan(p),y=this.styles.cyan(y)),v()}async renderChoices(){if(this.state.submitted)return"";let e=this.visible.map(async(i,n)=>await this.renderChoice(i,n)),t=await Promise.all(e);return t.length||t.push(this.styles.danger("No matching choices")),t.join(`
-`)}format(){return this.state.submitted?this.choices.map(t=>this.styles.info(t.scaleIdx)).join(", "):""}async render(){let{submitted:e,size:t}=this.state,i=await this.prefix(),n=await this.separator(),s=await this.message(),o=[i,s,n].filter(Boolean).join(" ");this.state.prompt=o;let a=await this.header(),l=await this.format(),c=await this.error()||await this.hint(),u=await this.renderChoices(),g=await this.footer();(l||!c)&&(o+=" "+l),c&&!o.includes(c)&&(o+=" "+c),e&&!l&&!u&&this.multiple&&this.type!=="form"&&(o+=this.styles.danger(this.emptyError)),this.clear(t),this.write([o,a,u,g].filter(Boolean).join(`
-`)),this.restore()}submit(){this.value={};for(let e of this.choices)this.value[e.name]=e.scaleIdx;return this.base.submit.call(this)}};function pqe(r,e={}){if(Array.isArray(e.scale))return e.scale.map(i=>({...i}));let t=[];for(let i=1;i<r+1;i++)t.push({i,selected:!1});return t}dse.exports=NL});var Ese=w((ift,mse)=>{mse.exports=wL()});var yse=w((nft,Ise)=>{"use strict";var dqe=xb(),TL=class extends dqe{async initialize(){await super.initialize(),this.value=this.initial=!!this.options.initial,this.disabled=this.options.disabled||"no",this.enabled=this.options.enabled||"yes",await this.render()}reset(){this.value=this.initial,this.render()}delete(){this.alert()}toggle(){this.value=!this.value,this.render()}enable(){if(this.value===!0)return this.alert();this.value=!0,this.render()}disable(){if(this.value===!1)return this.alert();this.value=!1,this.render()}up(){this.toggle()}down(){this.toggle()}right(){this.toggle()}left(){this.toggle()}next(){this.toggle()}prev(){this.toggle()}dispatch(e="",t){switch(e.toLowerCase()){case" ":return this.toggle();case"1":case"y":case"t":return this.enable();case"0":case"n":case"f":return this.disable();default:return this.alert()}}format(){let e=i=>this.styles.primary.underline(i);return[this.value?this.disabled:e(this.disabled),this.value?e(this.enabled):this.enabled].join(this.styles.muted(" / "))}async render(){let{size:e}=this.state,t=await this.header(),i=await this.prefix(),n=await this.separator(),s=await this.message(),o=await this.format(),a=await this.error()||await this.hint(),l=await this.footer(),c=[i,s,n,o].join(" ");this.state.prompt=c,a&&!c.includes(a)&&(c+=" "+a),this.clear(e),this.write([t,c,l].filter(Boolean).join(`
-`)),this.write(this.margin[2]),this.restore()}};Ise.exports=TL});var Bse=w((sft,wse)=>{"use strict";var Cqe=Cl(),LL=class extends Cqe{constructor(e){if(super(e),typeof this.options.correctChoice!="number"||this.options.correctChoice<0)throw new Error("Please specify the index of the correct answer from the list of choices")}async toChoices(e,t){let i=await super.toChoices(e,t);if(i.length<2)throw new Error("Please give at least two choices to the user");if(this.options.correctChoice>i.length)throw new Error("Please specify the index of the correct answer from the list of choices");return i}check(e){return e.index===this.options.correctChoice}async result(e){return{selectedAnswer:e,correctAnswer:this.options.choices[this.options.correctChoice].value,correct:await this.check(this.state)}}};wse.exports=LL});var Qse=w(OL=>{"use strict";var bse=ji(),ui=(r,e)=>{bse.defineExport(OL,r,e),bse.defineExport(OL,r.toLowerCase(),e)};ui("AutoComplete",()=>kne());ui("BasicAuth",()=>Mne());ui("Confirm",()=>Hne());ui("Editable",()=>Yne());ui("Form",()=>vb());ui("Input",()=>wL());ui("Invisible",()=>Xne());ui("List",()=>_ne());ui("MultiSelect",()=>ese());ui("Numeral",()=>ise());ui("Password",()=>sse());ui("Scale",()=>Ase());ui("Select",()=>Cl());ui("Snippet",()=>fse());ui("Sort",()=>pse());ui("Survey",()=>Cse());ui("Text",()=>Ese());ui("Toggle",()=>yse());ui("Quiz",()=>Bse())});var vse=w((aft,Sse)=>{Sse.exports={ArrayPrompt:Om(),AuthPrompt:dL(),BooleanPrompt:xb(),NumberPrompt:vL(),StringPrompt:au()}});var Km=w((Aft,Pse)=>{"use strict";var xse=J("assert"),KL=J("events"),ml=ji(),ho=class extends KL{constructor(e,t){super(),this.options=ml.merge({},e),this.answers={...t}}register(e,t){if(ml.isObject(e)){for(let n of Object.keys(e))this.register(n,e[n]);return this}xse.equal(typeof t,"function","expected a function");let i=e.toLowerCase();return t.prototype instanceof this.Prompt?this.prompts[i]=t:this.prompts[i]=t(this.Prompt,this),this}async prompt(e=[]){for(let t of[].concat(e))try{typeof t=="function"&&(t=await t.call(this)),await this.ask(ml.merge({},this.options,t))}catch(i){return Promise.reject(i)}return this.answers}async ask(e){typeof e=="function"&&(e=await e.call(this));let t=ml.merge({},this.options,e),{type:i,name:n}=e,{set:s,get:o}=ml;if(typeof i=="function"&&(i=await i.call(this,e,this.answers)),!i)return this.answers[n];xse(this.prompts[i],`Prompt "${i}" is not registered`);let a=new this.prompts[i](t),l=o(this.answers,n);a.state.answers=this.answers,a.enquirer=this,n&&a.on("submit",u=>{this.emit("answer",n,u,a),s(this.answers,n,u)});let c=a.emit.bind(a);return a.emit=(...u)=>(this.emit.call(this,...u),c(...u)),this.emit("prompt",a,this),t.autofill&&l!=null?(a.value=a.input=l,t.autofill==="show"&&await a.submit()):l=a.value=await a.run(),l}use(e){return e.call(this,this),this}set Prompt(e){this._Prompt=e}get Prompt(){return this._Prompt||this.constructor.Prompt}get prompts(){return this.constructor.prompts}static set Prompt(e){this._Prompt=e}static get Prompt(){return this._Prompt||Yh()}static get prompts(){return Qse()}static get types(){return vse()}static get prompt(){let e=(t,...i)=>{let n=new this(...i),s=n.emit.bind(n);return n.emit=(...o)=>(e.emit(...o),s(...o)),n.prompt(t)};return ml.mixinEmitter(e,new KL),e}};ml.mixinEmitter(ho,new KL);var ML=ho.prompts;for(let r of Object.keys(ML)){let e=r.toLowerCase(),t=i=>new ML[r](i).run();ho.prompt[e]=t,ho[e]=t,ho[r]||Reflect.defineProperty(ho,r,{get:()=>ML[r]})}var Mm=r=>{ml.defineExport(ho,r,()=>ho.types[r])};Mm("ArrayPrompt");Mm("AuthPrompt");Mm("BooleanPrompt");Mm("NumberPrompt");Mm("StringPrompt");Pse.exports=ho});var Kse=w((Vft,Mse)=>{function wqe(r,e){for(var t=-1,i=r==null?0:r.length;++t<i&&e(r[t],t,r)!==!1;);return r}Mse.exports=wqe});var Jh=w((Xft,Use)=>{var Bqe=Y0(),bqe=bh();function Qqe(r,e,t,i){var n=!t;t||(t={});for(var s=-1,o=e.length;++s<o;){var a=e[s],l=i?i(t[a],r[a],a,t,r):void 0;l===void 0&&(l=r[a]),n?bqe(t,a,l):Bqe(t,a,l)}return t}Use.exports=Qqe});var Gse=w((Zft,Hse)=>{var Sqe=Jh(),vqe=Rh();function xqe(r,e){return r&&Sqe(e,vqe(e),r)}Hse.exports=xqe});var jse=w((_ft,Yse)=>{function Pqe(r){var e=[];if(r!=null)for(var t in Object(r))e.push(t);return e}Yse.exports=Pqe});var Jse=w(($ft,qse)=>{var Dqe=vn(),kqe=ab(),Rqe=jse(),Fqe=Object.prototype,Nqe=Fqe.hasOwnProperty;function Tqe(r){if(!Dqe(r))return Rqe(r);var e=kqe(r),t=[];for(var i in r)i=="constructor"&&(e||!Nqe.call(r,i))||t.push(i);return t}qse.exports=Tqe});var Wh=w((eht,Wse)=>{var Lqe=lT(),Oqe=Jse(),Mqe=gm();function Kqe(r){return Mqe(r)?Lqe(r,!0):Oqe(r)}Wse.exports=Kqe});var Vse=w((tht,zse)=>{var Uqe=Jh(),Hqe=Wh();function Gqe(r,e){return r&&Uqe(e,Hqe(e),r)}zse.exports=Gqe});var qL=w((Ym,zh)=>{var Yqe=ys(),$se=typeof Ym=="object"&&Ym&&!Ym.nodeType&&Ym,Xse=$se&&typeof zh=="object"&&zh&&!zh.nodeType&&zh,jqe=Xse&&Xse.exports===$se,Zse=jqe?Yqe.Buffer:void 0,_se=Zse?Zse.allocUnsafe:void 0;function qqe(r,e){if(e)return r.slice();var t=r.length,i=_se?_se(t):new r.constructor(t);return r.copy(i),i}zh.exports=qqe});var JL=w((rht,eoe)=>{function Jqe(r,e){var t=-1,i=r.length;for(e||(e=Array(i));++t<i;)e[t]=r[t];return e}eoe.exports=Jqe});var roe=w((iht,toe)=>{var Wqe=Jh(),zqe=lb();function Vqe(r,e){return Wqe(r,zqe(r),e)}toe.exports=Vqe});var kb=w((nht,ioe)=>{var Xqe=cT(),Zqe=Xqe(Object.getPrototypeOf,Object);ioe.exports=Zqe});var WL=w((sht,noe)=>{var _qe=q0(),$qe=kb(),eJe=lb(),tJe=dT(),rJe=Object.getOwnPropertySymbols,iJe=rJe?function(r){for(var e=[];r;)_qe(e,eJe(r)),r=$qe(r);return e}:tJe;noe.exports=iJe});var ooe=w((oht,soe)=>{var nJe=Jh(),sJe=WL();function oJe(r,e){return nJe(r,sJe(r),e)}soe.exports=oJe});var Aoe=w((aht,aoe)=>{var aJe=pT(),AJe=WL(),lJe=Wh();function cJe(r){return aJe(r,lJe,AJe)}aoe.exports=cJe});var coe=w((Aht,loe)=>{var uJe=Object.prototype,gJe=uJe.hasOwnProperty;function fJe(r){var e=r.length,t=new r.constructor(e);return e&&typeof r[0]=="string"&&gJe.call(r,"index")&&(t.index=r.index,t.input=r.input),t}loe.exports=fJe});var Rb=w((lht,goe)=>{var uoe=fT();function hJe(r){var e=new r.constructor(r.byteLength);return new uoe(e).set(new uoe(r)),e}goe.exports=hJe});var hoe=w((cht,foe)=>{var pJe=Rb();function dJe(r,e){var t=e?pJe(r.buffer):r.buffer;return new r.constructor(t,r.byteOffset,r.byteLength)}foe.exports=dJe});var doe=w((uht,poe)=>{var CJe=/\w*$/;function mJe(r){var e=new r.constructor(r.source,CJe.exec(r));return e.lastIndex=r.lastIndex,e}poe.exports=mJe});var yoe=w((ght,Ioe)=>{var Coe=Rc(),moe=Coe?Coe.prototype:void 0,Eoe=moe?moe.valueOf:void 0;function EJe(r){return Eoe?Object(Eoe.call(r)):{}}Ioe.exports=EJe});var zL=w((fht,woe)=>{var IJe=Rb();function yJe(r,e){var t=e?IJe(r.buffer):r.buffer;return new r.constructor(t,r.byteOffset,r.length)}woe.exports=yJe});var boe=w((hht,Boe)=>{var wJe=Rb(),BJe=hoe(),bJe=doe(),QJe=yoe(),SJe=zL(),vJe="[object Boolean]",xJe="[object Date]",PJe="[object Map]",DJe="[object Number]",kJe="[object RegExp]",RJe="[object Set]",FJe="[object String]",NJe="[object Symbol]",TJe="[object ArrayBuffer]",LJe="[object DataView]",OJe="[object Float32Array]",MJe="[object Float64Array]",KJe="[object Int8Array]",UJe="[object Int16Array]",HJe="[object Int32Array]",GJe="[object Uint8Array]",YJe="[object Uint8ClampedArray]",jJe="[object Uint16Array]",qJe="[object Uint32Array]";function JJe(r,e,t){var i=r.constructor;switch(e){case TJe:return wJe(r);case vJe:case xJe:return new i(+r);case LJe:return BJe(r,t);case OJe:case MJe:case KJe:case UJe:case HJe:case GJe:case YJe:case jJe:case qJe:return SJe(r,t);case PJe:return new i;case DJe:case FJe:return new i(r);case kJe:return bJe(r);case RJe:return new i;case NJe:return QJe(r)}}Boe.exports=JJe});var voe=w((pht,Soe)=>{var WJe=vn(),Qoe=Object.create,zJe=function(){function r(){}return function(e){if(!WJe(e))return{};if(Qoe)return Qoe(e);r.prototype=e;var t=new r;return r.prototype=void 0,t}}();Soe.exports=zJe});var VL=w((dht,xoe)=>{var VJe=voe(),XJe=kb(),ZJe=ab();function _Je(r){return typeof r.constructor=="function"&&!ZJe(r)?VJe(XJe(r)):{}}xoe.exports=_Je});var Doe=w((Cht,Poe)=>{var $Je=hm(),e3e=Wo(),t3e="[object Map]";function r3e(r){return e3e(r)&&$Je(r)==t3e}Poe.exports=r3e});var Noe=w((mht,Foe)=>{var i3e=Doe(),n3e=nb(),koe=sb(),Roe=koe&&koe.isMap,s3e=Roe?n3e(Roe):i3e;Foe.exports=s3e});var Loe=w((Eht,Toe)=>{var o3e=hm(),a3e=Wo(),A3e="[object Set]";function l3e(r){return a3e(r)&&o3e(r)==A3e}Toe.exports=l3e});var Uoe=w((Iht,Koe)=>{var c3e=Loe(),u3e=nb(),Ooe=sb(),Moe=Ooe&&Ooe.isSet,g3e=Moe?u3e(Moe):c3e;Koe.exports=g3e});var qoe=w((yht,joe)=>{var f3e=fm(),h3e=Kse(),p3e=Y0(),d3e=Gse(),C3e=Vse(),m3e=qL(),E3e=JL(),I3e=roe(),y3e=ooe(),w3e=CT(),B3e=Aoe(),b3e=hm(),Q3e=coe(),S3e=boe(),v3e=VL(),x3e=vs(),P3e=lm(),D3e=Noe(),k3e=vn(),R3e=Uoe(),F3e=Rh(),N3e=Wh(),T3e=1,L3e=2,O3e=4,Hoe="[object Arguments]",M3e="[object Array]",K3e="[object Boolean]",U3e="[object Date]",H3e="[object Error]",Goe="[object Function]",G3e="[object GeneratorFunction]",Y3e="[object Map]",j3e="[object Number]",Yoe="[object Object]",q3e="[object RegExp]",J3e="[object Set]",W3e="[object String]",z3e="[object Symbol]",V3e="[object WeakMap]",X3e="[object ArrayBuffer]",Z3e="[object DataView]",_3e="[object Float32Array]",$3e="[object Float64Array]",eWe="[object Int8Array]",tWe="[object Int16Array]",rWe="[object Int32Array]",iWe="[object Uint8Array]",nWe="[object Uint8ClampedArray]",sWe="[object Uint16Array]",oWe="[object Uint32Array]",ur={};ur[Hoe]=ur[M3e]=ur[X3e]=ur[Z3e]=ur[K3e]=ur[U3e]=ur[_3e]=ur[$3e]=ur[eWe]=ur[tWe]=ur[rWe]=ur[Y3e]=ur[j3e]=ur[Yoe]=ur[q3e]=ur[J3e]=ur[W3e]=ur[z3e]=ur[iWe]=ur[nWe]=ur[sWe]=ur[oWe]=!0;ur[H3e]=ur[Goe]=ur[V3e]=!1;function Fb(r,e,t,i,n,s){var o,a=e&T3e,l=e&L3e,c=e&O3e;if(t&&(o=n?t(r,i,n,s):t(r)),o!==void 0)return o;if(!k3e(r))return r;var u=x3e(r);if(u){if(o=Q3e(r),!a)return E3e(r,o)}else{var g=b3e(r),f=g==Goe||g==G3e;if(P3e(r))return m3e(r,a);if(g==Yoe||g==Hoe||f&&!n){if(o=l||f?{}:v3e(r),!a)return l?y3e(r,C3e(o,r)):I3e(r,d3e(o,r))}else{if(!ur[g])return n?r:{};o=S3e(r,g,a)}}s||(s=new f3e);var h=s.get(r);if(h)return h;s.set(r,o),R3e(r)?r.forEach(function(y){o.add(Fb(y,e,t,y,r,s))}):D3e(r)&&r.forEach(function(y,B){o.set(B,Fb(y,e,t,B,r,s))});var p=c?l?B3e:w3e:l?N3e:F3e,C=u?void 0:p(r);return h3e(C||r,function(y,B){C&&(B=y,y=r[B]),p3e(o,B,Fb(y,e,t,B,r,s))}),o}joe.exports=Fb});var XL=w((wht,Joe)=>{var aWe=qoe(),AWe=1,lWe=4;function cWe(r){return aWe(r,AWe|lWe)}Joe.exports=cWe});var zoe=w((Bht,Woe)=>{var uWe=HN();function gWe(r,e,t){return r==null?r:uWe(r,e,t)}Woe.exports=gWe});var $oe=w((Pht,_oe)=>{function fWe(r){var e=r==null?0:r.length;return e?r[e-1]:void 0}_oe.exports=fWe});var tae=w((Dht,eae)=>{var hWe=rm(),pWe=HR();function dWe(r,e){return e.length<2?r:hWe(r,pWe(e,0,-1))}eae.exports=dWe});var iae=w((kht,rae)=>{var CWe=Bh(),mWe=$oe(),EWe=tae(),IWe=Zc();function yWe(r,e){return e=CWe(e,r),r=EWe(r,e),r==null||delete r[IWe(mWe(e))]}rae.exports=yWe});var sae=w((Rht,nae)=>{var wWe=iae();function BWe(r,e){return r==null?!0:wWe(r,e)}nae.exports=BWe});var cae=w((opt,SWe)=>{SWe.exports={name:"@yarnpkg/cli",version:"3.6.4",license:"BSD-2-Clause",main:"./sources/index.ts",dependencies:{"@yarnpkg/core":"workspace:^","@yarnpkg/fslib":"workspace:^","@yarnpkg/libzip":"workspace:^","@yarnpkg/parsers":"workspace:^","@yarnpkg/plugin-compat":"workspace:^","@yarnpkg/plugin-dlx":"workspace:^","@yarnpkg/plugin-essentials":"workspace:^","@yarnpkg/plugin-file":"workspace:^","@yarnpkg/plugin-git":"workspace:^","@yarnpkg/plugin-github":"workspace:^","@yarnpkg/plugin-http":"workspace:^","@yarnpkg/plugin-init":"workspace:^","@yarnpkg/plugin-link":"workspace:^","@yarnpkg/plugin-nm":"workspace:^","@yarnpkg/plugin-npm":"workspace:^","@yarnpkg/plugin-npm-cli":"workspace:^","@yarnpkg/plugin-pack":"workspace:^","@yarnpkg/plugin-patch":"workspace:^","@yarnpkg/plugin-pnp":"workspace:^","@yarnpkg/plugin-pnpm":"workspace:^","@yarnpkg/shell":"workspace:^",chalk:"^3.0.0","ci-info":"^3.2.0",clipanion:"3.2.0-rc.4",semver:"^7.1.2",tslib:"^1.13.0",typanion:"^3.3.0",yup:"^0.32.9"},devDependencies:{"@types/semver":"^7.1.0","@types/yup":"^0","@yarnpkg/builder":"workspace:^","@yarnpkg/monorepo":"workspace:^","@yarnpkg/pnpify":"workspace:^",micromatch:"^4.0.2"},peerDependencies:{"@yarnpkg/core":"workspace:^"},scripts:{postpack:"rm -rf lib",prepack:'run build:compile "$(pwd)"',"build:cli+hook":"run build:pnp:hook && builder build bundle","build:cli":"builder build bundle","run:cli":"builder run","update-local":"run build:cli --no-git-hash && rsync -a --delete bundles/ bin/"},publishConfig:{main:"./lib/index.js",types:"./lib/index.d.ts",bin:null},files:["/lib/**/*","!/lib/pluginConfiguration.*","!/lib/cli.*"],"@yarnpkg/builder":{bundles:{standard:["@yarnpkg/plugin-essentials","@yarnpkg/plugin-compat","@yarnpkg/plugin-dlx","@yarnpkg/plugin-file","@yarnpkg/plugin-git","@yarnpkg/plugin-github","@yarnpkg/plugin-http","@yarnpkg/plugin-init","@yarnpkg/plugin-link","@yarnpkg/plugin-nm","@yarnpkg/plugin-npm","@yarnpkg/plugin-npm-cli","@yarnpkg/plugin-pack","@yarnpkg/plugin-patch","@yarnpkg/plugin-pnp","@yarnpkg/plugin-pnpm"]}},repository:{type:"git",url:"ssh://git@github.com/yarnpkg/berry.git",directory:"packages/yarnpkg-cli"},engines:{node:">=12 <14 || 14.2 - 14.9 || >14.10.0"}}});var oO=w((kmt,bae)=>{"use strict";bae.exports=function(e,t){t===!0&&(t=0);var i="";if(typeof e=="string")try{i=new URL(e).protocol}catch{}else e&&e.constructor===URL&&(i=e.protocol);var n=i.split(/\:|\+/).filter(Boolean);return typeof t=="number"?n[t]:n}});var Sae=w((Rmt,Qae)=>{"use strict";var qWe=oO();function JWe(r){var e={protocols:[],protocol:null,port:null,resource:"",host:"",user:"",password:"",pathname:"",hash:"",search:"",href:r,query:{},parse_failed:!1};try{var t=new URL(r);e.protocols=qWe(t),e.protocol=e.protocols[0],e.port=t.port,e.resource=t.hostname,e.host=t.host,e.user=t.username||"",e.password=t.password||"",e.pathname=t.pathname,e.hash=t.hash.slice(1),e.search=t.search.slice(1),e.href=t.href,e.query=Object.fromEntries(t.searchParams)}catch{e.protocols=["file"],e.protocol=e.protocols[0],e.port="",e.resource="",e.user="",e.pathname="",e.hash="",e.search="",e.href=r,e.query={},e.parse_failed=!0}return e}Qae.exports=JWe});var Pae=w((Fmt,xae)=>{"use strict";var WWe=Sae();function zWe(r){return r&&typeof r=="object"&&"default"in r?r:{default:r}}var VWe=zWe(WWe),XWe="text/plain",ZWe="us-ascii",vae=(r,e)=>e.some(t=>t instanceof RegExp?t.test(r):t===r),_We=(r,{stripHash:e})=>{let t=/^data:(?<type>[^,]*?),(?<data>[^#]*?)(?:#(?<hash>.*))?$/.exec(r);if(!t)throw new Error(`Invalid URL: ${r}`);let{type:i,data:n,hash:s}=t.groups,o=i.split(";");s=e?"":s;let a=!1;o[o.length-1]==="base64"&&(o.pop(),a=!0);let l=(o.shift()||"").toLowerCase(),u=[...o.map(g=>{let[f,h=""]=g.split("=").map(p=>p.trim());return f==="charset"&&(h=h.toLowerCase(),h===ZWe)?"":`${f}${h?`=${h}`:""}`}).filter(Boolean)];return a&&u.push("base64"),(u.length>0||l&&l!==XWe)&&u.unshift(l),`data:${u.join(";")},${a?n.trim():n}${s?`#${s}`:""}`};function $We(r,e){if(e={defaultProtocol:"http:",normalizeProtocol:!0,forceHttp:!1,forceHttps:!1,stripAuthentication:!0,stripHash:!1,stripTextFragment:!0,stripWWW:!0,removeQueryParameters:[/^utm_\w+/i],removeTrailingSlash:!0,removeSingleSlash:!0,removeDirectoryIndex:!1,sortQueryParameters:!0,...e},r=r.trim(),/^data:/i.test(r))return _We(r,e);if(/^view-source:/i.test(r))throw new Error("`view-source:` is not supported as it is a non-standard protocol");let t=r.startsWith("//");!t&&/^\.*\//.test(r)||(r=r.replace(/^(?!(?:\w+:)?\/\/)|^\/\//,e.defaultProtocol));let n=new URL(r);if(e.forceHttp&&e.forceHttps)throw new Error("The `forceHttp` and `forceHttps` options cannot be used together");if(e.forceHttp&&n.protocol==="https:"&&(n.protocol="http:"),e.forceHttps&&n.protocol==="http:"&&(n.protocol="https:"),e.stripAuthentication&&(n.username="",n.password=""),e.stripHash?n.hash="":e.stripTextFragment&&(n.hash=n.hash.replace(/#?:~:text.*?$/i,"")),n.pathname){let o=/\b[a-z][a-z\d+\-.]{1,50}:\/\//g,a=0,l="";for(;;){let u=o.exec(n.pathname);if(!u)break;let g=u[0],f=u.index,h=n.pathname.slice(a,f);l+=h.replace(/\/{2,}/g,"/"),l+=g,a=f+g.length}let c=n.pathname.slice(a,n.pathname.length);l+=c.replace(/\/{2,}/g,"/"),n.pathname=l}if(n.pathname)try{n.pathname=decodeURI(n.pathname)}catch{}if(e.removeDirectoryIndex===!0&&(e.removeDirectoryIndex=[/^index\.[a-z]+$/]),Array.isArray(e.removeDirectoryIndex)&&e.removeDirectoryIndex.length>0){let o=n.pathname.split("/"),a=o[o.length-1];vae(a,e.removeDirectoryIndex)&&(o=o.slice(0,-1),n.pathname=o.slice(1).join("/")+"/")}if(n.hostname&&(n.hostname=n.hostname.replace(/\.$/,""),e.stripWWW&&/^www\.(?!www\.)[a-z\-\d]{1,63}\.[a-z.\-\d]{2,63}$/.test(n.hostname)&&(n.hostname=n.hostname.replace(/^www\./,""))),Array.isArray(e.removeQueryParameters))for(let o of[...n.searchParams.keys()])vae(o,e.removeQueryParameters)&&n.searchParams.delete(o);if(e.removeQueryParameters===!0&&(n.search=""),e.sortQueryParameters){n.searchParams.sort();try{n.search=decodeURIComponent(n.search)}catch{}}e.removeTrailingSlash&&(n.pathname=n.pathname.replace(/\/$/,""));let s=r;return r=n.toString(),!e.removeSingleSlash&&n.pathname==="/"&&!s.endsWith("/")&&n.hash===""&&(r=r.replace(/\/$/,"")),(e.removeTrailingSlash||n.pathname==="/")&&n.hash===""&&e.removeSingleSlash&&(r=r.replace(/\/$/,"")),t&&!e.normalizeProtocol&&(r=r.replace(/^http:\/\//,"//")),e.stripProtocol&&(r=r.replace(/^(?:https?:)?\/\//,"")),r}var aO=(r,e=!1)=>{let t=/^(?:([a-z_][a-z0-9_-]{0,31})@|https?:\/\/)([\w\.\-@]+)[\/:]([\~,\.\w,\-,\_,\/]+?(?:\.git|\/)?)$/,i=s=>{let o=new Error(s);throw o.subject_url=r,o};(typeof r!="string"||!r.trim())&&i("Invalid url."),r.length>aO.MAX_INPUT_LENGTH&&i("Input exceeds maximum length. If needed, change the value of parseUrl.MAX_INPUT_LENGTH."),e&&(typeof e!="object"&&(e={stripHash:!1}),r=$We(r,e));let n=VWe.default(r);if(n.parse_failed){let s=n.href.match(t);s?(n.protocols=["ssh"],n.protocol="ssh",n.resource=s[2],n.host=s[2],n.user=s[1],n.pathname=`/${s[3]}`,n.parse_failed=!1):i("URL parsing failed.")}return n};aO.MAX_INPUT_LENGTH=2048;xae.exports=aO});var Rae=w((Nmt,kae)=>{"use strict";var e4e=oO();function Dae(r){if(Array.isArray(r))return r.indexOf("ssh")!==-1||r.indexOf("rsync")!==-1;if(typeof r!="string")return!1;var e=e4e(r);if(r=r.substring(r.indexOf("://")+3),Dae(e))return!0;var t=new RegExp(".([a-zA-Z\\d]+):(\\d+)/");return!r.match(t)&&r.indexOf("@")<r.indexOf(":")}kae.exports=Dae});var Tae=w((Tmt,Nae)=>{"use strict";var t4e=Pae(),Fae=Rae();function r4e(r){var e=t4e(r);return e.token="",e.password==="x-oauth-basic"?e.token=e.user:e.user==="x-token-auth"&&(e.token=e.password),Fae(e.protocols)||e.protocols.length===0&&Fae(r)?e.protocol="ssh":e.protocols.length?e.protocol=e.protocols[0]:(e.protocol="file",e.protocols=["file"]),e.href=e.href.replace(/\/$/,""),e}Nae.exports=r4e});var Oae=w((Lmt,Lae)=>{"use strict";var i4e=Tae();function AO(r){if(typeof r!="string")throw new Error("The url must be a string.");var e=/^([a-z\d-]{1,39})\/([-\.\w]{1,100})$/i;e.test(r)&&(r="https://github.com/"+r);var t=i4e(r),i=t.resource.split("."),n=null;switch(t.toString=function(y){return AO.stringify(this,y)},t.source=i.length>2?i.slice(1-i.length).join("."):t.source=t.resource,t.git_suffix=/\.git$/.test(t.pathname),t.name=decodeURIComponent((t.pathname||t.href).replace(/(^\/)|(\/$)/g,"").replace(/\.git$/,"")),t.owner=decodeURIComponent(t.user),t.source){case"git.cloudforge.com":t.owner=t.user,t.organization=i[0],t.source="cloudforge.com";break;case"visualstudio.com":if(t.resource==="vs-ssh.visualstudio.com"){n=t.name.split("/"),n.length===4&&(t.organization=n[1],t.owner=n[2],t.name=n[3],t.full_name=n[2]+"/"+n[3]);break}else{n=t.name.split("/"),n.length===2?(t.owner=n[1],t.name=n[1],t.full_name="_git/"+t.name):n.length===3?(t.name=n[2],n[0]==="DefaultCollection"?(t.owner=n[2],t.organization=n[0],t.full_name=t.organization+"/_git/"+t.name):(t.owner=n[0],t.full_name=t.owner+"/_git/"+t.name)):n.length===4&&(t.organization=n[0],t.owner=n[1],t.name=n[3],t.full_name=t.organization+"/"+t.owner+"/_git/"+t.name);break}case"dev.azure.com":case"azure.com":if(t.resource==="ssh.dev.azure.com"){n=t.name.split("/"),n.length===4&&(t.organization=n[1],t.owner=n[2],t.name=n[3]);break}else{n=t.name.split("/"),n.length===5?(t.organization=n[0],t.owner=n[1],t.name=n[4],t.full_name="_git/"+t.name):n.length===3?(t.name=n[2],n[0]==="DefaultCollection"?(t.owner=n[2],t.organization=n[0],t.full_name=t.organization+"/_git/"+t.name):(t.owner=n[0],t.full_name=t.owner+"/_git/"+t.name)):n.length===4&&(t.organization=n[0],t.owner=n[1],t.name=n[3],t.full_name=t.organization+"/"+t.owner+"/_git/"+t.name),t.query&&t.query.path&&(t.filepath=t.query.path.replace(/^\/+/g,"")),t.query&&t.query.version&&(t.ref=t.query.version.replace(/^GB/,""));break}default:n=t.name.split("/");var s=n.length-1;if(n.length>=2){var o=n.indexOf("-",2),a=n.indexOf("blob",2),l=n.indexOf("tree",2),c=n.indexOf("commit",2),u=n.indexOf("src",2),g=n.indexOf("raw",2),f=n.indexOf("edit",2);s=o>0?o-1:a>0?a-1:l>0?l-1:c>0?c-1:u>0?u-1:g>0?g-1:f>0?f-1:s,t.owner=n.slice(0,s).join("/"),t.name=n[s],c&&(t.commit=n[s+2])}t.ref="",t.filepathtype="",t.filepath="";var h=n.length>s&&n[s+1]==="-"?s+1:s;n.length>h+2&&["raw","src","blob","tree","edit"].indexOf(n[h+1])>=0&&(t.filepathtype=n[h+1],t.ref=n[h+2],n.length>h+3&&(t.filepath=n.slice(h+3).join("/"))),t.organization=t.owner;break}t.full_name||(t.full_name=t.owner,t.name&&(t.full_name&&(t.full_name+="/"),t.full_name+=t.name)),t.owner.startsWith("scm/")&&(t.source="bitbucket-server",t.owner=t.owner.replace("scm/",""),t.organization=t.owner,t.full_name=t.owner+"/"+t.name);var p=/(projects|users)\/(.*?)\/repos\/(.*?)((\/.*$)|$)/,C=p.exec(t.pathname);return C!=null&&(t.source="bitbucket-server",C[1]==="users"?t.owner="~"+C[2]:t.owner=C[2],t.organization=t.owner,t.name=C[3],n=C[4].split("/"),n.length>1&&(["raw","browse"].indexOf(n[1])>=0?(t.filepathtype=n[1],n.length>2&&(t.filepath=n.slice(2).join("/"))):n[1]==="commits"&&n.length>2&&(t.commit=n[2])),t.full_name=t.owner+"/"+t.name,t.query.at?t.ref=t.query.at:t.ref=""),t}AO.stringify=function(r,e){e=e||(r.protocols&&r.protocols.length?r.protocols.join("+"):r.protocol);var t=r.port?":"+r.port:"",i=r.user||"git",n=r.git_suffix?".git":"";switch(e){case"ssh":return t?"ssh://"+i+"@"+r.resource+t+"/"+r.full_name+n:i+"@"+r.resource+":"+r.full_name+n;case"git+ssh":case"ssh+git":case"ftp":case"ftps":return e+"://"+i+"@"+r.resource+t+"/"+r.full_name+n;case"http":case"https":var s=r.token?n4e(r):r.user&&(r.protocols.includes("http")||r.protocols.includes("https"))?r.user+"@":"";return e+"://"+s+r.resource+t+"/"+s4e(r)+n;default:return r.href}};function n4e(r){switch(r.source){case"bitbucket.org":return"x-token-auth:"+r.token+"@";default:return r.token+"@"}}function s4e(r){switch(r.source){case"bitbucket-server":return"scm/"+r.full_name;default:return""+r.full_name}}Lae.exports=AO});var DO=w((Syt,iAe)=>{var S4e=bh(),v4e=Ih();function x4e(r,e,t){(t!==void 0&&!v4e(r[e],t)||t===void 0&&!(e in r))&&S4e(r,e,t)}iAe.exports=x4e});var sAe=w((vyt,nAe)=>{var P4e=gm(),D4e=Wo();function k4e(r){return D4e(r)&&P4e(r)}nAe.exports=k4e});var AAe=w((xyt,aAe)=>{var R4e=Fc(),F4e=kb(),N4e=Wo(),T4e="[object Object]",L4e=Function.prototype,O4e=Object.prototype,oAe=L4e.toString,M4e=O4e.hasOwnProperty,K4e=oAe.call(Object);function U4e(r){if(!N4e(r)||R4e(r)!=T4e)return!1;var e=F4e(r);if(e===null)return!0;var t=M4e.call(e,"constructor")&&e.constructor;return typeof t=="function"&&t instanceof t&&oAe.call(t)==K4e}aAe.exports=U4e});var kO=w((Pyt,lAe)=>{function H4e(r,e){if(!(e==="constructor"&&typeof r[e]=="function")&&e!="__proto__")return r[e]}lAe.exports=H4e});var uAe=w((Dyt,cAe)=>{var G4e=Jh(),Y4e=Wh();function j4e(r){return G4e(r,Y4e(r))}cAe.exports=j4e});var CAe=w((kyt,dAe)=>{var gAe=DO(),q4e=qL(),J4e=zL(),W4e=JL(),z4e=VL(),fAe=nm(),hAe=vs(),V4e=sAe(),X4e=lm(),Z4e=U0(),_4e=vn(),$4e=AAe(),e8e=ob(),pAe=kO(),t8e=uAe();function r8e(r,e,t,i,n,s,o){var a=pAe(r,t),l=pAe(e,t),c=o.get(l);if(c){gAe(r,t,c);return}var u=s?s(a,l,t+"",r,e,o):void 0,g=u===void 0;if(g){var f=hAe(l),h=!f&&X4e(l),p=!f&&!h&&e8e(l);u=l,f||h||p?hAe(a)?u=a:V4e(a)?u=W4e(a):h?(g=!1,u=q4e(l,!0)):p?(g=!1,u=J4e(l,!0)):u=[]:$4e(l)||fAe(l)?(u=a,fAe(a)?u=t8e(a):(!_4e(a)||Z4e(a))&&(u=z4e(l))):g=!1}g&&(o.set(l,u),n(u,l,i,s,o),o.delete(l)),gAe(r,t,u)}dAe.exports=r8e});var IAe=w((Ryt,EAe)=>{var i8e=fm(),n8e=DO(),s8e=aT(),o8e=CAe(),a8e=vn(),A8e=Wh(),l8e=kO();function mAe(r,e,t,i,n){r!==e&&s8e(e,function(s,o){if(n||(n=new i8e),a8e(s))o8e(r,e,o,t,mAe,i,n);else{var a=i?i(l8e(r,o),s,o+"",r,e,n):void 0;a===void 0&&(a=s),n8e(r,o,a)}},A8e)}EAe.exports=mAe});var wAe=w((Fyt,yAe)=>{var c8e=J0(),u8e=jN(),g8e=qN();function f8e(r,e){return g8e(u8e(r,e,c8e),r+"")}yAe.exports=f8e});var bAe=w((Nyt,BAe)=>{var h8e=Ih(),p8e=gm(),d8e=im(),C8e=vn();function m8e(r,e,t){if(!C8e(t))return!1;var i=typeof e;return(i=="number"?p8e(t)&&d8e(e,t.length):i=="string"&&e in t)?h8e(t[e],r):!1}BAe.exports=m8e});var SAe=w((Tyt,QAe)=>{var E8e=wAe(),I8e=bAe();function y8e(r){return E8e(function(e,t){var i=-1,n=t.length,s=n>1?t[n-1]:void 0,o=n>2?t[2]:void 0;for(s=r.length>3&&typeof s=="function"?(n--,s):void 0,o&&I8e(t[0],t[1],o)&&(s=n<3?void 0:s,n=1),e=Object(e);++i<n;){var a=t[i];a&&r(e,a,i,s)}return e})}QAe.exports=y8e});var xAe=w((Lyt,vAe)=>{var w8e=IAe(),B8e=SAe(),b8e=B8e(function(r,e,t){w8e(r,e,t)});vAe.exports=b8e});var GAe=w((Twt,HAe)=>{var HO;HAe.exports=()=>(typeof HO>"u"&&(HO=J("zlib").brotliDecompressSync(Buffer.from("W9rheIFxrIB/3Qnoz55s1X/YEmWILAV2tWvYmTaJks+s3FB2u4JIdxIJfq99W2srgqqqpiWVIS4pe9pSGGy76tWU4AFHiryjKNAhLkHpA+HUeUz10yGn4ZA9UFiF6dhnNHRZ1eLczWuZ2yq6XLQr4GmlAuJpqOAITL6vsyJwBy2HLDcGFvpIv7YZBTc2xGFs8mciLz+vZCGj+Tn+/YVvPPgJzoXl1bzn4SH6FRwiiaTWcx4udWRt9O70mcjRPOrwETRcGBn4BEV/vT/jJnX6F0mt6yVfA+i4/VUA4ggSk1KNGRjP6FzJpjiYi3nypf+Yqp6Fy+kJRkJ86uvDardQhu5eJ4ISqOlBDQ8lTUFggae/ULRav5JMdm9L33supzC/LfJXXGaEwFRZ6LLsOngEhlTe0MNQ0iqJ/+1Vv6/fi8arR8worbA6YpJXSvFkFQTG5kUFt1RYvzf3+z2bVfAG95BOYM6LnUz7wG9R/d///LWv/++fr/OcLal7jNPOHt6GKNP2c6HEOxuPWi6JmBYDlRMXugZTfV+nVfiTBSgGeTy2vJTSNkOpdZji+zatM1xO7PZkartuKY2XGBt7PJE+epJZ2DIwL/5beW1BiIA/B+BmqWn231S08/npdKVjaD9UjnPiGFyJ5AAMkPmA3qv27n+Z7t2W2pwJA7LJSaAPyCXNBJJO1zFdTzKW35iMBcDNlvb8JvJePC23CDITOuBiKfySkINg0XZzmsX8WX88vJ/7mc87SrKSGBJaxXhaeuuwU1kxkLZ0Nxg//oeT///8uPe+onra9HOt2QMZQohDRJv+xfQ40LwWDWk3Fp4of/N46A8RNR7fZDfJIquONtpww4CDIsY21UH9qLH98dDBraiPxzfLAIOCDUhFN8JcjAoVfyv5UXvn8dCDVFNrj29mZ5fhlwyEJHiLWBdEE5VUtFDZhlZjf7mbERgEBmEICW9I2rQ89Jaqx2tKu34MQe1sRMtQp28x5QwYPzLpG8NTlrM/Hn6axfn4WiMbfXDoYfPNsdXIGWob8bf25vEKJsysR9hGV9rQghEjNz8diD4TJvgJmqhq45ovbaQ7+KVLwW24A1OpdNmx/95My5N/v3swGNACNCfyjDXZANyTcTYIPd5/v3+h//89Yk8PcBiH3ZkBWAsMiLoxRB0B3PYA3NUMlieB5LLKyIF7VypQlpQ1hKGOIM+Q3N0zXBnjYmNsblyoUNFGMkGm8LJEpSRRkioJlGbG+pW/r153doUmez4AWPZ2VdY9EY2CmVkRwD15MiunX8PMopjM7xhOvR5BC8j78uTqel9NWx3uNOiUSrdu2kiCdMilq5J/w9vD/wg6JJoAeTeiQkq7+x6oDxDUEORZAnlKsXMKoWutzrXLyqOicmwa+9/3fmbvd5KAopWxfjCSZ6NQbBlj54p55T57n9WVz6QKSCQkAAV8+mhWfbKtOWuvc+6zCaZBsatQ1Qyy2P2Doox1Y83mzk4HiSwZsqWRsSMNhmP5//Wm1v804t40oBEpVVOq0mq1+nk/zkxAkCm13jfOj5sR58RelTfi3l9AmlVEZuK1CIDrl2jWKhJkG0kVcTNB3puE1AmI9ToBsbpBSdWPUptFqZ3ajN4v1bduaNxk/IwffeMmwz8Y6nu1vrf883H0qn/Oy/YuJRYgTrps9LGi5X13rFEFy//TX0x3z4U/YSIJv4kiskQwEW2bmscj0V26BN0eloyZh23994e5xt3BeDVjFKECioE2Jhg1YcWE1UNo7/4cYJvffzbRd+aPhTYVooSIaGNj5Jw9MxZ3P2ogN6uDCnuklJNKnAgeSoNJ8VIqVMADbWmIkCB6M1/wnQPVBqakgEw60GkGBgWPwD9d8O/rnZD/bxUVFYgKRJMhEAgEWdiCQCAQJ//N4v//f7/Xhj/66oWNrEGQgCUEKTFIkAgZxEfxDRIhSKEZ1KDEGtSgxB4cVb+5+H+QvU/IL64INCIiIpRQIiIiQomIiFjKUlZEhDJixEBHHDHiLjv4p9f7gHd3D4IgCIJgEATBIBgEQRAEQRAEg0G+q3z92rWdVuw+CfvJYMZEPxFGAWFk0EGQSSn9HU3OpZ5y2GaJeBXzbR2o0jqrcq9vMglJ5eb5Of0/uEghxLvSqjgYDpbKUhHHynBkoDSWoTvZH7/tC6DRc948tK3//7gCroK+9/4G9AQwRQ1DDllKhpQooX2vW+eco+5MR4CzTPk4uAb4p42cTnct+ZBLdEKDCTWlzXF30pfmOgCRD5kofvpLEtDivFIUBcXGZQjCSRtt/fXeQx5bB8bjTxiDz3wtpiVUC4sBkZLoNw0+HA8hX2JjlgYjuQhZSXnPR0AIOO0hmTcjaoasFBUND+QClQL06qXfU12vZWiUyUHQNXjokqIo0nuJUhXSL1CEG3QSP3nIwDUL9jZKDEsRrvqkOSF5lRQc3JgC+XUyK7oFokJn25vVdLur5dZWlTK8Ebd3eiWFLAKHj1XoX6MGZigp7lEK5PwbRxMCdc2q45QCLXlwrKq4CTl3yMbZAxL9frLj4MIL6Vd3jnXbDrTQnwn/lHTfci8759LeDm4dKOycJEwmb7sNAaYqkcuHPfYOFCVBkTL08/DLZSKzEGT1l2Q0x/9waxoCFMIUdkyc7DNfHd5JnguKJZQXZuXVHdeJ/bKB0sWSk1nf0m/MmfAaApXEZ8LdQQpogZnIGZVI8W/Nl8fYq9GzegOOl+RnMmhQ+GEmzIZg94B4EW1ySWk5dNZQUg5XgySOH07Dil3Oy4czZFRX1cciSgfUAhS+1np93aC8v0dWe8CXIzb4MzDnEGRLG7iuiqTRidVVvscBdlxDKpGPECG5hWSKVY3OmH9nI+Ji+QQ5lgdeqEsXV7krmD7cttXm2h6LXHHpk8pUuIXsHE6SBdTv+vY8WOj38bzAO33Py+hc2FvFJqKqdX2I8oVFkdbDDiVSqgNzCuTZ0QNvi1++0iCikmsN8ImhwuO+oael1jUevkUe52e6wIqY3iD89cTfS8JrXaynw/hXKrT8U5LKX7Q3+ZKNd0xdrpqIsKdDBxY5A/2YC0tr+IT0dAh0FEni2Se5RNqCRacxOGRa08Dt8+16ToPdrNz+7vZ3r2Snfbz4WkDQCW0gXCLuwUK5w/YXIPxtkMf9lAloC0bz4muNoDBSnIPhIXKRp6vB1VDgucr3ogb7GfFcZqlBVNjtvc+rFq5tHGMYS3xE+f0utvKwSvPQURxeADeQXn6HgxzOqy30Vawy/85rUO3blqbjBA4R5RGvuYcxeqznIPRa1ljmFeampQuHUWXOTdX1shnQQvOyz11hx6s+tH83NtYY65FcFHpZ5Swn+XkosiX7ILwHJ8baQTYRoESHwvKLTp/jo2jOH13UJbTuPPC3/hErrku5g0OhsIC1atlpwqw82KQcCRaVcbmrG9ujcY5798upibztZkSvmF/ev2LPJadwqRFCdRE4TbwPtWpn5adbfpPb1vQiLLV4Sgt/2TzfwfNUQABjgAIX/ZBQGYpHf94PwUtGN/vTbvOmp/J0nkKrCLh3e9Lt9Q9KpgzoBv6gjM6AbiAr2x1K6qoboirxARUuhyFzdQAI4WEImpf7jgYv+xF4LQCAP/YDKOxhg5MBG5f+gMbu+hF69cCR2LN+v6yOr4y9tug2f9VtW9OEexoF2ww39OtoTOS3NUbHzHe8ceBev9QcNZCXbzSvw8dLSUD6BMEyvFpexq/SS14lSMRNIiLT+S+9f+GsRY2k6x0YKuxacjv4wi7WRRabVyeFBhXg+RoOVO79gagP2SLDg7yS2m/rVISnveIAIkp/2mCm+bDk0NGEHoFpQLtGJm56D2eFJtp5sDCD/nL5as0Qg9ul/9gk2e+suGke1qM92PRg52mnAiyf1dXiT245avbvHZxOZdu5GdpWVc/nDqFoiXsP1J9DSHYo/PGNmzp1+R0JGIBK1PSzl7lJETbJAgvIA3wApS/ytWoKQheKyOAs9K8NK2BDOz0Osk0ll0DQNOk1LFLDGmgyv+iRdKidRYtsEtcHM7CILMMUHfthCciwppbjyvR6kziDp1lWPNMPqtk2nzUDkNT5vMjHYNIbBvSO+uXkVDhCognWfGwB1s0G3DNVGLaMvaYmuPTX8wI+wkP3RYdpIwOYdBUEJjaTqYPEik6LCGgnEWlSwgQkXo7gugl+DyoyihNr1TJqiehA1QxOCxZIK0rSwXiwlg+kFvy993PsWaaB79gPDeS/dmGbbuf/9zunF3MpyTj/r+h7tEBwx+CCs0HWR6m2tnApndivVKKpcEYX1ISPbOR/C/HaKoXyAqntilYIA61YJnxufmf2O7yPoxi33tjTQ4CNP4nhJWfUiaugir5/SCQ8uSAaRk7g+dmciwhmPC6hJWXYiBETMSYSPMNhtc8kyBb7lagzF8kXJ8LgmP1dp3aOdLo8lFfqrflNwbm9d8Zk7PKQDPEERhlxaYifDLmTkDJ5RINj4BEYvkG8R8wmE8R4fdoZgSYCFtFJhBpaouZx8EJKKGYPgtYxQzxpzmzRQGIWvka7NjCKaDhCOykjaG1C0GLbtrxAmN9TLWEXlTYNyqaJFVHnutbF5d60Yyeu6j+7cQz6cjSAI8d02Pr98E9cUo+tqMdKvwyhbMdBfgk0SFeOlG1lNUdjHvDsKspC7QNjqIueRry2QVUcLjnXEDdD1aNHc3wVLZ4uLPLg8BFuDGlqT68nDdOmFhYZKOqW8taWMmAY1gMhGxpuUJ6EIqeapSB8E17hhCA4IrwPH5RxPZIk8WYNKDVb/t7MiJhvzzvHhnUxxwvvaAwNxyXu5nKINggus0Q9XyFOPfMStW/gE5n1AdHcQTCeQfiFKnz7mvuWKbuMUVxG7jhOi4rbOBtP6K6Csj8K5UUYO39zZ2rjM1zWiEZTkFRN96QZASsMU25FQRIfZcZlEAVUUyru7icYPRMQRAcXLeOh7mbKIyIZfmcE+ITkCdDL7H51t227SmQGGtSthfTlSLUPSiA4JDHfGE3NmiAqUa2TsTJjRC4180l+8Y+a/jVroZzl0XTwnMau55yOWO+GXu4KjtOldHJeRpsvw5egQ0AX8Si+J9LkRl1M8ZppSgRe13KBuf+7BuGU3qsdCCEGfDuz2u6xHQlq9gHqsN5OwspqHQkRX9eweNQs8NsLn+N/56HiULUCn5kscJOIYwfg0ZGirZmtQULfSBwg7LJroDHyPtjJ1QcyU3YLDsIIyl25z5u33W5i6uyxVS8mBlTOmJJpvy2sbqDrcdWDe1tE5m/l78N1vV2mSQQbTOmsrSyt53jmbW8tvwWHDhY+ZM5rH+6jQpX9yC1Tj/3hyEr0133scnMWLk2qO4go7cK5KOOo+HjYgDJCNJbqaBVA9czovpISYhZYimHgGNsp2jgEMy9uTuxMywTwMWYNcesJIAobenNqGGw1tWUieH2cozrTWFwkMi74CGwF1kjfgcwHYXP7kmprRp7CRWxdWmYkNTh3/cZgAzHJ5L1Vc2WwcqNtnz2N+xhJS2p3os7kEVLc2BJ2vV4/+/bafOhXprz5IFvQuykZ2O3MXKgCxVwOUXGyfuMIqdKdrDe+TR6hdTqpfs8KSpf2qCw6lBmuCm2rYzakqxpqXRYcDM5s08eI3WFaabOhrwFrHy5wPHD2dvAMLJC4J8CAgBEWqUhWdtoJy1E8e4XlayDuQgsjAhV7JAdnjFLENSrIyCs8z/G4oIRjHOq7K56fFu7DiojQxv1yweSWn+4tSp3VC+eW1XTLyOkTfAj+ELBUp2wS3wdbyBsbj4OysiR+ZPVFgwi0o0CwImVd0Zc7nDINh+g1LLaG5yS1M+FWpESu5KqHkF6YgO2M3MXPTw8ceCoK/D9DhdcZg9iarNKwzqNlq588VqLiKghTRa8nDCnzouMV0uZcGhckIBprx/Qr/IbIGy2PwMdoIfVG6BKnWnA/WJ2lhfZJ7Phyecee4Nj6FAm3rez1Av+hcN9mClPKbVi22agwk5xIVyGd3em+RtospQbl6bJyBBaIbYXUdWVxQfNOLJH5TdnGIzeMEIBKGEsrP1z7qpfohlNXo4+1vs+dVne5qk4/sDVl5GtObn6u3t3D5OSEV0m99qTgdrG96yDd+C0Fg+8nPQT9BABEsmt6mJxrvx9D2AumnYZDNLzHEdIeA8lCpGSFXkjF4lw07n77ICwADeeRmRg9WUfoeM1IwskGqm6QnptcNhu9mYzUxHXcGSgZEBXEG3NcyY5TNcO2wuGXs7PFV3kqNkWC82FoOMNrmbUvdkyC8ulxjhM7umN8g9Vs69KmGvgFPd9v5aQiZ+kq2F+pc1iUVDMJlgbud5cInQJnvsQ0X8l4EJqDxvjwJeq1pn1TKyzkD4CuxwIdYVZ8KqFXR0POgL7gsd+gs7ZtpxJHSQmfnh1rYyF/AHZ6TfhLONcHXes43fQqs2YHKRBZnn1RmtRnbmHoSxh4+Sa5RPT4hKmXZjyA/AGAIuOVkmgZhVTTq+tSEQB9gQKsyaeHPgFbefGPdJngBZDHM4lPUMrvsgCXkEgl2dv1Gv4es0X8Aih/nwPyxiFZdPcoIHH8P1VO/c16BczSIUorbW7ewra7JKw0//Fu76z7/yRoeRVaeu59BCm5CzAxKX5wt0xxa2e70aTWBpMjAuXOM7WWEHVoi2YaaQWUQ2qjCRg/dZIAueFmAW+2EJ3B5qk8TdMsxXBEohFozgKgtj4cfsHSunIJRqdsUB9NpuN1/M9DS6V0CwV2959HL5eaUWE6Hjf/+ngLcGddotCjzuUEuSXtncbrlqs5/nc5zK0r9JYVFi1u1bc4qFnEn331velWoeamXyxdyj1praTScBWy72433pkHCsHY59Npa0Tc3XDXbBRTGwNXOA4yM7aElRMImOE8Sn6Mh0UAMOpscOLJFMsYsrh0xBC7KBDqVjqrDGp/EDN2OGw8VKE/rN5X6E0opITPcTnBX09foM8re89tt8go6JCn3MyGrPnxyjjW46IHe2aOjkwxzoqSLOuLsb4GRstXhOXCIEL0rd/+CIBuq6t0HorSbT/zUvfXaTuuBzNosOImMo1pHkmXGMjwzhSaB4ocsCfHK9o7wMMXeG2/1JSgkuMnXNHY7C2B9vkxe9pjrcZ0QsPANm1wJqLPouaG5yHlvnVZnQdVfelyZmhiKmHkS8VtO3I+nYlob+MegKKWBwA2hmxNv+WkLvI9hneB+VuFBAv3E8EGUyMVQi8Gb/adg/7gwfdmUaEljV0LDxsNMuTMI+13bfNj7beahpf9hFQYURwchYJAlVJJy/Ew0Es9P/nMzJ8oy/595YTngdLeLGKPF14WmFuDUq24GpQ798wedSYA2zrgPMU3jbGbvZYIxFrQCqkgUeh3zdUEHq02Ho4Mcqk+rrQEY+WlCS8KFzhgwFsnSAOJ3kJztp7PfbA/W1aKPyDOnU9EAEX7Az/sk408aadT/loFbrKoI1uTbe4SFX+CqxOAmKp+1pWcAx0FtaTFGsKFEHVRVLuKW9wd4HDqr/xsIpkdUSFiLUl1Ns4QzCxIwx4bSiGmU+6UKbXNoE7imrXDqAbc2RpBBoRasjYiniZ5tSkAYhSck3LhT+THPFbagfLGcYHjoLMoXp7lCHrbatPsHEXlQYyyvigsj64Tuq0uV3bXeR0jFlLNYB8bsXtMi4ULoTB3CQ1zc3ND3ZydDFbZfNVvvegPb6zG2xwq9+szuN7ChXlRnvbRFtPLimfvrSiSDwyn57lZMkoGqKbXYPthPMwSO1UJDTWFNsMrGHO5NIMkwu0O6WaJqEgqSkUlK+I9uARLgAyYY0LO9C6P2UDeFSnuL8dR3Nnnl3jx7LTfeiJ2W9F7e6qTkKEj7UAlAI7TDhrq0Et24WMi+97DUuNFpDT34prDYvt/f2Jvcgwg+DBqb7MKiG5yO6U6QL4i2QO0gmEatPeyefU1AWoOPPNND9ou4oRhD/aBxFtFNO3yngB4sDIugOR9shuhm4iJysyoM8IUO5NEORzEIDGWMbRMbWaFcDGvQCS668Nrx46otdG40mry3MSJcd7C7yKHdVuHiVxeAuh0rfbYqBqsQ99NbVpHziFX6mCCsMvz4cmQQVn/BEgoiSLIFSyaSRAj1ozh+sB8rADropX2myOAGzor/1ryMMVOHMx3c5iwgBAmPoi4GsiHgs8f57xgfPA9SdiAlowGfGDffZA9i0sLJCQG62UDecKPeHxtlDqb597IE9pfx3+Raq2f0vrHVVPOUF+i8CeXC3z9Xn/040ZIJhZ+3HL5+MONVOalssc4UOThfsAbGuqyCCoi33sVe3wLnde10/5kwXxDRZI2ogaj++8iyvXWEdi2LoUhI3M9SpVPOVBdFrFZ3j0QRDkc0KJer49rZ/Cbd7+B52O9jNuy1OOfPF6QAge+GOQWbEQ7rqCG84FuEcgE0s/7o7gv88MdpyOFjYnzV4SjAP8l8/hSTj+/F6SY676Msk8RgjOgAtmaJ/zwpLtI8EvzAgVp9VYiJce/QpMjSaAU0WURhVx96ZQLkmX2KFTYJSWrplWOc0Z65RSqy+R40ozzVWdG6Mp1mVKL6+FPj1omhCiTTdIgR19d5NSPIyJHS3DW1l7eBJLpbdt/Mq6pb2Cy3Nx5qmTJJcOrWPRDdu9L+7j9DWpycQmRcOC72q6bCkIgquZZxwuoibXKAngVqLsheRO87sfDdTsPXLqWbQAkwXg4ym75PGrZ1e3ODjHWzHeOHZTivuzT781kO8jnb4YerEv8ngsOJvHIQnpDIybHuuXbB1PBFJrXGnZHXnT/MR9bZ2t43dxjouTaBuUs1hx+tUQhAlUyh5X4TJCaPy2YQsgED7OdhDXPUrPo50kGRmEa1aToNDMkMOuewsIqwK+X3/0vJTbeXYcWmdPhEc7NVMn2yEAfR2x/t6AK0fochGTxKgtFX4y4V8oKS6t9G4qkxRaRDeimXjmq0BfsN959UUzbEOya3vy0rHiy4J/96dWpChPNuUrD+GyoPTuTrloib78TcB0U/u2yv2JOA7PJxpLyDtKTuNMMeZhnK2pCHhDpEXotZQFxPM4NZQqdFadZ0SL4py6T6ZoZWkou3vLpS4PASPnlqTf2S31N6AU+Q9Zbo3Q+UV4vZI+wgstSZGm7rrJdK5xBbiW+suXQLyVD9Nj2NpUs58ziuaEsp4n8e9SUy1h5cxogUm1XuuF0eMEtfdXr0j3cOrIxqePjjuDdd9yD6TKzjTuMAHqUpw/Iu48GktPB7wl38tor/CB465d3COuXtwdpj+H+Y5CxTmnoigJEpLDr4SRa7FeO52Z/Y09drpzPTGoyQ7IF0WOYXgfRx3tiZH7P6E8eje+Lu4rdR+79Q2b0K6h9fMMTzaMQ81EsWsjheBXKx2Xh6W04Pt1/BC5eQxXMrtL2BhOPLT/D8ipT25NmFPSvVnEkjqmG0DunmtRt4eks0sgPQWWN5LwLBQ41hJYw5pXFhkILw12ube08injzNuwWKnXO6898RGISjNqdrCoaRDTp+ezimOCTdhc+KERskkLhKpJt+tPyfkpN60xiAI3IBhx/kqap1htSQ565dIbBkojSlQ2jsU+Q1BiGu6l25Crmr3Eg/vf1wbBND/zaptCsxJLZeQV22yF2RYFRUJnd10uG66xcQZPBtaNNBxvdqwnS3qrwPXT3NqrfsUIM44KtIC3WKWYq5gipzDyOCmJOtGYx4MywWQgsQOJBYhoBYwKdSoI0xtPaGqukx/G5Qw8kXiVqYyzq6MgniRmFQgkFEwkP2bb9ivcZPcynIVq9MWoz/q2IHXVaVqX174V4ruPSLhy23xa162q71+8NKUGNd8duBGPQuSX6YJS9J2repdTOMN+zQWQcrSsyvx5E9b+zpnfaLnf47YBXOeyvtt3a/4/Aepa3NEcpdjZWdmxcYD3jpPi902sa6QZYkAblOCWjyBzxyTTIgYFRDG0RqoePs/JcRfO0eWg9KzXl8+jWyO4Ms1WRrPFDeZ0Md2dd2WvyuDzmuHDm53ncaJwYI/IijRnDFHAroACq5EK3ptxuGyNelj10HN0yuxqB6YVgzccGz4Biw9Jayrd7cATKjgZzG8ZNC47EsvdnMDOTZFT4LGzEjBGP1X7kx+MBQUXcgmLltMWKmtQyRYURChe/H1bMcQd6SkMvLXKnE/PuJTyIgXva4khdTgEvzu0hEr+Ng5psjfHdMIStA6YrEjtWshlztXV4j9q0rm6QYF6qYWPEgraqeo0JWsYYESEZQXkSQhvgMi0XgusKreGwfgMlb68quZtdooEgeKJlB2gZwXCJXIhBl8KnDs0OWD5GdAZAuj7qmUxdJF/uQFA8z8LIdITmEemo+5fVpt1/QQQ+VgJfXg8+LgJfCoGYTbZZ/o+cQJcyzcgB0/zCy1B2IEAx06B8eyUWi+BRBYMZYnKpksrOcLdggCFFG/AhcXyl7mFP58EnHyWPpgRmJBnbfOkY2m4JUi5oETA8ibDh0QWDGaKyqpPSznD3YIAhQaOWnDMJ8PsGUskg0CNJHgxnxNJpOFkirjtt8yW6G9EngikfdoGraHcTpV6g9DwBL5J3CK0xdBH+DwZiNmMo6uiMXizgfFkMhsw2QwR+mACxPlyekujbg4dnlhRG0HbcGbuLWnPc7t3A9dAxl21byVfUdhxeY0yAy5qqWgX5Oothg0pIRS0ldGXURlCpH5UOWIP6dnzY0mtDIkYQFzeD+IpmkDp2M4e/2AzEs80YWrlUm65hCltnl2WGJdfNBn+TAHdsGW/wtYiQjGgUYDYKJIZhLDJUgkL4nkGlx0sxzkYzgYw2Ar8XYKiPGA4E32pIHYaRjsWjT9I4WVgfzTRu29KGl90gnz7phXpRjHatiOCB2laX3HP13xYp+YUeTAsdD77g4VIJH7YVZUAEi6TpTrF6TIfJPMzDjq+0nU3LGCuvBIIh6Ep3cHmSwup1x9Eu2Wk4AgD2FYFOakaEIeBMgErj7bR8a7X4oyUzqFiv2Y9yOR5SZh0IKtn3pO5tz2CfpuObgtf3FhG9kY05jA06XsC3TIzDt5QKHaxG9XyZ0EoWcT54XAHOcpx5ihLza7ZDoD8oDSjvzb5qcSMk86OPpucIqSzFoU4IxFAkpEqZS5Y6cmXvZqjxoqg5uq12MVg4Ga3xSRfXAXsbQllfZIGlubYzMd6zC2jQMVwkizEjL2xVfNZqA7yzhc113FqiG3w/lq7Y0jVCYdtRDlUyNgsAwIsDXjnbwvdP2LryeXmfTLiI5DdyQaBTMD/7HaQAiKB4tMF3hj63H3BDRI51hAacG6GCPkAOsaaa6dCBAb8fErT5Mg5oFbBYoBHM4MPwctk9OVsZGH/Pd7I0IGAtHYqa8xeY9m4BeuyjwFACX788GXOZCL/A6YVZuYqdQMUE+b4CDYWQ40jLnjp3D2AcbdJ39cU6LPWKC04PLb9yg7FrPYV+8eMuXGbP7PdZdgu3RfCRhGaNDfXVjx0LRonoUV5PkPW2CKeeNutpcWDGm3+XysPHf/3Ht2LjvXaWdGOQRTyimNxsQn/45sFZwMa9zS/7Xf1hISS/j/T70Y52LvZdixnb0i1ggNU74LpwYoj9yamCzYfAqT+0Lp8Q6Bhw4BK7vPh54n1sMfNQdr2vrSLGz8YiIkyhdDEQNBdGshMOeQa97i9YYjVuZbYTDR0RG0ebdZO/gk1GU/uHEUHSHVMor/LrVhpOCqVu5xXjn9Cz8QxUrFA9++TFgduG0Zu+TrOBd7I80t9m1wtVC6tPsHFA4N86/+VVAM4PwTOxLxSdGFhAcDb6JY/wkzBNASY9PFAvGOTKCRR92bq8nKVsygy4d1pfgVNSvZDAJiDuo47ndzHMoQ2J/dQGYpW9tpSqt6dC16Bee6g9NzGpP/x6rq1zFw5UzzLMIGIupZjkZHhEbgvCvYzTrg46zwNUEB5Na920hHBds9WfUMaazN02p81eU2I+ki9+mhjh9EkT14uXbEblyT12fML5sYfosQvKXxdnFd6evMAq24ADr/sRsaatRI1Qzgz70ltTObRq6lB8ahJrOQBeh41/QHP13S02P8UzflM8+oCQ2gjKLnbShgrR1BqzLXtarPYwFA1Zun/vOYg1xFrJih8W1WbOamLprlOYIOwuwP/dMSPTIhnAyGyRZK8SBU5A2FAtznWbR7SYayZMdewE1Be49oOWjZ+wA9Uzf44sAy5qMMKKuMPH3PHEvqGPutOeGUkcNiap9mKebMtMdiqKdUqLNh7bUToFhQfiqbuDzyz4C0XpR1Gb4FzZYDhMeO5esH47DQ4/wvHhcoB6lCzI5Z2dUSGDJx81hk/YBnrpb0IUMOMgMxTKjR57rV3HaGA/onofHxyqhhXXhJi+jxmHmSplwDZWJK5HVWmWd3MmVDOCFmnh+j+HBr0AyBqurmqg9gLyq1eqJpltCDoWV08hyjacu00i0VHp3SPeGCIIsrgKkDF5wyWPZSic5UpEiPoHIbX/WhD4wkU6l2ml6U7IROEvYy2FOT2Odft9s2f4Stc2xGg5ovy58vawc7YHRfxh1zEChYJpIA1Ilb3tYon6uYRhusszKluLx90BapzbtQCz71+U7RM+D+M1XfyBva//uEAPeq3Qw2xkyP7BiKAPVaPk1K981ldniLnj4yWBeGdnV7FcXK4OUlIugRjfV4H30Y4lq+2sJWf21/GplHbHJ/63Yfjo8ffj7p8OYP1y4+5v4B+T9aXEUcZkD9tDukkDiS6wOOv+JL1p2PJy3LdN0eCUTAPjtMEntm/eGp9nvLRRUY0MnvzYL8oxp53MfYPweO7uG+0Sd1UQ24iXE/ujv5kCuluxhI4KsKfMd5ywK7zdvimcLOWTHUgeedMNAfNFNRB22j3HQsCXO3t1sQoghYPr/IDhT9wjd6IGLUK7sD8PriIkuqH4sEXZJGL3YFAaL4KWiQTFPVgCLyjnzizHsJJNwrCvpmXupITQE4FMsadOI73yLcUkvHFaYOMl7M36O0kvmrVp8ljw7gK31l41xzycUx8y7ZIkjI58S2To8z+44z/o+Pbo9IeztGp1OlUAuQ0iqpvYHa+Fe+4oZX7FK2pPl3AB3/M3oqR7fTrHgflTrqiut2CQKYqYsBVFfrfK61fcj9o9i4wBJQ+GwPZKGkgr+S6mVckH+3imZGo8GOUCCKAFhIeXk0Y0glvfvCKVqiPMROGF/Uy4XU+TNHtzDWIVPlv9qv0saiwHxr4eJvo/8pWLzzaPYUvsrCTAGbon26NDBN9GDo5AxJ2HLKvtSffwpmu+yONurAb8fl//FAdp+/hym5mtCPnnd4NXFRYoAavWy/2uW+g2M+0t/Xst8cD6TrAmtph+gwrkZ8Z9NOJRHdZLvGPH/GQVS8kzg0wFJhr23ndh+NEvw6U5Y62tlhThTSHG/3icnSEP592+pCwe9rP/NpPzNEAjD6qWCKizFs47nUqUWYTAmRN0kGuDfHK0FD40QZYsLUl1JE24f/dfJskE9w1Bqs6TbHWu0Ky1VEYFjJiukHYglvuU0bieCxzOiqAFnFIavcEF/6lV9tLbrc3CgUt74/J/B2TNp4VwHB8BW3itDdaaOAUNdwu3fvYIFop97Z/1LuqetvcJ224sNUe4eU+bM17sYQvsA6oAFTWlGKek/hTM5gLDVpPyGhsCQb3nBVJN9zK36C7JgHKPYW+typD2rpPrvT4IdZ9SvWV5x2p2BduZjP10lSGwbY/6H1x9oZe8yxQJvK11tvD6MIQ6V0Zy6I64ac5LUTWAeZTVAyGIe/O5DgeKP3YBPMRLf8dCxS5Y/MOCUb1UQcj7eLtaUutJL+3SGewoaTm4HOMIhq/lh3yM88PVmgQNYNmrgwysghrgcA3HljG6/maM+vIQ4V+Rdzv7gP+PgmNNM7SHxyAZyX9rC9vWIV1bPP2/e1D+yXMQ3agrEku26XffYK57J5hoWfhtDf0yR54VpGkUutvuXdSWKkICNGt7MstuMqQQ41UzeUd/JTwvGeo+9Udz9UdzG2wZ7FdY2c9lM0JI0qWdSfMf9RlBb7//vZeUP7hb8DHsF4AAdS+sk0EA0ZQQJic6WT0ESoC25VTc39LTvnXXInd9J4UeF9KAxZY4/dWCLwLnPyOx/G0oJx9cMRX0AtuyFBXBymKzA68n3VMjhS6uQlbulx9Xn4si9IAbqzX0VwO4p2PCYjrflddcNN86EOyuIX/mM+ipqlc32dINbmieRxbwalQ4QHm2GAFNdlP6CE7jCQmoD0O0JtQVD24ifs/t9BB0VyEI/Yv7g09YMox5FChl01SnVTdSpIzrqRTcgEYS7Mc/vhOFbtGvZHsKZ61nH4jxfSKQeD7pAr1TueBF9sn4EIrDEC2zL3BSlruvZtR9zoRgWJTtWt4U/sWHcuAeY9g8VU292URBp3Yw6N7dQO30H7K6SCVHKamXNLjHGG2do19liNwXWYTXG4Fhthwjldq+Ui9JFu1d/jl5/9W58X+C8a+U6IntFBazggOt9Vuagb8PtNsiGC7PvYohRoJO2+hZgikOJMWngUrPWsVLiHI8jBDEORNaosG+0bHj7N/iYRV7E6xkUwLAGdtYwp0fihkXFhv4eqMJPksTMvLvKZJ4G+he+xew8FPaLbjGmK6nDpbAXBQtlv2ym+i39IM7eY5yH6QfwuS6md5zz+FFRgyvdsrTmQKY3uT5PRBiZu6wl0X8OJGfxHgyXK9weAXsVJVhDBytwIelUwXPfDojQB0neLhawZ4Wq99ZQe+GAFxDH6qucjeFCaG9KGlEH06hvWmg+xraEoJ5p7dhIGcvTmhBxMeCDW0NcRTnv/NHXpFUOD0M83OkkNkWChdc9u+DvqSBc575YyHtAV4X79i4R2c7ZNY+WCjFR3abvLKlevxsrNTt0rqLATjs7MrlGybD49/XxtI/C1tnQQjnIOWk9QY8QSu1k6BGDLQQXfwz6ifUCG6THVk5EK7sdLvOCzo6RwxCGnNc6suRk0oDYtlJdGRLWV5sIQ8lZfUGPXJ04dOaycruoyN742o+6n5SrioDhd61ZDwlcV2aHX7ORq/K0a/Vp8GfZOLNXuhaCWMp83vn9k/9SRDJdgUPIg7q7bH6M2D/sJrOExDgUAv2Tfic8XwbT9SalqLQzIzn+gTDmhsYda/aeJZ0upQDQYvEp++Sv32NfF4lsyFA+OwAxin7UXlD3FCFLJEvFlUh6rJ0GDADCwXPym0txCyXcRn72e9aX05gKKsY3zLI5ZXsr9Oz686kLd+ygP+LYWX8Ca+AaLLNffgEPiwkcraq3toWLUIxMMQBPYVKLqddx3zAjmB3Rsti7fbsA5ZrrMSJFVjsrCFHY09mWPjuVD7UtCxYu06RC96CkcJTx7N7ohmX0pBh4v2UHL7a3alz66ey4W97SOPfqU9gvdTqeF4ES0q8q1PfrCtBvkX+0a9Sd9GYTpU2cLoPmAKF89bn5yR2z7t4GqKdUoCWFlrq8q92RuqicInnRb2704gskKOIX1lKK2FOSEJJ45nInV2JeMQTqRWr5iwXlJuFScfEtJTg7OId4UfomDmm3bp9ezsl9boNVJBW8aIsJJspCGTQDj3Z/lMgprZW6tyz6Wp3A4ABrtXb54D2iuKQn3YQs69+/iWi9kWOQU/tBH6PtVng0yRwF4HfJy24tQWd2Ieih++b9uHptOBTaEFA8B+sLPrgRD6GSPG8bK9guAWTK7x0jNs1nRg/39VfXnyVzzTTTOh2SmJ4VcF4ld+hg16/aGw7HuGASHzccnYjDY1rYx7Z3qJKCB/i4c0SFISquZrscwuFW7+Sqr8n+bynaSfBLXegZCFrLiq7j2DscGuCLPN5BJkE7Sd04Ejc4xZ/nX5OYR7ye8cGDXtwzOwXznL/W83D7tbfLbuXP8X92vOMb2+3y/q6vjGUJT3CRond1d/v52MP1+9lkrGchE+wcRramwD/AqVItw158WQOUQvB614W6+1LaEPszGwgviU/QBtLD0lVqc6jqNbG/fzyTnmnY7aIkxWI2NCsfBWziMkLTOhYPx9yfjdqtyQIVYEPf7psn3z0FDvimhtR9MLUFuPm21587qeuk4rw2qRU9DotMWRcgea8YrnN1PnIHpjJmfhAmh/3/XSMz5ftrmGNgXSJ9PtSlGnuf3ZihtKDJOXu+dY41/TrUlbnt+//s3jm66p6lNnwxirrzxxqfnRRq4s4HjWp+5/ImK3/tl47e/gdXrMrKisrN+IGFY9oIEB8WKiZ/iL78/c1DtDrSK2El86L/TGW5URwZmOJPk/SpqrrEG2QlM95DMZOKGQrZr5xZNYNFHqHXnEVNguchSlz7UjoLKIZ0ZRa7zZuz+7rMBmVjVPnXsvwSliSEbTA3Dnb0g1J6F+ydQ+RGxGtp1TcnpOoKrZEDokfiyi47vHEQB0tLadihxAKlsO52xKhnGjSdrnYPHsBNTLUHCpEAltFsPGYb6WxU1A3rfsJ8UcvEAISHSKRiem4Fl49RfVdputOZiMlYiegCX7e2mt2Q+9qcamVDW+1DWHzulKoBT7cNn5E4TupWHnp9toMd2Vvx+g2C2KAKf+2S3fsjM4O2IPHAOJj4/d6vVJpPURWC+7VPId8xXqXTGLBQb83WYMm4y4wIP6KQ5aiHnUVp489mt2RRUd43EIxFkM4OjhX2ktodyBTnWhy50kBbDFeHwe5I9Vz8tFGN5lg6VBE6YfsgNPvKIRp+GEd2a7Crhvfw797Gttvl6Z7g3FsFAiQ9Axnq80DKvcceqlORm1SJpPqTq4+U8DgdBq6kIKZfHBsUYeSiiwOP2RaxICtep8+jLz0JaLO8gDOqxs+52IK4T7LBn3jNOHvSnPdBkNtubikIlo+3bdP8rf2yR2Sn5msRepV4UKaDY/AwDRM5zCjXH7EDjw6jOO1O+YGW63mZ5Jugfcj4gcinlVaZQRdPzBn1de9f853g//55tRHNS0SH0IOc4jhjqNXQokPUMDVI8QdpJsk9FchRZJeZoeia+raMvDPzIGRDV0kcejx/Hq+5SvdlYsBVZDvzeCntEKyV7rBHTlEeOUZIMmvbCMyhWF27ULoxyJGQ7TP20IPc6WH2bb1OmtcsNdX2eHvHzwb8oWQpnkbdS7zuZDQxshWty8IGKuahhe30vFCjKJCqxuVU683qDddd7LdNhvEh+l+L8nPLR7WJ/8jBnLpBayLriKBNQyx3Klf4tk3DnwDAMHU8N2HCtu3YcC/n5AbpdsfIip+ebVUt9oT2/9gtp2AoYieQozaF9GAMOtmW7VI9ahV2frtpcSOfk6ZyFCb5+jwuvTSZbnzQ+rajRniEx31KD3qRf9f5x11iholD78jKmwI0tgr6R4Fzhc4jvAPtHgvUNV2NwTAxrh8x5I+s3rDWfB2olcMdkhHmDjNPEmGT/Q6+cji1+7x/Rv6OSMKZhoRnwGs3WYfHwXQ806MBCA0+0/1Zd+rLQ7VAsA2cSUYWXa20HdzjPaZSUjEssjEurnvJLIYKWRdpcKPLz9zcB6s1qjWaXLWmxmNUHa8pDnYrAT1nXhkrZlHMgf/hc9BnjOm15xhkYtYzxXlaIE94iFNFyMt0wz5B+bDSDEvawRxgpnfyhJ/hk+Z4lz+Dz/4/fv1AdMxWq3KIPY6zM9+0kcCTNriAgVtZItvoujoVXhOngFoKpFgoIxv12qZeFJ87SMgEQey3HpYdcLxA+zDMmWBJJs51ZyUfdBNv5rzN6lbnoyxyN941HtVR3LOsJ+VK5gzD88EX0FCNl654EhNLl54i51taeKczI7MsXS4bf+oGJ4xY3IsoHvAhHd4IDbvfV1+JdBv/zVrlPYZvnbfFXT389zaHqrB0rudaPWP7yC11Tv02LH9Z445iIPZBmnA/DU5vR6pjsj3uwUjMT4XxsNAo9X0yym2/h+UJSgGACeeisoogPdg2v3k7mEBd/qZpuAzSNDScM1BpzR+8po8cVR2HnTBkaK8c7aT1/gZngqozJ/Eye2p7AXWaG+yp+0L6937kdMlKnRfYqEsIxwhKTszMXVfv/kAQ7K5iDkKwQ41pzORw3LhadqnTIM33ulCAnCotbNdAhtMZMppp4I6zijJRMaDJ/AUP+CYWFK3gHwD3FNTD/P3nrB+87xjcuYQnVu8mOEYv4GujQeInPxlf0+RU7OP2N01LdvqXySdp4WUAFWNsEiL1SQ0GceA77pA5CjmhqsZ5kPUNBhdvMox7hYa5MktUxCxKmWNS3nEMMaGRC35wbTIhHMLAX4ixR9cRdUa4O5rMe1pvDUTr51RfxqAN5KGljXWcMM82Gyg0JJxwYnE6lY44TMjh9QOXZMtsH5c4m7NOro1BFwshhWz7xbtsHNghAmcCjiT6O0/7AMk5EJaYSGnDx2G2Vmv8VECKWs7V4fHZBq+tqW7rxhuZ+nO6g19D4KDohBDmp3tO5jjsGJd/6mHM0NNB8oZk/dHty2yE6HnXP6Okxbw5BE5GIqHnJFjjX07qzdLRDs/3f515vyBuFtPTMGSPHewemy4Ansz90nzlhxDWNiEX9A3nmFSEFDMrr5dJZEXt9+RV9q4wgbELcT5PAHxW8ARdLoCuzxr2utOogup3GthvPLa6zLqFJO7Iecck3ZI5VsFcBdGg4mlEEuKzLlLDQd+TfrA2+6BzKhpdDZUyYwm2vFUl+6BhUEJbTPl35wglJpgox3JPSphJmrRQW4UqGtZ3d2P/0bh54fMmDCjWwN2ar9U882fCE9f9lEfzm5WzDNYBTY4ym2CsZly0s3IfB1S02KkacYHgFFuVJ1irz8Gj4uXPVDeRLkb2hKAoQGgYI1lGwbs7HH18jy7K4GPogcfTQ+ir2Wq6GQAFbrk2iLpVUrMDHa/9Xqqn+DDNfL85PZScr/R8M5TKJKzZdPvYmz5Bzn44u+bbnw9iR5Jf0v+fHxG+FaHDQjY5bjVVO8LfHFdzVUfgkdfY5Xp0Je9vJI3p5qVmjrsAitQqUKlajU+2bOl2M4nh3yt0p9LM/c4gLjxq1YNgwkgqQ75iPyinrK+jbC+fNWtw946+YQAZgAczT4VQX64yHCwEgct7gYM21HpMqAkbhYfKgfV36I/PDXq9wjmxp9nJ8XviLmt55VGMerp36BHegvW9BDTzU3F2RENf+gwhvnjGoJXdHn8S9ZhAQHt9A2NmdPHMJTM66MLJs41OFELDYRNaWYEZ26BEoNe30xJ4csXXrpwmseXu/veFoM7S+1rx7sY2jRwKdaNOo/f0yU46aXaqGfztxG375GOv8haGm6dngnRswHrlXpxJTxcyepCeo+C8dHSXcKIB6RnYqXZojryvgnGpTz24jFLQwuiOLSMPDvFoLr9r6wHb/2dwdZe4pTxluXHkO5xtUQRC0WPu+GxhDX9QJZQ/VDNX3mcu/rz/5RdteUcyB8dAGoKAGCfdkBLr3U9sHIi4mvXt0Bis/5uBHLh1Iuyyo1r/vOPIoBJ3JMneSZLncHQ/3VxQOBmy/btaGLpJFx20VIF8uSUVUzG2JMsCMQzU9sWDNEFuG6qAxsPWpaOJqsIwRHm7VCOXgZqWkg4s995OJEnRhqW6gjr9zAwI9OH6c4Ynwv+HVQ3f+2H6LwJN2kEDPM44+aBgKPLKx/6OhJiscBaKUjiDZyAPlkpU5gD3GA7BFBvxkZ1rlKlZCpuoX2FkFO2VPYRLqYEnNYBDvXozhnCDIwXIJ/rIdwtMj8f7vcbdNAJg+LAod3imF7I2ngH06lO9b11D8nN/C7yRva+p21sXf7EiwP29yuO8V1EcSFRg6op0sbUyQPBavBQrAjF/AXuQD0I+dsVG+b4EVnrGQIhZeuYve8y8pF9qt3TaHU5xfCxTUCcN3fX/t0N1Jv7BMqum7fV/7Q700hYNjSbt288SmZI48cmyeNjNFVbtQMDQXFDcN/LHu4aK2A49ro7/el6EEpzMEJQdYgNSyt6jH0AE1fQizPjUAJUM+31O4ELwUzFUH89OlBUCay/tbQWY4YW3me6Dn79vtP1fEEQyq4qB6irAho7+UxtWQ00BZeL0+wIBHSjN08z2DHOp14bTtMBFAWW9GafurTSOQ8j9Km5A+0Omi8aCZbEOXOjTpBhn8KidvDMIo9Qnb+IG+MAoICaC7hpjOMx68hfaM0/h1ymiFbbHOaJBKRUti0eABE4uT+eRhzfZ+8ee9HeG4H31YN3JLBgzQ5YPAgFK3QAevF9tsTBT2JSzq7TEcekHkrvmsVYBZSaNRWApf5eWBoTEGjJZxdWyGNUCii+sxXbGIFLeFxtynPVcUy+TxUoAJC2l9+fSrPloiQmQECxx/eHKr3bFJhjoMJeMJVY2wS0sdPqi9t4WTCDNscEYKXtBTMvY7X/CgFwR/BcKgrCn59CA8zwmakymjUHwKyAwqkiIMhohKNgDkmYsOKu+P43TBb+07Wgbp0BwBwDpo/OhhX+0+HApO08ptRD1ThU4A2mBEDNlUOI/5OYAII59qLbw+Be4m/3/Rs8evQnhOIkf3SmRiMFhwqjRx3jBbpLZmswfNgbNhrOjgbBvPw0IrEfboOhoAqzg9H/jiIYxq3dg+QIHYLqhMaYyAqPGBQS84cbH3fUg7bXXDtEF7fPH43L41DtCwnE20NBJKzXbFbuHF3LEptwW881SBTYq80FIyGJ/Kxy1vxPsZE5b8OktKoeVSBMA+Z3MgBYAii5JAwR8yAIh0GMja3JY1NhqbvAC2NVCArGiQBD2WVbAJcBIYnqS7YANwCNv/5yLQAYEJjpUi2sXVLj7oU2vFPI2piWsa8Z97omNPHWQoGuCmoF3Eaus/Hti/NqzoOrlDYcKCGrngmBFRObSSDkAQnpnwmSK023q15NPI8d3lma60vreyIcWXHTshvMfF02OFvPm4VrJ36Qyvr8CcFsBM93m/8W/e4gkaV76460ekp10+3sMGrSy38Dfbwmi3ulfDQTThNUWqhMuH0nZ4ekBrqQQEHa+IHP+MqUpWfHfxRm7yGs5Qdb4AsldhgGBxhr4yHi758U4b3FVtE0TdJnBOm7Y0Mos1O64PhryWcJhmLHL2e2TE56xHq4CQlNzsEFL3SebO1AwaDUeBsi7q0Bcz4rru7DwZHssZxuyc5ZJ/6Jfm5QBeH0ZhMhZQFDBR7OkhwF1y8zmPPCkqTrwJJ49Lue56ois8CDrNe3JfgIEX1sJvjRSOrtlECBS1MHEnbrGhDVvI5iwUfoHcGnN+rizkhx1DmLgy27u3Z5tM0DoVjt9o2f1nGW1klDDK2RSVgvJgLDLN/UJI0LFpsy9ngkkGAnRBeRtZbs0uqpGiTkjrhMNuztqmzmSALOZ5TWWjSfSoLEKFoVv0UpFmCtVHAKARh9eq6803sSFSxvqk724n3g2pUaYgwGTkgLD84EIOgGL9CbUy4RE0qJ5b3vZgyO0/3h9ICCyhgYfad3bCVY6Vi6wTuZZnVriASjl4Mguj9nMfyKcZjR26Pe93I9Q8r8MWnbyl5KVvkbyHtXvnJVsiYJXO5KJ1T9VWg7fZBbAg55n+6h+xcI8vyD04n2CO/3smFywbugiVhcAnVF2Pt9KJRX2zfj0840E6Kr/2kiS1uk5NA+uDDizI0waJIA3lrGiGJTqw8SKHV9myI4KZoYwB2AvprLvfC8aUDzexKDV9wOw4wtyzW4+SvPBVxb1+iXo1i5NXzDYFqLPuHQblbBAxHwDAhWo6ZRE56HZT1D4DUOjxwTQpi4owvgmF2Y/cUwFFf7k2A2kIuapIAbn2KOfFmWL4LzAxIlXl46Fj9hLKPnTPZ3lyinQJ3u/hKLeDrwPbBB4L8DayxoeILnWVPN4oOvTqc10D8e0LIWrn70hX4ez6a/Zig+YdydMD1/WHw5wrimj/4dmPeFC4r9wxrDFnJNiU/N/+HI9pfJiRy+QZD3Xj9FwtMgesvfkQLE23crMpdZ/K6ecN0Jd1diFX8+YZ+XEa4X8kl3642uAVDP6mGGEZF7Ku4uhKEfMciftC6zhEQvW18qZiVu2DcSlj9pXeaJjJ1kzVb1wcGlfZlfPn9Idkg6SIZljvTQN6d54gqD2OeAjy3i2Mn5jx2JqN7B2oyQiCDjzh0CtF8VE5PLJUkk10VVWh/aufuUz5BmmikqGj4Y/XJyJSDzrbcapBYKYESY3cifp8cR6KiWmTK/Aw5vKM8nL76WQg5mV+zoPvmx1uPaRpVVvg5Dciyf/nRrmPPl7+O2x2czPgPPFa6sUPKd5htET5Altpmnntayus+hwvdlbNHwGT+HGjG9LITGAYYI3VH8IXS7EkHHlvHcmShPmYKAzI8L0LKfqwLhDP+aL3r2VkgSZULoFuBMBD8/P2xVtdDkK1QC8heY4GBigDj+LiTO086YsdJQ8kup1KuGIjNVLSABwC6y18+Zwy45bbG+rRlpHerQam/ohT6s0wtXQGsudyhmaN5+cc1XQ35gPh1POYyGov6DwXqlxKcXHn90DOYmR0n3g9BBFvUfS9YrpOCbsZRNr2TTiiZUopZWlU7xJHte6DJFQzLaoudwVqGun766voqWzXRlU4HpuBMj6F00QZoKAfPsuBhHWP/hcL0e4GJau5Sh+zcQLpx9u6gKwKGDRc+eLi+/gX59KQL/MpLcC5Fibe7D8fiRw/MzylETL9Px86S4lj/OV2WV90Cl3/sdxnREgqRsAFwQHFyuTI9t0uOcJZvWiPRPsjy4lHPtayMNsBe0MLay5phGr+tlqf7jRevfgrBudefV1N65NRteCP2+G+CNRM919qjVZTEEytilMYTfZLA1PQeJ6c/CriNu0S4Iicuk5CE6hN7iC/GjIFFBQ4ZMfmWd4oziEECieWBVJsjlwxlTEEcQHmlXy3OsrmU8zMXtecDB5viX46lPBoShoEwghF4o8uuHrKkwTbxYdiDDgIMvuiBLvRwFkQJFEmQdtOzyLGsqU2EvtjKeRM2lmVyrIxxYCu1Aqu3p9WnKW2Ia0+L1ss5ESRsph8H8pxfgKZcc8ByPvawzGRBhkVPAjyeXeIQE3hOBj68FHwOB90igXjup3qJxLW4xNmos4AKW7HpS9RYQOS7+1eUYgAlLwZpZqwASfzHARAAwtuA6XvUPPp4KAGijXKXXDStPB0F8i6cGY6UkJTAncExaHa1ekiB0bPYyLQKYACpWgVtNm4RoqNcoIARAYEyuTletWRSuCu0C1HEO0yvi5RUMFGmHRNVslkA8lsRCgPYxSQDuSkhB7qmfrfiMebZxcpjn09O1axdzHieXtuOo+jMJxbWOc7CByPriXnop/3GxD9xyCq7uXuXOz3b3mXcjoxu+0lmsIbIYdySu0a3/mlkc2ke6LfSutl0sl91YIzonBDvMykxEK5sNDpCcVFInoaOOP/lkk6fOUaaS14wEwikD+cwkVeG4pPjyfewkaSe+UFe4+U+TFeWzuKG+Wr2/cn1N+YCRElt5Ez+8F1JeW6XtKYceSeC2hOQT+bh9eIcCxe/cGLh8WJPizCdxNFrw8kEP3iaVGnIC324p6szYkhdtZqGkgP6NoPi2uvLeYHNpvSVcnuJPVxlqAEg6JIx+OcaqQffFwnRnX1KD91SojZjJYD7eh0oXn+3yyTKKD9gFfcH8NnLEwALoqUrbZ5s+Sdf0TnhmOAZOuOb9efhnpVciG/oM6ccuZzpV+PPMMtfhNOoAEzAg+iTzHB5henJO8/pbwLjb3XrA8xaRrcCDD6WKCxKQlVYxGyOfyL+LwNY8mIyvlNbNLhiqc4VMYVDtQzWsf8V0fy12b0g5+OuYfH6i/pWbPeNOqW8D1VrAOhBFCBfsJVDRZhkjWdRfKvDkw88zo44wfoCRJc0gOdkMNIuamWC9GVhmmvUWD4smAg9ztdyBIz7q0HytAgBDBQCEEijY22IpxcWZKJYlyDEQwJvdeKNezkFiJQoHhnSQ41t+LBrxEn+pskEkPySp+10LAJ5KAGjzwP+YZVYk8K8CgEge6H7XAoCnEvgy0Jzf+qXsXWNcrlE2SiM3iG+gq/iBZflBJB3VIXIFMgfybEjze90smnETbFRHvMYogOw2MPUZOkquQPEKhwAqvrXZtCjHGRNcxLDZ3iIXkzGsJvmrEfO5EepxvORUYgCv5wDpiT/6LB776pUR34klHg2lkO8/qT8TyYibk8DRVEhAfikbY6pfC8pwLAaATCEA2KsBx9DcJ8L1NpBI2izQOjYQKLIBqrbldxFaNPoC5IsVCEwewMTCmxvVy1ORqYhShq3Dlt9NqX55rxCpxSdMg5YCswqJIUjuGlXPS8Z0bPa64eaACkd4f6z69MRbaV2jS3+/oF9cNIaCpOaSHLY87uieXfXCAJ7JAgGp6GliNtYHnOBDPXc+Hkl//OgxgKO0nyqVBBnr9s7xP5D6tliByf7BHuQuZRtsYS1Z9gRWXxQ4/YT64kRJ2VYRZeXg+6cu8z8wq0QC06DjTT3C9whbsFHwfYOjgLgQCd4fTrsTVFme30kcWb5KvxKiFS+4LC9R7o+unJpsK5eIYFK1K67UF12mV0WRWo6kvMJnaadoG4mwGmwmo6daoYnzfSli0CyLLx2U9XQVtefPQbXghiMOGNn93Zv+nEBF1TMPXVUWxWkObrmip2OZrJjDHwwi7y1OTbrPAvunqUiymUl2MQIfIB4efHs5XqE+V5aT2cu0g1YjN5ugqm5v4ZJ9mH5k5Gf9yRsJMWR5iK+TTE9wU/WfQ1ZQaDULX9hq1ABhnW9vL+tLgxkwUgTAXQpEn3udwd0dn5nDBnWaGK4iJ/2VXFDArpXwde7KBru0jzMCUA+O6B53SEV7f8WvwZRWlnbKQFWTD/Wn0CU5LRknMplX5FvYCU+VmulDjweXsPcdj2MWwEI/ccFiDsM4ZiY3xNwcAH3CxSquoAOauJMBvp8Qrr6a2MPCosPtm5fA4m04ycrm85OtkyxUgAJk47SlyHsxFnmlMEVCyrSoz1n28DHbEfC9UotAbJA3L4qpFceIpLAwdzcofVGnBu88tOGyfYOdDfaTOy7TMl4jWffiOc0h9cHj0NIT6eZVBDDTH2NtmCvrB7njNz7NT7fZROAMFyUOnMMi5S04p9/0ULFJiXMZioTcFTyMgadaXB21FFLPxDdlX83Q63PABOD/DADz9uyWU/sAZrl/u0NjL80XkidYvOSk5RbHjLsy5s7UOLbXSnlzgwCoueQKqgX+7JeUmCdySrdcw2edEfeWci6iO/FlqDeEn+dsHIn53RLqrBmoPVKWqgapjsVr/JY0ni8CZQuy9TEKbBmXfCqMk4EjQSrnWiJrStFUX8C0tGl5BoU9v4oRwhIg/SLV0TjcLLwLH7IJIqFFAg5vHRnvidyTdINm53o2nt1r0pQ058hYjR777CgZjE7gcZkf9E84qNYyyB7+eA06D6fOeUlsXvxaK1nx+QX0Iv9RT73fJNEp9vUeSHSVEaADiiCK6bmPKQbvH89GW/G5eBSmq7zWH7B1xcAgVR/uiS/cLIbujmk8xU++Ai5zd+Y19qK0T7i60dorJqXP7j4w7bsQo/nHPYPBNTd/tI76P7RlnEv7nY3cfwUcMH05nnaT2Dm+txdYrDxUPl/Rtf/8cY358+3t+Nz/A/6Ds/2lmTV0bpih/CdGM93E+6HDR366HO7woLZgN95iNdykO5txY7A9DHz3yR6pm7MQOzjcNEs7D+3J9YdY6WtKvcdYh8ELM+e+BP1nvwS96x/H8idjZCg1Pzs0PmYAfinAvmVLHqGvfXzXBaO7imaiP5O0v959DfdgWlzp7KB540zjf+n4QhqA5P5Wtq1alCyg46U3rB0a+m6jfnkVgWUGHQ8CvN3rbB/maDy4prMzwmLX90yxV77FUHLlrdpsP1xE09Gb/87zwgiQM84XYKCNb+/m6HCx1GpzxnFY6FvIJ2pTw9CL1VknRxy4frhca1UOYx/uWjKVBbhTqFm7NXOlBRi7pg51rB7D9shfEV3E3DSB05CvFxin5e7EUGTsRoCrIAPj9pVdqwyTUEyPA8VkDhSsE+OvFsegqA6HZXjlUCyGxbHAOroym+RSdm53L/QwjgPBmRIs9GpBtB/7eTbf3WPJDtuttK0J6eqQUfeo+JnCe3utwA1NvQRGY7nV4SodzXDMam4KcTxCh96Gc+pMrjnMDDYZSq7YLnWUy4mVwAbLS03PhaZgWrx23XJI8m2thFNUwXetVmV2hKbD34uDXvbNDTNwsxEcNYICIVisedm6mmDlTVP+2ddp5EgF+qR4DooAU9VyJP2q/oIMFquWhfxHKhi90MU739RNCizwnYje0F49Zp3AS57mq5Fkhp3WfUV+PirtAchAOGSQVeQH4FlwScnBID6oCrjDVwDTdD9utvQ7bxLIPbrhN9qRdeA/1s6wrl+LjZFbxPLAES36qYH0u5ByJVcKEBvR36ZQz+b4zXj+sRn1H7ut8wDd37Ml7zT+m+U8CZvKJ6NZP/1xCG6bPl8sy47xAXp1ZR5oH5pHGVwgIVWOr4pszc5+CNnf3mlD4bS3cg1H/2F2VFDavVtv0Ok8tPfdGVNZQHvxa8gOBZBYHD+3hO/Fcxyd9ULUMqH8FiaA904JPfTu5Ba6TM5G4PuBVJGAz1mgb1buQn8tHwtZPcVttq+HPYmF9HlxL+G+QE6cE1Wv34vTTCEtNkbY6P9soR4AtIUlFvEcKYgDxlx14HCwNDsHD9dCxDd+dONBJ54YigjTNWGQUAzIOctatI8r+0IluXdKA2M2WtJ8SdqglZRrVFQtyu4OG16+oUqL9lsSPyFGhsUNle4ycJQJQ4Zk9acon05tgD56oVACgUIdnNN410iCLoEPoA1W5c8FeyGBJfo8aOicuwp+uUURzdqSMyCimrcDA8XNgbmO1B7bExBcSLLGCGNB54f97k6KfoTuFuaTLSyWmGJ1HaZBRg8SHzUgwoCPWjh+hjDv8fbCzu3tUkXO58NPqqOUV8Z3w5lnusX2eGYXjhKUdD6wSbgcLO6cwkWGdNf0kGVx5/7kxXvAPNzJVz959celEJO1igq7OAZBycv/+S5fd9Hi1qHtK0uSec3C2tWManfLG01UQzcG0tc5KLnKMEDM1uHPtzkpRt+Hfn4oVGoeMEoalPGxXTxisGjAT57XnaxB6RN94Jevv4IeWT++7WMdcByAMSiYERKAReP2cTMjTMiqn8UDqO+CrS8IPRh/CCp88+Fg6lNFP56RSR55CnrC+vtXbTPW1+icHiNZpGrW5xGL9WQS0Bc/iAdKiEx30AZ1Yp2pEzNCB0961EZDPFR1/pgaS76QTmJWbhSuGYFHH9tS5IQeqPkx8zSiKQBSJ94odIFeWaW8Mn2x1pERQoWdBTq+29jf72g18Jc4W+saniW1/SlIgLUeq8s9vjiMX0QwCoVRbB1vd0t+/J1fGtQ0y6Q7zCx79kA6DGxR5l8dzjkoqinM0FrWyj4T6rxhTsNF5N6PXosIezfMt4d7a/kUjBewMvyOwmDOI9U+KG/0n0GdRb5Q+jfNQdHYwuEjpUbC/ij23YKlK2WisgFKtuGuIuVMODmd/+yEy+rJePkabuy/najEkkciNX9uiLTc9WUIjsiB1bDbzp/kafPpmRInM0Dg7zoUPL6bIvuNl+zTT44LB8Rx7UXE2jagbDD4x3LYuX1okdKwIMm8xAmwsyDsl8BWmO5F/QOUFrIx2oBkG9hNzuXrqKtb+HvqTb/15PKeNC3wkWp9djiHna1Np4vNSsNJgP00moCXSEeSVvEmIsmqVBBK5ozfZIlz+mXHRPJFW9QQBWBUUqKKbKAPqusnfxxN4sw90WWR6TJWPHBeVCAsAKvhW35QLXiXr+rVkKYsM7hb8+/eRzigWgLJ9tYE7ovPM6J25PbzCIszMY473XILsLv6PKZOzvJ8ooPf9DvrCX4WNxu3CCy5giAetcAONN1quYMkoDaJLIQQHS8x0LieAkaxKL79H5HoJhi01/VcRcNeY1plg8nVPXLNl8W88QXn3JbMkc2hlbnytIIYkRhK5IR266P2ueBcziUeU6HlBQhMzs1dOEKUrJMozqrnSx5ahhzPAIDcDsp/vFllGEILFWYKyjAxBqJu4138uAxEV2C6L/S6zCGshnn+ESF8fgqCtsr+YWqjFmaYlBcEjW6v0MS57oMfcvgpQvSbX0WJokgexzsZs7U8L58n13JANFsaGquSCSLQcQOupzjSdP+9541t9JswHAJT9L3DboA3wsthjhuUHbWtIgH4pkyJDRnoEZ9bEQFFEiZJoNc3cSTnZebfmLQkWqyjg+EzB7KSQF84G6CovScYMlECR0bjZ1Z3UQ0m5h4qUKJVHmdLtpF5h2HPcRM+evqZ9zTk7oAE+yvcNFpwlwTNtqkgmnVTanwn8nXQ93x8uB8u/psW/pKYalPUtb2i+5bJJgTXyDZc7T6vuzFv1iF1oFJjz24t8UiodSPZYggv7ApOa5zOsHp+adoxF7Kmfl0fbbFkdYgnbz+G2f7TKm0NonY5n8CL8MWhAbK2iwY0URF0ckBqOJyNp+qLUBvelKgtZi8GKZoOE21oQw1cFhnP+dNOXLg47czFb2V9rlD4tAqXNe7xWFSEXnLXqNhO5L7zmkMp0G/0RpAVYMjdQHaXNwwC9afKrMd12HBo5Wn2vgHcQC84xNVjAItIEi7qHGOC/Amey2tANMYum7TvPFLpK39NCeoZ4iT9FXc8IsKBI9G8oJt/lIWhckMIzPo1pCaaywQhXACXKErd29ZLXP7HBYIgm+DuTmnj+U+HVdRtW3B+xev7Z40j4WPwhP+Y22y4xVO/PLQlSvX6gdFkJaSDup5Fyq27Cwr9ofyz+PAQLsAXBE4pKqe4jvsKbC8bK6D6ZYoiJgfSN5ICCNuDeQaUkwxG3LKIklMBJDuunupr82EL4Qgp4q0dDyT4NHL7qcGhjTIUhI2uozmoQ84Dv3VGGeYqo5qFhudJeeAJoSIdOBFkOBiCNYY69yb7a+ZZvjMR/ywZVNrcJ+1ScFm4PZmp5zWzfXEiLOZTIpVwYjm4mKsPaUB8q/nqLHI/9tDnM/vtWwJcauYR97y+iXtp4vehTKrd5Tb1lcaJuJ7Sj0jNO2RoaTNr7zfCqJ6zUvevuBDqQsrpeMqKE2aZaR9i6x95H8w8tanrIbWU7+e/ehg3yA/9wYQx6xYSN6WmW1nu2BgbDir/G33dGuwBPC/x2rMkeUu5cUz+/9oo53+NX9GZbO/roQ3+5JrnAPZlpcKUD3mwavH2SRqTPn8LuiZ94drGIDwcliMNkUaTokny399qNRt/GOh8pmimWEZ+6+zo55/u7mBRZYkuG7NHoY/QXec8Ayuo3VB4mG+7vwcsfV1VBEFyEAAQ/M8odHcAKvedlSKyOa2Ly3DK0SPw5wkQSiXm/4ELi4ZX5R3PDrwtigbQL4A/Atxg94z5o+y/XeYPTrI/zCuGvnYRugNOCSEVAMqyn9/RQUi/mzXgIvS8jnBqEYuoF/yUdLMuJ5Lv2knp2thMJj21QpFPOD0BIqBZKFXdpE0Ts361BNdykoobMqPc1EeMwGMel88xebM0Z1BOVV4I4vK72W23yRTQ7YbYM+km990dBSoBMgm9Hn05P2E+iCMqSCjGWnZwWNhQzIHC4Y5QuT1Nm+1x9glfja1uJK7xEQgBfKtsOueH7VoDlXPk9FdSS/rJaMH8XqfThUNjv7tvgcYfHWffqGP/iM6h+DaJveDda0VDxPh/d9FN3n5AQE1lprV5NT3Cz4zzjV0IzXjrJeUmWuNy3+5pgYs2i9+vhFqTYxnBi5bzMwVfhrsihZJc9mOO+vzJrdkxQzj0pRPFGPL6YlQLxrWIKqj1rr80ThlfMxckMiGlauQwtOP4qIRkCnc2jHY6Mi0hprc5Y3aA47mFIUqH32wijjN998Jg/YyL+ejyzVsHiO2E/U+0UdfqykrnF3oBV7oYsiyZpgl53Uu+aN5rw7lW6PIwiYjLbWL59x5murl0QG272QFx8ZYM9urtLgKlx4p+JL3HmW8dBAJgkZGGdncyNWXhD6HX/36S4iMA/CpUMAIOFmA8Zs7AUGMuwwsUw6PKItLHC0BUJ3ub8tn2vcqN9dCnA+wnt2BFW9wuQzfhKJh+OjJH61AeAJgxwtB9wDMrOSWRq9wznYWJeLBU/s0oVaekFSL0sEd88TtdTfXLOcbZwSvbZLbO4iw9NJYtvSWCbYxnkM1Ok8lKFPi9L3fjWRBeTvbir3uFzeCe+dQaRjuA29AmGhftHZtMLFhtQPJ9JdxSbIw0N5iZcejsTeTDc1Xwh4uq5uOjuvdQPvnOKdQS8TOzWwLZH5R0lxzPfbF7nhme5aGz4MbvVRW2dpzjYyG0U2CH+VmBl3HvyuCaLRCak4EtVUXQke67Ivx9k8GcMZ9xm/VJ7VD6uu5qE0F6bM4/UIq08/XN/kjxm4PWxS8yvXydscI/UE6EOkX3IiJjD8mykc2HUax43H7wYarJmeGwWxx8V7xHpTnPJQ8VKJKVbxQ1iHRU83wb/f80L0ek+cDRn6bD34PijmfAwyH8euY43iVI4dTTHOYYjHK+kXy0AP/jh93O35I8YpKDnt/57hZRQDsf1PykiUbKvLDxqRyyzxaOJu1uG18bf7ssxXwXosP89FclML7o9g+FxulUzZz8LV4wJoZ8I1wGKmNzEVpdvqCcm4SbOwaVZKD34nJJK60KbstaXT7UCRAJONHvHHiQvXC4ZHbsPIt1jFm6Sno9DWYrl8UrgS6/mQfbA0X/uEEcu9vAzMKH/QeGhfnz5zYmbTRh6a6fU/qXijQOlqJ0RcA3J7QxxVQeHe8MkXCDnjxBHcuUuoGuBvxC0BNCyqDT/azNVvqnB/BUaiiK2pJK3ksa2N+fEkrtpWwleBS2alSwhHaK0ujviQJLUbi7X+/r4A+KKoy1Am+LIIUH4fwVkNpH2g9W/vtSPh11IAFeYX8AC82RmCwdvyb856hgK2OMztO5A3mY/F2zN2DryyA9ze1Eqh89UyqWKm6BnWs9vh8xc5uMaSmmBzam06+QeRF3vf2UX6Y9yecQlk83qU+mfgXhFrkwckPLgtoUGoC4/XRQusjVdJCjwYrfl3dtuWGPzl7IeqPjbO1tC7yqH34d1vVM9rT2n2mKuG5nrHyWTcCqvLnnK6/CnvwNKkuKCo/v3D86vYLQxuLDu9CB9nMFWewJtG13L5BOLCiF5OqN/f7332sRR056foUvifXma/gVccJJBpQLHGeTPbg6ndAtbQUtBBVFeRKtv8vXkgI5ReGOLqA/a8BX/QD4ey7CfzXAX4bv8Hu23x2gFuqRByca5oeInbdSWB5y5Lpz35GT/jpfHLoK0e+5wtAg4Pf9kUTPQBb/vb7O8R8B1lvwfhJFZqJVE60a5eLNNZJ/y7oOm1zIW8VV40h6DYtW2AWOSqE0n53+k1D1YYANvHHtNOiG2xhTc4eoNwmbuBo2N2mEpQa2t+/3qYnIm7J5rt4Mao/kQUDwW37Qwx8/fEwSzan1O5lzxCjfwZLue3TAZn65xppq/774kmvzSTXMgxcyA6W5ptJrCgztqGftcCSCvUfx+wVRZ+C67n4QlsZBqAFCWzcIM/2gA4xgtWGMhKFBpq377abkuPhQXICTGemEarGAFQjJcQV8I1XDRVqNCsBnh13yk/y3tK2NFoAstK/b34/iQZe3Cn07UsLWD4itwQ7Epdb6xCRpDIybWrXlYDGhySFgm7V5oJnV+Q8zjTt8uJQXCgAOedAdYJpcdQDm9QP0zZ+GQS9L/TFCfhHaf0r8zO79hAb8ksEv2u6p2sLfNRyD6RCs0dL+a1hi5TO2Bx1CEwmQa3eIaTiYtmMQVcoYmofN1v4D6FoDJAcQ3QCOQeq4Ie6u5EZO3rm13is/fuXOo5B/qvKe2zTu5dt5cbv+ycsR1FdnITIxH2GI8RTdhLczDiumjGFue3v6dQU115iWDXmlr37S4L3202XV2xj4z/2Ra5DuVt9rVLzIVq1073kYnz15PynrbzlNxII6Pt7gwRPivwdjAKAvlFMHv3BYGuj5r+vJL+apAbw/DmU//fVhdNgtnLWqpxCgjpyky297F6sOed179CDWg/l2QjPM/GFpHw65Pfgtwb10aD/E5Gd2FDcAEIpw7wSNFXQSPbKWCIwL1e5ITs1Y0T1CdohYe+ZhiOGXeMTe/tbHNPb6IG4Rjchy73yIuVI4f1B+3Cg1Gvcw+iscLMCnVcJgdfBlCXxbMD8rGC2Y496cnrazmSBtF/hvteb3NX6Y6wyzJV3M1wOTfyFsZ3ZA9amUEYPiWPguNk/J9MN6m9jz1RoOgVwa86JSxZaSQXJKjbS9GXboQQWjQ6UQ47r6icGWJs6ciqUmjlzxv0WSDRbReKQNt0bSXKt0H9OX1KI3tiy39pxRG8Z4Z2Sa5shXD9XPJAS3pecqsGGjm2sW1EqJIZqFyhVOTXhKKj3FMqbk75g6zBWAzxVPe9F4w9a1Yu0o1gX3qSFXMSIYwSgIjf1Gd/NUcIhhQxhpABUrNmpjqPiOUHrTyhmKRym9OBKWhNgurr2JyUUQauy+rd/jtQ3sp6TGa8+D97EB7vlPnPiBDRMOI5AyqUYKiy3KUNCW+G/ClnA5LI5RToK2w7cylb6sECtBxox2ondlK1euEKs11pOgXcAssluNepx4A+dl60OIxYrNINgxfhCqY/A48RabUbBTrBB6VuywaxDgX1F2gp3jU6YXjfY4cYsZCHYhN8qUwQ04Wd9p1OFkh06jd5zss9OoxcmGTqM3WPbVadTAsu9Oo1dY9tNpdMLJxk5th5MdO41eYNmp0+gZlp07jWpYNnWKT6ajHnYq3/fCfJtw71NGg8x3ysCp6pG6stsLk3jkuinjFuFdzUgscrt7xh+P3G4vzB+L3G7K+KPMHzXjl0fu457xyyL3sRfml3KmyjDlIp2MBrQC55n9RFvjo6eDrgTnnnvLY5zVOs8tzpFz6AtPM1oU/7H7neApU2jNL9WM/mk6UY1k/5/p5l/KNWCF0P5jC1bS2XSr8I2NLJxArhEjUEGFM1aUI5pVLNwKWo6V4hYRihrihyvbf1LY/916SLrPNSgojhQRLHrs5gVElEwThZF80O0Djt4bTFAkoc4dFJ5wE8eRckSFX0Ghsfw0bXGZTVxD0aghASKexgqC0/34EdEJSK9iQbpfcaslsO/VyEDV4k5ih7gp6bNe+NoOrwX0zvenUOk6sI/Vb6R0+JV1Ron7ET/e6TUiBixzwMDC2SCQiOlAFosQ8vROrLFq4RAg96eeXrVqNMWWNJClxS3YtK/WsjyZGqF/9wokUFTEYXRmAizilAjMFEEKJIiw3AnsQJL26EkrKDT6BgzSkk4mEhGdMIs4RSF4JLjGAnOw9BtYBkXpUEM6K6yaGX2rPngavZETkI7NQhRyjQiFGNIP/4iUjpS60T1iUdFSHc2EGa7sr++w9VJbIc6BiFA429GKZeS1A6pFZvA+O0SzBkd009DrH5xFbBf1CrRMv/+SuK5nV/oC9tFfEIHKGSjaiORvOn9nycIJiHCQa0RXEFzru5+y83Ogotn6AgdA5VQBmZhwmkGMyJSGNK65JSZaZAcDyjtEYphNlL0IWcfA0RMLykeyUPezQdppLSTp9CuXrIYkDaYZuFsLdnQjPkpKkL1wf8DbyCYyVUHRjv7emof0syACo+kCbcI+4YW91iRuNyabFkab+YSnY9UeIFIsFzo21iVX4gPuFHsNHLvdcvrZQwuB+OsFo5PWcsAEZUSAcqzsiLGsJyus+z2t7+mdTccEhRbxn+DdT4Skxb71o3Vs7ZvsqbQN7SJ8h3YWZU5RiQfiOV9QKylRJSNIXx94z8dyI6hwMsCF9XoB0cKLG2JEsFRR5NZ+EsgWWq040YM44lkPPOumSC5+NTjZez2wkGZADlWelQSIuB7IWrCGNTlQAXZuK6/jbq1l2MPw6nCHAQpOFwuQkv3wMCKbNiyu10Q3T8iRnL6RTXlEGzSINru1RXDaJQTZaeFiOH2/SFdSdN84RHA34v7XPEpCOwEoPMUvx1vX+Ho66/547mRneE6Q73JR2mlbn6L8MGFWZMBEfOTCvbV8A95JSLs+ibFUo0pCyoKYm9LHDZb8dieCyL0gIxzezgYZpaZ5/yHMAjmjyJACChmFnCAboli7QrbX+9r0iGDV2IhJJIFUy+vxnJ2WdEJN6kYTVe3kCosYfV8CEbCB2BFTizMa8ZQiC7kCsc0xBFCEiIWVGmmqDinwCTp9Z2E/jdgvBDy0asD+KmDxQpzIYRpFhUKCBqkWS2JoXvLWIDZg5PDpeaIusU7rMmFnZzOcowYU6iMpYwUC2hCKFYJCoU2yq4XCTAjHQqXq9V0u/E8ZbfVlNcA/v1UdAJl8hgifKpD+WmUB23vchHXa5bVEmaVoG9Npppe6nS1ET6G+lRhVmuMo/br8E7NgkJ2eNXGjB1KoT2hO8iVtouw+KCyghMphD5xHlcnfCNW9a0lZJBWRbRGMAvQrTlPi7AEEdVKVgYdWqcbS0oxgIbr64zvfqiGBiCGDqUSc3GCBgs6nEQoy0+0DTBHRXhaX+GwKBUu5O6t0+8C7MVH1+U61X0yhOJkiAiuWsTLJKlCya1TuPTHSONREdObhjXDgkQ52kV/TmWO3kwB7q2iRlxQ5DSEUm9pdTgx9eG/GcJc17Z1Athc2A1jb3rkwix69g8KcMEkQNoARSpEEQyBLw3dFSMTXnLNY5GI0lQE85L0LknvGLDitgklI4I3E8tIJfh9Fz2Dd+xzqcoR5QEQqMJ0Rge4MmaPqWl4KmDaWMXOgQ7LWD2e/MZTT7wmM0B6U2q9FgOn11ku6ip2iV2ufTGBe5jRaOt4s3mPWDZtbKwvT/aWZ0Q4/5hylnQZUoJg4RQaFnskwuBWz4BW01cgmUi4EgGRGZv7qCDeMMpRMhROLvglht1k8TNrRY4y2auxbyDEIBlkrNbbEIaM2MYmWlKOBeCTh7cu2TRhLEp9RxAbV4Qd3VJdvoTiwwghNcVABXIjJjBGRWAYS8IxOFULfBeuvfPvQoCD6vfu6jtRQrkfi0n4x6R0X/P8y0iZBj1298ZKnr4tXbA24UoMw6JvBwP99vMEsNLVAo4FFH8cEBZF7uF+0RWV31qC9kdXOHTwxbqedBhtGNXhU3uyMMnU2oPn4xcB/ByMGWHbtq/4/xXj28fou1ZrwI7qs3AUWqKGEXQjMUAwebttFdy79A4U8SghxjatOARcWnqk3dazmAxYlmjEAlkQzBCy4SVWQx7p6vItoVl7n8NsAkZd5AIFuxYxX1ALs5wBBevynY8HOSOS/HYHjgUV55hFuK3zDqtfxRjh1+FXfU+slwAyeAbUaknQ2xSAWq4r5dPkKSmb1AkTSxJgIdUq5CMTPB3kvERtAPV2XiSaXUkVpLw/SdxI0lu36dREpR5KT1rIX2MRrAXjpyhynJvJjq6QZfGhhl8N5OYteqVphZJRYRUZSJJwsPWGP6AFHW2qfAi8sYf1rdJigMMKxG2pJT8RE/+Kb5yy7WRJQOklLQJy3zULcSU8txUIyKWskcWWeQtZyA0wkZ3E03AuqEEkuza0te9kYKiYBgkaEzxYLZH+fXKkRx6SFnvOlRZ3ayaqo8duxftn+bvSQbKH5xyu8BjWs2090NyanB9D+38nFOI/bEKIRKFrEQnhNqomlbFu5nPquOV2fP/hcCjpNFiYVT/w46gQKyYHl9QnBoLZb1+2vzWi9Hnmqf1o07WzOIoEvYVRQ64mCqoiC4lql8UVjTeJ+Z/0CEFHKFWlitC/cLZQNpQyoSoUimknaiq5kHsVkNFg4uczDkHzrWsMQFxxIflE2ReWRoZQC03d8qRoU/kp+AblU6mQbuMXyV7IzmstuU1i8G+uP4FDtH1eYwJvgDc7aVSmcKehg2XodadcEtPZ0QLjqNFIuLeZgRGg7um4fvO6/pOBw5Ytyq1FGg+vJY+XHUmRwvSzQvjgo2KW2vQXsikiJrmymq0qEb2dvDBcd6MilOhULKNY0jPih8TJNEh+exPUIMEC8kWEodmf1QTtCWwhAGZ6qCLYGZK0Wh74RBSBFF+HLRCqFtukNif+2GTWS5JDdm19wAT5l45UjMv4lGhMIP0QRWSZ4WzW8uAGFkMiqwHVyXKiCSSKJmFM+2SIvoXnL4EllNlpQTikCEXs6RUU7PgU3jmxaRUCsS7IQGY7/KgJty0tBiCyRBFFLcxixOril80AxPTGf0ND+nyXmlzGPVfedrpI3haRm5CS42K80uCT/gbqcOs520wYZFgqgdEXpDWGwbV6r62zxIwG1g6Zdz1B4ssmReM8Ppvw8IHJUuBuMHJex2NV0nsnW2A4pzZnIwjQNZOBYtKqPl45uqkPZx9aTdFktBJJNrx+pvrrg7YV4HxMYqWr/7rJbqmpw9Ix5vHdaSv0vKfZH4NirZ5zS+eXePbpbxA5dvVA60/a7xrCeAZeRZhW/Ert+zPqkSVsjzM+ZTP7kya3h6Qh++yChCFrYGVAoStV+6cSQNSJGe80WjGrBG8EcXqpQPPjSmDHLUqdo6QnVT53C8z7b8ZwrweDEylLeC7IzbS72D1rRcGzadd3Xu2mvQshaz7btSoI20jVsnIbfWZXTgSCp/5VLDDUbQObBh9CAT5VDWZT3HNqPPYX2sABlhbfZpRPclz/mPNCmsgiKwksVMnnTAIKdajWpy1OhFmGvrYGydrhSHKLEJN5bTnQByidZaxvCLdI2U8Oxvab59S7WbFIuCruSmIYns90g+hkHUzL9uDpUy60I9NKwXA4akV0cRGnPSX6ZPCPUalDCoW9uY7g/gZtTBhA8FmlMj5TivVs1NVhJFFsoxiTskuRuhKEKlJb18RZDBGMyT4xw9eQ8k2BeswbRHXqLYwtU52Ujb8fKCBY8hqzDYQC5v0CIy7qM1iJcyWJsl+7QXW1iXbcO0PZsaxsBPFAjJ4DdPYgGeZ0MVYkMP5mODaU4kr3HBLC795gAeAZ6RBzM2WAzcI/EAFobP1UWg8qbCEiWo3SuxVbLEE90TgPE7t4PDW7L2ihKgO62lcoYUpQieCgiqmYNIpolBNEe3DlclS2swWNLVcYxqKF77sXopq146k7RDh8UMQ0JEMdPJxG3R66jNAe4P+6P+2AyWU4GtZVxDo5fjbLH5dkOeAGfth+nUdHfR+mMzmCtzHCOO6aDtd6j7ODofuuv9pO1mpfiA4G5JBldVSKiv9ZC6VLDESxSB8ckkifaJRgdo9M0wlSkarCEt9PY/AysTYwEN0AtpbAbXSoziQfhomUb7GEngTQLNlXPaDTBgEmlXKMOEh5p6dVU1tZs7k9Iu/Mw6+dt59QT3xCJdkeAB+SknChCSxUFVFDbvC1TJQ0bUJqhiVazwMohkPxf86/DT12+qpUNgXr0fiOi6DpZnpDl8cfYcTcO2leywBOlWojGnhUDd0KPlOmbQ+9uej0XqyO/e6UzeaqEtLTp54Iqjg/R4KlYn5REKZMqsJIKja/19EwFVfvCJWheHqHCSQExw+MgaIbqo8M/AIYRWrtAPU3h6DK4L5Zrff/wWJUFvl0xABaJgZfHkYLVQvzculYsNokRg0KCqxrvqkoXEdncPmQtfNuOWKTtt/cpuXuvKM6XY8oVm2AIS1BrSUI+JoYFLs7wd2Oib5KOLuNrQHBVRA3E3O2kwJCY2whqWhhUdJkjK1z//tQbM2eQT6L7qbfxVA81q8ma033uUlB84l0lbl1umaDQYzO1CFbLM4gQHam7enF3NWvkBlpqFetxARHrUbq6NNqjEVyhOJ4JW3SLrltBcBOUdOMhFgKqUQvdgNaICE8vGi6Rar4idTvBEgRxta8UsT9BXxXB8dyI0ySvaYej0WJbhUlCu3HXhkRUQ0EtTnqTjV6iSSlJnZzPBD3vL0LFqokNTCqyaMpuwduAilWIQtHqOENgobEX3ISWmesj4DnSSAn91bnvDgEc5AwrFkJGDuOTRacJ1Ox1qi8nnp7liaWGqFfF51+KuHsntbg0osAQ+iXVWMCKTUJL3f4rqY8GcCMFmOJJlTKjCZwy1OVQfMFy+Tjs9kGsAzRqoGuRPY6eTeWPTwDwRWkIxyNVeKRlk5FPSC92rIwOTKIcy75lcNZFdyyNpjFjywibooXl7SsW0WBLdGFVtIhNseU52B38LHvSZPr2eHhNZ9Nkm1AiIhN3Lay4z0CUo6XFJUGdlToy1iTiScU2zmTAG7HyfHxdwZHwn+kCkFtAbrFW8CaCduz/7X9jWcVuO4MgG4JTOEDEgmoDCjJUdNzwpW9lZ4VPBsg3xwE+gSBfH1vIOXNo8rxeBAa1spY5ocARaFWWMhLmCcAOB4FriZFBEr/zQySB3tMKPJmUE5GfLDlvWaxmnNJSB6EAWs93EBxAk3DAAMBoJu3vwjQLr6YqtpSGOx3qzhhq/0QlGg5io+x/FpoKncSWqjxeZ62AIvvzpxW73oX7XLUfa3uViOjjb4TNCmyOiIwE+u2M6gYDiZm3imyi8NTEmigZaxC1Veei/m9zef4pd7sz1hTbnddXeI7ds2hM/gTkBUt9dd9sy6VNEonTVPvbq/Ymw/8nqn87Ai7aMWTQzb59vI6I75TmjObRlRTqgCbF1SlcYkAp8Lq/vP2SWs2oYZv2MJ5k07dhv5+RFn+nfz56eEeUTMY/oejEdREubpPT76MeAkMc+S0jKaRel16JCHo2lEBN7SeGz+771JIEBR7sAXq6RfXH8yPVMy830Q3uhps6K/VrmlYNuHLFl1tfHH1PF0/rdtX5jkTejgQlj3pBGSvIiiVB+tIUhWqPl36E0SFfCFZcNFOUAqbXAmBwVxDtcfcPcO3ykwsn2brzyzVmCJL29NIIAWrQ7W9/QL6vuv7lHWuEJDrpckIINLi1x10jBOQT0fcS+1Y7n64djW8RNV+BQuEpkauJ3WnmBI0nmBqLxFkXOl72ID1YkJtzDrmLQPlTDXE6prhnKP5BCafVT7BY2w0zQPxPYVJUUMQV2sqiFXRRV8Sg/IkV4XYAvcJyxARAexxkoTGaW+TFdfpkbCKdQ0D2cZACabF1UmAV1orznuhPlh5g1m1CGIlZYaDryEZ/9K6NDBimoMu2ARWbbRo7DvdrVIIQAJXzPrFG3XoGEY6f8S4hoORWglBU/FOuWajdH7hEG7ls5DSuhfVzWxdeCFGY1iY0NnQEoA19ECCJv4M/ufcdAhFcRlObI6ImeQaSyYo2dvknWA6LgIyYj9iEomYzi0HIrpgNB/Z1nQVD2W1vBBLmKD0RHspxhCJBHdCG48meyJJjD4Ao/8Q7QGSHOJk+CfrEe5PXTyEpcRKkWuUYs87wlVbwHQiHPqKhklmZKRgrY4uIOU/zBDfRud0vinMXAC4pZJfUx+p8AgsagXxCAgLYJTLFR75BmOar1LG2octv7fHfcEFGjKsgFQdin9zgS3gT271kAFGT+aBzmuv+RvBaChqSpNdnp/nckJisIttrRd49uzuEp1KqnLSFOaQDe7dOKHW8HYOYGuZL8g1CMlmNeyIThxrnynmEwCjYBAIcjjqCokrMw3tX7uwobRZtZYeGTi0wjkBlgmcywiPWvqyfkKY2EWeU117bBSjsIhCwAU7PdZACpoxr4N9BMWT5BmHbvEx10qOCUCz8tkvC1Ys1uummb7gMgubKrf84HMcW9efqJ4qSI1MWCKmjZIsitucRQucYmWVC3zEC5zNjrFKG5IqAE5L5aUS8huvSZdcACRVoZtnpaIBLcMuvD502UBEb2fit8lxYFnPcXjRUq9a0TCIF5Gws69oVqLAKxNxAIsSHUlyOr9ZkCotRqRwVyQUGuCUitHROm+OgO6MuqflL5Sw8W1N+OQEfuaICahlTRxNmAq5NELvZnFsaDzpXoOTwXaW8sga5rcAMXRRiVPxC9206rHbhy+KX9LQSCDeF+nldAPFLQRQtyEcddOX5GxgoFLCKri/++TkGSMrHtFxdcSWJ2rFyNNNaCTUPP7RYIpl3X+X4YRc7zfNoL+3/6LSyJA6iiDInMtUF7/zLVz/p+DTEl9yQkMQhDu2HfrtQL5eWNyxycivNsfLGIIBaUdqnPt3MhzFjf+Rmntnon2kOq7NpXwZTU5PbQmTqR2iEy+CV3/Y8UXs7j5QK6vhlwFUllFxxNfDx3uWi6bhDMMmgyIab0lRXFBXcAzWJc7ANwOvUAJ/dslhba2u72Gh29aL6rlJ8t6w8cgX1F06109fwFmP3RmwkifN2hJpM2bKBqWfr3eIkUs4Il8tBAJxtldcZgf7949SNrJfzgvKIijssmBzM2Q7hcUnjl3xsJqqNiijapQNQFvJ1ijm1nTmn1Lwc93e65L/Z7y62WLyRDGdlAoK3urn9UZPMgZ5WExyt14iJWUmVVtQaLawT/OZtLOywf41sXwjTiRaBW/zcr2gjJN8BTOcGECy3BJX7E+9osXNrBr6gOX1xybP83iwKaUPrJBRAytAx6oiQcH23Z5mEdsMMtiH/w1Vukha+ugPG/viLfUjBI2DKVMBKdhR8cSYkAFOoQIftTekMaWzv8imBGj+yfftUOVoCDZ4acwcMeaPK9j30bzF1NXPHV96ftBtzlJzhR923lbd90qayyxMLSMUbIKfhO1WIKNPyrhzkFs034U9aOEp1OiD1H/EsxSgfepbn4MvXSf86YKU8IbRg6nc/kmhRvnOf+xotNHIvR6b4ByIZCejfT1aTRHPyOVWH83HZ9FCpxeR1fDr+uZMknXMJkEjm7JLY4KIxDiu0kreCNZJC7gmsenC+uh3f3YoxiY8dQcpiqEjwo0sL6dmij/vWC0BIfhK6DwG8nBuXYzu3EyqdJzPpiJl8e1CiDnlVz0HLgQyPNKQ+gzjYwbIW6PprutNlTfapa1hWwmXeBBqNbtlpiCKrxgWu9dWqqSD9TXxacKcoq33Kz+L0c+a/lCQ6Q/6nBTCSkwKAKFD1qpfGH9ZCTIoGlxtaAU7aVKQW/Y2rqknaFQLaba4CTqtJ4szZDdsR4NmApq8WxX3fYs18OceD/jce4trAg3PkoWsTQuTMryQ0EChLoMAnpCyE17cygc6Bi17LeddmbjbtwSns/RcgkjPvV+b3kQMHfXTY/1ARlmscNADZQ0CuuliPw7SDjbDGw3Ds49MOmffv1hzrk5F7kOBAVMYVHZQ1BliaPikfjEyCa1nexzkdNxHz4PLzmV58ed1M/vLjcZCyAd41PcsOlHB5b+PmrtFFld0MgUKI0mlSWcNY3qMfa6UenEIxFNOkZYOcplywcqZA9CT5yuQHgafdZkm7NBkTqrV4T7JK+zNzXIhVuUNKEtQ7RxN1x5aLznBAvexjh2StXksgvM7Ox7l+Y4UEIgnbAnUDGIMX4bA2aKT5gfXD8h8hYQiRt/EEMA9BAtXJ1vXAYj9sDEqMRyJcRAzRKMXskWixCQjwEGhleDdUEYdHcvdXWoCQwaeR6sxuKTSLq4rcHaQWz6XXQTEQlhaasy6xP4h72gA7K9BMepMtu3VnlM8rS38kB7sLklWkBOHOS045UBKTOfzlckNWRPdJ4BoVsXZGl7xLKPcRQWtIktROdpZEfZMrhUDXOLQ/haDQk3LPDhNgBt115kV1poo/iWKf4vln2f0y5Hb5vrZBajeGqOjK8pgU2FijAlsXJxTlq6YdYwL9WuRLG07Dsp5fX1iDVXXNDtTmceK9tlK6IIxurUoYt1Ya/YSPQIspIMBjUYzXYGFahjSdOF254oGmLHqNo00XEwLbncCU7MYIzPSJUGPfXtt0cye/cEI7P2OSqYH9Ufs/lQj2OHYPDicxBVhMBZHrKcy8PiJK2gds4SI/AptNkDgf2PbuyN9CeDuLNoFJqTm77ZL4zLRqKNcRjwQCM8GaRCy8Vk6KboR/S5arId0oOY/5ortMu92vF8Af1uHypIjrSJDUQYdMmQEbzgojCF0VM60lcV1im/8wDnf4KqwVmwNPzFhris4Psfuk5QqeyO/HfR9XxA2UD2pjI+gmv6hQcLqqIpuWp6tStatCcEdLZntern9zLHwpopudvfUphR70SX5Wd/gOmcERCU3pbPWcAheLv4wW2Lkih2zcc940oGBNPU1gO08pl+l9jeGn1NTkuHn4enOwBAsg49+GivVcY4sDIR8jRko5LmkbVBDXMffcM2pjLj4cUcd6JTkdPUPfB/OPK5uw3AOgY5mFz0updplv4eqiIz3a9QmYHKy1brJcF+SXwdndihkLbSIcK7ikDrCf+iFPDIhzw+fUpSYBVT0qxs/6zAi9DpyWJh0Ngpfn37DMozgkji9kMTWGOTl6MPA0UY6AYmaJwoMsWmBvWH5PEkkIQg90drRH3Za4vc5TP1CKBXZ5SATLXVpzVTcW+V3R/cuABo0I9StAZh3kyifuCWDwkHYHeA/l1kN6B9DGrXrycUsP3dv5HJ0roW2IZFuCyyfdJsBgdNZke8yiggLxKIojFTKxDl+TQTDRIpPwM2vU3vOGl4tuhtcmsT3y5dS3iIec/859HCkKQbUBBJXLEe30AK7WC0AGoKOKqnR4QsAA/CKis9we6Bbot7iqVRDFuRw030d2zFgQ17YjpVNW1pQJmwSE72x5IVxYTclChJlxLB1QpC+UQyG8JCQmiE5QOteUpLVzM5DlQ6pPR/4dlkAoJEPyNEoVFjZT6KplZJW/K/e+kI2B/Z8OEdrn8kdzDyILqunYEv4yaCowaIDTLbKIBWFYgI+vyem5D6th/GahtAy/M3QlNqD2i6zkPiy+IL4AzcXHFPYCYK5bF8N7d4YQiyOSyl2oBGIt4YV6tP49QazSUqdNaq5BxDjC7BpS56k0jddXMmeam5iXfXBaU+KMN1TuezFhgUUu7eT/EoomBei2v6qMX1G32V11R9RvtYrPDDUaCe+fLM8J2Fz79xOvQiRB6kC93tbLPb6CgOtvO5vSeKaNkOqudvfL/PJY35EvYWNFyqRNOwU9G5EkMaTIiZx4K/m6GhkufFrLyHFyUpG0H+yz9dRukw0xGGg26SyYQkULrpcMrxt5MeWCCNiWwT1J6mgXhUD5JC0OFnZL4kq+oL1fSl73Hw6CYk0i6NX46Nfk7H+6PTewOTpZYXfNrtDe4CsCEV7+OFAit13ipFqQTFTTaA1LRd/2D6sHm2MIJUYzFmx1iw5Wd1XJZkZRYntJQGZelhsEpuVJSxQkIS0TMhWq8zrxKlwct8Ok20IYSyt32zcgFGjuXDSr9VNk58U+ZlCN5Sth2i6ZzNMhzg7afgjbx55h2XaQNRxBTXiHKR5rw2bSjeC8UqkIUHDKQPFt49E/xr6sYLTnWEtWNM/bvMl+31I254mpEjzhyfDzqzQX06mNKAiKwyNEwnNSA1JoKQsWC6hJMAWTf0Kv2hXqAm4f8Z5UWbXnpNBDVpUjb5Rcr91q6u2PtBQca+5HBzAvwsA6USUhFFXYel7zqjBQsR4abyYG7GsOCwHkDKs1QuME0gdrmNNtfzSzsA0i/AZgT9SYUq9027SCBvW3Haaqioj62UFWosMbHNUbxT4H4kugCdHzhSU+ojU+uFzptg4POt/f/FDRrOKGprNOxMDepjklUdv/VnOhhgiYCirOF8CiAqbzPXntlbe+SEVcpR59AIR+TnM6Q1ZKxi2AyKHJbr85kuNR3RXY3aJ1/b630B44d2lnVjrZqrwR5yg6KIC/eg/MS5XOGsP5LvwnChv/PoXn6Kbxqfpfr2yiTa8SDh3aJGgcI4SjOavNXZBxhLCHhAoh9gTXLloDUBC1d64Dbn6it4/Tc/0BC4XZ44DVItO2NkOkcz5WtnWYsVdCZsb8C9nFBne5I0ynfq821SKNtG5ElBEDlZqJ2zaVsf+rRYRKVzQ8S1umlBmK23/u7eV6olG4PWlPVmCXkTPl9GnvfiFHsgo/euLp6jnmUAp4Q3xsYvknvuI3tlJ8eku4oWO4OfOErLnPakweEZoaMZgELf5ciEoKEVk25d7zgAwTKhq0CDH7Qgab7F2Luj5bWZG6hmDKWRYlaLnzZVBZ9nIaNZGbvpjvVYKubvkTiG61jCSa3MEOZwDY2v4uYL0qjNZmC87WKnxH65rjZBy4su3KpL/pW6HyWJ318QN4Fr5MxsEDGRllhDGRGPe3iYw/nuxUlqNt3jpNXJp8FCt824Ev3VJ3agkpZ5rehlonFYjeNyesVw3izNlY+UVz5V0Fbhi4Z4N2XssONRhRiUczozk1IOZuIeJXADP9sfVYcb9DDgar3Y6I6o6cZy72JKT9KFIyzaqKpYuC6knGhbQnbQRq110tCmJ2ZmYbk3dnv1AYaZoM3rh7XSVbaYzvFzi9fvLFR8bbmaG4T1+UC5XM31T36yvczlkDN8nLJZnTz31IiP1apS9O4UYx1o0M9nWbbl/BJap5QGMpRdyGaodYNE46zpQaU6vePTQE6tuFppNWhWr1LtIkl5JLpu/4rPQibDePYy4gqbbzKmjool8AktZqRBZ1+MIqvaNf460BxrSCimRs1wHaMrrlsxeOqmUMy9e/cGyXMVvG8/LNy1guX/LCucMybdY6YqSaW9XomZxWWgmI5bqLj9GRCKb9AEENJFoiUw7fNMWgneXDC4fmdeSulq984ci+jh5tGbvlm5dRl2964fiwjMXyLS+cq5ZxvUx351jssfF0Pt4rG67q8TvkbIbvyh0U0Fzjj1XEC7d2w+krh7r3JlwFFtc281rGDspuUYvnHyZ5SYYIH6KIOMEqTJFdtQsUjHYfCY2e7/MaNr8IkkLEp8g1k2LMXlWnFUmIw8zKjEJJupQA63WjMh5FiYLyvqwWERigKZiwsZpBdA6kVPX8G+qOxwnTGWF9Zk7lhNed3yLOAGKBBt1cEaMBTh2kjDbh95PBFzs8v2DPpDIUs4UcUfnHGJLkO1JanjZQOd4RWzMrQ/lb6DGhMPH9Pd0Bllj5TngsfHHR+YTSIinV4+Xo+xW2CzANR8ui5nOuvl2MhZ2e37gjbEeQc5MKFD8Jl7+QmEOPnIkwUAlX7Nzhr/IdV0/RiYfAn+xaNy4puaTEVPfrfTVy2R/9YjQdP3xGPLwjzMPI9MPxtV5juLpr/SuYy6uYaHAjAar/ljacCo2I2o8GYXFeF6uElTMGeS6r6kNNNtnCNWgYsHX64uzQiyNRhxPIzfvKNbEISjmhTo5k0pTVAC3/9NRv2u1OXdzhS76oXmqV59ifcUDcnbcK54hGEK/mRKuOJTO0tziVL2/uHSE+sf35z9e3QpeT/Obb7wVx4W+P+NX0MBoxGI3qeLwf0b2VTULM61VpRNH1+1i86nE+gvm9p5urhMvd0sA2yEOkeNJzzWmuMtTfkHsyU54CDsmTu8ELuzS9dfL02lpycvDHnEklAs8mPdzViULn6j0i4Tk+rDF3OpiIQTqrVxjBrycIt5Vz1lDRVSIBOEgQoLVj5ggSdnRgmXtsymxI7QsUKq6WwT2VCevtmIDIsxf7FzUPVJxabbPR1poWF64QAdFmw14pnaVfm9Eng/4nyCkZSeaWgA4mKRUhtRYJJbCccNuH+4C5e5vMIaLs/AEvBLkvWwOqpLfaFsm6tXy+ZEE8LUItVyNPRS1jiudYCRiT2V9lwLZSi8MMhxZbIksJmN+SxNIDbzNKzQ7vhocybku+Ba7GoaRRdgogZMHSdK0mwyWSu3h3vY5oNLQlqP9Qf8TurG+nvgMOAm6wnldvl4t3ICo83ICmiGzzgTkgYkTSXs4v6Kn6l1Kp1PhK+vlOT/dlHTuLlCHi5lVXt3jkGzd95eVWmp0XZ9B3PjsOKawz+bNE2l05rIifXwz0387/6Otc3gU5+kmVZ2Z2cCPyubRr9ccI2PMgllTJAfc50QSrmijxQxpmTqNUqFjgh26/VKXfrKVpwVKJ6VBkak262Hvn/3BVvi7OqSKXIz+dTsMGWZfWLLPvrPiXbSMa0emVbA1yFuqo8Rz7f3TVyyIUyRZ7BqGYkDn+5qZIItAvSCdAvEFR1PqvmWWeUmiQiaNX8VXcIE2x5mUyxQ+AORLMCpOVkfEHwCZRAqnBuAI3slFo/Ypj2Tx2dIZ77A0JMl40qmlVkaHx47Ek9jXvXCoJ5eOY4oWIANnvpgonT6Gb8iAZ+IM8lBQ2HUiHCxXwmU1mcQ6RXBhTig6ud5IMtF97642u8gEuDys0mlgwn8RWlwVKd24fH9QGIFgh/VYGTw4iLUqwsLoTKjVmAWF1rsAX7jNWLSVXSpcX9IWfVla93cK/33QEDtZ0snGffI7H/HZJ1x55Mf6GlFRA+KOJuMWorBagaOnJPnJNxB3+h7ZMd63r7CzbGa5Lpc2R45gfIX8+Z1xlun/Dp2lO9Vh/9JVGTGQJnVj+uEWJj9hGRtjBNivdYIqhkuSnIA67C5UVUZVLP5xAkUUrtIM3zmoPkyHY0PLD0ZPPMlIzQqlE7XOu2vVqnuEyLIpbp5hhaHEd+3d1ClbQEKgjrloTaqD43V2tVIAcLqFTdpWojjggNwtAlpkCPwVJy0LXtCIG7MaqU13LsmsnmN5SdaX1iAvscP+e+AruQ4OKgkSpl4W+nQ2oSqiPllNDbLYM3X5BR5HkQrkN2tOYuOXkboxQhn4kUfzwhWrgM8N8YBVX82yK4x8y3TG3osQwvPb8YCqhsYowHPScU+SG2sgDH7KBXT7BhjGii+BwcT/M5gW60Mb6+konRKSggggpdSKWbTKNYi3Tmduc1/QyZ8X6poicKmA6txgmo2wfwJ6QNdoBBivuz25hOk91rkW80mOi2HM7Jp2YzZonTqmCG61UUhZpcSzru/Lw7JY5R0pt5KvfIOQhUb2zfxYP2HCp19DxW5OYkbBTktXX55FT0WKkEbwQB4481YST3SK6YzfjxfeiXkVWKnQcTuSqxLJmFZ5C4QFLpGNj/2QHQ21FW6kRdsYbYESNHOrTKu43XbpJic9FQfrRCEtWfDu4242KBqhZXUmrdwRmVsVAXDzZI3aH6M9mmkAcgSK78pTsmowj3KDQVQFrdd+lL2PN03XA5FXSqVdHe9jBqcZC8SXAhCr9EtyzcBIWX4VrsPg7Ls58o6sMS/g+Ia6VVtLYj6Px4wnhKtfUcl+sjUmeCkdW0W9XJ1zhenVKEtHH303uNCY4jp9f0ORPSnJCvitpHE+KPCGMorFvjNXY1DdqNWSDpwvDbn7zkUkMm8MZBC0ue/0eoTsrTRu8uhfwFyURl2Bvp5vCKLDbCRYOdocmctC52t3LyCbjDc9AJjdK24qxRJ8AVrjybwJMy3OHFTXhRh8g2Y+5Lybv3T1bJ1e8JAdAqI60S4IVC3WBGMoBFwBGuazOiE+B2NFiUVAxb3Uei7ZTg1V/LbddvZ3hbZATLGaKH6TfqJs7/8X4ti6nxgQeOFKmPNqOso5kyVqdA1S6AjEnnvdULLq1BMIdMh2piSL60MrNeR9xIMVeqRdIKezC3TkmvxrSxlGou7LCTSA5t5hPi2EOBE76HpHkxphvoOyVUnh92izKFxqLkgThu4ay9ONk6XGf8ffvaZtJm9J10Ha2idriIRBs4pupXLDrXM0sG1w7T6wXfXBy6NZCkgE0mbX+n7bI/fkfUU+aEeMdkQ/FzA0R7qJt8HNPSZjE0q8rxwxsqaJqen6KRUuZtsZ6Shvw8BkupNFQRJyrTfPvtyP8yz7P5sj8e15cbXqTBdLfbGTzLhYRy6hwvGRYcolvgS53Y1jQeiYD/zrjCWw8sOgg7pa4+PTgmvz00JHjHCvDwVNeOgrg5edPw8/HJtofTWNxbT/vW1dLeakRhWd3qLOnbD6C2f+Mz71MQL17+5XnaFYd3pyJV2X+3ckWqEcFDNMR6yhHLGfLXtsIfAmbn58PKGz95YgbZ3gLEjOGWvWChjCtMObLDVoheyD/jtQUYIWwgmmWjIt+LGcpB8OrvFbwk3sDG7sqdNAGZqMQfEWgChvUheXKq5vCdY8zncWI8DkqWv4XrE1fKvx1JQ0rNsMhoOGrtuo906G07BEAcI4G3HlSz6QxGSO3S2gNfoLxS72rbNNGfQ69xZRINlxI5fkazypO+gxeFMqItHB4U29TS9ziDWj9jEUjpZD1BJ+9Iev3EBuswkF+w5QfUYPqwNm3t+0x8XgmxzCWd0gB/FOSw/ua8fq1SJcbVS6MCb6krZKPsAHXrQZzpxXomIqwN+Ks9olfGblcB2v+DpyXDuTSRIDtHSThKCnhbR34x2QtXHbgHTkKf84xgU2+e+7XYtDsXHJYXa2N4er7Uq7Qcm5Iqn6dHL4cUu05hI59tqTpHOGiVTm1J72hQtb2uwYskjVCuST5X+0UvnxO3YCh3cFhgIsZZDUf7+N8sXmZZyMei9udMO78KIKKTBfI93eiacSbdLOmHqWiEGHTjLiRu0NtSxvuAxLQedHESBK1B4uST51i0zEOha7mxtvf6odwujdE2JCyuX5TH+suAvx7lbVNMboVGbHT521jP8EVMoR91ewcpMJC4OnEHM22foZfq42Dkyi9stNd26xjHm4xNHJKkbZ+9GFuYkRivYgwU/g1GpY6aYK+G2nBGe0p7SuSCCFr0akVw67ehuUFsnr3YqTatVJRgXruHkeAScWHsLi5Wk67qCnRRavLrBXhKEWPd970mTrlwBOxn8KW06uW9bWOJPhp4KS/3VS1SiRK4iS3tuu2ZP9CV6Yc/6S118CmZZpkUDLVIrH0qdALyZiyzsiW7/CUl4Qsifd0kfZfEFrabaLKLT6BeEqQUvkzkFnQLOuO7VToW8DWf4NPVTEBu1kPe3+BYmRUu95XPUY8abGhgR+tT1Qc1nbvlvKLoiwEYcA8MVwtMnJlsfE7Mp0I/J47G7js9Qy/YOIvYheHCqcGJDHz7m2pQJViT4vcA7NRdfMzupXU+IrRgHWqws7F54Au2sQDCG+JhK9yaoiM3Cs4oZI0aMeGt0zqQAPASrXXBe0Qw7UjFpvXjZimtfnilhbRZnzyA4dUwhP8XcVNrL3nX8hSXNETnXvzxS2WKR4Yx9Z32Hewd3Ap0WVSEgzfwWR5izE9jTSMtocgu0GYY7GbuK3DeYU69PaKWwmOQPohog2Zcz37us0M8RwGk5N7KYBkhdjH5ZJsDL14PJzOMhM4D4jxvF71M2tCjpkKbftDTpMZb3LG1EIufNwQASustluZh/nBB/cEiZuc4JpEcZo89sp7p5NpCt+sPJ5ugLu4AfGiJyeGQ83VUsIxRpBR68MYIRI3eXB/zIhzBBNTUYfUujzxFLmza+Y0FzKROQYDYjpQzmYyhAAY1YxFJRgBQ1Wr6iA9CfdXnXIkr2AvhxcLBCf4mpRc63mcQvm7SLaClLhUxTUNLdx8Ys/IiCPh3lm6W1CSzxaL05OVETIBXzVqv6DNygp5cSSuXbXO7mX+EsbsWMjqsxsY584bRLI80vaIWA/xRrRfiEytXE0MMPPPrzrCxAatxevjpPWuxfNPSmWGogLuTq4GA1YlFb/gOBG9NP9EynusQoN+4ELBX16kgfKsbZIE1cw4Ptkl9/hdWv5c4X3BUb+18h/O36NGCW1iv4j83siONrjSqTc3y/ZsprrxgirD5KlzcRolC3wnVtRdwp531ZTCKv6sSDB2Z2QbAE3JJC96HTuAqMqXdW15g2Wk6B8QeM04rUjzaVuH96lRaypTjrEwIr2bbsrAQCc5i9d1PYfOFkpuWxg/+MWXN3ZaNkO+yEJdZ1Sdoei9x8m4eq1fSb7E6VKNUckXAlHBVk9lbPRuGcIQ2SJ50Rjxz8g8gFNTj+J58kgSB8f8kHuks1zfLn0tLOmknVv5YkPlaEDfDpWySDYgdqTEihL+6xQJRY71qd1uW9zD43Rp6uT5cH3F9MxBst2MJvJDcu1fFHLUtKb11MVmbaMMQi2HvoUDaYbDVT8YBPYVBq4gvrp6PPII308/hcDKl7+1DHkiuhusU5YsgChTUwJB/QiI3jUh6PILQ2Q9XCkq4aa5JPbzdQ9AgqolXXiTd5g3yfubekiQRVEQ+9TK6K0KTeH30Xws0giPBx2fPT+N4Sct2KVHGoY5K6oBszcK3jZZNNOkZsr9zj9J18pJR0qMWknjInFQWZLscLltsipwDEk6+L7dAE68yPWJkTNhJm31GzC+lzwP8dMFShka18NPN4pEFwzmH+NvyGLv2mBjaHBUxiNx0MamCNV5BbYY8g0Hc4clGl6RmOqMx0P45yGrLp36z/Pr8N83vRq19ZWy4BEZFi1AfpMDwmEHXydErZpZEB1dMPJzHZ5927A1++9SaMykGuHdzyRSDw1Tlg1M3K1g3zjNCp5Q2DFTi+5eSuUn8idQv30uUIqs4tCtm5w3LFXogku0ifjnWBqL5yWRNBxXP8NGzmybKUgNXBBQhS1NvUgd+Rh2A6fiQj6CUudIHMWo1BYN5y8ekTcFDHXOpoXXWOdhVFIveZ7+uDXBPIUGJUXzRjOKGxaHJCnjBGIzB1fLdwtRuzxFslto7rJ2AVmC5weQ9fRhuLQioyCICwO0vqUHuD6+L4GBpuP0prZkuL7GAI24eAzrP8MIrG0SIyKq7o97BbXxt2Nl3kdARNnR3slmhzcSdBnpDbR+6j6+Vo+LF9b7dtlB7oFf5V1j29nbw5Un08I6bVefDt9/U2bdJ5PzMU4F7Ckp5K/gFiecPmbzhafhcDY4MlwBmgqagPpK6IWtOk6Ve8VjJBz5z30ldoOEV8erYPb8ZbDW3yPIFkt7mOM7TWN1uRx4oXObRa0atJUc2bOKlbAvy9IOn+BqZiJWWH1U0O8QEU4ksWannCEBzhtOqx/ni0iB9/E7yRSTeD/mLzDjBbz1lTg4A/slXT8rRtNT3PBFSmAszY8Y3sX3o4NLaJti/GSis+iO3ujk4F9IbpqXI5GsME4f87mL/Bx3dQjHa5Qi1Z6rCgDc/+BZNUudB85MJs/5oTjdXXB7kuEeqiVQpu6aeVgXki0L8H6J/Iv7tPzjEYUKI0ZBC1aqlPvOlCdY3W0zcjVi6pxTxbqWHhobnmi0mTh+SdjntjYUipbJhrv+4ReE6onSyv00eIrU0IUuv1rbBNNZ3z4aYc/YVZRSLbjlDnhCwPoiydddbXjqnkYzF0P6GBQo6OdUW/KglJnT496Ru2GNsBK+4clFJCJK+W5Xt59DfiAuh4d+XGXD7DbwN+RjqcJO2ypBwZqJuscDZ3whejjF3M7b/Lzsl3ooVj3lV6EnXlgHGBL+Z/oj5RZIYm39pcYG0Z8mBQeHWIjKUq1yEuZFWh2il+CUoBPIT2aMy9lcrmdoltkxtFguZ3+Lo5/Am7Q8fSl/LJ+9wMe1TNmlchF+0ErwBA3QI9nKASXHL9ZkrVJKeCxRIHC3UHpEdumQveVtwuECh9UtBHf2d2bwW9rNJc9+0d1nt7RrQNDvPdoe3SWX+A4K+qC6WFQIZt8QP860ngZGAjKV7cWDRdAXrsj7UDLhwfoc0Y8HJBHxXn9TRtaEJDlEOOdCSx5LUNONoFIjU8146y+nmws9P0B4i2SmMVHFjlAxfYIbJIjS6bcrO6oi+Qh7hMu1NyOqePCVftx+C0p5SMkSkiibzrUo1G8luSGtHdZMigUSJrOVxl5YbF9INAzq8tk/MIL5vbdj0POI2murPfGkDkic0VGZCixlqWwevCoaTM/WadW/q4c8W6H4v1NGqoBOcpGnKtwG6fyIwv0Df4HML7IrZ3cKqbSBnzWHS4xpvHDFZLmrQMh9KAqGq0vZ6tCp2BqsX7mBlYhCSAyB1bjWBBW+XSoJ08kleu0BrSy83CJNDVWo62TzZExQ9ZFeg91BBOTc3x7MVuQ0UsUzFAnyhXpN2jnNtUElg3TstmxrZ/PlPCiSYePOw5JwdcgvMQxf28FcNFEcCwz5fhA69rTvppSq0QYPqRkIZyr6fstAEE5XYOofmJlnDKwwKskIkJmh2vCHGM4Q+NVEDuE3miaASyit8Wo2yAn/fAnSfwZNAZa/2gQBMgiGQ6f5uPybfdb6yNQCheLBLb5WtwtR1xDkNKsrJGwhrpwp/eCcRUybwpf/2xgQRd8TbI3IHhYZSVBTlp5cpX49IbEeHWXVHD57MS55jwrdOsc6/ZHl+6EPpTEygvShzOhvEmm8hzmtnhxEInhpH8rUWSPlCht3Q65ZjiS0GHQNN8s1IbS6Xd3g/Jd5p/0Y/yqIlY1Ti/mm7i+vDvQTqIJq1TdC9q5Qtx5rbHxqwBMDJoy/OGl7BMy/6OxINN8JZezdPTsdaBHyQiRmCnzsJIn2UcrLrEAv2H62GiXb8igUP/oJGm3bPULsrx0t2ICsGaKNJ+HbJVNUSSlux5Clfzgmu46NQWpeEBA7NQ7oQ0fbM5bZeD5rOPqpv2T1p5gVzrhNz35/+l/EoHP0xShsDLIC4xtVNGlYNC6cF6oL0jL4XWedgI0NifApWfWrl/3vjY5DebuPLSFrQNowU0YDcPXYmCUqZd6OEbV5WXcuJKEMjb1MF6obgVDb6d60kPoUjAmV5klEtnMovMLYaknnWVQyvRz8VNJYZ5W5/57sKOaAjGVzGXNIwWGez+6nYFoPNnM/gymkURyrpTP1gvB5uR3WBEpVKCBqOMiaTmE8Axu1eI5SSyGSyiNcTwUVOo2Ze0OsgVZAendZ5R66WiwJ+fZuyjQUpRbBpXavXAV0WqMmbkVS8cJFs7FZNM5wbaIk9cfM14YPWQO6SCZzCTUwfX0zG9Ja+LXXuKdde0PQz4pL5RT5QklKDUPyNCjBSxNHGneKqRe89AGfM4H5O3EZeiA1rCw65A19w064EKWfkRCJ5fj1jZRm8/ecDLW2wS/8e5k4nAJDoCc0aTRlVRqBOOsFLowk7KiRsiPJ9yGokcck4zDOTZLi3G5oxlbm7v8QIz+OQdf9LGs5e8X+kUMGNFaw0Vnpnhk68CZUssSo1FreW5jJv/k6OdxF3saTHfLEw9oY/bDy7coPKoscrXf/OhJbPVbwxomey5R3I1aUq685Lfw+fQnvcAGxxyyQsDX3v5M9OjhyBvjFj6pv3p2FXhY+vWxUDHaMthYSF5vr+Qq/EiVfw+vnwswEsfCbXL59SfqT7/Czst3nraOtLROqYa63vN0oZECfvMaHFmIKy4wM1z9lGA2afXzDVdC/56e/REIYsuHPaC7ZbRaOvZjmrtoFmE8C4+Sd7s9kQhdbYVUWlpAg6IBtqb+HFF7XFRKntzPYQdZHH3i3h16XURop+AknpdUi6iB0dLQdTRRqAvINYb0rPcpjb6iqu4I8j2o+qsVpd2W0t1DJhBgXgJwGTIr+23km0rKH8xg9m86JG7ZKAUhSwWcjMCvTmKrP95Zaj73vPu6ODq90PxOJZjWJjY5sJbv3DK0mIidSh0goLL8Ub8IZ1pb6R9Legu8/zn/K4i8pxBlo4XIrw1d65ZyQDvqx0uxeGuGBMrgACRlH17ewYxFe4LVdNYbCMOmwychp3bi5a0iIz6lDbSAumXsm+Fy65IWFLS3L+BeslaExdKwBFAYXSXyEcMlOEYNRTbgGiWSiTrkae9vKQGiiCLRfMlvTZLRHZbz+SDD/oZa9CqUobUqlNPesURv0sZE1W3EkKlRa4E36zCn21PJp2h578Vmg4QqAAHCU8bqZXbhlbk5Dqu7aZSWRXPmG+U+2tVLEo3yT8IINJ5st1TZ4QX0pn25Bjatiy/5WaOcPucEXogOzzuHoUWzP5aoRZ4RfQ083Z6sk/Q+ka6OBh6yxOXn6MK6kjM+6x1p3dsRk+tQWx1ttBCQHzS307dllFEp3njhEeM9aLnX5Q2IA9zYDERgQtCMEWHmpwmxA6ZKXeuYBa5OAHQHzMd2APO3GV3TCkwcaVWJI49HEdr/RrhkkTroIO+6wgu6HIgA82nV3qcwnNLEzvpC3UJijzzYA5oAzlHXmXjnWDBjNhvri5xhG1GL3+jLcMz1Z313Bo/6nXwqksHdn4rQS+SCfl9abaGzl6jNiAo3xdm4CMw+T8YQWJbbClylDGtzyO9PwuoyEaEZ0lTEgyoEozBsnOhmfRxZtz4JkJaAvGfNPcHB4Greq9cnCZHuuBMnfNHhWyCBpivHmIeu0NKqzmVD0/P7zi+nB2KVhqZAyLkNiFwCLZGzd6ctAG5pybW3BtilY5bwUhgbPmVxSWNYo5oIudKbxHeDokAMrFzeSPVHesmD7ToHDX2dAAVqpkqT6BGB9Xi5CLq65mjh56sYsGc7hCjOa0+/tBtQ37px24JylVOEiJpyMlEGkXMrKhHNGJ2mtSUkZEexHNQXVBuaS2q/PGgbhAJgSyaI5FU7gDpEMmZ3lKsi14+JuYuSxBVMUINFSSSUV4xk3rugZibQKPonQdeawxNT92RLBWQU2wzmMdO4U8h7xNbFEcDFJBgBbtq3U7e7dxhwAqyBL3D655FRSV4oJbE/Ph6WCn5cxL8REmO22NSP7D91YHcbTfqzpuH/ht1ZSMX6lpaRo+SUp3VtJyJgskhTqljP9vjUCDmXle8rq/g2lAWuEsQmtntMoUACdrCq0RM1IDmjvhlwAOqSRoMYxTXqQx8Y40rU3joFcu3ofGDGmb2Ckphamf4jbMyXPAE95ciEPqxbfwLWCtSrTSHOH6AGtLMeuj6o8aASpFqcEW4cYpL2E64UQd8hAJ2r+j2YjNgUgMaU4jjQjNExIEMkgz5RgBqqW8Sg2pukTmjwnJr0J40tO7ykRzks2SkW9ANt5rYAjzAJ5GNhni5ULHVbJ2DyOKM2CufI+agBoXBZaOFTXM+XIk48yVZnx8nQIedrzhTptF4RF6dEkiY8xPL8dkq8o8Kw9cT1wP1Q2iEUAP14See+iHNo80l+G4e+uaVG/ABll5y1La7Tyqgz1yXtgO2heOINlcOMB42MRm/Pm33n3+Pd2nbyeSHRPVIyZYtAkUBsNUPtgHwwW8uDtn5TEyTRzy9drkevrchNpTGDkbde1YGDcAv2YwyTu0o7+gCddd9T4Rkhs6VAzbVwsbF4sc5AHtNY6xWz2Hyti9Ogyuz/Q7fjgFPPFnHbjjuCuTEo7gRzbGthfyJ8HbhCYFVCVOrg2lttko2diIZfYfeL/KFdgLsgbFCY9RMm4vcVOyQ3SsMBYWYLXqSVxA4gh0dSXadMcYdS3rADZxuMpBsa20PVahqynWueRlBAuXLczmhxl3PgTCmqNS8wk6JwW/f5SvfH3vVHrA8ASVOOzW187RSG4J04OBUbaUk0l+EPISs1CFH8kXBERnWngEnBDykXQghApVC+rFIsIbddJTQg1Qpw7AgVDstPpx6GovPJyiECtRnmGSFPcGB1p54znHnbzwElB7cI36JC+IWKOyAv3mdDHPK3eHHLL+jT3sZJe7/WscfP0TVYkSQpC8pBc9Q50TmNmGSz+WvZB4qqK3P1O4iFxE2LvO2PFUSNHf+/iIp680znF047jvM9fPzAHUrqFdIVV3/GMZqUFtC7pCN1Se7dHrxkFqrr9ZdYMEOJWvO/bmO8WzaIytMWo4S1nockvqp4K+Qolr2eP3kLSTMfEuMevYPIZQMmxJI71UZ8xHGZ+PsULmecXk2GhOkJf0H1gvB1C2W/gBlo9CDZDMittK21IQPKRe/Ey30hvhW66vsWQS0Hyun597BSgVNro9tAnRmtur1qrS1g7Dq+PUeEbLQPSKVJ9/Tc6Ir+bLIkx9xFKtBRi+5/V0FmpHoMMVT+B9gNbwmC0gd/2bhOXAiKnk1E2XmAVidLABI8XXw6P7a6qaBrEhu4g3HXe35xULLw6aJma8dx1yVho1HSMJk8VJGVJMcfffgyZIPhWUKFI/DyD1ZMSrLSc2hntdGKR7mpeaJccwoQeHA42RczAFEONla3bsptDGrQt16KXT0YlSht7zm9Zx3E9QrqLvUIeTH8QjIzziRpVGZS9PCazBsVq4Ag2NAZTYGyGmbe6/WYYFmGjOO+ZaCBclgJzY4wVtuGsoK1TjAKxi5vckT1dTVvNrL5Hlmr9lLhsQ1Su+lE6Ze7AVYKt3/t7qEmiaKysnaIGHi5c+ruqGEjJWIWRCSTyenLSbIpzr+XQj69a0qkC7x6fvEN61SfKRiek843JliRsD8/X4FHU93hQ+NV7JDJd1JHhS4nob9Tj3oizojYRkOaaHVjLoj7yMQJYeTFQtB9wiDKyEqA/Ug5cD1yXEzOp2gA3rgu04lasizTmNoKusLt0JCWagSJC+g6dQxhp2+1BMYU0WDc0jWMYPTFyQQyZpjtTVeHm1iFsBLPrCNgWNXFe3xHOQPoFRwOi3KIU/CIIrwaI/MaDsCAwCbewvMsgj35AINwcZY9eaFISLltjsSoGpfG3SCNsQHMoXjU+G1TzTpmHSuRVe399xmmMZs+JXzien9nCdUIWnLMYj1g7Zwyf1NNZG1dFEdmvjTi2y96Kb1948fiIO+dLOZtNBWgNWk9aHAYjWkdBNLYEInWa3qAx7MignWvmgria1ehR4mY0a6cEWAH72BmhRmVlGkyPRUSSuY9q78seGdq4KgvPYDYhOOix85U+HbZOxSyDfsr0ziHdQiahJZBO4xgy8/a3JS53xvSvVHjb78+LBNt+fuTKGd8iCkjY9N3jiyt3Sw4Pq9v5ivt3SsixPlSJiGyYcUGkxU8K/s1JJZEzpxR0o/wU5TwOzpj9XdJmMqPw++WN7EP2JZI5PHW41OpdUctiGsF/o5wDMF4LNfZHvkGXAWLEDAIlqpOKqOTFizR/ejEECnt+RPssHaosvRTc6CxIS5+VT9c0SZrpbLKGernTSqWvCRrpquujPa0u9aMikl/dSuEabAljpxrQFB0rY4XmShjtSEzv7fikLUpqhnMSBa4b6X0WENc6ezC1J28r23Vmc561TgKRuIkScgFTJ6wtOoV1RwIP2AqeqQi0aiXl/gXV9f5lff8aN97c1sMBxWgSYsX99XCcsrwOvSVA3VyAvAwSHJoeYZkbvdCa9lKPJI7bKGprSmpZu8PXECNiISj6zJVwTtySHnJF28PovEKQPGH3oGUPJvHGQf4d+AaI/kkzjnTQdrx59p5gfCo7tQg2k6JsKlOzELSio8M/2ASXkjoWhQ5GM502TIsx0fsSVecgEmTUMwq3lAh90r1n/zyRewNnSOUpNotCqecGPaCO/YhgjmvyyCUsIToJNPVKLkRR1IxFf1afRoZK25hVZT2XJtUjHFiqQksrMEK2/tzGjcDEERhNxIdBrbsWQBIkSD4TaTvGY72uG3myCKp8Cz8EGw3KY8ulTI3cgOjbRMcZARW7wKtbZwGhr1KHKHeqeE0ixB94uerCc+sE1zC0RJ6MFLgreBfMjafcDuVDYz1jG4rXBN0Vx84Krp+aVA8E64HwrUZL/IhR90WjEbxy8nbIDjlnBYY3s2zbXsnMQLZaVyfQ2z4OVWmAWqu0noEHpnhvfkz7GjUVg7mDR2K2fEh51ObmO1imUmTzZtqac9DsJTcRY83uG+ZAkxlE5us4MCG1QlfU8XVK8Pc+fzDWBv2hotMU6XhMMkGTFC9rAyKGG36LvCfcNr1wQkZ6BQkC7gjVkf6ic4IegTbqQ+NwEZbV3ZQzw9Hnxr96RAIBhAGjdyf7HL2lsVJb++qetBU/UVt4zcNfx4Og3Ve0/VLD7Kl2tu4eBGb9T1QmAKvzqRO1mdrk0Sfb4ZjvtHvVIHsmyBfBU+2u+5EGs/qKwZvMF3aYdgB3CupZf8kySfFBrnrq6Opeu5qGeeFpnGRwpb5ekXl/BG91oKeV15Fg+JzdHhz3E09a2i0xgPFEHpz2y5QMzdAN94qBXHQT905smSxDM5uTrSeD3faf1aPD6KmF9Sa54G2tIzvI8rREXTOEGwPgFt7RWBEePYl36mdluPQl245qS9c/re0Or06m33do40ZhBex91faoMPJXUoM1YMPkQbrgt+va72gfeQc6bSConEJ2VAF4IBz9dNlkkvzTOc7pRAnlbzrf3OF1q2ONekdaB057hC+cHrN3kI20Wh/3ekXzHMbP97YNgbsFx5Oe10nNX2E5aIu0AfzGV2clKuOCTuNHicHpKaKum7IipgW1bVc7mQofOSyLQ8fFcrkjrH1w/kZ3ndnukmw973AgmDnNqh32JHcGrzp0n2R2ZOXgyTunO4G4YFfvC7a6RQ2Cs4KX7cHtbjVUPtxCw14ZPVkq2Y6woAdHSPPzhIfKs8VTX/+GTta84sd7gVa0QO2h7a021nHTDHPoYMmkQ+CN/BlAoldCuTfe+7yvzsrSZXZn6aumfu2p/wGTYgEJMdxe4/p8fKe8J3IFI3jj4zLRPs/bCxcut87KdYoNamrpBM2pt5nJ3f5YV0E9fRfB/pZEMbmSnGNEn0DQmReZDSMk6+U7kJ+t6AVb0XpOjZG/+t4WO5QqlXMmWard/+a1gonGlum0BWxsKgYiKY42v3nygEvPnjMcjG1mPUZ4ioTjHh6bjIbXHiSkr+nvEMuzxw8BKPu5TgWFMnMXV4gnYQ8mblMyMV6h7+6NMjjnbISwpaXI4AYR7hTKF6hxSKuLcMZp1PYGsfyisue7O+zqlDmfZpB39TzoobsZkOd+yK2vD7+N5zt16e2ztMCeuIp9XGbJVGq+rffH/HxU/QJjTsYfpmgn5uODSZHKvJlIv3mNx7dQiXzDF+avsRhlvpnnfds6lq9TWG6Y/RKnHdMQiSThz/8+t64r0oSnWn7mhjeu+Haa+7a88Fp6w0d+s/USyfMx3b64dedWkVqXYMzYi9nLjmhDpolBuOeGbyeLURi625No5EL1TKJumR4ToyObkfFrutTZLRpFstusAn5+wY0r4CDFz4ncTVwz166dxgM9oQvPYidF9Orx6HbZBuxMW6IQK2fzso5U9stmY5S1O9NEwuoVQGwzZZXGxDitDkgmhcy00liBtiB96aHQHbW+JavCba1zyZDBicqUDgNl/YXzM1FLqRdR6Vkz9SkaC9SIDCw9GnZinrlGdAGX+k7eDgy50MZgrblhTyDGiYfMipCp9w84b1DoioUr1FFNTr4NKBLy5zkxHpH0uLOKEVepgaowKyRU9+nN+V5sJ3rfnU0aymBJI3Q74zJmgoKGhR2qqDNrU9PA41jQeE0FEWfeXjojzzxOjAzNtd9pvY4K7Y/albYbVLs3ED30Ud+bAtebGIPCFVf2xnAiQT9jtXaletFZNcQ0vGBO04tYIwEtxSBg0xvBf+/Jje1jBb5+4m+eChfApGWkAKPmF4TP/ZS+PBuMqGsXPyMdOXnEW4DsZt0tjyXy4nkCS2qjDBScYH5BB0c9C3OlMCbAFeQ7DKfVvEBPAuanfly0IQaA1n48ZBUFQ3pDBTLC2u5ZL0rpWiD25qhSb2SNMLwVXPdJoDhEtkGcDvVpA7yKmO5bYE6ogXwsepfnzjPemzLzUw5YY5qO77Vpi8aZFVGwHHGQPWv6xRXFszOEH0nlFUj/ohXIgUlLVV6tE0K6v81UTRDpmbD8lqJJJB3sAFU2oDM5iIZOX9xiuPrdpl2XkSF4mvHa/foQfaejJEvXO4wpKSVYWZhAlhGOFWgrlahkXuVskNUN5b+v0Oe5DJOjL70ugc37nuURdQgt2mx/Lj2HzNKAqV3WWwLg3PQYWyjlISt7bXrB4UCEuYmQBsqCnhfiGo22SKGNe1xynKO3s6IOIM3TfhZtlwUqzn4EQrr0DGZFigt8hdQJr8KQUaHYpT0aHhjR3loDdmKiJQkiga3dV3rQqhK4FZFwXFfNQ40RAGsNadMf8rMgxHeVnILxHM/OUHf2yNl0WIqv5FgJgp+8/lmv7bLQE+/GWeF3d7S+a0yQ1i1I6jdpKRkQ2yViqRlQrXOE8xYpMQJ9Fz7Cn1rdc7VdMHylnYXX0AiDdN6cYEDJ3wdev/a8u3ooCD7KLIsu+FBfd5g5iLpWxsJ0jCPBp2LUlb5LZRuC56gdrhq6rLo2xKIjg1c6ApLmCRYgNIInYv+2tSzBeAs0QdoGHCgQYFSQ+LAHzE5/8OhDd2Km7MMYAOooejxz8mGELFzfjXVyaqIGmh83kzLIsvlTehHSaiJ4R51MafmVE9u++2MmM+/TbwZW07kGIsptfiibe0sD+QnxkC20ZwdnntBM3zTJWDOU8e6KchTgXeJzZ0WpRW2uZE/e4yuUSEGqJFk9Hn/DEiqWVipkFJ1Y49XulG6uIzoxhOUW/WCamYPo2eygW9uCHg0N66jGfy/K+vhzpowlpQugz9B7Me7fR0gK3llgiORFebudbCz99GcSoe2UdByxer5GdffuxpYM34FCDRMGN8IVid6R1yJgGuUjTt69yHkDeNh0ggs+v0ZK3oDIeshr9RgypobZCV9b1naUMzt5eR3iOJbH/FZb0HhXuvXGEeNhNdEpP716rEmw9W788D+ekgbpReSTCokIoSHs6U1g6J856iF+gric93MUxWgkloBMKYHDNwwdmji86GsYynQaDt3Sr6Cd1cBuscojKiD8ggH2d+NxOJjJy2sP7kW8o8YMPWNhBJorw9hUIbWsD6/V3i2e36PwZbNZtG4bqCLIr30B3i3/6Ad/zOzfizss6EsRIlCWwr5ftwIzvOCxlb826KHuJfRCi/9p4aOQ+GZ8MQiX17H4IxlfHvGckTOQd99tKYP+oziL46J/kW8jJveaesSd8uykE4V5l2HAYP/sN0eBBWhvRkQsNbSbaclSSRrfQ9buJriAYPjj0WM757zsE43oDUozuuAneE5l4C1Qjti16/SrvLYOmQ2g2A5rNKRgXaFRdGQTNLtzl/LX8BiBTm+zIXRRB1NE729KmajiAnUS0df0SyHXJA3jX24dMdfXgvvP6Mdkggi+8R6S0L5YitIG9/WPbEKhhv8CE7ipsVA/mkLWKvEtuWYxGll+JjqHOyGxh8DeQ0+6PPBe8FPzz4D78/lsOxKMrUYidjfOyMNISFp1PQTZJe1l06Jb0ihdc3wevZyDnp/wWdpBzs3nP5IJEAtDGzt0RSaXl/JoYtkyzXU7JAe6wu0QCtjn/2IrUZj8rQl8Vw5rLJlU3YVSIgpZQj2HIf2n5f0Cvi36C5l9JdCuCKNYS2XWZY1V9aNXf4k/IdVFfWN0ej1ujFWIdjU8z5FpLAwYneUuzJUad4R5qfDKtXHqFBxg3ns2numqrYAXRf6U1fPeE3qtYjjU9HuZKREIx3Zz37LxApWN+VAjJHS8mC4tI3va9n/emk5P3OA/vit+u9ny/kNYX+/Z2vxMTNo8C2yBtuiEMo4ka23NSf7v1lydmm/XV8UOFgOY3WxuSKUY3sHTK0Ii8Rbu1ChTg3XpJs6iBG6cUP4738VOqNeidXv1GIXqwcyKvZbHRZmDYhdWD6tROfuOOitpzAaisxdF8uyRuKk1sjUb/8v6G7Ukf5XbRIyzdLL+iRzO2+n08UnQB6tTG47oc2FrAQNlU9rVOEt8Mh7X7K0ksqZmdatM8lrzDLZf0zFqnumSGANf7PhpJr31l+qbvWviPlHvaifgkPYYescuo0zVR07quKW7bgV1v6ZPd/l858TsYNbPnrnQWkXpFUum3etpUJDQOBelEybNh5e/GB9I9XQTX8QXgAynLJpwSsMvpqfCV6vv0qHB0j/Ik31FPTqoFnjk2/kaJZui2QLs1GfADVgejNff2tn7sD58JH9xhaw4UuokqSyjcC4IlsppI45UFrQ+9lWssYQeqn2yoZpbTj9391sEYG94rO1OnKCFVpX8VdeJ185CI+nU/8iTG6WbiL8MdpQO+vdsjreX9kOXtBaUNWTbeCAWmo18+zSgdx074oQgsu2Wa8JoiOt1ihc/9/C+IPpc5aaHAtjUF2Cs49DPn010Sw8ZbK9R94fm77obcLIRUIq8dc+yJdLWWvHoviKEK9m9m0tBwc7JbYYomo3jBgaPJs/qo4iOhQBJunvkrhhzNl1jbKQVA3Dco3NNw74cpomJAPRe24nF4Ztod/7vIkwttw5+bcoJIkDZrYXX5qnMHKbpymTTG0m6neWmQdIwmsCK/eFrlmx3XhtiNT9XeD3b51gx5rZ+fv3p9BjqeO0n4gPt/fvKDIr/Ftuzlzr/gUFxl+iHxEAoN9BVt3kNpnHDGzRWfKXmHVzu6+99vxyqgQz6eC6friZNly6sP3p+q92i9j34Q7EUR0esynCionDwERVQWITDiPTjypxuPUuWk0fy6K+aL2hQHp4LqokiMcLfp8RfKD8AQdc/36oPOnJdT0UHlcHeS7ZmRDBxodbxk51R0v01HzIahzGknE2MtXCtA7RKjemZqBiLuQg6P7FN2rfhCELxFkhT+EfYR93pgiVWekyYOlZLo18+SrJH7Yfo1qvlvJY4v7rtqVPebR9xA1ZFHU3b0/AnYbr0DBISKohEWIlH34gZYTD3DxomjoBCOahtxUem+eAyqhE87w+FlXHSb1yn61ZCMtJyefW7cUbZvGPE2j53QaEbTgJUcst2Ph6ROnPT11ygRkdqmPoc/lGrOST63FhgtTsshMLoulF8CB1W5CAz73XzmIbJ0Xs4uFJamYUcr7laH6Fh/jidTdv28eUIio57vAkp4xpo0H1tRsTCpg+3wrqlvT79K5orRYJgsG8JOQThTDMU+kGfDxxlTXZdnQ4TZ4JYAaGmzkhzpziPajOwIOCiss/a4pcqC69RNrePx8Hjk9/x8ELpEmjFcyHj3VoR0Ka63vnIJmkF+u517Hjg2HrW+RBQE8PGq4Q5Dt+FIQasGsLvvT0YyUBzPaIuY9mFSNO1lfcC4XP7BUE3RdjbuB1esKiSGVTJoznSrr23EsLXmg+jfE8OTWIIO4UttIpJJHdrPOMO7e7L4zIbDXjDWB7nN245ON7iZgwH+fD9Eh5E+AgocLFAeL3aXTw5/WlW+xfi2kAxHhCGLJoEUo/OTfIOQJxIzdz7qLn85Y9L1D6G2riEEYxLt/w/IkvTtoqmqMnhhTBTvhW8uO0f8IkxIzIrdnECVN0lGOkKhQ+8KARYXV2iTcM4xDK8BR2w75Yewk7RvsSru8rkDby8g2iA0wk25KK7Q13hHO4Jxo07AMtNMbP2jxYM+LNcANZVeVy8ha212DtZZEbtcbyJMoOXXGJftQARt/Wuca6/YdFNLwcHi+eZNNSXgzW53SzKeNRSLaEYAbGX5HVJ93SyO2/oZSe1SfQaGlCsTB8PYtSLnxDdg1Qe7OY0Zkg4DvGibTIXROmUfWABAkxyxu2txaFkt8uUFnvlhNmLWXK6To34lyxk0wswPuK1gpsUSH7OwcUw3litfmUVfq2xoaQAtc1ht2jKDvKep+LQUGZ2sLRvU5IBvKZZqQgRZXzAQL+KNIlKkj7E/6YrHK/v5VmA7mOWYgcTkj57sU1EQnIrpviG2DfnYOsip5iIMU/AZnSURtIP/uu08nD3bDKLf9UsLZpMhWfm5guu3Qv0crqG3AZ+6RbZfwuCrq5RbV/i1im/3a3PKpIIb42DRER/6mn8gyp4jGt8aoOlOdn+iYu2WXbZAe4VJ4RL0E0JiDzKie+vr+kCxvgdXVLuDdlDNnQ9OM7FVvQFcjZ+21RUq1zcAKy87OMY3+O9muHg3HtRHXeJI2rMAdtkTxm5zN5MZTWWXS/+cV1K5hO/Qm+JIETprBb2h2NB38yAX5Xv0b6mUILfYKmJqGnewkrUIvPzCBUeTaqfQYGClDlc8k7CHFVxpktCo1gruogFdqvBIf61bLFlNcbdhCtZam+QErwNdXIJfvcgyFUDXdv80FM+vyJFn6Ml692pEypUZHmIVMDjrZDgWvlRluI29E4d0nkhuq3aSst4svCtEPKeGDdOVILYTjw7NGRq6B5hfyRz2/P/wwlPCdGPmfTugzgi5IYIxQr81HRNXq6LxuLe3DaT5xUfSsdMoatdyPhXToUXg1/EeOZiLwZHXnsPlMFbF+Ynf7nk2GWaPOCTVKJpzZsMTEAeo7I4Xkc/ymZ/2rmulhAFvcjHlwnIty+BCoh2p9zX4f7md33o6swVN3GP8lGWaLs29blWL4fmJJ7zHnpb5z1dodDivNdXI+Bti5nS+ZnZyxq4FlJQak/o9zSJ3dUZrxBSZlDdcVlug4SV+ypS4Z9WelCT8T6pbL7jN7bNCVvIFk7PQ6Npjrj5iW27BYgdBue9MdeLETncaVZZMalS+cfu85gOfNYz9fPrpJ4sxeOL8YyZTNx4v7r5rquusTBWIwxuRcyCWL3Ss7uFsYYWH9x1Pc7taOJ/vXLNUU/EB8oz/FxJ9J/JSUIPir7r9gCvmOFfJwyXmsCo+F35FiMWs6RHKIz36oz1jq+jGVF6gDlxA5aHaMM3X6vq0kN8LO7WrLSBObbR0WumPd7dw+tb01/hU/LDLyeqOCI8G9OiR+D2sG+hXsQhA214tJesgdGWGI7bLDVbhen5em5CfvOLDzc91BQRKfN3OF6QYSk+113mfXvvpxj9r+AEBJEhumT8wy5DvCrjODoS5JSOV6DP/QsypKI4XY/+cf1hLxzD1C9+VNIDdVh4AAFgREB2hZjiHLeJV1+4IRQVoe8WNIgbdagRupkL+c7Bn9YU6p6F0H6wXmhtwhfovpbblXC0PoI1jg6C+oWtqo17vcfiHTt1Fe8e3nX+mm/9Bbsl0l/xiPf29o/KeE+5AO6EnYV77oLeva7HOiZsPg5OueCfY6enjjg5Ci9j3lnr5lCpvJf3KHYq/iK3Xv5sqHxWpHAw6pbx1obxxe4wZv85ps3+hxjgaZp72b20HYbWyFKaeVf4SSJsMzjFCnlcv4Q9V65mMWXr+05gM+cW2WwB9jxeXwdxmw6CHemhIyOLoKqCOAwm6DzJYm8pJ2NwKQ0L+F/QmCJIqS+awhx4qWDecCHD5299c+GwjrQp2ryVNTzGMGjitd6w+OEhKX9jDEZ9oSfm4jn0ZkalQafPeLB93OU5rmcTgeNsVILQWviYAcw5aYXce+2lHBHv1M593hXhpkOWjVForeXUvWLTPxwCzxn/aAyol/7MMlOpNkAdqDFp8I+MeG/T17SBv5F/z4SV9ozfxvUDp77i2iRSqMM4Jx/aq/FVd1hrdzbb8E7DoKovNY8tg9brrdFg1OzJM3zBCXDR/Ic7o/gH0pPTJoddiGX+DMxByxYZ3BXE3ZKM1ZoAyrboLB2WC5nuS/ugBr3rUlEaOoUT+TM6YlNrgZ2E+4R0zrD8kggGfO8rMMjSSAOLLGY84+cChrFsakOQA6GfHR32UOQMNXG/X2NyYCavMZ/hVIpWGLQcBB+ceFnOYwIYywmEgbjuQ2TQjftwH9QNGWqtN5zgRKMt9jVX/6JUrpbbtLDzENea4k4Ke6h4YNU81C8yF1elHwpvqrNiRmnaM/n6SWlOGGzXj2PA8A3XCGt9aTyeLWrhrAmCIDM5lRAE4VWUZkp3GZ5mhnKWlu7PU9NJSPZ8FyWJUNoF8C6ScbjGKPlpis0eIELGP4T6n6tgrsqR9XjDTWc3RXK84Kj+9ekLFFoqXqwXQ1Cm6dipLlzNu0Rl5dbJ7EnlndKFUzoWb2kpGAKyxs2QtHlHYP6MxZeVOcAwg4QrIkE7QJC0q1Gs47ejnk1mRWg3vcKkjojwNuVHFoNkOyxqGEtRGbdV+YkGiXZgJM3XfdcY2KiaavDUUrbzdgN7TN9AP96XBSuadnQgYlOubhWENcQwtjkPRyD1uVhivAIU7TxBQQ0qPRZcWZfjIkiex5zcfILvdV5vPDwUappZ8TNksxZmkaxRzMD5Yye7+l7oI0sULN1apdFz5Bgsg/jZE1C40GE5xeoZs7eqXzjcExIbLXGe6giK5nQ0gS9SI1F/ojt5Qx23odgB9H0fPUQy8gSNfvUYk3gSnHSRPXZl835KmAxIJp1L99ZItVQTgYIDJtT/9pi8F6OGjnaw/vtWONeVaVj8M8nCeoS8+r69JGqZvunUgTcxWoGeIxsKYWE/kidavwD1WiXsNOHHdeGCk74Wv+SBcvdgRwpUEbQ2lQg83fxvVWhmbGdFQqwY0AyuqNXcvh6D1azYeFK3XIR4BYwpR6QgqpObsGDhUusOuKEb7aS3ScuATlkYzjfChvjhmCm3EpSHQnDLINpIlFMCE2B0kzcgfomjMyXzH1T6GCzs+YlQOMIRpOoo2USg7+dCqTFhnJn1sPYDSupz42PVQYY6SExRRF00d0/2U784VN1lXQ+eO1cefPt1nHPoylTzoXadvws5pMmlzKcRzCANP26KO3B1DETnd2ncVO9EUb4czJ1ylQinrcncNBSTpcpbx1JqSbi8dEcm/+vQ/nYoyEQ32BRfwydw2FWfUrucHWI5mk87FRZ1TZ5oi1OMo9HJmV+1uNk8IYZZMwwLCBc6EuRU6kyBxpMXtirmP+aBUz3rR4xTtWAhLMKVwDdUBe1uFVz85kCK9B46yd/iPgVryH6Tx/4by/dfCPdSwj6Ak3O9rj13X5BdWP/Q8eLWcmTMEnL5F/GdQ4pAsiOY50j+VfYFec2/PO6QkIJ61IGb//nanfVJ6BrySVF3Fo9JiIN4jkkyha6Y/nMdJJI2ST3USeFRdG0DJqvovBBF8cqOt8ZnRLJX+F+/JYnSDV6lVdQl4JKaGuvnGMUbK0v97/4MZbTtK1LYteNL6DuW9vaMv+fF1dJML25ZzEwy2mL+bHRdz0ceruDzJDU5XYgMHssUHNVgq1arzk8eMUVd/JhQ7dQTfRuv62KbGqE3SGdpn75CcxqKbtNIK9/pbeHD3waxzPyYjARwaLS7GfuHVlbzWJ0ylsCpwJ+HI6ws6HIWM082/EqQ+Zk7Ti86Ll5QIdX6nPqlQ/hDAewdcBiCq4bJpQqfnx2g90Hf3Jt1wiFFoAeVFhHDSVOdfo7h3nLI1NwU6cPdVq196NW7daQL93QtR9E5xtblQMU3eZ2462SjuI7OHM28T7nCJJV6f0MWsWaUZjW7D7veQjgXrz/2Pu4lp+0wFoRtCskU2vfCoAqtJ5XCjvgpSlmmpIYWuwTbRg55gPjPObGhKenC91P88mumO/zE9Vqo9t/b97nd31zl7S6k+tLWIAOh197Qnib4jlbftEtSCfWqgygFH8uaAcy9AW4o01tiEO7x365C3YGOejxm6BbyK3BCTER01ZbHCW9PJTmQRdJzvRYPh2WB3NZ9Q5H2NZbWmjBFSnlRqkoy8Sf3cjdTXkWcwLdfPJeXWSlU2tErCUFrytqIepRlvVFIpEWdIqktA6kKvFJepot4wlxRkkpSpXELtP9yLQ/dr5+x6sifiITFh/rP24c2m+CoVZTqTLp4jsJUxXbGC+fZcm7HSrkCfcGlMI/iRW04xNaqoHaQk0kc78HtbNL3rDdYydC8PCId2nVffFa+I7z1NJS/kHgSsddRKLFAZucoqdUuPXrxpvbgysJ3fzZbIKMzJ8KSVveksGbOejhaiJ2/eX2abHP19EjZdmmvMx29+V4mzD6mAzDZeUXYt0fC3e/M5757wjIIQLBr3Wog2a/kJX3ztSaAyNTt95K3zixrK1pp2OSjgO+sIZHsPB4yz6A96/lTAWOGL3jeALCd7L8fh8eJd3+LZofuT9EAfVSLMozImDSh+/aWM3csu/0Ntef4XVJsLOD2ejAiAtDDpzv8ii6J1F9/TMGcJkAP0Xvb3LnSSY/tnrzuaH6rOKlzS/vJCI9DA8YNNa3oOV1vL4b7RSxePMTbX4v9GOGFFEqK+96Yh0IIIXPINl29CkgXuv3WhH16wFpiIGFfkRLDCs81CqkFunr1ddV1kHXq434aXsG8H0tMqYU9wGWly05FUaCLMNc0gF7X1YakjylNKLzCBVDwanDmRYKocWF2PmKfoQ4WZ7+2Jiuxv0303ruYGEEk5bm3a2r9IzsYQFL9ejvnbvnzNj6X5ALctQR12n14wAVLpaxXWL7tUoksWDgz2qkobsCR9CqudP3vVkiv3YZsfUJzFpNI/dmIs9AnbAin+QdoLBH+XoygN2UIF+Qh+DtfvDvYoUkXM6T5igHpxcojdHzewplSZFrZVVvzdJ/eirLNLq8oquSEwgGzD79GYu0Owhc6OhC7eRwR0dZ7O77B91yT2N+JGlZNOB+D4uf6jz07CIF3kmSF5jY+ah1Yy9hOlmM6nO3U9k1oW4/44D3o97uuvHtGH9CZwh5zAYY+TJ43XT25CYYjd1Jf1hT4xOhMlI5//a52G8FrKZlJiRh0/RMsWf8ZReFwTfPc9toqGvGeJ+t34piJimcSxAmS5jWwMP05muYRMiRhFG78yxMi+zI3RUzwBsmMa7rjOqvNmY5Lu4S6NmbdgcdDD61rN8Hi9uznyqYb0r2qhJes+2eSz0wDwQopfC8YOcLw9NLkDH2dgpXpCl6Mp3tUQ7wVvs5JQ3gf9D1rEeoP553LYYvoHIfZj09ZPLSSc+M3rfj5JOlDsFYvj0cypYbaub3QfsErkmjf7jJ+LvkrI5Z9+gZyYS14uQuy9Pvqajpuu+eoSCzaKx8i2WY2rnj7/cc9rHozPWL8ThGu1QwksbcDEMPIa3/opFIHqMR6LTraCuiSutw+JZixVFDU9SQg2s4Lxu4Od4DjM587g03W9mkKnNLWD7sdflulFILSFa0vtM5NgObT6/PGruwIss5cI2CZfiWF3A6UuTQuoLKKjrzIDRfdN+P4J3tBo4FSq+rbMHeqdC99It1eTyP2sus6FSxI6LUofLn+eGLuO8TuaFGSrpDToXSoGNTpKLQzcqsvuhMHNK3uP0Cy6mx0l/nO4mY7FcTpx2NxfnJvahrxehmEp5dXbb/DqlHJZxBdp4122rQWh+BaFG32coByrzS2s9ujBQ0DCjcrtefl3pxwaGw2zpkZytqZZVN5KVvIZX5r6vJh48yFFkjGdCHokeiwK+2cKBSQ0TJ05de0bFBwJCsNddsgxZdXR2+b6phAZzHUfFCXbu55xQY7M4X3kNbPYusgpc2bY6I/FiNczPAlunXxuasrJ26pse61AzpxG4HMvc2VoahLFbgB7nZeC9xOYe903XNHG2RzMKWKXRha2NVtHxrKP8kt6rP4a5JTCzbk7vPcuy6+tyDsh9mdUZEDq3oJ5JlK0OMfuxykgNTVViFngjEQUAk4Rpa4A3+gXA6JZliCwuMwMFcrxc5PyYNcgVTbzuyoLiMM36PmBQh10xzfRmGpWNS5D/eliM4Of6rFWHpgsGMLSSRAF1yqk5RyD3ypG0KM1CPbqlXRjtC4OI4Au3AgBk/kNPG+YeXZqECPPQj6rjFPntPW7ZNUwJohdurQoLBkW8UqgNy8ljMK4nliNhvCC9Us4ei4m1RYqFmqHWH7cQoXkmK2t4vKQNgkv6cWD869NbIF3/0LgJbnvWiPFxEKAOn1aDTegv1SW/pBKzn8lesonktw4usJ344FvxtKLzqpPV4D9iBDTPNvOzSORm60S/2uLQz/mG987kZwBaPW1bQcsjqZ7l9bo4ztPlqtJbrnwMT5pKm23WgA3SlcRYsDHc4ydolU2p39eXNENX7XshIpqjj7SUnqAV/m/UoQlpY2i6PCX7bfppvPjeSmiO8/JWYD1u6/PB750L0KVgvRM5N2bvzAEmOaAgLu877P3fcGgKBk9uU9KloBfe/JywOiEf7mc+EHbSyiYWBEceTByEiwyTyV7uJddTIPeYqu7un7eYUD8ff25d3pZ/CS9CFOg3Q5fwbgitZMLooUiadPr+oiZ3gcDCQcIsBb8LQGGfvXScTYyAAOBdUby29ZIPeXHBTfw5O02VrRvopfZUS69dmpOWoa0TEPt8qVBZmOzKv3LzpRmjTFA034kuaq2p+8PVMXUyZ6U4zy0vUfi/oTV4wBieqOP40HPZedbOWOXGZ+4ipQrbBJpi0JaFT0wn3z4jptIOTavb7y3YGP0A+w7f96r8EwgGlsccbNfwPu1XgBGkkLdvb9g5c87h1I0mYe5YAoqWYW8tAHnG9vAA68y++H3kNCbIok5YvnbkQDU+LM19H0vq+Q/SCtHClllMUsR5wN2Wz9gLpLiktlMmuYq5N5R/usChwHDfBMRTQTq5lNH8ZLuoYCbo0ODGTufUjmvmsJ46HbfdVa4ydwgCbwC+0+LutkgEzyaH9RG2JSlBsrgka1FEwYjTezfPtgWO2CkqD9+8sVgfNXPuW/A1Sp4HsO2QIFpBx+1MA1AMmFSpVrU72MEOCXpG+uFnIjWtAaBTDnZYOixn8DT6urjKTTX1576sBV2N6g7hcrgjWiASTtwX27SeKGCljdqcLICmkD3X+4rmzEIX9o7DriKosUrD1P3pLk0Mym2pOVF56/Q+ZAqcDkRuq3/VwkfXNja9YA1I4eFA7NJBzuh4PD9jSMCx4AE4rrTeR7PavleIgjNE6r4Gr5wkkwhbjw9jMbYlZyi4T983REH3geVEUmNIIN0ucIL7RF7lShBc2kM4SkTitJLYEXldetICs6Gv+kZrdC7SPNHQyELkvtCrkGgUnZpHiKQvkP/4w6rEHwGytcFu8suWla7cBN5Sr7AUv7n1O82x5g5hwDBE7iCRdskagJeKeMS04R9PD7kpzptVikVCZ/eLQvgKDCOyjcTgmpbpFaVzpSzwLCQaAdczCPG2IEOqAd40ni58M9msv1lcc1hnaA3FMlO4KRNExI6F/GbEBRFMsdWMN5E91rIB8mG7YE1SnPL2xlmeOEf5oaS4Yf9G0ciNLlIgjZqFFPyf/N67dFQg/m3CGMDTVpDOni9kxLCMhK/+ZM5Rs2xMZfXwE5ugyQS+NSqIKPlo/pnZglgWcZTgn9AvgTZadvKiJGsERK9DlygAQMrCeZtwvmXgFz0y7q97vuJTgDSKTMSVWrMCzAEwOwIgGk/eqk29HeQ4ixqUE+TbHH5e88QKSEsL3h/2EADd7ZNv7Q0J3J83tD1sb9BhDG4p7cyUjHpXBZAvSJTyVw9+nY6jujS3uosyKpoibT5j7BcQ4p/DiFrpc297wzAeDbJgub7EHUPHPHpmB//XQ0u6JAb0acJePikVd+uZjWv0fWlHrp6JNJoEij+u4tRRvBt9MqtxYx2iMiv1w5mUMvk9EC4TORdbuLo6mS7zzL7C9v96284+gDrvp1BCKg9DAL7mWpFNqBkoV6MUS/NKoiZVYO+u1yRrHJL6SAJ7q5zZWcKtIdgnW9VkZwNuVlBaku+NFec3kKmEpJmINHZmyeZBp/1i2NyW3hyuu1vCJjLEojgZBq5ArRYV3moicsB+dq1MaCEnWt4autlv4Gry5jH11md763eQ49Zwqat4zuIAT+Oh6pchiOkSeCEQoDUAljXNibXP+M1sdQP4B+2MCOwpVzBn6CB6Ia/QMoXYFRPVLhx4HhBPIrwWhf7HH9UxMTC4QMQkLhOf2WLblJ9UHEIZnQa+C6D+MZXbRmCRujRGnLlKvJPMW52Y5DrKhr0HbAQQYrpSlV8g/l+Wm6ErgcdYcDGJl7TWmz+s9LgP+XyGR57Cf4GD60o/GzOOAo/SFsfmjRjR3LiyPHJZU8IN1iMu1YOgmnAxEKktvMTutJ7NmXJrYeMbjHY2mI2A2LqkoKD5LjxFHpEirMVMQCuDnSmxCHb+ZGg5zpn2+ElzTUBbiZkF2lgkSSr0F1hCyE62rNMbHC03X/TjuIrRxkPj/iqv9wZCOPJBPpH7/BbcRtdPxNWkXld4knsa3+gttSkoYP4nN5ACGmuWt8bGAkuxds1Aa6OVPMVbl+3oCkc/AfDaXDcgcS3YEgP/hwYg8iJj1zatbf0R5hOszJKLbvJIl9fQoRTHAlTuc8IXswzKWTiE+l7lNZSPaRHwY7moEn7R7aHoYvmhA2WxHVaTUf9iLJzxqoSNqkDZT4S079SMOwY6K0e4NEDz6Uu99NChey1WGHas4bdqiDYjP+l6NtuKUR7RvcwjndFbmU2H4bkK2DdVjaJVs9mHYpqPFR/FWs15GpnzZiaySpyp3Eq/3al7eulKorfmGEoCBaJESu+if6yIzaX4kD30KMnADvglDCEZdWSflIj26nq4G45OAoxZuP3jOIyVwIk6vSz7q7c7x0g6oWOQ7i3BSwd/DwtFUR30PLXhj+hKx5W4SkRqr9VM2urS/h/YIgtYDO3daDmDiXwGWYpa/a2XvgBouLOpWiQg5Uv3VGr5vcyyL3+8ujHmabtVRT+/huBaUdpj4kaYbl5aTsijZWxFabCgTCNNVeQ2gLb/zhIFGL1yqf5uy9z0ae45lorS8hfUaeO7JcGIX5rHQBf643Bq0udXzDfcnE9UqZEZEEMHy1hl9aWITGfQhLDiGRBeSgdEwSiOV0ZstAzzhclSBLpzEAunTbz1FvWRJkA6n5HyOeJooPqOgEldilPrN0eAebHPG4jXzNhTQovWlI58F9L0GNh+qoD9CA5EEQbV3SCfV5TE8X7f2uczyGiAeBm/8iiD3E9d8XR9iSBt2GZxJgxypPLaQBKvDYjE+xttJiuqWgDBqeqo7P41j2i2jvfb7fjJtCKFA18yLbOSNm6lgRgkJsLJjpTPotZt15mh0aU94dUAK5ozCM1WyflsAMD9k77KZBRM9kzPYfpDuZMO89ZTvznJ2JdzwC0AZIIeIREaSWn0/UJBsyhirVDy2b0k0rdAN4NrshyH0jj+bV8fVkiA/2kbPE+syYg7ZP5+mskxGs0xXoVT3KSiLaeHI1XhOQErx5Gh2hpBB5m11USeVhTY3q2RIaq495IMGFN1QWJKQ59O6IeqI0EOlvlZghk8S6U2hO1cvXrYb7K358iXetWidAjt0QnstjDx6LPFzx6Yr79tCop0xrXX8IeUyzys9k3ObR33am33Bvx38g24XEq7qcUujP48pMhrbQHUACPSamy7lTFjaEUh9M3yNxbPWGvSfstGp6G9IyzDnmCr6pAuBWFaJwZMC57PJTcdI30MW114fqqaw97eV3G7/et/6b8Aesm3fd4n3AY5mUJuAxp4Ibb0GIIIo1d1EOj4/4CiBY9s6Hlq0gMxqsiPvZL8rIoZV/5y5k6kTa6ZOSxyH8q0FsDDX+VkI+SqdMfV/rg9y+Bm3cJZ/eYh8Nk5DCxjfUWau7siWAvZE1HJ0P6MleEdupI3dtihOn/yBjSJncvol4Fuh7J9NWfIdYsIbSm1N1NDutlpUGJNRLggnef8l0tz+on2fqeJleZ38cfwJ0QhOh16Lh4A5PENPNb3Ya9Jwc747jz4ulJyESDxuokK0yaXeDzzMOhybn5c9VwrLYGSYItGTwCgak78rr0MNDfwMBpzLMRpgd45vsFFxumkj+GPEcCqbeuK+jKIkXWUbepyj0rVAqYwfzVX0GR27HMlm7CewghIZXTCEjHSnvsTd5IVkzcaNyb7CBI92YOOUZparbq1/s1LphEEWyRrJyf9+j8DzyDpT7Ee8/Ak9n0zW24xC1fhVishx+Y8EhwetV+YwWmhcvrSluT+OdMP2Wd8JiN4HMjdRhO5uosWi+nT2pyFIU1iVlkejoM5qnPonli9lds4Xwj4BOV/hQSmJWh1voxfkZ9PPQzk5h1O8kylVRl7WUKiWearlujLABbIjHm+elwasPnvwhZ68o/oMzbToq48XGQOQPWOJrBUuh9XVag/rJHJ5Ej1hbKNndluNH8lS8baVc7lvQ6GuYXaScYRKN6gqGZ3NWg1vha9nym5lqWIk/Qofv4RjbULhz6tGAGFe3/wm74lzo10CXeuWQUK2aaCiPNEouFyhleo5fDBavcwJPVGk97uOAaJetRBiN4JG4LuG/0j/GQorhQHUbkbJcMiYLByIN49A/L50nsrtqagudLGIyDmmXRaST5nyr8t1VAltKq0gQS5lgb0nrzdCNMobGPeI/sQtEsnBQiKwV0T3yYLb2j2M1rXGCvUOkyG/z+2vdt8OSGJwXoCPB+xW6kF4mKqc681NYEOzAjIqxJdmx7Gzre0br27b6fiNuKA3sYvEbya5FfB7vVGJrKU5ROGZKDuh9RleVaslJ2+3e5ycQjUrPfKnZ43q5mGRTPd0eiFFx/4jJBg5wYLbZRMQ9wQPyuQih1MjLcPl9LuS/5ggc+g10/PQRBOW73mNXHN3H3N519ibAsZshQAfno0fRG9mU50Ve61lcO5tKMtx3LzDTgHO5I5eXoXH99DzdbR8BpKjHZDNin/42TQ9SaZ4YVqm/XIp8HZRTcLHZKrx7WFIykCr8VhLkYvGEbglOpBu3O4RJj5bnOaPDsZccVLtnuHCBZilRYVuhVvum/jjkeep5aWlTtoWDbDj47IK8FpYnNFSwGPxBeeJx6UAIWDOTtHLKOq9PeJvdXQbLq8+PwWEnL2W28VzJpuOwGjezvS4+BCqy3Pa9OYWpCzNFcrkHeWfyb8990wpX/Yc4MLk61GbXRebE0TrNGSkusZNM//qxaXGuWSCjW2+nw3KiLO1TqQOfW1K1INVHe1mn453pdH9Cytle9PZkgoDiUuvMg86IP9I33GLGl9y7DhvSUo4ZWmBCL4ZvvwIjPecU0V4BtlvExNiorVFpPQ8eqgvBh7glYRQl3dNVkfXD53TeI6hbYQStDWsgd6vptnPLSutWFrzWC4rD8brxE19uWVYddZtcJFNql4q8YM6ncUa4idPaSeQm5JQS+McO0vg2z2QfJoyKdMigemti/oyvMGTMafTeBvlIbTF5R/Cc9rgCKmr9pqnt9pcmzcws/cIxCyKJJmAJBSvk8ILnBcQeXj631yaSWJZpurnJ0Ivp3SpojFObtpd47kRLAiXgdQTLhJL6DyJVNc5DVUSuiizxwwaFtUYL319LndLR+TERk08pVXBBiHYdwMJJ4DP9wKTrTXRPKelQaOI4VPSzBL5L+NfxHmqxqZI6CyK3D6Q2ud1FhlthiQp4pp2dnjDnNmIB5m/W+wygXvYxc3oR7zepKHhOtSfDFmtvbv/8v/fVmoAi4W6n9K2n8ZF5ceTB+eCKp33P4j0/raFTkvwB+a3dTK8zA/oXnQuzd3phLdJJ173wShMkybDshTzYtowkuV1XVWCF6u57tBnFolJiVGEOOhjh6IdHh/3Un7Z+pV/jJbTTjmksRZmBJ9mr20dc1oo3FmsNZYXRo1z6Mt6vZPXEeJdEQeTqSoNhxQnshIdKh0bIaD75fOAyPWKXUg1/Xa0mtxOOvQaMQPU3syufcIJiTahIQbFD6mppAmsomnCxIv3EzGHwZRvtJcOXw+Yo0viKAOYp8hKoScEGrn9Br+VMbmNYmHLaVFM0BBC1Hs4HCaHBk8qZqV6hT6o9MqgkfXFIZ89+2hUe2G5KJ+92pCTs4h5GR1egEVsOD8y/XA15uKXxBorhknKi76gogV0xo1Oy0V760/DH3kIVAGAlXes78gLmqBODHZ8puJJbPmNToIWmt+s15mx/uVmqHzEvmgQF9Qrm6G43efY/vcvPC67LU60A8jVWWV+s0vyM+mMg17tV+2Q5Yog9crtZRfYpnn+W/bwMxU9QVYszogwPzPx7tVwjjfU+x22Wjq95N1n2WmfH11iKfIrrZ9nj8mTf5TUWz0S+lGEJeSnJp3j4LHv3iUs/i+cgO1HYTZy1RXwkS+FPcfksuy2Tf8qyuBfdUmJrjYql2E9x/iy7Lo9bpktrpR0eVGOKJ9mvWJj1HB5oXnbVCtvaHOVBIbrGWAn7aKjQ/YUJWZlyWorTi/1UqRmqa673H5zcTjOYI5qnUKsllhZwYIGrDUY5XWYvlYhx55QctBYdjNHcxFeoSTurzCeOukpO6reFsUrvrcRR7tpImpfjvMWneo4D1XxAN/EAYORCDfw+W5z2bnu25+0e+NwIcE7Ar6BVNcilvCVg0J0hVnRecY2c6EBEVHoMRR0Yzi2O3/KQyBUiJNZ/ubtf0N5t5JL6v0yyQ/ZO3wdwCv8y3uRY7/ErCxV7gHW+a93D/BfbRNdNhiidPPZAVbQp163J1mKzVbUqD78tFp3WU8Xx81N1WavkVHR1envJEx/4WlYoOE3PL/XUO1Pbr6FfeI9MkpitmM4tPAcLsxFNCbV/1rjB4iYs2xxyDavJknPXVNSgNaqsWuZN+WJlsdJclidfpDRtl6nsYltTFsufet66WIlbLJXThMDQCrSc2Y2i3WYNktIMAAPHd3fkPMMS6sviZQd2wu1G4v8U18+yx+XIxoNl13EEVssXy4z174BTR8NuZtZkCFpcSqp0Zzzjdk7d6uKZDUqjG+1RwITtYHOfTAwb2ZTXdrncpO1yHzDkPMyaoL1bpm0h/97aVHH54cveQhUAUA+rqYsan5P6ZmeZb9kjfleOobvpBiVrthxWWbEnhoRsaCT/0Y0l3Z0r4HXaYkNvdiON7a03VUEhPI/Bn527St2ULIU/xeWz7LYMvsLL1u2qbYZdtaYwesw8Tm0XtyIooATjGfwOddC8zJdQ75ac9y2qdq3z/wRPwbLrMrgSat1i2yVvCeEhTdr9shVKfK3w1ZRlN1T6dYI5wm4Q7ac4PsuOp0oAudNSb0kffPnzE1GZaxN6exPhDCXTvJClM2uCifbEoPDHNqGSWC1ZP2kx4wum8RGEmoGTCF5jSNz+LCa+qL6oUGMVjZtjCOQTXtJFxCFcDy8D7hTnwXRvufWXPhEi8dSSaiOHvOT1c7BibmVxwXVriqB2+o35CzBa/SAlqUP8A7/cAQsKvaPfFcaUj3wa0aa9BcJsKBCqOjs9mf4yyJYbWzCZJwdtBSRwl/+G/6XZuMfm7V9i+9xzSe9Dm6VqGa9q73vuxpRToXuXxvsTw5d8m8LLjK8QFvZ5dJ4xQJ5JJiXtiOLefn6KIp2Q6gQRSjNTEC+zgyU2btz3gQ7zBRPXY307hUQVxVmvYNQ8u+00AwaLx5hzgJjjTEh+xHuTcZhjmH2U0V//O46DPiiqNZkeuJyCskT0jtLtiTj/9dUiesZChBEEHcmo5KjdM3TMlhVspQIN7EuUB1r3HAiIt8rKi3rVmiKgYXadx3RKf5ASqdhnCfIThs8LhHiblnTykEgtQywAVAmpthAG+20vZJLja5NtrfW3Sm5gKNeD6Pzza3D9+8m3B5FzXlt5QmMx4amJXR6iWVoc+Rj+pBGrVb4YfeQVASbeBDA4QIUfWIuK3871kGDg7C/AAWB/HuJNNxfmayAVjiYVBDq7EiM6dhRVdEh2Yl1l0n7WNd/i3Hi6v0cMDUNXqE8e27viyzilN1EjVI2y4BFusJYk3VQFJSTZR/YeStjloL+Ju3D83/vNrxPo9FGpWcZz8EJ+A3WgVktxTOWIhD9HfMlaG8eATMei7lJYpflwQRM2aeY7ulTINVmKHFEFdICoF6EikFtkb/KOwNcH8xb2tjCjOEPTfL9AVlgyYljUQw84wLxpv4QO0paUumkA6WZTKSDgxdWxeGFy/eo27pp3OX3oYwG2Y2MSlmsvO6tbpWJbLbT/Z+nifd10tjsYITBFqI9TenJgPk5wUxvJKbi4bCEf1gvu40iFsVrm8ij2hzgB3wKw+uNKi0FvXtKjPUNp7t4gUtxVEPtjqGQuyvi5gsiEk0rxfFVA1k7KU4/Q6OrrM3ZibRFlmJxaM1xGKyXxtGr326xCaFfNtp43xB1CHWh81EQDw3RwRwsrXdHHbWEZLMJttjbagqaei7T4Y+5gVS27+VrBY9U8gDwZlNRUm/2XjG1S1bRG3C3kJgi5ovRnama8S0gla1FOkZfSNmVFbn2ZL/zhqrubde3PFufO+iv250Qjq9EJ4Uau8edFBSBWdsuv1vqcbJv4qfiGZjHscm7KHAPNCzvFLbrQRhRLV2G7VYHhce3h2V7ldN8qYl+2CfO+WA+/rLudS5AZi7X9I+C2ypbNiJ0GRtBq9gHxAViqHwx5ecIUADHeyB6fhIeRan/LbGaFq8/lu9dkCK+/S1wbVxRXor22RLAMg4mTy9vKalKJONUU3OCgxpoy5fPJ2t8a3zJKk7FCZwVy2Ldkhryga4Wlq36RolraC1xb/cA+4AHt/WakthItOyTSdu+mGjMPYhfwkUzZf1G/aPjSaH5Uo1364lufqkoCjuMxS1wJzs9hl5CdVTKBiAlGqYVEJLhTgSWy1V98gj85zGUISo0uHYa9Z1Tke9SUKhw/uiMIrNkvLe5LheoW/yc0l+iJ8irIP/JaLGegI8R+Zd20+GcbznN2M/X1AQ+dYtlQG68ZIB8KAWJK94qVPsGIIm9aE0G3nLBTG9m8VpRy3AqXj4WI0BOKr4OaN9H/eJXRdHuDXwMCKpVkzo8n1Iucrw3ddMrF5CQJIqCAJ0eStZS2rr2RoJEFhOozRDFtUuERUU5rpiKDoq0c+PtCrxRwCLkc8Z46Im1RM2RQPkExFC2+/6O+9WsswBdKH8RtgQ+HmOCV1PzhCJkG9r46E5eaovd9zhlsNZsXuTjHLQuLMiEHhLrS4+YLmnUPyfAipwOMvXEb+hWuzjLzg5moCKPZicKC/HRjeC1ypDSdLalJqglfg8o/D5Pdte7rWv8AQ6jDRqHthfU1MvgrPYoykTTkaI7rx7trIxwaNsLcpHQ/84j/nGrSatDa1vFzk68ukRM6pjZ1mvCFZ9WOKl01iuZwU0/kJoi5C6SmErHo8jrnpRmH/CQ6zw8fVo3hYoJkWVUZe4IGUQlMp/7cnwEeNYj/6bWMV0YF3CPnWy9jc9QB+GEKevpnFTazhCIueexW3ifKoI3pXaqKopllFMR/EYNqnitlbvJHXysGVDT6MQIwKt/S+oBoTBHR4gk6hjw1XpGk2xOn8lcXmNd453pOX/Sq9bI172Zn/en28oL//hiXEhLcr1yWeHY1No3aKA34zjT4FS38hvYx7oP/CDnvwec+xGHSiAqWNGh4UdyPgMg0kjSOi97BoGOen8CAIlwM8ouPKfQCJzC9IkIlhwZrt/r8BExzdlM3+GavQ+DjRkSP+TGYtndY1Rt9B/0kPMmmUjpPKKu001s5wWexbdku4ht2zpOud6WWNkSQbHjWiTIzWGzIDgsIhTEMbcoAMiHPdApjYLA06mk2ZZGhax7qXcNFkqc+kUKG0+jbtK2tnt2LNkHNmUEi4U0l1RQSg+O72neSoH1sJZV2gocv0dbUzlsyBJQ7/zYQQe07BAcNi2r9wJPJqXqRYgt+TvpciC/YxY8VP4JQXDWtpjX54vWkLujFb6TWjcX/A+rbAlCsT/K1coe9+WdJfJh2LDq+KiAy75qPUA3ufaMGMa+lOlc7D4qXXCmFbSx/s3CcXchlwCXpp6G4peeaLf+wkjWSYIDtXua3Cl4dRUlDEWq2BoU9Mi7oXJ79Ofve9nFkXsFlTTYI4eiA7xY+VE8MDiDJKx9F4PuowMrGuudWlI0BQ8kFgb1ijdtO75Dxgt6CpQcpOCcCZmGOFApbr85ASdlCwoxDIvaHaDVqa+h2bPR3WBZXAOyyTsmY5a/QEw4U74D4G9uTbCCWA580rRPHd7D1ikVHOZgMo8wUObwKoMkEh/q15h/+2miUvd8RHfUVL2Kxptrw3XavRQaFDyYL38GTUfYoBrm4YCaeZ6jp1gt5pxeUGOGqNFe7iXVIsp+rdVP3UNBHiomieIF5w23EEisO+k05gok11NCCWslismjXmDaQLQeKBzeQQPxMRXPOyJd9YvoauY7x3neCLegFnbFi9gTadqhWcgexXz9/nBStfbsUHN1rF5zM3Ny0MSpPJlh9oygJPhDs4W6Hi6UkQ16yd1UeSOqGbdmO63HyLHteTdEPrfCjP+ekNHX7kwR2pTx3Yw9AJxnLBdTmLLTowNvrYmuJYXe9DQeqEtvfI1Ep0EYB+thCfN4WAJHPUwgOIepP48RrMjfBc9rDAWF/bukKHWg2jK7gQubwJDPCFWPiG+MfMKDYGKYkGH8TsyH7qCzXCnicyDgF3CyE6ZfFzF3L1+r2KZ6ZWV2WHZJivUGWihQbg3BgajkN9AjAXxWSI4u/CXo8YMvSI6BngIAGpgpVUg82PhDajUDIocgWxoW9s40jXRwubXxBIsC/DeD4jzDhIVBN3EzEtyrImQ9/ZrdvkD9uDG8N3kO+wccrx1yETV9HxyJq7YYWWyLrTjaq3TLumT/AmSO1PunH8D8Aw7Oehe9XwAE7ZxZ4O4VALfgG41RG0UVw9caD+zaW/3tiiaIoCL9jXRvS///1Y+AZBByH0p/2igyIgLkCAxlQEPAM+JcwOjcXxTlUbtNZ6yK2MaLdDq7KYpbJ3XIa4A9f8+m15slIFrJ0VxQrYjaQ7iASHqW4zrElVstUxuG0nYFdZuD00klUQxhfQtYoHAMPbT13QcJKbEcx5sChIrE2wCGMr0dPauOAOoQnsTfPSHDSOHDKiuPVS5YWQpclEfb7bl4S497LyzGR/+gW8CXtsAfAl+fXQb5uHr/YoUBBni+ALcaRdyEuk1tZb1FLe7s9r58rcETf41s/FRmwiRh5XHQIdDwWf0ZMPdjr25goAxgInwbtBnG5AXm4GKIDNRL5iSboNNFETLx2hvM2DTH46JBU6NngypM4KwySzh+AFA+HggVfEgE040ppdxPQOCFZx7rKnoRZkyRYmH3h6RufFgIoJdZ9QYRNkygqJ+4avJ2bwFFX3nDl3hsKtyMeFDUWA+m7HcAwZi7HyzpX6waPXapvvPQnpn6v0DR89VkrYPGG4g3UDgtboxyWwSq298iM01abyJxu3S1XuCLabeN2NlXXJhEulrcamwDgQozT3YuD1Oz4OOAPdTFLrY7LHfIEbRm26sLdt3gD/c7PGetqDeqyzdNLkY5i6R1lKYqHJknSkZvFDSqtdrhmWCA2tGnmvtQAa5LBmiHLx8t7bHdGAdKY++ocETa2mEH+Wd6SCobErfX3vudhXP9Trbm2CTwPEzfrHYMYNaOG6nriYNU4dSOT6+4D5oLboWamifUrn+T3Cl3Vh3n2Ck58vlfPW/d3+LICqJ0KSp8b3Bor6UPI/hzpECtL5YHl1QI4rdBLxp9gKZfdaxl14jwwojvgHaiERKGTPCoxuJYPUcThDDcWghMFsqMOvnwZnUquZ+q/uuGl68mQCnwLskT48Ng1Mfd6C4B/1VhqCnG4+x8yMJlwIVHXpCdcCmifkYRnVho8FXbNdx4KUdaol0B6LcjW93OaHJjDxk6I+P/uNSOtuzxudoaaB5p6fd4PmtCOSS/elDk1PpDaZu63YC1U4ulkY6IJ7KaCVFmxxrEGFlImK4EhsMbAITWa1joIx0XxEu63wGvH+rlV+Ri96xND2SZcEJgILPVZLWbptdRWyiA9GGBSuvWg8BIKPhDXCGQB75W6gcEDRujCWmA5+2BeLuxdgWzdgw/iNYVo/O/xXH1/ebQ4rk2GOq2i3csFftuQ5Fs9Cg7zZ8O43o1TlrOq7IM+cME3fIsyMUKlHT+lJXPXnvFFuFdj55VW+N39RFwYxTVRxAh4e8jYqU0Jy59lRzgx9f9Zb1854LdjJAiHRDizhebboGkycxYu/d4IpbOPpEBqk88wA0SMAChh9jMEZPm7qBxVrjGP/TdKQqBhHmwg2BAYGTMw1bZVXlnlSmEdcsakmhfNK+Nk8vCwq5UCUzC4R+9DoRCec4iHzi3iVfe2rMcnUUFItheP0xcirEGzZEz4BYYw1BbE2zmAPxPlHijMXtaBrnW5+UzNyeVdddosBiYl/OY5CvSTLN4vpX1u4VuDQ78qPgCFV6lQ5ydtn7c990yXWj932YgGMXTNEhXAKkbkwCdpn9DhSxoFiqhdlOgl0QaM3yYSNGyuSguuDS7dOOF6Pa3qCZWOh5zlkspoHBSPzzuyz0ciOKkDRwrMjYO1j7zW8iOijstkDYjNDE/RG2asYaLpTuCqqNAJgdwexKok7IHfxTqSYIY2ikpSEe708UG1RapcOO9GjNhdr9VBnPEQ3irYEaoqL3QaDRrWFdK6QgwAT1fEa1WTIU6roB7zV4HJ3dQdjGthPnj2TBGVwkEafoOXtvpTKHiPOXoDPrPaL+mDLCsJV0H2lVVtPF5/3RvDnEXDriygqJaj1tKTG4DanUM7gtIZcstNcorMCbQAuAAwH6sw9cqzTKhC113JniyPeMKj9r2GXqRJrleJN6iwVOWVkvHiXCjUtS8apE/ulcBWD7dri9foNYGPoLs7ELwR0fK9pEb4+MSjDTmAfgMfBGV5lWs5GL5/SJspginnbOn2SvPolRtkIIK25m4sPG/H+vosCrZGzTAo0DAuX5ZiIVi27h+pC1uomh+V18ufr//T/1MSia+PtPHaTw93D4Xf2qCxLpi60CXw6LRWalpYlrv9vpz9MZeS7SW1TCuL3NsbdgEN0mUathbecc3lVnWi8SPPcXrfBAEsI9ZPpTVJkhoPLxr5TuMJGv6Ac1BzgSyFGsAYRfn5LEzU2EVPEriYbiIs3YaBTpC71IVyz9s6a5V8PmSL58AFBF/8RtBQJAsxHZNHPm4Klk43C8X4TF4/qhXEwjrkMsHq1WNK2z+uP+JA3NbooSNP/Z7+nmB65eMy1R8EDMufzH6VXrttzXj0DADwXEBnhCoPZaRUxeiRG8npLsE+ut0T+2Rxu8pHXS9RlR+aICKnSxtVdC6lQNfISTqra1ajWceegWkWSXXqbnp2uOcij1vUalWl+jA+yUvOZ/Biqud6vvda0g+pcLEngbwPtQqyrNzmftDk00tkfxELbFrGlwVXD1GWfbaAWtiM13Edy/0HLEtrR2J1Gz/oJ35h4Cg7VSsr/O0auYWt2MC8C5TGk+Zb/U1BSTzF2h/piJq3wlBXD+fLZk9XfzyKO8l1NOkAagwiQ83ruQr6OFLlVj/tIS8qlAK51R80QNdxztUj59kWwZHJu4TduB+Md5a6yKA4Y/hq4AMn33n5zcOwoDmjjwEWYe3l0KUWJpsF8PZ8dkImjnfSUiXNGrdl0/9V4zQS5AABM7o4gBU8Vv3M5xYf9PxU9Yc7X6RIB4UZ2thlhPcL4zYdqogFOnTopYoTgeaN0LfSHxKJkULBhrjA5AYEsKv7fxWyrfj+qU1n64mjIXBHe3xnOWJ7LwptlzVFrnN45F7SKYednQW9Ux3xk+UzBMdVTr5IucnVA9a/qKY74zryCvvSZklHaqTBUlFk5uR4eklWFyYTIyAardS3jU3E4xGWnSd+9rlmliBytRd3JImVDWDHyji00pDYh2iCCphfrgqTWfPmkQpCeULWvoPH60u7nT5AFM7r0J7J7+1w/M/GzYXn9mt8V/+g/03rC6G0brffByWbmGLHn/DmkL+G+l8rRHZUMGaleQvGivEMLOtAvTpYf0mH0UqlGAnbX9SxAhM3N3dJGCTvs2Tczd0xuz2HDN5w94b4nohmifWI8b2kg+5/Ww5LzH9PSYkk9dFqHN6a/qn1jHpW7gPzoefsEZxPV8IEFSvVtPbVG7Y+f5BU7UbcccCNWgVfYCPn7i3WikIL7YELQfT1dOKQuslJc7pfJ3b1CfQ/p0r9bMA+YtGGR64z2awwG8OH2zOqmPTWExiTN8heaftaRB/X0ROSy1s/qOolU3u2cyvPPBXj2s9KGv2Cb7IpjezMTjqzchdaCOIQlvrs4S2U03yi/6R9D8SJnvCHteCOAE9O9QlYYhtCUzN0Y12RgIpFrY1eqakiZnty0kUw+zJT8FSJluAx4r306dgoTuny5gtD8OqMsTfH2wyP3HT0cWF4/jCCH16VMCpFi+F4cOH7pP32JHg/ZdOr7JUb0/V4hAWUI4GNb0T7zME3TfW3aPjpvMEC8K5L/HcvUcVqiUGAOAbofFyb0RnwAJxWNm5hgSjZE0AmvKdbGS9u1QWFmaXP8WoLVCrl/jHflpNXlV2dmVLezmkQekxlFcyBfNsecjyk8KYj8HRDDd4budrUGzUb0RZRVUwL58JyvHfIKQc6KnnN7d12nOUB4efimgPplOXqMZAYmwEQ6YguJ05wiEcjHzP6cBKtSKYJoBUJkfW9nz6hm4oMz0Xu9jNz02iEfeyU/vHLQOmrPUQtTbxz024/FoUN3Zwx7+MnctlXD/gSB/HK00LBA0RcDC5cqdT7iBxPIzuvApsK9CBhS6HcyTATTMp4aqKF5t3rmo1Y2gE1jC8yb300XuoXfqod+B187FktyUaBol5wKzc602itigM54vde4QxJeRLhFm/oq1szgnjLf2yMKX21OCrlJ/PFt3l9Df7e7/G++Vu9M2O+/sYa4+n8N2IwaXTNW9+DgpFhmjE34oKPoaWUKBIBDfgKTg+56F/4+36BMIdTG0lGyU9+nbGJTYFPZUrO0tlXeXGU9KH4LlV/mehSmvzIqQSM35ibKb+dm17uP3P8+AOnO8yNqs8fJV1K3JGr3Uq+pexdyrnhzP1QkwVQZNBa6KXw92oUIXkuwWDvDt+d2qySm58QlR/NLpn8jZHziXlTP04xEb3Aywqys/mDgp5D8IW8LB8JKf4ZXxuv4Eqgu9mytipn5kZfMZAH1viM7v6+gItL8fpkm8ceCzTx13xImrcwJy1y03I1PYob6GYFbJaRPA5PRDDGZX47PmoQBui2PBuArZhQh2TMDO6Zm60KqQ3NlHjxTGhDKbO6saUw1iXRpGP3pMwFmbbeeSztr8AGyBENL4Y9NLURbkLqpXGx9ZOx+9anCqvpsRmjtYjHDy/XVBbhTm0tBTDY89x00U5kh/3IvUE24bxKjvlmqAoB3Zo00J+wKEzcC92vZD9a0HzMWSkK7e7vcXCqx7V1K2k3EJV7orZwbKVDX2pbArOAP+oxSln9FzXCsguxQEBXRyxgQ5jznX43BqeQAr8gsdj4erQoCE7OyJEqbeX5x1evvjvCig9+ounhYH76KG/AVc9OxEMOwhPDkuA8PxP5KfdEBBfv1dJIs1GLnIIcVDT/bgKH6+5vBwm2tHGkJdZ2HLAUB/VyZm0/+gpWZ++iQPiB4ZOMctX65M3iksn9K6U7ayROGeNTqKKtR2I3ZunPoHIQF670CvKaYi5uu3RMqc+WxeV77VJT7wnRAx/xbYQWdU8kv723eWoikDK3zdGeEGqzxCeaU9uVlLhUcBk2ksJeB1JYqGvHXxK3vv2yr1R0Up999IY76iLnhEvJdRxJR3HWS2lbNV/4iWN+GHeBHvv1D85gCurbqAcvAVPuTQOi4MkiotuQ/g7QEt9CrWC96q3ktTvROuNvc74o8qUfi7+yrfKK67afE80s1QMJXy5M/TGgrObF3019outNnTDb03KDFL08AigeaZBAnekIEVh7ZEFGfq0a4/Af5alGLrGkjyyhG1XudKslj8TJI1yJAj82xDWbhqnn05ATtQGGeJwMzpH1Yo1RDIGXd3RdaomaNny/LBpOA7/RnPNcDX6nJ/3LYiybBJtyZ2zCpAtRCqKgoJnjH8DB9TYS5ofxrAgbzzaohV9BZL/vR6iKQBiVqRiS/SPLqlk7gQwgpMa7z3nKwXOM8GD+4eicCJBmiuzFA++4KZl/CtYP3PL3uwOd3J73T6oqmqP+8XGIu0Evf4xD3GLqZI1ZPOCi24HrMCXnEuL2PeJUaPBNzNGNFuMQzIVPGMsmYRxe9nYs1tvlZ50sEZhpAtK1yeBcvR3EzfOH6ktxL3QkoiCa9pM0urva9Wi/uQnW8u6qHbYVWPoz6Bt/hSMBrYfqZWdZA7KD7aeCErh3tPhHSxXvThTGZaDxC5VoGChMqo4mJ9scxnxXqaLuhkdIly2Xt9KVpyqrdOc7pslXV2E4Ml0fJeMR8XxYBZ7ueDSGqx7sCfJ2qtovwCm89lKtHzulJp2Mln4xqzmCo2x6+Ykwt/N/WanoX6SvZTmkiFlRx2uwPGPMD05dJ4aaOiF+xjJyYmi6lOxeWHnV5RJ72622hQwRIgQHSfdxDjnG6cYcXgwajtnTTrAi9ZNZ0aU7hY/2XzyW0rtH1w3t4tJURcacxNzr0j5+8iCRkRj+AWc1kEP4lz6yKH58xzzwW+0zTe8TZgeFyptHcsI/k1JQ4AlBfcjfqw/Gyf9YpNYDJG0gnbVq+hQNy4cuY5PTAe+MfXmSyuGWdRwET5Jmr1qW4IyE43/aGYFSA/9IiibSAa8f1ujpyQkkCQ8HmDBsoU0qqkAarJJZgZtw7W69aKQnmUWDlaVzPgh2zwkDFLhNoTtInNhRRJhX1aLRx1d/0zOJr9sQfVbaAV9PzEmneQNE5wGBjL71N5zuvCMh6wYv6pqjBwrbJEn1uDDUTmSeeR97FQsEQqz9ldaNvxFB6Hfv6gfl0mF/mJ3coxWnWjQg3DfbVWGG13JZJT824Vg4McXX5WK1q5ne1XiTcPt7MaAooF1uesE99M6/Bpk9v355emireNFeDkgfBAc/UkzHcSVgBGLBrz5EuJOhjpgfjaASXo5XssNEmutJoLj0xBX9x4d9zE6/Dit90PbhHnSCzdzq9uryazhOhHHqTY0QadgNff+IaN+km7JVB8UMGJpD02GsilUnjLG2OASulvZvNB0efvrGNhyaHsvvzaBnQqV7MndMUrw+M9gePmRwJ6+9d6gNo11blX6n6AXmHvagb8srXDMDLizlm9m5tn4FFmIxt5pV/6FQaRniJthverGDtpVbdu52JgjqvnQPzl7Zw5P8j/HRFfkpqwHsXdQKrqtU2cjLv7SBYtjxj6hwN+IqavhOn4rKvBM3GK69EdoY4rq9TtvKVCnz2kvv8m0xdwWw5wntDzXmFySiro4t2heHx8pbBK7XzbuLtygfKqN9Og/+DySNO5NR5Y6utxUJ4E8pbtNrO0Wcp0s1Ou41SvUk8Zxonz3eWzxR5N/Wug3QPHmqp+rpTAO6aA5rP7mN6KKebN24Dd/1k5MFRIKpPu28QurY82OTw1LeguYqBek3M910P0rlBDMzXz+VHM5WcM80Ug/F+HNsnXPWQu1Bw68dqLFLHbmBKPbTcuUsq/5Y1ZYbhFtwrWX7nShFxn5cOb+zp2BbSvSSuAKJzyCsDm/aBgHvIFgmOcLgfXYhIApzrgxJPNzWvWyeisAmQTWSAac2UdWMPUnoLlx3JZFaMbY5Y3W71Azuq2kUFSfsdHMvAmXJsUF7NNAXQiFLrifULOEGLKXot9zYtSEd/2/5Yds9J6/MC5KFbNdAskU7eklTl+7CzE00h4TMEVroIz0HR6k/f0Dd1KzJaH3DesOz+TA+J88vspDRFlyc/I/sit0QPxvcB7u3zAMTAe1pR1LkgbcPzW9HOw5utLnQoRX3+PtNgWe5haTSeMi+JBqfPtyrbdwvfwuqkAraiCgqfXF+MVXRJ1cDLFCOGIlSYennwyvk25AYDp7TTxM/NTLyLIxFM5GKWdD7axiOhhRhC1S7r1eYtCK2N/ZjixTJd5Mt4trLMhv5ywq/ldfyUni5vBHDelaaN1OfBsJIf92RaOdWhrrXBrTL+cd3E/8l33ZDIfMIaJdiIDa8sdjHVBhdfbzjqSJd7/mu29z8pfiGLTY3+vvFYnW7+gMShga7EjPmz2D3VoHoMqpL2Zc2k/BsVlXJDK7gt6CX5DD6OYOsFu+mDHQUqch1LQRWRnBrE3b8gHQHdIR+I9jVStTBzeqb5vowrBKghIXaY0jVhySUAzBbogRwaPRJ2iHvQMLxnchvDNVk5PyQ7brOSaIp2PGzn8sJkXDHBYJ/1Ct42kyN7w6407vcjEFjv391RTBg7m8BIC1TIN/iLbM5Iw+uSyQYUXA8HtRIDVfy8opADhth3nj2xidUGtSeU0aX4eQobr0iX05FSFCICXDzOZgju583ZBR1cW7jsveVVO8QjPVT0UImQrX9zy5ti8qUMuo0IeSQtVdf2Rk/4eQahTEEWlgF/oSEtziaqNhnnqmz16H39b0gBXJyLqprxOv3iqQaFkgfwrKAeApryTX+IlZW28mhxgvkEkx2ZVVum25lgUXqt0QXiP5j0Lr2k1LeIGjBbv4OZiGRTTmmHEcT74IL234y+uRn6j8Lt46VIxPuyNXNqhshTGkYWqzowHyE7HHKG9HPo+3a+TySTL90ZdJwp1YTqfHH2F96KaMaiOcJL/Y14PL7R4yhHIzW4kNgNm5NPh4Lizj+scekSLEvswbIUOe6uD/Wd4q2eIAQpdgKEiNhQtTVi2lHEKl8ow+knxYjgYlQtJvlUH/maJEA0G4jeztwE8SEtYr2bUn35UC5XRp0+vKIgqlAf9WNwLgfmMbEaUEYNdB+AwnbMyjvizriF5WAbYw1aWZm2cL4znnV5TXA8W1VmV98oDcdRzLzzOcTlMXUjm0IdhaJnxRg6vMNQNh658yRs6Zbm7wi2y7PhDF39vGMfCwM+ZJr40iM2A03KJQHwSOtSQw+a59NsZrpkrCVC0nqS8TgPxeHht0cx407/56HqxA5XC+PHNHQ8JHo/jlVTaosXZcZetzztS7XZ5O6BXQ0UMXnh3lkBV++P5ueWiF8gzc7fl61d7pq0Ij12VRWWVKcbKyYtc8tt8RDBIYR3TxCrc59OVEunXSmkPfS7kO+eXT73hr4MTKfP34A6auDDxB3WvUl+z9PMtKEkRgMjjqq/+EG1o38Y4xT89OV6DVUXTwF33a/nYGt8Dc9avgZxGqF46T3C9HJD/CEjkfDLtxLj/X1QbnvYSchZRwy7zOlDIQs/2cg1xSgWzwmKUkipERrW4vP6X9mOdEwtNHOLctoeCguWDlgRjjrd2xycKNUhtJnN213whNKUFK++6P/LR382zUeDhjp5zU48+UpFPQH0l0vWQbh7UaN0HUQiiszIfV1kQu3iSc2LAU/e+a4SsbYAtm+31p/RyiNUZv5GexGlSsqxtz6UEnM10uU5621q690AgONv23rQak1geL2HeHSERe/tv8FIoVAv0MU9dZSy5PGwZ6KYVvg/5jrR43zALfea1nf6uh0I4+Ls4Qm4IIf/XKUw4192RTfXz8Fa+AgV3WvGdLP/5/i1hbSrfOnPP+DxLYcciPVcLAwR4FnkqdqLje3GGpxQVpLi8/cE/3cc/+ABH286O6N/Vonk4W0Ikw2mdnPzgJtgjRXCAI4nmVHNBzKg1jSu1A0j5i+vhpqDYu65eEqIoXQKUzGA+3P/vlhWUT0LWjHcuCHeR0vEGTY4mCDo3YBhmayHGQKoJgin+TwXxZ2jnar+Bw7Ya5y+1/tcLRKU/sL/sXhbGiBufO2vpRZwqSYVpQzyv8/IVgvw6kKP55OgZpgyDrffv0qSuxcAXPIl/tJ3BkG9pbeQyzLIiA6LSqunPmrhdpBGuZzVHGgZeZTZsgDf3HJhbQm+qrT5bDr6eSXPwhdVJWyCS6v+1aQkQdEPP3fjskN7APxEfOiKLlRQt0UEQ50A8iyRCByBNEvT6TJ6ToGO3XIFC9JbxmKhBYb5dBgvm4GAa62jZhtoMUr47D/HQuzWtc1YuNxroDh5O5JwpxKXenL2Hs/7bwHR6tbkcc2orEldyBcw6B7t48LDr423EILxtTAjOzssRQYx1MSZGExzYN66zz3KNjfifc7+czzf7CgP3f7xKeV7KP8KQtxwng2PZ9ByFQh//KNp9996PTn6zdiIjTcaHtoWucOL6P7XQzsg7/I1sA6H2HKg5bqIsTbCFLouwdrT01REw485jwPWhHLig/W16DUt5RN81TfQqEtaVVzpkXV4mRa/OiNHHou0LgP2gpJ9Yf2+t5HNgh+Vr5cOeUb/p9CxGVCpzX9lfAF65t6WX1a70deACagH9UP5zF/2pgCUcpUVxWtMNOjGiMjowRZGc+1g7It2GMNd0+15Q4DpTVIITEuTIMmkiUJT1NY1d5T+jKNAbYRSvEFKYhG7xiwax7ECJ/pj/SFDtnJ4EKQ+GJ6P3BpQdHL20cobFqa7zKA+5+5SZ3ydBFoHN9sAeL0AMvr1fhN/F9ed9dqW4ykC5aS6sCI17slq0tVL+gHGg9K0qhPloNi1vhJV5ROY7i8lWAxTNESb9FaAVLy6jGtTV8lhdYu4YB+k24RodWucVXnxxtCp2NKt0ufVMJX4e138T85+mkcOHT/+wbRq57OeSzvIe7y1bqz96HVa8IyWXZOMjDB2PDxRXDiRFymCtV0WnATeajGUhDrTjdC92QFKfrSNl29728N8TDV6Sbt0saVnH6Du76UAqZfr0Hs3X/dNWU/pY3AlQNrMlcGersTW65n8mmHBxfT8fIYUBHUuiQWqaBkTPpS5sWk9q66+GrwZ3rTgsSyM/cwzIUYwgkCFh4Oswb2KSKJpkTuaahMQBWml/PdoWkQmEMishV0Nnw7HXM48PJLUv1geoqUMDy/b2gFjxeX7Fbwc5XM2goqgsQWMDeiGLjUoOiccFKAsVYM/oLq19x8IJR5OdVj7ZXoAWgcDnoj7MFnvxq/dRrP34UduB52NQKKvpJv0vvxC5J93GM8sFaltHs+jypawa8EvU/2socH/1873Fbx6jmqfl1NF8LJVZIsx8/K/WilO6fW9aok4e5IFTyb3JI9ZI8JqhGl6td8/GKD6m6Tx/oq+45FcTJ1pSEUWRCm02v/u6oW4ojb4DAS3Ht1HneOSfCTKBk9Ktqyv5ZeqYr7sIqWX/F36R8R1VFf740OlUaoOr6TeK3azd+MP+tk1tcJ/qNJQlEJfPEsP/kO/GDCrBaHSBG1FoDIpVsKKJ2OOY6Gl7FCpkgRteDP2XS+RYQi4vgWQI0aKBKHir71oVqlIldvz3eontgRqpoxGoBI1XHTULNP6BbYwbnEpT1GQ/i2xYNt1q+PQ2rcC1Ds+aITKHXGC8Z8WluV00CdB86P88jNATZUF1kSh8Gh2eQYnabDuXuU9nveqEd7Fg/ff2CtvmQx9/Wjqw50+nrZ7PfBJTPa1vtaX5e0H31DQ+ySlWzK47gUsNeOAY3/BkUi8RNMxK+qoY7m7A9+LYq6lrGBWiodT/eNTqwLGNR9awPq4Oo0VsnWtkj2isbIT/7/V0SdMLWxqBQ6sV8C0iv0C3EUT2BylRywdImN3C8jwjJs+BtvtGtdS11uOM7o8VH1fQbvvpEGL6C11oI/swulUsM0a01VuQ+ldgeQP3jNGUaaouh71XG914/s7uuR29Fwt7kYwkoroR2UtqiBZCsDvVK3uAUAwXSWK0wDsI+y+5egFf6bB714RMTvpylk766dlcSIrRvbl7dhOClCVpAEVn4qYyOoQ7vF7BcvLGykFDMIQfdLqPpIepWB7f+mxRDCurnOY4usSBDF1wxGymKMcC2neRPC+trRbipZbL7vmaW7qdk6ZztHKXSVFVUiF2iIAieONreDTQv4X0FYb9WADUOtcZraCiNgu0NUZZORoLg8eOUoRbFCQhlwGmr1y04OY6kq5KaLchTeSNW80l/W4uH32Ms00NaCdaoSFxb49qhNozOW13zxfswmPb0cED0lNcSC/cOLSV0LW7X3kIanHArVL58D5ULW+L1OlKJqdoKyZ2wmFZAaZDb802xvZXZnt1B1T6gx/otE49P4U34jyBLpMrfA5XuxrOIcPI6OWk/0ASVelMRGnVmvSOa6Uecae+NbMU27QH8eybXMTnLwuiJiGWFCz2elGzoQa0nStrncVXOcJqAdhW6vOsi77eqfki7zIFrDYG0wU6EUVONsnMALqWCotAWlo2NyyXwo41geLSJ9xgcn2IELHwuEtuBpmNa5KiSn6RQJgaAt7wNsFokRk+Pb4Yk0CNVLX+6in7FSXZ5MmrVQRjhZTrae+qX7U8N54Y7ejaMh58Gkt438tSOkhjMQ3ia6uCZq3rL94QTo0RkNcTD437Xqvbx9v9xJ4XwWCJfPZWkC2lpsBanV/stVgRQshZB/P0CHcZDJ6p14t2R3tGYkgWfZsVwTwptDQv9mpamAy6Txi2E6B21S8IipKzptR0vthfA6tUVT828y+Hq3c4ejzaPbIf2g5YJVymA4cy70Fb15IX9N9SYCGiHcAJNu3y5u1GzcYycySx48r08QsAD/JqQNnje7SpL8Cbjq54YcKahDWn+A7T5eIVMFSetT1j6B4bbjKU/cW9Djvb4ZKPF7v6mVXo0+VDkAt7Eg3zkoOmUx5stSxLnqhQsnJ8RrKOOBo6W/YdK5n71hs5HBelznJJWff+1IO4XjoMdVPQWiAVhYK5oNNKKsCeHCMJxfQujpbKGTCD4Xy+SX2BgeL0LrXwsdRYRAA7MFnm0jLPF0/Plz7Z3OXh/rcDc3I4wZMwbfZ0IF+p2f1qDpGAUIPp/j3PN0nGCDoT44+yCmwPSqC8UdJpDnXMWqhmM1KlWFr8EpTW4pldK1j+lvcKMwrv/FZ/DaQU19fyHtjHSof22ROzcKN8SSSKFyNZgRjn6oXqQQWcHpMvM0cmQFuU601ZlDwIznCNa00sfKmRoBZCcBXwdcL+EZ87pHI/yvsXhivoGawiDJ93vtAkQ18vGVUgvc4IbdcBt0SJSqzjeskaTLHyQdQJceeNkPuu2Y7FfewWWkU9UumOYFVyPRpEKe3+IydE5h6AZxHRQo2nSWEfazn/EKTvSl8bWWx41zoqKVcJgaJOUJh7WIZrSY7Z4C/Lz/1Ft1G/LT+asbfUDC/5JgwJ7tqrCwPYkz8C6bG4O3Ba9FchHWLq5EEhKt+Gz1Fkn1TUEU3Ka45mChA20WioQKFKufz25rOmAxNz5am+QHKme1gw+dVWmheR35IP/ZU3yenbxuF4lYGXuw6OIhDLpueQhdjcjwUZBiwk7vsYAxT1ef3OWEoiObrNOsGtYU5RMldITKu8AiYBy5q3xo4d0PZWXIGDfuWnbaoa6tAQGJQ997DbVypGnWqoy+yIwLao7HLMsoLNjPmOQQ4R9DFa0VnC36Cs71q4sFMIbHKIATLI9aaK5EzOLC+jIhcNv0MYAs2O1RTvKwOIP6Ie6Z3EUrDKNmyROpRzp7v8Z2NoRZqoraXXBSC5yZa0fHjUsYcueLADyxm5Ez72AAEv+6cv2DZdrCqo+KeoRUPKMCPua3Vo0YfmP87AQYRn+kUa8AE0fa/G+Ti70hYmEewFTVn7sFMHC5jY/OT3a+GJ6BLtYlkqyzyLMgoHHD7JRTuuPtGFDvdIImi5gNfkiSvQWXg8mEhsdqLs0lPuLRuaPrfrTXCaqXTJAqeKpLaY2cMldptOIr+AL83FGp/ENwZwvYKipu8BuOcn0ymHtU4TlPB9XraU+NkNx6E5qB3ksFg17EmJ+g1ypBgg4LJTYZIfrZLI0K5Tf67BuDgx+jkT1MMMpPlKx1r1kZYMB1MCfFhtQUViKqmST3u9vs3zBwgz4W8nglDJ+d+ijIPabwoqmtEukcv75KRveBsOre7+lCcphP6DTBQQG2CwuOK0H6AHCGfPPe9JRcuS1iaSExSLCI5Vax8nKQtTrcN/Ox4MsOJ5WeiYNlnETOyXgdYoUEtZzeK3V25DKzUyoKyk+CUg8bkrRM+Pcy0Lj8MQAOA0PUjiOQtsjNdMk+5qIhJ6ZJL+pvtrz02AFa9Rh1fG4B98nj1yUMRLLDvg+vfzYgJhV4NHcwyz7LxUJWVIUQI/tgShGCgyamy31vfKP25PactfBRGUkuHIkrEPeBzarHFdjpcEUb1uBb530OJHtE/eJ0qUObR+/HEKee6PUePn/BNpJ7YmMMDv3qX44ALAOxJSyiQs6j6C+IdrSmxgRXEBTyLPjpxMWA6jbCfTzR4ySIDp3JzbkmudkqlLmSettm+vhjzPHUA/7iDgq9CPBjrtizK+N0kojVPyCKIkVJYUd9dkkilBn2JIP0D4DIGol//g+z+HhSi345MF8uauhlYK63L9dP0CD7K/kNC6Yw4tolImsguVXnhc+/75hFjoA5+7MRkKsMNhpIAbStd1iNGbnux1efKrcmjDpZJBTqnP0OfINmIZu/Gp6iAE9Uvm31rQRCG2+k5phA2VoTBRMjKuufdMwM6MnKkIm84bMmh8Bojx+snxSYMbe6S+CMYAiEpAy+0go3xC9kYN4y49ocmdsJePJbRPufUDqIKxlKzrRP/zM+9ryVfsWE2S2ekYhSsNoSUvY8It4uPLXRmRlZz2C4NVtE0FGEX/IDaKec6fcVafrrZeSvP5Rka8H1ZeLz3ZGXl7gk/EiIrfDWgQGsuqr8S/RNiNwvaUffgayCv0a67O//vsMSjap14nUK64J9CK+of4ElizxqFyBcyKneYTQxpDDA4HNCHKBFZPZM93rRxTLV8Dj6DRhEEC5puW5GaReBj5biuZoxg1kd7ABVilQ3zv10330jbemoyt+uHFFVCkwUpU/OTnov7V9e4QVtmTdzwplsyo0W/CIWr+lOZXYxNfNy5a+ELMWwYmqe7q3MSdgZz76glXLO2gR0+i7OiEAHhX2d0a9QQ8/GdAODXOFPs2hCTPUU0SNehzc7pNdNPz0g+M0UzRDFBi/jZ5qGoDl8G5fwwyqaEXEDSmFC03/6CUF/ZHbxSlX8dMAp5WGu4PU4VqjeDbq5SYHaa+6UcLNBIPSmt2XG8pB5Tq/ktLdcKfmhHj/IJwhea/QEXdnFqlkRxhSaknBGxNJO5v2v4Pf4Dpoi8O9oSpd3r0lM2dTo4FdBfGdhRZbMCC7Lr6NoNjHXfMmCXH3tfgPLLa6UWX/4zSufEC7gR7Lsb9NiSv6obN3xU6FMtUidyThFdPjmLlQYkib/u3iQ7xo+OUsFhwnqtn5yurg/tJ5FK56C/pUKjKRgbvw5GzdLru84y2PzJJ7o+5yJ66axCFHQLH4keJGA/Azzs6QulqEmb8zt4XxFF8hPIPduy2W8xwhGoEjUt1/3PjQIc/qcsUGrKYCRYunKfZzzhqhS4IsfUEmWd3FpdDcQixEl3+V43OFVezFer9si7SeXDNqr6bc3c5D30xpSFCw129G1wMy5+QVW0jB9JY3aozEyBCpkMEuDUtzjNUlrD8ajt0I3Z2ctzkBXtxk7LPwsli3Wl1I7a57h8cJVhN/0ktvgPV11B0wr24rS0Sy2djftsEw5z9E1ofcjE5G51SE5Kcjas9+0eCSmpauglaaCDEBo3uD0/FAKD3UvY5e+s349Fb+IX3LL6FhoTOc6S/IEN1vnLu/yguL2ZBgfWLAK02OY1MBuQgeeStm6/Py63MwbZXoJX4XUU/QmeA5jYYTX4nxjUNH+QY1F8hNXpyi69V3Q5bl1WYJDKxb7tdhDVMDjj3GPxSzdTV3LhaYNP7hcFijolq+KVMB7x/br1t7I/LAAOrlfez8zTxs1hnoTQN7TEdNbn9PiJ8CVRIuOZMZwiXoTwMWDfReJiHzQPMkJrQGIChDBpfCIavO2HXvvKrVwIyKdK9lb2paB4JacBPWFlbp6x4WOLB4zMT7k3pTaBuf0EwQcVvnex8DN6r3iNRsMiVzzgS/TutPq60XQSJJuXicgE22n2CoMs33t1wjcd4J7pdQKJ0u+2ie0zv7yg5jw14XsSUTnPJec5KkyZyj1szitegdGyo9E9xjOXjKCZ8DhHgK1etmlQSHsZxcU6Dic9QEjMqJvefU5tdNom4BkcLlLEfd5FqnTzsnTR5pAqV6G4jopzseeP5sSvuKwXNzYVhdcyRHtA+HzIOTy9apHSdj+uP7E/wuM/v9d7hrL8LShBgD9Bz8sp8F6UOG84NF5ukjMUnHTj0xq2gqNR+fwzjJvKm3BTJy2XNRVIVs5Udf/OFf/H+aKmXKvT8myMOgKQj2LwtYaNK2JHSA5/7HWHEMAIbq4dnaPDaUcJ/D1uMIyI686Dgp+d9BDmESj1J6gXPTTulkRiXVaoFE2eYyWcVYptr5DOdFX1ulL3swKYklPGq5Z2Tlpdn9MfpAFie6cxrg9qqVAmML2shH7gH4ez3+VGJJhDI+0jV52EWQjRVhy8ti1L6MrNE0sugZnRU88d9usmZLogt5sdizuN5GFjovtfoL7PvqN2r8iLFuKJuGhci1a+hMxJP88tFZsxfI/0WSMurh5TskIBEEzZe0XtLFwPAVrkvRwpmTR07cdCzKtgbUXrc6y/orDFOLiAC2uTlSJ9U+MGg8U5130nXu1zQ/Znva0W0paGCa2RR5rg6Gi7pFTCzdq5EWBycUo8TR4AYo8NNFGdVV4KqyjprXCayKwcAIoRc/LiitCnVU7aIR7oL7OgwUqZZuPAP4Y/YP0ZwRdo594USrqQtWiSa3T4GvlPaOtnrubFX9M/6fhnLZzyQdoUYqYqfQMJrHluSFf7Fw/t7b43MKa8taGWeH9CQUQL9Il8vFi6pdJ2nlkizSg23hqhnUxisR+SiTcfkguRI0M/qBrvC+Ez0EoQD8FIFsRywhxtnsfnYMqP34ZnjaqodjwxrTXFZbgq7nHpI1jSvXeWSnf37KI85qK7TwMsjVA4T2xbZU63QLihN2/1dBu7HvtyAEhtqHqM1n/7TOT40EYuMJ7dYt/WfnCaWMcRfDdwwyXJaXgggSVCismTpcMjLhutUps1l6lmB5FOLImuMQQ55U0FpnjUbDoamUMUkqpimulj1WklSDksyM0pg7JPpDmaO03505eAICVpJYde1H/RH/vwk3gwJTJRczwxS0fkkL1CHxCAO4UEjgp5KHMbZ6GneLu326GuD69y88LrstTs+vvoxEK6ZxzC4P99NRkjJb5yyG3a++p8NyAMZC5krg+p3UFDUufdlltSMDSrWMhJ2rP/lL70Wq8Tc0C0wXVfLYtGXTwDUuvEXUvbRWXDe5mBU1zb4qymqjVkSltQn0bca/KckcsIvSx3bENuQxya5cOLQ2a31vcx6JlC7rYW960Pb0WhL7VHaxc//eD2ePDavrxiOOvdR0o+MOjoW6+z9xyR8RvNFDHQpTfkOfG3XY3PpD1IN3BSy9Yc2edZxvIU4qC5XtpS0nuKZ8vDIeE8uWYaYsXsa+tSvshIO90fjfWOSIMC59V99W9ra2kviT2/ummP2PNBe3Sj44NjuD2AFshOMyPo2/RBAspNZGt3NSfBGQ59RwZzyn45nspFwoxbmJy6/8ZghGPF9pp180i/w1oUotpwz63zq2ca9nGVO/ja3wP/Xxa18Ery6ZQzLE4DPzDiuelsH0kvBF7VhluKJ2PKgbBDSvgDbdW8t2rS43dVC0zylRxU+on4KSo2g2lOLiW24Q/e7h45283L60PgjSdk4hIMaTzOpcTB2SphyTPdOBCV67dxkiXF2hnt0B91/FMSUvEa4oo3STyofdvvWWAzcciEbCXwT+NEfv7f1LWEQ8pBslvohraVH8/VPTx1xvT+6fvbRwGvr6Bg1w3JS0XM14pbHNx0/WsVYAtnmdeAVSnvAuOZKzJcQ8AAh5W3f2kLgy9nnObVV591KNKE/dlz7LZRhnaZEk9Eftj2yhNYH++3dqyfSfVxgojyrwkcN65s2QAC2F5hej3UxDsxYjx6nzKiCQQ/zu9TxYZ+WTig1CMJhfDgZzTmxKzBENP/NqAPtFqwD8PJyLgbiczJ9vPkxowCWsu1GkXuefAaIQ1RWUbxnY87fHSfuXnhK882P741pEjMXSBlVbsx8Rm8DC8/L0fC2UtZL68LLCQ8YJ5zXvok4lkVPJIAoUtRnTXxWpj9aM6++Bf3m0jvlc7AUg+Px7gkOZEJDEUVnlOStQt9rgYZw1dIw8mVQ+F+wkz8d/rMviYI54ATUYa2dEYACYf2CEHjpCbtXIpQwwjDs7e/IjHXsKgsyRamdIzRW4jxXOnmEuj8nOMRy2Za0LYvzxC5IhyR2n+ZZ+yf3cJkhT1YYHQHEPtd4hFPt3t055wpnBXwKd9HkZHcEqNj6sCVpkTVpj43fsGhQGVZOU6LbYIR1lJOaUX6KMOo5+DybGOzBeoPXOMswY/y+QLL4nLBRDCiSPbsRgBKDaEaHVmp8bXnbJvJ7zdTKAvTMlZLyIZVomPDdIPCfPR/7E47ZPK7b6a2yo5xjefzDJ/xEK9q0dFLeO1pIgrPbyHUQxU7szcLAXaNK2dJw5oVbcozUE9jJUZDcVMkO/NK2CgjOFwXGNxBvRwixPixxV2VJYUvO/Ksf148uUz7hw5IbJeLumviAESIRNwdIZD4QyTz74wOwZul6lbMkNQ+AvhTM9in80YM3o7ls3cPAZapw3AiUxblRbTPjy/HQ3IyVT9n0AF5PYb80iOyH3mqIv/i6gAKmshn8zj5858nYtsEwrvKRolkdLxX3n6L0W3PZbSxPSHSIf6dUPN5XNOxLac19idV5l0Qfki6SUDcbCiDImA6rr7h8INCtKYVq8aU7fKNEKHYoIq+Ige1/4Oqmttch/M1bhZZNN4dzsPPClJTf+StoJUz7gpFIbXdq9TYCuARbD45zIspJc9IIMAJcl1ps3XfN6GCF+4p4rz9Vt2RHVXxA+uTd+SqCzE/TWkp4j1vWn3rUu/ydg9dF+e61D174CjmuBbuF8GNWFaPvEpbIrvNITquIYJWy+kTcUMWl9j6WGuujU6BMu8stB4eJGDX+WyF+YpIjtVd6uziRtM2191iWavLWPl1Y9M5w0+p2ZtScwbWL7xagbbVh7RzVyVNbrHZtDE8Z00ryoNYC1PcUbC/hg0tAd3y494CpGgY8/z7gIbn+T4gwubqK32rUujZQaC8xfa5nXfUUZCa0ruRPX1odQavnT3hdIV+3iyB6wEBMCo5kMpIYFlRQrYVBZCK1HfhM3OTIepvLL+gzUcyxlOPp21QiSu+jM8ZsO/GSxAHnr/tGfpGpNnu+ET3X1MQr4yvS/JeUaf+vRWLH6HHEvJzimjYblc0PX6nq0ijcrG2FrixKe01Wy4KFhU6n3XcWA6NJp/EdKl1Drm0WZSXIxbFxRe4cFD29F8Qrx/QuXDsXXpvudTVd5j7zh6xWnxoB6Fsd14E81obxt3D9r9HZ8J/LW8EQXIrqEVx54kqYWvGp2iPsXSHYUOhZRjMrPiOch1v/BjT+XCddWm6gAR/J1puiUefean8e5BS+xO2tXzpgJa3b/wIZ9jRk2uzfUrTwXGJKk4pHb9/XGRVMkecsrb0yTDkL576kUTSXHNAU2eAs0/qknkx7ov2gopU1MGS4lpQxmSZ0IA2VBiOIoenTrquH1WNhHoKT653nBAS2hYZ+lqDtzfohVukfoJ7T+wIC9jSHF0AVEislQoe4Dnkz5FyhZesoxAcPcsngtIlYUsnmnnlnwCr1jyeEXh1bSOk42GIMBbEK7fiOWTWX1gwV5yCI+TZnqww0wBYtFda1e/zg/ekj5V7Ac1TsIVfF+A8dYU78jdwxLz4xiPp+K+09rNfxTOIr4S5rRFvEZbc6szv9/c9DqJZGWTuyIK86C1Xyfklmb/wvd9fxp3XAs/Z+R72ntC8RCDql5tdpkdWqQM5YJBGOFm98UjYMr52C5QSPf7tvKn5CfP+1/8j41ZPhLTe7bkIhr5Mo2BI9akG4x5v4jU+SDqq7F7gOHLqI97rEXrKJfyIB4mrGvrkZrGsT8/NMfI14iGc6uWQPQ5GrVCcOsNmwKBPQPaBZk3gawjAt26nA98Cyv+1HzmfO4DqK8iopcOmCyI5N1hCJM9n7sXGdV2BfTxdC91RC+Xog3spKtVe0qcV9ZLCZ12hhu2r8tK5j7Xw8VM/WQu8IqVqxeD03sP6e7Uc2BxbIomyLums7Sm1cIBzxz1WFYLnfWkSZvRvUxnVO27hxSl2XApduOstsQug0QnALgKsa+XmQChFb5drjyVYf5haw3VOE8OfHIuczna+MuqME8hrA6/efwZUlexfphkEqnJ1ePawKJT7vDM9tJYaFxvNJuqsagLno4UxqlQvXH1Ol5nYtWQHFl2Ltk/4jXKYBqWN9l0j/yfXP4bSHfP2sZ+trZQlonw2+WM+eFYzY7GfI2iM/EnLvqVywKpWxfachMHA3GXSP6TKiVNtO4gJWpgIFHcHAiwidxkcS/CofXHAODHzqGPOTlLpeUiYx813ON6d5udQ6MT/KGmn0zNJMO0K/Jh7I3OfpOfzQOnux5CUmO9tWE/+ywuz4s6LhU8xHCbiPUFadZUXEmzmbJJH6vNKl0BvZoD+N7sr1bAJoAH92QNYfynYw6KKCE4tMaLQOOwYaGSO6vR1L1HozAyhI+zq4D/xz90f0IErSs+NI0wPrrnY6RYgZMUqMRM86FMmEMKD56RXTwKoDbAhrfT+V0M4UunKIhJsLsA8oBb7vD+Yx+i2FxwdpytWxpvBvSISNjeSVHeagCCrUtob2E8Y7//w0Pi+5ZDdtrocbjNgZiY8uGQ7C3yC4cfuna2VV3gED5dUCjGzHxtnN06ObfqxNUuLRmzemFphk5qpMSLnXf1pnZJaewSOyHCtkZAMuB3MlvIWi/MIEiTrzvgAsFCNKfwnWwaT7D7yd9PcBaH9VsPHjZQ2lVta5Z8UUWRubTA+CHGEwemwkxrDiJzwopyQIcL8YncpMMZHiXTKGzlrA/icp0he6ApOqCyaeCH4rQKUUGcr2nDhfSy2FEiv2tlubDWEVE774ssvDnCxPZbw8W7zf7zFWHUVsTS+sQAtyMQxVq49AlI/hxB5qaQVoPcS5S3FtJrXtTuGhVe2q438wll6nrwHHfic9tLaM3HryH+76uaD/vgMc/5QhEZIHojvOuprqEELTnaF6vXHEpj2PMX4GA/CMkxcLJ3OHi/+5X7kjbA3VC1aFq6MFrgXxa7z6LhWfjVNUKpcareFcqP3pz6plHHkG8DF1DOX/mdHt/b2GiVKmrKE0ksx+TPdqp3aoQcXaEZ8d3Til9YqxHnmlmQD5rDv/BbD7JomMY2A1suieOmCP070lHOW2mM/cqL+uRGn3AoOSaHJ8uiHRsd+tx2F0Gp4UVXDHQkW3RdLKS6mxDBcMJx7Pqc7yDm905wzOpeL2s0riuwMEucJgZSSjL0CW0+QAVvUrDllYhr1Hy0Acnu+or0NSDypD5D7N+Li/NYfivosuTSDZki8chI1X8sGv/Pi19T79PBWAuTcZP7JmCn1UB2fLQBrTRoKVc1zgdCysiBrwwMonuFRRiorINBcTl3dUi/Y/UxT184ysia/sjPot9MlCpH6HPhI/e5EUCNwT2Pw8oP+LsPtZr1ZhJpdLcSjGbTcnw8msfoZpNpOA/6KCzdTgFth6B4P77hL25PFWaz1ZmpK/J1fKgB+UWyYbLWHPCVQfgLkpFWHZWdtY1k48XxpjXPU4FSM1ctNDi0QrljzIFLZg4qXQNp/eHO7nXUU6ikCIKm+jY/TeJ4BFW1ehFcEbbGm55Oj8HB+GZPbq8ymy1NxSr0Tj2QDdNgvtOcQ5/luo6dcX3CjbI4Hj0AMmSODafg+RBa26qN9B2NkI63k+kkaDDzOLwlHus7MboPp54k+1SYz3jZFCX988dP+CPzOLXcz5dvi8H0eK/YT7mVA2Av9j15GWAvRZZsb6rdpynBlHIor8f/k40h//tM88fzWYrTzb/w2Zc3Ij8n80awVcWFP9x46byaKzVJnNZXQlHyXk72ugmCblNK0yCtwnEjy54IC8lTeUJWfupDRfCoF5H0LTbs2J1f1OWVY0JA9qONRm5EFiPZLV+aS4ARzDjNNUciueCg+YlY25UXVo30wZIsjU5NmVok07k26FVEOLRtO8ie1e+lxARm1u6FzcZatlr7jLdSghcsPiRmHKRL8o2dkKfebtzDZwrmc8/uYbebPRVbvbv8gF/ZGLdC9uqJTPVBQM/NfBwVLllj62QPnM0BoL3JcRFwH368QjEI2R0u5wzJQT2IjLxUfaft/1TyLRuML/QQfihFS589Bq8jVTSpiiTzIA2Vm9dYEY0oYGosT+0tzat5RZUDXVoev1ZNRRpxRebY+qI+af7qzDcl//ZJ7xDNsvoek5f+/qC4KqLL4I411FbKqK3ErTSKu5CiIRPdKSwskB1OjYp9Y5ZbdjkTpZmcF0cYN51j/+dbqDfNrBQu4aJ9YU90DgKNgKM2+14OdCBNQtOOVQpnTe7BitC8HetemZEiNLLJuhs/SUWfxVihpj17QOrbhD6ssPEdJt74KsgBSXNovILPRgDLLrQHWBfejvuFRzVLau6wyGpn0UcXx2v0diFJQNlhcFmU7txGBKlbPc0H8FSy5hQEDPlZMnvKnBN3+3zTuTwLdhkvfofxQNurP0H8+wljSjnmwVGV6CF714N3K4BVgTgI4/cdQaRhShHR5zSXTZz66twOb4I69q/thviSBby1LWMxuNwF/BKLkgtVVnjIsP7y23fH3K4LxVFZWhjizb+mocLg7czvWoG2mOsOMYAdGX4zM1dSsCnDBT3hnlKKx6SY4saqdyoJlIiQJ15GxxJBSB0C6TI/jl5B/DNHo0jlu66wm9w21ql/a2BlUaGSmiCi5DdQvwDq+oEjs2ylWhsvuM1U0FSP2Utt66fXPYLkcSWeG/D3EXlqIoJcRYMCT6EpVmZUbTMj3w+52dyjAPDMgssL19KtOU15vBE3U8s0hbo+Qf59PT8ehbULtK3KvBqqetnEj9hc6sN6ke8jtXFldMVlrxkv5jMXmlPRZpeLz2x81JmpImYjerUm5W8IsODVNKpf16l+bS6oiEITuc9sEn19KbJH0WDBplP1WbSnSIQ/II2zx16mkCgG+RfW1U32BpLMintxMxTNX6dNuaj2qLCdRaRNIbJ8OmpYh/pwhFneT0mQWVI14WIhI0NSmwgoyBpEfHH58aW69nCS7OobZHQiErcbm+XaHs+05bZa6i8wJ8rcZ7X4P9JkgADBT130dNcxwjC4U/0mo8yz3GVBZyc6VAdBEkQqBc1K+ey7MMY2hlPmnlowOvKSxJJScs/R91s070LfTEc4Xn/en2wyShCpRNkCNcvImvNhccCJ1eojDAJlJELHdbwAY6YrV5EWerE28xyCrVPS/BTIBqjHpFbUcxnmXfO4Y90GDd/9YoKvKWxcce+fZ79Fmh0Q9sxfaIXQIA+bfAcHCN6KENWoxF0Lv4xjbIxxjIOmlEncWdyxG0IAM7lsZ8KwEkzmcmVI3j4925LLlJcGI2ELSBb2vmT0dWvEtMEnfx149yeLQbyIRM6pC3PRdl9UdWyVaqq3EpaIpbSImayuDlWrz5RUm+SsIjsfauyjTp+vDr0yaUNUbhPLa0JG9/go1ak2vagfX5/Kh2d2f/xd3edqlE7qwzgN7jJu8eEIHjKNZis7ej8g7goViHxqUse4FoMsK771wbUx98BLNOXWXqVjR4rKWq+TbOgWLK7DZqF040z8gBG45q1TMze4ezdA44t3Rq+6zt5FvxM9Fred20D8e9WAhqLkyrj7iaOfkqLGDmAPot1T31X00jtvztJLq9Jcjy6SaCXXV+K51Fg+6zWK+mZKHVF4HPIRAnIkANWjuafunWpd0Q4yqYi4O/JXsss5quDh18rp9XOQ8Xehfwxkf9uThPxoSLPukmWeLngEQyG8ooq1oj45wjcfjI15vQzKie4CdgNWRIBrMZkO0W/W/OoBjy2Sz+g8uLc2tXtFQ7JRvKTpuaTdes9r9ZtM2F+akTPfv+Yh6jges9szi+ZepOSear8QTbDjW7X33bo+n/aNhh3lF5z4l3rR3uCnJLn5hvvDunUwrppM7Vwu0X4WU1OY8wJQd7aZD5E2oJ6+skLNI1u09aTIMBVjXdf2V3mMk8U2l534EKrAY1eNtmpZMRtTiPqsOAmu82g36RD9vmwu56Wth0Zu5r8Ag+rqxIYndIHIsWrQpkpSEnFeRdYoXgQuo0Fi2YDiF1ahVHytOiuK0s5nKbN55nOGrCnS0ExNH2N1nQXJG2A9y0qAk9gOrqnXYsQz5l0Xz2TTq5CeWfFCIofMTdSAOiQkEFrHSSxb9sM2oZqBG0gsq0ONnfEyAR8EfuUtmp+sYvYsrG5/KuhTjus3cM4LR2/7/hImj9JCQVS4+DoBb38no0orpPgcwvyuB6q0O5BMfcdzZgdE+WXf5mIqGN2W/6zAKuDJ9aIPVcvXDNXDFPOWbhdwxf1GPimQWzXnLG1nPaFnsujB6DENSlgliCRaSY7buER7toUKeIHy3tgV41o8uXm6rLbqT+G++aDMco+hKTQWa81uvWSSqdUzCmDqasJsFNp63c9EmjjJQZYA0eSMB3aq+z4N2ycPCwhT54DW0Y+C8Zcnoe7NoBuS7iuwyW0RgMJC/f9SHj3xLzNynToH71i7R+bLk34A5BKaNSnc4fket+e102CkuVUUGhaK9HYM+vrMH4cKujzMQpV5T2qKJC0d9tLg4mvZE/seRsyrHiQouns9YxtWet2C5OU69emEwaUC6WerKDeTY8ezQ7y72EBnJxK+p728zwCaFc3ilR9e7bC9WGf4eK4Bg61dKW+Yk8Pyuy7qLj3iMWQkjPrN7l0tJJ8s6NGN9FKBgVd+T3W3hHe9Q0W4IveX6P47ufXFlyJ90YtbPie24Pl9qgr/BBtMIjJRUAwFAa8yvMcUKvd3senCBxtAFDF74G7Qk7hZwSX+X2FaFHSF4EFeOyGhj8pA9FA6P6JvWgMZO1d5UuB6ARwzw90lyVEHbaiExhkBoEJUsWLFirWhilkMkpiCYXqLIyMyelJXK8t7S7yHumuf05Eb/n5/AfSVWq0EWpLQRmttpYHPPvZNW1qDLmZ1a82xteAG9dLmAJYAcMTQudMAR5x2EmNxi29JhTPwfYBt11CHLVhsqiJtSTjCzKNCbF/avkvnI5/VYpAqNItGViJ/lIAGjHmxGKPY8VdAK9wkRHJbYYIrUiM6w2kUcWtZHwvK3ISUbGO2pq2pbotxA7XUCrfQJltEm0pT1kAfuwBPF0IV0aTixv7vle9OiXgs2YL5cG4xXZBwqUmUbe7joiHRWJClT5ULRzLf1/DPXgssG0uUK3210aquK9gqbYawipUsiozNrIQTqFIjP0JwFbRqzarMpXTbixpDb2yBL9/2hBLWZIUtyf4FELDz8gsLgH/xxx3VGKq/MoOVT0GwkRzSTtSJ/TfSoEIJwe9td9RTPL58B4mtRKjg/bagIzx9Z3zqobojaTGvJFBFDVznbhns4cx0A2Js5eI4Yelz7KyFSwnMXX3aRERjkI2NWA+Sh+vbuxkv7YEGFB58NRlORIJMgcvSPf30tD6OJ6GJEvw/ZvJN7xWw75BqxQPXTvghkk3jI32kEpPgjxsVP3WCNtj5F1n8bIUQopzzg7g/dgGeBox/SOcUFALZCMPI56cUMsf89pjH8Y++O8qE3WsSX8/Pcjhx4uvvECXegx2F96X9fgbqoclP1Yif0lJ+MQGeFEySZESu2oE84JNziqvNlPzpn76nSD3HimvvOzsXEdbeCUUh0ssTArcfeMygRgwnEcrVnTh4dQ/winTGgCgtFltqdYinwYdILZ7p/F/bzOkV9slU23t1rciDaB7Wi0T0PVl16Fb58fP34YImP5F0z4cjd4e2z6b2mzezmBwAbv+QmG1q8DHEdUavqi4jjUuW2XSNNKGxjXuavGWZSZJWS0tpvYbvAOA7qS9EiLUObMDQycacHpfHNpI5BcCh9rQq32Y32yrpXf9DG3knC4k3o6rvINmmHT0rdp9hhZEt+pEe7h5FfGbCbVHc0XqvyD/RTiUlYivkeHRJMZylNXaaK0OZz6HnDkXRQqnEo/6ZNZETV7naVlZJkno7WQhM4vykOXsT8G+emQimaH9MRhtdC/WuDamO0HafXFz2ume3cNMJLKfGzxAMdpRghewI72Yc4Dmlfx1J/FX6DxPbj5viO5Ol2a/u6HD/P88vYSYkfyBx0PDHr5F2cIhVJ4f+MVThx6sb294w84DFxQCivAkE1RfNw+QIODHd4ETx7+xXPE/fGyirTWnz025qP7PaEIG8/0GouZs67N+4HVY9uZM4WGzdCljOHV/xwCTEsdhbozBHgk2vkSzDF34OYIAaJK6PyQJeSlcBOMfnBlKl0v6TDg3RCm177YibE5TkiSQvK/cnTykqYf0u7ce7L0ocPVoQ5WJ3ozdcD+TqD1zyWNGBsur+cBJ2xTOXtvxoIKH2TF6O3BAPHt4cI3kwVCUUv0lE0c0Gn20yYfhiCi3w55g6ZIiOqJvYw3b75FdrX/TJKWTRaxiDlB6f9zDfWiN0YOhXxeUgNjSlYPaYlJIZ3HsY98TvmQKiiaCoZCeXnt7Vu+mQ3aRW8Jzo/pOxsFXjfkqDwNduGuU/6HW5VTS7sltze3xxFS4Ge0XZVCG71GBsEzifBxj0AyzdiQPUwILfcyWO0d4cWLkzWgUU3StYN6VL2rATcFGHDjZiSPhOwg6cOkrCfWVVIXGO7shLHufSddyS13cMV4cYL3pO4irdM53mD0hrpk4tZxwAxhgTb51skUMsiDC/2kpmNg/ehZVJjAtZJviwIvuQ9yP4CCwVFmCEkHQ6SI7XZ9bzGLB/Zfj6VqwHpMG/0ZTLwGjtosKUBGbtYMXwMS2AZMZ5OFT0qpUulX0lSKOqdawfIB+/o0Z2QvjiTBiF6WFsVvgHRH4bEf3ULHFX7Zlzf/2dhBVJYauRGLPdvSc4A4WWF5YgpfuSfO04+fHe2M09ngkAPuES7F3nqZ1MKoNhQ/IYg1pt3xU5OTf1k/PBzuFZVSOM4KYjTqKNJ22p/DlW6jYbdcuZ4QqP77jd9ht9WmA3pqMssxX4IvW6ra/uEf3hhBsl03lwIvM6l/hlO0Ul11wXxXuY+il6PSKsPMXhuVpa4pitY36zI24xRdrYoa8U2UoXr0SGVDwX7iuE3JAepUA7iB6zk+8V8m9w0cEc0XmxzyhpgVwwhkDM8cY3KsnQXBu92u35/fGa7J8CJwpSqpKyjBfxGa9FeHw0mUVlgbexCHd8yDKNdgv0KWPcPzWp1XWpSVRLoYzBRKiRTjq0Im3x/8hywqgUkcKZ2lUAWiVa99cUDRoeIyeM4p02acxQTtqqskxq17itb8Bugd6+fmDEz7I007DSalKyV8J6Uhzpbohf0kKeVCl8/e7J8W0wVxWYZUJBWELPzGooC9Ngw22DFN1hNcBIU2UzVEh5Lr392ssN3C0iajoS60nurBRrHjBnkRWW9FWCWcm0n5GKVBp2sJnJYDxLu192vFncvJE6j2IRaqobpS+ORVZEa4MmNxA6MS6zBaTgt65z7CS+5A1bAZNkD1YNg58n4q30l3JEjDPBXl75nJiXPtdB8rJ3FvvMPQKmm5fbmWIyapm5RmP4xvDasso/awUyynqCIOptm9HdAE733xQ2DF73hXShfoPmg9LduKTRLrVnvOO6N7ctS1tXzx2xjXzUBN33W5YCfceBahUix5xuZ8kjYTcbi1r5jw8HcgmqsRyQnULTAPIwDozqvLrCTVKyTqIuGjj6eG42omjqUf2rYh6h4OQuLJnGq8ZctbLqsXpsCKvrl4OvAWn9Dulnm4G9y8NmllwfVP5fwER+jWEP030oMI+FZLyOVzGrzU3r/PS5i2fR2P1wepYOgo1KpkGwasFw0dWWlC627+8mv2wlwWTaJTVFs7eSnUKqlSq6/kkbw5Pn5+3/C8q1DaoCTQ5roBxoaV1tx99HcjcHVx5MUJFjIGex1biC9WQo70Z5AnGaRruV4bIM3cc3dqbfaB9dOLCj++jQ3tz1cHB2b3a0Ida68DEovjUl89Tqwan6llHAqbZlTZKm/jx0jjlpv+zGsKYdnlN3JsXbks9DTyE67/sdhRVGvZRwhkjaHrpVfzWMBAXGp++0X7S7tRVoRH/0GkC2hLMNCg6ko2GC83AqFdDqKsbPzlGr2Lb/EVJbntfQ5CAKLu3I2/HVS7IgTUUxXXbiah/nKKqNEzdnQjj/oi5x04BjSIWamozw7Gi8fBA+JwvMvebX4NrKqE0aRoMHgnhLflMpv19BKcwFjs2MqAGjptVDJ/zojpvu6ZzFCpyRhfBIU1Cd60BX/rJX3V0Tpb9d4Z59mlq/DR2lWSw9HLfSwOZJGE9q691KPkRLtqR4PflY5ZLeF0nMfxX/+IF5A+kiylE7rgI8S8ydH8HZWiCOJ/sF6eTPSUdnMhGQ9VcYtBjYywhP3Z86q/nG6fyN9YnGK47ScEmHL3A2QQrr4PoGQv2XPdLwCBbIVO0YFMZ4OvsqNK2iG2lBGWrK4tz+aDPvqzf6upkKMWQMH9krAbuk6sW6sDvVXtzhYafNIxPOId/dtsVvslwIJDSPTlp9hXRQimzp0Jn+Ye9KfHpMkOKe67tEoHZ8PZfAXKoP1Ew09ed5B1cL3XyzCBE1S8i3l1CRfttSNVHpGeqOeHH80kmtTQqLKIsunBReXJzKJFurkZaGAQfUKJD5DTEFbhJ72Wm/djWT/RRuLgr3U2stZsxaiRPDNAZKDfbTIcTb4fz6DawJJxri+bYCwamnfHWorEM6oWa4m273nRnmErFRMEKEc49rYEg6J2wwnHNBqakBsAdS3beBLYy7XeO/sfKCcHnQ+CzJooN76DXMhq2LHim403BkaklvJyaiFxxzlF8vVZNRU3z2FPe7AW8Q9SJIS82Q1t/n+h1umpoIy351b/EuDbNg8qJZd9ek5vHlcrWug62OEdmegnTV1JyDf4c0i9TK7ZWQHYYINIJjcJsdOt/TQzTnOgeupLOsNDVx5Dh3abEwNZbFziAn6j2bneFZ3kUlf0uNoxzA50ALVzvtazFn3/DTRRwJaYRjuzRLxmr67gvbDqmc0PZFdq7EoqcifxSLt58WKeGS0tF1zJ2ven3shbCbXaxuk1tZVfRanuO3y/pXkrZ864/fjADSZoP+fpSc6e+c4G77fNisVINpZCHWm/vfdZiUW2/bwjY2Tcg/p6Jjn/6fcbcUx1/cYI1JlKL4g5n8qsKuEsVHv2GnDXZvgpUTHBrEhxR8px0OY8K3JQztsR8icSKGk8/03ml/xPFCofWJeJUbfGfG+z6x+0XHF99xYxU7EUdqspeyiCNCAwbo0Og3RcXfc4LoWAaQfx2sRJ5kvmVEY5WW8vQm3p27DZv5/H9iwKVqmXavNrx/jlDqbz6VGUP3v14Oeh/knZvK/XLfCf3dl3fJLzsv7jaRLwx1u/S1LTp79kMH1xGOoZEeTpEpXuE6NOANbkTzHHCGwnHDA6XiGz5HBfzENag8GG7AipA4j634wYUYiCAK88KQFrWTFBLxlFaQGR9UQFZsvSg8o42yhVfslF7gOyLQG/xI5KVDNByc7JGATumAlOMe9IXU4N7LiDSQGZ2RPLnSf6SQHvaKLOidDGmNR6N7Ukel9Eg6UcMuSQMwXqfYeAiNDliGFe4Lq4ewcMaKkB7+Yy288DHKAdxCgo3ij4UZewIo60LV4AY+oOV4U/uTVKFAowt2jh83j66YjHfjR4oQ4c2MbviE69EmQP0cXMNNAbepDS8luNePGhoYvB5ruMCQhr6GvXP6v3Ml4YerQm32blN9cX2G8zRsa5AQPsyVKfyPDpX7vnVhqlzB6HXDdQH//8P/yq9Orrryxvaz4ys3FC4df8pyXVeY8gNwu4183t2g1OgYux1uz+mC4aOcD+7i5dGOahunLzv6WCjv7X8dol154DBuM17LaRVzSKyPAAAgazz/g01ocSQOeV2joE7uLOROZdPS+phZ2BOZFaYq9uvMw1r1vqhccoUrTkFKLdagH8LlMHXEmKzn/Ty4CDhIjnO+6E/R2c2TJZyicfZeXBo2l4wA/DIPJRi2fbktLT5c20OguCVDXAKIdJo0xrEb6IJx/TRn0j75IBu4A5NTUEWRMDJu2dW3XDYxw18RVR1UObwt1AEr3HTroF5GBtpab8vph8ekqxx8TCQC8fitfX1uNr8y/Gq3oEz4fFO7lPad51O1Xxh0lJigrBVxkp2bjKGTE/pXN6MpjYjvAcY776qLURZOacSY1FPeSAbCud4WfW/9FY1M7HY5klnbg6dzZVlUTqSiPNib472JWxy4AtQ2F1+ZjBB2i4cbpz5Y75flGOSK93GGAayNmSJJbSwsP8xspk47gpQReYfBEYsEyKEgOvdkEg/ZbJ40CS1G0n9kGki5fI2Me7M003Eh5dh0kaeHFDpEXnjE3gEd+lOu+qvlEu48D83E2qQg7B190ycjSfr5Be6e/gox+q/Heo6EBWlEoT0ey4bOC99d7RuCT3MjopEHzfEyhUxJCdS5JD4rfpDgWkHJfGbtM9v2ix8T9d+XDbnNcZRZYBn9XpKGN4bxjNr4wMJbYeYg3acal2SLv+cqXnsV8YZuMrnn1Pr4fQv6gCeWz53Lgn/0ScDHdTBNQ/bnuVvg1Hzd2VgZtIuQFdQhsdEotEKheh5C8+ZF8Sp6AliChXiBPa0nn7VZNi/695DDXFPq8KsuhtneuSlpVzVsytR6TikXqhEq8FCkLITj5K71FImYwk8PqSqkDMERifYBjLv9LlwJpOUN74TnnAZwoJ7ve8H5ey9iOCGexOp6+EyBgZba19ATS9R/KAS+KXm7KVxR6wlJp0/r5q4qSHeYiPDk3AYiXmMgibwITmHfiUmHKFItJIZfRjwBWZAZByLr0mJOt8Z7+S9AsKn1xrgwPsaUOfLCxUbp9F8ihjlGXkewcCTyG8YN0h53O+DfDNI1ZxSgcyZXhXhPuZ94fhjqMP3yXwL8igVZYW41T2YbJC59QLMh9zYq5KI1Y4aJOG8HQlHeMGzD9iM+MIlMjAkjvaFBALiKUJJ+KaUEc472PQhLOez0X0C3y0wieKQFTXEn2OiX4fQloodEoy5ZJPi4KJ3MbjwIataTTjFzsEINVGlCr/ukYxBI70kQ2zmbYlizNeSpmDDs8axAcsdj4ImXzitYRInJmi4yqghaXvawblBGFtGZp2lz147NkAhf+vv+W9+UINEZtI+hXkEyeGRbo+9k565jeQbS9NfNglQmQCB989mzNrWwrkKdnhHPuKop+y5hbV9GyTMRCTSE2kwS009NsnjDyNEnzPqK4nSHYRiGZQ33SJtJQYzD9HXvEN7oHdzaReskm6Mxl8dBtDllT3/CRD6npBEWSPzoGcKe1z6z16w3Au47hJ8PqpiU0hUOVRM4Ow1o86HlznMqug3L6tJbfzr9Oj7TphgXj2fDKZEwJdkcLkfA5TzUXTe3sYzjepKl9wBpCnRKr+LH3Vw6TxgrI5yxp3F3bU7iar23vCVseYZse1EVu3qQ6PeW27aPcEngtORyvZEh9ArGLLJPx2tVdKZ1zME5hZ77TSHcBuKewI+FUakI3Yf02TEDfZT6beR5KO8yR66sDNDCVA5A/mqR3MyWwXF0G0bLAn62TeMUagGe1W61e4uO/2zo2Ig+Oj+ujHdEUpw+pUuy6OdMsoSjwJH8gvAEZ03POWD3g4oL3xq0frQ9UUXcQUS9a6iM8RYeL8ducnbARGoBIKKhiJBXGx6LZkc2hijjQ0RDyCUwjblb8cnQvbekauvAHRYwov7kKsUzmoBDgatbgU4jVrHEduhFB8wKvhkmSOjtrNzBKJ6iK6VUZ9ZDxMEggej3VWCxFdAkTjbWz2zA/Nl2QBj2inRs0jmbV6tzXVHb7Rg8Y97E0Ha0IAUApEXTSkcqn7pPqBnM2ck5F4K1VhGo/fU90jI9UX3QKcSNigYSm/zwqwKfGwVqVXZgH2l+1EeYy8ZfT+VOcxvcuoCnWbV4eMdbz7ZOnK4Ce6B2xnUJAl2SMGXltit9PpjmyWM9s8sL4/4xnckSh/jkhsQ4cZ24dIGMTz7pCSmeDje2ipPf7KY5sZhf8LpMVos69Jzm4lL5PyiMUQzh1eeUfnUpMwwgNFxyhcbbEJyTbIQOhRY8tLlIm3BMW6AwajVH0lGE1Pl6M9W1KVBxIndlpM9G/jaRjMf9t71KYZq3BKOY3q0SVgkIOmUNS4VgAvtLyKkjBaEjRSrcamirhFRuyzPTolLrpZEibk81ekPEZ9tRBaLLR777lvB0tGup3Uz1MVNYq12Pyj4H5Qay6auS1uJf+QnyaYmPZ8dOBgtIA6VESaplApExcBw2fsnep8cGkCACDLCasGY397PM82ifRUVUJ78Ed4R65ikPi90F+w3e1sEsTdASHyn4LXSBx17xMJH1ZHjq1+/Y+Hb6SUVmfreLsY026WEDPFxeH/ylyaTHiGjiX1vaWDBG9b06o4fGFe0Un6T43QKdwX5Fpiov1ws6SMZIpG0C8YZyaVBeQ9AeOsH6ZdUgQr+t7DP02egMHHeO9isPVVZFa9BRPZLkQ+bM2rLRmP7p1CaZkHV26I0yCgBOSI62N+tTkFaYNmZp6kz8Bh/AVZN9ADbWM/+U8EElShDOz+gcUdvN6iNAudC+yr5VaFK6uLx/5ldrDeoBu1mnVdVgGIZhTGTnmIgMWsZM7yHhUK1RWeDmfk/2qxVIaN3UZvPWFR7CtmjBhpco5iv5Dp13ANxFDXA74ZjlnJuFduFHLzRjkoVaxVmoKgml1ly4kbdH198rTyooe05gl+wIztxZofrAA/EeFYhkOlzJ9WXDEcWFEj3jAVuX6Pcm8iuXEAFW8v0+1hUK71ddtcgZ476FIgcH5DBPskeFePh3DBiFjtiyMieanvkCeegFZrIhMRUPDD/pg9PgIabbN06IFXzLwaNjWDFgVWvsJX+1Gv2gyRfgTkGPeeGUbqqSRqyNQfE6qOKWGt2X3Z14SosFze56SJaF80GzT1d3hfaIc+mL+1GQrLDrOZKlK3Lxb/LtomifcUCL3YdFpLiFuBSiHI5DDFVGwCdTvX4ThY+hNjloapU9pkqNypl7bWFcAix2qSKZ65Z+sivjJ3ovWA5MDjDhR7uHewS8aNaonhE1sGWbKycDd9JTYR6Z0/Y726CQ18T043WK+ztyh6sxunSBV0wqmh9dKiIhhF6A1QF04mUqaqBkVz51qLJAeCe8GmuJJH7aZa+Q3RSTyvSAM24hDM3gCsYBswXc2A63T16glL1y8oHUv6FUcAYcALccxlyZoeHyMYBokVu/eljrUoEZAvcoL1alZihsNBGWn+k4vS3hJqYq77Fjk1r4Zm5EV7kHnDHG5GYloUVdN+QBvNg5jQVgFsf3TRk9A/inzpcViHy8D5awTORDNbiFR/OmH0ntNmTldzrQ+52Frl2f7QQJF1m1Pxdr0y+tu6CKHyNIrOwYgzrLZEB7Eoh9cq9K4mWGF4DQr4xtgg2l/9QeEShWjN1bChxnhpbfrdP1FvZ1bYIQiCQijCFhgV5nY3X1l1mVASDkBxcloc+kXUOdDKNVqJv0l/DSHZNItsJ7npC0xx4dGrKa20G8bS2muBVW7sfuMkAtD8RHMI/qJ9Tdnr3DyEhGbYRjzQHfL3wIjYMoKSRYmdk02vzhoNhTu1RRs0K5gv6LHdk1Xj5PclM6beb7IThz4My4AW4JvufA4ZyGK6lmTf7ME9O4nUGq1j+i08I34ZvR7uVbBe09JqqxNbBZE3FghYacjBLhCdEp2EgjPWmotjKDj9TeKWsPeyvMQawsue0e+JWNsuc0pOnNMAhdHvTv0impuvH3gyfNlT3ywrvI+WND4+e3kjUFSUBIbCXzsR62G+9g2xRfHbd8jTtt93it2klV1nV5r7Lur3bkBDS+G3JIivyuP3A3iBQJ42hwfABdC2cFNP5zvq3dbphacCS+N90pKA/G30E6dWJ29Ez9Eg3lzds8+uvlSbPjoekNo0g/pKaDybP22Ihg79S/eKkY8gnqToJqAKa4y7WKdvA01Q5gGIZhpHC+9U7/MdNGbgAsjFWcLNSPMjEUFeldzQcMxtFb032xGyiljvzmjii2feT40sHIO9Eku5WvpMEmbNk+UulYCnnC0OJFVCkHmGVsF3Tlke96z2o5hQylmIMpp0izkIFzdINE8FDyJBxwPpmk/dXL965cj1rdzvHSYYxy1TTA/mlNRHWWpIez9ewOo1S/zG8d/XlrUq07SpzEFq9Hu5TkdoogjN/LaADs76MWA60kwfI3DC2ToEETMmCXG5axpW52yvDqEWo2g1MzH64q7E5vLwZ8zo7lOisZ2O0ZUIItSKVgjSz6vgiScQWa+rfMUlDT1/w0jqN5Peg4NNAqGw8nonomNtH058qURmmjSzJuH5oEPNFruyXINUkIiWFI0Mw18V7EspWmlzZDtkmFvhLPzyk3jYyvfAfqFXIqJWV1/IPqL9K9xW+WWUk0Fr1P6bS9XZUHIfAFAim/pK/OwgGaLwdbHCZC3gt4Vs1SePbJDvNia7qcrVTEoO6GZITwGbCYLCRzpsVS7B/gkmHna6HbuLrzsmBjoERryvtuU1l+oLgOdHlzuVMRT7DDFVx9XFD/FCV2+8bwNPach1UpJvivsZEbfzHbF5EGeWLF7uZZN2F02Ee+jQUeDAVsnKweKbBO39v8Nt8ccxRFmL0CuDmnJjyRrcQo3em66ajtiXmDPMf5jE95DHMWCIQ6lKoPzDmBTJpRaul9JnxdaRbCKkyvIr3uBULJieF8aPrljfiN5xJgxifsk5+ebRv4XPsNXi2RuQtJApng1oIh9gYS3kETUXotElJCq3Rsn1g0HX+s/qtdTN9w5TEYFiy1MR3ETRaJiEYHXBuAeFzpkrqFHneCNIPgpj5ruD/FDgcuBB1pr29mzgQmuDpHiZE6Ssk/h+jlulPoKPnYFiiTjlXxbdqR6Xbq5HEk0JwIaA8NlWOjzJ+VEvzN1upKUkWWEFYU9lcOzrB1wM6tkuAOmIJmYyOH03s2DhOvDbiRdrHeakEtHZW5sYsnCUkM+F6jRtyKInvhZjlZKlUQpjr4BSHIWCqKuA4OkLyaLLILU0CC0XTd63tPX6+JIocoFsUOchb82nuUcts8EBVz4CnVosDGLn2d8JDLKfTqKmEWy14uIsz3Lb3P1g2aNCGIJ/sxmiaxyHKVG+y1kVi86aga1YnHQ8oTpGZ6hcQng+0g9PcAVhPFMCcGo9jL+Xy31HL+IvLYhZxOysjZ3qWSB7n1vyaeFo8u199r/fi52mNN5i5/lupGYsBtKvB0CFXmQBY+vQL3Z61vOrWH+iI9dqATdXj57I82x7LMFOJ791bQYC4vdh3uqdinyuvheAGUjSDANA1R6crE9HzybvGyFyT5OFFOIqINwzAMi7IfF5EN3urqoAb5IueFkxbSDvXA2K9+VKVq1PPnpRjzXFya38DVUI20nnbMhPjcCRzxj8bJ5mRxDpRToTxfdsh2pqFuCy+CTrgHuZLOPagjtMStG4L10G1oS3xf85jEdMiIngEjHa+WdfxVT8CEr5086YHUi21HlskxKGwhWPMT3lUQyTAR5GGZyrfoHx43RZ01XRlqEBHMAu2MDvjMesLZtSQ3L/JXZsdtj4xxtgcGxXUsxwXcoPZGC3Tk5amhvS7aMMTPLN1GB53ETdrT9uBwtwWFAogxnbA7C2yN0bB5pMSO6SXenH6Hc68qR9+1UiaZ8LhPJJQbmU66DyOoIDlMeb7s2nuK/t2wy2xFLomdkyGnC9Q34I2E3gcG2si/TLEZe4DGZlr6S7AmtgWzBiE5CaL1VBxytZ4S+GEz5HRp9j2SSBNTn0+oSWH86ZHGCsqZLCSbpoeeOrBfsRwPc5aEvV4D5QIua6eupKWSEyrRN870YDIg9PsA2jXSAPklYUOcoWwt5MOUpkcalqqhRMjaZRfChO++EurDt086yLxmvXsh9e9MsVZCJg6DBEfQY+NjXnTcmtWIacisjdFhY4FSH5XddkwXWF7lOU4KkQ5WPfZucwtPT0f9JnmYYbICHGxFiik5TC5RjjredDc9PijWd8ds8oqO+Zu5pt9J5h2vqBt4kAl/XopR6rI3XXvoflMJzdXNmsckxnYhLnafPIc3Sg7ZMvCZ9TiRjduCM6TN4YYK4pDGaNhcO1V11Iw9QJ7MabYnN/IvkwbpuUk0GcuykcL5946HOYtX9uQzeDp5ucy+BjAOMq9ZSsPaZ084igDWfYG4SFaAg3BPf8YRvNnLUkp+3ffJc7g2CqoelJ8zlWVUiBTg6eSlpyuIRzemRm83156G2ZgaPQhCNfF1YoH8JtV16ItXf9FSluP4D5G+Xn+n5l3GnNaaYOo783iMEo9IDip4pVGiKwxEtQPFq7+AY4d0jbugaFWLA1mE56zBlYyd7xMOJCX0iCYuOT2HZ+ePBFSmMtr6mVHP4dkKzslW4sEQG1XkFAtERiz8Mae15tKwqnXJw7suXk9yS9W9fr1HOMfM2vzu87lz9CdJEK0HVOl3ztSXB9jUyGJeTY5FX53h6njeh1y3kl7KJdYo0ZWDPLI+aZOQv1ZgOfhnpykJApJ2ZZG4g7QR5QYtLszeVWZhQhdusYoZWI71PVs5q5PsJGyOetEo+z5+lfR1QdGqIWWaoQJfc0iCIvz9bPnvCmiCnI9QPg4aNPQYJHKEptpPuw5NC0jLNzgPWoiMgPhE/MpCGmC/Cn9Dj0QVeCApoR9u6+1tmbEHp03UPuqOfvc1zytEGzVxLf0gjsQghmEYRnKP1/EVJFmUXQ9tPpU+kZVhlBbCKNoqyYek6KX6tGt699lPFbjApbtsCCmu4wwo48xwwE8JXk8IeWI/2zsULwjtVHlZjJZ5P6loduiIC4YD9KySQFY7GH4ivlUzTsLbdHq4VdKZEziv1TyuDJ/LMq7pI2e/wPHB+gsXa14jQdU0Y37jfiVVSdGJtUTkl7CkibBtB6fsqvn52ZurYxwi1za40gycd0Y9SznzdOYPb0ZgjTbuN/cUqs4qhSWhtdvn3ztC8nHBTyjLUIYEz/XbP5pQ3mfPVFkV4YGpGpOt6ts+rFZBCDWbq8r//civ/Sh0BrOrVe5BFiUUTtBuoSh5tNlq7OrB5/wfIiOwU7yrE3aNZPL7yaydvTQkhSGFgi1GYCr5DfnMFq0Y5fdpbsXGw3BBHBtBewGTppeA6P/2jYxDr1+kJ+wUCIRXKeLXuoLx1nmp3ypUXwucOgwcl19MehxLJ463MBPqcRUFgDC/iSWMjS16Rqry7YP0UO+k5whG11xbaYaPtc55oQXx7cCk0rW8nTYDyrdST6vtH51o0IBlAGTT/DW/Gq8niXpMn+px3g6JRkjcJ+B2c5fG5aJ/NE73yeDpRcm5J8SyymYGp3/bqucpyFdFcVVILEB+8ozfNgDeKHfTsTPEn/EjGLrBFgRYN5clr/cWXWzTytHyL34Sjm7SBo3LY+LnctcPa2sShm33dg9+QlObgqGnIQwKXjwHWFnl0dlc5llELtlGLRAYqiy9SqTV4eA3f/JWcV8nWbJM3MgIMlFCbbPcnFPRg225eZB6pGbphxR2wxRoPiUMqzXNJ/odgXeDqsEBLZe0EUSvBUIhAHIr7iNImod7U1FEXhR91hVGie+tt9/ase5VhfqF0B2ACOU5IEpah09on7c1FciL6C+hZJoUEnTMrn+4e63P5jytKs5aCjTq5Yv73tPoCuLwbRvWAS5gfDFbdFFTrmZgrtWcT+wt34I6+wwHH8hiLVTakPzYT0QLqH2w3HUzmoerIePNySyPudaBs7SgS554cDbO4mtgzDN3PPG8PTOV5yoXmVda/WQ7x+jjIMks6ZENNwBfrrH4JZx9vOXq0VsZOMSBgzWS42IbvxdlvOlpkfj4rSq3NopQKwwY9qb8T8xgRO2mAscDulWxgIoDewXC+Y71NOw+9gv0BNGEz4suWKkvoHPZjU8hEQco4JXTQjtzoXPzOfQXjiKEPl+UZ5A3pxlCaXFtJNjHrcRxBaA8LRoG95zuZNlUUNdvi98hBWkfG62Sc57InxHclkTzWe2AXKY1HwUOuQoUJjNc0ayLdcvhQ0JGIIxW5ztmZCzW4w6Ro6GaYKlYcoZxGfEurlZTygJ+vOWrNvxjGIZhGJnL+oJvTfdihgyInELdzEf6UfrOKjB1NKEtLoElwBLG0wLZP0jclokRVmDLuTueMn0ywIY2d5DGwa9su8+0oEyJG6MsEyoqt3gje0OuP9chXXA7vd2OUkqa5TEs9PHvx9roZFPu4WWTIJvG4AZU1DoB2DO9uHdW1ZYELkCYH+SNlVAH/N3qsGAEB3a4DfmXzRNSyxzUw6+e7ahO6qeVCDfoLMO3We682TvJ5ghvSAKCocbh8el+Biyf4MilKt3jwEVrTxQz+cmA2sH5zzM7P3i6hStJxcpSpRMG6g22SncWjdwr+TdTiZAsdrO+eiwUNPf7ysO46KLL9K/q9pjL+oJ9I6tGixdP91kvDHxEh19QlKNoa6gTU7EKw+kp1stcVDKtnwNN804T1QbdKfHElJqLOS3hV43X/OZb+t3wcXPEk8e40CIUBpz4Baz8mpGRlEsrSornYoQKl9UGZkbaXT9tn7sBmHjXnk78+oTiuJ51kEoejSFJx5DrjEmT6Zm1rghDuLilHry05a0iXAVglYCvJTOz7osbOgxIgmah9Kpb4j75s0Mh49+p0HQ+6xTQzxUYO5JNzquSzcEuQw79NxPZ0HjUOUQjyh4zFG5GHzA4I+i37YJZSrRU957JMLoUnBCPJqDpNL0QKdI8+QjRffDdQqsPPp5oMRqBU0fQ1nQvBrPL9wS09wPIviDiFO9/X2zVABLd4yUVP1xeTLaiJq/vL5xjbFLTqvCCG1qSFx3QB6JCFAi4dnPZtyz80aBrYZT9udBRAyPyq0A4kLZ6yQTuIxF5yYGUFJy7LfY5/hhrVKhD42uQE2wvf92xcGlmZEc71jXCRvs0JugBBL9yxOKIT66+jJH7p/LnAWDfXBV1RKGkVXc0CiulXpjQPcLIYSBmtqYXGJB0h8Ae8mtKtlsZ310M7IOA9MlOZZBGVIxvzHnVX6BSeabNpCwJrPqMZfQZVmjbNwthWvew8jIWp7kTvdZTUf0zRvI9Bl2oZcNlSuhL0tOhQAZ6d4vZh3PIgMhR2ROUK0+DlGsAhkVKs8lef3Eqevvo6Ru1+k1jRPVt1Ng8E+eHP5iAZyUwT+2kh7eqjijrWrmRn9p0226dIKrpc4YHU3LfoG28gHaHTFqjokcH6SiCDYKXaMrbWXCDr0OnqAm/A4y881NTfhmUeP4nemKQpX37Fom15GHRICt2cs3GccRIrBNrEPsqkfh+nVitUaswXGdOPN6uoZKa1W/jdpMBHPcqh2G5RagNSQ3AzcLirzxFmBSYbd29VuVZuB+kO5JUVYijVcCJ6WaX6yby/D6eFMgjGOxk5/Q0jEj4py5XGyox2fp0k+FD+ry3SWinDhWYYoHRSGb32kCkwzAMw2G3VI5bMyvdq8E7QNjJWsYmTT5GF+4x/Svhr8Pf3FlIFFJ8bL3vih3gR5KZYI9usv9lZ19iJo0acNsLYupIYVUTWvAA9+LMr8vtdvui6M38pFpeCRgumpb/CvxW1+isUeYU3Ca0CQ8FsCKBVCz7gGZeZst2dl5StEephlpdeO222876iYdmIRV8LAUDcbRjSVNMipTRhvOD9eg4YuXYLrWL+ntzGoDtwytq/BqQuBynHdWkBEyGLBsTECUws5kd0ERlxEEh6pRHu7QqhGjQi0DkBQNloENmReETNJjETEHHX6D+/F312Pai+lvBRd9p9x04x2MpwfbsYWsVwq5yUWxohWjAiBfKQc/Upa59Uc7tbPu0jQGA+qlb9jCbViSawtQnma1QWpuwKHhC9Pvc56rELCYYTL51/SH5Emr33wPZy2y9mVG2rFGsSN41vuDekx1TEAg45JQ69Zhn5ntYl1eaZxMymuY9JJUUvNL1TXk9Uj/OMErt0Ny5A4LVNH9M9GPx08pOg0eBHTf5kYVArsQGvN3IhoubmwlMVAEQ4KrXpJBclzIG01vOJFc+zCw/nn6rPgdWCDgxhmSKOBzuNsEVEGbLQCEgGVviXUP/cBFCf/DXBhpuhTbN0FeXqBmhd7IRmQAVsYrKAPoDqDjUEi41TGGIOcndwAT1xTqvkeGEWHA8QiEuBzLxgMCTwpFCKtGXtVCi/nh9xVHO6hdlIVMyGEQZPxJ9CEeKiHiBWDFKbV7qy6/EbA9BOf1tynOYwTJHBJWcFaFh1QkQ9oflp8z5162YO67Nfs9NM9JDWdm+6lGssnekBzoykw3itNZVFLevrfUjHqdANAJBT9Wqmb2DSJclkFhlByV4je75/jSTFcwbTPjlwgh5CulPeyt9bVTLk8CZrZw5nqTrNjeOfGcZfT8yi2gIlPdJyDGjL8eqNW2xpdUAWmGJy1N1W6qKgxTQtuvEYrGD6y7cWHZ28k4pnMgLK8i6vd+kVlBTHhL+q1xUMg41vfvT6rpi9cmpSTa5RSVjjwrO1Ec+5lQ9rqOj66RGZYrGdJT7Pp0ZeICzRDinuCRPSjF4twTvyn6/PMgJQf3yfFy11PSwCxyZKdSndL76ClTesnAVCHNTdPOT62slzcsO3gZS8cIsVrHsZojTPLYT36vGFKzF0F7bo2mSFubx1jUy/dtWwCRmG55p1pJIXh1hqlym7zX2Cx6HEp7AdskFjXqdCheupUoE/4fM8YYW1rHP3BI+bH0k+KzNQMM54VQFyMInet++br6kk7gVADLLnC6Bla76/hUMKqvIz5H305gZphcf+eFhlUMrgGefV+ShKwLmfBBV7nr8ns2lId7AiXQf29HERPbeFOLc4B+7YBnmxFIUL95yO1TQ4F5bDkWFdlqqyGS9k2edMtJOGJVoV4t1nXjfJZWSSknNU3erPuDhIu0DPkwfPyQqtvwhcVnp5I1rdrWz2RvXafBiNgoj/k+kPM7/ed6Ldt60z/hhA0E7D/0Wb4Q56D252S0/JIZVe/s+8Tuei0+buy/RP65hsp61lCOW1+Wn76NTkRyyOxwbY9XAfVyRv7g0tKSnUdhqIGFvDpI2G8ix2kiSbiVJ23PQfd6Hbx8vR9B3LXqDTxTsHFa+Quilcrarzdjyngc3vqGrb2w5cYU7pNxIWkbxjxSbf+cuRufucvJsROPHsRVRCFxobNdxyjBahHEEWVSBuHhW2IRct3IeR5NHJwSKW5Eq3Lqk47CrXZR4cfwttQ57Iz+OqYju0ItVvOErwz+7MI4siz6gXHyjtgm0ja7IOIo86mEoLgWq8OWQjjtyOphk/dTgWKYm901quCWWInoAHNGSOFfVXlpVfUtEWfQM5uJbpU2o9CvJOLo8uiBRvBOrwh+3dNzfCwsqKCerdgtMDC4qfA5W2sIGoLIq/Gcosn8K6USoxRwK3eocrXnKiWg4e7YJ0RlhHR5Isuy7iJ8IwoXfLkX0T2UzEXbRZ1PtSh+lXmU4UeXZH6kwERyFg1EWvQpVEzG57L1TGt2jbcIGv3qXfeKv3E3kw+HTLo9+5dYTkVF2b+ajPVQVrtiK7EItnQj4DADykt2D8jRFGMIRcInHrcRYZChpWNIQuEfWwUDMK0h5RBmDaB1fmT9+zjGX34w3V309Ij20NxRMy0Uer8RwdkRRYy0Nol7WaOD5kHhcLFGuEELvcG3v4XR5ucQBb/yYI33MdB7HWc7L+/O8Pu+TVsfgMdqv2nA+f7nf9vb6N9U96mjC/d59ba9Nstg5K/7EfhG34z8m2C5MMPMzz6dpz///miMK+V2wrtUJS4hU1rAQa7YXmMubts+dhte5Rfm4L60W+yW3OM5i/SXZJ5+k+8BZeXDPC4F/G/qHab5/iv2MsBVhcT2B5xb/pOsG+ZHiVYQgvx39XbtrzA+JYXECQG12n443JekjSVLjfOFANrVLN4wPLRIrgD1U7e14RQ3aJhvrfzMsXXD8++Ima9jjSHN6PpPGIb5i5wy0zN45Jwpy450qc7dJxT5zdPmnP/C7VxV3B1QEGDT01Y83uKdF8bWp3CLIXRsTHe52g2eMHoc6PGq42A2Ew8/7wn1XDzd/dU6qaKhs6btNNY6xMVJji7XRSUk/cE+r6cVEU/YGeAWn5BNc8OJ2WmB7nUaLD7QdrXFGjLTOBeF0ytv8eAIi36WpvswciczB3/zghgOXc7+7fPCeI9EuH/pNY3H9Jz6mfiE7T9FkevXXyBNEAFc0ltIQNSjDOhzkzs8c/P++QXeqkS8QYnBRLTdXG6IxqBnWCe7lEDEH5M8QD6AS8gwRC64uWASiUqhWa/M7Z5LPEXOCfAfRm3r0l8gPEKXCZUA2iDRgRqynGOKG2SMXiKXR8PYb+StEcLh2WloqR9QONWJ9h2CDc0Y+Qjya2ikgnwohyV6fnkVu0oZoEuoT6wH34iPmEzILsVJUiSwjYuK6EyziiGqAWmF9wVObZJinyLtCrFWvfkL+YkQ5wGWCDEOk32FeYD3HEG8x75F7EwF96/+Rb0aEDq5Zi0twRN1B7bH+g+AI5xp5b4iNq53myFdDyAwuvdCmc0Qzg/qG9RgPchgx35G3hnhw1BXyNyPid3At3LCAqCLqRmuz3CiHAvOAPCiiT7rTBfKoiDLi8oQ0EKljCtaZUcQ7zCXyRhHLpG/9BvlJibCD660WlzgQ9Q7qDetoBJ/hPEc+KOIx6U4R+awIaXVVus/NhSOaFnWE9dMM4hPMF+SqiNWAqpBTifiE61/BUkJUE6g11r2Z21GGeY58r4j1oK5+i/yoRDmByylyp4j0FcxLrN9CEc+Yv5F9Yylzpm/9PfLkRMhwrbW4lI6oM9Qz1jcjOMA5IIcjNp3u1CBfHCEjXO41bdQRzQh1hvXIGOWQMf8hf3bEQ4daIM9OxL/hOtVYRBFVD/VHl3iUr4x5jHzniH6mj/4a+cERZQ+Xd2RzRDrBbLCeGUV8h/mIXByxnLHn7Rn5qxOhgOtGpKV2RF1AfWD9MIKf4HyNfHTE48yRE8gnhGDP/BJpaRzRgHKsrob4gGnIRKwiCmRBRLhuBYsYojKoDutOPcrXiDlD3iHWUR/9DfIXiNLgckAGRCqYCWuhDHHFbJF7PJdXB/rWvyPfIILCda7FJSiiVqgd1r9KMOAckfcQm53aKSFfIcThstS0aTdE41AF1qnyIIcec0TeQjzsUBn5G0Tc4HqisbAhqoS61dr83U3ymTE/kQdD9K0++gXyaIgy4fKCVIiUmCXWE2WI95gr5I0hlq09bwH5yYgwwPVOS0vcEPUA9RfrfyX4Hc4XyAdDPLa6U4V8NoR0DAotN9kRTQc1xfql7sULzD1yNcRqgqqR04h4hOt/wVIqoppBbbC+qqc2zTC/Id8bYj3Rqz9HfjSinMHlHLkzRPoO5hXWXy4mP2DeIFGdGHZW7g5QPAG35SShk6lhfhs6Od4blZtT03ypr7sXFDF2RGek6v5RbdXx1nQmyswD038u6ZLOaLnzj88g7+t4zxZ9gSvn1dTD8c4s03NTx7y5xfH+vPNcN9e6Xrm+hp+CF86jsF/H++AVXXN3P/sXgofhQMrES+uCpgo1atIaQWsiqr0qHkVjCFoHchVMWqoYKVoSEm8VR1FW7+4JAg/ASAXe3xPqPE4UD6LcsdUpaKhgzTO9MFKtqSF4AjpSdjHaL1hfYYuG1BBcy0bUxF4JpIAYchDXbHiA6gS4onlztPhBBFADdxdcc41lWAEB67QAkJEbwWCG7SMDoOaaYU3CsGnL/sqoeaPtWQ68eVrYxUUk/NsiFDCP021Obb+LYJVLgCljLJeQ9HYagu1NElu62Yq2K7aG9e7wu7VYjQ3v79s25Ddj06bGVrHGxUsnBUg6V6no5imLhlfTUxCjEj63kQumbe23doN1XDqKLcCD0902dn3sww1/ff2AJW/l/2VUX1/+2S+ts6jkXQIJZutyMHTt3levQpX/ObW2FNjlT1JmvF4SeFh9a29zX/ZjKIf/vvDnWTTOXpHweJ0M/6r+fLUuvQjXb8lxOS6bw6IHu3Zjkpf97jF9vluYmO2/plqSPOu4zw/eCtnBTq4aN9r4Jhmekn/dPkMCRuXiYK/e/Obd9tU7yILBybBtrUB/ksPqUFGVp4szAGUc7ptmdEiHKxE8Drwhvuk2MGK6Zn9LL+6eoWE3luOSJ0cArm+0w/HI3DPtEL6ENCvc5s9WRo/hkL5iSRrxQsQRe5fbWq/piHNy9TJZJAiQuVKFt/nQcL3viGJN9by5Jrc2KduMz9Ve+1hiNg04uiiHCIr2lZlzqCwpzOmQ//HEeIcq0AgBlMDoi5fmLraU1TjneaRUhF5g7rUNTuH5jk2mIGBo2uMIGs6CHvbS+oKbNE/Brw/Fj15dcLqzX230NdqCNS8BGuKJb/2UHUpLRs69N87kerRx0jdOVxZ43cOOJhUClMwBjBzu3nGiHTnS6P9vnM8na5EbcWVF4V77AvwwgBTGiipPUPVlpHgoVT4mJ74PJC3z9EiHXglHmmG25fZ7I23I2ib/juBsDMofpJbKWk04YFfC77u/7N9WVD7rI0CvJvOilpZl+s/FRqixjnTSjpUnY9mEgvtwo5xfHxwXsORL8Oj2xjoJVM7mWoz3sxbGK3N3Z9jj8tanYW41Zv+3YfTrNF26hEolVlmRRRi9xLKAXjYhEIuahKeX3O90b48TvGz0Swhemz444ZWQ7qUYxsPqjNFOLJ1GnqWx1nK6g88+3CRXG8uXASaTYdEgJGKgnxE33KtoNk3rk4ND3CG+5RUIRAxB1L0rYvn4xtzD3amtitXmoA890TW1tG7VPGFZwXxdLvyJmlXd2y9LztfmMQT/fuuJH0K+eGt3E/AUjoxW8zATUVXAnnUgu4UeUszSe5gyppS0OinkkyDJUQ4OKchKUulmMRifBrgcS0/dFFIyR4aUgFAVgcm9Bq+GPK3pKRjAGDg10GPHDWnngfSsDGO7QmmziIeuZtzkek2K05ZD5IyRkSOh/BX+dSlQ8sysiTSlyRJ0UmTVu0QPmXnpOML0v+FcidtguxjWxKKEKUsludKbRw2I5tgMMRDD4zaLNGrrT0NgwgEpeSxb3qghVncwr2VhA73tyi9WLz4GaEQvCnDAU7UMNG2l/cK1pemtxkCT2RNrRU8wliuAilY/fEvKRsJ+2RseByme5NlMU7Q2CAm1DT411M6JjLo3B3MQ2SQ6jZksZREanQM8bWgodrq55Xv+fKohb6PqjH2eZ2cac+zRPAL6OKh7KzYWmckV4DqnXOE2Dws49IhIif2oEMii3+/1uitJV5oLzootASTD1BWiTt07/sZUs/obYOyxs3XmrMJ5dwC1hyBFPzYmo77F5rD05JtLL5A2YUxINRYRzRVq0kBNSNKgRqrA0vArpZH10z1sIZQ8E7z1FQGCqfvVMDROkbOo2TzTVPgctnk3irwh2Fporqj708dbShq7ZrQz3L0Lsl6fm0QD3MD+HwPBm87LhXpFXWfcwMonL1IQhqyRzWhHIOvaJ8Sp7hcOc1llLybNF176Cr2FxTawwC+cz3upzDatpol6ho8G+QJP5ygcJd3VmW9EHfSK12EEWdnkc25Nhh/8KErDf7myLK4OLIc9rF67bmQAxlGwEr3HuuYL/Pu4ecFzUFxDTSUD+nS2qRayi6dM+wonfG4D6Jc0ICxXkEZEfWFLBK71lJPYNBKBbTcvtx57EftSJhdifNm9Dw1xo66VdwhJyzb79SK2AwPt8su//r7RtcQ44VGZp6ZkO695oAPya6AIePimngmeeP3vokqVV4F6TEDMtwRRbw2BDQXW3lqSbSZp+8Ce9BxO+VUaoajMc1ipCWfz/BYJk2aKCL0mu0KeXAC4V1L3gazpcmDono0lnjLTCkEgaWaHsCY1zBiidtcz1shQ1n5v+vpsbEPl/lAEAo8kMzA6gzJ3H/AF1oJbrpQWVu+blrL6f047oEFhynUtZFI/+tAK5pMLUICUqReW3SNIKudNzl7pL3wTtXYmhinV6XPsS9JtyXisY0bybxoi3zILZb2Ex6lDtN+Ep0IzS2rPiXkKqbtIYxQf4fCN1RAriKFujko6BI2IECtj+2H+EGQ17OZ0X5S7L/CrOLWDpVOQSNcG2kLXcw8Z+wvqJSAqQabn8xmjWMCpAcuZLs0v7si+JU4Opr8sylqaRA+xi67ydiMTTMgDnPegP3PiBHe12FPwonMRkqS6AzvfLUoXWAJOB9kceu7vqltunEa/nfUyC8kyGlgILSE/8i96X8M0dqrJl9GM/dRhmRL8HBQ+FfQmmaSvruZ0HcgbKgUELHLRpRTpq6TZJ2EJsDWZdQa4Ee2+e2AmIu9Lwq6s6fROHRMRnbnEMxWdXyDUBr5JZqh/CVzfFjdUGXukZ78bWBrrOI3yXFC+2bErce9EiGTRCLzMZpt7bX/6ppqMjN0ICGxkCjR6Aow/oe1sj80WxL0s1w/doZGvgdHjXi5kZ1kkcvTa/m/2u27J1oaqBm7O+2QeWj/YirWrkFkJ8Uip+yVEHjdhm9hosKTnsytdYDDbohFbookFq0GdBN2+psNENilJImse1C72JMMqhUlc5xne8Ixm6312Y9gM0mxf43JQo8dv2V6qawDaD7cKliGWYO4hNxIOsQLxD9kyDP5pOGujIUKwQPejmEyZhta4Q3FdGhYZW7xQwiZkhdB3Om2oVggZs2bs1O5senbyBIA4KIYNmCipztp+l+0NikeFLt7S9zwP6ln2nzeK8WFy6FzP8EkCwj2mzrUAs9Py+z4oBshlRPoiOvZn90KtVN54/WT/J0WYnCDggoK0EJ7nG961mhUwLn/i1qGETfA4ca1m4BxmmLT2EZVAYuK/+k86Rxm1r4haRNwMNHq2Pxvvk8+EOZaHwAUpEIe//OfGVg4EeiFr45mJKXR4H6qRlGUxHTEKK9ZCUmKsC7TsFATQTZ7fM5VItUCXhfhawvmaJ09DE6O2+Vbs5gMA6FSsAzvbkG9KVUYle106ru8etLlSvX0ft7+4gyMR5mfwhgSY9yJbkILJ+55BdWetaUg8lbyDA9kO5rv8529um0A/f7kAYjSYO4o0W/f/oOv/R0i9xqw9Tgtcy1z+N6f8O8AkBuMMpVodTL/26doqSRBnMjlp8qYQGHVaiARPXDYI6b65E3ZxzrEa/N0NNhLGMew3gkhDLN36weVV7uv5nbVo2QaunWQxFrmbHG6QmgaUae+PJU1SDaUBk9ULbaPxoeOkQqfaxKTzWV6knq/zRoT/RafrnrcIsj64+N/81yyBdG0R8F1YiqDfBPiWi+oMHQ6aC/3ZTxq2aglSrVYQS49x1sXDbIJJTP8XGdukqaJzvoA0/glbv9+HAwFIuS0404kfxwMnskXihTkYW3LWnm3spx1O3oCbfVkxuYHXmItYDZ4mNqUZQKuBl3sSE0awa9aou94dVYlcaOpwQ+zJil3ndXOo8hYUXW5wLLpSlQdRXPsPMB2PukE35HltOUO4D9PtQ9bS3HAR7fKz/GX1oCbflHUXXCrBNdvp2rBmaA0hALWz9NyTQyGASgoEWx/ZR1VGQ97OPRsNcFeTZ7JD4lhP21iHUEREpc7VzogwKnCRW3G1GJMOXd0Upd3KvEzQcPO+p7MvROjQofX85sN9ZM2wPUpDdRESRUvpJxoeOffR0PF8i3noUIFtLStnjVo+Ntm+9fnmo6MXoP1aHh6daJ7PlzQyqmb+Ct1n8omM3dJPQ68HfpKpQ+87lh1ved19DjciNAbgCOVD6IjH5Zmz8+FieoIqzmbzPgL3qP1vEvjJaMQsvDZ2C6Jk1iZFKSdsT1BkFxS30htIoBiY6K7vA6Zohje8q5DxT/iaiIGso5UuL1XQMTGKHsBF2SNmKCrTpK/A+DxyA3nIECCxM7pG9yM+2n3jW+3hUDyBUKe92iQ+NgKL0sQS+CNjLYyDPYF0PgMhzbW0FkwmOgql3RXIGJt2yMgPJePxBbJfvTgDjg1PNjDCQ4we6NkDe3kfwylHsTrTYDW7xIvkfgg+Io/2VQOk5FzyAYHG18vWyn7ppC0YYgteqcSdKh6JL8bjHjjSGq5R61gfaYBsVOoopm+WzTsivoexehRz/kD0Z+nwFFsoOy2XteNyKZq7su2AnvQA8rwkDiuFkMWfCqJXppvMER8UXdohbtS3AhjJ5Qs/q/x5wpLKXnN2Q9s2spjk/FqZn3HSFnBWjKRECN1xbI2Trmfrn1vhqreXG9ERGP0kWJUArKKsYdLdzNeX7cXVrGaVOQtvyGDFcon7or0Q21Gb4m5SA9w9LkF9l6224PC/eDQUW2wYy4mEvxXFE4GVGbid910kERFOTYCIc7ksftuejODDdR8YULx0yVtahxs/nkuU217Fm59BtJKzCaOT6dXhjnd4VvVGTsblMxbVMzrPrWTcloOJfJd8bU7o3gciIavkGA7UgXRaUunyQrEfoVXasjTqyCDaPcrkd51QclkQFygXzJk1yKHpEXKiZr+0aQK4lLme7aYKz0jb7J5YL5oDNpl8vAp8zsjf29yvPB5dBka9juseikHoqgt8W920O1eE2Vrjyq3azxv5HkDz1PAkq+QK3KgtlIKTmfbZRF9McSapuN+3FDmeATfDGGCn7jP5hcDpAi4IxouDHk91uetHiOEC+X1VZ9uogWogkXcWRcUJNG28CqbSD6oIyC0aux9YI5OT95FL8sH5xcZXQZBvX7x0xxRQkDpPPQn4Op9ZS2CAZLRQpTpRwEF7pff/CpfBfj5x68G2Npbbwk6sVR1q/R1lfEsHh9/N1Tra6mMOrALg3A8spj6MgbW7aMMmRi8xqJXlBCdioc7IpciouUHHyP2jL1IR/k34HOWxClhHMxiuz4O6umASg2NBIy1ug47uSD3Uy26QhIBLuIH4mTJnhJv+snVlLELSRR5zVabaubsV7smUVu55KpTCWEijuuk3t/afZ/8EVqkMEdnRWagapFP9x5Xwb92D0l8acvCzom14BaeJvHCwYHz2tSlOQ0NsOqghZmRMmrNNeKDpu6BXJtpd+ftm5t+YGOn9wzlXBzQR90cISMYfLHLQqD1me1yO3+NftFHhgOLRtl5fpzrDw84OhjhYs9Cn9/Z2OKuh5mY8p3XXHQxcMtTfatn+UGbusYLhCa3uGqHKPquQsBVvKrrSasazv3i/fEWt4+1pH/YIaq4w6ZcwzLq9y1UfVkIJq/03EyFudVOrFDpWn1jFDFCtWfvk0J2WF7IJQ1+DjkopWcQBwdkws+7bYS+SkK+g2f2ycPQ9t61rB6GCUn8N1YvhbDimKhSvR74LkXQmfD0saJkoFD+RE7/mU4Laki9VJmyUGH1MizgNfHYLVFJ27I73r5TdF8K48vVLlHDgDwn0FoWRrom/lxQSEmMMnme03+Uy5VdE5qThRWYJ2we50lnY3+iyE036jRuV90CZQDLobpoCLTJQmWWFYUX2ebfqLrc+QLEi0JnuUPEhjOZD7MhFfD/F8mF22hg+QH4XYEdk4UMYzUIythFFGC3G28PnlT72CSDKHL07AvfPf/sxkdZkyYcIRQyYqGkasxk6vaDVZxqu07SG+NBRWUlyQMkJ7rZV4oIm4DDGk+GIqcLW3isMFkvFtzlLEja0DOivfFfBFxLoKCfRLAKZDu4Xwx0T9bnXnOIfvHLG1wq5d+ozuqae5v2nDc8XzL4L3g4fsF2Hu0xeqKuboaGwFwIuT+b1hUrsrQEJcNiDRJwUqUdOED5JVR5dogi2aGE1sHWKE8Ig0gPboQ1ULDwwXJJc0p2pRv6O2Rgu1pomBECEAE3pLFLblSBR7SdFgEkgODeod2MP4JcUwlFQXvik2sE2p6JsMzY6beWCNLcNcJt3tnz2TmjWJVuVVbERSQenm0y5Tsdn9W5DkTAxfPbDkqyOa3qaRPmRWxdNCQepWHyv07BvsbeaZDw5RPL1KKXIbdgeV31HrTJC3dumioQ/cP8WFBFjPVtVuSsp8bR6PeBZ//1Aacye9QDNHAr7H8Js/E9goFxoZ6EEOoN09WCKt4052Kek6t9KkRoSnR/AvU0eMthzSxq4Tx/hgmg3DXBmbfDFgVRULrcAwqKbTGoR+RMOss73RnVb050pOujrV2x5K+mHIceIum6m9+6a6hMUV9UwxhTJ8CeUHbmujF+WWDszqezGQYwzkK/NjPOmSy0bLXXJESYwQUVartmEt9Yoaf4Fef0gpiGAsblkGCk7cea9xctGNzOKFM7lv+OSW3u0Ozm07JRQuJ//SJBHD4+DBvx5HBxFAWlU7AcC6entpLlyBSsKBAZHnEzWWl7sgQIgOOlAkAln5Y50BkZh44DxM64xIptebLuwiiKeOOQAkn7HDl7qk2L4tPr36tKlkhBbuYLFpvCbOwSlKbXB+peN3auGNkMMYswXDUC56kHuAqKRIDWXjkwHghrJiIeKCa7uHCG5zuxigJxfmYJHwDmmPcdYndaJSq3mvRfxQEMsoe9OmeYuPWj1ptO28ljvpDeyADBGiFO7DB0VV2r7hMP9Pyiw7qgCj+oM0KUbVkswZsyDhN7LuxwKp4LCcVse/XNlTRewNLy470EdLr/wjVpD/B6Fj/+Myj/41xUCQk7vuhDRhPKpeUpg1KCCSd8H8JsCURINRRYh7v2AUWEgZjoZ7S3OCYCwqM7QWI82UIg4FWzO03EpgipMgg9BaBWyqjMBpCuUUyjmxEr5PZ4khPH+sb4euamyz2VC43zZ3TlPfu3XHObf9D2//BOJL+bBUU9QTeeD9bBsNrJDZgiBQfAMDze0Kt/loyO3poG5LlKl9IWAcbpL17NRCJbr8zU4BrSRNmKLiRhd2SiOhFE6XYPFcWuyU5XIUagWGTZ5nt609tAkFOXT3uqFX90aqk+mfqNKTfdkCIjfgHT++SzjBk8Tvg9FMWre8rvO8KAVh9Uv/WKiKyu5EFe5A83jo6CN8Kqz+avSVUu6Ru0ejaCfItRtlYq2DXRZxIGq5Tmu3JKUf7v/38buJ1tPqlAbhxXkdgMRIZNDECXTdoBp43OWBqsUuhWukUgwNEmsC0d/pOy0WzYzgB5tquzRFS/12EpKy5JVDBRE1QOtz2juTIUoKbK8IU6xh+PJg2J4lGnyFzZ9L95Z24Dw29bPMkSxJhqfekokO/HgsDKYRXxqWxzLJoRbRejUEwCU6LLQ0wNoDnnxxzV6q+ehDqlueHXW5siT7nih2txWD5aRrt7QoidR+8tLVw/08mwioeAQfFl/dEc9gm2beSRN1cQxlU7gVtTmAx1xjSEqLMV/K5Xp+AIRo65+ZhIpj5cadx3wdrGr7+PVTGQZwo6kF4GJ/lizZ+kNdLtacOKhVHdibrZp+m1I3F3BFkbwIfY4CDkUsTUpyI39cVkGGdOhrboi0fcfr5XTLwCEgWY2okEV+RVUQT/9iLmOmHNq9o1pyKb7aw1NMrwgo9KG+Jem1/t2RHfQusWFh9tQV+smJ9UUgLm3r49vJMFhQLQcfaYz7F85BUQEKIYLDdiNCtbzFKNjdlr+tgxBQq1RshAW1m6CVn64kXykNMifHTb4ZrQNtb2Hj/HWMY/bU0cEw7rJbodMHBtxN3TluwxkGfREw9YbZfRNKfVYM8r2fifeJCOSWs4U4pKXBUbxLkVcHxRHCOkF7qP300jWyV3tQiM2Kp95t7O3SZhfONi2j2e2kjeG4wpbU3eJpr8dZJ+p9vb1ALaG7Pp4S5YWzXHwYMR23zUDlUQB/MvB1vshAd8tYAHRSYB832Xjx/qaiCZyGmzcQBJ+nLuAyCED5JVSe4kGCnflXB8LVYLpEWcU6RcufiYBn/BkNAvTyXLfEbSMOkm8yaWblPC1GDy4QZXt9WVokcoTptDN32pZ7c1Ttnchj5y52JpUpSwWAsHB6DjSrjdHl87QLrvcSiyIpmZ3FX20k6CtwReSNdiqVXDQJUG4iLutxdLevpAyLgSrQZfr0iSV+6L147M4Fal4L3x6UDNVc55ufBVxZRR/exeGQlbvC2NRVdgcYoi/rFRQblodryYGUhmjepdXfExEtc6ZyIRFqXiVNx1l1Bo0ajQENconSabzjCiWdBFMLicHGIJXz8U0lanyw0gPGClsEyQEqzFKaRxNJCYETKV2lflVbt/l/bHolkJHmTGgGKqoVl3KHAJtKaoYhbeiXArbRmsN1tVx6JZdTtXxuHP77Kv1iUUNHSUZdtv2oFoabm7KofIM2pItSm80kXm8AtdFq9xNMgMiypK+fAb6EJMrAnWJXtHgWALqKie17l8eZ0gycbl3GfU+PoTGX3O33OpB2RpKYWKqQtynHWRbrWt7UTv4jCFiuSvjZlXnUAKjxJ15dBuXEhOAc4qXXjfPNqSawBIq8oSjYMqOdXJKmHeNdSTZDs5TmOQvjDJE1Cp2F3LREZ2njf9OmM1TS/qunEOdoZ3gnDgWUUDSkpayQTbmUpI7t1owOoloko2u2gPRr9BbFqsG74HHi5Ns5Z1IzjrOiqrQOi3eTx4K6klbl0QpMgKBT2Y5T6bU3opawgZSJ5QEl76uER0JMItMiEwJvsQNauNDGujpXEJAVd0ewR7DNNbu8whIuiCCvF6aqiDF5YCg0DF9DGkqZCg1RKcbvhxcoPtCa8XNoMj1xA4H+LhZ7sBMkb70ZHKbnbh17w9QnvsFEXxTve8FIwI7c6//w/afcusUenlnqprpq9WFmgN3+y25zvX2um7ewY0QXMx3fbFMy+xI4Y6WXbEgUKM9IE7gwHpJnOPsqf4cuNuDoI4T6X8K45ho+PmXPowkL25lSMM+BhhCb8G6oHdWurej33LEoZ3h1kLQE2v/i/nA6gNbWg18HmqYeYIlAdg93DrAUszvHsKpVB2GgYoDzLliPDZ9AGUN9XZnR/HYMaCVOwuY966Vpm1X4ryCRXTNT4rYzeDW7kWTFrUHDLSk7FoRNqrPFn9m9iDryWgZaJeheDzQa2YpsP0ntW6n+5LDszi00uqEc1qjBmq4Rv5sot9GLSTnYvfAtdWsr9Yi1yUzhYpTW3UTt7uEgofhuO0dH3tb5dylIKdmmoTgECWJi5thQoACZGChRshlZGtn6x6l2zlhtzm/2Yd2YUombUcjW8YcZoztD08iiaCNHbzW2lb912MF2s4MiuGt4AZX632MVnwUJ2t975t1i/WjUZQUgjveVnYaPLaqNgCM2e1kjGX6YmHlcRRW+PP4uRFTKG2LWxRNnKUteItPGP8HoujZSNnW/aP/PfuOR3QCuIYlCI+dI1XZnwT+UfalU72mcMxLWWhxMGUI+KtHICoIU0mfwNKPOPDjYaPjAizUMzK+kA6tAuk+SwT2k+ygHJyPG//1by2JupEKFJUFVsTyisnbx9XPMsD6xxBObUgeHwzozovBcbC/Y9GgBlcMAuzvVMu1zAoFW3SVf2HpPnFuYQ8vIVjKR89dst4UtLhXHdjMUPBMmd6JcM7Zlj07Tts+k2P+wR7dwYWB8CCzaJuTyG6m6rDaOuGNTVb+g0ty+onZLdPakvLtGjRBBGzfJXCZJxFw+SErWBv7ZfhTzcv4KIdA4nyCuGwD8v+SzFa5nGG8aetmPD4fAuCGc3NIs3ACTEh3ePYEg9OD+gldGbGcwSPnDHPAUSHof++cchqfe4F0aaeOAQJSArqmusrp54KwemKUctH8rKoGuQUPppefUKTsJgeXF3WjNHaDsPpFKKD4B/TjS1FWX4fHZ8gBwq6hA6BJPu50XDddCHjvA+wgtsgAyHVX0/Ut3fhMoeUusFgGtu0CWCS7O6nsIIkwDYlPl7QgZ2PJg0OKs+l2iqNg0cPX3jDNRYd5OiGB3nkxV7+z0mJ3dq67AbCey/OCSrEwc81C/bN9Vt/u4wk92BzsuhVa/5yfj+8+mkzdOwbxyYBg8JqF9VKkq1obA1cAnZ3dBuU4/3XEVDQOqCqRFqXAC2v0WNhLnOUorLv1M9SuM7mu8HEU4+UNSzNV6is1p65Jjv8pZTHKm76i0rMhE9eWXZtDxvGXZqxC3Pi1pOGxHs0XNgrQxL1+Jbr65YfaO1t0GzyOX2zLSV+tT7um4EkzbZktbUNPJm0etXnk+EIWXeJXugTLveBq4X6ZlCw/BMIf+hbs6NqDfLZTDp+Isq3UeYOuePQZCasvZeR2Hcwx+pA602Z4JkNUfrY2cNBY3QiBYZaeO2NwPkK4ysEPd0sSIPXrHzbuvuRmd6eYWLeBuzIYEdUGetyl1MHqSXLsjoLC4Kd+3XviuJPqMcZDBZi7RQnmIZ4LghTs1j4Kan4aywptGuTU4g6p8CIEsceq1GfahV1h4+t5buOc5vFu5DN4RX4/4Rl8yWfgS34I1CBAs/5FUBV9EASobyjPmWM/W6hUtq+B5MQWUa+lEOCyFGFq4tNg2iE3vMT6F5bSQUFjoR5qsPeT0T9ngGCfRcX4rxfJTuIh8iL4I9kbhsSEmM4h4kyG8IMKDTn6lND+WRJ/uWpmrakGIs5kAE/8a8DRJ6ZdZqLvHifOzvqiY1lZvAmzOX0bfMoULD/7dwq8xJ4QOo3LwtEnpfuvbfewBk0LIAsNTA1X24BOpCaYknWRFruqIB4/wf3F5MZnEMYKKDcTjF4fDDTGT+V4afT4tOPVxz6T9CzxJzd5EEb/fU/uD/TP+b2RvvIi3VEVSj83TCe7DJan0pUGblzq6KwEUCxyz9BAscdBFGce8vik2N0wMMaQOe/bZSdTnOTDOTlsc4QgNRi704egn8/tWhELCjA+HssvKm1vJSjB8OTqeuIgUpZkFUEArE46ZgPq+wOQjtVGT7MnG+ZmXB/UHxoPjYcYd+cYDulndC7QKwyG2pkX85k5xyysIb3L6tODAFEagp9inAahFevNp1c5o2GiXLtqYBw+THC/E8CRnmVvpRJkLJy9yHwnVy9dS/ULXsWYv9A1T65n1lqEU7a7q8keW7xAvoVCCSdO3PcEaIQQeoGUqjCwOpihatd/R2bz6rLrtegmX8dV/F+9+ammYgeBwd3r9V5bwaUIi8gIy/WtqNLHe2Ys9aYr9aonuldUN4yJKdMXaiwm11c4oB8f9zbc02q5x0MIrT40fSkZC1NlrPmqtd0yJEKdHeYS6REbxiIDIdILhq3uoK0bzz9Sfqh92/h8Q5bO98pgvfeN5S7/7FZ+04z4v3TARaKJDCeye575ekL8iFA+EFd9fDosDr6CeaKhPcqCrcN2yOapx+GH1hyeSZukq61769CbS5Juei4wDtSDRLlJLWpi//3szwzEevk6iH/HRI0kl0bSSUH40QmUbXNgXWwhHKbiJ/HlkauEu7jeKQf2VBm43VPvElPffOciZgHWHm8WmSc/ad9NR05/QWceP28YZ/BHbYoXWPuCfncqPbNCiaKCwvlpPtJFG2mBGPXK6cAvfhGz/Bxmyfbdr79HpyDtEYYXB7p5G7FvW05P0KP/JefATNYX6vW89EOyTP8QDdGXaltPoGMvizfyeinr3Yh13/CmLXj9sfiItZkv1fwD2DIl8ORwuqH8eL/xd8JBgdPHGQRazMHN3OUGBCHMqSmqwsbTJofbKvVa/+bjfje3+fJ8W1PNik/NC7hUQeNc7JO7KNtRkwZmh+iQz0fxJoI5wDwrm56xFOypMAjHuv4xmLHzLGrwWJSQ7gntRzijPsY846z1u0W4eoSqoDtOylyYm6RtnGhHUtsS+EVJOhPptuYoq0L8H/VFwgN0zzfcPk1q4oJz+opAIoqLA7hCmLZWGF7cD1Ng4TqSZOOyV7xzzFJVP9a1tspH3ByRbdc1kPlgZEBARJ1nmTXtWLyr0uezCdQJ8I5WRXmXMpKwfRZvPRfH5Qo2LEgJI+KkGxlAXt9lDjrvpiadxHmjlpQgZBi4B9DXAsPVCQXJQ/Fvcy8Xny8m1pHmAhc7sguaH62UFOwfgyAZniP48N16UUecoE5K424YFi11Kyx4YelUCdK2EzMhPbWxBFAOixGxYwSdhxnhZmSiUEO2uhh+7INdvW9oKJJGXmNjwM/8GHoxJXqUfr6hs8BlVQUiZsOKzEcAIqXmRA85GFSgSG+KeQbNSGVsqRe8W8lRtNLO5xjDBmNAmZwj5fjAtsIXI8KnSkqH2hYFED1ItF+y8ktM/3suo475vcYCJdXPPgCLpYrgvPW7QNKiksT18tPxSyiGFlyRq9rWadsYbCUaZXnniRDtxMadT9sdekcyvFkS3CpzZ1eE3NBtiTDw+8VdYJaMRauGbBV2jLq7s8DNkyF14Jxjd7PLluhtnAraXcj3f554ozpsppOl8Q1fmgb8lTdywAfck8P+jC0BxDNpp0e+XaWNwN8gi3T57oqeAfireKxGCCIQe4XNRMCfqFsd/p3esMksPYt2yR0k9ZA3wngOJ1BqMTHsJWDB76CU2xS4rxOWW0TSQlo8uT1DpzcmwYaK3sOCLnvPMVxRtWEFT6l0XSri4wfj+ImySa4yiWYMiw/kVm2kZ6+F9w46akLPC59tdZXfQRzU/Tl8L7nD5a9vjcdJ23jm1IsoF0DEuqBQLXCQtfcDvd3Fk6mPPN1QE5Hp6i+OR1lR5lrMcc00cJZs2g89Ona3V+8rdNAWcTqbrftDM332so+/wYjxss+3ubHAqIY9+kEUfv87c32nrDT9cDAwqjv6UOI0oiI5dj7P9C1YdvLCjnM5i0YKCUAjQizAGX9pJ/DhjBl8GvIqmiDQKdS1JcjFM718B/BtkLcSxJBEcz7ItS6eKtk7u30/uE09qRrttwSRu0Z0nc8EA1Ub20YGaV56xH6r1qrgHXdCdxModpmIaYWudP+iezLkyEAmys9f9ECnbBs29waHJfMA9PtVaJldesiKGn96PLgS7eS4UCJez1UyjBBd73RjPH6OBcW1bmXSVeoe4hyjUDT+f+P3cMAyKUotGyOxGtWNINkSdlG8buXB5WChQlXUM4DveCcwChIHwv8T1ZuYUfeiZ11I4zD4flliNOjSF9kc2S6yR/J/qV3oH7u9YUqf6kaNLDzVX01Y7bnnDMJiKr9XJhDF8RMhlpy1EaXTb4FtqcaB5ymlr7kUX3kw8e1ZZjSi1951C5eT/g+z4SzwWl2MgLjRflCBf/iDfGbe7GtVRZvxYG31vr3r3HuEp0m0FWclcgXhTyfOQqfcsyqYfHj7EmZg6nfruc9H9YaWJeyKpU5rHg7jH1FXgPk4CxbU8YOkBMbfwKLMy2E+LrrPJjEsn4vvCll0d7ZNOkuMPdhjEdZC+aFVdaQS6zDaAoWYUB407c2nEonI/MKDqtD0cSt5O4E0jGosuGbiLgMm+FD77Bv5Mu55+NT121Q9QA44FP5EHKpZqb0LmMUM4RjuwKlw0R+BPjugk+n8DpVCg9WIcZ5yukn/UHU/VDk2egC3iqi20c7wOyosYVm/+1ODJL3YNpnSsgG4vhI/MyfQslMo2XHBELzOy5mSmhjWHAw5xpos2extU67oupyjaBAw0GjTU3Yrs+PTExrdpTuOAYC4nDZObMGBOMZbsYUsnaqobhwZg8N9gGkyBoLsRyunXdwSK5QFBXM5CtZRmd7RmsQWsuQfxnKSVp1bod5xItjS1fxvxw4b5n/dBstsi1cqh+pV2X+ebNuH65G+qsOdMYCIumAtfdy/kyZB2CefKG9HsH4BrKKg0K+6wgtYbXuoxp3RZBcpBi602vL+IjcKsEbKl7biXbqrJoJWkjHBvPYEXRnIZLrfxM+IF9afVFVC1bJQyT6Wu471Sj+IP4hyuwa6zJSYbc7NYHdjxFL9hhPBoh1UtTlpZ+A+Sg2MKAf+6Ui0ilGvq50/mnSkmWsoUd+ioFfbjPdjQtM31ckoaowJxva+bK/2uD4S0QT36hsk3gWw+vbuNBiHGiU1zG/FVpae5WVcRjDd6tPWJ3bre9mKFkhBLjbBfZP2EehmvtuKqwfy2VNnh14xs8eu3XWLaJqVgGIuaPmtJGw+P0TLniA6iOn39gdeR0YM9oALEbuBLaKomw1rClrpA4cU1YZu1HQ9um6GyNxWeN6AJ+TLn3ADquMAN33QaUJ9MuJYyvEAyaVeFpJKgjIKczV1NpfvUP5W2WQbRTq1tLiB5xStxv7Rcc4cFK9v/2wYg6AwV+0rj7hVK4cE7oJ9wwQwNKGhTrRlziApEgteb3GzY112FMlibNCOrlFgYtgbz8NTh3iR5+OvVzBmtzqKyczqAAad6afj32gyO5zES0cqaA3wcJJoTt6aXW8Dieg2uXduR30aI4Ex2BHv+ltYm4C5Igi1c8ziam6rYD9BXT/uIVelfigijjYrKg5Bly7nfho05EJ4kkqeDgXRBFGjLGKgn+XNNg451GXksFFv6ONGwAwk5yleQZXO/6oL1QbWVVE9iFsAF0+Z5g9+rNrbEXFPmi2n8NqSeN/rtE85MseNrl5vWrjCu7d9yG1kMT9gnUAL5kEj3tGredRJ8Snbnc/i8T0qdFvHGx9UCc/c2ye+Uu9X37NHXZbRIOMNawylUwVTiIJO3DiYwhZaWoX1sHOar5UpUGSdqb/Zu/U/bjuLQWBGoegLaabzk8FUnZGz0FK7N3SZOw2Hw5jPOQbxIzKOSLCYAVbFVIASUVKrbQZNv+SmcQ3DvuqBv4yrIAYtglCSGEZPAxtVoIfPhOno2egF73Zrh7F3YKHk0QjkgGFJ5Dya8JJWDabjcW84pysWP0zfF0+CIDyORzG55cSDvEHMqB/5LJ39XTcc2gIJ0cIJTAz+g9qdDRj4GYJYJfcNfT/ekjeTwoJq2Jnwb7vFBbVfbOFILrIJV0lv6fLN0xCphlkjTIVa+oRu5am3OBDoI148+x+t3EQEw9mKOQGctfPla8qBQg/NqzB5l0Rd1zBY56r0XKbVHzGbrWjxBh+zEl5GRQSa/t6XnTRY25PYcDfbkGheiAj1CixGrZsYKLogrJMsWOt2pfCNGQxy8+lW6wsZRPFDl6UgnwLSMqzD9XDSGZ8pffLNafFGsjHSaua+NUUIw1FDc8o99ol+W+NQJhujL9zWr/l4TZz+CgYRMphFRuKHVm0xn1rqYpBeJr64bZB2/vyw82qH09Qp8ONn9dHkf1aH02CXvc3KB+ZjW77Ph/n7I5PAuAeO5IWo+/5a95ipuUZl5mteO9HARB6xTXVhNQzLZK46iEXE1DUESNfmZmW4xSkG9v2l0rBlPZx/YlmYXqHGTWhy1WFome+rVT+jiHJrfszQZiG6yO7KX89SbasnPR7AAuAfEAEL4X+QAGrSLJmuNOLxTLqh1L1fB1nR9/+qUjGk927Vxc4M+satM7MJoN3jBJjs+LtHgZyMiNE7ge+T9XGeWPEQfSEhWZCf1oUayPrDISivUZBmhXLlm1rvDjTQbqgdHq8bUjiGrtwLhx68W48Y8HOC+pC/NZ3iU0uB32ybEcif36YtGN8OwhqonWF1572q/0TQ5+CnrwgUR3HQIe97cBpuRHrLNsi9zwU66h4+FIMOupO3+0Bfy2wYKc/4bAhSBzxRBxN8X2d9uBlq9zIYzIlauR7Wn8R/qEgEgZisY3AixPxY/K7dAycYk2ERNDg70tiMmyINmEzJ4YGXLSUw56hygRaCD2z6H/+cP2nDF5GrFm4pDPWN+EJft39UwnLbGM8wrN8zY3+JyKUfeeFRR3aHg+rHcvF58Jv3ZaHa0DZPoCzE9DmxVYfDOvm38oetyTkGVHF1HH3PL/Kzkp/z71K0lwZFBnQ2FZPKNSqjIxK4LqBamtNwEvTHZXedN2ot5VpHqn56vUXCd5R0JczhZ1Bwk8q0lqm8LMwvsJozxdNwzUx+jMNcqj3/JQRs/CVkKonYl86fdNl2vF3O4BqGorH50FTfrggaf1SEGu3i51QQMMJTUk13iTManxVmPKn+1T03SBvVj6/3pSA80GxAYegF3Py8/0tYcPgaEVb59+DnQ534rN4sAlYJ3jri4TQYVXV9HABP+Hk1FH8+YuK7nc+9qbsWKtESsVRJMvY7c4IJIQJQ6vJSk7n3G27v6xzU792g6UQIkVCQ/VYmo0QmExbubzuE8ZDjd3T5bhvmneJULnlTz5rDMiR1QRtJ0C5rusXkHXSpBPwaRUBihChMa1ul3hgX5kq6pxkJbMRtTp2jrGU8g92EuFEcYwTbqhoX4R563mGZhsMZpwUboJSJwxNnoBMclRuA9ug13N6BPeg76N8tPhBQ7pBn4PMHu1iZMJBj58iR2PYFa/h3jvArn0fmXFoHXS49FPlhw71UGKWvN+P4z0z0arhNHix/HqgTiE6n+o260SqCp7uTKW8BlpaXygCgQzx+tlCJhyBiAIhfpZsvoXX1MHKIyRDcj6FVDEmuio/PdZKgOnrjv7v6WdBLUi/aWuKpdmFehu0gteX/+MGNjABry09F/8K55+FVHwrnR7X6kpSXSpahQA/tIiV4Ivq0AK3y8XqRnxFZxjmhyDrZlyRsLdQ24Ht4MCvlOHD6miPCFoPOeG1J3P+K4j960Nay3c1LIZKXO3DMygn+N5HKQFjWcCSY1s1E9ggjnq4maTj+7Dym8yH0gtQof4c+6gWTTvMkYOk6DXZZvwGwuLrhbl5E8+TxRiydQZodthQdgzOZrV8/9c33uAcfS8vS5y8zbSOIZxjfB9lJ0JZImFlZOvcpR2xBuV/nvmlIE5f3YJGQNypTikbrPpbfmwrcxtaqSIN0IWBR/H6BgJv7YGgGX6EMHD/OLXnh8NDIW3i3NS1KhREjdJe718Kl2vO0ZHAA0wWEw+O/rc1KJRMQDUbQfjYB+DIqGlYJBv2b2kq1M8Kv48KssRR3D5RxseEdwmNv/eLG9WbyHGYjyHuEZLyWFo2lxqulWAJx0MzIVbpMt68L0Op88f+sLAVpwzcLSrnQc2QLjFg1UyuThs/Ch0CZemnGjWsDs8+gVDLDSN/FICFTvRVoZFiY/vvG6Q+fALm6eomhW5tlomNOZZEOQhga02GVU8btJTZpLy4266iP9YyuOA40eWMzo4hds0KNbvHQnKs44tKRglfHqEa3A75CrWNfR/2O3eCx6qilMKoRQyxq/y0mO0L03ACmHTO9fRTAXn9U9NHLGp25C+eaiRHA53iBl8KzvEPiMtloneR7Yj+m+uATirVTFdJqJPdqGoizxxe/I0SE3HOmoA6htjEFCvWwrrjpQ54bcVg/miU+yqd/eP4ougUWP/cb+/MFNkCx92W06mng2/Y3YOZz7yaGbDtVXvTkR2cL34pD7/P25LzRWX/WaScOGj29FM2kySn4KUZLvhJT61qJnBp0cEH9hC3oMWDpikDfi5/qOztOZ3Hl95wwdw8CY6ouwCbynifFE+zw3mwjZIl99uXV+xPN+Elh6MlJcdMH3p98bMl3ok16ymUhLUTMCAvbZtHOYM3aJlPSaJ5cmHia1C3nEx15v3l2ifk4NBKbTC7joNqbl3ibinBuJ5EN4bTYtvoOAvd0ZiTTEvn3mPUBZ/wMO9aoqes147mBI0DzdyLow1Dwn2/sJDRMabJ4sqLcvoieg1Lw9EzObD1ZE1TOObFcy195vjQL8P0ulD0BnPC383hhCFj+CKDHRU8EamnV9lmT77kbNPpF02lQq+Q+5aHwSO2ZjdF74jle209Cw2xtrpaurUmxN19/vOwlPpze+5YKibrBW5/wCDTbymR8A/vdGDn1WMvk0Y0k5Qp2zUjSccjZfzTdzZ8M/G3rMHLI1jE/ztPA1412buBDw2Sna67enwyaUoO3RAoZvE4rDPjybQiA9ZLPORe+u1w26VpvbOX0r3ss1YxKq7wZFaDtyhEqhqCF/aXxFht3d6HbmuXkUSLN54vepOPwo12fVU5/O0eO2iLj5Xz8uTTkJMHVPR5CohbbouTpVvjYmYCLtzJWQ8wGBizEC2xtWZ0PKNhH1BJOZJuc2On88VI2wbB7cAftPmTBPAPEy/+thc6MjmoHTFCYVb4ICQlb4CDWNJGnsmBUhmnmB+1P5dENjK6iWGYHVUTSOFxI1KSb3gm50j5h3xgUEElL03MJU/YhzjonEvkyByeW2CtqKzHs2+kD5mAp9rB3XRmsohEpPeZkBmQAroDIbE3jN8j6QOTb0fddpa7n+cXwzCGPw1cz/OhZZryCNqEyhwgnIu10qDbDDFI0Jnz9A3jIcRzpvw8KuCCAH7x3f2k4vtaB6VKr0A2O1uZRC7uyzh2csKFzqfEpbKIHVioBcAfsM7VGeV2wMQKwTgHPJ0aJsBryjG++jy6yRXcosnZYEvu3bX6Ygsd8O6uHCOzsM58w2wbJibWZbKxacroarcHbF236qSO/djnC3XtmJwJoMDK/zZuyyjPeHMrH8t0O67csqLQh9tAT83kJao9B1xCh5TIoorHjBZQFmmfAW97NK2cA3oIoQOnFvVnqmQNBVf5zNLyFwQ3IOwSOLNdUpuAm/U0jMNM81x4LxUDExZibc669l8GdjNFgfDyLvTsDTcVVImng1kahW6lRILKYyBtr81lVCmOeHU/jDRdcgLjObZM3KG4vZ2fiB303eUkqYvxGEIDVSGgJjqCPOR2DZFZ+YDbEnDQVlszFPdGCzzWqMySsDENag0Bl9g+CwZAHhgx91ILq/s7sdrtjHRMS45rYMV8TQ9yMmcpc1JPFvj/Pgnm/YIAnSFaNWPtanyKIsM+NikbfEWhYrT2v0/qfAYqN2LEKKjxTlwtrD8VdRrvL07wKbeg+XavbVUCLOmfxXL2tRN970xiQsAlVwinWDrWTMEiIlTsM2uGOZloWpPlHUVbDaE+n7ZhI62YBRqI1HwButmIb3BuIfXf3T/Xa4ffKp9GCPqLF4gy/tD5kqcmz5B+Of+s0DEJEJbGh72jIFLskSovW7yzJyJBHta9S04Sev8hywPAkPcGHs0L889PcxLq8Dh62m+gZuzTU6/RBQqPNHVjovDteVl8/p016OoNKBjet55pJ67SuHyr7uVkHmj6vTNCV6/I61pXqtE7rZuugi+vm66BL66Cr182PyTrC4i5Vvrt++NV+Zu5a8VzFsp9vAKIFAf51U/pedpXLizfitn3e0H2qeDGYRyJblm9Jxa/7rk9XNVbTFNe656QEL7w8pZunKYaZwZboKTRyqsXhHzRqy3kigigNeZvNqU9qV2+KoMZb8cWSAGcTzFkPIUzfk9Oeg0EPNvak5k4XjH7tG/wd3hx+1bO2L1goji0CSKXz+oMaZfxjk1s40TzFGOPTFQWTaNWYRAgPzJiIIqA5PhtTFtEmnoURI1OtB1Vmkz7AFoGvOtJFuAZ3xbiyLHwq7oTRfkDqTosqN00b8KG6qcGRAPKso6CWvMHndYg+Lw15JDx0r1cJZdWX0xSRaoGREdYks4t1qEPZJQSIyD7+0FAdRW/XUWoq2Zq1BSeGG9iXiim7Qhh32eqnfSGLViuY74WM6OhUL4CCj7X8qfGJVwD6Sg2af9yVdViZdkty3K0W080KQ/doSSccJynKcevGQTZ1TjTHvwcU4jBKtvfpyyi3wHste0jM9W5HS74ZhxU4Nmkznl/NO23LCMq+VE9RUQbAjf7k+6twJ8ZjYR/pSoF9ezgY+TYLKi5o8PTYahqXZtEEoDvZENwTX9P9I0jKE8Ww5IMNOVLHXCo1NyUQw68FKPw+BSKUM7ixQRx69Ek9zqFwPjijpHoYMbEvrIqyiXypLIs/Pk2qBcwswEq/D+s6FE3NAzwI/5gMatgPpKwNe8RwPTEGgb88/4XQO8KEscAIuh8+P8AxkTxlY9SAhc+OB0F/H2jhF/TqIDM7UZUi2ZwnQ1GQ7p9MVH53bI926oyzIz/ICSz/5XhntDguIBh0WhJaneKAUWTIKoDav3RDQW2lPe/2vmUUVSZ+7VotP3wjFIeSKrCtmBgI3471eQ33T3Ti28X4NYGjdpznQXef4SGyPmC/H5d9FlBkfbbLdkJOKzLbnSHNij9WITFk+oDyA0kh7DGDZVf2LTJp7hi+ijv7Wsq5KR8zs7dTftfaP2DvAS4YS8iVMg8PskYjLg0ASOsQSv4yhquUBGTNvpXsxuvowRD+KrUHVn4cwWP9zPbL4aPT9LwPqYuuCSBm3hQDbv1+Pum79zA9RxPerYrwJJq9sSXswJbPt9vkKflb7QZgQpTd3bNbXutvPWWbLw3PaSIP3R60GRAH9WSX24ACVw07m/FoH2K9A3BJC3Ihs7ew+LdL95RSQOFVc8ezlMx522LwEkSv+aa6zOY01i+VHY8y6t5RTO19spIPWSd/gMNPCZjQNn2P61bImN9c9ZeOMDwJw99F7ok2fXVZgUw24lpw30WxbMqh9MEhPdENyErPLNqy+bCNx4Q3NiACc95phIDIjdN7WB/TSOX0WUCrM3PW1T3ixw+OB3m2PJr0NQlW9SW68rXyzv9+JW8JWi9eyo178cozctv9eSfoNwmxcKgPWx/K7w1/8TPyFrLDpbr9sQ/IWs/eInMa3eoXDyXI65RzoTHtuwZWvMPNEeUBaHnZiwY2IBEJHCtCTgYlPkC8SHnhX9oZAf1hRqNHH/GP/nUn1lQ/CInYW2VpPA04lF1sS5T/5mCiN3MLb264oks/fSpEs9XHXhCWXscen1RL05in23Kguki5OTactmgZK19olCgu7pMPlzE4EzFnrJeIzL8rFG7tfpuHTfoTY7dRvDuBaRiGvytmRkFxD8EGscpkoylHwpgIgHFeHv3l3vB53ZisKfl1dW07einzHKtU8KhdcPRSKTPQTgG8lIzMBGLgeSvODMU0pAgg53eXgbZcaE5sL65O7e5CGVzdYTzAMYvA1q1PzB8whpm+K0DjGS/eB88/XmFY6hqVp7UYY1Tvwr1FlAdbD/D7KMH41bvObsHbTLeoPZVll+Y4iTlwNv7pbUChsy3v0z7d39b4VDrTT7keIlnd9k7XEcYhr8L7ZhqKiMwqpaaORN3cutyHOFu8/wo7pNHsSHRMvjhztfxjXsn+UYb0+v/L9F8F00L32wuSvAiQuM3zk6xtycE2er676JKjIPy4euvFF2ji1nwm2lEa/gtlwRXW71ugHRN8F/otYqc7zHyMxT30ft9S+nCy8PtU2cpXVn8xG3w6/ddnEwkBWcWIHqY+dOlfafXy1SBfyedZbXl4WtehC6wwLrX1EEHoldhpk6Ko4cbmcudV+EHV/v0iEBtt4PgYfyASTN3AuIJn40L28CRo/0qDu0DBsGOwFu3ECWekFA8dIVNuNJCGFbXjVZeQe0EPZKwbhC4VEecBVdQNS/WujH16ZKlmfuRK0eNIt6LF2kOon1927itD1tnjsXF27jh0PoOCXvnXXTSLbwGHFeVb2l1/nbtQy3u606SGMWHjdlw79A78Nk7ph6dQUVxivp082RuhNpGj48Sgmdxw0vliTvUE9zambDaDMszCDxP50U43YMylFvq+OIEcjwYQvrlynoJT96MAzv1LPCR6o4/e1QkWXK6nwvn7jPi3oW5nuQ261ZND+s/1lVhkqKvfE1J0PJr43sdyiNBaMbpDeGuApkXcxnTiwtDv4t8fATGN1Gj/xA5cx38Ss+9HdiFt2XVvJv/QD/d/fT+19Q9Js9fY+FmCIhqPyZHuRr7/+/vh/tg34xctmMUZD2PPxIk9+X50qi9OzcqRwYTJCdHC8EuKlBad1s/3jgFmEddI9JC1Z4buh8r498ZzuyL3fbgJQny596IA48ECu3+pcg2tmZ+nWWtmlA8uZkhhw+5L/Avsy02/UZA2DjPrKRClYpd3Fz7yZTpwgs6fkcJZld9fOP70Ne0VM5jkdFz+4t95Rv8jP3vUAw8eWMV5c5CUpbs8beQfSJMK1Sv0Agbg8RoRIXyiEEqeqXMz5LkqiZMcXxe/iGLHTeDAJl85I5OOyHCCKZZWDloU/BH6p+ff+X/d2Pl2NAUHRwx/uC0Kmsvi78OFo9UbXiGRTMRoIMAgAubfot9Z3/7Isz7w5I/4A4eIRLiECTHp/3nsBbEs8iMmc3HlvUxWLymX717+NntbY53kkjUsSAgbKmo0bNM9gGdUwFEb6vg47pEyLuIRI2QdKHuBMp42wFjCmh17L2WA0FEfpl72gJ2cU3j6h4EAG0ICrpHQbDjF7o0/VTgGWGIdsAxtrOyLRnQh0CwhvURPXTG83YLn67HHk0v24qV76FUY+s0zTKQhkJDUnYPjxRu+rQ1C9xteSk+RytmHwdCg3mbVaRfsB3SvMVowcRlIBxrtb5jeF11Eiy9Fpi/wveGyQY6/dV9d4gOgNjx6q+ktDo8TFWNPr1MC2OE9VS5Dvby+LP6SJV4+v6/KvV/71iId378/QWGnYKKaYAVu+SscwinkkBN+D9OpvQElEiwZyeOjUTsdd/0Plk3v2d/7tIMuHcbcpX/uDQpYuISVWbT03BDed63ev0R51OrT4vqtw9DbFPOiqbZtU2HZKqOGhAiF7WqpKtci36/PeyUUsFRK6uoAqZgiMFRfckFeYQds9vbbx9y1/CIM1i9z5dhqywhA+XpnUzzd4jFzNV41/kx7HRdm0Yh11VEJtK9t4Gi6gVb+GxUnXut+KBprVj7mfwd0qTU6j6tLoqK+bAjMvh9Nt5j2r3dBmNZlS63Fd0eKkp0Xtfc0b8kIHPGbdNjfgBoxBUL52uB5DGJDR4xdiORrOherA6OV6grVcS/2+feMP7wF93q2+7rGXClDG71NNjA0hcg420Eq0JLrOARKcN/+SXh+oOvRf5FSJstizpYiJmYUicbwZvPJNRw/0Qy/1GQnYyEuWmX4mgZujPNFC/lnH35r92vtHtb+wRqbsthfujcE4fnh2CHahJSmhJry0GpT4BJiT44q77+fSIQ1sxH9uO61GR7KlmKNS4TqTuyMHejkJZ+W5x5ntdv37L64y3iKXXHakmON7oZJLxoAYoeOD49dKHaQuNV/YNE8Iq+dzHfkGJ51pw856r3icQck+t4IJVGgYC7naWCPib3NZJBjtmDnOWIMUCwDbm62ak6QRWjt+xKa9dd16GD7o+Na3s2QD64+mM73w3RwCMhqZhDCexBzXtUY4eva9//IC/XFP7Z/qTjqcc0qEKvKKKX4MtsjXSW/eetVWA7xhylsHc0rGQtVBsToORgTs0r3xlX+UE6s9j9hg1++Kjc++ewHIrlT0f6wMynH3UfvB94FazoWXAF7o6LjjkY4lx7rydi0Egy2tmVVHQa5bhn/Q1TzW0RkAUi0ZxXUAlf3M8g4tBBhN+v9jV8f7IfQdZ2heOuVFy0Lj0ZCH6aAf7sV/ZHcH1i+HeicxLOW/uCGoVPu1JS/AYC7mcp2WvE0IWJRFU4BKex4ckNbtSvMdjD/067RdfB0MRo6HMrlK9z9k41s5d453PxWLETCt/ByRm9p+qKysOm/tatxvb5UCtsW+xQirta2F7bH2DrsDmYuiMTVMc0FXcHTlGCSszbRNtAEx4pNPP5iIt20VlG22UK5aHIPdxhGwAUNlmV8YsqUX5IGhJ3YQp8P/9JftoMgqJJUYxFi7hQ5t86VPfa6vv/mmW2+nP59tfO/u5zwwM0s6QXVE0Ub1/1DGL/AC6J5HroxOmFi1kFFsEqTroUmseW5SXcLAtOAa9s0jUbLv6oPR7XNMrqGZ6vw8S03trqesv1PERDhByrfgF6BLvvtA5rTa3ATrOlLQ5/TXNnvjoNsjELEMGlxagLoXHCbmVxYm5dW92LedKK8EpymOr5tnSIudi/BB+RUj5W+Tk78S+Fcw4t8w1sCi/6CLp05eR/G84EfHw50/8hXHCI2j1i94v4CAzwwgegCLKH3qwIFw2Pio0UesyKm/+D8i0Ruu+pkpEZ9S9awGO/NZFA8itNdc7b5RjfbYEjnW8sh7w/gpaAaAGT7dfFvdj9shKjSstqMgV+ONH/W28psMBzjccVlnmae0VFsuitxEDFUmYVgybpEsr4rKlu1KhurutFgOQBcXT0A+goAZC9Qf3w/pRGldHBAb1eL6Ep9WnPR80tt1DvjqJFBJuMXgASRuLh38ar3udlWAlKA0mxgDa36o4arzd6erP9yfVur3rkQ5EydM6gKDiBPMm1NWJc6i2fqn3lf/bmYoqlFdOpbcgepWVak0HjvH41sPqf3P49UUc+zqDerUUxoEK1zk4dn0JaHJSGxZOiBomsGpZQGb5M4H7p2fhgGtZ0Us/AM/val+V8YEJsWLz6PrJbky6nlg835B2ZYcBd9aRxlARuL/nVJ5VLAouoegISFjWb7LmJU+8UxP0+3bNmHU7kQ4OCsIBH4Y37yp1nA9I+Ep4uvtPs6ADXwbL+EscPGbNZYQTzGcHqjFvTaCXrs0Y9MGHtiwXEGNWI8KZEBipmIleCoXm5nK7L/dxLr3XxNs8euHQZFZFP6g4cMPBCNb+Z5hY7ExpqcPjHy785Fv6jSxouFWrowgjfNhxdtcwJcZWo+EwmGU9fS1Fo0JwfhJA5nlYW0dAv6qnd+n4H20mB/WYG20TsMVOfO7zZwPu0LDoiAUuniFfoBuMhJtWdAqPw1dX0B9NTMLCBAo4cxCxDQsBq7cADz+vJDXIA70Zj5CGyur+9rro+uEvjzgAUJI0SRCL4hNPAnlqPUK4fgd1zDJ4EK/s5eHvo9/5ugn39OUEQTKiNoErUfiLb46hx2mN8S9t9yoVXzpf4EYDArzNX8SnKymg+HRKPwV8Vgx8YKWBULsUgdrYqD+KiPVsUv+HpzulKBen8g56sStZfuSQJyFEgATNHYm+yS48Sf7Nq7oqW990YZaqqUSBVabY1mgFsBK9DfaAoXHFDb4CXXWRlqmsxCEEJxMyYrj16paNS2Dk4MzdnsZBfFntVx2nHWvzW13WnRi2f0HGQ9b3l/8b7e0T0RSOrFC06hFRZgCGV6Seh/8WhIuYiK5u7RrdDSAu765MyxSUjPlX7GxIv2ZKnhzCktP5uY4T9suKcqtBX+cTO188icScjBFFYlj0ZXN12dtUDdGoy5AVfa8y7BdsdetSu0EwW8ZmoFteNtMzZoOZ5s2VmKQO0Wgo1CTx9I6aKbvXMzF1zFsNceu4EHvCKy8sFLzDOP6F6CnX3Sf8qGvax49gJi1kUTTwSzbwRg51EXbe3dK1jsfqDF7/1zJ1IiUxVgsiCBM+7Y5aIk1ViuQUCVocYtNWiuRo6UZskja36pISUIisiyr6yYpdYocNpY4zfNpPIMZo3Tv6DB1bYUUfCSAx42lFQ0hovKGVSJu1kGYFKWyEz9W9sNByyFqbr6bzYehPFCbiZRv6DRuh0As6mEmZniTeRUryuaVvoxVozEStD5NfSEeUjNZkbaUgHs6FaxBmhcr05+DAwDlBzQMqW53VbyGs4JOLlEv9IvLic3Is0gu/ZcvZJEZdABTLIPVnDOxoeFHe4d3K/dElV/FPyrU/xfHZAXE0kflsagPITRb4esg/j0FzWLKAIAGLryFfi9G87mYo8QizEpp0uYp/k8AHkKrD5AGXEEsDhSp0BRvwGLtswVedDegNQFYTxZ22KF3PT7OCuYKBiG/zD3TQITtGplkm3rLYXYXTpk1VEgLJj0C+GFJoCyDTOUt6/16nY1koX3vvFDba0nLKxaWs/5eqt56P9/E5iDWMcewUBjibWRWT0EfPTFmxmLJEBVNGIwGWDhj44YT6sQY+mn12C1OKyYNZR+vBnMxJ+i6BsL9y6QquLmIF0D+0UnRSWsoXTFCB0PT6XoSj/O9uglhHmlIgaTAeITmEZglbaG0gGRJMVD0cLQFOtMhwVPdoE0FTWG0jUL2frnCly96ZTbrDIfVMwYSj7lf3siaasUnalaYcBjdFJxV2/6ycDaE3YikJWI6k8PuJ6Vo1Mp+tJP8SVr0UmlrLFxaKz/W4iXE/mUrggy+w6oqzAGx4F3DZqGqqqiM11DkjcPwapCDtIVJH/0NEhZMVdvemgdUfRAvxQU/eMp+PkSE8Cqi85xAvDWDhG7kyrhGRwrCzxiukCsZEz/OOmEJUulIkbHiA79EUFaaWss/fiipEhYNTGUCkdzpx9ca5AgVjVmRr+/axk4i1Ec9B3tE1TemMHCNOQaPUNF5uqGvPekoRZGU4PcD6az5r0+xfezMpufeShLQ0mSBRMTDXoCyxk7N5HTy3B4VS9jpQrAS1BajoCkyC/8WbHdNIaBZFs4sCroJSajmYuLo3R47tgu8xwqphWQlV4dAgEPYYQqm2ThHG3kNmiyAHGiheLl7NYCVctJVfhxTytd21u70OoyvDckuFzxiKqNbRtxfRSOrgc2QNG0WNllsvf7kgp8gg/J8RnsiaUtHIa3q/lSpD3nd9qm9Y47W4SOd/o9AM31cglMup7fKJCcdyxClATbu4wPZ7aDZWI7QcmlB2v62MZnkdTy1Toe5bTwFyJ+yuInLxmGRBT8X0yWakRjPi7UmhJD+GcLDXTq/wgUVXyEHFV+hJIni750j0EvNAMqDXwNmtDYInpZB55BA5/opI+jawtAbk7d9V/ptusUz9h3nTLpwldnLaoOI1YT9og2WsdOfBNTtDZRbVPTKcED1Ojukdph8KLbeJ8LamNPLPIEPTdhXAYrUFMKNMWfePh2mirMwtSETX7TvcBX2mO9axK66U2DtSs6SE0zFtIkoxqY6ZB2CK2/2kbj4DjbxXIQ4a1i7Og6Ux7R4OEG7cDcEyBqjWTakaZzUjzzkcRi3F2jEkMo38sFdNExm/La5y2VKVr3TAIB+i+LIlowzgNZPtE3tWK0LlFbdBfj9AitXXl/ht0jt//7fUK3dFF0mlbgAJuZ/x8px3W/XwkaoN3v7Oefh8zg2ARKcjxOKJpxxXpDRqy8TR3rIQsit1OkHAMLggiGGUpmGv9WwG3H1sMrEHAXcDI+C1t7mQJayUaWBBq6S7YqAgKXGSiE7M7nAlTd0wibYd/vAaz1+kYVzXBQIfNKr5c4kVVSTiNBpgqb8dBK0YNmWBxnydx6oaOKZjiBKuXOSjGvgMYpJUx1ki2eOAvWYFNanQxtgNdQhMp/ZkpVAY1Qg3MHUd5OlFy91mfhSjYB1tU1OYQwQfrBP7GEQowtTAJuhVkWeDtO28H8GSmnxYC9pFZHNTU6Mo3yB6p7TN+l3kDNJx9o5DGDuosoI+GTGP5bBiQGXYZz/1ezmfQS8LAmsm0rTLWjNYNnHiEYfSzeN7zJXyd4QOMmQX7P/zL7uzXzdhw9heFGfQb9fBYGflwDTOdLPA2yRs0j/vai7qfJIvNa/LOwQo3oEmgt5pAfhhzcgJXcgZBEhrrAw/AY4JBRhv7NQNxJa1J7AlIY64P0bTuzw4PubqA/3xlQuTDTbKsuzw2Zyx3h3pIlf51buheocD60nZykDSqA8Qz3K+atDuIsxoDhLdr4NjlzMafyzUstIS5duHIYG1r6mYfCnBEb0NtW2GeERSQoxAQcCIhgBxmNCEr9EQHuGNDDIPwWxkwPIzY75mSXw/3OKpRPexL9UCxtcGn/r7VLzXRn+tW5/M+9EKw2/ni3zbst28qm7DDvDOR2KzOO/xEbU3kXbWLU1q25VJ+vMgLznXiBNW5JjrjwbOderbCfr/AZbCV+w/9zwawESgTjukjeLmtW1+rLQ8Ozk0ALy3xmoTPJJ7OKAS1gN7nIcQoTUl9ovlEnmYMLXxTdPIE8BtuE3pM8/6Y+abM7PBFcCQor7M0+/ZlKpbzuLBJlM82qqIA8DAMPfCoKA2mRkD0WV8x+w0kFaa95+MwcuANrg/YzREN8AKFnEy5SX+RvgvYv4jh4M7bPXK9si+PGjHMOGvCfQzCH8qI83H4Vd8j4iuCHcQctcwpRjuhf7xpBAfBizjSwoGMvI+ewSeBfG2nvUPtFIfCTIRqotin9P7COiGlYF8ZTfmys/z8mQIba8n3r+bnuLcKi2Uhb/wqyhAQ2t2AOyn2mJNe+y9sC5n3AcqbFq+I7emO1zvgJ4935yf6EmJKJBAjKwqzuFZzBvzD6dX+mPc1LqnbM7Jm5fC6lVJz0tvK9IJjFMzw5OjNADPD4PgZi+k42OjfqgI8fk1UjWIM5BoF/hCDsSTllEKy2fLvuvkn2bY7cwflUxDCgHoY9XYrR+mZj5xMQQNJiVGDkr4E3vkUGVcylHN4MDqn3hnnNXjLqblb+CN9J3bg700aNOOmpERohsXH+952S9W3ITZ0b/tmn/uqL6W9gudq2i3PPDMn+RxV03OYha8FTSAVv0A2xteibQV54Rw3zHnoNJaJI3ZXFgWitBVPQEBhWy3DMF3QYMd3YZUV+hfT1AWlrUxF40LWmihkplm2e73dEeC4qizkZJQg/NN4aLKyk4T/KKelbjIxwOflAgt8TNUvsbvgpeHAD/pNRwvcDRnjYUF6RdfDleRdiQGcrlgBODIjfrm7hnPr/jY+XKuE6w/Do+JhRPzy1hir0BqPOwgFVtm9Ms+Rh2FW24R77WCpcz+/RVsHndxCbZf58j7sopFxoMWpKkA+ZhG7C5Lo9eGzsGMX/v+eIEUx+1pP39vE9Ds0sQ5qyA7GknoECFZkXu+NzLAJkrpAI9uOJdIv8u7BWjOfuY7b10XFbASzO1NtYHIFZ5rE4TOBZ+fmdVW9uGSYY+pCRarYrhL/5g4bLdpNFleWLUnp42+0G/KUQ5KfeYV0lvwirR6sxzE1ZQS8AwpbtQ2b9p1VJ6UMx9W5OfLhA/oaTdt2RapFZ9YEWv0Spj7J4Zt+GgclF3xtajL3mpSFluxTcD0yUIdcYfm14C0jc8iKyerK7stQtPvlCog8NhgN8D+sBHdCWwksKwVHAVanFAERHWisg4GPkHbkulZYjYzhMZ/ZwyR+VptZEPNwhc0e9YE5vOD8IHUeBzlBEOT7Ix474cwMKS0gcJ3EAdT4HCrGWWbxxZfbqnjPMN7vtEpXa11c9a6D0Ce/QsJYLao5qj8/jZIv9vvFq/F678Zi1R8nPtiKqyagRkdAyx2KRdyodNjNQcQlQX5gDIKI70Esn189S1PUftyY/eyZENREJUdu0WuqcSPConGkLZerdTx65iX3Df9XmNVbvLQ+x0Zz0WehGqtVudRzM4bOf8KgjOzjBv5PozW9seaV/Zee/n8qU3sprwBezLecVK4tE6RQmPUg0DWinnJregn9vbXw/iU8SEnvV32mZPjOOw9BZ6WxHy1CEcIEPaie+3JA2zAp+gBSJrC3JYwNCabNCxq7FJkqSARoKULUCjWvphBfA7Sg7CNz5eT5rTMH1lfpDyknQMpveO9xIqAg3YsrdiEc9beYn1kTs4bbD1+IDUrQm1YpqE3RHFTfPVhbs/e9MINbid417FxkCSGujR9KO/KDhodWeEpGtnPe08KFByDoDly+vIvt+PWZS0/9aTQiuHUIIYVhuXhduaXI8GCZrsrzhxyaz+osfInyrtFIOryRb52tbDuxKp8ONW55MGezBk9FCj96o30iiWZsOjrKyURhqX5N+XlnNQPR7xXhepN3SYBR6LBWNb0xkkDi0DYXqb+cd/GUJpsqwAmMN5e1fljTH62DU+o+02uvPdsdqwM5zWQCtwK/r5Ovr/emSPhp0ripFU9f1v2HSu2ojqszBwZNS3w29ewdunmy9FYCAHSA0bw31GacJ+5cWEMphCUTCIv6O28Wzlm16SqCz7RNbFyqar+wwcgj2GjZdKqBo2jYsQM594xkB+o/9VBJ3T886qRpW4EdEx2tPtl5m40u1/QugIVdGSQdRmxJKZKj7qRIcW7OLr67yE6q2aQU6luBuMtcjXsvSJWr+O24Oezp54xjKBJRHJhWH1CRqToRL5fvkzcbOtp6ZNiDatJf1IbAi/pkLRdL0mJlE4mT8gpSZRpSVVOUClckcx5fAJAIyuHCiusv+qF7mDlV3cj1bO3ED4RevZZyMo4Ir7448pTaOdb0gkk/nHKvtW27+2NEw4vwvnLqvNPUuDNF5/EFnb3h6PEfIAOBNKoGEItcUDQ2igaDrN0QA5B2B0xJ9BoBuRO8a2lTFYOKNnbuagTdGFzHr3P4YasKyBWYajqZS+UC+iVkcD2Cto0cr+rxAOnWFBWtEAGvX0CXlWuCSTwx9MK7bMHgW8KUhLFZ7/27j2wylcbYMblTmYE4VKLqxqKt9qXMp7TMDc9a7EENflH3snX38Wq3VWV84OZq/dd1JN51fhwrEJ+wXdqGo4AvnPJSbcr+yBnTk16+m7GRX5E3EsCf6+fU7rN3NBCtCL0i+81irWnsrsR28LLPakc85ZnHL4jOUcx1jsdNvcHpP9EVFqSBM0nYmOyonvoiA6wbjKmPL9c+mgO/O9xt0G92BpiOyhtN7MaqT1/xdutG55aafV35JXrXo0PryEp3OB8BfdenDpvDWk1zGkfumggMqdeHSSW+TOMCKoqsvvT6Ny4FsAAGoKnIbiWBq2vJb758sdZ8yw54urRYRSmcDeBvdv/Hx0iXkjgyh4cnqb2Us9y2CD1ujVGJxoiBK3ZIzHQcVqpV2gIPBzz+k779fODRi4AccpDK0WbUhSqWRzUCZdFTRxUOpyjt62TMrd0rbss+dtJ1978FJj7ktt4t/HrML+tN9cOc7/REa5yjR7fdO4z4Xfh5QPdHnzjLN9GgbM2dBh50kJ0QH2d8GegylSnFAAwt/jLY5owdKrmmv9pG07MfXV6ujuSIJ1MunLtJ90IqN/8vQNlP0PVGMHuYF1EPuWQz7aTxbwtJJkN3SCvMiKtO1JqAQB/Ff/x2i39pKlGhaVkX1zul0C2I+5dTsPhKrR+G8KP7N5xLUO/PnCYRCBwIcApGANVaPsGo7Jm2s2xDkpDMER/wdh8uBNOUqpJVVyPgDv+KvY5t72YONNsWycIWb+hcvq4znNz44/e34mS2BV3vrCFVBGeFZwwJZE0z8DLoJVjzn6mA4/XHrMKzrtaWhiy4jh4sZkx2mqbUhPMn9zI9pMRlj+xjHWGF4IW0lWKONmwqMMsOm9b6+RaPX/6kk8WXZWqxZ2ZEzfm0GAFsJkLANjN0ddra8vT1Fyn18oW4JQM3U/AB6YScMI/pPwz69TOIHWC6Bg9Xrx0S9e4PyZHs3uK3sWIr5DazBxl+IK3qYOrxiuwCQ9ilxyUqHHxuSHTNAKaTgrjDGZNudWHtyb6SMvdRqD4WhajVZ6bM4RDl7L8JPj1mKMT+C3Cbt2IX+sk9aYhGM/k+FYpdeS9dzXdlesVQgAwOowzN5MHQ0h+V8nC3xIkxe4lRfxEjhNzTH6YaM4TJYFAzk27DjCwl7B3nvrwEM0wETTwXIZHyVrjhUTQCCCJzG4Pk940/fWk99vmw8TLvLKPOXGZnnIPMbikPyYuao5TLX9lWMmciYNMSXV3Pd3sqdxszwsyJAm+rVItycmk4Q1Ayql3DjnPkCZxhtIWA+4M8Nx6p/QwhLKoaVQcCJbrGHR4lIFrCIbauQOvTbGQ2mRjXkQFDQmlGJquvsQOSfdKjgGNRwPVxx8JPOFJSMo6i30GinUJROrLtr+1+8Or95/j4uFSijohfC33PNFDP8XJx4q+LmrxwCPnoOBf+Ah+4EHETqgI0Pr9bTCLAHi/F7UinhcZiJprcQwt4oh0HxpdWsa0TuRNOGpVbxWj8BAbQ9Wn9v14ewvwDH4rxFn1QmAj1XGPFm93Y4dpSx9/fGM1E3j/dvNdsaVslZoQ377KxfsVjXLcYVuBCZRNEyMv7xz2sEYJKz6ZA9xYwIoT2sCL+eRPENSZNRfaMsGRUm80xhG6x32nkP8cdZO9hSClL4HP86ZlQQ95P3yc+l+m25d8KnqUP2c1t2xmmqWOHk//jby4eVomB11vSBM3YU5pDvCo4nLa6Wal1nwKQYeWOEZR3VF7SRR2iHN1kzVchFUnOIUFLlssoQfgS3g0I2V/QAkDKf9JEV5gyWruCO0oblXSLv/r2u/nAmzg9wX4LMpC8/P2p45t0Y18Z/NRmIMIHjxMPxTdC9MU7QiRkdYXswH8WYtHF/jPNT4md7MH8X1sL3jtlklzgxDfVfHMlk2TEV7+uG4Bo0F1cuFWdE4e/8W3lf3At+NGyZjwXEgwA+Kufuc2+Sng5vmcT9CAMuQEp1azQA1zw6Hxq6eMeBA8Nqe+RtTQcxbEmThPsVZy0euKfDAJ1z6MllYpd96VaiV6Xo70uZlgzTd7E4Pprz6IEDwjVp9U05yHyI0oAgBEPHArTw20UmEYUYI893bA4mrvIEmic8x4eD/z8kmqboCD14E2TnJDAFfRg9uXebxYXHLTh6ThEfPL6QidMQkNIol1pUrVQxGxyXGYEKCryvMuujIJ/rL1+23nHXie9H/b0PHPS1QBokrdFk5SLm1J8vABAKZK0orjqzDeVLdtRQJWZThgT2lWrDQTveEBaEPeoL4RpfhcDyDV9ho6uo2V/D2BhKVcDmcnTmgSQcpvCTtsgS5EW/fcRHim8rClPHoH1J5HlBnEXl+Maic1vI+Yg+oLl6oji4qALkj4q/OW95YjSxfcw/+MDBz9zqZVo19mqOb99cBkQ7YTV71K3jBsKS5hYr/qC44a/952bkhKYnEJr6jvx2c+Vryba+Yb2tlwb5LZ1y3mHjLQNW2YyWbV5IwM3PongXCRZVmRp/6XLdc3HxbTDj/O0gQrARTphO/jllikvkYWQ684mojKjEtmoq1wSZyNPr86vLLs+XH2/KS2n0fc1awst2+hrtw2wk3uD9hyDkP1RFJJTU4vk7NtTeeEl48cdsG7qOB/hnRlte40k2mCEMpyDtiUIdhNiEuOzz5w6A3vxjVzVRaWlThaTs7GnD8urnCqEmQxocaznE6aWcucWwF8NEieUj6WcYqLHthBJwNu5dZzGtLy2m9pqz0GAjmA817Pqd2VEVhmQxYWWbSDqYaTqQVjAeyGBt2GqrF+vt7CE/oOVBNL9zwc0rw1g+JhmKFvpmdqBQUf52KFxnLyDzKqnwTz2KAOG1h/IUKhpdzvj1Tz4RYDe4QByMA5kS4FCqoMLAO6cd4H6EiKt1j2DkpX7hOlFstkOtEku+YFBImEHruUqxRRpw0n43EpvsT3VOXD7d/p4tDEX57wnIcxsjp6WsCUK+GyX3356Wt60M9rsWYHGPBGUUmYJhS/Wk+SK/C3ginUnchFNQO77ntDwLgUiD4A0JdvmdiuisW3jQmu42E3RzP3AgvX6fKjOr7AEdsJZ1ADNlvCeg/P9pOjqAMX95Wj5Os32I3ZyjC5VQCZVWKVV/OkD4TpkinM2rlCvLePNGNlcpQeYlwO15HL1pICFQbHWO5KifzLdISi6q11/UxsihGn+vOZ1+G4SSIBCrDUh22IDlPnoY5HIB4pP+UJLr6EaQqGiBzSO0QC5HUKzZ37L4f5p3IucXv/3sbxCdCXcUF+cfVG3dOOiWW4f0RMoEVx43EK2WQjQAGvgWiRoh+aYkC9jjmLCOOf3/gs5lwX5DiyMLWEtjb8/RY8XszsOAh/yL7FhgMCZzgJTYoQf7HGICciSBuC73hYQIdSkjOmswb7CClYQvBocnDSjxRgYCs/tPlKQi2iY6kGA1gUHTDgHOBlEED2g1Al5E7rOtcufMskpDAh6T9hcnYYQ6q/+blcUwKi0/TW3cxXNwZzGTKit8XwfN82blBnrKrm4sJh5ea/5E8vcWuYCF5dlUJT1LAQ4MfCgc6iAbr7AI/p0Flt4QjxRzOZaKhd7SXwBKNzUVLS66CBFyZx5qAsVMqX6sUvtVtrAEgLhuLoJK3bhaJfaPnPlWBebKtnf1FN3dSBq+QjDbliu7ePBECGaZPBUI6IGKrqUDKxK524vemKdI9MayTlbniTjsxlIMVmFQlTw8BP5gQwoswPfnRrADD70RQxVdIigm1fL1ZD9Tl67kkYKX8L0l7PM7lWVNX7WTR7odZ+UAdYOR9novlBsHVHFm5T+RYzQFnMjVrAjXBX0hdqYK6m3Z3dH0FCzLobbBCDfXZQzI+WAeQb662ILbtmsbyV3dOIR2FJJCcUozeAV/BtT5xRkw1f6zox4M7asyjRWd3noCP+nvAnBNoOqaaNFHJ70Fx+SkjeqCi2uc1UE0oQ9TGRcR3FqOcxo0kacD82F+p9bouvz7JaA52zwALZmzgUVjlCCx7jNwzfSRl/3FCXEFSDVZEMWYSg+aYK5Epbd8uisBMrsYpu+v5cjaIMMrfFn8/xvrwR7x5vjy/xWpvtPEvsJXtmEEsi1zcFj2Oc0O7PNhfYYAF5bM+3qOfWr9BLjvOcOsaJMsrksHQ+5OEABAH5GeWRRKt2/IElwtq3MY9HCAI9BjmY3bkZItESmFz6Ygbmg0gPvFaKHLRQKqodF59r/8YB2fmvQmnMB5Cs3CH472DN2AuJAKbYVs7hiHZ8pJTLeI66KqNq8VLuuXk3hqosnYd98SsDQDdd75yNYfCoCGmKQZBjyHqQbj/mrsyQaLjo1fzUSrfYSPNziMzhMQRtKlCxibbFrDlYoiaExRI3U81VJZhac5chAFgnmmDpoU+Cp5ImUMRG1dtgOmghF1zPotLlTzOmWY7M6qAWw00RExPILge4yTLe8lisNslOW+QbiQ0QGRG34uVko7ryku9YznqR58Lyh13Cm6s2NdKQsUposDgWvSuYBAj0Q4VfJH2PrA66pPzqO25hxxmGogJuWnGB1YhldZR727AN1Ks91uDl+Tlxqsj6JJxu6O0c8MRi9vzq9AF9WOG+Pb9XL/kUScLla3Mr/I89gwEQE4XrD2lve4mRhu7S/yiyWqQOXlqyOgrfTBo6FwJ8EMhohSxYxKkuYuGv4ZKRfnvFw6wP2ey1UVefWF0u4GAYkBZ3kHJRzLtFCHGRP4Dhb4Et2VNOA9+E2Azq8TC88AiD4wr33bP7f4QV8agp2hmAaaDDgOPDLShEucjOwJmkPkeQAbfvB9bTktd9YTQN/Z1Njx33IQELOf5J2d7NAwPM7wtfMRTnsRIULnNMVLIWV2wSPWK5Ua1auOsqk2D0l1ckyd/mISafL7JMBobCq1TjZuoFdd1XlOAVBTdruOd3h0x7OjomkiGKJnZZ/69e2ajqtUuOv3fLAq05UiG0a2zWH0mndxIrn7/PnsnXAApk6qtmYQUaMdawHNVckGc1SuhcxwNMvpzsx0mtA5cz8cSJMuYi3ip2bO891l651XZKTygg4t3eiSNnZVH7+erf/xj5QXGlilhlz+yhNKwtUREkbRd5mrJOsLmSehgbN88/WA9IYIG+ASWO3mOQX3M4DwzBwvQHBPLFbQVJuPoKGIJNi1KxtseXVqYfZ9FkvD0oFD6cqOA+mJHmwqhUwR33QR3Zj9hMsU2B1tVtFfixK+rxJeVs/4SelIlWNZbG97OuVmYZ7KyyXj41JomOLrMKD5hIHroSEwBoWsZ0ySVwZwXFGEyVN8hFqFUDzw+LuP/r3l/nb3N/fMGGh3rlFBMWJeYV8/znA/D+x27psLtyYld+0ubW/OEOYEpIKB1uJ4woJ/XKVV+0XVJ1fy4GdJ3+Cbn0gB0UHkoGMm+ihrlHI681HHcRn3k4YgGDxsCSNLHeHZQU3FiKOYMY1i7A3ogaOJfU11LsjdNEBSBIPovYj4+nCnIpVSBY4Td3blY39X3DkwdQ/AfMqOW6KQjBUx9ieGuQQvKsA2jn8ioDqfwhcoTs/q9YYeH4LBVOLr7PQN9Khw0KqlneDluQb0zxOAQUMCHU71DGoPxL92Lqh03pIA4kG4iLKGxsL6gnXbB5nuwEpZqwb17k2tZ68gORn1YIYmiX2pN91OfeHuPZ4C8FVdYJTw754M0xMt6vDphUjnJehlPSaQvE6+mjkNL9Q5NDeEWazHL7bBH1RaTvT+46U8p+6n0lJ1VcSuuoWlS6Iqf8nqGsbSIaOisutaLiBXVcxGJGrGYR7GHGA51+EjeMaGbgNh5irdS1IF4arEqlfqAEAPj2MFulck55EKFLdkh8gbpzynSX1SN7Y9u9btbAjRmHmtv6QAT0fPJcSnrRY6E89JqGlCzfphxDRm+AsNyQsjAHHXe6wvbJ6+nLT6ywyQ+Y7XJQ66oA2y88EJq355QJ0dHt1RQHcjORbncRHsiTLj/RvTJQtohguv8YtrHQtA26LmzAFRMDrRTispwkd4OEX4DROJOkgJ/Hby3xQUy/As2Y6oySJa+wwUX0PRDjsvL0eUcvPkRmpxoWQUfRmZzsC8xwvHA5CxYWOastsKb4qD3sYrdC/BFSOZMaxd3bQ4pWhqTGfI/2/6Um+Hq7JTV1L+YtbsA/rd21qypCPp64povFTdXbiqR3ZmmgXRQe35TpMaiRgHeU6PUWVbYDQZWqwwXQOVveK+UmBNMg6sHODy7a4LDZpBk3l/3wDtnukK+lKyWgZjiDRcXo5tX8yDzx8d9cQFGTRUqJNVbzHFJTEfxpq4EDoqPqMVxArBpxX1lwxrOPhEefVanR3F+FVYQCeX5JJpLbkmzzqQsqyseXkrO+5OF/r58YOusEmjSDuhnaLyhrABQNOV4sa6NFZZovuVAyp1OkpMr70IqNxdnTITu9wIn7S8VIC82FWk/rLSiqpLOkS1VsOYoryUx/XxH9BNV6U0M5C83HOZavqsclSdV7EGylqquiXTUJ1h6jOthnpcPazOA0qXefWQfyQhUd5iyV4BPjdTO12lcVSKo25cnWb6oLM+PrHyGZxflLXaT1aH+9rDNgt6VbXAEF0NeK6qFgxqpfDb43rtCkMZxTP79xkL8P7buCR0AKeWZwI7vevQ3qIP1VX1Q6nkFXYZUf696DFohAUAZJVGNf3G8DQ90Pdo6x9iyqOs/SoY7dUVqzcplNtxmCEgJq+Q6pxgXq+4QfVgaWArKj6E5nMt+sIUbH3L+EGXwQhqJcH6eIo8flBd8R3wnxCxlWyLF2/0dk1Pzl7WLutimZchKA+qK7kMYX6I1wJDV6KSXM1j3marFKIk6IoHu/Y0uBE+LxlHHrZK/LUVbOPBpxaVoCRUdJ/Ps0mnx3FaQv8Q3ZVTAN7NaIYHCfZHlnNpRRRNIFwZ05R4aIaHPXmkFSEiBceqPtzFbHNrK4cvBIXwQA+Wc+YaUI8fwrYi4wrLyAB5XgqgKPsLO4MjDhtXVnN/GkYOiD3v6OnBNUv9hvDsKKWvMKAFcO2ciogn5OqgF76zlGVj7Bb4336GmhDnweXsGl62fX1X7g4pADsLsHsFTiHvXfUdwK7aiaQFI3R930P6Yr7IDOsZASMiD4WzcfiEOor834oaNCyK3w/9eJOHfSXLfsl1van6sh39JBTwjvhI7GQLRotGxtGOQ7doDwu7D/1Ba7MBLdDD/EcHArUCqWF1u29qSJ1rCTG8SjzWVXXe70klLpQqHUwsGxHw5N7QsnHEZ5vP/qwtj30s3mq0tdg5keocFFxzIDvgP3uC5yxOWSUWFXZVAY4RzTzVlvqHfeZSmBt5CqmJhOiNcn7DVqiNdayHMCXdfAq0lDPsEysfvRiD3nXcmwo/8SedLzZ9NKdLwE3AKdRQu4Y7iAQvDMZCJK6g8nswJOmAoPFjXInOWmP9VKTQCMIeRX3KFdrOBRi7TMKIkCXqN29VIOgFYZUgTnkY4nGhAFw3qmH1N3I97bll0MCB/PLCwjHLZFft4oDmFi66NOlmnprU8X8Q69Hz3eIQFNExF77L/SEYrRGZ+LZlfRA0HkNZak3WOsgyuJoxALo27S6n6AGjjpp5bZxJ8JdklZWSHENNGLbTBgVZCoraVIA0NKLjAOwnzHgpi2Bu4FHNCS4sjQCGYo31kMco8nF1xsANcZqrO2xBlQzFkNA+FhoAkfzQyy2njDLcxM/4OfDSgH2DijEVfFNLSKc87+E0Sz6zCG3WgLCvzEZbRJR4hYSsk10NcO8bhnyKamQJkma+j9HJ9Ca+luj6RnRnKPG2KRunP5GcJ448sHQy4WT5s3EyyWHYtk6QMHYoS89YptZ0CiPkaXZT8HshEee7BTsnHHCxwjNH9phcneINJhJJADbcsTN0zpCZkW/EllhYd8MWAhAcU3Z2ySbed6TTTq1ojW22VuXXzPDzpnXYPLJBbF2FzUJfD4wrpRFBXOoIdzqksIXsa5rLmm+eHvn0p1dDrykplHku6zA/OqaSgHgXlggCYrYw4HQcvhIfZRoPkixEC2YdeiHwIQ34ExXSAgZDdGQqAicHo6QfORB6eixOj9ZRWh2YRKxE2iQlVDbkwMTr5Ehqost44fXFo8nkjm7TYwCH6TG1TfWfYoubekqezyUp/MwVaTKJrRNQiIDmPgBiV0rrXhlaVPKIk5BTe20p54Q/JnROQeBRdKIagF1bTLyt5Ms8dcjeTRDxpDCAL1+VHvko2QedWi16+djQREIOSjNJGxEna/N91vaKGTpTgxVgeDEQuNU2FnUm6vw8r9X8MEO+XsSEid/vIlUXDc/f3pwegN+ybbv/rowU+vD/lfC68tVhUPVP8A4F/PS/A/4vxzvQP4NCdr4DRjN6nsM6+cy1CFoDp1HBZekNF16RG52RkXp2zPOMW3Mzi3bgiAdNuuCnjNfPD4D04p0LejoV/EigSVNfyw7t+XGhNnf2SL9TsHO0wl3f4SsyzW2+eK0K0DGF81IHcYaAwLzVzK1PKTp1T6RhTmKNUJuNH/f1kDRHqEwyXEAcYEjdw/yIydPzUM0EcpgBvLSDYU84SmhMTY4AFgN1IB79Dbp3HtxbGovpaZAjboFme6TPn74NFVN+vuSKdgJy45YkTOghqciAIJ1DdEteeJ24kNoarynuUDRletMR8JfrR09gfbs48gFLKg+mG5g7bPt4fLO/BGbmFSKhYcvu5OcdrBaZGb1YMP/e7bohzFI0hDsDE1p3vaVoPYaPOm6CVFS2Eu6WgELTivXHFjdOEqDEBXg4/p7MxKvT1vnyPc2U2TXntCzGKwoc7p4okoPLnZ0Wt+9cqgvgbrSwOKTAl0CLoCZIhFK81xvxTh+GREaDvQ+1ncE3C8q8jKzQcpVjl4w7GxUGF4g0LlhaY7ghTBySlcqXCgfeGIph4/qSvlQTQDLJBwwvX99jzahwrmizlmvexQwJZu001qMSseW7jvcCvk+uGyrNzatGb7dmLahE0ChT/hCzMH66td/dCO7V7Kk49UZHRt7SEqtBvNYCmyozUlnrC0vTozXlAA8yHkemL9ZM8JrRJpvrm2P5Vy7kubDCmoWs4xBI64gxpOSTXAKTTcanmUR4JTrpuTEY+h286GWCEK4zZwKZhT0Wg0eCwe5GvFNcM7huZeoXTOITq9pPH56o7E72n9cent6Gsp2UzGt2vgvAmelVP8vC5/kNmglgDzsVgaS9QdZTbh4MWwAin0Q73Q05LzZ0I87H9hv/+ZTlL1FGByCGXTaIvk6JxipgbyoDN2tDMAxdxc0OsoDcGuzt5tFGab12dwpueCQ2/vauXZGjcIrF+t327b9KOBovaCdGuWq2vgY2X8dTcHOWgwOZE9spO5bV2Whj7pvFcu0g1gqE1JGe6GfKFcGRDS4jzLEkXgF7w9QTa43sa3U3L7Idr05wReLucfQu3XVg/MLw3/NbZ++k4+lwNz13N36/iH9KIOSbclNQ2faDYdGbrGImBUFW/m5Y+5A/1GP2fgocLoepMUbJLjegE9zc3Cwcr/mzxd3C8cnSPR+dzoKUmBDSCKnagthtYVWGwRnxTAAij+l5iyOIcEmModbmSMFMAHQT49okDE/lxo8z2C9YW97rzEdcsLulGcNWE4XwkMCMJ0tycY5Oot8JmHTJOJGPfr+K8nbAto9jvCsL5AIPxXL339lzYZ2J8dq8/d8JW39RLSCpK2Lp9plHm6PtICBOGDd3R7Z03yvvC2iqcYiHoJxRYAJQ58HPr+Pj4wPy/dQJSEOpqyTCdWbilcI9pZTw4r4w1tgyrqQI6Bk57zVtmlgBI2WzzE3FLZkI1OosO3oUm0FQXO2C1Ys2C38mQIY+/tN1CLigvzIoQ/HFi/xGGDoHBvCaupX/P8ppcKNQqPC6is/knEx57SujYQpNT5Lpg2lv+OCod41zaWUZV+ByuTWy7cl1hU36IktKHeoaCQzhGQCQU6jthkCEptoqd2aUq+qmZ5tT8H3TkLxHSib4yNgmd6kN7s1Ndz8H66ovHCHS/tSN9pSxla3kjnFGY7aK04maqg9V7uQ8OKxmlK8DLAICFEz0xthRPbcUmhI4G95ubX8ODLHaLyycJZ62CcMNVhLb98pfAwJKzxIOdFcihAc1lz1mhhYbk6wakfljZI+5c4jdEDFTPHYwU799nghpJN7gNs37Ja2Dk+zx0Br5ArWm7PQGmyEIvxwZrqVPaHd5ZoEb9EliZnPdd7WfQFxRXBGAjcqVfXncZF4ML4TNFN6QTV1if+tyjXQ3l+/AphKKMLvK+G49hIHAf32TXxwmS0uOZ04+HvU2W44N6nw+tNXluxGdLkwf+3lzYdkV3e20M70Np9F0Loh5EYK/yOUbFsDuhSqMAFy7GCTnwybHOtk8DzZmYgz9ntfk3WBIaMYbtNmWRoFhgMfNnIZ23HiuJ9uNSwRdCEGZjBZaDWBehQiZ2R0iJkeI2SIZvquJZvmK3A9ZojJtMHO+3RNmEcoVlKnW3JqGkg358zLDng09I2DpCz0VZYecwNizB9+MLp+B1QznLXK+GL5KTUZfyRxAC5ltfp1A4Rhp7QmhfUPPaEF2N8ZxvMXE08S39+d8cnc8svZtgRvOSdaLawxtTTFol9xecZrElpwWLzEwsFKugobIyUXdtoRrmeCi5jrShSp2QNOrbYQWnbUoeGyMSj8FgBXtfB3pzAzgYph/zq+0cxjjIg5AscPiupILBTj8MRpgeSAaldw2ccjL2NdA1kvkTpg/9FZCZDGG4mOcI/ETQ/DZ8mpbQKMcyLyiph627Fb9tBXw9BZecucwZHJcnRkuqaGatmc26RnT2MxSf4IgTIYTBVwxsoWwfjXU3XOhMpsYaQniMf69q6PCQ/G7+tzBFb4zJjnyMPNtUacTNsNmv+woO2UAVKMDm1Dn4OMJcfUk7FODvr0aeszibZ2k4Tx60BZ8awT+4BtMZYpEo2fTq0fVmgbzqqTeyCa2L5groLtPUSoktLm5CoM2b+p7Zk6NT7Z3zZ1hz5phJvekdV34PsqQNmDPZlxr5F3gZUwgOhRulC8+wnpWZ2RsR7el2VP1qkRfxDm4hqpqlTPw0i4u6XVv5g0tBi5qtTlP2eGON25SUY0NLJEa6BoKN6jUHZ/cwKRgBrR+xzXOqPLvSn72jk84UqLilpPpZW2GunPkeM2yh+rhpjIelGcPRxVMDbr2SB5ELhmpr/5CQK/96YLGSNnFOnRSu7D7O63RCqnBjZwj6ybQHsgFD7hmgBB5MGGbIjUF1cbFt+mJrEfWarofZDd+NFH6aPce539gjiGGQtIZwnA5PohxSX0E9W/7CQpFLAiDOrMjx1GrxXZyWnjqk9zcUEafOFAISvUMQdmFajfF0RyrPD8RIoCrwx/yR1udRJrGMI3HEQSlT1RV5/MtNjoWuMznYns+IrK3vrvEP5dAJJaM68Q6NDc4tjWuUFceihUym8vQWCGkkC51KRxWJ/WlMQQminWS5CL7yHa3f54M2HYxIichtsw520Dv4+TgGZi/iguqnqiURKdGqYtVXIdkUtLYUQNM2d/Gtv6mVgDI4p0EzPuGKpRrwlNWUUWAKhv1AKKTnjT3XVIWAP151gDQSbBm24oE0G42dbIVyG5tGwi6k44ZL4AoNNLAT/M7/WvrSHwxS5hb/WHddRQKJjWy7Tki4u4YRLZsJXCFfdX4Mw0QWXR+tg48B0Z+IfsCgO1eoXd7jt2HZb0wWG6lrweml6l0clkYtvocbom2uz0e/4zKfINaVWdXObhiQNWgFHgMUEkGkiIgUvO1UTs19qxjdFDXfrRDSrVwStwRxJR7WyMbQJlhxtD0vvE87BRtryR61DDR4+H0qGX3Rxfj0k+bZzJyKjMYvb1UkwKnWE+Jt6sWiroTg9Re7wXBhWjvhf/jdR1e4xK4F1Ivsynva8nUzfuwoVMiK8iFZwLFxbfHWcPwwVBP03gk5LNHtf6ljQCmqNLBR+ztek/iukvyNj2e8SpylECJkbXcPIZeKyiFeKsSi5/huT9WH5xi56g6WIo/uvWmFaRFknqFJZ/BHW7r87+w1HRwXALo9ABwAuWhwse4nRYF0Y22zmpMc6ZeTabPiaJv/8qXPQ95EAzrgdXJ/FnjjU5ZmavCSgapD263mtUDt/KDcw6MEKi3k1Km6FBTOuRBEOz1WwhuJizJp7Dn2vpKBn89vytgTdlvvJtJYg05G0oPacKJoiXkM2irEgh1rtXtANL6GtkNfbcDrraYG3DJ5WAGP/r1Rm2NAMJUejesHTOqSJlSsiOE5Ec19HbI6Lpnej01Ywm0h+Opo0KxddNhI2vVVousy0d27SabKhYKVBJP+g6JPndd+oL4DnIARk8LA3ZO3enDPh6mSkRxnfqjYMCfz9MFG7NYThmR8x1R220yz/ywhXWdcI7cJjavPF3lO/D23YXnXXAynQldEUXaS4kodIfV1E+ZENVs1Ftf4E3vYMISCTMUNrlyXB5o0JFPq/pV14BqpSqooArVRRNOa8D0r94zx30qJPfnve9mjB1oNg0mQPnvCwrYOtoqRHOScw3lp5Pf8RtqpyKxSDq674RL3uu0+mHiNI/CkzSWJbRLayXrhm7YN3icxDZyCBPpSJPuh17jgzOVQ9Cw4/4dSy+nW6WsQ/e5HUPvp7I4UTgKZ3IP/ONX05d8fjcCSJBfGAcD3kbL9uWta3B+ZiM5mccTfHT9/F8dZi3i5Oa07VcOB84ngDQJfaUOX5JNT/E8a5VrUV4VnenZouk4U93RkUOTM7jzMx2lgQoc6f5jXcoIr2GO/x4dprkMmYJ+PPHZ+ahyvY5zOsDVCfYlOhjCuVrOEz59KOFs+l9MBY9Hw+Wc45laj1LOBMlSbKYA0BirafTcmV527lGkqZdWoigpYhpN8OrnVyEJuP8II0TXBGoHxo65nxfLK4Ihb/61wiVJYdBMZRT/QhInTCsTMvkvE/g7dGN5J5P5mst0SyjcsW2+HZJY1lGLCdG48y+KAkO8taqKsKDd870IVYW0AsuRsv8chbtTFiHFf7UE6CxFZVmXEECziUOV66EsReiWnkxN1zADmu5XT/8J6hpUVHR/DcbIDXFJxZSt0FGy7T7+eDIo7lqn8O0XT///CtD8ZppbdyPQULABdTcbrpl0W2/0ITudjXbKhPCBpEwKL08YvSo+xQT5aqXKQSpFfmwyAgGDtTCmtCcq3irJgUKiXK2afWW7fCYzafwR55+ZlhI21Jn6+o8tX/GFQJPhQ93ph3xl102ydJlLb4gRbTWTdRMB2OQVtqkTdHrvntCsstJWhQaZSJTFw400f5JI7DPOj/zdh+aY86GVZuHlzxkXj7u+Sy87/a37JeTamCIdr7gsXRF2+Lod0TsSUstZ7oFIZSBAm+RCSsuxB470GDd+w8YMJy9TXmW1zomudCTWmg9btKyp8r9Ni+fIvfr8Zzy3Qcy4/ouALVxa609P/xfJ4P86w0Ups6/++EPA2XWacaFavIIulM7WXdxzEk2KkPMPmckJHszpWAOEKcAlgnGPTv2N4ynR+XQM/GBG7mDPHHc392Q7Wz0BgM3usyFZBNSHh4dZG0xLq7Kq14aZgvtDXVCNzXp7Fp0c/XsPNRUlola6AX8ZQZ5w1MukKsPlxdch+XRY+Cm08QIDNqPnIXDvB5J31pSj++ELWV+8tiG9J4Zph1CIW8LmkRTrX3qqyGAvMUziTDP6vp/Qg9AjVHaV4vLHbxFZVI4a2W5noUUlmwqsET5T3rS8w82qIoMZc5Jmst483dRwrr20fPW1p16FoMXBISkMo0b28XAb8OnS0dEhbN72I7DAQJh8QFuvHQJq52StfCyUWpFCD2mGqi6O0gwzXfFCWdVLaapBXTKnYzBw97DFrRvcg2pTz/dFRB/5Q21j9dQg6RlM9/Rf7eFTZj/L3YfVJdQ9MfbfUhTYOqa+a6h8QQPBfcSzqHs1FoppAweq8UCBqjsw+u/TGGhGgzG+77214tZUykW0M28YGc6emU9gNxI7TBTSenicBlrJm2tA4pXMo6YcSLZHoF/FUb4QKC4HydgJYUZYB+OmVypTyrl167SQTa7MPsED2QOOSTVvp+JQRZB6o60NsTp2L36o3tJ9AblRNnJzNedrU+O1RnpZ6h22pPL3nUVzdYG3HEOY7d2ff+dakllBhO2pijUlsKGH4H/uFLgEFKQsVTCSwlk8iIMfHZPXHY7DBENI7aFKVE5nUOR6W8VSXQBVyJgKZwjyGJjSW+mskfNz9SXqrZiNjf5LetM9WWdzkvvU3taRPGz1vWH9re6Cvr01jVazSKj9RnQKSVgEsAOR526zwyD14NAQYnpavGBWS+BCcn2z0ILLleHjCbijwrg2UbBwEUlbiH9ore4AVFiOyrmdS4TxQDrmja/YIdc119R9G5o4zq3J3NqML0+y27kRLddZWFJUiIE8is/75Fc7TgIGlQgHbSxuFYHzz4LGIYr2ck/h2k8u6E4ZT07bVHM90cNvIGM8YcJXFWdalT7fHvDy6b37JP6Jqg+Qj24Hajd5tBDkcS/eEnW9pUH/06AfW53JUQb3SNTqNriLRSNxH2V+HaMyqcTxhH/7WPNfBVVrPulkxuGq/esUVDENmWsMdxqaX/5Y8vat87t3zsbpT8UhO+999G4XbT2BZpD1X+4otvnatVEbvq+C6syNrWg57VKWYvM76/L+k8/Mz42lpYHOepbeBPyGnHybrwAMSohbPc9K2Lr2MeXimhdwKt8vpPMp7OmyOhMuJ8T2qH0HYpGPXDggjDSS/wsPkKxhJqMEwnrFLT3pjy8jiYRqX6gQj88EBtFTJkuuUahLkylNSBYKrXTbf47zKwGYFA26GL0kub8OrWrxeoEvnmicXnLkl4Rh4Qffem14hB76Tk8IVvfwBj5yWdFTw2DKtIS+k1hmmFE9MF/DugnnPvKApmx/ykAuTC/ge5dZnU5MUll096sa92pK8SFpG/T+hHovgWiA7JwijqbI4cngcCL3v3SnBZibDShcjsgW1/ovc9U5WOfdNcKWDp6N7hG5weRI6aX71s/ujwzzz3nBU5eOwxO4QVvtFjEXy/MNnXmDX9IzQmbFap61c4Ns4J6RxGDpEclbVbUDXRDz63TAw2LwweUkOW1bmc9m6NoN53PvGK/Yt5WtuLrRXg9PLsZWXOhLeOhl34Zu9uaQ6pXeMhVP5LI4Q1NAQsmq0/Y3YSMvBACmkG5uOpLrF8jFuQ5aXa1UgEKFhQOYpohI6+J9fDuy2JT3dTHsYCdFzuzanNuCGZAd2PCWUa6BQ1rVBvhMkvRloEzrEp7D2yCkOqdfk1dw0iuRvJ+SUTZhdPleLzEVXeXAmnAUaSIU6WKvp6KiHUC+QWhypUov2Dwexvo5WGkLvgbGJikHVJkqrwiwYhy78fpAavOSK6WHUErOPQO91w0dgdBrNAyhvJB7P/SagjIPufBMAmIwA6H5Z/RU4H4PBiDRS6q9jYvwm7QjXyc4xHlmP7fINXVFStyxsY5AAW63yFRqnSXmpi7KFFGVwQn0lQo0BgmRZM9/VrWYLUulKl8tkzmzh1saqFhbCE0Cx5JrEnaZlrqk6n/QgxYN/ZzTdJYDY/Jfi8Alub360i9qValQzBqD9j6Us7IySQIJHfRCsPhGPQPLhsMunj88wBwKYlsLSZk6eZJwohvdvUffY/PC6UpcXaTZlZyTutVkVPUfFeC2ihBwQfBC8Wm3XghL4MFzaPdGUfZ6YNty4/IzUDneGqoe7xhZdY+br2b5ljKi8gx+mlQCc81X5v7DEHiAbj6VxDlrdWCkqL7z5DwzXVv30iANkfBxkbimitwtuX7YuDeidU/9sOf2q2sk2gYLc53r+SQzKNnbcYqcly8EFM1DpKrpIILS5/Ew3c2k2BjvmyZBYv8MnBF1k/gmUxqlI60G0J9q9bLYLqCfrGHXPrB3vZ2x7oWJmWPs3D0KwudCqIOD7R+ZvG5qX2zZPq9vhaHe1oCAvOlF2wx8XX8PLAWddCHNYjH5Y67kPlCC2azBGaGtdvHiSuWgUpt+rizFqRd0aLEIO/KUVj8li1qE0H4LIQ3cOBnFwukbXeSsF89Exz0X4m8b8GhAmFAeDBlQ9dLqMNfi1TCv/e1USgwP1bOuRfC1GwZryqML4o932dQ1P+lBbCmFr3cf2JDwOWMRP3MQA5084POxKvIBcvM7Ca6+OqeNxxEqg+BKQDFRvQNbM5NBRDSWxNdZqXcKvHCD5wHCaGcWV5Oi8Q18Vqy7wwQkuVMHycITPYlCwIjn4iHGS524jp+rPgMATvTCxteueTZcVyuW7gjdr0sVlVVsgTCCU2LeUle6XXIwTOPGB8MbiF85YMZBAQx56UMS9UCOdiYexixDHLUJaaqmiFk1d/kWQ3+q5yWTX8j9L5xTX6NxKLuqmZrPMqprnV/o/IqBumZDKebqi6yUYXlfAijAPpY4vQnLezHmU96fi3uO6BDT8Xn39xTZkpHADgQ3WXMpzmX4qlfkQOkR0tUhNgfuWTexKxkue9SFb6CnFbn49B8PgWTU3bC6eucL8Kuq3uTsui7MToIeaqfb8kugOTkqeg+LeShcFu1/ehSofIaejuu/Zq0kNdnSy67I8EYiDCR5nQWQ0uM9VdkH9qePG+NCUGXG/seMoQn/hJ1FBXSOm+wr0xR3TUJkMULnhmi2aqqej9u49Q6oO6w/C0lco8nZcWrAW3IrcUr3Wf8mwDtGYhGbQWw1Vfdin8LblizsfR7Ax6zY6t24SeA+QSTOW55UUbF2OeKKqKEX6nDnGRy3l6s9btlj2HILxHTkllJkNMi5QSrWwf5SJpWZ61sI7kfjnDVuChYHm5Glk3OyYuj6ZMx+tZI+PMEKOM8yA0uq8cIXsuA6cPkjDK77p1GRZx05atg2iYr5fLri+16Shh69ywQ7bD8rRQOP53RLe4HDZQClUD8TQOnW8RwJmG31oT01SyyRYgHV7ORtoo5RRwjO0iJFZU5ramgQbgiJxnuw7SbpYVabGresWqQTtUP2Nd5BLzXowLwT4hBmUlTgIvaXJSJci8I2BB+SCaVamjdj4TGMhS3nAe33hG5nBC0ArcjJX+BNHNIfz0s+AhxPho3tRbLTK/i2SJLn6lAf4V/3Mxq6K1YVx20ZwGUe0+nZH50wRgEVrB0CdVr4pSuYXbBj/Yy4Gr9Pt8jiL/5cyHIb72UT4B5DqqKs5eLdxjaPV8g6Pxvo35qamNgYECBKHCpwSgvyDkMQwkPrEuzXWZAPDNgbuR44hUyMRfKz5Arfa0YpVfjaqYGWnVKw6nXht00w35JfA7pFvANUTI+mcvWSt/Rttj+tzuWI8nX/usl2SZ8FsBAZ8lJrOYr9Idq5e/8ew+MJ5AdmuLOBm7S485JH/8adcvHvyMfdFzfmeCJrl5Qcq6q9mu3+VrUZOu7nm0wEm5lJHPh1HzFI8aXK+ZXcb8MpDxv2tCz9Db33M2D+itaJqIgIahPj5Uf9XHH69QBY77odDSWdfHxdq88Au5GBLXhEW8R0n8kVmckdfi/XWcKbsU3L4IjuNBW96jXVFo8StclU7gQD","base64")).toString()),HO)});var lle=w((sBt,Ale)=>{var XO=Symbol("arg flag"),Rn=class extends Error{constructor(e,t){super(e),this.name="ArgError",this.code=t,Object.setPrototypeOf(this,Rn.prototype)}};function uE(r,{argv:e=process.argv.slice(2),permissive:t=!1,stopAtPositional:i=!1}={}){if(!r)throw new Rn("argument specification object is required","ARG_CONFIG_NO_SPEC");let n={_:[]},s={},o={};for(let a of Object.keys(r)){if(!a)throw new Rn("argument key cannot be an empty string","ARG_CONFIG_EMPTY_KEY");if(a[0]!=="-")throw new Rn(`argument key must start with '-' but found: '${a}'`,"ARG_CONFIG_NONOPT_KEY");if(a.length===1)throw new Rn(`argument key must have a name; singular '-' keys are not allowed: ${a}`,"ARG_CONFIG_NONAME_KEY");if(typeof r[a]=="string"){s[a]=r[a];continue}let l=r[a],c=!1;if(Array.isArray(l)&&l.length===1&&typeof l[0]=="function"){let[u]=l;l=(g,f,h=[])=>(h.push(u(g,f,h[h.length-1])),h),c=u===Boolean||u[XO]===!0}else if(typeof l=="function")c=l===Boolean||l[XO]===!0;else throw new Rn(`type missing or not a function or valid array type: ${a}`,"ARG_CONFIG_VAD_TYPE");if(a[1]!=="-"&&a.length>2)throw new Rn(`short argument keys (with a single hyphen) must have only one character: ${a}`,"ARG_CONFIG_SHORTOPT_TOOLONG");o[a]=[l,c]}for(let a=0,l=e.length;a<l;a++){let c=e[a];if(i&&n._.length>0){n._=n._.concat(e.slice(a));break}if(c==="--"){n._=n._.concat(e.slice(a+1));break}if(c.length>1&&c[0]==="-"){let u=c[1]==="-"||c.length===2?[c]:c.slice(1).split("").map(g=>`-${g}`);for(let g=0;g<u.length;g++){let f=u[g],[h,p]=f[1]==="-"?f.split(/=(.*)/,2):[f,void 0],C=h;for(;C in s;)C=s[C];if(!(C in o))if(t){n._.push(f);continue}else throw new Rn(`unknown or unexpected option: ${h}`,"ARG_UNKNOWN_OPTION");let[y,B]=o[C];if(!B&&g+1<u.length)throw new Rn(`option requires argument (but was followed by another short argument): ${h}`,"ARG_MISSING_REQUIRED_SHORTARG");if(B)n[C]=y(!0,C,n[C]);else if(p===void 0){if(e.length<a+2||e[a+1].length>1&&e[a+1][0]==="-"&&!(e[a+1].match(/^-?\d*(\.(?=\d))?\d*$/)&&(y===Number||typeof BigInt<"u"&&y===BigInt))){let v=h===C?"":` (alias for ${C})`;throw new Rn(`option requires argument: ${h}${v}`,"ARG_MISSING_REQUIRED_LONGARG")}n[C]=y(e[a+1],C,n[C]),++a}else n[C]=y(p,C,n[C])}}else n._.push(c)}return n}uE.flag=r=>(r[XO]=!0,r);uE.COUNT=uE.flag((r,e,t)=>(t||0)+1);uE.ArgError=Rn;Ale.exports=uE});var Ile=w((LBt,Ele)=>{var eM;Ele.exports=()=>(typeof eM>"u"&&(eM=J("zlib").brotliDecompressSync(Buffer.from("W2QRIYo8Dg3EPjwjAzV1Mx4AWBbYhog/2fqQcbrIkz0xXrV55pTm5nGL+OMMcCdHxKi3slT78/Nq0QmoG+2FzL0kWXKIVHqxtm7BxVCECWJQGCjQZfDQfqL+jHqEQnLt5xcmc4zM+G5w+ImJyv0E6fG5lmp/f16YEA+4sMIlhQxXSnlBooU4cqrMxNK1JQfPp1tVNQFfrW94+WcaTm3Ns1ZB/N5NfYy6ziX7qgIc7AtZHesjHLapNK0ZK1i4GNVIplkItOn6w/R+vW/6mWmJdUmoUqwgX8fPKsXKVIoiTPfp7sU8zIyIwRAlkPPxHbie37rb3fc9jFsKALG1APmdD7UbyTiXxTbaUGEEUjZ0USTrWz7NYjESqXg4eTu10+QkFEZtVfV0E1KSGI+wdsj/hEMexBxrml8aWQFH29jrX9fvuvp6t2oIECIgogRkb3+MrH92W73ttM7/NwoBkhACRKrunpksc5SYPnz3o11ZpjFwMqQtiLiLEmy/1dHvh+YXZp1e3gpjvUNJ92vX8mrCFrk4xtPjvsQXFVgmQ/3ZafSL1cpAH4sBxpLjQrpJxRQresAU77eUeFloPrvVRkpOkTtG9GQYe1yn1l/to51Dfh8szWPm+RlAM7aRNf96AM2giNQFBJwG+M+f0XBC+v6OxsEqLNvLrBwOhN6XQROGFuzS7OO6LBoeYcb0u3fTgwek5eZWNH7DQBf/O9KJBeaNGruKV0MKp53Ws02jOMi+NAvpBJ3Jd7VqxsbXlaAZ2gyWPMgmX5J+W1hHNfWPvQqx0nqlZtV3NmrAU1Be/QG/BotuT7ipISrJvzHuxKw8Zg+AQUsYPBS+spnM+E9SBWq/E1vUAq6tQl7ahXhEwfpHVxLOgZrorkD6iHK2CoEJvx6tMSj9GlcR2QEXgg6p3qM4gGEAcb06WpOHbjQEt5HSiP/D0Qp+XJWbjfSv0lWG0gmY13RiY2AL9wGftld98QxOkEZl7kMw6k10lpO/C+BM+nj87+T4/TvnWN1AyXt6MSmU/YMDBJBBB1CXvKvo29mjVqtalVf7NGl3Zi31W1k5dos9k+38qjO6Ruj+oZ4L/g7pZ9lsyez00cgVFhvXRvcd+zQtpyj3xUpozpBYTGov4es7ZKAblavQ4EnG7/TO3iBdvTaXMTzGgpAlGv6cx9AF/cNBZiE+gF6f12qThUSzz0XY/M0AsCG9G4ywmUN933dyg82clp8JG1DEDSXeFFwknhdfTEHyNN7Pn9cRBCEo3yCXDV73/NlGJ+L/5vsvh8s999dSv7+nsPY0QnqXkWgyPxDlmVmGC4gC0UgMgiWCZT8e4foSmR0dnvdkdQJAJhMfQeJYtOg3pNm7i5jJizJmzs9UsXxa2meSD91or4zAbbxq5Si12uiVJfuUaQl3mMLCs1m/IugoMC/twr8S6la2cCJdbYRBckwAKJFcs4XTqN4KP0y7s2i97paIO6ro3/36MBxn0XGnDsDkHQrgaEF1VeXGA8WuFZf+zeg3olZXKe7saKaHooBsz9jvfChZaRVJexxF0f2LYrxNX0mvI7z9Tg8eiIWIurCPJNgEWm1GTGIOZuAhstFrH9ljFdQWNR6KODtQ1u5iBGKuffTtPkfjxrPkrLNko2MIV3s2zfk7dBci4q6eegc919bB716Vt52QkvhAS4b/VTQDoa6dzaIJCYVEmKtZkzJN/mUXt6XoWd3eZSM9mVJtoiWCN24pF4J83inWupcDtCz7rL9I6sRbDoBcoYlmqQCXEwgWuNmj/wG4VhgR96iuiYAQHYRRm+dMRpzXLF/GR8tWqbPTKDSQ9xPWUVWbFqZLn3td0AuRHqvT2QDO7wcA8TDIDs2rtoKDJG9IrozeZVSF9oOK26D9O7cwrNKnjRbqO0kWu7+nfWHM5a0wJYx0krheHCXZ3EOeyslJMuSaUJoHfYJv8OQe/lw2R1MqNCVmn06eEnYoqepsyw500JRHxcsvpypMmjoCMdGUxbcgq+EWtAsLBELDUuv6W3XsbjlHXjUqlWJ2X+yQwH8K0iW6i6aLRM3zBcXRJIhmloL2c4bWXkSR5+5YSzo1SgQnqcIHJ9w5UEo9BRFb9R5nkZDh/vq4R8X45WkbjM8oLTn86kRZEScOknLNlRhXk1P+lxoStwe7chJ5EC6DYqHJ8ZCu5teUsG3UCKNwN0vfkyC6f977WaMRG/oCBnCwEF6S2YpbnHXvBEidEh5oSMmPdt7sQwm9BHnOMBw1KC3AgBsmR4JSVe3X2+QApKh+hiPHPCcFtPGczbcIVXSM2X3gno7TrpSygAi8mcTkQkW+eXltHsPBoZPHPZhhYvFifeWWp6D1iL1orCxRUr8lL/umNH/KpZqrcSnHnRSiPjP5oDYRjNKx1MBos3EgwSvYfFijpIakSzOGluVAqwp1tVZaPeJJjzgtsfk28Yp95suwavFP6edpHLa8erI2N75xpOUy6hXillfJAIiOywX3UOwBR1ztUfJnGKFmcBrL3QZOsXwZ8vN5tVYY4fHsib6MkvjwfDbafQFgzJ7Udf1qXgiwMbCWH4SFWvs4q5pgaaUaRR/tjpket81YrCgEKBKpAwf4VqZErIGkhLvfqQxyuA+uRKMLgyVpn3sQ1JBHZMHBtw29aUhMCvmf5Pw36i4unSkKs5YURHmPPEb/ecBgBUlvDajMah2Hx3EszCcSIOSdWxev/TaCtS+DgDitF9US8Tpp9MzvtrSrRg5VE+fFyKu0NcK4hhsrj1ZBAj+nDWWGDouvz/AEY/zLD9HOeOfXgo89KtrHBEWFPQwz5yEDjQ7oJl07LHV9Z5giJUyXpToj/3kicbVGdfBo01Byvfhurb77dqjvpteP773aLyRVIJ83VaM5HYFsGw2rqcfXsdHs2FVumOdsqog+CgnKUHciiPh18DqWwyexMHzwuYP0qE3S3ZEa5jH3cPBTjTxJOriqljuvbbNx56x94qx6VzdG/R8D5dGWVcy8SrmplNBv17VYo0zn7OLg6JRoeEsbewSqFVr6aIftYrnltEw1LtKTfpo1bYNbghR+p50E/R637oCiSaS7U+KgJwzWjjdpcNsyMBch1SpO7SH8RwZBPsetpyaMXTfO1/jVFTCzYdyTYjCoPMTmirbHGeVolRk0fGK24XRdXPZBYyMqI+AQoaq6A6q0H3OoZRWNQJ8w7QCvthn4Bn+j4nl3aRElnm25ZgEIvs9oxrSuOizVPSQra99ylaMVDq1AcX3SA/bNA/4bS1JlvyVQcV/1pw/8DxKMPMShR3XBSSZoRfZFLmynx5XcuvdprCMqEAN5UOn8gx0CRw9bITdeCQTNjUwI5+rVBLM4tjC/ceceLxnHi1YMM448NzUkVxngPS0p7dX0kSw2LZJp/QzamMR2OseDoZJhJbgwXshbGXUxpBws67Vp4AibNnwqAd/TLOI3NRO0p71be4PhwHidnPDvuwOqpUP+N71v9LrvJslOKnrzmFbZz77HppLiOdU/433zOPrXkFTn9mrdjK8/zi853R1/8Ofpijy1DoYljrOfJmsg0cv0KU2GZdc3SYcse3ddHvfo94zqcblzl0pFe1i2lQz7Hq4Oafqny9xZ5kvAvceuNmeNrf5LEqmerDgt0NpNhiq53lCXpNbR1JwmMtgbyWDitqYBGcBEZB1mylkMyyawHtC0ZPY1mn6jkfQCzqxCnw/LmyIftBNBGysHKMwlRvJGJ+w1sbK2vzBf6wHbDulYXwt7lWG6vVsbz8I5bHe/VbHelqGVsRGzYnaDIwoY3wL0ZlgJ5vpHzH/3Yms1OkKGGBYpEUtdiLDF8SqmRFmFjncvOdg8BP2BcsRcqOBWsHhjd9E0JnsiVQvMbCCrCAGnMVTeRbnq7eUJTTWAeYZ+Z071Sg1x7zXZxTjoplVsNVTrcvdb0Rle1yTn2liT3AVHEBfE4/92shZSAt7+lbqWwsHQ1fnqchqAnR+BYKLASv62ax6385/9TV/wNs95G9+ArEUkoTukCcqqc3H937ZTtNamoPFRZq+OeCsVHz0E7yOJqLnI2tNFy0UnisbEJT44OKZA92ioa+6YVuC90IqdQYEukCAIwssT33DVUp310mWVDMUsUnWVQZEtvk7F9d+5WhwD0wjZYhjmLW17wjUy9b3fRhtPFNA1rhoZ6mB9GVYABkdUOFQVcGHvHpzVKfw5vm3Ro/g9osk4ycPAW0N5zJ4KslWCvWXmXZZwjH/h3zkXVk3WDsxfbg3YZ0Dg47bdvFbcoQUnfbyyYMc5acOa6XL1M+uX3rTJJx3RzM7f9aCnHjCs9sbiU2bDBymlADCw/MPsyrmQ2jAA8HIbRxO7XpFh5grpWTCRpLSUy27/Npcu6IuB8QGuiBuFikDgpSooX1FtA42KQGg1+5S2jQhMzdJmCj2ufYLU8w+ie5fJVNR2Yc7DJjcguXXb4qKGa/nLdSXwizzLGtvtK4qWDYuAy/vVyU75oh7ZIxoD+Oonfvjpte1Q+H1BxNqvIsG+bv7Y2IsPchq+FJhJtA9B3FLxGjhRj2WK7aF9aYWnOmRCxCF2TJgITk4iEMck+bnOrQjnIFcDVLumgZ/X7OnZDOGd51yZl8P1mTFHZH0eNPX44PJijqJ7fxbMqeC8txGMrmuDDyy9QTpZIsCh0wszWmBLvHbemL3/nvH9PQ7LV3EekiV5I6QsXnFybrZtEBcEmf5WjxeHEfNx0GtePUixEOubB5t4cMaPz2Xa6dA7qHbr2C++Mgc/aE4+g4K+d9tsAObG+pyOrNVnI+O3tRY7aBPnMeFRNaaDxvjWJA+mGXwy9E8P95qexF6ZxJgCj3e3wfemkxsr75KhtKZSzX5M04jPmsVl0DLyh81S9WiOFQAoj5Ieqk/NdvWsHDypgvYWGZ3EB0I0Irm3LSCqOnOaLGYE5rB0e8mMoR8qwd+P43enTXSohyFkENlXTdO4tune88SsbgpMkzH30wfw6V/7qNcxweQAB9cfbA+oZSb3yDJ+Xr3jn4q3n168cfeqSP6Umc5Am3yw6zOT++AQEAa1CmehtjeMXVGWXJs0eb7lqcmdMU7WjbA5GJ9RaPZdlqqRbynT+9VlglmGqsr53UfmZ05RVIDkbNapvMiFbyh8muzFN5N0WLXIcQOU8k0WE7BtyizkWBmb84+rOchkSAgot2zvCbUtfZYyLqXyNdfS7jWpAaWYRf2jT4WWhO209dUjCi0j1iY8fOoKN+a0ohU2hGpozNdMHew0JKTQ3UFKbhIun0fP18Rrb2pkHjC8my2T3jo/umMixN0i70gIntEND1eFZ4Ts+waXWp3VnFmCZnf9BnO7HoOonXD1ow8fUJfvVWgH8fI1NyDJUX3ukExaFmu498AR6+G3f/cHGIhZJ5U8qiPgiIknxnmss/jU0HlgRAzrhWzh7FD/PiOu58l/3nwISdwU4OSnfkzgQAYgehWE+39D+/3mCCBzrFpXmY9pX4KF6f0zeiVuAHT89Ui7KtuoFGy3UXm6Ee5nrUw9zL+f4WCMBtTCrheB9DV8I7B4jKOjg7a/zeuzOi6l1jApciGvnWVuuUtHkzKczBNWQ6hz1lD3lBFPyZDIOVVpL5vcIXVMowSeVTVnc4gXYZZxb8rtcf7J84SNe5PuoU0lV+kz0vFgs3oxqUGkkxOt238TUmXgUN8351TeMMVIotUPMUk1j1J/ZuUUjqbIH+YiKjdclWArUxlj0nwagKrVdCfknM5d5c3TgfQZmzYq2Wh0PuBN8sxHoIgCGAelAsRSQ3oQ2esT4WNlvjqIWYY3Z8KJhsSDwplnYQZYxbMxehGd2ieD7Aq1JvQPJNDughNqUjMYv02uQ0FMdDwC8KE/lpoU7BI0yrfGKcJtKHq7TC5CigwmYyizKlZsm+mT4fho9g0TUalb+dsCZPpE9hhZS5yGwN5n6x2p2BdNupJDlbvHUvszLhrgdVRXCDBez2HA7xHMjDw5jOLiMMO/hP0EVSJ+j6RDZb1k5wFHtrNmSIgEnnl7mZC6EYg1XNHcdthirMspycqxOljqi6rq6zD2EHAIDEoQajcs31xaR3z9Wi3X6gPTGKmXc1wrrGOCIjT6OR0o6/n1gHzMfX1JNssgyDaBMKCOR7XmMACMR8SHAyA34RFGZ8f8jvOrTJQXB5ZppE1HouYE+m9i5T6za3/nnRSgV/aNZ5Lwh+pAnB+iJnk06hXbT9vUDoBP17ifF7XVJTZNDpx2sCe0hoJc36Z9fCwtD0W5Y4R8Dt8uXY4wp+Ix52iApseJIt2AyxXgx9o2eihkJ795DuXot9qbAUVy6tqRgXf9SqILYcU7yi84wLfT/gohSU8dmm6/V7I+t1XXB3q5V+CdYEsLAOnRRbE0gvqq99Gh2otsvxIM2uDrL27G7ivYJzcdjCwdGMIX4rq6L667a/7H9S6K3a3G7oOL3W3F7gOJ3WwtFsM9cud0V4+BI8DrKyzgDEkYyaxOQ1VTnO2bygkpVxJdvrik95ZTpCVrgiHWiYfIQ3qmDx/3bTbxEniYoN4nwBpD0ljF7rWUHzjdXE5IudLp9M0lvfecIi1apf0l4vze2Ea/JLLcyPIGlswwWO/szBLDmno/XiL2dMb87aLTZa1cF/2Jqh5fdk8sv29wpIFu4vBJm5pgRvZlmPeE7eq9f5qBqSLbnA8G6c+LKhv6J+1MtxxpLBQcPXl+qM9x/DDS5fsBb7VH41YPpqxvnF1y9RZDHTnr2jqr5+wbggBrgS2f3TzNP+wPNszf3WZfD967s0FJfxnW3cjU/j0od+wD/4/ec577e8BV9wic3O0gLsCTY339BeC1Q2tYtE5k6BhfxmETz4AqK8xd7yeO2vJZYaNCo8Qw5TwTWmOp48/X1PlEENyjA4BCwwfMIUgU0HMT9hi7ZC0HLMnTOL0+TiFYP85l+mHtrapQBY8OtkGZk/+2pGxnYrf/ZU/HzXobX3Uej2lHrxNNkw9lA6pb2sXwsNMGQ/uBNV2ql1OreMONJctHtZR/7t/s/zgHIgfr5sLzjjLwKwrpQSh7qoLnZdj32s/PVsdBvN+uftTF+eyxvaHWabPytTptL/7Cs89l2sTbxN3gyr2Am64h+8pEQP22qPIhEIbWlwKdqiKfcc4Jae6WG1U+pvnMfHJhfyJ7TTpOwe1nh/n1RaYa37AvNsuVL38yI5M9V4ZbVjX2ym3HtKOFAw6jjidOmaqQYF1++igBbQZN9tdSYUft9JgM8RxeOZnPzy7WXODUU5tj/ZoSTNUe5p3aXqqJqFfMHfdvAZ+e/pDBSbCtR4CQF1W3Hm76kzS5+vj9P7nl5O/JkZRBWv+Ae+JDrPFsDWmsWCS/8TfV6WUfT02WgK/3yVs2HdDyg9cJxPHkMw7S/tpIUodlz4wlb+dCT7oPHlsnZhyPNaussXwv80fv0s93fS50z5EOnMmQL0EmG/HvT1DjQV2X0hWgOC4+V4lFxQNUWd8gzdZhB8v+4mNg38xPN5b6Fpch7UudZ1/zKrJl1EFBi/Pq3mXRZo+jHkjAU3cu+Ny1/BhQn5jZVquMgXVbWmURKClKs99qgcpbToEoRM29Lab0JUfw0Mb0DGSMAPDYgjic6XtYyO17vAlETvrrs9vY7W1sQUaVgva3PQkjdpb+JhDedSvsvIXZh7jeKGL/diBhdKcAaFfxhHLpfNON0K0Xb4NW4wYT6uEA+8ilbTI8c+jVD+uNLXwVZVZ0CaMNeDfZxqGuriVtzVLYpoGweWkzrIfea8iMoevNHBg1xElP8wZPMu+rL+vNBWiERr5W1uH069BYPD+vx7h7Cq9jIsTX4ViB5/cxuvN9i937Fbv3M3brEcg8eKXSaGEA9guDjpT1LbOEASXg9t4ayUtEScXyqFsA94sHHynrb80WxpSROL83R8TyxGqKbsaNqq8M1Npo1SANWZ/7o1OtLRKHqAPW2cTRmd2RozCJpXTujxTlyQCMJb660Y+rIkOWBkF6atJen/uCDPU2f0euoV/dY+7pfYSaJ8PSi1uJGNcEvZW+6DGmYV39IrBchFctnctRc3QNc4XK8rbPGCskeiv1kS88ksoayxgrbEdvpDcghJmSa38ArdU9scrXUUOtcK4PzogzvD2QM/sl3/higPL6LfEs5Sb+p7R5YEQZxEyB8eSw5TTz7StN1seukzbZX2Imd/XCuIyIIxMk8oI08/8vyy8SPGeWPtmOLIB61WNklvKTD0n54xc3rPnLO8Ndfq6O7IlynJ/HIVCcazY9BnR6U2aOfER0ryEdt9OfU+CWz/19baCP5qyqW6FSM0W/OnFMSN9xVMCsCxavF2h7qQ/BIAqppF8AUhcmoQmc/X3hEUyUUisNZQBoqwQSi85/fwhDsIV4xvbQhRAWTcYhCzxDXgp5gCKPIiQMNcO7tp6Z1p28KXYmTx86L4ITqfFZvrqv9ZC/Uf54qBzYHyoDyMf2dQanjwDq/tiw/y2CkHd2+q2uH+tlV+UBsB6i1yfP1OXjcaPPpprMjwtqvQP+sh7rM2kIbkHaEVqUFtcYIavh/BUi7uynLMdFts/doghIir/LTnt31rbInnQfy8ZDphwfXHL/OEzZUWAc5HUgwBG1i9fhTlwdOjBajnzQadPuZrMk6YlQFXrXPBXT9JEgCb2ASEkxxlB8K6keI2lx2kNhPsw7krjoyDBm6IHdN3TkJDd7YyzDW7y5hQ+f3kkY86OTU5yEoYUR48IHYViLzGEUIm9CQ6azU6/yj04AKim9XEWExP1an/OePH15I5hybA4BT3ei0b9mBbc5zLg7WrsYlL+15hgDoTyH0ZWpBJMVac4K562i03cxcpWSARHlmMVQkCFQQfpTr6mPv4boI3ZGhiB9h4UhLFpILhl4Go69AH2tKuzT7mpRFMRw51WlB5c7vEXRRdhJp5GhL94Llz9AGRTF8wnpbg/8REjtK3i8Rqyk1tDGRxBr1+MxOMqoRpI1M8dsAx6mLnN9X+j9Z7ISjG14FjU6pHl+C4+OZqyiS5Gm/5DwW1Sp3p8FrSCTmM8T5lesd/JddsFW6ESql3lzYrgjVWv2My6nQo3g8BcHvn5qaFqR5aGfZGvZI9pot6jDzkR8F/tY2Bn9elu0yXJyCuRnWJ87eVY/AR71NWp4d6j0mTV53/i/7KVa7O/j8qEJLgNeMrWlmSGdWALB0FRGdFuUs8GR2EdRm6+aw3KTq+xwBY1p0yeQWNUakl/QxCtucxATCJqvjxIDknf3yZcnHqmRdk/+7XXgDKUxjSdo/E1oxu3CY4gjaNiORua5DD3nBNtWNC2UvFEMKrpmEz2EwmO8WHxlfBcr/b7CWBd01IqvwvQNzy5UvWzH5Y60vlRzP6MXbhdlstiE0dEp+mhN5QYNu+xterH8yrzY/CLzK8a3W/1+oYNZNGjg53XjGxWM09AEk+Za3myHJBK1xvgfeeJqxi7oYAgxssXSMTZUxpNeDjhAIeUPjYqhzkz0FM8+IGXFZl6Uz04Q5T6y73jR80tghuvd1ikGJ0wbJXZI5fv5UHqzSNsqg63N77+tSL3i7IqrUmq2sQPool6byFS/p5yF453fKqQpV7wsBVXiLGVWj/DOANKpMpE9IsxlOGLwJvszCV9kOvQb9cb/3xGMHCITW8nLKkJy3s9BwkKXPdQY7tIUrC5c6LZRTwW8q26BfUgTJCO0oZdps23hWxcoIprOa4czkoTWWr7YQbkl/EfmE/rPteWgODVTgq05S5dDo5K82mf8U3y3sCk4ZFqs2YImAdVwWNloKConEtlqf1cOlyp3n5rL3Kv/JOvkZKhHxa7QEkp9GWx5qWr1EsrgFlrVF7GmgZWzANf+j5qx+prWIuxAxcA+EIuFXkI709aJZzn5ZQENWOh0cWEAmWHevuV6PuybJsSfWD1NXtQXGUWkRNsXsGoiaqXws+PB46IZXXoqn0yhEwe2B/jnL/Zf333R0c5lm/9z9mCcb5ya+z6HwO09dzbs/3a6v6apFDbvDsa6vJHprX4UjcLyirlGCgKy2qS14iVWW8xJegKjVUYQ8HY2YhS/QCdmpp8uT3YzL/NddrcgvPEuaxH+XoDZJHUXNxGCvJEe1FJ61Dp8sRBvuaOa7K6euAFDc4KZGRSXaEY6x1YFuLMhfBZl63pzGZUuPV1Kmm8+qs3NmJN3npq4+oAOcKOQdfga0gUfH9uXCHw1Q2KBRGPg4g2jSbm2lJ8kYrLkDV5a79gA7Q1pHg8q5rMMH8tE7KfzyBp5tLFnFqQDwG2sd6CGzV0EsjavJzIdUuhyRABt4SSG5Xz9wATtjckvT070iazaIDpzJwuv6ZKS773MxXnKbbSLqnnpBSO8S2hnZmhhwMJUhMZC34gYrXkcGIqYGoC7NxawdLBEuRONviYVUtEESDesWuDIIVra/woqRLB5bYYuSLCaDkpZSKOdIMgKhXfxLx+dOak90Afo1iTT32nxa08Jsv+4bXWROdNJqN6CSq5NxtmCMomtCTGJLunWSucFQ+QQt0h2+Uc43XfL0GPH6P7MjHuWjCWt2FM0YsBvV06eHlJLCKom1QKqDNFmY2x5rIgUn3wPB8ZlGmDh975taUY8nYGHxhdt5sdNBFT+nuZnksEpYd52pwfWrtFG9t6LAR/OkXfjedMCR8dzbfwjv2QC9FzdC2kjEOyCw3wnuAzXZnX8Vn/dBqO2u3DVNAGascCGW2ED6Msz1h+kNJCvev/nh1R0HVc9y+o3seQWIMBgFVU9/cYpNKVCvFDWX0guku+K1Bq2ZX6rCHuYKwbVCU0m8ik7IImGH5biAaDlaYPF8NpQM6BYXalDq2qxpWdzQObXzZUy3aVSM7QHJNTyQ3WDSxR2kFQF0uinay0C7ywiA3TAu/qktQ77wgfh3MmprB9w+2+XQNPJuzs9bmLAb27c9qSO28npDbmK4fZGaQw3S7XrQgNTU6nL892GP7oMfDlPg+Mqh0FqykwvuyQ2qsVAoWMgwaR0qc7hBYwv1BjZIzRThMHxKbg/VWsdy61iKHJABFoZpBd0ToNO+tVPo6QBiFlhuvP4aeNlqpz7WaApxA+mMFi6G4uGxftiAvoU+2Lo8j4GMCrkyqeMTB3pp4UkgiEwQMJNKH7+4H8xUaMRhoHiGzail552pVhKrfL84aeE/5kQhuwqaTkPgPmWEocaO4iGM9zEVk8JKDnlf/1mD4shjWbMxVGWxuTSkHSGfybwPadVXrEjWLUyvCTJUCXYBJ0mIJTNCDZ+u6z00WgRJRM0vcsk2oSVQJjUriBEN1Y2R0e/bKl+5YroxQvwYIUbN3wg68s/eqVv91kKrpwKfoVbE7W2fc0JNr/LAhYmW7HTCMCVOUtWG3pGtib/DGrIvzPd8SH/SZlfDFHeGWORQXd8ZW43UA0LTdXhgoY98dEazfY9XAw/xSR1DAwpZ7cXKoT1bN4FB6xblJ4EPjgxjuQc4ja43VcauDLzS3LbXRFEC0IK7RtVLfZ+TePD9gDFBIJHFATgtiX+/17QDR/aTg0/+7SdddBPY75gr0hO5n1akFTpNWSkoUdJC6wnkY4MFg6iDT3ntCiuNVZ3wSjEESgivtPAuj0lz/e+oh+AvwV7abejqgfRUi7PUCbRYlEzJsZsLxzJg+LGcy3DnVpdDTNzfeTeGboQQMFeGyvXaKhECI9JRf02NcWyjboOsT7k/MaiuERZzhpVqwokXEQL3wgfWHgoLOFz+x95lUhsdaaaR2+TPnsuJ3aYgh3Peb2exQyllwReCHEcMEuggQLGLy+DGaR176cG1oe5Zwt1WO0LxN9UNikvZKUjCyRB6HaKBYUTOfnuAm+LIZ1EPIXOj4b9LneKNDFSP6eLKEXewCPar9g8Gpk75m6dWm7nIUKPFbzWdsFZB0etSBKx6zE8NKIi0L4gN8kb+ATO06SFDf72qsL+uaUdZ1YCwe7SPiwx3RAVG6Ibjt95dzhOppRoubrn4Q7mkISs/Tk+fU1YdSLcH5kHDO2BygHfA6jyB0FbMX4mPabT8AhROSc8vXPElbPaJr/j3kQ83ReecY9NJcj5BpZxhxW3C1z8Y2flyuhOJ/yqmuAL9+ebdSvboU1ECgy7B+Q4vOUZ397T2Wa+u2L6D78Cy1h46gdc5ZA4mGXfTmZ+T+ewP9f1b8GV9WKkAjrO8U1sRpc+67et5xP0l7PzoW8Ihbe/8pO4cCEKkkcahMO2dESwohysabpZaOCdYdwkJIiklZH+3HJXbhI+Lt0AI5IqQRJsNfzKNi+1I5zzZ6nBB7ERC4wiDbmcTtI0nTt90whmNMLhMUto+aHcU7w9JVGeIjbeTYoynAnDt+80kdEqy70M/RMpCm4/61nPftZzPsdTFCszv7F8WTzH4wH8V/WwacyojvSuEe+k82i9sakUPcS9PWaoRzD+1Cy0gszLJ4oxF14fjhczVXgezbr5E52gk1BnSlRhjyJsWx208dqQgL1DNJlCUWk+X/lSduzLin0/QzX2FG/QsTuDxu8hCL1oXbKjxn4Iq0pv97KFKBnFtRk0AvNDe2VqkGJtBjr6vWELSpuLlg3FwRnnhdB9ss/v8/22zEA5xmp9O1MCkvSy9r0TcrHuVMVnhf9jMNEZbO5KCrpllR/pC7bSLiZB/fWKA09FLji+3rZyk1VZEW3exc4xsq6sk7l2lLfrMlpH4q0zcBabLTVVj6pPaZZoOnNcecMdZKU8tuU/r54+2a5MuQPQ9Kjf0mkJLyrO6ci8uhWndOD//eJR+V/ZpThcItLXgIqeTcPaCkJaudYTPWwh0jmCpvvwh7XIB4PEHWMQ+XvE+2OOTEbms1SSu0qK/p16+a2xcwdg4aNIQhpuK38YiGRS6xwszeUhDXmip+Nzun1b/zL6Yutxr2pETwWiK/dImrECDHPKn0si6bsehz8qRLKQdpfGt/347EJn9ZRuaLSldFRO6WFCTYGqOFQhTHjvPgRG4/ZenhgtdTCbJ1RSeAWFU/K14+wOkQxE5JGmMv0ktaWnfPqq96ldvjhbBmiTzosguECbhl/HRaMAogjOkgAM4XW2kDC2ESQvXFZE0sXm1aYy22b3e2w9rbS6s6ht8IBMqANMC9Wk4nEH6G0TH3dkEDnVVDEegixAHGLj9qfWpikKTh5QGImkESN8fWoxXmIwvGAN/sxWBNk7pKLEB7AzBKOlpbS2palF9H2yqi2sWEpqLGS/qVgqHVPlyjrCeZ3/nGKsv8BnSWRKKJqnLePVLUY41BMAYWMyzHRBDrVQBxnkAEDuTv07AiDPSgglgDpk0GVfjv33B64i2/oNP9/21bGxlbXvwre2XtMLunaxZhfsQr1hwNrd2rvS6+1CvxZrtnHrWXvmH2AbO2htPDwoj+jdKEI9r1ov5cIvLQ1vCWPYNEypBu6ZDQTXfwy5OCqoQkgNKSzHiEUxW7CjAEQNk1lwMPRdsOOCVdv+Iw1mys82cPuKymyCaHbyNaj3tl0HFzhqR/qt4DgZrWHQtRMPZXioYo4nepWl0LcrTm9QswkAudNBhv/0XAKjc5QTjLCnIg5By4oNFKOkW11sE+YMDxpxcNqGyl1Ty+68gtr28EwIfQyiHxZwrvjCGkgyUw4IqEw+QMKknexG2mYuZQphe57iHh68VtZRK+Bk/lB3tE1WA43ri+K4WjYbgLZZzcXBdzH/17KY8qLoM3iDQI3Oqj0jpDxgHB2XpkAelBmfe2rsPTRdd+JjnlvYQfSZq14ItEOul+gtt8dfaNNOR3neEMoGcWGCXPtxHJ44LMAEmpKYj7H1Da3IRaytl6j5dHT6xkQTUtIGUdg3bk0kUpefUBm2KaCx/rwYVd30D8qxlNT0kLQ45WXpQoP8uFQVR0K1LovTWLPzLb+WvPpynp06lSnWpkaIaLrH0ocJiTBXSAo2WYKc0khnZx0owsoXtl4h4KRah1N2aMCwDUvB7Wl2j0rgIO1wdEH4b1vgiurcP2CD9T4iOEEy7mtbXkIHzk4AeMZ85CjG7zJKbo+nWyXtQkql1PIUc9sLRrRHdvKTTnnwdPgE4KI/na7iWLIVeZ0ALF17Bp8L22mvLus1G0+EpPPSg28PgxmvNsHGmNXwjYv909hZwvdTGf/btaqEbHELQvDPstRIdiJzHlDN0aTwa1RgrusU1c7sAOoXLHHhYL6760XtqBMjz1UzL4yC7E78ymXr670E3Q8TLE6Q2mUvfoERzhmWaCJTVK9cmljJ8jeOpvbIM7DmcMfFqgCoaXYTzss5kXtx4PcE8ddWxlSKr3oJkJ/APsCGeVXI4XJjejhstSa9ygBzph3kNMobWMJGLUXz9D0f/is7s+HnhFm2O0tnerR8hYn12ES1uKy53ISu34unX6pT/sDpBAT/yjIzTVj8w0aMXN2+xgystdNLSF+W7isxDS1GIw3Ua6cLG66/7PQrT+w9TVnF26WvfQwUL3SSl1VxLVxfPGKy13NtflE2kzvyKP+Jqm2SYQAn3OnDYZf8ITgN2fpVx3xPyFXWPxl+D6U0Gvv2Hen2yzXPxM3VC3gztWUPs/qwVnlOEltQdNLGzG9mUpw2YDo7nCi31nX21lg85KZoSl8PJuh1j4IOD8GKvFsXsxt5p7SQCXzIvqIrHRst+LaGgOoNVknWHpcejqIE/8z4fBZtEqn+6jI37Dwy51sIpLocs054mbi176BKsPyqMfLiqt1FMoElr3dZ68U6vwbOa78UPfjuSp0URMqjU42pndbkTF9aFzi9XxTfDs3+rfGELbFhpWwCjJwPqpobEYOjFcfXaSHG0nny+C4jvVcuIIBFuSTzaS3Er5UCjNTSTL9exEaR4XyaqBDGNrDpZUkPfOaHf3nSwIdLSIiVebAsWpFSJ8a1VSgzrykd7bePT+LC4XNRA0WyL/IXEWX1dg0rIJqlKs0ZqmKaxDIfyCcHJB/rF6eAVlOgxoXt8lIzF5P5M19s6Whpv3jq5GeNnVsOWL7JjAa8mfp23TbbYizgncfDq4Z/wSsEOP0PYdXhkzRV/PEfUni7iIGIecSty3lpw6/Ri5vr86sqf3Qs9bgMO3xlojeyaf+Sbzk8Abw+emg6bJEdUlzziMZFMi9V4xVFc7vZKlX+Lb+wWyOg3BYGuS0JznqD74fBojJ8gOixiFzYSVOl85bmc0UYVstatNCtEDbaJJxtk43apgMOFPvhIdLz5hbkITqY4mex1puesC2bAZnCEUI+CX2Ji5b/7ADxmgukNL9u2LcT7uGYyXI/O2HNPlmlP4kUyKvivnV8Z6LpxfvmsYF5wqzpB37JCZlzh4Ohp7c8uqJcDqxyfKgfSYkmJL9M+SQHOO4eJVhvWunw2KoMppfExI9D5p7dRNoGvVO3twf81w4l4vJKKC6OdjUz3W89jkf5Z9dF67DVGNT48sxdiTneDUASvh90+ucw1wxGMtsoaZF3dVa+qHimrIRlSBP5cQh4tgFDAlyam1U2w4UYJujLHsewxxEvYR3L3uoFUw2fmrLLAYyzVHKnip1wsCWm/Zw4tk+9PHNjYwRw0MwJmDblAgShHKQcL7Fjt6GumSoiqjAaLBk3uCh9NQ9BCOHmjArk5HKVY/BBo8NxXxSFIV1H1B0HLnZFxVncgjn4mNrACzIPqGPHxGZFF1wNuq3713KTboT2bmC/sjUAPN/M44cjnhktofS3cOtOhd8Pemh+oyqtrA6iH8es8nTysaaUItV2PJDkvtV71c06CEXhMxVHtofIrOVJ+K0p4uOi/RDwRxSbJcgJjW0/xLqVOuWKfy6BiYP6GMfiw/THg7Ix0LvQksXmqfwnhweBnI0ZFDquHiZo8wiBABdrBUglDXPxAW+f2Wk8I5XXqQtRG3BnVc/iN2y9wt60+DF/cv9kLoOQDYt6Z9Ot05lf+pSZTMYzG5XSi3ADvHgzrBj0MHOER6uRejgetaMIOx1WxvWlZzjS75FGkapyfLA5p31x2nTbiulfxufbHp32DWEpMXsCE074L/THjwCHUNeBkBVAuvtw4cfkMNHJP754V/nUXFuV8uQ8NHCACyH5qGk8okihFLU4EJMbkGJggJ6LEGb9yi7bByf431cj56d4GpnePPU8iqu/qYXEyLvaBKRP7jzf0w4+qdz4wT9wNHnc4S74+T5vl5cAf6B13Gn4+nu93YfkzvkPDGSky62HNFXMu8UCPsMQMnKJZMwGo+JyX5AdAoq71mJtAMiTgLHOnew0Hx4IRvprP9kvm3jkvmr/GNmvPBh1M8qkQyijNENRaciTWVERLQA=","base64")).toString()),eM)});var vle=w((oM,aM)=>{(function(r){oM&&typeof oM=="object"&&typeof aM<"u"?aM.exports=r():typeof define=="function"&&define.amd?define([],r):typeof window<"u"?window.isWindows=r():typeof global<"u"?global.isWindows=r():typeof self<"u"?self.isWindows=r():this.isWindows=r()})(function(){"use strict";return function(){return process&&(process.platform==="win32"||/^(msys|cygwin)$/.test(process.env.OSTYPE))}})});var kle=w((T0t,Dle)=>{"use strict";AM.ifExists=wze;var np=J("util"),Ts=J("path"),xle=vle(),Eze=/^#!\s*(?:\/usr\/bin\/env)?\s*([^ \t]+)(.*)$/,Ize={createPwshFile:!0,createCmdFile:xle(),fs:J("fs")},yze=new Map([[".js","node"],[".cjs","node"],[".mjs","node"],[".cmd","cmd"],[".bat","cmd"],[".ps1","pwsh"],[".sh","sh"]]);function Ple(r){let e={...Ize,...r},t=e.fs;return e.fs_={chmod:t.chmod?np.promisify(t.chmod):async()=>{},mkdir:np.promisify(t.mkdir),readFile:np.promisify(t.readFile),stat:np.promisify(t.stat),unlink:np.promisify(t.unlink),writeFile:np.promisify(t.writeFile)},e}async function AM(r,e,t){let i=Ple(t);await i.fs_.stat(r),await bze(r,e,i)}function wze(r,e,t){return AM(r,e,t).catch(()=>{})}function Bze(r,e){return e.fs_.unlink(r).catch(()=>{})}async function bze(r,e,t){let i=await Pze(r,t);return await Qze(e,t),Sze(r,e,i,t)}function Qze(r,e){return e.fs_.mkdir(Ts.dirname(r),{recursive:!0})}function Sze(r,e,t,i){let n=Ple(i),s=[{generator:Rze,extension:""}];return n.createCmdFile&&s.push({generator:kze,extension:".cmd"}),n.createPwshFile&&s.push({generator:Fze,extension:".ps1"}),Promise.all(s.map(o=>Dze(r,e+o.extension,t,o.generator,n)))}function vze(r,e){return Bze(r,e)}function xze(r,e){return Nze(r,e)}async function Pze(r,e){let n=(await e.fs_.readFile(r,"utf8")).trim().split(/\r*\n/)[0].match(Eze);if(!n){let s=Ts.extname(r).toLowerCase();return{program:yze.get(s)||null,additionalArgs:""}}return{program:n[1],additionalArgs:n[2]}}async function Dze(r,e,t,i,n){let s=n.preserveSymlinks?"--preserve-symlinks":"",o=[t.additionalArgs,s].filter(a=>a).join(" ");return n=Object.assign({},n,{prog:t.program,args:o}),await vze(e,n),await n.fs_.writeFile(e,i(r,e,n),"utf8"),xze(e,n)}function kze(r,e,t){let n=Ts.relative(Ts.dirname(e),r).split("/").join("\\"),s=Ts.isAbsolute(n)?`"${n}"`:`"%~dp0\\${n}"`,o,a=t.prog,l=t.args||"",c=lM(t.nodePath).win32;a?(o=`"%~dp0\\${a}.exe"`,n=s):(a=s,l="",n="");let u=t.progArgs?`${t.progArgs.join(" ")} `:"",g=c?`@SET NODE_PATH=${c}\r
-`:"";return o?g+=`@IF EXIST ${o} (\r
-  ${o} ${l} ${n} ${u}%*\r
-) ELSE (\r
-  @SETLOCAL\r
-  @SET PATHEXT=%PATHEXT:;.JS;=;%\r
-  ${a} ${l} ${n} ${u}%*\r
-)\r
-`:g+=`@${a} ${l} ${n} ${u}%*\r
-`,g}function Rze(r,e,t){let i=Ts.relative(Ts.dirname(e),r),n=t.prog&&t.prog.split("\\").join("/"),s;i=i.split("\\").join("/");let o=Ts.isAbsolute(i)?`"${i}"`:`"$basedir/${i}"`,a=t.args||"",l=lM(t.nodePath).posix;n?(s=`"$basedir/${t.prog}"`,i=o):(n=o,a="",i="");let c=t.progArgs?`${t.progArgs.join(" ")} `:"",u=`#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\\\,/,g')")
-
-case \`uname\` in
-    *CYGWIN*) basedir=\`cygpath -w "$basedir"\`;;
-esac
-
-`,g=t.nodePath?`export NODE_PATH="${l}"
-`:"";return s?u+=`${g}if [ -x ${s} ]; then
-  exec ${s} ${a} ${i} ${c}"$@"
-else
-  exec ${n} ${a} ${i} ${c}"$@"
-fi
-`:u+=`${g}${n} ${a} ${i} ${c}"$@"
-exit $?
-`,u}function Fze(r,e,t){let i=Ts.relative(Ts.dirname(e),r),n=t.prog&&t.prog.split("\\").join("/"),s=n&&`"${n}$exe"`,o;i=i.split("\\").join("/");let a=Ts.isAbsolute(i)?`"${i}"`:`"$basedir/${i}"`,l=t.args||"",c=lM(t.nodePath),u=c.win32,g=c.posix;s?(o=`"$basedir/${t.prog}$exe"`,i=a):(s=a,l="",i="");let f=t.progArgs?`${t.progArgs.join(" ")} `:"",h=`#!/usr/bin/env pwsh
-$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
-
-$exe=""
-${t.nodePath?`$env_node_path=$env:NODE_PATH
-$env:NODE_PATH="${u}"
-`:""}if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
-  # Fix case when both the Windows and Linux builds of Node
-  # are installed in the same directory
-  $exe=".exe"
-}`;return t.nodePath&&(h+=` else {
-  $env:NODE_PATH="${g}"
-}`),o?h+=`
-$ret=0
-if (Test-Path ${o}) {
-  # Support pipeline input
-  if ($MyInvocation.ExpectingInput) {
-    $input | & ${o} ${l} ${i} ${f}$args
-  } else {
-    & ${o} ${l} ${i} ${f}$args
-  }
-  $ret=$LASTEXITCODE
-} else {
-  # Support pipeline input
-  if ($MyInvocation.ExpectingInput) {
-    $input | & ${s} ${l} ${i} ${f}$args
-  } else {
-    & ${s} ${l} ${i} ${f}$args
-  }
-  $ret=$LASTEXITCODE
-}
-${t.nodePath?`$env:NODE_PATH=$env_node_path
-`:""}exit $ret
-`:h+=`
-# Support pipeline input
-if ($MyInvocation.ExpectingInput) {
-  $input | & ${s} ${l} ${i} ${f}$args
-} else {
-  & ${s} ${l} ${i} ${f}$args
-}
-${t.nodePath?`$env:NODE_PATH=$env_node_path
-`:""}exit $LASTEXITCODE
-`,h}function Nze(r,e){return e.fs_.chmod(r,493)}function lM(r){if(!r)return{win32:"",posix:""};let e=typeof r=="string"?r.split(Ts.delimiter):Array.from(r),t={};for(let i=0;i<e.length;i++){let n=e[i].split("/").join("\\"),s=xle()?e[i].split("\\").join("/").replace(/^([^:\\/]*):/,(o,a)=>`/mnt/${a.toLowerCase()}`):e[i];t.win32=t.win32?`${t.win32};${n}`:n,t.posix=t.posix?`${t.posix}:${s}`:s,t[i]={win32:n,posix:s}}return t}Dle.exports=AM});var yM=w(($bt,Zle)=>{Zle.exports=J("stream")});var tce=w((eQt,ece)=>{"use strict";function _le(r,e){var t=Object.keys(r);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(r);e&&(i=i.filter(function(n){return Object.getOwnPropertyDescriptor(r,n).enumerable})),t.push.apply(t,i)}return t}function e5e(r){for(var e=1;e<arguments.length;e++){var t=arguments[e]!=null?arguments[e]:{};e%2?_le(Object(t),!0).forEach(function(i){t5e(r,i,t[i])}):Object.getOwnPropertyDescriptors?Object.defineProperties(r,Object.getOwnPropertyDescriptors(t)):_le(Object(t)).forEach(function(i){Object.defineProperty(r,i,Object.getOwnPropertyDescriptor(t,i))})}return r}function t5e(r,e,t){return e in r?Object.defineProperty(r,e,{value:t,enumerable:!0,configurable:!0,writable:!0}):r[e]=t,r}function r5e(r,e){if(!(r instanceof e))throw new TypeError("Cannot call a class as a function")}function $le(r,e){for(var t=0;t<e.length;t++){var i=e[t];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(r,i.key,i)}}function i5e(r,e,t){return e&&$le(r.prototype,e),t&&$le(r,t),r}var n5e=J("buffer"),pQ=n5e.Buffer,s5e=J("util"),wM=s5e.inspect,o5e=wM&&wM.custom||"inspect";function a5e(r,e,t){pQ.prototype.copy.call(r,e,t)}ece.exports=function(){function r(){r5e(this,r),this.head=null,this.tail=null,this.length=0}return i5e(r,[{key:"push",value:function(t){var i={data:t,next:null};this.length>0?this.tail.next=i:this.head=i,this.tail=i,++this.length}},{key:"unshift",value:function(t){var i={data:t,next:this.head};this.length===0&&(this.tail=i),this.head=i,++this.length}},{key:"shift",value:function(){if(this.length!==0){var t=this.head.data;return this.length===1?this.head=this.tail=null:this.head=this.head.next,--this.length,t}}},{key:"clear",value:function(){this.head=this.tail=null,this.length=0}},{key:"join",value:function(t){if(this.length===0)return"";for(var i=this.head,n=""+i.data;i=i.next;)n+=t+i.data;return n}},{key:"concat",value:function(t){if(this.length===0)return pQ.alloc(0);for(var i=pQ.allocUnsafe(t>>>0),n=this.head,s=0;n;)a5e(n.data,i,s),s+=n.data.length,n=n.next;return i}},{key:"consume",value:function(t,i){var n;return t<this.head.data.length?(n=this.head.data.slice(0,t),this.head.data=this.head.data.slice(t)):t===this.head.data.length?n=this.shift():n=i?this._getString(t):this._getBuffer(t),n}},{key:"first",value:function(){return this.head.data}},{key:"_getString",value:function(t){var i=this.head,n=1,s=i.data;for(t-=s.length;i=i.next;){var o=i.data,a=t>o.length?o.length:t;if(a===o.length?s+=o:s+=o.slice(0,t),t-=a,t===0){a===o.length?(++n,i.next?this.head=i.next:this.head=this.tail=null):(this.head=i,i.data=o.slice(a));break}++n}return this.length-=n,s}},{key:"_getBuffer",value:function(t){var i=pQ.allocUnsafe(t),n=this.head,s=1;for(n.data.copy(i),t-=n.data.length;n=n.next;){var o=n.data,a=t>o.length?o.length:t;if(o.copy(i,i.length-t,0,a),t-=a,t===0){a===o.length?(++s,n.next?this.head=n.next:this.head=this.tail=null):(this.head=n,n.data=o.slice(a));break}++s}return this.length-=s,i}},{key:o5e,value:function(t,i){return wM(this,e5e({},i,{depth:0,customInspect:!1}))}}]),r}()});var bM=w((tQt,ice)=>{"use strict";function A5e(r,e){var t=this,i=this._readableState&&this._readableState.destroyed,n=this._writableState&&this._writableState.destroyed;return i||n?(e?e(r):r&&(this._writableState?this._writableState.errorEmitted||(this._writableState.errorEmitted=!0,process.nextTick(BM,this,r)):process.nextTick(BM,this,r)),this):(this._readableState&&(this._readableState.destroyed=!0),this._writableState&&(this._writableState.destroyed=!0),this._destroy(r||null,function(s){!e&&s?t._writableState?t._writableState.errorEmitted?process.nextTick(dQ,t):(t._writableState.errorEmitted=!0,process.nextTick(rce,t,s)):process.nextTick(rce,t,s):e?(process.nextTick(dQ,t),e(s)):process.nextTick(dQ,t)}),this)}function rce(r,e){BM(r,e),dQ(r)}function dQ(r){r._writableState&&!r._writableState.emitClose||r._readableState&&!r._readableState.emitClose||r.emit("close")}function l5e(){this._readableState&&(this._readableState.destroyed=!1,this._readableState.reading=!1,this._readableState.ended=!1,this._readableState.endEmitted=!1),this._writableState&&(this._writableState.destroyed=!1,this._writableState.ended=!1,this._writableState.ending=!1,this._writableState.finalCalled=!1,this._writableState.prefinished=!1,this._writableState.finished=!1,this._writableState.errorEmitted=!1)}function BM(r,e){r.emit("error",e)}function c5e(r,e){var t=r._readableState,i=r._writableState;t&&t.autoDestroy||i&&i.autoDestroy?r.destroy(e):r.emit("error",e)}ice.exports={destroy:A5e,undestroy:l5e,errorOrDestroy:c5e}});var Sl=w((rQt,oce)=>{"use strict";var sce={};function Os(r,e,t){t||(t=Error);function i(s,o,a){return typeof e=="string"?e:e(s,o,a)}class n extends t{constructor(o,a,l){super(i(o,a,l))}}n.prototype.name=t.name,n.prototype.code=r,sce[r]=n}function nce(r,e){if(Array.isArray(r)){let t=r.length;return r=r.map(i=>String(i)),t>2?`one of ${e} ${r.slice(0,t-1).join(", ")}, or `+r[t-1]:t===2?`one of ${e} ${r[0]} or ${r[1]}`:`of ${e} ${r[0]}`}else return`of ${e} ${String(r)}`}function u5e(r,e,t){return r.substr(!t||t<0?0:+t,e.length)===e}function g5e(r,e,t){return(t===void 0||t>r.length)&&(t=r.length),r.substring(t-e.length,t)===e}function f5e(r,e,t){return typeof t!="number"&&(t=0),t+e.length>r.length?!1:r.indexOf(e,t)!==-1}Os("ERR_INVALID_OPT_VALUE",function(r,e){return'The value "'+e+'" is invalid for option "'+r+'"'},TypeError);Os("ERR_INVALID_ARG_TYPE",function(r,e,t){let i;typeof e=="string"&&u5e(e,"not ")?(i="must not be",e=e.replace(/^not /,"")):i="must be";let n;if(g5e(r," argument"))n=`The ${r} ${i} ${nce(e,"type")}`;else{let s=f5e(r,".")?"property":"argument";n=`The "${r}" ${s} ${i} ${nce(e,"type")}`}return n+=`. Received type ${typeof t}`,n},TypeError);Os("ERR_STREAM_PUSH_AFTER_EOF","stream.push() after EOF");Os("ERR_METHOD_NOT_IMPLEMENTED",function(r){return"The "+r+" method is not implemented"});Os("ERR_STREAM_PREMATURE_CLOSE","Premature close");Os("ERR_STREAM_DESTROYED",function(r){return"Cannot call "+r+" after a stream was destroyed"});Os("ERR_MULTIPLE_CALLBACK","Callback called multiple times");Os("ERR_STREAM_CANNOT_PIPE","Cannot pipe, not readable");Os("ERR_STREAM_WRITE_AFTER_END","write after end");Os("ERR_STREAM_NULL_VALUES","May not write null values to stream",TypeError);Os("ERR_UNKNOWN_ENCODING",function(r){return"Unknown encoding: "+r},TypeError);Os("ERR_STREAM_UNSHIFT_AFTER_END_EVENT","stream.unshift() after end event");oce.exports.codes=sce});var QM=w((iQt,ace)=>{"use strict";var h5e=Sl().codes.ERR_INVALID_OPT_VALUE;function p5e(r,e,t){return r.highWaterMark!=null?r.highWaterMark:e?r[t]:null}function d5e(r,e,t,i){var n=p5e(e,i,t);if(n!=null){if(!(isFinite(n)&&Math.floor(n)===n)||n<0){var s=i?t:"highWaterMark";throw new h5e(s,n)}return Math.floor(n)}return r.objectMode?16:16*1024}ace.exports={getHighWaterMark:d5e}});var Ace=w((nQt,SM)=>{typeof Object.create=="function"?SM.exports=function(e,t){t&&(e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}))}:SM.exports=function(e,t){if(t){e.super_=t;var i=function(){};i.prototype=t.prototype,e.prototype=new i,e.prototype.constructor=e}}});var vl=w((sQt,xM)=>{try{if(vM=J("util"),typeof vM.inherits!="function")throw"";xM.exports=vM.inherits}catch{xM.exports=Ace()}var vM});var cce=w((oQt,lce)=>{lce.exports=J("util").deprecate});var kM=w((aQt,dce)=>{"use strict";dce.exports=Lr;function gce(r){var e=this;this.next=null,this.entry=null,this.finish=function(){Y5e(e,r)}}var ap;Lr.WritableState=dE;var C5e={deprecate:cce()},fce=yM(),mQ=J("buffer").Buffer,m5e=global.Uint8Array||function(){};function E5e(r){return mQ.from(r)}function I5e(r){return mQ.isBuffer(r)||r instanceof m5e}var DM=bM(),y5e=QM(),w5e=y5e.getHighWaterMark,xl=Sl().codes,B5e=xl.ERR_INVALID_ARG_TYPE,b5e=xl.ERR_METHOD_NOT_IMPLEMENTED,Q5e=xl.ERR_MULTIPLE_CALLBACK,S5e=xl.ERR_STREAM_CANNOT_PIPE,v5e=xl.ERR_STREAM_DESTROYED,x5e=xl.ERR_STREAM_NULL_VALUES,P5e=xl.ERR_STREAM_WRITE_AFTER_END,D5e=xl.ERR_UNKNOWN_ENCODING,Ap=DM.errorOrDestroy;vl()(Lr,fce);function k5e(){}function dE(r,e,t){ap=ap||qu(),r=r||{},typeof t!="boolean"&&(t=e instanceof ap),this.objectMode=!!r.objectMode,t&&(this.objectMode=this.objectMode||!!r.writableObjectMode),this.highWaterMark=w5e(this,r,"writableHighWaterMark",t),this.finalCalled=!1,this.needDrain=!1,this.ending=!1,this.ended=!1,this.finished=!1,this.destroyed=!1;var i=r.decodeStrings===!1;this.decodeStrings=!i,this.defaultEncoding=r.defaultEncoding||"utf8",this.length=0,this.writing=!1,this.corked=0,this.sync=!0,this.bufferProcessing=!1,this.onwrite=function(n){M5e(e,n)},this.writecb=null,this.writelen=0,this.bufferedRequest=null,this.lastBufferedRequest=null,this.pendingcb=0,this.prefinished=!1,this.errorEmitted=!1,this.emitClose=r.emitClose!==!1,this.autoDestroy=!!r.autoDestroy,this.bufferedRequestCount=0,this.corkedRequestsFree=new gce(this)}dE.prototype.getBuffer=function(){for(var e=this.bufferedRequest,t=[];e;)t.push(e),e=e.next;return t};(function(){try{Object.defineProperty(dE.prototype,"buffer",{get:C5e.deprecate(function(){return this.getBuffer()},"_writableState.buffer is deprecated. Use _writableState.getBuffer instead.","DEP0003")})}catch{}})();var CQ;typeof Symbol=="function"&&Symbol.hasInstance&&typeof Function.prototype[Symbol.hasInstance]=="function"?(CQ=Function.prototype[Symbol.hasInstance],Object.defineProperty(Lr,Symbol.hasInstance,{value:function(e){return CQ.call(this,e)?!0:this!==Lr?!1:e&&e._writableState instanceof dE}})):CQ=function(e){return e instanceof this};function Lr(r){ap=ap||qu();var e=this instanceof ap;if(!e&&!CQ.call(Lr,this))return new Lr(r);this._writableState=new dE(r,this,e),this.writable=!0,r&&(typeof r.write=="function"&&(this._write=r.write),typeof r.writev=="function"&&(this._writev=r.writev),typeof r.destroy=="function"&&(this._destroy=r.destroy),typeof r.final=="function"&&(this._final=r.final)),fce.call(this)}Lr.prototype.pipe=function(){Ap(this,new S5e)};function R5e(r,e){var t=new P5e;Ap(r,t),process.nextTick(e,t)}function F5e(r,e,t,i){var n;return t===null?n=new x5e:typeof t!="string"&&!e.objectMode&&(n=new B5e("chunk",["string","Buffer"],t)),n?(Ap(r,n),process.nextTick(i,n),!1):!0}Lr.prototype.write=function(r,e,t){var i=this._writableState,n=!1,s=!i.objectMode&&I5e(r);return s&&!mQ.isBuffer(r)&&(r=E5e(r)),typeof e=="function"&&(t=e,e=null),s?e="buffer":e||(e=i.defaultEncoding),typeof t!="function"&&(t=k5e),i.ending?R5e(this,t):(s||F5e(this,i,r,t))&&(i.pendingcb++,n=T5e(this,i,s,r,e,t)),n};Lr.prototype.cork=function(){this._writableState.corked++};Lr.prototype.uncork=function(){var r=this._writableState;r.corked&&(r.corked--,!r.writing&&!r.corked&&!r.bufferProcessing&&r.bufferedRequest&&hce(this,r))};Lr.prototype.setDefaultEncoding=function(e){if(typeof e=="string"&&(e=e.toLowerCase()),!(["hex","utf8","utf-8","ascii","binary","base64","ucs2","ucs-2","utf16le","utf-16le","raw"].indexOf((e+"").toLowerCase())>-1))throw new D5e(e);return this._writableState.defaultEncoding=e,this};Object.defineProperty(Lr.prototype,"writableBuffer",{enumerable:!1,get:function(){return this._writableState&&this._writableState.getBuffer()}});function N5e(r,e,t){return!r.objectMode&&r.decodeStrings!==!1&&typeof e=="string"&&(e=mQ.from(e,t)),e}Object.defineProperty(Lr.prototype,"writableHighWaterMark",{enumerable:!1,get:function(){return this._writableState.highWaterMark}});function T5e(r,e,t,i,n,s){if(!t){var o=N5e(e,i,n);i!==o&&(t=!0,n="buffer",i=o)}var a=e.objectMode?1:i.length;e.length+=a;var l=e.length<e.highWaterMark;if(l||(e.needDrain=!0),e.writing||e.corked){var c=e.lastBufferedRequest;e.lastBufferedRequest={chunk:i,encoding:n,isBuf:t,callback:s,next:null},c?c.next=e.lastBufferedRequest:e.bufferedRequest=e.lastBufferedRequest,e.bufferedRequestCount+=1}else PM(r,e,!1,a,i,n,s);return l}function PM(r,e,t,i,n,s,o){e.writelen=i,e.writecb=o,e.writing=!0,e.sync=!0,e.destroyed?e.onwrite(new v5e("write")):t?r._writev(n,e.onwrite):r._write(n,s,e.onwrite),e.sync=!1}function L5e(r,e,t,i,n){--e.pendingcb,t?(process.nextTick(n,i),process.nextTick(pE,r,e),r._writableState.errorEmitted=!0,Ap(r,i)):(n(i),r._writableState.errorEmitted=!0,Ap(r,i),pE(r,e))}function O5e(r){r.writing=!1,r.writecb=null,r.length-=r.writelen,r.writelen=0}function M5e(r,e){var t=r._writableState,i=t.sync,n=t.writecb;if(typeof n!="function")throw new Q5e;if(O5e(t),e)L5e(r,t,i,e,n);else{var s=pce(t)||r.destroyed;!s&&!t.corked&&!t.bufferProcessing&&t.bufferedRequest&&hce(r,t),i?process.nextTick(uce,r,t,s,n):uce(r,t,s,n)}}function uce(r,e,t,i){t||K5e(r,e),e.pendingcb--,i(),pE(r,e)}function K5e(r,e){e.length===0&&e.needDrain&&(e.needDrain=!1,r.emit("drain"))}function hce(r,e){e.bufferProcessing=!0;var t=e.bufferedRequest;if(r._writev&&t&&t.next){var i=e.bufferedRequestCount,n=new Array(i),s=e.corkedRequestsFree;s.entry=t;for(var o=0,a=!0;t;)n[o]=t,t.isBuf||(a=!1),t=t.next,o+=1;n.allBuffers=a,PM(r,e,!0,e.length,n,"",s.finish),e.pendingcb++,e.lastBufferedRequest=null,s.next?(e.corkedRequestsFree=s.next,s.next=null):e.corkedRequestsFree=new gce(e),e.bufferedRequestCount=0}else{for(;t;){var l=t.chunk,c=t.encoding,u=t.callback,g=e.objectMode?1:l.length;if(PM(r,e,!1,g,l,c,u),t=t.next,e.bufferedRequestCount--,e.writing)break}t===null&&(e.lastBufferedRequest=null)}e.bufferedRequest=t,e.bufferProcessing=!1}Lr.prototype._write=function(r,e,t){t(new b5e("_write()"))};Lr.prototype._writev=null;Lr.prototype.end=function(r,e,t){var i=this._writableState;return typeof r=="function"?(t=r,r=null,e=null):typeof e=="function"&&(t=e,e=null),r!=null&&this.write(r,e),i.corked&&(i.corked=1,this.uncork()),i.ending||G5e(this,i,t),this};Object.defineProperty(Lr.prototype,"writableLength",{enumerable:!1,get:function(){return this._writableState.length}});function pce(r){return r.ending&&r.length===0&&r.bufferedRequest===null&&!r.finished&&!r.writing}function U5e(r,e){r._final(function(t){e.pendingcb--,t&&Ap(r,t),e.prefinished=!0,r.emit("prefinish"),pE(r,e)})}function H5e(r,e){!e.prefinished&&!e.finalCalled&&(typeof r._final=="function"&&!e.destroyed?(e.pendingcb++,e.finalCalled=!0,process.nextTick(U5e,r,e)):(e.prefinished=!0,r.emit("prefinish")))}function pE(r,e){var t=pce(e);if(t&&(H5e(r,e),e.pendingcb===0&&(e.finished=!0,r.emit("finish"),e.autoDestroy))){var i=r._readableState;(!i||i.autoDestroy&&i.endEmitted)&&r.destroy()}return t}function G5e(r,e,t){e.ending=!0,pE(r,e),t&&(e.finished?process.nextTick(t):r.once("finish",t)),e.ended=!0,r.writable=!1}function Y5e(r,e,t){var i=r.entry;for(r.entry=null;i;){var n=i.callback;e.pendingcb--,n(t),i=i.next}e.corkedRequestsFree.next=r}Object.defineProperty(Lr.prototype,"destroyed",{enumerable:!1,get:function(){return this._writableState===void 0?!1:this._writableState.destroyed},set:function(e){!this._writableState||(this._writableState.destroyed=e)}});Lr.prototype.destroy=DM.destroy;Lr.prototype._undestroy=DM.undestroy;Lr.prototype._destroy=function(r,e){e(r)}});var qu=w((AQt,mce)=>{"use strict";var j5e=Object.keys||function(r){var e=[];for(var t in r)e.push(t);return e};mce.exports=Aa;var Cce=NM(),FM=kM();vl()(Aa,Cce);for(RM=j5e(FM.prototype),EQ=0;EQ<RM.length;EQ++)IQ=RM[EQ],Aa.prototype[IQ]||(Aa.prototype[IQ]=FM.prototype[IQ]);var RM,IQ,EQ;function Aa(r){if(!(this instanceof Aa))return new Aa(r);Cce.call(this,r),FM.call(this,r),this.allowHalfOpen=!0,r&&(r.readable===!1&&(this.readable=!1),r.writable===!1&&(this.writable=!1),r.allowHalfOpen===!1&&(this.allowHalfOpen=!1,this.once("end",q5e)))}Object.defineProperty(Aa.prototype,"writableHighWaterMark",{enumerable:!1,get:function(){return this._writableState.highWaterMark}});Object.defineProperty(Aa.prototype,"writableBuffer",{enumerable:!1,get:function(){return this._writableState&&this._writableState.getBuffer()}});Object.defineProperty(Aa.prototype,"writableLength",{enumerable:!1,get:function(){return this._writableState.length}});function q5e(){this._writableState.ended||process.nextTick(J5e,this)}function J5e(r){r.end()}Object.defineProperty(Aa.prototype,"destroyed",{enumerable:!1,get:function(){return this._readableState===void 0||this._writableState===void 0?!1:this._readableState.destroyed&&this._writableState.destroyed},set:function(e){this._readableState===void 0||this._writableState===void 0||(this._readableState.destroyed=e,this._writableState.destroyed=e)}})});var yce=w((TM,Ice)=>{var yQ=J("buffer"),fA=yQ.Buffer;function Ece(r,e){for(var t in r)e[t]=r[t]}fA.from&&fA.alloc&&fA.allocUnsafe&&fA.allocUnsafeSlow?Ice.exports=yQ:(Ece(yQ,TM),TM.Buffer=lp);function lp(r,e,t){return fA(r,e,t)}Ece(fA,lp);lp.from=function(r,e,t){if(typeof r=="number")throw new TypeError("Argument must not be a number");return fA(r,e,t)};lp.alloc=function(r,e,t){if(typeof r!="number")throw new TypeError("Argument must be a number");var i=fA(r);return e!==void 0?typeof t=="string"?i.fill(e,t):i.fill(e):i.fill(0),i};lp.allocUnsafe=function(r){if(typeof r!="number")throw new TypeError("Argument must be a number");return fA(r)};lp.allocUnsafeSlow=function(r){if(typeof r!="number")throw new TypeError("Argument must be a number");return yQ.SlowBuffer(r)}});var MM=w(Bce=>{"use strict";var OM=yce().Buffer,wce=OM.isEncoding||function(r){switch(r=""+r,r&&r.toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":case"raw":return!0;default:return!1}};function W5e(r){if(!r)return"utf8";for(var e;;)switch(r){case"utf8":case"utf-8":return"utf8";case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return"utf16le";case"latin1":case"binary":return"latin1";case"base64":case"ascii":case"hex":return r;default:if(e)return;r=(""+r).toLowerCase(),e=!0}}function z5e(r){var e=W5e(r);if(typeof e!="string"&&(OM.isEncoding===wce||!wce(r)))throw new Error("Unknown encoding: "+r);return e||r}Bce.StringDecoder=CE;function CE(r){this.encoding=z5e(r);var e;switch(this.encoding){case"utf16le":this.text=e6e,this.end=t6e,e=4;break;case"utf8":this.fillLast=Z5e,e=4;break;case"base64":this.text=r6e,this.end=i6e,e=3;break;default:this.write=n6e,this.end=s6e;return}this.lastNeed=0,this.lastTotal=0,this.lastChar=OM.allocUnsafe(e)}CE.prototype.write=function(r){if(r.length===0)return"";var e,t;if(this.lastNeed){if(e=this.fillLast(r),e===void 0)return"";t=this.lastNeed,this.lastNeed=0}else t=0;return t<r.length?e?e+this.text(r,t):this.text(r,t):e||""};CE.prototype.end=$5e;CE.prototype.text=_5e;CE.prototype.fillLast=function(r){if(this.lastNeed<=r.length)return r.copy(this.lastChar,this.lastTotal-this.lastNeed,0,this.lastNeed),this.lastChar.toString(this.encoding,0,this.lastTotal);r.copy(this.lastChar,this.lastTotal-this.lastNeed,0,r.length),this.lastNeed-=r.length};function LM(r){return r<=127?0:r>>5===6?2:r>>4===14?3:r>>3===30?4:r>>6===2?-1:-2}function V5e(r,e,t){var i=e.length-1;if(i<t)return 0;var n=LM(e[i]);return n>=0?(n>0&&(r.lastNeed=n-1),n):--i<t||n===-2?0:(n=LM(e[i]),n>=0?(n>0&&(r.lastNeed=n-2),n):--i<t||n===-2?0:(n=LM(e[i]),n>=0?(n>0&&(n===2?n=0:r.lastNeed=n-3),n):0))}function X5e(r,e,t){if((e[0]&192)!==128)return r.lastNeed=0,"\uFFFD";if(r.lastNeed>1&&e.length>1){if((e[1]&192)!==128)return r.lastNeed=1,"\uFFFD";if(r.lastNeed>2&&e.length>2&&(e[2]&192)!==128)return r.lastNeed=2,"\uFFFD"}}function Z5e(r){var e=this.lastTotal-this.lastNeed,t=X5e(this,r,e);if(t!==void 0)return t;if(this.lastNeed<=r.length)return r.copy(this.lastChar,e,0,this.lastNeed),this.lastChar.toString(this.encoding,0,this.lastTotal);r.copy(this.lastChar,e,0,r.length),this.lastNeed-=r.length}function _5e(r,e){var t=V5e(this,r,e);if(!this.lastNeed)return r.toString("utf8",e);this.lastTotal=t;var i=r.length-(t-this.lastNeed);return r.copy(this.lastChar,0,i),r.toString("utf8",e,i)}function $5e(r){var e=r&&r.length?this.write(r):"";return this.lastNeed?e+"\uFFFD":e}function e6e(r,e){if((r.length-e)%2===0){var t=r.toString("utf16le",e);if(t){var i=t.charCodeAt(t.length-1);if(i>=55296&&i<=56319)return this.lastNeed=2,this.lastTotal=4,this.lastChar[0]=r[r.length-2],this.lastChar[1]=r[r.length-1],t.slice(0,-1)}return t}return this.lastNeed=1,this.lastTotal=2,this.lastChar[0]=r[r.length-1],r.toString("utf16le",e,r.length-1)}function t6e(r){var e=r&&r.length?this.write(r):"";if(this.lastNeed){var t=this.lastTotal-this.lastNeed;return e+this.lastChar.toString("utf16le",0,t)}return e}function r6e(r,e){var t=(r.length-e)%3;return t===0?r.toString("base64",e):(this.lastNeed=3-t,this.lastTotal=3,t===1?this.lastChar[0]=r[r.length-1]:(this.lastChar[0]=r[r.length-2],this.lastChar[1]=r[r.length-1]),r.toString("base64",e,r.length-t))}function i6e(r){var e=r&&r.length?this.write(r):"";return this.lastNeed?e+this.lastChar.toString("base64",0,3-this.lastNeed):e}function n6e(r){return r.toString(this.encoding)}function s6e(r){return r&&r.length?this.write(r):""}});var wQ=w((cQt,Sce)=>{"use strict";var bce=Sl().codes.ERR_STREAM_PREMATURE_CLOSE;function o6e(r){var e=!1;return function(){if(!e){e=!0;for(var t=arguments.length,i=new Array(t),n=0;n<t;n++)i[n]=arguments[n];r.apply(this,i)}}}function a6e(){}function A6e(r){return r.setHeader&&typeof r.abort=="function"}function Qce(r,e,t){if(typeof e=="function")return Qce(r,null,e);e||(e={}),t=o6e(t||a6e);var i=e.readable||e.readable!==!1&&r.readable,n=e.writable||e.writable!==!1&&r.writable,s=function(){r.writable||a()},o=r._writableState&&r._writableState.finished,a=function(){n=!1,o=!0,i||t.call(r)},l=r._readableState&&r._readableState.endEmitted,c=function(){i=!1,l=!0,n||t.call(r)},u=function(p){t.call(r,p)},g=function(){var p;if(i&&!l)return(!r._readableState||!r._readableState.ended)&&(p=new bce),t.call(r,p);if(n&&!o)return(!r._writableState||!r._writableState.ended)&&(p=new bce),t.call(r,p)},f=function(){r.req.on("finish",a)};return A6e(r)?(r.on("complete",a),r.on("abort",g),r.req?f():r.on("request",f)):n&&!r._writableState&&(r.on("end",s),r.on("close",s)),r.on("end",c),r.on("finish",a),e.error!==!1&&r.on("error",u),r.on("close",g),function(){r.removeListener("complete",a),r.removeListener("abort",g),r.removeListener("request",f),r.req&&r.req.removeListener("finish",a),r.removeListener("end",s),r.removeListener("close",s),r.removeListener("finish",a),r.removeListener("end",c),r.removeListener("error",u),r.removeListener("close",g)}}Sce.exports=Qce});var xce=w((uQt,vce)=>{"use strict";var BQ;function Pl(r,e,t){return e in r?Object.defineProperty(r,e,{value:t,enumerable:!0,configurable:!0,writable:!0}):r[e]=t,r}var l6e=wQ(),Dl=Symbol("lastResolve"),Ju=Symbol("lastReject"),mE=Symbol("error"),bQ=Symbol("ended"),Wu=Symbol("lastPromise"),KM=Symbol("handlePromise"),zu=Symbol("stream");function kl(r,e){return{value:r,done:e}}function c6e(r){var e=r[Dl];if(e!==null){var t=r[zu].read();t!==null&&(r[Wu]=null,r[Dl]=null,r[Ju]=null,e(kl(t,!1)))}}function u6e(r){process.nextTick(c6e,r)}function g6e(r,e){return function(t,i){r.then(function(){if(e[bQ]){t(kl(void 0,!0));return}e[KM](t,i)},i)}}var f6e=Object.getPrototypeOf(function(){}),h6e=Object.setPrototypeOf((BQ={get stream(){return this[zu]},next:function(){var e=this,t=this[mE];if(t!==null)return Promise.reject(t);if(this[bQ])return Promise.resolve(kl(void 0,!0));if(this[zu].destroyed)return new Promise(function(o,a){process.nextTick(function(){e[mE]?a(e[mE]):o(kl(void 0,!0))})});var i=this[Wu],n;if(i)n=new Promise(g6e(i,this));else{var s=this[zu].read();if(s!==null)return Promise.resolve(kl(s,!1));n=new Promise(this[KM])}return this[Wu]=n,n}},Pl(BQ,Symbol.asyncIterator,function(){return this}),Pl(BQ,"return",function(){var e=this;return new Promise(function(t,i){e[zu].destroy(null,function(n){if(n){i(n);return}t(kl(void 0,!0))})})}),BQ),f6e),p6e=function(e){var t,i=Object.create(h6e,(t={},Pl(t,zu,{value:e,writable:!0}),Pl(t,Dl,{value:null,writable:!0}),Pl(t,Ju,{value:null,writable:!0}),Pl(t,mE,{value:null,writable:!0}),Pl(t,bQ,{value:e._readableState.endEmitted,writable:!0}),Pl(t,KM,{value:function(s,o){var a=i[zu].read();a?(i[Wu]=null,i[Dl]=null,i[Ju]=null,s(kl(a,!1))):(i[Dl]=s,i[Ju]=o)},writable:!0}),t));return i[Wu]=null,l6e(e,function(n){if(n&&n.code!=="ERR_STREAM_PREMATURE_CLOSE"){var s=i[Ju];s!==null&&(i[Wu]=null,i[Dl]=null,i[Ju]=null,s(n)),i[mE]=n;return}var o=i[Dl];o!==null&&(i[Wu]=null,i[Dl]=null,i[Ju]=null,o(kl(void 0,!0))),i[bQ]=!0}),e.on("readable",u6e.bind(null,i)),i};vce.exports=p6e});var Rce=w((gQt,kce)=>{"use strict";function Pce(r,e,t,i,n,s,o){try{var a=r[s](o),l=a.value}catch(c){t(c);return}a.done?e(l):Promise.resolve(l).then(i,n)}function d6e(r){return function(){var e=this,t=arguments;return new Promise(function(i,n){var s=r.apply(e,t);function o(l){Pce(s,i,n,o,a,"next",l)}function a(l){Pce(s,i,n,o,a,"throw",l)}o(void 0)})}}function Dce(r,e){var t=Object.keys(r);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(r);e&&(i=i.filter(function(n){return Object.getOwnPropertyDescriptor(r,n).enumerable})),t.push.apply(t,i)}return t}function C6e(r){for(var e=1;e<arguments.length;e++){var t=arguments[e]!=null?arguments[e]:{};e%2?Dce(Object(t),!0).forEach(function(i){m6e(r,i,t[i])}):Object.getOwnPropertyDescriptors?Object.defineProperties(r,Object.getOwnPropertyDescriptors(t)):Dce(Object(t)).forEach(function(i){Object.defineProperty(r,i,Object.getOwnPropertyDescriptor(t,i))})}return r}function m6e(r,e,t){return e in r?Object.defineProperty(r,e,{value:t,enumerable:!0,configurable:!0,writable:!0}):r[e]=t,r}var E6e=Sl().codes.ERR_INVALID_ARG_TYPE;function I6e(r,e,t){var i;if(e&&typeof e.next=="function")i=e;else if(e&&e[Symbol.asyncIterator])i=e[Symbol.asyncIterator]();else if(e&&e[Symbol.iterator])i=e[Symbol.iterator]();else throw new E6e("iterable",["Iterable"],e);var n=new r(C6e({objectMode:!0},t)),s=!1;n._read=function(){s||(s=!0,o())};function o(){return a.apply(this,arguments)}function a(){return a=d6e(function*(){try{var l=yield i.next(),c=l.value,u=l.done;u?n.push(null):n.push(yield c)?o():s=!1}catch(g){n.destroy(g)}}),a.apply(this,arguments)}return n}kce.exports=I6e});var NM=w((hQt,Gce)=>{"use strict";Gce.exports=Ut;var cp;Ut.ReadableState=Lce;var fQt=J("events").EventEmitter,Tce=function(e,t){return e.listeners(t).length},IE=yM(),QQ=J("buffer").Buffer,y6e=global.Uint8Array||function(){};function w6e(r){return QQ.from(r)}function B6e(r){return QQ.isBuffer(r)||r instanceof y6e}var UM=J("util"),Dt;UM&&UM.debuglog?Dt=UM.debuglog("stream"):Dt=function(){};var b6e=tce(),WM=bM(),Q6e=QM(),S6e=Q6e.getHighWaterMark,SQ=Sl().codes,v6e=SQ.ERR_INVALID_ARG_TYPE,x6e=SQ.ERR_STREAM_PUSH_AFTER_EOF,P6e=SQ.ERR_METHOD_NOT_IMPLEMENTED,D6e=SQ.ERR_STREAM_UNSHIFT_AFTER_END_EVENT,up,HM,GM;vl()(Ut,IE);var EE=WM.errorOrDestroy,YM=["error","close","destroy","pause","resume"];function k6e(r,e,t){if(typeof r.prependListener=="function")return r.prependListener(e,t);!r._events||!r._events[e]?r.on(e,t):Array.isArray(r._events[e])?r._events[e].unshift(t):r._events[e]=[t,r._events[e]]}function Lce(r,e,t){cp=cp||qu(),r=r||{},typeof t!="boolean"&&(t=e instanceof cp),this.objectMode=!!r.objectMode,t&&(this.objectMode=this.objectMode||!!r.readableObjectMode),this.highWaterMark=S6e(this,r,"readableHighWaterMark",t),this.buffer=new b6e,this.length=0,this.pipes=null,this.pipesCount=0,this.flowing=null,this.ended=!1,this.endEmitted=!1,this.reading=!1,this.sync=!0,this.needReadable=!1,this.emittedReadable=!1,this.readableListening=!1,this.resumeScheduled=!1,this.paused=!0,this.emitClose=r.emitClose!==!1,this.autoDestroy=!!r.autoDestroy,this.destroyed=!1,this.defaultEncoding=r.defaultEncoding||"utf8",this.awaitDrain=0,this.readingMore=!1,this.decoder=null,this.encoding=null,r.encoding&&(up||(up=MM().StringDecoder),this.decoder=new up(r.encoding),this.encoding=r.encoding)}function Ut(r){if(cp=cp||qu(),!(this instanceof Ut))return new Ut(r);var e=this instanceof cp;this._readableState=new Lce(r,this,e),this.readable=!0,r&&(typeof r.read=="function"&&(this._read=r.read),typeof r.destroy=="function"&&(this._destroy=r.destroy)),IE.call(this)}Object.defineProperty(Ut.prototype,"destroyed",{enumerable:!1,get:function(){return this._readableState===void 0?!1:this._readableState.destroyed},set:function(e){!this._readableState||(this._readableState.destroyed=e)}});Ut.prototype.destroy=WM.destroy;Ut.prototype._undestroy=WM.undestroy;Ut.prototype._destroy=function(r,e){e(r)};Ut.prototype.push=function(r,e){var t=this._readableState,i;return t.objectMode?i=!0:typeof r=="string"&&(e=e||t.defaultEncoding,e!==t.encoding&&(r=QQ.from(r,e),e=""),i=!0),Oce(this,r,e,!1,i)};Ut.prototype.unshift=function(r){return Oce(this,r,null,!0,!1)};function Oce(r,e,t,i,n){Dt("readableAddChunk",e);var s=r._readableState;if(e===null)s.reading=!1,N6e(r,s);else{var o;if(n||(o=R6e(s,e)),o)EE(r,o);else if(s.objectMode||e&&e.length>0)if(typeof e!="string"&&!s.objectMode&&Object.getPrototypeOf(e)!==QQ.prototype&&(e=w6e(e)),i)s.endEmitted?EE(r,new D6e):jM(r,s,e,!0);else if(s.ended)EE(r,new x6e);else{if(s.destroyed)return!1;s.reading=!1,s.decoder&&!t?(e=s.decoder.write(e),s.objectMode||e.length!==0?jM(r,s,e,!1):JM(r,s)):jM(r,s,e,!1)}else i||(s.reading=!1,JM(r,s))}return!s.ended&&(s.length<s.highWaterMark||s.length===0)}function jM(r,e,t,i){e.flowing&&e.length===0&&!e.sync?(e.awaitDrain=0,r.emit("data",t)):(e.length+=e.objectMode?1:t.length,i?e.buffer.unshift(t):e.buffer.push(t),e.needReadable&&vQ(r)),JM(r,e)}function R6e(r,e){var t;return!B6e(e)&&typeof e!="string"&&e!==void 0&&!r.objectMode&&(t=new v6e("chunk",["string","Buffer","Uint8Array"],e)),t}Ut.prototype.isPaused=function(){return this._readableState.flowing===!1};Ut.prototype.setEncoding=function(r){up||(up=MM().StringDecoder);var e=new up(r);this._readableState.decoder=e,this._readableState.encoding=this._readableState.decoder.encoding;for(var t=this._readableState.buffer.head,i="";t!==null;)i+=e.write(t.data),t=t.next;return this._readableState.buffer.clear(),i!==""&&this._readableState.buffer.push(i),this._readableState.length=i.length,this};var Fce=1073741824;function F6e(r){return r>=Fce?r=Fce:(r--,r|=r>>>1,r|=r>>>2,r|=r>>>4,r|=r>>>8,r|=r>>>16,r++),r}function Nce(r,e){return r<=0||e.length===0&&e.ended?0:e.objectMode?1:r!==r?e.flowing&&e.length?e.buffer.head.data.length:e.length:(r>e.highWaterMark&&(e.highWaterMark=F6e(r)),r<=e.length?r:e.ended?e.length:(e.needReadable=!0,0))}Ut.prototype.read=function(r){Dt("read",r),r=parseInt(r,10);var e=this._readableState,t=r;if(r!==0&&(e.emittedReadable=!1),r===0&&e.needReadable&&((e.highWaterMark!==0?e.length>=e.highWaterMark:e.length>0)||e.ended))return Dt("read: emitReadable",e.length,e.ended),e.length===0&&e.ended?qM(this):vQ(this),null;if(r=Nce(r,e),r===0&&e.ended)return e.length===0&&qM(this),null;var i=e.needReadable;Dt("need readable",i),(e.length===0||e.length-r<e.highWaterMark)&&(i=!0,Dt("length less than watermark",i)),e.ended||e.reading?(i=!1,Dt("reading or ended",i)):i&&(Dt("do read"),e.reading=!0,e.sync=!0,e.length===0&&(e.needReadable=!0),this._read(e.highWaterMark),e.sync=!1,e.reading||(r=Nce(t,e)));var n;return r>0?n=Uce(r,e):n=null,n===null?(e.needReadable=e.length<=e.highWaterMark,r=0):(e.length-=r,e.awaitDrain=0),e.length===0&&(e.ended||(e.needReadable=!0),t!==r&&e.ended&&qM(this)),n!==null&&this.emit("data",n),n};function N6e(r,e){if(Dt("onEofChunk"),!e.ended){if(e.decoder){var t=e.decoder.end();t&&t.length&&(e.buffer.push(t),e.length+=e.objectMode?1:t.length)}e.ended=!0,e.sync?vQ(r):(e.needReadable=!1,e.emittedReadable||(e.emittedReadable=!0,Mce(r)))}}function vQ(r){var e=r._readableState;Dt("emitReadable",e.needReadable,e.emittedReadable),e.needReadable=!1,e.emittedReadable||(Dt("emitReadable",e.flowing),e.emittedReadable=!0,process.nextTick(Mce,r))}function Mce(r){var e=r._readableState;Dt("emitReadable_",e.destroyed,e.length,e.ended),!e.destroyed&&(e.length||e.ended)&&(r.emit("readable"),e.emittedReadable=!1),e.needReadable=!e.flowing&&!e.ended&&e.length<=e.highWaterMark,zM(r)}function JM(r,e){e.readingMore||(e.readingMore=!0,process.nextTick(T6e,r,e))}function T6e(r,e){for(;!e.reading&&!e.ended&&(e.length<e.highWaterMark||e.flowing&&e.length===0);){var t=e.length;if(Dt("maybeReadMore read 0"),r.read(0),t===e.length)break}e.readingMore=!1}Ut.prototype._read=function(r){EE(this,new P6e("_read()"))};Ut.prototype.pipe=function(r,e){var t=this,i=this._readableState;switch(i.pipesCount){case 0:i.pipes=r;break;case 1:i.pipes=[i.pipes,r];break;default:i.pipes.push(r);break}i.pipesCount+=1,Dt("pipe count=%d opts=%j",i.pipesCount,e);var n=(!e||e.end!==!1)&&r!==process.stdout&&r!==process.stderr,s=n?a:C;i.endEmitted?process.nextTick(s):t.once("end",s),r.on("unpipe",o);function o(y,B){Dt("onunpipe"),y===t&&B&&B.hasUnpiped===!1&&(B.hasUnpiped=!0,u())}function a(){Dt("onend"),r.end()}var l=L6e(t);r.on("drain",l);var c=!1;function u(){Dt("cleanup"),r.removeListener("close",h),r.removeListener("finish",p),r.removeListener("drain",l),r.removeListener("error",f),r.removeListener("unpipe",o),t.removeListener("end",a),t.removeListener("end",C),t.removeListener("data",g),c=!0,i.awaitDrain&&(!r._writableState||r._writableState.needDrain)&&l()}t.on("data",g);function g(y){Dt("ondata");var B=r.write(y);Dt("dest.write",B),B===!1&&((i.pipesCount===1&&i.pipes===r||i.pipesCount>1&&Hce(i.pipes,r)!==-1)&&!c&&(Dt("false write response, pause",i.awaitDrain),i.awaitDrain++),t.pause())}function f(y){Dt("onerror",y),C(),r.removeListener("error",f),Tce(r,"error")===0&&EE(r,y)}k6e(r,"error",f);function h(){r.removeListener("finish",p),C()}r.once("close",h);function p(){Dt("onfinish"),r.removeListener("close",h),C()}r.once("finish",p);function C(){Dt("unpipe"),t.unpipe(r)}return r.emit("pipe",t),i.flowing||(Dt("pipe resume"),t.resume()),r};function L6e(r){return function(){var t=r._readableState;Dt("pipeOnDrain",t.awaitDrain),t.awaitDrain&&t.awaitDrain--,t.awaitDrain===0&&Tce(r,"data")&&(t.flowing=!0,zM(r))}}Ut.prototype.unpipe=function(r){var e=this._readableState,t={hasUnpiped:!1};if(e.pipesCount===0)return this;if(e.pipesCount===1)return r&&r!==e.pipes?this:(r||(r=e.pipes),e.pipes=null,e.pipesCount=0,e.flowing=!1,r&&r.emit("unpipe",this,t),this);if(!r){var i=e.pipes,n=e.pipesCount;e.pipes=null,e.pipesCount=0,e.flowing=!1;for(var s=0;s<n;s++)i[s].emit("unpipe",this,{hasUnpiped:!1});return this}var o=Hce(e.pipes,r);return o===-1?this:(e.pipes.splice(o,1),e.pipesCount-=1,e.pipesCount===1&&(e.pipes=e.pipes[0]),r.emit("unpipe",this,t),this)};Ut.prototype.on=function(r,e){var t=IE.prototype.on.call(this,r,e),i=this._readableState;return r==="data"?(i.readableListening=this.listenerCount("readable")>0,i.flowing!==!1&&this.resume()):r==="readable"&&!i.endEmitted&&!i.readableListening&&(i.readableListening=i.needReadable=!0,i.flowing=!1,i.emittedReadable=!1,Dt("on readable",i.length,i.reading),i.length?vQ(this):i.reading||process.nextTick(O6e,this)),t};Ut.prototype.addListener=Ut.prototype.on;Ut.prototype.removeListener=function(r,e){var t=IE.prototype.removeListener.call(this,r,e);return r==="readable"&&process.nextTick(Kce,this),t};Ut.prototype.removeAllListeners=function(r){var e=IE.prototype.removeAllListeners.apply(this,arguments);return(r==="readable"||r===void 0)&&process.nextTick(Kce,this),e};function Kce(r){var e=r._readableState;e.readableListening=r.listenerCount("readable")>0,e.resumeScheduled&&!e.paused?e.flowing=!0:r.listenerCount("data")>0&&r.resume()}function O6e(r){Dt("readable nexttick read 0"),r.read(0)}Ut.prototype.resume=function(){var r=this._readableState;return r.flowing||(Dt("resume"),r.flowing=!r.readableListening,M6e(this,r)),r.paused=!1,this};function M6e(r,e){e.resumeScheduled||(e.resumeScheduled=!0,process.nextTick(K6e,r,e))}function K6e(r,e){Dt("resume",e.reading),e.reading||r.read(0),e.resumeScheduled=!1,r.emit("resume"),zM(r),e.flowing&&!e.reading&&r.read(0)}Ut.prototype.pause=function(){return Dt("call pause flowing=%j",this._readableState.flowing),this._readableState.flowing!==!1&&(Dt("pause"),this._readableState.flowing=!1,this.emit("pause")),this._readableState.paused=!0,this};function zM(r){var e=r._readableState;for(Dt("flow",e.flowing);e.flowing&&r.read()!==null;);}Ut.prototype.wrap=function(r){var e=this,t=this._readableState,i=!1;r.on("end",function(){if(Dt("wrapped end"),t.decoder&&!t.ended){var o=t.decoder.end();o&&o.length&&e.push(o)}e.push(null)}),r.on("data",function(o){if(Dt("wrapped data"),t.decoder&&(o=t.decoder.write(o)),!(t.objectMode&&o==null)&&!(!t.objectMode&&(!o||!o.length))){var a=e.push(o);a||(i=!0,r.pause())}});for(var n in r)this[n]===void 0&&typeof r[n]=="function"&&(this[n]=function(a){return function(){return r[a].apply(r,arguments)}}(n));for(var s=0;s<YM.length;s++)r.on(YM[s],this.emit.bind(this,YM[s]));return this._read=function(o){Dt("wrapped _read",o),i&&(i=!1,r.resume())},this};typeof Symbol=="function"&&(Ut.prototype[Symbol.asyncIterator]=function(){return HM===void 0&&(HM=xce()),HM(this)});Object.defineProperty(Ut.prototype,"readableHighWaterMark",{enumerable:!1,get:function(){return this._readableState.highWaterMark}});Object.defineProperty(Ut.prototype,"readableBuffer",{enumerable:!1,get:function(){return this._readableState&&this._readableState.buffer}});Object.defineProperty(Ut.prototype,"readableFlowing",{enumerable:!1,get:function(){return this._readableState.flowing},set:function(e){this._readableState&&(this._readableState.flowing=e)}});Ut._fromList=Uce;Object.defineProperty(Ut.prototype,"readableLength",{enumerable:!1,get:function(){return this._readableState.length}});function Uce(r,e){if(e.length===0)return null;var t;return e.objectMode?t=e.buffer.shift():!r||r>=e.length?(e.decoder?t=e.buffer.join(""):e.buffer.length===1?t=e.buffer.first():t=e.buffer.concat(e.length),e.buffer.clear()):t=e.buffer.consume(r,e.decoder),t}function qM(r){var e=r._readableState;Dt("endReadable",e.endEmitted),e.endEmitted||(e.ended=!0,process.nextTick(U6e,e,r))}function U6e(r,e){if(Dt("endReadableNT",r.endEmitted,r.length),!r.endEmitted&&r.length===0&&(r.endEmitted=!0,e.readable=!1,e.emit("end"),r.autoDestroy)){var t=e._writableState;(!t||t.autoDestroy&&t.finished)&&e.destroy()}}typeof Symbol=="function"&&(Ut.from=function(r,e){return GM===void 0&&(GM=Rce()),GM(Ut,r,e)});function Hce(r,e){for(var t=0,i=r.length;t<i;t++)if(r[t]===e)return t;return-1}});var VM=w((pQt,jce)=>{"use strict";jce.exports=hA;var xQ=Sl().codes,H6e=xQ.ERR_METHOD_NOT_IMPLEMENTED,G6e=xQ.ERR_MULTIPLE_CALLBACK,Y6e=xQ.ERR_TRANSFORM_ALREADY_TRANSFORMING,j6e=xQ.ERR_TRANSFORM_WITH_LENGTH_0,PQ=qu();vl()(hA,PQ);function q6e(r,e){var t=this._transformState;t.transforming=!1;var i=t.writecb;if(i===null)return this.emit("error",new G6e);t.writechunk=null,t.writecb=null,e!=null&&this.push(e),i(r);var n=this._readableState;n.reading=!1,(n.needReadable||n.length<n.highWaterMark)&&this._read(n.highWaterMark)}function hA(r){if(!(this instanceof hA))return new hA(r);PQ.call(this,r),this._transformState={afterTransform:q6e.bind(this),needTransform:!1,transforming:!1,writecb:null,writechunk:null,writeencoding:null},this._readableState.needReadable=!0,this._readableState.sync=!1,r&&(typeof r.transform=="function"&&(this._transform=r.transform),typeof r.flush=="function"&&(this._flush=r.flush)),this.on("prefinish",J6e)}function J6e(){var r=this;typeof this._flush=="function"&&!this._readableState.destroyed?this._flush(function(e,t){Yce(r,e,t)}):Yce(this,null,null)}hA.prototype.push=function(r,e){return this._transformState.needTransform=!1,PQ.prototype.push.call(this,r,e)};hA.prototype._transform=function(r,e,t){t(new H6e("_transform()"))};hA.prototype._write=function(r,e,t){var i=this._transformState;if(i.writecb=t,i.writechunk=r,i.writeencoding=e,!i.transforming){var n=this._readableState;(i.needTransform||n.needReadable||n.length<n.highWaterMark)&&this._read(n.highWaterMark)}};hA.prototype._read=function(r){var e=this._transformState;e.writechunk!==null&&!e.transforming?(e.transforming=!0,this._transform(e.writechunk,e.writeencoding,e.afterTransform)):e.needTransform=!0};hA.prototype._destroy=function(r,e){PQ.prototype._destroy.call(this,r,function(t){e(t)})};function Yce(r,e,t){if(e)return r.emit("error",e);if(t!=null&&r.push(t),r._writableState.length)throw new j6e;if(r._transformState.transforming)throw new Y6e;return r.push(null)}});var Wce=w((dQt,Jce)=>{"use strict";Jce.exports=yE;var qce=VM();vl()(yE,qce);function yE(r){if(!(this instanceof yE))return new yE(r);qce.call(this,r)}yE.prototype._transform=function(r,e,t){t(null,r)}});var _ce=w((CQt,Zce)=>{"use strict";var XM;function W6e(r){var e=!1;return function(){e||(e=!0,r.apply(void 0,arguments))}}var Xce=Sl().codes,z6e=Xce.ERR_MISSING_ARGS,V6e=Xce.ERR_STREAM_DESTROYED;function zce(r){if(r)throw r}function X6e(r){return r.setHeader&&typeof r.abort=="function"}function Z6e(r,e,t,i){i=W6e(i);var n=!1;r.on("close",function(){n=!0}),XM===void 0&&(XM=wQ()),XM(r,{readable:e,writable:t},function(o){if(o)return i(o);n=!0,i()});var s=!1;return function(o){if(!n&&!s){if(s=!0,X6e(r))return r.abort();if(typeof r.destroy=="function")return r.destroy();i(o||new V6e("pipe"))}}}function Vce(r){r()}function _6e(r,e){return r.pipe(e)}function $6e(r){return!r.length||typeof r[r.length-1]!="function"?zce:r.pop()}function eVe(){for(var r=arguments.length,e=new Array(r),t=0;t<r;t++)e[t]=arguments[t];var i=$6e(e);if(Array.isArray(e[0])&&(e=e[0]),e.length<2)throw new z6e("streams");var n,s=e.map(function(o,a){var l=a<e.length-1,c=a>0;return Z6e(o,l,c,function(u){n||(n=u),u&&s.forEach(Vce),!l&&(s.forEach(Vce),i(n))})});return e.reduce(_6e)}Zce.exports=eVe});var gp=w((Ms,BE)=>{var wE=J("stream");process.env.READABLE_STREAM==="disable"&&wE?(BE.exports=wE.Readable,Object.assign(BE.exports,wE),BE.exports.Stream=wE):(Ms=BE.exports=NM(),Ms.Stream=wE||Ms,Ms.Readable=Ms,Ms.Writable=kM(),Ms.Duplex=qu(),Ms.Transform=VM(),Ms.PassThrough=Wce(),Ms.finished=wQ(),Ms.pipeline=_ce())});var tue=w((mQt,eue)=>{"use strict";var{Buffer:Io}=J("buffer"),$ce=Symbol.for("BufferList");function fr(r){if(!(this instanceof fr))return new fr(r);fr._init.call(this,r)}fr._init=function(e){Object.defineProperty(this,$ce,{value:!0}),this._bufs=[],this.length=0,e&&this.append(e)};fr.prototype._new=function(e){return new fr(e)};fr.prototype._offset=function(e){if(e===0)return[0,0];let t=0;for(let i=0;i<this._bufs.length;i++){let n=t+this._bufs[i].length;if(e<n||i===this._bufs.length-1)return[i,e-t];t=n}};fr.prototype._reverseOffset=function(r){let e=r[0],t=r[1];for(let i=0;i<e;i++)t+=this._bufs[i].length;return t};fr.prototype.get=function(e){if(e>this.length||e<0)return;let t=this._offset(e);return this._bufs[t[0]][t[1]]};fr.prototype.slice=function(e,t){return typeof e=="number"&&e<0&&(e+=this.length),typeof t=="number"&&t<0&&(t+=this.length),this.copy(null,0,e,t)};fr.prototype.copy=function(e,t,i,n){if((typeof i!="number"||i<0)&&(i=0),(typeof n!="number"||n>this.length)&&(n=this.length),i>=this.length||n<=0)return e||Io.alloc(0);let s=!!e,o=this._offset(i),a=n-i,l=a,c=s&&t||0,u=o[1];if(i===0&&n===this.length){if(!s)return this._bufs.length===1?this._bufs[0]:Io.concat(this._bufs,this.length);for(let g=0;g<this._bufs.length;g++)this._bufs[g].copy(e,c),c+=this._bufs[g].length;return e}if(l<=this._bufs[o[0]].length-u)return s?this._bufs[o[0]].copy(e,t,u,u+l):this._bufs[o[0]].slice(u,u+l);s||(e=Io.allocUnsafe(a));for(let g=o[0];g<this._bufs.length;g++){let f=this._bufs[g].length-u;if(l>f)this._bufs[g].copy(e,c,u),c+=f;else{this._bufs[g].copy(e,c,u,u+l),c+=f;break}l-=f,u&&(u=0)}return e.length>c?e.slice(0,c):e};fr.prototype.shallowSlice=function(e,t){if(e=e||0,t=typeof t!="number"?this.length:t,e<0&&(e+=this.length),t<0&&(t+=this.length),e===t)return this._new();let i=this._offset(e),n=this._offset(t),s=this._bufs.slice(i[0],n[0]+1);return n[1]===0?s.pop():s[s.length-1]=s[s.length-1].slice(0,n[1]),i[1]!==0&&(s[0]=s[0].slice(i[1])),this._new(s)};fr.prototype.toString=function(e,t,i){return this.slice(t,i).toString(e)};fr.prototype.consume=function(e){if(e=Math.trunc(e),Number.isNaN(e)||e<=0)return this;for(;this._bufs.length;)if(e>=this._bufs[0].length)e-=this._bufs[0].length,this.length-=this._bufs[0].length,this._bufs.shift();else{this._bufs[0]=this._bufs[0].slice(e),this.length-=e;break}return this};fr.prototype.duplicate=function(){let e=this._new();for(let t=0;t<this._bufs.length;t++)e.append(this._bufs[t]);return e};fr.prototype.append=function(e){if(e==null)return this;if(e.buffer)this._appendBuffer(Io.from(e.buffer,e.byteOffset,e.byteLength));else if(Array.isArray(e))for(let t=0;t<e.length;t++)this.append(e[t]);else if(this._isBufferList(e))for(let t=0;t<e._bufs.length;t++)this.append(e._bufs[t]);else typeof e=="number"&&(e=e.toString()),this._appendBuffer(Io.from(e));return this};fr.prototype._appendBuffer=function(e){this._bufs.push(e),this.length+=e.length};fr.prototype.indexOf=function(r,e,t){if(t===void 0&&typeof e=="string"&&(t=e,e=void 0),typeof r=="function"||Array.isArray(r))throw new TypeError('The "value" argument must be one of type string, Buffer, BufferList, or Uint8Array.');if(typeof r=="number"?r=Io.from([r]):typeof r=="string"?r=Io.from(r,t):this._isBufferList(r)?r=r.slice():Array.isArray(r.buffer)?r=Io.from(r.buffer,r.byteOffset,r.byteLength):Io.isBuffer(r)||(r=Io.from(r)),e=Number(e||0),isNaN(e)&&(e=0),e<0&&(e=this.length+e),e<0&&(e=0),r.length===0)return e>this.length?this.length:e;let i=this._offset(e),n=i[0],s=i[1];for(;n<this._bufs.length;n++){let o=this._bufs[n];for(;s<o.length;)if(o.length-s>=r.length){let l=o.indexOf(r,s);if(l!==-1)return this._reverseOffset([n,l]);s=o.length-r.length+1}else{let l=this._reverseOffset([n,s]);if(this._match(l,r))return l;s++}s=0}return-1};fr.prototype._match=function(r,e){if(this.length-r<e.length)return!1;for(let t=0;t<e.length;t++)if(this.get(r+t)!==e[t])return!1;return!0};(function(){let r={readDoubleBE:8,readDoubleLE:8,readFloatBE:4,readFloatLE:4,readInt32BE:4,readInt32LE:4,readUInt32BE:4,readUInt32LE:4,readInt16BE:2,readInt16LE:2,readUInt16BE:2,readUInt16LE:2,readInt8:1,readUInt8:1,readIntBE:null,readIntLE:null,readUIntBE:null,readUIntLE:null};for(let e in r)(function(t){r[t]===null?fr.prototype[t]=function(i,n){return this.slice(i,i+n)[t](0,n)}:fr.prototype[t]=function(i=0){return this.slice(i,i+r[t])[t](0)}})(e)})();fr.prototype._isBufferList=function(e){return e instanceof fr||fr.isBufferList(e)};fr.isBufferList=function(e){return e!=null&&e[$ce]};eue.exports=fr});var rue=w((EQt,DQ)=>{"use strict";var ZM=gp().Duplex,tVe=vl(),bE=tue();function Wi(r){if(!(this instanceof Wi))return new Wi(r);if(typeof r=="function"){this._callback=r;let e=function(i){this._callback&&(this._callback(i),this._callback=null)}.bind(this);this.on("pipe",function(i){i.on("error",e)}),this.on("unpipe",function(i){i.removeListener("error",e)}),r=null}bE._init.call(this,r),ZM.call(this)}tVe(Wi,ZM);Object.assign(Wi.prototype,bE.prototype);Wi.prototype._new=function(e){return new Wi(e)};Wi.prototype._write=function(e,t,i){this._appendBuffer(e),typeof i=="function"&&i()};Wi.prototype._read=function(e){if(!this.length)return this.push(null);e=Math.min(e,this.length),this.push(this.slice(0,e)),this.consume(e)};Wi.prototype.end=function(e){ZM.prototype.end.call(this,e),this._callback&&(this._callback(null,this.slice()),this._callback=null)};Wi.prototype._destroy=function(e,t){this._bufs.length=0,this.length=0,t(e)};Wi.prototype._isBufferList=function(e){return e instanceof Wi||e instanceof bE||Wi.isBufferList(e)};Wi.isBufferList=bE.isBufferList;DQ.exports=Wi;DQ.exports.BufferListStream=Wi;DQ.exports.BufferList=bE});var e1=w(hp=>{var rVe=Buffer.alloc,iVe="0000000000000000000",nVe="7777777777777777777",iue="0".charCodeAt(0),nue=Buffer.from("ustar\0","binary"),sVe=Buffer.from("00","binary"),oVe=Buffer.from("ustar ","binary"),aVe=Buffer.from(" \0","binary"),AVe=parseInt("7777",8),QE=257,$M=263,lVe=function(r,e,t){return typeof r!="number"?t:(r=~~r,r>=e?e:r>=0||(r+=e,r>=0)?r:0)},cVe=function(r){switch(r){case 0:return"file";case 1:return"link";case 2:return"symlink";case 3:return"character-device";case 4:return"block-device";case 5:return"directory";case 6:return"fifo";case 7:return"contiguous-file";case 72:return"pax-header";case 55:return"pax-global-header";case 27:return"gnu-long-link-path";case 28:case 30:return"gnu-long-path"}return null},uVe=function(r){switch(r){case"file":return 0;case"link":return 1;case"symlink":return 2;case"character-device":return 3;case"block-device":return 4;case"directory":return 5;case"fifo":return 6;case"contiguous-file":return 7;case"pax-header":return 72}return 0},sue=function(r,e,t,i){for(;t<i;t++)if(r[t]===e)return t;return i},oue=function(r){for(var e=256,t=0;t<148;t++)e+=r[t];for(var i=156;i<512;i++)e+=r[i];return e},Rl=function(r,e){return r=r.toString(8),r.length>e?nVe.slice(0,e)+" ":iVe.slice(0,e-r.length)+r+" "};function gVe(r){var e;if(r[0]===128)e=!0;else if(r[0]===255)e=!1;else return null;for(var t=[],i=r.length-1;i>0;i--){var n=r[i];e?t.push(n):t.push(255-n)}var s=0,o=t.length;for(i=0;i<o;i++)s+=t[i]*Math.pow(256,i);return e?s:-1*s}var Fl=function(r,e,t){if(r=r.slice(e,e+t),e=0,r[e]&128)return gVe(r);for(;e<r.length&&r[e]===32;)e++;for(var i=lVe(sue(r,32,e,r.length),r.length,r.length);e<i&&r[e]===0;)e++;return i===e?0:parseInt(r.slice(e,i).toString(),8)},fp=function(r,e,t,i){return r.slice(e,sue(r,0,e,e+t)).toString(i)},_M=function(r){var e=Buffer.byteLength(r),t=Math.floor(Math.log(e)/Math.log(10))+1;return e+t>=Math.pow(10,t)&&t++,e+t+r};hp.decodeLongPath=function(r,e){return fp(r,0,r.length,e)};hp.encodePax=function(r){var e="";r.name&&(e+=_M(" path="+r.name+`
-`)),r.linkname&&(e+=_M(" linkpath="+r.linkname+`
-`));var t=r.pax;if(t)for(var i in t)e+=_M(" "+i+"="+t[i]+`
-`);return Buffer.from(e)};hp.decodePax=function(r){for(var e={};r.length;){for(var t=0;t<r.length&&r[t]!==32;)t++;var i=parseInt(r.slice(0,t).toString(),10);if(!i)return e;var n=r.slice(t+1,i-1).toString(),s=n.indexOf("=");if(s===-1)return e;e[n.slice(0,s)]=n.slice(s+1),r=r.slice(i)}return e};hp.encode=function(r){var e=rVe(512),t=r.name,i="";if(r.typeflag===5&&t[t.length-1]!=="/"&&(t+="/"),Buffer.byteLength(t)!==t.length)return null;for(;Buffer.byteLength(t)>100;){var n=t.indexOf("/");if(n===-1)return null;i+=i?"/"+t.slice(0,n):t.slice(0,n),t=t.slice(n+1)}return Buffer.byteLength(t)>100||Buffer.byteLength(i)>155||r.linkname&&Buffer.byteLength(r.linkname)>100?null:(e.write(t),e.write(Rl(r.mode&AVe,6),100),e.write(Rl(r.uid,6),108),e.write(Rl(r.gid,6),116),e.write(Rl(r.size,11),124),e.write(Rl(r.mtime.getTime()/1e3|0,11),136),e[156]=iue+uVe(r.type),r.linkname&&e.write(r.linkname,157),nue.copy(e,QE),sVe.copy(e,$M),r.uname&&e.write(r.uname,265),r.gname&&e.write(r.gname,297),e.write(Rl(r.devmajor||0,6),329),e.write(Rl(r.devminor||0,6),337),i&&e.write(i,345),e.write(Rl(oue(e),6),148),e)};hp.decode=function(r,e,t){var i=r[156]===0?0:r[156]-iue,n=fp(r,0,100,e),s=Fl(r,100,8),o=Fl(r,108,8),a=Fl(r,116,8),l=Fl(r,124,12),c=Fl(r,136,12),u=cVe(i),g=r[157]===0?null:fp(r,157,100,e),f=fp(r,265,32),h=fp(r,297,32),p=Fl(r,329,8),C=Fl(r,337,8),y=oue(r);if(y===8*32)return null;if(y!==Fl(r,148,8))throw new Error("Invalid tar header. Maybe the tar is corrupted or it needs to be gunzipped?");if(nue.compare(r,QE,QE+6)===0)r[345]&&(n=fp(r,345,155,e)+"/"+n);else if(!(oVe.compare(r,QE,QE+6)===0&&aVe.compare(r,$M,$M+2)===0)){if(!t)throw new Error("Invalid tar header: unknown format.")}return i===0&&n&&n[n.length-1]==="/"&&(i=5),{name:n,mode:s,uid:o,gid:a,size:l,mtime:new Date(1e3*c),type:u,linkname:g,uname:f,gname:h,devmajor:p,devminor:C}}});var fue=w((yQt,gue)=>{var Aue=J("util"),fVe=rue(),SE=e1(),lue=gp().Writable,cue=gp().PassThrough,uue=function(){},aue=function(r){return r&=511,r&&512-r},hVe=function(r,e){var t=new kQ(r,e);return t.end(),t},pVe=function(r,e){return e.path&&(r.name=e.path),e.linkpath&&(r.linkname=e.linkpath),e.size&&(r.size=parseInt(e.size,10)),r.pax=e,r},kQ=function(r,e){this._parent=r,this.offset=e,cue.call(this,{autoDestroy:!1})};Aue.inherits(kQ,cue);kQ.prototype.destroy=function(r){this._parent.destroy(r)};var pA=function(r){if(!(this instanceof pA))return new pA(r);lue.call(this,r),r=r||{},this._offset=0,this._buffer=fVe(),this._missing=0,this._partial=!1,this._onparse=uue,this._header=null,this._stream=null,this._overflow=null,this._cb=null,this._locked=!1,this._destroyed=!1,this._pax=null,this._paxGlobal=null,this._gnuLongPath=null,this._gnuLongLinkPath=null;var e=this,t=e._buffer,i=function(){e._continue()},n=function(f){if(e._locked=!1,f)return e.destroy(f);e._stream||i()},s=function(){e._stream=null;var f=aue(e._header.size);f?e._parse(f,o):e._parse(512,g),e._locked||i()},o=function(){e._buffer.consume(aue(e._header.size)),e._parse(512,g),i()},a=function(){var f=e._header.size;e._paxGlobal=SE.decodePax(t.slice(0,f)),t.consume(f),s()},l=function(){var f=e._header.size;e._pax=SE.decodePax(t.slice(0,f)),e._paxGlobal&&(e._pax=Object.assign({},e._paxGlobal,e._pax)),t.consume(f),s()},c=function(){var f=e._header.size;this._gnuLongPath=SE.decodeLongPath(t.slice(0,f),r.filenameEncoding),t.consume(f),s()},u=function(){var f=e._header.size;this._gnuLongLinkPath=SE.decodeLongPath(t.slice(0,f),r.filenameEncoding),t.consume(f),s()},g=function(){var f=e._offset,h;try{h=e._header=SE.decode(t.slice(0,512),r.filenameEncoding,r.allowUnknownFormat)}catch(p){e.emit("error",p)}if(t.consume(512),!h){e._parse(512,g),i();return}if(h.type==="gnu-long-path"){e._parse(h.size,c),i();return}if(h.type==="gnu-long-link-path"){e._parse(h.size,u),i();return}if(h.type==="pax-global-header"){e._parse(h.size,a),i();return}if(h.type==="pax-header"){e._parse(h.size,l),i();return}if(e._gnuLongPath&&(h.name=e._gnuLongPath,e._gnuLongPath=null),e._gnuLongLinkPath&&(h.linkname=e._gnuLongLinkPath,e._gnuLongLinkPath=null),e._pax&&(e._header=h=pVe(h,e._pax),e._pax=null),e._locked=!0,!h.size||h.type==="directory"){e._parse(512,g),e.emit("entry",h,hVe(e,f),n);return}e._stream=new kQ(e,f),e.emit("entry",h,e._stream,n),e._parse(h.size,s),i()};this._onheader=g,this._parse(512,g)};Aue.inherits(pA,lue);pA.prototype.destroy=function(r){this._destroyed||(this._destroyed=!0,r&&this.emit("error",r),this.emit("close"),this._stream&&this._stream.emit("close"))};pA.prototype._parse=function(r,e){this._destroyed||(this._offset+=r,this._missing=r,e===this._onheader&&(this._partial=!1),this._onparse=e)};pA.prototype._continue=function(){if(!this._destroyed){var r=this._cb;this._cb=uue,this._overflow?this._write(this._overflow,void 0,r):r()}};pA.prototype._write=function(r,e,t){if(!this._destroyed){var i=this._stream,n=this._buffer,s=this._missing;if(r.length&&(this._partial=!0),r.length<s)return this._missing-=r.length,this._overflow=null,i?i.write(r,t):(n.append(r),t());this._cb=t,this._missing=0;var o=null;r.length>s&&(o=r.slice(s),r=r.slice(0,s)),i?i.end(r):n.append(r),this._overflow=o,this._onparse()}};pA.prototype._final=function(r){if(this._partial)return this.destroy(new Error("Unexpected end of data"));r()};gue.exports=pA});var pue=w((wQt,hue)=>{hue.exports=J("fs").constants||J("constants")});var Iue=w((BQt,Eue)=>{var pp=pue(),due=Pk(),FQ=vl(),dVe=Buffer.alloc,Cue=gp().Readable,dp=gp().Writable,CVe=J("string_decoder").StringDecoder,RQ=e1(),mVe=parseInt("755",8),EVe=parseInt("644",8),mue=dVe(1024),r1=function(){},t1=function(r,e){e&=511,e&&r.push(mue.slice(0,512-e))};function IVe(r){switch(r&pp.S_IFMT){case pp.S_IFBLK:return"block-device";case pp.S_IFCHR:return"character-device";case pp.S_IFDIR:return"directory";case pp.S_IFIFO:return"fifo";case pp.S_IFLNK:return"symlink"}return"file"}var NQ=function(r){dp.call(this),this.written=0,this._to=r,this._destroyed=!1};FQ(NQ,dp);NQ.prototype._write=function(r,e,t){if(this.written+=r.length,this._to.push(r))return t();this._to._drain=t};NQ.prototype.destroy=function(){this._destroyed||(this._destroyed=!0,this.emit("close"))};var TQ=function(){dp.call(this),this.linkname="",this._decoder=new CVe("utf-8"),this._destroyed=!1};FQ(TQ,dp);TQ.prototype._write=function(r,e,t){this.linkname+=this._decoder.write(r),t()};TQ.prototype.destroy=function(){this._destroyed||(this._destroyed=!0,this.emit("close"))};var vE=function(){dp.call(this),this._destroyed=!1};FQ(vE,dp);vE.prototype._write=function(r,e,t){t(new Error("No body allowed for this entry"))};vE.prototype.destroy=function(){this._destroyed||(this._destroyed=!0,this.emit("close"))};var la=function(r){if(!(this instanceof la))return new la(r);Cue.call(this,r),this._drain=r1,this._finalized=!1,this._finalizing=!1,this._destroyed=!1,this._stream=null};FQ(la,Cue);la.prototype.entry=function(r,e,t){if(this._stream)throw new Error("already piping an entry");if(!(this._finalized||this._destroyed)){typeof e=="function"&&(t=e,e=null),t||(t=r1);var i=this;if((!r.size||r.type==="symlink")&&(r.size=0),r.type||(r.type=IVe(r.mode)),r.mode||(r.mode=r.type==="directory"?mVe:EVe),r.uid||(r.uid=0),r.gid||(r.gid=0),r.mtime||(r.mtime=new Date),typeof e=="string"&&(e=Buffer.from(e)),Buffer.isBuffer(e)){r.size=e.length,this._encode(r);var n=this.push(e);return t1(i,r.size),n?process.nextTick(t):this._drain=t,new vE}if(r.type==="symlink"&&!r.linkname){var s=new TQ;return due(s,function(a){if(a)return i.destroy(),t(a);r.linkname=s.linkname,i._encode(r),t()}),s}if(this._encode(r),r.type!=="file"&&r.type!=="contiguous-file")return process.nextTick(t),new vE;var o=new NQ(this);return this._stream=o,due(o,function(a){if(i._stream=null,a)return i.destroy(),t(a);if(o.written!==r.size)return i.destroy(),t(new Error("size mismatch"));t1(i,r.size),i._finalizing&&i.finalize(),t()}),o}};la.prototype.finalize=function(){if(this._stream){this._finalizing=!0;return}this._finalized||(this._finalized=!0,this.push(mue),this.push(null))};la.prototype.destroy=function(r){this._destroyed||(this._destroyed=!0,r&&this.emit("error",r),this.emit("close"),this._stream&&this._stream.destroy&&this._stream.destroy())};la.prototype._encode=function(r){if(!r.pax){var e=RQ.encode(r);if(e){this.push(e);return}}this._encodePax(r)};la.prototype._encodePax=function(r){var e=RQ.encodePax({name:r.name,linkname:r.linkname,pax:r.pax}),t={name:"PaxHeader",mode:r.mode,uid:r.uid,gid:r.gid,size:e.length,mtime:r.mtime,type:"pax-header",linkname:r.linkname&&"PaxHeader",uname:r.uname,gname:r.gname,devmajor:r.devmajor,devminor:r.devminor};this.push(RQ.encode(t)),this.push(e),t1(this,e.length),t.size=r.size,t.type=r.type,this.push(RQ.encode(t))};la.prototype._read=function(r){var e=this._drain;this._drain=r1,e()};Eue.exports=la});var yue=w(i1=>{i1.extract=fue();i1.pack=Iue()});var Fue=w((qQt,Rue)=>{"use strict";var Xu=class{constructor(e,t,i){this.__specs=e||{},Object.keys(this.__specs).forEach(n=>{if(typeof this.__specs[n]=="string"){let s=this.__specs[n],o=this.__specs[s];if(o){let a=o.aliases||[];a.push(n,s),o.aliases=[...new Set(a)],this.__specs[n]=o}else throw new Error(`Alias refers to invalid key: ${s} -> ${n}`)}}),this.__opts=t||{},this.__providers=Due(i.filter(n=>n!=null&&typeof n=="object")),this.__isFiggyPudding=!0}get(e){return l1(this,e,!0)}get[Symbol.toStringTag](){return"FiggyPudding"}forEach(e,t=this){for(let[i,n]of this.entries())e.call(t,n,i,this)}toJSON(){let e={};return this.forEach((t,i)=>{e[i]=t}),e}*entries(e){for(let i of Object.keys(this.__specs))yield[i,this.get(i)];let t=e||this.__opts.other;if(t){let i=new Set;for(let n of this.__providers){let s=n.entries?n.entries(t):TVe(n);for(let[o,a]of s)t(o)&&!i.has(o)&&(i.add(o),yield[o,a])}}}*[Symbol.iterator](){for(let[e,t]of this.entries())yield[e,t]}*keys(){for(let[e]of this.entries())yield e}*values(){for(let[,e]of this.entries())yield e}concat(...e){return new Proxy(new Xu(this.__specs,this.__opts,Due(this.__providers).concat(e)),kue)}};try{let r=J("util");Xu.prototype[r.inspect.custom]=function(e,t){return this[Symbol.toStringTag]+" "+r.inspect(this.toJSON(),t)}}catch{}function FVe(r){throw Object.assign(new Error(`invalid config key requested: ${r}`),{code:"EBADKEY"})}function l1(r,e,t){let i=r.__specs[e];if(t&&!i&&(!r.__opts.other||!r.__opts.other(e)))FVe(e);else{i||(i={});let n;for(let s of r.__providers){if(n=Pue(e,s),n===void 0&&i.aliases&&i.aliases.length){for(let o of i.aliases)if(o!==e&&(n=Pue(o,s),n!==void 0))break}if(n!==void 0)break}return n===void 0&&i.default!==void 0?typeof i.default=="function"?i.default(r):i.default:n}}function Pue(r,e){let t;return e.__isFiggyPudding?t=l1(e,r,!1):typeof e.get=="function"?t=e.get(r):t=e[r],t}var kue={has(r,e){return e in r.__specs&&l1(r,e,!1)!==void 0},ownKeys(r){return Object.keys(r.__specs)},get(r,e){return typeof e=="symbol"||e.slice(0,2)==="__"||e in Xu.prototype?r[e]:r.get(e)},set(r,e,t){if(typeof e=="symbol"||e.slice(0,2)==="__")return r[e]=t,!0;throw new Error("figgyPudding options cannot be modified. Use .concat() instead.")},deleteProperty(){throw new Error("figgyPudding options cannot be deleted. Use .concat() and shadow them instead.")}};Rue.exports=NVe;function NVe(r,e){function t(...i){return new Proxy(new Xu(r,e,i),kue)}return t}function Due(r){let e=[];return r.forEach(t=>e.unshift(t)),e}function TVe(r){return Object.keys(r).map(e=>[e,r[e]])}});var Lue=w((JQt,ga)=>{"use strict";var PE=J("crypto"),LVe=Fue(),OVe=J("stream").Transform,Nue=["sha256","sha384","sha512"],MVe=/^[a-z0-9+/]+(?:=?=?)$/i,KVe=/^([^-]+)-([^?]+)([?\S*]*)$/,UVe=/^([^-]+)-([A-Za-z0-9+/=]{44,88})(\?[\x21-\x7E]*)*$/,HVe=/^[\x21-\x7E]+$/,An=LVe({algorithms:{default:["sha512"]},error:{default:!1},integrity:{},options:{default:[]},pickAlgorithm:{default:()=>VVe},Promise:{default:()=>Promise},sep:{default:" "},single:{default:!1},size:{},strict:{default:!1}}),Nl=class{get isHash(){return!0}constructor(e,t){t=An(t);let i=!!t.strict;this.source=e.trim();let n=this.source.match(i?UVe:KVe);if(!n||i&&!Nue.some(o=>o===n[1]))return;this.algorithm=n[1],this.digest=n[2];let s=n[3];this.options=s?s.slice(1).split("?"):[]}hexDigest(){return this.digest&&Buffer.from(this.digest,"base64").toString("hex")}toJSON(){return this.toString()}toString(e){if(e=An(e),e.strict&&!(Nue.some(i=>i===this.algorithm)&&this.digest.match(MVe)&&(this.options||[]).every(i=>i.match(HVe))))return"";let t=this.options&&this.options.length?`?${this.options.join("?")}`:"";return`${this.algorithm}-${this.digest}${t}`}},Zu=class{get isIntegrity(){return!0}toJSON(){return this.toString()}toString(e){e=An(e);let t=e.sep||" ";return e.strict&&(t=t.replace(/\S+/g," ")),Object.keys(this).map(i=>this[i].map(n=>Nl.prototype.toString.call(n,e)).filter(n=>n.length).join(t)).filter(i=>i.length).join(t)}concat(e,t){t=An(t);let i=typeof e=="string"?e:xE(e,t);return ua(`${this.toString(t)} ${i}`,t)}hexDigest(){return ua(this,{single:!0}).hexDigest()}match(e,t){t=An(t);let i=ua(e,t),n=i.pickAlgorithm(t);return this[n]&&i[n]&&this[n].find(s=>i[n].find(o=>s.digest===o.digest))||!1}pickAlgorithm(e){e=An(e);let t=e.pickAlgorithm,i=Object.keys(this);if(!i.length)throw new Error(`No algorithms available for ${JSON.stringify(this.toString())}`);return i.reduce((n,s)=>t(n,s)||n)}};ga.exports.parse=ua;function ua(r,e){if(e=An(e),typeof r=="string")return c1(r,e);if(r.algorithm&&r.digest){let t=new Zu;return t[r.algorithm]=[r],c1(xE(t,e),e)}else return c1(xE(r,e),e)}function c1(r,e){return e.single?new Nl(r,e):r.trim().split(/\s+/).reduce((t,i)=>{let n=new Nl(i,e);if(n.algorithm&&n.digest){let s=n.algorithm;t[s]||(t[s]=[]),t[s].push(n)}return t},new Zu)}ga.exports.stringify=xE;function xE(r,e){return e=An(e),r.algorithm&&r.digest?Nl.prototype.toString.call(r,e):typeof r=="string"?xE(ua(r,e),e):Zu.prototype.toString.call(r,e)}ga.exports.fromHex=GVe;function GVe(r,e,t){t=An(t);let i=t.options&&t.options.length?`?${t.options.join("?")}`:"";return ua(`${e}-${Buffer.from(r,"hex").toString("base64")}${i}`,t)}ga.exports.fromData=YVe;function YVe(r,e){e=An(e);let t=e.algorithms,i=e.options&&e.options.length?`?${e.options.join("?")}`:"";return t.reduce((n,s)=>{let o=PE.createHash(s).update(r).digest("base64"),a=new Nl(`${s}-${o}${i}`,e);if(a.algorithm&&a.digest){let l=a.algorithm;n[l]||(n[l]=[]),n[l].push(a)}return n},new Zu)}ga.exports.fromStream=jVe;function jVe(r,e){e=An(e);let t=e.Promise||Promise,i=u1(e);return new t((n,s)=>{r.pipe(i),r.on("error",s),i.on("error",s);let o;i.on("integrity",a=>{o=a}),i.on("end",()=>n(o)),i.on("data",()=>{})})}ga.exports.checkData=qVe;function qVe(r,e,t){if(t=An(t),e=ua(e,t),!Object.keys(e).length){if(t.error)throw Object.assign(new Error("No valid integrity hashes to check against"),{code:"EINTEGRITY"});return!1}let i=e.pickAlgorithm(t),n=PE.createHash(i).update(r).digest("base64"),s=ua({algorithm:i,digest:n}),o=s.match(e,t);if(o||!t.error)return o;if(typeof t.size=="number"&&r.length!==t.size){let a=new Error(`data size mismatch when checking ${e}.
-  Wanted: ${t.size}
-  Found: ${r.length}`);throw a.code="EBADSIZE",a.found=r.length,a.expected=t.size,a.sri=e,a}else{let a=new Error(`Integrity checksum failed when using ${i}: Wanted ${e}, but got ${s}. (${r.length} bytes)`);throw a.code="EINTEGRITY",a.found=s,a.expected=e,a.algorithm=i,a.sri=e,a}}ga.exports.checkStream=JVe;function JVe(r,e,t){t=An(t);let i=t.Promise||Promise,n=u1(t.concat({integrity:e}));return new i((s,o)=>{r.pipe(n),r.on("error",o),n.on("error",o);let a;n.on("verified",l=>{a=l}),n.on("end",()=>s(a)),n.on("data",()=>{})})}ga.exports.integrityStream=u1;function u1(r){r=An(r);let e=r.integrity&&ua(r.integrity,r),t=e&&Object.keys(e).length,i=t&&e.pickAlgorithm(r),n=t&&e[i],s=Array.from(new Set(r.algorithms.concat(i?[i]:[]))),o=s.map(PE.createHash),a=0,l=new OVe({transform(c,u,g){a+=c.length,o.forEach(f=>f.update(c,u)),g(null,c,u)}}).on("end",()=>{let c=r.options&&r.options.length?`?${r.options.join("?")}`:"",u=ua(o.map((f,h)=>`${s[h]}-${f.digest("base64")}${c}`).join(" "),r),g=t&&u.match(e,r);if(typeof r.size=="number"&&a!==r.size){let f=new Error(`stream size mismatch when checking ${e}.
-  Wanted: ${r.size}
-  Found: ${a}`);f.code="EBADSIZE",f.found=a,f.expected=r.size,f.sri=e,l.emit("error",f)}else if(r.integrity&&!g){let f=new Error(`${e} integrity checksum failed when using ${i}: wanted ${n} but got ${u}. (${a} bytes)`);f.code="EINTEGRITY",f.found=u,f.expected=n,f.algorithm=i,f.sri=e,l.emit("error",f)}else l.emit("size",a),l.emit("integrity",u),g&&l.emit("verified",g)});return l}ga.exports.create=WVe;function WVe(r){r=An(r);let e=r.algorithms,t=r.options.length?`?${r.options.join("?")}`:"",i=e.map(PE.createHash);return{update:function(n,s){return i.forEach(o=>o.update(n,s)),this},digest:function(n){return e.reduce((o,a)=>{let l=i.shift().digest("base64"),c=new Nl(`${a}-${l}${t}`,r);if(c.algorithm&&c.digest){let u=c.algorithm;o[u]||(o[u]=[]),o[u].push(c)}return o},new Zu)}}}var zVe=new Set(PE.getHashes()),Tue=["md5","whirlpool","sha1","sha224","sha256","sha384","sha512","sha3","sha3-256","sha3-384","sha3-512","sha3_256","sha3_384","sha3_512"].filter(r=>zVe.has(r));function VVe(r,e){return Tue.indexOf(r.toLowerCase())>=Tue.indexOf(e.toLowerCase())?r:e}});var sm={};ut(sm,{BuildType:()=>O0,Cache:()=>Rt,Configuration:()=>ye,DEFAULT_LOCK_FILENAME:()=>ok,DEFAULT_RC_FILENAME:()=>sk,FormatType:()=>xi,InstallMode:()=>ts,LightReport:()=>ra,LinkType:()=>Ef,Manifest:()=>ot,MessageName:()=>Ct,MultiFetcher:()=>Df,PackageExtensionStatus:()=>Xx,PackageExtensionType:()=>Vx,Project:()=>je,ProjectLookup:()=>ck,Report:()=>vi,ReportError:()=>at,SettingsType:()=>ak,StreamReport:()=>Ge,TAG_REGEXP:()=>Rf,TelemetryManager:()=>Sh,ThrowReport:()=>ti,VirtualFetcher:()=>Ff,Workspace:()=>Qh,WorkspaceFetcher:()=>Tf,WorkspaceResolver:()=>Yr,YarnVersion:()=>Tr,execUtils:()=>Cr,folderUtils:()=>Tw,formatUtils:()=>ee,hashUtils:()=>li,httpUtils:()=>Xt,miscUtils:()=>Ie,nodeUtils:()=>ws,parseMessageName:()=>LI,scriptUtils:()=>Wt,semverUtils:()=>vt,stringifyMessageName:()=>FA,structUtils:()=>P,tgzUtils:()=>mi,treeUtils:()=>es});var Cr={};ut(Cr,{EndStrategy:()=>hk,ExecError:()=>Yw,PipeError:()=>dC,execvp:()=>tk,pipevp:()=>oo});var Wp={};ut(Wp,{AliasFS:()=>So,CustomDir:()=>Hp,CwdFS:()=>qt,DEFAULT_COMPRESSION_LEVEL:()=>Xl,FakeFS:()=>ya,Filename:()=>xt,JailFS:()=>vo,LazyFS:()=>Sg,LinkStrategy:()=>CS,NoFS:()=>jp,NodeFS:()=>$t,PortablePath:()=>Oe,PosixFS:()=>vg,ProxiedFS:()=>pi,VirtualFS:()=>Br,ZipFS:()=>Wr,ZipOpenFS:()=>Kn,constants:()=>xr,extendFs:()=>AI,normalizeLineEndings:()=>Vl,npath:()=>K,opendir:()=>tI,patchFs:()=>bS,ppath:()=>x,statUtils:()=>Op,toFilename:()=>Jr,xfs:()=>M});var xr={};ut(xr,{SAFE_TIME:()=>sK,S_IFDIR:()=>Jl,S_IFLNK:()=>zl,S_IFMT:()=>qs,S_IFREG:()=>Wl});var qs=61440,Jl=16384,Wl=32768,zl=40960,sK=456789e3;var Op={};ut(Op,{BigIntStatsEntry:()=>Bg,DEFAULT_MODE:()=>Tp,DirEntry:()=>cS,StatEntry:()=>Ia,areStatsEqual:()=>gS,clearStats:()=>WE,convertToBigIntStats:()=>zE,makeDefaultStats:()=>Lp,makeEmptyStats:()=>Oge});var uS=Pe(J("util"));var Tp=33188,cS=class{constructor(){this.name="";this.mode=0}isBlockDevice(){return!1}isCharacterDevice(){return!1}isDirectory(){return(this.mode&61440)===16384}isFIFO(){return!1}isFile(){return(this.mode&61440)===32768}isSocket(){return!1}isSymbolicLink(){return(this.mode&61440)===40960}},Ia=class{constructor(){this.uid=0;this.gid=0;this.size=0;this.blksize=0;this.atimeMs=0;this.mtimeMs=0;this.ctimeMs=0;this.birthtimeMs=0;this.atime=new Date(0);this.mtime=new Date(0);this.ctime=new Date(0);this.birthtime=new Date(0);this.dev=0;this.ino=0;this.mode=Tp;this.nlink=1;this.rdev=0;this.blocks=1}isBlockDevice(){return!1}isCharacterDevice(){return!1}isDirectory(){return(this.mode&61440)===16384}isFIFO(){return!1}isFile(){return(this.mode&61440)===32768}isSocket(){return!1}isSymbolicLink(){return(this.mode&61440)===40960}},Bg=class{constructor(){this.uid=BigInt(0);this.gid=BigInt(0);this.size=BigInt(0);this.blksize=BigInt(0);this.atimeMs=BigInt(0);this.mtimeMs=BigInt(0);this.ctimeMs=BigInt(0);this.birthtimeMs=BigInt(0);this.atimeNs=BigInt(0);this.mtimeNs=BigInt(0);this.ctimeNs=BigInt(0);this.birthtimeNs=BigInt(0);this.atime=new Date(0);this.mtime=new Date(0);this.ctime=new Date(0);this.birthtime=new Date(0);this.dev=BigInt(0);this.ino=BigInt(0);this.mode=BigInt(Tp);this.nlink=BigInt(1);this.rdev=BigInt(0);this.blocks=BigInt(1)}isBlockDevice(){return!1}isCharacterDevice(){return!1}isDirectory(){return(this.mode&BigInt(61440))===BigInt(16384)}isFIFO(){return!1}isFile(){return(this.mode&BigInt(61440))===BigInt(32768)}isSocket(){return!1}isSymbolicLink(){return(this.mode&BigInt(61440))===BigInt(40960)}};function Lp(){return new Ia}function Oge(){return WE(Lp())}function WE(r){for(let e in r)if(Object.prototype.hasOwnProperty.call(r,e)){let t=r[e];typeof t=="number"?r[e]=0:typeof t=="bigint"?r[e]=BigInt(0):uS.types.isDate(t)&&(r[e]=new Date(0))}return r}function zE(r){let e=new Bg;for(let t in r)if(Object.prototype.hasOwnProperty.call(r,t)){let i=r[t];typeof i=="number"?e[t]=BigInt(i):uS.types.isDate(i)&&(e[t]=new Date(i))}return e.atimeNs=e.atimeMs*BigInt(1e6),e.mtimeNs=e.mtimeMs*BigInt(1e6),e.ctimeNs=e.ctimeMs*BigInt(1e6),e.birthtimeNs=e.birthtimeMs*BigInt(1e6),e}function gS(r,e){if(r.atimeMs!==e.atimeMs||r.birthtimeMs!==e.birthtimeMs||r.blksize!==e.blksize||r.blocks!==e.blocks||r.ctimeMs!==e.ctimeMs||r.dev!==e.dev||r.gid!==e.gid||r.ino!==e.ino||r.isBlockDevice()!==e.isBlockDevice()||r.isCharacterDevice()!==e.isCharacterDevice()||r.isDirectory()!==e.isDirectory()||r.isFIFO()!==e.isFIFO()||r.isFile()!==e.isFile()||r.isSocket()!==e.isSocket()||r.isSymbolicLink()!==e.isSymbolicLink()||r.mode!==e.mode||r.mtimeMs!==e.mtimeMs||r.nlink!==e.nlink||r.rdev!==e.rdev||r.size!==e.size||r.uid!==e.uid)return!1;let t=r,i=e;return!(t.atimeNs!==i.atimeNs||t.mtimeNs!==i.mtimeNs||t.ctimeNs!==i.ctimeNs||t.birthtimeNs!==i.birthtimeNs)}var XE=Pe(J("fs"));var Mp=Pe(J("path"));var Oe={root:"/",dot:".",parent:".."},xt={nodeModules:"node_modules",manifest:"package.json",lockfile:"yarn.lock",virtual:"__virtual__",pnpJs:".pnp.js",pnpCjs:".pnp.cjs",rc:".yarnrc.yml"},K=Object.create(Mp.default),x=Object.create(Mp.default.posix);K.cwd=()=>process.cwd();x.cwd=()=>fS(process.cwd());x.resolve=(...r)=>r.length>0&&x.isAbsolute(r[0])?Mp.default.posix.resolve(...r):Mp.default.posix.resolve(x.cwd(),...r);var oK=function(r,e,t){return e=r.normalize(e),t=r.normalize(t),e===t?".":(e.endsWith(r.sep)||(e=e+r.sep),t.startsWith(e)?t.slice(e.length):null)};K.fromPortablePath=aK;K.toPortablePath=fS;K.contains=(r,e)=>oK(K,r,e);x.contains=(r,e)=>oK(x,r,e);var Mge=/^([a-zA-Z]:.*)$/,Kge=/^\/\/(\.\/)?(.*)$/,Uge=/^\/([a-zA-Z]:.*)$/,Hge=/^\/unc\/(\.dot\/)?(.*)$/;function aK(r){if(process.platform!=="win32")return r;let e,t;if(e=r.match(Uge))r=e[1];else if(t=r.match(Hge))r=`\\\\${t[1]?".\\":""}${t[2]}`;else return r;return r.replace(/\//g,"\\")}function fS(r){if(process.platform!=="win32")return r;r=r.replace(/\\/g,"/");let e,t;return(e=r.match(Mge))?r=`/${e[1]}`:(t=r.match(Kge))&&(r=`/unc/${t[1]?".dot/":""}${t[2]}`),r}function VE(r,e){return r===K?aK(e):fS(e)}function Jr(r){if(K.parse(r).dir!==""||x.parse(r).dir!=="")throw new Error(`Invalid filename: "${r}"`);return r}var ZE=new Date(456789e3*1e3),CS=(t=>(t.Allow="allow",t.ReadOnly="readOnly",t))(CS||{});async function AK(r,e,t,i,n){let s=r.pathUtils.normalize(e),o=t.pathUtils.normalize(i),a=[],l=[],{atime:c,mtime:u}=n.stableTime?{atime:ZE,mtime:ZE}:await t.lstatPromise(o);await r.mkdirpPromise(r.pathUtils.dirname(e),{utimes:[c,u]});let g=typeof r.lutimesPromise=="function"?r.lutimesPromise.bind(r):r.utimesPromise.bind(r);await pS(a,l,g,r,s,t,o,{...n,didParentExist:!0});for(let f of a)await f();await Promise.all(l.map(f=>f()))}async function pS(r,e,t,i,n,s,o,a){var h,p;let l=a.didParentExist?await Gge(i,n):null,c=await s.lstatPromise(o),{atime:u,mtime:g}=a.stableTime?{atime:ZE,mtime:ZE}:c,f;switch(!0){case c.isDirectory():f=await Yge(r,e,t,i,n,l,s,o,c,a);break;case c.isFile():f=await qge(r,e,t,i,n,l,s,o,c,a);break;case c.isSymbolicLink():f=await Jge(r,e,t,i,n,l,s,o,c,a);break;default:throw new Error(`Unsupported file type (${c.mode})`)}return(f||((h=l==null?void 0:l.mtime)==null?void 0:h.getTime())!==g.getTime()||((p=l==null?void 0:l.atime)==null?void 0:p.getTime())!==u.getTime())&&(e.push(()=>t(n,u,g)),f=!0),(l===null||(l.mode&511)!==(c.mode&511))&&(e.push(()=>i.chmodPromise(n,c.mode&511)),f=!0),f}async function Gge(r,e){try{return await r.lstatPromise(e)}catch{return null}}async function Yge(r,e,t,i,n,s,o,a,l,c){if(s!==null&&!s.isDirectory())if(c.overwrite)r.push(async()=>i.removePromise(n)),s=null;else return!1;let u=!1;s===null&&(r.push(async()=>{try{await i.mkdirPromise(n,{mode:l.mode})}catch(h){if(h.code!=="EEXIST")throw h}}),u=!0);let g=await o.readdirPromise(a),f=c.didParentExist&&!s?{...c,didParentExist:!1}:c;if(c.stableSort)for(let h of g.sort())await pS(r,e,t,i,i.pathUtils.join(n,h),o,o.pathUtils.join(a,h),f)&&(u=!0);else(await Promise.all(g.map(async p=>{await pS(r,e,t,i,i.pathUtils.join(n,p),o,o.pathUtils.join(a,p),f)}))).some(p=>p)&&(u=!0);return u}var hS=new WeakMap;function dS(r,e,t,i,n){return async()=>{await r.linkPromise(t,e),n==="readOnly"&&(i.mode&=-147,await r.chmodPromise(e,i.mode))}}function jge(r,e,t,i,n){let s=hS.get(r);return typeof s>"u"?async()=>{try{await r.copyFilePromise(t,e,XE.default.constants.COPYFILE_FICLONE_FORCE),hS.set(r,!0)}catch(o){if(o.code==="ENOSYS"||o.code==="ENOTSUP")hS.set(r,!1),await dS(r,e,t,i,n)();else throw o}}:s?async()=>r.copyFilePromise(t,e,XE.default.constants.COPYFILE_FICLONE_FORCE):dS(r,e,t,i,n)}async function qge(r,e,t,i,n,s,o,a,l,c){var f;if(s!==null)if(c.overwrite)r.push(async()=>i.removePromise(n)),s=null;else return!1;let u=(f=c.linkStrategy)!=null?f:null,g=i===o?u!==null?jge(i,n,a,l,u):async()=>i.copyFilePromise(a,n,XE.default.constants.COPYFILE_FICLONE):u!==null?dS(i,n,a,l,u):async()=>i.writeFilePromise(n,await o.readFilePromise(a));return r.push(async()=>g()),!0}async function Jge(r,e,t,i,n,s,o,a,l,c){if(s!==null)if(c.overwrite)r.push(async()=>i.removePromise(n)),s=null;else return!1;return r.push(async()=>{await i.symlinkPromise(VE(i.pathUtils,await o.readlinkPromise(a)),n)}),!0}function As(r,e){return Object.assign(new Error(`${r}: ${e}`),{code:r})}function $E(r){return As("EBUSY",r)}function Kp(r,e){return As("ENOSYS",`${r}, ${e}`)}function vA(r){return As("EINVAL",`invalid argument, ${r}`)}function Ur(r){return As("EBADF",`bad file descriptor, ${r}`)}function Js(r){return As("ENOENT",`no such file or directory, ${r}`)}function Qo(r){return As("ENOTDIR",`not a directory, ${r}`)}function Up(r){return As("EISDIR",`illegal operation on a directory, ${r}`)}function eI(r){return As("EEXIST",`file already exists, ${r}`)}function un(r){return As("EROFS",`read-only filesystem, ${r}`)}function lK(r){return As("ENOTEMPTY",`directory not empty, ${r}`)}function cK(r){return As("EOPNOTSUPP",`operation not supported, ${r}`)}function uK(){return As("ERR_DIR_CLOSED","Directory handle was closed")}var _E=class extends Error{constructor(t,i){super(t);this.name="Libzip Error",this.code=i}};var Hp=class{constructor(e,t,i={}){this.path=e;this.nextDirent=t;this.opts=i;this.closed=!1}throwIfClosed(){if(this.closed)throw uK()}async*[Symbol.asyncIterator](){try{let e;for(;(e=await this.read())!==null;)yield e}finally{await this.close()}}read(e){let t=this.readSync();return typeof e<"u"?e(null,t):Promise.resolve(t)}readSync(){return this.throwIfClosed(),this.nextDirent()}close(e){return this.closeSync(),typeof e<"u"?e(null):Promise.resolve()}closeSync(){var e,t;this.throwIfClosed(),(t=(e=this.opts).onClose)==null||t.call(e),this.closed=!0}};function tI(r,e,t,i){let n=()=>{let s=t.shift();return typeof s>"u"?null:Object.assign(r.statSync(r.pathUtils.join(e,s)),{name:s})};return new Hp(e,n,i)}var gK=J("os");var ya=class{constructor(e){this.pathUtils=e}async*genTraversePromise(e,{stableSort:t=!1}={}){let i=[e];for(;i.length>0;){let n=i.shift();if((await this.lstatPromise(n)).isDirectory()){let o=await this.readdirPromise(n);if(t)for(let a of o.sort())i.push(this.pathUtils.join(n,a));else throw new Error("Not supported")}else yield n}}async removePromise(e,{recursive:t=!0,maxRetries:i=5}={}){let n;try{n=await this.lstatPromise(e)}catch(s){if(s.code==="ENOENT")return;throw s}if(n.isDirectory()){if(t){let s=await this.readdirPromise(e);await Promise.all(s.map(o=>this.removePromise(this.pathUtils.resolve(e,o))))}for(let s=0;s<=i;s++)try{await this.rmdirPromise(e);break}catch(o){if(o.code!=="EBUSY"&&o.code!=="ENOTEMPTY")throw o;s<i&&await new Promise(a=>setTimeout(a,s*100))}}else await this.unlinkPromise(e)}removeSync(e,{recursive:t=!0}={}){let i;try{i=this.lstatSync(e)}catch(n){if(n.code==="ENOENT")return;throw n}if(i.isDirectory()){if(t)for(let n of this.readdirSync(e))this.removeSync(this.pathUtils.resolve(e,n));this.rmdirSync(e)}else this.unlinkSync(e)}async mkdirpPromise(e,{chmod:t,utimes:i}={}){if(e=this.resolve(e),e===this.pathUtils.dirname(e))return;let n=e.split(this.pathUtils.sep),s;for(let o=2;o<=n.length;++o){let a=n.slice(0,o).join(this.pathUtils.sep);if(!this.existsSync(a)){try{await this.mkdirPromise(a)}catch(l){if(l.code==="EEXIST")continue;throw l}if(s!=null||(s=a),t!=null&&await this.chmodPromise(a,t),i!=null)await this.utimesPromise(a,i[0],i[1]);else{let l=await this.statPromise(this.pathUtils.dirname(a));await this.utimesPromise(a,l.atime,l.mtime)}}}return s}mkdirpSync(e,{chmod:t,utimes:i}={}){if(e=this.resolve(e),e===this.pathUtils.dirname(e))return;let n=e.split(this.pathUtils.sep),s;for(let o=2;o<=n.length;++o){let a=n.slice(0,o).join(this.pathUtils.sep);if(!this.existsSync(a)){try{this.mkdirSync(a)}catch(l){if(l.code==="EEXIST")continue;throw l}if(s!=null||(s=a),t!=null&&this.chmodSync(a,t),i!=null)this.utimesSync(a,i[0],i[1]);else{let l=this.statSync(this.pathUtils.dirname(a));this.utimesSync(a,l.atime,l.mtime)}}}return s}async copyPromise(e,t,{baseFs:i=this,overwrite:n=!0,stableSort:s=!1,stableTime:o=!1,linkStrategy:a=null}={}){return await AK(this,e,i,t,{overwrite:n,stableSort:s,stableTime:o,linkStrategy:a})}copySync(e,t,{baseFs:i=this,overwrite:n=!0}={}){let s=i.lstatSync(t),o=this.existsSync(e);if(s.isDirectory()){this.mkdirpSync(e);let l=i.readdirSync(t);for(let c of l)this.copySync(this.pathUtils.join(e,c),i.pathUtils.join(t,c),{baseFs:i,overwrite:n})}else if(s.isFile()){if(!o||n){o&&this.removeSync(e);let l=i.readFileSync(t);this.writeFileSync(e,l)}}else if(s.isSymbolicLink()){if(!o||n){o&&this.removeSync(e);let l=i.readlinkSync(t);this.symlinkSync(VE(this.pathUtils,l),e)}}else throw new Error(`Unsupported file type (file: ${t}, mode: 0o${s.mode.toString(8).padStart(6,"0")})`);let a=s.mode&511;this.chmodSync(e,a)}async changeFilePromise(e,t,i={}){return Buffer.isBuffer(t)?this.changeFileBufferPromise(e,t,i):this.changeFileTextPromise(e,t,i)}async changeFileBufferPromise(e,t,{mode:i}={}){let n=Buffer.alloc(0);try{n=await this.readFilePromise(e)}catch{}Buffer.compare(n,t)!==0&&await this.writeFilePromise(e,t,{mode:i})}async changeFileTextPromise(e,t,{automaticNewlines:i,mode:n}={}){let s="";try{s=await this.readFilePromise(e,"utf8")}catch{}let o=i?Vl(s,t):t;s!==o&&await this.writeFilePromise(e,o,{mode:n})}changeFileSync(e,t,i={}){return Buffer.isBuffer(t)?this.changeFileBufferSync(e,t,i):this.changeFileTextSync(e,t,i)}changeFileBufferSync(e,t,{mode:i}={}){let n=Buffer.alloc(0);try{n=this.readFileSync(e)}catch{}Buffer.compare(n,t)!==0&&this.writeFileSync(e,t,{mode:i})}changeFileTextSync(e,t,{automaticNewlines:i=!1,mode:n}={}){let s="";try{s=this.readFileSync(e,"utf8")}catch{}let o=i?Vl(s,t):t;s!==o&&this.writeFileSync(e,o,{mode:n})}async movePromise(e,t){try{await this.renamePromise(e,t)}catch(i){if(i.code==="EXDEV")await this.copyPromise(t,e),await this.removePromise(e);else throw i}}moveSync(e,t){try{this.renameSync(e,t)}catch(i){if(i.code==="EXDEV")this.copySync(t,e),this.removeSync(e);else throw i}}async lockPromise(e,t){let i=`${e}.flock`,n=1e3/60,s=Date.now(),o=null,a=async()=>{let l;try{[l]=await this.readJsonPromise(i)}catch{return Date.now()-s<500}try{return process.kill(l,0),!0}catch{return!1}};for(;o===null;)try{o=await this.openPromise(i,"wx")}catch(l){if(l.code==="EEXIST"){if(!await a())try{await this.unlinkPromise(i);continue}catch{}if(Date.now()-s<60*1e3)await new Promise(c=>setTimeout(c,n));else throw new Error(`Couldn't acquire a lock in a reasonable time (via ${i})`)}else throw l}await this.writePromise(o,JSON.stringify([process.pid]));try{return await t()}finally{try{await this.closePromise(o),await this.unlinkPromise(i)}catch{}}}async readJsonPromise(e){let t=await this.readFilePromise(e,"utf8");try{return JSON.parse(t)}catch(i){throw i.message+=` (in ${e})`,i}}readJsonSync(e){let t=this.readFileSync(e,"utf8");try{return JSON.parse(t)}catch(i){throw i.message+=` (in ${e})`,i}}async writeJsonPromise(e,t){return await this.writeFilePromise(e,`${JSON.stringify(t,null,2)}
-`)}writeJsonSync(e,t){return this.writeFileSync(e,`${JSON.stringify(t,null,2)}
-`)}async preserveTimePromise(e,t){let i=await this.lstatPromise(e),n=await t();typeof n<"u"&&(e=n),this.lutimesPromise?await this.lutimesPromise(e,i.atime,i.mtime):i.isSymbolicLink()||await this.utimesPromise(e,i.atime,i.mtime)}async preserveTimeSync(e,t){let i=this.lstatSync(e),n=t();typeof n<"u"&&(e=n),this.lutimesSync?this.lutimesSync(e,i.atime,i.mtime):i.isSymbolicLink()||this.utimesSync(e,i.atime,i.mtime)}},xA=class extends ya{constructor(){super(x)}};function Wge(r){let e=r.match(/\r?\n/g);if(e===null)return gK.EOL;let t=e.filter(n=>n===`\r
-`).length,i=e.length-t;return t>i?`\r
-`:`
-`}function Vl(r,e){return e.replace(/\r?\n/g,Wge(r))}var Qg=J("fs"),IS=J("stream"),dK=J("util"),yS=Pe(J("zlib"));var fK=Pe(J("fs"));var $t=class extends xA{constructor(t=fK.default){super();this.realFs=t,typeof this.realFs.lutimes<"u"&&(this.lutimesPromise=this.lutimesPromiseImpl,this.lutimesSync=this.lutimesSyncImpl)}getExtractHint(){return!1}getRealPath(){return Oe.root}resolve(t){return x.resolve(t)}async openPromise(t,i,n){return await new Promise((s,o)=>{this.realFs.open(K.fromPortablePath(t),i,n,this.makeCallback(s,o))})}openSync(t,i,n){return this.realFs.openSync(K.fromPortablePath(t),i,n)}async opendirPromise(t,i){return await new Promise((n,s)=>{typeof i<"u"?this.realFs.opendir(K.fromPortablePath(t),i,this.makeCallback(n,s)):this.realFs.opendir(K.fromPortablePath(t),this.makeCallback(n,s))}).then(n=>Object.defineProperty(n,"path",{value:t,configurable:!0,writable:!0}))}opendirSync(t,i){let n=typeof i<"u"?this.realFs.opendirSync(K.fromPortablePath(t),i):this.realFs.opendirSync(K.fromPortablePath(t));return Object.defineProperty(n,"path",{value:t,configurable:!0,writable:!0})}async readPromise(t,i,n=0,s=0,o=-1){return await new Promise((a,l)=>{this.realFs.read(t,i,n,s,o,(c,u)=>{c?l(c):a(u)})})}readSync(t,i,n,s,o){return this.realFs.readSync(t,i,n,s,o)}async writePromise(t,i,n,s,o){return await new Promise((a,l)=>typeof i=="string"?this.realFs.write(t,i,n,this.makeCallback(a,l)):this.realFs.write(t,i,n,s,o,this.makeCallback(a,l)))}writeSync(t,i,n,s,o){return typeof i=="string"?this.realFs.writeSync(t,i,n):this.realFs.writeSync(t,i,n,s,o)}async closePromise(t){await new Promise((i,n)=>{this.realFs.close(t,this.makeCallback(i,n))})}closeSync(t){this.realFs.closeSync(t)}createReadStream(t,i){let n=t!==null?K.fromPortablePath(t):t;return this.realFs.createReadStream(n,i)}createWriteStream(t,i){let n=t!==null?K.fromPortablePath(t):t;return this.realFs.createWriteStream(n,i)}async realpathPromise(t){return await new Promise((i,n)=>{this.realFs.realpath(K.fromPortablePath(t),{},this.makeCallback(i,n))}).then(i=>K.toPortablePath(i))}realpathSync(t){return K.toPortablePath(this.realFs.realpathSync(K.fromPortablePath(t),{}))}async existsPromise(t){return await new Promise(i=>{this.realFs.exists(K.fromPortablePath(t),i)})}accessSync(t,i){return this.realFs.accessSync(K.fromPortablePath(t),i)}async accessPromise(t,i){return await new Promise((n,s)=>{this.realFs.access(K.fromPortablePath(t),i,this.makeCallback(n,s))})}existsSync(t){return this.realFs.existsSync(K.fromPortablePath(t))}async statPromise(t,i){return await new Promise((n,s)=>{i?this.realFs.stat(K.fromPortablePath(t),i,this.makeCallback(n,s)):this.realFs.stat(K.fromPortablePath(t),this.makeCallback(n,s))})}statSync(t,i){return i?this.realFs.statSync(K.fromPortablePath(t),i):this.realFs.statSync(K.fromPortablePath(t))}async fstatPromise(t,i){return await new Promise((n,s)=>{i?this.realFs.fstat(t,i,this.makeCallback(n,s)):this.realFs.fstat(t,this.makeCallback(n,s))})}fstatSync(t,i){return i?this.realFs.fstatSync(t,i):this.realFs.fstatSync(t)}async lstatPromise(t,i){return await new Promise((n,s)=>{i?this.realFs.lstat(K.fromPortablePath(t),i,this.makeCallback(n,s)):this.realFs.lstat(K.fromPortablePath(t),this.makeCallback(n,s))})}lstatSync(t,i){return i?this.realFs.lstatSync(K.fromPortablePath(t),i):this.realFs.lstatSync(K.fromPortablePath(t))}async fchmodPromise(t,i){return await new Promise((n,s)=>{this.realFs.fchmod(t,i,this.makeCallback(n,s))})}fchmodSync(t,i){return this.realFs.fchmodSync(t,i)}async chmodPromise(t,i){return await new Promise((n,s)=>{this.realFs.chmod(K.fromPortablePath(t),i,this.makeCallback(n,s))})}chmodSync(t,i){return this.realFs.chmodSync(K.fromPortablePath(t),i)}async fchownPromise(t,i,n){return await new Promise((s,o)=>{this.realFs.fchown(t,i,n,this.makeCallback(s,o))})}fchownSync(t,i,n){return this.realFs.fchownSync(t,i,n)}async chownPromise(t,i,n){return await new Promise((s,o)=>{this.realFs.chown(K.fromPortablePath(t),i,n,this.makeCallback(s,o))})}chownSync(t,i,n){return this.realFs.chownSync(K.fromPortablePath(t),i,n)}async renamePromise(t,i){return await new Promise((n,s)=>{this.realFs.rename(K.fromPortablePath(t),K.fromPortablePath(i),this.makeCallback(n,s))})}renameSync(t,i){return this.realFs.renameSync(K.fromPortablePath(t),K.fromPortablePath(i))}async copyFilePromise(t,i,n=0){return await new Promise((s,o)=>{this.realFs.copyFile(K.fromPortablePath(t),K.fromPortablePath(i),n,this.makeCallback(s,o))})}copyFileSync(t,i,n=0){return this.realFs.copyFileSync(K.fromPortablePath(t),K.fromPortablePath(i),n)}async appendFilePromise(t,i,n){return await new Promise((s,o)=>{let a=typeof t=="string"?K.fromPortablePath(t):t;n?this.realFs.appendFile(a,i,n,this.makeCallback(s,o)):this.realFs.appendFile(a,i,this.makeCallback(s,o))})}appendFileSync(t,i,n){let s=typeof t=="string"?K.fromPortablePath(t):t;n?this.realFs.appendFileSync(s,i,n):this.realFs.appendFileSync(s,i)}async writeFilePromise(t,i,n){return await new Promise((s,o)=>{let a=typeof t=="string"?K.fromPortablePath(t):t;n?this.realFs.writeFile(a,i,n,this.makeCallback(s,o)):this.realFs.writeFile(a,i,this.makeCallback(s,o))})}writeFileSync(t,i,n){let s=typeof t=="string"?K.fromPortablePath(t):t;n?this.realFs.writeFileSync(s,i,n):this.realFs.writeFileSync(s,i)}async unlinkPromise(t){return await new Promise((i,n)=>{this.realFs.unlink(K.fromPortablePath(t),this.makeCallback(i,n))})}unlinkSync(t){return this.realFs.unlinkSync(K.fromPortablePath(t))}async utimesPromise(t,i,n){return await new Promise((s,o)=>{this.realFs.utimes(K.fromPortablePath(t),i,n,this.makeCallback(s,o))})}utimesSync(t,i,n){this.realFs.utimesSync(K.fromPortablePath(t),i,n)}async lutimesPromiseImpl(t,i,n){let s=this.realFs.lutimes;if(typeof s>"u")throw Kp("unavailable Node binding",`lutimes '${t}'`);return await new Promise((o,a)=>{s.call(this.realFs,K.fromPortablePath(t),i,n,this.makeCallback(o,a))})}lutimesSyncImpl(t,i,n){let s=this.realFs.lutimesSync;if(typeof s>"u")throw Kp("unavailable Node binding",`lutimes '${t}'`);s.call(this.realFs,K.fromPortablePath(t),i,n)}async mkdirPromise(t,i){return await new Promise((n,s)=>{this.realFs.mkdir(K.fromPortablePath(t),i,this.makeCallback(n,s))})}mkdirSync(t,i){return this.realFs.mkdirSync(K.fromPortablePath(t),i)}async rmdirPromise(t,i){return await new Promise((n,s)=>{i?this.realFs.rmdir(K.fromPortablePath(t),i,this.makeCallback(n,s)):this.realFs.rmdir(K.fromPortablePath(t),this.makeCallback(n,s))})}rmdirSync(t,i){return this.realFs.rmdirSync(K.fromPortablePath(t),i)}async linkPromise(t,i){return await new Promise((n,s)=>{this.realFs.link(K.fromPortablePath(t),K.fromPortablePath(i),this.makeCallback(n,s))})}linkSync(t,i){return this.realFs.linkSync(K.fromPortablePath(t),K.fromPortablePath(i))}async symlinkPromise(t,i,n){return await new Promise((s,o)=>{this.realFs.symlink(K.fromPortablePath(t.replace(/\/+$/,"")),K.fromPortablePath(i),n,this.makeCallback(s,o))})}symlinkSync(t,i,n){return this.realFs.symlinkSync(K.fromPortablePath(t.replace(/\/+$/,"")),K.fromPortablePath(i),n)}async readFilePromise(t,i){return await new Promise((n,s)=>{let o=typeof t=="string"?K.fromPortablePath(t):t;this.realFs.readFile(o,i,this.makeCallback(n,s))})}readFileSync(t,i){let n=typeof t=="string"?K.fromPortablePath(t):t;return this.realFs.readFileSync(n,i)}async readdirPromise(t,i){return await new Promise((n,s)=>{i!=null&&i.withFileTypes?this.realFs.readdir(K.fromPortablePath(t),{withFileTypes:!0},this.makeCallback(n,s)):this.realFs.readdir(K.fromPortablePath(t),this.makeCallback(o=>n(o),s))})}readdirSync(t,i){return i!=null&&i.withFileTypes?this.realFs.readdirSync(K.fromPortablePath(t),{withFileTypes:!0}):this.realFs.readdirSync(K.fromPortablePath(t))}async readlinkPromise(t){return await new Promise((i,n)=>{this.realFs.readlink(K.fromPortablePath(t),this.makeCallback(i,n))}).then(i=>K.toPortablePath(i))}readlinkSync(t){return K.toPortablePath(this.realFs.readlinkSync(K.fromPortablePath(t)))}async truncatePromise(t,i){return await new Promise((n,s)=>{this.realFs.truncate(K.fromPortablePath(t),i,this.makeCallback(n,s))})}truncateSync(t,i){return this.realFs.truncateSync(K.fromPortablePath(t),i)}async ftruncatePromise(t,i){return await new Promise((n,s)=>{this.realFs.ftruncate(t,i,this.makeCallback(n,s))})}ftruncateSync(t,i){return this.realFs.ftruncateSync(t,i)}watch(t,i,n){return this.realFs.watch(K.fromPortablePath(t),i,n)}watchFile(t,i,n){return this.realFs.watchFile(K.fromPortablePath(t),i,n)}unwatchFile(t,i){return this.realFs.unwatchFile(K.fromPortablePath(t),i)}makeCallback(t,i){return(n,s)=>{n?i(n):t(s)}}};var pK=J("events");function hK(r,e){if(r!==e)throw new Error(`Invalid StatWatcher status: expected '${e}', got '${r}'`)}var bg=class extends pK.EventEmitter{constructor(t,i,{bigint:n=!1}={}){super();this.status="ready";this.changeListeners=new Map;this.startTimeout=null;this.fakeFs=t,this.path=i,this.bigint=n,this.lastStats=this.stat()}static create(t,i,n){let s=new bg(t,i,n);return s.start(),s}start(){hK(this.status,"ready"),this.status="running",this.startTimeout=setTimeout(()=>{this.startTimeout=null,this.fakeFs.existsSync(this.path)||this.emit("change",this.lastStats,this.lastStats)},3)}stop(){hK(this.status,"running"),this.status="stopped",this.startTimeout!==null&&(clearTimeout(this.startTimeout),this.startTimeout=null),this.emit("stop")}stat(){try{return this.fakeFs.statSync(this.path,{bigint:this.bigint})}catch{let i=this.bigint?new Bg:new Ia;return WE(i)}}makeInterval(t){let i=setInterval(()=>{let n=this.stat(),s=this.lastStats;gS(n,s)||(this.lastStats=n,this.emit("change",n,s))},t.interval);return t.persistent?i:i.unref()}registerChangeListener(t,i){this.addListener("change",t),this.changeListeners.set(t,this.makeInterval(i))}unregisterChangeListener(t){this.removeListener("change",t);let i=this.changeListeners.get(t);typeof i<"u"&&clearInterval(i),this.changeListeners.delete(t)}unregisterAllChangeListeners(){for(let t of this.changeListeners.keys())this.unregisterChangeListener(t)}hasChangeListeners(){return this.changeListeners.size>0}ref(){for(let t of this.changeListeners.values())t.ref();return this}unref(){for(let t of this.changeListeners.values())t.unref();return this}};var rI=new WeakMap;function iI(r,e,t,i){let n,s,o,a;switch(typeof t){case"function":n=!1,s=!0,o=5007,a=t;break;default:({bigint:n=!1,persistent:s=!0,interval:o=5007}=t),a=i;break}let l=rI.get(r);typeof l>"u"&&rI.set(r,l=new Map);let c=l.get(e);return typeof c>"u"&&(c=bg.create(r,e,{bigint:n}),l.set(e,c)),c.registerChangeListener(a,{persistent:s,interval:o}),c}function Gp(r,e,t){let i=rI.get(r);if(typeof i>"u")return;let n=i.get(e);typeof n>"u"||(typeof t>"u"?n.unregisterAllChangeListeners():n.unregisterChangeListener(t),n.hasChangeListeners()||(n.stop(),i.delete(e)))}function Yp(r){let e=rI.get(r);if(!(typeof e>"u"))for(let t of e.keys())Gp(r,t)}var Xl="mixed";function zge(r){if(typeof r=="string"&&String(+r)===r)return+r;if(typeof r=="number"&&Number.isFinite(r))return r<0?Date.now()/1e3:r;if(dK.types.isDate(r))return r.getTime()/1e3;throw new Error("Invalid time")}function ES(){return Buffer.from([80,75,5,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0])}var Wr=class extends xA{constructor(t,i){super();this.lzSource=null;this.listings=new Map;this.entries=new Map;this.fileSources=new Map;this.fds=new Map;this.nextFd=0;this.ready=!1;this.readOnly=!1;this.libzip=i.libzip;let n=i;if(this.level=typeof n.level<"u"?n.level:Xl,t!=null||(t=ES()),typeof t=="string"){let{baseFs:a=new $t}=n;this.baseFs=a,this.path=t}else this.path=null,this.baseFs=null;if(i.stats)this.stats=i.stats;else if(typeof t=="string")try{this.stats=this.baseFs.statSync(t)}catch(a){if(a.code==="ENOENT"&&n.create)this.stats=Lp();else throw a}else this.stats=Lp();let s=this.libzip.malloc(4);try{let a=0;if(typeof t=="string"&&n.create&&(a|=this.libzip.ZIP_CREATE|this.libzip.ZIP_TRUNCATE),i.readOnly&&(a|=this.libzip.ZIP_RDONLY,this.readOnly=!0),typeof t=="string")this.zip=this.libzip.open(K.fromPortablePath(t),a,s);else{let l=this.allocateUnattachedSource(t);try{this.zip=this.libzip.openFromSource(l,a,s),this.lzSource=l}catch(c){throw this.libzip.source.free(l),c}}if(this.zip===0){let l=this.libzip.struct.errorS();throw this.libzip.error.initWithCode(l,this.libzip.getValue(s,"i32")),this.makeLibzipError(l)}}finally{this.libzip.free(s)}this.listings.set(Oe.root,new Set);let o=this.libzip.getNumEntries(this.zip,0);for(let a=0;a<o;++a){let l=this.libzip.getName(this.zip,a,0);if(x.isAbsolute(l))continue;let c=x.resolve(Oe.root,l);this.registerEntry(c,a),l.endsWith("/")&&this.registerListing(c)}if(this.symlinkCount=this.libzip.ext.countSymlinks(this.zip),this.symlinkCount===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));this.ready=!0}makeLibzipError(t){let i=this.libzip.struct.errorCodeZip(t),n=this.libzip.error.strerror(t),s=new _E(n,this.libzip.errors[i]);if(i===this.libzip.errors.ZIP_ER_CHANGED)throw new Error(`Assertion failed: Unexpected libzip error: ${s.message}`);return s}getExtractHint(t){for(let i of this.entries.keys()){let n=this.pathUtils.extname(i);if(t.relevantExtensions.has(n))return!0}return!1}getAllFiles(){return Array.from(this.entries.keys())}getRealPath(){if(!this.path)throw new Error("ZipFS don't have real paths when loaded from a buffer");return this.path}getBufferAndClose(){if(this.prepareClose(),!this.lzSource)throw new Error("ZipFS was not created from a Buffer");if(this.entries.size===0)return this.discardAndClose(),ES();try{if(this.libzip.source.keep(this.lzSource),this.libzip.close(this.zip)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));if(this.libzip.source.open(this.lzSource)===-1)throw this.makeLibzipError(this.libzip.source.error(this.lzSource));if(this.libzip.source.seek(this.lzSource,0,0,this.libzip.SEEK_END)===-1)throw this.makeLibzipError(this.libzip.source.error(this.lzSource));let t=this.libzip.source.tell(this.lzSource);if(t===-1)throw this.makeLibzipError(this.libzip.source.error(this.lzSource));if(this.libzip.source.seek(this.lzSource,0,0,this.libzip.SEEK_SET)===-1)throw this.makeLibzipError(this.libzip.source.error(this.lzSource));let i=this.libzip.malloc(t);if(!i)throw new Error("Couldn't allocate enough memory");try{let n=this.libzip.source.read(this.lzSource,i,t);if(n===-1)throw this.makeLibzipError(this.libzip.source.error(this.lzSource));if(n<t)throw new Error("Incomplete read");if(n>t)throw new Error("Overread");let s=this.libzip.HEAPU8.subarray(i,i+t);return Buffer.from(s)}finally{this.libzip.free(i)}}finally{this.libzip.source.close(this.lzSource),this.libzip.source.free(this.lzSource),this.ready=!1}}prepareClose(){if(!this.ready)throw $E("archive closed, close");Yp(this)}saveAndClose(){if(!this.path||!this.baseFs)throw new Error("ZipFS cannot be saved and must be discarded when loaded from a buffer");if(this.prepareClose(),this.readOnly){this.discardAndClose();return}let t=this.baseFs.existsSync(this.path)||this.stats.mode===Tp?void 0:this.stats.mode;if(this.entries.size===0)this.discardAndClose(),this.baseFs.writeFileSync(this.path,ES(),{mode:t});else{if(this.libzip.close(this.zip)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));typeof t<"u"&&this.baseFs.chmodSync(this.path,t)}this.ready=!1}discardAndClose(){this.prepareClose(),this.libzip.discard(this.zip),this.ready=!1}resolve(t){return x.resolve(Oe.root,t)}async openPromise(t,i,n){return this.openSync(t,i,n)}openSync(t,i,n){let s=this.nextFd++;return this.fds.set(s,{cursor:0,p:t}),s}hasOpenFileHandles(){return!!this.fds.size}async opendirPromise(t,i){return this.opendirSync(t,i)}opendirSync(t,i={}){let n=this.resolveFilename(`opendir '${t}'`,t);if(!this.entries.has(n)&&!this.listings.has(n))throw Js(`opendir '${t}'`);let s=this.listings.get(n);if(!s)throw Qo(`opendir '${t}'`);let o=[...s],a=this.openSync(n,"r");return tI(this,n,o,{onClose:()=>{this.closeSync(a)}})}async readPromise(t,i,n,s,o){return this.readSync(t,i,n,s,o)}readSync(t,i,n=0,s=i.byteLength,o=-1){let a=this.fds.get(t);if(typeof a>"u")throw Ur("read");let l=o===-1||o===null?a.cursor:o,c=this.readFileSync(a.p);c.copy(i,n,l,l+s);let u=Math.max(0,Math.min(c.length-l,s));return(o===-1||o===null)&&(a.cursor+=u),u}async writePromise(t,i,n,s,o){return typeof i=="string"?this.writeSync(t,i,o):this.writeSync(t,i,n,s,o)}writeSync(t,i,n,s,o){throw typeof this.fds.get(t)>"u"?Ur("read"):new Error("Unimplemented")}async closePromise(t){return this.closeSync(t)}closeSync(t){if(typeof this.fds.get(t)>"u")throw Ur("read");this.fds.delete(t)}createReadStream(t,{encoding:i}={}){if(t===null)throw new Error("Unimplemented");let n=this.openSync(t,"r"),s=Object.assign(new IS.PassThrough({emitClose:!0,autoDestroy:!0,destroy:(a,l)=>{clearImmediate(o),this.closeSync(n),l(a)}}),{close(){s.destroy()},bytesRead:0,path:t}),o=setImmediate(async()=>{try{let a=await this.readFilePromise(t,i);s.bytesRead=a.length,s.end(a)}catch(a){s.destroy(a)}});return s}createWriteStream(t,{encoding:i}={}){if(this.readOnly)throw un(`open '${t}'`);if(t===null)throw new Error("Unimplemented");let n=[],s=this.openSync(t,"w"),o=Object.assign(new IS.PassThrough({autoDestroy:!0,emitClose:!0,destroy:(a,l)=>{try{a?l(a):(this.writeFileSync(t,Buffer.concat(n),i),l(null))}catch(c){l(c)}finally{this.closeSync(s)}}}),{bytesWritten:0,path:t,close(){o.destroy()}});return o.on("data",a=>{let l=Buffer.from(a);o.bytesWritten+=l.length,n.push(l)}),o}async realpathPromise(t){return this.realpathSync(t)}realpathSync(t){let i=this.resolveFilename(`lstat '${t}'`,t);if(!this.entries.has(i)&&!this.listings.has(i))throw Js(`lstat '${t}'`);return i}async existsPromise(t){return this.existsSync(t)}existsSync(t){if(!this.ready)throw $E(`archive closed, existsSync '${t}'`);if(this.symlinkCount===0){let n=x.resolve(Oe.root,t);return this.entries.has(n)||this.listings.has(n)}let i;try{i=this.resolveFilename(`stat '${t}'`,t,void 0,!1)}catch{return!1}return i===void 0?!1:this.entries.has(i)||this.listings.has(i)}async accessPromise(t,i){return this.accessSync(t,i)}accessSync(t,i=Qg.constants.F_OK){let n=this.resolveFilename(`access '${t}'`,t);if(!this.entries.has(n)&&!this.listings.has(n))throw Js(`access '${t}'`);if(this.readOnly&&i&Qg.constants.W_OK)throw un(`access '${t}'`)}async statPromise(t,i={bigint:!1}){return i.bigint?this.statSync(t,{bigint:!0}):this.statSync(t)}statSync(t,i={bigint:!1,throwIfNoEntry:!0}){let n=this.resolveFilename(`stat '${t}'`,t,void 0,i.throwIfNoEntry);if(n!==void 0){if(!this.entries.has(n)&&!this.listings.has(n)){if(i.throwIfNoEntry===!1)return;throw Js(`stat '${t}'`)}if(t[t.length-1]==="/"&&!this.listings.has(n))throw Qo(`stat '${t}'`);return this.statImpl(`stat '${t}'`,n,i)}}async fstatPromise(t,i){return this.fstatSync(t,i)}fstatSync(t,i){let n=this.fds.get(t);if(typeof n>"u")throw Ur("fstatSync");let{p:s}=n,o=this.resolveFilename(`stat '${s}'`,s);if(!this.entries.has(o)&&!this.listings.has(o))throw Js(`stat '${s}'`);if(s[s.length-1]==="/"&&!this.listings.has(o))throw Qo(`stat '${s}'`);return this.statImpl(`fstat '${s}'`,o,i)}async lstatPromise(t,i={bigint:!1}){return i.bigint?this.lstatSync(t,{bigint:!0}):this.lstatSync(t)}lstatSync(t,i={bigint:!1,throwIfNoEntry:!0}){let n=this.resolveFilename(`lstat '${t}'`,t,!1,i.throwIfNoEntry);if(n!==void 0){if(!this.entries.has(n)&&!this.listings.has(n)){if(i.throwIfNoEntry===!1)return;throw Js(`lstat '${t}'`)}if(t[t.length-1]==="/"&&!this.listings.has(n))throw Qo(`lstat '${t}'`);return this.statImpl(`lstat '${t}'`,n,i)}}statImpl(t,i,n={}){let s=this.entries.get(i);if(typeof s<"u"){let o=this.libzip.struct.statS();if(this.libzip.statIndex(this.zip,s,0,0,o)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));let l=this.stats.uid,c=this.stats.gid,u=this.libzip.struct.statSize(o)>>>0,g=512,f=Math.ceil(u/g),h=(this.libzip.struct.statMtime(o)>>>0)*1e3,p=h,C=h,y=h,B=new Date(p),v=new Date(C),D=new Date(y),T=new Date(h),H=this.listings.has(i)?16384:this.isSymbolicLink(s)?40960:32768,j=H===16384?493:420,$=H|this.getUnixMode(s,j)&511,V=this.libzip.struct.statCrc(o),W=Object.assign(new Ia,{uid:l,gid:c,size:u,blksize:g,blocks:f,atime:B,birthtime:v,ctime:D,mtime:T,atimeMs:p,birthtimeMs:C,ctimeMs:y,mtimeMs:h,mode:$,crc:V});return n.bigint===!0?zE(W):W}if(this.listings.has(i)){let o=this.stats.uid,a=this.stats.gid,l=0,c=512,u=0,g=this.stats.mtimeMs,f=this.stats.mtimeMs,h=this.stats.mtimeMs,p=this.stats.mtimeMs,C=new Date(g),y=new Date(f),B=new Date(h),v=new Date(p),D=16877,T=0,H=Object.assign(new Ia,{uid:o,gid:a,size:l,blksize:c,blocks:u,atime:C,birthtime:y,ctime:B,mtime:v,atimeMs:g,birthtimeMs:f,ctimeMs:h,mtimeMs:p,mode:D,crc:T});return n.bigint===!0?zE(H):H}throw new Error("Unreachable")}getUnixMode(t,i){if(this.libzip.file.getExternalAttributes(this.zip,t,0,0,this.libzip.uint08S,this.libzip.uint32S)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));return this.libzip.getValue(this.libzip.uint08S,"i8")>>>0!==this.libzip.ZIP_OPSYS_UNIX?i:this.libzip.getValue(this.libzip.uint32S,"i32")>>>16}registerListing(t){let i=this.listings.get(t);if(i)return i;this.registerListing(x.dirname(t)).add(x.basename(t));let s=new Set;return this.listings.set(t,s),s}registerEntry(t,i){this.registerListing(x.dirname(t)).add(x.basename(t)),this.entries.set(t,i)}unregisterListing(t){this.listings.delete(t);let i=this.listings.get(x.dirname(t));i==null||i.delete(x.basename(t))}unregisterEntry(t){this.unregisterListing(t);let i=this.entries.get(t);this.entries.delete(t),!(typeof i>"u")&&(this.fileSources.delete(i),this.isSymbolicLink(i)&&this.symlinkCount--)}deleteEntry(t,i){if(this.unregisterEntry(t),this.libzip.delete(this.zip,i)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip))}resolveFilename(t,i,n=!0,s=!0){if(!this.ready)throw $E(`archive closed, ${t}`);let o=x.resolve(Oe.root,i);if(o==="/")return Oe.root;let a=this.entries.get(o);if(n&&a!==void 0)if(this.symlinkCount!==0&&this.isSymbolicLink(a)){let l=this.getFileSource(a).toString();return this.resolveFilename(t,x.resolve(x.dirname(o),l),!0,s)}else return o;for(;;){let l=this.resolveFilename(t,x.dirname(o),!0,s);if(l===void 0)return l;let c=this.listings.has(l),u=this.entries.has(l);if(!c&&!u){if(s===!1)return;throw Js(t)}if(!c)throw Qo(t);if(o=x.resolve(l,x.basename(o)),!n||this.symlinkCount===0)break;let g=this.libzip.name.locate(this.zip,o.slice(1),0);if(g===-1)break;if(this.isSymbolicLink(g)){let f=this.getFileSource(g).toString();o=x.resolve(x.dirname(o),f)}else break}return o}allocateBuffer(t){Buffer.isBuffer(t)||(t=Buffer.from(t));let i=this.libzip.malloc(t.byteLength);if(!i)throw new Error("Couldn't allocate enough memory");return new Uint8Array(this.libzip.HEAPU8.buffer,i,t.byteLength).set(t),{buffer:i,byteLength:t.byteLength}}allocateUnattachedSource(t){let i=this.libzip.struct.errorS(),{buffer:n,byteLength:s}=this.allocateBuffer(t),o=this.libzip.source.fromUnattachedBuffer(n,s,0,1,i);if(o===0)throw this.libzip.free(i),this.makeLibzipError(i);return o}allocateSource(t){let{buffer:i,byteLength:n}=this.allocateBuffer(t),s=this.libzip.source.fromBuffer(this.zip,i,n,0,1);if(s===0)throw this.libzip.free(i),this.makeLibzipError(this.libzip.getError(this.zip));return s}setFileSource(t,i){let n=Buffer.isBuffer(i)?i:Buffer.from(i),s=x.relative(Oe.root,t),o=this.allocateSource(i);try{let a=this.libzip.file.add(this.zip,s,o,this.libzip.ZIP_FL_OVERWRITE);if(a===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));if(this.level!=="mixed"){let l=this.level===0?this.libzip.ZIP_CM_STORE:this.libzip.ZIP_CM_DEFLATE;if(this.libzip.file.setCompression(this.zip,a,0,l,this.level)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip))}return this.fileSources.set(a,n),a}catch(a){throw this.libzip.source.free(o),a}}isSymbolicLink(t){if(this.symlinkCount===0)return!1;if(this.libzip.file.getExternalAttributes(this.zip,t,0,0,this.libzip.uint08S,this.libzip.uint32S)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));return this.libzip.getValue(this.libzip.uint08S,"i8")>>>0!==this.libzip.ZIP_OPSYS_UNIX?!1:(this.libzip.getValue(this.libzip.uint32S,"i32")>>>16&61440)===40960}getFileSource(t,i={asyncDecompress:!1}){let n=this.fileSources.get(t);if(typeof n<"u")return n;let s=this.libzip.struct.statS();if(this.libzip.statIndex(this.zip,t,0,0,s)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));let a=this.libzip.struct.statCompSize(s),l=this.libzip.struct.statCompMethod(s),c=this.libzip.malloc(a);try{let u=this.libzip.fopenIndex(this.zip,t,0,this.libzip.ZIP_FL_COMPRESSED);if(u===0)throw this.makeLibzipError(this.libzip.getError(this.zip));try{let g=this.libzip.fread(u,c,a,0);if(g===-1)throw this.makeLibzipError(this.libzip.file.getError(u));if(g<a)throw new Error("Incomplete read");if(g>a)throw new Error("Overread");let f=this.libzip.HEAPU8.subarray(c,c+a),h=Buffer.from(f);if(l===0)return this.fileSources.set(t,h),h;if(i.asyncDecompress)return new Promise((p,C)=>{yS.default.inflateRaw(h,(y,B)=>{y?C(y):(this.fileSources.set(t,B),p(B))})});{let p=yS.default.inflateRawSync(h);return this.fileSources.set(t,p),p}}finally{this.libzip.fclose(u)}}finally{this.libzip.free(c)}}async fchmodPromise(t,i){return this.chmodPromise(this.fdToPath(t,"fchmod"),i)}fchmodSync(t,i){return this.chmodSync(this.fdToPath(t,"fchmodSync"),i)}async chmodPromise(t,i){return this.chmodSync(t,i)}chmodSync(t,i){if(this.readOnly)throw un(`chmod '${t}'`);i&=493;let n=this.resolveFilename(`chmod '${t}'`,t,!1),s=this.entries.get(n);if(typeof s>"u")throw new Error(`Assertion failed: The entry should have been registered (${n})`);let a=this.getUnixMode(s,32768)&-512|i;if(this.libzip.file.setExternalAttributes(this.zip,s,0,0,this.libzip.ZIP_OPSYS_UNIX,a<<16)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip))}async fchownPromise(t,i,n){return this.chownPromise(this.fdToPath(t,"fchown"),i,n)}fchownSync(t,i,n){return this.chownSync(this.fdToPath(t,"fchownSync"),i,n)}async chownPromise(t,i,n){return this.chownSync(t,i,n)}chownSync(t,i,n){throw new Error("Unimplemented")}async renamePromise(t,i){return this.renameSync(t,i)}renameSync(t,i){throw new Error("Unimplemented")}async copyFilePromise(t,i,n){let{indexSource:s,indexDest:o,resolvedDestP:a}=this.prepareCopyFile(t,i,n),l=await this.getFileSource(s,{asyncDecompress:!0}),c=this.setFileSource(a,l);c!==o&&this.registerEntry(a,c)}copyFileSync(t,i,n=0){let{indexSource:s,indexDest:o,resolvedDestP:a}=this.prepareCopyFile(t,i,n),l=this.getFileSource(s),c=this.setFileSource(a,l);c!==o&&this.registerEntry(a,c)}prepareCopyFile(t,i,n=0){if(this.readOnly)throw un(`copyfile '${t} -> '${i}'`);if((n&Qg.constants.COPYFILE_FICLONE_FORCE)!==0)throw Kp("unsupported clone operation",`copyfile '${t}' -> ${i}'`);let s=this.resolveFilename(`copyfile '${t} -> ${i}'`,t),o=this.entries.get(s);if(typeof o>"u")throw vA(`copyfile '${t}' -> '${i}'`);let a=this.resolveFilename(`copyfile '${t}' -> ${i}'`,i),l=this.entries.get(a);if((n&(Qg.constants.COPYFILE_EXCL|Qg.constants.COPYFILE_FICLONE_FORCE))!==0&&typeof l<"u")throw eI(`copyfile '${t}' -> '${i}'`);return{indexSource:o,resolvedDestP:a,indexDest:l}}async appendFilePromise(t,i,n){if(this.readOnly)throw un(`open '${t}'`);return typeof n>"u"?n={flag:"a"}:typeof n=="string"?n={flag:"a",encoding:n}:typeof n.flag>"u"&&(n={flag:"a",...n}),this.writeFilePromise(t,i,n)}appendFileSync(t,i,n={}){if(this.readOnly)throw un(`open '${t}'`);return typeof n>"u"?n={flag:"a"}:typeof n=="string"?n={flag:"a",encoding:n}:typeof n.flag>"u"&&(n={flag:"a",...n}),this.writeFileSync(t,i,n)}fdToPath(t,i){var s;let n=(s=this.fds.get(t))==null?void 0:s.p;if(typeof n>"u")throw Ur(i);return n}async writeFilePromise(t,i,n){let{encoding:s,mode:o,index:a,resolvedP:l}=this.prepareWriteFile(t,n);a!==void 0&&typeof n=="object"&&n.flag&&n.flag.includes("a")&&(i=Buffer.concat([await this.getFileSource(a,{asyncDecompress:!0}),Buffer.from(i)])),s!==null&&(i=i.toString(s));let c=this.setFileSource(l,i);c!==a&&this.registerEntry(l,c),o!==null&&await this.chmodPromise(l,o)}writeFileSync(t,i,n){let{encoding:s,mode:o,index:a,resolvedP:l}=this.prepareWriteFile(t,n);a!==void 0&&typeof n=="object"&&n.flag&&n.flag.includes("a")&&(i=Buffer.concat([this.getFileSource(a),Buffer.from(i)])),s!==null&&(i=i.toString(s));let c=this.setFileSource(l,i);c!==a&&this.registerEntry(l,c),o!==null&&this.chmodSync(l,o)}prepareWriteFile(t,i){if(typeof t=="number"&&(t=this.fdToPath(t,"read")),this.readOnly)throw un(`open '${t}'`);let n=this.resolveFilename(`open '${t}'`,t);if(this.listings.has(n))throw Up(`open '${t}'`);let s=null,o=null;typeof i=="string"?s=i:typeof i=="object"&&({encoding:s=null,mode:o=null}=i);let a=this.entries.get(n);return{encoding:s,mode:o,resolvedP:n,index:a}}async unlinkPromise(t){return this.unlinkSync(t)}unlinkSync(t){if(this.readOnly)throw un(`unlink '${t}'`);let i=this.resolveFilename(`unlink '${t}'`,t);if(this.listings.has(i))throw Up(`unlink '${t}'`);let n=this.entries.get(i);if(typeof n>"u")throw vA(`unlink '${t}'`);this.deleteEntry(i,n)}async utimesPromise(t,i,n){return this.utimesSync(t,i,n)}utimesSync(t,i,n){if(this.readOnly)throw un(`utimes '${t}'`);let s=this.resolveFilename(`utimes '${t}'`,t);this.utimesImpl(s,n)}async lutimesPromise(t,i,n){return this.lutimesSync(t,i,n)}lutimesSync(t,i,n){if(this.readOnly)throw un(`lutimes '${t}'`);let s=this.resolveFilename(`utimes '${t}'`,t,!1);this.utimesImpl(s,n)}utimesImpl(t,i){this.listings.has(t)&&(this.entries.has(t)||this.hydrateDirectory(t));let n=this.entries.get(t);if(n===void 0)throw new Error("Unreachable");if(this.libzip.file.setMtime(this.zip,n,0,zge(i),0)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip))}async mkdirPromise(t,i){return this.mkdirSync(t,i)}mkdirSync(t,{mode:i=493,recursive:n=!1}={}){if(n)return this.mkdirpSync(t,{chmod:i});if(this.readOnly)throw un(`mkdir '${t}'`);let s=this.resolveFilename(`mkdir '${t}'`,t);if(this.entries.has(s)||this.listings.has(s))throw eI(`mkdir '${t}'`);this.hydrateDirectory(s),this.chmodSync(s,i)}async rmdirPromise(t,i){return this.rmdirSync(t,i)}rmdirSync(t,{recursive:i=!1}={}){if(this.readOnly)throw un(`rmdir '${t}'`);if(i){this.removeSync(t);return}let n=this.resolveFilename(`rmdir '${t}'`,t),s=this.listings.get(n);if(!s)throw Qo(`rmdir '${t}'`);if(s.size>0)throw lK(`rmdir '${t}'`);let o=this.entries.get(n);if(typeof o>"u")throw vA(`rmdir '${t}'`);this.deleteEntry(t,o)}hydrateDirectory(t){let i=this.libzip.dir.add(this.zip,x.relative(Oe.root,t));if(i===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));return this.registerListing(t),this.registerEntry(t,i),i}async linkPromise(t,i){return this.linkSync(t,i)}linkSync(t,i){throw cK(`link '${t}' -> '${i}'`)}async symlinkPromise(t,i){return this.symlinkSync(t,i)}symlinkSync(t,i){if(this.readOnly)throw un(`symlink '${t}' -> '${i}'`);let n=this.resolveFilename(`symlink '${t}' -> '${i}'`,i);if(this.listings.has(n))throw Up(`symlink '${t}' -> '${i}'`);if(this.entries.has(n))throw eI(`symlink '${t}' -> '${i}'`);let s=this.setFileSource(n,t);if(this.registerEntry(n,s),this.libzip.file.setExternalAttributes(this.zip,s,0,0,this.libzip.ZIP_OPSYS_UNIX,41471<<16)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));this.symlinkCount+=1}async readFilePromise(t,i){typeof i=="object"&&(i=i?i.encoding:void 0);let n=await this.readFileBuffer(t,{asyncDecompress:!0});return i?n.toString(i):n}readFileSync(t,i){typeof i=="object"&&(i=i?i.encoding:void 0);let n=this.readFileBuffer(t);return i?n.toString(i):n}readFileBuffer(t,i={asyncDecompress:!1}){typeof t=="number"&&(t=this.fdToPath(t,"read"));let n=this.resolveFilename(`open '${t}'`,t);if(!this.entries.has(n)&&!this.listings.has(n))throw Js(`open '${t}'`);if(t[t.length-1]==="/"&&!this.listings.has(n))throw Qo(`open '${t}'`);if(this.listings.has(n))throw Up("read");let s=this.entries.get(n);if(s===void 0)throw new Error("Unreachable");return this.getFileSource(s,i)}async readdirPromise(t,i){return this.readdirSync(t,i)}readdirSync(t,i){let n=this.resolveFilename(`scandir '${t}'`,t);if(!this.entries.has(n)&&!this.listings.has(n))throw Js(`scandir '${t}'`);let s=this.listings.get(n);if(!s)throw Qo(`scandir '${t}'`);let o=[...s];return i!=null&&i.withFileTypes?o.map(a=>Object.assign(this.statImpl("lstat",x.join(t,a)),{name:a})):o}async readlinkPromise(t){let i=this.prepareReadlink(t);return(await this.getFileSource(i,{asyncDecompress:!0})).toString()}readlinkSync(t){let i=this.prepareReadlink(t);return this.getFileSource(i).toString()}prepareReadlink(t){let i=this.resolveFilename(`readlink '${t}'`,t,!1);if(!this.entries.has(i)&&!this.listings.has(i))throw Js(`readlink '${t}'`);if(t[t.length-1]==="/"&&!this.listings.has(i))throw Qo(`open '${t}'`);if(this.listings.has(i))throw vA(`readlink '${t}'`);let n=this.entries.get(i);if(n===void 0)throw new Error("Unreachable");if(!this.isSymbolicLink(n))throw vA(`readlink '${t}'`);return n}async truncatePromise(t,i=0){let n=this.resolveFilename(`open '${t}'`,t),s=this.entries.get(n);if(typeof s>"u")throw vA(`open '${t}'`);let o=await this.getFileSource(s,{asyncDecompress:!0}),a=Buffer.alloc(i,0);return o.copy(a),await this.writeFilePromise(t,a)}truncateSync(t,i=0){let n=this.resolveFilename(`open '${t}'`,t),s=this.entries.get(n);if(typeof s>"u")throw vA(`open '${t}'`);let o=this.getFileSource(s),a=Buffer.alloc(i,0);return o.copy(a),this.writeFileSync(t,a)}async ftruncatePromise(t,i){return this.truncatePromise(this.fdToPath(t,"ftruncate"),i)}ftruncateSync(t,i){return this.truncateSync(this.fdToPath(t,"ftruncateSync"),i)}watch(t,i,n){let s;switch(typeof i){case"function":case"string":case"undefined":s=!0;break;default:({persistent:s=!0}=i);break}if(!s)return{on:()=>{},close:()=>{}};let o=setInterval(()=>{},24*60*60*1e3);return{on:()=>{},close:()=>{clearInterval(o)}}}watchFile(t,i,n){let s=x.resolve(Oe.root,t);return iI(this,s,i,n)}unwatchFile(t,i){let n=x.resolve(Oe.root,t);return Gp(this,n,i)}};var pi=class extends ya{getExtractHint(e){return this.baseFs.getExtractHint(e)}resolve(e){return this.mapFromBase(this.baseFs.resolve(this.mapToBase(e)))}getRealPath(){return this.mapFromBase(this.baseFs.getRealPath())}async openPromise(e,t,i){return this.baseFs.openPromise(this.mapToBase(e),t,i)}openSync(e,t,i){return this.baseFs.openSync(this.mapToBase(e),t,i)}async opendirPromise(e,t){return Object.assign(await this.baseFs.opendirPromise(this.mapToBase(e),t),{path:e})}opendirSync(e,t){return Object.assign(this.baseFs.opendirSync(this.mapToBase(e),t),{path:e})}async readPromise(e,t,i,n,s){return await this.baseFs.readPromise(e,t,i,n,s)}readSync(e,t,i,n,s){return this.baseFs.readSync(e,t,i,n,s)}async writePromise(e,t,i,n,s){return typeof t=="string"?await this.baseFs.writePromise(e,t,i):await this.baseFs.writePromise(e,t,i,n,s)}writeSync(e,t,i,n,s){return typeof t=="string"?this.baseFs.writeSync(e,t,i):this.baseFs.writeSync(e,t,i,n,s)}async closePromise(e){return this.baseFs.closePromise(e)}closeSync(e){this.baseFs.closeSync(e)}createReadStream(e,t){return this.baseFs.createReadStream(e!==null?this.mapToBase(e):e,t)}createWriteStream(e,t){return this.baseFs.createWriteStream(e!==null?this.mapToBase(e):e,t)}async realpathPromise(e){return this.mapFromBase(await this.baseFs.realpathPromise(this.mapToBase(e)))}realpathSync(e){return this.mapFromBase(this.baseFs.realpathSync(this.mapToBase(e)))}async existsPromise(e){return this.baseFs.existsPromise(this.mapToBase(e))}existsSync(e){return this.baseFs.existsSync(this.mapToBase(e))}accessSync(e,t){return this.baseFs.accessSync(this.mapToBase(e),t)}async accessPromise(e,t){return this.baseFs.accessPromise(this.mapToBase(e),t)}async statPromise(e,t){return this.baseFs.statPromise(this.mapToBase(e),t)}statSync(e,t){return this.baseFs.statSync(this.mapToBase(e),t)}async fstatPromise(e,t){return this.baseFs.fstatPromise(e,t)}fstatSync(e,t){return this.baseFs.fstatSync(e,t)}lstatPromise(e,t){return this.baseFs.lstatPromise(this.mapToBase(e),t)}lstatSync(e,t){return this.baseFs.lstatSync(this.mapToBase(e),t)}async fchmodPromise(e,t){return this.baseFs.fchmodPromise(e,t)}fchmodSync(e,t){return this.baseFs.fchmodSync(e,t)}async chmodPromise(e,t){return this.baseFs.chmodPromise(this.mapToBase(e),t)}chmodSync(e,t){return this.baseFs.chmodSync(this.mapToBase(e),t)}async fchownPromise(e,t,i){return this.baseFs.fchownPromise(e,t,i)}fchownSync(e,t,i){return this.baseFs.fchownSync(e,t,i)}async chownPromise(e,t,i){return this.baseFs.chownPromise(this.mapToBase(e),t,i)}chownSync(e,t,i){return this.baseFs.chownSync(this.mapToBase(e),t,i)}async renamePromise(e,t){return this.baseFs.renamePromise(this.mapToBase(e),this.mapToBase(t))}renameSync(e,t){return this.baseFs.renameSync(this.mapToBase(e),this.mapToBase(t))}async copyFilePromise(e,t,i=0){return this.baseFs.copyFilePromise(this.mapToBase(e),this.mapToBase(t),i)}copyFileSync(e,t,i=0){return this.baseFs.copyFileSync(this.mapToBase(e),this.mapToBase(t),i)}async appendFilePromise(e,t,i){return this.baseFs.appendFilePromise(this.fsMapToBase(e),t,i)}appendFileSync(e,t,i){return this.baseFs.appendFileSync(this.fsMapToBase(e),t,i)}async writeFilePromise(e,t,i){return this.baseFs.writeFilePromise(this.fsMapToBase(e),t,i)}writeFileSync(e,t,i){return this.baseFs.writeFileSync(this.fsMapToBase(e),t,i)}async unlinkPromise(e){return this.baseFs.unlinkPromise(this.mapToBase(e))}unlinkSync(e){return this.baseFs.unlinkSync(this.mapToBase(e))}async utimesPromise(e,t,i){return this.baseFs.utimesPromise(this.mapToBase(e),t,i)}utimesSync(e,t,i){return this.baseFs.utimesSync(this.mapToBase(e),t,i)}async mkdirPromise(e,t){return this.baseFs.mkdirPromise(this.mapToBase(e),t)}mkdirSync(e,t){return this.baseFs.mkdirSync(this.mapToBase(e),t)}async rmdirPromise(e,t){return this.baseFs.rmdirPromise(this.mapToBase(e),t)}rmdirSync(e,t){return this.baseFs.rmdirSync(this.mapToBase(e),t)}async linkPromise(e,t){return this.baseFs.linkPromise(this.mapToBase(e),this.mapToBase(t))}linkSync(e,t){return this.baseFs.linkSync(this.mapToBase(e),this.mapToBase(t))}async symlinkPromise(e,t,i){let n=this.mapToBase(t);if(this.pathUtils.isAbsolute(e))return this.baseFs.symlinkPromise(this.mapToBase(e),n,i);let s=this.mapToBase(this.pathUtils.join(this.pathUtils.dirname(t),e)),o=this.baseFs.pathUtils.relative(this.baseFs.pathUtils.dirname(n),s);return this.baseFs.symlinkPromise(o,n,i)}symlinkSync(e,t,i){let n=this.mapToBase(t);if(this.pathUtils.isAbsolute(e))return this.baseFs.symlinkSync(this.mapToBase(e),n,i);let s=this.mapToBase(this.pathUtils.join(this.pathUtils.dirname(t),e)),o=this.baseFs.pathUtils.relative(this.baseFs.pathUtils.dirname(n),s);return this.baseFs.symlinkSync(o,n,i)}async readFilePromise(e,t){return t==="utf8"?this.baseFs.readFilePromise(this.fsMapToBase(e),t):this.baseFs.readFilePromise(this.fsMapToBase(e),t)}readFileSync(e,t){return t==="utf8"?this.baseFs.readFileSync(this.fsMapToBase(e),t):this.baseFs.readFileSync(this.fsMapToBase(e),t)}async readdirPromise(e,t){return this.baseFs.readdirPromise(this.mapToBase(e),t)}readdirSync(e,t){return this.baseFs.readdirSync(this.mapToBase(e),t)}async readlinkPromise(e){return this.mapFromBase(await this.baseFs.readlinkPromise(this.mapToBase(e)))}readlinkSync(e){return this.mapFromBase(this.baseFs.readlinkSync(this.mapToBase(e)))}async truncatePromise(e,t){return this.baseFs.truncatePromise(this.mapToBase(e),t)}truncateSync(e,t){return this.baseFs.truncateSync(this.mapToBase(e),t)}async ftruncatePromise(e,t){return this.baseFs.ftruncatePromise(e,t)}ftruncateSync(e,t){return this.baseFs.ftruncateSync(e,t)}watch(e,t,i){return this.baseFs.watch(this.mapToBase(e),t,i)}watchFile(e,t,i){return this.baseFs.watchFile(this.mapToBase(e),t,i)}unwatchFile(e,t){return this.baseFs.unwatchFile(this.mapToBase(e),t)}fsMapToBase(e){return typeof e=="number"?e:this.mapToBase(e)}};var So=class extends pi{constructor(t,{baseFs:i,pathUtils:n}){super(n);this.target=t,this.baseFs=i}getRealPath(){return this.target}getBaseFs(){return this.baseFs}mapFromBase(t){return t}mapToBase(t){return t}};var qt=class extends pi{constructor(t,{baseFs:i=new $t}={}){super(x);this.target=this.pathUtils.normalize(t),this.baseFs=i}getRealPath(){return this.pathUtils.resolve(this.baseFs.getRealPath(),this.target)}resolve(t){return this.pathUtils.isAbsolute(t)?x.normalize(t):this.baseFs.resolve(x.join(this.target,t))}mapFromBase(t){return t}mapToBase(t){return this.pathUtils.isAbsolute(t)?t:this.pathUtils.join(this.target,t)}};var CK=Oe.root,vo=class extends pi{constructor(t,{baseFs:i=new $t}={}){super(x);this.target=this.pathUtils.resolve(Oe.root,t),this.baseFs=i}getRealPath(){return this.pathUtils.resolve(this.baseFs.getRealPath(),this.pathUtils.relative(Oe.root,this.target))}getTarget(){return this.target}getBaseFs(){return this.baseFs}mapToBase(t){let i=this.pathUtils.normalize(t);if(this.pathUtils.isAbsolute(t))return this.pathUtils.resolve(this.target,this.pathUtils.relative(CK,t));if(i.match(/^\.\.\/?/))throw new Error(`Resolving this path (${t}) would escape the jail`);return this.pathUtils.resolve(this.target,t)}mapFromBase(t){return this.pathUtils.resolve(CK,this.pathUtils.relative(this.target,t))}};var Sg=class extends pi{constructor(t,i){super(i);this.instance=null;this.factory=t}get baseFs(){return this.instance||(this.instance=this.factory()),this.instance}set baseFs(t){this.instance=t}mapFromBase(t){return t}mapToBase(t){return t}};var Ze=()=>Object.assign(new Error("ENOSYS: unsupported filesystem access"),{code:"ENOSYS"}),wS=class extends ya{constructor(){super(x)}getExtractHint(){throw Ze()}getRealPath(){throw Ze()}resolve(){throw Ze()}async openPromise(){throw Ze()}openSync(){throw Ze()}async opendirPromise(){throw Ze()}opendirSync(){throw Ze()}async readPromise(){throw Ze()}readSync(){throw Ze()}async writePromise(){throw Ze()}writeSync(){throw Ze()}async closePromise(){throw Ze()}closeSync(){throw Ze()}createWriteStream(){throw Ze()}createReadStream(){throw Ze()}async realpathPromise(){throw Ze()}realpathSync(){throw Ze()}async readdirPromise(){throw Ze()}readdirSync(){throw Ze()}async existsPromise(e){throw Ze()}existsSync(e){throw Ze()}async accessPromise(){throw Ze()}accessSync(){throw Ze()}async statPromise(){throw Ze()}statSync(){throw Ze()}async fstatPromise(e){throw Ze()}fstatSync(e){throw Ze()}async lstatPromise(e){throw Ze()}lstatSync(e){throw Ze()}async fchmodPromise(){throw Ze()}fchmodSync(){throw Ze()}async chmodPromise(){throw Ze()}chmodSync(){throw Ze()}async fchownPromise(){throw Ze()}fchownSync(){throw Ze()}async chownPromise(){throw Ze()}chownSync(){throw Ze()}async mkdirPromise(){throw Ze()}mkdirSync(){throw Ze()}async rmdirPromise(){throw Ze()}rmdirSync(){throw Ze()}async linkPromise(){throw Ze()}linkSync(){throw Ze()}async symlinkPromise(){throw Ze()}symlinkSync(){throw Ze()}async renamePromise(){throw Ze()}renameSync(){throw Ze()}async copyFilePromise(){throw Ze()}copyFileSync(){throw Ze()}async appendFilePromise(){throw Ze()}appendFileSync(){throw Ze()}async writeFilePromise(){throw Ze()}writeFileSync(){throw Ze()}async unlinkPromise(){throw Ze()}unlinkSync(){throw Ze()}async utimesPromise(){throw Ze()}utimesSync(){throw Ze()}async readFilePromise(){throw Ze()}readFileSync(){throw Ze()}async readlinkPromise(){throw Ze()}readlinkSync(){throw Ze()}async truncatePromise(){throw Ze()}truncateSync(){throw Ze()}async ftruncatePromise(e,t){throw Ze()}ftruncateSync(e,t){throw Ze()}watch(){throw Ze()}watchFile(){throw Ze()}unwatchFile(){throw Ze()}},jp=wS;jp.instance=new wS;var vg=class extends pi{constructor(t){super(K);this.baseFs=t}mapFromBase(t){return K.fromPortablePath(t)}mapToBase(t){return K.toPortablePath(t)}};var Vge=/^[0-9]+$/,BS=/^(\/(?:[^/]+\/)*?(?:\$\$virtual|__virtual__))((?:\/((?:[^/]+-)?[a-f0-9]+)(?:\/([^/]+))?)?((?:\/.*)?))$/,Xge=/^([^/]+-)?[a-f0-9]+$/,Br=class extends pi{constructor({baseFs:t=new $t}={}){super(x);this.baseFs=t}static makeVirtualPath(t,i,n){if(x.basename(t)!=="__virtual__")throw new Error('Assertion failed: Virtual folders must be named "__virtual__"');if(!x.basename(i).match(Xge))throw new Error("Assertion failed: Virtual components must be ended by an hexadecimal hash");let o=x.relative(x.dirname(t),n).split("/"),a=0;for(;a<o.length&&o[a]==="..";)a+=1;let l=o.slice(a);return x.join(t,i,String(a),...l)}static resolveVirtual(t){let i=t.match(BS);if(!i||!i[3]&&i[5])return t;let n=x.dirname(i[1]);if(!i[3]||!i[4])return n;if(!Vge.test(i[4]))return t;let o=Number(i[4]),a="../".repeat(o),l=i[5]||".";return Br.resolveVirtual(x.join(n,a,l))}getExtractHint(t){return this.baseFs.getExtractHint(t)}getRealPath(){return this.baseFs.getRealPath()}realpathSync(t){let i=t.match(BS);if(!i)return this.baseFs.realpathSync(t);if(!i[5])return t;let n=this.baseFs.realpathSync(this.mapToBase(t));return Br.makeVirtualPath(i[1],i[3],n)}async realpathPromise(t){let i=t.match(BS);if(!i)return await this.baseFs.realpathPromise(t);if(!i[5])return t;let n=await this.baseFs.realpathPromise(this.mapToBase(t));return Br.makeVirtualPath(i[1],i[3],n)}mapToBase(t){if(t==="")return t;if(this.pathUtils.isAbsolute(t))return Br.resolveVirtual(t);let i=Br.resolveVirtual(this.baseFs.resolve(Oe.dot)),n=Br.resolveVirtual(this.baseFs.resolve(t));return x.relative(i,n)||Oe.dot}mapFromBase(t){return t}};var qp=J("fs");var gn=4278190080,Vi=704643072,mK=(r,e)=>{let t=r.indexOf(e);if(t<=0)return null;let i=t;for(;t>=0&&(i=t+e.length,r[i]!==x.sep);){if(r[t-1]===x.sep)return null;t=r.indexOf(e,i)}return r.length>i&&r[i]!==x.sep?null:r.slice(0,i)},Kn=class extends xA{constructor({libzip:t,baseFs:i=new $t,filter:n=null,maxOpenFiles:s=1/0,readOnlyArchives:o=!1,useCache:a=!0,maxAge:l=5e3,fileExtensions:c=null}){super();this.fdMap=new Map;this.nextFd=3;this.isZip=new Set;this.notZip=new Set;this.realPaths=new Map;this.limitOpenFilesTimeout=null;this.libzipFactory=typeof t!="function"?()=>t:t,this.baseFs=i,this.zipInstances=a?new Map:null,this.filter=n,this.maxOpenFiles=s,this.readOnlyArchives=o,this.maxAge=l,this.fileExtensions=c}static async openPromise(t,i){let n=new Kn(i);try{return await t(n)}finally{n.saveAndClose()}}get libzip(){return typeof this.libzipInstance>"u"&&(this.libzipInstance=this.libzipFactory()),this.libzipInstance}getExtractHint(t){return this.baseFs.getExtractHint(t)}getRealPath(){return this.baseFs.getRealPath()}saveAndClose(){if(Yp(this),this.zipInstances)for(let[t,{zipFs:i}]of this.zipInstances.entries())i.saveAndClose(),this.zipInstances.delete(t)}discardAndClose(){if(Yp(this),this.zipInstances)for(let[t,{zipFs:i}]of this.zipInstances.entries())i.discardAndClose(),this.zipInstances.delete(t)}resolve(t){return this.baseFs.resolve(t)}remapFd(t,i){let n=this.nextFd++|Vi;return this.fdMap.set(n,[t,i]),n}async openPromise(t,i,n){return await this.makeCallPromise(t,async()=>await this.baseFs.openPromise(t,i,n),async(s,{subPath:o})=>this.remapFd(s,await s.openPromise(o,i,n)))}openSync(t,i,n){return this.makeCallSync(t,()=>this.baseFs.openSync(t,i,n),(s,{subPath:o})=>this.remapFd(s,s.openSync(o,i,n)))}async opendirPromise(t,i){return await this.makeCallPromise(t,async()=>await this.baseFs.opendirPromise(t,i),async(n,{subPath:s})=>await n.opendirPromise(s,i),{requireSubpath:!1})}opendirSync(t,i){return this.makeCallSync(t,()=>this.baseFs.opendirSync(t,i),(n,{subPath:s})=>n.opendirSync(s,i),{requireSubpath:!1})}async readPromise(t,i,n,s,o){if((t&gn)!==Vi)return await this.baseFs.readPromise(t,i,n,s,o);let a=this.fdMap.get(t);if(typeof a>"u")throw Ur("read");let[l,c]=a;return await l.readPromise(c,i,n,s,o)}readSync(t,i,n,s,o){if((t&gn)!==Vi)return this.baseFs.readSync(t,i,n,s,o);let a=this.fdMap.get(t);if(typeof a>"u")throw Ur("readSync");let[l,c]=a;return l.readSync(c,i,n,s,o)}async writePromise(t,i,n,s,o){if((t&gn)!==Vi)return typeof i=="string"?await this.baseFs.writePromise(t,i,n):await this.baseFs.writePromise(t,i,n,s,o);let a=this.fdMap.get(t);if(typeof a>"u")throw Ur("write");let[l,c]=a;return typeof i=="string"?await l.writePromise(c,i,n):await l.writePromise(c,i,n,s,o)}writeSync(t,i,n,s,o){if((t&gn)!==Vi)return typeof i=="string"?this.baseFs.writeSync(t,i,n):this.baseFs.writeSync(t,i,n,s,o);let a=this.fdMap.get(t);if(typeof a>"u")throw Ur("writeSync");let[l,c]=a;return typeof i=="string"?l.writeSync(c,i,n):l.writeSync(c,i,n,s,o)}async closePromise(t){if((t&gn)!==Vi)return await this.baseFs.closePromise(t);let i=this.fdMap.get(t);if(typeof i>"u")throw Ur("close");this.fdMap.delete(t);let[n,s]=i;return await n.closePromise(s)}closeSync(t){if((t&gn)!==Vi)return this.baseFs.closeSync(t);let i=this.fdMap.get(t);if(typeof i>"u")throw Ur("closeSync");this.fdMap.delete(t);let[n,s]=i;return n.closeSync(s)}createReadStream(t,i){return t===null?this.baseFs.createReadStream(t,i):this.makeCallSync(t,()=>this.baseFs.createReadStream(t,i),(n,{archivePath:s,subPath:o})=>{let a=n.createReadStream(o,i);return a.path=K.fromPortablePath(this.pathUtils.join(s,o)),a})}createWriteStream(t,i){return t===null?this.baseFs.createWriteStream(t,i):this.makeCallSync(t,()=>this.baseFs.createWriteStream(t,i),(n,{subPath:s})=>n.createWriteStream(s,i))}async realpathPromise(t){return await this.makeCallPromise(t,async()=>await this.baseFs.realpathPromise(t),async(i,{archivePath:n,subPath:s})=>{let o=this.realPaths.get(n);return typeof o>"u"&&(o=await this.baseFs.realpathPromise(n),this.realPaths.set(n,o)),this.pathUtils.join(o,this.pathUtils.relative(Oe.root,await i.realpathPromise(s)))})}realpathSync(t){return this.makeCallSync(t,()=>this.baseFs.realpathSync(t),(i,{archivePath:n,subPath:s})=>{let o=this.realPaths.get(n);return typeof o>"u"&&(o=this.baseFs.realpathSync(n),this.realPaths.set(n,o)),this.pathUtils.join(o,this.pathUtils.relative(Oe.root,i.realpathSync(s)))})}async existsPromise(t){return await this.makeCallPromise(t,async()=>await this.baseFs.existsPromise(t),async(i,{subPath:n})=>await i.existsPromise(n))}existsSync(t){return this.makeCallSync(t,()=>this.baseFs.existsSync(t),(i,{subPath:n})=>i.existsSync(n))}async accessPromise(t,i){return await this.makeCallPromise(t,async()=>await this.baseFs.accessPromise(t,i),async(n,{subPath:s})=>await n.accessPromise(s,i))}accessSync(t,i){return this.makeCallSync(t,()=>this.baseFs.accessSync(t,i),(n,{subPath:s})=>n.accessSync(s,i))}async statPromise(t,i){return await this.makeCallPromise(t,async()=>await this.baseFs.statPromise(t,i),async(n,{subPath:s})=>await n.statPromise(s,i))}statSync(t,i){return this.makeCallSync(t,()=>this.baseFs.statSync(t,i),(n,{subPath:s})=>n.statSync(s,i))}async fstatPromise(t,i){if((t&gn)!==Vi)return this.baseFs.fstatPromise(t,i);let n=this.fdMap.get(t);if(typeof n>"u")throw Ur("fstat");let[s,o]=n;return s.fstatPromise(o,i)}fstatSync(t,i){if((t&gn)!==Vi)return this.baseFs.fstatSync(t,i);let n=this.fdMap.get(t);if(typeof n>"u")throw Ur("fstatSync");let[s,o]=n;return s.fstatSync(o,i)}async lstatPromise(t,i){return await this.makeCallPromise(t,async()=>await this.baseFs.lstatPromise(t,i),async(n,{subPath:s})=>await n.lstatPromise(s,i))}lstatSync(t,i){return this.makeCallSync(t,()=>this.baseFs.lstatSync(t,i),(n,{subPath:s})=>n.lstatSync(s,i))}async fchmodPromise(t,i){if((t&gn)!==Vi)return this.baseFs.fchmodPromise(t,i);let n=this.fdMap.get(t);if(typeof n>"u")throw Ur("fchmod");let[s,o]=n;return s.fchmodPromise(o,i)}fchmodSync(t,i){if((t&gn)!==Vi)return this.baseFs.fchmodSync(t,i);let n=this.fdMap.get(t);if(typeof n>"u")throw Ur("fchmodSync");let[s,o]=n;return s.fchmodSync(o,i)}async chmodPromise(t,i){return await this.makeCallPromise(t,async()=>await this.baseFs.chmodPromise(t,i),async(n,{subPath:s})=>await n.chmodPromise(s,i))}chmodSync(t,i){return this.makeCallSync(t,()=>this.baseFs.chmodSync(t,i),(n,{subPath:s})=>n.chmodSync(s,i))}async fchownPromise(t,i,n){if((t&gn)!==Vi)return this.baseFs.fchownPromise(t,i,n);let s=this.fdMap.get(t);if(typeof s>"u")throw Ur("fchown");let[o,a]=s;return o.fchownPromise(a,i,n)}fchownSync(t,i,n){if((t&gn)!==Vi)return this.baseFs.fchownSync(t,i,n);let s=this.fdMap.get(t);if(typeof s>"u")throw Ur("fchownSync");let[o,a]=s;return o.fchownSync(a,i,n)}async chownPromise(t,i,n){return await this.makeCallPromise(t,async()=>await this.baseFs.chownPromise(t,i,n),async(s,{subPath:o})=>await s.chownPromise(o,i,n))}chownSync(t,i,n){return this.makeCallSync(t,()=>this.baseFs.chownSync(t,i,n),(s,{subPath:o})=>s.chownSync(o,i,n))}async renamePromise(t,i){return await this.makeCallPromise(t,async()=>await this.makeCallPromise(i,async()=>await this.baseFs.renamePromise(t,i),async()=>{throw Object.assign(new Error("EEXDEV: cross-device link not permitted"),{code:"EEXDEV"})}),async(n,{subPath:s})=>await this.makeCallPromise(i,async()=>{throw Object.assign(new Error("EEXDEV: cross-device link not permitted"),{code:"EEXDEV"})},async(o,{subPath:a})=>{if(n!==o)throw Object.assign(new Error("EEXDEV: cross-device link not permitted"),{code:"EEXDEV"});return await n.renamePromise(s,a)}))}renameSync(t,i){return this.makeCallSync(t,()=>this.makeCallSync(i,()=>this.baseFs.renameSync(t,i),()=>{throw Object.assign(new Error("EEXDEV: cross-device link not permitted"),{code:"EEXDEV"})}),(n,{subPath:s})=>this.makeCallSync(i,()=>{throw Object.assign(new Error("EEXDEV: cross-device link not permitted"),{code:"EEXDEV"})},(o,{subPath:a})=>{if(n!==o)throw Object.assign(new Error("EEXDEV: cross-device link not permitted"),{code:"EEXDEV"});return n.renameSync(s,a)}))}async copyFilePromise(t,i,n=0){let s=async(o,a,l,c)=>{if((n&qp.constants.COPYFILE_FICLONE_FORCE)!==0)throw Object.assign(new Error(`EXDEV: cross-device clone not permitted, copyfile '${a}' -> ${c}'`),{code:"EXDEV"});if(n&qp.constants.COPYFILE_EXCL&&await this.existsPromise(a))throw Object.assign(new Error(`EEXIST: file already exists, copyfile '${a}' -> '${c}'`),{code:"EEXIST"});let u;try{u=await o.readFilePromise(a)}catch{throw Object.assign(new Error(`EINVAL: invalid argument, copyfile '${a}' -> '${c}'`),{code:"EINVAL"})}await l.writeFilePromise(c,u)};return await this.makeCallPromise(t,async()=>await this.makeCallPromise(i,async()=>await this.baseFs.copyFilePromise(t,i,n),async(o,{subPath:a})=>await s(this.baseFs,t,o,a)),async(o,{subPath:a})=>await this.makeCallPromise(i,async()=>await s(o,a,this.baseFs,i),async(l,{subPath:c})=>o!==l?await s(o,a,l,c):await o.copyFilePromise(a,c,n)))}copyFileSync(t,i,n=0){let s=(o,a,l,c)=>{if((n&qp.constants.COPYFILE_FICLONE_FORCE)!==0)throw Object.assign(new Error(`EXDEV: cross-device clone not permitted, copyfile '${a}' -> ${c}'`),{code:"EXDEV"});if(n&qp.constants.COPYFILE_EXCL&&this.existsSync(a))throw Object.assign(new Error(`EEXIST: file already exists, copyfile '${a}' -> '${c}'`),{code:"EEXIST"});let u;try{u=o.readFileSync(a)}catch{throw Object.assign(new Error(`EINVAL: invalid argument, copyfile '${a}' -> '${c}'`),{code:"EINVAL"})}l.writeFileSync(c,u)};return this.makeCallSync(t,()=>this.makeCallSync(i,()=>this.baseFs.copyFileSync(t,i,n),(o,{subPath:a})=>s(this.baseFs,t,o,a)),(o,{subPath:a})=>this.makeCallSync(i,()=>s(o,a,this.baseFs,i),(l,{subPath:c})=>o!==l?s(o,a,l,c):o.copyFileSync(a,c,n)))}async appendFilePromise(t,i,n){return await this.makeCallPromise(t,async()=>await this.baseFs.appendFilePromise(t,i,n),async(s,{subPath:o})=>await s.appendFilePromise(o,i,n))}appendFileSync(t,i,n){return this.makeCallSync(t,()=>this.baseFs.appendFileSync(t,i,n),(s,{subPath:o})=>s.appendFileSync(o,i,n))}async writeFilePromise(t,i,n){return await this.makeCallPromise(t,async()=>await this.baseFs.writeFilePromise(t,i,n),async(s,{subPath:o})=>await s.writeFilePromise(o,i,n))}writeFileSync(t,i,n){return this.makeCallSync(t,()=>this.baseFs.writeFileSync(t,i,n),(s,{subPath:o})=>s.writeFileSync(o,i,n))}async unlinkPromise(t){return await this.makeCallPromise(t,async()=>await this.baseFs.unlinkPromise(t),async(i,{subPath:n})=>await i.unlinkPromise(n))}unlinkSync(t){return this.makeCallSync(t,()=>this.baseFs.unlinkSync(t),(i,{subPath:n})=>i.unlinkSync(n))}async utimesPromise(t,i,n){return await this.makeCallPromise(t,async()=>await this.baseFs.utimesPromise(t,i,n),async(s,{subPath:o})=>await s.utimesPromise(o,i,n))}utimesSync(t,i,n){return this.makeCallSync(t,()=>this.baseFs.utimesSync(t,i,n),(s,{subPath:o})=>s.utimesSync(o,i,n))}async mkdirPromise(t,i){return await this.makeCallPromise(t,async()=>await this.baseFs.mkdirPromise(t,i),async(n,{subPath:s})=>await n.mkdirPromise(s,i))}mkdirSync(t,i){return this.makeCallSync(t,()=>this.baseFs.mkdirSync(t,i),(n,{subPath:s})=>n.mkdirSync(s,i))}async rmdirPromise(t,i){return await this.makeCallPromise(t,async()=>await this.baseFs.rmdirPromise(t,i),async(n,{subPath:s})=>await n.rmdirPromise(s,i))}rmdirSync(t,i){return this.makeCallSync(t,()=>this.baseFs.rmdirSync(t,i),(n,{subPath:s})=>n.rmdirSync(s,i))}async linkPromise(t,i){return await this.makeCallPromise(i,async()=>await this.baseFs.linkPromise(t,i),async(n,{subPath:s})=>await n.linkPromise(t,s))}linkSync(t,i){return this.makeCallSync(i,()=>this.baseFs.linkSync(t,i),(n,{subPath:s})=>n.linkSync(t,s))}async symlinkPromise(t,i,n){return await this.makeCallPromise(i,async()=>await this.baseFs.symlinkPromise(t,i,n),async(s,{subPath:o})=>await s.symlinkPromise(t,o))}symlinkSync(t,i,n){return this.makeCallSync(i,()=>this.baseFs.symlinkSync(t,i,n),(s,{subPath:o})=>s.symlinkSync(t,o))}async readFilePromise(t,i){return this.makeCallPromise(t,async()=>{switch(i){case"utf8":return await this.baseFs.readFilePromise(t,i);default:return await this.baseFs.readFilePromise(t,i)}},async(n,{subPath:s})=>await n.readFilePromise(s,i))}readFileSync(t,i){return this.makeCallSync(t,()=>{switch(i){case"utf8":return this.baseFs.readFileSync(t,i);default:return this.baseFs.readFileSync(t,i)}},(n,{subPath:s})=>n.readFileSync(s,i))}async readdirPromise(t,i){return await this.makeCallPromise(t,async()=>await this.baseFs.readdirPromise(t,i),async(n,{subPath:s})=>await n.readdirPromise(s,i),{requireSubpath:!1})}readdirSync(t,i){return this.makeCallSync(t,()=>this.baseFs.readdirSync(t,i),(n,{subPath:s})=>n.readdirSync(s,i),{requireSubpath:!1})}async readlinkPromise(t){return await this.makeCallPromise(t,async()=>await this.baseFs.readlinkPromise(t),async(i,{subPath:n})=>await i.readlinkPromise(n))}readlinkSync(t){return this.makeCallSync(t,()=>this.baseFs.readlinkSync(t),(i,{subPath:n})=>i.readlinkSync(n))}async truncatePromise(t,i){return await this.makeCallPromise(t,async()=>await this.baseFs.truncatePromise(t,i),async(n,{subPath:s})=>await n.truncatePromise(s,i))}truncateSync(t,i){return this.makeCallSync(t,()=>this.baseFs.truncateSync(t,i),(n,{subPath:s})=>n.truncateSync(s,i))}async ftruncatePromise(t,i){if((t&gn)!==Vi)return this.baseFs.ftruncatePromise(t,i);let n=this.fdMap.get(t);if(typeof n>"u")throw Ur("ftruncate");let[s,o]=n;return s.ftruncatePromise(o,i)}ftruncateSync(t,i){if((t&gn)!==Vi)return this.baseFs.ftruncateSync(t,i);let n=this.fdMap.get(t);if(typeof n>"u")throw Ur("ftruncateSync");let[s,o]=n;return s.ftruncateSync(o,i)}watch(t,i,n){return this.makeCallSync(t,()=>this.baseFs.watch(t,i,n),(s,{subPath:o})=>s.watch(o,i,n))}watchFile(t,i,n){return this.makeCallSync(t,()=>this.baseFs.watchFile(t,i,n),()=>iI(this,t,i,n))}unwatchFile(t,i){return this.makeCallSync(t,()=>this.baseFs.unwatchFile(t,i),()=>Gp(this,t,i))}async makeCallPromise(t,i,n,{requireSubpath:s=!0}={}){if(typeof t!="string")return await i();let o=this.resolve(t),a=this.findZip(o);return a?s&&a.subPath==="/"?await i():await this.getZipPromise(a.archivePath,async l=>await n(l,a)):await i()}makeCallSync(t,i,n,{requireSubpath:s=!0}={}){if(typeof t!="string")return i();let o=this.resolve(t),a=this.findZip(o);return!a||s&&a.subPath==="/"?i():this.getZipSync(a.archivePath,l=>n(l,a))}findZip(t){if(this.filter&&!this.filter.test(t))return null;let i="";for(;;){let n=t.substring(i.length),s;if(!this.fileExtensions)s=mK(n,".zip");else for(let o of this.fileExtensions)if(s=mK(n,o),s)break;if(!s)return null;if(i=this.pathUtils.join(i,s),this.isZip.has(i)===!1){if(this.notZip.has(i))continue;try{if(!this.baseFs.lstatSync(i).isFile()){this.notZip.add(i);continue}}catch{return null}this.isZip.add(i)}return{archivePath:i,subPath:this.pathUtils.join(Oe.root,t.substring(i.length))}}}limitOpenFiles(t){if(this.zipInstances===null)return;let i=Date.now(),n=i+this.maxAge,s=t===null?0:this.zipInstances.size-t;for(let[o,{zipFs:a,expiresAt:l,refCount:c}]of this.zipInstances.entries())if(!(c!==0||a.hasOpenFileHandles())){if(i>=l){a.saveAndClose(),this.zipInstances.delete(o),s-=1;continue}else if(t===null||s<=0){n=l;break}a.saveAndClose(),this.zipInstances.delete(o),s-=1}this.limitOpenFilesTimeout===null&&(t===null&&this.zipInstances.size>0||t!==null)&&(this.limitOpenFilesTimeout=setTimeout(()=>{this.limitOpenFilesTimeout=null,this.limitOpenFiles(null)},n-i).unref())}async getZipPromise(t,i){let n=async()=>({baseFs:this.baseFs,libzip:this.libzip,readOnly:this.readOnlyArchives,stats:await this.baseFs.statPromise(t)});if(this.zipInstances){let s=this.zipInstances.get(t);if(!s){let o=await n();s=this.zipInstances.get(t),s||(s={zipFs:new Wr(t,o),expiresAt:0,refCount:0})}this.zipInstances.delete(t),this.limitOpenFiles(this.maxOpenFiles-1),this.zipInstances.set(t,s),s.expiresAt=Date.now()+this.maxAge,s.refCount+=1;try{return await i(s.zipFs)}finally{s.refCount-=1}}else{let s=new Wr(t,await n());try{return await i(s)}finally{s.saveAndClose()}}}getZipSync(t,i){let n=()=>({baseFs:this.baseFs,libzip:this.libzip,readOnly:this.readOnlyArchives,stats:this.baseFs.statSync(t)});if(this.zipInstances){let s=this.zipInstances.get(t);return s||(s={zipFs:new Wr(t,n()),expiresAt:0,refCount:0}),this.zipInstances.delete(t),this.limitOpenFiles(this.maxOpenFiles-1),this.zipInstances.set(t,s),s.expiresAt=Date.now()+this.maxAge,i(s.zipFs)}else{let s=new Wr(t,n());try{return i(s)}finally{s.saveAndClose()}}}};var Pg=J("util");var sI=J("url"),EK=J("util");var nI=class extends pi{constructor(t){super(K);this.baseFs=t}mapFromBase(t){return t}mapToBase(t){if(typeof t=="string")return t;if(t instanceof sI.URL)return(0,sI.fileURLToPath)(t);if(Buffer.isBuffer(t)){let i=t.toString();if(Buffer.byteLength(i)!==t.byteLength)throw new Error("Non-utf8 buffers are not supported at the moment. Please upvote the following issue if you encounter this error: https://github.com/yarnpkg/berry/issues/4942");return i}throw new Error(`Unsupported path type: ${(0,EK.inspect)(t)}`)}};var IK=J("readline"),Fi=Symbol("kBaseFs"),wa=Symbol("kFd"),PA=Symbol("kClosePromise"),oI=Symbol("kCloseResolve"),aI=Symbol("kCloseReject"),xg=Symbol("kRefs"),Ws=Symbol("kRef"),zs=Symbol("kUnref"),Zge,_ge,$ge,efe,Jp=class{constructor(e,t){this[Zge]=1;this[_ge]=void 0;this[$ge]=void 0;this[efe]=void 0;this[Fi]=t,this[wa]=e}get fd(){return this[wa]}async appendFile(e,t){var i;try{this[Ws](this.appendFile);let n=(i=typeof t=="string"?t:t==null?void 0:t.encoding)!=null?i:void 0;return await this[Fi].appendFilePromise(this.fd,e,n?{encoding:n}:void 0)}finally{this[zs]()}}async chown(e,t){try{return this[Ws](this.chown),await this[Fi].fchownPromise(this.fd,e,t)}finally{this[zs]()}}async chmod(e){try{return this[Ws](this.chmod),await this[Fi].fchmodPromise(this.fd,e)}finally{this[zs]()}}createReadStream(e){return this[Fi].createReadStream(null,{...e,fd:this.fd})}createWriteStream(e){return this[Fi].createWriteStream(null,{...e,fd:this.fd})}datasync(){throw new Error("Method not implemented.")}sync(){throw new Error("Method not implemented.")}async read(e,t,i,n){var s,o,a;try{this[Ws](this.read);let l;return Buffer.isBuffer(e)?l=e:(e!=null||(e={}),l=(s=e.buffer)!=null?s:Buffer.alloc(16384),t=e.offset||0,i=(o=e.length)!=null?o:l.byteLength,n=(a=e.position)!=null?a:null),t!=null||(t=0),i!=null||(i=0),i===0?{bytesRead:i,buffer:l}:{bytesRead:await this[Fi].readPromise(this.fd,l,t,i,n),buffer:l}}finally{this[zs]()}}async readFile(e){var t;try{this[Ws](this.readFile);let i=(t=typeof e=="string"?e:e==null?void 0:e.encoding)!=null?t:void 0;return await this[Fi].readFilePromise(this.fd,i)}finally{this[zs]()}}readLines(e){return(0,IK.createInterface)({input:this.createReadStream(e),crlfDelay:1/0})}async stat(e){try{return this[Ws](this.stat),await this[Fi].fstatPromise(this.fd,e)}finally{this[zs]()}}async truncate(e){try{return this[Ws](this.truncate),await this[Fi].ftruncatePromise(this.fd,e)}finally{this[zs]()}}utimes(e,t){throw new Error("Method not implemented.")}async writeFile(e,t){var i;try{this[Ws](this.writeFile);let n=(i=typeof t=="string"?t:t==null?void 0:t.encoding)!=null?i:void 0;await this[Fi].writeFilePromise(this.fd,e,n)}finally{this[zs]()}}async write(...e){try{if(this[Ws](this.write),ArrayBuffer.isView(e[0])){let[t,i,n,s]=e;return{bytesWritten:await this[Fi].writePromise(this.fd,t,i!=null?i:void 0,n!=null?n:void 0,s!=null?s:void 0),buffer:t}}else{let[t,i,n]=e;return{bytesWritten:await this[Fi].writePromise(this.fd,t,i,n),buffer:t}}}finally{this[zs]()}}async writev(e,t){try{this[Ws](this.writev);let i=0;if(typeof t<"u")for(let n of e){let s=await this.write(n,void 0,void 0,t);i+=s.bytesWritten,t+=s.bytesWritten}else for(let n of e){let s=await this.write(n);i+=s.bytesWritten}return{buffers:e,bytesWritten:i}}finally{this[zs]()}}readv(e,t){throw new Error("Method not implemented.")}close(){if(this[wa]===-1)return Promise.resolve();if(this[PA])return this[PA];if(this[xg]--,this[xg]===0){let e=this[wa];this[wa]=-1,this[PA]=this[Fi].closePromise(e).finally(()=>{this[PA]=void 0})}else this[PA]=new Promise((e,t)=>{this[oI]=e,this[aI]=t}).finally(()=>{this[PA]=void 0,this[aI]=void 0,this[oI]=void 0});return this[PA]}[(Fi,wa,Zge=xg,_ge=PA,$ge=oI,efe=aI,Ws)](e){if(this[wa]===-1){let t=new Error("file closed");throw t.code="EBADF",t.syscall=e.name,t}this[xg]++}[zs](){if(this[xg]--,this[xg]===0){let e=this[wa];this[wa]=-1,this[Fi].closePromise(e).then(this[oI],this[aI])}}};var tfe=new Set(["accessSync","appendFileSync","createReadStream","createWriteStream","chmodSync","fchmodSync","chownSync","fchownSync","closeSync","copyFileSync","linkSync","lstatSync","fstatSync","lutimesSync","mkdirSync","openSync","opendirSync","readlinkSync","readFileSync","readdirSync","readlinkSync","realpathSync","renameSync","rmdirSync","statSync","symlinkSync","truncateSync","ftruncateSync","unlinkSync","unwatchFile","utimesSync","watch","watchFile","writeFileSync","writeSync"]),yK=new Set(["accessPromise","appendFilePromise","fchmodPromise","chmodPromise","fchownPromise","chownPromise","closePromise","copyFilePromise","linkPromise","fstatPromise","lstatPromise","lutimesPromise","mkdirPromise","openPromise","opendirPromise","readdirPromise","realpathPromise","readFilePromise","readdirPromise","readlinkPromise","renamePromise","rmdirPromise","statPromise","symlinkPromise","truncatePromise","ftruncatePromise","unlinkPromise","utimesPromise","writeFilePromise","writeSync"]);function bS(r,e){e=new nI(e);let t=(i,n,s)=>{let o=i[n];i[n]=s,typeof(o==null?void 0:o[Pg.promisify.custom])<"u"&&(s[Pg.promisify.custom]=o[Pg.promisify.custom])};{t(r,"exists",(i,...n)=>{let o=typeof n[n.length-1]=="function"?n.pop():()=>{};process.nextTick(()=>{e.existsPromise(i).then(a=>{o(a)},()=>{o(!1)})})}),t(r,"read",(...i)=>{let[n,s,o,a,l,c]=i;if(i.length<=3){let u={};i.length<3?c=i[1]:(u=i[1],c=i[2]),{buffer:s=Buffer.alloc(16384),offset:o=0,length:a=s.byteLength,position:l}=u}if(o==null&&(o=0),a|=0,a===0){process.nextTick(()=>{c(null,0,s)});return}l==null&&(l=-1),process.nextTick(()=>{e.readPromise(n,s,o,a,l).then(u=>{c(null,u,s)},u=>{c(u,0,s)})})});for(let i of yK){let n=i.replace(/Promise$/,"");if(typeof r[n]>"u")continue;let s=e[i];if(typeof s>"u")continue;t(r,n,(...a)=>{let c=typeof a[a.length-1]=="function"?a.pop():()=>{};process.nextTick(()=>{s.apply(e,a).then(u=>{c(null,u)},u=>{c(u)})})})}r.realpath.native=r.realpath}{t(r,"existsSync",i=>{try{return e.existsSync(i)}catch{return!1}}),t(r,"readSync",(...i)=>{let[n,s,o,a,l]=i;return i.length<=3&&({offset:o=0,length:a=s.byteLength,position:l}=i[2]||{}),o==null&&(o=0),a|=0,a===0?0:(l==null&&(l=-1),e.readSync(n,s,o,a,l))});for(let i of tfe){let n=i;if(typeof r[n]>"u")continue;let s=e[i];typeof s>"u"||t(r,n,s.bind(e))}r.realpathSync.native=r.realpathSync}{let i=process.emitWarning;process.emitWarning=()=>{};let n;try{n=r.promises}finally{process.emitWarning=i}if(typeof n<"u"){for(let s of yK){let o=s.replace(/Promise$/,"");if(typeof n[o]>"u")continue;let a=e[s];typeof a>"u"||s!=="open"&&t(n,o,(l,...c)=>l instanceof Jp?l[o].apply(l,c):a.call(e,l,...c))}t(n,"open",async(...s)=>{let o=await e.openPromise(...s);return new Jp(o,e)})}}r.read[Pg.promisify.custom]=async(i,n,...s)=>({bytesRead:await e.readPromise(i,n,...s),buffer:n}),r.write[Pg.promisify.custom]=async(i,n,...s)=>({bytesWritten:await e.writePromise(i,n,...s),buffer:n})}function AI(r,e){let t=Object.create(r);return bS(t,e),t}var bK=Pe(J("os"));function wK(r){let e=Math.ceil(Math.random()*4294967296).toString(16).padStart(8,"0");return`${r}${e}`}var Vs=new Set,QS=null;function BK(){if(QS)return QS;let r=K.toPortablePath(bK.default.tmpdir()),e=M.realpathSync(r);return process.once("exit",()=>{M.rmtempSync()}),QS={tmpdir:r,realTmpdir:e}}var M=Object.assign(new $t,{detachTemp(r){Vs.delete(r)},mktempSync(r){let{tmpdir:e,realTmpdir:t}=BK();for(;;){let i=wK("xfs-");try{this.mkdirSync(x.join(e,i))}catch(s){if(s.code==="EEXIST")continue;throw s}let n=x.join(t,i);if(Vs.add(n),typeof r>"u")return n;try{return r(n)}finally{if(Vs.has(n)){Vs.delete(n);try{this.removeSync(n)}catch{}}}}},async mktempPromise(r){let{tmpdir:e,realTmpdir:t}=BK();for(;;){let i=wK("xfs-");try{await this.mkdirPromise(x.join(e,i))}catch(s){if(s.code==="EEXIST")continue;throw s}let n=x.join(t,i);if(Vs.add(n),typeof r>"u")return n;try{return await r(n)}finally{if(Vs.has(n)){Vs.delete(n);try{await this.removePromise(n)}catch{}}}}},async rmtempPromise(){await Promise.all(Array.from(Vs.values()).map(async r=>{try{await M.removePromise(r,{maxRetries:0}),Vs.delete(r)}catch{}}))},rmtempSync(){for(let r of Vs)try{M.removeSync(r),Vs.delete(r)}catch{}}});var fk=Pe(TS());var td={};ut(td,{parseResolution:()=>hI,parseShell:()=>uI,parseSyml:()=>yi,stringifyArgument:()=>KS,stringifyArgumentSegment:()=>US,stringifyArithmeticExpression:()=>fI,stringifyCommand:()=>MS,stringifyCommandChain:()=>Fg,stringifyCommandChainThen:()=>OS,stringifyCommandLine:()=>gI,stringifyCommandLineThen:()=>LS,stringifyEnvSegment:()=>cI,stringifyRedirectArgument:()=>zp,stringifyResolution:()=>pI,stringifyShell:()=>Rg,stringifyShellLine:()=>Rg,stringifySyml:()=>ba,stringifyValueArgument:()=>_l});var hU=Pe(fU());function uI(r,e={isGlobPattern:()=>!1}){try{return(0,hU.parse)(r,e)}catch(t){throw t.location&&(t.message=t.message.replace(/(\.)?$/,` (line ${t.location.start.line}, column ${t.location.start.column})$1`)),t}}function Rg(r,{endSemicolon:e=!1}={}){return r.map(({command:t,type:i},n)=>`${gI(t)}${i===";"?n!==r.length-1||e?";":"":" &"}`).join(" ")}function gI(r){return`${Fg(r.chain)}${r.then?` ${LS(r.then)}`:""}`}function LS(r){return`${r.type} ${gI(r.line)}`}function Fg(r){return`${MS(r)}${r.then?` ${OS(r.then)}`:""}`}function OS(r){return`${r.type} ${Fg(r.chain)}`}function MS(r){switch(r.type){case"command":return`${r.envs.length>0?`${r.envs.map(e=>cI(e)).join(" ")} `:""}${r.args.map(e=>KS(e)).join(" ")}`;case"subshell":return`(${Rg(r.subshell)})${r.args.length>0?` ${r.args.map(e=>zp(e)).join(" ")}`:""}`;case"group":return`{ ${Rg(r.group,{endSemicolon:!0})} }${r.args.length>0?` ${r.args.map(e=>zp(e)).join(" ")}`:""}`;case"envs":return r.envs.map(e=>cI(e)).join(" ");default:throw new Error(`Unsupported command type:  "${r.type}"`)}}function cI(r){return`${r.name}=${r.args[0]?_l(r.args[0]):""}`}function KS(r){switch(r.type){case"redirection":return zp(r);case"argument":return _l(r);default:throw new Error(`Unsupported argument type: "${r.type}"`)}}function zp(r){return`${r.subtype} ${r.args.map(e=>_l(e)).join(" ")}`}function _l(r){return r.segments.map(e=>US(e)).join("")}function US(r){let e=(i,n)=>n?`"${i}"`:i,t=i=>i===""?'""':i.match(/[(){}<>$|&; \t"']/)?`$'${i.replace(/\\/g,"\\\\").replace(/'/g,"\\'").replace(/\f/g,"\\f").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/\t/g,"\\t").replace(/\v/g,"\\v").replace(/\0/g,"\\0")}'`:i;switch(r.type){case"text":return t(r.text);case"glob":return r.pattern;case"shell":return e(`\${${Rg(r.shell)}}`,r.quoted);case"variable":return e(typeof r.defaultValue>"u"?typeof r.alternativeValue>"u"?`\${${r.name}}`:r.alternativeValue.length===0?`\${${r.name}:+}`:`\${${r.name}:+${r.alternativeValue.map(i=>_l(i)).join(" ")}}`:r.defaultValue.length===0?`\${${r.name}:-}`:`\${${r.name}:-${r.defaultValue.map(i=>_l(i)).join(" ")}}`,r.quoted);case"arithmetic":return`$(( ${fI(r.arithmetic)} ))`;default:throw new Error(`Unsupported argument segment type: "${r.type}"`)}}function fI(r){let e=n=>{switch(n){case"addition":return"+";case"subtraction":return"-";case"multiplication":return"*";case"division":return"/";default:throw new Error(`Can't extract operator from arithmetic expression of type "${n}"`)}},t=(n,s)=>s?`( ${n} )`:n,i=n=>t(fI(n),!["number","variable"].includes(n.type));switch(r.type){case"number":return String(r.value);case"variable":return r.name;default:return`${i(r.left)} ${e(r.type)} ${i(r.right)}`}}var CU=Pe(dU());function hI(r){let e=r.match(/^\*{1,2}\/(.*)/);if(e)throw new Error(`The override for '${r}' includes a glob pattern. Glob patterns have been removed since their behaviours don't match what you'd expect. Set the override to '${e[1]}' instead.`);try{return(0,CU.parse)(r)}catch(t){throw t.location&&(t.message=t.message.replace(/(\.)?$/,` (line ${t.location.start.line}, column ${t.location.start.column})$1`)),t}}function pI(r){let e="";return r.from&&(e+=r.from.fullName,r.from.description&&(e+=`@${r.from.description}`),e+="/"),e+=r.descriptor.fullName,r.descriptor.description&&(e+=`@${r.descriptor.description}`),e}var vI=Pe(aH()),gH=Pe(lH()),cde=/^(?![-?:,\][{}#&*!|>'"%@` \t\r\n]).([ \t]*(?![,\][{}:# \t\r\n]).)*$/,cH=["__metadata","version","resolution","dependencies","peerDependencies","dependenciesMeta","peerDependenciesMeta","binaries"],SI=class{constructor(e){this.data=e}};function uH(r){return r.match(cde)?r:JSON.stringify(r)}function fH(r){return typeof r>"u"?!0:typeof r=="object"&&r!==null?Object.keys(r).every(e=>fH(r[e])):!1}function $S(r,e,t){if(r===null)return`null
-`;if(typeof r=="number"||typeof r=="boolean")return`${r.toString()}
-`;if(typeof r=="string")return`${uH(r)}
-`;if(Array.isArray(r)){if(r.length===0)return`[]
-`;let i="  ".repeat(e);return`
-${r.map(s=>`${i}- ${$S(s,e+1,!1)}`).join("")}`}if(typeof r=="object"&&r){let i,n;r instanceof SI?(i=r.data,n=!1):(i=r,n=!0);let s="  ".repeat(e),o=Object.keys(i);n&&o.sort((l,c)=>{let u=cH.indexOf(l),g=cH.indexOf(c);return u===-1&&g===-1?l<c?-1:l>c?1:0:u!==-1&&g===-1?-1:u===-1&&g!==-1?1:u-g});let a=o.filter(l=>!fH(i[l])).map((l,c)=>{let u=i[l],g=uH(l),f=$S(u,e+1,!0),h=c>0||t?s:"",p=g.length>1024?`? ${g}
-${h}:`:`${g}:`,C=f.startsWith(`
-`)?f:` ${f}`;return`${h}${p}${C}`}).join(e===0?`
-`:"")||`
-`;return t?`
-${a}`:`${a}`}throw new Error(`Unsupported value type (${r})`)}function ba(r){try{let e=$S(r,0,!1);return e!==`
-`?e:""}catch(e){throw e.location&&(e.message=e.message.replace(/(\.)?$/,` (line ${e.location.start.line}, column ${e.location.start.column})$1`)),e}}ba.PreserveOrdering=SI;function ude(r){return r.endsWith(`
-`)||(r+=`
-`),(0,gH.parse)(r)}var gde=/^(#.*(\r?\n))*?#\s+yarn\s+lockfile\s+v1\r?\n/i;function fde(r){if(gde.test(r))return ude(r);let e=(0,vI.safeLoad)(r,{schema:vI.FAILSAFE_SCHEMA,json:!0});if(e==null)return{};if(typeof e!="object")throw new Error(`Expected an indexed object, got a ${typeof e} instead. Does your file follow Yaml's rules?`);if(Array.isArray(e))throw new Error("Expected an indexed object, got an array instead. Does your file follow Yaml's rules?");return e}function yi(r){return fde(r)}var mz=Pe(pH()),Kw=Pe(Ac());var ud={};ut(ud,{Builtins:()=>hv,Cli:()=>Gn,Command:()=>ve,Option:()=>z,UsageError:()=>Qe,formatMarkdownish:()=>Ti});var tv="
",wi="\0";var rv=/^(-h|--help)(?:=([0-9]+))?$/,xI=/^(--[a-z]+(?:-[a-z]+)*|-[a-zA-Z]+)$/,EH=/^-[a-zA-Z]{2,}$/,iv=/^([^=]+)=([\s\S]*)$/,nv=process.env.DEBUG_CLI==="1";var Qe=class extends Error{constructor(e){super(e),this.clipanion={type:"usage"},this.name="UsageError"}},Hg=class extends Error{constructor(e,t){if(super(),this.input=e,this.candidates=t,this.clipanion={type:"none"},this.name="UnknownSyntaxError",this.candidates.length===0)this.message="Command not found, but we're not sure what's the alternative.";else if(this.candidates.every(i=>i.reason!==null&&i.reason===t[0].reason)){let[{reason:i}]=this.candidates;this.message=`${i}
-
-${this.candidates.map(({usage:n})=>`$ ${n}`).join(`
-`)}`}else if(this.candidates.length===1){let[{usage:i}]=this.candidates;this.message=`Command not found; did you mean:
-
-$ ${i}
-${sv(e)}`}else this.message=`Command not found; did you mean one of:
-
-${this.candidates.map(({usage:i},n)=>`${`${n}.`.padStart(4)} ${i}`).join(`
-`)}
-
-${sv(e)}`}},PI=class extends Error{constructor(e,t){super(),this.input=e,this.usages=t,this.clipanion={type:"none"},this.name="AmbiguousSyntaxError",this.message=`Cannot find which to pick amongst the following alternatives:
-
-${this.usages.map((i,n)=>`${`${n}.`.padStart(4)} ${i}`).join(`
-`)}
-
-${sv(e)}`}},sv=r=>`While running ${r.filter(e=>e!==wi).map(e=>{let t=JSON.stringify(e);return e.match(/\s/)||e.length===0||t!==`"${e}"`?t:e}).join(" ")}`;var rd=Symbol("clipanion/isOption");function Xi(r){return{...r,[rd]:!0}}function Do(r,e){return typeof r>"u"?[r,e]:typeof r=="object"&&r!==null&&!Array.isArray(r)?[void 0,r]:[r,e]}function DI(r,e=!1){let t=r.replace(/^\.: /,"");return e&&(t=t[0].toLowerCase()+t.slice(1)),t}function id(r,e){return e.length===1?new Qe(`${r}: ${DI(e[0],!0)}`):new Qe(`${r}:
-${e.map(t=>`
-- ${DI(t)}`).join("")}`)}function nd(r,e,t){if(typeof t>"u")return e;let i=[],n=[],s=a=>{let l=e;return e=a,s.bind(null,l)};if(!t(e,{errors:i,coercions:n,coercion:s}))throw id(`Invalid value for ${r}`,i);for(let[,a]of n)a();return e}var ve=class{constructor(){this.help=!1}static Usage(e){return e}async catch(e){throw e}async validateAndExecute(){let t=this.constructor.schema;if(Array.isArray(t)){let{isDict:n,isUnknown:s,applyCascade:o}=await Promise.resolve().then(()=>(ls(),hn)),a=o(n(s()),t),l=[],c=[];if(!a(this,{errors:l,coercions:c}))throw id("Invalid option schema",l);for(let[,g]of c)g()}else if(t!=null)throw new Error("Invalid command schema");let i=await this.execute();return typeof i<"u"?i:0}};ve.isOption=rd;ve.Default=[];var Av=Array(80).fill("\u2501");for(let r=0;r<=24;++r)Av[Av.length-r]=`\x1B[38;5;${232+r}m\u2501`;var lv={header:r=>`\x1B[1m\u2501\u2501\u2501 ${r}${r.length<80-5?` ${Av.slice(r.length+5).join("")}`:":"}\x1B[0m`,bold:r=>`\x1B[1m${r}\x1B[22m`,error:r=>`\x1B[31m\x1B[1m${r}\x1B[22m\x1B[39m`,code:r=>`\x1B[36m${r}\x1B[39m`},PH={header:r=>r,bold:r=>r,error:r=>r,code:r=>r};function Xde(r){let e=r.split(`
-`),t=e.filter(n=>n.match(/\S/)),i=t.length>0?t.reduce((n,s)=>Math.min(n,s.length-s.trimStart().length),Number.MAX_VALUE):0;return e.map(n=>n.slice(i).trimRight()).join(`
-`)}function Ti(r,{format:e,paragraphs:t}){return r=r.replace(/\r\n?/g,`
-`),r=Xde(r),r=r.replace(/^\n+|\n+$/g,""),r=r.replace(/^(\s*)-([^\n]*?)\n+/gm,`$1-$2
-
-`),r=r.replace(/\n(\n)?\n*/g,"$1"),t&&(r=r.split(/\n/).map(i=>{let n=i.match(/^\s*[*-][\t ]+(.*)/);if(!n)return i.match(/(.{1,80})(?: |$)/g).join(`
-`);let s=i.length-i.trimStart().length;return n[1].match(new RegExp(`(.{1,${78-s}})(?: |$)`,"g")).map((o,a)=>" ".repeat(s)+(a===0?"- ":"  ")+o).join(`
-`)}).join(`
-
-`)),r=r.replace(/(`+)((?:.|[\n])*?)\1/g,(i,n,s)=>e.code(n+s+n)),r=r.replace(/(\*\*)((?:.|[\n])*?)\1/g,(i,n,s)=>e.bold(n+s+n)),r?`${r}
-`:""}var fv=Pe(J("tty"),1);function pn(r){nv&&console.log(r)}var DH={candidateUsage:null,requiredOptions:[],errorMessage:null,ignoreOptions:!1,path:[],positionals:[],options:[],remainder:null,selectedIndex:-1};function kH(){return{nodes:[_i(),_i(),_i()]}}function Zde(r){let e=kH(),t=[],i=e.nodes.length;for(let n of r){t.push(i);for(let s=0;s<n.nodes.length;++s)NH(s)||e.nodes.push(oCe(n.nodes[s],i));i+=n.nodes.length-2}for(let n of t)Gg(e,0,n);return e}function Xs(r,e){return r.nodes.push(e),r.nodes.length-1}function _de(r){let e=new Set,t=i=>{if(e.has(i))return;e.add(i);let n=r.nodes[i];for(let o of Object.values(n.statics))for(let{to:a}of o)t(a);for(let[,{to:o}]of n.dynamics)t(o);for(let{to:o}of n.shortcuts)t(o);let s=new Set(n.shortcuts.map(({to:o})=>o));for(;n.shortcuts.length>0;){let{to:o}=n.shortcuts.shift(),a=r.nodes[o];for(let[l,c]of Object.entries(a.statics)){let u=Object.prototype.hasOwnProperty.call(n.statics,l)?n.statics[l]:n.statics[l]=[];for(let g of c)u.some(({to:f})=>g.to===f)||u.push(g)}for(let[l,c]of a.dynamics)n.dynamics.some(([u,{to:g}])=>l===u&&c.to===g)||n.dynamics.push([l,c]);for(let l of a.shortcuts)s.has(l.to)||(n.shortcuts.push(l),s.add(l.to))}};t(0)}function $de(r,{prefix:e=""}={}){if(nv){pn(`${e}Nodes are:`);for(let t=0;t<r.nodes.length;++t)pn(`${e}  ${t}: ${JSON.stringify(r.nodes[t])}`)}}function RH(r,e,t=!1){pn(`Running a vm on ${JSON.stringify(e)}`);let i=[{node:0,state:{candidateUsage:null,requiredOptions:[],errorMessage:null,ignoreOptions:!1,options:[],path:[],positionals:[],remainder:null,selectedIndex:null}}];$de(r,{prefix:"  "});let n=[tv,...e];for(let s=0;s<n.length;++s){let o=n[s];pn(`  Processing ${JSON.stringify(o)}`);let a=[];for(let{node:l,state:c}of i){pn(`    Current node is ${l}`);let u=r.nodes[l];if(l===2){a.push({node:l,state:c});continue}console.assert(u.shortcuts.length===0,"Shortcuts should have been eliminated by now");let g=Object.prototype.hasOwnProperty.call(u.statics,o);if(!t||s<n.length-1||g)if(g){let f=u.statics[o];for(let{to:h,reducer:p}of f)a.push({node:h,state:typeof p<"u"?RI(uv,p,c,o):c}),pn(`      Static transition to ${h} found`)}else pn("      No static transition found");else{let f=!1;for(let h of Object.keys(u.statics))if(!!h.startsWith(o)){if(o===h)for(let{to:p,reducer:C}of u.statics[h])a.push({node:p,state:typeof C<"u"?RI(uv,C,c,o):c}),pn(`      Static transition to ${p} found`);else for(let{to:p}of u.statics[h])a.push({node:p,state:{...c,remainder:h.slice(o.length)}}),pn(`      Static transition to ${p} found (partial match)`);f=!0}f||pn("      No partial static transition found")}if(o!==wi)for(let[f,{to:h,reducer:p}]of u.dynamics)RI(NI,f,c,o)&&(a.push({node:h,state:typeof p<"u"?RI(uv,p,c,o):c}),pn(`      Dynamic transition to ${h} found (via ${f})`))}if(a.length===0&&o===wi&&e.length===1)return[{node:0,state:DH}];if(a.length===0)throw new Hg(e,i.filter(({node:l})=>l!==2).map(({state:l})=>({usage:l.candidateUsage,reason:null})));if(a.every(({node:l})=>l===2))throw new Hg(e,a.map(({state:l})=>({usage:l.candidateUsage,reason:l.errorMessage})));i=iCe(a)}if(i.length>0){pn("  Results:");for(let s of i)pn(`    - ${s.node} -> ${JSON.stringify(s.state)}`)}else pn("  No results");return i}function eCe(r,e){if(e.selectedIndex!==null)return!0;if(Object.prototype.hasOwnProperty.call(r.statics,wi)){for(let{to:t}of r.statics[wi])if(t===1)return!0}return!1}function tCe(r,e,t){let i=t&&e.length>0?[""]:[],n=RH(r,e,t),s=[],o=new Set,a=(l,c,u=!0)=>{let g=[c];for(;g.length>0;){let h=g;g=[];for(let p of h){let C=r.nodes[p],y=Object.keys(C.statics);for(let B of Object.keys(C.statics)){let v=y[0];for(let{to:D,reducer:T}of C.statics[v])T==="pushPath"&&(u||l.push(v),g.push(D))}}u=!1}let f=JSON.stringify(l);o.has(f)||(s.push(l),o.add(f))};for(let{node:l,state:c}of n){if(c.remainder!==null){a([c.remainder],l);continue}let u=r.nodes[l],g=eCe(u,c);for(let[f,h]of Object.entries(u.statics))(g&&f!==wi||!f.startsWith("-")&&h.some(({reducer:p})=>p==="pushPath"))&&a([...i,f],l);if(!!g)for(let[f,{to:h}]of u.dynamics){if(h===2)continue;let p=aCe(f,c);if(p!==null)for(let C of p)a([...i,C],l)}}return[...s].sort()}function rCe(r,e){let t=RH(r,[...e,wi]);return nCe(e,t.map(({state:i})=>i))}function iCe(r){let e=0;for(let{state:t}of r)t.path.length>e&&(e=t.path.length);return r.filter(({state:t})=>t.path.length===e)}function nCe(r,e){let t=e.filter(g=>g.selectedIndex!==null);if(t.length===0)throw new Error;let i=t.filter(g=>g.requiredOptions.every(f=>f.some(h=>g.options.find(p=>p.name===h))));if(i.length===0)throw new Hg(r,t.map(g=>({usage:g.candidateUsage,reason:null})));let n=0;for(let g of i)g.path.length>n&&(n=g.path.length);let s=i.filter(g=>g.path.length===n),o=g=>g.positionals.filter(({extra:f})=>!f).length+g.options.length,a=s.map(g=>({state:g,positionalCount:o(g)})),l=0;for(let{positionalCount:g}of a)g>l&&(l=g);let c=a.filter(({positionalCount:g})=>g===l).map(({state:g})=>g),u=sCe(c);if(u.length>1)throw new PI(r,u.map(g=>g.candidateUsage));return u[0]}function sCe(r){let e=[],t=[];for(let i of r)i.selectedIndex===-1?t.push(i):e.push(i);return t.length>0&&e.push({...DH,path:FH(...t.map(i=>i.path)),options:t.reduce((i,n)=>i.concat(n.options),[])}),e}function FH(r,e,...t){return e===void 0?Array.from(r):FH(r.filter((i,n)=>i===e[n]),...t)}function _i(){return{dynamics:[],shortcuts:[],statics:{}}}function NH(r){return r===1||r===2}function cv(r,e=0){return{to:NH(r.to)?r.to:r.to>2?r.to+e-2:r.to+e,reducer:r.reducer}}function oCe(r,e=0){let t=_i();for(let[i,n]of r.dynamics)t.dynamics.push([i,cv(n,e)]);for(let i of r.shortcuts)t.shortcuts.push(cv(i,e));for(let[i,n]of Object.entries(r.statics))t.statics[i]=n.map(s=>cv(s,e));return t}function Bi(r,e,t,i,n){r.nodes[e].dynamics.push([t,{to:i,reducer:n}])}function Gg(r,e,t,i){r.nodes[e].shortcuts.push({to:t,reducer:i})}function Qa(r,e,t,i,n){(Object.prototype.hasOwnProperty.call(r.nodes[e].statics,t)?r.nodes[e].statics[t]:r.nodes[e].statics[t]=[]).push({to:i,reducer:n})}function RI(r,e,t,i){if(Array.isArray(e)){let[n,...s]=e;return r[n](t,i,...s)}else return r[e](t,i)}function aCe(r,e){let t=Array.isArray(r)?NI[r[0]]:NI[r];if(typeof t.suggest>"u")return null;let i=Array.isArray(r)?r.slice(1):[];return t.suggest(e,...i)}var NI={always:()=>!0,isOptionLike:(r,e)=>!r.ignoreOptions&&e!=="-"&&e.startsWith("-"),isNotOptionLike:(r,e)=>r.ignoreOptions||e==="-"||!e.startsWith("-"),isOption:(r,e,t,i)=>!r.ignoreOptions&&e===t,isBatchOption:(r,e,t)=>!r.ignoreOptions&&EH.test(e)&&[...e.slice(1)].every(i=>t.includes(`-${i}`)),isBoundOption:(r,e,t,i)=>{let n=e.match(iv);return!r.ignoreOptions&&!!n&&xI.test(n[1])&&t.includes(n[1])&&i.filter(s=>s.names.includes(n[1])).every(s=>s.allowBinding)},isNegatedOption:(r,e,t)=>!r.ignoreOptions&&e===`--no-${t.slice(2)}`,isHelp:(r,e)=>!r.ignoreOptions&&rv.test(e),isUnsupportedOption:(r,e,t)=>!r.ignoreOptions&&e.startsWith("-")&&xI.test(e)&&!t.includes(e),isInvalidOption:(r,e)=>!r.ignoreOptions&&e.startsWith("-")&&!xI.test(e)};NI.isOption.suggest=(r,e,t=!0)=>t?null:[e];var uv={setCandidateState:(r,e,t)=>({...r,...t}),setSelectedIndex:(r,e,t)=>({...r,selectedIndex:t}),pushBatch:(r,e)=>({...r,options:r.options.concat([...e.slice(1)].map(t=>({name:`-${t}`,value:!0})))}),pushBound:(r,e)=>{let[,t,i]=e.match(iv);return{...r,options:r.options.concat({name:t,value:i})}},pushPath:(r,e)=>({...r,path:r.path.concat(e)}),pushPositional:(r,e)=>({...r,positionals:r.positionals.concat({value:e,extra:!1})}),pushExtra:(r,e)=>({...r,positionals:r.positionals.concat({value:e,extra:!0})}),pushExtraNoLimits:(r,e)=>({...r,positionals:r.positionals.concat({value:e,extra:Hn})}),pushTrue:(r,e,t=e)=>({...r,options:r.options.concat({name:e,value:!0})}),pushFalse:(r,e,t=e)=>({...r,options:r.options.concat({name:t,value:!1})}),pushUndefined:(r,e)=>({...r,options:r.options.concat({name:e,value:void 0})}),pushStringValue:(r,e)=>{var t;let i={...r,options:[...r.options]},n=r.options[r.options.length-1];return n.value=((t=n.value)!==null&&t!==void 0?t:[]).concat([e]),i},setStringValue:(r,e)=>{let t={...r,options:[...r.options]},i=r.options[r.options.length-1];return i.value=e,t},inhibateOptions:r=>({...r,ignoreOptions:!0}),useHelp:(r,e,t)=>{let[,,i]=e.match(rv);return typeof i<"u"?{...r,options:[{name:"-c",value:String(t)},{name:"-i",value:i}]}:{...r,options:[{name:"-c",value:String(t)}]}},setError:(r,e,t)=>e===wi?{...r,errorMessage:`${t}.`}:{...r,errorMessage:`${t} ("${e}").`},setOptionArityError:(r,e)=>{let t=r.options[r.options.length-1];return{...r,errorMessage:`Not enough arguments to option ${t.name}.`}}},Hn=Symbol(),gv=class{constructor(e,t){this.allOptionNames=[],this.arity={leading:[],trailing:[],extra:[],proxy:!1},this.options=[],this.paths=[],this.cliIndex=e,this.cliOpts=t}addPath(e){this.paths.push(e)}setArity({leading:e=this.arity.leading,trailing:t=this.arity.trailing,extra:i=this.arity.extra,proxy:n=this.arity.proxy}){Object.assign(this.arity,{leading:e,trailing:t,extra:i,proxy:n})}addPositional({name:e="arg",required:t=!0}={}){if(!t&&this.arity.extra===Hn)throw new Error("Optional parameters cannot be declared when using .rest() or .proxy()");if(!t&&this.arity.trailing.length>0)throw new Error("Optional parameters cannot be declared after the required trailing positional arguments");!t&&this.arity.extra!==Hn?this.arity.extra.push(e):this.arity.extra!==Hn&&this.arity.extra.length===0?this.arity.leading.push(e):this.arity.trailing.push(e)}addRest({name:e="arg",required:t=0}={}){if(this.arity.extra===Hn)throw new Error("Infinite lists cannot be declared multiple times in the same command");if(this.arity.trailing.length>0)throw new Error("Infinite lists cannot be declared after the required trailing positional arguments");for(let i=0;i<t;++i)this.addPositional({name:e});this.arity.extra=Hn}addProxy({required:e=0}={}){this.addRest({required:e}),this.arity.proxy=!0}addOption({names:e,description:t,arity:i=0,hidden:n=!1,required:s=!1,allowBinding:o=!0}){if(!o&&i>1)throw new Error("The arity cannot be higher than 1 when the option only supports the --arg=value syntax");if(!Number.isInteger(i))throw new Error(`The arity must be an integer, got ${i}`);if(i<0)throw new Error(`The arity must be positive, got ${i}`);this.allOptionNames.push(...e),this.options.push({names:e,description:t,arity:i,hidden:n,required:s,allowBinding:o})}setContext(e){this.context=e}usage({detailed:e=!0,inlineOptions:t=!0}={}){let i=[this.cliOpts.binaryName],n=[];if(this.paths.length>0&&i.push(...this.paths[0]),e){for(let{names:o,arity:a,hidden:l,description:c,required:u}of this.options){if(l)continue;let g=[];for(let h=0;h<a;++h)g.push(` #${h}`);let f=`${o.join(",")}${g.join("")}`;!t&&c?n.push({definition:f,description:c,required:u}):i.push(u?`<${f}>`:`[${f}]`)}i.push(...this.arity.leading.map(o=>`<${o}>`)),this.arity.extra===Hn?i.push("..."):i.push(...this.arity.extra.map(o=>`[${o}]`)),i.push(...this.arity.trailing.map(o=>`<${o}>`))}return{usage:i.join(" "),options:n}}compile(){if(typeof this.context>"u")throw new Error("Assertion failed: No context attached");let e=kH(),t=0,i=this.usage().usage,n=this.options.filter(a=>a.required).map(a=>a.names);t=Xs(e,_i()),Qa(e,0,tv,t,["setCandidateState",{candidateUsage:i,requiredOptions:n}]);let s=this.arity.proxy?"always":"isNotOptionLike",o=this.paths.length>0?this.paths:[[]];for(let a of o){let l=t;if(a.length>0){let f=Xs(e,_i());Gg(e,l,f),this.registerOptions(e,f),l=f}for(let f=0;f<a.length;++f){let h=Xs(e,_i());Qa(e,l,a[f],h,"pushPath"),l=h}if(this.arity.leading.length>0||!this.arity.proxy){let f=Xs(e,_i());Bi(e,l,"isHelp",f,["useHelp",this.cliIndex]),Qa(e,f,wi,1,["setSelectedIndex",-1]),this.registerOptions(e,l)}this.arity.leading.length>0&&Qa(e,l,wi,2,["setError","Not enough positional arguments"]);let c=l;for(let f=0;f<this.arity.leading.length;++f){let h=Xs(e,_i());this.arity.proxy||this.registerOptions(e,h),(this.arity.trailing.length>0||f+1!==this.arity.leading.length)&&Qa(e,h,wi,2,["setError","Not enough positional arguments"]),Bi(e,c,"isNotOptionLike",h,"pushPositional"),c=h}let u=c;if(this.arity.extra===Hn||this.arity.extra.length>0){let f=Xs(e,_i());if(Gg(e,c,f),this.arity.extra===Hn){let h=Xs(e,_i());this.arity.proxy||this.registerOptions(e,h),Bi(e,c,s,h,"pushExtraNoLimits"),Bi(e,h,s,h,"pushExtraNoLimits"),Gg(e,h,f)}else for(let h=0;h<this.arity.extra.length;++h){let p=Xs(e,_i());this.arity.proxy||this.registerOptions(e,p),Bi(e,u,s,p,"pushExtra"),Gg(e,p,f),u=p}u=f}this.arity.trailing.length>0&&Qa(e,u,wi,2,["setError","Not enough positional arguments"]);let g=u;for(let f=0;f<this.arity.trailing.length;++f){let h=Xs(e,_i());this.arity.proxy||this.registerOptions(e,h),f+1<this.arity.trailing.length&&Qa(e,h,wi,2,["setError","Not enough positional arguments"]),Bi(e,g,"isNotOptionLike",h,"pushPositional"),g=h}Bi(e,g,s,2,["setError","Extraneous positional argument"]),Qa(e,g,wi,1,["setSelectedIndex",this.cliIndex])}return{machine:e,context:this.context}}registerOptions(e,t){Bi(e,t,["isOption","--"],t,"inhibateOptions"),Bi(e,t,["isBatchOption",this.allOptionNames],t,"pushBatch"),Bi(e,t,["isBoundOption",this.allOptionNames,this.options],t,"pushBound"),Bi(e,t,["isUnsupportedOption",this.allOptionNames],2,["setError","Unsupported option name"]),Bi(e,t,["isInvalidOption"],2,["setError","Invalid option name"]);for(let i of this.options){let n=i.names.reduce((s,o)=>o.length>s.length?o:s,"");if(i.arity===0)for(let s of i.names)Bi(e,t,["isOption",s,i.hidden||s!==n],t,"pushTrue"),s.startsWith("--")&&!s.startsWith("--no-")&&Bi(e,t,["isNegatedOption",s],t,["pushFalse",s]);else{let s=Xs(e,_i());for(let o of i.names)Bi(e,t,["isOption",o,i.hidden||o!==n],s,"pushUndefined");for(let o=0;o<i.arity;++o){let a=Xs(e,_i());Qa(e,s,wi,2,"setOptionArityError"),Bi(e,s,"isOptionLike",2,"setOptionArityError");let l=i.arity===1?"setStringValue":"pushStringValue";Bi(e,s,"isNotOptionLike",a,l),s=a}Gg(e,s,t)}}}},jg=class{constructor({binaryName:e="..."}={}){this.builders=[],this.opts={binaryName:e}}static build(e,t={}){return new jg(t).commands(e).compile()}getBuilderByIndex(e){if(!(e>=0&&e<this.builders.length))throw new Error(`Assertion failed: Out-of-bound command index (${e})`);return this.builders[e]}commands(e){for(let t of e)t(this.command());return this}command(){let e=new gv(this.builders.length,this.opts);return this.builders.push(e),e}compile(){let e=[],t=[];for(let n of this.builders){let{machine:s,context:o}=n.compile();e.push(s),t.push(o)}let i=Zde(e);return _de(i),{machine:i,contexts:t,process:n=>rCe(i,n),suggest:(n,s)=>tCe(i,n,s)}}};var qg=class extends ve{constructor(e){super(),this.contexts=e,this.commands=[]}static from(e,t){let i=new qg(t);i.path=e.path;for(let n of e.options)switch(n.name){case"-c":i.commands.push(Number(n.value));break;case"-i":i.index=Number(n.value);break}return i}async execute(){let e=this.commands;if(typeof this.index<"u"&&this.index>=0&&this.index<e.length&&(e=[e[this.index]]),e.length===0)this.context.stdout.write(this.cli.usage());else if(e.length===1)this.context.stdout.write(this.cli.usage(this.contexts[e[0]].commandClass,{detailed:!0}));else if(e.length>1){this.context.stdout.write(`Multiple commands match your selection:
-`),this.context.stdout.write(`
-`);let t=0;for(let i of this.commands)this.context.stdout.write(this.cli.usage(this.contexts[i].commandClass,{prefix:`${t++}. `.padStart(5)}));this.context.stdout.write(`
-`),this.context.stdout.write(`Run again with -h=<index> to see the longer details of any of those commands.
-`)}}};var TH=Symbol("clipanion/errorCommand");function ACe(){return process.env.FORCE_COLOR==="0"?1:process.env.FORCE_COLOR==="1"||typeof process.stdout<"u"&&process.stdout.isTTY?8:1}var Gn=class{constructor({binaryLabel:e,binaryName:t="...",binaryVersion:i,enableCapture:n=!1,enableColors:s}={}){this.registrations=new Map,this.builder=new jg({binaryName:t}),this.binaryLabel=e,this.binaryName=t,this.binaryVersion=i,this.enableCapture=n,this.enableColors=s}static from(e,t={}){let i=new Gn(t);for(let n of e)i.register(n);return i}register(e){var t;let i=new Map,n=new e;for(let l in n){let c=n[l];typeof c=="object"&&c!==null&&c[ve.isOption]&&i.set(l,c)}let s=this.builder.command(),o=s.cliIndex,a=(t=e.paths)!==null&&t!==void 0?t:n.paths;if(typeof a<"u")for(let l of a)s.addPath(l);this.registrations.set(e,{specs:i,builder:s,index:o});for(let[l,{definition:c}]of i.entries())c(s,l);s.setContext({commandClass:e})}process(e){let{contexts:t,process:i}=this.builder.compile(),n=i(e);switch(n.selectedIndex){case-1:return qg.from(n,t);default:{let{commandClass:s}=t[n.selectedIndex],o=this.registrations.get(s);if(typeof o>"u")throw new Error("Assertion failed: Expected the command class to have been registered.");let a=new s;a.path=n.path;try{for(let[l,{transformer:c}]of o.specs.entries())a[l]=c(o.builder,l,n);return a}catch(l){throw l[TH]=a,l}}break}}async run(e,t){var i;let n,s={...Gn.defaultContext,...t},o=(i=this.enableColors)!==null&&i!==void 0?i:s.colorDepth>1;if(!Array.isArray(e))n=e;else try{n=this.process(e)}catch(c){return s.stdout.write(this.error(c,{colored:o})),1}if(n.help)return s.stdout.write(this.usage(n,{colored:o,detailed:!0})),0;n.context=s,n.cli={binaryLabel:this.binaryLabel,binaryName:this.binaryName,binaryVersion:this.binaryVersion,enableCapture:this.enableCapture,enableColors:this.enableColors,definitions:()=>this.definitions(),error:(c,u)=>this.error(c,u),format:c=>this.format(c),process:c=>this.process(c),run:(c,u)=>this.run(c,{...s,...u}),usage:(c,u)=>this.usage(c,u)};let a=this.enableCapture?lCe(s):OH,l;try{l=await a(()=>n.validateAndExecute().catch(c=>n.catch(c).then(()=>0)))}catch(c){return s.stdout.write(this.error(c,{colored:o,command:n})),1}return l}async runExit(e,t){process.exitCode=await this.run(e,t)}suggest(e,t){let{suggest:i}=this.builder.compile();return i(e,t)}definitions({colored:e=!1}={}){let t=[];for(let[i,{index:n}]of this.registrations){if(typeof i.usage>"u")continue;let{usage:s}=this.getUsageByIndex(n,{detailed:!1}),{usage:o,options:a}=this.getUsageByIndex(n,{detailed:!0,inlineOptions:!1}),l=typeof i.usage.category<"u"?Ti(i.usage.category,{format:this.format(e),paragraphs:!1}):void 0,c=typeof i.usage.description<"u"?Ti(i.usage.description,{format:this.format(e),paragraphs:!1}):void 0,u=typeof i.usage.details<"u"?Ti(i.usage.details,{format:this.format(e),paragraphs:!0}):void 0,g=typeof i.usage.examples<"u"?i.usage.examples.map(([f,h])=>[Ti(f,{format:this.format(e),paragraphs:!1}),h.replace(/\$0/g,this.binaryName)]):void 0;t.push({path:s,usage:o,category:l,description:c,details:u,examples:g,options:a})}return t}usage(e=null,{colored:t,detailed:i=!1,prefix:n="$ "}={}){var s;if(e===null){for(let l of this.registrations.keys()){let c=l.paths,u=typeof l.usage<"u";if(!c||c.length===0||c.length===1&&c[0].length===0||((s=c==null?void 0:c.some(h=>h.length===0))!==null&&s!==void 0?s:!1))if(e){e=null;break}else e=l;else if(u){e=null;continue}}e&&(i=!0)}let o=e!==null&&e instanceof ve?e.constructor:e,a="";if(o)if(i){let{description:l="",details:c="",examples:u=[]}=o.usage||{};l!==""&&(a+=Ti(l,{format:this.format(t),paragraphs:!1}).replace(/^./,h=>h.toUpperCase()),a+=`
-`),(c!==""||u.length>0)&&(a+=`${this.format(t).header("Usage")}
-`,a+=`
-`);let{usage:g,options:f}=this.getUsageByRegistration(o,{inlineOptions:!1});if(a+=`${this.format(t).bold(n)}${g}
-`,f.length>0){a+=`
-`,a+=`${lv.header("Options")}
-`;let h=f.reduce((p,C)=>Math.max(p,C.definition.length),0);a+=`
-`;for(let{definition:p,description:C}of f)a+=`  ${this.format(t).bold(p.padEnd(h))}    ${Ti(C,{format:this.format(t),paragraphs:!1})}`}if(c!==""&&(a+=`
-`,a+=`${this.format(t).header("Details")}
-`,a+=`
-`,a+=Ti(c,{format:this.format(t),paragraphs:!0})),u.length>0){a+=`
-`,a+=`${this.format(t).header("Examples")}
-`;for(let[h,p]of u)a+=`
-`,a+=Ti(h,{format:this.format(t),paragraphs:!1}),a+=`${p.replace(/^/m,`  ${this.format(t).bold(n)}`).replace(/\$0/g,this.binaryName)}
-`}}else{let{usage:l}=this.getUsageByRegistration(o);a+=`${this.format(t).bold(n)}${l}
-`}else{let l=new Map;for(let[f,{index:h}]of this.registrations.entries()){if(typeof f.usage>"u")continue;let p=typeof f.usage.category<"u"?Ti(f.usage.category,{format:this.format(t),paragraphs:!1}):null,C=l.get(p);typeof C>"u"&&l.set(p,C=[]);let{usage:y}=this.getUsageByIndex(h);C.push({commandClass:f,usage:y})}let c=Array.from(l.keys()).sort((f,h)=>f===null?-1:h===null?1:f.localeCompare(h,"en",{usage:"sort",caseFirst:"upper"})),u=typeof this.binaryLabel<"u",g=typeof this.binaryVersion<"u";u||g?(u&&g?a+=`${this.format(t).header(`${this.binaryLabel} - ${this.binaryVersion}`)}
-
-`:u?a+=`${this.format(t).header(`${this.binaryLabel}`)}
-`:a+=`${this.format(t).header(`${this.binaryVersion}`)}
-`,a+=`  ${this.format(t).bold(n)}${this.binaryName} <command>
-`):a+=`${this.format(t).bold(n)}${this.binaryName} <command>
-`;for(let f of c){let h=l.get(f).slice().sort((C,y)=>C.usage.localeCompare(y.usage,"en",{usage:"sort",caseFirst:"upper"})),p=f!==null?f.trim():"General commands";a+=`
-`,a+=`${this.format(t).header(`${p}`)}
-`;for(let{commandClass:C,usage:y}of h){let B=C.usage.description||"undocumented";a+=`
-`,a+=`  ${this.format(t).bold(y)}
-`,a+=`    ${Ti(B,{format:this.format(t),paragraphs:!1})}`}}a+=`
-`,a+=Ti("You can also print more details about any of these commands by calling them with the `-h,--help` flag right after the command name.",{format:this.format(t),paragraphs:!0})}return a}error(e,t){var i,{colored:n,command:s=(i=e[TH])!==null&&i!==void 0?i:null}=t===void 0?{}:t;e instanceof Error||(e=new Error(`Execution failed with a non-error rejection (rejected value: ${JSON.stringify(e)})`));let o="",a=e.name.replace(/([a-z])([A-Z])/g,"$1 $2");a==="Error"&&(a="Internal Error"),o+=`${this.format(n).error(a)}: ${e.message}
-`;let l=e.clipanion;return typeof l<"u"?l.type==="usage"&&(o+=`
-`,o+=this.usage(s)):e.stack&&(o+=`${e.stack.replace(/^.*\n/,"")}
-`),o}format(e){var t;return((t=e!=null?e:this.enableColors)!==null&&t!==void 0?t:Gn.defaultContext.colorDepth>1)?lv:PH}getUsageByRegistration(e,t){let i=this.registrations.get(e);if(typeof i>"u")throw new Error("Assertion failed: Unregistered command");return this.getUsageByIndex(i.index,t)}getUsageByIndex(e,t){return this.builder.getBuilderByIndex(e).usage(t)}};Gn.defaultContext={stdin:process.stdin,stdout:process.stdout,stderr:process.stderr,colorDepth:"getColorDepth"in fv.default.WriteStream.prototype?fv.default.WriteStream.prototype.getColorDepth():ACe()};var LH;function lCe(r){let e=LH;if(typeof e>"u"){if(r.stdout===process.stdout&&r.stderr===process.stderr)return OH;let{AsyncLocalStorage:t}=J("async_hooks");e=LH=new t;let i=process.stdout._write;process.stdout._write=function(s,o,a){let l=e.getStore();return typeof l>"u"?i.call(this,s,o,a):l.stdout.write(s,o,a)};let n=process.stderr._write;process.stderr._write=function(s,o,a){let l=e.getStore();return typeof l>"u"?n.call(this,s,o,a):l.stderr.write(s,o,a)}}return t=>e.run(r,t)}function OH(r){return r()}var hv={};ut(hv,{DefinitionsCommand:()=>Ad,HelpCommand:()=>ld,VersionCommand:()=>cd});var Ad=class extends ve{async execute(){this.context.stdout.write(`${JSON.stringify(this.cli.definitions(),null,2)}
-`)}};Ad.paths=[["--clipanion=definitions"]];var ld=class extends ve{async execute(){this.context.stdout.write(this.cli.usage())}};ld.paths=[["-h"],["--help"]];var cd=class extends ve{async execute(){var e;this.context.stdout.write(`${(e=this.cli.binaryVersion)!==null&&e!==void 0?e:"<unknown>"}
-`)}};cd.paths=[["-v"],["--version"]];var z={};ut(z,{Array:()=>MH,Boolean:()=>KH,Counter:()=>UH,Proxy:()=>HH,Rest:()=>GH,String:()=>YH,applyValidator:()=>nd,cleanValidationError:()=>DI,formatError:()=>id,isOptionSymbol:()=>rd,makeCommandOption:()=>Xi,rerouteArguments:()=>Do});function MH(r,e,t){let[i,n]=Do(e,t!=null?t:{}),{arity:s=1}=n,o=r.split(","),a=new Set(o);return Xi({definition(l){l.addOption({names:o,arity:s,hidden:n==null?void 0:n.hidden,description:n==null?void 0:n.description,required:n.required})},transformer(l,c,u){let g=typeof i<"u"?[...i]:void 0;for(let{name:f,value:h}of u.options)!a.has(f)||(g=g!=null?g:[],g.push(h));return g}})}function KH(r,e,t){let[i,n]=Do(e,t!=null?t:{}),s=r.split(","),o=new Set(s);return Xi({definition(a){a.addOption({names:s,allowBinding:!1,arity:0,hidden:n.hidden,description:n.description,required:n.required})},transformer(a,l,c){let u=i;for(let{name:g,value:f}of c.options)!o.has(g)||(u=f);return u}})}function UH(r,e,t){let[i,n]=Do(e,t!=null?t:{}),s=r.split(","),o=new Set(s);return Xi({definition(a){a.addOption({names:s,allowBinding:!1,arity:0,hidden:n.hidden,description:n.description,required:n.required})},transformer(a,l,c){let u=i;for(let{name:g,value:f}of c.options)!o.has(g)||(u!=null||(u=0),f?u+=1:u=0);return u}})}function HH(r={}){return Xi({definition(e,t){var i;e.addProxy({name:(i=r.name)!==null&&i!==void 0?i:t,required:r.required})},transformer(e,t,i){return i.positionals.map(({value:n})=>n)}})}function GH(r={}){return Xi({definition(e,t){var i;e.addRest({name:(i=r.name)!==null&&i!==void 0?i:t,required:r.required})},transformer(e,t,i){let n=o=>{let a=i.positionals[o];return a.extra===Hn||a.extra===!1&&o<e.arity.leading.length},s=0;for(;s<i.positionals.length&&n(s);)s+=1;return i.positionals.splice(0,s).map(({value:o})=>o)}})}function cCe(r,e,t){let[i,n]=Do(e,t!=null?t:{}),{arity:s=1}=n,o=r.split(","),a=new Set(o);return Xi({definition(l){l.addOption({names:o,arity:n.tolerateBoolean?0:s,hidden:n.hidden,description:n.description,required:n.required})},transformer(l,c,u){let g,f=i;for(let{name:h,value:p}of u.options)!a.has(h)||(g=h,f=p);return typeof f=="string"?nd(g!=null?g:c,f,n.validator):f}})}function uCe(r={}){let{required:e=!0}=r;return Xi({definition(t,i){var n;t.addPositional({name:(n=r.name)!==null&&n!==void 0?n:i,required:r.required})},transformer(t,i,n){var s;for(let o=0;o<n.positionals.length;++o){if(n.positionals[o].extra===Hn||e&&n.positionals[o].extra===!0||!e&&n.positionals[o].extra===!1)continue;let[a]=n.positionals.splice(o,1);return nd((s=r.name)!==null&&s!==void 0?s:i,a.value,r.validator)}}})}function YH(r,...e){return typeof r=="string"?cCe(r,...e):uCe(r)}var Ez=Pe(Jg()),nk=J("stream");var Ct=(se=>(se[se.UNNAMED=0]="UNNAMED",se[se.EXCEPTION=1]="EXCEPTION",se[se.MISSING_PEER_DEPENDENCY=2]="MISSING_PEER_DEPENDENCY",se[se.CYCLIC_DEPENDENCIES=3]="CYCLIC_DEPENDENCIES",se[se.DISABLED_BUILD_SCRIPTS=4]="DISABLED_BUILD_SCRIPTS",se[se.BUILD_DISABLED=5]="BUILD_DISABLED",se[se.SOFT_LINK_BUILD=6]="SOFT_LINK_BUILD",se[se.MUST_BUILD=7]="MUST_BUILD",se[se.MUST_REBUILD=8]="MUST_REBUILD",se[se.BUILD_FAILED=9]="BUILD_FAILED",se[se.RESOLVER_NOT_FOUND=10]="RESOLVER_NOT_FOUND",se[se.FETCHER_NOT_FOUND=11]="FETCHER_NOT_FOUND",se[se.LINKER_NOT_FOUND=12]="LINKER_NOT_FOUND",se[se.FETCH_NOT_CACHED=13]="FETCH_NOT_CACHED",se[se.YARN_IMPORT_FAILED=14]="YARN_IMPORT_FAILED",se[se.REMOTE_INVALID=15]="REMOTE_INVALID",se[se.REMOTE_NOT_FOUND=16]="REMOTE_NOT_FOUND",se[se.RESOLUTION_PACK=17]="RESOLUTION_PACK",se[se.CACHE_CHECKSUM_MISMATCH=18]="CACHE_CHECKSUM_MISMATCH",se[se.UNUSED_CACHE_ENTRY=19]="UNUSED_CACHE_ENTRY",se[se.MISSING_LOCKFILE_ENTRY=20]="MISSING_LOCKFILE_ENTRY",se[se.WORKSPACE_NOT_FOUND=21]="WORKSPACE_NOT_FOUND",se[se.TOO_MANY_MATCHING_WORKSPACES=22]="TOO_MANY_MATCHING_WORKSPACES",se[se.CONSTRAINTS_MISSING_DEPENDENCY=23]="CONSTRAINTS_MISSING_DEPENDENCY",se[se.CONSTRAINTS_INCOMPATIBLE_DEPENDENCY=24]="CONSTRAINTS_INCOMPATIBLE_DEPENDENCY",se[se.CONSTRAINTS_EXTRANEOUS_DEPENDENCY=25]="CONSTRAINTS_EXTRANEOUS_DEPENDENCY",se[se.CONSTRAINTS_INVALID_DEPENDENCY=26]="CONSTRAINTS_INVALID_DEPENDENCY",se[se.CANT_SUGGEST_RESOLUTIONS=27]="CANT_SUGGEST_RESOLUTIONS",se[se.FROZEN_LOCKFILE_EXCEPTION=28]="FROZEN_LOCKFILE_EXCEPTION",se[se.CROSS_DRIVE_VIRTUAL_LOCAL=29]="CROSS_DRIVE_VIRTUAL_LOCAL",se[se.FETCH_FAILED=30]="FETCH_FAILED",se[se.DANGEROUS_NODE_MODULES=31]="DANGEROUS_NODE_MODULES",se[se.NODE_GYP_INJECTED=32]="NODE_GYP_INJECTED",se[se.AUTHENTICATION_NOT_FOUND=33]="AUTHENTICATION_NOT_FOUND",se[se.INVALID_CONFIGURATION_KEY=34]="INVALID_CONFIGURATION_KEY",se[se.NETWORK_ERROR=35]="NETWORK_ERROR",se[se.LIFECYCLE_SCRIPT=36]="LIFECYCLE_SCRIPT",se[se.CONSTRAINTS_MISSING_FIELD=37]="CONSTRAINTS_MISSING_FIELD",se[se.CONSTRAINTS_INCOMPATIBLE_FIELD=38]="CONSTRAINTS_INCOMPATIBLE_FIELD",se[se.CONSTRAINTS_EXTRANEOUS_FIELD=39]="CONSTRAINTS_EXTRANEOUS_FIELD",se[se.CONSTRAINTS_INVALID_FIELD=40]="CONSTRAINTS_INVALID_FIELD",se[se.AUTHENTICATION_INVALID=41]="AUTHENTICATION_INVALID",se[se.PROLOG_UNKNOWN_ERROR=42]="PROLOG_UNKNOWN_ERROR",se[se.PROLOG_SYNTAX_ERROR=43]="PROLOG_SYNTAX_ERROR",se[se.PROLOG_EXISTENCE_ERROR=44]="PROLOG_EXISTENCE_ERROR",se[se.STACK_OVERFLOW_RESOLUTION=45]="STACK_OVERFLOW_RESOLUTION",se[se.AUTOMERGE_FAILED_TO_PARSE=46]="AUTOMERGE_FAILED_TO_PARSE",se[se.AUTOMERGE_IMMUTABLE=47]="AUTOMERGE_IMMUTABLE",se[se.AUTOMERGE_SUCCESS=48]="AUTOMERGE_SUCCESS",se[se.AUTOMERGE_REQUIRED=49]="AUTOMERGE_REQUIRED",se[se.DEPRECATED_CLI_SETTINGS=50]="DEPRECATED_CLI_SETTINGS",se[se.PLUGIN_NAME_NOT_FOUND=51]="PLUGIN_NAME_NOT_FOUND",se[se.INVALID_PLUGIN_REFERENCE=52]="INVALID_PLUGIN_REFERENCE",se[se.CONSTRAINTS_AMBIGUITY=53]="CONSTRAINTS_AMBIGUITY",se[se.CACHE_OUTSIDE_PROJECT=54]="CACHE_OUTSIDE_PROJECT",se[se.IMMUTABLE_INSTALL=55]="IMMUTABLE_INSTALL",se[se.IMMUTABLE_CACHE=56]="IMMUTABLE_CACHE",se[se.INVALID_MANIFEST=57]="INVALID_MANIFEST",se[se.PACKAGE_PREPARATION_FAILED=58]="PACKAGE_PREPARATION_FAILED",se[se.INVALID_RANGE_PEER_DEPENDENCY=59]="INVALID_RANGE_PEER_DEPENDENCY",se[se.INCOMPATIBLE_PEER_DEPENDENCY=60]="INCOMPATIBLE_PEER_DEPENDENCY",se[se.DEPRECATED_PACKAGE=61]="DEPRECATED_PACKAGE",se[se.INCOMPATIBLE_OS=62]="INCOMPATIBLE_OS",se[se.INCOMPATIBLE_CPU=63]="INCOMPATIBLE_CPU",se[se.FROZEN_ARTIFACT_EXCEPTION=64]="FROZEN_ARTIFACT_EXCEPTION",se[se.TELEMETRY_NOTICE=65]="TELEMETRY_NOTICE",se[se.PATCH_HUNK_FAILED=66]="PATCH_HUNK_FAILED",se[se.INVALID_CONFIGURATION_VALUE=67]="INVALID_CONFIGURATION_VALUE",se[se.UNUSED_PACKAGE_EXTENSION=68]="UNUSED_PACKAGE_EXTENSION",se[se.REDUNDANT_PACKAGE_EXTENSION=69]="REDUNDANT_PACKAGE_EXTENSION",se[se.AUTO_NM_SUCCESS=70]="AUTO_NM_SUCCESS",se[se.NM_CANT_INSTALL_EXTERNAL_SOFT_LINK=71]="NM_CANT_INSTALL_EXTERNAL_SOFT_LINK",se[se.NM_PRESERVE_SYMLINKS_REQUIRED=72]="NM_PRESERVE_SYMLINKS_REQUIRED",se[se.UPDATE_LOCKFILE_ONLY_SKIP_LINK=73]="UPDATE_LOCKFILE_ONLY_SKIP_LINK",se[se.NM_HARDLINKS_MODE_DOWNGRADED=74]="NM_HARDLINKS_MODE_DOWNGRADED",se[se.PROLOG_INSTANTIATION_ERROR=75]="PROLOG_INSTANTIATION_ERROR",se[se.INCOMPATIBLE_ARCHITECTURE=76]="INCOMPATIBLE_ARCHITECTURE",se[se.GHOST_ARCHITECTURE=77]="GHOST_ARCHITECTURE",se[se.PROLOG_LIMIT_EXCEEDED=79]="PROLOG_LIMIT_EXCEEDED",se))(Ct||{});function FA(r){return`YN${r.toString(10).padStart(4,"0")}`}function LI(r){let e=Number(r.slice(2));if(typeof Ct[e]>"u")throw new Error(`Unknown message name: "${r}"`);return e}var P={};ut(P,{areDescriptorsEqual:()=>S8,areIdentsEqual:()=>sC,areLocatorsEqual:()=>oC,areVirtualPackagesEquivalent:()=>LSe,bindDescriptor:()=>NSe,bindLocator:()=>TSe,convertDescriptorToLocator:()=>Sw,convertLocatorToDescriptor:()=>HD,convertPackageToLocator:()=>FSe,convertToIdent:()=>RSe,convertToManifestRange:()=>KSe,copyPackage:()=>rC,devirtualizeDescriptor:()=>iC,devirtualizeLocator:()=>nC,getIdentVendorPath:()=>qD,isPackageCompatible:()=>kw,isVirtualDescriptor:()=>JA,isVirtualLocator:()=>qo,makeDescriptor:()=>_t,makeIdent:()=>Jo,makeLocator:()=>nn,makeRange:()=>xw,parseDescriptor:()=>WA,parseFileStyleRange:()=>OSe,parseIdent:()=>tn,parseLocator:()=>Dc,parseRange:()=>vf,prettyDependent:()=>nP,prettyDescriptor:()=>tr,prettyIdent:()=>Ai,prettyLocator:()=>mt,prettyLocatorNoColors:()=>jD,prettyRange:()=>Dw,prettyReference:()=>AC,prettyResolution:()=>iP,prettyWorkspace:()=>lC,renamePackage:()=>tC,slugifyIdent:()=>UD,slugifyLocator:()=>xf,sortDescriptors:()=>Pf,stringifyDescriptor:()=>Sn,stringifyIdent:()=>Ot,stringifyLocator:()=>Es,tryParseDescriptor:()=>aC,tryParseIdent:()=>v8,tryParseLocator:()=>vw,virtualizeDescriptor:()=>GD,virtualizePackage:()=>YD});var Sf=Pe(J("querystring")),B8=Pe(Xr()),b8=Pe(mJ());var ee={};ut(ee,{LogLevel:()=>Xy,Style:()=>_x,Type:()=>Ue,addLogFilterSupport:()=>Xd,applyColor:()=>Qn,applyHyperlink:()=>If,applyStyle:()=>Vy,json:()=>Bc,jsonOrPretty:()=>h0e,mark:()=>rP,pretty:()=>$e,prettyField:()=>Go,prettyList:()=>tP,supportsColor:()=>zy,supportsHyperlinks:()=>eP,tuple:()=>no});var Vd=Pe(wx()),zd=Pe(Ac());var pW=Pe(Bn()),dW=Pe(nW());var Ie={};ut(Ie,{AsyncActions:()=>Gx,BufferStream:()=>Hx,CachingStrategy:()=>fW,DefaultStream:()=>Yx,allSettledSafe:()=>io,assertNever:()=>qx,bufferStream:()=>Cf,buildIgnorePattern:()=>c0e,convertMapsToIndexableObjects:()=>Jy,dynamicRequire:()=>mf,escapeRegExp:()=>n0e,getArrayWithDefault:()=>hf,getFactoryWithDefault:()=>Ta,getMapWithDefault:()=>pf,getSetWithDefault:()=>wc,isIndexableObject:()=>Ux,isPathLike:()=>u0e,isTaggedYarnVersion:()=>i0e,mapAndFilter:()=>Ho,mapAndFind:()=>Jd,overrideType:()=>s0e,parseBoolean:()=>Wd,parseOptionalBoolean:()=>hW,prettifyAsyncErrors:()=>df,prettifySyncErrors:()=>Jx,releaseAfterUseAsync:()=>a0e,replaceEnvVariables:()=>Wx,sortMap:()=>bn,tryParseOptionalBoolean:()=>zx,validateEnum:()=>o0e});var oW=Pe(Bn()),aW=Pe(Jg()),AW=Pe(Xr()),jx=J("stream");function i0e(r){return!!(AW.default.valid(r)&&r.match(/^[^-]+(-rc\.[0-9]+)?$/))}function n0e(r){return r.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")}function s0e(r){}function qx(r){throw new Error(`Assertion failed: Unexpected object '${r}'`)}function o0e(r,e){let t=Object.values(r);if(!t.includes(e))throw new Qe(`Invalid value for enumeration: ${JSON.stringify(e)} (expected one of ${t.map(i=>JSON.stringify(i)).join(", ")})`);return e}function Ho(r,e){let t=[];for(let i of r){let n=e(i);n!==lW&&t.push(n)}return t}var lW=Symbol();Ho.skip=lW;function Jd(r,e){for(let t of r){let i=e(t);if(i!==cW)return i}}var cW=Symbol();Jd.skip=cW;function Ux(r){return typeof r=="object"&&r!==null}async function io(r){let e=await Promise.allSettled(r),t=[];for(let i of e){if(i.status==="rejected")throw i.reason;t.push(i.value)}return t}function Jy(r){if(r instanceof Map&&(r=Object.fromEntries(r)),Ux(r))for(let e of Object.keys(r)){let t=r[e];Ux(t)&&(r[e]=Jy(t))}return r}function Ta(r,e,t){let i=r.get(e);return typeof i>"u"&&r.set(e,i=t()),i}function hf(r,e){let t=r.get(e);return typeof t>"u"&&r.set(e,t=[]),t}function wc(r,e){let t=r.get(e);return typeof t>"u"&&r.set(e,t=new Set),t}function pf(r,e){let t=r.get(e);return typeof t>"u"&&r.set(e,t=new Map),t}async function a0e(r,e){if(e==null)return await r();try{return await r()}finally{await e()}}async function df(r,e){try{return await r()}catch(t){throw t.message=e(t.message),t}}function Jx(r,e){try{return r()}catch(t){throw t.message=e(t.message),t}}async function Cf(r){return await new Promise((e,t)=>{let i=[];r.on("error",n=>{t(n)}),r.on("data",n=>{i.push(n)}),r.on("end",()=>{e(Buffer.concat(i))})})}var Hx=class extends jx.Transform{constructor(){super(...arguments);this.chunks=[]}_transform(t,i,n){if(i!=="buffer"||!Buffer.isBuffer(t))throw new Error("Assertion failed: BufferStream only accept buffers");this.chunks.push(t),n(null,null)}_flush(t){t(null,Buffer.concat(this.chunks))}};function A0e(){let r,e;return{promise:new Promise((i,n)=>{r=i,e=n}),resolve:r,reject:e}}var Gx=class{constructor(e){this.deferred=new Map;this.promises=new Map;this.limit=(0,aW.default)(e)}set(e,t){let i=this.deferred.get(e);typeof i>"u"&&this.deferred.set(e,i=A0e());let n=this.limit(()=>t());return this.promises.set(e,n),n.then(()=>{this.promises.get(e)===n&&i.resolve()},s=>{this.promises.get(e)===n&&i.reject(s)}),i.promise}reduce(e,t){var n;let i=(n=this.promises.get(e))!=null?n:Promise.resolve();this.set(e,()=>t(i))}async wait(){await Promise.all(this.promises.values())}},Yx=class extends jx.Transform{constructor(t=Buffer.alloc(0)){super();this.active=!0;this.ifEmpty=t}_transform(t,i,n){if(i!=="buffer"||!Buffer.isBuffer(t))throw new Error("Assertion failed: DefaultStream only accept buffers");this.active=!1,n(null,t)}_flush(t){this.active&&this.ifEmpty.length>0?t(null,this.ifEmpty):t(null)}},qd=eval("require");function uW(r){return qd(K.fromPortablePath(r))}function gW(path){let physicalPath=K.fromPortablePath(path),currentCacheEntry=qd.cache[physicalPath];delete qd.cache[physicalPath];let result;try{result=uW(physicalPath);let freshCacheEntry=qd.cache[physicalPath],dynamicModule=eval("module"),freshCacheIndex=dynamicModule.children.indexOf(freshCacheEntry);freshCacheIndex!==-1&&dynamicModule.children.splice(freshCacheIndex,1)}finally{qd.cache[physicalPath]=currentCacheEntry}return result}var sW=new Map;function l0e(r){let e=sW.get(r),t=M.statSync(r);if((e==null?void 0:e.mtime)===t.mtimeMs)return e.instance;let i=gW(r);return sW.set(r,{mtime:t.mtimeMs,instance:i}),i}var fW=(i=>(i[i.NoCache=0]="NoCache",i[i.FsTime=1]="FsTime",i[i.Node=2]="Node",i))(fW||{});function mf(r,{cachingStrategy:e=2}={}){switch(e){case 0:return gW(r);case 1:return l0e(r);case 2:return uW(r);default:throw new Error("Unsupported caching strategy")}}function bn(r,e){let t=Array.from(r);Array.isArray(e)||(e=[e]);let i=[];for(let s of e)i.push(t.map(o=>s(o)));let n=t.map((s,o)=>o);return n.sort((s,o)=>{for(let a of i){let l=a[s]<a[o]?-1:a[s]>a[o]?1:0;if(l!==0)return l}return 0}),n.map(s=>t[s])}function c0e(r){return r.length===0?null:r.map(e=>`(${oW.default.makeRe(e,{windows:!1,dot:!0}).source})`).join("|")}function Wx(r,{env:e}){let t=/\${(?<variableName>[\d\w_]+)(?<colon>:)?(?:-(?<fallback>[^}]*))?}/g;return r.replace(t,(...i)=>{let{variableName:n,colon:s,fallback:o}=i[i.length-1],a=Object.prototype.hasOwnProperty.call(e,n),l=e[n];if(l||a&&!s)return l;if(o!=null)return o;throw new Qe(`Environment variable not found (${n})`)})}function Wd(r){switch(r){case"true":case"1":case 1:case!0:return!0;case"false":case"0":case 0:case!1:return!1;default:throw new Error(`Couldn't parse "${r}" as a boolean`)}}function hW(r){return typeof r>"u"?r:Wd(r)}function zx(r){try{return hW(r)}catch{return null}}function u0e(r){return!!(K.isAbsolute(r)||r.match(/^(\.{1,2}|~)\//))}var Ef=(t=>(t.HARD="HARD",t.SOFT="SOFT",t))(Ef||{}),Vx=(i=>(i.Dependency="Dependency",i.PeerDependency="PeerDependency",i.PeerDependencyMeta="PeerDependencyMeta",i))(Vx||{}),Xx=(i=>(i.Inactive="inactive",i.Redundant="redundant",i.Active="active",i))(Xx||{});var Ue={NO_HINT:"NO_HINT",NULL:"NULL",SCOPE:"SCOPE",NAME:"NAME",RANGE:"RANGE",REFERENCE:"REFERENCE",NUMBER:"NUMBER",PATH:"PATH",URL:"URL",ADDED:"ADDED",REMOVED:"REMOVED",CODE:"CODE",DURATION:"DURATION",SIZE:"SIZE",IDENT:"IDENT",DESCRIPTOR:"DESCRIPTOR",LOCATOR:"LOCATOR",RESOLUTION:"RESOLUTION",DEPENDENT:"DEPENDENT",PACKAGE_EXTENSION:"PACKAGE_EXTENSION",SETTING:"SETTING",MARKDOWN:"MARKDOWN"},_x=(e=>(e[e.BOLD=2]="BOLD",e))(_x||{}),$x=zd.default.GITHUB_ACTIONS?{level:2}:Vd.default.supportsColor?{level:Vd.default.supportsColor.level}:{level:0},zy=$x.level!==0,eP=zy&&!zd.default.GITHUB_ACTIONS&&!zd.default.CIRCLE&&!zd.default.GITLAB,Zx=new Vd.default.Instance($x),g0e=new Map([[Ue.NO_HINT,null],[Ue.NULL,["#a853b5",129]],[Ue.SCOPE,["#d75f00",166]],[Ue.NAME,["#d7875f",173]],[Ue.RANGE,["#00afaf",37]],[Ue.REFERENCE,["#87afff",111]],[Ue.NUMBER,["#ffd700",220]],[Ue.PATH,["#d75fd7",170]],[Ue.URL,["#d75fd7",170]],[Ue.ADDED,["#5faf00",70]],[Ue.REMOVED,["#d70000",160]],[Ue.CODE,["#87afff",111]],[Ue.SIZE,["#ffd700",220]]]),ms=r=>r,Wy={[Ue.NUMBER]:ms({pretty:(r,e)=>Qn(r,`${e}`,Ue.NUMBER),json:r=>r}),[Ue.IDENT]:ms({pretty:(r,e)=>Ai(r,e),json:r=>Ot(r)}),[Ue.LOCATOR]:ms({pretty:(r,e)=>mt(r,e),json:r=>Es(r)}),[Ue.DESCRIPTOR]:ms({pretty:(r,e)=>tr(r,e),json:r=>Sn(r)}),[Ue.RESOLUTION]:ms({pretty:(r,{descriptor:e,locator:t})=>iP(r,e,t),json:({descriptor:r,locator:e})=>({descriptor:Sn(r),locator:e!==null?Es(e):null})}),[Ue.DEPENDENT]:ms({pretty:(r,{locator:e,descriptor:t})=>nP(r,e,t),json:({locator:r,descriptor:e})=>({locator:Es(r),descriptor:Sn(e)})}),[Ue.PACKAGE_EXTENSION]:ms({pretty:(r,e)=>{switch(e.type){case"Dependency":return`${Ai(r,e.parentDescriptor)} \u27A4 ${Qn(r,"dependencies",Ue.CODE)} \u27A4 ${Ai(r,e.descriptor)}`;case"PeerDependency":return`${Ai(r,e.parentDescriptor)} \u27A4 ${Qn(r,"peerDependencies",Ue.CODE)} \u27A4 ${Ai(r,e.descriptor)}`;case"PeerDependencyMeta":return`${Ai(r,e.parentDescriptor)} \u27A4 ${Qn(r,"peerDependenciesMeta",Ue.CODE)} \u27A4 ${Ai(r,tn(e.selector))} \u27A4 ${Qn(r,e.key,Ue.CODE)}`;default:throw new Error(`Assertion failed: Unsupported package extension type: ${e.type}`)}},json:r=>{switch(r.type){case"Dependency":return`${Ot(r.parentDescriptor)} > ${Ot(r.descriptor)}`;case"PeerDependency":return`${Ot(r.parentDescriptor)} >> ${Ot(r.descriptor)}`;case"PeerDependencyMeta":return`${Ot(r.parentDescriptor)} >> ${r.selector} / ${r.key}`;default:throw new Error(`Assertion failed: Unsupported package extension type: ${r.type}`)}}}),[Ue.SETTING]:ms({pretty:(r,e)=>(r.get(e),If(r,Qn(r,e,Ue.CODE),`https://yarnpkg.com/configuration/yarnrc#${e}`)),json:r=>r}),[Ue.DURATION]:ms({pretty:(r,e)=>{if(e>1e3*60){let t=Math.floor(e/1e3/60),i=Math.ceil((e-t*60*1e3)/1e3);return i===0?`${t}m`:`${t}m ${i}s`}else{let t=Math.floor(e/1e3),i=e-t*1e3;return i===0?`${t}s`:`${t}s ${i}ms`}},json:r=>r}),[Ue.SIZE]:ms({pretty:(r,e)=>{let t=["KB","MB","GB","TB"],i=t.length;for(;i>1&&e<1024**i;)i-=1;let n=1024**i,s=Math.floor(e*100/n)/100;return Qn(r,`${s} ${t[i-1]}`,Ue.NUMBER)},json:r=>r}),[Ue.PATH]:ms({pretty:(r,e)=>Qn(r,K.fromPortablePath(e),Ue.PATH),json:r=>K.fromPortablePath(r)}),[Ue.MARKDOWN]:ms({pretty:(r,{text:e,format:t,paragraphs:i})=>Ti(e,{format:t,paragraphs:i}),json:({text:r})=>r})};function no(r,e){return[e,r]}function Vy(r,e,t){return r.get("enableColors")&&t&2&&(e=Vd.default.bold(e)),e}function Qn(r,e,t){if(!r.get("enableColors"))return e;let i=g0e.get(t);if(i===null)return e;let n=typeof i>"u"?t:$x.level>=3?i[0]:i[1],s=typeof n=="number"?Zx.ansi256(n):n.startsWith("#")?Zx.hex(n):Zx[n];if(typeof s!="function")throw new Error(`Invalid format type ${n}`);return s(e)}var f0e=!!process.env.KONSOLE_VERSION;function If(r,e,t){return r.get("enableHyperlinks")?f0e?`\x1B]8;;${t}\x1B\\${e}\x1B]8;;\x1B\\`:`\x1B]8;;${t}\x07${e}\x1B]8;;\x07`:e}function $e(r,e,t){if(e===null)return Qn(r,"null",Ue.NULL);if(Object.prototype.hasOwnProperty.call(Wy,t))return Wy[t].pretty(r,e);if(typeof e!="string")throw new Error(`Assertion failed: Expected the value to be a string, got ${typeof e}`);return Qn(r,e,t)}function tP(r,e,t,{separator:i=", "}={}){return[...e].map(n=>$e(r,n,t)).join(i)}function Bc(r,e){if(r===null)return null;if(Object.prototype.hasOwnProperty.call(Wy,e))return Wy[e].json(r);if(typeof r!="string")throw new Error(`Assertion failed: Expected the value to be a string, got ${typeof r}`);return r}function h0e(r,e,[t,i]){return r?Bc(t,i):$e(e,t,i)}function rP(r){return{Check:Qn(r,"\u2713","green"),Cross:Qn(r,"\u2718","red"),Question:Qn(r,"?","cyan")}}function Go(r,{label:e,value:[t,i]}){return`${$e(r,e,Ue.CODE)}: ${$e(r,t,i)}`}var Xy=(n=>(n.Error="error",n.Warning="warning",n.Info="info",n.Discard="discard",n))(Xy||{});function Xd(r,{configuration:e}){let t=e.get("logFilters"),i=new Map,n=new Map,s=[];for(let g of t){let f=g.get("level");if(typeof f>"u")continue;let h=g.get("code");typeof h<"u"&&i.set(h,f);let p=g.get("text");typeof p<"u"&&n.set(p,f);let C=g.get("pattern");typeof C<"u"&&s.push([pW.default.matcher(C,{contains:!0}),f])}s.reverse();let o=(g,f,h)=>{if(g===null||g===0)return h;let p=n.size>0||s.length>0?(0,dW.default)(f):f;if(n.size>0){let C=n.get(p);if(typeof C<"u")return C!=null?C:h}if(s.length>0){for(let[C,y]of s)if(C(p))return y!=null?y:h}if(i.size>0){let C=i.get(FA(g));if(typeof C<"u")return C!=null?C:h}return h},a=r.reportInfo,l=r.reportWarning,c=r.reportError,u=function(g,f,h,p){switch(o(f,h,p)){case"info":a.call(g,f,h);break;case"warning":l.call(g,f!=null?f:0,h);break;case"error":c.call(g,f!=null?f:0,h);break}};r.reportInfo=function(...g){return u(this,...g,"info")},r.reportWarning=function(...g){return u(this,...g,"warning")},r.reportError=function(...g){return u(this,...g,"error")}}var li={};ut(li,{checksumFile:()=>bw,checksumPattern:()=>Qw,makeHash:()=>rn});var Bw=J("crypto"),KD=Pe(MD());function rn(...r){let e=(0,Bw.createHash)("sha512"),t="";for(let i of r)typeof i=="string"?t+=i:i&&(t&&(e.update(t),t=""),e.update(i));return t&&e.update(t),e.digest("hex")}async function bw(r,{baseFs:e,algorithm:t}={baseFs:M,algorithm:"sha512"}){let i=await e.openPromise(r,"r");try{let s=Buffer.allocUnsafeSlow(65536),o=(0,Bw.createHash)(t),a=0;for(;(a=await e.readPromise(i,s,0,65536))!==0;)o.update(a===65536?s:s.slice(0,a));return o.digest("hex")}finally{await e.closePromise(i)}}async function Qw(r,{cwd:e}){let i=(await(0,KD.default)(r,{cwd:K.fromPortablePath(e),expandDirectories:!1,onlyDirectories:!0,unique:!0})).map(a=>`${a}/**/*`),n=await(0,KD.default)([r,...i],{cwd:K.fromPortablePath(e),expandDirectories:!1,onlyFiles:!1,unique:!0});n.sort();let s=await Promise.all(n.map(async a=>{let l=[Buffer.from(a)],c=K.toPortablePath(a),u=await M.lstatPromise(c);return u.isSymbolicLink()?l.push(Buffer.from(await M.readlinkPromise(c))):u.isFile()&&l.push(await M.readFilePromise(c)),l.join("\0")})),o=(0,Bw.createHash)("sha512");for(let a of s)o.update(a);return o.digest("hex")}var eC="virtual:",DSe=5,Q8=/(os|cpu|libc)=([a-z0-9_-]+)/,kSe=(0,b8.makeParser)(Q8);function Jo(r,e){if(r!=null&&r.startsWith("@"))throw new Error("Invalid scope: don't prefix it with '@'");return{identHash:rn(r,e),scope:r,name:e}}function _t(r,e){return{identHash:r.identHash,scope:r.scope,name:r.name,descriptorHash:rn(r.identHash,e),range:e}}function nn(r,e){return{identHash:r.identHash,scope:r.scope,name:r.name,locatorHash:rn(r.identHash,e),reference:e}}function RSe(r){return{identHash:r.identHash,scope:r.scope,name:r.name}}function Sw(r){return{identHash:r.identHash,scope:r.scope,name:r.name,locatorHash:r.descriptorHash,reference:r.range}}function HD(r){return{identHash:r.identHash,scope:r.scope,name:r.name,descriptorHash:r.locatorHash,range:r.reference}}function FSe(r){return{identHash:r.identHash,scope:r.scope,name:r.name,locatorHash:r.locatorHash,reference:r.reference}}function tC(r,e){return{identHash:e.identHash,scope:e.scope,name:e.name,locatorHash:e.locatorHash,reference:e.reference,version:r.version,languageName:r.languageName,linkType:r.linkType,conditions:r.conditions,dependencies:new Map(r.dependencies),peerDependencies:new Map(r.peerDependencies),dependenciesMeta:new Map(r.dependenciesMeta),peerDependenciesMeta:new Map(r.peerDependenciesMeta),bin:new Map(r.bin)}}function rC(r){return tC(r,r)}function GD(r,e){if(e.includes("#"))throw new Error("Invalid entropy");return _t(r,`virtual:${e}#${r.range}`)}function YD(r,e){if(e.includes("#"))throw new Error("Invalid entropy");return tC(r,nn(r,`virtual:${e}#${r.reference}`))}function JA(r){return r.range.startsWith(eC)}function qo(r){return r.reference.startsWith(eC)}function iC(r){if(!JA(r))throw new Error("Not a virtual descriptor");return _t(r,r.range.replace(/^[^#]*#/,""))}function nC(r){if(!qo(r))throw new Error("Not a virtual descriptor");return nn(r,r.reference.replace(/^[^#]*#/,""))}function NSe(r,e){return r.range.includes("::")?r:_t(r,`${r.range}::${Sf.default.stringify(e)}`)}function TSe(r,e){return r.reference.includes("::")?r:nn(r,`${r.reference}::${Sf.default.stringify(e)}`)}function sC(r,e){return r.identHash===e.identHash}function S8(r,e){return r.descriptorHash===e.descriptorHash}function oC(r,e){return r.locatorHash===e.locatorHash}function LSe(r,e){if(!qo(r))throw new Error("Invalid package type");if(!qo(e))throw new Error("Invalid package type");if(!sC(r,e)||r.dependencies.size!==e.dependencies.size)return!1;for(let t of r.dependencies.values()){let i=e.dependencies.get(t.identHash);if(!i||!S8(t,i))return!1}return!0}function tn(r){let e=v8(r);if(!e)throw new Error(`Invalid ident (${r})`);return e}function v8(r){let e=r.match(/^(?:@([^/]+?)\/)?([^/]+)$/);if(!e)return null;let[,t,i]=e;return Jo(typeof t<"u"?t:null,i)}function WA(r,e=!1){let t=aC(r,e);if(!t)throw new Error(`Invalid descriptor (${r})`);return t}function aC(r,e=!1){let t=e?r.match(/^(?:@([^/]+?)\/)?([^/]+?)(?:@(.+))$/):r.match(/^(?:@([^/]+?)\/)?([^/]+?)(?:@(.+))?$/);if(!t)return null;let[,i,n,s]=t;if(s==="unknown")throw new Error(`Invalid range (${r})`);let o=typeof i<"u"?i:null,a=typeof s<"u"?s:"unknown";return _t(Jo(o,n),a)}function Dc(r,e=!1){let t=vw(r,e);if(!t)throw new Error(`Invalid locator (${r})`);return t}function vw(r,e=!1){let t=e?r.match(/^(?:@([^/]+?)\/)?([^/]+?)(?:@(.+))$/):r.match(/^(?:@([^/]+?)\/)?([^/]+?)(?:@(.+))?$/);if(!t)return null;let[,i,n,s]=t;if(s==="unknown")throw new Error(`Invalid reference (${r})`);let o=typeof i<"u"?i:null,a=typeof s<"u"?s:"unknown";return nn(Jo(o,n),a)}function vf(r,e){let t=r.match(/^([^#:]*:)?((?:(?!::)[^#])*)(?:#((?:(?!::).)*))?(?:::(.*))?$/);if(t===null)throw new Error(`Invalid range (${r})`);let i=typeof t[1]<"u"?t[1]:null;if(typeof(e==null?void 0:e.requireProtocol)=="string"&&i!==e.requireProtocol)throw new Error(`Invalid protocol (${i})`);if((e==null?void 0:e.requireProtocol)&&i===null)throw new Error(`Missing protocol (${i})`);let n=typeof t[3]<"u"?decodeURIComponent(t[2]):null;if((e==null?void 0:e.requireSource)&&n===null)throw new Error(`Missing source (${r})`);let s=typeof t[3]<"u"?decodeURIComponent(t[3]):decodeURIComponent(t[2]),o=e!=null&&e.parseSelector?Sf.default.parse(s):s,a=typeof t[4]<"u"?Sf.default.parse(t[4]):null;return{protocol:i,source:n,selector:o,params:a}}function OSe(r,{protocol:e}){let{selector:t,params:i}=vf(r,{requireProtocol:e,requireBindings:!0});if(typeof i.locator!="string")throw new Error(`Assertion failed: Invalid bindings for ${r}`);return{parentLocator:Dc(i.locator,!0),path:t}}function w8(r){return r=r.replace(/%/g,"%25"),r=r.replace(/:/g,"%3A"),r=r.replace(/#/g,"%23"),r}function MSe(r){return r===null?!1:Object.entries(r).length>0}function xw({protocol:r,source:e,selector:t,params:i}){let n="";return r!==null&&(n+=`${r}`),e!==null&&(n+=`${w8(e)}#`),n+=w8(t),MSe(i)&&(n+=`::${Sf.default.stringify(i)}`),n}function KSe(r){let{params:e,protocol:t,source:i,selector:n}=vf(r);for(let s in e)s.startsWith("__")&&delete e[s];return xw({protocol:t,source:i,params:e,selector:n})}function Ot(r){return r.scope?`@${r.scope}/${r.name}`:`${r.name}`}function Sn(r){return r.scope?`@${r.scope}/${r.name}@${r.range}`:`${r.name}@${r.range}`}function Es(r){return r.scope?`@${r.scope}/${r.name}@${r.reference}`:`${r.name}@${r.reference}`}function UD(r){return r.scope!==null?`@${r.scope}-${r.name}`:r.name}function xf(r){let{protocol:e,selector:t}=vf(r.reference),i=e!==null?e.replace(/:$/,""):"exotic",n=B8.default.valid(t),s=n!==null?`${i}-${n}`:`${i}`,o=10,a=r.scope?`${UD(r)}-${s}-${r.locatorHash.slice(0,o)}`:`${UD(r)}-${s}-${r.locatorHash.slice(0,o)}`;return Jr(a)}function Ai(r,e){return e.scope?`${$e(r,`@${e.scope}/`,Ue.SCOPE)}${$e(r,e.name,Ue.NAME)}`:`${$e(r,e.name,Ue.NAME)}`}function Pw(r){if(r.startsWith(eC)){let e=Pw(r.substring(r.indexOf("#")+1)),t=r.substring(eC.length,eC.length+DSe);return`${e} [${t}]`}else return r.replace(/\?.*/,"?[...]")}function Dw(r,e){return`${$e(r,Pw(e),Ue.RANGE)}`}function tr(r,e){return`${Ai(r,e)}${$e(r,"@",Ue.RANGE)}${Dw(r,e.range)}`}function AC(r,e){return`${$e(r,Pw(e),Ue.REFERENCE)}`}function mt(r,e){return`${Ai(r,e)}${$e(r,"@",Ue.REFERENCE)}${AC(r,e.reference)}`}function jD(r){return`${Ot(r)}@${Pw(r.reference)}`}function Pf(r){return bn(r,[e=>Ot(e),e=>e.range])}function lC(r,e){return Ai(r,e.locator)}function iP(r,e,t){let i=JA(e)?iC(e):e;return t===null?`${tr(r,i)} \u2192 ${rP(r).Cross}`:i.identHash===t.identHash?`${tr(r,i)} \u2192 ${AC(r,t.reference)}`:`${tr(r,i)} \u2192 ${mt(r,t)}`}function nP(r,e,t){return t===null?`${mt(r,e)}`:`${mt(r,e)} (via ${Dw(r,t.range)})`}function qD(r){return`node_modules/${Ot(r)}`}function kw(r,e){return r.conditions?kSe(r.conditions,t=>{let[,i,n]=t.match(Q8),s=e[i];return s?s.includes(n):!0}):!0}var x8={hooks:{reduceDependency:(r,e,t,i,{resolver:n,resolveOptions:s})=>{for(let{pattern:o,reference:a}of e.topLevelWorkspace.manifest.resolutions){if(o.from&&o.from.fullName!==Ot(t)||o.from&&o.from.description&&o.from.description!==t.reference||o.descriptor.fullName!==Ot(r)||o.descriptor.description&&o.descriptor.description!==r.range)continue;return n.bindDescriptor(_t(r,a),e.topLevelWorkspace.anchoredLocator,s)}return r},validateProject:async(r,e)=>{for(let t of r.workspaces){let i=lC(r.configuration,t);await r.configuration.triggerHook(n=>n.validateWorkspace,t,{reportWarning:(n,s)=>e.reportWarning(n,`${i}: ${s}`),reportError:(n,s)=>e.reportError(n,`${i}: ${s}`)})}},validateWorkspace:async(r,e)=>{let{manifest:t}=r;t.resolutions.length&&r.cwd!==r.project.cwd&&t.errors.push(new Error("Resolutions field will be ignored"));for(let i of t.errors)e.reportWarning(57,i.message)}}};var T8=Pe(Xr());var cC=class{supportsDescriptor(e,t){return!!(e.range.startsWith(cC.protocol)||t.project.tryWorkspaceByDescriptor(e)!==null)}supportsLocator(e,t){return!!e.reference.startsWith(cC.protocol)}shouldPersistResolution(e,t){return!1}bindDescriptor(e,t,i){return e}getResolutionDependencies(e,t){return[]}async getCandidates(e,t,i){return[i.project.getWorkspaceByDescriptor(e).anchoredLocator]}async getSatisfying(e,t,i){return null}async resolve(e,t){let i=t.project.getWorkspaceByCwd(e.reference.slice(cC.protocol.length));return{...e,version:i.manifest.version||"0.0.0",languageName:"unknown",linkType:"SOFT",conditions:null,dependencies:new Map([...i.manifest.dependencies,...i.manifest.devDependencies]),peerDependencies:new Map([...i.manifest.peerDependencies]),dependenciesMeta:i.manifest.dependenciesMeta,peerDependenciesMeta:i.manifest.peerDependenciesMeta,bin:i.manifest.bin}}},Yr=cC;Yr.protocol="workspace:";var vt={};ut(vt,{SemVer:()=>k8.SemVer,clean:()=>HSe,satisfiesWithPrereleases:()=>kc,validRange:()=>so});var Rw=Pe(Xr()),k8=Pe(Xr()),P8=new Map;function kc(r,e,t=!1){if(!r)return!1;let i=`${e}${t}`,n=P8.get(i);if(typeof n>"u")try{n=new Rw.default.Range(e,{includePrerelease:!0,loose:t})}catch{return!1}finally{P8.set(i,n||null)}else if(n===null)return!1;let s;try{s=new Rw.default.SemVer(r,n)}catch{return!1}return n.test(s)?!0:(s.prerelease&&(s.prerelease=[]),n.set.some(o=>{for(let a of o)a.semver.prerelease&&(a.semver.prerelease=[]);return o.every(a=>a.test(s))}))}var D8=new Map;function so(r){if(r.indexOf(":")!==-1)return null;let e=D8.get(r);if(typeof e<"u")return e;try{e=new Rw.default.Range(r)}catch{e=null}return D8.set(r,e),e}var USe=/^(?:[\sv=]*?)((0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\s*)$/;function HSe(r){let e=USe.exec(r);return e?e[1]:null}var zA=class{constructor(){this.indent="  ";this.name=null;this.version=null;this.os=null;this.cpu=null;this.libc=null;this.type=null;this.packageManager=null;this.private=!1;this.license=null;this.main=null;this.module=null;this.browser=null;this.languageName=null;this.bin=new Map;this.scripts=new Map;this.dependencies=new Map;this.devDependencies=new Map;this.peerDependencies=new Map;this.workspaceDefinitions=[];this.dependenciesMeta=new Map;this.peerDependenciesMeta=new Map;this.resolutions=[];this.files=null;this.publishConfig=null;this.installConfig=null;this.preferUnplugged=null;this.raw={};this.errors=[]}static async tryFind(e,{baseFs:t=new $t}={}){let i=x.join(e,"package.json");try{return await zA.fromFile(i,{baseFs:t})}catch(n){if(n.code==="ENOENT")return null;throw n}}static async find(e,{baseFs:t}={}){let i=await zA.tryFind(e,{baseFs:t});if(i===null)throw new Error("Manifest not found");return i}static async fromFile(e,{baseFs:t=new $t}={}){let i=new zA;return await i.loadFile(e,{baseFs:t}),i}static fromText(e){let t=new zA;return t.loadFromText(e),t}static isManifestFieldCompatible(e,t){if(e===null)return!0;let i=!0,n=!1;for(let s of e)if(s[0]==="!"){if(n=!0,t===s.slice(1))return!1}else if(i=!1,s===t)return!0;return n&&i}loadFromText(e){let t;try{t=JSON.parse(F8(e)||"{}")}catch(i){throw i.message+=` (when parsing ${e})`,i}this.load(t),this.indent=R8(e)}async loadFile(e,{baseFs:t=new $t}){let i=await t.readFilePromise(e,"utf8"),n;try{n=JSON.parse(F8(i)||"{}")}catch(s){throw s.message+=` (when parsing ${e})`,s}this.load(n),this.indent=R8(i)}load(e,{yamlCompatibilityMode:t=!1}={}){if(typeof e!="object"||e===null)throw new Error(`Utterly invalid manifest data (${e})`);this.raw=e;let i=[];if(this.name=null,typeof e.name=="string")try{this.name=tn(e.name)}catch{i.push(new Error("Parsing failed for the 'name' field"))}if(typeof e.version=="string"?this.version=e.version:this.version=null,Array.isArray(e.os)){let s=[];this.os=s;for(let o of e.os)typeof o!="string"?i.push(new Error("Parsing failed for the 'os' field")):s.push(o)}else this.os=null;if(Array.isArray(e.cpu)){let s=[];this.cpu=s;for(let o of e.cpu)typeof o!="string"?i.push(new Error("Parsing failed for the 'cpu' field")):s.push(o)}else this.cpu=null;if(Array.isArray(e.libc)){let s=[];this.libc=s;for(let o of e.libc)typeof o!="string"?i.push(new Error("Parsing failed for the 'libc' field")):s.push(o)}else this.libc=null;if(typeof e.type=="string"?this.type=e.type:this.type=null,typeof e.packageManager=="string"?this.packageManager=e.packageManager:this.packageManager=null,typeof e.private=="boolean"?this.private=e.private:this.private=!1,typeof e.license=="string"?this.license=e.license:this.license=null,typeof e.languageName=="string"?this.languageName=e.languageName:this.languageName=null,typeof e.main=="string"?this.main=sn(e.main):this.main=null,typeof e.module=="string"?this.module=sn(e.module):this.module=null,e.browser!=null)if(typeof e.browser=="string")this.browser=sn(e.browser);else{this.browser=new Map;for(let[s,o]of Object.entries(e.browser))this.browser.set(sn(s),typeof o=="string"?sn(o):o)}else this.browser=null;if(this.bin=new Map,typeof e.bin=="string")e.bin.trim()===""?i.push(new Error("Invalid bin field")):this.name!==null?this.bin.set(this.name.name,sn(e.bin)):i.push(new Error("String bin field, but no attached package name"));else if(typeof e.bin=="object"&&e.bin!==null)for(let[s,o]of Object.entries(e.bin)){if(typeof o!="string"||o.trim()===""){i.push(new Error(`Invalid bin definition for '${s}'`));continue}let a=tn(s);this.bin.set(a.name,sn(o))}if(this.scripts=new Map,typeof e.scripts=="object"&&e.scripts!==null)for(let[s,o]of Object.entries(e.scripts)){if(typeof o!="string"){i.push(new Error(`Invalid script definition for '${s}'`));continue}this.scripts.set(s,o)}if(this.dependencies=new Map,typeof e.dependencies=="object"&&e.dependencies!==null)for(let[s,o]of Object.entries(e.dependencies)){if(typeof o!="string"){i.push(new Error(`Invalid dependency range for '${s}'`));continue}let a;try{a=tn(s)}catch{i.push(new Error(`Parsing failed for the dependency name '${s}'`));continue}let l=_t(a,o);this.dependencies.set(l.identHash,l)}if(this.devDependencies=new Map,typeof e.devDependencies=="object"&&e.devDependencies!==null)for(let[s,o]of Object.entries(e.devDependencies)){if(typeof o!="string"){i.push(new Error(`Invalid dependency range for '${s}'`));continue}let a;try{a=tn(s)}catch{i.push(new Error(`Parsing failed for the dependency name '${s}'`));continue}let l=_t(a,o);this.devDependencies.set(l.identHash,l)}if(this.peerDependencies=new Map,typeof e.peerDependencies=="object"&&e.peerDependencies!==null)for(let[s,o]of Object.entries(e.peerDependencies)){let a;try{a=tn(s)}catch{i.push(new Error(`Parsing failed for the dependency name '${s}'`));continue}(typeof o!="string"||!o.startsWith(Yr.protocol)&&!so(o))&&(i.push(new Error(`Invalid dependency range for '${s}'`)),o="*");let l=_t(a,o);this.peerDependencies.set(l.identHash,l)}typeof e.workspaces=="object"&&e.workspaces!==null&&e.workspaces.nohoist&&i.push(new Error("'nohoist' is deprecated, please use 'installConfig.hoistingLimits' instead"));let n=Array.isArray(e.workspaces)?e.workspaces:typeof e.workspaces=="object"&&e.workspaces!==null&&Array.isArray(e.workspaces.packages)?e.workspaces.packages:[];this.workspaceDefinitions=[];for(let s of n){if(typeof s!="string"){i.push(new Error(`Invalid workspace definition for '${s}'`));continue}this.workspaceDefinitions.push({pattern:s})}if(this.dependenciesMeta=new Map,typeof e.dependenciesMeta=="object"&&e.dependenciesMeta!==null)for(let[s,o]of Object.entries(e.dependenciesMeta)){if(typeof o!="object"||o===null){i.push(new Error(`Invalid meta field for '${s}`));continue}let a=WA(s),l=this.ensureDependencyMeta(a),c=Fw(o.built,{yamlCompatibilityMode:t});if(c===null){i.push(new Error(`Invalid built meta field for '${s}'`));continue}let u=Fw(o.optional,{yamlCompatibilityMode:t});if(u===null){i.push(new Error(`Invalid optional meta field for '${s}'`));continue}let g=Fw(o.unplugged,{yamlCompatibilityMode:t});if(g===null){i.push(new Error(`Invalid unplugged meta field for '${s}'`));continue}Object.assign(l,{built:c,optional:u,unplugged:g})}if(this.peerDependenciesMeta=new Map,typeof e.peerDependenciesMeta=="object"&&e.peerDependenciesMeta!==null)for(let[s,o]of Object.entries(e.peerDependenciesMeta)){if(typeof o!="object"||o===null){i.push(new Error(`Invalid meta field for '${s}'`));continue}let a=WA(s),l=this.ensurePeerDependencyMeta(a),c=Fw(o.optional,{yamlCompatibilityMode:t});if(c===null){i.push(new Error(`Invalid optional meta field for '${s}'`));continue}Object.assign(l,{optional:c})}if(this.resolutions=[],typeof e.resolutions=="object"&&e.resolutions!==null)for(let[s,o]of Object.entries(e.resolutions)){if(typeof o!="string"){i.push(new Error(`Invalid resolution entry for '${s}'`));continue}try{this.resolutions.push({pattern:hI(s),reference:o})}catch(a){i.push(a);continue}}if(Array.isArray(e.files)){this.files=new Set;for(let s of e.files){if(typeof s!="string"){i.push(new Error(`Invalid files entry for '${s}'`));continue}this.files.add(s)}}else this.files=null;if(typeof e.publishConfig=="object"&&e.publishConfig!==null){if(this.publishConfig={},typeof e.publishConfig.access=="string"&&(this.publishConfig.access=e.publishConfig.access),typeof e.publishConfig.main=="string"&&(this.publishConfig.main=sn(e.publishConfig.main)),typeof e.publishConfig.module=="string"&&(this.publishConfig.module=sn(e.publishConfig.module)),e.publishConfig.browser!=null)if(typeof e.publishConfig.browser=="string")this.publishConfig.browser=sn(e.publishConfig.browser);else{this.publishConfig.browser=new Map;for(let[s,o]of Object.entries(e.publishConfig.browser))this.publishConfig.browser.set(sn(s),typeof o=="string"?sn(o):o)}if(typeof e.publishConfig.registry=="string"&&(this.publishConfig.registry=e.publishConfig.registry),typeof e.publishConfig.bin=="string")this.name!==null?this.publishConfig.bin=new Map([[this.name.name,sn(e.publishConfig.bin)]]):i.push(new Error("String bin field, but no attached package name"));else if(typeof e.publishConfig.bin=="object"&&e.publishConfig.bin!==null){this.publishConfig.bin=new Map;for(let[s,o]of Object.entries(e.publishConfig.bin)){if(typeof o!="string"){i.push(new Error(`Invalid bin definition for '${s}'`));continue}this.publishConfig.bin.set(s,sn(o))}}if(Array.isArray(e.publishConfig.executableFiles)){this.publishConfig.executableFiles=new Set;for(let s of e.publishConfig.executableFiles){if(typeof s!="string"){i.push(new Error("Invalid executable file definition"));continue}this.publishConfig.executableFiles.add(sn(s))}}}else this.publishConfig=null;if(typeof e.installConfig=="object"&&e.installConfig!==null){this.installConfig={};for(let s of Object.keys(e.installConfig))s==="hoistingLimits"?typeof e.installConfig.hoistingLimits=="string"?this.installConfig.hoistingLimits=e.installConfig.hoistingLimits:i.push(new Error("Invalid hoisting limits definition")):s=="selfReferences"?typeof e.installConfig.selfReferences=="boolean"?this.installConfig.selfReferences=e.installConfig.selfReferences:i.push(new Error("Invalid selfReferences definition, must be a boolean value")):i.push(new Error(`Unrecognized installConfig key: ${s}`))}else this.installConfig=null;if(typeof e.optionalDependencies=="object"&&e.optionalDependencies!==null)for(let[s,o]of Object.entries(e.optionalDependencies)){if(typeof o!="string"){i.push(new Error(`Invalid dependency range for '${s}'`));continue}let a;try{a=tn(s)}catch{i.push(new Error(`Parsing failed for the dependency name '${s}'`));continue}let l=_t(a,o);this.dependencies.set(l.identHash,l);let c=_t(a,"unknown"),u=this.ensureDependencyMeta(c);Object.assign(u,{optional:!0})}typeof e.preferUnplugged=="boolean"?this.preferUnplugged=e.preferUnplugged:this.preferUnplugged=null,this.errors=i}getForScope(e){switch(e){case"dependencies":return this.dependencies;case"devDependencies":return this.devDependencies;case"peerDependencies":return this.peerDependencies;default:throw new Error(`Unsupported value ("${e}")`)}}hasConsumerDependency(e){return!!(this.dependencies.has(e.identHash)||this.peerDependencies.has(e.identHash))}hasHardDependency(e){return!!(this.dependencies.has(e.identHash)||this.devDependencies.has(e.identHash))}hasSoftDependency(e){return!!this.peerDependencies.has(e.identHash)}hasDependency(e){return!!(this.hasHardDependency(e)||this.hasSoftDependency(e))}getConditions(){let e=[];return this.os&&this.os.length>0&&e.push(JD("os",this.os)),this.cpu&&this.cpu.length>0&&e.push(JD("cpu",this.cpu)),this.libc&&this.libc.length>0&&e.push(JD("libc",this.libc)),e.length>0?e.join(" & "):null}isCompatibleWithOS(e){return zA.isManifestFieldCompatible(this.os,e)}isCompatibleWithCPU(e){return zA.isManifestFieldCompatible(this.cpu,e)}ensureDependencyMeta(e){if(e.range!=="unknown"&&!T8.default.valid(e.range))throw new Error(`Invalid meta field range for '${Sn(e)}'`);let t=Ot(e),i=e.range!=="unknown"?e.range:null,n=this.dependenciesMeta.get(t);n||this.dependenciesMeta.set(t,n=new Map);let s=n.get(i);return s||n.set(i,s={}),s}ensurePeerDependencyMeta(e){if(e.range!=="unknown")throw new Error(`Invalid meta field range for '${Sn(e)}'`);let t=Ot(e),i=this.peerDependenciesMeta.get(t);return i||this.peerDependenciesMeta.set(t,i={}),i}setRawField(e,t,{after:i=[]}={}){let n=new Set(i.filter(s=>Object.prototype.hasOwnProperty.call(this.raw,s)));if(n.size===0||Object.prototype.hasOwnProperty.call(this.raw,e))this.raw[e]=t;else{let s=this.raw,o=this.raw={},a=!1;for(let l of Object.keys(s))o[l]=s[l],a||(n.delete(l),n.size===0&&(o[e]=t,a=!0))}}exportTo(e,{compatibilityMode:t=!0}={}){var s;if(Object.assign(e,this.raw),this.name!==null?e.name=Ot(this.name):delete e.name,this.version!==null?e.version=this.version:delete e.version,this.os!==null?e.os=this.os:delete e.os,this.cpu!==null?e.cpu=this.cpu:delete e.cpu,this.type!==null?e.type=this.type:delete e.type,this.packageManager!==null?e.packageManager=this.packageManager:delete e.packageManager,this.private?e.private=!0:delete e.private,this.license!==null?e.license=this.license:delete e.license,this.languageName!==null?e.languageName=this.languageName:delete e.languageName,this.main!==null?e.main=this.main:delete e.main,this.module!==null?e.module=this.module:delete e.module,this.browser!==null){let o=this.browser;typeof o=="string"?e.browser=o:o instanceof Map&&(e.browser=Object.assign({},...Array.from(o.keys()).sort().map(a=>({[a]:o.get(a)}))))}else delete e.browser;this.bin.size===1&&this.name!==null&&this.bin.has(this.name.name)?e.bin=this.bin.get(this.name.name):this.bin.size>0?e.bin=Object.assign({},...Array.from(this.bin.keys()).sort().map(o=>({[o]:this.bin.get(o)}))):delete e.bin,this.workspaceDefinitions.length>0?this.raw.workspaces&&!Array.isArray(this.raw.workspaces)?e.workspaces={...this.raw.workspaces,packages:this.workspaceDefinitions.map(({pattern:o})=>o)}:e.workspaces=this.workspaceDefinitions.map(({pattern:o})=>o):this.raw.workspaces&&!Array.isArray(this.raw.workspaces)&&Object.keys(this.raw.workspaces).length>0?e.workspaces=this.raw.workspaces:delete e.workspaces;let i=[],n=[];for(let o of this.dependencies.values()){let a=this.dependenciesMeta.get(Ot(o)),l=!1;if(t&&a){let c=a.get(null);c&&c.optional&&(l=!0)}l?n.push(o):i.push(o)}i.length>0?e.dependencies=Object.assign({},...Pf(i).map(o=>({[Ot(o)]:o.range}))):delete e.dependencies,n.length>0?e.optionalDependencies=Object.assign({},...Pf(n).map(o=>({[Ot(o)]:o.range}))):delete e.optionalDependencies,this.devDependencies.size>0?e.devDependencies=Object.assign({},...Pf(this.devDependencies.values()).map(o=>({[Ot(o)]:o.range}))):delete e.devDependencies,this.peerDependencies.size>0?e.peerDependencies=Object.assign({},...Pf(this.peerDependencies.values()).map(o=>({[Ot(o)]:o.range}))):delete e.peerDependencies,e.dependenciesMeta={};for(let[o,a]of bn(this.dependenciesMeta.entries(),([l,c])=>l))for(let[l,c]of bn(a.entries(),([u,g])=>u!==null?`0${u}`:"1")){let u=l!==null?Sn(_t(tn(o),l)):o,g={...c};t&&l===null&&delete g.optional,Object.keys(g).length!==0&&(e.dependenciesMeta[u]=g)}if(Object.keys(e.dependenciesMeta).length===0&&delete e.dependenciesMeta,this.peerDependenciesMeta.size>0?e.peerDependenciesMeta=Object.assign({},...bn(this.peerDependenciesMeta.entries(),([o,a])=>o).map(([o,a])=>({[o]:a}))):delete e.peerDependenciesMeta,this.resolutions.length>0?e.resolutions=Object.assign({},...this.resolutions.map(({pattern:o,reference:a})=>({[pI(o)]:a}))):delete e.resolutions,this.files!==null?e.files=Array.from(this.files):delete e.files,this.preferUnplugged!==null?e.preferUnplugged=this.preferUnplugged:delete e.preferUnplugged,this.scripts!==null&&this.scripts.size>0){(s=e.scripts)!=null||(e.scripts={});for(let o of Object.keys(e.scripts))this.scripts.has(o)||delete e.scripts[o];for(let[o,a]of this.scripts.entries())e.scripts[o]=a}else delete e.scripts;return e}},ot=zA;ot.fileName="package.json",ot.allDependencies=["dependencies","devDependencies","peerDependencies"],ot.hardDependencies=["dependencies","devDependencies"];function R8(r){let e=r.match(/^[ \t]+/m);return e?e[0]:"  "}function F8(r){return r.charCodeAt(0)===65279?r.slice(1):r}function sn(r){return r.replace(/\\/g,"/")}function Fw(r,{yamlCompatibilityMode:e}){return e?zx(r):typeof r>"u"||typeof r=="boolean"?r:null}function N8(r,e){let t=e.search(/[^!]/);if(t===-1)return"invalid";let i=t%2===0?"":"!",n=e.slice(t);return`${i}${r}=${n}`}function JD(r,e){return e.length===1?N8(r,e[0]):`(${e.map(t=>N8(r,t)).join(" | ")})`}var gz=Pe(uz()),fz=J("stream"),hz=J("string_decoder");var Nve=15,at=class extends Error{constructor(t,i,n){super(i);this.reportExtra=n;this.reportCode=t}};function Tve(r){return typeof r.reportCode<"u"}var vi=class{constructor(){this.reportedInfos=new Set;this.reportedWarnings=new Set;this.reportedErrors=new Set}static progressViaCounter(e){let t=0,i,n=new Promise(l=>{i=l}),s=l=>{let c=i;n=new Promise(u=>{i=u}),t=l,c()},o=(l=0)=>{s(t+1)},a=async function*(){for(;t<e;)await n,yield{progress:t/e}}();return{[Symbol.asyncIterator](){return a},hasProgress:!0,hasTitle:!1,set:s,tick:o}}static progressViaTitle(){let e,t,i=new Promise(o=>{t=o}),n=(0,gz.default)(o=>{let a=t;i=new Promise(l=>{t=l}),e=o,a()},1e3/Nve),s=async function*(){for(;;)await i,yield{title:e}}();return{[Symbol.asyncIterator](){return s},hasProgress:!1,hasTitle:!0,setTitle:n}}async startProgressPromise(e,t){let i=this.reportProgress(e);try{return await t(e)}finally{i.stop()}}startProgressSync(e,t){let i=this.reportProgress(e);try{return t(e)}finally{i.stop()}}reportInfoOnce(e,t,i){var s;let n=i&&i.key?i.key:t;this.reportedInfos.has(n)||(this.reportedInfos.add(n),this.reportInfo(e,t),(s=i==null?void 0:i.reportExtra)==null||s.call(i,this))}reportWarningOnce(e,t,i){var s;let n=i&&i.key?i.key:t;this.reportedWarnings.has(n)||(this.reportedWarnings.add(n),this.reportWarning(e,t),(s=i==null?void 0:i.reportExtra)==null||s.call(i,this))}reportErrorOnce(e,t,i){var s;let n=i&&i.key?i.key:t;this.reportedErrors.has(n)||(this.reportedErrors.add(n),this.reportError(e,t),(s=i==null?void 0:i.reportExtra)==null||s.call(i,this))}reportExceptionOnce(e){Tve(e)?this.reportErrorOnce(e.reportCode,e.message,{key:e,reportExtra:e.reportExtra}):this.reportErrorOnce(1,e.stack||e.message,{key:e})}createStreamReporter(e=null){let t=new fz.PassThrough,i=new hz.StringDecoder,n="";return t.on("data",s=>{let o=i.write(s),a;do if(a=o.indexOf(`
-`),a!==-1){let l=n+o.substring(0,a);o=o.substring(a+1),n="",e!==null?this.reportInfo(null,`${e} ${l}`):this.reportInfo(null,l)}while(a!==-1);n+=o}),t.on("end",()=>{let s=i.end();s!==""&&(e!==null?this.reportInfo(null,`${e} ${s}`):this.reportInfo(null,s))}),t}};var Df=class{constructor(e){this.fetchers=e}supports(e,t){return!!this.tryFetcher(e,t)}getLocalPath(e,t){return this.getFetcher(e,t).getLocalPath(e,t)}async fetch(e,t){return await this.getFetcher(e,t).fetch(e,t)}tryFetcher(e,t){let i=this.fetchers.find(n=>n.supports(e,t));return i||null}getFetcher(e,t){let i=this.fetchers.find(n=>n.supports(e,t));if(!i)throw new at(11,`${mt(t.project.configuration,e)} isn't supported by any available fetcher`);return i}};var kf=class{constructor(e){this.resolvers=e.filter(t=>t)}supportsDescriptor(e,t){return!!this.tryResolverByDescriptor(e,t)}supportsLocator(e,t){return!!this.tryResolverByLocator(e,t)}shouldPersistResolution(e,t){return this.getResolverByLocator(e,t).shouldPersistResolution(e,t)}bindDescriptor(e,t,i){return this.getResolverByDescriptor(e,i).bindDescriptor(e,t,i)}getResolutionDependencies(e,t){return this.getResolverByDescriptor(e,t).getResolutionDependencies(e,t)}async getCandidates(e,t,i){return await this.getResolverByDescriptor(e,i).getCandidates(e,t,i)}async getSatisfying(e,t,i){return this.getResolverByDescriptor(e,i).getSatisfying(e,t,i)}async resolve(e,t){return await this.getResolverByLocator(e,t).resolve(e,t)}tryResolverByDescriptor(e,t){let i=this.resolvers.find(n=>n.supportsDescriptor(e,t));return i||null}getResolverByDescriptor(e,t){let i=this.resolvers.find(n=>n.supportsDescriptor(e,t));if(!i)throw new Error(`${tr(t.project.configuration,e)} isn't supported by any available resolver`);return i}tryResolverByLocator(e,t){let i=this.resolvers.find(n=>n.supportsLocator(e,t));return i||null}getResolverByLocator(e,t){let i=this.resolvers.find(n=>n.supportsLocator(e,t));if(!i)throw new Error(`${mt(t.project.configuration,e)} isn't supported by any available resolver`);return i}};var pz=Pe(Xr());var Rf=/^(?!v)[a-z0-9._-]+$/i,Nw=class{supportsDescriptor(e,t){return!!(so(e.range)||Rf.test(e.range))}supportsLocator(e,t){return!!(pz.default.valid(e.reference)||Rf.test(e.reference))}shouldPersistResolution(e,t){return t.resolver.shouldPersistResolution(this.forwardLocator(e,t),t)}bindDescriptor(e,t,i){return i.resolver.bindDescriptor(this.forwardDescriptor(e,i),t,i)}getResolutionDependencies(e,t){return t.resolver.getResolutionDependencies(this.forwardDescriptor(e,t),t)}async getCandidates(e,t,i){return await i.resolver.getCandidates(this.forwardDescriptor(e,i),t,i)}async getSatisfying(e,t,i){return await i.resolver.getSatisfying(this.forwardDescriptor(e,i),t,i)}async resolve(e,t){let i=await t.resolver.resolve(this.forwardLocator(e,t),t);return tC(i,e)}forwardDescriptor(e,t){return _t(e,`${t.project.configuration.get("defaultProtocol")}${e.range}`)}forwardLocator(e,t){return nn(e,`${t.project.configuration.get("defaultProtocol")}${e.reference}`)}};var Ff=class{supports(e){return!!e.reference.startsWith("virtual:")}getLocalPath(e,t){let i=e.reference.indexOf("#");if(i===-1)throw new Error("Invalid virtual package reference");let n=e.reference.slice(i+1),s=nn(e,n);return t.fetcher.getLocalPath(s,t)}async fetch(e,t){let i=e.reference.indexOf("#");if(i===-1)throw new Error("Invalid virtual package reference");let n=e.reference.slice(i+1),s=nn(e,n),o=await t.fetcher.fetch(s,t);return await this.ensureVirtualLink(e,o,t)}getLocatorFilename(e){return xf(e)}async ensureVirtualLink(e,t,i){let n=t.packageFs.getRealPath(),s=i.project.configuration.get("virtualFolder"),o=this.getLocatorFilename(e),a=Br.makeVirtualPath(s,o,n),l=new So(a,{baseFs:t.packageFs,pathUtils:x});return{...t,packageFs:l}}};var Nf=class{static isVirtualDescriptor(e){return!!e.range.startsWith(Nf.protocol)}static isVirtualLocator(e){return!!e.reference.startsWith(Nf.protocol)}supportsDescriptor(e,t){return Nf.isVirtualDescriptor(e)}supportsLocator(e,t){return Nf.isVirtualLocator(e)}shouldPersistResolution(e,t){return!1}bindDescriptor(e,t,i){throw new Error('Assertion failed: calling "bindDescriptor" on a virtual descriptor is unsupported')}getResolutionDependencies(e,t){throw new Error('Assertion failed: calling "getResolutionDependencies" on a virtual descriptor is unsupported')}async getCandidates(e,t,i){throw new Error('Assertion failed: calling "getCandidates" on a virtual descriptor is unsupported')}async getSatisfying(e,t,i){throw new Error('Assertion failed: calling "getSatisfying" on a virtual descriptor is unsupported')}async resolve(e,t){throw new Error('Assertion failed: calling "resolve" on a virtual locator is unsupported')}},fC=Nf;fC.protocol="virtual:";var Tf=class{supports(e){return!!e.reference.startsWith(Yr.protocol)}getLocalPath(e,t){return this.getWorkspace(e,t).cwd}async fetch(e,t){let i=this.getWorkspace(e,t).cwd;return{packageFs:new qt(i),prefixPath:Oe.dot,localPath:i}}getWorkspace(e,t){return t.project.getWorkspaceByCwd(e.reference.slice(Yr.protocol.length))}};var Tw={};ut(Tw,{getDefaultGlobalFolder:()=>XD,getHomeFolder:()=>hC,isFolderInside:()=>ZD});var VD=J("os");function XD(){if(process.platform==="win32"){let r=K.toPortablePath(process.env.LOCALAPPDATA||K.join((0,VD.homedir)(),"AppData","Local"));return x.resolve(r,"Yarn/Berry")}if(process.env.XDG_DATA_HOME){let r=K.toPortablePath(process.env.XDG_DATA_HOME);return x.resolve(r,"yarn/berry")}return x.resolve(hC(),".yarn/berry")}function hC(){return K.toPortablePath((0,VD.homedir)()||"/usr/local/share")}function ZD(r,e){let t=x.relative(e,r);return t&&!t.startsWith("..")&&!x.isAbsolute(t)}var ws={};ut(ws,{availableParallelism:()=>ek,builtinModules:()=>_D,getArchitecture:()=>pC,getArchitectureName:()=>Mve,getArchitectureSet:()=>$D,openUrl:()=>Lve});var Cz=Pe(J("module")),Mw=Pe(J("os"));var dz=new Map([["darwin","open"],["linux","xdg-open"],["win32","explorer.exe"]]).get(process.platform),Lve=typeof dz<"u"?async r=>{try{return await tk(dz,[r],{cwd:x.cwd()}),!0}catch{return!1}}:void 0;function _D(){return new Set(Cz.default.builtinModules||Object.keys(process.binding("natives")))}function Ove(){var i,n,s,o;if(process.platform==="win32")return null;let e=(s=((n=(i=process.report)==null?void 0:i.getReport())!=null?n:{}).sharedObjects)!=null?s:[],t=/\/(?:(ld-linux-|[^/]+-linux-gnu\/)|(libc.musl-|ld-musl-))/;return(o=Jd(e,a=>{let l=a.match(t);if(!l)return Jd.skip;if(l[1])return"glibc";if(l[2])return"musl";throw new Error("Assertion failed: Expected the libc variant to have been detected")}))!=null?o:null}var Lw,Ow;function pC(){return Lw=Lw!=null?Lw:{os:process.platform,cpu:process.arch,libc:Ove()}}function Mve(r=pC()){return r.libc?`${r.os}-${r.cpu}-${r.libc}`:`${r.os}-${r.cpu}`}function $D(){let r=pC();return Ow=Ow!=null?Ow:{os:[r.os],cpu:[r.cpu],libc:r.libc?[r.libc]:[]}}function ek(){return"availableParallelism"in Mw.default?Mw.default.availableParallelism():Math.max(1,Mw.default.cpus().length)}var Kve=new Set(["isTestEnv","injectNpmUser","injectNpmPassword","injectNpm2FaToken","binFolder","version","flags","profile","gpg","ignoreNode","wrapOutput","home","confDir","registry"]),Gw="yarn_",sk=".yarnrc.yml",ok="yarn.lock",Uve="********",ak=(u=>(u.ANY="ANY",u.BOOLEAN="BOOLEAN",u.ABSOLUTE_PATH="ABSOLUTE_PATH",u.LOCATOR="LOCATOR",u.LOCATOR_LOOSE="LOCATOR_LOOSE",u.NUMBER="NUMBER",u.STRING="STRING",u.SECRET="SECRET",u.SHAPE="SHAPE",u.MAP="MAP",u))(ak||{}),xi=Ue,rk={lastUpdateCheck:{description:"Last timestamp we checked whether new Yarn versions were available",type:"STRING",default:null},yarnPath:{description:"Path to the local executable that must be used over the global one",type:"ABSOLUTE_PATH",default:null},ignorePath:{description:"If true, the local executable will be ignored when using the global one",type:"BOOLEAN",default:!1},ignoreCwd:{description:"If true, the `--cwd` flag will be ignored",type:"BOOLEAN",default:!1},cacheKeyOverride:{description:"A global cache key override; used only for test purposes",type:"STRING",default:null},globalFolder:{description:"Folder where all system-global files are stored",type:"ABSOLUTE_PATH",default:XD()},cacheFolder:{description:"Folder where the cache files must be written",type:"ABSOLUTE_PATH",default:"./.yarn/cache"},compressionLevel:{description:"Zip files compression level, from 0 to 9 or mixed (a variant of 9, which stores some files uncompressed, when compression doesn't yield good results)",type:"NUMBER",values:["mixed",0,1,2,3,4,5,6,7,8,9],default:Xl},virtualFolder:{description:"Folder where the virtual packages (cf doc) will be mapped on the disk (must be named __virtual__)",type:"ABSOLUTE_PATH",default:"./.yarn/__virtual__"},lockfileFilename:{description:"Name of the files where the Yarn dependency tree entries must be stored",type:"STRING",default:ok},installStatePath:{description:"Path of the file where the install state will be persisted",type:"ABSOLUTE_PATH",default:"./.yarn/install-state.gz"},immutablePatterns:{description:"Array of glob patterns; files matching them won't be allowed to change during immutable installs",type:"STRING",default:[],isArray:!0},rcFilename:{description:"Name of the files where the configuration can be found",type:"STRING",default:Hw()},enableGlobalCache:{description:"If true, the system-wide cache folder will be used regardless of `cache-folder`",type:"BOOLEAN",default:!1},enableColors:{description:"If true, the CLI is allowed to use colors in its output",type:"BOOLEAN",default:zy,defaultText:"<dynamic>"},enableHyperlinks:{description:"If true, the CLI is allowed to use hyperlinks in its output",type:"BOOLEAN",default:eP,defaultText:"<dynamic>"},enableInlineBuilds:{description:"If true, the CLI will print the build output on the command line",type:"BOOLEAN",default:Kw.isCI,defaultText:"<dynamic>"},enableMessageNames:{description:"If true, the CLI will prefix most messages with codes suitable for search engines",type:"BOOLEAN",default:!0},enableProgressBars:{description:"If true, the CLI is allowed to show a progress bar for long-running events",type:"BOOLEAN",default:!Kw.isCI,defaultText:"<dynamic>"},enableTimers:{description:"If true, the CLI is allowed to print the time spent executing commands",type:"BOOLEAN",default:!0},preferAggregateCacheInfo:{description:"If true, the CLI will only print a one-line report of any cache changes",type:"BOOLEAN",default:Kw.isCI},preferInteractive:{description:"If true, the CLI will automatically use the interactive mode when called from a TTY",type:"BOOLEAN",default:!1},preferTruncatedLines:{description:"If true, the CLI will truncate lines that would go beyond the size of the terminal",type:"BOOLEAN",default:!1},progressBarStyle:{description:"Which style of progress bar should be used (only when progress bars are enabled)",type:"STRING",default:void 0,defaultText:"<dynamic>"},defaultLanguageName:{description:"Default language mode that should be used when a package doesn't offer any insight",type:"STRING",default:"node"},defaultProtocol:{description:"Default resolution protocol used when resolving pure semver and tag ranges",type:"STRING",default:"npm:"},enableTransparentWorkspaces:{description:"If false, Yarn won't automatically resolve workspace dependencies unless they use the `workspace:` protocol",type:"BOOLEAN",default:!0},supportedArchitectures:{description:"Architectures that Yarn will fetch and inject into the resolver",type:"SHAPE",properties:{os:{description:"Array of supported process.platform strings, or null to target them all",type:"STRING",isArray:!0,isNullable:!0,default:["current"]},cpu:{description:"Array of supported process.arch strings, or null to target them all",type:"STRING",isArray:!0,isNullable:!0,default:["current"]},libc:{description:"Array of supported libc libraries, or null to target them all",type:"STRING",isArray:!0,isNullable:!0,default:["current"]}}},enableMirror:{description:"If true, the downloaded packages will be retrieved and stored in both the local and global folders",type:"BOOLEAN",default:!0},enableNetwork:{description:"If false, the package manager will refuse to use the network if required to",type:"BOOLEAN",default:!0},httpProxy:{description:"URL of the http proxy that must be used for outgoing http requests",type:"STRING",default:null},httpsProxy:{description:"URL of the http proxy that must be used for outgoing https requests",type:"STRING",default:null},unsafeHttpWhitelist:{description:"List of the hostnames for which http queries are allowed (glob patterns are supported)",type:"STRING",default:[],isArray:!0},httpTimeout:{description:"Timeout of each http request in milliseconds",type:"NUMBER",default:6e4},httpRetry:{description:"Retry times on http failure",type:"NUMBER",default:3},networkConcurrency:{description:"Maximal number of concurrent requests",type:"NUMBER",default:50},networkSettings:{description:"Network settings per hostname (glob patterns are supported)",type:"MAP",valueDefinition:{description:"",type:"SHAPE",properties:{caFilePath:{description:"Path to file containing one or multiple Certificate Authority signing certificates",type:"ABSOLUTE_PATH",default:null},enableNetwork:{description:"If false, the package manager will refuse to use the network if required to",type:"BOOLEAN",default:null},httpProxy:{description:"URL of the http proxy that must be used for outgoing http requests",type:"STRING",default:null},httpsProxy:{description:"URL of the http proxy that must be used for outgoing https requests",type:"STRING",default:null},httpsKeyFilePath:{description:"Path to file containing private key in PEM format",type:"ABSOLUTE_PATH",default:null},httpsCertFilePath:{description:"Path to file containing certificate chain in PEM format",type:"ABSOLUTE_PATH",default:null}}}},caFilePath:{description:"A path to a file containing one or multiple Certificate Authority signing certificates",type:"ABSOLUTE_PATH",default:null},httpsKeyFilePath:{description:"Path to file containing private key in PEM format",type:"ABSOLUTE_PATH",default:null},httpsCertFilePath:{description:"Path to file containing certificate chain in PEM format",type:"ABSOLUTE_PATH",default:null},enableStrictSsl:{description:"If false, SSL certificate errors will be ignored",type:"BOOLEAN",default:!0},logFilters:{description:"Overrides for log levels",type:"SHAPE",isArray:!0,concatenateValues:!0,properties:{code:{description:"Code of the messages covered by this override",type:"STRING",default:void 0},text:{description:"Code of the texts covered by this override",type:"STRING",default:void 0},pattern:{description:"Code of the patterns covered by this override",type:"STRING",default:void 0},level:{description:"Log level override, set to null to remove override",type:"STRING",values:Object.values(Xy),isNullable:!0,default:void 0}}},enableTelemetry:{description:"If true, telemetry will be periodically sent, following the rules in https://yarnpkg.com/advanced/telemetry",type:"BOOLEAN",default:!0},telemetryInterval:{description:"Minimal amount of time between two telemetry uploads, in days",type:"NUMBER",default:7},telemetryUserId:{description:"If you desire to tell us which project you are, you can set this field. Completely optional and opt-in.",type:"STRING",default:null},enableScripts:{description:"If true, packages are allowed to have install scripts by default",type:"BOOLEAN",default:!0},enableStrictSettings:{description:"If true, unknown settings will cause Yarn to abort",type:"BOOLEAN",default:!0},enableImmutableCache:{description:"If true, the cache is reputed immutable and actions that would modify it will throw",type:"BOOLEAN",default:!1},checksumBehavior:{description:"Enumeration defining what to do when a checksum doesn't match expectations",type:"STRING",default:"throw"},packageExtensions:{description:"Map of package corrections to apply on the dependency tree",type:"MAP",valueDefinition:{description:"The extension that will be applied to any package whose version matches the specified range",type:"SHAPE",properties:{dependencies:{description:"The set of dependencies that must be made available to the current package in order for it to work properly",type:"MAP",valueDefinition:{description:"A range",type:"STRING"}},peerDependencies:{description:"Inherited dependencies - the consumer of the package will be tasked to provide them",type:"MAP",valueDefinition:{description:"A semver range",type:"STRING"}},peerDependenciesMeta:{description:"Extra information related to the dependencies listed in the peerDependencies field",type:"MAP",valueDefinition:{description:"The peerDependency meta",type:"SHAPE",properties:{optional:{description:"If true, the selected peer dependency will be marked as optional by the package manager and the consumer omitting it won't be reported as an error",type:"BOOLEAN",default:!1}}}}}}}};function Ak(r,e,t,i,n){if(i.isArray||i.type==="ANY"&&Array.isArray(t))return Array.isArray(t)?t.map((s,o)=>ik(r,`${e}[${o}]`,s,i,n)):String(t).split(/,/).map(s=>ik(r,e,s,i,n));if(Array.isArray(t))throw new Error(`Non-array configuration settings "${e}" cannot be an array`);return ik(r,e,t,i,n)}function ik(r,e,t,i,n){var a;switch(i.type){case"ANY":return t;case"SHAPE":return Hve(r,e,t,i,n);case"MAP":return Gve(r,e,t,i,n)}if(t===null&&!i.isNullable&&i.default!==null)throw new Error(`Non-nullable configuration settings "${e}" cannot be set to null`);if((a=i.values)!=null&&a.includes(t))return t;let o=(()=>{if(i.type==="BOOLEAN"&&typeof t!="string")return Wd(t);if(typeof t!="string")throw new Error(`Expected configuration setting "${e}" to be a string, got ${typeof t}`);let l=Wx(t,{env:process.env});switch(i.type){case"ABSOLUTE_PATH":return x.resolve(n,K.toPortablePath(l));case"LOCATOR_LOOSE":return Dc(l,!1);case"NUMBER":return parseInt(l);case"LOCATOR":return Dc(l);case"BOOLEAN":return Wd(l);default:return l}})();if(i.values&&!i.values.includes(o))throw new Error(`Invalid value, expected one of ${i.values.join(", ")}`);return o}function Hve(r,e,t,i,n){if(typeof t!="object"||Array.isArray(t))throw new Qe(`Object configuration settings "${e}" must be an object`);let s=lk(r,i,{ignoreArrays:!0});if(t===null)return s;for(let[o,a]of Object.entries(t)){let l=`${e}.${o}`;if(!i.properties[o])throw new Qe(`Unrecognized configuration settings found: ${e}.${o} - run "yarn config -v" to see the list of settings supported in Yarn`);s.set(o,Ak(r,l,a,i.properties[o],n))}return s}function Gve(r,e,t,i,n){let s=new Map;if(typeof t!="object"||Array.isArray(t))throw new Qe(`Map configuration settings "${e}" must be an object`);if(t===null)return s;for(let[o,a]of Object.entries(t)){let l=i.normalizeKeys?i.normalizeKeys(o):o,c=`${e}['${l}']`,u=i.valueDefinition;s.set(l,Ak(r,c,a,u,n))}return s}function lk(r,e,{ignoreArrays:t=!1}={}){switch(e.type){case"SHAPE":{if(e.isArray&&!t)return[];let i=new Map;for(let[n,s]of Object.entries(e.properties))i.set(n,lk(r,s));return i}break;case"MAP":return e.isArray&&!t?[]:new Map;case"ABSOLUTE_PATH":return e.default===null?null:r.projectCwd===null?x.isAbsolute(e.default)?x.normalize(e.default):e.isNullable?null:void 0:Array.isArray(e.default)?e.default.map(i=>x.resolve(r.projectCwd,i)):x.resolve(r.projectCwd,e.default);default:return e.default}}function Uw(r,e,t){if(e.type==="SECRET"&&typeof r=="string"&&t.hideSecrets)return Uve;if(e.type==="ABSOLUTE_PATH"&&typeof r=="string"&&t.getNativePaths)return K.fromPortablePath(r);if(e.isArray&&Array.isArray(r)){let i=[];for(let n of r)i.push(Uw(n,e,t));return i}if(e.type==="MAP"&&r instanceof Map){let i=new Map;for(let[n,s]of r.entries())i.set(n,Uw(s,e.valueDefinition,t));return i}if(e.type==="SHAPE"&&r instanceof Map){let i=new Map;for(let[n,s]of r.entries()){let o=e.properties[n];i.set(n,Uw(s,o,t))}return i}return r}function Yve(){let r={};for(let[e,t]of Object.entries(process.env))e=e.toLowerCase(),e.startsWith(Gw)&&(e=(0,mz.default)(e.slice(Gw.length)),r[e]=t);return r}function Hw(){let r=`${Gw}rc_filename`;for(let[e,t]of Object.entries(process.env))if(e.toLowerCase()===r&&typeof t=="string")return t;return sk}var ck=(i=>(i[i.LOCKFILE=0]="LOCKFILE",i[i.MANIFEST=1]="MANIFEST",i[i.NONE=2]="NONE",i))(ck||{}),Ha=class{constructor(e){this.projectCwd=null;this.plugins=new Map;this.settings=new Map;this.values=new Map;this.sources=new Map;this.invalid=new Map;this.packageExtensions=new Map;this.limits=new Map;this.startingCwd=e}static create(e,t,i){let n=new Ha(e);typeof t<"u"&&!(t instanceof Map)&&(n.projectCwd=t),n.importSettings(rk);let s=typeof i<"u"?i:t instanceof Map?t:new Map;for(let[o,a]of s)n.activatePlugin(o,a);return n}static async find(e,t,{lookup:i=0,strict:n=!0,usePath:s=!1,useRc:o=!0}={}){let a=Yve();delete a.rcFilename;let l=await Ha.findRcFiles(e),c=await Ha.findHomeRcFile();if(c){let B=l.find(v=>v.path===c.path);B?B.strict=!1:l.push({...c,strict:!1})}let u=({ignoreCwd:B,yarnPath:v,ignorePath:D,lockfileFilename:T})=>({ignoreCwd:B,yarnPath:v,ignorePath:D,lockfileFilename:T}),g=({ignoreCwd:B,yarnPath:v,ignorePath:D,lockfileFilename:T,...H})=>H,f=new Ha(e);f.importSettings(u(rk)),f.useWithSource("<environment>",u(a),e,{strict:!1});for(let{path:B,cwd:v,data:D}of l)f.useWithSource(B,u(D),v,{strict:!1});if(s){let B=f.get("yarnPath"),v=f.get("ignorePath");if(B!==null&&!v)return f}let h=f.get("lockfileFilename"),p;switch(i){case 0:p=await Ha.findProjectCwd(e,h);break;case 1:p=await Ha.findProjectCwd(e,null);break;case 2:M.existsSync(x.join(e,"package.json"))?p=x.resolve(e):p=null;break}f.startingCwd=e,f.projectCwd=p,f.importSettings(g(rk));let C=new Map([["@@core",x8]]),y=B=>"default"in B?B.default:B;if(t!==null){for(let T of t.plugins.keys())C.set(T,y(t.modules.get(T)));let B=new Map;for(let T of _D())B.set(T,()=>mf(T));for(let[T,H]of t.modules)B.set(T,()=>H);let v=new Set,D=async(T,H)=>{let{factory:j,name:$}=mf(T);if(v.has($))return;let V=new Map(B),W=A=>{if(V.has(A))return V.get(A)();throw new Qe(`This plugin cannot access the package referenced via ${A} which is neither a builtin, nor an exposed entry`)},_=await df(async()=>y(await j(W)),A=>`${A} (when initializing ${$}, defined in ${H})`);B.set($,()=>_),v.add($),C.set($,_)};if(a.plugins)for(let T of a.plugins.split(";")){let H=x.resolve(e,K.toPortablePath(T));await D(H,"<environment>")}for(let{path:T,cwd:H,data:j}of l)if(!!o&&!!Array.isArray(j.plugins))for(let $ of j.plugins){let V=typeof $!="string"?$.path:$,W=x.resolve(H,K.toPortablePath(V));await D(W,T)}}for(let[B,v]of C)f.activatePlugin(B,v);f.useWithSource("<environment>",g(a),e,{strict:n});for(let{path:B,cwd:v,data:D,strict:T}of l)f.useWithSource(B,g(D),v,{strict:T!=null?T:n});return f.get("enableGlobalCache")&&(f.values.set("cacheFolder",`${f.get("globalFolder")}/cache`),f.sources.set("cacheFolder","<internal>")),await f.refreshPackageExtensions(),f}static async findRcFiles(e){let t=Hw(),i=[],n=e,s=null;for(;n!==s;){s=n;let o=x.join(s,t);if(M.existsSync(o)){let a=await M.readFilePromise(o,"utf8"),l;try{l=yi(a)}catch{let u="";throw a.match(/^\s+(?!-)[^:]+\s+\S+/m)&&(u=" (in particular, make sure you list the colons after each key name)"),new Qe(`Parse error when loading ${o}; please check it's proper Yaml${u}`)}i.push({path:o,cwd:s,data:l})}n=x.dirname(s)}return i}static async findHomeRcFile(){let e=Hw(),t=hC(),i=x.join(t,e);if(M.existsSync(i)){let n=await M.readFilePromise(i,"utf8"),s=yi(n);return{path:i,cwd:t,data:s}}return null}static async findProjectCwd(e,t){let i=null,n=e,s=null;for(;n!==s;){if(s=n,M.existsSync(x.join(s,"package.json"))&&(i=s),t!==null){if(M.existsSync(x.join(s,t))){i=s;break}}else if(i!==null)break;n=x.dirname(s)}return i}static async updateConfiguration(e,t){let i=Hw(),n=x.join(e,i),s=M.existsSync(n)?yi(await M.readFilePromise(n,"utf8")):{},o=!1,a;if(typeof t=="function"){try{a=t(s)}catch{a=t({})}if(a===s)return}else{a=s;for(let l of Object.keys(t)){let c=s[l],u=t[l],g;if(typeof u=="function")try{g=u(c)}catch{g=u(void 0)}else g=u;c!==g&&(a[l]=g,o=!0)}if(!o)return}await M.changeFilePromise(n,ba(a),{automaticNewlines:!0})}static async updateHomeConfiguration(e){let t=hC();return await Ha.updateConfiguration(t,e)}activatePlugin(e,t){this.plugins.set(e,t),typeof t.configuration<"u"&&this.importSettings(t.configuration)}importSettings(e){for(let[t,i]of Object.entries(e))if(i!=null){if(this.settings.has(t))throw new Error(`Cannot redefine settings "${t}"`);this.settings.set(t,i),this.values.set(t,lk(this,i))}}useWithSource(e,t,i,n){try{this.use(e,t,i,n)}catch(s){throw s.message+=` (in ${$e(this,e,Ue.PATH)})`,s}}use(e,t,i,{strict:n=!0,overwrite:s=!1}={}){n=n&&this.get("enableStrictSettings");for(let o of["enableStrictSettings",...Object.keys(t)]){if(typeof t[o]>"u"||o==="plugins"||e==="<environment>"&&Kve.has(o))continue;if(o==="rcFilename")throw new Qe(`The rcFilename settings can only be set via ${`${Gw}RC_FILENAME`.toUpperCase()}, not via a rc file`);let l=this.settings.get(o);if(!l){if(n)throw new Qe(`Unrecognized or legacy configuration settings found: ${o} - run "yarn config -v" to see the list of settings supported in Yarn`);this.invalid.set(o,e);continue}if(this.sources.has(o)&&!(s||l.type==="MAP"||l.isArray&&l.concatenateValues))continue;let c;try{c=Ak(this,o,t[o],l,i)}catch(u){throw u.message+=` in ${$e(this,e,Ue.PATH)}`,u}if(o==="enableStrictSettings"&&e!=="<environment>"){n=c;continue}if(l.type==="MAP"){let u=this.values.get(o);this.values.set(o,new Map(s?[...u,...c]:[...c,...u])),this.sources.set(o,`${this.sources.get(o)}, ${e}`)}else if(l.isArray&&l.concatenateValues){let u=this.values.get(o);this.values.set(o,s?[...u,...c]:[...c,...u]),this.sources.set(o,`${this.sources.get(o)}, ${e}`)}else this.values.set(o,c),this.sources.set(o,e)}}get(e){if(!this.values.has(e))throw new Error(`Invalid configuration key "${e}"`);return this.values.get(e)}getSpecial(e,{hideSecrets:t=!1,getNativePaths:i=!1}){let n=this.get(e),s=this.settings.get(e);if(typeof s>"u")throw new Qe(`Couldn't find a configuration settings named "${e}"`);return Uw(n,s,{hideSecrets:t,getNativePaths:i})}getSubprocessStreams(e,{header:t,prefix:i,report:n}){let s,o,a=M.createWriteStream(e);if(this.get("enableInlineBuilds")){let l=n.createStreamReporter(`${i} ${$e(this,"STDOUT","green")}`),c=n.createStreamReporter(`${i} ${$e(this,"STDERR","red")}`);s=new nk.PassThrough,s.pipe(l),s.pipe(a),o=new nk.PassThrough,o.pipe(c),o.pipe(a)}else s=a,o=a,typeof t<"u"&&s.write(`${t}
-`);return{stdout:s,stderr:o}}makeResolver(){let e=[];for(let t of this.plugins.values())for(let i of t.resolvers||[])e.push(new i);return new kf([new fC,new Yr,new Nw,...e])}makeFetcher(){let e=[];for(let t of this.plugins.values())for(let i of t.fetchers||[])e.push(new i);return new Df([new Ff,new Tf,...e])}getLinkers(){let e=[];for(let t of this.plugins.values())for(let i of t.linkers||[])e.push(new i);return e}getSupportedArchitectures(){let e=pC(),t=this.get("supportedArchitectures"),i=t.get("os");i!==null&&(i=i.map(o=>o==="current"?e.os:o));let n=t.get("cpu");n!==null&&(n=n.map(o=>o==="current"?e.cpu:o));let s=t.get("libc");return s!==null&&(s=Ho(s,o=>{var a;return o==="current"?(a=e.libc)!=null?a:Ho.skip:o})),{os:i,cpu:n,libc:s}}async refreshPackageExtensions(){this.packageExtensions=new Map;let e=this.packageExtensions,t=(i,n,{userProvided:s=!1}={})=>{if(!so(i.range))throw new Error("Only semver ranges are allowed as keys for the packageExtensions setting");let o=new ot;o.load(n,{yamlCompatibilityMode:!0});let a=hf(e,i.identHash),l=[];a.push([i.range,l]);let c={status:"inactive",userProvided:s,parentDescriptor:i};for(let u of o.dependencies.values())l.push({...c,type:"Dependency",descriptor:u});for(let u of o.peerDependencies.values())l.push({...c,type:"PeerDependency",descriptor:u});for(let[u,g]of o.peerDependenciesMeta)for(let[f,h]of Object.entries(g))l.push({...c,type:"PeerDependencyMeta",selector:u,key:f,value:h})};await this.triggerHook(i=>i.registerPackageExtensions,this,t);for(let[i,n]of this.get("packageExtensions"))t(WA(i,!0),Jy(n),{userProvided:!0})}normalizePackage(e){let t=rC(e);if(this.packageExtensions==null)throw new Error("refreshPackageExtensions has to be called before normalizing packages");let i=this.packageExtensions.get(e.identHash);if(typeof i<"u"){let s=e.version;if(s!==null){for(let[o,a]of i)if(!!kc(s,o))for(let l of a)switch(l.status==="inactive"&&(l.status="redundant"),l.type){case"Dependency":typeof t.dependencies.get(l.descriptor.identHash)>"u"&&(l.status="active",t.dependencies.set(l.descriptor.identHash,l.descriptor));break;case"PeerDependency":typeof t.peerDependencies.get(l.descriptor.identHash)>"u"&&(l.status="active",t.peerDependencies.set(l.descriptor.identHash,l.descriptor));break;case"PeerDependencyMeta":{let c=t.peerDependenciesMeta.get(l.selector);(typeof c>"u"||!Object.prototype.hasOwnProperty.call(c,l.key)||c[l.key]!==l.value)&&(l.status="active",Ta(t.peerDependenciesMeta,l.selector,()=>({}))[l.key]=l.value)}break;default:qx(l);break}}}let n=s=>s.scope?`${s.scope}__${s.name}`:`${s.name}`;for(let s of t.peerDependenciesMeta.keys()){let o=tn(s);t.peerDependencies.has(o.identHash)||t.peerDependencies.set(o.identHash,_t(o,"*"))}for(let s of t.peerDependencies.values()){if(s.scope==="types")continue;let o=n(s),a=Jo("types",o),l=Ot(a);t.peerDependencies.has(a.identHash)||t.peerDependenciesMeta.has(l)||(t.peerDependencies.set(a.identHash,_t(a,"*")),t.peerDependenciesMeta.set(l,{optional:!0}))}return t.dependencies=new Map(bn(t.dependencies,([,s])=>Sn(s))),t.peerDependencies=new Map(bn(t.peerDependencies,([,s])=>Sn(s))),t}getLimit(e){return Ta(this.limits,e,()=>(0,Ez.default)(this.get(e)))}async triggerHook(e,...t){for(let i of this.plugins.values()){let n=i.hooks;if(!n)continue;let s=e(n);!s||await s(...t)}}async triggerMultipleHooks(e,t){for(let i of t)await this.triggerHook(e,...i)}async reduceHook(e,t,...i){let n=t;for(let s of this.plugins.values()){let o=s.hooks;if(!o)continue;let a=e(o);!a||(n=await a(n,...i))}return n}async firstHook(e,...t){for(let i of this.plugins.values()){let n=i.hooks;if(!n)continue;let s=e(n);if(!s)continue;let o=await s(...t);if(typeof o<"u")return o}return null}},ye=Ha;ye.telemetry=null;var hk=(i=>(i[i.Never=0]="Never",i[i.ErrorCode=1]="ErrorCode",i[i.Always=2]="Always",i))(hk||{}),dC=class extends at{constructor({fileName:t,code:i,signal:n}){let s=ye.create(x.cwd()),o=$e(s,t,Ue.PATH);super(1,`Child ${o} reported an error`,a=>{qve(i,n,{configuration:s,report:a})});this.code=pk(i,n)}},Yw=class extends dC{constructor({fileName:t,code:i,signal:n,stdout:s,stderr:o}){super({fileName:t,code:i,signal:n});this.stdout=s,this.stderr=o}};function Nc(r){return r!==null&&typeof r.fd=="number"}var Tc=new Set;function uk(){}function gk(){for(let r of Tc)r.kill()}async function oo(r,e,{cwd:t,env:i=process.env,strict:n=!1,stdin:s=null,stdout:o,stderr:a,end:l=2}){let c=["pipe","pipe","pipe"];s===null?c[0]="ignore":Nc(s)&&(c[0]=s),Nc(o)&&(c[1]=o),Nc(a)&&(c[2]=a);let u=(0,fk.default)(r,e,{cwd:K.fromPortablePath(t),env:{...i,PWD:K.fromPortablePath(t)},stdio:c});Tc.add(u),Tc.size===1&&(process.on("SIGINT",uk),process.on("SIGTERM",gk)),!Nc(s)&&s!==null&&s.pipe(u.stdin),Nc(o)||u.stdout.pipe(o,{end:!1}),Nc(a)||u.stderr.pipe(a,{end:!1});let g=()=>{for(let f of new Set([o,a]))Nc(f)||f.end()};return new Promise((f,h)=>{u.on("error",p=>{Tc.delete(u),Tc.size===0&&(process.off("SIGINT",uk),process.off("SIGTERM",gk)),(l===2||l===1)&&g(),h(p)}),u.on("close",(p,C)=>{Tc.delete(u),Tc.size===0&&(process.off("SIGINT",uk),process.off("SIGTERM",gk)),(l===2||l===1&&p>0)&&g(),p===0||!n?f({code:pk(p,C)}):h(new dC({fileName:r,code:p,signal:C}))})})}async function tk(r,e,{cwd:t,env:i=process.env,encoding:n="utf8",strict:s=!1}){let o=["ignore","pipe","pipe"],a=[],l=[],c=K.fromPortablePath(t);typeof i.PWD<"u"&&(i={...i,PWD:c});let u=(0,fk.default)(r,e,{cwd:c,env:i,stdio:o});return u.stdout.on("data",g=>{a.push(g)}),u.stderr.on("data",g=>{l.push(g)}),await new Promise((g,f)=>{u.on("error",h=>{let p=ye.create(t),C=$e(p,r,Ue.PATH);f(new at(1,`Process ${C} failed to spawn`,y=>{y.reportError(1,`  ${Go(p,{label:"Thrown Error",value:no(Ue.NO_HINT,h.message)})}`)}))}),u.on("close",(h,p)=>{let C=n==="buffer"?Buffer.concat(a):Buffer.concat(a).toString(n),y=n==="buffer"?Buffer.concat(l):Buffer.concat(l).toString(n);h===0||!s?g({code:pk(h,p),stdout:C,stderr:y}):f(new Yw({fileName:r,code:h,signal:p,stdout:C,stderr:y}))})})}var jve=new Map([["SIGINT",2],["SIGQUIT",3],["SIGKILL",9],["SIGTERM",15]]);function pk(r,e){let t=jve.get(e);return typeof t<"u"?128+t:r!=null?r:1}function qve(r,e,{configuration:t,report:i}){i.reportError(1,`  ${Go(t,r!==null?{label:"Exit Code",value:no(Ue.NUMBER,r)}:{label:"Exit Signal",value:no(Ue.CODE,e)})}`)}var Xt={};ut(Xt,{Method:()=>eV,RequestError:()=>tV.RequestError,del:()=>nke,get:()=>rke,getNetworkSettings:()=>$6,post:()=>kR,put:()=>ike,request:()=>vC});var X6=Pe(CB()),Z6=J("https"),_6=J("http"),DR=Pe(Bn()),PR=Pe(J6()),mB=J("url");var tV=Pe(CB()),W6=new Map,z6=new Map,$De=new _6.Agent({keepAlive:!0}),eke=new Z6.Agent({keepAlive:!0});function V6(r){let e=new mB.URL(r),t={host:e.hostname,headers:{}};return e.port&&(t.port=Number(e.port)),{proxy:t}}async function xR(r){return Ta(z6,r,()=>M.readFilePromise(r).then(e=>(z6.set(r,e),e)))}function tke({statusCode:r,statusMessage:e},t){let i=$e(t,r,Ue.NUMBER),n=`https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/${r}`;return If(t,`${i}${e?` (${e})`:""}`,n)}async function EB(r,{configuration:e,customErrorMessage:t}){var i,n;try{return await r}catch(s){if(s.name!=="HTTPError")throw s;let o=(n=t==null?void 0:t(s))!=null?n:(i=s.response.body)==null?void 0:i.error;o==null&&(s.message.startsWith("Response code")?o="The remote server failed to provide the requested resource":o=s.message),s instanceof X6.TimeoutError&&s.event==="socket"&&(o+=`(can be increased via ${$e(e,"httpTimeout",Ue.SETTING)})`);let a=new at(35,o,l=>{s.response&&l.reportError(35,`  ${Go(e,{label:"Response Code",value:no(Ue.NO_HINT,tke(s.response,e))})}`),s.request&&(l.reportError(35,`  ${Go(e,{label:"Request Method",value:no(Ue.NO_HINT,s.request.options.method)})}`),l.reportError(35,`  ${Go(e,{label:"Request URL",value:no(Ue.URL,s.request.requestUrl)})}`)),s.request.redirects.length>0&&l.reportError(35,`  ${Go(e,{label:"Request Redirects",value:no(Ue.NO_HINT,tP(e,s.request.redirects,Ue.URL))})}`),s.request.retryCount===s.request.options.retry.limit&&l.reportError(35,`  ${Go(e,{label:"Request Retry Count",value:no(Ue.NO_HINT,`${$e(e,s.request.retryCount,Ue.NUMBER)} (can be increased via ${$e(e,"httpRetry",Ue.SETTING)})`)})}`)});throw a.originalError=s,a}}function $6(r,e){let t=[...e.configuration.get("networkSettings")].sort(([o],[a])=>a.length-o.length),i={enableNetwork:void 0,caFilePath:void 0,httpProxy:void 0,httpsProxy:void 0,httpsKeyFilePath:void 0,httpsCertFilePath:void 0},n=Object.keys(i),s=typeof r=="string"?new mB.URL(r):r;for(let[o,a]of t)if(DR.default.isMatch(s.hostname,o))for(let l of n){let c=a.get(l);c!==null&&typeof i[l]>"u"&&(i[l]=c)}for(let o of n)typeof i[o]>"u"&&(i[o]=e.configuration.get(o));return i}var eV=(n=>(n.GET="GET",n.PUT="PUT",n.POST="POST",n.DELETE="DELETE",n))(eV||{});async function vC(r,e,{configuration:t,headers:i,jsonRequest:n,jsonResponse:s,method:o="GET"}){let a=async()=>await ske(r,e,{configuration:t,headers:i,jsonRequest:n,jsonResponse:s,method:o});return await(await t.reduceHook(c=>c.wrapNetworkRequest,a,{target:r,body:e,configuration:t,headers:i,jsonRequest:n,jsonResponse:s,method:o}))()}async function rke(r,{configuration:e,jsonResponse:t,...i}){let n=Ta(W6,r,()=>EB(vC(r,null,{configuration:e,...i}),{configuration:e}).then(s=>(W6.set(r,s.body),s.body)));return Buffer.isBuffer(n)===!1&&(n=await n),t?JSON.parse(n.toString()):n}async function ike(r,e,{customErrorMessage:t,...i}){return(await EB(vC(r,e,{...i,method:"PUT"}),i)).body}async function kR(r,e,{customErrorMessage:t,...i}){return(await EB(vC(r,e,{...i,method:"POST"}),i)).body}async function nke(r,{customErrorMessage:e,...t}){return(await EB(vC(r,null,{...t,method:"DELETE"}),t)).body}async function ske(r,e,{configuration:t,headers:i,jsonRequest:n,jsonResponse:s,method:o="GET"}){let a=typeof r=="string"?new mB.URL(r):r,l=$6(a,{configuration:t});if(l.enableNetwork===!1)throw new Error(`Request to '${a.href}' has been blocked because of your configuration settings`);if(a.protocol==="http:"&&!DR.default.isMatch(a.hostname,t.get("unsafeHttpWhitelist")))throw new Error(`Unsafe http requests must be explicitly whitelisted in your configuration (${a.hostname})`);let u={agent:{http:l.httpProxy?PR.default.httpOverHttp(V6(l.httpProxy)):$De,https:l.httpsProxy?PR.default.httpsOverHttp(V6(l.httpsProxy)):eke},headers:i,method:o};u.responseType=s?"json":"buffer",e!==null&&(Buffer.isBuffer(e)||!n&&typeof e=="string"?u.body=e:u.json=e);let g=t.get("httpTimeout"),f=t.get("httpRetry"),h=t.get("enableStrictSsl"),p=l.caFilePath,C=l.httpsCertFilePath,y=l.httpsKeyFilePath,{default:B}=await Promise.resolve().then(()=>Pe(CB())),v=p?await xR(p):void 0,D=C?await xR(C):void 0,T=y?await xR(y):void 0,H=B.extend({timeout:{socket:g},retry:f,https:{rejectUnauthorized:h,certificateAuthority:v,certificate:D,key:T},...u});return t.getLimit("networkConcurrency")(()=>H(a))}var Wt={};ut(Wt,{PackageManager:()=>f9,detectPackageManager:()=>h9,executePackageAccessibleBinary:()=>E9,executePackageScript:()=>TB,executePackageShellcode:()=>JR,executeWorkspaceAccessibleBinary:()=>bRe,executeWorkspaceLifecycleScript:()=>C9,executeWorkspaceScript:()=>d9,getPackageAccessibleBinaries:()=>LB,getWorkspaceAccessibleBinaries:()=>m9,hasPackageScript:()=>yRe,hasWorkspaceScript:()=>WR,isNodeScript:()=>zR,makeScriptEnv:()=>FC,maybeExecuteWorkspaceLifecycleScript:()=>BRe,prepareExternalProject:()=>IRe});var xC={};ut(xC,{getLibzipPromise:()=>an,getLibzipSync:()=>aV});var oV=Pe(iV());var Ja=["number","number"],nV=(F=>(F[F.ZIP_ER_OK=0]="ZIP_ER_OK",F[F.ZIP_ER_MULTIDISK=1]="ZIP_ER_MULTIDISK",F[F.ZIP_ER_RENAME=2]="ZIP_ER_RENAME",F[F.ZIP_ER_CLOSE=3]="ZIP_ER_CLOSE",F[F.ZIP_ER_SEEK=4]="ZIP_ER_SEEK",F[F.ZIP_ER_READ=5]="ZIP_ER_READ",F[F.ZIP_ER_WRITE=6]="ZIP_ER_WRITE",F[F.ZIP_ER_CRC=7]="ZIP_ER_CRC",F[F.ZIP_ER_ZIPCLOSED=8]="ZIP_ER_ZIPCLOSED",F[F.ZIP_ER_NOENT=9]="ZIP_ER_NOENT",F[F.ZIP_ER_EXISTS=10]="ZIP_ER_EXISTS",F[F.ZIP_ER_OPEN=11]="ZIP_ER_OPEN",F[F.ZIP_ER_TMPOPEN=12]="ZIP_ER_TMPOPEN",F[F.ZIP_ER_ZLIB=13]="ZIP_ER_ZLIB",F[F.ZIP_ER_MEMORY=14]="ZIP_ER_MEMORY",F[F.ZIP_ER_CHANGED=15]="ZIP_ER_CHANGED",F[F.ZIP_ER_COMPNOTSUPP=16]="ZIP_ER_COMPNOTSUPP",F[F.ZIP_ER_EOF=17]="ZIP_ER_EOF",F[F.ZIP_ER_INVAL=18]="ZIP_ER_INVAL",F[F.ZIP_ER_NOZIP=19]="ZIP_ER_NOZIP",F[F.ZIP_ER_INTERNAL=20]="ZIP_ER_INTERNAL",F[F.ZIP_ER_INCONS=21]="ZIP_ER_INCONS",F[F.ZIP_ER_REMOVE=22]="ZIP_ER_REMOVE",F[F.ZIP_ER_DELETED=23]="ZIP_ER_DELETED",F[F.ZIP_ER_ENCRNOTSUPP=24]="ZIP_ER_ENCRNOTSUPP",F[F.ZIP_ER_RDONLY=25]="ZIP_ER_RDONLY",F[F.ZIP_ER_NOPASSWD=26]="ZIP_ER_NOPASSWD",F[F.ZIP_ER_WRONGPASSWD=27]="ZIP_ER_WRONGPASSWD",F[F.ZIP_ER_OPNOTSUPP=28]="ZIP_ER_OPNOTSUPP",F[F.ZIP_ER_INUSE=29]="ZIP_ER_INUSE",F[F.ZIP_ER_TELL=30]="ZIP_ER_TELL",F[F.ZIP_ER_COMPRESSED_DATA=31]="ZIP_ER_COMPRESSED_DATA",F))(nV||{}),sV=r=>({get HEAP8(){return r.HEAP8},get HEAPU8(){return r.HEAPU8},errors:nV,SEEK_SET:0,SEEK_CUR:1,SEEK_END:2,ZIP_CHECKCONS:4,ZIP_CREATE:1,ZIP_EXCL:2,ZIP_TRUNCATE:8,ZIP_RDONLY:16,ZIP_FL_OVERWRITE:8192,ZIP_FL_COMPRESSED:4,ZIP_OPSYS_DOS:0,ZIP_OPSYS_AMIGA:1,ZIP_OPSYS_OPENVMS:2,ZIP_OPSYS_UNIX:3,ZIP_OPSYS_VM_CMS:4,ZIP_OPSYS_ATARI_ST:5,ZIP_OPSYS_OS_2:6,ZIP_OPSYS_MACINTOSH:7,ZIP_OPSYS_Z_SYSTEM:8,ZIP_OPSYS_CPM:9,ZIP_OPSYS_WINDOWS_NTFS:10,ZIP_OPSYS_MVS:11,ZIP_OPSYS_VSE:12,ZIP_OPSYS_ACORN_RISC:13,ZIP_OPSYS_VFAT:14,ZIP_OPSYS_ALTERNATE_MVS:15,ZIP_OPSYS_BEOS:16,ZIP_OPSYS_TANDEM:17,ZIP_OPSYS_OS_400:18,ZIP_OPSYS_OS_X:19,ZIP_CM_DEFAULT:-1,ZIP_CM_STORE:0,ZIP_CM_DEFLATE:8,uint08S:r._malloc(1),uint16S:r._malloc(2),uint32S:r._malloc(4),uint64S:r._malloc(8),malloc:r._malloc,free:r._free,getValue:r.getValue,open:r.cwrap("zip_open","number",["string","number","number"]),openFromSource:r.cwrap("zip_open_from_source","number",["number","number","number"]),close:r.cwrap("zip_close","number",["number"]),discard:r.cwrap("zip_discard",null,["number"]),getError:r.cwrap("zip_get_error","number",["number"]),getName:r.cwrap("zip_get_name","string",["number","number","number"]),getNumEntries:r.cwrap("zip_get_num_entries","number",["number","number"]),delete:r.cwrap("zip_delete","number",["number","number"]),stat:r.cwrap("zip_stat","number",["number","string","number","number"]),statIndex:r.cwrap("zip_stat_index","number",["number",...Ja,"number","number"]),fopen:r.cwrap("zip_fopen","number",["number","string","number"]),fopenIndex:r.cwrap("zip_fopen_index","number",["number",...Ja,"number"]),fread:r.cwrap("zip_fread","number",["number","number","number","number"]),fclose:r.cwrap("zip_fclose","number",["number"]),dir:{add:r.cwrap("zip_dir_add","number",["number","string"])},file:{add:r.cwrap("zip_file_add","number",["number","string","number","number"]),getError:r.cwrap("zip_file_get_error","number",["number"]),getExternalAttributes:r.cwrap("zip_file_get_external_attributes","number",["number",...Ja,"number","number","number"]),setExternalAttributes:r.cwrap("zip_file_set_external_attributes","number",["number",...Ja,"number","number","number"]),setMtime:r.cwrap("zip_file_set_mtime","number",["number",...Ja,"number","number"]),setCompression:r.cwrap("zip_set_file_compression","number",["number",...Ja,"number","number"])},ext:{countSymlinks:r.cwrap("zip_ext_count_symlinks","number",["number"])},error:{initWithCode:r.cwrap("zip_error_init_with_code",null,["number","number"]),strerror:r.cwrap("zip_error_strerror","string",["number"])},name:{locate:r.cwrap("zip_name_locate","number",["number","string","number"])},source:{fromUnattachedBuffer:r.cwrap("zip_source_buffer_create","number",["number",...Ja,"number","number"]),fromBuffer:r.cwrap("zip_source_buffer","number",["number","number",...Ja,"number"]),free:r.cwrap("zip_source_free",null,["number"]),keep:r.cwrap("zip_source_keep",null,["number"]),open:r.cwrap("zip_source_open","number",["number"]),close:r.cwrap("zip_source_close","number",["number"]),seek:r.cwrap("zip_source_seek","number",["number",...Ja,"number"]),tell:r.cwrap("zip_source_tell","number",["number"]),read:r.cwrap("zip_source_read","number",["number","number","number"]),error:r.cwrap("zip_source_error","number",["number"]),setMtime:r.cwrap("zip_source_set_mtime","number",["number","number"])},struct:{stat:r.cwrap("zipstruct_stat","number",[]),statS:r.cwrap("zipstruct_statS","number",[]),statName:r.cwrap("zipstruct_stat_name","string",["number"]),statIndex:r.cwrap("zipstruct_stat_index","number",["number"]),statSize:r.cwrap("zipstruct_stat_size","number",["number"]),statCompSize:r.cwrap("zipstruct_stat_comp_size","number",["number"]),statCompMethod:r.cwrap("zipstruct_stat_comp_method","number",["number"]),statMtime:r.cwrap("zipstruct_stat_mtime","number",["number"]),statCrc:r.cwrap("zipstruct_stat_crc","number",["number"]),error:r.cwrap("zipstruct_error","number",[]),errorS:r.cwrap("zipstruct_errorS","number",[]),errorCodeZip:r.cwrap("zipstruct_error_code_zip","number",["number"])}});var NR=null;function aV(){return NR===null&&(NR=sV((0,oV.default)())),NR}async function an(){return aV()}var RC={};ut(RC,{ShellError:()=>zn,execute:()=>xB,globUtils:()=>BB});var yV=Pe(wx()),wV=J("os"),Vn=J("stream"),BV=J("util");var zn=class extends Error{constructor(e){super(e),this.name="ShellError"}};var BB={};ut(BB,{fastGlobOptions:()=>cV,isBraceExpansion:()=>TR,isGlobPattern:()=>oke,match:()=>ake,micromatchOptions:()=>wB});var AV=Pe(dw()),lV=Pe(J("fs")),yB=Pe(Bn()),wB={strictBrackets:!0},cV={onlyDirectories:!1,onlyFiles:!1};function oke(r){if(!yB.default.scan(r,wB).isGlob)return!1;try{yB.default.parse(r,wB)}catch{return!1}return!0}function ake(r,{cwd:e,baseFs:t}){return(0,AV.default)(r,{...cV,cwd:K.fromPortablePath(e),fs:AI(lV.default,new vg(t))})}function TR(r){return yB.default.scan(r,wB).isBrace}var gV=Pe(TS()),Vo=J("stream"),fV=J("string_decoder");var Mc=new Set;function LR(){}function OR(){for(let r of Mc)r.kill()}function hV(r,e,t,i){return n=>{let s=n[0]instanceof Vo.Transform?"pipe":n[0],o=n[1]instanceof Vo.Transform?"pipe":n[1],a=n[2]instanceof Vo.Transform?"pipe":n[2],l=(0,gV.default)(r,e,{...i,stdio:[s,o,a]});return Mc.add(l),Mc.size===1&&(process.on("SIGINT",LR),process.on("SIGTERM",OR)),n[0]instanceof Vo.Transform&&n[0].pipe(l.stdin),n[1]instanceof Vo.Transform&&l.stdout.pipe(n[1],{end:!1}),n[2]instanceof Vo.Transform&&l.stderr.pipe(n[2],{end:!1}),{stdin:l.stdin,promise:new Promise(c=>{l.on("error",u=>{switch(Mc.delete(l),Mc.size===0&&(process.off("SIGINT",LR),process.off("SIGTERM",OR)),u.code){case"ENOENT":n[2].write(`command not found: ${r}
-`),c(127);break;case"EACCES":n[2].write(`permission denied: ${r}
-`),c(128);break;default:n[2].write(`uncaught error: ${u.message}
-`),c(1);break}}),l.on("close",u=>{Mc.delete(l),Mc.size===0&&(process.off("SIGINT",LR),process.off("SIGTERM",OR)),c(u!==null?u:129)})})}}}function pV(r){return e=>{let t=e[0]==="pipe"?new Vo.PassThrough:e[0];return{stdin:t,promise:Promise.resolve().then(()=>r({stdin:t,stdout:e[1],stderr:e[2]}))}}}var Ss=class{constructor(e){this.stream=e}close(){}get(){return this.stream}},MR=class{constructor(){this.stream=null}close(){if(this.stream===null)throw new Error("Assertion failed: No stream attached");this.stream.end()}attach(e){this.stream=e}get(){if(this.stream===null)throw new Error("Assertion failed: No stream attached");return this.stream}},zf=class{constructor(e,t){this.stdin=null;this.stdout=null;this.stderr=null;this.pipe=null;this.ancestor=e,this.implementation=t}static start(e,{stdin:t,stdout:i,stderr:n}){let s=new zf(null,e);return s.stdin=t,s.stdout=i,s.stderr=n,s}pipeTo(e,t=1){let i=new zf(this,e),n=new MR;return i.pipe=n,i.stdout=this.stdout,i.stderr=this.stderr,(t&1)===1?this.stdout=n:this.ancestor!==null&&(this.stderr=this.ancestor.stdout),(t&2)===2?this.stderr=n:this.ancestor!==null&&(this.stderr=this.ancestor.stderr),i}async exec(){let e=["ignore","ignore","ignore"];if(this.pipe)e[0]="pipe";else{if(this.stdin===null)throw new Error("Assertion failed: No input stream registered");e[0]=this.stdin.get()}let t;if(this.stdout===null)throw new Error("Assertion failed: No output stream registered");t=this.stdout,e[1]=t.get();let i;if(this.stderr===null)throw new Error("Assertion failed: No error stream registered");i=this.stderr,e[2]=i.get();let n=this.implementation(e);return this.pipe&&this.pipe.attach(n.stdin),await n.promise.then(s=>(t.close(),i.close(),s))}async run(){let e=[];for(let i=this;i;i=i.ancestor)e.push(i.exec());return(await Promise.all(e))[0]}};function bB(r,e){return zf.start(r,e)}function uV(r,e=null){let t=new Vo.PassThrough,i=new fV.StringDecoder,n="";return t.on("data",s=>{let o=i.write(s),a;do if(a=o.indexOf(`
-`),a!==-1){let l=n+o.substring(0,a);o=o.substring(a+1),n="",r(e!==null?`${e} ${l}`:l)}while(a!==-1);n+=o}),t.on("end",()=>{let s=i.end();s!==""&&r(e!==null?`${e} ${s}`:s)}),t}function dV(r,{prefix:e}){return{stdout:uV(t=>r.stdout.write(`${t}
-`),r.stdout.isTTY?e:null),stderr:uV(t=>r.stderr.write(`${t}
-`),r.stderr.isTTY?e:null)}}var Ake=(0,BV.promisify)(setTimeout);function CV(r,e,t){let i=new Vn.PassThrough({autoDestroy:!0});switch(r){case 0:(e&1)===1&&t.stdin.pipe(i,{end:!1}),(e&2)===2&&t.stdin instanceof Vn.Writable&&i.pipe(t.stdin,{end:!1});break;case 1:(e&1)===1&&t.stdout.pipe(i,{end:!1}),(e&2)===2&&i.pipe(t.stdout,{end:!1});break;case 2:(e&1)===1&&t.stderr.pipe(i,{end:!1}),(e&2)===2&&i.pipe(t.stderr,{end:!1});break;default:throw new zn(`Bad file descriptor: "${r}"`)}return i}function SB(r,e={}){let t={...r,...e};return t.environment={...r.environment,...e.environment},t.variables={...r.variables,...e.variables},t}var lke=new Map([["cd",async([r=(0,wV.homedir)(),...e],t,i)=>{let n=x.resolve(i.cwd,K.toPortablePath(r));if(!(await t.baseFs.statPromise(n).catch(o=>{throw o.code==="ENOENT"?new zn(`cd: no such file or directory: ${r}`):o})).isDirectory())throw new zn(`cd: not a directory: ${r}`);return i.cwd=n,0}],["pwd",async(r,e,t)=>(t.stdout.write(`${K.fromPortablePath(t.cwd)}
-`),0)],[":",async(r,e,t)=>0],["true",async(r,e,t)=>0],["false",async(r,e,t)=>1],["exit",async([r,...e],t,i)=>i.exitCode=parseInt(r!=null?r:i.variables["?"],10)],["echo",async(r,e,t)=>(t.stdout.write(`${r.join(" ")}
-`),0)],["sleep",async([r],e,t)=>{if(typeof r>"u")throw new zn("sleep: missing operand");let i=Number(r);if(Number.isNaN(i))throw new zn(`sleep: invalid time interval '${r}'`);return await Ake(1e3*i,0)}],["__ysh_run_procedure",async(r,e,t)=>{let i=t.procedures[r[0]];return await bB(i,{stdin:new Ss(t.stdin),stdout:new Ss(t.stdout),stderr:new Ss(t.stderr)}).run()}],["__ysh_set_redirects",async(r,e,t)=>{let i=t.stdin,n=t.stdout,s=t.stderr,o=[],a=[],l=[],c=0;for(;r[c]!=="--";){let g=r[c++],{type:f,fd:h}=JSON.parse(g),p=v=>{switch(h){case null:case 0:o.push(v);break;default:throw new Error(`Unsupported file descriptor: "${h}"`)}},C=v=>{switch(h){case null:case 1:a.push(v);break;case 2:l.push(v);break;default:throw new Error(`Unsupported file descriptor: "${h}"`)}},y=Number(r[c++]),B=c+y;for(let v=c;v<B;++c,++v)switch(f){case"<":p(()=>e.baseFs.createReadStream(x.resolve(t.cwd,K.toPortablePath(r[v]))));break;case"<<<":p(()=>{let D=new Vn.PassThrough;return process.nextTick(()=>{D.write(`${r[v]}
-`),D.end()}),D});break;case"<&":p(()=>CV(Number(r[v]),1,t));break;case">":case">>":{let D=x.resolve(t.cwd,K.toPortablePath(r[v]));C(D==="/dev/null"?new Vn.Writable({autoDestroy:!0,emitClose:!0,write(T,H,j){setImmediate(j)}}):e.baseFs.createWriteStream(D,f===">>"?{flags:"a"}:void 0))}break;case">&":C(CV(Number(r[v]),2,t));break;default:throw new Error(`Assertion failed: Unsupported redirection type: "${f}"`)}}if(o.length>0){let g=new Vn.PassThrough;i=g;let f=h=>{if(h===o.length)g.end();else{let p=o[h]();p.pipe(g,{end:!1}),p.on("end",()=>{f(h+1)})}};f(0)}if(a.length>0){let g=new Vn.PassThrough;n=g;for(let f of a)g.pipe(f)}if(l.length>0){let g=new Vn.PassThrough;s=g;for(let f of l)g.pipe(f)}let u=await bB(DC(r.slice(c+1),e,t),{stdin:new Ss(i),stdout:new Ss(n),stderr:new Ss(s)}).run();return await Promise.all(a.map(g=>new Promise((f,h)=>{g.on("error",p=>{h(p)}),g.on("close",()=>{f()}),g.end()}))),await Promise.all(l.map(g=>new Promise((f,h)=>{g.on("error",p=>{h(p)}),g.on("close",()=>{f()}),g.end()}))),u}]]);async function cke(r,e,t){let i=[],n=new Vn.PassThrough;return n.on("data",s=>i.push(s)),await vB(r,e,SB(t,{stdout:n})),Buffer.concat(i).toString().replace(/[\r\n]+$/,"")}async function mV(r,e,t){let i=r.map(async s=>{let o=await Kc(s.args,e,t);return{name:s.name,value:o.join(" ")}});return(await Promise.all(i)).reduce((s,o)=>(s[o.name]=o.value,s),{})}function QB(r){return r.match(/[^ \r\n\t]+/g)||[]}async function bV(r,e,t,i,n=i){switch(r.name){case"$":i(String(process.pid));break;case"#":i(String(e.args.length));break;case"@":if(r.quoted)for(let s of e.args)n(s);else for(let s of e.args){let o=QB(s);for(let a=0;a<o.length-1;++a)n(o[a]);i(o[o.length-1])}break;case"*":{let s=e.args.join(" ");if(r.quoted)i(s);else for(let o of QB(s))n(o)}break;case"PPID":i(String(process.ppid));break;case"RANDOM":i(String(Math.floor(Math.random()*32768)));break;default:{let s=parseInt(r.name,10),o,a=Number.isFinite(s);if(a?s>=0&&s<e.args.length&&(o=e.args[s]):Object.prototype.hasOwnProperty.call(t.variables,r.name)?o=t.variables[r.name]:Object.prototype.hasOwnProperty.call(t.environment,r.name)&&(o=t.environment[r.name]),typeof o<"u"&&r.alternativeValue?o=(await Kc(r.alternativeValue,e,t)).join(" "):typeof o>"u"&&(r.defaultValue?o=(await Kc(r.defaultValue,e,t)).join(" "):r.alternativeValue&&(o="")),typeof o>"u")throw a?new zn(`Unbound argument #${s}`):new zn(`Unbound variable "${r.name}"`);if(r.quoted)i(o);else{let l=QB(o);for(let u=0;u<l.length-1;++u)n(l[u]);let c=l[l.length-1];typeof c<"u"&&i(c)}}break}}var uke={addition:(r,e)=>r+e,subtraction:(r,e)=>r-e,multiplication:(r,e)=>r*e,division:(r,e)=>Math.trunc(r/e)};async function PC(r,e,t){if(r.type==="number"){if(Number.isInteger(r.value))return r.value;throw new Error(`Invalid number: "${r.value}", only integers are allowed`)}else if(r.type==="variable"){let i=[];await bV({...r,quoted:!0},e,t,s=>i.push(s));let n=Number(i.join(" "));return Number.isNaN(n)?PC({type:"variable",name:i.join(" ")},e,t):PC({type:"number",value:n},e,t)}else return uke[r.type](await PC(r.left,e,t),await PC(r.right,e,t))}async function Kc(r,e,t){let i=new Map,n=[],s=[],o=u=>{s.push(u)},a=()=>{s.length>0&&n.push(s.join("")),s=[]},l=u=>{o(u),a()},c=(u,g,f)=>{let h=JSON.stringify({type:u,fd:g}),p=i.get(h);typeof p>"u"&&i.set(h,p=[]),p.push(f)};for(let u of r){let g=!1;switch(u.type){case"redirection":{let f=await Kc(u.args,e,t);for(let h of f)c(u.subtype,u.fd,h)}break;case"argument":for(let f of u.segments)switch(f.type){case"text":o(f.text);break;case"glob":o(f.pattern),g=!0;break;case"shell":{let h=await cke(f.shell,e,t);if(f.quoted)o(h);else{let p=QB(h);for(let C=0;C<p.length-1;++C)l(p[C]);o(p[p.length-1])}}break;case"variable":await bV(f,e,t,o,l);break;case"arithmetic":o(String(await PC(f.arithmetic,e,t)));break}break}if(a(),g){let f=n.pop();if(typeof f>"u")throw new Error("Assertion failed: Expected a glob pattern to have been set");let h=await e.glob.match(f,{cwd:t.cwd,baseFs:e.baseFs});if(h.length===0){let p=TR(f)?". Note: Brace expansion of arbitrary strings isn't currently supported. For more details, please read this issue: https://github.com/yarnpkg/berry/issues/22":"";throw new zn(`No matches found: "${f}"${p}`)}for(let p of h.sort())l(p)}}if(i.size>0){let u=[];for(let[g,f]of i.entries())u.splice(u.length,0,g,String(f.length),...f);n.splice(0,0,"__ysh_set_redirects",...u,"--")}return n}function DC(r,e,t){e.builtins.has(r[0])||(r=["command",...r]);let i=K.fromPortablePath(t.cwd),n=t.environment;typeof n.PWD<"u"&&(n={...n,PWD:i});let[s,...o]=r;if(s==="command")return hV(o[0],o.slice(1),e,{cwd:i,env:n});let a=e.builtins.get(s);if(typeof a>"u")throw new Error(`Assertion failed: A builtin should exist for "${s}"`);return pV(async({stdin:l,stdout:c,stderr:u})=>{let{stdin:g,stdout:f,stderr:h}=t;t.stdin=l,t.stdout=c,t.stderr=u;try{return await a(o,e,t)}finally{t.stdin=g,t.stdout=f,t.stderr=h}})}function gke(r,e,t){return i=>{let n=new Vn.PassThrough,s=vB(r,e,SB(t,{stdin:n}));return{stdin:n,promise:s}}}function fke(r,e,t){return i=>{let n=new Vn.PassThrough,s=vB(r,e,t);return{stdin:n,promise:s}}}function EV(r,e,t,i){if(e.length===0)return r;{let n;do n=String(Math.random());while(Object.prototype.hasOwnProperty.call(i.procedures,n));return i.procedures={...i.procedures},i.procedures[n]=r,DC([...e,"__ysh_run_procedure",n],t,i)}}async function IV(r,e,t){let i=r,n=null,s=null;for(;i;){let o=i.then?{...t}:t,a;switch(i.type){case"command":{let l=await Kc(i.args,e,t),c=await mV(i.envs,e,t);a=i.envs.length?DC(l,e,SB(o,{environment:c})):DC(l,e,o)}break;case"subshell":{let l=await Kc(i.args,e,t),c=gke(i.subshell,e,o);a=EV(c,l,e,o)}break;case"group":{let l=await Kc(i.args,e,t),c=fke(i.group,e,o);a=EV(c,l,e,o)}break;case"envs":{let l=await mV(i.envs,e,t);o.environment={...o.environment,...l},a=DC(["true"],e,o)}break}if(typeof a>"u")throw new Error("Assertion failed: An action should have been generated");if(n===null)s=bB(a,{stdin:new Ss(o.stdin),stdout:new Ss(o.stdout),stderr:new Ss(o.stderr)});else{if(s===null)throw new Error("Assertion failed: The execution pipeline should have been setup");switch(n){case"|":s=s.pipeTo(a,1);break;case"|&":s=s.pipeTo(a,3);break}}i.then?(n=i.then.type,i=i.then.chain):i=null}if(s===null)throw new Error("Assertion failed: The execution pipeline should have been setup");return await s.run()}async function hke(r,e,t,{background:i=!1}={}){function n(s){let o=["#2E86AB","#A23B72","#F18F01","#C73E1D","#CCE2A3"],a=o[s%o.length];return yV.default.hex(a)}if(i){let s=t.nextBackgroundJobIndex++,o=n(s),a=`[${s}]`,l=o(a),{stdout:c,stderr:u}=dV(t,{prefix:l});return t.backgroundJobs.push(IV(r,e,SB(t,{stdout:c,stderr:u})).catch(g=>u.write(`${g.message}
-`)).finally(()=>{t.stdout.isTTY&&t.stdout.write(`Job ${l}, '${o(Fg(r))}' has ended
-`)})),0}return await IV(r,e,t)}async function pke(r,e,t,{background:i=!1}={}){let n,s=a=>{n=a,t.variables["?"]=String(a)},o=async a=>{try{return await hke(a.chain,e,t,{background:i&&typeof a.then>"u"})}catch(l){if(!(l instanceof zn))throw l;return t.stderr.write(`${l.message}
-`),1}};for(s(await o(r));r.then;){if(t.exitCode!==null)return t.exitCode;switch(r.then.type){case"&&":n===0&&s(await o(r.then.line));break;case"||":n!==0&&s(await o(r.then.line));break;default:throw new Error(`Assertion failed: Unsupported command type: "${r.then.type}"`)}r=r.then.line}return n}async function vB(r,e,t){let i=t.backgroundJobs;t.backgroundJobs=[];let n=0;for(let{command:s,type:o}of r){if(n=await pke(s,e,t,{background:o==="&"}),t.exitCode!==null)return t.exitCode;t.variables["?"]=String(n)}return await Promise.all(t.backgroundJobs),t.backgroundJobs=i,n}function QV(r){switch(r.type){case"variable":return r.name==="@"||r.name==="#"||r.name==="*"||Number.isFinite(parseInt(r.name,10))||"defaultValue"in r&&!!r.defaultValue&&r.defaultValue.some(e=>kC(e))||"alternativeValue"in r&&!!r.alternativeValue&&r.alternativeValue.some(e=>kC(e));case"arithmetic":return KR(r.arithmetic);case"shell":return UR(r.shell);default:return!1}}function kC(r){switch(r.type){case"redirection":return r.args.some(e=>kC(e));case"argument":return r.segments.some(e=>QV(e));default:throw new Error(`Assertion failed: Unsupported argument type: "${r.type}"`)}}function KR(r){switch(r.type){case"variable":return QV(r);case"number":return!1;default:return KR(r.left)||KR(r.right)}}function UR(r){return r.some(({command:e})=>{for(;e;){let t=e.chain;for(;t;){let i;switch(t.type){case"subshell":i=UR(t.subshell);break;case"command":i=t.envs.some(n=>n.args.some(s=>kC(s)))||t.args.some(n=>kC(n));break}if(i)return!0;if(!t.then)break;t=t.then.chain}if(!e.then)break;e=e.then.line}return!1})}async function xB(r,e=[],{baseFs:t=new $t,builtins:i={},cwd:n=K.toPortablePath(process.cwd()),env:s=process.env,stdin:o=process.stdin,stdout:a=process.stdout,stderr:l=process.stderr,variables:c={},glob:u=BB}={}){let g={};for(let[p,C]of Object.entries(s))typeof C<"u"&&(g[p]=C);let f=new Map(lke);for(let[p,C]of Object.entries(i))f.set(p,C);o===null&&(o=new Vn.PassThrough,o.end());let h=uI(r,u);if(!UR(h)&&h.length>0&&e.length>0){let{command:p}=h[h.length-1];for(;p.then;)p=p.then.line;let C=p.chain;for(;C.then;)C=C.then.chain;C.type==="command"&&(C.args=C.args.concat(e.map(y=>({type:"argument",segments:[{type:"text",text:y}]}))))}return await vB(h,{args:e,baseFs:t,builtins:f,initialStdin:o,initialStdout:a,initialStderr:l,glob:u},{cwd:n,environment:g,exitCode:null,procedures:{},stdin:o,stdout:a,stderr:l,variables:Object.assign({},c,{["?"]:0}),nextBackgroundJobIndex:1,backgroundJobs:[]})}var u9=Pe(PB()),g9=Pe(Jg()),tl=J("stream");var l9=Pe(s9()),FB=Pe(Ac());var o9=["\u280B","\u2819","\u2839","\u2838","\u283C","\u2834","\u2826","\u2827","\u2807","\u280F"],a9=80,fRe=new Set([13,19]),hRe=5,RB=FB.default.GITHUB_ACTIONS?{start:r=>`::group::${r}
-`,end:r=>`::endgroup::
-`}:FB.default.TRAVIS?{start:r=>`travis_fold:start:${r}
-`,end:r=>`travis_fold:end:${r}
-`}:FB.default.GITLAB?{start:r=>`section_start:${Math.floor(Date.now()/1e3)}:${r.toLowerCase().replace(/\W+/g,"_")}[collapsed=true]\r\x1B[0K${r}
-`,end:r=>`section_end:${Math.floor(Date.now()/1e3)}:${r.toLowerCase().replace(/\W+/g,"_")}\r\x1B[0K`}:null,A9=new Date,pRe=["iTerm.app","Apple_Terminal","WarpTerminal","vscode"].includes(process.env.TERM_PROGRAM)||!!process.env.WT_SESSION,dRe=r=>r,NB=dRe({patrick:{date:[17,3],chars:["\u{1F340}","\u{1F331}"],size:40},simba:{date:[19,7],chars:["\u{1F981}","\u{1F334}"],size:40},jack:{date:[31,10],chars:["\u{1F383}","\u{1F987}"],size:40},hogsfather:{date:[31,12],chars:["\u{1F389}","\u{1F384}"],size:40},default:{chars:["=","-"],size:80}}),CRe=pRe&&Object.keys(NB).find(r=>{let e=NB[r];return!(e.date&&(e.date[0]!==A9.getDate()||e.date[1]!==A9.getMonth()+1))})||"default";function c9(r,{configuration:e,json:t}){if(!e.get("enableMessageNames"))return"";let n=FA(r===null?0:r);return!t&&r===null?$e(e,n,"grey"):n}function qR(r,{configuration:e,json:t}){let i=c9(r,{configuration:e,json:t});if(!i||r===null||r===0)return i;let n=Ct[r],s=`https://yarnpkg.com/advanced/error-codes#${i}---${n}`.toLowerCase();return If(e,i,s)}var Ge=class extends vi{constructor({configuration:t,stdout:i,json:n=!1,includePrefix:s=!0,includeFooter:o=!0,includeLogs:a=!n,includeInfos:l=a,includeWarnings:c=a,forgettableBufferSize:u=hRe,forgettableNames:g=new Set}){super();this.uncommitted=new Set;this.cacheHitCount=0;this.cacheMissCount=0;this.lastCacheMiss=null;this.warningCount=0;this.errors=[];this.startTime=Date.now();this.indent=0;this.progress=new Map;this.progressTime=0;this.progressFrame=0;this.progressTimeout=null;this.progressStyle=null;this.progressMaxScaledSize=null;this.forgettableLines=[];if(Xd(this,{configuration:t}),this.configuration=t,this.forgettableBufferSize=u,this.forgettableNames=new Set([...g,...fRe]),this.includePrefix=s,this.includeFooter=o,this.includeInfos=l,this.includeWarnings=c,this.json=n,this.stdout=i,t.get("enableProgressBars")&&!n&&i.isTTY&&i.columns>22){let f=t.get("progressBarStyle")||CRe;if(!Object.prototype.hasOwnProperty.call(NB,f))throw new Error("Assertion failed: Invalid progress bar style");this.progressStyle=NB[f];let h=12,p=Math.max(0,Math.min(i.columns-h,80));this.progressMaxScaledSize=Math.floor(this.progressStyle.size*p/80)}}static async start(t,i){let n=new this(t),s=process.emitWarning;process.emitWarning=(o,a)=>{if(typeof o!="string"){let c=o;o=c.message,a=a!=null?a:c.name}let l=typeof a<"u"?`${a}: ${o}`:o;n.reportWarning(0,l)};try{await i(n)}catch(o){n.reportExceptionOnce(o)}finally{await n.finalize(),process.emitWarning=s}return n}hasErrors(){return this.errors.length>0}exitCode(){return this.hasErrors()?1:0}reportCacheHit(t){this.cacheHitCount+=1}reportCacheMiss(t,i){this.lastCacheMiss=t,this.cacheMissCount+=1,typeof i<"u"&&!this.configuration.get("preferAggregateCacheInfo")&&this.reportInfo(13,i)}startSectionSync({reportHeader:t,reportFooter:i,skipIfEmpty:n},s){let o={committed:!1,action:()=>{t==null||t()}};n?this.uncommitted.add(o):(o.action(),o.committed=!0);let a=Date.now();try{return s()}catch(l){throw this.reportExceptionOnce(l),l}finally{let l=Date.now();this.uncommitted.delete(o),o.committed&&(i==null||i(l-a))}}async startSectionPromise({reportHeader:t,reportFooter:i,skipIfEmpty:n},s){let o={committed:!1,action:()=>{t==null||t()}};n?this.uncommitted.add(o):(o.action(),o.committed=!0);let a=Date.now();try{return await s()}catch(l){throw this.reportExceptionOnce(l),l}finally{let l=Date.now();this.uncommitted.delete(o),o.committed&&(i==null||i(l-a))}}startTimerImpl(t,i,n){return{cb:typeof i=="function"?i:n,reportHeader:()=>{this.reportInfo(null,`\u250C ${t}`),this.indent+=1,RB!==null&&!this.json&&this.includeInfos&&this.stdout.write(RB.start(t))},reportFooter:a=>{if(this.indent-=1,RB!==null&&!this.json&&this.includeInfos){this.stdout.write(RB.end(t));for(let[l,c]of this.errors)this.reportErrorImpl(l,c)}this.configuration.get("enableTimers")&&a>200?this.reportInfo(null,`\u2514 Completed in ${$e(this.configuration,a,Ue.DURATION)}`):this.reportInfo(null,"\u2514 Completed")},skipIfEmpty:(typeof i=="function"?{}:i).skipIfEmpty}}startTimerSync(t,i,n){let{cb:s,...o}=this.startTimerImpl(t,i,n);return this.startSectionSync(o,s)}async startTimerPromise(t,i,n){let{cb:s,...o}=this.startTimerImpl(t,i,n);return this.startSectionPromise(o,s)}async startCacheReport(t){let i=this.configuration.get("preferAggregateCacheInfo")?{cacheHitCount:this.cacheHitCount,cacheMissCount:this.cacheMissCount}:null;try{return await t()}catch(n){throw this.reportExceptionOnce(n),n}finally{i!==null&&this.reportCacheChanges(i)}}reportSeparator(){this.indent===0?this.writeLineWithForgettableReset(""):this.reportInfo(null,"")}reportInfo(t,i){if(!this.includeInfos)return;this.commit();let n=this.formatNameWithHyperlink(t),s=n?`${n}: `:"",o=`${this.formatPrefix(s,"blueBright")}${i}`;if(this.json)this.reportJson({type:"info",name:t,displayName:this.formatName(t),indent:this.formatIndent(),data:i});else if(this.forgettableNames.has(t))if(this.forgettableLines.push(o),this.forgettableLines.length>this.forgettableBufferSize){for(;this.forgettableLines.length>this.forgettableBufferSize;)this.forgettableLines.shift();this.writeLines(this.forgettableLines,{truncate:!0})}else this.writeLine(o,{truncate:!0});else this.writeLineWithForgettableReset(o)}reportWarning(t,i){if(this.warningCount+=1,!this.includeWarnings)return;this.commit();let n=this.formatNameWithHyperlink(t),s=n?`${n}: `:"";this.json?this.reportJson({type:"warning",name:t,displayName:this.formatName(t),indent:this.formatIndent(),data:i}):this.writeLineWithForgettableReset(`${this.formatPrefix(s,"yellowBright")}${i}`)}reportError(t,i){this.errors.push([t,i]),this.reportErrorImpl(t,i)}reportErrorImpl(t,i){this.commit();let n=this.formatNameWithHyperlink(t),s=n?`${n}: `:"";this.json?this.reportJson({type:"error",name:t,displayName:this.formatName(t),indent:this.formatIndent(),data:i}):this.writeLineWithForgettableReset(`${this.formatPrefix(s,"redBright")}${i}`,{truncate:!1})}reportProgress(t){if(this.progressStyle===null)return{...Promise.resolve(),stop:()=>{}};if(t.hasProgress&&t.hasTitle)throw new Error("Unimplemented: Progress bars can't have both progress and titles.");let i=!1,n=Promise.resolve().then(async()=>{let o={progress:t.hasProgress?0:void 0,title:t.hasTitle?"":void 0};this.progress.set(t,{definition:o,lastScaledSize:t.hasProgress?-1:void 0,lastTitle:void 0}),this.refreshProgress({delta:-1});for await(let{progress:a,title:l}of t)i||o.progress===a&&o.title===l||(o.progress=a,o.title=l,this.refreshProgress());s()}),s=()=>{i||(i=!0,this.progress.delete(t),this.refreshProgress({delta:1}))};return{...n,stop:s}}reportJson(t){this.json&&this.writeLineWithForgettableReset(`${JSON.stringify(t)}`)}async finalize(){if(!this.includeFooter)return;let t="";this.errors.length>0?t="Failed with errors":this.warningCount>0?t="Done with warnings":t="Done";let i=$e(this.configuration,Date.now()-this.startTime,Ue.DURATION),n=this.configuration.get("enableTimers")?`${t} in ${i}`:t;this.errors.length>0?this.reportError(0,n):this.warningCount>0?this.reportWarning(0,n):this.reportInfo(0,n)}writeLine(t,{truncate:i}={}){this.clearProgress({clear:!0}),this.stdout.write(`${this.truncate(t,{truncate:i})}
-`),this.writeProgress()}writeLineWithForgettableReset(t,{truncate:i}={}){this.forgettableLines=[],this.writeLine(t,{truncate:i})}writeLines(t,{truncate:i}={}){this.clearProgress({delta:t.length});for(let n of t)this.stdout.write(`${this.truncate(n,{truncate:i})}
-`);this.writeProgress()}reportCacheChanges({cacheHitCount:t,cacheMissCount:i}){let n=this.cacheHitCount-t,s=this.cacheMissCount-i;if(n===0&&s===0)return;let o="";this.cacheHitCount>1?o+=`${this.cacheHitCount} packages were already cached`:this.cacheHitCount===1?o+=" - one package was already cached":o+="No packages were cached",this.cacheHitCount>0?this.cacheMissCount>1?o+=`, ${this.cacheMissCount} had to be fetched`:this.cacheMissCount===1&&(o+=`, one had to be fetched (${mt(this.configuration,this.lastCacheMiss)})`):this.cacheMissCount>1?o+=` - ${this.cacheMissCount} packages had to be fetched`:this.cacheMissCount===1&&(o+=` - one package had to be fetched (${mt(this.configuration,this.lastCacheMiss)})`),this.reportInfo(13,o)}commit(){let t=this.uncommitted;this.uncommitted=new Set;for(let i of t)i.committed=!0,i.action()}clearProgress({delta:t=0,clear:i=!1}){this.progressStyle!==null&&this.progress.size+t>0&&(this.stdout.write(`\x1B[${this.progress.size+t}A`),(t>0||i)&&this.stdout.write("\x1B[0J"))}writeProgress(){if(this.progressStyle===null||(this.progressTimeout!==null&&clearTimeout(this.progressTimeout),this.progressTimeout=null,this.progress.size===0))return;let t=Date.now();t-this.progressTime>a9&&(this.progressFrame=(this.progressFrame+1)%o9.length,this.progressTime=t);let i=o9[this.progressFrame];for(let n of this.progress.values()){let s="";if(typeof n.lastScaledSize<"u"){let c=this.progressStyle.chars[0].repeat(n.lastScaledSize),u=this.progressStyle.chars[1].repeat(this.progressMaxScaledSize-n.lastScaledSize);s=` ${c}${u}`}let o=this.formatName(null),a=o?`${o}: `:"",l=n.definition.title?` ${n.definition.title}`:"";this.stdout.write(`${$e(this.configuration,"\u27A4","blueBright")} ${a}${i}${s}${l}
-`)}this.progressTimeout=setTimeout(()=>{this.refreshProgress({force:!0})},a9)}refreshProgress({delta:t=0,force:i=!1}={}){let n=!1,s=!1;if(i||this.progress.size===0)n=!0;else for(let o of this.progress.values()){let a=typeof o.definition.progress<"u"?Math.trunc(this.progressMaxScaledSize*o.definition.progress):void 0,l=o.lastScaledSize;o.lastScaledSize=a;let c=o.lastTitle;if(o.lastTitle=o.definition.title,a!==l||(s=c!==o.definition.title)){n=!0;break}}n&&(this.clearProgress({delta:t,clear:s}),this.writeProgress())}truncate(t,{truncate:i}={}){return this.progressStyle===null&&(i=!1),typeof i>"u"&&(i=this.configuration.get("preferTruncatedLines")),i&&(t=(0,l9.default)(t,0,this.stdout.columns-1)),t}formatName(t){return c9(t,{configuration:this.configuration,json:this.json})}formatPrefix(t,i){return this.includePrefix?`${$e(this.configuration,"\u27A4",i)} ${t}${this.formatIndent()}`:""}formatNameWithHyperlink(t){return qR(t,{configuration:this.configuration,json:this.json})}formatIndent(){return"\u2502 ".repeat(this.indent)}};var Tr="3.6.4";var f9=(n=>(n.Yarn1="Yarn Classic",n.Yarn2="Yarn",n.Npm="npm",n.Pnpm="pnpm",n))(f9||{});async function el(r,e,t,i=[]){if(process.platform==="win32"){let n=`@goto #_undefined_# 2>NUL || @title %COMSPEC% & @setlocal & @"${t}" ${i.map(s=>`"${s.replace('"','""')}"`).join(" ")} %*`;await M.writeFilePromise(x.format({dir:r,name:e,ext:".cmd"}),n)}await M.writeFilePromise(x.join(r,e),`#!/bin/sh
-exec "${t}" ${i.map(n=>`'${n.replace(/'/g,`'"'"'`)}'`).join(" ")} "$@"
-`,{mode:493})}async function h9(r){let e=await ot.tryFind(r);if(e!=null&&e.packageManager){let i=vw(e.packageManager);if(i!=null&&i.name){let n=`found ${JSON.stringify({packageManager:e.packageManager})} in manifest`,[s]=i.reference.split(".");switch(i.name){case"yarn":return{packageManagerField:!0,packageManager:Number(s)===1?"Yarn Classic":"Yarn",reason:n};case"npm":return{packageManagerField:!0,packageManager:"npm",reason:n};case"pnpm":return{packageManagerField:!0,packageManager:"pnpm",reason:n}}}}let t;try{t=await M.readFilePromise(x.join(r,xt.lockfile),"utf8")}catch{}return t!==void 0?t.match(/^__metadata:$/m)?{packageManager:"Yarn",reason:'"__metadata" key found in yarn.lock'}:{packageManager:"Yarn Classic",reason:'"__metadata" key not found in yarn.lock, must be a Yarn classic lockfile'}:M.existsSync(x.join(r,"package-lock.json"))?{packageManager:"npm",reason:`found npm's "package-lock.json" lockfile`}:M.existsSync(x.join(r,"pnpm-lock.yaml"))?{packageManager:"pnpm",reason:`found pnpm's "pnpm-lock.yaml" lockfile`}:null}async function FC({project:r,locator:e,binFolder:t,ignoreCorepack:i,lifecycleScript:n}){var c,u;let s={};for(let[g,f]of Object.entries(process.env))typeof f<"u"&&(s[g.toLowerCase()!=="path"?g:"PATH"]=f);let o=K.fromPortablePath(t);s.BERRY_BIN_FOLDER=K.fromPortablePath(o);let a=process.env.COREPACK_ROOT&&!i?K.join(process.env.COREPACK_ROOT,"dist/yarn.js"):process.argv[1];if(await Promise.all([el(t,"node",process.execPath),...Tr!==null?[el(t,"run",process.execPath,[a,"run"]),el(t,"yarn",process.execPath,[a]),el(t,"yarnpkg",process.execPath,[a]),el(t,"node-gyp",process.execPath,[a,"run","--top-level","node-gyp"])]:[]]),r&&(s.INIT_CWD=K.fromPortablePath(r.configuration.startingCwd),s.PROJECT_CWD=K.fromPortablePath(r.cwd)),s.PATH=s.PATH?`${o}${K.delimiter}${s.PATH}`:`${o}`,s.npm_execpath=`${o}${K.sep}yarn`,s.npm_node_execpath=`${o}${K.sep}node`,e){if(!r)throw new Error("Assertion failed: Missing project");let g=r.tryWorkspaceByLocator(e),f=g?(c=g.manifest.version)!=null?c:"":(u=r.storedPackages.get(e.locatorHash).version)!=null?u:"";s.npm_package_name=Ot(e),s.npm_package_version=f;let h;if(g)h=g.cwd;else{let p=r.storedPackages.get(e.locatorHash);if(!p)throw new Error(`Package for ${mt(r.configuration,e)} not found in the project`);let C=r.configuration.getLinkers(),y={project:r,report:new Ge({stdout:new tl.PassThrough,configuration:r.configuration})},B=C.find(v=>v.supportsPackage(p,y));if(!B)throw new Error(`The package ${mt(r.configuration,p)} isn't supported by any of the available linkers`);h=await B.findPackageLocation(p,y)}s.npm_package_json=K.fromPortablePath(x.join(h,xt.manifest))}let l=Tr!==null?`yarn/${Tr}`:`yarn/${mf("@yarnpkg/core").version}-core`;return s.npm_config_user_agent=`${l} npm/? node/${process.version} ${process.platform} ${process.arch}`,n&&(s.npm_lifecycle_event=n),r&&await r.configuration.triggerHook(g=>g.setupScriptEnvironment,r,s,async(g,f,h)=>await el(t,Jr(g),f,h)),s}var mRe=2,ERe=(0,g9.default)(mRe);async function IRe(r,e,{configuration:t,report:i,workspace:n=null,locator:s=null}){await ERe(async()=>{await M.mktempPromise(async o=>{let a=x.join(o,"pack.log"),l=null,{stdout:c,stderr:u}=t.getSubprocessStreams(a,{prefix:K.fromPortablePath(r),report:i}),g=s&&qo(s)?nC(s):s,f=g?Es(g):"an external project";c.write(`Packing ${f} from sources
-`);let h=await h9(r),p;h!==null?(c.write(`Using ${h.packageManager} for bootstrap. Reason: ${h.reason}
-
-`),p=h.packageManager):(c.write(`No package manager configuration detected; defaulting to Yarn
-
-`),p="Yarn");let C=p==="Yarn"&&!(h!=null&&h.packageManagerField);await M.mktempPromise(async y=>{let B=await FC({binFolder:y,ignoreCorepack:C}),D=new Map([["Yarn Classic",async()=>{let H=n!==null?["workspace",n]:[],j=x.join(r,xt.manifest),$=await M.readFilePromise(j),V=await oo(process.execPath,[process.argv[1],"set","version","classic","--only-if-needed"],{cwd:r,env:B,stdin:l,stdout:c,stderr:u,end:1});if(V.code!==0)return V.code;await M.writeFilePromise(j,$),await M.appendFilePromise(x.join(r,".npmignore"),`/.yarn
-`),c.write(`
-`),delete B.NODE_ENV;let W=await oo("yarn",["install"],{cwd:r,env:B,stdin:l,stdout:c,stderr:u,end:1});if(W.code!==0)return W.code;c.write(`
-`);let _=await oo("yarn",[...H,"pack","--filename",K.fromPortablePath(e)],{cwd:r,env:B,stdin:l,stdout:c,stderr:u});return _.code!==0?_.code:0}],["Yarn",async()=>{let H=n!==null?["workspace",n]:[];B.YARN_ENABLE_INLINE_BUILDS="1";let j=x.join(r,xt.lockfile);await M.existsPromise(j)||await M.writeFilePromise(j,"");let $=await oo("yarn",[...H,"pack","--install-if-needed","--filename",K.fromPortablePath(e)],{cwd:r,env:B,stdin:l,stdout:c,stderr:u});return $.code!==0?$.code:0}],["npm",async()=>{if(n!==null){let Ae=new tl.PassThrough,ge=Cf(Ae);Ae.pipe(c,{end:!1});let re=await oo("npm",["--version"],{cwd:r,env:B,stdin:l,stdout:Ae,stderr:u,end:0});if(Ae.end(),re.code!==0)return c.end(),u.end(),re.code;let O=(await ge).toString().trim();if(!kc(O,">=7.x")){let F=Jo(null,"npm"),ue=_t(F,O),pe=_t(F,">=7.x");throw new Error(`Workspaces aren't supported by ${tr(t,ue)}; please upgrade to ${tr(t,pe)} (npm has been detected as the primary package manager for ${$e(t,r,Ue.PATH)})`)}}let H=n!==null?["--workspace",n]:[];delete B.npm_config_user_agent,delete B.npm_config_production,delete B.NPM_CONFIG_PRODUCTION,delete B.NODE_ENV;let j=await oo("npm",["install"],{cwd:r,env:B,stdin:l,stdout:c,stderr:u,end:1});if(j.code!==0)return j.code;let $=new tl.PassThrough,V=Cf($);$.pipe(c);let W=await oo("npm",["pack","--silent",...H],{cwd:r,env:B,stdin:l,stdout:$,stderr:u});if(W.code!==0)return W.code;let _=(await V).toString().trim().replace(/^.*\n/s,""),A=x.resolve(r,K.toPortablePath(_));return await M.renamePromise(A,e),0}]]).get(p);if(typeof D>"u")throw new Error("Assertion failed: Unsupported workflow");let T=await D();if(!(T===0||typeof T>"u"))throw M.detachTemp(o),new at(58,`Packing the package failed (exit code ${T}, logs can be found here: ${$e(t,a,Ue.PATH)})`)})})})}async function yRe(r,e,{project:t}){let i=t.tryWorkspaceByLocator(r);if(i!==null)return WR(i,e);let n=t.storedPackages.get(r.locatorHash);if(!n)throw new Error(`Package for ${mt(t.configuration,r)} not found in the project`);return await Kn.openPromise(async s=>{let o=t.configuration,a=t.configuration.getLinkers(),l={project:t,report:new Ge({stdout:new tl.PassThrough,configuration:o})},c=a.find(h=>h.supportsPackage(n,l));if(!c)throw new Error(`The package ${mt(t.configuration,n)} isn't supported by any of the available linkers`);let u=await c.findPackageLocation(n,l),g=new qt(u,{baseFs:s});return(await ot.find(Oe.dot,{baseFs:g})).scripts.has(e)},{libzip:await an()})}async function TB(r,e,t,{cwd:i,project:n,stdin:s,stdout:o,stderr:a}){return await M.mktempPromise(async l=>{let{manifest:c,env:u,cwd:g}=await p9(r,{project:n,binFolder:l,cwd:i,lifecycleScript:e}),f=c.scripts.get(e);if(typeof f>"u")return 1;let h=async()=>await xB(f,t,{cwd:g,env:u,stdin:s,stdout:o,stderr:a});return await(await n.configuration.reduceHook(C=>C.wrapScriptExecution,h,n,r,e,{script:f,args:t,cwd:g,env:u,stdin:s,stdout:o,stderr:a}))()})}async function JR(r,e,t,{cwd:i,project:n,stdin:s,stdout:o,stderr:a}){return await M.mktempPromise(async l=>{let{env:c,cwd:u}=await p9(r,{project:n,binFolder:l,cwd:i});return await xB(e,t,{cwd:u,env:c,stdin:s,stdout:o,stderr:a})})}async function wRe(r,{binFolder:e,cwd:t,lifecycleScript:i}){let n=await FC({project:r.project,locator:r.anchoredLocator,binFolder:e,lifecycleScript:i});return await VR(e,await m9(r)),typeof t>"u"&&(t=x.dirname(await M.realpathPromise(x.join(r.cwd,"package.json")))),{manifest:r.manifest,binFolder:e,env:n,cwd:t}}async function p9(r,{project:e,binFolder:t,cwd:i,lifecycleScript:n}){let s=e.tryWorkspaceByLocator(r);if(s!==null)return wRe(s,{binFolder:t,cwd:i,lifecycleScript:n});let o=e.storedPackages.get(r.locatorHash);if(!o)throw new Error(`Package for ${mt(e.configuration,r)} not found in the project`);return await Kn.openPromise(async a=>{let l=e.configuration,c=e.configuration.getLinkers(),u={project:e,report:new Ge({stdout:new tl.PassThrough,configuration:l})},g=c.find(y=>y.supportsPackage(o,u));if(!g)throw new Error(`The package ${mt(e.configuration,o)} isn't supported by any of the available linkers`);let f=await FC({project:e,locator:r,binFolder:t,lifecycleScript:n});await VR(t,await LB(r,{project:e}));let h=await g.findPackageLocation(o,u),p=new qt(h,{baseFs:a}),C=await ot.find(Oe.dot,{baseFs:p});return typeof i>"u"&&(i=h),{manifest:C,binFolder:t,env:f,cwd:i}},{libzip:await an()})}async function d9(r,e,t,{cwd:i,stdin:n,stdout:s,stderr:o}){return await TB(r.anchoredLocator,e,t,{cwd:i,project:r.project,stdin:n,stdout:s,stderr:o})}function WR(r,e){return r.manifest.scripts.has(e)}async function C9(r,e,{cwd:t,report:i}){let{configuration:n}=r.project,s=null;await M.mktempPromise(async o=>{let a=x.join(o,`${e}.log`),l=`# This file contains the result of Yarn calling the "${e}" lifecycle script inside a workspace ("${K.fromPortablePath(r.cwd)}")
-`,{stdout:c,stderr:u}=n.getSubprocessStreams(a,{report:i,prefix:mt(n,r.anchoredLocator),header:l});i.reportInfo(36,`Calling the "${e}" lifecycle script`);let g=await d9(r,e,[],{cwd:t,stdin:s,stdout:c,stderr:u});if(c.end(),u.end(),g!==0)throw M.detachTemp(o),new at(36,`${(0,u9.default)(e)} script failed (exit code ${$e(n,g,Ue.NUMBER)}, logs can be found here: ${$e(n,a,Ue.PATH)}); run ${$e(n,`yarn ${e}`,Ue.CODE)} to investigate`)})}async function BRe(r,e,t){WR(r,e)&&await C9(r,e,t)}function zR(r){let e=x.extname(r);if(e.match(/\.[cm]?[jt]sx?$/))return!0;if(e===".exe"||e===".bin")return!1;let t=Buffer.alloc(4),i;try{i=M.openSync(r,"r")}catch{return!0}try{M.readSync(i,t,0,t.length,0)}finally{M.closeSync(i)}let n=t.readUint32BE();return!(n===3405691582||n===3489328638||n===2135247942||(n&4294901760)===1297743872)}async function LB(r,{project:e}){let t=e.configuration,i=new Map,n=e.storedPackages.get(r.locatorHash);if(!n)throw new Error(`Package for ${mt(t,r)} not found in the project`);let s=new tl.Writable,o=t.getLinkers(),a={project:e,report:new Ge({configuration:t,stdout:s})},l=new Set([r.locatorHash]);for(let u of n.dependencies.values()){let g=e.storedResolutions.get(u.descriptorHash);if(!g)throw new Error(`Assertion failed: The resolution (${tr(t,u)}) should have been registered`);l.add(g)}let c=await Promise.all(Array.from(l,async u=>{let g=e.storedPackages.get(u);if(!g)throw new Error(`Assertion failed: The package (${u}) should have been registered`);if(g.bin.size===0)return Ho.skip;let f=o.find(p=>p.supportsPackage(g,a));if(!f)return Ho.skip;let h=null;try{h=await f.findPackageLocation(g,a)}catch(p){if(p.code==="LOCATOR_NOT_INSTALLED")return Ho.skip;throw p}return{dependency:g,packageLocation:h}}));for(let u of c){if(u===Ho.skip)continue;let{dependency:g,packageLocation:f}=u;for(let[h,p]of g.bin){let C=x.resolve(f,p);i.set(h,[g,K.fromPortablePath(C),zR(C)])}}return i}async function m9(r){return await LB(r.anchoredLocator,{project:r.project})}async function VR(r,e){await Promise.all(Array.from(e,([t,[,i,n]])=>n?el(r,Jr(t),process.execPath,[i]):el(r,Jr(t),i,[])))}async function E9(r,e,t,{cwd:i,project:n,stdin:s,stdout:o,stderr:a,nodeArgs:l=[],packageAccessibleBinaries:c}){c!=null||(c=await LB(r,{project:n}));let u=c.get(e);if(!u)throw new Error(`Binary not found (${e}) for ${mt(n.configuration,r)}`);return await M.mktempPromise(async g=>{let[,f]=u,h=await FC({project:n,locator:r,binFolder:g});await VR(h.BERRY_BIN_FOLDER,c);let p=zR(K.toPortablePath(f))?oo(process.execPath,[...l,f,...t],{cwd:i,env:h,stdin:s,stdout:o,stderr:a}):oo(f,t,{cwd:i,env:h,stdin:s,stdout:o,stderr:a}),C;try{C=await p}finally{await M.removePromise(h.BERRY_BIN_FOLDER)}return C.code})}async function bRe(r,e,t,{cwd:i,stdin:n,stdout:s,stderr:o,packageAccessibleBinaries:a}){return await E9(r.anchoredLocator,e,t,{project:r.project,cwd:i,stdin:n,stdout:s,stderr:o,packageAccessibleBinaries:a})}var mi={};ut(mi,{convertToZip:()=>ZNe,extractArchiveTo:()=>$Ne,makeArchiveFromDirectory:()=>XNe});var lZ=J("stream"),cZ=Pe(iZ());var nZ=Pe(Jg()),sZ=J("worker_threads");var hl=Symbol("kTaskInfo"),L0=class{constructor(e){this.source=e;this.workers=[];this.limit=(0,nZ.default)(ek());this.cleanupInterval=setInterval(()=>{if(this.limit.pendingCount===0&&this.limit.activeCount===0){let t=this.workers.pop();t?t.terminate():clearInterval(this.cleanupInterval)}},5e3).unref()}createWorker(){this.cleanupInterval.refresh();let e=new sZ.Worker(this.source,{eval:!0,execArgv:[...process.execArgv,"--unhandled-rejections=strict"]});return e.on("message",t=>{if(!e[hl])throw new Error("Assertion failed: Worker sent a result without having a task assigned");e[hl].resolve(t),e[hl]=null,e.unref(),this.workers.push(e)}),e.on("error",t=>{var i;(i=e[hl])==null||i.reject(t),e[hl]=null}),e.on("exit",t=>{var i;t!==0&&((i=e[hl])==null||i.reject(new Error(`Worker exited with code ${t}`))),e[hl]=null}),e}run(e){return this.limit(()=>{var i;let t=(i=this.workers.pop())!=null?i:this.createWorker();return t.ref(),new Promise((n,s)=>{t[hl]={resolve:n,reject:s},t.postMessage(e)})})}};var uZ=Pe(aZ());async function XNe(r,{baseFs:e=new $t,prefixPath:t=Oe.root,compressionLevel:i,inMemory:n=!1}={}){let s=await an(),o;if(n)o=new Wr(null,{libzip:s,level:i});else{let l=await M.mktempPromise(),c=x.join(l,"archive.zip");o=new Wr(c,{create:!0,libzip:s,level:i})}let a=x.resolve(Oe.root,t);return await o.copyPromise(a,r,{baseFs:e,stableTime:!0,stableSort:!0}),o}var AZ;async function ZNe(r,e){let t=await M.mktempPromise(),i=x.join(t,"archive.zip");return AZ||(AZ=new L0((0,uZ.getContent)())),await AZ.run({tmpFile:i,tgz:r,opts:e}),new Wr(i,{libzip:await an(),level:e.compressionLevel})}async function*_Ne(r){let e=new cZ.default.Parse,t=new lZ.PassThrough({objectMode:!0,autoDestroy:!0,emitClose:!0});e.on("entry",i=>{t.write(i)}),e.on("error",i=>{t.destroy(i)}),e.on("close",()=>{t.destroyed||t.end()}),e.end(r);for await(let i of t){let n=i;yield n,n.resume()}}async function $Ne(r,e,{stripComponents:t=0,prefixPath:i=Oe.dot}={}){var s,o;function n(a){if(a.path[0]==="/")return!0;let l=a.path.split(/\//g);return!!(l.some(c=>c==="..")||l.length<=t)}for await(let a of _Ne(r)){if(n(a))continue;let l=x.normalize(K.toPortablePath(a.path)).replace(/\/$/,"").split(/\//g);if(l.length<=t)continue;let c=l.slice(t).join("/"),u=x.join(i,c),g=420;switch((a.type==="Directory"||(((s=a.mode)!=null?s:0)&73)!==0)&&(g|=73),a.type){case"Directory":e.mkdirpSync(x.dirname(u),{chmod:493,utimes:[xr.SAFE_TIME,xr.SAFE_TIME]}),e.mkdirSync(u,{mode:g}),e.utimesSync(u,xr.SAFE_TIME,xr.SAFE_TIME);break;case"OldFile":case"File":e.mkdirpSync(x.dirname(u),{chmod:493,utimes:[xr.SAFE_TIME,xr.SAFE_TIME]}),e.writeFileSync(u,await Cf(a),{mode:g}),e.utimesSync(u,xr.SAFE_TIME,xr.SAFE_TIME);break;case"SymbolicLink":e.mkdirpSync(x.dirname(u),{chmod:493,utimes:[xr.SAFE_TIME,xr.SAFE_TIME]}),e.symlinkSync(a.linkpath,u),(o=e.lutimesSync)==null||o.call(e,u,xr.SAFE_TIME,xr.SAFE_TIME);break}}return e}var es={};ut(es,{emitList:()=>eTe,emitTree:()=>CZ,treeNodeToJson:()=>dZ,treeNodeToTreeify:()=>pZ});var hZ=Pe(fZ());function pZ(r,{configuration:e}){let t={},i=(n,s)=>{let o=Array.isArray(n)?n.entries():Object.entries(n);for(let[a,{label:l,value:c,children:u}]of o){let g=[];typeof l<"u"&&g.push(Vy(e,l,2)),typeof c<"u"&&g.push($e(e,c[0],c[1])),g.length===0&&g.push(Vy(e,`${a}`,2));let f=g.join(": "),h=s[f]={};typeof u<"u"&&i(u,h)}};if(typeof r.children>"u")throw new Error("The root node must only contain children");return i(r.children,t),t}function dZ(r){let e=t=>{var s;if(typeof t.children>"u"){if(typeof t.value>"u")throw new Error("Assertion failed: Expected a value to be set if the children are missing");return Bc(t.value[0],t.value[1])}let i=Array.isArray(t.children)?t.children.entries():Object.entries((s=t.children)!=null?s:{}),n=Array.isArray(t.children)?[]:{};for(let[o,a]of i)n[o]=e(a);return typeof t.value>"u"?n:{value:Bc(t.value[0],t.value[1]),children:n}};return e(r)}function eTe(r,{configuration:e,stdout:t,json:i}){let n=r.map(s=>({value:s}));CZ({children:n},{configuration:e,stdout:t,json:i})}function CZ(r,{configuration:e,stdout:t,json:i,separators:n=0}){var o;if(i){let a=Array.isArray(r.children)?r.children.values():Object.values((o=r.children)!=null?o:{});for(let l of a)t.write(`${JSON.stringify(dZ(l))}
-`);return}let s=(0,hZ.asTree)(pZ(r,{configuration:e}),!1,!1);if(n>=1&&(s=s.replace(/^([├└]─)/gm,`\u2502
-$1`).replace(/^│\n/,"")),n>=2)for(let a=0;a<2;++a)s=s.replace(/^([│ ].{2}[├│ ].{2}[^\n]+\n)(([│ ]).{2}[├└].{2}[^\n]*\n[│ ].{2}[│ ].{2}[├└]─)/gm,`$1$3  \u2502
-$2`).replace(/^│\n/,"");if(n>=3)throw new Error("Only the first two levels are accepted by treeUtils.emitTree");t.write(s)}var mZ=J("crypto"),kN=Pe(J("fs"));var tTe=8,Rt=class{constructor(e,{configuration:t,immutable:i=t.get("enableImmutableCache"),check:n=!1}){this.markedFiles=new Set;this.mutexes=new Map;this.cacheId=`-${(0,mZ.randomBytes)(8).toString("hex")}.tmp`;this.configuration=t,this.cwd=e,this.immutable=i,this.check=n;let s=t.get("cacheKeyOverride");if(s!==null)this.cacheKey=`${s}`;else{let o=t.get("compressionLevel"),a=o!==Xl?`c${o}`:"";this.cacheKey=[tTe,a].join("")}}static async find(e,{immutable:t,check:i}={}){let n=new Rt(e.get("cacheFolder"),{configuration:e,immutable:t,check:i});return await n.setup(),n}get mirrorCwd(){if(!this.configuration.get("enableMirror"))return null;let e=`${this.configuration.get("globalFolder")}/cache`;return e!==this.cwd?e:null}getVersionFilename(e){return`${xf(e)}-${this.cacheKey}.zip`}getChecksumFilename(e,t){let n=rTe(t).slice(0,10);return`${xf(e)}-${n}.zip`}getLocatorPath(e,t,i={}){var s;return this.mirrorCwd===null||((s=i.unstablePackages)==null?void 0:s.has(e.locatorHash))?x.resolve(this.cwd,this.getVersionFilename(e)):t===null||DN(t)!==this.cacheKey?null:x.resolve(this.cwd,this.getChecksumFilename(e,t))}getLocatorMirrorPath(e){let t=this.mirrorCwd;return t!==null?x.resolve(t,this.getVersionFilename(e)):null}async setup(){if(!this.configuration.get("enableGlobalCache"))if(this.immutable){if(!await M.existsPromise(this.cwd))throw new at(56,"Cache path does not exist.")}else{await M.mkdirPromise(this.cwd,{recursive:!0});let e=x.resolve(this.cwd,".gitignore");await M.changeFilePromise(e,`/.gitignore
-*.flock
-*.tmp
-`)}(this.mirrorCwd||!this.immutable)&&await M.mkdirPromise(this.mirrorCwd||this.cwd,{recursive:!0})}async fetchPackageFromCache(e,t,{onHit:i,onMiss:n,loader:s,...o}){var W;let a=this.getLocatorMirrorPath(e),l=new $t,c=()=>{let _=new Wr(null,{libzip:D}),A=x.join(Oe.root,qD(e));return _.mkdirSync(A,{recursive:!0}),_.writeJsonSync(x.join(A,xt.manifest),{name:Ot(e),mocked:!0}),_},u=async(_,A=null)=>{var ge;if(A===null&&((ge=o.unstablePackages)==null?void 0:ge.has(e.locatorHash)))return{isValid:!0,hash:null};let Ae=!o.skipIntegrityCheck||!t?`${this.cacheKey}/${await bw(_)}`:t;if(A!==null){let re=!o.skipIntegrityCheck||!t?`${this.cacheKey}/${await bw(A)}`:t;if(Ae!==re)throw new at(18,"The remote archive doesn't match the local checksum - has the local cache been corrupted?")}if(t!==null&&Ae!==t){let re;switch(this.check?re="throw":DN(t)!==DN(Ae)?re="update":re=this.configuration.get("checksumBehavior"),re){case"ignore":return{isValid:!0,hash:t};case"update":return{isValid:!0,hash:Ae};case"reset":return{isValid:!1,hash:t};default:case"throw":throw new at(18,"The remote archive doesn't match the expected checksum")}}return{isValid:!0,hash:Ae}},g=async _=>{if(!s)throw new Error(`Cache check required but no loader configured for ${mt(this.configuration,e)}`);let A=await s(),Ae=A.getRealPath();A.saveAndClose(),await M.chmodPromise(Ae,420);let ge=await u(_,Ae);if(!ge.isValid)throw new Error("Assertion failed: Expected a valid checksum");return ge.hash},f=async()=>{if(a===null||!await M.existsPromise(a)){let _=await s(),A=_.getRealPath();return _.saveAndClose(),{source:"loader",path:A}}return{source:"mirror",path:a}},h=async()=>{if(!s)throw new Error(`Cache entry required but missing for ${mt(this.configuration,e)}`);if(this.immutable)throw new at(56,`Cache entry required but missing for ${mt(this.configuration,e)}`);let{path:_,source:A}=await f(),Ae=(await u(_)).hash,ge=this.getLocatorPath(e,Ae,o);if(!ge)throw new Error("Assertion failed: Expected the cache path to be available");let re=[];A!=="mirror"&&a!==null&&re.push(async()=>{let F=`${a}${this.cacheId}`;await M.copyFilePromise(_,F,kN.default.constants.COPYFILE_FICLONE),await M.chmodPromise(F,420),await M.renamePromise(F,a)}),(!o.mirrorWriteOnly||a===null)&&re.push(async()=>{let F=`${ge}${this.cacheId}`;await M.copyFilePromise(_,F,kN.default.constants.COPYFILE_FICLONE),await M.chmodPromise(F,420),await M.renamePromise(F,ge)});let O=o.mirrorWriteOnly&&a!=null?a:ge;return await Promise.all(re.map(F=>F())),[!1,O,Ae]},p=async()=>{let A=(async()=>{var ue;let Ae=this.getLocatorPath(e,t,o),ge=Ae!==null?await l.existsPromise(Ae):!1,re=!!((ue=o.mockedPackages)!=null&&ue.has(e.locatorHash))&&(!this.check||!ge),O=re||ge,F=O?i:n;if(F&&F(),O){let pe=null,ke=Ae;if(!re)if(this.check)pe=await g(ke);else{let Fe=await u(ke);if(Fe.isValid)pe=Fe.hash;else return h()}return[re,ke,pe]}else return h()})();this.mutexes.set(e.locatorHash,A);try{return await A}finally{this.mutexes.delete(e.locatorHash)}};for(let _;_=this.mutexes.get(e.locatorHash);)await _;let[C,y,B]=await p();this.markedFiles.add(y);let v,D=await an(),T=C?()=>c():()=>new Wr(y,{baseFs:l,libzip:D,readOnly:!0}),H=new Sg(()=>Jx(()=>v=T(),_=>`Failed to open the cache entry for ${mt(this.configuration,e)}: ${_}`),x),j=new So(y,{baseFs:H,pathUtils:x}),$=()=>{v==null||v.discardAndClose()},V=(W=o.unstablePackages)!=null&&W.has(e.locatorHash)?null:B;return[j,$,V]}};function DN(r){let e=r.indexOf("/");return e!==-1?r.slice(0,e):null}function rTe(r){let e=r.indexOf("/");return e!==-1?r.slice(e+1):r}var O0=(t=>(t[t.SCRIPT=0]="SCRIPT",t[t.SHELLCODE=1]="SHELLCODE",t))(O0||{});var ra=class extends vi{constructor({configuration:t,stdout:i,suggestInstall:n=!0}){super();this.errorCount=0;Xd(this,{configuration:t}),this.configuration=t,this.stdout=i,this.suggestInstall=n}static async start(t,i){let n=new this(t);try{await i(n)}catch(s){n.reportExceptionOnce(s)}finally{await n.finalize()}return n}hasErrors(){return this.errorCount>0}exitCode(){return this.hasErrors()?1:0}reportCacheHit(t){}reportCacheMiss(t){}startSectionSync(t,i){return i()}async startSectionPromise(t,i){return await i()}startTimerSync(t,i,n){return(typeof i=="function"?i:n)()}async startTimerPromise(t,i,n){return await(typeof i=="function"?i:n)()}async startCacheReport(t){return await t()}reportSeparator(){}reportInfo(t,i){}reportWarning(t,i){}reportError(t,i){this.errorCount+=1,this.stdout.write(`${$e(this.configuration,"\u27A4","redBright")} ${this.formatNameWithHyperlink(t)}: ${i}
-`)}reportProgress(t){return{...Promise.resolve().then(async()=>{for await(let{}of t);}),stop:()=>{}}}reportJson(t){}async finalize(){this.errorCount>0&&(this.stdout.write(`
-`),this.stdout.write(`${$e(this.configuration,"\u27A4","redBright")} Errors happened when preparing the environment required to run this command.
-`),this.suggestInstall&&this.stdout.write(`${$e(this.configuration,"\u27A4","redBright")} This might be caused by packages being missing from the lockfile, in which case running "yarn install" might help.
-`))}formatNameWithHyperlink(t){return qR(t,{configuration:this.configuration,json:!1})}};var X0=J("crypto");function rA(){}rA.prototype={diff:function(e,t){var i=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{},n=i.callback;typeof i=="function"&&(n=i,i={}),this.options=i;var s=this;function o(C){return n?(setTimeout(function(){n(void 0,C)},0),!0):C}e=this.castInput(e),t=this.castInput(t),e=this.removeEmpty(this.tokenize(e)),t=this.removeEmpty(this.tokenize(t));var a=t.length,l=e.length,c=1,u=a+l;i.maxEditLength&&(u=Math.min(u,i.maxEditLength));var g=[{newPos:-1,components:[]}],f=this.extractCommon(g[0],t,e,0);if(g[0].newPos+1>=a&&f+1>=l)return o([{value:this.join(t),count:t.length}]);function h(){for(var C=-1*c;C<=c;C+=2){var y=void 0,B=g[C-1],v=g[C+1],D=(v?v.newPos:0)-C;B&&(g[C-1]=void 0);var T=B&&B.newPos+1<a,H=v&&0<=D&&D<l;if(!T&&!H){g[C]=void 0;continue}if(!T||H&&B.newPos<v.newPos?(y=nTe(v),s.pushComponent(y.components,void 0,!0)):(y=B,y.newPos++,s.pushComponent(y.components,!0,void 0)),D=s.extractCommon(y,t,e,C),y.newPos+1>=a&&D+1>=l)return o(iTe(s,y.components,t,e,s.useLongestToken));g[C]=y}c++}if(n)(function C(){setTimeout(function(){if(c>u)return n();h()||C()},0)})();else for(;c<=u;){var p=h();if(p)return p}},pushComponent:function(e,t,i){var n=e[e.length-1];n&&n.added===t&&n.removed===i?e[e.length-1]={count:n.count+1,added:t,removed:i}:e.push({count:1,added:t,removed:i})},extractCommon:function(e,t,i,n){for(var s=t.length,o=i.length,a=e.newPos,l=a-n,c=0;a+1<s&&l+1<o&&this.equals(t[a+1],i[l+1]);)a++,l++,c++;return c&&e.components.push({count:c}),e.newPos=a,l},equals:function(e,t){return this.options.comparator?this.options.comparator(e,t):e===t||this.options.ignoreCase&&e.toLowerCase()===t.toLowerCase()},removeEmpty:function(e){for(var t=[],i=0;i<e.length;i++)e[i]&&t.push(e[i]);return t},castInput:function(e){return e},tokenize:function(e){return e.split("")},join:function(e){return e.join("")}};function iTe(r,e,t,i,n){for(var s=0,o=e.length,a=0,l=0;s<o;s++){var c=e[s];if(c.removed){if(c.value=r.join(i.slice(l,l+c.count)),l+=c.count,s&&e[s-1].added){var g=e[s-1];e[s-1]=e[s],e[s]=g}}else{if(!c.added&&n){var u=t.slice(a,a+c.count);u=u.map(function(h,p){var C=i[l+p];return C.length>h.length?C:h}),c.value=r.join(u)}else c.value=r.join(t.slice(a,a+c.count));a+=c.count,c.added||(l+=c.count)}}var f=e[o-1];return o>1&&typeof f.value=="string"&&(f.added||f.removed)&&r.equals("",f.value)&&(e[o-2].value+=f.value,e.pop()),e}function nTe(r){return{newPos:r.newPos,components:r.components.slice(0)}}var Mat=new rA;var EZ=/^[A-Za-z\xC0-\u02C6\u02C8-\u02D7\u02DE-\u02FF\u1E00-\u1EFF]+$/,IZ=/\S/,yZ=new rA;yZ.equals=function(r,e){return this.options.ignoreCase&&(r=r.toLowerCase(),e=e.toLowerCase()),r===e||this.options.ignoreWhitespace&&!IZ.test(r)&&!IZ.test(e)};yZ.tokenize=function(r){for(var e=r.split(/([^\S\r\n]+|[()[\]{}'"\r\n]|\b)/),t=0;t<e.length-1;t++)!e[t+1]&&e[t+2]&&EZ.test(e[t])&&EZ.test(e[t+2])&&(e[t]+=e[t+2],e.splice(t+1,2),t--);return e};var LN=new rA;LN.tokenize=function(r){var e=[],t=r.split(/(\n|\r\n)/);t[t.length-1]||t.pop();for(var i=0;i<t.length;i++){var n=t[i];i%2&&!this.options.newlineIsToken?e[e.length-1]+=n:(this.options.ignoreWhitespace&&(n=n.trim()),e.push(n))}return e};function sTe(r,e,t){return LN.diff(r,e,t)}var oTe=new rA;oTe.tokenize=function(r){return r.split(/(\S.+?[.!?])(?=\s+|$)/)};var aTe=new rA;aTe.tokenize=function(r){return r.split(/([{}:;,]|\s+)/)};function M0(r){return typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?M0=function(e){return typeof e}:M0=function(e){return e&&typeof Symbol=="function"&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},M0(r)}function RN(r){return ATe(r)||lTe(r)||cTe(r)||uTe()}function ATe(r){if(Array.isArray(r))return FN(r)}function lTe(r){if(typeof Symbol<"u"&&Symbol.iterator in Object(r))return Array.from(r)}function cTe(r,e){if(!!r){if(typeof r=="string")return FN(r,e);var t=Object.prototype.toString.call(r).slice(8,-1);if(t==="Object"&&r.constructor&&(t=r.constructor.name),t==="Map"||t==="Set")return Array.from(r);if(t==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t))return FN(r,e)}}function FN(r,e){(e==null||e>r.length)&&(e=r.length);for(var t=0,i=new Array(e);t<e;t++)i[t]=r[t];return i}function uTe(){throw new TypeError(`Invalid attempt to spread non-iterable instance.
-In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`)}var gTe=Object.prototype.toString,ZC=new rA;ZC.useLongestToken=!0;ZC.tokenize=LN.tokenize;ZC.castInput=function(r){var e=this.options,t=e.undefinedReplacement,i=e.stringifyReplacer,n=i===void 0?function(s,o){return typeof o>"u"?t:o}:i;return typeof r=="string"?r:JSON.stringify(NN(r,null,null,n),n,"  ")};ZC.equals=function(r,e){return rA.prototype.equals.call(ZC,r.replace(/,([\r\n])/g,"$1"),e.replace(/,([\r\n])/g,"$1"))};function NN(r,e,t,i,n){e=e||[],t=t||[],i&&(r=i(n,r));var s;for(s=0;s<e.length;s+=1)if(e[s]===r)return t[s];var o;if(gTe.call(r)==="[object Array]"){for(e.push(r),o=new Array(r.length),t.push(o),s=0;s<r.length;s+=1)o[s]=NN(r[s],e,t,i,n);return e.pop(),t.pop(),o}if(r&&r.toJSON&&(r=r.toJSON()),M0(r)==="object"&&r!==null){e.push(r),o={},t.push(o);var a=[],l;for(l in r)r.hasOwnProperty(l)&&a.push(l);for(a.sort(),s=0;s<a.length;s+=1)l=a[s],o[l]=NN(r[l],e,t,i,l);e.pop(),t.pop()}else o=r;return o}var TN=new rA;TN.tokenize=function(r){return r.slice()};TN.join=TN.removeEmpty=function(r){return r};function wZ(r,e,t,i,n,s,o){o||(o={}),typeof o.context>"u"&&(o.context=4);var a=sTe(t,i,o);if(!a)return;a.push({value:"",lines:[]});function l(B){return B.map(function(v){return" "+v})}for(var c=[],u=0,g=0,f=[],h=1,p=1,C=function(v){var D=a[v],T=D.lines||D.value.replace(/\n$/,"").split(`
-`);if(D.lines=T,D.added||D.removed){var H;if(!u){var j=a[v-1];u=h,g=p,j&&(f=o.context>0?l(j.lines.slice(-o.context)):[],u-=f.length,g-=f.length)}(H=f).push.apply(H,RN(T.map(function(re){return(D.added?"+":"-")+re}))),D.added?p+=T.length:h+=T.length}else{if(u)if(T.length<=o.context*2&&v<a.length-2){var $;($=f).push.apply($,RN(l(T)))}else{var V,W=Math.min(T.length,o.context);(V=f).push.apply(V,RN(l(T.slice(0,W))));var _={oldStart:u,oldLines:h-u+W,newStart:g,newLines:p-g+W,lines:f};if(v>=a.length-2&&T.length<=o.context){var A=/\n$/.test(t),Ae=/\n$/.test(i),ge=T.length==0&&f.length>_.oldLines;!A&&ge&&t.length>0&&f.splice(_.oldLines,0,"\\ No newline at end of file"),(!A&&!ge||!Ae)&&f.push("\\ No newline at end of file")}c.push(_),u=0,g=0,f=[]}h+=T.length,p+=T.length}},y=0;y<a.length;y++)C(y);return{oldFileName:r,newFileName:e,oldHeader:n,newHeader:s,hunks:c}}var Z0=Pe(x$()),_0=Pe(Jg()),F$=Pe(Xr()),zN=J("util"),WN=Pe(J("v8")),VN=Pe(J("zlib"));var UMe=[[/^(git(?:\+(?:https|ssh))?:\/\/.*(?:\.git)?)#(.*)$/,(r,e,t,i)=>`${t}#commit=${i}`],[/^https:\/\/((?:[^/]+?)@)?codeload\.github\.com\/([^/]+\/[^/]+)\/tar\.gz\/([0-9a-f]+)$/,(r,e,t="",i,n)=>`https://${t}github.com/${i}.git#commit=${n}`],[/^https:\/\/((?:[^/]+?)@)?github\.com\/([^/]+\/[^/]+?)(?:\.git)?#([0-9a-f]+)$/,(r,e,t="",i,n)=>`https://${t}github.com/${i}.git#commit=${n}`],[/^https?:\/\/[^/]+\/(?:[^/]+\/)*(?:@.+(?:\/|(?:%2f)))?([^/]+)\/(?:-|download)\/\1-[^/]+\.tgz(?:#|$)/,r=>`npm:${r}`],[/^https:\/\/npm\.pkg\.github\.com\/download\/(?:@[^/]+)\/(?:[^/]+)\/(?:[^/]+)\/(?:[0-9a-f]+)(?:#|$)/,r=>`npm:${r}`],[/^https:\/\/npm\.fontawesome\.com\/(?:@[^/]+)\/([^/]+)\/-\/([^/]+)\/\1-\2.tgz(?:#|$)/,r=>`npm:${r}`],[/^https?:\/\/[^/]+\/.*\/(@[^/]+)\/([^/]+)\/-\/\1\/\2-(?:[.\d\w-]+)\.tgz(?:#|$)/,(r,e)=>xw({protocol:"npm:",source:null,selector:r,params:{__archiveUrl:e}})],[/^[^/]+\.tgz#[0-9a-f]+$/,r=>`npm:${r}`]],W0=class{constructor(e){this.resolver=e;this.resolutions=null}async setup(e,{report:t}){let i=x.join(e.cwd,e.configuration.get("lockfileFilename"));if(!M.existsSync(i))return;let n=await M.readFilePromise(i,"utf8"),s=yi(n);if(Object.prototype.hasOwnProperty.call(s,"__metadata"))return;let o=this.resolutions=new Map;for(let a of Object.keys(s)){let l=aC(a);if(!l){t.reportWarning(14,`Failed to parse the string "${a}" into a proper descriptor`);continue}let c=so(l.range)?_t(l,`npm:${l.range}`):l,{version:u,resolved:g}=s[a];if(!g)continue;let f;for(let[p,C]of UMe){let y=g.match(p);if(y){f=C(u,...y);break}}if(!f){t.reportWarning(14,`${tr(e.configuration,c)}: Only some patterns can be imported from legacy lockfiles (not "${g}")`);continue}let h=c;try{let p=vf(c.range),C=aC(p.selector,!0);C&&(h=C)}catch{}o.set(c.descriptorHash,nn(h,f))}}supportsDescriptor(e,t){return this.resolutions?this.resolutions.has(e.descriptorHash):!1}supportsLocator(e,t){return!1}shouldPersistResolution(e,t){throw new Error("Assertion failed: This resolver doesn't support resolving locators to packages")}bindDescriptor(e,t,i){return e}getResolutionDependencies(e,t){return[]}async getCandidates(e,t,i){if(!this.resolutions)throw new Error("Assertion failed: The resolution store should have been setup");let n=this.resolutions.get(e.descriptorHash);if(!n)throw new Error("Assertion failed: The resolution should have been registered");return await this.resolver.getCandidates(HD(n),t,i)}async getSatisfying(e,t,i){return null}async resolve(e,t){throw new Error("Assertion failed: This resolver doesn't support resolving locators to packages")}};var z0=class{constructor(e){this.resolver=e}supportsDescriptor(e,t){return!!(t.project.storedResolutions.get(e.descriptorHash)||t.project.originalPackages.has(Sw(e).locatorHash))}supportsLocator(e,t){return!!(t.project.originalPackages.has(e.locatorHash)&&!t.project.lockfileNeedsRefresh)}shouldPersistResolution(e,t){throw new Error("The shouldPersistResolution method shouldn't be called on the lockfile resolver, which would always answer yes")}bindDescriptor(e,t,i){return e}getResolutionDependencies(e,t){return this.resolver.getResolutionDependencies(e,t)}async getCandidates(e,t,i){let n=i.project.originalPackages.get(Sw(e).locatorHash);if(n)return[n];let s=i.project.storedResolutions.get(e.descriptorHash);if(!s)throw new Error("Expected the resolution to have been successful - resolution not found");if(n=i.project.originalPackages.get(s),!n)throw new Error("Expected the resolution to have been successful - package not found");return[n]}async getSatisfying(e,t,i){return null}async resolve(e,t){let i=t.project.originalPackages.get(e.locatorHash);if(!i)throw new Error("The lockfile resolver isn't meant to resolve packages - they should already have been stored into a cache");return i}};var V0=class{constructor(e){this.resolver=e}supportsDescriptor(e,t){return this.resolver.supportsDescriptor(e,t)}supportsLocator(e,t){return this.resolver.supportsLocator(e,t)}shouldPersistResolution(e,t){return this.resolver.shouldPersistResolution(e,t)}bindDescriptor(e,t,i){return this.resolver.bindDescriptor(e,t,i)}getResolutionDependencies(e,t){return this.resolver.getResolutionDependencies(e,t)}async getCandidates(e,t,i){throw new at(20,`This package doesn't seem to be present in your lockfile; run "yarn install" to update the lockfile`)}async getSatisfying(e,t,i){throw new at(20,`This package doesn't seem to be present in your lockfile; run "yarn install" to update the lockfile`)}async resolve(e,t){throw new at(20,`This package doesn't seem to be present in your lockfile; run "yarn install" to update the lockfile`)}};var ti=class extends vi{reportCacheHit(e){}reportCacheMiss(e){}startSectionSync(e,t){return t()}async startSectionPromise(e,t){return await t()}startTimerSync(e,t,i){return(typeof t=="function"?t:i)()}async startTimerPromise(e,t,i){return await(typeof t=="function"?t:i)()}async startCacheReport(e){return await e()}reportSeparator(){}reportInfo(e,t){}reportWarning(e,t){}reportError(e,t){}reportProgress(e){return{...Promise.resolve().then(async()=>{for await(let{}of e);}),stop:()=>{}}}reportJson(e){}async finalize(){}};var P$=Pe(MD());var Qh=class{constructor(e,{project:t}){this.workspacesCwds=new Set;this.dependencies=new Map;this.project=t,this.cwd=e}async setup(){var s;this.manifest=(s=await ot.tryFind(this.cwd))!=null?s:new ot,this.relativeCwd=x.relative(this.project.cwd,this.cwd)||Oe.dot;let e=this.manifest.name?this.manifest.name:Jo(null,`${this.computeCandidateName()}-${rn(this.relativeCwd).substring(0,6)}`),t=this.manifest.version?this.manifest.version:"0.0.0";this.locator=nn(e,t),this.anchoredDescriptor=_t(this.locator,`${Yr.protocol}${this.relativeCwd}`),this.anchoredLocator=nn(this.locator,`${Yr.protocol}${this.relativeCwd}`);let i=this.manifest.workspaceDefinitions.map(({pattern:o})=>o);if(i.length===0)return;let n=await(0,P$.default)(i,{cwd:K.fromPortablePath(this.cwd),expandDirectories:!1,onlyDirectories:!0,onlyFiles:!1,ignore:["**/node_modules","**/.git","**/.yarn"]});n.sort(),await n.reduce(async(o,a)=>{let l=x.resolve(this.cwd,K.toPortablePath(a)),c=await M.existsPromise(x.join(l,"package.json"));await o,c&&this.workspacesCwds.add(l)},Promise.resolve())}accepts(e){var o;let t=e.indexOf(":"),i=t!==-1?e.slice(0,t+1):null,n=t!==-1?e.slice(t+1):e;if(i===Yr.protocol&&x.normalize(n)===this.relativeCwd||i===Yr.protocol&&(n==="*"||n==="^"||n==="~"))return!0;let s=so(n);return s?i===Yr.protocol?s.test((o=this.manifest.version)!=null?o:"0.0.0"):this.project.configuration.get("enableTransparentWorkspaces")&&this.manifest.version!==null?s.test(this.manifest.version):!1:!1}computeCandidateName(){return this.cwd===this.project.cwd?"root-workspace":`${x.basename(this.cwd)}`||"unnamed-workspace"}getRecursiveWorkspaceDependencies({dependencies:e=ot.hardDependencies}={}){let t=new Set,i=n=>{for(let s of e)for(let o of n.manifest[s].values()){let a=this.project.tryWorkspaceByDescriptor(o);a===null||t.has(a)||(t.add(a),i(a))}};return i(this),t}getRecursiveWorkspaceDependents({dependencies:e=ot.hardDependencies}={}){let t=new Set,i=n=>{for(let s of this.project.workspaces)e.some(a=>[...s.manifest[a].values()].some(l=>{let c=this.project.tryWorkspaceByDescriptor(l);return c!==null&&oC(c.anchoredLocator,n.anchoredLocator)}))&&!t.has(s)&&(t.add(s),i(s))};return i(this),t}getRecursiveWorkspaceChildren(){let e=[];for(let t of this.workspacesCwds){let i=this.project.workspacesByCwd.get(t);i&&e.push(i,...i.getRecursiveWorkspaceChildren())}return e}async persistManifest(){let e={};this.manifest.exportTo(e);let t=x.join(this.cwd,ot.fileName),i=`${JSON.stringify(e,null,this.manifest.indent)}
-`;await M.changeFilePromise(t,i,{automaticNewlines:!0}),this.manifest.raw=e}};var D$=6,HMe=1,GMe=/ *, */g,k$=/\/$/,YMe=32,jMe=(0,zN.promisify)(VN.default.gzip),qMe=(0,zN.promisify)(VN.default.gunzip),ts=(t=>(t.UpdateLockfile="update-lockfile",t.SkipBuild="skip-build",t))(ts||{}),JN={restoreInstallersCustomData:["installersCustomData"],restoreResolutions:["accessibleLocators","conditionalLocators","disabledLocators","optionalBuilds","storedDescriptors","storedResolutions","storedPackages","lockFileChecksum"],restoreBuildState:["storedBuildState"]},R$=r=>rn(`${HMe}`,r),je=class{constructor(e,{configuration:t}){this.resolutionAliases=new Map;this.workspaces=[];this.workspacesByCwd=new Map;this.workspacesByIdent=new Map;this.storedResolutions=new Map;this.storedDescriptors=new Map;this.storedPackages=new Map;this.storedChecksums=new Map;this.storedBuildState=new Map;this.accessibleLocators=new Set;this.conditionalLocators=new Set;this.disabledLocators=new Set;this.originalPackages=new Map;this.optionalBuilds=new Set;this.lockfileNeedsRefresh=!1;this.peerRequirements=new Map;this.installersCustomData=new Map;this.lockFileChecksum=null;this.installStateChecksum=null;this.configuration=t,this.cwd=e}static async find(e,t){var p,C,y;if(!e.projectCwd)throw new Qe(`No project found in ${t}`);let i=e.projectCwd,n=t,s=null;for(;s!==e.projectCwd;){if(s=n,M.existsSync(x.join(s,xt.manifest))){i=s;break}n=x.dirname(s)}let o=new je(e.projectCwd,{configuration:e});(p=ye.telemetry)==null||p.reportProject(o.cwd),await o.setupResolutions(),await o.setupWorkspaces(),(C=ye.telemetry)==null||C.reportWorkspaceCount(o.workspaces.length),(y=ye.telemetry)==null||y.reportDependencyCount(o.workspaces.reduce((B,v)=>B+v.manifest.dependencies.size+v.manifest.devDependencies.size,0));let a=o.tryWorkspaceByCwd(i);if(a)return{project:o,workspace:a,locator:a.anchoredLocator};let l=await o.findLocatorForLocation(`${i}/`,{strict:!0});if(l)return{project:o,locator:l,workspace:null};let c=$e(e,o.cwd,Ue.PATH),u=$e(e,x.relative(o.cwd,i),Ue.PATH),g=`- If ${c} isn't intended to be a project, remove any yarn.lock and/or package.json file there.`,f=`- If ${c} is intended to be a project, it might be that you forgot to list ${u} in its workspace configuration.`,h=`- Finally, if ${c} is fine and you intend ${u} to be treated as a completely separate project (not even a workspace), create an empty yarn.lock file in it.`;throw new Qe(`The nearest package directory (${$e(e,i,Ue.PATH)}) doesn't seem to be part of the project declared in ${$e(e,o.cwd,Ue.PATH)}.
-
-${[g,f,h].join(`
-`)}`)}async setupResolutions(){var i;this.storedResolutions=new Map,this.storedDescriptors=new Map,this.storedPackages=new Map,this.lockFileChecksum=null;let e=x.join(this.cwd,this.configuration.get("lockfileFilename")),t=this.configuration.get("defaultLanguageName");if(M.existsSync(e)){let n=await M.readFilePromise(e,"utf8");this.lockFileChecksum=R$(n);let s=yi(n);if(s.__metadata){let o=s.__metadata.version,a=s.__metadata.cacheKey;this.lockfileNeedsRefresh=o<D$;for(let l of Object.keys(s)){if(l==="__metadata")continue;let c=s[l];if(typeof c.resolution>"u")throw new Error(`Assertion failed: Expected the lockfile entry to have a resolution field (${l})`);let u=Dc(c.resolution,!0),g=new ot;g.load(c,{yamlCompatibilityMode:!0});let f=g.version,h=g.languageName||t,p=c.linkType.toUpperCase(),C=(i=c.conditions)!=null?i:null,y=g.dependencies,B=g.peerDependencies,v=g.dependenciesMeta,D=g.peerDependenciesMeta,T=g.bin;if(c.checksum!=null){let j=typeof a<"u"&&!c.checksum.includes("/")?`${a}/${c.checksum}`:c.checksum;this.storedChecksums.set(u.locatorHash,j)}let H={...u,version:f,languageName:h,linkType:p,conditions:C,dependencies:y,peerDependencies:B,dependenciesMeta:v,peerDependenciesMeta:D,bin:T};this.originalPackages.set(H.locatorHash,H);for(let j of l.split(GMe)){let $=WA(j);this.storedDescriptors.set($.descriptorHash,$),this.storedResolutions.set($.descriptorHash,u.locatorHash)}}}}}async setupWorkspaces(){this.workspaces=[],this.workspacesByCwd=new Map,this.workspacesByIdent=new Map;let e=new Set,t=(0,_0.default)(4),i=async(n,s)=>{if(e.has(s))return n;e.add(s);let o=new Qh(s,{project:this});await t(()=>o.setup());let a=n.then(()=>{this.addWorkspace(o);let l=this.storedPackages.get(o.anchoredLocator.locatorHash);l&&(o.dependencies=l.dependencies)});return Array.from(o.workspacesCwds).reduce(i,a)};await i(Promise.resolve(),this.cwd)}addWorkspace(e){let t=this.workspacesByIdent.get(e.locator.identHash);if(typeof t<"u")throw new Error(`Duplicate workspace name ${Ai(this.configuration,e.locator)}: ${K.fromPortablePath(e.cwd)} conflicts with ${K.fromPortablePath(t.cwd)}`);this.workspaces.push(e),this.workspacesByCwd.set(e.cwd,e),this.workspacesByIdent.set(e.locator.identHash,e)}get topLevelWorkspace(){return this.getWorkspaceByCwd(this.cwd)}tryWorkspaceByCwd(e){x.isAbsolute(e)||(e=x.resolve(this.cwd,e)),e=x.normalize(e).replace(/\/+$/,"");let t=this.workspacesByCwd.get(e);return t||null}getWorkspaceByCwd(e){let t=this.tryWorkspaceByCwd(e);if(!t)throw new Error(`Workspace not found (${e})`);return t}tryWorkspaceByFilePath(e){let t=null;for(let i of this.workspaces)x.relative(i.cwd,e).startsWith("../")||t&&t.cwd.length>=i.cwd.length||(t=i);return t||null}getWorkspaceByFilePath(e){let t=this.tryWorkspaceByFilePath(e);if(!t)throw new Error(`Workspace not found (${e})`);return t}tryWorkspaceByIdent(e){let t=this.workspacesByIdent.get(e.identHash);return typeof t>"u"?null:t}getWorkspaceByIdent(e){let t=this.tryWorkspaceByIdent(e);if(!t)throw new Error(`Workspace not found (${Ai(this.configuration,e)})`);return t}tryWorkspaceByDescriptor(e){let t=this.tryWorkspaceByIdent(e);return t===null||(JA(e)&&(e=iC(e)),!t.accepts(e.range))?null:t}getWorkspaceByDescriptor(e){let t=this.tryWorkspaceByDescriptor(e);if(t===null)throw new Error(`Workspace not found (${tr(this.configuration,e)})`);return t}tryWorkspaceByLocator(e){let t=this.tryWorkspaceByIdent(e);return t===null||(qo(e)&&(e=nC(e)),t.locator.locatorHash!==e.locatorHash&&t.anchoredLocator.locatorHash!==e.locatorHash)?null:t}getWorkspaceByLocator(e){let t=this.tryWorkspaceByLocator(e);if(!t)throw new Error(`Workspace not found (${mt(this.configuration,e)})`);return t}refreshWorkspaceDependencies(){for(let e of this.workspaces){let t=this.storedPackages.get(e.anchoredLocator.locatorHash);if(!t)throw new Error(`Assertion failed: Expected workspace ${lC(this.configuration,e)} (${$e(this.configuration,x.join(e.cwd,xt.manifest),Ue.PATH)}) to have been resolved. Run "yarn install" to update the lockfile`);e.dependencies=new Map(t.dependencies)}}deleteDescriptor(e){this.storedResolutions.delete(e),this.storedDescriptors.delete(e)}deleteLocator(e){this.originalPackages.delete(e),this.storedPackages.delete(e),this.accessibleLocators.delete(e)}forgetResolution(e){if("descriptorHash"in e){let t=this.storedResolutions.get(e.descriptorHash);this.deleteDescriptor(e.descriptorHash);let i=new Set(this.storedResolutions.values());typeof t<"u"&&!i.has(t)&&this.deleteLocator(t)}if("locatorHash"in e){this.deleteLocator(e.locatorHash);for(let[t,i]of this.storedResolutions)i===e.locatorHash&&this.deleteDescriptor(t)}}forgetTransientResolutions(){let e=this.configuration.makeResolver(),t=new Map;for(let[i,n]of this.storedResolutions.entries()){let s=t.get(n);s||t.set(n,s=new Set),s.add(i)}for(let i of this.originalPackages.values()){let n;try{n=e.shouldPersistResolution(i,{project:this,resolver:e})}catch{n=!1}if(!n){this.deleteLocator(i.locatorHash);let s=t.get(i.locatorHash);if(s){t.delete(i.locatorHash);for(let o of s)this.deleteDescriptor(o)}}}}forgetVirtualResolutions(){for(let e of this.storedPackages.values())for(let[t,i]of e.dependencies)JA(i)&&e.dependencies.set(t,iC(i))}getDependencyMeta(e,t){let i={},s=this.topLevelWorkspace.manifest.dependenciesMeta.get(Ot(e));if(!s)return i;let o=s.get(null);if(o&&Object.assign(i,o),t===null||!F$.default.valid(t))return i;for(let[a,l]of s)a!==null&&a===t&&Object.assign(i,l);return i}async findLocatorForLocation(e,{strict:t=!1}={}){let i=new ti,n=this.configuration.getLinkers(),s={project:this,report:i};for(let o of n){let a=await o.findPackageLocator(e,s);if(a){if(t&&(await o.findPackageLocation(a,s)).replace(k$,"")!==e.replace(k$,""))continue;return a}}return null}async resolveEverything(e){if(!this.workspacesByCwd||!this.workspacesByIdent)throw new Error("Workspaces must have been setup before calling this function");this.forgetVirtualResolutions(),e.lockfileOnly||this.forgetTransientResolutions();let t=e.resolver||this.configuration.makeResolver(),i=new W0(t);await i.setup(this,{report:e.report});let n=e.lockfileOnly?[new V0(t)]:[i,t],s=new kf([new z0(t),...n]),o=this.configuration.makeFetcher(),a=e.lockfileOnly?{project:this,report:e.report,resolver:s}:{project:this,report:e.report,resolver:s,fetchOptions:{project:this,cache:e.cache,checksums:this.storedChecksums,report:e.report,fetcher:o,cacheOptions:{mirrorWriteOnly:!0}}},l=new Map,c=new Map,u=new Map,g=new Map,f=new Map,h=new Map,p=this.topLevelWorkspace.anchoredLocator,C=new Set,y=[],B=$D(),v=this.configuration.getSupportedArchitectures();await e.report.startProgressPromise(vi.progressViaTitle(),async W=>{let _=async O=>{let F=await df(async()=>await s.resolve(O,a),ke=>`${mt(this.configuration,O)}: ${ke}`);if(!oC(O,F))throw new Error(`Assertion failed: The locator cannot be changed by the resolver (went from ${mt(this.configuration,O)} to ${mt(this.configuration,F)})`);g.set(F.locatorHash,F);let ue=this.configuration.normalizePackage(F);for(let[ke,Fe]of ue.dependencies){let Ne=await this.configuration.reduceHook(le=>le.reduceDependency,Fe,this,ue,Fe,{resolver:s,resolveOptions:a});if(!sC(Fe,Ne))throw new Error("Assertion failed: The descriptor ident cannot be changed through aliases");let oe=s.bindDescriptor(Ne,O,a);ue.dependencies.set(ke,oe)}let pe=io([...ue.dependencies.values()].map(ke=>re(ke)));return y.push(pe),pe.catch(()=>{}),c.set(ue.locatorHash,ue),ue},A=async O=>{let F=f.get(O.locatorHash);if(typeof F<"u")return F;let ue=Promise.resolve().then(()=>_(O));return f.set(O.locatorHash,ue),ue},Ae=async(O,F)=>{let ue=await re(F);return l.set(O.descriptorHash,O),u.set(O.descriptorHash,ue.locatorHash),ue},ge=async O=>{W.setTitle(tr(this.configuration,O));let F=this.resolutionAliases.get(O.descriptorHash);if(typeof F<"u")return Ae(O,this.storedDescriptors.get(F));let ue=s.getResolutionDependencies(O,a),pe=new Map(await io(ue.map(async Ne=>{let oe=s.bindDescriptor(Ne,p,a),le=await re(oe);return C.add(le.locatorHash),[Ne.descriptorHash,le]}))),Fe=(await df(async()=>await s.getCandidates(O,pe,a),Ne=>`${tr(this.configuration,O)}: ${Ne}`))[0];if(typeof Fe>"u")throw new Error(`${tr(this.configuration,O)}: No candidates found`);return l.set(O.descriptorHash,O),u.set(O.descriptorHash,Fe.locatorHash),A(Fe)},re=O=>{let F=h.get(O.descriptorHash);if(typeof F<"u")return F;l.set(O.descriptorHash,O);let ue=Promise.resolve().then(()=>ge(O));return h.set(O.descriptorHash,ue),ue};for(let O of this.workspaces){let F=O.anchoredDescriptor;y.push(re(F))}for(;y.length>0;){let O=[...y];y.length=0,await io(O)}});let D=new Set(this.resolutionAliases.values()),T=new Set(c.keys()),H=new Set,j=new Map;JMe({project:this,report:e.report,accessibleLocators:H,volatileDescriptors:D,optionalBuilds:T,peerRequirements:j,allDescriptors:l,allResolutions:u,allPackages:c});for(let W of C)T.delete(W);for(let W of D)l.delete(W),u.delete(W);let $=new Set,V=new Set;for(let W of c.values())W.conditions!=null&&(!T.has(W.locatorHash)||(kw(W,v)||(kw(W,B)&&e.report.reportWarningOnce(77,`${mt(this.configuration,W)}: Your current architecture (${process.platform}-${process.arch}) is supported by this package, but is missing from the ${$e(this.configuration,"supportedArchitectures",xi.SETTING)} setting`),V.add(W.locatorHash)),$.add(W.locatorHash)));this.storedResolutions=u,this.storedDescriptors=l,this.storedPackages=c,this.accessibleLocators=H,this.conditionalLocators=$,this.disabledLocators=V,this.originalPackages=g,this.optionalBuilds=T,this.peerRequirements=j,this.refreshWorkspaceDependencies()}async fetchEverything({cache:e,report:t,fetcher:i,mode:n}){let s={mockedPackages:this.disabledLocators,unstablePackages:this.conditionalLocators},o=i||this.configuration.makeFetcher(),a={checksums:this.storedChecksums,project:this,cache:e,fetcher:o,report:t,cacheOptions:s},l=Array.from(new Set(bn(this.storedResolutions.values(),[f=>{let h=this.storedPackages.get(f);if(!h)throw new Error("Assertion failed: The locator should have been registered");return Es(h)}])));n==="update-lockfile"&&(l=l.filter(f=>!this.storedChecksums.has(f)));let c=!1,u=vi.progressViaCounter(l.length);await t.reportProgress(u);let g=(0,_0.default)(YMe);if(await t.startCacheReport(async()=>{await io(l.map(f=>g(async()=>{let h=this.storedPackages.get(f);if(!h)throw new Error("Assertion failed: The locator should have been registered");if(qo(h))return;let p;try{p=await o.fetch(h,a)}catch(C){C.message=`${mt(this.configuration,h)}: ${C.message}`,t.reportExceptionOnce(C),c=C;return}p.checksum!=null?this.storedChecksums.set(h.locatorHash,p.checksum):this.storedChecksums.delete(h.locatorHash),p.releaseFs&&p.releaseFs()}).finally(()=>{u.tick()})))}),c)throw c}async linkEverything({cache:e,report:t,fetcher:i,mode:n}){var Ae,ge,re;let s={mockedPackages:this.disabledLocators,unstablePackages:this.conditionalLocators,skipIntegrityCheck:!0},o=i||this.configuration.makeFetcher(),a={checksums:this.storedChecksums,project:this,cache:e,fetcher:o,report:t,skipIntegrityCheck:!0,cacheOptions:s},l=this.configuration.getLinkers(),c={project:this,report:t},u=new Map(l.map(O=>{let F=O.makeInstaller(c),ue=F.getCustomDataKey(),pe=this.installersCustomData.get(ue);return typeof pe<"u"&&F.attachCustomData(pe),[O,F]})),g=new Map,f=new Map,h=new Map,p=new Map(await io([...this.accessibleLocators].map(async O=>{let F=this.storedPackages.get(O);if(!F)throw new Error("Assertion failed: The locator should have been registered");return[O,await o.fetch(F,a)]}))),C=[];for(let O of this.accessibleLocators){let F=this.storedPackages.get(O);if(typeof F>"u")throw new Error("Assertion failed: The locator should have been registered");let ue=p.get(F.locatorHash);if(typeof ue>"u")throw new Error("Assertion failed: The fetch result should have been registered");let pe=[],ke=Ne=>{pe.push(Ne)},Fe=this.tryWorkspaceByLocator(F);if(Fe!==null){let Ne=[],{scripts:oe}=Fe.manifest;for(let Be of["preinstall","install","postinstall"])oe.has(Be)&&Ne.push([0,Be]);try{for(let[Be,fe]of u)if(Be.supportsPackage(F,c)&&(await fe.installPackage(F,ue,{holdFetchResult:ke})).buildDirective!==null)throw new Error("Assertion failed: Linkers can't return build directives for workspaces; this responsibility befalls to the Yarn core")}finally{pe.length===0?(Ae=ue.releaseFs)==null||Ae.call(ue):C.push(io(pe).catch(()=>{}).then(()=>{var Be;(Be=ue.releaseFs)==null||Be.call(ue)}))}let le=x.join(ue.packageFs.getRealPath(),ue.prefixPath);f.set(F.locatorHash,le),!qo(F)&&Ne.length>0&&h.set(F.locatorHash,{directives:Ne,buildLocations:[le]})}else{let Ne=l.find(Be=>Be.supportsPackage(F,c));if(!Ne)throw new at(12,`${mt(this.configuration,F)} isn't supported by any available linker`);let oe=u.get(Ne);if(!oe)throw new Error("Assertion failed: The installer should have been registered");let le;try{le=await oe.installPackage(F,ue,{holdFetchResult:ke})}finally{pe.length===0?(ge=ue.releaseFs)==null||ge.call(ue):C.push(io(pe).then(()=>{}).then(()=>{var Be;(Be=ue.releaseFs)==null||Be.call(ue)}))}g.set(F.locatorHash,Ne),f.set(F.locatorHash,le.packageLocation),le.buildDirective&&le.buildDirective.length>0&&le.packageLocation&&h.set(F.locatorHash,{directives:le.buildDirective,buildLocations:[le.packageLocation]})}}let y=new Map;for(let O of this.accessibleLocators){let F=this.storedPackages.get(O);if(!F)throw new Error("Assertion failed: The locator should have been registered");let ue=this.tryWorkspaceByLocator(F)!==null,pe=async(ke,Fe)=>{let Ne=f.get(F.locatorHash);if(typeof Ne>"u")throw new Error(`Assertion failed: The package (${mt(this.configuration,F)}) should have been registered`);let oe=[];for(let le of F.dependencies.values()){let Be=this.storedResolutions.get(le.descriptorHash);if(typeof Be>"u")throw new Error(`Assertion failed: The resolution (${tr(this.configuration,le)}, from ${mt(this.configuration,F)})should have been registered`);let fe=this.storedPackages.get(Be);if(typeof fe>"u")throw new Error(`Assertion failed: The package (${Be}, resolved from ${tr(this.configuration,le)}) should have been registered`);let ae=this.tryWorkspaceByLocator(fe)===null?g.get(Be):null;if(typeof ae>"u")throw new Error(`Assertion failed: The package (${Be}, resolved from ${tr(this.configuration,le)}) should have been registered`);ae===ke||ae===null?f.get(fe.locatorHash)!==null&&oe.push([le,fe]):!ue&&Ne!==null&&hf(y,Be).push(Ne)}Ne!==null&&await Fe.attachInternalDependencies(F,oe)};if(ue)for(let[ke,Fe]of u)ke.supportsPackage(F,c)&&await pe(ke,Fe);else{let ke=g.get(F.locatorHash);if(!ke)throw new Error("Assertion failed: The linker should have been found");let Fe=u.get(ke);if(!Fe)throw new Error("Assertion failed: The installer should have been registered");await pe(ke,Fe)}}for(let[O,F]of y){let ue=this.storedPackages.get(O);if(!ue)throw new Error("Assertion failed: The package should have been registered");let pe=g.get(ue.locatorHash);if(!pe)throw new Error("Assertion failed: The linker should have been found");let ke=u.get(pe);if(!ke)throw new Error("Assertion failed: The installer should have been registered");await ke.attachExternalDependents(ue,F)}let B=new Map;for(let O of u.values()){let F=await O.finalizeInstall();for(let ue of(re=F==null?void 0:F.records)!=null?re:[])h.set(ue.locatorHash,{directives:ue.buildDirective,buildLocations:ue.buildLocations});typeof(F==null?void 0:F.customData)<"u"&&B.set(O.getCustomDataKey(),F.customData)}if(this.installersCustomData=B,await io(C),n==="skip-build")return;let v=new Set(this.storedPackages.keys()),D=new Set(h.keys());for(let O of D)v.delete(O);let T=(0,X0.createHash)("sha512");T.update(process.versions.node),await this.configuration.triggerHook(O=>O.globalHashGeneration,this,O=>{T.update("\0"),T.update(O)});let H=T.digest("hex"),j=new Map,$=O=>{let F=j.get(O.locatorHash);if(typeof F<"u")return F;let ue=this.storedPackages.get(O.locatorHash);if(typeof ue>"u")throw new Error("Assertion failed: The package should have been registered");let pe=(0,X0.createHash)("sha512");pe.update(O.locatorHash),j.set(O.locatorHash,"<recursive>");for(let ke of ue.dependencies.values()){let Fe=this.storedResolutions.get(ke.descriptorHash);if(typeof Fe>"u")throw new Error(`Assertion failed: The resolution (${tr(this.configuration,ke)}) should have been registered`);let Ne=this.storedPackages.get(Fe);if(typeof Ne>"u")throw new Error("Assertion failed: The package should have been registered");pe.update($(Ne))}return F=pe.digest("hex"),j.set(O.locatorHash,F),F},V=(O,F)=>{let ue=(0,X0.createHash)("sha512");ue.update(H),ue.update($(O));for(let pe of F)ue.update(pe);return ue.digest("hex")},W=new Map,_=!1,A=O=>{let F=new Set([O.locatorHash]);for(let ue of F){let pe=this.storedPackages.get(ue);if(!pe)throw new Error("Assertion failed: The package should have been registered");for(let ke of pe.dependencies.values()){let Fe=this.storedResolutions.get(ke.descriptorHash);if(!Fe)throw new Error(`Assertion failed: The resolution (${tr(this.configuration,ke)}) should have been registered`);if(Fe!==O.locatorHash&&D.has(Fe))return!1;let Ne=this.storedPackages.get(Fe);if(!Ne)throw new Error("Assertion failed: The package should have been registered");let oe=this.tryWorkspaceByLocator(Ne);if(oe){if(oe.anchoredLocator.locatorHash!==O.locatorHash&&D.has(oe.anchoredLocator.locatorHash))return!1;F.add(oe.anchoredLocator.locatorHash)}F.add(Fe)}}return!0};for(;D.size>0;){let O=D.size,F=[];for(let ue of D){let pe=this.storedPackages.get(ue);if(!pe)throw new Error("Assertion failed: The package should have been registered");if(!A(pe))continue;let ke=h.get(pe.locatorHash);if(!ke)throw new Error("Assertion failed: The build directive should have been registered");let Fe=V(pe,ke.buildLocations);if(this.storedBuildState.get(pe.locatorHash)===Fe){W.set(pe.locatorHash,Fe),D.delete(ue);continue}_||(await this.persistInstallStateFile(),_=!0),this.storedBuildState.has(pe.locatorHash)?t.reportInfo(8,`${mt(this.configuration,pe)} must be rebuilt because its dependency tree changed`):t.reportInfo(7,`${mt(this.configuration,pe)} must be built because it never has been before or the last one failed`);let Ne=ke.buildLocations.map(async oe=>{if(!x.isAbsolute(oe))throw new Error(`Assertion failed: Expected the build location to be absolute (not ${oe})`);for(let[le,Be]of ke.directives){let fe=`# This file contains the result of Yarn building a package (${Es(pe)})
-`;switch(le){case 0:fe+=`# Script name: ${Be}
-`;break;case 1:fe+=`# Script code: ${Be}
-`;break}let ae=null;if(!await M.mktempPromise(async ne=>{let Y=x.join(ne,"build.log"),{stdout:he,stderr:ie}=this.configuration.getSubprocessStreams(Y,{header:fe,prefix:mt(this.configuration,pe),report:t}),de;try{switch(le){case 0:de=await TB(pe,Be,[],{cwd:oe,project:this,stdin:ae,stdout:he,stderr:ie});break;case 1:de=await JR(pe,Be,[],{cwd:oe,project:this,stdin:ae,stdout:he,stderr:ie});break}}catch(Pt){ie.write(Pt.stack),de=1}if(he.end(),ie.end(),de===0)return!0;M.detachTemp(ne);let _e=`${mt(this.configuration,pe)} couldn't be built successfully (exit code ${$e(this.configuration,de,Ue.NUMBER)}, logs can be found here: ${$e(this.configuration,Y,Ue.PATH)})`;return this.optionalBuilds.has(pe.locatorHash)?(t.reportInfo(9,_e),!0):(t.reportError(9,_e),!1)}))return!1}return!0});F.push(...Ne,Promise.allSettled(Ne).then(oe=>{D.delete(ue),oe.every(le=>le.status==="fulfilled"&&le.value===!0)&&W.set(pe.locatorHash,Fe)}))}if(await io(F),O===D.size){let ue=Array.from(D).map(pe=>{let ke=this.storedPackages.get(pe);if(!ke)throw new Error("Assertion failed: The package should have been registered");return mt(this.configuration,ke)}).join(", ");t.reportError(3,`Some packages have circular dependencies that make their build order unsatisfiable - as a result they won't be built (affected packages are: ${ue})`);break}}this.storedBuildState=W}async install(e){var a,l;let t=this.configuration.get("nodeLinker");(a=ye.telemetry)==null||a.reportInstall(t),await e.report.startTimerPromise("Project validation",{skipIfEmpty:!0},async()=>{await this.configuration.triggerHook(c=>c.validateProject,this,{reportWarning:e.report.reportWarning.bind(e.report),reportError:e.report.reportError.bind(e.report)})});for(let c of this.configuration.packageExtensions.values())for(let[,u]of c)for(let g of u)g.status="inactive";let i=x.join(this.cwd,this.configuration.get("lockfileFilename")),n=null;if(e.immutable)try{n=await M.readFilePromise(i,"utf8")}catch(c){throw c.code==="ENOENT"?new at(28,"The lockfile would have been created by this install, which is explicitly forbidden."):c}await e.report.startTimerPromise("Resolution step",async()=>{await this.resolveEverything(e)}),await e.report.startTimerPromise("Post-resolution validation",{skipIfEmpty:!0},async()=>{for(let[,c]of this.configuration.packageExtensions)for(let[,u]of c)for(let g of u)if(g.userProvided){let f=$e(this.configuration,g,Ue.PACKAGE_EXTENSION);switch(g.status){case"inactive":e.report.reportWarning(68,`${f}: No matching package in the dependency tree; you may not need this rule anymore.`);break;case"redundant":e.report.reportWarning(69,`${f}: This rule seems redundant when applied on the original package; the extension may have been applied upstream.`);break}}if(n!==null){let c=Vl(n,this.generateLockfile());if(c!==n){let u=wZ(i,i,n,c,void 0,void 0,{maxEditLength:100});if(u){e.report.reportSeparator();for(let g of u.hunks){e.report.reportInfo(null,`@@ -${g.oldStart},${g.oldLines} +${g.newStart},${g.newLines} @@`);for(let f of g.lines)f.startsWith("+")?e.report.reportError(28,$e(this.configuration,f,Ue.ADDED)):f.startsWith("-")?e.report.reportError(28,$e(this.configuration,f,Ue.REMOVED)):e.report.reportInfo(null,$e(this.configuration,f,"grey"))}e.report.reportSeparator()}throw new at(28,"The lockfile would have been modified by this install, which is explicitly forbidden.")}}});for(let c of this.configuration.packageExtensions.values())for(let[,u]of c)for(let g of u)g.userProvided&&g.status==="active"&&((l=ye.telemetry)==null||l.reportPackageExtension(Bc(g,Ue.PACKAGE_EXTENSION)));await e.report.startTimerPromise("Fetch step",async()=>{await this.fetchEverything(e),(typeof e.persistProject>"u"||e.persistProject)&&e.mode!=="update-lockfile"&&await this.cacheCleanup(e)});let s=e.immutable?[...new Set(this.configuration.get("immutablePatterns"))].sort():[],o=await Promise.all(s.map(async c=>Qw(c,{cwd:this.cwd})));(typeof e.persistProject>"u"||e.persistProject)&&await this.persist(),await e.report.startTimerPromise("Link step",async()=>{if(e.mode==="update-lockfile"){e.report.reportWarning(73,`Skipped due to ${$e(this.configuration,"mode=update-lockfile",Ue.CODE)}`);return}await this.linkEverything(e);let c=await Promise.all(s.map(async u=>Qw(u,{cwd:this.cwd})));for(let u=0;u<s.length;++u)o[u]!==c[u]&&e.report.reportError(64,`The checksum for ${s[u]} has been modified by this install, which is explicitly forbidden.`)}),await this.persistInstallStateFile(),await this.configuration.triggerHook(c=>c.afterAllInstalled,this,e)}generateLockfile(){let e=new Map;for(let[n,s]of this.storedResolutions.entries()){let o=e.get(s);o||e.set(s,o=new Set),o.add(n)}let t={};t.__metadata={version:D$,cacheKey:void 0};for(let[n,s]of e.entries()){let o=this.originalPackages.get(n);if(!o)continue;let a=[];for(let f of s){let h=this.storedDescriptors.get(f);if(!h)throw new Error("Assertion failed: The descriptor should have been registered");a.push(h)}let l=a.map(f=>Sn(f)).sort().join(", "),c=new ot;c.version=o.linkType==="HARD"?o.version:"0.0.0-use.local",c.languageName=o.languageName,c.dependencies=new Map(o.dependencies),c.peerDependencies=new Map(o.peerDependencies),c.dependenciesMeta=new Map(o.dependenciesMeta),c.peerDependenciesMeta=new Map(o.peerDependenciesMeta),c.bin=new Map(o.bin);let u,g=this.storedChecksums.get(o.locatorHash);if(typeof g<"u"){let f=g.indexOf("/");if(f===-1)throw new Error("Assertion failed: Expected the checksum to reference its cache key");let h=g.slice(0,f),p=g.slice(f+1);typeof t.__metadata.cacheKey>"u"&&(t.__metadata.cacheKey=h),h===t.__metadata.cacheKey?u=p:u=g}t[l]={...c.exportTo({},{compatibilityMode:!1}),linkType:o.linkType.toLowerCase(),resolution:Es(o),checksum:u,conditions:o.conditions||void 0}}return`${[`# This file is generated by running "yarn install" inside your project.
-`,`# Manual changes might be lost - proceed with caution!
-`].join("")}
-`+ba(t)}async persistLockfile(){let e=x.join(this.cwd,this.configuration.get("lockfileFilename")),t="";try{t=await M.readFilePromise(e,"utf8")}catch{}let i=this.generateLockfile(),n=Vl(t,i);n!==t&&(await M.writeFilePromise(e,n),this.lockFileChecksum=R$(n),this.lockfileNeedsRefresh=!1)}async persistInstallStateFile(){let e=[];for(let o of Object.values(JN))e.push(...o);let t=(0,Z0.default)(this,e),i=WN.default.serialize(t),n=rn(i);if(this.installStateChecksum===n)return;let s=this.configuration.get("installStatePath");await M.mkdirPromise(x.dirname(s),{recursive:!0}),await M.writeFilePromise(s,await jMe(i)),this.installStateChecksum=n}async restoreInstallState({restoreInstallersCustomData:e=!0,restoreResolutions:t=!0,restoreBuildState:i=!0}={}){let n=this.configuration.get("installStatePath"),s;try{let o=await qMe(await M.readFilePromise(n));s=WN.default.deserialize(o),this.installStateChecksum=rn(o)}catch{t&&await this.applyLightResolution();return}e&&typeof s.installersCustomData<"u"&&(this.installersCustomData=s.installersCustomData),i&&Object.assign(this,(0,Z0.default)(s,JN.restoreBuildState)),t&&(s.lockFileChecksum===this.lockFileChecksum?(Object.assign(this,(0,Z0.default)(s,JN.restoreResolutions)),this.refreshWorkspaceDependencies()):await this.applyLightResolution())}async applyLightResolution(){await this.resolveEverything({lockfileOnly:!0,report:new ti}),await this.persistInstallStateFile()}async persist(){let e=(0,_0.default)(4);await Promise.all([this.persistLockfile(),...this.workspaces.map(t=>e(()=>t.persistManifest()))])}async cacheCleanup({cache:e,report:t}){if(this.configuration.get("enableGlobalCache"))return;let i=new Set([".gitignore"]);if(!ZD(e.cwd,this.cwd)||!await M.existsPromise(e.cwd))return;let n=this.configuration.get("preferAggregateCacheInfo"),s=0,o=null;for(let a of await M.readdirPromise(e.cwd)){if(i.has(a))continue;let l=x.resolve(e.cwd,a);e.markedFiles.has(l)||(o=a,e.immutable?t.reportError(56,`${$e(this.configuration,x.basename(l),"magenta")} appears to be unused and would be marked for deletion, but the cache is immutable`):(n?s+=1:t.reportInfo(19,`${$e(this.configuration,x.basename(l),"magenta")} appears to be unused - removing`),await M.removePromise(l)))}n&&s!==0&&t.reportInfo(19,s>1?`${s} packages appeared to be unused and were removed`:`${o} appeared to be unused and was removed`),e.markedFiles.clear()}};function JMe({project:r,allDescriptors:e,allResolutions:t,allPackages:i,accessibleLocators:n=new Set,optionalBuilds:s=new Set,peerRequirements:o=new Map,volatileDescriptors:a=new Set,report:l}){var V;let c=new Map,u=[],g=new Map,f=new Map,h=new Map,p=new Map,C=new Map,y=new Map(r.workspaces.map(W=>{let _=W.anchoredLocator.locatorHash,A=i.get(_);if(typeof A>"u")throw new Error("Assertion failed: The workspace should have an associated package");return[_,rC(A)]})),B=()=>{let W=M.mktempSync(),_=x.join(W,"stacktrace.log"),A=String(u.length+1).length,Ae=u.map((ge,re)=>`${`${re+1}.`.padStart(A," ")} ${Es(ge)}
-`).join("");throw M.writeFileSync(_,Ae),M.detachTemp(W),new at(45,`Encountered a stack overflow when resolving peer dependencies; cf ${K.fromPortablePath(_)}`)},v=W=>{let _=t.get(W.descriptorHash);if(typeof _>"u")throw new Error("Assertion failed: The resolution should have been registered");let A=i.get(_);if(!A)throw new Error("Assertion failed: The package could not be found");return A},D=(W,_,A,{top:Ae,optional:ge})=>{u.length>1e3&&B(),u.push(_);let re=T(W,_,A,{top:Ae,optional:ge});return u.pop(),re},T=(W,_,A,{top:Ae,optional:ge})=>{if(n.has(_.locatorHash))return;n.add(_.locatorHash),ge||s.delete(_.locatorHash);let re=i.get(_.locatorHash);if(!re)throw new Error(`Assertion failed: The package (${mt(r.configuration,_)}) should have been registered`);let O=[],F=[],ue=[],pe=[],ke=[];for(let Ne of Array.from(re.dependencies.values())){if(re.peerDependencies.has(Ne.identHash)&&re.locatorHash!==Ae)continue;if(JA(Ne))throw new Error("Assertion failed: Virtual packages shouldn't be encountered when virtualizing a branch");a.delete(Ne.descriptorHash);let oe=ge;if(!oe){let Y=re.dependenciesMeta.get(Ot(Ne));if(typeof Y<"u"){let he=Y.get(null);typeof he<"u"&&he.optional&&(oe=!0)}}let le=t.get(Ne.descriptorHash);if(!le)throw new Error(`Assertion failed: The resolution (${tr(r.configuration,Ne)}) should have been registered`);let Be=y.get(le)||i.get(le);if(!Be)throw new Error(`Assertion failed: The package (${le}, resolved from ${tr(r.configuration,Ne)}) should have been registered`);if(Be.peerDependencies.size===0){D(Ne,Be,new Map,{top:Ae,optional:oe});continue}let fe,ae,qe=new Set,ne;F.push(()=>{fe=GD(Ne,_.locatorHash),ae=YD(Be,_.locatorHash),re.dependencies.delete(Ne.identHash),re.dependencies.set(fe.identHash,fe),t.set(fe.descriptorHash,ae.locatorHash),e.set(fe.descriptorHash,fe),i.set(ae.locatorHash,ae),O.push([Be,fe,ae])}),ue.push(()=>{var Y;ne=new Map;for(let he of ae.peerDependencies.values()){let ie=re.dependencies.get(he.identHash);if(!ie&&sC(_,he)&&(W.identHash===_.identHash?ie=W:(ie=_t(_,W.range),e.set(ie.descriptorHash,ie),t.set(ie.descriptorHash,_.locatorHash),a.delete(ie.descriptorHash))),(!ie||ie.range==="missing:")&&ae.dependencies.has(he.identHash)){ae.peerDependencies.delete(he.identHash);continue}ie||(ie=_t(he,"missing:")),ae.dependencies.set(ie.identHash,ie),JA(ie)&&wc(h,ie.descriptorHash).add(ae.locatorHash),g.set(ie.identHash,ie),ie.range==="missing:"&&qe.add(ie.identHash),ne.set(he.identHash,(Y=A.get(he.identHash))!=null?Y:ae.locatorHash)}ae.dependencies=new Map(bn(ae.dependencies,([he,ie])=>Ot(ie)))}),pe.push(()=>{if(!i.has(ae.locatorHash))return;let Y=c.get(Be.locatorHash);typeof Y=="number"&&Y>=2&&B();let he=c.get(Be.locatorHash),ie=typeof he<"u"?he+1:1;c.set(Be.locatorHash,ie),D(fe,ae,ne,{top:Ae,optional:oe}),c.set(Be.locatorHash,ie-1)}),ke.push(()=>{let Y=re.dependencies.get(Ne.identHash);if(typeof Y>"u")throw new Error("Assertion failed: Expected the peer dependency to have been turned into a dependency");let he=t.get(Y.descriptorHash);if(typeof he>"u")throw new Error("Assertion failed: Expected the descriptor to be registered");if(wc(C,he).add(_.locatorHash),!!i.has(ae.locatorHash)){for(let ie of ae.peerDependencies.values()){let de=ne.get(ie.identHash);if(typeof de>"u")throw new Error("Assertion failed: Expected the peer dependency ident to be registered");hf(pf(p,de),Ot(ie)).push(ae.locatorHash)}for(let ie of qe)ae.dependencies.delete(ie)}})}for(let Ne of[...F,...ue])Ne();let Fe;do{Fe=!0;for(let[Ne,oe,le]of O){let Be=pf(f,Ne.locatorHash),fe=rn(...[...le.dependencies.values()].map(Y=>{let he=Y.range!=="missing:"?t.get(Y.descriptorHash):"missing:";if(typeof he>"u")throw new Error(`Assertion failed: Expected the resolution for ${tr(r.configuration,Y)} to have been registered`);return he===Ae?`${he} (top)`:he}),oe.identHash),ae=Be.get(fe);if(typeof ae>"u"){Be.set(fe,oe);continue}if(ae===oe)continue;i.delete(le.locatorHash),e.delete(oe.descriptorHash),t.delete(oe.descriptorHash),n.delete(le.locatorHash);let qe=h.get(oe.descriptorHash)||[],ne=[re.locatorHash,...qe];h.delete(oe.descriptorHash);for(let Y of ne){let he=i.get(Y);typeof he>"u"||(he.dependencies.get(oe.identHash).descriptorHash!==ae.descriptorHash&&(Fe=!1),he.dependencies.set(oe.identHash,ae))}}}while(!Fe);for(let Ne of[...pe,...ke])Ne()};for(let W of r.workspaces){let _=W.anchoredLocator;a.delete(W.anchoredDescriptor.descriptorHash),D(W.anchoredDescriptor,_,new Map,{top:_.locatorHash,optional:!1})}let H;(A=>(A[A.NotProvided=0]="NotProvided",A[A.NotCompatible=1]="NotCompatible"))(H||(H={}));let j=[];for(let[W,_]of C){let A=i.get(W);if(typeof A>"u")throw new Error("Assertion failed: Expected the root to be registered");let Ae=p.get(W);if(!(typeof Ae>"u"))for(let ge of _){let re=i.get(ge);if(!(typeof re>"u"))for(let[O,F]of Ae){let ue=tn(O);if(re.peerDependencies.has(ue.identHash))continue;let pe=`p${rn(ge,O,W).slice(0,5)}`;o.set(pe,{subject:ge,requested:ue,rootRequester:W,allRequesters:F});let ke=A.dependencies.get(ue.identHash);if(typeof ke<"u"){let Fe=v(ke),Ne=(V=Fe.version)!=null?V:"0.0.0",oe=new Set;for(let Be of F){let fe=i.get(Be);if(typeof fe>"u")throw new Error("Assertion failed: Expected the link to be registered");let ae=fe.peerDependencies.get(ue.identHash);if(typeof ae>"u")throw new Error("Assertion failed: Expected the ident to be registered");oe.add(ae.range)}[...oe].every(Be=>{if(Be.startsWith(Yr.protocol)){if(!r.tryWorkspaceByLocator(Fe))return!1;Be=Be.slice(Yr.protocol.length),(Be==="^"||Be==="~")&&(Be="*")}return kc(Ne,Be)})||j.push({type:1,subject:re,requested:ue,requester:A,version:Ne,hash:pe,requirementCount:F.length})}else{let Fe=A.peerDependenciesMeta.get(O);Fe!=null&&Fe.optional||j.push({type:0,subject:re,requested:ue,requester:A,hash:pe})}}}}let $=[W=>jD(W.subject),W=>Ot(W.requested),W=>`${W.type}`];l==null||l.startSectionSync({reportFooter:()=>{l.reportWarning(0,`Some peer dependencies are incorrectly met; run ${$e(r.configuration,"yarn explain peer-requirements <hash>",Ue.CODE)} for details, where ${$e(r.configuration,"<hash>",Ue.CODE)} is the six-letter p-prefixed code`)},skipIfEmpty:!0},()=>{for(let W of bn(j,$))switch(W.type){case 0:l.reportWarning(2,`${mt(r.configuration,W.subject)} doesn't provide ${Ai(r.configuration,W.requested)} (${$e(r.configuration,W.hash,Ue.CODE)}), requested by ${Ai(r.configuration,W.requester)}`);break;case 1:{let _=W.requirementCount>1?"and some of its descendants request":"requests";l.reportWarning(60,`${mt(r.configuration,W.subject)} provides ${Ai(r.configuration,W.requested)} (${$e(r.configuration,W.hash,Ue.CODE)}) with version ${AC(r.configuration,W.version)}, which doesn't satisfy what ${Ai(r.configuration,W.requester)} ${_}`)}break}})}var Sh=class{constructor(e,t){this.values=new Map;this.hits=new Map;this.enumerators=new Map;this.configuration=e;let i=this.getRegistryPath();this.isNew=!M.existsSync(i),this.sendReport(t),this.startBuffer()}reportVersion(e){this.reportValue("version",e.replace(/-git\..*/,"-git"))}reportCommandName(e){this.reportValue("commandName",e||"<none>")}reportPluginName(e){this.reportValue("pluginName",e)}reportProject(e){this.reportEnumerator("projectCount",e)}reportInstall(e){this.reportHit("installCount",e)}reportPackageExtension(e){this.reportValue("packageExtension",e)}reportWorkspaceCount(e){this.reportValue("workspaceCount",String(e))}reportDependencyCount(e){this.reportValue("dependencyCount",String(e))}reportValue(e,t){wc(this.values,e).add(t)}reportEnumerator(e,t){wc(this.enumerators,e).add(rn(t))}reportHit(e,t="*"){let i=pf(this.hits,e),n=Ta(i,t,()=>0);i.set(t,n+1)}getRegistryPath(){let e=this.configuration.get("globalFolder");return x.join(e,"telemetry.json")}sendReport(e){var u,g,f;let t=this.getRegistryPath(),i;try{i=M.readJsonSync(t)}catch{i={}}let n=Date.now(),s=this.configuration.get("telemetryInterval")*24*60*60*1e3,a=((u=i.lastUpdate)!=null?u:n+s+Math.floor(s*Math.random()))+s;if(a>n&&i.lastUpdate!=null)return;try{M.mkdirSync(x.dirname(t),{recursive:!0}),M.writeJsonSync(t,{lastUpdate:n})}catch{return}if(a>n||!i.blocks)return;let l=`https://browser-http-intake.logs.datadoghq.eu/v1/input/${e}?ddsource=yarn`,c=h=>kR(l,h,{configuration:this.configuration}).catch(()=>{});for(let[h,p]of Object.entries((g=i.blocks)!=null?g:{})){if(Object.keys(p).length===0)continue;let C=p;C.userId=h,C.reportType="primary";for(let v of Object.keys((f=C.enumerators)!=null?f:{}))C.enumerators[v]=C.enumerators[v].length;c(C);let y=new Map,B=20;for(let[v,D]of Object.entries(C.values))D.length>0&&y.set(v,D.slice(0,B));for(;y.size>0;){let v={};v.userId=h,v.reportType="secondary",v.metrics={};for(let[D,T]of y)v.metrics[D]=T.shift(),T.length===0&&y.delete(D);c(v)}}}applyChanges(){var o,a,l,c,u,g,f,h,p;let e=this.getRegistryPath(),t;try{t=M.readJsonSync(e)}catch{t={}}let i=(o=this.configuration.get("telemetryUserId"))!=null?o:"*",n=t.blocks=(a=t.blocks)!=null?a:{},s=n[i]=(l=n[i])!=null?l:{};for(let C of this.hits.keys()){let y=s.hits=(c=s.hits)!=null?c:{},B=y[C]=(u=y[C])!=null?u:{};for(let[v,D]of this.hits.get(C))B[v]=((g=B[v])!=null?g:0)+D}for(let C of["values","enumerators"])for(let y of this[C].keys()){let B=s[C]=(f=s[C])!=null?f:{};B[y]=[...new Set([...(h=B[y])!=null?h:[],...(p=this[C].get(y))!=null?p:[]])]}M.mkdirSync(x.dirname(e),{recursive:!0}),M.writeJsonSync(e,t)}startBuffer(){process.on("exit",()=>{try{this.applyChanges()}catch{}})}};var XN=J("child_process"),N$=Pe(Ac());var ZN=J("fs");var vh=new Map([["constraints",[["constraints","query"],["constraints","source"],["constraints"]]],["exec",[]],["interactive-tools",[["search"],["upgrade-interactive"]]],["stage",[["stage"]]],["typescript",[]],["version",[["version","apply"],["version","check"],["version"]]],["workspace-tools",[["workspaces","focus"],["workspaces","foreach"]]]]);function WMe(r){let e=K.fromPortablePath(r);process.on("SIGINT",()=>{}),e?(0,XN.execFileSync)(process.execPath,[e,...process.argv.slice(2)],{stdio:"inherit",env:{...process.env,YARN_IGNORE_PATH:"1",YARN_IGNORE_CWD:"1"}}):(0,XN.execFileSync)(e,process.argv.slice(2),{stdio:"inherit",env:{...process.env,YARN_IGNORE_PATH:"1",YARN_IGNORE_CWD:"1"}})}async function $0({binaryVersion:r,pluginConfiguration:e}){async function t(){let n=new Gn({binaryLabel:"Yarn Package Manager",binaryName:"yarn",binaryVersion:r});try{await i(n)}catch(s){process.stdout.write(n.error(s)),process.exitCode=1}}async function i(n){var C,y,B,v,D;let s=process.versions.node,o=">=12 <14 || 14.2 - 14.9 || >14.10.0";if(!Ie.parseOptionalBoolean(process.env.YARN_IGNORE_NODE)&&!vt.satisfiesWithPrereleases(s,o))throw new Qe(`This tool requires a Node version compatible with ${o} (got ${s}). Upgrade Node, or set \`YARN_IGNORE_NODE=1\` in your environment.`);let l=await ye.find(K.toPortablePath(process.cwd()),e,{usePath:!0,strict:!1}),c=l.get("yarnPath"),u=l.get("ignorePath"),g=l.get("ignoreCwd"),f=K.toPortablePath(K.resolve(process.argv[1])),h=T=>M.readFilePromise(T).catch(()=>Buffer.of());if(!u&&!g&&await(async()=>c===f||Buffer.compare(...await Promise.all([h(c),h(f)]))===0)()){process.env.YARN_IGNORE_PATH="1",process.env.YARN_IGNORE_CWD="1",await i(n);return}else if(c!==null&&!u)if(!M.existsSync(c))process.stdout.write(n.error(new Error(`The "yarn-path" option has been set (in ${l.sources.get("yarnPath")}), but the specified location doesn't exist (${c}).`))),process.exitCode=1;else try{WMe(c)}catch(T){process.exitCode=T.code||1}else{u&&delete process.env.YARN_IGNORE_PATH,l.get("enableTelemetry")&&!N$.isCI&&process.stdout.isTTY&&(ye.telemetry=new Sh(l,"puba9cdc10ec5790a2cf4969dd413a47270")),(C=ye.telemetry)==null||C.reportVersion(r);for(let[$,V]of l.plugins.entries()){vh.has((B=(y=$.match(/^@yarnpkg\/plugin-(.*)$/))==null?void 0:y[1])!=null?B:"")&&((v=ye.telemetry)==null||v.reportPluginName($));for(let W of V.commands||[])n.register(W)}let H=n.process(process.argv.slice(2));H.help||(D=ye.telemetry)==null||D.reportCommandName(H.path.join(" "));let j=H.cwd;if(typeof j<"u"&&!g){let $=(0,ZN.realpathSync)(process.cwd()),V=(0,ZN.realpathSync)(j);if($!==V){process.chdir(j),await t();return}}await n.runExit(H,{cwd:K.toPortablePath(process.cwd()),plugins:e,quiet:!1,stdin:process.stdin,stdout:process.stdout,stderr:process.stderr})}}return t().catch(n=>{process.stdout.write(n.stack||n.message),process.exitCode=1}).finally(()=>M.rmtempPromise())}function T$(r){r.Command.Path=(...e)=>t=>{t.paths=t.paths||[],t.paths.push(e)};for(let e of["Array","Boolean","String","Proxy","Rest","Counter"])r.Command[e]=(...t)=>(i,n)=>{let s=r.Option[e](...t);Object.defineProperty(i,`__${n}`,{configurable:!1,enumerable:!0,get(){return s},set(o){this[n]=o}})};return r}var Nm={};ut(Nm,{BaseCommand:()=>De,WorkspaceRequiredError:()=>ct,getDynamicLibs:()=>zie,getPluginConfiguration:()=>Bb,main:()=>$0,openWorkspace:()=>Hh,pluginCommands:()=>vh});var De=class extends ve{constructor(){super(...arguments);this.cwd=z.String("--cwd",{hidden:!0})}};var ct=class extends Qe{constructor(e,t){let i=x.relative(e,t),n=x.join(e,ot.fileName);super(`This command can only be run from within a workspace of your project (${i} isn't a workspace of ${n}).`)}};var $Ye=Pe(Xr());ls();var eje=Pe(VT()),zie=()=>new Map([["@yarnpkg/cli",Nm],["@yarnpkg/core",sm],["@yarnpkg/fslib",Wp],["@yarnpkg/libzip",xC],["@yarnpkg/parsers",td],["@yarnpkg/shell",RC],["clipanion",ud],["semver",$Ye],["typanion",hn],["yup",eje]]);async function Hh(r,e){let{project:t,workspace:i}=await je.find(r,e);if(!i)throw new ct(t.cwd,e);return i}var P9e=Pe(Xr());ls();var D9e=Pe(VT());var CO={};ut(CO,{dedupeUtils:()=>Nb,default:()=>g4e,suggestUtils:()=>qh});var Wae=Pe(Ac());var Lse=Pe(Km());ls();var qh={};ut(qh,{Modifier:()=>HL,Strategy:()=>Db,Target:()=>Um,WorkspaceModifier:()=>Dse,applyModifier:()=>Rse,extractDescriptorFromPath:()=>GL,extractRangeModifier:()=>kse,fetchDescriptorFrom:()=>YL,findProjectDescriptors:()=>Tse,getModifier:()=>Hm,getSuggestedDescriptors:()=>Gm,makeWorkspaceDescriptor:()=>Nse,toWorkspaceModifier:()=>Fse});var UL=Pe(Xr()),mqe="workspace:",Um=(i=>(i.REGULAR="dependencies",i.DEVELOPMENT="devDependencies",i.PEER="peerDependencies",i))(Um||{}),HL=(i=>(i.CARET="^",i.TILDE="~",i.EXACT="",i))(HL||{}),Dse=(i=>(i.CARET="^",i.TILDE="~",i.EXACT="*",i))(Dse||{}),Db=(s=>(s.KEEP="keep",s.REUSE="reuse",s.PROJECT="project",s.LATEST="latest",s.CACHE="cache",s))(Db||{});function Hm(r,e){return r.exact?"":r.caret?"^":r.tilde?"~":e.configuration.get("defaultSemverRangePrefix")}var Eqe=/^([\^~]?)[0-9]+(?:\.[0-9]+){0,2}(?:-\S+)?$/;function kse(r,{project:e}){let t=r.match(Eqe);return t?t[1]:e.configuration.get("defaultSemverRangePrefix")}function Rse(r,e){let{protocol:t,source:i,params:n,selector:s}=P.parseRange(r.range);return UL.default.valid(s)&&(s=`${e}${r.range}`),P.makeDescriptor(r,P.makeRange({protocol:t,source:i,params:n,selector:s}))}function Fse(r){switch(r){case"^":return"^";case"~":return"~";case"":return"*";default:throw new Error(`Assertion failed: Unknown modifier: "${r}"`)}}function Nse(r,e){return P.makeDescriptor(r.anchoredDescriptor,`${mqe}${Fse(e)}`)}async function Tse(r,{project:e,target:t}){let i=new Map,n=s=>{let o=i.get(s.descriptorHash);return o||i.set(s.descriptorHash,o={descriptor:s,locators:[]}),o};for(let s of e.workspaces)if(t==="peerDependencies"){let o=s.manifest.peerDependencies.get(r.identHash);o!==void 0&&n(o).locators.push(s.anchoredLocator)}else{let o=s.manifest.dependencies.get(r.identHash),a=s.manifest.devDependencies.get(r.identHash);t==="devDependencies"?a!==void 0?n(a).locators.push(s.anchoredLocator):o!==void 0&&n(o).locators.push(s.anchoredLocator):o!==void 0?n(o).locators.push(s.anchoredLocator):a!==void 0&&n(a).locators.push(s.anchoredLocator)}return i}async function GL(r,{cwd:e,workspace:t}){return await Iqe(async i=>{x.isAbsolute(r)||(r=x.relative(t.cwd,x.resolve(e,r)),r.match(/^\.{0,2}\//)||(r=`./${r}`));let{project:n}=t,s=await YL(P.makeIdent(null,"archive"),r,{project:t.project,cache:i,workspace:t});if(!s)throw new Error("Assertion failed: The descriptor should have been found");let o=new ti,a=n.configuration.makeResolver(),l=n.configuration.makeFetcher(),c={checksums:n.storedChecksums,project:n,cache:i,fetcher:l,report:o,resolver:a},u=a.bindDescriptor(s,t.anchoredLocator,c),g=P.convertDescriptorToLocator(u),f=await l.fetch(g,c),h=await ot.find(f.prefixPath,{baseFs:f.packageFs});if(!h.name)throw new Error("Target path doesn't have a name");return P.makeDescriptor(h.name,r)})}async function Gm(r,{project:e,workspace:t,cache:i,target:n,modifier:s,strategies:o,maxResults:a=1/0}){if(!(a>=0))throw new Error(`Invalid maxResults (${a})`);if(r.range!=="unknown")return{suggestions:[{descriptor:r,name:`Use ${P.prettyDescriptor(e.configuration,r)}`,reason:"(unambiguous explicit request)"}],rejections:[]};let l=typeof t<"u"&&t!==null&&t.manifest[n].get(r.identHash)||null,c=[],u=[],g=async f=>{try{await f()}catch(h){u.push(h)}};for(let f of o){if(c.length>=a)break;switch(f){case"keep":await g(async()=>{l&&c.push({descriptor:l,name:`Keep ${P.prettyDescriptor(e.configuration,l)}`,reason:"(no changes)"})});break;case"reuse":await g(async()=>{for(let{descriptor:h,locators:p}of(await Tse(r,{project:e,target:n})).values()){if(p.length===1&&p[0].locatorHash===t.anchoredLocator.locatorHash&&o.includes("keep"))continue;let C=`(originally used by ${P.prettyLocator(e.configuration,p[0])}`;C+=p.length>1?` and ${p.length-1} other${p.length>2?"s":""})`:")",c.push({descriptor:h,name:`Reuse ${P.prettyDescriptor(e.configuration,h)}`,reason:C})}});break;case"cache":await g(async()=>{for(let h of e.storedDescriptors.values())h.identHash===r.identHash&&c.push({descriptor:h,name:`Reuse ${P.prettyDescriptor(e.configuration,h)}`,reason:"(already used somewhere in the lockfile)"})});break;case"project":await g(async()=>{if(t.manifest.name!==null&&r.identHash===t.manifest.name.identHash)return;let h=e.tryWorkspaceByIdent(r);if(h===null)return;let p=Nse(h,s);c.push({descriptor:p,name:`Attach ${P.prettyDescriptor(e.configuration,p)}`,reason:`(local workspace at ${ee.pretty(e.configuration,h.relativeCwd,ee.Type.PATH)})`})});break;case"latest":await g(async()=>{if(r.range!=="unknown")c.push({descriptor:r,name:`Use ${P.prettyRange(e.configuration,r.range)}`,reason:"(explicit range requested)"});else if(n==="peerDependencies")c.push({descriptor:P.makeDescriptor(r,"*"),name:"Use *",reason:"(catch-all peer dependency pattern)"});else if(!e.configuration.get("enableNetwork"))c.push({descriptor:null,name:"Resolve from latest",reason:ee.pretty(e.configuration,"(unavailable because enableNetwork is toggled off)","grey")});else{let h=await YL(r,"latest",{project:e,cache:i,workspace:t,preserveModifier:!1});h&&(h=Rse(h,s),c.push({descriptor:h,name:`Use ${P.prettyDescriptor(e.configuration,h)}`,reason:"(resolved from latest)"}))}});break}}return{suggestions:c.slice(0,a),rejections:u.slice(0,a)}}async function YL(r,e,{project:t,cache:i,workspace:n,preserveModifier:s=!0}){let o=P.makeDescriptor(r,e),a=new ti,l=t.configuration.makeFetcher(),c=t.configuration.makeResolver(),u={project:t,fetcher:l,cache:i,checksums:t.storedChecksums,report:a,cacheOptions:{skipIntegrityCheck:!0},skipIntegrityCheck:!0},g={...u,resolver:c,fetchOptions:u},f=c.bindDescriptor(o,n.anchoredLocator,g),h=await c.getCandidates(f,new Map,g);if(h.length===0)return null;let p=h[0],{protocol:C,source:y,params:B,selector:v}=P.parseRange(P.convertToManifestRange(p.reference));if(C===t.configuration.get("defaultProtocol")&&(C=null),UL.default.valid(v)&&s!==!1){let D=typeof s=="string"?s:o.range;v=kse(D,{project:t})+v}return P.makeDescriptor(p,P.makeRange({protocol:C,source:y,params:B,selector:v}))}async function Iqe(r){return await M.mktempPromise(async e=>{let t=ye.create(e);return t.useWithSource(e,{enableMirror:!1,compressionLevel:0},e,{overwrite:!0}),await r(new Rt(e,{configuration:t,check:!1,immutable:!1}))})}var Au=class extends De{constructor(){super(...arguments);this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.exact=z.Boolean("-E,--exact",!1,{description:"Don't use any semver modifier on the resolved range"});this.tilde=z.Boolean("-T,--tilde",!1,{description:"Use the `~` semver modifier on the resolved range"});this.caret=z.Boolean("-C,--caret",!1,{description:"Use the `^` semver modifier on the resolved range"});this.dev=z.Boolean("-D,--dev",!1,{description:"Add a package as a dev dependency"});this.peer=z.Boolean("-P,--peer",!1,{description:"Add a package as a peer dependency"});this.optional=z.Boolean("-O,--optional",!1,{description:"Add / upgrade a package to an optional regular / peer dependency"});this.preferDev=z.Boolean("--prefer-dev",!1,{description:"Add / upgrade a package to a dev dependency"});this.interactive=z.Boolean("-i,--interactive",{description:"Reuse the specified package from other workspaces in the project"});this.cached=z.Boolean("--cached",!1,{description:"Reuse the highest version already used somewhere within the project"});this.mode=z.String("--mode",{description:"Change what artifacts installs generate",validator:Zi(ts)});this.silent=z.Boolean("--silent",{hidden:!0});this.packages=z.Rest()}async execute(){var y;let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd),s=await Rt.find(t);if(!n)throw new ct(i.cwd,this.context.cwd);await i.restoreInstallState({restoreResolutions:!1});let o=(y=this.interactive)!=null?y:t.get("preferInteractive"),a=Hm(this,i),l=[...o?["reuse"]:[],"project",...this.cached?["cache"]:[],"latest"],c=o?1/0:1,u=await Promise.all(this.packages.map(async B=>{let v=B.match(/^\.{0,2}\//)?await GL(B,{cwd:this.context.cwd,workspace:n}):P.tryParseDescriptor(B),D=B.match(/^(https?:|git@github)/);if(D)throw new Qe(`It seems you are trying to add a package using a ${ee.pretty(t,`${D[0]}...`,xi.RANGE)} url; we now require package names to be explicitly specified.
-Try running the command again with the package name prefixed: ${ee.pretty(t,"yarn add",xi.CODE)} ${ee.pretty(t,P.makeDescriptor(P.makeIdent(null,"my-package"),`${D[0]}...`),xi.DESCRIPTOR)}`);if(!v)throw new Qe(`The ${ee.pretty(t,B,xi.CODE)} string didn't match the required format (package-name@range). Did you perhaps forget to explicitly reference the package name?`);let T=yqe(n,v,{dev:this.dev,peer:this.peer,preferDev:this.preferDev,optional:this.optional});return await Promise.all(T.map(async j=>{let $=await Gm(v,{project:i,workspace:n,cache:s,target:j,modifier:a,strategies:l,maxResults:c});return{request:v,suggestedDescriptors:$,target:j}}))})).then(B=>B.flat()),g=await ra.start({configuration:t,stdout:this.context.stdout,suggestInstall:!1},async B=>{for(let{request:v,suggestedDescriptors:{suggestions:D,rejections:T}}of u)if(D.filter(j=>j.descriptor!==null).length===0){let[j]=T;if(typeof j>"u")throw new Error("Assertion failed: Expected an error to have been set");i.configuration.get("enableNetwork")?B.reportError(27,`${P.prettyDescriptor(t,v)} can't be resolved to a satisfying range`):B.reportError(27,`${P.prettyDescriptor(t,v)} can't be resolved to a satisfying range (note: network resolution has been disabled)`),B.reportSeparator(),B.reportExceptionOnce(j)}});if(g.hasErrors())return g.exitCode();let f=!1,h=[],p=[];for(let{suggestedDescriptors:{suggestions:B},target:v}of u){let D,T=B.filter(V=>V.descriptor!==null),H=T[0].descriptor,j=T.every(V=>P.areDescriptorsEqual(V.descriptor,H));T.length===1||j?D=H:(f=!0,{answer:D}=await(0,Lse.prompt)({type:"select",name:"answer",message:"Which range do you want to use?",choices:B.map(({descriptor:V,name:W,reason:_})=>V?{name:W,hint:_,descriptor:V}:{name:W,hint:_,disabled:!0}),onCancel:()=>process.exit(130),result(V){return this.find(V,"descriptor")},stdin:this.context.stdin,stdout:this.context.stdout}));let $=n.manifest[v].get(D.identHash);(typeof $>"u"||$.descriptorHash!==D.descriptorHash)&&(n.manifest[v].set(D.identHash,D),this.optional&&(v==="dependencies"?n.manifest.ensureDependencyMeta({...D,range:"unknown"}).optional=!0:v==="peerDependencies"&&(n.manifest.ensurePeerDependencyMeta({...D,range:"unknown"}).optional=!0)),typeof $>"u"?h.push([n,v,D,l]):p.push([n,v,$,D]))}return await t.triggerMultipleHooks(B=>B.afterWorkspaceDependencyAddition,h),await t.triggerMultipleHooks(B=>B.afterWorkspaceDependencyReplacement,p),f&&this.context.stdout.write(`
-`),(await Ge.start({configuration:t,json:this.json,stdout:this.context.stdout,includeLogs:!this.context.quiet},async B=>{await i.install({cache:s,report:B,mode:this.mode})})).exitCode()}};Au.paths=[["add"]],Au.usage=ve.Usage({description:"add dependencies to the project",details:"\n      This command adds a package to the package.json for the nearest workspace.\n\n      - If it didn't exist before, the package will by default be added to the regular `dependencies` field, but this behavior can be overriden thanks to the `-D,--dev` flag (which will cause the dependency to be added to the `devDependencies` field instead) and the `-P,--peer` flag (which will do the same but for `peerDependencies`).\n\n      - If the package was already listed in your dependencies, it will by default be upgraded whether it's part of your `dependencies` or `devDependencies` (it won't ever update `peerDependencies`, though).\n\n      - If set, the `--prefer-dev` flag will operate as a more flexible `-D,--dev` in that it will add the package to your `devDependencies` if it isn't already listed in either `dependencies` or `devDependencies`, but it will also happily upgrade your `dependencies` if that's what you already use (whereas `-D,--dev` would throw an exception).\n\n      - If set, the `-O,--optional` flag will add the package to the `optionalDependencies` field and, in combination with the `-P,--peer` flag, it will add the package as an optional peer dependency. If the package was already listed in your `dependencies`, it will be upgraded to `optionalDependencies`. If the package was already listed in your `peerDependencies`, in combination with the `-P,--peer` flag, it will be upgraded to an optional peer dependency: `\"peerDependenciesMeta\": { \"<package>\": { \"optional\": true } }`\n\n      - If the added package doesn't specify a range at all its `latest` tag will be resolved and the returned version will be used to generate a new semver range (using the `^` modifier by default unless otherwise configured via the `defaultSemverRangePrefix` configuration, or the `~` modifier if `-T,--tilde` is specified, or no modifier at all if `-E,--exact` is specified). Two exceptions to this rule: the first one is that if the package is a workspace then its local version will be used, and the second one is that if you use `-P,--peer` the default range will be `*` and won't be resolved at all.\n\n      - If the added package specifies a range (such as `^1.0.0`, `latest`, or `rc`), Yarn will add this range as-is in the resulting package.json entry (in particular, tags such as `rc` will be encoded as-is rather than being converted into a semver range).\n\n      If the `--cached` option is used, Yarn will preferably reuse the highest version already used somewhere within the project, even if through a transitive dependency.\n\n      If the `-i,--interactive` option is used (or if the `preferInteractive` settings is toggled on) the command will first try to check whether other workspaces in the project use the specified package and, if so, will offer to reuse them.\n\n      If the `--mode=<mode>` option is set, Yarn will change which artifacts are generated. The modes currently supported are:\n\n      - `skip-build` will not run the build scripts at all. Note that this is different from setting `enableScripts` to false because the latter will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run.\n\n      - `update-lockfile` will skip the link step altogether, and only fetch packages that are missing from the lockfile (or that have no associated checksums). This mode is typically used by tools like Renovate or Dependabot to keep a lockfile up-to-date without incurring the full install cost.\n\n      For a compilation of all the supported protocols, please consult the dedicated page from our website: https://yarnpkg.com/features/protocols.\n    ",examples:[["Add a regular package to the current workspace","$0 add lodash"],["Add a specific version for a package to the current workspace","$0 add lodash@1.2.3"],["Add a package from a GitHub repository (the master branch) to the current workspace using a URL","$0 add lodash@https://github.com/lodash/lodash"],["Add a package from a GitHub repository (the master branch) to the current workspace using the GitHub protocol","$0 add lodash@github:lodash/lodash"],["Add a package from a GitHub repository (the master branch) to the current workspace using the GitHub protocol (shorthand)","$0 add lodash@lodash/lodash"],["Add a package from a specific branch of a GitHub repository to the current workspace using the GitHub protocol (shorthand)","$0 add lodash-es@lodash/lodash#es"]]});function yqe(r,e,{dev:t,peer:i,preferDev:n,optional:s}){let o=r.manifest["dependencies"].has(e.identHash),a=r.manifest["devDependencies"].has(e.identHash),l=r.manifest["peerDependencies"].has(e.identHash);if((t||i)&&o)throw new Qe(`Package "${P.prettyIdent(r.project.configuration,e)}" is already listed as a regular dependency - remove the -D,-P flags or remove it from your dependencies first`);if(!t&&!i&&l)throw new Qe(`Package "${P.prettyIdent(r.project.configuration,e)}" is already listed as a peer dependency - use either of -D or -P, or remove it from your peer dependencies first`);if(s&&a)throw new Qe(`Package "${P.prettyIdent(r.project.configuration,e)}" is already listed as a dev dependency - remove the -O flag or remove it from your dev dependencies first`);if(s&&!i&&l)throw new Qe(`Package "${P.prettyIdent(r.project.configuration,e)}" is already listed as a peer dependency - remove the -O flag or add the -P flag or remove it from your peer dependencies first`);if((t||n)&&s)throw new Qe(`Package "${P.prettyIdent(r.project.configuration,e)}" cannot simultaneously be a dev dependency and an optional dependency`);let c=[];return i&&c.push("peerDependencies"),(t||n)&&c.push("devDependencies"),s&&c.push("dependencies"),c.length>0?c:a?["devDependencies"]:l?["peerDependencies"]:["dependencies"]}var lu=class extends De{constructor(){super(...arguments);this.verbose=z.Boolean("-v,--verbose",!1,{description:"Print both the binary name and the locator of the package that provides the binary"});this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.name=z.String({required:!1})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,locator:n}=await je.find(t,this.context.cwd);if(await i.restoreInstallState(),this.name){let a=(await Wt.getPackageAccessibleBinaries(n,{project:i})).get(this.name);if(!a)throw new Qe(`Couldn't find a binary named "${this.name}" for package "${P.prettyLocator(t,n)}"`);let[,l]=a;return this.context.stdout.write(`${l}
-`),0}return(await Ge.start({configuration:t,json:this.json,stdout:this.context.stdout},async o=>{let a=await Wt.getPackageAccessibleBinaries(n,{project:i}),c=Array.from(a.keys()).reduce((u,g)=>Math.max(u,g.length),0);for(let[u,[g,f]]of a)o.reportJson({name:u,source:P.stringifyIdent(g),path:f});if(this.verbose)for(let[u,[g]]of a)o.reportInfo(null,`${u.padEnd(c," ")}   ${P.prettyLocator(t,g)}`);else for(let u of a.keys())o.reportInfo(null,u)})).exitCode()}};lu.paths=[["bin"]],lu.usage=ve.Usage({description:"get the path to a binary script",details:`
-      When used without arguments, this command will print the list of all the binaries available in the current workspace. Adding the \`-v,--verbose\` flag will cause the output to contain both the binary name and the locator of the package that provides the binary.
-
-      When an argument is specified, this command will just print the path to the binary on the standard output and exit. Note that the reported path may be stored within a zip archive.
-    `,examples:[["List all the available binaries","$0 bin"],["Print the path to a specific binary","$0 bin eslint"]]});var cu=class extends De{constructor(){super(...arguments);this.mirror=z.Boolean("--mirror",!1,{description:"Remove the global cache files instead of the local cache files"});this.all=z.Boolean("--all",!1,{description:"Remove both the global cache files and the local cache files of the current project"})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),i=await Rt.find(t);return(await Ge.start({configuration:t,stdout:this.context.stdout},async()=>{let s=(this.all||this.mirror)&&i.mirrorCwd!==null,o=!this.mirror;s&&(await M.removePromise(i.mirrorCwd),await t.triggerHook(a=>a.cleanGlobalArtifacts,t)),o&&await M.removePromise(i.cwd)})).exitCode()}};cu.paths=[["cache","clean"],["cache","clear"]],cu.usage=ve.Usage({description:"remove the shared cache files",details:`
-      This command will remove all the files from the cache.
-    `,examples:[["Remove all the local archives","$0 cache clean"],["Remove all the archives stored in the ~/.yarn directory","$0 cache clean --mirror"]]});var Ose=Pe(ub()),jL=J("util"),uu=class extends De{constructor(){super(...arguments);this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.unsafe=z.Boolean("--no-redacted",!1,{description:"Don't redact secrets (such as tokens) from the output"});this.name=z.String()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),i=this.name.replace(/[.[].*$/,""),n=this.name.replace(/^[^.[]*/,"");if(typeof t.settings.get(i)>"u")throw new Qe(`Couldn't find a configuration settings named "${i}"`);let o=t.getSpecial(i,{hideSecrets:!this.unsafe,getNativePaths:!0}),a=Ie.convertMapsToIndexableObjects(o),l=n?(0,Ose.default)(a,n):a,c=await Ge.start({configuration:t,includeFooter:!1,json:this.json,stdout:this.context.stdout},async u=>{u.reportJson(l)});if(!this.json){if(typeof l=="string")return this.context.stdout.write(`${l}
-`),c.exitCode();jL.inspect.styles.name="cyan",this.context.stdout.write(`${(0,jL.inspect)(l,{depth:1/0,colors:t.get("enableColors"),compact:!1})}
-`)}return c.exitCode()}};uu.paths=[["config","get"]],uu.usage=ve.Usage({description:"read a configuration settings",details:`
-      This command will print a configuration setting.
-
-      Secrets (such as tokens) will be redacted from the output by default. If this behavior isn't desired, set the \`--no-redacted\` to get the untransformed value.
-    `,examples:[["Print a simple configuration setting","yarn config get yarnPath"],["Print a complex configuration setting","yarn config get packageExtensions"],["Print a nested field from the configuration",`yarn config get 'npmScopes["my-company"].npmRegistryServer'`],["Print a token from the configuration","yarn config get npmAuthToken --no-redacted"],["Print a configuration setting as JSON","yarn config get packageExtensions --json"]]});var Voe=Pe(XL()),Xoe=Pe(ub()),Zoe=Pe(zoe()),ZL=J("util"),gu=class extends De{constructor(){super(...arguments);this.json=z.Boolean("--json",!1,{description:"Set complex configuration settings to JSON values"});this.home=z.Boolean("-H,--home",!1,{description:"Update the home configuration instead of the project configuration"});this.name=z.String();this.value=z.String()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),i=()=>{if(!t.projectCwd)throw new Qe("This command must be run from within a project folder");return t.projectCwd},n=this.name.replace(/[.[].*$/,""),s=this.name.replace(/^[^.[]*\.?/,"");if(typeof t.settings.get(n)>"u")throw new Qe(`Couldn't find a configuration settings named "${n}"`);if(n==="enableStrictSettings")throw new Qe("This setting only affects the file it's in, and thus cannot be set from the CLI");let a=this.json?JSON.parse(this.value):this.value;await(this.home?p=>ye.updateHomeConfiguration(p):p=>ye.updateConfiguration(i(),p))(p=>{if(s){let C=(0,Voe.default)(p);return(0,Zoe.default)(C,this.name,a),C}else return{...p,[n]:a}});let u=(await ye.find(this.context.cwd,this.context.plugins)).getSpecial(n,{hideSecrets:!0,getNativePaths:!0}),g=Ie.convertMapsToIndexableObjects(u),f=s?(0,Xoe.default)(g,s):g;return(await Ge.start({configuration:t,includeFooter:!1,stdout:this.context.stdout},async p=>{ZL.inspect.styles.name="cyan",p.reportInfo(0,`Successfully set ${this.name} to ${(0,ZL.inspect)(f,{depth:1/0,colors:t.get("enableColors"),compact:!1})}`)})).exitCode()}};gu.paths=[["config","set"]],gu.usage=ve.Usage({description:"change a configuration settings",details:`
-      This command will set a configuration setting.
-
-      When used without the \`--json\` flag, it can only set a simple configuration setting (a string, a number, or a boolean).
-
-      When used with the \`--json\` flag, it can set both simple and complex configuration settings, including Arrays and Objects.
-    `,examples:[["Set a simple configuration setting (a string, a number, or a boolean)","yarn config set initScope myScope"],["Set a simple configuration setting (a string, a number, or a boolean) using the `--json` flag",'yarn config set initScope --json \\"myScope\\"'],["Set a complex configuration setting (an Array) using the `--json` flag",`yarn config set unsafeHttpWhitelist --json '["*.example.com", "example.com"]'`],["Set a complex configuration setting (an Object) using the `--json` flag",`yarn config set packageExtensions --json '{ "@babel/parser@*": { "dependencies": { "@babel/types": "*" } } }'`],["Set a nested configuration setting",'yarn config set npmScopes.company.npmRegistryServer "https://npm.example.com"'],["Set a nested configuration setting using indexed access for non-simple keys",`yarn config set 'npmRegistries["//npm.example.com"].npmAuthToken' "ffffffff-ffff-ffff-ffff-ffffffffffff"`]]});var oae=Pe(XL()),aae=Pe(am()),Aae=Pe(sae()),fu=class extends De{constructor(){super(...arguments);this.home=z.Boolean("-H,--home",!1,{description:"Update the home configuration instead of the project configuration"});this.name=z.String()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),i=()=>{if(!t.projectCwd)throw new Qe("This command must be run from within a project folder");return t.projectCwd},n=this.name.replace(/[.[].*$/,""),s=this.name.replace(/^[^.[]*\.?/,"");if(typeof t.settings.get(n)>"u")throw new Qe(`Couldn't find a configuration settings named "${n}"`);let a=this.home?c=>ye.updateHomeConfiguration(c):c=>ye.updateConfiguration(i(),c);return(await Ge.start({configuration:t,includeFooter:!1,stdout:this.context.stdout},async c=>{let u=!1;await a(g=>{if(!(0,aae.default)(g,this.name))return c.reportWarning(0,`Configuration doesn't contain setting ${this.name}; there is nothing to unset`),u=!0,g;let f=s?(0,oae.default)(g):{...g};return(0,Aae.default)(f,this.name),f}),u||c.reportInfo(0,`Successfully unset ${this.name}`)})).exitCode()}};fu.paths=[["config","unset"]],fu.usage=ve.Usage({description:"unset a configuration setting",details:`
-      This command will unset a configuration setting.
-    `,examples:[["Unset a simple configuration setting","yarn config unset initScope"],["Unset a complex configuration setting","yarn config unset packageExtensions"],["Unset a nested configuration setting","yarn config unset npmScopes.company.npmRegistryServer"]]});var _L=J("util"),hu=class extends De{constructor(){super(...arguments);this.verbose=z.Boolean("-v,--verbose",!1,{description:"Print the setting description on top of the regular key/value information"});this.why=z.Boolean("--why",!1,{description:"Print the reason why a setting is set a particular way"});this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins,{strict:!1});return(await Ge.start({configuration:t,json:this.json,stdout:this.context.stdout},async n=>{if(t.invalid.size>0&&!this.json){for(let[s,o]of t.invalid)n.reportError(34,`Invalid configuration key "${s}" in ${o}`);n.reportSeparator()}if(this.json){let s=Ie.sortMap(t.settings.keys(),o=>o);for(let o of s){let a=t.settings.get(o),l=t.getSpecial(o,{hideSecrets:!0,getNativePaths:!0}),c=t.sources.get(o);this.verbose?n.reportJson({key:o,effective:l,source:c}):n.reportJson({key:o,effective:l,source:c,...a})}}else{let s=Ie.sortMap(t.settings.keys(),l=>l),o=s.reduce((l,c)=>Math.max(l,c.length),0),a={breakLength:1/0,colors:t.get("enableColors"),maxArrayLength:2};if(this.why||this.verbose){let l=s.map(u=>{let g=t.settings.get(u);if(!g)throw new Error(`Assertion failed: This settings ("${u}") should have been registered`);let f=this.why?t.sources.get(u)||"<default>":g.description;return[u,f]}),c=l.reduce((u,[,g])=>Math.max(u,g.length),0);for(let[u,g]of l)n.reportInfo(null,`${u.padEnd(o," ")}   ${g.padEnd(c," ")}   ${(0,_L.inspect)(t.getSpecial(u,{hideSecrets:!0,getNativePaths:!0}),a)}`)}else for(let l of s)n.reportInfo(null,`${l.padEnd(o," ")}   ${(0,_L.inspect)(t.getSpecial(l,{hideSecrets:!0,getNativePaths:!0}),a)}`)}})).exitCode()}};hu.paths=[["config"]],hu.usage=ve.Usage({description:"display the current configuration",details:`
-      This command prints the current active configuration settings.
-    `,examples:[["Print the active configuration settings","$0 config"]]});ls();var Nb={};ut(Nb,{Strategy:()=>jm,acceptedStrategies:()=>bWe,dedupe:()=>$L});var lae=Pe(Bn()),jm=(e=>(e.HIGHEST="highest",e))(jm||{}),bWe=new Set(Object.values(jm)),QWe={highest:async(r,e,{resolver:t,fetcher:i,resolveOptions:n,fetchOptions:s})=>{let o=new Map;for(let[a,l]of r.storedResolutions){let c=r.storedDescriptors.get(a);if(typeof c>"u")throw new Error(`Assertion failed: The descriptor (${a}) should have been registered`);Ie.getSetWithDefault(o,c.identHash).add(l)}return Array.from(r.storedDescriptors.values(),async a=>{if(e.length&&!lae.default.isMatch(P.stringifyIdent(a),e))return null;let l=r.storedResolutions.get(a.descriptorHash);if(typeof l>"u")throw new Error(`Assertion failed: The resolution (${a.descriptorHash}) should have been registered`);let c=r.originalPackages.get(l);if(typeof c>"u"||!t.shouldPersistResolution(c,n))return null;let u=o.get(a.identHash);if(typeof u>"u")throw new Error(`Assertion failed: The resolutions (${a.identHash}) should have been registered`);if(u.size===1)return null;let g=[...u].map(y=>{let B=r.originalPackages.get(y);if(typeof B>"u")throw new Error(`Assertion failed: The package (${y}) should have been registered`);return B.reference}),f=await t.getSatisfying(a,g,n),h=f==null?void 0:f[0];if(typeof h>"u")return null;let p=h.locatorHash,C=r.originalPackages.get(p);if(typeof C>"u")throw new Error(`Assertion failed: The package (${p}) should have been registered`);return p===l?null:{descriptor:a,currentPackage:c,updatedPackage:C}})}};async function $L(r,{strategy:e,patterns:t,cache:i,report:n}){let{configuration:s}=r,o=new ti,a=s.makeResolver(),l=s.makeFetcher(),c={cache:i,checksums:r.storedChecksums,fetcher:l,project:r,report:o,skipIntegrityCheck:!0,cacheOptions:{skipIntegrityCheck:!0}},u={project:r,resolver:a,report:o,fetchOptions:c};return await n.startTimerPromise("Deduplication step",async()=>{let g=QWe[e],f=await g(r,t,{resolver:a,resolveOptions:u,fetcher:l,fetchOptions:c}),h=vi.progressViaCounter(f.length);await n.reportProgress(h);let p=0;await Promise.all(f.map(B=>B.then(v=>{if(v===null)return;p++;let{descriptor:D,currentPackage:T,updatedPackage:H}=v;n.reportInfo(0,`${P.prettyDescriptor(s,D)} can be deduped from ${P.prettyLocator(s,T)} to ${P.prettyLocator(s,H)}`),n.reportJson({descriptor:P.stringifyDescriptor(D),currentResolution:P.stringifyLocator(T),updatedResolution:P.stringifyLocator(H)}),r.storedResolutions.set(D.descriptorHash,H.locatorHash)}).finally(()=>h.tick())));let C;switch(p){case 0:C="No packages";break;case 1:C="One package";break;default:C=`${p} packages`}let y=ee.pretty(s,e,ee.Type.CODE);return n.reportInfo(0,`${C} can be deduped using the ${y} strategy`),p})}var pu=class extends De{constructor(){super(...arguments);this.strategy=z.String("-s,--strategy","highest",{description:"The strategy to use when deduping dependencies",validator:Zi(jm)});this.check=z.Boolean("-c,--check",!1,{description:"Exit with exit code 1 when duplicates are found, without persisting the dependency tree"});this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.mode=z.String("--mode",{description:"Change what artifacts installs generate",validator:Zi(ts)});this.patterns=z.Rest()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i}=await je.find(t,this.context.cwd),n=await Rt.find(t);await i.restoreInstallState({restoreResolutions:!1});let s=0,o=await Ge.start({configuration:t,includeFooter:!1,stdout:this.context.stdout,json:this.json},async a=>{s=await $L(i,{strategy:this.strategy,patterns:this.patterns,cache:n,report:a})});return o.hasErrors()?o.exitCode():this.check?s?1:0:(await Ge.start({configuration:t,stdout:this.context.stdout,json:this.json},async l=>{await i.install({cache:n,report:l,mode:this.mode})})).exitCode()}};pu.paths=[["dedupe"]],pu.usage=ve.Usage({description:"deduplicate dependencies with overlapping ranges",details:"\n      Duplicates are defined as descriptors with overlapping ranges being resolved and locked to different locators. They are a natural consequence of Yarn's deterministic installs, but they can sometimes pile up and unnecessarily increase the size of your project.\n\n      This command dedupes dependencies in the current project using different strategies (only one is implemented at the moment):\n\n      - `highest`: Reuses (where possible) the locators with the highest versions. This means that dependencies can only be upgraded, never downgraded. It's also guaranteed that it never takes more than a single pass to dedupe the entire dependency tree.\n\n      **Note:** Even though it never produces a wrong dependency tree, this command should be used with caution, as it modifies the dependency tree, which can sometimes cause problems when packages don't strictly follow semver recommendations. Because of this, it is recommended to also review the changes manually.\n\n      If set, the `-c,--check` flag will only report the found duplicates, without persisting the modified dependency tree. If changes are found, the command will exit with a non-zero exit code, making it suitable for CI purposes.\n\n      If the `--mode=<mode>` option is set, Yarn will change which artifacts are generated. The modes currently supported are:\n\n      - `skip-build` will not run the build scripts at all. Note that this is different from setting `enableScripts` to false because the latter will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run.\n\n      - `update-lockfile` will skip the link step altogether, and only fetch packages that are missing from the lockfile (or that have no associated checksums). This mode is typically used by tools like Renovate or Dependabot to keep a lockfile up-to-date without incurring the full install cost.\n\n      This command accepts glob patterns as arguments (if valid Idents and supported by [micromatch](https://github.com/micromatch/micromatch)). Make sure to escape the patterns, to prevent your own shell from trying to expand them.\n\n      ### In-depth explanation:\n\n      Yarn doesn't deduplicate dependencies by default, otherwise installs wouldn't be deterministic and the lockfile would be useless. What it actually does is that it tries to not duplicate dependencies in the first place.\n\n      **Example:** If `foo@^2.3.4` (a dependency of a dependency) has already been resolved to `foo@2.3.4`, running `yarn add foo@*`will cause Yarn to reuse `foo@2.3.4`, even if the latest `foo` is actually `foo@2.10.14`, thus preventing unnecessary duplication.\n\n      Duplication happens when Yarn can't unlock dependencies that have already been locked inside the lockfile.\n\n      **Example:** If `foo@^2.3.4` (a dependency of a dependency) has already been resolved to `foo@2.3.4`, running `yarn add foo@2.10.14` will cause Yarn to install `foo@2.10.14` because the existing resolution doesn't satisfy the range `2.10.14`. This behavior can lead to (sometimes) unwanted duplication, since now the lockfile contains 2 separate resolutions for the 2 `foo` descriptors, even though they have overlapping ranges, which means that the lockfile can be simplified so that both descriptors resolve to `foo@2.10.14`.\n    ",examples:[["Dedupe all packages","$0 dedupe"],["Dedupe all packages using a specific strategy","$0 dedupe --strategy highest"],["Dedupe a specific package","$0 dedupe lodash"],["Dedupe all packages with the `@babel/*` scope","$0 dedupe '@babel/*'"],["Check for duplicates (can be used as a CI step)","$0 dedupe --check"]]});var Vh=class extends De{async execute(){let{plugins:e}=await ye.find(this.context.cwd,this.context.plugins),t=[];for(let o of e){let{commands:a}=o[1];if(a){let c=Gn.from(a).definitions();t.push([o[0],c])}}let i=this.cli.definitions(),n=(o,a)=>o.split(" ").slice(1).join()===a.split(" ").slice(1).join(),s=cae()["@yarnpkg/builder"].bundles.standard;for(let o of t){let a=o[1];for(let l of a)i.find(c=>n(c.path,l.path)).plugin={name:o[0],isDefault:s.includes(o[0])}}this.context.stdout.write(`${JSON.stringify(i,null,2)}
-`)}};Vh.paths=[["--clipanion=definitions"]];var Xh=class extends De{async execute(){this.context.stdout.write(this.cli.usage(null))}};Xh.paths=[["help"],["--help"],["-h"]];var qm=class extends De{constructor(){super(...arguments);this.leadingArgument=z.String();this.args=z.Proxy()}async execute(){if(this.leadingArgument.match(/[\\/]/)&&!P.tryParseIdent(this.leadingArgument)){let t=x.resolve(this.context.cwd,K.toPortablePath(this.leadingArgument));return await this.cli.run(this.args,{cwd:t})}else return await this.cli.run(["run",this.leadingArgument,...this.args])}};var Zh=class extends De{async execute(){this.context.stdout.write(`${Tr||"<unknown>"}
-`)}};Zh.paths=[["-v"],["--version"]];var du=class extends De{constructor(){super(...arguments);this.commandName=z.String();this.args=z.Proxy()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,locator:n}=await je.find(t,this.context.cwd);return await i.restoreInstallState(),await Wt.executePackageShellcode(n,this.commandName,this.args,{cwd:this.context.cwd,stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr,project:i})}};du.paths=[["exec"]],du.usage=ve.Usage({description:"execute a shell script",details:`
-      This command simply executes a shell script within the context of the root directory of the active workspace using the portable shell.
-
-      It also makes sure to call it in a way that's compatible with the current project (for example, on PnP projects the environment will be setup in such a way that PnP will be correctly injected into the environment).
-    `,examples:[["Execute a single shell command","$0 exec echo Hello World"],["Execute a shell script",'$0 exec "tsc & babel src --out-dir lib"']]});ls();var Cu=class extends De{constructor(){super(...arguments);this.hash=z.String({required:!1,validator:od(sd(),[ad(/^p[0-9a-f]{5}$/)])})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i}=await je.find(t,this.context.cwd);return await i.restoreInstallState({restoreResolutions:!1}),await i.applyLightResolution(),typeof this.hash<"u"?await vWe(this.hash,i,{stdout:this.context.stdout}):(await Ge.start({configuration:t,stdout:this.context.stdout,includeFooter:!1},async s=>{var a;let o=[([,l])=>P.stringifyLocator(i.storedPackages.get(l.subject)),([,l])=>P.stringifyIdent(l.requested)];for(let[l,c]of Ie.sortMap(i.peerRequirements,o)){let u=i.storedPackages.get(c.subject);if(typeof u>"u")throw new Error("Assertion failed: Expected the subject package to have been registered");let g=i.storedPackages.get(c.rootRequester);if(typeof g>"u")throw new Error("Assertion failed: Expected the root package to have been registered");let f=(a=u.dependencies.get(c.requested.identHash))!=null?a:null,h=ee.pretty(t,l,ee.Type.CODE),p=P.prettyLocator(t,u),C=P.prettyIdent(t,c.requested),y=P.prettyIdent(t,g),B=c.allRequesters.length-1,v=`descendant${B===1?"":"s"}`,D=B>0?` and ${B} ${v}`:"",T=f!==null?"provides":"doesn't provide";s.reportInfo(null,`${h} \u2192 ${p} ${T} ${C} to ${y}${D}`)}})).exitCode()}};Cu.paths=[["explain","peer-requirements"]],Cu.usage=ve.Usage({description:"explain a set of peer requirements",details:`
-      A set of peer requirements represents all peer requirements that a dependent must satisfy when providing a given peer request to a requester and its descendants.
-
-      When the hash argument is specified, this command prints a detailed explanation of all requirements of the set corresponding to the hash and whether they're satisfied or not.
-
-      When used without arguments, this command lists all sets of peer requirements and the corresponding hash that can be used to get detailed information about a given set.
-
-      **Note:** A hash is a six-letter p-prefixed code that can be obtained from peer dependency warnings or from the list of all peer requirements (\`yarn explain peer-requirements\`).
-    `,examples:[["Explain the corresponding set of peer requirements for a hash","$0 explain peer-requirements p1a4ed"],["List all sets of peer requirements","$0 explain peer-requirements"]]});async function vWe(r,e,t){let{configuration:i}=e,n=e.peerRequirements.get(r);if(typeof n>"u")throw new Error(`No peerDependency requirements found for hash: "${r}"`);return(await Ge.start({configuration:i,stdout:t.stdout,includeFooter:!1},async o=>{var B,v;let a=e.storedPackages.get(n.subject);if(typeof a>"u")throw new Error("Assertion failed: Expected the subject package to have been registered");let l=e.storedPackages.get(n.rootRequester);if(typeof l>"u")throw new Error("Assertion failed: Expected the root package to have been registered");let c=(B=a.dependencies.get(n.requested.identHash))!=null?B:null,u=c!==null?e.storedResolutions.get(c.descriptorHash):null;if(typeof u>"u")throw new Error("Assertion failed: Expected the resolution to have been registered");let g=u!==null?e.storedPackages.get(u):null;if(typeof g>"u")throw new Error("Assertion failed: Expected the provided package to have been registered");let f=[...n.allRequesters.values()].map(D=>{let T=e.storedPackages.get(D);if(typeof T>"u")throw new Error("Assertion failed: Expected the package to be registered");let H=P.devirtualizeLocator(T),j=e.storedPackages.get(H.locatorHash);if(typeof j>"u")throw new Error("Assertion failed: Expected the package to be registered");let $=j.peerDependencies.get(n.requested.identHash);if(typeof $>"u")throw new Error("Assertion failed: Expected the peer dependency to be registered");return{pkg:T,peerDependency:$}});if(g!==null){let D=f.every(({peerDependency:T})=>vt.satisfiesWithPrereleases(g.version,T.range));o.reportInfo(0,`${P.prettyLocator(i,a)} provides ${P.prettyLocator(i,g)} with version ${P.prettyReference(i,(v=g.version)!=null?v:"<missing>")}, which ${D?"satisfies":"doesn't satisfy"} the following requirements:`)}else o.reportInfo(0,`${P.prettyLocator(i,a)} doesn't provide ${P.prettyIdent(i,n.requested)}, breaking the following requirements:`);o.reportSeparator();let h=ee.mark(i),p=[];for(let{pkg:D,peerDependency:T}of Ie.sortMap(f,H=>P.stringifyLocator(H.pkg))){let j=(g!==null?vt.satisfiesWithPrereleases(g.version,T.range):!1)?h.Check:h.Cross;p.push({stringifiedLocator:P.stringifyLocator(D),prettyLocator:P.prettyLocator(i,D),prettyRange:P.prettyRange(i,T.range),mark:j})}let C=Math.max(...p.map(({stringifiedLocator:D})=>D.length)),y=Math.max(...p.map(({prettyRange:D})=>D.length));for(let{stringifiedLocator:D,prettyLocator:T,prettyRange:H,mark:j}of Ie.sortMap(p,({stringifiedLocator:$})=>$))o.reportInfo(null,`${T.padEnd(C+(T.length-D.length)," ")} \u2192 ${H.padEnd(y," ")} ${j}`);p.length>1&&(o.reportSeparator(),o.reportInfo(0,`Note: these requirements start with ${P.prettyLocator(e.configuration,l)}`))})).exitCode()}ls();var uae=Pe(Xr()),mu=class extends De{constructor(){super(...arguments);this.onlyIfNeeded=z.Boolean("--only-if-needed",!1,{description:"Only lock the Yarn version if it isn't already locked"});this.version=z.String()}async execute(){var o;let t=await ye.find(this.context.cwd,this.context.plugins);if(this.onlyIfNeeded&&t.get("yarnPath")){let a=t.sources.get("yarnPath");if(!a)throw new Error("Assertion failed: Expected 'yarnPath' to have a source");let l=(o=t.projectCwd)!=null?o:t.startingCwd;if(x.contains(l,a))return 0}let i=()=>{if(typeof Tr>"u")throw new Qe("The --install flag can only be used without explicit version specifier from the Yarn CLI");return`file://${process.argv[1]}`},n;if(this.version==="self")n=i();else if(this.version==="latest"||this.version==="berry"||this.version==="stable")n=`https://repo.yarnpkg.com/${await Jm(t,"stable")}/packages/yarnpkg-cli/bin/yarn.js`;else if(this.version==="canary")n=`https://repo.yarnpkg.com/${await Jm(t,"canary")}/packages/yarnpkg-cli/bin/yarn.js`;else if(this.version==="classic")n="https://classic.yarnpkg.com/latest.js";else if(this.version.match(/^https?:/))n=this.version;else if(this.version.match(/^\.{0,2}[\\/]/)||K.isAbsolute(this.version))n=`file://${K.resolve(this.version)}`;else if(vt.satisfiesWithPrereleases(this.version,">=2.0.0"))n=`https://repo.yarnpkg.com/${this.version}/packages/yarnpkg-cli/bin/yarn.js`;else if(vt.satisfiesWithPrereleases(this.version,"^0.x || ^1.x"))n=`https://github.com/yarnpkg/yarn/releases/download/v${this.version}/yarn-${this.version}.js`;else if(vt.validRange(this.version))n=`https://repo.yarnpkg.com/${await xWe(t,this.version)}/packages/yarnpkg-cli/bin/yarn.js`;else throw new Qe(`Invalid version descriptor "${this.version}"`);return(await Ge.start({configuration:t,stdout:this.context.stdout,includeLogs:!this.context.quiet},async a=>{let l="file://",c;n.startsWith(l)?(a.reportInfo(0,`Downloading ${ee.pretty(t,n,xi.URL)}`),c=await M.readFilePromise(K.toPortablePath(n.slice(l.length)))):(a.reportInfo(0,`Retrieving ${ee.pretty(t,n,xi.PATH)}`),c=await Xt.get(n,{configuration:t})),await eO(t,null,c,{report:a})})).exitCode()}};mu.paths=[["set","version"]],mu.usage=ve.Usage({description:"lock the Yarn version used by the project",details:"\n      This command will download a specific release of Yarn directly from the Yarn GitHub repository, will store it inside your project, and will change the `yarnPath` settings from your project `.yarnrc.yml` file to point to the new file.\n\n      A very good use case for this command is to enforce the version of Yarn used by any single member of your team inside the same project - by doing this you ensure that you have control over Yarn upgrades and downgrades (including on your deployment servers), and get rid of most of the headaches related to someone using a slightly different version and getting different behavior.\n\n      The version specifier can be:\n\n      - a tag:\n        - `latest` / `berry` / `stable` -> the most recent stable berry (`>=2.0.0`) release\n        - `canary` -> the most recent canary (release candidate) berry (`>=2.0.0`) release\n        - `classic` -> the most recent classic (`^0.x || ^1.x`) release\n\n      - a semver range (e.g. `2.x`) -> the most recent version satisfying the range (limited to berry releases)\n\n      - a semver version (e.g. `2.4.1`, `1.22.1`)\n\n      - a local file referenced through either a relative or absolute path\n\n      - `self` -> the version used to invoke the command\n    ",examples:[["Download the latest release from the Yarn repository","$0 set version latest"],["Download the latest canary release from the Yarn repository","$0 set version canary"],["Download the latest classic release from the Yarn repository","$0 set version classic"],["Download the most recent Yarn 3 build","$0 set version 3.x"],["Download a specific Yarn 2 build","$0 set version 2.0.0-rc.30"],["Switch back to a specific Yarn 1 release","$0 set version 1.22.1"],["Use a release from the local filesystem","$0 set version ./yarn.cjs"],["Use a release from a URL","$0 set version https://repo.yarnpkg.com/3.1.0/packages/yarnpkg-cli/bin/yarn.js"],["Download the version used to invoke the command","$0 set version self"]]});async function xWe(r,e){let i=(await Xt.get("https://repo.yarnpkg.com/tags",{configuration:r,jsonResponse:!0})).tags.filter(n=>vt.satisfiesWithPrereleases(n,e));if(i.length===0)throw new Qe(`No matching release found for range ${ee.pretty(r,e,ee.Type.RANGE)}.`);return i[0]}async function Jm(r,e){let t=await Xt.get("https://repo.yarnpkg.com/tags",{configuration:r,jsonResponse:!0});if(!t.latest[e])throw new Qe(`Tag ${ee.pretty(r,e,ee.Type.RANGE)} not found`);return t.latest[e]}async function eO(r,e,t,{report:i}){var h;e===null&&await M.mktempPromise(async p=>{let C=x.join(p,"yarn.cjs");await M.writeFilePromise(C,t);let{stdout:y}=await Cr.execvp(process.execPath,[K.fromPortablePath(C),"--version"],{cwd:p,env:{...process.env,YARN_IGNORE_PATH:"1"}});if(e=y.trim(),!uae.default.valid(e))throw new Error(`Invalid semver version. ${ee.pretty(r,"yarn --version",ee.Type.CODE)} returned:
-${e}`)});let n=(h=r.projectCwd)!=null?h:r.startingCwd,s=x.resolve(n,".yarn/releases"),o=x.resolve(s,`yarn-${e}.cjs`),a=x.relative(r.startingCwd,o),l=x.relative(n,o);i.reportInfo(0,`Saving the new release in ${ee.pretty(r,a,"magenta")}`),await M.removePromise(x.dirname(o)),await M.mkdirPromise(x.dirname(o),{recursive:!0}),await M.writeFilePromise(o,t,{mode:493}),await ye.updateConfiguration(n,{yarnPath:l});let c=await ot.tryFind(n)||new ot;c.packageManager=`yarn@${e&&Ie.isTaggedYarnVersion(e)?e:await Jm(r,"stable")}`;let u={};c.exportTo(u);let g=x.join(n,ot.fileName),f=`${JSON.stringify(u,null,c.indent)}
-`;await M.changeFilePromise(g,f,{automaticNewlines:!0})}function gae(r){return Ct[LI(r)]}var PWe=/## (?<code>YN[0-9]{4}) - `(?<name>[A-Z_]+)`\n\n(?<details>(?:.(?!##))+)/gs;async function DWe(r){let t=`https://repo.yarnpkg.com/${Ie.isTaggedYarnVersion(Tr)?Tr:await Jm(r,"canary")}/packages/gatsby/content/advanced/error-codes.md`,i=await Xt.get(t,{configuration:r});return new Map(Array.from(i.toString().matchAll(PWe),({groups:n})=>{if(!n)throw new Error("Assertion failed: Expected the match to have been successful");let s=gae(n.code);if(n.name!==s)throw new Error(`Assertion failed: Invalid error code data: Expected "${n.name}" to be named "${s}"`);return[n.code,n.details]}))}var Eu=class extends De{constructor(){super(...arguments);this.code=z.String({required:!1,validator:od(sd(),[ad(/^YN[0-9]{4}$/)])});this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins);if(typeof this.code<"u"){let i=gae(this.code),n=ee.pretty(t,i,ee.Type.CODE),s=this.cli.format().header(`${this.code} - ${n}`),a=(await DWe(t)).get(this.code),l=typeof a<"u"?ee.jsonOrPretty(this.json,t,ee.tuple(ee.Type.MARKDOWN,{text:a,format:this.cli.format(),paragraphs:!0})):`This error code does not have a description.
-
-You can help us by editing this page on GitHub \u{1F642}:
-${ee.jsonOrPretty(this.json,t,ee.tuple(ee.Type.URL,"https://github.com/yarnpkg/berry/blob/master/packages/gatsby/content/advanced/error-codes.md"))}
-`;this.json?this.context.stdout.write(`${JSON.stringify({code:this.code,name:i,details:l})}
-`):this.context.stdout.write(`${s}
-
-${l}
-`)}else{let i={children:Ie.mapAndFilter(Object.entries(Ct),([n,s])=>Number.isNaN(Number(n))?Ie.mapAndFilter.skip:{label:FA(Number(n)),value:ee.tuple(ee.Type.CODE,s)})};es.emitTree(i,{configuration:t,stdout:this.context.stdout,json:this.json})}}};Eu.paths=[["explain"]],Eu.usage=ve.Usage({description:"explain an error code",details:`
-      When the code argument is specified, this command prints its name and its details.
-
-      When used without arguments, this command lists all error codes and their names.
-    `,examples:[["Explain an error code","$0 explain YN0006"],["List all error codes","$0 explain"]]});var fae=Pe(Bn()),Iu=class extends De{constructor(){super(...arguments);this.all=z.Boolean("-A,--all",!1,{description:"Print versions of a package from the whole project"});this.recursive=z.Boolean("-R,--recursive",!1,{description:"Print information for all packages, including transitive dependencies"});this.extra=z.Array("-X,--extra",[],{description:"An array of requests of extra data provided by plugins"});this.cache=z.Boolean("--cache",!1,{description:"Print information about the cache entry of a package (path, size, checksum)"});this.dependents=z.Boolean("--dependents",!1,{description:"Print all dependents for each matching package"});this.manifest=z.Boolean("--manifest",!1,{description:"Print data obtained by looking at the package archive (license, homepage, ...)"});this.nameOnly=z.Boolean("--name-only",!1,{description:"Only print the name for the matching packages"});this.virtuals=z.Boolean("--virtuals",!1,{description:"Print each instance of the virtual packages"});this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.patterns=z.Rest()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd),s=await Rt.find(t);if(!n&&!this.all)throw new ct(i.cwd,this.context.cwd);await i.restoreInstallState();let o=new Set(this.extra);this.cache&&o.add("cache"),this.dependents&&o.add("dependents"),this.manifest&&o.add("manifest");let a=(T,{recursive:H})=>{let j=T.anchoredLocator.locatorHash,$=new Map,V=[j];for(;V.length>0;){let W=V.shift();if($.has(W))continue;let _=i.storedPackages.get(W);if(typeof _>"u")throw new Error("Assertion failed: Expected the package to be registered");if($.set(W,_),P.isVirtualLocator(_)&&V.push(P.devirtualizeLocator(_).locatorHash),!(!H&&W!==j))for(let A of _.dependencies.values()){let Ae=i.storedResolutions.get(A.descriptorHash);if(typeof Ae>"u")throw new Error("Assertion failed: Expected the resolution to be registered");V.push(Ae)}}return $.values()},l=({recursive:T})=>{let H=new Map;for(let j of i.workspaces)for(let $ of a(j,{recursive:T}))H.set($.locatorHash,$);return H.values()},c=({all:T,recursive:H})=>T&&H?i.storedPackages.values():T?l({recursive:H}):a(n,{recursive:H}),u=({all:T,recursive:H})=>{let j=c({all:T,recursive:H}),$=this.patterns.map(_=>{let A=P.parseLocator(_),Ae=fae.default.makeRe(P.stringifyIdent(A)),ge=P.isVirtualLocator(A),re=ge?P.devirtualizeLocator(A):A;return O=>{let F=P.stringifyIdent(O);if(!Ae.test(F))return!1;if(A.reference==="unknown")return!0;let ue=P.isVirtualLocator(O),pe=ue?P.devirtualizeLocator(O):O;return!(ge&&ue&&A.reference!==O.reference||re.reference!==pe.reference)}}),V=Ie.sortMap([...j],_=>P.stringifyLocator(_));return{selection:V.filter(_=>$.length===0||$.some(A=>A(_))),sortedLookup:V}},{selection:g,sortedLookup:f}=u({all:this.all,recursive:this.recursive});if(g.length===0)throw new Qe("No package matched your request");let h=new Map;if(this.dependents)for(let T of f)for(let H of T.dependencies.values()){let j=i.storedResolutions.get(H.descriptorHash);if(typeof j>"u")throw new Error("Assertion failed: Expected the resolution to be registered");Ie.getArrayWithDefault(h,j).push(T)}let p=new Map;for(let T of f){if(!P.isVirtualLocator(T))continue;let H=P.devirtualizeLocator(T);Ie.getArrayWithDefault(p,H.locatorHash).push(T)}let C={},y={children:C},B=t.makeFetcher(),v={project:i,fetcher:B,cache:s,checksums:i.storedChecksums,report:new ti,cacheOptions:{skipIntegrityCheck:!0},skipIntegrityCheck:!0},D=[async(T,H,j)=>{var W,_;if(!H.has("manifest"))return;let $=await B.fetch(T,v),V;try{V=await ot.find($.prefixPath,{baseFs:$.packageFs})}finally{(W=$.releaseFs)==null||W.call($)}j("Manifest",{License:ee.tuple(ee.Type.NO_HINT,V.license),Homepage:ee.tuple(ee.Type.URL,(_=V.raw.homepage)!=null?_:null)})},async(T,H,j)=>{var Ae;if(!H.has("cache"))return;let $={mockedPackages:i.disabledLocators,unstablePackages:i.conditionalLocators},V=(Ae=i.storedChecksums.get(T.locatorHash))!=null?Ae:null,W=s.getLocatorPath(T,V,$),_;if(W!==null)try{_=M.statSync(W)}catch{}let A=typeof _<"u"?[_.size,ee.Type.SIZE]:void 0;j("Cache",{Checksum:ee.tuple(ee.Type.NO_HINT,V),Path:ee.tuple(ee.Type.PATH,W),Size:A})}];for(let T of g){let H=P.isVirtualLocator(T);if(!this.virtuals&&H)continue;let j={},$={value:[T,ee.Type.LOCATOR],children:j};if(C[P.stringifyLocator(T)]=$,this.nameOnly){delete $.children;continue}let V=p.get(T.locatorHash);typeof V<"u"&&(j.Instances={label:"Instances",value:ee.tuple(ee.Type.NUMBER,V.length)}),j.Version={label:"Version",value:ee.tuple(ee.Type.NO_HINT,T.version)};let W=(A,Ae)=>{let ge={};if(j[A]=ge,Array.isArray(Ae))ge.children=Ae.map(re=>({value:re}));else{let re={};ge.children=re;for(let[O,F]of Object.entries(Ae))typeof F>"u"||(re[O]={label:O,value:F})}};if(!H){for(let A of D)await A(T,o,W);await t.triggerHook(A=>A.fetchPackageInfo,T,o,W)}T.bin.size>0&&!H&&W("Exported Binaries",[...T.bin.keys()].map(A=>ee.tuple(ee.Type.PATH,A)));let _=h.get(T.locatorHash);typeof _<"u"&&_.length>0&&W("Dependents",_.map(A=>ee.tuple(ee.Type.LOCATOR,A))),T.dependencies.size>0&&!H&&W("Dependencies",[...T.dependencies.values()].map(A=>{var re;let Ae=i.storedResolutions.get(A.descriptorHash),ge=typeof Ae<"u"&&(re=i.storedPackages.get(Ae))!=null?re:null;return ee.tuple(ee.Type.RESOLUTION,{descriptor:A,locator:ge})})),T.peerDependencies.size>0&&H&&W("Peer dependencies",[...T.peerDependencies.values()].map(A=>{var O,F;let Ae=T.dependencies.get(A.identHash),ge=typeof Ae<"u"&&(O=i.storedResolutions.get(Ae.descriptorHash))!=null?O:null,re=ge!==null&&(F=i.storedPackages.get(ge))!=null?F:null;return ee.tuple(ee.Type.RESOLUTION,{descriptor:A,locator:re})}))}es.emitTree(y,{configuration:t,json:this.json,stdout:this.context.stdout,separators:this.nameOnly?0:2})}};Iu.paths=[["info"]],Iu.usage=ve.Usage({description:"see information related to packages",details:"\n      This command prints various information related to the specified packages, accepting glob patterns.\n\n      By default, if the locator reference is missing, Yarn will default to print the information about all the matching direct dependencies of the package for the active workspace. To instead print all versions of the package that are direct dependencies of any of your workspaces, use the `-A,--all` flag. Adding the `-R,--recursive` flag will also report transitive dependencies.\n\n      Some fields will be hidden by default in order to keep the output readable, but can be selectively displayed by using additional options (`--dependents`, `--manifest`, `--virtuals`, ...) described in the option descriptions.\n\n      Note that this command will only print the information directly related to the selected packages - if you wish to know why the package is there in the first place, use `yarn why` which will do just that (it also provides a `-R,--recursive` flag that may be of some help).\n    ",examples:[["Show information about Lodash","$0 info lodash"]]});var Tb=Pe(Ac());ls();var yu=class extends De{constructor(){super(...arguments);this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.immutable=z.Boolean("--immutable",{description:"Abort with an error exit code if the lockfile was to be modified"});this.immutableCache=z.Boolean("--immutable-cache",{description:"Abort with an error exit code if the cache folder was to be modified"});this.checkCache=z.Boolean("--check-cache",!1,{description:"Always refetch the packages and ensure that their checksums are consistent"});this.inlineBuilds=z.Boolean("--inline-builds",{description:"Verbosely print the output of the build steps of dependencies"});this.mode=z.String("--mode",{description:"Change what artifacts installs generate",validator:Zi(ts)});this.cacheFolder=z.String("--cache-folder",{hidden:!0});this.frozenLockfile=z.Boolean("--frozen-lockfile",{hidden:!0});this.ignoreEngines=z.Boolean("--ignore-engines",{hidden:!0});this.nonInteractive=z.Boolean("--non-interactive",{hidden:!0});this.preferOffline=z.Boolean("--prefer-offline",{hidden:!0});this.production=z.Boolean("--production",{hidden:!0});this.registry=z.String("--registry",{hidden:!0});this.silent=z.Boolean("--silent",{hidden:!0});this.networkTimeout=z.String("--network-timeout",{hidden:!0})}async execute(){var f;let t=await ye.find(this.context.cwd,this.context.plugins);typeof this.inlineBuilds<"u"&&t.useWithSource("<cli>",{enableInlineBuilds:this.inlineBuilds},t.startingCwd,{overwrite:!0});let i=!!process.env.FUNCTION_TARGET||!!process.env.GOOGLE_RUNTIME,n=async(h,{error:p})=>{let C=await Ge.start({configuration:t,stdout:this.context.stdout,includeFooter:!1},async y=>{p?y.reportError(50,h):y.reportWarning(50,h)});return C.hasErrors()?C.exitCode():null};if(typeof this.ignoreEngines<"u"){let h=await n("The --ignore-engines option is deprecated; engine checking isn't a core feature anymore",{error:!Tb.default.VERCEL});if(h!==null)return h}if(typeof this.registry<"u"){let h=await n("The --registry option is deprecated; prefer setting npmRegistryServer in your .yarnrc.yml file",{error:!1});if(h!==null)return h}if(typeof this.preferOffline<"u"){let h=await n("The --prefer-offline flag is deprecated; use the --cached flag with 'yarn add' instead",{error:!Tb.default.VERCEL});if(h!==null)return h}if(typeof this.production<"u"){let h=await n("The --production option is deprecated on 'install'; use 'yarn workspaces focus' instead",{error:!0});if(h!==null)return h}if(typeof this.nonInteractive<"u"){let h=await n("The --non-interactive option is deprecated",{error:!i});if(h!==null)return h}if(typeof this.frozenLockfile<"u"&&(await n("The --frozen-lockfile option is deprecated; use --immutable and/or --immutable-cache instead",{error:!1}),this.immutable=this.frozenLockfile),typeof this.cacheFolder<"u"){let h=await n("The cache-folder option has been deprecated; use rc settings instead",{error:!Tb.default.NETLIFY});if(h!==null)return h}let s=this.mode==="update-lockfile";if(s&&(this.immutable||this.immutableCache))throw new Qe(`${ee.pretty(t,"--immutable",ee.Type.CODE)} and ${ee.pretty(t,"--immutable-cache",ee.Type.CODE)} cannot be used with ${ee.pretty(t,"--mode=update-lockfile",ee.Type.CODE)}`);let o=((f=this.immutable)!=null?f:t.get("enableImmutableInstalls"))&&!s,a=this.immutableCache&&!s;if(t.projectCwd!==null){let h=await Ge.start({configuration:t,json:this.json,stdout:this.context.stdout,includeFooter:!1},async p=>{await NWe(t,o)&&(p.reportInfo(48,"Automatically fixed merge conflicts \u{1F44D}"),p.reportSeparator())});if(h.hasErrors())return h.exitCode()}if(t.projectCwd!==null&&typeof t.sources.get("nodeLinker")>"u"){let h=t.projectCwd,p;try{p=await M.readFilePromise(x.join(h,xt.lockfile),"utf8")}catch{}if(p!=null&&p.includes("yarn lockfile v1")){let C=await Ge.start({configuration:t,json:this.json,stdout:this.context.stdout,includeFooter:!1},async y=>{y.reportInfo(70,"Migrating from Yarn 1; automatically enabling the compatibility node-modules linker \u{1F44D}"),y.reportSeparator(),t.use("<compat>",{nodeLinker:"node-modules"},h,{overwrite:!0}),await ye.updateConfiguration(h,{nodeLinker:"node-modules"})});if(C.hasErrors())return C.exitCode()}}if(t.projectCwd!==null){let h=await Ge.start({configuration:t,json:this.json,stdout:this.context.stdout,includeFooter:!1},async p=>{var C;(C=ye.telemetry)!=null&&C.isNew&&(p.reportInfo(65,"Yarn will periodically gather anonymous telemetry: https://yarnpkg.com/advanced/telemetry"),p.reportInfo(65,`Run ${ee.pretty(t,"yarn config set --home enableTelemetry 0",ee.Type.CODE)} to disable`),p.reportSeparator())});if(h.hasErrors())return h.exitCode()}let{project:l,workspace:c}=await je.find(t,this.context.cwd),u=await Rt.find(t,{immutable:a,check:this.checkCache});if(!c)throw new ct(l.cwd,this.context.cwd);return await l.restoreInstallState({restoreResolutions:!1}),(await Ge.start({configuration:t,json:this.json,stdout:this.context.stdout,includeLogs:!0},async h=>{await l.install({cache:u,report:h,immutable:o,mode:this.mode})})).exitCode()}};yu.paths=[["install"],ve.Default],yu.usage=ve.Usage({description:"install the project dependencies",details:`
-      This command sets up your project if needed. The installation is split into four different steps that each have their own characteristics:
-
-      - **Resolution:** First the package manager will resolve your dependencies. The exact way a dependency version is privileged over another isn't standardized outside of the regular semver guarantees. If a package doesn't resolve to what you would expect, check that all dependencies are correctly declared (also check our website for more information: ).
-
-      - **Fetch:** Then we download all the dependencies if needed, and make sure that they're all stored within our cache (check the value of \`cacheFolder\` in \`yarn config\` to see where the cache files are stored).
-
-      - **Link:** Then we send the dependency tree information to internal plugins tasked with writing them on the disk in some form (for example by generating the .pnp.cjs file you might know).
-
-      - **Build:** Once the dependency tree has been written on the disk, the package manager will now be free to run the build scripts for all packages that might need it, in a topological order compatible with the way they depend on one another. See https://yarnpkg.com/advanced/lifecycle-scripts for detail.
-
-      Note that running this command is not part of the recommended workflow. Yarn supports zero-installs, which means that as long as you store your cache and your .pnp.cjs file inside your repository, everything will work without requiring any install right after cloning your repository or switching branches.
-
-      If the \`--immutable\` option is set (defaults to true on CI), Yarn will abort with an error exit code if the lockfile was to be modified (other paths can be added using the \`immutablePatterns\` configuration setting). For backward compatibility we offer an alias under the name of \`--frozen-lockfile\`, but it will be removed in a later release.
-
-      If the \`--immutable-cache\` option is set, Yarn will abort with an error exit code if the cache folder was to be modified (either because files would be added, or because they'd be removed).
-
-      If the \`--check-cache\` option is set, Yarn will always refetch the packages and will ensure that their checksum matches what's 1/ described in the lockfile 2/ inside the existing cache files (if present). This is recommended as part of your CI workflow if you're both following the Zero-Installs model and accepting PRs from third-parties, as they'd otherwise have the ability to alter the checked-in packages before submitting them.
-
-      If the \`--inline-builds\` option is set, Yarn will verbosely print the output of the build steps of your dependencies (instead of writing them into individual files). This is likely useful mostly for debug purposes only when using Docker-like environments.
-
-      If the \`--mode=<mode>\` option is set, Yarn will change which artifacts are generated. The modes currently supported are:
-
-      - \`skip-build\` will not run the build scripts at all. Note that this is different from setting \`enableScripts\` to false because the latter will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run.
-
-      - \`update-lockfile\` will skip the link step altogether, and only fetch packages that are missing from the lockfile (or that have no associated checksums). This mode is typically used by tools like Renovate or Dependabot to keep a lockfile up-to-date without incurring the full install cost.
-    `,examples:[["Install the project","$0 install"],["Validate a project when using Zero-Installs","$0 install --immutable --immutable-cache"],["Validate a project when using Zero-Installs (slightly safer if you accept external PRs)","$0 install --immutable --immutable-cache --check-cache"]]});var kWe="|||||||",RWe=">>>>>>>",FWe="=======",hae="<<<<<<<";async function NWe(r,e){if(!r.projectCwd)return!1;let t=x.join(r.projectCwd,r.get("lockfileFilename"));if(!await M.existsPromise(t))return!1;let i=await M.readFilePromise(t,"utf8");if(!i.includes(hae))return!1;if(e)throw new at(47,"Cannot autofix a lockfile when running an immutable install");let[n,s]=TWe(i),o,a;try{o=yi(n),a=yi(s)}catch{throw new at(46,"The individual variants of the lockfile failed to parse")}let l={...o,...a};for(let[c,u]of Object.entries(l))typeof u=="string"&&delete l[c];return await M.changeFilePromise(t,ba(l),{automaticNewlines:!0}),!0}function TWe(r){let e=[[],[]],t=r.split(/\r?\n/g),i=!1;for(;t.length>0;){let n=t.shift();if(typeof n>"u")throw new Error("Assertion failed: Some lines should remain");if(n.startsWith(hae)){for(;t.length>0;){let s=t.shift();if(typeof s>"u")throw new Error("Assertion failed: Some lines should remain");if(s===FWe){i=!1;break}else if(i||s.startsWith(kWe)){i=!0;continue}else e[0].push(s)}for(;t.length>0;){let s=t.shift();if(typeof s>"u")throw new Error("Assertion failed: Some lines should remain");if(s.startsWith(RWe))break;e[1].push(s)}}else e[0].push(n),e[1].push(n)}return[e[0].join(`
-`),e[1].join(`
-`)]}var wu=class extends De{constructor(){super(...arguments);this.all=z.Boolean("-A,--all",!1,{description:"Link all workspaces belonging to the target project to the current one"});this.private=z.Boolean("-p,--private",!1,{description:"Also link private workspaces belonging to the target project to the current one"});this.relative=z.Boolean("-r,--relative",!1,{description:"Link workspaces using relative paths instead of absolute paths"});this.destination=z.String()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd),s=await Rt.find(t);if(!n)throw new ct(i.cwd,this.context.cwd);await i.restoreInstallState({restoreResolutions:!1});let o=x.resolve(this.context.cwd,K.toPortablePath(this.destination)),a=await ye.find(o,this.context.plugins,{useRc:!1,strict:!1}),{project:l,workspace:c}=await je.find(a,o);if(i.cwd===l.cwd)throw new Qe("Invalid destination; Can't link the project to itself");if(!c)throw new ct(l.cwd,o);let u=i.topLevelWorkspace,g=[];if(this.all){for(let h of l.workspaces)h.manifest.name&&(!h.manifest.private||this.private)&&g.push(h);if(g.length===0)throw new Qe("No workspace found to be linked in the target project")}else{if(!c.manifest.name)throw new Qe("The target workspace doesn't have a name and thus cannot be linked");if(c.manifest.private&&!this.private)throw new Qe("The target workspace is marked private - use the --private flag to link it anyway");g.push(c)}for(let h of g){let p=P.stringifyIdent(h.locator),C=this.relative?x.relative(i.cwd,h.cwd):h.cwd;u.manifest.resolutions.push({pattern:{descriptor:{fullName:p}},reference:`portal:${C}`})}return(await Ge.start({configuration:t,stdout:this.context.stdout},async h=>{await i.install({cache:s,report:h})})).exitCode()}};wu.paths=[["link"]],wu.usage=ve.Usage({description:"connect the local project to another one",details:"\n      This command will set a new `resolutions` field in the project-level manifest and point it to the workspace at the specified location (even if part of another project).\n    ",examples:[["Register a remote workspace for use in the current project","$0 link ~/ts-loader"],["Register all workspaces from a remote project for use in the current project","$0 link ~/jest --all"]]});var Bu=class extends De{constructor(){super(...arguments);this.args=z.Proxy()}async execute(){return this.cli.run(["exec","node",...this.args])}};Bu.paths=[["node"]],Bu.usage=ve.Usage({description:"run node with the hook already setup",details:`
-      This command simply runs Node. It also makes sure to call it in a way that's compatible with the current project (for example, on PnP projects the environment will be setup in such a way that PnP will be correctly injected into the environment).
-
-      The Node process will use the exact same version of Node as the one used to run Yarn itself, which might be a good way to ensure that your commands always use a consistent Node version.
-    `,examples:[["Run a Node script","$0 node ./my-script.js"]]});var Iae=J("os");var pae=J("os");var LWe="https://raw.githubusercontent.com/yarnpkg/berry/master/plugins.yml";async function Qu(r){let e=await Xt.get(LWe,{configuration:r});return yi(e.toString())}var bu=class extends De{constructor(){super(...arguments);this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins);return(await Ge.start({configuration:t,json:this.json,stdout:this.context.stdout},async n=>{let s=await Qu(t);for(let[o,{experimental:a,...l}]of Object.entries(s)){let c=o;a&&(c+=" [experimental]"),n.reportJson({name:o,experimental:a,...l}),n.reportInfo(null,c)}})).exitCode()}};bu.paths=[["plugin","list"]],bu.usage=ve.Usage({category:"Plugin-related commands",description:"list the available official plugins",details:"\n      This command prints the plugins available directly from the Yarn repository. Only those plugins can be referenced by name in `yarn plugin import`.\n    ",examples:[["List the official plugins","$0 plugin list"]]});var OWe=/^[0-9]+$/;function dae(r){return OWe.test(r)?`pull/${r}/head`:r}var MWe=({repository:r,branch:e},t)=>[["git","init",K.fromPortablePath(t)],["git","remote","add","origin",r],["git","fetch","origin","--depth=1",dae(e)],["git","reset","--hard","FETCH_HEAD"]],KWe=({branch:r})=>[["git","fetch","origin","--depth=1",dae(r),"--force"],["git","reset","--hard","FETCH_HEAD"],["git","clean","-dfx"]],UWe=({plugins:r,noMinify:e},t)=>[["yarn","build:cli",...new Array().concat(...r.map(i=>["--plugin",x.resolve(t,i)])),...e?["--no-minify"]:[],"|"]],Su=class extends De{constructor(){super(...arguments);this.installPath=z.String("--path",{description:"The path where the repository should be cloned to"});this.repository=z.String("--repository","https://github.com/yarnpkg/berry.git",{description:"The repository that should be cloned"});this.branch=z.String("--branch","master",{description:"The branch of the repository that should be cloned"});this.plugins=z.Array("--plugin",[],{description:"An array of additional plugins that should be included in the bundle"});this.noMinify=z.Boolean("--no-minify",!1,{description:"Build a bundle for development (debugging) - non-minified and non-mangled"});this.force=z.Boolean("-f,--force",!1,{description:"Always clone the repository instead of trying to fetch the latest commits"});this.skipPlugins=z.Boolean("--skip-plugins",!1,{description:"Skip updating the contrib plugins"})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i}=await je.find(t,this.context.cwd),n=typeof this.installPath<"u"?x.resolve(this.context.cwd,K.toPortablePath(this.installPath)):x.resolve(K.toPortablePath((0,pae.tmpdir)()),"yarnpkg-sources",li.makeHash(this.repository).slice(0,6));return(await Ge.start({configuration:t,stdout:this.context.stdout},async o=>{await tO(this,{configuration:t,report:o,target:n}),o.reportSeparator(),o.reportInfo(0,"Building a fresh bundle"),o.reportSeparator(),await Wm(UWe(this,n),{configuration:t,context:this.context,target:n}),o.reportSeparator();let a=x.resolve(n,"packages/yarnpkg-cli/bundles/yarn.js"),l=await M.readFilePromise(a);await eO(t,"sources",l,{report:o}),this.skipPlugins||await HWe(this,{project:i,report:o,target:n})})).exitCode()}};Su.paths=[["set","version","from","sources"]],Su.usage=ve.Usage({description:"build Yarn from master",details:`
-      This command will clone the Yarn repository into a temporary folder, then build it. The resulting bundle will then be copied into the local project.
-
-      By default, it also updates all contrib plugins to the same commit the bundle is built from. This behavior can be disabled by using the \`--skip-plugins\` flag.
-    `,examples:[["Build Yarn from master","$0 set version from sources"]]});async function Wm(r,{configuration:e,context:t,target:i}){for(let[n,...s]of r){let o=s[s.length-1]==="|";if(o&&s.pop(),o)await Cr.pipevp(n,s,{cwd:i,stdin:t.stdin,stdout:t.stdout,stderr:t.stderr,strict:!0});else{t.stdout.write(`${ee.pretty(e,`  $ ${[n,...s].join(" ")}`,"grey")}
-`);try{await Cr.execvp(n,s,{cwd:i,strict:!0})}catch(a){throw t.stdout.write(a.stdout||a.stack),a}}}}async function tO(r,{configuration:e,report:t,target:i}){let n=!1;if(!r.force&&M.existsSync(x.join(i,".git"))){t.reportInfo(0,"Fetching the latest commits"),t.reportSeparator();try{await Wm(KWe(r),{configuration:e,context:r.context,target:i}),n=!0}catch{t.reportSeparator(),t.reportWarning(0,"Repository update failed; we'll try to regenerate it")}}n||(t.reportInfo(0,"Cloning the remote repository"),t.reportSeparator(),await M.removePromise(i),await M.mkdirPromise(i,{recursive:!0}),await Wm(MWe(r,i),{configuration:e,context:r.context,target:i}))}async function HWe(r,{project:e,report:t,target:i}){let n=await Qu(e.configuration),s=new Set(Object.keys(n));for(let o of e.configuration.plugins.keys())!s.has(o)||await rO(o,r,{project:e,report:t,target:i})}var Cae=Pe(Xr()),mae=J("url"),Eae=J("vm");var vu=class extends De{constructor(){super(...arguments);this.name=z.String()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins);return(await Ge.start({configuration:t,stdout:this.context.stdout},async n=>{let{project:s}=await je.find(t,this.context.cwd),o,a;if(this.name.match(/^\.{0,2}[\\/]/)||K.isAbsolute(this.name)){let l=x.resolve(this.context.cwd,K.toPortablePath(this.name));n.reportInfo(0,`Reading ${ee.pretty(t,l,ee.Type.PATH)}`),o=x.relative(s.cwd,l),a=await M.readFilePromise(l)}else{let l;if(this.name.match(/^https?:/)){try{new mae.URL(this.name)}catch{throw new at(52,`Plugin specifier "${this.name}" is neither a plugin name nor a valid url`)}o=this.name,l=this.name}else{let c=P.parseLocator(this.name.replace(/^((@yarnpkg\/)?plugin-)?/,"@yarnpkg/plugin-"));if(c.reference!=="unknown"&&!Cae.default.valid(c.reference))throw new at(0,"Official plugins only accept strict version references. Use an explicit URL if you wish to download them from another location.");let u=P.stringifyIdent(c),g=await Qu(t);if(!Object.prototype.hasOwnProperty.call(g,u))throw new at(51,`Couldn't find a plugin named "${u}" on the remote registry. Note that only the plugins referenced on our website (https://github.com/yarnpkg/berry/blob/master/plugins.yml) can be referenced by their name; any other plugin will have to be referenced through its public url (for example https://github.com/yarnpkg/berry/raw/master/packages/plugin-typescript/bin/%40yarnpkg/plugin-typescript.js).`);o=u,l=g[u].url,c.reference!=="unknown"?l=l.replace(/\/master\//,`/${u}/${c.reference}/`):Tr!==null&&(l=l.replace(/\/master\//,`/@yarnpkg/cli/${Tr}/`))}n.reportInfo(0,`Downloading ${ee.pretty(t,l,"green")}`),a=await Xt.get(l,{configuration:t})}await iO(o,a,{project:s,report:n})})).exitCode()}};vu.paths=[["plugin","import"]],vu.usage=ve.Usage({category:"Plugin-related commands",description:"download a plugin",details:`
-      This command downloads the specified plugin from its remote location and updates the configuration to reference it in further CLI invocations.
-
-      Three types of plugin references are accepted:
-
-      - If the plugin is stored within the Yarn repository, it can be referenced by name.
-      - Third-party plugins can be referenced directly through their public urls.
-      - Local plugins can be referenced by their path on the disk.
-
-      Plugins cannot be downloaded from the npm registry, and aren't allowed to have dependencies (they need to be bundled into a single file, possibly thanks to the \`@yarnpkg/builder\` package).
-    `,examples:[['Download and activate the "@yarnpkg/plugin-exec" plugin',"$0 plugin import @yarnpkg/plugin-exec"],['Download and activate the "@yarnpkg/plugin-exec" plugin (shorthand)',"$0 plugin import exec"],["Download and activate a community plugin","$0 plugin import https://example.org/path/to/plugin.js"],["Activate a local plugin","$0 plugin import ./path/to/plugin.js"]]});async function iO(r,e,{project:t,report:i}){let{configuration:n}=t,s={},o={exports:s};(0,Eae.runInNewContext)(e.toString(),{module:o,exports:s});let a=o.exports.name,l=`.yarn/plugins/${a}.cjs`,c=x.resolve(t.cwd,l);i.reportInfo(0,`Saving the new plugin in ${ee.pretty(n,l,"magenta")}`),await M.mkdirPromise(x.dirname(c),{recursive:!0}),await M.writeFilePromise(c,e);let u={path:l,spec:r};await ye.updateConfiguration(t.cwd,g=>{let f=[],h=!1;for(let p of g.plugins||[]){let C=typeof p!="string"?p.path:p,y=x.resolve(t.cwd,K.toPortablePath(C)),{name:B}=Ie.dynamicRequire(y);B!==a?f.push(p):(f.push(u),h=!0)}return h||f.push(u),{...g,plugins:f}})}var GWe=({pluginName:r,noMinify:e},t)=>[["yarn",`build:${r}`,...e?["--no-minify"]:[],"|"]],xu=class extends De{constructor(){super(...arguments);this.installPath=z.String("--path",{description:"The path where the repository should be cloned to"});this.repository=z.String("--repository","https://github.com/yarnpkg/berry.git",{description:"The repository that should be cloned"});this.branch=z.String("--branch","master",{description:"The branch of the repository that should be cloned"});this.noMinify=z.Boolean("--no-minify",!1,{description:"Build a plugin for development (debugging) - non-minified and non-mangled"});this.force=z.Boolean("-f,--force",!1,{description:"Always clone the repository instead of trying to fetch the latest commits"});this.name=z.String()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),i=typeof this.installPath<"u"?x.resolve(this.context.cwd,K.toPortablePath(this.installPath)):x.resolve(K.toPortablePath((0,Iae.tmpdir)()),"yarnpkg-sources",li.makeHash(this.repository).slice(0,6));return(await Ge.start({configuration:t,stdout:this.context.stdout},async s=>{let{project:o}=await je.find(t,this.context.cwd),a=P.parseIdent(this.name.replace(/^((@yarnpkg\/)?plugin-)?/,"@yarnpkg/plugin-")),l=P.stringifyIdent(a),c=await Qu(t);if(!Object.prototype.hasOwnProperty.call(c,l))throw new at(51,`Couldn't find a plugin named "${l}" on the remote registry. Note that only the plugins referenced on our website (https://github.com/yarnpkg/berry/blob/master/plugins.yml) can be built and imported from sources.`);let u=l;await tO(this,{configuration:t,report:s,target:i}),await rO(u,this,{project:o,report:s,target:i})})).exitCode()}};xu.paths=[["plugin","import","from","sources"]],xu.usage=ve.Usage({category:"Plugin-related commands",description:"build a plugin from sources",details:`
-      This command clones the Yarn repository into a temporary folder, builds the specified contrib plugin and updates the configuration to reference it in further CLI invocations.
-
-      The plugins can be referenced by their short name if sourced from the official Yarn repository.
-    `,examples:[['Build and activate the "@yarnpkg/plugin-exec" plugin',"$0 plugin import from sources @yarnpkg/plugin-exec"],['Build and activate the "@yarnpkg/plugin-exec" plugin (shorthand)',"$0 plugin import from sources exec"]]});async function rO(r,{context:e,noMinify:t},{project:i,report:n,target:s}){let o=r.replace(/@yarnpkg\//,""),{configuration:a}=i;n.reportSeparator(),n.reportInfo(0,`Building a fresh ${o}`),n.reportSeparator(),await Wm(GWe({pluginName:o,noMinify:t},s),{configuration:a,context:e,target:s}),n.reportSeparator();let l=x.resolve(s,`packages/${o}/bundles/${r}.js`),c=await M.readFilePromise(l);await iO(r,c,{project:i,report:n})}var Pu=class extends De{constructor(){super(...arguments);this.name=z.String()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i}=await je.find(t,this.context.cwd);return(await Ge.start({configuration:t,stdout:this.context.stdout},async s=>{let o=this.name,a=P.parseIdent(o);if(!t.plugins.has(o))throw new Qe(`${P.prettyIdent(t,a)} isn't referenced by the current configuration`);let l=`.yarn/plugins/${o}.cjs`,c=x.resolve(i.cwd,l);M.existsSync(c)&&(s.reportInfo(0,`Removing ${ee.pretty(t,l,ee.Type.PATH)}...`),await M.removePromise(c)),s.reportInfo(0,"Updating the configuration..."),await ye.updateConfiguration(i.cwd,u=>{if(!Array.isArray(u.plugins))return u;let g=u.plugins.filter(f=>f.path!==l);return u.plugins.length===g.length?u:{...u,plugins:g}})})).exitCode()}};Pu.paths=[["plugin","remove"]],Pu.usage=ve.Usage({category:"Plugin-related commands",description:"remove a plugin",details:`
-      This command deletes the specified plugin from the .yarn/plugins folder and removes it from the configuration.
-
-      **Note:** The plugins have to be referenced by their name property, which can be obtained using the \`yarn plugin runtime\` command. Shorthands are not allowed.
-   `,examples:[["Remove a plugin imported from the Yarn repository","$0 plugin remove @yarnpkg/plugin-typescript"],["Remove a plugin imported from a local file","$0 plugin remove my-local-plugin"]]});var Du=class extends De{constructor(){super(...arguments);this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins);return(await Ge.start({configuration:t,json:this.json,stdout:this.context.stdout},async n=>{for(let s of t.plugins.keys()){let o=this.context.plugins.plugins.has(s),a=s;o&&(a+=" [builtin]"),n.reportJson({name:s,builtin:o}),n.reportInfo(null,`${a}`)}})).exitCode()}};Du.paths=[["plugin","runtime"]],Du.usage=ve.Usage({category:"Plugin-related commands",description:"list the active plugins",details:`
-      This command prints the currently active plugins. Will be displayed both builtin plugins and external plugins.
-    `,examples:[["List the currently active plugins","$0 plugin runtime"]]});var ku=class extends De{constructor(){super(...arguments);this.idents=z.Rest()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd),s=await Rt.find(t);if(!n)throw new ct(i.cwd,this.context.cwd);let o=new Set;for(let l of this.idents)o.add(P.parseIdent(l).identHash);if(await i.restoreInstallState({restoreResolutions:!1}),await i.resolveEverything({cache:s,report:new ti}),o.size>0)for(let l of i.storedPackages.values())o.has(l.identHash)&&i.storedBuildState.delete(l.locatorHash);else i.storedBuildState.clear();return(await Ge.start({configuration:t,stdout:this.context.stdout,includeLogs:!this.context.quiet},async l=>{await i.install({cache:s,report:l})})).exitCode()}};ku.paths=[["rebuild"]],ku.usage=ve.Usage({description:"rebuild the project's native packages",details:`
-      This command will automatically cause Yarn to forget about previous compilations of the given packages and to run them again.
-
-      Note that while Yarn forgets the compilation, the previous artifacts aren't erased from the filesystem and may affect the next builds (in good or bad). To avoid this, you may remove the .yarn/unplugged folder, or any other relevant location where packages might have been stored (Yarn may offer a way to do that automatically in the future).
-
-      By default all packages will be rebuilt, but you can filter the list by specifying the names of the packages you want to clear from memory.
-    `,examples:[["Rebuild all packages","$0 rebuild"],["Rebuild fsevents only","$0 rebuild fsevents"]]});var nO=Pe(Bn());ls();var Ru=class extends De{constructor(){super(...arguments);this.all=z.Boolean("-A,--all",!1,{description:"Apply the operation to all workspaces from the current project"});this.mode=z.String("--mode",{description:"Change what artifacts installs generate",validator:Zi(ts)});this.patterns=z.Rest()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd),s=await Rt.find(t);if(!n)throw new ct(i.cwd,this.context.cwd);await i.restoreInstallState({restoreResolutions:!1});let o=this.all?i.workspaces:[n],a=["dependencies","devDependencies","peerDependencies"],l=[],c=!1,u=[];for(let p of this.patterns){let C=!1,y=P.parseIdent(p);for(let B of o){let v=[...B.manifest.peerDependenciesMeta.keys()];for(let D of(0,nO.default)(v,p))B.manifest.peerDependenciesMeta.delete(D),c=!0,C=!0;for(let D of a){let T=B.manifest.getForScope(D),H=[...T.values()].map(j=>P.stringifyIdent(j));for(let j of(0,nO.default)(H,P.stringifyIdent(y))){let{identHash:$}=P.parseIdent(j),V=T.get($);if(typeof V>"u")throw new Error("Assertion failed: Expected the descriptor to be registered");B.manifest[D].delete($),u.push([B,D,V]),c=!0,C=!0}}}C||l.push(p)}let g=l.length>1?"Patterns":"Pattern",f=l.length>1?"don't":"doesn't",h=this.all?"any":"this";if(l.length>0)throw new Qe(`${g} ${ee.prettyList(t,l,xi.CODE)} ${f} match any packages referenced by ${h} workspace`);return c?(await t.triggerMultipleHooks(C=>C.afterWorkspaceDependencyRemoval,u),(await Ge.start({configuration:t,stdout:this.context.stdout},async C=>{await i.install({cache:s,report:C,mode:this.mode})})).exitCode()):0}};Ru.paths=[["remove"]],Ru.usage=ve.Usage({description:"remove dependencies from the project",details:`
-      This command will remove the packages matching the specified patterns from the current workspace.
-
-      If the \`--mode=<mode>\` option is set, Yarn will change which artifacts are generated. The modes currently supported are:
-
-      - \`skip-build\` will not run the build scripts at all. Note that this is different from setting \`enableScripts\` to false because the latter will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run.
-
-      - \`update-lockfile\` will skip the link step altogether, and only fetch packages that are missing from the lockfile (or that have no associated checksums). This mode is typically used by tools like Renovate or Dependabot to keep a lockfile up-to-date without incurring the full install cost.
-
-      This command accepts glob patterns as arguments (if valid Idents and supported by [micromatch](https://github.com/micromatch/micromatch)). Make sure to escape the patterns, to prevent your own shell from trying to expand them.
-    `,examples:[["Remove a dependency from the current project","$0 remove lodash"],["Remove a dependency from all workspaces at once","$0 remove lodash --all"],["Remove all dependencies starting with `eslint-`","$0 remove 'eslint-*'"],["Remove all dependencies with the `@babel` scope","$0 remove '@babel/*'"],["Remove all dependencies matching `react-dom` or `react-helmet`","$0 remove 'react-{dom,helmet}'"]]});var yae=J("util"),_h=class extends De{async execute(){let e=await ye.find(this.context.cwd,this.context.plugins),{project:t,workspace:i}=await je.find(e,this.context.cwd);if(!i)throw new ct(t.cwd,this.context.cwd);return(await Ge.start({configuration:e,stdout:this.context.stdout},async s=>{let o=i.manifest.scripts,a=Ie.sortMap(o.keys(),u=>u),l={breakLength:1/0,colors:e.get("enableColors"),maxArrayLength:2},c=a.reduce((u,g)=>Math.max(u,g.length),0);for(let[u,g]of o.entries())s.reportInfo(null,`${u.padEnd(c," ")}   ${(0,yae.inspect)(g,l)}`)})).exitCode()}};_h.paths=[["run"]];var Fu=class extends De{constructor(){super(...arguments);this.inspect=z.String("--inspect",!1,{tolerateBoolean:!0,description:"Forwarded to the underlying Node process when executing a binary"});this.inspectBrk=z.String("--inspect-brk",!1,{tolerateBoolean:!0,description:"Forwarded to the underlying Node process when executing a binary"});this.topLevel=z.Boolean("-T,--top-level",!1,{description:"Check the root workspace for scripts and/or binaries instead of the current one"});this.binariesOnly=z.Boolean("-B,--binaries-only",!1,{description:"Ignore any user defined scripts and only check for binaries"});this.silent=z.Boolean("--silent",{hidden:!0});this.scriptName=z.String();this.args=z.Proxy()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n,locator:s}=await je.find(t,this.context.cwd);await i.restoreInstallState();let o=this.topLevel?i.topLevelWorkspace.anchoredLocator:s;if(!this.binariesOnly&&await Wt.hasPackageScript(o,this.scriptName,{project:i}))return await Wt.executePackageScript(o,this.scriptName,this.args,{project:i,stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr});let a=await Wt.getPackageAccessibleBinaries(o,{project:i});if(a.get(this.scriptName)){let c=[];return this.inspect&&(typeof this.inspect=="string"?c.push(`--inspect=${this.inspect}`):c.push("--inspect")),this.inspectBrk&&(typeof this.inspectBrk=="string"?c.push(`--inspect-brk=${this.inspectBrk}`):c.push("--inspect-brk")),await Wt.executePackageAccessibleBinary(o,this.scriptName,this.args,{cwd:this.context.cwd,project:i,stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr,nodeArgs:c,packageAccessibleBinaries:a})}if(!this.topLevel&&!this.binariesOnly&&n&&this.scriptName.includes(":")){let u=(await Promise.all(i.workspaces.map(async g=>g.manifest.scripts.has(this.scriptName)?g:null))).filter(g=>g!==null);if(u.length===1)return await Wt.executeWorkspaceScript(u[0],this.scriptName,this.args,{stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr})}if(this.topLevel)throw this.scriptName==="node-gyp"?new Qe(`Couldn't find a script name "${this.scriptName}" in the top-level (used by ${P.prettyLocator(t,s)}). This typically happens because some package depends on "node-gyp" to build itself, but didn't list it in their dependencies. To fix that, please run "yarn add node-gyp" into your top-level workspace. You also can open an issue on the repository of the specified package to suggest them to use an optional peer dependency.`):new Qe(`Couldn't find a script name "${this.scriptName}" in the top-level (used by ${P.prettyLocator(t,s)}).`);{if(this.scriptName==="global")throw new Qe("The 'yarn global' commands have been removed in 2.x - consider using 'yarn dlx' or a third-party plugin instead");let c=[this.scriptName].concat(this.args);for(let[u,g]of vh)for(let f of g)if(c.length>=f.length&&JSON.stringify(c.slice(0,f.length))===JSON.stringify(f))throw new Qe(`Couldn't find a script named "${this.scriptName}", but a matching command can be found in the ${u} plugin. You can install it with "yarn plugin import ${u}".`);throw new Qe(`Couldn't find a script named "${this.scriptName}".`)}}};Fu.paths=[["run"]],Fu.usage=ve.Usage({description:"run a script defined in the package.json",details:`
-      This command will run a tool. The exact tool that will be executed will depend on the current state of your workspace:
-
-      - If the \`scripts\` field from your local package.json contains a matching script name, its definition will get executed.
-
-      - Otherwise, if one of the local workspace's dependencies exposes a binary with a matching name, this binary will get executed.
-
-      - Otherwise, if the specified name contains a colon character and if one of the workspaces in the project contains exactly one script with a matching name, then this script will get executed.
-
-      Whatever happens, the cwd of the spawned process will be the workspace that declares the script (which makes it possible to call commands cross-workspaces using the third syntax).
-    `,examples:[["Run the tests from the local workspace","$0 run test"],['Same thing, but without the "run" keyword',"$0 test"],["Inspect Webpack while running","$0 run --inspect-brk webpack"]]});var Nu=class extends De{constructor(){super(...arguments);this.save=z.Boolean("-s,--save",!1,{description:"Persist the resolution inside the top-level manifest"});this.descriptor=z.String();this.resolution=z.String()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd),s=await Rt.find(t);if(await i.restoreInstallState({restoreResolutions:!1}),!n)throw new ct(i.cwd,this.context.cwd);let o=P.parseDescriptor(this.descriptor,!0),a=P.makeDescriptor(o,this.resolution);return i.storedDescriptors.set(o.descriptorHash,o),i.storedDescriptors.set(a.descriptorHash,a),i.resolutionAliases.set(o.descriptorHash,a.descriptorHash),(await Ge.start({configuration:t,stdout:this.context.stdout},async c=>{await i.install({cache:s,report:c})})).exitCode()}};Nu.paths=[["set","resolution"]],Nu.usage=ve.Usage({description:"enforce a package resolution",details:'\n      This command updates the resolution table so that `descriptor` is resolved by `resolution`.\n\n      Note that by default this command only affect the current resolution table - meaning that this "manual override" will disappear if you remove the lockfile, or if the package disappear from the table. If you wish to make the enforced resolution persist whatever happens, add the `-s,--save` flag which will also edit the `resolutions` field from your top-level manifest.\n\n      Note that no attempt is made at validating that `resolution` is a valid resolution entry for `descriptor`.\n    ',examples:[["Force all instances of lodash@npm:^1.2.3 to resolve to 1.5.0","$0 set resolution lodash@npm:^1.2.3 1.5.0"]]});var wae=Pe(Bn()),Tu=class extends De{constructor(){super(...arguments);this.all=z.Boolean("-A,--all",!1,{description:"Unlink all workspaces belonging to the target project from the current one"});this.leadingArguments=z.Rest()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd),s=await Rt.find(t);if(!n)throw new ct(i.cwd,this.context.cwd);let o=i.topLevelWorkspace,a=new Set;if(this.leadingArguments.length===0&&this.all)for(let{pattern:c,reference:u}of o.manifest.resolutions)u.startsWith("portal:")&&a.add(c.descriptor.fullName);if(this.leadingArguments.length>0)for(let c of this.leadingArguments){let u=x.resolve(this.context.cwd,K.toPortablePath(c));if(Ie.isPathLike(c)){let g=await ye.find(u,this.context.plugins,{useRc:!1,strict:!1}),{project:f,workspace:h}=await je.find(g,u);if(!h)throw new ct(f.cwd,u);if(this.all){for(let p of f.workspaces)p.manifest.name&&a.add(P.stringifyIdent(p.locator));if(a.size===0)throw new Qe("No workspace found to be unlinked in the target project")}else{if(!h.manifest.name)throw new Qe("The target workspace doesn't have a name and thus cannot be unlinked");a.add(P.stringifyIdent(h.locator))}}else{let g=[...o.manifest.resolutions.map(({pattern:f})=>f.descriptor.fullName)];for(let f of(0,wae.default)(g,c))a.add(f)}}return o.manifest.resolutions=o.manifest.resolutions.filter(({pattern:c})=>!a.has(c.descriptor.fullName)),(await Ge.start({configuration:t,stdout:this.context.stdout},async c=>{await i.install({cache:s,report:c})})).exitCode()}};Tu.paths=[["unlink"]],Tu.usage=ve.Usage({description:"disconnect the local project from another one",details:`
-      This command will remove any resolutions in the project-level manifest that would have been added via a yarn link with similar arguments.
-    `,examples:[["Unregister a remote workspace in the current project","$0 unlink ~/ts-loader"],["Unregister all workspaces from a remote project in the current project","$0 unlink ~/jest --all"],["Unregister all previously linked workspaces","$0 unlink --all"],["Unregister all workspaces matching a glob","$0 unlink '@babel/*' 'pkg-{a,b}'"]]});var Bae=Pe(Km()),sO=Pe(Bn());ls();var El=class extends De{constructor(){super(...arguments);this.interactive=z.Boolean("-i,--interactive",{description:"Offer various choices, depending on the detected upgrade paths"});this.exact=z.Boolean("-E,--exact",!1,{description:"Don't use any semver modifier on the resolved range"});this.tilde=z.Boolean("-T,--tilde",!1,{description:"Use the `~` semver modifier on the resolved range"});this.caret=z.Boolean("-C,--caret",!1,{description:"Use the `^` semver modifier on the resolved range"});this.recursive=z.Boolean("-R,--recursive",!1,{description:"Resolve again ALL resolutions for those packages"});this.mode=z.String("--mode",{description:"Change what artifacts installs generate",validator:Zi(ts)});this.patterns=z.Rest()}async execute(){return this.recursive?await this.executeUpRecursive():await this.executeUpClassic()}async executeUpRecursive(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd),s=await Rt.find(t);if(!n)throw new ct(i.cwd,this.context.cwd);await i.restoreInstallState({restoreResolutions:!1});let o=[...i.storedDescriptors.values()],a=o.map(g=>P.stringifyIdent(g)),l=new Set;for(let g of this.patterns){if(P.parseDescriptor(g).range!=="unknown")throw new Qe("Ranges aren't allowed when using --recursive");for(let f of(0,sO.default)(a,g)){let h=P.parseIdent(f);l.add(h.identHash)}}let c=o.filter(g=>l.has(g.identHash));for(let g of c)i.storedDescriptors.delete(g.descriptorHash),i.storedResolutions.delete(g.descriptorHash);return(await Ge.start({configuration:t,stdout:this.context.stdout},async g=>{await i.install({cache:s,report:g})})).exitCode()}async executeUpClassic(){var y;let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd),s=await Rt.find(t);if(!n)throw new ct(i.cwd,this.context.cwd);await i.restoreInstallState({restoreResolutions:!1});let o=(y=this.interactive)!=null?y:t.get("preferInteractive"),a=Hm(this,i),l=o?["keep","reuse","project","latest"]:["project","latest"],c=[],u=[];for(let B of this.patterns){let v=!1,D=P.parseDescriptor(B);for(let T of i.workspaces)for(let H of["dependencies","devDependencies"]){let $=[...T.manifest.getForScope(H).values()].map(V=>P.stringifyIdent(V));for(let V of(0,sO.default)($,P.stringifyIdent(D))){let W=P.parseIdent(V),_=T.manifest[H].get(W.identHash);if(typeof _>"u")throw new Error("Assertion failed: Expected the descriptor to be registered");let A=P.makeDescriptor(W,D.range);c.push(Promise.resolve().then(async()=>[T,H,_,await Gm(A,{project:i,workspace:T,cache:s,target:H,modifier:a,strategies:l})])),v=!0}}v||u.push(B)}if(u.length>1)throw new Qe(`Patterns ${ee.prettyList(t,u,xi.CODE)} don't match any packages referenced by any workspace`);if(u.length>0)throw new Qe(`Pattern ${ee.prettyList(t,u,xi.CODE)} doesn't match any packages referenced by any workspace`);let g=await Promise.all(c),f=await ra.start({configuration:t,stdout:this.context.stdout,suggestInstall:!1},async B=>{for(let[,,v,{suggestions:D,rejections:T}]of g){let H=D.filter(j=>j.descriptor!==null);if(H.length===0){let[j]=T;if(typeof j>"u")throw new Error("Assertion failed: Expected an error to have been set");let $=this.cli.error(j);i.configuration.get("enableNetwork")?B.reportError(27,`${P.prettyDescriptor(t,v)} can't be resolved to a satisfying range
-
-${$}`):B.reportError(27,`${P.prettyDescriptor(t,v)} can't be resolved to a satisfying range (note: network resolution has been disabled)
-
-${$}`)}else H.length>1&&!o&&B.reportError(27,`${P.prettyDescriptor(t,v)} has multiple possible upgrade strategies; use -i to disambiguate manually`)}});if(f.hasErrors())return f.exitCode();let h=!1,p=[];for(let[B,v,,{suggestions:D}]of g){let T,H=D.filter(W=>W.descriptor!==null),j=H[0].descriptor,$=H.every(W=>P.areDescriptorsEqual(W.descriptor,j));H.length===1||$?T=j:(h=!0,{answer:T}=await(0,Bae.prompt)({type:"select",name:"answer",message:`Which range to you want to use in ${P.prettyWorkspace(t,B)} \u276F ${v}?`,choices:D.map(({descriptor:W,name:_,reason:A})=>W?{name:_,hint:A,descriptor:W}:{name:_,hint:A,disabled:!0}),onCancel:()=>process.exit(130),result(W){return this.find(W,"descriptor")},stdin:this.context.stdin,stdout:this.context.stdout}));let V=B.manifest[v].get(T.identHash);if(typeof V>"u")throw new Error("Assertion failed: This descriptor should have a matching entry");if(V.descriptorHash!==T.descriptorHash)B.manifest[v].set(T.identHash,T),p.push([B,v,V,T]);else{let W=t.makeResolver(),_={project:i,resolver:W},A=W.bindDescriptor(V,B.anchoredLocator,_);i.forgetResolution(A)}}return await t.triggerMultipleHooks(B=>B.afterWorkspaceDependencyReplacement,p),h&&this.context.stdout.write(`
-`),(await Ge.start({configuration:t,stdout:this.context.stdout},async B=>{await i.install({cache:s,report:B,mode:this.mode})})).exitCode()}};El.paths=[["up"]],El.usage=ve.Usage({description:"upgrade dependencies across the project",details:"\n      This command upgrades the packages matching the list of specified patterns to their latest available version across the whole project (regardless of whether they're part of `dependencies` or `devDependencies` - `peerDependencies` won't be affected). This is a project-wide command: all workspaces will be upgraded in the process.\n\n      If `-R,--recursive` is set the command will change behavior and no other switch will be allowed. When operating under this mode `yarn up` will force all ranges matching the selected packages to be resolved again (often to the highest available versions) before being stored in the lockfile. It however won't touch your manifests anymore, so depending on your needs you might want to run both `yarn up` and `yarn up -R` to cover all bases.\n\n      If `-i,--interactive` is set (or if the `preferInteractive` settings is toggled on) the command will offer various choices, depending on the detected upgrade paths. Some upgrades require this flag in order to resolve ambiguities.\n\n      The, `-C,--caret`, `-E,--exact` and  `-T,--tilde` options have the same meaning as in the `add` command (they change the modifier used when the range is missing or a tag, and are ignored when the range is explicitly set).\n\n      If the `--mode=<mode>` option is set, Yarn will change which artifacts are generated. The modes currently supported are:\n\n      - `skip-build` will not run the build scripts at all. Note that this is different from setting `enableScripts` to false because the latter will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run.\n\n      - `update-lockfile` will skip the link step altogether, and only fetch packages that are missing from the lockfile (or that have no associated checksums). This mode is typically used by tools like Renovate or Dependabot to keep a lockfile up-to-date without incurring the full install cost.\n\n      Generally you can see `yarn up` as a counterpart to what was `yarn upgrade --latest` in Yarn 1 (ie it ignores the ranges previously listed in your manifests), but unlike `yarn upgrade` which only upgraded dependencies in the current workspace, `yarn up` will upgrade all workspaces at the same time.\n\n      This command accepts glob patterns as arguments (if valid Descriptors and supported by [micromatch](https://github.com/micromatch/micromatch)). Make sure to escape the patterns, to prevent your own shell from trying to expand them.\n\n      **Note:** The ranges have to be static, only the package scopes and names can contain glob patterns.\n    ",examples:[["Upgrade all instances of lodash to the latest release","$0 up lodash"],["Upgrade all instances of lodash to the latest release, but ask confirmation for each","$0 up lodash -i"],["Upgrade all instances of lodash to 1.2.3","$0 up lodash@1.2.3"],["Upgrade all instances of packages with the `@babel` scope to the latest release","$0 up '@babel/*'"],["Upgrade all instances of packages containing the word `jest` to the latest release","$0 up '*jest*'"],["Upgrade all instances of packages with the `@babel` scope to 7.0.0","$0 up '@babel/*@7.0.0'"]]}),El.schema=[av("recursive",lc.Forbids,["interactive","exact","tilde","caret"],{ignore:[void 0,!1]})];var Lu=class extends De{constructor(){super(...arguments);this.recursive=z.Boolean("-R,--recursive",!1,{description:"List, for each workspace, what are all the paths that lead to the dependency"});this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.peers=z.Boolean("--peers",!1,{description:"Also print the peer dependencies that match the specified name"});this.package=z.String()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd);if(!n)throw new ct(i.cwd,this.context.cwd);await i.restoreInstallState();let s=P.parseIdent(this.package).identHash,o=this.recursive?jWe(i,s,{configuration:t,peers:this.peers}):YWe(i,s,{configuration:t,peers:this.peers});es.emitTree(o,{configuration:t,stdout:this.context.stdout,json:this.json,separators:1})}};Lu.paths=[["why"]],Lu.usage=ve.Usage({description:"display the reason why a package is needed",details:`
-      This command prints the exact reasons why a package appears in the dependency tree.
-
-      If \`-R,--recursive\` is set, the listing will go in depth and will list, for each workspaces, what are all the paths that lead to the dependency. Note that the display is somewhat optimized in that it will not print the package listing twice for a single package, so if you see a leaf named "Foo" when looking for "Bar", it means that "Foo" already got printed higher in the tree.
-    `,examples:[["Explain why lodash is used in your project","$0 why lodash"]]});function YWe(r,e,{configuration:t,peers:i}){let n=Ie.sortMap(r.storedPackages.values(),a=>P.stringifyLocator(a)),s={},o={children:s};for(let a of n){let l={};for(let u of a.dependencies.values()){if(!i&&a.peerDependencies.has(u.identHash))continue;let g=r.storedResolutions.get(u.descriptorHash);if(!g)throw new Error("Assertion failed: The resolution should have been registered");let f=r.storedPackages.get(g);if(!f)throw new Error("Assertion failed: The package should have been registered");if(f.identHash!==e)continue;{let p=P.stringifyLocator(a);s[p]={value:[a,ee.Type.LOCATOR],children:l}}let h=P.stringifyLocator(f);l[h]={value:[{descriptor:u,locator:f},ee.Type.DEPENDENT]}}}return o}function jWe(r,e,{configuration:t,peers:i}){let n=Ie.sortMap(r.workspaces,f=>P.stringifyLocator(f.anchoredLocator)),s=new Set,o=new Set,a=f=>{if(s.has(f.locatorHash))return o.has(f.locatorHash);if(s.add(f.locatorHash),f.identHash===e)return o.add(f.locatorHash),!0;let h=!1;f.identHash===e&&(h=!0);for(let p of f.dependencies.values()){if(!i&&f.peerDependencies.has(p.identHash))continue;let C=r.storedResolutions.get(p.descriptorHash);if(!C)throw new Error("Assertion failed: The resolution should have been registered");let y=r.storedPackages.get(C);if(!y)throw new Error("Assertion failed: The package should have been registered");a(y)&&(h=!0)}return h&&o.add(f.locatorHash),h};for(let f of n){let h=r.storedPackages.get(f.anchoredLocator.locatorHash);if(!h)throw new Error("Assertion failed: The package should have been registered");a(h)}let l=new Set,c={},u={children:c},g=(f,h,p)=>{if(!o.has(f.locatorHash))return;let C=p!==null?ee.tuple(ee.Type.DEPENDENT,{locator:f,descriptor:p}):ee.tuple(ee.Type.LOCATOR,f),y={},B={value:C,children:y},v=P.stringifyLocator(f);if(h[v]=B,!l.has(f.locatorHash)&&(l.add(f.locatorHash),!(p!==null&&r.tryWorkspaceByLocator(f))))for(let D of f.dependencies.values()){if(!i&&f.peerDependencies.has(D.identHash))continue;let T=r.storedResolutions.get(D.descriptorHash);if(!T)throw new Error("Assertion failed: The resolution should have been registered");let H=r.storedPackages.get(T);if(!H)throw new Error("Assertion failed: The package should have been registered");g(H,y,D)}};for(let f of n){let h=r.storedPackages.get(f.anchoredLocator.locatorHash);if(!h)throw new Error("Assertion failed: The package should have been registered");g(h,c,null)}return u}var dO={};ut(dO,{default:()=>c4e,gitUtils:()=>AA});var AA={};ut(AA,{TreeishProtocols:()=>Lb,clone:()=>pO,fetchBase:()=>qae,fetchChangedFiles:()=>Jae,fetchChangedWorkspaces:()=>A4e,fetchRoot:()=>jae,isGitUrl:()=>ep,lsRemote:()=>Yae,normalizeLocator:()=>fO,normalizeRepoUrl:()=>Vm,resolveUrl:()=>hO,splitRepoUrl:()=>zm});var gO=Pe(Oae()),Hae=Pe(PB()),$h=Pe(J("querystring")),cO=Pe(Xr());var Kae=J("url");function lO(r,e,t){let i=r.indexOf(t);return r.lastIndexOf(e,i>-1?i:1/0)}function Mae(r){try{return new Kae.URL(r)}catch{return}}function o4e(r){let e=lO(r,"@","#"),t=lO(r,":","#");return t>e&&(r=`${r.slice(0,t)}/${r.slice(t+1)}`),lO(r,":","#")===-1&&r.indexOf("//")===-1&&(r=`ssh://${r}`),r}function Uae(r){return Mae(r)||Mae(o4e(r))}function Gae(){return{...process.env,GIT_SSH_COMMAND:process.env.GIT_SSH_COMMAND||`${process.env.GIT_SSH||"ssh"} -o BatchMode=yes`}}var a4e=[/^ssh:/,/^git(?:\+[^:]+)?:/,/^(?:git\+)?https?:[^#]+\/[^#]+(?:\.git)(?:#.*)?$/,/^git@[^#]+\/[^#]+\.git(?:#.*)?$/,/^(?:github:|https:\/\/github\.com\/)?(?!\.{1,2}\/)([a-zA-Z._0-9-]+)\/(?!\.{1,2}(?:#|$))([a-zA-Z._0-9-]+?)(?:\.git)?(?:#.*)?$/,/^https:\/\/github\.com\/(?!\.{1,2}\/)([a-zA-Z0-9._-]+)\/(?!\.{1,2}(?:#|$))([a-zA-Z0-9._-]+?)\/tarball\/(.+)?$/],Lb=(n=>(n.Commit="commit",n.Head="head",n.Tag="tag",n.Semver="semver",n))(Lb||{});function ep(r){return r?a4e.some(e=>!!r.match(e)):!1}function zm(r){r=Vm(r);let e=r.indexOf("#");if(e===-1)return{repo:r,treeish:{protocol:"head",request:"HEAD"},extra:{}};let t=r.slice(0,e),i=r.slice(e+1);if(i.match(/^[a-z]+=/)){let n=$h.default.parse(i);for(let[l,c]of Object.entries(n))if(typeof c!="string")throw new Error(`Assertion failed: The ${l} parameter must be a literal string`);let s=Object.values(Lb).find(l=>Object.prototype.hasOwnProperty.call(n,l)),o,a;typeof s<"u"?(o=s,a=n[s]):(o="head",a="HEAD");for(let l of Object.values(Lb))delete n[l];return{repo:t,treeish:{protocol:o,request:a},extra:n}}else{let n=i.indexOf(":"),s,o;return n===-1?(s=null,o=i):(s=i.slice(0,n),o=i.slice(n+1)),{repo:t,treeish:{protocol:s,request:o},extra:{}}}}function Vm(r,{git:e=!1}={}){if(r=r.replace(/^git\+https:/,"https:"),r=r.replace(/^(?:github:|https:\/\/github\.com\/|git:\/\/github\.com\/)?(?!\.{1,2}\/)([a-zA-Z0-9._-]+)\/(?!\.{1,2}(?:#|$))([a-zA-Z0-9._-]+?)(?:\.git)?(#.*)?$/,"https://github.com/$1/$2.git$3"),r=r.replace(/^https:\/\/github\.com\/(?!\.{1,2}\/)([a-zA-Z0-9._-]+)\/(?!\.{1,2}(?:#|$))([a-zA-Z0-9._-]+?)\/tarball\/(.+)?$/,"https://github.com/$1/$2.git#$3"),e){let t=Uae(r);t&&(r=t.href),r=r.replace(/^git\+([^:]+):/,"$1:")}return r}function fO(r){return P.makeLocator(r,Vm(r.reference))}async function Yae(r,e){let t=Vm(r,{git:!0});if(!Xt.getNetworkSettings(`https://${(0,gO.default)(t).resource}`,{configuration:e}).enableNetwork)throw new Error(`Request to '${t}' has been blocked because of your configuration settings`);let n=await uO("listing refs",["ls-remote",t],{cwd:e.startingCwd,env:Gae()},{configuration:e,normalizedRepoUrl:t}),s=new Map,o=/^([a-f0-9]{40})\t([^\n]+)/gm,a;for(;(a=o.exec(n.stdout))!==null;)s.set(a[2],a[1]);return s}async function hO(r,e){let{repo:t,treeish:{protocol:i,request:n},extra:s}=zm(r),o=await Yae(t,e),a=(c,u)=>{switch(c){case"commit":{if(!u.match(/^[a-f0-9]{40}$/))throw new Error("Invalid commit hash");return $h.default.stringify({...s,commit:u})}case"head":{let g=o.get(u==="HEAD"?u:`refs/heads/${u}`);if(typeof g>"u")throw new Error(`Unknown head ("${u}")`);return $h.default.stringify({...s,commit:g})}case"tag":{let g=o.get(`refs/tags/${u}`);if(typeof g>"u")throw new Error(`Unknown tag ("${u}")`);return $h.default.stringify({...s,commit:g})}case"semver":{let g=vt.validRange(u);if(!g)throw new Error(`Invalid range ("${u}")`);let f=new Map([...o.entries()].filter(([p])=>p.startsWith("refs/tags/")).map(([p,C])=>[cO.default.parse(p.slice(10)),C]).filter(p=>p[0]!==null)),h=cO.default.maxSatisfying([...f.keys()],g);if(h===null)throw new Error(`No matching range ("${u}")`);return $h.default.stringify({...s,commit:f.get(h)})}case null:{let g;if((g=l("commit",u))!==null||(g=l("tag",u))!==null||(g=l("head",u))!==null)return g;throw u.match(/^[a-f0-9]+$/)?new Error(`Couldn't resolve "${u}" as either a commit, a tag, or a head - if a commit, use the 40-characters commit hash`):new Error(`Couldn't resolve "${u}" as either a commit, a tag, or a head`)}default:throw new Error(`Invalid Git resolution protocol ("${c}")`)}},l=(c,u)=>{try{return a(c,u)}catch{return null}};return`${t}#${a(i,n)}`}async function pO(r,e){return await e.getLimit("cloneConcurrency")(async()=>{let{repo:t,treeish:{protocol:i,request:n}}=zm(r);if(i!=="commit")throw new Error("Invalid treeish protocol when cloning");let s=Vm(t,{git:!0});if(Xt.getNetworkSettings(`https://${(0,gO.default)(s).resource}`,{configuration:e}).enableNetwork===!1)throw new Error(`Request to '${s}' has been blocked because of your configuration settings`);let o=await M.mktempPromise(),a={cwd:o,env:Gae()};return await uO("cloning the repository",["clone","-c core.autocrlf=false",s,K.fromPortablePath(o)],a,{configuration:e,normalizedRepoUrl:s}),await uO("switching branch",["checkout",`${n}`],a,{configuration:e,normalizedRepoUrl:s}),o})}async function jae(r){let e=null,t,i=r;do t=i,await M.existsPromise(x.join(t,".git"))&&(e=t),i=x.dirname(t);while(e===null&&i!==t);return e}async function qae(r,{baseRefs:e}){if(e.length===0)throw new Qe("Can't run this command with zero base refs specified.");let t=[];for(let a of e){let{code:l}=await Cr.execvp("git",["merge-base",a,"HEAD"],{cwd:r});l===0&&t.push(a)}if(t.length===0)throw new Qe(`No ancestor could be found between any of HEAD and ${e.join(", ")}`);let{stdout:i}=await Cr.execvp("git",["merge-base","HEAD",...t],{cwd:r,strict:!0}),n=i.trim(),{stdout:s}=await Cr.execvp("git",["show","--quiet","--pretty=format:%s",n],{cwd:r,strict:!0}),o=s.trim();return{hash:n,title:o}}async function Jae(r,{base:e,project:t}){let i=Ie.buildIgnorePattern(t.configuration.get("changesetIgnorePatterns")),{stdout:n}=await Cr.execvp("git",["diff","--name-only",`${e}`],{cwd:r,strict:!0}),s=n.split(/\r\n|\r|\n/).filter(c=>c.length>0).map(c=>x.resolve(r,K.toPortablePath(c))),{stdout:o}=await Cr.execvp("git",["ls-files","--others","--exclude-standard"],{cwd:r,strict:!0}),a=o.split(/\r\n|\r|\n/).filter(c=>c.length>0).map(c=>x.resolve(r,K.toPortablePath(c))),l=[...new Set([...s,...a].sort())];return i?l.filter(c=>!x.relative(t.cwd,c).match(i)):l}async function A4e({ref:r,project:e}){if(e.configuration.projectCwd===null)throw new Qe("This command can only be run from within a Yarn project");let t=[x.resolve(e.cwd,e.configuration.get("cacheFolder")),x.resolve(e.cwd,e.configuration.get("installStatePath")),x.resolve(e.cwd,e.configuration.get("lockfileFilename")),x.resolve(e.cwd,e.configuration.get("virtualFolder"))];await e.configuration.triggerHook(o=>o.populateYarnPaths,e,o=>{o!=null&&t.push(o)});let i=await jae(e.configuration.projectCwd);if(i==null)throw new Qe("This command can only be run on Git repositories");let n=await qae(i,{baseRefs:typeof r=="string"?[r]:e.configuration.get("changesetBaseRefs")}),s=await Jae(i,{base:n.hash,project:e});return new Set(Ie.mapAndFilter(s,o=>{let a=e.tryWorkspaceByFilePath(o);return a===null?Ie.mapAndFilter.skip:t.some(l=>o.startsWith(l))?Ie.mapAndFilter.skip:a}))}async function uO(r,e,t,{configuration:i,normalizedRepoUrl:n}){try{return await Cr.execvp("git",e,{...t,strict:!0})}catch(s){if(!(s instanceof Cr.ExecError))throw s;let o=s.reportExtra,a=s.stderr.toString();throw new at(1,`Failed ${r}`,l=>{l.reportError(1,`  ${ee.prettyField(i,{label:"Repository URL",value:ee.tuple(ee.Type.URL,n)})}`);for(let c of a.matchAll(/^(.+?): (.*)$/gm)){let[,u,g]=c;u=u.toLowerCase();let f=u==="error"?"Error":`${(0,Hae.default)(u)} Error`;l.reportError(1,`  ${ee.prettyField(i,{label:f,value:ee.tuple(ee.Type.NO_HINT,g)})}`)}o==null||o(l)})}}var Ob=class{supports(e,t){return ep(e.reference)}getLocalPath(e,t){return null}async fetch(e,t){let i=t.checksums.get(e.locatorHash)||null,n=fO(e),s=new Map(t.checksums);s.set(n.locatorHash,i);let o={...t,checksums:s},a=await this.downloadHosted(n,o);if(a!==null)return a;let[l,c,u]=await t.cache.fetchPackageFromCache(e,i,{onHit:()=>t.report.reportCacheHit(e),onMiss:()=>t.report.reportCacheMiss(e,`${P.prettyLocator(t.project.configuration,e)} can't be found in the cache and will be fetched from the remote repository`),loader:()=>this.cloneFromRemote(n,o),skipIntegrityCheck:t.skipIntegrityCheck,...t.cacheOptions});return{packageFs:l,releaseFs:c,prefixPath:P.getIdentVendorPath(e),checksum:u}}async downloadHosted(e,t){return t.project.configuration.reduceHook(i=>i.fetchHostedRepository,null,e,t)}async cloneFromRemote(e,t){let i=await pO(e.reference,t.project.configuration),n=zm(e.reference),s=x.join(i,"package.tgz");await Wt.prepareExternalProject(i,s,{configuration:t.project.configuration,report:t.report,workspace:n.extra.workspace,locator:e});let o=await M.readFilePromise(s);return await Ie.releaseAfterUseAsync(async()=>await mi.convertToZip(o,{compressionLevel:t.project.configuration.get("compressionLevel"),prefixPath:P.getIdentVendorPath(e),stripComponents:1}))}};var Mb=class{supportsDescriptor(e,t){return ep(e.range)}supportsLocator(e,t){return ep(e.reference)}shouldPersistResolution(e,t){return!0}bindDescriptor(e,t,i){return e}getResolutionDependencies(e,t){return[]}async getCandidates(e,t,i){let n=await hO(e.range,i.project.configuration);return[P.makeLocator(e,n)]}async getSatisfying(e,t,i){return null}async resolve(e,t){if(!t.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let i=await t.fetchOptions.fetcher.fetch(e,t.fetchOptions),n=await Ie.releaseAfterUseAsync(async()=>await ot.find(i.prefixPath,{baseFs:i.packageFs}),i.releaseFs);return{...e,version:n.version||"0.0.0",languageName:n.languageName||t.project.configuration.get("defaultLanguageName"),linkType:"HARD",conditions:n.getConditions(),dependencies:n.dependencies,peerDependencies:n.peerDependencies,dependenciesMeta:n.dependenciesMeta,peerDependenciesMeta:n.peerDependenciesMeta,bin:n.bin}}};var l4e={configuration:{changesetBaseRefs:{description:"The base git refs that the current HEAD is compared against when detecting changes. Supports git branches, tags, and commits.",type:"STRING",isArray:!0,isNullable:!1,default:["master","origin/master","upstream/master","main","origin/main","upstream/main"]},changesetIgnorePatterns:{description:"Array of glob patterns; files matching them will be ignored when fetching the changed files",type:"STRING",default:[],isArray:!0},cloneConcurrency:{description:"Maximal number of concurrent clones",type:"NUMBER",default:2}},fetchers:[Ob],resolvers:[Mb]};var c4e=l4e;var Ou=class extends De{constructor(){super(...arguments);this.since=z.String("--since",{description:"Only include workspaces that have been changed since the specified ref.",tolerateBoolean:!0});this.recursive=z.Boolean("-R,--recursive",!1,{description:"Find packages via dependencies/devDependencies instead of using the workspaces field"});this.noPrivate=z.Boolean("--no-private",{description:"Exclude workspaces that have the private field set to true"});this.verbose=z.Boolean("-v,--verbose",!1,{description:"Also return the cross-dependencies between workspaces"});this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i}=await je.find(t,this.context.cwd);return(await Ge.start({configuration:t,json:this.json,stdout:this.context.stdout},async s=>{let o=this.since?await AA.fetchChangedWorkspaces({ref:this.since,project:i}):i.workspaces,a=new Set(o);if(this.recursive)for(let l of[...o].map(c=>c.getRecursiveWorkspaceDependents()))for(let c of l)a.add(c);for(let l of a){let{manifest:c}=l;if(c.private&&this.noPrivate)continue;let u;if(this.verbose){let g=new Set,f=new Set;for(let h of ot.hardDependencies)for(let[p,C]of c.getForScope(h)){let y=i.tryWorkspaceByDescriptor(C);y===null?i.workspacesByIdent.has(p)&&f.add(C):g.add(y)}u={workspaceDependencies:Array.from(g).map(h=>h.relativeCwd),mismatchedWorkspaceDependencies:Array.from(f).map(h=>P.stringifyDescriptor(h))}}s.reportInfo(null,`${l.relativeCwd}`),s.reportJson({location:l.relativeCwd,name:c.name?P.stringifyIdent(c.name):null,...u})}})).exitCode()}};Ou.paths=[["workspaces","list"]],Ou.usage=ve.Usage({category:"Workspace-related commands",description:"list all available workspaces",details:"\n      This command will print the list of all workspaces in the project.\n\n      - If `--since` is set, Yarn will only list workspaces that have been modified since the specified ref. By default Yarn will use the refs specified by the `changesetBaseRefs` configuration option.\n\n      - If `-R,--recursive` is set, Yarn will find workspaces to run the command on by recursively evaluating `dependencies` and `devDependencies` fields, instead of looking at the `workspaces` fields.\n\n      - If `--no-private` is set, Yarn will not list any workspaces that have the `private` field set to `true`.\n\n      - If both the `-v,--verbose` and `--json` options are set, Yarn will also return the cross-dependencies between each workspaces (useful when you wish to automatically generate Buck / Bazel rules).\n    "});var Mu=class extends De{constructor(){super(...arguments);this.workspaceName=z.String();this.commandName=z.String();this.args=z.Proxy()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd);if(!n)throw new ct(i.cwd,this.context.cwd);let s=i.workspaces,o=new Map(s.map(l=>[P.stringifyIdent(l.locator),l])),a=o.get(this.workspaceName);if(a===void 0){let l=Array.from(o.keys()).sort();throw new Qe(`Workspace '${this.workspaceName}' not found. Did you mean any of the following:
-  - ${l.join(`
-  - `)}?`)}return this.cli.run([this.commandName,...this.args],{cwd:a.cwd})}};Mu.paths=[["workspace"]],Mu.usage=ve.Usage({category:"Workspace-related commands",description:"run a command within the specified workspace",details:`
-      This command will run a given sub-command on a single workspace.
-    `,examples:[["Add a package to a single workspace","yarn workspace components add -D react"],["Run build script on a single workspace","yarn workspace components run build"]]});var u4e={configuration:{enableImmutableInstalls:{description:"If true (the default on CI), prevents the install command from modifying the lockfile",type:"BOOLEAN",default:Wae.isCI},defaultSemverRangePrefix:{description:"The default save prefix: '^', '~' or ''",type:"STRING",values:["^","~",""],default:"^"}},commands:[cu,uu,gu,fu,Nu,Su,mu,Ou,Vh,Xh,qm,Zh,Au,lu,hu,pu,du,Cu,Eu,Iu,yu,wu,Tu,Bu,xu,vu,Pu,bu,Du,ku,Ru,_h,Fu,El,Lu,Mu]},g4e=u4e;var wO={};ut(wO,{default:()=>h4e});var Te={optional:!0},mO=[["@tailwindcss/aspect-ratio@<0.2.1",{peerDependencies:{tailwindcss:"^2.0.2"}}],["@tailwindcss/line-clamp@<0.2.1",{peerDependencies:{tailwindcss:"^2.0.2"}}],["@fullhuman/postcss-purgecss@3.1.3 || 3.1.3-alpha.0",{peerDependencies:{postcss:"^8.0.0"}}],["@samverschueren/stream-to-observable@<0.3.1",{peerDependenciesMeta:{rxjs:Te,zenObservable:Te}}],["any-observable@<0.5.1",{peerDependenciesMeta:{rxjs:Te,zenObservable:Te}}],["@pm2/agent@<1.0.4",{dependencies:{debug:"*"}}],["debug@<4.2.0",{peerDependenciesMeta:{["supports-color"]:Te}}],["got@<11",{dependencies:{["@types/responselike"]:"^1.0.0",["@types/keyv"]:"^3.1.1"}}],["cacheable-lookup@<4.1.2",{dependencies:{["@types/keyv"]:"^3.1.1"}}],["http-link-dataloader@*",{peerDependencies:{graphql:"^0.13.1 || ^14.0.0"}}],["typescript-language-server@*",{dependencies:{["vscode-jsonrpc"]:"^5.0.1",["vscode-languageserver-protocol"]:"^3.15.0"}}],["postcss-syntax@*",{peerDependenciesMeta:{["postcss-html"]:Te,["postcss-jsx"]:Te,["postcss-less"]:Te,["postcss-markdown"]:Te,["postcss-scss"]:Te}}],["jss-plugin-rule-value-function@<=10.1.1",{dependencies:{["tiny-warning"]:"^1.0.2"}}],["ink-select-input@<4.1.0",{peerDependencies:{react:"^16.8.2"}}],["license-webpack-plugin@<2.3.18",{peerDependenciesMeta:{webpack:Te}}],["snowpack@>=3.3.0",{dependencies:{["node-gyp"]:"^7.1.0"}}],["promise-inflight@*",{peerDependenciesMeta:{bluebird:Te}}],["reactcss@*",{peerDependencies:{react:"*"}}],["react-color@<=2.19.0",{peerDependencies:{react:"*"}}],["gatsby-plugin-i18n@*",{dependencies:{ramda:"^0.24.1"}}],["useragent@^2.0.0",{dependencies:{request:"^2.88.0",yamlparser:"0.0.x",semver:"5.5.x"}}],["@apollographql/apollo-tools@<=0.5.2",{peerDependencies:{graphql:"^14.2.1 || ^15.0.0"}}],["material-table@^2.0.0",{dependencies:{"@babel/runtime":"^7.11.2"}}],["@babel/parser@*",{dependencies:{"@babel/types":"^7.8.3"}}],["fork-ts-checker-webpack-plugin@<=6.3.4",{peerDependencies:{eslint:">= 6",typescript:">= 2.7",webpack:">= 4","vue-template-compiler":"*"},peerDependenciesMeta:{eslint:Te,"vue-template-compiler":Te}}],["rc-animate@<=3.1.1",{peerDependencies:{react:">=16.9.0","react-dom":">=16.9.0"}}],["react-bootstrap-table2-paginator@*",{dependencies:{classnames:"^2.2.6"}}],["react-draggable@<=4.4.3",{peerDependencies:{react:">= 16.3.0","react-dom":">= 16.3.0"}}],["apollo-upload-client@<14",{peerDependencies:{graphql:"14 - 15"}}],["react-instantsearch-core@<=6.7.0",{peerDependencies:{algoliasearch:">= 3.1 < 5"}}],["react-instantsearch-dom@<=6.7.0",{dependencies:{"react-fast-compare":"^3.0.0"}}],["ws@<7.2.1",{peerDependencies:{bufferutil:"^4.0.1","utf-8-validate":"^5.0.2"},peerDependenciesMeta:{bufferutil:Te,"utf-8-validate":Te}}],["react-portal@<4.2.2",{peerDependencies:{"react-dom":"^15.0.0-0 || ^16.0.0-0 || ^17.0.0-0"}}],["react-scripts@<=4.0.1",{peerDependencies:{react:"*"}}],["testcafe@<=1.10.1",{dependencies:{"@babel/plugin-transform-for-of":"^7.12.1","@babel/runtime":"^7.12.5"}}],["testcafe-legacy-api@<=4.2.0",{dependencies:{"testcafe-hammerhead":"^17.0.1","read-file-relative":"^1.2.0"}}],["@google-cloud/firestore@<=4.9.3",{dependencies:{protobufjs:"^6.8.6"}}],["gatsby-source-apiserver@*",{dependencies:{["babel-polyfill"]:"^6.26.0"}}],["@webpack-cli/package-utils@<=1.0.1-alpha.4",{dependencies:{["cross-spawn"]:"^7.0.3"}}],["gatsby-remark-prismjs@<3.3.28",{dependencies:{lodash:"^4"}}],["gatsby-plugin-favicon@*",{peerDependencies:{webpack:"*"}}],["gatsby-plugin-sharp@<=4.6.0-next.3",{dependencies:{debug:"^4.3.1"}}],["gatsby-react-router-scroll@<=5.6.0-next.0",{dependencies:{["prop-types"]:"^15.7.2"}}],["@rebass/forms@*",{dependencies:{["@styled-system/should-forward-prop"]:"^5.0.0"},peerDependencies:{react:"^16.8.6"}}],["rebass@*",{peerDependencies:{react:"^16.8.6"}}],["@ant-design/react-slick@<=0.28.3",{peerDependencies:{react:">=16.0.0"}}],["mqtt@<4.2.7",{dependencies:{duplexify:"^4.1.1"}}],["vue-cli-plugin-vuetify@<=2.0.3",{dependencies:{semver:"^6.3.0"},peerDependenciesMeta:{"sass-loader":Te,"vuetify-loader":Te}}],["vue-cli-plugin-vuetify@<=2.0.4",{dependencies:{"null-loader":"^3.0.0"}}],["vue-cli-plugin-vuetify@>=2.4.3",{peerDependencies:{vue:"*"}}],["@vuetify/cli-plugin-utils@<=0.0.4",{dependencies:{semver:"^6.3.0"},peerDependenciesMeta:{"sass-loader":Te}}],["@vue/cli-plugin-typescript@<=5.0.0-alpha.0",{dependencies:{"babel-loader":"^8.1.0"}}],["@vue/cli-plugin-typescript@<=5.0.0-beta.0",{dependencies:{"@babel/core":"^7.12.16"},peerDependencies:{"vue-template-compiler":"^2.0.0"},peerDependenciesMeta:{"vue-template-compiler":Te}}],["cordova-ios@<=6.3.0",{dependencies:{underscore:"^1.9.2"}}],["cordova-lib@<=10.0.1",{dependencies:{underscore:"^1.9.2"}}],["git-node-fs@*",{peerDependencies:{"js-git":"^0.7.8"},peerDependenciesMeta:{"js-git":Te}}],["consolidate@<0.16.0",{peerDependencies:{mustache:"^3.0.0"},peerDependenciesMeta:{mustache:Te}}],["consolidate@<=0.16.0",{peerDependencies:{velocityjs:"^2.0.1",tinyliquid:"^0.2.34","liquid-node":"^3.0.1",jade:"^1.11.0","then-jade":"*",dust:"^0.3.0","dustjs-helpers":"^1.7.4","dustjs-linkedin":"^2.7.5",swig:"^1.4.2","swig-templates":"^2.0.3","razor-tmpl":"^1.3.1",atpl:">=0.7.6",liquor:"^0.0.5",twig:"^1.15.2",ejs:"^3.1.5",eco:"^1.1.0-rc-3",jazz:"^0.0.18",jqtpl:"~1.1.0",hamljs:"^0.6.2",hamlet:"^0.3.3",whiskers:"^0.4.0","haml-coffee":"^1.14.1","hogan.js":"^3.0.2",templayed:">=0.2.3",handlebars:"^4.7.6",underscore:"^1.11.0",lodash:"^4.17.20",pug:"^3.0.0","then-pug":"*",qejs:"^3.0.5",walrus:"^0.10.1",mustache:"^4.0.1",just:"^0.1.8",ect:"^0.5.9",mote:"^0.2.0",toffee:"^0.3.6",dot:"^1.1.3","bracket-template":"^1.1.5",ractive:"^1.3.12",nunjucks:"^3.2.2",htmling:"^0.0.8","babel-core":"^6.26.3",plates:"~0.4.11","react-dom":"^16.13.1",react:"^16.13.1","arc-templates":"^0.5.3",vash:"^0.13.0",slm:"^2.0.0",marko:"^3.14.4",teacup:"^2.0.0","coffee-script":"^1.12.7",squirrelly:"^5.1.0",twing:"^5.0.2"},peerDependenciesMeta:{velocityjs:Te,tinyliquid:Te,"liquid-node":Te,jade:Te,"then-jade":Te,dust:Te,"dustjs-helpers":Te,"dustjs-linkedin":Te,swig:Te,"swig-templates":Te,"razor-tmpl":Te,atpl:Te,liquor:Te,twig:Te,ejs:Te,eco:Te,jazz:Te,jqtpl:Te,hamljs:Te,hamlet:Te,whiskers:Te,"haml-coffee":Te,"hogan.js":Te,templayed:Te,handlebars:Te,underscore:Te,lodash:Te,pug:Te,"then-pug":Te,qejs:Te,walrus:Te,mustache:Te,just:Te,ect:Te,mote:Te,toffee:Te,dot:Te,"bracket-template":Te,ractive:Te,nunjucks:Te,htmling:Te,"babel-core":Te,plates:Te,"react-dom":Te,react:Te,"arc-templates":Te,vash:Te,slm:Te,marko:Te,teacup:Te,"coffee-script":Te,squirrelly:Te,twing:Te}}],["vue-loader@<=16.3.3",{peerDependencies:{"@vue/compiler-sfc":"^3.0.8",webpack:"^4.1.0 || ^5.0.0-0"},peerDependenciesMeta:{"@vue/compiler-sfc":Te}}],["vue-loader@^16.7.0",{peerDependencies:{"@vue/compiler-sfc":"^3.0.8",vue:"^3.2.13"},peerDependenciesMeta:{"@vue/compiler-sfc":Te,vue:Te}}],["scss-parser@<=1.0.5",{dependencies:{lodash:"^4.17.21"}}],["query-ast@<1.0.5",{dependencies:{lodash:"^4.17.21"}}],["redux-thunk@<=2.3.0",{peerDependencies:{redux:"^4.0.0"}}],["skypack@<=0.3.2",{dependencies:{tar:"^6.1.0"}}],["@npmcli/metavuln-calculator@<2.0.0",{dependencies:{"json-parse-even-better-errors":"^2.3.1"}}],["bin-links@<2.3.0",{dependencies:{"mkdirp-infer-owner":"^1.0.2"}}],["rollup-plugin-polyfill-node@<=0.8.0",{peerDependencies:{rollup:"^1.20.0 || ^2.0.0"}}],["snowpack@<3.8.6",{dependencies:{"magic-string":"^0.25.7"}}],["elm-webpack-loader@*",{dependencies:{temp:"^0.9.4"}}],["winston-transport@<=4.4.0",{dependencies:{logform:"^2.2.0"}}],["jest-vue-preprocessor@*",{dependencies:{"@babel/core":"7.8.7","@babel/template":"7.8.6"},peerDependencies:{pug:"^2.0.4"},peerDependenciesMeta:{pug:Te}}],["redux-persist@*",{peerDependencies:{react:">=16"},peerDependenciesMeta:{react:Te}}],["sodium@>=3",{dependencies:{"node-gyp":"^3.8.0"}}],["babel-plugin-graphql-tag@<=3.1.0",{peerDependencies:{graphql:"^14.0.0 || ^15.0.0"}}],["@playwright/test@<=1.14.1",{dependencies:{"jest-matcher-utils":"^26.4.2"}}],...["babel-plugin-remove-graphql-queries@<3.14.0-next.1","babel-preset-gatsby-package@<1.14.0-next.1","create-gatsby@<1.14.0-next.1","gatsby-admin@<0.24.0-next.1","gatsby-cli@<3.14.0-next.1","gatsby-core-utils@<2.14.0-next.1","gatsby-design-tokens@<3.14.0-next.1","gatsby-legacy-polyfills@<1.14.0-next.1","gatsby-plugin-benchmark-reporting@<1.14.0-next.1","gatsby-plugin-graphql-config@<0.23.0-next.1","gatsby-plugin-image@<1.14.0-next.1","gatsby-plugin-mdx@<2.14.0-next.1","gatsby-plugin-netlify-cms@<5.14.0-next.1","gatsby-plugin-no-sourcemaps@<3.14.0-next.1","gatsby-plugin-page-creator@<3.14.0-next.1","gatsby-plugin-preact@<5.14.0-next.1","gatsby-plugin-preload-fonts@<2.14.0-next.1","gatsby-plugin-schema-snapshot@<2.14.0-next.1","gatsby-plugin-styletron@<6.14.0-next.1","gatsby-plugin-subfont@<3.14.0-next.1","gatsby-plugin-utils@<1.14.0-next.1","gatsby-recipes@<0.25.0-next.1","gatsby-source-shopify@<5.6.0-next.1","gatsby-source-wikipedia@<3.14.0-next.1","gatsby-transformer-screenshot@<3.14.0-next.1","gatsby-worker@<0.5.0-next.1"].map(r=>[r,{dependencies:{"@babel/runtime":"^7.14.8"}}]),["gatsby-core-utils@<2.14.0-next.1",{dependencies:{got:"8.3.2"}}],["gatsby-plugin-gatsby-cloud@<=3.1.0-next.0",{dependencies:{"gatsby-core-utils":"^2.13.0-next.0"}}],["gatsby-plugin-gatsby-cloud@<=3.2.0-next.1",{peerDependencies:{webpack:"*"}}],["babel-plugin-remove-graphql-queries@<=3.14.0-next.1",{dependencies:{"gatsby-core-utils":"^2.8.0-next.1"}}],["gatsby-plugin-netlify@3.13.0-next.1",{dependencies:{"gatsby-core-utils":"^2.13.0-next.0"}}],["clipanion-v3-codemod@<=0.2.0",{peerDependencies:{jscodeshift:"^0.11.0"}}],["react-live@*",{peerDependencies:{"react-dom":"*",react:"*"}}],["webpack@<4.44.1",{peerDependenciesMeta:{"webpack-cli":Te,"webpack-command":Te}}],["webpack@<5.0.0-beta.23",{peerDependenciesMeta:{"webpack-cli":Te}}],["webpack-dev-server@<3.10.2",{peerDependenciesMeta:{"webpack-cli":Te}}],["@docusaurus/responsive-loader@<1.5.0",{peerDependenciesMeta:{sharp:Te,jimp:Te}}],["eslint-module-utils@*",{peerDependenciesMeta:{"eslint-import-resolver-node":Te,"eslint-import-resolver-typescript":Te,"eslint-import-resolver-webpack":Te,"@typescript-eslint/parser":Te}}],["eslint-plugin-import@*",{peerDependenciesMeta:{"@typescript-eslint/parser":Te}}],["critters-webpack-plugin@<3.0.2",{peerDependenciesMeta:{"html-webpack-plugin":Te}}],["terser@<=5.10.0",{dependencies:{acorn:"^8.5.0"}}],["babel-preset-react-app@10.0.x",{dependencies:{"@babel/plugin-proposal-private-property-in-object":"^7.16.0"}}],["eslint-config-react-app@*",{peerDependenciesMeta:{typescript:Te}}],["@vue/eslint-config-typescript@<11.0.0",{peerDependenciesMeta:{typescript:Te}}],["unplugin-vue2-script-setup@<0.9.1",{peerDependencies:{"@vue/composition-api":"^1.4.3","@vue/runtime-dom":"^3.2.26"}}],["@cypress/snapshot@*",{dependencies:{debug:"^3.2.7"}}],["auto-relay@<=0.14.0",{peerDependencies:{"reflect-metadata":"^0.1.13"}}],["vue-template-babel-compiler@<1.2.0",{peerDependencies:{["vue-template-compiler"]:"^2.6.0"}}],["@parcel/transformer-image@<2.5.0",{peerDependencies:{["@parcel/core"]:"*"}}],["@parcel/transformer-js@<2.5.0",{peerDependencies:{["@parcel/core"]:"*"}}],["parcel@*",{peerDependenciesMeta:{["@parcel/core"]:Te}}],["react-scripts@*",{peerDependencies:{eslint:"*"}}],["focus-trap-react@^8.0.0",{dependencies:{tabbable:"^5.3.2"}}],["react-rnd@<10.3.7",{peerDependencies:{react:">=16.3.0","react-dom":">=16.3.0"}}],["connect-mongo@*",{peerDependencies:{"express-session":"^1.17.1"}}],["vue-i18n@<9",{peerDependencies:{vue:"^2"}}],["vue-router@<4",{peerDependencies:{vue:"^2"}}],["unified@<10",{dependencies:{"@types/unist":"^2.0.0"}}],["react-github-btn@<=1.3.0",{peerDependencies:{react:">=16.3.0"}}],["react-dev-utils@*",{peerDependencies:{typescript:">=2.7",webpack:">=4"},peerDependenciesMeta:{typescript:Te}}],["@asyncapi/react-component@<=1.0.0-next.39",{peerDependencies:{react:">=16.8.0","react-dom":">=16.8.0"}}],["xo@*",{peerDependencies:{webpack:">=1.11.0"},peerDependenciesMeta:{webpack:Te}}],["babel-plugin-remove-graphql-queries@<=4.20.0-next.0",{dependencies:{"@babel/types":"^7.15.4"}}],["gatsby-plugin-page-creator@<=4.20.0-next.1",{dependencies:{"fs-extra":"^10.1.0"}}],["gatsby-plugin-utils@<=3.14.0-next.1",{dependencies:{fastq:"^1.13.0"},peerDependencies:{graphql:"^15.0.0"}}],["gatsby-plugin-mdx@<3.1.0-next.1",{dependencies:{mkdirp:"^1.0.4"}}],["gatsby-plugin-mdx@^2",{peerDependencies:{gatsby:"^3.0.0-next"}}],["fdir@<=5.2.0",{peerDependencies:{picomatch:"2.x"},peerDependenciesMeta:{picomatch:Te}}],["babel-plugin-transform-typescript-metadata@<=0.3.2",{peerDependencies:{"@babel/core":"^7","@babel/traverse":"^7"},peerDependenciesMeta:{"@babel/traverse":Te}}],["graphql-compose@>=9.0.10",{peerDependencies:{graphql:"^14.2.0 || ^15.0.0 || ^16.0.0"}}]];var EO;function zae(){return typeof EO>"u"&&(EO=J("zlib").brotliDecompressSync(Buffer.from("G7weAByFTVk3Vs7UfHhq4yykgEM7pbW7TI43SG2S5tvGrwHBAzdz+s/npQ6tgEvobvxisrPIadkXeUAJotBn5bDZ5kAhcRqsIHe3F75Walet5hNalwgFDtxb0BiDUjiUQkjG0yW2hto9HPgiCkm316d6bC0kST72YN7D7rfkhCE9x4J0XwB0yavalxpUu2t9xszHrmtwalOxT7VslsxWcB1qpqZwERUra4psWhTV8BgwWeizurec82Caf1ABL11YMfbf8FJ9JBceZOkgmvrQPbC9DUldX/yMbmX06UQluCEjSwUoyO+EZPIjofr+/oAZUck2enraRD+oWLlnlYnj8xB+gwSo9lmmks4fXv574qSqcWA6z21uYkzMu3EWj+K23RxeQlLqiE35/rC8GcS4CGkKHKKq+zAIQwD9iRDNfiAqueLLpicFFrNsAI4zeTD/eO9MHcnRa5m8UT+M2+V+AkFST4BlKneiAQRSdST8KEAIyFlULt6wa9EBd0Ds28VmpaxquJdVt+nwdEs5xUskI13OVtFyY0UrQIRAlCuvvWivvlSKQfTO+2Q8OyUR1W5RvetaPz4jD27hdtwHFFA1Ptx6Ee/t2cY2rg2G46M1pNDRf2pWhvpy8pqMnuI3++4OF3+7OFIWXGjh+o7Nr2jNvbiYcQdQS1h903/jVFgOpA0yJ78z+x759bFA0rq+6aY5qPB4FzS3oYoLupDUhD9nDz6F6H7hpnlMf18KNKDu4IKjTWwrAnY6MFQw1W6ymOALHlFyCZmQhldg1MQHaMVVQTVgDC60TfaBqG++Y8PEoFhN/PBTZT175KNP/BlHDYGOOBmnBdzqJKplZ/ljiVG0ZBzfqeBRrrUkn6rA54462SgiliKoYVnbeptMdXNfAuaupIEi0bApF10TlgHfmEJAPUVidRVFyDupSem5po5vErPqWKhKbUIp0LozpYsIKK57dM/HKr+nguF+7924IIWMICkQ8JUigs9D+W+c4LnNoRtPPKNRUiCYmP+Jfo2lfKCKw8qpraEeWU3uiNRO6zcyKQoXPR5htmzzLznke7b4YbXW3I1lIRzmgG02Udb58U+7TpwyN7XymCgH+wuPDthZVQvRZuEP+SnLtMicz9m5zASWOBiAcLmkuFlTKuHspSIhCBD0yUPKcxu81A+4YD78rA2vtwsUEday9WNyrShyrl60rWmA+SmbYZkQOwFJWArxRYYc5jGhA5ikxYw1rx3ei4NmeX/lKiwpZ9Ln1tV2Ae7sArvxuVLbJjqJRjW1vFXAyHpvLG+8MJ6T2Ubx5M2KDa2SN6vuIGxJ9WQM9Mk3Q7aCNiZONXllhqq24DmoLbQfW2rYWsOgHWjtOmIQMyMKdiHZDjoyIq5+U700nZ6odJAoYXPQBvFNiQ78d5jaXliBqLTJEqUCwi+LiH2mx92EmNKDsJL74Z613+3lf20pxkV1+erOrjj8pW00vsPaahKUM+05ssd5uwM7K482KWEf3TCwlg/o3e5ngto7qSMz7YteIgCsF1UOcsLk7F7MxWbvrPMY473ew0G+noVL8EPbkmEMftMSeL6HFub/zy+2JQ==","base64")).toString()),EO}var IO;function Vae(){return typeof IO>"u"&&(IO=J("zlib").brotliDecompressSync(Buffer.from("G8MSIIzURnVBnObTcvb3XE6v2S9Qgc2K801Oa5otNKEtK8BINZNcaQHy+9/vf/WXBimwutXC33P2DPc64pps5rz7NGGWaOKNSPL4Y2KRE8twut2lFOIN+OXPtRmPMRhMTILib2bEQx43az2I5d3YS8Roa5UZpF/ujHb3Djd3GDvYUfvFYSUQ39vb2cmifp/rgB4J/65JK3wRBTvMBoNBmn3mbXC63/gbBkW/2IRPri0O8bcsRBsmarF328pAln04nyJFkwUAvNu934supAqLtyerZZpJ8I8suJHhf/ocMV+scKwa8NOiDKIPXw6Ex/EEZD6TEGaW8N5zvNHYF10l6Lfooj7D5W2k3dgvQSbp2Wv8TGOayS978gxlOLVjTGXs66ozewbrjwElLtyrYNnWTfzzdEutgROUFPVMhnMoy8EjJLLlWwIEoySxliim9kYW30JUHiPVyjt0iAw/ZpPmCbUCltYPnq6ZNblIKhTNhqS/oqC9iya5sGKZTOVsTEg34n92uZTf2iPpcZih8rPW8CzA+adIGmyCPcKdLMsBLShd+zuEbTrqpwuh+DLmracZcjPC5Sdf5odDAhKpFuOsQS67RT+1VgWWygSv3YwxDnylc04/PYuaMeIzhBkLrvs7e/OUzRTF56MmfY6rI63QtEjEQzq637zQqJ39nNhu3NmoRRhW/086bHGBUtx0PE0j3aEGvkdh9WJC8y8j8mqqke9/dQ5la+Q3ba4RlhvTbnfQhPDDab3tUifkjKuOsp13mXEmO00Mu88F/M67R7LXfoFDFLNtgCSWjWX+3Jn1371pJTK9xPBiMJafvDjtFyAzu8rxeQ0TKMQXNPs5xxiBOd+BRJP8KP88XPtJIbZKh/cdW8KvBUkpqKpGoiIaA32c3/JnQr4efXt85mXvidOvn/eU3Pase1typLYBalJ14mCso9h79nuMOuCa/kZAOkJHmTjP5RM2WNoPasZUAnT1TAE/NH25hUxcQv6hQWR/m1PKk4ooXMcM4SR1iYU3fUohvqk4RY2hbmTVVIXv6TvqO+0doOjgeVFAcom+RlwJQmOVH7pr1Q9LoJT6n1DeQEB+NHygsATbIwTcOKZlJsY8G4+suX1uQLjUWwLjjs0mvSvZcLTpIGAekeR7GCgl8eo3ndAqEe2XCav4huliHjdbIPBsGJuPX7lrO9HX1UbXRH5opOe1x6JsOSgHZR+EaxuXVhpLLxm6jk1LJtZfHSc6BKPun3CpYYVMJGwEUyk8MTGG0XL5MfEwaXpnc9TKnBmlGn6nHiGREc3ysn47XIBDzA+YvFdjZzVIEDcKGpS6PbUJehFRjEne8D0lVU1XuRtlgszq6pTNlQ/3MzNOEgCWPyTct22V2mEi2krizn5VDo9B19/X2DB3hCGRMM7ONbtnAcIx/OWB1u5uPbW1gsH8irXxT/IzG0PoXWYjhbMsH3KTuoOl5o17PulcgvsfTSnKFM354GWI8luqZnrswWjiXy3G+Vbyo1KMopFmmvBwNELgaS8z8dNZchx/Cl/xjddxhMcyqtzFyONb2Zdu90NkI8pAeufe7YlXrp53v8Dj/l8vWeVspRKBGXScBBPI/HinSTGmLDOGGOCIyH0JFdOZx0gWsacNlQLJMIrBhqRxXxHF/5pseWwejlAAvZ3klZSDSYY8mkToaWejXhgNomeGtx1DTLEUFMRkgF5yFB22WYdJnaWN14r1YJj81hGi45+jrADS5nYRhCiSlCJJ1nL8pYX+HDSMhdTEWyRcgHVp/IsUIZYMfT+YYncUQPgcxNGCHfZ88vDdrcUuaGIl6zhAsiaq7R5dfqrqXH/JcBhfjT8D0azayIyEz75Nxp6YkcyDxlJq3EXnJUpqDohJJOysL1t1uNiHESlvsxPb5cpbW0+ICZqJmUZus1BMW0F5IVBODLIo2zHHjA0=","base64")).toString()),IO}var yO;function Xae(){return typeof yO>"u"&&(yO=J("zlib").brotliDecompressSync(Buffer.from("mzF6NgXjlkdPMVn0scJ+7FAF29WDziEeaAuoui3+DtxQdKzTIJFj52iDuvy9YtoNqHoskONocQvK/wjn2gElOvLI4HhdlntnzKVeT1DljOjk3C4x69EX/F8RjJjYzD19FR6RVg9SibYWuuh6/PkNPzJNUaM/IPyz7TckbFkn3Kf9XsZMETsuz73YKqHGyAOQbVFqdFQrrsapQ0e+5aTzNYCOW38JEIQwclbiYRqR0yw2+1QHocuLPzw+Dno9XTc5QQO9QCg8rLC/UK6AtFifOr93U62z8D/AqaJzSOmTVieCtNybWYKdLStA9tXU787l1MxPwxirmbAukKNqTyndLH3iSE4KJdiIn19L9U9nbxpj0iqTp/JLaSliMbKDC2gk/DnI8qV36n9+vt5YymQN2De6UAHg7MVqcgWS23GD9MwoVP0Rn/Eh6Ktoj6cqie3Y0SI6x1nC1hamWTZvD2wCulKnAN/PicrWlcGo8BM6suo6DnrQ5UE+GSRlduZ0/f4fU7bju69AAiFqlT735/fvL/0vlfUJIPpBKNsPBgiyCSL1PlWn9Jo0I7Ws9SRbH5Cq6tS53epu6RnnW348hJBEk6ScD2dxy/CJVz5A6H+uVIDs9PpPPbzqdQC0IaSAFOEmUi61BbxlCXOGl/lIFhaxApgAgsL4tYqJvg2sr492y1pC+n+qlq0Oe5KTyA0k98ma2QvA5WpUtBdIpzrEok+wgY9AvZW0l6LWKenOMQEgZuZCipVD6Syqrt007mqQGAh7K0K8AFAXCF0iJKdY2UVR+Uq1MtdpTdWTeMNuyKDnzc5dlUJ+kEk+SN5EMklyVUOskY+sPZ4c74LYLigXKnM2VpDsBnFqAHDfgLdvZsDSbfeg6hYDvvHy+/y9Zaql95fhK5FME06Q7XJk4hQ4Q3W/+2v9B7RE2jFzZp+urq4q8Z6RATmD1HHsNKv3tCY8uc9GjtCPpp/ilJ3nKqXZXcZxkAzYwQMoCLXddQfkAg0TQut+ZhgEA3UA0zYrkXmzadJH/1ggao3NAmdEosUK/FqGKye9Ny+NEULQkzGLpWvG0uIrFSzoYYYla/ndMdZq3bN+71EDRARkEJFFiho9qFg6iPrzlVqPTR+gHrHtZ0H/eXCppSra1yRs0lCTsay671vhjyEgYKV74xGFqNpsTL1S+8ulEzJOIJlmMWamKf3yVVmQJnC4ogQcjDYlj4rY8YaxECLp8C7pWOkcQPcjEsuW9RxjqUnzaN+s20REQETiHZyCLQpRM9EEQuaTl6Gl0FrIEgXvKX62EFDdgubkahOmJ3/7J/EEB5e7OLj5lt6LqcY6KpjXTgfrrwgCjZ+LP+PfryUh4qL+gBBDKs0nuro3YOjB72D238i+/G983O797U/1y0sMX0KniwssP8cPOHAj75v+kN9dzXxMIT5eECusDydI58tXmkoLey8oyB3dvL40B+wDsPmzOBGQE6/c9UiiMvwU8fU1Mvolx6OvHE2xtGPCEEagv+3lPXLhF2jeKBtyDagmPXbndYshoCtYEdGIp6cTOdpLPpJd7+9Irkoqk+17OuAORpb2RgSdyzai9dZ8GfivonlSsdX8R6K/9Xn82rJgWxg2RHSZ/nMC/k4/8CubknJxW6P2GBBw6/OHES2CL2HzDiGQAbPNyFBEeuq3PLih7TZZollMj4k4OVzCmtgTiPTui6YsyrYKOWjvT899GEAPExQyT1bHr+NqP+m2pArR6i965ia5cfF6WSifXSjXrY3Ity4W4uAYl99sDgEF89T49Zp+XacsYOJLjOk5C5bGSLV660MH4NJS8HRx3ev9PqpvMSSICiEd+Ks6djJrzMY5J2QQQU/6aqIyAadiPT6eIiVAuoWwEapdMfvSx/lH1QrOvB63AEkJPi9NkI2Mw7FX3VZxSL7k6vnfRZQlJHNdqz7lq37+GW7aenR1dxZFjbsccLpj1JIpmoHj6IZ5wG3XlzSORUMz8CX3yQDcGN3WE0GIcgnrW9Z6v2PMyp1/nrBbSk0EliIyZ/NVkehSINEpUCrNA2VeomBJuT1Aff5tU4t8GzQNt3RrBam34KR/pxdqaNmi2KDez/A0mT+WUrEAqzJEY8LGZGS3dSPDsTUnoHZXyD4Nqtr3S+mp7zCXBcwENl9shUWKbLDwJqUFev7a88yyaRdmvVAuLq5QMrtyJCmoc/axBYjkoxLhcDW5j+hXBcfNH/YIqIjeptYACnbQnrOu5+1r3/O7rZzHCXXUANVGbd6E44MpI3nBVDpkL3VSIggo99iPyrCcrwsJ5DP31wmB000Y0GUe4w1OMOqt8nDULQ+5cRzHq88cjkj25XNSfuII9MdHn/+jd0lG5ao++uk6OosboL8Vnatky82C5cH/sHGPSFCWQhq70NqviNofjEcJfbu5jKfiJlpvIwsZnvlZulw29UkJtdGcKh8LRbxrydfd83qekbqMdUBqOWwpYDczOT9fLD123eLyim3uu849y+7jRrv45mxsSx7latoWkrupzHl12mYpYmKtbUXKMaBibOTgbP0msxwmrvxsZW84TTY13yYKTZ7p1ZlTmjcnlfwD5hcFyqIVUxRCw+Ms1Kfc+lTbNIMRdG+zS6leLlZ54yWpCRTqMscjaBRCSZ5lwvRtzLFmuKzRvVTpsvm09tU1SOwWPn64fXTKFz8JPqCwV3ZTW4sSfRR+DIFCiOwo2KTeC/bi4YzffoHV9yjxX86OPNmnW5AmTmSddsJZlxazozn6p14ryEMGKFJktS6nmwSA71D4sivnsxE5lvp1FLsQpdhXBMbrdbur3k9npfaGNND6sNus0xl76TE9N4iRaMt+pqW0rw7jMV7sfG2vR84Vl5RHtwR9J+40PvBYNm8tPfXAxezUhrtXtFtypxdZwJkdljyE+ahwBzvXWYys/jFIJtdOkSicOWvplXaoyJ0q0Q3VAhBPmoVUit7eEBqsKu3Cd4GKBUV26xySXgYQYIyoReIjdtS3c1/DpGS7dri88oTdyNWvdfKhkwgGLPoqmQMqr718ydqQiSy3VwYsc+iW9wSAsO4dFEg/3dgFQjP8VYHigEKRqQUBRc9QWHFUy7UuE2OSe1MCKXL6gMzXiDIhBky9ZhS4LmiIvDWrJXFNEbUQJGHVKKtH7OD6uhmgzwADFQ5+jiuHlOsZtoSpbnq1MNsXKolUVu7MHUQVoiWU9B0SiZTIoxX6BqWnHqlsmr89sZWh9Sa4Twg5yD202iGUMXldyYHwhh+y6wRNMwyFZ76jNKbjuTD4ZnsJVKKfZHnz4qX7YobYMnwRhlzfY8lDjXAuXToGSYK4543kumXWuDjvkFF+ovvlqURpN9Ga8xL1qcLTf4cmMi2mKletkHV5H/nRzAZh75uLFuEpB7bBSwzSvKS+d1aq7vUTkKh5nq0tKmJs10tntItyWBueurbVe9F+qZZgZvJpnaIwbLcvpj2yyVKN+6+KbcgBPC3jNSpvkKKXfTu7/2RBtao6i6ZDpfDWHH8hXflSSXG4vBCVRegVoHpnheLPiUQvVVs893+6sucE9ohUH3uiirk7m3/BzxMpwtlZahI53zzQpUVzlOJGEnMzOJdmNvWNtniCAa1mWqdUWxTrmN2TnSznoYVTZF9WgDbeXXv1JPcAsnPjOPb/XrqsYXPz9V/6r1tEvo8i2kY5C5VN7c5yETPPJTz6BpvYuGJV4QwfAt9op5mwbBNvVtjGveJ8QwXvJUhdxt+E8SMGHgfbbwR7b1UD1mwg2TXwC/n15PBeYLFnftG0sSRe479EP0+mhJONGzY6CZsBOv5iypqsBPi2kmv7emIYkbwJt/11Ef988XFKVgYSIOI0o7WuPiOHiWeOZZ11wn5hyJD77hZ12pcnUUxVeJV0sUW+5fuB657820RELOLuKJNp6w96cU7xXTkyz9O0cHJePvpedinzYcRcrIGTDSq//uBzlwLx0BLVhaae7D/ZSuYyJiez/aEdQVWePjCIy/V0BoV1iKa2Qx8vKFEhgqAxzx4hSM0wNVwAwMSTDXrhwiJ1ifZuPHGUZ1UjANDcmaW1WzIwqMwT/YPAXFfZezefbd1XN74+hiHsoC1PHxZkZZRVXACgDAKk8CQoJdspULb2CABwETw0myUvh+FBZq4/4Nx2D7YPfDD14q4QxzxycxhnIVgBIDsf/u0//fXHN6MXlsE8c2iQnOvuc2gh31btS9wQenoM4Tx7jHCGpOECABJG2u0KywnCiHYYT3bHi9v1awQATH8uHJNXRbo7VCe+kw1431jro+tlGpTdMLpiGQAA2k4g/2uu/8//1PnJZ1w3RjlU8TNHBKrIKbJXsIGKE1vXF10g483Yr2Z7BwbtC0LhoW/QdLTRFb8FANBLKBMTLhujmfBwYgbvnCZaQaRYF9mVaSD1artMAEBTAZIXHnS42kEIfNZyojLHBiTmcnBDWwAgiIlNDA8mNtLuqrHO+PS7BACSRGmOPJ+2IKSe2q6HlkODhobRFWMLAMjJtbaywtUoSYn2WIipRkndrxEACPJw0ZgE/IDUH7WDN+xBQl7m18R5FQByM1vXjMf480hKy1r+EMhnHt26nBqnzPwqxtkCAJVjl9uJ4cKEou0flZXGhOIbAQD6csmYpKNjJp4PdieMjl9qZWy0UhehCtjoimUAABhKP1DjagL5z5zAYnV4Zpxtb6DkHmDvBblNhykubd+5t6T7gNBDf0YKpdEVvwUAULB8nsbVVOeDK4BFTTtonGmfRWWzdembCQCY5JLKU/Ust786jxPWlvl+nMbl0Ea4AEAIVaVywqpARdN6TrQvK5ut0+cSAFjORD9Sck3LfHFhfNj6Mo9TOXojXAAgGhXl6DkhbFY01Em0i5VN6vTZBABE0hM2w+pb9mqtSe3Fn/I7xYIVAKozW84wvRKa7ktznWrPSb3j/VkaV2ICuuJxAYAas8cnM5zGBBPuwgT7NQIAAnVoFCrUObRwzFhSXZwzVq3rkkB9yAhmB+nTxfKeg2jqTQNB35T5vahgT8KI7RBIUkIDA0lJRyLCkzXsmgFWfFhoxQrsQLx+4y6/FTppSgZXAyG/fkn6J/aG/hqofrHr9V7+0vXCvU/ZdFGCz+IvKLindtwwXvcdWnh17nynrs38hxjk7TT4zWlcgPM91/VOCl/618Vzr2m2uLQ9iFj7247eKbOOFQlipN8nT9uxMLUYS9B38fS0nBqp/d7MGwwXMDzcs+x8ucq+fcg53XtIwmR/4c1oA3pVr78K21EWdB6++NOVeJrjQQEygWveXj5x+RW9o9lNcFigYKhQXVs/N0b9RBiuG2nzjLNm7OvuZP2AIzHzZTIH6WS8j1StrybVMdoK54R9yI7N7Ov3ZrUuAUrWUNzbDatXTDwFCu7tIKGVGro6UdCDZ6oM/Rz9xYBCacdtr2/hz9jlGTtIEL2nK654TgB8nwM5hLVHlCrS9RVE/NPPjR7SlfCEGnpaumPdzRHHaT1i6WFK4A4vU84EPNPdz6eJhB1++XM3eSatISw9OPfUQJSOyySlVzfNavH+k0RNcIgplSE5jz9CW6eZo9RTgSmFyjbH/fQzwTjgyzwFgUzN+L2FZRFqsAIh520u62bTCrZEltoQhW82DkF9ch70zT2acPgnQeIkDxeEjh/A3TV+u/pGdB71fvOb8v0kpPT3O92Sj2+WxI873k9e10EThxm8jtTHmng1cBW0+01OAk4k/Ujns1rkGR8M2ylN2lxkJW8TrkYpMfAxV1Ak1jGyE3Pym1UMLgTeAdVHbwK34xXZ8Bn5XvfqdiJyXZdUka0y+TxLwPAqVyfmvyLVLft1ydq814tCu+INZA7KvHl43zvv7O1L/L+2g62okMbVb44bxoTuc0xchoDoOGofflg/CBjwrvfNuOjnplHrYsGZca285wUcvO6TEc4pmjSLf96FJ32MOdnHHVo4V/3aF0i8jRt7i46AkJAD9fBk+i2fk7xZPkoAKZpMk6qcMaljmh3BzPjfpmmYPF+aJXmIpp0V1nQOvGk8BSklywWsAE8GLEUS02VhHZTubJlhQ2aUwsCRPAdMIbpp7vKHMjs483V/SDss401QoZosiwk51eNsQQYzY3aRmTrtIy4z85ut0z/i0vyvZCuRIm97XEegzEobSn0zgyYWPbbLKL6w9ovhzRzKCaz1e1j0/LZXAS0JahkwsYS4HhKCfo+RGijOnLcrvuUyS+cgfs6uFu/0hpGu4D0CJBF2uDtzIPGS6mTBALmWg8jXZQeI6U1GEEFF8nEMMEjDwlI0iZvOn7kjvsxXzNyQlrWogR/LcA1t057Ue5KCO2ZJj5V8lBMjferjlyQk86fGuPS64bYYvfJRv9En9kQHVodE4dbpWLYlOYLYczdEdVkNxbSuCcdgD+d7/rQw5dzPHo1iT85Mnpp9u921ay7zIhuuzGhFTU7JwslkBn0usZxqTUO5uhwZxGtLRrXqfu7VftokoXg94i5jlKCAZ9fQ1+Q4G5XgLcI548gd0zsznbs0ctNnK973utipyZcK5rpSb4F+WFp6AcHIKnFbBuDiTFnAodjBej4PVVNruOBaHdjHPidPm33bLFHi5tLhl3rdjkaYNPjHsQw/o4hTU65ZIONKqz92dZNV5fjcOY3WjmDZRiF6sn7bIlcY1R39UgAYqXxJNurobU5LbdaiJSXrM3ZrhBgZpAU0eow6SwPvx/sqHWkadjArzSSQsgK4PD4TywwAyGkamqTwyqFEe+RUH00AICrl0vI5SsNBAguOknY26fOGfdLdJk1pw9jIRupQ5+3Kd0pT74PZZibrUtY6yriNmQEACocpkhLHR6Ldhcnn1AaaAICzLe2k5VuU0AMFetk5Gdg3prw76KkEH6NuqTM5w/ymk6ZxF4upAExWw82IcOrkGf7Wz6RpzDUnp5ksp6xlyjMbMgMAs7hMLRcVVlOZdpUc2kATALhSyUzLQ0qewQAJrMqWZSZbf0XmF6qAf/AecuzeGvK/pqEC1IsQId6cbhuaAQALIdVwOKGu651ZnKskZdslkHazZb4O4tKossfyv8A2Wv1B33kXjAmbwGGFP+VmCrODaGcWRo3lUDSY+p6iQvsl2YFuM6u7/LHdURVFxbKmnS73DzLuF3Exmxa+mIxiNe8LbnWPWKQ6Ms5eYbfMwbFKOarh7JcQQsxb+l/slDxUjEdnwCKvFvDocu8jA5qEFqN+DI3oi047digm6IrL9ZP1E0rQWacOL3d4LHgYJqJGYuHWrnAoVOOeC6jlMshkGaCUiRZ6f6kcAgfh9Oi24DxvK3yEZ6xLwr25vm0+GjXvPPi0m3MmkKViGF5xRpHlyUrZr1YafZXVcGeW6vxUdBYf7CRxkOvmsi07k2NF47KKin7p4OgEsEf8T7N2bY7wEF5T3XH3g1HaO95UXSFhfy6j8/b1cnobFwY1TIdRgLsvh1qnzK2bZgEhJ7p22L0d/pqG1bMvrTB84kJsZW6beRfUFxW2NQI6l4KwdXRrVyy8RvKIOAFKa4UU3ju9HBhDD5G3FSdx/BBCRoywQojTNE5MwzKlx+B4PPFtEY/8sBbF5FxXdrN8pZAcxE2Gc2jya/F5dh8ThPRf242nbCkRlzIIIilT2QH73e1M/Xs5gnh/YHpVYuhjoSp0KkBTP2YAYITOlZzwWYVePH23U2RHFWJtIj0cpdU/lgkAoAzz9Czt5A//hztLe0fv8ed5bNKINbKO1es6zecE5pQaw5sT47kpUmUdPvdKvwfcNQ2CQZ9PwUuJ+GBc1szJ1uOnGllrLG4vFrjhVnk/19QvnW8n4Wj8bWjnqek/BmT53HC9f7WxHqXqVVKjNMnVC4uf9qHDLSd2YxMi1b53+/ZsrnWv74LDU6hQAQaF/7vDr/MhbfGUN/c9gMGhHx8QOZPZmAnhX0gNhAKEttL7WYz7qXf+jGo/K6am2Om2pSXVJSc5CuJoV6ozRr3ibOqpAORWIiRMkdUZ0zp5PykWX4H61umo4MKukrlqnsONhG+3mtDALIsrIxk37p10v+nMxNn0X8ZrPq/PgYjKI1I1BOi/tnVpLR34UnQC+oTzu5+RepcO62A4DgXuJSOqDKOoQVlakQZvCHVw+fl49SVApAiuqmxUgcy6ETcC3TozANANTTPhuaKUDhkJyfYUNNA0AYARcPfddxB4/4wSAHQGVoyeyVVRqaunyZEYsyhdPvJBRd3Y2n6weXlpd7QIesVWOQAxIhgWpSY5Hl+9nVx+LNJ6JmJG8FP8lAMQQ4JtueGSz3RyZG/53y3bSdTxIzhrzzChnqhdLc+ICs4/MgMA8FDRzYRhFUUHaWR7EhIUTQAgyVO5S/e7mBrdJACgEGdVmtXkLvk69vnga067vpg9/EVdcs8woV6ASGH0EKp+ZgCAJDOmV2+CwmTcwnwjM6NWTxn2gWQmlRqb5ndYl6LiSn/R061YeOEvxVR1KBmNihuMkFqErX2pBtv0DjxQ0Faw3f2cH8DxD3TWDJjOoACYnm9xwufOwifgtBs386c4Cx9XNkXJHbdk/szMYV8gUsMvtFo3rIoJIv6uqMVIbgQZcgzKfkk3FsgEQPYMRJIjKyV8AC/aMxmmmef6/9COxqxMB9HyBypcuXb3SNZ9eJm5um8Z7Ic9Oi81z3CaPTAY1xWF31TRYYTQd8tPoHCiRYNz/QoEBzhpNrBUBj0DdH1W2If7rzP5Tj3OIMTxeFH3cj7xpvEbXti1Ga50WMxyX4PNGHmXhrZhiLF/8XmMrEk8Opp0du46XXAFiCLVI5QOy0KfL5CxEsmHbgLAyTaczcCm5RjTD8DgZrPEqfeX+96H8rw/OUwBAF+rk5k8FvdJabIOPErnr/2dh7XZNe1Ir1bLsPKDbHjU95w/zP2Bq7UjHBCW683G5wL2Iw9rPuOBJQyhIoPRo3ng/hw3OIv9YmFbjJm8O0r6NwkG2dCCICEdTDLxgxaaz7PP2GFiDB8rB8S1OsZpsT2m5Fa3Oo10THHWsuemnCjw4AlaWJGp/h7HfLpXYpy0E4Cjs2OqFoNo5sQXKx1CKkuOrMx1TpVi+1GX40oUtpiBEHbPGNdoEsXTyHkuDBQ093xZsaSkHaRKbtZuO+VKDMqgQY5fOEIfsHheskzOi6l2x+hCxtQ9DW0wI0EE3JpBKWQP51wQF/+6voIDF4DlP6Vr9fJYty7RmvKEP3PFjilOsEO2elBuVO8FjPzOYJNsom4XKqoFohNjwRcW5LBibp/gUUoCYrhXuqYgteFWdJ3N0AjrxmyiEWW4LmcdrERASqRKWwLedoE/h0qOkFHE5fZezEArU8at/emHzzbmxVWpfT4RNd6aLgg44UnhaNbfuVYx553mXNPz6S8aIEFRz+JFfv/Yi1LsKA2WhiU0oQkYR81TttJ0dYQMKC2DbUEGuSwWjOdFfFkXbJzxu1MNduh04vs0l3E+UcAPD6mkHaiiIxQUN1N4Y1b6825jfylTdWn+ilBMTjCtGKo447KUAcREDgmvTiL/alNAzxio8Jyhhhio7DNeOh7vmvf2Os9WjbZdO6/laOu6GccQV8Cjo59nza5dxyQi5pVlRtTp4z6yonf+q4GvXsyvIT7XzIzNqgkAXywrrvFhfWg5ndJKwotFP7kChswdxSbm80tQ6iBM+0umKnIZR5cdD55dbfeE/tT2YK+o3E8wmtdP2F35TVdmbV0mlD9T9HWn5RmlhSsWH14tGSeLFBM2SwrbrKc6tNqPYoKC36YwhfhTkTZNpjgh/5w3YcJGFxqL9/myeZ+ZxNPE+bTrRMxfiuLBl2kad7kW9vAh44MQTZ4LzN8f4PB6xIVSSPNkI15m/hgDu/w1KcDNHz6ZK2NVDpWqHtxthv3sQFMcMwAg5MejN0FRX+MiFRvZ75T0lGjnRNVoXaOxUSYAQGy/wla7qu7cU4Dfxl3t1NlvfM8CKwFwrYLW4mPt1tGrL+OGIiFxHxB1GIjnmKon6Xqe8PVMt/G3nlCgutweHXFB0xWAKTqm+jd9YkozN+HnSOODdwKjPiDDBatVnDAMEUpyjC7CACXJJPxA6/Zfit7rx27m78npM9oDQNyySzY3l7hO4oOu4K6x97QJR5yBBotMQ8LY+wfJihNsew6c20lZyO1vARKN86c30ThlsxNgPnXrgYl3SzvB6hAjMjea8WsCJ4HRE0fkZwTnlyqjKYf611fge939k7jlL5HXbckiCfRhd/W5YtN9DaNhHuUeSiBKMetNKux9B9ooq28+eWeZubjrqvyH1WMOmOQ2esaAJBL69Tgfzb1LsfjvwOSraM5h4j2qeA7asyXoW7OC2rXJJ21F97rlCDb7ChRWWg69XX43aOdygoPxZNxaEnKdMAhtiQTdnQz+q+h4fEy6dTEgH2FLoIXn84UWBOnukX2ZyTqkaaSu3ZTo83GzsBvAh3HlZN3mIsXBq2BpaYl0CSlrk2rUMy1f5I/VO9f/kRVudG4ytLu6qmsn2R/NOuOdJMNouOBsLl09IMcD9xPjqj9/XS/rFh3d4DC3lyuetah+epMTzkeo++prV8OKPPbXboT7DdpLxCwybFpvftm6mPiVsNmuXM0B7ccIK5vc7ms0GZ4ymMaGcn1j/gSpUA4PFPDMU7CMrYIpiLkXzZM487RlHPtlJ+EGruHAfuSUnz+iB58Au2XfpTBykCmIFsX6OFtzmvHje+e1iql+0CmomJ7AioF+JOQwHDuIbGPWEQFR6FnJminVtL1GQYbmRj6fNljcjJY1kd/R1/Mn+sZmKDhNJoaVMXkFfflW153eerrT5epCd7Wegx39Gv+Vl+mX6zuLaD83C4gq5B4mwmZCJu3LdKUzGgrqGLPQAmf3Q6OzbGIfqGrcqx/VnNwT4UCa612YC6yFEzwAePu52fcSX0h1tQy8NhrDxgy8MhpYju7MKdnVHHsC56d0fQ3hlrEpe4MgD8cjVBHny5vjb3Jtm7fZyaCv3DbIlUv4l4/2QHykpw30Nc1TT/Mum6YvJt7xm9SqDapkmxJHkP9ylZqMbqOEb2LCQfPNBHIi/cBp9fUaIGfLUgLvA3xNKr5OU5rGTRDrEnjrQ5uwc4FXZaLe8Dhm7PbyfU2LEb+6EtcFjW3eKHxN4krMs8BJZ8BgReXbxK4dhbDDhEkukhPHyQjpZZ4TMyI4DA2s25F/zpi09xBxsSp3vbmDoCc7wV0jPmm4VZVWQUjCitTBjomJeBSXrQWmXbdjDdPTbn8vyyxPcbgP5qIm/ijr5bURwbhMQIhN4MbLZm+MAIamwpOT6aLJUkfvul2HeUrc7Na0mDNcRldQWhTxOQQisAmx/3Axj1+H83DHvqdwSellKqGAsRVzLrYeXF/KGN1GrpMe/ojZ/P6E14Hzs+I/+z9YrjL82b+i6cPfWrGY+L6sJL1vVlK+O/2MN8Y5UeTZ0+CNwddkwonoVyEkEC8d46ILA2NoviK5GH6VMxYcf3d++xtToEIYjB2d0LFxZefPi5FFrvFBrQaN0oTEmYzlvUvf3ofGqXRSke8EvEw3rkAHVgCPLkuyi5dbHrTIIEssmFdyKCQ2LDegneGjIAkBeRxj8257GygPVmY+8nfKgE7oXy6dBo3AzyJ1V5YUzLage6o+zADARcZcr956E15uCkUsWn1QB9657OIY2zPAXhZmAgDH0zPyCNyTsLkdOFcevV2Lt93UDwAcDaVIKA+h+5gvbmiKizMFLYu/LOCILsHu0dkcgeO131dvtoN31S2p5iBVoUtJncDsstkOIFds4RxUtcz2DhSGv9OElH1FJoGxKHwbWctrg+ltWHXYR9DOA31iDSSAOfcHY3hMfEe6fe8Nxsym6tLTEb/jl9gFCWAWiWzLlkqi93t3uNugpVxt9+gx51SuL1W9HuowGJPSrR8zANBBmOnivvFg5QO2Tw7JDq4eOcbYXPfwsaIJABBs9qTNAtYlvS2mS+0HAFigFlFZaOU+BXDZOAaV/JsBrjAYI9N9ht65YFWVY7I9NPkgqnOJ/IOdkLoemKYW+liEjC8njIb03tcMAHAQmtJb8nMio6ejk2F3RwbapzMw/yaXKVPm4IKLRluVY3QTvbRuRWASDx+1OIaei0AMjSeGjzcOcrOL1YJoaW+u6278Lm/3PNqEWvjN3eFBT4AnwYXHo5Jw+MksnFX1q3Rs3IjVuUcd5vMupkpNck8KanMsu4TRS5pHRnZJ0BgK28inXfJFRmYsjOwKVpMcwfByuSvixVc2IRXSz7s7mY+BvDuu5/cju9JnWuXrsWqQwipYNaApjhkAOKFaIqxbbwlhB11VaSTZOWwXZZxuNV44EwAw7+wCsnN/izWUu/V+fJjBx0FnPbJ/eGyzH4QlWjb8uoJYh+PwOteFK7KONWg3pk6Yx6vfxBYDALU67vB5lHwq665dVi3yTxW34a90VbcWqV5rPiUwSDHy595w3oDcKHMyfqM2/JUu0FrkCDgIyLCyK/U+xrjYuZw2Uq+BrSWdIWxzByR5FsdNRhT3On8uM0oF055RBUeA6VEhm5OCmaqRN2cDy8BWRZou7Ct0TGp05svn6iQvaE9/pG449sQD9cIqpD/vT2lnZbLHK3QuTugzLZjwS6gGbypa34gZAOgO2ukaTuzo6PBFK4KuTwn3e6oNx24Hxk71GE0A4DRZRLQR2DBy2w+oaa+cE7GrmwsCgKBd6GrCgYJPmUUGRNnukTEgUJaYjgHBdv2YGFA4p8CJASXZcm/i1HkmA8F0eZSCuGKUK2wGCo6bLY6Bk5XZZ8E58fdtwen4iq4EhEWdjsm5W9Sdn0oyxKcvpa4fYhAkgPn3B6Nax6Tmi+ZXUx3LO/ThU6kbh5gGCWBGiYxX6xDEe6m+uriNT6uTafoIgf2rT6q0PX+csmqVQvUqZgCghhmuh8o8WBljby+sHafPcgftaJoAABY00kYFSVEu7SkuqkEA0AGMiLKgKvcR0M7GbkDkXwiQMEgDTzX1XmBVueOZfmLvfhOqDG1gdiTUhZNBOhKozXHXXBKz4GddI0FVF9/5GKTpgNUSiRjsR0XBs/6SuJupFo0gL6LVOUZc818XLOpq9P8cvDuS5Xx6l+WVf1xNnE7c8LzgNrqDA3TKEBDcLroCLL+QPWZLl57d9Zn4DlfdahveyMFVcVP2kOp9eij3Wtm6FODxCn6V0W5Jc8/FfEeFKSrxhuxIIfgjMLfj5EBSiZvPpyiFURrxsjPWprHl/SP1XdW8LXMvLGRNcAHGdFkFiwDGGZ20urClu9bxK0eA/Azpc1lf6Do2UtRFKKKw3CF93P/GH1c8mVG5qUNlz0E2y+LVizqsfkwYzeTZWaosNwKhZWDHWSioMlWAptVPmmD1rFGlsN91/+W7M9uuCm0ogo2PH+UXsKnJaUWoqXCiArMhGR1GSE7/lzl9AQykO+JCmE1LcjxGp7VDGUl9FOQJF6r91KLLn7gye0I4bfmAVfHj9glPDDx6UXcSanvySeflrUmrLmuEVcSB0boiPokl5Zt0z+p1iFUYj1buAu2gRuC3mVDMwir9AlfiBr0Eu8T19jxUnZWJ+PZGSEUiOUdd+PzrbeERgEyUWSjBOfpec9ok2a9+IbLdi4zoLJ67MWIDfWBlTRC3nOzIlLOKbVXZ73+2TiWK55ULc4VCUR//j8GaH5n7sne1R2ksGG+Jmc+LbJd9z7DRlz9AvMoaXCjXffYDQvHPliNqIFg0k7GVythvD5iKTzAIbUZGEZovWXNRCE5nR26n0BGCpm8WHlMsjqu29AHse7XXv0/nkv38X+3ZQwxcB7gjueHiRj5sY+Di/y43CC5W5lrL2pGzJ8W947Pc9NcBAGZE8OUZiunBZ9NiDCnVqy0czlMjl4rVRkj0ShOzGnykT1E1dmg/Qls3dOiWLz5ItKpKbYQsR8PYmuEgcjYjO9Y7ImyuSIA7DQi7Kiaw2gOZOJCe6Opk6OsM8pFQZ05C6So04Cv21BWzHkIGnrxcOqj0JWKYKYyouxLWCDFuMmG8XCbVa6Z114BhQ+xwsjlMsrsiRJe+9O4CJjYiFrxu0J1QEL5bDefeHhJN+ACoQfplLN5sTZH38UKBPo3cxwb/y15smTQ74cXcT9ZqwUjH8q2m5Hd/Tg9VZe42VgUG7qcpn3gojmgian/C30GX2mhc2wqQG1DfLkzxxHEX8uAyFkIiL5+XABC8GWpeXF0ssEVlVozipzwOHKQDuM7HAoZnX5Ru9hqFnndwqeUAkpJAhO3elxRsTYjGAugwT3GuTHvAe5oqP1S3lDxEu4rBJNRZLEUSoElJJJErE035lbBYmyeQutbav2aVCSGC3Rt70zRrC4xWR/p4ZX5pLWSB5/wDIHKNi9b5IWLpQmtHnrVe/ztiO/tYjJwC0p0kRuGPFvK4btcd0x1WklrD6uFtUrvT67r9uB5VFVtmYWZxlEVawiNrtDbu5QsHhoiPb1Jh3A3WUReU7EbWT12IJTwp5Anm+JO5Azas3Omd+HYrac5g3XOyIbrUB9Nq4Rtx17G5cNGQwLK5gclBxkJDT1U2Ls8BtLIMuuuxmxCpPRR3m3lEFC7sAREN6RNc+bfzP22GZ4WKixjRO6Wmxtyzi7xbTmtZJgCJNBBnVIpi8v4aE5Ek2lVgAqU8p2k4y/9flzaoukQF5Gn5Gl/wBsjS06mUljvJZ0rTdhKOiuV07n7mEm1kksyEzZsyjiTWVuKBuy83+uD1fhxZddkQJPWHlDd2NElMK5c2t+78/oPUk2PV5UImrqyFNvuCIqxZR+rdNH6UMF2WGLbatNDiSoW/VfXDofsrwnwfZ09AhU0CJ6TNAxv2QaHJPDGgCmEgN57QGBSyKo6vT1rPk2XMfFYsquWRgOdK+1R29shuyveaUbkhC47buPyCxvpupycaoF3H0zOvn79euId9rtdO0rcZ/qjV2fJe8IN2eWHXq7HQ1fFud0cxjH0aPJP/mcxFGwPs7qG6qToHV764h2krfKDbIXXfariy4vywIN5yuALNxQNDWOB3g/qNSUpuO4Ho9+5Ku5TuLK+mKSNJQOtr2TSSBoXO11uUdPmes1LKeyY3Tq6HSsXVQ6kSkM7l4/f2fWSyRuZA3od6j0drR16Tie9t5Sl6MaQYuOIUlDJf4v9E7bZlj7gp2t3fJrY79zTPXoN8vkxduwOxgSfUrSMIKwmaTmPUTZR3cR8sIXqCAF1bDl4uRspKABdBmKxQNdORgOxWWEZq9PxaGGghoFnuSHSDhUUhdHf0y4Wjr/o+fWzr/3/qnw/l43rNzb/11+Lgp13MxZv/0/1yzfePGZP9KA+PX7l5vmb27R9LGd9LoxfmPXtMfYwfDRmcf0IoQ8tYdzFi/VFqjBqPNaYSaTGzhpV2SoFan3Jgv8gWvrA2kbluIPclyDuyLsaAOoy3ciEHHOmM9a0v2EC1JmoFFTRv6H4Ij+Ol1ChW+lnzVMK5eMuz1cxyWa7U87yp4oFtVDnRyfbMyc3gym3ebK7gFhr+Sm7e+XRFV2/aYquGHDzambT4ao4NHMElm3xs7cWonM3a4LskYN6kZzhNgIXGhB4Pn5cgJNZ1poAmsaDdDV41ypqIIF2jIWLUbLoI7CyJd/qUDpuqEbkylCV0oMUHfLoMOBKVY3t5yQIpEF9S59yqREPM9GVY87qfv+7O63vOVMHQooVwkz3NZGPTMbPRBRBuE9FadNUjd7otNpBOSXBUgDnRI4FeUQwphmzh5Ues3OGEllu13c4LQ2BSs9cYdb+S3DviSfPtgu6W7fw1+W8QQZrrDrQxIVhaZMgrearRnxdByLCNPducN4wjFEMxt6yiECu6/RA6F0cZNM5b9bccXF7sTlx3vl8wLOir3MTzq+Gs+zDeMJ1DZB/q4adyKGBmXVCV1t8q7tbWFc3HBdvt0QTqXdLcth8NYv+4plsZvosa/oqbJpRWmNXKsvuWoHXGI5HF/b8sSAZv3FX4lrgCDbV8GM0XvqiC76qxv7UFMbp07lpd9Qhk1X8GgERdQWcWe0nDZR6hYOsuuv1KXvFTuTC74pbdThcfietA3thTg1cngY6T/fERta0eSH1qp8fHS90dM2+OTqWnFeGvI9a0E17NOaVT4xTzkqKUWmwt1+vT2fI071wleYEOROpwxROALstv3QGJF+IoqKcfuqZbxilKTwdW4tPRUpXTeHin/jxb6cl6dVlS3CqU9cWS7OvlQXuHqL/dYMn+L3osj27KstSR1wN5hS9dPehnlyLVwuTmka5q6vR+LVjpX5RvV5GzzR79fnD0mb6awYEmkFwVMEnkiu0gDVDub+zlvI/Af0g3b5xjeozs8xkmhOeOsAvBPQ9bANNdmTVcYo7LqCyfBUzFZNVPu41CEHDpvm+CkkYJ2DLhJiUxBsJkitE9EgHebwKFmkKigvoIeUe432scI7h4i6G3ksxAeUShoyGaVqeBvacKhFbKc7CPtN1obIxu1nCtnZ0Uh0x3ugPDM2nonMQWfglzQcMmLHKGXAvr+myjOxXIP0MKyeBHUyxJ+YVL8xlCXZigF7hV4bTMho1l9QdQLAlLmxifu4jliZhx40HbUs61yiy6Y4RRWIO14vQ8Aox4tSdM8b9HzIJIScDbR7CwIdqmd3TkpJ/NpF8Zux4tZEzQhF2ymQUgxU8n1MGUXHrhNoOBp7oVY3KsoKgjfWCYd6QXg/Q9lg0YIbbjk20Q+eP6uy/dRs/BhBnQqb2VbxSGJNWU2437NSS3jo0fWTXbxJpKOhRsquXIVk+75jDgL1vUSqk7BPiynJzlqJisnslLlKQXUhdybnXMa4tbOo7UQPnGGdhXSPFga0IJvMzlTDOs4lGxr1l7m8x6EWcyXXZ5qs4GAZSVEkRcc/pvi47Yxd/qHkdEphqWiw7danhBphFhCG+sAn+199XRf5ZvmPxVtVKiUIsOFE8hmoD+c9uXoF+A7aXjPfovHE62OwSQ6y+rdJFAGS/MFEGMwFG0CauCg0zVKLUDj/v20CaeW2ZTK3auRmMfTrstgF2DkfzcMsZwevadK6XL9mkAYBLl3cOyxq5ft3T04yF3D4fOPfTc7gEPW8/WcQYI2bHp2QDYtPt/t9Aw0R8CnI6iz+jVkSNeHN+jtespjAfhThCAP5tP2lq2C2aRO+3QmUe5O+dqyH5k3OFgR+0sEOA7/+WDNZE4dzMQGg9cBYiSgimAwZ2VRVU94mLctyAd+29dwHeGggReO1uM18pSXQ9BSdYcsY/vn5ldNDqqh39sUTTNvPh2FkgxbmeH9ZamJN2sTu2/KobfCF+K8x54Md83HlU5uFgA2hyIRRY5t5mLMBB+X/cfV7SatJcnK03lXmggOEl0oHJjb7W0lQrmEB7tUhnbLtIVOtd8qrWmsmBt83Om6Xth7pNku6RflcbbQ79VIMWZJkFEwB/ZiN09+XFIlSVLtoXF5DuAzVMMSde/zhGckW9QOiM7vYd91gHSNvPCLZf/QjiyWjXP14mRwsNzJqPBgoq8aMIajowqgHv7JNOpumeSkeQcvM1HFaQ3kDmVNgWA3Q7QEVUgfnhGyKvizx7tr9Dq2H+GN7mLBwmN5nRYLvzd5wh+ya2TzmR3JuPWJ5XbPpyeeyw9Z7Rzj6XXIo0WyGH3IwM3OdgU6YRpcYJsSk6Sa/JQhBTul8NnQvJQzlcsK1XuPieO9xoUgz29F0js6Ul2VYIO8LJuAODASrwYEGfpGDuRFOeCbVq7deUwKFdog9XMSGorZnWe1W6rjsqWX6lBwG4ngmki5Ga6C1PlEkzZruVwC3fo/bst8IpL/wEAFAXmJH6WDU6O3a4LnF07fGyxt1K5Ed05f/IG7iYoYIsQqxEIsCNwQea9OXBpOXYHYN1v2g4AoKqWwYWv9aGay+Cm04Fab6eROtR2Xx4P0AHV0XRCAaeEKtMJynXTmAcAsAcchONuC1TEM9MHaiGzhwO6VjZMCGrHAzUSsL79RnUPb6Jf8o+uRDL9Tqv9rs+tf7+F7gTMC/eh+zDWQKQgaUwsLHVFhsJfvG/aP1emMk0Gcf+KVdsAksFEbW6+e6lf8o+uuTCTnIonJ+3DySoMxb7uY/Fvcb5owlyZGfr7j7SCuG6J1dFIv0K4pGocYt82gLk2M16YuxCX8Aa97Qz386/5bna17J1WqtozoUG7CpJcodKmk7oBAF+/BtBQVdddPs3iXJDa6i7dQc1yhTZwxx5JbcVQG7hTRtRJXARdcSLaLWLCTHchzy6By9Suh1uYrPdvxmBul/4DAL04UHviJwjoiN2mDHrJxYMFfRJ/owLmEBTguBC2Bn3Uj/PByviuZPBPZbwvlYqz3pZKrI/GrydyIHgDTf26AICT6SL2zvC/axVTbzuMsl9/yc0T8S/5EbGV/Dx7r1lPGZRPl6TwKdxsETUsONMoENPYpgAAYALQFTnCv4aw3vAWzK9IhrZaUTpg2b29DgCghCBjK+diXvQSLkKm+xWkNc35tcum8usizMoa8m7kizikXbcYjFVU4yOvf7uw4nK31Y89CARkZC7TYtsnryUz1bYxLl781L993OnlUMPb9u1QtXAA+pTteaaZJcjV1vol25vhK/2e/sbePa+kRmFP/KgzqzVsX5JYZ1XI7a0yoUwKq4rQ1J8bAFghVlOXHsNEuRHwBTkRyEg5MivrkR1rsCzFi1ZIZhehy/oVY5xXxC7prCdxqjZKox8iABBJ0LJWEqx6EUx0qEXKuetPW0Bp4GX/AIDWgWxI/DjxnwU5hfbSIwaVSwc4UX+uisdkr+iI6T3HLmLO5bxUNpFXlgW+qztC5E3xSarJLQ62GKObvuN8Lxprbsv5Theu7PU3mdXMTb+aDKP12RECX1f/+c9uvlosccV7Vw0mk8FeGQzm0fDCZlw1bKaCB5Oh4PHLTPDguldQ027pmTQ70a75/MFlIDhpC24ZB1ZnGtg9w8CumQU2fV89dSaBFRkETsLrfm3mB7sm840zBJz6J/A4VZ0JYJ8MAMtTQigO2X+c3hoL7H3+ffjw/tN0PdVVc0LuR0pTg7HtkS6rxnUhMrAYkBJZMZSOB1YsQLAY+k0BAOA44OzRHjvheODCLe3YYz7hkucmoFteJWPrVOBre7s8AOA4Bt0EI7hUtedblbQ3f45Jr5or0ik9JbLYPsnpsEAnyDKspQSp2Qoq2FinwhQeego+Ewo86SlWzd5CGp4/ZvdSB95ZxzUnseGqTBfUc5NZ7lKdaP1W8wQIOge4Euvx3hdQZ+L6jYskNlQVE6mq2Q2eUFh987e6AQAWCgnwsgGIlc2MgZ2r7q5fBVy2EADxWCALQF0ngTN/K7SqCREAaBlaFyTBppaGX4d7g7tX+3dXa41iXTf+AwAuQ57e4MdrC+fCmscBF1sR32JddgQuz9LfGsU114pSPFGQ3ubW+0qnLNkTlHKM4qn2z60HnKbvYdcocsW7nqDIixjzHg9SjaZ2ACBlFA0x39A8SBN+u5GgLihYaUggdY15AIBz4DkWDu1bVgPMFsugWOGKDDC3IhtlGWAh0YAaGWCrO6BYXiD5+ZaVrLAXJ71TJ/1xPkMrsZ6KMCTviIWLWUlDv4b8x+rgu1s0/Uisn2IwNoCkHAXHe6szaUQ+Bv1S5bfSZ/yS2EhFIeYszLKVrSTezwfwUXX8GUPplxIbp5iODWDOw4xb6VMiujb1PHW2u6lEJLGxUk5EDKsSQ3J3SJtO6gYApnT+oUHZ3CkgI2s33RsvKVsICl1fUbGOqgGKqZOoFXRfEyIA0BC0uJEEq1p2eR7uDWbl/ZtrcFpL/wEArQy6KX7iAn3NmkOAAW3xxGaq6JDpPUuuFXkpt8DX6X240l6dKpRS/lCGfTt0IkLIr8HSZRKkP+Tvdk9R0vVhTXO8UC9ApIC8gqq/DQBA86ma7bZp04Kq9j8aJ8mx+cyIqgndzQy0rinM0oDgLDl/VyRCpitDrJAI24GziCWR0EYWEwAA09pwV2FExXw9QaWjY5MkWe9KJg0wKybXsAMAZItkxBJKYwnGxZkTAGMy8cTAWDBJTiCdwLEVceB9H78d7ybLFKhDf5IKmUSpHxb7qiYzGEkw6wVM4C89I4i/Z+db9hq2lV2Gxy+Oz/XgCX6XPs7uyZZVBi+zyBAAuCkEiVsJalMspNkp6bplhm7GySmTKOmYcr5zho//JVFV6q5ACSSodocEKgbQ04AIAABAd7nPhCAKJJraq/+bdtPEvdOL/wGAATQHuT9bVlaNtuzmNtGWNd4m2nqeblMuiVp3BKT0iRaGLFheFfPBRdh/1WznQV5n98+fudKfy1Z2gyDm8v8LrnGSB5BX5kZd1nQxakgZm3CBYzg3RiQHzzx0sIqV/u9Z17ez1rTmsTLfhnlemVwaRUV2p8vHN5otdrtHNhvoV7xlEZP/NRfVtlnIg8CTg1BlITaXDG+//lcOD1DmyjP7zd4IwuDbGprLw3MXBPRNdvGus81kmYbdG4zBU1yATUkIT3P8FABg2lRyFObzShfgWH47r5mY61aYogpIU2/lvcZxeQBAI72qQ2SNMZybW3KjWhkzgdzcINtcQe4oaLC6oLS3KyqqoKcLZ3B8cFuaxhpkldOamNToj8PjqM7jg+EvhKSGe8/44B7NMG0qqZfYQ69UejDfdiepoZ6MBWtf11lhdxqa4gwBgLYG3/piJNlZgINsJg5YjTu/u2jdMECfXGEwe3e5Q4A6nwR8AKecCGGZKzzTXThNSbS9IJa1f7xGsCQeduM/ADAStN3r/iwMnBpt280l0cIaL4kW68tS6QaluAS+TFSOQKXtSfp7fhEJU0GXhEDCbGegREGp3XY3mIbSVcFYsEKlO8vaAYCwCgqwLV/EQgVMt13EQ0nk3EqsimqAVZryAACWm1dVAyrguKkB2eIZp0ASMtuzIL2yISWQBvwgqFS7cM9vQ8orPPMRPaPOKdb7NlpiPTvCkKghFlZFJUU4ZeFTZ7bfaeJKrF/HVmsACRgKjkFPyZbVNeKtDn4n+I6MxEZ2FGJ+ugxFEhy7VnrVsanuvPlJbFzHamsA89tla0tTMmsdpYPqNJ94OqiVldRgT4qpqoiKDnXakS0CBwC2yx8fKpbNPQSWY+02ff2ykoWoL+exKDRQRZ9EiUCvnIjpJf7/THehKnNF23J7kcvx/rnTsqHG7mr8BwA8gHwN9ydlUdPIZzfTRClrnCZKradLpVsctixADI6W+1kBl5WxTUnjOvUnmOpkCvnufl3i/zjVJ5PeVMTLScx+bWg6ghEwxeTzx1O3Xu4+/8XjoOXeNePtX0XpAZiL5fH4ZjMxQ353C75C2hOOQCKwoNjPY9CZ5c5aNdNh5gWpe08t9HveviF61g2vXXpoZnP0dTWFUSrCpxdPz1cPbwiPtwr7CG5uhMxVURnBi+oWflx5Ws1uynDlEPpQJ/pHCmOXgYVEr56eL5pq9T0Qacqf3cqypzTeZugGWTZoPTBzjp5Gf0YO1APU8q6zI6xRnklaB7VjUH2czHPVyVzDl+ck13rri/LRFYbyNkD/+OjIfA9QP6W6dp4IqB/73TS4Gf0g1e38dLqQ2l/UXjn1MLebqELHIGyvtbKxa/aDPc6gCnG26F3LqPH3wJWmjRMGRgfn4OD31iRbqMuFgG35ptluhmvzvMI2SJznU9seRv0MAkyCyVmrpV6ANMsB0Dl8lbjv1vEt1/hzQtHPp8gdDgM86EsBOC7MB9VkXoDf7WNhNR+0lgdiPqRB718BpAeK8PvymjAIf+X3US18q8UZ3SASjn2DiuC6Agt8B1q5R+W7OzheFjf35/VyeNTGQah4t3YTsHVzOm+tNdUyQvOedjAQAl/RYTundDToiBlmngQ6bobDp+uXRnyqOnrIyCduzQbdrvSIEizps+EjO96RlZ6kv3Xla7iQvYdQSQuw+Emr7Y7zm/AXwsWbof9ecWuo6hYnbVy/Xmga22TvyGomokqNP+HaT4jeo6U5swqT5Ef8yYcxFwEiVDO0po/308VTjiWaAwethuFfiapmcx7ahWGirPgGQgq9ac+y3eswPpG/UElyQCRd0sY7nUcTjcRzHO8d7gZIhd9gSjeiGad7PmZbBvmh3J399NVWh++YTN0+IVrAfWtl5gt4+AN6uqOeu9or1WHM4DyAvsmYEzsEK8DZMDZWzYTYj1dztY2H+YrYgeWcuu1x/vTmzZDypkI/LZK4swYdSAGA5gpFFXtdJQZg2DJgRr0LmsNgar9mbjRiRRfkCkvpgs0PzFpn92esXNvYP5I5sxrCSqlDFcGfIht2U0UsXK6NdQ23lzCKQCYa/ECxukbQMpp0fuHhOU80W7ZWxYfqfMSxPUZBEyMt+tvTLzmuD7ix3mAPAPCk+KszglQKsUCKixaVyu//2GJRKH6nSfMXSOq9Q6SYWSmo8Y2IUZyenNkYLrgaNjKkyEZBqapQgFpaXFVBqVUQQO2Ct8aFru0IvAWNtrYPtJxEYnULs6tiRxzypgB2dvNjKbHPyexObdLhSBoFAm4piq7hYFXu7lVl7lzVDnStKn2pYNiFUm/vna8xWqHo/HLHsC8jYmDlVCYPHdjEwhlMSvY5wBnfGfL2+utlPHnsS0yj2zt5lbtfKiImHqjAvuOIL1PNvlTN1naZLrC7VFQxpsE6aMu9bTU+3sEuKG6ooDmWMOWLivNo+oECsAzfJ9oWu84Ajse4o133Mh/vYl7HZaUewW2qwWFhJJMVweF0ITvrAYf0K+PsBfuFW9Y9aYDrUe7ChZQc2cfk9tiLGVgnNIGz5SqOVPMrU7DMjs9zxTDskQMoQzSPGSrpeTQcRunU7mEdU2PEeBw/j/tZRPds+1Xtl+88G4DVq8nvDvBuaXr9APT3oHDKmVae2pphUPyHb9u3q0EZtkVMRyKA0qKpdg6z4R07dHs5mF8RPZKOr+z/2Ntg6qrV2ZKeGt/zOqovIewrIDUNJgBAuoFBzX1M0lIXUQJ35Z9YJCxd1xnrSMIKwgJ2i4Q1CpHYWACk04a9R71maou5donmRg0rnc4dgpeSsclFewBAMvPaF84ifeJHt6A4rOktUENLHOyfCgzUSpSGAHNyClYjiNXAqXMENlJSF3ZlMmJ6PIQzRq0YyxuMJVZaaeXYhlxeRTY/BABxodYT7pslsVeeuzmA2ZEqV0SlcfV71MxnX34XR+a4O4O+4ZnVgmnL7E3AqAXEHsDQHrHdhZDT1tWBgEjqUWpPeO+t4jkMI/pbfOgGEHxRMAagKlm1WK/Y2xRvvtSOD5oz+1u86QbwGnnZjtlWUlE/iZdYu8sHM3XiXhsv+1vFpepZ1bUNEztmc2uIYUjhNVTQTACACtTmHp6RwVopaSkBYUgqn+1CHmlQB+VEEghhWdtOLRa3a0sbVuC9d9/VtsJVnyDvMFgNIABIQ1b3B0dA5M0xyCbi3uCTeJgTpRis9lgBhxSshxKnsP6e2bIxo92qUOhn6/MV+d//0Me6jPAAh2oEVRrAmFdSkl0NcKCH/BASFYsZVBnU/SUHwTcCMCSAs3UkH1zPcp/AiiigAbCHyxkDshs+AACXSKitgIWeAk5CfYaeCUDbhomfn+Y9QPnNf2/ZKtRFyywHWzvNILBzb5E1miSrkcYLSqwbu/3LxoUg51KczjwmB+PAglyvkUwz5XbZWalibkRcpbsZawGlPWzkiVy0DyywYCa8HeiZB7TwvYged/mlfddLsM6xpeLh36auufAwdMOLtWIcrjnQlHbd2Z5MR3zJT/59HU72R7Oq9xKtHqqjDO6S7c/3z9by6mw1Aqzfa6+kcHvppxaZAAApYHpk+ngAdck/GSTsoOuMqJCwxyEBgSGVYf0dF0ktoNIgCgCoGqQgiGiiUVQeQckuFmOKTf/n7gOSleUT4KVRXI20SRsAcI8OZtRCjQa1ji79JKILm82aLYNNcXHrwKalVLvIPHKhRnvSuqIHvVrgDJVKmui6OpH8pSpwfsmkXZq+yK6hZ3lWGpSYaxhmbwyaC7wC8x4avKIcO4D4yg0QAcBB4HW47zjE1+O5Oy6063NWrkqFAJ3ZZvdetrBa2ZbeL7TCtW+bOfQUtl+LmTLB1Snc/ZFwsV3qKcKmxIMn6mn2GR4xD9x6KU/pSwgXTQ2DV4qckC9DM3w3+O7Xs/fpEcZ5fuFwZf/VoArVarVXFIxoxhWepT+3yAQA2AKu2/U4V7QmRZSQkgMY5bZRQjqdZ1SVwJytFFIa8lAK3JZIogGrnAhfA3XhOAQAQGQgiDjgr1BW5qbcLvGC44o9u1AbAJi+Z7oOqiis4+K8OZ+7FV1hzehAC5Y4W2KcGGjTlZqam/GnIM6Udb1OJqNsxVk7Asf8MMLZkl1zAWfbRzg3jC8cmXcBMDo5tjRx4gaIAGDd4Mxw362IZ+23uyPqNOWqZEsPVspWefiyqJmky+8XDGjhduZvfAM1tjIDDdTRyR5poPsExEyBbnrEJgGAz2hyJcH3o59xeLSdi06yMziaIfqv4uU2gBiGAtLbyyPswffYTTs3v3xpHV6RLftx2Rp/twG8YlvGXURCAj9uz3jtpF/LZUK/Ulu+w5t1OrKGq5EnpNaD2bIZKdyC2poJANBmpBihLs6eYiPYXUAyh1/Fg87+s3RDQ2mQA2lEEoIHaNEG15uGt2uLHEZUw5vVA7qYSGKEldoAQEzEFpdWFJjLbBGMTiwi8yYJoGy8hLjdNnrAdHLNjRTDKYuN5I+9EcNpDRHWC4XjuNVb86UGYvRtO/KTfvFf7Se5/yi75oAkh5CESDogI7tIyFkTNcpKQ40eGqLQ3VpC/+/Zcg/uJd+foMFfGTq0NvUKmDuhSynSLb4PFw0t1KRP/rLrqXSadd3TydH0qKaZl0M6/80IjP59n2miCL8MG8LUI5qZXv+sX4YVuhQn/wd0Syh8jaXtjzz40U4DALT+/IY2nlp5sKUyvL/325q37bHSmrhd8s+9D7+mATv0zlw3sCtbeZyGEw+hcNVMfjqSFG/JBwCQ2iVRjHBFI3A1q7Lj39NPM8Nb+hT5lZ7PR9nIAgAs9nNqF4VLp+cSnelI7RFndq60w9TV6eLi6tmCePy0OnjacL6kK/W2Ktiuc3ozlXpxVUqXLr35yWHDd8GAc6/J2+SN63Gkm4xvg7uyqndtAJNfEghMu+aDxwRYjeJZ33pNDyN+Jvnc53rduEgtp6cIb8KuCQDZOmDPtWfHC/BKFPBCmsJW4SAtTFQ7IkKtXYH9cQgAgKQFBZGOVVu0Rm/rDRLRB0bwpXqNpj0AoG+rdJMiUsIUpA9WtXvABJgtORMHJ8B2ZGJc1kcaDSwmlAJuyF5iSfaVvbDhZiqxfK4AsVbh0mYddO2K0ObYPbjrHiMWmmXSFOtOr5pl2eD8YTuAuarLWI0pZuiFlNcKX3ri7YJ6KafLGv53xqIrZD8mazWSTfmMh3/+qfj+yEPnJumGwMW5CJiQc46vIxAGo6voSmaZ0/UXBOnOsFxaKoUxbFUi4kuI1GcOPI636vUZ8oABWGlVX+LG7F0b7RtIEqIpTHgrXW1jmfeDAlj58XNKM74D/Yw4VUpfnJr79ekSkKlSbBcS5vobroiFSwpyLPg03fgL5WUpnsjBOGhLhxcHCVX+THHiB0dakNwvI93sFfuLILCfh/8czcVAOGvh36fay5NX5oeFdiKyTcQOh+AYptd1gcGtSilxHaArBgBZHg+w6oHWHfvmf20LxfSGN8NNxDtdayf1X/brGy2omAMUAgRSizcFLBxcvYncv/uBWfWV+6z31DpZpoSXkSYtsHx/DkRP6EGNQ3VWOHZtipNTwfxAk56WbIJ3tSYa6FDGoNGLiGyRUTppc+LAjDRx3xURLMaXPbMIdQ40AO6wwlpBC2rO+WW0aXJ0zSk7JdozkSG8u1sP74rxglLUN1COzegUeQgjPFsVc0yntUbBay9W4aOgV50ZAzf/lKd4yxzQtvPN8ORsM11W0OwOQPlvZ1SE8wbPz1CG1G1G+kMLPcGmQmuciDM9EwAlX2lvhkuMUTRngYf/Ns3KmYQYe18vXsv+MCQOc936V6pXIVifODBGSFcengZsaQwHEHkrfoU/hq0i60W6Nqrn67taYQldMmFWGPgIj9882jf24ThLxs6ap0Sxz4+Yo5I6p/8UtkiYXGUSGrWuMKN7FE4HiNCa6nGxfrmZ1XM8PNGn/YfEWK8h+LlbJQ/f4dJ41GEXhHPamN1UXqsjDrYjzxq5XSrhbuDbJo8RzaubqCgcYYluT5ii2wq26B4wjNExGgd5/ukoZXC3M9hhx17VbJv0jlIJJyQCfJp6WjIdEarptoZuup3M5d2e0M5QOKSHfrojQUF/+8n2bny4qDsMfNTtAid1W2ojw4abOsOHn7pHBI7quMFT3cHgKqsxWI2CP5xlqi6NaA4f7oqpwg0z856KZTc3Pcomgay5mRqkdmO96U6s72w7cFSANKqpFu3TcFwjDKoGdP1GjOfwdG/1xD5SXH0UwOuPrkLRSNZxG2YmYadKZV2ot1DrONsVMTGQLYU6ESyHkgVk8+gakVRlN1kmFS2CLlmr+k+s2SUZjiLnIr/xwq8N2aFrTO2LcB0MLc2s9X8RE304vuwa2l2JNThTvHeGmjWc0ee1u7Q6dUKwku5ZqoqTO9WbEQIAUz1QT9kxxXALSFA3yyAzsbvpgXBmnOyceiDbcB8G6qF0Rp3YtFsv5WlVDOE2x3FqTJsw5NvzMtxGyYf69hr/muk9pWEIT/U26JVd7U2ReoKcQBhKByUMmm1GAQC0AFKyDNHbNF4KEljt/lEZZpr6WLlyxaOl8muiLggDtadu3UQNhEjqiYBtJ4LsxtwdhwAASK4el8hdX7hooGrfIBHoHhVKadoDANCzLksVksJepA+LlR2CATfiTHarwepiYrAr3KA0bURopy13RXCrV3Ype7IVYVYoajz25BfpcHG8TtncFR3rCE9M2C3Ju00saAbEbpuy+pT55Zo+XqKBw+OVuldLTwKA5hSqUVhqNwC0IKipYr52EudOs6lN79Tb242PpG2ma1dl1kemmkrZTAgAMAHGVcl1Me5tYMp2ZudKCCizsQchOgGBa4gRfWK8ZkJOM80x0fjeaJ/7WfSPvNfwwzXEboSAx0GHALGjBqSJJ0zEF+Jez9td+pmgUwIIYj8y8+OqQ4CAgtjmw8SMR3m2T1YO3YdET20wQexvlZvzzazqzRbUfkLA7ahKwpMRJQAzipNRAIB5NCuBd66HWBLrFVFCXeRfc0m4K+8ZD/P+N3BPGPBEwuuRSLyZlyhBNU2iAICakLYREOn6oN5iR2JfA9WrbtoDAPqmutkrIiXkWvpgWSdwTIDJyZm4dgJsWUuM600M3WjY9c2z6UIskl3Zu0dbylRiadmfqG3XUmb1ZfHQZOOBfS8Of2PzbcOv7bEON3OALJMMmRjYxSJ2gZeVZDcN3E5zCQBwVyTuhm1wJ6hYyUGYhvs3OkLeBmIPPyJOHbFS3yWJs9YyWdKOD5tp+uqvbDkhjLbhAwCYG5I0ErIEHQi0u2ogBQVeL2UBAOACRJQCJbIPIiacSd6UfUtFlik7LJYhHGnaWOu5It2yz5AJomu4m+ExcCZFA/IJY/OTj+YsnxdP7oPHptZZh7vJribgGLS2Wu3e3MeEWK6BMFaM5Qs21YwCAGzEyrnqLPoDB3ACKOM90zSgrDDQENCUSNIE2NN821WO67O0pdAjiaKMSjGildpEZn4BV/R6OTwAwOkFpYgfpSBZtJtK/b9B8piLNbiivKJNQ0hzw646bfeWMpW0DRmgyw5uaWswep+z07W7IK8Ta9ilxNrj+qlHOfPpGyKT42NujRSNf+b33I/pYJaO8tk/LRACW15sW/dBE+HwPrHkmUEkRogZYmB5PAUAIfHSkwAA60Yhy6V2AwCuDGER5mOply9xhVhKvx3LTkLuGqowKAhmlhICAJgsxLYYjsKGMmoyrm4tjZHVEpHL0TaIXC6ECaWvusYiH3pxzOvglkC4vOx7xpF8unZYK1E+r3e/1aC/A14WOnD2qS0xoGBXqY293SUWoRBmMdeGgeVmFACAZRL2MUwnSOBQDuBlkcJJtFl21HUpplUuv8JuC4Mjgat2kc5zMXvi2nUj3L31z+MQAAAxtiRKTMSpTeSiOHON2gAArwsQpAMqKhY/moM0HLupLTlESJPjYl0XEUioWSmlA9lfSHdtX93dC7ZMJVfForhbEmy5Rc2mYEpyuUrNpsvwv7k2kOCE4Bq8K1AiXAEbxUBEEvBQBgkxazSeBACKVMRlqd0AQPeiKJ7tS1JjOKbkuWMGUlVLFYH1DooZHNZiQgDgchmTWjkuLRDlikaZKBEZjrZFZLgQNhSuuuASk2GO7c/BwAfoPaCVdeSn2aejxICkVSVbeCYTskDb4IsLb7ynJCspAIAOWkUf9QhmKyV1c0CPIEFal8+uoB1pcID2JNIJh+ZWiQIArCflHAicSA/+uGPYyxOLjdLiAYAi0DGXnRa+TiywbeY+cXvXYbXEtx1imrV1GvM6ZtG67kKETtXXupt80u6ko95kJLLjpWtI3QenO4DLvS2gFm0Y4BE9IsgpKAGAjdnR7gaAOoaV+pw9Eo7hLrmLR7yDDAXToI1BMC5khuYT0c/K4ZfBk2cX9A/7FJKICQ4BggBim/ERZEfx0vvJSoyefGJMAgBiX9/RVBqbrjbqTweM7c0NYzFc9D4laqUAAEKG1ZtQNeDAFk6CN9BySNig6bJVUinqEMnUbZuWsnltQS4SgJ9IkL3xAEAO0QrIC2CcAbbjAiG3BmPfoJ8zf1Eq7SPGuZiP1Pj26tpW7YlcyeGLL96LPgmxkbBTyHUTkLmrSNydUZxgAgCcALVlwFRaSCUHYXnu304NhGRA5rwz0wPkylYOF9acQyhMxZaPK1HwS9kp3+Fd35+KjP8nsawP0FWYHyvsdmpSndIkMRS0JD15JYFX5a25E3jMchYAgOUCZ+C47OVW1pTE1djMy2pXb8DOMbGqykAQKu6+pErVsUBs0qo/g+4Ol6NLNW5dS6iayDRD00QTXVUnmHzUj+R7wjn7DJEYJnx1jzztNfwqvp+++Mg4WfcY4XruStV9YfwxcfNYvwlh3AC4G8VxKQCAK3TUe8D1zQHW6udl9Er1Z6uIv/rbrsGG/tJF2gNcuM81zsM2JZnjhc26q07BKXN2iXI96y4N9dwbJEK4jitMCb0N8QCA6FRSJTcifow8onBoFGuaXmO9yFBxsXnFqi4Z7v8ZqygHbDWbs48QjCwfezv92MApa+QKhKCqZZcDUHVD7PLUWiKIjVdhHoXsHx+Ei5SVwGTvKyq6Dvjf9LCfaKMhyu7LMxmf8Mwk0+XeBuFZ2dDTlW7jt+L3Z8NO2WeaZn9C5JReGPXSE57XT93nl11tSl257ATPMD5OQsTqdboGlmNGn73BBJk3b4V+M3WjOGQvuhp6zzYaYEd8eUKn9Rs4B5VDBjSUZUX4Ifq4CIRq61E0JT7p91n2P1FTZq/IwMeU1UMaTrf12EC2bODIYrLSzMrtgdrnv4Ni3kx2M+F6WXKJQAY0IS80XiQHAQU4rsKSznb1SVu+PBU57mwPkdeNkfXwouUsq/fsHygSHPYdfavl07W32hg5kocxaytQK/y+3M5XBgWVElyNOX4U7Jzo30/LKLTxPpY1d1pxBRSNQ9Dhwa/0Zno+xUQJosEmC2QeAt/swat/j0SAU2wUjEoAUZlBDDimCvrME+KUgPUGU1DmDC4Df7nYrhu0O5zDakjz5FEIynQhnhDJnu7IZE+3kOzJfjSkVndksic/xYMgIR4z57e0JkgBUGBsa7x0+TN9zoaXG6A3ObSL3wY5iAoKKX52EwPCxCHJoHAHJHvqWlKMR9z7sIR4RE9m5MAqPG0ec4Os+rAOvzxHMiGr8hSFTq88uSUCMjcHT6EVS9W5sTYfkgLQYIEu5qa7a4erSGzk08ATnJPrOXjwy3hDx+e4hhIUEB2Vm5FO1JutcJH+zmOZJyBngXRgdVfHw5/wjlhGRaOTHyoRDkWVyCx8yZWhrG0JAYBhrriZUEY1GMGNqDLZd2l8OEcyQRHs0xSyAzTYNyw+BBrwdO3UcLVWP67bv7w5Ex55FeDvdSeYP7MANo5UrV/TyHUNTK4sV3PMqpW1IuD/0pzq19fzhTvbvfKj9WvHpxIgZ/ASJUTmogJW10xJjTUAYP+EzvsJ3M7JhOA+cfdSpIUuR5mECs4YDrZqrc9ei1G+Qi+KTnTKLUW5FRerm1oFYmdMucEDE/bechQAgH2MVRSIFenMkqhM+ae6N8DYGNyt98yl/FMAVwsDVwAXRZJr6aObdwEADIXbk0RTN/LBxuLQukTt/R94WWq4IB4AsCQT5f5Ya8Hs2CpcWNNaUFRlbMmS1+2SlBjTem8V1F5jJ6sbsHBCVEvRhZ66IWdCFGBnInoJHDsgUAPAiXZYXZjk5FG/cX52cRhl4XJd2+o0eLvLyQQA9RlS0+2pGKPUoiAQZ2e7XwIXruysuDcolAZGW7+3a/ldRGLjzOpkbJwGZRneoNJqka02Kp0REFKDLBi3J1un1Oz6HdJpeNvce1XC9xxNiInZJ7rAQAyvigHba5SEH+5iYO/oHY8CAIhku+k071dJIyXAFY7bzOD2WlU+c63VX+SSBi7IJZJcvDTq/sULABhRYIkbFRMtUbgOomLiBFNcuAcA7NKy2knRzX78oBpX5jkpkw/sjQc4EY8eGCm1A0nZe+7hMXbgS/7tgSizrmyKcD00y4kjAEiCJqCSMNK29UYqJNHIMKzitoGZ08oEgA1AcqqDoRhBGl1GEbh2L1/DTFyFDcY7cdjlNHXL22nlCSmkvMvZH0CIIWVH6vxXI/pTqVOzy01jFF7IzjuAeKG1ddhuwTRsZFopAMAgzeomcA24Szc7f7YuC9zWRLWBkXSVZCTV4gUAjMy6aBfYTRyO9S3uAQDdqFSdFMU/ou81TgJo8bm5lURo9fSCVfgfuA/Y/JtSg3qe0ReayzuSnfz/32fyU/sC33T4r+r+97/efpK3p10dk+2qOh1CLVOGLYuDJIatUWhiB0nif7vHKvNonRxh7OcgiValYPxB5Tx3Ocf3PDUyaYrwlPWL/wN9fhAlBwCAIV3cUloZvcLBf69h9WnSSgsAMIZuhMt1KWDQlBikzDu6jmOvlIipY68lidTYrkreKCjjj9RtmYKsM7/g6NV+zfsb3xD8jpbTqg/1+eEw4R1CS96+SgoAUMWoVamhD0MUB10Qx3+76FePGkvPXF/GOwQzg9GBzHuOuQ5GdRBAGBH6LgCwQ7U4UXQcS0tAFxMJDKzFAwBc0JE/LADlTS7AZGMBYKWUCHT5OwIuIZCwJLV6gq72LNSCOxPbG4BUQEDDABVzHDau36CfXRxGrcBB1zYdgbxeTiYA0LcQzW1POVkUrQgCzrSKTErgAmuliqzmT7SBmlpICABMVfn1BtauhWM2uqHpr00ebeh2puHiOx5feOXZcDy+Pb9ABGHVUD+ZqjgY8/MIhVwAQJGHZVOZEh96Z5LqMcM4UNH2/mamI+HlZ9TBcTEKAKBDVKSenZykkoBqDl0Vl5658q/3BscMRm9wzOe2nEEnCVuUCgDSuAsAYBuaAiXRNMtAy7FUY12ie4L7vywpLogHALySabkuVrcMc7cXFGM1vavdKFlZJna6YbtkBjUnpMICs1O9buceNFtxCtX/NuNBtyQUy/FCT1+qhOKuo2cmCqcJCNRc4HwsrHbNCZdHTX+T8KspMQq37thWz6BUpeVkAoDQDand7am4jVL7BIF4W+3lErhwaLHizhI5RUzUUAgA8CpNOWkDNsfZ2DTzjBqbtswWsemVEDJgF8p8NDP85+sNZ8epfhYbWqprXrSJbfsNQSxcOWR6Ay1IAQB0HsDxR6v2sZWSXBzwVjSo73djclR5sxqZS12pMo9nytWUWMxnd0zwJ4oxkXoUXgBgALXiorqgrRLPuy1xUt13DGdFPAAwOpDZzy6gUA4wSXMKlUwHvlRcG1kPb1hSCg1mkysaSQKn69Mc25PukMBNRqB5106DH47B3Z4oHR1OAJ1vl9LhEqLtcqoUM/p6+yZyt2N3FzXKBIAy6gRDHROUO7jevo4IxZ6RM57DI/UXIN4pFmjwUEZ0Ido/FugXtT6AaEMKT93zI08yf6ynmHIJlcqRhqj+sKCXoeEM8a2PJ2qlAABrQP3R3A5UKYPWgLt0cw4akaIDIyCnQbrFCwAEqbqoMvR5pz79xOIIm/EAQBCtgLAAxhlgOy4Qmmow+r3vRHxnrfpvsRrPZ6TxUCD6dmoc3lB89+5/f133H59lmds1xMd29brMHiL04qYJAGAkdBsGLwVZwID5eSt7NFPTwKnHyq8yu6gve6/aikPZKCleqsWj5ZrgQlS1fPV0zV9TR31LTOsc2M1TLXW9Tsc1fu04OF6OdS3f8HY4wtonNH/x0eB9BAfkAdkr/qsDT0X1UvLixpCvjJhAraJ2mjcE6q8p/bTnq2qjhVH29QsAZ2t8/32ur2t1dVfX9kQyQgLY+klnRh739Av0BwtyAIAhybjA+eM78dpysFXcRW3NTcHso3i9zSwAgIqQxuW6aGf75elIWixn6rxN856UNiUT63b56KfSTtJz9f7gxt0l9Y4fBk47OoLEyMDqcGa5EP2hlUbyDcoc2OMy5MwU/hZX0AKPpT71XdvktRcztmdeGDnrjTDYgnxZ3rRjdNe3S8OyGzX3EUVWxSEcV/5jqhJLiSIlIeDSJD9ahIh8FwmoIu1TL1LoCXloX/1wR/5Wco6SoWDM7MbrZEUcIZYOysTziZdNjMojn/qanRX0Xhv/2MI0Ldlj10xWwUAqtpA6OKom2rc7PS9WfVZinZzsx6+3el+Y6pvlKxmsAlPqF0YBACR/Vb3IpQf4QmJNFlD8xD1wMsP8yyjVuPEYK+oU20UeLdfU14q2Og+7MJFjaJKJhvXo6wJLch9kkytrRXTTDnYlPWmtZufDrh0k1u6XJdrUnFFzh5fDiKfLl6Rnrn6NcQsVnBnXhvZ+aiXNMMLpJctwwkUzPD6TXapojbbfBQBoQ6m5/FibvUzR1vRbj43FZonmbW9U9pnoF4gHACzvLF9xAGd/wg10Ig67Z0No1iPYOBRnQxRvkAhwaM5Gsl1H37ROI87wNzJ7CEWKF45ABk1YFXgRU4MCKrJqE6dQkk8OxIWSpq1wUrL/5FCVtC0XM0RJN77t7BG701AmAAwIJmTUPRJn2iG4WtAMy98qR+us7I5jfNI2mwkBAJfL3Qiy2BznKWiwyzPjQMOKzB4vNCQExKSgVabLbEeUjHIQZ5cgyx3keRyGAVr8eu7e7VR9CydBsk7zq0S4qlixQXUZU73OC2tJtexTC1IAAAqit930YK8k9zVRF1DksmGEzPq0NxdQziAQtngBgEVUE/VRhjLRc4n7iZcEtbgHADTC25VSqPoZCvoJSjVXwMskQI33iO6ZAL8TRLuTnj4TrSdeYgSE84Zd7D7gks5ENgbYGUHgyhjaR+0KNteC2hOMrgN17d12F9GxoUwAcAt0LaOaTexa36AJKJUIlLBmOtPPXlhXsEwIAPS2ijJRGrd/yU0wKtMsgM8UU/aYiaYIg/hkYEcnMOFHMsK9+E274P0y3jyRTpY/Z9R3a9ta9+4ARdFwI2ylAABEhtSbDkeBROTNLRhnEEhavABAE/awaO7A+InLkW7GAwACTUAGZZwCtONFtH7XARt4gWEB8MXpDrvYXcaePcZ54t5O7I1vsssSgUdVXSJFbGMiRYxrdLuytV1n1MONMgGARt3AUMsE5Q220W3PCgW3NxM/I3sb32fKQv2hmCz4V+zDHtnK7oZw/5IeCBDpStncARhT6AWWh06nz+9BfUSiXCn/VRhjnftxpefRcCFopQAAQMLqhSwFAqE3NyDOYCNu8QIABaYqmpr1I8RPHFB74wEAERT/iB6nmk2D3gTQYhOQ3xeRvaZ1/lxYRP+74c/F+nk3I2pt4B9/O+yPAzZ75/7jvd0515vQKvIOOwONj2wnZQVEmQ8aKyYAwCyjqU4N05jNjhwcscAAuWGXcKp2F372oFGvD1CMaHxK1XGcv3dL70/2RQcaONkXPkYPCP2i6O1QXR4+6f/5GTM76VjjbcVqlYastE2FxnBFmKlWhOskM03RMluF3T+pi1016huUmucBE3xSBadsJ+mmpZJrIZfOarpLX8pJuba1xYZUrnt9exm9h1jSZSzZu6wq3+RqGbdPNAWKR/IYH8g+VwWGryV6+mX7YJ7z4+6jKWV0+genV6xYq4BJRY2EsOYAXZpRAABXAeG46Zlu+k0ixi6gNOPxXzJRcc355RiB1HoFVQXYBSkfloOdHdsJAAQ0R9tcSbRQUUFNttqb6HjAXVUyXi0eAJgG2vjn3MqSA0/enAapZDw7DJMfSSveJ2CRv2/ASgrcQdsdL9xAi/5E3ELDLoEO0KjLphM07jLqDM30buuCmVPKBIAqrE4ZtYenOhUHe7Hdw1D8oJTBb6nMcjMhAGAJOLiNS98Cs+KZLe9Qhmm2ILO3BprFCojtgvbCbrIDz+2R9g9TCeNS5fwUgDOCvMDD8LZSf1/3vinRxhcrMNbs6zn/lSpYm2k6RA1dYar2L+tTi1IAAAoI46Znup4KiRgJQKnWJ/HLZl+YrM96cyTM1YK8o9M1dQEAgamITvrsZKLmEjfhUNGxuYV4AGB/+56Alcs6sve77XOaudP4yZTW4hNwtplofgewup6zwCotSk9ORGAB5xeJYGQXefuXFSKkrkSqLLntcMBUIHeGhU2fnNnJnaYPl7VxF3OS+9ixba550Gg0kwkA6kOZPj71Hg+aGYfAt4NJKYGLplmMVmYT354JLRMCAHO6fwIpXGMKPRPUmXKOJ0HX2SaYCsIEmJvzGeV6wrOnwfCiskuIbrKYn+P4Xyvubv9EaDiE3ZcCAOgQsHoIXgXykPbmjHBjkEfQXl0AwAfARQT0EwWmFQ8ATLftI8IQUIPYZtH77Fig+N2gDTyAJLA8JjCHXeQuq6V3CF6ZSB6P3cr/CUxOTJO9V4XP9IpdSu2zzFh0q83tCceKzTIBoEBZatF7iWBb4fw1uB1CKMmx07NyKuzny1/HvLxOw76UygGPZqV0Cgos4oEA0a2UzT2B8c6zR8F1mjKJdroS2Ur5tBO4tbTWvb9WYBo2Mq0UAGCRrtSbnYSRqAZcsQIiKW9OAM7gImzqAgALuirqvcdFgJ9IkL3xAEAOhIAK8X+cObBmTHofvwuUgRvA/IcxWeWbwIyA1+WmqkeFZ2TbZ3UX9X9tAh/ijASAjBNY9GAQEyupmTg7dkpCaQjB4MRZ/x2eRNWCn3u/Cf9EdiO6B8jbo9GkFCACnPhzdif/TL9DmGrKfhcwFTWf8KWYhU/bYPVxWfEvrNoCCFoV0Tc07D21gcUPw+MTF/srWpRWUjDWLBC+814RE/pJYJGFoB2lWrMCwl9EEF/n6R7zsF+jAenWe2Nc3JbK6FqiSy9Ktzw+Dexd5jAcKo7uD4KqHgwIhhK724WxgS1LDS4FnD++tY9fGYQqNoLY7L0BABoEGXO/647FxWLQZg2qgvz5Ua2yzQIAxCSIS3rbzvryJ99pfhp0hmXucEDIFBkxfFtE7ENPvoBcqq4IF5YaAOyZtdtodiMOQiEnm8ZWdp9OscSmJHD8AGJkL13+uUwT3MG1eWvNbYvusGIo8vLkOOmlvu9siracfRXuwd0WbAWABDi4znyw1zi/emy+gxCYfx//hncA7VKig/b9LJsW+K/TyupnbtaN2SjsZp8uANChUxNRzkBdZYq8xHSdWxKwtQcA8MQ3kVIqRyValanK5tFCsG6eaLrKDKPGZspsOswdGTh/BXMy5n1rfvdylDWkwBSAxblerCXkAJZTo8gCRztXcOCk5toOnKm5xgNnc/vtA7e8sEwAcAFnWFU3eKnaQQNMI1QJZ1Fm54RCAMA9exbyMVYu2HIF08yZZbb2xBhN3eOZbf6RYNnn8czyxiCYhIDAqEyW5iBNF9Aj5DAgFHlz/O5jLMH3Y80Ut+clYieA38VcAeB2jXkVzi/7B1EVeM+rnvQ5N+cPGmcGPdG5qAsA2KmIKO+YMJBX4FxiyXidAIt7AMCpSmGlVLYu6WhnlRVSzNOaD89FdPjEKNlzkdpnAjpQPiUKPn2wRNL67wsHQkNeWt4SBsL2E8XgTpiADO5ZZiODe5cZyWCU3G3xxACbZQKAuMMpUw13OesPhs5ilJkCbl9f4EVCAKDJS58ptrjeGQIkIpOZ0wf1mUCV7duBrSAq2rYEnClzR+Xh0NNku5+hn0Anrj8wOArThVsBIKEgrjMf7KE/c3ejrJgCC2lvLoDOYCFq6gIABchFBvQTzZFpxgMAAEM9BLFN0Pvs2KDchwCo9/rXnUCK4uXFgeCSl5behYFQ/EQxuD1MQAZ3jtnI4J5jRjK4z+42eWK0mmUCgLjDtKmGu8z5g6EzGWVW4dmz4fhFbT5Oryma6Zp3dNQ9C7sCQOJTLJNzAFH4FD4PBzWStDZuTRHcbxk9isBnQVcASNCMa8zL+7+H/ZegVSAPKW/OCDYGeQTu1QUAfABcJAA/URxJMx4AaBDqAbBuNvmGIqwZi97nPhi0gQ+g+Rd3pa3SyOMgkuEcXi959OluisVxg/tjCFu1UYcu79bmbyd/1Uycbo0AtGbc3mFODOmnOfExd3vfBx+/+/n/8swRX/CdxTJ1zR+PnFWdrM8NQD28LXc7VRJbXMNqjwcmzWrTtkiKJwnEkW7OpvTmsSp7WkdPzqnJaYyImS0fmce6/ZSAMMCBMHcoC3Tl/aEJEuPoaY34WfNkp4UzkT5PPZ6iYgQ+wdkn+cbyhRN6zGW05VAlWjUABM5vBYjgHv1x5u8bhE3WuS2lr+DjBfpsBqo7dyh/PRL6lACJuD2DZxLc74g9WxkixF6QlC1CzP9VZtkU+/dZSq1P/F05LAl8hDT2s60oiXuU4u8Lx5UJxRHxf+r2gb5COOLWgPKaV2lgVXmDwinIa5QEDd0kk9N4eKiujxXrISHKcPTevfQsNr9L1fZfow2OEYln31MtyDJv1Q/VR8kmSd5DxE3xceP6WFVlkp4iVMpivevpj4z90qY+Iuorp4WNlbk9k8yvAjQChYpn59DOJhVodWAQZrTPfZO+d/oSrRs1ED8qOgq7mqX2h7PKS916NjhiF35nTgikme2Qaa5eG+APyNGnxC3xj2gRmNMQ6vIrFiBGdFekrp9/GnztWfLzzwidK2nQnwRMenqcaEyFbEU5NJKUJMcNAnLmRxol+DEmi7IkiFIcw1YwttbHBjcuvsDq5pzPRICRREHSAho28TVjUlgdRueHBMS+MrV2QN+Z/1yAuGIO9aXmMgaNEtuWePQITYAHZCYjosrHqk5kcAX9lGS83wFc0UbJ+aoLTQH4bPNpoYKokNM6vlWe5C4wHXcnyGhvU/1MAfCG0XUliFl9y/RBnBb6OQnpzIE0e9O692HY9hD383kkkki+GkxesXCOIM6GwYjoxCon9SRhiJN0AlM2hbegEciqom+ooH+sWH3Sr/2L6vIX6juAjWbrYC6EH9uTl9GIn4jZodR6BR1r0xZsgtYt/WVE1g114Wg0xkK6CqbEm1evO57/1uixdEquRcn3KYbgxQiZ3fzcCFBmqD5y2H7eay/bvUUNs17jVm0CLLKhuJoJgOREtJFt6RrYxA7j0rI64TOAVK5kBpk/TsVsaczB4lvpEDibVQRODZTWHlTbQFgGkkzmLxdAaajhzplUp7Cq8MYfbhcaq2ZX0vWhrDdnE7Uf64+zLv2YSiU/ZIcbPRyRcH5Ky45d+V3XW2w4/uEa0eKmyCH5RH4VT8AOhqhCzLiQQuhi/VvrkTeKytgk9MFZbkAkHWpVX4tO0k2e++G9fIHrZTtWyMwuu4afHFIf49/o7XwW+51Yoq+J9e2c/lntU8HVdLx0ExRXHNR/2JsdLROXNWoWi2ZCdfwcln9UQsxLXR34w/JIIRdoxbujy7LWwxSMjjVAP0VDX9fm/N78axPSK/ZN0tfVnagsQ0Yu2O57RJXFz72T2d537g7mWx6A4eutuSTecREnLaFDCirbsiMEK2vhAbdHtok+l9qQLE3OKI6A3EiyffujNUp2+NQ2e+iRGeFhjlH/qKCzh6nJn+YZIOYex/FrJxhaHsi1wPsACN06hqUQi6Spjldb2gsYFq717NELbVa6XbaPYStJizgSynTOFgdtYJcsPh8Q6c1YlMNDu60HlrEShnY+SF8BhnF3k3L9eJB6kgDg0Celtjgs1PuxfHMLVfiMCjkwC1qfNiTeiGEdHQOutpn3GzW+BHBbdTzSH3c1oicV+xaqb1ZoBiQFJPcfLjafzG2WEldAFTuADhsARHviU4H+c+ah4fxd4fot4PjfoNlk101kMndDw0H7EAoT5S03r3X4P3uN1znpgPf1HwOJDwjo6tBIyQEYe8g6bi0ootN8NMNS9wWDrBaMdnUisfpUgAzFcX9LzeOWS/DsW6aoDH1mEwkG5haGRB5UYAXDByRQutCnE5izMz0x3nukeNE3LcDLjvUDTsVE0RmrXAUI1w/0ljuoZB5JHr2gbJc7Gh3UWeZ1k1ix7PwyjBtm3GWzFDXB3qpgbndl93aP++MHTnpvlvcpMeZr4/mITCBIwLV8gqDUcvR/1TylZO7TohUYds3gtet3X8Qt27dfH56ocDCvEK1iUvdzMddAaRT0qZhGyAGI0jYRLkBjnpVdc/OsPpvQriLqUWbhTKdtS9rjKqJURF1SHy02ptnxfLXLGNmI57Kz5gezsS7azvfEqmd1UNKV4p8Wx2Gr0Ka/cQUz5S8meSRsovBha318NqJr+DxLtSFNZseiyGu6zxThbNRjbMeCdBPyimH1EcrQkrc4dXwIIKLWNYRJ0lsH5qw05LCbMwWdreL/xc6t/l0iA2PuRh3JU908F6SCvgsYZ2aZ5RotIRvtOmwLoj7RM3VNnL/WMLIzJUZDJkKDmYX28G9QxbPVp+Z2l8Ok3wr4bwaAqwC9AdRNlPiFpSQgdxg20XgFg1wpLox1Evfi/9AZ1p9tIGwuMGvxDgXoH4g/rsr5F/d18uuq2vqwTR4Hl5fJpvoHeWDXlkLBnW7/eoVPc7bLzKtu8PMX6L7A1D6nYYP2zXIZNof8TUPPBx8p1PS+S65bFVw4U+5hR7PHoCEPl0Jp9W+IUNt3Wgql8L8RhFrk9LZQvjVoDojuTVfciWkRKBZ8HIvcg4H+HUiycGjQl67pTgpXx9gvBQFZJS8pKWDNfK5YuepbiT3/qzyfv71Xns0BSsG7MHd9urQkUQFik4XN2pG1wuwNQhLmzi1EWbEjTzJbgDMKWEX3O+5y6pCyrweSA8T7i/OAHcMZKwEK//YZABCwrpMcEPEvJQNu7wRzDrSCLz5XENaBc+p6p8Pf16R0T9Ca7f5dGyd7OD5ZOH4u9kci9DEOV1urZ3tOeAsEOW77iE5Nc2hb5CmX1pY+86XA50fhHlk0ZMilPXlWBPPGk/+msNf4XWwCVAPzqvnzp+WuPyUZ3eaz85GhJ56sRX7V73SMQl4LkGWDy2tAmtdgAJdPGlD4Ggtg4nQV0K0iWDzprIHUrANVW580kPY6UJXOaVMLaPZZ/43T9Lurt6B+CAGfchS42Sk8Gb1ruQrcykrYvneKQGO8g+RIBv7HSpINAMMu+puKwHwrwvI391idqmsDRVOv9zOJ52frnA5P3gMhbWEpNdnEUTnUpSLK3SIUuQki9MwY6CZm5OxKkX9dFAD9eViGz2++e+iItXo2mA/Lwg84i4LI6iZyyKFqgN8soSiA8L51NSbMpqb4TlZP0xyOLfN8i/itLWdp9faXHm2rqaBupHjaibZp8KIilOiovJCgZ2TMCjX6j1fFMrhn91urA0rM+fXZleb52F0UQFf7P5P6yhtUVb7CQtAp/F2gkJCfs2ao/HeW2Nr5lTqyhguVB7B9xVHrmkApLLtDaWXNIt1l8qA3E1AqeW/Hp+/gnkWrX70GJJjGZVzfsOfis4VoZz4eQ5d4xVeOgbI+yAjxgEvN4t+uYB4rvAtypOSZc05uQ+YrzYCU126jaWBvUHfbGNY7esdbhK+hPVkkAoEL2HWboeRaCzT6mt93TTxb5P+hp6G3uDPTrMEDARmfR2WrFN8aK0/BT+QFoo8O+Sz+fD2htdSpve7yV6K3dBsbCmuLbsHDpHL51/PmAPttp3f2d3R1kgFj+UNBQazSVNVvwwUgU9qtEJIp4a/+pvIEdd+UgFenu45EV8WqclDbZicP2WSdPCSr9WQ76/XkmhV7st6ajcHNkPpZQxpnBZ0FbQeHXoWtf1KbzX8St/1P5lMAk8NPBUxWTwkQGoIa8vw7vqOlkyPClLES0B9EKa7YIvPyRtRMVYnFYCLZFa4mwUywPl/DZbW5bO0qHDZSSUyobjyh3zkGB93S2j/QuNO7d5jTRIIQiSzbVJShs0h7tuUC/xqm10xJi4W0Ed/c2p86odzGGZFlO/PBaALltUd94saEt3JXWxI3fcrSWQ3KgdCqqRTT7NJcrztL+YKY1QLzig89AgGlbiSTYs+uZlfHLaLWQj2PQzh3grH2tCwdtYuGR/1AooqhH+iRaoT7YGUFTJzCVQOlowNjjeqorYz2oEnxuYl2X5WnBuTJMREdqzrOLPDIfqxx9zQ62LDUJhgfrJe88xK/Zc7kUFe311yCqmKtjZIFO1vtwMISaw67AHdXzDfreKecYQyh4UiiVVNusmLjjtG5EL0zcJUz+IaHhVvfLXqetXPvfwtlU0vYnUwUdUzMsIh9GRweBabKhefNu9IbOm9S5QxdyUQhd0ry+uWjaClfWlItkFoi1/316y9YKmRaYliwtGRvSYreklW9+GRMHCNHxpQ2pqoZlFXPTV1IO+XmFnublPvScskoup6Mom+7NKK4HwFMmJZoKMRMtnK1NC0kRSxnWkJlS0sWZmEpkr1qkouFlpAZZFYUtERZBrREjgEZRzlLxv/LUe2+SLcq1lQYxpKKXXOT/cluihUV9VhQcR30x3p7jsnEuyR3mMSKaEuMqyZmUwjDt+TnCzP7pvLcmi62qYAaZL0YNCkE8FVCFLjAaSxk62VXX22a3mTcfBbZxdcZF+CXjb831dYuMaf4Ops3vcqeW//TPkG6TVnCV/RKtOgvQWNzZRSXsIvUEhvkzTDn9boqkvzLnerjyOBH/sGYTbQDIbEXPVPrm5PPA5Km7KpEAQkKQldpiLseEFASAFty8M9m8UuisIvPOpZiHqMXDJnzy1vN+1ZbHMwLXpSpz00uWPoiANX0QQYDm3K4uijSCPP62HLYG/ErX8wHavwh+8WnOfiehDdJz2vyB68ZnAKZgteVW3jwEQjlAV733J5jQvB6ub9iRUte33UPqW5HRVkvwvYTWlw/+1Iaoig0+E3ORr0Aj8sVfTQ+9DZ45ALTuugVyUsddJuZCdbqpVIrinm/ijPEcZVqBF0rnThu636X218ms6Ysr/D0irIdLlNSAoUwiH7AVU6E8iglGOcpYxHwrXo/bpD31OKMpVfeuVtX8qr9wzmmVpp+C//DXd36R8S+XFvZHrX4O8h/n9/1Az7O512Lz/3ctD4EqfvAA9c304heBH07OQ3pZi5DFaqsSqXsnREPjN8V21crsoDtUy3zRx4SEuebSlN830cBcMJBm+1AE70MG8qS/CqiEAigPjgyLdHPlkgAHiJRqIJoWsXjzl9EfgBk+Lh9KJINR140ZOArCks3A3LvnSdah+qD0vujruN7/b1vpY59G9R44S1qfZQJwv39SbUofMXU6irHk/RaSEyimbYJXpb8Ilj2S6JlLOBV+mFvDl7r2Hd8KotA9EcuXNbicrvhhztuFR9GNIePEyAAHw5sqMn4udzGJpNp38nLkt9tLPvdTFtvkzfihzCNCnMSbsAiUZPpcWpEJgEIxl1EVxQ0X0URO9wwylsCvcCMKQ2fET0YQRCDu1GiNy3Ei0WfpifYP0Qq9ebwjwZgS2HIFDQA7IwoPh0bw8AlWUC+QhlFNwP+vgBhuJHpcVyFgoARyb+RG8FoJlmjqPa/3rNW+7oGgy8G229olcHUm8PfBoAZG54kWd4Y+IptPZOZohoNOC65P/vBYHsXvQg1lwi8bCfPn8s4+dkCiWZw1EY90BzxWfHRhElh+mA5nfIaEujQZMvr1i12KtfX+nEntlhO3tQeqD8TOy2CJfsQ30CcL9rqCo16UYhatD9TkHwqGdiy1ECmF4y9YGwogDs9iR07wfmzRgiIZGSqyS2KhNybmK1mU/0aVEDVUI06mYsBGq7RJyMQX0TjYN8gslHiSObvLUGU+MpTg7bXDiElaIwkws7GO6fhf+ezZwB7KXYRhM9KXU46Yy5Xa+US9uLfFc3PNh5/SVsrF6NL/5fNUrcw3yzzZUIGrTmpGURN238Hupyq3VFX8tKxhi4QtLHWYsBgWMw5mvbqFjszTc1TX06qHiioaEEcWoawM6bXbz4K5aijLynV34xeCDb0lLATLnbh0XDpS0olZKhGENdKZRl9dUuY8ir2qKKkVB2wYkPFiAqY0rOHvXn28PbzveHuW1qqHqcVjIYlGZFx3hTQGBZnWp8DnCaYeczX/5tPsGJuWX6y67RSMdOkvxBkHfPLo/UMEIpgrzn8joKOPRgPw7C/8HakFGYJ/TkYjuLMbm6yZ17ZyydJecK3tONJ4p4K9Mqhl7LJGk8G6Qsi+A26/HSc+9PmOQngOrXMQbvVdlMGWEzefPV4bH9fBD9YOJ5ks2jCcWNP5k4NLA2RJ05FT4+TDYoeUeFkXHxK/vR8LZbKi+VeRZccLdgsHnv+7MmiEQ1fXBIZeOLAmiw+f3r+1Lih0QIVd+b0YovPD/gYvsHyJ9MjZvzJ9PRkevHpOeL0ZHpEi3CeCCfwB64AzExrdV95JTl5iT4nzRr4i8uekhN7UOUvOHsAImfLLpPfA9f5SnB1dn/PyPK0UXGVdr0X/6u1eeP19TqUXcxf9wVvH9uP+oyg2ObLsWseER+C+7b2fwh0fotUWAqBlcpK29oG2OpqM/XPgb7qpqyH1q0JOV3j9fToRo5Z+41/2uCH05xdxPnaemq884YyE20gPdGyFsUvGkRnb59wu3/BqxbzCaeoGklfwg8PYV+PFfJlWHuFH1Cg0PkJZynCqP2CCv5AVEA7QAC0AioQDMIfIKPf09BCPHsaWhRIm8H076osxurAFUqmVcTXtFA4WRFPDmOka/tc3L8k/VskuH+dE/M/JRZ5W32wqw8DW8NK1mvqLmUr+XbCDAF1eLzzyyfod/Y/dd/s00unFdtsurtDFYYXjfjUUMvMyQjMyEQiYYSwJ28yNmaiMZ1SP1QHjdEDBXujFFhqk2OiSkIi00hMwyOQmU6dHpoDeQT0DN/5CEYL4AhQIPv8hZO0Kar8kMW4vZBYb/kITjZFYiz6Iv0lc7I7kh+jKu65oLZJ9kj0VAF2AC9AEORw03snTe2TooPS3kRZ9VG2WSl7zOhpJkHw0JMPHhMac2VmOOwEFkuvNwcmxWpna/Cjzw+fNKWl3O7k253Fbw5Ak3b2qmVPBjzrqpZVTeEpZqYVjwAAhYwO39WAsuYcNF+Uw/olm39wqjy7jF+x5bFno97sOxPTIRTUC56+S5Pd+gC3u9nXgfUufeM/+QPOFGgJYb2a45oM0m6I+uf2d/dfGDsz7bDpdld2u47utmdUQxbOa5SeWFJ8je9vnwEAvlBN9sWcJnlJscK0t4eZFUeAvMHP833VU08/V4l+dAevNusWzgs9Q5fNelJIewRMBxB0rL8UVkUNJZSgqmXeY8sAx84OgDu+aysbLXeduiqKDnluOTqkyHTkZm3b5cEmxXaOuKNlUlc3rmomk3AvYF0hEE/17tXowVv7q6w1AyDQlzrFSyxEAwB4J3CtbPXplKCAP4jGgkfJ6UtHjUmRC9bzefslrgQptyH6b9e1CJ1igFNaQFNczPEYY70FzTdWLxl8RsM1ZspcTzJn2ONAM++EplFNLVFjVA2h/Sg9vyWqxMYtdweFR9ZvlNzyw9YlGZfuhmgvP3xtxCyVFgg4LJyhhW6O6Ua4lWkb8yU3tqySBLnOYhPscynV3iXxyU86uXIQ/KkXjCYZK13XwQKzmhKGTivIOIuTbt755rong809Z3QAH8ixV6aBjGXlUUsYnIftJTpgXJ6oKHaRssAuTdMlL8IrDhuWlPe6xZa/A4OX8DJ8GuapayU648HxZqmZN8O2p7h9eRF64qJL4Cb2LHfbjmGhFUPfSQsdYDBkcIKFu0BB2VJhsvVVfFE8LXIMDMXskFZ1QF1jcqJkIrwWoYILTEn+KfcynX1aM1drFKXVLqAoviMZmm1i74a29CIfOLP4i8GGtSeYDcIPELoo/HjpMBO8swb8kZy8u4rNkaZ2wTCk7UuFmeE2v7UNnCxNSXEBEW10nrK0zZZerzgW4dEjnSxyqRiWlnbDldPmSVIskzp4De7SONjfvQ2L5kXPAPBNhNNWRBANZH9kIWiLmgfQh0PICi5RrIYoguuKeXyuR0dOWxcxkE51ldUCvJ7u7hc6ZQJ/b8Fl9rXIG7+OzbUtTAsKQsK6Pl+FF5Y7oBz6JJutGJKH5qmrXyCz8cyzG6Ltudx8SUovzHplCfTApvjtSUkczLeWaJ3og1C4XbVQFABAFVDopxA6e33dkeUnc9Pac6VMXEYGGgzJgcq8W68LAjYP4v1hj1rqPmbamD433ce7tqXPpvvU3eb1OXRfelq3vhm6L0Rr2jcn++JTDBO8S3F+sXd3s8U+InMEyDq9autTDUb3zTFk5mOM+gdxYg8x7NTjQqzBhtnXUD1MErW+0f/o6gdLivgASe3llBQuuun8OvSiXKANztdKdIEGNxscdglzvEj3BaVYgeM8rkjF4MwAnaUGt7sEDQBgrSSET0ySW/XGgxOISsDNzFxvkizRmZebQdmpDvYpnSR71bUzNY2Su9Alu1X0FBIqEkTc+qBqCJk2BpJpCHdtC6SjIXa3eZCLhtzTukFTNGSiNYUGkk15fNwt/vytq978tcrDatot7FUXZ4sX9cExpJxT+RRpeCswu58lIda5wd7MjOWxdf3Gvdw76Ko7fPZ+9BNQPe7n/Db5s//9+Y+ABxbifWjrfzeRt023tSUH6+K8+6yx/yI/SzlYgk0DNVRda2p2Z0gHc7x7CBfU/3h+ht41/mNP1K395TsD4NhFU+8z5X2BpdIwkKqsEAh2N8EcChSWJwQA8BaCTuEhxkAEGPxTO4hzajtU25R9zRc7Rzk0Ix+IYk2gm+Wgrqj9a86gxqStbx8Np71vSL6+dwff8KH3bvF1yllBVQf9eD2+DanpNjREa30lEIJeXDJCgAPIbcylkIH1scHhwM6Ij9OY8vE+n/7+IO2/dl1xnPD6eqsOMLBcmX0E2OGyNgCgbux73bph8IeNEXPz4oh6R+DXnwTmMXqW2Gzef0T0p18mV7NiVh+MZSt//uiu7rrW1tAwB9bOlTM9K3H48meEkPCCIldouFPt1T7hgttIqcJ6knCcmGhE9PzFZEnmz0Fo7ZR6NkHETQnE/uocmAjPmQdC/K+7zkUz+adaF9xMQogfVL76Oktz+btn8VZ/F62KfgfDEdmQRTTKxli7fRZ/a9Qx9aXEZ+NmaS615Sbyv4M/BeDL7cl11+obuwg8hSPwCkF2W4O4ELTTtiAbBN21ecgthSmz3ZUoDIprD0as5mMmIKG/fdDvVsQDsRj8+eeA1fqvtRPnboUvj99GsiuZNVkg/sy0I/5a9aJZxpr6HmDHQtU/OfhLNt1fBUnO+bZjcujrRumQnNnrm8dvbZeGEoDNP33elegwNO+OKn+QG+2bEMp+W+4Weq6QDnKr3u4r1EMDbvVu7tRRvZdqLW7fEQC4s2rtze/1Wq0zz4/6BK9P7/XdqeYBYpWaxd/BAMs1ML8az//1cWNSaaaWv3vkPTCFrMBS9RjcYHhcoTf/jk62PXAgfV+99/jawbqy37waz6ucS+YhtK9bN6ySq75K1VNGSIRW9a5G+cRB9QpbVQgVpJTyGzXf9lV9RF4x1ro4u8QSRABtipc3GaE7Ze3Tl6xyX5ZH5airwtNWRJlY38kFN9MouzfuCACmUutUfq93aJR318QJCfC6VZ5PG795cWVZtXY4p+KdYY93oLm+EdwcQK7jsnhexzvZYyt16t0GDQCok8h1wRWC67IhAcHdW6jD+towTF+5ayY53gyypyyoZxeviW6incLdVFKlCiKvic0UlZ5KrifBEZ/BR8Nh2NEATfMWNtdh7/tUVkS3QH+4JT3dNG1e9DoX4g/MnjdLcjbBHkXwHKU0oLRFWceEH8AfLIHqkjkf3hdZwcr5KwZYd0AZYR6XM1CGhyE5o8XjLp8Ka4rptt7/X2mzSWtotSJhe09iq8pmpblM3JbS9OC8LXtZt06YTx/8IjMBmmrEDdwZqU06F3IVtQWGMjdQWevPLqiqdXCTc0KKh8q3oWrw18wpfigKyDvLDs3g3zY6WhqbZN7X8k72tnlq3VieQGDWG7Z+cyepTJb56GfiMiVYNTFsch45SAApdk26uVYPuURmTQrFS0ni140QlKKbb7t7S3yUakmIl7fetq808APeXt5+u34nkJ+3zvuZelK6cHnnreZJmz+++guS8UbFdLJ//pcr9t60p14Ec5d3L8+rn/KKpxVA3/ghnS/2CBj99WAwnMJJzk+I1berpB+4dQFlfh8ui4YFl4ptFx9YY3us2Q8bYKtZYUvKr3O2KBm+VV3dNmc8v5YNdkFtBbt2hAcVqBmzkTLNCSSqi8iWB4czUMJCh+fsOsRyloIBAGxjzkxAsr0iNSMWqCjMwakPGwzpwu3MrynJwf68qUG50MM+LUlu6d2ZDpreCV6G2Zc43SJkj3AGLHM+uCV2uTPYTpvnqvF9F2YwFuoYTbGLQaxB2yn9Gp3/7C7dFTkObiOmum/8QkVqj1OwIrGLiZk2a3XsQvW94SFXRFp0SOhay1fjForMw13fmfNMRjuaPtztR1uuz1Ex0YC5K44hU51y70TbGmd3Vdk4QsbtH24XYXfaeqJkGAaHrgf2bthG7p4GiqeaAWVrR51Bdlki17nxlM00e3rq3zxnMqY5rqO2r7pM49j133R/wPbT3yd7de3A3lz946Y6AKRSKVz09VFez3SYwHEPlT/rHdc/zGnvmIfqH8R/F6RlKXy4Q6XlYR3pULmyHedxA7p5j4lolzSu3DKkoXJlOeMgsBybHNge79/lwNpd1C61AzUNdtwV4wqRC7wjoRt6wPuTBrsdkLCmwQmtDZsDbtS6sIfgNm0ee+377Gtg+33kddH27PcL17yOD8meTrt27TTiu5ior4JqtvJY6/gI/57t+URQj/kbunfKUVf3EV+7OhJHGFZ6hkg3RiP1KbfduQuJ1/Dv8qzjHRmcSATdDLpCzioHhTrcSh73UaftU+qUEXTT6YQBKLjToYSJzQger2GEZIM9HAdhzLMQC0tPdfgKOCVeDe8+gn90/kFM6FQADHHk29ETRrB018VK9bv76PwTy4TxnHVYXs/EtCPZc1bR+twsR9dESvVdV1c01akQmNBub4W3lahjBdSDAzWeeT1WGmlA/+RZABwBNJuPWSF0Daq1JcWyIXtIOK+rfay7C08Mw1I6AoA5WAg+N2TWHEHzZeqrvyu2R1vPcKG+SZ6pcVTDwesp9kcBxXBc8STrSni+RqG1eikYALAOu7N1o3bm2qvaZSX6HlC9PO9fqNevXnSbRTZ4/Sl/rB++zm4yETz1WdXffvORGeHJfHXX1/wnoFCl+ULbTrt9toUb0nGVe6AhZd6JFqbXFUzrrd1zs1a5htio2xlsZiYFtlewXg1oScJBBmQ8epL1Rz529+idPDvm0SiWjQkQuaJRzBoYxr25gFIVs9hyAaXmk+3MaGzIfn88s7qMcNEsXfy2+b/7zb7wxZ/4s9SLv7EP/7+oSNnrC97Vftw0SSXyT9+7AWDn/9FTcq2DH5vHQYmdGYnDyOW5GN4OrzNq766hfE/4nDYKvvTNxQAAgKMXMk9j9CZCsFWQKJf5qL+YP5/GgwzYPYvBAAB0DKB2kTVetIvp9M4i7gi9HW9eE9QU7F9HCU3J3h0gUKF0iYQMIwSxKGS2OcauE9nCeZgabrHpPMxUuGC7Z3+m7Eyo4/FS9jKI9WzZql3efV05Z7GEqSr9qfaukJo7dI3rbjqK1LV2OUIAcNygY1V4ePZSTkn0bxalx3f9KHCkTXBzbcUig7bA9njZDS4JdA8OomvbPy4acZptvYplmOgrkjf6fshA1WHSevL0soLCbujhwXAacACAUWVwSgtz1XGPNyS8wkIU3Optg3MF2l2SaL3QDADY0V+MXjN70lsJssW6Z9L558LCa/nQuwoc5Y9pQH/3BWkCVm71UxRF9cmR1ImptTYZMd3WZZqiMY93kKm1972z39kf3fs8sj+o/SEYDyWOjhSPSwSfjVTqu4xgoiMhg84aBnx0gc8st3IGexPysLoX+ZCaVVuvUlksoVXpoQ3OHF/+z3/V9bDzb3MeUiHbqlTSuf5W88es7Vjq/9efXTJEqhVIm0GWV7lnGi1AImcEFySQ1mPalbK8hadEt4yJpE2K9ugpXs4d/X01uF3eQNjDWaY7C06RwASGJ1++DZGsMyXDomjxtLOSo3hCU2zkCJrH986hkOqqSLgq18Ov8rKt84OHp9z4O+YBJ8/C8wjg+AZAI4RSoFpbUuw1op7aC3pwvqFmp0BfGUtiuLpJALADV/LRB+P10KX5uhBu0nP4xew5SH7vW+i29xrNoNuexcybh4I8FxuSpdvGrAoDAA62WGzU98GvfVs/D/4u5kU+vNHO3V+33mQ3+gB7Y6szBhnXLWXO+ruW56C/5wqewGTc8+1xbmPALSwGAwA2SV+xC1arFJlpnIEQF85Y2tldQnpTnzcIIY4fG3MOUCCTup3Fywl6ZxKCoADUp2pjUFeob9C2oBHUtw4X0DwKfQx1QA0F1IXLYM5woyHlN+8H/lWPId5z2sgwvZXtWUm6lZGcCAAAXIAO7wgFmBOCIkGagjkbwBmBrhiq0RAGALgWTJe9Wi4XfovoJNOFAG7AQ4OTP088SMLD7m5Aw7djEl25QpcDG2V1EmSKSzbgCXKNsMzUjY1AzIldpolynnBhWhs1HYudoYeFs5relrHDsRVComAJm0XsjStFjtxAnS6NMWGAdHYWqW23ss5F/532b8pHK5a08+lK3pg+zVLpB6dyk3NJe72RptPoNSYPNQlN0rJ/DuMvkBb0J7cGbvhl+aPag9vjWSX9j/M21/5JJvrn/mDn5j11b23GZGkWJJ5S3OqTvl2UjnB7/Ui2XjpnpiCu1oN6q9bGuJjD6O3CGoQue0P2pP3z7iHPdlufuvWoLqRHG/YDO98x0LdF5Kml51g6B1xVAw4AcNXw0PYFCw9wCnH6GrfaRg3AzWYPxsC44YVmAAAtsmt7sgaXDcbcDZfcqfj+2KDctx50rpDR641RBXBwJ3IKjQDen3TIVREk7luHuaErbY0RQXe1LWYVcrfCBbP5TJmAOLIx7gVikzLYFnRwh/HKJdYhQRC7idjoswpbpNha0dNTsDOn1N6jUwSNCQRrM5U2NMtaK/m48ykKbyYAAKR83cWCU7mpvKS/btTRKZ2MCccJe1FQpzxnOB2ulZ0qBvb7TjF9rtgg6bYlsOFVeVy+DZnxmdKJkb19hvUuHKAjw7D7IhBun6e+N9x6DbLRZOGIfD9DuBxvxWYMa6ddjOU+Qs+dX9VjebvPsecRwHEGiDhzQc6IiPWixSV2Ya4Hwc5iX+XQRNzaqFDkafoIAFIRu859nBWdXhzmTL/qgsPrm+Xxjv3gz87mxWtBb4rprSufXTPrXRpwwnJQgWnOoc/2sYEBR3tbg8nMpAxuIxevOAjLJhmUkAnw4LSHenPy6OCxa986TkYZT08nqtOzydKg1A7T05m+steonepQ3By2aTdPO8Fed8Ha1iXPs2K60ilJgwyusnpSJuW3IajmUan6tAVxoQa+LP1v/lPTjWmsW+a/uVyHA1+xnaGlaNnRfFX98z//w2ZJ/32dv0LUnO0iMjUlm7dHlY2wNErEzVAivCCJT5iht4K8IkylJhvrACUazNx5qYGyDU4IaigRIrpZBghEm13AMkYHEQzsiDnl7BiJwRXMsAw3b7Pemy4O/mLNrO8aPkF89xY/S/LmUepfLQQAAI5QDbszgYIdwb3Z4Yx6LyeYRwAy3HPrFKcyIto5GQwA2Izo7Qr4a8746sCMhcJkeinhhlgeiNJwpkbPSKSuY/fpi7U7aXRwuS+nuheqqZQTAp3kH2gaZJlho2mbXYZC0xnJMHTu5bg7jnt5Tq0X7EQusfaMqOpQimkEhfUbRRBL0xwQAGQNU5SHm0ZbO2H/0g2TZpbTQmXYYmzobj6eOyhL6I6EUs32L0SooJfrTRv2VngLr/bjm3sgPtZNOmefFRd1CyBRw6pOxAEArJdlGHL1tp5Mup7BaTdnQDswJKxT1D+62TuQ2CYzAEAsGOxjH1+WT8/FUb+fkVK4Q+WS58d2CSo6Nnip/buGmKnXUjbATQr59G9qY9ZA7jtSeDC9vL81EE1BoiLEhG00DVnLLq6BRAkG94mNFUeDEVuSwaMDS99lUhqqmyWDKEIhp5YoMLdzPbd8F0X2ItE5NDhVvqiDxdPX9BEAXBbs2HnsHmaFmLrTZRrGJJNTTBqUeedFyQTM8myZWoK7a6fCKrDl1mi7Bqyuvd92gzl4K65u8TE6rJz+ahXunwLVFYSjP7D7HH8hARzpgUh2hLwi9YuWtHiabg8lurxoRYnatVEq91ILPwKApeiq9DjWC0dE40Ihw4WQz5F8Lk4pvW4e1hqeItTbFD7bsXsGQJrlEIHhuOfjkjMZcAaLwQCAufyyrpoR61cJdlAKp0jOquh9D1XQL3u5mnW5FCe1qY5WaTVgZ+2MI1/4h9hVdNO2poCKm3/m29C2XeM+Ecpjd7oqpwhTIwen2+BMeX5VI4/HALfbDAYAXCkGwJ6/gLPASycuuyHtAjPy5+0SbsPDfnZgCe/OzUBTIiRz0Dc2ZvTSgCGsy2zvuxMiCQbMUVhD7LCKwmZlLAuyzzDgk+ncun+EHvvsa3r1UuxF1U+G2CEQ8sET44DMD2eDbaXVYadtsO0LBdmBCXu7L7cE865Kp9hPueg5UbgoDAAY6h29C6oAnOfitAgppdHGnxc2NFQTNrUhLlqcByx5dwY+izLuyxpacEIGwUmxzMwZT1Rhl2XDGIJhRbipYGfLDXcS0G4NKXLq1OGRG34HO//oii23b77C7OrwPfzFUlw9d0oNq9pvhLa4UM0BAQC8sCcOorhRaUlzG1G4sLyVNX/CmD5DCXY+fZOBSrD1pUfYWD1EBbZivNIkNKAr1ngu6XpLXMPcLkSqCtBbeZaGSLbEgSy67HC4yFKan1wMdH2gTZ+pdtThCis7gl41nQAAveOWWpfOfL+BU3kk9mVcpERQjyzUDkhOVo8WSJHZVkFtN5kBAF7C2fa0XQN0So6xBOj2/rkIuedD9xiozhvjG+DwTjRutJXm/YW3jDIjJyDx7gYnzTbnwLmwy53B1oYLqRoq1QmNgjaVIoLggAND3HFiwmDubKuy20bKC4atx5jdH96HupcO4cCzClpEQLXkgbBN9XeF4Cqn1dRC5FwE3XKcrHyXGLsLBQAAc1FNNnthLCGuaQ6yreFZZVFE+xSja8o4elE8BcZ7Bkl5ffZLd/6hadm1V/fh1v/BYFN3xGuPAEN6uaUXn33vCB63hzCXFmnrtgSIq2XxBdGmhuFKxtuGg48awbfKoxelk19NeCXJpT0bEG1liF5APSBPIvNG7daNZP4cWxsPunalkZ0MBgAkG3W1NlmqN/M0pe6qQ1AB","base64")).toString()),yO}var Zae=new Map([[P.makeIdent(null,"fsevents").identHash,zae],[P.makeIdent(null,"resolve").identHash,Vae],[P.makeIdent(null,"typescript").identHash,Xae]]),f4e={hooks:{registerPackageExtensions:async(r,e)=>{for(let[t,i]of mO)e(P.parseDescriptor(t,!0),i)},getBuiltinPatch:async(r,e)=>{var s;let t="compat/";if(!e.startsWith(t))return;let i=P.parseIdent(e.slice(t.length)),n=(s=Zae.get(i.identHash))==null?void 0:s();return typeof n<"u"?n:null},reduceDependency:async(r,e,t,i)=>typeof Zae.get(r.identHash)>"u"?r:P.makeDescriptor(r,P.makeRange({protocol:"patch:",source:P.stringifyDescriptor(r),selector:`~builtin<compat/${P.stringifyIdent(r)}>`,params:null}))}},h4e=f4e;var BO={};ut(BO,{default:()=>d4e});var tp=class extends De{constructor(){super(...arguments);this.pkg=z.String("-p,--package",{description:"The package to run the provided command from"});this.quiet=z.Boolean("-q,--quiet",!1,{description:"Only report critical errors instead of printing the full install logs"});this.command=z.String();this.args=z.Proxy()}async execute(){let t=[];this.pkg&&t.push("--package",this.pkg),this.quiet&&t.push("--quiet");let i=P.parseDescriptor(this.command),n;i.scope?n=P.makeIdent(i.scope,`create-${i.name}`):i.name.startsWith("@")?n=P.makeIdent(i.name.substring(1),"create"):n=P.makeIdent(null,`create-${i.name}`);let s=P.stringifyIdent(n);return i.range!=="unknown"&&(s+=`@${i.range}`),this.cli.run(["dlx",...t,s,...this.args])}};tp.paths=[["create"]];var Ku=class extends De{constructor(){super(...arguments);this.packages=z.Array("-p,--package",{description:"The package(s) to install before running the command"});this.quiet=z.Boolean("-q,--quiet",!1,{description:"Only report critical errors instead of printing the full install logs"});this.command=z.String();this.args=z.Proxy()}async execute(){return ye.telemetry=null,await M.mktempPromise(async t=>{var C;let i=x.join(t,`dlx-${process.pid}`);await M.mkdirPromise(i),await M.writeFilePromise(x.join(i,"package.json"),`{}
-`),await M.writeFilePromise(x.join(i,"yarn.lock"),"");let n=x.join(i,".yarnrc.yml"),s=await ye.findProjectCwd(this.context.cwd,xt.lockfile),o=!(await ye.find(this.context.cwd,null,{strict:!1})).get("enableGlobalCache"),a=s!==null?x.join(s,".yarnrc.yml"):null;a!==null&&M.existsSync(a)?(await M.copyFilePromise(a,n),await ye.updateConfiguration(i,y=>{let B={...y,enableGlobalCache:o,enableTelemetry:!1};return Array.isArray(y.plugins)&&(B.plugins=y.plugins.map(v=>{let D=typeof v=="string"?v:v.path,T=K.isAbsolute(D)?D:K.resolve(K.fromPortablePath(s),D);return typeof v=="string"?T:{path:T,spec:v.spec}})),B})):await M.writeFilePromise(n,`enableGlobalCache: ${o}
-enableTelemetry: false
-`);let l=(C=this.packages)!=null?C:[this.command],c=P.parseDescriptor(this.command).name,u=await this.cli.run(["add","--",...l],{cwd:i,quiet:this.quiet});if(u!==0)return u;this.quiet||this.context.stdout.write(`
-`);let g=await ye.find(i,this.context.plugins),{project:f,workspace:h}=await je.find(g,i);if(h===null)throw new ct(f.cwd,i);await f.restoreInstallState();let p=await Wt.getWorkspaceAccessibleBinaries(h);return p.has(c)===!1&&p.size===1&&typeof this.packages>"u"&&(c=Array.from(p)[0][0]),await Wt.executeWorkspaceAccessibleBinary(h,c,this.args,{packageAccessibleBinaries:p,cwd:this.context.cwd,stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr})})}};Ku.paths=[["dlx"]],Ku.usage=ve.Usage({description:"run a package in a temporary environment",details:"\n      This command will install a package within a temporary environment, and run its binary script if it contains any. The binary will run within the current cwd.\n\n      By default Yarn will download the package named `command`, but this can be changed through the use of the `-p,--package` flag which will instruct Yarn to still run the same command but from a different package.\n\n      Using `yarn dlx` as a replacement of `yarn add` isn't recommended, as it makes your project non-deterministic (Yarn doesn't keep track of the packages installed through `dlx` - neither their name, nor their version).\n    ",examples:[["Use create-react-app to create a new React app","yarn dlx create-react-app ./my-app"],["Install multiple packages for a single command",`yarn dlx -p typescript -p ts-node ts-node --transpile-only -e "console.log('hello!')"`]]});var p4e={commands:[tp,Ku]},d4e=p4e;var vO={};ut(vO,{default:()=>E4e,fileUtils:()=>Zm});var rp=/^(?:[a-zA-Z]:[\\/]|\.{0,2}\/)/,Xm=/^[^?]*\.(?:tar\.gz|tgz)(?:::.*)?$/,jr="file:";var Zm={};ut(Zm,{makeArchiveFromLocator:()=>Kb,makeBufferFromLocator:()=>SO,makeLocator:()=>QO,makeSpec:()=>_ae,parseSpec:()=>bO});function bO(r){let{params:e,selector:t}=P.parseRange(r),i=K.toPortablePath(t);return{parentLocator:e&&typeof e.locator=="string"?P.parseLocator(e.locator):null,path:i}}function _ae({parentLocator:r,path:e,folderHash:t,protocol:i}){let n=r!==null?{locator:P.stringifyLocator(r)}:{},s=typeof t<"u"?{hash:t}:{};return P.makeRange({protocol:i,source:e,selector:e,params:{...s,...n}})}function QO(r,{parentLocator:e,path:t,folderHash:i,protocol:n}){return P.makeLocator(r,_ae({parentLocator:e,path:t,folderHash:i,protocol:n}))}async function Kb(r,{protocol:e,fetchOptions:t,inMemory:i=!1}){let{parentLocator:n,path:s}=P.parseFileStyleRange(r.reference,{protocol:e}),o=x.isAbsolute(s)?{packageFs:new qt(Oe.root),prefixPath:Oe.dot,localPath:Oe.root}:await t.fetcher.fetch(n,t),a=o.localPath?{packageFs:new qt(Oe.root),prefixPath:x.relative(Oe.root,o.localPath)}:o;o!==a&&o.releaseFs&&o.releaseFs();let l=a.packageFs,c=x.join(a.prefixPath,s);return await Ie.releaseAfterUseAsync(async()=>await mi.makeArchiveFromDirectory(c,{baseFs:l,prefixPath:P.getIdentVendorPath(r),compressionLevel:t.project.configuration.get("compressionLevel"),inMemory:i}),a.releaseFs)}async function SO(r,{protocol:e,fetchOptions:t}){return(await Kb(r,{protocol:e,fetchOptions:t,inMemory:!0})).getBufferAndClose()}var Ub=class{supports(e,t){return!!e.reference.startsWith(jr)}getLocalPath(e,t){let{parentLocator:i,path:n}=P.parseFileStyleRange(e.reference,{protocol:jr});if(x.isAbsolute(n))return n;let s=t.fetcher.getLocalPath(i,t);return s===null?null:x.resolve(s,n)}async fetch(e,t){let i=t.checksums.get(e.locatorHash)||null,[n,s,o]=await t.cache.fetchPackageFromCache(e,i,{onHit:()=>t.report.reportCacheHit(e),onMiss:()=>t.report.reportCacheMiss(e,`${P.prettyLocator(t.project.configuration,e)} can't be found in the cache and will be fetched from the disk`),loader:()=>this.fetchFromDisk(e,t),skipIntegrityCheck:t.skipIntegrityCheck,...t.cacheOptions});return{packageFs:n,releaseFs:s,prefixPath:P.getIdentVendorPath(e),localPath:this.getLocalPath(e,t),checksum:o}}async fetchFromDisk(e,t){return Kb(e,{protocol:jr,fetchOptions:t})}};var C4e=2,Hb=class{supportsDescriptor(e,t){return e.range.match(rp)?!0:!!e.range.startsWith(jr)}supportsLocator(e,t){return!!e.reference.startsWith(jr)}shouldPersistResolution(e,t){return!1}bindDescriptor(e,t,i){return rp.test(e.range)&&(e=P.makeDescriptor(e,`${jr}${e.range}`)),P.bindDescriptor(e,{locator:P.stringifyLocator(t)})}getResolutionDependencies(e,t){return[]}async getCandidates(e,t,i){if(!i.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let{path:n,parentLocator:s}=bO(e.range);if(s===null)throw new Error("Assertion failed: The descriptor should have been bound");let o=await SO(P.makeLocator(e,P.makeRange({protocol:jr,source:n,selector:n,params:{locator:P.stringifyLocator(s)}})),{protocol:jr,fetchOptions:i.fetchOptions}),a=li.makeHash(`${C4e}`,o).slice(0,6);return[QO(e,{parentLocator:s,path:n,folderHash:a,protocol:jr})]}async getSatisfying(e,t,i){return null}async resolve(e,t){if(!t.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let i=await t.fetchOptions.fetcher.fetch(e,t.fetchOptions),n=await Ie.releaseAfterUseAsync(async()=>await ot.find(i.prefixPath,{baseFs:i.packageFs}),i.releaseFs);return{...e,version:n.version||"0.0.0",languageName:n.languageName||t.project.configuration.get("defaultLanguageName"),linkType:"HARD",conditions:n.getConditions(),dependencies:n.dependencies,peerDependencies:n.peerDependencies,dependenciesMeta:n.dependenciesMeta,peerDependenciesMeta:n.peerDependenciesMeta,bin:n.bin}}};var Gb=class{supports(e,t){return Xm.test(e.reference)?!!e.reference.startsWith(jr):!1}getLocalPath(e,t){return null}async fetch(e,t){let i=t.checksums.get(e.locatorHash)||null,[n,s,o]=await t.cache.fetchPackageFromCache(e,i,{onHit:()=>t.report.reportCacheHit(e),onMiss:()=>t.report.reportCacheMiss(e,`${P.prettyLocator(t.project.configuration,e)} can't be found in the cache and will be fetched from the disk`),loader:()=>this.fetchFromDisk(e,t),skipIntegrityCheck:t.skipIntegrityCheck,...t.cacheOptions});return{packageFs:n,releaseFs:s,prefixPath:P.getIdentVendorPath(e),checksum:o}}async fetchFromDisk(e,t){let{parentLocator:i,path:n}=P.parseFileStyleRange(e.reference,{protocol:jr}),s=x.isAbsolute(n)?{packageFs:new qt(Oe.root),prefixPath:Oe.dot,localPath:Oe.root}:await t.fetcher.fetch(i,t),o=s.localPath?{packageFs:new qt(Oe.root),prefixPath:x.relative(Oe.root,s.localPath)}:s;s!==o&&s.releaseFs&&s.releaseFs();let a=o.packageFs,l=x.join(o.prefixPath,n),c=await a.readFilePromise(l);return await Ie.releaseAfterUseAsync(async()=>await mi.convertToZip(c,{compressionLevel:t.project.configuration.get("compressionLevel"),prefixPath:P.getIdentVendorPath(e),stripComponents:1}),o.releaseFs)}};var Yb=class{supportsDescriptor(e,t){return Xm.test(e.range)?!!(e.range.startsWith(jr)||rp.test(e.range)):!1}supportsLocator(e,t){return Xm.test(e.reference)?!!e.reference.startsWith(jr):!1}shouldPersistResolution(e,t){return!0}bindDescriptor(e,t,i){return rp.test(e.range)&&(e=P.makeDescriptor(e,`${jr}${e.range}`)),P.bindDescriptor(e,{locator:P.stringifyLocator(t)})}getResolutionDependencies(e,t){return[]}async getCandidates(e,t,i){let n=e.range;return n.startsWith(jr)&&(n=n.slice(jr.length)),[P.makeLocator(e,`${jr}${K.toPortablePath(n)}`)]}async getSatisfying(e,t,i){return null}async resolve(e,t){if(!t.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let i=await t.fetchOptions.fetcher.fetch(e,t.fetchOptions),n=await Ie.releaseAfterUseAsync(async()=>await ot.find(i.prefixPath,{baseFs:i.packageFs}),i.releaseFs);return{...e,version:n.version||"0.0.0",languageName:n.languageName||t.project.configuration.get("defaultLanguageName"),linkType:"HARD",conditions:n.getConditions(),dependencies:n.dependencies,peerDependencies:n.peerDependencies,dependenciesMeta:n.dependenciesMeta,peerDependenciesMeta:n.peerDependenciesMeta,bin:n.bin}}};var m4e={fetchers:[Gb,Ub],resolvers:[Yb,Hb]},E4e=m4e;var xO={};ut(xO,{default:()=>B4e});var $ae=Pe(J("querystring")),eAe=[/^https?:\/\/(?:([^/]+?)@)?github.com\/([^/#]+)\/([^/#]+)\/tarball\/([^/#]+)(?:#(.*))?$/,/^https?:\/\/(?:([^/]+?)@)?github.com\/([^/#]+)\/([^/#]+?)(?:\.git)?(?:#(.*))?$/];function tAe(r){return r?eAe.some(e=>!!r.match(e)):!1}function rAe(r){let e;for(let a of eAe)if(e=r.match(a),e)break;if(!e)throw new Error(I4e(r));let[,t,i,n,s="master"]=e,{commit:o}=$ae.default.parse(s);return s=o||s.replace(/[^:]*:/,""),{auth:t,username:i,reponame:n,treeish:s}}function I4e(r){return`Input cannot be parsed as a valid GitHub URL ('${r}').`}var jb=class{supports(e,t){return!!tAe(e.reference)}getLocalPath(e,t){return null}async fetch(e,t){let i=t.checksums.get(e.locatorHash)||null,[n,s,o]=await t.cache.fetchPackageFromCache(e,i,{onHit:()=>t.report.reportCacheHit(e),onMiss:()=>t.report.reportCacheMiss(e,`${P.prettyLocator(t.project.configuration,e)} can't be found in the cache and will be fetched from GitHub`),loader:()=>this.fetchFromNetwork(e,t),skipIntegrityCheck:t.skipIntegrityCheck,...t.cacheOptions});return{packageFs:n,releaseFs:s,prefixPath:P.getIdentVendorPath(e),checksum:o}}async fetchFromNetwork(e,t){let i=await Xt.get(this.getLocatorUrl(e,t),{configuration:t.project.configuration});return await M.mktempPromise(async n=>{let s=new qt(n);await mi.extractArchiveTo(i,s,{stripComponents:1});let o=AA.splitRepoUrl(e.reference),a=x.join(n,"package.tgz");await Wt.prepareExternalProject(n,a,{configuration:t.project.configuration,report:t.report,workspace:o.extra.workspace,locator:e});let l=await M.readFilePromise(a);return await mi.convertToZip(l,{compressionLevel:t.project.configuration.get("compressionLevel"),prefixPath:P.getIdentVendorPath(e),stripComponents:1})})}getLocatorUrl(e,t){let{auth:i,username:n,reponame:s,treeish:o}=rAe(e.reference);return`https://${i?`${i}@`:""}github.com/${n}/${s}/archive/${o}.tar.gz`}};var w4e={hooks:{async fetchHostedRepository(r,e,t){if(r!==null)return r;let i=new jb;if(!i.supports(e,t))return null;try{return await i.fetch(e,t)}catch{return null}}}},B4e=w4e;var PO={};ut(PO,{default:()=>Q4e});var _m=/^[^?]*\.(?:tar\.gz|tgz)(?:\?.*)?$/,$m=/^https?:/;var qb=class{supports(e,t){return _m.test(e.reference)?!!$m.test(e.reference):!1}getLocalPath(e,t){return null}async fetch(e,t){let i=t.checksums.get(e.locatorHash)||null,[n,s,o]=await t.cache.fetchPackageFromCache(e,i,{onHit:()=>t.report.reportCacheHit(e),onMiss:()=>t.report.reportCacheMiss(e,`${P.prettyLocator(t.project.configuration,e)} can't be found in the cache and will be fetched from the remote server`),loader:()=>this.fetchFromNetwork(e,t),skipIntegrityCheck:t.skipIntegrityCheck,...t.cacheOptions});return{packageFs:n,releaseFs:s,prefixPath:P.getIdentVendorPath(e),checksum:o}}async fetchFromNetwork(e,t){let i=await Xt.get(e.reference,{configuration:t.project.configuration});return await mi.convertToZip(i,{compressionLevel:t.project.configuration.get("compressionLevel"),prefixPath:P.getIdentVendorPath(e),stripComponents:1})}};var Jb=class{supportsDescriptor(e,t){return _m.test(e.range)?!!$m.test(e.range):!1}supportsLocator(e,t){return _m.test(e.reference)?!!$m.test(e.reference):!1}shouldPersistResolution(e,t){return!0}bindDescriptor(e,t,i){return e}getResolutionDependencies(e,t){return[]}async getCandidates(e,t,i){return[P.convertDescriptorToLocator(e)]}async getSatisfying(e,t,i){return null}async resolve(e,t){if(!t.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let i=await t.fetchOptions.fetcher.fetch(e,t.fetchOptions),n=await Ie.releaseAfterUseAsync(async()=>await ot.find(i.prefixPath,{baseFs:i.packageFs}),i.releaseFs);return{...e,version:n.version||"0.0.0",languageName:n.languageName||t.project.configuration.get("defaultLanguageName"),linkType:"HARD",conditions:n.getConditions(),dependencies:n.dependencies,peerDependencies:n.peerDependencies,dependenciesMeta:n.dependenciesMeta,peerDependenciesMeta:n.peerDependenciesMeta,bin:n.bin}}};var b4e={fetchers:[qb],resolvers:[Jb]},Q4e=b4e;var FO={};ut(FO,{default:()=>S8e});var PAe=Pe(xAe()),RO=J("util"),Uu=class extends De{constructor(){super(...arguments);this.private=z.Boolean("-p,--private",!1,{description:"Initialize a private package"});this.workspace=z.Boolean("-w,--workspace",!1,{description:"Initialize a workspace root with a `packages/` directory"});this.install=z.String("-i,--install",!1,{tolerateBoolean:!0,description:"Initialize a package with a specific bundle that will be locked in the project"});this.usev2=z.Boolean("-2",!1,{hidden:!0});this.yes=z.Boolean("-y,--yes",{hidden:!0});this.assumeFreshProject=z.Boolean("--assume-fresh-project",!1,{hidden:!0})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),i=typeof this.install=="string"?this.install:this.usev2||this.install===!0?"latest":null;return i!==null?await this.executeProxy(t,i):await this.executeRegular(t)}async executeProxy(t,i){if(t.projectCwd!==null&&t.projectCwd!==this.context.cwd)throw new Qe("Cannot use the --install flag from within a project subdirectory");M.existsSync(this.context.cwd)||await M.mkdirPromise(this.context.cwd,{recursive:!0});let n=x.join(this.context.cwd,t.get("lockfileFilename"));M.existsSync(n)||await M.writeFilePromise(n,"");let s=await this.cli.run(["set","version",i],{quiet:!0});if(s!==0)return s;let o=[];return this.private&&o.push("-p"),this.workspace&&o.push("-w"),this.yes&&o.push("-y"),await M.mktempPromise(async a=>{let{code:l}=await Cr.pipevp("yarn",["init",...o],{cwd:this.context.cwd,stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr,env:await Wt.makeScriptEnv({binFolder:a})});return l})}async executeRegular(t){var c;let i=null;try{i=(await je.find(t,this.context.cwd)).project}catch{i=null}M.existsSync(this.context.cwd)||await M.mkdirPromise(this.context.cwd,{recursive:!0});let n=await ot.tryFind(this.context.cwd)||new ot,s=Object.fromEntries(t.get("initFields").entries());n.load(s),n.name=(c=n.name)!=null?c:P.makeIdent(t.get("initScope"),x.basename(this.context.cwd)),n.packageManager=Tr&&Ie.isTaggedYarnVersion(Tr)?`yarn@${Tr}`:null,typeof n.raw.private>"u"&&(this.private||this.workspace&&n.workspaceDefinitions.length===0)&&(n.private=!0),this.workspace&&n.workspaceDefinitions.length===0&&(await M.mkdirPromise(x.join(this.context.cwd,"packages"),{recursive:!0}),n.workspaceDefinitions=[{pattern:"packages/*"}]);let o={};n.exportTo(o),RO.inspect.styles.name="cyan",this.context.stdout.write(`${(0,RO.inspect)(o,{depth:1/0,colors:!0,compact:!1})}
-`);let a=x.join(this.context.cwd,ot.fileName);await M.changeFilePromise(a,`${JSON.stringify(o,null,2)}
-`,{automaticNewlines:!0});let l=x.join(this.context.cwd,"README.md");if(M.existsSync(l)||await M.writeFilePromise(l,`# ${P.stringifyIdent(n.name)}
-`),!i||i.cwd===this.context.cwd){let u=x.join(this.context.cwd,xt.lockfile);M.existsSync(u)||await M.writeFilePromise(u,"");let f=[".yarn/*","!.yarn/patches","!.yarn/plugins","!.yarn/releases","!.yarn/sdks","!.yarn/versions","","# Swap the comments on the following lines if you don't wish to use zero-installs","# Documentation here: https://yarnpkg.com/features/zero-installs","!.yarn/cache","#.pnp.*"].map(T=>`${T}
-`).join(""),h=x.join(this.context.cwd,".gitignore");M.existsSync(h)||await M.writeFilePromise(h,f);let C=["/.yarn/**            linguist-vendored","/.yarn/releases/*    binary","/.yarn/plugins/**/*  binary","/.pnp.*              binary linguist-generated"].map(T=>`${T}
-`).join(""),y=x.join(this.context.cwd,".gitattributes");M.existsSync(y)||await M.writeFilePromise(y,C);let B={["*"]:{endOfLine:"lf",insertFinalNewline:!0},["*.{js,json,yml}"]:{charset:"utf-8",indentStyle:"space",indentSize:2}};(0,PAe.default)(B,t.get("initEditorConfig"));let v=`root = true
-`;for(let[T,H]of Object.entries(B)){v+=`
-[${T}]
-`;for(let[j,$]of Object.entries(H)){let V=j.replace(/[A-Z]/g,W=>`_${W.toLowerCase()}`);v+=`${V} = ${$}
-`}}let D=x.join(this.context.cwd,".editorconfig");M.existsSync(D)||await M.writeFilePromise(D,v),M.existsSync(x.join(this.context.cwd,".git"))||await Cr.execvp("git",["init"],{cwd:this.context.cwd})}}};Uu.paths=[["init"]],Uu.usage=ve.Usage({description:"create a new package",details:"\n      This command will setup a new package in your local directory.\n\n      If the `-p,--private` or `-w,--workspace` options are set, the package will be private by default.\n\n      If the `-w,--workspace` option is set, the package will be configured to accept a set of workspaces in the `packages/` directory.\n\n      If the `-i,--install` option is given a value, Yarn will first download it using `yarn set version` and only then forward the init call to the newly downloaded bundle. Without arguments, the downloaded bundle will be `latest`.\n\n      The initial settings of the manifest can be changed by using the `initScope` and `initFields` configuration values. Additionally, Yarn will generate an EditorConfig file whose rules can be altered via `initEditorConfig`, and will initialize a Git repository in the current directory.\n    ",examples:[["Create a new package in the local directory","yarn init"],["Create a new private package in the local directory","yarn init -p"],["Create a new package and store the Yarn release inside","yarn init -i=latest"],["Create a new private package and defines it as a workspace root","yarn init -w"]]});var Q8e={configuration:{initScope:{description:"Scope used when creating packages via the init command",type:"STRING",default:null},initFields:{description:"Additional fields to set when creating packages via the init command",type:"MAP",valueDefinition:{description:"",type:"ANY"}},initEditorConfig:{description:"Extra rules to define in the generator editorconfig",type:"MAP",valueDefinition:{description:"",type:"ANY"}}},commands:[Uu]},S8e=Q8e;var NO={};ut(NO,{default:()=>x8e});var lA="portal:",cA="link:";var Wb=class{supports(e,t){return!!e.reference.startsWith(lA)}getLocalPath(e,t){let{parentLocator:i,path:n}=P.parseFileStyleRange(e.reference,{protocol:lA});if(x.isAbsolute(n))return n;let s=t.fetcher.getLocalPath(i,t);return s===null?null:x.resolve(s,n)}async fetch(e,t){var c;let{parentLocator:i,path:n}=P.parseFileStyleRange(e.reference,{protocol:lA}),s=x.isAbsolute(n)?{packageFs:new qt(Oe.root),prefixPath:Oe.dot,localPath:Oe.root}:await t.fetcher.fetch(i,t),o=s.localPath?{packageFs:new qt(Oe.root),prefixPath:x.relative(Oe.root,s.localPath),localPath:Oe.root}:s;s!==o&&s.releaseFs&&s.releaseFs();let a=o.packageFs,l=x.resolve((c=o.localPath)!=null?c:o.packageFs.getRealPath(),o.prefixPath,n);return s.localPath?{packageFs:new qt(l,{baseFs:a}),releaseFs:o.releaseFs,prefixPath:Oe.dot,localPath:l}:{packageFs:new vo(l,{baseFs:a}),releaseFs:o.releaseFs,prefixPath:Oe.dot}}};var zb=class{supportsDescriptor(e,t){return!!e.range.startsWith(lA)}supportsLocator(e,t){return!!e.reference.startsWith(lA)}shouldPersistResolution(e,t){return!1}bindDescriptor(e,t,i){return P.bindDescriptor(e,{locator:P.stringifyLocator(t)})}getResolutionDependencies(e,t){return[]}async getCandidates(e,t,i){let n=e.range.slice(lA.length);return[P.makeLocator(e,`${lA}${K.toPortablePath(n)}`)]}async getSatisfying(e,t,i){return null}async resolve(e,t){if(!t.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let i=await t.fetchOptions.fetcher.fetch(e,t.fetchOptions),n=await Ie.releaseAfterUseAsync(async()=>await ot.find(i.prefixPath,{baseFs:i.packageFs}),i.releaseFs);return{...e,version:n.version||"0.0.0",languageName:n.languageName||t.project.configuration.get("defaultLanguageName"),linkType:"SOFT",conditions:n.getConditions(),dependencies:new Map([...n.dependencies]),peerDependencies:n.peerDependencies,dependenciesMeta:n.dependenciesMeta,peerDependenciesMeta:n.peerDependenciesMeta,bin:n.bin}}};var Vb=class{supports(e,t){return!!e.reference.startsWith(cA)}getLocalPath(e,t){let{parentLocator:i,path:n}=P.parseFileStyleRange(e.reference,{protocol:cA});if(x.isAbsolute(n))return n;let s=t.fetcher.getLocalPath(i,t);return s===null?null:x.resolve(s,n)}async fetch(e,t){var c;let{parentLocator:i,path:n}=P.parseFileStyleRange(e.reference,{protocol:cA}),s=x.isAbsolute(n)?{packageFs:new qt(Oe.root),prefixPath:Oe.dot,localPath:Oe.root}:await t.fetcher.fetch(i,t),o=s.localPath?{packageFs:new qt(Oe.root),prefixPath:x.relative(Oe.root,s.localPath),localPath:Oe.root}:s;s!==o&&s.releaseFs&&s.releaseFs();let a=o.packageFs,l=x.resolve((c=o.localPath)!=null?c:o.packageFs.getRealPath(),o.prefixPath,n);return s.localPath?{packageFs:new qt(l,{baseFs:a}),releaseFs:o.releaseFs,prefixPath:Oe.dot,discardFromLookup:!0,localPath:l}:{packageFs:new vo(l,{baseFs:a}),releaseFs:o.releaseFs,prefixPath:Oe.dot,discardFromLookup:!0}}};var Xb=class{supportsDescriptor(e,t){return!!e.range.startsWith(cA)}supportsLocator(e,t){return!!e.reference.startsWith(cA)}shouldPersistResolution(e,t){return!1}bindDescriptor(e,t,i){return P.bindDescriptor(e,{locator:P.stringifyLocator(t)})}getResolutionDependencies(e,t){return[]}async getCandidates(e,t,i){let n=e.range.slice(cA.length);return[P.makeLocator(e,`${cA}${K.toPortablePath(n)}`)]}async getSatisfying(e,t,i){return null}async resolve(e,t){return{...e,version:"0.0.0",languageName:t.project.configuration.get("defaultLanguageName"),linkType:"SOFT",conditions:null,dependencies:new Map,peerDependencies:new Map,dependenciesMeta:new Map,peerDependenciesMeta:new Map,bin:new Map}}};var v8e={fetchers:[Vb,Wb],resolvers:[Xb,zb]},x8e=v8e;var dM={};ut(dM,{default:()=>qze});var LO=(r,e)=>`${r}@${e}`,DAe=(r,e)=>{let t=e.indexOf("#"),i=t>=0?e.substring(t+1):e;return LO(r,i)};var FAe=(r,e={})=>{let t=e.debugLevel||Number(process.env.NM_DEBUG_LEVEL||-1),i=e.check||t>=9,n=e.hoistingLimits||new Map,s={check:i,debugLevel:t,hoistingLimits:n,fastLookupPossible:!0},o;s.debugLevel>=0&&(o=Date.now());let a=T8e(r,s),l=!1,c=0;do l=OO(a,[a],new Set([a.locator]),new Map,s).anotherRoundNeeded,s.fastLookupPossible=!1,c++;while(l);if(s.debugLevel>=0&&console.log(`hoist time: ${Date.now()-o}ms, rounds: ${c}`),s.debugLevel>=1){let u=eE(a);if(OO(a,[a],new Set([a.locator]),new Map,s).isGraphChanged)throw new Error(`The hoisting result is not terminal, prev tree:
-${u}, next tree:
-${eE(a)}`);let f=NAe(a);if(f)throw new Error(`${f}, after hoisting finished:
-${eE(a)}`)}return s.debugLevel>=2&&console.log(eE(a)),L8e(a)},P8e=r=>{let e=r[r.length-1],t=new Map,i=new Set,n=s=>{if(!i.has(s)){i.add(s);for(let o of s.hoistedDependencies.values())t.set(o.name,o);for(let o of s.dependencies.values())s.peerNames.has(o.name)||n(o)}};return n(e),t},D8e=r=>{let e=r[r.length-1],t=new Map,i=new Set,n=new Set,s=(o,a)=>{if(i.has(o))return;i.add(o);for(let c of o.hoistedDependencies.values())if(!a.has(c.name)){let u;for(let g of r)u=g.dependencies.get(c.name),u&&t.set(u.name,u)}let l=new Set;for(let c of o.dependencies.values())l.add(c.name);for(let c of o.dependencies.values())o.peerNames.has(c.name)||s(c,l)};return s(e,n),t},kAe=(r,e)=>{if(e.decoupled)return e;let{name:t,references:i,ident:n,locator:s,dependencies:o,originalDependencies:a,hoistedDependencies:l,peerNames:c,reasons:u,isHoistBorder:g,hoistPriority:f,dependencyKind:h,hoistedFrom:p,hoistedTo:C}=e,y={name:t,references:new Set(i),ident:n,locator:s,dependencies:new Map(o),originalDependencies:new Map(a),hoistedDependencies:new Map(l),peerNames:new Set(c),reasons:new Map(u),decoupled:!0,isHoistBorder:g,hoistPriority:f,dependencyKind:h,hoistedFrom:new Map(p),hoistedTo:new Map(C)},B=y.dependencies.get(t);return B&&B.ident==y.ident&&y.dependencies.set(t,y),r.dependencies.set(y.name,y),y},k8e=(r,e)=>{let t=new Map([[r.name,[r.ident]]]);for(let n of r.dependencies.values())r.peerNames.has(n.name)||t.set(n.name,[n.ident]);let i=Array.from(e.keys());i.sort((n,s)=>{let o=e.get(n),a=e.get(s);return a.hoistPriority!==o.hoistPriority?a.hoistPriority-o.hoistPriority:a.peerDependents.size!==o.peerDependents.size?a.peerDependents.size-o.peerDependents.size:a.dependents.size-o.dependents.size});for(let n of i){let s=n.substring(0,n.indexOf("@",1)),o=n.substring(s.length+1);if(!r.peerNames.has(s)){let a=t.get(s);a||(a=[],t.set(s,a)),a.indexOf(o)<0&&a.push(o)}}return t},TO=r=>{let e=new Set,t=(i,n=new Set)=>{if(!n.has(i)){n.add(i);for(let s of i.peerNames)if(!r.peerNames.has(s)){let o=r.dependencies.get(s);o&&!e.has(o)&&t(o,n)}e.add(i)}};for(let i of r.dependencies.values())r.peerNames.has(i.name)||t(i);return e},OO=(r,e,t,i,n,s=new Set)=>{let o=e[e.length-1];if(s.has(o))return{anotherRoundNeeded:!1,isGraphChanged:!1};s.add(o);let a=O8e(o),l=k8e(o,a),c=r==o?new Map:n.fastLookupPossible?P8e(e):D8e(e),u,g=!1,f=!1,h=new Map(Array.from(l.entries()).map(([C,y])=>[C,y[0]])),p=new Map;do{let C=N8e(r,e,t,c,h,l,i,p,n);C.isGraphChanged&&(f=!0),C.anotherRoundNeeded&&(g=!0),u=!1;for(let[y,B]of l)B.length>1&&!o.dependencies.has(y)&&(h.delete(y),B.shift(),h.set(y,B[0]),u=!0)}while(u);for(let C of o.dependencies.values())if(!o.peerNames.has(C.name)&&!t.has(C.locator)){t.add(C.locator);let y=OO(r,[...e,C],t,p,n);y.isGraphChanged&&(f=!0),y.anotherRoundNeeded&&(g=!0),t.delete(C.locator)}return{anotherRoundNeeded:g,isGraphChanged:f}},R8e=r=>{for(let[e,t]of r.dependencies)if(!r.peerNames.has(e)&&t.ident!==r.ident)return!0;return!1},F8e=(r,e,t,i,n,s,o,a,{outputReason:l,fastLookupPossible:c})=>{let u,g=null,f=new Set;l&&(u=`${Array.from(e).map(y=>ki(y)).join("\u2192")}`);let h=t[t.length-1],C=!(i.ident===h.ident);if(l&&!C&&(g="- self-reference"),C&&(C=i.dependencyKind!==1,l&&!C&&(g="- workspace")),C&&i.dependencyKind===2&&(C=!R8e(i),l&&!C&&(g="- external soft link with unhoisted dependencies")),C&&(C=h.dependencyKind!==1||h.hoistedFrom.has(i.name)||e.size===1,l&&!C&&(g=h.reasons.get(i.name))),C&&(C=!r.peerNames.has(i.name),l&&!C&&(g=`- cannot shadow peer: ${ki(r.originalDependencies.get(i.name).locator)} at ${u}`)),C){let y=!1,B=n.get(i.name);if(y=!B||B.ident===i.ident,l&&!y&&(g=`- filled by: ${ki(B.locator)} at ${u}`),y)for(let v=t.length-1;v>=1;v--){let T=t[v].dependencies.get(i.name);if(T&&T.ident!==i.ident){y=!1;let H=a.get(h);H||(H=new Set,a.set(h,H)),H.add(i.name),l&&(g=`- filled by ${ki(T.locator)} at ${t.slice(0,v).map(j=>ki(j.locator)).join("\u2192")}`);break}}C=y}if(C&&(C=s.get(i.name)===i.ident,l&&!C&&(g=`- filled by: ${ki(o.get(i.name)[0])} at ${u}`)),C){let y=!0,B=new Set(i.peerNames);for(let v=t.length-1;v>=1;v--){let D=t[v];for(let T of B){if(D.peerNames.has(T)&&D.originalDependencies.has(T))continue;let H=D.dependencies.get(T);H&&r.dependencies.get(T)!==H&&(v===t.length-1?f.add(H):(f=null,y=!1,l&&(g=`- peer dependency ${ki(H.locator)} from parent ${ki(D.locator)} was not hoisted to ${u}`))),B.delete(T)}if(!y)break}C=y}if(C&&!c)for(let y of i.hoistedDependencies.values()){let B=n.get(y.name)||r.dependencies.get(y.name);if(!B||y.ident!==B.ident){C=!1,l&&(g=`- previously hoisted dependency mismatch, needed: ${ki(y.locator)}, available: ${ki(B==null?void 0:B.locator)}`);break}}return f!==null&&f.size>0?{isHoistable:2,dependsOn:f,reason:g}:{isHoistable:C?0:1,reason:g}},Zb=r=>`${r.name}@${r.locator}`,N8e=(r,e,t,i,n,s,o,a,l)=>{let c=e[e.length-1],u=new Set,g=!1,f=!1,h=(B,v,D,T,H)=>{if(u.has(T))return;let j=[...v,Zb(T)],$=[...D,Zb(T)],V=new Map,W=new Map;for(let re of TO(T)){let O=F8e(c,t,[c,...B,T],re,i,n,s,a,{outputReason:l.debugLevel>=2,fastLookupPossible:l.fastLookupPossible});if(W.set(re,O),O.isHoistable===2)for(let F of O.dependsOn){let ue=V.get(F.name)||new Set;ue.add(re.name),V.set(F.name,ue)}}let _=new Set,A=(re,O,F)=>{if(!_.has(re)){_.add(re),W.set(re,{isHoistable:1,reason:F});for(let ue of V.get(re.name)||[])A(T.dependencies.get(ue),O,l.debugLevel>=2?`- peer dependency ${ki(re.locator)} from parent ${ki(T.locator)} was not hoisted`:"")}};for(let[re,O]of W)O.isHoistable===1&&A(re,O,O.reason);let Ae=!1;for(let re of W.keys())if(!_.has(re)){f=!0;let O=o.get(T);O&&O.has(re.name)&&(g=!0),Ae=!0,T.dependencies.delete(re.name),T.hoistedDependencies.set(re.name,re),T.reasons.delete(re.name);let F=c.dependencies.get(re.name);if(l.debugLevel>=2){let ue=Array.from(v).concat([T.locator]).map(ke=>ki(ke)).join("\u2192"),pe=c.hoistedFrom.get(re.name);pe||(pe=[],c.hoistedFrom.set(re.name,pe)),pe.push(ue),T.hoistedTo.set(re.name,Array.from(e).map(ke=>ki(ke.locator)).join("\u2192"))}if(!F)c.ident!==re.ident&&(c.dependencies.set(re.name,re),H.add(re));else for(let ue of re.references)F.references.add(ue)}if(T.dependencyKind===2&&Ae&&(g=!0),l.check){let re=NAe(r);if(re)throw new Error(`${re}, after hoisting dependencies of ${[c,...B,T].map(O=>ki(O.locator)).join("\u2192")}:
-${eE(r)}`)}let ge=TO(T);for(let re of ge)if(_.has(re)){let O=W.get(re);if((n.get(re.name)===re.ident||!T.reasons.has(re.name))&&O.isHoistable!==0&&T.reasons.set(re.name,O.reason),!re.isHoistBorder&&$.indexOf(Zb(re))<0){u.add(T);let ue=kAe(T,re);h([...B,T],j,$,ue,C),u.delete(T)}}},p,C=new Set(TO(c)),y=Array.from(e).map(B=>Zb(B));do{p=C,C=new Set;for(let B of p){if(B.locator===c.locator||B.isHoistBorder)continue;let v=kAe(c,B);h([],Array.from(t),y,v,C)}}while(C.size>0);return{anotherRoundNeeded:g,isGraphChanged:f}},NAe=r=>{let e=[],t=new Set,i=new Set,n=(s,o,a)=>{if(t.has(s)||(t.add(s),i.has(s)))return;let l=new Map(o);for(let c of s.dependencies.values())s.peerNames.has(c.name)||l.set(c.name,c);for(let c of s.originalDependencies.values()){let u=l.get(c.name),g=()=>`${Array.from(i).concat([s]).map(f=>ki(f.locator)).join("\u2192")}`;if(s.peerNames.has(c.name)){let f=o.get(c.name);(f!==u||!f||f.ident!==c.ident)&&e.push(`${g()} - broken peer promise: expected ${c.ident} but found ${f&&f.ident}`)}else{let f=a.hoistedFrom.get(s.name),h=s.hoistedTo.get(c.name),p=`${f?` hoisted from ${f.join(", ")}`:""}`,C=`${h?` hoisted to ${h}`:""}`,y=`${g()}${p}`;u?u.ident!==c.ident&&e.push(`${y} - broken require promise for ${c.name}${C}: expected ${c.ident}, but found: ${u.ident}`):e.push(`${y} - broken require promise: no required dependency ${c.name}${C} found`)}}i.add(s);for(let c of s.dependencies.values())s.peerNames.has(c.name)||n(c,l,s);i.delete(s)};return n(r,r.dependencies,r),e.join(`
-`)},T8e=(r,e)=>{let{identName:t,name:i,reference:n,peerNames:s}=r,o={name:i,references:new Set([n]),locator:LO(t,n),ident:DAe(t,n),dependencies:new Map,originalDependencies:new Map,hoistedDependencies:new Map,peerNames:new Set(s),reasons:new Map,decoupled:!0,isHoistBorder:!0,hoistPriority:0,dependencyKind:1,hoistedFrom:new Map,hoistedTo:new Map},a=new Map([[r,o]]),l=(c,u)=>{let g=a.get(c),f=!!g;if(!g){let{name:h,identName:p,reference:C,peerNames:y,hoistPriority:B,dependencyKind:v}=c,D=e.hoistingLimits.get(u.locator);g={name:h,references:new Set([C]),locator:LO(p,C),ident:DAe(p,C),dependencies:new Map,originalDependencies:new Map,hoistedDependencies:new Map,peerNames:new Set(y),reasons:new Map,decoupled:!0,isHoistBorder:D?D.has(h):!1,hoistPriority:B||0,dependencyKind:v||0,hoistedFrom:new Map,hoistedTo:new Map},a.set(c,g)}if(u.dependencies.set(c.name,g),u.originalDependencies.set(c.name,g),f){let h=new Set,p=C=>{if(!h.has(C)){h.add(C),C.decoupled=!1;for(let y of C.dependencies.values())C.peerNames.has(y.name)||p(y)}};p(g)}else for(let h of c.dependencies)l(h,g)};for(let c of r.dependencies)l(c,o);return o},MO=r=>r.substring(0,r.indexOf("@",1)),L8e=r=>{let e={name:r.name,identName:MO(r.locator),references:new Set(r.references),dependencies:new Set},t=new Set([r]),i=(n,s,o)=>{let a=t.has(n),l;if(s===n)l=o;else{let{name:c,references:u,locator:g}=n;l={name:c,identName:MO(g),references:u,dependencies:new Set}}if(o.dependencies.add(l),!a){t.add(n);for(let c of n.dependencies.values())n.peerNames.has(c.name)||i(c,n,l);t.delete(n)}};for(let n of r.dependencies.values())i(n,r,e);return e},O8e=r=>{let e=new Map,t=new Set([r]),i=o=>`${o.name}@${o.ident}`,n=o=>{let a=i(o),l=e.get(a);return l||(l={dependents:new Set,peerDependents:new Set,hoistPriority:0},e.set(a,l)),l},s=(o,a)=>{let l=!!t.has(a);if(n(a).dependents.add(o.ident),!l){t.add(a);for(let u of a.dependencies.values()){let g=n(u);g.hoistPriority=Math.max(g.hoistPriority,u.hoistPriority),a.peerNames.has(u.name)?g.peerDependents.add(a.ident):s(a,u)}}};for(let o of r.dependencies.values())r.peerNames.has(o.name)||s(r,o);return e},ki=r=>{if(!r)return"none";let e=r.indexOf("@",1),t=r.substring(0,e);t.endsWith("$wsroot$")&&(t=`wh:${t.replace("$wsroot$","")}`);let i=r.substring(e+1);if(i==="workspace:.")return".";if(i){let n=(i.indexOf("#")>0?i.split("#")[1]:i).replace("npm:","");return i.startsWith("virtual")&&(t=`v:${t}`),n.startsWith("workspace")&&(t=`w:${t}`,n=""),`${t}${n?`@${n}`:""}`}else return`${t}`},RAe=5e4,eE=r=>{let e=0,t=(n,s,o="")=>{if(e>RAe||s.has(n))return"";e++;let a=Array.from(n.dependencies.values()).sort((c,u)=>c.name===u.name?0:c.name>u.name?1:-1),l="";s.add(n);for(let c=0;c<a.length;c++){let u=a[c];if(!n.peerNames.has(u.name)&&u!==n){let g=n.reasons.get(u.name),f=MO(u.locator);l+=`${o}${c<a.length-1?"\u251C\u2500":"\u2514\u2500"}${(s.has(u)?">":"")+(f!==u.name?`a:${u.name}:`:"")+ki(u.locator)+(g?` ${g}`:"")}
-`,l+=t(u,s,`${o}${c<a.length-1?"\u2502 ":"  "}`)}}return s.delete(n),l};return t(r,new Set)+(e>RAe?`
-Tree is too large, part of the tree has been dunped
-`:"")};var tE=(i=>(i.WORKSPACES="workspaces",i.DEPENDENCIES="dependencies",i.NONE="none",i))(tE||{}),TAe="node_modules",Hu="$wsroot$";var rE=(r,e)=>{let{packageTree:t,hoistingLimits:i,errors:n,preserveSymlinksRequired:s}=K8e(r,e),o=null;if(n.length===0){let a=FAe(t,{hoistingLimits:i});o=H8e(r,a,e)}return{tree:o,errors:n,preserveSymlinksRequired:s}},sa=r=>`${r.name}@${r.reference}`,UO=r=>{let e=new Map;for(let[t,i]of r.entries())if(!i.dirList){let n=e.get(i.locator);n||(n={target:i.target,linkType:i.linkType,locations:[],aliases:i.aliases},e.set(i.locator,n)),n.locations.push(t)}for(let t of e.values())t.locations=t.locations.sort((i,n)=>{let s=i.split(x.delimiter).length,o=n.split(x.delimiter).length;return n===i?0:s!==o?o-s:n>i?1:-1});return e},LAe=(r,e)=>{let t=P.isVirtualLocator(r)?P.devirtualizeLocator(r):r,i=P.isVirtualLocator(e)?P.devirtualizeLocator(e):e;return P.areLocatorsEqual(t,i)},KO=(r,e,t,i)=>{if(r.linkType!=="SOFT")return!1;let n=K.toPortablePath(t.resolveVirtual&&e.reference&&e.reference.startsWith("virtual:")?t.resolveVirtual(r.packageLocation):r.packageLocation);return x.contains(i,n)===null},M8e=r=>{let e=r.getPackageInformation(r.topLevel);if(e===null)throw new Error("Assertion failed: Expected the top-level package to have been registered");if(r.findPackageLocator(e.packageLocation)===null)throw new Error("Assertion failed: Expected the top-level package to have a physical locator");let i=K.toPortablePath(e.packageLocation.slice(0,-1)),n=new Map,s={children:new Map},o=r.getDependencyTreeRoots(),a=new Map,l=new Set,c=(f,h)=>{let p=sa(f);if(l.has(p))return;l.add(p);let C=r.getPackageInformation(f);if(C){let y=h?sa(h):"";if(sa(f)!==y&&C.linkType==="SOFT"&&!KO(C,f,r,i)){let B=OAe(C,f,r);(!a.get(B)||f.reference.startsWith("workspace:"))&&a.set(B,f)}for(let[B,v]of C.packageDependencies)v!==null&&(C.packagePeers.has(B)||c(r.getLocator(B,v),f))}};for(let f of o)c(f,null);let u=i.split(x.sep);for(let f of a.values()){let h=r.getPackageInformation(f),C=K.toPortablePath(h.packageLocation.slice(0,-1)).split(x.sep).slice(u.length),y=s;for(let B of C){let v=y.children.get(B);v||(v={children:new Map},y.children.set(B,v)),y=v}y.workspaceLocator=f}let g=(f,h)=>{if(f.workspaceLocator){let p=sa(h),C=n.get(p);C||(C=new Set,n.set(p,C)),C.add(f.workspaceLocator)}for(let p of f.children.values())g(p,f.workspaceLocator||h)};for(let f of s.children.values())g(f,s.workspaceLocator);return n},K8e=(r,e)=>{let t=[],i=!1,n=new Map,s=M8e(r),o=r.getPackageInformation(r.topLevel);if(o===null)throw new Error("Assertion failed: Expected the top-level package to have been registered");let a=r.findPackageLocator(o.packageLocation);if(a===null)throw new Error("Assertion failed: Expected the top-level package to have a physical locator");let l=K.toPortablePath(o.packageLocation.slice(0,-1)),c={name:a.name,identName:a.name,reference:a.reference,peerNames:o.packagePeers,dependencies:new Set,dependencyKind:1},u=new Map,g=(h,p)=>`${sa(p)}:${h}`,f=(h,p,C,y,B,v,D,T)=>{var re,O;let H=g(h,C),j=u.get(H),$=!!j;!$&&C.name===a.name&&C.reference===a.reference&&(j=c,u.set(H,c));let V=KO(p,C,r,l);if(!j){let F=0;V?F=2:p.linkType==="SOFT"&&C.name.endsWith(Hu)&&(F=1),j={name:h,identName:C.name,reference:C.reference,dependencies:new Set,peerNames:F===1?new Set:p.packagePeers,dependencyKind:F},u.set(H,j)}let W;if(V?W=2:B.linkType==="SOFT"?W=1:W=0,j.hoistPriority=Math.max(j.hoistPriority||0,W),T&&!V){let F=sa({name:y.identName,reference:y.reference}),ue=n.get(F)||new Set;n.set(F,ue),ue.add(j.name)}let _=new Map(p.packageDependencies);if(e.project){let F=e.project.workspacesByCwd.get(K.toPortablePath(p.packageLocation.slice(0,-1)));if(F){let ue=new Set([...Array.from(F.manifest.peerDependencies.values(),pe=>P.stringifyIdent(pe)),...Array.from(F.manifest.peerDependenciesMeta.keys())]);for(let pe of ue)_.has(pe)||(_.set(pe,v.get(pe)||null),j.peerNames.add(pe))}}let A=sa({name:C.name.replace(Hu,""),reference:C.reference}),Ae=s.get(A);if(Ae)for(let F of Ae)_.set(`${F.name}${Hu}`,F.reference);(p!==B||p.linkType!=="SOFT"||!V&&(!e.selfReferencesByCwd||e.selfReferencesByCwd.get(D)))&&y.dependencies.add(j);let ge=C!==a&&p.linkType==="SOFT"&&!C.name.endsWith(Hu)&&!V;if(!$&&!ge){let F=new Map;for(let[ue,pe]of _)if(pe!==null){let ke=r.getLocator(ue,pe),Fe=r.getLocator(ue.replace(Hu,""),pe),Ne=r.getPackageInformation(Fe);if(Ne===null)throw new Error("Assertion failed: Expected the package to have been registered");let oe=KO(Ne,ke,r,l);if(e.validateExternalSoftLinks&&e.project&&oe){Ne.packageDependencies.size>0&&(i=!0);for(let[qe,ne]of Ne.packageDependencies)if(ne!==null){let Y=P.parseLocator(Array.isArray(ne)?`${ne[0]}@${ne[1]}`:`${qe}@${ne}`);if(sa(Y)!==sa(ke)){let he=_.get(qe);if(he){let ie=P.parseLocator(Array.isArray(he)?`${he[0]}@${he[1]}`:`${qe}@${he}`);LAe(ie,Y)||t.push({messageName:71,text:`Cannot link ${P.prettyIdent(e.project.configuration,P.parseIdent(ke.name))} into ${P.prettyLocator(e.project.configuration,P.parseLocator(`${C.name}@${C.reference}`))} dependency ${P.prettyLocator(e.project.configuration,Y)} conflicts with parent dependency ${P.prettyLocator(e.project.configuration,ie)}`})}else{let ie=F.get(qe);if(ie){let de=ie.target,_e=P.parseLocator(Array.isArray(de)?`${de[0]}@${de[1]}`:`${qe}@${de}`);LAe(_e,Y)||t.push({messageName:71,text:`Cannot link ${P.prettyIdent(e.project.configuration,P.parseIdent(ke.name))} into ${P.prettyLocator(e.project.configuration,P.parseLocator(`${C.name}@${C.reference}`))} dependency ${P.prettyLocator(e.project.configuration,Y)} conflicts with dependency ${P.prettyLocator(e.project.configuration,_e)} from sibling portal ${P.prettyIdent(e.project.configuration,P.parseIdent(ie.portal.name))}`})}else F.set(qe,{target:Y.reference,portal:ke})}}}}let le=(re=e.hoistingLimitsByCwd)==null?void 0:re.get(D),Be=oe?D:x.relative(l,K.toPortablePath(Ne.packageLocation))||Oe.dot,fe=(O=e.hoistingLimitsByCwd)==null?void 0:O.get(Be);f(ue,Ne,ke,j,p,_,Be,le==="dependencies"||fe==="dependencies"||fe==="workspaces")}}};return f(a.name,o,a,c,o,o.packageDependencies,Oe.dot,!1),{packageTree:c,hoistingLimits:n,errors:t,preserveSymlinksRequired:i}};function OAe(r,e,t){let i=t.resolveVirtual&&e.reference&&e.reference.startsWith("virtual:")?t.resolveVirtual(r.packageLocation):r.packageLocation;return K.toPortablePath(i||r.packageLocation)}function U8e(r,e,t){let i=e.getLocator(r.name.replace(Hu,""),r.reference),n=e.getPackageInformation(i);if(n===null)throw new Error("Assertion failed: Expected the package to be registered");let s,o;return t.pnpifyFs?(o=K.toPortablePath(n.packageLocation),s="SOFT"):(o=OAe(n,r,e),s=n.linkType),{linkType:s,target:o}}var H8e=(r,e,t)=>{let i=new Map,n=(u,g,f)=>{let{linkType:h,target:p}=U8e(u,r,t);return{locator:sa(u),nodePath:g,target:p,linkType:h,aliases:f}},s=u=>{let[g,f]=u.split("/");return f?{scope:Jr(g),name:Jr(f)}:{scope:null,name:Jr(g)}},o=new Set,a=(u,g,f)=>{if(o.has(u))return;o.add(u);let h=Array.from(u.references).sort().join("#");for(let p of u.dependencies){let C=Array.from(p.references).sort().join("#");if(p.identName===u.identName&&C===h)continue;let y=Array.from(p.references).sort(),B={name:p.identName,reference:y[0]},{name:v,scope:D}=s(p.name),T=D?[D,v]:[v],H=x.join(g,TAe),j=x.join(H,...T),$=`${f}/${B.name}`,V=n(B,f,y.slice(1)),W=!1;if(V.linkType==="SOFT"&&t.project){let A=t.project.workspacesByCwd.get(V.target.slice(0,-1));W=!!(A&&!A.manifest.name)}let _=V.linkType==="SOFT"&&j.startsWith(V.target);if(!p.name.endsWith(Hu)&&!W&&!_){let A=i.get(j);if(A){if(A.dirList)throw new Error(`Assertion failed: ${j} cannot merge dir node with leaf node`);{let O=P.parseLocator(A.locator),F=P.parseLocator(V.locator);if(A.linkType!==V.linkType)throw new Error(`Assertion failed: ${j} cannot merge nodes with different link types ${A.nodePath}/${P.stringifyLocator(O)} and ${f}/${P.stringifyLocator(F)}`);if(O.identHash!==F.identHash)throw new Error(`Assertion failed: ${j} cannot merge nodes with different idents ${A.nodePath}/${P.stringifyLocator(O)} and ${f}/s${P.stringifyLocator(F)}`);V.aliases=[...V.aliases,...A.aliases,P.parseLocator(A.locator).reference]}}i.set(j,V);let Ae=j.split("/"),ge=Ae.indexOf(TAe),re=Ae.length-1;for(;ge>=0&&re>ge;){let O=K.toPortablePath(Ae.slice(0,re).join(x.sep)),F=Jr(Ae[re]),ue=i.get(O);if(!ue)i.set(O,{dirList:new Set([F])});else if(ue.dirList){if(ue.dirList.has(F))break;ue.dirList.add(F)}re--}}a(p,V.linkType==="SOFT"?V.target:j,$)}},l=n({name:e.name,reference:Array.from(e.references)[0]},"",[]),c=l.target;return i.set(c,l),a(e,c,""),i};var sM={};ut(sM,{PnpInstaller:()=>Yu,PnpLinker:()=>wl,default:()=>mze,getPnpPath:()=>Bl,jsInstallUtils:()=>Co,pnpUtils:()=>hE,quotePathIfNeeded:()=>Sle});var ble=Pe(Xr()),Qle=J("url");var MAe={["DEFAULT"]:{collapsed:!1,next:{["*"]:"DEFAULT"}},["TOP_LEVEL"]:{collapsed:!1,next:{fallbackExclusionList:"FALLBACK_EXCLUSION_LIST",packageRegistryData:"PACKAGE_REGISTRY_DATA",["*"]:"DEFAULT"}},["FALLBACK_EXCLUSION_LIST"]:{collapsed:!1,next:{["*"]:"FALLBACK_EXCLUSION_ENTRIES"}},["FALLBACK_EXCLUSION_ENTRIES"]:{collapsed:!0,next:{["*"]:"FALLBACK_EXCLUSION_DATA"}},["FALLBACK_EXCLUSION_DATA"]:{collapsed:!0,next:{["*"]:"DEFAULT"}},["PACKAGE_REGISTRY_DATA"]:{collapsed:!1,next:{["*"]:"PACKAGE_REGISTRY_ENTRIES"}},["PACKAGE_REGISTRY_ENTRIES"]:{collapsed:!0,next:{["*"]:"PACKAGE_STORE_DATA"}},["PACKAGE_STORE_DATA"]:{collapsed:!1,next:{["*"]:"PACKAGE_STORE_ENTRIES"}},["PACKAGE_STORE_ENTRIES"]:{collapsed:!0,next:{["*"]:"PACKAGE_INFORMATION_DATA"}},["PACKAGE_INFORMATION_DATA"]:{collapsed:!1,next:{packageDependencies:"PACKAGE_DEPENDENCIES",["*"]:"DEFAULT"}},["PACKAGE_DEPENDENCIES"]:{collapsed:!1,next:{["*"]:"PACKAGE_DEPENDENCY"}},["PACKAGE_DEPENDENCY"]:{collapsed:!0,next:{["*"]:"DEFAULT"}}};function G8e(r,e,t){let i="";i+="[";for(let n=0,s=r.length;n<s;++n)i+=_b(String(n),r[n],e,t).replace(/^ +/g,""),n+1<s&&(i+=", ");return i+="]",i}function Y8e(r,e,t){let i=`${t}  `,n="";n+=t,n+=`[
-`;for(let s=0,o=r.length;s<o;++s)n+=i+_b(String(s),r[s],e,i).replace(/^ +/,""),s+1<o&&(n+=","),n+=`
-`;return n+=t,n+="]",n}function j8e(r,e,t){let i=Object.keys(r),n="";n+="{";for(let s=0,o=i.length,a=0;s<o;++s){let l=i[s],c=r[l];typeof c>"u"||(a!==0&&(n+=", "),n+=JSON.stringify(l),n+=": ",n+=_b(l,c,e,t).replace(/^ +/g,""),a+=1)}return n+="}",n}function q8e(r,e,t){let i=Object.keys(r),n=`${t}  `,s="";s+=t,s+=`{
-`;let o=0;for(let a=0,l=i.length;a<l;++a){let c=i[a],u=r[c];typeof u>"u"||(o!==0&&(s+=",",s+=`
-`),s+=n,s+=JSON.stringify(c),s+=": ",s+=_b(c,u,e,n).replace(/^ +/g,""),o+=1)}return o!==0&&(s+=`
-`),s+=t,s+="}",s}function _b(r,e,t,i){let{next:n}=MAe[t],s=n[r]||n["*"];return KAe(e,s,i)}function KAe(r,e,t){let{collapsed:i}=MAe[e];return Array.isArray(r)?i?G8e(r,e,t):Y8e(r,e,t):typeof r=="object"&&r!==null?i?j8e(r,e,t):q8e(r,e,t):JSON.stringify(r)}function UAe(r){return KAe(r,"TOP_LEVEL","")}function iE(r,e){let t=Array.from(r);Array.isArray(e)||(e=[e]);let i=[];for(let s of e)i.push(t.map(o=>s(o)));let n=t.map((s,o)=>o);return n.sort((s,o)=>{for(let a of i){let l=a[s]<a[o]?-1:a[s]>a[o]?1:0;if(l!==0)return l}return 0}),n.map(s=>t[s])}function J8e(r){let e=new Map,t=iE(r.fallbackExclusionList||[],[({name:i,reference:n})=>i,({name:i,reference:n})=>n]);for(let{name:i,reference:n}of t){let s=e.get(i);typeof s>"u"&&e.set(i,s=new Set),s.add(n)}return Array.from(e).map(([i,n])=>[i,Array.from(n)])}function W8e(r){return iE(r.fallbackPool||[],([e])=>e)}function z8e(r){let e=[];for(let[t,i]of iE(r.packageRegistry,([n])=>n===null?"0":`1${n}`)){let n=[];e.push([t,n]);for(let[s,{packageLocation:o,packageDependencies:a,packagePeers:l,linkType:c,discardFromLookup:u}]of iE(i,([g])=>g===null?"0":`1${g}`)){let g=[];t!==null&&s!==null&&!a.has(t)&&g.push([t,s]);for(let[p,C]of iE(a.entries(),([y])=>y))g.push([p,C]);let f=l&&l.size>0?Array.from(l):void 0,h=u||void 0;n.push([s,{packageLocation:o,packageDependencies:g,packagePeers:f,linkType:c,discardFromLookup:h}])}}return e}function nE(r){return{__info:["This file is automatically generated. Do not touch it, or risk","your modifications being lost. We also recommend you not to read","it either without using the @yarnpkg/pnp package, as the data layout","is entirely unspecified and WILL change from a version to another."],dependencyTreeRoots:r.dependencyTreeRoots,enableTopLevelFallback:r.enableTopLevelFallback||!1,ignorePatternData:r.ignorePattern||null,fallbackExclusionList:J8e(r),fallbackPool:W8e(r),packageRegistryData:z8e(r)}}var YAe=Pe(GAe());function jAe(r,e){return[r?`${r}
-`:"",`/* eslint-disable */
-`,`"use strict";
-`,`
-`,`function $$SETUP_STATE(hydrateRuntimeState, basePath) {
-`,e.replace(/^/gm,"  "),`}
-`,`
-`,(0,YAe.default)()].join("")}function V8e(r){return JSON.stringify(r,null,2)}function X8e(r){return`'${r.replace(/\\/g,"\\\\").replace(/'/g,"\\'").replace(/\n/g,`\\
-`)}'`}function Z8e(r){return[`return hydrateRuntimeState(JSON.parse(${X8e(UAe(r))}), {basePath: basePath || __dirname});
-`].join("")}function _8e(r){return[`var path = require('path');
-`,`var dataLocation = path.resolve(__dirname, ${JSON.stringify(r)});
-`,`return hydrateRuntimeState(require(dataLocation), {basePath: basePath || path.dirname(dataLocation)});
-`].join("")}function qAe(r){let e=nE(r),t=Z8e(e);return jAe(r.shebang,t)}function JAe(r){let e=nE(r),t=_8e(r.dataLocation),i=jAe(r.shebang,t);return{dataFile:V8e(e),loaderFile:i}}var dle=J("fs");var Cle=J("util");function GO(r,{basePath:e}){let t=K.toPortablePath(e),i=x.resolve(t),n=r.ignorePatternData!==null?new RegExp(r.ignorePatternData):null,s=new Map,o=new Map(r.packageRegistryData.map(([g,f])=>[g,new Map(f.map(([h,p])=>{var D;if(g===null!=(h===null))throw new Error("Assertion failed: The name and reference should be null, or neither should");let C=(D=p.discardFromLookup)!=null?D:!1,y={name:g,reference:h},B=s.get(p.packageLocation);B?(B.discardFromLookup=B.discardFromLookup&&C,C||(B.locator=y)):s.set(p.packageLocation,{locator:y,discardFromLookup:C});let v=null;return[h,{packageDependencies:new Map(p.packageDependencies),packagePeers:new Set(p.packagePeers),linkType:p.linkType,discardFromLookup:C,get packageLocation(){return v||(v=x.join(i,p.packageLocation))}}]}))])),a=new Map(r.fallbackExclusionList.map(([g,f])=>[g,new Set(f)])),l=new Map(r.fallbackPool),c=r.dependencyTreeRoots,u=r.enableTopLevelFallback;return{basePath:t,dependencyTreeRoots:c,enableTopLevelFallback:u,fallbackExclusionList:a,fallbackPool:l,ignorePattern:n,packageLocatorsByLocations:s,packageRegistry:o}}var gE=J("module"),uA=J("url"),_O=J("util");var qi=J("url");var XAe=Pe(J("assert"));var YO=Array.isArray,sE=JSON.stringify,oE=Object.getOwnPropertyNames,Gu=(r,e)=>Object.prototype.hasOwnProperty.call(r,e),jO=(r,e)=>RegExp.prototype.exec.call(r,e),qO=(r,...e)=>RegExp.prototype[Symbol.replace].apply(r,e),Il=(r,...e)=>String.prototype.endsWith.apply(r,e),JO=(r,...e)=>String.prototype.includes.apply(r,e),WO=(r,...e)=>String.prototype.lastIndexOf.apply(r,e),aE=(r,...e)=>String.prototype.indexOf.apply(r,e),WAe=(r,...e)=>String.prototype.replace.apply(r,e),yl=(r,...e)=>String.prototype.slice.apply(r,e),oa=(r,...e)=>String.prototype.startsWith.apply(r,e),zAe=Map,VAe=JSON.parse;function AE(r,e,t){return class extends t{constructor(...i){super(e(...i)),this.code=r,this.name=`${t.name} [${r}]`}}}var ZAe=AE("ERR_PACKAGE_IMPORT_NOT_DEFINED",(r,e,t)=>`Package import specifier "${r}" is not defined${e?` in package ${e}package.json`:""} imported from ${t}`,TypeError),zO=AE("ERR_INVALID_MODULE_SPECIFIER",(r,e,t=void 0)=>`Invalid module "${r}" ${e}${t?` imported from ${t}`:""}`,TypeError),_Ae=AE("ERR_INVALID_PACKAGE_TARGET",(r,e,t,i=!1,n=void 0)=>{let s=typeof t=="string"&&!i&&t.length&&!oa(t,"./");return e==="."?((0,XAe.default)(i===!1),`Invalid "exports" main target ${sE(t)} defined in the package config ${r}package.json${n?` imported from ${n}`:""}${s?'; targets must start with "./"':""}`):`Invalid "${i?"imports":"exports"}" target ${sE(t)} defined for '${e}' in the package config ${r}package.json${n?` imported from ${n}`:""}${s?'; targets must start with "./"':""}`},Error),lE=AE("ERR_INVALID_PACKAGE_CONFIG",(r,e,t)=>`Invalid package config ${r}${e?` while importing ${e}`:""}${t?`. ${t}`:""}`,Error),$Ae=AE("ERR_PACKAGE_PATH_NOT_EXPORTED",(r,e,t=void 0)=>e==="."?`No "exports" main defined in ${r}package.json${t?` imported from ${t}`:""}`:`Package subpath '${e}' is not defined by "exports" in ${r}package.json${t?` imported from ${t}`:""}`,Error);var eQ=J("url");function ele(r,e){let t=Object.create(null);for(let i=0;i<e.length;i++){let n=e[i];Gu(r,n)&&(t[n]=r[n])}return t}var $b=new zAe;function $8e(r,e,t,i){let n=$b.get(r);if(n!==void 0)return n;let s=i(r);if(s===void 0){let h={pjsonPath:r,exists:!1,main:void 0,name:void 0,type:"none",exports:void 0,imports:void 0};return $b.set(r,h),h}let o;try{o=VAe(s)}catch(h){throw new lE(r,(t?`"${e}" from `:"")+(0,eQ.fileURLToPath)(t||e),h.message)}let{imports:a,main:l,name:c,type:u}=ele(o,["imports","main","name","type"]),g=Gu(o,"exports")?o.exports:void 0;(typeof a!="object"||a===null)&&(a=void 0),typeof l!="string"&&(l=void 0),typeof c!="string"&&(c=void 0),u!=="module"&&u!=="commonjs"&&(u="none");let f={pjsonPath:r,exists:!0,main:l,name:c,type:u,exports:g,imports:a};return $b.set(r,f),f}function tle(r,e){let t=new URL("./package.json",r);for(;;){let s=t.pathname;if(Il(s,"node_modules/package.json"))break;let o=$8e((0,eQ.fileURLToPath)(t),r,void 0,e);if(o.exists)return o;let a=t;if(t=new URL("../package.json",t),t.pathname===a.pathname)break}let i=(0,eQ.fileURLToPath)(t),n={pjsonPath:i,exists:!1,main:void 0,name:void 0,type:"none",exports:void 0,imports:void 0};return $b.set(i,n),n}function eze(r,e,t){throw new ZAe(r,e&&(0,qi.fileURLToPath)(new URL(".",e)),(0,qi.fileURLToPath)(t))}function tze(r,e,t,i){let n=`request is not a valid subpath for the "${t?"imports":"exports"}" resolution of ${(0,qi.fileURLToPath)(e)}`;throw new zO(r,n,i&&(0,qi.fileURLToPath)(i))}function cE(r,e,t,i,n){throw typeof e=="object"&&e!==null?e=sE(e,null,""):e=`${e}`,new _Ae((0,qi.fileURLToPath)(new URL(".",t)),r,e,i,n&&(0,qi.fileURLToPath)(n))}var rle=/(^|\\|\/)((\.|%2e)(\.|%2e)?|(n|%6e|%4e)(o|%6f|%4f)(d|%64|%44)(e|%65|%45)(_|%5f)(m|%6d|%4d)(o|%6f|%4f)(d|%64|%44)(u|%75|%55)(l|%6c|%4c)(e|%65|%45)(s|%73|%53))(\\|\/|$)/i,ile=/\*/g;function rze(r,e,t,i,n,s,o,a){if(e!==""&&!s&&r[r.length-1]!=="/"&&cE(t,r,i,o,n),!oa(r,"./")){if(o&&!oa(r,"../")&&!oa(r,"/")){let g=!1;try{new URL(r),g=!0}catch{}if(!g)return s?qO(ile,r,()=>e):r+e}cE(t,r,i,o,n)}jO(rle,yl(r,2))!==null&&cE(t,r,i,o,n);let l=new URL(r,i),c=l.pathname,u=new URL(".",i).pathname;if(oa(c,u)||cE(t,r,i,o,n),e==="")return l;if(jO(rle,e)!==null){let g=s?WAe(t,"*",()=>e):t+e;tze(g,i,o,n)}return s?new URL(qO(ile,l.href,()=>e)):new URL(e,l)}function ize(r){let e=+r;return`${e}`!==r?!1:e>=0&&e<4294967295}function ip(r,e,t,i,n,s,o,a){if(typeof e=="string")return rze(e,t,i,r,n,s,o,a);if(YO(e)){if(e.length===0)return null;let l;for(let c=0;c<e.length;c++){let u=e[c],g;try{g=ip(r,u,t,i,n,s,o,a)}catch(f){if(l=f,f.code==="ERR_INVALID_PACKAGE_TARGET")continue;throw f}if(g!==void 0){if(g===null){l=null;continue}return g}}if(l==null)return l;throw l}else if(typeof e=="object"&&e!==null){let l=oE(e);for(let c=0;c<l.length;c++){let u=l[c];if(ize(u))throw new lE((0,qi.fileURLToPath)(r),n,'"exports" cannot contain numeric property keys.')}for(let c=0;c<l.length;c++){let u=l[c];if(u==="default"||a.has(u)){let g=e[u],f=ip(r,g,t,i,n,s,o,a);if(f===void 0)continue;return f}}return}else if(e===null)return null;cE(i,e,r,o,n)}function sle(r,e){let t=aE(r,"*"),i=aE(e,"*"),n=t===-1?r.length:t+1,s=i===-1?e.length:i+1;return n>s?-1:s>n||t===-1?1:i===-1||r.length>e.length?-1:e.length>r.length?1:0}function nze(r,e,t){if(typeof r=="string"||YO(r))return!0;if(typeof r!="object"||r===null)return!1;let i=oE(r),n=!1,s=0;for(let o=0;o<i.length;o++){let a=i[o],l=a===""||a[0]!==".";if(s++===0)n=l;else if(n!==l)throw new lE((0,qi.fileURLToPath)(e),t,`"exports" cannot contain some keys starting with '.' and some not. The exports object must either be an object of package subpath keys or an object of main entry condition name keys only.`)}return n}function VO(r,e,t){throw new $Ae((0,qi.fileURLToPath)(new URL(".",e)),r,t&&(0,qi.fileURLToPath)(t))}var nle=new Set;function sze(r,e,t){let i=(0,qi.fileURLToPath)(e);nle.has(i+"|"+r)||(nle.add(i+"|"+r),process.emitWarning(`Use of deprecated trailing slash pattern mapping "${r}" in the "exports" field module resolution of the package at ${i}${t?` imported from ${(0,qi.fileURLToPath)(t)}`:""}. Mapping specifiers ending in "/" is no longer supported.`,"DeprecationWarning","DEP0155"))}function ole({packageJSONUrl:r,packageSubpath:e,exports:t,base:i,conditions:n}){if(nze(t,r,i)&&(t={".":t}),Gu(t,e)&&!JO(e,"*")&&!Il(e,"/")){let l=t[e],c=ip(r,l,"",e,i,!1,!1,n);return c==null&&VO(e,r,i),c}let s="",o,a=oE(t);for(let l=0;l<a.length;l++){let c=a[l],u=aE(c,"*");if(u!==-1&&oa(e,yl(c,0,u))){Il(e,"/")&&sze(e,r,i);let g=yl(c,u+1);e.length>=c.length&&Il(e,g)&&sle(s,c)===1&&WO(c,"*")===u&&(s=c,o=yl(e,u,e.length-g.length))}}if(s){let l=t[s],c=ip(r,l,o,s,i,!0,!1,n);return c==null&&VO(e,r,i),c}VO(e,r,i)}function ale({name:r,base:e,conditions:t,readFileSyncFn:i}){if(r==="#"||oa(r,"#/")||Il(r,"/")){let o="is not a valid internal imports specifier name";throw new zO(r,o,(0,qi.fileURLToPath)(e))}let n,s=tle(e,i);if(s.exists){n=(0,qi.pathToFileURL)(s.pjsonPath);let o=s.imports;if(o)if(Gu(o,r)&&!JO(r,"*")){let a=ip(n,o[r],"",r,e,!1,!0,t);if(a!=null)return a}else{let a="",l,c=oE(o);for(let u=0;u<c.length;u++){let g=c[u],f=aE(g,"*");if(f!==-1&&oa(r,yl(g,0,f))){let h=yl(g,f+1);r.length>=g.length&&Il(r,h)&&sle(a,g)===1&&WO(g,"*")===f&&(a=g,l=yl(r,f,r.length-h.length))}}if(a){let u=o[a],g=ip(n,u,l,a,e,!0,!0,t);if(g!=null)return g}}}eze(r,n,e)}var oze=new Set(["BUILTIN_NODE_RESOLUTION_FAILED","MISSING_DEPENDENCY","MISSING_PEER_DEPENDENCY","QUALIFIED_PATH_RESOLUTION_FAILED","UNDECLARED_DEPENDENCY"]);function ri(r,e,t={},i){i!=null||(i=oze.has(r)?"MODULE_NOT_FOUND":r);let n={configurable:!0,writable:!0,enumerable:!1};return Object.defineProperties(new Error(e),{code:{...n,value:i},pnpCode:{...n,value:r},data:{...n,value:t}})}function po(r){return K.normalize(K.fromPortablePath(r))}var ule=Pe(lle());function gle(r){return aze(),ZO[r]}var ZO;function aze(){ZO||(ZO={"--conditions":[],...cle(Aze()),...cle(process.execArgv)})}function cle(r){return(0,ule.default)({"--conditions":[String],"-C":"--conditions"},{argv:r,permissive:!0})}function Aze(){let r=[],e=lze(process.env.NODE_OPTIONS||"",r);return r.length,e}function lze(r,e){let t=[],i=!1,n=!0;for(let s=0;s<r.length;++s){let o=r[s];if(o==="\\"&&i){if(s+1===r.length)return e.push(`invalid value for NODE_OPTIONS (invalid escape)
-`),t;o=r[++s]}else if(o===" "&&!i){n=!0;continue}else if(o==='"'){i=!i;continue}n?(t.push(o),n=!1):t[t.length-1]+=o}return i&&e.push(`invalid value for NODE_OPTIONS (unterminated string)
-`),t}var hle=J("module");var[Ji,aa]=process.versions.node.split(".").map(r=>parseInt(r,10)),aBt=Ji>16||Ji===16&&aa>=12,ABt=Ji>17||Ji===17&&aa>=5||Ji===16&&aa>=15,lBt=Ji>17||Ji===17&&aa>=1||Ji===16&&aa>14,fle=Ji>19||Ji===19&&aa>=2||Ji===18&&aa>=13,cBt=Ji>19||Ji===19&&aa>=3,uBt=Ji>18||Ji===18&&aa>=1||Ji===16&&aa>=17;var cze=new Set(hle.Module.builtinModules||Object.keys(process.binding("natives"))),tQ=r=>r.startsWith("node:")||cze.has(r);function ple(r){if(process.env.WATCH_REPORT_DEPENDENCIES&&process.send)if(r=r.map(e=>K.fromPortablePath(Br.resolveVirtual(K.toPortablePath(e)))),fle)process.send({"watch:require":r});else for(let e of r)process.send({"watch:require":e})}function $O(r,e){let t=Number(process.env.PNP_ALWAYS_WARN_ON_FALLBACK)>0,i=Number(process.env.PNP_DEBUG_LEVEL),n=/^(?![a-zA-Z]:[\\/]|\\\\|\.{0,2}(?:\/|$))((?:node:)?(?:@[^/]+\/)?[^/]+)\/*(.*|)$/,s=/^(\/|\.{1,2}(\/|$))/,o=/\/$/,a=/^\.{0,2}\//,l={name:null,reference:null},c=[],u=new Set;if(r.enableTopLevelFallback===!0&&c.push(l),e.compatibilityMode!==!1)for(let oe of["react-scripts","gatsby"]){let le=r.packageRegistry.get(oe);if(le)for(let Be of le.keys()){if(Be===null)throw new Error("Assertion failed: This reference shouldn't be null");c.push({name:oe,reference:Be})}}let{ignorePattern:g,packageRegistry:f,packageLocatorsByLocations:h}=r;function p(oe,le){return{fn:oe,args:le,error:null,result:null}}function C(oe){var qe,ne,Y,he,ie,de;let le=(Y=(ne=(qe=process.stderr)==null?void 0:qe.hasColors)==null?void 0:ne.call(qe))!=null?Y:process.stdout.isTTY,Be=(_e,Pt)=>`\x1B[${_e}m${Pt}\x1B[0m`,fe=oe.error;console.error(fe?Be("31;1",`\u2716 ${(he=oe.error)==null?void 0:he.message.replace(/\n.*/s,"")}`):Be("33;1","\u203C Resolution")),oe.args.length>0&&console.error();for(let _e of oe.args)console.error(`  ${Be("37;1","In \u2190")} ${(0,_O.inspect)(_e,{colors:le,compact:!0})}`);oe.result&&(console.error(),console.error(`  ${Be("37;1","Out \u2192")} ${(0,_O.inspect)(oe.result,{colors:le,compact:!0})}`));let ae=(de=(ie=new Error().stack.match(/(?<=^ +)at.*/gm))==null?void 0:ie.slice(2))!=null?de:[];if(ae.length>0){console.error();for(let _e of ae)console.error(`  ${Be("38;5;244",_e)}`)}console.error()}function y(oe,le){if(e.allowDebug===!1)return le;if(Number.isFinite(i)){if(i>=2)return(...Be)=>{let fe=p(oe,Be);try{return fe.result=le(...Be)}catch(ae){throw fe.error=ae}finally{C(fe)}};if(i>=1)return(...Be)=>{try{return le(...Be)}catch(fe){let ae=p(oe,Be);throw ae.error=fe,C(ae),fe}}}return le}function B(oe){let le=A(oe);if(!le)throw ri("INTERNAL","Couldn't find a matching entry in the dependency tree for the specified parent (this is probably an internal error)");return le}function v(oe){if(oe.name===null)return!0;for(let le of r.dependencyTreeRoots)if(le.name===oe.name&&le.reference===oe.reference)return!0;return!1}let D=new Set(["node","require",...gle("--conditions")]);function T(oe,le=D,Be){let fe=re(x.join(oe,"internal.js"),{resolveIgnored:!0,includeDiscardFromLookup:!0});if(fe===null)throw ri("INTERNAL",`The locator that owns the "${oe}" path can't be found inside the dependency tree (this is probably an internal error)`);let{packageLocation:ae}=B(fe),qe=x.join(ae,xt.manifest);if(!e.fakeFs.existsSync(qe))return null;let ne=JSON.parse(e.fakeFs.readFileSync(qe,"utf8"));if(ne.exports==null)return null;let Y=x.contains(ae,oe);if(Y===null)throw ri("INTERNAL","unqualifiedPath doesn't contain the packageLocation (this is probably an internal error)");Y!=="."&&!a.test(Y)&&(Y=`./${Y}`);try{let he=ole({packageJSONUrl:(0,uA.pathToFileURL)(K.fromPortablePath(qe)),packageSubpath:Y,exports:ne.exports,base:Be?(0,uA.pathToFileURL)(K.fromPortablePath(Be)):null,conditions:le});return K.toPortablePath((0,uA.fileURLToPath)(he))}catch(he){throw ri("EXPORTS_RESOLUTION_FAILED",he.message,{unqualifiedPath:po(oe),locator:fe,pkgJson:ne,subpath:po(Y),conditions:le},he.code)}}function H(oe,le,{extensions:Be}){let fe;try{le.push(oe),fe=e.fakeFs.statSync(oe)}catch{}if(fe&&!fe.isDirectory())return e.fakeFs.realpathSync(oe);if(fe&&fe.isDirectory()){let ae;try{ae=JSON.parse(e.fakeFs.readFileSync(x.join(oe,xt.manifest),"utf8"))}catch{}let qe;if(ae&&ae.main&&(qe=x.resolve(oe,ae.main)),qe&&qe!==oe){let ne=H(qe,le,{extensions:Be});if(ne!==null)return ne}}for(let ae=0,qe=Be.length;ae<qe;ae++){let ne=`${oe}${Be[ae]}`;if(le.push(ne),e.fakeFs.existsSync(ne))return ne}if(fe&&fe.isDirectory())for(let ae=0,qe=Be.length;ae<qe;ae++){let ne=x.format({dir:oe,name:"index",ext:Be[ae]});if(le.push(ne),e.fakeFs.existsSync(ne))return ne}return null}function j(oe){let le=new gE.Module(oe,null);return le.filename=oe,le.paths=gE.Module._nodeModulePaths(oe),le}function $(oe,le){return le.endsWith("/")&&(le=x.join(le,"internal.js")),gE.Module._resolveFilename(K.fromPortablePath(oe),j(K.fromPortablePath(le)),!1,{plugnplay:!1})}function V(oe){if(g===null)return!1;let le=x.contains(r.basePath,oe);return le===null?!1:!!g.test(le.replace(/\/$/,""))}let W={std:3,resolveVirtual:1,getAllLocators:1},_=l;function A({name:oe,reference:le}){let Be=f.get(oe);if(!Be)return null;let fe=Be.get(le);return fe||null}function Ae({name:oe,reference:le}){let Be=[];for(let[fe,ae]of f)if(fe!==null)for(let[qe,ne]of ae)qe===null||ne.packageDependencies.get(oe)!==le||fe===oe&&qe===le||Be.push({name:fe,reference:qe});return Be}function ge(oe,le){let Be=new Map,fe=new Set,ae=ne=>{let Y=JSON.stringify(ne.name);if(fe.has(Y))return;fe.add(Y);let he=Ae(ne);for(let ie of he)if(B(ie).packagePeers.has(oe))ae(ie);else{let _e=Be.get(ie.name);typeof _e>"u"&&Be.set(ie.name,_e=new Set),_e.add(ie.reference)}};ae(le);let qe=[];for(let ne of[...Be.keys()].sort())for(let Y of[...Be.get(ne)].sort())qe.push({name:ne,reference:Y});return qe}function re(oe,{resolveIgnored:le=!1,includeDiscardFromLookup:Be=!1}={}){if(V(oe)&&!le)return null;let fe=x.relative(r.basePath,oe);fe.match(s)||(fe=`./${fe}`),fe.endsWith("/")||(fe=`${fe}/`);do{let ae=h.get(fe);if(typeof ae>"u"||ae.discardFromLookup&&!Be){fe=fe.substring(0,fe.lastIndexOf("/",fe.length-2)+1);continue}return ae.locator}while(fe!=="");return null}function O(oe){try{return e.fakeFs.readFileSync(K.toPortablePath(oe),"utf8")}catch(le){if(le.code==="ENOENT")return;throw le}}function F(oe,le,{considerBuiltins:Be=!0}={}){if(oe.startsWith("#"))throw new Error("resolveToUnqualified can not handle private import mappings");if(oe==="pnpapi")return K.toPortablePath(e.pnpapiResolution);if(Be&&tQ(oe))return null;let fe=po(oe),ae=le&&po(le);if(le&&V(le)&&(!x.isAbsolute(oe)||re(oe)===null)){let Y=$(oe,le);if(Y===!1)throw ri("BUILTIN_NODE_RESOLUTION_FAILED",`The builtin node resolution algorithm was unable to resolve the requested module (it didn't go through the pnp resolver because the issuer was explicitely ignored by the regexp)
-
-Require request: "${fe}"
-Required by: ${ae}
-`,{request:fe,issuer:ae});return K.toPortablePath(Y)}let qe,ne=oe.match(n);if(ne){if(!le)throw ri("API_ERROR","The resolveToUnqualified function must be called with a valid issuer when the path isn't a builtin nor absolute",{request:fe,issuer:ae});let[,Y,he]=ne,ie=re(le);if(!ie){let hr=$(oe,le);if(hr===!1)throw ri("BUILTIN_NODE_RESOLUTION_FAILED",`The builtin node resolution algorithm was unable to resolve the requested module (it didn't go through the pnp resolver because the issuer doesn't seem to be part of the Yarn-managed dependency tree).
-
-Require path: "${fe}"
-Required by: ${ae}
-`,{request:fe,issuer:ae});return K.toPortablePath(hr)}let _e=B(ie).packageDependencies.get(Y),Pt=null;if(_e==null&&ie.name!==null){let hr=r.fallbackExclusionList.get(ie.name);if(!hr||!hr.has(ie.reference)){for(let ni=0,Ks=c.length;ni<Ks;++ni){let Ii=B(c[ni]).packageDependencies.get(Y);if(Ii!=null){t?Pt=Ii:_e=Ii;break}}if(r.enableTopLevelFallback&&_e==null&&Pt===null){let ni=r.fallbackPool.get(Y);ni!=null&&(Pt=ni)}}}let It=null;if(_e===null)if(v(ie))It=ri("MISSING_PEER_DEPENDENCY",`Your application tried to access ${Y} (a peer dependency); this isn't allowed as there is no ancestor to satisfy the requirement. Use a devDependency if needed.
-
-Required package: ${Y}${Y!==fe?` (via "${fe}")`:""}
-Required by: ${ae}
-`,{request:fe,issuer:ae,dependencyName:Y});else{let hr=ge(Y,ie);hr.every(fi=>v(fi))?It=ri("MISSING_PEER_DEPENDENCY",`${ie.name} tried to access ${Y} (a peer dependency) but it isn't provided by your application; this makes the require call ambiguous and unsound.
-
-Required package: ${Y}${Y!==fe?` (via "${fe}")`:""}
-Required by: ${ie.name}@${ie.reference} (via ${ae})
-${hr.map(fi=>`Ancestor breaking the chain: ${fi.name}@${fi.reference}
-`).join("")}
-`,{request:fe,issuer:ae,issuerLocator:Object.assign({},ie),dependencyName:Y,brokenAncestors:hr}):It=ri("MISSING_PEER_DEPENDENCY",`${ie.name} tried to access ${Y} (a peer dependency) but it isn't provided by its ancestors; this makes the require call ambiguous and unsound.
-
-Required package: ${Y}${Y!==fe?` (via "${fe}")`:""}
-Required by: ${ie.name}@${ie.reference} (via ${ae})
-
-${hr.map(fi=>`Ancestor breaking the chain: ${fi.name}@${fi.reference}
-`).join("")}
-`,{request:fe,issuer:ae,issuerLocator:Object.assign({},ie),dependencyName:Y,brokenAncestors:hr})}else _e===void 0&&(!Be&&tQ(oe)?v(ie)?It=ri("UNDECLARED_DEPENDENCY",`Your application tried to access ${Y}. While this module is usually interpreted as a Node builtin, your resolver is running inside a non-Node resolution context where such builtins are ignored. Since ${Y} isn't otherwise declared in your dependencies, this makes the require call ambiguous and unsound.
-
-Required package: ${Y}${Y!==fe?` (via "${fe}")`:""}
-Required by: ${ae}
-`,{request:fe,issuer:ae,dependencyName:Y}):It=ri("UNDECLARED_DEPENDENCY",`${ie.name} tried to access ${Y}. While this module is usually interpreted as a Node builtin, your resolver is running inside a non-Node resolution context where such builtins are ignored. Since ${Y} isn't otherwise declared in ${ie.name}'s dependencies, this makes the require call ambiguous and unsound.
-
-Required package: ${Y}${Y!==fe?` (via "${fe}")`:""}
-Required by: ${ae}
-`,{request:fe,issuer:ae,issuerLocator:Object.assign({},ie),dependencyName:Y}):v(ie)?It=ri("UNDECLARED_DEPENDENCY",`Your application tried to access ${Y}, but it isn't declared in your dependencies; this makes the require call ambiguous and unsound.
-
-Required package: ${Y}${Y!==fe?` (via "${fe}")`:""}
-Required by: ${ae}
-`,{request:fe,issuer:ae,dependencyName:Y}):It=ri("UNDECLARED_DEPENDENCY",`${ie.name} tried to access ${Y}, but it isn't declared in its dependencies; this makes the require call ambiguous and unsound.
-
-Required package: ${Y}${Y!==fe?` (via "${fe}")`:""}
-Required by: ${ie.name}@${ie.reference} (via ${ae})
-`,{request:fe,issuer:ae,issuerLocator:Object.assign({},ie),dependencyName:Y}));if(_e==null){if(Pt===null||It===null)throw It||new Error("Assertion failed: Expected an error to have been set");_e=Pt;let hr=It.message.replace(/\n.*/g,"");It.message=hr,!u.has(hr)&&i!==0&&(u.add(hr),process.emitWarning(It))}let Or=Array.isArray(_e)?{name:_e[0],reference:_e[1]}:{name:Y,reference:_e},ii=B(Or);if(!ii.packageLocation)throw ri("MISSING_DEPENDENCY",`A dependency seems valid but didn't get installed for some reason. This might be caused by a partial install, such as dev vs prod.
-
-Required package: ${Or.name}@${Or.reference}${Or.name!==fe?` (via "${fe}")`:""}
-Required by: ${ie.name}@${ie.reference} (via ${ae})
-`,{request:fe,issuer:ae,dependencyLocator:Object.assign({},Or)});let gi=ii.packageLocation;he?qe=x.join(gi,he):qe=gi}else if(x.isAbsolute(oe))qe=x.normalize(oe);else{if(!le)throw ri("API_ERROR","The resolveToUnqualified function must be called with a valid issuer when the path isn't a builtin nor absolute",{request:fe,issuer:ae});let Y=x.resolve(le);le.match(o)?qe=x.normalize(x.join(Y,oe)):qe=x.normalize(x.join(x.dirname(Y),oe))}return x.normalize(qe)}function ue(oe,le,Be=D,fe){if(s.test(oe))return le;let ae=T(le,Be,fe);return ae?x.normalize(ae):le}function pe(oe,{extensions:le=Object.keys(gE.Module._extensions)}={}){var ae,qe;let Be=[],fe=H(oe,Be,{extensions:le});if(fe)return x.normalize(fe);{ple(Be.map(he=>K.fromPortablePath(he)));let ne=po(oe),Y=re(oe);if(Y){let{packageLocation:he}=B(Y),ie=!0;try{e.fakeFs.accessSync(he)}catch(de){if((de==null?void 0:de.code)==="ENOENT")ie=!1;else{let _e=((qe=(ae=de==null?void 0:de.message)!=null?ae:de)!=null?qe:"empty exception thrown").replace(/^[A-Z]/,Pt=>Pt.toLowerCase());throw ri("QUALIFIED_PATH_RESOLUTION_FAILED",`Required package exists but could not be accessed (${_e}).
-
-Missing package: ${Y.name}@${Y.reference}
-Expected package location: ${po(he)}
-`,{unqualifiedPath:ne,extensions:le})}}if(!ie){let de=he.includes("/unplugged/")?"Required unplugged package missing from disk. This may happen when switching branches without running installs (unplugged packages must be fully materialized on disk to work).":"Required package missing from disk. If you keep your packages inside your repository then restarting the Node process may be enough. Otherwise, try to run an install first.";throw ri("QUALIFIED_PATH_RESOLUTION_FAILED",`${de}
-
-Missing package: ${Y.name}@${Y.reference}
-Expected package location: ${po(he)}
-`,{unqualifiedPath:ne,extensions:le})}}throw ri("QUALIFIED_PATH_RESOLUTION_FAILED",`Qualified path resolution failed: we looked for the following paths, but none could be accessed.
-
-Source path: ${ne}
-${Be.map(he=>`Not found: ${po(he)}
-`).join("")}`,{unqualifiedPath:ne,extensions:le})}}function ke(oe,le,Be){var ae;if(!le)throw new Error("Assertion failed: An issuer is required to resolve private import mappings");let fe=ale({name:oe,base:(0,uA.pathToFileURL)(K.fromPortablePath(le)),conditions:(ae=Be.conditions)!=null?ae:D,readFileSyncFn:O});if(fe instanceof uA.URL)return pe(K.toPortablePath((0,uA.fileURLToPath)(fe)),{extensions:Be.extensions});if(fe.startsWith("#"))throw new Error("Mapping from one private import to another isn't allowed");return Fe(fe,le,Be)}function Fe(oe,le,Be={}){try{if(oe.startsWith("#"))return ke(oe,le,Be);let{considerBuiltins:fe,extensions:ae,conditions:qe}=Be,ne=F(oe,le,{considerBuiltins:fe});if(oe==="pnpapi")return ne;if(ne===null)return null;let Y=()=>le!==null?V(le):!1,he=(!fe||!tQ(oe))&&!Y()?ue(oe,ne,qe,le):ne;return pe(he,{extensions:ae})}catch(fe){throw Object.prototype.hasOwnProperty.call(fe,"pnpCode")&&Object.assign(fe.data,{request:po(oe),issuer:le&&po(le)}),fe}}function Ne(oe){let le=x.normalize(oe),Be=Br.resolveVirtual(le);return Be!==le?Be:null}return{VERSIONS:W,topLevel:_,getLocator:(oe,le)=>Array.isArray(le)?{name:le[0],reference:le[1]}:{name:oe,reference:le},getDependencyTreeRoots:()=>[...r.dependencyTreeRoots],getAllLocators(){let oe=[];for(let[le,Be]of f)for(let fe of Be.keys())le!==null&&fe!==null&&oe.push({name:le,reference:fe});return oe},getPackageInformation:oe=>{let le=A(oe);if(le===null)return null;let Be=K.fromPortablePath(le.packageLocation);return{...le,packageLocation:Be}},findPackageLocator:oe=>re(K.toPortablePath(oe)),resolveToUnqualified:y("resolveToUnqualified",(oe,le,Be)=>{let fe=le!==null?K.toPortablePath(le):null,ae=F(K.toPortablePath(oe),fe,Be);return ae===null?null:K.fromPortablePath(ae)}),resolveUnqualified:y("resolveUnqualified",(oe,le)=>K.fromPortablePath(pe(K.toPortablePath(oe),le))),resolveRequest:y("resolveRequest",(oe,le,Be)=>{let fe=le!==null?K.toPortablePath(le):null,ae=Fe(K.toPortablePath(oe),fe,Be);return ae===null?null:K.fromPortablePath(ae)}),resolveVirtual:y("resolveVirtual",oe=>{let le=Ne(K.toPortablePath(oe));return le!==null?K.fromPortablePath(le):null})}}var xBt=(0,Cle.promisify)(dle.readFile);var mle=(r,e,t)=>{let i=nE(r),n=GO(i,{basePath:e}),s=K.join(e,xt.pnpCjs);return $O(n,{fakeFs:t,pnpapiResolution:s})};var tM=Pe(Ile());var Co={};ut(Co,{checkAndReportManifestCompatibility:()=>wle,checkManifestCompatibility:()=>yle,extractBuildScripts:()=>rQ,getExtractHint:()=>rM,hasBindingGyp:()=>iM});function yle(r){return P.isPackageCompatible(r,ws.getArchitectureSet())}function wle(r,e,{configuration:t,report:i}){return yle(r)?!0:(i==null||i.reportWarningOnce(76,`${P.prettyLocator(t,r)} The ${ws.getArchitectureName()} architecture is incompatible with this package, ${e} skipped.`),!1)}function rQ(r,e,t,{configuration:i,report:n}){let s=[];for(let a of["preinstall","install","postinstall"])e.manifest.scripts.has(a)&&s.push([0,a]);return!e.manifest.scripts.has("install")&&e.misc.hasBindingGyp&&s.push([1,"node-gyp rebuild"]),s.length===0?[]:r.linkType!=="HARD"?(n==null||n.reportWarningOnce(6,`${P.prettyLocator(i,r)} lists build scripts, but is referenced through a soft link. Soft links don't support build scripts, so they'll be ignored.`),[]):t&&t.built===!1?(n==null||n.reportInfoOnce(5,`${P.prettyLocator(i,r)} lists build scripts, but its build has been explicitly disabled through configuration.`),[]):!i.get("enableScripts")&&!t.built?(n==null||n.reportWarningOnce(4,`${P.prettyLocator(i,r)} lists build scripts, but all build scripts have been disabled.`),[]):wle(r,"build",{configuration:i,report:n})?s:[]}var gze=new Set([".exe",".bin",".h",".hh",".hpp",".c",".cc",".cpp",".java",".jar",".node"]);function rM(r){return r.packageFs.getExtractHint({relevantExtensions:gze})}function iM(r){let e=x.join(r.prefixPath,"binding.gyp");return r.packageFs.existsSync(e)}var hE={};ut(hE,{getUnpluggedPath:()=>fE});function fE(r,{configuration:e}){return x.resolve(e.get("pnpUnpluggedFolder"),P.slugifyLocator(r))}var fze=new Set([P.makeIdent(null,"open").identHash,P.makeIdent(null,"opn").identHash]),wl=class{constructor(){this.mode="strict";this.pnpCache=new Map}supportsPackage(e,t){return this.isEnabled(t)}async findPackageLocation(e,t){if(!this.isEnabled(t))throw new Error("Assertion failed: Expected the PnP linker to be enabled");let i=Bl(t.project).cjs;if(!M.existsSync(i))throw new Qe(`The project in ${ee.pretty(t.project.configuration,`${t.project.cwd}/package.json`,ee.Type.PATH)} doesn't seem to have been installed - running an install there might help`);let n=Ie.getFactoryWithDefault(this.pnpCache,i,()=>Ie.dynamicRequire(i,{cachingStrategy:Ie.CachingStrategy.FsTime})),s={name:P.stringifyIdent(e),reference:e.reference},o=n.getPackageInformation(s);if(!o)throw new Qe(`Couldn't find ${P.prettyLocator(t.project.configuration,e)} in the currently installed PnP map - running an install might help`);return K.toPortablePath(o.packageLocation)}async findPackageLocator(e,t){if(!this.isEnabled(t))return null;let i=Bl(t.project).cjs;if(!M.existsSync(i))return null;let s=Ie.getFactoryWithDefault(this.pnpCache,i,()=>Ie.dynamicRequire(i,{cachingStrategy:Ie.CachingStrategy.FsTime})).findPackageLocator(K.fromPortablePath(e));return s?P.makeLocator(P.parseIdent(s.name),s.reference):null}makeInstaller(e){return new Yu(e)}isEnabled(e){return!(e.project.configuration.get("nodeLinker")!=="pnp"||e.project.configuration.get("pnpMode")!==this.mode)}},Yu=class{constructor(e){this.opts=e;this.mode="strict";this.asyncActions=new Ie.AsyncActions(10);this.packageRegistry=new Map;this.virtualTemplates=new Map;this.isESMLoaderRequired=!1;this.customData={store:new Map};this.unpluggedPaths=new Set;this.opts=e}getCustomDataKey(){return JSON.stringify({name:"PnpInstaller",version:2})}attachCustomData(e){this.customData=e}async installPackage(e,t,i){let n=P.stringifyIdent(e),s=e.reference,o=!!this.opts.project.tryWorkspaceByLocator(e),a=P.isVirtualLocator(e),l=e.peerDependencies.size>0&&!a,c=!l&&!o,u=!l&&e.linkType!=="SOFT",g,f;if(c||u){let D=a?P.devirtualizeLocator(e):e;g=this.customData.store.get(D.locatorHash),typeof g>"u"&&(g=await hze(t),e.linkType==="HARD"&&this.customData.store.set(D.locatorHash,g)),g.manifest.type==="module"&&(this.isESMLoaderRequired=!0),f=this.opts.project.getDependencyMeta(D,e.version)}let h=c?rQ(e,g,f,{configuration:this.opts.project.configuration,report:this.opts.report}):[],p=u?await this.unplugPackageIfNeeded(e,g,t,f,i):t.packageFs;if(x.isAbsolute(t.prefixPath))throw new Error(`Assertion failed: Expected the prefix path (${t.prefixPath}) to be relative to the parent`);let C=x.resolve(p.getRealPath(),t.prefixPath),y=nM(this.opts.project.cwd,C),B=new Map,v=new Set;if(a){for(let D of e.peerDependencies.values())B.set(P.stringifyIdent(D),null),v.add(P.stringifyIdent(D));if(!o){let D=P.devirtualizeLocator(e);this.virtualTemplates.set(D.locatorHash,{location:nM(this.opts.project.cwd,Br.resolveVirtual(C)),locator:D})}}return Ie.getMapWithDefault(this.packageRegistry,n).set(s,{packageLocation:y,packageDependencies:B,packagePeers:v,linkType:e.linkType,discardFromLookup:t.discardFromLookup||!1}),{packageLocation:C,buildDirective:h.length>0?h:null}}async attachInternalDependencies(e,t){let i=this.getPackageInformation(e);for(let[n,s]of t){let o=P.areIdentsEqual(n,s)?s.reference:[P.stringifyIdent(s),s.reference];i.packageDependencies.set(P.stringifyIdent(n),o)}}async attachExternalDependents(e,t){for(let i of t)this.getDiskInformation(i).packageDependencies.set(P.stringifyIdent(e),e.reference)}async finalizeInstall(){if(this.opts.project.configuration.get("pnpMode")!==this.mode)return;let e=Bl(this.opts.project);if(M.existsSync(e.cjsLegacy)&&(this.opts.report.reportWarning(0,`Removing the old ${ee.pretty(this.opts.project.configuration,xt.pnpJs,ee.Type.PATH)} file. You might need to manually update existing references to reference the new ${ee.pretty(this.opts.project.configuration,xt.pnpCjs,ee.Type.PATH)} file. If you use Editor SDKs, you'll have to rerun ${ee.pretty(this.opts.project.configuration,"yarn sdks",ee.Type.CODE)}.`),await M.removePromise(e.cjsLegacy)),this.isEsmEnabled()||await M.removePromise(e.esmLoader),this.opts.project.configuration.get("nodeLinker")!=="pnp"){await M.removePromise(e.cjs),await M.removePromise(this.opts.project.configuration.get("pnpDataPath")),await M.removePromise(e.esmLoader),await M.removePromise(this.opts.project.configuration.get("pnpUnpluggedFolder"));return}for(let{locator:u,location:g}of this.virtualTemplates.values())Ie.getMapWithDefault(this.packageRegistry,P.stringifyIdent(u)).set(u.reference,{packageLocation:g,packageDependencies:new Map,packagePeers:new Set,linkType:"SOFT",discardFromLookup:!1});this.packageRegistry.set(null,new Map([[null,this.getPackageInformation(this.opts.project.topLevelWorkspace.anchoredLocator)]]));let t=this.opts.project.configuration.get("pnpFallbackMode"),i=this.opts.project.workspaces.map(({anchoredLocator:u})=>({name:P.stringifyIdent(u),reference:u.reference})),n=t!=="none",s=[],o=new Map,a=Ie.buildIgnorePattern([".yarn/sdks/**",...this.opts.project.configuration.get("pnpIgnorePatterns")]),l=this.packageRegistry,c=this.opts.project.configuration.get("pnpShebang");if(t==="dependencies-only")for(let u of this.opts.project.storedPackages.values())this.opts.project.tryWorkspaceByLocator(u)&&s.push({name:P.stringifyIdent(u),reference:u.reference});return await this.asyncActions.wait(),await this.finalizeInstallWithPnp({dependencyTreeRoots:i,enableTopLevelFallback:n,fallbackExclusionList:s,fallbackPool:o,ignorePattern:a,packageRegistry:l,shebang:c}),{customData:this.customData}}async transformPnpSettings(e){}isEsmEnabled(){if(this.opts.project.configuration.sources.has("pnpEnableEsmLoader"))return this.opts.project.configuration.get("pnpEnableEsmLoader");if(this.isESMLoaderRequired)return!0;for(let e of this.opts.project.workspaces)if(e.manifest.type==="module")return!0;return!1}async finalizeInstallWithPnp(e){let t=Bl(this.opts.project),i=this.opts.project.configuration.get("pnpDataPath"),n=await this.locateNodeModules(e.ignorePattern);if(n.length>0){this.opts.report.reportWarning(31,"One or more node_modules have been detected and will be removed. This operation may take some time.");for(let o of n)await M.removePromise(o)}if(await this.transformPnpSettings(e),this.opts.project.configuration.get("pnpEnableInlining")){let o=qAe(e);await M.changeFilePromise(t.cjs,o,{automaticNewlines:!0,mode:493}),await M.removePromise(i)}else{let o=x.relative(x.dirname(t.cjs),i),{dataFile:a,loaderFile:l}=JAe({...e,dataLocation:o});await M.changeFilePromise(t.cjs,l,{automaticNewlines:!0,mode:493}),await M.changeFilePromise(i,a,{automaticNewlines:!0,mode:420})}this.isEsmEnabled()&&(this.opts.report.reportWarning(0,"ESM support for PnP uses the experimental loader API and is therefore experimental"),await M.changeFilePromise(t.esmLoader,(0,tM.default)(),{automaticNewlines:!0,mode:420}));let s=this.opts.project.configuration.get("pnpUnpluggedFolder");if(this.unpluggedPaths.size===0)await M.removePromise(s);else for(let o of await M.readdirPromise(s)){let a=x.resolve(s,o);this.unpluggedPaths.has(a)||await M.removePromise(a)}}async locateNodeModules(e){let t=[],i=e?new RegExp(e):null;for(let n of this.opts.project.workspaces){let s=x.join(n.cwd,"node_modules");if(i&&i.test(x.relative(this.opts.project.cwd,n.cwd))||!M.existsSync(s))continue;let o=await M.readdirPromise(s,{withFileTypes:!0}),a=o.filter(l=>!l.isDirectory()||l.name===".bin"||!l.name.startsWith("."));if(a.length===o.length)t.push(s);else for(let l of a)t.push(x.join(s,l.name))}return t}async unplugPackageIfNeeded(e,t,i,n,s){return this.shouldBeUnplugged(e,t,n)?this.unplugPackage(e,i,s):i.packageFs}shouldBeUnplugged(e,t,i){return typeof i.unplugged<"u"?i.unplugged:fze.has(e.identHash)||e.conditions!=null?!0:t.manifest.preferUnplugged!==null?t.manifest.preferUnplugged:!!(rQ(e,t,i,{configuration:this.opts.project.configuration}).length>0||t.misc.extractHint)}async unplugPackage(e,t,i){let n=fE(e,{configuration:this.opts.project.configuration});return this.opts.project.disabledLocators.has(e.locatorHash)?new So(n,{baseFs:t.packageFs,pathUtils:x}):(this.unpluggedPaths.add(n),i.holdFetchResult(this.asyncActions.set(e.locatorHash,async()=>{let s=x.join(n,t.prefixPath,".ready");await M.existsPromise(s)||(this.opts.project.storedBuildState.delete(e.locatorHash),await M.mkdirPromise(n,{recursive:!0}),await M.copyPromise(n,Oe.dot,{baseFs:t.packageFs,overwrite:!1}),await M.writeFilePromise(s,""))})),new qt(n))}getPackageInformation(e){let t=P.stringifyIdent(e),i=e.reference,n=this.packageRegistry.get(t);if(!n)throw new Error(`Assertion failed: The package information store should have been available (for ${P.prettyIdent(this.opts.project.configuration,e)})`);let s=n.get(i);if(!s)throw new Error(`Assertion failed: The package information should have been available (for ${P.prettyLocator(this.opts.project.configuration,e)})`);return s}getDiskInformation(e){let t=Ie.getMapWithDefault(this.packageRegistry,"@@disk"),i=nM(this.opts.project.cwd,e);return Ie.getFactoryWithDefault(t,i,()=>({packageLocation:i,packageDependencies:new Map,packagePeers:new Set,linkType:"SOFT",discardFromLookup:!1}))}};function nM(r,e){let t=x.relative(r,e);return t.match(/^\.{0,2}\//)||(t=`./${t}`),t.replace(/\/?$/,"/")}async function hze(r){var i;let e=(i=await ot.tryFind(r.prefixPath,{baseFs:r.packageFs}))!=null?i:new ot,t=new Set(["preinstall","install","postinstall"]);for(let n of e.scripts.keys())t.has(n)||e.scripts.delete(n);return{manifest:{scripts:e.scripts,preferUnplugged:e.preferUnplugged,type:e.type},misc:{extractHint:rM(r),hasBindingGyp:iM(r)}}}var Ble=Pe(Bn());var ju=class extends De{constructor(){super(...arguments);this.all=z.Boolean("-A,--all",!1,{description:"Unplug direct dependencies from the entire project"});this.recursive=z.Boolean("-R,--recursive",!1,{description:"Unplug both direct and transitive dependencies"});this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.patterns=z.Rest()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd),s=await Rt.find(t);if(!n)throw new ct(i.cwd,this.context.cwd);if(t.get("nodeLinker")!=="pnp")throw new Qe("This command can only be used if the `nodeLinker` option is set to `pnp`");await i.restoreInstallState();let o=new Set(this.patterns),a=this.patterns.map(h=>{let p=P.parseDescriptor(h),C=p.range!=="unknown"?p:P.makeDescriptor(p,"*");if(!vt.validRange(C.range))throw new Qe(`The range of the descriptor patterns must be a valid semver range (${P.prettyDescriptor(t,C)})`);return y=>{let B=P.stringifyIdent(y);return!Ble.default.isMatch(B,P.stringifyIdent(C))||y.version&&!vt.satisfiesWithPrereleases(y.version,C.range)?!1:(o.delete(h),!0)}}),l=()=>{let h=[];for(let p of i.storedPackages.values())!i.tryWorkspaceByLocator(p)&&!P.isVirtualLocator(p)&&a.some(C=>C(p))&&h.push(p);return h},c=h=>{let p=new Set,C=[],y=(B,v)=>{if(!p.has(B.locatorHash)&&(p.add(B.locatorHash),!i.tryWorkspaceByLocator(B)&&a.some(D=>D(B))&&C.push(B),!(v>0&&!this.recursive)))for(let D of B.dependencies.values()){let T=i.storedResolutions.get(D.descriptorHash);if(!T)throw new Error("Assertion failed: The resolution should have been registered");let H=i.storedPackages.get(T);if(!H)throw new Error("Assertion failed: The package should have been registered");y(H,v+1)}};for(let B of h){let v=i.storedPackages.get(B.anchoredLocator.locatorHash);if(!v)throw new Error("Assertion failed: The package should have been registered");y(v,0)}return C},u,g;if(this.all&&this.recursive?(u=l(),g="the project"):this.all?(u=c(i.workspaces),g="any workspace"):(u=c([n]),g="this workspace"),o.size>1)throw new Qe(`Patterns ${ee.prettyList(t,o,ee.Type.CODE)} don't match any packages referenced by ${g}`);if(o.size>0)throw new Qe(`Pattern ${ee.prettyList(t,o,ee.Type.CODE)} doesn't match any packages referenced by ${g}`);return u=Ie.sortMap(u,h=>P.stringifyLocator(h)),(await Ge.start({configuration:t,stdout:this.context.stdout,json:this.json},async h=>{var p;for(let C of u){let y=(p=C.version)!=null?p:"unknown",B=i.topLevelWorkspace.manifest.ensureDependencyMeta(P.makeDescriptor(C,y));B.unplugged=!0,h.reportInfo(0,`Will unpack ${P.prettyLocator(t,C)} to ${ee.pretty(t,fE(C,{configuration:t}),ee.Type.PATH)}`),h.reportJson({locator:P.stringifyLocator(C),version:y})}await i.topLevelWorkspace.persistManifest(),h.reportSeparator(),await i.install({cache:s,report:h})})).exitCode()}};ju.paths=[["unplug"]],ju.usage=ve.Usage({description:"force the unpacking of a list of packages",details:"\n      This command will add the selectors matching the specified patterns to the list of packages that must be unplugged when installed.\n\n      A package being unplugged means that instead of being referenced directly through its archive, it will be unpacked at install time in the directory configured via `pnpUnpluggedFolder`. Note that unpacking packages this way is generally not recommended because it'll make it harder to store your packages within the repository. However, it's a good approach to quickly and safely debug some packages, and can even sometimes be required depending on the context (for example when the package contains shellscripts).\n\n      Running the command will set a persistent flag inside your top-level `package.json`, in the `dependenciesMeta` field. As such, to undo its effects, you'll need to revert the changes made to the manifest and run `yarn install` to apply the modification.\n\n      By default, only direct dependencies from the current workspace are affected. If `-A,--all` is set, direct dependencies from the entire project are affected. Using the `-R,--recursive` flag will affect transitive dependencies as well as direct ones.\n\n      This command accepts glob patterns inside the scope and name components (not the range). Make sure to escape the patterns to prevent your own shell from trying to expand them.\n    ",examples:[["Unplug the lodash dependency from the active workspace","yarn unplug lodash"],["Unplug all instances of lodash referenced by any workspace","yarn unplug lodash -A"],["Unplug all instances of lodash referenced by the active workspace and its dependencies","yarn unplug lodash -R"],["Unplug all instances of lodash, anywhere","yarn unplug lodash -AR"],["Unplug one specific version of lodash","yarn unplug lodash@1.2.3"],["Unplug all packages with the `@babel` scope","yarn unplug '@babel/*'"],["Unplug all packages (only for testing, not recommended)","yarn unplug -R '*'"]]});var Bl=r=>({cjs:x.join(r.cwd,xt.pnpCjs),cjsLegacy:x.join(r.cwd,xt.pnpJs),esmLoader:x.join(r.cwd,".pnp.loader.mjs")}),Sle=r=>/\s/.test(r)?JSON.stringify(r):r;async function pze(r,e,t){let i=Bl(r),n=`--require ${Sle(K.fromPortablePath(i.cjs))}`;if(M.existsSync(i.esmLoader)&&(n=`${n} --experimental-loader ${(0,Qle.pathToFileURL)(K.fromPortablePath(i.esmLoader)).href}`),i.cjs.includes(" ")&&ble.default.lt(process.versions.node,"12.0.0"))throw new Error(`Expected the build location to not include spaces when using Node < 12.0.0 (${process.versions.node})`);if(M.existsSync(i.cjs)){let s=e.NODE_OPTIONS||"",o=/\s*--require\s+\S*\.pnp\.c?js\s*/g,a=/\s*--experimental-loader\s+\S*\.pnp\.loader\.mjs\s*/;s=s.replace(o," ").replace(a," ").trim(),s=s?`${n} ${s}`:n,e.NODE_OPTIONS=s}}async function dze(r,e){let t=Bl(r);e(t.cjs),e(t.esmLoader),e(r.configuration.get("pnpDataPath")),e(r.configuration.get("pnpUnpluggedFolder"))}var Cze={hooks:{populateYarnPaths:dze,setupScriptEnvironment:pze},configuration:{nodeLinker:{description:'The linker used for installing Node packages, one of: "pnp", "node-modules"',type:"STRING",default:"pnp"},pnpMode:{description:"If 'strict', generates standard PnP maps. If 'loose', merges them with the n_m resolution.",type:"STRING",default:"strict"},pnpShebang:{description:"String to prepend to the generated PnP script",type:"STRING",default:"#!/usr/bin/env node"},pnpIgnorePatterns:{description:"Array of glob patterns; files matching them will use the classic resolution",type:"STRING",default:[],isArray:!0},pnpEnableEsmLoader:{description:"If true, Yarn will generate an ESM loader (`.pnp.loader.mjs`). If this is not explicitly set Yarn tries to automatically detect whether ESM support is required.",type:"BOOLEAN",default:!1},pnpEnableInlining:{description:"If true, the PnP data will be inlined along with the generated loader",type:"BOOLEAN",default:!0},pnpFallbackMode:{description:"If true, the generated PnP loader will follow the top-level fallback rule",type:"STRING",default:"dependencies-only"},pnpUnpluggedFolder:{description:"Folder where the unplugged packages must be stored",type:"ABSOLUTE_PATH",default:"./.yarn/unplugged"},pnpDataPath:{description:"Path of the file where the PnP data (used by the loader) must be written",type:"ABSOLUTE_PATH",default:"./.pnp.data.json"}},linkers:[wl],commands:[ju]},mze=Cze;var Nle=Pe(kle());var gM=Pe(J("crypto")),Tle=Pe(J("fs")),Lle=1,kr="node_modules",iQ=".bin",Ole=".yarn-state.yml",Tze=1e3;var nQ=class{constructor(){this.installStateCache=new Map}supportsPackage(e,t){return this.isEnabled(t)}async findPackageLocation(e,t){if(!this.isEnabled(t))throw new Error("Assertion failed: Expected the node-modules linker to be enabled");let i=t.project.tryWorkspaceByLocator(e);if(i)return i.cwd;let n=await Ie.getFactoryWithDefault(this.installStateCache,t.project.cwd,async()=>await uM(t.project,{unrollAliases:!0}));if(n===null)throw new Qe("Couldn't find the node_modules state file - running an install might help (findPackageLocation)");let s=n.locatorMap.get(P.stringifyLocator(e));if(!s){let l=new Qe(`Couldn't find ${P.prettyLocator(t.project.configuration,e)} in the currently installed node_modules map - running an install might help`);throw l.code="LOCATOR_NOT_INSTALLED",l}let o=s.locations.sort((l,c)=>l.split(x.sep).length-c.split(x.sep).length),a=x.join(t.project.configuration.startingCwd,kr);return o.find(l=>x.contains(a,l))||s.locations[0]}async findPackageLocator(e,t){if(!this.isEnabled(t))return null;let i=await Ie.getFactoryWithDefault(this.installStateCache,t.project.cwd,async()=>await uM(t.project,{unrollAliases:!0}));if(i===null)return null;let{locationRoot:n,segments:s}=sQ(x.resolve(e),{skipPrefix:t.project.cwd}),o=i.locationTree.get(n);if(!o)return null;let a=o.locator;for(let l of s){if(o=o.children.get(l),!o)break;a=o.locator||a}return P.parseLocator(a)}makeInstaller(e){return new cM(e)}isEnabled(e){return e.project.configuration.get("nodeLinker")==="node-modules"}},cM=class{constructor(e){this.opts=e;this.localStore=new Map;this.realLocatorChecksums=new Map;this.customData={store:new Map}}getCustomDataKey(){return JSON.stringify({name:"NodeModulesInstaller",version:2})}attachCustomData(e){this.customData=e}async installPackage(e,t){var u;let i=x.resolve(t.packageFs.getRealPath(),t.prefixPath),n=this.customData.store.get(e.locatorHash);if(typeof n>"u"&&(n=await Lze(e,t),e.linkType==="HARD"&&this.customData.store.set(e.locatorHash,n)),!P.isPackageCompatible(e,this.opts.project.configuration.getSupportedArchitectures()))return{packageLocation:null,buildDirective:null};let s=new Map,o=new Set;s.has(P.stringifyIdent(e))||s.set(P.stringifyIdent(e),e.reference);let a=e;if(P.isVirtualLocator(e)){a=P.devirtualizeLocator(e);for(let g of e.peerDependencies.values())s.set(P.stringifyIdent(g),null),o.add(P.stringifyIdent(g))}let l={packageLocation:`${K.fromPortablePath(i)}/`,packageDependencies:s,packagePeers:o,linkType:e.linkType,discardFromLookup:(u=t.discardFromLookup)!=null?u:!1};this.localStore.set(e.locatorHash,{pkg:e,customPackageData:n,dependencyMeta:this.opts.project.getDependencyMeta(e,e.version),pnpNode:l});let c=t.checksum?t.checksum.substring(t.checksum.indexOf("/")+1):null;return this.realLocatorChecksums.set(a.locatorHash,c),{packageLocation:i,buildDirective:null}}async attachInternalDependencies(e,t){let i=this.localStore.get(e.locatorHash);if(typeof i>"u")throw new Error("Assertion failed: Expected information object to have been registered");for(let[n,s]of t){let o=P.areIdentsEqual(n,s)?s.reference:[P.stringifyIdent(s),s.reference];i.pnpNode.packageDependencies.set(P.stringifyIdent(n),o)}}async attachExternalDependents(e,t){throw new Error("External dependencies haven't been implemented for the node-modules linker")}async finalizeInstall(){if(this.opts.project.configuration.get("nodeLinker")!=="node-modules")return;let e=new Br({baseFs:new Kn({libzip:await an(),maxOpenFiles:80,readOnlyArchives:!0})}),t=await uM(this.opts.project),i=this.opts.project.configuration.get("nmMode");(t===null||i!==t.nmMode)&&(this.opts.project.storedBuildState.clear(),t={locatorMap:new Map,binSymlinks:new Map,locationTree:new Map,nmMode:i,mtimeMs:0});let n=new Map(this.opts.project.workspaces.map(f=>{var p,C;let h=this.opts.project.configuration.get("nmHoistingLimits");try{h=Ie.validateEnum(tE,(C=(p=f.manifest.installConfig)==null?void 0:p.hoistingLimits)!=null?C:h)}catch{let B=P.prettyWorkspace(this.opts.project.configuration,f);this.opts.report.reportWarning(57,`${B}: Invalid 'installConfig.hoistingLimits' value. Expected one of ${Object.values(tE).join(", ")}, using default: "${h}"`)}return[f.relativeCwd,h]})),s=new Map(this.opts.project.workspaces.map(f=>{var p,C;let h=this.opts.project.configuration.get("nmSelfReferences");return h=(C=(p=f.manifest.installConfig)==null?void 0:p.selfReferences)!=null?C:h,[f.relativeCwd,h]})),o={VERSIONS:{std:1},topLevel:{name:null,reference:null},getLocator:(f,h)=>Array.isArray(h)?{name:h[0],reference:h[1]}:{name:f,reference:h},getDependencyTreeRoots:()=>this.opts.project.workspaces.map(f=>{let h=f.anchoredLocator;return{name:P.stringifyIdent(f.locator),reference:h.reference}}),getPackageInformation:f=>{let h=f.reference===null?this.opts.project.topLevelWorkspace.anchoredLocator:P.makeLocator(P.parseIdent(f.name),f.reference),p=this.localStore.get(h.locatorHash);if(typeof p>"u")throw new Error("Assertion failed: Expected the package reference to have been registered");return p.pnpNode},findPackageLocator:f=>{let h=this.opts.project.tryWorkspaceByCwd(K.toPortablePath(f));if(h!==null){let p=h.anchoredLocator;return{name:P.stringifyIdent(p),reference:p.reference}}throw new Error("Assertion failed: Unimplemented")},resolveToUnqualified:()=>{throw new Error("Assertion failed: Unimplemented")},resolveUnqualified:()=>{throw new Error("Assertion failed: Unimplemented")},resolveRequest:()=>{throw new Error("Assertion failed: Unimplemented")},resolveVirtual:f=>K.fromPortablePath(Br.resolveVirtual(K.toPortablePath(f)))},{tree:a,errors:l,preserveSymlinksRequired:c}=rE(o,{pnpifyFs:!1,validateExternalSoftLinks:!0,hoistingLimitsByCwd:n,project:this.opts.project,selfReferencesByCwd:s});if(!a){for(let{messageName:f,text:h}of l)this.opts.report.reportError(f,h);return}let u=UO(a);await Gze(t,u,{baseFs:e,project:this.opts.project,report:this.opts.report,realLocatorChecksums:this.realLocatorChecksums,loadManifest:async f=>{let h=P.parseLocator(f),p=this.localStore.get(h.locatorHash);if(typeof p>"u")throw new Error("Assertion failed: Expected the slot to exist");return p.customPackageData.manifest}});let g=[];for(let[f,h]of u.entries()){if(Hle(f))continue;let p=P.parseLocator(f),C=this.localStore.get(p.locatorHash);if(typeof C>"u")throw new Error("Assertion failed: Expected the slot to exist");if(this.opts.project.tryWorkspaceByLocator(C.pkg))continue;let y=Co.extractBuildScripts(C.pkg,C.customPackageData,C.dependencyMeta,{configuration:this.opts.project.configuration,report:this.opts.report});y.length!==0&&g.push({buildLocations:h.locations,locatorHash:p.locatorHash,buildDirective:y})}return c&&this.opts.report.reportWarning(72,`The application uses portals and that's why ${ee.pretty(this.opts.project.configuration,"--preserve-symlinks",ee.Type.CODE)} Node option is required for launching it`),{customData:this.customData,records:g}}};async function Lze(r,e){var n;let t=(n=await ot.tryFind(e.prefixPath,{baseFs:e.packageFs}))!=null?n:new ot,i=new Set(["preinstall","install","postinstall"]);for(let s of t.scripts.keys())i.has(s)||t.scripts.delete(s);return{manifest:{bin:t.bin,scripts:t.scripts},misc:{extractHint:Co.getExtractHint(e),hasBindingGyp:Co.hasBindingGyp(e)}}}async function Oze(r,e,t,i,{installChangedByUser:n}){let s="";s+=`# Warning: This file is automatically generated. Removing it is fine, but will
-`,s+=`# cause your node_modules installation to become invalidated.
-`,s+=`
-`,s+=`__metadata:
-`,s+=`  version: ${Lle}
-`,s+=`  nmMode: ${i.value}
-`;let o=Array.from(e.keys()).sort(),a=P.stringifyLocator(r.topLevelWorkspace.anchoredLocator);for(let u of o){let g=e.get(u);s+=`
-`,s+=`${JSON.stringify(u)}:
-`,s+=`  locations:
-`;for(let f of g.locations){let h=x.contains(r.cwd,f);if(h===null)throw new Error(`Assertion failed: Expected the path to be within the project (${f})`);s+=`    - ${JSON.stringify(h)}
-`}if(g.aliases.length>0){s+=`  aliases:
-`;for(let f of g.aliases)s+=`    - ${JSON.stringify(f)}
-`}if(u===a&&t.size>0){s+=`  bin:
-`;for(let[f,h]of t){let p=x.contains(r.cwd,f);if(p===null)throw new Error(`Assertion failed: Expected the path to be within the project (${f})`);s+=`    ${JSON.stringify(p)}:
-`;for(let[C,y]of h){let B=x.relative(x.join(f,kr),y);s+=`      ${JSON.stringify(C)}: ${JSON.stringify(B)}
-`}}}}let l=r.cwd,c=x.join(l,kr,Ole);n&&await M.removePromise(c),await M.changeFilePromise(c,s,{automaticNewlines:!0})}async function uM(r,{unrollAliases:e=!1}={}){let t=r.cwd,i=x.join(t,kr,Ole),n;try{n=await M.statPromise(i)}catch{}if(!n)return null;let s=yi(await M.readFilePromise(i,"utf8"));if(s.__metadata.version>Lle)return null;let o=s.__metadata.nmMode||"classic",a=new Map,l=new Map;delete s.__metadata;for(let[c,u]of Object.entries(s)){let g=u.locations.map(h=>x.join(t,h)),f=u.bin;if(f)for(let[h,p]of Object.entries(f)){let C=x.join(t,K.toPortablePath(h)),y=Ie.getMapWithDefault(l,C);for(let[B,v]of Object.entries(p))y.set(Jr(B),K.toPortablePath([C,kr,v].join(x.sep)))}if(a.set(c,{target:Oe.dot,linkType:"HARD",locations:g,aliases:u.aliases||[]}),e&&u.aliases)for(let h of u.aliases){let{scope:p,name:C}=P.parseLocator(c),y=P.makeLocator(P.makeIdent(p,C),h),B=P.stringifyLocator(y);a.set(B,{target:Oe.dot,linkType:"HARD",locations:g,aliases:[]})}}return{locatorMap:a,binSymlinks:l,locationTree:Mle(a,{skipPrefix:r.cwd}),nmMode:o,mtimeMs:n.mtimeMs}}var sp=async(r,e)=>{if(r.split(x.sep).indexOf(kr)<0)throw new Error(`Assertion failed: trying to remove dir that doesn't contain node_modules: ${r}`);try{if(!e.innerLoop){let i=e.allowSymlink?await M.statPromise(r):await M.lstatPromise(r);if(e.allowSymlink&&!i.isDirectory()||!e.allowSymlink&&i.isSymbolicLink()){await M.unlinkPromise(r);return}}let t=await M.readdirPromise(r,{withFileTypes:!0});for(let i of t){let n=x.join(r,Jr(i.name));i.isDirectory()?(i.name!==kr||e&&e.innerLoop)&&await sp(n,{innerLoop:!0,contentsOnly:!1}):await M.unlinkPromise(n)}e.contentsOnly||await M.rmdirPromise(r)}catch(t){if(t.code!=="ENOENT"&&t.code!=="ENOTEMPTY")throw t}},Rle=4,sQ=(r,{skipPrefix:e})=>{let t=x.contains(e,r);if(t===null)throw new Error(`Assertion failed: Writing attempt prevented to ${r} which is outside project root: ${e}`);let i=t.split(x.sep).filter(l=>l!==""),n=i.indexOf(kr),s=i.slice(0,n).join(x.sep),o=x.join(e,s),a=i.slice(n);return{locationRoot:o,segments:a}},Mle=(r,{skipPrefix:e})=>{let t=new Map;if(r===null)return t;let i=()=>({children:new Map,linkType:"HARD"});for(let[n,s]of r.entries()){if(s.linkType==="SOFT"&&x.contains(e,s.target)!==null){let a=Ie.getFactoryWithDefault(t,s.target,i);a.locator=n,a.linkType=s.linkType}for(let o of s.locations){let{locationRoot:a,segments:l}=sQ(o,{skipPrefix:e}),c=Ie.getFactoryWithDefault(t,a,i);for(let u=0;u<l.length;++u){let g=l[u];if(g!=="."){let f=Ie.getFactoryWithDefault(c.children,g,i);c.children.set(g,f),c=f}u===l.length-1&&(c.locator=n,c.linkType=s.linkType)}}}return t},fM=async(r,e)=>{let t;try{process.platform==="win32"&&(t=await M.lstatPromise(r))}catch{}process.platform=="win32"&&(!t||t.isDirectory())?await M.symlinkPromise(r,e,"junction"):await M.symlinkPromise(x.relative(x.dirname(e),r),e)};async function Kle(r,e,t){let i=x.join(r,Jr(`${gM.default.randomBytes(16).toString("hex")}.tmp`));try{await M.writeFilePromise(i,t);try{await M.linkPromise(i,e)}catch{}}finally{await M.unlinkPromise(i)}}async function Mze({srcPath:r,dstPath:e,entry:t,globalHardlinksStore:i,baseFs:n,nmMode:s}){if(t.kind===Ule.FILE){if(s.value==="hardlinks-global"&&i&&t.digest){let a=x.join(i,t.digest.substring(0,2),`${t.digest.substring(2)}.dat`),l;try{let c=await M.statPromise(a);if(c&&(!t.mtimeMs||c.mtimeMs>t.mtimeMs||c.mtimeMs<t.mtimeMs-Tze))if(await li.checksumFile(a,{baseFs:M,algorithm:"sha1"})!==t.digest){let g=x.join(i,Jr(`${gM.default.randomBytes(16).toString("hex")}.tmp`));await M.renamePromise(a,g);let f=await n.readFilePromise(r);await M.writeFilePromise(g,f);try{await M.linkPromise(g,a),t.mtimeMs=new Date().getTime(),await M.unlinkPromise(g)}catch{}}else t.mtimeMs||(t.mtimeMs=Math.ceil(c.mtimeMs));await M.linkPromise(a,e),l=!0}catch{l=!1}if(!l){let c=await n.readFilePromise(r);await Kle(i,a,c),t.mtimeMs=new Date().getTime();try{await M.linkPromise(a,e)}catch(u){u&&u.code&&u.code=="EXDEV"&&(s.value="hardlinks-local",await n.copyFilePromise(r,e))}}}else await n.copyFilePromise(r,e);let o=t.mode&511;o!==420&&await M.chmodPromise(e,o)}}var Ule=(i=>(i.FILE="file",i.DIRECTORY="directory",i.SYMLINK="symlink",i))(Ule||{}),Kze=async(r,e,{baseFs:t,globalHardlinksStore:i,nmMode:n,packageChecksum:s})=>{await M.mkdirPromise(r,{recursive:!0});let o=async(c=Oe.dot)=>{let u=x.join(e,c),g=await t.readdirPromise(u,{withFileTypes:!0}),f=new Map;for(let h of g){let p=x.join(c,h.name),C,y=x.join(u,h.name);if(h.isFile()){if(C={kind:"file",mode:(await t.lstatPromise(y)).mode},n.value==="hardlinks-global"){let B=await li.checksumFile(y,{baseFs:t,algorithm:"sha1"});C.digest=B}}else if(h.isDirectory())C={kind:"directory"};else if(h.isSymbolicLink())C={kind:"symlink",symlinkTo:await t.readlinkPromise(y)};else throw new Error(`Unsupported file type (file: ${y}, mode: 0o${await t.statSync(y).mode.toString(8).padStart(6,"0")})`);if(f.set(p,C),h.isDirectory()&&p!==kr){let B=await o(p);for(let[v,D]of B)f.set(v,D)}}return f},a;if(n.value==="hardlinks-global"&&i&&s){let c=x.join(i,s.substring(0,2),`${s.substring(2)}.json`);try{a=new Map(Object.entries(JSON.parse(await M.readFilePromise(c,"utf8"))))}catch{a=await o()}}else a=await o();let l=!1;for(let[c,u]of a){let g=x.join(e,c),f=x.join(r,c);if(u.kind==="directory")await M.mkdirPromise(f,{recursive:!0});else if(u.kind==="file"){let h=u.mtimeMs;await Mze({srcPath:g,dstPath:f,entry:u,nmMode:n,baseFs:t,globalHardlinksStore:i}),u.mtimeMs!==h&&(l=!0)}else u.kind==="symlink"&&await fM(x.resolve(x.dirname(f),u.symlinkTo),f)}if(n.value==="hardlinks-global"&&i&&l&&s){let c=x.join(i,s.substring(0,2),`${s.substring(2)}.json`);await M.removePromise(c),await Kle(i,c,Buffer.from(JSON.stringify(Object.fromEntries(a))))}};function Uze(r,e,t,i){let n=new Map,s=new Map,o=new Map,a=!1,l=(c,u,g,f,h)=>{let p=!0,C=x.join(c,u),y=new Set;if(u===kr||u.startsWith("@")){let v;try{v=M.statSync(C)}catch{}p=!!v,v?v.mtimeMs>t?(a=!0,y=new Set(M.readdirSync(C))):y=new Set(g.children.get(u).children.keys()):a=!0;let D=e.get(c);if(D){let T=x.join(c,kr,iQ),H;try{H=M.statSync(T)}catch{}if(!H)a=!0;else if(H.mtimeMs>t){a=!0;let j=new Set(M.readdirSync(T)),$=new Map;s.set(c,$);for(let[V,W]of D)j.has(V)&&$.set(V,W)}else s.set(c,D)}}else p=h.has(u);let B=g.children.get(u);if(p){let{linkType:v,locator:D}=B,T={children:new Map,linkType:v,locator:D};if(f.children.set(u,T),D){let H=Ie.getSetWithDefault(o,D);H.add(C),o.set(D,H)}for(let H of B.children.keys())l(C,H,B,T,y)}else B.locator&&i.storedBuildState.delete(P.parseLocator(B.locator).locatorHash)};for(let[c,u]of r){let{linkType:g,locator:f}=u,h={children:new Map,linkType:g,locator:f};if(n.set(c,h),f){let p=Ie.getSetWithDefault(o,u.locator);p.add(c),o.set(u.locator,p)}u.children.has(kr)&&l(c,kr,u,h,new Set)}return{locationTree:n,binSymlinks:s,locatorLocations:o,installChangedByUser:a}}function Hle(r){let e=P.parseDescriptor(r);return P.isVirtualDescriptor(e)&&(e=P.devirtualizeDescriptor(e)),e.range.startsWith("link:")}async function Hze(r,e,t,{loadManifest:i}){let n=new Map;for(let[a,{locations:l}]of r){let c=Hle(a)?null:await i(a,l[0]),u=new Map;if(c)for(let[g,f]of c.bin){let h=x.join(l[0],f);f!==""&&M.existsSync(h)&&u.set(g,f)}n.set(a,u)}let s=new Map,o=(a,l,c)=>{let u=new Map,g=x.contains(t,a);if(c.locator&&g!==null){let f=n.get(c.locator);for(let[h,p]of f){let C=x.join(a,K.toPortablePath(p));u.set(Jr(h),C)}for(let[h,p]of c.children){let C=x.join(a,h),y=o(C,C,p);y.size>0&&s.set(a,new Map([...s.get(a)||new Map,...y]))}}else for(let[f,h]of c.children){let p=o(x.join(a,f),l,h);for(let[C,y]of p)u.set(C,y)}return u};for(let[a,l]of e){let c=o(a,a,l);c.size>0&&s.set(a,new Map([...s.get(a)||new Map,...c]))}return s}var Fle=(r,e)=>{if(!r||!e)return r===e;let t=P.parseLocator(r);P.isVirtualLocator(t)&&(t=P.devirtualizeLocator(t));let i=P.parseLocator(e);return P.isVirtualLocator(i)&&(i=P.devirtualizeLocator(i)),P.areLocatorsEqual(t,i)};function hM(r){return x.join(r.get("globalFolder"),"store")}async function Gze(r,e,{baseFs:t,project:i,report:n,loadManifest:s,realLocatorChecksums:o}){let a=x.join(i.cwd,kr),{locationTree:l,binSymlinks:c,locatorLocations:u,installChangedByUser:g}=Uze(r.locationTree,r.binSymlinks,r.mtimeMs,i),f=Mle(e,{skipPrefix:i.cwd}),h=[],p=async({srcDir:V,dstDir:W,linkType:_,globalHardlinksStore:A,nmMode:Ae,packageChecksum:ge})=>{let re=(async()=>{try{_==="SOFT"?(await M.mkdirPromise(x.dirname(W),{recursive:!0}),await fM(x.resolve(V),W)):await Kze(W,V,{baseFs:t,globalHardlinksStore:A,nmMode:Ae,packageChecksum:ge})}catch(O){throw O.message=`While persisting ${V} -> ${W} ${O.message}`,O}finally{T.tick()}})().then(()=>h.splice(h.indexOf(re),1));h.push(re),h.length>Rle&&await Promise.race(h)},C=async(V,W,_)=>{let A=(async()=>{let Ae=async(ge,re,O)=>{try{O.innerLoop||await M.mkdirPromise(re,{recursive:!0});let F=await M.readdirPromise(ge,{withFileTypes:!0});for(let ue of F){if(!O.innerLoop&&ue.name===iQ)continue;let pe=x.join(ge,ue.name),ke=x.join(re,ue.name);ue.isDirectory()?(ue.name!==kr||O&&O.innerLoop)&&(await M.mkdirPromise(ke,{recursive:!0}),await Ae(pe,ke,{...O,innerLoop:!0})):$.value==="hardlinks-local"||$.value==="hardlinks-global"?await M.linkPromise(pe,ke):await M.copyFilePromise(pe,ke,Tle.default.constants.COPYFILE_FICLONE)}}catch(F){throw O.innerLoop||(F.message=`While cloning ${ge} -> ${re} ${F.message}`),F}finally{O.innerLoop||T.tick()}};await Ae(V,W,_)})().then(()=>h.splice(h.indexOf(A),1));h.push(A),h.length>Rle&&await Promise.race(h)},y=async(V,W,_)=>{if(_)for(let[A,Ae]of W.children){let ge=_.children.get(A);await y(x.join(V,A),Ae,ge)}else{W.children.has(kr)&&await sp(x.join(V,kr),{contentsOnly:!1});let A=x.basename(V)===kr&&f.has(x.join(x.dirname(V),x.sep));await sp(V,{contentsOnly:V===a,allowSymlink:A})}};for(let[V,W]of l){let _=f.get(V);for(let[A,Ae]of W.children){if(A===".")continue;let ge=_&&_.children.get(A),re=x.join(V,A);await y(re,Ae,ge)}}let B=async(V,W,_)=>{if(_){Fle(W.locator,_.locator)||await sp(V,{contentsOnly:W.linkType==="HARD"});for(let[A,Ae]of W.children){let ge=_.children.get(A);await B(x.join(V,A),Ae,ge)}}else{W.children.has(kr)&&await sp(x.join(V,kr),{contentsOnly:!0});let A=x.basename(V)===kr&&f.has(x.join(x.dirname(V),x.sep));await sp(V,{contentsOnly:W.linkType==="HARD",allowSymlink:A})}};for(let[V,W]of f){let _=l.get(V);for(let[A,Ae]of W.children){if(A===".")continue;let ge=_&&_.children.get(A);await B(x.join(V,A),Ae,ge)}}let v=new Map,D=[];for(let[V,W]of u)for(let _ of W){let{locationRoot:A,segments:Ae}=sQ(_,{skipPrefix:i.cwd}),ge=f.get(A),re=A;if(ge){for(let O of Ae)if(re=x.join(re,O),ge=ge.children.get(O),!ge)break;if(ge){let O=Fle(ge.locator,V),F=e.get(ge.locator),ue=F.target,pe=re,ke=F.linkType;if(O)v.has(ue)||v.set(ue,pe);else if(ue!==pe){let Fe=P.parseLocator(ge.locator);P.isVirtualLocator(Fe)&&(Fe=P.devirtualizeLocator(Fe)),D.push({srcDir:ue,dstDir:pe,linkType:ke,realLocatorHash:Fe.locatorHash})}}}}for(let[V,{locations:W}]of e.entries())for(let _ of W){let{locationRoot:A,segments:Ae}=sQ(_,{skipPrefix:i.cwd}),ge=l.get(A),re=f.get(A),O=A,F=e.get(V),ue=P.parseLocator(V);P.isVirtualLocator(ue)&&(ue=P.devirtualizeLocator(ue));let pe=ue.locatorHash,ke=F.target,Fe=_;if(ke===Fe)continue;let Ne=F.linkType;for(let oe of Ae)re=re.children.get(oe);if(!ge)D.push({srcDir:ke,dstDir:Fe,linkType:Ne,realLocatorHash:pe});else for(let oe of Ae)if(O=x.join(O,oe),ge=ge.children.get(oe),!ge){D.push({srcDir:ke,dstDir:Fe,linkType:Ne,realLocatorHash:pe});break}}let T=vi.progressViaCounter(D.length),H=n.reportProgress(T),j=i.configuration.get("nmMode"),$={value:j};try{let V=$.value==="hardlinks-global"?`${hM(i.configuration)}/v1`:null;if(V&&!await M.existsPromise(V)){await M.mkdirpPromise(V);for(let _=0;_<256;_++)await M.mkdirPromise(x.join(V,_.toString(16).padStart(2,"0")))}for(let _ of D)(_.linkType==="SOFT"||!v.has(_.srcDir))&&(v.set(_.srcDir,_.dstDir),await p({..._,globalHardlinksStore:V,nmMode:$,packageChecksum:o.get(_.realLocatorHash)||null}));await Promise.all(h),h.length=0;for(let _ of D){let A=v.get(_.srcDir);_.linkType!=="SOFT"&&_.dstDir!==A&&await C(A,_.dstDir,{nmMode:$})}await Promise.all(h),await M.mkdirPromise(a,{recursive:!0});let W=await Hze(e,f,i.cwd,{loadManifest:s});await Yze(c,W,i.cwd),await Oze(i,e,W,$,{installChangedByUser:g}),j=="hardlinks-global"&&$.value=="hardlinks-local"&&n.reportWarningOnce(74,"'nmMode' has been downgraded to 'hardlinks-local' due to global cache and install folder being on different devices")}finally{H.stop()}}async function Yze(r,e,t){for(let i of r.keys()){if(x.contains(t,i)===null)throw new Error(`Assertion failed. Excepted bin symlink location to be inside project dir, instead it was at ${i}`);if(!e.has(i)){let n=x.join(i,kr,iQ);await M.removePromise(n)}}for(let[i,n]of e){if(x.contains(t,i)===null)throw new Error(`Assertion failed. Excepted bin symlink location to be inside project dir, instead it was at ${i}`);let s=x.join(i,kr,iQ),o=r.get(i)||new Map;await M.mkdirPromise(s,{recursive:!0});for(let a of o.keys())n.has(a)||(await M.removePromise(x.join(s,a)),process.platform==="win32"&&await M.removePromise(x.join(s,Jr(`${a}.cmd`))));for(let[a,l]of n){let c=o.get(a),u=x.join(s,a);c!==l&&(process.platform==="win32"?await(0,Nle.default)(K.fromPortablePath(l),K.fromPortablePath(u),{createPwshFile:!1}):(await M.removePromise(u),await fM(l,u),x.contains(t,await M.realpathPromise(l))!==null&&await M.chmodPromise(l,493)))}}}var oQ=class extends wl{constructor(){super(...arguments);this.mode="loose"}makeInstaller(t){return new pM(t)}},pM=class extends Yu{constructor(){super(...arguments);this.mode="loose"}async transformPnpSettings(t){let i=new Br({baseFs:new Kn({libzip:await an(),maxOpenFiles:80,readOnlyArchives:!0})}),n=mle(t,this.opts.project.cwd,i),{tree:s,errors:o}=rE(n,{pnpifyFs:!1,project:this.opts.project});if(!s){for(let{messageName:g,text:f}of o)this.opts.report.reportError(g,f);return}let a=new Map;t.fallbackPool=a;let l=(g,f)=>{let h=P.parseLocator(f.locator),p=P.stringifyIdent(h);p===g?a.set(g,h.reference):a.set(g,[p,h.reference])},c=x.join(this.opts.project.cwd,xt.nodeModules),u=s.get(c);if(!(typeof u>"u")){if("target"in u)throw new Error("Assertion failed: Expected the root junction point to be a directory");for(let g of u.dirList){let f=x.join(c,g),h=s.get(f);if(typeof h>"u")throw new Error("Assertion failed: Expected the child to have been registered");if("target"in h)l(g,h);else for(let p of h.dirList){let C=x.join(f,p),y=s.get(C);if(typeof y>"u")throw new Error("Assertion failed: Expected the subchild to have been registered");if("target"in y)l(`${g}/${p}`,y);else throw new Error("Assertion failed: Expected the leaf junction to be a package")}}}}};var jze={hooks:{cleanGlobalArtifacts:async r=>{let e=hM(r);await M.removePromise(e)}},configuration:{nmHoistingLimits:{description:"Prevent packages to be hoisted past specific levels",type:"STRING",values:["workspaces","dependencies","none"],default:"none"},nmMode:{description:'If set to "hardlinks-local" Yarn will utilize hardlinks to reduce disk space consumption inside "node_modules" directories. With "hardlinks-global" Yarn will use global content addressable storage to reduce "node_modules" size across all the projects using this option.',type:"STRING",values:["classic","hardlinks-local","hardlinks-global"],default:"classic"},nmSelfReferences:{description:"If set to 'false' the workspace will not be allowed to require itself and corresponding self-referencing symlink will not be created",type:"BOOLEAN",default:!0}},linkers:[nQ,oQ]},qze=jze;var f1={};ut(f1,{default:()=>$Ve,npmConfigUtils:()=>or,npmHttpUtils:()=>Mt,npmPublishUtils:()=>Cp});var Wle=Pe(Xr());var gr="npm:";var Mt={};ut(Mt,{AuthType:()=>Jle,customPackageError:()=>Wze,del:()=>Xze,get:()=>Eo,getIdentUrl:()=>Ql,handleInvalidAuthenticationError:()=>bl,post:()=>zze,put:()=>Vze});var EM=Pe(Km()),qle=J("url");var or={};ut(or,{RegistryType:()=>Gle,getAuditRegistry:()=>Jze,getAuthConfiguration:()=>mM,getDefaultRegistry:()=>aQ,getPublishRegistry:()=>Yle,getRegistryConfiguration:()=>jle,getScopeConfiguration:()=>CM,getScopeRegistry:()=>gA,normalizeRegistry:()=>mo});var Gle=(i=>(i.AUDIT_REGISTRY="npmAuditRegistry",i.FETCH_REGISTRY="npmRegistryServer",i.PUBLISH_REGISTRY="npmPublishRegistry",i))(Gle||{});function mo(r){return r.replace(/\/$/,"")}function Jze(r,{configuration:e}){let t=e.get("npmAuditRegistry");return t!==null?mo(t):Yle(r,{configuration:e})}function Yle(r,{configuration:e}){var t;return(t=r.publishConfig)!=null&&t.registry?mo(r.publishConfig.registry):r.name?gA(r.name.scope,{configuration:e,type:"npmPublishRegistry"}):aQ({configuration:e,type:"npmPublishRegistry"})}function gA(r,{configuration:e,type:t="npmRegistryServer"}){let i=CM(r,{configuration:e});if(i===null)return aQ({configuration:e,type:t});let n=i.get(t);return n===null?aQ({configuration:e,type:t}):mo(n)}function aQ({configuration:r,type:e="npmRegistryServer"}){let t=r.get(e);return mo(t!==null?t:r.get("npmRegistryServer"))}function jle(r,{configuration:e}){let t=e.get("npmRegistries"),i=mo(r),n=t.get(i);if(typeof n<"u")return n;let s=t.get(i.replace(/^[a-z]+:/,""));return typeof s<"u"?s:null}function CM(r,{configuration:e}){if(r===null)return null;let i=e.get("npmScopes").get(r);return i||null}function mM(r,{configuration:e,ident:t}){let i=t&&CM(t.scope,{configuration:e});return(i==null?void 0:i.get("npmAuthIdent"))||(i==null?void 0:i.get("npmAuthToken"))?i:jle(r,{configuration:e})||e}var Jle=(n=>(n[n.NO_AUTH=0]="NO_AUTH",n[n.BEST_EFFORT=1]="BEST_EFFORT",n[n.CONFIGURATION=2]="CONFIGURATION",n[n.ALWAYS_AUTH=3]="ALWAYS_AUTH",n))(Jle||{});async function bl(r,{attemptedAs:e,registry:t,headers:i,configuration:n}){var s,o;if(lQ(r))throw new at(41,"Invalid OTP token");if(((s=r.originalError)==null?void 0:s.name)==="HTTPError"&&((o=r.originalError)==null?void 0:o.response.statusCode)===401)throw new at(41,`Invalid authentication (${typeof e!="string"?`as ${await _ze(t,i,{configuration:n})}`:`attempted as ${e}`})`)}function Wze(r){var e;return((e=r.response)==null?void 0:e.statusCode)===404?"Package not found":null}function Ql(r){return r.scope?`/@${r.scope}%2f${r.name}`:`/${r.name}`}async function Eo(r,{configuration:e,headers:t,ident:i,authType:n,registry:s,...o}){if(i&&typeof s>"u"&&(s=gA(i.scope,{configuration:e})),i&&i.scope&&typeof n>"u"&&(n=1),typeof s!="string")throw new Error("Assertion failed: The registry should be a string");let a=await AQ(s,{authType:n,configuration:e,ident:i});a&&(t={...t,authorization:a});try{return await Xt.get(r.charAt(0)==="/"?`${s}${r}`:r,{configuration:e,headers:t,...o})}catch(l){throw await bl(l,{registry:s,configuration:e,headers:t}),l}}async function zze(r,e,{attemptedAs:t,configuration:i,headers:n,ident:s,authType:o=3,registry:a,otp:l,...c}){if(s&&typeof a>"u"&&(a=gA(s.scope,{configuration:i})),typeof a!="string")throw new Error("Assertion failed: The registry should be a string");let u=await AQ(a,{authType:o,configuration:i,ident:s});u&&(n={...n,authorization:u}),l&&(n={...n,...op(l)});try{return await Xt.post(a+r,e,{configuration:i,headers:n,...c})}catch(g){if(!lQ(g)||l)throw await bl(g,{attemptedAs:t,registry:a,configuration:i,headers:n}),g;l=await IM(g,{configuration:i});let f={...n,...op(l)};try{return await Xt.post(`${a}${r}`,e,{configuration:i,headers:f,...c})}catch(h){throw await bl(h,{attemptedAs:t,registry:a,configuration:i,headers:n}),h}}}async function Vze(r,e,{attemptedAs:t,configuration:i,headers:n,ident:s,authType:o=3,registry:a,otp:l,...c}){if(s&&typeof a>"u"&&(a=gA(s.scope,{configuration:i})),typeof a!="string")throw new Error("Assertion failed: The registry should be a string");let u=await AQ(a,{authType:o,configuration:i,ident:s});u&&(n={...n,authorization:u}),l&&(n={...n,...op(l)});try{return await Xt.put(a+r,e,{configuration:i,headers:n,...c})}catch(g){if(!lQ(g))throw await bl(g,{attemptedAs:t,registry:a,configuration:i,headers:n}),g;l=await IM(g,{configuration:i});let f={...n,...op(l)};try{return await Xt.put(`${a}${r}`,e,{configuration:i,headers:f,...c})}catch(h){throw await bl(h,{attemptedAs:t,registry:a,configuration:i,headers:n}),h}}}async function Xze(r,{attemptedAs:e,configuration:t,headers:i,ident:n,authType:s=3,registry:o,otp:a,...l}){if(n&&typeof o>"u"&&(o=gA(n.scope,{configuration:t})),typeof o!="string")throw new Error("Assertion failed: The registry should be a string");let c=await AQ(o,{authType:s,configuration:t,ident:n});c&&(i={...i,authorization:c}),a&&(i={...i,...op(a)});try{return await Xt.del(o+r,{configuration:t,headers:i,...l})}catch(u){if(!lQ(u)||a)throw await bl(u,{attemptedAs:e,registry:o,configuration:t,headers:i}),u;a=await IM(u,{configuration:t});let g={...i,...op(a)};try{return await Xt.del(`${o}${r}`,{configuration:t,headers:g,...l})}catch(f){throw await bl(f,{attemptedAs:e,registry:o,configuration:t,headers:i}),f}}}async function AQ(r,{authType:e=2,configuration:t,ident:i}){let n=mM(r,{configuration:t,ident:i}),s=Zze(n,e);if(!s)return null;let o=await t.reduceHook(a=>a.getNpmAuthenticationHeader,void 0,r,{configuration:t,ident:i});if(o)return o;if(n.get("npmAuthToken"))return`Bearer ${n.get("npmAuthToken")}`;if(n.get("npmAuthIdent")){let a=n.get("npmAuthIdent");return a.includes(":")?`Basic ${Buffer.from(a).toString("base64")}`:`Basic ${a}`}if(s&&e!==1)throw new at(33,"No authentication configured for request");return null}function Zze(r,e){switch(e){case 2:return r.get("npmAlwaysAuth");case 1:case 3:return!0;case 0:return!1;default:throw new Error("Unreachable")}}async function _ze(r,e,{configuration:t}){var i;if(typeof e>"u"||typeof e.authorization>"u")return"an anonymous user";try{return(i=(await Xt.get(new qle.URL(`${r}/-/whoami`).href,{configuration:t,headers:e,jsonResponse:!0})).username)!=null?i:"an unknown user"}catch{return"an unknown user"}}async function IM(r,{configuration:e}){var n;let t=(n=r.originalError)==null?void 0:n.response.headers["npm-notice"];if(t&&(await Ge.start({configuration:e,stdout:process.stdout,includeFooter:!1},async s=>{if(s.reportInfo(0,t.replace(/(https?:\/\/\S+)/g,ee.pretty(e,"$1",ee.Type.URL))),!process.env.YARN_IS_TEST_ENV){let o=t.match(/open (https?:\/\/\S+)/i);if(o&&ws.openUrl){let{openNow:a}=await(0,EM.prompt)({type:"confirm",name:"openNow",message:"Do you want to try to open this url now?",required:!0,initial:!0,onCancel:()=>process.exit(130)});a&&(await ws.openUrl(o[1])||(s.reportSeparator(),s.reportWarning(0,"We failed to automatically open the url; you'll have to open it yourself in your browser of choice.")))}}}),process.stdout.write(`
-`)),process.env.YARN_IS_TEST_ENV)return process.env.YARN_INJECT_NPM_2FA_TOKEN||"";let{otp:i}=await(0,EM.prompt)({type:"password",name:"otp",message:"One-time password:",required:!0,onCancel:()=>process.exit(130)});return process.stdout.write(`
-`),i}function lQ(r){var e,t;if(((e=r.originalError)==null?void 0:e.name)!=="HTTPError")return!1;try{return((t=r.originalError)==null?void 0:t.response.headers["www-authenticate"].split(/,\s*/).map(n=>n.toLowerCase())).includes("otp")}catch{return!1}}function op(r){return{["npm-otp"]:r}}var cQ=class{supports(e,t){if(!e.reference.startsWith(gr))return!1;let{selector:i,params:n}=P.parseRange(e.reference);return!(!Wle.default.valid(i)||n===null||typeof n.__archiveUrl!="string")}getLocalPath(e,t){return null}async fetch(e,t){let i=t.checksums.get(e.locatorHash)||null,[n,s,o]=await t.cache.fetchPackageFromCache(e,i,{onHit:()=>t.report.reportCacheHit(e),onMiss:()=>t.report.reportCacheMiss(e,`${P.prettyLocator(t.project.configuration,e)} can't be found in the cache and will be fetched from the remote server`),loader:()=>this.fetchFromNetwork(e,t),skipIntegrityCheck:t.skipIntegrityCheck,...t.cacheOptions});return{packageFs:n,releaseFs:s,prefixPath:P.getIdentVendorPath(e),checksum:o}}async fetchFromNetwork(e,t){let{params:i}=P.parseRange(e.reference);if(i===null||typeof i.__archiveUrl!="string")throw new Error("Assertion failed: The archiveUrl querystring parameter should have been available");let n=await Eo(i.__archiveUrl,{configuration:t.project.configuration,ident:e});return await mi.convertToZip(n,{compressionLevel:t.project.configuration.get("compressionLevel"),prefixPath:P.getIdentVendorPath(e),stripComponents:1})}};var uQ=class{supportsDescriptor(e,t){return!(!e.range.startsWith(gr)||!P.tryParseDescriptor(e.range.slice(gr.length),!0))}supportsLocator(e,t){return!1}shouldPersistResolution(e,t){throw new Error("Unreachable")}bindDescriptor(e,t,i){return e}getResolutionDependencies(e,t){let i=P.parseDescriptor(e.range.slice(gr.length),!0);return t.resolver.getResolutionDependencies(i,t)}async getCandidates(e,t,i){let n=P.parseDescriptor(e.range.slice(gr.length),!0);return await i.resolver.getCandidates(n,t,i)}async getSatisfying(e,t,i){let n=P.parseDescriptor(e.range.slice(gr.length),!0);return i.resolver.getSatisfying(n,t,i)}resolve(e,t){throw new Error("Unreachable")}};var zle=Pe(Xr()),Vle=J("url");var Ls=class{supports(e,t){if(!e.reference.startsWith(gr))return!1;let i=new Vle.URL(e.reference);return!(!zle.default.valid(i.pathname)||i.searchParams.has("__archiveUrl"))}getLocalPath(e,t){return null}async fetch(e,t){let i=t.checksums.get(e.locatorHash)||null,[n,s,o]=await t.cache.fetchPackageFromCache(e,i,{onHit:()=>t.report.reportCacheHit(e),onMiss:()=>t.report.reportCacheMiss(e,`${P.prettyLocator(t.project.configuration,e)} can't be found in the cache and will be fetched from the remote registry`),loader:()=>this.fetchFromNetwork(e,t),skipIntegrityCheck:t.skipIntegrityCheck,...t.cacheOptions});return{packageFs:n,releaseFs:s,prefixPath:P.getIdentVendorPath(e),checksum:o}}async fetchFromNetwork(e,t){let i;try{i=await Eo(Ls.getLocatorUrl(e),{configuration:t.project.configuration,ident:e})}catch{i=await Eo(Ls.getLocatorUrl(e).replace(/%2f/g,"/"),{configuration:t.project.configuration,ident:e})}return await mi.convertToZip(i,{compressionLevel:t.project.configuration.get("compressionLevel"),prefixPath:P.getIdentVendorPath(e),stripComponents:1})}static isConventionalTarballUrl(e,t,{configuration:i}){let n=gA(e.scope,{configuration:i}),s=Ls.getLocatorUrl(e);return t=t.replace(/^https?:(\/\/(?:[^/]+\.)?npmjs.org(?:$|\/))/,"https:$1"),n=n.replace(/^https:\/\/registry\.npmjs\.org($|\/)/,"https://registry.yarnpkg.com$1"),t=t.replace(/^https:\/\/registry\.npmjs\.org($|\/)/,"https://registry.yarnpkg.com$1"),t===n+s||t===n+s.replace(/%2f/g,"/")}static getLocatorUrl(e){let t=vt.clean(e.reference.slice(gr.length));if(t===null)throw new at(10,"The npm semver resolver got selected, but the version isn't semver");return`${Ql(e)}/-/${e.name}-${t}.tgz`}};var Xle=Pe(Xr());var gQ=P.makeIdent(null,"node-gyp"),$ze=/\b(node-gyp|prebuild-install)\b/,fQ=class{supportsDescriptor(e,t){return e.range.startsWith(gr)?!!vt.validRange(e.range.slice(gr.length)):!1}supportsLocator(e,t){if(!e.reference.startsWith(gr))return!1;let{selector:i}=P.parseRange(e.reference);return!!Xle.default.valid(i)}shouldPersistResolution(e,t){return!0}bindDescriptor(e,t,i){return e}getResolutionDependencies(e,t){return[]}async getCandidates(e,t,i){let n=vt.validRange(e.range.slice(gr.length));if(n===null)throw new Error(`Expected a valid range, got ${e.range.slice(gr.length)}`);let s=await Eo(Ql(e),{configuration:i.project.configuration,ident:e,jsonResponse:!0}),o=Ie.mapAndFilter(Object.keys(s.versions),c=>{try{let u=new vt.SemVer(c);if(n.test(u))return u}catch{}return Ie.mapAndFilter.skip}),a=o.filter(c=>!s.versions[c.raw].deprecated),l=a.length>0?a:o;return l.sort((c,u)=>-c.compare(u)),l.map(c=>{let u=P.makeLocator(e,`${gr}${c.raw}`),g=s.versions[c.raw].dist.tarball;return Ls.isConventionalTarballUrl(u,g,{configuration:i.project.configuration})?u:P.bindLocator(u,{__archiveUrl:g})})}async getSatisfying(e,t,i){let n=vt.validRange(e.range.slice(gr.length));if(n===null)throw new Error(`Expected a valid range, got ${e.range.slice(gr.length)}`);return Ie.mapAndFilter(t,s=>{try{let{selector:o}=P.parseRange(s,{requireProtocol:gr}),a=new vt.SemVer(o);if(n.test(a))return{reference:s,version:a}}catch{}return Ie.mapAndFilter.skip}).sort((s,o)=>-s.version.compare(o.version)).map(({reference:s})=>P.makeLocator(e,s))}async resolve(e,t){let{selector:i}=P.parseRange(e.reference),n=vt.clean(i);if(n===null)throw new at(10,"The npm semver resolver got selected, but the version isn't semver");let s=await Eo(Ql(e),{configuration:t.project.configuration,ident:e,jsonResponse:!0});if(!Object.prototype.hasOwnProperty.call(s,"versions"))throw new at(15,'Registry returned invalid data for - missing "versions" field');if(!Object.prototype.hasOwnProperty.call(s.versions,n))throw new at(16,`Registry failed to return reference "${n}"`);let o=new ot;if(o.load(s.versions[n]),!o.dependencies.has(gQ.identHash)&&!o.peerDependencies.has(gQ.identHash)){for(let a of o.scripts.values())if(a.match($ze)){o.dependencies.set(gQ.identHash,P.makeDescriptor(gQ,"latest")),t.report.reportWarningOnce(32,`${P.prettyLocator(t.project.configuration,e)}: Implicit dependencies on node-gyp are discouraged`);break}}if(typeof o.raw.deprecated=="string"&&o.raw.deprecated!==""){let a=P.prettyLocator(t.project.configuration,e),l=o.raw.deprecated.match(/\S/)?`${a} is deprecated: ${o.raw.deprecated}`:`${a} is deprecated`;t.report.reportWarningOnce(61,l)}return{...e,version:n,languageName:"node",linkType:"HARD",conditions:o.getConditions(),dependencies:o.dependencies,peerDependencies:o.peerDependencies,dependenciesMeta:o.dependenciesMeta,peerDependenciesMeta:o.peerDependenciesMeta,bin:o.bin}}};var hQ=class{supportsDescriptor(e,t){return!(!e.range.startsWith(gr)||!Rf.test(e.range.slice(gr.length)))}supportsLocator(e,t){return!1}shouldPersistResolution(e,t){throw new Error("Unreachable")}bindDescriptor(e,t,i){return e}getResolutionDependencies(e,t){return[]}async getCandidates(e,t,i){let n=e.range.slice(gr.length),s=await Eo(Ql(e),{configuration:i.project.configuration,ident:e,jsonResponse:!0});if(!Object.prototype.hasOwnProperty.call(s,"dist-tags"))throw new at(15,'Registry returned invalid data - missing "dist-tags" field');let o=s["dist-tags"];if(!Object.prototype.hasOwnProperty.call(o,n))throw new at(16,`Registry failed to return tag "${n}"`);let a=o[n],l=P.makeLocator(e,`${gr}${a}`),c=s.versions[a].dist.tarball;return Ls.isConventionalTarballUrl(l,c,{configuration:i.project.configuration})?[l]:[P.bindLocator(l,{__archiveUrl:c})]}async getSatisfying(e,t,i){return null}async resolve(e,t){throw new Error("Unreachable")}};var Cp={};ut(Cp,{getGitHead:()=>ZVe,getPublishAccess:()=>Uue,getReadmeContent:()=>Hue,makePublishBody:()=>XVe});var A1={};ut(A1,{default:()=>RVe,packUtils:()=>ca});var ca={};ut(ca,{genPackList:()=>OQ,genPackStream:()=>a1,genPackageManifest:()=>vue,hasPackScripts:()=>s1,prepareForPack:()=>o1});var n1=Pe(Bn()),Que=Pe(yue()),Sue=J("zlib"),yVe=["/package.json","/readme","/readme.*","/license","/license.*","/licence","/licence.*","/changelog","/changelog.*"],wVe=["/package.tgz",".github",".git",".hg","node_modules",".npmignore",".gitignore",".#*",".DS_Store"];async function s1(r){return!!(Wt.hasWorkspaceScript(r,"prepack")||Wt.hasWorkspaceScript(r,"postpack"))}async function o1(r,{report:e},t){await Wt.maybeExecuteWorkspaceLifecycleScript(r,"prepack",{report:e});try{let i=x.join(r.cwd,ot.fileName);await M.existsPromise(i)&&await r.manifest.loadFile(i,{baseFs:M}),await t()}finally{await Wt.maybeExecuteWorkspaceLifecycleScript(r,"postpack",{report:e})}}async function a1(r,e){var s,o;typeof e>"u"&&(e=await OQ(r));let t=new Set;for(let a of(o=(s=r.manifest.publishConfig)==null?void 0:s.executableFiles)!=null?o:new Set)t.add(x.normalize(a));for(let a of r.manifest.bin.values())t.add(x.normalize(a));let i=Que.default.pack();process.nextTick(async()=>{for(let a of e){let l=x.normalize(a),c=x.resolve(r.cwd,l),u=x.join("package",l),g=await M.lstatPromise(c),f={name:u,mtime:new Date(xr.SAFE_TIME*1e3)},h=t.has(l)?493:420,p,C,y=new Promise((v,D)=>{p=v,C=D}),B=v=>{v?C(v):p()};if(g.isFile()){let v;l==="package.json"?v=Buffer.from(JSON.stringify(await vue(r),null,2)):v=await M.readFilePromise(c),i.entry({...f,mode:h,type:"file"},v,B)}else g.isSymbolicLink()?i.entry({...f,mode:h,type:"symlink",linkname:await M.readlinkPromise(c)},B):B(new Error(`Unsupported file type ${g.mode} for ${K.fromPortablePath(l)}`));await y}i.finalize()});let n=(0,Sue.createGzip)();return i.pipe(n),n}async function vue(r){let e=JSON.parse(JSON.stringify(r.manifest.raw));return await r.project.configuration.triggerHook(t=>t.beforeWorkspacePacking,r,e),e}async function OQ(r){var g,f,h,p,C,y,B,v;let e=r.project,t=e.configuration,i={accept:[],reject:[]};for(let D of wVe)i.reject.push(D);for(let D of yVe)i.accept.push(D);i.reject.push(t.get("rcFilename"));let n=D=>{if(D===null||!D.startsWith(`${r.cwd}/`))return;let T=x.relative(r.cwd,D),H=x.resolve(Oe.root,T);i.reject.push(H)};n(x.resolve(e.cwd,t.get("lockfileFilename"))),n(t.get("cacheFolder")),n(t.get("globalFolder")),n(t.get("installStatePath")),n(t.get("virtualFolder")),n(t.get("yarnPath")),await t.triggerHook(D=>D.populateYarnPaths,e,D=>{n(D)});for(let D of e.workspaces){let T=x.relative(r.cwd,D.cwd);T!==""&&!T.match(/^(\.\.)?\//)&&i.reject.push(`/${T}`)}let s={accept:[],reject:[]},o=(f=(g=r.manifest.publishConfig)==null?void 0:g.main)!=null?f:r.manifest.main,a=(p=(h=r.manifest.publishConfig)==null?void 0:h.module)!=null?p:r.manifest.module,l=(y=(C=r.manifest.publishConfig)==null?void 0:C.browser)!=null?y:r.manifest.browser,c=(v=(B=r.manifest.publishConfig)==null?void 0:B.bin)!=null?v:r.manifest.bin;o!=null&&s.accept.push(x.resolve(Oe.root,o)),a!=null&&s.accept.push(x.resolve(Oe.root,a)),typeof l=="string"&&s.accept.push(x.resolve(Oe.root,l));for(let D of c.values())s.accept.push(x.resolve(Oe.root,D));if(l instanceof Map)for(let[D,T]of l.entries())s.accept.push(x.resolve(Oe.root,D)),typeof T=="string"&&s.accept.push(x.resolve(Oe.root,T));let u=r.manifest.files!==null;if(u){s.reject.push("/*");for(let D of r.manifest.files)xue(s.accept,D,{cwd:Oe.root})}return await BVe(r.cwd,{hasExplicitFileList:u,globalList:i,ignoreList:s})}async function BVe(r,{hasExplicitFileList:e,globalList:t,ignoreList:i}){let n=[],s=new vo(r),o=[[Oe.root,[i]]];for(;o.length>0;){let[a,l]=o.pop(),c=await s.lstatPromise(a);if(!Bue(a,{globalList:t,ignoreLists:c.isDirectory()?null:l}))if(c.isDirectory()){let u=await s.readdirPromise(a),g=!1,f=!1;if(!e||a!==Oe.root)for(let C of u)g=g||C===".gitignore",f=f||C===".npmignore";let h=f?await wue(s,a,".npmignore"):g?await wue(s,a,".gitignore"):null,p=h!==null?[h].concat(l):l;Bue(a,{globalList:t,ignoreLists:l})&&(p=[...l,{accept:[],reject:["**/*"]}]);for(let C of u)o.push([x.resolve(a,C),p])}else(c.isFile()||c.isSymbolicLink())&&n.push(x.relative(Oe.root,a))}return n.sort()}async function wue(r,e,t){let i={accept:[],reject:[]},n=await r.readFilePromise(x.join(e,t),"utf8");for(let s of n.split(/\n/g))xue(i.reject,s,{cwd:e});return i}function bVe(r,{cwd:e}){let t=r[0]==="!";return t&&(r=r.slice(1)),r.match(/\.{0,1}\//)&&(r=x.resolve(e,r)),t&&(r=`!${r}`),r}function xue(r,e,{cwd:t}){let i=e.trim();i===""||i[0]==="#"||r.push(bVe(i,{cwd:t}))}function Bue(r,{globalList:e,ignoreLists:t}){let i=LQ(r,e.accept);if(i!==0)return i===2;let n=LQ(r,e.reject);if(n!==0)return n===1;if(t!==null)for(let s of t){let o=LQ(r,s.accept);if(o!==0)return o===2;let a=LQ(r,s.reject);if(a!==0)return a===1}return!1}function LQ(r,e){let t=e,i=[];for(let n=0;n<e.length;++n)e[n][0]!=="!"?t!==e&&t.push(e[n]):(t===e&&(t=e.slice(0,n)),i.push(e[n].slice(1)));return bue(r,i)?2:bue(r,t)?1:0}function bue(r,e){let t=e,i=[];for(let n=0;n<e.length;++n)e[n].includes("/")?t!==e&&t.push(e[n]):(t===e&&(t=e.slice(0,n)),i.push(e[n]));return!!(n1.default.isMatch(r,t,{dot:!0,nocase:!0})||n1.default.isMatch(r,i,{dot:!0,basename:!0,nocase:!0}))}var Vu=class extends De{constructor(){super(...arguments);this.installIfNeeded=z.Boolean("--install-if-needed",!1,{description:"Run a preliminary `yarn install` if the package contains build scripts"});this.dryRun=z.Boolean("-n,--dry-run",!1,{description:"Print the file paths without actually generating the package archive"});this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.out=z.String("-o,--out",{description:"Create the archive at the specified path"});this.filename=z.String("--filename",{hidden:!0})}async execute(){var l;let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd);if(!n)throw new ct(i.cwd,this.context.cwd);await s1(n)&&(this.installIfNeeded?await i.install({cache:await Rt.find(t),report:new ti}):await i.restoreInstallState());let s=(l=this.out)!=null?l:this.filename,o=typeof s<"u"?x.resolve(this.context.cwd,QVe(s,{workspace:n})):x.resolve(n.cwd,"package.tgz");return(await Ge.start({configuration:t,stdout:this.context.stdout,json:this.json},async c=>{await o1(n,{report:c},async()=>{c.reportJson({base:K.fromPortablePath(n.cwd)});let u=await OQ(n);for(let g of u)c.reportInfo(null,K.fromPortablePath(g)),c.reportJson({location:K.fromPortablePath(g)});if(!this.dryRun){let g=await a1(n,u),f=M.createWriteStream(o);g.pipe(f),await new Promise(h=>{f.on("finish",h)})}}),this.dryRun||(c.reportInfo(0,`Package archive generated in ${ee.pretty(t,o,ee.Type.PATH)}`),c.reportJson({output:K.fromPortablePath(o)}))})).exitCode()}};Vu.paths=[["pack"]],Vu.usage=ve.Usage({description:"generate a tarball from the active workspace",details:"\n      This command will turn the active workspace into a compressed archive suitable for publishing. The archive will by default be stored at the root of the workspace (`package.tgz`).\n\n      If the `-o,---out` is set the archive will be created at the specified path. The `%s` and `%v` variables can be used within the path and will be respectively replaced by the package name and version.\n    ",examples:[["Create an archive from the active workspace","yarn pack"],["List the files that would be made part of the workspace's archive","yarn pack --dry-run"],["Name and output the archive in a dedicated folder","yarn pack --out /artifacts/%s-%v.tgz"]]});function QVe(r,{workspace:e}){let t=r.replace("%s",SVe(e)).replace("%v",vVe(e));return K.toPortablePath(t)}function SVe(r){return r.manifest.name!==null?P.slugifyIdent(r.manifest.name):"package"}function vVe(r){return r.manifest.version!==null?r.manifest.version:"unknown"}var xVe=["dependencies","devDependencies","peerDependencies"],PVe="workspace:",DVe=(r,e)=>{var i,n;e.publishConfig&&(e.publishConfig.type&&(e.type=e.publishConfig.type),e.publishConfig.main&&(e.main=e.publishConfig.main),e.publishConfig.browser&&(e.browser=e.publishConfig.browser),e.publishConfig.module&&(e.module=e.publishConfig.module),e.publishConfig.exports&&(e.exports=e.publishConfig.exports),e.publishConfig.imports&&(e.imports=e.publishConfig.imports),e.publishConfig.bin&&(e.bin=e.publishConfig.bin));let t=r.project;for(let s of xVe)for(let o of r.manifest.getForScope(s).values()){let a=t.tryWorkspaceByDescriptor(o),l=P.parseRange(o.range);if(l.protocol===PVe)if(a===null){if(t.tryWorkspaceByIdent(o)===null)throw new at(21,`${P.prettyDescriptor(t.configuration,o)}: No local workspace found for this range`)}else{let c;P.areDescriptorsEqual(o,a.anchoredDescriptor)||l.selector==="*"?c=(i=a.manifest.version)!=null?i:"0.0.0":l.selector==="~"||l.selector==="^"?c=`${l.selector}${(n=a.manifest.version)!=null?n:"0.0.0"}`:c=l.selector;let u=s==="dependencies"?P.makeDescriptor(o,"unknown"):null,g=u!==null&&r.manifest.ensureDependencyMeta(u).optional?"optionalDependencies":s;e[g][P.stringifyIdent(o)]=c}}},kVe={hooks:{beforeWorkspacePacking:DVe},commands:[Vu]},RVe=kVe;var Oue=J("crypto"),Mue=Pe(Lue()),Kue=J("url");async function XVe(r,e,{access:t,tag:i,registry:n,gitHead:s}){let o=r.manifest.name,a=r.manifest.version,l=P.stringifyIdent(o),c=(0,Oue.createHash)("sha1").update(e).digest("hex"),u=Mue.default.fromData(e).toString(),g=t!=null?t:Uue(r,o),f=await Hue(r),h=await ca.genPackageManifest(r),p=`${l}-${a}.tgz`,C=new Kue.URL(`${mo(n)}/${l}/-/${p}`);return{_id:l,_attachments:{[p]:{content_type:"application/octet-stream",data:e.toString("base64"),length:e.length}},name:l,access:g,["dist-tags"]:{[i]:a},versions:{[a]:{...h,_id:`${l}@${a}`,name:l,version:a,gitHead:s,dist:{shasum:c,integrity:u,tarball:C.toString()}}},readme:f}}async function ZVe(r){try{let{stdout:e}=await Cr.execvp("git",["rev-parse","--revs-only","HEAD"],{cwd:r});return e.trim()===""?void 0:e.trim()}catch{return}}function Uue(r,e){let t=r.project.configuration;return r.manifest.publishConfig&&typeof r.manifest.publishConfig.access=="string"?r.manifest.publishConfig.access:t.get("npmPublishAccess")!==null?t.get("npmPublishAccess"):e.scope?"restricted":"public"}async function Hue(r){let e=K.toPortablePath(`${r.cwd}/README.md`),t=r.manifest.name,n=`# ${P.stringifyIdent(t)}
-`;try{n=await M.readFilePromise(e,"utf8")}catch(s){if(s.code==="ENOENT")return n;throw s}return n}var g1={npmAlwaysAuth:{description:"URL of the selected npm registry (note: npm enterprise isn't supported)",type:"BOOLEAN",default:!1},npmAuthIdent:{description:"Authentication identity for the npm registry (_auth in npm and yarn v1)",type:"SECRET",default:null},npmAuthToken:{description:"Authentication token for the npm registry (_authToken in npm and yarn v1)",type:"SECRET",default:null}},Gue={npmAuditRegistry:{description:"Registry to query for audit reports",type:"STRING",default:null},npmPublishRegistry:{description:"Registry to push packages to",type:"STRING",default:null},npmRegistryServer:{description:"URL of the selected npm registry (note: npm enterprise isn't supported)",type:"STRING",default:"https://registry.yarnpkg.com"}},_Ve={configuration:{...g1,...Gue,npmScopes:{description:"Settings per package scope",type:"MAP",valueDefinition:{description:"",type:"SHAPE",properties:{...g1,...Gue}}},npmRegistries:{description:"Settings per registry",type:"MAP",normalizeKeys:mo,valueDefinition:{description:"",type:"SHAPE",properties:{...g1}}}},fetchers:[cQ,Ls],resolvers:[uQ,fQ,hQ]},$Ve=_Ve;var C1={};ut(C1,{default:()=>l9e});var kE=Pe(Bn());ls();var MQ=(i=>(i.All="all",i.Production="production",i.Development="development",i))(MQ||{}),KQ=(s=>(s.Info="info",s.Low="low",s.Moderate="moderate",s.High="high",s.Critical="critical",s))(KQ||{});var DE=["info","low","moderate","high","critical"];function jue(r,e){let t=[],i=new Set,n=o=>{i.has(o)||(i.add(o),t.push(o))};for(let o of e)n(o);let s=new Set;for(;t.length>0;){let o=t.shift(),a=r.storedResolutions.get(o);if(typeof a>"u")throw new Error("Assertion failed: Expected the resolution to have been registered");let l=r.storedPackages.get(a);if(!!l){s.add(o);for(let c of l.dependencies.values())n(c.descriptorHash)}}return s}function e9e(r,e){return new Set([...r].filter(t=>!e.has(t)))}function t9e(r,e,{all:t}){let i=t?r.workspaces:[e],n=i.map(f=>f.manifest),s=new Set(n.map(f=>[...f.dependencies].map(([h,p])=>h)).flat()),o=new Set(n.map(f=>[...f.devDependencies].map(([h,p])=>h)).flat()),a=i.map(f=>[...f.dependencies.values()]).flat(),l=a.filter(f=>s.has(f.identHash)).map(f=>f.descriptorHash),c=a.filter(f=>o.has(f.identHash)).map(f=>f.descriptorHash),u=jue(r,l),g=jue(r,c);return e9e(g,u)}function que(r){let e={};for(let t of r)e[P.stringifyIdent(t)]=P.parseRange(t.range).selector;return e}function Jue(r){if(typeof r>"u")return new Set(DE);let e=DE.indexOf(r),t=DE.slice(e);return new Set(t)}function r9e(r,e){let t=Jue(e),i={};for(let n of t)i[n]=r[n];return i}function Wue(r,e){var i;let t=r9e(r,e);for(let n of Object.keys(t))if((i=t[n])!=null?i:0>0)return!0;return!1}function zue(r,e){var s;let t={},i={children:t},n=Object.values(r.advisories);if(e!=null){let o=Jue(e);n=n.filter(a=>o.has(a.severity))}for(let o of Ie.sortMap(n,a=>a.module_name))t[o.module_name]={label:o.module_name,value:ee.tuple(ee.Type.RANGE,o.findings.map(a=>a.version).join(", ")),children:{ID:{label:"ID",value:ee.tuple(ee.Type.NUMBER,o.id)},Issue:{label:"Issue",value:ee.tuple(ee.Type.NO_HINT,o.title)},URL:{label:"URL",value:ee.tuple(ee.Type.URL,o.url)},Severity:{label:"Severity",value:ee.tuple(ee.Type.NO_HINT,o.severity)},["Vulnerable Versions"]:{label:"Vulnerable Versions",value:ee.tuple(ee.Type.RANGE,o.vulnerable_versions)},["Patched Versions"]:{label:"Patched Versions",value:ee.tuple(ee.Type.RANGE,o.patched_versions)},Via:{label:"Via",value:ee.tuple(ee.Type.NO_HINT,Array.from(new Set(o.findings.map(a=>a.paths).flat().map(a=>a.split(">")[0]))).join(", "))},Recommendation:{label:"Recommendation",value:ee.tuple(ee.Type.NO_HINT,(s=o.recommendation)==null?void 0:s.replace(/\n/g," "))}}};return i}function Vue(r,e,{all:t,environment:i}){let n=t?r.workspaces:[e],s=["all","production"].includes(i),o=[];if(s)for(let c of n)for(let u of c.manifest.dependencies.values())o.push(u);let a=["all","development"].includes(i),l=[];if(a)for(let c of n)for(let u of c.manifest.devDependencies.values())l.push(u);return que([...o,...l].filter(c=>P.parseRange(c.range).protocol===null))}function Xue(r,e,{all:t}){var s;let i=t9e(r,e,{all:t}),n={};for(let o of r.storedPackages.values())n[P.stringifyIdent(o)]={version:(s=o.version)!=null?s:"0.0.0",integrity:o.identHash,requires:que(o.dependencies.values()),dev:i.has(P.convertLocatorToDescriptor(o).descriptorHash)};return n}var _u=class extends De{constructor(){super(...arguments);this.all=z.Boolean("-A,--all",!1,{description:"Audit dependencies from all workspaces"});this.recursive=z.Boolean("-R,--recursive",!1,{description:"Audit transitive dependencies as well"});this.environment=z.String("--environment","all",{description:"Which environments to cover",validator:Zi(MQ)});this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.severity=z.String("--severity","info",{description:"Minimal severity requested for packages to be displayed",validator:Zi(KQ)});this.excludes=z.Array("--exclude",[],{description:"Array of glob patterns of packages to exclude from audit"});this.ignores=z.Array("--ignore",[],{description:"Array of glob patterns of advisory ID's to ignore in the audit report"})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd);if(!n)throw new ct(i.cwd,this.context.cwd);await i.restoreInstallState();let s=Vue(i,n,{all:this.all,environment:this.environment}),o=Xue(i,n,{all:this.all});if(!this.recursive)for(let C of Object.keys(o))Object.prototype.hasOwnProperty.call(s,C)?o[C].requires={}:delete o[C];let a=Array.from(new Set([...t.get("npmAuditExcludePackages"),...this.excludes]));if(a){for(let C of Object.keys(s))kE.default.isMatch(C,a)&&delete s[C];for(let C of Object.keys(o))kE.default.isMatch(C,a)&&delete o[C];for(let C of Object.keys(o))for(let y of Object.keys(o[C].requires))kE.default.isMatch(y,a)&&delete o[C].requires[y]}let l={requires:s,dependencies:o},c=or.getAuditRegistry(n.manifest,{configuration:t}),u,g=await ra.start({configuration:t,stdout:this.context.stdout},async()=>{u=await Mt.post("/-/npm/v1/security/audits/quick",l,{authType:Mt.AuthType.BEST_EFFORT,configuration:t,jsonResponse:!0,registry:c})});if(g.hasErrors())return g.exitCode();let f=Array.from(new Set([...t.get("npmAuditIgnoreAdvisories"),...this.ignores]));if(f){for(let C of Object.keys(u.advisories))if(kE.default.isMatch(C,f)){let y=u.advisories[C],B=0;y.findings.forEach(v=>B+=v.paths.length),u.metadata.vulnerabilities[y.severity]-=B,delete u.advisories[C]}}let h=Wue(u.metadata.vulnerabilities,this.severity);return!this.json&&h?(es.emitTree(zue(u,this.severity),{configuration:t,json:this.json,stdout:this.context.stdout,separators:2}),1):(await Ge.start({configuration:t,includeFooter:!1,json:this.json,stdout:this.context.stdout},async C=>{C.reportJson(u),h||C.reportInfo(1,"No audit suggestions")})).exitCode()}};_u.paths=[["npm","audit"]],_u.usage=ve.Usage({description:"perform a vulnerability audit against the installed packages",details:`
-      This command checks for known security reports on the packages you use. The reports are by default extracted from the npm registry, and may or may not be relevant to your actual program (not all vulnerabilities affect all code paths).
-
-      For consistency with our other commands the default is to only check the direct dependencies for the active workspace. To extend this search to all workspaces, use \`-A,--all\`. To extend this search to both direct and transitive dependencies, use \`-R,--recursive\`.
-
-      Applying the \`--severity\` flag will limit the audit table to vulnerabilities of the corresponding severity and above. Valid values are ${DE.map(t=>`\`${t}\``).join(", ")}.
-
-      If the \`--json\` flag is set, Yarn will print the output exactly as received from the registry. Regardless of this flag, the process will exit with a non-zero exit code if a report is found for the selected packages.
-
-      If certain packages produce false positives for a particular environment, the \`--exclude\` flag can be used to exclude any number of packages from the audit. This can also be set in the configuration file with the \`npmAuditExcludePackages\` option.
-
-      If particular advisories are needed to be ignored, the \`--ignore\` flag can be used with Advisory ID's to ignore any number of advisories in the audit report. This can also be set in the configuration file with the \`npmAuditIgnoreAdvisories\` option.
-
-      To understand the dependency tree requiring vulnerable packages, check the raw report with the \`--json\` flag or use \`yarn why <package>\` to get more information as to who depends on them.
-    `,examples:[["Checks for known security issues with the installed packages. The output is a list of known issues.","yarn npm audit"],["Audit dependencies in all workspaces","yarn npm audit --all"],["Limit auditing to `dependencies` (excludes `devDependencies`)","yarn npm audit --environment production"],["Show audit report as valid JSON","yarn npm audit --json"],["Audit all direct and transitive dependencies","yarn npm audit --recursive"],["Output moderate (or more severe) vulnerabilities","yarn npm audit --severity moderate"],["Exclude certain packages","yarn npm audit --exclude package1 --exclude package2"],["Ignore specific advisories","yarn npm audit --ignore 1234567 --ignore 7654321"]]});var h1=Pe(Xr()),p1=J("util"),$u=class extends De{constructor(){super(...arguments);this.fields=z.String("-f,--fields",{description:"A comma-separated list of manifest fields that should be displayed"});this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.packages=z.Rest()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i}=await je.find(t,this.context.cwd),n=typeof this.fields<"u"?new Set(["name",...this.fields.split(/\s*,\s*/)]):null,s=[],o=!1,a=await Ge.start({configuration:t,includeFooter:!1,json:this.json,stdout:this.context.stdout},async l=>{for(let c of this.packages){let u;if(c==="."){let T=i.topLevelWorkspace;if(!T.manifest.name)throw new Qe(`Missing ${ee.pretty(t,"name",ee.Type.CODE)} field in ${K.fromPortablePath(x.join(T.cwd,xt.manifest))}`);u=P.makeDescriptor(T.manifest.name,"unknown")}else u=P.parseDescriptor(c);let g=Mt.getIdentUrl(u),f=d1(await Mt.get(g,{configuration:t,ident:u,jsonResponse:!0,customErrorMessage:Mt.customPackageError})),h=Object.keys(f.versions).sort(h1.default.compareLoose),C=f["dist-tags"].latest||h[h.length-1],y=vt.validRange(u.range);if(y){let T=h1.default.maxSatisfying(h,y);T!==null?C=T:(l.reportWarning(0,`Unmet range ${P.prettyRange(t,u.range)}; falling back to the latest version`),o=!0)}else Object.prototype.hasOwnProperty.call(f["dist-tags"],u.range)?C=f["dist-tags"][u.range]:u.range!=="unknown"&&(l.reportWarning(0,`Unknown tag ${P.prettyRange(t,u.range)}; falling back to the latest version`),o=!0);let B=f.versions[C],v={...f,...B,version:C,versions:h},D;if(n!==null){D={};for(let T of n){let H=v[T];if(typeof H<"u")D[T]=H;else{l.reportWarning(1,`The ${ee.pretty(t,T,ee.Type.CODE)} field doesn't exist inside ${P.prettyIdent(t,u)}'s information`),o=!0;continue}}}else this.json||(delete v.dist,delete v.readme,delete v.users),D=v;l.reportJson(D),this.json||s.push(D)}});p1.inspect.styles.name="cyan";for(let l of s)(l!==s[0]||o)&&this.context.stdout.write(`
-`),this.context.stdout.write(`${(0,p1.inspect)(l,{depth:1/0,colors:!0,compact:!1})}
-`);return a.exitCode()}};$u.paths=[["npm","info"]],$u.usage=ve.Usage({category:"Npm-related commands",description:"show information about a package",details:"\n      This command fetches information about a package from the npm registry and prints it in a tree format.\n\n      The package does not have to be installed locally, but needs to have been published (in particular, local changes will be ignored even for workspaces).\n\n      Append `@<range>` to the package argument to provide information specific to the latest version that satisfies the range or to the corresponding tagged version. If the range is invalid or if there is no version satisfying the range, the command will print a warning and fall back to the latest version.\n\n      If the `-f,--fields` option is set, it's a comma-separated list of fields which will be used to only display part of the package information.\n\n      By default, this command won't return the `dist`, `readme`, and `users` fields, since they are often very long. To explicitly request those fields, explicitly list them with the `--fields` flag or request the output in JSON mode.\n    ",examples:[["Show all available information about react (except the `dist`, `readme`, and `users` fields)","yarn npm info react"],["Show all available information about react as valid JSON (including the `dist`, `readme`, and `users` fields)","yarn npm info react --json"],["Show all available information about react@16.12.0","yarn npm info react@16.12.0"],["Show all available information about react@next","yarn npm info react@next"],["Show the description of react","yarn npm info react --fields description"],["Show all available versions of react","yarn npm info react --fields versions"],["Show the readme of react","yarn npm info react --fields readme"],["Show a few fields of react","yarn npm info react --fields homepage,repository"]]});function d1(r){if(Array.isArray(r)){let e=[];for(let t of r)t=d1(t),t&&e.push(t);return e}else if(typeof r=="object"&&r!==null){let e={};for(let t of Object.keys(r)){if(t.startsWith("_"))continue;let i=d1(r[t]);i&&(e[t]=i)}return e}else return r||null}var Zue=Pe(Km()),eg=class extends De{constructor(){super(...arguments);this.scope=z.String("-s,--scope",{description:"Login to the registry configured for a given scope"});this.publish=z.Boolean("--publish",!1,{description:"Login to the publish registry"});this.alwaysAuth=z.Boolean("--always-auth",{description:"Set the npmAlwaysAuth configuration"})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),i=await UQ({configuration:t,cwd:this.context.cwd,publish:this.publish,scope:this.scope});return(await Ge.start({configuration:t,stdout:this.context.stdout,includeFooter:!1},async s=>{let o=await s9e({configuration:t,registry:i,report:s,stdin:this.context.stdin,stdout:this.context.stdout}),a=`/-/user/org.couchdb.user:${encodeURIComponent(o.name)}`,l=await Mt.put(a,o,{attemptedAs:o.name,configuration:t,registry:i,jsonResponse:!0,authType:Mt.AuthType.NO_AUTH});return await n9e(i,l.token,{alwaysAuth:this.alwaysAuth,scope:this.scope}),s.reportInfo(0,"Successfully logged in")})).exitCode()}};eg.paths=[["npm","login"]],eg.usage=ve.Usage({category:"Npm-related commands",description:"store new login info to access the npm registry",details:"\n      This command will ask you for your username, password, and 2FA One-Time-Password (when it applies). It will then modify your local configuration (in your home folder, never in the project itself) to reference the new tokens thus generated.\n\n      Adding the `-s,--scope` flag will cause the authentication to be done against whatever registry is configured for the associated scope (see also `npmScopes`).\n\n      Adding the `--publish` flag will cause the authentication to be done against the registry used when publishing the package (see also `publishConfig.registry` and `npmPublishRegistry`).\n    ",examples:[["Login to the default registry","yarn npm login"],["Login to the registry linked to the @my-scope registry","yarn npm login --scope my-scope"],["Login to the publish registry for the current package","yarn npm login --publish"]]});async function UQ({scope:r,publish:e,configuration:t,cwd:i}){return r&&e?or.getScopeRegistry(r,{configuration:t,type:or.RegistryType.PUBLISH_REGISTRY}):r?or.getScopeRegistry(r,{configuration:t}):e?or.getPublishRegistry((await Hh(t,i)).manifest,{configuration:t}):or.getDefaultRegistry({configuration:t})}async function n9e(r,e,{alwaysAuth:t,scope:i}){let n=o=>a=>{let l=Ie.isIndexableObject(a)?a:{},c=l[o],u=Ie.isIndexableObject(c)?c:{};return{...l,[o]:{...u,...t!==void 0?{npmAlwaysAuth:t}:{},npmAuthToken:e}}},s=i?{npmScopes:n(i)}:{npmRegistries:n(r)};return await ye.updateHomeConfiguration(s)}async function s9e({configuration:r,registry:e,report:t,stdin:i,stdout:n}){t.reportInfo(0,`Logging in to ${ee.pretty(r,e,ee.Type.URL)}`);let s=!1;if(e.match(/^https:\/\/npm\.pkg\.github\.com(\/|$)/)&&(t.reportInfo(0,"You seem to be using the GitHub Package Registry. Tokens must be generated with the 'repo', 'write:packages', and 'read:packages' permissions."),s=!0),t.reportSeparator(),process.env.YARN_IS_TEST_ENV)return{name:process.env.YARN_INJECT_NPM_USER||"",password:process.env.YARN_INJECT_NPM_PASSWORD||""};let{username:o,password:a}=await(0,Zue.prompt)([{type:"input",name:"username",message:"Username:",required:!0,onCancel:()=>process.exit(130),stdin:i,stdout:n},{type:"password",name:"password",message:s?"Token:":"Password:",required:!0,onCancel:()=>process.exit(130),stdin:i,stdout:n}]);return t.reportSeparator(),{name:o,password:a}}var mp=new Set(["npmAuthIdent","npmAuthToken"]),tg=class extends De{constructor(){super(...arguments);this.scope=z.String("-s,--scope",{description:"Logout of the registry configured for a given scope"});this.publish=z.Boolean("--publish",!1,{description:"Logout of the publish registry"});this.all=z.Boolean("-A,--all",!1,{description:"Logout of all registries"})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),i=async()=>{var c;let s=await UQ({configuration:t,cwd:this.context.cwd,publish:this.publish,scope:this.scope}),o=await ye.find(this.context.cwd,this.context.plugins),a=P.makeIdent((c=this.scope)!=null?c:null,"pkg");return!or.getAuthConfiguration(s,{configuration:o,ident:a}).get("npmAuthToken")};return(await Ge.start({configuration:t,stdout:this.context.stdout},async s=>{if(this.all&&(await a9e(),s.reportInfo(0,"Successfully logged out from everything")),this.scope){await _ue("npmScopes",this.scope),await i()?s.reportInfo(0,`Successfully logged out from ${this.scope}`):s.reportWarning(0,"Scope authentication settings removed, but some other ones settings still apply to it");return}let o=await UQ({configuration:t,cwd:this.context.cwd,publish:this.publish});await _ue("npmRegistries",o),await i()?s.reportInfo(0,`Successfully logged out from ${o}`):s.reportWarning(0,"Registry authentication settings removed, but some other ones settings still apply to it")})).exitCode()}};tg.paths=[["npm","logout"]],tg.usage=ve.Usage({category:"Npm-related commands",description:"logout of the npm registry",details:"\n      This command will log you out by modifying your local configuration (in your home folder, never in the project itself) to delete all credentials linked to a registry.\n\n      Adding the `-s,--scope` flag will cause the deletion to be done against whatever registry is configured for the associated scope (see also `npmScopes`).\n\n      Adding the `--publish` flag will cause the deletion to be done against the registry used when publishing the package (see also `publishConfig.registry` and `npmPublishRegistry`).\n\n      Adding the `-A,--all` flag will cause the deletion to be done against all registries and scopes.\n    ",examples:[["Logout of the default registry","yarn npm logout"],["Logout of the @my-scope scope","yarn npm logout --scope my-scope"],["Logout of the publish registry for the current package","yarn npm logout --publish"],["Logout of all registries","yarn npm logout --all"]]});function o9e(r,e){let t=r[e];if(!Ie.isIndexableObject(t))return!1;let i=new Set(Object.keys(t));if([...mp].every(s=>!i.has(s)))return!1;for(let s of mp)i.delete(s);if(i.size===0)return r[e]=void 0,!0;let n={...t};for(let s of mp)delete n[s];return r[e]=n,!0}async function a9e(){let r=e=>{let t=!1,i=Ie.isIndexableObject(e)?{...e}:{};i.npmAuthToken&&(delete i.npmAuthToken,t=!0);for(let n of Object.keys(i))o9e(i,n)&&(t=!0);if(Object.keys(i).length!==0)return t?i:e};return await ye.updateHomeConfiguration({npmRegistries:r,npmScopes:r})}async function _ue(r,e){return await ye.updateHomeConfiguration({[r]:t=>{let i=Ie.isIndexableObject(t)?t:{};if(!Object.prototype.hasOwnProperty.call(i,e))return t;let n=i[e],s=Ie.isIndexableObject(n)?n:{},o=new Set(Object.keys(s));if([...mp].every(l=>!o.has(l)))return t;for(let l of mp)o.delete(l);if(o.size===0)return Object.keys(i).length===1?void 0:{...i,[e]:void 0};let a={};for(let l of mp)a[l]=void 0;return{...i,[e]:{...s,...a}}}})}var rg=class extends De{constructor(){super(...arguments);this.access=z.String("--access",{description:"The access for the published package (public or restricted)"});this.tag=z.String("--tag","latest",{description:"The tag on the registry that the package should be attached to"});this.tolerateRepublish=z.Boolean("--tolerate-republish",!1,{description:"Warn and exit when republishing an already existing version of a package"});this.otp=z.String("--otp",{description:"The OTP token to use with the command"})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd);if(!n)throw new ct(i.cwd,this.context.cwd);if(n.manifest.private)throw new Qe("Private workspaces cannot be published");if(n.manifest.name===null||n.manifest.version===null)throw new Qe("Workspaces must have valid names and versions to be published on an external registry");await i.restoreInstallState();let s=n.manifest.name,o=n.manifest.version,a=or.getPublishRegistry(n.manifest,{configuration:t});return(await Ge.start({configuration:t,stdout:this.context.stdout},async c=>{var u,g;if(this.tolerateRepublish)try{let f=await Mt.get(Mt.getIdentUrl(s),{configuration:t,registry:a,ident:s,jsonResponse:!0});if(!Object.prototype.hasOwnProperty.call(f,"versions"))throw new at(15,'Registry returned invalid data for - missing "versions" field');if(Object.prototype.hasOwnProperty.call(f.versions,o)){c.reportWarning(0,`Registry already knows about version ${o}; skipping.`);return}}catch(f){if(((g=(u=f.originalError)==null?void 0:u.response)==null?void 0:g.statusCode)!==404)throw f}await Wt.maybeExecuteWorkspaceLifecycleScript(n,"prepublish",{report:c}),await ca.prepareForPack(n,{report:c},async()=>{let f=await ca.genPackList(n);for(let B of f)c.reportInfo(null,B);let h=await ca.genPackStream(n,f),p=await Ie.bufferStream(h),C=await Cp.getGitHead(n.cwd),y=await Cp.makePublishBody(n,p,{access:this.access,tag:this.tag,registry:a,gitHead:C});await Mt.put(Mt.getIdentUrl(s),y,{configuration:t,registry:a,ident:s,otp:this.otp,jsonResponse:!0})}),c.reportInfo(0,"Package archive published")})).exitCode()}};rg.paths=[["npm","publish"]],rg.usage=ve.Usage({category:"Npm-related commands",description:"publish the active workspace to the npm registry",details:'\n      This command will pack the active workspace into a fresh archive and upload it to the npm registry.\n\n      The package will by default be attached to the `latest` tag on the registry, but this behavior can be overriden by using the `--tag` option.\n\n      Note that for legacy reasons scoped packages are by default published with an access set to `restricted` (aka "private packages"). This requires you to register for a paid npm plan. In case you simply wish to publish a public scoped package to the registry (for free), just add the `--access public` flag. This behavior can be enabled by default through the `npmPublishAccess` settings.\n    ',examples:[["Publish the active workspace","yarn npm publish"]]});var $ue=Pe(Xr());var ig=class extends De{constructor(){super(...arguments);this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.package=z.String({required:!1})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd),s;if(typeof this.package<"u")s=P.parseIdent(this.package);else{if(!n)throw new ct(i.cwd,this.context.cwd);if(!n.manifest.name)throw new Qe(`Missing 'name' field in ${K.fromPortablePath(x.join(n.cwd,xt.manifest))}`);s=n.manifest.name}let o=await RE(s,t),l={children:Ie.sortMap(Object.entries(o),([c])=>c).map(([c,u])=>({value:ee.tuple(ee.Type.RESOLUTION,{descriptor:P.makeDescriptor(s,c),locator:P.makeLocator(s,u)})}))};return es.emitTree(l,{configuration:t,json:this.json,stdout:this.context.stdout})}};ig.paths=[["npm","tag","list"]],ig.usage=ve.Usage({category:"Npm-related commands",description:"list all dist-tags of a package",details:`
-      This command will list all tags of a package from the npm registry.
-
-      If the package is not specified, Yarn will default to the current workspace.
-    `,examples:[["List all tags of package `my-pkg`","yarn npm tag list my-pkg"]]});async function RE(r,e){let t=`/-/package${Mt.getIdentUrl(r)}/dist-tags`;return Mt.get(t,{configuration:e,ident:r,jsonResponse:!0,customErrorMessage:Mt.customPackageError})}var ng=class extends De{constructor(){super(...arguments);this.package=z.String();this.tag=z.String()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd);if(!n)throw new ct(i.cwd,this.context.cwd);let s=P.parseDescriptor(this.package,!0),o=s.range;if(!$ue.default.valid(o))throw new Qe(`The range ${ee.pretty(t,s.range,ee.Type.RANGE)} must be a valid semver version`);let a=or.getPublishRegistry(n.manifest,{configuration:t}),l=ee.pretty(t,s,ee.Type.IDENT),c=ee.pretty(t,o,ee.Type.RANGE),u=ee.pretty(t,this.tag,ee.Type.CODE);return(await Ge.start({configuration:t,stdout:this.context.stdout},async f=>{let h=await RE(s,t);Object.prototype.hasOwnProperty.call(h,this.tag)&&h[this.tag]===o&&f.reportWarning(0,`Tag ${u} is already set to version ${c}`);let p=`/-/package${Mt.getIdentUrl(s)}/dist-tags/${encodeURIComponent(this.tag)}`;await Mt.put(p,o,{configuration:t,registry:a,ident:s,jsonRequest:!0,jsonResponse:!0}),f.reportInfo(0,`Tag ${u} added to version ${c} of package ${l}`)})).exitCode()}};ng.paths=[["npm","tag","add"]],ng.usage=ve.Usage({category:"Npm-related commands",description:"add a tag for a specific version of a package",details:`
-      This command will add a tag to the npm registry for a specific version of a package. If the tag already exists, it will be overwritten.
-    `,examples:[["Add a `beta` tag for version `2.3.4-beta.4` of package `my-pkg`","yarn npm tag add my-pkg@2.3.4-beta.4 beta"]]});var sg=class extends De{constructor(){super(...arguments);this.package=z.String();this.tag=z.String()}async execute(){if(this.tag==="latest")throw new Qe("The 'latest' tag cannot be removed.");let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd);if(!n)throw new ct(i.cwd,this.context.cwd);let s=P.parseIdent(this.package),o=or.getPublishRegistry(n.manifest,{configuration:t}),a=ee.pretty(t,this.tag,ee.Type.CODE),l=ee.pretty(t,s,ee.Type.IDENT),c=await RE(s,t);if(!Object.prototype.hasOwnProperty.call(c,this.tag))throw new Qe(`${a} is not a tag of package ${l}`);return(await Ge.start({configuration:t,stdout:this.context.stdout},async g=>{let f=`/-/package${Mt.getIdentUrl(s)}/dist-tags/${encodeURIComponent(this.tag)}`;await Mt.del(f,{configuration:t,registry:o,ident:s,jsonResponse:!0}),g.reportInfo(0,`Tag ${a} removed from package ${l}`)})).exitCode()}};sg.paths=[["npm","tag","remove"]],sg.usage=ve.Usage({category:"Npm-related commands",description:"remove a tag from a package",details:`
-      This command will remove a tag from a package from the npm registry.
-    `,examples:[["Remove the `beta` tag from package `my-pkg`","yarn npm tag remove my-pkg beta"]]});var og=class extends De{constructor(){super(...arguments);this.scope=z.String("-s,--scope",{description:"Print username for the registry configured for a given scope"});this.publish=z.Boolean("--publish",!1,{description:"Print username for the publish registry"})}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),i;return this.scope&&this.publish?i=or.getScopeRegistry(this.scope,{configuration:t,type:or.RegistryType.PUBLISH_REGISTRY}):this.scope?i=or.getScopeRegistry(this.scope,{configuration:t}):this.publish?i=or.getPublishRegistry((await Hh(t,this.context.cwd)).manifest,{configuration:t}):i=or.getDefaultRegistry({configuration:t}),(await Ge.start({configuration:t,stdout:this.context.stdout},async s=>{var a,l;let o;try{o=await Mt.get("/-/whoami",{configuration:t,registry:i,authType:Mt.AuthType.ALWAYS_AUTH,jsonResponse:!0,ident:this.scope?P.makeIdent(this.scope,""):void 0})}catch(c){if(((a=c.response)==null?void 0:a.statusCode)===401||((l=c.response)==null?void 0:l.statusCode)===403){s.reportError(41,"Authentication failed - your credentials may have expired");return}else throw c}s.reportInfo(0,o.username)})).exitCode()}};og.paths=[["npm","whoami"]],og.usage=ve.Usage({category:"Npm-related commands",description:"display the name of the authenticated user",details:"\n      Print the username associated with the current authentication settings to the standard output.\n\n      When using `-s,--scope`, the username printed will be the one that matches the authentication settings of the registry associated with the given scope (those settings can be overriden using the `npmRegistries` map, and the registry associated with the scope is configured via the `npmScopes` map).\n\n      When using `--publish`, the registry we'll select will by default be the one used when publishing packages (`publishConfig.registry` or `npmPublishRegistry` if available, otherwise we'll fallback to the regular `npmRegistryServer`).\n    ",examples:[["Print username for the default registry","yarn npm whoami"],["Print username for the registry on a given scope","yarn npm whoami --scope company"]]});var A9e={configuration:{npmPublishAccess:{description:"Default access of the published packages",type:"STRING",default:null},npmAuditExcludePackages:{description:"Array of glob patterns of packages to exclude from npm audit",type:"STRING",default:[],isArray:!0},npmAuditIgnoreAdvisories:{description:"Array of glob patterns of advisory IDs to exclude from npm audit",type:"STRING",default:[],isArray:!0}},commands:[_u,$u,eg,tg,rg,ng,ig,sg,og]},l9e=A9e;var S1={};ut(S1,{default:()=>Q9e,patchUtils:()=>ag});var ag={};ut(ag,{applyPatchFile:()=>GQ,diffFolders:()=>b1,ensureUnpatchedDescriptor:()=>E1,extractPackageToDisk:()=>B1,extractPatchFlags:()=>oge,isParentRequired:()=>w1,loadPatchFiles:()=>LE,makeDescriptor:()=>I1,makeLocator:()=>y1,makePatchHash:()=>Q1,parseDescriptor:()=>NE,parseLocator:()=>TE,parsePatchFile:()=>FE});var c9e=/^@@ -(\d+)(,(\d+))? \+(\d+)(,(\d+))? @@.*/;function Ep(r){return x.relative(Oe.root,x.resolve(Oe.root,K.toPortablePath(r)))}function u9e(r){let e=r.trim().match(c9e);if(!e)throw new Error(`Bad header line: '${r}'`);return{original:{start:Math.max(Number(e[1]),1),length:Number(e[3]||1)},patched:{start:Math.max(Number(e[4]),1),length:Number(e[6]||1)}}}var g9e=420,f9e=493;var ege=()=>({semverExclusivity:null,diffLineFromPath:null,diffLineToPath:null,oldMode:null,newMode:null,deletedFileMode:null,newFileMode:null,renameFrom:null,renameTo:null,beforeHash:null,afterHash:null,fromPath:null,toPath:null,hunks:null}),h9e=r=>({header:u9e(r),parts:[]}),p9e={["@"]:"header",["-"]:"deletion",["+"]:"insertion",[" "]:"context",["\\"]:"pragma",undefined:"context"};function d9e(r){let e=[],t=ege(),i="parsing header",n=null,s=null;function o(){n&&(s&&(n.parts.push(s),s=null),t.hunks.push(n),n=null)}function a(){o(),e.push(t),t=ege()}for(let l=0;l<r.length;l++){let c=r[l];if(i==="parsing header")if(c.startsWith("@@"))i="parsing hunks",t.hunks=[],l-=1;else if(c.startsWith("diff --git ")){t&&t.diffLineFromPath&&a();let u=c.match(/^diff --git a\/(.*?) b\/(.*?)\s*$/);if(!u)throw new Error(`Bad diff line: ${c}`);t.diffLineFromPath=u[1],t.diffLineToPath=u[2]}else if(c.startsWith("old mode "))t.oldMode=c.slice(9).trim();else if(c.startsWith("new mode "))t.newMode=c.slice(9).trim();else if(c.startsWith("deleted file mode "))t.deletedFileMode=c.slice(18).trim();else if(c.startsWith("new file mode "))t.newFileMode=c.slice(14).trim();else if(c.startsWith("rename from "))t.renameFrom=c.slice(12).trim();else if(c.startsWith("rename to "))t.renameTo=c.slice(10).trim();else if(c.startsWith("index ")){let u=c.match(/(\w+)\.\.(\w+)/);if(!u)continue;t.beforeHash=u[1],t.afterHash=u[2]}else c.startsWith("semver exclusivity ")?t.semverExclusivity=c.slice(19).trim():c.startsWith("--- ")?t.fromPath=c.slice(6).trim():c.startsWith("+++ ")&&(t.toPath=c.slice(6).trim());else{let u=p9e[c[0]]||null;switch(u){case"header":o(),n=h9e(c);break;case null:i="parsing header",a(),l-=1;break;case"pragma":{if(!c.startsWith("\\ No newline at end of file"))throw new Error(`Unrecognized pragma in patch file: ${c}`);if(!s)throw new Error("Bad parser state: No newline at EOF pragma encountered without context");s.noNewlineAtEndOfFile=!0}break;case"context":case"deletion":case"insertion":{if(!n)throw new Error("Bad parser state: Hunk lines encountered before hunk header");s&&s.type!==u&&(n.parts.push(s),s=null),s||(s={type:u,lines:[],noNewlineAtEndOfFile:!1}),s.lines.push(c.slice(1))}break;default:Ie.assertNever(u);break}}}a();for(let{hunks:l}of e)if(l)for(let c of l)m9e(c);return e}function C9e(r){let e=[];for(let t of r){let{semverExclusivity:i,diffLineFromPath:n,diffLineToPath:s,oldMode:o,newMode:a,deletedFileMode:l,newFileMode:c,renameFrom:u,renameTo:g,beforeHash:f,afterHash:h,fromPath:p,toPath:C,hunks:y}=t,B=u?"rename":l?"file deletion":c?"file creation":y&&y.length>0?"patch":"mode change",v=null;switch(B){case"rename":{if(!u||!g)throw new Error("Bad parser state: rename from & to not given");e.push({type:"rename",semverExclusivity:i,fromPath:Ep(u),toPath:Ep(g)}),v=g}break;case"file deletion":{let D=n||p;if(!D)throw new Error("Bad parse state: no path given for file deletion");e.push({type:"file deletion",semverExclusivity:i,hunk:y&&y[0]||null,path:Ep(D),mode:HQ(l),hash:f})}break;case"file creation":{let D=s||C;if(!D)throw new Error("Bad parse state: no path given for file creation");e.push({type:"file creation",semverExclusivity:i,hunk:y&&y[0]||null,path:Ep(D),mode:HQ(c),hash:h})}break;case"patch":case"mode change":v=C||s;break;default:Ie.assertNever(B);break}v&&o&&a&&o!==a&&e.push({type:"mode change",semverExclusivity:i,path:Ep(v),oldMode:HQ(o),newMode:HQ(a)}),v&&y&&y.length&&e.push({type:"patch",semverExclusivity:i,path:Ep(v),hunks:y,beforeHash:f,afterHash:h})}if(e.length===0)throw new Error("Unable to parse patch file: No changes found. Make sure the patch is a valid UTF8 encoded string");return e}function HQ(r){let e=parseInt(r,8)&511;if(e!==g9e&&e!==f9e)throw new Error(`Unexpected file mode string: ${r}`);return e}function FE(r){let e=r.split(/\n/g);return e[e.length-1]===""&&e.pop(),C9e(d9e(e))}function m9e(r){let e=0,t=0;for(let{type:i,lines:n}of r.parts)switch(i){case"context":t+=n.length,e+=n.length;break;case"deletion":e+=n.length;break;case"insertion":t+=n.length;break;default:Ie.assertNever(i);break}if(e!==r.header.original.length||t!==r.header.patched.length){let i=n=>n<0?n:`+${n}`;throw new Error(`hunk header integrity check failed (expected @@ ${i(r.header.original.length)} ${i(r.header.patched.length)} @@, got @@ ${i(e)} ${i(t)} @@)`)}}var Ip=class extends Error{constructor(t,i){super(`Cannot apply hunk #${t+1}`);this.hunk=i}};async function yp(r,e,t){let i=await r.lstatPromise(e),n=await t();if(typeof n<"u"&&(e=n),r.lutimesPromise)await r.lutimesPromise(e,i.atime,i.mtime);else if(!i.isSymbolicLink())await r.utimesPromise(e,i.atime,i.mtime);else throw new Error("Cannot preserve the time values of a symlink")}async function GQ(r,{baseFs:e=new $t,dryRun:t=!1,version:i=null}={}){for(let n of r)if(!(n.semverExclusivity!==null&&i!==null&&!vt.satisfiesWithPrereleases(i,n.semverExclusivity)))switch(n.type){case"file deletion":if(t){if(!e.existsSync(n.path))throw new Error(`Trying to delete a file that doesn't exist: ${n.path}`)}else await yp(e,x.dirname(n.path),async()=>{await e.unlinkPromise(n.path)});break;case"rename":if(t){if(!e.existsSync(n.fromPath))throw new Error(`Trying to move a file that doesn't exist: ${n.fromPath}`)}else await yp(e,x.dirname(n.fromPath),async()=>{await yp(e,x.dirname(n.toPath),async()=>{await yp(e,n.fromPath,async()=>(await e.movePromise(n.fromPath,n.toPath),n.toPath))})});break;case"file creation":if(t){if(e.existsSync(n.path))throw new Error(`Trying to create a file that already exists: ${n.path}`)}else{let s=n.hunk?n.hunk.parts[0].lines.join(`
-`)+(n.hunk.parts[0].noNewlineAtEndOfFile?"":`
-`):"";await e.mkdirpPromise(x.dirname(n.path),{chmod:493,utimes:[xr.SAFE_TIME,xr.SAFE_TIME]}),await e.writeFilePromise(n.path,s,{mode:n.mode}),await e.utimesPromise(n.path,xr.SAFE_TIME,xr.SAFE_TIME)}break;case"patch":await yp(e,n.path,async()=>{await y9e(n,{baseFs:e,dryRun:t})});break;case"mode change":{let o=(await e.statPromise(n.path)).mode;if(tge(n.newMode)!==tge(o))continue;await yp(e,n.path,async()=>{await e.chmodPromise(n.path,n.newMode)})}break;default:Ie.assertNever(n);break}}function tge(r){return(r&64)>0}function rge(r){return r.replace(/\s+$/,"")}function I9e(r,e){return rge(r)===rge(e)}async function y9e({hunks:r,path:e},{baseFs:t,dryRun:i=!1}){let n=await t.statSync(e).mode,o=(await t.readFileSync(e,"utf8")).split(/\n/),a=[],l=0,c=0;for(let g of r){let f=Math.max(c,g.header.patched.start+l),h=Math.max(0,f-c),p=Math.max(0,o.length-f-g.header.original.length),C=Math.max(h,p),y=0,B=0,v=null;for(;y<=C;){if(y<=h&&(B=f-y,v=ige(g,o,B),v!==null)){y=-y;break}if(y<=p&&(B=f+y,v=ige(g,o,B),v!==null))break;y+=1}if(v===null)throw new Ip(r.indexOf(g),g);a.push(v),l+=y,c=B+g.header.original.length}if(i)return;let u=0;for(let g of a)for(let f of g)switch(f.type){case"splice":{let h=f.index+u;o.splice(h,f.numToDelete,...f.linesToInsert),u+=f.linesToInsert.length-f.numToDelete}break;case"pop":o.pop();break;case"push":o.push(f.line);break;default:Ie.assertNever(f);break}await t.writeFilePromise(e,o.join(`
-`),{mode:n})}function ige(r,e,t){let i=[];for(let n of r.parts)switch(n.type){case"context":case"deletion":{for(let s of n.lines){let o=e[t];if(o==null||!I9e(o,s))return null;t+=1}n.type==="deletion"&&(i.push({type:"splice",index:t-n.lines.length,numToDelete:n.lines.length,linesToInsert:[]}),n.noNewlineAtEndOfFile&&i.push({type:"push",line:""}))}break;case"insertion":i.push({type:"splice",index:t,numToDelete:0,linesToInsert:n.lines}),n.noNewlineAtEndOfFile&&i.push({type:"pop"});break;default:Ie.assertNever(n.type);break}return i}var B9e=/^builtin<([^>]+)>$/;function m1(r,e){let{source:t,selector:i,params:n}=P.parseRange(r);if(t===null)throw new Error("Patch locators must explicitly define their source");let s=i?i.split(/&/).map(c=>K.toPortablePath(c)):[],o=n&&typeof n.locator=="string"?P.parseLocator(n.locator):null,a=n&&typeof n.version=="string"?n.version:null,l=e(t);return{parentLocator:o,sourceItem:l,patchPaths:s,sourceVersion:a}}function NE(r){let{sourceItem:e,...t}=m1(r.range,P.parseDescriptor);return{...t,sourceDescriptor:e}}function TE(r){let{sourceItem:e,...t}=m1(r.reference,P.parseLocator);return{...t,sourceLocator:e}}function E1(r){if(!r.range.startsWith("patch:"))return r;let{sourceItem:e}=m1(r.range,P.parseDescriptor);return e}function nge({parentLocator:r,sourceItem:e,patchPaths:t,sourceVersion:i,patchHash:n},s){let o=r!==null?{locator:P.stringifyLocator(r)}:{},a=typeof i<"u"?{version:i}:{},l=typeof n<"u"?{hash:n}:{};return P.makeRange({protocol:"patch:",source:s(e),selector:t.join("&"),params:{...a,...l,...o}})}function I1(r,{parentLocator:e,sourceDescriptor:t,patchPaths:i}){return P.makeDescriptor(r,nge({parentLocator:e,sourceItem:t,patchPaths:i},P.stringifyDescriptor))}function y1(r,{parentLocator:e,sourcePackage:t,patchPaths:i,patchHash:n}){return P.makeLocator(r,nge({parentLocator:e,sourceItem:t,sourceVersion:t.version,patchPaths:i,patchHash:n},P.stringifyLocator))}function sge({onAbsolute:r,onRelative:e,onBuiltin:t},i){i.startsWith("~")&&(i=i.slice(1));let s=i.match(B9e);return s!==null?t(s[1]):x.isAbsolute(i)?r(i):e(i)}function oge(r){let e=r.startsWith("~");return e&&(r=r.slice(1)),{optional:e}}function w1(r){return sge({onAbsolute:()=>!1,onRelative:()=>!0,onBuiltin:()=>!1},r)}async function LE(r,e,t){let i=r!==null?await t.fetcher.fetch(r,t):null,n=i&&i.localPath?{packageFs:new qt(Oe.root),prefixPath:x.relative(Oe.root,i.localPath)}:i;i&&i!==n&&i.releaseFs&&i.releaseFs();let s=await Ie.releaseAfterUseAsync(async()=>await Promise.all(e.map(async o=>{let a=oge(o),l=await sge({onAbsolute:async()=>await M.readFilePromise(o,"utf8"),onRelative:async()=>{if(n===null)throw new Error("Assertion failed: The parent locator should have been fetched");return await n.packageFs.readFilePromise(x.join(n.prefixPath,o),"utf8")},onBuiltin:async c=>await t.project.configuration.firstHook(u=>u.getBuiltinPatch,t.project,c)},o);return{...a,source:l}})));for(let o of s)typeof o.source=="string"&&(o.source=o.source.replace(/\r\n?/g,`
-`));return s}async function B1(r,{cache:e,project:t}){let i=t.storedPackages.get(r.locatorHash);if(typeof i>"u")throw new Error("Assertion failed: Expected the package to be registered");let n=t.storedChecksums,s=new ti,o=t.configuration.makeFetcher(),a=await o.fetch(r,{cache:e,project:t,fetcher:o,checksums:n,report:s}),l=await M.mktempPromise(),c=x.join(l,"source"),u=x.join(l,"user"),g=x.join(l,".yarn-patch.json");return await Promise.all([M.copyPromise(c,a.prefixPath,{baseFs:a.packageFs}),M.copyPromise(u,a.prefixPath,{baseFs:a.packageFs}),M.writeJsonPromise(g,{locator:P.stringifyLocator(r),version:i.version})]),M.detachTemp(l),u}async function b1(r,e){let t=K.fromPortablePath(r).replace(/\\/g,"/"),i=K.fromPortablePath(e).replace(/\\/g,"/"),{stdout:n,stderr:s}=await Cr.execvp("git",["-c","core.safecrlf=false","diff","--src-prefix=a/","--dst-prefix=b/","--ignore-cr-at-eol","--full-index","--no-index","--no-renames","--text",t,i],{cwd:K.toPortablePath(process.cwd()),env:{...process.env,GIT_CONFIG_NOSYSTEM:"1",HOME:"",XDG_CONFIG_HOME:"",USERPROFILE:""}});if(s.length>0)throw new Error(`Unable to diff directories. Make sure you have a recent version of 'git' available in PATH.
-The following error was reported by 'git':
-${s}`);let o=t.startsWith("/")?a=>a.slice(1):a=>a;return n.replace(new RegExp(`(a|b)(${Ie.escapeRegExp(`/${o(t)}/`)})`,"g"),"$1/").replace(new RegExp(`(a|b)${Ie.escapeRegExp(`/${o(i)}/`)}`,"g"),"$1/").replace(new RegExp(Ie.escapeRegExp(`${t}/`),"g"),"").replace(new RegExp(Ie.escapeRegExp(`${i}/`),"g"),"")}function Q1(r,e){let t=[];for(let{source:i}of r){if(i===null)continue;let n=FE(i);for(let s of n){let{semverExclusivity:o,...a}=s;o!==null&&e!==null&&!vt.satisfiesWithPrereleases(e,o)||t.push(JSON.stringify(a))}}return li.makeHash(`${3}`,...t).slice(0,6)}function age(r,{configuration:e,report:t}){for(let i of r.parts)for(let n of i.lines)switch(i.type){case"context":t.reportInfo(null,`  ${ee.pretty(e,n,"grey")}`);break;case"deletion":t.reportError(28,`- ${ee.pretty(e,n,ee.Type.REMOVED)}`);break;case"insertion":t.reportError(28,`+ ${ee.pretty(e,n,ee.Type.ADDED)}`);break;default:Ie.assertNever(i.type)}}var YQ=class{supports(e,t){return!!e.reference.startsWith("patch:")}getLocalPath(e,t){return null}async fetch(e,t){let i=t.checksums.get(e.locatorHash)||null,[n,s,o]=await t.cache.fetchPackageFromCache(e,i,{onHit:()=>t.report.reportCacheHit(e),onMiss:()=>t.report.reportCacheMiss(e,`${P.prettyLocator(t.project.configuration,e)} can't be found in the cache and will be fetched from the disk`),loader:()=>this.patchPackage(e,t),skipIntegrityCheck:t.skipIntegrityCheck,...t.cacheOptions});return{packageFs:n,releaseFs:s,prefixPath:P.getIdentVendorPath(e),localPath:this.getLocalPath(e,t),checksum:o}}async patchPackage(e,t){let{parentLocator:i,sourceLocator:n,sourceVersion:s,patchPaths:o}=TE(e),a=await LE(i,o,t),l=await M.mktempPromise(),c=x.join(l,"current.zip"),u=await t.fetcher.fetch(n,t),g=P.getIdentVendorPath(e),f=await an(),h=new Wr(c,{libzip:f,create:!0,level:t.project.configuration.get("compressionLevel")});await Ie.releaseAfterUseAsync(async()=>{await h.copyPromise(g,u.prefixPath,{baseFs:u.packageFs,stableSort:!0})},u.releaseFs),h.saveAndClose();for(let{source:p,optional:C}of a){if(p===null)continue;let y=new Wr(c,{libzip:f,level:t.project.configuration.get("compressionLevel")}),B=new qt(x.resolve(Oe.root,g),{baseFs:y});try{await GQ(FE(p),{baseFs:B,version:s})}catch(v){if(!(v instanceof Ip))throw v;let D=t.project.configuration.get("enableInlineHunks"),T=!D&&!C?" (set enableInlineHunks for details)":"",H=`${P.prettyLocator(t.project.configuration,e)}: ${v.message}${T}`,j=$=>{!D||age(v.hunk,{configuration:t.project.configuration,report:$})};if(y.discardAndClose(),C){t.report.reportWarningOnce(66,H,{reportExtra:j});continue}else throw new at(66,H,j)}y.saveAndClose()}return new Wr(c,{libzip:f,level:t.project.configuration.get("compressionLevel")})}};var jQ=class{supportsDescriptor(e,t){return!!e.range.startsWith("patch:")}supportsLocator(e,t){return!!e.reference.startsWith("patch:")}shouldPersistResolution(e,t){return!1}bindDescriptor(e,t,i){let{patchPaths:n}=NE(e);return n.every(s=>!w1(s))?e:P.bindDescriptor(e,{locator:P.stringifyLocator(t)})}getResolutionDependencies(e,t){let{sourceDescriptor:i}=NE(e);return[i]}async getCandidates(e,t,i){if(!i.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let{parentLocator:n,sourceDescriptor:s,patchPaths:o}=NE(e),a=await LE(n,o,i.fetchOptions),l=t.get(s.descriptorHash);if(typeof l>"u")throw new Error("Assertion failed: The dependency should have been resolved");let c=Q1(a,l.version);return[y1(e,{parentLocator:n,sourcePackage:l,patchPaths:o,patchHash:c})]}async getSatisfying(e,t,i){return null}async resolve(e,t){let{sourceLocator:i}=TE(e);return{...await t.resolver.resolve(i,t),...e}}};var Ag=class extends De{constructor(){super(...arguments);this.save=z.Boolean("-s,--save",!1,{description:"Add the patch to your resolution entries"});this.patchFolder=z.String()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd);if(!n)throw new ct(i.cwd,this.context.cwd);await i.restoreInstallState();let s=x.resolve(this.context.cwd,K.toPortablePath(this.patchFolder)),o=x.join(s,"../source"),a=x.join(s,"../.yarn-patch.json");if(!M.existsSync(o))throw new Qe("The argument folder didn't get created by 'yarn patch'");let l=await b1(o,s),c=await M.readJsonPromise(a),u=P.parseLocator(c.locator,!0);if(!i.storedPackages.has(u.locatorHash))throw new Qe("No package found in the project for the given locator");if(!this.save){this.context.stdout.write(l);return}let g=t.get("patchFolder"),f=x.join(g,`${P.slugifyLocator(u)}.patch`);await M.mkdirPromise(g,{recursive:!0}),await M.writeFilePromise(f,l);let h=new Map;for(let p of i.storedPackages.values()){if(P.isVirtualLocator(p))continue;let C=p.dependencies.get(u.identHash);if(!C)continue;let y=P.isVirtualDescriptor(C)?P.devirtualizeDescriptor(C):C,B=E1(y),v=i.storedResolutions.get(B.descriptorHash);if(!v)throw new Error("Assertion failed: Expected the resolution to have been registered");if(!i.storedPackages.get(v))throw new Error("Assertion failed: Expected the package to have been registered");let T=i.originalPackages.get(p.locatorHash);if(!T)throw new Error("Assertion failed: Expected the original package to have been registered");let H=T.dependencies.get(C.identHash);if(!H)throw new Error("Assertion failed: Expected the original dependency to have been registered");h.set(H.descriptorHash,H)}for(let p of h.values()){let C=I1(p,{parentLocator:null,sourceDescriptor:P.convertLocatorToDescriptor(u),sourceVersion:null,patchPaths:[`./${x.relative(i.cwd,f)}`]});i.topLevelWorkspace.manifest.resolutions.push({pattern:{descriptor:{fullName:P.stringifyIdent(C),description:p.range}},reference:C.range})}await i.persist()}};Ag.paths=[["patch-commit"]],Ag.usage=ve.Usage({description:"generate a patch out of a directory",details:"\n      By default, this will print a patchfile on stdout based on the diff between the folder passed in and the original version of the package. Such file is suitable for consumption with the `patch:` protocol.\n\n      With the `-s,--save` option set, the patchfile won't be printed on stdout anymore and will instead be stored within a local file (by default kept within `.yarn/patches`, but configurable via the `patchFolder` setting). A `resolutions` entry will also be added to your top-level manifest, referencing the patched package via the `patch:` protocol.\n\n      Note that only folders generated by `yarn patch` are accepted as valid input for `yarn patch-commit`.\n    "});var lg=class extends De{constructor(){super(...arguments);this.json=z.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.package=z.String()}async execute(){let t=await ye.find(this.context.cwd,this.context.plugins),{project:i,workspace:n}=await je.find(t,this.context.cwd),s=await Rt.find(t);if(!n)throw new ct(i.cwd,this.context.cwd);await i.restoreInstallState();let o=P.parseLocator(this.package);if(o.reference==="unknown"){let a=Ie.mapAndFilter([...i.storedPackages.values()],l=>l.identHash!==o.identHash?Ie.mapAndFilter.skip:P.isVirtualLocator(l)?Ie.mapAndFilter.skip:l);if(a.length===0)throw new Qe("No package found in the project for the given locator");if(a.length>1)throw new Qe(`Multiple candidate packages found; explicitly choose one of them (use \`yarn why <package>\` to get more information as to who depends on them):
-${a.map(l=>`
-- ${P.prettyLocator(t,l)}`).join("")}`);o=a[0]}if(!i.storedPackages.has(o.locatorHash))throw new Qe("No package found in the project for the given locator");await Ge.start({configuration:t,json:this.json,stdout:this.context.stdout},async a=>{let l=await B1(o,{cache:s,project:i});a.reportJson({locator:P.stringifyLocator(o),path:K.fromPortablePath(l)}),a.reportInfo(0,`Package ${P.prettyLocator(t,o)} got extracted with success!`),a.reportInfo(0,`You can now edit the following folder: ${ee.pretty(t,K.fromPortablePath(l),"magenta")}`),a.reportInfo(0,`Once you are done run ${ee.pretty(t,`yarn patch-commit -s ${process.platform==="win32"?'"':""}${K.fromPortablePath(l)}${process.platform==="win32"?'"':""}`,"cyan")} and Yarn will store a patchfile based on your changes.`)})}};lg.paths=[["patch"]],lg.usage=ve.Usage({description:"prepare a package for patching",details:"\n      This command will cause a package to be extracted in a temporary directory intended to be editable at will.\n      \n      Once you're done with your changes, run `yarn patch-commit -s <path>` (with `<path>` being the temporary directory you received) to generate a patchfile and register it into your top-level manifest via the `patch:` protocol. Run `yarn patch-commit -h` for more details.\n    "});var b9e={configuration:{enableInlineHunks:{description:"If true, the installs will print unmatched patch hunks",type:"BOOLEAN",default:!1},patchFolder:{description:"Folder where the patch files must be written",type:"ABSOLUTE_PATH",default:"./.yarn/patches"}},commands:[Ag,lg],fetchers:[YQ],resolvers:[jQ]},Q9e=b9e;var D1={};ut(D1,{default:()=>x9e});var qQ=class{supportsPackage(e,t){return this.isEnabled(t)}async findPackageLocation(e,t){if(!this.isEnabled(t))throw new Error("Assertion failed: Expected the pnpm linker to be enabled");let i=x1(),n=t.project.installersCustomData.get(i);if(!n)throw new Qe(`The project in ${ee.pretty(t.project.configuration,`${t.project.cwd}/package.json`,ee.Type.PATH)} doesn't seem to have been installed - running an install there might help`);let s=n.pathByLocator.get(e.locatorHash);if(typeof s>"u")throw new Qe(`Couldn't find ${P.prettyLocator(t.project.configuration,e)} in the currently installed pnpm map - running an install might help`);return s}async findPackageLocator(e,t){if(!this.isEnabled(t))return null;let i=x1(),n=t.project.installersCustomData.get(i);if(!n)throw new Qe(`The project in ${ee.pretty(t.project.configuration,`${t.project.cwd}/package.json`,ee.Type.PATH)} doesn't seem to have been installed - running an install there might help`);let s=e.match(/(^.*\/node_modules\/(@[^/]*\/)?[^/]+)(\/.*$)/);if(s){let l=n.locatorByPath.get(s[1]);if(l)return l}let o=e,a=e;do{a=o,o=x.dirname(a);let l=n.locatorByPath.get(a);if(l)return l}while(o!==a);return null}makeInstaller(e){return new v1(e)}isEnabled(e){return e.project.configuration.get("nodeLinker")==="pnpm"}},v1=class{constructor(e){this.opts=e;this.asyncActions=new Ie.AsyncActions(10);this.customData={pathByLocator:new Map,locatorByPath:new Map}}getCustomDataKey(){return x1()}attachCustomData(e){}async installPackage(e,t,i){switch(e.linkType){case"SOFT":return this.installPackageSoft(e,t,i);case"HARD":return this.installPackageHard(e,t,i)}throw new Error("Assertion failed: Unsupported package link type")}async installPackageSoft(e,t,i){let n=x.resolve(t.packageFs.getRealPath(),t.prefixPath);return this.customData.pathByLocator.set(e.locatorHash,n),{packageLocation:n,buildDirective:null}}async installPackageHard(e,t,i){var u;let n=S9e(e,{project:this.opts.project});this.customData.locatorByPath.set(n,P.stringifyLocator(e)),this.customData.pathByLocator.set(e.locatorHash,n),i.holdFetchResult(this.asyncActions.set(e.locatorHash,async()=>{await M.mkdirPromise(n,{recursive:!0}),await M.copyPromise(n,t.prefixPath,{baseFs:t.packageFs,overwrite:!1})}));let o=P.isVirtualLocator(e)?P.devirtualizeLocator(e):e,a={manifest:(u=await ot.tryFind(t.prefixPath,{baseFs:t.packageFs}))!=null?u:new ot,misc:{hasBindingGyp:Co.hasBindingGyp(t)}},l=this.opts.project.getDependencyMeta(o,e.version),c=Co.extractBuildScripts(e,a,l,{configuration:this.opts.project.configuration,report:this.opts.report});return{packageLocation:n,buildDirective:c}}async attachInternalDependencies(e,t){this.opts.project.configuration.get("nodeLinker")==="pnpm"&&(!Age(e,{project:this.opts.project})||this.asyncActions.reduce(e.locatorHash,async i=>{await i;let n=this.customData.pathByLocator.get(e.locatorHash);if(typeof n>"u")throw new Error(`Assertion failed: Expected the package to have been registered (${P.stringifyLocator(e)})`);let s=x.join(n,xt.nodeModules),o=[],a=await lge(s);for(let[l,c]of t){let u=c;Age(c,{project:this.opts.project})||(this.opts.report.reportWarningOnce(0,"The pnpm linker doesn't support providing different versions to workspaces' peer dependencies"),u=P.devirtualizeLocator(c));let g=this.customData.pathByLocator.get(u.locatorHash);if(typeof g>"u")throw new Error(`Assertion failed: Expected the package to have been registered (${P.stringifyLocator(c)})`);let f=P.stringifyIdent(l),h=x.join(s,f),p=x.relative(x.dirname(h),g),C=a.get(f);a.delete(f),o.push(Promise.resolve().then(async()=>{if(C){if(C.isSymbolicLink()&&await M.readlinkPromise(h)===p)return;await M.removePromise(h)}await M.mkdirpPromise(x.dirname(h)),process.platform=="win32"?await M.symlinkPromise(g,h,"junction"):await M.symlinkPromise(p,h)}))}o.push(cge(s,a)),await Promise.all(o)}))}async attachExternalDependents(e,t){throw new Error("External dependencies haven't been implemented for the pnpm linker")}async finalizeInstall(){let e=gge(this.opts.project);if(this.opts.project.configuration.get("nodeLinker")!=="pnpm")await M.removePromise(e);else{let t=[],i=new Set;for(let s of this.customData.pathByLocator.values()){let o=x.contains(e,s);if(o!==null){let[a,,...l]=o.split(x.sep);i.add(a);let c=x.join(e,a);t.push(M.readdirPromise(c).then(u=>Promise.all(u.map(async g=>{let f=x.join(c,g);if(g===xt.nodeModules){let h=await lge(f);return h.delete(l.join(x.sep)),cge(f,h)}else return M.removePromise(f)}))).catch(u=>{if(u.code!=="ENOENT")throw u}))}}let n;try{n=await M.readdirPromise(e)}catch{n=[]}for(let s of n)i.has(s)||t.push(M.removePromise(x.join(e,s)));await Promise.all(t)}return await this.asyncActions.wait(),await P1(e),this.opts.project.configuration.get("nodeLinker")!=="node-modules"&&await P1(uge(this.opts.project)),{customData:this.customData}}};function x1(){return JSON.stringify({name:"PnpmInstaller",version:2})}function uge(r){return x.join(r.cwd,xt.nodeModules)}function gge(r){return x.join(uge(r),".store")}function S9e(r,{project:e}){let t=P.slugifyLocator(r),i=P.getIdentVendorPath(r);return x.join(gge(e),t,i)}function Age(r,{project:e}){return!P.isVirtualLocator(r)||!e.tryWorkspaceByLocator(r)}async function lge(r){let e=new Map,t=[];try{t=await M.readdirPromise(r,{withFileTypes:!0})}catch(i){if(i.code!=="ENOENT")throw i}try{for(let i of t)if(!i.name.startsWith("."))if(i.name.startsWith("@")){let n=await M.readdirPromise(x.join(r,i.name),{withFileTypes:!0});if(n.length===0)e.set(i.name,i);else for(let s of n)e.set(`${i.name}/${s.name}`,s)}else e.set(i.name,i)}catch(i){if(i.code!=="ENOENT")throw i}return e}async function cge(r,e){var n;let t=[],i=new Set;for(let s of e.keys()){t.push(M.removePromise(x.join(r,s)));let o=(n=P.tryParseIdent(s))==null?void 0:n.scope;o&&i.add(`@${o}`)}return Promise.all(t).then(()=>Promise.all([...i].map(s=>P1(x.join(r,s)))))}async function P1(r){try{await M.rmdirPromise(r)}catch(e){if(e.code!=="ENOENT"&&e.code!=="ENOTEMPTY")throw e}}var v9e={linkers:[qQ]},x9e=v9e;var Bb=()=>({modules:new Map([["@yarnpkg/cli",Nm],["@yarnpkg/core",sm],["@yarnpkg/fslib",Wp],["@yarnpkg/libzip",xC],["@yarnpkg/parsers",td],["@yarnpkg/shell",RC],["clipanion",T$(ud)],["semver",P9e],["typanion",hn],["yup",D9e],["@yarnpkg/plugin-essentials",CO],["@yarnpkg/plugin-compat",wO],["@yarnpkg/plugin-dlx",BO],["@yarnpkg/plugin-file",vO],["@yarnpkg/plugin-git",dO],["@yarnpkg/plugin-github",xO],["@yarnpkg/plugin-http",PO],["@yarnpkg/plugin-init",FO],["@yarnpkg/plugin-link",NO],["@yarnpkg/plugin-nm",dM],["@yarnpkg/plugin-npm",f1],["@yarnpkg/plugin-npm-cli",C1],["@yarnpkg/plugin-pack",A1],["@yarnpkg/plugin-patch",S1],["@yarnpkg/plugin-pnp",sM],["@yarnpkg/plugin-pnpm",D1]]),plugins:new Set(["@yarnpkg/plugin-essentials","@yarnpkg/plugin-compat","@yarnpkg/plugin-dlx","@yarnpkg/plugin-file","@yarnpkg/plugin-git","@yarnpkg/plugin-github","@yarnpkg/plugin-http","@yarnpkg/plugin-init","@yarnpkg/plugin-link","@yarnpkg/plugin-nm","@yarnpkg/plugin-npm","@yarnpkg/plugin-npm-cli","@yarnpkg/plugin-pack","@yarnpkg/plugin-patch","@yarnpkg/plugin-pnp","@yarnpkg/plugin-pnpm"])});$0({binaryVersion:Tr||"<unknown>",pluginConfiguration:Bb()});})();
-/*!
- * buildToken
- * Builds OAuth token prefix (helper function)
- *
- * @name buildToken
- * @function
- * @param {GitUrl} obj The parsed Git url object.
- * @return {String} token prefix
- */
-/*!
- * fill-range <https://github.com/jonschlinkert/fill-range>
- *
- * Copyright (c) 2014-present, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-/*!
- * is-extglob <https://github.com/jonschlinkert/is-extglob>
- *
- * Copyright (c) 2014-2016, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-/*!
- * is-glob <https://github.com/jonschlinkert/is-glob>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-/*!
- * is-number <https://github.com/jonschlinkert/is-number>
- *
- * Copyright (c) 2014-present, Jon Schlinkert.
- * Released under the MIT License.
- */
-/*!
- * is-windows <https://github.com/jonschlinkert/is-windows>
- *
- * Copyright © 2015-2018, Jon Schlinkert.
- * Released under the MIT License.
- */
-/*!
- * to-regex-range <https://github.com/micromatch/to-regex-range>
- *
- * Copyright (c) 2015-present, Jon Schlinkert.
- * Released under the MIT License.
- */
-/**
-  @license
-  Copyright (c) 2015, Rebecca Turner
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  PERFORMANCE OF THIS SOFTWARE.
- */
-/**
-  @license
-  Copyright Joyent, Inc. and other Node contributors.
-
-  Permission is hereby granted, free of charge, to any person obtaining a
-  copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to permit
-  persons to whom the Software is furnished to do so, subject to the
-  following conditions:
-
-  The above copyright notice and this permission notice shall be included
-  in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-  NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-  OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-  USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-/**
-  @license
-  Copyright Node.js contributors. All rights reserved.
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to
-  deal in the Software without restriction, including without limitation the
-  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-  sell copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-  IN THE SOFTWARE.
-*/
-/**
-  @license
-  The MIT License (MIT)
-
-  Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com)
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
diff --git a/.yarn/releases/yarn-4.1.0.cjs b/.yarn/releases/yarn-4.1.0.cjs
new file mode 100755
index 0000000000000..738adce5914a0
--- /dev/null
+++ b/.yarn/releases/yarn-4.1.0.cjs
@@ -0,0 +1,893 @@
+#!/usr/bin/env node
+/* eslint-disable */
+//prettier-ignore
+(()=>{var Z3e=Object.create;var NR=Object.defineProperty;var $3e=Object.getOwnPropertyDescriptor;var e_e=Object.getOwnPropertyNames;var t_e=Object.getPrototypeOf,r_e=Object.prototype.hasOwnProperty;var ve=(t=>typeof require<"u"?require:typeof Proxy<"u"?new Proxy(t,{get:(e,r)=>(typeof require<"u"?require:e)[r]}):t)(function(t){if(typeof require<"u")return require.apply(this,arguments);throw new Error('Dynamic require of "'+t+'" is not supported')});var Et=(t,e)=>()=>(t&&(e=t(t=0)),e);var _=(t,e)=>()=>(e||t((e={exports:{}}).exports,e),e.exports),Vt=(t,e)=>{for(var r in e)NR(t,r,{get:e[r],enumerable:!0})},n_e=(t,e,r,o)=>{if(e&&typeof e=="object"||typeof e=="function")for(let a of e_e(e))!r_e.call(t,a)&&a!==r&&NR(t,a,{get:()=>e[a],enumerable:!(o=$3e(e,a))||o.enumerable});return t};var $e=(t,e,r)=>(r=t!=null?Z3e(t_e(t)):{},n_e(e||!t||!t.__esModule?NR(r,"default",{value:t,enumerable:!0}):r,t));var vi={};Vt(vi,{SAFE_TIME:()=>x7,S_IFDIR:()=>wD,S_IFLNK:()=>ID,S_IFMT:()=>Ou,S_IFREG:()=>jw});var Ou,wD,jw,ID,x7,k7=Et(()=>{Ou=61440,wD=16384,jw=32768,ID=40960,x7=456789e3});var ar={};Vt(ar,{EBADF:()=>Io,EBUSY:()=>i_e,EEXIST:()=>u_e,EINVAL:()=>o_e,EISDIR:()=>c_e,ENOENT:()=>a_e,ENOSYS:()=>s_e,ENOTDIR:()=>l_e,ENOTEMPTY:()=>f_e,EOPNOTSUPP:()=>p_e,EROFS:()=>A_e,ERR_DIR_CLOSED:()=>LR});function Tl(t,e){return Object.assign(new Error(`${t}: ${e}`),{code:t})}function i_e(t){return Tl("EBUSY",t)}function s_e(t,e){return Tl("ENOSYS",`${t}, ${e}`)}function o_e(t){return Tl("EINVAL",`invalid argument, ${t}`)}function Io(t){return Tl("EBADF",`bad file descriptor, ${t}`)}function a_e(t){return Tl("ENOENT",`no such file or directory, ${t}`)}function l_e(t){return Tl("ENOTDIR",`not a directory, ${t}`)}function c_e(t){return Tl("EISDIR",`illegal operation on a directory, ${t}`)}function u_e(t){return Tl("EEXIST",`file already exists, ${t}`)}function A_e(t){return Tl("EROFS",`read-only filesystem, ${t}`)}function f_e(t){return Tl("ENOTEMPTY",`directory not empty, ${t}`)}function p_e(t){return Tl("EOPNOTSUPP",`operation not supported, ${t}`)}function LR(){return Tl("ERR_DIR_CLOSED","Directory handle was closed")}var BD=Et(()=>{});var Ea={};Vt(Ea,{BigIntStatsEntry:()=>ty,DEFAULT_MODE:()=>UR,DirEntry:()=>OR,StatEntry:()=>ey,areStatsEqual:()=>_R,clearStats:()=>vD,convertToBigIntStats:()=>g_e,makeDefaultStats:()=>Q7,makeEmptyStats:()=>h_e});function Q7(){return new ey}function h_e(){return vD(Q7())}function vD(t){for(let e in t)if(Object.hasOwn(t,e)){let r=t[e];typeof r=="number"?t[e]=0:typeof r=="bigint"?t[e]=BigInt(0):MR.types.isDate(r)&&(t[e]=new Date(0))}return t}function g_e(t){let e=new ty;for(let r in t)if(Object.hasOwn(t,r)){let o=t[r];typeof o=="number"?e[r]=BigInt(o):MR.types.isDate(o)&&(e[r]=new Date(o))}return e.atimeNs=e.atimeMs*BigInt(1e6),e.mtimeNs=e.mtimeMs*BigInt(1e6),e.ctimeNs=e.ctimeMs*BigInt(1e6),e.birthtimeNs=e.birthtimeMs*BigInt(1e6),e}function _R(t,e){if(t.atimeMs!==e.atimeMs||t.birthtimeMs!==e.birthtimeMs||t.blksize!==e.blksize||t.blocks!==e.blocks||t.ctimeMs!==e.ctimeMs||t.dev!==e.dev||t.gid!==e.gid||t.ino!==e.ino||t.isBlockDevice()!==e.isBlockDevice()||t.isCharacterDevice()!==e.isCharacterDevice()||t.isDirectory()!==e.isDirectory()||t.isFIFO()!==e.isFIFO()||t.isFile()!==e.isFile()||t.isSocket()!==e.isSocket()||t.isSymbolicLink()!==e.isSymbolicLink()||t.mode!==e.mode||t.mtimeMs!==e.mtimeMs||t.nlink!==e.nlink||t.rdev!==e.rdev||t.size!==e.size||t.uid!==e.uid)return!1;let r=t,o=e;return!(r.atimeNs!==o.atimeNs||r.mtimeNs!==o.mtimeNs||r.ctimeNs!==o.ctimeNs||r.birthtimeNs!==o.birthtimeNs)}var MR,UR,OR,ey,ty,HR=Et(()=>{MR=$e(ve("util")),UR=33188,OR=class{constructor(){this.name="";this.path="";this.mode=0}isBlockDevice(){return!1}isCharacterDevice(){return!1}isDirectory(){return(this.mode&61440)===16384}isFIFO(){return!1}isFile(){return(this.mode&61440)===32768}isSocket(){return!1}isSymbolicLink(){return(this.mode&61440)===40960}},ey=class{constructor(){this.uid=0;this.gid=0;this.size=0;this.blksize=0;this.atimeMs=0;this.mtimeMs=0;this.ctimeMs=0;this.birthtimeMs=0;this.atime=new Date(0);this.mtime=new Date(0);this.ctime=new Date(0);this.birthtime=new Date(0);this.dev=0;this.ino=0;this.mode=UR;this.nlink=1;this.rdev=0;this.blocks=1}isBlockDevice(){return!1}isCharacterDevice(){return!1}isDirectory(){return(this.mode&61440)===16384}isFIFO(){return!1}isFile(){return(this.mode&61440)===32768}isSocket(){return!1}isSymbolicLink(){return(this.mode&61440)===40960}},ty=class{constructor(){this.uid=BigInt(0);this.gid=BigInt(0);this.size=BigInt(0);this.blksize=BigInt(0);this.atimeMs=BigInt(0);this.mtimeMs=BigInt(0);this.ctimeMs=BigInt(0);this.birthtimeMs=BigInt(0);this.atimeNs=BigInt(0);this.mtimeNs=BigInt(0);this.ctimeNs=BigInt(0);this.birthtimeNs=BigInt(0);this.atime=new Date(0);this.mtime=new Date(0);this.ctime=new Date(0);this.birthtime=new Date(0);this.dev=BigInt(0);this.ino=BigInt(0);this.mode=BigInt(UR);this.nlink=BigInt(1);this.rdev=BigInt(0);this.blocks=BigInt(1)}isBlockDevice(){return!1}isCharacterDevice(){return!1}isDirectory(){return(this.mode&BigInt(61440))===BigInt(16384)}isFIFO(){return!1}isFile(){return(this.mode&BigInt(61440))===BigInt(32768)}isSocket(){return!1}isSymbolicLink(){return(this.mode&BigInt(61440))===BigInt(40960)}}});function C_e(t){let e,r;if(e=t.match(y_e))t=e[1];else if(r=t.match(E_e))t=`\\\\${r[1]?".\\":""}${r[2]}`;else return t;return t.replace(/\//g,"\\")}function w_e(t){t=t.replace(/\\/g,"/");let e,r;return(e=t.match(d_e))?t=`/${e[1]}`:(r=t.match(m_e))&&(t=`/unc/${r[1]?".dot/":""}${r[2]}`),t}function DD(t,e){return t===ue?R7(e):jR(e)}var Gw,Bt,dr,ue,V,F7,d_e,m_e,y_e,E_e,jR,R7,Ca=Et(()=>{Gw=$e(ve("path")),Bt={root:"/",dot:".",parent:".."},dr={home:"~",nodeModules:"node_modules",manifest:"package.json",lockfile:"yarn.lock",virtual:"__virtual__",pnpJs:".pnp.js",pnpCjs:".pnp.cjs",pnpData:".pnp.data.json",pnpEsmLoader:".pnp.loader.mjs",rc:".yarnrc.yml",env:".env"},ue=Object.create(Gw.default),V=Object.create(Gw.default.posix);ue.cwd=()=>process.cwd();V.cwd=process.platform==="win32"?()=>jR(process.cwd()):process.cwd;process.platform==="win32"&&(V.resolve=(...t)=>t.length>0&&V.isAbsolute(t[0])?Gw.default.posix.resolve(...t):Gw.default.posix.resolve(V.cwd(),...t));F7=function(t,e,r){return e=t.normalize(e),r=t.normalize(r),e===r?".":(e.endsWith(t.sep)||(e=e+t.sep),r.startsWith(e)?r.slice(e.length):null)};ue.contains=(t,e)=>F7(ue,t,e);V.contains=(t,e)=>F7(V,t,e);d_e=/^([a-zA-Z]:.*)$/,m_e=/^\/\/(\.\/)?(.*)$/,y_e=/^\/([a-zA-Z]:.*)$/,E_e=/^\/unc\/(\.dot\/)?(.*)$/;jR=process.platform==="win32"?w_e:t=>t,R7=process.platform==="win32"?C_e:t=>t;ue.fromPortablePath=R7;ue.toPortablePath=jR});async function SD(t,e){let r="0123456789abcdef";await t.mkdirPromise(e.indexPath,{recursive:!0});let o=[];for(let a of r)for(let n of r)o.push(t.mkdirPromise(t.pathUtils.join(e.indexPath,`${a}${n}`),{recursive:!0}));return await Promise.all(o),e.indexPath}async function T7(t,e,r,o,a){let n=t.pathUtils.normalize(e),u=r.pathUtils.normalize(o),A=[],p=[],{atime:h,mtime:E}=a.stableTime?{atime:Og,mtime:Og}:await r.lstatPromise(u);await t.mkdirpPromise(t.pathUtils.dirname(e),{utimes:[h,E]}),await GR(A,p,t,n,r,u,{...a,didParentExist:!0});for(let I of A)await I();await Promise.all(p.map(I=>I()))}async function GR(t,e,r,o,a,n,u){let A=u.didParentExist?await N7(r,o):null,p=await a.lstatPromise(n),{atime:h,mtime:E}=u.stableTime?{atime:Og,mtime:Og}:p,I;switch(!0){case p.isDirectory():I=await B_e(t,e,r,o,A,a,n,p,u);break;case p.isFile():I=await S_e(t,e,r,o,A,a,n,p,u);break;case p.isSymbolicLink():I=await P_e(t,e,r,o,A,a,n,p,u);break;default:throw new Error(`Unsupported file type (${p.mode})`)}return(u.linkStrategy?.type!=="HardlinkFromIndex"||!p.isFile())&&((I||A?.mtime?.getTime()!==E.getTime()||A?.atime?.getTime()!==h.getTime())&&(e.push(()=>r.lutimesPromise(o,h,E)),I=!0),(A===null||(A.mode&511)!==(p.mode&511))&&(e.push(()=>r.chmodPromise(o,p.mode&511)),I=!0)),I}async function N7(t,e){try{return await t.lstatPromise(e)}catch{return null}}async function B_e(t,e,r,o,a,n,u,A,p){if(a!==null&&!a.isDirectory())if(p.overwrite)t.push(async()=>r.removePromise(o)),a=null;else return!1;let h=!1;a===null&&(t.push(async()=>{try{await r.mkdirPromise(o,{mode:A.mode})}catch(v){if(v.code!=="EEXIST")throw v}}),h=!0);let E=await n.readdirPromise(u),I=p.didParentExist&&!a?{...p,didParentExist:!1}:p;if(p.stableSort)for(let v of E.sort())await GR(t,e,r,r.pathUtils.join(o,v),n,n.pathUtils.join(u,v),I)&&(h=!0);else(await Promise.all(E.map(async x=>{await GR(t,e,r,r.pathUtils.join(o,x),n,n.pathUtils.join(u,x),I)}))).some(x=>x)&&(h=!0);return h}async function v_e(t,e,r,o,a,n,u,A,p,h){let E=await n.checksumFilePromise(u,{algorithm:"sha1"}),I=420,v=A.mode&511,x=`${E}${v!==I?v.toString(8):""}`,C=r.pathUtils.join(h.indexPath,E.slice(0,2),`${x}.dat`),R;(ce=>(ce[ce.Lock=0]="Lock",ce[ce.Rename=1]="Rename"))(R||={});let L=1,U=await N7(r,C);if(a){let ae=U&&a.dev===U.dev&&a.ino===U.ino,fe=U?.mtimeMs!==I_e;if(ae&&fe&&h.autoRepair&&(L=0,U=null),!ae)if(p.overwrite)t.push(async()=>r.removePromise(o)),a=null;else return!1}let J=!U&&L===1?`${C}.${Math.floor(Math.random()*4294967296).toString(16).padStart(8,"0")}`:null,te=!1;return t.push(async()=>{if(!U&&(L===0&&await r.lockPromise(C,async()=>{let ae=await n.readFilePromise(u);await r.writeFilePromise(C,ae)}),L===1&&J)){let ae=await n.readFilePromise(u);await r.writeFilePromise(J,ae);try{await r.linkPromise(J,C)}catch(fe){if(fe.code==="EEXIST")te=!0,await r.unlinkPromise(J);else throw fe}}a||await r.linkPromise(C,o)}),e.push(async()=>{U||(await r.lutimesPromise(C,Og,Og),v!==I&&await r.chmodPromise(C,v)),J&&!te&&await r.unlinkPromise(J)}),!1}async function D_e(t,e,r,o,a,n,u,A,p){if(a!==null)if(p.overwrite)t.push(async()=>r.removePromise(o)),a=null;else return!1;return t.push(async()=>{let h=await n.readFilePromise(u);await r.writeFilePromise(o,h)}),!0}async function S_e(t,e,r,o,a,n,u,A,p){return p.linkStrategy?.type==="HardlinkFromIndex"?v_e(t,e,r,o,a,n,u,A,p,p.linkStrategy):D_e(t,e,r,o,a,n,u,A,p)}async function P_e(t,e,r,o,a,n,u,A,p){if(a!==null)if(p.overwrite)t.push(async()=>r.removePromise(o)),a=null;else return!1;return t.push(async()=>{await r.symlinkPromise(DD(r.pathUtils,await n.readlinkPromise(u)),o)}),!0}var Og,I_e,qR=Et(()=>{Ca();Og=new Date(456789e3*1e3),I_e=Og.getTime()});function PD(t,e,r,o){let a=()=>{let n=r.shift();if(typeof n>"u")return null;let u=t.pathUtils.join(e,n);return Object.assign(t.statSync(u),{name:n,path:void 0})};return new qw(e,a,o)}var qw,L7=Et(()=>{BD();qw=class{constructor(e,r,o={}){this.path=e;this.nextDirent=r;this.opts=o;this.closed=!1}throwIfClosed(){if(this.closed)throw LR()}async*[Symbol.asyncIterator](){try{let e;for(;(e=await this.read())!==null;)yield e}finally{await this.close()}}read(e){let r=this.readSync();return typeof e<"u"?e(null,r):Promise.resolve(r)}readSync(){return this.throwIfClosed(),this.nextDirent()}close(e){return this.closeSync(),typeof e<"u"?e(null):Promise.resolve()}closeSync(){this.throwIfClosed(),this.opts.onClose?.(),this.closed=!0}}});function O7(t,e){if(t!==e)throw new Error(`Invalid StatWatcher status: expected '${e}', got '${t}'`)}var M7,ry,U7=Et(()=>{M7=ve("events");HR();ry=class extends M7.EventEmitter{constructor(r,o,{bigint:a=!1}={}){super();this.status="ready";this.changeListeners=new Map;this.startTimeout=null;this.fakeFs=r,this.path=o,this.bigint=a,this.lastStats=this.stat()}static create(r,o,a){let n=new ry(r,o,a);return n.start(),n}start(){O7(this.status,"ready"),this.status="running",this.startTimeout=setTimeout(()=>{this.startTimeout=null,this.fakeFs.existsSync(this.path)||this.emit("change",this.lastStats,this.lastStats)},3)}stop(){O7(this.status,"running"),this.status="stopped",this.startTimeout!==null&&(clearTimeout(this.startTimeout),this.startTimeout=null),this.emit("stop")}stat(){try{return this.fakeFs.statSync(this.path,{bigint:this.bigint})}catch{let o=this.bigint?new ty:new ey;return vD(o)}}makeInterval(r){let o=setInterval(()=>{let a=this.stat(),n=this.lastStats;_R(a,n)||(this.lastStats=a,this.emit("change",a,n))},r.interval);return r.persistent?o:o.unref()}registerChangeListener(r,o){this.addListener("change",r),this.changeListeners.set(r,this.makeInterval(o))}unregisterChangeListener(r){this.removeListener("change",r);let o=this.changeListeners.get(r);typeof o<"u"&&clearInterval(o),this.changeListeners.delete(r)}unregisterAllChangeListeners(){for(let r of this.changeListeners.keys())this.unregisterChangeListener(r)}hasChangeListeners(){return this.changeListeners.size>0}ref(){for(let r of this.changeListeners.values())r.ref();return this}unref(){for(let r of this.changeListeners.values())r.unref();return this}}});function ny(t,e,r,o){let a,n,u,A;switch(typeof r){case"function":a=!1,n=!0,u=5007,A=r;break;default:({bigint:a=!1,persistent:n=!0,interval:u=5007}=r),A=o;break}let p=bD.get(t);typeof p>"u"&&bD.set(t,p=new Map);let h=p.get(e);return typeof h>"u"&&(h=ry.create(t,e,{bigint:a}),p.set(e,h)),h.registerChangeListener(A,{persistent:n,interval:u}),h}function Mg(t,e,r){let o=bD.get(t);if(typeof o>"u")return;let a=o.get(e);typeof a>"u"||(typeof r>"u"?a.unregisterAllChangeListeners():a.unregisterChangeListener(r),a.hasChangeListeners()||(a.stop(),o.delete(e)))}function Ug(t){let e=bD.get(t);if(!(typeof e>"u"))for(let r of e.keys())Mg(t,r)}var bD,YR=Et(()=>{U7();bD=new WeakMap});function b_e(t){let e=t.match(/\r?\n/g);if(e===null)return H7.EOL;let r=e.filter(a=>a===`\r
+`).length,o=e.length-r;return r>o?`\r
+`:`
+`}function _g(t,e){return e.replace(/\r?\n/g,b_e(t))}var _7,H7,gf,Mu,Hg=Et(()=>{_7=ve("crypto"),H7=ve("os");qR();Ca();gf=class{constructor(e){this.pathUtils=e}async*genTraversePromise(e,{stableSort:r=!1}={}){let o=[e];for(;o.length>0;){let a=o.shift();if((await this.lstatPromise(a)).isDirectory()){let u=await this.readdirPromise(a);if(r)for(let A of u.sort())o.push(this.pathUtils.join(a,A));else throw new Error("Not supported")}else yield a}}async checksumFilePromise(e,{algorithm:r="sha512"}={}){let o=await this.openPromise(e,"r");try{let n=Buffer.allocUnsafeSlow(65536),u=(0,_7.createHash)(r),A=0;for(;(A=await this.readPromise(o,n,0,65536))!==0;)u.update(A===65536?n:n.slice(0,A));return u.digest("hex")}finally{await this.closePromise(o)}}async removePromise(e,{recursive:r=!0,maxRetries:o=5}={}){let a;try{a=await this.lstatPromise(e)}catch(n){if(n.code==="ENOENT")return;throw n}if(a.isDirectory()){if(r){let n=await this.readdirPromise(e);await Promise.all(n.map(u=>this.removePromise(this.pathUtils.resolve(e,u))))}for(let n=0;n<=o;n++)try{await this.rmdirPromise(e);break}catch(u){if(u.code!=="EBUSY"&&u.code!=="ENOTEMPTY")throw u;n<o&&await new Promise(A=>setTimeout(A,n*100))}}else await this.unlinkPromise(e)}removeSync(e,{recursive:r=!0}={}){let o;try{o=this.lstatSync(e)}catch(a){if(a.code==="ENOENT")return;throw a}if(o.isDirectory()){if(r)for(let a of this.readdirSync(e))this.removeSync(this.pathUtils.resolve(e,a));this.rmdirSync(e)}else this.unlinkSync(e)}async mkdirpPromise(e,{chmod:r,utimes:o}={}){if(e=this.resolve(e),e===this.pathUtils.dirname(e))return;let a=e.split(this.pathUtils.sep),n;for(let u=2;u<=a.length;++u){let A=a.slice(0,u).join(this.pathUtils.sep);if(!this.existsSync(A)){try{await this.mkdirPromise(A)}catch(p){if(p.code==="EEXIST")continue;throw p}if(n??=A,r!=null&&await this.chmodPromise(A,r),o!=null)await this.utimesPromise(A,o[0],o[1]);else{let p=await this.statPromise(this.pathUtils.dirname(A));await this.utimesPromise(A,p.atime,p.mtime)}}}return n}mkdirpSync(e,{chmod:r,utimes:o}={}){if(e=this.resolve(e),e===this.pathUtils.dirname(e))return;let a=e.split(this.pathUtils.sep),n;for(let u=2;u<=a.length;++u){let A=a.slice(0,u).join(this.pathUtils.sep);if(!this.existsSync(A)){try{this.mkdirSync(A)}catch(p){if(p.code==="EEXIST")continue;throw p}if(n??=A,r!=null&&this.chmodSync(A,r),o!=null)this.utimesSync(A,o[0],o[1]);else{let p=this.statSync(this.pathUtils.dirname(A));this.utimesSync(A,p.atime,p.mtime)}}}return n}async copyPromise(e,r,{baseFs:o=this,overwrite:a=!0,stableSort:n=!1,stableTime:u=!1,linkStrategy:A=null}={}){return await T7(this,e,o,r,{overwrite:a,stableSort:n,stableTime:u,linkStrategy:A})}copySync(e,r,{baseFs:o=this,overwrite:a=!0}={}){let n=o.lstatSync(r),u=this.existsSync(e);if(n.isDirectory()){this.mkdirpSync(e);let p=o.readdirSync(r);for(let h of p)this.copySync(this.pathUtils.join(e,h),o.pathUtils.join(r,h),{baseFs:o,overwrite:a})}else if(n.isFile()){if(!u||a){u&&this.removeSync(e);let p=o.readFileSync(r);this.writeFileSync(e,p)}}else if(n.isSymbolicLink()){if(!u||a){u&&this.removeSync(e);let p=o.readlinkSync(r);this.symlinkSync(DD(this.pathUtils,p),e)}}else throw new Error(`Unsupported file type (file: ${r}, mode: 0o${n.mode.toString(8).padStart(6,"0")})`);let A=n.mode&511;this.chmodSync(e,A)}async changeFilePromise(e,r,o={}){return Buffer.isBuffer(r)?this.changeFileBufferPromise(e,r,o):this.changeFileTextPromise(e,r,o)}async changeFileBufferPromise(e,r,{mode:o}={}){let a=Buffer.alloc(0);try{a=await this.readFilePromise(e)}catch{}Buffer.compare(a,r)!==0&&await this.writeFilePromise(e,r,{mode:o})}async changeFileTextPromise(e,r,{automaticNewlines:o,mode:a}={}){let n="";try{n=await this.readFilePromise(e,"utf8")}catch{}let u=o?_g(n,r):r;n!==u&&await this.writeFilePromise(e,u,{mode:a})}changeFileSync(e,r,o={}){return Buffer.isBuffer(r)?this.changeFileBufferSync(e,r,o):this.changeFileTextSync(e,r,o)}changeFileBufferSync(e,r,{mode:o}={}){let a=Buffer.alloc(0);try{a=this.readFileSync(e)}catch{}Buffer.compare(a,r)!==0&&this.writeFileSync(e,r,{mode:o})}changeFileTextSync(e,r,{automaticNewlines:o=!1,mode:a}={}){let n="";try{n=this.readFileSync(e,"utf8")}catch{}let u=o?_g(n,r):r;n!==u&&this.writeFileSync(e,u,{mode:a})}async movePromise(e,r){try{await this.renamePromise(e,r)}catch(o){if(o.code==="EXDEV")await this.copyPromise(r,e),await this.removePromise(e);else throw o}}moveSync(e,r){try{this.renameSync(e,r)}catch(o){if(o.code==="EXDEV")this.copySync(r,e),this.removeSync(e);else throw o}}async lockPromise(e,r){let o=`${e}.flock`,a=1e3/60,n=Date.now(),u=null,A=async()=>{let p;try{[p]=await this.readJsonPromise(o)}catch{return Date.now()-n<500}try{return process.kill(p,0),!0}catch{return!1}};for(;u===null;)try{u=await this.openPromise(o,"wx")}catch(p){if(p.code==="EEXIST"){if(!await A())try{await this.unlinkPromise(o);continue}catch{}if(Date.now()-n<60*1e3)await new Promise(h=>setTimeout(h,a));else throw new Error(`Couldn't acquire a lock in a reasonable time (via ${o})`)}else throw p}await this.writePromise(u,JSON.stringify([process.pid]));try{return await r()}finally{try{await this.closePromise(u),await this.unlinkPromise(o)}catch{}}}async readJsonPromise(e){let r=await this.readFilePromise(e,"utf8");try{return JSON.parse(r)}catch(o){throw o.message+=` (in ${e})`,o}}readJsonSync(e){let r=this.readFileSync(e,"utf8");try{return JSON.parse(r)}catch(o){throw o.message+=` (in ${e})`,o}}async writeJsonPromise(e,r,{compact:o=!1}={}){let a=o?0:2;return await this.writeFilePromise(e,`${JSON.stringify(r,null,a)}
+`)}writeJsonSync(e,r,{compact:o=!1}={}){let a=o?0:2;return this.writeFileSync(e,`${JSON.stringify(r,null,a)}
+`)}async preserveTimePromise(e,r){let o=await this.lstatPromise(e),a=await r();typeof a<"u"&&(e=a),await this.lutimesPromise(e,o.atime,o.mtime)}async preserveTimeSync(e,r){let o=this.lstatSync(e),a=r();typeof a<"u"&&(e=a),this.lutimesSync(e,o.atime,o.mtime)}},Mu=class extends gf{constructor(){super(V)}}});var Ss,df=Et(()=>{Hg();Ss=class extends gf{getExtractHint(e){return this.baseFs.getExtractHint(e)}resolve(e){return this.mapFromBase(this.baseFs.resolve(this.mapToBase(e)))}getRealPath(){return this.mapFromBase(this.baseFs.getRealPath())}async openPromise(e,r,o){return this.baseFs.openPromise(this.mapToBase(e),r,o)}openSync(e,r,o){return this.baseFs.openSync(this.mapToBase(e),r,o)}async opendirPromise(e,r){return Object.assign(await this.baseFs.opendirPromise(this.mapToBase(e),r),{path:e})}opendirSync(e,r){return Object.assign(this.baseFs.opendirSync(this.mapToBase(e),r),{path:e})}async readPromise(e,r,o,a,n){return await this.baseFs.readPromise(e,r,o,a,n)}readSync(e,r,o,a,n){return this.baseFs.readSync(e,r,o,a,n)}async writePromise(e,r,o,a,n){return typeof r=="string"?await this.baseFs.writePromise(e,r,o):await this.baseFs.writePromise(e,r,o,a,n)}writeSync(e,r,o,a,n){return typeof r=="string"?this.baseFs.writeSync(e,r,o):this.baseFs.writeSync(e,r,o,a,n)}async closePromise(e){return this.baseFs.closePromise(e)}closeSync(e){this.baseFs.closeSync(e)}createReadStream(e,r){return this.baseFs.createReadStream(e!==null?this.mapToBase(e):e,r)}createWriteStream(e,r){return this.baseFs.createWriteStream(e!==null?this.mapToBase(e):e,r)}async realpathPromise(e){return this.mapFromBase(await this.baseFs.realpathPromise(this.mapToBase(e)))}realpathSync(e){return this.mapFromBase(this.baseFs.realpathSync(this.mapToBase(e)))}async existsPromise(e){return this.baseFs.existsPromise(this.mapToBase(e))}existsSync(e){return this.baseFs.existsSync(this.mapToBase(e))}accessSync(e,r){return this.baseFs.accessSync(this.mapToBase(e),r)}async accessPromise(e,r){return this.baseFs.accessPromise(this.mapToBase(e),r)}async statPromise(e,r){return this.baseFs.statPromise(this.mapToBase(e),r)}statSync(e,r){return this.baseFs.statSync(this.mapToBase(e),r)}async fstatPromise(e,r){return this.baseFs.fstatPromise(e,r)}fstatSync(e,r){return this.baseFs.fstatSync(e,r)}lstatPromise(e,r){return this.baseFs.lstatPromise(this.mapToBase(e),r)}lstatSync(e,r){return this.baseFs.lstatSync(this.mapToBase(e),r)}async fchmodPromise(e,r){return this.baseFs.fchmodPromise(e,r)}fchmodSync(e,r){return this.baseFs.fchmodSync(e,r)}async chmodPromise(e,r){return this.baseFs.chmodPromise(this.mapToBase(e),r)}chmodSync(e,r){return this.baseFs.chmodSync(this.mapToBase(e),r)}async fchownPromise(e,r,o){return this.baseFs.fchownPromise(e,r,o)}fchownSync(e,r,o){return this.baseFs.fchownSync(e,r,o)}async chownPromise(e,r,o){return this.baseFs.chownPromise(this.mapToBase(e),r,o)}chownSync(e,r,o){return this.baseFs.chownSync(this.mapToBase(e),r,o)}async renamePromise(e,r){return this.baseFs.renamePromise(this.mapToBase(e),this.mapToBase(r))}renameSync(e,r){return this.baseFs.renameSync(this.mapToBase(e),this.mapToBase(r))}async copyFilePromise(e,r,o=0){return this.baseFs.copyFilePromise(this.mapToBase(e),this.mapToBase(r),o)}copyFileSync(e,r,o=0){return this.baseFs.copyFileSync(this.mapToBase(e),this.mapToBase(r),o)}async appendFilePromise(e,r,o){return this.baseFs.appendFilePromise(this.fsMapToBase(e),r,o)}appendFileSync(e,r,o){return this.baseFs.appendFileSync(this.fsMapToBase(e),r,o)}async writeFilePromise(e,r,o){return this.baseFs.writeFilePromise(this.fsMapToBase(e),r,o)}writeFileSync(e,r,o){return this.baseFs.writeFileSync(this.fsMapToBase(e),r,o)}async unlinkPromise(e){return this.baseFs.unlinkPromise(this.mapToBase(e))}unlinkSync(e){return this.baseFs.unlinkSync(this.mapToBase(e))}async utimesPromise(e,r,o){return this.baseFs.utimesPromise(this.mapToBase(e),r,o)}utimesSync(e,r,o){return this.baseFs.utimesSync(this.mapToBase(e),r,o)}async lutimesPromise(e,r,o){return this.baseFs.lutimesPromise(this.mapToBase(e),r,o)}lutimesSync(e,r,o){return this.baseFs.lutimesSync(this.mapToBase(e),r,o)}async mkdirPromise(e,r){return this.baseFs.mkdirPromise(this.mapToBase(e),r)}mkdirSync(e,r){return this.baseFs.mkdirSync(this.mapToBase(e),r)}async rmdirPromise(e,r){return this.baseFs.rmdirPromise(this.mapToBase(e),r)}rmdirSync(e,r){return this.baseFs.rmdirSync(this.mapToBase(e),r)}async linkPromise(e,r){return this.baseFs.linkPromise(this.mapToBase(e),this.mapToBase(r))}linkSync(e,r){return this.baseFs.linkSync(this.mapToBase(e),this.mapToBase(r))}async symlinkPromise(e,r,o){let a=this.mapToBase(r);if(this.pathUtils.isAbsolute(e))return this.baseFs.symlinkPromise(this.mapToBase(e),a,o);let n=this.mapToBase(this.pathUtils.join(this.pathUtils.dirname(r),e)),u=this.baseFs.pathUtils.relative(this.baseFs.pathUtils.dirname(a),n);return this.baseFs.symlinkPromise(u,a,o)}symlinkSync(e,r,o){let a=this.mapToBase(r);if(this.pathUtils.isAbsolute(e))return this.baseFs.symlinkSync(this.mapToBase(e),a,o);let n=this.mapToBase(this.pathUtils.join(this.pathUtils.dirname(r),e)),u=this.baseFs.pathUtils.relative(this.baseFs.pathUtils.dirname(a),n);return this.baseFs.symlinkSync(u,a,o)}async readFilePromise(e,r){return this.baseFs.readFilePromise(this.fsMapToBase(e),r)}readFileSync(e,r){return this.baseFs.readFileSync(this.fsMapToBase(e),r)}readdirPromise(e,r){return this.baseFs.readdirPromise(this.mapToBase(e),r)}readdirSync(e,r){return this.baseFs.readdirSync(this.mapToBase(e),r)}async readlinkPromise(e){return this.mapFromBase(await this.baseFs.readlinkPromise(this.mapToBase(e)))}readlinkSync(e){return this.mapFromBase(this.baseFs.readlinkSync(this.mapToBase(e)))}async truncatePromise(e,r){return this.baseFs.truncatePromise(this.mapToBase(e),r)}truncateSync(e,r){return this.baseFs.truncateSync(this.mapToBase(e),r)}async ftruncatePromise(e,r){return this.baseFs.ftruncatePromise(e,r)}ftruncateSync(e,r){return this.baseFs.ftruncateSync(e,r)}watch(e,r,o){return this.baseFs.watch(this.mapToBase(e),r,o)}watchFile(e,r,o){return this.baseFs.watchFile(this.mapToBase(e),r,o)}unwatchFile(e,r){return this.baseFs.unwatchFile(this.mapToBase(e),r)}fsMapToBase(e){return typeof e=="number"?e:this.mapToBase(e)}}});var Uu,j7=Et(()=>{df();Uu=class extends Ss{constructor(r,{baseFs:o,pathUtils:a}){super(a);this.target=r,this.baseFs=o}getRealPath(){return this.target}getBaseFs(){return this.baseFs}mapFromBase(r){return r}mapToBase(r){return r}}});function G7(t){let e=t;return typeof t.path=="string"&&(e.path=ue.toPortablePath(t.path)),e}var q7,Tn,jg=Et(()=>{q7=$e(ve("fs"));Hg();Ca();Tn=class extends Mu{constructor(r=q7.default){super();this.realFs=r}getExtractHint(){return!1}getRealPath(){return Bt.root}resolve(r){return V.resolve(r)}async openPromise(r,o,a){return await new Promise((n,u)=>{this.realFs.open(ue.fromPortablePath(r),o,a,this.makeCallback(n,u))})}openSync(r,o,a){return this.realFs.openSync(ue.fromPortablePath(r),o,a)}async opendirPromise(r,o){return await new Promise((a,n)=>{typeof o<"u"?this.realFs.opendir(ue.fromPortablePath(r),o,this.makeCallback(a,n)):this.realFs.opendir(ue.fromPortablePath(r),this.makeCallback(a,n))}).then(a=>{let n=a;return Object.defineProperty(n,"path",{value:r,configurable:!0,writable:!0}),n})}opendirSync(r,o){let n=typeof o<"u"?this.realFs.opendirSync(ue.fromPortablePath(r),o):this.realFs.opendirSync(ue.fromPortablePath(r));return Object.defineProperty(n,"path",{value:r,configurable:!0,writable:!0}),n}async readPromise(r,o,a=0,n=0,u=-1){return await new Promise((A,p)=>{this.realFs.read(r,o,a,n,u,(h,E)=>{h?p(h):A(E)})})}readSync(r,o,a,n,u){return this.realFs.readSync(r,o,a,n,u)}async writePromise(r,o,a,n,u){return await new Promise((A,p)=>typeof o=="string"?this.realFs.write(r,o,a,this.makeCallback(A,p)):this.realFs.write(r,o,a,n,u,this.makeCallback(A,p)))}writeSync(r,o,a,n,u){return typeof o=="string"?this.realFs.writeSync(r,o,a):this.realFs.writeSync(r,o,a,n,u)}async closePromise(r){await new Promise((o,a)=>{this.realFs.close(r,this.makeCallback(o,a))})}closeSync(r){this.realFs.closeSync(r)}createReadStream(r,o){let a=r!==null?ue.fromPortablePath(r):r;return this.realFs.createReadStream(a,o)}createWriteStream(r,o){let a=r!==null?ue.fromPortablePath(r):r;return this.realFs.createWriteStream(a,o)}async realpathPromise(r){return await new Promise((o,a)=>{this.realFs.realpath(ue.fromPortablePath(r),{},this.makeCallback(o,a))}).then(o=>ue.toPortablePath(o))}realpathSync(r){return ue.toPortablePath(this.realFs.realpathSync(ue.fromPortablePath(r),{}))}async existsPromise(r){return await new Promise(o=>{this.realFs.exists(ue.fromPortablePath(r),o)})}accessSync(r,o){return this.realFs.accessSync(ue.fromPortablePath(r),o)}async accessPromise(r,o){return await new Promise((a,n)=>{this.realFs.access(ue.fromPortablePath(r),o,this.makeCallback(a,n))})}existsSync(r){return this.realFs.existsSync(ue.fromPortablePath(r))}async statPromise(r,o){return await new Promise((a,n)=>{o?this.realFs.stat(ue.fromPortablePath(r),o,this.makeCallback(a,n)):this.realFs.stat(ue.fromPortablePath(r),this.makeCallback(a,n))})}statSync(r,o){return o?this.realFs.statSync(ue.fromPortablePath(r),o):this.realFs.statSync(ue.fromPortablePath(r))}async fstatPromise(r,o){return await new Promise((a,n)=>{o?this.realFs.fstat(r,o,this.makeCallback(a,n)):this.realFs.fstat(r,this.makeCallback(a,n))})}fstatSync(r,o){return o?this.realFs.fstatSync(r,o):this.realFs.fstatSync(r)}async lstatPromise(r,o){return await new Promise((a,n)=>{o?this.realFs.lstat(ue.fromPortablePath(r),o,this.makeCallback(a,n)):this.realFs.lstat(ue.fromPortablePath(r),this.makeCallback(a,n))})}lstatSync(r,o){return o?this.realFs.lstatSync(ue.fromPortablePath(r),o):this.realFs.lstatSync(ue.fromPortablePath(r))}async fchmodPromise(r,o){return await new Promise((a,n)=>{this.realFs.fchmod(r,o,this.makeCallback(a,n))})}fchmodSync(r,o){return this.realFs.fchmodSync(r,o)}async chmodPromise(r,o){return await new Promise((a,n)=>{this.realFs.chmod(ue.fromPortablePath(r),o,this.makeCallback(a,n))})}chmodSync(r,o){return this.realFs.chmodSync(ue.fromPortablePath(r),o)}async fchownPromise(r,o,a){return await new Promise((n,u)=>{this.realFs.fchown(r,o,a,this.makeCallback(n,u))})}fchownSync(r,o,a){return this.realFs.fchownSync(r,o,a)}async chownPromise(r,o,a){return await new Promise((n,u)=>{this.realFs.chown(ue.fromPortablePath(r),o,a,this.makeCallback(n,u))})}chownSync(r,o,a){return this.realFs.chownSync(ue.fromPortablePath(r),o,a)}async renamePromise(r,o){return await new Promise((a,n)=>{this.realFs.rename(ue.fromPortablePath(r),ue.fromPortablePath(o),this.makeCallback(a,n))})}renameSync(r,o){return this.realFs.renameSync(ue.fromPortablePath(r),ue.fromPortablePath(o))}async copyFilePromise(r,o,a=0){return await new Promise((n,u)=>{this.realFs.copyFile(ue.fromPortablePath(r),ue.fromPortablePath(o),a,this.makeCallback(n,u))})}copyFileSync(r,o,a=0){return this.realFs.copyFileSync(ue.fromPortablePath(r),ue.fromPortablePath(o),a)}async appendFilePromise(r,o,a){return await new Promise((n,u)=>{let A=typeof r=="string"?ue.fromPortablePath(r):r;a?this.realFs.appendFile(A,o,a,this.makeCallback(n,u)):this.realFs.appendFile(A,o,this.makeCallback(n,u))})}appendFileSync(r,o,a){let n=typeof r=="string"?ue.fromPortablePath(r):r;a?this.realFs.appendFileSync(n,o,a):this.realFs.appendFileSync(n,o)}async writeFilePromise(r,o,a){return await new Promise((n,u)=>{let A=typeof r=="string"?ue.fromPortablePath(r):r;a?this.realFs.writeFile(A,o,a,this.makeCallback(n,u)):this.realFs.writeFile(A,o,this.makeCallback(n,u))})}writeFileSync(r,o,a){let n=typeof r=="string"?ue.fromPortablePath(r):r;a?this.realFs.writeFileSync(n,o,a):this.realFs.writeFileSync(n,o)}async unlinkPromise(r){return await new Promise((o,a)=>{this.realFs.unlink(ue.fromPortablePath(r),this.makeCallback(o,a))})}unlinkSync(r){return this.realFs.unlinkSync(ue.fromPortablePath(r))}async utimesPromise(r,o,a){return await new Promise((n,u)=>{this.realFs.utimes(ue.fromPortablePath(r),o,a,this.makeCallback(n,u))})}utimesSync(r,o,a){this.realFs.utimesSync(ue.fromPortablePath(r),o,a)}async lutimesPromise(r,o,a){return await new Promise((n,u)=>{this.realFs.lutimes(ue.fromPortablePath(r),o,a,this.makeCallback(n,u))})}lutimesSync(r,o,a){this.realFs.lutimesSync(ue.fromPortablePath(r),o,a)}async mkdirPromise(r,o){return await new Promise((a,n)=>{this.realFs.mkdir(ue.fromPortablePath(r),o,this.makeCallback(a,n))})}mkdirSync(r,o){return this.realFs.mkdirSync(ue.fromPortablePath(r),o)}async rmdirPromise(r,o){return await new Promise((a,n)=>{o?this.realFs.rmdir(ue.fromPortablePath(r),o,this.makeCallback(a,n)):this.realFs.rmdir(ue.fromPortablePath(r),this.makeCallback(a,n))})}rmdirSync(r,o){return this.realFs.rmdirSync(ue.fromPortablePath(r),o)}async linkPromise(r,o){return await new Promise((a,n)=>{this.realFs.link(ue.fromPortablePath(r),ue.fromPortablePath(o),this.makeCallback(a,n))})}linkSync(r,o){return this.realFs.linkSync(ue.fromPortablePath(r),ue.fromPortablePath(o))}async symlinkPromise(r,o,a){return await new Promise((n,u)=>{this.realFs.symlink(ue.fromPortablePath(r.replace(/\/+$/,"")),ue.fromPortablePath(o),a,this.makeCallback(n,u))})}symlinkSync(r,o,a){return this.realFs.symlinkSync(ue.fromPortablePath(r.replace(/\/+$/,"")),ue.fromPortablePath(o),a)}async readFilePromise(r,o){return await new Promise((a,n)=>{let u=typeof r=="string"?ue.fromPortablePath(r):r;this.realFs.readFile(u,o,this.makeCallback(a,n))})}readFileSync(r,o){let a=typeof r=="string"?ue.fromPortablePath(r):r;return this.realFs.readFileSync(a,o)}async readdirPromise(r,o){return await new Promise((a,n)=>{o?o.recursive&&process.platform==="win32"?o.withFileTypes?this.realFs.readdir(ue.fromPortablePath(r),o,this.makeCallback(u=>a(u.map(G7)),n)):this.realFs.readdir(ue.fromPortablePath(r),o,this.makeCallback(u=>a(u.map(ue.toPortablePath)),n)):this.realFs.readdir(ue.fromPortablePath(r),o,this.makeCallback(a,n)):this.realFs.readdir(ue.fromPortablePath(r),this.makeCallback(a,n))})}readdirSync(r,o){return o?o.recursive&&process.platform==="win32"?o.withFileTypes?this.realFs.readdirSync(ue.fromPortablePath(r),o).map(G7):this.realFs.readdirSync(ue.fromPortablePath(r),o).map(ue.toPortablePath):this.realFs.readdirSync(ue.fromPortablePath(r),o):this.realFs.readdirSync(ue.fromPortablePath(r))}async readlinkPromise(r){return await new Promise((o,a)=>{this.realFs.readlink(ue.fromPortablePath(r),this.makeCallback(o,a))}).then(o=>ue.toPortablePath(o))}readlinkSync(r){return ue.toPortablePath(this.realFs.readlinkSync(ue.fromPortablePath(r)))}async truncatePromise(r,o){return await new Promise((a,n)=>{this.realFs.truncate(ue.fromPortablePath(r),o,this.makeCallback(a,n))})}truncateSync(r,o){return this.realFs.truncateSync(ue.fromPortablePath(r),o)}async ftruncatePromise(r,o){return await new Promise((a,n)=>{this.realFs.ftruncate(r,o,this.makeCallback(a,n))})}ftruncateSync(r,o){return this.realFs.ftruncateSync(r,o)}watch(r,o,a){return this.realFs.watch(ue.fromPortablePath(r),o,a)}watchFile(r,o,a){return this.realFs.watchFile(ue.fromPortablePath(r),o,a)}unwatchFile(r,o){return this.realFs.unwatchFile(ue.fromPortablePath(r),o)}makeCallback(r,o){return(a,n)=>{a?o(a):r(n)}}}});var gn,Y7=Et(()=>{jg();df();Ca();gn=class extends Ss{constructor(r,{baseFs:o=new Tn}={}){super(V);this.target=this.pathUtils.normalize(r),this.baseFs=o}getRealPath(){return this.pathUtils.resolve(this.baseFs.getRealPath(),this.target)}resolve(r){return this.pathUtils.isAbsolute(r)?V.normalize(r):this.baseFs.resolve(V.join(this.target,r))}mapFromBase(r){return r}mapToBase(r){return this.pathUtils.isAbsolute(r)?r:this.pathUtils.join(this.target,r)}}});var W7,_u,K7=Et(()=>{jg();df();Ca();W7=Bt.root,_u=class extends Ss{constructor(r,{baseFs:o=new Tn}={}){super(V);this.target=this.pathUtils.resolve(Bt.root,r),this.baseFs=o}getRealPath(){return this.pathUtils.resolve(this.baseFs.getRealPath(),this.pathUtils.relative(Bt.root,this.target))}getTarget(){return this.target}getBaseFs(){return this.baseFs}mapToBase(r){let o=this.pathUtils.normalize(r);if(this.pathUtils.isAbsolute(r))return this.pathUtils.resolve(this.target,this.pathUtils.relative(W7,r));if(o.match(/^\.\.\/?/))throw new Error(`Resolving this path (${r}) would escape the jail`);return this.pathUtils.resolve(this.target,r)}mapFromBase(r){return this.pathUtils.resolve(W7,this.pathUtils.relative(this.target,r))}}});var iy,V7=Et(()=>{df();iy=class extends Ss{constructor(r,o){super(o);this.instance=null;this.factory=r}get baseFs(){return this.instance||(this.instance=this.factory()),this.instance}set baseFs(r){this.instance=r}mapFromBase(r){return r}mapToBase(r){return r}}});var Gg,wa,Hp,J7=Et(()=>{Gg=ve("fs");Hg();jg();YR();BD();Ca();wa=4278190080,Hp=class extends Mu{constructor({baseFs:r=new Tn,filter:o=null,magicByte:a=42,maxOpenFiles:n=1/0,useCache:u=!0,maxAge:A=5e3,typeCheck:p=Gg.constants.S_IFREG,getMountPoint:h,factoryPromise:E,factorySync:I}){if(Math.floor(a)!==a||!(a>1&&a<=127))throw new Error("The magic byte must be set to a round value between 1 and 127 included");super();this.fdMap=new Map;this.nextFd=3;this.isMount=new Set;this.notMount=new Set;this.realPaths=new Map;this.limitOpenFilesTimeout=null;this.baseFs=r,this.mountInstances=u?new Map:null,this.factoryPromise=E,this.factorySync=I,this.filter=o,this.getMountPoint=h,this.magic=a<<24,this.maxAge=A,this.maxOpenFiles=n,this.typeCheck=p}getExtractHint(r){return this.baseFs.getExtractHint(r)}getRealPath(){return this.baseFs.getRealPath()}saveAndClose(){if(Ug(this),this.mountInstances)for(let[r,{childFs:o}]of this.mountInstances.entries())o.saveAndClose?.(),this.mountInstances.delete(r)}discardAndClose(){if(Ug(this),this.mountInstances)for(let[r,{childFs:o}]of this.mountInstances.entries())o.discardAndClose?.(),this.mountInstances.delete(r)}resolve(r){return this.baseFs.resolve(r)}remapFd(r,o){let a=this.nextFd++|this.magic;return this.fdMap.set(a,[r,o]),a}async openPromise(r,o,a){return await this.makeCallPromise(r,async()=>await this.baseFs.openPromise(r,o,a),async(n,{subPath:u})=>this.remapFd(n,await n.openPromise(u,o,a)))}openSync(r,o,a){return this.makeCallSync(r,()=>this.baseFs.openSync(r,o,a),(n,{subPath:u})=>this.remapFd(n,n.openSync(u,o,a)))}async opendirPromise(r,o){return await this.makeCallPromise(r,async()=>await this.baseFs.opendirPromise(r,o),async(a,{subPath:n})=>await a.opendirPromise(n,o),{requireSubpath:!1})}opendirSync(r,o){return this.makeCallSync(r,()=>this.baseFs.opendirSync(r,o),(a,{subPath:n})=>a.opendirSync(n,o),{requireSubpath:!1})}async readPromise(r,o,a,n,u){if((r&wa)!==this.magic)return await this.baseFs.readPromise(r,o,a,n,u);let A=this.fdMap.get(r);if(typeof A>"u")throw Io("read");let[p,h]=A;return await p.readPromise(h,o,a,n,u)}readSync(r,o,a,n,u){if((r&wa)!==this.magic)return this.baseFs.readSync(r,o,a,n,u);let A=this.fdMap.get(r);if(typeof A>"u")throw Io("readSync");let[p,h]=A;return p.readSync(h,o,a,n,u)}async writePromise(r,o,a,n,u){if((r&wa)!==this.magic)return typeof o=="string"?await this.baseFs.writePromise(r,o,a):await this.baseFs.writePromise(r,o,a,n,u);let A=this.fdMap.get(r);if(typeof A>"u")throw Io("write");let[p,h]=A;return typeof o=="string"?await p.writePromise(h,o,a):await p.writePromise(h,o,a,n,u)}writeSync(r,o,a,n,u){if((r&wa)!==this.magic)return typeof o=="string"?this.baseFs.writeSync(r,o,a):this.baseFs.writeSync(r,o,a,n,u);let A=this.fdMap.get(r);if(typeof A>"u")throw Io("writeSync");let[p,h]=A;return typeof o=="string"?p.writeSync(h,o,a):p.writeSync(h,o,a,n,u)}async closePromise(r){if((r&wa)!==this.magic)return await this.baseFs.closePromise(r);let o=this.fdMap.get(r);if(typeof o>"u")throw Io("close");this.fdMap.delete(r);let[a,n]=o;return await a.closePromise(n)}closeSync(r){if((r&wa)!==this.magic)return this.baseFs.closeSync(r);let o=this.fdMap.get(r);if(typeof o>"u")throw Io("closeSync");this.fdMap.delete(r);let[a,n]=o;return a.closeSync(n)}createReadStream(r,o){return r===null?this.baseFs.createReadStream(r,o):this.makeCallSync(r,()=>this.baseFs.createReadStream(r,o),(a,{archivePath:n,subPath:u})=>{let A=a.createReadStream(u,o);return A.path=ue.fromPortablePath(this.pathUtils.join(n,u)),A})}createWriteStream(r,o){return r===null?this.baseFs.createWriteStream(r,o):this.makeCallSync(r,()=>this.baseFs.createWriteStream(r,o),(a,{subPath:n})=>a.createWriteStream(n,o))}async realpathPromise(r){return await this.makeCallPromise(r,async()=>await this.baseFs.realpathPromise(r),async(o,{archivePath:a,subPath:n})=>{let u=this.realPaths.get(a);return typeof u>"u"&&(u=await this.baseFs.realpathPromise(a),this.realPaths.set(a,u)),this.pathUtils.join(u,this.pathUtils.relative(Bt.root,await o.realpathPromise(n)))})}realpathSync(r){return this.makeCallSync(r,()=>this.baseFs.realpathSync(r),(o,{archivePath:a,subPath:n})=>{let u=this.realPaths.get(a);return typeof u>"u"&&(u=this.baseFs.realpathSync(a),this.realPaths.set(a,u)),this.pathUtils.join(u,this.pathUtils.relative(Bt.root,o.realpathSync(n)))})}async existsPromise(r){return await this.makeCallPromise(r,async()=>await this.baseFs.existsPromise(r),async(o,{subPath:a})=>await o.existsPromise(a))}existsSync(r){return this.makeCallSync(r,()=>this.baseFs.existsSync(r),(o,{subPath:a})=>o.existsSync(a))}async accessPromise(r,o){return await this.makeCallPromise(r,async()=>await this.baseFs.accessPromise(r,o),async(a,{subPath:n})=>await a.accessPromise(n,o))}accessSync(r,o){return this.makeCallSync(r,()=>this.baseFs.accessSync(r,o),(a,{subPath:n})=>a.accessSync(n,o))}async statPromise(r,o){return await this.makeCallPromise(r,async()=>await this.baseFs.statPromise(r,o),async(a,{subPath:n})=>await a.statPromise(n,o))}statSync(r,o){return this.makeCallSync(r,()=>this.baseFs.statSync(r,o),(a,{subPath:n})=>a.statSync(n,o))}async fstatPromise(r,o){if((r&wa)!==this.magic)return this.baseFs.fstatPromise(r,o);let a=this.fdMap.get(r);if(typeof a>"u")throw Io("fstat");let[n,u]=a;return n.fstatPromise(u,o)}fstatSync(r,o){if((r&wa)!==this.magic)return this.baseFs.fstatSync(r,o);let a=this.fdMap.get(r);if(typeof a>"u")throw Io("fstatSync");let[n,u]=a;return n.fstatSync(u,o)}async lstatPromise(r,o){return await this.makeCallPromise(r,async()=>await this.baseFs.lstatPromise(r,o),async(a,{subPath:n})=>await a.lstatPromise(n,o))}lstatSync(r,o){return this.makeCallSync(r,()=>this.baseFs.lstatSync(r,o),(a,{subPath:n})=>a.lstatSync(n,o))}async fchmodPromise(r,o){if((r&wa)!==this.magic)return this.baseFs.fchmodPromise(r,o);let a=this.fdMap.get(r);if(typeof a>"u")throw Io("fchmod");let[n,u]=a;return n.fchmodPromise(u,o)}fchmodSync(r,o){if((r&wa)!==this.magic)return this.baseFs.fchmodSync(r,o);let a=this.fdMap.get(r);if(typeof a>"u")throw Io("fchmodSync");let[n,u]=a;return n.fchmodSync(u,o)}async chmodPromise(r,o){return await this.makeCallPromise(r,async()=>await this.baseFs.chmodPromise(r,o),async(a,{subPath:n})=>await a.chmodPromise(n,o))}chmodSync(r,o){return this.makeCallSync(r,()=>this.baseFs.chmodSync(r,o),(a,{subPath:n})=>a.chmodSync(n,o))}async fchownPromise(r,o,a){if((r&wa)!==this.magic)return this.baseFs.fchownPromise(r,o,a);let n=this.fdMap.get(r);if(typeof n>"u")throw Io("fchown");let[u,A]=n;return u.fchownPromise(A,o,a)}fchownSync(r,o,a){if((r&wa)!==this.magic)return this.baseFs.fchownSync(r,o,a);let n=this.fdMap.get(r);if(typeof n>"u")throw Io("fchownSync");let[u,A]=n;return u.fchownSync(A,o,a)}async chownPromise(r,o,a){return await this.makeCallPromise(r,async()=>await this.baseFs.chownPromise(r,o,a),async(n,{subPath:u})=>await n.chownPromise(u,o,a))}chownSync(r,o,a){return this.makeCallSync(r,()=>this.baseFs.chownSync(r,o,a),(n,{subPath:u})=>n.chownSync(u,o,a))}async renamePromise(r,o){return await this.makeCallPromise(r,async()=>await this.makeCallPromise(o,async()=>await this.baseFs.renamePromise(r,o),async()=>{throw Object.assign(new Error("EEXDEV: cross-device link not permitted"),{code:"EEXDEV"})}),async(a,{subPath:n})=>await this.makeCallPromise(o,async()=>{throw Object.assign(new Error("EEXDEV: cross-device link not permitted"),{code:"EEXDEV"})},async(u,{subPath:A})=>{if(a!==u)throw Object.assign(new Error("EEXDEV: cross-device link not permitted"),{code:"EEXDEV"});return await a.renamePromise(n,A)}))}renameSync(r,o){return this.makeCallSync(r,()=>this.makeCallSync(o,()=>this.baseFs.renameSync(r,o),()=>{throw Object.assign(new Error("EEXDEV: cross-device link not permitted"),{code:"EEXDEV"})}),(a,{subPath:n})=>this.makeCallSync(o,()=>{throw Object.assign(new Error("EEXDEV: cross-device link not permitted"),{code:"EEXDEV"})},(u,{subPath:A})=>{if(a!==u)throw Object.assign(new Error("EEXDEV: cross-device link not permitted"),{code:"EEXDEV"});return a.renameSync(n,A)}))}async copyFilePromise(r,o,a=0){let n=async(u,A,p,h)=>{if((a&Gg.constants.COPYFILE_FICLONE_FORCE)!==0)throw Object.assign(new Error(`EXDEV: cross-device clone not permitted, copyfile '${A}' -> ${h}'`),{code:"EXDEV"});if(a&Gg.constants.COPYFILE_EXCL&&await this.existsPromise(A))throw Object.assign(new Error(`EEXIST: file already exists, copyfile '${A}' -> '${h}'`),{code:"EEXIST"});let E;try{E=await u.readFilePromise(A)}catch{throw Object.assign(new Error(`EINVAL: invalid argument, copyfile '${A}' -> '${h}'`),{code:"EINVAL"})}await p.writeFilePromise(h,E)};return await this.makeCallPromise(r,async()=>await this.makeCallPromise(o,async()=>await this.baseFs.copyFilePromise(r,o,a),async(u,{subPath:A})=>await n(this.baseFs,r,u,A)),async(u,{subPath:A})=>await this.makeCallPromise(o,async()=>await n(u,A,this.baseFs,o),async(p,{subPath:h})=>u!==p?await n(u,A,p,h):await u.copyFilePromise(A,h,a)))}copyFileSync(r,o,a=0){let n=(u,A,p,h)=>{if((a&Gg.constants.COPYFILE_FICLONE_FORCE)!==0)throw Object.assign(new Error(`EXDEV: cross-device clone not permitted, copyfile '${A}' -> ${h}'`),{code:"EXDEV"});if(a&Gg.constants.COPYFILE_EXCL&&this.existsSync(A))throw Object.assign(new Error(`EEXIST: file already exists, copyfile '${A}' -> '${h}'`),{code:"EEXIST"});let E;try{E=u.readFileSync(A)}catch{throw Object.assign(new Error(`EINVAL: invalid argument, copyfile '${A}' -> '${h}'`),{code:"EINVAL"})}p.writeFileSync(h,E)};return this.makeCallSync(r,()=>this.makeCallSync(o,()=>this.baseFs.copyFileSync(r,o,a),(u,{subPath:A})=>n(this.baseFs,r,u,A)),(u,{subPath:A})=>this.makeCallSync(o,()=>n(u,A,this.baseFs,o),(p,{subPath:h})=>u!==p?n(u,A,p,h):u.copyFileSync(A,h,a)))}async appendFilePromise(r,o,a){return await this.makeCallPromise(r,async()=>await this.baseFs.appendFilePromise(r,o,a),async(n,{subPath:u})=>await n.appendFilePromise(u,o,a))}appendFileSync(r,o,a){return this.makeCallSync(r,()=>this.baseFs.appendFileSync(r,o,a),(n,{subPath:u})=>n.appendFileSync(u,o,a))}async writeFilePromise(r,o,a){return await this.makeCallPromise(r,async()=>await this.baseFs.writeFilePromise(r,o,a),async(n,{subPath:u})=>await n.writeFilePromise(u,o,a))}writeFileSync(r,o,a){return this.makeCallSync(r,()=>this.baseFs.writeFileSync(r,o,a),(n,{subPath:u})=>n.writeFileSync(u,o,a))}async unlinkPromise(r){return await this.makeCallPromise(r,async()=>await this.baseFs.unlinkPromise(r),async(o,{subPath:a})=>await o.unlinkPromise(a))}unlinkSync(r){return this.makeCallSync(r,()=>this.baseFs.unlinkSync(r),(o,{subPath:a})=>o.unlinkSync(a))}async utimesPromise(r,o,a){return await this.makeCallPromise(r,async()=>await this.baseFs.utimesPromise(r,o,a),async(n,{subPath:u})=>await n.utimesPromise(u,o,a))}utimesSync(r,o,a){return this.makeCallSync(r,()=>this.baseFs.utimesSync(r,o,a),(n,{subPath:u})=>n.utimesSync(u,o,a))}async lutimesPromise(r,o,a){return await this.makeCallPromise(r,async()=>await this.baseFs.lutimesPromise(r,o,a),async(n,{subPath:u})=>await n.lutimesPromise(u,o,a))}lutimesSync(r,o,a){return this.makeCallSync(r,()=>this.baseFs.lutimesSync(r,o,a),(n,{subPath:u})=>n.lutimesSync(u,o,a))}async mkdirPromise(r,o){return await this.makeCallPromise(r,async()=>await this.baseFs.mkdirPromise(r,o),async(a,{subPath:n})=>await a.mkdirPromise(n,o))}mkdirSync(r,o){return this.makeCallSync(r,()=>this.baseFs.mkdirSync(r,o),(a,{subPath:n})=>a.mkdirSync(n,o))}async rmdirPromise(r,o){return await this.makeCallPromise(r,async()=>await this.baseFs.rmdirPromise(r,o),async(a,{subPath:n})=>await a.rmdirPromise(n,o))}rmdirSync(r,o){return this.makeCallSync(r,()=>this.baseFs.rmdirSync(r,o),(a,{subPath:n})=>a.rmdirSync(n,o))}async linkPromise(r,o){return await this.makeCallPromise(o,async()=>await this.baseFs.linkPromise(r,o),async(a,{subPath:n})=>await a.linkPromise(r,n))}linkSync(r,o){return this.makeCallSync(o,()=>this.baseFs.linkSync(r,o),(a,{subPath:n})=>a.linkSync(r,n))}async symlinkPromise(r,o,a){return await this.makeCallPromise(o,async()=>await this.baseFs.symlinkPromise(r,o,a),async(n,{subPath:u})=>await n.symlinkPromise(r,u))}symlinkSync(r,o,a){return this.makeCallSync(o,()=>this.baseFs.symlinkSync(r,o,a),(n,{subPath:u})=>n.symlinkSync(r,u))}async readFilePromise(r,o){return this.makeCallPromise(r,async()=>await this.baseFs.readFilePromise(r,o),async(a,{subPath:n})=>await a.readFilePromise(n,o))}readFileSync(r,o){return this.makeCallSync(r,()=>this.baseFs.readFileSync(r,o),(a,{subPath:n})=>a.readFileSync(n,o))}async readdirPromise(r,o){return await this.makeCallPromise(r,async()=>await this.baseFs.readdirPromise(r,o),async(a,{subPath:n})=>await a.readdirPromise(n,o),{requireSubpath:!1})}readdirSync(r,o){return this.makeCallSync(r,()=>this.baseFs.readdirSync(r,o),(a,{subPath:n})=>a.readdirSync(n,o),{requireSubpath:!1})}async readlinkPromise(r){return await this.makeCallPromise(r,async()=>await this.baseFs.readlinkPromise(r),async(o,{subPath:a})=>await o.readlinkPromise(a))}readlinkSync(r){return this.makeCallSync(r,()=>this.baseFs.readlinkSync(r),(o,{subPath:a})=>o.readlinkSync(a))}async truncatePromise(r,o){return await this.makeCallPromise(r,async()=>await this.baseFs.truncatePromise(r,o),async(a,{subPath:n})=>await a.truncatePromise(n,o))}truncateSync(r,o){return this.makeCallSync(r,()=>this.baseFs.truncateSync(r,o),(a,{subPath:n})=>a.truncateSync(n,o))}async ftruncatePromise(r,o){if((r&wa)!==this.magic)return this.baseFs.ftruncatePromise(r,o);let a=this.fdMap.get(r);if(typeof a>"u")throw Io("ftruncate");let[n,u]=a;return n.ftruncatePromise(u,o)}ftruncateSync(r,o){if((r&wa)!==this.magic)return this.baseFs.ftruncateSync(r,o);let a=this.fdMap.get(r);if(typeof a>"u")throw Io("ftruncateSync");let[n,u]=a;return n.ftruncateSync(u,o)}watch(r,o,a){return this.makeCallSync(r,()=>this.baseFs.watch(r,o,a),(n,{subPath:u})=>n.watch(u,o,a))}watchFile(r,o,a){return this.makeCallSync(r,()=>this.baseFs.watchFile(r,o,a),()=>ny(this,r,o,a))}unwatchFile(r,o){return this.makeCallSync(r,()=>this.baseFs.unwatchFile(r,o),()=>Mg(this,r,o))}async makeCallPromise(r,o,a,{requireSubpath:n=!0}={}){if(typeof r!="string")return await o();let u=this.resolve(r),A=this.findMount(u);return A?n&&A.subPath==="/"?await o():await this.getMountPromise(A.archivePath,async p=>await a(p,A)):await o()}makeCallSync(r,o,a,{requireSubpath:n=!0}={}){if(typeof r!="string")return o();let u=this.resolve(r),A=this.findMount(u);return!A||n&&A.subPath==="/"?o():this.getMountSync(A.archivePath,p=>a(p,A))}findMount(r){if(this.filter&&!this.filter.test(r))return null;let o="";for(;;){let a=r.substring(o.length),n=this.getMountPoint(a,o);if(!n)return null;if(o=this.pathUtils.join(o,n),!this.isMount.has(o)){if(this.notMount.has(o))continue;try{if(this.typeCheck!==null&&(this.baseFs.lstatSync(o).mode&Gg.constants.S_IFMT)!==this.typeCheck){this.notMount.add(o);continue}}catch{return null}this.isMount.add(o)}return{archivePath:o,subPath:this.pathUtils.join(Bt.root,r.substring(o.length))}}}limitOpenFiles(r){if(this.mountInstances===null)return;let o=Date.now(),a=o+this.maxAge,n=r===null?0:this.mountInstances.size-r;for(let[u,{childFs:A,expiresAt:p,refCount:h}]of this.mountInstances.entries())if(!(h!==0||A.hasOpenFileHandles?.())){if(o>=p){A.saveAndClose?.(),this.mountInstances.delete(u),n-=1;continue}else if(r===null||n<=0){a=p;break}A.saveAndClose?.(),this.mountInstances.delete(u),n-=1}this.limitOpenFilesTimeout===null&&(r===null&&this.mountInstances.size>0||r!==null)&&isFinite(a)&&(this.limitOpenFilesTimeout=setTimeout(()=>{this.limitOpenFilesTimeout=null,this.limitOpenFiles(null)},a-o).unref())}async getMountPromise(r,o){if(this.mountInstances){let a=this.mountInstances.get(r);if(!a){let n=await this.factoryPromise(this.baseFs,r);a=this.mountInstances.get(r),a||(a={childFs:n(),expiresAt:0,refCount:0})}this.mountInstances.delete(r),this.limitOpenFiles(this.maxOpenFiles-1),this.mountInstances.set(r,a),a.expiresAt=Date.now()+this.maxAge,a.refCount+=1;try{return await o(a.childFs)}finally{a.refCount-=1}}else{let a=(await this.factoryPromise(this.baseFs,r))();try{return await o(a)}finally{a.saveAndClose?.()}}}getMountSync(r,o){if(this.mountInstances){let a=this.mountInstances.get(r);return a||(a={childFs:this.factorySync(this.baseFs,r),expiresAt:0,refCount:0}),this.mountInstances.delete(r),this.limitOpenFiles(this.maxOpenFiles-1),this.mountInstances.set(r,a),a.expiresAt=Date.now()+this.maxAge,o(a.childFs)}else{let a=this.factorySync(this.baseFs,r);try{return o(a)}finally{a.saveAndClose?.()}}}}});var Zt,WR,Yw,z7=Et(()=>{Hg();Ca();Zt=()=>Object.assign(new Error("ENOSYS: unsupported filesystem access"),{code:"ENOSYS"}),WR=class extends gf{constructor(){super(V)}getExtractHint(){throw Zt()}getRealPath(){throw Zt()}resolve(){throw Zt()}async openPromise(){throw Zt()}openSync(){throw Zt()}async opendirPromise(){throw Zt()}opendirSync(){throw Zt()}async readPromise(){throw Zt()}readSync(){throw Zt()}async writePromise(){throw Zt()}writeSync(){throw Zt()}async closePromise(){throw Zt()}closeSync(){throw Zt()}createWriteStream(){throw Zt()}createReadStream(){throw Zt()}async realpathPromise(){throw Zt()}realpathSync(){throw Zt()}async readdirPromise(){throw Zt()}readdirSync(){throw Zt()}async existsPromise(e){throw Zt()}existsSync(e){throw Zt()}async accessPromise(){throw Zt()}accessSync(){throw Zt()}async statPromise(){throw Zt()}statSync(){throw Zt()}async fstatPromise(e){throw Zt()}fstatSync(e){throw Zt()}async lstatPromise(e){throw Zt()}lstatSync(e){throw Zt()}async fchmodPromise(){throw Zt()}fchmodSync(){throw Zt()}async chmodPromise(){throw Zt()}chmodSync(){throw Zt()}async fchownPromise(){throw Zt()}fchownSync(){throw Zt()}async chownPromise(){throw Zt()}chownSync(){throw Zt()}async mkdirPromise(){throw Zt()}mkdirSync(){throw Zt()}async rmdirPromise(){throw Zt()}rmdirSync(){throw Zt()}async linkPromise(){throw Zt()}linkSync(){throw Zt()}async symlinkPromise(){throw Zt()}symlinkSync(){throw Zt()}async renamePromise(){throw Zt()}renameSync(){throw Zt()}async copyFilePromise(){throw Zt()}copyFileSync(){throw Zt()}async appendFilePromise(){throw Zt()}appendFileSync(){throw Zt()}async writeFilePromise(){throw Zt()}writeFileSync(){throw Zt()}async unlinkPromise(){throw Zt()}unlinkSync(){throw Zt()}async utimesPromise(){throw Zt()}utimesSync(){throw Zt()}async lutimesPromise(){throw Zt()}lutimesSync(){throw Zt()}async readFilePromise(){throw Zt()}readFileSync(){throw Zt()}async readlinkPromise(){throw Zt()}readlinkSync(){throw Zt()}async truncatePromise(){throw Zt()}truncateSync(){throw Zt()}async ftruncatePromise(e,r){throw Zt()}ftruncateSync(e,r){throw Zt()}watch(){throw Zt()}watchFile(){throw Zt()}unwatchFile(){throw Zt()}},Yw=WR;Yw.instance=new WR});var jp,X7=Et(()=>{df();Ca();jp=class extends Ss{constructor(r){super(ue);this.baseFs=r}mapFromBase(r){return ue.fromPortablePath(r)}mapToBase(r){return ue.toPortablePath(r)}}});var x_e,KR,k_e,mi,Z7=Et(()=>{jg();df();Ca();x_e=/^[0-9]+$/,KR=/^(\/(?:[^/]+\/)*?(?:\$\$virtual|__virtual__))((?:\/((?:[^/]+-)?[a-f0-9]+)(?:\/([^/]+))?)?((?:\/.*)?))$/,k_e=/^([^/]+-)?[a-f0-9]+$/,mi=class extends Ss{constructor({baseFs:r=new Tn}={}){super(V);this.baseFs=r}static makeVirtualPath(r,o,a){if(V.basename(r)!=="__virtual__")throw new Error('Assertion failed: Virtual folders must be named "__virtual__"');if(!V.basename(o).match(k_e))throw new Error("Assertion failed: Virtual components must be ended by an hexadecimal hash");let u=V.relative(V.dirname(r),a).split("/"),A=0;for(;A<u.length&&u[A]==="..";)A+=1;let p=u.slice(A);return V.join(r,o,String(A),...p)}static resolveVirtual(r){let o=r.match(KR);if(!o||!o[3]&&o[5])return r;let a=V.dirname(o[1]);if(!o[3]||!o[4])return a;if(!x_e.test(o[4]))return r;let u=Number(o[4]),A="../".repeat(u),p=o[5]||".";return mi.resolveVirtual(V.join(a,A,p))}getExtractHint(r){return this.baseFs.getExtractHint(r)}getRealPath(){return this.baseFs.getRealPath()}realpathSync(r){let o=r.match(KR);if(!o)return this.baseFs.realpathSync(r);if(!o[5])return r;let a=this.baseFs.realpathSync(this.mapToBase(r));return mi.makeVirtualPath(o[1],o[3],a)}async realpathPromise(r){let o=r.match(KR);if(!o)return await this.baseFs.realpathPromise(r);if(!o[5])return r;let a=await this.baseFs.realpathPromise(this.mapToBase(r));return mi.makeVirtualPath(o[1],o[3],a)}mapToBase(r){if(r==="")return r;if(this.pathUtils.isAbsolute(r))return mi.resolveVirtual(r);let o=mi.resolveVirtual(this.baseFs.resolve(Bt.dot)),a=mi.resolveVirtual(this.baseFs.resolve(r));return V.relative(o,a)||Bt.dot}mapFromBase(r){return r}}});function Q_e(t,e){return typeof VR.default.isUtf8<"u"?VR.default.isUtf8(t):Buffer.byteLength(e)===t.byteLength}var VR,$7,eY,xD,tY=Et(()=>{VR=$e(ve("buffer")),$7=ve("url"),eY=ve("util");df();Ca();xD=class extends Ss{constructor(r){super(ue);this.baseFs=r}mapFromBase(r){return r}mapToBase(r){if(typeof r=="string")return r;if(r instanceof URL)return(0,$7.fileURLToPath)(r);if(Buffer.isBuffer(r)){let o=r.toString();if(!Q_e(r,o))throw new Error("Non-utf8 buffers are not supported at the moment. Please upvote the following issue if you encounter this error: https://github.com/yarnpkg/berry/issues/4942");return o}throw new Error(`Unsupported path type: ${(0,eY.inspect)(r)}`)}}});var rY,Bo,mf,Gp,kD,QD,sy,Tc,Nc,F_e,R_e,T_e,N_e,Ww,nY=Et(()=>{rY=ve("readline"),Bo=Symbol("kBaseFs"),mf=Symbol("kFd"),Gp=Symbol("kClosePromise"),kD=Symbol("kCloseResolve"),QD=Symbol("kCloseReject"),sy=Symbol("kRefs"),Tc=Symbol("kRef"),Nc=Symbol("kUnref"),Ww=class{constructor(e,r){this[F_e]=1;this[R_e]=void 0;this[T_e]=void 0;this[N_e]=void 0;this[Bo]=r,this[mf]=e}get fd(){return this[mf]}async appendFile(e,r){try{this[Tc](this.appendFile);let o=(typeof r=="string"?r:r?.encoding)??void 0;return await this[Bo].appendFilePromise(this.fd,e,o?{encoding:o}:void 0)}finally{this[Nc]()}}async chown(e,r){try{return this[Tc](this.chown),await this[Bo].fchownPromise(this.fd,e,r)}finally{this[Nc]()}}async chmod(e){try{return this[Tc](this.chmod),await this[Bo].fchmodPromise(this.fd,e)}finally{this[Nc]()}}createReadStream(e){return this[Bo].createReadStream(null,{...e,fd:this.fd})}createWriteStream(e){return this[Bo].createWriteStream(null,{...e,fd:this.fd})}datasync(){throw new Error("Method not implemented.")}sync(){throw new Error("Method not implemented.")}async read(e,r,o,a){try{this[Tc](this.read);let n;return Buffer.isBuffer(e)?n=e:(e??={},n=e.buffer??Buffer.alloc(16384),r=e.offset||0,o=e.length??n.byteLength,a=e.position??null),r??=0,o??=0,o===0?{bytesRead:o,buffer:n}:{bytesRead:await this[Bo].readPromise(this.fd,n,r,o,a),buffer:n}}finally{this[Nc]()}}async readFile(e){try{this[Tc](this.readFile);let r=(typeof e=="string"?e:e?.encoding)??void 0;return await this[Bo].readFilePromise(this.fd,r)}finally{this[Nc]()}}readLines(e){return(0,rY.createInterface)({input:this.createReadStream(e),crlfDelay:1/0})}async stat(e){try{return this[Tc](this.stat),await this[Bo].fstatPromise(this.fd,e)}finally{this[Nc]()}}async truncate(e){try{return this[Tc](this.truncate),await this[Bo].ftruncatePromise(this.fd,e)}finally{this[Nc]()}}utimes(e,r){throw new Error("Method not implemented.")}async writeFile(e,r){try{this[Tc](this.writeFile);let o=(typeof r=="string"?r:r?.encoding)??void 0;await this[Bo].writeFilePromise(this.fd,e,o)}finally{this[Nc]()}}async write(...e){try{if(this[Tc](this.write),ArrayBuffer.isView(e[0])){let[r,o,a,n]=e;return{bytesWritten:await this[Bo].writePromise(this.fd,r,o??void 0,a??void 0,n??void 0),buffer:r}}else{let[r,o,a]=e;return{bytesWritten:await this[Bo].writePromise(this.fd,r,o,a),buffer:r}}}finally{this[Nc]()}}async writev(e,r){try{this[Tc](this.writev);let o=0;if(typeof r<"u")for(let a of e){let n=await this.write(a,void 0,void 0,r);o+=n.bytesWritten,r+=n.bytesWritten}else for(let a of e){let n=await this.write(a);o+=n.bytesWritten}return{buffers:e,bytesWritten:o}}finally{this[Nc]()}}readv(e,r){throw new Error("Method not implemented.")}close(){if(this[mf]===-1)return Promise.resolve();if(this[Gp])return this[Gp];if(this[sy]--,this[sy]===0){let e=this[mf];this[mf]=-1,this[Gp]=this[Bo].closePromise(e).finally(()=>{this[Gp]=void 0})}else this[Gp]=new Promise((e,r)=>{this[kD]=e,this[QD]=r}).finally(()=>{this[Gp]=void 0,this[QD]=void 0,this[kD]=void 0});return this[Gp]}[(Bo,mf,F_e=sy,R_e=Gp,T_e=kD,N_e=QD,Tc)](e){if(this[mf]===-1){let r=new Error("file closed");throw r.code="EBADF",r.syscall=e.name,r}this[sy]++}[Nc](){if(this[sy]--,this[sy]===0){let e=this[mf];this[mf]=-1,this[Bo].closePromise(e).then(this[kD],this[QD])}}}});function Kw(t,e){e=new xD(e);let r=(o,a,n)=>{let u=o[a];o[a]=n,typeof u?.[oy.promisify.custom]<"u"&&(n[oy.promisify.custom]=u[oy.promisify.custom])};{r(t,"exists",(o,...a)=>{let u=typeof a[a.length-1]=="function"?a.pop():()=>{};process.nextTick(()=>{e.existsPromise(o).then(A=>{u(A)},()=>{u(!1)})})}),r(t,"read",(...o)=>{let[a,n,u,A,p,h]=o;if(o.length<=3){let E={};o.length<3?h=o[1]:(E=o[1],h=o[2]),{buffer:n=Buffer.alloc(16384),offset:u=0,length:A=n.byteLength,position:p}=E}if(u==null&&(u=0),A|=0,A===0){process.nextTick(()=>{h(null,0,n)});return}p==null&&(p=-1),process.nextTick(()=>{e.readPromise(a,n,u,A,p).then(E=>{h(null,E,n)},E=>{h(E,0,n)})})});for(let o of iY){let a=o.replace(/Promise$/,"");if(typeof t[a]>"u")continue;let n=e[o];if(typeof n>"u")continue;r(t,a,(...A)=>{let h=typeof A[A.length-1]=="function"?A.pop():()=>{};process.nextTick(()=>{n.apply(e,A).then(E=>{h(null,E)},E=>{h(E)})})})}t.realpath.native=t.realpath}{r(t,"existsSync",o=>{try{return e.existsSync(o)}catch{return!1}}),r(t,"readSync",(...o)=>{let[a,n,u,A,p]=o;return o.length<=3&&({offset:u=0,length:A=n.byteLength,position:p}=o[2]||{}),u==null&&(u=0),A|=0,A===0?0:(p==null&&(p=-1),e.readSync(a,n,u,A,p))});for(let o of L_e){let a=o;if(typeof t[a]>"u")continue;let n=e[o];typeof n>"u"||r(t,a,n.bind(e))}t.realpathSync.native=t.realpathSync}{let o=t.promises;for(let a of iY){let n=a.replace(/Promise$/,"");if(typeof o[n]>"u")continue;let u=e[a];typeof u>"u"||a!=="open"&&r(o,n,(A,...p)=>A instanceof Ww?A[n].apply(A,p):u.call(e,A,...p))}r(o,"open",async(...a)=>{let n=await e.openPromise(...a);return new Ww(n,e)})}t.read[oy.promisify.custom]=async(o,a,...n)=>({bytesRead:await e.readPromise(o,a,...n),buffer:a}),t.write[oy.promisify.custom]=async(o,a,...n)=>({bytesWritten:await e.writePromise(o,a,...n),buffer:a})}function FD(t,e){let r=Object.create(t);return Kw(r,e),r}var oy,L_e,iY,sY=Et(()=>{oy=ve("util");tY();nY();L_e=new Set(["accessSync","appendFileSync","createReadStream","createWriteStream","chmodSync","fchmodSync","chownSync","fchownSync","closeSync","copyFileSync","linkSync","lstatSync","fstatSync","lutimesSync","mkdirSync","openSync","opendirSync","readlinkSync","readFileSync","readdirSync","readlinkSync","realpathSync","renameSync","rmdirSync","statSync","symlinkSync","truncateSync","ftruncateSync","unlinkSync","unwatchFile","utimesSync","watch","watchFile","writeFileSync","writeSync"]),iY=new Set(["accessPromise","appendFilePromise","fchmodPromise","chmodPromise","fchownPromise","chownPromise","closePromise","copyFilePromise","linkPromise","fstatPromise","lstatPromise","lutimesPromise","mkdirPromise","openPromise","opendirPromise","readdirPromise","realpathPromise","readFilePromise","readdirPromise","readlinkPromise","renamePromise","rmdirPromise","statPromise","symlinkPromise","truncatePromise","ftruncatePromise","unlinkPromise","utimesPromise","writeFilePromise","writeSync"])});function oY(t){let e=Math.ceil(Math.random()*4294967296).toString(16).padStart(8,"0");return`${t}${e}`}function aY(){if(JR)return JR;let t=ue.toPortablePath(lY.default.tmpdir()),e=oe.realpathSync(t);return process.once("exit",()=>{oe.rmtempSync()}),JR={tmpdir:t,realTmpdir:e}}var lY,Lc,JR,oe,cY=Et(()=>{lY=$e(ve("os"));jg();Ca();Lc=new Set,JR=null;oe=Object.assign(new Tn,{detachTemp(t){Lc.delete(t)},mktempSync(t){let{tmpdir:e,realTmpdir:r}=aY();for(;;){let o=oY("xfs-");try{this.mkdirSync(V.join(e,o))}catch(n){if(n.code==="EEXIST")continue;throw n}let a=V.join(r,o);if(Lc.add(a),typeof t>"u")return a;try{return t(a)}finally{if(Lc.has(a)){Lc.delete(a);try{this.removeSync(a)}catch{}}}}},async mktempPromise(t){let{tmpdir:e,realTmpdir:r}=aY();for(;;){let o=oY("xfs-");try{await this.mkdirPromise(V.join(e,o))}catch(n){if(n.code==="EEXIST")continue;throw n}let a=V.join(r,o);if(Lc.add(a),typeof t>"u")return a;try{return await t(a)}finally{if(Lc.has(a)){Lc.delete(a);try{await this.removePromise(a)}catch{}}}}},async rmtempPromise(){await Promise.all(Array.from(Lc.values()).map(async t=>{try{await oe.removePromise(t,{maxRetries:0}),Lc.delete(t)}catch{}}))},rmtempSync(){for(let t of Lc)try{oe.removeSync(t),Lc.delete(t)}catch{}}})});var Vw={};Vt(Vw,{AliasFS:()=>Uu,BasePortableFakeFS:()=>Mu,CustomDir:()=>qw,CwdFS:()=>gn,FakeFS:()=>gf,Filename:()=>dr,JailFS:()=>_u,LazyFS:()=>iy,MountFS:()=>Hp,NoFS:()=>Yw,NodeFS:()=>Tn,PortablePath:()=>Bt,PosixFS:()=>jp,ProxiedFS:()=>Ss,VirtualFS:()=>mi,constants:()=>vi,errors:()=>ar,extendFs:()=>FD,normalizeLineEndings:()=>_g,npath:()=>ue,opendir:()=>PD,patchFs:()=>Kw,ppath:()=>V,setupCopyIndex:()=>SD,statUtils:()=>Ea,unwatchAllFiles:()=>Ug,unwatchFile:()=>Mg,watchFile:()=>ny,xfs:()=>oe});var St=Et(()=>{k7();BD();HR();qR();L7();YR();Hg();Ca();Ca();j7();Hg();Y7();K7();V7();J7();z7();jg();X7();df();Z7();sY();cY()});var hY=_((obt,pY)=>{pY.exports=fY;fY.sync=M_e;var uY=ve("fs");function O_e(t,e){var r=e.pathExt!==void 0?e.pathExt:process.env.PATHEXT;if(!r||(r=r.split(";"),r.indexOf("")!==-1))return!0;for(var o=0;o<r.length;o++){var a=r[o].toLowerCase();if(a&&t.substr(-a.length).toLowerCase()===a)return!0}return!1}function AY(t,e,r){return!t.isSymbolicLink()&&!t.isFile()?!1:O_e(e,r)}function fY(t,e,r){uY.stat(t,function(o,a){r(o,o?!1:AY(a,t,e))})}function M_e(t,e){return AY(uY.statSync(t),t,e)}});var EY=_((abt,yY)=>{yY.exports=dY;dY.sync=U_e;var gY=ve("fs");function dY(t,e,r){gY.stat(t,function(o,a){r(o,o?!1:mY(a,e))})}function U_e(t,e){return mY(gY.statSync(t),e)}function mY(t,e){return t.isFile()&&__e(t,e)}function __e(t,e){var r=t.mode,o=t.uid,a=t.gid,n=e.uid!==void 0?e.uid:process.getuid&&process.getuid(),u=e.gid!==void 0?e.gid:process.getgid&&process.getgid(),A=parseInt("100",8),p=parseInt("010",8),h=parseInt("001",8),E=A|p,I=r&h||r&p&&a===u||r&A&&o===n||r&E&&n===0;return I}});var wY=_((cbt,CY)=>{var lbt=ve("fs"),RD;process.platform==="win32"||global.TESTING_WINDOWS?RD=hY():RD=EY();CY.exports=zR;zR.sync=H_e;function zR(t,e,r){if(typeof e=="function"&&(r=e,e={}),!r){if(typeof Promise!="function")throw new TypeError("callback not provided");return new Promise(function(o,a){zR(t,e||{},function(n,u){n?a(n):o(u)})})}RD(t,e||{},function(o,a){o&&(o.code==="EACCES"||e&&e.ignoreErrors)&&(o=null,a=!1),r(o,a)})}function H_e(t,e){try{return RD.sync(t,e||{})}catch(r){if(e&&e.ignoreErrors||r.code==="EACCES")return!1;throw r}}});var bY=_((ubt,PY)=>{var ay=process.platform==="win32"||process.env.OSTYPE==="cygwin"||process.env.OSTYPE==="msys",IY=ve("path"),j_e=ay?";":":",BY=wY(),vY=t=>Object.assign(new Error(`not found: ${t}`),{code:"ENOENT"}),DY=(t,e)=>{let r=e.colon||j_e,o=t.match(/\//)||ay&&t.match(/\\/)?[""]:[...ay?[process.cwd()]:[],...(e.path||process.env.PATH||"").split(r)],a=ay?e.pathExt||process.env.PATHEXT||".EXE;.CMD;.BAT;.COM":"",n=ay?a.split(r):[""];return ay&&t.indexOf(".")!==-1&&n[0]!==""&&n.unshift(""),{pathEnv:o,pathExt:n,pathExtExe:a}},SY=(t,e,r)=>{typeof e=="function"&&(r=e,e={}),e||(e={});let{pathEnv:o,pathExt:a,pathExtExe:n}=DY(t,e),u=[],A=h=>new Promise((E,I)=>{if(h===o.length)return e.all&&u.length?E(u):I(vY(t));let v=o[h],x=/^".*"$/.test(v)?v.slice(1,-1):v,C=IY.join(x,t),R=!x&&/^\.[\\\/]/.test(t)?t.slice(0,2)+C:C;E(p(R,h,0))}),p=(h,E,I)=>new Promise((v,x)=>{if(I===a.length)return v(A(E+1));let C=a[I];BY(h+C,{pathExt:n},(R,L)=>{if(!R&&L)if(e.all)u.push(h+C);else return v(h+C);return v(p(h,E,I+1))})});return r?A(0).then(h=>r(null,h),r):A(0)},G_e=(t,e)=>{e=e||{};let{pathEnv:r,pathExt:o,pathExtExe:a}=DY(t,e),n=[];for(let u=0;u<r.length;u++){let A=r[u],p=/^".*"$/.test(A)?A.slice(1,-1):A,h=IY.join(p,t),E=!p&&/^\.[\\\/]/.test(t)?t.slice(0,2)+h:h;for(let I=0;I<o.length;I++){let v=E+o[I];try{if(BY.sync(v,{pathExt:a}))if(e.all)n.push(v);else return v}catch{}}}if(e.all&&n.length)return n;if(e.nothrow)return null;throw vY(t)};PY.exports=SY;SY.sync=G_e});var kY=_((Abt,XR)=>{"use strict";var xY=(t={})=>{let e=t.env||process.env;return(t.platform||process.platform)!=="win32"?"PATH":Object.keys(e).reverse().find(o=>o.toUpperCase()==="PATH")||"Path"};XR.exports=xY;XR.exports.default=xY});var TY=_((fbt,RY)=>{"use strict";var QY=ve("path"),q_e=bY(),Y_e=kY();function FY(t,e){let r=t.options.env||process.env,o=process.cwd(),a=t.options.cwd!=null,n=a&&process.chdir!==void 0&&!process.chdir.disabled;if(n)try{process.chdir(t.options.cwd)}catch{}let u;try{u=q_e.sync(t.command,{path:r[Y_e({env:r})],pathExt:e?QY.delimiter:void 0})}catch{}finally{n&&process.chdir(o)}return u&&(u=QY.resolve(a?t.options.cwd:"",u)),u}function W_e(t){return FY(t)||FY(t,!0)}RY.exports=W_e});var NY=_((pbt,$R)=>{"use strict";var ZR=/([()\][%!^"`<>&|;, *?])/g;function K_e(t){return t=t.replace(ZR,"^$1"),t}function V_e(t,e){return t=`${t}`,t=t.replace(/(\\*)"/g,'$1$1\\"'),t=t.replace(/(\\*)$/,"$1$1"),t=`"${t}"`,t=t.replace(ZR,"^$1"),e&&(t=t.replace(ZR,"^$1")),t}$R.exports.command=K_e;$R.exports.argument=V_e});var OY=_((hbt,LY)=>{"use strict";LY.exports=/^#!(.*)/});var UY=_((gbt,MY)=>{"use strict";var J_e=OY();MY.exports=(t="")=>{let e=t.match(J_e);if(!e)return null;let[r,o]=e[0].replace(/#! ?/,"").split(" "),a=r.split("/").pop();return a==="env"?o:o?`${a} ${o}`:a}});var HY=_((dbt,_Y)=>{"use strict";var eT=ve("fs"),z_e=UY();function X_e(t){let r=Buffer.alloc(150),o;try{o=eT.openSync(t,"r"),eT.readSync(o,r,0,150,0),eT.closeSync(o)}catch{}return z_e(r.toString())}_Y.exports=X_e});var YY=_((mbt,qY)=>{"use strict";var Z_e=ve("path"),jY=TY(),GY=NY(),$_e=HY(),e8e=process.platform==="win32",t8e=/\.(?:com|exe)$/i,r8e=/node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i;function n8e(t){t.file=jY(t);let e=t.file&&$_e(t.file);return e?(t.args.unshift(t.file),t.command=e,jY(t)):t.file}function i8e(t){if(!e8e)return t;let e=n8e(t),r=!t8e.test(e);if(t.options.forceShell||r){let o=r8e.test(e);t.command=Z_e.normalize(t.command),t.command=GY.command(t.command),t.args=t.args.map(n=>GY.argument(n,o));let a=[t.command].concat(t.args).join(" ");t.args=["/d","/s","/c",`"${a}"`],t.command=process.env.comspec||"cmd.exe",t.options.windowsVerbatimArguments=!0}return t}function s8e(t,e,r){e&&!Array.isArray(e)&&(r=e,e=null),e=e?e.slice(0):[],r=Object.assign({},r);let o={command:t,args:e,options:r,file:void 0,original:{command:t,args:e}};return r.shell?o:i8e(o)}qY.exports=s8e});var VY=_((ybt,KY)=>{"use strict";var tT=process.platform==="win32";function rT(t,e){return Object.assign(new Error(`${e} ${t.command} ENOENT`),{code:"ENOENT",errno:"ENOENT",syscall:`${e} ${t.command}`,path:t.command,spawnargs:t.args})}function o8e(t,e){if(!tT)return;let r=t.emit;t.emit=function(o,a){if(o==="exit"){let n=WY(a,e,"spawn");if(n)return r.call(t,"error",n)}return r.apply(t,arguments)}}function WY(t,e){return tT&&t===1&&!e.file?rT(e.original,"spawn"):null}function a8e(t,e){return tT&&t===1&&!e.file?rT(e.original,"spawnSync"):null}KY.exports={hookChildProcess:o8e,verifyENOENT:WY,verifyENOENTSync:a8e,notFoundError:rT}});var sT=_((Ebt,ly)=>{"use strict";var JY=ve("child_process"),nT=YY(),iT=VY();function zY(t,e,r){let o=nT(t,e,r),a=JY.spawn(o.command,o.args,o.options);return iT.hookChildProcess(a,o),a}function l8e(t,e,r){let o=nT(t,e,r),a=JY.spawnSync(o.command,o.args,o.options);return a.error=a.error||iT.verifyENOENTSync(a.status,o),a}ly.exports=zY;ly.exports.spawn=zY;ly.exports.sync=l8e;ly.exports._parse=nT;ly.exports._enoent=iT});var ZY=_((Cbt,XY)=>{"use strict";function c8e(t,e){function r(){this.constructor=t}r.prototype=e.prototype,t.prototype=new r}function qg(t,e,r,o){this.message=t,this.expected=e,this.found=r,this.location=o,this.name="SyntaxError",typeof Error.captureStackTrace=="function"&&Error.captureStackTrace(this,qg)}c8e(qg,Error);qg.buildMessage=function(t,e){var r={literal:function(h){return'"'+a(h.text)+'"'},class:function(h){var E="",I;for(I=0;I<h.parts.length;I++)E+=h.parts[I]instanceof Array?n(h.parts[I][0])+"-"+n(h.parts[I][1]):n(h.parts[I]);return"["+(h.inverted?"^":"")+E+"]"},any:function(h){return"any character"},end:function(h){return"end of input"},other:function(h){return h.description}};function o(h){return h.charCodeAt(0).toString(16).toUpperCase()}function a(h){return h.replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,function(E){return"\\x0"+o(E)}).replace(/[\x10-\x1F\x7F-\x9F]/g,function(E){return"\\x"+o(E)})}function n(h){return h.replace(/\\/g,"\\\\").replace(/\]/g,"\\]").replace(/\^/g,"\\^").replace(/-/g,"\\-").replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,function(E){return"\\x0"+o(E)}).replace(/[\x10-\x1F\x7F-\x9F]/g,function(E){return"\\x"+o(E)})}function u(h){return r[h.type](h)}function A(h){var E=new Array(h.length),I,v;for(I=0;I<h.length;I++)E[I]=u(h[I]);if(E.sort(),E.length>0){for(I=1,v=1;I<E.length;I++)E[I-1]!==E[I]&&(E[v]=E[I],v++);E.length=v}switch(E.length){case 1:return E[0];case 2:return E[0]+" or "+E[1];default:return E.slice(0,-1).join(", ")+", or "+E[E.length-1]}}function p(h){return h?'"'+a(h)+'"':"end of input"}return"Expected "+A(t)+" but "+p(e)+" found."};function u8e(t,e){e=e!==void 0?e:{};var r={},o={Start:hg},a=hg,n=function(N){return N||[]},u=function(N,K,re){return[{command:N,type:K}].concat(re||[])},A=function(N,K){return[{command:N,type:K||";"}]},p=function(N){return N},h=";",E=Br(";",!1),I="&",v=Br("&",!1),x=function(N,K){return K?{chain:N,then:K}:{chain:N}},C=function(N,K){return{type:N,line:K}},R="&&",L=Br("&&",!1),U="||",J=Br("||",!1),te=function(N,K){return K?{...N,then:K}:N},ae=function(N,K){return{type:N,chain:K}},fe="|&",ce=Br("|&",!1),me="|",he=Br("|",!1),Be="=",we=Br("=",!1),g=function(N,K){return{name:N,args:[K]}},Ee=function(N){return{name:N,args:[]}},Se="(",le=Br("(",!1),ne=")",ee=Br(")",!1),Ie=function(N,K){return{type:"subshell",subshell:N,args:K}},Fe="{",At=Br("{",!1),H="}",at=Br("}",!1),Re=function(N,K){return{type:"group",group:N,args:K}},ke=function(N,K){return{type:"command",args:K,envs:N}},xe=function(N){return{type:"envs",envs:N}},He=function(N){return N},Te=function(N){return N},Je=/^[0-9]/,je=Cs([["0","9"]],!1,!1),b=function(N,K,re){return{type:"redirection",subtype:K,fd:N!==null?parseInt(N):null,args:[re]}},w=">>",P=Br(">>",!1),y=">&",F=Br(">&",!1),z=">",X=Br(">",!1),Z="<<<",ie=Br("<<<",!1),Pe="<&",Ne=Br("<&",!1),ot="<",dt=Br("<",!1),Gt=function(N){return{type:"argument",segments:[].concat(...N)}},$t=function(N){return N},bt="$'",an=Br("$'",!1),Qr="'",mr=Br("'",!1),br=function(N){return[{type:"text",text:N}]},Wr='""',Kn=Br('""',!1),Ns=function(){return{type:"text",text:""}},Ti='"',ps=Br('"',!1),io=function(N){return N},Pi=function(N){return{type:"arithmetic",arithmetic:N,quoted:!0}},Ls=function(N){return{type:"shell",shell:N,quoted:!0}},so=function(N){return{type:"variable",...N,quoted:!0}},cc=function(N){return{type:"text",text:N}},cu=function(N){return{type:"arithmetic",arithmetic:N,quoted:!1}},lp=function(N){return{type:"shell",shell:N,quoted:!1}},cp=function(N){return{type:"variable",...N,quoted:!1}},Os=function(N){return{type:"glob",pattern:N}},Dn=/^[^']/,oo=Cs(["'"],!0,!1),Ms=function(N){return N.join("")},ml=/^[^$"]/,yl=Cs(["$",'"'],!0,!1),ao=`\\
+`,Vn=Br(`\\
+`,!1),On=function(){return""},Ni="\\",Mn=Br("\\",!1),_i=/^[\\$"`]/,tr=Cs(["\\","$",'"',"`"],!1,!1),Oe=function(N){return N},ii="\\a",Ma=Br("\\a",!1),hr=function(){return"a"},uc="\\b",uu=Br("\\b",!1),Ac=function(){return"\b"},El=/^[Ee]/,DA=Cs(["E","e"],!1,!1),Au=function(){return"\x1B"},Ce="\\f",Rt=Br("\\f",!1),fc=function(){return"\f"},Hi="\\n",fu=Br("\\n",!1),Yt=function(){return`
+`},Cl="\\r",SA=Br("\\r",!1),up=function(){return"\r"},pc="\\t",PA=Br("\\t",!1),Qn=function(){return"	"},hi="\\v",hc=Br("\\v",!1),bA=function(){return"\v"},sa=/^[\\'"?]/,Li=Cs(["\\","'",'"',"?"],!1,!1),_o=function(N){return String.fromCharCode(parseInt(N,16))},Ze="\\x",lo=Br("\\x",!1),gc="\\u",pu=Br("\\u",!1),ji="\\U",hu=Br("\\U",!1),xA=function(N){return String.fromCodePoint(parseInt(N,16))},Ua=/^[0-7]/,dc=Cs([["0","7"]],!1,!1),hs=/^[0-9a-fA-f]/,_t=Cs([["0","9"],["a","f"],["A","f"]],!1,!1),Fn=ug(),Ci="{}",oa=Br("{}",!1),co=function(){return"{}"},Us="-",aa=Br("-",!1),la="+",Ho=Br("+",!1),wi=".",gs=Br(".",!1),ds=function(N,K,re){return{type:"number",value:(N==="-"?-1:1)*parseFloat(K.join("")+"."+re.join(""))}},ms=function(N,K){return{type:"number",value:(N==="-"?-1:1)*parseInt(K.join(""))}},_s=function(N){return{type:"variable",...N}},Un=function(N){return{type:"variable",name:N}},Sn=function(N){return N},ys="*",We=Br("*",!1),tt="/",It=Br("/",!1),nr=function(N,K,re){return{type:K==="*"?"multiplication":"division",right:re}},$=function(N,K){return K.reduce((re,pe)=>({left:re,...pe}),N)},ye=function(N,K,re){return{type:K==="+"?"addition":"subtraction",right:re}},Le="$((",pt=Br("$((",!1),ht="))",Tt=Br("))",!1),er=function(N){return N},$r="$(",Gi=Br("$(",!1),es=function(N){return N},bi="${",jo=Br("${",!1),kA=":-",QA=Br(":-",!1),Ap=function(N,K){return{name:N,defaultValue:K}},ig=":-}",gu=Br(":-}",!1),sg=function(N){return{name:N,defaultValue:[]}},du=":+",uo=Br(":+",!1),FA=function(N,K){return{name:N,alternativeValue:K}},mc=":+}",ca=Br(":+}",!1),og=function(N){return{name:N,alternativeValue:[]}},yc=function(N){return{name:N}},Pm="$",ag=Br("$",!1),$n=function(N){return e.isGlobPattern(N)},fp=function(N){return N},lg=/^[a-zA-Z0-9_]/,RA=Cs([["a","z"],["A","Z"],["0","9"],"_"],!1,!1),Hs=function(){return cg()},mu=/^[$@*?#a-zA-Z0-9_\-]/,Ha=Cs(["$","@","*","?","#",["a","z"],["A","Z"],["0","9"],"_","-"],!1,!1),qi=/^[()}<>$|&; \t"']/,ua=Cs(["(",")","}","<",">","$","|","&",";"," ","	",'"',"'"],!1,!1),yu=/^[<>&; \t"']/,Es=Cs(["<",">","&",";"," ","	",'"',"'"],!1,!1),Ec=/^[ \t]/,Cc=Cs([" ","	"],!1,!1),q=0,Dt=0,wl=[{line:1,column:1}],xi=0,wc=[],ct=0,Eu;if("startRule"in e){if(!(e.startRule in o))throw new Error(`Can't start parsing from rule "`+e.startRule+'".');a=o[e.startRule]}function cg(){return t.substring(Dt,q)}function yw(){return Ic(Dt,q)}function TA(N,K){throw K=K!==void 0?K:Ic(Dt,q),pg([fg(N)],t.substring(Dt,q),K)}function pp(N,K){throw K=K!==void 0?K:Ic(Dt,q),bm(N,K)}function Br(N,K){return{type:"literal",text:N,ignoreCase:K}}function Cs(N,K,re){return{type:"class",parts:N,inverted:K,ignoreCase:re}}function ug(){return{type:"any"}}function Ag(){return{type:"end"}}function fg(N){return{type:"other",description:N}}function hp(N){var K=wl[N],re;if(K)return K;for(re=N-1;!wl[re];)re--;for(K=wl[re],K={line:K.line,column:K.column};re<N;)t.charCodeAt(re)===10?(K.line++,K.column=1):K.column++,re++;return wl[N]=K,K}function Ic(N,K){var re=hp(N),pe=hp(K);return{start:{offset:N,line:re.line,column:re.column},end:{offset:K,line:pe.line,column:pe.column}}}function Ct(N){q<xi||(q>xi&&(xi=q,wc=[]),wc.push(N))}function bm(N,K){return new qg(N,null,null,K)}function pg(N,K,re){return new qg(qg.buildMessage(N,K),N,K,re)}function hg(){var N,K,re;for(N=q,K=[],re=Qt();re!==r;)K.push(re),re=Qt();return K!==r?(re=Cu(),re===r&&(re=null),re!==r?(Dt=N,K=n(re),N=K):(q=N,N=r)):(q=N,N=r),N}function Cu(){var N,K,re,pe,ze;if(N=q,K=wu(),K!==r){for(re=[],pe=Qt();pe!==r;)re.push(pe),pe=Qt();re!==r?(pe=gg(),pe!==r?(ze=xm(),ze===r&&(ze=null),ze!==r?(Dt=N,K=u(K,pe,ze),N=K):(q=N,N=r)):(q=N,N=r)):(q=N,N=r)}else q=N,N=r;if(N===r)if(N=q,K=wu(),K!==r){for(re=[],pe=Qt();pe!==r;)re.push(pe),pe=Qt();re!==r?(pe=gg(),pe===r&&(pe=null),pe!==r?(Dt=N,K=A(K,pe),N=K):(q=N,N=r)):(q=N,N=r)}else q=N,N=r;return N}function xm(){var N,K,re,pe,ze;for(N=q,K=[],re=Qt();re!==r;)K.push(re),re=Qt();if(K!==r)if(re=Cu(),re!==r){for(pe=[],ze=Qt();ze!==r;)pe.push(ze),ze=Qt();pe!==r?(Dt=N,K=p(re),N=K):(q=N,N=r)}else q=N,N=r;else q=N,N=r;return N}function gg(){var N;return t.charCodeAt(q)===59?(N=h,q++):(N=r,ct===0&&Ct(E)),N===r&&(t.charCodeAt(q)===38?(N=I,q++):(N=r,ct===0&&Ct(v))),N}function wu(){var N,K,re;return N=q,K=Aa(),K!==r?(re=Ew(),re===r&&(re=null),re!==r?(Dt=N,K=x(K,re),N=K):(q=N,N=r)):(q=N,N=r),N}function Ew(){var N,K,re,pe,ze,mt,fr;for(N=q,K=[],re=Qt();re!==r;)K.push(re),re=Qt();if(K!==r)if(re=km(),re!==r){for(pe=[],ze=Qt();ze!==r;)pe.push(ze),ze=Qt();if(pe!==r)if(ze=wu(),ze!==r){for(mt=[],fr=Qt();fr!==r;)mt.push(fr),fr=Qt();mt!==r?(Dt=N,K=C(re,ze),N=K):(q=N,N=r)}else q=N,N=r;else q=N,N=r}else q=N,N=r;else q=N,N=r;return N}function km(){var N;return t.substr(q,2)===R?(N=R,q+=2):(N=r,ct===0&&Ct(L)),N===r&&(t.substr(q,2)===U?(N=U,q+=2):(N=r,ct===0&&Ct(J))),N}function Aa(){var N,K,re;return N=q,K=dg(),K!==r?(re=Bc(),re===r&&(re=null),re!==r?(Dt=N,K=te(K,re),N=K):(q=N,N=r)):(q=N,N=r),N}function Bc(){var N,K,re,pe,ze,mt,fr;for(N=q,K=[],re=Qt();re!==r;)K.push(re),re=Qt();if(K!==r)if(re=Il(),re!==r){for(pe=[],ze=Qt();ze!==r;)pe.push(ze),ze=Qt();if(pe!==r)if(ze=Aa(),ze!==r){for(mt=[],fr=Qt();fr!==r;)mt.push(fr),fr=Qt();mt!==r?(Dt=N,K=ae(re,ze),N=K):(q=N,N=r)}else q=N,N=r;else q=N,N=r}else q=N,N=r;else q=N,N=r;return N}function Il(){var N;return t.substr(q,2)===fe?(N=fe,q+=2):(N=r,ct===0&&Ct(ce)),N===r&&(t.charCodeAt(q)===124?(N=me,q++):(N=r,ct===0&&Ct(he))),N}function Iu(){var N,K,re,pe,ze,mt;if(N=q,K=Cg(),K!==r)if(t.charCodeAt(q)===61?(re=Be,q++):(re=r,ct===0&&Ct(we)),re!==r)if(pe=Go(),pe!==r){for(ze=[],mt=Qt();mt!==r;)ze.push(mt),mt=Qt();ze!==r?(Dt=N,K=g(K,pe),N=K):(q=N,N=r)}else q=N,N=r;else q=N,N=r;else q=N,N=r;if(N===r)if(N=q,K=Cg(),K!==r)if(t.charCodeAt(q)===61?(re=Be,q++):(re=r,ct===0&&Ct(we)),re!==r){for(pe=[],ze=Qt();ze!==r;)pe.push(ze),ze=Qt();pe!==r?(Dt=N,K=Ee(K),N=K):(q=N,N=r)}else q=N,N=r;else q=N,N=r;return N}function dg(){var N,K,re,pe,ze,mt,fr,Cr,yn,oi,Oi;for(N=q,K=[],re=Qt();re!==r;)K.push(re),re=Qt();if(K!==r)if(t.charCodeAt(q)===40?(re=Se,q++):(re=r,ct===0&&Ct(le)),re!==r){for(pe=[],ze=Qt();ze!==r;)pe.push(ze),ze=Qt();if(pe!==r)if(ze=Cu(),ze!==r){for(mt=[],fr=Qt();fr!==r;)mt.push(fr),fr=Qt();if(mt!==r)if(t.charCodeAt(q)===41?(fr=ne,q++):(fr=r,ct===0&&Ct(ee)),fr!==r){for(Cr=[],yn=Qt();yn!==r;)Cr.push(yn),yn=Qt();if(Cr!==r){for(yn=[],oi=ja();oi!==r;)yn.push(oi),oi=ja();if(yn!==r){for(oi=[],Oi=Qt();Oi!==r;)oi.push(Oi),Oi=Qt();oi!==r?(Dt=N,K=Ie(ze,yn),N=K):(q=N,N=r)}else q=N,N=r}else q=N,N=r}else q=N,N=r;else q=N,N=r}else q=N,N=r;else q=N,N=r}else q=N,N=r;else q=N,N=r;if(N===r){for(N=q,K=[],re=Qt();re!==r;)K.push(re),re=Qt();if(K!==r)if(t.charCodeAt(q)===123?(re=Fe,q++):(re=r,ct===0&&Ct(At)),re!==r){for(pe=[],ze=Qt();ze!==r;)pe.push(ze),ze=Qt();if(pe!==r)if(ze=Cu(),ze!==r){for(mt=[],fr=Qt();fr!==r;)mt.push(fr),fr=Qt();if(mt!==r)if(t.charCodeAt(q)===125?(fr=H,q++):(fr=r,ct===0&&Ct(at)),fr!==r){for(Cr=[],yn=Qt();yn!==r;)Cr.push(yn),yn=Qt();if(Cr!==r){for(yn=[],oi=ja();oi!==r;)yn.push(oi),oi=ja();if(yn!==r){for(oi=[],Oi=Qt();Oi!==r;)oi.push(Oi),Oi=Qt();oi!==r?(Dt=N,K=Re(ze,yn),N=K):(q=N,N=r)}else q=N,N=r}else q=N,N=r}else q=N,N=r;else q=N,N=r}else q=N,N=r;else q=N,N=r}else q=N,N=r;else q=N,N=r;if(N===r){for(N=q,K=[],re=Qt();re!==r;)K.push(re),re=Qt();if(K!==r){for(re=[],pe=Iu();pe!==r;)re.push(pe),pe=Iu();if(re!==r){for(pe=[],ze=Qt();ze!==r;)pe.push(ze),ze=Qt();if(pe!==r){if(ze=[],mt=gp(),mt!==r)for(;mt!==r;)ze.push(mt),mt=gp();else ze=r;if(ze!==r){for(mt=[],fr=Qt();fr!==r;)mt.push(fr),fr=Qt();mt!==r?(Dt=N,K=ke(re,ze),N=K):(q=N,N=r)}else q=N,N=r}else q=N,N=r}else q=N,N=r}else q=N,N=r;if(N===r){for(N=q,K=[],re=Qt();re!==r;)K.push(re),re=Qt();if(K!==r){if(re=[],pe=Iu(),pe!==r)for(;pe!==r;)re.push(pe),pe=Iu();else re=r;if(re!==r){for(pe=[],ze=Qt();ze!==r;)pe.push(ze),ze=Qt();pe!==r?(Dt=N,K=xe(re),N=K):(q=N,N=r)}else q=N,N=r}else q=N,N=r}}}return N}function NA(){var N,K,re,pe,ze;for(N=q,K=[],re=Qt();re!==r;)K.push(re),re=Qt();if(K!==r){if(re=[],pe=dp(),pe!==r)for(;pe!==r;)re.push(pe),pe=dp();else re=r;if(re!==r){for(pe=[],ze=Qt();ze!==r;)pe.push(ze),ze=Qt();pe!==r?(Dt=N,K=He(re),N=K):(q=N,N=r)}else q=N,N=r}else q=N,N=r;return N}function gp(){var N,K,re;for(N=q,K=[],re=Qt();re!==r;)K.push(re),re=Qt();if(K!==r?(re=ja(),re!==r?(Dt=N,K=Te(re),N=K):(q=N,N=r)):(q=N,N=r),N===r){for(N=q,K=[],re=Qt();re!==r;)K.push(re),re=Qt();K!==r?(re=dp(),re!==r?(Dt=N,K=Te(re),N=K):(q=N,N=r)):(q=N,N=r)}return N}function ja(){var N,K,re,pe,ze;for(N=q,K=[],re=Qt();re!==r;)K.push(re),re=Qt();return K!==r?(Je.test(t.charAt(q))?(re=t.charAt(q),q++):(re=r,ct===0&&Ct(je)),re===r&&(re=null),re!==r?(pe=mg(),pe!==r?(ze=dp(),ze!==r?(Dt=N,K=b(re,pe,ze),N=K):(q=N,N=r)):(q=N,N=r)):(q=N,N=r)):(q=N,N=r),N}function mg(){var N;return t.substr(q,2)===w?(N=w,q+=2):(N=r,ct===0&&Ct(P)),N===r&&(t.substr(q,2)===y?(N=y,q+=2):(N=r,ct===0&&Ct(F)),N===r&&(t.charCodeAt(q)===62?(N=z,q++):(N=r,ct===0&&Ct(X)),N===r&&(t.substr(q,3)===Z?(N=Z,q+=3):(N=r,ct===0&&Ct(ie)),N===r&&(t.substr(q,2)===Pe?(N=Pe,q+=2):(N=r,ct===0&&Ct(Ne)),N===r&&(t.charCodeAt(q)===60?(N=ot,q++):(N=r,ct===0&&Ct(dt))))))),N}function dp(){var N,K,re;for(N=q,K=[],re=Qt();re!==r;)K.push(re),re=Qt();return K!==r?(re=Go(),re!==r?(Dt=N,K=Te(re),N=K):(q=N,N=r)):(q=N,N=r),N}function Go(){var N,K,re;if(N=q,K=[],re=ws(),re!==r)for(;re!==r;)K.push(re),re=ws();else K=r;return K!==r&&(Dt=N,K=Gt(K)),N=K,N}function ws(){var N,K;return N=q,K=Ii(),K!==r&&(Dt=N,K=$t(K)),N=K,N===r&&(N=q,K=Qm(),K!==r&&(Dt=N,K=$t(K)),N=K,N===r&&(N=q,K=Fm(),K!==r&&(Dt=N,K=$t(K)),N=K,N===r&&(N=q,K=qo(),K!==r&&(Dt=N,K=$t(K)),N=K))),N}function Ii(){var N,K,re,pe;return N=q,t.substr(q,2)===bt?(K=bt,q+=2):(K=r,ct===0&&Ct(an)),K!==r?(re=ln(),re!==r?(t.charCodeAt(q)===39?(pe=Qr,q++):(pe=r,ct===0&&Ct(mr)),pe!==r?(Dt=N,K=br(re),N=K):(q=N,N=r)):(q=N,N=r)):(q=N,N=r),N}function Qm(){var N,K,re,pe;return N=q,t.charCodeAt(q)===39?(K=Qr,q++):(K=r,ct===0&&Ct(mr)),K!==r?(re=yp(),re!==r?(t.charCodeAt(q)===39?(pe=Qr,q++):(pe=r,ct===0&&Ct(mr)),pe!==r?(Dt=N,K=br(re),N=K):(q=N,N=r)):(q=N,N=r)):(q=N,N=r),N}function Fm(){var N,K,re,pe;if(N=q,t.substr(q,2)===Wr?(K=Wr,q+=2):(K=r,ct===0&&Ct(Kn)),K!==r&&(Dt=N,K=Ns()),N=K,N===r)if(N=q,t.charCodeAt(q)===34?(K=Ti,q++):(K=r,ct===0&&Ct(ps)),K!==r){for(re=[],pe=LA();pe!==r;)re.push(pe),pe=LA();re!==r?(t.charCodeAt(q)===34?(pe=Ti,q++):(pe=r,ct===0&&Ct(ps)),pe!==r?(Dt=N,K=io(re),N=K):(q=N,N=r)):(q=N,N=r)}else q=N,N=r;return N}function qo(){var N,K,re;if(N=q,K=[],re=mp(),re!==r)for(;re!==r;)K.push(re),re=mp();else K=r;return K!==r&&(Dt=N,K=io(K)),N=K,N}function LA(){var N,K;return N=q,K=qr(),K!==r&&(Dt=N,K=Pi(K)),N=K,N===r&&(N=q,K=Ep(),K!==r&&(Dt=N,K=Ls(K)),N=K,N===r&&(N=q,K=Dc(),K!==r&&(Dt=N,K=so(K)),N=K,N===r&&(N=q,K=yg(),K!==r&&(Dt=N,K=cc(K)),N=K))),N}function mp(){var N,K;return N=q,K=qr(),K!==r&&(Dt=N,K=cu(K)),N=K,N===r&&(N=q,K=Ep(),K!==r&&(Dt=N,K=lp(K)),N=K,N===r&&(N=q,K=Dc(),K!==r&&(Dt=N,K=cp(K)),N=K,N===r&&(N=q,K=Cw(),K!==r&&(Dt=N,K=Os(K)),N=K,N===r&&(N=q,K=pa(),K!==r&&(Dt=N,K=cc(K)),N=K)))),N}function yp(){var N,K,re;for(N=q,K=[],Dn.test(t.charAt(q))?(re=t.charAt(q),q++):(re=r,ct===0&&Ct(oo));re!==r;)K.push(re),Dn.test(t.charAt(q))?(re=t.charAt(q),q++):(re=r,ct===0&&Ct(oo));return K!==r&&(Dt=N,K=Ms(K)),N=K,N}function yg(){var N,K,re;if(N=q,K=[],re=fa(),re===r&&(ml.test(t.charAt(q))?(re=t.charAt(q),q++):(re=r,ct===0&&Ct(yl))),re!==r)for(;re!==r;)K.push(re),re=fa(),re===r&&(ml.test(t.charAt(q))?(re=t.charAt(q),q++):(re=r,ct===0&&Ct(yl)));else K=r;return K!==r&&(Dt=N,K=Ms(K)),N=K,N}function fa(){var N,K,re;return N=q,t.substr(q,2)===ao?(K=ao,q+=2):(K=r,ct===0&&Ct(Vn)),K!==r&&(Dt=N,K=On()),N=K,N===r&&(N=q,t.charCodeAt(q)===92?(K=Ni,q++):(K=r,ct===0&&Ct(Mn)),K!==r?(_i.test(t.charAt(q))?(re=t.charAt(q),q++):(re=r,ct===0&&Ct(tr)),re!==r?(Dt=N,K=Oe(re),N=K):(q=N,N=r)):(q=N,N=r)),N}function ln(){var N,K,re;for(N=q,K=[],re=Ao(),re===r&&(Dn.test(t.charAt(q))?(re=t.charAt(q),q++):(re=r,ct===0&&Ct(oo)));re!==r;)K.push(re),re=Ao(),re===r&&(Dn.test(t.charAt(q))?(re=t.charAt(q),q++):(re=r,ct===0&&Ct(oo)));return K!==r&&(Dt=N,K=Ms(K)),N=K,N}function Ao(){var N,K,re;return N=q,t.substr(q,2)===ii?(K=ii,q+=2):(K=r,ct===0&&Ct(Ma)),K!==r&&(Dt=N,K=hr()),N=K,N===r&&(N=q,t.substr(q,2)===uc?(K=uc,q+=2):(K=r,ct===0&&Ct(uu)),K!==r&&(Dt=N,K=Ac()),N=K,N===r&&(N=q,t.charCodeAt(q)===92?(K=Ni,q++):(K=r,ct===0&&Ct(Mn)),K!==r?(El.test(t.charAt(q))?(re=t.charAt(q),q++):(re=r,ct===0&&Ct(DA)),re!==r?(Dt=N,K=Au(),N=K):(q=N,N=r)):(q=N,N=r),N===r&&(N=q,t.substr(q,2)===Ce?(K=Ce,q+=2):(K=r,ct===0&&Ct(Rt)),K!==r&&(Dt=N,K=fc()),N=K,N===r&&(N=q,t.substr(q,2)===Hi?(K=Hi,q+=2):(K=r,ct===0&&Ct(fu)),K!==r&&(Dt=N,K=Yt()),N=K,N===r&&(N=q,t.substr(q,2)===Cl?(K=Cl,q+=2):(K=r,ct===0&&Ct(SA)),K!==r&&(Dt=N,K=up()),N=K,N===r&&(N=q,t.substr(q,2)===pc?(K=pc,q+=2):(K=r,ct===0&&Ct(PA)),K!==r&&(Dt=N,K=Qn()),N=K,N===r&&(N=q,t.substr(q,2)===hi?(K=hi,q+=2):(K=r,ct===0&&Ct(hc)),K!==r&&(Dt=N,K=bA()),N=K,N===r&&(N=q,t.charCodeAt(q)===92?(K=Ni,q++):(K=r,ct===0&&Ct(Mn)),K!==r?(sa.test(t.charAt(q))?(re=t.charAt(q),q++):(re=r,ct===0&&Ct(Li)),re!==r?(Dt=N,K=Oe(re),N=K):(q=N,N=r)):(q=N,N=r),N===r&&(N=OA()))))))))),N}function OA(){var N,K,re,pe,ze,mt,fr,Cr,yn,oi,Oi,Ig;return N=q,t.charCodeAt(q)===92?(K=Ni,q++):(K=r,ct===0&&Ct(Mn)),K!==r?(re=Ga(),re!==r?(Dt=N,K=_o(re),N=K):(q=N,N=r)):(q=N,N=r),N===r&&(N=q,t.substr(q,2)===Ze?(K=Ze,q+=2):(K=r,ct===0&&Ct(lo)),K!==r?(re=q,pe=q,ze=Ga(),ze!==r?(mt=si(),mt!==r?(ze=[ze,mt],pe=ze):(q=pe,pe=r)):(q=pe,pe=r),pe===r&&(pe=Ga()),pe!==r?re=t.substring(re,q):re=pe,re!==r?(Dt=N,K=_o(re),N=K):(q=N,N=r)):(q=N,N=r),N===r&&(N=q,t.substr(q,2)===gc?(K=gc,q+=2):(K=r,ct===0&&Ct(pu)),K!==r?(re=q,pe=q,ze=si(),ze!==r?(mt=si(),mt!==r?(fr=si(),fr!==r?(Cr=si(),Cr!==r?(ze=[ze,mt,fr,Cr],pe=ze):(q=pe,pe=r)):(q=pe,pe=r)):(q=pe,pe=r)):(q=pe,pe=r),pe!==r?re=t.substring(re,q):re=pe,re!==r?(Dt=N,K=_o(re),N=K):(q=N,N=r)):(q=N,N=r),N===r&&(N=q,t.substr(q,2)===ji?(K=ji,q+=2):(K=r,ct===0&&Ct(hu)),K!==r?(re=q,pe=q,ze=si(),ze!==r?(mt=si(),mt!==r?(fr=si(),fr!==r?(Cr=si(),Cr!==r?(yn=si(),yn!==r?(oi=si(),oi!==r?(Oi=si(),Oi!==r?(Ig=si(),Ig!==r?(ze=[ze,mt,fr,Cr,yn,oi,Oi,Ig],pe=ze):(q=pe,pe=r)):(q=pe,pe=r)):(q=pe,pe=r)):(q=pe,pe=r)):(q=pe,pe=r)):(q=pe,pe=r)):(q=pe,pe=r)):(q=pe,pe=r),pe!==r?re=t.substring(re,q):re=pe,re!==r?(Dt=N,K=xA(re),N=K):(q=N,N=r)):(q=N,N=r)))),N}function Ga(){var N;return Ua.test(t.charAt(q))?(N=t.charAt(q),q++):(N=r,ct===0&&Ct(dc)),N}function si(){var N;return hs.test(t.charAt(q))?(N=t.charAt(q),q++):(N=r,ct===0&&Ct(_t)),N}function pa(){var N,K,re,pe,ze;if(N=q,K=[],re=q,t.charCodeAt(q)===92?(pe=Ni,q++):(pe=r,ct===0&&Ct(Mn)),pe!==r?(t.length>q?(ze=t.charAt(q),q++):(ze=r,ct===0&&Ct(Fn)),ze!==r?(Dt=re,pe=Oe(ze),re=pe):(q=re,re=r)):(q=re,re=r),re===r&&(re=q,t.substr(q,2)===Ci?(pe=Ci,q+=2):(pe=r,ct===0&&Ct(oa)),pe!==r&&(Dt=re,pe=co()),re=pe,re===r&&(re=q,pe=q,ct++,ze=Rm(),ct--,ze===r?pe=void 0:(q=pe,pe=r),pe!==r?(t.length>q?(ze=t.charAt(q),q++):(ze=r,ct===0&&Ct(Fn)),ze!==r?(Dt=re,pe=Oe(ze),re=pe):(q=re,re=r)):(q=re,re=r))),re!==r)for(;re!==r;)K.push(re),re=q,t.charCodeAt(q)===92?(pe=Ni,q++):(pe=r,ct===0&&Ct(Mn)),pe!==r?(t.length>q?(ze=t.charAt(q),q++):(ze=r,ct===0&&Ct(Fn)),ze!==r?(Dt=re,pe=Oe(ze),re=pe):(q=re,re=r)):(q=re,re=r),re===r&&(re=q,t.substr(q,2)===Ci?(pe=Ci,q+=2):(pe=r,ct===0&&Ct(oa)),pe!==r&&(Dt=re,pe=co()),re=pe,re===r&&(re=q,pe=q,ct++,ze=Rm(),ct--,ze===r?pe=void 0:(q=pe,pe=r),pe!==r?(t.length>q?(ze=t.charAt(q),q++):(ze=r,ct===0&&Ct(Fn)),ze!==r?(Dt=re,pe=Oe(ze),re=pe):(q=re,re=r)):(q=re,re=r)));else K=r;return K!==r&&(Dt=N,K=Ms(K)),N=K,N}function vc(){var N,K,re,pe,ze,mt;if(N=q,t.charCodeAt(q)===45?(K=Us,q++):(K=r,ct===0&&Ct(aa)),K===r&&(t.charCodeAt(q)===43?(K=la,q++):(K=r,ct===0&&Ct(Ho))),K===r&&(K=null),K!==r){if(re=[],Je.test(t.charAt(q))?(pe=t.charAt(q),q++):(pe=r,ct===0&&Ct(je)),pe!==r)for(;pe!==r;)re.push(pe),Je.test(t.charAt(q))?(pe=t.charAt(q),q++):(pe=r,ct===0&&Ct(je));else re=r;if(re!==r)if(t.charCodeAt(q)===46?(pe=wi,q++):(pe=r,ct===0&&Ct(gs)),pe!==r){if(ze=[],Je.test(t.charAt(q))?(mt=t.charAt(q),q++):(mt=r,ct===0&&Ct(je)),mt!==r)for(;mt!==r;)ze.push(mt),Je.test(t.charAt(q))?(mt=t.charAt(q),q++):(mt=r,ct===0&&Ct(je));else ze=r;ze!==r?(Dt=N,K=ds(K,re,ze),N=K):(q=N,N=r)}else q=N,N=r;else q=N,N=r}else q=N,N=r;if(N===r){if(N=q,t.charCodeAt(q)===45?(K=Us,q++):(K=r,ct===0&&Ct(aa)),K===r&&(t.charCodeAt(q)===43?(K=la,q++):(K=r,ct===0&&Ct(Ho))),K===r&&(K=null),K!==r){if(re=[],Je.test(t.charAt(q))?(pe=t.charAt(q),q++):(pe=r,ct===0&&Ct(je)),pe!==r)for(;pe!==r;)re.push(pe),Je.test(t.charAt(q))?(pe=t.charAt(q),q++):(pe=r,ct===0&&Ct(je));else re=r;re!==r?(Dt=N,K=ms(K,re),N=K):(q=N,N=r)}else q=N,N=r;if(N===r&&(N=q,K=Dc(),K!==r&&(Dt=N,K=_s(K)),N=K,N===r&&(N=q,K=qa(),K!==r&&(Dt=N,K=Un(K)),N=K,N===r)))if(N=q,t.charCodeAt(q)===40?(K=Se,q++):(K=r,ct===0&&Ct(le)),K!==r){for(re=[],pe=Qt();pe!==r;)re.push(pe),pe=Qt();if(re!==r)if(pe=ts(),pe!==r){for(ze=[],mt=Qt();mt!==r;)ze.push(mt),mt=Qt();ze!==r?(t.charCodeAt(q)===41?(mt=ne,q++):(mt=r,ct===0&&Ct(ee)),mt!==r?(Dt=N,K=Sn(pe),N=K):(q=N,N=r)):(q=N,N=r)}else q=N,N=r;else q=N,N=r}else q=N,N=r}return N}function Bl(){var N,K,re,pe,ze,mt,fr,Cr;if(N=q,K=vc(),K!==r){for(re=[],pe=q,ze=[],mt=Qt();mt!==r;)ze.push(mt),mt=Qt();if(ze!==r)if(t.charCodeAt(q)===42?(mt=ys,q++):(mt=r,ct===0&&Ct(We)),mt===r&&(t.charCodeAt(q)===47?(mt=tt,q++):(mt=r,ct===0&&Ct(It))),mt!==r){for(fr=[],Cr=Qt();Cr!==r;)fr.push(Cr),Cr=Qt();fr!==r?(Cr=vc(),Cr!==r?(Dt=pe,ze=nr(K,mt,Cr),pe=ze):(q=pe,pe=r)):(q=pe,pe=r)}else q=pe,pe=r;else q=pe,pe=r;for(;pe!==r;){for(re.push(pe),pe=q,ze=[],mt=Qt();mt!==r;)ze.push(mt),mt=Qt();if(ze!==r)if(t.charCodeAt(q)===42?(mt=ys,q++):(mt=r,ct===0&&Ct(We)),mt===r&&(t.charCodeAt(q)===47?(mt=tt,q++):(mt=r,ct===0&&Ct(It))),mt!==r){for(fr=[],Cr=Qt();Cr!==r;)fr.push(Cr),Cr=Qt();fr!==r?(Cr=vc(),Cr!==r?(Dt=pe,ze=nr(K,mt,Cr),pe=ze):(q=pe,pe=r)):(q=pe,pe=r)}else q=pe,pe=r;else q=pe,pe=r}re!==r?(Dt=N,K=$(K,re),N=K):(q=N,N=r)}else q=N,N=r;return N}function ts(){var N,K,re,pe,ze,mt,fr,Cr;if(N=q,K=Bl(),K!==r){for(re=[],pe=q,ze=[],mt=Qt();mt!==r;)ze.push(mt),mt=Qt();if(ze!==r)if(t.charCodeAt(q)===43?(mt=la,q++):(mt=r,ct===0&&Ct(Ho)),mt===r&&(t.charCodeAt(q)===45?(mt=Us,q++):(mt=r,ct===0&&Ct(aa))),mt!==r){for(fr=[],Cr=Qt();Cr!==r;)fr.push(Cr),Cr=Qt();fr!==r?(Cr=Bl(),Cr!==r?(Dt=pe,ze=ye(K,mt,Cr),pe=ze):(q=pe,pe=r)):(q=pe,pe=r)}else q=pe,pe=r;else q=pe,pe=r;for(;pe!==r;){for(re.push(pe),pe=q,ze=[],mt=Qt();mt!==r;)ze.push(mt),mt=Qt();if(ze!==r)if(t.charCodeAt(q)===43?(mt=la,q++):(mt=r,ct===0&&Ct(Ho)),mt===r&&(t.charCodeAt(q)===45?(mt=Us,q++):(mt=r,ct===0&&Ct(aa))),mt!==r){for(fr=[],Cr=Qt();Cr!==r;)fr.push(Cr),Cr=Qt();fr!==r?(Cr=Bl(),Cr!==r?(Dt=pe,ze=ye(K,mt,Cr),pe=ze):(q=pe,pe=r)):(q=pe,pe=r)}else q=pe,pe=r;else q=pe,pe=r}re!==r?(Dt=N,K=$(K,re),N=K):(q=N,N=r)}else q=N,N=r;return N}function qr(){var N,K,re,pe,ze,mt;if(N=q,t.substr(q,3)===Le?(K=Le,q+=3):(K=r,ct===0&&Ct(pt)),K!==r){for(re=[],pe=Qt();pe!==r;)re.push(pe),pe=Qt();if(re!==r)if(pe=ts(),pe!==r){for(ze=[],mt=Qt();mt!==r;)ze.push(mt),mt=Qt();ze!==r?(t.substr(q,2)===ht?(mt=ht,q+=2):(mt=r,ct===0&&Ct(Tt)),mt!==r?(Dt=N,K=er(pe),N=K):(q=N,N=r)):(q=N,N=r)}else q=N,N=r;else q=N,N=r}else q=N,N=r;return N}function Ep(){var N,K,re,pe;return N=q,t.substr(q,2)===$r?(K=$r,q+=2):(K=r,ct===0&&Ct(Gi)),K!==r?(re=Cu(),re!==r?(t.charCodeAt(q)===41?(pe=ne,q++):(pe=r,ct===0&&Ct(ee)),pe!==r?(Dt=N,K=es(re),N=K):(q=N,N=r)):(q=N,N=r)):(q=N,N=r),N}function Dc(){var N,K,re,pe,ze,mt;return N=q,t.substr(q,2)===bi?(K=bi,q+=2):(K=r,ct===0&&Ct(jo)),K!==r?(re=qa(),re!==r?(t.substr(q,2)===kA?(pe=kA,q+=2):(pe=r,ct===0&&Ct(QA)),pe!==r?(ze=NA(),ze!==r?(t.charCodeAt(q)===125?(mt=H,q++):(mt=r,ct===0&&Ct(at)),mt!==r?(Dt=N,K=Ap(re,ze),N=K):(q=N,N=r)):(q=N,N=r)):(q=N,N=r)):(q=N,N=r)):(q=N,N=r),N===r&&(N=q,t.substr(q,2)===bi?(K=bi,q+=2):(K=r,ct===0&&Ct(jo)),K!==r?(re=qa(),re!==r?(t.substr(q,3)===ig?(pe=ig,q+=3):(pe=r,ct===0&&Ct(gu)),pe!==r?(Dt=N,K=sg(re),N=K):(q=N,N=r)):(q=N,N=r)):(q=N,N=r),N===r&&(N=q,t.substr(q,2)===bi?(K=bi,q+=2):(K=r,ct===0&&Ct(jo)),K!==r?(re=qa(),re!==r?(t.substr(q,2)===du?(pe=du,q+=2):(pe=r,ct===0&&Ct(uo)),pe!==r?(ze=NA(),ze!==r?(t.charCodeAt(q)===125?(mt=H,q++):(mt=r,ct===0&&Ct(at)),mt!==r?(Dt=N,K=FA(re,ze),N=K):(q=N,N=r)):(q=N,N=r)):(q=N,N=r)):(q=N,N=r)):(q=N,N=r),N===r&&(N=q,t.substr(q,2)===bi?(K=bi,q+=2):(K=r,ct===0&&Ct(jo)),K!==r?(re=qa(),re!==r?(t.substr(q,3)===mc?(pe=mc,q+=3):(pe=r,ct===0&&Ct(ca)),pe!==r?(Dt=N,K=og(re),N=K):(q=N,N=r)):(q=N,N=r)):(q=N,N=r),N===r&&(N=q,t.substr(q,2)===bi?(K=bi,q+=2):(K=r,ct===0&&Ct(jo)),K!==r?(re=qa(),re!==r?(t.charCodeAt(q)===125?(pe=H,q++):(pe=r,ct===0&&Ct(at)),pe!==r?(Dt=N,K=yc(re),N=K):(q=N,N=r)):(q=N,N=r)):(q=N,N=r),N===r&&(N=q,t.charCodeAt(q)===36?(K=Pm,q++):(K=r,ct===0&&Ct(ag)),K!==r?(re=qa(),re!==r?(Dt=N,K=yc(re),N=K):(q=N,N=r)):(q=N,N=r)))))),N}function Cw(){var N,K,re;return N=q,K=Eg(),K!==r?(Dt=q,re=$n(K),re?re=void 0:re=r,re!==r?(Dt=N,K=fp(K),N=K):(q=N,N=r)):(q=N,N=r),N}function Eg(){var N,K,re,pe,ze;if(N=q,K=[],re=q,pe=q,ct++,ze=wg(),ct--,ze===r?pe=void 0:(q=pe,pe=r),pe!==r?(t.length>q?(ze=t.charAt(q),q++):(ze=r,ct===0&&Ct(Fn)),ze!==r?(Dt=re,pe=Oe(ze),re=pe):(q=re,re=r)):(q=re,re=r),re!==r)for(;re!==r;)K.push(re),re=q,pe=q,ct++,ze=wg(),ct--,ze===r?pe=void 0:(q=pe,pe=r),pe!==r?(t.length>q?(ze=t.charAt(q),q++):(ze=r,ct===0&&Ct(Fn)),ze!==r?(Dt=re,pe=Oe(ze),re=pe):(q=re,re=r)):(q=re,re=r);else K=r;return K!==r&&(Dt=N,K=Ms(K)),N=K,N}function Cg(){var N,K,re;if(N=q,K=[],lg.test(t.charAt(q))?(re=t.charAt(q),q++):(re=r,ct===0&&Ct(RA)),re!==r)for(;re!==r;)K.push(re),lg.test(t.charAt(q))?(re=t.charAt(q),q++):(re=r,ct===0&&Ct(RA));else K=r;return K!==r&&(Dt=N,K=Hs()),N=K,N}function qa(){var N,K,re;if(N=q,K=[],mu.test(t.charAt(q))?(re=t.charAt(q),q++):(re=r,ct===0&&Ct(Ha)),re!==r)for(;re!==r;)K.push(re),mu.test(t.charAt(q))?(re=t.charAt(q),q++):(re=r,ct===0&&Ct(Ha));else K=r;return K!==r&&(Dt=N,K=Hs()),N=K,N}function Rm(){var N;return qi.test(t.charAt(q))?(N=t.charAt(q),q++):(N=r,ct===0&&Ct(ua)),N}function wg(){var N;return yu.test(t.charAt(q))?(N=t.charAt(q),q++):(N=r,ct===0&&Ct(Es)),N}function Qt(){var N,K;if(N=[],Ec.test(t.charAt(q))?(K=t.charAt(q),q++):(K=r,ct===0&&Ct(Cc)),K!==r)for(;K!==r;)N.push(K),Ec.test(t.charAt(q))?(K=t.charAt(q),q++):(K=r,ct===0&&Ct(Cc));else N=r;return N}if(Eu=a(),Eu!==r&&q===t.length)return Eu;throw Eu!==r&&q<t.length&&Ct(Ag()),pg(wc,xi<t.length?t.charAt(xi):null,xi<t.length?Ic(xi,xi+1):Ic(xi,xi))}XY.exports={SyntaxError:qg,parse:u8e}});function ND(t,e={isGlobPattern:()=>!1}){try{return(0,$Y.parse)(t,e)}catch(r){throw r.location&&(r.message=r.message.replace(/(\.)?$/,` (line ${r.location.start.line}, column ${r.location.start.column})$1`)),r}}function cy(t,{endSemicolon:e=!1}={}){return t.map(({command:r,type:o},a)=>`${LD(r)}${o===";"?a!==t.length-1||e?";":"":" &"}`).join(" ")}function LD(t){return`${uy(t.chain)}${t.then?` ${oT(t.then)}`:""}`}function oT(t){return`${t.type} ${LD(t.line)}`}function uy(t){return`${lT(t)}${t.then?` ${aT(t.then)}`:""}`}function aT(t){return`${t.type} ${uy(t.chain)}`}function lT(t){switch(t.type){case"command":return`${t.envs.length>0?`${t.envs.map(e=>TD(e)).join(" ")} `:""}${t.args.map(e=>cT(e)).join(" ")}`;case"subshell":return`(${cy(t.subshell)})${t.args.length>0?` ${t.args.map(e=>Jw(e)).join(" ")}`:""}`;case"group":return`{ ${cy(t.group,{endSemicolon:!0})} }${t.args.length>0?` ${t.args.map(e=>Jw(e)).join(" ")}`:""}`;case"envs":return t.envs.map(e=>TD(e)).join(" ");default:throw new Error(`Unsupported command type:  "${t.type}"`)}}function TD(t){return`${t.name}=${t.args[0]?Yg(t.args[0]):""}`}function cT(t){switch(t.type){case"redirection":return Jw(t);case"argument":return Yg(t);default:throw new Error(`Unsupported argument type: "${t.type}"`)}}function Jw(t){return`${t.subtype} ${t.args.map(e=>Yg(e)).join(" ")}`}function Yg(t){return t.segments.map(e=>uT(e)).join("")}function uT(t){let e=(o,a)=>a?`"${o}"`:o,r=o=>o===""?"''":o.match(/[()}<>$|&;"'\n\t ]/)?o.match(/['\t\p{C}]/u)?o.match(/'/)?`"${o.replace(/["$\t\p{C}]/u,f8e)}"`:`$'${o.replace(/[\t\p{C}]/u,tW)}'`:`'${o}'`:o;switch(t.type){case"text":return r(t.text);case"glob":return t.pattern;case"shell":return e(`\${${cy(t.shell)}}`,t.quoted);case"variable":return e(typeof t.defaultValue>"u"?typeof t.alternativeValue>"u"?`\${${t.name}}`:t.alternativeValue.length===0?`\${${t.name}:+}`:`\${${t.name}:+${t.alternativeValue.map(o=>Yg(o)).join(" ")}}`:t.defaultValue.length===0?`\${${t.name}:-}`:`\${${t.name}:-${t.defaultValue.map(o=>Yg(o)).join(" ")}}`,t.quoted);case"arithmetic":return`$(( ${OD(t.arithmetic)} ))`;default:throw new Error(`Unsupported argument segment type: "${t.type}"`)}}function OD(t){let e=a=>{switch(a){case"addition":return"+";case"subtraction":return"-";case"multiplication":return"*";case"division":return"/";default:throw new Error(`Can't extract operator from arithmetic expression of type "${a}"`)}},r=(a,n)=>n?`( ${a} )`:a,o=a=>r(OD(a),!["number","variable"].includes(a.type));switch(t.type){case"number":return String(t.value);case"variable":return t.name;default:return`${o(t.left)} ${e(t.type)} ${o(t.right)}`}}var $Y,eW,A8e,tW,f8e,rW=Et(()=>{$Y=$e(ZY());eW=new Map([["\f","\\f"],[`
+`,"\\n"],["\r","\\r"],["	","\\t"],["\v","\\v"],["\0","\\0"]]),A8e=new Map([["\\","\\\\"],["$","\\$"],['"','\\"'],...Array.from(eW,([t,e])=>[t,`"$'${e}'"`])]),tW=t=>eW.get(t)??`\\x${t.charCodeAt(0).toString(16).padStart(2,"0")}`,f8e=t=>A8e.get(t)??`"$'${tW(t)}'"`});var iW=_((Tbt,nW)=>{"use strict";function p8e(t,e){function r(){this.constructor=t}r.prototype=e.prototype,t.prototype=new r}function Wg(t,e,r,o){this.message=t,this.expected=e,this.found=r,this.location=o,this.name="SyntaxError",typeof Error.captureStackTrace=="function"&&Error.captureStackTrace(this,Wg)}p8e(Wg,Error);Wg.buildMessage=function(t,e){var r={literal:function(h){return'"'+a(h.text)+'"'},class:function(h){var E="",I;for(I=0;I<h.parts.length;I++)E+=h.parts[I]instanceof Array?n(h.parts[I][0])+"-"+n(h.parts[I][1]):n(h.parts[I]);return"["+(h.inverted?"^":"")+E+"]"},any:function(h){return"any character"},end:function(h){return"end of input"},other:function(h){return h.description}};function o(h){return h.charCodeAt(0).toString(16).toUpperCase()}function a(h){return h.replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,function(E){return"\\x0"+o(E)}).replace(/[\x10-\x1F\x7F-\x9F]/g,function(E){return"\\x"+o(E)})}function n(h){return h.replace(/\\/g,"\\\\").replace(/\]/g,"\\]").replace(/\^/g,"\\^").replace(/-/g,"\\-").replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,function(E){return"\\x0"+o(E)}).replace(/[\x10-\x1F\x7F-\x9F]/g,function(E){return"\\x"+o(E)})}function u(h){return r[h.type](h)}function A(h){var E=new Array(h.length),I,v;for(I=0;I<h.length;I++)E[I]=u(h[I]);if(E.sort(),E.length>0){for(I=1,v=1;I<E.length;I++)E[I-1]!==E[I]&&(E[v]=E[I],v++);E.length=v}switch(E.length){case 1:return E[0];case 2:return E[0]+" or "+E[1];default:return E.slice(0,-1).join(", ")+", or "+E[E.length-1]}}function p(h){return h?'"'+a(h)+'"':"end of input"}return"Expected "+A(t)+" but "+p(e)+" found."};function h8e(t,e){e=e!==void 0?e:{};var r={},o={resolution:ke},a=ke,n="/",u=Se("/",!1),A=function(je,b){return{from:je,descriptor:b}},p=function(je){return{descriptor:je}},h="@",E=Se("@",!1),I=function(je,b){return{fullName:je,description:b}},v=function(je){return{fullName:je}},x=function(){return Be()},C=/^[^\/@]/,R=le(["/","@"],!0,!1),L=/^[^\/]/,U=le(["/"],!0,!1),J=0,te=0,ae=[{line:1,column:1}],fe=0,ce=[],me=0,he;if("startRule"in e){if(!(e.startRule in o))throw new Error(`Can't start parsing from rule "`+e.startRule+'".');a=o[e.startRule]}function Be(){return t.substring(te,J)}function we(){return At(te,J)}function g(je,b){throw b=b!==void 0?b:At(te,J),Re([Ie(je)],t.substring(te,J),b)}function Ee(je,b){throw b=b!==void 0?b:At(te,J),at(je,b)}function Se(je,b){return{type:"literal",text:je,ignoreCase:b}}function le(je,b,w){return{type:"class",parts:je,inverted:b,ignoreCase:w}}function ne(){return{type:"any"}}function ee(){return{type:"end"}}function Ie(je){return{type:"other",description:je}}function Fe(je){var b=ae[je],w;if(b)return b;for(w=je-1;!ae[w];)w--;for(b=ae[w],b={line:b.line,column:b.column};w<je;)t.charCodeAt(w)===10?(b.line++,b.column=1):b.column++,w++;return ae[je]=b,b}function At(je,b){var w=Fe(je),P=Fe(b);return{start:{offset:je,line:w.line,column:w.column},end:{offset:b,line:P.line,column:P.column}}}function H(je){J<fe||(J>fe&&(fe=J,ce=[]),ce.push(je))}function at(je,b){return new Wg(je,null,null,b)}function Re(je,b,w){return new Wg(Wg.buildMessage(je,b),je,b,w)}function ke(){var je,b,w,P;return je=J,b=xe(),b!==r?(t.charCodeAt(J)===47?(w=n,J++):(w=r,me===0&&H(u)),w!==r?(P=xe(),P!==r?(te=je,b=A(b,P),je=b):(J=je,je=r)):(J=je,je=r)):(J=je,je=r),je===r&&(je=J,b=xe(),b!==r&&(te=je,b=p(b)),je=b),je}function xe(){var je,b,w,P;return je=J,b=He(),b!==r?(t.charCodeAt(J)===64?(w=h,J++):(w=r,me===0&&H(E)),w!==r?(P=Je(),P!==r?(te=je,b=I(b,P),je=b):(J=je,je=r)):(J=je,je=r)):(J=je,je=r),je===r&&(je=J,b=He(),b!==r&&(te=je,b=v(b)),je=b),je}function He(){var je,b,w,P,y;return je=J,t.charCodeAt(J)===64?(b=h,J++):(b=r,me===0&&H(E)),b!==r?(w=Te(),w!==r?(t.charCodeAt(J)===47?(P=n,J++):(P=r,me===0&&H(u)),P!==r?(y=Te(),y!==r?(te=je,b=x(),je=b):(J=je,je=r)):(J=je,je=r)):(J=je,je=r)):(J=je,je=r),je===r&&(je=J,b=Te(),b!==r&&(te=je,b=x()),je=b),je}function Te(){var je,b,w;if(je=J,b=[],C.test(t.charAt(J))?(w=t.charAt(J),J++):(w=r,me===0&&H(R)),w!==r)for(;w!==r;)b.push(w),C.test(t.charAt(J))?(w=t.charAt(J),J++):(w=r,me===0&&H(R));else b=r;return b!==r&&(te=je,b=x()),je=b,je}function Je(){var je,b,w;if(je=J,b=[],L.test(t.charAt(J))?(w=t.charAt(J),J++):(w=r,me===0&&H(U)),w!==r)for(;w!==r;)b.push(w),L.test(t.charAt(J))?(w=t.charAt(J),J++):(w=r,me===0&&H(U));else b=r;return b!==r&&(te=je,b=x()),je=b,je}if(he=a(),he!==r&&J===t.length)return he;throw he!==r&&J<t.length&&H(ee()),Re(ce,fe<t.length?t.charAt(fe):null,fe<t.length?At(fe,fe+1):At(fe,fe))}nW.exports={SyntaxError:Wg,parse:h8e}});function MD(t){let e=t.match(/^\*{1,2}\/(.*)/);if(e)throw new Error(`The override for '${t}' includes a glob pattern. Glob patterns have been removed since their behaviours don't match what you'd expect. Set the override to '${e[1]}' instead.`);try{return(0,sW.parse)(t)}catch(r){throw r.location&&(r.message=r.message.replace(/(\.)?$/,` (line ${r.location.start.line}, column ${r.location.start.column})$1`)),r}}function UD(t){let e="";return t.from&&(e+=t.from.fullName,t.from.description&&(e+=`@${t.from.description}`),e+="/"),e+=t.descriptor.fullName,t.descriptor.description&&(e+=`@${t.descriptor.description}`),e}var sW,oW=Et(()=>{sW=$e(iW())});var Vg=_((Lbt,Kg)=>{"use strict";function aW(t){return typeof t>"u"||t===null}function g8e(t){return typeof t=="object"&&t!==null}function d8e(t){return Array.isArray(t)?t:aW(t)?[]:[t]}function m8e(t,e){var r,o,a,n;if(e)for(n=Object.keys(e),r=0,o=n.length;r<o;r+=1)a=n[r],t[a]=e[a];return t}function y8e(t,e){var r="",o;for(o=0;o<e;o+=1)r+=t;return r}function E8e(t){return t===0&&Number.NEGATIVE_INFINITY===1/t}Kg.exports.isNothing=aW;Kg.exports.isObject=g8e;Kg.exports.toArray=d8e;Kg.exports.repeat=y8e;Kg.exports.isNegativeZero=E8e;Kg.exports.extend=m8e});var Ay=_((Obt,lW)=>{"use strict";function zw(t,e){Error.call(this),this.name="YAMLException",this.reason=t,this.mark=e,this.message=(this.reason||"(unknown reason)")+(this.mark?" "+this.mark.toString():""),Error.captureStackTrace?Error.captureStackTrace(this,this.constructor):this.stack=new Error().stack||""}zw.prototype=Object.create(Error.prototype);zw.prototype.constructor=zw;zw.prototype.toString=function(e){var r=this.name+": ";return r+=this.reason||"(unknown reason)",!e&&this.mark&&(r+=" "+this.mark.toString()),r};lW.exports=zw});var AW=_((Mbt,uW)=>{"use strict";var cW=Vg();function AT(t,e,r,o,a){this.name=t,this.buffer=e,this.position=r,this.line=o,this.column=a}AT.prototype.getSnippet=function(e,r){var o,a,n,u,A;if(!this.buffer)return null;for(e=e||4,r=r||75,o="",a=this.position;a>0&&`\0\r
+\x85\u2028\u2029`.indexOf(this.buffer.charAt(a-1))===-1;)if(a-=1,this.position-a>r/2-1){o=" ... ",a+=5;break}for(n="",u=this.position;u<this.buffer.length&&`\0\r
+\x85\u2028\u2029`.indexOf(this.buffer.charAt(u))===-1;)if(u+=1,u-this.position>r/2-1){n=" ... ",u-=5;break}return A=this.buffer.slice(a,u),cW.repeat(" ",e)+o+A+n+`
+`+cW.repeat(" ",e+this.position-a+o.length)+"^"};AT.prototype.toString=function(e){var r,o="";return this.name&&(o+='in "'+this.name+'" '),o+="at line "+(this.line+1)+", column "+(this.column+1),e||(r=this.getSnippet(),r&&(o+=`:
+`+r)),o};uW.exports=AT});var os=_((Ubt,pW)=>{"use strict";var fW=Ay(),C8e=["kind","resolve","construct","instanceOf","predicate","represent","defaultStyle","styleAliases"],w8e=["scalar","sequence","mapping"];function I8e(t){var e={};return t!==null&&Object.keys(t).forEach(function(r){t[r].forEach(function(o){e[String(o)]=r})}),e}function B8e(t,e){if(e=e||{},Object.keys(e).forEach(function(r){if(C8e.indexOf(r)===-1)throw new fW('Unknown option "'+r+'" is met in definition of "'+t+'" YAML type.')}),this.tag=t,this.kind=e.kind||null,this.resolve=e.resolve||function(){return!0},this.construct=e.construct||function(r){return r},this.instanceOf=e.instanceOf||null,this.predicate=e.predicate||null,this.represent=e.represent||null,this.defaultStyle=e.defaultStyle||null,this.styleAliases=I8e(e.styleAliases||null),w8e.indexOf(this.kind)===-1)throw new fW('Unknown kind "'+this.kind+'" is specified for "'+t+'" YAML type.')}pW.exports=B8e});var Jg=_((_bt,gW)=>{"use strict";var hW=Vg(),_D=Ay(),v8e=os();function fT(t,e,r){var o=[];return t.include.forEach(function(a){r=fT(a,e,r)}),t[e].forEach(function(a){r.forEach(function(n,u){n.tag===a.tag&&n.kind===a.kind&&o.push(u)}),r.push(a)}),r.filter(function(a,n){return o.indexOf(n)===-1})}function D8e(){var t={scalar:{},sequence:{},mapping:{},fallback:{}},e,r;function o(a){t[a.kind][a.tag]=t.fallback[a.tag]=a}for(e=0,r=arguments.length;e<r;e+=1)arguments[e].forEach(o);return t}function fy(t){this.include=t.include||[],this.implicit=t.implicit||[],this.explicit=t.explicit||[],this.implicit.forEach(function(e){if(e.loadKind&&e.loadKind!=="scalar")throw new _D("There is a non-scalar type in the implicit list of a schema. Implicit resolving of such types is not supported.")}),this.compiledImplicit=fT(this,"implicit",[]),this.compiledExplicit=fT(this,"explicit",[]),this.compiledTypeMap=D8e(this.compiledImplicit,this.compiledExplicit)}fy.DEFAULT=null;fy.create=function(){var e,r;switch(arguments.length){case 1:e=fy.DEFAULT,r=arguments[0];break;case 2:e=arguments[0],r=arguments[1];break;default:throw new _D("Wrong number of arguments for Schema.create function")}if(e=hW.toArray(e),r=hW.toArray(r),!e.every(function(o){return o instanceof fy}))throw new _D("Specified list of super schemas (or a single Schema object) contains a non-Schema object.");if(!r.every(function(o){return o instanceof v8e}))throw new _D("Specified list of YAML types (or a single Type object) contains a non-Type object.");return new fy({include:e,explicit:r})};gW.exports=fy});var mW=_((Hbt,dW)=>{"use strict";var S8e=os();dW.exports=new S8e("tag:yaml.org,2002:str",{kind:"scalar",construct:function(t){return t!==null?t:""}})});var EW=_((jbt,yW)=>{"use strict";var P8e=os();yW.exports=new P8e("tag:yaml.org,2002:seq",{kind:"sequence",construct:function(t){return t!==null?t:[]}})});var wW=_((Gbt,CW)=>{"use strict";var b8e=os();CW.exports=new b8e("tag:yaml.org,2002:map",{kind:"mapping",construct:function(t){return t!==null?t:{}}})});var HD=_((qbt,IW)=>{"use strict";var x8e=Jg();IW.exports=new x8e({explicit:[mW(),EW(),wW()]})});var vW=_((Ybt,BW)=>{"use strict";var k8e=os();function Q8e(t){if(t===null)return!0;var e=t.length;return e===1&&t==="~"||e===4&&(t==="null"||t==="Null"||t==="NULL")}function F8e(){return null}function R8e(t){return t===null}BW.exports=new k8e("tag:yaml.org,2002:null",{kind:"scalar",resolve:Q8e,construct:F8e,predicate:R8e,represent:{canonical:function(){return"~"},lowercase:function(){return"null"},uppercase:function(){return"NULL"},camelcase:function(){return"Null"}},defaultStyle:"lowercase"})});var SW=_((Wbt,DW)=>{"use strict";var T8e=os();function N8e(t){if(t===null)return!1;var e=t.length;return e===4&&(t==="true"||t==="True"||t==="TRUE")||e===5&&(t==="false"||t==="False"||t==="FALSE")}function L8e(t){return t==="true"||t==="True"||t==="TRUE"}function O8e(t){return Object.prototype.toString.call(t)==="[object Boolean]"}DW.exports=new T8e("tag:yaml.org,2002:bool",{kind:"scalar",resolve:N8e,construct:L8e,predicate:O8e,represent:{lowercase:function(t){return t?"true":"false"},uppercase:function(t){return t?"TRUE":"FALSE"},camelcase:function(t){return t?"True":"False"}},defaultStyle:"lowercase"})});var bW=_((Kbt,PW)=>{"use strict";var M8e=Vg(),U8e=os();function _8e(t){return 48<=t&&t<=57||65<=t&&t<=70||97<=t&&t<=102}function H8e(t){return 48<=t&&t<=55}function j8e(t){return 48<=t&&t<=57}function G8e(t){if(t===null)return!1;var e=t.length,r=0,o=!1,a;if(!e)return!1;if(a=t[r],(a==="-"||a==="+")&&(a=t[++r]),a==="0"){if(r+1===e)return!0;if(a=t[++r],a==="b"){for(r++;r<e;r++)if(a=t[r],a!=="_"){if(a!=="0"&&a!=="1")return!1;o=!0}return o&&a!=="_"}if(a==="x"){for(r++;r<e;r++)if(a=t[r],a!=="_"){if(!_8e(t.charCodeAt(r)))return!1;o=!0}return o&&a!=="_"}for(;r<e;r++)if(a=t[r],a!=="_"){if(!H8e(t.charCodeAt(r)))return!1;o=!0}return o&&a!=="_"}if(a==="_")return!1;for(;r<e;r++)if(a=t[r],a!=="_"){if(a===":")break;if(!j8e(t.charCodeAt(r)))return!1;o=!0}return!o||a==="_"?!1:a!==":"?!0:/^(:[0-5]?[0-9])+$/.test(t.slice(r))}function q8e(t){var e=t,r=1,o,a,n=[];return e.indexOf("_")!==-1&&(e=e.replace(/_/g,"")),o=e[0],(o==="-"||o==="+")&&(o==="-"&&(r=-1),e=e.slice(1),o=e[0]),e==="0"?0:o==="0"?e[1]==="b"?r*parseInt(e.slice(2),2):e[1]==="x"?r*parseInt(e,16):r*parseInt(e,8):e.indexOf(":")!==-1?(e.split(":").forEach(function(u){n.unshift(parseInt(u,10))}),e=0,a=1,n.forEach(function(u){e+=u*a,a*=60}),r*e):r*parseInt(e,10)}function Y8e(t){return Object.prototype.toString.call(t)==="[object Number]"&&t%1===0&&!M8e.isNegativeZero(t)}PW.exports=new U8e("tag:yaml.org,2002:int",{kind:"scalar",resolve:G8e,construct:q8e,predicate:Y8e,represent:{binary:function(t){return t>=0?"0b"+t.toString(2):"-0b"+t.toString(2).slice(1)},octal:function(t){return t>=0?"0"+t.toString(8):"-0"+t.toString(8).slice(1)},decimal:function(t){return t.toString(10)},hexadecimal:function(t){return t>=0?"0x"+t.toString(16).toUpperCase():"-0x"+t.toString(16).toUpperCase().slice(1)}},defaultStyle:"decimal",styleAliases:{binary:[2,"bin"],octal:[8,"oct"],decimal:[10,"dec"],hexadecimal:[16,"hex"]}})});var QW=_((Vbt,kW)=>{"use strict";var xW=Vg(),W8e=os(),K8e=new RegExp("^(?:[-+]?(?:0|[1-9][0-9_]*)(?:\\.[0-9_]*)?(?:[eE][-+]?[0-9]+)?|\\.[0-9_]+(?:[eE][-+]?[0-9]+)?|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN))$");function V8e(t){return!(t===null||!K8e.test(t)||t[t.length-1]==="_")}function J8e(t){var e,r,o,a;return e=t.replace(/_/g,"").toLowerCase(),r=e[0]==="-"?-1:1,a=[],"+-".indexOf(e[0])>=0&&(e=e.slice(1)),e===".inf"?r===1?Number.POSITIVE_INFINITY:Number.NEGATIVE_INFINITY:e===".nan"?NaN:e.indexOf(":")>=0?(e.split(":").forEach(function(n){a.unshift(parseFloat(n,10))}),e=0,o=1,a.forEach(function(n){e+=n*o,o*=60}),r*e):r*parseFloat(e,10)}var z8e=/^[-+]?[0-9]+e/;function X8e(t,e){var r;if(isNaN(t))switch(e){case"lowercase":return".nan";case"uppercase":return".NAN";case"camelcase":return".NaN"}else if(Number.POSITIVE_INFINITY===t)switch(e){case"lowercase":return".inf";case"uppercase":return".INF";case"camelcase":return".Inf"}else if(Number.NEGATIVE_INFINITY===t)switch(e){case"lowercase":return"-.inf";case"uppercase":return"-.INF";case"camelcase":return"-.Inf"}else if(xW.isNegativeZero(t))return"-0.0";return r=t.toString(10),z8e.test(r)?r.replace("e",".e"):r}function Z8e(t){return Object.prototype.toString.call(t)==="[object Number]"&&(t%1!==0||xW.isNegativeZero(t))}kW.exports=new W8e("tag:yaml.org,2002:float",{kind:"scalar",resolve:V8e,construct:J8e,predicate:Z8e,represent:X8e,defaultStyle:"lowercase"})});var pT=_((Jbt,FW)=>{"use strict";var $8e=Jg();FW.exports=new $8e({include:[HD()],implicit:[vW(),SW(),bW(),QW()]})});var hT=_((zbt,RW)=>{"use strict";var eHe=Jg();RW.exports=new eHe({include:[pT()]})});var OW=_((Xbt,LW)=>{"use strict";var tHe=os(),TW=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9])-([0-9][0-9])$"),NW=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9]?)-([0-9][0-9]?)(?:[Tt]|[ \\t]+)([0-9][0-9]?):([0-9][0-9]):([0-9][0-9])(?:\\.([0-9]*))?(?:[ \\t]*(Z|([-+])([0-9][0-9]?)(?::([0-9][0-9]))?))?$");function rHe(t){return t===null?!1:TW.exec(t)!==null||NW.exec(t)!==null}function nHe(t){var e,r,o,a,n,u,A,p=0,h=null,E,I,v;if(e=TW.exec(t),e===null&&(e=NW.exec(t)),e===null)throw new Error("Date resolve error");if(r=+e[1],o=+e[2]-1,a=+e[3],!e[4])return new Date(Date.UTC(r,o,a));if(n=+e[4],u=+e[5],A=+e[6],e[7]){for(p=e[7].slice(0,3);p.length<3;)p+="0";p=+p}return e[9]&&(E=+e[10],I=+(e[11]||0),h=(E*60+I)*6e4,e[9]==="-"&&(h=-h)),v=new Date(Date.UTC(r,o,a,n,u,A,p)),h&&v.setTime(v.getTime()-h),v}function iHe(t){return t.toISOString()}LW.exports=new tHe("tag:yaml.org,2002:timestamp",{kind:"scalar",resolve:rHe,construct:nHe,instanceOf:Date,represent:iHe})});var UW=_((Zbt,MW)=>{"use strict";var sHe=os();function oHe(t){return t==="<<"||t===null}MW.exports=new sHe("tag:yaml.org,2002:merge",{kind:"scalar",resolve:oHe})});var jW=_(($bt,HW)=>{"use strict";var zg;try{_W=ve,zg=_W("buffer").Buffer}catch{}var _W,aHe=os(),gT=`ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=
+\r`;function lHe(t){if(t===null)return!1;var e,r,o=0,a=t.length,n=gT;for(r=0;r<a;r++)if(e=n.indexOf(t.charAt(r)),!(e>64)){if(e<0)return!1;o+=6}return o%8===0}function cHe(t){var e,r,o=t.replace(/[\r\n=]/g,""),a=o.length,n=gT,u=0,A=[];for(e=0;e<a;e++)e%4===0&&e&&(A.push(u>>16&255),A.push(u>>8&255),A.push(u&255)),u=u<<6|n.indexOf(o.charAt(e));return r=a%4*6,r===0?(A.push(u>>16&255),A.push(u>>8&255),A.push(u&255)):r===18?(A.push(u>>10&255),A.push(u>>2&255)):r===12&&A.push(u>>4&255),zg?zg.from?zg.from(A):new zg(A):A}function uHe(t){var e="",r=0,o,a,n=t.length,u=gT;for(o=0;o<n;o++)o%3===0&&o&&(e+=u[r>>18&63],e+=u[r>>12&63],e+=u[r>>6&63],e+=u[r&63]),r=(r<<8)+t[o];return a=n%3,a===0?(e+=u[r>>18&63],e+=u[r>>12&63],e+=u[r>>6&63],e+=u[r&63]):a===2?(e+=u[r>>10&63],e+=u[r>>4&63],e+=u[r<<2&63],e+=u[64]):a===1&&(e+=u[r>>2&63],e+=u[r<<4&63],e+=u[64],e+=u[64]),e}function AHe(t){return zg&&zg.isBuffer(t)}HW.exports=new aHe("tag:yaml.org,2002:binary",{kind:"scalar",resolve:lHe,construct:cHe,predicate:AHe,represent:uHe})});var qW=_((txt,GW)=>{"use strict";var fHe=os(),pHe=Object.prototype.hasOwnProperty,hHe=Object.prototype.toString;function gHe(t){if(t===null)return!0;var e=[],r,o,a,n,u,A=t;for(r=0,o=A.length;r<o;r+=1){if(a=A[r],u=!1,hHe.call(a)!=="[object Object]")return!1;for(n in a)if(pHe.call(a,n))if(!u)u=!0;else return!1;if(!u)return!1;if(e.indexOf(n)===-1)e.push(n);else return!1}return!0}function dHe(t){return t!==null?t:[]}GW.exports=new fHe("tag:yaml.org,2002:omap",{kind:"sequence",resolve:gHe,construct:dHe})});var WW=_((rxt,YW)=>{"use strict";var mHe=os(),yHe=Object.prototype.toString;function EHe(t){if(t===null)return!0;var e,r,o,a,n,u=t;for(n=new Array(u.length),e=0,r=u.length;e<r;e+=1){if(o=u[e],yHe.call(o)!=="[object Object]"||(a=Object.keys(o),a.length!==1))return!1;n[e]=[a[0],o[a[0]]]}return!0}function CHe(t){if(t===null)return[];var e,r,o,a,n,u=t;for(n=new Array(u.length),e=0,r=u.length;e<r;e+=1)o=u[e],a=Object.keys(o),n[e]=[a[0],o[a[0]]];return n}YW.exports=new mHe("tag:yaml.org,2002:pairs",{kind:"sequence",resolve:EHe,construct:CHe})});var VW=_((nxt,KW)=>{"use strict";var wHe=os(),IHe=Object.prototype.hasOwnProperty;function BHe(t){if(t===null)return!0;var e,r=t;for(e in r)if(IHe.call(r,e)&&r[e]!==null)return!1;return!0}function vHe(t){return t!==null?t:{}}KW.exports=new wHe("tag:yaml.org,2002:set",{kind:"mapping",resolve:BHe,construct:vHe})});var py=_((ixt,JW)=>{"use strict";var DHe=Jg();JW.exports=new DHe({include:[hT()],implicit:[OW(),UW()],explicit:[jW(),qW(),WW(),VW()]})});var XW=_((sxt,zW)=>{"use strict";var SHe=os();function PHe(){return!0}function bHe(){}function xHe(){return""}function kHe(t){return typeof t>"u"}zW.exports=new SHe("tag:yaml.org,2002:js/undefined",{kind:"scalar",resolve:PHe,construct:bHe,predicate:kHe,represent:xHe})});var $W=_((oxt,ZW)=>{"use strict";var QHe=os();function FHe(t){if(t===null||t.length===0)return!1;var e=t,r=/\/([gim]*)$/.exec(t),o="";return!(e[0]==="/"&&(r&&(o=r[1]),o.length>3||e[e.length-o.length-1]!=="/"))}function RHe(t){var e=t,r=/\/([gim]*)$/.exec(t),o="";return e[0]==="/"&&(r&&(o=r[1]),e=e.slice(1,e.length-o.length-1)),new RegExp(e,o)}function THe(t){var e="/"+t.source+"/";return t.global&&(e+="g"),t.multiline&&(e+="m"),t.ignoreCase&&(e+="i"),e}function NHe(t){return Object.prototype.toString.call(t)==="[object RegExp]"}ZW.exports=new QHe("tag:yaml.org,2002:js/regexp",{kind:"scalar",resolve:FHe,construct:RHe,predicate:NHe,represent:THe})});var rK=_((axt,tK)=>{"use strict";var jD;try{eK=ve,jD=eK("esprima")}catch{typeof window<"u"&&(jD=window.esprima)}var eK,LHe=os();function OHe(t){if(t===null)return!1;try{var e="("+t+")",r=jD.parse(e,{range:!0});return!(r.type!=="Program"||r.body.length!==1||r.body[0].type!=="ExpressionStatement"||r.body[0].expression.type!=="ArrowFunctionExpression"&&r.body[0].expression.type!=="FunctionExpression")}catch{return!1}}function MHe(t){var e="("+t+")",r=jD.parse(e,{range:!0}),o=[],a;if(r.type!=="Program"||r.body.length!==1||r.body[0].type!=="ExpressionStatement"||r.body[0].expression.type!=="ArrowFunctionExpression"&&r.body[0].expression.type!=="FunctionExpression")throw new Error("Failed to resolve function");return r.body[0].expression.params.forEach(function(n){o.push(n.name)}),a=r.body[0].expression.body.range,r.body[0].expression.body.type==="BlockStatement"?new Function(o,e.slice(a[0]+1,a[1]-1)):new Function(o,"return "+e.slice(a[0],a[1]))}function UHe(t){return t.toString()}function _He(t){return Object.prototype.toString.call(t)==="[object Function]"}tK.exports=new LHe("tag:yaml.org,2002:js/function",{kind:"scalar",resolve:OHe,construct:MHe,predicate:_He,represent:UHe})});var Xw=_((cxt,iK)=>{"use strict";var nK=Jg();iK.exports=nK.DEFAULT=new nK({include:[py()],explicit:[XW(),$W(),rK()]})});var BK=_((uxt,Zw)=>{"use strict";var yf=Vg(),AK=Ay(),HHe=AW(),fK=py(),jHe=Xw(),Yp=Object.prototype.hasOwnProperty,GD=1,pK=2,hK=3,qD=4,dT=1,GHe=2,sK=3,qHe=/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x84\x86-\x9F\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/,YHe=/[\x85\u2028\u2029]/,WHe=/[,\[\]\{\}]/,gK=/^(?:!|!!|![a-z\-]+!)$/i,dK=/^(?:!|[^,\[\]\{\}])(?:%[0-9a-f]{2}|[0-9a-z\-#;\/\?:@&=\+\$,_\.!~\*'\(\)\[\]])*$/i;function oK(t){return Object.prototype.toString.call(t)}function Hu(t){return t===10||t===13}function Zg(t){return t===9||t===32}function Ia(t){return t===9||t===32||t===10||t===13}function hy(t){return t===44||t===91||t===93||t===123||t===125}function KHe(t){var e;return 48<=t&&t<=57?t-48:(e=t|32,97<=e&&e<=102?e-97+10:-1)}function VHe(t){return t===120?2:t===117?4:t===85?8:0}function JHe(t){return 48<=t&&t<=57?t-48:-1}function aK(t){return t===48?"\0":t===97?"\x07":t===98?"\b":t===116||t===9?"	":t===110?`
+`:t===118?"\v":t===102?"\f":t===114?"\r":t===101?"\x1B":t===32?" ":t===34?'"':t===47?"/":t===92?"\\":t===78?"\x85":t===95?"\xA0":t===76?"\u2028":t===80?"\u2029":""}function zHe(t){return t<=65535?String.fromCharCode(t):String.fromCharCode((t-65536>>10)+55296,(t-65536&1023)+56320)}var mK=new Array(256),yK=new Array(256);for(Xg=0;Xg<256;Xg++)mK[Xg]=aK(Xg)?1:0,yK[Xg]=aK(Xg);var Xg;function XHe(t,e){this.input=t,this.filename=e.filename||null,this.schema=e.schema||jHe,this.onWarning=e.onWarning||null,this.legacy=e.legacy||!1,this.json=e.json||!1,this.listener=e.listener||null,this.implicitTypes=this.schema.compiledImplicit,this.typeMap=this.schema.compiledTypeMap,this.length=t.length,this.position=0,this.line=0,this.lineStart=0,this.lineIndent=0,this.documents=[]}function EK(t,e){return new AK(e,new HHe(t.filename,t.input,t.position,t.line,t.position-t.lineStart))}function Pr(t,e){throw EK(t,e)}function YD(t,e){t.onWarning&&t.onWarning.call(null,EK(t,e))}var lK={YAML:function(e,r,o){var a,n,u;e.version!==null&&Pr(e,"duplication of %YAML directive"),o.length!==1&&Pr(e,"YAML directive accepts exactly one argument"),a=/^([0-9]+)\.([0-9]+)$/.exec(o[0]),a===null&&Pr(e,"ill-formed argument of the YAML directive"),n=parseInt(a[1],10),u=parseInt(a[2],10),n!==1&&Pr(e,"unacceptable YAML version of the document"),e.version=o[0],e.checkLineBreaks=u<2,u!==1&&u!==2&&YD(e,"unsupported YAML version of the document")},TAG:function(e,r,o){var a,n;o.length!==2&&Pr(e,"TAG directive accepts exactly two arguments"),a=o[0],n=o[1],gK.test(a)||Pr(e,"ill-formed tag handle (first argument) of the TAG directive"),Yp.call(e.tagMap,a)&&Pr(e,'there is a previously declared suffix for "'+a+'" tag handle'),dK.test(n)||Pr(e,"ill-formed tag prefix (second argument) of the TAG directive"),e.tagMap[a]=n}};function qp(t,e,r,o){var a,n,u,A;if(e<r){if(A=t.input.slice(e,r),o)for(a=0,n=A.length;a<n;a+=1)u=A.charCodeAt(a),u===9||32<=u&&u<=1114111||Pr(t,"expected valid JSON character");else qHe.test(A)&&Pr(t,"the stream contains non-printable characters");t.result+=A}}function cK(t,e,r,o){var a,n,u,A;for(yf.isObject(r)||Pr(t,"cannot merge mappings; the provided source object is unacceptable"),a=Object.keys(r),u=0,A=a.length;u<A;u+=1)n=a[u],Yp.call(e,n)||(e[n]=r[n],o[n]=!0)}function gy(t,e,r,o,a,n,u,A){var p,h;if(Array.isArray(a))for(a=Array.prototype.slice.call(a),p=0,h=a.length;p<h;p+=1)Array.isArray(a[p])&&Pr(t,"nested arrays are not supported inside keys"),typeof a=="object"&&oK(a[p])==="[object Object]"&&(a[p]="[object Object]");if(typeof a=="object"&&oK(a)==="[object Object]"&&(a="[object Object]"),a=String(a),e===null&&(e={}),o==="tag:yaml.org,2002:merge")if(Array.isArray(n))for(p=0,h=n.length;p<h;p+=1)cK(t,e,n[p],r);else cK(t,e,n,r);else!t.json&&!Yp.call(r,a)&&Yp.call(e,a)&&(t.line=u||t.line,t.position=A||t.position,Pr(t,"duplicated mapping key")),e[a]=n,delete r[a];return e}function mT(t){var e;e=t.input.charCodeAt(t.position),e===10?t.position++:e===13?(t.position++,t.input.charCodeAt(t.position)===10&&t.position++):Pr(t,"a line break is expected"),t.line+=1,t.lineStart=t.position}function Wi(t,e,r){for(var o=0,a=t.input.charCodeAt(t.position);a!==0;){for(;Zg(a);)a=t.input.charCodeAt(++t.position);if(e&&a===35)do a=t.input.charCodeAt(++t.position);while(a!==10&&a!==13&&a!==0);if(Hu(a))for(mT(t),a=t.input.charCodeAt(t.position),o++,t.lineIndent=0;a===32;)t.lineIndent++,a=t.input.charCodeAt(++t.position);else break}return r!==-1&&o!==0&&t.lineIndent<r&&YD(t,"deficient indentation"),o}function WD(t){var e=t.position,r;return r=t.input.charCodeAt(e),!!((r===45||r===46)&&r===t.input.charCodeAt(e+1)&&r===t.input.charCodeAt(e+2)&&(e+=3,r=t.input.charCodeAt(e),r===0||Ia(r)))}function yT(t,e){e===1?t.result+=" ":e>1&&(t.result+=yf.repeat(`
+`,e-1))}function ZHe(t,e,r){var o,a,n,u,A,p,h,E,I=t.kind,v=t.result,x;if(x=t.input.charCodeAt(t.position),Ia(x)||hy(x)||x===35||x===38||x===42||x===33||x===124||x===62||x===39||x===34||x===37||x===64||x===96||(x===63||x===45)&&(a=t.input.charCodeAt(t.position+1),Ia(a)||r&&hy(a)))return!1;for(t.kind="scalar",t.result="",n=u=t.position,A=!1;x!==0;){if(x===58){if(a=t.input.charCodeAt(t.position+1),Ia(a)||r&&hy(a))break}else if(x===35){if(o=t.input.charCodeAt(t.position-1),Ia(o))break}else{if(t.position===t.lineStart&&WD(t)||r&&hy(x))break;if(Hu(x))if(p=t.line,h=t.lineStart,E=t.lineIndent,Wi(t,!1,-1),t.lineIndent>=e){A=!0,x=t.input.charCodeAt(t.position);continue}else{t.position=u,t.line=p,t.lineStart=h,t.lineIndent=E;break}}A&&(qp(t,n,u,!1),yT(t,t.line-p),n=u=t.position,A=!1),Zg(x)||(u=t.position+1),x=t.input.charCodeAt(++t.position)}return qp(t,n,u,!1),t.result?!0:(t.kind=I,t.result=v,!1)}function $He(t,e){var r,o,a;if(r=t.input.charCodeAt(t.position),r!==39)return!1;for(t.kind="scalar",t.result="",t.position++,o=a=t.position;(r=t.input.charCodeAt(t.position))!==0;)if(r===39)if(qp(t,o,t.position,!0),r=t.input.charCodeAt(++t.position),r===39)o=t.position,t.position++,a=t.position;else return!0;else Hu(r)?(qp(t,o,a,!0),yT(t,Wi(t,!1,e)),o=a=t.position):t.position===t.lineStart&&WD(t)?Pr(t,"unexpected end of the document within a single quoted scalar"):(t.position++,a=t.position);Pr(t,"unexpected end of the stream within a single quoted scalar")}function e6e(t,e){var r,o,a,n,u,A;if(A=t.input.charCodeAt(t.position),A!==34)return!1;for(t.kind="scalar",t.result="",t.position++,r=o=t.position;(A=t.input.charCodeAt(t.position))!==0;){if(A===34)return qp(t,r,t.position,!0),t.position++,!0;if(A===92){if(qp(t,r,t.position,!0),A=t.input.charCodeAt(++t.position),Hu(A))Wi(t,!1,e);else if(A<256&&mK[A])t.result+=yK[A],t.position++;else if((u=VHe(A))>0){for(a=u,n=0;a>0;a--)A=t.input.charCodeAt(++t.position),(u=KHe(A))>=0?n=(n<<4)+u:Pr(t,"expected hexadecimal character");t.result+=zHe(n),t.position++}else Pr(t,"unknown escape sequence");r=o=t.position}else Hu(A)?(qp(t,r,o,!0),yT(t,Wi(t,!1,e)),r=o=t.position):t.position===t.lineStart&&WD(t)?Pr(t,"unexpected end of the document within a double quoted scalar"):(t.position++,o=t.position)}Pr(t,"unexpected end of the stream within a double quoted scalar")}function t6e(t,e){var r=!0,o,a=t.tag,n,u=t.anchor,A,p,h,E,I,v={},x,C,R,L;if(L=t.input.charCodeAt(t.position),L===91)p=93,I=!1,n=[];else if(L===123)p=125,I=!0,n={};else return!1;for(t.anchor!==null&&(t.anchorMap[t.anchor]=n),L=t.input.charCodeAt(++t.position);L!==0;){if(Wi(t,!0,e),L=t.input.charCodeAt(t.position),L===p)return t.position++,t.tag=a,t.anchor=u,t.kind=I?"mapping":"sequence",t.result=n,!0;r||Pr(t,"missed comma between flow collection entries"),C=x=R=null,h=E=!1,L===63&&(A=t.input.charCodeAt(t.position+1),Ia(A)&&(h=E=!0,t.position++,Wi(t,!0,e))),o=t.line,dy(t,e,GD,!1,!0),C=t.tag,x=t.result,Wi(t,!0,e),L=t.input.charCodeAt(t.position),(E||t.line===o)&&L===58&&(h=!0,L=t.input.charCodeAt(++t.position),Wi(t,!0,e),dy(t,e,GD,!1,!0),R=t.result),I?gy(t,n,v,C,x,R):h?n.push(gy(t,null,v,C,x,R)):n.push(x),Wi(t,!0,e),L=t.input.charCodeAt(t.position),L===44?(r=!0,L=t.input.charCodeAt(++t.position)):r=!1}Pr(t,"unexpected end of the stream within a flow collection")}function r6e(t,e){var r,o,a=dT,n=!1,u=!1,A=e,p=0,h=!1,E,I;if(I=t.input.charCodeAt(t.position),I===124)o=!1;else if(I===62)o=!0;else return!1;for(t.kind="scalar",t.result="";I!==0;)if(I=t.input.charCodeAt(++t.position),I===43||I===45)dT===a?a=I===43?sK:GHe:Pr(t,"repeat of a chomping mode identifier");else if((E=JHe(I))>=0)E===0?Pr(t,"bad explicit indentation width of a block scalar; it cannot be less than one"):u?Pr(t,"repeat of an indentation width identifier"):(A=e+E-1,u=!0);else break;if(Zg(I)){do I=t.input.charCodeAt(++t.position);while(Zg(I));if(I===35)do I=t.input.charCodeAt(++t.position);while(!Hu(I)&&I!==0)}for(;I!==0;){for(mT(t),t.lineIndent=0,I=t.input.charCodeAt(t.position);(!u||t.lineIndent<A)&&I===32;)t.lineIndent++,I=t.input.charCodeAt(++t.position);if(!u&&t.lineIndent>A&&(A=t.lineIndent),Hu(I)){p++;continue}if(t.lineIndent<A){a===sK?t.result+=yf.repeat(`
+`,n?1+p:p):a===dT&&n&&(t.result+=`
+`);break}for(o?Zg(I)?(h=!0,t.result+=yf.repeat(`
+`,n?1+p:p)):h?(h=!1,t.result+=yf.repeat(`
+`,p+1)):p===0?n&&(t.result+=" "):t.result+=yf.repeat(`
+`,p):t.result+=yf.repeat(`
+`,n?1+p:p),n=!0,u=!0,p=0,r=t.position;!Hu(I)&&I!==0;)I=t.input.charCodeAt(++t.position);qp(t,r,t.position,!1)}return!0}function uK(t,e){var r,o=t.tag,a=t.anchor,n=[],u,A=!1,p;for(t.anchor!==null&&(t.anchorMap[t.anchor]=n),p=t.input.charCodeAt(t.position);p!==0&&!(p!==45||(u=t.input.charCodeAt(t.position+1),!Ia(u)));){if(A=!0,t.position++,Wi(t,!0,-1)&&t.lineIndent<=e){n.push(null),p=t.input.charCodeAt(t.position);continue}if(r=t.line,dy(t,e,hK,!1,!0),n.push(t.result),Wi(t,!0,-1),p=t.input.charCodeAt(t.position),(t.line===r||t.lineIndent>e)&&p!==0)Pr(t,"bad indentation of a sequence entry");else if(t.lineIndent<e)break}return A?(t.tag=o,t.anchor=a,t.kind="sequence",t.result=n,!0):!1}function n6e(t,e,r){var o,a,n,u,A=t.tag,p=t.anchor,h={},E={},I=null,v=null,x=null,C=!1,R=!1,L;for(t.anchor!==null&&(t.anchorMap[t.anchor]=h),L=t.input.charCodeAt(t.position);L!==0;){if(o=t.input.charCodeAt(t.position+1),n=t.line,u=t.position,(L===63||L===58)&&Ia(o))L===63?(C&&(gy(t,h,E,I,v,null),I=v=x=null),R=!0,C=!0,a=!0):C?(C=!1,a=!0):Pr(t,"incomplete explicit mapping pair; a key node is missed; or followed by a non-tabulated empty line"),t.position+=1,L=o;else if(dy(t,r,pK,!1,!0))if(t.line===n){for(L=t.input.charCodeAt(t.position);Zg(L);)L=t.input.charCodeAt(++t.position);if(L===58)L=t.input.charCodeAt(++t.position),Ia(L)||Pr(t,"a whitespace character is expected after the key-value separator within a block mapping"),C&&(gy(t,h,E,I,v,null),I=v=x=null),R=!0,C=!1,a=!1,I=t.tag,v=t.result;else if(R)Pr(t,"can not read an implicit mapping pair; a colon is missed");else return t.tag=A,t.anchor=p,!0}else if(R)Pr(t,"can not read a block mapping entry; a multiline key may not be an implicit key");else return t.tag=A,t.anchor=p,!0;else break;if((t.line===n||t.lineIndent>e)&&(dy(t,e,qD,!0,a)&&(C?v=t.result:x=t.result),C||(gy(t,h,E,I,v,x,n,u),I=v=x=null),Wi(t,!0,-1),L=t.input.charCodeAt(t.position)),t.lineIndent>e&&L!==0)Pr(t,"bad indentation of a mapping entry");else if(t.lineIndent<e)break}return C&&gy(t,h,E,I,v,null),R&&(t.tag=A,t.anchor=p,t.kind="mapping",t.result=h),R}function i6e(t){var e,r=!1,o=!1,a,n,u;if(u=t.input.charCodeAt(t.position),u!==33)return!1;if(t.tag!==null&&Pr(t,"duplication of a tag property"),u=t.input.charCodeAt(++t.position),u===60?(r=!0,u=t.input.charCodeAt(++t.position)):u===33?(o=!0,a="!!",u=t.input.charCodeAt(++t.position)):a="!",e=t.position,r){do u=t.input.charCodeAt(++t.position);while(u!==0&&u!==62);t.position<t.length?(n=t.input.slice(e,t.position),u=t.input.charCodeAt(++t.position)):Pr(t,"unexpected end of the stream within a verbatim tag")}else{for(;u!==0&&!Ia(u);)u===33&&(o?Pr(t,"tag suffix cannot contain exclamation marks"):(a=t.input.slice(e-1,t.position+1),gK.test(a)||Pr(t,"named tag handle cannot contain such characters"),o=!0,e=t.position+1)),u=t.input.charCodeAt(++t.position);n=t.input.slice(e,t.position),WHe.test(n)&&Pr(t,"tag suffix cannot contain flow indicator characters")}return n&&!dK.test(n)&&Pr(t,"tag name cannot contain such characters: "+n),r?t.tag=n:Yp.call(t.tagMap,a)?t.tag=t.tagMap[a]+n:a==="!"?t.tag="!"+n:a==="!!"?t.tag="tag:yaml.org,2002:"+n:Pr(t,'undeclared tag handle "'+a+'"'),!0}function s6e(t){var e,r;if(r=t.input.charCodeAt(t.position),r!==38)return!1;for(t.anchor!==null&&Pr(t,"duplication of an anchor property"),r=t.input.charCodeAt(++t.position),e=t.position;r!==0&&!Ia(r)&&!hy(r);)r=t.input.charCodeAt(++t.position);return t.position===e&&Pr(t,"name of an anchor node must contain at least one character"),t.anchor=t.input.slice(e,t.position),!0}function o6e(t){var e,r,o;if(o=t.input.charCodeAt(t.position),o!==42)return!1;for(o=t.input.charCodeAt(++t.position),e=t.position;o!==0&&!Ia(o)&&!hy(o);)o=t.input.charCodeAt(++t.position);return t.position===e&&Pr(t,"name of an alias node must contain at least one character"),r=t.input.slice(e,t.position),Yp.call(t.anchorMap,r)||Pr(t,'unidentified alias "'+r+'"'),t.result=t.anchorMap[r],Wi(t,!0,-1),!0}function dy(t,e,r,o,a){var n,u,A,p=1,h=!1,E=!1,I,v,x,C,R;if(t.listener!==null&&t.listener("open",t),t.tag=null,t.anchor=null,t.kind=null,t.result=null,n=u=A=qD===r||hK===r,o&&Wi(t,!0,-1)&&(h=!0,t.lineIndent>e?p=1:t.lineIndent===e?p=0:t.lineIndent<e&&(p=-1)),p===1)for(;i6e(t)||s6e(t);)Wi(t,!0,-1)?(h=!0,A=n,t.lineIndent>e?p=1:t.lineIndent===e?p=0:t.lineIndent<e&&(p=-1)):A=!1;if(A&&(A=h||a),(p===1||qD===r)&&(GD===r||pK===r?C=e:C=e+1,R=t.position-t.lineStart,p===1?A&&(uK(t,R)||n6e(t,R,C))||t6e(t,C)?E=!0:(u&&r6e(t,C)||$He(t,C)||e6e(t,C)?E=!0:o6e(t)?(E=!0,(t.tag!==null||t.anchor!==null)&&Pr(t,"alias node should not have any properties")):ZHe(t,C,GD===r)&&(E=!0,t.tag===null&&(t.tag="?")),t.anchor!==null&&(t.anchorMap[t.anchor]=t.result)):p===0&&(E=A&&uK(t,R))),t.tag!==null&&t.tag!=="!")if(t.tag==="?"){for(t.result!==null&&t.kind!=="scalar"&&Pr(t,'unacceptable node kind for !<?> tag; it should be "scalar", not "'+t.kind+'"'),I=0,v=t.implicitTypes.length;I<v;I+=1)if(x=t.implicitTypes[I],x.resolve(t.result)){t.result=x.construct(t.result),t.tag=x.tag,t.anchor!==null&&(t.anchorMap[t.anchor]=t.result);break}}else Yp.call(t.typeMap[t.kind||"fallback"],t.tag)?(x=t.typeMap[t.kind||"fallback"][t.tag],t.result!==null&&x.kind!==t.kind&&Pr(t,"unacceptable node kind for !<"+t.tag+'> tag; it should be "'+x.kind+'", not "'+t.kind+'"'),x.resolve(t.result)?(t.result=x.construct(t.result),t.anchor!==null&&(t.anchorMap[t.anchor]=t.result)):Pr(t,"cannot resolve a node with !<"+t.tag+"> explicit tag")):Pr(t,"unknown tag !<"+t.tag+">");return t.listener!==null&&t.listener("close",t),t.tag!==null||t.anchor!==null||E}function a6e(t){var e=t.position,r,o,a,n=!1,u;for(t.version=null,t.checkLineBreaks=t.legacy,t.tagMap={},t.anchorMap={};(u=t.input.charCodeAt(t.position))!==0&&(Wi(t,!0,-1),u=t.input.charCodeAt(t.position),!(t.lineIndent>0||u!==37));){for(n=!0,u=t.input.charCodeAt(++t.position),r=t.position;u!==0&&!Ia(u);)u=t.input.charCodeAt(++t.position);for(o=t.input.slice(r,t.position),a=[],o.length<1&&Pr(t,"directive name must not be less than one character in length");u!==0;){for(;Zg(u);)u=t.input.charCodeAt(++t.position);if(u===35){do u=t.input.charCodeAt(++t.position);while(u!==0&&!Hu(u));break}if(Hu(u))break;for(r=t.position;u!==0&&!Ia(u);)u=t.input.charCodeAt(++t.position);a.push(t.input.slice(r,t.position))}u!==0&&mT(t),Yp.call(lK,o)?lK[o](t,o,a):YD(t,'unknown document directive "'+o+'"')}if(Wi(t,!0,-1),t.lineIndent===0&&t.input.charCodeAt(t.position)===45&&t.input.charCodeAt(t.position+1)===45&&t.input.charCodeAt(t.position+2)===45?(t.position+=3,Wi(t,!0,-1)):n&&Pr(t,"directives end mark is expected"),dy(t,t.lineIndent-1,qD,!1,!0),Wi(t,!0,-1),t.checkLineBreaks&&YHe.test(t.input.slice(e,t.position))&&YD(t,"non-ASCII line breaks are interpreted as content"),t.documents.push(t.result),t.position===t.lineStart&&WD(t)){t.input.charCodeAt(t.position)===46&&(t.position+=3,Wi(t,!0,-1));return}if(t.position<t.length-1)Pr(t,"end of the stream or a document separator is expected");else return}function CK(t,e){t=String(t),e=e||{},t.length!==0&&(t.charCodeAt(t.length-1)!==10&&t.charCodeAt(t.length-1)!==13&&(t+=`
+`),t.charCodeAt(0)===65279&&(t=t.slice(1)));var r=new XHe(t,e),o=t.indexOf("\0");for(o!==-1&&(r.position=o,Pr(r,"null byte is not allowed in input")),r.input+="\0";r.input.charCodeAt(r.position)===32;)r.lineIndent+=1,r.position+=1;for(;r.position<r.length-1;)a6e(r);return r.documents}function wK(t,e,r){e!==null&&typeof e=="object"&&typeof r>"u"&&(r=e,e=null);var o=CK(t,r);if(typeof e!="function")return o;for(var a=0,n=o.length;a<n;a+=1)e(o[a])}function IK(t,e){var r=CK(t,e);if(r.length!==0){if(r.length===1)return r[0];throw new AK("expected a single document in the stream, but found more")}}function l6e(t,e,r){return typeof e=="object"&&e!==null&&typeof r>"u"&&(r=e,e=null),wK(t,e,yf.extend({schema:fK},r))}function c6e(t,e){return IK(t,yf.extend({schema:fK},e))}Zw.exports.loadAll=wK;Zw.exports.load=IK;Zw.exports.safeLoadAll=l6e;Zw.exports.safeLoad=c6e});var WK=_((Axt,IT)=>{"use strict";var eI=Vg(),tI=Ay(),u6e=Xw(),A6e=py(),QK=Object.prototype.toString,FK=Object.prototype.hasOwnProperty,f6e=9,$w=10,p6e=13,h6e=32,g6e=33,d6e=34,RK=35,m6e=37,y6e=38,E6e=39,C6e=42,TK=44,w6e=45,NK=58,I6e=61,B6e=62,v6e=63,D6e=64,LK=91,OK=93,S6e=96,MK=123,P6e=124,UK=125,vo={};vo[0]="\\0";vo[7]="\\a";vo[8]="\\b";vo[9]="\\t";vo[10]="\\n";vo[11]="\\v";vo[12]="\\f";vo[13]="\\r";vo[27]="\\e";vo[34]='\\"';vo[92]="\\\\";vo[133]="\\N";vo[160]="\\_";vo[8232]="\\L";vo[8233]="\\P";var b6e=["y","Y","yes","Yes","YES","on","On","ON","n","N","no","No","NO","off","Off","OFF"];function x6e(t,e){var r,o,a,n,u,A,p;if(e===null)return{};for(r={},o=Object.keys(e),a=0,n=o.length;a<n;a+=1)u=o[a],A=String(e[u]),u.slice(0,2)==="!!"&&(u="tag:yaml.org,2002:"+u.slice(2)),p=t.compiledTypeMap.fallback[u],p&&FK.call(p.styleAliases,A)&&(A=p.styleAliases[A]),r[u]=A;return r}function vK(t){var e,r,o;if(e=t.toString(16).toUpperCase(),t<=255)r="x",o=2;else if(t<=65535)r="u",o=4;else if(t<=4294967295)r="U",o=8;else throw new tI("code point within a string may not be greater than 0xFFFFFFFF");return"\\"+r+eI.repeat("0",o-e.length)+e}function k6e(t){this.schema=t.schema||u6e,this.indent=Math.max(1,t.indent||2),this.noArrayIndent=t.noArrayIndent||!1,this.skipInvalid=t.skipInvalid||!1,this.flowLevel=eI.isNothing(t.flowLevel)?-1:t.flowLevel,this.styleMap=x6e(this.schema,t.styles||null),this.sortKeys=t.sortKeys||!1,this.lineWidth=t.lineWidth||80,this.noRefs=t.noRefs||!1,this.noCompatMode=t.noCompatMode||!1,this.condenseFlow=t.condenseFlow||!1,this.implicitTypes=this.schema.compiledImplicit,this.explicitTypes=this.schema.compiledExplicit,this.tag=null,this.result="",this.duplicates=[],this.usedDuplicates=null}function DK(t,e){for(var r=eI.repeat(" ",e),o=0,a=-1,n="",u,A=t.length;o<A;)a=t.indexOf(`
+`,o),a===-1?(u=t.slice(o),o=A):(u=t.slice(o,a+1),o=a+1),u.length&&u!==`
+`&&(n+=r),n+=u;return n}function ET(t,e){return`
+`+eI.repeat(" ",t.indent*e)}function Q6e(t,e){var r,o,a;for(r=0,o=t.implicitTypes.length;r<o;r+=1)if(a=t.implicitTypes[r],a.resolve(e))return!0;return!1}function wT(t){return t===h6e||t===f6e}function my(t){return 32<=t&&t<=126||161<=t&&t<=55295&&t!==8232&&t!==8233||57344<=t&&t<=65533&&t!==65279||65536<=t&&t<=1114111}function F6e(t){return my(t)&&!wT(t)&&t!==65279&&t!==p6e&&t!==$w}function SK(t,e){return my(t)&&t!==65279&&t!==TK&&t!==LK&&t!==OK&&t!==MK&&t!==UK&&t!==NK&&(t!==RK||e&&F6e(e))}function R6e(t){return my(t)&&t!==65279&&!wT(t)&&t!==w6e&&t!==v6e&&t!==NK&&t!==TK&&t!==LK&&t!==OK&&t!==MK&&t!==UK&&t!==RK&&t!==y6e&&t!==C6e&&t!==g6e&&t!==P6e&&t!==I6e&&t!==B6e&&t!==E6e&&t!==d6e&&t!==m6e&&t!==D6e&&t!==S6e}function _K(t){var e=/^\n* /;return e.test(t)}var HK=1,jK=2,GK=3,qK=4,KD=5;function T6e(t,e,r,o,a){var n,u,A,p=!1,h=!1,E=o!==-1,I=-1,v=R6e(t.charCodeAt(0))&&!wT(t.charCodeAt(t.length-1));if(e)for(n=0;n<t.length;n++){if(u=t.charCodeAt(n),!my(u))return KD;A=n>0?t.charCodeAt(n-1):null,v=v&&SK(u,A)}else{for(n=0;n<t.length;n++){if(u=t.charCodeAt(n),u===$w)p=!0,E&&(h=h||n-I-1>o&&t[I+1]!==" ",I=n);else if(!my(u))return KD;A=n>0?t.charCodeAt(n-1):null,v=v&&SK(u,A)}h=h||E&&n-I-1>o&&t[I+1]!==" "}return!p&&!h?v&&!a(t)?HK:jK:r>9&&_K(t)?KD:h?qK:GK}function N6e(t,e,r,o){t.dump=function(){if(e.length===0)return"''";if(!t.noCompatMode&&b6e.indexOf(e)!==-1)return"'"+e+"'";var a=t.indent*Math.max(1,r),n=t.lineWidth===-1?-1:Math.max(Math.min(t.lineWidth,40),t.lineWidth-a),u=o||t.flowLevel>-1&&r>=t.flowLevel;function A(p){return Q6e(t,p)}switch(T6e(e,u,t.indent,n,A)){case HK:return e;case jK:return"'"+e.replace(/'/g,"''")+"'";case GK:return"|"+PK(e,t.indent)+bK(DK(e,a));case qK:return">"+PK(e,t.indent)+bK(DK(L6e(e,n),a));case KD:return'"'+O6e(e,n)+'"';default:throw new tI("impossible error: invalid scalar style")}}()}function PK(t,e){var r=_K(t)?String(e):"",o=t[t.length-1]===`
+`,a=o&&(t[t.length-2]===`
+`||t===`
+`),n=a?"+":o?"":"-";return r+n+`
+`}function bK(t){return t[t.length-1]===`
+`?t.slice(0,-1):t}function L6e(t,e){for(var r=/(\n+)([^\n]*)/g,o=function(){var h=t.indexOf(`
+`);return h=h!==-1?h:t.length,r.lastIndex=h,xK(t.slice(0,h),e)}(),a=t[0]===`
+`||t[0]===" ",n,u;u=r.exec(t);){var A=u[1],p=u[2];n=p[0]===" ",o+=A+(!a&&!n&&p!==""?`
+`:"")+xK(p,e),a=n}return o}function xK(t,e){if(t===""||t[0]===" ")return t;for(var r=/ [^ ]/g,o,a=0,n,u=0,A=0,p="";o=r.exec(t);)A=o.index,A-a>e&&(n=u>a?u:A,p+=`
+`+t.slice(a,n),a=n+1),u=A;return p+=`
+`,t.length-a>e&&u>a?p+=t.slice(a,u)+`
+`+t.slice(u+1):p+=t.slice(a),p.slice(1)}function O6e(t){for(var e="",r,o,a,n=0;n<t.length;n++){if(r=t.charCodeAt(n),r>=55296&&r<=56319&&(o=t.charCodeAt(n+1),o>=56320&&o<=57343)){e+=vK((r-55296)*1024+o-56320+65536),n++;continue}a=vo[r],e+=!a&&my(r)?t[n]:a||vK(r)}return e}function M6e(t,e,r){var o="",a=t.tag,n,u;for(n=0,u=r.length;n<u;n+=1)$g(t,e,r[n],!1,!1)&&(n!==0&&(o+=","+(t.condenseFlow?"":" ")),o+=t.dump);t.tag=a,t.dump="["+o+"]"}function U6e(t,e,r,o){var a="",n=t.tag,u,A;for(u=0,A=r.length;u<A;u+=1)$g(t,e+1,r[u],!0,!0)&&((!o||u!==0)&&(a+=ET(t,e)),t.dump&&$w===t.dump.charCodeAt(0)?a+="-":a+="- ",a+=t.dump);t.tag=n,t.dump=a||"[]"}function _6e(t,e,r){var o="",a=t.tag,n=Object.keys(r),u,A,p,h,E;for(u=0,A=n.length;u<A;u+=1)E="",u!==0&&(E+=", "),t.condenseFlow&&(E+='"'),p=n[u],h=r[p],$g(t,e,p,!1,!1)&&(t.dump.length>1024&&(E+="? "),E+=t.dump+(t.condenseFlow?'"':"")+":"+(t.condenseFlow?"":" "),$g(t,e,h,!1,!1)&&(E+=t.dump,o+=E));t.tag=a,t.dump="{"+o+"}"}function H6e(t,e,r,o){var a="",n=t.tag,u=Object.keys(r),A,p,h,E,I,v;if(t.sortKeys===!0)u.sort();else if(typeof t.sortKeys=="function")u.sort(t.sortKeys);else if(t.sortKeys)throw new tI("sortKeys must be a boolean or a function");for(A=0,p=u.length;A<p;A+=1)v="",(!o||A!==0)&&(v+=ET(t,e)),h=u[A],E=r[h],$g(t,e+1,h,!0,!0,!0)&&(I=t.tag!==null&&t.tag!=="?"||t.dump&&t.dump.length>1024,I&&(t.dump&&$w===t.dump.charCodeAt(0)?v+="?":v+="? "),v+=t.dump,I&&(v+=ET(t,e)),$g(t,e+1,E,!0,I)&&(t.dump&&$w===t.dump.charCodeAt(0)?v+=":":v+=": ",v+=t.dump,a+=v));t.tag=n,t.dump=a||"{}"}function kK(t,e,r){var o,a,n,u,A,p;for(a=r?t.explicitTypes:t.implicitTypes,n=0,u=a.length;n<u;n+=1)if(A=a[n],(A.instanceOf||A.predicate)&&(!A.instanceOf||typeof e=="object"&&e instanceof A.instanceOf)&&(!A.predicate||A.predicate(e))){if(t.tag=r?A.tag:"?",A.represent){if(p=t.styleMap[A.tag]||A.defaultStyle,QK.call(A.represent)==="[object Function]")o=A.represent(e,p);else if(FK.call(A.represent,p))o=A.represent[p](e,p);else throw new tI("!<"+A.tag+'> tag resolver accepts not "'+p+'" style');t.dump=o}return!0}return!1}function $g(t,e,r,o,a,n){t.tag=null,t.dump=r,kK(t,r,!1)||kK(t,r,!0);var u=QK.call(t.dump);o&&(o=t.flowLevel<0||t.flowLevel>e);var A=u==="[object Object]"||u==="[object Array]",p,h;if(A&&(p=t.duplicates.indexOf(r),h=p!==-1),(t.tag!==null&&t.tag!=="?"||h||t.indent!==2&&e>0)&&(a=!1),h&&t.usedDuplicates[p])t.dump="*ref_"+p;else{if(A&&h&&!t.usedDuplicates[p]&&(t.usedDuplicates[p]=!0),u==="[object Object]")o&&Object.keys(t.dump).length!==0?(H6e(t,e,t.dump,a),h&&(t.dump="&ref_"+p+t.dump)):(_6e(t,e,t.dump),h&&(t.dump="&ref_"+p+" "+t.dump));else if(u==="[object Array]"){var E=t.noArrayIndent&&e>0?e-1:e;o&&t.dump.length!==0?(U6e(t,E,t.dump,a),h&&(t.dump="&ref_"+p+t.dump)):(M6e(t,E,t.dump),h&&(t.dump="&ref_"+p+" "+t.dump))}else if(u==="[object String]")t.tag!=="?"&&N6e(t,t.dump,e,n);else{if(t.skipInvalid)return!1;throw new tI("unacceptable kind of an object to dump "+u)}t.tag!==null&&t.tag!=="?"&&(t.dump="!<"+t.tag+"> "+t.dump)}return!0}function j6e(t,e){var r=[],o=[],a,n;for(CT(t,r,o),a=0,n=o.length;a<n;a+=1)e.duplicates.push(r[o[a]]);e.usedDuplicates=new Array(n)}function CT(t,e,r){var o,a,n;if(t!==null&&typeof t=="object")if(a=e.indexOf(t),a!==-1)r.indexOf(a)===-1&&r.push(a);else if(e.push(t),Array.isArray(t))for(a=0,n=t.length;a<n;a+=1)CT(t[a],e,r);else for(o=Object.keys(t),a=0,n=o.length;a<n;a+=1)CT(t[o[a]],e,r)}function YK(t,e){e=e||{};var r=new k6e(e);return r.noRefs||j6e(t,r),$g(r,0,t,!0,!0)?r.dump+`
+`:""}function G6e(t,e){return YK(t,eI.extend({schema:A6e},e))}IT.exports.dump=YK;IT.exports.safeDump=G6e});var VK=_((fxt,ki)=>{"use strict";var VD=BK(),KK=WK();function JD(t){return function(){throw new Error("Function "+t+" is deprecated and cannot be used.")}}ki.exports.Type=os();ki.exports.Schema=Jg();ki.exports.FAILSAFE_SCHEMA=HD();ki.exports.JSON_SCHEMA=pT();ki.exports.CORE_SCHEMA=hT();ki.exports.DEFAULT_SAFE_SCHEMA=py();ki.exports.DEFAULT_FULL_SCHEMA=Xw();ki.exports.load=VD.load;ki.exports.loadAll=VD.loadAll;ki.exports.safeLoad=VD.safeLoad;ki.exports.safeLoadAll=VD.safeLoadAll;ki.exports.dump=KK.dump;ki.exports.safeDump=KK.safeDump;ki.exports.YAMLException=Ay();ki.exports.MINIMAL_SCHEMA=HD();ki.exports.SAFE_SCHEMA=py();ki.exports.DEFAULT_SCHEMA=Xw();ki.exports.scan=JD("scan");ki.exports.parse=JD("parse");ki.exports.compose=JD("compose");ki.exports.addConstructor=JD("addConstructor")});var zK=_((pxt,JK)=>{"use strict";var q6e=VK();JK.exports=q6e});var ZK=_((hxt,XK)=>{"use strict";function Y6e(t,e){function r(){this.constructor=t}r.prototype=e.prototype,t.prototype=new r}function ed(t,e,r,o){this.message=t,this.expected=e,this.found=r,this.location=o,this.name="SyntaxError",typeof Error.captureStackTrace=="function"&&Error.captureStackTrace(this,ed)}Y6e(ed,Error);ed.buildMessage=function(t,e){var r={literal:function(h){return'"'+a(h.text)+'"'},class:function(h){var E="",I;for(I=0;I<h.parts.length;I++)E+=h.parts[I]instanceof Array?n(h.parts[I][0])+"-"+n(h.parts[I][1]):n(h.parts[I]);return"["+(h.inverted?"^":"")+E+"]"},any:function(h){return"any character"},end:function(h){return"end of input"},other:function(h){return h.description}};function o(h){return h.charCodeAt(0).toString(16).toUpperCase()}function a(h){return h.replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,function(E){return"\\x0"+o(E)}).replace(/[\x10-\x1F\x7F-\x9F]/g,function(E){return"\\x"+o(E)})}function n(h){return h.replace(/\\/g,"\\\\").replace(/\]/g,"\\]").replace(/\^/g,"\\^").replace(/-/g,"\\-").replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,function(E){return"\\x0"+o(E)}).replace(/[\x10-\x1F\x7F-\x9F]/g,function(E){return"\\x"+o(E)})}function u(h){return r[h.type](h)}function A(h){var E=new Array(h.length),I,v;for(I=0;I<h.length;I++)E[I]=u(h[I]);if(E.sort(),E.length>0){for(I=1,v=1;I<E.length;I++)E[I-1]!==E[I]&&(E[v]=E[I],v++);E.length=v}switch(E.length){case 1:return E[0];case 2:return E[0]+" or "+E[1];default:return E.slice(0,-1).join(", ")+", or "+E[E.length-1]}}function p(h){return h?'"'+a(h)+'"':"end of input"}return"Expected "+A(t)+" but "+p(e)+" found."};function W6e(t,e){e=e!==void 0?e:{};var r={},o={Start:pu},a=pu,n=function($){return[].concat(...$)},u="-",A=Qn("-",!1),p=function($){return $},h=function($){return Object.assign({},...$)},E="#",I=Qn("#",!1),v=hc(),x=function(){return{}},C=":",R=Qn(":",!1),L=function($,ye){return{[$]:ye}},U=",",J=Qn(",",!1),te=function($,ye){return ye},ae=function($,ye,Le){return Object.assign({},...[$].concat(ye).map(pt=>({[pt]:Le})))},fe=function($){return $},ce=function($){return $},me=sa("correct indentation"),he=" ",Be=Qn(" ",!1),we=function($){return $.length===nr*It},g=function($){return $.length===(nr+1)*It},Ee=function(){return nr++,!0},Se=function(){return nr--,!0},le=function(){return SA()},ne=sa("pseudostring"),ee=/^[^\r\n\t ?:,\][{}#&*!|>'"%@`\-]/,Ie=hi(["\r",`
+`,"	"," ","?",":",",","]","[","{","}","#","&","*","!","|",">","'",'"',"%","@","`","-"],!0,!1),Fe=/^[^\r\n\t ,\][{}:#"']/,At=hi(["\r",`
+`,"	"," ",",","]","[","{","}",":","#",'"',"'"],!0,!1),H=function(){return SA().replace(/^ *| *$/g,"")},at="--",Re=Qn("--",!1),ke=/^[a-zA-Z\/0-9]/,xe=hi([["a","z"],["A","Z"],"/",["0","9"]],!1,!1),He=/^[^\r\n\t :,]/,Te=hi(["\r",`
+`,"	"," ",":",","],!0,!1),Je="null",je=Qn("null",!1),b=function(){return null},w="true",P=Qn("true",!1),y=function(){return!0},F="false",z=Qn("false",!1),X=function(){return!1},Z=sa("string"),ie='"',Pe=Qn('"',!1),Ne=function(){return""},ot=function($){return $},dt=function($){return $.join("")},Gt=/^[^"\\\0-\x1F\x7F]/,$t=hi(['"',"\\",["\0",""],"\x7F"],!0,!1),bt='\\"',an=Qn('\\"',!1),Qr=function(){return'"'},mr="\\\\",br=Qn("\\\\",!1),Wr=function(){return"\\"},Kn="\\/",Ns=Qn("\\/",!1),Ti=function(){return"/"},ps="\\b",io=Qn("\\b",!1),Pi=function(){return"\b"},Ls="\\f",so=Qn("\\f",!1),cc=function(){return"\f"},cu="\\n",lp=Qn("\\n",!1),cp=function(){return`
+`},Os="\\r",Dn=Qn("\\r",!1),oo=function(){return"\r"},Ms="\\t",ml=Qn("\\t",!1),yl=function(){return"	"},ao="\\u",Vn=Qn("\\u",!1),On=function($,ye,Le,pt){return String.fromCharCode(parseInt(`0x${$}${ye}${Le}${pt}`))},Ni=/^[0-9a-fA-F]/,Mn=hi([["0","9"],["a","f"],["A","F"]],!1,!1),_i=sa("blank space"),tr=/^[ \t]/,Oe=hi([" ","	"],!1,!1),ii=sa("white space"),Ma=/^[ \t\n\r]/,hr=hi([" ","	",`
+`,"\r"],!1,!1),uc=`\r
+`,uu=Qn(`\r
+`,!1),Ac=`
+`,El=Qn(`
+`,!1),DA="\r",Au=Qn("\r",!1),Ce=0,Rt=0,fc=[{line:1,column:1}],Hi=0,fu=[],Yt=0,Cl;if("startRule"in e){if(!(e.startRule in o))throw new Error(`Can't start parsing from rule "`+e.startRule+'".');a=o[e.startRule]}function SA(){return t.substring(Rt,Ce)}function up(){return _o(Rt,Ce)}function pc($,ye){throw ye=ye!==void 0?ye:_o(Rt,Ce),gc([sa($)],t.substring(Rt,Ce),ye)}function PA($,ye){throw ye=ye!==void 0?ye:_o(Rt,Ce),lo($,ye)}function Qn($,ye){return{type:"literal",text:$,ignoreCase:ye}}function hi($,ye,Le){return{type:"class",parts:$,inverted:ye,ignoreCase:Le}}function hc(){return{type:"any"}}function bA(){return{type:"end"}}function sa($){return{type:"other",description:$}}function Li($){var ye=fc[$],Le;if(ye)return ye;for(Le=$-1;!fc[Le];)Le--;for(ye=fc[Le],ye={line:ye.line,column:ye.column};Le<$;)t.charCodeAt(Le)===10?(ye.line++,ye.column=1):ye.column++,Le++;return fc[$]=ye,ye}function _o($,ye){var Le=Li($),pt=Li(ye);return{start:{offset:$,line:Le.line,column:Le.column},end:{offset:ye,line:pt.line,column:pt.column}}}function Ze($){Ce<Hi||(Ce>Hi&&(Hi=Ce,fu=[]),fu.push($))}function lo($,ye){return new ed($,null,null,ye)}function gc($,ye,Le){return new ed(ed.buildMessage($,ye),$,ye,Le)}function pu(){var $;return $=xA(),$}function ji(){var $,ye,Le;for($=Ce,ye=[],Le=hu();Le!==r;)ye.push(Le),Le=hu();return ye!==r&&(Rt=$,ye=n(ye)),$=ye,$}function hu(){var $,ye,Le,pt,ht;return $=Ce,ye=hs(),ye!==r?(t.charCodeAt(Ce)===45?(Le=u,Ce++):(Le=r,Yt===0&&Ze(A)),Le!==r?(pt=Sn(),pt!==r?(ht=dc(),ht!==r?(Rt=$,ye=p(ht),$=ye):(Ce=$,$=r)):(Ce=$,$=r)):(Ce=$,$=r)):(Ce=$,$=r),$}function xA(){var $,ye,Le;for($=Ce,ye=[],Le=Ua();Le!==r;)ye.push(Le),Le=Ua();return ye!==r&&(Rt=$,ye=h(ye)),$=ye,$}function Ua(){var $,ye,Le,pt,ht,Tt,er,$r,Gi;if($=Ce,ye=Sn(),ye===r&&(ye=null),ye!==r){if(Le=Ce,t.charCodeAt(Ce)===35?(pt=E,Ce++):(pt=r,Yt===0&&Ze(I)),pt!==r){if(ht=[],Tt=Ce,er=Ce,Yt++,$r=tt(),Yt--,$r===r?er=void 0:(Ce=er,er=r),er!==r?(t.length>Ce?($r=t.charAt(Ce),Ce++):($r=r,Yt===0&&Ze(v)),$r!==r?(er=[er,$r],Tt=er):(Ce=Tt,Tt=r)):(Ce=Tt,Tt=r),Tt!==r)for(;Tt!==r;)ht.push(Tt),Tt=Ce,er=Ce,Yt++,$r=tt(),Yt--,$r===r?er=void 0:(Ce=er,er=r),er!==r?(t.length>Ce?($r=t.charAt(Ce),Ce++):($r=r,Yt===0&&Ze(v)),$r!==r?(er=[er,$r],Tt=er):(Ce=Tt,Tt=r)):(Ce=Tt,Tt=r);else ht=r;ht!==r?(pt=[pt,ht],Le=pt):(Ce=Le,Le=r)}else Ce=Le,Le=r;if(Le===r&&(Le=null),Le!==r){if(pt=[],ht=We(),ht!==r)for(;ht!==r;)pt.push(ht),ht=We();else pt=r;pt!==r?(Rt=$,ye=x(),$=ye):(Ce=$,$=r)}else Ce=$,$=r}else Ce=$,$=r;if($===r&&($=Ce,ye=hs(),ye!==r?(Le=oa(),Le!==r?(pt=Sn(),pt===r&&(pt=null),pt!==r?(t.charCodeAt(Ce)===58?(ht=C,Ce++):(ht=r,Yt===0&&Ze(R)),ht!==r?(Tt=Sn(),Tt===r&&(Tt=null),Tt!==r?(er=dc(),er!==r?(Rt=$,ye=L(Le,er),$=ye):(Ce=$,$=r)):(Ce=$,$=r)):(Ce=$,$=r)):(Ce=$,$=r)):(Ce=$,$=r)):(Ce=$,$=r),$===r&&($=Ce,ye=hs(),ye!==r?(Le=co(),Le!==r?(pt=Sn(),pt===r&&(pt=null),pt!==r?(t.charCodeAt(Ce)===58?(ht=C,Ce++):(ht=r,Yt===0&&Ze(R)),ht!==r?(Tt=Sn(),Tt===r&&(Tt=null),Tt!==r?(er=dc(),er!==r?(Rt=$,ye=L(Le,er),$=ye):(Ce=$,$=r)):(Ce=$,$=r)):(Ce=$,$=r)):(Ce=$,$=r)):(Ce=$,$=r)):(Ce=$,$=r),$===r))){if($=Ce,ye=hs(),ye!==r)if(Le=co(),Le!==r)if(pt=Sn(),pt!==r)if(ht=aa(),ht!==r){if(Tt=[],er=We(),er!==r)for(;er!==r;)Tt.push(er),er=We();else Tt=r;Tt!==r?(Rt=$,ye=L(Le,ht),$=ye):(Ce=$,$=r)}else Ce=$,$=r;else Ce=$,$=r;else Ce=$,$=r;else Ce=$,$=r;if($===r)if($=Ce,ye=hs(),ye!==r)if(Le=co(),Le!==r){if(pt=[],ht=Ce,Tt=Sn(),Tt===r&&(Tt=null),Tt!==r?(t.charCodeAt(Ce)===44?(er=U,Ce++):(er=r,Yt===0&&Ze(J)),er!==r?($r=Sn(),$r===r&&($r=null),$r!==r?(Gi=co(),Gi!==r?(Rt=ht,Tt=te(Le,Gi),ht=Tt):(Ce=ht,ht=r)):(Ce=ht,ht=r)):(Ce=ht,ht=r)):(Ce=ht,ht=r),ht!==r)for(;ht!==r;)pt.push(ht),ht=Ce,Tt=Sn(),Tt===r&&(Tt=null),Tt!==r?(t.charCodeAt(Ce)===44?(er=U,Ce++):(er=r,Yt===0&&Ze(J)),er!==r?($r=Sn(),$r===r&&($r=null),$r!==r?(Gi=co(),Gi!==r?(Rt=ht,Tt=te(Le,Gi),ht=Tt):(Ce=ht,ht=r)):(Ce=ht,ht=r)):(Ce=ht,ht=r)):(Ce=ht,ht=r);else pt=r;pt!==r?(ht=Sn(),ht===r&&(ht=null),ht!==r?(t.charCodeAt(Ce)===58?(Tt=C,Ce++):(Tt=r,Yt===0&&Ze(R)),Tt!==r?(er=Sn(),er===r&&(er=null),er!==r?($r=dc(),$r!==r?(Rt=$,ye=ae(Le,pt,$r),$=ye):(Ce=$,$=r)):(Ce=$,$=r)):(Ce=$,$=r)):(Ce=$,$=r)):(Ce=$,$=r)}else Ce=$,$=r;else Ce=$,$=r}return $}function dc(){var $,ye,Le,pt,ht,Tt,er;if($=Ce,ye=Ce,Yt++,Le=Ce,pt=tt(),pt!==r?(ht=_t(),ht!==r?(t.charCodeAt(Ce)===45?(Tt=u,Ce++):(Tt=r,Yt===0&&Ze(A)),Tt!==r?(er=Sn(),er!==r?(pt=[pt,ht,Tt,er],Le=pt):(Ce=Le,Le=r)):(Ce=Le,Le=r)):(Ce=Le,Le=r)):(Ce=Le,Le=r),Yt--,Le!==r?(Ce=ye,ye=void 0):ye=r,ye!==r?(Le=We(),Le!==r?(pt=Fn(),pt!==r?(ht=ji(),ht!==r?(Tt=Ci(),Tt!==r?(Rt=$,ye=fe(ht),$=ye):(Ce=$,$=r)):(Ce=$,$=r)):(Ce=$,$=r)):(Ce=$,$=r)):(Ce=$,$=r),$===r&&($=Ce,ye=tt(),ye!==r?(Le=Fn(),Le!==r?(pt=xA(),pt!==r?(ht=Ci(),ht!==r?(Rt=$,ye=fe(pt),$=ye):(Ce=$,$=r)):(Ce=$,$=r)):(Ce=$,$=r)):(Ce=$,$=r),$===r))if($=Ce,ye=Us(),ye!==r){if(Le=[],pt=We(),pt!==r)for(;pt!==r;)Le.push(pt),pt=We();else Le=r;Le!==r?(Rt=$,ye=ce(ye),$=ye):(Ce=$,$=r)}else Ce=$,$=r;return $}function hs(){var $,ye,Le;for(Yt++,$=Ce,ye=[],t.charCodeAt(Ce)===32?(Le=he,Ce++):(Le=r,Yt===0&&Ze(Be));Le!==r;)ye.push(Le),t.charCodeAt(Ce)===32?(Le=he,Ce++):(Le=r,Yt===0&&Ze(Be));return ye!==r?(Rt=Ce,Le=we(ye),Le?Le=void 0:Le=r,Le!==r?(ye=[ye,Le],$=ye):(Ce=$,$=r)):(Ce=$,$=r),Yt--,$===r&&(ye=r,Yt===0&&Ze(me)),$}function _t(){var $,ye,Le;for($=Ce,ye=[],t.charCodeAt(Ce)===32?(Le=he,Ce++):(Le=r,Yt===0&&Ze(Be));Le!==r;)ye.push(Le),t.charCodeAt(Ce)===32?(Le=he,Ce++):(Le=r,Yt===0&&Ze(Be));return ye!==r?(Rt=Ce,Le=g(ye),Le?Le=void 0:Le=r,Le!==r?(ye=[ye,Le],$=ye):(Ce=$,$=r)):(Ce=$,$=r),$}function Fn(){var $;return Rt=Ce,$=Ee(),$?$=void 0:$=r,$}function Ci(){var $;return Rt=Ce,$=Se(),$?$=void 0:$=r,$}function oa(){var $;return $=ds(),$===r&&($=la()),$}function co(){var $,ye,Le;if($=ds(),$===r){if($=Ce,ye=[],Le=Ho(),Le!==r)for(;Le!==r;)ye.push(Le),Le=Ho();else ye=r;ye!==r&&(Rt=$,ye=le()),$=ye}return $}function Us(){var $;return $=wi(),$===r&&($=gs(),$===r&&($=ds(),$===r&&($=la()))),$}function aa(){var $;return $=wi(),$===r&&($=ds(),$===r&&($=Ho())),$}function la(){var $,ye,Le,pt,ht,Tt;if(Yt++,$=Ce,ee.test(t.charAt(Ce))?(ye=t.charAt(Ce),Ce++):(ye=r,Yt===0&&Ze(Ie)),ye!==r){for(Le=[],pt=Ce,ht=Sn(),ht===r&&(ht=null),ht!==r?(Fe.test(t.charAt(Ce))?(Tt=t.charAt(Ce),Ce++):(Tt=r,Yt===0&&Ze(At)),Tt!==r?(ht=[ht,Tt],pt=ht):(Ce=pt,pt=r)):(Ce=pt,pt=r);pt!==r;)Le.push(pt),pt=Ce,ht=Sn(),ht===r&&(ht=null),ht!==r?(Fe.test(t.charAt(Ce))?(Tt=t.charAt(Ce),Ce++):(Tt=r,Yt===0&&Ze(At)),Tt!==r?(ht=[ht,Tt],pt=ht):(Ce=pt,pt=r)):(Ce=pt,pt=r);Le!==r?(Rt=$,ye=H(),$=ye):(Ce=$,$=r)}else Ce=$,$=r;return Yt--,$===r&&(ye=r,Yt===0&&Ze(ne)),$}function Ho(){var $,ye,Le,pt,ht;if($=Ce,t.substr(Ce,2)===at?(ye=at,Ce+=2):(ye=r,Yt===0&&Ze(Re)),ye===r&&(ye=null),ye!==r)if(ke.test(t.charAt(Ce))?(Le=t.charAt(Ce),Ce++):(Le=r,Yt===0&&Ze(xe)),Le!==r){for(pt=[],He.test(t.charAt(Ce))?(ht=t.charAt(Ce),Ce++):(ht=r,Yt===0&&Ze(Te));ht!==r;)pt.push(ht),He.test(t.charAt(Ce))?(ht=t.charAt(Ce),Ce++):(ht=r,Yt===0&&Ze(Te));pt!==r?(Rt=$,ye=H(),$=ye):(Ce=$,$=r)}else Ce=$,$=r;else Ce=$,$=r;return $}function wi(){var $,ye;return $=Ce,t.substr(Ce,4)===Je?(ye=Je,Ce+=4):(ye=r,Yt===0&&Ze(je)),ye!==r&&(Rt=$,ye=b()),$=ye,$}function gs(){var $,ye;return $=Ce,t.substr(Ce,4)===w?(ye=w,Ce+=4):(ye=r,Yt===0&&Ze(P)),ye!==r&&(Rt=$,ye=y()),$=ye,$===r&&($=Ce,t.substr(Ce,5)===F?(ye=F,Ce+=5):(ye=r,Yt===0&&Ze(z)),ye!==r&&(Rt=$,ye=X()),$=ye),$}function ds(){var $,ye,Le,pt;return Yt++,$=Ce,t.charCodeAt(Ce)===34?(ye=ie,Ce++):(ye=r,Yt===0&&Ze(Pe)),ye!==r?(t.charCodeAt(Ce)===34?(Le=ie,Ce++):(Le=r,Yt===0&&Ze(Pe)),Le!==r?(Rt=$,ye=Ne(),$=ye):(Ce=$,$=r)):(Ce=$,$=r),$===r&&($=Ce,t.charCodeAt(Ce)===34?(ye=ie,Ce++):(ye=r,Yt===0&&Ze(Pe)),ye!==r?(Le=ms(),Le!==r?(t.charCodeAt(Ce)===34?(pt=ie,Ce++):(pt=r,Yt===0&&Ze(Pe)),pt!==r?(Rt=$,ye=ot(Le),$=ye):(Ce=$,$=r)):(Ce=$,$=r)):(Ce=$,$=r)),Yt--,$===r&&(ye=r,Yt===0&&Ze(Z)),$}function ms(){var $,ye,Le;if($=Ce,ye=[],Le=_s(),Le!==r)for(;Le!==r;)ye.push(Le),Le=_s();else ye=r;return ye!==r&&(Rt=$,ye=dt(ye)),$=ye,$}function _s(){var $,ye,Le,pt,ht,Tt;return Gt.test(t.charAt(Ce))?($=t.charAt(Ce),Ce++):($=r,Yt===0&&Ze($t)),$===r&&($=Ce,t.substr(Ce,2)===bt?(ye=bt,Ce+=2):(ye=r,Yt===0&&Ze(an)),ye!==r&&(Rt=$,ye=Qr()),$=ye,$===r&&($=Ce,t.substr(Ce,2)===mr?(ye=mr,Ce+=2):(ye=r,Yt===0&&Ze(br)),ye!==r&&(Rt=$,ye=Wr()),$=ye,$===r&&($=Ce,t.substr(Ce,2)===Kn?(ye=Kn,Ce+=2):(ye=r,Yt===0&&Ze(Ns)),ye!==r&&(Rt=$,ye=Ti()),$=ye,$===r&&($=Ce,t.substr(Ce,2)===ps?(ye=ps,Ce+=2):(ye=r,Yt===0&&Ze(io)),ye!==r&&(Rt=$,ye=Pi()),$=ye,$===r&&($=Ce,t.substr(Ce,2)===Ls?(ye=Ls,Ce+=2):(ye=r,Yt===0&&Ze(so)),ye!==r&&(Rt=$,ye=cc()),$=ye,$===r&&($=Ce,t.substr(Ce,2)===cu?(ye=cu,Ce+=2):(ye=r,Yt===0&&Ze(lp)),ye!==r&&(Rt=$,ye=cp()),$=ye,$===r&&($=Ce,t.substr(Ce,2)===Os?(ye=Os,Ce+=2):(ye=r,Yt===0&&Ze(Dn)),ye!==r&&(Rt=$,ye=oo()),$=ye,$===r&&($=Ce,t.substr(Ce,2)===Ms?(ye=Ms,Ce+=2):(ye=r,Yt===0&&Ze(ml)),ye!==r&&(Rt=$,ye=yl()),$=ye,$===r&&($=Ce,t.substr(Ce,2)===ao?(ye=ao,Ce+=2):(ye=r,Yt===0&&Ze(Vn)),ye!==r?(Le=Un(),Le!==r?(pt=Un(),pt!==r?(ht=Un(),ht!==r?(Tt=Un(),Tt!==r?(Rt=$,ye=On(Le,pt,ht,Tt),$=ye):(Ce=$,$=r)):(Ce=$,$=r)):(Ce=$,$=r)):(Ce=$,$=r)):(Ce=$,$=r)))))))))),$}function Un(){var $;return Ni.test(t.charAt(Ce))?($=t.charAt(Ce),Ce++):($=r,Yt===0&&Ze(Mn)),$}function Sn(){var $,ye;if(Yt++,$=[],tr.test(t.charAt(Ce))?(ye=t.charAt(Ce),Ce++):(ye=r,Yt===0&&Ze(Oe)),ye!==r)for(;ye!==r;)$.push(ye),tr.test(t.charAt(Ce))?(ye=t.charAt(Ce),Ce++):(ye=r,Yt===0&&Ze(Oe));else $=r;return Yt--,$===r&&(ye=r,Yt===0&&Ze(_i)),$}function ys(){var $,ye;if(Yt++,$=[],Ma.test(t.charAt(Ce))?(ye=t.charAt(Ce),Ce++):(ye=r,Yt===0&&Ze(hr)),ye!==r)for(;ye!==r;)$.push(ye),Ma.test(t.charAt(Ce))?(ye=t.charAt(Ce),Ce++):(ye=r,Yt===0&&Ze(hr));else $=r;return Yt--,$===r&&(ye=r,Yt===0&&Ze(ii)),$}function We(){var $,ye,Le,pt,ht,Tt;if($=Ce,ye=tt(),ye!==r){for(Le=[],pt=Ce,ht=Sn(),ht===r&&(ht=null),ht!==r?(Tt=tt(),Tt!==r?(ht=[ht,Tt],pt=ht):(Ce=pt,pt=r)):(Ce=pt,pt=r);pt!==r;)Le.push(pt),pt=Ce,ht=Sn(),ht===r&&(ht=null),ht!==r?(Tt=tt(),Tt!==r?(ht=[ht,Tt],pt=ht):(Ce=pt,pt=r)):(Ce=pt,pt=r);Le!==r?(ye=[ye,Le],$=ye):(Ce=$,$=r)}else Ce=$,$=r;return $}function tt(){var $;return t.substr(Ce,2)===uc?($=uc,Ce+=2):($=r,Yt===0&&Ze(uu)),$===r&&(t.charCodeAt(Ce)===10?($=Ac,Ce++):($=r,Yt===0&&Ze(El)),$===r&&(t.charCodeAt(Ce)===13?($=DA,Ce++):($=r,Yt===0&&Ze(Au)))),$}let It=2,nr=0;if(Cl=a(),Cl!==r&&Ce===t.length)return Cl;throw Cl!==r&&Ce<t.length&&Ze(bA()),gc(fu,Hi<t.length?t.charAt(Hi):null,Hi<t.length?_o(Hi,Hi+1):_o(Hi,Hi))}XK.exports={SyntaxError:ed,parse:W6e}});function eV(t){return t.match(K6e)?t:JSON.stringify(t)}function rV(t){return typeof t>"u"?!0:typeof t=="object"&&t!==null&&!Array.isArray(t)?Object.keys(t).every(e=>rV(t[e])):!1}function BT(t,e,r){if(t===null)return`null
+`;if(typeof t=="number"||typeof t=="boolean")return`${t.toString()}
+`;if(typeof t=="string")return`${eV(t)}
+`;if(Array.isArray(t)){if(t.length===0)return`[]
+`;let o="  ".repeat(e);return`
+${t.map(n=>`${o}- ${BT(n,e+1,!1)}`).join("")}`}if(typeof t=="object"&&t){let[o,a]=t instanceof zD?[t.data,!1]:[t,!0],n="  ".repeat(e),u=Object.keys(o);a&&u.sort((p,h)=>{let E=$K.indexOf(p),I=$K.indexOf(h);return E===-1&&I===-1?p<h?-1:p>h?1:0:E!==-1&&I===-1?-1:E===-1&&I!==-1?1:E-I});let A=u.filter(p=>!rV(o[p])).map((p,h)=>{let E=o[p],I=eV(p),v=BT(E,e+1,!0),x=h>0||r?n:"",C=I.length>1024?`? ${I}
+${x}:`:`${I}:`,R=v.startsWith(`
+`)?v:` ${v}`;return`${x}${C}${R}`}).join(e===0?`
+`:"")||`
+`;return r?`
+${A}`:`${A}`}throw new Error(`Unsupported value type (${t})`)}function Ba(t){try{let e=BT(t,0,!1);return e!==`
+`?e:""}catch(e){throw e.location&&(e.message=e.message.replace(/(\.)?$/,` (line ${e.location.start.line}, column ${e.location.start.column})$1`)),e}}function V6e(t){return t.endsWith(`
+`)||(t+=`
+`),(0,tV.parse)(t)}function z6e(t){if(J6e.test(t))return V6e(t);let e=(0,XD.safeLoad)(t,{schema:XD.FAILSAFE_SCHEMA,json:!0});if(e==null)return{};if(typeof e!="object")throw new Error(`Expected an indexed object, got a ${typeof e} instead. Does your file follow Yaml's rules?`);if(Array.isArray(e))throw new Error("Expected an indexed object, got an array instead. Does your file follow Yaml's rules?");return e}function Ki(t){return z6e(t)}var XD,tV,K6e,$K,zD,J6e,nV=Et(()=>{XD=$e(zK()),tV=$e(ZK()),K6e=/^(?![-?:,\][{}#&*!|>'"%@` \t\r\n]).([ \t]*(?![,\][{}:# \t\r\n]).)*$/,$K=["__metadata","version","resolution","dependencies","peerDependencies","dependenciesMeta","peerDependenciesMeta","binaries"],zD=class{constructor(e){this.data=e}};Ba.PreserveOrdering=zD;J6e=/^(#.*(\r?\n))*?#\s+yarn\s+lockfile\s+v1\r?\n/i});var rI={};Vt(rI,{parseResolution:()=>MD,parseShell:()=>ND,parseSyml:()=>Ki,stringifyArgument:()=>cT,stringifyArgumentSegment:()=>uT,stringifyArithmeticExpression:()=>OD,stringifyCommand:()=>lT,stringifyCommandChain:()=>uy,stringifyCommandChainThen:()=>aT,stringifyCommandLine:()=>LD,stringifyCommandLineThen:()=>oT,stringifyEnvSegment:()=>TD,stringifyRedirectArgument:()=>Jw,stringifyResolution:()=>UD,stringifyShell:()=>cy,stringifyShellLine:()=>cy,stringifySyml:()=>Ba,stringifyValueArgument:()=>Yg});var Nl=Et(()=>{rW();oW();nV()});var sV=_((Ext,vT)=>{"use strict";var X6e=t=>{let e=!1,r=!1,o=!1;for(let a=0;a<t.length;a++){let n=t[a];e&&/[a-zA-Z]/.test(n)&&n.toUpperCase()===n?(t=t.slice(0,a)+"-"+t.slice(a),e=!1,o=r,r=!0,a++):r&&o&&/[a-zA-Z]/.test(n)&&n.toLowerCase()===n?(t=t.slice(0,a-1)+"-"+t.slice(a-1),o=r,r=!1,e=!0):(e=n.toLowerCase()===n&&n.toUpperCase()!==n,o=r,r=n.toUpperCase()===n&&n.toLowerCase()!==n)}return t},iV=(t,e)=>{if(!(typeof t=="string"||Array.isArray(t)))throw new TypeError("Expected the input to be `string | string[]`");e=Object.assign({pascalCase:!1},e);let r=a=>e.pascalCase?a.charAt(0).toUpperCase()+a.slice(1):a;return Array.isArray(t)?t=t.map(a=>a.trim()).filter(a=>a.length).join("-"):t=t.trim(),t.length===0?"":t.length===1?e.pascalCase?t.toUpperCase():t.toLowerCase():(t!==t.toLowerCase()&&(t=X6e(t)),t=t.replace(/^[_.\- ]+/,"").toLowerCase().replace(/[_.\- ]+(\w|$)/g,(a,n)=>n.toUpperCase()).replace(/\d+(\w|$)/g,a=>a.toUpperCase()),r(t))};vT.exports=iV;vT.exports.default=iV});var oV=_((Cxt,Z6e)=>{Z6e.exports=[{name:"AppVeyor",constant:"APPVEYOR",env:"APPVEYOR",pr:"APPVEYOR_PULL_REQUEST_NUMBER"},{name:"Azure Pipelines",constant:"AZURE_PIPELINES",env:"SYSTEM_TEAMFOUNDATIONCOLLECTIONURI",pr:"SYSTEM_PULLREQUEST_PULLREQUESTID"},{name:"Appcircle",constant:"APPCIRCLE",env:"AC_APPCIRCLE"},{name:"Bamboo",constant:"BAMBOO",env:"bamboo_planKey"},{name:"Bitbucket Pipelines",constant:"BITBUCKET",env:"BITBUCKET_COMMIT",pr:"BITBUCKET_PR_ID"},{name:"Bitrise",constant:"BITRISE",env:"BITRISE_IO",pr:"BITRISE_PULL_REQUEST"},{name:"Buddy",constant:"BUDDY",env:"BUDDY_WORKSPACE_ID",pr:"BUDDY_EXECUTION_PULL_REQUEST_ID"},{name:"Buildkite",constant:"BUILDKITE",env:"BUILDKITE",pr:{env:"BUILDKITE_PULL_REQUEST",ne:"false"}},{name:"CircleCI",constant:"CIRCLE",env:"CIRCLECI",pr:"CIRCLE_PULL_REQUEST"},{name:"Cirrus CI",constant:"CIRRUS",env:"CIRRUS_CI",pr:"CIRRUS_PR"},{name:"AWS CodeBuild",constant:"CODEBUILD",env:"CODEBUILD_BUILD_ARN"},{name:"Codefresh",constant:"CODEFRESH",env:"CF_BUILD_ID",pr:{any:["CF_PULL_REQUEST_NUMBER","CF_PULL_REQUEST_ID"]}},{name:"Codeship",constant:"CODESHIP",env:{CI_NAME:"codeship"}},{name:"Drone",constant:"DRONE",env:"DRONE",pr:{DRONE_BUILD_EVENT:"pull_request"}},{name:"dsari",constant:"DSARI",env:"DSARI"},{name:"GitHub Actions",constant:"GITHUB_ACTIONS",env:"GITHUB_ACTIONS",pr:{GITHUB_EVENT_NAME:"pull_request"}},{name:"GitLab CI",constant:"GITLAB",env:"GITLAB_CI",pr:"CI_MERGE_REQUEST_ID"},{name:"GoCD",constant:"GOCD",env:"GO_PIPELINE_LABEL"},{name:"LayerCI",constant:"LAYERCI",env:"LAYERCI",pr:"LAYERCI_PULL_REQUEST"},{name:"Hudson",constant:"HUDSON",env:"HUDSON_URL"},{name:"Jenkins",constant:"JENKINS",env:["JENKINS_URL","BUILD_ID"],pr:{any:["ghprbPullId","CHANGE_ID"]}},{name:"Magnum CI",constant:"MAGNUM",env:"MAGNUM"},{name:"Netlify CI",constant:"NETLIFY",env:"NETLIFY",pr:{env:"PULL_REQUEST",ne:"false"}},{name:"Nevercode",constant:"NEVERCODE",env:"NEVERCODE",pr:{env:"NEVERCODE_PULL_REQUEST",ne:"false"}},{name:"Render",constant:"RENDER",env:"RENDER",pr:{IS_PULL_REQUEST:"true"}},{name:"Sail CI",constant:"SAIL",env:"SAILCI",pr:"SAIL_PULL_REQUEST_NUMBER"},{name:"Semaphore",constant:"SEMAPHORE",env:"SEMAPHORE",pr:"PULL_REQUEST_NUMBER"},{name:"Screwdriver",constant:"SCREWDRIVER",env:"SCREWDRIVER",pr:{env:"SD_PULL_REQUEST",ne:"false"}},{name:"Shippable",constant:"SHIPPABLE",env:"SHIPPABLE",pr:{IS_PULL_REQUEST:"true"}},{name:"Solano CI",constant:"SOLANO",env:"TDDIUM",pr:"TDDIUM_PR_ID"},{name:"Strider CD",constant:"STRIDER",env:"STRIDER"},{name:"TaskCluster",constant:"TASKCLUSTER",env:["TASK_ID","RUN_ID"]},{name:"TeamCity",constant:"TEAMCITY",env:"TEAMCITY_VERSION"},{name:"Travis CI",constant:"TRAVIS",env:"TRAVIS",pr:{env:"TRAVIS_PULL_REQUEST",ne:"false"}},{name:"Vercel",constant:"VERCEL",env:"NOW_BUILDER"},{name:"Visual Studio App Center",constant:"APPCENTER",env:"APPCENTER_BUILD_ID"}]});var td=_(Xa=>{"use strict";var lV=oV(),ju=process.env;Object.defineProperty(Xa,"_vendors",{value:lV.map(function(t){return t.constant})});Xa.name=null;Xa.isPR=null;lV.forEach(function(t){let r=(Array.isArray(t.env)?t.env:[t.env]).every(function(o){return aV(o)});if(Xa[t.constant]=r,r)switch(Xa.name=t.name,typeof t.pr){case"string":Xa.isPR=!!ju[t.pr];break;case"object":"env"in t.pr?Xa.isPR=t.pr.env in ju&&ju[t.pr.env]!==t.pr.ne:"any"in t.pr?Xa.isPR=t.pr.any.some(function(o){return!!ju[o]}):Xa.isPR=aV(t.pr);break;default:Xa.isPR=null}});Xa.isCI=!!(ju.CI||ju.CONTINUOUS_INTEGRATION||ju.BUILD_NUMBER||ju.RUN_ID||Xa.name);function aV(t){return typeof t=="string"?!!ju[t]:Object.keys(t).every(function(e){return ju[e]===t[e]})}});var Hn,cn,rd,DT,ZD,cV,ST,PT,$D=Et(()=>{(function(t){t.StartOfInput="\0",t.EndOfInput="
",t.EndOfPartialInput=""})(Hn||(Hn={}));(function(t){t[t.InitialNode=0]="InitialNode",t[t.SuccessNode=1]="SuccessNode",t[t.ErrorNode=2]="ErrorNode",t[t.CustomNode=3]="CustomNode"})(cn||(cn={}));rd=-1,DT=/^(-h|--help)(?:=([0-9]+))?$/,ZD=/^(--[a-z]+(?:-[a-z]+)*|-[a-zA-Z]+)$/,cV=/^-[a-zA-Z]{2,}$/,ST=/^([^=]+)=([\s\S]*)$/,PT=process.env.DEBUG_CLI==="1"});var it,yy,eS,bT,tS=Et(()=>{$D();it=class extends Error{constructor(e){super(e),this.clipanion={type:"usage"},this.name="UsageError"}},yy=class extends Error{constructor(e,r){if(super(),this.input=e,this.candidates=r,this.clipanion={type:"none"},this.name="UnknownSyntaxError",this.candidates.length===0)this.message="Command not found, but we're not sure what's the alternative.";else if(this.candidates.every(o=>o.reason!==null&&o.reason===r[0].reason)){let[{reason:o}]=this.candidates;this.message=`${o}
+
+${this.candidates.map(({usage:a})=>`$ ${a}`).join(`
+`)}`}else if(this.candidates.length===1){let[{usage:o}]=this.candidates;this.message=`Command not found; did you mean:
+
+$ ${o}
+${bT(e)}`}else this.message=`Command not found; did you mean one of:
+
+${this.candidates.map(({usage:o},a)=>`${`${a}.`.padStart(4)} ${o}`).join(`
+`)}
+
+${bT(e)}`}},eS=class extends Error{constructor(e,r){super(),this.input=e,this.usages=r,this.clipanion={type:"none"},this.name="AmbiguousSyntaxError",this.message=`Cannot find which to pick amongst the following alternatives:
+
+${this.usages.map((o,a)=>`${`${a}.`.padStart(4)} ${o}`).join(`
+`)}
+
+${bT(e)}`}},bT=t=>`While running ${t.filter(e=>e!==Hn.EndOfInput&&e!==Hn.EndOfPartialInput).map(e=>{let r=JSON.stringify(e);return e.match(/\s/)||e.length===0||r!==`"${e}"`?r:e}).join(" ")}`});function $6e(t){let e=t.split(`
+`),r=e.filter(a=>a.match(/\S/)),o=r.length>0?r.reduce((a,n)=>Math.min(a,n.length-n.trimStart().length),Number.MAX_VALUE):0;return e.map(a=>a.slice(o).trimRight()).join(`
+`)}function Do(t,{format:e,paragraphs:r}){return t=t.replace(/\r\n?/g,`
+`),t=$6e(t),t=t.replace(/^\n+|\n+$/g,""),t=t.replace(/^(\s*)-([^\n]*?)\n+/gm,`$1-$2
+
+`),t=t.replace(/\n(\n)?\n*/g,(o,a)=>a||" "),r&&(t=t.split(/\n/).map(o=>{let a=o.match(/^\s*[*-][\t ]+(.*)/);if(!a)return o.match(/(.{1,80})(?: |$)/g).join(`
+`);let n=o.length-o.trimStart().length;return a[1].match(new RegExp(`(.{1,${78-n}})(?: |$)`,"g")).map((u,A)=>" ".repeat(n)+(A===0?"- ":"  ")+u).join(`
+`)}).join(`
+
+`)),t=t.replace(/(`+)((?:.|[\n])*?)\1/g,(o,a,n)=>e.code(a+n+a)),t=t.replace(/(\*\*)((?:.|[\n])*?)\1/g,(o,a,n)=>e.bold(a+n+a)),t?`${t}
+`:""}var xT,uV,AV,kT=Et(()=>{xT=Array(80).fill("\u2501");for(let t=0;t<=24;++t)xT[xT.length-t]=`\x1B[38;5;${232+t}m\u2501`;uV={header:t=>`\x1B[1m\u2501\u2501\u2501 ${t}${t.length<80-5?` ${xT.slice(t.length+5).join("")}`:":"}\x1B[0m`,bold:t=>`\x1B[1m${t}\x1B[22m`,error:t=>`\x1B[31m\x1B[1m${t}\x1B[22m\x1B[39m`,code:t=>`\x1B[36m${t}\x1B[39m`},AV={header:t=>t,bold:t=>t,error:t=>t,code:t=>t}});function Ko(t){return{...t,[nI]:!0}}function Gu(t,e){return typeof t>"u"?[t,e]:typeof t=="object"&&t!==null&&!Array.isArray(t)?[void 0,t]:[t,e]}function rS(t,{mergeName:e=!1}={}){let r=t.match(/^([^:]+): (.*)$/m);if(!r)return"validation failed";let[,o,a]=r;return e&&(a=a[0].toLowerCase()+a.slice(1)),a=o!=="."||!e?`${o.replace(/^\.(\[|$)/,"$1")}: ${a}`:`: ${a}`,a}function iI(t,e){return e.length===1?new it(`${t}${rS(e[0],{mergeName:!0})}`):new it(`${t}:
+${e.map(r=>`
+- ${rS(r)}`).join("")}`)}function nd(t,e,r){if(typeof r>"u")return e;let o=[],a=[],n=A=>{let p=e;return e=A,n.bind(null,p)};if(!r(e,{errors:o,coercions:a,coercion:n}))throw iI(`Invalid value for ${t}`,o);for(let[,A]of a)A();return e}var nI,Ef=Et(()=>{tS();nI=Symbol("clipanion/isOption")});var Vo={};Vt(Vo,{KeyRelationship:()=>qu,TypeAssertionError:()=>Kp,applyCascade:()=>aI,as:()=>yje,assert:()=>gje,assertWithErrors:()=>dje,cascade:()=>oS,fn:()=>Eje,hasAtLeastOneKey:()=>OT,hasExactLength:()=>dV,hasForbiddenKeys:()=>Mje,hasKeyRelationship:()=>cI,hasMaxLength:()=>wje,hasMinLength:()=>Cje,hasMutuallyExclusiveKeys:()=>Uje,hasRequiredKeys:()=>Oje,hasUniqueItems:()=>Ije,isArray:()=>nS,isAtLeast:()=>NT,isAtMost:()=>Dje,isBase64:()=>Rje,isBoolean:()=>aje,isDate:()=>cje,isDict:()=>fje,isEnum:()=>Ks,isHexColor:()=>Fje,isISO8601:()=>Qje,isInExclusiveRange:()=>Pje,isInInclusiveRange:()=>Sje,isInstanceOf:()=>hje,isInteger:()=>LT,isJSON:()=>Tje,isLiteral:()=>pV,isLowerCase:()=>bje,isMap:()=>Aje,isNegative:()=>Bje,isNullable:()=>Lje,isNumber:()=>RT,isObject:()=>hV,isOneOf:()=>TT,isOptional:()=>Nje,isPartial:()=>pje,isPayload:()=>lje,isPositive:()=>vje,isRecord:()=>sS,isSet:()=>uje,isString:()=>Cy,isTuple:()=>iS,isUUID4:()=>kje,isUnknown:()=>FT,isUpperCase:()=>xje,makeTrait:()=>gV,makeValidator:()=>Hr,matchesRegExp:()=>oI,softAssert:()=>mje});function jn(t){return t===null?"null":t===void 0?"undefined":t===""?"an empty string":typeof t=="symbol"?`<${t.toString()}>`:Array.isArray(t)?"an array":JSON.stringify(t)}function Ey(t,e){if(t.length===0)return"nothing";if(t.length===1)return jn(t[0]);let r=t.slice(0,-1),o=t[t.length-1],a=t.length>2?`, ${e} `:` ${e} `;return`${r.map(n=>jn(n)).join(", ")}${a}${jn(o)}`}function Wp(t,e){var r,o,a;return typeof e=="number"?`${(r=t?.p)!==null&&r!==void 0?r:"."}[${e}]`:eje.test(e)?`${(o=t?.p)!==null&&o!==void 0?o:""}.${e}`:`${(a=t?.p)!==null&&a!==void 0?a:"."}[${JSON.stringify(e)}]`}function QT(t,e,r){return t===1?e:r}function pr({errors:t,p:e}={},r){return t?.push(`${e??"."}: ${r}`),!1}function sje(t,e){return r=>{t[e]=r}}function Yu(t,e){return r=>{let o=t[e];return t[e]=r,Yu(t,e).bind(null,o)}}function sI(t,e,r){let o=()=>(t(r()),a),a=()=>(t(e),o);return o}function FT(){return Hr({test:(t,e)=>!0})}function pV(t){return Hr({test:(e,r)=>e!==t?pr(r,`Expected ${jn(t)} (got ${jn(e)})`):!0})}function Cy(){return Hr({test:(t,e)=>typeof t!="string"?pr(e,`Expected a string (got ${jn(t)})`):!0})}function Ks(t){let e=Array.isArray(t)?t:Object.values(t),r=e.every(a=>typeof a=="string"||typeof a=="number"),o=new Set(e);return o.size===1?pV([...o][0]):Hr({test:(a,n)=>o.has(a)?!0:r?pr(n,`Expected one of ${Ey(e,"or")} (got ${jn(a)})`):pr(n,`Expected a valid enumeration value (got ${jn(a)})`)})}function aje(){return Hr({test:(t,e)=>{var r;if(typeof t!="boolean"){if(typeof e?.coercions<"u"){if(typeof e?.coercion>"u")return pr(e,"Unbound coercion result");let o=oje.get(t);if(typeof o<"u")return e.coercions.push([(r=e.p)!==null&&r!==void 0?r:".",e.coercion.bind(null,o)]),!0}return pr(e,`Expected a boolean (got ${jn(t)})`)}return!0}})}function RT(){return Hr({test:(t,e)=>{var r;if(typeof t!="number"){if(typeof e?.coercions<"u"){if(typeof e?.coercion>"u")return pr(e,"Unbound coercion result");let o;if(typeof t=="string"){let a;try{a=JSON.parse(t)}catch{}if(typeof a=="number")if(JSON.stringify(a)===t)o=a;else return pr(e,`Received a number that can't be safely represented by the runtime (${t})`)}if(typeof o<"u")return e.coercions.push([(r=e.p)!==null&&r!==void 0?r:".",e.coercion.bind(null,o)]),!0}return pr(e,`Expected a number (got ${jn(t)})`)}return!0}})}function lje(t){return Hr({test:(e,r)=>{var o;if(typeof r?.coercions>"u")return pr(r,"The isPayload predicate can only be used with coercion enabled");if(typeof r.coercion>"u")return pr(r,"Unbound coercion result");if(typeof e!="string")return pr(r,`Expected a string (got ${jn(e)})`);let a;try{a=JSON.parse(e)}catch{return pr(r,`Expected a JSON string (got ${jn(e)})`)}let n={value:a};return t(a,Object.assign(Object.assign({},r),{coercion:Yu(n,"value")}))?(r.coercions.push([(o=r.p)!==null&&o!==void 0?o:".",r.coercion.bind(null,n.value)]),!0):!1}})}function cje(){return Hr({test:(t,e)=>{var r;if(!(t instanceof Date)){if(typeof e?.coercions<"u"){if(typeof e?.coercion>"u")return pr(e,"Unbound coercion result");let o;if(typeof t=="string"&&fV.test(t))o=new Date(t);else{let a;if(typeof t=="string"){let n;try{n=JSON.parse(t)}catch{}typeof n=="number"&&(a=n)}else typeof t=="number"&&(a=t);if(typeof a<"u")if(Number.isSafeInteger(a)||!Number.isSafeInteger(a*1e3))o=new Date(a*1e3);else return pr(e,`Received a timestamp that can't be safely represented by the runtime (${t})`)}if(typeof o<"u")return e.coercions.push([(r=e.p)!==null&&r!==void 0?r:".",e.coercion.bind(null,o)]),!0}return pr(e,`Expected a date (got ${jn(t)})`)}return!0}})}function nS(t,{delimiter:e}={}){return Hr({test:(r,o)=>{var a;let n=r;if(typeof r=="string"&&typeof e<"u"&&typeof o?.coercions<"u"){if(typeof o?.coercion>"u")return pr(o,"Unbound coercion result");r=r.split(e)}if(!Array.isArray(r))return pr(o,`Expected an array (got ${jn(r)})`);let u=!0;for(let A=0,p=r.length;A<p&&(u=t(r[A],Object.assign(Object.assign({},o),{p:Wp(o,A),coercion:Yu(r,A)}))&&u,!(!u&&o?.errors==null));++A);return r!==n&&o.coercions.push([(a=o.p)!==null&&a!==void 0?a:".",o.coercion.bind(null,r)]),u}})}function uje(t,{delimiter:e}={}){let r=nS(t,{delimiter:e});return Hr({test:(o,a)=>{var n,u;if(Object.getPrototypeOf(o).toString()==="[object Set]")if(typeof a?.coercions<"u"){if(typeof a?.coercion>"u")return pr(a,"Unbound coercion result");let A=[...o],p=[...o];if(!r(p,Object.assign(Object.assign({},a),{coercion:void 0})))return!1;let h=()=>p.some((E,I)=>E!==A[I])?new Set(p):o;return a.coercions.push([(n=a.p)!==null&&n!==void 0?n:".",sI(a.coercion,o,h)]),!0}else{let A=!0;for(let p of o)if(A=t(p,Object.assign({},a))&&A,!A&&a?.errors==null)break;return A}if(typeof a?.coercions<"u"){if(typeof a?.coercion>"u")return pr(a,"Unbound coercion result");let A={value:o};return r(o,Object.assign(Object.assign({},a),{coercion:Yu(A,"value")}))?(a.coercions.push([(u=a.p)!==null&&u!==void 0?u:".",sI(a.coercion,o,()=>new Set(A.value))]),!0):!1}return pr(a,`Expected a set (got ${jn(o)})`)}})}function Aje(t,e){let r=nS(iS([t,e])),o=sS(e,{keys:t});return Hr({test:(a,n)=>{var u,A,p;if(Object.getPrototypeOf(a).toString()==="[object Map]")if(typeof n?.coercions<"u"){if(typeof n?.coercion>"u")return pr(n,"Unbound coercion result");let h=[...a],E=[...a];if(!r(E,Object.assign(Object.assign({},n),{coercion:void 0})))return!1;let I=()=>E.some((v,x)=>v[0]!==h[x][0]||v[1]!==h[x][1])?new Map(E):a;return n.coercions.push([(u=n.p)!==null&&u!==void 0?u:".",sI(n.coercion,a,I)]),!0}else{let h=!0;for(let[E,I]of a)if(h=t(E,Object.assign({},n))&&h,!h&&n?.errors==null||(h=e(I,Object.assign(Object.assign({},n),{p:Wp(n,E)}))&&h,!h&&n?.errors==null))break;return h}if(typeof n?.coercions<"u"){if(typeof n?.coercion>"u")return pr(n,"Unbound coercion result");let h={value:a};return Array.isArray(a)?r(a,Object.assign(Object.assign({},n),{coercion:void 0}))?(n.coercions.push([(A=n.p)!==null&&A!==void 0?A:".",sI(n.coercion,a,()=>new Map(h.value))]),!0):!1:o(a,Object.assign(Object.assign({},n),{coercion:Yu(h,"value")}))?(n.coercions.push([(p=n.p)!==null&&p!==void 0?p:".",sI(n.coercion,a,()=>new Map(Object.entries(h.value)))]),!0):!1}return pr(n,`Expected a map (got ${jn(a)})`)}})}function iS(t,{delimiter:e}={}){let r=dV(t.length);return Hr({test:(o,a)=>{var n;if(typeof o=="string"&&typeof e<"u"&&typeof a?.coercions<"u"){if(typeof a?.coercion>"u")return pr(a,"Unbound coercion result");o=o.split(e),a.coercions.push([(n=a.p)!==null&&n!==void 0?n:".",a.coercion.bind(null,o)])}if(!Array.isArray(o))return pr(a,`Expected a tuple (got ${jn(o)})`);let u=r(o,Object.assign({},a));for(let A=0,p=o.length;A<p&&A<t.length&&(u=t[A](o[A],Object.assign(Object.assign({},a),{p:Wp(a,A),coercion:Yu(o,A)}))&&u,!(!u&&a?.errors==null));++A);return u}})}function sS(t,{keys:e=null}={}){let r=nS(iS([e??Cy(),t]));return Hr({test:(o,a)=>{var n;if(Array.isArray(o)&&typeof a?.coercions<"u")return typeof a?.coercion>"u"?pr(a,"Unbound coercion result"):r(o,Object.assign(Object.assign({},a),{coercion:void 0}))?(o=Object.fromEntries(o),a.coercions.push([(n=a.p)!==null&&n!==void 0?n:".",a.coercion.bind(null,o)]),!0):!1;if(typeof o!="object"||o===null)return pr(a,`Expected an object (got ${jn(o)})`);let u=Object.keys(o),A=!0;for(let p=0,h=u.length;p<h&&(A||a?.errors!=null);++p){let E=u[p],I=o[E];if(E==="__proto__"||E==="constructor"){A=pr(Object.assign(Object.assign({},a),{p:Wp(a,E)}),"Unsafe property name");continue}if(e!==null&&!e(E,a)){A=!1;continue}if(!t(I,Object.assign(Object.assign({},a),{p:Wp(a,E),coercion:Yu(o,E)}))){A=!1;continue}}return A}})}function fje(t,e={}){return sS(t,e)}function hV(t,{extra:e=null}={}){let r=Object.keys(t),o=Hr({test:(a,n)=>{if(typeof a!="object"||a===null)return pr(n,`Expected an object (got ${jn(a)})`);let u=new Set([...r,...Object.keys(a)]),A={},p=!0;for(let h of u){if(h==="constructor"||h==="__proto__")p=pr(Object.assign(Object.assign({},n),{p:Wp(n,h)}),"Unsafe property name");else{let E=Object.prototype.hasOwnProperty.call(t,h)?t[h]:void 0,I=Object.prototype.hasOwnProperty.call(a,h)?a[h]:void 0;typeof E<"u"?p=E(I,Object.assign(Object.assign({},n),{p:Wp(n,h),coercion:Yu(a,h)}))&&p:e===null?p=pr(Object.assign(Object.assign({},n),{p:Wp(n,h)}),`Extraneous property (got ${jn(I)})`):Object.defineProperty(A,h,{enumerable:!0,get:()=>I,set:sje(a,h)})}if(!p&&n?.errors==null)break}return e!==null&&(p||n?.errors!=null)&&(p=e(A,n)&&p),p}});return Object.assign(o,{properties:t})}function pje(t){return hV(t,{extra:sS(FT())})}function gV(t){return()=>t}function Hr({test:t}){return gV(t)()}function gje(t,e){if(!e(t))throw new Kp}function dje(t,e){let r=[];if(!e(t,{errors:r}))throw new Kp({errors:r})}function mje(t,e){}function yje(t,e,{coerce:r=!1,errors:o,throw:a}={}){let n=o?[]:void 0;if(!r){if(e(t,{errors:n}))return a?t:{value:t,errors:void 0};if(a)throw new Kp({errors:n});return{value:void 0,errors:n??!0}}let u={value:t},A=Yu(u,"value"),p=[];if(!e(t,{errors:n,coercion:A,coercions:p})){if(a)throw new Kp({errors:n});return{value:void 0,errors:n??!0}}for(let[,h]of p)h();return a?u.value:{value:u.value,errors:void 0}}function Eje(t,e){let r=iS(t);return(...o)=>{if(!r(o))throw new Kp;return e(...o)}}function Cje(t){return Hr({test:(e,r)=>e.length>=t?!0:pr(r,`Expected to have a length of at least ${t} elements (got ${e.length})`)})}function wje(t){return Hr({test:(e,r)=>e.length<=t?!0:pr(r,`Expected to have a length of at most ${t} elements (got ${e.length})`)})}function dV(t){return Hr({test:(e,r)=>e.length!==t?pr(r,`Expected to have a length of exactly ${t} elements (got ${e.length})`):!0})}function Ije({map:t}={}){return Hr({test:(e,r)=>{let o=new Set,a=new Set;for(let n=0,u=e.length;n<u;++n){let A=e[n],p=typeof t<"u"?t(A):A;if(o.has(p)){if(a.has(p))continue;pr(r,`Expected to contain unique elements; got a duplicate with ${jn(e)}`),a.add(p)}else o.add(p)}return a.size===0}})}function Bje(){return Hr({test:(t,e)=>t<=0?!0:pr(e,`Expected to be negative (got ${t})`)})}function vje(){return Hr({test:(t,e)=>t>=0?!0:pr(e,`Expected to be positive (got ${t})`)})}function NT(t){return Hr({test:(e,r)=>e>=t?!0:pr(r,`Expected to be at least ${t} (got ${e})`)})}function Dje(t){return Hr({test:(e,r)=>e<=t?!0:pr(r,`Expected to be at most ${t} (got ${e})`)})}function Sje(t,e){return Hr({test:(r,o)=>r>=t&&r<=e?!0:pr(o,`Expected to be in the [${t}; ${e}] range (got ${r})`)})}function Pje(t,e){return Hr({test:(r,o)=>r>=t&&r<e?!0:pr(o,`Expected to be in the [${t}; ${e}[ range (got ${r})`)})}function LT({unsafe:t=!1}={}){return Hr({test:(e,r)=>e!==Math.round(e)?pr(r,`Expected to be an integer (got ${e})`):!t&&!Number.isSafeInteger(e)?pr(r,`Expected to be a safe integer (got ${e})`):!0})}function oI(t){return Hr({test:(e,r)=>t.test(e)?!0:pr(r,`Expected to match the pattern ${t.toString()} (got ${jn(e)})`)})}function bje(){return Hr({test:(t,e)=>t!==t.toLowerCase()?pr(e,`Expected to be all-lowercase (got ${t})`):!0})}function xje(){return Hr({test:(t,e)=>t!==t.toUpperCase()?pr(e,`Expected to be all-uppercase (got ${t})`):!0})}function kje(){return Hr({test:(t,e)=>ije.test(t)?!0:pr(e,`Expected to be a valid UUID v4 (got ${jn(t)})`)})}function Qje(){return Hr({test:(t,e)=>fV.test(t)?!0:pr(e,`Expected to be a valid ISO 8601 date string (got ${jn(t)})`)})}function Fje({alpha:t=!1}){return Hr({test:(e,r)=>(t?tje.test(e):rje.test(e))?!0:pr(r,`Expected to be a valid hexadecimal color string (got ${jn(e)})`)})}function Rje(){return Hr({test:(t,e)=>nje.test(t)?!0:pr(e,`Expected to be a valid base 64 string (got ${jn(t)})`)})}function Tje(t=FT()){return Hr({test:(e,r)=>{let o;try{o=JSON.parse(e)}catch{return pr(r,`Expected to be a valid JSON string (got ${jn(e)})`)}return t(o,r)}})}function oS(t,...e){let r=Array.isArray(e[0])?e[0]:e;return Hr({test:(o,a)=>{var n,u;let A={value:o},p=typeof a?.coercions<"u"?Yu(A,"value"):void 0,h=typeof a?.coercions<"u"?[]:void 0;if(!t(o,Object.assign(Object.assign({},a),{coercion:p,coercions:h})))return!1;let E=[];if(typeof h<"u")for(let[,I]of h)E.push(I());try{if(typeof a?.coercions<"u"){if(A.value!==o){if(typeof a?.coercion>"u")return pr(a,"Unbound coercion result");a.coercions.push([(n=a.p)!==null&&n!==void 0?n:".",a.coercion.bind(null,A.value)])}(u=a?.coercions)===null||u===void 0||u.push(...h)}return r.every(I=>I(A.value,a))}finally{for(let I of E)I()}}})}function aI(t,...e){let r=Array.isArray(e[0])?e[0]:e;return oS(t,r)}function Nje(t){return Hr({test:(e,r)=>typeof e>"u"?!0:t(e,r)})}function Lje(t){return Hr({test:(e,r)=>e===null?!0:t(e,r)})}function Oje(t,e){var r;let o=new Set(t),a=lI[(r=e?.missingIf)!==null&&r!==void 0?r:"missing"];return Hr({test:(n,u)=>{let A=new Set(Object.keys(n)),p=[];for(let h of o)a(A,h,n)||p.push(h);return p.length>0?pr(u,`Missing required ${QT(p.length,"property","properties")} ${Ey(p,"and")}`):!0}})}function OT(t,e){var r;let o=new Set(t),a=lI[(r=e?.missingIf)!==null&&r!==void 0?r:"missing"];return Hr({test:(n,u)=>Object.keys(n).some(h=>a(o,h,n))?!0:pr(u,`Missing at least one property from ${Ey(Array.from(o),"or")}`)})}function Mje(t,e){var r;let o=new Set(t),a=lI[(r=e?.missingIf)!==null&&r!==void 0?r:"missing"];return Hr({test:(n,u)=>{let A=new Set(Object.keys(n)),p=[];for(let h of o)a(A,h,n)&&p.push(h);return p.length>0?pr(u,`Forbidden ${QT(p.length,"property","properties")} ${Ey(p,"and")}`):!0}})}function Uje(t,e){var r;let o=new Set(t),a=lI[(r=e?.missingIf)!==null&&r!==void 0?r:"missing"];return Hr({test:(n,u)=>{let A=new Set(Object.keys(n)),p=[];for(let h of o)a(A,h,n)&&p.push(h);return p.length>1?pr(u,`Mutually exclusive properties ${Ey(p,"and")}`):!0}})}function cI(t,e,r,o){var a,n;let u=new Set((a=o?.ignore)!==null&&a!==void 0?a:[]),A=lI[(n=o?.missingIf)!==null&&n!==void 0?n:"missing"],p=new Set(r),h=_je[e],E=e===qu.Forbids?"or":"and";return Hr({test:(I,v)=>{let x=new Set(Object.keys(I));if(!A(x,t,I)||u.has(I[t]))return!0;let C=[];for(let R of p)(A(x,R,I)&&!u.has(I[R]))!==h.expect&&C.push(R);return C.length>=1?pr(v,`Property "${t}" ${h.message} ${QT(C.length,"property","properties")} ${Ey(C,E)}`):!0}})}var eje,tje,rje,nje,ije,fV,oje,hje,TT,Kp,lI,qu,_je,Za=Et(()=>{eje=/^[a-zA-Z_][a-zA-Z0-9_]*$/;tje=/^#[0-9a-f]{6}$/i,rje=/^#[0-9a-f]{6}([0-9a-f]{2})?$/i,nje=/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/,ije=/^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89aAbB][a-f0-9]{3}-[a-f0-9]{12}$/i,fV=/^(?:[1-9]\d{3}(-?)(?:(?:0[1-9]|1[0-2])\1(?:0[1-9]|1\d|2[0-8])|(?:0[13-9]|1[0-2])\1(?:29|30)|(?:0[13578]|1[02])(?:\1)31|00[1-9]|0[1-9]\d|[12]\d{2}|3(?:[0-5]\d|6[0-5]))|(?:[1-9]\d(?:0[48]|[2468][048]|[13579][26])|(?:[2468][048]|[13579][26])00)(?:(-?)02(?:\2)29|-?366))T(?:[01]\d|2[0-3])(:?)[0-5]\d(?:\3[0-5]\d)?(?:Z|[+-][01]\d(?:\3[0-5]\d)?)$/;oje=new Map([["true",!0],["True",!0],["1",!0],[1,!0],["false",!1],["False",!1],["0",!1],[0,!1]]);hje=t=>Hr({test:(e,r)=>e instanceof t?!0:pr(r,`Expected an instance of ${t.name} (got ${jn(e)})`)}),TT=(t,{exclusive:e=!1}={})=>Hr({test:(r,o)=>{var a,n,u;let A=[],p=typeof o?.errors<"u"?[]:void 0;for(let h=0,E=t.length;h<E;++h){let I=typeof o?.errors<"u"?[]:void 0,v=typeof o?.coercions<"u"?[]:void 0;if(t[h](r,Object.assign(Object.assign({},o),{errors:I,coercions:v,p:`${(a=o?.p)!==null&&a!==void 0?a:"."}#${h+1}`}))){if(A.push([`#${h+1}`,v]),!e)break}else p?.push(I[0])}if(A.length===1){let[,h]=A[0];return typeof h<"u"&&((n=o?.coercions)===null||n===void 0||n.push(...h)),!0}return A.length>1?pr(o,`Expected to match exactly a single predicate (matched ${A.join(", ")})`):(u=o?.errors)===null||u===void 0||u.push(...p),!1}});Kp=class extends Error{constructor({errors:e}={}){let r="Type mismatch";if(e&&e.length>0){r+=`
+`;for(let o of e)r+=`
+- ${o}`}super(r)}};lI={missing:(t,e)=>t.has(e),undefined:(t,e,r)=>t.has(e)&&typeof r[e]<"u",nil:(t,e,r)=>t.has(e)&&r[e]!=null,falsy:(t,e,r)=>t.has(e)&&!!r[e]};(function(t){t.Forbids="Forbids",t.Requires="Requires"})(qu||(qu={}));_je={[qu.Forbids]:{expect:!1,message:"forbids using"},[qu.Requires]:{expect:!0,message:"requires using"}}});var nt,Vp=Et(()=>{Ef();nt=class{constructor(){this.help=!1}static Usage(e){return e}async catch(e){throw e}async validateAndExecute(){let r=this.constructor.schema;if(Array.isArray(r)){let{isDict:a,isUnknown:n,applyCascade:u}=await Promise.resolve().then(()=>(Za(),Vo)),A=u(a(n()),r),p=[],h=[];if(!A(this,{errors:p,coercions:h}))throw iI("Invalid option schema",p);for(let[,I]of h)I()}else if(r!=null)throw new Error("Invalid command schema");let o=await this.execute();return typeof o<"u"?o:0}};nt.isOption=nI;nt.Default=[]});function va(t){PT&&console.log(t)}function yV(){let t={nodes:[]};for(let e=0;e<cn.CustomNode;++e)t.nodes.push($a());return t}function Hje(t){let e=yV(),r=[],o=e.nodes.length;for(let a of t){r.push(o);for(let n=0;n<a.nodes.length;++n)CV(n)||e.nodes.push(Jje(a.nodes[n],o));o+=a.nodes.length-cn.CustomNode+1}for(let a of r)wy(e,cn.InitialNode,a);return e}function Oc(t,e){return t.nodes.push(e),t.nodes.length-1}function jje(t){let e=new Set,r=o=>{if(e.has(o))return;e.add(o);let a=t.nodes[o];for(let u of Object.values(a.statics))for(let{to:A}of u)r(A);for(let[,{to:u}]of a.dynamics)r(u);for(let{to:u}of a.shortcuts)r(u);let n=new Set(a.shortcuts.map(({to:u})=>u));for(;a.shortcuts.length>0;){let{to:u}=a.shortcuts.shift(),A=t.nodes[u];for(let[p,h]of Object.entries(A.statics)){let E=Object.prototype.hasOwnProperty.call(a.statics,p)?a.statics[p]:a.statics[p]=[];for(let I of h)E.some(({to:v})=>I.to===v)||E.push(I)}for(let[p,h]of A.dynamics)a.dynamics.some(([E,{to:I}])=>p===E&&h.to===I)||a.dynamics.push([p,h]);for(let p of A.shortcuts)n.has(p.to)||(a.shortcuts.push(p),n.add(p.to))}};r(cn.InitialNode)}function Gje(t,{prefix:e=""}={}){if(PT){va(`${e}Nodes are:`);for(let r=0;r<t.nodes.length;++r)va(`${e}  ${r}: ${JSON.stringify(t.nodes[r])}`)}}function qje(t,e,r=!1){va(`Running a vm on ${JSON.stringify(e)}`);let o=[{node:cn.InitialNode,state:{candidateUsage:null,requiredOptions:[],errorMessage:null,ignoreOptions:!1,options:[],path:[],positionals:[],remainder:null,selectedIndex:null,partial:!1,tokens:[]}}];Gje(t,{prefix:"  "});let a=[Hn.StartOfInput,...e];for(let n=0;n<a.length;++n){let u=a[n],A=u===Hn.EndOfInput||u===Hn.EndOfPartialInput,p=n-1;va(`  Processing ${JSON.stringify(u)}`);let h=[];for(let{node:E,state:I}of o){va(`    Current node is ${E}`);let v=t.nodes[E];if(E===cn.ErrorNode){h.push({node:E,state:I});continue}console.assert(v.shortcuts.length===0,"Shortcuts should have been eliminated by now");let x=Object.prototype.hasOwnProperty.call(v.statics,u);if(!r||n<a.length-1||x)if(x){let C=v.statics[u];for(let{to:R,reducer:L}of C)h.push({node:R,state:typeof L<"u"?aS(UT,L,I,u,p):I}),va(`      Static transition to ${R} found`)}else va("      No static transition found");else{let C=!1;for(let R of Object.keys(v.statics))if(!!R.startsWith(u)){if(u===R)for(let{to:L,reducer:U}of v.statics[R])h.push({node:L,state:typeof U<"u"?aS(UT,U,I,u,p):I}),va(`      Static transition to ${L} found`);else for(let{to:L}of v.statics[R])h.push({node:L,state:{...I,remainder:R.slice(u.length)}}),va(`      Static transition to ${L} found (partial match)`);C=!0}C||va("      No partial static transition found")}if(!A)for(let[C,{to:R,reducer:L}]of v.dynamics)aS(zje,C,I,u,p)&&(h.push({node:R,state:typeof L<"u"?aS(UT,L,I,u,p):I}),va(`      Dynamic transition to ${R} found (via ${C})`))}if(h.length===0&&A&&e.length===1)return[{node:cn.InitialNode,state:mV}];if(h.length===0)throw new yy(e,o.filter(({node:E})=>E!==cn.ErrorNode).map(({state:E})=>({usage:E.candidateUsage,reason:null})));if(h.every(({node:E})=>E===cn.ErrorNode))throw new yy(e,h.map(({state:E})=>({usage:E.candidateUsage,reason:E.errorMessage})));o=Wje(h)}if(o.length>0){va("  Results:");for(let n of o)va(`    - ${n.node} -> ${JSON.stringify(n.state)}`)}else va("  No results");return o}function Yje(t,e,{endToken:r=Hn.EndOfInput}={}){let o=qje(t,[...e,r]);return Kje(e,o.map(({state:a})=>a))}function Wje(t){let e=0;for(let{state:r}of t)r.path.length>e&&(e=r.path.length);return t.filter(({state:r})=>r.path.length===e)}function Kje(t,e){let r=e.filter(v=>v.selectedIndex!==null),o=r.filter(v=>!v.partial);if(o.length>0&&(r=o),r.length===0)throw new Error;let a=r.filter(v=>v.selectedIndex===rd||v.requiredOptions.every(x=>x.some(C=>v.options.find(R=>R.name===C))));if(a.length===0)throw new yy(t,r.map(v=>({usage:v.candidateUsage,reason:null})));let n=0;for(let v of a)v.path.length>n&&(n=v.path.length);let u=a.filter(v=>v.path.length===n),A=v=>v.positionals.filter(({extra:x})=>!x).length+v.options.length,p=u.map(v=>({state:v,positionalCount:A(v)})),h=0;for(let{positionalCount:v}of p)v>h&&(h=v);let E=p.filter(({positionalCount:v})=>v===h).map(({state:v})=>v),I=Vje(E);if(I.length>1)throw new eS(t,I.map(v=>v.candidateUsage));return I[0]}function Vje(t){let e=[],r=[];for(let o of t)o.selectedIndex===rd?r.push(o):e.push(o);return r.length>0&&e.push({...mV,path:EV(...r.map(o=>o.path)),options:r.reduce((o,a)=>o.concat(a.options),[])}),e}function EV(t,e,...r){return e===void 0?Array.from(t):EV(t.filter((o,a)=>o===e[a]),...r)}function $a(){return{dynamics:[],shortcuts:[],statics:{}}}function CV(t){return t===cn.SuccessNode||t===cn.ErrorNode}function MT(t,e=0){return{to:CV(t.to)?t.to:t.to>=cn.CustomNode?t.to+e-cn.CustomNode+1:t.to+e,reducer:t.reducer}}function Jje(t,e=0){let r=$a();for(let[o,a]of t.dynamics)r.dynamics.push([o,MT(a,e)]);for(let o of t.shortcuts)r.shortcuts.push(MT(o,e));for(let[o,a]of Object.entries(t.statics))r.statics[o]=a.map(n=>MT(n,e));return r}function Ps(t,e,r,o,a){t.nodes[e].dynamics.push([r,{to:o,reducer:a}])}function wy(t,e,r,o){t.nodes[e].shortcuts.push({to:r,reducer:o})}function Jo(t,e,r,o,a){(Object.prototype.hasOwnProperty.call(t.nodes[e].statics,r)?t.nodes[e].statics[r]:t.nodes[e].statics[r]=[]).push({to:o,reducer:a})}function aS(t,e,r,o,a){if(Array.isArray(e)){let[n,...u]=e;return t[n](r,o,a,...u)}else return t[e](r,o,a)}var mV,zje,UT,el,_T,Iy,lS=Et(()=>{$D();tS();mV={candidateUsage:null,requiredOptions:[],errorMessage:null,ignoreOptions:!1,path:[],positionals:[],options:[],remainder:null,selectedIndex:rd,partial:!1,tokens:[]};zje={always:()=>!0,isOptionLike:(t,e)=>!t.ignoreOptions&&e!=="-"&&e.startsWith("-"),isNotOptionLike:(t,e)=>t.ignoreOptions||e==="-"||!e.startsWith("-"),isOption:(t,e,r,o)=>!t.ignoreOptions&&e===o,isBatchOption:(t,e,r,o)=>!t.ignoreOptions&&cV.test(e)&&[...e.slice(1)].every(a=>o.has(`-${a}`)),isBoundOption:(t,e,r,o,a)=>{let n=e.match(ST);return!t.ignoreOptions&&!!n&&ZD.test(n[1])&&o.has(n[1])&&a.filter(u=>u.nameSet.includes(n[1])).every(u=>u.allowBinding)},isNegatedOption:(t,e,r,o)=>!t.ignoreOptions&&e===`--no-${o.slice(2)}`,isHelp:(t,e)=>!t.ignoreOptions&&DT.test(e),isUnsupportedOption:(t,e,r,o)=>!t.ignoreOptions&&e.startsWith("-")&&ZD.test(e)&&!o.has(e),isInvalidOption:(t,e)=>!t.ignoreOptions&&e.startsWith("-")&&!ZD.test(e)},UT={setCandidateState:(t,e,r,o)=>({...t,...o}),setSelectedIndex:(t,e,r,o)=>({...t,selectedIndex:o}),setPartialIndex:(t,e,r,o)=>({...t,selectedIndex:o,partial:!0}),pushBatch:(t,e,r,o)=>{let a=t.options.slice(),n=t.tokens.slice();for(let u=1;u<e.length;++u){let A=o.get(`-${e[u]}`),p=u===1?[0,2]:[u,u+1];a.push({name:A,value:!0}),n.push({segmentIndex:r,type:"option",option:A,slice:p})}return{...t,options:a,tokens:n}},pushBound:(t,e,r)=>{let[,o,a]=e.match(ST),n=t.options.concat({name:o,value:a}),u=t.tokens.concat([{segmentIndex:r,type:"option",slice:[0,o.length],option:o},{segmentIndex:r,type:"assign",slice:[o.length,o.length+1]},{segmentIndex:r,type:"value",slice:[o.length+1,o.length+a.length+1]}]);return{...t,options:n,tokens:u}},pushPath:(t,e,r)=>{let o=t.path.concat(e),a=t.tokens.concat({segmentIndex:r,type:"path"});return{...t,path:o,tokens:a}},pushPositional:(t,e,r)=>{let o=t.positionals.concat({value:e,extra:!1}),a=t.tokens.concat({segmentIndex:r,type:"positional"});return{...t,positionals:o,tokens:a}},pushExtra:(t,e,r)=>{let o=t.positionals.concat({value:e,extra:!0}),a=t.tokens.concat({segmentIndex:r,type:"positional"});return{...t,positionals:o,tokens:a}},pushExtraNoLimits:(t,e,r)=>{let o=t.positionals.concat({value:e,extra:el}),a=t.tokens.concat({segmentIndex:r,type:"positional"});return{...t,positionals:o,tokens:a}},pushTrue:(t,e,r,o)=>{let a=t.options.concat({name:o,value:!0}),n=t.tokens.concat({segmentIndex:r,type:"option",option:o});return{...t,options:a,tokens:n}},pushFalse:(t,e,r,o)=>{let a=t.options.concat({name:o,value:!1}),n=t.tokens.concat({segmentIndex:r,type:"option",option:o});return{...t,options:a,tokens:n}},pushUndefined:(t,e,r,o)=>{let a=t.options.concat({name:e,value:void 0}),n=t.tokens.concat({segmentIndex:r,type:"option",option:e});return{...t,options:a,tokens:n}},pushStringValue:(t,e,r)=>{var o;let a=t.options[t.options.length-1],n=t.options.slice(),u=t.tokens.concat({segmentIndex:r,type:"value"});return a.value=((o=a.value)!==null&&o!==void 0?o:[]).concat([e]),{...t,options:n,tokens:u}},setStringValue:(t,e,r)=>{let o=t.options[t.options.length-1],a=t.options.slice(),n=t.tokens.concat({segmentIndex:r,type:"value"});return o.value=e,{...t,options:a,tokens:n}},inhibateOptions:t=>({...t,ignoreOptions:!0}),useHelp:(t,e,r,o)=>{let[,,a]=e.match(DT);return typeof a<"u"?{...t,options:[{name:"-c",value:String(o)},{name:"-i",value:a}]}:{...t,options:[{name:"-c",value:String(o)}]}},setError:(t,e,r,o)=>e===Hn.EndOfInput||e===Hn.EndOfPartialInput?{...t,errorMessage:`${o}.`}:{...t,errorMessage:`${o} ("${e}").`},setOptionArityError:(t,e)=>{let r=t.options[t.options.length-1];return{...t,errorMessage:`Not enough arguments to option ${r.name}.`}}},el=Symbol(),_T=class{constructor(e,r){this.allOptionNames=new Map,this.arity={leading:[],trailing:[],extra:[],proxy:!1},this.options=[],this.paths=[],this.cliIndex=e,this.cliOpts=r}addPath(e){this.paths.push(e)}setArity({leading:e=this.arity.leading,trailing:r=this.arity.trailing,extra:o=this.arity.extra,proxy:a=this.arity.proxy}){Object.assign(this.arity,{leading:e,trailing:r,extra:o,proxy:a})}addPositional({name:e="arg",required:r=!0}={}){if(!r&&this.arity.extra===el)throw new Error("Optional parameters cannot be declared when using .rest() or .proxy()");if(!r&&this.arity.trailing.length>0)throw new Error("Optional parameters cannot be declared after the required trailing positional arguments");!r&&this.arity.extra!==el?this.arity.extra.push(e):this.arity.extra!==el&&this.arity.extra.length===0?this.arity.leading.push(e):this.arity.trailing.push(e)}addRest({name:e="arg",required:r=0}={}){if(this.arity.extra===el)throw new Error("Infinite lists cannot be declared multiple times in the same command");if(this.arity.trailing.length>0)throw new Error("Infinite lists cannot be declared after the required trailing positional arguments");for(let o=0;o<r;++o)this.addPositional({name:e});this.arity.extra=el}addProxy({required:e=0}={}){this.addRest({required:e}),this.arity.proxy=!0}addOption({names:e,description:r,arity:o=0,hidden:a=!1,required:n=!1,allowBinding:u=!0}){if(!u&&o>1)throw new Error("The arity cannot be higher than 1 when the option only supports the --arg=value syntax");if(!Number.isInteger(o))throw new Error(`The arity must be an integer, got ${o}`);if(o<0)throw new Error(`The arity must be positive, got ${o}`);let A=e.reduce((p,h)=>h.length>p.length?h:p,"");for(let p of e)this.allOptionNames.set(p,A);this.options.push({preferredName:A,nameSet:e,description:r,arity:o,hidden:a,required:n,allowBinding:u})}setContext(e){this.context=e}usage({detailed:e=!0,inlineOptions:r=!0}={}){let o=[this.cliOpts.binaryName],a=[];if(this.paths.length>0&&o.push(...this.paths[0]),e){for(let{preferredName:u,nameSet:A,arity:p,hidden:h,description:E,required:I}of this.options){if(h)continue;let v=[];for(let C=0;C<p;++C)v.push(` #${C}`);let x=`${A.join(",")}${v.join("")}`;!r&&E?a.push({preferredName:u,nameSet:A,definition:x,description:E,required:I}):o.push(I?`<${x}>`:`[${x}]`)}o.push(...this.arity.leading.map(u=>`<${u}>`)),this.arity.extra===el?o.push("..."):o.push(...this.arity.extra.map(u=>`[${u}]`)),o.push(...this.arity.trailing.map(u=>`<${u}>`))}return{usage:o.join(" "),options:a}}compile(){if(typeof this.context>"u")throw new Error("Assertion failed: No context attached");let e=yV(),r=cn.InitialNode,o=this.usage().usage,a=this.options.filter(A=>A.required).map(A=>A.nameSet);r=Oc(e,$a()),Jo(e,cn.InitialNode,Hn.StartOfInput,r,["setCandidateState",{candidateUsage:o,requiredOptions:a}]);let n=this.arity.proxy?"always":"isNotOptionLike",u=this.paths.length>0?this.paths:[[]];for(let A of u){let p=r;if(A.length>0){let v=Oc(e,$a());wy(e,p,v),this.registerOptions(e,v),p=v}for(let v=0;v<A.length;++v){let x=Oc(e,$a());Jo(e,p,A[v],x,"pushPath"),p=x}if(this.arity.leading.length>0||!this.arity.proxy){let v=Oc(e,$a());Ps(e,p,"isHelp",v,["useHelp",this.cliIndex]),Ps(e,v,"always",v,"pushExtra"),Jo(e,v,Hn.EndOfInput,cn.SuccessNode,["setSelectedIndex",rd]),this.registerOptions(e,p)}this.arity.leading.length>0&&(Jo(e,p,Hn.EndOfInput,cn.ErrorNode,["setError","Not enough positional arguments"]),Jo(e,p,Hn.EndOfPartialInput,cn.SuccessNode,["setPartialIndex",this.cliIndex]));let h=p;for(let v=0;v<this.arity.leading.length;++v){let x=Oc(e,$a());(!this.arity.proxy||v+1!==this.arity.leading.length)&&this.registerOptions(e,x),(this.arity.trailing.length>0||v+1!==this.arity.leading.length)&&(Jo(e,x,Hn.EndOfInput,cn.ErrorNode,["setError","Not enough positional arguments"]),Jo(e,x,Hn.EndOfPartialInput,cn.SuccessNode,["setPartialIndex",this.cliIndex])),Ps(e,h,"isNotOptionLike",x,"pushPositional"),h=x}let E=h;if(this.arity.extra===el||this.arity.extra.length>0){let v=Oc(e,$a());if(wy(e,h,v),this.arity.extra===el){let x=Oc(e,$a());this.arity.proxy||this.registerOptions(e,x),Ps(e,h,n,x,"pushExtraNoLimits"),Ps(e,x,n,x,"pushExtraNoLimits"),wy(e,x,v)}else for(let x=0;x<this.arity.extra.length;++x){let C=Oc(e,$a());(!this.arity.proxy||x>0)&&this.registerOptions(e,C),Ps(e,E,n,C,"pushExtra"),wy(e,C,v),E=C}E=v}this.arity.trailing.length>0&&(Jo(e,E,Hn.EndOfInput,cn.ErrorNode,["setError","Not enough positional arguments"]),Jo(e,E,Hn.EndOfPartialInput,cn.SuccessNode,["setPartialIndex",this.cliIndex]));let I=E;for(let v=0;v<this.arity.trailing.length;++v){let x=Oc(e,$a());this.arity.proxy||this.registerOptions(e,x),v+1<this.arity.trailing.length&&(Jo(e,x,Hn.EndOfInput,cn.ErrorNode,["setError","Not enough positional arguments"]),Jo(e,x,Hn.EndOfPartialInput,cn.SuccessNode,["setPartialIndex",this.cliIndex])),Ps(e,I,"isNotOptionLike",x,"pushPositional"),I=x}Ps(e,I,n,cn.ErrorNode,["setError","Extraneous positional argument"]),Jo(e,I,Hn.EndOfInput,cn.SuccessNode,["setSelectedIndex",this.cliIndex]),Jo(e,I,Hn.EndOfPartialInput,cn.SuccessNode,["setSelectedIndex",this.cliIndex])}return{machine:e,context:this.context}}registerOptions(e,r){Ps(e,r,["isOption","--"],r,"inhibateOptions"),Ps(e,r,["isBatchOption",this.allOptionNames],r,["pushBatch",this.allOptionNames]),Ps(e,r,["isBoundOption",this.allOptionNames,this.options],r,"pushBound"),Ps(e,r,["isUnsupportedOption",this.allOptionNames],cn.ErrorNode,["setError","Unsupported option name"]),Ps(e,r,["isInvalidOption"],cn.ErrorNode,["setError","Invalid option name"]);for(let o of this.options)if(o.arity===0)for(let a of o.nameSet)Ps(e,r,["isOption",a],r,["pushTrue",o.preferredName]),a.startsWith("--")&&!a.startsWith("--no-")&&Ps(e,r,["isNegatedOption",a],r,["pushFalse",o.preferredName]);else{let a=Oc(e,$a());for(let n of o.nameSet)Ps(e,r,["isOption",n],a,["pushUndefined",o.preferredName]);for(let n=0;n<o.arity;++n){let u=Oc(e,$a());Jo(e,a,Hn.EndOfInput,cn.ErrorNode,"setOptionArityError"),Jo(e,a,Hn.EndOfPartialInput,cn.ErrorNode,"setOptionArityError"),Ps(e,a,"isOptionLike",cn.ErrorNode,"setOptionArityError");let A=o.arity===1?"setStringValue":"pushStringValue";Ps(e,a,"isNotOptionLike",u,A),a=u}wy(e,a,r)}}},Iy=class{constructor({binaryName:e="..."}={}){this.builders=[],this.opts={binaryName:e}}static build(e,r={}){return new Iy(r).commands(e).compile()}getBuilderByIndex(e){if(!(e>=0&&e<this.builders.length))throw new Error(`Assertion failed: Out-of-bound command index (${e})`);return this.builders[e]}commands(e){for(let r of e)r(this.command());return this}command(){let e=new _T(this.builders.length,this.opts);return this.builders.push(e),e}compile(){let e=[],r=[];for(let a of this.builders){let{machine:n,context:u}=a.compile();e.push(n),r.push(u)}let o=Hje(e);return jje(o),{machine:o,contexts:r,process:(a,{partial:n}={})=>{let u=n?Hn.EndOfPartialInput:Hn.EndOfInput;return Yje(o,a,{endToken:u})}}}}});function IV(){return cS.default&&"getColorDepth"in cS.default.WriteStream.prototype?cS.default.WriteStream.prototype.getColorDepth():process.env.FORCE_COLOR==="0"?1:process.env.FORCE_COLOR==="1"||typeof process.stdout<"u"&&process.stdout.isTTY?8:1}function BV(t){let e=wV;if(typeof e>"u"){if(t.stdout===process.stdout&&t.stderr===process.stderr)return null;let{AsyncLocalStorage:r}=ve("async_hooks");e=wV=new r;let o=process.stdout._write;process.stdout._write=function(n,u,A){let p=e.getStore();return typeof p>"u"?o.call(this,n,u,A):p.stdout.write(n,u,A)};let a=process.stderr._write;process.stderr._write=function(n,u,A){let p=e.getStore();return typeof p>"u"?a.call(this,n,u,A):p.stderr.write(n,u,A)}}return r=>e.run(t,r)}var cS,wV,vV=Et(()=>{cS=$e(ve("tty"),1)});var By,DV=Et(()=>{Vp();By=class extends nt{constructor(e){super(),this.contexts=e,this.commands=[]}static from(e,r){let o=new By(r);o.path=e.path;for(let a of e.options)switch(a.name){case"-c":o.commands.push(Number(a.value));break;case"-i":o.index=Number(a.value);break}return o}async execute(){let e=this.commands;if(typeof this.index<"u"&&this.index>=0&&this.index<e.length&&(e=[e[this.index]]),e.length===0)this.context.stdout.write(this.cli.usage());else if(e.length===1)this.context.stdout.write(this.cli.usage(this.contexts[e[0]].commandClass,{detailed:!0}));else if(e.length>1){this.context.stdout.write(`Multiple commands match your selection:
+`),this.context.stdout.write(`
+`);let r=0;for(let o of this.commands)this.context.stdout.write(this.cli.usage(this.contexts[o].commandClass,{prefix:`${r++}. `.padStart(5)}));this.context.stdout.write(`
+`),this.context.stdout.write(`Run again with -h=<index> to see the longer details of any of those commands.
+`)}}}});async function bV(...t){let{resolvedOptions:e,resolvedCommandClasses:r,resolvedArgv:o,resolvedContext:a}=kV(t);return as.from(r,e).runExit(o,a)}async function xV(...t){let{resolvedOptions:e,resolvedCommandClasses:r,resolvedArgv:o,resolvedContext:a}=kV(t);return as.from(r,e).run(o,a)}function kV(t){let e,r,o,a;switch(typeof process<"u"&&typeof process.argv<"u"&&(o=process.argv.slice(2)),t.length){case 1:r=t[0];break;case 2:t[0]&&t[0].prototype instanceof nt||Array.isArray(t[0])?(r=t[0],Array.isArray(t[1])?o=t[1]:a=t[1]):(e=t[0],r=t[1]);break;case 3:Array.isArray(t[2])?(e=t[0],r=t[1],o=t[2]):t[0]&&t[0].prototype instanceof nt||Array.isArray(t[0])?(r=t[0],o=t[1],a=t[2]):(e=t[0],r=t[1],a=t[2]);break;default:e=t[0],r=t[1],o=t[2],a=t[3];break}if(typeof o>"u")throw new Error("The argv parameter must be provided when running Clipanion outside of a Node context");return{resolvedOptions:e,resolvedCommandClasses:r,resolvedArgv:o,resolvedContext:a}}function PV(t){return t()}var SV,as,QV=Et(()=>{$D();lS();kT();vV();Vp();DV();SV=Symbol("clipanion/errorCommand");as=class{constructor({binaryLabel:e,binaryName:r="...",binaryVersion:o,enableCapture:a=!1,enableColors:n}={}){this.registrations=new Map,this.builder=new Iy({binaryName:r}),this.binaryLabel=e,this.binaryName=r,this.binaryVersion=o,this.enableCapture=a,this.enableColors=n}static from(e,r={}){let o=new as(r),a=Array.isArray(e)?e:[e];for(let n of a)o.register(n);return o}register(e){var r;let o=new Map,a=new e;for(let p in a){let h=a[p];typeof h=="object"&&h!==null&&h[nt.isOption]&&o.set(p,h)}let n=this.builder.command(),u=n.cliIndex,A=(r=e.paths)!==null&&r!==void 0?r:a.paths;if(typeof A<"u")for(let p of A)n.addPath(p);this.registrations.set(e,{specs:o,builder:n,index:u});for(let[p,{definition:h}]of o.entries())h(n,p);n.setContext({commandClass:e})}process(e,r){let{input:o,context:a,partial:n}=typeof e=="object"&&Array.isArray(e)?{input:e,context:r}:e,{contexts:u,process:A}=this.builder.compile(),p=A(o,{partial:n}),h={...as.defaultContext,...a};switch(p.selectedIndex){case rd:{let E=By.from(p,u);return E.context=h,E.tokens=p.tokens,E}default:{let{commandClass:E}=u[p.selectedIndex],I=this.registrations.get(E);if(typeof I>"u")throw new Error("Assertion failed: Expected the command class to have been registered.");let v=new E;v.context=h,v.tokens=p.tokens,v.path=p.path;try{for(let[x,{transformer:C}]of I.specs.entries())v[x]=C(I.builder,x,p,h);return v}catch(x){throw x[SV]=v,x}}break}}async run(e,r){var o,a;let n,u={...as.defaultContext,...r},A=(o=this.enableColors)!==null&&o!==void 0?o:u.colorDepth>1;if(!Array.isArray(e))n=e;else try{n=this.process(e,u)}catch(E){return u.stdout.write(this.error(E,{colored:A})),1}if(n.help)return u.stdout.write(this.usage(n,{colored:A,detailed:!0})),0;n.context=u,n.cli={binaryLabel:this.binaryLabel,binaryName:this.binaryName,binaryVersion:this.binaryVersion,enableCapture:this.enableCapture,enableColors:this.enableColors,definitions:()=>this.definitions(),definition:E=>this.definition(E),error:(E,I)=>this.error(E,I),format:E=>this.format(E),process:(E,I)=>this.process(E,{...u,...I}),run:(E,I)=>this.run(E,{...u,...I}),usage:(E,I)=>this.usage(E,I)};let p=this.enableCapture&&(a=BV(u))!==null&&a!==void 0?a:PV,h;try{h=await p(()=>n.validateAndExecute().catch(E=>n.catch(E).then(()=>0)))}catch(E){return u.stdout.write(this.error(E,{colored:A,command:n})),1}return h}async runExit(e,r){process.exitCode=await this.run(e,r)}definition(e,{colored:r=!1}={}){if(!e.usage)return null;let{usage:o}=this.getUsageByRegistration(e,{detailed:!1}),{usage:a,options:n}=this.getUsageByRegistration(e,{detailed:!0,inlineOptions:!1}),u=typeof e.usage.category<"u"?Do(e.usage.category,{format:this.format(r),paragraphs:!1}):void 0,A=typeof e.usage.description<"u"?Do(e.usage.description,{format:this.format(r),paragraphs:!1}):void 0,p=typeof e.usage.details<"u"?Do(e.usage.details,{format:this.format(r),paragraphs:!0}):void 0,h=typeof e.usage.examples<"u"?e.usage.examples.map(([E,I])=>[Do(E,{format:this.format(r),paragraphs:!1}),I.replace(/\$0/g,this.binaryName)]):void 0;return{path:o,usage:a,category:u,description:A,details:p,examples:h,options:n}}definitions({colored:e=!1}={}){let r=[];for(let o of this.registrations.keys()){let a=this.definition(o,{colored:e});!a||r.push(a)}return r}usage(e=null,{colored:r,detailed:o=!1,prefix:a="$ "}={}){var n;if(e===null){for(let p of this.registrations.keys()){let h=p.paths,E=typeof p.usage<"u";if(!h||h.length===0||h.length===1&&h[0].length===0||((n=h?.some(x=>x.length===0))!==null&&n!==void 0?n:!1))if(e){e=null;break}else e=p;else if(E){e=null;continue}}e&&(o=!0)}let u=e!==null&&e instanceof nt?e.constructor:e,A="";if(u)if(o){let{description:p="",details:h="",examples:E=[]}=u.usage||{};p!==""&&(A+=Do(p,{format:this.format(r),paragraphs:!1}).replace(/^./,x=>x.toUpperCase()),A+=`
+`),(h!==""||E.length>0)&&(A+=`${this.format(r).header("Usage")}
+`,A+=`
+`);let{usage:I,options:v}=this.getUsageByRegistration(u,{inlineOptions:!1});if(A+=`${this.format(r).bold(a)}${I}
+`,v.length>0){A+=`
+`,A+=`${this.format(r).header("Options")}
+`;let x=v.reduce((C,R)=>Math.max(C,R.definition.length),0);A+=`
+`;for(let{definition:C,description:R}of v)A+=`  ${this.format(r).bold(C.padEnd(x))}    ${Do(R,{format:this.format(r),paragraphs:!1})}`}if(h!==""&&(A+=`
+`,A+=`${this.format(r).header("Details")}
+`,A+=`
+`,A+=Do(h,{format:this.format(r),paragraphs:!0})),E.length>0){A+=`
+`,A+=`${this.format(r).header("Examples")}
+`;for(let[x,C]of E)A+=`
+`,A+=Do(x,{format:this.format(r),paragraphs:!1}),A+=`${C.replace(/^/m,`  ${this.format(r).bold(a)}`).replace(/\$0/g,this.binaryName)}
+`}}else{let{usage:p}=this.getUsageByRegistration(u);A+=`${this.format(r).bold(a)}${p}
+`}else{let p=new Map;for(let[v,{index:x}]of this.registrations.entries()){if(typeof v.usage>"u")continue;let C=typeof v.usage.category<"u"?Do(v.usage.category,{format:this.format(r),paragraphs:!1}):null,R=p.get(C);typeof R>"u"&&p.set(C,R=[]);let{usage:L}=this.getUsageByIndex(x);R.push({commandClass:v,usage:L})}let h=Array.from(p.keys()).sort((v,x)=>v===null?-1:x===null?1:v.localeCompare(x,"en",{usage:"sort",caseFirst:"upper"})),E=typeof this.binaryLabel<"u",I=typeof this.binaryVersion<"u";E||I?(E&&I?A+=`${this.format(r).header(`${this.binaryLabel} - ${this.binaryVersion}`)}
+
+`:E?A+=`${this.format(r).header(`${this.binaryLabel}`)}
+`:A+=`${this.format(r).header(`${this.binaryVersion}`)}
+`,A+=`  ${this.format(r).bold(a)}${this.binaryName} <command>
+`):A+=`${this.format(r).bold(a)}${this.binaryName} <command>
+`;for(let v of h){let x=p.get(v).slice().sort((R,L)=>R.usage.localeCompare(L.usage,"en",{usage:"sort",caseFirst:"upper"})),C=v!==null?v.trim():"General commands";A+=`
+`,A+=`${this.format(r).header(`${C}`)}
+`;for(let{commandClass:R,usage:L}of x){let U=R.usage.description||"undocumented";A+=`
+`,A+=`  ${this.format(r).bold(L)}
+`,A+=`    ${Do(U,{format:this.format(r),paragraphs:!1})}`}}A+=`
+`,A+=Do("You can also print more details about any of these commands by calling them with the `-h,--help` flag right after the command name.",{format:this.format(r),paragraphs:!0})}return A}error(e,r){var o,{colored:a,command:n=(o=e[SV])!==null&&o!==void 0?o:null}=r===void 0?{}:r;(!e||typeof e!="object"||!("stack"in e))&&(e=new Error(`Execution failed with a non-error rejection (rejected value: ${JSON.stringify(e)})`));let u="",A=e.name.replace(/([a-z])([A-Z])/g,"$1 $2");A==="Error"&&(A="Internal Error"),u+=`${this.format(a).error(A)}: ${e.message}
+`;let p=e.clipanion;return typeof p<"u"?p.type==="usage"&&(u+=`
+`,u+=this.usage(n)):e.stack&&(u+=`${e.stack.replace(/^.*\n/,"")}
+`),u}format(e){var r;return((r=e??this.enableColors)!==null&&r!==void 0?r:as.defaultContext.colorDepth>1)?uV:AV}getUsageByRegistration(e,r){let o=this.registrations.get(e);if(typeof o>"u")throw new Error("Assertion failed: Unregistered command");return this.getUsageByIndex(o.index,r)}getUsageByIndex(e,r){return this.builder.getBuilderByIndex(e).usage(r)}};as.defaultContext={env:process.env,stdin:process.stdin,stdout:process.stdout,stderr:process.stderr,colorDepth:IV()}});var uI,FV=Et(()=>{Vp();uI=class extends nt{async execute(){this.context.stdout.write(`${JSON.stringify(this.cli.definitions(),null,2)}
+`)}};uI.paths=[["--clipanion=definitions"]]});var AI,RV=Et(()=>{Vp();AI=class extends nt{async execute(){this.context.stdout.write(this.cli.usage())}};AI.paths=[["-h"],["--help"]]});function uS(t={}){return Ko({definition(e,r){var o;e.addProxy({name:(o=t.name)!==null&&o!==void 0?o:r,required:t.required})},transformer(e,r,o){return o.positionals.map(({value:a})=>a)}})}var HT=Et(()=>{Ef()});var fI,TV=Et(()=>{Vp();HT();fI=class extends nt{constructor(){super(...arguments),this.args=uS()}async execute(){this.context.stdout.write(`${JSON.stringify(this.cli.process(this.args).tokens,null,2)}
+`)}};fI.paths=[["--clipanion=tokens"]]});var pI,NV=Et(()=>{Vp();pI=class extends nt{async execute(){var e;this.context.stdout.write(`${(e=this.cli.binaryVersion)!==null&&e!==void 0?e:"<unknown>"}
+`)}};pI.paths=[["-v"],["--version"]]});var jT={};Vt(jT,{DefinitionsCommand:()=>uI,HelpCommand:()=>AI,TokensCommand:()=>fI,VersionCommand:()=>pI});var LV=Et(()=>{FV();RV();TV();NV()});function OV(t,e,r){let[o,a]=Gu(e,r??{}),{arity:n=1}=a,u=t.split(","),A=new Set(u);return Ko({definition(p){p.addOption({names:u,arity:n,hidden:a?.hidden,description:a?.description,required:a.required})},transformer(p,h,E){let I,v=typeof o<"u"?[...o]:void 0;for(let{name:x,value:C}of E.options)!A.has(x)||(I=x,v=v??[],v.push(C));return typeof v<"u"?nd(I??h,v,a.validator):v}})}var MV=Et(()=>{Ef()});function UV(t,e,r){let[o,a]=Gu(e,r??{}),n=t.split(","),u=new Set(n);return Ko({definition(A){A.addOption({names:n,allowBinding:!1,arity:0,hidden:a.hidden,description:a.description,required:a.required})},transformer(A,p,h){let E=o;for(let{name:I,value:v}of h.options)!u.has(I)||(E=v);return E}})}var _V=Et(()=>{Ef()});function HV(t,e,r){let[o,a]=Gu(e,r??{}),n=t.split(","),u=new Set(n);return Ko({definition(A){A.addOption({names:n,allowBinding:!1,arity:0,hidden:a.hidden,description:a.description,required:a.required})},transformer(A,p,h){let E=o;for(let{name:I,value:v}of h.options)!u.has(I)||(E??(E=0),v?E+=1:E=0);return E}})}var jV=Et(()=>{Ef()});function GV(t={}){return Ko({definition(e,r){var o;e.addRest({name:(o=t.name)!==null&&o!==void 0?o:r,required:t.required})},transformer(e,r,o){let a=u=>{let A=o.positionals[u];return A.extra===el||A.extra===!1&&u<e.arity.leading.length},n=0;for(;n<o.positionals.length&&a(n);)n+=1;return o.positionals.splice(0,n).map(({value:u})=>u)}})}var qV=Et(()=>{lS();Ef()});function Xje(t,e,r){let[o,a]=Gu(e,r??{}),{arity:n=1}=a,u=t.split(","),A=new Set(u);return Ko({definition(p){p.addOption({names:u,arity:a.tolerateBoolean?0:n,hidden:a.hidden,description:a.description,required:a.required})},transformer(p,h,E,I){let v,x=o;typeof a.env<"u"&&I.env[a.env]&&(v=a.env,x=I.env[a.env]);for(let{name:C,value:R}of E.options)!A.has(C)||(v=C,x=R);return typeof x=="string"?nd(v??h,x,a.validator):x}})}function Zje(t={}){let{required:e=!0}=t;return Ko({definition(r,o){var a;r.addPositional({name:(a=t.name)!==null&&a!==void 0?a:o,required:t.required})},transformer(r,o,a){var n;for(let u=0;u<a.positionals.length;++u){if(a.positionals[u].extra===el||e&&a.positionals[u].extra===!0||!e&&a.positionals[u].extra===!1)continue;let[A]=a.positionals.splice(u,1);return nd((n=t.name)!==null&&n!==void 0?n:o,A.value,t.validator)}}})}function YV(t,...e){return typeof t=="string"?Xje(t,...e):Zje(t)}var WV=Et(()=>{lS();Ef()});var ge={};Vt(ge,{Array:()=>OV,Boolean:()=>UV,Counter:()=>HV,Proxy:()=>uS,Rest:()=>GV,String:()=>YV,applyValidator:()=>nd,cleanValidationError:()=>rS,formatError:()=>iI,isOptionSymbol:()=>nI,makeCommandOption:()=>Ko,rerouteArguments:()=>Gu});var KV=Et(()=>{Ef();HT();MV();_V();jV();qV();WV()});var hI={};Vt(hI,{Builtins:()=>jT,Cli:()=>as,Command:()=>nt,Option:()=>ge,UsageError:()=>it,formatMarkdownish:()=>Do,run:()=>xV,runExit:()=>bV});var jt=Et(()=>{tS();kT();Vp();QV();LV();KV()});var VV=_((Pkt,$je)=>{$je.exports={name:"dotenv",version:"16.3.1",description:"Loads environment variables from .env file",main:"lib/main.js",types:"lib/main.d.ts",exports:{".":{types:"./lib/main.d.ts",require:"./lib/main.js",default:"./lib/main.js"},"./config":"./config.js","./config.js":"./config.js","./lib/env-options":"./lib/env-options.js","./lib/env-options.js":"./lib/env-options.js","./lib/cli-options":"./lib/cli-options.js","./lib/cli-options.js":"./lib/cli-options.js","./package.json":"./package.json"},scripts:{"dts-check":"tsc --project tests/types/tsconfig.json",lint:"standard","lint-readme":"standard-markdown",pretest:"npm run lint && npm run dts-check",test:"tap tests/*.js --100 -Rspec",prerelease:"npm test",release:"standard-version"},repository:{type:"git",url:"git://github.com/motdotla/dotenv.git"},funding:"https://github.com/motdotla/dotenv?sponsor=1",keywords:["dotenv","env",".env","environment","variables","config","settings"],readmeFilename:"README.md",license:"BSD-2-Clause",devDependencies:{"@definitelytyped/dtslint":"^0.0.133","@types/node":"^18.11.3",decache:"^4.6.1",sinon:"^14.0.1",standard:"^17.0.0","standard-markdown":"^7.1.0","standard-version":"^9.5.0",tap:"^16.3.0",tar:"^6.1.11",typescript:"^4.8.4"},engines:{node:">=12"},browser:{fs:!1}}});var ZV=_((bkt,Cf)=>{var JV=ve("fs"),qT=ve("path"),eGe=ve("os"),tGe=ve("crypto"),rGe=VV(),YT=rGe.version,nGe=/(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/mg;function iGe(t){let e={},r=t.toString();r=r.replace(/\r\n?/mg,`
+`);let o;for(;(o=nGe.exec(r))!=null;){let a=o[1],n=o[2]||"";n=n.trim();let u=n[0];n=n.replace(/^(['"`])([\s\S]*)\1$/mg,"$2"),u==='"'&&(n=n.replace(/\\n/g,`
+`),n=n.replace(/\\r/g,"\r")),e[a]=n}return e}function sGe(t){let e=XV(t),r=bs.configDotenv({path:e});if(!r.parsed)throw new Error(`MISSING_DATA: Cannot parse ${e} for an unknown reason`);let o=zV(t).split(","),a=o.length,n;for(let u=0;u<a;u++)try{let A=o[u].trim(),p=lGe(r,A);n=bs.decrypt(p.ciphertext,p.key);break}catch(A){if(u+1>=a)throw A}return bs.parse(n)}function oGe(t){console.log(`[dotenv@${YT}][INFO] ${t}`)}function aGe(t){console.log(`[dotenv@${YT}][WARN] ${t}`)}function GT(t){console.log(`[dotenv@${YT}][DEBUG] ${t}`)}function zV(t){return t&&t.DOTENV_KEY&&t.DOTENV_KEY.length>0?t.DOTENV_KEY:process.env.DOTENV_KEY&&process.env.DOTENV_KEY.length>0?process.env.DOTENV_KEY:""}function lGe(t,e){let r;try{r=new URL(e)}catch(A){throw A.code==="ERR_INVALID_URL"?new Error("INVALID_DOTENV_KEY: Wrong format. Must be in valid uri format like dotenv://:key_1234@dotenv.org/vault/.env.vault?environment=development"):A}let o=r.password;if(!o)throw new Error("INVALID_DOTENV_KEY: Missing key part");let a=r.searchParams.get("environment");if(!a)throw new Error("INVALID_DOTENV_KEY: Missing environment part");let n=`DOTENV_VAULT_${a.toUpperCase()}`,u=t.parsed[n];if(!u)throw new Error(`NOT_FOUND_DOTENV_ENVIRONMENT: Cannot locate environment ${n} in your .env.vault file.`);return{ciphertext:u,key:o}}function XV(t){let e=qT.resolve(process.cwd(),".env");return t&&t.path&&t.path.length>0&&(e=t.path),e.endsWith(".vault")?e:`${e}.vault`}function cGe(t){return t[0]==="~"?qT.join(eGe.homedir(),t.slice(1)):t}function uGe(t){oGe("Loading env from encrypted .env.vault");let e=bs._parseVault(t),r=process.env;return t&&t.processEnv!=null&&(r=t.processEnv),bs.populate(r,e,t),{parsed:e}}function AGe(t){let e=qT.resolve(process.cwd(),".env"),r="utf8",o=Boolean(t&&t.debug);t&&(t.path!=null&&(e=cGe(t.path)),t.encoding!=null&&(r=t.encoding));try{let a=bs.parse(JV.readFileSync(e,{encoding:r})),n=process.env;return t&&t.processEnv!=null&&(n=t.processEnv),bs.populate(n,a,t),{parsed:a}}catch(a){return o&&GT(`Failed to load ${e} ${a.message}`),{error:a}}}function fGe(t){let e=XV(t);return zV(t).length===0?bs.configDotenv(t):JV.existsSync(e)?bs._configVault(t):(aGe(`You set DOTENV_KEY but you are missing a .env.vault file at ${e}. Did you forget to build it?`),bs.configDotenv(t))}function pGe(t,e){let r=Buffer.from(e.slice(-64),"hex"),o=Buffer.from(t,"base64"),a=o.slice(0,12),n=o.slice(-16);o=o.slice(12,-16);try{let u=tGe.createDecipheriv("aes-256-gcm",r,a);return u.setAuthTag(n),`${u.update(o)}${u.final()}`}catch(u){let A=u instanceof RangeError,p=u.message==="Invalid key length",h=u.message==="Unsupported state or unable to authenticate data";if(A||p){let E="INVALID_DOTENV_KEY: It must be 64 characters long (or more)";throw new Error(E)}else if(h){let E="DECRYPTION_FAILED: Please check your DOTENV_KEY";throw new Error(E)}else throw console.error("Error: ",u.code),console.error("Error: ",u.message),u}}function hGe(t,e,r={}){let o=Boolean(r&&r.debug),a=Boolean(r&&r.override);if(typeof e!="object")throw new Error("OBJECT_REQUIRED: Please check the processEnv argument being passed to populate");for(let n of Object.keys(e))Object.prototype.hasOwnProperty.call(t,n)?(a===!0&&(t[n]=e[n]),o&&GT(a===!0?`"${n}" is already defined and WAS overwritten`:`"${n}" is already defined and was NOT overwritten`)):t[n]=e[n]}var bs={configDotenv:AGe,_configVault:uGe,_parseVault:sGe,config:fGe,decrypt:pGe,parse:iGe,populate:hGe};Cf.exports.configDotenv=bs.configDotenv;Cf.exports._configVault=bs._configVault;Cf.exports._parseVault=bs._parseVault;Cf.exports.config=bs.config;Cf.exports.decrypt=bs.decrypt;Cf.exports.parse=bs.parse;Cf.exports.populate=bs.populate;Cf.exports=bs});var eJ=_((xkt,$V)=>{"use strict";$V.exports=(t,...e)=>new Promise(r=>{r(t(...e))})});var id=_((kkt,WT)=>{"use strict";var gGe=eJ(),tJ=t=>{if(t<1)throw new TypeError("Expected `concurrency` to be a number from 1 and up");let e=[],r=0,o=()=>{r--,e.length>0&&e.shift()()},a=(A,p,...h)=>{r++;let E=gGe(A,...h);p(E),E.then(o,o)},n=(A,p,...h)=>{r<t?a(A,p,...h):e.push(a.bind(null,A,p,...h))},u=(A,...p)=>new Promise(h=>n(A,h,...p));return Object.defineProperties(u,{activeCount:{get:()=>r},pendingCount:{get:()=>e.length}}),u};WT.exports=tJ;WT.exports.default=tJ});function Wu(t){return`YN${t.toString(10).padStart(4,"0")}`}function AS(t){let e=Number(t.slice(2));if(typeof wr[e]>"u")throw new Error(`Unknown message name: "${t}"`);return e}var wr,fS=Et(()=>{wr=(Oe=>(Oe[Oe.UNNAMED=0]="UNNAMED",Oe[Oe.EXCEPTION=1]="EXCEPTION",Oe[Oe.MISSING_PEER_DEPENDENCY=2]="MISSING_PEER_DEPENDENCY",Oe[Oe.CYCLIC_DEPENDENCIES=3]="CYCLIC_DEPENDENCIES",Oe[Oe.DISABLED_BUILD_SCRIPTS=4]="DISABLED_BUILD_SCRIPTS",Oe[Oe.BUILD_DISABLED=5]="BUILD_DISABLED",Oe[Oe.SOFT_LINK_BUILD=6]="SOFT_LINK_BUILD",Oe[Oe.MUST_BUILD=7]="MUST_BUILD",Oe[Oe.MUST_REBUILD=8]="MUST_REBUILD",Oe[Oe.BUILD_FAILED=9]="BUILD_FAILED",Oe[Oe.RESOLVER_NOT_FOUND=10]="RESOLVER_NOT_FOUND",Oe[Oe.FETCHER_NOT_FOUND=11]="FETCHER_NOT_FOUND",Oe[Oe.LINKER_NOT_FOUND=12]="LINKER_NOT_FOUND",Oe[Oe.FETCH_NOT_CACHED=13]="FETCH_NOT_CACHED",Oe[Oe.YARN_IMPORT_FAILED=14]="YARN_IMPORT_FAILED",Oe[Oe.REMOTE_INVALID=15]="REMOTE_INVALID",Oe[Oe.REMOTE_NOT_FOUND=16]="REMOTE_NOT_FOUND",Oe[Oe.RESOLUTION_PACK=17]="RESOLUTION_PACK",Oe[Oe.CACHE_CHECKSUM_MISMATCH=18]="CACHE_CHECKSUM_MISMATCH",Oe[Oe.UNUSED_CACHE_ENTRY=19]="UNUSED_CACHE_ENTRY",Oe[Oe.MISSING_LOCKFILE_ENTRY=20]="MISSING_LOCKFILE_ENTRY",Oe[Oe.WORKSPACE_NOT_FOUND=21]="WORKSPACE_NOT_FOUND",Oe[Oe.TOO_MANY_MATCHING_WORKSPACES=22]="TOO_MANY_MATCHING_WORKSPACES",Oe[Oe.CONSTRAINTS_MISSING_DEPENDENCY=23]="CONSTRAINTS_MISSING_DEPENDENCY",Oe[Oe.CONSTRAINTS_INCOMPATIBLE_DEPENDENCY=24]="CONSTRAINTS_INCOMPATIBLE_DEPENDENCY",Oe[Oe.CONSTRAINTS_EXTRANEOUS_DEPENDENCY=25]="CONSTRAINTS_EXTRANEOUS_DEPENDENCY",Oe[Oe.CONSTRAINTS_INVALID_DEPENDENCY=26]="CONSTRAINTS_INVALID_DEPENDENCY",Oe[Oe.CANT_SUGGEST_RESOLUTIONS=27]="CANT_SUGGEST_RESOLUTIONS",Oe[Oe.FROZEN_LOCKFILE_EXCEPTION=28]="FROZEN_LOCKFILE_EXCEPTION",Oe[Oe.CROSS_DRIVE_VIRTUAL_LOCAL=29]="CROSS_DRIVE_VIRTUAL_LOCAL",Oe[Oe.FETCH_FAILED=30]="FETCH_FAILED",Oe[Oe.DANGEROUS_NODE_MODULES=31]="DANGEROUS_NODE_MODULES",Oe[Oe.NODE_GYP_INJECTED=32]="NODE_GYP_INJECTED",Oe[Oe.AUTHENTICATION_NOT_FOUND=33]="AUTHENTICATION_NOT_FOUND",Oe[Oe.INVALID_CONFIGURATION_KEY=34]="INVALID_CONFIGURATION_KEY",Oe[Oe.NETWORK_ERROR=35]="NETWORK_ERROR",Oe[Oe.LIFECYCLE_SCRIPT=36]="LIFECYCLE_SCRIPT",Oe[Oe.CONSTRAINTS_MISSING_FIELD=37]="CONSTRAINTS_MISSING_FIELD",Oe[Oe.CONSTRAINTS_INCOMPATIBLE_FIELD=38]="CONSTRAINTS_INCOMPATIBLE_FIELD",Oe[Oe.CONSTRAINTS_EXTRANEOUS_FIELD=39]="CONSTRAINTS_EXTRANEOUS_FIELD",Oe[Oe.CONSTRAINTS_INVALID_FIELD=40]="CONSTRAINTS_INVALID_FIELD",Oe[Oe.AUTHENTICATION_INVALID=41]="AUTHENTICATION_INVALID",Oe[Oe.PROLOG_UNKNOWN_ERROR=42]="PROLOG_UNKNOWN_ERROR",Oe[Oe.PROLOG_SYNTAX_ERROR=43]="PROLOG_SYNTAX_ERROR",Oe[Oe.PROLOG_EXISTENCE_ERROR=44]="PROLOG_EXISTENCE_ERROR",Oe[Oe.STACK_OVERFLOW_RESOLUTION=45]="STACK_OVERFLOW_RESOLUTION",Oe[Oe.AUTOMERGE_FAILED_TO_PARSE=46]="AUTOMERGE_FAILED_TO_PARSE",Oe[Oe.AUTOMERGE_IMMUTABLE=47]="AUTOMERGE_IMMUTABLE",Oe[Oe.AUTOMERGE_SUCCESS=48]="AUTOMERGE_SUCCESS",Oe[Oe.AUTOMERGE_REQUIRED=49]="AUTOMERGE_REQUIRED",Oe[Oe.DEPRECATED_CLI_SETTINGS=50]="DEPRECATED_CLI_SETTINGS",Oe[Oe.PLUGIN_NAME_NOT_FOUND=51]="PLUGIN_NAME_NOT_FOUND",Oe[Oe.INVALID_PLUGIN_REFERENCE=52]="INVALID_PLUGIN_REFERENCE",Oe[Oe.CONSTRAINTS_AMBIGUITY=53]="CONSTRAINTS_AMBIGUITY",Oe[Oe.CACHE_OUTSIDE_PROJECT=54]="CACHE_OUTSIDE_PROJECT",Oe[Oe.IMMUTABLE_INSTALL=55]="IMMUTABLE_INSTALL",Oe[Oe.IMMUTABLE_CACHE=56]="IMMUTABLE_CACHE",Oe[Oe.INVALID_MANIFEST=57]="INVALID_MANIFEST",Oe[Oe.PACKAGE_PREPARATION_FAILED=58]="PACKAGE_PREPARATION_FAILED",Oe[Oe.INVALID_RANGE_PEER_DEPENDENCY=59]="INVALID_RANGE_PEER_DEPENDENCY",Oe[Oe.INCOMPATIBLE_PEER_DEPENDENCY=60]="INCOMPATIBLE_PEER_DEPENDENCY",Oe[Oe.DEPRECATED_PACKAGE=61]="DEPRECATED_PACKAGE",Oe[Oe.INCOMPATIBLE_OS=62]="INCOMPATIBLE_OS",Oe[Oe.INCOMPATIBLE_CPU=63]="INCOMPATIBLE_CPU",Oe[Oe.FROZEN_ARTIFACT_EXCEPTION=64]="FROZEN_ARTIFACT_EXCEPTION",Oe[Oe.TELEMETRY_NOTICE=65]="TELEMETRY_NOTICE",Oe[Oe.PATCH_HUNK_FAILED=66]="PATCH_HUNK_FAILED",Oe[Oe.INVALID_CONFIGURATION_VALUE=67]="INVALID_CONFIGURATION_VALUE",Oe[Oe.UNUSED_PACKAGE_EXTENSION=68]="UNUSED_PACKAGE_EXTENSION",Oe[Oe.REDUNDANT_PACKAGE_EXTENSION=69]="REDUNDANT_PACKAGE_EXTENSION",Oe[Oe.AUTO_NM_SUCCESS=70]="AUTO_NM_SUCCESS",Oe[Oe.NM_CANT_INSTALL_EXTERNAL_SOFT_LINK=71]="NM_CANT_INSTALL_EXTERNAL_SOFT_LINK",Oe[Oe.NM_PRESERVE_SYMLINKS_REQUIRED=72]="NM_PRESERVE_SYMLINKS_REQUIRED",Oe[Oe.UPDATE_LOCKFILE_ONLY_SKIP_LINK=73]="UPDATE_LOCKFILE_ONLY_SKIP_LINK",Oe[Oe.NM_HARDLINKS_MODE_DOWNGRADED=74]="NM_HARDLINKS_MODE_DOWNGRADED",Oe[Oe.PROLOG_INSTANTIATION_ERROR=75]="PROLOG_INSTANTIATION_ERROR",Oe[Oe.INCOMPATIBLE_ARCHITECTURE=76]="INCOMPATIBLE_ARCHITECTURE",Oe[Oe.GHOST_ARCHITECTURE=77]="GHOST_ARCHITECTURE",Oe[Oe.RESOLUTION_MISMATCH=78]="RESOLUTION_MISMATCH",Oe[Oe.PROLOG_LIMIT_EXCEEDED=79]="PROLOG_LIMIT_EXCEEDED",Oe[Oe.NETWORK_DISABLED=80]="NETWORK_DISABLED",Oe[Oe.NETWORK_UNSAFE_HTTP=81]="NETWORK_UNSAFE_HTTP",Oe[Oe.RESOLUTION_FAILED=82]="RESOLUTION_FAILED",Oe[Oe.AUTOMERGE_GIT_ERROR=83]="AUTOMERGE_GIT_ERROR",Oe[Oe.CONSTRAINTS_CHECK_FAILED=84]="CONSTRAINTS_CHECK_FAILED",Oe[Oe.UPDATED_RESOLUTION_RECORD=85]="UPDATED_RESOLUTION_RECORD",Oe[Oe.EXPLAIN_PEER_DEPENDENCIES_CTA=86]="EXPLAIN_PEER_DEPENDENCIES_CTA",Oe[Oe.MIGRATION_SUCCESS=87]="MIGRATION_SUCCESS",Oe[Oe.VERSION_NOTICE=88]="VERSION_NOTICE",Oe[Oe.TIPS_NOTICE=89]="TIPS_NOTICE",Oe[Oe.OFFLINE_MODE_ENABLED=90]="OFFLINE_MODE_ENABLED",Oe))(wr||{})});var gI=_((Fkt,rJ)=>{var dGe="2.0.0",mGe=Number.MAX_SAFE_INTEGER||9007199254740991,yGe=16,EGe=256-6,CGe=["major","premajor","minor","preminor","patch","prepatch","prerelease"];rJ.exports={MAX_LENGTH:256,MAX_SAFE_COMPONENT_LENGTH:yGe,MAX_SAFE_BUILD_LENGTH:EGe,MAX_SAFE_INTEGER:mGe,RELEASE_TYPES:CGe,SEMVER_SPEC_VERSION:dGe,FLAG_INCLUDE_PRERELEASE:1,FLAG_LOOSE:2}});var dI=_((Rkt,nJ)=>{var wGe=typeof process=="object"&&process.env&&process.env.NODE_DEBUG&&/\bsemver\b/i.test(process.env.NODE_DEBUG)?(...t)=>console.error("SEMVER",...t):()=>{};nJ.exports=wGe});var vy=_((wf,iJ)=>{var{MAX_SAFE_COMPONENT_LENGTH:KT,MAX_SAFE_BUILD_LENGTH:IGe,MAX_LENGTH:BGe}=gI(),vGe=dI();wf=iJ.exports={};var DGe=wf.re=[],SGe=wf.safeRe=[],lr=wf.src=[],cr=wf.t={},PGe=0,VT="[a-zA-Z0-9-]",bGe=[["\\s",1],["\\d",BGe],[VT,IGe]],xGe=t=>{for(let[e,r]of bGe)t=t.split(`${e}*`).join(`${e}{0,${r}}`).split(`${e}+`).join(`${e}{1,${r}}`);return t},Jr=(t,e,r)=>{let o=xGe(e),a=PGe++;vGe(t,a,e),cr[t]=a,lr[a]=e,DGe[a]=new RegExp(e,r?"g":void 0),SGe[a]=new RegExp(o,r?"g":void 0)};Jr("NUMERICIDENTIFIER","0|[1-9]\\d*");Jr("NUMERICIDENTIFIERLOOSE","\\d+");Jr("NONNUMERICIDENTIFIER",`\\d*[a-zA-Z-]${VT}*`);Jr("MAINVERSION",`(${lr[cr.NUMERICIDENTIFIER]})\\.(${lr[cr.NUMERICIDENTIFIER]})\\.(${lr[cr.NUMERICIDENTIFIER]})`);Jr("MAINVERSIONLOOSE",`(${lr[cr.NUMERICIDENTIFIERLOOSE]})\\.(${lr[cr.NUMERICIDENTIFIERLOOSE]})\\.(${lr[cr.NUMERICIDENTIFIERLOOSE]})`);Jr("PRERELEASEIDENTIFIER",`(?:${lr[cr.NUMERICIDENTIFIER]}|${lr[cr.NONNUMERICIDENTIFIER]})`);Jr("PRERELEASEIDENTIFIERLOOSE",`(?:${lr[cr.NUMERICIDENTIFIERLOOSE]}|${lr[cr.NONNUMERICIDENTIFIER]})`);Jr("PRERELEASE",`(?:-(${lr[cr.PRERELEASEIDENTIFIER]}(?:\\.${lr[cr.PRERELEASEIDENTIFIER]})*))`);Jr("PRERELEASELOOSE",`(?:-?(${lr[cr.PRERELEASEIDENTIFIERLOOSE]}(?:\\.${lr[cr.PRERELEASEIDENTIFIERLOOSE]})*))`);Jr("BUILDIDENTIFIER",`${VT}+`);Jr("BUILD",`(?:\\+(${lr[cr.BUILDIDENTIFIER]}(?:\\.${lr[cr.BUILDIDENTIFIER]})*))`);Jr("FULLPLAIN",`v?${lr[cr.MAINVERSION]}${lr[cr.PRERELEASE]}?${lr[cr.BUILD]}?`);Jr("FULL",`^${lr[cr.FULLPLAIN]}$`);Jr("LOOSEPLAIN",`[v=\\s]*${lr[cr.MAINVERSIONLOOSE]}${lr[cr.PRERELEASELOOSE]}?${lr[cr.BUILD]}?`);Jr("LOOSE",`^${lr[cr.LOOSEPLAIN]}$`);Jr("GTLT","((?:<|>)?=?)");Jr("XRANGEIDENTIFIERLOOSE",`${lr[cr.NUMERICIDENTIFIERLOOSE]}|x|X|\\*`);Jr("XRANGEIDENTIFIER",`${lr[cr.NUMERICIDENTIFIER]}|x|X|\\*`);Jr("XRANGEPLAIN",`[v=\\s]*(${lr[cr.XRANGEIDENTIFIER]})(?:\\.(${lr[cr.XRANGEIDENTIFIER]})(?:\\.(${lr[cr.XRANGEIDENTIFIER]})(?:${lr[cr.PRERELEASE]})?${lr[cr.BUILD]}?)?)?`);Jr("XRANGEPLAINLOOSE",`[v=\\s]*(${lr[cr.XRANGEIDENTIFIERLOOSE]})(?:\\.(${lr[cr.XRANGEIDENTIFIERLOOSE]})(?:\\.(${lr[cr.XRANGEIDENTIFIERLOOSE]})(?:${lr[cr.PRERELEASELOOSE]})?${lr[cr.BUILD]}?)?)?`);Jr("XRANGE",`^${lr[cr.GTLT]}\\s*${lr[cr.XRANGEPLAIN]}$`);Jr("XRANGELOOSE",`^${lr[cr.GTLT]}\\s*${lr[cr.XRANGEPLAINLOOSE]}$`);Jr("COERCE",`(^|[^\\d])(\\d{1,${KT}})(?:\\.(\\d{1,${KT}}))?(?:\\.(\\d{1,${KT}}))?(?:$|[^\\d])`);Jr("COERCERTL",lr[cr.COERCE],!0);Jr("LONETILDE","(?:~>?)");Jr("TILDETRIM",`(\\s*)${lr[cr.LONETILDE]}\\s+`,!0);wf.tildeTrimReplace="$1~";Jr("TILDE",`^${lr[cr.LONETILDE]}${lr[cr.XRANGEPLAIN]}$`);Jr("TILDELOOSE",`^${lr[cr.LONETILDE]}${lr[cr.XRANGEPLAINLOOSE]}$`);Jr("LONECARET","(?:\\^)");Jr("CARETTRIM",`(\\s*)${lr[cr.LONECARET]}\\s+`,!0);wf.caretTrimReplace="$1^";Jr("CARET",`^${lr[cr.LONECARET]}${lr[cr.XRANGEPLAIN]}$`);Jr("CARETLOOSE",`^${lr[cr.LONECARET]}${lr[cr.XRANGEPLAINLOOSE]}$`);Jr("COMPARATORLOOSE",`^${lr[cr.GTLT]}\\s*(${lr[cr.LOOSEPLAIN]})$|^$`);Jr("COMPARATOR",`^${lr[cr.GTLT]}\\s*(${lr[cr.FULLPLAIN]})$|^$`);Jr("COMPARATORTRIM",`(\\s*)${lr[cr.GTLT]}\\s*(${lr[cr.LOOSEPLAIN]}|${lr[cr.XRANGEPLAIN]})`,!0);wf.comparatorTrimReplace="$1$2$3";Jr("HYPHENRANGE",`^\\s*(${lr[cr.XRANGEPLAIN]})\\s+-\\s+(${lr[cr.XRANGEPLAIN]})\\s*$`);Jr("HYPHENRANGELOOSE",`^\\s*(${lr[cr.XRANGEPLAINLOOSE]})\\s+-\\s+(${lr[cr.XRANGEPLAINLOOSE]})\\s*$`);Jr("STAR","(<|>)?=?\\s*\\*");Jr("GTE0","^\\s*>=\\s*0\\.0\\.0\\s*$");Jr("GTE0PRE","^\\s*>=\\s*0\\.0\\.0-0\\s*$")});var pS=_((Tkt,sJ)=>{var kGe=Object.freeze({loose:!0}),QGe=Object.freeze({}),FGe=t=>t?typeof t!="object"?kGe:t:QGe;sJ.exports=FGe});var JT=_((Nkt,lJ)=>{var oJ=/^[0-9]+$/,aJ=(t,e)=>{let r=oJ.test(t),o=oJ.test(e);return r&&o&&(t=+t,e=+e),t===e?0:r&&!o?-1:o&&!r?1:t<e?-1:1},RGe=(t,e)=>aJ(e,t);lJ.exports={compareIdentifiers:aJ,rcompareIdentifiers:RGe}});var So=_((Lkt,fJ)=>{var hS=dI(),{MAX_LENGTH:cJ,MAX_SAFE_INTEGER:gS}=gI(),{safeRe:uJ,t:AJ}=vy(),TGe=pS(),{compareIdentifiers:Dy}=JT(),tl=class{constructor(e,r){if(r=TGe(r),e instanceof tl){if(e.loose===!!r.loose&&e.includePrerelease===!!r.includePrerelease)return e;e=e.version}else if(typeof e!="string")throw new TypeError(`Invalid version. Must be a string. Got type "${typeof e}".`);if(e.length>cJ)throw new TypeError(`version is longer than ${cJ} characters`);hS("SemVer",e,r),this.options=r,this.loose=!!r.loose,this.includePrerelease=!!r.includePrerelease;let o=e.trim().match(r.loose?uJ[AJ.LOOSE]:uJ[AJ.FULL]);if(!o)throw new TypeError(`Invalid Version: ${e}`);if(this.raw=e,this.major=+o[1],this.minor=+o[2],this.patch=+o[3],this.major>gS||this.major<0)throw new TypeError("Invalid major version");if(this.minor>gS||this.minor<0)throw new TypeError("Invalid minor version");if(this.patch>gS||this.patch<0)throw new TypeError("Invalid patch version");o[4]?this.prerelease=o[4].split(".").map(a=>{if(/^[0-9]+$/.test(a)){let n=+a;if(n>=0&&n<gS)return n}return a}):this.prerelease=[],this.build=o[5]?o[5].split("."):[],this.format()}format(){return this.version=`${this.major}.${this.minor}.${this.patch}`,this.prerelease.length&&(this.version+=`-${this.prerelease.join(".")}`),this.version}toString(){return this.version}compare(e){if(hS("SemVer.compare",this.version,this.options,e),!(e instanceof tl)){if(typeof e=="string"&&e===this.version)return 0;e=new tl(e,this.options)}return e.version===this.version?0:this.compareMain(e)||this.comparePre(e)}compareMain(e){return e instanceof tl||(e=new tl(e,this.options)),Dy(this.major,e.major)||Dy(this.minor,e.minor)||Dy(this.patch,e.patch)}comparePre(e){if(e instanceof tl||(e=new tl(e,this.options)),this.prerelease.length&&!e.prerelease.length)return-1;if(!this.prerelease.length&&e.prerelease.length)return 1;if(!this.prerelease.length&&!e.prerelease.length)return 0;let r=0;do{let o=this.prerelease[r],a=e.prerelease[r];if(hS("prerelease compare",r,o,a),o===void 0&&a===void 0)return 0;if(a===void 0)return 1;if(o===void 0)return-1;if(o===a)continue;return Dy(o,a)}while(++r)}compareBuild(e){e instanceof tl||(e=new tl(e,this.options));let r=0;do{let o=this.build[r],a=e.build[r];if(hS("prerelease compare",r,o,a),o===void 0&&a===void 0)return 0;if(a===void 0)return 1;if(o===void 0)return-1;if(o===a)continue;return Dy(o,a)}while(++r)}inc(e,r,o){switch(e){case"premajor":this.prerelease.length=0,this.patch=0,this.minor=0,this.major++,this.inc("pre",r,o);break;case"preminor":this.prerelease.length=0,this.patch=0,this.minor++,this.inc("pre",r,o);break;case"prepatch":this.prerelease.length=0,this.inc("patch",r,o),this.inc("pre",r,o);break;case"prerelease":this.prerelease.length===0&&this.inc("patch",r,o),this.inc("pre",r,o);break;case"major":(this.minor!==0||this.patch!==0||this.prerelease.length===0)&&this.major++,this.minor=0,this.patch=0,this.prerelease=[];break;case"minor":(this.patch!==0||this.prerelease.length===0)&&this.minor++,this.patch=0,this.prerelease=[];break;case"patch":this.prerelease.length===0&&this.patch++,this.prerelease=[];break;case"pre":{let a=Number(o)?1:0;if(!r&&o===!1)throw new Error("invalid increment argument: identifier is empty");if(this.prerelease.length===0)this.prerelease=[a];else{let n=this.prerelease.length;for(;--n>=0;)typeof this.prerelease[n]=="number"&&(this.prerelease[n]++,n=-2);if(n===-1){if(r===this.prerelease.join(".")&&o===!1)throw new Error("invalid increment argument: identifier already exists");this.prerelease.push(a)}}if(r){let n=[r,a];o===!1&&(n=[r]),Dy(this.prerelease[0],r)===0?isNaN(this.prerelease[1])&&(this.prerelease=n):this.prerelease=n}break}default:throw new Error(`invalid increment argument: ${e}`)}return this.raw=this.format(),this.build.length&&(this.raw+=`+${this.build.join(".")}`),this}};fJ.exports=tl});var sd=_((Okt,hJ)=>{var pJ=So(),NGe=(t,e,r=!1)=>{if(t instanceof pJ)return t;try{return new pJ(t,e)}catch(o){if(!r)return null;throw o}};hJ.exports=NGe});var dJ=_((Mkt,gJ)=>{var LGe=sd(),OGe=(t,e)=>{let r=LGe(t,e);return r?r.version:null};gJ.exports=OGe});var yJ=_((Ukt,mJ)=>{var MGe=sd(),UGe=(t,e)=>{let r=MGe(t.trim().replace(/^[=v]+/,""),e);return r?r.version:null};mJ.exports=UGe});var wJ=_((_kt,CJ)=>{var EJ=So(),_Ge=(t,e,r,o,a)=>{typeof r=="string"&&(a=o,o=r,r=void 0);try{return new EJ(t instanceof EJ?t.version:t,r).inc(e,o,a).version}catch{return null}};CJ.exports=_Ge});var vJ=_((Hkt,BJ)=>{var IJ=sd(),HGe=(t,e)=>{let r=IJ(t,null,!0),o=IJ(e,null,!0),a=r.compare(o);if(a===0)return null;let n=a>0,u=n?r:o,A=n?o:r,p=!!u.prerelease.length;if(!!A.prerelease.length&&!p)return!A.patch&&!A.minor?"major":u.patch?"patch":u.minor?"minor":"major";let E=p?"pre":"";return r.major!==o.major?E+"major":r.minor!==o.minor?E+"minor":r.patch!==o.patch?E+"patch":"prerelease"};BJ.exports=HGe});var SJ=_((jkt,DJ)=>{var jGe=So(),GGe=(t,e)=>new jGe(t,e).major;DJ.exports=GGe});var bJ=_((Gkt,PJ)=>{var qGe=So(),YGe=(t,e)=>new qGe(t,e).minor;PJ.exports=YGe});var kJ=_((qkt,xJ)=>{var WGe=So(),KGe=(t,e)=>new WGe(t,e).patch;xJ.exports=KGe});var FJ=_((Ykt,QJ)=>{var VGe=sd(),JGe=(t,e)=>{let r=VGe(t,e);return r&&r.prerelease.length?r.prerelease:null};QJ.exports=JGe});var Ll=_((Wkt,TJ)=>{var RJ=So(),zGe=(t,e,r)=>new RJ(t,r).compare(new RJ(e,r));TJ.exports=zGe});var LJ=_((Kkt,NJ)=>{var XGe=Ll(),ZGe=(t,e,r)=>XGe(e,t,r);NJ.exports=ZGe});var MJ=_((Vkt,OJ)=>{var $Ge=Ll(),eqe=(t,e)=>$Ge(t,e,!0);OJ.exports=eqe});var dS=_((Jkt,_J)=>{var UJ=So(),tqe=(t,e,r)=>{let o=new UJ(t,r),a=new UJ(e,r);return o.compare(a)||o.compareBuild(a)};_J.exports=tqe});var jJ=_((zkt,HJ)=>{var rqe=dS(),nqe=(t,e)=>t.sort((r,o)=>rqe(r,o,e));HJ.exports=nqe});var qJ=_((Xkt,GJ)=>{var iqe=dS(),sqe=(t,e)=>t.sort((r,o)=>iqe(o,r,e));GJ.exports=sqe});var mI=_((Zkt,YJ)=>{var oqe=Ll(),aqe=(t,e,r)=>oqe(t,e,r)>0;YJ.exports=aqe});var mS=_(($kt,WJ)=>{var lqe=Ll(),cqe=(t,e,r)=>lqe(t,e,r)<0;WJ.exports=cqe});var zT=_((eQt,KJ)=>{var uqe=Ll(),Aqe=(t,e,r)=>uqe(t,e,r)===0;KJ.exports=Aqe});var XT=_((tQt,VJ)=>{var fqe=Ll(),pqe=(t,e,r)=>fqe(t,e,r)!==0;VJ.exports=pqe});var yS=_((rQt,JJ)=>{var hqe=Ll(),gqe=(t,e,r)=>hqe(t,e,r)>=0;JJ.exports=gqe});var ES=_((nQt,zJ)=>{var dqe=Ll(),mqe=(t,e,r)=>dqe(t,e,r)<=0;zJ.exports=mqe});var ZT=_((iQt,XJ)=>{var yqe=zT(),Eqe=XT(),Cqe=mI(),wqe=yS(),Iqe=mS(),Bqe=ES(),vqe=(t,e,r,o)=>{switch(e){case"===":return typeof t=="object"&&(t=t.version),typeof r=="object"&&(r=r.version),t===r;case"!==":return typeof t=="object"&&(t=t.version),typeof r=="object"&&(r=r.version),t!==r;case"":case"=":case"==":return yqe(t,r,o);case"!=":return Eqe(t,r,o);case">":return Cqe(t,r,o);case">=":return wqe(t,r,o);case"<":return Iqe(t,r,o);case"<=":return Bqe(t,r,o);default:throw new TypeError(`Invalid operator: ${e}`)}};XJ.exports=vqe});var $J=_((sQt,ZJ)=>{var Dqe=So(),Sqe=sd(),{safeRe:CS,t:wS}=vy(),Pqe=(t,e)=>{if(t instanceof Dqe)return t;if(typeof t=="number"&&(t=String(t)),typeof t!="string")return null;e=e||{};let r=null;if(!e.rtl)r=t.match(CS[wS.COERCE]);else{let o;for(;(o=CS[wS.COERCERTL].exec(t))&&(!r||r.index+r[0].length!==t.length);)(!r||o.index+o[0].length!==r.index+r[0].length)&&(r=o),CS[wS.COERCERTL].lastIndex=o.index+o[1].length+o[2].length;CS[wS.COERCERTL].lastIndex=-1}return r===null?null:Sqe(`${r[2]}.${r[3]||"0"}.${r[4]||"0"}`,e)};ZJ.exports=Pqe});var tz=_((oQt,ez)=>{"use strict";ez.exports=function(t){t.prototype[Symbol.iterator]=function*(){for(let e=this.head;e;e=e.next)yield e.value}}});var IS=_((aQt,rz)=>{"use strict";rz.exports=Cn;Cn.Node=od;Cn.create=Cn;function Cn(t){var e=this;if(e instanceof Cn||(e=new Cn),e.tail=null,e.head=null,e.length=0,t&&typeof t.forEach=="function")t.forEach(function(a){e.push(a)});else if(arguments.length>0)for(var r=0,o=arguments.length;r<o;r++)e.push(arguments[r]);return e}Cn.prototype.removeNode=function(t){if(t.list!==this)throw new Error("removing node which does not belong to this list");var e=t.next,r=t.prev;return e&&(e.prev=r),r&&(r.next=e),t===this.head&&(this.head=e),t===this.tail&&(this.tail=r),t.list.length--,t.next=null,t.prev=null,t.list=null,e};Cn.prototype.unshiftNode=function(t){if(t!==this.head){t.list&&t.list.removeNode(t);var e=this.head;t.list=this,t.next=e,e&&(e.prev=t),this.head=t,this.tail||(this.tail=t),this.length++}};Cn.prototype.pushNode=function(t){if(t!==this.tail){t.list&&t.list.removeNode(t);var e=this.tail;t.list=this,t.prev=e,e&&(e.next=t),this.tail=t,this.head||(this.head=t),this.length++}};Cn.prototype.push=function(){for(var t=0,e=arguments.length;t<e;t++)xqe(this,arguments[t]);return this.length};Cn.prototype.unshift=function(){for(var t=0,e=arguments.length;t<e;t++)kqe(this,arguments[t]);return this.length};Cn.prototype.pop=function(){if(!!this.tail){var t=this.tail.value;return this.tail=this.tail.prev,this.tail?this.tail.next=null:this.head=null,this.length--,t}};Cn.prototype.shift=function(){if(!!this.head){var t=this.head.value;return this.head=this.head.next,this.head?this.head.prev=null:this.tail=null,this.length--,t}};Cn.prototype.forEach=function(t,e){e=e||this;for(var r=this.head,o=0;r!==null;o++)t.call(e,r.value,o,this),r=r.next};Cn.prototype.forEachReverse=function(t,e){e=e||this;for(var r=this.tail,o=this.length-1;r!==null;o--)t.call(e,r.value,o,this),r=r.prev};Cn.prototype.get=function(t){for(var e=0,r=this.head;r!==null&&e<t;e++)r=r.next;if(e===t&&r!==null)return r.value};Cn.prototype.getReverse=function(t){for(var e=0,r=this.tail;r!==null&&e<t;e++)r=r.prev;if(e===t&&r!==null)return r.value};Cn.prototype.map=function(t,e){e=e||this;for(var r=new Cn,o=this.head;o!==null;)r.push(t.call(e,o.value,this)),o=o.next;return r};Cn.prototype.mapReverse=function(t,e){e=e||this;for(var r=new Cn,o=this.tail;o!==null;)r.push(t.call(e,o.value,this)),o=o.prev;return r};Cn.prototype.reduce=function(t,e){var r,o=this.head;if(arguments.length>1)r=e;else if(this.head)o=this.head.next,r=this.head.value;else throw new TypeError("Reduce of empty list with no initial value");for(var a=0;o!==null;a++)r=t(r,o.value,a),o=o.next;return r};Cn.prototype.reduceReverse=function(t,e){var r,o=this.tail;if(arguments.length>1)r=e;else if(this.tail)o=this.tail.prev,r=this.tail.value;else throw new TypeError("Reduce of empty list with no initial value");for(var a=this.length-1;o!==null;a--)r=t(r,o.value,a),o=o.prev;return r};Cn.prototype.toArray=function(){for(var t=new Array(this.length),e=0,r=this.head;r!==null;e++)t[e]=r.value,r=r.next;return t};Cn.prototype.toArrayReverse=function(){for(var t=new Array(this.length),e=0,r=this.tail;r!==null;e++)t[e]=r.value,r=r.prev;return t};Cn.prototype.slice=function(t,e){e=e||this.length,e<0&&(e+=this.length),t=t||0,t<0&&(t+=this.length);var r=new Cn;if(e<t||e<0)return r;t<0&&(t=0),e>this.length&&(e=this.length);for(var o=0,a=this.head;a!==null&&o<t;o++)a=a.next;for(;a!==null&&o<e;o++,a=a.next)r.push(a.value);return r};Cn.prototype.sliceReverse=function(t,e){e=e||this.length,e<0&&(e+=this.length),t=t||0,t<0&&(t+=this.length);var r=new Cn;if(e<t||e<0)return r;t<0&&(t=0),e>this.length&&(e=this.length);for(var o=this.length,a=this.tail;a!==null&&o>e;o--)a=a.prev;for(;a!==null&&o>t;o--,a=a.prev)r.push(a.value);return r};Cn.prototype.splice=function(t,e,...r){t>this.length&&(t=this.length-1),t<0&&(t=this.length+t);for(var o=0,a=this.head;a!==null&&o<t;o++)a=a.next;for(var n=[],o=0;a&&o<e;o++)n.push(a.value),a=this.removeNode(a);a===null&&(a=this.tail),a!==this.head&&a!==this.tail&&(a=a.prev);for(var o=0;o<r.length;o++)a=bqe(this,a,r[o]);return n};Cn.prototype.reverse=function(){for(var t=this.head,e=this.tail,r=t;r!==null;r=r.prev){var o=r.prev;r.prev=r.next,r.next=o}return this.head=e,this.tail=t,this};function bqe(t,e,r){var o=e===t.head?new od(r,null,e,t):new od(r,e,e.next,t);return o.next===null&&(t.tail=o),o.prev===null&&(t.head=o),t.length++,o}function xqe(t,e){t.tail=new od(e,t.tail,null,t),t.head||(t.head=t.tail),t.length++}function kqe(t,e){t.head=new od(e,null,t.head,t),t.tail||(t.tail=t.head),t.length++}function od(t,e,r,o){if(!(this instanceof od))return new od(t,e,r,o);this.list=o,this.value=t,e?(e.next=this,this.prev=e):this.prev=null,r?(r.prev=this,this.next=r):this.next=null}try{tz()(Cn)}catch{}});var az=_((lQt,oz)=>{"use strict";var Qqe=IS(),ad=Symbol("max"),Bf=Symbol("length"),Sy=Symbol("lengthCalculator"),EI=Symbol("allowStale"),ld=Symbol("maxAge"),If=Symbol("dispose"),nz=Symbol("noDisposeOnSet"),xs=Symbol("lruList"),Mc=Symbol("cache"),sz=Symbol("updateAgeOnGet"),$T=()=>1,tN=class{constructor(e){if(typeof e=="number"&&(e={max:e}),e||(e={}),e.max&&(typeof e.max!="number"||e.max<0))throw new TypeError("max must be a non-negative number");let r=this[ad]=e.max||1/0,o=e.length||$T;if(this[Sy]=typeof o!="function"?$T:o,this[EI]=e.stale||!1,e.maxAge&&typeof e.maxAge!="number")throw new TypeError("maxAge must be a number");this[ld]=e.maxAge||0,this[If]=e.dispose,this[nz]=e.noDisposeOnSet||!1,this[sz]=e.updateAgeOnGet||!1,this.reset()}set max(e){if(typeof e!="number"||e<0)throw new TypeError("max must be a non-negative number");this[ad]=e||1/0,yI(this)}get max(){return this[ad]}set allowStale(e){this[EI]=!!e}get allowStale(){return this[EI]}set maxAge(e){if(typeof e!="number")throw new TypeError("maxAge must be a non-negative number");this[ld]=e,yI(this)}get maxAge(){return this[ld]}set lengthCalculator(e){typeof e!="function"&&(e=$T),e!==this[Sy]&&(this[Sy]=e,this[Bf]=0,this[xs].forEach(r=>{r.length=this[Sy](r.value,r.key),this[Bf]+=r.length})),yI(this)}get lengthCalculator(){return this[Sy]}get length(){return this[Bf]}get itemCount(){return this[xs].length}rforEach(e,r){r=r||this;for(let o=this[xs].tail;o!==null;){let a=o.prev;iz(this,e,o,r),o=a}}forEach(e,r){r=r||this;for(let o=this[xs].head;o!==null;){let a=o.next;iz(this,e,o,r),o=a}}keys(){return this[xs].toArray().map(e=>e.key)}values(){return this[xs].toArray().map(e=>e.value)}reset(){this[If]&&this[xs]&&this[xs].length&&this[xs].forEach(e=>this[If](e.key,e.value)),this[Mc]=new Map,this[xs]=new Qqe,this[Bf]=0}dump(){return this[xs].map(e=>BS(this,e)?!1:{k:e.key,v:e.value,e:e.now+(e.maxAge||0)}).toArray().filter(e=>e)}dumpLru(){return this[xs]}set(e,r,o){if(o=o||this[ld],o&&typeof o!="number")throw new TypeError("maxAge must be a number");let a=o?Date.now():0,n=this[Sy](r,e);if(this[Mc].has(e)){if(n>this[ad])return Py(this,this[Mc].get(e)),!1;let p=this[Mc].get(e).value;return this[If]&&(this[nz]||this[If](e,p.value)),p.now=a,p.maxAge=o,p.value=r,this[Bf]+=n-p.length,p.length=n,this.get(e),yI(this),!0}let u=new rN(e,r,n,a,o);return u.length>this[ad]?(this[If]&&this[If](e,r),!1):(this[Bf]+=u.length,this[xs].unshift(u),this[Mc].set(e,this[xs].head),yI(this),!0)}has(e){if(!this[Mc].has(e))return!1;let r=this[Mc].get(e).value;return!BS(this,r)}get(e){return eN(this,e,!0)}peek(e){return eN(this,e,!1)}pop(){let e=this[xs].tail;return e?(Py(this,e),e.value):null}del(e){Py(this,this[Mc].get(e))}load(e){this.reset();let r=Date.now();for(let o=e.length-1;o>=0;o--){let a=e[o],n=a.e||0;if(n===0)this.set(a.k,a.v);else{let u=n-r;u>0&&this.set(a.k,a.v,u)}}}prune(){this[Mc].forEach((e,r)=>eN(this,r,!1))}},eN=(t,e,r)=>{let o=t[Mc].get(e);if(o){let a=o.value;if(BS(t,a)){if(Py(t,o),!t[EI])return}else r&&(t[sz]&&(o.value.now=Date.now()),t[xs].unshiftNode(o));return a.value}},BS=(t,e)=>{if(!e||!e.maxAge&&!t[ld])return!1;let r=Date.now()-e.now;return e.maxAge?r>e.maxAge:t[ld]&&r>t[ld]},yI=t=>{if(t[Bf]>t[ad])for(let e=t[xs].tail;t[Bf]>t[ad]&&e!==null;){let r=e.prev;Py(t,e),e=r}},Py=(t,e)=>{if(e){let r=e.value;t[If]&&t[If](r.key,r.value),t[Bf]-=r.length,t[Mc].delete(r.key),t[xs].removeNode(e)}},rN=class{constructor(e,r,o,a,n){this.key=e,this.value=r,this.length=o,this.now=a,this.maxAge=n||0}},iz=(t,e,r,o)=>{let a=r.value;BS(t,a)&&(Py(t,r),t[EI]||(a=void 0)),a&&e.call(o,a.value,a.key,t)};oz.exports=tN});var Ol=_((cQt,Az)=>{var cd=class{constructor(e,r){if(r=Rqe(r),e instanceof cd)return e.loose===!!r.loose&&e.includePrerelease===!!r.includePrerelease?e:new cd(e.raw,r);if(e instanceof nN)return this.raw=e.value,this.set=[[e]],this.format(),this;if(this.options=r,this.loose=!!r.loose,this.includePrerelease=!!r.includePrerelease,this.raw=e.trim().split(/\s+/).join(" "),this.set=this.raw.split("||").map(o=>this.parseRange(o.trim())).filter(o=>o.length),!this.set.length)throw new TypeError(`Invalid SemVer Range: ${this.raw}`);if(this.set.length>1){let o=this.set[0];if(this.set=this.set.filter(a=>!cz(a[0])),this.set.length===0)this.set=[o];else if(this.set.length>1){for(let a of this.set)if(a.length===1&&_qe(a[0])){this.set=[a];break}}}this.format()}format(){return this.range=this.set.map(e=>e.join(" ").trim()).join("||").trim(),this.range}toString(){return this.range}parseRange(e){let o=((this.options.includePrerelease&&Mqe)|(this.options.loose&&Uqe))+":"+e,a=lz.get(o);if(a)return a;let n=this.options.loose,u=n?Da[zo.HYPHENRANGELOOSE]:Da[zo.HYPHENRANGE];e=e.replace(u,zqe(this.options.includePrerelease)),ci("hyphen replace",e),e=e.replace(Da[zo.COMPARATORTRIM],Nqe),ci("comparator trim",e),e=e.replace(Da[zo.TILDETRIM],Lqe),ci("tilde trim",e),e=e.replace(Da[zo.CARETTRIM],Oqe),ci("caret trim",e);let A=e.split(" ").map(I=>Hqe(I,this.options)).join(" ").split(/\s+/).map(I=>Jqe(I,this.options));n&&(A=A.filter(I=>(ci("loose invalid filter",I,this.options),!!I.match(Da[zo.COMPARATORLOOSE])))),ci("range list",A);let p=new Map,h=A.map(I=>new nN(I,this.options));for(let I of h){if(cz(I))return[I];p.set(I.value,I)}p.size>1&&p.has("")&&p.delete("");let E=[...p.values()];return lz.set(o,E),E}intersects(e,r){if(!(e instanceof cd))throw new TypeError("a Range is required");return this.set.some(o=>uz(o,r)&&e.set.some(a=>uz(a,r)&&o.every(n=>a.every(u=>n.intersects(u,r)))))}test(e){if(!e)return!1;if(typeof e=="string")try{e=new Tqe(e,this.options)}catch{return!1}for(let r=0;r<this.set.length;r++)if(Xqe(this.set[r],e,this.options))return!0;return!1}};Az.exports=cd;var Fqe=az(),lz=new Fqe({max:1e3}),Rqe=pS(),nN=CI(),ci=dI(),Tqe=So(),{safeRe:Da,t:zo,comparatorTrimReplace:Nqe,tildeTrimReplace:Lqe,caretTrimReplace:Oqe}=vy(),{FLAG_INCLUDE_PRERELEASE:Mqe,FLAG_LOOSE:Uqe}=gI(),cz=t=>t.value==="<0.0.0-0",_qe=t=>t.value==="",uz=(t,e)=>{let r=!0,o=t.slice(),a=o.pop();for(;r&&o.length;)r=o.every(n=>a.intersects(n,e)),a=o.pop();return r},Hqe=(t,e)=>(ci("comp",t,e),t=qqe(t,e),ci("caret",t),t=jqe(t,e),ci("tildes",t),t=Wqe(t,e),ci("xrange",t),t=Vqe(t,e),ci("stars",t),t),Xo=t=>!t||t.toLowerCase()==="x"||t==="*",jqe=(t,e)=>t.trim().split(/\s+/).map(r=>Gqe(r,e)).join(" "),Gqe=(t,e)=>{let r=e.loose?Da[zo.TILDELOOSE]:Da[zo.TILDE];return t.replace(r,(o,a,n,u,A)=>{ci("tilde",t,o,a,n,u,A);let p;return Xo(a)?p="":Xo(n)?p=`>=${a}.0.0 <${+a+1}.0.0-0`:Xo(u)?p=`>=${a}.${n}.0 <${a}.${+n+1}.0-0`:A?(ci("replaceTilde pr",A),p=`>=${a}.${n}.${u}-${A} <${a}.${+n+1}.0-0`):p=`>=${a}.${n}.${u} <${a}.${+n+1}.0-0`,ci("tilde return",p),p})},qqe=(t,e)=>t.trim().split(/\s+/).map(r=>Yqe(r,e)).join(" "),Yqe=(t,e)=>{ci("caret",t,e);let r=e.loose?Da[zo.CARETLOOSE]:Da[zo.CARET],o=e.includePrerelease?"-0":"";return t.replace(r,(a,n,u,A,p)=>{ci("caret",t,a,n,u,A,p);let h;return Xo(n)?h="":Xo(u)?h=`>=${n}.0.0${o} <${+n+1}.0.0-0`:Xo(A)?n==="0"?h=`>=${n}.${u}.0${o} <${n}.${+u+1}.0-0`:h=`>=${n}.${u}.0${o} <${+n+1}.0.0-0`:p?(ci("replaceCaret pr",p),n==="0"?u==="0"?h=`>=${n}.${u}.${A}-${p} <${n}.${u}.${+A+1}-0`:h=`>=${n}.${u}.${A}-${p} <${n}.${+u+1}.0-0`:h=`>=${n}.${u}.${A}-${p} <${+n+1}.0.0-0`):(ci("no pr"),n==="0"?u==="0"?h=`>=${n}.${u}.${A}${o} <${n}.${u}.${+A+1}-0`:h=`>=${n}.${u}.${A}${o} <${n}.${+u+1}.0-0`:h=`>=${n}.${u}.${A} <${+n+1}.0.0-0`),ci("caret return",h),h})},Wqe=(t,e)=>(ci("replaceXRanges",t,e),t.split(/\s+/).map(r=>Kqe(r,e)).join(" ")),Kqe=(t,e)=>{t=t.trim();let r=e.loose?Da[zo.XRANGELOOSE]:Da[zo.XRANGE];return t.replace(r,(o,a,n,u,A,p)=>{ci("xRange",t,o,a,n,u,A,p);let h=Xo(n),E=h||Xo(u),I=E||Xo(A),v=I;return a==="="&&v&&(a=""),p=e.includePrerelease?"-0":"",h?a===">"||a==="<"?o="<0.0.0-0":o="*":a&&v?(E&&(u=0),A=0,a===">"?(a=">=",E?(n=+n+1,u=0,A=0):(u=+u+1,A=0)):a==="<="&&(a="<",E?n=+n+1:u=+u+1),a==="<"&&(p="-0"),o=`${a+n}.${u}.${A}${p}`):E?o=`>=${n}.0.0${p} <${+n+1}.0.0-0`:I&&(o=`>=${n}.${u}.0${p} <${n}.${+u+1}.0-0`),ci("xRange return",o),o})},Vqe=(t,e)=>(ci("replaceStars",t,e),t.trim().replace(Da[zo.STAR],"")),Jqe=(t,e)=>(ci("replaceGTE0",t,e),t.trim().replace(Da[e.includePrerelease?zo.GTE0PRE:zo.GTE0],"")),zqe=t=>(e,r,o,a,n,u,A,p,h,E,I,v,x)=>(Xo(o)?r="":Xo(a)?r=`>=${o}.0.0${t?"-0":""}`:Xo(n)?r=`>=${o}.${a}.0${t?"-0":""}`:u?r=`>=${r}`:r=`>=${r}${t?"-0":""}`,Xo(h)?p="":Xo(E)?p=`<${+h+1}.0.0-0`:Xo(I)?p=`<${h}.${+E+1}.0-0`:v?p=`<=${h}.${E}.${I}-${v}`:t?p=`<${h}.${E}.${+I+1}-0`:p=`<=${p}`,`${r} ${p}`.trim()),Xqe=(t,e,r)=>{for(let o=0;o<t.length;o++)if(!t[o].test(e))return!1;if(e.prerelease.length&&!r.includePrerelease){for(let o=0;o<t.length;o++)if(ci(t[o].semver),t[o].semver!==nN.ANY&&t[o].semver.prerelease.length>0){let a=t[o].semver;if(a.major===e.major&&a.minor===e.minor&&a.patch===e.patch)return!0}return!1}return!0}});var CI=_((uQt,mz)=>{var wI=Symbol("SemVer ANY"),by=class{static get ANY(){return wI}constructor(e,r){if(r=fz(r),e instanceof by){if(e.loose===!!r.loose)return e;e=e.value}e=e.trim().split(/\s+/).join(" "),sN("comparator",e,r),this.options=r,this.loose=!!r.loose,this.parse(e),this.semver===wI?this.value="":this.value=this.operator+this.semver.version,sN("comp",this)}parse(e){let r=this.options.loose?pz[hz.COMPARATORLOOSE]:pz[hz.COMPARATOR],o=e.match(r);if(!o)throw new TypeError(`Invalid comparator: ${e}`);this.operator=o[1]!==void 0?o[1]:"",this.operator==="="&&(this.operator=""),o[2]?this.semver=new gz(o[2],this.options.loose):this.semver=wI}toString(){return this.value}test(e){if(sN("Comparator.test",e,this.options.loose),this.semver===wI||e===wI)return!0;if(typeof e=="string")try{e=new gz(e,this.options)}catch{return!1}return iN(e,this.operator,this.semver,this.options)}intersects(e,r){if(!(e instanceof by))throw new TypeError("a Comparator is required");return this.operator===""?this.value===""?!0:new dz(e.value,r).test(this.value):e.operator===""?e.value===""?!0:new dz(this.value,r).test(e.semver):(r=fz(r),r.includePrerelease&&(this.value==="<0.0.0-0"||e.value==="<0.0.0-0")||!r.includePrerelease&&(this.value.startsWith("<0.0.0")||e.value.startsWith("<0.0.0"))?!1:!!(this.operator.startsWith(">")&&e.operator.startsWith(">")||this.operator.startsWith("<")&&e.operator.startsWith("<")||this.semver.version===e.semver.version&&this.operator.includes("=")&&e.operator.includes("=")||iN(this.semver,"<",e.semver,r)&&this.operator.startsWith(">")&&e.operator.startsWith("<")||iN(this.semver,">",e.semver,r)&&this.operator.startsWith("<")&&e.operator.startsWith(">")))}};mz.exports=by;var fz=pS(),{safeRe:pz,t:hz}=vy(),iN=ZT(),sN=dI(),gz=So(),dz=Ol()});var II=_((AQt,yz)=>{var Zqe=Ol(),$qe=(t,e,r)=>{try{e=new Zqe(e,r)}catch{return!1}return e.test(t)};yz.exports=$qe});var Cz=_((fQt,Ez)=>{var e9e=Ol(),t9e=(t,e)=>new e9e(t,e).set.map(r=>r.map(o=>o.value).join(" ").trim().split(" "));Ez.exports=t9e});var Iz=_((pQt,wz)=>{var r9e=So(),n9e=Ol(),i9e=(t,e,r)=>{let o=null,a=null,n=null;try{n=new n9e(e,r)}catch{return null}return t.forEach(u=>{n.test(u)&&(!o||a.compare(u)===-1)&&(o=u,a=new r9e(o,r))}),o};wz.exports=i9e});var vz=_((hQt,Bz)=>{var s9e=So(),o9e=Ol(),a9e=(t,e,r)=>{let o=null,a=null,n=null;try{n=new o9e(e,r)}catch{return null}return t.forEach(u=>{n.test(u)&&(!o||a.compare(u)===1)&&(o=u,a=new s9e(o,r))}),o};Bz.exports=a9e});var Pz=_((gQt,Sz)=>{var oN=So(),l9e=Ol(),Dz=mI(),c9e=(t,e)=>{t=new l9e(t,e);let r=new oN("0.0.0");if(t.test(r)||(r=new oN("0.0.0-0"),t.test(r)))return r;r=null;for(let o=0;o<t.set.length;++o){let a=t.set[o],n=null;a.forEach(u=>{let A=new oN(u.semver.version);switch(u.operator){case">":A.prerelease.length===0?A.patch++:A.prerelease.push(0),A.raw=A.format();case"":case">=":(!n||Dz(A,n))&&(n=A);break;case"<":case"<=":break;default:throw new Error(`Unexpected operation: ${u.operator}`)}}),n&&(!r||Dz(r,n))&&(r=n)}return r&&t.test(r)?r:null};Sz.exports=c9e});var xz=_((dQt,bz)=>{var u9e=Ol(),A9e=(t,e)=>{try{return new u9e(t,e).range||"*"}catch{return null}};bz.exports=A9e});var vS=_((mQt,Rz)=>{var f9e=So(),Fz=CI(),{ANY:p9e}=Fz,h9e=Ol(),g9e=II(),kz=mI(),Qz=mS(),d9e=ES(),m9e=yS(),y9e=(t,e,r,o)=>{t=new f9e(t,o),e=new h9e(e,o);let a,n,u,A,p;switch(r){case">":a=kz,n=d9e,u=Qz,A=">",p=">=";break;case"<":a=Qz,n=m9e,u=kz,A="<",p="<=";break;default:throw new TypeError('Must provide a hilo val of "<" or ">"')}if(g9e(t,e,o))return!1;for(let h=0;h<e.set.length;++h){let E=e.set[h],I=null,v=null;if(E.forEach(x=>{x.semver===p9e&&(x=new Fz(">=0.0.0")),I=I||x,v=v||x,a(x.semver,I.semver,o)?I=x:u(x.semver,v.semver,o)&&(v=x)}),I.operator===A||I.operator===p||(!v.operator||v.operator===A)&&n(t,v.semver))return!1;if(v.operator===p&&u(t,v.semver))return!1}return!0};Rz.exports=y9e});var Nz=_((yQt,Tz)=>{var E9e=vS(),C9e=(t,e,r)=>E9e(t,e,">",r);Tz.exports=C9e});var Oz=_((EQt,Lz)=>{var w9e=vS(),I9e=(t,e,r)=>w9e(t,e,"<",r);Lz.exports=I9e});var _z=_((CQt,Uz)=>{var Mz=Ol(),B9e=(t,e,r)=>(t=new Mz(t,r),e=new Mz(e,r),t.intersects(e,r));Uz.exports=B9e});var jz=_((wQt,Hz)=>{var v9e=II(),D9e=Ll();Hz.exports=(t,e,r)=>{let o=[],a=null,n=null,u=t.sort((E,I)=>D9e(E,I,r));for(let E of u)v9e(E,e,r)?(n=E,a||(a=E)):(n&&o.push([a,n]),n=null,a=null);a&&o.push([a,null]);let A=[];for(let[E,I]of o)E===I?A.push(E):!I&&E===u[0]?A.push("*"):I?E===u[0]?A.push(`<=${I}`):A.push(`${E} - ${I}`):A.push(`>=${E}`);let p=A.join(" || "),h=typeof e.raw=="string"?e.raw:String(e);return p.length<h.length?p:e}});var Vz=_((IQt,Kz)=>{var Gz=Ol(),lN=CI(),{ANY:aN}=lN,BI=II(),cN=Ll(),S9e=(t,e,r={})=>{if(t===e)return!0;t=new Gz(t,r),e=new Gz(e,r);let o=!1;e:for(let a of t.set){for(let n of e.set){let u=b9e(a,n,r);if(o=o||u!==null,u)continue e}if(o)return!1}return!0},P9e=[new lN(">=0.0.0-0")],qz=[new lN(">=0.0.0")],b9e=(t,e,r)=>{if(t===e)return!0;if(t.length===1&&t[0].semver===aN){if(e.length===1&&e[0].semver===aN)return!0;r.includePrerelease?t=P9e:t=qz}if(e.length===1&&e[0].semver===aN){if(r.includePrerelease)return!0;e=qz}let o=new Set,a,n;for(let x of t)x.operator===">"||x.operator===">="?a=Yz(a,x,r):x.operator==="<"||x.operator==="<="?n=Wz(n,x,r):o.add(x.semver);if(o.size>1)return null;let u;if(a&&n){if(u=cN(a.semver,n.semver,r),u>0)return null;if(u===0&&(a.operator!==">="||n.operator!=="<="))return null}for(let x of o){if(a&&!BI(x,String(a),r)||n&&!BI(x,String(n),r))return null;for(let C of e)if(!BI(x,String(C),r))return!1;return!0}let A,p,h,E,I=n&&!r.includePrerelease&&n.semver.prerelease.length?n.semver:!1,v=a&&!r.includePrerelease&&a.semver.prerelease.length?a.semver:!1;I&&I.prerelease.length===1&&n.operator==="<"&&I.prerelease[0]===0&&(I=!1);for(let x of e){if(E=E||x.operator===">"||x.operator===">=",h=h||x.operator==="<"||x.operator==="<=",a){if(v&&x.semver.prerelease&&x.semver.prerelease.length&&x.semver.major===v.major&&x.semver.minor===v.minor&&x.semver.patch===v.patch&&(v=!1),x.operator===">"||x.operator===">="){if(A=Yz(a,x,r),A===x&&A!==a)return!1}else if(a.operator===">="&&!BI(a.semver,String(x),r))return!1}if(n){if(I&&x.semver.prerelease&&x.semver.prerelease.length&&x.semver.major===I.major&&x.semver.minor===I.minor&&x.semver.patch===I.patch&&(I=!1),x.operator==="<"||x.operator==="<="){if(p=Wz(n,x,r),p===x&&p!==n)return!1}else if(n.operator==="<="&&!BI(n.semver,String(x),r))return!1}if(!x.operator&&(n||a)&&u!==0)return!1}return!(a&&h&&!n&&u!==0||n&&E&&!a&&u!==0||v||I)},Yz=(t,e,r)=>{if(!t)return e;let o=cN(t.semver,e.semver,r);return o>0?t:o<0||e.operator===">"&&t.operator===">="?e:t},Wz=(t,e,r)=>{if(!t)return e;let o=cN(t.semver,e.semver,r);return o<0?t:o>0||e.operator==="<"&&t.operator==="<="?e:t};Kz.exports=S9e});var zn=_((BQt,Xz)=>{var uN=vy(),Jz=gI(),x9e=So(),zz=JT(),k9e=sd(),Q9e=dJ(),F9e=yJ(),R9e=wJ(),T9e=vJ(),N9e=SJ(),L9e=bJ(),O9e=kJ(),M9e=FJ(),U9e=Ll(),_9e=LJ(),H9e=MJ(),j9e=dS(),G9e=jJ(),q9e=qJ(),Y9e=mI(),W9e=mS(),K9e=zT(),V9e=XT(),J9e=yS(),z9e=ES(),X9e=ZT(),Z9e=$J(),$9e=CI(),e5e=Ol(),t5e=II(),r5e=Cz(),n5e=Iz(),i5e=vz(),s5e=Pz(),o5e=xz(),a5e=vS(),l5e=Nz(),c5e=Oz(),u5e=_z(),A5e=jz(),f5e=Vz();Xz.exports={parse:k9e,valid:Q9e,clean:F9e,inc:R9e,diff:T9e,major:N9e,minor:L9e,patch:O9e,prerelease:M9e,compare:U9e,rcompare:_9e,compareLoose:H9e,compareBuild:j9e,sort:G9e,rsort:q9e,gt:Y9e,lt:W9e,eq:K9e,neq:V9e,gte:J9e,lte:z9e,cmp:X9e,coerce:Z9e,Comparator:$9e,Range:e5e,satisfies:t5e,toComparators:r5e,maxSatisfying:n5e,minSatisfying:i5e,minVersion:s5e,validRange:o5e,outside:a5e,gtr:l5e,ltr:c5e,intersects:u5e,simplifyRange:A5e,subset:f5e,SemVer:x9e,re:uN.re,src:uN.src,tokens:uN.t,SEMVER_SPEC_VERSION:Jz.SEMVER_SPEC_VERSION,RELEASE_TYPES:Jz.RELEASE_TYPES,compareIdentifiers:zz.compareIdentifiers,rcompareIdentifiers:zz.rcompareIdentifiers}});var $z=_((vQt,Zz)=>{"use strict";function p5e(t,e){function r(){this.constructor=t}r.prototype=e.prototype,t.prototype=new r}function ud(t,e,r,o){this.message=t,this.expected=e,this.found=r,this.location=o,this.name="SyntaxError",typeof Error.captureStackTrace=="function"&&Error.captureStackTrace(this,ud)}p5e(ud,Error);ud.buildMessage=function(t,e){var r={literal:function(h){return'"'+a(h.text)+'"'},class:function(h){var E="",I;for(I=0;I<h.parts.length;I++)E+=h.parts[I]instanceof Array?n(h.parts[I][0])+"-"+n(h.parts[I][1]):n(h.parts[I]);return"["+(h.inverted?"^":"")+E+"]"},any:function(h){return"any character"},end:function(h){return"end of input"},other:function(h){return h.description}};function o(h){return h.charCodeAt(0).toString(16).toUpperCase()}function a(h){return h.replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,function(E){return"\\x0"+o(E)}).replace(/[\x10-\x1F\x7F-\x9F]/g,function(E){return"\\x"+o(E)})}function n(h){return h.replace(/\\/g,"\\\\").replace(/\]/g,"\\]").replace(/\^/g,"\\^").replace(/-/g,"\\-").replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,function(E){return"\\x0"+o(E)}).replace(/[\x10-\x1F\x7F-\x9F]/g,function(E){return"\\x"+o(E)})}function u(h){return r[h.type](h)}function A(h){var E=new Array(h.length),I,v;for(I=0;I<h.length;I++)E[I]=u(h[I]);if(E.sort(),E.length>0){for(I=1,v=1;I<E.length;I++)E[I-1]!==E[I]&&(E[v]=E[I],v++);E.length=v}switch(E.length){case 1:return E[0];case 2:return E[0]+" or "+E[1];default:return E.slice(0,-1).join(", ")+", or "+E[E.length-1]}}function p(h){return h?'"'+a(h)+'"':"end of input"}return"Expected "+A(t)+" but "+p(e)+" found."};function h5e(t,e){e=e!==void 0?e:{};var r={},o={Expression:y},a=y,n="|",u=Re("|",!1),A="&",p=Re("&",!1),h="^",E=Re("^",!1),I=function(Z,ie){return!!ie.reduce((Pe,Ne)=>{switch(Ne[1]){case"|":return Pe|Ne[3];case"&":return Pe&Ne[3];case"^":return Pe^Ne[3]}},Z)},v="!",x=Re("!",!1),C=function(Z){return!Z},R="(",L=Re("(",!1),U=")",J=Re(")",!1),te=function(Z){return Z},ae=/^[^ \t\n\r()!|&\^]/,fe=ke([" ","	",`
+`,"\r","(",")","!","|","&","^"],!0,!1),ce=function(Z){return e.queryPattern.test(Z)},me=function(Z){return e.checkFn(Z)},he=Te("whitespace"),Be=/^[ \t\n\r]/,we=ke([" ","	",`
+`,"\r"],!1,!1),g=0,Ee=0,Se=[{line:1,column:1}],le=0,ne=[],ee=0,Ie;if("startRule"in e){if(!(e.startRule in o))throw new Error(`Can't start parsing from rule "`+e.startRule+'".');a=o[e.startRule]}function Fe(){return t.substring(Ee,g)}function At(){return je(Ee,g)}function H(Z,ie){throw ie=ie!==void 0?ie:je(Ee,g),P([Te(Z)],t.substring(Ee,g),ie)}function at(Z,ie){throw ie=ie!==void 0?ie:je(Ee,g),w(Z,ie)}function Re(Z,ie){return{type:"literal",text:Z,ignoreCase:ie}}function ke(Z,ie,Pe){return{type:"class",parts:Z,inverted:ie,ignoreCase:Pe}}function xe(){return{type:"any"}}function He(){return{type:"end"}}function Te(Z){return{type:"other",description:Z}}function Je(Z){var ie=Se[Z],Pe;if(ie)return ie;for(Pe=Z-1;!Se[Pe];)Pe--;for(ie=Se[Pe],ie={line:ie.line,column:ie.column};Pe<Z;)t.charCodeAt(Pe)===10?(ie.line++,ie.column=1):ie.column++,Pe++;return Se[Z]=ie,ie}function je(Z,ie){var Pe=Je(Z),Ne=Je(ie);return{start:{offset:Z,line:Pe.line,column:Pe.column},end:{offset:ie,line:Ne.line,column:Ne.column}}}function b(Z){g<le||(g>le&&(le=g,ne=[]),ne.push(Z))}function w(Z,ie){return new ud(Z,null,null,ie)}function P(Z,ie,Pe){return new ud(ud.buildMessage(Z,ie),Z,ie,Pe)}function y(){var Z,ie,Pe,Ne,ot,dt,Gt,$t;if(Z=g,ie=F(),ie!==r){for(Pe=[],Ne=g,ot=X(),ot!==r?(t.charCodeAt(g)===124?(dt=n,g++):(dt=r,ee===0&&b(u)),dt===r&&(t.charCodeAt(g)===38?(dt=A,g++):(dt=r,ee===0&&b(p)),dt===r&&(t.charCodeAt(g)===94?(dt=h,g++):(dt=r,ee===0&&b(E)))),dt!==r?(Gt=X(),Gt!==r?($t=F(),$t!==r?(ot=[ot,dt,Gt,$t],Ne=ot):(g=Ne,Ne=r)):(g=Ne,Ne=r)):(g=Ne,Ne=r)):(g=Ne,Ne=r);Ne!==r;)Pe.push(Ne),Ne=g,ot=X(),ot!==r?(t.charCodeAt(g)===124?(dt=n,g++):(dt=r,ee===0&&b(u)),dt===r&&(t.charCodeAt(g)===38?(dt=A,g++):(dt=r,ee===0&&b(p)),dt===r&&(t.charCodeAt(g)===94?(dt=h,g++):(dt=r,ee===0&&b(E)))),dt!==r?(Gt=X(),Gt!==r?($t=F(),$t!==r?(ot=[ot,dt,Gt,$t],Ne=ot):(g=Ne,Ne=r)):(g=Ne,Ne=r)):(g=Ne,Ne=r)):(g=Ne,Ne=r);Pe!==r?(Ee=Z,ie=I(ie,Pe),Z=ie):(g=Z,Z=r)}else g=Z,Z=r;return Z}function F(){var Z,ie,Pe,Ne,ot,dt;return Z=g,t.charCodeAt(g)===33?(ie=v,g++):(ie=r,ee===0&&b(x)),ie!==r?(Pe=F(),Pe!==r?(Ee=Z,ie=C(Pe),Z=ie):(g=Z,Z=r)):(g=Z,Z=r),Z===r&&(Z=g,t.charCodeAt(g)===40?(ie=R,g++):(ie=r,ee===0&&b(L)),ie!==r?(Pe=X(),Pe!==r?(Ne=y(),Ne!==r?(ot=X(),ot!==r?(t.charCodeAt(g)===41?(dt=U,g++):(dt=r,ee===0&&b(J)),dt!==r?(Ee=Z,ie=te(Ne),Z=ie):(g=Z,Z=r)):(g=Z,Z=r)):(g=Z,Z=r)):(g=Z,Z=r)):(g=Z,Z=r),Z===r&&(Z=z())),Z}function z(){var Z,ie,Pe,Ne,ot;if(Z=g,ie=X(),ie!==r){if(Pe=g,Ne=[],ae.test(t.charAt(g))?(ot=t.charAt(g),g++):(ot=r,ee===0&&b(fe)),ot!==r)for(;ot!==r;)Ne.push(ot),ae.test(t.charAt(g))?(ot=t.charAt(g),g++):(ot=r,ee===0&&b(fe));else Ne=r;Ne!==r?Pe=t.substring(Pe,g):Pe=Ne,Pe!==r?(Ee=g,Ne=ce(Pe),Ne?Ne=void 0:Ne=r,Ne!==r?(Ee=Z,ie=me(Pe),Z=ie):(g=Z,Z=r)):(g=Z,Z=r)}else g=Z,Z=r;return Z}function X(){var Z,ie;for(ee++,Z=[],Be.test(t.charAt(g))?(ie=t.charAt(g),g++):(ie=r,ee===0&&b(we));ie!==r;)Z.push(ie),Be.test(t.charAt(g))?(ie=t.charAt(g),g++):(ie=r,ee===0&&b(we));return ee--,Z===r&&(ie=r,ee===0&&b(he)),Z}if(Ie=a(),Ie!==r&&g===t.length)return Ie;throw Ie!==r&&g<t.length&&b(He()),P(ne,le<t.length?t.charAt(le):null,le<t.length?je(le,le+1):je(le,le))}Zz.exports={SyntaxError:ud,parse:h5e}});var eX=_(DS=>{var{parse:g5e}=$z();DS.makeParser=(t=/[a-z]+/)=>(e,r)=>g5e(e,{queryPattern:t,checkFn:r});DS.parse=DS.makeParser()});var rX=_((SQt,tX)=>{"use strict";tX.exports={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]}});var AN=_((PQt,iX)=>{var vI=rX(),nX={};for(let t of Object.keys(vI))nX[vI[t]]=t;var Ar={rgb:{channels:3,labels:"rgb"},hsl:{channels:3,labels:"hsl"},hsv:{channels:3,labels:"hsv"},hwb:{channels:3,labels:"hwb"},cmyk:{channels:4,labels:"cmyk"},xyz:{channels:3,labels:"xyz"},lab:{channels:3,labels:"lab"},lch:{channels:3,labels:"lch"},hex:{channels:1,labels:["hex"]},keyword:{channels:1,labels:["keyword"]},ansi16:{channels:1,labels:["ansi16"]},ansi256:{channels:1,labels:["ansi256"]},hcg:{channels:3,labels:["h","c","g"]},apple:{channels:3,labels:["r16","g16","b16"]},gray:{channels:1,labels:["gray"]}};iX.exports=Ar;for(let t of Object.keys(Ar)){if(!("channels"in Ar[t]))throw new Error("missing channels property: "+t);if(!("labels"in Ar[t]))throw new Error("missing channel labels property: "+t);if(Ar[t].labels.length!==Ar[t].channels)throw new Error("channel and label counts mismatch: "+t);let{channels:e,labels:r}=Ar[t];delete Ar[t].channels,delete Ar[t].labels,Object.defineProperty(Ar[t],"channels",{value:e}),Object.defineProperty(Ar[t],"labels",{value:r})}Ar.rgb.hsl=function(t){let e=t[0]/255,r=t[1]/255,o=t[2]/255,a=Math.min(e,r,o),n=Math.max(e,r,o),u=n-a,A,p;n===a?A=0:e===n?A=(r-o)/u:r===n?A=2+(o-e)/u:o===n&&(A=4+(e-r)/u),A=Math.min(A*60,360),A<0&&(A+=360);let h=(a+n)/2;return n===a?p=0:h<=.5?p=u/(n+a):p=u/(2-n-a),[A,p*100,h*100]};Ar.rgb.hsv=function(t){let e,r,o,a,n,u=t[0]/255,A=t[1]/255,p=t[2]/255,h=Math.max(u,A,p),E=h-Math.min(u,A,p),I=function(v){return(h-v)/6/E+1/2};return E===0?(a=0,n=0):(n=E/h,e=I(u),r=I(A),o=I(p),u===h?a=o-r:A===h?a=1/3+e-o:p===h&&(a=2/3+r-e),a<0?a+=1:a>1&&(a-=1)),[a*360,n*100,h*100]};Ar.rgb.hwb=function(t){let e=t[0],r=t[1],o=t[2],a=Ar.rgb.hsl(t)[0],n=1/255*Math.min(e,Math.min(r,o));return o=1-1/255*Math.max(e,Math.max(r,o)),[a,n*100,o*100]};Ar.rgb.cmyk=function(t){let e=t[0]/255,r=t[1]/255,o=t[2]/255,a=Math.min(1-e,1-r,1-o),n=(1-e-a)/(1-a)||0,u=(1-r-a)/(1-a)||0,A=(1-o-a)/(1-a)||0;return[n*100,u*100,A*100,a*100]};function d5e(t,e){return(t[0]-e[0])**2+(t[1]-e[1])**2+(t[2]-e[2])**2}Ar.rgb.keyword=function(t){let e=nX[t];if(e)return e;let r=1/0,o;for(let a of Object.keys(vI)){let n=vI[a],u=d5e(t,n);u<r&&(r=u,o=a)}return o};Ar.keyword.rgb=function(t){return vI[t]};Ar.rgb.xyz=function(t){let e=t[0]/255,r=t[1]/255,o=t[2]/255;e=e>.04045?((e+.055)/1.055)**2.4:e/12.92,r=r>.04045?((r+.055)/1.055)**2.4:r/12.92,o=o>.04045?((o+.055)/1.055)**2.4:o/12.92;let a=e*.4124+r*.3576+o*.1805,n=e*.2126+r*.7152+o*.0722,u=e*.0193+r*.1192+o*.9505;return[a*100,n*100,u*100]};Ar.rgb.lab=function(t){let e=Ar.rgb.xyz(t),r=e[0],o=e[1],a=e[2];r/=95.047,o/=100,a/=108.883,r=r>.008856?r**(1/3):7.787*r+16/116,o=o>.008856?o**(1/3):7.787*o+16/116,a=a>.008856?a**(1/3):7.787*a+16/116;let n=116*o-16,u=500*(r-o),A=200*(o-a);return[n,u,A]};Ar.hsl.rgb=function(t){let e=t[0]/360,r=t[1]/100,o=t[2]/100,a,n,u;if(r===0)return u=o*255,[u,u,u];o<.5?a=o*(1+r):a=o+r-o*r;let A=2*o-a,p=[0,0,0];for(let h=0;h<3;h++)n=e+1/3*-(h-1),n<0&&n++,n>1&&n--,6*n<1?u=A+(a-A)*6*n:2*n<1?u=a:3*n<2?u=A+(a-A)*(2/3-n)*6:u=A,p[h]=u*255;return p};Ar.hsl.hsv=function(t){let e=t[0],r=t[1]/100,o=t[2]/100,a=r,n=Math.max(o,.01);o*=2,r*=o<=1?o:2-o,a*=n<=1?n:2-n;let u=(o+r)/2,A=o===0?2*a/(n+a):2*r/(o+r);return[e,A*100,u*100]};Ar.hsv.rgb=function(t){let e=t[0]/60,r=t[1]/100,o=t[2]/100,a=Math.floor(e)%6,n=e-Math.floor(e),u=255*o*(1-r),A=255*o*(1-r*n),p=255*o*(1-r*(1-n));switch(o*=255,a){case 0:return[o,p,u];case 1:return[A,o,u];case 2:return[u,o,p];case 3:return[u,A,o];case 4:return[p,u,o];case 5:return[o,u,A]}};Ar.hsv.hsl=function(t){let e=t[0],r=t[1]/100,o=t[2]/100,a=Math.max(o,.01),n,u;u=(2-r)*o;let A=(2-r)*a;return n=r*a,n/=A<=1?A:2-A,n=n||0,u/=2,[e,n*100,u*100]};Ar.hwb.rgb=function(t){let e=t[0]/360,r=t[1]/100,o=t[2]/100,a=r+o,n;a>1&&(r/=a,o/=a);let u=Math.floor(6*e),A=1-o;n=6*e-u,(u&1)!==0&&(n=1-n);let p=r+n*(A-r),h,E,I;switch(u){default:case 6:case 0:h=A,E=p,I=r;break;case 1:h=p,E=A,I=r;break;case 2:h=r,E=A,I=p;break;case 3:h=r,E=p,I=A;break;case 4:h=p,E=r,I=A;break;case 5:h=A,E=r,I=p;break}return[h*255,E*255,I*255]};Ar.cmyk.rgb=function(t){let e=t[0]/100,r=t[1]/100,o=t[2]/100,a=t[3]/100,n=1-Math.min(1,e*(1-a)+a),u=1-Math.min(1,r*(1-a)+a),A=1-Math.min(1,o*(1-a)+a);return[n*255,u*255,A*255]};Ar.xyz.rgb=function(t){let e=t[0]/100,r=t[1]/100,o=t[2]/100,a,n,u;return a=e*3.2406+r*-1.5372+o*-.4986,n=e*-.9689+r*1.8758+o*.0415,u=e*.0557+r*-.204+o*1.057,a=a>.0031308?1.055*a**(1/2.4)-.055:a*12.92,n=n>.0031308?1.055*n**(1/2.4)-.055:n*12.92,u=u>.0031308?1.055*u**(1/2.4)-.055:u*12.92,a=Math.min(Math.max(0,a),1),n=Math.min(Math.max(0,n),1),u=Math.min(Math.max(0,u),1),[a*255,n*255,u*255]};Ar.xyz.lab=function(t){let e=t[0],r=t[1],o=t[2];e/=95.047,r/=100,o/=108.883,e=e>.008856?e**(1/3):7.787*e+16/116,r=r>.008856?r**(1/3):7.787*r+16/116,o=o>.008856?o**(1/3):7.787*o+16/116;let a=116*r-16,n=500*(e-r),u=200*(r-o);return[a,n,u]};Ar.lab.xyz=function(t){let e=t[0],r=t[1],o=t[2],a,n,u;n=(e+16)/116,a=r/500+n,u=n-o/200;let A=n**3,p=a**3,h=u**3;return n=A>.008856?A:(n-16/116)/7.787,a=p>.008856?p:(a-16/116)/7.787,u=h>.008856?h:(u-16/116)/7.787,a*=95.047,n*=100,u*=108.883,[a,n,u]};Ar.lab.lch=function(t){let e=t[0],r=t[1],o=t[2],a;a=Math.atan2(o,r)*360/2/Math.PI,a<0&&(a+=360);let u=Math.sqrt(r*r+o*o);return[e,u,a]};Ar.lch.lab=function(t){let e=t[0],r=t[1],a=t[2]/360*2*Math.PI,n=r*Math.cos(a),u=r*Math.sin(a);return[e,n,u]};Ar.rgb.ansi16=function(t,e=null){let[r,o,a]=t,n=e===null?Ar.rgb.hsv(t)[2]:e;if(n=Math.round(n/50),n===0)return 30;let u=30+(Math.round(a/255)<<2|Math.round(o/255)<<1|Math.round(r/255));return n===2&&(u+=60),u};Ar.hsv.ansi16=function(t){return Ar.rgb.ansi16(Ar.hsv.rgb(t),t[2])};Ar.rgb.ansi256=function(t){let e=t[0],r=t[1],o=t[2];return e===r&&r===o?e<8?16:e>248?231:Math.round((e-8)/247*24)+232:16+36*Math.round(e/255*5)+6*Math.round(r/255*5)+Math.round(o/255*5)};Ar.ansi16.rgb=function(t){let e=t%10;if(e===0||e===7)return t>50&&(e+=3.5),e=e/10.5*255,[e,e,e];let r=(~~(t>50)+1)*.5,o=(e&1)*r*255,a=(e>>1&1)*r*255,n=(e>>2&1)*r*255;return[o,a,n]};Ar.ansi256.rgb=function(t){if(t>=232){let n=(t-232)*10+8;return[n,n,n]}t-=16;let e,r=Math.floor(t/36)/5*255,o=Math.floor((e=t%36)/6)/5*255,a=e%6/5*255;return[r,o,a]};Ar.rgb.hex=function(t){let r=(((Math.round(t[0])&255)<<16)+((Math.round(t[1])&255)<<8)+(Math.round(t[2])&255)).toString(16).toUpperCase();return"000000".substring(r.length)+r};Ar.hex.rgb=function(t){let e=t.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);if(!e)return[0,0,0];let r=e[0];e[0].length===3&&(r=r.split("").map(A=>A+A).join(""));let o=parseInt(r,16),a=o>>16&255,n=o>>8&255,u=o&255;return[a,n,u]};Ar.rgb.hcg=function(t){let e=t[0]/255,r=t[1]/255,o=t[2]/255,a=Math.max(Math.max(e,r),o),n=Math.min(Math.min(e,r),o),u=a-n,A,p;return u<1?A=n/(1-u):A=0,u<=0?p=0:a===e?p=(r-o)/u%6:a===r?p=2+(o-e)/u:p=4+(e-r)/u,p/=6,p%=1,[p*360,u*100,A*100]};Ar.hsl.hcg=function(t){let e=t[1]/100,r=t[2]/100,o=r<.5?2*e*r:2*e*(1-r),a=0;return o<1&&(a=(r-.5*o)/(1-o)),[t[0],o*100,a*100]};Ar.hsv.hcg=function(t){let e=t[1]/100,r=t[2]/100,o=e*r,a=0;return o<1&&(a=(r-o)/(1-o)),[t[0],o*100,a*100]};Ar.hcg.rgb=function(t){let e=t[0]/360,r=t[1]/100,o=t[2]/100;if(r===0)return[o*255,o*255,o*255];let a=[0,0,0],n=e%1*6,u=n%1,A=1-u,p=0;switch(Math.floor(n)){case 0:a[0]=1,a[1]=u,a[2]=0;break;case 1:a[0]=A,a[1]=1,a[2]=0;break;case 2:a[0]=0,a[1]=1,a[2]=u;break;case 3:a[0]=0,a[1]=A,a[2]=1;break;case 4:a[0]=u,a[1]=0,a[2]=1;break;default:a[0]=1,a[1]=0,a[2]=A}return p=(1-r)*o,[(r*a[0]+p)*255,(r*a[1]+p)*255,(r*a[2]+p)*255]};Ar.hcg.hsv=function(t){let e=t[1]/100,r=t[2]/100,o=e+r*(1-e),a=0;return o>0&&(a=e/o),[t[0],a*100,o*100]};Ar.hcg.hsl=function(t){let e=t[1]/100,o=t[2]/100*(1-e)+.5*e,a=0;return o>0&&o<.5?a=e/(2*o):o>=.5&&o<1&&(a=e/(2*(1-o))),[t[0],a*100,o*100]};Ar.hcg.hwb=function(t){let e=t[1]/100,r=t[2]/100,o=e+r*(1-e);return[t[0],(o-e)*100,(1-o)*100]};Ar.hwb.hcg=function(t){let e=t[1]/100,o=1-t[2]/100,a=o-e,n=0;return a<1&&(n=(o-a)/(1-a)),[t[0],a*100,n*100]};Ar.apple.rgb=function(t){return[t[0]/65535*255,t[1]/65535*255,t[2]/65535*255]};Ar.rgb.apple=function(t){return[t[0]/255*65535,t[1]/255*65535,t[2]/255*65535]};Ar.gray.rgb=function(t){return[t[0]/100*255,t[0]/100*255,t[0]/100*255]};Ar.gray.hsl=function(t){return[0,0,t[0]]};Ar.gray.hsv=Ar.gray.hsl;Ar.gray.hwb=function(t){return[0,100,t[0]]};Ar.gray.cmyk=function(t){return[0,0,0,t[0]]};Ar.gray.lab=function(t){return[t[0],0,0]};Ar.gray.hex=function(t){let e=Math.round(t[0]/100*255)&255,o=((e<<16)+(e<<8)+e).toString(16).toUpperCase();return"000000".substring(o.length)+o};Ar.rgb.gray=function(t){return[(t[0]+t[1]+t[2])/3/255*100]}});var oX=_((bQt,sX)=>{var SS=AN();function m5e(){let t={},e=Object.keys(SS);for(let r=e.length,o=0;o<r;o++)t[e[o]]={distance:-1,parent:null};return t}function y5e(t){let e=m5e(),r=[t];for(e[t].distance=0;r.length;){let o=r.pop(),a=Object.keys(SS[o]);for(let n=a.length,u=0;u<n;u++){let A=a[u],p=e[A];p.distance===-1&&(p.distance=e[o].distance+1,p.parent=o,r.unshift(A))}}return e}function E5e(t,e){return function(r){return e(t(r))}}function C5e(t,e){let r=[e[t].parent,t],o=SS[e[t].parent][t],a=e[t].parent;for(;e[a].parent;)r.unshift(e[a].parent),o=E5e(SS[e[a].parent][a],o),a=e[a].parent;return o.conversion=r,o}sX.exports=function(t){let e=y5e(t),r={},o=Object.keys(e);for(let a=o.length,n=0;n<a;n++){let u=o[n];e[u].parent!==null&&(r[u]=C5e(u,e))}return r}});var lX=_((xQt,aX)=>{var fN=AN(),w5e=oX(),xy={},I5e=Object.keys(fN);function B5e(t){let e=function(...r){let o=r[0];return o==null?o:(o.length>1&&(r=o),t(r))};return"conversion"in t&&(e.conversion=t.conversion),e}function v5e(t){let e=function(...r){let o=r[0];if(o==null)return o;o.length>1&&(r=o);let a=t(r);if(typeof a=="object")for(let n=a.length,u=0;u<n;u++)a[u]=Math.round(a[u]);return a};return"conversion"in t&&(e.conversion=t.conversion),e}I5e.forEach(t=>{xy[t]={},Object.defineProperty(xy[t],"channels",{value:fN[t].channels}),Object.defineProperty(xy[t],"labels",{value:fN[t].labels});let e=w5e(t);Object.keys(e).forEach(o=>{let a=e[o];xy[t][o]=v5e(a),xy[t][o].raw=B5e(a)})});aX.exports=xy});var DI=_((kQt,pX)=>{"use strict";var cX=(t,e)=>(...r)=>`\x1B[${t(...r)+e}m`,uX=(t,e)=>(...r)=>{let o=t(...r);return`\x1B[${38+e};5;${o}m`},AX=(t,e)=>(...r)=>{let o=t(...r);return`\x1B[${38+e};2;${o[0]};${o[1]};${o[2]}m`},PS=t=>t,fX=(t,e,r)=>[t,e,r],ky=(t,e,r)=>{Object.defineProperty(t,e,{get:()=>{let o=r();return Object.defineProperty(t,e,{value:o,enumerable:!0,configurable:!0}),o},enumerable:!0,configurable:!0})},pN,Qy=(t,e,r,o)=>{pN===void 0&&(pN=lX());let a=o?10:0,n={};for(let[u,A]of Object.entries(pN)){let p=u==="ansi16"?"ansi":u;u===e?n[p]=t(r,a):typeof A=="object"&&(n[p]=t(A[e],a))}return n};function D5e(){let t=new Map,e={modifier:{reset:[0,0],bold:[1,22],dim:[2,22],italic:[3,23],underline:[4,24],inverse:[7,27],hidden:[8,28],strikethrough:[9,29]},color:{black:[30,39],red:[31,39],green:[32,39],yellow:[33,39],blue:[34,39],magenta:[35,39],cyan:[36,39],white:[37,39],blackBright:[90,39],redBright:[91,39],greenBright:[92,39],yellowBright:[93,39],blueBright:[94,39],magentaBright:[95,39],cyanBright:[96,39],whiteBright:[97,39]},bgColor:{bgBlack:[40,49],bgRed:[41,49],bgGreen:[42,49],bgYellow:[43,49],bgBlue:[44,49],bgMagenta:[45,49],bgCyan:[46,49],bgWhite:[47,49],bgBlackBright:[100,49],bgRedBright:[101,49],bgGreenBright:[102,49],bgYellowBright:[103,49],bgBlueBright:[104,49],bgMagentaBright:[105,49],bgCyanBright:[106,49],bgWhiteBright:[107,49]}};e.color.gray=e.color.blackBright,e.bgColor.bgGray=e.bgColor.bgBlackBright,e.color.grey=e.color.blackBright,e.bgColor.bgGrey=e.bgColor.bgBlackBright;for(let[r,o]of Object.entries(e)){for(let[a,n]of Object.entries(o))e[a]={open:`\x1B[${n[0]}m`,close:`\x1B[${n[1]}m`},o[a]=e[a],t.set(n[0],n[1]);Object.defineProperty(e,r,{value:o,enumerable:!1})}return Object.defineProperty(e,"codes",{value:t,enumerable:!1}),e.color.close="\x1B[39m",e.bgColor.close="\x1B[49m",ky(e.color,"ansi",()=>Qy(cX,"ansi16",PS,!1)),ky(e.color,"ansi256",()=>Qy(uX,"ansi256",PS,!1)),ky(e.color,"ansi16m",()=>Qy(AX,"rgb",fX,!1)),ky(e.bgColor,"ansi",()=>Qy(cX,"ansi16",PS,!0)),ky(e.bgColor,"ansi256",()=>Qy(uX,"ansi256",PS,!0)),ky(e.bgColor,"ansi16m",()=>Qy(AX,"rgb",fX,!0)),e}Object.defineProperty(pX,"exports",{enumerable:!0,get:D5e})});var gX=_((QQt,hX)=>{"use strict";hX.exports=(t,e=process.argv)=>{let r=t.startsWith("-")?"":t.length===1?"-":"--",o=e.indexOf(r+t),a=e.indexOf("--");return o!==-1&&(a===-1||o<a)}});var dN=_((FQt,mX)=>{"use strict";var S5e=ve("os"),dX=ve("tty"),Ml=gX(),{env:ls}=process,Jp;Ml("no-color")||Ml("no-colors")||Ml("color=false")||Ml("color=never")?Jp=0:(Ml("color")||Ml("colors")||Ml("color=true")||Ml("color=always"))&&(Jp=1);"FORCE_COLOR"in ls&&(ls.FORCE_COLOR==="true"?Jp=1:ls.FORCE_COLOR==="false"?Jp=0:Jp=ls.FORCE_COLOR.length===0?1:Math.min(parseInt(ls.FORCE_COLOR,10),3));function hN(t){return t===0?!1:{level:t,hasBasic:!0,has256:t>=2,has16m:t>=3}}function gN(t,e){if(Jp===0)return 0;if(Ml("color=16m")||Ml("color=full")||Ml("color=truecolor"))return 3;if(Ml("color=256"))return 2;if(t&&!e&&Jp===void 0)return 0;let r=Jp||0;if(ls.TERM==="dumb")return r;if(process.platform==="win32"){let o=S5e.release().split(".");return Number(o[0])>=10&&Number(o[2])>=10586?Number(o[2])>=14931?3:2:1}if("CI"in ls)return["TRAVIS","CIRCLECI","APPVEYOR","GITLAB_CI"].some(o=>o in ls)||ls.CI_NAME==="codeship"?1:r;if("TEAMCITY_VERSION"in ls)return/^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(ls.TEAMCITY_VERSION)?1:0;if("GITHUB_ACTIONS"in ls)return 1;if(ls.COLORTERM==="truecolor")return 3;if("TERM_PROGRAM"in ls){let o=parseInt((ls.TERM_PROGRAM_VERSION||"").split(".")[0],10);switch(ls.TERM_PROGRAM){case"iTerm.app":return o>=3?3:2;case"Apple_Terminal":return 2}}return/-256(color)?$/i.test(ls.TERM)?2:/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(ls.TERM)||"COLORTERM"in ls?1:r}function P5e(t){let e=gN(t,t&&t.isTTY);return hN(e)}mX.exports={supportsColor:P5e,stdout:hN(gN(!0,dX.isatty(1))),stderr:hN(gN(!0,dX.isatty(2)))}});var EX=_((RQt,yX)=>{"use strict";var b5e=(t,e,r)=>{let o=t.indexOf(e);if(o===-1)return t;let a=e.length,n=0,u="";do u+=t.substr(n,o-n)+e+r,n=o+a,o=t.indexOf(e,n);while(o!==-1);return u+=t.substr(n),u},x5e=(t,e,r,o)=>{let a=0,n="";do{let u=t[o-1]==="\r";n+=t.substr(a,(u?o-1:o)-a)+e+(u?`\r
+`:`
+`)+r,a=o+1,o=t.indexOf(`
+`,a)}while(o!==-1);return n+=t.substr(a),n};yX.exports={stringReplaceAll:b5e,stringEncaseCRLFWithFirstIndex:x5e}});var vX=_((TQt,BX)=>{"use strict";var k5e=/(?:\\(u(?:[a-f\d]{4}|\{[a-f\d]{1,6}\})|x[a-f\d]{2}|.))|(?:\{(~)?(\w+(?:\([^)]*\))?(?:\.\w+(?:\([^)]*\))?)*)(?:[ \t]|(?=\r?\n)))|(\})|((?:.|[\r\n\f])+?)/gi,CX=/(?:^|\.)(\w+)(?:\(([^)]*)\))?/g,Q5e=/^(['"])((?:\\.|(?!\1)[^\\])*)\1$/,F5e=/\\(u(?:[a-f\d]{4}|\{[a-f\d]{1,6}\})|x[a-f\d]{2}|.)|([^\\])/gi,R5e=new Map([["n",`
+`],["r","\r"],["t","	"],["b","\b"],["f","\f"],["v","\v"],["0","\0"],["\\","\\"],["e","\x1B"],["a","\x07"]]);function IX(t){let e=t[0]==="u",r=t[1]==="{";return e&&!r&&t.length===5||t[0]==="x"&&t.length===3?String.fromCharCode(parseInt(t.slice(1),16)):e&&r?String.fromCodePoint(parseInt(t.slice(2,-1),16)):R5e.get(t)||t}function T5e(t,e){let r=[],o=e.trim().split(/\s*,\s*/g),a;for(let n of o){let u=Number(n);if(!Number.isNaN(u))r.push(u);else if(a=n.match(Q5e))r.push(a[2].replace(F5e,(A,p,h)=>p?IX(p):h));else throw new Error(`Invalid Chalk template style argument: ${n} (in style '${t}')`)}return r}function N5e(t){CX.lastIndex=0;let e=[],r;for(;(r=CX.exec(t))!==null;){let o=r[1];if(r[2]){let a=T5e(o,r[2]);e.push([o].concat(a))}else e.push([o])}return e}function wX(t,e){let r={};for(let a of e)for(let n of a.styles)r[n[0]]=a.inverse?null:n.slice(1);let o=t;for(let[a,n]of Object.entries(r))if(!!Array.isArray(n)){if(!(a in o))throw new Error(`Unknown Chalk style: ${a}`);o=n.length>0?o[a](...n):o[a]}return o}BX.exports=(t,e)=>{let r=[],o=[],a=[];if(e.replace(k5e,(n,u,A,p,h,E)=>{if(u)a.push(IX(u));else if(p){let I=a.join("");a=[],o.push(r.length===0?I:wX(t,r)(I)),r.push({inverse:A,styles:N5e(p)})}else if(h){if(r.length===0)throw new Error("Found extraneous } in Chalk template literal");o.push(wX(t,r)(a.join(""))),a=[],r.pop()}else a.push(E)}),o.push(a.join("")),r.length>0){let n=`Chalk template literal is missing ${r.length} closing bracket${r.length===1?"":"s"} (\`}\`)`;throw new Error(n)}return o.join("")}});var IN=_((NQt,bX)=>{"use strict";var SI=DI(),{stdout:yN,stderr:EN}=dN(),{stringReplaceAll:L5e,stringEncaseCRLFWithFirstIndex:O5e}=EX(),DX=["ansi","ansi","ansi256","ansi16m"],Fy=Object.create(null),M5e=(t,e={})=>{if(e.level>3||e.level<0)throw new Error("The `level` option should be an integer from 0 to 3");let r=yN?yN.level:0;t.level=e.level===void 0?r:e.level},CN=class{constructor(e){return SX(e)}},SX=t=>{let e={};return M5e(e,t),e.template=(...r)=>H5e(e.template,...r),Object.setPrototypeOf(e,bS.prototype),Object.setPrototypeOf(e.template,e),e.template.constructor=()=>{throw new Error("`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.")},e.template.Instance=CN,e.template};function bS(t){return SX(t)}for(let[t,e]of Object.entries(SI))Fy[t]={get(){let r=xS(this,wN(e.open,e.close,this._styler),this._isEmpty);return Object.defineProperty(this,t,{value:r}),r}};Fy.visible={get(){let t=xS(this,this._styler,!0);return Object.defineProperty(this,"visible",{value:t}),t}};var PX=["rgb","hex","keyword","hsl","hsv","hwb","ansi","ansi256"];for(let t of PX)Fy[t]={get(){let{level:e}=this;return function(...r){let o=wN(SI.color[DX[e]][t](...r),SI.color.close,this._styler);return xS(this,o,this._isEmpty)}}};for(let t of PX){let e="bg"+t[0].toUpperCase()+t.slice(1);Fy[e]={get(){let{level:r}=this;return function(...o){let a=wN(SI.bgColor[DX[r]][t](...o),SI.bgColor.close,this._styler);return xS(this,a,this._isEmpty)}}}}var U5e=Object.defineProperties(()=>{},{...Fy,level:{enumerable:!0,get(){return this._generator.level},set(t){this._generator.level=t}}}),wN=(t,e,r)=>{let o,a;return r===void 0?(o=t,a=e):(o=r.openAll+t,a=e+r.closeAll),{open:t,close:e,openAll:o,closeAll:a,parent:r}},xS=(t,e,r)=>{let o=(...a)=>_5e(o,a.length===1?""+a[0]:a.join(" "));return o.__proto__=U5e,o._generator=t,o._styler=e,o._isEmpty=r,o},_5e=(t,e)=>{if(t.level<=0||!e)return t._isEmpty?"":e;let r=t._styler;if(r===void 0)return e;let{openAll:o,closeAll:a}=r;if(e.indexOf("\x1B")!==-1)for(;r!==void 0;)e=L5e(e,r.close,r.open),r=r.parent;let n=e.indexOf(`
+`);return n!==-1&&(e=O5e(e,a,o,n)),o+e+a},mN,H5e=(t,...e)=>{let[r]=e;if(!Array.isArray(r))return e.join(" ");let o=e.slice(1),a=[r.raw[0]];for(let n=1;n<r.length;n++)a.push(String(o[n-1]).replace(/[{}\\]/g,"\\$&"),String(r.raw[n]));return mN===void 0&&(mN=vX()),mN(t,a.join(""))};Object.defineProperties(bS.prototype,Fy);var PI=bS();PI.supportsColor=yN;PI.stderr=bS({level:EN?EN.level:0});PI.stderr.supportsColor=EN;PI.Level={None:0,Basic:1,Ansi256:2,TrueColor:3,0:"None",1:"Basic",2:"Ansi256",3:"TrueColor"};bX.exports=PI});var kS=_(Ul=>{"use strict";Ul.isInteger=t=>typeof t=="number"?Number.isInteger(t):typeof t=="string"&&t.trim()!==""?Number.isInteger(Number(t)):!1;Ul.find=(t,e)=>t.nodes.find(r=>r.type===e);Ul.exceedsLimit=(t,e,r=1,o)=>o===!1||!Ul.isInteger(t)||!Ul.isInteger(e)?!1:(Number(e)-Number(t))/Number(r)>=o;Ul.escapeNode=(t,e=0,r)=>{let o=t.nodes[e];!o||(r&&o.type===r||o.type==="open"||o.type==="close")&&o.escaped!==!0&&(o.value="\\"+o.value,o.escaped=!0)};Ul.encloseBrace=t=>t.type!=="brace"?!1:t.commas>>0+t.ranges>>0===0?(t.invalid=!0,!0):!1;Ul.isInvalidBrace=t=>t.type!=="brace"?!1:t.invalid===!0||t.dollar?!0:t.commas>>0+t.ranges>>0===0||t.open!==!0||t.close!==!0?(t.invalid=!0,!0):!1;Ul.isOpenOrClose=t=>t.type==="open"||t.type==="close"?!0:t.open===!0||t.close===!0;Ul.reduce=t=>t.reduce((e,r)=>(r.type==="text"&&e.push(r.value),r.type==="range"&&(r.type="text"),e),[]);Ul.flatten=(...t)=>{let e=[],r=o=>{for(let a=0;a<o.length;a++){let n=o[a];Array.isArray(n)?r(n,e):n!==void 0&&e.push(n)}return e};return r(t),e}});var QS=_((OQt,kX)=>{"use strict";var xX=kS();kX.exports=(t,e={})=>{let r=(o,a={})=>{let n=e.escapeInvalid&&xX.isInvalidBrace(a),u=o.invalid===!0&&e.escapeInvalid===!0,A="";if(o.value)return(n||u)&&xX.isOpenOrClose(o)?"\\"+o.value:o.value;if(o.value)return o.value;if(o.nodes)for(let p of o.nodes)A+=r(p);return A};return r(t)}});var FX=_((MQt,QX)=>{"use strict";QX.exports=function(t){return typeof t=="number"?t-t===0:typeof t=="string"&&t.trim()!==""?Number.isFinite?Number.isFinite(+t):isFinite(+t):!1}});var HX=_((UQt,_X)=>{"use strict";var RX=FX(),Ad=(t,e,r)=>{if(RX(t)===!1)throw new TypeError("toRegexRange: expected the first argument to be a number");if(e===void 0||t===e)return String(t);if(RX(e)===!1)throw new TypeError("toRegexRange: expected the second argument to be a number.");let o={relaxZeros:!0,...r};typeof o.strictZeros=="boolean"&&(o.relaxZeros=o.strictZeros===!1);let a=String(o.relaxZeros),n=String(o.shorthand),u=String(o.capture),A=String(o.wrap),p=t+":"+e+"="+a+n+u+A;if(Ad.cache.hasOwnProperty(p))return Ad.cache[p].result;let h=Math.min(t,e),E=Math.max(t,e);if(Math.abs(h-E)===1){let R=t+"|"+e;return o.capture?`(${R})`:o.wrap===!1?R:`(?:${R})`}let I=UX(t)||UX(e),v={min:t,max:e,a:h,b:E},x=[],C=[];if(I&&(v.isPadded=I,v.maxLen=String(v.max).length),h<0){let R=E<0?Math.abs(E):1;C=TX(R,Math.abs(h),v,o),h=v.a=0}return E>=0&&(x=TX(h,E,v,o)),v.negatives=C,v.positives=x,v.result=j5e(C,x,o),o.capture===!0?v.result=`(${v.result})`:o.wrap!==!1&&x.length+C.length>1&&(v.result=`(?:${v.result})`),Ad.cache[p]=v,v.result};function j5e(t,e,r){let o=BN(t,e,"-",!1,r)||[],a=BN(e,t,"",!1,r)||[],n=BN(t,e,"-?",!0,r)||[];return o.concat(n).concat(a).join("|")}function G5e(t,e){let r=1,o=1,a=LX(t,r),n=new Set([e]);for(;t<=a&&a<=e;)n.add(a),r+=1,a=LX(t,r);for(a=OX(e+1,o)-1;t<a&&a<=e;)n.add(a),o+=1,a=OX(e+1,o)-1;return n=[...n],n.sort(W5e),n}function q5e(t,e,r){if(t===e)return{pattern:t,count:[],digits:0};let o=Y5e(t,e),a=o.length,n="",u=0;for(let A=0;A<a;A++){let[p,h]=o[A];p===h?n+=p:p!=="0"||h!=="9"?n+=K5e(p,h,r):u++}return u&&(n+=r.shorthand===!0?"\\d":"[0-9]"),{pattern:n,count:[u],digits:a}}function TX(t,e,r,o){let a=G5e(t,e),n=[],u=t,A;for(let p=0;p<a.length;p++){let h=a[p],E=q5e(String(u),String(h),o),I="";if(!r.isPadded&&A&&A.pattern===E.pattern){A.count.length>1&&A.count.pop(),A.count.push(E.count[0]),A.string=A.pattern+MX(A.count),u=h+1;continue}r.isPadded&&(I=V5e(h,r,o)),E.string=I+E.pattern+MX(E.count),n.push(E),u=h+1,A=E}return n}function BN(t,e,r,o,a){let n=[];for(let u of t){let{string:A}=u;!o&&!NX(e,"string",A)&&n.push(r+A),o&&NX(e,"string",A)&&n.push(r+A)}return n}function Y5e(t,e){let r=[];for(let o=0;o<t.length;o++)r.push([t[o],e[o]]);return r}function W5e(t,e){return t>e?1:e>t?-1:0}function NX(t,e,r){return t.some(o=>o[e]===r)}function LX(t,e){return Number(String(t).slice(0,-e)+"9".repeat(e))}function OX(t,e){return t-t%Math.pow(10,e)}function MX(t){let[e=0,r=""]=t;return r||e>1?`{${e+(r?","+r:"")}}`:""}function K5e(t,e,r){return`[${t}${e-t===1?"":"-"}${e}]`}function UX(t){return/^-?(0+)\d/.test(t)}function V5e(t,e,r){if(!e.isPadded)return t;let o=Math.abs(e.maxLen-String(t).length),a=r.relaxZeros!==!1;switch(o){case 0:return"";case 1:return a?"0?":"0";case 2:return a?"0{0,2}":"00";default:return a?`0{0,${o}}`:`0{${o}}`}}Ad.cache={};Ad.clearCache=()=>Ad.cache={};_X.exports=Ad});var SN=_((_Qt,JX)=>{"use strict";var J5e=ve("util"),qX=HX(),jX=t=>t!==null&&typeof t=="object"&&!Array.isArray(t),z5e=t=>e=>t===!0?Number(e):String(e),vN=t=>typeof t=="number"||typeof t=="string"&&t!=="",bI=t=>Number.isInteger(+t),DN=t=>{let e=`${t}`,r=-1;if(e[0]==="-"&&(e=e.slice(1)),e==="0")return!1;for(;e[++r]==="0";);return r>0},X5e=(t,e,r)=>typeof t=="string"||typeof e=="string"?!0:r.stringify===!0,Z5e=(t,e,r)=>{if(e>0){let o=t[0]==="-"?"-":"";o&&(t=t.slice(1)),t=o+t.padStart(o?e-1:e,"0")}return r===!1?String(t):t},GX=(t,e)=>{let r=t[0]==="-"?"-":"";for(r&&(t=t.slice(1),e--);t.length<e;)t="0"+t;return r?"-"+t:t},$5e=(t,e)=>{t.negatives.sort((u,A)=>u<A?-1:u>A?1:0),t.positives.sort((u,A)=>u<A?-1:u>A?1:0);let r=e.capture?"":"?:",o="",a="",n;return t.positives.length&&(o=t.positives.join("|")),t.negatives.length&&(a=`-(${r}${t.negatives.join("|")})`),o&&a?n=`${o}|${a}`:n=o||a,e.wrap?`(${r}${n})`:n},YX=(t,e,r,o)=>{if(r)return qX(t,e,{wrap:!1,...o});let a=String.fromCharCode(t);if(t===e)return a;let n=String.fromCharCode(e);return`[${a}-${n}]`},WX=(t,e,r)=>{if(Array.isArray(t)){let o=r.wrap===!0,a=r.capture?"":"?:";return o?`(${a}${t.join("|")})`:t.join("|")}return qX(t,e,r)},KX=(...t)=>new RangeError("Invalid range arguments: "+J5e.inspect(...t)),VX=(t,e,r)=>{if(r.strictRanges===!0)throw KX([t,e]);return[]},e7e=(t,e)=>{if(e.strictRanges===!0)throw new TypeError(`Expected step "${t}" to be a number`);return[]},t7e=(t,e,r=1,o={})=>{let a=Number(t),n=Number(e);if(!Number.isInteger(a)||!Number.isInteger(n)){if(o.strictRanges===!0)throw KX([t,e]);return[]}a===0&&(a=0),n===0&&(n=0);let u=a>n,A=String(t),p=String(e),h=String(r);r=Math.max(Math.abs(r),1);let E=DN(A)||DN(p)||DN(h),I=E?Math.max(A.length,p.length,h.length):0,v=E===!1&&X5e(t,e,o)===!1,x=o.transform||z5e(v);if(o.toRegex&&r===1)return YX(GX(t,I),GX(e,I),!0,o);let C={negatives:[],positives:[]},R=J=>C[J<0?"negatives":"positives"].push(Math.abs(J)),L=[],U=0;for(;u?a>=n:a<=n;)o.toRegex===!0&&r>1?R(a):L.push(Z5e(x(a,U),I,v)),a=u?a-r:a+r,U++;return o.toRegex===!0?r>1?$5e(C,o):WX(L,null,{wrap:!1,...o}):L},r7e=(t,e,r=1,o={})=>{if(!bI(t)&&t.length>1||!bI(e)&&e.length>1)return VX(t,e,o);let a=o.transform||(v=>String.fromCharCode(v)),n=`${t}`.charCodeAt(0),u=`${e}`.charCodeAt(0),A=n>u,p=Math.min(n,u),h=Math.max(n,u);if(o.toRegex&&r===1)return YX(p,h,!1,o);let E=[],I=0;for(;A?n>=u:n<=u;)E.push(a(n,I)),n=A?n-r:n+r,I++;return o.toRegex===!0?WX(E,null,{wrap:!1,options:o}):E},RS=(t,e,r,o={})=>{if(e==null&&vN(t))return[t];if(!vN(t)||!vN(e))return VX(t,e,o);if(typeof r=="function")return RS(t,e,1,{transform:r});if(jX(r))return RS(t,e,0,r);let a={...o};return a.capture===!0&&(a.wrap=!0),r=r||a.step||1,bI(r)?bI(t)&&bI(e)?t7e(t,e,r,a):r7e(t,e,Math.max(Math.abs(r),1),a):r!=null&&!jX(r)?e7e(r,a):RS(t,e,1,r)};JX.exports=RS});var ZX=_((HQt,XX)=>{"use strict";var n7e=SN(),zX=kS(),i7e=(t,e={})=>{let r=(o,a={})=>{let n=zX.isInvalidBrace(a),u=o.invalid===!0&&e.escapeInvalid===!0,A=n===!0||u===!0,p=e.escapeInvalid===!0?"\\":"",h="";if(o.isOpen===!0||o.isClose===!0)return p+o.value;if(o.type==="open")return A?p+o.value:"(";if(o.type==="close")return A?p+o.value:")";if(o.type==="comma")return o.prev.type==="comma"?"":A?o.value:"|";if(o.value)return o.value;if(o.nodes&&o.ranges>0){let E=zX.reduce(o.nodes),I=n7e(...E,{...e,wrap:!1,toRegex:!0});if(I.length!==0)return E.length>1&&I.length>1?`(${I})`:I}if(o.nodes)for(let E of o.nodes)h+=r(E,o);return h};return r(t)};XX.exports=i7e});var tZ=_((jQt,eZ)=>{"use strict";var s7e=SN(),$X=QS(),Ry=kS(),fd=(t="",e="",r=!1)=>{let o=[];if(t=[].concat(t),e=[].concat(e),!e.length)return t;if(!t.length)return r?Ry.flatten(e).map(a=>`{${a}}`):e;for(let a of t)if(Array.isArray(a))for(let n of a)o.push(fd(n,e,r));else for(let n of e)r===!0&&typeof n=="string"&&(n=`{${n}}`),o.push(Array.isArray(n)?fd(a,n,r):a+n);return Ry.flatten(o)},o7e=(t,e={})=>{let r=e.rangeLimit===void 0?1e3:e.rangeLimit,o=(a,n={})=>{a.queue=[];let u=n,A=n.queue;for(;u.type!=="brace"&&u.type!=="root"&&u.parent;)u=u.parent,A=u.queue;if(a.invalid||a.dollar){A.push(fd(A.pop(),$X(a,e)));return}if(a.type==="brace"&&a.invalid!==!0&&a.nodes.length===2){A.push(fd(A.pop(),["{}"]));return}if(a.nodes&&a.ranges>0){let I=Ry.reduce(a.nodes);if(Ry.exceedsLimit(...I,e.step,r))throw new RangeError("expanded array length exceeds range limit. Use options.rangeLimit to increase or disable the limit.");let v=s7e(...I,e);v.length===0&&(v=$X(a,e)),A.push(fd(A.pop(),v)),a.nodes=[];return}let p=Ry.encloseBrace(a),h=a.queue,E=a;for(;E.type!=="brace"&&E.type!=="root"&&E.parent;)E=E.parent,h=E.queue;for(let I=0;I<a.nodes.length;I++){let v=a.nodes[I];if(v.type==="comma"&&a.type==="brace"){I===1&&h.push(""),h.push("");continue}if(v.type==="close"){A.push(fd(A.pop(),h,p));continue}if(v.value&&v.type!=="open"){h.push(fd(h.pop(),v.value));continue}v.nodes&&o(v,a)}return h};return Ry.flatten(o(t))};eZ.exports=o7e});var nZ=_((GQt,rZ)=>{"use strict";rZ.exports={MAX_LENGTH:1024*64,CHAR_0:"0",CHAR_9:"9",CHAR_UPPERCASE_A:"A",CHAR_LOWERCASE_A:"a",CHAR_UPPERCASE_Z:"Z",CHAR_LOWERCASE_Z:"z",CHAR_LEFT_PARENTHESES:"(",CHAR_RIGHT_PARENTHESES:")",CHAR_ASTERISK:"*",CHAR_AMPERSAND:"&",CHAR_AT:"@",CHAR_BACKSLASH:"\\",CHAR_BACKTICK:"`",CHAR_CARRIAGE_RETURN:"\r",CHAR_CIRCUMFLEX_ACCENT:"^",CHAR_COLON:":",CHAR_COMMA:",",CHAR_DOLLAR:"$",CHAR_DOT:".",CHAR_DOUBLE_QUOTE:'"',CHAR_EQUAL:"=",CHAR_EXCLAMATION_MARK:"!",CHAR_FORM_FEED:"\f",CHAR_FORWARD_SLASH:"/",CHAR_HASH:"#",CHAR_HYPHEN_MINUS:"-",CHAR_LEFT_ANGLE_BRACKET:"<",CHAR_LEFT_CURLY_BRACE:"{",CHAR_LEFT_SQUARE_BRACKET:"[",CHAR_LINE_FEED:`
+`,CHAR_NO_BREAK_SPACE:"\xA0",CHAR_PERCENT:"%",CHAR_PLUS:"+",CHAR_QUESTION_MARK:"?",CHAR_RIGHT_ANGLE_BRACKET:">",CHAR_RIGHT_CURLY_BRACE:"}",CHAR_RIGHT_SQUARE_BRACKET:"]",CHAR_SEMICOLON:";",CHAR_SINGLE_QUOTE:"'",CHAR_SPACE:" ",CHAR_TAB:"	",CHAR_UNDERSCORE:"_",CHAR_VERTICAL_LINE:"|",CHAR_ZERO_WIDTH_NOBREAK_SPACE:"\uFEFF"}});var lZ=_((qQt,aZ)=>{"use strict";var a7e=QS(),{MAX_LENGTH:iZ,CHAR_BACKSLASH:PN,CHAR_BACKTICK:l7e,CHAR_COMMA:c7e,CHAR_DOT:u7e,CHAR_LEFT_PARENTHESES:A7e,CHAR_RIGHT_PARENTHESES:f7e,CHAR_LEFT_CURLY_BRACE:p7e,CHAR_RIGHT_CURLY_BRACE:h7e,CHAR_LEFT_SQUARE_BRACKET:sZ,CHAR_RIGHT_SQUARE_BRACKET:oZ,CHAR_DOUBLE_QUOTE:g7e,CHAR_SINGLE_QUOTE:d7e,CHAR_NO_BREAK_SPACE:m7e,CHAR_ZERO_WIDTH_NOBREAK_SPACE:y7e}=nZ(),E7e=(t,e={})=>{if(typeof t!="string")throw new TypeError("Expected a string");let r=e||{},o=typeof r.maxLength=="number"?Math.min(iZ,r.maxLength):iZ;if(t.length>o)throw new SyntaxError(`Input length (${t.length}), exceeds max characters (${o})`);let a={type:"root",input:t,nodes:[]},n=[a],u=a,A=a,p=0,h=t.length,E=0,I=0,v,x={},C=()=>t[E++],R=L=>{if(L.type==="text"&&A.type==="dot"&&(A.type="text"),A&&A.type==="text"&&L.type==="text"){A.value+=L.value;return}return u.nodes.push(L),L.parent=u,L.prev=A,A=L,L};for(R({type:"bos"});E<h;)if(u=n[n.length-1],v=C(),!(v===y7e||v===m7e)){if(v===PN){R({type:"text",value:(e.keepEscaping?v:"")+C()});continue}if(v===oZ){R({type:"text",value:"\\"+v});continue}if(v===sZ){p++;let L=!0,U;for(;E<h&&(U=C());){if(v+=U,U===sZ){p++;continue}if(U===PN){v+=C();continue}if(U===oZ&&(p--,p===0))break}R({type:"text",value:v});continue}if(v===A7e){u=R({type:"paren",nodes:[]}),n.push(u),R({type:"text",value:v});continue}if(v===f7e){if(u.type!=="paren"){R({type:"text",value:v});continue}u=n.pop(),R({type:"text",value:v}),u=n[n.length-1];continue}if(v===g7e||v===d7e||v===l7e){let L=v,U;for(e.keepQuotes!==!0&&(v="");E<h&&(U=C());){if(U===PN){v+=U+C();continue}if(U===L){e.keepQuotes===!0&&(v+=U);break}v+=U}R({type:"text",value:v});continue}if(v===p7e){I++;let U={type:"brace",open:!0,close:!1,dollar:A.value&&A.value.slice(-1)==="$"||u.dollar===!0,depth:I,commas:0,ranges:0,nodes:[]};u=R(U),n.push(u),R({type:"open",value:v});continue}if(v===h7e){if(u.type!=="brace"){R({type:"text",value:v});continue}let L="close";u=n.pop(),u.close=!0,R({type:L,value:v}),I--,u=n[n.length-1];continue}if(v===c7e&&I>0){if(u.ranges>0){u.ranges=0;let L=u.nodes.shift();u.nodes=[L,{type:"text",value:a7e(u)}]}R({type:"comma",value:v}),u.commas++;continue}if(v===u7e&&I>0&&u.commas===0){let L=u.nodes;if(I===0||L.length===0){R({type:"text",value:v});continue}if(A.type==="dot"){if(u.range=[],A.value+=v,A.type="range",u.nodes.length!==3&&u.nodes.length!==5){u.invalid=!0,u.ranges=0,A.type="text";continue}u.ranges++,u.args=[];continue}if(A.type==="range"){L.pop();let U=L[L.length-1];U.value+=A.value+v,A=U,u.ranges--;continue}R({type:"dot",value:v});continue}R({type:"text",value:v})}do if(u=n.pop(),u.type!=="root"){u.nodes.forEach(J=>{J.nodes||(J.type==="open"&&(J.isOpen=!0),J.type==="close"&&(J.isClose=!0),J.nodes||(J.type="text"),J.invalid=!0)});let L=n[n.length-1],U=L.nodes.indexOf(u);L.nodes.splice(U,1,...u.nodes)}while(n.length>0);return R({type:"eos"}),a};aZ.exports=E7e});var AZ=_((YQt,uZ)=>{"use strict";var cZ=QS(),C7e=ZX(),w7e=tZ(),I7e=lZ(),rl=(t,e={})=>{let r=[];if(Array.isArray(t))for(let o of t){let a=rl.create(o,e);Array.isArray(a)?r.push(...a):r.push(a)}else r=[].concat(rl.create(t,e));return e&&e.expand===!0&&e.nodupes===!0&&(r=[...new Set(r)]),r};rl.parse=(t,e={})=>I7e(t,e);rl.stringify=(t,e={})=>cZ(typeof t=="string"?rl.parse(t,e):t,e);rl.compile=(t,e={})=>(typeof t=="string"&&(t=rl.parse(t,e)),C7e(t,e));rl.expand=(t,e={})=>{typeof t=="string"&&(t=rl.parse(t,e));let r=w7e(t,e);return e.noempty===!0&&(r=r.filter(Boolean)),e.nodupes===!0&&(r=[...new Set(r)]),r};rl.create=(t,e={})=>t===""||t.length<3?[t]:e.expand!==!0?rl.compile(t,e):rl.expand(t,e);uZ.exports=rl});var xI=_((WQt,dZ)=>{"use strict";var B7e=ve("path"),Ku="\\\\/",fZ=`[^${Ku}]`,vf="\\.",v7e="\\+",D7e="\\?",TS="\\/",S7e="(?=.)",pZ="[^/]",bN=`(?:${TS}|$)`,hZ=`(?:^|${TS})`,xN=`${vf}{1,2}${bN}`,P7e=`(?!${vf})`,b7e=`(?!${hZ}${xN})`,x7e=`(?!${vf}{0,1}${bN})`,k7e=`(?!${xN})`,Q7e=`[^.${TS}]`,F7e=`${pZ}*?`,gZ={DOT_LITERAL:vf,PLUS_LITERAL:v7e,QMARK_LITERAL:D7e,SLASH_LITERAL:TS,ONE_CHAR:S7e,QMARK:pZ,END_ANCHOR:bN,DOTS_SLASH:xN,NO_DOT:P7e,NO_DOTS:b7e,NO_DOT_SLASH:x7e,NO_DOTS_SLASH:k7e,QMARK_NO_DOT:Q7e,STAR:F7e,START_ANCHOR:hZ},R7e={...gZ,SLASH_LITERAL:`[${Ku}]`,QMARK:fZ,STAR:`${fZ}*?`,DOTS_SLASH:`${vf}{1,2}(?:[${Ku}]|$)`,NO_DOT:`(?!${vf})`,NO_DOTS:`(?!(?:^|[${Ku}])${vf}{1,2}(?:[${Ku}]|$))`,NO_DOT_SLASH:`(?!${vf}{0,1}(?:[${Ku}]|$))`,NO_DOTS_SLASH:`(?!${vf}{1,2}(?:[${Ku}]|$))`,QMARK_NO_DOT:`[^.${Ku}]`,START_ANCHOR:`(?:^|[${Ku}])`,END_ANCHOR:`(?:[${Ku}]|$)`},T7e={alnum:"a-zA-Z0-9",alpha:"a-zA-Z",ascii:"\\x00-\\x7F",blank:" \\t",cntrl:"\\x00-\\x1F\\x7F",digit:"0-9",graph:"\\x21-\\x7E",lower:"a-z",print:"\\x20-\\x7E ",punct:"\\-!\"#$%&'()\\*+,./:;<=>?@[\\]^_`{|}~",space:" \\t\\r\\n\\v\\f",upper:"A-Z",word:"A-Za-z0-9_",xdigit:"A-Fa-f0-9"};dZ.exports={MAX_LENGTH:1024*64,POSIX_REGEX_SOURCE:T7e,REGEX_BACKSLASH:/\\(?![*+?^${}(|)[\]])/g,REGEX_NON_SPECIAL_CHARS:/^[^@![\].,$*+?^{}()|\\/]+/,REGEX_SPECIAL_CHARS:/[-*+?.^${}(|)[\]]/,REGEX_SPECIAL_CHARS_BACKREF:/(\\?)((\W)(\3*))/g,REGEX_SPECIAL_CHARS_GLOBAL:/([-*+?.^${}(|)[\]])/g,REGEX_REMOVE_BACKSLASH:/(?:\[.*?[^\\]\]|\\(?=.))/g,REPLACEMENTS:{"***":"*","**/**":"**","**/**/**":"**"},CHAR_0:48,CHAR_9:57,CHAR_UPPERCASE_A:65,CHAR_LOWERCASE_A:97,CHAR_UPPERCASE_Z:90,CHAR_LOWERCASE_Z:122,CHAR_LEFT_PARENTHESES:40,CHAR_RIGHT_PARENTHESES:41,CHAR_ASTERISK:42,CHAR_AMPERSAND:38,CHAR_AT:64,CHAR_BACKWARD_SLASH:92,CHAR_CARRIAGE_RETURN:13,CHAR_CIRCUMFLEX_ACCENT:94,CHAR_COLON:58,CHAR_COMMA:44,CHAR_DOT:46,CHAR_DOUBLE_QUOTE:34,CHAR_EQUAL:61,CHAR_EXCLAMATION_MARK:33,CHAR_FORM_FEED:12,CHAR_FORWARD_SLASH:47,CHAR_GRAVE_ACCENT:96,CHAR_HASH:35,CHAR_HYPHEN_MINUS:45,CHAR_LEFT_ANGLE_BRACKET:60,CHAR_LEFT_CURLY_BRACE:123,CHAR_LEFT_SQUARE_BRACKET:91,CHAR_LINE_FEED:10,CHAR_NO_BREAK_SPACE:160,CHAR_PERCENT:37,CHAR_PLUS:43,CHAR_QUESTION_MARK:63,CHAR_RIGHT_ANGLE_BRACKET:62,CHAR_RIGHT_CURLY_BRACE:125,CHAR_RIGHT_SQUARE_BRACKET:93,CHAR_SEMICOLON:59,CHAR_SINGLE_QUOTE:39,CHAR_SPACE:32,CHAR_TAB:9,CHAR_UNDERSCORE:95,CHAR_VERTICAL_LINE:124,CHAR_ZERO_WIDTH_NOBREAK_SPACE:65279,SEP:B7e.sep,extglobChars(t){return{"!":{type:"negate",open:"(?:(?!(?:",close:`))${t.STAR})`},"?":{type:"qmark",open:"(?:",close:")?"},"+":{type:"plus",open:"(?:",close:")+"},"*":{type:"star",open:"(?:",close:")*"},"@":{type:"at",open:"(?:",close:")"}}},globChars(t){return t===!0?R7e:gZ}}});var kI=_(Sa=>{"use strict";var N7e=ve("path"),L7e=process.platform==="win32",{REGEX_BACKSLASH:O7e,REGEX_REMOVE_BACKSLASH:M7e,REGEX_SPECIAL_CHARS:U7e,REGEX_SPECIAL_CHARS_GLOBAL:_7e}=xI();Sa.isObject=t=>t!==null&&typeof t=="object"&&!Array.isArray(t);Sa.hasRegexChars=t=>U7e.test(t);Sa.isRegexChar=t=>t.length===1&&Sa.hasRegexChars(t);Sa.escapeRegex=t=>t.replace(_7e,"\\$1");Sa.toPosixSlashes=t=>t.replace(O7e,"/");Sa.removeBackslashes=t=>t.replace(M7e,e=>e==="\\"?"":e);Sa.supportsLookbehinds=()=>{let t=process.version.slice(1).split(".").map(Number);return t.length===3&&t[0]>=9||t[0]===8&&t[1]>=10};Sa.isWindows=t=>t&&typeof t.windows=="boolean"?t.windows:L7e===!0||N7e.sep==="\\";Sa.escapeLast=(t,e,r)=>{let o=t.lastIndexOf(e,r);return o===-1?t:t[o-1]==="\\"?Sa.escapeLast(t,e,o-1):`${t.slice(0,o)}\\${t.slice(o)}`};Sa.removePrefix=(t,e={})=>{let r=t;return r.startsWith("./")&&(r=r.slice(2),e.prefix="./"),r};Sa.wrapOutput=(t,e={},r={})=>{let o=r.contains?"":"^",a=r.contains?"":"$",n=`${o}(?:${t})${a}`;return e.negated===!0&&(n=`(?:^(?!${n}).*$)`),n}});var vZ=_((VQt,BZ)=>{"use strict";var mZ=kI(),{CHAR_ASTERISK:kN,CHAR_AT:H7e,CHAR_BACKWARD_SLASH:QI,CHAR_COMMA:j7e,CHAR_DOT:QN,CHAR_EXCLAMATION_MARK:FN,CHAR_FORWARD_SLASH:IZ,CHAR_LEFT_CURLY_BRACE:RN,CHAR_LEFT_PARENTHESES:TN,CHAR_LEFT_SQUARE_BRACKET:G7e,CHAR_PLUS:q7e,CHAR_QUESTION_MARK:yZ,CHAR_RIGHT_CURLY_BRACE:Y7e,CHAR_RIGHT_PARENTHESES:EZ,CHAR_RIGHT_SQUARE_BRACKET:W7e}=xI(),CZ=t=>t===IZ||t===QI,wZ=t=>{t.isPrefix!==!0&&(t.depth=t.isGlobstar?1/0:1)},K7e=(t,e)=>{let r=e||{},o=t.length-1,a=r.parts===!0||r.scanToEnd===!0,n=[],u=[],A=[],p=t,h=-1,E=0,I=0,v=!1,x=!1,C=!1,R=!1,L=!1,U=!1,J=!1,te=!1,ae=!1,fe=!1,ce=0,me,he,Be={value:"",depth:0,isGlob:!1},we=()=>h>=o,g=()=>p.charCodeAt(h+1),Ee=()=>(me=he,p.charCodeAt(++h));for(;h<o;){he=Ee();let Ie;if(he===QI){J=Be.backslashes=!0,he=Ee(),he===RN&&(U=!0);continue}if(U===!0||he===RN){for(ce++;we()!==!0&&(he=Ee());){if(he===QI){J=Be.backslashes=!0,Ee();continue}if(he===RN){ce++;continue}if(U!==!0&&he===QN&&(he=Ee())===QN){if(v=Be.isBrace=!0,C=Be.isGlob=!0,fe=!0,a===!0)continue;break}if(U!==!0&&he===j7e){if(v=Be.isBrace=!0,C=Be.isGlob=!0,fe=!0,a===!0)continue;break}if(he===Y7e&&(ce--,ce===0)){U=!1,v=Be.isBrace=!0,fe=!0;break}}if(a===!0)continue;break}if(he===IZ){if(n.push(h),u.push(Be),Be={value:"",depth:0,isGlob:!1},fe===!0)continue;if(me===QN&&h===E+1){E+=2;continue}I=h+1;continue}if(r.noext!==!0&&(he===q7e||he===H7e||he===kN||he===yZ||he===FN)===!0&&g()===TN){if(C=Be.isGlob=!0,R=Be.isExtglob=!0,fe=!0,he===FN&&h===E&&(ae=!0),a===!0){for(;we()!==!0&&(he=Ee());){if(he===QI){J=Be.backslashes=!0,he=Ee();continue}if(he===EZ){C=Be.isGlob=!0,fe=!0;break}}continue}break}if(he===kN){if(me===kN&&(L=Be.isGlobstar=!0),C=Be.isGlob=!0,fe=!0,a===!0)continue;break}if(he===yZ){if(C=Be.isGlob=!0,fe=!0,a===!0)continue;break}if(he===G7e){for(;we()!==!0&&(Ie=Ee());){if(Ie===QI){J=Be.backslashes=!0,Ee();continue}if(Ie===W7e){x=Be.isBracket=!0,C=Be.isGlob=!0,fe=!0;break}}if(a===!0)continue;break}if(r.nonegate!==!0&&he===FN&&h===E){te=Be.negated=!0,E++;continue}if(r.noparen!==!0&&he===TN){if(C=Be.isGlob=!0,a===!0){for(;we()!==!0&&(he=Ee());){if(he===TN){J=Be.backslashes=!0,he=Ee();continue}if(he===EZ){fe=!0;break}}continue}break}if(C===!0){if(fe=!0,a===!0)continue;break}}r.noext===!0&&(R=!1,C=!1);let Se=p,le="",ne="";E>0&&(le=p.slice(0,E),p=p.slice(E),I-=E),Se&&C===!0&&I>0?(Se=p.slice(0,I),ne=p.slice(I)):C===!0?(Se="",ne=p):Se=p,Se&&Se!==""&&Se!=="/"&&Se!==p&&CZ(Se.charCodeAt(Se.length-1))&&(Se=Se.slice(0,-1)),r.unescape===!0&&(ne&&(ne=mZ.removeBackslashes(ne)),Se&&J===!0&&(Se=mZ.removeBackslashes(Se)));let ee={prefix:le,input:t,start:E,base:Se,glob:ne,isBrace:v,isBracket:x,isGlob:C,isExtglob:R,isGlobstar:L,negated:te,negatedExtglob:ae};if(r.tokens===!0&&(ee.maxDepth=0,CZ(he)||u.push(Be),ee.tokens=u),r.parts===!0||r.tokens===!0){let Ie;for(let Fe=0;Fe<n.length;Fe++){let At=Ie?Ie+1:E,H=n[Fe],at=t.slice(At,H);r.tokens&&(Fe===0&&E!==0?(u[Fe].isPrefix=!0,u[Fe].value=le):u[Fe].value=at,wZ(u[Fe]),ee.maxDepth+=u[Fe].depth),(Fe!==0||at!=="")&&A.push(at),Ie=H}if(Ie&&Ie+1<t.length){let Fe=t.slice(Ie+1);A.push(Fe),r.tokens&&(u[u.length-1].value=Fe,wZ(u[u.length-1]),ee.maxDepth+=u[u.length-1].depth)}ee.slashes=n,ee.parts=A}return ee};BZ.exports=K7e});var PZ=_((JQt,SZ)=>{"use strict";var NS=xI(),nl=kI(),{MAX_LENGTH:LS,POSIX_REGEX_SOURCE:V7e,REGEX_NON_SPECIAL_CHARS:J7e,REGEX_SPECIAL_CHARS_BACKREF:z7e,REPLACEMENTS:DZ}=NS,X7e=(t,e)=>{if(typeof e.expandRange=="function")return e.expandRange(...t,e);t.sort();let r=`[${t.join("-")}]`;try{new RegExp(r)}catch{return t.map(a=>nl.escapeRegex(a)).join("..")}return r},Ty=(t,e)=>`Missing ${t}: "${e}" - use "\\\\${e}" to match literal characters`,NN=(t,e)=>{if(typeof t!="string")throw new TypeError("Expected a string");t=DZ[t]||t;let r={...e},o=typeof r.maxLength=="number"?Math.min(LS,r.maxLength):LS,a=t.length;if(a>o)throw new SyntaxError(`Input length: ${a}, exceeds maximum allowed length: ${o}`);let n={type:"bos",value:"",output:r.prepend||""},u=[n],A=r.capture?"":"?:",p=nl.isWindows(e),h=NS.globChars(p),E=NS.extglobChars(h),{DOT_LITERAL:I,PLUS_LITERAL:v,SLASH_LITERAL:x,ONE_CHAR:C,DOTS_SLASH:R,NO_DOT:L,NO_DOT_SLASH:U,NO_DOTS_SLASH:J,QMARK:te,QMARK_NO_DOT:ae,STAR:fe,START_ANCHOR:ce}=h,me=b=>`(${A}(?:(?!${ce}${b.dot?R:I}).)*?)`,he=r.dot?"":L,Be=r.dot?te:ae,we=r.bash===!0?me(r):fe;r.capture&&(we=`(${we})`),typeof r.noext=="boolean"&&(r.noextglob=r.noext);let g={input:t,index:-1,start:0,dot:r.dot===!0,consumed:"",output:"",prefix:"",backtrack:!1,negated:!1,brackets:0,braces:0,parens:0,quotes:0,globstar:!1,tokens:u};t=nl.removePrefix(t,g),a=t.length;let Ee=[],Se=[],le=[],ne=n,ee,Ie=()=>g.index===a-1,Fe=g.peek=(b=1)=>t[g.index+b],At=g.advance=()=>t[++g.index]||"",H=()=>t.slice(g.index+1),at=(b="",w=0)=>{g.consumed+=b,g.index+=w},Re=b=>{g.output+=b.output!=null?b.output:b.value,at(b.value)},ke=()=>{let b=1;for(;Fe()==="!"&&(Fe(2)!=="("||Fe(3)==="?");)At(),g.start++,b++;return b%2===0?!1:(g.negated=!0,g.start++,!0)},xe=b=>{g[b]++,le.push(b)},He=b=>{g[b]--,le.pop()},Te=b=>{if(ne.type==="globstar"){let w=g.braces>0&&(b.type==="comma"||b.type==="brace"),P=b.extglob===!0||Ee.length&&(b.type==="pipe"||b.type==="paren");b.type!=="slash"&&b.type!=="paren"&&!w&&!P&&(g.output=g.output.slice(0,-ne.output.length),ne.type="star",ne.value="*",ne.output=we,g.output+=ne.output)}if(Ee.length&&b.type!=="paren"&&(Ee[Ee.length-1].inner+=b.value),(b.value||b.output)&&Re(b),ne&&ne.type==="text"&&b.type==="text"){ne.value+=b.value,ne.output=(ne.output||"")+b.value;return}b.prev=ne,u.push(b),ne=b},Je=(b,w)=>{let P={...E[w],conditions:1,inner:""};P.prev=ne,P.parens=g.parens,P.output=g.output;let y=(r.capture?"(":"")+P.open;xe("parens"),Te({type:b,value:w,output:g.output?"":C}),Te({type:"paren",extglob:!0,value:At(),output:y}),Ee.push(P)},je=b=>{let w=b.close+(r.capture?")":""),P;if(b.type==="negate"){let y=we;if(b.inner&&b.inner.length>1&&b.inner.includes("/")&&(y=me(r)),(y!==we||Ie()||/^\)+$/.test(H()))&&(w=b.close=`)$))${y}`),b.inner.includes("*")&&(P=H())&&/^\.[^\\/.]+$/.test(P)){let F=NN(P,{...e,fastpaths:!1}).output;w=b.close=`)${F})${y})`}b.prev.type==="bos"&&(g.negatedExtglob=!0)}Te({type:"paren",extglob:!0,value:ee,output:w}),He("parens")};if(r.fastpaths!==!1&&!/(^[*!]|[/()[\]{}"])/.test(t)){let b=!1,w=t.replace(z7e,(P,y,F,z,X,Z)=>z==="\\"?(b=!0,P):z==="?"?y?y+z+(X?te.repeat(X.length):""):Z===0?Be+(X?te.repeat(X.length):""):te.repeat(F.length):z==="."?I.repeat(F.length):z==="*"?y?y+z+(X?we:""):we:y?P:`\\${P}`);return b===!0&&(r.unescape===!0?w=w.replace(/\\/g,""):w=w.replace(/\\+/g,P=>P.length%2===0?"\\\\":P?"\\":"")),w===t&&r.contains===!0?(g.output=t,g):(g.output=nl.wrapOutput(w,g,e),g)}for(;!Ie();){if(ee=At(),ee==="\0")continue;if(ee==="\\"){let P=Fe();if(P==="/"&&r.bash!==!0||P==="."||P===";")continue;if(!P){ee+="\\",Te({type:"text",value:ee});continue}let y=/^\\+/.exec(H()),F=0;if(y&&y[0].length>2&&(F=y[0].length,g.index+=F,F%2!==0&&(ee+="\\")),r.unescape===!0?ee=At():ee+=At(),g.brackets===0){Te({type:"text",value:ee});continue}}if(g.brackets>0&&(ee!=="]"||ne.value==="["||ne.value==="[^")){if(r.posix!==!1&&ee===":"){let P=ne.value.slice(1);if(P.includes("[")&&(ne.posix=!0,P.includes(":"))){let y=ne.value.lastIndexOf("["),F=ne.value.slice(0,y),z=ne.value.slice(y+2),X=V7e[z];if(X){ne.value=F+X,g.backtrack=!0,At(),!n.output&&u.indexOf(ne)===1&&(n.output=C);continue}}}(ee==="["&&Fe()!==":"||ee==="-"&&Fe()==="]")&&(ee=`\\${ee}`),ee==="]"&&(ne.value==="["||ne.value==="[^")&&(ee=`\\${ee}`),r.posix===!0&&ee==="!"&&ne.value==="["&&(ee="^"),ne.value+=ee,Re({value:ee});continue}if(g.quotes===1&&ee!=='"'){ee=nl.escapeRegex(ee),ne.value+=ee,Re({value:ee});continue}if(ee==='"'){g.quotes=g.quotes===1?0:1,r.keepQuotes===!0&&Te({type:"text",value:ee});continue}if(ee==="("){xe("parens"),Te({type:"paren",value:ee});continue}if(ee===")"){if(g.parens===0&&r.strictBrackets===!0)throw new SyntaxError(Ty("opening","("));let P=Ee[Ee.length-1];if(P&&g.parens===P.parens+1){je(Ee.pop());continue}Te({type:"paren",value:ee,output:g.parens?")":"\\)"}),He("parens");continue}if(ee==="["){if(r.nobracket===!0||!H().includes("]")){if(r.nobracket!==!0&&r.strictBrackets===!0)throw new SyntaxError(Ty("closing","]"));ee=`\\${ee}`}else xe("brackets");Te({type:"bracket",value:ee});continue}if(ee==="]"){if(r.nobracket===!0||ne&&ne.type==="bracket"&&ne.value.length===1){Te({type:"text",value:ee,output:`\\${ee}`});continue}if(g.brackets===0){if(r.strictBrackets===!0)throw new SyntaxError(Ty("opening","["));Te({type:"text",value:ee,output:`\\${ee}`});continue}He("brackets");let P=ne.value.slice(1);if(ne.posix!==!0&&P[0]==="^"&&!P.includes("/")&&(ee=`/${ee}`),ne.value+=ee,Re({value:ee}),r.literalBrackets===!1||nl.hasRegexChars(P))continue;let y=nl.escapeRegex(ne.value);if(g.output=g.output.slice(0,-ne.value.length),r.literalBrackets===!0){g.output+=y,ne.value=y;continue}ne.value=`(${A}${y}|${ne.value})`,g.output+=ne.value;continue}if(ee==="{"&&r.nobrace!==!0){xe("braces");let P={type:"brace",value:ee,output:"(",outputIndex:g.output.length,tokensIndex:g.tokens.length};Se.push(P),Te(P);continue}if(ee==="}"){let P=Se[Se.length-1];if(r.nobrace===!0||!P){Te({type:"text",value:ee,output:ee});continue}let y=")";if(P.dots===!0){let F=u.slice(),z=[];for(let X=F.length-1;X>=0&&(u.pop(),F[X].type!=="brace");X--)F[X].type!=="dots"&&z.unshift(F[X].value);y=X7e(z,r),g.backtrack=!0}if(P.comma!==!0&&P.dots!==!0){let F=g.output.slice(0,P.outputIndex),z=g.tokens.slice(P.tokensIndex);P.value=P.output="\\{",ee=y="\\}",g.output=F;for(let X of z)g.output+=X.output||X.value}Te({type:"brace",value:ee,output:y}),He("braces"),Se.pop();continue}if(ee==="|"){Ee.length>0&&Ee[Ee.length-1].conditions++,Te({type:"text",value:ee});continue}if(ee===","){let P=ee,y=Se[Se.length-1];y&&le[le.length-1]==="braces"&&(y.comma=!0,P="|"),Te({type:"comma",value:ee,output:P});continue}if(ee==="/"){if(ne.type==="dot"&&g.index===g.start+1){g.start=g.index+1,g.consumed="",g.output="",u.pop(),ne=n;continue}Te({type:"slash",value:ee,output:x});continue}if(ee==="."){if(g.braces>0&&ne.type==="dot"){ne.value==="."&&(ne.output=I);let P=Se[Se.length-1];ne.type="dots",ne.output+=ee,ne.value+=ee,P.dots=!0;continue}if(g.braces+g.parens===0&&ne.type!=="bos"&&ne.type!=="slash"){Te({type:"text",value:ee,output:I});continue}Te({type:"dot",value:ee,output:I});continue}if(ee==="?"){if(!(ne&&ne.value==="(")&&r.noextglob!==!0&&Fe()==="("&&Fe(2)!=="?"){Je("qmark",ee);continue}if(ne&&ne.type==="paren"){let y=Fe(),F=ee;if(y==="<"&&!nl.supportsLookbehinds())throw new Error("Node.js v10 or higher is required for regex lookbehinds");(ne.value==="("&&!/[!=<:]/.test(y)||y==="<"&&!/<([!=]|\w+>)/.test(H()))&&(F=`\\${ee}`),Te({type:"text",value:ee,output:F});continue}if(r.dot!==!0&&(ne.type==="slash"||ne.type==="bos")){Te({type:"qmark",value:ee,output:ae});continue}Te({type:"qmark",value:ee,output:te});continue}if(ee==="!"){if(r.noextglob!==!0&&Fe()==="("&&(Fe(2)!=="?"||!/[!=<:]/.test(Fe(3)))){Je("negate",ee);continue}if(r.nonegate!==!0&&g.index===0){ke();continue}}if(ee==="+"){if(r.noextglob!==!0&&Fe()==="("&&Fe(2)!=="?"){Je("plus",ee);continue}if(ne&&ne.value==="("||r.regex===!1){Te({type:"plus",value:ee,output:v});continue}if(ne&&(ne.type==="bracket"||ne.type==="paren"||ne.type==="brace")||g.parens>0){Te({type:"plus",value:ee});continue}Te({type:"plus",value:v});continue}if(ee==="@"){if(r.noextglob!==!0&&Fe()==="("&&Fe(2)!=="?"){Te({type:"at",extglob:!0,value:ee,output:""});continue}Te({type:"text",value:ee});continue}if(ee!=="*"){(ee==="$"||ee==="^")&&(ee=`\\${ee}`);let P=J7e.exec(H());P&&(ee+=P[0],g.index+=P[0].length),Te({type:"text",value:ee});continue}if(ne&&(ne.type==="globstar"||ne.star===!0)){ne.type="star",ne.star=!0,ne.value+=ee,ne.output=we,g.backtrack=!0,g.globstar=!0,at(ee);continue}let b=H();if(r.noextglob!==!0&&/^\([^?]/.test(b)){Je("star",ee);continue}if(ne.type==="star"){if(r.noglobstar===!0){at(ee);continue}let P=ne.prev,y=P.prev,F=P.type==="slash"||P.type==="bos",z=y&&(y.type==="star"||y.type==="globstar");if(r.bash===!0&&(!F||b[0]&&b[0]!=="/")){Te({type:"star",value:ee,output:""});continue}let X=g.braces>0&&(P.type==="comma"||P.type==="brace"),Z=Ee.length&&(P.type==="pipe"||P.type==="paren");if(!F&&P.type!=="paren"&&!X&&!Z){Te({type:"star",value:ee,output:""});continue}for(;b.slice(0,3)==="/**";){let ie=t[g.index+4];if(ie&&ie!=="/")break;b=b.slice(3),at("/**",3)}if(P.type==="bos"&&Ie()){ne.type="globstar",ne.value+=ee,ne.output=me(r),g.output=ne.output,g.globstar=!0,at(ee);continue}if(P.type==="slash"&&P.prev.type!=="bos"&&!z&&Ie()){g.output=g.output.slice(0,-(P.output+ne.output).length),P.output=`(?:${P.output}`,ne.type="globstar",ne.output=me(r)+(r.strictSlashes?")":"|$)"),ne.value+=ee,g.globstar=!0,g.output+=P.output+ne.output,at(ee);continue}if(P.type==="slash"&&P.prev.type!=="bos"&&b[0]==="/"){let ie=b[1]!==void 0?"|$":"";g.output=g.output.slice(0,-(P.output+ne.output).length),P.output=`(?:${P.output}`,ne.type="globstar",ne.output=`${me(r)}${x}|${x}${ie})`,ne.value+=ee,g.output+=P.output+ne.output,g.globstar=!0,at(ee+At()),Te({type:"slash",value:"/",output:""});continue}if(P.type==="bos"&&b[0]==="/"){ne.type="globstar",ne.value+=ee,ne.output=`(?:^|${x}|${me(r)}${x})`,g.output=ne.output,g.globstar=!0,at(ee+At()),Te({type:"slash",value:"/",output:""});continue}g.output=g.output.slice(0,-ne.output.length),ne.type="globstar",ne.output=me(r),ne.value+=ee,g.output+=ne.output,g.globstar=!0,at(ee);continue}let w={type:"star",value:ee,output:we};if(r.bash===!0){w.output=".*?",(ne.type==="bos"||ne.type==="slash")&&(w.output=he+w.output),Te(w);continue}if(ne&&(ne.type==="bracket"||ne.type==="paren")&&r.regex===!0){w.output=ee,Te(w);continue}(g.index===g.start||ne.type==="slash"||ne.type==="dot")&&(ne.type==="dot"?(g.output+=U,ne.output+=U):r.dot===!0?(g.output+=J,ne.output+=J):(g.output+=he,ne.output+=he),Fe()!=="*"&&(g.output+=C,ne.output+=C)),Te(w)}for(;g.brackets>0;){if(r.strictBrackets===!0)throw new SyntaxError(Ty("closing","]"));g.output=nl.escapeLast(g.output,"["),He("brackets")}for(;g.parens>0;){if(r.strictBrackets===!0)throw new SyntaxError(Ty("closing",")"));g.output=nl.escapeLast(g.output,"("),He("parens")}for(;g.braces>0;){if(r.strictBrackets===!0)throw new SyntaxError(Ty("closing","}"));g.output=nl.escapeLast(g.output,"{"),He("braces")}if(r.strictSlashes!==!0&&(ne.type==="star"||ne.type==="bracket")&&Te({type:"maybe_slash",value:"",output:`${x}?`}),g.backtrack===!0){g.output="";for(let b of g.tokens)g.output+=b.output!=null?b.output:b.value,b.suffix&&(g.output+=b.suffix)}return g};NN.fastpaths=(t,e)=>{let r={...e},o=typeof r.maxLength=="number"?Math.min(LS,r.maxLength):LS,a=t.length;if(a>o)throw new SyntaxError(`Input length: ${a}, exceeds maximum allowed length: ${o}`);t=DZ[t]||t;let n=nl.isWindows(e),{DOT_LITERAL:u,SLASH_LITERAL:A,ONE_CHAR:p,DOTS_SLASH:h,NO_DOT:E,NO_DOTS:I,NO_DOTS_SLASH:v,STAR:x,START_ANCHOR:C}=NS.globChars(n),R=r.dot?I:E,L=r.dot?v:E,U=r.capture?"":"?:",J={negated:!1,prefix:""},te=r.bash===!0?".*?":x;r.capture&&(te=`(${te})`);let ae=he=>he.noglobstar===!0?te:`(${U}(?:(?!${C}${he.dot?h:u}).)*?)`,fe=he=>{switch(he){case"*":return`${R}${p}${te}`;case".*":return`${u}${p}${te}`;case"*.*":return`${R}${te}${u}${p}${te}`;case"*/*":return`${R}${te}${A}${p}${L}${te}`;case"**":return R+ae(r);case"**/*":return`(?:${R}${ae(r)}${A})?${L}${p}${te}`;case"**/*.*":return`(?:${R}${ae(r)}${A})?${L}${te}${u}${p}${te}`;case"**/.*":return`(?:${R}${ae(r)}${A})?${u}${p}${te}`;default:{let Be=/^(.*?)\.(\w+)$/.exec(he);if(!Be)return;let we=fe(Be[1]);return we?we+u+Be[2]:void 0}}},ce=nl.removePrefix(t,J),me=fe(ce);return me&&r.strictSlashes!==!0&&(me+=`${A}?`),me};SZ.exports=NN});var xZ=_((zQt,bZ)=>{"use strict";var Z7e=ve("path"),$7e=vZ(),LN=PZ(),ON=kI(),eYe=xI(),tYe=t=>t&&typeof t=="object"&&!Array.isArray(t),Mi=(t,e,r=!1)=>{if(Array.isArray(t)){let E=t.map(v=>Mi(v,e,r));return v=>{for(let x of E){let C=x(v);if(C)return C}return!1}}let o=tYe(t)&&t.tokens&&t.input;if(t===""||typeof t!="string"&&!o)throw new TypeError("Expected pattern to be a non-empty string");let a=e||{},n=ON.isWindows(e),u=o?Mi.compileRe(t,e):Mi.makeRe(t,e,!1,!0),A=u.state;delete u.state;let p=()=>!1;if(a.ignore){let E={...e,ignore:null,onMatch:null,onResult:null};p=Mi(a.ignore,E,r)}let h=(E,I=!1)=>{let{isMatch:v,match:x,output:C}=Mi.test(E,u,e,{glob:t,posix:n}),R={glob:t,state:A,regex:u,posix:n,input:E,output:C,match:x,isMatch:v};return typeof a.onResult=="function"&&a.onResult(R),v===!1?(R.isMatch=!1,I?R:!1):p(E)?(typeof a.onIgnore=="function"&&a.onIgnore(R),R.isMatch=!1,I?R:!1):(typeof a.onMatch=="function"&&a.onMatch(R),I?R:!0)};return r&&(h.state=A),h};Mi.test=(t,e,r,{glob:o,posix:a}={})=>{if(typeof t!="string")throw new TypeError("Expected input to be a string");if(t==="")return{isMatch:!1,output:""};let n=r||{},u=n.format||(a?ON.toPosixSlashes:null),A=t===o,p=A&&u?u(t):t;return A===!1&&(p=u?u(t):t,A=p===o),(A===!1||n.capture===!0)&&(n.matchBase===!0||n.basename===!0?A=Mi.matchBase(t,e,r,a):A=e.exec(p)),{isMatch:Boolean(A),match:A,output:p}};Mi.matchBase=(t,e,r,o=ON.isWindows(r))=>(e instanceof RegExp?e:Mi.makeRe(e,r)).test(Z7e.basename(t));Mi.isMatch=(t,e,r)=>Mi(e,r)(t);Mi.parse=(t,e)=>Array.isArray(t)?t.map(r=>Mi.parse(r,e)):LN(t,{...e,fastpaths:!1});Mi.scan=(t,e)=>$7e(t,e);Mi.compileRe=(t,e,r=!1,o=!1)=>{if(r===!0)return t.output;let a=e||{},n=a.contains?"":"^",u=a.contains?"":"$",A=`${n}(?:${t.output})${u}`;t&&t.negated===!0&&(A=`^(?!${A}).*$`);let p=Mi.toRegex(A,e);return o===!0&&(p.state=t),p};Mi.makeRe=(t,e={},r=!1,o=!1)=>{if(!t||typeof t!="string")throw new TypeError("Expected a non-empty string");let a={negated:!1,fastpaths:!0};return e.fastpaths!==!1&&(t[0]==="."||t[0]==="*")&&(a.output=LN.fastpaths(t,e)),a.output||(a=LN(t,e)),Mi.compileRe(a,e,r,o)};Mi.toRegex=(t,e)=>{try{let r=e||{};return new RegExp(t,r.flags||(r.nocase?"i":""))}catch(r){if(e&&e.debug===!0)throw r;return/$^/}};Mi.constants=eYe;bZ.exports=Mi});var QZ=_((XQt,kZ)=>{"use strict";kZ.exports=xZ()});var Zo=_((ZQt,NZ)=>{"use strict";var RZ=ve("util"),TZ=AZ(),Vu=QZ(),MN=kI(),FZ=t=>t===""||t==="./",yi=(t,e,r)=>{e=[].concat(e),t=[].concat(t);let o=new Set,a=new Set,n=new Set,u=0,A=E=>{n.add(E.output),r&&r.onResult&&r.onResult(E)};for(let E=0;E<e.length;E++){let I=Vu(String(e[E]),{...r,onResult:A},!0),v=I.state.negated||I.state.negatedExtglob;v&&u++;for(let x of t){let C=I(x,!0);!(v?!C.isMatch:C.isMatch)||(v?o.add(C.output):(o.delete(C.output),a.add(C.output)))}}let h=(u===e.length?[...n]:[...a]).filter(E=>!o.has(E));if(r&&h.length===0){if(r.failglob===!0)throw new Error(`No matches found for "${e.join(", ")}"`);if(r.nonull===!0||r.nullglob===!0)return r.unescape?e.map(E=>E.replace(/\\/g,"")):e}return h};yi.match=yi;yi.matcher=(t,e)=>Vu(t,e);yi.isMatch=(t,e,r)=>Vu(e,r)(t);yi.any=yi.isMatch;yi.not=(t,e,r={})=>{e=[].concat(e).map(String);let o=new Set,a=[],n=A=>{r.onResult&&r.onResult(A),a.push(A.output)},u=new Set(yi(t,e,{...r,onResult:n}));for(let A of a)u.has(A)||o.add(A);return[...o]};yi.contains=(t,e,r)=>{if(typeof t!="string")throw new TypeError(`Expected a string: "${RZ.inspect(t)}"`);if(Array.isArray(e))return e.some(o=>yi.contains(t,o,r));if(typeof e=="string"){if(FZ(t)||FZ(e))return!1;if(t.includes(e)||t.startsWith("./")&&t.slice(2).includes(e))return!0}return yi.isMatch(t,e,{...r,contains:!0})};yi.matchKeys=(t,e,r)=>{if(!MN.isObject(t))throw new TypeError("Expected the first argument to be an object");let o=yi(Object.keys(t),e,r),a={};for(let n of o)a[n]=t[n];return a};yi.some=(t,e,r)=>{let o=[].concat(t);for(let a of[].concat(e)){let n=Vu(String(a),r);if(o.some(u=>n(u)))return!0}return!1};yi.every=(t,e,r)=>{let o=[].concat(t);for(let a of[].concat(e)){let n=Vu(String(a),r);if(!o.every(u=>n(u)))return!1}return!0};yi.all=(t,e,r)=>{if(typeof t!="string")throw new TypeError(`Expected a string: "${RZ.inspect(t)}"`);return[].concat(e).every(o=>Vu(o,r)(t))};yi.capture=(t,e,r)=>{let o=MN.isWindows(r),n=Vu.makeRe(String(t),{...r,capture:!0}).exec(o?MN.toPosixSlashes(e):e);if(n)return n.slice(1).map(u=>u===void 0?"":u)};yi.makeRe=(...t)=>Vu.makeRe(...t);yi.scan=(...t)=>Vu.scan(...t);yi.parse=(t,e)=>{let r=[];for(let o of[].concat(t||[]))for(let a of TZ(String(o),e))r.push(Vu.parse(a,e));return r};yi.braces=(t,e)=>{if(typeof t!="string")throw new TypeError("Expected a string");return e&&e.nobrace===!0||!/\{.*\}/.test(t)?[t]:TZ(t,e)};yi.braceExpand=(t,e)=>{if(typeof t!="string")throw new TypeError("Expected a string");return yi.braces(t,{...e,expand:!0})};NZ.exports=yi});var OZ=_(($Qt,LZ)=>{"use strict";LZ.exports=({onlyFirst:t=!1}={})=>{let e=["[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)","(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))"].join("|");return new RegExp(e,t?void 0:"g")}});var OS=_((eFt,MZ)=>{"use strict";var rYe=OZ();MZ.exports=t=>typeof t=="string"?t.replace(rYe(),""):t});var _Z=_((tFt,UZ)=>{function nYe(){this.__data__=[],this.size=0}UZ.exports=nYe});var Ny=_((rFt,HZ)=>{function iYe(t,e){return t===e||t!==t&&e!==e}HZ.exports=iYe});var FI=_((nFt,jZ)=>{var sYe=Ny();function oYe(t,e){for(var r=t.length;r--;)if(sYe(t[r][0],e))return r;return-1}jZ.exports=oYe});var qZ=_((iFt,GZ)=>{var aYe=FI(),lYe=Array.prototype,cYe=lYe.splice;function uYe(t){var e=this.__data__,r=aYe(e,t);if(r<0)return!1;var o=e.length-1;return r==o?e.pop():cYe.call(e,r,1),--this.size,!0}GZ.exports=uYe});var WZ=_((sFt,YZ)=>{var AYe=FI();function fYe(t){var e=this.__data__,r=AYe(e,t);return r<0?void 0:e[r][1]}YZ.exports=fYe});var VZ=_((oFt,KZ)=>{var pYe=FI();function hYe(t){return pYe(this.__data__,t)>-1}KZ.exports=hYe});var zZ=_((aFt,JZ)=>{var gYe=FI();function dYe(t,e){var r=this.__data__,o=gYe(r,t);return o<0?(++this.size,r.push([t,e])):r[o][1]=e,this}JZ.exports=dYe});var RI=_((lFt,XZ)=>{var mYe=_Z(),yYe=qZ(),EYe=WZ(),CYe=VZ(),wYe=zZ();function Ly(t){var e=-1,r=t==null?0:t.length;for(this.clear();++e<r;){var o=t[e];this.set(o[0],o[1])}}Ly.prototype.clear=mYe;Ly.prototype.delete=yYe;Ly.prototype.get=EYe;Ly.prototype.has=CYe;Ly.prototype.set=wYe;XZ.exports=Ly});var $Z=_((cFt,ZZ)=>{var IYe=RI();function BYe(){this.__data__=new IYe,this.size=0}ZZ.exports=BYe});var t$=_((uFt,e$)=>{function vYe(t){var e=this.__data__,r=e.delete(t);return this.size=e.size,r}e$.exports=vYe});var n$=_((AFt,r$)=>{function DYe(t){return this.__data__.get(t)}r$.exports=DYe});var s$=_((fFt,i$)=>{function SYe(t){return this.__data__.has(t)}i$.exports=SYe});var UN=_((pFt,o$)=>{var PYe=typeof global=="object"&&global&&global.Object===Object&&global;o$.exports=PYe});var _l=_((hFt,a$)=>{var bYe=UN(),xYe=typeof self=="object"&&self&&self.Object===Object&&self,kYe=bYe||xYe||Function("return this")();a$.exports=kYe});var pd=_((gFt,l$)=>{var QYe=_l(),FYe=QYe.Symbol;l$.exports=FYe});var f$=_((dFt,A$)=>{var c$=pd(),u$=Object.prototype,RYe=u$.hasOwnProperty,TYe=u$.toString,TI=c$?c$.toStringTag:void 0;function NYe(t){var e=RYe.call(t,TI),r=t[TI];try{t[TI]=void 0;var o=!0}catch{}var a=TYe.call(t);return o&&(e?t[TI]=r:delete t[TI]),a}A$.exports=NYe});var h$=_((mFt,p$)=>{var LYe=Object.prototype,OYe=LYe.toString;function MYe(t){return OYe.call(t)}p$.exports=MYe});var hd=_((yFt,m$)=>{var g$=pd(),UYe=f$(),_Ye=h$(),HYe="[object Null]",jYe="[object Undefined]",d$=g$?g$.toStringTag:void 0;function GYe(t){return t==null?t===void 0?jYe:HYe:d$&&d$ in Object(t)?UYe(t):_Ye(t)}m$.exports=GYe});var il=_((EFt,y$)=>{function qYe(t){var e=typeof t;return t!=null&&(e=="object"||e=="function")}y$.exports=qYe});var MS=_((CFt,E$)=>{var YYe=hd(),WYe=il(),KYe="[object AsyncFunction]",VYe="[object Function]",JYe="[object GeneratorFunction]",zYe="[object Proxy]";function XYe(t){if(!WYe(t))return!1;var e=YYe(t);return e==VYe||e==JYe||e==KYe||e==zYe}E$.exports=XYe});var w$=_((wFt,C$)=>{var ZYe=_l(),$Ye=ZYe["__core-js_shared__"];C$.exports=$Ye});var v$=_((IFt,B$)=>{var _N=w$(),I$=function(){var t=/[^.]+$/.exec(_N&&_N.keys&&_N.keys.IE_PROTO||"");return t?"Symbol(src)_1."+t:""}();function eWe(t){return!!I$&&I$ in t}B$.exports=eWe});var HN=_((BFt,D$)=>{var tWe=Function.prototype,rWe=tWe.toString;function nWe(t){if(t!=null){try{return rWe.call(t)}catch{}try{return t+""}catch{}}return""}D$.exports=nWe});var P$=_((vFt,S$)=>{var iWe=MS(),sWe=v$(),oWe=il(),aWe=HN(),lWe=/[\\^$.*+?()[\]{}|]/g,cWe=/^\[object .+?Constructor\]$/,uWe=Function.prototype,AWe=Object.prototype,fWe=uWe.toString,pWe=AWe.hasOwnProperty,hWe=RegExp("^"+fWe.call(pWe).replace(lWe,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$");function gWe(t){if(!oWe(t)||sWe(t))return!1;var e=iWe(t)?hWe:cWe;return e.test(aWe(t))}S$.exports=gWe});var x$=_((DFt,b$)=>{function dWe(t,e){return t?.[e]}b$.exports=dWe});var zp=_((SFt,k$)=>{var mWe=P$(),yWe=x$();function EWe(t,e){var r=yWe(t,e);return mWe(r)?r:void 0}k$.exports=EWe});var US=_((PFt,Q$)=>{var CWe=zp(),wWe=_l(),IWe=CWe(wWe,"Map");Q$.exports=IWe});var NI=_((bFt,F$)=>{var BWe=zp(),vWe=BWe(Object,"create");F$.exports=vWe});var N$=_((xFt,T$)=>{var R$=NI();function DWe(){this.__data__=R$?R$(null):{},this.size=0}T$.exports=DWe});var O$=_((kFt,L$)=>{function SWe(t){var e=this.has(t)&&delete this.__data__[t];return this.size-=e?1:0,e}L$.exports=SWe});var U$=_((QFt,M$)=>{var PWe=NI(),bWe="__lodash_hash_undefined__",xWe=Object.prototype,kWe=xWe.hasOwnProperty;function QWe(t){var e=this.__data__;if(PWe){var r=e[t];return r===bWe?void 0:r}return kWe.call(e,t)?e[t]:void 0}M$.exports=QWe});var H$=_((FFt,_$)=>{var FWe=NI(),RWe=Object.prototype,TWe=RWe.hasOwnProperty;function NWe(t){var e=this.__data__;return FWe?e[t]!==void 0:TWe.call(e,t)}_$.exports=NWe});var G$=_((RFt,j$)=>{var LWe=NI(),OWe="__lodash_hash_undefined__";function MWe(t,e){var r=this.__data__;return this.size+=this.has(t)?0:1,r[t]=LWe&&e===void 0?OWe:e,this}j$.exports=MWe});var Y$=_((TFt,q$)=>{var UWe=N$(),_We=O$(),HWe=U$(),jWe=H$(),GWe=G$();function Oy(t){var e=-1,r=t==null?0:t.length;for(this.clear();++e<r;){var o=t[e];this.set(o[0],o[1])}}Oy.prototype.clear=UWe;Oy.prototype.delete=_We;Oy.prototype.get=HWe;Oy.prototype.has=jWe;Oy.prototype.set=GWe;q$.exports=Oy});var V$=_((NFt,K$)=>{var W$=Y$(),qWe=RI(),YWe=US();function WWe(){this.size=0,this.__data__={hash:new W$,map:new(YWe||qWe),string:new W$}}K$.exports=WWe});var z$=_((LFt,J$)=>{function KWe(t){var e=typeof t;return e=="string"||e=="number"||e=="symbol"||e=="boolean"?t!=="__proto__":t===null}J$.exports=KWe});var LI=_((OFt,X$)=>{var VWe=z$();function JWe(t,e){var r=t.__data__;return VWe(e)?r[typeof e=="string"?"string":"hash"]:r.map}X$.exports=JWe});var $$=_((MFt,Z$)=>{var zWe=LI();function XWe(t){var e=zWe(this,t).delete(t);return this.size-=e?1:0,e}Z$.exports=XWe});var tee=_((UFt,eee)=>{var ZWe=LI();function $We(t){return ZWe(this,t).get(t)}eee.exports=$We});var nee=_((_Ft,ree)=>{var eKe=LI();function tKe(t){return eKe(this,t).has(t)}ree.exports=tKe});var see=_((HFt,iee)=>{var rKe=LI();function nKe(t,e){var r=rKe(this,t),o=r.size;return r.set(t,e),this.size+=r.size==o?0:1,this}iee.exports=nKe});var _S=_((jFt,oee)=>{var iKe=V$(),sKe=$$(),oKe=tee(),aKe=nee(),lKe=see();function My(t){var e=-1,r=t==null?0:t.length;for(this.clear();++e<r;){var o=t[e];this.set(o[0],o[1])}}My.prototype.clear=iKe;My.prototype.delete=sKe;My.prototype.get=oKe;My.prototype.has=aKe;My.prototype.set=lKe;oee.exports=My});var lee=_((GFt,aee)=>{var cKe=RI(),uKe=US(),AKe=_S(),fKe=200;function pKe(t,e){var r=this.__data__;if(r instanceof cKe){var o=r.__data__;if(!uKe||o.length<fKe-1)return o.push([t,e]),this.size=++r.size,this;r=this.__data__=new AKe(o)}return r.set(t,e),this.size=r.size,this}aee.exports=pKe});var HS=_((qFt,cee)=>{var hKe=RI(),gKe=$Z(),dKe=t$(),mKe=n$(),yKe=s$(),EKe=lee();function Uy(t){var e=this.__data__=new hKe(t);this.size=e.size}Uy.prototype.clear=gKe;Uy.prototype.delete=dKe;Uy.prototype.get=mKe;Uy.prototype.has=yKe;Uy.prototype.set=EKe;cee.exports=Uy});var Aee=_((YFt,uee)=>{var CKe="__lodash_hash_undefined__";function wKe(t){return this.__data__.set(t,CKe),this}uee.exports=wKe});var pee=_((WFt,fee)=>{function IKe(t){return this.__data__.has(t)}fee.exports=IKe});var gee=_((KFt,hee)=>{var BKe=_S(),vKe=Aee(),DKe=pee();function jS(t){var e=-1,r=t==null?0:t.length;for(this.__data__=new BKe;++e<r;)this.add(t[e])}jS.prototype.add=jS.prototype.push=vKe;jS.prototype.has=DKe;hee.exports=jS});var mee=_((VFt,dee)=>{function SKe(t,e){for(var r=-1,o=t==null?0:t.length;++r<o;)if(e(t[r],r,t))return!0;return!1}dee.exports=SKe});var Eee=_((JFt,yee)=>{function PKe(t,e){return t.has(e)}yee.exports=PKe});var jN=_((zFt,Cee)=>{var bKe=gee(),xKe=mee(),kKe=Eee(),QKe=1,FKe=2;function RKe(t,e,r,o,a,n){var u=r&QKe,A=t.length,p=e.length;if(A!=p&&!(u&&p>A))return!1;var h=n.get(t),E=n.get(e);if(h&&E)return h==e&&E==t;var I=-1,v=!0,x=r&FKe?new bKe:void 0;for(n.set(t,e),n.set(e,t);++I<A;){var C=t[I],R=e[I];if(o)var L=u?o(R,C,I,e,t,n):o(C,R,I,t,e,n);if(L!==void 0){if(L)continue;v=!1;break}if(x){if(!xKe(e,function(U,J){if(!kKe(x,J)&&(C===U||a(C,U,r,o,n)))return x.push(J)})){v=!1;break}}else if(!(C===R||a(C,R,r,o,n))){v=!1;break}}return n.delete(t),n.delete(e),v}Cee.exports=RKe});var GN=_((XFt,wee)=>{var TKe=_l(),NKe=TKe.Uint8Array;wee.exports=NKe});var Bee=_((ZFt,Iee)=>{function LKe(t){var e=-1,r=Array(t.size);return t.forEach(function(o,a){r[++e]=[a,o]}),r}Iee.exports=LKe});var Dee=_(($Ft,vee)=>{function OKe(t){var e=-1,r=Array(t.size);return t.forEach(function(o){r[++e]=o}),r}vee.exports=OKe});var kee=_((eRt,xee)=>{var See=pd(),Pee=GN(),MKe=Ny(),UKe=jN(),_Ke=Bee(),HKe=Dee(),jKe=1,GKe=2,qKe="[object Boolean]",YKe="[object Date]",WKe="[object Error]",KKe="[object Map]",VKe="[object Number]",JKe="[object RegExp]",zKe="[object Set]",XKe="[object String]",ZKe="[object Symbol]",$Ke="[object ArrayBuffer]",eVe="[object DataView]",bee=See?See.prototype:void 0,qN=bee?bee.valueOf:void 0;function tVe(t,e,r,o,a,n,u){switch(r){case eVe:if(t.byteLength!=e.byteLength||t.byteOffset!=e.byteOffset)return!1;t=t.buffer,e=e.buffer;case $Ke:return!(t.byteLength!=e.byteLength||!n(new Pee(t),new Pee(e)));case qKe:case YKe:case VKe:return MKe(+t,+e);case WKe:return t.name==e.name&&t.message==e.message;case JKe:case XKe:return t==e+"";case KKe:var A=_Ke;case zKe:var p=o&jKe;if(A||(A=HKe),t.size!=e.size&&!p)return!1;var h=u.get(t);if(h)return h==e;o|=GKe,u.set(t,e);var E=UKe(A(t),A(e),o,a,n,u);return u.delete(t),E;case ZKe:if(qN)return qN.call(t)==qN.call(e)}return!1}xee.exports=tVe});var GS=_((tRt,Qee)=>{function rVe(t,e){for(var r=-1,o=e.length,a=t.length;++r<o;)t[a+r]=e[r];return t}Qee.exports=rVe});var Hl=_((rRt,Fee)=>{var nVe=Array.isArray;Fee.exports=nVe});var YN=_((nRt,Ree)=>{var iVe=GS(),sVe=Hl();function oVe(t,e,r){var o=e(t);return sVe(t)?o:iVe(o,r(t))}Ree.exports=oVe});var Nee=_((iRt,Tee)=>{function aVe(t,e){for(var r=-1,o=t==null?0:t.length,a=0,n=[];++r<o;){var u=t[r];e(u,r,t)&&(n[a++]=u)}return n}Tee.exports=aVe});var WN=_((sRt,Lee)=>{function lVe(){return[]}Lee.exports=lVe});var qS=_((oRt,Mee)=>{var cVe=Nee(),uVe=WN(),AVe=Object.prototype,fVe=AVe.propertyIsEnumerable,Oee=Object.getOwnPropertySymbols,pVe=Oee?function(t){return t==null?[]:(t=Object(t),cVe(Oee(t),function(e){return fVe.call(t,e)}))}:uVe;Mee.exports=pVe});var _ee=_((aRt,Uee)=>{function hVe(t,e){for(var r=-1,o=Array(t);++r<t;)o[r]=e(r);return o}Uee.exports=hVe});var Ju=_((lRt,Hee)=>{function gVe(t){return t!=null&&typeof t=="object"}Hee.exports=gVe});var Gee=_((cRt,jee)=>{var dVe=hd(),mVe=Ju(),yVe="[object Arguments]";function EVe(t){return mVe(t)&&dVe(t)==yVe}jee.exports=EVe});var OI=_((uRt,Wee)=>{var qee=Gee(),CVe=Ju(),Yee=Object.prototype,wVe=Yee.hasOwnProperty,IVe=Yee.propertyIsEnumerable,BVe=qee(function(){return arguments}())?qee:function(t){return CVe(t)&&wVe.call(t,"callee")&&!IVe.call(t,"callee")};Wee.exports=BVe});var Vee=_((ARt,Kee)=>{function vVe(){return!1}Kee.exports=vVe});var UI=_((MI,_y)=>{var DVe=_l(),SVe=Vee(),Xee=typeof MI=="object"&&MI&&!MI.nodeType&&MI,Jee=Xee&&typeof _y=="object"&&_y&&!_y.nodeType&&_y,PVe=Jee&&Jee.exports===Xee,zee=PVe?DVe.Buffer:void 0,bVe=zee?zee.isBuffer:void 0,xVe=bVe||SVe;_y.exports=xVe});var _I=_((fRt,Zee)=>{var kVe=9007199254740991,QVe=/^(?:0|[1-9]\d*)$/;function FVe(t,e){var r=typeof t;return e=e??kVe,!!e&&(r=="number"||r!="symbol"&&QVe.test(t))&&t>-1&&t%1==0&&t<e}Zee.exports=FVe});var YS=_((pRt,$ee)=>{var RVe=9007199254740991;function TVe(t){return typeof t=="number"&&t>-1&&t%1==0&&t<=RVe}$ee.exports=TVe});var tte=_((hRt,ete)=>{var NVe=hd(),LVe=YS(),OVe=Ju(),MVe="[object Arguments]",UVe="[object Array]",_Ve="[object Boolean]",HVe="[object Date]",jVe="[object Error]",GVe="[object Function]",qVe="[object Map]",YVe="[object Number]",WVe="[object Object]",KVe="[object RegExp]",VVe="[object Set]",JVe="[object String]",zVe="[object WeakMap]",XVe="[object ArrayBuffer]",ZVe="[object DataView]",$Ve="[object Float32Array]",eJe="[object Float64Array]",tJe="[object Int8Array]",rJe="[object Int16Array]",nJe="[object Int32Array]",iJe="[object Uint8Array]",sJe="[object Uint8ClampedArray]",oJe="[object Uint16Array]",aJe="[object Uint32Array]",ui={};ui[$Ve]=ui[eJe]=ui[tJe]=ui[rJe]=ui[nJe]=ui[iJe]=ui[sJe]=ui[oJe]=ui[aJe]=!0;ui[MVe]=ui[UVe]=ui[XVe]=ui[_Ve]=ui[ZVe]=ui[HVe]=ui[jVe]=ui[GVe]=ui[qVe]=ui[YVe]=ui[WVe]=ui[KVe]=ui[VVe]=ui[JVe]=ui[zVe]=!1;function lJe(t){return OVe(t)&&LVe(t.length)&&!!ui[NVe(t)]}ete.exports=lJe});var WS=_((gRt,rte)=>{function cJe(t){return function(e){return t(e)}}rte.exports=cJe});var KS=_((HI,Hy)=>{var uJe=UN(),nte=typeof HI=="object"&&HI&&!HI.nodeType&&HI,jI=nte&&typeof Hy=="object"&&Hy&&!Hy.nodeType&&Hy,AJe=jI&&jI.exports===nte,KN=AJe&&uJe.process,fJe=function(){try{var t=jI&&jI.require&&jI.require("util").types;return t||KN&&KN.binding&&KN.binding("util")}catch{}}();Hy.exports=fJe});var VS=_((dRt,ote)=>{var pJe=tte(),hJe=WS(),ite=KS(),ste=ite&&ite.isTypedArray,gJe=ste?hJe(ste):pJe;ote.exports=gJe});var VN=_((mRt,ate)=>{var dJe=_ee(),mJe=OI(),yJe=Hl(),EJe=UI(),CJe=_I(),wJe=VS(),IJe=Object.prototype,BJe=IJe.hasOwnProperty;function vJe(t,e){var r=yJe(t),o=!r&&mJe(t),a=!r&&!o&&EJe(t),n=!r&&!o&&!a&&wJe(t),u=r||o||a||n,A=u?dJe(t.length,String):[],p=A.length;for(var h in t)(e||BJe.call(t,h))&&!(u&&(h=="length"||a&&(h=="offset"||h=="parent")||n&&(h=="buffer"||h=="byteLength"||h=="byteOffset")||CJe(h,p)))&&A.push(h);return A}ate.exports=vJe});var JS=_((yRt,lte)=>{var DJe=Object.prototype;function SJe(t){var e=t&&t.constructor,r=typeof e=="function"&&e.prototype||DJe;return t===r}lte.exports=SJe});var JN=_((ERt,cte)=>{function PJe(t,e){return function(r){return t(e(r))}}cte.exports=PJe});var Ate=_((CRt,ute)=>{var bJe=JN(),xJe=bJe(Object.keys,Object);ute.exports=xJe});var pte=_((wRt,fte)=>{var kJe=JS(),QJe=Ate(),FJe=Object.prototype,RJe=FJe.hasOwnProperty;function TJe(t){if(!kJe(t))return QJe(t);var e=[];for(var r in Object(t))RJe.call(t,r)&&r!="constructor"&&e.push(r);return e}fte.exports=TJe});var GI=_((IRt,hte)=>{var NJe=MS(),LJe=YS();function OJe(t){return t!=null&&LJe(t.length)&&!NJe(t)}hte.exports=OJe});var zS=_((BRt,gte)=>{var MJe=VN(),UJe=pte(),_Je=GI();function HJe(t){return _Je(t)?MJe(t):UJe(t)}gte.exports=HJe});var zN=_((vRt,dte)=>{var jJe=YN(),GJe=qS(),qJe=zS();function YJe(t){return jJe(t,qJe,GJe)}dte.exports=YJe});var Ete=_((DRt,yte)=>{var mte=zN(),WJe=1,KJe=Object.prototype,VJe=KJe.hasOwnProperty;function JJe(t,e,r,o,a,n){var u=r&WJe,A=mte(t),p=A.length,h=mte(e),E=h.length;if(p!=E&&!u)return!1;for(var I=p;I--;){var v=A[I];if(!(u?v in e:VJe.call(e,v)))return!1}var x=n.get(t),C=n.get(e);if(x&&C)return x==e&&C==t;var R=!0;n.set(t,e),n.set(e,t);for(var L=u;++I<p;){v=A[I];var U=t[v],J=e[v];if(o)var te=u?o(J,U,v,e,t,n):o(U,J,v,t,e,n);if(!(te===void 0?U===J||a(U,J,r,o,n):te)){R=!1;break}L||(L=v=="constructor")}if(R&&!L){var ae=t.constructor,fe=e.constructor;ae!=fe&&"constructor"in t&&"constructor"in e&&!(typeof ae=="function"&&ae instanceof ae&&typeof fe=="function"&&fe instanceof fe)&&(R=!1)}return n.delete(t),n.delete(e),R}yte.exports=JJe});var wte=_((SRt,Cte)=>{var zJe=zp(),XJe=_l(),ZJe=zJe(XJe,"DataView");Cte.exports=ZJe});var Bte=_((PRt,Ite)=>{var $Je=zp(),eze=_l(),tze=$Je(eze,"Promise");Ite.exports=tze});var Dte=_((bRt,vte)=>{var rze=zp(),nze=_l(),ize=rze(nze,"Set");vte.exports=ize});var Pte=_((xRt,Ste)=>{var sze=zp(),oze=_l(),aze=sze(oze,"WeakMap");Ste.exports=aze});var qI=_((kRt,Tte)=>{var XN=wte(),ZN=US(),$N=Bte(),eL=Dte(),tL=Pte(),Rte=hd(),jy=HN(),bte="[object Map]",lze="[object Object]",xte="[object Promise]",kte="[object Set]",Qte="[object WeakMap]",Fte="[object DataView]",cze=jy(XN),uze=jy(ZN),Aze=jy($N),fze=jy(eL),pze=jy(tL),gd=Rte;(XN&&gd(new XN(new ArrayBuffer(1)))!=Fte||ZN&&gd(new ZN)!=bte||$N&&gd($N.resolve())!=xte||eL&&gd(new eL)!=kte||tL&&gd(new tL)!=Qte)&&(gd=function(t){var e=Rte(t),r=e==lze?t.constructor:void 0,o=r?jy(r):"";if(o)switch(o){case cze:return Fte;case uze:return bte;case Aze:return xte;case fze:return kte;case pze:return Qte}return e});Tte.exports=gd});var jte=_((QRt,Hte)=>{var rL=HS(),hze=jN(),gze=kee(),dze=Ete(),Nte=qI(),Lte=Hl(),Ote=UI(),mze=VS(),yze=1,Mte="[object Arguments]",Ute="[object Array]",XS="[object Object]",Eze=Object.prototype,_te=Eze.hasOwnProperty;function Cze(t,e,r,o,a,n){var u=Lte(t),A=Lte(e),p=u?Ute:Nte(t),h=A?Ute:Nte(e);p=p==Mte?XS:p,h=h==Mte?XS:h;var E=p==XS,I=h==XS,v=p==h;if(v&&Ote(t)){if(!Ote(e))return!1;u=!0,E=!1}if(v&&!E)return n||(n=new rL),u||mze(t)?hze(t,e,r,o,a,n):gze(t,e,p,r,o,a,n);if(!(r&yze)){var x=E&&_te.call(t,"__wrapped__"),C=I&&_te.call(e,"__wrapped__");if(x||C){var R=x?t.value():t,L=C?e.value():e;return n||(n=new rL),a(R,L,r,o,n)}}return v?(n||(n=new rL),dze(t,e,r,o,a,n)):!1}Hte.exports=Cze});var Wte=_((FRt,Yte)=>{var wze=jte(),Gte=Ju();function qte(t,e,r,o,a){return t===e?!0:t==null||e==null||!Gte(t)&&!Gte(e)?t!==t&&e!==e:wze(t,e,r,o,qte,a)}Yte.exports=qte});var Vte=_((RRt,Kte)=>{var Ize=Wte();function Bze(t,e){return Ize(t,e)}Kte.exports=Bze});var nL=_((TRt,Jte)=>{var vze=zp(),Dze=function(){try{var t=vze(Object,"defineProperty");return t({},"",{}),t}catch{}}();Jte.exports=Dze});var ZS=_((NRt,Xte)=>{var zte=nL();function Sze(t,e,r){e=="__proto__"&&zte?zte(t,e,{configurable:!0,enumerable:!0,value:r,writable:!0}):t[e]=r}Xte.exports=Sze});var iL=_((LRt,Zte)=>{var Pze=ZS(),bze=Ny();function xze(t,e,r){(r!==void 0&&!bze(t[e],r)||r===void 0&&!(e in t))&&Pze(t,e,r)}Zte.exports=xze});var ere=_((ORt,$te)=>{function kze(t){return function(e,r,o){for(var a=-1,n=Object(e),u=o(e),A=u.length;A--;){var p=u[t?A:++a];if(r(n[p],p,n)===!1)break}return e}}$te.exports=kze});var rre=_((MRt,tre)=>{var Qze=ere(),Fze=Qze();tre.exports=Fze});var sL=_((YI,Gy)=>{var Rze=_l(),ore=typeof YI=="object"&&YI&&!YI.nodeType&&YI,nre=ore&&typeof Gy=="object"&&Gy&&!Gy.nodeType&&Gy,Tze=nre&&nre.exports===ore,ire=Tze?Rze.Buffer:void 0,sre=ire?ire.allocUnsafe:void 0;function Nze(t,e){if(e)return t.slice();var r=t.length,o=sre?sre(r):new t.constructor(r);return t.copy(o),o}Gy.exports=Nze});var $S=_((URt,lre)=>{var are=GN();function Lze(t){var e=new t.constructor(t.byteLength);return new are(e).set(new are(t)),e}lre.exports=Lze});var oL=_((_Rt,cre)=>{var Oze=$S();function Mze(t,e){var r=e?Oze(t.buffer):t.buffer;return new t.constructor(r,t.byteOffset,t.length)}cre.exports=Mze});var eP=_((HRt,ure)=>{function Uze(t,e){var r=-1,o=t.length;for(e||(e=Array(o));++r<o;)e[r]=t[r];return e}ure.exports=Uze});var pre=_((jRt,fre)=>{var _ze=il(),Are=Object.create,Hze=function(){function t(){}return function(e){if(!_ze(e))return{};if(Are)return Are(e);t.prototype=e;var r=new t;return t.prototype=void 0,r}}();fre.exports=Hze});var tP=_((GRt,hre)=>{var jze=JN(),Gze=jze(Object.getPrototypeOf,Object);hre.exports=Gze});var aL=_((qRt,gre)=>{var qze=pre(),Yze=tP(),Wze=JS();function Kze(t){return typeof t.constructor=="function"&&!Wze(t)?qze(Yze(t)):{}}gre.exports=Kze});var mre=_((YRt,dre)=>{var Vze=GI(),Jze=Ju();function zze(t){return Jze(t)&&Vze(t)}dre.exports=zze});var lL=_((WRt,Ere)=>{var Xze=hd(),Zze=tP(),$ze=Ju(),eXe="[object Object]",tXe=Function.prototype,rXe=Object.prototype,yre=tXe.toString,nXe=rXe.hasOwnProperty,iXe=yre.call(Object);function sXe(t){if(!$ze(t)||Xze(t)!=eXe)return!1;var e=Zze(t);if(e===null)return!0;var r=nXe.call(e,"constructor")&&e.constructor;return typeof r=="function"&&r instanceof r&&yre.call(r)==iXe}Ere.exports=sXe});var cL=_((KRt,Cre)=>{function oXe(t,e){if(!(e==="constructor"&&typeof t[e]=="function")&&e!="__proto__")return t[e]}Cre.exports=oXe});var rP=_((VRt,wre)=>{var aXe=ZS(),lXe=Ny(),cXe=Object.prototype,uXe=cXe.hasOwnProperty;function AXe(t,e,r){var o=t[e];(!(uXe.call(t,e)&&lXe(o,r))||r===void 0&&!(e in t))&&aXe(t,e,r)}wre.exports=AXe});var dd=_((JRt,Ire)=>{var fXe=rP(),pXe=ZS();function hXe(t,e,r,o){var a=!r;r||(r={});for(var n=-1,u=e.length;++n<u;){var A=e[n],p=o?o(r[A],t[A],A,r,t):void 0;p===void 0&&(p=t[A]),a?pXe(r,A,p):fXe(r,A,p)}return r}Ire.exports=hXe});var vre=_((zRt,Bre)=>{function gXe(t){var e=[];if(t!=null)for(var r in Object(t))e.push(r);return e}Bre.exports=gXe});var Sre=_((XRt,Dre)=>{var dXe=il(),mXe=JS(),yXe=vre(),EXe=Object.prototype,CXe=EXe.hasOwnProperty;function wXe(t){if(!dXe(t))return yXe(t);var e=mXe(t),r=[];for(var o in t)o=="constructor"&&(e||!CXe.call(t,o))||r.push(o);return r}Dre.exports=wXe});var qy=_((ZRt,Pre)=>{var IXe=VN(),BXe=Sre(),vXe=GI();function DXe(t){return vXe(t)?IXe(t,!0):BXe(t)}Pre.exports=DXe});var xre=_(($Rt,bre)=>{var SXe=dd(),PXe=qy();function bXe(t){return SXe(t,PXe(t))}bre.exports=bXe});var Nre=_((eTt,Tre)=>{var kre=iL(),xXe=sL(),kXe=oL(),QXe=eP(),FXe=aL(),Qre=OI(),Fre=Hl(),RXe=mre(),TXe=UI(),NXe=MS(),LXe=il(),OXe=lL(),MXe=VS(),Rre=cL(),UXe=xre();function _Xe(t,e,r,o,a,n,u){var A=Rre(t,r),p=Rre(e,r),h=u.get(p);if(h){kre(t,r,h);return}var E=n?n(A,p,r+"",t,e,u):void 0,I=E===void 0;if(I){var v=Fre(p),x=!v&&TXe(p),C=!v&&!x&&MXe(p);E=p,v||x||C?Fre(A)?E=A:RXe(A)?E=QXe(A):x?(I=!1,E=xXe(p,!0)):C?(I=!1,E=kXe(p,!0)):E=[]:OXe(p)||Qre(p)?(E=A,Qre(A)?E=UXe(A):(!LXe(A)||NXe(A))&&(E=FXe(p))):I=!1}I&&(u.set(p,E),a(E,p,o,n,u),u.delete(p)),kre(t,r,E)}Tre.exports=_Xe});var Mre=_((tTt,Ore)=>{var HXe=HS(),jXe=iL(),GXe=rre(),qXe=Nre(),YXe=il(),WXe=qy(),KXe=cL();function Lre(t,e,r,o,a){t!==e&&GXe(e,function(n,u){if(a||(a=new HXe),YXe(n))qXe(t,e,u,r,Lre,o,a);else{var A=o?o(KXe(t,u),n,u+"",t,e,a):void 0;A===void 0&&(A=n),jXe(t,u,A)}},WXe)}Ore.exports=Lre});var uL=_((rTt,Ure)=>{function VXe(t){return t}Ure.exports=VXe});var Hre=_((nTt,_re)=>{function JXe(t,e,r){switch(r.length){case 0:return t.call(e);case 1:return t.call(e,r[0]);case 2:return t.call(e,r[0],r[1]);case 3:return t.call(e,r[0],r[1],r[2])}return t.apply(e,r)}_re.exports=JXe});var AL=_((iTt,Gre)=>{var zXe=Hre(),jre=Math.max;function XXe(t,e,r){return e=jre(e===void 0?t.length-1:e,0),function(){for(var o=arguments,a=-1,n=jre(o.length-e,0),u=Array(n);++a<n;)u[a]=o[e+a];a=-1;for(var A=Array(e+1);++a<e;)A[a]=o[a];return A[e]=r(u),zXe(t,this,A)}}Gre.exports=XXe});var Yre=_((sTt,qre)=>{function ZXe(t){return function(){return t}}qre.exports=ZXe});var Vre=_((oTt,Kre)=>{var $Xe=Yre(),Wre=nL(),eZe=uL(),tZe=Wre?function(t,e){return Wre(t,"toString",{configurable:!0,enumerable:!1,value:$Xe(e),writable:!0})}:eZe;Kre.exports=tZe});var zre=_((aTt,Jre)=>{var rZe=800,nZe=16,iZe=Date.now;function sZe(t){var e=0,r=0;return function(){var o=iZe(),a=nZe-(o-r);if(r=o,a>0){if(++e>=rZe)return arguments[0]}else e=0;return t.apply(void 0,arguments)}}Jre.exports=sZe});var fL=_((lTt,Xre)=>{var oZe=Vre(),aZe=zre(),lZe=aZe(oZe);Xre.exports=lZe});var $re=_((cTt,Zre)=>{var cZe=uL(),uZe=AL(),AZe=fL();function fZe(t,e){return AZe(uZe(t,e,cZe),t+"")}Zre.exports=fZe});var tne=_((uTt,ene)=>{var pZe=Ny(),hZe=GI(),gZe=_I(),dZe=il();function mZe(t,e,r){if(!dZe(r))return!1;var o=typeof e;return(o=="number"?hZe(r)&&gZe(e,r.length):o=="string"&&e in r)?pZe(r[e],t):!1}ene.exports=mZe});var nne=_((ATt,rne)=>{var yZe=$re(),EZe=tne();function CZe(t){return yZe(function(e,r){var o=-1,a=r.length,n=a>1?r[a-1]:void 0,u=a>2?r[2]:void 0;for(n=t.length>3&&typeof n=="function"?(a--,n):void 0,u&&EZe(r[0],r[1],u)&&(n=a<3?void 0:n,a=1),e=Object(e);++o<a;){var A=r[o];A&&t(e,A,o,n)}return e})}rne.exports=CZe});var sne=_((fTt,ine)=>{var wZe=Mre(),IZe=nne(),BZe=IZe(function(t,e,r,o){wZe(t,e,r,o)});ine.exports=BZe});var _e={};Vt(_e,{AsyncActions:()=>gL,BufferStream:()=>hL,CachingStrategy:()=>mne,DefaultStream:()=>dL,allSettledSafe:()=>Uc,assertNever:()=>yL,bufferStream:()=>Vy,buildIgnorePattern:()=>kZe,convertMapsToIndexableObjects:()=>iP,dynamicRequire:()=>Df,escapeRegExp:()=>DZe,getArrayWithDefault:()=>Yy,getFactoryWithDefault:()=>ol,getMapWithDefault:()=>Wy,getSetWithDefault:()=>md,groupBy:()=>wL,isIndexableObject:()=>pL,isPathLike:()=>QZe,isTaggedYarnVersion:()=>vZe,makeDeferred:()=>hne,mapAndFilter:()=>sl,mapAndFind:()=>KI,mergeIntoTarget:()=>Ene,overrideType:()=>SZe,parseBoolean:()=>VI,parseInt:()=>Jy,parseOptionalBoolean:()=>yne,plural:()=>nP,prettifyAsyncErrors:()=>Ky,prettifySyncErrors:()=>EL,releaseAfterUseAsync:()=>bZe,replaceEnvVariables:()=>sP,sortMap:()=>ks,toMerged:()=>FZe,tryParseOptionalBoolean:()=>CL,validateEnum:()=>PZe});function vZe(t){return!!(Ane.default.valid(t)&&t.match(/^[^-]+(-rc\.[0-9]+)?$/))}function nP(t,{one:e,more:r,zero:o=r}){return t===0?o:t===1?e:r}function DZe(t){return t.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")}function SZe(t){}function yL(t){throw new Error(`Assertion failed: Unexpected object '${t}'`)}function PZe(t,e){let r=Object.values(t);if(!r.includes(e))throw new it(`Invalid value for enumeration: ${JSON.stringify(e)} (expected one of ${r.map(o=>JSON.stringify(o)).join(", ")})`);return e}function sl(t,e){let r=[];for(let o of t){let a=e(o);a!==fne&&r.push(a)}return r}function KI(t,e){for(let r of t){let o=e(r);if(o!==pne)return o}}function pL(t){return typeof t=="object"&&t!==null}async function Uc(t){let e=await Promise.allSettled(t),r=[];for(let o of e){if(o.status==="rejected")throw o.reason;r.push(o.value)}return r}function iP(t){if(t instanceof Map&&(t=Object.fromEntries(t)),pL(t))for(let e of Object.keys(t)){let r=t[e];pL(r)&&(t[e]=iP(r))}return t}function ol(t,e,r){let o=t.get(e);return typeof o>"u"&&t.set(e,o=r()),o}function Yy(t,e){let r=t.get(e);return typeof r>"u"&&t.set(e,r=[]),r}function md(t,e){let r=t.get(e);return typeof r>"u"&&t.set(e,r=new Set),r}function Wy(t,e){let r=t.get(e);return typeof r>"u"&&t.set(e,r=new Map),r}async function bZe(t,e){if(e==null)return await t();try{return await t()}finally{await e()}}async function Ky(t,e){try{return await t()}catch(r){throw r.message=e(r.message),r}}function EL(t,e){try{return t()}catch(r){throw r.message=e(r.message),r}}async function Vy(t){return await new Promise((e,r)=>{let o=[];t.on("error",a=>{r(a)}),t.on("data",a=>{o.push(a)}),t.on("end",()=>{e(Buffer.concat(o))})})}function hne(){let t,e;return{promise:new Promise((o,a)=>{t=o,e=a}),resolve:t,reject:e}}function gne(t){return WI(ue.fromPortablePath(t))}function dne(path){let physicalPath=ue.fromPortablePath(path),currentCacheEntry=WI.cache[physicalPath];delete WI.cache[physicalPath];let result;try{result=gne(physicalPath);let freshCacheEntry=WI.cache[physicalPath],dynamicModule=eval("module"),freshCacheIndex=dynamicModule.children.indexOf(freshCacheEntry);freshCacheIndex!==-1&&dynamicModule.children.splice(freshCacheIndex,1)}finally{WI.cache[physicalPath]=currentCacheEntry}return result}function xZe(t){let e=one.get(t),r=oe.statSync(t);if(e?.mtime===r.mtimeMs)return e.instance;let o=dne(t);return one.set(t,{mtime:r.mtimeMs,instance:o}),o}function Df(t,{cachingStrategy:e=2}={}){switch(e){case 0:return dne(t);case 1:return xZe(t);case 2:return gne(t);default:throw new Error("Unsupported caching strategy")}}function ks(t,e){let r=Array.from(t);Array.isArray(e)||(e=[e]);let o=[];for(let n of e)o.push(r.map(u=>n(u)));let a=r.map((n,u)=>u);return a.sort((n,u)=>{for(let A of o){let p=A[n]<A[u]?-1:A[n]>A[u]?1:0;if(p!==0)return p}return 0}),a.map(n=>r[n])}function kZe(t){return t.length===0?null:t.map(e=>`(${cne.default.makeRe(e,{windows:!1,dot:!0}).source})`).join("|")}function sP(t,{env:e}){let r=/\${(?<variableName>[\d\w_]+)(?<colon>:)?(?:-(?<fallback>[^}]*))?}/g;return t.replace(r,(...o)=>{let{variableName:a,colon:n,fallback:u}=o[o.length-1],A=Object.hasOwn(e,a),p=e[a];if(p||A&&!n)return p;if(u!=null)return u;throw new it(`Environment variable not found (${a})`)})}function VI(t){switch(t){case"true":case"1":case 1:case!0:return!0;case"false":case"0":case 0:case!1:return!1;default:throw new Error(`Couldn't parse "${t}" as a boolean`)}}function yne(t){return typeof t>"u"?t:VI(t)}function CL(t){try{return yne(t)}catch{return null}}function QZe(t){return!!(ue.isAbsolute(t)||t.match(/^(\.{1,2}|~)\//))}function Ene(t,...e){let r=u=>({value:u}),o=r(t),a=e.map(u=>r(u)),{value:n}=(0,lne.default)(o,...a,(u,A)=>{if(Array.isArray(u)&&Array.isArray(A)){for(let p of A)u.find(h=>(0,ane.default)(h,p))||u.push(p);return u}});return n}function FZe(...t){return Ene({},...t)}function wL(t,e){let r=Object.create(null);for(let o of t){let a=o[e];r[a]??=[],r[a].push(o)}return r}function Jy(t){return typeof t=="string"?Number.parseInt(t,10):t}var ane,lne,cne,une,Ane,mL,fne,pne,hL,gL,dL,WI,one,mne,jl=Et(()=>{St();jt();ane=$e(Vte()),lne=$e(sne()),cne=$e(Zo()),une=$e(id()),Ane=$e(zn()),mL=ve("stream");fne=Symbol();sl.skip=fne;pne=Symbol();KI.skip=pne;hL=class extends mL.Transform{constructor(){super(...arguments);this.chunks=[]}_transform(r,o,a){if(o!=="buffer"||!Buffer.isBuffer(r))throw new Error("Assertion failed: BufferStream only accept buffers");this.chunks.push(r),a(null,null)}_flush(r){r(null,Buffer.concat(this.chunks))}};gL=class{constructor(e){this.deferred=new Map;this.promises=new Map;this.limit=(0,une.default)(e)}set(e,r){let o=this.deferred.get(e);typeof o>"u"&&this.deferred.set(e,o=hne());let a=this.limit(()=>r());return this.promises.set(e,a),a.then(()=>{this.promises.get(e)===a&&o.resolve()},n=>{this.promises.get(e)===a&&o.reject(n)}),o.promise}reduce(e,r){let o=this.promises.get(e)??Promise.resolve();this.set(e,()=>r(o))}async wait(){await Promise.all(this.promises.values())}},dL=class extends mL.Transform{constructor(r=Buffer.alloc(0)){super();this.active=!0;this.ifEmpty=r}_transform(r,o,a){if(o!=="buffer"||!Buffer.isBuffer(r))throw new Error("Assertion failed: DefaultStream only accept buffers");this.active=!1,a(null,r)}_flush(r){this.active&&this.ifEmpty.length>0?r(null,this.ifEmpty):r(null)}},WI=eval("require");one=new Map;mne=(o=>(o[o.NoCache=0]="NoCache",o[o.FsTime=1]="FsTime",o[o.Node=2]="Node",o))(mne||{})});var zy,IL,BL,Cne=Et(()=>{zy=(r=>(r.HARD="HARD",r.SOFT="SOFT",r))(zy||{}),IL=(o=>(o.Dependency="Dependency",o.PeerDependency="PeerDependency",o.PeerDependencyMeta="PeerDependencyMeta",o))(IL||{}),BL=(o=>(o.Inactive="inactive",o.Redundant="redundant",o.Active="active",o))(BL||{})});var de={};Vt(de,{LogLevel:()=>uP,Style:()=>aP,Type:()=>yt,addLogFilterSupport:()=>XI,applyColor:()=>Vs,applyHyperlink:()=>Zy,applyStyle:()=>yd,json:()=>Ed,jsonOrPretty:()=>NZe,mark:()=>bL,pretty:()=>Mt,prettyField:()=>zu,prettyList:()=>PL,prettyTruncatedLocatorList:()=>cP,stripAnsi:()=>Xy.default,supportsColor:()=>lP,supportsHyperlinks:()=>SL,tuple:()=>_c});function wne(t){let e=["KiB","MiB","GiB","TiB"],r=e.length;for(;r>1&&t<1024**r;)r-=1;let o=1024**r;return`${Math.floor(t*100/o)/100} ${e[r-1]}`}function _c(t,e){return[e,t]}function yd(t,e,r){return t.get("enableColors")&&r&2&&(e=zI.default.bold(e)),e}function Vs(t,e,r){if(!t.get("enableColors"))return e;let o=RZe.get(r);if(o===null)return e;let a=typeof o>"u"?r:DL.level>=3?o[0]:o[1],n=typeof a=="number"?vL.ansi256(a):a.startsWith("#")?vL.hex(a):vL[a];if(typeof n!="function")throw new Error(`Invalid format type ${a}`);return n(e)}function Zy(t,e,r){return t.get("enableHyperlinks")?TZe?`\x1B]8;;${r}\x1B\\${e}\x1B]8;;\x1B\\`:`\x1B]8;;${r}\x07${e}\x1B]8;;\x07`:e}function Mt(t,e,r){if(e===null)return Vs(t,"null",yt.NULL);if(Object.hasOwn(oP,r))return oP[r].pretty(t,e);if(typeof e!="string")throw new Error(`Assertion failed: Expected the value to be a string, got ${typeof e}`);return Vs(t,e,r)}function PL(t,e,r,{separator:o=", "}={}){return[...e].map(a=>Mt(t,a,r)).join(o)}function Ed(t,e){if(t===null)return null;if(Object.hasOwn(oP,e))return oP[e].json(t);if(typeof t!="string")throw new Error(`Assertion failed: Expected the value to be a string, got ${typeof t}`);return t}function NZe(t,e,[r,o]){return t?Ed(r,o):Mt(e,r,o)}function bL(t){return{Check:Vs(t,"\u2713","green"),Cross:Vs(t,"\u2718","red"),Question:Vs(t,"?","cyan")}}function zu(t,{label:e,value:[r,o]}){return`${Mt(t,e,yt.CODE)}: ${Mt(t,r,o)}`}function cP(t,e,r){let o=[],a=[...e],n=r;for(;a.length>0;){let h=a[0],E=`${jr(t,h)}, `,I=xL(h).length+2;if(o.length>0&&n<I)break;o.push([E,I]),n-=I,a.shift()}if(a.length===0)return o.map(([h])=>h).join("").slice(0,-2);let u="X".repeat(a.length.toString().length),A=`and ${u} more.`,p=a.length;for(;o.length>1&&n<A.length;)n+=o[o.length-1][1],p+=1,o.pop();return[o.map(([h])=>h).join(""),A.replace(u,Mt(t,p,yt.NUMBER))].join("")}function XI(t,{configuration:e}){let r=e.get("logFilters"),o=new Map,a=new Map,n=[];for(let I of r){let v=I.get("level");if(typeof v>"u")continue;let x=I.get("code");typeof x<"u"&&o.set(x,v);let C=I.get("text");typeof C<"u"&&a.set(C,v);let R=I.get("pattern");typeof R<"u"&&n.push([Ine.default.matcher(R,{contains:!0}),v])}n.reverse();let u=(I,v,x)=>{if(I===null||I===0)return x;let C=a.size>0||n.length>0?(0,Xy.default)(v):v;if(a.size>0){let R=a.get(C);if(typeof R<"u")return R??x}if(n.length>0){for(let[R,L]of n)if(R(C))return L??x}if(o.size>0){let R=o.get(Wu(I));if(typeof R<"u")return R??x}return x},A=t.reportInfo,p=t.reportWarning,h=t.reportError,E=function(I,v,x,C){switch(u(v,x,C)){case"info":A.call(I,v,x);break;case"warning":p.call(I,v??0,x);break;case"error":h.call(I,v??0,x);break}};t.reportInfo=function(...I){return E(this,...I,"info")},t.reportWarning=function(...I){return E(this,...I,"warning")},t.reportError=function(...I){return E(this,...I,"error")}}var zI,JI,Ine,Xy,Bne,yt,aP,DL,lP,SL,vL,RZe,Po,oP,TZe,uP,Gl=Et(()=>{St();zI=$e(IN()),JI=$e(td());jt();Ine=$e(Zo()),Xy=$e(OS()),Bne=ve("util");fS();bo();yt={NO_HINT:"NO_HINT",ID:"ID",NULL:"NULL",SCOPE:"SCOPE",NAME:"NAME",RANGE:"RANGE",REFERENCE:"REFERENCE",NUMBER:"NUMBER",PATH:"PATH",URL:"URL",ADDED:"ADDED",REMOVED:"REMOVED",CODE:"CODE",INSPECT:"INSPECT",DURATION:"DURATION",SIZE:"SIZE",SIZE_DIFF:"SIZE_DIFF",IDENT:"IDENT",DESCRIPTOR:"DESCRIPTOR",LOCATOR:"LOCATOR",RESOLUTION:"RESOLUTION",DEPENDENT:"DEPENDENT",PACKAGE_EXTENSION:"PACKAGE_EXTENSION",SETTING:"SETTING",MARKDOWN:"MARKDOWN",MARKDOWN_INLINE:"MARKDOWN_INLINE"},aP=(e=>(e[e.BOLD=2]="BOLD",e))(aP||{}),DL=JI.default.GITHUB_ACTIONS?{level:2}:zI.default.supportsColor?{level:zI.default.supportsColor.level}:{level:0},lP=DL.level!==0,SL=lP&&!JI.default.GITHUB_ACTIONS&&!JI.default.CIRCLE&&!JI.default.GITLAB,vL=new zI.default.Instance(DL),RZe=new Map([[yt.NO_HINT,null],[yt.NULL,["#a853b5",129]],[yt.SCOPE,["#d75f00",166]],[yt.NAME,["#d7875f",173]],[yt.RANGE,["#00afaf",37]],[yt.REFERENCE,["#87afff",111]],[yt.NUMBER,["#ffd700",220]],[yt.PATH,["#d75fd7",170]],[yt.URL,["#d75fd7",170]],[yt.ADDED,["#5faf00",70]],[yt.REMOVED,["#ff3131",160]],[yt.CODE,["#87afff",111]],[yt.SIZE,["#ffd700",220]]]),Po=t=>t;oP={[yt.ID]:Po({pretty:(t,e)=>typeof e=="number"?Vs(t,`${e}`,yt.NUMBER):Vs(t,e,yt.CODE),json:t=>t}),[yt.INSPECT]:Po({pretty:(t,e)=>(0,Bne.inspect)(e,{depth:1/0,colors:t.get("enableColors"),compact:!0,breakLength:1/0}),json:t=>t}),[yt.NUMBER]:Po({pretty:(t,e)=>Vs(t,`${e}`,yt.NUMBER),json:t=>t}),[yt.IDENT]:Po({pretty:(t,e)=>cs(t,e),json:t=>fn(t)}),[yt.LOCATOR]:Po({pretty:(t,e)=>jr(t,e),json:t=>ba(t)}),[yt.DESCRIPTOR]:Po({pretty:(t,e)=>Gn(t,e),json:t=>Pa(t)}),[yt.RESOLUTION]:Po({pretty:(t,{descriptor:e,locator:r})=>ZI(t,e,r),json:({descriptor:t,locator:e})=>({descriptor:Pa(t),locator:e!==null?ba(e):null})}),[yt.DEPENDENT]:Po({pretty:(t,{locator:e,descriptor:r})=>kL(t,e,r),json:({locator:t,descriptor:e})=>({locator:ba(t),descriptor:Pa(e)})}),[yt.PACKAGE_EXTENSION]:Po({pretty:(t,e)=>{switch(e.type){case"Dependency":return`${cs(t,e.parentDescriptor)} \u27A4 ${Vs(t,"dependencies",yt.CODE)} \u27A4 ${cs(t,e.descriptor)}`;case"PeerDependency":return`${cs(t,e.parentDescriptor)} \u27A4 ${Vs(t,"peerDependencies",yt.CODE)} \u27A4 ${cs(t,e.descriptor)}`;case"PeerDependencyMeta":return`${cs(t,e.parentDescriptor)} \u27A4 ${Vs(t,"peerDependenciesMeta",yt.CODE)} \u27A4 ${cs(t,Js(e.selector))} \u27A4 ${Vs(t,e.key,yt.CODE)}`;default:throw new Error(`Assertion failed: Unsupported package extension type: ${e.type}`)}},json:t=>{switch(t.type){case"Dependency":return`${fn(t.parentDescriptor)} > ${fn(t.descriptor)}`;case"PeerDependency":return`${fn(t.parentDescriptor)} >> ${fn(t.descriptor)}`;case"PeerDependencyMeta":return`${fn(t.parentDescriptor)} >> ${t.selector} / ${t.key}`;default:throw new Error(`Assertion failed: Unsupported package extension type: ${t.type}`)}}}),[yt.SETTING]:Po({pretty:(t,e)=>(t.get(e),Zy(t,Vs(t,e,yt.CODE),`https://yarnpkg.com/configuration/yarnrc#${e}`)),json:t=>t}),[yt.DURATION]:Po({pretty:(t,e)=>{if(e>1e3*60){let r=Math.floor(e/1e3/60),o=Math.ceil((e-r*60*1e3)/1e3);return o===0?`${r}m`:`${r}m ${o}s`}else{let r=Math.floor(e/1e3),o=e-r*1e3;return o===0?`${r}s`:`${r}s ${o}ms`}},json:t=>t}),[yt.SIZE]:Po({pretty:(t,e)=>Vs(t,wne(e),yt.NUMBER),json:t=>t}),[yt.SIZE_DIFF]:Po({pretty:(t,e)=>{let r=e>=0?"+":"-",o=r==="+"?yt.REMOVED:yt.ADDED;return Vs(t,`${r} ${wne(Math.max(Math.abs(e),1))}`,o)},json:t=>t}),[yt.PATH]:Po({pretty:(t,e)=>Vs(t,ue.fromPortablePath(e),yt.PATH),json:t=>ue.fromPortablePath(t)}),[yt.MARKDOWN]:Po({pretty:(t,{text:e,format:r,paragraphs:o})=>Do(e,{format:r,paragraphs:o}),json:({text:t})=>t}),[yt.MARKDOWN_INLINE]:Po({pretty:(t,e)=>(e=e.replace(/(`+)((?:.|[\n])*?)\1/g,(r,o,a)=>Mt(t,o+a+o,yt.CODE)),e=e.replace(/(\*\*)((?:.|[\n])*?)\1/g,(r,o,a)=>yd(t,a,2)),e),json:t=>t})};TZe=!!process.env.KONSOLE_VERSION;uP=(a=>(a.Error="error",a.Warning="warning",a.Info="info",a.Discard="discard",a))(uP||{})});var vne=_($y=>{"use strict";Object.defineProperty($y,"__esModule",{value:!0});$y.splitWhen=$y.flatten=void 0;function LZe(t){return t.reduce((e,r)=>[].concat(e,r),[])}$y.flatten=LZe;function OZe(t,e){let r=[[]],o=0;for(let a of t)e(a)?(o++,r[o]=[]):r[o].push(a);return r}$y.splitWhen=OZe});var Dne=_(AP=>{"use strict";Object.defineProperty(AP,"__esModule",{value:!0});AP.isEnoentCodeError=void 0;function MZe(t){return t.code==="ENOENT"}AP.isEnoentCodeError=MZe});var Sne=_(fP=>{"use strict";Object.defineProperty(fP,"__esModule",{value:!0});fP.createDirentFromStats=void 0;var QL=class{constructor(e,r){this.name=e,this.isBlockDevice=r.isBlockDevice.bind(r),this.isCharacterDevice=r.isCharacterDevice.bind(r),this.isDirectory=r.isDirectory.bind(r),this.isFIFO=r.isFIFO.bind(r),this.isFile=r.isFile.bind(r),this.isSocket=r.isSocket.bind(r),this.isSymbolicLink=r.isSymbolicLink.bind(r)}};function UZe(t,e){return new QL(t,e)}fP.createDirentFromStats=UZe});var Pne=_(Xu=>{"use strict";Object.defineProperty(Xu,"__esModule",{value:!0});Xu.removeLeadingDotSegment=Xu.escape=Xu.makeAbsolute=Xu.unixify=void 0;var _Ze=ve("path"),HZe=2,jZe=/(\\?)([()*?[\]{|}]|^!|[!+@](?=\())/g;function GZe(t){return t.replace(/\\/g,"/")}Xu.unixify=GZe;function qZe(t,e){return _Ze.resolve(t,e)}Xu.makeAbsolute=qZe;function YZe(t){return t.replace(jZe,"\\$2")}Xu.escape=YZe;function WZe(t){if(t.charAt(0)==="."){let e=t.charAt(1);if(e==="/"||e==="\\")return t.slice(HZe)}return t}Xu.removeLeadingDotSegment=WZe});var xne=_((PTt,bne)=>{bne.exports=function(e){if(typeof e!="string"||e==="")return!1;for(var r;r=/(\\).|([@?!+*]\(.*\))/g.exec(e);){if(r[2])return!0;e=e.slice(r.index+r[0].length)}return!1}});var Fne=_((bTt,Qne)=>{var KZe=xne(),kne={"{":"}","(":")","[":"]"},VZe=function(t){if(t[0]==="!")return!0;for(var e=0,r=-2,o=-2,a=-2,n=-2,u=-2;e<t.length;){if(t[e]==="*"||t[e+1]==="?"&&/[\].+)]/.test(t[e])||o!==-1&&t[e]==="["&&t[e+1]!=="]"&&(o<e&&(o=t.indexOf("]",e)),o>e&&(u===-1||u>o||(u=t.indexOf("\\",e),u===-1||u>o)))||a!==-1&&t[e]==="{"&&t[e+1]!=="}"&&(a=t.indexOf("}",e),a>e&&(u=t.indexOf("\\",e),u===-1||u>a))||n!==-1&&t[e]==="("&&t[e+1]==="?"&&/[:!=]/.test(t[e+2])&&t[e+3]!==")"&&(n=t.indexOf(")",e),n>e&&(u=t.indexOf("\\",e),u===-1||u>n))||r!==-1&&t[e]==="("&&t[e+1]!=="|"&&(r<e&&(r=t.indexOf("|",e)),r!==-1&&t[r+1]!==")"&&(n=t.indexOf(")",r),n>r&&(u=t.indexOf("\\",r),u===-1||u>n))))return!0;if(t[e]==="\\"){var A=t[e+1];e+=2;var p=kne[A];if(p){var h=t.indexOf(p,e);h!==-1&&(e=h+1)}if(t[e]==="!")return!0}else e++}return!1},JZe=function(t){if(t[0]==="!")return!0;for(var e=0;e<t.length;){if(/[*?{}()[\]]/.test(t[e]))return!0;if(t[e]==="\\"){var r=t[e+1];e+=2;var o=kne[r];if(o){var a=t.indexOf(o,e);a!==-1&&(e=a+1)}if(t[e]==="!")return!0}else e++}return!1};Qne.exports=function(e,r){if(typeof e!="string"||e==="")return!1;if(KZe(e))return!0;var o=VZe;return r&&r.strict===!1&&(o=JZe),o(e)}});var Tne=_((xTt,Rne)=>{"use strict";var zZe=Fne(),XZe=ve("path").posix.dirname,ZZe=ve("os").platform()==="win32",FL="/",$Ze=/\\/g,e$e=/[\{\[].*[\}\]]$/,t$e=/(^|[^\\])([\{\[]|\([^\)]+$)/,r$e=/\\([\!\*\?\|\[\]\(\)\{\}])/g;Rne.exports=function(e,r){var o=Object.assign({flipBackslashes:!0},r);o.flipBackslashes&&ZZe&&e.indexOf(FL)<0&&(e=e.replace($Ze,FL)),e$e.test(e)&&(e+=FL),e+="a";do e=XZe(e);while(zZe(e)||t$e.test(e));return e.replace(r$e,"$1")}});var jne=_(Gr=>{"use strict";Object.defineProperty(Gr,"__esModule",{value:!0});Gr.matchAny=Gr.convertPatternsToRe=Gr.makeRe=Gr.getPatternParts=Gr.expandBraceExpansion=Gr.expandPatternsWithBraceExpansion=Gr.isAffectDepthOfReadingPattern=Gr.endsWithSlashGlobStar=Gr.hasGlobStar=Gr.getBaseDirectory=Gr.isPatternRelatedToParentDirectory=Gr.getPatternsOutsideCurrentDirectory=Gr.getPatternsInsideCurrentDirectory=Gr.getPositivePatterns=Gr.getNegativePatterns=Gr.isPositivePattern=Gr.isNegativePattern=Gr.convertToNegativePattern=Gr.convertToPositivePattern=Gr.isDynamicPattern=Gr.isStaticPattern=void 0;var n$e=ve("path"),i$e=Tne(),RL=Zo(),Nne="**",s$e="\\",o$e=/[*?]|^!/,a$e=/\[[^[]*]/,l$e=/(?:^|[^!*+?@])\([^(]*\|[^|]*\)/,c$e=/[!*+?@]\([^(]*\)/,u$e=/,|\.\./;function Lne(t,e={}){return!One(t,e)}Gr.isStaticPattern=Lne;function One(t,e={}){return t===""?!1:!!(e.caseSensitiveMatch===!1||t.includes(s$e)||o$e.test(t)||a$e.test(t)||l$e.test(t)||e.extglob!==!1&&c$e.test(t)||e.braceExpansion!==!1&&A$e(t))}Gr.isDynamicPattern=One;function A$e(t){let e=t.indexOf("{");if(e===-1)return!1;let r=t.indexOf("}",e+1);if(r===-1)return!1;let o=t.slice(e,r);return u$e.test(o)}function f$e(t){return pP(t)?t.slice(1):t}Gr.convertToPositivePattern=f$e;function p$e(t){return"!"+t}Gr.convertToNegativePattern=p$e;function pP(t){return t.startsWith("!")&&t[1]!=="("}Gr.isNegativePattern=pP;function Mne(t){return!pP(t)}Gr.isPositivePattern=Mne;function h$e(t){return t.filter(pP)}Gr.getNegativePatterns=h$e;function g$e(t){return t.filter(Mne)}Gr.getPositivePatterns=g$e;function d$e(t){return t.filter(e=>!TL(e))}Gr.getPatternsInsideCurrentDirectory=d$e;function m$e(t){return t.filter(TL)}Gr.getPatternsOutsideCurrentDirectory=m$e;function TL(t){return t.startsWith("..")||t.startsWith("./..")}Gr.isPatternRelatedToParentDirectory=TL;function y$e(t){return i$e(t,{flipBackslashes:!1})}Gr.getBaseDirectory=y$e;function E$e(t){return t.includes(Nne)}Gr.hasGlobStar=E$e;function Une(t){return t.endsWith("/"+Nne)}Gr.endsWithSlashGlobStar=Une;function C$e(t){let e=n$e.basename(t);return Une(t)||Lne(e)}Gr.isAffectDepthOfReadingPattern=C$e;function w$e(t){return t.reduce((e,r)=>e.concat(_ne(r)),[])}Gr.expandPatternsWithBraceExpansion=w$e;function _ne(t){return RL.braces(t,{expand:!0,nodupes:!0})}Gr.expandBraceExpansion=_ne;function I$e(t,e){let{parts:r}=RL.scan(t,Object.assign(Object.assign({},e),{parts:!0}));return r.length===0&&(r=[t]),r[0].startsWith("/")&&(r[0]=r[0].slice(1),r.unshift("")),r}Gr.getPatternParts=I$e;function Hne(t,e){return RL.makeRe(t,e)}Gr.makeRe=Hne;function B$e(t,e){return t.map(r=>Hne(r,e))}Gr.convertPatternsToRe=B$e;function v$e(t,e){return e.some(r=>r.test(t))}Gr.matchAny=v$e});var Wne=_((QTt,Yne)=>{"use strict";var D$e=ve("stream"),Gne=D$e.PassThrough,S$e=Array.prototype.slice;Yne.exports=P$e;function P$e(){let t=[],e=S$e.call(arguments),r=!1,o=e[e.length-1];o&&!Array.isArray(o)&&o.pipe==null?e.pop():o={};let a=o.end!==!1,n=o.pipeError===!0;o.objectMode==null&&(o.objectMode=!0),o.highWaterMark==null&&(o.highWaterMark=64*1024);let u=Gne(o);function A(){for(let E=0,I=arguments.length;E<I;E++)t.push(qne(arguments[E],o));return p(),this}function p(){if(r)return;r=!0;let E=t.shift();if(!E){process.nextTick(h);return}Array.isArray(E)||(E=[E]);let I=E.length+1;function v(){--I>0||(r=!1,p())}function x(C){function R(){C.removeListener("merge2UnpipeEnd",R),C.removeListener("end",R),n&&C.removeListener("error",L),v()}function L(U){u.emit("error",U)}if(C._readableState.endEmitted)return v();C.on("merge2UnpipeEnd",R),C.on("end",R),n&&C.on("error",L),C.pipe(u,{end:!1}),C.resume()}for(let C=0;C<E.length;C++)x(E[C]);v()}function h(){r=!1,u.emit("queueDrain"),a&&u.end()}return u.setMaxListeners(0),u.add=A,u.on("unpipe",function(E){E.emit("merge2UnpipeEnd")}),e.length&&A.apply(null,e),u}function qne(t,e){if(Array.isArray(t))for(let r=0,o=t.length;r<o;r++)t[r]=qne(t[r],e);else{if(!t._readableState&&t.pipe&&(t=t.pipe(Gne(e))),!t._readableState||!t.pause||!t.pipe)throw new Error("Only readable stream can be merged.");t.pause()}return t}});var Vne=_(hP=>{"use strict";Object.defineProperty(hP,"__esModule",{value:!0});hP.merge=void 0;var b$e=Wne();function x$e(t){let e=b$e(t);return t.forEach(r=>{r.once("error",o=>e.emit("error",o))}),e.once("close",()=>Kne(t)),e.once("end",()=>Kne(t)),e}hP.merge=x$e;function Kne(t){t.forEach(e=>e.emit("close"))}});var Jne=_(eE=>{"use strict";Object.defineProperty(eE,"__esModule",{value:!0});eE.isEmpty=eE.isString=void 0;function k$e(t){return typeof t=="string"}eE.isString=k$e;function Q$e(t){return t===""}eE.isEmpty=Q$e});var Sf=_(xo=>{"use strict";Object.defineProperty(xo,"__esModule",{value:!0});xo.string=xo.stream=xo.pattern=xo.path=xo.fs=xo.errno=xo.array=void 0;var F$e=vne();xo.array=F$e;var R$e=Dne();xo.errno=R$e;var T$e=Sne();xo.fs=T$e;var N$e=Pne();xo.path=N$e;var L$e=jne();xo.pattern=L$e;var O$e=Vne();xo.stream=O$e;var M$e=Jne();xo.string=M$e});var Zne=_(ko=>{"use strict";Object.defineProperty(ko,"__esModule",{value:!0});ko.convertPatternGroupToTask=ko.convertPatternGroupsToTasks=ko.groupPatternsByBaseDirectory=ko.getNegativePatternsAsPositive=ko.getPositivePatterns=ko.convertPatternsToTasks=ko.generate=void 0;var Pf=Sf();function U$e(t,e){let r=zne(t),o=Xne(t,e.ignore),a=r.filter(p=>Pf.pattern.isStaticPattern(p,e)),n=r.filter(p=>Pf.pattern.isDynamicPattern(p,e)),u=NL(a,o,!1),A=NL(n,o,!0);return u.concat(A)}ko.generate=U$e;function NL(t,e,r){let o=[],a=Pf.pattern.getPatternsOutsideCurrentDirectory(t),n=Pf.pattern.getPatternsInsideCurrentDirectory(t),u=LL(a),A=LL(n);return o.push(...OL(u,e,r)),"."in A?o.push(ML(".",n,e,r)):o.push(...OL(A,e,r)),o}ko.convertPatternsToTasks=NL;function zne(t){return Pf.pattern.getPositivePatterns(t)}ko.getPositivePatterns=zne;function Xne(t,e){return Pf.pattern.getNegativePatterns(t).concat(e).map(Pf.pattern.convertToPositivePattern)}ko.getNegativePatternsAsPositive=Xne;function LL(t){let e={};return t.reduce((r,o)=>{let a=Pf.pattern.getBaseDirectory(o);return a in r?r[a].push(o):r[a]=[o],r},e)}ko.groupPatternsByBaseDirectory=LL;function OL(t,e,r){return Object.keys(t).map(o=>ML(o,t[o],e,r))}ko.convertPatternGroupsToTasks=OL;function ML(t,e,r,o){return{dynamic:o,positive:e,negative:r,base:t,patterns:[].concat(e,r.map(Pf.pattern.convertToNegativePattern))}}ko.convertPatternGroupToTask=ML});var eie=_(tE=>{"use strict";Object.defineProperty(tE,"__esModule",{value:!0});tE.removeDuplicateSlashes=tE.transform=void 0;var _$e=/(?!^)\/{2,}/g;function H$e(t){return t.map(e=>$ne(e))}tE.transform=H$e;function $ne(t){return t.replace(_$e,"/")}tE.removeDuplicateSlashes=$ne});var rie=_(gP=>{"use strict";Object.defineProperty(gP,"__esModule",{value:!0});gP.read=void 0;function j$e(t,e,r){e.fs.lstat(t,(o,a)=>{if(o!==null){tie(r,o);return}if(!a.isSymbolicLink()||!e.followSymbolicLink){UL(r,a);return}e.fs.stat(t,(n,u)=>{if(n!==null){if(e.throwErrorOnBrokenSymbolicLink){tie(r,n);return}UL(r,a);return}e.markSymbolicLink&&(u.isSymbolicLink=()=>!0),UL(r,u)})})}gP.read=j$e;function tie(t,e){t(e)}function UL(t,e){t(null,e)}});var nie=_(dP=>{"use strict";Object.defineProperty(dP,"__esModule",{value:!0});dP.read=void 0;function G$e(t,e){let r=e.fs.lstatSync(t);if(!r.isSymbolicLink()||!e.followSymbolicLink)return r;try{let o=e.fs.statSync(t);return e.markSymbolicLink&&(o.isSymbolicLink=()=>!0),o}catch(o){if(!e.throwErrorOnBrokenSymbolicLink)return r;throw o}}dP.read=G$e});var iie=_(Xp=>{"use strict";Object.defineProperty(Xp,"__esModule",{value:!0});Xp.createFileSystemAdapter=Xp.FILE_SYSTEM_ADAPTER=void 0;var mP=ve("fs");Xp.FILE_SYSTEM_ADAPTER={lstat:mP.lstat,stat:mP.stat,lstatSync:mP.lstatSync,statSync:mP.statSync};function q$e(t){return t===void 0?Xp.FILE_SYSTEM_ADAPTER:Object.assign(Object.assign({},Xp.FILE_SYSTEM_ADAPTER),t)}Xp.createFileSystemAdapter=q$e});var sie=_(HL=>{"use strict";Object.defineProperty(HL,"__esModule",{value:!0});var Y$e=iie(),_L=class{constructor(e={}){this._options=e,this.followSymbolicLink=this._getValue(this._options.followSymbolicLink,!0),this.fs=Y$e.createFileSystemAdapter(this._options.fs),this.markSymbolicLink=this._getValue(this._options.markSymbolicLink,!1),this.throwErrorOnBrokenSymbolicLink=this._getValue(this._options.throwErrorOnBrokenSymbolicLink,!0)}_getValue(e,r){return e??r}};HL.default=_L});var Cd=_(Zp=>{"use strict";Object.defineProperty(Zp,"__esModule",{value:!0});Zp.statSync=Zp.stat=Zp.Settings=void 0;var oie=rie(),W$e=nie(),jL=sie();Zp.Settings=jL.default;function K$e(t,e,r){if(typeof e=="function"){oie.read(t,qL(),e);return}oie.read(t,qL(e),r)}Zp.stat=K$e;function V$e(t,e){let r=qL(e);return W$e.read(t,r)}Zp.statSync=V$e;function qL(t={}){return t instanceof jL.default?t:new jL.default(t)}});var lie=_((jTt,aie)=>{aie.exports=J$e;function J$e(t,e){var r,o,a,n=!0;Array.isArray(t)?(r=[],o=t.length):(a=Object.keys(t),r={},o=a.length);function u(p){function h(){e&&e(p,r),e=null}n?process.nextTick(h):h()}function A(p,h,E){r[p]=E,(--o===0||h)&&u(h)}o?a?a.forEach(function(p){t[p](function(h,E){A(p,h,E)})}):t.forEach(function(p,h){p(function(E,I){A(h,E,I)})}):u(null),n=!1}});var YL=_(EP=>{"use strict";Object.defineProperty(EP,"__esModule",{value:!0});EP.IS_SUPPORT_READDIR_WITH_FILE_TYPES=void 0;var yP=process.versions.node.split(".");if(yP[0]===void 0||yP[1]===void 0)throw new Error(`Unexpected behavior. The 'process.versions.node' variable has invalid value: ${process.versions.node}`);var cie=Number.parseInt(yP[0],10),z$e=Number.parseInt(yP[1],10),uie=10,X$e=10,Z$e=cie>uie,$$e=cie===uie&&z$e>=X$e;EP.IS_SUPPORT_READDIR_WITH_FILE_TYPES=Z$e||$$e});var Aie=_(CP=>{"use strict";Object.defineProperty(CP,"__esModule",{value:!0});CP.createDirentFromStats=void 0;var WL=class{constructor(e,r){this.name=e,this.isBlockDevice=r.isBlockDevice.bind(r),this.isCharacterDevice=r.isCharacterDevice.bind(r),this.isDirectory=r.isDirectory.bind(r),this.isFIFO=r.isFIFO.bind(r),this.isFile=r.isFile.bind(r),this.isSocket=r.isSocket.bind(r),this.isSymbolicLink=r.isSymbolicLink.bind(r)}};function eet(t,e){return new WL(t,e)}CP.createDirentFromStats=eet});var KL=_(wP=>{"use strict";Object.defineProperty(wP,"__esModule",{value:!0});wP.fs=void 0;var tet=Aie();wP.fs=tet});var VL=_(IP=>{"use strict";Object.defineProperty(IP,"__esModule",{value:!0});IP.joinPathSegments=void 0;function ret(t,e,r){return t.endsWith(r)?t+e:t+r+e}IP.joinPathSegments=ret});var mie=_($p=>{"use strict";Object.defineProperty($p,"__esModule",{value:!0});$p.readdir=$p.readdirWithFileTypes=$p.read=void 0;var net=Cd(),fie=lie(),iet=YL(),pie=KL(),hie=VL();function set(t,e,r){if(!e.stats&&iet.IS_SUPPORT_READDIR_WITH_FILE_TYPES){gie(t,e,r);return}die(t,e,r)}$p.read=set;function gie(t,e,r){e.fs.readdir(t,{withFileTypes:!0},(o,a)=>{if(o!==null){BP(r,o);return}let n=a.map(A=>({dirent:A,name:A.name,path:hie.joinPathSegments(t,A.name,e.pathSegmentSeparator)}));if(!e.followSymbolicLinks){JL(r,n);return}let u=n.map(A=>oet(A,e));fie(u,(A,p)=>{if(A!==null){BP(r,A);return}JL(r,p)})})}$p.readdirWithFileTypes=gie;function oet(t,e){return r=>{if(!t.dirent.isSymbolicLink()){r(null,t);return}e.fs.stat(t.path,(o,a)=>{if(o!==null){if(e.throwErrorOnBrokenSymbolicLink){r(o);return}r(null,t);return}t.dirent=pie.fs.createDirentFromStats(t.name,a),r(null,t)})}}function die(t,e,r){e.fs.readdir(t,(o,a)=>{if(o!==null){BP(r,o);return}let n=a.map(u=>{let A=hie.joinPathSegments(t,u,e.pathSegmentSeparator);return p=>{net.stat(A,e.fsStatSettings,(h,E)=>{if(h!==null){p(h);return}let I={name:u,path:A,dirent:pie.fs.createDirentFromStats(u,E)};e.stats&&(I.stats=E),p(null,I)})}});fie(n,(u,A)=>{if(u!==null){BP(r,u);return}JL(r,A)})})}$p.readdir=die;function BP(t,e){t(e)}function JL(t,e){t(null,e)}});var Iie=_(eh=>{"use strict";Object.defineProperty(eh,"__esModule",{value:!0});eh.readdir=eh.readdirWithFileTypes=eh.read=void 0;var aet=Cd(),cet=YL(),yie=KL(),Eie=VL();function uet(t,e){return!e.stats&&cet.IS_SUPPORT_READDIR_WITH_FILE_TYPES?Cie(t,e):wie(t,e)}eh.read=uet;function Cie(t,e){return e.fs.readdirSync(t,{withFileTypes:!0}).map(o=>{let a={dirent:o,name:o.name,path:Eie.joinPathSegments(t,o.name,e.pathSegmentSeparator)};if(a.dirent.isSymbolicLink()&&e.followSymbolicLinks)try{let n=e.fs.statSync(a.path);a.dirent=yie.fs.createDirentFromStats(a.name,n)}catch(n){if(e.throwErrorOnBrokenSymbolicLink)throw n}return a})}eh.readdirWithFileTypes=Cie;function wie(t,e){return e.fs.readdirSync(t).map(o=>{let a=Eie.joinPathSegments(t,o,e.pathSegmentSeparator),n=aet.statSync(a,e.fsStatSettings),u={name:o,path:a,dirent:yie.fs.createDirentFromStats(o,n)};return e.stats&&(u.stats=n),u})}eh.readdir=wie});var Bie=_(th=>{"use strict";Object.defineProperty(th,"__esModule",{value:!0});th.createFileSystemAdapter=th.FILE_SYSTEM_ADAPTER=void 0;var rE=ve("fs");th.FILE_SYSTEM_ADAPTER={lstat:rE.lstat,stat:rE.stat,lstatSync:rE.lstatSync,statSync:rE.statSync,readdir:rE.readdir,readdirSync:rE.readdirSync};function Aet(t){return t===void 0?th.FILE_SYSTEM_ADAPTER:Object.assign(Object.assign({},th.FILE_SYSTEM_ADAPTER),t)}th.createFileSystemAdapter=Aet});var vie=_(XL=>{"use strict";Object.defineProperty(XL,"__esModule",{value:!0});var fet=ve("path"),pet=Cd(),het=Bie(),zL=class{constructor(e={}){this._options=e,this.followSymbolicLinks=this._getValue(this._options.followSymbolicLinks,!1),this.fs=het.createFileSystemAdapter(this._options.fs),this.pathSegmentSeparator=this._getValue(this._options.pathSegmentSeparator,fet.sep),this.stats=this._getValue(this._options.stats,!1),this.throwErrorOnBrokenSymbolicLink=this._getValue(this._options.throwErrorOnBrokenSymbolicLink,!0),this.fsStatSettings=new pet.Settings({followSymbolicLink:this.followSymbolicLinks,fs:this.fs,throwErrorOnBrokenSymbolicLink:this.throwErrorOnBrokenSymbolicLink})}_getValue(e,r){return e??r}};XL.default=zL});var vP=_(rh=>{"use strict";Object.defineProperty(rh,"__esModule",{value:!0});rh.Settings=rh.scandirSync=rh.scandir=void 0;var Die=mie(),get=Iie(),ZL=vie();rh.Settings=ZL.default;function det(t,e,r){if(typeof e=="function"){Die.read(t,$L(),e);return}Die.read(t,$L(e),r)}rh.scandir=det;function met(t,e){let r=$L(e);return get.read(t,r)}rh.scandirSync=met;function $L(t={}){return t instanceof ZL.default?t:new ZL.default(t)}});var Pie=_((ZTt,Sie)=>{"use strict";function yet(t){var e=new t,r=e;function o(){var n=e;return n.next?e=n.next:(e=new t,r=e),n.next=null,n}function a(n){r.next=n,r=n}return{get:o,release:a}}Sie.exports=yet});var xie=_(($Tt,eO)=>{"use strict";var Eet=Pie();function bie(t,e,r){if(typeof t=="function"&&(r=e,e=t,t=null),r<1)throw new Error("fastqueue concurrency must be greater than 1");var o=Eet(Cet),a=null,n=null,u=0,A=null,p={push:R,drain:ql,saturated:ql,pause:E,paused:!1,concurrency:r,running:h,resume:x,idle:C,length:I,getQueue:v,unshift:L,empty:ql,kill:J,killAndDrain:te,error:ae};return p;function h(){return u}function E(){p.paused=!0}function I(){for(var fe=a,ce=0;fe;)fe=fe.next,ce++;return ce}function v(){for(var fe=a,ce=[];fe;)ce.push(fe.value),fe=fe.next;return ce}function x(){if(!!p.paused){p.paused=!1;for(var fe=0;fe<p.concurrency;fe++)u++,U()}}function C(){return u===0&&p.length()===0}function R(fe,ce){var me=o.get();me.context=t,me.release=U,me.value=fe,me.callback=ce||ql,me.errorHandler=A,u===p.concurrency||p.paused?n?(n.next=me,n=me):(a=me,n=me,p.saturated()):(u++,e.call(t,me.value,me.worked))}function L(fe,ce){var me=o.get();me.context=t,me.release=U,me.value=fe,me.callback=ce||ql,u===p.concurrency||p.paused?a?(me.next=a,a=me):(a=me,n=me,p.saturated()):(u++,e.call(t,me.value,me.worked))}function U(fe){fe&&o.release(fe);var ce=a;ce?p.paused?u--:(n===a&&(n=null),a=ce.next,ce.next=null,e.call(t,ce.value,ce.worked),n===null&&p.empty()):--u===0&&p.drain()}function J(){a=null,n=null,p.drain=ql}function te(){a=null,n=null,p.drain(),p.drain=ql}function ae(fe){A=fe}}function ql(){}function Cet(){this.value=null,this.callback=ql,this.next=null,this.release=ql,this.context=null,this.errorHandler=null;var t=this;this.worked=function(r,o){var a=t.callback,n=t.errorHandler,u=t.value;t.value=null,t.callback=ql,t.errorHandler&&n(r,u),a.call(t.context,r,o),t.release(t)}}function wet(t,e,r){typeof t=="function"&&(r=e,e=t,t=null);function o(E,I){e.call(this,E).then(function(v){I(null,v)},I)}var a=bie(t,o,r),n=a.push,u=a.unshift;return a.push=A,a.unshift=p,a.drained=h,a;function A(E){var I=new Promise(function(v,x){n(E,function(C,R){if(C){x(C);return}v(R)})});return I.catch(ql),I}function p(E){var I=new Promise(function(v,x){u(E,function(C,R){if(C){x(C);return}v(R)})});return I.catch(ql),I}function h(){var E=a.drain,I=new Promise(function(v){a.drain=function(){E(),v()}});return I}}eO.exports=bie;eO.exports.promise=wet});var DP=_(Zu=>{"use strict";Object.defineProperty(Zu,"__esModule",{value:!0});Zu.joinPathSegments=Zu.replacePathSegmentSeparator=Zu.isAppliedFilter=Zu.isFatalError=void 0;function Iet(t,e){return t.errorFilter===null?!0:!t.errorFilter(e)}Zu.isFatalError=Iet;function Bet(t,e){return t===null||t(e)}Zu.isAppliedFilter=Bet;function vet(t,e){return t.split(/[/\\]/).join(e)}Zu.replacePathSegmentSeparator=vet;function Det(t,e,r){return t===""?e:t.endsWith(r)?t+e:t+r+e}Zu.joinPathSegments=Det});var nO=_(rO=>{"use strict";Object.defineProperty(rO,"__esModule",{value:!0});var Pet=DP(),tO=class{constructor(e,r){this._root=e,this._settings=r,this._root=Pet.replacePathSegmentSeparator(e,r.pathSegmentSeparator)}};rO.default=tO});var oO=_(sO=>{"use strict";Object.defineProperty(sO,"__esModule",{value:!0});var bet=ve("events"),xet=vP(),ket=xie(),SP=DP(),Qet=nO(),iO=class extends Qet.default{constructor(e,r){super(e,r),this._settings=r,this._scandir=xet.scandir,this._emitter=new bet.EventEmitter,this._queue=ket(this._worker.bind(this),this._settings.concurrency),this._isFatalError=!1,this._isDestroyed=!1,this._queue.drain=()=>{this._isFatalError||this._emitter.emit("end")}}read(){return this._isFatalError=!1,this._isDestroyed=!1,setImmediate(()=>{this._pushToQueue(this._root,this._settings.basePath)}),this._emitter}get isDestroyed(){return this._isDestroyed}destroy(){if(this._isDestroyed)throw new Error("The reader is already destroyed");this._isDestroyed=!0,this._queue.killAndDrain()}onEntry(e){this._emitter.on("entry",e)}onError(e){this._emitter.once("error",e)}onEnd(e){this._emitter.once("end",e)}_pushToQueue(e,r){let o={directory:e,base:r};this._queue.push(o,a=>{a!==null&&this._handleError(a)})}_worker(e,r){this._scandir(e.directory,this._settings.fsScandirSettings,(o,a)=>{if(o!==null){r(o,void 0);return}for(let n of a)this._handleEntry(n,e.base);r(null,void 0)})}_handleError(e){this._isDestroyed||!SP.isFatalError(this._settings,e)||(this._isFatalError=!0,this._isDestroyed=!0,this._emitter.emit("error",e))}_handleEntry(e,r){if(this._isDestroyed||this._isFatalError)return;let o=e.path;r!==void 0&&(e.path=SP.joinPathSegments(r,e.name,this._settings.pathSegmentSeparator)),SP.isAppliedFilter(this._settings.entryFilter,e)&&this._emitEntry(e),e.dirent.isDirectory()&&SP.isAppliedFilter(this._settings.deepFilter,e)&&this._pushToQueue(o,r===void 0?void 0:e.path)}_emitEntry(e){this._emitter.emit("entry",e)}};sO.default=iO});var kie=_(lO=>{"use strict";Object.defineProperty(lO,"__esModule",{value:!0});var Fet=oO(),aO=class{constructor(e,r){this._root=e,this._settings=r,this._reader=new Fet.default(this._root,this._settings),this._storage=[]}read(e){this._reader.onError(r=>{Ret(e,r)}),this._reader.onEntry(r=>{this._storage.push(r)}),this._reader.onEnd(()=>{Tet(e,this._storage)}),this._reader.read()}};lO.default=aO;function Ret(t,e){t(e)}function Tet(t,e){t(null,e)}});var Qie=_(uO=>{"use strict";Object.defineProperty(uO,"__esModule",{value:!0});var Net=ve("stream"),Let=oO(),cO=class{constructor(e,r){this._root=e,this._settings=r,this._reader=new Let.default(this._root,this._settings),this._stream=new Net.Readable({objectMode:!0,read:()=>{},destroy:()=>{this._reader.isDestroyed||this._reader.destroy()}})}read(){return this._reader.onError(e=>{this._stream.emit("error",e)}),this._reader.onEntry(e=>{this._stream.push(e)}),this._reader.onEnd(()=>{this._stream.push(null)}),this._reader.read(),this._stream}};uO.default=cO});var Fie=_(fO=>{"use strict";Object.defineProperty(fO,"__esModule",{value:!0});var Oet=vP(),PP=DP(),Met=nO(),AO=class extends Met.default{constructor(){super(...arguments),this._scandir=Oet.scandirSync,this._storage=[],this._queue=new Set}read(){return this._pushToQueue(this._root,this._settings.basePath),this._handleQueue(),this._storage}_pushToQueue(e,r){this._queue.add({directory:e,base:r})}_handleQueue(){for(let e of this._queue.values())this._handleDirectory(e.directory,e.base)}_handleDirectory(e,r){try{let o=this._scandir(e,this._settings.fsScandirSettings);for(let a of o)this._handleEntry(a,r)}catch(o){this._handleError(o)}}_handleError(e){if(!!PP.isFatalError(this._settings,e))throw e}_handleEntry(e,r){let o=e.path;r!==void 0&&(e.path=PP.joinPathSegments(r,e.name,this._settings.pathSegmentSeparator)),PP.isAppliedFilter(this._settings.entryFilter,e)&&this._pushToStorage(e),e.dirent.isDirectory()&&PP.isAppliedFilter(this._settings.deepFilter,e)&&this._pushToQueue(o,r===void 0?void 0:e.path)}_pushToStorage(e){this._storage.push(e)}};fO.default=AO});var Rie=_(hO=>{"use strict";Object.defineProperty(hO,"__esModule",{value:!0});var Uet=Fie(),pO=class{constructor(e,r){this._root=e,this._settings=r,this._reader=new Uet.default(this._root,this._settings)}read(){return this._reader.read()}};hO.default=pO});var Tie=_(dO=>{"use strict";Object.defineProperty(dO,"__esModule",{value:!0});var _et=ve("path"),Het=vP(),gO=class{constructor(e={}){this._options=e,this.basePath=this._getValue(this._options.basePath,void 0),this.concurrency=this._getValue(this._options.concurrency,Number.POSITIVE_INFINITY),this.deepFilter=this._getValue(this._options.deepFilter,null),this.entryFilter=this._getValue(this._options.entryFilter,null),this.errorFilter=this._getValue(this._options.errorFilter,null),this.pathSegmentSeparator=this._getValue(this._options.pathSegmentSeparator,_et.sep),this.fsScandirSettings=new Het.Settings({followSymbolicLinks:this._options.followSymbolicLinks,fs:this._options.fs,pathSegmentSeparator:this._options.pathSegmentSeparator,stats:this._options.stats,throwErrorOnBrokenSymbolicLink:this._options.throwErrorOnBrokenSymbolicLink})}_getValue(e,r){return e??r}};dO.default=gO});var xP=_($u=>{"use strict";Object.defineProperty($u,"__esModule",{value:!0});$u.Settings=$u.walkStream=$u.walkSync=$u.walk=void 0;var Nie=kie(),jet=Qie(),Get=Rie(),mO=Tie();$u.Settings=mO.default;function qet(t,e,r){if(typeof e=="function"){new Nie.default(t,bP()).read(e);return}new Nie.default(t,bP(e)).read(r)}$u.walk=qet;function Yet(t,e){let r=bP(e);return new Get.default(t,r).read()}$u.walkSync=Yet;function Wet(t,e){let r=bP(e);return new jet.default(t,r).read()}$u.walkStream=Wet;function bP(t={}){return t instanceof mO.default?t:new mO.default(t)}});var kP=_(EO=>{"use strict";Object.defineProperty(EO,"__esModule",{value:!0});var Ket=ve("path"),Vet=Cd(),Lie=Sf(),yO=class{constructor(e){this._settings=e,this._fsStatSettings=new Vet.Settings({followSymbolicLink:this._settings.followSymbolicLinks,fs:this._settings.fs,throwErrorOnBrokenSymbolicLink:this._settings.followSymbolicLinks})}_getFullEntryPath(e){return Ket.resolve(this._settings.cwd,e)}_makeEntry(e,r){let o={name:r,path:r,dirent:Lie.fs.createDirentFromStats(r,e)};return this._settings.stats&&(o.stats=e),o}_isFatalError(e){return!Lie.errno.isEnoentCodeError(e)&&!this._settings.suppressErrors}};EO.default=yO});var IO=_(wO=>{"use strict";Object.defineProperty(wO,"__esModule",{value:!0});var Jet=ve("stream"),zet=Cd(),Xet=xP(),Zet=kP(),CO=class extends Zet.default{constructor(){super(...arguments),this._walkStream=Xet.walkStream,this._stat=zet.stat}dynamic(e,r){return this._walkStream(e,r)}static(e,r){let o=e.map(this._getFullEntryPath,this),a=new Jet.PassThrough({objectMode:!0});a._write=(n,u,A)=>this._getEntry(o[n],e[n],r).then(p=>{p!==null&&r.entryFilter(p)&&a.push(p),n===o.length-1&&a.end(),A()}).catch(A);for(let n=0;n<o.length;n++)a.write(n);return a}_getEntry(e,r,o){return this._getStat(e).then(a=>this._makeEntry(a,r)).catch(a=>{if(o.errorFilter(a))return null;throw a})}_getStat(e){return new Promise((r,o)=>{this._stat(e,this._fsStatSettings,(a,n)=>a===null?r(n):o(a))})}};wO.default=CO});var Oie=_(vO=>{"use strict";Object.defineProperty(vO,"__esModule",{value:!0});var $et=xP(),ett=kP(),ttt=IO(),BO=class extends ett.default{constructor(){super(...arguments),this._walkAsync=$et.walk,this._readerStream=new ttt.default(this._settings)}dynamic(e,r){return new Promise((o,a)=>{this._walkAsync(e,r,(n,u)=>{n===null?o(u):a(n)})})}async static(e,r){let o=[],a=this._readerStream.static(e,r);return new Promise((n,u)=>{a.once("error",u),a.on("data",A=>o.push(A)),a.once("end",()=>n(o))})}};vO.default=BO});var Mie=_(SO=>{"use strict";Object.defineProperty(SO,"__esModule",{value:!0});var nE=Sf(),DO=class{constructor(e,r,o){this._patterns=e,this._settings=r,this._micromatchOptions=o,this._storage=[],this._fillStorage()}_fillStorage(){let e=nE.pattern.expandPatternsWithBraceExpansion(this._patterns);for(let r of e){let o=this._getPatternSegments(r),a=this._splitSegmentsIntoSections(o);this._storage.push({complete:a.length<=1,pattern:r,segments:o,sections:a})}}_getPatternSegments(e){return nE.pattern.getPatternParts(e,this._micromatchOptions).map(o=>nE.pattern.isDynamicPattern(o,this._settings)?{dynamic:!0,pattern:o,patternRe:nE.pattern.makeRe(o,this._micromatchOptions)}:{dynamic:!1,pattern:o})}_splitSegmentsIntoSections(e){return nE.array.splitWhen(e,r=>r.dynamic&&nE.pattern.hasGlobStar(r.pattern))}};SO.default=DO});var Uie=_(bO=>{"use strict";Object.defineProperty(bO,"__esModule",{value:!0});var rtt=Mie(),PO=class extends rtt.default{match(e){let r=e.split("/"),o=r.length,a=this._storage.filter(n=>!n.complete||n.segments.length>o);for(let n of a){let u=n.sections[0];if(!n.complete&&o>u.length||r.every((p,h)=>{let E=n.segments[h];return!!(E.dynamic&&E.patternRe.test(p)||!E.dynamic&&E.pattern===p)}))return!0}return!1}};bO.default=PO});var _ie=_(kO=>{"use strict";Object.defineProperty(kO,"__esModule",{value:!0});var QP=Sf(),ntt=Uie(),xO=class{constructor(e,r){this._settings=e,this._micromatchOptions=r}getFilter(e,r,o){let a=this._getMatcher(r),n=this._getNegativePatternsRe(o);return u=>this._filter(e,u,a,n)}_getMatcher(e){return new ntt.default(e,this._settings,this._micromatchOptions)}_getNegativePatternsRe(e){let r=e.filter(QP.pattern.isAffectDepthOfReadingPattern);return QP.pattern.convertPatternsToRe(r,this._micromatchOptions)}_filter(e,r,o,a){if(this._isSkippedByDeep(e,r.path)||this._isSkippedSymbolicLink(r))return!1;let n=QP.path.removeLeadingDotSegment(r.path);return this._isSkippedByPositivePatterns(n,o)?!1:this._isSkippedByNegativePatterns(n,a)}_isSkippedByDeep(e,r){return this._settings.deep===1/0?!1:this._getEntryLevel(e,r)>=this._settings.deep}_getEntryLevel(e,r){let o=r.split("/").length;if(e==="")return o;let a=e.split("/").length;return o-a}_isSkippedSymbolicLink(e){return!this._settings.followSymbolicLinks&&e.dirent.isSymbolicLink()}_isSkippedByPositivePatterns(e,r){return!this._settings.baseNameMatch&&!r.match(e)}_isSkippedByNegativePatterns(e,r){return!QP.pattern.matchAny(e,r)}};kO.default=xO});var Hie=_(FO=>{"use strict";Object.defineProperty(FO,"__esModule",{value:!0});var wd=Sf(),QO=class{constructor(e,r){this._settings=e,this._micromatchOptions=r,this.index=new Map}getFilter(e,r){let o=wd.pattern.convertPatternsToRe(e,this._micromatchOptions),a=wd.pattern.convertPatternsToRe(r,this._micromatchOptions);return n=>this._filter(n,o,a)}_filter(e,r,o){if(this._settings.unique&&this._isDuplicateEntry(e)||this._onlyFileFilter(e)||this._onlyDirectoryFilter(e)||this._isSkippedByAbsoluteNegativePatterns(e.path,o))return!1;let a=this._settings.baseNameMatch?e.name:e.path,n=e.dirent.isDirectory(),u=this._isMatchToPatterns(a,r,n)&&!this._isMatchToPatterns(e.path,o,n);return this._settings.unique&&u&&this._createIndexRecord(e),u}_isDuplicateEntry(e){return this.index.has(e.path)}_createIndexRecord(e){this.index.set(e.path,void 0)}_onlyFileFilter(e){return this._settings.onlyFiles&&!e.dirent.isFile()}_onlyDirectoryFilter(e){return this._settings.onlyDirectories&&!e.dirent.isDirectory()}_isSkippedByAbsoluteNegativePatterns(e,r){if(!this._settings.absolute)return!1;let o=wd.path.makeAbsolute(this._settings.cwd,e);return wd.pattern.matchAny(o,r)}_isMatchToPatterns(e,r,o){let a=wd.path.removeLeadingDotSegment(e),n=wd.pattern.matchAny(a,r);return!n&&o?wd.pattern.matchAny(a+"/",r):n}};FO.default=QO});var jie=_(TO=>{"use strict";Object.defineProperty(TO,"__esModule",{value:!0});var itt=Sf(),RO=class{constructor(e){this._settings=e}getFilter(){return e=>this._isNonFatalError(e)}_isNonFatalError(e){return itt.errno.isEnoentCodeError(e)||this._settings.suppressErrors}};TO.default=RO});var qie=_(LO=>{"use strict";Object.defineProperty(LO,"__esModule",{value:!0});var Gie=Sf(),NO=class{constructor(e){this._settings=e}getTransformer(){return e=>this._transform(e)}_transform(e){let r=e.path;return this._settings.absolute&&(r=Gie.path.makeAbsolute(this._settings.cwd,r),r=Gie.path.unixify(r)),this._settings.markDirectories&&e.dirent.isDirectory()&&(r+="/"),this._settings.objectMode?Object.assign(Object.assign({},e),{path:r}):r}};LO.default=NO});var FP=_(MO=>{"use strict";Object.defineProperty(MO,"__esModule",{value:!0});var stt=ve("path"),ott=_ie(),att=Hie(),ltt=jie(),ctt=qie(),OO=class{constructor(e){this._settings=e,this.errorFilter=new ltt.default(this._settings),this.entryFilter=new att.default(this._settings,this._getMicromatchOptions()),this.deepFilter=new ott.default(this._settings,this._getMicromatchOptions()),this.entryTransformer=new ctt.default(this._settings)}_getRootDirectory(e){return stt.resolve(this._settings.cwd,e.base)}_getReaderOptions(e){let r=e.base==="."?"":e.base;return{basePath:r,pathSegmentSeparator:"/",concurrency:this._settings.concurrency,deepFilter:this.deepFilter.getFilter(r,e.positive,e.negative),entryFilter:this.entryFilter.getFilter(e.positive,e.negative),errorFilter:this.errorFilter.getFilter(),followSymbolicLinks:this._settings.followSymbolicLinks,fs:this._settings.fs,stats:this._settings.stats,throwErrorOnBrokenSymbolicLink:this._settings.throwErrorOnBrokenSymbolicLink,transform:this.entryTransformer.getTransformer()}}_getMicromatchOptions(){return{dot:this._settings.dot,matchBase:this._settings.baseNameMatch,nobrace:!this._settings.braceExpansion,nocase:!this._settings.caseSensitiveMatch,noext:!this._settings.extglob,noglobstar:!this._settings.globstar,posix:!0,strictSlashes:!1}}};MO.default=OO});var Yie=_(_O=>{"use strict";Object.defineProperty(_O,"__esModule",{value:!0});var utt=Oie(),Att=FP(),UO=class extends Att.default{constructor(){super(...arguments),this._reader=new utt.default(this._settings)}async read(e){let r=this._getRootDirectory(e),o=this._getReaderOptions(e);return(await this.api(r,e,o)).map(n=>o.transform(n))}api(e,r,o){return r.dynamic?this._reader.dynamic(e,o):this._reader.static(r.patterns,o)}};_O.default=UO});var Wie=_(jO=>{"use strict";Object.defineProperty(jO,"__esModule",{value:!0});var ftt=ve("stream"),ptt=IO(),htt=FP(),HO=class extends htt.default{constructor(){super(...arguments),this._reader=new ptt.default(this._settings)}read(e){let r=this._getRootDirectory(e),o=this._getReaderOptions(e),a=this.api(r,e,o),n=new ftt.Readable({objectMode:!0,read:()=>{}});return a.once("error",u=>n.emit("error",u)).on("data",u=>n.emit("data",o.transform(u))).once("end",()=>n.emit("end")),n.once("close",()=>a.destroy()),n}api(e,r,o){return r.dynamic?this._reader.dynamic(e,o):this._reader.static(r.patterns,o)}};jO.default=HO});var Kie=_(qO=>{"use strict";Object.defineProperty(qO,"__esModule",{value:!0});var gtt=Cd(),dtt=xP(),mtt=kP(),GO=class extends mtt.default{constructor(){super(...arguments),this._walkSync=dtt.walkSync,this._statSync=gtt.statSync}dynamic(e,r){return this._walkSync(e,r)}static(e,r){let o=[];for(let a of e){let n=this._getFullEntryPath(a),u=this._getEntry(n,a,r);u===null||!r.entryFilter(u)||o.push(u)}return o}_getEntry(e,r,o){try{let a=this._getStat(e);return this._makeEntry(a,r)}catch(a){if(o.errorFilter(a))return null;throw a}}_getStat(e){return this._statSync(e,this._fsStatSettings)}};qO.default=GO});var Vie=_(WO=>{"use strict";Object.defineProperty(WO,"__esModule",{value:!0});var ytt=Kie(),Ett=FP(),YO=class extends Ett.default{constructor(){super(...arguments),this._reader=new ytt.default(this._settings)}read(e){let r=this._getRootDirectory(e),o=this._getReaderOptions(e);return this.api(r,e,o).map(o.transform)}api(e,r,o){return r.dynamic?this._reader.dynamic(e,o):this._reader.static(r.patterns,o)}};WO.default=YO});var Jie=_(sE=>{"use strict";Object.defineProperty(sE,"__esModule",{value:!0});sE.DEFAULT_FILE_SYSTEM_ADAPTER=void 0;var iE=ve("fs"),Ctt=ve("os"),wtt=Math.max(Ctt.cpus().length,1);sE.DEFAULT_FILE_SYSTEM_ADAPTER={lstat:iE.lstat,lstatSync:iE.lstatSync,stat:iE.stat,statSync:iE.statSync,readdir:iE.readdir,readdirSync:iE.readdirSync};var KO=class{constructor(e={}){this._options=e,this.absolute=this._getValue(this._options.absolute,!1),this.baseNameMatch=this._getValue(this._options.baseNameMatch,!1),this.braceExpansion=this._getValue(this._options.braceExpansion,!0),this.caseSensitiveMatch=this._getValue(this._options.caseSensitiveMatch,!0),this.concurrency=this._getValue(this._options.concurrency,wtt),this.cwd=this._getValue(this._options.cwd,process.cwd()),this.deep=this._getValue(this._options.deep,1/0),this.dot=this._getValue(this._options.dot,!1),this.extglob=this._getValue(this._options.extglob,!0),this.followSymbolicLinks=this._getValue(this._options.followSymbolicLinks,!0),this.fs=this._getFileSystemMethods(this._options.fs),this.globstar=this._getValue(this._options.globstar,!0),this.ignore=this._getValue(this._options.ignore,[]),this.markDirectories=this._getValue(this._options.markDirectories,!1),this.objectMode=this._getValue(this._options.objectMode,!1),this.onlyDirectories=this._getValue(this._options.onlyDirectories,!1),this.onlyFiles=this._getValue(this._options.onlyFiles,!0),this.stats=this._getValue(this._options.stats,!1),this.suppressErrors=this._getValue(this._options.suppressErrors,!1),this.throwErrorOnBrokenSymbolicLink=this._getValue(this._options.throwErrorOnBrokenSymbolicLink,!1),this.unique=this._getValue(this._options.unique,!0),this.onlyDirectories&&(this.onlyFiles=!1),this.stats&&(this.objectMode=!0)}_getValue(e,r){return e===void 0?r:e}_getFileSystemMethods(e={}){return Object.assign(Object.assign({},sE.DEFAULT_FILE_SYSTEM_ADAPTER),e)}};sE.default=KO});var RP=_((vNt,Zie)=>{"use strict";var zie=Zne(),Xie=eie(),Itt=Yie(),Btt=Wie(),vtt=Vie(),VO=Jie(),Id=Sf();async function JO(t,e){oE(t);let r=zO(t,Itt.default,e),o=await Promise.all(r);return Id.array.flatten(o)}(function(t){function e(u,A){oE(u);let p=zO(u,vtt.default,A);return Id.array.flatten(p)}t.sync=e;function r(u,A){oE(u);let p=zO(u,Btt.default,A);return Id.stream.merge(p)}t.stream=r;function o(u,A){oE(u);let p=Xie.transform([].concat(u)),h=new VO.default(A);return zie.generate(p,h)}t.generateTasks=o;function a(u,A){oE(u);let p=new VO.default(A);return Id.pattern.isDynamicPattern(u,p)}t.isDynamicPattern=a;function n(u){return oE(u),Id.path.escape(u)}t.escapePath=n})(JO||(JO={}));function zO(t,e,r){let o=Xie.transform([].concat(t)),a=new VO.default(r),n=zie.generate(o,a),u=new e(a);return n.map(u.read,u)}function oE(t){if(![].concat(t).every(o=>Id.string.isString(o)&&!Id.string.isEmpty(o)))throw new TypeError("Patterns must be a string (non empty) or an array of strings")}Zie.exports=JO});var wn={};Vt(wn,{checksumFile:()=>NP,checksumPattern:()=>LP,makeHash:()=>zs});function zs(...t){let e=(0,TP.createHash)("sha512"),r="";for(let o of t)typeof o=="string"?r+=o:o&&(r&&(e.update(r),r=""),e.update(o));return r&&e.update(r),e.digest("hex")}async function NP(t,{baseFs:e,algorithm:r}={baseFs:oe,algorithm:"sha512"}){let o=await e.openPromise(t,"r");try{let n=Buffer.allocUnsafeSlow(65536),u=(0,TP.createHash)(r),A=0;for(;(A=await e.readPromise(o,n,0,65536))!==0;)u.update(A===65536?n:n.slice(0,A));return u.digest("hex")}finally{await e.closePromise(o)}}async function LP(t,{cwd:e}){let o=(await(0,XO.default)(t,{cwd:ue.fromPortablePath(e),onlyDirectories:!0})).map(A=>`${A}/**/*`),a=await(0,XO.default)([t,...o],{cwd:ue.fromPortablePath(e),onlyFiles:!1});a.sort();let n=await Promise.all(a.map(async A=>{let p=[Buffer.from(A)],h=ue.toPortablePath(A),E=await oe.lstatPromise(h);return E.isSymbolicLink()?p.push(Buffer.from(await oe.readlinkPromise(h))):E.isFile()&&p.push(await oe.readFilePromise(h)),p.join("\0")})),u=(0,TP.createHash)("sha512");for(let A of n)u.update(A);return u.digest("hex")}var TP,XO,nh=Et(()=>{St();TP=ve("crypto"),XO=$e(RP())});var W={};Vt(W,{areDescriptorsEqual:()=>nse,areIdentsEqual:()=>n1,areLocatorsEqual:()=>i1,areVirtualPackagesEquivalent:()=>Rtt,bindDescriptor:()=>Qtt,bindLocator:()=>Ftt,convertDescriptorToLocator:()=>OP,convertLocatorToDescriptor:()=>$O,convertPackageToLocator:()=>btt,convertToIdent:()=>Ptt,convertToManifestRange:()=>Gtt,copyPackage:()=>e1,devirtualizeDescriptor:()=>t1,devirtualizeLocator:()=>r1,ensureDevirtualizedDescriptor:()=>xtt,ensureDevirtualizedLocator:()=>ktt,getIdentVendorPath:()=>nM,isPackageCompatible:()=>jP,isVirtualDescriptor:()=>bf,isVirtualLocator:()=>Hc,makeDescriptor:()=>In,makeIdent:()=>eA,makeLocator:()=>Qs,makeRange:()=>_P,parseDescriptor:()=>ih,parseFileStyleRange:()=>Htt,parseIdent:()=>Js,parseLocator:()=>xf,parseRange:()=>Bd,prettyDependent:()=>kL,prettyDescriptor:()=>Gn,prettyIdent:()=>cs,prettyLocator:()=>jr,prettyLocatorNoColors:()=>xL,prettyRange:()=>cE,prettyReference:()=>o1,prettyResolution:()=>ZI,prettyWorkspace:()=>a1,renamePackage:()=>eM,slugifyIdent:()=>ZO,slugifyLocator:()=>lE,sortDescriptors:()=>uE,stringifyDescriptor:()=>Pa,stringifyIdent:()=>fn,stringifyLocator:()=>ba,tryParseDescriptor:()=>s1,tryParseIdent:()=>ise,tryParseLocator:()=>UP,tryParseRange:()=>_tt,virtualizeDescriptor:()=>tM,virtualizePackage:()=>rM});function eA(t,e){if(t?.startsWith("@"))throw new Error("Invalid scope: don't prefix it with '@'");return{identHash:zs(t,e),scope:t,name:e}}function In(t,e){return{identHash:t.identHash,scope:t.scope,name:t.name,descriptorHash:zs(t.identHash,e),range:e}}function Qs(t,e){return{identHash:t.identHash,scope:t.scope,name:t.name,locatorHash:zs(t.identHash,e),reference:e}}function Ptt(t){return{identHash:t.identHash,scope:t.scope,name:t.name}}function OP(t){return{identHash:t.identHash,scope:t.scope,name:t.name,locatorHash:t.descriptorHash,reference:t.range}}function $O(t){return{identHash:t.identHash,scope:t.scope,name:t.name,descriptorHash:t.locatorHash,range:t.reference}}function btt(t){return{identHash:t.identHash,scope:t.scope,name:t.name,locatorHash:t.locatorHash,reference:t.reference}}function eM(t,e){return{identHash:e.identHash,scope:e.scope,name:e.name,locatorHash:e.locatorHash,reference:e.reference,version:t.version,languageName:t.languageName,linkType:t.linkType,conditions:t.conditions,dependencies:new Map(t.dependencies),peerDependencies:new Map(t.peerDependencies),dependenciesMeta:new Map(t.dependenciesMeta),peerDependenciesMeta:new Map(t.peerDependenciesMeta),bin:new Map(t.bin)}}function e1(t){return eM(t,t)}function tM(t,e){if(e.includes("#"))throw new Error("Invalid entropy");return In(t,`virtual:${e}#${t.range}`)}function rM(t,e){if(e.includes("#"))throw new Error("Invalid entropy");return eM(t,Qs(t,`virtual:${e}#${t.reference}`))}function bf(t){return t.range.startsWith($I)}function Hc(t){return t.reference.startsWith($I)}function t1(t){if(!bf(t))throw new Error("Not a virtual descriptor");return In(t,t.range.replace(MP,""))}function r1(t){if(!Hc(t))throw new Error("Not a virtual descriptor");return Qs(t,t.reference.replace(MP,""))}function xtt(t){return bf(t)?In(t,t.range.replace(MP,"")):t}function ktt(t){return Hc(t)?Qs(t,t.reference.replace(MP,"")):t}function Qtt(t,e){return t.range.includes("::")?t:In(t,`${t.range}::${aE.default.stringify(e)}`)}function Ftt(t,e){return t.reference.includes("::")?t:Qs(t,`${t.reference}::${aE.default.stringify(e)}`)}function n1(t,e){return t.identHash===e.identHash}function nse(t,e){return t.descriptorHash===e.descriptorHash}function i1(t,e){return t.locatorHash===e.locatorHash}function Rtt(t,e){if(!Hc(t))throw new Error("Invalid package type");if(!Hc(e))throw new Error("Invalid package type");if(!n1(t,e)||t.dependencies.size!==e.dependencies.size)return!1;for(let r of t.dependencies.values()){let o=e.dependencies.get(r.identHash);if(!o||!nse(r,o))return!1}return!0}function Js(t){let e=ise(t);if(!e)throw new Error(`Invalid ident (${t})`);return e}function ise(t){let e=t.match(Ttt);if(!e)return null;let[,r,o]=e;return eA(typeof r<"u"?r:null,o)}function ih(t,e=!1){let r=s1(t,e);if(!r)throw new Error(`Invalid descriptor (${t})`);return r}function s1(t,e=!1){let r=e?t.match(Ntt):t.match(Ltt);if(!r)return null;let[,o,a,n]=r;if(n==="unknown")throw new Error(`Invalid range (${t})`);let u=typeof o<"u"?o:null,A=typeof n<"u"?n:"unknown";return In(eA(u,a),A)}function xf(t,e=!1){let r=UP(t,e);if(!r)throw new Error(`Invalid locator (${t})`);return r}function UP(t,e=!1){let r=e?t.match(Ott):t.match(Mtt);if(!r)return null;let[,o,a,n]=r;if(n==="unknown")throw new Error(`Invalid reference (${t})`);let u=typeof o<"u"?o:null,A=typeof n<"u"?n:"unknown";return Qs(eA(u,a),A)}function Bd(t,e){let r=t.match(Utt);if(r===null)throw new Error(`Invalid range (${t})`);let o=typeof r[1]<"u"?r[1]:null;if(typeof e?.requireProtocol=="string"&&o!==e.requireProtocol)throw new Error(`Invalid protocol (${o})`);if(e?.requireProtocol&&o===null)throw new Error(`Missing protocol (${o})`);let a=typeof r[3]<"u"?decodeURIComponent(r[2]):null;if(e?.requireSource&&a===null)throw new Error(`Missing source (${t})`);let n=typeof r[3]<"u"?decodeURIComponent(r[3]):decodeURIComponent(r[2]),u=e?.parseSelector?aE.default.parse(n):n,A=typeof r[4]<"u"?aE.default.parse(r[4]):null;return{protocol:o,source:a,selector:u,params:A}}function _tt(t,e){try{return Bd(t,e)}catch{return null}}function Htt(t,{protocol:e}){let{selector:r,params:o}=Bd(t,{requireProtocol:e,requireBindings:!0});if(typeof o.locator!="string")throw new Error(`Assertion failed: Invalid bindings for ${t}`);return{parentLocator:xf(o.locator,!0),path:r}}function $ie(t){return t=t.replaceAll("%","%25"),t=t.replaceAll(":","%3A"),t=t.replaceAll("#","%23"),t}function jtt(t){return t===null?!1:Object.entries(t).length>0}function _P({protocol:t,source:e,selector:r,params:o}){let a="";return t!==null&&(a+=`${t}`),e!==null&&(a+=`${$ie(e)}#`),a+=$ie(r),jtt(o)&&(a+=`::${aE.default.stringify(o)}`),a}function Gtt(t){let{params:e,protocol:r,source:o,selector:a}=Bd(t);for(let n in e)n.startsWith("__")&&delete e[n];return _P({protocol:r,source:o,params:e,selector:a})}function fn(t){return t.scope?`@${t.scope}/${t.name}`:`${t.name}`}function Pa(t){return t.scope?`@${t.scope}/${t.name}@${t.range}`:`${t.name}@${t.range}`}function ba(t){return t.scope?`@${t.scope}/${t.name}@${t.reference}`:`${t.name}@${t.reference}`}function ZO(t){return t.scope!==null?`@${t.scope}-${t.name}`:t.name}function lE(t){let{protocol:e,selector:r}=Bd(t.reference),o=e!==null?e.replace(qtt,""):"exotic",a=ese.default.valid(r),n=a!==null?`${o}-${a}`:`${o}`,u=10;return t.scope?`${ZO(t)}-${n}-${t.locatorHash.slice(0,u)}`:`${ZO(t)}-${n}-${t.locatorHash.slice(0,u)}`}function cs(t,e){return e.scope?`${Mt(t,`@${e.scope}/`,yt.SCOPE)}${Mt(t,e.name,yt.NAME)}`:`${Mt(t,e.name,yt.NAME)}`}function HP(t){if(t.startsWith($I)){let e=HP(t.substring(t.indexOf("#")+1)),r=t.substring($I.length,$I.length+Dtt);return`${e} [${r}]`}else return t.replace(Ytt,"?[...]")}function cE(t,e){return`${Mt(t,HP(e),yt.RANGE)}`}function Gn(t,e){return`${cs(t,e)}${Mt(t,"@",yt.RANGE)}${cE(t,e.range)}`}function o1(t,e){return`${Mt(t,HP(e),yt.REFERENCE)}`}function jr(t,e){return`${cs(t,e)}${Mt(t,"@",yt.REFERENCE)}${o1(t,e.reference)}`}function xL(t){return`${fn(t)}@${HP(t.reference)}`}function uE(t){return ks(t,[e=>fn(e),e=>e.range])}function a1(t,e){return cs(t,e.anchoredLocator)}function ZI(t,e,r){let o=bf(e)?t1(e):e;return r===null?`${Gn(t,o)} \u2192 ${bL(t).Cross}`:o.identHash===r.identHash?`${Gn(t,o)} \u2192 ${o1(t,r.reference)}`:`${Gn(t,o)} \u2192 ${jr(t,r)}`}function kL(t,e,r){return r===null?`${jr(t,e)}`:`${jr(t,e)} (via ${cE(t,r.range)})`}function nM(t){return`node_modules/${fn(t)}`}function jP(t,e){return t.conditions?Stt(t.conditions,r=>{let[,o,a]=r.match(rse),n=e[o];return n?n.includes(a):!0}):!0}var aE,ese,tse,$I,Dtt,rse,Stt,MP,Ttt,Ntt,Ltt,Ott,Mtt,Utt,qtt,Ytt,bo=Et(()=>{aE=$e(ve("querystring")),ese=$e(zn()),tse=$e(eX());Gl();nh();jl();bo();$I="virtual:",Dtt=5,rse=/(os|cpu|libc)=([a-z0-9_-]+)/,Stt=(0,tse.makeParser)(rse);MP=/^[^#]*#/;Ttt=/^(?:@([^/]+?)\/)?([^@/]+)$/;Ntt=/^(?:@([^/]+?)\/)?([^@/]+?)(?:@(.+))$/,Ltt=/^(?:@([^/]+?)\/)?([^@/]+?)(?:@(.+))?$/;Ott=/^(?:@([^/]+?)\/)?([^@/]+?)(?:@(.+))$/,Mtt=/^(?:@([^/]+?)\/)?([^@/]+?)(?:@(.+))?$/;Utt=/^([^#:]*:)?((?:(?!::)[^#])*)(?:#((?:(?!::).)*))?(?:::(.*))?$/;qtt=/:$/;Ytt=/\?.*/});var sse,ose=Et(()=>{bo();sse={hooks:{reduceDependency:(t,e,r,o,{resolver:a,resolveOptions:n})=>{for(let{pattern:u,reference:A}of e.topLevelWorkspace.manifest.resolutions){if(u.from&&(u.from.fullName!==fn(r)||e.configuration.normalizeLocator(Qs(Js(u.from.fullName),u.from.description??r.reference)).locatorHash!==r.locatorHash)||u.descriptor.fullName!==fn(t)||e.configuration.normalizeDependency(In(xf(u.descriptor.fullName),u.descriptor.description??t.range)).descriptorHash!==t.descriptorHash)continue;return a.bindDescriptor(e.configuration.normalizeDependency(In(t,A)),e.topLevelWorkspace.anchoredLocator,n)}return t},validateProject:async(t,e)=>{for(let r of t.workspaces){let o=a1(t.configuration,r);await t.configuration.triggerHook(a=>a.validateWorkspace,r,{reportWarning:(a,n)=>e.reportWarning(a,`${o}: ${n}`),reportError:(a,n)=>e.reportError(a,`${o}: ${n}`)})}},validateWorkspace:async(t,e)=>{let{manifest:r}=t;r.resolutions.length&&t.cwd!==t.project.cwd&&r.errors.push(new Error("Resolutions field will be ignored"));for(let o of r.errors)e.reportWarning(57,o.message)}}}});var l1,Xn,vd=Et(()=>{l1=class{supportsDescriptor(e,r){return!!(e.range.startsWith(l1.protocol)||r.project.tryWorkspaceByDescriptor(e)!==null)}supportsLocator(e,r){return!!e.reference.startsWith(l1.protocol)}shouldPersistResolution(e,r){return!1}bindDescriptor(e,r,o){return e}getResolutionDependencies(e,r){return{}}async getCandidates(e,r,o){return[o.project.getWorkspaceByDescriptor(e).anchoredLocator]}async getSatisfying(e,r,o,a){let[n]=await this.getCandidates(e,r,a);return{locators:o.filter(u=>u.locatorHash===n.locatorHash),sorted:!1}}async resolve(e,r){let o=r.project.getWorkspaceByCwd(e.reference.slice(l1.protocol.length));return{...e,version:o.manifest.version||"0.0.0",languageName:"unknown",linkType:"SOFT",conditions:null,dependencies:r.project.configuration.normalizeDependencyMap(new Map([...o.manifest.dependencies,...o.manifest.devDependencies])),peerDependencies:new Map([...o.manifest.peerDependencies]),dependenciesMeta:o.manifest.dependenciesMeta,peerDependenciesMeta:o.manifest.peerDependenciesMeta,bin:o.manifest.bin}}},Xn=l1;Xn.protocol="workspace:"});var kr={};Vt(kr,{SemVer:()=>Ase.SemVer,clean:()=>Ktt,getComparator:()=>cse,mergeComparators:()=>iM,satisfiesWithPrereleases:()=>kf,simplifyRanges:()=>sM,stringifyComparator:()=>use,validRange:()=>xa});function kf(t,e,r=!1){if(!t)return!1;let o=`${e}${r}`,a=ase.get(o);if(typeof a>"u")try{a=new sh.default.Range(e,{includePrerelease:!0,loose:r})}catch{return!1}finally{ase.set(o,a||null)}else if(a===null)return!1;let n;try{n=new sh.default.SemVer(t,a)}catch{return!1}return a.test(n)?!0:(n.prerelease&&(n.prerelease=[]),a.set.some(u=>{for(let A of u)A.semver.prerelease&&(A.semver.prerelease=[]);return u.every(A=>A.test(n))}))}function xa(t){if(t.indexOf(":")!==-1)return null;let e=lse.get(t);if(typeof e<"u")return e;try{e=new sh.default.Range(t)}catch{e=null}return lse.set(t,e),e}function Ktt(t){let e=Wtt.exec(t);return e?e[1]:null}function cse(t){if(t.semver===sh.default.Comparator.ANY)return{gt:null,lt:null};switch(t.operator){case"":return{gt:[">=",t.semver],lt:["<=",t.semver]};case">":case">=":return{gt:[t.operator,t.semver],lt:null};case"<":case"<=":return{gt:null,lt:[t.operator,t.semver]};default:throw new Error(`Assertion failed: Unexpected comparator operator (${t.operator})`)}}function iM(t){if(t.length===0)return null;let e=null,r=null;for(let o of t){if(o.gt){let a=e!==null?sh.default.compare(o.gt[1],e[1]):null;(a===null||a>0||a===0&&o.gt[0]===">")&&(e=o.gt)}if(o.lt){let a=r!==null?sh.default.compare(o.lt[1],r[1]):null;(a===null||a<0||a===0&&o.lt[0]==="<")&&(r=o.lt)}}if(e&&r){let o=sh.default.compare(e[1],r[1]);if(o===0&&(e[0]===">"||r[0]==="<")||o>0)return null}return{gt:e,lt:r}}function use(t){if(t.gt&&t.lt){if(t.gt[0]===">="&&t.lt[0]==="<="&&t.gt[1].version===t.lt[1].version)return t.gt[1].version;if(t.gt[0]===">="&&t.lt[0]==="<"){if(t.lt[1].version===`${t.gt[1].major+1}.0.0-0`)return`^${t.gt[1].version}`;if(t.lt[1].version===`${t.gt[1].major}.${t.gt[1].minor+1}.0-0`)return`~${t.gt[1].version}`}}let e=[];return t.gt&&e.push(t.gt[0]+t.gt[1].version),t.lt&&e.push(t.lt[0]+t.lt[1].version),e.length?e.join(" "):"*"}function sM(t){let e=t.map(o=>xa(o).set.map(a=>a.map(n=>cse(n)))),r=e.shift().map(o=>iM(o)).filter(o=>o!==null);for(let o of e){let a=[];for(let n of r)for(let u of o){let A=iM([n,...u]);A!==null&&a.push(A)}r=a}return r.length===0?null:r.map(o=>use(o)).join(" || ")}var sh,Ase,ase,lse,Wtt,Qf=Et(()=>{sh=$e(zn()),Ase=$e(zn()),ase=new Map;lse=new Map;Wtt=/^(?:[\sv=]*?)((0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\s*)$/});function fse(t){let e=t.match(/^[ \t]+/m);return e?e[0]:"  "}function pse(t){return t.charCodeAt(0)===65279?t.slice(1):t}function $o(t){return t.replace(/\\/g,"/")}function GP(t,{yamlCompatibilityMode:e}){return e?CL(t):typeof t>"u"||typeof t=="boolean"?t:null}function hse(t,e){let r=e.search(/[^!]/);if(r===-1)return"invalid";let o=r%2===0?"":"!",a=e.slice(r);return`${o}${t}=${a}`}function oM(t,e){return e.length===1?hse(t,e[0]):`(${e.map(r=>hse(t,r)).join(" | ")})`}var gse,AE,Ot,fE=Et(()=>{St();Nl();gse=$e(zn());vd();jl();Qf();bo();AE=class{constructor(){this.indent="  ";this.name=null;this.version=null;this.os=null;this.cpu=null;this.libc=null;this.type=null;this.packageManager=null;this.private=!1;this.license=null;this.main=null;this.module=null;this.browser=null;this.languageName=null;this.bin=new Map;this.scripts=new Map;this.dependencies=new Map;this.devDependencies=new Map;this.peerDependencies=new Map;this.workspaceDefinitions=[];this.dependenciesMeta=new Map;this.peerDependenciesMeta=new Map;this.resolutions=[];this.files=null;this.publishConfig=null;this.installConfig=null;this.preferUnplugged=null;this.raw={};this.errors=[]}static async tryFind(e,{baseFs:r=new Tn}={}){let o=V.join(e,"package.json");try{return await AE.fromFile(o,{baseFs:r})}catch(a){if(a.code==="ENOENT")return null;throw a}}static async find(e,{baseFs:r}={}){let o=await AE.tryFind(e,{baseFs:r});if(o===null)throw new Error("Manifest not found");return o}static async fromFile(e,{baseFs:r=new Tn}={}){let o=new AE;return await o.loadFile(e,{baseFs:r}),o}static fromText(e){let r=new AE;return r.loadFromText(e),r}loadFromText(e){let r;try{r=JSON.parse(pse(e)||"{}")}catch(o){throw o.message+=` (when parsing ${e})`,o}this.load(r),this.indent=fse(e)}async loadFile(e,{baseFs:r=new Tn}){let o=await r.readFilePromise(e,"utf8"),a;try{a=JSON.parse(pse(o)||"{}")}catch(n){throw n.message+=` (when parsing ${e})`,n}this.load(a),this.indent=fse(o)}load(e,{yamlCompatibilityMode:r=!1}={}){if(typeof e!="object"||e===null)throw new Error(`Utterly invalid manifest data (${e})`);this.raw=e;let o=[];if(this.name=null,typeof e.name=="string")try{this.name=Js(e.name)}catch{o.push(new Error("Parsing failed for the 'name' field"))}if(typeof e.version=="string"?this.version=e.version:this.version=null,Array.isArray(e.os)){let n=[];this.os=n;for(let u of e.os)typeof u!="string"?o.push(new Error("Parsing failed for the 'os' field")):n.push(u)}else this.os=null;if(Array.isArray(e.cpu)){let n=[];this.cpu=n;for(let u of e.cpu)typeof u!="string"?o.push(new Error("Parsing failed for the 'cpu' field")):n.push(u)}else this.cpu=null;if(Array.isArray(e.libc)){let n=[];this.libc=n;for(let u of e.libc)typeof u!="string"?o.push(new Error("Parsing failed for the 'libc' field")):n.push(u)}else this.libc=null;if(typeof e.type=="string"?this.type=e.type:this.type=null,typeof e.packageManager=="string"?this.packageManager=e.packageManager:this.packageManager=null,typeof e.private=="boolean"?this.private=e.private:this.private=!1,typeof e.license=="string"?this.license=e.license:this.license=null,typeof e.languageName=="string"?this.languageName=e.languageName:this.languageName=null,typeof e.main=="string"?this.main=$o(e.main):this.main=null,typeof e.module=="string"?this.module=$o(e.module):this.module=null,e.browser!=null)if(typeof e.browser=="string")this.browser=$o(e.browser);else{this.browser=new Map;for(let[n,u]of Object.entries(e.browser))this.browser.set($o(n),typeof u=="string"?$o(u):u)}else this.browser=null;if(this.bin=new Map,typeof e.bin=="string")e.bin.trim()===""?o.push(new Error("Invalid bin field")):this.name!==null?this.bin.set(this.name.name,$o(e.bin)):o.push(new Error("String bin field, but no attached package name"));else if(typeof e.bin=="object"&&e.bin!==null)for(let[n,u]of Object.entries(e.bin)){if(typeof u!="string"||u.trim()===""){o.push(new Error(`Invalid bin definition for '${n}'`));continue}let A=Js(n);this.bin.set(A.name,$o(u))}if(this.scripts=new Map,typeof e.scripts=="object"&&e.scripts!==null)for(let[n,u]of Object.entries(e.scripts)){if(typeof u!="string"){o.push(new Error(`Invalid script definition for '${n}'`));continue}this.scripts.set(n,u)}if(this.dependencies=new Map,typeof e.dependencies=="object"&&e.dependencies!==null)for(let[n,u]of Object.entries(e.dependencies)){if(typeof u!="string"){o.push(new Error(`Invalid dependency range for '${n}'`));continue}let A;try{A=Js(n)}catch{o.push(new Error(`Parsing failed for the dependency name '${n}'`));continue}let p=In(A,u);this.dependencies.set(p.identHash,p)}if(this.devDependencies=new Map,typeof e.devDependencies=="object"&&e.devDependencies!==null)for(let[n,u]of Object.entries(e.devDependencies)){if(typeof u!="string"){o.push(new Error(`Invalid dependency range for '${n}'`));continue}let A;try{A=Js(n)}catch{o.push(new Error(`Parsing failed for the dependency name '${n}'`));continue}let p=In(A,u);this.devDependencies.set(p.identHash,p)}if(this.peerDependencies=new Map,typeof e.peerDependencies=="object"&&e.peerDependencies!==null)for(let[n,u]of Object.entries(e.peerDependencies)){let A;try{A=Js(n)}catch{o.push(new Error(`Parsing failed for the dependency name '${n}'`));continue}(typeof u!="string"||!u.startsWith(Xn.protocol)&&!xa(u))&&(o.push(new Error(`Invalid dependency range for '${n}'`)),u="*");let p=In(A,u);this.peerDependencies.set(p.identHash,p)}typeof e.workspaces=="object"&&e.workspaces!==null&&e.workspaces.nohoist&&o.push(new Error("'nohoist' is deprecated, please use 'installConfig.hoistingLimits' instead"));let a=Array.isArray(e.workspaces)?e.workspaces:typeof e.workspaces=="object"&&e.workspaces!==null&&Array.isArray(e.workspaces.packages)?e.workspaces.packages:[];this.workspaceDefinitions=[];for(let n of a){if(typeof n!="string"){o.push(new Error(`Invalid workspace definition for '${n}'`));continue}this.workspaceDefinitions.push({pattern:n})}if(this.dependenciesMeta=new Map,typeof e.dependenciesMeta=="object"&&e.dependenciesMeta!==null)for(let[n,u]of Object.entries(e.dependenciesMeta)){if(typeof u!="object"||u===null){o.push(new Error(`Invalid meta field for '${n}`));continue}let A=ih(n),p=this.ensureDependencyMeta(A),h=GP(u.built,{yamlCompatibilityMode:r});if(h===null){o.push(new Error(`Invalid built meta field for '${n}'`));continue}let E=GP(u.optional,{yamlCompatibilityMode:r});if(E===null){o.push(new Error(`Invalid optional meta field for '${n}'`));continue}let I=GP(u.unplugged,{yamlCompatibilityMode:r});if(I===null){o.push(new Error(`Invalid unplugged meta field for '${n}'`));continue}Object.assign(p,{built:h,optional:E,unplugged:I})}if(this.peerDependenciesMeta=new Map,typeof e.peerDependenciesMeta=="object"&&e.peerDependenciesMeta!==null)for(let[n,u]of Object.entries(e.peerDependenciesMeta)){if(typeof u!="object"||u===null){o.push(new Error(`Invalid meta field for '${n}'`));continue}let A=ih(n),p=this.ensurePeerDependencyMeta(A),h=GP(u.optional,{yamlCompatibilityMode:r});if(h===null){o.push(new Error(`Invalid optional meta field for '${n}'`));continue}Object.assign(p,{optional:h})}if(this.resolutions=[],typeof e.resolutions=="object"&&e.resolutions!==null)for(let[n,u]of Object.entries(e.resolutions)){if(typeof u!="string"){o.push(new Error(`Invalid resolution entry for '${n}'`));continue}try{this.resolutions.push({pattern:MD(n),reference:u})}catch(A){o.push(A);continue}}if(Array.isArray(e.files)){this.files=new Set;for(let n of e.files){if(typeof n!="string"){o.push(new Error(`Invalid files entry for '${n}'`));continue}this.files.add(n)}}else this.files=null;if(typeof e.publishConfig=="object"&&e.publishConfig!==null){if(this.publishConfig={},typeof e.publishConfig.access=="string"&&(this.publishConfig.access=e.publishConfig.access),typeof e.publishConfig.main=="string"&&(this.publishConfig.main=$o(e.publishConfig.main)),typeof e.publishConfig.module=="string"&&(this.publishConfig.module=$o(e.publishConfig.module)),e.publishConfig.browser!=null)if(typeof e.publishConfig.browser=="string")this.publishConfig.browser=$o(e.publishConfig.browser);else{this.publishConfig.browser=new Map;for(let[n,u]of Object.entries(e.publishConfig.browser))this.publishConfig.browser.set($o(n),typeof u=="string"?$o(u):u)}if(typeof e.publishConfig.registry=="string"&&(this.publishConfig.registry=e.publishConfig.registry),typeof e.publishConfig.bin=="string")this.name!==null?this.publishConfig.bin=new Map([[this.name.name,$o(e.publishConfig.bin)]]):o.push(new Error("String bin field, but no attached package name"));else if(typeof e.publishConfig.bin=="object"&&e.publishConfig.bin!==null){this.publishConfig.bin=new Map;for(let[n,u]of Object.entries(e.publishConfig.bin)){if(typeof u!="string"){o.push(new Error(`Invalid bin definition for '${n}'`));continue}this.publishConfig.bin.set(n,$o(u))}}if(Array.isArray(e.publishConfig.executableFiles)){this.publishConfig.executableFiles=new Set;for(let n of e.publishConfig.executableFiles){if(typeof n!="string"){o.push(new Error("Invalid executable file definition"));continue}this.publishConfig.executableFiles.add($o(n))}}}else this.publishConfig=null;if(typeof e.installConfig=="object"&&e.installConfig!==null){this.installConfig={};for(let n of Object.keys(e.installConfig))n==="hoistingLimits"?typeof e.installConfig.hoistingLimits=="string"?this.installConfig.hoistingLimits=e.installConfig.hoistingLimits:o.push(new Error("Invalid hoisting limits definition")):n=="selfReferences"?typeof e.installConfig.selfReferences=="boolean"?this.installConfig.selfReferences=e.installConfig.selfReferences:o.push(new Error("Invalid selfReferences definition, must be a boolean value")):o.push(new Error(`Unrecognized installConfig key: ${n}`))}else this.installConfig=null;if(typeof e.optionalDependencies=="object"&&e.optionalDependencies!==null)for(let[n,u]of Object.entries(e.optionalDependencies)){if(typeof u!="string"){o.push(new Error(`Invalid dependency range for '${n}'`));continue}let A;try{A=Js(n)}catch{o.push(new Error(`Parsing failed for the dependency name '${n}'`));continue}let p=In(A,u);this.dependencies.set(p.identHash,p);let h=In(A,"unknown"),E=this.ensureDependencyMeta(h);Object.assign(E,{optional:!0})}typeof e.preferUnplugged=="boolean"?this.preferUnplugged=e.preferUnplugged:this.preferUnplugged=null,this.errors=o}getForScope(e){switch(e){case"dependencies":return this.dependencies;case"devDependencies":return this.devDependencies;case"peerDependencies":return this.peerDependencies;default:throw new Error(`Unsupported value ("${e}")`)}}hasConsumerDependency(e){return!!(this.dependencies.has(e.identHash)||this.peerDependencies.has(e.identHash))}hasHardDependency(e){return!!(this.dependencies.has(e.identHash)||this.devDependencies.has(e.identHash))}hasSoftDependency(e){return!!this.peerDependencies.has(e.identHash)}hasDependency(e){return!!(this.hasHardDependency(e)||this.hasSoftDependency(e))}getConditions(){let e=[];return this.os&&this.os.length>0&&e.push(oM("os",this.os)),this.cpu&&this.cpu.length>0&&e.push(oM("cpu",this.cpu)),this.libc&&this.libc.length>0&&e.push(oM("libc",this.libc)),e.length>0?e.join(" & "):null}ensureDependencyMeta(e){if(e.range!=="unknown"&&!gse.default.valid(e.range))throw new Error(`Invalid meta field range for '${Pa(e)}'`);let r=fn(e),o=e.range!=="unknown"?e.range:null,a=this.dependenciesMeta.get(r);a||this.dependenciesMeta.set(r,a=new Map);let n=a.get(o);return n||a.set(o,n={}),n}ensurePeerDependencyMeta(e){if(e.range!=="unknown")throw new Error(`Invalid meta field range for '${Pa(e)}'`);let r=fn(e),o=this.peerDependenciesMeta.get(r);return o||this.peerDependenciesMeta.set(r,o={}),o}setRawField(e,r,{after:o=[]}={}){let a=new Set(o.filter(n=>Object.hasOwn(this.raw,n)));if(a.size===0||Object.hasOwn(this.raw,e))this.raw[e]=r;else{let n=this.raw,u=this.raw={},A=!1;for(let p of Object.keys(n))u[p]=n[p],A||(a.delete(p),a.size===0&&(u[e]=r,A=!0))}}exportTo(e,{compatibilityMode:r=!0}={}){if(Object.assign(e,this.raw),this.name!==null?e.name=fn(this.name):delete e.name,this.version!==null?e.version=this.version:delete e.version,this.os!==null?e.os=this.os:delete e.os,this.cpu!==null?e.cpu=this.cpu:delete e.cpu,this.type!==null?e.type=this.type:delete e.type,this.packageManager!==null?e.packageManager=this.packageManager:delete e.packageManager,this.private?e.private=!0:delete e.private,this.license!==null?e.license=this.license:delete e.license,this.languageName!==null?e.languageName=this.languageName:delete e.languageName,this.main!==null?e.main=this.main:delete e.main,this.module!==null?e.module=this.module:delete e.module,this.browser!==null){let n=this.browser;typeof n=="string"?e.browser=n:n instanceof Map&&(e.browser=Object.assign({},...Array.from(n.keys()).sort().map(u=>({[u]:n.get(u)}))))}else delete e.browser;this.bin.size===1&&this.name!==null&&this.bin.has(this.name.name)?e.bin=this.bin.get(this.name.name):this.bin.size>0?e.bin=Object.assign({},...Array.from(this.bin.keys()).sort().map(n=>({[n]:this.bin.get(n)}))):delete e.bin,this.workspaceDefinitions.length>0?this.raw.workspaces&&!Array.isArray(this.raw.workspaces)?e.workspaces={...this.raw.workspaces,packages:this.workspaceDefinitions.map(({pattern:n})=>n)}:e.workspaces=this.workspaceDefinitions.map(({pattern:n})=>n):this.raw.workspaces&&!Array.isArray(this.raw.workspaces)&&Object.keys(this.raw.workspaces).length>0?e.workspaces=this.raw.workspaces:delete e.workspaces;let o=[],a=[];for(let n of this.dependencies.values()){let u=this.dependenciesMeta.get(fn(n)),A=!1;if(r&&u){let p=u.get(null);p&&p.optional&&(A=!0)}A?a.push(n):o.push(n)}o.length>0?e.dependencies=Object.assign({},...uE(o).map(n=>({[fn(n)]:n.range}))):delete e.dependencies,a.length>0?e.optionalDependencies=Object.assign({},...uE(a).map(n=>({[fn(n)]:n.range}))):delete e.optionalDependencies,this.devDependencies.size>0?e.devDependencies=Object.assign({},...uE(this.devDependencies.values()).map(n=>({[fn(n)]:n.range}))):delete e.devDependencies,this.peerDependencies.size>0?e.peerDependencies=Object.assign({},...uE(this.peerDependencies.values()).map(n=>({[fn(n)]:n.range}))):delete e.peerDependencies,e.dependenciesMeta={};for(let[n,u]of ks(this.dependenciesMeta.entries(),([A,p])=>A))for(let[A,p]of ks(u.entries(),([h,E])=>h!==null?`0${h}`:"1")){let h=A!==null?Pa(In(Js(n),A)):n,E={...p};r&&A===null&&delete E.optional,Object.keys(E).length!==0&&(e.dependenciesMeta[h]=E)}if(Object.keys(e.dependenciesMeta).length===0&&delete e.dependenciesMeta,this.peerDependenciesMeta.size>0?e.peerDependenciesMeta=Object.assign({},...ks(this.peerDependenciesMeta.entries(),([n,u])=>n).map(([n,u])=>({[n]:u}))):delete e.peerDependenciesMeta,this.resolutions.length>0?e.resolutions=Object.assign({},...this.resolutions.map(({pattern:n,reference:u})=>({[UD(n)]:u}))):delete e.resolutions,this.files!==null?e.files=Array.from(this.files):delete e.files,this.preferUnplugged!==null?e.preferUnplugged=this.preferUnplugged:delete e.preferUnplugged,this.scripts!==null&&this.scripts.size>0){e.scripts??={};for(let n of Object.keys(e.scripts))this.scripts.has(n)||delete e.scripts[n];for(let[n,u]of this.scripts.entries())e.scripts[n]=u}else delete e.scripts;return e}},Ot=AE;Ot.fileName="package.json",Ot.allDependencies=["dependencies","devDependencies","peerDependencies"],Ot.hardDependencies=["dependencies","devDependencies"]});var mse=_((UNt,dse)=>{var Vtt=_l(),Jtt=function(){return Vtt.Date.now()};dse.exports=Jtt});var Ese=_((_Nt,yse)=>{var ztt=/\s/;function Xtt(t){for(var e=t.length;e--&&ztt.test(t.charAt(e)););return e}yse.exports=Xtt});var wse=_((HNt,Cse)=>{var Ztt=Ese(),$tt=/^\s+/;function ert(t){return t&&t.slice(0,Ztt(t)+1).replace($tt,"")}Cse.exports=ert});var pE=_((jNt,Ise)=>{var trt=hd(),rrt=Ju(),nrt="[object Symbol]";function irt(t){return typeof t=="symbol"||rrt(t)&&trt(t)==nrt}Ise.exports=irt});var Sse=_((GNt,Dse)=>{var srt=wse(),Bse=il(),ort=pE(),vse=0/0,art=/^[-+]0x[0-9a-f]+$/i,lrt=/^0b[01]+$/i,crt=/^0o[0-7]+$/i,urt=parseInt;function Art(t){if(typeof t=="number")return t;if(ort(t))return vse;if(Bse(t)){var e=typeof t.valueOf=="function"?t.valueOf():t;t=Bse(e)?e+"":e}if(typeof t!="string")return t===0?t:+t;t=srt(t);var r=lrt.test(t);return r||crt.test(t)?urt(t.slice(2),r?2:8):art.test(t)?vse:+t}Dse.exports=Art});var xse=_((qNt,bse)=>{var frt=il(),aM=mse(),Pse=Sse(),prt="Expected a function",hrt=Math.max,grt=Math.min;function drt(t,e,r){var o,a,n,u,A,p,h=0,E=!1,I=!1,v=!0;if(typeof t!="function")throw new TypeError(prt);e=Pse(e)||0,frt(r)&&(E=!!r.leading,I="maxWait"in r,n=I?hrt(Pse(r.maxWait)||0,e):n,v="trailing"in r?!!r.trailing:v);function x(ce){var me=o,he=a;return o=a=void 0,h=ce,u=t.apply(he,me),u}function C(ce){return h=ce,A=setTimeout(U,e),E?x(ce):u}function R(ce){var me=ce-p,he=ce-h,Be=e-me;return I?grt(Be,n-he):Be}function L(ce){var me=ce-p,he=ce-h;return p===void 0||me>=e||me<0||I&&he>=n}function U(){var ce=aM();if(L(ce))return J(ce);A=setTimeout(U,R(ce))}function J(ce){return A=void 0,v&&o?x(ce):(o=a=void 0,u)}function te(){A!==void 0&&clearTimeout(A),h=0,o=p=a=A=void 0}function ae(){return A===void 0?u:J(aM())}function fe(){var ce=aM(),me=L(ce);if(o=arguments,a=this,p=ce,me){if(A===void 0)return C(p);if(I)return clearTimeout(A),A=setTimeout(U,e),x(p)}return A===void 0&&(A=setTimeout(U,e)),u}return fe.cancel=te,fe.flush=ae,fe}bse.exports=drt});var lM=_((YNt,kse)=>{var mrt=xse(),yrt=il(),Ert="Expected a function";function Crt(t,e,r){var o=!0,a=!0;if(typeof t!="function")throw new TypeError(Ert);return yrt(r)&&(o="leading"in r?!!r.leading:o,a="trailing"in r?!!r.trailing:a),mrt(t,e,{leading:o,maxWait:e,trailing:a})}kse.exports=Crt});function Irt(t){return typeof t.reportCode<"u"}var Qse,Fse,Rse,wrt,zt,Xs,Yl=Et(()=>{Qse=$e(lM()),Fse=ve("stream"),Rse=ve("string_decoder"),wrt=15,zt=class extends Error{constructor(r,o,a){super(o);this.reportExtra=a;this.reportCode=r}};Xs=class{constructor(){this.cacheHits=new Set;this.cacheMisses=new Set;this.reportedInfos=new Set;this.reportedWarnings=new Set;this.reportedErrors=new Set}getRecommendedLength(){return 180}reportCacheHit(e){this.cacheHits.add(e.locatorHash)}reportCacheMiss(e,r){this.cacheMisses.add(e.locatorHash)}static progressViaCounter(e){let r=0,o,a=new Promise(p=>{o=p}),n=p=>{let h=o;a=new Promise(E=>{o=E}),r=p,h()},u=(p=0)=>{n(r+1)},A=async function*(){for(;r<e;)await a,yield{progress:r/e}}();return{[Symbol.asyncIterator](){return A},hasProgress:!0,hasTitle:!1,set:n,tick:u}}static progressViaTitle(){let e,r,o=new Promise(u=>{r=u}),a=(0,Qse.default)(u=>{let A=r;o=new Promise(p=>{r=p}),e=u,A()},1e3/wrt),n=async function*(){for(;;)await o,yield{title:e}}();return{[Symbol.asyncIterator](){return n},hasProgress:!1,hasTitle:!0,setTitle:a}}async startProgressPromise(e,r){let o=this.reportProgress(e);try{return await r(e)}finally{o.stop()}}startProgressSync(e,r){let o=this.reportProgress(e);try{return r(e)}finally{o.stop()}}reportInfoOnce(e,r,o){let a=o&&o.key?o.key:r;this.reportedInfos.has(a)||(this.reportedInfos.add(a),this.reportInfo(e,r),o?.reportExtra?.(this))}reportWarningOnce(e,r,o){let a=o&&o.key?o.key:r;this.reportedWarnings.has(a)||(this.reportedWarnings.add(a),this.reportWarning(e,r),o?.reportExtra?.(this))}reportErrorOnce(e,r,o){let a=o&&o.key?o.key:r;this.reportedErrors.has(a)||(this.reportedErrors.add(a),this.reportError(e,r),o?.reportExtra?.(this))}reportExceptionOnce(e){Irt(e)?this.reportErrorOnce(e.reportCode,e.message,{key:e,reportExtra:e.reportExtra}):this.reportErrorOnce(1,e.stack||e.message,{key:e})}createStreamReporter(e=null){let r=new Fse.PassThrough,o=new Rse.StringDecoder,a="";return r.on("data",n=>{let u=o.write(n),A;do if(A=u.indexOf(`
+`),A!==-1){let p=a+u.substring(0,A);u=u.substring(A+1),a="",e!==null?this.reportInfo(null,`${e} ${p}`):this.reportInfo(null,p)}while(A!==-1);a+=u}),r.on("end",()=>{let n=o.end();n!==""&&(e!==null?this.reportInfo(null,`${e} ${n}`):this.reportInfo(null,n))}),r}}});var hE,cM=Et(()=>{Yl();bo();hE=class{constructor(e){this.fetchers=e}supports(e,r){return!!this.tryFetcher(e,r)}getLocalPath(e,r){return this.getFetcher(e,r).getLocalPath(e,r)}async fetch(e,r){return await this.getFetcher(e,r).fetch(e,r)}tryFetcher(e,r){let o=this.fetchers.find(a=>a.supports(e,r));return o||null}getFetcher(e,r){let o=this.fetchers.find(a=>a.supports(e,r));if(!o)throw new zt(11,`${jr(r.project.configuration,e)} isn't supported by any available fetcher`);return o}}});var Dd,uM=Et(()=>{bo();Dd=class{constructor(e){this.resolvers=e.filter(r=>r)}supportsDescriptor(e,r){return!!this.tryResolverByDescriptor(e,r)}supportsLocator(e,r){return!!this.tryResolverByLocator(e,r)}shouldPersistResolution(e,r){return this.getResolverByLocator(e,r).shouldPersistResolution(e,r)}bindDescriptor(e,r,o){return this.getResolverByDescriptor(e,o).bindDescriptor(e,r,o)}getResolutionDependencies(e,r){return this.getResolverByDescriptor(e,r).getResolutionDependencies(e,r)}async getCandidates(e,r,o){return await this.getResolverByDescriptor(e,o).getCandidates(e,r,o)}async getSatisfying(e,r,o,a){return this.getResolverByDescriptor(e,a).getSatisfying(e,r,o,a)}async resolve(e,r){return await this.getResolverByLocator(e,r).resolve(e,r)}tryResolverByDescriptor(e,r){let o=this.resolvers.find(a=>a.supportsDescriptor(e,r));return o||null}getResolverByDescriptor(e,r){let o=this.resolvers.find(a=>a.supportsDescriptor(e,r));if(!o)throw new Error(`${Gn(r.project.configuration,e)} isn't supported by any available resolver`);return o}tryResolverByLocator(e,r){let o=this.resolvers.find(a=>a.supportsLocator(e,r));return o||null}getResolverByLocator(e,r){let o=this.resolvers.find(a=>a.supportsLocator(e,r));if(!o)throw new Error(`${jr(r.project.configuration,e)} isn't supported by any available resolver`);return o}}});var gE,AM=Et(()=>{St();bo();gE=class{supports(e){return!!e.reference.startsWith("virtual:")}getLocalPath(e,r){let o=e.reference.indexOf("#");if(o===-1)throw new Error("Invalid virtual package reference");let a=e.reference.slice(o+1),n=Qs(e,a);return r.fetcher.getLocalPath(n,r)}async fetch(e,r){let o=e.reference.indexOf("#");if(o===-1)throw new Error("Invalid virtual package reference");let a=e.reference.slice(o+1),n=Qs(e,a),u=await r.fetcher.fetch(n,r);return await this.ensureVirtualLink(e,u,r)}getLocatorFilename(e){return lE(e)}async ensureVirtualLink(e,r,o){let a=r.packageFs.getRealPath(),n=o.project.configuration.get("virtualFolder"),u=this.getLocatorFilename(e),A=mi.makeVirtualPath(n,u,a),p=new Uu(A,{baseFs:r.packageFs,pathUtils:V});return{...r,packageFs:p}}}});var dE,c1,Tse=Et(()=>{dE=class{static isVirtualDescriptor(e){return!!e.range.startsWith(dE.protocol)}static isVirtualLocator(e){return!!e.reference.startsWith(dE.protocol)}supportsDescriptor(e,r){return dE.isVirtualDescriptor(e)}supportsLocator(e,r){return dE.isVirtualLocator(e)}shouldPersistResolution(e,r){return!1}bindDescriptor(e,r,o){throw new Error('Assertion failed: calling "bindDescriptor" on a virtual descriptor is unsupported')}getResolutionDependencies(e,r){throw new Error('Assertion failed: calling "getResolutionDependencies" on a virtual descriptor is unsupported')}async getCandidates(e,r,o){throw new Error('Assertion failed: calling "getCandidates" on a virtual descriptor is unsupported')}async getSatisfying(e,r,o,a){throw new Error('Assertion failed: calling "getSatisfying" on a virtual descriptor is unsupported')}async resolve(e,r){throw new Error('Assertion failed: calling "resolve" on a virtual locator is unsupported')}},c1=dE;c1.protocol="virtual:"});var mE,fM=Et(()=>{St();vd();mE=class{supports(e){return!!e.reference.startsWith(Xn.protocol)}getLocalPath(e,r){return this.getWorkspace(e,r).cwd}async fetch(e,r){let o=this.getWorkspace(e,r).cwd;return{packageFs:new gn(o),prefixPath:Bt.dot,localPath:o}}getWorkspace(e,r){return r.project.getWorkspaceByCwd(e.reference.slice(Xn.protocol.length))}}});function u1(t){return typeof t=="object"&&t!==null&&!Array.isArray(t)}function Nse(t){return typeof t>"u"?3:u1(t)?0:Array.isArray(t)?1:2}function gM(t,e){return Object.hasOwn(t,e)}function vrt(t){return u1(t)&&gM(t,"onConflict")&&typeof t.onConflict=="string"}function Drt(t){if(typeof t>"u")return{onConflict:"default",value:t};if(!vrt(t))return{onConflict:"default",value:t};if(gM(t,"value"))return t;let{onConflict:e,...r}=t;return{onConflict:e,value:r}}function Lse(t,e){let r=u1(t)&&gM(t,e)?t[e]:void 0;return Drt(r)}function yE(t,e){return[t,e,Ose]}function dM(t){return Array.isArray(t)?t[2]===Ose:!1}function pM(t,e){if(u1(t)){let r={};for(let o of Object.keys(t))r[o]=pM(t[o],e);return yE(e,r)}return Array.isArray(t)?yE(e,t.map(r=>pM(r,e))):yE(e,t)}function hM(t,e,r,o,a){let n,u=[],A=a,p=0;for(let E=a-1;E>=o;--E){let[I,v]=t[E],{onConflict:x,value:C}=Lse(v,r),R=Nse(C);if(R!==3){if(n??=R,R!==n||x==="hardReset"){p=A;break}if(R===2)return yE(I,C);if(u.unshift([I,C]),x==="reset"){p=E;break}x==="extend"&&E===o&&(o=0),A=E}}if(typeof n>"u")return null;let h=u.map(([E])=>E).join(", ");switch(n){case 1:return yE(h,new Array().concat(...u.map(([E,I])=>I.map(v=>pM(v,E)))));case 0:{let E=Object.assign({},...u.map(([,R])=>R)),I=Object.keys(E),v={},x=t.map(([R,L])=>[R,Lse(L,r).value]),C=Brt(x,([R,L])=>{let U=Nse(L);return U!==0&&U!==3});if(C!==-1){let R=x.slice(C+1);for(let L of I)v[L]=hM(R,e,L,0,R.length)}else for(let R of I)v[R]=hM(x,e,R,p,x.length);return yE(h,v)}default:throw new Error("Assertion failed: Non-extendable value type")}}function Mse(t){return hM(t.map(([e,r])=>[e,{["."]:r}]),[],".",0,t.length)}function A1(t){return dM(t)?t[1]:t}function qP(t){let e=dM(t)?t[1]:t;if(Array.isArray(e))return e.map(r=>qP(r));if(u1(e)){let r={};for(let[o,a]of Object.entries(e))r[o]=qP(a);return r}return e}function mM(t){return dM(t)?t[0]:null}var Brt,Ose,Use=Et(()=>{Brt=(t,e,r)=>{let o=[...t];return o.reverse(),o.findIndex(e,r)};Ose=Symbol()});var YP={};Vt(YP,{getDefaultGlobalFolder:()=>EM,getHomeFolder:()=>EE,isFolderInside:()=>CM});function EM(){if(process.platform==="win32"){let t=ue.toPortablePath(process.env.LOCALAPPDATA||ue.join((0,yM.homedir)(),"AppData","Local"));return V.resolve(t,"Yarn/Berry")}if(process.env.XDG_DATA_HOME){let t=ue.toPortablePath(process.env.XDG_DATA_HOME);return V.resolve(t,"yarn/berry")}return V.resolve(EE(),".yarn/berry")}function EE(){return ue.toPortablePath((0,yM.homedir)()||"/usr/local/share")}function CM(t,e){let r=V.relative(e,t);return r&&!r.startsWith("..")&&!V.isAbsolute(r)}var yM,WP=Et(()=>{St();yM=ve("os")});var Gse=_(CE=>{"use strict";var iLt=ve("net"),Prt=ve("tls"),wM=ve("http"),_se=ve("https"),brt=ve("events"),sLt=ve("assert"),xrt=ve("util");CE.httpOverHttp=krt;CE.httpsOverHttp=Qrt;CE.httpOverHttps=Frt;CE.httpsOverHttps=Rrt;function krt(t){var e=new Ff(t);return e.request=wM.request,e}function Qrt(t){var e=new Ff(t);return e.request=wM.request,e.createSocket=Hse,e.defaultPort=443,e}function Frt(t){var e=new Ff(t);return e.request=_se.request,e}function Rrt(t){var e=new Ff(t);return e.request=_se.request,e.createSocket=Hse,e.defaultPort=443,e}function Ff(t){var e=this;e.options=t||{},e.proxyOptions=e.options.proxy||{},e.maxSockets=e.options.maxSockets||wM.Agent.defaultMaxSockets,e.requests=[],e.sockets=[],e.on("free",function(o,a,n,u){for(var A=jse(a,n,u),p=0,h=e.requests.length;p<h;++p){var E=e.requests[p];if(E.host===A.host&&E.port===A.port){e.requests.splice(p,1),E.request.onSocket(o);return}}o.destroy(),e.removeSocket(o)})}xrt.inherits(Ff,brt.EventEmitter);Ff.prototype.addRequest=function(e,r,o,a){var n=this,u=IM({request:e},n.options,jse(r,o,a));if(n.sockets.length>=this.maxSockets){n.requests.push(u);return}n.createSocket(u,function(A){A.on("free",p),A.on("close",h),A.on("agentRemove",h),e.onSocket(A);function p(){n.emit("free",A,u)}function h(E){n.removeSocket(A),A.removeListener("free",p),A.removeListener("close",h),A.removeListener("agentRemove",h)}})};Ff.prototype.createSocket=function(e,r){var o=this,a={};o.sockets.push(a);var n=IM({},o.proxyOptions,{method:"CONNECT",path:e.host+":"+e.port,agent:!1,headers:{host:e.host+":"+e.port}});e.localAddress&&(n.localAddress=e.localAddress),n.proxyAuth&&(n.headers=n.headers||{},n.headers["Proxy-Authorization"]="Basic "+new Buffer(n.proxyAuth).toString("base64")),oh("making CONNECT request");var u=o.request(n);u.useChunkedEncodingByDefault=!1,u.once("response",A),u.once("upgrade",p),u.once("connect",h),u.once("error",E),u.end();function A(I){I.upgrade=!0}function p(I,v,x){process.nextTick(function(){h(I,v,x)})}function h(I,v,x){if(u.removeAllListeners(),v.removeAllListeners(),I.statusCode!==200){oh("tunneling socket could not be established, statusCode=%d",I.statusCode),v.destroy();var C=new Error("tunneling socket could not be established, statusCode="+I.statusCode);C.code="ECONNRESET",e.request.emit("error",C),o.removeSocket(a);return}if(x.length>0){oh("got illegal response body from proxy"),v.destroy();var C=new Error("got illegal response body from proxy");C.code="ECONNRESET",e.request.emit("error",C),o.removeSocket(a);return}return oh("tunneling connection has established"),o.sockets[o.sockets.indexOf(a)]=v,r(v)}function E(I){u.removeAllListeners(),oh(`tunneling socket could not be established, cause=%s
+`,I.message,I.stack);var v=new Error("tunneling socket could not be established, cause="+I.message);v.code="ECONNRESET",e.request.emit("error",v),o.removeSocket(a)}};Ff.prototype.removeSocket=function(e){var r=this.sockets.indexOf(e);if(r!==-1){this.sockets.splice(r,1);var o=this.requests.shift();o&&this.createSocket(o,function(a){o.request.onSocket(a)})}};function Hse(t,e){var r=this;Ff.prototype.createSocket.call(r,t,function(o){var a=t.request.getHeader("host"),n=IM({},r.options,{socket:o,servername:a?a.replace(/:.*$/,""):t.host}),u=Prt.connect(0,n);r.sockets[r.sockets.indexOf(o)]=u,e(u)})}function jse(t,e,r){return typeof t=="string"?{host:t,port:e,localAddress:r}:t}function IM(t){for(var e=1,r=arguments.length;e<r;++e){var o=arguments[e];if(typeof o=="object")for(var a=Object.keys(o),n=0,u=a.length;n<u;++n){var A=a[n];o[A]!==void 0&&(t[A]=o[A])}}return t}var oh;process.env.NODE_DEBUG&&/\btunnel\b/.test(process.env.NODE_DEBUG)?oh=function(){var t=Array.prototype.slice.call(arguments);typeof t[0]=="string"?t[0]="TUNNEL: "+t[0]:t.unshift("TUNNEL:"),console.error.apply(console,t)}:oh=function(){};CE.debug=oh});var Yse=_((aLt,qse)=>{qse.exports=Gse()});var Tf=_((Rf,KP)=>{"use strict";Object.defineProperty(Rf,"__esModule",{value:!0});var Wse=["Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Uint16Array","Int32Array","Uint32Array","Float32Array","Float64Array","BigInt64Array","BigUint64Array"];function Trt(t){return Wse.includes(t)}var Nrt=["Function","Generator","AsyncGenerator","GeneratorFunction","AsyncGeneratorFunction","AsyncFunction","Observable","Array","Buffer","Object","RegExp","Date","Error","Map","Set","WeakMap","WeakSet","ArrayBuffer","SharedArrayBuffer","DataView","Promise","URL","FormData","URLSearchParams","HTMLElement",...Wse];function Lrt(t){return Nrt.includes(t)}var Ort=["null","undefined","string","number","bigint","boolean","symbol"];function Mrt(t){return Ort.includes(t)}function wE(t){return e=>typeof e===t}var{toString:Kse}=Object.prototype,f1=t=>{let e=Kse.call(t).slice(8,-1);if(/HTML\w+Element/.test(e)&&be.domElement(t))return"HTMLElement";if(Lrt(e))return e},ei=t=>e=>f1(e)===t;function be(t){if(t===null)return"null";switch(typeof t){case"undefined":return"undefined";case"string":return"string";case"number":return"number";case"boolean":return"boolean";case"function":return"Function";case"bigint":return"bigint";case"symbol":return"symbol";default:}if(be.observable(t))return"Observable";if(be.array(t))return"Array";if(be.buffer(t))return"Buffer";let e=f1(t);if(e)return e;if(t instanceof String||t instanceof Boolean||t instanceof Number)throw new TypeError("Please don't use object wrappers for primitive types");return"Object"}be.undefined=wE("undefined");be.string=wE("string");var Urt=wE("number");be.number=t=>Urt(t)&&!be.nan(t);be.bigint=wE("bigint");be.function_=wE("function");be.null_=t=>t===null;be.class_=t=>be.function_(t)&&t.toString().startsWith("class ");be.boolean=t=>t===!0||t===!1;be.symbol=wE("symbol");be.numericString=t=>be.string(t)&&!be.emptyStringOrWhitespace(t)&&!Number.isNaN(Number(t));be.array=(t,e)=>Array.isArray(t)?be.function_(e)?t.every(e):!0:!1;be.buffer=t=>{var e,r,o,a;return(a=(o=(r=(e=t)===null||e===void 0?void 0:e.constructor)===null||r===void 0?void 0:r.isBuffer)===null||o===void 0?void 0:o.call(r,t))!==null&&a!==void 0?a:!1};be.nullOrUndefined=t=>be.null_(t)||be.undefined(t);be.object=t=>!be.null_(t)&&(typeof t=="object"||be.function_(t));be.iterable=t=>{var e;return be.function_((e=t)===null||e===void 0?void 0:e[Symbol.iterator])};be.asyncIterable=t=>{var e;return be.function_((e=t)===null||e===void 0?void 0:e[Symbol.asyncIterator])};be.generator=t=>be.iterable(t)&&be.function_(t.next)&&be.function_(t.throw);be.asyncGenerator=t=>be.asyncIterable(t)&&be.function_(t.next)&&be.function_(t.throw);be.nativePromise=t=>ei("Promise")(t);var _rt=t=>{var e,r;return be.function_((e=t)===null||e===void 0?void 0:e.then)&&be.function_((r=t)===null||r===void 0?void 0:r.catch)};be.promise=t=>be.nativePromise(t)||_rt(t);be.generatorFunction=ei("GeneratorFunction");be.asyncGeneratorFunction=t=>f1(t)==="AsyncGeneratorFunction";be.asyncFunction=t=>f1(t)==="AsyncFunction";be.boundFunction=t=>be.function_(t)&&!t.hasOwnProperty("prototype");be.regExp=ei("RegExp");be.date=ei("Date");be.error=ei("Error");be.map=t=>ei("Map")(t);be.set=t=>ei("Set")(t);be.weakMap=t=>ei("WeakMap")(t);be.weakSet=t=>ei("WeakSet")(t);be.int8Array=ei("Int8Array");be.uint8Array=ei("Uint8Array");be.uint8ClampedArray=ei("Uint8ClampedArray");be.int16Array=ei("Int16Array");be.uint16Array=ei("Uint16Array");be.int32Array=ei("Int32Array");be.uint32Array=ei("Uint32Array");be.float32Array=ei("Float32Array");be.float64Array=ei("Float64Array");be.bigInt64Array=ei("BigInt64Array");be.bigUint64Array=ei("BigUint64Array");be.arrayBuffer=ei("ArrayBuffer");be.sharedArrayBuffer=ei("SharedArrayBuffer");be.dataView=ei("DataView");be.directInstanceOf=(t,e)=>Object.getPrototypeOf(t)===e.prototype;be.urlInstance=t=>ei("URL")(t);be.urlString=t=>{if(!be.string(t))return!1;try{return new URL(t),!0}catch{return!1}};be.truthy=t=>Boolean(t);be.falsy=t=>!t;be.nan=t=>Number.isNaN(t);be.primitive=t=>be.null_(t)||Mrt(typeof t);be.integer=t=>Number.isInteger(t);be.safeInteger=t=>Number.isSafeInteger(t);be.plainObject=t=>{if(Kse.call(t)!=="[object Object]")return!1;let e=Object.getPrototypeOf(t);return e===null||e===Object.getPrototypeOf({})};be.typedArray=t=>Trt(f1(t));var Hrt=t=>be.safeInteger(t)&&t>=0;be.arrayLike=t=>!be.nullOrUndefined(t)&&!be.function_(t)&&Hrt(t.length);be.inRange=(t,e)=>{if(be.number(e))return t>=Math.min(0,e)&&t<=Math.max(e,0);if(be.array(e)&&e.length===2)return t>=Math.min(...e)&&t<=Math.max(...e);throw new TypeError(`Invalid range: ${JSON.stringify(e)}`)};var jrt=1,Grt=["innerHTML","ownerDocument","style","attributes","nodeValue"];be.domElement=t=>be.object(t)&&t.nodeType===jrt&&be.string(t.nodeName)&&!be.plainObject(t)&&Grt.every(e=>e in t);be.observable=t=>{var e,r,o,a;return t?t===((r=(e=t)[Symbol.observable])===null||r===void 0?void 0:r.call(e))||t===((a=(o=t)["@@observable"])===null||a===void 0?void 0:a.call(o)):!1};be.nodeStream=t=>be.object(t)&&be.function_(t.pipe)&&!be.observable(t);be.infinite=t=>t===1/0||t===-1/0;var Vse=t=>e=>be.integer(e)&&Math.abs(e%2)===t;be.evenInteger=Vse(0);be.oddInteger=Vse(1);be.emptyArray=t=>be.array(t)&&t.length===0;be.nonEmptyArray=t=>be.array(t)&&t.length>0;be.emptyString=t=>be.string(t)&&t.length===0;be.nonEmptyString=t=>be.string(t)&&t.length>0;var qrt=t=>be.string(t)&&!/\S/.test(t);be.emptyStringOrWhitespace=t=>be.emptyString(t)||qrt(t);be.emptyObject=t=>be.object(t)&&!be.map(t)&&!be.set(t)&&Object.keys(t).length===0;be.nonEmptyObject=t=>be.object(t)&&!be.map(t)&&!be.set(t)&&Object.keys(t).length>0;be.emptySet=t=>be.set(t)&&t.size===0;be.nonEmptySet=t=>be.set(t)&&t.size>0;be.emptyMap=t=>be.map(t)&&t.size===0;be.nonEmptyMap=t=>be.map(t)&&t.size>0;be.propertyKey=t=>be.any([be.string,be.number,be.symbol],t);be.formData=t=>ei("FormData")(t);be.urlSearchParams=t=>ei("URLSearchParams")(t);var Jse=(t,e,r)=>{if(!be.function_(e))throw new TypeError(`Invalid predicate: ${JSON.stringify(e)}`);if(r.length===0)throw new TypeError("Invalid number of values");return t.call(r,e)};be.any=(t,...e)=>(be.array(t)?t:[t]).some(o=>Jse(Array.prototype.some,o,e));be.all=(t,...e)=>Jse(Array.prototype.every,t,e);var Ht=(t,e,r,o={})=>{if(!t){let{multipleValues:a}=o,n=a?`received values of types ${[...new Set(r.map(u=>`\`${be(u)}\``))].join(", ")}`:`received value of type \`${be(r)}\``;throw new TypeError(`Expected value which is \`${e}\`, ${n}.`)}};Rf.assert={undefined:t=>Ht(be.undefined(t),"undefined",t),string:t=>Ht(be.string(t),"string",t),number:t=>Ht(be.number(t),"number",t),bigint:t=>Ht(be.bigint(t),"bigint",t),function_:t=>Ht(be.function_(t),"Function",t),null_:t=>Ht(be.null_(t),"null",t),class_:t=>Ht(be.class_(t),"Class",t),boolean:t=>Ht(be.boolean(t),"boolean",t),symbol:t=>Ht(be.symbol(t),"symbol",t),numericString:t=>Ht(be.numericString(t),"string with a number",t),array:(t,e)=>{Ht(be.array(t),"Array",t),e&&t.forEach(e)},buffer:t=>Ht(be.buffer(t),"Buffer",t),nullOrUndefined:t=>Ht(be.nullOrUndefined(t),"null or undefined",t),object:t=>Ht(be.object(t),"Object",t),iterable:t=>Ht(be.iterable(t),"Iterable",t),asyncIterable:t=>Ht(be.asyncIterable(t),"AsyncIterable",t),generator:t=>Ht(be.generator(t),"Generator",t),asyncGenerator:t=>Ht(be.asyncGenerator(t),"AsyncGenerator",t),nativePromise:t=>Ht(be.nativePromise(t),"native Promise",t),promise:t=>Ht(be.promise(t),"Promise",t),generatorFunction:t=>Ht(be.generatorFunction(t),"GeneratorFunction",t),asyncGeneratorFunction:t=>Ht(be.asyncGeneratorFunction(t),"AsyncGeneratorFunction",t),asyncFunction:t=>Ht(be.asyncFunction(t),"AsyncFunction",t),boundFunction:t=>Ht(be.boundFunction(t),"Function",t),regExp:t=>Ht(be.regExp(t),"RegExp",t),date:t=>Ht(be.date(t),"Date",t),error:t=>Ht(be.error(t),"Error",t),map:t=>Ht(be.map(t),"Map",t),set:t=>Ht(be.set(t),"Set",t),weakMap:t=>Ht(be.weakMap(t),"WeakMap",t),weakSet:t=>Ht(be.weakSet(t),"WeakSet",t),int8Array:t=>Ht(be.int8Array(t),"Int8Array",t),uint8Array:t=>Ht(be.uint8Array(t),"Uint8Array",t),uint8ClampedArray:t=>Ht(be.uint8ClampedArray(t),"Uint8ClampedArray",t),int16Array:t=>Ht(be.int16Array(t),"Int16Array",t),uint16Array:t=>Ht(be.uint16Array(t),"Uint16Array",t),int32Array:t=>Ht(be.int32Array(t),"Int32Array",t),uint32Array:t=>Ht(be.uint32Array(t),"Uint32Array",t),float32Array:t=>Ht(be.float32Array(t),"Float32Array",t),float64Array:t=>Ht(be.float64Array(t),"Float64Array",t),bigInt64Array:t=>Ht(be.bigInt64Array(t),"BigInt64Array",t),bigUint64Array:t=>Ht(be.bigUint64Array(t),"BigUint64Array",t),arrayBuffer:t=>Ht(be.arrayBuffer(t),"ArrayBuffer",t),sharedArrayBuffer:t=>Ht(be.sharedArrayBuffer(t),"SharedArrayBuffer",t),dataView:t=>Ht(be.dataView(t),"DataView",t),urlInstance:t=>Ht(be.urlInstance(t),"URL",t),urlString:t=>Ht(be.urlString(t),"string with a URL",t),truthy:t=>Ht(be.truthy(t),"truthy",t),falsy:t=>Ht(be.falsy(t),"falsy",t),nan:t=>Ht(be.nan(t),"NaN",t),primitive:t=>Ht(be.primitive(t),"primitive",t),integer:t=>Ht(be.integer(t),"integer",t),safeInteger:t=>Ht(be.safeInteger(t),"integer",t),plainObject:t=>Ht(be.plainObject(t),"plain object",t),typedArray:t=>Ht(be.typedArray(t),"TypedArray",t),arrayLike:t=>Ht(be.arrayLike(t),"array-like",t),domElement:t=>Ht(be.domElement(t),"HTMLElement",t),observable:t=>Ht(be.observable(t),"Observable",t),nodeStream:t=>Ht(be.nodeStream(t),"Node.js Stream",t),infinite:t=>Ht(be.infinite(t),"infinite number",t),emptyArray:t=>Ht(be.emptyArray(t),"empty array",t),nonEmptyArray:t=>Ht(be.nonEmptyArray(t),"non-empty array",t),emptyString:t=>Ht(be.emptyString(t),"empty string",t),nonEmptyString:t=>Ht(be.nonEmptyString(t),"non-empty string",t),emptyStringOrWhitespace:t=>Ht(be.emptyStringOrWhitespace(t),"empty string or whitespace",t),emptyObject:t=>Ht(be.emptyObject(t),"empty object",t),nonEmptyObject:t=>Ht(be.nonEmptyObject(t),"non-empty object",t),emptySet:t=>Ht(be.emptySet(t),"empty set",t),nonEmptySet:t=>Ht(be.nonEmptySet(t),"non-empty set",t),emptyMap:t=>Ht(be.emptyMap(t),"empty map",t),nonEmptyMap:t=>Ht(be.nonEmptyMap(t),"non-empty map",t),propertyKey:t=>Ht(be.propertyKey(t),"PropertyKey",t),formData:t=>Ht(be.formData(t),"FormData",t),urlSearchParams:t=>Ht(be.urlSearchParams(t),"URLSearchParams",t),evenInteger:t=>Ht(be.evenInteger(t),"even integer",t),oddInteger:t=>Ht(be.oddInteger(t),"odd integer",t),directInstanceOf:(t,e)=>Ht(be.directInstanceOf(t,e),"T",t),inRange:(t,e)=>Ht(be.inRange(t,e),"in range",t),any:(t,...e)=>Ht(be.any(t,...e),"predicate returns truthy for any value",e,{multipleValues:!0}),all:(t,...e)=>Ht(be.all(t,...e),"predicate returns truthy for all values",e,{multipleValues:!0})};Object.defineProperties(be,{class:{value:be.class_},function:{value:be.function_},null:{value:be.null_}});Object.defineProperties(Rf.assert,{class:{value:Rf.assert.class_},function:{value:Rf.assert.function_},null:{value:Rf.assert.null_}});Rf.default=be;KP.exports=be;KP.exports.default=be;KP.exports.assert=Rf.assert});var zse=_((lLt,BM)=>{"use strict";var VP=class extends Error{constructor(e){super(e||"Promise was canceled"),this.name="CancelError"}get isCanceled(){return!0}},IE=class{static fn(e){return(...r)=>new IE((o,a,n)=>{r.push(n),e(...r).then(o,a)})}constructor(e){this._cancelHandlers=[],this._isPending=!0,this._isCanceled=!1,this._rejectOnCancel=!0,this._promise=new Promise((r,o)=>{this._reject=o;let a=A=>{this._isPending=!1,r(A)},n=A=>{this._isPending=!1,o(A)},u=A=>{if(!this._isPending)throw new Error("The `onCancel` handler was attached after the promise settled.");this._cancelHandlers.push(A)};return Object.defineProperties(u,{shouldReject:{get:()=>this._rejectOnCancel,set:A=>{this._rejectOnCancel=A}}}),e(a,n,u)})}then(e,r){return this._promise.then(e,r)}catch(e){return this._promise.catch(e)}finally(e){return this._promise.finally(e)}cancel(e){if(!(!this._isPending||this._isCanceled)){if(this._cancelHandlers.length>0)try{for(let r of this._cancelHandlers)r()}catch(r){this._reject(r)}this._isCanceled=!0,this._rejectOnCancel&&this._reject(new VP(e))}}get isCanceled(){return this._isCanceled}};Object.setPrototypeOf(IE.prototype,Promise.prototype);BM.exports=IE;BM.exports.CancelError=VP});var Xse=_((DM,SM)=>{"use strict";Object.defineProperty(DM,"__esModule",{value:!0});var Yrt=ve("tls"),vM=(t,e)=>{let r;typeof e=="function"?r={connect:e}:r=e;let o=typeof r.connect=="function",a=typeof r.secureConnect=="function",n=typeof r.close=="function",u=()=>{o&&r.connect(),t instanceof Yrt.TLSSocket&&a&&(t.authorized?r.secureConnect():t.authorizationError||t.once("secureConnect",r.secureConnect)),n&&t.once("close",r.close)};t.writable&&!t.connecting?u():t.connecting?t.once("connect",u):t.destroyed&&n&&r.close(t._hadError)};DM.default=vM;SM.exports=vM;SM.exports.default=vM});var Zse=_((bM,xM)=>{"use strict";Object.defineProperty(bM,"__esModule",{value:!0});var Wrt=Xse(),Krt=Number(process.versions.node.split(".")[0]),PM=t=>{let e={start:Date.now(),socket:void 0,lookup:void 0,connect:void 0,secureConnect:void 0,upload:void 0,response:void 0,end:void 0,error:void 0,abort:void 0,phases:{wait:void 0,dns:void 0,tcp:void 0,tls:void 0,request:void 0,firstByte:void 0,download:void 0,total:void 0}};t.timings=e;let r=u=>{let A=u.emit.bind(u);u.emit=(p,...h)=>(p==="error"&&(e.error=Date.now(),e.phases.total=e.error-e.start,u.emit=A),A(p,...h))};r(t),t.prependOnceListener("abort",()=>{e.abort=Date.now(),(!e.response||Krt>=13)&&(e.phases.total=Date.now()-e.start)});let o=u=>{e.socket=Date.now(),e.phases.wait=e.socket-e.start;let A=()=>{e.lookup=Date.now(),e.phases.dns=e.lookup-e.socket};u.prependOnceListener("lookup",A),Wrt.default(u,{connect:()=>{e.connect=Date.now(),e.lookup===void 0&&(u.removeListener("lookup",A),e.lookup=e.connect,e.phases.dns=e.lookup-e.socket),e.phases.tcp=e.connect-e.lookup},secureConnect:()=>{e.secureConnect=Date.now(),e.phases.tls=e.secureConnect-e.connect}})};t.socket?o(t.socket):t.prependOnceListener("socket",o);let a=()=>{var u;e.upload=Date.now(),e.phases.request=e.upload-(u=e.secureConnect,u??e.connect)};return(()=>typeof t.writableFinished=="boolean"?t.writableFinished:t.finished&&t.outputSize===0&&(!t.socket||t.socket.writableLength===0))()?a():t.prependOnceListener("finish",a),t.prependOnceListener("response",u=>{e.response=Date.now(),e.phases.firstByte=e.response-e.upload,u.timings=e,r(u),u.prependOnceListener("end",()=>{e.end=Date.now(),e.phases.download=e.end-e.response,e.phases.total=e.end-e.start})}),e};bM.default=PM;xM.exports=PM;xM.exports.default=PM});var soe=_((cLt,FM)=>{"use strict";var{V4MAPPED:Vrt,ADDRCONFIG:Jrt,ALL:ioe,promises:{Resolver:$se},lookup:zrt}=ve("dns"),{promisify:kM}=ve("util"),Xrt=ve("os"),BE=Symbol("cacheableLookupCreateConnection"),QM=Symbol("cacheableLookupInstance"),eoe=Symbol("expires"),Zrt=typeof ioe=="number",toe=t=>{if(!(t&&typeof t.createConnection=="function"))throw new Error("Expected an Agent instance as the first argument")},$rt=t=>{for(let e of t)e.family!==6&&(e.address=`::ffff:${e.address}`,e.family=6)},roe=()=>{let t=!1,e=!1;for(let r of Object.values(Xrt.networkInterfaces()))for(let o of r)if(!o.internal&&(o.family==="IPv6"?e=!0:t=!0,t&&e))return{has4:t,has6:e};return{has4:t,has6:e}},ent=t=>Symbol.iterator in t,noe={ttl:!0},tnt={all:!0},JP=class{constructor({cache:e=new Map,maxTtl:r=1/0,fallbackDuration:o=3600,errorTtl:a=.15,resolver:n=new $se,lookup:u=zrt}={}){if(this.maxTtl=r,this.errorTtl=a,this._cache=e,this._resolver=n,this._dnsLookup=kM(u),this._resolver instanceof $se?(this._resolve4=this._resolver.resolve4.bind(this._resolver),this._resolve6=this._resolver.resolve6.bind(this._resolver)):(this._resolve4=kM(this._resolver.resolve4.bind(this._resolver)),this._resolve6=kM(this._resolver.resolve6.bind(this._resolver))),this._iface=roe(),this._pending={},this._nextRemovalTime=!1,this._hostnamesToFallback=new Set,o<1)this._fallback=!1;else{this._fallback=!0;let A=setInterval(()=>{this._hostnamesToFallback.clear()},o*1e3);A.unref&&A.unref()}this.lookup=this.lookup.bind(this),this.lookupAsync=this.lookupAsync.bind(this)}set servers(e){this.clear(),this._resolver.setServers(e)}get servers(){return this._resolver.getServers()}lookup(e,r,o){if(typeof r=="function"?(o=r,r={}):typeof r=="number"&&(r={family:r}),!o)throw new Error("Callback must be a function.");this.lookupAsync(e,r).then(a=>{r.all?o(null,a):o(null,a.address,a.family,a.expires,a.ttl)},o)}async lookupAsync(e,r={}){typeof r=="number"&&(r={family:r});let o=await this.query(e);if(r.family===6){let a=o.filter(n=>n.family===6);r.hints&Vrt&&(Zrt&&r.hints&ioe||a.length===0)?$rt(o):o=a}else r.family===4&&(o=o.filter(a=>a.family===4));if(r.hints&Jrt){let{_iface:a}=this;o=o.filter(n=>n.family===6?a.has6:a.has4)}if(o.length===0){let a=new Error(`cacheableLookup ENOTFOUND ${e}`);throw a.code="ENOTFOUND",a.hostname=e,a}return r.all?o:o[0]}async query(e){let r=await this._cache.get(e);if(!r){let o=this._pending[e];if(o)r=await o;else{let a=this.queryAndCache(e);this._pending[e]=a,r=await a}}return r=r.map(o=>({...o})),r}async _resolve(e){let r=async h=>{try{return await h}catch(E){if(E.code==="ENODATA"||E.code==="ENOTFOUND")return[];throw E}},[o,a]=await Promise.all([this._resolve4(e,noe),this._resolve6(e,noe)].map(h=>r(h))),n=0,u=0,A=0,p=Date.now();for(let h of o)h.family=4,h.expires=p+h.ttl*1e3,n=Math.max(n,h.ttl);for(let h of a)h.family=6,h.expires=p+h.ttl*1e3,u=Math.max(u,h.ttl);return o.length>0?a.length>0?A=Math.min(n,u):A=n:A=u,{entries:[...o,...a],cacheTtl:A}}async _lookup(e){try{return{entries:await this._dnsLookup(e,{all:!0}),cacheTtl:0}}catch{return{entries:[],cacheTtl:0}}}async _set(e,r,o){if(this.maxTtl>0&&o>0){o=Math.min(o,this.maxTtl)*1e3,r[eoe]=Date.now()+o;try{await this._cache.set(e,r,o)}catch(a){this.lookupAsync=async()=>{let n=new Error("Cache Error. Please recreate the CacheableLookup instance.");throw n.cause=a,n}}ent(this._cache)&&this._tick(o)}}async queryAndCache(e){if(this._hostnamesToFallback.has(e))return this._dnsLookup(e,tnt);try{let r=await this._resolve(e);r.entries.length===0&&this._fallback&&(r=await this._lookup(e),r.entries.length!==0&&this._hostnamesToFallback.add(e));let o=r.entries.length===0?this.errorTtl:r.cacheTtl;return await this._set(e,r.entries,o),delete this._pending[e],r.entries}catch(r){throw delete this._pending[e],r}}_tick(e){let r=this._nextRemovalTime;(!r||e<r)&&(clearTimeout(this._removalTimeout),this._nextRemovalTime=e,this._removalTimeout=setTimeout(()=>{this._nextRemovalTime=!1;let o=1/0,a=Date.now();for(let[n,u]of this._cache){let A=u[eoe];a>=A?this._cache.delete(n):A<o&&(o=A)}o!==1/0&&this._tick(o-a)},e),this._removalTimeout.unref&&this._removalTimeout.unref())}install(e){if(toe(e),BE in e)throw new Error("CacheableLookup has been already installed");e[BE]=e.createConnection,e[QM]=this,e.createConnection=(r,o)=>("lookup"in r||(r.lookup=this.lookup),e[BE](r,o))}uninstall(e){if(toe(e),e[BE]){if(e[QM]!==this)throw new Error("The agent is not owned by this CacheableLookup instance");e.createConnection=e[BE],delete e[BE],delete e[QM]}}updateInterfaceInfo(){let{_iface:e}=this;this._iface=roe(),(e.has4&&!this._iface.has4||e.has6&&!this._iface.has6)&&this._cache.clear()}clear(e){if(e){this._cache.delete(e);return}this._cache.clear()}};FM.exports=JP;FM.exports.default=JP});var loe=_((uLt,RM)=>{"use strict";var rnt=typeof URL>"u"?ve("url").URL:URL,nnt="text/plain",int="us-ascii",ooe=(t,e)=>e.some(r=>r instanceof RegExp?r.test(t):r===t),snt=(t,{stripHash:e})=>{let r=t.match(/^data:([^,]*?),([^#]*?)(?:#(.*))?$/);if(!r)throw new Error(`Invalid URL: ${t}`);let o=r[1].split(";"),a=r[2],n=e?"":r[3],u=!1;o[o.length-1]==="base64"&&(o.pop(),u=!0);let A=(o.shift()||"").toLowerCase(),h=[...o.map(E=>{let[I,v=""]=E.split("=").map(x=>x.trim());return I==="charset"&&(v=v.toLowerCase(),v===int)?"":`${I}${v?`=${v}`:""}`}).filter(Boolean)];return u&&h.push("base64"),(h.length!==0||A&&A!==nnt)&&h.unshift(A),`data:${h.join(";")},${u?a.trim():a}${n?`#${n}`:""}`},aoe=(t,e)=>{if(e={defaultProtocol:"http:",normalizeProtocol:!0,forceHttp:!1,forceHttps:!1,stripAuthentication:!0,stripHash:!1,stripWWW:!0,removeQueryParameters:[/^utm_\w+/i],removeTrailingSlash:!0,removeDirectoryIndex:!1,sortQueryParameters:!0,...e},Reflect.has(e,"normalizeHttps"))throw new Error("options.normalizeHttps is renamed to options.forceHttp");if(Reflect.has(e,"normalizeHttp"))throw new Error("options.normalizeHttp is renamed to options.forceHttps");if(Reflect.has(e,"stripFragment"))throw new Error("options.stripFragment is renamed to options.stripHash");if(t=t.trim(),/^data:/i.test(t))return snt(t,e);let r=t.startsWith("//");!r&&/^\.*\//.test(t)||(t=t.replace(/^(?!(?:\w+:)?\/\/)|^\/\//,e.defaultProtocol));let a=new rnt(t);if(e.forceHttp&&e.forceHttps)throw new Error("The `forceHttp` and `forceHttps` options cannot be used together");if(e.forceHttp&&a.protocol==="https:"&&(a.protocol="http:"),e.forceHttps&&a.protocol==="http:"&&(a.protocol="https:"),e.stripAuthentication&&(a.username="",a.password=""),e.stripHash&&(a.hash=""),a.pathname&&(a.pathname=a.pathname.replace(/((?!:).|^)\/{2,}/g,(n,u)=>/^(?!\/)/g.test(u)?`${u}/`:"/")),a.pathname&&(a.pathname=decodeURI(a.pathname)),e.removeDirectoryIndex===!0&&(e.removeDirectoryIndex=[/^index\.[a-z]+$/]),Array.isArray(e.removeDirectoryIndex)&&e.removeDirectoryIndex.length>0){let n=a.pathname.split("/"),u=n[n.length-1];ooe(u,e.removeDirectoryIndex)&&(n=n.slice(0,n.length-1),a.pathname=n.slice(1).join("/")+"/")}if(a.hostname&&(a.hostname=a.hostname.replace(/\.$/,""),e.stripWWW&&/^www\.([a-z\-\d]{2,63})\.([a-z.]{2,5})$/.test(a.hostname)&&(a.hostname=a.hostname.replace(/^www\./,""))),Array.isArray(e.removeQueryParameters))for(let n of[...a.searchParams.keys()])ooe(n,e.removeQueryParameters)&&a.searchParams.delete(n);return e.sortQueryParameters&&a.searchParams.sort(),e.removeTrailingSlash&&(a.pathname=a.pathname.replace(/\/$/,"")),t=a.toString(),(e.removeTrailingSlash||a.pathname==="/")&&a.hash===""&&(t=t.replace(/\/$/,"")),r&&!e.normalizeProtocol&&(t=t.replace(/^http:\/\//,"//")),e.stripProtocol&&(t=t.replace(/^(?:https?:)?\/\//,"")),t};RM.exports=aoe;RM.exports.default=aoe});var Aoe=_((ALt,uoe)=>{uoe.exports=coe;function coe(t,e){if(t&&e)return coe(t)(e);if(typeof t!="function")throw new TypeError("need wrapper function");return Object.keys(t).forEach(function(o){r[o]=t[o]}),r;function r(){for(var o=new Array(arguments.length),a=0;a<o.length;a++)o[a]=arguments[a];var n=t.apply(this,o),u=o[o.length-1];return typeof n=="function"&&n!==u&&Object.keys(u).forEach(function(A){n[A]=u[A]}),n}}});var NM=_((fLt,TM)=>{var foe=Aoe();TM.exports=foe(zP);TM.exports.strict=foe(poe);zP.proto=zP(function(){Object.defineProperty(Function.prototype,"once",{value:function(){return zP(this)},configurable:!0}),Object.defineProperty(Function.prototype,"onceStrict",{value:function(){return poe(this)},configurable:!0})});function zP(t){var e=function(){return e.called?e.value:(e.called=!0,e.value=t.apply(this,arguments))};return e.called=!1,e}function poe(t){var e=function(){if(e.called)throw new Error(e.onceError);return e.called=!0,e.value=t.apply(this,arguments)},r=t.name||"Function wrapped with `once`";return e.onceError=r+" shouldn't be called more than once",e.called=!1,e}});var LM=_((pLt,goe)=>{var ont=NM(),ant=function(){},lnt=function(t){return t.setHeader&&typeof t.abort=="function"},cnt=function(t){return t.stdio&&Array.isArray(t.stdio)&&t.stdio.length===3},hoe=function(t,e,r){if(typeof e=="function")return hoe(t,null,e);e||(e={}),r=ont(r||ant);var o=t._writableState,a=t._readableState,n=e.readable||e.readable!==!1&&t.readable,u=e.writable||e.writable!==!1&&t.writable,A=function(){t.writable||p()},p=function(){u=!1,n||r.call(t)},h=function(){n=!1,u||r.call(t)},E=function(C){r.call(t,C?new Error("exited with error code: "+C):null)},I=function(C){r.call(t,C)},v=function(){if(n&&!(a&&a.ended))return r.call(t,new Error("premature close"));if(u&&!(o&&o.ended))return r.call(t,new Error("premature close"))},x=function(){t.req.on("finish",p)};return lnt(t)?(t.on("complete",p),t.on("abort",v),t.req?x():t.on("request",x)):u&&!o&&(t.on("end",A),t.on("close",A)),cnt(t)&&t.on("exit",E),t.on("end",h),t.on("finish",p),e.error!==!1&&t.on("error",I),t.on("close",v),function(){t.removeListener("complete",p),t.removeListener("abort",v),t.removeListener("request",x),t.req&&t.req.removeListener("finish",p),t.removeListener("end",A),t.removeListener("close",A),t.removeListener("finish",p),t.removeListener("exit",E),t.removeListener("end",h),t.removeListener("error",I),t.removeListener("close",v)}};goe.exports=hoe});var yoe=_((hLt,moe)=>{var unt=NM(),Ant=LM(),OM=ve("fs"),p1=function(){},fnt=/^v?\.0/.test(process.version),XP=function(t){return typeof t=="function"},pnt=function(t){return!fnt||!OM?!1:(t instanceof(OM.ReadStream||p1)||t instanceof(OM.WriteStream||p1))&&XP(t.close)},hnt=function(t){return t.setHeader&&XP(t.abort)},gnt=function(t,e,r,o){o=unt(o);var a=!1;t.on("close",function(){a=!0}),Ant(t,{readable:e,writable:r},function(u){if(u)return o(u);a=!0,o()});var n=!1;return function(u){if(!a&&!n){if(n=!0,pnt(t))return t.close(p1);if(hnt(t))return t.abort();if(XP(t.destroy))return t.destroy();o(u||new Error("stream was destroyed"))}}},doe=function(t){t()},dnt=function(t,e){return t.pipe(e)},mnt=function(){var t=Array.prototype.slice.call(arguments),e=XP(t[t.length-1]||p1)&&t.pop()||p1;if(Array.isArray(t[0])&&(t=t[0]),t.length<2)throw new Error("pump requires two streams per minimum");var r,o=t.map(function(a,n){var u=n<t.length-1,A=n>0;return gnt(a,u,A,function(p){r||(r=p),p&&o.forEach(doe),!u&&(o.forEach(doe),e(r))})});return t.reduce(dnt)};moe.exports=mnt});var Coe=_((gLt,Eoe)=>{"use strict";var{PassThrough:ynt}=ve("stream");Eoe.exports=t=>{t={...t};let{array:e}=t,{encoding:r}=t,o=r==="buffer",a=!1;e?a=!(r||o):r=r||"utf8",o&&(r=null);let n=new ynt({objectMode:a});r&&n.setEncoding(r);let u=0,A=[];return n.on("data",p=>{A.push(p),a?u=A.length:u+=p.length}),n.getBufferedValue=()=>e?A:o?Buffer.concat(A,u):A.join(""),n.getBufferedLength=()=>u,n}});var woe=_((dLt,vE)=>{"use strict";var Ent=yoe(),Cnt=Coe(),ZP=class extends Error{constructor(){super("maxBuffer exceeded"),this.name="MaxBufferError"}};async function $P(t,e){if(!t)return Promise.reject(new Error("Expected a stream"));e={maxBuffer:1/0,...e};let{maxBuffer:r}=e,o;return await new Promise((a,n)=>{let u=A=>{A&&(A.bufferedData=o.getBufferedValue()),n(A)};o=Ent(t,Cnt(e),A=>{if(A){u(A);return}a()}),o.on("data",()=>{o.getBufferedLength()>r&&u(new ZP)})}),o.getBufferedValue()}vE.exports=$P;vE.exports.default=$P;vE.exports.buffer=(t,e)=>$P(t,{...e,encoding:"buffer"});vE.exports.array=(t,e)=>$P(t,{...e,array:!0});vE.exports.MaxBufferError=ZP});var Boe=_((yLt,Ioe)=>{"use strict";var wnt=new Set([200,203,204,206,300,301,404,405,410,414,501]),Int=new Set([200,203,204,300,301,302,303,307,308,404,405,410,414,501]),Bnt=new Set([500,502,503,504]),vnt={date:!0,connection:!0,"keep-alive":!0,"proxy-authenticate":!0,"proxy-authorization":!0,te:!0,trailer:!0,"transfer-encoding":!0,upgrade:!0},Dnt={"content-length":!0,"content-encoding":!0,"transfer-encoding":!0,"content-range":!0};function Sd(t){let e=parseInt(t,10);return isFinite(e)?e:0}function Snt(t){return t?Bnt.has(t.status):!0}function MM(t){let e={};if(!t)return e;let r=t.trim().split(/\s*,\s*/);for(let o of r){let[a,n]=o.split(/\s*=\s*/,2);e[a]=n===void 0?!0:n.replace(/^"|"$/g,"")}return e}function Pnt(t){let e=[];for(let r in t){let o=t[r];e.push(o===!0?r:r+"="+o)}if(!!e.length)return e.join(", ")}Ioe.exports=class{constructor(e,r,{shared:o,cacheHeuristic:a,immutableMinTimeToLive:n,ignoreCargoCult:u,_fromObject:A}={}){if(A){this._fromObject(A);return}if(!r||!r.headers)throw Error("Response headers missing");this._assertRequestHasHeaders(e),this._responseTime=this.now(),this._isShared=o!==!1,this._cacheHeuristic=a!==void 0?a:.1,this._immutableMinTtl=n!==void 0?n:24*3600*1e3,this._status="status"in r?r.status:200,this._resHeaders=r.headers,this._rescc=MM(r.headers["cache-control"]),this._method="method"in e?e.method:"GET",this._url=e.url,this._host=e.headers.host,this._noAuthorization=!e.headers.authorization,this._reqHeaders=r.headers.vary?e.headers:null,this._reqcc=MM(e.headers["cache-control"]),u&&"pre-check"in this._rescc&&"post-check"in this._rescc&&(delete this._rescc["pre-check"],delete this._rescc["post-check"],delete this._rescc["no-cache"],delete this._rescc["no-store"],delete this._rescc["must-revalidate"],this._resHeaders=Object.assign({},this._resHeaders,{"cache-control":Pnt(this._rescc)}),delete this._resHeaders.expires,delete this._resHeaders.pragma),r.headers["cache-control"]==null&&/no-cache/.test(r.headers.pragma)&&(this._rescc["no-cache"]=!0)}now(){return Date.now()}storable(){return!!(!this._reqcc["no-store"]&&(this._method==="GET"||this._method==="HEAD"||this._method==="POST"&&this._hasExplicitExpiration())&&Int.has(this._status)&&!this._rescc["no-store"]&&(!this._isShared||!this._rescc.private)&&(!this._isShared||this._noAuthorization||this._allowsStoringAuthenticated())&&(this._resHeaders.expires||this._rescc["max-age"]||this._isShared&&this._rescc["s-maxage"]||this._rescc.public||wnt.has(this._status)))}_hasExplicitExpiration(){return this._isShared&&this._rescc["s-maxage"]||this._rescc["max-age"]||this._resHeaders.expires}_assertRequestHasHeaders(e){if(!e||!e.headers)throw Error("Request headers missing")}satisfiesWithoutRevalidation(e){this._assertRequestHasHeaders(e);let r=MM(e.headers["cache-control"]);return r["no-cache"]||/no-cache/.test(e.headers.pragma)||r["max-age"]&&this.age()>r["max-age"]||r["min-fresh"]&&this.timeToLive()<1e3*r["min-fresh"]||this.stale()&&!(r["max-stale"]&&!this._rescc["must-revalidate"]&&(r["max-stale"]===!0||r["max-stale"]>this.age()-this.maxAge()))?!1:this._requestMatches(e,!1)}_requestMatches(e,r){return(!this._url||this._url===e.url)&&this._host===e.headers.host&&(!e.method||this._method===e.method||r&&e.method==="HEAD")&&this._varyMatches(e)}_allowsStoringAuthenticated(){return this._rescc["must-revalidate"]||this._rescc.public||this._rescc["s-maxage"]}_varyMatches(e){if(!this._resHeaders.vary)return!0;if(this._resHeaders.vary==="*")return!1;let r=this._resHeaders.vary.trim().toLowerCase().split(/\s*,\s*/);for(let o of r)if(e.headers[o]!==this._reqHeaders[o])return!1;return!0}_copyWithoutHopByHopHeaders(e){let r={};for(let o in e)vnt[o]||(r[o]=e[o]);if(e.connection){let o=e.connection.trim().split(/\s*,\s*/);for(let a of o)delete r[a]}if(r.warning){let o=r.warning.split(/,/).filter(a=>!/^\s*1[0-9][0-9]/.test(a));o.length?r.warning=o.join(",").trim():delete r.warning}return r}responseHeaders(){let e=this._copyWithoutHopByHopHeaders(this._resHeaders),r=this.age();return r>3600*24&&!this._hasExplicitExpiration()&&this.maxAge()>3600*24&&(e.warning=(e.warning?`${e.warning}, `:"")+'113 - "rfc7234 5.5.4"'),e.age=`${Math.round(r)}`,e.date=new Date(this.now()).toUTCString(),e}date(){let e=Date.parse(this._resHeaders.date);return isFinite(e)?e:this._responseTime}age(){let e=this._ageValue(),r=(this.now()-this._responseTime)/1e3;return e+r}_ageValue(){return Sd(this._resHeaders.age)}maxAge(){if(!this.storable()||this._rescc["no-cache"]||this._isShared&&this._resHeaders["set-cookie"]&&!this._rescc.public&&!this._rescc.immutable||this._resHeaders.vary==="*")return 0;if(this._isShared){if(this._rescc["proxy-revalidate"])return 0;if(this._rescc["s-maxage"])return Sd(this._rescc["s-maxage"])}if(this._rescc["max-age"])return Sd(this._rescc["max-age"]);let e=this._rescc.immutable?this._immutableMinTtl:0,r=this.date();if(this._resHeaders.expires){let o=Date.parse(this._resHeaders.expires);return Number.isNaN(o)||o<r?0:Math.max(e,(o-r)/1e3)}if(this._resHeaders["last-modified"]){let o=Date.parse(this._resHeaders["last-modified"]);if(isFinite(o)&&r>o)return Math.max(e,(r-o)/1e3*this._cacheHeuristic)}return e}timeToLive(){let e=this.maxAge()-this.age(),r=e+Sd(this._rescc["stale-if-error"]),o=e+Sd(this._rescc["stale-while-revalidate"]);return Math.max(0,e,r,o)*1e3}stale(){return this.maxAge()<=this.age()}_useStaleIfError(){return this.maxAge()+Sd(this._rescc["stale-if-error"])>this.age()}useStaleWhileRevalidate(){return this.maxAge()+Sd(this._rescc["stale-while-revalidate"])>this.age()}static fromObject(e){return new this(void 0,void 0,{_fromObject:e})}_fromObject(e){if(this._responseTime)throw Error("Reinitialized");if(!e||e.v!==1)throw Error("Invalid serialization");this._responseTime=e.t,this._isShared=e.sh,this._cacheHeuristic=e.ch,this._immutableMinTtl=e.imm!==void 0?e.imm:24*3600*1e3,this._status=e.st,this._resHeaders=e.resh,this._rescc=e.rescc,this._method=e.m,this._url=e.u,this._host=e.h,this._noAuthorization=e.a,this._reqHeaders=e.reqh,this._reqcc=e.reqcc}toObject(){return{v:1,t:this._responseTime,sh:this._isShared,ch:this._cacheHeuristic,imm:this._immutableMinTtl,st:this._status,resh:this._resHeaders,rescc:this._rescc,m:this._method,u:this._url,h:this._host,a:this._noAuthorization,reqh:this._reqHeaders,reqcc:this._reqcc}}revalidationHeaders(e){this._assertRequestHasHeaders(e);let r=this._copyWithoutHopByHopHeaders(e.headers);if(delete r["if-range"],!this._requestMatches(e,!0)||!this.storable())return delete r["if-none-match"],delete r["if-modified-since"],r;if(this._resHeaders.etag&&(r["if-none-match"]=r["if-none-match"]?`${r["if-none-match"]}, ${this._resHeaders.etag}`:this._resHeaders.etag),r["accept-ranges"]||r["if-match"]||r["if-unmodified-since"]||this._method&&this._method!="GET"){if(delete r["if-modified-since"],r["if-none-match"]){let a=r["if-none-match"].split(/,/).filter(n=>!/^\s*W\//.test(n));a.length?r["if-none-match"]=a.join(",").trim():delete r["if-none-match"]}}else this._resHeaders["last-modified"]&&!r["if-modified-since"]&&(r["if-modified-since"]=this._resHeaders["last-modified"]);return r}revalidatedPolicy(e,r){if(this._assertRequestHasHeaders(e),this._useStaleIfError()&&Snt(r))return{modified:!1,matches:!1,policy:this};if(!r||!r.headers)throw Error("Response headers missing");let o=!1;if(r.status!==void 0&&r.status!=304?o=!1:r.headers.etag&&!/^\s*W\//.test(r.headers.etag)?o=this._resHeaders.etag&&this._resHeaders.etag.replace(/^\s*W\//,"")===r.headers.etag:this._resHeaders.etag&&r.headers.etag?o=this._resHeaders.etag.replace(/^\s*W\//,"")===r.headers.etag.replace(/^\s*W\//,""):this._resHeaders["last-modified"]?o=this._resHeaders["last-modified"]===r.headers["last-modified"]:!this._resHeaders.etag&&!this._resHeaders["last-modified"]&&!r.headers.etag&&!r.headers["last-modified"]&&(o=!0),!o)return{policy:new this.constructor(e,r),modified:r.status!=304,matches:!1};let a={};for(let u in this._resHeaders)a[u]=u in r.headers&&!Dnt[u]?r.headers[u]:this._resHeaders[u];let n=Object.assign({},r,{status:this._status,method:this._method,headers:a});return{policy:new this.constructor(e,n,{shared:this._isShared,cacheHeuristic:this._cacheHeuristic,immutableMinTimeToLive:this._immutableMinTtl}),modified:!1,matches:!0}}}});var eb=_((ELt,voe)=>{"use strict";voe.exports=t=>{let e={};for(let[r,o]of Object.entries(t))e[r.toLowerCase()]=o;return e}});var Soe=_((CLt,Doe)=>{"use strict";var bnt=ve("stream").Readable,xnt=eb(),UM=class extends bnt{constructor(e,r,o,a){if(typeof e!="number")throw new TypeError("Argument `statusCode` should be a number");if(typeof r!="object")throw new TypeError("Argument `headers` should be an object");if(!(o instanceof Buffer))throw new TypeError("Argument `body` should be a buffer");if(typeof a!="string")throw new TypeError("Argument `url` should be a string");super(),this.statusCode=e,this.headers=xnt(r),this.body=o,this.url=a}_read(){this.push(this.body),this.push(null)}};Doe.exports=UM});var boe=_((wLt,Poe)=>{"use strict";var knt=["destroy","setTimeout","socket","headers","trailers","rawHeaders","statusCode","httpVersion","httpVersionMinor","httpVersionMajor","rawTrailers","statusMessage"];Poe.exports=(t,e)=>{let r=new Set(Object.keys(t).concat(knt));for(let o of r)o in e||(e[o]=typeof t[o]=="function"?t[o].bind(t):t[o])}});var koe=_((ILt,xoe)=>{"use strict";var Qnt=ve("stream").PassThrough,Fnt=boe(),Rnt=t=>{if(!(t&&t.pipe))throw new TypeError("Parameter `response` must be a response stream.");let e=new Qnt;return Fnt(t,e),t.pipe(e)};xoe.exports=Rnt});var Qoe=_(_M=>{_M.stringify=function t(e){if(typeof e>"u")return e;if(e&&Buffer.isBuffer(e))return JSON.stringify(":base64:"+e.toString("base64"));if(e&&e.toJSON&&(e=e.toJSON()),e&&typeof e=="object"){var r="",o=Array.isArray(e);r=o?"[":"{";var a=!0;for(var n in e){var u=typeof e[n]=="function"||!o&&typeof e[n]>"u";Object.hasOwnProperty.call(e,n)&&!u&&(a||(r+=","),a=!1,o?e[n]==null?r+="null":r+=t(e[n]):e[n]!==void 0&&(r+=t(n)+":"+t(e[n])))}return r+=o?"]":"}",r}else return typeof e=="string"?JSON.stringify(/^:/.test(e)?":"+e:e):typeof e>"u"?"null":JSON.stringify(e)};_M.parse=function(t){return JSON.parse(t,function(e,r){return typeof r=="string"?/^:base64:/.test(r)?Buffer.from(r.substring(8),"base64"):/^:/.test(r)?r.substring(1):r:r})}});var Toe=_((vLt,Roe)=>{"use strict";var Tnt=ve("events"),Foe=Qoe(),Nnt=t=>{let e={redis:"@keyv/redis",mongodb:"@keyv/mongo",mongo:"@keyv/mongo",sqlite:"@keyv/sqlite",postgresql:"@keyv/postgres",postgres:"@keyv/postgres",mysql:"@keyv/mysql"};if(t.adapter||t.uri){let r=t.adapter||/^[^:]*/.exec(t.uri)[0];return new(ve(e[r]))(t)}return new Map},HM=class extends Tnt{constructor(e,r){if(super(),this.opts=Object.assign({namespace:"keyv",serialize:Foe.stringify,deserialize:Foe.parse},typeof e=="string"?{uri:e}:e,r),!this.opts.store){let o=Object.assign({},this.opts);this.opts.store=Nnt(o)}typeof this.opts.store.on=="function"&&this.opts.store.on("error",o=>this.emit("error",o)),this.opts.store.namespace=this.opts.namespace}_getKeyPrefix(e){return`${this.opts.namespace}:${e}`}get(e,r){e=this._getKeyPrefix(e);let{store:o}=this.opts;return Promise.resolve().then(()=>o.get(e)).then(a=>typeof a=="string"?this.opts.deserialize(a):a).then(a=>{if(a!==void 0){if(typeof a.expires=="number"&&Date.now()>a.expires){this.delete(e);return}return r&&r.raw?a:a.value}})}set(e,r,o){e=this._getKeyPrefix(e),typeof o>"u"&&(o=this.opts.ttl),o===0&&(o=void 0);let{store:a}=this.opts;return Promise.resolve().then(()=>{let n=typeof o=="number"?Date.now()+o:null;return r={value:r,expires:n},this.opts.serialize(r)}).then(n=>a.set(e,n,o)).then(()=>!0)}delete(e){e=this._getKeyPrefix(e);let{store:r}=this.opts;return Promise.resolve().then(()=>r.delete(e))}clear(){let{store:e}=this.opts;return Promise.resolve().then(()=>e.clear())}};Roe.exports=HM});var Ooe=_((SLt,Loe)=>{"use strict";var Lnt=ve("events"),tb=ve("url"),Ont=loe(),Mnt=woe(),jM=Boe(),Noe=Soe(),Unt=eb(),_nt=koe(),Hnt=Toe(),jc=class{constructor(e,r){if(typeof e!="function")throw new TypeError("Parameter `request` must be a function");return this.cache=new Hnt({uri:typeof r=="string"&&r,store:typeof r!="string"&&r,namespace:"cacheable-request"}),this.createCacheableRequest(e)}createCacheableRequest(e){return(r,o)=>{let a;if(typeof r=="string")a=GM(tb.parse(r)),r={};else if(r instanceof tb.URL)a=GM(tb.parse(r.toString())),r={};else{let[I,...v]=(r.path||"").split("?"),x=v.length>0?`?${v.join("?")}`:"";a=GM({...r,pathname:I,search:x})}r={headers:{},method:"GET",cache:!0,strictTtl:!1,automaticFailover:!1,...r,...jnt(a)},r.headers=Unt(r.headers);let n=new Lnt,u=Ont(tb.format(a),{stripWWW:!1,removeTrailingSlash:!1,stripAuthentication:!1}),A=`${r.method}:${u}`,p=!1,h=!1,E=I=>{h=!0;let v=!1,x,C=new Promise(L=>{x=()=>{v||(v=!0,L())}}),R=L=>{if(p&&!I.forceRefresh){L.status=L.statusCode;let J=jM.fromObject(p.cachePolicy).revalidatedPolicy(I,L);if(!J.modified){let te=J.policy.responseHeaders();L=new Noe(p.statusCode,te,p.body,p.url),L.cachePolicy=J.policy,L.fromCache=!0}}L.fromCache||(L.cachePolicy=new jM(I,L,I),L.fromCache=!1);let U;I.cache&&L.cachePolicy.storable()?(U=_nt(L),(async()=>{try{let J=Mnt.buffer(L);if(await Promise.race([C,new Promise(ce=>L.once("end",ce))]),v)return;let te=await J,ae={cachePolicy:L.cachePolicy.toObject(),url:L.url,statusCode:L.fromCache?p.statusCode:L.statusCode,body:te},fe=I.strictTtl?L.cachePolicy.timeToLive():void 0;I.maxTtl&&(fe=fe?Math.min(fe,I.maxTtl):I.maxTtl),await this.cache.set(A,ae,fe)}catch(J){n.emit("error",new jc.CacheError(J))}})()):I.cache&&p&&(async()=>{try{await this.cache.delete(A)}catch(J){n.emit("error",new jc.CacheError(J))}})(),n.emit("response",U||L),typeof o=="function"&&o(U||L)};try{let L=e(I,R);L.once("error",x),L.once("abort",x),n.emit("request",L)}catch(L){n.emit("error",new jc.RequestError(L))}};return(async()=>{let I=async x=>{await Promise.resolve();let C=x.cache?await this.cache.get(A):void 0;if(typeof C>"u")return E(x);let R=jM.fromObject(C.cachePolicy);if(R.satisfiesWithoutRevalidation(x)&&!x.forceRefresh){let L=R.responseHeaders(),U=new Noe(C.statusCode,L,C.body,C.url);U.cachePolicy=R,U.fromCache=!0,n.emit("response",U),typeof o=="function"&&o(U)}else p=C,x.headers=R.revalidationHeaders(x),E(x)},v=x=>n.emit("error",new jc.CacheError(x));this.cache.once("error",v),n.on("response",()=>this.cache.removeListener("error",v));try{await I(r)}catch(x){r.automaticFailover&&!h&&E(r),n.emit("error",new jc.CacheError(x))}})(),n}}};function jnt(t){let e={...t};return e.path=`${t.pathname||"/"}${t.search||""}`,delete e.pathname,delete e.search,e}function GM(t){return{protocol:t.protocol,auth:t.auth,hostname:t.hostname||t.host||"localhost",port:t.port,pathname:t.pathname,search:t.search}}jc.RequestError=class extends Error{constructor(t){super(t.message),this.name="RequestError",Object.assign(this,t)}};jc.CacheError=class extends Error{constructor(t){super(t.message),this.name="CacheError",Object.assign(this,t)}};Loe.exports=jc});var Uoe=_((xLt,Moe)=>{"use strict";var Gnt=["aborted","complete","headers","httpVersion","httpVersionMinor","httpVersionMajor","method","rawHeaders","rawTrailers","setTimeout","socket","statusCode","statusMessage","trailers","url"];Moe.exports=(t,e)=>{if(e._readableState.autoDestroy)throw new Error("The second stream must have the `autoDestroy` option set to `false`");let r=new Set(Object.keys(t).concat(Gnt)),o={};for(let a of r)a in e||(o[a]={get(){let n=t[a];return typeof n=="function"?n.bind(t):n},set(n){t[a]=n},enumerable:!0,configurable:!1});return Object.defineProperties(e,o),t.once("aborted",()=>{e.destroy(),e.emit("aborted")}),t.once("close",()=>{t.complete&&e.readable?e.once("end",()=>{e.emit("close")}):e.emit("close")}),e}});var Hoe=_((kLt,_oe)=>{"use strict";var{Transform:qnt,PassThrough:Ynt}=ve("stream"),qM=ve("zlib"),Wnt=Uoe();_oe.exports=t=>{let e=(t.headers["content-encoding"]||"").toLowerCase();if(!["gzip","deflate","br"].includes(e))return t;let r=e==="br";if(r&&typeof qM.createBrotliDecompress!="function")return t.destroy(new Error("Brotli is not supported on Node.js < 12")),t;let o=!0,a=new qnt({transform(A,p,h){o=!1,h(null,A)},flush(A){A()}}),n=new Ynt({autoDestroy:!1,destroy(A,p){t.destroy(),p(A)}}),u=r?qM.createBrotliDecompress():qM.createUnzip();return u.once("error",A=>{if(o&&!t.readable){n.end();return}n.destroy(A)}),Wnt(t,n),t.pipe(a).pipe(u).pipe(n),n}});var WM=_((QLt,joe)=>{"use strict";var YM=class{constructor(e={}){if(!(e.maxSize&&e.maxSize>0))throw new TypeError("`maxSize` must be a number greater than 0");this.maxSize=e.maxSize,this.onEviction=e.onEviction,this.cache=new Map,this.oldCache=new Map,this._size=0}_set(e,r){if(this.cache.set(e,r),this._size++,this._size>=this.maxSize){if(this._size=0,typeof this.onEviction=="function")for(let[o,a]of this.oldCache.entries())this.onEviction(o,a);this.oldCache=this.cache,this.cache=new Map}}get(e){if(this.cache.has(e))return this.cache.get(e);if(this.oldCache.has(e)){let r=this.oldCache.get(e);return this.oldCache.delete(e),this._set(e,r),r}}set(e,r){return this.cache.has(e)?this.cache.set(e,r):this._set(e,r),this}has(e){return this.cache.has(e)||this.oldCache.has(e)}peek(e){if(this.cache.has(e))return this.cache.get(e);if(this.oldCache.has(e))return this.oldCache.get(e)}delete(e){let r=this.cache.delete(e);return r&&this._size--,this.oldCache.delete(e)||r}clear(){this.cache.clear(),this.oldCache.clear(),this._size=0}*keys(){for(let[e]of this)yield e}*values(){for(let[,e]of this)yield e}*[Symbol.iterator](){for(let e of this.cache)yield e;for(let e of this.oldCache){let[r]=e;this.cache.has(r)||(yield e)}}get size(){let e=0;for(let r of this.oldCache.keys())this.cache.has(r)||e++;return Math.min(this._size+e,this.maxSize)}};joe.exports=YM});var VM=_((FLt,Woe)=>{"use strict";var Knt=ve("events"),Vnt=ve("tls"),Jnt=ve("http2"),znt=WM(),ea=Symbol("currentStreamsCount"),Goe=Symbol("request"),Wl=Symbol("cachedOriginSet"),DE=Symbol("gracefullyClosing"),Xnt=["maxDeflateDynamicTableSize","maxSessionMemory","maxHeaderListPairs","maxOutstandingPings","maxReservedRemoteStreams","maxSendHeaderBlockLength","paddingStrategy","localAddress","path","rejectUnauthorized","minDHSize","ca","cert","clientCertEngine","ciphers","key","pfx","servername","minVersion","maxVersion","secureProtocol","crl","honorCipherOrder","ecdhCurve","dhparam","secureOptions","sessionIdContext"],Znt=(t,e,r)=>{let o=0,a=t.length;for(;o<a;){let n=o+a>>>1;r(t[n],e)?o=n+1:a=n}return o},$nt=(t,e)=>t.remoteSettings.maxConcurrentStreams>e.remoteSettings.maxConcurrentStreams,KM=(t,e)=>{for(let r of t)r[Wl].length<e[Wl].length&&r[Wl].every(o=>e[Wl].includes(o))&&r[ea]+e[ea]<=e.remoteSettings.maxConcurrentStreams&&Yoe(r)},eit=(t,e)=>{for(let r of t)e[Wl].length<r[Wl].length&&e[Wl].every(o=>r[Wl].includes(o))&&e[ea]+r[ea]<=r.remoteSettings.maxConcurrentStreams&&Yoe(e)},qoe=({agent:t,isFree:e})=>{let r={};for(let o in t.sessions){let n=t.sessions[o].filter(u=>{let A=u[tA.kCurrentStreamsCount]<u.remoteSettings.maxConcurrentStreams;return e?A:!A});n.length!==0&&(r[o]=n)}return r},Yoe=t=>{t[DE]=!0,t[ea]===0&&t.close()},tA=class extends Knt{constructor({timeout:e=6e4,maxSessions:r=1/0,maxFreeSessions:o=10,maxCachedTlsSessions:a=100}={}){super(),this.sessions={},this.queue={},this.timeout=e,this.maxSessions=r,this.maxFreeSessions=o,this._freeSessionsCount=0,this._sessionsCount=0,this.settings={enablePush:!1},this.tlsSessionCache=new znt({maxSize:a})}static normalizeOrigin(e,r){return typeof e=="string"&&(e=new URL(e)),r&&e.hostname!==r&&(e.hostname=r),e.origin}normalizeOptions(e){let r="";if(e)for(let o of Xnt)e[o]&&(r+=`:${e[o]}`);return r}_tryToCreateNewSession(e,r){if(!(e in this.queue)||!(r in this.queue[e]))return;let o=this.queue[e][r];this._sessionsCount<this.maxSessions&&!o.completed&&(o.completed=!0,o())}getSession(e,r,o){return new Promise((a,n)=>{Array.isArray(o)?(o=[...o],a()):o=[{resolve:a,reject:n}];let u=this.normalizeOptions(r),A=tA.normalizeOrigin(e,r&&r.servername);if(A===void 0){for(let{reject:E}of o)E(new TypeError("The `origin` argument needs to be a string or an URL object"));return}if(u in this.sessions){let E=this.sessions[u],I=-1,v=-1,x;for(let C of E){let R=C.remoteSettings.maxConcurrentStreams;if(R<I)break;if(C[Wl].includes(A)){let L=C[ea];if(L>=R||C[DE]||C.destroyed)continue;x||(I=R),L>v&&(x=C,v=L)}}if(x){if(o.length!==1){for(let{reject:C}of o){let R=new Error(`Expected the length of listeners to be 1, got ${o.length}.
+Please report this to https://github.com/szmarczak/http2-wrapper/`);C(R)}return}o[0].resolve(x);return}}if(u in this.queue){if(A in this.queue[u]){this.queue[u][A].listeners.push(...o),this._tryToCreateNewSession(u,A);return}}else this.queue[u]={};let p=()=>{u in this.queue&&this.queue[u][A]===h&&(delete this.queue[u][A],Object.keys(this.queue[u]).length===0&&delete this.queue[u])},h=()=>{let E=`${A}:${u}`,I=!1;try{let v=Jnt.connect(e,{createConnection:this.createConnection,settings:this.settings,session:this.tlsSessionCache.get(E),...r});v[ea]=0,v[DE]=!1;let x=()=>v[ea]<v.remoteSettings.maxConcurrentStreams,C=!0;v.socket.once("session",L=>{this.tlsSessionCache.set(E,L)}),v.once("error",L=>{for(let{reject:U}of o)U(L);this.tlsSessionCache.delete(E)}),v.setTimeout(this.timeout,()=>{v.destroy()}),v.once("close",()=>{if(I){C&&this._freeSessionsCount--,this._sessionsCount--;let L=this.sessions[u];L.splice(L.indexOf(v),1),L.length===0&&delete this.sessions[u]}else{let L=new Error("Session closed without receiving a SETTINGS frame");L.code="HTTP2WRAPPER_NOSETTINGS";for(let{reject:U}of o)U(L);p()}this._tryToCreateNewSession(u,A)});let R=()=>{if(!(!(u in this.queue)||!x())){for(let L of v[Wl])if(L in this.queue[u]){let{listeners:U}=this.queue[u][L];for(;U.length!==0&&x();)U.shift().resolve(v);let J=this.queue[u];if(J[L].listeners.length===0&&(delete J[L],Object.keys(J).length===0)){delete this.queue[u];break}if(!x())break}}};v.on("origin",()=>{v[Wl]=v.originSet,x()&&(R(),KM(this.sessions[u],v))}),v.once("remoteSettings",()=>{if(v.ref(),v.unref(),this._sessionsCount++,h.destroyed){let L=new Error("Agent has been destroyed");for(let U of o)U.reject(L);v.destroy();return}v[Wl]=v.originSet;{let L=this.sessions;if(u in L){let U=L[u];U.splice(Znt(U,v,$nt),0,v)}else L[u]=[v]}this._freeSessionsCount+=1,I=!0,this.emit("session",v),R(),p(),v[ea]===0&&this._freeSessionsCount>this.maxFreeSessions&&v.close(),o.length!==0&&(this.getSession(A,r,o),o.length=0),v.on("remoteSettings",()=>{R(),KM(this.sessions[u],v)})}),v[Goe]=v.request,v.request=(L,U)=>{if(v[DE])throw new Error("The session is gracefully closing. No new streams are allowed.");let J=v[Goe](L,U);return v.ref(),++v[ea],v[ea]===v.remoteSettings.maxConcurrentStreams&&this._freeSessionsCount--,J.once("close",()=>{if(C=x(),--v[ea],!v.destroyed&&!v.closed&&(eit(this.sessions[u],v),x()&&!v.closed)){C||(this._freeSessionsCount++,C=!0);let te=v[ea]===0;te&&v.unref(),te&&(this._freeSessionsCount>this.maxFreeSessions||v[DE])?v.close():(KM(this.sessions[u],v),R())}}),J}}catch(v){for(let x of o)x.reject(v);p()}};h.listeners=o,h.completed=!1,h.destroyed=!1,this.queue[u][A]=h,this._tryToCreateNewSession(u,A)})}request(e,r,o,a){return new Promise((n,u)=>{this.getSession(e,r,[{reject:u,resolve:A=>{try{n(A.request(o,a))}catch(p){u(p)}}}])})}createConnection(e,r){return tA.connect(e,r)}static connect(e,r){r.ALPNProtocols=["h2"];let o=e.port||443,a=e.hostname||e.host;return typeof r.servername>"u"&&(r.servername=a),Vnt.connect(o,a,r)}closeFreeSessions(){for(let e of Object.values(this.sessions))for(let r of e)r[ea]===0&&r.close()}destroy(e){for(let r of Object.values(this.sessions))for(let o of r)o.destroy(e);for(let r of Object.values(this.queue))for(let o of Object.values(r))o.destroyed=!0;this.queue={}}get freeSessions(){return qoe({agent:this,isFree:!0})}get busySessions(){return qoe({agent:this,isFree:!1})}};tA.kCurrentStreamsCount=ea;tA.kGracefullyClosing=DE;Woe.exports={Agent:tA,globalAgent:new tA}});var zM=_((RLt,Koe)=>{"use strict";var{Readable:tit}=ve("stream"),JM=class extends tit{constructor(e,r){super({highWaterMark:r,autoDestroy:!1}),this.statusCode=null,this.statusMessage="",this.httpVersion="2.0",this.httpVersionMajor=2,this.httpVersionMinor=0,this.headers={},this.trailers={},this.req=null,this.aborted=!1,this.complete=!1,this.upgrade=null,this.rawHeaders=[],this.rawTrailers=[],this.socket=e,this.connection=e,this._dumped=!1}_destroy(e){this.req._request.destroy(e)}setTimeout(e,r){return this.req.setTimeout(e,r),this}_dump(){this._dumped||(this._dumped=!0,this.removeAllListeners("data"),this.resume())}_read(){this.req&&this.req._request.resume()}};Koe.exports=JM});var XM=_((TLt,Voe)=>{"use strict";Voe.exports=t=>{let e={protocol:t.protocol,hostname:typeof t.hostname=="string"&&t.hostname.startsWith("[")?t.hostname.slice(1,-1):t.hostname,host:t.host,hash:t.hash,search:t.search,pathname:t.pathname,href:t.href,path:`${t.pathname||""}${t.search||""}`};return typeof t.port=="string"&&t.port.length!==0&&(e.port=Number(t.port)),(t.username||t.password)&&(e.auth=`${t.username||""}:${t.password||""}`),e}});var zoe=_((NLt,Joe)=>{"use strict";Joe.exports=(t,e,r)=>{for(let o of r)t.on(o,(...a)=>e.emit(o,...a))}});var Zoe=_((LLt,Xoe)=>{"use strict";Xoe.exports=t=>{switch(t){case":method":case":scheme":case":authority":case":path":return!0;default:return!1}}});var eae=_((MLt,$oe)=>{"use strict";var SE=(t,e,r)=>{$oe.exports[e]=class extends t{constructor(...a){super(typeof r=="string"?r:r(a)),this.name=`${super.name} [${e}]`,this.code=e}}};SE(TypeError,"ERR_INVALID_ARG_TYPE",t=>{let e=t[0].includes(".")?"property":"argument",r=t[1],o=Array.isArray(r);return o&&(r=`${r.slice(0,-1).join(", ")} or ${r.slice(-1)}`),`The "${t[0]}" ${e} must be ${o?"one of":"of"} type ${r}. Received ${typeof t[2]}`});SE(TypeError,"ERR_INVALID_PROTOCOL",t=>`Protocol "${t[0]}" not supported. Expected "${t[1]}"`);SE(Error,"ERR_HTTP_HEADERS_SENT",t=>`Cannot ${t[0]} headers after they are sent to the client`);SE(TypeError,"ERR_INVALID_HTTP_TOKEN",t=>`${t[0]} must be a valid HTTP token [${t[1]}]`);SE(TypeError,"ERR_HTTP_INVALID_HEADER_VALUE",t=>`Invalid value "${t[0]} for header "${t[1]}"`);SE(TypeError,"ERR_INVALID_CHAR",t=>`Invalid character in ${t[0]} [${t[1]}]`)});var r4=_((ULt,aae)=>{"use strict";var rit=ve("http2"),{Writable:nit}=ve("stream"),{Agent:tae,globalAgent:iit}=VM(),sit=zM(),oit=XM(),ait=zoe(),lit=Zoe(),{ERR_INVALID_ARG_TYPE:ZM,ERR_INVALID_PROTOCOL:cit,ERR_HTTP_HEADERS_SENT:rae,ERR_INVALID_HTTP_TOKEN:uit,ERR_HTTP_INVALID_HEADER_VALUE:Ait,ERR_INVALID_CHAR:fit}=eae(),{HTTP2_HEADER_STATUS:nae,HTTP2_HEADER_METHOD:iae,HTTP2_HEADER_PATH:sae,HTTP2_METHOD_CONNECT:pit}=rit.constants,Qo=Symbol("headers"),$M=Symbol("origin"),e4=Symbol("session"),oae=Symbol("options"),rb=Symbol("flushedHeaders"),h1=Symbol("jobs"),hit=/^[\^`\-\w!#$%&*+.|~]+$/,git=/[^\t\u0020-\u007E\u0080-\u00FF]/,t4=class extends nit{constructor(e,r,o){super({autoDestroy:!1});let a=typeof e=="string"||e instanceof URL;if(a&&(e=oit(e instanceof URL?e:new URL(e))),typeof r=="function"||r===void 0?(o=r,r=a?e:{...e}):r={...e,...r},r.h2session)this[e4]=r.h2session;else if(r.agent===!1)this.agent=new tae({maxFreeSessions:0});else if(typeof r.agent>"u"||r.agent===null)typeof r.createConnection=="function"?(this.agent=new tae({maxFreeSessions:0}),this.agent.createConnection=r.createConnection):this.agent=iit;else if(typeof r.agent.request=="function")this.agent=r.agent;else throw new ZM("options.agent",["Agent-like Object","undefined","false"],r.agent);if(r.protocol&&r.protocol!=="https:")throw new cit(r.protocol,"https:");let n=r.port||r.defaultPort||this.agent&&this.agent.defaultPort||443,u=r.hostname||r.host||"localhost";delete r.hostname,delete r.host,delete r.port;let{timeout:A}=r;if(r.timeout=void 0,this[Qo]=Object.create(null),this[h1]=[],this.socket=null,this.connection=null,this.method=r.method||"GET",this.path=r.path,this.res=null,this.aborted=!1,this.reusedSocket=!1,r.headers)for(let[p,h]of Object.entries(r.headers))this.setHeader(p,h);r.auth&&!("authorization"in this[Qo])&&(this[Qo].authorization="Basic "+Buffer.from(r.auth).toString("base64")),r.session=r.tlsSession,r.path=r.socketPath,this[oae]=r,n===443?(this[$M]=`https://${u}`,":authority"in this[Qo]||(this[Qo][":authority"]=u)):(this[$M]=`https://${u}:${n}`,":authority"in this[Qo]||(this[Qo][":authority"]=`${u}:${n}`)),A&&this.setTimeout(A),o&&this.once("response",o),this[rb]=!1}get method(){return this[Qo][iae]}set method(e){e&&(this[Qo][iae]=e.toUpperCase())}get path(){return this[Qo][sae]}set path(e){e&&(this[Qo][sae]=e)}get _mustNotHaveABody(){return this.method==="GET"||this.method==="HEAD"||this.method==="DELETE"}_write(e,r,o){if(this._mustNotHaveABody){o(new Error("The GET, HEAD and DELETE methods must NOT have a body"));return}this.flushHeaders();let a=()=>this._request.write(e,r,o);this._request?a():this[h1].push(a)}_final(e){if(this.destroyed)return;this.flushHeaders();let r=()=>{if(this._mustNotHaveABody){e();return}this._request.end(e)};this._request?r():this[h1].push(r)}abort(){this.res&&this.res.complete||(this.aborted||process.nextTick(()=>this.emit("abort")),this.aborted=!0,this.destroy())}_destroy(e,r){this.res&&this.res._dump(),this._request&&this._request.destroy(),r(e)}async flushHeaders(){if(this[rb]||this.destroyed)return;this[rb]=!0;let e=this.method===pit,r=o=>{if(this._request=o,this.destroyed){o.destroy();return}e||ait(o,this,["timeout","continue","close","error"]);let a=u=>(...A)=>{!this.writable&&!this.destroyed?u(...A):this.once("finish",()=>{u(...A)})};o.once("response",a((u,A,p)=>{let h=new sit(this.socket,o.readableHighWaterMark);this.res=h,h.req=this,h.statusCode=u[nae],h.headers=u,h.rawHeaders=p,h.once("end",()=>{this.aborted?(h.aborted=!0,h.emit("aborted")):(h.complete=!0,h.socket=null,h.connection=null)}),e?(h.upgrade=!0,this.emit("connect",h,o,Buffer.alloc(0))?this.emit("close"):o.destroy()):(o.on("data",E=>{!h._dumped&&!h.push(E)&&o.pause()}),o.once("end",()=>{h.push(null)}),this.emit("response",h)||h._dump())})),o.once("headers",a(u=>this.emit("information",{statusCode:u[nae]}))),o.once("trailers",a((u,A,p)=>{let{res:h}=this;h.trailers=u,h.rawTrailers=p}));let{socket:n}=o.session;this.socket=n,this.connection=n;for(let u of this[h1])u();this.emit("socket",this.socket)};if(this[e4])try{r(this[e4].request(this[Qo]))}catch(o){this.emit("error",o)}else{this.reusedSocket=!0;try{r(await this.agent.request(this[$M],this[oae],this[Qo]))}catch(o){this.emit("error",o)}}}getHeader(e){if(typeof e!="string")throw new ZM("name","string",e);return this[Qo][e.toLowerCase()]}get headersSent(){return this[rb]}removeHeader(e){if(typeof e!="string")throw new ZM("name","string",e);if(this.headersSent)throw new rae("remove");delete this[Qo][e.toLowerCase()]}setHeader(e,r){if(this.headersSent)throw new rae("set");if(typeof e!="string"||!hit.test(e)&&!lit(e))throw new uit("Header name",e);if(typeof r>"u")throw new Ait(r,e);if(git.test(r))throw new fit("header content",e);this[Qo][e.toLowerCase()]=r}setNoDelay(){}setSocketKeepAlive(){}setTimeout(e,r){let o=()=>this._request.setTimeout(e,r);return this._request?o():this[h1].push(o),this}get maxHeadersCount(){if(!this.destroyed&&this._request)return this._request.session.localSettings.maxHeaderListSize}set maxHeadersCount(e){}};aae.exports=t4});var cae=_((_Lt,lae)=>{"use strict";var dit=ve("tls");lae.exports=(t={})=>new Promise((e,r)=>{let o=dit.connect(t,()=>{t.resolveSocket?(o.off("error",r),e({alpnProtocol:o.alpnProtocol,socket:o})):(o.destroy(),e({alpnProtocol:o.alpnProtocol}))});o.on("error",r)})});var Aae=_((HLt,uae)=>{"use strict";var mit=ve("net");uae.exports=t=>{let e=t.host,r=t.headers&&t.headers.host;return r&&(r.startsWith("[")?r.indexOf("]")===-1?e=r:e=r.slice(1,-1):e=r.split(":",1)[0]),mit.isIP(e)?"":e}});var hae=_((jLt,i4)=>{"use strict";var fae=ve("http"),n4=ve("https"),yit=cae(),Eit=WM(),Cit=r4(),wit=Aae(),Iit=XM(),nb=new Eit({maxSize:100}),g1=new Map,pae=(t,e,r)=>{e._httpMessage={shouldKeepAlive:!0};let o=()=>{t.emit("free",e,r)};e.on("free",o);let a=()=>{t.removeSocket(e,r)};e.on("close",a);let n=()=>{t.removeSocket(e,r),e.off("close",a),e.off("free",o),e.off("agentRemove",n)};e.on("agentRemove",n),t.emit("free",e,r)},Bit=async t=>{let e=`${t.host}:${t.port}:${t.ALPNProtocols.sort()}`;if(!nb.has(e)){if(g1.has(e))return(await g1.get(e)).alpnProtocol;let{path:r,agent:o}=t;t.path=t.socketPath;let a=yit(t);g1.set(e,a);try{let{socket:n,alpnProtocol:u}=await a;if(nb.set(e,u),t.path=r,u==="h2")n.destroy();else{let{globalAgent:A}=n4,p=n4.Agent.prototype.createConnection;o?o.createConnection===p?pae(o,n,t):n.destroy():A.createConnection===p?pae(A,n,t):n.destroy()}return g1.delete(e),u}catch(n){throw g1.delete(e),n}}return nb.get(e)};i4.exports=async(t,e,r)=>{if((typeof t=="string"||t instanceof URL)&&(t=Iit(new URL(t))),typeof e=="function"&&(r=e,e=void 0),e={ALPNProtocols:["h2","http/1.1"],...t,...e,resolveSocket:!0},!Array.isArray(e.ALPNProtocols)||e.ALPNProtocols.length===0)throw new Error("The `ALPNProtocols` option must be an Array with at least one entry");e.protocol=e.protocol||"https:";let o=e.protocol==="https:";e.host=e.hostname||e.host||"localhost",e.session=e.tlsSession,e.servername=e.servername||wit(e),e.port=e.port||(o?443:80),e._defaultAgent=o?n4.globalAgent:fae.globalAgent;let a=e.agent;if(a){if(a.addRequest)throw new Error("The `options.agent` object can contain only `http`, `https` or `http2` properties");e.agent=a[o?"https":"http"]}return o&&await Bit(e)==="h2"?(a&&(e.agent=a.http2),new Cit(e,r)):fae.request(e,r)};i4.exports.protocolCache=nb});var dae=_((GLt,gae)=>{"use strict";var vit=ve("http2"),Dit=VM(),s4=r4(),Sit=zM(),Pit=hae(),bit=(t,e,r)=>new s4(t,e,r),xit=(t,e,r)=>{let o=new s4(t,e,r);return o.end(),o};gae.exports={...vit,ClientRequest:s4,IncomingMessage:Sit,...Dit,request:bit,get:xit,auto:Pit}});var a4=_(o4=>{"use strict";Object.defineProperty(o4,"__esModule",{value:!0});var mae=Tf();o4.default=t=>mae.default.nodeStream(t)&&mae.default.function_(t.getBoundary)});var wae=_(l4=>{"use strict";Object.defineProperty(l4,"__esModule",{value:!0});var Eae=ve("fs"),Cae=ve("util"),yae=Tf(),kit=a4(),Qit=Cae.promisify(Eae.stat);l4.default=async(t,e)=>{if(e&&"content-length"in e)return Number(e["content-length"]);if(!t)return 0;if(yae.default.string(t))return Buffer.byteLength(t);if(yae.default.buffer(t))return t.length;if(kit.default(t))return Cae.promisify(t.getLength.bind(t))();if(t instanceof Eae.ReadStream){let{size:r}=await Qit(t.path);return r===0?void 0:r}}});var u4=_(c4=>{"use strict";Object.defineProperty(c4,"__esModule",{value:!0});function Fit(t,e,r){let o={};for(let a of r)o[a]=(...n)=>{e.emit(a,...n)},t.on(a,o[a]);return()=>{for(let a of r)t.off(a,o[a])}}c4.default=Fit});var Iae=_(A4=>{"use strict";Object.defineProperty(A4,"__esModule",{value:!0});A4.default=()=>{let t=[];return{once(e,r,o){e.once(r,o),t.push({origin:e,event:r,fn:o})},unhandleAll(){for(let e of t){let{origin:r,event:o,fn:a}=e;r.removeListener(o,a)}t.length=0}}}});var vae=_(d1=>{"use strict";Object.defineProperty(d1,"__esModule",{value:!0});d1.TimeoutError=void 0;var Rit=ve("net"),Tit=Iae(),Bae=Symbol("reentry"),Nit=()=>{},ib=class extends Error{constructor(e,r){super(`Timeout awaiting '${r}' for ${e}ms`),this.event=r,this.name="TimeoutError",this.code="ETIMEDOUT"}};d1.TimeoutError=ib;d1.default=(t,e,r)=>{if(Bae in t)return Nit;t[Bae]=!0;let o=[],{once:a,unhandleAll:n}=Tit.default(),u=(I,v,x)=>{var C;let R=setTimeout(v,I,I,x);(C=R.unref)===null||C===void 0||C.call(R);let L=()=>{clearTimeout(R)};return o.push(L),L},{host:A,hostname:p}=r,h=(I,v)=>{t.destroy(new ib(I,v))},E=()=>{for(let I of o)I();n()};if(t.once("error",I=>{if(E(),t.listenerCount("error")===0)throw I}),t.once("close",E),a(t,"response",I=>{a(I,"end",E)}),typeof e.request<"u"&&u(e.request,h,"request"),typeof e.socket<"u"){let I=()=>{h(e.socket,"socket")};t.setTimeout(e.socket,I),o.push(()=>{t.removeListener("timeout",I)})}return a(t,"socket",I=>{var v;let{socketPath:x}=t;if(I.connecting){let C=Boolean(x??Rit.isIP((v=p??A)!==null&&v!==void 0?v:"")!==0);if(typeof e.lookup<"u"&&!C&&typeof I.address().address>"u"){let R=u(e.lookup,h,"lookup");a(I,"lookup",R)}if(typeof e.connect<"u"){let R=()=>u(e.connect,h,"connect");C?a(I,"connect",R()):a(I,"lookup",L=>{L===null&&a(I,"connect",R())})}typeof e.secureConnect<"u"&&r.protocol==="https:"&&a(I,"connect",()=>{let R=u(e.secureConnect,h,"secureConnect");a(I,"secureConnect",R)})}if(typeof e.send<"u"){let C=()=>u(e.send,h,"send");I.connecting?a(I,"connect",()=>{a(t,"upload-complete",C())}):a(t,"upload-complete",C())}}),typeof e.response<"u"&&a(t,"upload-complete",()=>{let I=u(e.response,h,"response");a(t,"response",I)}),E}});var Sae=_(f4=>{"use strict";Object.defineProperty(f4,"__esModule",{value:!0});var Dae=Tf();f4.default=t=>{t=t;let e={protocol:t.protocol,hostname:Dae.default.string(t.hostname)&&t.hostname.startsWith("[")?t.hostname.slice(1,-1):t.hostname,host:t.host,hash:t.hash,search:t.search,pathname:t.pathname,href:t.href,path:`${t.pathname||""}${t.search||""}`};return Dae.default.string(t.port)&&t.port.length>0&&(e.port=Number(t.port)),(t.username||t.password)&&(e.auth=`${t.username||""}:${t.password||""}`),e}});var Pae=_(p4=>{"use strict";Object.defineProperty(p4,"__esModule",{value:!0});var Lit=ve("url"),Oit=["protocol","host","hostname","port","pathname","search"];p4.default=(t,e)=>{var r,o;if(e.path){if(e.pathname)throw new TypeError("Parameters `path` and `pathname` are mutually exclusive.");if(e.search)throw new TypeError("Parameters `path` and `search` are mutually exclusive.");if(e.searchParams)throw new TypeError("Parameters `path` and `searchParams` are mutually exclusive.")}if(e.search&&e.searchParams)throw new TypeError("Parameters `search` and `searchParams` are mutually exclusive.");if(!t){if(!e.protocol)throw new TypeError("No URL protocol specified");t=`${e.protocol}//${(o=(r=e.hostname)!==null&&r!==void 0?r:e.host)!==null&&o!==void 0?o:""}`}let a=new Lit.URL(t);if(e.path){let n=e.path.indexOf("?");n===-1?e.pathname=e.path:(e.pathname=e.path.slice(0,n),e.search=e.path.slice(n+1)),delete e.path}for(let n of Oit)e[n]&&(a[n]=e[n].toString());return a}});var bae=_(g4=>{"use strict";Object.defineProperty(g4,"__esModule",{value:!0});var h4=class{constructor(){this.weakMap=new WeakMap,this.map=new Map}set(e,r){typeof e=="object"?this.weakMap.set(e,r):this.map.set(e,r)}get(e){return typeof e=="object"?this.weakMap.get(e):this.map.get(e)}has(e){return typeof e=="object"?this.weakMap.has(e):this.map.has(e)}};g4.default=h4});var m4=_(d4=>{"use strict";Object.defineProperty(d4,"__esModule",{value:!0});var Mit=async t=>{let e=[],r=0;for await(let o of t)e.push(o),r+=Buffer.byteLength(o);return Buffer.isBuffer(e[0])?Buffer.concat(e,r):Buffer.from(e.join(""))};d4.default=Mit});var kae=_(Pd=>{"use strict";Object.defineProperty(Pd,"__esModule",{value:!0});Pd.dnsLookupIpVersionToFamily=Pd.isDnsLookupIpVersion=void 0;var xae={auto:0,ipv4:4,ipv6:6};Pd.isDnsLookupIpVersion=t=>t in xae;Pd.dnsLookupIpVersionToFamily=t=>{if(Pd.isDnsLookupIpVersion(t))return xae[t];throw new Error("Invalid DNS lookup IP version")}});var y4=_(sb=>{"use strict";Object.defineProperty(sb,"__esModule",{value:!0});sb.isResponseOk=void 0;sb.isResponseOk=t=>{let{statusCode:e}=t,r=t.request.options.followRedirect?299:399;return e>=200&&e<=r||e===304}});var Fae=_(E4=>{"use strict";Object.defineProperty(E4,"__esModule",{value:!0});var Qae=new Set;E4.default=t=>{Qae.has(t)||(Qae.add(t),process.emitWarning(`Got: ${t}`,{type:"DeprecationWarning"}))}});var Rae=_(C4=>{"use strict";Object.defineProperty(C4,"__esModule",{value:!0});var Ai=Tf(),Uit=(t,e)=>{if(Ai.default.null_(t.encoding))throw new TypeError("To get a Buffer, set `options.responseType` to `buffer` instead");Ai.assert.any([Ai.default.string,Ai.default.undefined],t.encoding),Ai.assert.any([Ai.default.boolean,Ai.default.undefined],t.resolveBodyOnly),Ai.assert.any([Ai.default.boolean,Ai.default.undefined],t.methodRewriting),Ai.assert.any([Ai.default.boolean,Ai.default.undefined],t.isStream),Ai.assert.any([Ai.default.string,Ai.default.undefined],t.responseType),t.responseType===void 0&&(t.responseType="text");let{retry:r}=t;if(e?t.retry={...e.retry}:t.retry={calculateDelay:o=>o.computedValue,limit:0,methods:[],statusCodes:[],errorCodes:[],maxRetryAfter:void 0},Ai.default.object(r)?(t.retry={...t.retry,...r},t.retry.methods=[...new Set(t.retry.methods.map(o=>o.toUpperCase()))],t.retry.statusCodes=[...new Set(t.retry.statusCodes)],t.retry.errorCodes=[...new Set(t.retry.errorCodes)]):Ai.default.number(r)&&(t.retry.limit=r),Ai.default.undefined(t.retry.maxRetryAfter)&&(t.retry.maxRetryAfter=Math.min(...[t.timeout.request,t.timeout.connect].filter(Ai.default.number))),Ai.default.object(t.pagination)){e&&(t.pagination={...e.pagination,...t.pagination});let{pagination:o}=t;if(!Ai.default.function_(o.transform))throw new Error("`options.pagination.transform` must be implemented");if(!Ai.default.function_(o.shouldContinue))throw new Error("`options.pagination.shouldContinue` must be implemented");if(!Ai.default.function_(o.filter))throw new TypeError("`options.pagination.filter` must be implemented");if(!Ai.default.function_(o.paginate))throw new Error("`options.pagination.paginate` must be implemented")}return t.responseType==="json"&&t.headers.accept===void 0&&(t.headers.accept="application/json"),t};C4.default=Uit});var Tae=_(m1=>{"use strict";Object.defineProperty(m1,"__esModule",{value:!0});m1.retryAfterStatusCodes=void 0;m1.retryAfterStatusCodes=new Set([413,429,503]);var _it=({attemptCount:t,retryOptions:e,error:r,retryAfter:o})=>{if(t>e.limit)return 0;let a=e.methods.includes(r.options.method),n=e.errorCodes.includes(r.code),u=r.response&&e.statusCodes.includes(r.response.statusCode);if(!a||!n&&!u)return 0;if(r.response){if(o)return e.maxRetryAfter===void 0||o>e.maxRetryAfter?0:o;if(r.response.statusCode===413)return 0}let A=Math.random()*100;return 2**(t-1)*1e3+A};m1.default=_it});var C1=_(Bn=>{"use strict";Object.defineProperty(Bn,"__esModule",{value:!0});Bn.UnsupportedProtocolError=Bn.ReadError=Bn.TimeoutError=Bn.UploadError=Bn.CacheError=Bn.HTTPError=Bn.MaxRedirectsError=Bn.RequestError=Bn.setNonEnumerableProperties=Bn.knownHookEvents=Bn.withoutBody=Bn.kIsNormalizedAlready=void 0;var Nae=ve("util"),Lae=ve("stream"),Hit=ve("fs"),ah=ve("url"),Oae=ve("http"),w4=ve("http"),jit=ve("https"),Git=Zse(),qit=soe(),Mae=Ooe(),Yit=Hoe(),Wit=dae(),Kit=eb(),st=Tf(),Vit=wae(),Uae=a4(),Jit=u4(),_ae=vae(),zit=Sae(),Hae=Pae(),Xit=bae(),Zit=m4(),jae=kae(),$it=y4(),lh=Fae(),est=Rae(),tst=Tae(),I4,Zs=Symbol("request"),lb=Symbol("response"),PE=Symbol("responseSize"),bE=Symbol("downloadedSize"),xE=Symbol("bodySize"),kE=Symbol("uploadedSize"),ob=Symbol("serverResponsesPiped"),Gae=Symbol("unproxyEvents"),qae=Symbol("isFromCache"),B4=Symbol("cancelTimeouts"),Yae=Symbol("startedReading"),QE=Symbol("stopReading"),ab=Symbol("triggerRead"),ch=Symbol("body"),y1=Symbol("jobs"),Wae=Symbol("originalResponse"),Kae=Symbol("retryTimeout");Bn.kIsNormalizedAlready=Symbol("isNormalizedAlready");var rst=st.default.string(process.versions.brotli);Bn.withoutBody=new Set(["GET","HEAD"]);Bn.knownHookEvents=["init","beforeRequest","beforeRedirect","beforeError","beforeRetry","afterResponse"];function nst(t){for(let e in t){let r=t[e];if(!st.default.string(r)&&!st.default.number(r)&&!st.default.boolean(r)&&!st.default.null_(r)&&!st.default.undefined(r))throw new TypeError(`The \`searchParams\` value '${String(r)}' must be a string, number, boolean or null`)}}function ist(t){return st.default.object(t)&&!("statusCode"in t)}var v4=new Xit.default,sst=async t=>new Promise((e,r)=>{let o=a=>{r(a)};t.pending||e(),t.once("error",o),t.once("ready",()=>{t.off("error",o),e()})}),ost=new Set([300,301,302,303,304,307,308]),ast=["context","body","json","form"];Bn.setNonEnumerableProperties=(t,e)=>{let r={};for(let o of t)if(!!o)for(let a of ast)a in o&&(r[a]={writable:!0,configurable:!0,enumerable:!1,value:o[a]});Object.defineProperties(e,r)};var Vi=class extends Error{constructor(e,r,o){var a;if(super(e),Error.captureStackTrace(this,this.constructor),this.name="RequestError",this.code=r.code,o instanceof db?(Object.defineProperty(this,"request",{enumerable:!1,value:o}),Object.defineProperty(this,"response",{enumerable:!1,value:o[lb]}),Object.defineProperty(this,"options",{enumerable:!1,value:o.options})):Object.defineProperty(this,"options",{enumerable:!1,value:o}),this.timings=(a=this.request)===null||a===void 0?void 0:a.timings,st.default.string(r.stack)&&st.default.string(this.stack)){let n=this.stack.indexOf(this.message)+this.message.length,u=this.stack.slice(n).split(`
+`).reverse(),A=r.stack.slice(r.stack.indexOf(r.message)+r.message.length).split(`
+`).reverse();for(;A.length!==0&&A[0]===u[0];)u.shift();this.stack=`${this.stack.slice(0,n)}${u.reverse().join(`
+`)}${A.reverse().join(`
+`)}`}}};Bn.RequestError=Vi;var ub=class extends Vi{constructor(e){super(`Redirected ${e.options.maxRedirects} times. Aborting.`,{},e),this.name="MaxRedirectsError"}};Bn.MaxRedirectsError=ub;var Ab=class extends Vi{constructor(e){super(`Response code ${e.statusCode} (${e.statusMessage})`,{},e.request),this.name="HTTPError"}};Bn.HTTPError=Ab;var fb=class extends Vi{constructor(e,r){super(e.message,e,r),this.name="CacheError"}};Bn.CacheError=fb;var pb=class extends Vi{constructor(e,r){super(e.message,e,r),this.name="UploadError"}};Bn.UploadError=pb;var hb=class extends Vi{constructor(e,r,o){super(e.message,e,o),this.name="TimeoutError",this.event=e.event,this.timings=r}};Bn.TimeoutError=hb;var E1=class extends Vi{constructor(e,r){super(e.message,e,r),this.name="ReadError"}};Bn.ReadError=E1;var gb=class extends Vi{constructor(e){super(`Unsupported protocol "${e.url.protocol}"`,{},e),this.name="UnsupportedProtocolError"}};Bn.UnsupportedProtocolError=gb;var lst=["socket","connect","continue","information","upgrade","timeout"],db=class extends Lae.Duplex{constructor(e,r={},o){super({autoDestroy:!1,highWaterMark:0}),this[bE]=0,this[kE]=0,this.requestInitialized=!1,this[ob]=new Set,this.redirects=[],this[QE]=!1,this[ab]=!1,this[y1]=[],this.retryCount=0,this._progressCallbacks=[];let a=()=>this._unlockWrite(),n=()=>this._lockWrite();this.on("pipe",h=>{h.prependListener("data",a),h.on("data",n),h.prependListener("end",a),h.on("end",n)}),this.on("unpipe",h=>{h.off("data",a),h.off("data",n),h.off("end",a),h.off("end",n)}),this.on("pipe",h=>{h instanceof w4.IncomingMessage&&(this.options.headers={...h.headers,...this.options.headers})});let{json:u,body:A,form:p}=r;if((u||A||p)&&this._lockWrite(),Bn.kIsNormalizedAlready in r)this.options=r;else try{this.options=this.constructor.normalizeArguments(e,r,o)}catch(h){st.default.nodeStream(r.body)&&r.body.destroy(),this.destroy(h);return}(async()=>{var h;try{this.options.body instanceof Hit.ReadStream&&await sst(this.options.body);let{url:E}=this.options;if(!E)throw new TypeError("Missing `url` property");if(this.requestUrl=E.toString(),decodeURI(this.requestUrl),await this._finalizeBody(),await this._makeRequest(),this.destroyed){(h=this[Zs])===null||h===void 0||h.destroy();return}for(let I of this[y1])I();this[y1].length=0,this.requestInitialized=!0}catch(E){if(E instanceof Vi){this._beforeError(E);return}this.destroyed||this.destroy(E)}})()}static normalizeArguments(e,r,o){var a,n,u,A,p;let h=r;if(st.default.object(e)&&!st.default.urlInstance(e))r={...o,...e,...r};else{if(e&&r&&r.url!==void 0)throw new TypeError("The `url` option is mutually exclusive with the `input` argument");r={...o,...r},e!==void 0&&(r.url=e),st.default.urlInstance(r.url)&&(r.url=new ah.URL(r.url.toString()))}if(r.cache===!1&&(r.cache=void 0),r.dnsCache===!1&&(r.dnsCache=void 0),st.assert.any([st.default.string,st.default.undefined],r.method),st.assert.any([st.default.object,st.default.undefined],r.headers),st.assert.any([st.default.string,st.default.urlInstance,st.default.undefined],r.prefixUrl),st.assert.any([st.default.object,st.default.undefined],r.cookieJar),st.assert.any([st.default.object,st.default.string,st.default.undefined],r.searchParams),st.assert.any([st.default.object,st.default.string,st.default.undefined],r.cache),st.assert.any([st.default.object,st.default.number,st.default.undefined],r.timeout),st.assert.any([st.default.object,st.default.undefined],r.context),st.assert.any([st.default.object,st.default.undefined],r.hooks),st.assert.any([st.default.boolean,st.default.undefined],r.decompress),st.assert.any([st.default.boolean,st.default.undefined],r.ignoreInvalidCookies),st.assert.any([st.default.boolean,st.default.undefined],r.followRedirect),st.assert.any([st.default.number,st.default.undefined],r.maxRedirects),st.assert.any([st.default.boolean,st.default.undefined],r.throwHttpErrors),st.assert.any([st.default.boolean,st.default.undefined],r.http2),st.assert.any([st.default.boolean,st.default.undefined],r.allowGetBody),st.assert.any([st.default.string,st.default.undefined],r.localAddress),st.assert.any([jae.isDnsLookupIpVersion,st.default.undefined],r.dnsLookupIpVersion),st.assert.any([st.default.object,st.default.undefined],r.https),st.assert.any([st.default.boolean,st.default.undefined],r.rejectUnauthorized),r.https&&(st.assert.any([st.default.boolean,st.default.undefined],r.https.rejectUnauthorized),st.assert.any([st.default.function_,st.default.undefined],r.https.checkServerIdentity),st.assert.any([st.default.string,st.default.object,st.default.array,st.default.undefined],r.https.certificateAuthority),st.assert.any([st.default.string,st.default.object,st.default.array,st.default.undefined],r.https.key),st.assert.any([st.default.string,st.default.object,st.default.array,st.default.undefined],r.https.certificate),st.assert.any([st.default.string,st.default.undefined],r.https.passphrase),st.assert.any([st.default.string,st.default.buffer,st.default.array,st.default.undefined],r.https.pfx)),st.assert.any([st.default.object,st.default.undefined],r.cacheOptions),st.default.string(r.method)?r.method=r.method.toUpperCase():r.method="GET",r.headers===o?.headers?r.headers={...r.headers}:r.headers=Kit({...o?.headers,...r.headers}),"slashes"in r)throw new TypeError("The legacy `url.Url` has been deprecated. Use `URL` instead.");if("auth"in r)throw new TypeError("Parameter `auth` is deprecated. Use `username` / `password` instead.");if("searchParams"in r&&r.searchParams&&r.searchParams!==o?.searchParams){let x;if(st.default.string(r.searchParams)||r.searchParams instanceof ah.URLSearchParams)x=new ah.URLSearchParams(r.searchParams);else{nst(r.searchParams),x=new ah.URLSearchParams;for(let C in r.searchParams){let R=r.searchParams[C];R===null?x.append(C,""):R!==void 0&&x.append(C,R)}}(a=o?.searchParams)===null||a===void 0||a.forEach((C,R)=>{x.has(R)||x.append(R,C)}),r.searchParams=x}if(r.username=(n=r.username)!==null&&n!==void 0?n:"",r.password=(u=r.password)!==null&&u!==void 0?u:"",st.default.undefined(r.prefixUrl)?r.prefixUrl=(A=o?.prefixUrl)!==null&&A!==void 0?A:"":(r.prefixUrl=r.prefixUrl.toString(),r.prefixUrl!==""&&!r.prefixUrl.endsWith("/")&&(r.prefixUrl+="/")),st.default.string(r.url)){if(r.url.startsWith("/"))throw new Error("`input` must not start with a slash when using `prefixUrl`");r.url=Hae.default(r.prefixUrl+r.url,r)}else(st.default.undefined(r.url)&&r.prefixUrl!==""||r.protocol)&&(r.url=Hae.default(r.prefixUrl,r));if(r.url){"port"in r&&delete r.port;let{prefixUrl:x}=r;Object.defineProperty(r,"prefixUrl",{set:R=>{let L=r.url;if(!L.href.startsWith(R))throw new Error(`Cannot change \`prefixUrl\` from ${x} to ${R}: ${L.href}`);r.url=new ah.URL(R+L.href.slice(x.length)),x=R},get:()=>x});let{protocol:C}=r.url;if(C==="unix:"&&(C="http:",r.url=new ah.URL(`http://unix${r.url.pathname}${r.url.search}`)),r.searchParams&&(r.url.search=r.searchParams.toString()),C!=="http:"&&C!=="https:")throw new gb(r);r.username===""?r.username=r.url.username:r.url.username=r.username,r.password===""?r.password=r.url.password:r.url.password=r.password}let{cookieJar:E}=r;if(E){let{setCookie:x,getCookieString:C}=E;st.assert.function_(x),st.assert.function_(C),x.length===4&&C.length===0&&(x=Nae.promisify(x.bind(r.cookieJar)),C=Nae.promisify(C.bind(r.cookieJar)),r.cookieJar={setCookie:x,getCookieString:C})}let{cache:I}=r;if(I&&(v4.has(I)||v4.set(I,new Mae((x,C)=>{let R=x[Zs](x,C);return st.default.promise(R)&&(R.once=(L,U)=>{if(L==="error")R.catch(U);else if(L==="abort")(async()=>{try{(await R).once("abort",U)}catch{}})();else throw new Error(`Unknown HTTP2 promise event: ${L}`);return R}),R},I))),r.cacheOptions={...r.cacheOptions},r.dnsCache===!0)I4||(I4=new qit.default),r.dnsCache=I4;else if(!st.default.undefined(r.dnsCache)&&!r.dnsCache.lookup)throw new TypeError(`Parameter \`dnsCache\` must be a CacheableLookup instance or a boolean, got ${st.default(r.dnsCache)}`);st.default.number(r.timeout)?r.timeout={request:r.timeout}:o&&r.timeout!==o.timeout?r.timeout={...o.timeout,...r.timeout}:r.timeout={...r.timeout},r.context||(r.context={});let v=r.hooks===o?.hooks;r.hooks={...r.hooks};for(let x of Bn.knownHookEvents)if(x in r.hooks)if(st.default.array(r.hooks[x]))r.hooks[x]=[...r.hooks[x]];else throw new TypeError(`Parameter \`${x}\` must be an Array, got ${st.default(r.hooks[x])}`);else r.hooks[x]=[];if(o&&!v)for(let x of Bn.knownHookEvents)o.hooks[x].length>0&&(r.hooks[x]=[...o.hooks[x],...r.hooks[x]]);if("family"in r&&lh.default('"options.family" was never documented, please use "options.dnsLookupIpVersion"'),o?.https&&(r.https={...o.https,...r.https}),"rejectUnauthorized"in r&&lh.default('"options.rejectUnauthorized" is now deprecated, please use "options.https.rejectUnauthorized"'),"checkServerIdentity"in r&&lh.default('"options.checkServerIdentity" was never documented, please use "options.https.checkServerIdentity"'),"ca"in r&&lh.default('"options.ca" was never documented, please use "options.https.certificateAuthority"'),"key"in r&&lh.default('"options.key" was never documented, please use "options.https.key"'),"cert"in r&&lh.default('"options.cert" was never documented, please use "options.https.certificate"'),"passphrase"in r&&lh.default('"options.passphrase" was never documented, please use "options.https.passphrase"'),"pfx"in r&&lh.default('"options.pfx" was never documented, please use "options.https.pfx"'),"followRedirects"in r)throw new TypeError("The `followRedirects` option does not exist. Use `followRedirect` instead.");if(r.agent){for(let x in r.agent)if(x!=="http"&&x!=="https"&&x!=="http2")throw new TypeError(`Expected the \`options.agent\` properties to be \`http\`, \`https\` or \`http2\`, got \`${x}\``)}return r.maxRedirects=(p=r.maxRedirects)!==null&&p!==void 0?p:0,Bn.setNonEnumerableProperties([o,h],r),est.default(r,o)}_lockWrite(){let e=()=>{throw new TypeError("The payload has been already provided")};this.write=e,this.end=e}_unlockWrite(){this.write=super.write,this.end=super.end}async _finalizeBody(){let{options:e}=this,{headers:r}=e,o=!st.default.undefined(e.form),a=!st.default.undefined(e.json),n=!st.default.undefined(e.body),u=o||a||n,A=Bn.withoutBody.has(e.method)&&!(e.method==="GET"&&e.allowGetBody);if(this._cannotHaveBody=A,u){if(A)throw new TypeError(`The \`${e.method}\` method cannot be used with a body`);if([n,o,a].filter(p=>p).length>1)throw new TypeError("The `body`, `json` and `form` options are mutually exclusive");if(n&&!(e.body instanceof Lae.Readable)&&!st.default.string(e.body)&&!st.default.buffer(e.body)&&!Uae.default(e.body))throw new TypeError("The `body` option must be a stream.Readable, string or Buffer");if(o&&!st.default.object(e.form))throw new TypeError("The `form` option must be an Object");{let p=!st.default.string(r["content-type"]);n?(Uae.default(e.body)&&p&&(r["content-type"]=`multipart/form-data; boundary=${e.body.getBoundary()}`),this[ch]=e.body):o?(p&&(r["content-type"]="application/x-www-form-urlencoded"),this[ch]=new ah.URLSearchParams(e.form).toString()):(p&&(r["content-type"]="application/json"),this[ch]=e.stringifyJson(e.json));let h=await Vit.default(this[ch],e.headers);st.default.undefined(r["content-length"])&&st.default.undefined(r["transfer-encoding"])&&!A&&!st.default.undefined(h)&&(r["content-length"]=String(h))}}else A?this._lockWrite():this._unlockWrite();this[xE]=Number(r["content-length"])||void 0}async _onResponseBase(e){let{options:r}=this,{url:o}=r;this[Wae]=e,r.decompress&&(e=Yit(e));let a=e.statusCode,n=e;n.statusMessage=n.statusMessage?n.statusMessage:Oae.STATUS_CODES[a],n.url=r.url.toString(),n.requestUrl=this.requestUrl,n.redirectUrls=this.redirects,n.request=this,n.isFromCache=e.fromCache||!1,n.ip=this.ip,n.retryCount=this.retryCount,this[qae]=n.isFromCache,this[PE]=Number(e.headers["content-length"])||void 0,this[lb]=e,e.once("end",()=>{this[PE]=this[bE],this.emit("downloadProgress",this.downloadProgress)}),e.once("error",A=>{e.destroy(),this._beforeError(new E1(A,this))}),e.once("aborted",()=>{this._beforeError(new E1({name:"Error",message:"The server aborted pending request",code:"ECONNRESET"},this))}),this.emit("downloadProgress",this.downloadProgress);let u=e.headers["set-cookie"];if(st.default.object(r.cookieJar)&&u){let A=u.map(async p=>r.cookieJar.setCookie(p,o.toString()));r.ignoreInvalidCookies&&(A=A.map(async p=>p.catch(()=>{})));try{await Promise.all(A)}catch(p){this._beforeError(p);return}}if(r.followRedirect&&e.headers.location&&ost.has(a)){if(e.resume(),this[Zs]&&(this[B4](),delete this[Zs],this[Gae]()),(a===303&&r.method!=="GET"&&r.method!=="HEAD"||!r.methodRewriting)&&(r.method="GET","body"in r&&delete r.body,"json"in r&&delete r.json,"form"in r&&delete r.form,this[ch]=void 0,delete r.headers["content-length"]),this.redirects.length>=r.maxRedirects){this._beforeError(new ub(this));return}try{let p=Buffer.from(e.headers.location,"binary").toString(),h=new ah.URL(p,o),E=h.toString();decodeURI(E),h.hostname!==o.hostname||h.port!==o.port?("host"in r.headers&&delete r.headers.host,"cookie"in r.headers&&delete r.headers.cookie,"authorization"in r.headers&&delete r.headers.authorization,(r.username||r.password)&&(r.username="",r.password="")):(h.username=r.username,h.password=r.password),this.redirects.push(E),r.url=h;for(let I of r.hooks.beforeRedirect)await I(r,n);this.emit("redirect",n,r),await this._makeRequest()}catch(p){this._beforeError(p);return}return}if(r.isStream&&r.throwHttpErrors&&!$it.isResponseOk(n)){this._beforeError(new Ab(n));return}e.on("readable",()=>{this[ab]&&this._read()}),this.on("resume",()=>{e.resume()}),this.on("pause",()=>{e.pause()}),e.once("end",()=>{this.push(null)}),this.emit("response",e);for(let A of this[ob])if(!A.headersSent){for(let p in e.headers){let h=r.decompress?p!=="content-encoding":!0,E=e.headers[p];h&&A.setHeader(p,E)}A.statusCode=a}}async _onResponse(e){try{await this._onResponseBase(e)}catch(r){this._beforeError(r)}}_onRequest(e){let{options:r}=this,{timeout:o,url:a}=r;Git.default(e),this[B4]=_ae.default(e,o,a);let n=r.cache?"cacheableResponse":"response";e.once(n,p=>{this._onResponse(p)}),e.once("error",p=>{var h;e.destroy(),(h=e.res)===null||h===void 0||h.removeAllListeners("end"),p=p instanceof _ae.TimeoutError?new hb(p,this.timings,this):new Vi(p.message,p,this),this._beforeError(p)}),this[Gae]=Jit.default(e,this,lst),this[Zs]=e,this.emit("uploadProgress",this.uploadProgress);let u=this[ch],A=this.redirects.length===0?this:e;st.default.nodeStream(u)?(u.pipe(A),u.once("error",p=>{this._beforeError(new pb(p,this))})):(this._unlockWrite(),st.default.undefined(u)?(this._cannotHaveBody||this._noPipe)&&(A.end(),this._lockWrite()):(this._writeRequest(u,void 0,()=>{}),A.end(),this._lockWrite())),this.emit("request",e)}async _createCacheableRequest(e,r){return new Promise((o,a)=>{Object.assign(r,zit.default(e)),delete r.url;let n,u=v4.get(r.cache)(r,async A=>{A._readableState.autoDestroy=!1,n&&(await n).emit("cacheableResponse",A),o(A)});r.url=e,u.once("error",a),u.once("request",async A=>{n=A,o(n)})})}async _makeRequest(){var e,r,o,a,n;let{options:u}=this,{headers:A}=u;for(let U in A)if(st.default.undefined(A[U]))delete A[U];else if(st.default.null_(A[U]))throw new TypeError(`Use \`undefined\` instead of \`null\` to delete the \`${U}\` header`);if(u.decompress&&st.default.undefined(A["accept-encoding"])&&(A["accept-encoding"]=rst?"gzip, deflate, br":"gzip, deflate"),u.cookieJar){let U=await u.cookieJar.getCookieString(u.url.toString());st.default.nonEmptyString(U)&&(u.headers.cookie=U)}for(let U of u.hooks.beforeRequest){let J=await U(u);if(!st.default.undefined(J)){u.request=()=>J;break}}u.body&&this[ch]!==u.body&&(this[ch]=u.body);let{agent:p,request:h,timeout:E,url:I}=u;if(u.dnsCache&&!("lookup"in u)&&(u.lookup=u.dnsCache.lookup),I.hostname==="unix"){let U=/(?<socketPath>.+?):(?<path>.+)/.exec(`${I.pathname}${I.search}`);if(U?.groups){let{socketPath:J,path:te}=U.groups;Object.assign(u,{socketPath:J,path:te,host:""})}}let v=I.protocol==="https:",x;u.http2?x=Wit.auto:x=v?jit.request:Oae.request;let C=(e=u.request)!==null&&e!==void 0?e:x,R=u.cache?this._createCacheableRequest:C;p&&!u.http2&&(u.agent=p[v?"https":"http"]),u[Zs]=C,delete u.request,delete u.timeout;let L=u;if(L.shared=(r=u.cacheOptions)===null||r===void 0?void 0:r.shared,L.cacheHeuristic=(o=u.cacheOptions)===null||o===void 0?void 0:o.cacheHeuristic,L.immutableMinTimeToLive=(a=u.cacheOptions)===null||a===void 0?void 0:a.immutableMinTimeToLive,L.ignoreCargoCult=(n=u.cacheOptions)===null||n===void 0?void 0:n.ignoreCargoCult,u.dnsLookupIpVersion!==void 0)try{L.family=jae.dnsLookupIpVersionToFamily(u.dnsLookupIpVersion)}catch{throw new Error("Invalid `dnsLookupIpVersion` option value")}u.https&&("rejectUnauthorized"in u.https&&(L.rejectUnauthorized=u.https.rejectUnauthorized),u.https.checkServerIdentity&&(L.checkServerIdentity=u.https.checkServerIdentity),u.https.certificateAuthority&&(L.ca=u.https.certificateAuthority),u.https.certificate&&(L.cert=u.https.certificate),u.https.key&&(L.key=u.https.key),u.https.passphrase&&(L.passphrase=u.https.passphrase),u.https.pfx&&(L.pfx=u.https.pfx));try{let U=await R(I,L);st.default.undefined(U)&&(U=x(I,L)),u.request=h,u.timeout=E,u.agent=p,u.https&&("rejectUnauthorized"in u.https&&delete L.rejectUnauthorized,u.https.checkServerIdentity&&delete L.checkServerIdentity,u.https.certificateAuthority&&delete L.ca,u.https.certificate&&delete L.cert,u.https.key&&delete L.key,u.https.passphrase&&delete L.passphrase,u.https.pfx&&delete L.pfx),ist(U)?this._onRequest(U):this.writable?(this.once("finish",()=>{this._onResponse(U)}),this._unlockWrite(),this.end(),this._lockWrite()):this._onResponse(U)}catch(U){throw U instanceof Mae.CacheError?new fb(U,this):new Vi(U.message,U,this)}}async _error(e){try{for(let r of this.options.hooks.beforeError)e=await r(e)}catch(r){e=new Vi(r.message,r,this)}this.destroy(e)}_beforeError(e){if(this[QE])return;let{options:r}=this,o=this.retryCount+1;this[QE]=!0,e instanceof Vi||(e=new Vi(e.message,e,this));let a=e,{response:n}=a;(async()=>{if(n&&!n.body){n.setEncoding(this._readableState.encoding);try{n.rawBody=await Zit.default(n),n.body=n.rawBody.toString()}catch{}}if(this.listenerCount("retry")!==0){let u;try{let A;n&&"retry-after"in n.headers&&(A=Number(n.headers["retry-after"]),Number.isNaN(A)?(A=Date.parse(n.headers["retry-after"])-Date.now(),A<=0&&(A=1)):A*=1e3),u=await r.retry.calculateDelay({attemptCount:o,retryOptions:r.retry,error:a,retryAfter:A,computedValue:tst.default({attemptCount:o,retryOptions:r.retry,error:a,retryAfter:A,computedValue:0})})}catch(A){this._error(new Vi(A.message,A,this));return}if(u){let A=async()=>{try{for(let p of this.options.hooks.beforeRetry)await p(this.options,a,o)}catch(p){this._error(new Vi(p.message,e,this));return}this.destroyed||(this.destroy(),this.emit("retry",o,e))};this[Kae]=setTimeout(A,u);return}}this._error(a)})()}_read(){this[ab]=!0;let e=this[lb];if(e&&!this[QE]){e.readableLength&&(this[ab]=!1);let r;for(;(r=e.read())!==null;){this[bE]+=r.length,this[Yae]=!0;let o=this.downloadProgress;o.percent<1&&this.emit("downloadProgress",o),this.push(r)}}}_write(e,r,o){let a=()=>{this._writeRequest(e,r,o)};this.requestInitialized?a():this[y1].push(a)}_writeRequest(e,r,o){this[Zs].destroyed||(this._progressCallbacks.push(()=>{this[kE]+=Buffer.byteLength(e,r);let a=this.uploadProgress;a.percent<1&&this.emit("uploadProgress",a)}),this[Zs].write(e,r,a=>{!a&&this._progressCallbacks.length>0&&this._progressCallbacks.shift()(),o(a)}))}_final(e){let r=()=>{for(;this._progressCallbacks.length!==0;)this._progressCallbacks.shift()();if(!(Zs in this)){e();return}if(this[Zs].destroyed){e();return}this[Zs].end(o=>{o||(this[xE]=this[kE],this.emit("uploadProgress",this.uploadProgress),this[Zs].emit("upload-complete")),e(o)})};this.requestInitialized?r():this[y1].push(r)}_destroy(e,r){var o;this[QE]=!0,clearTimeout(this[Kae]),Zs in this&&(this[B4](),!((o=this[lb])===null||o===void 0)&&o.complete||this[Zs].destroy()),e!==null&&!st.default.undefined(e)&&!(e instanceof Vi)&&(e=new Vi(e.message,e,this)),r(e)}get _isAboutToError(){return this[QE]}get ip(){var e;return(e=this.socket)===null||e===void 0?void 0:e.remoteAddress}get aborted(){var e,r,o;return((r=(e=this[Zs])===null||e===void 0?void 0:e.destroyed)!==null&&r!==void 0?r:this.destroyed)&&!(!((o=this[Wae])===null||o===void 0)&&o.complete)}get socket(){var e,r;return(r=(e=this[Zs])===null||e===void 0?void 0:e.socket)!==null&&r!==void 0?r:void 0}get downloadProgress(){let e;return this[PE]?e=this[bE]/this[PE]:this[PE]===this[bE]?e=1:e=0,{percent:e,transferred:this[bE],total:this[PE]}}get uploadProgress(){let e;return this[xE]?e=this[kE]/this[xE]:this[xE]===this[kE]?e=1:e=0,{percent:e,transferred:this[kE],total:this[xE]}}get timings(){var e;return(e=this[Zs])===null||e===void 0?void 0:e.timings}get isFromCache(){return this[qae]}pipe(e,r){if(this[Yae])throw new Error("Failed to pipe. The response has been emitted already.");return e instanceof w4.ServerResponse&&this[ob].add(e),super.pipe(e,r)}unpipe(e){return e instanceof w4.ServerResponse&&this[ob].delete(e),super.unpipe(e),this}};Bn.default=db});var w1=_(Gc=>{"use strict";var cst=Gc&&Gc.__createBinding||(Object.create?function(t,e,r,o){o===void 0&&(o=r),Object.defineProperty(t,o,{enumerable:!0,get:function(){return e[r]}})}:function(t,e,r,o){o===void 0&&(o=r),t[o]=e[r]}),ust=Gc&&Gc.__exportStar||function(t,e){for(var r in t)r!=="default"&&!Object.prototype.hasOwnProperty.call(e,r)&&cst(e,t,r)};Object.defineProperty(Gc,"__esModule",{value:!0});Gc.CancelError=Gc.ParseError=void 0;var Vae=C1(),D4=class extends Vae.RequestError{constructor(e,r){let{options:o}=r.request;super(`${e.message} in "${o.url.toString()}"`,e,r.request),this.name="ParseError"}};Gc.ParseError=D4;var S4=class extends Vae.RequestError{constructor(e){super("Promise was canceled",{},e),this.name="CancelError"}get isCanceled(){return!0}};Gc.CancelError=S4;ust(C1(),Gc)});var zae=_(P4=>{"use strict";Object.defineProperty(P4,"__esModule",{value:!0});var Jae=w1(),Ast=(t,e,r,o)=>{let{rawBody:a}=t;try{if(e==="text")return a.toString(o);if(e==="json")return a.length===0?"":r(a.toString());if(e==="buffer")return a;throw new Jae.ParseError({message:`Unknown body type '${e}'`,name:"Error"},t)}catch(n){throw new Jae.ParseError(n,t)}};P4.default=Ast});var b4=_(uh=>{"use strict";var fst=uh&&uh.__createBinding||(Object.create?function(t,e,r,o){o===void 0&&(o=r),Object.defineProperty(t,o,{enumerable:!0,get:function(){return e[r]}})}:function(t,e,r,o){o===void 0&&(o=r),t[o]=e[r]}),pst=uh&&uh.__exportStar||function(t,e){for(var r in t)r!=="default"&&!Object.prototype.hasOwnProperty.call(e,r)&&fst(e,t,r)};Object.defineProperty(uh,"__esModule",{value:!0});var hst=ve("events"),gst=Tf(),dst=zse(),mb=w1(),Xae=zae(),Zae=C1(),mst=u4(),yst=m4(),$ae=y4(),Est=["request","response","redirect","uploadProgress","downloadProgress"];function ele(t){let e,r,o=new hst.EventEmitter,a=new dst((u,A,p)=>{let h=E=>{let I=new Zae.default(void 0,t);I.retryCount=E,I._noPipe=!0,p(()=>I.destroy()),p.shouldReject=!1,p(()=>A(new mb.CancelError(I))),e=I,I.once("response",async C=>{var R;if(C.retryCount=E,C.request.aborted)return;let L;try{L=await yst.default(I),C.rawBody=L}catch{return}if(I._isAboutToError)return;let U=((R=C.headers["content-encoding"])!==null&&R!==void 0?R:"").toLowerCase(),J=["gzip","deflate","br"].includes(U),{options:te}=I;if(J&&!te.decompress)C.body=L;else try{C.body=Xae.default(C,te.responseType,te.parseJson,te.encoding)}catch(ae){if(C.body=L.toString(),$ae.isResponseOk(C)){I._beforeError(ae);return}}try{for(let[ae,fe]of te.hooks.afterResponse.entries())C=await fe(C,async ce=>{let me=Zae.default.normalizeArguments(void 0,{...ce,retry:{calculateDelay:()=>0},throwHttpErrors:!1,resolveBodyOnly:!1},te);me.hooks.afterResponse=me.hooks.afterResponse.slice(0,ae);for(let Be of me.hooks.beforeRetry)await Be(me);let he=ele(me);return p(()=>{he.catch(()=>{}),he.cancel()}),he})}catch(ae){I._beforeError(new mb.RequestError(ae.message,ae,I));return}if(!$ae.isResponseOk(C)){I._beforeError(new mb.HTTPError(C));return}r=C,u(I.options.resolveBodyOnly?C.body:C)});let v=C=>{if(a.isCanceled)return;let{options:R}=I;if(C instanceof mb.HTTPError&&!R.throwHttpErrors){let{response:L}=C;u(I.options.resolveBodyOnly?L.body:L);return}A(C)};I.once("error",v);let x=I.options.body;I.once("retry",(C,R)=>{var L,U;if(x===((L=R.request)===null||L===void 0?void 0:L.options.body)&&gst.default.nodeStream((U=R.request)===null||U===void 0?void 0:U.options.body)){v(R);return}h(C)}),mst.default(I,o,Est)};h(0)});a.on=(u,A)=>(o.on(u,A),a);let n=u=>{let A=(async()=>{await a;let{options:p}=r.request;return Xae.default(r,u,p.parseJson,p.encoding)})();return Object.defineProperties(A,Object.getOwnPropertyDescriptors(a)),A};return a.json=()=>{let{headers:u}=e.options;return!e.writableFinished&&u.accept===void 0&&(u.accept="application/json"),n("json")},a.buffer=()=>n("buffer"),a.text=()=>n("text"),a}uh.default=ele;pst(w1(),uh)});var tle=_(x4=>{"use strict";Object.defineProperty(x4,"__esModule",{value:!0});var Cst=w1();function wst(t,...e){let r=(async()=>{if(t instanceof Cst.RequestError)try{for(let a of e)if(a)for(let n of a)t=await n(t)}catch(a){t=a}throw t})(),o=()=>r;return r.json=o,r.text=o,r.buffer=o,r.on=o,r}x4.default=wst});var ile=_(k4=>{"use strict";Object.defineProperty(k4,"__esModule",{value:!0});var rle=Tf();function nle(t){for(let e of Object.values(t))(rle.default.plainObject(e)||rle.default.array(e))&&nle(e);return Object.freeze(t)}k4.default=nle});var ole=_(sle=>{"use strict";Object.defineProperty(sle,"__esModule",{value:!0})});var Q4=_(Vl=>{"use strict";var Ist=Vl&&Vl.__createBinding||(Object.create?function(t,e,r,o){o===void 0&&(o=r),Object.defineProperty(t,o,{enumerable:!0,get:function(){return e[r]}})}:function(t,e,r,o){o===void 0&&(o=r),t[o]=e[r]}),Bst=Vl&&Vl.__exportStar||function(t,e){for(var r in t)r!=="default"&&!Object.prototype.hasOwnProperty.call(e,r)&&Ist(e,t,r)};Object.defineProperty(Vl,"__esModule",{value:!0});Vl.defaultHandler=void 0;var ale=Tf(),Kl=b4(),vst=tle(),Eb=C1(),Dst=ile(),Sst={RequestError:Kl.RequestError,CacheError:Kl.CacheError,ReadError:Kl.ReadError,HTTPError:Kl.HTTPError,MaxRedirectsError:Kl.MaxRedirectsError,TimeoutError:Kl.TimeoutError,ParseError:Kl.ParseError,CancelError:Kl.CancelError,UnsupportedProtocolError:Kl.UnsupportedProtocolError,UploadError:Kl.UploadError},Pst=async t=>new Promise(e=>{setTimeout(e,t)}),{normalizeArguments:yb}=Eb.default,lle=(...t)=>{let e;for(let r of t)e=yb(void 0,r,e);return e},bst=t=>t.isStream?new Eb.default(void 0,t):Kl.default(t),xst=t=>"defaults"in t&&"options"in t.defaults,kst=["get","post","put","patch","head","delete"];Vl.defaultHandler=(t,e)=>e(t);var cle=(t,e)=>{if(t)for(let r of t)r(e)},ule=t=>{t._rawHandlers=t.handlers,t.handlers=t.handlers.map(o=>(a,n)=>{let u,A=o(a,p=>(u=n(p),u));if(A!==u&&!a.isStream&&u){let p=A,{then:h,catch:E,finally:I}=p;Object.setPrototypeOf(p,Object.getPrototypeOf(u)),Object.defineProperties(p,Object.getOwnPropertyDescriptors(u)),p.then=h,p.catch=E,p.finally=I}return A});let e=(o,a={},n)=>{var u,A;let p=0,h=E=>t.handlers[p++](E,p===t.handlers.length?bst:h);if(ale.default.plainObject(o)){let E={...o,...a};Eb.setNonEnumerableProperties([o,a],E),a=E,o=void 0}try{let E;try{cle(t.options.hooks.init,a),cle((u=a.hooks)===null||u===void 0?void 0:u.init,a)}catch(v){E=v}let I=yb(o,a,n??t.options);if(I[Eb.kIsNormalizedAlready]=!0,E)throw new Kl.RequestError(E.message,E,I);return h(I)}catch(E){if(a.isStream)throw E;return vst.default(E,t.options.hooks.beforeError,(A=a.hooks)===null||A===void 0?void 0:A.beforeError)}};e.extend=(...o)=>{let a=[t.options],n=[...t._rawHandlers],u;for(let A of o)xst(A)?(a.push(A.defaults.options),n.push(...A.defaults._rawHandlers),u=A.defaults.mutableDefaults):(a.push(A),"handlers"in A&&n.push(...A.handlers),u=A.mutableDefaults);return n=n.filter(A=>A!==Vl.defaultHandler),n.length===0&&n.push(Vl.defaultHandler),ule({options:lle(...a),handlers:n,mutableDefaults:Boolean(u)})};let r=async function*(o,a){let n=yb(o,a,t.options);n.resolveBodyOnly=!1;let u=n.pagination;if(!ale.default.object(u))throw new TypeError("`options.pagination` must be implemented");let A=[],{countLimit:p}=u,h=0;for(;h<u.requestLimit;){h!==0&&await Pst(u.backoff);let E=await e(void 0,void 0,n),I=await u.transform(E),v=[];for(let C of I)if(u.filter(C,A,v)&&(!u.shouldContinue(C,A,v)||(yield C,u.stackAllItems&&A.push(C),v.push(C),--p<=0)))return;let x=u.paginate(E,A,v);if(x===!1)return;x===E.request.options?n=E.request.options:x!==void 0&&(n=yb(void 0,x,n)),h++}};e.paginate=r,e.paginate.all=async(o,a)=>{let n=[];for await(let u of r(o,a))n.push(u);return n},e.paginate.each=r,e.stream=(o,a)=>e(o,{...a,isStream:!0});for(let o of kst)e[o]=(a,n)=>e(a,{...n,method:o}),e.stream[o]=(a,n)=>e(a,{...n,method:o,isStream:!0});return Object.assign(e,Sst),Object.defineProperty(e,"defaults",{value:t.mutableDefaults?t:Dst.default(t),writable:t.mutableDefaults,configurable:t.mutableDefaults,enumerable:!0}),e.mergeOptions=lle,e};Vl.default=ule;Bst(ole(),Vl)});var ple=_((Nf,Cb)=>{"use strict";var Qst=Nf&&Nf.__createBinding||(Object.create?function(t,e,r,o){o===void 0&&(o=r),Object.defineProperty(t,o,{enumerable:!0,get:function(){return e[r]}})}:function(t,e,r,o){o===void 0&&(o=r),t[o]=e[r]}),Ale=Nf&&Nf.__exportStar||function(t,e){for(var r in t)r!=="default"&&!Object.prototype.hasOwnProperty.call(e,r)&&Qst(e,t,r)};Object.defineProperty(Nf,"__esModule",{value:!0});var Fst=ve("url"),fle=Q4(),Rst={options:{method:"GET",retry:{limit:2,methods:["GET","PUT","HEAD","DELETE","OPTIONS","TRACE"],statusCodes:[408,413,429,500,502,503,504,521,522,524],errorCodes:["ETIMEDOUT","ECONNRESET","EADDRINUSE","ECONNREFUSED","EPIPE","ENOTFOUND","ENETUNREACH","EAI_AGAIN"],maxRetryAfter:void 0,calculateDelay:({computedValue:t})=>t},timeout:{},headers:{"user-agent":"got (https://github.com/sindresorhus/got)"},hooks:{init:[],beforeRequest:[],beforeRedirect:[],beforeRetry:[],beforeError:[],afterResponse:[]},cache:void 0,dnsCache:void 0,decompress:!0,throwHttpErrors:!0,followRedirect:!0,isStream:!1,responseType:"text",resolveBodyOnly:!1,maxRedirects:10,prefixUrl:"",methodRewriting:!0,ignoreInvalidCookies:!1,context:{},http2:!1,allowGetBody:!1,https:void 0,pagination:{transform:t=>t.request.options.responseType==="json"?t.body:JSON.parse(t.body),paginate:t=>{if(!Reflect.has(t.headers,"link"))return!1;let e=t.headers.link.split(","),r;for(let o of e){let a=o.split(";");if(a[1].includes("next")){r=a[0].trimStart().trim(),r=r.slice(1,-1);break}}return r?{url:new Fst.URL(r)}:!1},filter:()=>!0,shouldContinue:()=>!0,countLimit:1/0,backoff:0,requestLimit:1e4,stackAllItems:!0},parseJson:t=>JSON.parse(t),stringifyJson:t=>JSON.stringify(t),cacheOptions:{}},handlers:[fle.defaultHandler],mutableDefaults:!1},F4=fle.default(Rst);Nf.default=F4;Cb.exports=F4;Cb.exports.default=F4;Cb.exports.__esModule=!0;Ale(Q4(),Nf);Ale(b4(),Nf)});var nn={};Vt(nn,{Method:()=>Cle,del:()=>Mst,get:()=>L4,getNetworkSettings:()=>Ele,post:()=>O4,put:()=>Ost,request:()=>I1});function dle(t){let e=new URL(t),r={host:e.hostname,headers:{}};return e.port&&(r.port=Number(e.port)),e.username&&e.password&&(r.proxyAuth=`${e.username}:${e.password}`),{proxy:r}}async function R4(t){return ol(gle,t,()=>oe.readFilePromise(t).then(e=>(gle.set(t,e),e)))}function Lst({statusCode:t,statusMessage:e},r){let o=Mt(r,t,yt.NUMBER),a=`https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/${t}`;return Zy(r,`${o}${e?` (${e})`:""}`,a)}async function wb(t,{configuration:e,customErrorMessage:r}){try{return await t}catch(o){if(o.name!=="HTTPError")throw o;let a=r?.(o,e)??o.response.body?.error;a==null&&(o.message.startsWith("Response code")?a="The remote server failed to provide the requested resource":a=o.message),o.code==="ETIMEDOUT"&&o.event==="socket"&&(a+=`(can be increased via ${Mt(e,"httpTimeout",yt.SETTING)})`);let n=new zt(35,a,u=>{o.response&&u.reportError(35,`  ${zu(e,{label:"Response Code",value:_c(yt.NO_HINT,Lst(o.response,e))})}`),o.request&&(u.reportError(35,`  ${zu(e,{label:"Request Method",value:_c(yt.NO_HINT,o.request.options.method)})}`),u.reportError(35,`  ${zu(e,{label:"Request URL",value:_c(yt.URL,o.request.requestUrl)})}`)),o.request.redirects.length>0&&u.reportError(35,`  ${zu(e,{label:"Request Redirects",value:_c(yt.NO_HINT,PL(e,o.request.redirects,yt.URL))})}`),o.request.retryCount===o.request.options.retry.limit&&u.reportError(35,`  ${zu(e,{label:"Request Retry Count",value:_c(yt.NO_HINT,`${Mt(e,o.request.retryCount,yt.NUMBER)} (can be increased via ${Mt(e,"httpRetry",yt.SETTING)})`)})}`)});throw n.originalError=o,n}}function Ele(t,e){let r=[...e.configuration.get("networkSettings")].sort(([u],[A])=>A.length-u.length),o={enableNetwork:void 0,httpsCaFilePath:void 0,httpProxy:void 0,httpsProxy:void 0,httpsKeyFilePath:void 0,httpsCertFilePath:void 0},a=Object.keys(o),n=typeof t=="string"?new URL(t):t;for(let[u,A]of r)if(N4.default.isMatch(n.hostname,u))for(let p of a){let h=A.get(p);h!==null&&typeof o[p]>"u"&&(o[p]=h)}for(let u of a)typeof o[u]>"u"&&(o[u]=e.configuration.get(u));return o}async function I1(t,e,{configuration:r,headers:o,jsonRequest:a,jsonResponse:n,method:u="GET",wrapNetworkRequest:A}){let p={target:t,body:e,configuration:r,headers:o,jsonRequest:a,jsonResponse:n,method:u},h=async()=>await Ust(t,e,p),E=typeof A<"u"?await A(h,p):h;return await(await r.reduceHook(v=>v.wrapNetworkRequest,E,p))()}async function L4(t,{configuration:e,jsonResponse:r,customErrorMessage:o,wrapNetworkRequest:a,...n}){let u=()=>wb(I1(t,null,{configuration:e,wrapNetworkRequest:a,...n}),{configuration:e,customErrorMessage:o}).then(p=>p.body),A=await(typeof a<"u"?u():ol(hle,t,()=>u().then(p=>(hle.set(t,p),p))));return r?JSON.parse(A.toString()):A}async function Ost(t,e,{customErrorMessage:r,...o}){return(await wb(I1(t,e,{...o,method:"PUT"}),{customErrorMessage:r,configuration:o.configuration})).body}async function O4(t,e,{customErrorMessage:r,...o}){return(await wb(I1(t,e,{...o,method:"POST"}),{customErrorMessage:r,configuration:o.configuration})).body}async function Mst(t,{customErrorMessage:e,...r}){return(await wb(I1(t,null,{...r,method:"DELETE"}),{customErrorMessage:e,configuration:r.configuration})).body}async function Ust(t,e,{configuration:r,headers:o,jsonRequest:a,jsonResponse:n,method:u="GET"}){let A=typeof t=="string"?new URL(t):t,p=Ele(A,{configuration:r});if(p.enableNetwork===!1)throw new zt(80,`Request to '${A.href}' has been blocked because of your configuration settings`);if(A.protocol==="http:"&&!N4.default.isMatch(A.hostname,r.get("unsafeHttpWhitelist")))throw new zt(81,`Unsafe http requests must be explicitly whitelisted in your configuration (${A.hostname})`);let E={agent:{http:p.httpProxy?T4.default.httpOverHttp(dle(p.httpProxy)):Tst,https:p.httpsProxy?T4.default.httpsOverHttp(dle(p.httpsProxy)):Nst},headers:o,method:u};E.responseType=n?"json":"buffer",e!==null&&(Buffer.isBuffer(e)||!a&&typeof e=="string"?E.body=e:E.json=e);let I=r.get("httpTimeout"),v=r.get("httpRetry"),x=r.get("enableStrictSsl"),C=p.httpsCaFilePath,R=p.httpsCertFilePath,L=p.httpsKeyFilePath,{default:U}=await Promise.resolve().then(()=>$e(ple())),J=C?await R4(C):void 0,te=R?await R4(R):void 0,ae=L?await R4(L):void 0,fe=U.extend({timeout:{socket:I},retry:v,https:{rejectUnauthorized:x,certificateAuthority:J,certificate:te,key:ae},...E});return r.getLimit("networkConcurrency")(()=>fe(A))}var mle,yle,N4,T4,hle,gle,Tst,Nst,Cle,Ib=Et(()=>{St();mle=ve("https"),yle=ve("http"),N4=$e(Zo()),T4=$e(Yse());Yl();Gl();jl();hle=new Map,gle=new Map,Tst=new yle.Agent({keepAlive:!0}),Nst=new mle.Agent({keepAlive:!0});Cle=(a=>(a.GET="GET",a.PUT="PUT",a.POST="POST",a.DELETE="DELETE",a))(Cle||{})});var Ji={};Vt(Ji,{availableParallelism:()=>U4,getArchitecture:()=>B1,getArchitectureName:()=>qst,getArchitectureSet:()=>M4,getCaller:()=>Vst,major:()=>_st,openUrl:()=>Hst});function Gst(){if(process.platform==="darwin"||process.platform==="win32")return null;let t;try{t=oe.readFileSync(jst)}catch{}if(typeof t<"u"){if(t&&t.includes("GLIBC"))return"glibc";if(t&&t.includes("musl"))return"musl"}let r=(process.report?.getReport()??{}).sharedObjects??[],o=/\/(?:(ld-linux-|[^/]+-linux-gnu\/)|(libc.musl-|ld-musl-))/;return KI(r,a=>{let n=a.match(o);if(!n)return KI.skip;if(n[1])return"glibc";if(n[2])return"musl";throw new Error("Assertion failed: Expected the libc variant to have been detected")})??null}function B1(){return Ile=Ile??{os:process.platform,cpu:process.arch,libc:Gst()}}function qst(t=B1()){return t.libc?`${t.os}-${t.cpu}-${t.libc}`:`${t.os}-${t.cpu}`}function M4(){let t=B1();return Ble=Ble??{os:[t.os],cpu:[t.cpu],libc:t.libc?[t.libc]:[]}}function Kst(t){let e=Yst.exec(t);if(!e)return null;let r=e[2]&&e[2].indexOf("native")===0,o=e[2]&&e[2].indexOf("eval")===0,a=Wst.exec(e[2]);return o&&a!=null&&(e[2]=a[1],e[3]=a[2],e[4]=a[3]),{file:r?null:e[2],methodName:e[1]||"<unknown>",arguments:r?[e[2]]:[],line:e[3]?+e[3]:null,column:e[4]?+e[4]:null}}function Vst(){let e=new Error().stack.split(`
+`)[3];return Kst(e)}function U4(){return typeof Bb.default.availableParallelism<"u"?Bb.default.availableParallelism():Math.max(1,Bb.default.cpus().length)}var Bb,_st,wle,Hst,jst,Ile,Ble,Yst,Wst,vb=Et(()=>{St();Bb=$e(ve("os"));Db();jl();_st=Number(process.versions.node.split(".")[0]),wle=new Map([["darwin","open"],["linux","xdg-open"],["win32","explorer.exe"]]).get(process.platform),Hst=typeof wle<"u"?async t=>{try{return await _4(wle,[t],{cwd:V.cwd()}),!0}catch{return!1}}:void 0,jst="/usr/bin/ldd";Yst=/^\s*at (.*?) ?\(((?:file|https?|blob|chrome-extension|native|eval|webpack|<anonymous>|\/|[a-z]:\\|\\\\).*?)(?::(\d+))?(?::(\d+))?\)?\s*$/i,Wst=/\((\S*)(?::(\d+))(?::(\d+))\)/});function Y4(t,e,r,o,a){let n=A1(r);if(o.isArray||o.type==="ANY"&&Array.isArray(n))return Array.isArray(n)?n.map((u,A)=>H4(t,`${e}[${A}]`,u,o,a)):String(n).split(/,/).map(u=>H4(t,e,u,o,a));if(Array.isArray(n))throw new Error(`Non-array configuration settings "${e}" cannot be an array`);return H4(t,e,r,o,a)}function H4(t,e,r,o,a){let n=A1(r);switch(o.type){case"ANY":return qP(n);case"SHAPE":return Zst(t,e,r,o,a);case"MAP":return $st(t,e,r,o,a)}if(n===null&&!o.isNullable&&o.default!==null)throw new Error(`Non-nullable configuration settings "${e}" cannot be set to null`);if(o.values?.includes(n))return n;let A=(()=>{if(o.type==="BOOLEAN"&&typeof n!="string")return VI(n);if(typeof n!="string")throw new Error(`Expected configuration setting "${e}" to be a string, got ${typeof n}`);let p=sP(n,{env:t.env});switch(o.type){case"ABSOLUTE_PATH":{let h=a,E=mM(r);return E&&E[0]!=="<"&&(h=V.dirname(E)),V.resolve(h,ue.toPortablePath(p))}case"LOCATOR_LOOSE":return xf(p,!1);case"NUMBER":return parseInt(p);case"LOCATOR":return xf(p);case"BOOLEAN":return VI(p);default:return p}})();if(o.values&&!o.values.includes(A))throw new Error(`Invalid value, expected one of ${o.values.join(", ")}`);return A}function Zst(t,e,r,o,a){let n=A1(r);if(typeof n!="object"||Array.isArray(n))throw new it(`Object configuration settings "${e}" must be an object`);let u=W4(t,o,{ignoreArrays:!0});if(n===null)return u;for(let[A,p]of Object.entries(n)){let h=`${e}.${A}`;if(!o.properties[A])throw new it(`Unrecognized configuration settings found: ${e}.${A} - run "yarn config -v" to see the list of settings supported in Yarn`);u.set(A,Y4(t,h,p,o.properties[A],a))}return u}function $st(t,e,r,o,a){let n=A1(r),u=new Map;if(typeof n!="object"||Array.isArray(n))throw new it(`Map configuration settings "${e}" must be an object`);if(n===null)return u;for(let[A,p]of Object.entries(n)){let h=o.normalizeKeys?o.normalizeKeys(A):A,E=`${e}['${h}']`,I=o.valueDefinition;u.set(h,Y4(t,E,p,I,a))}return u}function W4(t,e,{ignoreArrays:r=!1}={}){switch(e.type){case"SHAPE":{if(e.isArray&&!r)return[];let o=new Map;for(let[a,n]of Object.entries(e.properties))o.set(a,W4(t,n));return o}case"MAP":return e.isArray&&!r?[]:new Map;case"ABSOLUTE_PATH":return e.default===null?null:t.projectCwd===null?Array.isArray(e.default)?e.default.map(o=>V.normalize(o)):V.isAbsolute(e.default)?V.normalize(e.default):e.isNullable?null:void 0:Array.isArray(e.default)?e.default.map(o=>V.resolve(t.projectCwd,o)):V.resolve(t.projectCwd,e.default);default:return e.default}}function Pb(t,e,r){if(e.type==="SECRET"&&typeof t=="string"&&r.hideSecrets)return Xst;if(e.type==="ABSOLUTE_PATH"&&typeof t=="string"&&r.getNativePaths)return ue.fromPortablePath(t);if(e.isArray&&Array.isArray(t)){let o=[];for(let a of t)o.push(Pb(a,e,r));return o}if(e.type==="MAP"&&t instanceof Map){if(t.size===0)return;let o=new Map;for(let[a,n]of t.entries()){let u=Pb(n,e.valueDefinition,r);typeof u<"u"&&o.set(a,u)}return o}if(e.type==="SHAPE"&&t instanceof Map){if(t.size===0)return;let o=new Map;for(let[a,n]of t.entries()){let u=e.properties[a],A=Pb(n,u,r);typeof A<"u"&&o.set(a,A)}return o}return t}function eot(){let t={};for(let[e,r]of Object.entries(process.env))e=e.toLowerCase(),e.startsWith(bb)&&(e=(0,Dle.default)(e.slice(bb.length)),t[e]=r);return t}function G4(){let t=`${bb}rc_filename`;for(let[e,r]of Object.entries(process.env))if(e.toLowerCase()===t&&typeof r=="string")return r;return q4}async function vle(t){try{return await oe.readFilePromise(t)}catch{return Buffer.of()}}async function tot(t,e){return Buffer.compare(...await Promise.all([vle(t),vle(e)]))===0}async function rot(t,e){let[r,o]=await Promise.all([oe.statPromise(t),oe.statPromise(e)]);return r.dev===o.dev&&r.ino===o.ino}async function iot({configuration:t,selfPath:e}){let r=t.get("yarnPath");return t.get("ignorePath")||r===null||r===e||await not(r,e)?null:r}var Dle,Lf,Sle,Ple,ble,j4,Jst,v1,zst,FE,bb,q4,Xst,D1,xle,xb,Sb,not,rA,Ke,S1=Et(()=>{St();Nl();Dle=$e(sV()),Lf=$e(td());jt();Sle=$e(ZV()),Ple=ve("module"),ble=$e(id()),j4=ve("stream");ose();fE();cM();uM();AM();Tse();fM();vd();Use();WP();Gl();nh();Ib();jl();vb();Qf();bo();Jst=function(){if(!Lf.GITHUB_ACTIONS||!process.env.GITHUB_EVENT_PATH)return!1;let t=ue.toPortablePath(process.env.GITHUB_EVENT_PATH),e;try{e=oe.readJsonSync(t)}catch{return!1}return!(!("repository"in e)||!e.repository||(e.repository.private??!0))}(),v1=new Set(["@yarnpkg/plugin-constraints","@yarnpkg/plugin-exec","@yarnpkg/plugin-interactive-tools","@yarnpkg/plugin-stage","@yarnpkg/plugin-typescript","@yarnpkg/plugin-version","@yarnpkg/plugin-workspace-tools"]),zst=new Set(["isTestEnv","injectNpmUser","injectNpmPassword","injectNpm2FaToken","zipDataEpilogue","cacheCheckpointOverride","cacheVersionOverride","lockfileVersionOverride","binFolder","version","flags","profile","gpg","ignoreNode","wrapOutput","home","confDir","registry","ignoreCwd"]),FE=/^(?!v)[a-z0-9._-]+$/i,bb="yarn_",q4=".yarnrc.yml",Xst="********",D1=(E=>(E.ANY="ANY",E.BOOLEAN="BOOLEAN",E.ABSOLUTE_PATH="ABSOLUTE_PATH",E.LOCATOR="LOCATOR",E.LOCATOR_LOOSE="LOCATOR_LOOSE",E.NUMBER="NUMBER",E.STRING="STRING",E.SECRET="SECRET",E.SHAPE="SHAPE",E.MAP="MAP",E))(D1||{}),xle=yt,xb=(r=>(r.JUNCTIONS="junctions",r.SYMLINKS="symlinks",r))(xb||{}),Sb={lastUpdateCheck:{description:"Last timestamp we checked whether new Yarn versions were available",type:"STRING",default:null},yarnPath:{description:"Path to the local executable that must be used over the global one",type:"ABSOLUTE_PATH",default:null},ignorePath:{description:"If true, the local executable will be ignored when using the global one",type:"BOOLEAN",default:!1},globalFolder:{description:"Folder where all system-global files are stored",type:"ABSOLUTE_PATH",default:EM()},cacheFolder:{description:"Folder where the cache files must be written",type:"ABSOLUTE_PATH",default:"./.yarn/cache"},compressionLevel:{description:"Zip files compression level, from 0 to 9 or mixed (a variant of 9, which stores some files uncompressed, when compression doesn't yield good results)",type:"NUMBER",values:["mixed",0,1,2,3,4,5,6,7,8,9],default:0},virtualFolder:{description:"Folder where the virtual packages (cf doc) will be mapped on the disk (must be named __virtual__)",type:"ABSOLUTE_PATH",default:"./.yarn/__virtual__"},installStatePath:{description:"Path of the file where the install state will be persisted",type:"ABSOLUTE_PATH",default:"./.yarn/install-state.gz"},immutablePatterns:{description:"Array of glob patterns; files matching them won't be allowed to change during immutable installs",type:"STRING",default:[],isArray:!0},rcFilename:{description:"Name of the files where the configuration can be found",type:"STRING",default:G4()},enableGlobalCache:{description:"If true, the system-wide cache folder will be used regardless of `cache-folder`",type:"BOOLEAN",default:!0},cacheMigrationMode:{description:"Defines the conditions under which Yarn upgrades should cause the cache archives to be regenerated.",type:"STRING",values:["always","match-spec","required-only"],default:"always"},enableColors:{description:"If true, the CLI is allowed to use colors in its output",type:"BOOLEAN",default:lP,defaultText:"<dynamic>"},enableHyperlinks:{description:"If true, the CLI is allowed to use hyperlinks in its output",type:"BOOLEAN",default:SL,defaultText:"<dynamic>"},enableInlineBuilds:{description:"If true, the CLI will print the build output on the command line",type:"BOOLEAN",default:Lf.isCI,defaultText:"<dynamic>"},enableMessageNames:{description:"If true, the CLI will prefix most messages with codes suitable for search engines",type:"BOOLEAN",default:!0},enableProgressBars:{description:"If true, the CLI is allowed to show a progress bar for long-running events",type:"BOOLEAN",default:!Lf.isCI,defaultText:"<dynamic>"},enableTimers:{description:"If true, the CLI is allowed to print the time spent executing commands",type:"BOOLEAN",default:!0},enableTips:{description:"If true, installs will print a helpful message every day of the week",type:"BOOLEAN",default:!Lf.isCI,defaultText:"<dynamic>"},preferInteractive:{description:"If true, the CLI will automatically use the interactive mode when called from a TTY",type:"BOOLEAN",default:!1},preferTruncatedLines:{description:"If true, the CLI will truncate lines that would go beyond the size of the terminal",type:"BOOLEAN",default:!1},progressBarStyle:{description:"Which style of progress bar should be used (only when progress bars are enabled)",type:"STRING",default:void 0,defaultText:"<dynamic>"},defaultLanguageName:{description:"Default language mode that should be used when a package doesn't offer any insight",type:"STRING",default:"node"},defaultProtocol:{description:"Default resolution protocol used when resolving pure semver and tag ranges",type:"STRING",default:"npm:"},enableTransparentWorkspaces:{description:"If false, Yarn won't automatically resolve workspace dependencies unless they use the `workspace:` protocol",type:"BOOLEAN",default:!0},supportedArchitectures:{description:"Architectures that Yarn will fetch and inject into the resolver",type:"SHAPE",properties:{os:{description:"Array of supported process.platform strings, or null to target them all",type:"STRING",isArray:!0,isNullable:!0,default:["current"]},cpu:{description:"Array of supported process.arch strings, or null to target them all",type:"STRING",isArray:!0,isNullable:!0,default:["current"]},libc:{description:"Array of supported libc libraries, or null to target them all",type:"STRING",isArray:!0,isNullable:!0,default:["current"]}}},enableMirror:{description:"If true, the downloaded packages will be retrieved and stored in both the local and global folders",type:"BOOLEAN",default:!0},enableNetwork:{description:"If false, Yarn will refuse to use the network if required to",type:"BOOLEAN",default:!0},enableOfflineMode:{description:"If true, Yarn will attempt to retrieve files and metadata from the global cache rather than the network",type:"BOOLEAN",default:!1},httpProxy:{description:"URL of the http proxy that must be used for outgoing http requests",type:"STRING",default:null},httpsProxy:{description:"URL of the http proxy that must be used for outgoing https requests",type:"STRING",default:null},unsafeHttpWhitelist:{description:"List of the hostnames for which http queries are allowed (glob patterns are supported)",type:"STRING",default:[],isArray:!0},httpTimeout:{description:"Timeout of each http request in milliseconds",type:"NUMBER",default:6e4},httpRetry:{description:"Retry times on http failure",type:"NUMBER",default:3},networkConcurrency:{description:"Maximal number of concurrent requests",type:"NUMBER",default:50},taskPoolConcurrency:{description:"Maximal amount of concurrent heavy task processing",type:"NUMBER",default:U4()},taskPoolMode:{description:"Execution strategy for heavy tasks",type:"STRING",values:["async","workers"],default:"workers"},networkSettings:{description:"Network settings per hostname (glob patterns are supported)",type:"MAP",valueDefinition:{description:"",type:"SHAPE",properties:{httpsCaFilePath:{description:"Path to file containing one or multiple Certificate Authority signing certificates",type:"ABSOLUTE_PATH",default:null},enableNetwork:{description:"If false, the package manager will refuse to use the network if required to",type:"BOOLEAN",default:null},httpProxy:{description:"URL of the http proxy that must be used for outgoing http requests",type:"STRING",default:null},httpsProxy:{description:"URL of the http proxy that must be used for outgoing https requests",type:"STRING",default:null},httpsKeyFilePath:{description:"Path to file containing private key in PEM format",type:"ABSOLUTE_PATH",default:null},httpsCertFilePath:{description:"Path to file containing certificate chain in PEM format",type:"ABSOLUTE_PATH",default:null}}}},httpsCaFilePath:{description:"A path to a file containing one or multiple Certificate Authority signing certificates",type:"ABSOLUTE_PATH",default:null},httpsKeyFilePath:{description:"Path to file containing private key in PEM format",type:"ABSOLUTE_PATH",default:null},httpsCertFilePath:{description:"Path to file containing certificate chain in PEM format",type:"ABSOLUTE_PATH",default:null},enableStrictSsl:{description:"If false, SSL certificate errors will be ignored",type:"BOOLEAN",default:!0},logFilters:{description:"Overrides for log levels",type:"SHAPE",isArray:!0,concatenateValues:!0,properties:{code:{description:"Code of the messages covered by this override",type:"STRING",default:void 0},text:{description:"Code of the texts covered by this override",type:"STRING",default:void 0},pattern:{description:"Code of the patterns covered by this override",type:"STRING",default:void 0},level:{description:"Log level override, set to null to remove override",type:"STRING",values:Object.values(uP),isNullable:!0,default:void 0}}},enableTelemetry:{description:"If true, telemetry will be periodically sent, following the rules in https://yarnpkg.com/advanced/telemetry",type:"BOOLEAN",default:!0},telemetryInterval:{description:"Minimal amount of time between two telemetry uploads, in days",type:"NUMBER",default:7},telemetryUserId:{description:"If you desire to tell us which project you are, you can set this field. Completely optional and opt-in.",type:"STRING",default:null},enableHardenedMode:{description:"If true, automatically enable --check-resolutions --refresh-lockfile on installs",type:"BOOLEAN",default:Lf.isPR&&Jst,defaultText:"<true on public PRs>"},enableScripts:{description:"If true, packages are allowed to have install scripts by default",type:"BOOLEAN",default:!0},enableStrictSettings:{description:"If true, unknown settings will cause Yarn to abort",type:"BOOLEAN",default:!0},enableImmutableCache:{description:"If true, the cache is reputed immutable and actions that would modify it will throw",type:"BOOLEAN",default:!1},checksumBehavior:{description:"Enumeration defining what to do when a checksum doesn't match expectations",type:"STRING",default:"throw"},injectEnvironmentFiles:{description:"List of all the environment files that Yarn should inject inside the process when it starts",type:"ABSOLUTE_PATH",default:[".env.yarn?"],isArray:!0},packageExtensions:{description:"Map of package corrections to apply on the dependency tree",type:"MAP",valueDefinition:{description:"The extension that will be applied to any package whose version matches the specified range",type:"SHAPE",properties:{dependencies:{description:"The set of dependencies that must be made available to the current package in order for it to work properly",type:"MAP",valueDefinition:{description:"A range",type:"STRING"}},peerDependencies:{description:"Inherited dependencies - the consumer of the package will be tasked to provide them",type:"MAP",valueDefinition:{description:"A semver range",type:"STRING"}},peerDependenciesMeta:{description:"Extra information related to the dependencies listed in the peerDependencies field",type:"MAP",valueDefinition:{description:"The peerDependency meta",type:"SHAPE",properties:{optional:{description:"If true, the selected peer dependency will be marked as optional by the package manager and the consumer omitting it won't be reported as an error",type:"BOOLEAN",default:!1}}}}}}}};not=process.platform==="win32"?tot:rot;rA=class{constructor(e){this.isCI=Lf.isCI;this.projectCwd=null;this.plugins=new Map;this.settings=new Map;this.values=new Map;this.sources=new Map;this.invalid=new Map;this.env={};this.limits=new Map;this.packageExtensions=null;this.startingCwd=e}static create(e,r,o){let a=new rA(e);typeof r<"u"&&!(r instanceof Map)&&(a.projectCwd=r),a.importSettings(Sb);let n=typeof o<"u"?o:r instanceof Map?r:new Map;for(let[u,A]of n)a.activatePlugin(u,A);return a}static async find(e,r,{strict:o=!0,usePathCheck:a=null,useRc:n=!0}={}){let u=eot();delete u.rcFilename;let A=new rA(e),p=await rA.findRcFiles(e),h=await rA.findFolderRcFile(EE());h&&(p.find(me=>me.path===h.path)||p.unshift(h));let E=Mse(p.map(ce=>[ce.path,ce.data])),I=Bt.dot,v=new Set(Object.keys(Sb)),x=({yarnPath:ce,ignorePath:me,injectEnvironmentFiles:he})=>({yarnPath:ce,ignorePath:me,injectEnvironmentFiles:he}),C=({yarnPath:ce,ignorePath:me,injectEnvironmentFiles:he,...Be})=>{let we={};for(let[g,Ee]of Object.entries(Be))v.has(g)&&(we[g]=Ee);return we},R=({yarnPath:ce,ignorePath:me,...he})=>{let Be={};for(let[we,g]of Object.entries(he))v.has(we)||(Be[we]=g);return Be};if(A.importSettings(x(Sb)),A.useWithSource("<environment>",x(u),e,{strict:!1}),E){let[ce,me]=E;A.useWithSource(ce,x(me),I,{strict:!1})}if(a){if(await iot({configuration:A,selfPath:a})!==null)return A;A.useWithSource("<override>",{ignorePath:!0},e,{strict:!1,overwrite:!0})}let L=await rA.findProjectCwd(e);A.startingCwd=e,A.projectCwd=L;let U=Object.assign(Object.create(null),process.env);A.env=U;let J=await Promise.all(A.get("injectEnvironmentFiles").map(async ce=>{let me=ce.endsWith("?")?await oe.readFilePromise(ce.slice(0,-1),"utf8").catch(()=>""):await oe.readFilePromise(ce,"utf8");return(0,Sle.parse)(me)}));for(let ce of J)for(let[me,he]of Object.entries(ce))A.env[me]=sP(he,{env:U});if(A.importSettings(C(Sb)),A.useWithSource("<environment>",C(u),e,{strict:o}),E){let[ce,me]=E;A.useWithSource(ce,C(me),I,{strict:o})}let te=ce=>"default"in ce?ce.default:ce,ae=new Map([["@@core",sse]]);if(r!==null)for(let ce of r.plugins.keys())ae.set(ce,te(r.modules.get(ce)));for(let[ce,me]of ae)A.activatePlugin(ce,me);let fe=new Map([]);if(r!==null){let ce=new Map;for(let Be of Ple.builtinModules)ce.set(Be,()=>Df(Be));for(let[Be,we]of r.modules)ce.set(Be,()=>we);let me=new Set,he=async(Be,we)=>{let{factory:g,name:Ee}=Df(Be);if(!g||me.has(Ee))return;let Se=new Map(ce),le=ee=>{if(Se.has(ee))return Se.get(ee)();throw new it(`This plugin cannot access the package referenced via ${ee} which is neither a builtin, nor an exposed entry`)},ne=await Ky(async()=>te(await g(le)),ee=>`${ee} (when initializing ${Ee}, defined in ${we})`);ce.set(Ee,()=>ne),me.add(Ee),fe.set(Ee,ne)};if(u.plugins)for(let Be of u.plugins.split(";")){let we=V.resolve(e,ue.toPortablePath(Be));await he(we,"<environment>")}for(let{path:Be,cwd:we,data:g}of p)if(!!n&&!!Array.isArray(g.plugins))for(let Ee of g.plugins){let Se=typeof Ee!="string"?Ee.path:Ee,le=Ee?.spec??"",ne=Ee?.checksum??"";if(v1.has(le))continue;let ee=V.resolve(we,ue.toPortablePath(Se));if(!await oe.existsPromise(ee)){if(!le){let At=Mt(A,V.basename(ee,".cjs"),yt.NAME),H=Mt(A,".gitignore",yt.NAME),at=Mt(A,A.values.get("rcFilename"),yt.NAME),Re=Mt(A,"https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored",yt.URL);throw new it(`Missing source for the ${At} plugin - please try to remove the plugin from ${at} then reinstall it manually. This error usually occurs because ${H} is incorrect, check ${Re} to make sure your plugin folder isn't gitignored.`)}if(!le.match(/^https?:/)){let At=Mt(A,V.basename(ee,".cjs"),yt.NAME),H=Mt(A,A.values.get("rcFilename"),yt.NAME);throw new it(`Failed to recognize the source for the ${At} plugin - please try to delete the plugin from ${H} then reinstall it manually.`)}let Ie=await L4(le,{configuration:A}),Fe=zs(Ie);if(ne&&ne!==Fe){let At=Mt(A,V.basename(ee,".cjs"),yt.NAME),H=Mt(A,A.values.get("rcFilename"),yt.NAME),at=Mt(A,`yarn plugin import ${le}`,yt.CODE);throw new it(`Failed to fetch the ${At} plugin from its remote location: its checksum seems to have changed. If this is expected, please remove the plugin from ${H} then run ${at} to reimport it.`)}await oe.mkdirPromise(V.dirname(ee),{recursive:!0}),await oe.writeFilePromise(ee,Ie)}await he(ee,Be)}}for(let[ce,me]of fe)A.activatePlugin(ce,me);if(A.useWithSource("<environment>",R(u),e,{strict:o}),E){let[ce,me]=E;A.useWithSource(ce,R(me),I,{strict:o})}return A.get("enableGlobalCache")&&(A.values.set("cacheFolder",`${A.get("globalFolder")}/cache`),A.sources.set("cacheFolder","<internal>")),A}static async findRcFiles(e){let r=G4(),o=[],a=e,n=null;for(;a!==n;){n=a;let u=V.join(n,r);if(oe.existsSync(u)){let A=await oe.readFilePromise(u,"utf8"),p;try{p=Ki(A)}catch{let E="";throw A.match(/^\s+(?!-)[^:]+\s+\S+/m)&&(E=" (in particular, make sure you list the colons after each key name)"),new it(`Parse error when loading ${u}; please check it's proper Yaml${E}`)}o.unshift({path:u,cwd:n,data:p})}a=V.dirname(n)}return o}static async findFolderRcFile(e){let r=V.join(e,dr.rc),o;try{o=await oe.readFilePromise(r,"utf8")}catch(n){if(n.code==="ENOENT")return null;throw n}let a=Ki(o);return{path:r,cwd:e,data:a}}static async findProjectCwd(e){let r=null,o=e,a=null;for(;o!==a;){if(a=o,oe.existsSync(V.join(a,dr.lockfile)))return a;oe.existsSync(V.join(a,dr.manifest))&&(r=a),o=V.dirname(a)}return r}static async updateConfiguration(e,r,o={}){let a=G4(),n=V.join(e,a),u=oe.existsSync(n)?Ki(await oe.readFilePromise(n,"utf8")):{},A=!1,p;if(typeof r=="function"){try{p=r(u)}catch{p=r({})}if(p===u)return!1}else{p=u;for(let h of Object.keys(r)){let E=u[h],I=r[h],v;if(typeof I=="function")try{v=I(E)}catch{v=I(void 0)}else v=I;E!==v&&(v===rA.deleteProperty?delete p[h]:p[h]=v,A=!0)}if(!A)return!1}return await oe.changeFilePromise(n,Ba(p),{automaticNewlines:!0}),!0}static async addPlugin(e,r){r.length!==0&&await rA.updateConfiguration(e,o=>{let a=o.plugins??[];if(a.length===0)return{...o,plugins:r};let n=[],u=[...r];for(let A of a){let p=typeof A!="string"?A.path:A,h=u.find(E=>E.path===p);h?(n.push(h),u=u.filter(E=>E!==h)):n.push(A)}return n.push(...u),{...o,plugins:n}})}static async updateHomeConfiguration(e){let r=EE();return await rA.updateConfiguration(r,e)}activatePlugin(e,r){this.plugins.set(e,r),typeof r.configuration<"u"&&this.importSettings(r.configuration)}importSettings(e){for(let[r,o]of Object.entries(e))if(o!=null){if(this.settings.has(r))throw new Error(`Cannot redefine settings "${r}"`);this.settings.set(r,o),this.values.set(r,W4(this,o))}}useWithSource(e,r,o,a){try{this.use(e,r,o,a)}catch(n){throw n.message+=` (in ${Mt(this,e,yt.PATH)})`,n}}use(e,r,o,{strict:a=!0,overwrite:n=!1}={}){a=a&&this.get("enableStrictSettings");for(let u of["enableStrictSettings",...Object.keys(r)]){let A=r[u],p=mM(A);if(p&&(e=p),typeof A>"u"||u==="plugins"||e==="<environment>"&&zst.has(u))continue;if(u==="rcFilename")throw new it(`The rcFilename settings can only be set via ${`${bb}RC_FILENAME`.toUpperCase()}, not via a rc file`);let h=this.settings.get(u);if(!h){let I=EE(),v=e[0]!=="<"?V.dirname(e):null;if(a&&!(v!==null?I===v:!1))throw new it(`Unrecognized or legacy configuration settings found: ${u} - run "yarn config -v" to see the list of settings supported in Yarn`);this.invalid.set(u,e);continue}if(this.sources.has(u)&&!(n||h.type==="MAP"||h.isArray&&h.concatenateValues))continue;let E;try{E=Y4(this,u,A,h,o)}catch(I){throw I.message+=` in ${Mt(this,e,yt.PATH)}`,I}if(u==="enableStrictSettings"&&e!=="<environment>"){a=E;continue}if(h.type==="MAP"){let I=this.values.get(u);this.values.set(u,new Map(n?[...I,...E]:[...E,...I])),this.sources.set(u,`${this.sources.get(u)}, ${e}`)}else if(h.isArray&&h.concatenateValues){let I=this.values.get(u);this.values.set(u,n?[...I,...E]:[...E,...I]),this.sources.set(u,`${this.sources.get(u)}, ${e}`)}else this.values.set(u,E),this.sources.set(u,e)}}get(e){if(!this.values.has(e))throw new Error(`Invalid configuration key "${e}"`);return this.values.get(e)}getSpecial(e,{hideSecrets:r=!1,getNativePaths:o=!1}){let a=this.get(e),n=this.settings.get(e);if(typeof n>"u")throw new it(`Couldn't find a configuration settings named "${e}"`);return Pb(a,n,{hideSecrets:r,getNativePaths:o})}getSubprocessStreams(e,{header:r,prefix:o,report:a}){let n,u,A=oe.createWriteStream(e);if(this.get("enableInlineBuilds")){let p=a.createStreamReporter(`${o} ${Mt(this,"STDOUT","green")}`),h=a.createStreamReporter(`${o} ${Mt(this,"STDERR","red")}`);n=new j4.PassThrough,n.pipe(p),n.pipe(A),u=new j4.PassThrough,u.pipe(h),u.pipe(A)}else n=A,u=A,typeof r<"u"&&n.write(`${r}
+`);return{stdout:n,stderr:u}}makeResolver(){let e=[];for(let r of this.plugins.values())for(let o of r.resolvers||[])e.push(new o);return new Dd([new c1,new Xn,...e])}makeFetcher(){let e=[];for(let r of this.plugins.values())for(let o of r.fetchers||[])e.push(new o);return new hE([new gE,new mE,...e])}getLinkers(){let e=[];for(let r of this.plugins.values())for(let o of r.linkers||[])e.push(new o);return e}getSupportedArchitectures(){let e=B1(),r=this.get("supportedArchitectures"),o=r.get("os");o!==null&&(o=o.map(u=>u==="current"?e.os:u));let a=r.get("cpu");a!==null&&(a=a.map(u=>u==="current"?e.cpu:u));let n=r.get("libc");return n!==null&&(n=sl(n,u=>u==="current"?e.libc??sl.skip:u)),{os:o,cpu:a,libc:n}}async getPackageExtensions(){if(this.packageExtensions!==null)return this.packageExtensions;this.packageExtensions=new Map;let e=this.packageExtensions,r=(o,a,{userProvided:n=!1}={})=>{if(!xa(o.range))throw new Error("Only semver ranges are allowed as keys for the packageExtensions setting");let u=new Ot;u.load(a,{yamlCompatibilityMode:!0});let A=Yy(e,o.identHash),p=[];A.push([o.range,p]);let h={status:"inactive",userProvided:n,parentDescriptor:o};for(let E of u.dependencies.values())p.push({...h,type:"Dependency",descriptor:E});for(let E of u.peerDependencies.values())p.push({...h,type:"PeerDependency",descriptor:E});for(let[E,I]of u.peerDependenciesMeta)for(let[v,x]of Object.entries(I))p.push({...h,type:"PeerDependencyMeta",selector:E,key:v,value:x})};await this.triggerHook(o=>o.registerPackageExtensions,this,r);for(let[o,a]of this.get("packageExtensions"))r(ih(o,!0),iP(a),{userProvided:!0});return e}normalizeLocator(e){return xa(e.reference)?Qs(e,`${this.get("defaultProtocol")}${e.reference}`):FE.test(e.reference)?Qs(e,`${this.get("defaultProtocol")}${e.reference}`):e}normalizeDependency(e){return xa(e.range)?In(e,`${this.get("defaultProtocol")}${e.range}`):FE.test(e.range)?In(e,`${this.get("defaultProtocol")}${e.range}`):e}normalizeDependencyMap(e){return new Map([...e].map(([r,o])=>[r,this.normalizeDependency(o)]))}normalizePackage(e,{packageExtensions:r}){let o=e1(e),a=r.get(e.identHash);if(typeof a<"u"){let u=e.version;if(u!==null){for(let[A,p]of a)if(!!kf(u,A))for(let h of p)switch(h.status==="inactive"&&(h.status="redundant"),h.type){case"Dependency":typeof o.dependencies.get(h.descriptor.identHash)>"u"&&(h.status="active",o.dependencies.set(h.descriptor.identHash,this.normalizeDependency(h.descriptor)));break;case"PeerDependency":typeof o.peerDependencies.get(h.descriptor.identHash)>"u"&&(h.status="active",o.peerDependencies.set(h.descriptor.identHash,h.descriptor));break;case"PeerDependencyMeta":{let E=o.peerDependenciesMeta.get(h.selector);(typeof E>"u"||!Object.hasOwn(E,h.key)||E[h.key]!==h.value)&&(h.status="active",ol(o.peerDependenciesMeta,h.selector,()=>({}))[h.key]=h.value)}break;default:yL(h)}}}let n=u=>u.scope?`${u.scope}__${u.name}`:`${u.name}`;for(let u of o.peerDependenciesMeta.keys()){let A=Js(u);o.peerDependencies.has(A.identHash)||o.peerDependencies.set(A.identHash,In(A,"*"))}for(let u of o.peerDependencies.values()){if(u.scope==="types")continue;let A=n(u),p=eA("types",A),h=fn(p);o.peerDependencies.has(p.identHash)||o.peerDependenciesMeta.has(h)||(o.peerDependencies.set(p.identHash,In(p,"*")),o.peerDependenciesMeta.set(h,{optional:!0}))}return o.dependencies=new Map(ks(o.dependencies,([,u])=>Pa(u))),o.peerDependencies=new Map(ks(o.peerDependencies,([,u])=>Pa(u))),o}getLimit(e){return ol(this.limits,e,()=>(0,ble.default)(this.get(e)))}async triggerHook(e,...r){for(let o of this.plugins.values()){let a=o.hooks;if(!a)continue;let n=e(a);!n||await n(...r)}}async triggerMultipleHooks(e,r){for(let o of r)await this.triggerHook(e,...o)}async reduceHook(e,r,...o){let a=r;for(let n of this.plugins.values()){let u=n.hooks;if(!u)continue;let A=e(u);!A||(a=await A(a,...o))}return a}async firstHook(e,...r){for(let o of this.plugins.values()){let a=o.hooks;if(!a)continue;let n=e(a);if(!n)continue;let u=await n(...r);if(typeof u<"u")return u}return null}},Ke=rA;Ke.deleteProperty=Symbol(),Ke.telemetry=null});var Ur={};Vt(Ur,{EndStrategy:()=>z4,ExecError:()=>kb,PipeError:()=>P1,execvp:()=>_4,pipevp:()=>qc});function bd(t){return t!==null&&typeof t.fd=="number"}function K4(){}function V4(){for(let t of xd)t.kill()}async function qc(t,e,{cwd:r,env:o=process.env,strict:a=!1,stdin:n=null,stdout:u,stderr:A,end:p=2}){let h=["pipe","pipe","pipe"];n===null?h[0]="ignore":bd(n)&&(h[0]=n),bd(u)&&(h[1]=u),bd(A)&&(h[2]=A);let E=(0,J4.default)(t,e,{cwd:ue.fromPortablePath(r),env:{...o,PWD:ue.fromPortablePath(r)},stdio:h});xd.add(E),xd.size===1&&(process.on("SIGINT",K4),process.on("SIGTERM",V4)),!bd(n)&&n!==null&&n.pipe(E.stdin),bd(u)||E.stdout.pipe(u,{end:!1}),bd(A)||E.stderr.pipe(A,{end:!1});let I=()=>{for(let v of new Set([u,A]))bd(v)||v.end()};return new Promise((v,x)=>{E.on("error",C=>{xd.delete(E),xd.size===0&&(process.off("SIGINT",K4),process.off("SIGTERM",V4)),(p===2||p===1)&&I(),x(C)}),E.on("close",(C,R)=>{xd.delete(E),xd.size===0&&(process.off("SIGINT",K4),process.off("SIGTERM",V4)),(p===2||p===1&&C!==0)&&I(),C===0||!a?v({code:X4(C,R)}):x(new P1({fileName:t,code:C,signal:R}))})})}async function _4(t,e,{cwd:r,env:o=process.env,encoding:a="utf8",strict:n=!1}){let u=["ignore","pipe","pipe"],A=[],p=[],h=ue.fromPortablePath(r);typeof o.PWD<"u"&&(o={...o,PWD:h});let E=(0,J4.default)(t,e,{cwd:h,env:o,stdio:u});return E.stdout.on("data",I=>{A.push(I)}),E.stderr.on("data",I=>{p.push(I)}),await new Promise((I,v)=>{E.on("error",x=>{let C=Ke.create(r),R=Mt(C,t,yt.PATH);v(new zt(1,`Process ${R} failed to spawn`,L=>{L.reportError(1,`  ${zu(C,{label:"Thrown Error",value:_c(yt.NO_HINT,x.message)})}`)}))}),E.on("close",(x,C)=>{let R=a==="buffer"?Buffer.concat(A):Buffer.concat(A).toString(a),L=a==="buffer"?Buffer.concat(p):Buffer.concat(p).toString(a);x===0||!n?I({code:X4(x,C),stdout:R,stderr:L}):v(new kb({fileName:t,code:x,signal:C,stdout:R,stderr:L}))})})}function X4(t,e){let r=sot.get(e);return typeof r<"u"?128+r:t??1}function oot(t,e,{configuration:r,report:o}){o.reportError(1,`  ${zu(r,t!==null?{label:"Exit Code",value:_c(yt.NUMBER,t)}:{label:"Exit Signal",value:_c(yt.CODE,e)})}`)}var J4,z4,P1,kb,xd,sot,Db=Et(()=>{St();J4=$e(sT());S1();Yl();Gl();z4=(o=>(o[o.Never=0]="Never",o[o.ErrorCode=1]="ErrorCode",o[o.Always=2]="Always",o))(z4||{}),P1=class extends zt{constructor({fileName:r,code:o,signal:a}){let n=Ke.create(V.cwd()),u=Mt(n,r,yt.PATH);super(1,`Child ${u} reported an error`,A=>{oot(o,a,{configuration:n,report:A})});this.code=X4(o,a)}},kb=class extends P1{constructor({fileName:r,code:o,signal:a,stdout:n,stderr:u}){super({fileName:r,code:o,signal:a});this.stdout=n,this.stderr=u}};xd=new Set;sot=new Map([["SIGINT",2],["SIGQUIT",3],["SIGKILL",9],["SIGTERM",15]])});function Qle(t){kle=t}function b1(){return typeof Z4>"u"&&(Z4=kle()),Z4}var Z4,kle,$4=Et(()=>{kle=()=>{throw new Error("Assertion failed: No libzip instance is available, and no factory was configured")}});var Fle=_((Qb,tU)=>{var aot=Object.assign({},ve("fs")),eU=function(){var t=typeof document<"u"&&document.currentScript?document.currentScript.src:void 0;return typeof __filename<"u"&&(t=t||__filename),function(e){e=e||{};var r=typeof e<"u"?e:{},o,a;r.ready=new Promise(function(We,tt){o=We,a=tt});var n={},u;for(u in r)r.hasOwnProperty(u)&&(n[u]=r[u]);var A=[],p="./this.program",h=function(We,tt){throw tt},E=!1,I=!0,v="";function x(We){return r.locateFile?r.locateFile(We,v):v+We}var C,R,L,U;I&&(E?v=ve("path").dirname(v)+"/":v=__dirname+"/",C=function(tt,It){var nr=ii(tt);return nr?It?nr:nr.toString():(L||(L=aot),U||(U=ve("path")),tt=U.normalize(tt),L.readFileSync(tt,It?null:"utf8"))},R=function(tt){var It=C(tt,!0);return It.buffer||(It=new Uint8Array(It)),Ee(It.buffer),It},process.argv.length>1&&(p=process.argv[1].replace(/\\/g,"/")),A=process.argv.slice(2),h=function(We){process.exit(We)},r.inspect=function(){return"[Emscripten Module object]"});var J=r.print||console.log.bind(console),te=r.printErr||console.warn.bind(console);for(u in n)n.hasOwnProperty(u)&&(r[u]=n[u]);n=null,r.arguments&&(A=r.arguments),r.thisProgram&&(p=r.thisProgram),r.quit&&(h=r.quit);var ae=0,fe=function(We){ae=We},ce;r.wasmBinary&&(ce=r.wasmBinary);var me=r.noExitRuntime||!0;typeof WebAssembly!="object"&&Ti("no native wasm support detected");function he(We,tt,It){switch(tt=tt||"i8",tt.charAt(tt.length-1)==="*"&&(tt="i32"),tt){case"i1":return He[We>>0];case"i8":return He[We>>0];case"i16":return cp((We>>1)*2);case"i32":return Os((We>>2)*4);case"i64":return Os((We>>2)*4);case"float":return cu((We>>2)*4);case"double":return lp((We>>3)*8);default:Ti("invalid type for getValue: "+tt)}return null}var Be,we=!1,g;function Ee(We,tt){We||Ti("Assertion failed: "+tt)}function Se(We){var tt=r["_"+We];return Ee(tt,"Cannot call unknown function "+We+", make sure it is exported"),tt}function le(We,tt,It,nr,$){var ye={string:function(es){var bi=0;if(es!=null&&es!==0){var jo=(es.length<<2)+1;bi=Un(jo),At(es,bi,jo)}return bi},array:function(es){var bi=Un(es.length);return Re(es,bi),bi}};function Le(es){return tt==="string"?Ie(es):tt==="boolean"?Boolean(es):es}var pt=Se(We),ht=[],Tt=0;if(nr)for(var er=0;er<nr.length;er++){var $r=ye[It[er]];$r?(Tt===0&&(Tt=ms()),ht[er]=$r(nr[er])):ht[er]=nr[er]}var Gi=pt.apply(null,ht);return Gi=Le(Gi),Tt!==0&&_s(Tt),Gi}function ne(We,tt,It,nr){It=It||[];var $=It.every(function(Le){return Le==="number"}),ye=tt!=="string";return ye&&$&&!nr?Se(We):function(){return le(We,tt,It,arguments,nr)}}var ee=new TextDecoder("utf8");function Ie(We,tt){if(!We)return"";for(var It=We+tt,nr=We;!(nr>=It)&&Te[nr];)++nr;return ee.decode(Te.subarray(We,nr))}function Fe(We,tt,It,nr){if(!(nr>0))return 0;for(var $=It,ye=It+nr-1,Le=0;Le<We.length;++Le){var pt=We.charCodeAt(Le);if(pt>=55296&&pt<=57343){var ht=We.charCodeAt(++Le);pt=65536+((pt&1023)<<10)|ht&1023}if(pt<=127){if(It>=ye)break;tt[It++]=pt}else if(pt<=2047){if(It+1>=ye)break;tt[It++]=192|pt>>6,tt[It++]=128|pt&63}else if(pt<=65535){if(It+2>=ye)break;tt[It++]=224|pt>>12,tt[It++]=128|pt>>6&63,tt[It++]=128|pt&63}else{if(It+3>=ye)break;tt[It++]=240|pt>>18,tt[It++]=128|pt>>12&63,tt[It++]=128|pt>>6&63,tt[It++]=128|pt&63}}return tt[It]=0,It-$}function At(We,tt,It){return Fe(We,Te,tt,It)}function H(We){for(var tt=0,It=0;It<We.length;++It){var nr=We.charCodeAt(It);nr>=55296&&nr<=57343&&(nr=65536+((nr&1023)<<10)|We.charCodeAt(++It)&1023),nr<=127?++tt:nr<=2047?tt+=2:nr<=65535?tt+=3:tt+=4}return tt}function at(We){var tt=H(We)+1,It=Li(tt);return It&&Fe(We,He,It,tt),It}function Re(We,tt){He.set(We,tt)}function ke(We,tt){return We%tt>0&&(We+=tt-We%tt),We}var xe,He,Te,Je,je,b,w,P,y,F;function z(We){xe=We,r.HEAP_DATA_VIEW=F=new DataView(We),r.HEAP8=He=new Int8Array(We),r.HEAP16=Je=new Int16Array(We),r.HEAP32=b=new Int32Array(We),r.HEAPU8=Te=new Uint8Array(We),r.HEAPU16=je=new Uint16Array(We),r.HEAPU32=w=new Uint32Array(We),r.HEAPF32=P=new Float32Array(We),r.HEAPF64=y=new Float64Array(We)}var X=r.INITIAL_MEMORY||16777216,Z,ie=[],Pe=[],Ne=[],ot=!1;function dt(){if(r.preRun)for(typeof r.preRun=="function"&&(r.preRun=[r.preRun]);r.preRun.length;)bt(r.preRun.shift());oo(ie)}function Gt(){ot=!0,oo(Pe)}function $t(){if(r.postRun)for(typeof r.postRun=="function"&&(r.postRun=[r.postRun]);r.postRun.length;)Qr(r.postRun.shift());oo(Ne)}function bt(We){ie.unshift(We)}function an(We){Pe.unshift(We)}function Qr(We){Ne.unshift(We)}var mr=0,br=null,Wr=null;function Kn(We){mr++,r.monitorRunDependencies&&r.monitorRunDependencies(mr)}function Ns(We){if(mr--,r.monitorRunDependencies&&r.monitorRunDependencies(mr),mr==0&&(br!==null&&(clearInterval(br),br=null),Wr)){var tt=Wr;Wr=null,tt()}}r.preloadedImages={},r.preloadedAudios={};function Ti(We){r.onAbort&&r.onAbort(We),We+="",te(We),we=!0,g=1,We="abort("+We+"). Build with -s ASSERTIONS=1 for more info.";var tt=new WebAssembly.RuntimeError(We);throw a(tt),tt}var ps="data:application/octet-stream;base64,";function io(We){return We.startsWith(ps)}var Pi="data:application/octet-stream;base64,AGFzbQEAAAAB/wEkYAN/f38Bf2ABfwF/YAJ/fwF/YAF/AGAEf39/fwF/YAN/f38AYAV/f39/fwF/YAJ/fwBgBH9/f38AYAABf2AFf39/fn8BfmAEf35/fwF/YAR/f35/AX5gAn9+AX9gA398fwBgA39/fgF/YAF/AX5gBn9/f39/fwF/YAN/fn8Bf2AEf39/fwF+YAV/f35/fwF/YAR/f35/AX9gA39/fgF+YAJ/fgBgAn9/AX5gBX9/f39/AGADf35/AX5gBX5+f35/AX5gA39/fwF+YAZ/fH9/f38Bf2AAAGAHf35/f39+fwF/YAV/fn9/fwF/YAV/f39/fwF+YAJ+fwF/YAJ/fAACJQYBYQFhAAMBYQFiAAEBYQFjAAABYQFkAAEBYQFlAAIBYQFmAAED5wHlAQMAAwEDAwEHDAgDFgcNEgEDDRcFAQ8DEAUQAwIBAhgECxkEAQMBBQsFAwMDARACBAMAAggLBwEAAwADGgQDGwYGABwBBgMTFBEHBwcVCx4ABAgHBAICAgAfAQICAgIGFSAAIQAiAAIBBgIHAg0LEw0FAQUCACMDAQAUAAAGBQECBQUDCwsSAgEDBQIHAQEICAACCQQEAQABCAEBCQoBAwkBAQEBBgEGBgYABAIEBAQGEQQEAAARAAEDCQEJAQAJCQkBAQECCgoAAAMPAQEBAwACAgICBQIABwAKBgwHAAADAgICBQEEBQFwAT8/BQcBAYACgIACBgkBfwFBgInBAgsH+gEzAWcCAAFoAFQBaQDqAQFqALsBAWsAwQEBbACpAQFtAKgBAW4ApwEBbwClAQFwAKMBAXEAoAEBcgCbAQFzAMABAXQAugEBdQC5AQF2AEsBdwDiAQF4AMgBAXkAxwEBegDCAQFBAMkBAUIAuAEBQwAGAUQACQFFAKYBAUYAtwEBRwC2AQFIALUBAUkAtAEBSgCzAQFLALIBAUwAsQEBTQCwAQFOAK8BAU8AvAEBUACuAQFRAK0BAVIArAEBUwAaAVQACwFVAKQBAVYAMgFXAQABWACrAQFZAKoBAVoAxgEBXwDFAQEkAMQBAmFhAL8BAmJhAL4BAmNhAL0BCXgBAEEBCz6iAeMBjgGQAVpbjwFYnwGdAVeeAV1coQFZVlWcAZoBmQGYAZcBlgGVAZQBkwGSAZEB6QHoAecB5gHlAeQB4QHfAeAB3gHdAdwB2gHbAYUB2QHYAdcB1gHVAdQB0wHSAdEB0AHPAc4BzQHMAcsBygE4wwEK1N8G5QHMDAEHfwJAIABFDQAgAEEIayIDIABBBGsoAgAiAUF4cSIAaiEFAkAgAUEBcQ0AIAFBA3FFDQEgAyADKAIAIgFrIgNBxIQBKAIASQ0BIAAgAWohACADQciEASgCAEcEQCABQf8BTQRAIAMoAggiAiABQQN2IgRBA3RB3IQBakYaIAIgAygCDCIBRgRAQbSEAUG0hAEoAgBBfiAEd3E2AgAMAwsgAiABNgIMIAEgAjYCCAwCCyADKAIYIQYCQCADIAMoAgwiAUcEQCADKAIIIgIgATYCDCABIAI2AggMAQsCQCADQRRqIgIoAgAiBA0AIANBEGoiAigCACIEDQBBACEBDAELA0AgAiEHIAQiAUEUaiICKAIAIgQNACABQRBqIQIgASgCECIEDQALIAdBADYCAAsgBkUNAQJAIAMgAygCHCICQQJ0QeSGAWoiBCgCAEYEQCAEIAE2AgAgAQ0BQbiEAUG4hAEoAgBBfiACd3E2AgAMAwsgBkEQQRQgBigCECADRhtqIAE2AgAgAUUNAgsgASAGNgIYIAMoAhAiAgRAIAEgAjYCECACIAE2AhgLIAMoAhQiAkUNASABIAI2AhQgAiABNgIYDAELIAUoAgQiAUEDcUEDRw0AQbyEASAANgIAIAUgAUF+cTYCBCADIABBAXI2AgQgACADaiAANgIADwsgAyAFTw0AIAUoAgQiAUEBcUUNAAJAIAFBAnFFBEAgBUHMhAEoAgBGBEBBzIQBIAM2AgBBwIQBQcCEASgCACAAaiIANgIAIAMgAEEBcjYCBCADQciEASgCAEcNA0G8hAFBADYCAEHIhAFBADYCAA8LIAVByIQBKAIARgRAQciEASADNgIAQbyEAUG8hAEoAgAgAGoiADYCACADIABBAXI2AgQgACADaiAANgIADwsgAUF4cSAAaiEAAkAgAUH/AU0EQCAFKAIIIgIgAUEDdiIEQQN0QdyEAWpGGiACIAUoAgwiAUYEQEG0hAFBtIQBKAIAQX4gBHdxNgIADAILIAIgATYCDCABIAI2AggMAQsgBSgCGCEGAkAgBSAFKAIMIgFHBEAgBSgCCCICQcSEASgCAEkaIAIgATYCDCABIAI2AggMAQsCQCAFQRRqIgIoAgAiBA0AIAVBEGoiAigCACIEDQBBACEBDAELA0AgAiEHIAQiAUEUaiICKAIAIgQNACABQRBqIQIgASgCECIEDQALIAdBADYCAAsgBkUNAAJAIAUgBSgCHCICQQJ0QeSGAWoiBCgCAEYEQCAEIAE2AgAgAQ0BQbiEAUG4hAEoAgBBfiACd3E2AgAMAgsgBkEQQRQgBigCECAFRhtqIAE2AgAgAUUNAQsgASAGNgIYIAUoAhAiAgRAIAEgAjYCECACIAE2AhgLIAUoAhQiAkUNACABIAI2AhQgAiABNgIYCyADIABBAXI2AgQgACADaiAANgIAIANByIQBKAIARw0BQbyEASAANgIADwsgBSABQX5xNgIEIAMgAEEBcjYCBCAAIANqIAA2AgALIABB/wFNBEAgAEEDdiIBQQN0QdyEAWohAAJ/QbSEASgCACICQQEgAXQiAXFFBEBBtIQBIAEgAnI2AgAgAAwBCyAAKAIICyECIAAgAzYCCCACIAM2AgwgAyAANgIMIAMgAjYCCA8LQR8hAiADQgA3AhAgAEH///8HTQRAIABBCHYiASABQYD+P2pBEHZBCHEiAXQiAiACQYDgH2pBEHZBBHEiAnQiBCAEQYCAD2pBEHZBAnEiBHRBD3YgASACciAEcmsiAUEBdCAAIAFBFWp2QQFxckEcaiECCyADIAI2AhwgAkECdEHkhgFqIQECQAJAAkBBuIQBKAIAIgRBASACdCIHcUUEQEG4hAEgBCAHcjYCACABIAM2AgAgAyABNgIYDAELIABBAEEZIAJBAXZrIAJBH0YbdCECIAEoAgAhAQNAIAEiBCgCBEF4cSAARg0CIAJBHXYhASACQQF0IQIgBCABQQRxaiIHQRBqKAIAIgENAAsgByADNgIQIAMgBDYCGAsgAyADNgIMIAMgAzYCCAwBCyAEKAIIIgAgAzYCDCAEIAM2AgggA0EANgIYIAMgBDYCDCADIAA2AggLQdSEAUHUhAEoAgBBAWsiAEF/IAAbNgIACwuDBAEDfyACQYAETwRAIAAgASACEAIaIAAPCyAAIAJqIQMCQCAAIAFzQQNxRQRAAkAgAEEDcUUEQCAAIQIMAQsgAkEBSARAIAAhAgwBCyAAIQIDQCACIAEtAAA6AAAgAUEBaiEBIAJBAWoiAkEDcUUNASACIANJDQALCwJAIANBfHEiBEHAAEkNACACIARBQGoiBUsNAANAIAIgASgCADYCACACIAEoAgQ2AgQgAiABKAIINgIIIAIgASgCDDYCDCACIAEoAhA2AhAgAiABKAIUNgIUIAIgASgCGDYCGCACIAEoAhw2AhwgAiABKAIgNgIgIAIgASgCJDYCJCACIAEoAig2AiggAiABKAIsNgIsIAIgASgCMDYCMCACIAEoAjQ2AjQgAiABKAI4NgI4IAIgASgCPDYCPCABQUBrIQEgAkFAayICIAVNDQALCyACIARPDQEDQCACIAEoAgA2AgAgAUEEaiEBIAJBBGoiAiAESQ0ACwwBCyADQQRJBEAgACECDAELIAAgA0EEayIESwRAIAAhAgwBCyAAIQIDQCACIAEtAAA6AAAgAiABLQABOgABIAIgAS0AAjoAAiACIAEtAAM6AAMgAUEEaiEBIAJBBGoiAiAETQ0ACwsgAiADSQRAA0AgAiABLQAAOgAAIAFBAWohASACQQFqIgIgA0cNAAsLIAALGgAgAARAIAAtAAEEQCAAKAIEEAYLIAAQBgsLoi4BDH8jAEEQayIMJAACQAJAAkACQAJAAkACQAJAAkACQAJAAkAgAEH0AU0EQEG0hAEoAgAiBUEQIABBC2pBeHEgAEELSRsiCEEDdiICdiIBQQNxBEAgAUF/c0EBcSACaiIDQQN0IgFB5IQBaigCACIEQQhqIQACQCAEKAIIIgIgAUHchAFqIgFGBEBBtIQBIAVBfiADd3E2AgAMAQsgAiABNgIMIAEgAjYCCAsgBCADQQN0IgFBA3I2AgQgASAEaiIBIAEoAgRBAXI2AgQMDQsgCEG8hAEoAgAiCk0NASABBEACQEECIAJ0IgBBACAAa3IgASACdHEiAEEAIABrcUEBayIAIABBDHZBEHEiAnYiAUEFdkEIcSIAIAJyIAEgAHYiAUECdkEEcSIAciABIAB2IgFBAXZBAnEiAHIgASAAdiIBQQF2QQFxIgByIAEgAHZqIgNBA3QiAEHkhAFqKAIAIgQoAggiASAAQdyEAWoiAEYEQEG0hAEgBUF+IAN3cSIFNgIADAELIAEgADYCDCAAIAE2AggLIARBCGohACAEIAhBA3I2AgQgBCAIaiICIANBA3QiASAIayIDQQFyNgIEIAEgBGogAzYCACAKBEAgCkEDdiIBQQN0QdyEAWohB0HIhAEoAgAhBAJ/IAVBASABdCIBcUUEQEG0hAEgASAFcjYCACAHDAELIAcoAggLIQEgByAENgIIIAEgBDYCDCAEIAc2AgwgBCABNgIIC0HIhAEgAjYCAEG8hAEgAzYCAAwNC0G4hAEoAgAiBkUNASAGQQAgBmtxQQFrIgAgAEEMdkEQcSICdiIBQQV2QQhxIgAgAnIgASAAdiIBQQJ2QQRxIgByIAEgAHYiAUEBdkECcSIAciABIAB2IgFBAXZBAXEiAHIgASAAdmpBAnRB5IYBaigCACIBKAIEQXhxIAhrIQMgASECA0ACQCACKAIQIgBFBEAgAigCFCIARQ0BCyAAKAIEQXhxIAhrIgIgAyACIANJIgIbIQMgACABIAIbIQEgACECDAELCyABIAhqIgkgAU0NAiABKAIYIQsgASABKAIMIgRHBEAgASgCCCIAQcSEASgCAEkaIAAgBDYCDCAEIAA2AggMDAsgAUEUaiICKAIAIgBFBEAgASgCECIARQ0EIAFBEGohAgsDQCACIQcgACIEQRRqIgIoAgAiAA0AIARBEGohAiAEKAIQIgANAAsgB0EANgIADAsLQX8hCCAAQb9/Sw0AIABBC2oiAEF4cSEIQbiEASgCACIJRQ0AQQAgCGshAwJAAkACQAJ/QQAgCEGAAkkNABpBHyAIQf///wdLDQAaIABBCHYiACAAQYD+P2pBEHZBCHEiAnQiACAAQYDgH2pBEHZBBHEiAXQiACAAQYCAD2pBEHZBAnEiAHRBD3YgASACciAAcmsiAEEBdCAIIABBFWp2QQFxckEcagsiBUECdEHkhgFqKAIAIgJFBEBBACEADAELQQAhACAIQQBBGSAFQQF2ayAFQR9GG3QhAQNAAkAgAigCBEF4cSAIayIHIANPDQAgAiEEIAciAw0AQQAhAyACIQAMAwsgACACKAIUIgcgByACIAFBHXZBBHFqKAIQIgJGGyAAIAcbIQAgAUEBdCEBIAINAAsLIAAgBHJFBEBBAiAFdCIAQQAgAGtyIAlxIgBFDQMgAEEAIABrcUEBayIAIABBDHZBEHEiAnYiAUEFdkEIcSIAIAJyIAEgAHYiAUECdkEEcSIAciABIAB2IgFBAXZBAnEiAHIgASAAdiIBQQF2QQFxIgByIAEgAHZqQQJ0QeSGAWooAgAhAAsgAEUNAQsDQCAAKAIEQXhxIAhrIgEgA0khAiABIAMgAhshAyAAIAQgAhshBCAAKAIQIgEEfyABBSAAKAIUCyIADQALCyAERQ0AIANBvIQBKAIAIAhrTw0AIAQgCGoiBiAETQ0BIAQoAhghBSAEIAQoAgwiAUcEQCAEKAIIIgBBxIQBKAIASRogACABNgIMIAEgADYCCAwKCyAEQRRqIgIoAgAiAEUEQCAEKAIQIgBFDQQgBEEQaiECCwNAIAIhByAAIgFBFGoiAigCACIADQAgAUEQaiECIAEoAhAiAA0ACyAHQQA2AgAMCQsgCEG8hAEoAgAiAk0EQEHIhAEoAgAhAwJAIAIgCGsiAUEQTwRAQbyEASABNgIAQciEASADIAhqIgA2AgAgACABQQFyNgIEIAIgA2ogATYCACADIAhBA3I2AgQMAQtByIQBQQA2AgBBvIQBQQA2AgAgAyACQQNyNgIEIAIgA2oiACAAKAIEQQFyNgIECyADQQhqIQAMCwsgCEHAhAEoAgAiBkkEQEHAhAEgBiAIayIBNgIAQcyEAUHMhAEoAgAiAiAIaiIANgIAIAAgAUEBcjYCBCACIAhBA3I2AgQgAkEIaiEADAsLQQAhACAIQS9qIgkCf0GMiAEoAgAEQEGUiAEoAgAMAQtBmIgBQn83AgBBkIgBQoCggICAgAQ3AgBBjIgBIAxBDGpBcHFB2KrVqgVzNgIAQaCIAUEANgIAQfCHAUEANgIAQYAgCyIBaiIFQQAgAWsiB3EiAiAITQ0KQeyHASgCACIEBEBB5IcBKAIAIgMgAmoiASADTQ0LIAEgBEsNCwtB8IcBLQAAQQRxDQUCQAJAQcyEASgCACIDBEBB9IcBIQADQCADIAAoAgAiAU8EQCABIAAoAgRqIANLDQMLIAAoAggiAA0ACwtBABApIgFBf0YNBiACIQVBkIgBKAIAIgNBAWsiACABcQRAIAIgAWsgACABakEAIANrcWohBQsgBSAITQ0GIAVB/v///wdLDQZB7IcBKAIAIgQEQEHkhwEoAgAiAyAFaiIAIANNDQcgACAESw0HCyAFECkiACABRw0BDAgLIAUgBmsgB3EiBUH+////B0sNBSAFECkiASAAKAIAIAAoAgRqRg0EIAEhAAsCQCAAQX9GDQAgCEEwaiAFTQ0AQZSIASgCACIBIAkgBWtqQQAgAWtxIgFB/v///wdLBEAgACEBDAgLIAEQKUF/RwRAIAEgBWohBSAAIQEMCAtBACAFaxApGgwFCyAAIgFBf0cNBgwECwALQQAhBAwHC0EAIQEMBQsgAUF/Rw0CC0HwhwFB8IcBKAIAQQRyNgIACyACQf7///8HSw0BIAIQKSEBQQAQKSEAIAFBf0YNASAAQX9GDQEgACABTQ0BIAAgAWsiBSAIQShqTQ0BC0HkhwFB5IcBKAIAIAVqIgA2AgBB6IcBKAIAIABJBEBB6IcBIAA2AgALAkACQAJAQcyEASgCACIHBEBB9IcBIQADQCABIAAoAgAiAyAAKAIEIgJqRg0CIAAoAggiAA0ACwwCC0HEhAEoAgAiAEEAIAAgAU0bRQRAQcSEASABNgIAC0EAIQBB+IcBIAU2AgBB9IcBIAE2AgBB1IQBQX82AgBB2IQBQYyIASgCADYCAEGAiAFBADYCAANAIABBA3QiA0HkhAFqIANB3IQBaiICNgIAIANB6IQBaiACNgIAIABBAWoiAEEgRw0AC0HAhAEgBUEoayIDQXggAWtBB3FBACABQQhqQQdxGyIAayICNgIAQcyEASAAIAFqIgA2AgAgACACQQFyNgIEIAEgA2pBKDYCBEHQhAFBnIgBKAIANgIADAILIAAtAAxBCHENACADIAdLDQAgASAHTQ0AIAAgAiAFajYCBEHMhAEgB0F4IAdrQQdxQQAgB0EIakEHcRsiAGoiAjYCAEHAhAFBwIQBKAIAIAVqIgEgAGsiADYCACACIABBAXI2AgQgASAHakEoNgIEQdCEAUGciAEoAgA2AgAMAQtBxIQBKAIAIAFLBEBBxIQBIAE2AgALIAEgBWohAkH0hwEhAAJAAkACQAJAAkACQANAIAIgACgCAEcEQCAAKAIIIgANAQwCCwsgAC0ADEEIcUUNAQtB9IcBIQADQCAHIAAoAgAiAk8EQCACIAAoAgRqIgQgB0sNAwsgACgCCCEADAALAAsgACABNgIAIAAgACgCBCAFajYCBCABQXggAWtBB3FBACABQQhqQQdxG2oiCSAIQQNyNgIEIAJBeCACa0EHcUEAIAJBCGpBB3EbaiIFIAggCWoiBmshAiAFIAdGBEBBzIQBIAY2AgBBwIQBQcCEASgCACACaiIANgIAIAYgAEEBcjYCBAwDCyAFQciEASgCAEYEQEHIhAEgBjYCAEG8hAFBvIQBKAIAIAJqIgA2AgAgBiAAQQFyNgIEIAAgBmogADYCAAwDCyAFKAIEIgBBA3FBAUYEQCAAQXhxIQcCQCAAQf8BTQRAIAUoAggiAyAAQQN2IgBBA3RB3IQBakYaIAMgBSgCDCIBRgRAQbSEAUG0hAEoAgBBfiAAd3E2AgAMAgsgAyABNgIMIAEgAzYCCAwBCyAFKAIYIQgCQCAFIAUoAgwiAUcEQCAFKAIIIgAgATYCDCABIAA2AggMAQsCQCAFQRRqIgAoAgAiAw0AIAVBEGoiACgCACIDDQBBACEBDAELA0AgACEEIAMiAUEUaiIAKAIAIgMNACABQRBqIQAgASgCECIDDQALIARBADYCAAsgCEUNAAJAIAUgBSgCHCIDQQJ0QeSGAWoiACgCAEYEQCAAIAE2AgAgAQ0BQbiEAUG4hAEoAgBBfiADd3E2AgAMAgsgCEEQQRQgCCgCECAFRhtqIAE2AgAgAUUNAQsgASAINgIYIAUoAhAiAARAIAEgADYCECAAIAE2AhgLIAUoAhQiAEUNACABIAA2AhQgACABNgIYCyAFIAdqIQUgAiAHaiECCyAFIAUoAgRBfnE2AgQgBiACQQFyNgIEIAIgBmogAjYCACACQf8BTQRAIAJBA3YiAEEDdEHchAFqIQICf0G0hAEoAgAiAUEBIAB0IgBxRQRAQbSEASAAIAFyNgIAIAIMAQsgAigCCAshACACIAY2AgggACAGNgIMIAYgAjYCDCAGIAA2AggMAwtBHyEAIAJB////B00EQCACQQh2IgAgAEGA/j9qQRB2QQhxIgN0IgAgAEGA4B9qQRB2QQRxIgF0IgAgAEGAgA9qQRB2QQJxIgB0QQ92IAEgA3IgAHJrIgBBAXQgAiAAQRVqdkEBcXJBHGohAAsgBiAANgIcIAZCADcCECAAQQJ0QeSGAWohBAJAQbiEASgCACIDQQEgAHQiAXFFBEBBuIQBIAEgA3I2AgAgBCAGNgIAIAYgBDYCGAwBCyACQQBBGSAAQQF2ayAAQR9GG3QhACAEKAIAIQEDQCABIgMoAgRBeHEgAkYNAyAAQR12IQEgAEEBdCEAIAMgAUEEcWoiBCgCECIBDQALIAQgBjYCECAGIAM2AhgLIAYgBjYCDCAGIAY2AggMAgtBwIQBIAVBKGsiA0F4IAFrQQdxQQAgAUEIakEHcRsiAGsiAjYCAEHMhAEgACABaiIANgIAIAAgAkEBcjYCBCABIANqQSg2AgRB0IQBQZyIASgCADYCACAHIARBJyAEa0EHcUEAIARBJ2tBB3EbakEvayIAIAAgB0EQakkbIgJBGzYCBCACQfyHASkCADcCECACQfSHASkCADcCCEH8hwEgAkEIajYCAEH4hwEgBTYCAEH0hwEgATYCAEGAiAFBADYCACACQRhqIQADQCAAQQc2AgQgAEEIaiEBIABBBGohACABIARJDQALIAIgB0YNAyACIAIoAgRBfnE2AgQgByACIAdrIgRBAXI2AgQgAiAENgIAIARB/wFNBEAgBEEDdiIAQQN0QdyEAWohAgJ/QbSEASgCACIBQQEgAHQiAHFFBEBBtIQBIAAgAXI2AgAgAgwBCyACKAIICyEAIAIgBzYCCCAAIAc2AgwgByACNgIMIAcgADYCCAwEC0EfIQAgB0IANwIQIARB////B00EQCAEQQh2IgAgAEGA/j9qQRB2QQhxIgJ0IgAgAEGA4B9qQRB2QQRxIgF0IgAgAEGAgA9qQRB2QQJxIgB0QQ92IAEgAnIgAHJrIgBBAXQgBCAAQRVqdkEBcXJBHGohAAsgByAANgIcIABBAnRB5IYBaiEDAkBBuIQBKAIAIgJBASAAdCIBcUUEQEG4hAEgASACcjYCACADIAc2AgAgByADNgIYDAELIARBAEEZIABBAXZrIABBH0YbdCEAIAMoAgAhAQNAIAEiAigCBEF4cSAERg0EIABBHXYhASAAQQF0IQAgAiABQQRxaiIDKAIQIgENAAsgAyAHNgIQIAcgAjYCGAsgByAHNgIMIAcgBzYCCAwDCyADKAIIIgAgBjYCDCADIAY2AgggBkEANgIYIAYgAzYCDCAGIAA2AggLIAlBCGohAAwFCyACKAIIIgAgBzYCDCACIAc2AgggB0EANgIYIAcgAjYCDCAHIAA2AggLQcCEASgCACIAIAhNDQBBwIQBIAAgCGsiATYCAEHMhAFBzIQBKAIAIgIgCGoiADYCACAAIAFBAXI2AgQgAiAIQQNyNgIEIAJBCGohAAwDC0GEhAFBMDYCAEEAIQAMAgsCQCAFRQ0AAkAgBCgCHCICQQJ0QeSGAWoiACgCACAERgRAIAAgATYCACABDQFBuIQBIAlBfiACd3EiCTYCAAwCCyAFQRBBFCAFKAIQIARGG2ogATYCACABRQ0BCyABIAU2AhggBCgCECIABEAgASAANgIQIAAgATYCGAsgBCgCFCIARQ0AIAEgADYCFCAAIAE2AhgLAkAgA0EPTQRAIAQgAyAIaiIAQQNyNgIEIAAgBGoiACAAKAIEQQFyNgIEDAELIAQgCEEDcjYCBCAGIANBAXI2AgQgAyAGaiADNgIAIANB/wFNBEAgA0EDdiIAQQN0QdyEAWohAgJ/QbSEASgCACIBQQEgAHQiAHFFBEBBtIQBIAAgAXI2AgAgAgwBCyACKAIICyEAIAIgBjYCCCAAIAY2AgwgBiACNgIMIAYgADYCCAwBC0EfIQAgA0H///8HTQRAIANBCHYiACAAQYD+P2pBEHZBCHEiAnQiACAAQYDgH2pBEHZBBHEiAXQiACAAQYCAD2pBEHZBAnEiAHRBD3YgASACciAAcmsiAEEBdCADIABBFWp2QQFxckEcaiEACyAGIAA2AhwgBkIANwIQIABBAnRB5IYBaiECAkACQCAJQQEgAHQiAXFFBEBBuIQBIAEgCXI2AgAgAiAGNgIAIAYgAjYCGAwBCyADQQBBGSAAQQF2ayAAQR9GG3QhACACKAIAIQgDQCAIIgEoAgRBeHEgA0YNAiAAQR12IQIgAEEBdCEAIAEgAkEEcWoiAigCECIIDQALIAIgBjYCECAGIAE2AhgLIAYgBjYCDCAGIAY2AggMAQsgASgCCCIAIAY2AgwgASAGNgIIIAZBADYCGCAGIAE2AgwgBiAANgIICyAEQQhqIQAMAQsCQCALRQ0AAkAgASgCHCICQQJ0QeSGAWoiACgCACABRgRAIAAgBDYCACAEDQFBuIQBIAZBfiACd3E2AgAMAgsgC0EQQRQgCygCECABRhtqIAQ2AgAgBEUNAQsgBCALNgIYIAEoAhAiAARAIAQgADYCECAAIAQ2AhgLIAEoAhQiAEUNACAEIAA2AhQgACAENgIYCwJAIANBD00EQCABIAMgCGoiAEEDcjYCBCAAIAFqIgAgACgCBEEBcjYCBAwBCyABIAhBA3I2AgQgCSADQQFyNgIEIAMgCWogAzYCACAKBEAgCkEDdiIAQQN0QdyEAWohBEHIhAEoAgAhAgJ/QQEgAHQiACAFcUUEQEG0hAEgACAFcjYCACAEDAELIAQoAggLIQAgBCACNgIIIAAgAjYCDCACIAQ2AgwgAiAANgIIC0HIhAEgCTYCAEG8hAEgAzYCAAsgAUEIaiEACyAMQRBqJAAgAAuJAQEDfyAAKAIcIgEQMAJAIAAoAhAiAiABKAIQIgMgAiADSRsiAkUNACAAKAIMIAEoAgggAhAHGiAAIAAoAgwgAmo2AgwgASABKAIIIAJqNgIIIAAgACgCFCACajYCFCAAIAAoAhAgAms2AhAgASABKAIQIAJrIgA2AhAgAA0AIAEgASgCBDYCCAsLzgEBBX8CQCAARQ0AIAAoAjAiAQRAIAAgAUEBayIBNgIwIAENAQsgACgCIARAIABBATYCICAAEBoaCyAAKAIkQQFGBEAgABBDCwJAIAAoAiwiAUUNACAALQAoDQACQCABKAJEIgNFDQAgASgCTCEEA0AgACAEIAJBAnRqIgUoAgBHBEAgAyACQQFqIgJHDQEMAgsLIAUgBCADQQFrIgJBAnRqKAIANgIAIAEgAjYCRAsLIABBAEIAQQUQDhogACgCACIBBEAgARALCyAAEAYLC1oCAn4BfwJ/AkACQCAALQAARQ0AIAApAxAiAUJ9Vg0AIAFCAnwiAiAAKQMIWA0BCyAAQQA6AABBAAwBC0EAIAAoAgQiA0UNABogACACNwMQIAMgAadqLwAACwthAgJ+AX8CQAJAIAAtAABFDQAgACkDECICQn1WDQAgAkICfCIDIAApAwhYDQELIABBADoAAA8LIAAoAgQiBEUEQA8LIAAgAzcDECAEIAKnaiIAIAFBCHY6AAEgACABOgAAC8wCAQJ/IwBBEGsiBCQAAkAgACkDGCADrYinQQFxRQRAIABBDGoiAARAIABBADYCBCAAQRw2AgALQn8hAgwBCwJ+IAAoAgAiBUUEQCAAKAIIIAEgAiADIAAoAgQRDAAMAQsgBSAAKAIIIAEgAiADIAAoAgQRCgALIgJCf1UNAAJAIANBBGsOCwEAAAAAAAAAAAABAAsCQAJAIAAtABhBEHFFBEAgAEEMaiIBBEAgAUEANgIEIAFBHDYCAAsMAQsCfiAAKAIAIgFFBEAgACgCCCAEQQhqQghBBCAAKAIEEQwADAELIAEgACgCCCAEQQhqQghBBCAAKAIEEQoAC0J/VQ0BCyAAQQxqIgAEQCAAQQA2AgQgAEEUNgIACwwBCyAEKAIIIQEgBCgCDCEDIABBDGoiAARAIAAgAzYCBCAAIAE2AgALCyAEQRBqJAAgAguTFQIOfwN+AkACQAJAAkACQAJAAkACQAJAAkACQCAAKALwLQRAIAAoAogBQQFIDQEgACgCACIEKAIsQQJHDQQgAC8B5AENAyAALwHoAQ0DIAAvAewBDQMgAC8B8AENAyAALwH0AQ0DIAAvAfgBDQMgAC8B/AENAyAALwGcAg0DIAAvAaACDQMgAC8BpAINAyAALwGoAg0DIAAvAawCDQMgAC8BsAINAyAALwG0Ag0DIAAvAbgCDQMgAC8BvAINAyAALwHAAg0DIAAvAcQCDQMgAC8ByAINAyAALwHUAg0DIAAvAdgCDQMgAC8B3AINAyAALwHgAg0DIAAvAYgCDQIgAC8BjAINAiAALwGYAg0CQSAhBgNAIAAgBkECdCIFai8B5AENAyAAIAVBBHJqLwHkAQ0DIAAgBUEIcmovAeQBDQMgACAFQQxyai8B5AENAyAGQQRqIgZBgAJHDQALDAMLIABBBzYC/C0gAkF8Rw0FIAFFDQUMBgsgAkEFaiIEIQcMAwtBASEHCyAEIAc2AiwLIAAgAEHoFmoQUSAAIABB9BZqEFEgAC8B5gEhBCAAIABB7BZqKAIAIgxBAnRqQf//AzsB6gEgAEGQFmohECAAQZQWaiERIABBjBZqIQdBACEGIAxBAE4EQEEHQYoBIAQbIQ1BBEEDIAQbIQpBfyEJA0AgBCEIIAAgCyIOQQFqIgtBAnRqLwHmASEEAkACQCAGQQFqIgVB//8DcSIPIA1B//8DcU8NACAEIAhHDQAgBSEGDAELAn8gACAIQQJ0akHMFWogCkH//wNxIA9LDQAaIAgEQEEBIQUgByAIIAlGDQEaIAAgCEECdGpBzBVqIgYgBi8BAEEBajsBACAHDAELQQEhBSAQIBEgBkH//wNxQQpJGwsiBiAGLwEAIAVqOwEAQQAhBgJ/IARFBEBBAyEKQYoBDAELQQNBBCAEIAhGIgUbIQpBBkEHIAUbCyENIAghCQsgDCAORw0ACwsgAEHaE2ovAQAhBCAAIABB+BZqKAIAIgxBAnRqQd4TakH//wM7AQBBACEGIAxBAE4EQEEHQYoBIAQbIQ1BBEEDIAQbIQpBfyEJQQAhCwNAIAQhCCAAIAsiDkEBaiILQQJ0akHaE2ovAQAhBAJAAkAgBkEBaiIFQf//A3EiDyANQf//A3FPDQAgBCAIRw0AIAUhBgwBCwJ/IAAgCEECdGpBzBVqIApB//8DcSAPSw0AGiAIBEBBASEFIAcgCCAJRg0BGiAAIAhBAnRqQcwVaiIGIAYvAQBBAWo7AQAgBwwBC0EBIQUgECARIAZB//8DcUEKSRsLIgYgBi8BACAFajsBAEEAIQYCfyAERQRAQQMhCkGKAQwBC0EDQQQgBCAIRiIFGyEKQQZBByAFGwshDSAIIQkLIAwgDkcNAAsLIAAgAEGAF2oQUSAAIAAoAvgtAn9BEiAAQYoWai8BAA0AGkERIABB0hVqLwEADQAaQRAgAEGGFmovAQANABpBDyAAQdYVai8BAA0AGkEOIABBghZqLwEADQAaQQ0gAEHaFWovAQANABpBDCAAQf4Vai8BAA0AGkELIABB3hVqLwEADQAaQQogAEH6FWovAQANABpBCSAAQeIVai8BAA0AGkEIIABB9hVqLwEADQAaQQcgAEHmFWovAQANABpBBiAAQfIVai8BAA0AGkEFIABB6hVqLwEADQAaQQQgAEHuFWovAQANABpBA0ECIABBzhVqLwEAGwsiBkEDbGoiBEERajYC+C0gACgC/C1BCmpBA3YiByAEQRtqQQN2IgRNBEAgByEEDAELIAAoAowBQQRHDQAgByEECyAEIAJBBGpPQQAgARsNASAEIAdHDQQLIANBAmqtIRIgACkDmC4hFCAAKAKgLiIBQQNqIgdBP0sNASASIAGthiAUhCESDAILIAAgASACIAMQOQwDCyABQcAARgRAIAAoAgQgACgCEGogFDcAACAAIAAoAhBBCGo2AhBBAyEHDAELIAAoAgQgACgCEGogEiABrYYgFIQ3AAAgACAAKAIQQQhqNgIQIAFBPWshByASQcAAIAFrrYghEgsgACASNwOYLiAAIAc2AqAuIABBgMEAQYDKABCHAQwBCyADQQRqrSESIAApA5guIRQCQCAAKAKgLiIBQQNqIgRBP00EQCASIAGthiAUhCESDAELIAFBwABGBEAgACgCBCAAKAIQaiAUNwAAIAAgACgCEEEIajYCEEEDIQQMAQsgACgCBCAAKAIQaiASIAGthiAUhDcAACAAIAAoAhBBCGo2AhAgAUE9ayEEIBJBwAAgAWutiCESCyAAIBI3A5guIAAgBDYCoC4gAEHsFmooAgAiC6xCgAJ9IRMgAEH4FmooAgAhCQJAAkACfwJ+AkACfwJ/IARBOk0EQCATIASthiAShCETIARBBWoMAQsgBEHAAEYEQCAAKAIEIAAoAhBqIBI3AAAgACAAKAIQQQhqNgIQIAmsIRJCBSEUQQoMAgsgACgCBCAAKAIQaiATIASthiAShDcAACAAIAAoAhBBCGo2AhAgE0HAACAEa62IIRMgBEE7awshBSAJrCESIAVBOksNASAFrSEUIAVBBWoLIQcgEiAUhiAThAwBCyAFQcAARgRAIAAoAgQgACgCEGogEzcAACAAIAAoAhBBCGo2AhAgBq1CA30hE0IFIRRBCQwCCyAAKAIEIAAoAhBqIBIgBa2GIBOENwAAIAAgACgCEEEIajYCECAFQTtrIQcgEkHAACAFa62ICyESIAatQgN9IRMgB0E7Sw0BIAetIRQgB0EEagshBCATIBSGIBKEIRMMAQsgB0HAAEYEQCAAKAIEIAAoAhBqIBI3AAAgACAAKAIQQQhqNgIQQQQhBAwBCyAAKAIEIAAoAhBqIBMgB62GIBKENwAAIAAgACgCEEEIajYCECAHQTxrIQQgE0HAACAHa62IIRMLQQAhBQNAIAAgBSIBQZDWAGotAABBAnRqQc4VajMBACEUAn8gBEE8TQRAIBQgBK2GIBOEIRMgBEEDagwBCyAEQcAARgRAIAAoAgQgACgCEGogEzcAACAAIAAoAhBBCGo2AhAgFCETQQMMAQsgACgCBCAAKAIQaiAUIASthiAThDcAACAAIAAoAhBBCGo2AhAgFEHAACAEa62IIRMgBEE9awshBCABQQFqIQUgASAGRw0ACyAAIAQ2AqAuIAAgEzcDmC4gACAAQeQBaiICIAsQhgEgACAAQdgTaiIBIAkQhgEgACACIAEQhwELIAAQiAEgAwRAAkAgACgCoC4iBEE5TgRAIAAoAgQgACgCEGogACkDmC43AAAgACAAKAIQQQhqNgIQDAELIARBGU4EQCAAKAIEIAAoAhBqIAApA5guPgAAIAAgAEGcLmo1AgA3A5guIAAgACgCEEEEajYCECAAIAAoAqAuQSBrIgQ2AqAuCyAEQQlOBH8gACgCBCAAKAIQaiAAKQOYLj0AACAAIAAoAhBBAmo2AhAgACAAKQOYLkIQiDcDmC4gACgCoC5BEGsFIAQLQQFIDQAgACAAKAIQIgFBAWo2AhAgASAAKAIEaiAAKQOYLjwAAAsgAEEANgKgLiAAQgA3A5guCwsZACAABEAgACgCABAGIAAoAgwQBiAAEAYLC6wBAQJ+Qn8hAwJAIAAtACgNAAJAAkAgACgCIEUNACACQgBTDQAgAlANASABDQELIABBDGoiAARAIABBADYCBCAAQRI2AgALQn8PCyAALQA1DQBCACEDIAAtADQNACACUA0AA0AgACABIAOnaiACIAN9QQEQDiIEQn9XBEAgAEEBOgA1Qn8gAyADUBsPCyAEUEUEQCADIAR8IgMgAloNAgwBCwsgAEEBOgA0CyADC3UCAn4BfwJAAkAgAC0AAEUNACAAKQMQIgJCe1YNACACQgR8IgMgACkDCFgNAQsgAEEAOgAADwsgACgCBCIERQRADwsgACADNwMQIAQgAqdqIgAgAUEYdjoAAyAAIAFBEHY6AAIgACABQQh2OgABIAAgAToAAAtUAgF+AX8CQAJAIAAtAABFDQAgASAAKQMQIgF8IgIgAVQNACACIAApAwhYDQELIABBADoAAEEADwsgACgCBCIDRQRAQQAPCyAAIAI3AxAgAyABp2oLdwECfyMAQRBrIgMkAEF/IQQCQCAALQAoDQAgACgCIEEAIAJBA0kbRQRAIABBDGoiAARAIABBADYCBCAAQRI2AgALDAELIAMgAjYCCCADIAE3AwAgACADQhBBBhAOQgBTDQBBACEEIABBADoANAsgA0EQaiQAIAQLVwICfgF/AkACQCAALQAARQ0AIAApAxAiAUJ7Vg0AIAFCBHwiAiAAKQMIWA0BCyAAQQA6AABBAA8LIAAoAgQiA0UEQEEADwsgACACNwMQIAMgAadqKAAAC1UCAX4BfyAABEACQCAAKQMIUA0AQgEhAQNAIAAoAgAgAkEEdGoQPiABIAApAwhaDQEgAachAiABQgF8IQEMAAsACyAAKAIAEAYgACgCKBAQIAAQBgsLZAECfwJAAkACQCAARQRAIAGnEAkiA0UNAkEYEAkiAkUNAQwDCyAAIQNBGBAJIgINAkEADwsgAxAGC0EADwsgAkIANwMQIAIgATcDCCACIAM2AgQgAkEBOgAAIAIgAEU6AAEgAgudAQICfgF/AkACQCAALQAARQ0AIAApAxAiAkJ3Vg0AIAJCCHwiAyAAKQMIWA0BCyAAQQA6AAAPCyAAKAIEIgRFBEAPCyAAIAM3AxAgBCACp2oiACABQjiIPAAHIAAgAUIwiDwABiAAIAFCKIg8AAUgACABQiCIPAAEIAAgAUIYiDwAAyAAIAFCEIg8AAIgACABQgiIPAABIAAgATwAAAvwAgICfwF+AkAgAkUNACAAIAJqIgNBAWsgAToAACAAIAE6AAAgAkEDSQ0AIANBAmsgAToAACAAIAE6AAEgA0EDayABOgAAIAAgAToAAiACQQdJDQAgA0EEayABOgAAIAAgAToAAyACQQlJDQAgAEEAIABrQQNxIgRqIgMgAUH/AXFBgYKECGwiADYCACADIAIgBGtBfHEiAmoiAUEEayAANgIAIAJBCUkNACADIAA2AgggAyAANgIEIAFBCGsgADYCACABQQxrIAA2AgAgAkEZSQ0AIAMgADYCGCADIAA2AhQgAyAANgIQIAMgADYCDCABQRBrIAA2AgAgAUEUayAANgIAIAFBGGsgADYCACABQRxrIAA2AgAgAiADQQRxQRhyIgFrIgJBIEkNACAArUKBgICAEH4hBSABIANqIQEDQCABIAU3AxggASAFNwMQIAEgBTcDCCABIAU3AwAgAUEgaiEBIAJBIGsiAkEfSw0ACwsLbwEDfyAAQQxqIQICQAJ/IAAoAiAiAUUEQEF/IQFBEgwBCyAAIAFBAWsiAzYCIEEAIQEgAw0BIABBAEIAQQIQDhogACgCACIARQ0BIAAQGkF/Sg0BQRQLIQAgAgRAIAJBADYCBCACIAA2AgALCyABC58BAgF/AX4CfwJAAn4gACgCACIDKAIkQQFGQQAgAkJ/VRtFBEAgA0EMaiIBBEAgAUEANgIEIAFBEjYCAAtCfwwBCyADIAEgAkELEA4LIgRCf1cEQCAAKAIAIQEgAEEIaiIABEAgACABKAIMNgIAIAAgASgCEDYCBAsMAQtBACACIARRDQEaIABBCGoEQCAAQRs2AgwgAEEGNgIICwtBfwsLJAEBfyAABEADQCAAKAIAIQEgACgCDBAGIAAQBiABIgANAAsLC5gBAgJ+AX8CQAJAIAAtAABFDQAgACkDECIBQndWDQAgAUIIfCICIAApAwhYDQELIABBADoAAEIADwsgACgCBCIDRQRAQgAPCyAAIAI3AxAgAyABp2oiADEABkIwhiAAMQAHQjiGhCAAMQAFQiiGhCAAMQAEQiCGhCAAMQADQhiGhCAAMQACQhCGhCAAMQABQgiGhCAAMQAAfAsjACAAQShGBEAgAhAGDwsgAgRAIAEgAkEEaygCACAAEQcACwsyACAAKAIkQQFHBEAgAEEMaiIABEAgAEEANgIEIABBEjYCAAtCfw8LIABBAEIAQQ0QDgsPACAABEAgABA2IAAQBgsLgAEBAX8gAC0AKAR/QX8FIAFFBEAgAEEMagRAIABBADYCECAAQRI2AgwLQX8PCyABECoCQCAAKAIAIgJFDQAgAiABECFBf0oNACAAKAIAIQEgAEEMaiIABEAgACABKAIMNgIAIAAgASgCEDYCBAtBfw8LIAAgAUI4QQMQDkI/h6cLC38BA38gACEBAkAgAEEDcQRAA0AgAS0AAEUNAiABQQFqIgFBA3ENAAsLA0AgASICQQRqIQEgAigCACIDQX9zIANBgYKECGtxQYCBgoR4cUUNAAsgA0H/AXFFBEAgAiAAaw8LA0AgAi0AASEDIAJBAWoiASECIAMNAAsLIAEgAGsL3wIBCH8gAEUEQEEBDwsCQCAAKAIIIgINAEEBIQQgAC8BBCIHRQRAQQEhAgwBCyAAKAIAIQgDQAJAIAMgCGoiBS0AACICQSBPBEAgAkEYdEEYdUF/Sg0BCyACQQ1NQQBBASACdEGAzABxGw0AAn8CfyACQeABcUHAAUYEQEEBIQYgA0EBagwBCyACQfABcUHgAUYEQCADQQJqIQNBACEGQQEMAgsgAkH4AXFB8AFHBEBBBCECDAULQQAhBiADQQNqCyEDQQALIQlBBCECIAMgB08NAiAFLQABQcABcUGAAUcNAkEDIQQgBg0AIAUtAAJBwAFxQYABRw0CIAkNACAFLQADQcABcUGAAUcNAgsgBCECIANBAWoiAyAHSQ0ACwsgACACNgIIAn8CQCABRQ0AAkAgAUECRw0AIAJBA0cNAEECIQIgAEECNgIICyABIAJGDQBBBSACQQFHDQEaCyACCwtIAgJ+An8jAEEQayIEIAE2AgxCASAArYYhAgNAIAQgAUEEaiIANgIMIAIiA0IBIAEoAgAiBa2GhCECIAAhASAFQX9KDQALIAMLhwUBB38CQAJAIABFBEBBxRQhAiABRQ0BIAFBADYCAEHFFA8LIAJBwABxDQEgACgCCEUEQCAAQQAQIxoLIAAoAgghBAJAIAJBgAFxBEAgBEEBa0ECTw0BDAMLIARBBEcNAgsCQCAAKAIMIgINACAAAn8gACgCACEIIABBEGohCUEAIQICQAJAAkACQCAALwEEIgUEQEEBIQQgBUEBcSEHIAVBAUcNAQwCCyAJRQ0CIAlBADYCAEEADAQLIAVBfnEhBgNAIARBAUECQQMgAiAIai0AAEEBdEHQFGovAQAiCkGAEEkbIApBgAFJG2pBAUECQQMgCCACQQFyai0AAEEBdEHQFGovAQAiBEGAEEkbIARBgAFJG2ohBCACQQJqIQIgBkECayIGDQALCwJ/IAcEQCAEQQFBAkEDIAIgCGotAABBAXRB0BRqLwEAIgJBgBBJGyACQYABSRtqIQQLIAQLEAkiB0UNASAFQQEgBUEBSxshCkEAIQVBACEGA0AgBSAHaiEDAn8gBiAIai0AAEEBdEHQFGovAQAiAkH/AE0EQCADIAI6AAAgBUEBagwBCyACQf8PTQRAIAMgAkE/cUGAAXI6AAEgAyACQQZ2QcABcjoAACAFQQJqDAELIAMgAkE/cUGAAXI6AAIgAyACQQx2QeABcjoAACADIAJBBnZBP3FBgAFyOgABIAVBA2oLIQUgBkEBaiIGIApHDQALIAcgBEEBayICakEAOgAAIAlFDQAgCSACNgIACyAHDAELIAMEQCADQQA2AgQgA0EONgIAC0EACyICNgIMIAINAEEADwsgAUUNACABIAAoAhA2AgALIAIPCyABBEAgASAALwEENgIACyAAKAIAC4MBAQR/QRIhBQJAAkAgACkDMCABWA0AIAGnIQYgACgCQCEEIAJBCHEiB0UEQCAEIAZBBHRqKAIEIgINAgsgBCAGQQR0aiIEKAIAIgJFDQAgBC0ADEUNAUEXIQUgBw0BC0EAIQIgAyAAQQhqIAMbIgAEQCAAQQA2AgQgACAFNgIACwsgAgtuAQF/IwBBgAJrIgUkAAJAIARBgMAEcQ0AIAIgA0wNACAFIAFB/wFxIAIgA2siAkGAAiACQYACSSIBGxAZIAFFBEADQCAAIAVBgAIQLiACQYACayICQf8BSw0ACwsgACAFIAIQLgsgBUGAAmokAAuBAQEBfyMAQRBrIgQkACACIANsIQICQCAAQSdGBEAgBEEMaiACEIwBIQBBACAEKAIMIAAbIQAMAQsgAUEBIAJBxABqIAARAAAiAUUEQEEAIQAMAQtBwAAgAUE/cWsiACABakHAAEEAIABBBEkbaiIAQQRrIAE2AAALIARBEGokACAAC1IBAn9BhIEBKAIAIgEgAEEDakF8cSICaiEAAkAgAkEAIAAgAU0bDQAgAD8AQRB0SwRAIAAQA0UNAQtBhIEBIAA2AgAgAQ8LQYSEAUEwNgIAQX8LNwAgAEJ/NwMQIABBADYCCCAAQgA3AwAgAEEANgIwIABC/////w83AyggAEIANwMYIABCADcDIAulAQEBf0HYABAJIgFFBEBBAA8LAkAgAARAIAEgAEHYABAHGgwBCyABQgA3AyAgAUEANgIYIAFC/////w83AxAgAUEAOwEMIAFBv4YoNgIIIAFBAToABiABQQA6AAQgAUIANwNIIAFBgIDYjXg2AkQgAUIANwMoIAFCADcDMCABQgA3AzggAUFAa0EAOwEAIAFCADcDUAsgAUEBOgAFIAFBADYCACABC1gCAn4BfwJAAkAgAC0AAEUNACAAKQMQIgMgAq18IgQgA1QNACAEIAApAwhYDQELIABBADoAAA8LIAAoAgQiBUUEQA8LIAAgBDcDECAFIAOnaiABIAIQBxoLlgEBAn8CQAJAIAJFBEAgAacQCSIFRQ0BQRgQCSIEDQIgBRAGDAELIAIhBUEYEAkiBA0BCyADBEAgA0EANgIEIANBDjYCAAtBAA8LIARCADcDECAEIAE3AwggBCAFNgIEIARBAToAACAEIAJFOgABIAAgBSABIAMQZUEASAR/IAQtAAEEQCAEKAIEEAYLIAQQBkEABSAECwubAgEDfyAALQAAQSBxRQRAAkAgASEDAkAgAiAAIgEoAhAiAAR/IAAFAn8gASABLQBKIgBBAWsgAHI6AEogASgCACIAQQhxBEAgASAAQSByNgIAQX8MAQsgAUIANwIEIAEgASgCLCIANgIcIAEgADYCFCABIAAgASgCMGo2AhBBAAsNASABKAIQCyABKAIUIgVrSwRAIAEgAyACIAEoAiQRAAAaDAILAn8gASwAS0F/SgRAIAIhAANAIAIgACIERQ0CGiADIARBAWsiAGotAABBCkcNAAsgASADIAQgASgCJBEAACAESQ0CIAMgBGohAyABKAIUIQUgAiAEawwBCyACCyEAIAUgAyAAEAcaIAEgASgCFCAAajYCFAsLCwvNBQEGfyAAKAIwIgNBhgJrIQYgACgCPCECIAMhAQNAIAAoAkQgAiAAKAJoIgRqayECIAEgBmogBE0EQCAAKAJIIgEgASADaiADEAcaAkAgAyAAKAJsIgFNBEAgACABIANrNgJsDAELIABCADcCbAsgACAAKAJoIANrIgE2AmggACAAKAJYIANrNgJYIAEgACgChC5JBEAgACABNgKELgsgAEH8gAEoAgARAwAgAiADaiECCwJAIAAoAgAiASgCBCIERQ0AIAAoAjwhBSAAIAIgBCACIARJGyICBH8gACgCSCAAKAJoaiAFaiEFIAEgBCACazYCBAJAAkACQAJAIAEoAhwiBCgCFEEBaw4CAQACCyAEQaABaiAFIAEoAgAgAkHcgAEoAgARCAAMAgsgASABKAIwIAUgASgCACACQcSAASgCABEEADYCMAwBCyAFIAEoAgAgAhAHGgsgASABKAIAIAJqNgIAIAEgASgCCCACajYCCCAAKAI8BSAFCyACaiICNgI8AkAgACgChC4iASACakEDSQ0AIAAoAmggAWshAQJAIAAoAnRBgQhPBEAgACAAIAAoAkggAWoiAi0AACACLQABIAAoAnwRAAA2AlQMAQsgAUUNACAAIAFBAWsgACgChAERAgAaCyAAKAKELiAAKAI8IgJBAUZrIgRFDQAgACABIAQgACgCgAERBQAgACAAKAKELiAEazYChC4gACgCPCECCyACQYUCSw0AIAAoAgAoAgRFDQAgACgCMCEBDAELCwJAIAAoAkQiAiAAKAJAIgNNDQAgAAJ/IAAoAjwgACgCaGoiASADSwRAIAAoAkggAWpBACACIAFrIgNBggIgA0GCAkkbIgMQGSABIANqDAELIAFBggJqIgEgA00NASAAKAJIIANqQQAgAiADayICIAEgA2siAyACIANJGyIDEBkgACgCQCADags2AkALC50CAQF/AkAgAAJ/IAAoAqAuIgFBwABGBEAgACgCBCAAKAIQaiAAKQOYLjcAACAAQgA3A5guIAAgACgCEEEIajYCEEEADAELIAFBIE4EQCAAKAIEIAAoAhBqIAApA5guPgAAIAAgAEGcLmo1AgA3A5guIAAgACgCEEEEajYCECAAIAAoAqAuQSBrIgE2AqAuCyABQRBOBEAgACgCBCAAKAIQaiAAKQOYLj0AACAAIAAoAhBBAmo2AhAgACAAKQOYLkIQiDcDmC4gACAAKAKgLkEQayIBNgKgLgsgAUEISA0BIAAgACgCECIBQQFqNgIQIAEgACgCBGogACkDmC48AAAgACAAKQOYLkIIiDcDmC4gACgCoC5BCGsLNgKgLgsLEAAgACgCCBAGIABBADYCCAvwAQECf0F/IQECQCAALQAoDQAgACgCJEEDRgRAIABBDGoEQCAAQQA2AhAgAEEXNgIMC0F/DwsCQCAAKAIgBEAgACkDGELAAINCAFINASAAQQxqBEAgAEEANgIQIABBHTYCDAtBfw8LAkAgACgCACICRQ0AIAIQMkF/Sg0AIAAoAgAhASAAQQxqIgAEQCAAIAEoAgw2AgAgACABKAIQNgIEC0F/DwsgAEEAQgBBABAOQn9VDQAgACgCACIARQ0BIAAQGhpBfw8LQQAhASAAQQA7ATQgAEEMagRAIABCADcCDAsgACAAKAIgQQFqNgIgCyABCzsAIAAtACgEfkJ/BSAAKAIgRQRAIABBDGoiAARAIABBADYCBCAAQRI2AgALQn8PCyAAQQBCAEEHEA4LC5oIAQt/IABFBEAgARAJDwsgAUFATwRAQYSEAUEwNgIAQQAPCwJ/QRAgAUELakF4cSABQQtJGyEGIABBCGsiBSgCBCIJQXhxIQQCQCAJQQNxRQRAQQAgBkGAAkkNAhogBkEEaiAETQRAIAUhAiAEIAZrQZSIASgCAEEBdE0NAgtBAAwCCyAEIAVqIQcCQCAEIAZPBEAgBCAGayIDQRBJDQEgBSAJQQFxIAZyQQJyNgIEIAUgBmoiAiADQQNyNgIEIAcgBygCBEEBcjYCBCACIAMQOwwBCyAHQcyEASgCAEYEQEHAhAEoAgAgBGoiBCAGTQ0CIAUgCUEBcSAGckECcjYCBCAFIAZqIgMgBCAGayICQQFyNgIEQcCEASACNgIAQcyEASADNgIADAELIAdByIQBKAIARgRAQbyEASgCACAEaiIDIAZJDQICQCADIAZrIgJBEE8EQCAFIAlBAXEgBnJBAnI2AgQgBSAGaiIEIAJBAXI2AgQgAyAFaiIDIAI2AgAgAyADKAIEQX5xNgIEDAELIAUgCUEBcSADckECcjYCBCADIAVqIgIgAigCBEEBcjYCBEEAIQJBACEEC0HIhAEgBDYCAEG8hAEgAjYCAAwBCyAHKAIEIgNBAnENASADQXhxIARqIgogBkkNASAKIAZrIQwCQCADQf8BTQRAIAcoAggiBCADQQN2IgJBA3RB3IQBakYaIAQgBygCDCIDRgRAQbSEAUG0hAEoAgBBfiACd3E2AgAMAgsgBCADNgIMIAMgBDYCCAwBCyAHKAIYIQsCQCAHIAcoAgwiCEcEQCAHKAIIIgJBxIQBKAIASRogAiAINgIMIAggAjYCCAwBCwJAIAdBFGoiBCgCACICDQAgB0EQaiIEKAIAIgINAEEAIQgMAQsDQCAEIQMgAiIIQRRqIgQoAgAiAg0AIAhBEGohBCAIKAIQIgINAAsgA0EANgIACyALRQ0AAkAgByAHKAIcIgNBAnRB5IYBaiICKAIARgRAIAIgCDYCACAIDQFBuIQBQbiEASgCAEF+IAN3cTYCAAwCCyALQRBBFCALKAIQIAdGG2ogCDYCACAIRQ0BCyAIIAs2AhggBygCECICBEAgCCACNgIQIAIgCDYCGAsgBygCFCICRQ0AIAggAjYCFCACIAg2AhgLIAxBD00EQCAFIAlBAXEgCnJBAnI2AgQgBSAKaiICIAIoAgRBAXI2AgQMAQsgBSAJQQFxIAZyQQJyNgIEIAUgBmoiAyAMQQNyNgIEIAUgCmoiAiACKAIEQQFyNgIEIAMgDBA7CyAFIQILIAILIgIEQCACQQhqDwsgARAJIgVFBEBBAA8LIAUgAEF8QXggAEEEaygCACICQQNxGyACQXhxaiICIAEgASACSxsQBxogABAGIAUL6QEBA38CQCABRQ0AIAJBgDBxIgIEfwJ/IAJBgCBHBEBBAiACQYAQRg0BGiADBEAgA0EANgIEIANBEjYCAAtBAA8LQQQLIQJBAAVBAQshBkEUEAkiBEUEQCADBEAgA0EANgIEIANBDjYCAAtBAA8LIAQgAUEBahAJIgU2AgAgBUUEQCAEEAZBAA8LIAUgACABEAcgAWpBADoAACAEQQA2AhAgBEIANwMIIAQgATsBBCAGDQAgBCACECNBBUcNACAEKAIAEAYgBCgCDBAGIAQQBkEAIQQgAwRAIANBADYCBCADQRI2AgALCyAEC7UBAQJ/AkACQAJAAkACQAJAAkAgAC0ABQRAIAAtAABBAnFFDQELIAAoAjAQECAAQQA2AjAgAC0ABUUNAQsgAC0AAEEIcUUNAQsgACgCNBAcIABBADYCNCAALQAFRQ0BCyAALQAAQQRxRQ0BCyAAKAI4EBAgAEEANgI4IAAtAAVFDQELIAAtAABBgAFxRQ0BCyAAKAJUIgEEfyABQQAgARAiEBkgACgCVAVBAAsQBiAAQQA2AlQLC9wMAgl/AX4jAEFAaiIGJAACQAJAAkACQAJAIAEoAjBBABAjIgVBAkZBACABKAI4QQAQIyIEQQFGGw0AIAVBAUZBACAEQQJGGw0AIAVBAkciAw0BIARBAkcNAQsgASABLwEMQYAQcjsBDEEAIQMMAQsgASABLwEMQf/vA3E7AQxBACEFIANFBEBB9eABIAEoAjAgAEEIahBpIgVFDQILIAJBgAJxBEAgBSEDDAELIARBAkcEQCAFIQMMAQtB9cYBIAEoAjggAEEIahBpIgNFBEAgBRAcDAILIAMgBTYCAAsgASABLwEMQf7/A3EgAS8BUiIFQQBHcjsBDAJAAkACQAJAAn8CQAJAIAEpAyhC/v///w9WDQAgASkDIEL+////D1YNACACQYAEcUUNASABKQNIQv////8PVA0BCyAFQYECa0H//wNxQQNJIQdBAQwBCyAFQYECa0H//wNxIQQgAkGACnFBgApHDQEgBEEDSSEHQQALIQkgBkIcEBciBEUEQCAAQQhqIgAEQCAAQQA2AgQgAEEONgIACyADEBwMBQsgAkGACHEhBQJAAkAgAkGAAnEEQAJAIAUNACABKQMgQv////8PVg0AIAEpAyhCgICAgBBUDQMLIAQgASkDKBAYIAEpAyAhDAwBCwJAAkACQCAFDQAgASkDIEL/////D1YNACABKQMoIgxC/////w9WDQEgASkDSEKAgICAEFQNBAsgASkDKCIMQv////8PVA0BCyAEIAwQGAsgASkDICIMQv////8PWgRAIAQgDBAYCyABKQNIIgxC/////w9UDQELIAQgDBAYCyAELQAARQRAIABBCGoiAARAIABBADYCBCAAQRQ2AgALIAQQCCADEBwMBQtBASEKQQEgBC0AAAR+IAQpAxAFQgALp0H//wNxIAYQRyEFIAQQCCAFIAM2AgAgBw0BDAILIAMhBSAEQQJLDQELIAZCBxAXIgRFBEAgAEEIaiIABEAgAEEANgIEIABBDjYCAAsgBRAcDAMLIARBAhANIARBhxJBAhAsIAQgAS0AUhBwIAQgAS8BEBANIAQtAABFBEAgAEEIaiIABEAgAEEANgIEIABBFDYCAAsgBBAIDAILQYGyAkEHIAYQRyEDIAQQCCADIAU2AgBBASELIAMhBQsgBkIuEBciA0UEQCAAQQhqIgAEQCAAQQA2AgQgAEEONgIACyAFEBwMAgsgA0GjEkGoEiACQYACcSIHG0EEECwgB0UEQCADIAkEf0EtBSABLwEIC0H//wNxEA0LIAMgCQR/QS0FIAEvAQoLQf//A3EQDSADIAEvAQwQDSADIAsEf0HjAAUgASgCEAtB//8DcRANIAYgASgCFDYCPAJ/IAZBPGoQjQEiCEUEQEEAIQlBIQwBCwJ/IAgoAhQiBEHQAE4EQCAEQQl0DAELIAhB0AA2AhRBgMACCyEEIAgoAgRBBXQgCCgCCEELdGogCCgCAEEBdmohCSAIKAIMIAQgCCgCEEEFdGpqQaDAAWoLIQQgAyAJQf//A3EQDSADIARB//8DcRANIAMCfyALBEBBACABKQMoQhRUDQEaCyABKAIYCxASIAEpAyAhDCADAn8gAwJ/AkAgBwRAIAxC/v///w9YBEAgASkDKEL/////D1QNAgsgA0F/EBJBfwwDC0F/IAxC/v///w9WDQEaCyAMpwsQEiABKQMoIgxC/////w8gDEL/////D1QbpwsQEiADIAEoAjAiBAR/IAQvAQQFQQALQf//A3EQDSADIAEoAjQgAhBsIAVBgAYQbGpB//8DcRANIAdFBEAgAyABKAI4IgQEfyAELwEEBUEAC0H//wNxEA0gAyABLwE8EA0gAyABLwFAEA0gAyABKAJEEBIgAyABKQNIIgxC/////w8gDEL/////D1QbpxASCyADLQAARQRAIABBCGoiAARAIABBADYCBCAAQRQ2AgALIAMQCCAFEBwMAgsgACAGIAMtAAAEfiADKQMQBUIACxAbIQQgAxAIIARBf0wNACABKAIwIgMEQCAAIAMQYUF/TA0BCyAFBEAgACAFQYAGEGtBf0wNAQsgBRAcIAEoAjQiBQRAIAAgBSACEGtBAEgNAgsgBw0CIAEoAjgiAUUNAiAAIAEQYUEATg0CDAELIAUQHAtBfyEKCyAGQUBrJAAgCgtNAQJ/IAEtAAAhAgJAIAAtAAAiA0UNACACIANHDQADQCABLQABIQIgAC0AASIDRQ0BIAFBAWohASAAQQFqIQAgAiADRg0ACwsgAyACawvcAwICfgF/IAOtIQQgACkDmC4hBQJAIAACfyAAAn4gACgCoC4iBkEDaiIDQT9NBEAgBCAGrYYgBYQMAQsgBkHAAEYEQCAAKAIEIAAoAhBqIAU3AAAgACgCEEEIagwCCyAAKAIEIAAoAhBqIAQgBq2GIAWENwAAIAAgACgCEEEIajYCECAGQT1rIQMgBEHAACAGa62ICyIENwOYLiAAIAM2AqAuIANBOU4EQCAAKAIEIAAoAhBqIAQ3AAAgACAAKAIQQQhqNgIQDAILIANBGU4EQCAAKAIEIAAoAhBqIAQ+AAAgACAAKAIQQQRqNgIQIAAgACkDmC5CIIgiBDcDmC4gACAAKAKgLkEgayIDNgKgLgsgA0EJTgR/IAAoAgQgACgCEGogBD0AACAAIAAoAhBBAmo2AhAgACkDmC5CEIghBCAAKAKgLkEQawUgAwtBAUgNASAAKAIQCyIDQQFqNgIQIAAoAgQgA2ogBDwAAAsgAEEANgKgLiAAQgA3A5guIAAoAgQgACgCEGogAjsAACAAIAAoAhBBAmoiAzYCECAAKAIEIANqIAJBf3M7AAAgACAAKAIQQQJqIgM2AhAgAgRAIAAoAgQgA2ogASACEAcaIAAgACgCECACajYCEAsLrAQCAX8BfgJAIAANACABUA0AIAMEQCADQQA2AgQgA0ESNgIAC0EADwsCQAJAIAAgASACIAMQiQEiBEUNAEEYEAkiAkUEQCADBEAgA0EANgIEIANBDjYCAAsCQCAEKAIoIgBFBEAgBCkDGCEBDAELIABBADYCKCAEKAIoQgA3AyAgBCAEKQMYIgUgBCkDICIBIAEgBVQbIgE3AxgLIAQpAwggAVYEQANAIAQoAgAgAadBBHRqKAIAEAYgAUIBfCIBIAQpAwhUDQALCyAEKAIAEAYgBCgCBBAGIAQQBgwBCyACQQA2AhQgAiAENgIQIAJBABABNgIMIAJBADYCCCACQgA3AgACf0E4EAkiAEUEQCADBEAgA0EANgIEIANBDjYCAAtBAAwBCyAAQQA2AgggAEIANwMAIABCADcDICAAQoCAgIAQNwIsIABBADoAKCAAQQA2AhQgAEIANwIMIABBADsBNCAAIAI2AgggAEEkNgIEIABCPyACQQBCAEEOQSQRDAAiASABQgBTGzcDGCAACyIADQEgAigCECIDBEACQCADKAIoIgBFBEAgAykDGCEBDAELIABBADYCKCADKAIoQgA3AyAgAyADKQMYIgUgAykDICIBIAEgBVQbIgE3AxgLIAMpAwggAVYEQANAIAMoAgAgAadBBHRqKAIAEAYgAUIBfCIBIAMpAwhUDQALCyADKAIAEAYgAygCBBAGIAMQBgsgAhAGC0EAIQALIAALiwwBBn8gACABaiEFAkACQCAAKAIEIgJBAXENACACQQNxRQ0BIAAoAgAiAiABaiEBAkAgACACayIAQciEASgCAEcEQCACQf8BTQRAIAAoAggiBCACQQN2IgJBA3RB3IQBakYaIAAoAgwiAyAERw0CQbSEAUG0hAEoAgBBfiACd3E2AgAMAwsgACgCGCEGAkAgACAAKAIMIgNHBEAgACgCCCICQcSEASgCAEkaIAIgAzYCDCADIAI2AggMAQsCQCAAQRRqIgIoAgAiBA0AIABBEGoiAigCACIEDQBBACEDDAELA0AgAiEHIAQiA0EUaiICKAIAIgQNACADQRBqIQIgAygCECIEDQALIAdBADYCAAsgBkUNAgJAIAAgACgCHCIEQQJ0QeSGAWoiAigCAEYEQCACIAM2AgAgAw0BQbiEAUG4hAEoAgBBfiAEd3E2AgAMBAsgBkEQQRQgBigCECAARhtqIAM2AgAgA0UNAwsgAyAGNgIYIAAoAhAiAgRAIAMgAjYCECACIAM2AhgLIAAoAhQiAkUNAiADIAI2AhQgAiADNgIYDAILIAUoAgQiAkEDcUEDRw0BQbyEASABNgIAIAUgAkF+cTYCBCAAIAFBAXI2AgQgBSABNgIADwsgBCADNgIMIAMgBDYCCAsCQCAFKAIEIgJBAnFFBEAgBUHMhAEoAgBGBEBBzIQBIAA2AgBBwIQBQcCEASgCACABaiIBNgIAIAAgAUEBcjYCBCAAQciEASgCAEcNA0G8hAFBADYCAEHIhAFBADYCAA8LIAVByIQBKAIARgRAQciEASAANgIAQbyEAUG8hAEoAgAgAWoiATYCACAAIAFBAXI2AgQgACABaiABNgIADwsgAkF4cSABaiEBAkAgAkH/AU0EQCAFKAIIIgQgAkEDdiICQQN0QdyEAWpGGiAEIAUoAgwiA0YEQEG0hAFBtIQBKAIAQX4gAndxNgIADAILIAQgAzYCDCADIAQ2AggMAQsgBSgCGCEGAkAgBSAFKAIMIgNHBEAgBSgCCCICQcSEASgCAEkaIAIgAzYCDCADIAI2AggMAQsCQCAFQRRqIgQoAgAiAg0AIAVBEGoiBCgCACICDQBBACEDDAELA0AgBCEHIAIiA0EUaiIEKAIAIgINACADQRBqIQQgAygCECICDQALIAdBADYCAAsgBkUNAAJAIAUgBSgCHCIEQQJ0QeSGAWoiAigCAEYEQCACIAM2AgAgAw0BQbiEAUG4hAEoAgBBfiAEd3E2AgAMAgsgBkEQQRQgBigCECAFRhtqIAM2AgAgA0UNAQsgAyAGNgIYIAUoAhAiAgRAIAMgAjYCECACIAM2AhgLIAUoAhQiAkUNACADIAI2AhQgAiADNgIYCyAAIAFBAXI2AgQgACABaiABNgIAIABByIQBKAIARw0BQbyEASABNgIADwsgBSACQX5xNgIEIAAgAUEBcjYCBCAAIAFqIAE2AgALIAFB/wFNBEAgAUEDdiICQQN0QdyEAWohAQJ/QbSEASgCACIDQQEgAnQiAnFFBEBBtIQBIAIgA3I2AgAgAQwBCyABKAIICyECIAEgADYCCCACIAA2AgwgACABNgIMIAAgAjYCCA8LQR8hAiAAQgA3AhAgAUH///8HTQRAIAFBCHYiAiACQYD+P2pBEHZBCHEiBHQiAiACQYDgH2pBEHZBBHEiA3QiAiACQYCAD2pBEHZBAnEiAnRBD3YgAyAEciACcmsiAkEBdCABIAJBFWp2QQFxckEcaiECCyAAIAI2AhwgAkECdEHkhgFqIQcCQAJAQbiEASgCACIEQQEgAnQiA3FFBEBBuIQBIAMgBHI2AgAgByAANgIAIAAgBzYCGAwBCyABQQBBGSACQQF2ayACQR9GG3QhAiAHKAIAIQMDQCADIgQoAgRBeHEgAUYNAiACQR12IQMgAkEBdCECIAQgA0EEcWoiB0EQaigCACIDDQALIAcgADYCECAAIAQ2AhgLIAAgADYCDCAAIAA2AggPCyAEKAIIIgEgADYCDCAEIAA2AgggAEEANgIYIAAgBDYCDCAAIAE2AggLC1gCAX8BfgJAAn9BACAARQ0AGiAArUIChiICpyIBIABBBHJBgIAESQ0AGkF/IAEgAkIgiKcbCyIBEAkiAEUNACAAQQRrLQAAQQNxRQ0AIABBACABEBkLIAALQwEDfwJAIAJFDQADQCAALQAAIgQgAS0AACIFRgRAIAFBAWohASAAQQFqIQAgAkEBayICDQEMAgsLIAQgBWshAwsgAwsUACAAEEAgACgCABAgIAAoAgQQIAutBAIBfgV/IwBBEGsiBCQAIAAgAWshBgJAAkAgAUEBRgRAIAAgBi0AACACEBkMAQsgAUEJTwRAIAAgBikAADcAACAAIAJBAWtBB3FBAWoiBWohACACIAVrIgFFDQIgBSAGaiECA0AgACACKQAANwAAIAJBCGohAiAAQQhqIQAgAUEIayIBDQALDAILAkACQAJAAkAgAUEEaw4FAAICAgECCyAEIAYoAAAiATYCBCAEIAE2AgAMAgsgBCAGKQAANwMADAELQQghByAEQQhqIQgDQCAIIAYgByABIAEgB0sbIgUQByAFaiEIIAcgBWsiBw0ACyAEIAQpAwg3AwALAkAgBQ0AIAJBEEkNACAEKQMAIQMgAkEQayIGQQR2QQFqQQdxIgEEQANAIAAgAzcACCAAIAM3AAAgAkEQayECIABBEGohACABQQFrIgENAAsLIAZB8ABJDQADQCAAIAM3AHggACADNwBwIAAgAzcAaCAAIAM3AGAgACADNwBYIAAgAzcAUCAAIAM3AEggACADNwBAIAAgAzcAOCAAIAM3ADAgACADNwAoIAAgAzcAICAAIAM3ABggACADNwAQIAAgAzcACCAAIAM3AAAgAEGAAWohACACQYABayICQQ9LDQALCyACQQhPBEBBCCAFayEBA0AgACAEKQMANwAAIAAgAWohACACIAFrIgJBB0sNAAsLIAJFDQEgACAEIAIQBxoLIAAgAmohAAsgBEEQaiQAIAALXwECfyAAKAIIIgEEQCABEAsgAEEANgIICwJAIAAoAgQiAUUNACABKAIAIgJBAXFFDQAgASgCEEF+Rw0AIAEgAkF+cSICNgIAIAINACABECAgAEEANgIECyAAQQA6AAwL1wICBH8BfgJAAkAgACgCQCABp0EEdGooAgAiA0UEQCACBEAgAkEANgIEIAJBFDYCAAsMAQsgACgCACADKQNIIgdBABAUIQMgACgCACEAIANBf0wEQCACBEAgAiAAKAIMNgIAIAIgACgCEDYCBAsMAQtCACEBIwBBEGsiBiQAQX8hAwJAIABCGkEBEBRBf0wEQCACBEAgAiAAKAIMNgIAIAIgACgCEDYCBAsMAQsgAEIEIAZBCmogAhAtIgRFDQBBHiEAQQEhBQNAIAQQDCAAaiEAIAVBAkcEQCAFQQFqIQUMAQsLIAQtAAAEfyAEKQMQIAQpAwhRBUEAC0UEQCACBEAgAkEANgIEIAJBFDYCAAsgBBAIDAELIAQQCCAAIQMLIAZBEGokACADIgBBAEgNASAHIACtfCIBQn9VDQEgAgRAIAJBFjYCBCACQQQ2AgALC0IAIQELIAELYAIBfgF/AkAgAEUNACAAQQhqEF8iAEUNACABIAEoAjBBAWo2AjAgACADNgIIIAAgAjYCBCAAIAE2AgAgAEI/IAEgA0EAQgBBDiACEQoAIgQgBEIAUxs3AxggACEFCyAFCyIAIAAoAiRBAWtBAU0EQCAAQQBCAEEKEA4aIABBADYCJAsLbgACQAJAAkAgA0IQVA0AIAJFDQECfgJAAkACQCACKAIIDgMCAAEECyACKQMAIAB8DAILIAIpAwAgAXwMAQsgAikDAAsiA0IAUw0AIAEgA1oNAgsgBARAIARBADYCBCAEQRI2AgALC0J/IQMLIAMLggICAX8CfgJAQQEgAiADGwRAIAIgA2oQCSIFRQRAIAQEQCAEQQA2AgQgBEEONgIAC0EADwsgAq0hBgJAAkAgAARAIAAgBhATIgBFBEAgBARAIARBADYCBCAEQQ42AgALDAULIAUgACACEAcaIAMNAQwCCyABIAUgBhARIgdCf1cEQCAEBEAgBCABKAIMNgIAIAQgASgCEDYCBAsMBAsgBiAHVQRAIAQEQCAEQQA2AgQgBEERNgIACwwECyADRQ0BCyACIAVqIgBBADoAACACQQFIDQAgBSECA0AgAi0AAEUEQCACQSA6AAALIAJBAWoiAiAASQ0ACwsLIAUPCyAFEAZBAAuBAQEBfwJAIAAEQCADQYAGcSEFQQAhAwNAAkAgAC8BCCACRw0AIAUgACgCBHFFDQAgA0EATg0DIANBAWohAwsgACgCACIADQALCyAEBEAgBEEANgIEIARBCTYCAAtBAA8LIAEEQCABIAAvAQo7AQALIAAvAQpFBEBBwBQPCyAAKAIMC1cBAX9BEBAJIgNFBEBBAA8LIAMgATsBCiADIAA7AQggA0GABjYCBCADQQA2AgACQCABBEAgAyACIAEQYyIANgIMIAANASADEAZBAA8LIANBADYCDAsgAwvuBQIEfwV+IwBB4ABrIgQkACAEQQhqIgNCADcDICADQQA2AhggA0L/////DzcDECADQQA7AQwgA0G/hig2AgggA0EBOgAGIANBADsBBCADQQA2AgAgA0IANwNIIANBgIDYjXg2AkQgA0IANwMoIANCADcDMCADQgA3AzggA0FAa0EAOwEAIANCADcDUCABKQMIUCIDRQRAIAEoAgAoAgApA0ghBwsCfgJAIAMEQCAHIQkMAQsgByEJA0AgCqdBBHQiBSABKAIAaigCACIDKQNIIgggCSAIIAlUGyIJIAEpAyBWBEAgAgRAIAJBADYCBCACQRM2AgALQn8MAwsgAygCMCIGBH8gBi8BBAVBAAtB//8Dca0gCCADKQMgfHxCHnwiCCAHIAcgCFQbIgcgASkDIFYEQCACBEAgAkEANgIEIAJBEzYCAAtCfwwDCyAAKAIAIAEoAgAgBWooAgApA0hBABAUIQYgACgCACEDIAZBf0wEQCACBEAgAiADKAIMNgIAIAIgAygCEDYCBAtCfwwDCyAEQQhqIANBAEEBIAIQaEJ/UQRAIARBCGoQNkJ/DAMLAkACQCABKAIAIAVqKAIAIgMvAQogBC8BEkkNACADKAIQIAQoAhhHDQAgAygCFCAEKAIcRw0AIAMoAjAgBCgCOBBiRQ0AAkAgBCgCICIGIAMoAhhHBEAgBCkDKCEIDAELIAMpAyAiCyAEKQMoIghSDQAgCyEIIAMpAyggBCkDMFENAgsgBC0AFEEIcUUNACAGDQAgCEIAUg0AIAQpAzBQDQELIAIEQCACQQA2AgQgAkEVNgIACyAEQQhqEDZCfwwDCyABKAIAIAVqKAIAKAI0IAQoAjwQbyEDIAEoAgAgBWooAgAiBUEBOgAEIAUgAzYCNCAEQQA2AjwgBEEIahA2IApCAXwiCiABKQMIVA0ACwsgByAJfSIHQv///////////wAgB0L///////////8AVBsLIQcgBEHgAGokACAHC8YBAQJ/QdgAEAkiAUUEQCAABEAgAEEANgIEIABBDjYCAAtBAA8LIAECf0EYEAkiAkUEQCAABEAgAEEANgIEIABBDjYCAAtBAAwBCyACQQA2AhAgAkIANwMIIAJBADYCACACCyIANgJQIABFBEAgARAGQQAPCyABQgA3AwAgAUEANgIQIAFCADcCCCABQgA3AhQgAUEANgJUIAFCADcCHCABQgA3ACEgAUIANwMwIAFCADcDOCABQUBrQgA3AwAgAUIANwNIIAELgBMCD38CfiMAQdAAayIFJAAgBSABNgJMIAVBN2ohEyAFQThqIRBBACEBA0ACQCAOQQBIDQBB/////wcgDmsgAUgEQEGEhAFBPTYCAEF/IQ4MAQsgASAOaiEOCyAFKAJMIgchAQJAAkACQAJAAkACQAJAAkAgBQJ/AkAgBy0AACIGBEADQAJAAkAgBkH/AXEiBkUEQCABIQYMAQsgBkElRw0BIAEhBgNAIAEtAAFBJUcNASAFIAFBAmoiCDYCTCAGQQFqIQYgAS0AAiEMIAghASAMQSVGDQALCyAGIAdrIQEgAARAIAAgByABEC4LIAENDSAFKAJMIQEgBSgCTCwAAUEwa0EKTw0DIAEtAAJBJEcNAyABLAABQTBrIQ9BASERIAFBA2oMBAsgBSABQQFqIgg2AkwgAS0AASEGIAghAQwACwALIA4hDSAADQggEUUNAkEBIQEDQCAEIAFBAnRqKAIAIgAEQCADIAFBA3RqIAAgAhB4QQEhDSABQQFqIgFBCkcNAQwKCwtBASENIAFBCk8NCANAIAQgAUECdGooAgANCCABQQFqIgFBCkcNAAsMCAtBfyEPIAFBAWoLIgE2AkxBACEIAkAgASwAACIKQSBrIgZBH0sNAEEBIAZ0IgZBidEEcUUNAANAAkAgBSABQQFqIgg2AkwgASwAASIKQSBrIgFBIE8NAEEBIAF0IgFBidEEcUUNACABIAZyIQYgCCEBDAELCyAIIQEgBiEICwJAIApBKkYEQCAFAn8CQCABLAABQTBrQQpPDQAgBSgCTCIBLQACQSRHDQAgASwAAUECdCAEakHAAWtBCjYCACABLAABQQN0IANqQYADaygCACELQQEhESABQQNqDAELIBENCEEAIRFBACELIAAEQCACIAIoAgAiAUEEajYCACABKAIAIQsLIAUoAkxBAWoLIgE2AkwgC0F/Sg0BQQAgC2shCyAIQYDAAHIhCAwBCyAFQcwAahB3IgtBAEgNBiAFKAJMIQELQX8hCQJAIAEtAABBLkcNACABLQABQSpGBEACQCABLAACQTBrQQpPDQAgBSgCTCIBLQADQSRHDQAgASwAAkECdCAEakHAAWtBCjYCACABLAACQQN0IANqQYADaygCACEJIAUgAUEEaiIBNgJMDAILIBENByAABH8gAiACKAIAIgFBBGo2AgAgASgCAAVBAAshCSAFIAUoAkxBAmoiATYCTAwBCyAFIAFBAWo2AkwgBUHMAGoQdyEJIAUoAkwhAQtBACEGA0AgBiESQX8hDSABLAAAQcEAa0E5Sw0HIAUgAUEBaiIKNgJMIAEsAAAhBiAKIQEgBiASQTpsakGf7ABqLQAAIgZBAWtBCEkNAAsgBkETRg0CIAZFDQYgD0EATgRAIAQgD0ECdGogBjYCACAFIAMgD0EDdGopAwA3A0AMBAsgAA0BC0EAIQ0MBQsgBUFAayAGIAIQeCAFKAJMIQoMAgsgD0F/Sg0DC0EAIQEgAEUNBAsgCEH//3txIgwgCCAIQYDAAHEbIQZBACENQaQIIQ8gECEIAkACQAJAAn8CQAJAAkACQAJ/AkACQAJAAkACQAJAAkAgCkEBaywAACIBQV9xIAEgAUEPcUEDRhsgASASGyIBQdgAaw4hBBISEhISEhISDhIPBg4ODhIGEhISEgIFAxISCRIBEhIEAAsCQCABQcEAaw4HDhILEg4ODgALIAFB0wBGDQkMEQsgBSkDQCEUQaQIDAULQQAhAQJAAkACQAJAAkACQAJAIBJB/wFxDggAAQIDBBcFBhcLIAUoAkAgDjYCAAwWCyAFKAJAIA42AgAMFQsgBSgCQCAOrDcDAAwUCyAFKAJAIA47AQAMEwsgBSgCQCAOOgAADBILIAUoAkAgDjYCAAwRCyAFKAJAIA6sNwMADBALIAlBCCAJQQhLGyEJIAZBCHIhBkH4ACEBCyAQIQcgAUEgcSEMIAUpA0AiFFBFBEADQCAHQQFrIgcgFKdBD3FBsPAAai0AACAMcjoAACAUQg9WIQogFEIEiCEUIAoNAAsLIAUpA0BQDQMgBkEIcUUNAyABQQR2QaQIaiEPQQIhDQwDCyAQIQEgBSkDQCIUUEUEQANAIAFBAWsiASAUp0EHcUEwcjoAACAUQgdWIQcgFEIDiCEUIAcNAAsLIAEhByAGQQhxRQ0CIAkgECAHayIBQQFqIAEgCUgbIQkMAgsgBSkDQCIUQn9XBEAgBUIAIBR9IhQ3A0BBASENQaQIDAELIAZBgBBxBEBBASENQaUIDAELQaYIQaQIIAZBAXEiDRsLIQ8gECEBAkAgFEKAgICAEFQEQCAUIRUMAQsDQCABQQFrIgEgFCAUQgqAIhVCCn59p0EwcjoAACAUQv////+fAVYhByAVIRQgBw0ACwsgFaciBwRAA0AgAUEBayIBIAcgB0EKbiIMQQpsa0EwcjoAACAHQQlLIQogDCEHIAoNAAsLIAEhBwsgBkH//3txIAYgCUF/ShshBgJAIAUpA0AiFEIAUg0AIAkNAEEAIQkgECEHDAoLIAkgFFAgECAHa2oiASABIAlIGyEJDAkLIAUoAkAiAUGKEiABGyIHQQAgCRB6IgEgByAJaiABGyEIIAwhBiABIAdrIAkgARshCQwICyAJBEAgBSgCQAwCC0EAIQEgAEEgIAtBACAGECcMAgsgBUEANgIMIAUgBSkDQD4CCCAFIAVBCGo2AkBBfyEJIAVBCGoLIQhBACEBAkADQCAIKAIAIgdFDQECQCAFQQRqIAcQeSIHQQBIIgwNACAHIAkgAWtLDQAgCEEEaiEIIAkgASAHaiIBSw0BDAILC0F/IQ0gDA0FCyAAQSAgCyABIAYQJyABRQRAQQAhAQwBC0EAIQggBSgCQCEKA0AgCigCACIHRQ0BIAVBBGogBxB5IgcgCGoiCCABSg0BIAAgBUEEaiAHEC4gCkEEaiEKIAEgCEsNAAsLIABBICALIAEgBkGAwABzECcgCyABIAEgC0gbIQEMBQsgACAFKwNAIAsgCSAGIAFBABEdACEBDAQLIAUgBSkDQDwAN0EBIQkgEyEHIAwhBgwCC0F/IQ0LIAVB0ABqJAAgDQ8LIABBICANIAggB2siDCAJIAkgDEgbIgpqIgggCyAIIAtKGyIBIAggBhAnIAAgDyANEC4gAEEwIAEgCCAGQYCABHMQJyAAQTAgCiAMQQAQJyAAIAcgDBAuIABBICABIAggBkGAwABzECcMAAsAC54DAgR/AX4gAARAIAAoAgAiAQRAIAEQGhogACgCABALCyAAKAIcEAYgACgCIBAQIAAoAiQQECAAKAJQIgMEQCADKAIQIgIEQCADKAIAIgEEfwNAIAIgBEECdGooAgAiAgRAA0AgAigCGCEBIAIQBiABIgINAAsgAygCACEBCyABIARBAWoiBEsEQCADKAIQIQIMAQsLIAMoAhAFIAILEAYLIAMQBgsgACgCQCIBBEAgACkDMFAEfyABBSABED5CAiEFAkAgACkDMEICVA0AQQEhAgNAIAAoAkAgAkEEdGoQPiAFIAApAzBaDQEgBachAiAFQgF8IQUMAAsACyAAKAJACxAGCwJAIAAoAkRFDQBBACECQgEhBQNAIAAoAkwgAkECdGooAgAiAUEBOgAoIAFBDGoiASgCAEUEQCABBEAgAUEANgIEIAFBCDYCAAsLIAUgADUCRFoNASAFpyECIAVCAXwhBQwACwALIAAoAkwQBiAAKAJUIgIEQCACKAIIIgEEQCACKAIMIAERAwALIAIQBgsgAEEIahAxIAAQBgsL6gMCAX4EfwJAIAAEfiABRQRAIAMEQCADQQA2AgQgA0ESNgIAC0J/DwsgAkGDIHEEQAJAIAApAzBQDQBBPEE9IAJBAXEbIQcgAkECcUUEQANAIAAgBCACIAMQUyIFBEAgASAFIAcRAgBFDQYLIARCAXwiBCAAKQMwVA0ADAILAAsDQCAAIAQgAiADEFMiBQRAIAECfyAFECJBAWohBgNAQQAgBkUNARogBSAGQQFrIgZqIggtAABBL0cNAAsgCAsiBkEBaiAFIAYbIAcRAgBFDQULIARCAXwiBCAAKQMwVA0ACwsgAwRAIANBADYCBCADQQk2AgALQn8PC0ESIQYCQAJAIAAoAlAiBUUNACABRQ0AQQkhBiAFKQMIUA0AIAUoAhAgAS0AACIHBH9CpesKIQQgASEAA0AgBCAHrUL/AYN8IQQgAC0AASIHBEAgAEEBaiEAIARC/////w+DQiF+IQQMAQsLIASnBUGFKgsgBSgCAHBBAnRqKAIAIgBFDQADQCABIAAoAgAQOEUEQCACQQhxBEAgACkDCCIEQn9RDQMMBAsgACkDECIEQn9RDQIMAwsgACgCGCIADQALCyADBEAgA0EANgIEIAMgBjYCAAtCfyEECyAEBUJ/Cw8LIAMEQCADQgA3AgALIAQL3AQCB38BfgJAAkAgAEUNACABRQ0AIAJCf1UNAQsgBARAIARBADYCBCAEQRI2AgALQQAPCwJAIAAoAgAiB0UEQEGAAiEHQYACEDwiBkUNASAAKAIQEAYgAEGAAjYCACAAIAY2AhALAkACQCAAKAIQIAEtAAAiBQR/QqXrCiEMIAEhBgNAIAwgBa1C/wGDfCEMIAYtAAEiBQRAIAZBAWohBiAMQv////8Pg0IhfiEMDAELCyAMpwVBhSoLIgYgB3BBAnRqIggoAgAiBQRAA0ACQCAFKAIcIAZHDQAgASAFKAIAEDgNAAJAIANBCHEEQCAFKQMIQn9SDQELIAUpAxBCf1ENBAsgBARAIARBADYCBCAEQQo2AgALQQAPCyAFKAIYIgUNAAsLQSAQCSIFRQ0CIAUgATYCACAFIAgoAgA2AhggCCAFNgIAIAVCfzcDCCAFIAY2AhwgACAAKQMIQgF8Igw3AwggDLogB7hEAAAAAAAA6D+iZEUNACAHQQBIDQAgByAHQQF0IghGDQAgCBA8IgpFDQECQCAMQgAgBxtQBEAgACgCECEJDAELIAAoAhAhCUEAIQQDQCAJIARBAnRqKAIAIgYEQANAIAYoAhghASAGIAogBigCHCAIcEECdGoiCygCADYCGCALIAY2AgAgASIGDQALCyAEQQFqIgQgB0cNAAsLIAkQBiAAIAg2AgAgACAKNgIQCyADQQhxBEAgBSACNwMICyAFIAI3AxBBAQ8LIAQEQCAEQQA2AgQgBEEONgIAC0EADwsgBARAIARBADYCBCAEQQ42AgALQQAL3Q8BF38jAEFAaiIHQgA3AzAgB0IANwM4IAdCADcDICAHQgA3AygCQAJAAkACQAJAIAIEQCACQQNxIQggAkEBa0EDTwRAIAJBfHEhBgNAIAdBIGogASAJQQF0IgxqLwEAQQF0aiIKIAovAQBBAWo7AQAgB0EgaiABIAxBAnJqLwEAQQF0aiIKIAovAQBBAWo7AQAgB0EgaiABIAxBBHJqLwEAQQF0aiIKIAovAQBBAWo7AQAgB0EgaiABIAxBBnJqLwEAQQF0aiIKIAovAQBBAWo7AQAgCUEEaiEJIAZBBGsiBg0ACwsgCARAA0AgB0EgaiABIAlBAXRqLwEAQQF0aiIGIAYvAQBBAWo7AQAgCUEBaiEJIAhBAWsiCA0ACwsgBCgCACEJQQ8hCyAHLwE+IhENAgwBCyAEKAIAIQkLQQ4hC0EAIREgBy8BPA0AQQ0hCyAHLwE6DQBBDCELIAcvATgNAEELIQsgBy8BNg0AQQohCyAHLwE0DQBBCSELIAcvATINAEEIIQsgBy8BMA0AQQchCyAHLwEuDQBBBiELIAcvASwNAEEFIQsgBy8BKg0AQQQhCyAHLwEoDQBBAyELIAcvASYNAEECIQsgBy8BJA0AIAcvASJFBEAgAyADKAIAIgBBBGo2AgAgAEHAAjYBACADIAMoAgAiAEEEajYCACAAQcACNgEAQQEhDQwDCyAJQQBHIRtBASELQQEhCQwBCyALIAkgCSALSxshG0EBIQ5BASEJA0AgB0EgaiAJQQF0ai8BAA0BIAlBAWoiCSALRw0ACyALIQkLQX8hCCAHLwEiIg9BAksNAUEEIAcvASQiECAPQQF0amsiBkEASA0BIAZBAXQgBy8BJiISayIGQQBIDQEgBkEBdCAHLwEoIhNrIgZBAEgNASAGQQF0IAcvASoiFGsiBkEASA0BIAZBAXQgBy8BLCIVayIGQQBIDQEgBkEBdCAHLwEuIhZrIgZBAEgNASAGQQF0IAcvATAiF2siBkEASA0BIAZBAXQgBy8BMiIZayIGQQBIDQEgBkEBdCAHLwE0IhxrIgZBAEgNASAGQQF0IAcvATYiDWsiBkEASA0BIAZBAXQgBy8BOCIYayIGQQBIDQEgBkEBdCAHLwE6IgxrIgZBAEgNASAGQQF0IAcvATwiCmsiBkEASA0BIAZBAXQgEWsiBkEASA0BIAZBACAARSAOchsNASAJIBtLIRpBACEIIAdBADsBAiAHIA87AQQgByAPIBBqIgY7AQYgByAGIBJqIgY7AQggByAGIBNqIgY7AQogByAGIBRqIgY7AQwgByAGIBVqIgY7AQ4gByAGIBZqIgY7ARAgByAGIBdqIgY7ARIgByAGIBlqIgY7ARQgByAGIBxqIgY7ARYgByAGIA1qIgY7ARggByAGIBhqIgY7ARogByAGIAxqIgY7ARwgByAGIApqOwEeAkAgAkUNACACQQFHBEAgAkF+cSEGA0AgASAIQQF0ai8BACIKBEAgByAKQQF0aiIKIAovAQAiCkEBajsBACAFIApBAXRqIAg7AQALIAEgCEEBciIMQQF0ai8BACIKBEAgByAKQQF0aiIKIAovAQAiCkEBajsBACAFIApBAXRqIAw7AQALIAhBAmohCCAGQQJrIgYNAAsLIAJBAXFFDQAgASAIQQF0ai8BACICRQ0AIAcgAkEBdGoiAiACLwEAIgJBAWo7AQAgBSACQQF0aiAIOwEACyAJIBsgGhshDUEUIRBBACEWIAUiCiEYQQAhEgJAAkACQCAADgICAAELQQEhCCANQQpLDQNBgQIhEEHw2QAhGEGw2QAhCkEBIRIMAQsgAEECRiEWQQAhEEHw2gAhGEGw2gAhCiAAQQJHBEAMAQtBASEIIA1BCUsNAgtBASANdCITQQFrIRwgAygCACEUQQAhFSANIQZBACEPQQAhDkF/IQIDQEEBIAZ0IRoCQANAIAkgD2shFwJAIAUgFUEBdGovAQAiCCAQTwRAIAogCCAQa0EBdCIAai8BACERIAAgGGotAAAhAAwBC0EAQeAAIAhBAWogEEkiBhshACAIQQAgBhshEQsgDiAPdiEMQX8gF3QhBiAaIQgDQCAUIAYgCGoiCCAMakECdGoiGSAROwECIBkgFzoAASAZIAA6AAAgCA0AC0EBIAlBAWt0IQYDQCAGIgBBAXYhBiAAIA5xDQALIAdBIGogCUEBdGoiBiAGLwEAQQFrIgY7AQAgAEEBayAOcSAAakEAIAAbIQ4gFUEBaiEVIAZB//8DcUUEQCAJIAtGDQIgASAFIBVBAXRqLwEAQQF0ai8BACEJCyAJIA1NDQAgDiAccSIAIAJGDQALQQEgCSAPIA0gDxsiD2siBnQhAiAJIAtJBEAgCyAPayEMIAkhCAJAA0AgAiAHQSBqIAhBAXRqLwEAayICQQFIDQEgAkEBdCECIAZBAWoiBiAPaiIIIAtJDQALIAwhBgtBASAGdCECC0EBIQggEiACIBNqIhNBtApLcQ0DIBYgE0HQBEtxDQMgAygCACICIABBAnRqIgggDToAASAIIAY6AAAgCCAUIBpBAnRqIhQgAmtBAnY7AQIgACECDAELCyAOBEAgFCAOQQJ0aiIAQQA7AQIgACAXOgABIABBwAA6AAALIAMgAygCACATQQJ0ajYCAAsgBCANNgIAQQAhCAsgCAusAQICfgF/IAFBAmqtIQIgACkDmC4hAwJAIAAoAqAuIgFBA2oiBEE/TQRAIAIgAa2GIAOEIQIMAQsgAUHAAEYEQCAAKAIEIAAoAhBqIAM3AAAgACAAKAIQQQhqNgIQQQMhBAwBCyAAKAIEIAAoAhBqIAIgAa2GIAOENwAAIAAgACgCEEEIajYCECABQT1rIQQgAkHAACABa62IIQILIAAgAjcDmC4gACAENgKgLguXAwICfgN/QYDJADMBACECIAApA5guIQMCQCAAKAKgLiIFQYLJAC8BACIGaiIEQT9NBEAgAiAFrYYgA4QhAgwBCyAFQcAARgRAIAAoAgQgACgCEGogAzcAACAAIAAoAhBBCGo2AhAgBiEEDAELIAAoAgQgACgCEGogAiAFrYYgA4Q3AAAgACAAKAIQQQhqNgIQIARBQGohBCACQcAAIAVrrYghAgsgACACNwOYLiAAIAQ2AqAuIAEEQAJAIARBOU4EQCAAKAIEIAAoAhBqIAI3AAAgACAAKAIQQQhqNgIQDAELIARBGU4EQCAAKAIEIAAoAhBqIAI+AAAgACAAKAIQQQRqNgIQIAAgACkDmC5CIIgiAjcDmC4gACAAKAKgLkEgayIENgKgLgsgBEEJTgR/IAAoAgQgACgCEGogAj0AACAAIAAoAhBBAmo2AhAgACkDmC5CEIghAiAAKAKgLkEQawUgBAtBAUgNACAAIAAoAhAiAUEBajYCECABIAAoAgRqIAI8AAALIABBADYCoC4gAEIANwOYLgsL8hQBEn8gASgCCCICKAIAIQUgAigCDCEHIAEoAgAhCCAAQoCAgIDQxwA3A6ApQQAhAgJAAkAgB0EASgRAQX8hDANAAkAgCCACQQJ0aiIDLwEABEAgACAAKAKgKUEBaiIDNgKgKSAAIANBAnRqQawXaiACNgIAIAAgAmpBqClqQQA6AAAgAiEMDAELIANBADsBAgsgAkEBaiICIAdHDQALIABB/C1qIQ8gAEH4LWohESAAKAKgKSIEQQFKDQIMAQsgAEH8LWohDyAAQfgtaiERQX8hDAsDQCAAIARBAWoiAjYCoCkgACACQQJ0akGsF2ogDEEBaiIDQQAgDEECSCIGGyICNgIAIAggAkECdCIEakEBOwEAIAAgAmpBqClqQQA6AAAgACAAKAL4LUEBazYC+C0gBQRAIA8gDygCACAEIAVqLwECazYCAAsgAyAMIAYbIQwgACgCoCkiBEECSA0ACwsgASAMNgIEIARBAXYhBgNAIAAgBkECdGpBrBdqKAIAIQkCQCAGIgJBAXQiAyAESg0AIAggCUECdGohCiAAIAlqQagpaiENIAYhBQNAAkAgAyAETgRAIAMhAgwBCyAIIABBrBdqIgIgA0EBciIEQQJ0aigCACILQQJ0ai8BACIOIAggAiADQQJ0aigCACIQQQJ0ai8BACICTwRAIAIgDkcEQCADIQIMAgsgAyECIABBqClqIgMgC2otAAAgAyAQai0AAEsNAQsgBCECCyAKLwEAIgQgCCAAIAJBAnRqQawXaigCACIDQQJ0ai8BACILSQRAIAUhAgwCCwJAIAQgC0cNACANLQAAIAAgA2pBqClqLQAASw0AIAUhAgwCCyAAIAVBAnRqQawXaiADNgIAIAIhBSACQQF0IgMgACgCoCkiBEwNAAsLIAAgAkECdGpBrBdqIAk2AgAgBkECTgRAIAZBAWshBiAAKAKgKSEEDAELCyAAKAKgKSEDA0AgByEGIAAgA0EBayIENgKgKSAAKAKwFyEKIAAgACADQQJ0akGsF2ooAgAiCTYCsBdBASECAkAgA0EDSA0AIAggCUECdGohDSAAIAlqQagpaiELQQIhA0EBIQUDQAJAIAMgBE4EQCADIQIMAQsgCCAAQawXaiICIANBAXIiB0ECdGooAgAiBEECdGovAQAiDiAIIAIgA0ECdGooAgAiEEECdGovAQAiAk8EQCACIA5HBEAgAyECDAILIAMhAiAAQagpaiIDIARqLQAAIAMgEGotAABLDQELIAchAgsgDS8BACIHIAggACACQQJ0akGsF2ooAgAiA0ECdGovAQAiBEkEQCAFIQIMAgsCQCAEIAdHDQAgCy0AACAAIANqQagpai0AAEsNACAFIQIMAgsgACAFQQJ0akGsF2ogAzYCACACIQUgAkEBdCIDIAAoAqApIgRMDQALC0ECIQMgAEGsF2oiByACQQJ0aiAJNgIAIAAgACgCpClBAWsiBTYCpCkgACgCsBchAiAHIAVBAnRqIAo2AgAgACAAKAKkKUEBayIFNgKkKSAHIAVBAnRqIAI2AgAgCCAGQQJ0aiINIAggAkECdGoiBS8BACAIIApBAnRqIgQvAQBqOwEAIABBqClqIgkgBmoiCyACIAlqLQAAIgIgCSAKai0AACIKIAIgCksbQQFqOgAAIAUgBjsBAiAEIAY7AQIgACAGNgKwF0EBIQVBASECAkAgACgCoCkiBEECSA0AA0AgDS8BACIKIAggAAJ/IAMgAyAETg0AGiAIIAcgA0EBciICQQJ0aigCACIEQQJ0ai8BACIOIAggByADQQJ0aigCACIQQQJ0ai8BACISTwRAIAMgDiASRw0BGiADIAQgCWotAAAgCSAQai0AAEsNARoLIAILIgJBAnRqQawXaigCACIDQQJ0ai8BACIESQRAIAUhAgwCCwJAIAQgCkcNACALLQAAIAAgA2pBqClqLQAASw0AIAUhAgwCCyAAIAVBAnRqQawXaiADNgIAIAIhBSACQQF0IgMgACgCoCkiBEwNAAsLIAZBAWohByAAIAJBAnRqQawXaiAGNgIAIAAoAqApIgNBAUoNAAsgACAAKAKkKUEBayICNgKkKSAAQawXaiIDIAJBAnRqIAAoArAXNgIAIAEoAgQhCSABKAIIIgIoAhAhBiACKAIIIQogAigCBCEQIAIoAgAhDSABKAIAIQcgAEGkF2pCADcBACAAQZwXakIANwEAIABBlBdqQgA3AQAgAEGMF2oiAUIANwEAQQAhBSAHIAMgACgCpClBAnRqKAIAQQJ0akEAOwECAkAgACgCpCkiAkG7BEoNACACQQFqIQIDQCAHIAAgAkECdGpBrBdqKAIAIgRBAnQiEmoiCyAHIAsvAQJBAnRqLwECIgNBAWogBiADIAZJGyIOOwECIAMgBk8hEwJAIAQgCUoNACAAIA5BAXRqQYwXaiIDIAMvAQBBAWo7AQBBACEDIAQgCk4EQCAQIAQgCmtBAnRqKAIAIQMLIBEgESgCACALLwEAIgQgAyAOamxqNgIAIA1FDQAgDyAPKAIAIAMgDSASai8BAmogBGxqNgIACyAFIBNqIQUgAkEBaiICQb0ERw0ACyAFRQ0AIAAgBkEBdGpBjBdqIQQDQCAGIQIDQCAAIAIiA0EBayICQQF0akGMF2oiDy8BACIKRQ0ACyAPIApBAWs7AQAgACADQQF0akGMF2oiAiACLwEAQQJqOwEAIAQgBC8BAEEBayIDOwEAIAVBAkohAiAFQQJrIQUgAg0ACyAGRQ0AQb0EIQIDQCADQf//A3EiBQRAA0AgACACQQFrIgJBAnRqQawXaigCACIDIAlKDQAgByADQQJ0aiIDLwECIAZHBEAgESARKAIAIAYgAy8BAGxqIgQ2AgAgESAEIAMvAQAgAy8BAmxrNgIAIAMgBjsBAgsgBUEBayIFDQALCyAGQQFrIgZFDQEgACAGQQF0akGMF2ovAQAhAwwACwALIwBBIGsiAiABIgAvAQBBAXQiATsBAiACIAEgAC8BAmpBAXQiATsBBCACIAEgAC8BBGpBAXQiATsBBiACIAEgAC8BBmpBAXQiATsBCCACIAEgAC8BCGpBAXQiATsBCiACIAEgAC8BCmpBAXQiATsBDCACIAEgAC8BDGpBAXQiATsBDiACIAEgAC8BDmpBAXQiATsBECACIAEgAC8BEGpBAXQiATsBEiACIAEgAC8BEmpBAXQiATsBFCACIAEgAC8BFGpBAXQiATsBFiACIAEgAC8BFmpBAXQiATsBGCACIAEgAC8BGGpBAXQiATsBGiACIAEgAC8BGmpBAXQiATsBHCACIAAvARwgAWpBAXQ7AR5BACEAIAxBAE4EQANAIAggAEECdGoiAy8BAiIBBEAgAiABQQF0aiIFIAUvAQAiBUEBajsBACADIAWtQoD+A4NCCIhCgpCAgQh+QpDCiKKIAYNCgYKEiBB+QiCIp0H/AXEgBUH/AXGtQoKQgIEIfkKQwoiiiAGDQoGChIgQfkIYiKdBgP4DcXJBECABa3Y7AQALIAAgDEchASAAQQFqIQAgAQ0ACwsLcgEBfyMAQRBrIgQkAAJ/QQAgAEUNABogAEEIaiEAIAFFBEAgAlBFBEAgAARAIABBADYCBCAAQRI2AgALQQAMAgtBAEIAIAMgABA6DAELIAQgAjcDCCAEIAE2AgAgBEIBIAMgABA6CyEAIARBEGokACAACyIAIAAgASACIAMQJiIARQRAQQAPCyAAKAIwQQAgAiADECULAwABC8gFAQR/IABB//8DcSEDIABBEHYhBEEBIQAgAkEBRgRAIAMgAS0AAGpB8f8DcCIAIARqQfH/A3BBEHQgAHIPCwJAIAEEfyACQRBJDQECQCACQa8rSwRAA0AgAkGwK2shAkG1BSEFIAEhAANAIAMgAC0AAGoiAyAEaiADIAAtAAFqIgNqIAMgAC0AAmoiA2ogAyAALQADaiIDaiADIAAtAARqIgNqIAMgAC0ABWoiA2ogAyAALQAGaiIDaiADIAAtAAdqIgNqIQQgBQRAIABBCGohACAFQQFrIQUMAQsLIARB8f8DcCEEIANB8f8DcCEDIAFBsCtqIQEgAkGvK0sNAAsgAkEISQ0BCwNAIAMgAS0AAGoiACAEaiAAIAEtAAFqIgBqIAAgAS0AAmoiAGogACABLQADaiIAaiAAIAEtAARqIgBqIAAgAS0ABWoiAGogACABLQAGaiIAaiAAIAEtAAdqIgNqIQQgAUEIaiEBIAJBCGsiAkEHSw0ACwsCQCACRQ0AIAJBAWshBiACQQNxIgUEQCABIQADQCACQQFrIQIgAyAALQAAaiIDIARqIQQgAEEBaiIBIQAgBUEBayIFDQALCyAGQQNJDQADQCADIAEtAABqIgAgAS0AAWoiBSABLQACaiIGIAEtAANqIgMgBiAFIAAgBGpqamohBCABQQRqIQEgAkEEayICDQALCyADQfH/A3AgBEHx/wNwQRB0cgVBAQsPCwJAIAJFDQAgAkEBayEGIAJBA3EiBQRAIAEhAANAIAJBAWshAiADIAAtAABqIgMgBGohBCAAQQFqIgEhACAFQQFrIgUNAAsLIAZBA0kNAANAIAMgAS0AAGoiACABLQABaiIFIAEtAAJqIgYgAS0AA2oiAyAGIAUgACAEampqaiEEIAFBBGohASACQQRrIgINAAsLIANB8f8DcCAEQfH/A3BBEHRyCx8AIAAgAiADQcCAASgCABEAACEAIAEgAiADEAcaIAALIwAgACAAKAJAIAIgA0HUgAEoAgARAAA2AkAgASACIAMQBxoLzSoCGH8HfiAAKAIMIgIgACgCECIDaiEQIAMgAWshASAAKAIAIgUgACgCBGohA0F/IAAoAhwiBygCpAF0IQRBfyAHKAKgAXQhCyAHKAI4IQwCf0EAIAcoAiwiEUUNABpBACACIAxJDQAaIAJBhAJqIAwgEWpNCyEWIBBBgwJrIRMgASACaiEXIANBDmshFCAEQX9zIRggC0F/cyESIAcoApwBIRUgBygCmAEhDSAHKAKIASEIIAc1AoQBIR0gBygCNCEOIAcoAjAhGSAQQQFqIQ8DQCAIQThyIQYgBSAIQQN2QQdxayELAn8gAiANIAUpAAAgCK2GIB2EIh2nIBJxQQJ0IgFqIgMtAAAiBA0AGiACIAEgDWoiAS0AAjoAACAGIAEtAAEiAWshBiACQQFqIA0gHSABrYgiHacgEnFBAnQiAWoiAy0AACIEDQAaIAIgASANaiIDLQACOgABIAYgAy0AASIDayEGIA0gHSADrYgiHacgEnFBAnRqIgMtAAAhBCACQQJqCyEBIAtBB2ohBSAGIAMtAAEiAmshCCAdIAKtiCEdAkACQAJAIARB/wFxRQ0AAkACQAJAAkACQANAIARBEHEEQCAVIB0gBK1CD4OIIhqnIBhxQQJ0aiECAn8gCCAEQQ9xIgZrIgRBG0sEQCAEIQggBQwBCyAEQThyIQggBSkAACAErYYgGoQhGiAFIARBA3ZrQQdqCyELIAMzAQIhGyAIIAItAAEiA2shCCAaIAOtiCEaIAItAAAiBEEQcQ0CA0AgBEHAAHFFBEAgCCAVIAIvAQJBAnRqIBqnQX8gBHRBf3NxQQJ0aiICLQABIgNrIQggGiADrYghGiACLQAAIgRBEHFFDQEMBAsLIAdB0f4ANgIEIABB7A42AhggGiEdDAMLIARB/wFxIgJBwABxRQRAIAggDSADLwECQQJ0aiAdp0F/IAJ0QX9zcUECdGoiAy0AASICayEIIB0gAq2IIR0gAy0AACIERQ0HDAELCyAEQSBxBEAgB0G//gA2AgQgASECDAgLIAdB0f4ANgIEIABB0A42AhggASECDAcLIB1BfyAGdEF/c62DIBt8IhunIQUgCCAEQQ9xIgNrIQggGiAErUIPg4ghHSABIBdrIgYgAjMBAiAaQX8gA3RBf3Otg3ynIgRPDQIgBCAGayIGIBlNDQEgBygCjEdFDQEgB0HR/gA2AgQgAEG5DDYCGAsgASECIAshBQwFCwJAIA5FBEAgDCARIAZraiEDDAELIAYgDk0EQCAMIA4gBmtqIQMMAQsgDCARIAYgDmsiBmtqIQMgBSAGTQ0AIAUgBmshBQJAAkAgASADTSABIA8gAWusIhogBq0iGyAaIBtUGyIapyIGaiICIANLcQ0AIAMgBmogAUsgASADT3ENACABIAMgBhAHGiACIQEMAQsgASADIAMgAWsiASABQR91IgFqIAFzIgIQByACaiEBIBogAq0iHn0iHFANACACIANqIQIDQAJAIBwgHiAcIB5UGyIbQiBUBEAgGyEaDAELIBsiGkIgfSIgQgWIQgF8QgODIh9QRQRAA0AgASACKQAANwAAIAEgAikAGDcAGCABIAIpABA3ABAgASACKQAINwAIIBpCIH0hGiACQSBqIQIgAUEgaiEBIB9CAX0iH0IAUg0ACwsgIELgAFQNAANAIAEgAikAADcAACABIAIpABg3ABggASACKQAQNwAQIAEgAikACDcACCABIAIpADg3ADggASACKQAwNwAwIAEgAikAKDcAKCABIAIpACA3ACAgASACKQBYNwBYIAEgAikAUDcAUCABIAIpAEg3AEggASACKQBANwBAIAEgAikAYDcAYCABIAIpAGg3AGggASACKQBwNwBwIAEgAikAeDcAeCACQYABaiECIAFBgAFqIQEgGkKAAX0iGkIfVg0ACwsgGkIQWgRAIAEgAikAADcAACABIAIpAAg3AAggGkIQfSEaIAJBEGohAiABQRBqIQELIBpCCFoEQCABIAIpAAA3AAAgGkIIfSEaIAJBCGohAiABQQhqIQELIBpCBFoEQCABIAIoAAA2AAAgGkIEfSEaIAJBBGohAiABQQRqIQELIBpCAloEQCABIAIvAAA7AAAgGkICfSEaIAJBAmohAiABQQJqIQELIBwgG30hHCAaUEUEQCABIAItAAA6AAAgAkEBaiECIAFBAWohAQsgHEIAUg0ACwsgDiEGIAwhAwsgBSAGSwRAAkACQCABIANNIAEgDyABa6wiGiAGrSIbIBogG1QbIhqnIglqIgIgA0txDQAgAyAJaiABSyABIANPcQ0AIAEgAyAJEAcaDAELIAEgAyADIAFrIgEgAUEfdSIBaiABcyIBEAcgAWohAiAaIAGtIh59IhxQDQAgASADaiEBA0ACQCAcIB4gHCAeVBsiG0IgVARAIBshGgwBCyAbIhpCIH0iIEIFiEIBfEIDgyIfUEUEQANAIAIgASkAADcAACACIAEpABg3ABggAiABKQAQNwAQIAIgASkACDcACCAaQiB9IRogAUEgaiEBIAJBIGohAiAfQgF9Ih9CAFINAAsLICBC4ABUDQADQCACIAEpAAA3AAAgAiABKQAYNwAYIAIgASkAEDcAECACIAEpAAg3AAggAiABKQA4NwA4IAIgASkAMDcAMCACIAEpACg3ACggAiABKQAgNwAgIAIgASkAWDcAWCACIAEpAFA3AFAgAiABKQBINwBIIAIgASkAQDcAQCACIAEpAGA3AGAgAiABKQBoNwBoIAIgASkAcDcAcCACIAEpAHg3AHggAUGAAWohASACQYABaiECIBpCgAF9IhpCH1YNAAsLIBpCEFoEQCACIAEpAAA3AAAgAiABKQAINwAIIBpCEH0hGiACQRBqIQIgAUEQaiEBCyAaQghaBEAgAiABKQAANwAAIBpCCH0hGiACQQhqIQIgAUEIaiEBCyAaQgRaBEAgAiABKAAANgAAIBpCBH0hGiACQQRqIQIgAUEEaiEBCyAaQgJaBEAgAiABLwAAOwAAIBpCAn0hGiACQQJqIQIgAUECaiEBCyAcIBt9IRwgGlBFBEAgAiABLQAAOgAAIAJBAWohAiABQQFqIQELIBxCAFINAAsLIAUgBmshAUEAIARrIQUCQCAEQQdLBEAgBCEDDAELIAEgBE0EQCAEIQMMAQsgAiAEayEFA0ACQCACIAUpAAA3AAAgBEEBdCEDIAEgBGshASACIARqIQIgBEEDSw0AIAMhBCABIANLDQELC0EAIANrIQULIAIgBWohBAJAIAUgDyACa6wiGiABrSIbIBogG1QbIhqnIgFIIAVBf0pxDQAgBUEBSCABIARqIAJLcQ0AIAIgBCABEAcgAWohAgwDCyACIAQgAyADQR91IgFqIAFzIgEQByABaiECIBogAa0iHn0iHFANAiABIARqIQEDQAJAIBwgHiAcIB5UGyIbQiBUBEAgGyEaDAELIBsiGkIgfSIgQgWIQgF8QgODIh9QRQRAA0AgAiABKQAANwAAIAIgASkAGDcAGCACIAEpABA3ABAgAiABKQAINwAIIBpCIH0hGiABQSBqIQEgAkEgaiECIB9CAX0iH0IAUg0ACwsgIELgAFQNAANAIAIgASkAADcAACACIAEpABg3ABggAiABKQAQNwAQIAIgASkACDcACCACIAEpADg3ADggAiABKQAwNwAwIAIgASkAKDcAKCACIAEpACA3ACAgAiABKQBYNwBYIAIgASkAUDcAUCACIAEpAEg3AEggAiABKQBANwBAIAIgASkAYDcAYCACIAEpAGg3AGggAiABKQBwNwBwIAIgASkAeDcAeCABQYABaiEBIAJBgAFqIQIgGkKAAX0iGkIfVg0ACwsgGkIQWgRAIAIgASkAADcAACACIAEpAAg3AAggGkIQfSEaIAJBEGohAiABQRBqIQELIBpCCFoEQCACIAEpAAA3AAAgGkIIfSEaIAJBCGohAiABQQhqIQELIBpCBFoEQCACIAEoAAA2AAAgGkIEfSEaIAJBBGohAiABQQRqIQELIBpCAloEQCACIAEvAAA7AAAgGkICfSEaIAJBAmohAiABQQJqIQELIBwgG30hHCAaUEUEQCACIAEtAAA6AAAgAkEBaiECIAFBAWohAQsgHFBFDQALDAILAkAgASADTSABIA8gAWusIhogBa0iGyAaIBtUGyIapyIEaiICIANLcQ0AIAMgBGogAUsgASADT3ENACABIAMgBBAHGgwCCyABIAMgAyABayIBIAFBH3UiAWogAXMiARAHIAFqIQIgGiABrSIefSIcUA0BIAEgA2ohAQNAAkAgHCAeIBwgHlQbIhtCIFQEQCAbIRoMAQsgGyIaQiB9IiBCBYhCAXxCA4MiH1BFBEADQCACIAEpAAA3AAAgAiABKQAYNwAYIAIgASkAEDcAECACIAEpAAg3AAggGkIgfSEaIAFBIGohASACQSBqIQIgH0IBfSIfQgBSDQALCyAgQuAAVA0AA0AgAiABKQAANwAAIAIgASkAGDcAGCACIAEpABA3ABAgAiABKQAINwAIIAIgASkAODcAOCACIAEpADA3ADAgAiABKQAoNwAoIAIgASkAIDcAICACIAEpAFg3AFggAiABKQBQNwBQIAIgASkASDcASCACIAEpAEA3AEAgAiABKQBgNwBgIAIgASkAaDcAaCACIAEpAHA3AHAgAiABKQB4NwB4IAFBgAFqIQEgAkGAAWohAiAaQoABfSIaQh9WDQALCyAaQhBaBEAgAiABKQAANwAAIAIgASkACDcACCAaQhB9IRogAkEQaiECIAFBEGohAQsgGkIIWgRAIAIgASkAADcAACAaQgh9IRogAkEIaiECIAFBCGohAQsgGkIEWgRAIAIgASgAADYAACAaQgR9IRogAkEEaiECIAFBBGohAQsgGkICWgRAIAIgAS8AADsAACAaQgJ9IRogAkECaiECIAFBAmohAQsgHCAbfSEcIBpQRQRAIAIgAS0AADoAACACQQFqIQIgAUEBaiEBCyAcUEUNAAsMAQsCQAJAIBYEQAJAIAQgBUkEQCAHKAKYRyAESw0BCyABIARrIQMCQEEAIARrIgVBf0ogDyABa6wiGiAbIBogG1QbIhqnIgIgBUpxDQAgBUEBSCACIANqIAFLcQ0AIAEgAyACEAcgAmohAgwFCyABIAMgBCAEQR91IgFqIAFzIgEQByABaiECIBogAa0iHn0iHFANBCABIANqIQEDQAJAIBwgHiAcIB5UGyIbQiBUBEAgGyEaDAELIBsiGkIgfSIgQgWIQgF8QgODIh9QRQRAA0AgAiABKQAANwAAIAIgASkAGDcAGCACIAEpABA3ABAgAiABKQAINwAIIBpCIH0hGiABQSBqIQEgAkEgaiECIB9CAX0iH0IAUg0ACwsgIELgAFQNAANAIAIgASkAADcAACACIAEpABg3ABggAiABKQAQNwAQIAIgASkACDcACCACIAEpADg3ADggAiABKQAwNwAwIAIgASkAKDcAKCACIAEpACA3ACAgAiABKQBYNwBYIAIgASkAUDcAUCACIAEpAEg3AEggAiABKQBANwBAIAIgASkAYDcAYCACIAEpAGg3AGggAiABKQBwNwBwIAIgASkAeDcAeCABQYABaiEBIAJBgAFqIQIgGkKAAX0iGkIfVg0ACwsgGkIQWgRAIAIgASkAADcAACACIAEpAAg3AAggGkIQfSEaIAJBEGohAiABQRBqIQELIBpCCFoEQCACIAEpAAA3AAAgGkIIfSEaIAJBCGohAiABQQhqIQELIBpCBFoEQCACIAEoAAA2AAAgGkIEfSEaIAJBBGohAiABQQRqIQELIBpCAloEQCACIAEvAAA7AAAgGkICfSEaIAJBAmohAiABQQJqIQELIBwgG30hHCAaUEUEQCACIAEtAAA6AAAgAkEBaiECIAFBAWohAQsgHFBFDQALDAQLIBAgAWsiCUEBaiIGIAUgBSAGSxshAyABIARrIQIgAUEHcUUNAiADRQ0CIAEgAi0AADoAACACQQFqIQIgAUEBaiIGQQdxQQAgA0EBayIFGw0BIAYhASAFIQMgCSEGDAILAkAgBCAFSQRAIAcoAphHIARLDQELIAEgASAEayIGKQAANwAAIAEgBUEBa0EHcUEBaiIDaiECIAUgA2siBEUNAyADIAZqIQEDQCACIAEpAAA3AAAgAUEIaiEBIAJBCGohAiAEQQhrIgQNAAsMAwsgASAEIAUQPyECDAILIAEgAi0AADoAASAJQQFrIQYgA0ECayEFIAJBAWohAgJAIAFBAmoiCkEHcUUNACAFRQ0AIAEgAi0AADoAAiAJQQJrIQYgA0EDayEFIAJBAWohAgJAIAFBA2oiCkEHcUUNACAFRQ0AIAEgAi0AADoAAyAJQQNrIQYgA0EEayEFIAJBAWohAgJAIAFBBGoiCkEHcUUNACAFRQ0AIAEgAi0AADoABCAJQQRrIQYgA0EFayEFIAJBAWohAgJAIAFBBWoiCkEHcUUNACAFRQ0AIAEgAi0AADoABSAJQQVrIQYgA0EGayEFIAJBAWohAgJAIAFBBmoiCkEHcUUNACAFRQ0AIAEgAi0AADoABiAJQQZrIQYgA0EHayEFIAJBAWohAgJAIAFBB2oiCkEHcUUNACAFRQ0AIAEgAi0AADoAByAJQQdrIQYgA0EIayEDIAFBCGohASACQQFqIQIMBgsgCiEBIAUhAwwFCyAKIQEgBSEDDAQLIAohASAFIQMMAwsgCiEBIAUhAwwCCyAKIQEgBSEDDAELIAohASAFIQMLAkACQCAGQRdNBEAgA0UNASADQQFrIQUgA0EHcSIEBEADQCABIAItAAA6AAAgA0EBayEDIAFBAWohASACQQFqIQIgBEEBayIEDQALCyAFQQdJDQEDQCABIAItAAA6AAAgASACLQABOgABIAEgAi0AAjoAAiABIAItAAM6AAMgASACLQAEOgAEIAEgAi0ABToABSABIAItAAY6AAYgASACLQAHOgAHIAFBCGohASACQQhqIQIgA0EIayIDDQALDAELIAMNAQsgASECDAELIAEgBCADED8hAgsgCyEFDAELIAEgAy0AAjoAACABQQFqIQILIAUgFE8NACACIBNJDQELCyAAIAI2AgwgACAFIAhBA3ZrIgE2AgAgACATIAJrQYMCajYCECAAIBQgAWtBDmo2AgQgByAIQQdxIgA2AogBIAcgHUJ/IACthkJ/hYM+AoQBC+cFAQR/IAMgAiACIANLGyEEIAAgAWshAgJAIABBB3FFDQAgBEUNACAAIAItAAA6AAAgA0EBayEGIAJBAWohAiAAQQFqIgdBB3FBACAEQQFrIgUbRQRAIAchACAFIQQgBiEDDAELIAAgAi0AADoAASADQQJrIQYgBEECayEFIAJBAWohAgJAIABBAmoiB0EHcUUNACAFRQ0AIAAgAi0AADoAAiADQQNrIQYgBEEDayEFIAJBAWohAgJAIABBA2oiB0EHcUUNACAFRQ0AIAAgAi0AADoAAyADQQRrIQYgBEEEayEFIAJBAWohAgJAIABBBGoiB0EHcUUNACAFRQ0AIAAgAi0AADoABCADQQVrIQYgBEEFayEFIAJBAWohAgJAIABBBWoiB0EHcUUNACAFRQ0AIAAgAi0AADoABSADQQZrIQYgBEEGayEFIAJBAWohAgJAIABBBmoiB0EHcUUNACAFRQ0AIAAgAi0AADoABiADQQdrIQYgBEEHayEFIAJBAWohAgJAIABBB2oiB0EHcUUNACAFRQ0AIAAgAi0AADoAByADQQhrIQMgBEEIayEEIABBCGohACACQQFqIQIMBgsgByEAIAUhBCAGIQMMBQsgByEAIAUhBCAGIQMMBAsgByEAIAUhBCAGIQMMAwsgByEAIAUhBCAGIQMMAgsgByEAIAUhBCAGIQMMAQsgByEAIAUhBCAGIQMLAkAgA0EXTQRAIARFDQEgBEEBayEBIARBB3EiAwRAA0AgACACLQAAOgAAIARBAWshBCAAQQFqIQAgAkEBaiECIANBAWsiAw0ACwsgAUEHSQ0BA0AgACACLQAAOgAAIAAgAi0AAToAASAAIAItAAI6AAIgACACLQADOgADIAAgAi0ABDoABCAAIAItAAU6AAUgACACLQAGOgAGIAAgAi0ABzoAByAAQQhqIQAgAkEIaiECIARBCGsiBA0ACwwBCyAERQ0AIAAgASAEED8hAAsgAAvyCAEXfyAAKAJoIgwgACgCMEGGAmsiBWtBACAFIAxJGyENIAAoAnQhAiAAKAKQASEPIAAoAkgiDiAMaiIJIAAoAnAiBUECIAUbIgVBAWsiBmoiAy0AASESIAMtAAAhEyAGIA5qIQZBAyEDIAAoApQBIRYgACgCPCEUIAAoAkwhECAAKAI4IRECQAJ/IAVBA0kEQCANIQggDgwBCyAAIABBACAJLQABIAAoAnwRAAAgCS0AAiAAKAJ8EQAAIQoDQCAAIAogAyAJai0AACAAKAJ8EQAAIQogACgCUCAKQQF0ai8BACIIIAEgCCABQf//A3FJIggbIQEgA0ECayAHIAgbIQcgA0EBaiIDIAVNDQALIAFB//8DcSAHIA1qIghB//8DcU0NASAGIAdB//8DcSIDayEGIA4gA2sLIQMCQAJAIAwgAUH//wNxTQ0AIAIgAkECdiAFIA9JGyEKIA1B//8DcSEVIAlBAmohDyAJQQRrIRcDQAJAAkAgBiABQf//A3EiC2otAAAgE0cNACAGIAtBAWoiAWotAAAgEkcNACADIAtqIgItAAAgCS0AAEcNACABIANqLQAAIAktAAFGDQELIApBAWsiCkUNAiAQIAsgEXFBAXRqLwEAIgEgCEH//wNxSw0BDAILIAJBAmohAUEAIQQgDyECAkADQCACLQAAIAEtAABHDQEgAi0AASABLQABRwRAIARBAXIhBAwCCyACLQACIAEtAAJHBEAgBEECciEEDAILIAItAAMgAS0AA0cEQCAEQQNyIQQMAgsgAi0ABCABLQAERwRAIARBBHIhBAwCCyACLQAFIAEtAAVHBEAgBEEFciEEDAILIAItAAYgAS0ABkcEQCAEQQZyIQQMAgsgAi0AByABLQAHRwRAIARBB3IhBAwCCyABQQhqIQEgAkEIaiECIARB+AFJIRggBEEIaiEEIBgNAAtBgAIhBAsCQAJAIAUgBEECaiICSQRAIAAgCyAHQf//A3FrIgY2AmwgAiAUSwRAIBQPCyACIBZPBEAgAg8LIAkgBEEBaiIFaiIBLQABIRIgAS0AACETAkAgAkEESQ0AIAIgBmogDE8NACAGQf//A3EhCCAEQQFrIQtBACEDQQAhBwNAIBAgAyAIaiARcUEBdGovAQAiASAGQf//A3FJBEAgAyAVaiABTw0IIAMhByABIQYLIANBAWoiAyALTQ0ACyAAIAAgAEEAIAIgF2oiAS0AACAAKAJ8EQAAIAEtAAEgACgCfBEAACABLQACIAAoAnwRAAAhASAAKAJQIAFBAXRqLwEAIgEgBkH//wNxTwRAIAdB//8DcSEDIAYhAQwDCyAEQQJrIgdB//8DcSIDIBVqIAFPDQYMAgsgAyAFaiEGIAIhBQsgCkEBayIKRQ0DIBAgCyARcUEBdGovAQAiASAIQf//A3FNDQMMAQsgByANaiEIIA4gA2siAyAFaiEGIAIhBQsgDCABQf//A3FLDQALCyAFDwsgAiEFCyAFIAAoAjwiACAAIAVLGwuGBQETfyAAKAJ0IgMgA0ECdiAAKAJwIgNBAiADGyIDIAAoApABSRshByAAKAJoIgogACgCMEGGAmsiBWtB//8DcUEAIAUgCkkbIQwgACgCSCIIIApqIgkgA0EBayICaiIFLQABIQ0gBS0AACEOIAlBAmohBSACIAhqIQsgACgClAEhEiAAKAI8IQ8gACgCTCEQIAAoAjghESAAKAKIAUEFSCETA0ACQCAKIAFB//8DcU0NAANAAkACQCALIAFB//8DcSIGai0AACAORw0AIAsgBkEBaiIBai0AACANRw0AIAYgCGoiAi0AACAJLQAARw0AIAEgCGotAAAgCS0AAUYNAQsgB0EBayIHRQ0CIAwgECAGIBFxQQF0ai8BACIBSQ0BDAILCyACQQJqIQRBACECIAUhAQJAA0AgAS0AACAELQAARw0BIAEtAAEgBC0AAUcEQCACQQFyIQIMAgsgAS0AAiAELQACRwRAIAJBAnIhAgwCCyABLQADIAQtAANHBEAgAkEDciECDAILIAEtAAQgBC0ABEcEQCACQQRyIQIMAgsgAS0ABSAELQAFRwRAIAJBBXIhAgwCCyABLQAGIAQtAAZHBEAgAkEGciECDAILIAEtAAcgBC0AB0cEQCACQQdyIQIMAgsgBEEIaiEEIAFBCGohASACQfgBSSEUIAJBCGohAiAUDQALQYACIQILAkAgAyACQQJqIgFJBEAgACAGNgJsIAEgD0sEQCAPDwsgASASTwRAIAEPCyAIIAJBAWoiA2ohCyADIAlqIgMtAAEhDSADLQAAIQ4gASEDDAELIBMNAQsgB0EBayIHRQ0AIAwgECAGIBFxQQF0ai8BACIBSQ0BCwsgAwvLAQECfwJAA0AgAC0AACABLQAARw0BIAAtAAEgAS0AAUcEQCACQQFyDwsgAC0AAiABLQACRwRAIAJBAnIPCyAALQADIAEtAANHBEAgAkEDcg8LIAAtAAQgAS0ABEcEQCACQQRyDwsgAC0ABSABLQAFRwRAIAJBBXIPCyAALQAGIAEtAAZHBEAgAkEGcg8LIAAtAAcgAS0AB0cEQCACQQdyDwsgAUEIaiEBIABBCGohACACQfgBSSEDIAJBCGohAiADDQALQYACIQILIAIL5wwBB38gAEF/cyEAIAJBF08EQAJAIAFBA3FFDQAgAS0AACAAQf8BcXNBAnRB0BhqKAIAIABBCHZzIQAgAkEBayIEQQAgAUEBaiIDQQNxG0UEQCAEIQIgAyEBDAELIAEtAAEgAEH/AXFzQQJ0QdAYaigCACAAQQh2cyEAIAFBAmohAwJAIAJBAmsiBEUNACADQQNxRQ0AIAEtAAIgAEH/AXFzQQJ0QdAYaigCACAAQQh2cyEAIAFBA2ohAwJAIAJBA2siBEUNACADQQNxRQ0AIAEtAAMgAEH/AXFzQQJ0QdAYaigCACAAQQh2cyEAIAFBBGohASACQQRrIQIMAgsgBCECIAMhAQwBCyAEIQIgAyEBCyACQRRuIgNBbGwhCQJAIANBAWsiCEUEQEEAIQQMAQsgA0EUbCABakEUayEDQQAhBANAIAEoAhAgB3MiB0EWdkH8B3FB0DhqKAIAIAdBDnZB/AdxQdAwaigCACAHQQZ2QfwHcUHQKGooAgAgB0H/AXFBAnRB0CBqKAIAc3NzIQcgASgCDCAGcyIGQRZ2QfwHcUHQOGooAgAgBkEOdkH8B3FB0DBqKAIAIAZBBnZB/AdxQdAoaigCACAGQf8BcUECdEHQIGooAgBzc3MhBiABKAIIIAVzIgVBFnZB/AdxQdA4aigCACAFQQ52QfwHcUHQMGooAgAgBUEGdkH8B3FB0ChqKAIAIAVB/wFxQQJ0QdAgaigCAHNzcyEFIAEoAgQgBHMiBEEWdkH8B3FB0DhqKAIAIARBDnZB/AdxQdAwaigCACAEQQZ2QfwHcUHQKGooAgAgBEH/AXFBAnRB0CBqKAIAc3NzIQQgASgCACAAcyIAQRZ2QfwHcUHQOGooAgAgAEEOdkH8B3FB0DBqKAIAIABBBnZB/AdxQdAoaigCACAAQf8BcUECdEHQIGooAgBzc3MhACABQRRqIQEgCEEBayIIDQALIAMhAQsgAiAJaiECIAEoAhAgASgCDCABKAIIIAEoAgQgASgCACAAcyIAQQh2IABB/wFxQQJ0QdAYaigCAHMiAEEIdiAAQf8BcUECdEHQGGooAgBzIgBBCHYgAEH/AXFBAnRB0BhqKAIAcyIAQf8BcUECdEHQGGooAgAgBHNzIABBCHZzIgBBCHYgAEH/AXFBAnRB0BhqKAIAcyIAQQh2IABB/wFxQQJ0QdAYaigCAHMiAEEIdiAAQf8BcUECdEHQGGooAgBzIgBB/wFxQQJ0QdAYaigCACAFc3MgAEEIdnMiAEEIdiAAQf8BcUECdEHQGGooAgBzIgBBCHYgAEH/AXFBAnRB0BhqKAIAcyIAQQh2IABB/wFxQQJ0QdAYaigCAHMiAEH/AXFBAnRB0BhqKAIAIAZzcyAAQQh2cyIAQQh2IABB/wFxQQJ0QdAYaigCAHMiAEEIdiAAQf8BcUECdEHQGGooAgBzIgBBCHYgAEH/AXFBAnRB0BhqKAIAcyIAQf8BcUECdEHQGGooAgAgB3NzIABBCHZzIgBBCHYgAEH/AXFBAnRB0BhqKAIAcyIAQQh2IABB/wFxQQJ0QdAYaigCAHMiAEEIdiAAQf8BcUECdEHQGGooAgBzIgBBCHYgAEH/AXFBAnRB0BhqKAIAcyEAIAFBFGohAQsgAkEHSwRAA0AgAS0AByABLQAGIAEtAAUgAS0ABCABLQADIAEtAAIgAS0AASABLQAAIABB/wFxc0ECdEHQGGooAgAgAEEIdnMiAEH/AXFzQQJ0QdAYaigCACAAQQh2cyIAQf8BcXNBAnRB0BhqKAIAIABBCHZzIgBB/wFxc0ECdEHQGGooAgAgAEEIdnMiAEH/AXFzQQJ0QdAYaigCACAAQQh2cyIAQf8BcXNBAnRB0BhqKAIAIABBCHZzIgBB/wFxc0ECdEHQGGooAgAgAEEIdnMiAEH/AXFzQQJ0QdAYaigCACAAQQh2cyEAIAFBCGohASACQQhrIgJBB0sNAAsLAkAgAkUNACACQQFxBH8gAS0AACAAQf8BcXNBAnRB0BhqKAIAIABBCHZzIQAgAUEBaiEBIAJBAWsFIAILIQMgAkEBRg0AA0AgAS0AASABLQAAIABB/wFxc0ECdEHQGGooAgAgAEEIdnMiAEH/AXFzQQJ0QdAYaigCACAAQQh2cyEAIAFBAmohASADQQJrIgMNAAsLIABBf3MLwgIBA38jAEEQayIIJAACfwJAIAAEQCAEDQEgBVANAQsgBgRAIAZBADYCBCAGQRI2AgALQQAMAQtBgAEQCSIHRQRAIAYEQCAGQQA2AgQgBkEONgIAC0EADAELIAcgATcDCCAHQgA3AwAgB0EoaiIJECogByAFNwMYIAcgBDYCECAHIAM6AGAgB0EANgJsIAdCADcCZCAAKQMYIQEgCEF/NgIIIAhCjoCAgPAANwMAIAdBECAIECQgAUL/gQGDhCIBNwNwIAcgAadBBnZBAXE6AHgCQCACRQ0AIAkgAhBgQX9KDQAgBxAGQQAMAQsgBhBfIgIEQCAAIAAoAjBBAWo2AjAgAiAHNgIIIAJBATYCBCACIAA2AgAgAkI/IAAgB0EAQgBBDkEBEQoAIgEgAUIAUxs3AxgLIAILIQAgCEEQaiQAIAALYgEBf0E4EAkiAUUEQCAABEAgAEEANgIEIABBDjYCAAtBAA8LIAFBADYCCCABQgA3AwAgAUIANwMgIAFCgICAgBA3AiwgAUEAOgAoIAFBADYCFCABQgA3AgwgAUEAOwE0IAELuwEBAX4gASkDACICQgKDUEUEQCAAIAEpAxA3AxALIAJCBINQRQRAIAAgASkDGDcDGAsgAkIIg1BFBEAgACABKQMgNwMgCyACQhCDUEUEQCAAIAEoAig2AigLIAJCIINQRQRAIAAgASgCLDYCLAsgAkLAAINQRQRAIAAgAS8BMDsBMAsgAkKAAYNQRQRAIAAgAS8BMjsBMgsgAkKAAoNQRQRAIAAgASgCNDYCNAsgACAAKQMAIAKENwMAQQALGQAgAUUEQEEADwsgACABKAIAIAEzAQQQGws3AQJ/IABBACABG0UEQCAAIAFGDwsgAC8BBCIDIAEvAQRGBH8gACgCACABKAIAIAMQPQVBAQtFCyIBAX8gAUUEQEEADwsgARAJIgJFBEBBAA8LIAIgACABEAcLKQAgACABIAIgAyAEEEUiAEUEQEEADwsgACACQQAgBBA1IQEgABAGIAELcQEBfgJ/AkAgAkJ/VwRAIAMEQCADQQA2AgQgA0EUNgIACwwBCyAAIAEgAhARIgRCf1cEQCADBEAgAyAAKAIMNgIAIAMgACgCEDYCBAsMAQtBACACIARXDQEaIAMEQCADQQA2AgQgA0ERNgIACwtBfwsLNQAgACABIAJBABAmIgBFBEBBfw8LIAMEQCADIAAtAAk6AAALIAQEQCAEIAAoAkQ2AgALQQAL/AECAn8BfiMAQRBrIgMkAAJAIAAgA0EOaiABQYAGQQAQRiIARQRAIAIhAAwBCyADLwEOIgFBBUkEQCACIQAMAQsgAC0AAEEBRwRAIAIhAAwBCyAAIAGtQv//A4MQFyIBRQRAIAIhAAwBCyABEH0aAkAgARAVIAIEfwJ/IAIvAQQhAEEAIAIoAgAiBEUNABpBACAEIABB1IABKAIAEQAACwVBAAtHBEAgAiEADAELIAEgAS0AAAR+IAEpAwggASkDEH0FQgALIgVC//8DgxATIAWnQf//A3FBgBBBABA1IgBFBEAgAiEADAELIAIQEAsgARAICyADQRBqJAAgAAvmDwIIfwJ+IwBB4ABrIgckAEEeQS4gAxshCwJAAkAgAgRAIAIiBSIGLQAABH4gBikDCCAGKQMQfQVCAAsgC61aDQEgBARAIARBADYCBCAEQRM2AgALQn8hDQwCCyABIAutIAcgBBAtIgUNAEJ/IQ0MAQsgBUIEEBMoAABBoxJBqBIgAxsoAABHBEAgBARAIARBADYCBCAEQRM2AgALQn8hDSACDQEgBRAIDAELIABCADcDICAAQQA2AhggAEL/////DzcDECAAQQA7AQwgAEG/hig2AgggAEEBOgAGIABBADsBBCAAQQA2AgAgAEIANwNIIABBgIDYjXg2AkQgAEIANwMoIABCADcDMCAAQgA3AzggAEFAa0EAOwEAIABCADcDUCAAIAMEf0EABSAFEAwLOwEIIAAgBRAMOwEKIAAgBRAMOwEMIAAgBRAMNgIQIAUQDCEGIAUQDCEJIAdBADYCWCAHQgA3A1AgB0IANwNIIAcgCUEfcTYCPCAHIAZBC3Y2AjggByAGQQV2QT9xNgI0IAcgBkEBdEE+cTYCMCAHIAlBCXZB0ABqNgJEIAcgCUEFdkEPcUEBazYCQCAAIAdBMGoQBTYCFCAAIAUQFTYCGCAAIAUQFa03AyAgACAFEBWtNwMoIAUQDCEIIAUQDCEGIAACfiADBEBBACEJIABBADYCRCAAQQA7AUAgAEEANgI8QgAMAQsgBRAMIQkgACAFEAw2AjwgACAFEAw7AUAgACAFEBU2AkQgBRAVrQs3A0ggBS0AAEUEQCAEBEAgBEEANgIEIARBFDYCAAtCfyENIAINASAFEAgMAQsCQCAALwEMIgpBAXEEQCAKQcAAcQRAIABB//8DOwFSDAILIABBATsBUgwBCyAAQQA7AVILIABBADYCOCAAQgA3AzAgBiAIaiAJaiEKAkAgAgRAIAUtAAAEfiAFKQMIIAUpAxB9BUIACyAKrVoNASAEBEAgBEEANgIEIARBFTYCAAtCfyENDAILIAUQCCABIAqtQQAgBBAtIgUNAEJ/IQ0MAQsCQCAIRQ0AIAAgBSABIAhBASAEEGQiCDYCMCAIRQRAIAQoAgBBEUYEQCAEBEAgBEEANgIEIARBFTYCAAsLQn8hDSACDQIgBRAIDAILIAAtAA1BCHFFDQAgCEECECNBBUcNACAEBEAgBEEANgIEIARBFTYCAAtCfyENIAINASAFEAgMAQsgAEE0aiEIAkAgBkUNACAFIAEgBkEAIAQQRSIMRQRAQn8hDSACDQIgBRAIDAILIAwgBkGAAkGABCADGyAIIAQQbiEGIAwQBiAGRQRAQn8hDSACDQIgBRAIDAILIANFDQAgAEEBOgAECwJAIAlFDQAgACAFIAEgCUEAIAQQZCIBNgI4IAFFBEBCfyENIAINAiAFEAgMAgsgAC0ADUEIcUUNACABQQIQI0EFRw0AIAQEQCAEQQA2AgQgBEEVNgIAC0J/IQ0gAg0BIAUQCAwBCyAAIAAoAjRB9eABIAAoAjAQZzYCMCAAIAAoAjRB9cYBIAAoAjgQZzYCOAJAAkAgACkDKEL/////D1ENACAAKQMgQv////8PUQ0AIAApA0hC/////w9SDQELAkACQAJAIAgoAgAgB0EwakEBQYACQYAEIAMbIAQQRiIBRQRAIAJFDQEMAgsgASAHMwEwEBciAUUEQCAEBEAgBEEANgIEIARBDjYCAAsgAkUNAQwCCwJAIAApAyhC/////w9RBEAgACABEB03AygMAQsgA0UNAEEAIQYCQCABKQMQIg5CCHwiDSAOVA0AIAEpAwggDVQNACABIA03AxBBASEGCyABIAY6AAALIAApAyBC/////w9RBEAgACABEB03AyALAkAgAw0AIAApA0hC/////w9RBEAgACABEB03A0gLIAAoAjxB//8DRw0AIAAgARAVNgI8CyABLQAABH8gASkDECABKQMIUQVBAAsNAiAEBEAgBEEANgIEIARBFTYCAAsgARAIIAINAQsgBRAIC0J/IQ0MAgsgARAICyAFLQAARQRAIAQEQCAEQQA2AgQgBEEUNgIAC0J/IQ0gAg0BIAUQCAwBCyACRQRAIAUQCAtCfyENIAApA0hCf1cEQCAEBEAgBEEWNgIEIARBBDYCAAsMAQsjAEEQayIDJABBASEBAkAgACgCEEHjAEcNAEEAIQECQCAAKAI0IANBDmpBgbICQYAGQQAQRiICBEAgAy8BDiIFQQZLDQELIAQEQCAEQQA2AgQgBEEVNgIACwwBCyACIAWtQv//A4MQFyICRQRAIAQEQCAEQQA2AgQgBEEUNgIACwwBC0EBIQECQAJAAkAgAhAMQQFrDgICAQALQQAhASAEBEAgBEEANgIEIARBGDYCAAsgAhAIDAILIAApAyhCE1YhAQsgAkICEBMvAABBwYoBRwRAQQAhASAEBEAgBEEANgIEIARBGDYCAAsgAhAIDAELIAIQfUEBayIFQf8BcUEDTwRAQQAhASAEBEAgBEEANgIEIARBGDYCAAsgAhAIDAELIAMvAQ5BB0cEQEEAIQEgBARAIARBADYCBCAEQRU2AgALIAIQCAwBCyAAIAE6AAYgACAFQf8BcUGBAmo7AVIgACACEAw2AhAgAhAIQQEhAQsgA0EQaiQAIAFFDQAgCCAIKAIAEG02AgAgCiALaq0hDQsgB0HgAGokACANC4ECAQR/IwBBEGsiBCQAAkAgASAEQQxqQcAAQQAQJSIGRQ0AIAQoAgxBBWoiA0GAgARPBEAgAgRAIAJBADYCBCACQRI2AgALDAELQQAgA60QFyIDRQRAIAIEQCACQQA2AgQgAkEONgIACwwBCyADQQEQcCADIAEEfwJ/IAEvAQQhBUEAIAEoAgAiAUUNABpBACABIAVB1IABKAIAEQAACwVBAAsQEiADIAYgBCgCDBAsAn8gAy0AAEUEQCACBEAgAkEANgIEIAJBFDYCAAtBAAwBCyAAIAMtAAAEfiADKQMQBUIAC6dB//8DcSADKAIEEEcLIQUgAxAICyAEQRBqJAAgBQvgAQICfwF+QTAQCSICRQRAIAEEQCABQQA2AgQgAUEONgIAC0EADwsgAkIANwMIIAJBADYCACACQgA3AxAgAkIANwMYIAJCADcDICACQgA3ACUgAFAEQCACDwsCQCAAQv////8AVg0AIACnQQR0EAkiA0UNACACIAM2AgBBACEBQgEhBANAIAMgAUEEdGoiAUIANwIAIAFCADcABSAAIARSBEAgBKchASAEQgF8IQQMAQsLIAIgADcDCCACIAA3AxAgAg8LIAEEQCABQQA2AgQgAUEONgIAC0EAEBAgAhAGQQAL7gECA38BfiMAQRBrIgQkAAJAIARBDGpCBBAXIgNFBEBBfyECDAELAkAgAQRAIAJBgAZxIQUDQAJAIAUgASgCBHFFDQACQCADKQMIQgBUBEAgA0EAOgAADAELIANCADcDECADQQE6AAALIAMgAS8BCBANIAMgAS8BChANIAMtAABFBEAgAEEIaiIABEAgAEEANgIEIABBFDYCAAtBfyECDAQLQX8hAiAAIARBDGpCBBAbQQBIDQMgATMBCiIGUA0AIAAgASgCDCAGEBtBAEgNAwsgASgCACIBDQALC0EAIQILIAMQCAsgBEEQaiQAIAILPAEBfyAABEAgAUGABnEhAQNAIAEgACgCBHEEQCACIAAvAQpqQQRqIQILIAAoAgAiAA0ACwsgAkH//wNxC5wBAQN/IABFBEBBAA8LIAAhAwNAAn8CQAJAIAAvAQgiAUH04AFNBEAgAUEBRg0BIAFB9cYBRg0BDAILIAFBgbICRg0AIAFB9eABRw0BCyAAKAIAIQEgAEEANgIAIAAoAgwQBiAAEAYgASADIAAgA0YbIQMCQCACRQRAQQAhAgwBCyACIAE2AgALIAEMAQsgACICKAIACyIADQALIAMLsgQCBX8BfgJAAkACQCAAIAGtEBciAQRAIAEtAAANAUEAIQAMAgsgBARAIARBADYCBCAEQQ42AgALQQAPC0EAIQADQCABLQAABH4gASkDCCABKQMQfQVCAAtCBFQNASABEAwhByABIAEQDCIGrRATIghFBEBBACECIAQEQCAEQQA2AgQgBEEVNgIACyABEAggAEUNAwNAIAAoAgAhASAAKAIMEAYgABAGIAEiAA0ACwwDCwJAAkBBEBAJIgUEQCAFIAY7AQogBSAHOwEIIAUgAjYCBCAFQQA2AgAgBkUNASAFIAggBhBjIgY2AgwgBg0CIAUQBgtBACECIAQEQCAEQQA2AgQgBEEONgIACyABEAggAEUNBANAIAAoAgAhASAAKAIMEAYgABAGIAEiAA0ACwwECyAFQQA2AgwLAkAgAEUEQCAFIQAMAQsgCSAFNgIACyAFIQkgAS0AAA0ACwsCQCABLQAABH8gASkDECABKQMIUQVBAAsNACABIAEtAAAEfiABKQMIIAEpAxB9BUIACyIKQv////8PgxATIQICQCAKpyIFQQNLDQAgAkUNACACQcEUIAUQPUUNAQtBACECIAQEQCAEQQA2AgQgBEEVNgIACyABEAggAEUNAQNAIAAoAgAhASAAKAIMEAYgABAGIAEiAA0ACwwBCyABEAggAwRAIAMgADYCAEEBDwtBASECIABFDQADQCAAKAIAIQEgACgCDBAGIAAQBiABIgANAAsLIAILvgEBBX8gAAR/IAAhAgNAIAIiBCgCACICDQALIAEEQANAIAEiAy8BCCEGIAMoAgAhASAAIQICQAJAA0ACQCACLwEIIAZHDQAgAi8BCiIFIAMvAQpHDQAgBUUNAiACKAIMIAMoAgwgBRA9RQ0CCyACKAIAIgINAAsgA0EANgIAIAQgAzYCACADIQQMAQsgAiACKAIEIAMoAgRBgAZxcjYCBCADQQA2AgAgAygCDBAGIAMQBgsgAQ0ACwsgAAUgAQsLVQICfgF/AkACQCAALQAARQ0AIAApAxAiAkIBfCIDIAJUDQAgAyAAKQMIWA0BCyAAQQA6AAAPCyAAKAIEIgRFBEAPCyAAIAM3AxAgBCACp2ogAToAAAt9AQN/IwBBEGsiAiQAIAIgATYCDEF/IQMCQCAALQAoDQACQCAAKAIAIgRFDQAgBCABEHFBf0oNACAAKAIAIQEgAEEMaiIABEAgACABKAIMNgIAIAAgASgCEDYCBAsMAQsgACACQQxqQgRBExAOQj+HpyEDCyACQRBqJAAgAwvdAQEDfyABIAApAzBaBEAgAEEIagRAIABBADYCDCAAQRI2AggLQX8PCyAAQQhqIQIgAC0AGEECcQRAIAIEQCACQQA2AgQgAkEZNgIAC0F/DwtBfyEDAkAgACABQQAgAhBTIgRFDQAgACgCUCAEIAIQfkUNAAJ/IAEgACkDMFoEQCAAQQhqBEAgAEEANgIMIABBEjYCCAtBfwwBCyABp0EEdCICIAAoAkBqKAIEECAgACgCQCACaiICQQA2AgQgAhBAQQALDQAgACgCQCABp0EEdGpBAToADEEAIQMLIAMLpgIBBX9BfyEFAkAgACABQQBBABAmRQ0AIAAtABhBAnEEQCAAQQhqIgAEQCAAQQA2AgQgAEEZNgIAC0F/DwsCfyAAKAJAIgQgAaciBkEEdGooAgAiBUUEQCADQYCA2I14RyEHQQMMAQsgBSgCRCADRyEHIAUtAAkLIQggBCAGQQR0aiIEIQYgBCgCBCEEQQAgAiAIRiAHG0UEQAJAIAQNACAGIAUQKyIENgIEIAQNACAAQQhqIgAEQCAAQQA2AgQgAEEONgIAC0F/DwsgBCADNgJEIAQgAjoACSAEIAQoAgBBEHI2AgBBAA8LQQAhBSAERQ0AIAQgBCgCAEFvcSIANgIAIABFBEAgBBAgIAZBADYCBEEADwsgBCADNgJEIAQgCDoACQsgBQvjCAIFfwR+IAAtABhBAnEEQCAAQQhqBEAgAEEANgIMIABBGTYCCAtCfw8LIAApAzAhCwJAIANBgMAAcQRAIAAgASADQQAQTCIJQn9SDQELAn4CQAJAIAApAzAiCUIBfCIMIAApAzgiClQEQCAAKAJAIQQMAQsgCkIBhiIJQoAIIAlCgAhUGyIJQhAgCUIQVhsgCnwiCadBBHQiBK0gCkIEhkLw////D4NUDQEgACgCQCAEEDQiBEUNASAAIAk3AzggACAENgJAIAApAzAiCUIBfCEMCyAAIAw3AzAgBCAJp0EEdGoiBEIANwIAIARCADcABSAJDAELIABBCGoEQCAAQQA2AgwgAEEONgIIC0J/CyIJQgBZDQBCfw8LAkAgAUUNAAJ/QQAhBCAJIAApAzBaBEAgAEEIagRAIABBADYCDCAAQRI2AggLQX8MAQsgAC0AGEECcQRAIABBCGoEQCAAQQA2AgwgAEEZNgIIC0F/DAELAkAgAUUNACABLQAARQ0AQX8gASABECJB//8DcSADIABBCGoQNSIERQ0BGiADQYAwcQ0AIARBABAjQQNHDQAgBEECNgIICwJAIAAgAUEAQQAQTCIKQgBTIgENACAJIApRDQAgBBAQIABBCGoEQCAAQQA2AgwgAEEKNgIIC0F/DAELAkAgAUEBIAkgClEbRQ0AAkACfwJAIAAoAkAiASAJpyIFQQR0aiIGKAIAIgMEQCADKAIwIAQQYg0BCyAEIAYoAgQNARogBiAGKAIAECsiAzYCBCAEIAMNARogAEEIagRAIABBADYCDCAAQQ42AggLDAILQQEhByAGKAIAKAIwC0EAQQAgAEEIaiIDECUiCEUNAAJAAkAgASAFQQR0aiIFKAIEIgENACAGKAIAIgENAEEAIQEMAQsgASgCMCIBRQRAQQAhAQwBCyABQQBBACADECUiAUUNAQsgACgCUCAIIAlBACADEE1FDQAgAQRAIAAoAlAgAUEAEH4aCyAFKAIEIQMgBwRAIANFDQIgAy0AAEECcUUNAiADKAIwEBAgBSgCBCIBIAEoAgBBfXEiAzYCACADRQRAIAEQICAFQQA2AgQgBBAQQQAMBAsgASAGKAIAKAIwNgIwIAQQEEEADAMLIAMoAgAiAUECcQRAIAMoAjAQECAFKAIEIgMoAgAhAQsgAyAENgIwIAMgAUECcjYCAEEADAILIAQQEEF/DAELIAQQEEEAC0UNACALIAApAzBRBEBCfw8LIAAoAkAgCadBBHRqED4gACALNwMwQn8PCyAJpyIGQQR0IgEgACgCQGoQQAJAAkAgACgCQCIEIAFqIgMoAgAiBUUNAAJAIAMoAgQiAwRAIAMoAgAiAEEBcUUNAQwCCyAFECshAyAAKAJAIgQgBkEEdGogAzYCBCADRQ0CIAMoAgAhAAsgA0F+NgIQIAMgAEEBcjYCAAsgASAEaiACNgIIIAkPCyAAQQhqBEAgAEEANgIMIABBDjYCCAtCfwteAQF/IwBBEGsiAiQAAn8gACgCJEEBRwRAIABBDGoiAARAIABBADYCBCAAQRI2AgALQX8MAQsgAkEANgIIIAIgATcDACAAIAJCEEEMEA5CP4enCyEAIAJBEGokACAAC9oDAQZ/IwBBEGsiBSQAIAUgAjYCDCMAQaABayIEJAAgBEEIakHA8ABBkAEQBxogBCAANgI0IAQgADYCHCAEQX4gAGsiA0H/////ByADQf////8HSRsiBjYCOCAEIAAgBmoiADYCJCAEIAA2AhggBEEIaiEAIwBB0AFrIgMkACADIAI2AswBIANBoAFqQQBBKBAZIAMgAygCzAE2AsgBAkBBACABIANByAFqIANB0ABqIANBoAFqEEpBAEgNACAAKAJMQQBOIQcgACgCACECIAAsAEpBAEwEQCAAIAJBX3E2AgALIAJBIHEhCAJ/IAAoAjAEQCAAIAEgA0HIAWogA0HQAGogA0GgAWoQSgwBCyAAQdAANgIwIAAgA0HQAGo2AhAgACADNgIcIAAgAzYCFCAAKAIsIQIgACADNgIsIAAgASADQcgBaiADQdAAaiADQaABahBKIAJFDQAaIABBAEEAIAAoAiQRAAAaIABBADYCMCAAIAI2AiwgAEEANgIcIABBADYCECAAKAIUGiAAQQA2AhRBAAsaIAAgACgCACAIcjYCACAHRQ0ACyADQdABaiQAIAYEQCAEKAIcIgAgACAEKAIYRmtBADoAAAsgBEGgAWokACAFQRBqJAALUwEDfwJAIAAoAgAsAABBMGtBCk8NAANAIAAoAgAiAiwAACEDIAAgAkEBajYCACABIANqQTBrIQEgAiwAAUEwa0EKTw0BIAFBCmwhAQwACwALIAELuwIAAkAgAUEUSw0AAkACQAJAAkACQAJAAkACQAJAAkAgAUEJaw4KAAECAwQFBgcICQoLIAIgAigCACIBQQRqNgIAIAAgASgCADYCAA8LIAIgAigCACIBQQRqNgIAIAAgATQCADcDAA8LIAIgAigCACIBQQRqNgIAIAAgATUCADcDAA8LIAIgAigCAEEHakF4cSIBQQhqNgIAIAAgASkDADcDAA8LIAIgAigCACIBQQRqNgIAIAAgATIBADcDAA8LIAIgAigCACIBQQRqNgIAIAAgATMBADcDAA8LIAIgAigCACIBQQRqNgIAIAAgATAAADcDAA8LIAIgAigCACIBQQRqNgIAIAAgATEAADcDAA8LIAIgAigCAEEHakF4cSIBQQhqNgIAIAAgASsDADkDAA8LIAAgAkEAEQcACwubAgAgAEUEQEEADwsCfwJAIAAEfyABQf8ATQ0BAkBB9IIBKAIAKAIARQRAIAFBgH9xQYC/A0YNAwwBCyABQf8PTQRAIAAgAUE/cUGAAXI6AAEgACABQQZ2QcABcjoAAEECDAQLIAFBgLADT0EAIAFBgEBxQYDAA0cbRQRAIAAgAUE/cUGAAXI6AAIgACABQQx2QeABcjoAACAAIAFBBnZBP3FBgAFyOgABQQMMBAsgAUGAgARrQf//P00EQCAAIAFBP3FBgAFyOgADIAAgAUESdkHwAXI6AAAgACABQQZ2QT9xQYABcjoAAiAAIAFBDHZBP3FBgAFyOgABQQQMBAsLQYSEAUEZNgIAQX8FQQELDAELIAAgAToAAEEBCwvjAQECfyACQQBHIQMCQAJAAkAgAEEDcUUNACACRQ0AIAFB/wFxIQQDQCAALQAAIARGDQIgAkEBayICQQBHIQMgAEEBaiIAQQNxRQ0BIAINAAsLIANFDQELAkAgAC0AACABQf8BcUYNACACQQRJDQAgAUH/AXFBgYKECGwhAwNAIAAoAgAgA3MiBEF/cyAEQYGChAhrcUGAgYKEeHENASAAQQRqIQAgAkEEayICQQNLDQALCyACRQ0AIAFB/wFxIQEDQCABIAAtAABGBEAgAA8LIABBAWohACACQQFrIgINAAsLQQALeQEBfAJAIABFDQAgACsDECAAKwMgIgIgAUQAAAAAAAAAACABRAAAAAAAAAAAZBsiAUQAAAAAAADwPyABRAAAAAAAAPA/YxsgACsDKCACoaKgIgEgACsDGKFjRQ0AIAAoAgAgASAAKAIMIAAoAgQRDgAgACABOQMYCwtIAQF8AkAgAEUNACAAKwMQIAArAyAiASAAKwMoIAGhoCIBIAArAxihY0UNACAAKAIAIAEgACgCDCAAKAIEEQ4AIAAgATkDGAsLWgICfgF/An8CQAJAIAAtAABFDQAgACkDECIBQgF8IgIgAVQNACACIAApAwhYDQELIABBADoAAEEADAELQQAgACgCBCIDRQ0AGiAAIAI3AxAgAyABp2otAAALC4IEAgZ/AX4gAEEAIAEbRQRAIAIEQCACQQA2AgQgAkESNgIAC0EADwsCQAJAIAApAwhQDQAgACgCECABLQAAIgQEf0Kl6wohCSABIQMDQCAJIAStQv8Bg3whCSADLQABIgQEQCADQQFqIQMgCUL/////D4NCIX4hCQwBCwsgCacFQYUqCyIEIAAoAgBwQQJ0aiIGKAIAIgNFDQADQAJAIAMoAhwgBEcNACABIAMoAgAQOA0AAkAgAykDCEJ/UQRAIAMoAhghAQJAIAUEQCAFIAE2AhgMAQsgBiABNgIACyADEAYgACAAKQMIQgF9Igk3AwggCbogACgCACIBuER7FK5H4XqEP6JjRQ0BIAFBgQJJDQECf0EAIQMgACgCACIGIAFBAXYiBUcEQCAFEDwiB0UEQCACBEAgAkEANgIEIAJBDjYCAAtBAAwCCwJAIAApAwhCACAGG1AEQCAAKAIQIQQMAQsgACgCECEEA0AgBCADQQJ0aigCACIBBEADQCABKAIYIQIgASAHIAEoAhwgBXBBAnRqIggoAgA2AhggCCABNgIAIAIiAQ0ACwsgA0EBaiIDIAZHDQALCyAEEAYgACAFNgIAIAAgBzYCEAtBAQsNAQwFCyADQn83AxALQQEPCyADIgUoAhgiAw0ACwsgAgRAIAJBADYCBCACQQk2AgALC0EAC6UGAgl/AX4jAEHwAGsiBSQAAkACQCAARQ0AAkAgAQRAIAEpAzAgAlYNAQtBACEDIABBCGoEQCAAQQA2AgwgAEESNgIICwwCCwJAIANBCHENACABKAJAIAKnQQR0aiIGKAIIRQRAIAYtAAxFDQELQQAhAyAAQQhqBEAgAEEANgIMIABBDzYCCAsMAgsgASACIANBCHIgBUE4ahCKAUF/TARAQQAhAyAAQQhqBEAgAEEANgIMIABBFDYCCAsMAgsgA0EDdkEEcSADciIGQQRxIQcgBSkDUCEOIAUvAWghCQJAIANBIHFFIAUvAWpBAEdxIgtFDQAgBA0AIAAoAhwiBA0AQQAhAyAAQQhqBEAgAEEANgIMIABBGjYCCAsMAgsgBSkDWFAEQCAAQQBCAEEAEFIhAwwCCwJAIAdFIgwgCUEAR3EiDUEBckUEQEEAIQMgBUEAOwEwIAUgDjcDICAFIA43AxggBSAFKAJgNgIoIAVC3AA3AwAgASgCACAOIAVBACABIAIgAEEIahBeIgYNAQwDC0EAIQMgASACIAYgAEEIaiIGECYiB0UNAiABKAIAIAUpA1ggBUE4aiAHLwEMQQF2QQNxIAEgAiAGEF4iBkUNAgsCfyAGIAE2AiwCQCABKAJEIghBAWoiCiABKAJIIgdJBEAgASgCTCEHDAELIAEoAkwgB0EKaiIIQQJ0EDQiB0UEQCABQQhqBEAgAUEANgIMIAFBDjYCCAtBfwwCCyABIAc2AkwgASAINgJIIAEoAkQiCEEBaiEKCyABIAo2AkQgByAIQQJ0aiAGNgIAQQALQX9MBEAgBhALDAELAkAgC0UEQCAGIQEMAQtBJkEAIAUvAWpBAUYbIgFFBEAgAEEIagRAIABBADYCDCAAQRg2AggLDAMLIAAgBiAFLwFqQQAgBCABEQYAIQEgBhALIAFFDQILAkAgDUUEQCABIQMMAQsgACABIAUvAWgQgQEhAyABEAsgA0UNAQsCQCAJRSAMckUEQCADIQEMAQsgACADQQEQgAEhASADEAsgAUUNAQsgASEDDAELQQAhAwsgBUHwAGokACADC4UBAQF/IAFFBEAgAEEIaiIABEAgAEEANgIEIABBEjYCAAtBAA8LQTgQCSIDRQRAIABBCGoiAARAIABBADYCBCAAQQ42AgALQQAPCyADQQA2AhAgA0IANwIIIANCADcDKCADQQA2AgQgAyACNgIAIANCADcDGCADQQA2AjAgACABQTsgAxBCCw8AIAAgASACQQBBABCCAQusAgECfyABRQRAIABBCGoiAARAIABBADYCBCAAQRI2AgALQQAPCwJAIAJBfUsNACACQf//A3FBCEYNACAAQQhqIgAEQCAAQQA2AgQgAEEQNgIAC0EADwsCQEGwwAAQCSIFBEAgBUEANgIIIAVCADcCACAFQYiBAUGogQEgAxs2AqhAIAUgAjYCFCAFIAM6ABAgBUEAOgAPIAVBADsBDCAFIAMgAkF9SyIGcToADiAFQQggAiAGG0H//wNxIAQgBUGIgQFBqIEBIAMbKAIAEQAAIgI2AqxAIAINASAFEDEgBRAGCyAAQQhqIgAEQCAAQQA2AgQgAEEONgIAC0EADwsgACABQTogBRBCIgAEfyAABSAFKAKsQCAFKAKoQCgCBBEDACAFEDEgBRAGQQALC6ABAQF/IAIgACgCBCIDIAIgA0kbIgIEQCAAIAMgAms2AgQCQAJAAkACQCAAKAIcIgMoAhRBAWsOAgEAAgsgA0GgAWogASAAKAIAIAJB3IABKAIAEQgADAILIAAgACgCMCABIAAoAgAgAkHEgAEoAgARBAA2AjAMAQsgASAAKAIAIAIQBxoLIAAgACgCACACajYCACAAIAAoAgggAmo2AggLC7cCAQR/QX4hAgJAIABFDQAgACgCIEUNACAAKAIkIgRFDQAgACgCHCIBRQ0AIAEoAgAgAEcNAAJAAkAgASgCICIDQTlrDjkBAgICAgICAgICAgIBAgICAQICAgICAgICAgICAgICAgICAQICAgICAgICAgICAQICAgICAgICAgEACyADQZoFRg0AIANBKkcNAQsCfwJ/An8gASgCBCICBEAgBCAAKAIoIAIQHiAAKAIcIQELIAEoAlAiAgsEQCAAKAIkIAAoAiggAhAeIAAoAhwhAQsgASgCTCICCwRAIAAoAiQgACgCKCACEB4gACgCHCEBCyABKAJIIgILBEAgACgCJCAAKAIoIAIQHiAAKAIcIQELIAAoAiQgACgCKCABEB4gAEEANgIcQX1BACADQfEARhshAgsgAgvrCQEIfyAAKAIwIgMgACgCDEEFayICIAIgA0sbIQggACgCACIEKAIEIQkgAUEERiEHAkADQCAEKAIQIgMgACgCoC5BKmpBA3UiAkkEQEEBIQYMAgsgCCADIAJrIgMgACgCaCAAKAJYayICIAQoAgRqIgVB//8DIAVB//8DSRsiBiADIAZJGyIDSwRAQQEhBiADQQBHIAdyRQ0CIAFFDQIgAyAFRw0CCyAAQQBBACAHIAMgBUZxIgUQOSAAIAAoAhBBBGsiBDYCECAAKAIEIARqIAM7AAAgACAAKAIQQQJqIgQ2AhAgACgCBCAEaiADQX9zOwAAIAAgACgCEEECajYCECAAKAIAEAoCfyACBEAgACgCACgCDCAAKAJIIAAoAlhqIAMgAiACIANLGyICEAcaIAAoAgAiBCAEKAIMIAJqNgIMIAQgBCgCECACazYCECAEIAQoAhQgAmo2AhQgACAAKAJYIAJqNgJYIAMgAmshAwsgAwsEQCAAKAIAIgIgAigCDCADEIMBIAAoAgAiAiACKAIMIANqNgIMIAIgAigCECADazYCECACIAIoAhQgA2o2AhQLIAAoAgAhBCAFRQ0AC0EAIQYLAkAgCSAEKAIEayICRQRAIAAoAmghAwwBCwJAIAAoAjAiAyACTQRAIABBAjYCgC4gACgCSCAEKAIAIANrIAMQBxogACAAKAIwIgM2AoQuIAAgAzYCaAwBCyACIAAoAkQgACgCaCIFa08EQCAAIAUgA2siBDYCaCAAKAJIIgUgAyAFaiAEEAcaIAAoAoAuIgNBAU0EQCAAIANBAWo2AoAuCyAAIAAoAmgiBSAAKAKELiIDIAMgBUsbNgKELiAAKAIAIQQLIAAoAkggBWogBCgCACACayACEAcaIAAgACgCaCACaiIDNgJoIAAgACgCMCAAKAKELiIEayIFIAIgAiAFSxsgBGo2AoQuCyAAIAM2AlgLIAAgAyAAKAJAIgIgAiADSRs2AkBBAyECAkAgBkUNACAAKAIAIgUoAgQhAgJAAkAgAUF7cUUNACACDQBBASECIAMgACgCWEYNAiAAKAJEIANrIQRBACECDAELIAIgACgCRCADayIETQ0AIAAoAlgiByAAKAIwIgZIDQAgACADIAZrIgM2AmggACAHIAZrNgJYIAAoAkgiAiACIAZqIAMQBxogACgCgC4iA0EBTQRAIAAgA0EBajYCgC4LIAAgACgCaCIDIAAoAoQuIgIgAiADSxs2AoQuIAAoAjAgBGohBCAAKAIAIgUoAgQhAgsCQCACIAQgAiAESRsiAkUEQCAAKAIwIQUMAQsgBSAAKAJIIANqIAIQgwEgACAAKAJoIAJqIgM2AmggACAAKAIwIgUgACgChC4iBGsiBiACIAIgBksbIARqNgKELgsgACADIAAoAkAiAiACIANJGzYCQCADIAAoAlgiBmsiAyAFIAAoAgwgACgCoC5BKmpBA3VrIgJB//8DIAJB//8DSRsiBCAEIAVLG0kEQEEAIQIgAUEERiADQQBHckUNASABRQ0BIAAoAgAoAgQNASADIARLDQELQQAhAiABQQRGBEAgACgCACgCBEUgAyAETXEhAgsgACAAKAJIIAZqIAQgAyADIARLGyIBIAIQOSAAIAAoAlggAWo2AlggACgCABAKQQJBACACGw8LIAIL/woCCn8DfiAAKQOYLiENIAAoAqAuIQQgAkEATgRAQQRBAyABLwECIggbIQlBB0GKASAIGyEFQX8hCgNAIAghByABIAsiDEEBaiILQQJ0ai8BAiEIAkACQCAGQQFqIgMgBU4NACAHIAhHDQAgAyEGDAELAkAgAyAJSARAIAAgB0ECdGoiBkHOFWohCSAGQcwVaiEKA0AgCjMBACEPAn8gBCAJLwEAIgZqIgVBP00EQCAPIASthiANhCENIAUMAQsgBEHAAEYEQCAAKAIEIAAoAhBqIA03AAAgACAAKAIQQQhqNgIQIA8hDSAGDAELIAAoAgQgACgCEGogDyAErYYgDYQ3AAAgACAAKAIQQQhqNgIQIA9BwAAgBGutiCENIAVBQGoLIQQgA0EBayIDDQALDAELIAcEQAJAIAcgCkYEQCANIQ8gBCEFIAMhBgwBCyAAIAdBAnRqIgNBzBVqMwEAIQ8gBCADQc4Vai8BACIDaiIFQT9NBEAgDyAErYYgDYQhDwwBCyAEQcAARgRAIAAoAgQgACgCEGogDTcAACAAIAAoAhBBCGo2AhAgAyEFDAELIAAoAgQgACgCEGogDyAErYYgDYQ3AAAgACAAKAIQQQhqNgIQIAVBQGohBSAPQcAAIARrrYghDwsgADMBjBYhDgJAIAUgAC8BjhYiBGoiA0E/TQRAIA4gBa2GIA+EIQ4MAQsgBUHAAEYEQCAAKAIEIAAoAhBqIA83AAAgACAAKAIQQQhqNgIQIAQhAwwBCyAAKAIEIAAoAhBqIA4gBa2GIA+ENwAAIAAgACgCEEEIajYCECADQUBqIQMgDkHAACAFa62IIQ4LIAasQgN9IQ0gA0E9TQRAIANBAmohBCANIAOthiAOhCENDAILIANBwABGBEAgACgCBCAAKAIQaiAONwAAIAAgACgCEEEIajYCEEECIQQMAgsgACgCBCAAKAIQaiANIAOthiAOhDcAACAAIAAoAhBBCGo2AhAgA0E+ayEEIA1BwAAgA2utiCENDAELIAZBCUwEQCAAMwGQFiEOAkAgBCAALwGSFiIFaiIDQT9NBEAgDiAErYYgDYQhDgwBCyAEQcAARgRAIAAoAgQgACgCEGogDTcAACAAIAAoAhBBCGo2AhAgBSEDDAELIAAoAgQgACgCEGogDiAErYYgDYQ3AAAgACAAKAIQQQhqNgIQIANBQGohAyAOQcAAIARrrYghDgsgBqxCAn0hDSADQTxNBEAgA0EDaiEEIA0gA62GIA6EIQ0MAgsgA0HAAEYEQCAAKAIEIAAoAhBqIA43AAAgACAAKAIQQQhqNgIQQQMhBAwCCyAAKAIEIAAoAhBqIA0gA62GIA6ENwAAIAAgACgCEEEIajYCECADQT1rIQQgDUHAACADa62IIQ0MAQsgADMBlBYhDgJAIAQgAC8BlhYiBWoiA0E/TQRAIA4gBK2GIA2EIQ4MAQsgBEHAAEYEQCAAKAIEIAAoAhBqIA03AAAgACAAKAIQQQhqNgIQIAUhAwwBCyAAKAIEIAAoAhBqIA4gBK2GIA2ENwAAIAAgACgCEEEIajYCECADQUBqIQMgDkHAACAEa62IIQ4LIAatQgp9IQ0gA0E4TQRAIANBB2ohBCANIAOthiAOhCENDAELIANBwABGBEAgACgCBCAAKAIQaiAONwAAIAAgACgCEEEIajYCEEEHIQQMAQsgACgCBCAAKAIQaiANIAOthiAOhDcAACAAIAAoAhBBCGo2AhAgA0E5ayEEIA1BwAAgA2utiCENC0EAIQYCfyAIRQRAQYoBIQVBAwwBC0EGQQcgByAIRiIDGyEFQQNBBCADGwshCSAHIQoLIAIgDEcNAAsLIAAgBDYCoC4gACANNwOYLgv5BQIIfwJ+AkAgACgC8C1FBEAgACkDmC4hCyAAKAKgLiEDDAELA0AgCSIDQQNqIQkgAyAAKALsLWoiAy0AAiEFIAApA5guIQwgACgCoC4hBAJAIAMvAAAiB0UEQCABIAVBAnRqIgMzAQAhCyAEIAMvAQIiBWoiA0E/TQRAIAsgBK2GIAyEIQsMAgsgBEHAAEYEQCAAKAIEIAAoAhBqIAw3AAAgACAAKAIQQQhqNgIQIAUhAwwCCyAAKAIEIAAoAhBqIAsgBK2GIAyENwAAIAAgACgCEEEIajYCECADQUBqIQMgC0HAACAEa62IIQsMAQsgBUGAzwBqLQAAIghBAnQiBiABaiIDQYQIajMBACELIANBhghqLwEAIQMgCEEIa0ETTQRAIAUgBkGA0QBqKAIAa60gA62GIAuEIQsgBkHA0wBqKAIAIANqIQMLIAMgAiAHQQFrIgcgB0EHdkGAAmogB0GAAkkbQYDLAGotAAAiBUECdCIIaiIKLwECaiEGIAozAQAgA62GIAuEIQsgBCAFQQRJBH8gBgUgByAIQYDSAGooAgBrrSAGrYYgC4QhCyAIQcDUAGooAgAgBmoLIgVqIgNBP00EQCALIASthiAMhCELDAELIARBwABGBEAgACgCBCAAKAIQaiAMNwAAIAAgACgCEEEIajYCECAFIQMMAQsgACgCBCAAKAIQaiALIASthiAMhDcAACAAIAAoAhBBCGo2AhAgA0FAaiEDIAtBwAAgBGutiCELCyAAIAs3A5guIAAgAzYCoC4gCSAAKALwLUkNAAsLIAFBgAhqMwEAIQwCQCADIAFBgghqLwEAIgJqIgFBP00EQCAMIAOthiALhCEMDAELIANBwABGBEAgACgCBCAAKAIQaiALNwAAIAAgACgCEEEIajYCECACIQEMAQsgACgCBCAAKAIQaiAMIAOthiALhDcAACAAIAAoAhBBCGo2AhAgAUFAaiEBIAxBwAAgA2utiCEMCyAAIAw3A5guIAAgATYCoC4L8AQBA38gAEHkAWohAgNAIAIgAUECdCIDakEAOwEAIAIgA0EEcmpBADsBACABQQJqIgFBngJHDQALIABBADsBzBUgAEEAOwHYEyAAQZQWakEAOwEAIABBkBZqQQA7AQAgAEGMFmpBADsBACAAQYgWakEAOwEAIABBhBZqQQA7AQAgAEGAFmpBADsBACAAQfwVakEAOwEAIABB+BVqQQA7AQAgAEH0FWpBADsBACAAQfAVakEAOwEAIABB7BVqQQA7AQAgAEHoFWpBADsBACAAQeQVakEAOwEAIABB4BVqQQA7AQAgAEHcFWpBADsBACAAQdgVakEAOwEAIABB1BVqQQA7AQAgAEHQFWpBADsBACAAQcwUakEAOwEAIABByBRqQQA7AQAgAEHEFGpBADsBACAAQcAUakEAOwEAIABBvBRqQQA7AQAgAEG4FGpBADsBACAAQbQUakEAOwEAIABBsBRqQQA7AQAgAEGsFGpBADsBACAAQagUakEAOwEAIABBpBRqQQA7AQAgAEGgFGpBADsBACAAQZwUakEAOwEAIABBmBRqQQA7AQAgAEGUFGpBADsBACAAQZAUakEAOwEAIABBjBRqQQA7AQAgAEGIFGpBADsBACAAQYQUakEAOwEAIABBgBRqQQA7AQAgAEH8E2pBADsBACAAQfgTakEAOwEAIABB9BNqQQA7AQAgAEHwE2pBADsBACAAQewTakEAOwEAIABB6BNqQQA7AQAgAEHkE2pBADsBACAAQeATakEAOwEAIABB3BNqQQA7AQAgAEIANwL8LSAAQeQJakEBOwEAIABBADYC+C0gAEEANgLwLQuKAwIGfwR+QcgAEAkiBEUEQEEADwsgBEIANwMAIARCADcDMCAEQQA2AiggBEIANwMgIARCADcDGCAEQgA3AxAgBEIANwMIIARCADcDOCABUARAIARBCBAJIgA2AgQgAEUEQCAEEAYgAwRAIANBADYCBCADQQ42AgALQQAPCyAAQgA3AwAgBA8LAkAgAaciBUEEdBAJIgZFDQAgBCAGNgIAIAVBA3RBCGoQCSIFRQ0AIAQgATcDECAEIAU2AgQDQCAAIAynIghBBHRqIgcpAwgiDVBFBEAgBygCACIHRQRAIAMEQCADQQA2AgQgA0ESNgIACyAGEAYgBRAGIAQQBkEADwsgBiAKp0EEdGoiCSANNwMIIAkgBzYCACAFIAhBA3RqIAs3AwAgCyANfCELIApCAXwhCgsgDEIBfCIMIAFSDQALIAQgCjcDCCAEQgAgCiACGzcDGCAFIAqnQQN0aiALNwMAIAQgCzcDMCAEDwsgAwRAIANBADYCBCADQQ42AgALIAYQBiAEEAZBAAvlAQIDfwF+QX8hBQJAIAAgASACQQAQJiIERQ0AIAAgASACEIsBIgZFDQACfgJAIAJBCHENACAAKAJAIAGnQQR0aigCCCICRQ0AIAIgAxAhQQBOBEAgAykDAAwCCyAAQQhqIgAEQCAAQQA2AgQgAEEPNgIAC0F/DwsgAxAqIAMgBCgCGDYCLCADIAQpAyg3AxggAyAEKAIUNgIoIAMgBCkDIDcDICADIAQoAhA7ATAgAyAELwFSOwEyQvwBQtwBIAQtAAYbCyEHIAMgBjYCCCADIAE3AxAgAyAHQgOENwMAQQAhBQsgBQspAQF/IAAgASACIABBCGoiABAmIgNFBEBBAA8LIAMoAjBBACACIAAQJQuAAwEGfwJ/An9BMCABQYB/Sw0BGgJ/IAFBgH9PBEBBhIQBQTA2AgBBAAwBC0EAQRAgAUELakF4cSABQQtJGyIFQcwAahAJIgFFDQAaIAFBCGshAgJAIAFBP3FFBEAgAiEBDAELIAFBBGsiBigCACIHQXhxIAFBP2pBQHFBCGsiASABQUBrIAEgAmtBD0sbIgEgAmsiA2shBCAHQQNxRQRAIAIoAgAhAiABIAQ2AgQgASACIANqNgIADAELIAEgBCABKAIEQQFxckECcjYCBCABIARqIgQgBCgCBEEBcjYCBCAGIAMgBigCAEEBcXJBAnI2AgAgAiADaiIEIAQoAgRBAXI2AgQgAiADEDsLAkAgASgCBCICQQNxRQ0AIAJBeHEiAyAFQRBqTQ0AIAEgBSACQQFxckECcjYCBCABIAVqIgIgAyAFayIFQQNyNgIEIAEgA2oiAyADKAIEQQFyNgIEIAIgBRA7CyABQQhqCyIBRQsEQEEwDwsgACABNgIAQQALCwoAIABBiIQBEAQL6AIBBX8gACgCUCEBIAAvATAhBEEEIQUDQCABQQAgAS8BACICIARrIgMgAiADSRs7AQAgAUEAIAEvAQIiAiAEayIDIAIgA0kbOwECIAFBACABLwEEIgIgBGsiAyACIANJGzsBBCABQQAgAS8BBiICIARrIgMgAiADSRs7AQYgBUGAgARGRQRAIAFBCGohASAFQQRqIQUMAQsLAkAgBEUNACAEQQNxIQUgACgCTCEBIARBAWtBA08EQCAEIAVrIQADQCABQQAgAS8BACICIARrIgMgAiADSRs7AQAgAUEAIAEvAQIiAiAEayIDIAIgA0kbOwECIAFBACABLwEEIgIgBGsiAyACIANJGzsBBCABQQAgAS8BBiICIARrIgMgAiADSRs7AQYgAUEIaiEBIABBBGsiAA0ACwsgBUUNAANAIAFBACABLwEAIgAgBGsiAiAAIAJJGzsBACABQQJqIQEgBUEBayIFDQALCwuDAQEEfyACQQFOBEAgAiAAKAJIIAFqIgJqIQMgACgCUCEEA0AgBCACKAAAQbHz3fF5bEEPdkH+/wdxaiIFLwEAIgYgAUH//wNxRwRAIAAoAkwgASAAKAI4cUH//wNxQQF0aiAGOwEAIAUgATsBAAsgAUEBaiEBIAJBAWoiAiADSQ0ACwsLUAECfyABIAAoAlAgACgCSCABaigAAEGx893xeWxBD3ZB/v8HcWoiAy8BACICRwRAIAAoAkwgACgCOCABcUEBdGogAjsBACADIAE7AQALIAILugEBAX8jAEEQayICJAAgAkEAOgAIQYCBAUECNgIAQfyAAUEDNgIAQfiAAUEENgIAQfSAAUEFNgIAQfCAAUEGNgIAQeyAAUEHNgIAQeiAAUEINgIAQeSAAUEJNgIAQeCAAUEKNgIAQdyAAUELNgIAQdiAAUEMNgIAQdSAAUENNgIAQdCAAUEONgIAQcyAAUEPNgIAQciAAUEQNgIAQcSAAUERNgIAQcCAAUESNgIAIAAgARBYIAJBEGokAAu9AQEBfyMAQRBrIgEkACABQQA6AAhBgIEBQQI2AgBB/IABQQM2AgBB+IABQQQ2AgBB9IABQQU2AgBB8IABQQY2AgBB7IABQQc2AgBB6IABQQg2AgBB5IABQQk2AgBB4IABQQo2AgBB3IABQQs2AgBB2IABQQw2AgBB1IABQQ02AgBB0IABQQ42AgBBzIABQQ82AgBByIABQRA2AgBBxIABQRE2AgBBwIABQRI2AgAgAEEANgJAIAFBEGokAEEAC70BAQF/IwBBEGsiASQAIAFBADoACEGAgQFBAjYCAEH8gAFBAzYCAEH4gAFBBDYCAEH0gAFBBTYCAEHwgAFBBjYCAEHsgAFBBzYCAEHogAFBCDYCAEHkgAFBCTYCAEHggAFBCjYCAEHcgAFBCzYCAEHYgAFBDDYCAEHUgAFBDTYCAEHQgAFBDjYCAEHMgAFBDzYCAEHIgAFBEDYCAEHEgAFBETYCAEHAgAFBEjYCACAAKAJAIQAgAUEQaiQAIAALvgEBAX8jAEEQayIEJAAgBEEAOgAIQYCBAUECNgIAQfyAAUEDNgIAQfiAAUEENgIAQfSAAUEFNgIAQfCAAUEGNgIAQeyAAUEHNgIAQeiAAUEINgIAQeSAAUEJNgIAQeCAAUEKNgIAQdyAAUELNgIAQdiAAUEMNgIAQdSAAUENNgIAQdCAAUEONgIAQcyAAUEPNgIAQciAAUEQNgIAQcSAAUERNgIAQcCAAUESNgIAIAAgASACIAMQVyAEQRBqJAALygEAIwBBEGsiAyQAIANBADoACEGAgQFBAjYCAEH8gAFBAzYCAEH4gAFBBDYCAEH0gAFBBTYCAEHwgAFBBjYCAEHsgAFBBzYCAEHogAFBCDYCAEHkgAFBCTYCAEHggAFBCjYCAEHcgAFBCzYCAEHYgAFBDDYCAEHUgAFBDTYCAEHQgAFBDjYCAEHMgAFBDzYCAEHIgAFBEDYCAEHEgAFBETYCAEHAgAFBEjYCACAAIAAoAkAgASACQdSAASgCABEAADYCQCADQRBqJAALwAEBAX8jAEEQayIDJAAgA0EAOgAIQYCBAUECNgIAQfyAAUEDNgIAQfiAAUEENgIAQfSAAUEFNgIAQfCAAUEGNgIAQeyAAUEHNgIAQeiAAUEINgIAQeSAAUEJNgIAQeCAAUEKNgIAQdyAAUELNgIAQdiAAUEMNgIAQdSAAUENNgIAQdCAAUEONgIAQcyAAUEPNgIAQciAAUEQNgIAQcSAAUERNgIAQcCAAUESNgIAIAAgASACEF0hACADQRBqJAAgAAu+AQEBfyMAQRBrIgIkACACQQA6AAhBgIEBQQI2AgBB/IABQQM2AgBB+IABQQQ2AgBB9IABQQU2AgBB8IABQQY2AgBB7IABQQc2AgBB6IABQQg2AgBB5IABQQk2AgBB4IABQQo2AgBB3IABQQs2AgBB2IABQQw2AgBB1IABQQ02AgBB0IABQQ42AgBBzIABQQ82AgBByIABQRA2AgBBxIABQRE2AgBBwIABQRI2AgAgACABEFwhACACQRBqJAAgAAu2AQEBfyMAQRBrIgAkACAAQQA6AAhBgIEBQQI2AgBB/IABQQM2AgBB+IABQQQ2AgBB9IABQQU2AgBB8IABQQY2AgBB7IABQQc2AgBB6IABQQg2AgBB5IABQQk2AgBB4IABQQo2AgBB3IABQQs2AgBB2IABQQw2AgBB1IABQQ02AgBB0IABQQ42AgBBzIABQQ82AgBByIABQRA2AgBBxIABQRE2AgBBwIABQRI2AgAgAEEQaiQAQQgLwgEBAX8jAEEQayIEJAAgBEEAOgAIQYCBAUECNgIAQfyAAUEDNgIAQfiAAUEENgIAQfSAAUEFNgIAQfCAAUEGNgIAQeyAAUEHNgIAQeiAAUEINgIAQeSAAUEJNgIAQeCAAUEKNgIAQdyAAUELNgIAQdiAAUEMNgIAQdSAAUENNgIAQdCAAUEONgIAQcyAAUEPNgIAQciAAUEQNgIAQcSAAUERNgIAQcCAAUESNgIAIAAgASACIAMQWSEAIARBEGokACAAC8IBAQF/IwBBEGsiBCQAIARBADoACEGAgQFBAjYCAEH8gAFBAzYCAEH4gAFBBDYCAEH0gAFBBTYCAEHwgAFBBjYCAEHsgAFBBzYCAEHogAFBCDYCAEHkgAFBCTYCAEHggAFBCjYCAEHcgAFBCzYCAEHYgAFBDDYCAEHUgAFBDTYCAEHQgAFBDjYCAEHMgAFBDzYCAEHIgAFBEDYCAEHEgAFBETYCAEHAgAFBEjYCACAAIAEgAiADEFYhACAEQRBqJAAgAAsHACAALwEwC8ABAQF/IwBBEGsiAyQAIANBADoACEGAgQFBAjYCAEH8gAFBAzYCAEH4gAFBBDYCAEH0gAFBBTYCAEHwgAFBBjYCAEHsgAFBBzYCAEHogAFBCDYCAEHkgAFBCTYCAEHggAFBCjYCAEHcgAFBCzYCAEHYgAFBDDYCAEHUgAFBDTYCAEHQgAFBDjYCAEHMgAFBDzYCAEHIgAFBEDYCAEHEgAFBETYCAEHAgAFBEjYCACAAIAEgAhBVIQAgA0EQaiQAIAALBwAgACgCQAsaACAAIAAoAkAgASACQdSAASgCABEAADYCQAsLACAAQQA2AkBBAAsHACAAKAIgCwQAQQgLzgUCA34BfyMAQYBAaiIIJAACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQCAEDhECAwwFAAEECAkJCQkJCQcJBgkLIANCCFoEfiACIAEoAmQ2AgAgAiABKAJoNgIEQggFQn8LIQYMCwsgARAGDAoLIAEoAhAiAgRAIAIgASkDGCABQeQAaiICEEEiA1ANCCABKQMIIgVCf4UgA1QEQCACBEAgAkEANgIEIAJBFTYCAAsMCQsgAUEANgIQIAEgAyAFfDcDCCABIAEpAwAgA3w3AwALIAEtAHgEQCABKQMAIQUMCQtCACEDIAEpAwAiBVAEQCABQgA3AyAMCgsDQCAAIAggBSADfSIFQoDAACAFQoDAAFQbEBEiB0J/VwRAIAFB5ABqIgEEQCABIAAoAgw2AgAgASAAKAIQNgIECwwJCyAHUEUEQCABKQMAIgUgAyAHfCIDWA0KDAELCyABQeQAagRAIAFBADYCaCABQRE2AmQLDAcLIAEpAwggASkDICIFfSIHIAMgAyAHVhsiA1ANCAJAIAEtAHhFDQAgACAFQQAQFEF/Sg0AIAFB5ABqIgEEQCABIAAoAgw2AgAgASAAKAIQNgIECwwHCyAAIAIgAxARIgZCf1cEQCABQeQAagRAIAFBADYCaCABQRE2AmQLDAcLIAEgASkDICAGfCIDNwMgIAZCAFINCEIAIQYgAyABKQMIWg0IIAFB5ABqBEAgAUEANgJoIAFBETYCZAsMBgsgASkDICABKQMAIgV9IAEpAwggBX0gAiADIAFB5ABqEEQiA0IAUw0FIAEgASkDACADfDcDIAwHCyACIAFBKGoQYEEfdawhBgwGCyABMABgIQYMBQsgASkDcCEGDAQLIAEpAyAgASkDAH0hBgwDCyABQeQAagRAIAFBADYCaCABQRw2AmQLC0J/IQYMAQsgASAFNwMgCyAIQYBAayQAIAYLBwAgACgCAAsPACAAIAAoAjBBAWo2AjALGABB+IMBQgA3AgBBgIQBQQA2AgBB+IMBCwcAIABBDGoLBwAgACgCLAsHACAAKAIoCwcAIAAoAhgLFQAgACABrSACrUIghoQgAyAEEIoBCxMBAX4gABAzIgFCIIinEAAgAacLbwEBfiABrSACrUIghoQhBSMAQRBrIgEkAAJ/IABFBEAgBVBFBEAgBARAIARBADYCBCAEQRI2AgALQQAMAgtBAEIAIAMgBBA6DAELIAEgBTcDCCABIAA2AgAgAUIBIAMgBBA6CyEAIAFBEGokACAACxQAIAAgASACrSADrUIghoQgBBBSC9oCAgJ/AX4CfyABrSACrUIghoQiByAAKQMwVEEAIARBCkkbRQRAIABBCGoEQCAAQQA2AgwgAEESNgIIC0F/DAELIAAtABhBAnEEQCAAQQhqBEAgAEEANgIMIABBGTYCCAtBfwwBCyADBH8gA0H//wNxQQhGIANBfUtyBUEBC0UEQCAAQQhqBEAgAEEANgIMIABBEDYCCAtBfwwBCyAAKAJAIgEgB6ciBUEEdGooAgAiAgR/IAIoAhAgA0YFIANBf0YLIQYgASAFQQR0aiIBIQUgASgCBCEBAkAgBgRAIAFFDQEgAUEAOwFQIAEgASgCAEF+cSIANgIAIAANASABECAgBUEANgIEQQAMAgsCQCABDQAgBSACECsiATYCBCABDQAgAEEIagRAIABBADYCDCAAQQ42AggLQX8MAgsgASAEOwFQIAEgAzYCECABIAEoAgBBAXI2AgALQQALCxwBAX4gACABIAIgAEEIahBMIgNCIIinEAAgA6cLHwEBfiAAIAEgAq0gA61CIIaEEBEiBEIgiKcQACAEpwteAQF+An5CfyAARQ0AGiAAKQMwIgIgAUEIcUUNABpCACACUA0AGiAAKAJAIQADQCACIAKnQQR0IABqQRBrKAIADQEaIAJCAX0iAkIAUg0AC0IACyICQiCIpxAAIAKnCxMAIAAgAa0gAq1CIIaEIAMQiwELnwEBAn4CfiACrSADrUIghoQhBUJ/IQQCQCAARQ0AIAAoAgQNACAAQQRqIQIgBUJ/VwRAIAIEQCACQQA2AgQgAkESNgIAC0J/DAILQgAhBCAALQAQDQAgBVANACAAKAIUIAEgBRARIgRCf1UNACAAKAIUIQAgAgRAIAIgACgCDDYCACACIAAoAhA2AgQLQn8hBAsgBAsiBEIgiKcQACAEpwueAQEBfwJ/IAAgACABrSACrUIghoQgAyAAKAIcEH8iAQRAIAEQMkF/TARAIABBCGoEQCAAIAEoAgw2AgggACABKAIQNgIMCyABEAtBAAwCC0EYEAkiBEUEQCAAQQhqBEAgAEEANgIMIABBDjYCCAsgARALQQAMAgsgBCAANgIAIARBADYCDCAEQgA3AgQgBCABNgIUIARBADoAEAsgBAsLsQICAX8BfgJ/QX8hBAJAIAAgAa0gAq1CIIaEIgZBAEEAECZFDQAgAC0AGEECcQRAIABBCGoEQCAAQQA2AgwgAEEZNgIIC0F/DAILIAAoAkAiASAGpyICQQR0aiIEKAIIIgUEQEEAIQQgBSADEHFBf0oNASAAQQhqBEAgAEEANgIMIABBDzYCCAtBfwwCCwJAIAQoAgAiBQRAIAUoAhQgA0YNAQsCQCABIAJBBHRqIgEoAgQiBA0AIAEgBRArIgQ2AgQgBA0AIABBCGoEQCAAQQA2AgwgAEEONgIIC0F/DAMLIAQgAzYCFCAEIAQoAgBBIHI2AgBBAAwCC0EAIQQgASACQQR0aiIBKAIEIgBFDQAgACAAKAIAQV9xIgI2AgAgAg0AIAAQICABQQA2AgQLIAQLCxQAIAAgAa0gAq1CIIaEIAQgBRBzCxIAIAAgAa0gAq1CIIaEIAMQFAtBAQF+An4gAUEAIAIbRQRAIABBCGoEQCAAQQA2AgwgAEESNgIIC0J/DAELIAAgASACIAMQdAsiBEIgiKcQACAEpwvGAwIFfwF+An4CQAJAIAAiBC0AGEECcQRAIARBCGoEQCAEQQA2AgwgBEEZNgIICwwBCyABRQRAIARBCGoEQCAEQQA2AgwgBEESNgIICwwBCyABECIiByABakEBay0AAEEvRwRAIAdBAmoQCSIARQRAIARBCGoEQCAEQQA2AgwgBEEONgIICwwCCwJAAkAgACIGIAEiBXNBA3ENACAFQQNxBEADQCAGIAUtAAAiAzoAACADRQ0DIAZBAWohBiAFQQFqIgVBA3ENAAsLIAUoAgAiA0F/cyADQYGChAhrcUGAgYKEeHENAANAIAYgAzYCACAFKAIEIQMgBkEEaiEGIAVBBGohBSADQYGChAhrIANBf3NxQYCBgoR4cUUNAAsLIAYgBS0AACIDOgAAIANFDQADQCAGIAUtAAEiAzoAASAGQQFqIQYgBUEBaiEFIAMNAAsLIAcgACIDakEvOwAACyAEQQBCAEEAEFIiAEUEQCADEAYMAQsgBCADIAEgAxsgACACEHQhCCADEAYgCEJ/VwRAIAAQCyAIDAMLIAQgCEEDQYCA/I8EEHNBf0oNASAEIAgQchoLQn8hCAsgCAsiCEIgiKcQACAIpwsQACAAIAGtIAKtQiCGhBByCxYAIAAgAa0gAq1CIIaEIAMgBCAFEGYL3iMDD38IfgF8IwBB8ABrIgkkAAJAIAFBAE5BACAAG0UEQCACBEAgAkEANgIEIAJBEjYCAAsMAQsgACkDGCISAn5BsIMBKQMAIhNCf1EEQCAJQoOAgIBwNwMwIAlChoCAgPAANwMoIAlCgYCAgCA3AyBBsIMBQQAgCUEgahAkNwMAIAlCj4CAgHA3AxAgCUKJgICAoAE3AwAgCUKMgICA0AE3AwhBuIMBQQggCRAkNwMAQbCDASkDACETCyATC4MgE1IEQCACBEAgAkEANgIEIAJBHDYCAAsMAQsgASABQRByQbiDASkDACITIBKDIBNRGyIKQRhxQRhGBEAgAgRAIAJBADYCBCACQRk2AgALDAELIAlBOGoQKgJAIAAgCUE4ahAhBEACQCAAKAIMQQVGBEAgACgCEEEsRg0BCyACBEAgAiAAKAIMNgIAIAIgACgCEDYCBAsMAgsgCkEBcUUEQCACBEAgAkEANgIEIAJBCTYCAAsMAwsgAhBJIgVFDQEgBSAKNgIEIAUgADYCACAKQRBxRQ0CIAUgBSgCFEECcjYCFCAFIAUoAhhBAnI2AhgMAgsgCkECcQRAIAIEQCACQQA2AgQgAkEKNgIACwwCCyAAEDJBf0wEQCACBEAgAiAAKAIMNgIAIAIgACgCEDYCBAsMAQsCfyAKQQhxBEACQCACEEkiAUUNACABIAo2AgQgASAANgIAIApBEHFFDQAgASABKAIUQQJyNgIUIAEgASgCGEECcjYCGAsgAQwBCyMAQUBqIg4kACAOQQhqECoCQCAAIA5BCGoQIUF/TARAIAIEQCACIAAoAgw2AgAgAiAAKAIQNgIECwwBCyAOLQAIQQRxRQRAIAIEQCACQYoBNgIEIAJBBDYCAAsMAQsgDikDICETIAIQSSIFRQRAQQAhBQwBCyAFIAo2AgQgBSAANgIAIApBEHEEQCAFIAUoAhRBAnI2AhQgBSAFKAIYQQJyNgIYCwJAAkACQCATUARAAn8gACEBAkADQCABKQMYQoCAEINCAFINASABKAIAIgENAAtBAQwBCyABQQBCAEESEA6nCw0EIAVBCGoEQCAFQQA2AgwgBUETNgIICwwBCyMAQdAAayIBJAACQCATQhVYBEAgBUEIagRAIAVBADYCDCAFQRM2AggLDAELAkACQCAFKAIAQgAgE0KqgAQgE0KqgARUGyISfUECEBRBf0oNACAFKAIAIgMoAgxBBEYEQCADKAIQQRZGDQELIAVBCGoEQCAFIAMoAgw2AgggBSADKAIQNgIMCwwBCyAFKAIAEDMiE0J/VwRAIAUoAgAhAyAFQQhqIggEQCAIIAMoAgw2AgAgCCADKAIQNgIECwwBCyAFKAIAIBJBACAFQQhqIg8QLSIERQ0BIBJCqoAEWgRAAkAgBCkDCEIUVARAIARBADoAAAwBCyAEQhQ3AxAgBEEBOgAACwsgAQRAIAFBADYCBCABQRM2AgALIARCABATIQwCQCAELQAABH4gBCkDCCAEKQMQfQVCAAunIgdBEmtBA0sEQEJ/IRcDQCAMQQFrIQMgByAMakEVayEGAkADQCADQQFqIgNB0AAgBiADaxB6IgNFDQEgA0EBaiIMQZ8SQQMQPQ0ACwJAIAMgBCgCBGusIhIgBCkDCFYEQCAEQQA6AAAMAQsgBCASNwMQIARBAToAAAsgBC0AAAR+IAQpAxAFQgALIRICQCAELQAABH4gBCkDCCAEKQMQfQVCAAtCFVgEQCABBEAgAUEANgIEIAFBEzYCAAsMAQsgBEIEEBMoAABB0JaVMEcEQCABBEAgAUEANgIEIAFBEzYCAAsMAQsCQAJAAkAgEkIUVA0AIAQoAgQgEqdqQRRrKAAAQdCWmThHDQACQCASQhR9IhQgBCIDKQMIVgRAIANBADoAAAwBCyADIBQ3AxAgA0EBOgAACyAFKAIUIRAgBSgCACEGIAMtAAAEfiAEKQMQBUIACyEWIARCBBATGiAEEAwhCyAEEAwhDSAEEB0iFEJ/VwRAIAEEQCABQRY2AgQgAUEENgIACwwECyAUQjh8IhUgEyAWfCIWVgRAIAEEQCABQQA2AgQgAUEVNgIACwwECwJAAkAgEyAUVg0AIBUgEyAEKQMIfFYNAAJAIBQgE30iFSAEKQMIVgRAIANBADoAAAwBCyADIBU3AxAgA0EBOgAAC0EAIQcMAQsgBiAUQQAQFEF/TARAIAEEQCABIAYoAgw2AgAgASAGKAIQNgIECwwFC0EBIQcgBkI4IAFBEGogARAtIgNFDQQLIANCBBATKAAAQdCWmTBHBEAgAQRAIAFBADYCBCABQRU2AgALIAdFDQQgAxAIDAQLIAMQHSEVAkAgEEEEcSIGRQ0AIBQgFXxCDHwgFlENACABBEAgAUEANgIEIAFBFTYCAAsgB0UNBCADEAgMBAsgA0IEEBMaIAMQFSIQIAsgC0H//wNGGyELIAMQFSIRIA0gDUH//wNGGyENAkAgBkUNACANIBFGQQAgCyAQRhsNACABBEAgAUEANgIEIAFBFTYCAAsgB0UNBCADEAgMBAsgCyANcgRAIAEEQCABQQA2AgQgAUEBNgIACyAHRQ0EIAMQCAwECyADEB0iGCADEB1SBEAgAQRAIAFBADYCBCABQQE2AgALIAdFDQQgAxAIDAQLIAMQHSEVIAMQHSEWIAMtAABFBEAgAQRAIAFBADYCBCABQRQ2AgALIAdFDQQgAxAIDAQLIAcEQCADEAgLAkAgFkIAWQRAIBUgFnwiGSAWWg0BCyABBEAgAUEWNgIEIAFBBDYCAAsMBAsgEyAUfCIUIBlUBEAgAQRAIAFBADYCBCABQRU2AgALDAQLAkAgBkUNACAUIBlRDQAgAQRAIAFBADYCBCABQRU2AgALDAQLIBggFUIugFgNASABBEAgAUEANgIEIAFBFTYCAAsMAwsCQCASIAQpAwhWBEAgBEEAOgAADAELIAQgEjcDECAEQQE6AAALIAUoAhQhAyAELQAABH4gBCkDCCAEKQMQfQVCAAtCFVgEQCABBEAgAUEANgIEIAFBFTYCAAsMAwsgBC0AAAR+IAQpAxAFQgALIRQgBEIEEBMaIAQQFQRAIAEEQCABQQA2AgQgAUEBNgIACwwDCyAEEAwgBBAMIgZHBEAgAQRAIAFBADYCBCABQRM2AgALDAMLIAQQFSEHIAQQFa0iFiAHrSIVfCIYIBMgFHwiFFYEQCABBEAgAUEANgIEIAFBFTYCAAsMAwsCQCADQQRxRQ0AIBQgGFENACABBEAgAUEANgIEIAFBFTYCAAsMAwsgBq0gARBqIgNFDQIgAyAWNwMgIAMgFTcDGCADQQA6ACwMAQsgGCABEGoiA0UNASADIBY3AyAgAyAVNwMYIANBAToALAsCQCASQhR8IhQgBCkDCFYEQCAEQQA6AAAMAQsgBCAUNwMQIARBAToAAAsgBBAMIQYCQCADKQMYIAMpAyB8IBIgE3xWDQACQCAGRQRAIAUtAARBBHFFDQELAkAgEkIWfCISIAQpAwhWBEAgBEEAOgAADAELIAQgEjcDECAEQQE6AAALIAQtAAAEfiAEKQMIIAQpAxB9BUIACyIUIAatIhJUDQEgBS0ABEEEcUEAIBIgFFIbDQEgBkUNACADIAQgEhATIAZBACABEDUiBjYCKCAGDQAgAxAWDAILAkAgEyADKQMgIhJYBEACQCASIBN9IhIgBCkDCFYEQCAEQQA6AAAMAQsgBCASNwMQIARBAToAAAsgBCADKQMYEBMiBkUNAiAGIAMpAxgQFyIHDQEgAQRAIAFBADYCBCABQQ42AgALIAMQFgwDCyAFKAIAIBJBABAUIQcgBSgCACEGIAdBf0wEQCABBEAgASAGKAIMNgIAIAEgBigCEDYCBAsgAxAWDAMLQQAhByAGEDMgAykDIFENACABBEAgAUEANgIEIAFBEzYCAAsgAxAWDAILQgAhFAJAAkAgAykDGCIWUEUEQANAIBQgAykDCFIiC0UEQCADLQAsDQMgFkIuVA0DAn8CQCADKQMQIhVCgIAEfCISIBVaQQAgEkKAgICAAVQbRQ0AIAMoAgAgEqdBBHQQNCIGRQ0AIAMgBjYCAAJAIAMpAwgiFSASWg0AIAYgFadBBHRqIgZCADcCACAGQgA3AAUgFUIBfCIVIBJRDQADQCADKAIAIBWnQQR0aiIGQgA3AgAgBkIANwAFIBVCAXwiFSASUg0ACwsgAyASNwMIIAMgEjcDEEEBDAELIAEEQCABQQA2AgQgAUEONgIAC0EAC0UNBAtB2AAQCSIGBH8gBkIANwMgIAZBADYCGCAGQv////8PNwMQIAZBADsBDCAGQb+GKDYCCCAGQQE6AAYgBkEAOwEEIAZBADYCACAGQgA3A0ggBkGAgNiNeDYCRCAGQgA3AyggBkIANwMwIAZCADcDOCAGQUBrQQA7AQAgBkIANwNQIAYFQQALIQYgAygCACAUp0EEdGogBjYCAAJAIAYEQCAGIAUoAgAgB0EAIAEQaCISQn9VDQELIAsNBCABKAIAQRNHDQQgAQRAIAFBADYCBCABQRU2AgALDAQLIBRCAXwhFCAWIBJ9IhZCAFINAAsLIBQgAykDCFINAAJAIAUtAARBBHFFDQAgBwRAIActAAAEfyAHKQMQIAcpAwhRBUEAC0UNAgwBCyAFKAIAEDMiEkJ/VwRAIAUoAgAhBiABBEAgASAGKAIMNgIAIAEgBigCEDYCBAsgAxAWDAULIBIgAykDGCADKQMgfFINAQsgBxAIAn4gCARAAn8gF0IAVwRAIAUgCCABEEghFwsgBSADIAEQSCISIBdVCwRAIAgQFiASDAILIAMQFgwFC0IAIAUtAARBBHFFDQAaIAUgAyABEEgLIRcgAyEIDAMLIAEEQCABQQA2AgQgAUEVNgIACyAHEAggAxAWDAILIAMQFiAHEAgMAQsgAQRAIAFBADYCBCABQRU2AgALIAMQFgsCQCAMIAQoAgRrrCISIAQpAwhWBEAgBEEAOgAADAELIAQgEjcDECAEQQE6AAALIAQtAAAEfiAEKQMIIAQpAxB9BUIAC6ciB0ESa0EDSw0BCwsgBBAIIBdCf1UNAwwBCyAEEAgLIA8iAwRAIAMgASgCADYCACADIAEoAgQ2AgQLIAgQFgtBACEICyABQdAAaiQAIAgNAQsgAgRAIAIgBSgCCDYCACACIAUoAgw2AgQLDAELIAUgCCgCADYCQCAFIAgpAwg3AzAgBSAIKQMQNwM4IAUgCCgCKDYCICAIEAYgBSgCUCEIIAVBCGoiBCEBQQAhBwJAIAUpAzAiE1ANAEGAgICAeCEGAn8gE7pEAAAAAAAA6D+jRAAA4P///+9BpCIaRAAAAAAAAPBBYyAaRAAAAAAAAAAAZnEEQCAaqwwBC0EACyIDQYCAgIB4TQRAIANBAWsiA0EBdiADciIDQQJ2IANyIgNBBHYgA3IiA0EIdiADciIDQRB2IANyQQFqIQYLIAYgCCgCACIMTQ0AIAYQPCILRQRAIAEEQCABQQA2AgQgAUEONgIACwwBCwJAIAgpAwhCACAMG1AEQCAIKAIQIQ8MAQsgCCgCECEPA0AgDyAHQQJ0aigCACIBBEADQCABKAIYIQMgASALIAEoAhwgBnBBAnRqIg0oAgA2AhggDSABNgIAIAMiAQ0ACwsgB0EBaiIHIAxHDQALCyAPEAYgCCAGNgIAIAggCzYCEAsCQCAFKQMwUA0AQgAhEwJAIApBBHFFBEADQCAFKAJAIBOnQQR0aigCACgCMEEAQQAgAhAlIgFFDQQgBSgCUCABIBNBCCAEEE1FBEAgBCgCAEEKRw0DCyATQgF8IhMgBSkDMFQNAAwDCwALA0AgBSgCQCATp0EEdGooAgAoAjBBAEEAIAIQJSIBRQ0DIAUoAlAgASATQQggBBBNRQ0BIBNCAXwiEyAFKQMwVA0ACwwBCyACBEAgAiAEKAIANgIAIAIgBCgCBDYCBAsMAQsgBSAFKAIUNgIYDAELIAAgACgCMEEBajYCMCAFEEtBACEFCyAOQUBrJAAgBQsiBQ0BIAAQGhoLQQAhBQsgCUHwAGokACAFCxAAIwAgAGtBcHEiACQAIAALBgAgACQACwQAIwAL4CoDEX8IfgN8IwBBwMAAayIHJABBfyECAkAgAEUNAAJ/IAAtAChFBEBBACAAKAIYIAAoAhRGDQEaC0EBCyEBAkACQCAAKQMwIhRQRQRAIAAoAkAhCgNAIAogEqdBBHRqIgMtAAwhCwJAAkAgAygCCA0AIAsNACADKAIEIgNFDQEgAygCAEUNAQtBASEBCyAXIAtBAXOtQv8Bg3whFyASQgF8IhIgFFINAAsgF0IAUg0BCyAAKAIEQQhxIAFyRQ0BAn8gACgCACIDKAIkIgFBA0cEQCADKAIgBH9BfyADEBpBAEgNAhogAygCJAUgAQsEQCADEEMLQX8gA0EAQgBBDxAOQgBTDQEaIANBAzYCJAtBAAtBf0oNASAAKAIAKAIMQRZGBEAgACgCACgCEEEsRg0CCyAAKAIAIQEgAEEIagRAIAAgASgCDDYCCCAAIAEoAhA2AgwLDAILIAFFDQAgFCAXVARAIABBCGoEQCAAQQA2AgwgAEEUNgIICwwCCyAXp0EDdBAJIgtFDQFCfyEWQgAhEgNAAkAgCiASp0EEdGoiBigCACIDRQ0AAkAgBigCCA0AIAYtAAwNACAGKAIEIgFFDQEgASgCAEUNAQsgFiADKQNIIhMgEyAWVhshFgsgBi0ADEUEQCAXIBlYBEAgCxAGIABBCGoEQCAAQQA2AgwgAEEUNgIICwwECyALIBmnQQN0aiASNwMAIBlCAXwhGQsgEkIBfCISIBRSDQALIBcgGVYEQCALEAYgAEEIagRAIABBADYCDCAAQRQ2AggLDAILAkACQCAAKAIAKQMYQoCACINQDQACQAJAIBZCf1INACAAKQMwIhNQDQIgE0IBgyEVIAAoAkAhAwJAIBNCAVEEQEJ/IRRCACESQgAhFgwBCyATQn6DIRlCfyEUQgAhEkIAIRYDQCADIBKnQQR0aigCACIBBEAgFiABKQNIIhMgEyAWVCIBGyEWIBQgEiABGyEUCyADIBJCAYQiGKdBBHRqKAIAIgEEQCAWIAEpA0giEyATIBZUIgEbIRYgFCAYIAEbIRQLIBJCAnwhEiAZQgJ9IhlQRQ0ACwsCQCAVUA0AIAMgEqdBBHRqKAIAIgFFDQAgFiABKQNIIhMgEyAWVCIBGyEWIBQgEiABGyEUCyAUQn9RDQBCACETIwBBEGsiBiQAAkAgACAUIABBCGoiCBBBIhVQDQAgFSAAKAJAIBSnQQR0aigCACIKKQMgIhh8IhQgGFpBACAUQn9VG0UEQCAIBEAgCEEWNgIEIAhBBDYCAAsMAQsgCi0ADEEIcUUEQCAUIRMMAQsgACgCACAUQQAQFCEBIAAoAgAhAyABQX9MBEAgCARAIAggAygCDDYCACAIIAMoAhA2AgQLDAELIAMgBkEMakIEEBFCBFIEQCAAKAIAIQEgCARAIAggASgCDDYCACAIIAEoAhA2AgQLDAELIBRCBHwgFCAGKAAMQdCWncAARhtCFEIMAn9BASEBAkAgCikDKEL+////D1YNACAKKQMgQv7///8PVg0AQQAhAQsgAQsbfCIUQn9XBEAgCARAIAhBFjYCBCAIQQQ2AgALDAELIBQhEwsgBkEQaiQAIBMiFkIAUg0BIAsQBgwFCyAWUA0BCwJ/IAAoAgAiASgCJEEBRgRAIAFBDGoEQCABQQA2AhAgAUESNgIMC0F/DAELQX8gAUEAIBZBERAOQgBTDQAaIAFBATYCJEEAC0F/Sg0BC0IAIRYCfyAAKAIAIgEoAiRBAUYEQCABQQxqBEAgAUEANgIQIAFBEjYCDAtBfwwBC0F/IAFBAEIAQQgQDkIAUw0AGiABQQE2AiRBAAtBf0oNACAAKAIAIQEgAEEIagRAIAAgASgCDDYCCCAAIAEoAhA2AgwLIAsQBgwCCyAAKAJUIgIEQCACQgA3AxggAigCAEQAAAAAAAAAACACKAIMIAIoAgQRDgALIABBCGohBCAXuiEcQgAhFAJAAkACQANAIBcgFCITUgRAIBO6IByjIRsgE0IBfCIUuiAcoyEaAkAgACgCVCICRQ0AIAIgGjkDKCACIBs5AyAgAisDECAaIBuhRAAAAAAAAAAAoiAboCIaIAIrAxihY0UNACACKAIAIBogAigCDCACKAIEEQ4AIAIgGjkDGAsCfwJAIAAoAkAgCyATp0EDdGopAwAiE6dBBHRqIg0oAgAiAQRAIAEpA0ggFlQNAQsgDSgCBCEFAkACfwJAIA0oAggiAkUEQCAFRQ0BQQEgBSgCACICQQFxDQIaIAJBwABxQQZ2DAILQQEgBQ0BGgsgDSABECsiBTYCBCAFRQ0BIAJBAEcLIQZBACEJIwBBEGsiDCQAAkAgEyAAKQMwWgRAIABBCGoEQCAAQQA2AgwgAEESNgIIC0F/IQkMAQsgACgCQCIKIBOnIgNBBHRqIg8oAgAiAkUNACACLQAEDQACQCACKQNIQhp8IhhCf1cEQCAAQQhqBEAgAEEWNgIMIABBBDYCCAsMAQtBfyEJIAAoAgAgGEEAEBRBf0wEQCAAKAIAIQIgAEEIagRAIAAgAigCDDYCCCAAIAIoAhA2AgwLDAILIAAoAgBCBCAMQQxqIABBCGoiDhAtIhBFDQEgEBAMIQEgEBAMIQggEC0AAAR/IBApAxAgECkDCFEFQQALIQIgEBAIIAJFBEAgDgRAIA5BADYCBCAOQRQ2AgALDAILAkAgCEUNACAAKAIAIAGtQQEQFEF/TARAQYSEASgCACECIA4EQCAOIAI2AgQgDkEENgIACwwDC0EAIAAoAgAgCEEAIA4QRSIBRQ0BIAEgCEGAAiAMQQhqIA4QbiECIAEQBiACRQ0BIAwoAggiAkUNACAMIAIQbSICNgIIIA8oAgAoAjQgAhBvIQIgDygCACACNgI0CyAPKAIAIgJBAToABEEAIQkgCiADQQR0aigCBCIBRQ0BIAEtAAQNASACKAI0IQIgAUEBOgAEIAEgAjYCNAwBC0F/IQkLIAxBEGokACAJQQBIDQUgACgCABAfIhhCAFMNBSAFIBg3A0ggBgRAQQAhDCANKAIIIg0hASANRQRAIAAgACATQQhBABB/IgwhASAMRQ0HCwJAAkAgASAHQQhqECFBf0wEQCAEBEAgBCABKAIMNgIAIAQgASgCEDYCBAsMAQsgBykDCCISQsAAg1AEQCAHQQA7ATggByASQsAAhCISNwMICwJAAkAgBSgCECICQX5PBEAgBy8BOCIDRQ0BIAUgAzYCECADIQIMAgsgAg0AIBJCBINQDQAgByAHKQMgNwMoIAcgEkIIhCISNwMIQQAhAgwBCyAHIBJC9////w+DIhI3AwgLIBJCgAGDUARAIAdBADsBOiAHIBJCgAGEIhI3AwgLAn8gEkIEg1AEQEJ/IRVBgAoMAQsgBSAHKQMgIhU3AyggEkIIg1AEQAJAAkACQAJAQQggAiACQX1LG0H//wNxDg0CAwMDAwMDAwEDAwMAAwtBgApBgAIgFUKUwuTzD1YbDAQLQYAKQYACIBVCg4Ow/w9WGwwDC0GACkGAAiAVQv////8PVhsMAgtBgApBgAIgFUIAUhsMAQsgBSAHKQMoNwMgQYACCyEPIAAoAgAQHyITQn9XBEAgACgCACECIAQEQCAEIAIoAgw2AgAgBCACKAIQNgIECwwBCyAFIAUvAQxB9/8DcTsBDCAAIAUgDxA3IgpBAEgNACAHLwE4IghBCCAFKAIQIgMgA0F9SxtB//8DcSICRyEGAkACQAJAAkACQAJAAkAgAiAIRwRAIANBAEchAwwBC0EAIQMgBS0AAEGAAXFFDQELIAUvAVIhCSAHLwE6IQIMAQsgBS8BUiIJIAcvAToiAkYNAQsgASABKAIwQQFqNgIwIAJB//8DcQ0BIAEhAgwCCyABIAEoAjBBAWo2AjBBACEJDAILQSZBACAHLwE6QQFGGyICRQRAIAQEQCAEQQA2AgQgBEEYNgIACyABEAsMAwsgACABIAcvATpBACAAKAIcIAIRBgAhAiABEAsgAkUNAgsgCUEARyEJIAhBAEcgBnFFBEAgAiEBDAELIAAgAiAHLwE4EIEBIQEgAhALIAFFDQELAkAgCEUgBnJFBEAgASECDAELIAAgAUEAEIABIQIgARALIAJFDQELAkAgA0UEQCACIQMMAQsgACACIAUoAhBBASAFLwFQEIIBIQMgAhALIANFDQELAkAgCUUEQCADIQEMAQsgBSgCVCIBRQRAIAAoAhwhAQsCfyAFLwFSGkEBCwRAIAQEQCAEQQA2AgQgBEEYNgIACyADEAsMAgsgACADIAUvAVJBASABQQARBgAhASADEAsgAUUNAQsgACgCABAfIhhCf1cEQCAAKAIAIQIgBARAIAQgAigCDDYCACAEIAIoAhA2AgQLDAELAkAgARAyQQBOBEACfwJAAkAgASAHQUBrQoDAABARIhJCAVMNAEIAIRkgFUIAVQRAIBW5IRoDQCAAIAdBQGsgEhAbQQBIDQMCQCASQoDAAFINACAAKAJUIgJFDQAgAiAZQoBAfSIZuSAaoxB7CyABIAdBQGtCgMAAEBEiEkIAVQ0ACwwBCwNAIAAgB0FAayASEBtBAEgNAiABIAdBQGtCgMAAEBEiEkIAVQ0ACwtBACASQn9VDQEaIAQEQCAEIAEoAgw2AgAgBCABKAIQNgIECwtBfwshAiABEBoaDAELIAQEQCAEIAEoAgw2AgAgBCABKAIQNgIEC0F/IQILIAEgB0EIahAhQX9MBEAgBARAIAQgASgCDDYCACAEIAEoAhA2AgQLQX8hAgsCf0EAIQkCQCABIgNFDQADQCADLQAaQQFxBEBB/wEhCSADQQBCAEEQEA4iFUIAUw0CIBVCBFkEQCADQQxqBEAgA0EANgIQIANBFDYCDAsMAwsgFachCQwCCyADKAIAIgMNAAsLIAlBGHRBGHUiA0F/TAsEQCAEBEAgBCABKAIMNgIAIAQgASgCEDYCBAsgARALDAELIAEQCyACQQBIDQAgACgCABAfIRUgACgCACECIBVCf1cEQCAEBEAgBCACKAIMNgIAIAQgAigCEDYCBAsMAQsgAiATEHVBf0wEQCAAKAIAIQIgBARAIAQgAigCDDYCACAEIAIoAhA2AgQLDAELIAcpAwgiE0LkAINC5ABSBEAgBARAIARBADYCBCAEQRQ2AgALDAELAkAgBS0AAEEgcQ0AIBNCEINQRQRAIAUgBygCMDYCFAwBCyAFQRRqEAEaCyAFIAcvATg2AhAgBSAHKAI0NgIYIAcpAyAhEyAFIBUgGH03AyAgBSATNwMoIAUgBS8BDEH5/wNxIANB/wFxQQF0cjsBDCAPQQp2IQNBPyEBAkACQAJAAkAgBSgCECICQQxrDgMAAQIBCyAFQS47AQoMAgtBLSEBIAMNACAFKQMoQv7///8PVg0AIAUpAyBC/v///w9WDQBBFCEBIAJBCEYNACAFLwFSQQFGDQAgBSgCMCICBH8gAi8BBAVBAAtB//8DcSICBEAgAiAFKAIwKAIAakEBay0AAEEvRg0BC0EKIQELIAUgATsBCgsgACAFIA8QNyICQQBIDQAgAiAKRwRAIAQEQCAEQQA2AgQgBEEUNgIACwwBCyAAKAIAIBUQdUF/Sg0BIAAoAgAhAiAEBEAgBCACKAIMNgIAIAQgAigCEDYCBAsLIA0NByAMEAsMBwsgDQ0CIAwQCwwCCyAFIAUvAQxB9/8DcTsBDCAAIAVBgAIQN0EASA0FIAAgEyAEEEEiE1ANBSAAKAIAIBNBABAUQX9MBEAgACgCACECIAQEQCAEIAIoAgw2AgAgBCACKAIQNgIECwwGCyAFKQMgIRIjAEGAQGoiAyQAAkAgElBFBEAgAEEIaiECIBK6IRoDQEF/IQEgACgCACADIBJCgMAAIBJCgMAAVBsiEyACEGVBAEgNAiAAIAMgExAbQQBIDQIgACgCVCAaIBIgE30iErqhIBqjEHsgEkIAUg0ACwtBACEBCyADQYBAayQAIAFBf0oNAUEBIREgAUEcdkEIcUEIRgwCCyAEBEAgBEEANgIEIARBDjYCAAsMBAtBAAtFDQELCyARDQBBfyECAkAgACgCABAfQgBTDQAgFyEUQQAhCkIAIRcjAEHwAGsiESQAAkAgACgCABAfIhVCAFkEQCAUUEUEQANAIAAgACgCQCALIBenQQN0aigCAEEEdGoiAygCBCIBBH8gAQUgAygCAAtBgAQQNyIBQQBIBEBCfyEXDAQLIAFBAEcgCnIhCiAXQgF8IhcgFFINAAsLQn8hFyAAKAIAEB8iGEJ/VwRAIAAoAgAhASAAQQhqBEAgACABKAIMNgIIIAAgASgCEDYCDAsMAgsgEULiABAXIgZFBEAgAEEIagRAIABBADYCDCAAQQ42AggLDAILIBggFX0hEyAVQv////8PViAUQv//A1ZyIApyQQFxBEAgBkGZEkEEECwgBkIsEBggBkEtEA0gBkEtEA0gBkEAEBIgBkEAEBIgBiAUEBggBiAUEBggBiATEBggBiAVEBggBkGUEkEEECwgBkEAEBIgBiAYEBggBkEBEBILIAZBnhJBBBAsIAZBABASIAYgFEL//wMgFEL//wNUG6dB//8DcSIBEA0gBiABEA0gBkF/IBOnIBNC/v///w9WGxASIAZBfyAVpyAVQv7///8PVhsQEiAGIABBJEEgIAAtACgbaigCACIDBH8gAy8BBAVBAAtB//8DcRANIAYtAABFBEAgAEEIagRAIABBADYCDCAAQRQ2AggLIAYQCAwCCyAAIAYoAgQgBi0AAAR+IAYpAxAFQgALEBshASAGEAggAUEASA0BIAMEQCAAIAMoAgAgAzMBBBAbQQBIDQILIBMhFwwBCyAAKAIAIQEgAEEIagRAIAAgASgCDDYCCCAAIAEoAhA2AgwLQn8hFwsgEUHwAGokACAXQgBTDQAgACgCABAfQj+HpyECCyALEAYgAkEASA0BAn8gACgCACIBKAIkQQFHBEAgAUEMagRAIAFBADYCECABQRI2AgwLQX8MAQsgASgCICICQQJPBEAgAUEMagRAIAFBADYCECABQR02AgwLQX8MAQsCQCACQQFHDQAgARAaQQBODQBBfwwBCyABQQBCAEEJEA5Cf1cEQCABQQI2AiRBfwwBCyABQQA2AiRBAAtFDQIgACgCACECIAQEQCAEIAIoAgw2AgAgBCACKAIQNgIECwwBCyALEAYLIAAoAlQQfCAAKAIAEENBfyECDAILIAAoAlQQfAsgABBLQQAhAgsgB0HAwABqJAAgAgtFAEHwgwFCADcDAEHogwFCADcDAEHggwFCADcDAEHYgwFCADcDAEHQgwFCADcDAEHIgwFCADcDAEHAgwFCADcDAEHAgwELoQMBCH8jAEGgAWsiAiQAIAAQMQJAAn8CQCAAKAIAIgFBAE4EQCABQbATKAIASA0BCyACIAE2AhAgAkEgakH2ESACQRBqEHZBASEGIAJBIGohBCACQSBqECIhA0EADAELIAFBAnQiAUGwEmooAgAhBQJ/AkACQCABQcATaigCAEEBaw4CAAEECyAAKAIEIQNB9IIBKAIAIQdBACEBAkACQANAIAMgAUHQ8QBqLQAARwRAQdcAIQQgAUEBaiIBQdcARw0BDAILCyABIgQNAEGw8gAhAwwBC0Gw8gAhAQNAIAEtAAAhCCABQQFqIgMhASAIDQAgAyEBIARBAWsiBA0ACwsgBygCFBogAwwBC0EAIAAoAgRrQQJ0QdjAAGooAgALIgRFDQEgBBAiIQMgBUUEQEEAIQVBASEGQQAMAQsgBRAiQQJqCyEBIAEgA2pBAWoQCSIBRQRAQegSKAIAIQUMAQsgAiAENgIIIAJBrBJBkRIgBhs2AgQgAkGsEiAFIAYbNgIAIAFBqwogAhB2IAAgATYCCCABIQULIAJBoAFqJAAgBQszAQF/IAAoAhQiAyABIAIgACgCECADayIBIAEgAksbIgEQBxogACAAKAIUIAFqNgIUIAILBgBBsIgBCwYAQayIAQsGAEGkiAELBwAgAEEEagsHACAAQQhqCyYBAX8gACgCFCIBBEAgARALCyAAKAIEIQEgAEEEahAxIAAQBiABC6kBAQN/AkAgAC0AACICRQ0AA0AgAS0AACIERQRAIAIhAwwCCwJAIAIgBEYNACACQSByIAIgAkHBAGtBGkkbIAEtAAAiAkEgciACIAJBwQBrQRpJG0YNACAALQAAIQMMAgsgAUEBaiEBIAAtAAEhAiAAQQFqIQAgAg0ACwsgA0H/AXEiAEEgciAAIABBwQBrQRpJGyABLQAAIgBBIHIgACAAQcEAa0EaSRtrC8sGAgJ+An8jAEHgAGsiByQAAkACQAJAAkACQAJAAkACQAJAAkACQCAEDg8AAQoCAwQGBwgICAgICAUICyABQgA3AyAMCQsgACACIAMQESIFQn9XBEAgAUEIaiIBBEAgASAAKAIMNgIAIAEgACgCEDYCBAsMCAsCQCAFUARAIAEpAygiAyABKQMgUg0BIAEgAzcDGCABQQE2AgQgASgCAEUNASAAIAdBKGoQIUF/TARAIAFBCGoiAQRAIAEgACgCDDYCACABIAAoAhA2AgQLDAoLAkAgBykDKCIDQiCDUA0AIAcoAlQgASgCMEYNACABQQhqBEAgAUEANgIMIAFBBzYCCAsMCgsgA0IEg1ANASAHKQNAIAEpAxhRDQEgAUEIagRAIAFBADYCDCABQRU2AggLDAkLIAEoAgQNACABKQMoIgMgASkDICIGVA0AIAUgAyAGfSIDWA0AIAEoAjAhBANAIAECfyAFIAN9IgZC/////w8gBkL/////D1QbIganIQBBACACIAOnaiIIRQ0AGiAEIAggAEHUgAEoAgARAAALIgQ2AjAgASABKQMoIAZ8NwMoIAUgAyAGfCIDVg0ACwsgASABKQMgIAV8NwMgDAgLIAEoAgRFDQcgAiABKQMYIgM3AxggASgCMCEAIAJBADYCMCACIAM3AyAgAiAANgIsIAIgAikDAELsAYQ3AwAMBwsgA0IIWgR+IAIgASgCCDYCACACIAEoAgw2AgRCCAVCfwshBQwGCyABEAYMBQtCfyEFIAApAxgiA0J/VwRAIAFBCGoiAQRAIAEgACgCDDYCACABIAAoAhA2AgQLDAULIAdBfzYCGCAHQo+AgICAAjcDECAHQoyAgIDQATcDCCAHQomAgICgATcDACADQQggBxAkQn+FgyEFDAQLIANCD1gEQCABQQhqBEAgAUEANgIMIAFBEjYCCAsMAwsgAkUNAgJAIAAgAikDACACKAIIEBRBAE4EQCAAEDMiA0J/VQ0BCyABQQhqIgEEQCABIAAoAgw2AgAgASAAKAIQNgIECwwDCyABIAM3AyAMAwsgASkDICEFDAILIAFBCGoEQCABQQA2AgwgAUEcNgIICwtCfyEFCyAHQeAAaiQAIAULjAcCAn4CfyMAQRBrIgckAAJAAkACQAJAAkACQAJAAkACQAJAIAQOEQABAgMFBggICAgICAgIBwgECAsgAUJ/NwMgIAFBADoADyABQQA7AQwgAUIANwMYIAEoAqxAIAEoAqhAKAIMEQEArUIBfSEFDAgLQn8hBSABKAIADQdCACEFIANQDQcgAS0ADQ0HIAFBKGohBAJAA0ACQCAHIAMgBX03AwggASgCrEAgAiAFp2ogB0EIaiABKAKoQCgCHBEAACEIQgAgBykDCCAIQQJGGyAFfCEFAkACQAJAIAhBAWsOAwADAQILIAFBAToADSABKQMgIgNCf1cEQCABBEAgAUEANgIEIAFBFDYCAAsMBQsgAS0ADkUNBCADIAVWDQQgASADNwMYIAFBAToADyACIAQgA6cQBxogASkDGCEFDAwLIAEtAAwNAyAAIARCgMAAEBEiBkJ/VwRAIAEEQCABIAAoAgw2AgAgASAAKAIQNgIECwwECyAGUARAIAFBAToADCABKAKsQCABKAKoQCgCGBEDACABKQMgQn9VDQEgAUIANwMgDAELAkAgASkDIEIAWQRAIAFBADoADgwBCyABIAY3AyALIAEoAqxAIAQgBiABKAKoQCgCFBEPABoLIAMgBVYNAQwCCwsgASgCAA0AIAEEQCABQQA2AgQgAUEUNgIACwsgBVBFBEAgAUEAOgAOIAEgASkDGCAFfDcDGAwIC0J/QgAgASgCABshBQwHCyABKAKsQCABKAKoQCgCEBEBAK1CAX0hBQwGCyABLQAQBEAgAS0ADQRAIAIgAS0ADwR/QQAFQQggASgCFCIAIABBfUsbCzsBMCACIAEpAxg3AyAgAiACKQMAQsgAhDcDAAwHCyACIAIpAwBCt////w+DNwMADAYLIAJBADsBMCACKQMAIQMgAS0ADQRAIAEpAxghBSACIANCxACENwMAIAIgBTcDGEIAIQUMBgsgAiADQrv///8Pg0LAAIQ3AwAMBQsgAS0ADw0EIAEoAqxAIAEoAqhAKAIIEQEArCEFDAQLIANCCFoEfiACIAEoAgA2AgAgAiABKAIENgIEQggFQn8LIQUMAwsgAUUNAiABKAKsQCABKAKoQCgCBBEDACABEDEgARAGDAILIAdBfzYCAEEQIAcQJEI/hCEFDAELIAEEQCABQQA2AgQgAUEUNgIAC0J/IQULIAdBEGokACAFC2MAQcgAEAkiAEUEQEGEhAEoAgAhASACBEAgAiABNgIEIAJBATYCAAsgAA8LIABBADoADCAAQQA6AAQgACACNgIAIABBADYCOCAAQgA3AzAgACABQQkgAUEBa0EJSRs2AgggAAu3fAIefwZ+IAIpAwAhIiAAIAE2AhwgACAiQv////8PICJC/////w9UGz4CICAAQRBqIQECfyAALQAEBEACfyAALQAMQQJ0IQpBfiEEAkACQAJAIAEiBUUNACAFKAIgRQ0AIAUoAiRFDQAgBSgCHCIDRQ0AIAMoAgAgBUcNAAJAAkAgAygCICIGQTlrDjkBAgICAgICAgICAgIBAgICAQICAgICAgICAgICAgICAgICAQICAgICAgICAgICAQICAgICAgICAgEACyAGQZoFRg0AIAZBKkcNAQsgCkEFSw0AAkACQCAFKAIMRQ0AIAUoAgQiAQRAIAUoAgBFDQELIAZBmgVHDQEgCkEERg0BCyAFQeDAACgCADYCGEF+DAQLIAUoAhBFDQEgAygCJCEEIAMgCjYCJAJAIAMoAhAEQCADEDACQCAFKAIQIgYgAygCECIIIAYgCEkbIgFFDQAgBSgCDCADKAIIIAEQBxogBSAFKAIMIAFqNgIMIAMgAygCCCABajYCCCAFIAUoAhQgAWo2AhQgBSAFKAIQIAFrIgY2AhAgAyADKAIQIAFrIgg2AhAgCA0AIAMgAygCBDYCCEEAIQgLIAYEQCADKAIgIQYMAgsMBAsgAQ0AIApBAXRBd0EAIApBBEsbaiAEQQF0QXdBACAEQQRKG2pKDQAgCkEERg0ADAILAkACQAJAAkACQCAGQSpHBEAgBkGaBUcNASAFKAIERQ0DDAcLIAMoAhRFBEAgA0HxADYCIAwCCyADKAI0QQx0QYDwAWshBAJAIAMoAowBQQJODQAgAygCiAEiAUEBTA0AIAFBBUwEQCAEQcAAciEEDAELQYABQcABIAFBBkYbIARyIQQLIAMoAgQgCGogBEEgciAEIAMoAmgbIgFBH3AgAXJBH3NBCHQgAUGA/gNxQQh2cjsAACADIAMoAhBBAmoiATYCECADKAJoBEAgAygCBCABaiAFKAIwIgFBGHQgAUEIdEGAgPwHcXIgAUEIdkGA/gNxIAFBGHZycjYAACADIAMoAhBBBGo2AhALIAVBATYCMCADQfEANgIgIAUQCiADKAIQDQcgAygCICEGCwJAAkACQAJAIAZBOUYEfyADQaABakHkgAEoAgARAQAaIAMgAygCECIBQQFqNgIQIAEgAygCBGpBHzoAACADIAMoAhAiAUEBajYCECABIAMoAgRqQYsBOgAAIAMgAygCECIBQQFqNgIQIAEgAygCBGpBCDoAAAJAIAMoAhwiAUUEQCADKAIEIAMoAhBqQQA2AAAgAyADKAIQIgFBBWo2AhAgASADKAIEakEAOgAEQQIhBCADKAKIASIBQQlHBEBBBCABQQJIQQJ0IAMoAowBQQFKGyEECyADIAMoAhAiAUEBajYCECABIAMoAgRqIAQ6AAAgAyADKAIQIgFBAWo2AhAgASADKAIEakEDOgAAIANB8QA2AiAgBRAKIAMoAhBFDQEMDQsgASgCJCELIAEoAhwhCSABKAIQIQggASgCLCENIAEoAgAhBiADIAMoAhAiAUEBajYCEEECIQQgASADKAIEaiANQQBHQQF0IAZBAEdyIAhBAEdBAnRyIAlBAEdBA3RyIAtBAEdBBHRyOgAAIAMoAgQgAygCEGogAygCHCgCBDYAACADIAMoAhAiDUEEaiIGNgIQIAMoAogBIgFBCUcEQEEEIAFBAkhBAnQgAygCjAFBAUobIQQLIAMgDUEFajYCECADKAIEIAZqIAQ6AAAgAygCHCgCDCEEIAMgAygCECIBQQFqNgIQIAEgAygCBGogBDoAACADKAIcIgEoAhAEfyADKAIEIAMoAhBqIAEoAhQ7AAAgAyADKAIQQQJqNgIQIAMoAhwFIAELKAIsBEAgBQJ/IAUoAjAhBiADKAIQIQRBACADKAIEIgFFDQAaIAYgASAEQdSAASgCABEAAAs2AjALIANBxQA2AiAgA0EANgIYDAILIAMoAiAFIAYLQcUAaw4jAAQEBAEEBAQEBAQEBAQEBAQEBAQEBAIEBAQEBAQEBAQEBAMECyADKAIcIgEoAhAiBgRAIAMoAgwiCCADKAIQIgQgAS8BFCADKAIYIg1rIglqSQRAA0AgAygCBCAEaiAGIA1qIAggBGsiCBAHGiADIAMoAgwiDTYCEAJAIAMoAhwoAixFDQAgBCANTw0AIAUCfyAFKAIwIQZBACADKAIEIARqIgFFDQAaIAYgASANIARrQdSAASgCABEAAAs2AjALIAMgAygCGCAIajYCGCAFKAIcIgYQMAJAIAUoAhAiBCAGKAIQIgEgASAESxsiAUUNACAFKAIMIAYoAgggARAHGiAFIAUoAgwgAWo2AgwgBiAGKAIIIAFqNgIIIAUgBSgCFCABajYCFCAFIAUoAhAgAWs2AhAgBiAGKAIQIAFrIgE2AhAgAQ0AIAYgBigCBDYCCAsgAygCEA0MIAMoAhghDSADKAIcKAIQIQZBACEEIAkgCGsiCSADKAIMIghLDQALCyADKAIEIARqIAYgDWogCRAHGiADIAMoAhAgCWoiDTYCEAJAIAMoAhwoAixFDQAgBCANTw0AIAUCfyAFKAIwIQZBACADKAIEIARqIgFFDQAaIAYgASANIARrQdSAASgCABEAAAs2AjALIANBADYCGAsgA0HJADYCIAsgAygCHCgCHARAIAMoAhAiBCEJA0ACQCAEIAMoAgxHDQACQCADKAIcKAIsRQ0AIAQgCU0NACAFAn8gBSgCMCEGQQAgAygCBCAJaiIBRQ0AGiAGIAEgBCAJa0HUgAEoAgARAAALNgIwCyAFKAIcIgYQMAJAIAUoAhAiBCAGKAIQIgEgASAESxsiAUUNACAFKAIMIAYoAgggARAHGiAFIAUoAgwgAWo2AgwgBiAGKAIIIAFqNgIIIAUgBSgCFCABajYCFCAFIAUoAhAgAWs2AhAgBiAGKAIQIAFrIgE2AhAgAQ0AIAYgBigCBDYCCAtBACEEQQAhCSADKAIQRQ0ADAsLIAMoAhwoAhwhBiADIAMoAhgiAUEBajYCGCABIAZqLQAAIQEgAyAEQQFqNgIQIAMoAgQgBGogAToAACABBEAgAygCECEEDAELCwJAIAMoAhwoAixFDQAgAygCECIGIAlNDQAgBQJ/IAUoAjAhBEEAIAMoAgQgCWoiAUUNABogBCABIAYgCWtB1IABKAIAEQAACzYCMAsgA0EANgIYCyADQdsANgIgCwJAIAMoAhwoAiRFDQAgAygCECIEIQkDQAJAIAQgAygCDEcNAAJAIAMoAhwoAixFDQAgBCAJTQ0AIAUCfyAFKAIwIQZBACADKAIEIAlqIgFFDQAaIAYgASAEIAlrQdSAASgCABEAAAs2AjALIAUoAhwiBhAwAkAgBSgCECIEIAYoAhAiASABIARLGyIBRQ0AIAUoAgwgBigCCCABEAcaIAUgBSgCDCABajYCDCAGIAYoAgggAWo2AgggBSAFKAIUIAFqNgIUIAUgBSgCECABazYCECAGIAYoAhAgAWsiATYCECABDQAgBiAGKAIENgIIC0EAIQRBACEJIAMoAhBFDQAMCgsgAygCHCgCJCEGIAMgAygCGCIBQQFqNgIYIAEgBmotAAAhASADIARBAWo2AhAgAygCBCAEaiABOgAAIAEEQCADKAIQIQQMAQsLIAMoAhwoAixFDQAgAygCECIGIAlNDQAgBQJ/IAUoAjAhBEEAIAMoAgQgCWoiAUUNABogBCABIAYgCWtB1IABKAIAEQAACzYCMAsgA0HnADYCIAsCQCADKAIcKAIsBEAgAygCDCADKAIQIgFBAmpJBH8gBRAKIAMoAhANAkEABSABCyADKAIEaiAFKAIwOwAAIAMgAygCEEECajYCECADQaABakHkgAEoAgARAQAaCyADQfEANgIgIAUQCiADKAIQRQ0BDAcLDAYLIAUoAgQNAQsgAygCPA0AIApFDQEgAygCIEGaBUYNAQsCfyADKAKIASIBRQRAIAMgChCFAQwBCwJAAkACQCADKAKMAUECaw4CAAECCwJ/AkADQAJAAkAgAygCPA0AIAMQLyADKAI8DQAgCg0BQQAMBAsgAygCSCADKAJoai0AACEEIAMgAygC8C0iAUEBajYC8C0gASADKALsLWpBADoAACADIAMoAvAtIgFBAWo2AvAtIAEgAygC7C1qQQA6AAAgAyADKALwLSIBQQFqNgLwLSABIAMoAuwtaiAEOgAAIAMgBEECdGoiASABLwHkAUEBajsB5AEgAyADKAI8QQFrNgI8IAMgAygCaEEBaiIBNgJoIAMoAvAtIAMoAvQtRw0BQQAhBCADIAMoAlgiBkEATgR/IAMoAkggBmoFQQALIAEgBmtBABAPIAMgAygCaDYCWCADKAIAEAogAygCACgCEA0BDAILCyADQQA2AoQuIApBBEYEQCADIAMoAlgiAUEATgR/IAMoAkggAWoFQQALIAMoAmggAWtBARAPIAMgAygCaDYCWCADKAIAEApBA0ECIAMoAgAoAhAbDAILIAMoAvAtBEBBACEEIAMgAygCWCIBQQBOBH8gAygCSCABagVBAAsgAygCaCABa0EAEA8gAyADKAJoNgJYIAMoAgAQCiADKAIAKAIQRQ0BC0EBIQQLIAQLDAILAn8CQANAAkACQAJAAkACQCADKAI8Ig1BggJLDQAgAxAvAkAgAygCPCINQYICSw0AIAoNAEEADAgLIA1FDQQgDUECSw0AIAMoAmghCAwBCyADKAJoIghFBEBBACEIDAELIAMoAkggCGoiAUEBayIELQAAIgYgAS0AAEcNACAGIAQtAAJHDQAgBEEDaiEEQQAhCQJAA0AgBiAELQAARw0BIAQtAAEgBkcEQCAJQQFyIQkMAgsgBC0AAiAGRwRAIAlBAnIhCQwCCyAELQADIAZHBEAgCUEDciEJDAILIAQtAAQgBkcEQCAJQQRyIQkMAgsgBC0ABSAGRwRAIAlBBXIhCQwCCyAELQAGIAZHBEAgCUEGciEJDAILIAQtAAcgBkcEQCAJQQdyIQkMAgsgBEEIaiEEIAlB+AFJIQEgCUEIaiEJIAENAAtBgAIhCQtBggIhBCANIAlBAmoiASABIA1LGyIBQYECSw0BIAEiBEECSw0BCyADKAJIIAhqLQAAIQQgAyADKALwLSIBQQFqNgLwLSABIAMoAuwtakEAOgAAIAMgAygC8C0iAUEBajYC8C0gASADKALsLWpBADoAACADIAMoAvAtIgFBAWo2AvAtIAEgAygC7C1qIAQ6AAAgAyAEQQJ0aiIBIAEvAeQBQQFqOwHkASADIAMoAjxBAWs2AjwgAyADKAJoQQFqIgQ2AmgMAQsgAyADKALwLSIBQQFqNgLwLSABIAMoAuwtakEBOgAAIAMgAygC8C0iAUEBajYC8C0gASADKALsLWpBADoAACADIAMoAvAtIgFBAWo2AvAtIAEgAygC7C1qIARBA2s6AAAgAyADKAKALkEBajYCgC4gBEH9zgBqLQAAQQJ0IANqQegJaiIBIAEvAQBBAWo7AQAgA0GAywAtAABBAnRqQdgTaiIBIAEvAQBBAWo7AQAgAyADKAI8IARrNgI8IAMgAygCaCAEaiIENgJoCyADKALwLSADKAL0LUcNAUEAIQggAyADKAJYIgFBAE4EfyADKAJIIAFqBUEACyAEIAFrQQAQDyADIAMoAmg2AlggAygCABAKIAMoAgAoAhANAQwCCwsgA0EANgKELiAKQQRGBEAgAyADKAJYIgFBAE4EfyADKAJIIAFqBUEACyADKAJoIAFrQQEQDyADIAMoAmg2AlggAygCABAKQQNBAiADKAIAKAIQGwwCCyADKALwLQRAQQAhCCADIAMoAlgiAUEATgR/IAMoAkggAWoFQQALIAMoAmggAWtBABAPIAMgAygCaDYCWCADKAIAEAogAygCACgCEEUNAQtBASEICyAICwwBCyADIAogAUEMbEG42ABqKAIAEQIACyIBQX5xQQJGBEAgA0GaBTYCIAsgAUF9cUUEQEEAIQQgBSgCEA0CDAQLIAFBAUcNAAJAAkACQCAKQQFrDgUAAQEBAgELIAMpA5guISICfwJ+IAMoAqAuIgFBA2oiCUE/TQRAQgIgAa2GICKEDAELIAFBwABGBEAgAygCBCADKAIQaiAiNwAAIAMgAygCEEEIajYCEEICISJBCgwCCyADKAIEIAMoAhBqQgIgAa2GICKENwAAIAMgAygCEEEIajYCECABQT1rIQlCAkHAACABa62ICyEiIAlBB2ogCUE5SQ0AGiADKAIEIAMoAhBqICI3AAAgAyADKAIQQQhqNgIQQgAhIiAJQTlrCyEBIAMgIjcDmC4gAyABNgKgLiADEDAMAQsgA0EAQQBBABA5IApBA0cNACADKAJQQQBBgIAIEBkgAygCPA0AIANBADYChC4gA0EANgJYIANBADYCaAsgBRAKIAUoAhANAAwDC0EAIQQgCkEERw0AAkACfwJAAkAgAygCFEEBaw4CAQADCyAFIANBoAFqQeCAASgCABEBACIBNgIwIAMoAgQgAygCEGogATYAACADIAMoAhBBBGoiATYCECADKAIEIAFqIQQgBSgCCAwBCyADKAIEIAMoAhBqIQQgBSgCMCIBQRh0IAFBCHRBgID8B3FyIAFBCHZBgP4DcSABQRh2cnILIQEgBCABNgAAIAMgAygCEEEEajYCEAsgBRAKIAMoAhQiAUEBTgRAIANBACABazYCFAsgAygCEEUhBAsgBAwCCyAFQezAACgCADYCGEF7DAELIANBfzYCJEEACwwBCyMAQRBrIhQkAEF+IRcCQCABIgxFDQAgDCgCIEUNACAMKAIkRQ0AIAwoAhwiB0UNACAHKAIAIAxHDQAgBygCBCIIQbT+AGtBH0sNACAMKAIMIhBFDQAgDCgCACIBRQRAIAwoAgQNAQsgCEG//gBGBEAgB0HA/gA2AgRBwP4AIQgLIAdBpAFqIR8gB0G8BmohGSAHQbwBaiEcIAdBoAFqIR0gB0G4AWohGiAHQfwKaiEYIAdBQGshHiAHKAKIASEFIAwoAgQiICEGIAcoAoQBIQogDCgCECIPIRYCfwJAAkACQANAAkBBfSEEQQEhCQJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAIAhBtP4Aaw4fBwYICQolJicoBSwtLQsZGgQMAjIzATUANw0OAzlISUwLIAcoApQBIQMgASEEIAYhCAw1CyAHKAKUASEDIAEhBCAGIQgMMgsgBygCtAEhCAwuCyAHKAIMIQgMQQsgBUEOTw0pIAZFDUEgBUEIaiEIIAFBAWohBCAGQQFrIQkgAS0AACAFdCAKaiEKIAVBBkkNDCAEIQEgCSEGIAghBQwpCyAFQSBPDSUgBkUNQCABQQFqIQQgBkEBayEIIAEtAAAgBXQgCmohCiAFQRhJDQ0gBCEBIAghBgwlCyAFQRBPDRUgBkUNPyAFQQhqIQggAUEBaiEEIAZBAWshCSABLQAAIAV0IApqIQogBUEISQ0NIAQhASAJIQYgCCEFDBULIAcoAgwiC0UNByAFQRBPDSIgBkUNPiAFQQhqIQggAUEBaiEEIAZBAWshCSABLQAAIAV0IApqIQogBUEISQ0NIAQhASAJIQYgCCEFDCILIAVBH0sNFQwUCyAFQQ9LDRYMFQsgBygCFCIEQYAIcUUEQCAFIQgMFwsgCiEIIAVBD0sNGAwXCyAKIAVBB3F2IQogBUF4cSIFQR9LDQwgBkUNOiAFQQhqIQggAUEBaiEEIAZBAWshCSABLQAAIAV0IApqIQogBUEYSQ0GIAQhASAJIQYgCCEFDAwLIAcoArQBIgggBygCqAEiC08NIwwiCyAPRQ0qIBAgBygCjAE6AAAgB0HI/gA2AgQgD0EBayEPIBBBAWohECAHKAIEIQgMOQsgBygCDCIDRQRAQQAhCAwJCyAFQR9LDQcgBkUNNyAFQQhqIQggAUEBaiEEIAZBAWshCSABLQAAIAV0IApqIQogBUEYSQ0BIAQhASAJIQYgCCEFDAcLIAdBwP4ANgIEDCoLIAlFBEAgBCEBQQAhBiAIIQUgDSEEDDgLIAVBEGohCSABQQJqIQQgBkECayELIAEtAAEgCHQgCmohCiAFQQ9LBEAgBCEBIAshBiAJIQUMBgsgC0UEQCAEIQFBACEGIAkhBSANIQQMOAsgBUEYaiEIIAFBA2ohBCAGQQNrIQsgAS0AAiAJdCAKaiEKIAVBB0sEQCAEIQEgCyEGIAghBQwGCyALRQRAIAQhAUEAIQYgCCEFIA0hBAw4CyAFQSBqIQUgBkEEayEGIAEtAAMgCHQgCmohCiABQQRqIQEMBQsgCUUEQCAEIQFBACEGIAghBSANIQQMNwsgBUEQaiEFIAZBAmshBiABLQABIAh0IApqIQogAUECaiEBDBwLIAlFBEAgBCEBQQAhBiAIIQUgDSEEDDYLIAVBEGohCSABQQJqIQQgBkECayELIAEtAAEgCHQgCmohCiAFQQ9LBEAgBCEBIAshBiAJIQUMBgsgC0UEQCAEIQFBACEGIAkhBSANIQQMNgsgBUEYaiEIIAFBA2ohBCAGQQNrIQsgAS0AAiAJdCAKaiEKIAUEQCAEIQEgCyEGIAghBQwGCyALRQRAIAQhAUEAIQYgCCEFIA0hBAw2CyAFQSBqIQUgBkEEayEGIAEtAAMgCHQgCmohCiABQQRqIQEMBQsgBUEIaiEJIAhFBEAgBCEBQQAhBiAJIQUgDSEEDDULIAFBAmohBCAGQQJrIQggAS0AASAJdCAKaiEKIAVBD0sEQCAEIQEgCCEGDBgLIAVBEGohCSAIRQRAIAQhAUEAIQYgCSEFIA0hBAw1CyABQQNqIQQgBkEDayEIIAEtAAIgCXQgCmohCiAFQQdLBEAgBCEBIAghBgwYCyAFQRhqIQUgCEUEQCAEIQFBACEGIA0hBAw1CyAGQQRrIQYgAS0AAyAFdCAKaiEKIAFBBGohAQwXCyAJDQYgBCEBQQAhBiAIIQUgDSEEDDMLIAlFBEAgBCEBQQAhBiAIIQUgDSEEDDMLIAVBEGohBSAGQQJrIQYgAS0AASAIdCAKaiEKIAFBAmohAQwUCyAMIBYgD2siCSAMKAIUajYCFCAHIAcoAiAgCWo2AiACQCADQQRxRQ0AIAkEQAJAIBAgCWshBCAMKAIcIggoAhQEQCAIQUBrIAQgCUEAQdiAASgCABEIAAwBCyAIIAgoAhwgBCAJQcCAASgCABEAACIENgIcIAwgBDYCMAsLIAcoAhRFDQAgByAeQeCAASgCABEBACIENgIcIAwgBDYCMAsCQCAHKAIMIghBBHFFDQAgBygCHCAKIApBCHRBgID8B3EgCkEYdHIgCkEIdkGA/gNxIApBGHZyciAHKAIUG0YNACAHQdH+ADYCBCAMQaQMNgIYIA8hFiAHKAIEIQgMMQtBACEKQQAhBSAPIRYLIAdBz/4ANgIEDC0LIApB//8DcSIEIApBf3NBEHZHBEAgB0HR/gA2AgQgDEGOCjYCGCAHKAIEIQgMLwsgB0HC/gA2AgQgByAENgKMAUEAIQpBACEFCyAHQcP+ADYCBAsgBygCjAEiBARAIA8gBiAEIAQgBksbIgQgBCAPSxsiCEUNHiAQIAEgCBAHIQQgByAHKAKMASAIazYCjAEgBCAIaiEQIA8gCGshDyABIAhqIQEgBiAIayEGIAcoAgQhCAwtCyAHQb/+ADYCBCAHKAIEIQgMLAsgBUEQaiEFIAZBAmshBiABLQABIAh0IApqIQogAUECaiEBCyAHIAo2AhQgCkH/AXFBCEcEQCAHQdH+ADYCBCAMQYIPNgIYIAcoAgQhCAwrCyAKQYDAA3EEQCAHQdH+ADYCBCAMQY0JNgIYIAcoAgQhCAwrCyAHKAIkIgQEQCAEIApBCHZBAXE2AgALAkAgCkGABHFFDQAgBy0ADEEEcUUNACAUIAo7AAwgBwJ/IAcoAhwhBUEAIBRBDGoiBEUNABogBSAEQQJB1IABKAIAEQAACzYCHAsgB0G2/gA2AgRBACEFQQAhCgsgBkUNKCABQQFqIQQgBkEBayEIIAEtAAAgBXQgCmohCiAFQRhPBEAgBCEBIAghBgwBCyAFQQhqIQkgCEUEQCAEIQFBACEGIAkhBSANIQQMKwsgAUECaiEEIAZBAmshCCABLQABIAl0IApqIQogBUEPSwRAIAQhASAIIQYMAQsgBUEQaiEJIAhFBEAgBCEBQQAhBiAJIQUgDSEEDCsLIAFBA2ohBCAGQQNrIQggAS0AAiAJdCAKaiEKIAVBB0sEQCAEIQEgCCEGDAELIAVBGGohBSAIRQRAIAQhAUEAIQYgDSEEDCsLIAZBBGshBiABLQADIAV0IApqIQogAUEEaiEBCyAHKAIkIgQEQCAEIAo2AgQLAkAgBy0AFUECcUUNACAHLQAMQQRxRQ0AIBQgCjYADCAHAn8gBygCHCEFQQAgFEEMaiIERQ0AGiAFIARBBEHUgAEoAgARAAALNgIcCyAHQbf+ADYCBEEAIQVBACEKCyAGRQ0mIAFBAWohBCAGQQFrIQggAS0AACAFdCAKaiEKIAVBCE8EQCAEIQEgCCEGDAELIAVBCGohBSAIRQRAIAQhAUEAIQYgDSEEDCkLIAZBAmshBiABLQABIAV0IApqIQogAUECaiEBCyAHKAIkIgQEQCAEIApBCHY2AgwgBCAKQf8BcTYCCAsCQCAHLQAVQQJxRQ0AIActAAxBBHFFDQAgFCAKOwAMIAcCfyAHKAIcIQVBACAUQQxqIgRFDQAaIAUgBEECQdSAASgCABEAAAs2AhwLIAdBuP4ANgIEQQAhCEEAIQVBACEKIAcoAhQiBEGACHENAQsgBygCJCIEBEAgBEEANgIQCyAIIQUMAgsgBkUEQEEAIQYgCCEKIA0hBAwmCyABQQFqIQkgBkEBayELIAEtAAAgBXQgCGohCiAFQQhPBEAgCSEBIAshBgwBCyAFQQhqIQUgC0UEQCAJIQFBACEGIA0hBAwmCyAGQQJrIQYgAS0AASAFdCAKaiEKIAFBAmohAQsgByAKQf//A3EiCDYCjAEgBygCJCIFBEAgBSAINgIUC0EAIQUCQCAEQYAEcUUNACAHLQAMQQRxRQ0AIBQgCjsADCAHAn8gBygCHCEIQQAgFEEMaiIERQ0AGiAIIARBAkHUgAEoAgARAAALNgIcC0EAIQoLIAdBuf4ANgIECyAHKAIUIglBgAhxBEAgBiAHKAKMASIIIAYgCEkbIg4EQAJAIAcoAiQiA0UNACADKAIQIgRFDQAgAygCGCILIAMoAhQgCGsiCE0NACAEIAhqIAEgCyAIayAOIAggDmogC0sbEAcaIAcoAhQhCQsCQCAJQYAEcUUNACAHLQAMQQRxRQ0AIAcCfyAHKAIcIQRBACABRQ0AGiAEIAEgDkHUgAEoAgARAAALNgIcCyAHIAcoAowBIA5rIgg2AowBIAYgDmshBiABIA5qIQELIAgNEwsgB0G6/gA2AgQgB0EANgKMAQsCQCAHLQAVQQhxBEBBACEIIAZFDQQDQCABIAhqLQAAIQMCQCAHKAIkIgtFDQAgCygCHCIERQ0AIAcoAowBIgkgCygCIE8NACAHIAlBAWo2AowBIAQgCWogAzoAAAsgA0EAIAYgCEEBaiIISxsNAAsCQCAHLQAVQQJxRQ0AIActAAxBBHFFDQAgBwJ/IAcoAhwhBEEAIAFFDQAaIAQgASAIQdSAASgCABEAAAs2AhwLIAEgCGohASAGIAhrIQYgA0UNAQwTCyAHKAIkIgRFDQAgBEEANgIcCyAHQbv+ADYCBCAHQQA2AowBCwJAIActABVBEHEEQEEAIQggBkUNAwNAIAEgCGotAAAhAwJAIAcoAiQiC0UNACALKAIkIgRFDQAgBygCjAEiCSALKAIoTw0AIAcgCUEBajYCjAEgBCAJaiADOgAACyADQQAgBiAIQQFqIghLGw0ACwJAIActABVBAnFFDQAgBy0ADEEEcUUNACAHAn8gBygCHCEEQQAgAUUNABogBCABIAhB1IABKAIAEQAACzYCHAsgASAIaiEBIAYgCGshBiADRQ0BDBILIAcoAiQiBEUNACAEQQA2AiQLIAdBvP4ANgIECyAHKAIUIgtBgARxBEACQCAFQQ9LDQAgBkUNHyAFQQhqIQggAUEBaiEEIAZBAWshCSABLQAAIAV0IApqIQogBUEITwRAIAQhASAJIQYgCCEFDAELIAlFBEAgBCEBQQAhBiAIIQUgDSEEDCILIAVBEGohBSAGQQJrIQYgAS0AASAIdCAKaiEKIAFBAmohAQsCQCAHLQAMQQRxRQ0AIAogBy8BHEYNACAHQdH+ADYCBCAMQdcMNgIYIAcoAgQhCAwgC0EAIQpBACEFCyAHKAIkIgQEQCAEQQE2AjAgBCALQQl2QQFxNgIsCwJAIActAAxBBHFFDQAgC0UNACAHIB5B5IABKAIAEQEAIgQ2AhwgDCAENgIwCyAHQb/+ADYCBCAHKAIEIQgMHgtBACEGDA4LAkAgC0ECcUUNACAKQZ+WAkcNACAHKAIoRQRAIAdBDzYCKAtBACEKIAdBADYCHCAUQZ+WAjsADCAHIBRBDGoiBAR/QQAgBEECQdSAASgCABEAAAVBAAs2AhwgB0G1/gA2AgRBACEFIAcoAgQhCAwdCyAHKAIkIgQEQCAEQX82AjALAkAgC0EBcQRAIApBCHRBgP4DcSAKQQh2akEfcEUNAQsgB0HR/gA2AgQgDEH2CzYCGCAHKAIEIQgMHQsgCkEPcUEIRwRAIAdB0f4ANgIEIAxBgg82AhggBygCBCEIDB0LIApBBHYiBEEPcSIJQQhqIQsgCUEHTUEAIAcoAigiCAR/IAgFIAcgCzYCKCALCyALTxtFBEAgBUEEayEFIAdB0f4ANgIEIAxB+gw2AhggBCEKIAcoAgQhCAwdCyAHQQE2AhxBACEFIAdBADYCFCAHQYACIAl0NgIYIAxBATYCMCAHQb3+AEG//gAgCkGAwABxGzYCBEEAIQogBygCBCEIDBwLIAcgCkEIdEGAgPwHcSAKQRh0ciAKQQh2QYD+A3EgCkEYdnJyIgQ2AhwgDCAENgIwIAdBvv4ANgIEQQAhCkEAIQULIAcoAhBFBEAgDCAPNgIQIAwgEDYCDCAMIAY2AgQgDCABNgIAIAcgBTYCiAEgByAKNgKEAUECIRcMIAsgB0EBNgIcIAxBATYCMCAHQb/+ADYCBAsCfwJAIAcoAghFBEAgBUEDSQ0BIAUMAgsgB0HO/gA2AgQgCiAFQQdxdiEKIAVBeHEhBSAHKAIEIQgMGwsgBkUNGSAGQQFrIQYgAS0AACAFdCAKaiEKIAFBAWohASAFQQhqCyEEIAcgCkEBcTYCCAJAAkACQAJAAkAgCkEBdkEDcUEBaw4DAQIDAAsgB0HB/gA2AgQMAwsgB0Gw2wA2ApgBIAdCiYCAgNAANwOgASAHQbDrADYCnAEgB0HH/gA2AgQMAgsgB0HE/gA2AgQMAQsgB0HR/gA2AgQgDEHXDTYCGAsgBEEDayEFIApBA3YhCiAHKAIEIQgMGQsgByAKQR9xIghBgQJqNgKsASAHIApBBXZBH3EiBEEBajYCsAEgByAKQQp2QQ9xQQRqIgs2AqgBIAVBDmshBSAKQQ52IQogCEEdTUEAIARBHkkbRQRAIAdB0f4ANgIEIAxB6gk2AhggBygCBCEIDBkLIAdBxf4ANgIEQQAhCCAHQQA2ArQBCyAIIQQDQCAFQQJNBEAgBkUNGCAGQQFrIQYgAS0AACAFdCAKaiEKIAVBCGohBSABQQFqIQELIAcgBEEBaiIINgK0ASAHIARBAXRBsOwAai8BAEEBdGogCkEHcTsBvAEgBUEDayEFIApBA3YhCiALIAgiBEsNAAsLIAhBEk0EQEESIAhrIQ1BAyAIa0EDcSIEBEADQCAHIAhBAXRBsOwAai8BAEEBdGpBADsBvAEgCEEBaiEIIARBAWsiBA0ACwsgDUEDTwRAA0AgB0G8AWoiDSAIQQF0IgRBsOwAai8BAEEBdGpBADsBACANIARBsuwAai8BAEEBdGpBADsBACANIARBtOwAai8BAEEBdGpBADsBACANIARBtuwAai8BAEEBdGpBADsBACAIQQRqIghBE0cNAAsLIAdBEzYCtAELIAdBBzYCoAEgByAYNgKYASAHIBg2ArgBQQAhCEEAIBxBEyAaIB0gGRBOIg0EQCAHQdH+ADYCBCAMQfQINgIYIAcoAgQhCAwXCyAHQcb+ADYCBCAHQQA2ArQBQQAhDQsgBygCrAEiFSAHKAKwAWoiESAISwRAQX8gBygCoAF0QX9zIRIgBygCmAEhGwNAIAYhCSABIQsCQCAFIgMgGyAKIBJxIhNBAnRqLQABIg5PBEAgBSEEDAELA0AgCUUNDSALLQAAIAN0IQ4gC0EBaiELIAlBAWshCSADQQhqIgQhAyAEIBsgCiAOaiIKIBJxIhNBAnRqLQABIg5JDQALIAshASAJIQYLAkAgGyATQQJ0ai8BAiIFQQ9NBEAgByAIQQFqIgk2ArQBIAcgCEEBdGogBTsBvAEgBCAOayEFIAogDnYhCiAJIQgMAQsCfwJ/AkACQAJAIAVBEGsOAgABAgsgDkECaiIFIARLBEADQCAGRQ0bIAZBAWshBiABLQAAIAR0IApqIQogAUEBaiEBIARBCGoiBCAFSQ0ACwsgBCAOayEFIAogDnYhBCAIRQRAIAdB0f4ANgIEIAxBvAk2AhggBCEKIAcoAgQhCAwdCyAFQQJrIQUgBEECdiEKIARBA3FBA2ohCSAIQQF0IAdqLwG6AQwDCyAOQQNqIgUgBEsEQANAIAZFDRogBkEBayEGIAEtAAAgBHQgCmohCiABQQFqIQEgBEEIaiIEIAVJDQALCyAEIA5rQQNrIQUgCiAOdiIEQQN2IQogBEEHcUEDagwBCyAOQQdqIgUgBEsEQANAIAZFDRkgBkEBayEGIAEtAAAgBHQgCmohCiABQQFqIQEgBEEIaiIEIAVJDQALCyAEIA5rQQdrIQUgCiAOdiIEQQd2IQogBEH/AHFBC2oLIQlBAAshAyAIIAlqIBFLDRMgCUEBayEEIAlBA3EiCwRAA0AgByAIQQF0aiADOwG8ASAIQQFqIQggCUEBayEJIAtBAWsiCw0ACwsgBEEDTwRAA0AgByAIQQF0aiIEIAM7Ab4BIAQgAzsBvAEgBCADOwHAASAEIAM7AcIBIAhBBGohCCAJQQRrIgkNAAsLIAcgCDYCtAELIAggEUkNAAsLIAcvAbwFRQRAIAdB0f4ANgIEIAxB0Qs2AhggBygCBCEIDBYLIAdBCjYCoAEgByAYNgKYASAHIBg2ArgBQQEgHCAVIBogHSAZEE4iDQRAIAdB0f4ANgIEIAxB2Ag2AhggBygCBCEIDBYLIAdBCTYCpAEgByAHKAK4ATYCnAFBAiAHIAcoAqwBQQF0akG8AWogBygCsAEgGiAfIBkQTiINBEAgB0HR/gA2AgQgDEGmCTYCGCAHKAIEIQgMFgsgB0HH/gA2AgRBACENCyAHQcj+ADYCBAsCQCAGQQ9JDQAgD0GEAkkNACAMIA82AhAgDCAQNgIMIAwgBjYCBCAMIAE2AgAgByAFNgKIASAHIAo2AoQBIAwgFkHogAEoAgARBwAgBygCiAEhBSAHKAKEASEKIAwoAgQhBiAMKAIAIQEgDCgCECEPIAwoAgwhECAHKAIEQb/+AEcNByAHQX82ApBHIAcoAgQhCAwUCyAHQQA2ApBHIAUhCSAGIQggASEEAkAgBygCmAEiEiAKQX8gBygCoAF0QX9zIhVxIg5BAnRqLQABIgsgBU0EQCAFIQMMAQsDQCAIRQ0PIAQtAAAgCXQhCyAEQQFqIQQgCEEBayEIIAlBCGoiAyEJIAMgEiAKIAtqIgogFXEiDkECdGotAAEiC0kNAAsLIBIgDkECdGoiAS8BAiETAkBBACABLQAAIhEgEUHwAXEbRQRAIAshBgwBCyAIIQYgBCEBAkAgAyIFIAsgEiAKQX8gCyARanRBf3MiFXEgC3YgE2oiEUECdGotAAEiDmpPBEAgAyEJDAELA0AgBkUNDyABLQAAIAV0IQ4gAUEBaiEBIAZBAWshBiAFQQhqIgkhBSALIBIgCiAOaiIKIBVxIAt2IBNqIhFBAnRqLQABIg5qIAlLDQALIAEhBCAGIQgLIBIgEUECdGoiAS0AACERIAEvAQIhEyAHIAs2ApBHIAsgDmohBiAJIAtrIQMgCiALdiEKIA4hCwsgByAGNgKQRyAHIBNB//8DcTYCjAEgAyALayEFIAogC3YhCiARRQRAIAdBzf4ANgIEDBALIBFBIHEEQCAHQb/+ADYCBCAHQX82ApBHDBALIBFBwABxBEAgB0HR/gA2AgQgDEHQDjYCGAwQCyAHQcn+ADYCBCAHIBFBD3EiAzYClAELAkAgA0UEQCAHKAKMASELIAQhASAIIQYMAQsgBSEJIAghBiAEIQsCQCADIAVNBEAgBCEBDAELA0AgBkUNDSAGQQFrIQYgCy0AACAJdCAKaiEKIAtBAWoiASELIAlBCGoiCSADSQ0ACwsgByAHKAKQRyADajYCkEcgByAHKAKMASAKQX8gA3RBf3NxaiILNgKMASAJIANrIQUgCiADdiEKCyAHQcr+ADYCBCAHIAs2ApRHCyAFIQkgBiEIIAEhBAJAIAcoApwBIhIgCkF/IAcoAqQBdEF/cyIVcSIOQQJ0ai0AASIDIAVNBEAgBSELDAELA0AgCEUNCiAELQAAIAl0IQMgBEEBaiEEIAhBAWshCCAJQQhqIgshCSALIBIgAyAKaiIKIBVxIg5BAnRqLQABIgNJDQALCyASIA5BAnRqIgEvAQIhEwJAIAEtAAAiEUHwAXEEQCAHKAKQRyEGIAMhCQwBCyAIIQYgBCEBAkAgCyIFIAMgEiAKQX8gAyARanRBf3MiFXEgA3YgE2oiEUECdGotAAEiCWpPBEAgCyEODAELA0AgBkUNCiABLQAAIAV0IQkgAUEBaiEBIAZBAWshBiAFQQhqIg4hBSADIBIgCSAKaiIKIBVxIAN2IBNqIhFBAnRqLQABIglqIA5LDQALIAEhBCAGIQgLIBIgEUECdGoiAS0AACERIAEvAQIhEyAHIAcoApBHIANqIgY2ApBHIA4gA2shCyAKIAN2IQoLIAcgBiAJajYCkEcgCyAJayEFIAogCXYhCiARQcAAcQRAIAdB0f4ANgIEIAxB7A42AhggBCEBIAghBiAHKAIEIQgMEgsgB0HL/gA2AgQgByARQQ9xIgM2ApQBIAcgE0H//wNxNgKQAQsCQCADRQRAIAQhASAIIQYMAQsgBSEJIAghBiAEIQsCQCADIAVNBEAgBCEBDAELA0AgBkUNCCAGQQFrIQYgCy0AACAJdCAKaiEKIAtBAWoiASELIAlBCGoiCSADSQ0ACwsgByAHKAKQRyADajYCkEcgByAHKAKQASAKQX8gA3RBf3NxajYCkAEgCSADayEFIAogA3YhCgsgB0HM/gA2AgQLIA9FDQACfyAHKAKQASIIIBYgD2siBEsEQAJAIAggBGsiCCAHKAIwTQ0AIAcoAoxHRQ0AIAdB0f4ANgIEIAxBuQw2AhggBygCBCEIDBILAn8CQAJ/IAcoAjQiBCAISQRAIAcoAjggBygCLCAIIARrIghragwBCyAHKAI4IAQgCGtqCyILIBAgDyAQaiAQa0EBaqwiISAPIAcoAowBIgQgCCAEIAhJGyIEIAQgD0sbIgitIiIgISAiVBsiIqciCWoiBEkgCyAQT3ENACALIBBNIAkgC2ogEEtxDQAgECALIAkQBxogBAwBCyAQIAsgCyAQayIEIARBH3UiBGogBHMiCRAHIAlqIQQgIiAJrSIkfSIjUEUEQCAJIAtqIQkDQAJAICMgJCAjICRUGyIiQiBUBEAgIiEhDAELICIiIUIgfSImQgWIQgF8QgODIiVQRQRAA0AgBCAJKQAANwAAIAQgCSkAGDcAGCAEIAkpABA3ABAgBCAJKQAINwAIICFCIH0hISAJQSBqIQkgBEEgaiEEICVCAX0iJUIAUg0ACwsgJkLgAFQNAANAIAQgCSkAADcAACAEIAkpABg3ABggBCAJKQAQNwAQIAQgCSkACDcACCAEIAkpADg3ADggBCAJKQAwNwAwIAQgCSkAKDcAKCAEIAkpACA3ACAgBCAJKQBYNwBYIAQgCSkAUDcAUCAEIAkpAEg3AEggBCAJKQBANwBAIAQgCSkAYDcAYCAEIAkpAGg3AGggBCAJKQBwNwBwIAQgCSkAeDcAeCAJQYABaiEJIARBgAFqIQQgIUKAAX0iIUIfVg0ACwsgIUIQWgRAIAQgCSkAADcAACAEIAkpAAg3AAggIUIQfSEhIAlBEGohCSAEQRBqIQQLICFCCFoEQCAEIAkpAAA3AAAgIUIIfSEhIAlBCGohCSAEQQhqIQQLICFCBFoEQCAEIAkoAAA2AAAgIUIEfSEhIAlBBGohCSAEQQRqIQQLICFCAloEQCAEIAkvAAA7AAAgIUICfSEhIAlBAmohCSAEQQJqIQQLICMgIn0hIyAhUEUEQCAEIAktAAA6AAAgCUEBaiEJIARBAWohBAsgI0IAUg0ACwsgBAsMAQsgECAIIA8gBygCjAEiBCAEIA9LGyIIIA9ByIABKAIAEQQACyEQIAcgBygCjAEgCGsiBDYCjAEgDyAIayEPIAQNAiAHQcj+ADYCBCAHKAIEIQgMDwsgDSEJCyAJIQQMDgsgBygCBCEIDAwLIAEgBmohASAFIAZBA3RqIQUMCgsgBCAIaiEBIAUgCEEDdGohBQwJCyAEIAhqIQEgCyAIQQN0aiEFDAgLIAEgBmohASAFIAZBA3RqIQUMBwsgBCAIaiEBIAUgCEEDdGohBQwGCyAEIAhqIQEgAyAIQQN0aiEFDAULIAEgBmohASAFIAZBA3RqIQUMBAsgB0HR/gA2AgQgDEG8CTYCGCAHKAIEIQgMBAsgBCEBIAghBiAHKAIEIQgMAwtBACEGIAQhBSANIQQMAwsCQAJAIAhFBEAgCiEJDAELIAcoAhRFBEAgCiEJDAELAkAgBUEfSw0AIAZFDQMgBUEIaiEJIAFBAWohBCAGQQFrIQsgAS0AACAFdCAKaiEKIAVBGE8EQCAEIQEgCyEGIAkhBQwBCyALRQRAIAQhAUEAIQYgCSEFIA0hBAwGCyAFQRBqIQsgAUECaiEEIAZBAmshAyABLQABIAl0IApqIQogBUEPSwRAIAQhASADIQYgCyEFDAELIANFBEAgBCEBQQAhBiALIQUgDSEEDAYLIAVBGGohCSABQQNqIQQgBkEDayEDIAEtAAIgC3QgCmohCiAFQQdLBEAgBCEBIAMhBiAJIQUMAQsgA0UEQCAEIQFBACEGIAkhBSANIQQMBgsgBUEgaiEFIAZBBGshBiABLQADIAl0IApqIQogAUEEaiEBC0EAIQkgCEEEcQRAIAogBygCIEcNAgtBACEFCyAHQdD+ADYCBEEBIQQgCSEKDAMLIAdB0f4ANgIEIAxBjQw2AhggBygCBCEIDAELC0EAIQYgDSEECyAMIA82AhAgDCAQNgIMIAwgBjYCBCAMIAE2AgAgByAFNgKIASAHIAo2AoQBAkAgBygCLA0AIA8gFkYNAiAHKAIEIgFB0P4ASw0CIAFBzv4ASQ0ACwJ/IBYgD2shCiAHKAIMQQRxIQkCQAJAAkAgDCgCHCIDKAI4Ig1FBEBBASEIIAMgAygCACIBKAIgIAEoAiggAygCmEdBASADKAIodGpBARAoIg02AjggDUUNAQsgAygCLCIGRQRAIANCADcDMCADQQEgAygCKHQiBjYCLAsgBiAKTQRAAkAgCQRAAkAgBiAKTw0AIAogBmshBSAQIAprIQEgDCgCHCIGKAIUBEAgBkFAayABIAVBAEHYgAEoAgARCAAMAQsgBiAGKAIcIAEgBUHAgAEoAgARAAAiATYCHCAMIAE2AjALIAMoAiwiDUUNASAQIA1rIQUgAygCOCEBIAwoAhwiBigCFARAIAZBQGsgASAFIA1B3IABKAIAEQgADAILIAYgBigCHCABIAUgDUHEgAEoAgARBAAiATYCHCAMIAE2AjAMAQsgDSAQIAZrIAYQBxoLIANBADYCNCADIAMoAiw2AjBBAAwECyAKIAYgAygCNCIFayIBIAEgCksbIQsgECAKayEGIAUgDWohBQJAIAkEQAJAIAtFDQAgDCgCHCIBKAIUBEAgAUFAayAFIAYgC0HcgAEoAgARCAAMAQsgASABKAIcIAUgBiALQcSAASgCABEEACIBNgIcIAwgATYCMAsgCiALayIFRQ0BIBAgBWshBiADKAI4IQEgDCgCHCINKAIUBEAgDUFAayABIAYgBUHcgAEoAgARCAAMBQsgDSANKAIcIAEgBiAFQcSAASgCABEEACIBNgIcIAwgATYCMAwECyAFIAYgCxAHGiAKIAtrIgUNAgtBACEIIANBACADKAI0IAtqIgUgBSADKAIsIgFGGzYCNCABIAMoAjAiAU0NACADIAEgC2o2AjALIAgMAgsgAygCOCAQIAVrIAUQBxoLIAMgBTYCNCADIAMoAiw2AjBBAAtFBEAgDCgCECEPIAwoAgQhFyAHKAKIAQwDCyAHQdL+ADYCBAtBfCEXDAILIAYhFyAFCyEFIAwgICAXayIBIAwoAghqNgIIIAwgFiAPayIGIAwoAhRqNgIUIAcgBygCICAGajYCICAMIAcoAghBAEdBBnQgBWogBygCBCIFQb/+AEZBB3RqQYACIAVBwv4ARkEIdCAFQcf+AEYbajYCLCAEIARBeyAEGyABIAZyGyEXCyAUQRBqJAAgFwshASACIAIpAwAgADUCIH03AwACQAJAAkACQCABQQVqDgcBAgICAgMAAgtBAQ8LIAAoAhQNAEEDDwsgACgCACIABEAgACABNgIEIABBDTYCAAtBAiEBCyABCwkAIABBAToADAtEAAJAIAJC/////w9YBEAgACgCFEUNAQsgACgCACIABEAgAEEANgIEIABBEjYCAAtBAA8LIAAgATYCECAAIAI+AhRBAQu5AQEEfyAAQRBqIQECfyAALQAEBEAgARCEAQwBC0F+IQMCQCABRQ0AIAEoAiBFDQAgASgCJCIERQ0AIAEoAhwiAkUNACACKAIAIAFHDQAgAigCBEG0/gBrQR9LDQAgAigCOCIDBEAgBCABKAIoIAMQHiABKAIkIQQgASgCHCECCyAEIAEoAiggAhAeQQAhAyABQQA2AhwLIAMLIgEEQCAAKAIAIgAEQCAAIAE2AgQgAEENNgIACwsgAUUL0gwBBn8gAEIANwIQIABCADcCHCAAQRBqIQICfyAALQAEBEAgACgCCCEBQesMLQAAQTFGBH8Cf0F+IQMCQCACRQ0AIAJBADYCGCACKAIgIgRFBEAgAkEANgIoIAJBJzYCIEEnIQQLIAIoAiRFBEAgAkEoNgIkC0EGIAEgAUF/RhsiBUEASA0AIAVBCUoNAEF8IQMgBCACKAIoQQFB0C4QKCIBRQ0AIAIgATYCHCABIAI2AgAgAUEPNgI0IAFCgICAgKAFNwIcIAFBADYCFCABQYCAAjYCMCABQf//ATYCOCABIAIoAiAgAigCKEGAgAJBAhAoNgJIIAEgAigCICACKAIoIAEoAjBBAhAoIgM2AkwgA0EAIAEoAjBBAXQQGSACKAIgIAIoAihBgIAEQQIQKCEDIAFBgIACNgLoLSABQQA2AkAgASADNgJQIAEgAigCICACKAIoQYCAAkEEECgiAzYCBCABIAEoAugtIgRBAnQ2AgwCQAJAIAEoAkhFDQAgASgCTEUNACABKAJQRQ0AIAMNAQsgAUGaBTYCICACQejAACgCADYCGCACEIQBGkF8DAILIAFBADYCjAEgASAFNgKIASABQgA3AyggASADIARqNgLsLSABIARBA2xBA2s2AvQtQX4hAwJAIAJFDQAgAigCIEUNACACKAIkRQ0AIAIoAhwiAUUNACABKAIAIAJHDQACQAJAIAEoAiAiBEE5aw45AQICAgICAgICAgICAQICAgECAgICAgICAgICAgICAgICAgECAgICAgICAgICAgECAgICAgICAgIBAAsgBEGaBUYNACAEQSpHDQELIAJBAjYCLCACQQA2AgggAkIANwIUIAFBADYCECABIAEoAgQ2AgggASgCFCIDQX9MBEAgAUEAIANrIgM2AhQLIAFBOUEqIANBAkYbNgIgIAIgA0ECRgR/IAFBoAFqQeSAASgCABEBAAVBAQs2AjAgAUF+NgIkIAFBADYCoC4gAUIANwOYLiABQYgXakGg0wA2AgAgASABQcwVajYCgBcgAUH8FmpBjNMANgIAIAEgAUHYE2o2AvQWIAFB8BZqQfjSADYCACABIAFB5AFqNgLoFiABEIgBQQAhAwsgAw0AIAIoAhwiAiACKAIwQQF0NgJEQQAhAyACKAJQQQBBgIAIEBkgAiACKAKIASIEQQxsIgFBtNgAai8BADYClAEgAiABQbDYAGovAQA2ApABIAIgAUGy2ABqLwEANgJ4IAIgAUG22ABqLwEANgJ0QfiAASgCACEFQeyAASgCACEGQYCBASgCACEBIAJCADcCbCACQgA3AmQgAkEANgI8IAJBADYChC4gAkIANwJUIAJBKSABIARBCUYiARs2AnwgAkEqIAYgARs2AoABIAJBKyAFIAEbNgKEAQsgAwsFQXoLDAELAn9BekHrDC0AAEExRw0AGkF+IAJFDQAaIAJBADYCGCACKAIgIgNFBEAgAkEANgIoIAJBJzYCIEEnIQMLIAIoAiRFBEAgAkEoNgIkC0F8IAMgAigCKEEBQaDHABAoIgRFDQAaIAIgBDYCHCAEQQA2AjggBCACNgIAIARBtP4ANgIEIARBzIABKAIAEQkANgKYR0F+IQMCQCACRQ0AIAIoAiBFDQAgAigCJCIFRQ0AIAIoAhwiAUUNACABKAIAIAJHDQAgASgCBEG0/gBrQR9LDQACQAJAIAEoAjgiBgRAIAEoAihBD0cNAQsgAUEPNgIoIAFBADYCDAwBCyAFIAIoAiggBhAeIAFBADYCOCACKAIgIQUgAUEPNgIoIAFBADYCDCAFRQ0BCyACKAIkRQ0AIAIoAhwiAUUNACABKAIAIAJHDQAgASgCBEG0/gBrQR9LDQBBACEDIAFBADYCNCABQgA3AiwgAUEANgIgIAJBADYCCCACQgA3AhQgASgCDCIFBEAgAiAFQQFxNgIwCyABQrT+ADcCBCABQgA3AoQBIAFBADYCJCABQoCAgoAQNwMYIAFCgICAgHA3AxAgAUKBgICAcDcCjEcgASABQfwKaiIFNgK4ASABIAU2ApwBIAEgBTYCmAELQQAgA0UNABogAigCJCACKAIoIAQQHiACQQA2AhwgAwsLIgIEQCAAKAIAIgAEQCAAIAI2AgQgAEENNgIACwsgAkULKQEBfyAALQAERQRAQQAPC0ECIQEgACgCCCIAQQNOBH8gAEEHSgVBAgsLBgAgABAGC2MAQcgAEAkiAEUEQEGEhAEoAgAhASACBEAgAiABNgIEIAJBATYCAAsgAA8LIABBADoADCAAQQE6AAQgACACNgIAIABBADYCOCAAQgA3AzAgACABQQkgAUEBa0EJSRs2AgggAAukCgIIfwF+QfCAAUH0gAEgACgCdEGBCEkbIQYCQANAAkACfwJAIAAoAjxBhQJLDQAgABAvAkAgACgCPCICQYUCSw0AIAENAEEADwsgAkUNAiACQQRPDQBBAAwBCyAAIAAoAmggACgChAERAgALIQMgACAAKAJsOwFgQQIhAgJAIAA1AmggA619IgpCAVMNACAKIAAoAjBBhgJrrVUNACAAKAJwIAAoAnhPDQAgA0UNACAAIAMgBigCABECACICQQVLDQBBAiACIAAoAowBQQFGGyECCwJAIAAoAnAiA0EDSQ0AIAIgA0sNACAAIAAoAvAtIgJBAWo2AvAtIAAoAjwhBCACIAAoAuwtaiAAKAJoIgcgAC8BYEF/c2oiAjoAACAAIAAoAvAtIgVBAWo2AvAtIAUgACgC7C1qIAJBCHY6AAAgACAAKALwLSIFQQFqNgLwLSAFIAAoAuwtaiADQQNrOgAAIAAgACgCgC5BAWo2AoAuIANB/c4Aai0AAEECdCAAakHoCWoiAyADLwEAQQFqOwEAIAAgAkEBayICIAJBB3ZBgAJqIAJBgAJJG0GAywBqLQAAQQJ0akHYE2oiAiACLwEAQQFqOwEAIAAgACgCcCIFQQFrIgM2AnAgACAAKAI8IANrNgI8IAAoAvQtIQggACgC8C0hCSAEIAdqQQNrIgQgACgCaCICSwRAIAAgAkEBaiAEIAJrIgIgBUECayIEIAIgBEkbIAAoAoABEQUAIAAoAmghAgsgAEEANgJkIABBADYCcCAAIAIgA2oiBDYCaCAIIAlHDQJBACECIAAgACgCWCIDQQBOBH8gACgCSCADagVBAAsgBCADa0EAEA8gACAAKAJoNgJYIAAoAgAQCiAAKAIAKAIQDQIMAwsgACgCZARAIAAoAmggACgCSGpBAWstAAAhAyAAIAAoAvAtIgRBAWo2AvAtIAQgACgC7C1qQQA6AAAgACAAKALwLSIEQQFqNgLwLSAEIAAoAuwtakEAOgAAIAAgACgC8C0iBEEBajYC8C0gBCAAKALsLWogAzoAACAAIANBAnRqIgMgAy8B5AFBAWo7AeQBIAAoAvAtIAAoAvQtRgRAIAAgACgCWCIDQQBOBH8gACgCSCADagVBAAsgACgCaCADa0EAEA8gACAAKAJoNgJYIAAoAgAQCgsgACACNgJwIAAgACgCaEEBajYCaCAAIAAoAjxBAWs2AjwgACgCACgCEA0CQQAPBSAAQQE2AmQgACACNgJwIAAgACgCaEEBajYCaCAAIAAoAjxBAWs2AjwMAgsACwsgACgCZARAIAAoAmggACgCSGpBAWstAAAhAiAAIAAoAvAtIgNBAWo2AvAtIAMgACgC7C1qQQA6AAAgACAAKALwLSIDQQFqNgLwLSADIAAoAuwtakEAOgAAIAAgACgC8C0iA0EBajYC8C0gAyAAKALsLWogAjoAACAAIAJBAnRqIgIgAi8B5AFBAWo7AeQBIAAoAvAtIAAoAvQtRhogAEEANgJkCyAAIAAoAmgiA0ECIANBAkkbNgKELiABQQRGBEAgACAAKAJYIgFBAE4EfyAAKAJIIAFqBUEACyADIAFrQQEQDyAAIAAoAmg2AlggACgCABAKQQNBAiAAKAIAKAIQGw8LIAAoAvAtBEBBACECIAAgACgCWCIBQQBOBH8gACgCSCABagVBAAsgAyABa0EAEA8gACAAKAJoNgJYIAAoAgAQCiAAKAIAKAIQRQ0BC0EBIQILIAIL2BACEH8BfiAAKAKIAUEFSCEOA0ACQAJ/AkACQAJAAn8CQAJAIAAoAjxBhQJNBEAgABAvIAAoAjwiA0GFAksNASABDQFBAA8LIA4NASAIIQMgBSEHIAohDSAGQf//A3FFDQEMAwsgA0UNA0EAIANBBEkNARoLIAAgACgCaEH4gAEoAgARAgALIQZBASECQQAhDSAAKAJoIgOtIAatfSISQgFTDQIgEiAAKAIwQYYCa61VDQIgBkUNAiAAIAZB8IABKAIAEQIAIgZBASAGQfz/A3EbQQEgACgCbCINQf//A3EgA0H//wNxSRshBiADIQcLAkAgACgCPCIEIAZB//8DcSICQQRqTQ0AIAZB//8DcUEDTQRAQQEgBkEBa0H//wNxIglFDQQaIANB//8DcSIEIAdBAWpB//8DcSIDSw0BIAAgAyAJIAQgA2tBAWogAyAJaiAESxtB7IABKAIAEQUADAELAkAgACgCeEEEdCACSQ0AIARBBEkNACAGQQFrQf//A3EiDCAHQQFqQf//A3EiBGohCSAEIANB//8DcSIDTwRAQeyAASgCACELIAMgCUkEQCAAIAQgDCALEQUADAMLIAAgBCADIARrQQFqIAsRBQAMAgsgAyAJTw0BIAAgAyAJIANrQeyAASgCABEFAAwBCyAGIAdqQf//A3EiA0UNACAAIANBAWtB+IABKAIAEQIAGgsgBgwCCyAAIAAoAmgiBUECIAVBAkkbNgKELiABQQRGBEBBACEDIAAgACgCWCIBQQBOBH8gACgCSCABagVBAAsgBSABa0EBEA8gACAAKAJoNgJYIAAoAgAQCkEDQQIgACgCACgCEBsPCyAAKALwLQRAQQAhAkEAIQMgACAAKAJYIgFBAE4EfyAAKAJIIAFqBUEACyAFIAFrQQAQDyAAIAAoAmg2AlggACgCABAKIAAoAgAoAhBFDQMLQQEhAgwCCyADIQdBAQshBEEAIQYCQCAODQAgACgCPEGHAkkNACACIAdB//8DcSIQaiIDIAAoAkRBhgJrTw0AIAAgAzYCaEEAIQogACADQfiAASgCABECACEFAn8CQCAAKAJoIgitIAWtfSISQgFTDQAgEiAAKAIwQYYCa61VDQAgBUUNACAAIAVB8IABKAIAEQIAIQYgAC8BbCIKIAhB//8DcSIFTw0AIAZB//8DcSIDQQRJDQAgCCAEQf//A3FBAkkNARogCCACIApBAWpLDQEaIAggAiAFQQFqSw0BGiAIIAAoAkgiCSACa0EBaiICIApqLQAAIAIgBWotAABHDQEaIAggCUEBayICIApqIgwtAAAgAiAFaiIPLQAARw0BGiAIIAUgCCAAKAIwQYYCayICa0H//wNxQQAgAiAFSRsiEU0NARogCCADQf8BSw0BGiAGIQUgCCECIAQhAyAIIAoiCUECSQ0BGgNAAkAgA0EBayEDIAVBAWohCyAJQQFrIQkgAkEBayECIAxBAWsiDC0AACAPQQFrIg8tAABHDQAgA0H//wNxRQ0AIBEgAkH//wNxTw0AIAVB//8DcUH+AUsNACALIQUgCUH//wNxQQFLDQELCyAIIANB//8DcUEBSw0BGiAIIAtB//8DcUECRg0BGiAIQQFqIQggAyEEIAshBiAJIQogAgwBC0EBIQYgCAshBSAAIBA2AmgLAn8gBEH//wNxIgNBA00EQCAEQf//A3EiA0UNAyAAKAJIIAdB//8DcWotAAAhBCAAIAAoAvAtIgJBAWo2AvAtIAIgACgC7C1qQQA6AAAgACAAKALwLSICQQFqNgLwLSACIAAoAuwtakEAOgAAIAAgACgC8C0iAkEBajYC8C0gAiAAKALsLWogBDoAACAAIARBAnRqIgRB5AFqIAQvAeQBQQFqOwEAIAAgACgCPEEBazYCPCAAKALwLSICIAAoAvQtRiIEIANBAUYNARogACgCSCAHQQFqQf//A3FqLQAAIQkgACACQQFqNgLwLSAAKALsLSACakEAOgAAIAAgACgC8C0iAkEBajYC8C0gAiAAKALsLWpBADoAACAAIAAoAvAtIgJBAWo2AvAtIAIgACgC7C1qIAk6AAAgACAJQQJ0aiICQeQBaiACLwHkAUEBajsBACAAIAAoAjxBAWs2AjwgBCAAKALwLSICIAAoAvQtRmoiBCADQQJGDQEaIAAoAkggB0ECakH//wNxai0AACEHIAAgAkEBajYC8C0gACgC7C0gAmpBADoAACAAIAAoAvAtIgJBAWo2AvAtIAIgACgC7C1qQQA6AAAgACAAKALwLSICQQFqNgLwLSACIAAoAuwtaiAHOgAAIAAgB0ECdGoiB0HkAWogBy8B5AFBAWo7AQAgACAAKAI8QQFrNgI8IAQgACgC8C0gACgC9C1GagwBCyAAIAAoAvAtIgJBAWo2AvAtIAIgACgC7C1qIAdB//8DcSANQf//A3FrIgc6AAAgACAAKALwLSICQQFqNgLwLSACIAAoAuwtaiAHQQh2OgAAIAAgACgC8C0iAkEBajYC8C0gAiAAKALsLWogBEEDazoAACAAIAAoAoAuQQFqNgKALiADQf3OAGotAABBAnQgAGpB6AlqIgQgBC8BAEEBajsBACAAIAdBAWsiBCAEQQd2QYACaiAEQYACSRtBgMsAai0AAEECdGpB2BNqIgQgBC8BAEEBajsBACAAIAAoAjwgA2s2AjwgACgC8C0gACgC9C1GCyEEIAAgACgCaCADaiIHNgJoIARFDQFBACECQQAhBCAAIAAoAlgiA0EATgR/IAAoAkggA2oFQQALIAcgA2tBABAPIAAgACgCaDYCWCAAKAIAEAogACgCACgCEA0BCwsgAgu0BwIEfwF+AkADQAJAAkACQAJAIAAoAjxBhQJNBEAgABAvAkAgACgCPCICQYUCSw0AIAENAEEADwsgAkUNBCACQQRJDQELIAAgACgCaEH4gAEoAgARAgAhAiAANQJoIAKtfSIGQgFTDQAgBiAAKAIwQYYCa61VDQAgAkUNACAAIAJB8IABKAIAEQIAIgJBBEkNACAAIAAoAvAtIgNBAWo2AvAtIAMgACgC7C1qIAAoAmggACgCbGsiAzoAACAAIAAoAvAtIgRBAWo2AvAtIAQgACgC7C1qIANBCHY6AAAgACAAKALwLSIEQQFqNgLwLSAEIAAoAuwtaiACQQNrOgAAIAAgACgCgC5BAWo2AoAuIAJB/c4Aai0AAEECdCAAakHoCWoiBCAELwEAQQFqOwEAIAAgA0EBayIDIANBB3ZBgAJqIANBgAJJG0GAywBqLQAAQQJ0akHYE2oiAyADLwEAQQFqOwEAIAAgACgCPCACayIFNgI8IAAoAvQtIQMgACgC8C0hBCAAKAJ4IAJPQQAgBUEDSxsNASAAIAAoAmggAmoiAjYCaCAAIAJBAWtB+IABKAIAEQIAGiADIARHDQQMAgsgACgCSCAAKAJoai0AACECIAAgACgC8C0iA0EBajYC8C0gAyAAKALsLWpBADoAACAAIAAoAvAtIgNBAWo2AvAtIAMgACgC7C1qQQA6AAAgACAAKALwLSIDQQFqNgLwLSADIAAoAuwtaiACOgAAIAAgAkECdGoiAkHkAWogAi8B5AFBAWo7AQAgACAAKAI8QQFrNgI8IAAgACgCaEEBajYCaCAAKALwLSAAKAL0LUcNAwwBCyAAIAAoAmhBAWoiBTYCaCAAIAUgAkEBayICQeyAASgCABEFACAAIAAoAmggAmo2AmggAyAERw0CC0EAIQNBACECIAAgACgCWCIEQQBOBH8gACgCSCAEagVBAAsgACgCaCAEa0EAEA8gACAAKAJoNgJYIAAoAgAQCiAAKAIAKAIQDQEMAgsLIAAgACgCaCIEQQIgBEECSRs2AoQuIAFBBEYEQEEAIQIgACAAKAJYIgFBAE4EfyAAKAJIIAFqBUEACyAEIAFrQQEQDyAAIAAoAmg2AlggACgCABAKQQNBAiAAKAIAKAIQGw8LIAAoAvAtBEBBACEDQQAhAiAAIAAoAlgiAUEATgR/IAAoAkggAWoFQQALIAQgAWtBABAPIAAgACgCaDYCWCAAKAIAEAogACgCACgCEEUNAQtBASEDCyADC80JAgl/An4gAUEERiEGIAAoAiwhAgJAAkACQCABQQRGBEAgAkECRg0CIAIEQCAAQQAQUCAAQQA2AiwgACAAKAJoNgJYIAAoAgAQCiAAKAIAKAIQRQ0ECyAAIAYQTyAAQQI2AiwMAQsgAg0BIAAoAjxFDQEgACAGEE8gAEEBNgIsCyAAIAAoAmg2AlgLQQJBASABQQRGGyEKA0ACQCAAKAIMIAAoAhBBCGpLDQAgACgCABAKIAAoAgAiAigCEA0AQQAhAyABQQRHDQIgAigCBA0CIAAoAqAuDQIgACgCLEVBAXQPCwJAAkAgACgCPEGFAk0EQCAAEC8CQCAAKAI8IgNBhQJLDQAgAQ0AQQAPCyADRQ0CIAAoAiwEfyADBSAAIAYQTyAAIAo2AiwgACAAKAJoNgJYIAAoAjwLQQRJDQELIAAgACgCaEH4gAEoAgARAgAhBCAAKAJoIgKtIAStfSILQgFTDQAgCyAAKAIwQYYCa61VDQAgAiAAKAJIIgJqIgMvAAAgAiAEaiICLwAARw0AIANBAmogAkECakHQgAEoAgARAgBBAmoiA0EESQ0AIAAoAjwiAiADIAIgA0kbIgJBggIgAkGCAkkbIgdB/c4Aai0AACICQQJ0IgRBhMkAajMBACEMIARBhskAai8BACEDIAJBCGtBE00EQCAHQQNrIARBgNEAaigCAGutIAOthiAMhCEMIARBsNYAaigCACADaiEDCyAAKAKgLiEFIAMgC6dBAWsiCCAIQQd2QYACaiAIQYACSRtBgMsAai0AACICQQJ0IglBgsoAai8BAGohBCAJQYDKAGozAQAgA62GIAyEIQsgACkDmC4hDAJAIAUgAkEESQR/IAQFIAggCUGA0gBqKAIAa60gBK2GIAuEIQsgCUGw1wBqKAIAIARqCyICaiIDQT9NBEAgCyAFrYYgDIQhCwwBCyAFQcAARgRAIAAoAgQgACgCEGogDDcAACAAIAAoAhBBCGo2AhAgAiEDDAELIAAoAgQgACgCEGogCyAFrYYgDIQ3AAAgACAAKAIQQQhqNgIQIANBQGohAyALQcAAIAVrrYghCwsgACALNwOYLiAAIAM2AqAuIAAgACgCPCAHazYCPCAAIAAoAmggB2o2AmgMAgsgACgCSCAAKAJoai0AAEECdCICQYDBAGozAQAhCyAAKQOYLiEMAkAgACgCoC4iBCACQYLBAGovAQAiAmoiA0E/TQRAIAsgBK2GIAyEIQsMAQsgBEHAAEYEQCAAKAIEIAAoAhBqIAw3AAAgACAAKAIQQQhqNgIQIAIhAwwBCyAAKAIEIAAoAhBqIAsgBK2GIAyENwAAIAAgACgCEEEIajYCECADQUBqIQMgC0HAACAEa62IIQsLIAAgCzcDmC4gACADNgKgLiAAIAAoAmhBAWo2AmggACAAKAI8QQFrNgI8DAELCyAAIAAoAmgiAkECIAJBAkkbNgKELiAAKAIsIQIgAUEERgRAAkAgAkUNACAAQQEQUCAAQQA2AiwgACAAKAJoNgJYIAAoAgAQCiAAKAIAKAIQDQBBAg8LQQMPCyACBEBBACEDIABBABBQIABBADYCLCAAIAAoAmg2AlggACgCABAKIAAoAgAoAhBFDQELQQEhAwsgAwucAQEFfyACQQFOBEAgAiAAKAJIIAFqIgNqQQJqIQQgA0ECaiECIAAoAlQhAyAAKAJQIQUDQCAAIAItAAAgA0EFdEHg/wFxcyIDNgJUIAUgA0EBdGoiBi8BACIHIAFB//8DcUcEQCAAKAJMIAEgACgCOHFB//8DcUEBdGogBzsBACAGIAE7AQALIAFBAWohASACQQFqIgIgBEkNAAsLC1sBAn8gACAAKAJIIAFqLQACIAAoAlRBBXRB4P8BcXMiAjYCVCABIAAoAlAgAkEBdGoiAy8BACICRwRAIAAoAkwgACgCOCABcUEBdGogAjsBACADIAE7AQALIAILEwAgAUEFdEHg/wFxIAJB/wFxcwsGACABEAYLLwAjAEEQayIAJAAgAEEMaiABIAJsEIwBIQEgACgCDCECIABBEGokAEEAIAIgARsLjAoCAX4CfyMAQfAAayIGJAACQAJAAkACQAJAAkACQAJAIAQODwABBwIEBQYGBgYGBgYGAwYLQn8hBQJAIAAgBkHkAGpCDBARIgNCf1cEQCABBEAgASAAKAIMNgIAIAEgACgCEDYCBAsMAQsCQCADQgxSBEAgAQRAIAFBADYCBCABQRE2AgALDAELIAEoAhQhBEEAIQJCASEFA0AgBkHkAGogAmoiAiACLQAAIARB/f8DcSICQQJyIAJBA3NsQQh2cyICOgAAIAYgAjoAKCABAn8gASgCDEF/cyECQQAgBkEoaiIERQ0AGiACIARBAUHUgAEoAgARAAALQX9zIgI2AgwgASABKAIQIAJB/wFxakGFiKLAAGxBAWoiAjYCECAGIAJBGHY6ACggAQJ/IAEoAhRBf3MhAkEAIAZBKGoiBEUNABogAiAEQQFB1IABKAIAEQAAC0F/cyIENgIUIAVCDFIEQCAFpyECIAVCAXwhBQwBCwtCACEFIAAgBkEoahAhQQBIDQEgBigCUCEAIwBBEGsiAiQAIAIgADYCDCAGAn8gAkEMahCNASIARQRAIAZBITsBJEEADAELAn8gACgCFCIEQdAATgRAIARBCXQMAQsgAEHQADYCFEGAwAILIQQgBiAAKAIMIAQgACgCEEEFdGpqQaDAAWo7ASQgACgCBEEFdCAAKAIIQQt0aiAAKAIAQQF2ags7ASYgAkEQaiQAIAYtAG8iACAGLQBXRg0BIAYtACcgAEYNASABBEAgAUEANgIEIAFBGzYCAAsLQn8hBQsgBkHwAGokACAFDwtCfyEFIAAgAiADEBEiA0J/VwRAIAEEQCABIAAoAgw2AgAgASAAKAIQNgIECwwGCyMAQRBrIgAkAAJAIANQDQAgASgCFCEEIAJFBEBCASEFA0AgACACIAdqLQAAIARB/f8DcSIEQQJyIARBA3NsQQh2czoADyABAn8gASgCDEF/cyEEQQAgAEEPaiIHRQ0AGiAEIAdBAUHUgAEoAgARAAALQX9zIgQ2AgwgASABKAIQIARB/wFxakGFiKLAAGxBAWoiBDYCECAAIARBGHY6AA8gAQJ/IAEoAhRBf3MhBEEAIABBD2oiB0UNABogBCAHQQFB1IABKAIAEQAAC0F/cyIENgIUIAMgBVENAiAFpyEHIAVCAXwhBQwACwALQgEhBQNAIAAgAiAHai0AACAEQf3/A3EiBEECciAEQQNzbEEIdnMiBDoADyACIAdqIAQ6AAAgAQJ/IAEoAgxBf3MhBEEAIABBD2oiB0UNABogBCAHQQFB1IABKAIAEQAAC0F/cyIENgIMIAEgASgCECAEQf8BcWpBhYiiwABsQQFqIgQ2AhAgACAEQRh2OgAPIAECfyABKAIUQX9zIQRBACAAQQ9qIgdFDQAaIAQgB0EBQdSAASgCABEAAAtBf3MiBDYCFCADIAVRDQEgBachByAFQgF8IQUMAAsACyAAQRBqJAAgAyEFDAULIAJBADsBMiACIAIpAwAiA0KAAYQ3AwAgA0IIg1ANBCACIAIpAyBCDH03AyAMBAsgBkKFgICAcDcDECAGQoOAgIDAADcDCCAGQoGAgIAgNwMAQQAgBhAkIQUMAwsgA0IIWgR+IAIgASgCADYCACACIAEoAgQ2AgRCCAVCfwshBQwCCyABEAYMAQsgAQRAIAFBADYCBCABQRI2AgALQn8hBQsgBkHwAGokACAFC60DAgJ/An4jAEEQayIGJAACQAJAAkAgBEUNACABRQ0AIAJBAUYNAQtBACEDIABBCGoiAARAIABBADYCBCAAQRI2AgALDAELIANBAXEEQEEAIQMgAEEIaiIABEAgAEEANgIEIABBGDYCAAsMAQtBGBAJIgVFBEBBACEDIABBCGoiAARAIABBADYCBCAAQQ42AgALDAELIAVBADYCCCAFQgA3AgAgBUGQ8dmiAzYCFCAFQvis0ZGR8dmiIzcCDAJAIAQQIiICRQ0AIAKtIQhBACEDQYfTru5+IQJCASEHA0AgBiADIARqLQAAOgAPIAUgBkEPaiIDBH8gAiADQQFB1IABKAIAEQAABUEAC0F/cyICNgIMIAUgBSgCECACQf8BcWpBhYiiwABsQQFqIgI2AhAgBiACQRh2OgAPIAUCfyAFKAIUQX9zIQJBACAGQQ9qIgNFDQAaIAIgA0EBQdSAASgCABEAAAtBf3M2AhQgByAIUQ0BIAUoAgxBf3MhAiAHpyEDIAdCAXwhBwwACwALIAAgAUElIAUQQiIDDQAgBRAGQQAhAwsgBkEQaiQAIAMLnRoCBn4FfyMAQdAAayILJAACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQCADDhQFBhULAwQJDgACCBAKDw0HEQERDBELAkBByAAQCSIBBEAgAUIANwMAIAFCADcDMCABQQA2AiggAUIANwMgIAFCADcDGCABQgA3AxAgAUIANwMIIAFCADcDOCABQQgQCSIDNgIEIAMNASABEAYgAARAIABBADYCBCAAQQ42AgALCyAAQQA2AhQMFAsgA0IANwMAIAAgATYCFCABQUBrQgA3AwAgAUIANwM4DBQLAkACQCACUARAQcgAEAkiA0UNFCADQgA3AwAgA0IANwMwIANBADYCKCADQgA3AyAgA0IANwMYIANCADcDECADQgA3AwggA0IANwM4IANBCBAJIgE2AgQgAQ0BIAMQBiAABEAgAEEANgIEIABBDjYCAAsMFAsgAiAAKAIQIgEpAzBWBEAgAARAIABBADYCBCAAQRI2AgALDBQLIAEoAigEQCAABEAgAEEANgIEIABBHTYCAAsMFAsgASgCBCEDAkAgASkDCCIGQgF9IgdQDQADQAJAIAIgAyAHIAR9QgGIIAR8IgWnQQN0aikDAFQEQCAFQgF9IQcMAQsgBSAGUQRAIAYhBQwDCyADIAVCAXwiBKdBA3RqKQMAIAJWDQILIAQhBSAEIAdUDQALCwJAIAIgAyAFpyIKQQN0aikDAH0iBFBFBEAgASgCACIDIApBBHRqKQMIIQcMAQsgASgCACIDIAVCAX0iBadBBHRqKQMIIgchBAsgAiAHIAR9VARAIAAEQCAAQQA2AgQgAEEcNgIACwwUCyADIAVCAXwiBUEAIAAQiQEiA0UNEyADKAIAIAMoAggiCkEEdGpBCGsgBDcDACADKAIEIApBA3RqIAI3AwAgAyACNwMwIAMgASkDGCIGIAMpAwgiBEIBfSIHIAYgB1QbNwMYIAEgAzYCKCADIAE2AiggASAENwMgIAMgBTcDIAwBCyABQgA3AwALIAAgAzYCFCADIAQ3A0AgAyACNwM4QgAhBAwTCyAAKAIQIgEEQAJAIAEoAigiA0UEQCABKQMYIQIMAQsgA0EANgIoIAEoAihCADcDICABIAEpAxgiAiABKQMgIgUgAiAFVhsiAjcDGAsgASkDCCACVgRAA0AgASgCACACp0EEdGooAgAQBiACQgF8IgIgASkDCFQNAAsLIAEoAgAQBiABKAIEEAYgARAGCyAAKAIUIQEgAEEANgIUIAAgATYCEAwSCyACQghaBH4gASAAKAIANgIAIAEgACgCBDYCBEIIBUJ/CyEEDBELIAAoAhAiAQRAAkAgASgCKCIDRQRAIAEpAxghAgwBCyADQQA2AiggASgCKEIANwMgIAEgASkDGCICIAEpAyAiBSACIAVWGyICNwMYCyABKQMIIAJWBEADQCABKAIAIAKnQQR0aigCABAGIAJCAXwiAiABKQMIVA0ACwsgASgCABAGIAEoAgQQBiABEAYLIAAoAhQiAQRAAkAgASgCKCIDRQRAIAEpAxghAgwBCyADQQA2AiggASgCKEIANwMgIAEgASkDGCICIAEpAyAiBSACIAVWGyICNwMYCyABKQMIIAJWBEADQCABKAIAIAKnQQR0aigCABAGIAJCAXwiAiABKQMIVA0ACwsgASgCABAGIAEoAgQQBiABEAYLIAAQBgwQCyAAKAIQIgBCADcDOCAAQUBrQgA3AwAMDwsgAkJ/VwRAIAAEQCAAQQA2AgQgAEESNgIACwwOCyACIAAoAhAiAykDMCADKQM4IgZ9IgUgAiAFVBsiBVANDiABIAMpA0AiB6ciAEEEdCIBIAMoAgBqIgooAgAgBiADKAIEIABBA3RqKQMAfSICp2ogBSAKKQMIIAJ9IgYgBSAGVBsiBKcQByEKIAcgBCADKAIAIgAgAWopAwggAn1RrXwhAiAFIAZWBEADQCAKIASnaiAAIAKnQQR0IgFqIgAoAgAgBSAEfSIGIAApAwgiByAGIAdUGyIGpxAHGiACIAYgAygCACIAIAFqKQMIUa18IQIgBSAEIAZ8IgRWDQALCyADIAI3A0AgAyADKQM4IAR8NwM4DA4LQn8hBEHIABAJIgNFDQ0gA0IANwMAIANCADcDMCADQQA2AiggA0IANwMgIANCADcDGCADQgA3AxAgA0IANwMIIANCADcDOCADQQgQCSIBNgIEIAFFBEAgAxAGIAAEQCAAQQA2AgQgAEEONgIACwwOCyABQgA3AwAgACgCECIBBEACQCABKAIoIgpFBEAgASkDGCEEDAELIApBADYCKCABKAIoQgA3AyAgASABKQMYIgIgASkDICIFIAIgBVYbIgQ3AxgLIAEpAwggBFYEQANAIAEoAgAgBKdBBHRqKAIAEAYgBEIBfCIEIAEpAwhUDQALCyABKAIAEAYgASgCBBAGIAEQBgsgACADNgIQQgAhBAwNCyAAKAIUIgEEQAJAIAEoAigiA0UEQCABKQMYIQIMAQsgA0EANgIoIAEoAihCADcDICABIAEpAxgiAiABKQMgIgUgAiAFVhsiAjcDGAsgASkDCCACVgRAA0AgASgCACACp0EEdGooAgAQBiACQgF8IgIgASkDCFQNAAsLIAEoAgAQBiABKAIEEAYgARAGCyAAQQA2AhQMDAsgACgCECIDKQM4IAMpAzAgASACIAAQRCIHQgBTDQogAyAHNwM4AkAgAykDCCIGQgF9IgJQDQAgAygCBCEAA0ACQCAHIAAgAiAEfUIBiCAEfCIFp0EDdGopAwBUBEAgBUIBfSECDAELIAUgBlEEQCAGIQUMAwsgACAFQgF8IgSnQQN0aikDACAHVg0CCyAEIQUgAiAEVg0ACwsgAyAFNwNAQgAhBAwLCyAAKAIUIgMpAzggAykDMCABIAIgABBEIgdCAFMNCSADIAc3AzgCQCADKQMIIgZCAX0iAlANACADKAIEIQADQAJAIAcgACACIAR9QgGIIAR8IgWnQQN0aikDAFQEQCAFQgF9IQIMAQsgBSAGUQRAIAYhBQwDCyAAIAVCAXwiBKdBA3RqKQMAIAdWDQILIAQhBSACIARWDQALCyADIAU3A0BCACEEDAoLIAJCN1gEQCAABEAgAEEANgIEIABBEjYCAAsMCQsgARAqIAEgACgCDDYCKCAAKAIQKQMwIQIgAUEANgIwIAEgAjcDICABIAI3AxggAULcATcDAEI4IQQMCQsgACABKAIANgIMDAgLIAtBQGtBfzYCACALQouAgICwAjcDOCALQoyAgIDQATcDMCALQo+AgICgATcDKCALQpGAgICQATcDICALQoeAgICAATcDGCALQoWAgIDgADcDECALQoOAgIDAADcDCCALQoGAgIAgNwMAQQAgCxAkIQQMBwsgACgCECkDOCIEQn9VDQYgAARAIABBPTYCBCAAQR42AgALDAULIAAoAhQpAzgiBEJ/VQ0FIAAEQCAAQT02AgQgAEEeNgIACwwEC0J/IQQgAkJ/VwRAIAAEQCAAQQA2AgQgAEESNgIACwwFCyACIAAoAhQiAykDOCACfCIFQv//A3wiBFYEQCAABEAgAEEANgIEIABBEjYCAAsMBAsCQCAFIAMoAgQiCiADKQMIIganQQN0aikDACIHWA0AAkAgBCAHfUIQiCAGfCIIIAMpAxAiCVgNAEIQIAkgCVAbIQUDQCAFIgRCAYYhBSAEIAhUDQALIAQgCVQNACADKAIAIASnIgpBBHQQNCIMRQ0DIAMgDDYCACADKAIEIApBA3RBCGoQNCIKRQ0DIAMgBDcDECADIAo2AgQgAykDCCEGCyAGIAhaDQAgAygCACEMA0AgDCAGp0EEdGoiDUGAgAQQCSIONgIAIA5FBEAgAARAIABBADYCBCAAQQ42AgALDAYLIA1CgIAENwMIIAMgBkIBfCIFNwMIIAogBadBA3RqIAdCgIAEfCIHNwMAIAMpAwgiBiAIVA0ACwsgAykDQCEFIAMpAzghBwJAIAJQBEBCACEEDAELIAWnIgBBBHQiDCADKAIAaiINKAIAIAcgCiAAQQN0aikDAH0iBqdqIAEgAiANKQMIIAZ9IgcgAiAHVBsiBKcQBxogBSAEIAMoAgAiACAMaikDCCAGfVGtfCEFIAIgB1YEQANAIAAgBadBBHQiCmoiACgCACABIASnaiACIAR9IgYgACkDCCIHIAYgB1QbIganEAcaIAUgBiADKAIAIgAgCmopAwhRrXwhBSAEIAZ8IgQgAlQNAAsLIAMpAzghBwsgAyAFNwNAIAMgBCAHfCICNwM4IAIgAykDMFgNBCADIAI3AzAMBAsgAARAIABBADYCBCAAQRw2AgALDAILIAAEQCAAQQA2AgQgAEEONgIACyAABEAgAEEANgIEIABBDjYCAAsMAQsgAEEANgIUC0J/IQQLIAtB0ABqJAAgBAtIAQF/IABCADcCBCAAIAE2AgACQCABQQBIDQBBsBMoAgAgAUwNACABQQJ0QcATaigCAEEBRw0AQYSEASgCACECCyAAIAI2AgQLDgAgAkGx893xeWxBEHYLvgEAIwBBEGsiACQAIABBADoACEGAgQFBAjYCAEH8gAFBAzYCAEH4gAFBBDYCAEH0gAFBBTYCAEHwgAFBBjYCAEHsgAFBBzYCAEHogAFBCDYCAEHkgAFBCTYCAEHggAFBCjYCAEHcgAFBCzYCAEHYgAFBDDYCAEHUgAFBDTYCAEHQgAFBDjYCAEHMgAFBDzYCAEHIgAFBEDYCAEHEgAFBETYCAEHAgAFBEjYCACAAQRBqJAAgAkGx893xeWxBEHYLuQEBAX8jAEEQayIBJAAgAUEAOgAIQYCBAUECNgIAQfyAAUEDNgIAQfiAAUEENgIAQfSAAUEFNgIAQfCAAUEGNgIAQeyAAUEHNgIAQeiAAUEINgIAQeSAAUEJNgIAQeCAAUEKNgIAQdyAAUELNgIAQdiAAUEMNgIAQdSAAUENNgIAQdCAAUEONgIAQcyAAUEPNgIAQciAAUEQNgIAQcSAAUERNgIAQcCAAUESNgIAIAAQjgEgAUEQaiQAC78BAQF/IwBBEGsiAiQAIAJBADoACEGAgQFBAjYCAEH8gAFBAzYCAEH4gAFBBDYCAEH0gAFBBTYCAEHwgAFBBjYCAEHsgAFBBzYCAEHogAFBCDYCAEHkgAFBCTYCAEHggAFBCjYCAEHcgAFBCzYCAEHYgAFBDDYCAEHUgAFBDTYCAEHQgAFBDjYCAEHMgAFBDzYCAEHIgAFBEDYCAEHEgAFBETYCAEHAgAFBEjYCACAAIAEQkAEhACACQRBqJAAgAAu+AQEBfyMAQRBrIgIkACACQQA6AAhBgIEBQQI2AgBB/IABQQM2AgBB+IABQQQ2AgBB9IABQQU2AgBB8IABQQY2AgBB7IABQQc2AgBB6IABQQg2AgBB5IABQQk2AgBB4IABQQo2AgBB3IABQQs2AgBB2IABQQw2AgBB1IABQQ02AgBB0IABQQ42AgBBzIABQQ82AgBByIABQRA2AgBBxIABQRE2AgBBwIABQRI2AgAgACABEFohACACQRBqJAAgAAu+AQEBfyMAQRBrIgIkACACQQA6AAhBgIEBQQI2AgBB/IABQQM2AgBB+IABQQQ2AgBB9IABQQU2AgBB8IABQQY2AgBB7IABQQc2AgBB6IABQQg2AgBB5IABQQk2AgBB4IABQQo2AgBB3IABQQs2AgBB2IABQQw2AgBB1IABQQ02AgBB0IABQQ42AgBBzIABQQ82AgBByIABQRA2AgBBxIABQRE2AgBBwIABQRI2AgAgACABEFshACACQRBqJAAgAAu9AQEBfyMAQRBrIgMkACADQQA6AAhBgIEBQQI2AgBB/IABQQM2AgBB+IABQQQ2AgBB9IABQQU2AgBB8IABQQY2AgBB7IABQQc2AgBB6IABQQg2AgBB5IABQQk2AgBB4IABQQo2AgBB3IABQQs2AgBB2IABQQw2AgBB1IABQQ02AgBB0IABQQ42AgBBzIABQQ82AgBByIABQRA2AgBBxIABQRE2AgBBwIABQRI2AgAgACABIAIQjwEgA0EQaiQAC4UBAgR/AX4jAEEQayIBJAACQCAAKQMwUARADAELA0ACQCAAIAVBACABQQ9qIAFBCGoQZiIEQX9GDQAgAS0AD0EDRw0AIAIgASgCCEGAgICAf3FBgICAgHpGaiECC0F/IQMgBEF/Rg0BIAIhAyAFQgF8IgUgACkDMFQNAAsLIAFBEGokACADCwuMdSUAQYAIC7ELaW5zdWZmaWNpZW50IG1lbW9yeQBuZWVkIGRpY3Rpb25hcnkALSsgICAwWDB4AFppcCBhcmNoaXZlIGluY29uc2lzdGVudABJbnZhbGlkIGFyZ3VtZW50AGludmFsaWQgbGl0ZXJhbC9sZW5ndGhzIHNldABpbnZhbGlkIGNvZGUgbGVuZ3RocyBzZXQAdW5rbm93biBoZWFkZXIgZmxhZ3Mgc2V0AGludmFsaWQgZGlzdGFuY2VzIHNldABpbnZhbGlkIGJpdCBsZW5ndGggcmVwZWF0AEZpbGUgYWxyZWFkeSBleGlzdHMAdG9vIG1hbnkgbGVuZ3RoIG9yIGRpc3RhbmNlIHN5bWJvbHMAaW52YWxpZCBzdG9yZWQgYmxvY2sgbGVuZ3RocwAlcyVzJXMAYnVmZmVyIGVycm9yAE5vIGVycm9yAHN0cmVhbSBlcnJvcgBUZWxsIGVycm9yAEludGVybmFsIGVycm9yAFNlZWsgZXJyb3IAV3JpdGUgZXJyb3IAZmlsZSBlcnJvcgBSZWFkIGVycm9yAFpsaWIgZXJyb3IAZGF0YSBlcnJvcgBDUkMgZXJyb3IAaW5jb21wYXRpYmxlIHZlcnNpb24AaW52YWxpZCBjb2RlIC0tIG1pc3NpbmcgZW5kLW9mLWJsb2NrAGluY29ycmVjdCBoZWFkZXIgY2hlY2sAaW5jb3JyZWN0IGxlbmd0aCBjaGVjawBpbmNvcnJlY3QgZGF0YSBjaGVjawBpbnZhbGlkIGRpc3RhbmNlIHRvbyBmYXIgYmFjawBoZWFkZXIgY3JjIG1pc21hdGNoADEuMi4xMy56bGliLW5nAGludmFsaWQgd2luZG93IHNpemUAUmVhZC1vbmx5IGFyY2hpdmUATm90IGEgemlwIGFyY2hpdmUAUmVzb3VyY2Ugc3RpbGwgaW4gdXNlAE1hbGxvYyBmYWlsdXJlAGludmFsaWQgYmxvY2sgdHlwZQBGYWlsdXJlIHRvIGNyZWF0ZSB0ZW1wb3JhcnkgZmlsZQBDYW4ndCBvcGVuIGZpbGUATm8gc3VjaCBmaWxlAFByZW1hdHVyZSBlbmQgb2YgZmlsZQBDYW4ndCByZW1vdmUgZmlsZQBpbnZhbGlkIGxpdGVyYWwvbGVuZ3RoIGNvZGUAaW52YWxpZCBkaXN0YW5jZSBjb2RlAHVua25vd24gY29tcHJlc3Npb24gbWV0aG9kAHN0cmVhbSBlbmQAQ29tcHJlc3NlZCBkYXRhIGludmFsaWQATXVsdGktZGlzayB6aXAgYXJjaGl2ZXMgbm90IHN1cHBvcnRlZABPcGVyYXRpb24gbm90IHN1cHBvcnRlZABFbmNyeXB0aW9uIG1ldGhvZCBub3Qgc3VwcG9ydGVkAENvbXByZXNzaW9uIG1ldGhvZCBub3Qgc3VwcG9ydGVkAEVudHJ5IGhhcyBiZWVuIGRlbGV0ZWQAQ29udGFpbmluZyB6aXAgYXJjaGl2ZSB3YXMgY2xvc2VkAENsb3NpbmcgemlwIGFyY2hpdmUgZmFpbGVkAFJlbmFtaW5nIHRlbXBvcmFyeSBmaWxlIGZhaWxlZABFbnRyeSBoYXMgYmVlbiBjaGFuZ2VkAE5vIHBhc3N3b3JkIHByb3ZpZGVkAFdyb25nIHBhc3N3b3JkIHByb3ZpZGVkAFVua25vd24gZXJyb3IgJWQAQUUAKG51bGwpADogAFBLBgcAUEsGBgBQSwUGAFBLAwQAUEsBAgAAAAA/BQAAwAcAAJMIAAB4CAAAbwUAAJEFAAB6BQAAsgUAAFYIAAAbBwAA1gQAAAsHAADqBgAAnAUAAMgGAACyCAAAHggAACgHAABHBAAAoAYAAGAFAAAuBAAAPgcAAD8IAAD+BwAAjgYAAMkIAADeCAAA5gcAALIGAABVBQAAqAcAACAAQcgTCxEBAAAAAQAAAAEAAAABAAAAAQBB7BMLCQEAAAABAAAAAgBBmBQLAQEAQbgUCwEBAEHSFAukLDomOyZlJmYmYyZgJiIg2CXLJdklQiZAJmomayY8JrolxCWVITwgtgCnAKwlqCGRIZMhkiGQIR8ilCGyJbwlIAAhACIAIwAkACUAJgAnACgAKQAqACsALAAtAC4ALwAwADEAMgAzADQANQA2ADcAOAA5ADoAOwA8AD0APgA/AEAAQQBCAEMARABFAEYARwBIAEkASgBLAEwATQBOAE8AUABRAFIAUwBUAFUAVgBXAFgAWQBaAFsAXABdAF4AXwBgAGEAYgBjAGQAZQBmAGcAaABpAGoAawBsAG0AbgBvAHAAcQByAHMAdAB1AHYAdwB4AHkAegB7AHwAfQB+AAIjxwD8AOkA4gDkAOAA5QDnAOoA6wDoAO8A7gDsAMQAxQDJAOYAxgD0APYA8gD7APkA/wDWANwAogCjAKUApyCSAeEA7QDzAPoA8QDRAKoAugC/ABAjrAC9ALwAoQCrALsAkSWSJZMlAiUkJWElYiVWJVUlYyVRJVclXSVcJVslECUUJTQlLCUcJQAlPCVeJV8lWiVUJWklZiVgJVAlbCVnJWglZCVlJVklWCVSJVMlayVqJRglDCWIJYQljCWQJYAlsQPfAJMDwAOjA8MDtQDEA6YDmAOpA7QDHiLGA7UDKSJhIrEAZSJkIiAjISP3AEgisAAZIrcAGiJ/ILIAoCWgAAAAAACWMAd3LGEO7rpRCZkZxG0Hj/RqcDWlY+mjlWSeMojbDqS43Hke6dXgiNnSlytMtgm9fLF+By2455Edv5BkELcd8iCwakhxufPeQb6EfdTaGuvk3W1RtdT0x4XTg1aYbBPAqGtkevli/ezJZYpPXAEU2WwGY2M9D/r1DQiNyCBuO14QaUzkQWDVcnFnotHkAzxH1ARL/YUN0mu1CqX6qLU1bJiyQtbJu9tA+bys42zYMnVc30XPDdbcWT3Rq6ww2SY6AN5RgFHXyBZh0L+19LQhI8SzVpmVus8Ppb24nrgCKAiIBV+y2QzGJOkLsYd8by8RTGhYqx1hwT0tZraQQdx2BnHbAbwg0pgqENXviYWxcR+1tgal5L+fM9S46KLJB3g0+QAPjqgJlhiYDuG7DWp/LT1tCJdsZJEBXGPm9FFra2JhbBzYMGWFTgBi8u2VBmx7pQEbwfQIglfED/XG2bBlUOm3Euq4vot8iLn83x3dYkkt2hXzfNOMZUzU+1hhsk3OUbU6dAC8o+Iwu9RBpd9K15XYPW3E0aT79NbTaulpQ/zZbjRGiGet0Lhg2nMtBETlHQMzX0wKqsl8Dd08cQVQqkECJxAQC76GIAzJJbVoV7OFbyAJ1Ga5n+Rhzg753l6YydkpIpjQsLSo18cXPbNZgQ20LjtcvbetbLrAIIO47bazv5oM4rYDmtKxdDlH1eqvd9KdFSbbBIMW3HMSC2PjhDtklD5qbQ2oWmp6C88O5J3/CZMnrgAKsZ4HfUSTD/DSowiHaPIBHv7CBmldV2L3y2dlgHE2bBnnBmtudhvU/uAr04laetoQzErdZ2/fufn5776OQ763F9WOsGDoo9bWfpPRocTC2DhS8t9P8We70WdXvKbdBrU/SzaySNorDdhMGwqv9koDNmB6BEHD72DfVd9nqO+ObjF5vmlGjLNhyxqDZryg0m8lNuJoUpV3DMwDRwu7uRYCIi8mBVW+O7rFKAu9spJatCsEarNcp//XwjHP0LWLntksHa7eW7DCZJsm8mPsnKNqdQqTbQKpBgmcPzYO64VnB3ITVwAFgkq/lRR6uOKuK7F7OBu2DJuO0pINvtXlt+/cfCHf2wvU0tOGQuLU8fiz3Whug9ofzRa+gVsmufbhd7Bvd0e3GOZaCIhwag//yjsGZlwLARH/nmWPaa5i+NP/a2FFz2wWeOIKoO7SDddUgwROwrMDOWEmZ6f3FmDQTUdpSdt3bj5KatGu3FrW2WYL30DwO9g3U668qcWeu95/z7JH6f+1MBzyvb2KwrrKMJOzU6ajtCQFNtC6kwbXzSlX3lS/Z9kjLnpms7hKYcQCG2hdlCtvKje+C7ShjgzDG98FWo3vAi0AAAAARjtnZYx2zsrKTamvWevtTh/QiivVnSOEk6ZE4bLW25307bz4PqAVV3ibcjLrPTbTrQZRtmdL+BkhcJ98JavG4GOQoYWp3Qgq7+ZvT3xAK646e0zL8DblZLYNggGXfR190UZ6GBsL07ddMLTSzpbwM4itl1ZC4D75BNtZnAtQ/BpNa5t/hyYy0MEdVbVSuxFUFIB2Md7N356Y9rj7uYYnh/+9QOI18OlNc8uOKOBtysmmVq2sbBsEAyogY2Yu+zr6aMBdn6KN9DDktpNVdxDXtDErsNH7Zhl+vV1+G5wt4WfaFoYCEFsvrVZgSMjFxgwpg/1rTEmwwuMPi6WGFqD4NVCbn1Ca1jb/3O1Rmk9LFXsJcHIewz3bsYUGvNSkdiOo4k1EzSgA7WJuO4oH/Z3O5rumqYNx6wAsN9BnSTMLPtV1MFmwv33wH/lGl3pq4NObLNu0/uaWHVGgrXo0gd3lSMfmgi0NqyuCS5BM59g2CAaeDW9jVEDGzBJ7oakd8AQvW8tjSpGGyuXXva2ARBvpYQIgjgTIbSerjlZAzq8m37LpHbjXI1AReGVrdh32zTL8sPZVmXq7/DY8gJtTOFvCz35gpaq0LQwF8hZrYGGwL4Eni0jk7cbhS6v9hi6KjRlSzLZ+Nwb715hAwLD902b0HJVdk3lfEDrWGStdsyxA8Wtqe5YOoDY/oeYNWMR1qxwlM5B7QPnd0u+/5rWKnpYq9titTZMS4OQ8VNuDWcd9x7iBRqDdSwsJcg0wbhcJ6zeLT9BQ7oWd+UHDpp4kUADaxRY7vaDcdhQPmk1zars97Bb9BotzN0si3HFwRbni1gFYpO1mPW6gz5Iom6j3JxANcWErahSrZsO77V2k3n774D84wIda8o0u9bS2SZCVxtbs0/2xiRmwGCZfi39DzC07oooWXMdAW/VoBmCSDQK7y5FEgKz0js0FW8j2Yj5bUCbfHWtButcm6BWRHY9wsG0QDPZWd2k8G97GeiC5o+mG/UKvvZonZfAziCPLVO064AlefNtuO7aWx5TwraDxYwvkECUwg3XvfSraqUZNv4g20sPODbWmBEAcCUJ7e2zR3T+Nl+ZY6F2r8UcbkJYiH0vPvllwqNuTPQF01QZmEUagIvAAm0WVytbsOozti1+tnRQj66ZzRiHr2uln0L2M9Hb5bbJNngh4ADenPjtQwjGw9UR3i5IhvcY7jvv9XOtoWxgKLmB/b+Qt1sCiFrGlg2Yu2cVdSbwPEOATSSuHdtqNw5ectqTyVvsNXRDAajgUGzOkUiBUwZht/W7eVpoLTfDe6gvLuY/BhhAgh713RabN6Dng9o9cKrsm82yAQZb/JgV3uR1iEnNQy701a6zYAAAAAFiA4tfxBrR0qYZWo+INaOm6jYo+EwvcnUuLPkqFHaEJ3Z1D3nQbFX0sm/eqZxDJ4D+QKzeWFn2UzpafQwo7QhNSu6DE+z32Z6O9FLDoNir6sLbILRkwno5BsHxZjybjGtemAc1+IFduJqC1uW0ri/M1q2kknC0/h8St3VAUdoQmTPZm8eVwMFK98NKF9nvsz677DhgHfVi7X/26bJFrJS/J68f4YG2RWzjtc4xzZk3GK+avEYJg+bLa4BtlHk3GNUbNJOLvS3JBt8uQlvxArtykwEwLDUYaqFXG+H+bUGc8w9CF62pW00gy1jGfeV0P1SHd7QKIW7uh0NtZdijsCE1wbOqa2eq8OYFqXu7K4WCkkmGCczvn1NBjZzYHrfGpRPVxS5Nc9x0wBHf/50/8wa0XfCN6vvp12eZ6lw4i10peeleoidPR/iqLURz9wNoit5hawGAx3JbDaVx0FKfK61f/SgmAVsxfIw5MvfRFx4O+HUdhabTBN8rsQdUdPJqMa2QabrzNnDgflRzayN6X5IKGFwZVL5FQ9ncRsiG5hy1i4QfPtUiBmRYQAXvBW4pFiwMKp1yqjPH/8gwTKDahznhuISyvx6d6DJ8nmNvUrKaRjCxERiWqEuV9KvAys7xvces8jaZCutsFGjo50lGxB5gJMeVPoLez7Pg3UTtQ2BGaCFjzTaHepe75Xkc5stV5c+pVm6RD080HG1Mv0NXFsJONRVJEJMME53xD5jA3yNh6b0g6rcbObA6eTo7ZWuNTiQJjsV6r5ef982UFKrjuO2Dgbtm3SeiPFBFobcPf/vKAh34QVy74RvR2eKQjPfOaaWVzeL7M9S4dlHXMykSulbwcLndrtaghyO0owx+mo/1V/iMfglelSSEPJav2wbM0tZkz1mIwtYDBaDViFiO+XFx7Pr6L0rjoKIo4Cv9OldevFhU1eL+TY9vnE4EMrJi/RvQYXZFdngsyBR7p5cuIdqaTCJRxOo7C0mIOIAUphR5PcQX8mNiDqjuAA0jseDQZ1yC0+wCJMq2j0bJPdJo5cT7CuZPpaz/FSjO/J539KbjepalaCQwvDKpUr+59HyTQN0ekMuDuImRDtqKGlHIPW8Qqj7kTgwnvsNuJDWeQAjMtyILR+mEEh1k5hGWO9xL6za+SGBoGFE65XpSsbhUfkiRNn3Dz5BkmULyZxIdsQp3xNMJ/Jp1EKYXFxMtSjk/1GNbPF89/SUFsJ8mju+lfPPix394vGFmIjEDZalsLUlQRU9K2xvpU4GWi1AKyZnnf4j75PTWXf2uWz/+JQYR0twvc9FXcdXIDfy3y4ajjZH7ru+ScPBJiyp9K4ihIAWkWAlnp9NXwb6J2qO9AoQAAAADhtlLvg2vUBWLdhuoG16gL52H65IW8fA5kCi7hDK5RF+0YA/iPxYUSbnPX/Qp5+Rzrz6vziRItGWikf/YYXKMu+erxwZs3dyt6gSXEHosLJf89Wcqd4N8gfFaNzxTy8jn1RKDWl5kmPHYvdNMSJVoy85MI3ZFOjjdw+NzYMLhGXdEOFLKz05JYUmXAtzZv7lbX2by5tQQ6U1SyaLw8FhdK3aBFpb99w09ey5GgOsG/Qdt37a65qmtEWBw5qyjk5XPJUrecq48xdko5Y5kuM014z4Ufl61YmX1M7suSJEq0ZMX85ounIWBhRpcyjiKdHG/DK06AofbIakBAmoVgcI26gcbfVeMbWb8CrQtQZqclsYcRd17lzPG0BHqjW2ze3K2NaI5C77UIqA4DWkdqCXSmi78mSelioKMI1PJMeCwulJmafHv7R/qRGvGofn77hp+fTdRw/ZBSmhwmAHV0gn+DlTQtbPfpq4YWX/lpclXXiJPjhWfxPgONEIhRYlDIy+exfpkI06Mf4jIVTQ1WH2Pst6kxA9V0t+k0wuUGXGaa8L3QyB/fDU71PrscGlqxMvu7B2AU2drm/jhstBFIlGjJqSI6Jsv/vMwqSe4jTkPAwq/1ki3NKBTHLJ5GKEQ6Od6ljGsxx1Ht2ybnvzRC7ZHVo1vDOsGGRdAgMBc/geZrrmBQOUECjb+r4zvtRIcxw6Vmh5FKBFoXoOXsRU+NSDq5bP5oVg4j7rzvlbxTi5+SsmopwF0I9Ea36UIUWJm6yIB4DJpvGtEchftnTmqfbWCLftsyZBwGtI79sOZhlRSZl3Siy3gWf02S98kffZPDMZxydWNzEKjlmfEet3axXi3zUOh/HDI1+fbTg6sZt4mF+FY/1xc04lH91VQDEr3wfORcRi4LPpuo4d8t+g67J9TvWpGGADhMAOrZ+lIFqQKO3Ui03DIqaVrYy98IN6/VJtZOY3Q5LL7y080IoDylrN/KRBqNJSbHC8/HcVkgo3t3wULNJS4gEKPEwabxK+GW5hQAILT7Yv0yEYNLYP7nQU4fBvcc8GQqmhqFnMj17Ti3AwyO5exuU2MGj+Ux6evvHwgKWU3naITLDYkymeL5ykU6GHwX1XqhkT+bF8PQ/x3tMR6rv958djk0ncBr2/VkFC0U0kbCdg/AKJe5ksfzs7wmEgXuyXDYaCORbjrM0S6gSTCY8qZSRXRMs/Mmo9f5CEI2T1qtVJLcR7UkjqjdgPFePDajsV7rJVu/XXe021dZVTrhC7pYPI1QuYrfv8lyA2coxFGIShnXYquvhY3PpatsLhP5g0zOf2mteC2GxdxScCRqAJ9Gt4Z1pwHUmsML+nsivaiUQGAufqHWfJEAAAAAQ8umh8eQPNSEW5pTzycIc4zsrvQItzSnS3ySIJ5PEObdhLZhWd8sMhoUirVRaBiVEqO+Epb4JEHVM4LGfZlRFz5S95C6CW3D+cLLRLK+WWTxdf/jdS5lsDblwzfj1kHxoB3ndiRGfSVnjduiLPFJgm867wXrYXVWqKrT0foyoy65+QWpPaKf+n5pOX01Fatddt4N2vKFl4mxTjEOZH2zyCe2FU+j7Y8c4CYpm6tau7vokR08bMqHby8BIeiHq/I5xGBUvkA7zu0D8GhqSIz6SgtHXM2PHMaezNdgGRnk4t9aL0RY3nTeC52/eIzWw+qslQhMKxFT1nhSmHD/9GVGXbeu4Noz9XqJcD7cDjtCTi54ieip/NJy+r8Z1H1qKla7KeHwPK26am/ucczopQ1eyObG+E9inWIcIVbEm4n8F0rKN7HNTmwrng2njRlG2x85BRC5voFLI+3CgIVqF7MHrFR4oSvQIzt4k+id/9iUD9+bX6lYHwQzC1zPlYwOV+VzTZxD9MnH2aeKDH8gwXDtAIK7S4cG4NHURSt3U5AY9ZXT01MSV4jJQRRDb8ZfP/3mHPRbYZivwTLbZGe1c860ZDAFEuO0Xoiw95UuN7zpvBf/IhqQe3mAwziyJkTtgaSCrkoCBSoRmFZp2j7RIqas8WFtCnblNpAlpv02oujLjLqrACo9L1uwbmyQFukn7ITJZCciTuB8uB2jtx6adoScXDVPOtuxFKCI8t8GD7mjlC/6aDKofjOo+z34DnyVUt2t1pl7KlLC4XkRCUf+WnXV3hm+c1md5ekK3i5PjQsdzUtI1mvMzI3xn49GVxjEOsU4h/FjvwOq+exAYV9rEvkvlFEyiRPVaRNAlqK1x93eJ+eeFYFgGk4bM1mFvbSMtj9yz32Z9UsmA6YI7aUhQ5E3AQBakYaEAQvVx8qtUm9gfoMsq9gEqPBCV+s75NCgR3bw44zQd2fXSiQkHOyj8S9uZbLkyOI2v1KxdXT0Nj4IZhZ9w8CR+ZhawrpT/EUcrsrnX2VsYNs+9jOY9VC004nClJBCZBMUGf5AV9JYx4Lh2gHBKnyGRXHm1Qa6QFJNxtJyDg109YpW7qbJnUghYTeb8CL8PXemp6ck5WwBo64Qk4Pt2zUEaYCvVypLCdD/eIsWvLMtkTjot8J7IxFFMF+DZXOUJeL3z7+xtAQZNuacacmlV89OIQxVHWLH85opu2G6anDHPe4rXW6t4PvpeNN5LzsY36i/Q0X7/IjjfLf0cVz0P9fbcGRNiDOv6w+bBTje2M6eWVyVBAofXqKNVCIwrRfpliqTsgx50Hmq/gVKKDhGgY6/wtoU7IERsmvKbSBLiaaGzA39HJ9ONroYFAQAAJ0HAAAsCQAAhgUAAEgFAACnBQAAAAQAADIFAAC8BQAALAkAQYDBAAv3CQwACACMAAgATAAIAMwACAAsAAgArAAIAGwACADsAAgAHAAIAJwACABcAAgA3AAIADwACAC8AAgAfAAIAPwACAACAAgAggAIAEIACADCAAgAIgAIAKIACABiAAgA4gAIABIACACSAAgAUgAIANIACAAyAAgAsgAIAHIACADyAAgACgAIAIoACABKAAgAygAIACoACACqAAgAagAIAOoACAAaAAgAmgAIAFoACADaAAgAOgAIALoACAB6AAgA+gAIAAYACACGAAgARgAIAMYACAAmAAgApgAIAGYACADmAAgAFgAIAJYACABWAAgA1gAIADYACAC2AAgAdgAIAPYACAAOAAgAjgAIAE4ACADOAAgALgAIAK4ACABuAAgA7gAIAB4ACACeAAgAXgAIAN4ACAA+AAgAvgAIAH4ACAD+AAgAAQAIAIEACABBAAgAwQAIACEACAChAAgAYQAIAOEACAARAAgAkQAIAFEACADRAAgAMQAIALEACABxAAgA8QAIAAkACACJAAgASQAIAMkACAApAAgAqQAIAGkACADpAAgAGQAIAJkACABZAAgA2QAIADkACAC5AAgAeQAIAPkACAAFAAgAhQAIAEUACADFAAgAJQAIAKUACABlAAgA5QAIABUACACVAAgAVQAIANUACAA1AAgAtQAIAHUACAD1AAgADQAIAI0ACABNAAgAzQAIAC0ACACtAAgAbQAIAO0ACAAdAAgAnQAIAF0ACADdAAgAPQAIAL0ACAB9AAgA/QAIABMACQATAQkAkwAJAJMBCQBTAAkAUwEJANMACQDTAQkAMwAJADMBCQCzAAkAswEJAHMACQBzAQkA8wAJAPMBCQALAAkACwEJAIsACQCLAQkASwAJAEsBCQDLAAkAywEJACsACQArAQkAqwAJAKsBCQBrAAkAawEJAOsACQDrAQkAGwAJABsBCQCbAAkAmwEJAFsACQBbAQkA2wAJANsBCQA7AAkAOwEJALsACQC7AQkAewAJAHsBCQD7AAkA+wEJAAcACQAHAQkAhwAJAIcBCQBHAAkARwEJAMcACQDHAQkAJwAJACcBCQCnAAkApwEJAGcACQBnAQkA5wAJAOcBCQAXAAkAFwEJAJcACQCXAQkAVwAJAFcBCQDXAAkA1wEJADcACQA3AQkAtwAJALcBCQB3AAkAdwEJAPcACQD3AQkADwAJAA8BCQCPAAkAjwEJAE8ACQBPAQkAzwAJAM8BCQAvAAkALwEJAK8ACQCvAQkAbwAJAG8BCQDvAAkA7wEJAB8ACQAfAQkAnwAJAJ8BCQBfAAkAXwEJAN8ACQDfAQkAPwAJAD8BCQC/AAkAvwEJAH8ACQB/AQkA/wAJAP8BCQAAAAcAQAAHACAABwBgAAcAEAAHAFAABwAwAAcAcAAHAAgABwBIAAcAKAAHAGgABwAYAAcAWAAHADgABwB4AAcABAAHAEQABwAkAAcAZAAHABQABwBUAAcANAAHAHQABwADAAgAgwAIAEMACADDAAgAIwAIAKMACABjAAgA4wAIAAAABQAQAAUACAAFABgABQAEAAUAFAAFAAwABQAcAAUAAgAFABIABQAKAAUAGgAFAAYABQAWAAUADgAFAB4ABQABAAUAEQAFAAkABQAZAAUABQAFABUABQANAAUAHQAFAAMABQATAAUACwAFABsABQAHAAUAFwAFAEGBywAL7AYBAgMEBAUFBgYGBgcHBwcICAgICAgICAkJCQkJCQkJCgoKCgoKCgoKCgoKCgoKCgsLCwsLCwsLCwsLCwsLCwsMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8AABAREhITExQUFBQVFRUVFhYWFhYWFhYXFxcXFxcXFxgYGBgYGBgYGBgYGBgYGBgZGRkZGRkZGRkZGRkZGRkZGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhobGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwdHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dAAECAwQFBgcICAkJCgoLCwwMDAwNDQ0NDg4ODg8PDw8QEBAQEBAQEBEREREREREREhISEhISEhITExMTExMTExQUFBQUFBQUFBQUFBQUFBQVFRUVFRUVFRUVFRUVFRUVFhYWFhYWFhYWFhYWFhYWFhcXFxcXFxcXFxcXFxcXFxcYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhobGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbHAAAAAABAAAAAgAAAAMAAAAEAAAABQAAAAYAAAAHAAAACAAAAAoAAAAMAAAADgAAABAAAAAUAAAAGAAAABwAAAAgAAAAKAAAADAAAAA4AAAAQAAAAFAAAABgAAAAcAAAAIAAAACgAAAAwAAAAOAAQYTSAAutAQEAAAACAAAAAwAAAAQAAAAGAAAACAAAAAwAAAAQAAAAGAAAACAAAAAwAAAAQAAAAGAAAACAAAAAwAAAAAABAACAAQAAAAIAAAADAAAABAAAAAYAAAAIAAAADAAAABAAAAAYAAAAIAAAADAAAABAAAAAYAAAgCAAAMApAAABAQAAHgEAAA8AAAAAJQAAQCoAAAAAAAAeAAAADwAAAAAAAADAKgAAAAAAABMAAAAHAEHg0wALTQEAAAABAAAAAQAAAAEAAAACAAAAAgAAAAIAAAACAAAAAwAAAAMAAAADAAAAAwAAAAQAAAAEAAAABAAAAAQAAAAFAAAABQAAAAUAAAAFAEHQ1AALZQEAAAABAAAAAgAAAAIAAAADAAAAAwAAAAQAAAAEAAAABQAAAAUAAAAGAAAABgAAAAcAAAAHAAAACAAAAAgAAAAJAAAACQAAAAoAAAAKAAAACwAAAAsAAAAMAAAADAAAAA0AAAANAEGA1gALIwIAAAADAAAABwAAAAAAAAAQERIACAcJBgoFCwQMAw0CDgEPAEHQ1gALTQEAAAABAAAAAQAAAAEAAAACAAAAAgAAAAIAAAACAAAAAwAAAAMAAAADAAAAAwAAAAQAAAAEAAAABAAAAAQAAAAFAAAABQAAAAUAAAAFAEHA1wALZQEAAAABAAAAAgAAAAIAAAADAAAAAwAAAAQAAAAEAAAABQAAAAUAAAAGAAAABgAAAAcAAAAHAAAACAAAAAgAAAAJAAAACQAAAAoAAAAKAAAACwAAAAsAAAAMAAAADAAAAA0AAAANAEG42AALASwAQcTYAAthLQAAAAQABAAIAAQALgAAAAQABgAQAAYALwAAAAQADAAgABgALwAAAAgAEAAgACAALwAAAAgAEACAAIAALwAAAAgAIACAAAABMAAAACAAgAACAQAEMAAAACAAAgECAQAQMABBsNkAC6UTAwAEAAUABgAHAAgACQAKAAsADQAPABEAEwAXABsAHwAjACsAMwA7AEMAUwBjAHMAgwCjAMMA4wACAQAAAAAAABAAEAAQABAAEAAQABAAEAARABEAEQARABIAEgASABIAEwATABMAEwAUABQAFAAUABUAFQAVABUAEABNAMoAAAABAAIAAwAEAAUABwAJAA0AEQAZACEAMQBBAGEAgQDBAAEBgQEBAgEDAQQBBgEIAQwBEAEYASABMAFAAWAAAAAAEAAQABAAEAARABEAEgASABMAEwAUABQAFQAVABYAFgAXABcAGAAYABkAGQAaABoAGwAbABwAHAAdAB0AQABAAGAHAAAACFAAAAgQABQIcwASBx8AAAhwAAAIMAAACcAAEAcKAAAIYAAACCAAAAmgAAAIAAAACIAAAAhAAAAJ4AAQBwYAAAhYAAAIGAAACZAAEwc7AAAIeAAACDgAAAnQABEHEQAACGgAAAgoAAAJsAAACAgAAAiIAAAISAAACfAAEAcEAAAIVAAACBQAFQjjABMHKwAACHQAAAg0AAAJyAARBw0AAAhkAAAIJAAACagAAAgEAAAIhAAACEQAAAnoABAHCAAACFwAAAgcAAAJmAAUB1MAAAh8AAAIPAAACdgAEgcXAAAIbAAACCwAAAm4AAAIDAAACIwAAAhMAAAJ+AAQBwMAAAhSAAAIEgAVCKMAEwcjAAAIcgAACDIAAAnEABEHCwAACGIAAAgiAAAJpAAACAIAAAiCAAAIQgAACeQAEAcHAAAIWgAACBoAAAmUABQHQwAACHoAAAg6AAAJ1AASBxMAAAhqAAAIKgAACbQAAAgKAAAIigAACEoAAAn0ABAHBQAACFYAAAgWAEAIAAATBzMAAAh2AAAINgAACcwAEQcPAAAIZgAACCYAAAmsAAAIBgAACIYAAAhGAAAJ7AAQBwkAAAheAAAIHgAACZwAFAdjAAAIfgAACD4AAAncABIHGwAACG4AAAguAAAJvAAACA4AAAiOAAAITgAACfwAYAcAAAAIUQAACBEAFQiDABIHHwAACHEAAAgxAAAJwgAQBwoAAAhhAAAIIQAACaIAAAgBAAAIgQAACEEAAAniABAHBgAACFkAAAgZAAAJkgATBzsAAAh5AAAIOQAACdIAEQcRAAAIaQAACCkAAAmyAAAICQAACIkAAAhJAAAJ8gAQBwQAAAhVAAAIFQAQCAIBEwcrAAAIdQAACDUAAAnKABEHDQAACGUAAAglAAAJqgAACAUAAAiFAAAIRQAACeoAEAcIAAAIXQAACB0AAAmaABQHUwAACH0AAAg9AAAJ2gASBxcAAAhtAAAILQAACboAAAgNAAAIjQAACE0AAAn6ABAHAwAACFMAAAgTABUIwwATByMAAAhzAAAIMwAACcYAEQcLAAAIYwAACCMAAAmmAAAIAwAACIMAAAhDAAAJ5gAQBwcAAAhbAAAIGwAACZYAFAdDAAAIewAACDsAAAnWABIHEwAACGsAAAgrAAAJtgAACAsAAAiLAAAISwAACfYAEAcFAAAIVwAACBcAQAgAABMHMwAACHcAAAg3AAAJzgARBw8AAAhnAAAIJwAACa4AAAgHAAAIhwAACEcAAAnuABAHCQAACF8AAAgfAAAJngAUB2MAAAh/AAAIPwAACd4AEgcbAAAIbwAACC8AAAm+AAAIDwAACI8AAAhPAAAJ/gBgBwAAAAhQAAAIEAAUCHMAEgcfAAAIcAAACDAAAAnBABAHCgAACGAAAAggAAAJoQAACAAAAAiAAAAIQAAACeEAEAcGAAAIWAAACBgAAAmRABMHOwAACHgAAAg4AAAJ0QARBxEAAAhoAAAIKAAACbEAAAgIAAAIiAAACEgAAAnxABAHBAAACFQAAAgUABUI4wATBysAAAh0AAAINAAACckAEQcNAAAIZAAACCQAAAmpAAAIBAAACIQAAAhEAAAJ6QAQBwgAAAhcAAAIHAAACZkAFAdTAAAIfAAACDwAAAnZABIHFwAACGwAAAgsAAAJuQAACAwAAAiMAAAITAAACfkAEAcDAAAIUgAACBIAFQijABMHIwAACHIAAAgyAAAJxQARBwsAAAhiAAAIIgAACaUAAAgCAAAIggAACEIAAAnlABAHBwAACFoAAAgaAAAJlQAUB0MAAAh6AAAIOgAACdUAEgcTAAAIagAACCoAAAm1AAAICgAACIoAAAhKAAAJ9QAQBwUAAAhWAAAIFgBACAAAEwczAAAIdgAACDYAAAnNABEHDwAACGYAAAgmAAAJrQAACAYAAAiGAAAIRgAACe0AEAcJAAAIXgAACB4AAAmdABQHYwAACH4AAAg+AAAJ3QASBxsAAAhuAAAILgAACb0AAAgOAAAIjgAACE4AAAn9AGAHAAAACFEAAAgRABUIgwASBx8AAAhxAAAIMQAACcMAEAcKAAAIYQAACCEAAAmjAAAIAQAACIEAAAhBAAAJ4wAQBwYAAAhZAAAIGQAACZMAEwc7AAAIeQAACDkAAAnTABEHEQAACGkAAAgpAAAJswAACAkAAAiJAAAISQAACfMAEAcEAAAIVQAACBUAEAgCARMHKwAACHUAAAg1AAAJywARBw0AAAhlAAAIJQAACasAAAgFAAAIhQAACEUAAAnrABAHCAAACF0AAAgdAAAJmwAUB1MAAAh9AAAIPQAACdsAEgcXAAAIbQAACC0AAAm7AAAIDQAACI0AAAhNAAAJ+wAQBwMAAAhTAAAIEwAVCMMAEwcjAAAIcwAACDMAAAnHABEHCwAACGMAAAgjAAAJpwAACAMAAAiDAAAIQwAACecAEAcHAAAIWwAACBsAAAmXABQHQwAACHsAAAg7AAAJ1wASBxMAAAhrAAAIKwAACbcAAAgLAAAIiwAACEsAAAn3ABAHBQAACFcAAAgXAEAIAAATBzMAAAh3AAAINwAACc8AEQcPAAAIZwAACCcAAAmvAAAIBwAACIcAAAhHAAAJ7wAQBwkAAAhfAAAIHwAACZ8AFAdjAAAIfwAACD8AAAnfABIHGwAACG8AAAgvAAAJvwAACA8AAAiPAAAITwAACf8AEAUBABcFAQETBREAGwUBEBEFBQAZBQEEFQVBAB0FAUAQBQMAGAUBAhQFIQAcBQEgEgUJABoFAQgWBYEAQAUAABAFAgAXBYEBEwUZABsFARgRBQcAGQUBBhUFYQAdBQFgEAUEABgFAQMUBTEAHAUBMBIFDQAaBQEMFgXBAEAFAAAQABEAEgAAAAgABwAJAAYACgAFAAsABAAMAAMADQACAA4AAQAPAEHg7AALQREACgAREREAAAAABQAAAAAAAAkAAAAACwAAAAAAAAAAEQAPChEREQMKBwABAAkLCwAACQYLAAALAAYRAAAAERERAEGx7QALIQsAAAAAAAAAABEACgoREREACgAAAgAJCwAAAAkACwAACwBB6+0ACwEMAEH37QALFQwAAAAADAAAAAAJDAAAAAAADAAADABBpe4ACwEOAEGx7gALFQ0AAAAEDQAAAAAJDgAAAAAADgAADgBB3+4ACwEQAEHr7gALHg8AAAAADwAAAAAJEAAAAAAAEAAAEAAAEgAAABISEgBBou8ACw4SAAAAEhISAAAAAAAACQBB0+8ACwELAEHf7wALFQoAAAAACgAAAAAJCwAAAAAACwAACwBBjfAACwEMAEGZ8AALJwwAAAAADAAAAAAJDAAAAAAADAAADAAAMDEyMzQ1Njc4OUFCQ0RFRgBB5PAACwE+AEGL8QALBf//////AEHQ8QALVxkSRDsCPyxHFD0zMAobBkZLRTcPSQ6OFwNAHTxpKzYfSi0cASAlKSEIDBUWIi4QOD4LNDEYZHR1di9BCX85ESNDMkKJiosFBCYoJw0qHjWMBxpIkxOUlQBBsPIAC4oOSWxsZWdhbCBieXRlIHNlcXVlbmNlAERvbWFpbiBlcnJvcgBSZXN1bHQgbm90IHJlcHJlc2VudGFibGUATm90IGEgdHR5AFBlcm1pc3Npb24gZGVuaWVkAE9wZXJhdGlvbiBub3QgcGVybWl0dGVkAE5vIHN1Y2ggZmlsZSBvciBkaXJlY3RvcnkATm8gc3VjaCBwcm9jZXNzAEZpbGUgZXhpc3RzAFZhbHVlIHRvbyBsYXJnZSBmb3IgZGF0YSB0eXBlAE5vIHNwYWNlIGxlZnQgb24gZGV2aWNlAE91dCBvZiBtZW1vcnkAUmVzb3VyY2UgYnVzeQBJbnRlcnJ1cHRlZCBzeXN0ZW0gY2FsbABSZXNvdXJjZSB0ZW1wb3JhcmlseSB1bmF2YWlsYWJsZQBJbnZhbGlkIHNlZWsAQ3Jvc3MtZGV2aWNlIGxpbmsAUmVhZC1vbmx5IGZpbGUgc3lzdGVtAERpcmVjdG9yeSBub3QgZW1wdHkAQ29ubmVjdGlvbiByZXNldCBieSBwZWVyAE9wZXJhdGlvbiB0aW1lZCBvdXQAQ29ubmVjdGlvbiByZWZ1c2VkAEhvc3QgaXMgZG93bgBIb3N0IGlzIHVucmVhY2hhYmxlAEFkZHJlc3MgaW4gdXNlAEJyb2tlbiBwaXBlAEkvTyBlcnJvcgBObyBzdWNoIGRldmljZSBvciBhZGRyZXNzAEJsb2NrIGRldmljZSByZXF1aXJlZABObyBzdWNoIGRldmljZQBOb3QgYSBkaXJlY3RvcnkASXMgYSBkaXJlY3RvcnkAVGV4dCBmaWxlIGJ1c3kARXhlYyBmb3JtYXQgZXJyb3IASW52YWxpZCBhcmd1bWVudABBcmd1bWVudCBsaXN0IHRvbyBsb25nAFN5bWJvbGljIGxpbmsgbG9vcABGaWxlbmFtZSB0b28gbG9uZwBUb28gbWFueSBvcGVuIGZpbGVzIGluIHN5c3RlbQBObyBmaWxlIGRlc2NyaXB0b3JzIGF2YWlsYWJsZQBCYWQgZmlsZSBkZXNjcmlwdG9yAE5vIGNoaWxkIHByb2Nlc3MAQmFkIGFkZHJlc3MARmlsZSB0b28gbGFyZ2UAVG9vIG1hbnkgbGlua3MATm8gbG9ja3MgYXZhaWxhYmxlAFJlc291cmNlIGRlYWRsb2NrIHdvdWxkIG9jY3VyAFN0YXRlIG5vdCByZWNvdmVyYWJsZQBQcmV2aW91cyBvd25lciBkaWVkAE9wZXJhdGlvbiBjYW5jZWxlZABGdW5jdGlvbiBub3QgaW1wbGVtZW50ZWQATm8gbWVzc2FnZSBvZiBkZXNpcmVkIHR5cGUASWRlbnRpZmllciByZW1vdmVkAERldmljZSBub3QgYSBzdHJlYW0ATm8gZGF0YSBhdmFpbGFibGUARGV2aWNlIHRpbWVvdXQAT3V0IG9mIHN0cmVhbXMgcmVzb3VyY2VzAExpbmsgaGFzIGJlZW4gc2V2ZXJlZABQcm90b2NvbCBlcnJvcgBCYWQgbWVzc2FnZQBGaWxlIGRlc2NyaXB0b3IgaW4gYmFkIHN0YXRlAE5vdCBhIHNvY2tldABEZXN0aW5hdGlvbiBhZGRyZXNzIHJlcXVpcmVkAE1lc3NhZ2UgdG9vIGxhcmdlAFByb3RvY29sIHdyb25nIHR5cGUgZm9yIHNvY2tldABQcm90b2NvbCBub3QgYXZhaWxhYmxlAFByb3RvY29sIG5vdCBzdXBwb3J0ZWQAU29ja2V0IHR5cGUgbm90IHN1cHBvcnRlZABOb3Qgc3VwcG9ydGVkAFByb3RvY29sIGZhbWlseSBub3Qgc3VwcG9ydGVkAEFkZHJlc3MgZmFtaWx5IG5vdCBzdXBwb3J0ZWQgYnkgcHJvdG9jb2wAQWRkcmVzcyBub3QgYXZhaWxhYmxlAE5ldHdvcmsgaXMgZG93bgBOZXR3b3JrIHVucmVhY2hhYmxlAENvbm5lY3Rpb24gcmVzZXQgYnkgbmV0d29yawBDb25uZWN0aW9uIGFib3J0ZWQATm8gYnVmZmVyIHNwYWNlIGF2YWlsYWJsZQBTb2NrZXQgaXMgY29ubmVjdGVkAFNvY2tldCBub3QgY29ubmVjdGVkAENhbm5vdCBzZW5kIGFmdGVyIHNvY2tldCBzaHV0ZG93bgBPcGVyYXRpb24gYWxyZWFkeSBpbiBwcm9ncmVzcwBPcGVyYXRpb24gaW4gcHJvZ3Jlc3MAU3RhbGUgZmlsZSBoYW5kbGUAUmVtb3RlIEkvTyBlcnJvcgBRdW90YSBleGNlZWRlZABObyBtZWRpdW0gZm91bmQAV3JvbmcgbWVkaXVtIHR5cGUATm8gZXJyb3IgaW5mb3JtYXRpb24AQcCAAQuFARMAAAAUAAAAFQAAABYAAAAXAAAAGAAAABkAAAAaAAAAGwAAABwAAAAdAAAAHgAAAB8AAAAgAAAAIQAAACIAAAAjAAAAgERQADEAAAAyAAAAMwAAADQAAAA1AAAANgAAADcAAAA4AAAAOQAAADIAAAAzAAAANAAAADUAAAA2AAAANwAAADgAQfSCAQsCXEQAQbCDAQsQ/////////////////////w==";io(Pi)||(Pi=x(Pi));function Ls(We){try{if(We==Pi&&ce)return new Uint8Array(ce);var tt=ii(We);if(tt)return tt;if(R)return R(We);throw"sync fetching of the wasm failed: you can preload it to Module['wasmBinary'] manually, or emcc.py will do that for you when generating HTML (but not JS)"}catch(It){Ti(It)}}function so(We,tt){var It,nr,$;try{$=Ls(We),nr=new WebAssembly.Module($),It=new WebAssembly.Instance(nr,tt)}catch(Le){var ye=Le.toString();throw te("failed to compile wasm module: "+ye),(ye.includes("imported Memory")||ye.includes("memory import"))&&te("Memory size incompatibility issues may be due to changing INITIAL_MEMORY at runtime to something too large. Use ALLOW_MEMORY_GROWTH to allow any size memory (and also make sure not to set INITIAL_MEMORY at runtime to something smaller than it was at compile time)."),Le}return[It,nr]}function cc(){var We={a:Ma};function tt($,ye){var Le=$.exports;r.asm=Le,Be=r.asm.g,z(Be.buffer),Z=r.asm.W,an(r.asm.h),Ns("wasm-instantiate")}if(Kn("wasm-instantiate"),r.instantiateWasm)try{var It=r.instantiateWasm(We,tt);return It}catch($){return te("Module.instantiateWasm callback failed with error: "+$),!1}var nr=so(Pi,We);return tt(nr[0]),r.asm}function cu(We){return F.getFloat32(We,!0)}function lp(We){return F.getFloat64(We,!0)}function cp(We){return F.getInt16(We,!0)}function Os(We){return F.getInt32(We,!0)}function Dn(We,tt){F.setInt32(We,tt,!0)}function oo(We){for(;We.length>0;){var tt=We.shift();if(typeof tt=="function"){tt(r);continue}var It=tt.func;typeof It=="number"?tt.arg===void 0?Z.get(It)():Z.get(It)(tt.arg):It(tt.arg===void 0?null:tt.arg)}}function Ms(We,tt){var It=new Date(Os((We>>2)*4)*1e3);Dn((tt>>2)*4,It.getUTCSeconds()),Dn((tt+4>>2)*4,It.getUTCMinutes()),Dn((tt+8>>2)*4,It.getUTCHours()),Dn((tt+12>>2)*4,It.getUTCDate()),Dn((tt+16>>2)*4,It.getUTCMonth()),Dn((tt+20>>2)*4,It.getUTCFullYear()-1900),Dn((tt+24>>2)*4,It.getUTCDay()),Dn((tt+36>>2)*4,0),Dn((tt+32>>2)*4,0);var nr=Date.UTC(It.getUTCFullYear(),0,1,0,0,0,0),$=(It.getTime()-nr)/(1e3*60*60*24)|0;return Dn((tt+28>>2)*4,$),Ms.GMTString||(Ms.GMTString=at("GMT")),Dn((tt+40>>2)*4,Ms.GMTString),tt}function ml(We,tt){return Ms(We,tt)}function yl(We,tt,It){Te.copyWithin(We,tt,tt+It)}function ao(We){try{return Be.grow(We-xe.byteLength+65535>>>16),z(Be.buffer),1}catch{}}function Vn(We){var tt=Te.length;We=We>>>0;var It=2147483648;if(We>It)return!1;for(var nr=1;nr<=4;nr*=2){var $=tt*(1+.2/nr);$=Math.min($,We+100663296);var ye=Math.min(It,ke(Math.max(We,$),65536)),Le=ao(ye);if(Le)return!0}return!1}function On(We){fe(We)}function Ni(We){var tt=Date.now()/1e3|0;return We&&Dn((We>>2)*4,tt),tt}function Mn(){if(Mn.called)return;Mn.called=!0;var We=new Date().getFullYear(),tt=new Date(We,0,1),It=new Date(We,6,1),nr=tt.getTimezoneOffset(),$=It.getTimezoneOffset(),ye=Math.max(nr,$);Dn((ds()>>2)*4,ye*60),Dn((gs()>>2)*4,Number(nr!=$));function Le($r){var Gi=$r.toTimeString().match(/\(([A-Za-z ]+)\)$/);return Gi?Gi[1]:"GMT"}var pt=Le(tt),ht=Le(It),Tt=at(pt),er=at(ht);$<nr?(Dn((wi()>>2)*4,Tt),Dn((wi()+4>>2)*4,er)):(Dn((wi()>>2)*4,er),Dn((wi()+4>>2)*4,Tt))}function _i(We){Mn();var tt=Date.UTC(Os((We+20>>2)*4)+1900,Os((We+16>>2)*4),Os((We+12>>2)*4),Os((We+8>>2)*4),Os((We+4>>2)*4),Os((We>>2)*4),0),It=new Date(tt);Dn((We+24>>2)*4,It.getUTCDay());var nr=Date.UTC(It.getUTCFullYear(),0,1,0,0,0,0),$=(It.getTime()-nr)/(1e3*60*60*24)|0;return Dn((We+28>>2)*4,$),It.getTime()/1e3|0}var tr=typeof atob=="function"?atob:function(We){var tt="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",It="",nr,$,ye,Le,pt,ht,Tt,er=0;We=We.replace(/[^A-Za-z0-9\+\/\=]/g,"");do Le=tt.indexOf(We.charAt(er++)),pt=tt.indexOf(We.charAt(er++)),ht=tt.indexOf(We.charAt(er++)),Tt=tt.indexOf(We.charAt(er++)),nr=Le<<2|pt>>4,$=(pt&15)<<4|ht>>2,ye=(ht&3)<<6|Tt,It=It+String.fromCharCode(nr),ht!==64&&(It=It+String.fromCharCode($)),Tt!==64&&(It=It+String.fromCharCode(ye));while(er<We.length);return It};function Oe(We){if(typeof I=="boolean"&&I){var tt;try{tt=Buffer.from(We,"base64")}catch{tt=new Buffer(We,"base64")}return new Uint8Array(tt.buffer,tt.byteOffset,tt.byteLength)}try{for(var It=tr(We),nr=new Uint8Array(It.length),$=0;$<It.length;++$)nr[$]=It.charCodeAt($);return nr}catch{throw new Error("Converting base64 string to bytes failed.")}}function ii(We){if(!!io(We))return Oe(We.slice(ps.length))}var Ma={e:ml,c:yl,d:Vn,a:On,b:Ni,f:_i},hr=cc(),uc=r.___wasm_call_ctors=hr.h,uu=r._zip_ext_count_symlinks=hr.i,Ac=r._zip_file_get_external_attributes=hr.j,El=r._zipstruct_statS=hr.k,DA=r._zipstruct_stat_size=hr.l,Au=r._zipstruct_stat_mtime=hr.m,Ce=r._zipstruct_stat_crc=hr.n,Rt=r._zipstruct_errorS=hr.o,fc=r._zipstruct_error_code_zip=hr.p,Hi=r._zipstruct_stat_comp_size=hr.q,fu=r._zipstruct_stat_comp_method=hr.r,Yt=r._zip_close=hr.s,Cl=r._zip_delete=hr.t,SA=r._zip_dir_add=hr.u,up=r._zip_discard=hr.v,pc=r._zip_error_init_with_code=hr.w,PA=r._zip_get_error=hr.x,Qn=r._zip_file_get_error=hr.y,hi=r._zip_error_strerror=hr.z,hc=r._zip_fclose=hr.A,bA=r._zip_file_add=hr.B,sa=r._free=hr.C,Li=r._malloc=hr.D,_o=r._zip_source_error=hr.E,Ze=r._zip_source_seek=hr.F,lo=r._zip_file_set_external_attributes=hr.G,gc=r._zip_file_set_mtime=hr.H,pu=r._zip_fopen_index=hr.I,ji=r._zip_fread=hr.J,hu=r._zip_get_name=hr.K,xA=r._zip_get_num_entries=hr.L,Ua=r._zip_source_read=hr.M,dc=r._zip_name_locate=hr.N,hs=r._zip_open_from_source=hr.O,_t=r._zip_set_file_compression=hr.P,Fn=r._zip_source_buffer=hr.Q,Ci=r._zip_source_buffer_create=hr.R,oa=r._zip_source_close=hr.S,co=r._zip_source_free=hr.T,Us=r._zip_source_keep=hr.U,aa=r._zip_source_open=hr.V,la=r._zip_source_tell=hr.X,Ho=r._zip_stat_index=hr.Y,wi=r.__get_tzname=hr.Z,gs=r.__get_daylight=hr._,ds=r.__get_timezone=hr.$,ms=r.stackSave=hr.aa,_s=r.stackRestore=hr.ba,Un=r.stackAlloc=hr.ca;r.cwrap=ne,r.getValue=he;var Sn;Wr=function We(){Sn||ys(),Sn||(Wr=We)};function ys(We){if(We=We||A,mr>0||(dt(),mr>0))return;function tt(){Sn||(Sn=!0,r.calledRun=!0,!we&&(Gt(),o(r),r.onRuntimeInitialized&&r.onRuntimeInitialized(),$t()))}r.setStatus?(r.setStatus("Running..."),setTimeout(function(){setTimeout(function(){r.setStatus("")},1),tt()},1)):tt()}if(r.run=ys,r.preInit)for(typeof r.preInit=="function"&&(r.preInit=[r.preInit]);r.preInit.length>0;)r.preInit.pop()();return ys(),e}}();typeof Qb=="object"&&typeof tU=="object"?tU.exports=eU:typeof define=="function"&&define.amd?define([],function(){return eU}):typeof Qb=="object"&&(Qb.createModule=eU)});var Of,Rle,Tle,Nle=Et(()=>{Of=["number","number"],Rle=(ee=>(ee[ee.ZIP_ER_OK=0]="ZIP_ER_OK",ee[ee.ZIP_ER_MULTIDISK=1]="ZIP_ER_MULTIDISK",ee[ee.ZIP_ER_RENAME=2]="ZIP_ER_RENAME",ee[ee.ZIP_ER_CLOSE=3]="ZIP_ER_CLOSE",ee[ee.ZIP_ER_SEEK=4]="ZIP_ER_SEEK",ee[ee.ZIP_ER_READ=5]="ZIP_ER_READ",ee[ee.ZIP_ER_WRITE=6]="ZIP_ER_WRITE",ee[ee.ZIP_ER_CRC=7]="ZIP_ER_CRC",ee[ee.ZIP_ER_ZIPCLOSED=8]="ZIP_ER_ZIPCLOSED",ee[ee.ZIP_ER_NOENT=9]="ZIP_ER_NOENT",ee[ee.ZIP_ER_EXISTS=10]="ZIP_ER_EXISTS",ee[ee.ZIP_ER_OPEN=11]="ZIP_ER_OPEN",ee[ee.ZIP_ER_TMPOPEN=12]="ZIP_ER_TMPOPEN",ee[ee.ZIP_ER_ZLIB=13]="ZIP_ER_ZLIB",ee[ee.ZIP_ER_MEMORY=14]="ZIP_ER_MEMORY",ee[ee.ZIP_ER_CHANGED=15]="ZIP_ER_CHANGED",ee[ee.ZIP_ER_COMPNOTSUPP=16]="ZIP_ER_COMPNOTSUPP",ee[ee.ZIP_ER_EOF=17]="ZIP_ER_EOF",ee[ee.ZIP_ER_INVAL=18]="ZIP_ER_INVAL",ee[ee.ZIP_ER_NOZIP=19]="ZIP_ER_NOZIP",ee[ee.ZIP_ER_INTERNAL=20]="ZIP_ER_INTERNAL",ee[ee.ZIP_ER_INCONS=21]="ZIP_ER_INCONS",ee[ee.ZIP_ER_REMOVE=22]="ZIP_ER_REMOVE",ee[ee.ZIP_ER_DELETED=23]="ZIP_ER_DELETED",ee[ee.ZIP_ER_ENCRNOTSUPP=24]="ZIP_ER_ENCRNOTSUPP",ee[ee.ZIP_ER_RDONLY=25]="ZIP_ER_RDONLY",ee[ee.ZIP_ER_NOPASSWD=26]="ZIP_ER_NOPASSWD",ee[ee.ZIP_ER_WRONGPASSWD=27]="ZIP_ER_WRONGPASSWD",ee[ee.ZIP_ER_OPNOTSUPP=28]="ZIP_ER_OPNOTSUPP",ee[ee.ZIP_ER_INUSE=29]="ZIP_ER_INUSE",ee[ee.ZIP_ER_TELL=30]="ZIP_ER_TELL",ee[ee.ZIP_ER_COMPRESSED_DATA=31]="ZIP_ER_COMPRESSED_DATA",ee))(Rle||{}),Tle=t=>({get HEAPU8(){return t.HEAPU8},errors:Rle,SEEK_SET:0,SEEK_CUR:1,SEEK_END:2,ZIP_CHECKCONS:4,ZIP_EXCL:2,ZIP_RDONLY:16,ZIP_FL_OVERWRITE:8192,ZIP_FL_COMPRESSED:4,ZIP_OPSYS_DOS:0,ZIP_OPSYS_AMIGA:1,ZIP_OPSYS_OPENVMS:2,ZIP_OPSYS_UNIX:3,ZIP_OPSYS_VM_CMS:4,ZIP_OPSYS_ATARI_ST:5,ZIP_OPSYS_OS_2:6,ZIP_OPSYS_MACINTOSH:7,ZIP_OPSYS_Z_SYSTEM:8,ZIP_OPSYS_CPM:9,ZIP_OPSYS_WINDOWS_NTFS:10,ZIP_OPSYS_MVS:11,ZIP_OPSYS_VSE:12,ZIP_OPSYS_ACORN_RISC:13,ZIP_OPSYS_VFAT:14,ZIP_OPSYS_ALTERNATE_MVS:15,ZIP_OPSYS_BEOS:16,ZIP_OPSYS_TANDEM:17,ZIP_OPSYS_OS_400:18,ZIP_OPSYS_OS_X:19,ZIP_CM_DEFAULT:-1,ZIP_CM_STORE:0,ZIP_CM_DEFLATE:8,uint08S:t._malloc(1),uint32S:t._malloc(4),malloc:t._malloc,free:t._free,getValue:t.getValue,openFromSource:t.cwrap("zip_open_from_source","number",["number","number","number"]),close:t.cwrap("zip_close","number",["number"]),discard:t.cwrap("zip_discard",null,["number"]),getError:t.cwrap("zip_get_error","number",["number"]),getName:t.cwrap("zip_get_name","string",["number","number","number"]),getNumEntries:t.cwrap("zip_get_num_entries","number",["number","number"]),delete:t.cwrap("zip_delete","number",["number","number"]),statIndex:t.cwrap("zip_stat_index","number",["number",...Of,"number","number"]),fopenIndex:t.cwrap("zip_fopen_index","number",["number",...Of,"number"]),fread:t.cwrap("zip_fread","number",["number","number","number","number"]),fclose:t.cwrap("zip_fclose","number",["number"]),dir:{add:t.cwrap("zip_dir_add","number",["number","string"])},file:{add:t.cwrap("zip_file_add","number",["number","string","number","number"]),getError:t.cwrap("zip_file_get_error","number",["number"]),getExternalAttributes:t.cwrap("zip_file_get_external_attributes","number",["number",...Of,"number","number","number"]),setExternalAttributes:t.cwrap("zip_file_set_external_attributes","number",["number",...Of,"number","number","number"]),setMtime:t.cwrap("zip_file_set_mtime","number",["number",...Of,"number","number"]),setCompression:t.cwrap("zip_set_file_compression","number",["number",...Of,"number","number"])},ext:{countSymlinks:t.cwrap("zip_ext_count_symlinks","number",["number"])},error:{initWithCode:t.cwrap("zip_error_init_with_code",null,["number","number"]),strerror:t.cwrap("zip_error_strerror","string",["number"])},name:{locate:t.cwrap("zip_name_locate","number",["number","string","number"])},source:{fromUnattachedBuffer:t.cwrap("zip_source_buffer_create","number",["number",...Of,"number","number"]),fromBuffer:t.cwrap("zip_source_buffer","number",["number","number",...Of,"number"]),free:t.cwrap("zip_source_free",null,["number"]),keep:t.cwrap("zip_source_keep",null,["number"]),open:t.cwrap("zip_source_open","number",["number"]),close:t.cwrap("zip_source_close","number",["number"]),seek:t.cwrap("zip_source_seek","number",["number",...Of,"number"]),tell:t.cwrap("zip_source_tell","number",["number"]),read:t.cwrap("zip_source_read","number",["number","number","number"]),error:t.cwrap("zip_source_error","number",["number"])},struct:{statS:t.cwrap("zipstruct_statS","number",[]),statSize:t.cwrap("zipstruct_stat_size","number",["number"]),statCompSize:t.cwrap("zipstruct_stat_comp_size","number",["number"]),statCompMethod:t.cwrap("zipstruct_stat_comp_method","number",["number"]),statMtime:t.cwrap("zipstruct_stat_mtime","number",["number"]),statCrc:t.cwrap("zipstruct_stat_crc","number",["number"]),errorS:t.cwrap("zipstruct_errorS","number",[]),errorCodeZip:t.cwrap("zipstruct_error_code_zip","number",["number"])}})});function rU(t,e){let r=t.indexOf(e);if(r<=0)return null;let o=r;for(;r>=0&&(o=r+e.length,t[o]!==V.sep);){if(t[r-1]===V.sep)return null;r=t.indexOf(e,o)}return t.length>o&&t[o]!==V.sep?null:t.slice(0,o)}var Jl,Lle=Et(()=>{St();St();nA();Jl=class extends Hp{static async openPromise(e,r){let o=new Jl(r);try{return await e(o)}finally{o.saveAndClose()}}constructor(e={}){let r=e.fileExtensions,o=e.readOnlyArchives,a=typeof r>"u"?A=>rU(A,".zip"):A=>{for(let p of r){let h=rU(A,p);if(h)return h}return null},n=(A,p)=>new zi(p,{baseFs:A,readOnly:o,stats:A.statSync(p)}),u=async(A,p)=>{let h={baseFs:A,readOnly:o,stats:await A.statPromise(p)};return()=>new zi(p,h)};super({...e,factorySync:n,factoryPromise:u,getMountPoint:a})}}});function lot(t){if(typeof t=="string"&&String(+t)===t)return+t;if(typeof t=="number"&&Number.isFinite(t))return t<0?Date.now()/1e3:t;if(Ole.types.isDate(t))return t.getTime()/1e3;throw new Error("Invalid time")}function Fb(){return Buffer.from([80,75,5,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0])}var ta,nU,Ole,iU,Mle,Rb,zi,sU=Et(()=>{St();St();St();St();St();St();ta=ve("fs"),nU=ve("stream"),Ole=ve("util"),iU=$e(ve("zlib"));$4();Mle="mixed";Rb=class extends Error{constructor(r,o){super(r);this.name="Libzip Error",this.code=o}},zi=class extends Mu{constructor(r,o={}){super();this.listings=new Map;this.entries=new Map;this.fileSources=new Map;this.fds=new Map;this.nextFd=0;this.ready=!1;this.readOnly=!1;let a=o;if(this.level=typeof a.level<"u"?a.level:Mle,r??=Fb(),typeof r=="string"){let{baseFs:A=new Tn}=a;this.baseFs=A,this.path=r}else this.path=null,this.baseFs=null;if(o.stats)this.stats=o.stats;else if(typeof r=="string")try{this.stats=this.baseFs.statSync(r)}catch(A){if(A.code==="ENOENT"&&a.create)this.stats=Ea.makeDefaultStats();else throw A}else this.stats=Ea.makeDefaultStats();this.libzip=b1();let n=this.libzip.malloc(4);try{let A=0;o.readOnly&&(A|=this.libzip.ZIP_RDONLY,this.readOnly=!0),typeof r=="string"&&(r=a.create?Fb():this.baseFs.readFileSync(r));let p=this.allocateUnattachedSource(r);try{this.zip=this.libzip.openFromSource(p,A,n),this.lzSource=p}catch(h){throw this.libzip.source.free(p),h}if(this.zip===0){let h=this.libzip.struct.errorS();throw this.libzip.error.initWithCode(h,this.libzip.getValue(n,"i32")),this.makeLibzipError(h)}}finally{this.libzip.free(n)}this.listings.set(Bt.root,new Set);let u=this.libzip.getNumEntries(this.zip,0);for(let A=0;A<u;++A){let p=this.libzip.getName(this.zip,A,0);if(V.isAbsolute(p))continue;let h=V.resolve(Bt.root,p);this.registerEntry(h,A),p.endsWith("/")&&this.registerListing(h)}if(this.symlinkCount=this.libzip.ext.countSymlinks(this.zip),this.symlinkCount===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));this.ready=!0}makeLibzipError(r){let o=this.libzip.struct.errorCodeZip(r),a=this.libzip.error.strerror(r),n=new Rb(a,this.libzip.errors[o]);if(o===this.libzip.errors.ZIP_ER_CHANGED)throw new Error(`Assertion failed: Unexpected libzip error: ${n.message}`);return n}getExtractHint(r){for(let o of this.entries.keys()){let a=this.pathUtils.extname(o);if(r.relevantExtensions.has(a))return!0}return!1}getAllFiles(){return Array.from(this.entries.keys())}getRealPath(){if(!this.path)throw new Error("ZipFS don't have real paths when loaded from a buffer");return this.path}prepareClose(){if(!this.ready)throw ar.EBUSY("archive closed, close");Ug(this)}getBufferAndClose(){if(this.prepareClose(),this.entries.size===0)return this.discardAndClose(),Fb();try{if(this.libzip.source.keep(this.lzSource),this.libzip.close(this.zip)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));if(this.libzip.source.open(this.lzSource)===-1)throw this.makeLibzipError(this.libzip.source.error(this.lzSource));if(this.libzip.source.seek(this.lzSource,0,0,this.libzip.SEEK_END)===-1)throw this.makeLibzipError(this.libzip.source.error(this.lzSource));let r=this.libzip.source.tell(this.lzSource);if(r===-1)throw this.makeLibzipError(this.libzip.source.error(this.lzSource));if(this.libzip.source.seek(this.lzSource,0,0,this.libzip.SEEK_SET)===-1)throw this.makeLibzipError(this.libzip.source.error(this.lzSource));let o=this.libzip.malloc(r);if(!o)throw new Error("Couldn't allocate enough memory");try{let a=this.libzip.source.read(this.lzSource,o,r);if(a===-1)throw this.makeLibzipError(this.libzip.source.error(this.lzSource));if(a<r)throw new Error("Incomplete read");if(a>r)throw new Error("Overread");let n=Buffer.from(this.libzip.HEAPU8.subarray(o,o+r));return process.env.YARN_IS_TEST_ENV&&process.env.YARN_ZIP_DATA_EPILOGUE&&(n=Buffer.concat([n,Buffer.from(process.env.YARN_ZIP_DATA_EPILOGUE)])),n}finally{this.libzip.free(o)}}finally{this.libzip.source.close(this.lzSource),this.libzip.source.free(this.lzSource),this.ready=!1}}discardAndClose(){this.prepareClose(),this.libzip.discard(this.zip),this.ready=!1}saveAndClose(){if(!this.path||!this.baseFs)throw new Error("ZipFS cannot be saved and must be discarded when loaded from a buffer");if(this.readOnly){this.discardAndClose();return}let r=this.baseFs.existsSync(this.path)||this.stats.mode===Ea.DEFAULT_MODE?void 0:this.stats.mode;this.baseFs.writeFileSync(this.path,this.getBufferAndClose(),{mode:r}),this.ready=!1}resolve(r){return V.resolve(Bt.root,r)}async openPromise(r,o,a){return this.openSync(r,o,a)}openSync(r,o,a){let n=this.nextFd++;return this.fds.set(n,{cursor:0,p:r}),n}hasOpenFileHandles(){return!!this.fds.size}async opendirPromise(r,o){return this.opendirSync(r,o)}opendirSync(r,o={}){let a=this.resolveFilename(`opendir '${r}'`,r);if(!this.entries.has(a)&&!this.listings.has(a))throw ar.ENOENT(`opendir '${r}'`);let n=this.listings.get(a);if(!n)throw ar.ENOTDIR(`opendir '${r}'`);let u=[...n],A=this.openSync(a,"r");return PD(this,a,u,{onClose:()=>{this.closeSync(A)}})}async readPromise(r,o,a,n,u){return this.readSync(r,o,a,n,u)}readSync(r,o,a=0,n=o.byteLength,u=-1){let A=this.fds.get(r);if(typeof A>"u")throw ar.EBADF("read");let p=u===-1||u===null?A.cursor:u,h=this.readFileSync(A.p);h.copy(o,a,p,p+n);let E=Math.max(0,Math.min(h.length-p,n));return(u===-1||u===null)&&(A.cursor+=E),E}async writePromise(r,o,a,n,u){return typeof o=="string"?this.writeSync(r,o,u):this.writeSync(r,o,a,n,u)}writeSync(r,o,a,n,u){throw typeof this.fds.get(r)>"u"?ar.EBADF("read"):new Error("Unimplemented")}async closePromise(r){return this.closeSync(r)}closeSync(r){if(typeof this.fds.get(r)>"u")throw ar.EBADF("read");this.fds.delete(r)}createReadStream(r,{encoding:o}={}){if(r===null)throw new Error("Unimplemented");let a=this.openSync(r,"r"),n=Object.assign(new nU.PassThrough({emitClose:!0,autoDestroy:!0,destroy:(A,p)=>{clearImmediate(u),this.closeSync(a),p(A)}}),{close(){n.destroy()},bytesRead:0,path:r,pending:!1}),u=setImmediate(async()=>{try{let A=await this.readFilePromise(r,o);n.bytesRead=A.length,n.end(A)}catch(A){n.destroy(A)}});return n}createWriteStream(r,{encoding:o}={}){if(this.readOnly)throw ar.EROFS(`open '${r}'`);if(r===null)throw new Error("Unimplemented");let a=[],n=this.openSync(r,"w"),u=Object.assign(new nU.PassThrough({autoDestroy:!0,emitClose:!0,destroy:(A,p)=>{try{A?p(A):(this.writeFileSync(r,Buffer.concat(a),o),p(null))}catch(h){p(h)}finally{this.closeSync(n)}}}),{close(){u.destroy()},bytesWritten:0,path:r,pending:!1});return u.on("data",A=>{let p=Buffer.from(A);u.bytesWritten+=p.length,a.push(p)}),u}async realpathPromise(r){return this.realpathSync(r)}realpathSync(r){let o=this.resolveFilename(`lstat '${r}'`,r);if(!this.entries.has(o)&&!this.listings.has(o))throw ar.ENOENT(`lstat '${r}'`);return o}async existsPromise(r){return this.existsSync(r)}existsSync(r){if(!this.ready)throw ar.EBUSY(`archive closed, existsSync '${r}'`);if(this.symlinkCount===0){let a=V.resolve(Bt.root,r);return this.entries.has(a)||this.listings.has(a)}let o;try{o=this.resolveFilename(`stat '${r}'`,r,void 0,!1)}catch{return!1}return o===void 0?!1:this.entries.has(o)||this.listings.has(o)}async accessPromise(r,o){return this.accessSync(r,o)}accessSync(r,o=ta.constants.F_OK){let a=this.resolveFilename(`access '${r}'`,r);if(!this.entries.has(a)&&!this.listings.has(a))throw ar.ENOENT(`access '${r}'`);if(this.readOnly&&o&ta.constants.W_OK)throw ar.EROFS(`access '${r}'`)}async statPromise(r,o={bigint:!1}){return o.bigint?this.statSync(r,{bigint:!0}):this.statSync(r)}statSync(r,o={bigint:!1,throwIfNoEntry:!0}){let a=this.resolveFilename(`stat '${r}'`,r,void 0,o.throwIfNoEntry);if(a!==void 0){if(!this.entries.has(a)&&!this.listings.has(a)){if(o.throwIfNoEntry===!1)return;throw ar.ENOENT(`stat '${r}'`)}if(r[r.length-1]==="/"&&!this.listings.has(a))throw ar.ENOTDIR(`stat '${r}'`);return this.statImpl(`stat '${r}'`,a,o)}}async fstatPromise(r,o){return this.fstatSync(r,o)}fstatSync(r,o){let a=this.fds.get(r);if(typeof a>"u")throw ar.EBADF("fstatSync");let{p:n}=a,u=this.resolveFilename(`stat '${n}'`,n);if(!this.entries.has(u)&&!this.listings.has(u))throw ar.ENOENT(`stat '${n}'`);if(n[n.length-1]==="/"&&!this.listings.has(u))throw ar.ENOTDIR(`stat '${n}'`);return this.statImpl(`fstat '${n}'`,u,o)}async lstatPromise(r,o={bigint:!1}){return o.bigint?this.lstatSync(r,{bigint:!0}):this.lstatSync(r)}lstatSync(r,o={bigint:!1,throwIfNoEntry:!0}){let a=this.resolveFilename(`lstat '${r}'`,r,!1,o.throwIfNoEntry);if(a!==void 0){if(!this.entries.has(a)&&!this.listings.has(a)){if(o.throwIfNoEntry===!1)return;throw ar.ENOENT(`lstat '${r}'`)}if(r[r.length-1]==="/"&&!this.listings.has(a))throw ar.ENOTDIR(`lstat '${r}'`);return this.statImpl(`lstat '${r}'`,a,o)}}statImpl(r,o,a={}){let n=this.entries.get(o);if(typeof n<"u"){let u=this.libzip.struct.statS();if(this.libzip.statIndex(this.zip,n,0,0,u)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));let p=this.stats.uid,h=this.stats.gid,E=this.libzip.struct.statSize(u)>>>0,I=512,v=Math.ceil(E/I),x=(this.libzip.struct.statMtime(u)>>>0)*1e3,C=x,R=x,L=x,U=new Date(C),J=new Date(R),te=new Date(L),ae=new Date(x),fe=this.listings.has(o)?ta.constants.S_IFDIR:this.isSymbolicLink(n)?ta.constants.S_IFLNK:ta.constants.S_IFREG,ce=fe===ta.constants.S_IFDIR?493:420,me=fe|this.getUnixMode(n,ce)&511,he=this.libzip.struct.statCrc(u),Be=Object.assign(new Ea.StatEntry,{uid:p,gid:h,size:E,blksize:I,blocks:v,atime:U,birthtime:J,ctime:te,mtime:ae,atimeMs:C,birthtimeMs:R,ctimeMs:L,mtimeMs:x,mode:me,crc:he});return a.bigint===!0?Ea.convertToBigIntStats(Be):Be}if(this.listings.has(o)){let u=this.stats.uid,A=this.stats.gid,p=0,h=512,E=0,I=this.stats.mtimeMs,v=this.stats.mtimeMs,x=this.stats.mtimeMs,C=this.stats.mtimeMs,R=new Date(I),L=new Date(v),U=new Date(x),J=new Date(C),te=ta.constants.S_IFDIR|493,ae=0,fe=Object.assign(new Ea.StatEntry,{uid:u,gid:A,size:p,blksize:h,blocks:E,atime:R,birthtime:L,ctime:U,mtime:J,atimeMs:I,birthtimeMs:v,ctimeMs:x,mtimeMs:C,mode:te,crc:ae});return a.bigint===!0?Ea.convertToBigIntStats(fe):fe}throw new Error("Unreachable")}getUnixMode(r,o){if(this.libzip.file.getExternalAttributes(this.zip,r,0,0,this.libzip.uint08S,this.libzip.uint32S)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));return this.libzip.getValue(this.libzip.uint08S,"i8")>>>0!==this.libzip.ZIP_OPSYS_UNIX?o:this.libzip.getValue(this.libzip.uint32S,"i32")>>>16}registerListing(r){let o=this.listings.get(r);if(o)return o;this.registerListing(V.dirname(r)).add(V.basename(r));let n=new Set;return this.listings.set(r,n),n}registerEntry(r,o){this.registerListing(V.dirname(r)).add(V.basename(r)),this.entries.set(r,o)}unregisterListing(r){this.listings.delete(r),this.listings.get(V.dirname(r))?.delete(V.basename(r))}unregisterEntry(r){this.unregisterListing(r);let o=this.entries.get(r);this.entries.delete(r),!(typeof o>"u")&&(this.fileSources.delete(o),this.isSymbolicLink(o)&&this.symlinkCount--)}deleteEntry(r,o){if(this.unregisterEntry(r),this.libzip.delete(this.zip,o)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip))}resolveFilename(r,o,a=!0,n=!0){if(!this.ready)throw ar.EBUSY(`archive closed, ${r}`);let u=V.resolve(Bt.root,o);if(u==="/")return Bt.root;let A=this.entries.get(u);if(a&&A!==void 0)if(this.symlinkCount!==0&&this.isSymbolicLink(A)){let p=this.getFileSource(A).toString();return this.resolveFilename(r,V.resolve(V.dirname(u),p),!0,n)}else return u;for(;;){let p=this.resolveFilename(r,V.dirname(u),!0,n);if(p===void 0)return p;let h=this.listings.has(p),E=this.entries.has(p);if(!h&&!E){if(n===!1)return;throw ar.ENOENT(r)}if(!h)throw ar.ENOTDIR(r);if(u=V.resolve(p,V.basename(u)),!a||this.symlinkCount===0)break;let I=this.libzip.name.locate(this.zip,u.slice(1),0);if(I===-1)break;if(this.isSymbolicLink(I)){let v=this.getFileSource(I).toString();u=V.resolve(V.dirname(u),v)}else break}return u}allocateBuffer(r){Buffer.isBuffer(r)||(r=Buffer.from(r));let o=this.libzip.malloc(r.byteLength);if(!o)throw new Error("Couldn't allocate enough memory");return new Uint8Array(this.libzip.HEAPU8.buffer,o,r.byteLength).set(r),{buffer:o,byteLength:r.byteLength}}allocateUnattachedSource(r){let o=this.libzip.struct.errorS(),{buffer:a,byteLength:n}=this.allocateBuffer(r),u=this.libzip.source.fromUnattachedBuffer(a,n,0,1,o);if(u===0)throw this.libzip.free(o),this.makeLibzipError(o);return u}allocateSource(r){let{buffer:o,byteLength:a}=this.allocateBuffer(r),n=this.libzip.source.fromBuffer(this.zip,o,a,0,1);if(n===0)throw this.libzip.free(o),this.makeLibzipError(this.libzip.getError(this.zip));return n}setFileSource(r,o){let a=Buffer.isBuffer(o)?o:Buffer.from(o),n=V.relative(Bt.root,r),u=this.allocateSource(o);try{let A=this.libzip.file.add(this.zip,n,u,this.libzip.ZIP_FL_OVERWRITE);if(A===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));if(this.level!=="mixed"){let p=this.level===0?this.libzip.ZIP_CM_STORE:this.libzip.ZIP_CM_DEFLATE;if(this.libzip.file.setCompression(this.zip,A,0,p,this.level)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip))}return this.fileSources.set(A,a),A}catch(A){throw this.libzip.source.free(u),A}}isSymbolicLink(r){if(this.symlinkCount===0)return!1;if(this.libzip.file.getExternalAttributes(this.zip,r,0,0,this.libzip.uint08S,this.libzip.uint32S)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));return this.libzip.getValue(this.libzip.uint08S,"i8")>>>0!==this.libzip.ZIP_OPSYS_UNIX?!1:(this.libzip.getValue(this.libzip.uint32S,"i32")>>>16&ta.constants.S_IFMT)===ta.constants.S_IFLNK}getFileSource(r,o={asyncDecompress:!1}){let a=this.fileSources.get(r);if(typeof a<"u")return a;let n=this.libzip.struct.statS();if(this.libzip.statIndex(this.zip,r,0,0,n)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));let A=this.libzip.struct.statCompSize(n),p=this.libzip.struct.statCompMethod(n),h=this.libzip.malloc(A);try{let E=this.libzip.fopenIndex(this.zip,r,0,this.libzip.ZIP_FL_COMPRESSED);if(E===0)throw this.makeLibzipError(this.libzip.getError(this.zip));try{let I=this.libzip.fread(E,h,A,0);if(I===-1)throw this.makeLibzipError(this.libzip.file.getError(E));if(I<A)throw new Error("Incomplete read");if(I>A)throw new Error("Overread");let v=this.libzip.HEAPU8.subarray(h,h+A),x=Buffer.from(v);if(p===0)return this.fileSources.set(r,x),x;if(o.asyncDecompress)return new Promise((C,R)=>{iU.default.inflateRaw(x,(L,U)=>{L?R(L):(this.fileSources.set(r,U),C(U))})});{let C=iU.default.inflateRawSync(x);return this.fileSources.set(r,C),C}}finally{this.libzip.fclose(E)}}finally{this.libzip.free(h)}}async fchmodPromise(r,o){return this.chmodPromise(this.fdToPath(r,"fchmod"),o)}fchmodSync(r,o){return this.chmodSync(this.fdToPath(r,"fchmodSync"),o)}async chmodPromise(r,o){return this.chmodSync(r,o)}chmodSync(r,o){if(this.readOnly)throw ar.EROFS(`chmod '${r}'`);o&=493;let a=this.resolveFilename(`chmod '${r}'`,r,!1),n=this.entries.get(a);if(typeof n>"u")throw new Error(`Assertion failed: The entry should have been registered (${a})`);let A=this.getUnixMode(n,ta.constants.S_IFREG|0)&-512|o;if(this.libzip.file.setExternalAttributes(this.zip,n,0,0,this.libzip.ZIP_OPSYS_UNIX,A<<16)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip))}async fchownPromise(r,o,a){return this.chownPromise(this.fdToPath(r,"fchown"),o,a)}fchownSync(r,o,a){return this.chownSync(this.fdToPath(r,"fchownSync"),o,a)}async chownPromise(r,o,a){return this.chownSync(r,o,a)}chownSync(r,o,a){throw new Error("Unimplemented")}async renamePromise(r,o){return this.renameSync(r,o)}renameSync(r,o){throw new Error("Unimplemented")}async copyFilePromise(r,o,a){let{indexSource:n,indexDest:u,resolvedDestP:A}=this.prepareCopyFile(r,o,a),p=await this.getFileSource(n,{asyncDecompress:!0}),h=this.setFileSource(A,p);h!==u&&this.registerEntry(A,h)}copyFileSync(r,o,a=0){let{indexSource:n,indexDest:u,resolvedDestP:A}=this.prepareCopyFile(r,o,a),p=this.getFileSource(n),h=this.setFileSource(A,p);h!==u&&this.registerEntry(A,h)}prepareCopyFile(r,o,a=0){if(this.readOnly)throw ar.EROFS(`copyfile '${r} -> '${o}'`);if((a&ta.constants.COPYFILE_FICLONE_FORCE)!==0)throw ar.ENOSYS("unsupported clone operation",`copyfile '${r}' -> ${o}'`);let n=this.resolveFilename(`copyfile '${r} -> ${o}'`,r),u=this.entries.get(n);if(typeof u>"u")throw ar.EINVAL(`copyfile '${r}' -> '${o}'`);let A=this.resolveFilename(`copyfile '${r}' -> ${o}'`,o),p=this.entries.get(A);if((a&(ta.constants.COPYFILE_EXCL|ta.constants.COPYFILE_FICLONE_FORCE))!==0&&typeof p<"u")throw ar.EEXIST(`copyfile '${r}' -> '${o}'`);return{indexSource:u,resolvedDestP:A,indexDest:p}}async appendFilePromise(r,o,a){if(this.readOnly)throw ar.EROFS(`open '${r}'`);return typeof a>"u"?a={flag:"a"}:typeof a=="string"?a={flag:"a",encoding:a}:typeof a.flag>"u"&&(a={flag:"a",...a}),this.writeFilePromise(r,o,a)}appendFileSync(r,o,a={}){if(this.readOnly)throw ar.EROFS(`open '${r}'`);return typeof a>"u"?a={flag:"a"}:typeof a=="string"?a={flag:"a",encoding:a}:typeof a.flag>"u"&&(a={flag:"a",...a}),this.writeFileSync(r,o,a)}fdToPath(r,o){let a=this.fds.get(r)?.p;if(typeof a>"u")throw ar.EBADF(o);return a}async writeFilePromise(r,o,a){let{encoding:n,mode:u,index:A,resolvedP:p}=this.prepareWriteFile(r,a);A!==void 0&&typeof a=="object"&&a.flag&&a.flag.includes("a")&&(o=Buffer.concat([await this.getFileSource(A,{asyncDecompress:!0}),Buffer.from(o)])),n!==null&&(o=o.toString(n));let h=this.setFileSource(p,o);h!==A&&this.registerEntry(p,h),u!==null&&await this.chmodPromise(p,u)}writeFileSync(r,o,a){let{encoding:n,mode:u,index:A,resolvedP:p}=this.prepareWriteFile(r,a);A!==void 0&&typeof a=="object"&&a.flag&&a.flag.includes("a")&&(o=Buffer.concat([this.getFileSource(A),Buffer.from(o)])),n!==null&&(o=o.toString(n));let h=this.setFileSource(p,o);h!==A&&this.registerEntry(p,h),u!==null&&this.chmodSync(p,u)}prepareWriteFile(r,o){if(typeof r=="number"&&(r=this.fdToPath(r,"read")),this.readOnly)throw ar.EROFS(`open '${r}'`);let a=this.resolveFilename(`open '${r}'`,r);if(this.listings.has(a))throw ar.EISDIR(`open '${r}'`);let n=null,u=null;typeof o=="string"?n=o:typeof o=="object"&&({encoding:n=null,mode:u=null}=o);let A=this.entries.get(a);return{encoding:n,mode:u,resolvedP:a,index:A}}async unlinkPromise(r){return this.unlinkSync(r)}unlinkSync(r){if(this.readOnly)throw ar.EROFS(`unlink '${r}'`);let o=this.resolveFilename(`unlink '${r}'`,r);if(this.listings.has(o))throw ar.EISDIR(`unlink '${r}'`);let a=this.entries.get(o);if(typeof a>"u")throw ar.EINVAL(`unlink '${r}'`);this.deleteEntry(o,a)}async utimesPromise(r,o,a){return this.utimesSync(r,o,a)}utimesSync(r,o,a){if(this.readOnly)throw ar.EROFS(`utimes '${r}'`);let n=this.resolveFilename(`utimes '${r}'`,r);this.utimesImpl(n,a)}async lutimesPromise(r,o,a){return this.lutimesSync(r,o,a)}lutimesSync(r,o,a){if(this.readOnly)throw ar.EROFS(`lutimes '${r}'`);let n=this.resolveFilename(`utimes '${r}'`,r,!1);this.utimesImpl(n,a)}utimesImpl(r,o){this.listings.has(r)&&(this.entries.has(r)||this.hydrateDirectory(r));let a=this.entries.get(r);if(a===void 0)throw new Error("Unreachable");if(this.libzip.file.setMtime(this.zip,a,0,lot(o),0)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip))}async mkdirPromise(r,o){return this.mkdirSync(r,o)}mkdirSync(r,{mode:o=493,recursive:a=!1}={}){if(a)return this.mkdirpSync(r,{chmod:o});if(this.readOnly)throw ar.EROFS(`mkdir '${r}'`);let n=this.resolveFilename(`mkdir '${r}'`,r);if(this.entries.has(n)||this.listings.has(n))throw ar.EEXIST(`mkdir '${r}'`);this.hydrateDirectory(n),this.chmodSync(n,o)}async rmdirPromise(r,o){return this.rmdirSync(r,o)}rmdirSync(r,{recursive:o=!1}={}){if(this.readOnly)throw ar.EROFS(`rmdir '${r}'`);if(o){this.removeSync(r);return}let a=this.resolveFilename(`rmdir '${r}'`,r),n=this.listings.get(a);if(!n)throw ar.ENOTDIR(`rmdir '${r}'`);if(n.size>0)throw ar.ENOTEMPTY(`rmdir '${r}'`);let u=this.entries.get(a);if(typeof u>"u")throw ar.EINVAL(`rmdir '${r}'`);this.deleteEntry(r,u)}hydrateDirectory(r){let o=this.libzip.dir.add(this.zip,V.relative(Bt.root,r));if(o===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));return this.registerListing(r),this.registerEntry(r,o),o}async linkPromise(r,o){return this.linkSync(r,o)}linkSync(r,o){throw ar.EOPNOTSUPP(`link '${r}' -> '${o}'`)}async symlinkPromise(r,o){return this.symlinkSync(r,o)}symlinkSync(r,o){if(this.readOnly)throw ar.EROFS(`symlink '${r}' -> '${o}'`);let a=this.resolveFilename(`symlink '${r}' -> '${o}'`,o);if(this.listings.has(a))throw ar.EISDIR(`symlink '${r}' -> '${o}'`);if(this.entries.has(a))throw ar.EEXIST(`symlink '${r}' -> '${o}'`);let n=this.setFileSource(a,r);if(this.registerEntry(a,n),this.libzip.file.setExternalAttributes(this.zip,n,0,0,this.libzip.ZIP_OPSYS_UNIX,(ta.constants.S_IFLNK|511)<<16)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));this.symlinkCount+=1}async readFilePromise(r,o){typeof o=="object"&&(o=o?o.encoding:void 0);let a=await this.readFileBuffer(r,{asyncDecompress:!0});return o?a.toString(o):a}readFileSync(r,o){typeof o=="object"&&(o=o?o.encoding:void 0);let a=this.readFileBuffer(r);return o?a.toString(o):a}readFileBuffer(r,o={asyncDecompress:!1}){typeof r=="number"&&(r=this.fdToPath(r,"read"));let a=this.resolveFilename(`open '${r}'`,r);if(!this.entries.has(a)&&!this.listings.has(a))throw ar.ENOENT(`open '${r}'`);if(r[r.length-1]==="/"&&!this.listings.has(a))throw ar.ENOTDIR(`open '${r}'`);if(this.listings.has(a))throw ar.EISDIR("read");let n=this.entries.get(a);if(n===void 0)throw new Error("Unreachable");return this.getFileSource(n,o)}async readdirPromise(r,o){return this.readdirSync(r,o)}readdirSync(r,o){let a=this.resolveFilename(`scandir '${r}'`,r);if(!this.entries.has(a)&&!this.listings.has(a))throw ar.ENOENT(`scandir '${r}'`);let n=this.listings.get(a);if(!n)throw ar.ENOTDIR(`scandir '${r}'`);if(o?.recursive)if(o?.withFileTypes){let u=Array.from(n,A=>Object.assign(this.statImpl("lstat",V.join(r,A)),{name:A,path:Bt.dot}));for(let A of u){if(!A.isDirectory())continue;let p=V.join(A.path,A.name),h=this.listings.get(V.join(a,p));for(let E of h)u.push(Object.assign(this.statImpl("lstat",V.join(r,p,E)),{name:E,path:p}))}return u}else{let u=[...n];for(let A of u){let p=this.listings.get(V.join(a,A));if(!(typeof p>"u"))for(let h of p)u.push(V.join(A,h))}return u}else return o?.withFileTypes?Array.from(n,u=>Object.assign(this.statImpl("lstat",V.join(r,u)),{name:u,path:void 0})):[...n]}async readlinkPromise(r){let o=this.prepareReadlink(r);return(await this.getFileSource(o,{asyncDecompress:!0})).toString()}readlinkSync(r){let o=this.prepareReadlink(r);return this.getFileSource(o).toString()}prepareReadlink(r){let o=this.resolveFilename(`readlink '${r}'`,r,!1);if(!this.entries.has(o)&&!this.listings.has(o))throw ar.ENOENT(`readlink '${r}'`);if(r[r.length-1]==="/"&&!this.listings.has(o))throw ar.ENOTDIR(`open '${r}'`);if(this.listings.has(o))throw ar.EINVAL(`readlink '${r}'`);let a=this.entries.get(o);if(a===void 0)throw new Error("Unreachable");if(!this.isSymbolicLink(a))throw ar.EINVAL(`readlink '${r}'`);return a}async truncatePromise(r,o=0){let a=this.resolveFilename(`open '${r}'`,r),n=this.entries.get(a);if(typeof n>"u")throw ar.EINVAL(`open '${r}'`);let u=await this.getFileSource(n,{asyncDecompress:!0}),A=Buffer.alloc(o,0);return u.copy(A),await this.writeFilePromise(r,A)}truncateSync(r,o=0){let a=this.resolveFilename(`open '${r}'`,r),n=this.entries.get(a);if(typeof n>"u")throw ar.EINVAL(`open '${r}'`);let u=this.getFileSource(n),A=Buffer.alloc(o,0);return u.copy(A),this.writeFileSync(r,A)}async ftruncatePromise(r,o){return this.truncatePromise(this.fdToPath(r,"ftruncate"),o)}ftruncateSync(r,o){return this.truncateSync(this.fdToPath(r,"ftruncateSync"),o)}watch(r,o,a){let n;switch(typeof o){case"function":case"string":case"undefined":n=!0;break;default:({persistent:n=!0}=o);break}if(!n)return{on:()=>{},close:()=>{}};let u=setInterval(()=>{},24*60*60*1e3);return{on:()=>{},close:()=>{clearInterval(u)}}}watchFile(r,o,a){let n=V.resolve(Bt.root,r);return ny(this,n,o,a)}unwatchFile(r,o){let a=V.resolve(Bt.root,r);return Mg(this,a,o)}}});function _le(t,e,r=Buffer.alloc(0),o){let a=new zi(r),n=I=>I===e||I.startsWith(`${e}/`)?I.slice(0,e.length):null,u=async(I,v)=>()=>a,A=(I,v)=>a,p={...t},h=new Tn(p),E=new Hp({baseFs:h,getMountPoint:n,factoryPromise:u,factorySync:A,magicByte:21,maxAge:1/0,typeCheck:o?.typeCheck});return Kw(Ule.default,new jp(E)),a}var Ule,Hle=Et(()=>{St();Ule=$e(ve("fs"));sU()});var jle=Et(()=>{Lle();sU();Hle()});var x1={};Vt(x1,{DEFAULT_COMPRESSION_LEVEL:()=>Mle,LibzipError:()=>Rb,ZipFS:()=>zi,ZipOpenFS:()=>Jl,getArchivePart:()=>rU,getLibzipPromise:()=>uot,getLibzipSync:()=>cot,makeEmptyArchive:()=>Fb,mountMemoryDrive:()=>_le});function cot(){return b1()}async function uot(){return b1()}var Gle,nA=Et(()=>{$4();Gle=$e(Fle());Nle();jle();Qle(()=>{let t=(0,Gle.default)();return Tle(t)})});var RE,qle=Et(()=>{St();jt();k1();RE=class extends nt{constructor(){super(...arguments);this.cwd=ge.String("--cwd",process.cwd(),{description:"The directory to run the command in"});this.commandName=ge.String();this.args=ge.Proxy()}async execute(){let r=this.args.length>0?`${this.commandName} ${this.args.join(" ")}`:this.commandName;return await TE(r,[],{cwd:ue.toPortablePath(this.cwd),stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr})}};RE.usage={description:"run a command using yarn's portable shell",details:`
+      This command will run a command using Yarn's portable shell.
+
+      Make sure to escape glob patterns, redirections, and other features that might be expanded by your own shell.
+
+      Note: To escape something from Yarn's shell, you might have to escape it twice, the first time from your own shell.
+
+      Note: Don't use this command in Yarn scripts, as Yarn's shell is automatically used.
+
+      For a list of features, visit: https://github.com/yarnpkg/berry/blob/master/packages/yarnpkg-shell/README.md.
+    `,examples:[["Run a simple command","$0 echo Hello"],["Run a command with a glob pattern","$0 echo '*.js'"],["Run a command with a redirection","$0 echo Hello World '>' hello.txt"],["Run a command with an escaped glob pattern (The double escape is needed in Unix shells)",`$0 echo '"*.js"'`],["Run a command with a variable (Double quotes are needed in Unix shells, to prevent them from expanding the variable)",'$0 "GREETING=Hello echo $GREETING World"']]}});var al,Yle=Et(()=>{al=class extends Error{constructor(e){super(e),this.name="ShellError"}}});var Lb={};Vt(Lb,{fastGlobOptions:()=>Vle,isBraceExpansion:()=>oU,isGlobPattern:()=>Aot,match:()=>fot,micromatchOptions:()=>Nb});function Aot(t){if(!Tb.default.scan(t,Nb).isGlob)return!1;try{Tb.default.parse(t,Nb)}catch{return!1}return!0}function fot(t,{cwd:e,baseFs:r}){return(0,Wle.default)(t,{...Vle,cwd:ue.fromPortablePath(e),fs:FD(Kle.default,new jp(r))})}function oU(t){return Tb.default.scan(t,Nb).isBrace}var Wle,Kle,Tb,Nb,Vle,Jle=Et(()=>{St();Wle=$e(RP()),Kle=$e(ve("fs")),Tb=$e(Zo()),Nb={strictBrackets:!0},Vle={onlyDirectories:!1,onlyFiles:!1}});function aU(){}function lU(){for(let t of kd)t.kill()}function $le(t,e,r,o){return a=>{let n=a[0]instanceof iA.Transform?"pipe":a[0],u=a[1]instanceof iA.Transform?"pipe":a[1],A=a[2]instanceof iA.Transform?"pipe":a[2],p=(0,Xle.default)(t,e,{...o,stdio:[n,u,A]});return kd.add(p),kd.size===1&&(process.on("SIGINT",aU),process.on("SIGTERM",lU)),a[0]instanceof iA.Transform&&a[0].pipe(p.stdin),a[1]instanceof iA.Transform&&p.stdout.pipe(a[1],{end:!1}),a[2]instanceof iA.Transform&&p.stderr.pipe(a[2],{end:!1}),{stdin:p.stdin,promise:new Promise(h=>{p.on("error",E=>{switch(kd.delete(p),kd.size===0&&(process.off("SIGINT",aU),process.off("SIGTERM",lU)),E.code){case"ENOENT":a[2].write(`command not found: ${t}
+`),h(127);break;case"EACCES":a[2].write(`permission denied: ${t}
+`),h(128);break;default:a[2].write(`uncaught error: ${E.message}
+`),h(1);break}}),p.on("close",E=>{kd.delete(p),kd.size===0&&(process.off("SIGINT",aU),process.off("SIGTERM",lU)),h(E!==null?E:129)})})}}}function ece(t){return e=>{let r=e[0]==="pipe"?new iA.PassThrough:e[0];return{stdin:r,promise:Promise.resolve().then(()=>t({stdin:r,stdout:e[1],stderr:e[2]}))}}}function Ob(t,e){return NE.start(t,e)}function zle(t,e=null){let r=new iA.PassThrough,o=new Zle.StringDecoder,a="";return r.on("data",n=>{let u=o.write(n),A;do if(A=u.indexOf(`
+`),A!==-1){let p=a+u.substring(0,A);u=u.substring(A+1),a="",t(e!==null?`${e} ${p}`:p)}while(A!==-1);a+=u}),r.on("end",()=>{let n=o.end();n!==""&&t(e!==null?`${e} ${n}`:n)}),r}function tce(t,{prefix:e}){return{stdout:zle(r=>t.stdout.write(`${r}
+`),t.stdout.isTTY?e:null),stderr:zle(r=>t.stderr.write(`${r}
+`),t.stderr.isTTY?e:null)}}var Xle,iA,Zle,kd,zl,cU,NE,uU=Et(()=>{Xle=$e(sT()),iA=ve("stream"),Zle=ve("string_decoder"),kd=new Set;zl=class{constructor(e){this.stream=e}close(){}get(){return this.stream}},cU=class{constructor(){this.stream=null}close(){if(this.stream===null)throw new Error("Assertion failed: No stream attached");this.stream.end()}attach(e){this.stream=e}get(){if(this.stream===null)throw new Error("Assertion failed: No stream attached");return this.stream}},NE=class{constructor(e,r){this.stdin=null;this.stdout=null;this.stderr=null;this.pipe=null;this.ancestor=e,this.implementation=r}static start(e,{stdin:r,stdout:o,stderr:a}){let n=new NE(null,e);return n.stdin=r,n.stdout=o,n.stderr=a,n}pipeTo(e,r=1){let o=new NE(this,e),a=new cU;return o.pipe=a,o.stdout=this.stdout,o.stderr=this.stderr,(r&1)===1?this.stdout=a:this.ancestor!==null&&(this.stderr=this.ancestor.stdout),(r&2)===2?this.stderr=a:this.ancestor!==null&&(this.stderr=this.ancestor.stderr),o}async exec(){let e=["ignore","ignore","ignore"];if(this.pipe)e[0]="pipe";else{if(this.stdin===null)throw new Error("Assertion failed: No input stream registered");e[0]=this.stdin.get()}let r;if(this.stdout===null)throw new Error("Assertion failed: No output stream registered");r=this.stdout,e[1]=r.get();let o;if(this.stderr===null)throw new Error("Assertion failed: No error stream registered");o=this.stderr,e[2]=o.get();let a=this.implementation(e);return this.pipe&&this.pipe.attach(a.stdin),await a.promise.then(n=>(r.close(),o.close(),n))}async run(){let e=[];for(let o=this;o;o=o.ancestor)e.push(o.exec());return(await Promise.all(e))[0]}}});var T1={};Vt(T1,{EntryCommand:()=>RE,ShellError:()=>al,execute:()=>TE,globUtils:()=>Lb});function rce(t,e,r){let o=new ll.PassThrough({autoDestroy:!0});switch(t){case 0:(e&1)===1&&r.stdin.pipe(o,{end:!1}),(e&2)===2&&r.stdin instanceof ll.Writable&&o.pipe(r.stdin,{end:!1});break;case 1:(e&1)===1&&r.stdout.pipe(o,{end:!1}),(e&2)===2&&o.pipe(r.stdout,{end:!1});break;case 2:(e&1)===1&&r.stderr.pipe(o,{end:!1}),(e&2)===2&&o.pipe(r.stderr,{end:!1});break;default:throw new al(`Bad file descriptor: "${t}"`)}return o}function Ub(t,e={}){let r={...t,...e};return r.environment={...t.environment,...e.environment},r.variables={...t.variables,...e.variables},r}async function hot(t,e,r){let o=[],a=new ll.PassThrough;return a.on("data",n=>o.push(n)),await _b(t,e,Ub(r,{stdout:a})),Buffer.concat(o).toString().replace(/[\r\n]+$/,"")}async function nce(t,e,r){let o=t.map(async n=>{let u=await Qd(n.args,e,r);return{name:n.name,value:u.join(" ")}});return(await Promise.all(o)).reduce((n,u)=>(n[u.name]=u.value,n),{})}function Mb(t){return t.match(/[^ \r\n\t]+/g)||[]}async function cce(t,e,r,o,a=o){switch(t.name){case"$":o(String(process.pid));break;case"#":o(String(e.args.length));break;case"@":if(t.quoted)for(let n of e.args)a(n);else for(let n of e.args){let u=Mb(n);for(let A=0;A<u.length-1;++A)a(u[A]);o(u[u.length-1])}break;case"*":{let n=e.args.join(" ");if(t.quoted)o(n);else for(let u of Mb(n))a(u)}break;case"PPID":o(String(process.ppid));break;case"RANDOM":o(String(Math.floor(Math.random()*32768)));break;default:{let n=parseInt(t.name,10),u,A=Number.isFinite(n);if(A?n>=0&&n<e.args.length&&(u=e.args[n]):Object.hasOwn(r.variables,t.name)?u=r.variables[t.name]:Object.hasOwn(r.environment,t.name)&&(u=r.environment[t.name]),typeof u<"u"&&t.alternativeValue?u=(await Qd(t.alternativeValue,e,r)).join(" "):typeof u>"u"&&(t.defaultValue?u=(await Qd(t.defaultValue,e,r)).join(" "):t.alternativeValue&&(u="")),typeof u>"u")throw A?new al(`Unbound argument #${n}`):new al(`Unbound variable "${t.name}"`);if(t.quoted)o(u);else{let p=Mb(u);for(let E=0;E<p.length-1;++E)a(p[E]);let h=p[p.length-1];typeof h<"u"&&o(h)}}break}}async function Q1(t,e,r){if(t.type==="number"){if(Number.isInteger(t.value))return t.value;throw new Error(`Invalid number: "${t.value}", only integers are allowed`)}else if(t.type==="variable"){let o=[];await cce({...t,quoted:!0},e,r,n=>o.push(n));let a=Number(o.join(" "));return Number.isNaN(a)?Q1({type:"variable",name:o.join(" ")},e,r):Q1({type:"number",value:a},e,r)}else return got[t.type](await Q1(t.left,e,r),await Q1(t.right,e,r))}async function Qd(t,e,r){let o=new Map,a=[],n=[],u=E=>{n.push(E)},A=()=>{n.length>0&&a.push(n.join("")),n=[]},p=E=>{u(E),A()},h=(E,I,v)=>{let x=JSON.stringify({type:E,fd:I}),C=o.get(x);typeof C>"u"&&o.set(x,C=[]),C.push(v)};for(let E of t){let I=!1;switch(E.type){case"redirection":{let v=await Qd(E.args,e,r);for(let x of v)h(E.subtype,E.fd,x)}break;case"argument":for(let v of E.segments)switch(v.type){case"text":u(v.text);break;case"glob":u(v.pattern),I=!0;break;case"shell":{let x=await hot(v.shell,e,r);if(v.quoted)u(x);else{let C=Mb(x);for(let R=0;R<C.length-1;++R)p(C[R]);u(C[C.length-1])}}break;case"variable":await cce(v,e,r,u,p);break;case"arithmetic":u(String(await Q1(v.arithmetic,e,r)));break}break}if(A(),I){let v=a.pop();if(typeof v>"u")throw new Error("Assertion failed: Expected a glob pattern to have been set");let x=await e.glob.match(v,{cwd:r.cwd,baseFs:e.baseFs});if(x.length===0){let C=oU(v)?". Note: Brace expansion of arbitrary strings isn't currently supported. For more details, please read this issue: https://github.com/yarnpkg/berry/issues/22":"";throw new al(`No matches found: "${v}"${C}`)}for(let C of x.sort())p(C)}}if(o.size>0){let E=[];for(let[I,v]of o.entries())E.splice(E.length,0,I,String(v.length),...v);a.splice(0,0,"__ysh_set_redirects",...E,"--")}return a}function F1(t,e,r){e.builtins.has(t[0])||(t=["command",...t]);let o=ue.fromPortablePath(r.cwd),a=r.environment;typeof a.PWD<"u"&&(a={...a,PWD:o});let[n,...u]=t;if(n==="command")return $le(u[0],u.slice(1),e,{cwd:o,env:a});let A=e.builtins.get(n);if(typeof A>"u")throw new Error(`Assertion failed: A builtin should exist for "${n}"`);return ece(async({stdin:p,stdout:h,stderr:E})=>{let{stdin:I,stdout:v,stderr:x}=r;r.stdin=p,r.stdout=h,r.stderr=E;try{return await A(u,e,r)}finally{r.stdin=I,r.stdout=v,r.stderr=x}})}function dot(t,e,r){return o=>{let a=new ll.PassThrough,n=_b(t,e,Ub(r,{stdin:a}));return{stdin:a,promise:n}}}function mot(t,e,r){return o=>{let a=new ll.PassThrough,n=_b(t,e,r);return{stdin:a,promise:n}}}function ice(t,e,r,o){if(e.length===0)return t;{let a;do a=String(Math.random());while(Object.hasOwn(o.procedures,a));return o.procedures={...o.procedures},o.procedures[a]=t,F1([...e,"__ysh_run_procedure",a],r,o)}}async function sce(t,e,r){let o=t,a=null,n=null;for(;o;){let u=o.then?{...r}:r,A;switch(o.type){case"command":{let p=await Qd(o.args,e,r),h=await nce(o.envs,e,r);A=o.envs.length?F1(p,e,Ub(u,{environment:h})):F1(p,e,u)}break;case"subshell":{let p=await Qd(o.args,e,r),h=dot(o.subshell,e,u);A=ice(h,p,e,u)}break;case"group":{let p=await Qd(o.args,e,r),h=mot(o.group,e,u);A=ice(h,p,e,u)}break;case"envs":{let p=await nce(o.envs,e,r);u.environment={...u.environment,...p},A=F1(["true"],e,u)}break}if(typeof A>"u")throw new Error("Assertion failed: An action should have been generated");if(a===null)n=Ob(A,{stdin:new zl(u.stdin),stdout:new zl(u.stdout),stderr:new zl(u.stderr)});else{if(n===null)throw new Error("Assertion failed: The execution pipeline should have been setup");switch(a){case"|":n=n.pipeTo(A,1);break;case"|&":n=n.pipeTo(A,3);break}}o.then?(a=o.then.type,o=o.then.chain):o=null}if(n===null)throw new Error("Assertion failed: The execution pipeline should have been setup");return await n.run()}async function yot(t,e,r,{background:o=!1}={}){function a(n){let u=["#2E86AB","#A23B72","#F18F01","#C73E1D","#CCE2A3"],A=u[n%u.length];return oce.default.hex(A)}if(o){let n=r.nextBackgroundJobIndex++,u=a(n),A=`[${n}]`,p=u(A),{stdout:h,stderr:E}=tce(r,{prefix:p});return r.backgroundJobs.push(sce(t,e,Ub(r,{stdout:h,stderr:E})).catch(I=>E.write(`${I.message}
+`)).finally(()=>{r.stdout.isTTY&&r.stdout.write(`Job ${p}, '${u(uy(t))}' has ended
+`)})),0}return await sce(t,e,r)}async function Eot(t,e,r,{background:o=!1}={}){let a,n=A=>{a=A,r.variables["?"]=String(A)},u=async A=>{try{return await yot(A.chain,e,r,{background:o&&typeof A.then>"u"})}catch(p){if(!(p instanceof al))throw p;return r.stderr.write(`${p.message}
+`),1}};for(n(await u(t));t.then;){if(r.exitCode!==null)return r.exitCode;switch(t.then.type){case"&&":a===0&&n(await u(t.then.line));break;case"||":a!==0&&n(await u(t.then.line));break;default:throw new Error(`Assertion failed: Unsupported command type: "${t.then.type}"`)}t=t.then.line}return a}async function _b(t,e,r){let o=r.backgroundJobs;r.backgroundJobs=[];let a=0;for(let{command:n,type:u}of t){if(a=await Eot(n,e,r,{background:u==="&"}),r.exitCode!==null)return r.exitCode;r.variables["?"]=String(a)}return await Promise.all(r.backgroundJobs),r.backgroundJobs=o,a}function uce(t){switch(t.type){case"variable":return t.name==="@"||t.name==="#"||t.name==="*"||Number.isFinite(parseInt(t.name,10))||"defaultValue"in t&&!!t.defaultValue&&t.defaultValue.some(e=>R1(e))||"alternativeValue"in t&&!!t.alternativeValue&&t.alternativeValue.some(e=>R1(e));case"arithmetic":return AU(t.arithmetic);case"shell":return fU(t.shell);default:return!1}}function R1(t){switch(t.type){case"redirection":return t.args.some(e=>R1(e));case"argument":return t.segments.some(e=>uce(e));default:throw new Error(`Assertion failed: Unsupported argument type: "${t.type}"`)}}function AU(t){switch(t.type){case"variable":return uce(t);case"number":return!1;default:return AU(t.left)||AU(t.right)}}function fU(t){return t.some(({command:e})=>{for(;e;){let r=e.chain;for(;r;){let o;switch(r.type){case"subshell":o=fU(r.subshell);break;case"command":o=r.envs.some(a=>a.args.some(n=>R1(n)))||r.args.some(a=>R1(a));break}if(o)return!0;if(!r.then)break;r=r.then.chain}if(!e.then)break;e=e.then.line}return!1})}async function TE(t,e=[],{baseFs:r=new Tn,builtins:o={},cwd:a=ue.toPortablePath(process.cwd()),env:n=process.env,stdin:u=process.stdin,stdout:A=process.stdout,stderr:p=process.stderr,variables:h={},glob:E=Lb}={}){let I={};for(let[C,R]of Object.entries(n))typeof R<"u"&&(I[C]=R);let v=new Map(pot);for(let[C,R]of Object.entries(o))v.set(C,R);u===null&&(u=new ll.PassThrough,u.end());let x=ND(t,E);if(!fU(x)&&x.length>0&&e.length>0){let{command:C}=x[x.length-1];for(;C.then;)C=C.then.line;let R=C.chain;for(;R.then;)R=R.then.chain;R.type==="command"&&(R.args=R.args.concat(e.map(L=>({type:"argument",segments:[{type:"text",text:L}]}))))}return await _b(x,{args:e,baseFs:r,builtins:v,initialStdin:u,initialStdout:A,initialStderr:p,glob:E},{cwd:a,environment:I,exitCode:null,procedures:{},stdin:u,stdout:A,stderr:p,variables:Object.assign({},h,{["?"]:0}),nextBackgroundJobIndex:1,backgroundJobs:[]})}var oce,ace,ll,lce,pot,got,k1=Et(()=>{St();Nl();oce=$e(IN()),ace=ve("os"),ll=ve("stream"),lce=ve("timers/promises");qle();Yle();Jle();uU();uU();pot=new Map([["cd",async([t=(0,ace.homedir)(),...e],r,o)=>{let a=V.resolve(o.cwd,ue.toPortablePath(t));if(!(await r.baseFs.statPromise(a).catch(u=>{throw u.code==="ENOENT"?new al(`cd: no such file or directory: ${t}`):u})).isDirectory())throw new al(`cd: not a directory: ${t}`);return o.cwd=a,0}],["pwd",async(t,e,r)=>(r.stdout.write(`${ue.fromPortablePath(r.cwd)}
+`),0)],[":",async(t,e,r)=>0],["true",async(t,e,r)=>0],["false",async(t,e,r)=>1],["exit",async([t,...e],r,o)=>o.exitCode=parseInt(t??o.variables["?"],10)],["echo",async(t,e,r)=>(r.stdout.write(`${t.join(" ")}
+`),0)],["sleep",async([t],e,r)=>{if(typeof t>"u")throw new al("sleep: missing operand");let o=Number(t);if(Number.isNaN(o))throw new al(`sleep: invalid time interval '${t}'`);return await(0,lce.setTimeout)(1e3*o,0)}],["__ysh_run_procedure",async(t,e,r)=>{let o=r.procedures[t[0]];return await Ob(o,{stdin:new zl(r.stdin),stdout:new zl(r.stdout),stderr:new zl(r.stderr)}).run()}],["__ysh_set_redirects",async(t,e,r)=>{let o=r.stdin,a=r.stdout,n=r.stderr,u=[],A=[],p=[],h=0;for(;t[h]!=="--";){let I=t[h++],{type:v,fd:x}=JSON.parse(I),C=J=>{switch(x){case null:case 0:u.push(J);break;default:throw new Error(`Unsupported file descriptor: "${x}"`)}},R=J=>{switch(x){case null:case 1:A.push(J);break;case 2:p.push(J);break;default:throw new Error(`Unsupported file descriptor: "${x}"`)}},L=Number(t[h++]),U=h+L;for(let J=h;J<U;++h,++J)switch(v){case"<":C(()=>e.baseFs.createReadStream(V.resolve(r.cwd,ue.toPortablePath(t[J]))));break;case"<<<":C(()=>{let te=new ll.PassThrough;return process.nextTick(()=>{te.write(`${t[J]}
+`),te.end()}),te});break;case"<&":C(()=>rce(Number(t[J]),1,r));break;case">":case">>":{let te=V.resolve(r.cwd,ue.toPortablePath(t[J]));R(te==="/dev/null"?new ll.Writable({autoDestroy:!0,emitClose:!0,write(ae,fe,ce){setImmediate(ce)}}):e.baseFs.createWriteStream(te,v===">>"?{flags:"a"}:void 0))}break;case">&":R(rce(Number(t[J]),2,r));break;default:throw new Error(`Assertion failed: Unsupported redirection type: "${v}"`)}}if(u.length>0){let I=new ll.PassThrough;o=I;let v=x=>{if(x===u.length)I.end();else{let C=u[x]();C.pipe(I,{end:!1}),C.on("end",()=>{v(x+1)})}};v(0)}if(A.length>0){let I=new ll.PassThrough;a=I;for(let v of A)I.pipe(v)}if(p.length>0){let I=new ll.PassThrough;n=I;for(let v of p)I.pipe(v)}let E=await Ob(F1(t.slice(h+1),e,r),{stdin:new zl(o),stdout:new zl(a),stderr:new zl(n)}).run();return await Promise.all(A.map(I=>new Promise((v,x)=>{I.on("error",C=>{x(C)}),I.on("close",()=>{v()}),I.end()}))),await Promise.all(p.map(I=>new Promise((v,x)=>{I.on("error",C=>{x(C)}),I.on("close",()=>{v()}),I.end()}))),E}]]);got={addition:(t,e)=>t+e,subtraction:(t,e)=>t-e,multiplication:(t,e)=>t*e,division:(t,e)=>Math.trunc(t/e)}});var Hb=_((r4t,Ace)=>{function Cot(t,e){for(var r=-1,o=t==null?0:t.length,a=Array(o);++r<o;)a[r]=e(t[r],r,t);return a}Ace.exports=Cot});var mce=_((n4t,dce)=>{var fce=pd(),wot=Hb(),Iot=Hl(),Bot=pE(),vot=1/0,pce=fce?fce.prototype:void 0,hce=pce?pce.toString:void 0;function gce(t){if(typeof t=="string")return t;if(Iot(t))return wot(t,gce)+"";if(Bot(t))return hce?hce.call(t):"";var e=t+"";return e=="0"&&1/t==-vot?"-0":e}dce.exports=gce});var N1=_((i4t,yce)=>{var Dot=mce();function Sot(t){return t==null?"":Dot(t)}yce.exports=Sot});var pU=_((s4t,Ece)=>{function Pot(t,e,r){var o=-1,a=t.length;e<0&&(e=-e>a?0:a+e),r=r>a?a:r,r<0&&(r+=a),a=e>r?0:r-e>>>0,e>>>=0;for(var n=Array(a);++o<a;)n[o]=t[o+e];return n}Ece.exports=Pot});var wce=_((o4t,Cce)=>{var bot=pU();function xot(t,e,r){var o=t.length;return r=r===void 0?o:r,!e&&r>=o?t:bot(t,e,r)}Cce.exports=xot});var hU=_((a4t,Ice)=>{var kot="\\ud800-\\udfff",Qot="\\u0300-\\u036f",Fot="\\ufe20-\\ufe2f",Rot="\\u20d0-\\u20ff",Tot=Qot+Fot+Rot,Not="\\ufe0e\\ufe0f",Lot="\\u200d",Oot=RegExp("["+Lot+kot+Tot+Not+"]");function Mot(t){return Oot.test(t)}Ice.exports=Mot});var vce=_((l4t,Bce)=>{function Uot(t){return t.split("")}Bce.exports=Uot});var Fce=_((c4t,Qce)=>{var Dce="\\ud800-\\udfff",_ot="\\u0300-\\u036f",Hot="\\ufe20-\\ufe2f",jot="\\u20d0-\\u20ff",Got=_ot+Hot+jot,qot="\\ufe0e\\ufe0f",Yot="["+Dce+"]",gU="["+Got+"]",dU="\\ud83c[\\udffb-\\udfff]",Wot="(?:"+gU+"|"+dU+")",Sce="[^"+Dce+"]",Pce="(?:\\ud83c[\\udde6-\\uddff]){2}",bce="[\\ud800-\\udbff][\\udc00-\\udfff]",Kot="\\u200d",xce=Wot+"?",kce="["+qot+"]?",Vot="(?:"+Kot+"(?:"+[Sce,Pce,bce].join("|")+")"+kce+xce+")*",Jot=kce+xce+Vot,zot="(?:"+[Sce+gU+"?",gU,Pce,bce,Yot].join("|")+")",Xot=RegExp(dU+"(?="+dU+")|"+zot+Jot,"g");function Zot(t){return t.match(Xot)||[]}Qce.exports=Zot});var Tce=_((u4t,Rce)=>{var $ot=vce(),eat=hU(),tat=Fce();function rat(t){return eat(t)?tat(t):$ot(t)}Rce.exports=rat});var Lce=_((A4t,Nce)=>{var nat=wce(),iat=hU(),sat=Tce(),oat=N1();function aat(t){return function(e){e=oat(e);var r=iat(e)?sat(e):void 0,o=r?r[0]:e.charAt(0),a=r?nat(r,1).join(""):e.slice(1);return o[t]()+a}}Nce.exports=aat});var Mce=_((f4t,Oce)=>{var lat=Lce(),cat=lat("toUpperCase");Oce.exports=cat});var mU=_((p4t,Uce)=>{var uat=N1(),Aat=Mce();function fat(t){return Aat(uat(t).toLowerCase())}Uce.exports=fat});var _ce=_((h4t,jb)=>{function pat(){var t=0,e=1,r=2,o=3,a=4,n=5,u=6,A=7,p=8,h=9,E=10,I=11,v=12,x=13,C=14,R=15,L=16,U=17,J=0,te=1,ae=2,fe=3,ce=4;function me(g,Ee){return 55296<=g.charCodeAt(Ee)&&g.charCodeAt(Ee)<=56319&&56320<=g.charCodeAt(Ee+1)&&g.charCodeAt(Ee+1)<=57343}function he(g,Ee){Ee===void 0&&(Ee=0);var Se=g.charCodeAt(Ee);if(55296<=Se&&Se<=56319&&Ee<g.length-1){var le=Se,ne=g.charCodeAt(Ee+1);return 56320<=ne&&ne<=57343?(le-55296)*1024+(ne-56320)+65536:le}if(56320<=Se&&Se<=57343&&Ee>=1){var le=g.charCodeAt(Ee-1),ne=Se;return 55296<=le&&le<=56319?(le-55296)*1024+(ne-56320)+65536:ne}return Se}function Be(g,Ee,Se){var le=[g].concat(Ee).concat([Se]),ne=le[le.length-2],ee=Se,Ie=le.lastIndexOf(C);if(Ie>1&&le.slice(1,Ie).every(function(H){return H==o})&&[o,x,U].indexOf(g)==-1)return ae;var Fe=le.lastIndexOf(a);if(Fe>0&&le.slice(1,Fe).every(function(H){return H==a})&&[v,a].indexOf(ne)==-1)return le.filter(function(H){return H==a}).length%2==1?fe:ce;if(ne==t&&ee==e)return J;if(ne==r||ne==t||ne==e)return ee==C&&Ee.every(function(H){return H==o})?ae:te;if(ee==r||ee==t||ee==e)return te;if(ne==u&&(ee==u||ee==A||ee==h||ee==E))return J;if((ne==h||ne==A)&&(ee==A||ee==p))return J;if((ne==E||ne==p)&&ee==p)return J;if(ee==o||ee==R)return J;if(ee==n)return J;if(ne==v)return J;var At=le.indexOf(o)!=-1?le.lastIndexOf(o)-1:le.length-2;return[x,U].indexOf(le[At])!=-1&&le.slice(At+1,-1).every(function(H){return H==o})&&ee==C||ne==R&&[L,U].indexOf(ee)!=-1?J:Ee.indexOf(a)!=-1?ae:ne==a&&ee==a?J:te}this.nextBreak=function(g,Ee){if(Ee===void 0&&(Ee=0),Ee<0)return 0;if(Ee>=g.length-1)return g.length;for(var Se=we(he(g,Ee)),le=[],ne=Ee+1;ne<g.length;ne++)if(!me(g,ne-1)){var ee=we(he(g,ne));if(Be(Se,le,ee))return ne;le.push(ee)}return g.length},this.splitGraphemes=function(g){for(var Ee=[],Se=0,le;(le=this.nextBreak(g,Se))<g.length;)Ee.push(g.slice(Se,le)),Se=le;return Se<g.length&&Ee.push(g.slice(Se)),Ee},this.iterateGraphemes=function(g){var Ee=0,Se={next:function(){var le,ne;return(ne=this.nextBreak(g,Ee))<g.length?(le=g.slice(Ee,ne),Ee=ne,{value:le,done:!1}):Ee<g.length?(le=g.slice(Ee),Ee=g.length,{value:le,done:!1}):{value:void 0,done:!0}}.bind(this)};return typeof Symbol<"u"&&Symbol.iterator&&(Se[Symbol.iterator]=function(){return Se}),Se},this.countGraphemes=function(g){for(var Ee=0,Se=0,le;(le=this.nextBreak(g,Se))<g.length;)Se=le,Ee++;return Se<g.length&&Ee++,Ee};function we(g){return 1536<=g&&g<=1541||g==1757||g==1807||g==2274||g==3406||g==69821||70082<=g&&g<=70083||g==72250||72326<=g&&g<=72329||g==73030?v:g==13?t:g==10?e:0<=g&&g<=9||11<=g&&g<=12||14<=g&&g<=31||127<=g&&g<=159||g==173||g==1564||g==6158||g==8203||8206<=g&&g<=8207||g==8232||g==8233||8234<=g&&g<=8238||8288<=g&&g<=8292||g==8293||8294<=g&&g<=8303||55296<=g&&g<=57343||g==65279||65520<=g&&g<=65528||65529<=g&&g<=65531||113824<=g&&g<=113827||119155<=g&&g<=119162||g==917504||g==917505||917506<=g&&g<=917535||917632<=g&&g<=917759||918e3<=g&&g<=921599?r:768<=g&&g<=879||1155<=g&&g<=1159||1160<=g&&g<=1161||1425<=g&&g<=1469||g==1471||1473<=g&&g<=1474||1476<=g&&g<=1477||g==1479||1552<=g&&g<=1562||1611<=g&&g<=1631||g==1648||1750<=g&&g<=1756||1759<=g&&g<=1764||1767<=g&&g<=1768||1770<=g&&g<=1773||g==1809||1840<=g&&g<=1866||1958<=g&&g<=1968||2027<=g&&g<=2035||2070<=g&&g<=2073||2075<=g&&g<=2083||2085<=g&&g<=2087||2089<=g&&g<=2093||2137<=g&&g<=2139||2260<=g&&g<=2273||2275<=g&&g<=2306||g==2362||g==2364||2369<=g&&g<=2376||g==2381||2385<=g&&g<=2391||2402<=g&&g<=2403||g==2433||g==2492||g==2494||2497<=g&&g<=2500||g==2509||g==2519||2530<=g&&g<=2531||2561<=g&&g<=2562||g==2620||2625<=g&&g<=2626||2631<=g&&g<=2632||2635<=g&&g<=2637||g==2641||2672<=g&&g<=2673||g==2677||2689<=g&&g<=2690||g==2748||2753<=g&&g<=2757||2759<=g&&g<=2760||g==2765||2786<=g&&g<=2787||2810<=g&&g<=2815||g==2817||g==2876||g==2878||g==2879||2881<=g&&g<=2884||g==2893||g==2902||g==2903||2914<=g&&g<=2915||g==2946||g==3006||g==3008||g==3021||g==3031||g==3072||3134<=g&&g<=3136||3142<=g&&g<=3144||3146<=g&&g<=3149||3157<=g&&g<=3158||3170<=g&&g<=3171||g==3201||g==3260||g==3263||g==3266||g==3270||3276<=g&&g<=3277||3285<=g&&g<=3286||3298<=g&&g<=3299||3328<=g&&g<=3329||3387<=g&&g<=3388||g==3390||3393<=g&&g<=3396||g==3405||g==3415||3426<=g&&g<=3427||g==3530||g==3535||3538<=g&&g<=3540||g==3542||g==3551||g==3633||3636<=g&&g<=3642||3655<=g&&g<=3662||g==3761||3764<=g&&g<=3769||3771<=g&&g<=3772||3784<=g&&g<=3789||3864<=g&&g<=3865||g==3893||g==3895||g==3897||3953<=g&&g<=3966||3968<=g&&g<=3972||3974<=g&&g<=3975||3981<=g&&g<=3991||3993<=g&&g<=4028||g==4038||4141<=g&&g<=4144||4146<=g&&g<=4151||4153<=g&&g<=4154||4157<=g&&g<=4158||4184<=g&&g<=4185||4190<=g&&g<=4192||4209<=g&&g<=4212||g==4226||4229<=g&&g<=4230||g==4237||g==4253||4957<=g&&g<=4959||5906<=g&&g<=5908||5938<=g&&g<=5940||5970<=g&&g<=5971||6002<=g&&g<=6003||6068<=g&&g<=6069||6071<=g&&g<=6077||g==6086||6089<=g&&g<=6099||g==6109||6155<=g&&g<=6157||6277<=g&&g<=6278||g==6313||6432<=g&&g<=6434||6439<=g&&g<=6440||g==6450||6457<=g&&g<=6459||6679<=g&&g<=6680||g==6683||g==6742||6744<=g&&g<=6750||g==6752||g==6754||6757<=g&&g<=6764||6771<=g&&g<=6780||g==6783||6832<=g&&g<=6845||g==6846||6912<=g&&g<=6915||g==6964||6966<=g&&g<=6970||g==6972||g==6978||7019<=g&&g<=7027||7040<=g&&g<=7041||7074<=g&&g<=7077||7080<=g&&g<=7081||7083<=g&&g<=7085||g==7142||7144<=g&&g<=7145||g==7149||7151<=g&&g<=7153||7212<=g&&g<=7219||7222<=g&&g<=7223||7376<=g&&g<=7378||7380<=g&&g<=7392||7394<=g&&g<=7400||g==7405||g==7412||7416<=g&&g<=7417||7616<=g&&g<=7673||7675<=g&&g<=7679||g==8204||8400<=g&&g<=8412||8413<=g&&g<=8416||g==8417||8418<=g&&g<=8420||8421<=g&&g<=8432||11503<=g&&g<=11505||g==11647||11744<=g&&g<=11775||12330<=g&&g<=12333||12334<=g&&g<=12335||12441<=g&&g<=12442||g==42607||42608<=g&&g<=42610||42612<=g&&g<=42621||42654<=g&&g<=42655||42736<=g&&g<=42737||g==43010||g==43014||g==43019||43045<=g&&g<=43046||43204<=g&&g<=43205||43232<=g&&g<=43249||43302<=g&&g<=43309||43335<=g&&g<=43345||43392<=g&&g<=43394||g==43443||43446<=g&&g<=43449||g==43452||g==43493||43561<=g&&g<=43566||43569<=g&&g<=43570||43573<=g&&g<=43574||g==43587||g==43596||g==43644||g==43696||43698<=g&&g<=43700||43703<=g&&g<=43704||43710<=g&&g<=43711||g==43713||43756<=g&&g<=43757||g==43766||g==44005||g==44008||g==44013||g==64286||65024<=g&&g<=65039||65056<=g&&g<=65071||65438<=g&&g<=65439||g==66045||g==66272||66422<=g&&g<=66426||68097<=g&&g<=68099||68101<=g&&g<=68102||68108<=g&&g<=68111||68152<=g&&g<=68154||g==68159||68325<=g&&g<=68326||g==69633||69688<=g&&g<=69702||69759<=g&&g<=69761||69811<=g&&g<=69814||69817<=g&&g<=69818||69888<=g&&g<=69890||69927<=g&&g<=69931||69933<=g&&g<=69940||g==70003||70016<=g&&g<=70017||70070<=g&&g<=70078||70090<=g&&g<=70092||70191<=g&&g<=70193||g==70196||70198<=g&&g<=70199||g==70206||g==70367||70371<=g&&g<=70378||70400<=g&&g<=70401||g==70460||g==70462||g==70464||g==70487||70502<=g&&g<=70508||70512<=g&&g<=70516||70712<=g&&g<=70719||70722<=g&&g<=70724||g==70726||g==70832||70835<=g&&g<=70840||g==70842||g==70845||70847<=g&&g<=70848||70850<=g&&g<=70851||g==71087||71090<=g&&g<=71093||71100<=g&&g<=71101||71103<=g&&g<=71104||71132<=g&&g<=71133||71219<=g&&g<=71226||g==71229||71231<=g&&g<=71232||g==71339||g==71341||71344<=g&&g<=71349||g==71351||71453<=g&&g<=71455||71458<=g&&g<=71461||71463<=g&&g<=71467||72193<=g&&g<=72198||72201<=g&&g<=72202||72243<=g&&g<=72248||72251<=g&&g<=72254||g==72263||72273<=g&&g<=72278||72281<=g&&g<=72283||72330<=g&&g<=72342||72344<=g&&g<=72345||72752<=g&&g<=72758||72760<=g&&g<=72765||g==72767||72850<=g&&g<=72871||72874<=g&&g<=72880||72882<=g&&g<=72883||72885<=g&&g<=72886||73009<=g&&g<=73014||g==73018||73020<=g&&g<=73021||73023<=g&&g<=73029||g==73031||92912<=g&&g<=92916||92976<=g&&g<=92982||94095<=g&&g<=94098||113821<=g&&g<=113822||g==119141||119143<=g&&g<=119145||119150<=g&&g<=119154||119163<=g&&g<=119170||119173<=g&&g<=119179||119210<=g&&g<=119213||119362<=g&&g<=119364||121344<=g&&g<=121398||121403<=g&&g<=121452||g==121461||g==121476||121499<=g&&g<=121503||121505<=g&&g<=121519||122880<=g&&g<=122886||122888<=g&&g<=122904||122907<=g&&g<=122913||122915<=g&&g<=122916||122918<=g&&g<=122922||125136<=g&&g<=125142||125252<=g&&g<=125258||917536<=g&&g<=917631||917760<=g&&g<=917999?o:127462<=g&&g<=127487?a:g==2307||g==2363||2366<=g&&g<=2368||2377<=g&&g<=2380||2382<=g&&g<=2383||2434<=g&&g<=2435||2495<=g&&g<=2496||2503<=g&&g<=2504||2507<=g&&g<=2508||g==2563||2622<=g&&g<=2624||g==2691||2750<=g&&g<=2752||g==2761||2763<=g&&g<=2764||2818<=g&&g<=2819||g==2880||2887<=g&&g<=2888||2891<=g&&g<=2892||g==3007||3009<=g&&g<=3010||3014<=g&&g<=3016||3018<=g&&g<=3020||3073<=g&&g<=3075||3137<=g&&g<=3140||3202<=g&&g<=3203||g==3262||3264<=g&&g<=3265||3267<=g&&g<=3268||3271<=g&&g<=3272||3274<=g&&g<=3275||3330<=g&&g<=3331||3391<=g&&g<=3392||3398<=g&&g<=3400||3402<=g&&g<=3404||3458<=g&&g<=3459||3536<=g&&g<=3537||3544<=g&&g<=3550||3570<=g&&g<=3571||g==3635||g==3763||3902<=g&&g<=3903||g==3967||g==4145||4155<=g&&g<=4156||4182<=g&&g<=4183||g==4228||g==6070||6078<=g&&g<=6085||6087<=g&&g<=6088||6435<=g&&g<=6438||6441<=g&&g<=6443||6448<=g&&g<=6449||6451<=g&&g<=6456||6681<=g&&g<=6682||g==6741||g==6743||6765<=g&&g<=6770||g==6916||g==6965||g==6971||6973<=g&&g<=6977||6979<=g&&g<=6980||g==7042||g==7073||7078<=g&&g<=7079||g==7082||g==7143||7146<=g&&g<=7148||g==7150||7154<=g&&g<=7155||7204<=g&&g<=7211||7220<=g&&g<=7221||g==7393||7410<=g&&g<=7411||g==7415||43043<=g&&g<=43044||g==43047||43136<=g&&g<=43137||43188<=g&&g<=43203||43346<=g&&g<=43347||g==43395||43444<=g&&g<=43445||43450<=g&&g<=43451||43453<=g&&g<=43456||43567<=g&&g<=43568||43571<=g&&g<=43572||g==43597||g==43755||43758<=g&&g<=43759||g==43765||44003<=g&&g<=44004||44006<=g&&g<=44007||44009<=g&&g<=44010||g==44012||g==69632||g==69634||g==69762||69808<=g&&g<=69810||69815<=g&&g<=69816||g==69932||g==70018||70067<=g&&g<=70069||70079<=g&&g<=70080||70188<=g&&g<=70190||70194<=g&&g<=70195||g==70197||70368<=g&&g<=70370||70402<=g&&g<=70403||g==70463||70465<=g&&g<=70468||70471<=g&&g<=70472||70475<=g&&g<=70477||70498<=g&&g<=70499||70709<=g&&g<=70711||70720<=g&&g<=70721||g==70725||70833<=g&&g<=70834||g==70841||70843<=g&&g<=70844||g==70846||g==70849||71088<=g&&g<=71089||71096<=g&&g<=71099||g==71102||71216<=g&&g<=71218||71227<=g&&g<=71228||g==71230||g==71340||71342<=g&&g<=71343||g==71350||71456<=g&&g<=71457||g==71462||72199<=g&&g<=72200||g==72249||72279<=g&&g<=72280||g==72343||g==72751||g==72766||g==72873||g==72881||g==72884||94033<=g&&g<=94078||g==119142||g==119149?n:4352<=g&&g<=4447||43360<=g&&g<=43388?u:4448<=g&&g<=4519||55216<=g&&g<=55238?A:4520<=g&&g<=4607||55243<=g&&g<=55291?p:g==44032||g==44060||g==44088||g==44116||g==44144||g==44172||g==44200||g==44228||g==44256||g==44284||g==44312||g==44340||g==44368||g==44396||g==44424||g==44452||g==44480||g==44508||g==44536||g==44564||g==44592||g==44620||g==44648||g==44676||g==44704||g==44732||g==44760||g==44788||g==44816||g==44844||g==44872||g==44900||g==44928||g==44956||g==44984||g==45012||g==45040||g==45068||g==45096||g==45124||g==45152||g==45180||g==45208||g==45236||g==45264||g==45292||g==45320||g==45348||g==45376||g==45404||g==45432||g==45460||g==45488||g==45516||g==45544||g==45572||g==45600||g==45628||g==45656||g==45684||g==45712||g==45740||g==45768||g==45796||g==45824||g==45852||g==45880||g==45908||g==45936||g==45964||g==45992||g==46020||g==46048||g==46076||g==46104||g==46132||g==46160||g==46188||g==46216||g==46244||g==46272||g==46300||g==46328||g==46356||g==46384||g==46412||g==46440||g==46468||g==46496||g==46524||g==46552||g==46580||g==46608||g==46636||g==46664||g==46692||g==46720||g==46748||g==46776||g==46804||g==46832||g==46860||g==46888||g==46916||g==46944||g==46972||g==47e3||g==47028||g==47056||g==47084||g==47112||g==47140||g==47168||g==47196||g==47224||g==47252||g==47280||g==47308||g==47336||g==47364||g==47392||g==47420||g==47448||g==47476||g==47504||g==47532||g==47560||g==47588||g==47616||g==47644||g==47672||g==47700||g==47728||g==47756||g==47784||g==47812||g==47840||g==47868||g==47896||g==47924||g==47952||g==47980||g==48008||g==48036||g==48064||g==48092||g==48120||g==48148||g==48176||g==48204||g==48232||g==48260||g==48288||g==48316||g==48344||g==48372||g==48400||g==48428||g==48456||g==48484||g==48512||g==48540||g==48568||g==48596||g==48624||g==48652||g==48680||g==48708||g==48736||g==48764||g==48792||g==48820||g==48848||g==48876||g==48904||g==48932||g==48960||g==48988||g==49016||g==49044||g==49072||g==49100||g==49128||g==49156||g==49184||g==49212||g==49240||g==49268||g==49296||g==49324||g==49352||g==49380||g==49408||g==49436||g==49464||g==49492||g==49520||g==49548||g==49576||g==49604||g==49632||g==49660||g==49688||g==49716||g==49744||g==49772||g==49800||g==49828||g==49856||g==49884||g==49912||g==49940||g==49968||g==49996||g==50024||g==50052||g==50080||g==50108||g==50136||g==50164||g==50192||g==50220||g==50248||g==50276||g==50304||g==50332||g==50360||g==50388||g==50416||g==50444||g==50472||g==50500||g==50528||g==50556||g==50584||g==50612||g==50640||g==50668||g==50696||g==50724||g==50752||g==50780||g==50808||g==50836||g==50864||g==50892||g==50920||g==50948||g==50976||g==51004||g==51032||g==51060||g==51088||g==51116||g==51144||g==51172||g==51200||g==51228||g==51256||g==51284||g==51312||g==51340||g==51368||g==51396||g==51424||g==51452||g==51480||g==51508||g==51536||g==51564||g==51592||g==51620||g==51648||g==51676||g==51704||g==51732||g==51760||g==51788||g==51816||g==51844||g==51872||g==51900||g==51928||g==51956||g==51984||g==52012||g==52040||g==52068||g==52096||g==52124||g==52152||g==52180||g==52208||g==52236||g==52264||g==52292||g==52320||g==52348||g==52376||g==52404||g==52432||g==52460||g==52488||g==52516||g==52544||g==52572||g==52600||g==52628||g==52656||g==52684||g==52712||g==52740||g==52768||g==52796||g==52824||g==52852||g==52880||g==52908||g==52936||g==52964||g==52992||g==53020||g==53048||g==53076||g==53104||g==53132||g==53160||g==53188||g==53216||g==53244||g==53272||g==53300||g==53328||g==53356||g==53384||g==53412||g==53440||g==53468||g==53496||g==53524||g==53552||g==53580||g==53608||g==53636||g==53664||g==53692||g==53720||g==53748||g==53776||g==53804||g==53832||g==53860||g==53888||g==53916||g==53944||g==53972||g==54e3||g==54028||g==54056||g==54084||g==54112||g==54140||g==54168||g==54196||g==54224||g==54252||g==54280||g==54308||g==54336||g==54364||g==54392||g==54420||g==54448||g==54476||g==54504||g==54532||g==54560||g==54588||g==54616||g==54644||g==54672||g==54700||g==54728||g==54756||g==54784||g==54812||g==54840||g==54868||g==54896||g==54924||g==54952||g==54980||g==55008||g==55036||g==55064||g==55092||g==55120||g==55148||g==55176?h:44033<=g&&g<=44059||44061<=g&&g<=44087||44089<=g&&g<=44115||44117<=g&&g<=44143||44145<=g&&g<=44171||44173<=g&&g<=44199||44201<=g&&g<=44227||44229<=g&&g<=44255||44257<=g&&g<=44283||44285<=g&&g<=44311||44313<=g&&g<=44339||44341<=g&&g<=44367||44369<=g&&g<=44395||44397<=g&&g<=44423||44425<=g&&g<=44451||44453<=g&&g<=44479||44481<=g&&g<=44507||44509<=g&&g<=44535||44537<=g&&g<=44563||44565<=g&&g<=44591||44593<=g&&g<=44619||44621<=g&&g<=44647||44649<=g&&g<=44675||44677<=g&&g<=44703||44705<=g&&g<=44731||44733<=g&&g<=44759||44761<=g&&g<=44787||44789<=g&&g<=44815||44817<=g&&g<=44843||44845<=g&&g<=44871||44873<=g&&g<=44899||44901<=g&&g<=44927||44929<=g&&g<=44955||44957<=g&&g<=44983||44985<=g&&g<=45011||45013<=g&&g<=45039||45041<=g&&g<=45067||45069<=g&&g<=45095||45097<=g&&g<=45123||45125<=g&&g<=45151||45153<=g&&g<=45179||45181<=g&&g<=45207||45209<=g&&g<=45235||45237<=g&&g<=45263||45265<=g&&g<=45291||45293<=g&&g<=45319||45321<=g&&g<=45347||45349<=g&&g<=45375||45377<=g&&g<=45403||45405<=g&&g<=45431||45433<=g&&g<=45459||45461<=g&&g<=45487||45489<=g&&g<=45515||45517<=g&&g<=45543||45545<=g&&g<=45571||45573<=g&&g<=45599||45601<=g&&g<=45627||45629<=g&&g<=45655||45657<=g&&g<=45683||45685<=g&&g<=45711||45713<=g&&g<=45739||45741<=g&&g<=45767||45769<=g&&g<=45795||45797<=g&&g<=45823||45825<=g&&g<=45851||45853<=g&&g<=45879||45881<=g&&g<=45907||45909<=g&&g<=45935||45937<=g&&g<=45963||45965<=g&&g<=45991||45993<=g&&g<=46019||46021<=g&&g<=46047||46049<=g&&g<=46075||46077<=g&&g<=46103||46105<=g&&g<=46131||46133<=g&&g<=46159||46161<=g&&g<=46187||46189<=g&&g<=46215||46217<=g&&g<=46243||46245<=g&&g<=46271||46273<=g&&g<=46299||46301<=g&&g<=46327||46329<=g&&g<=46355||46357<=g&&g<=46383||46385<=g&&g<=46411||46413<=g&&g<=46439||46441<=g&&g<=46467||46469<=g&&g<=46495||46497<=g&&g<=46523||46525<=g&&g<=46551||46553<=g&&g<=46579||46581<=g&&g<=46607||46609<=g&&g<=46635||46637<=g&&g<=46663||46665<=g&&g<=46691||46693<=g&&g<=46719||46721<=g&&g<=46747||46749<=g&&g<=46775||46777<=g&&g<=46803||46805<=g&&g<=46831||46833<=g&&g<=46859||46861<=g&&g<=46887||46889<=g&&g<=46915||46917<=g&&g<=46943||46945<=g&&g<=46971||46973<=g&&g<=46999||47001<=g&&g<=47027||47029<=g&&g<=47055||47057<=g&&g<=47083||47085<=g&&g<=47111||47113<=g&&g<=47139||47141<=g&&g<=47167||47169<=g&&g<=47195||47197<=g&&g<=47223||47225<=g&&g<=47251||47253<=g&&g<=47279||47281<=g&&g<=47307||47309<=g&&g<=47335||47337<=g&&g<=47363||47365<=g&&g<=47391||47393<=g&&g<=47419||47421<=g&&g<=47447||47449<=g&&g<=47475||47477<=g&&g<=47503||47505<=g&&g<=47531||47533<=g&&g<=47559||47561<=g&&g<=47587||47589<=g&&g<=47615||47617<=g&&g<=47643||47645<=g&&g<=47671||47673<=g&&g<=47699||47701<=g&&g<=47727||47729<=g&&g<=47755||47757<=g&&g<=47783||47785<=g&&g<=47811||47813<=g&&g<=47839||47841<=g&&g<=47867||47869<=g&&g<=47895||47897<=g&&g<=47923||47925<=g&&g<=47951||47953<=g&&g<=47979||47981<=g&&g<=48007||48009<=g&&g<=48035||48037<=g&&g<=48063||48065<=g&&g<=48091||48093<=g&&g<=48119||48121<=g&&g<=48147||48149<=g&&g<=48175||48177<=g&&g<=48203||48205<=g&&g<=48231||48233<=g&&g<=48259||48261<=g&&g<=48287||48289<=g&&g<=48315||48317<=g&&g<=48343||48345<=g&&g<=48371||48373<=g&&g<=48399||48401<=g&&g<=48427||48429<=g&&g<=48455||48457<=g&&g<=48483||48485<=g&&g<=48511||48513<=g&&g<=48539||48541<=g&&g<=48567||48569<=g&&g<=48595||48597<=g&&g<=48623||48625<=g&&g<=48651||48653<=g&&g<=48679||48681<=g&&g<=48707||48709<=g&&g<=48735||48737<=g&&g<=48763||48765<=g&&g<=48791||48793<=g&&g<=48819||48821<=g&&g<=48847||48849<=g&&g<=48875||48877<=g&&g<=48903||48905<=g&&g<=48931||48933<=g&&g<=48959||48961<=g&&g<=48987||48989<=g&&g<=49015||49017<=g&&g<=49043||49045<=g&&g<=49071||49073<=g&&g<=49099||49101<=g&&g<=49127||49129<=g&&g<=49155||49157<=g&&g<=49183||49185<=g&&g<=49211||49213<=g&&g<=49239||49241<=g&&g<=49267||49269<=g&&g<=49295||49297<=g&&g<=49323||49325<=g&&g<=49351||49353<=g&&g<=49379||49381<=g&&g<=49407||49409<=g&&g<=49435||49437<=g&&g<=49463||49465<=g&&g<=49491||49493<=g&&g<=49519||49521<=g&&g<=49547||49549<=g&&g<=49575||49577<=g&&g<=49603||49605<=g&&g<=49631||49633<=g&&g<=49659||49661<=g&&g<=49687||49689<=g&&g<=49715||49717<=g&&g<=49743||49745<=g&&g<=49771||49773<=g&&g<=49799||49801<=g&&g<=49827||49829<=g&&g<=49855||49857<=g&&g<=49883||49885<=g&&g<=49911||49913<=g&&g<=49939||49941<=g&&g<=49967||49969<=g&&g<=49995||49997<=g&&g<=50023||50025<=g&&g<=50051||50053<=g&&g<=50079||50081<=g&&g<=50107||50109<=g&&g<=50135||50137<=g&&g<=50163||50165<=g&&g<=50191||50193<=g&&g<=50219||50221<=g&&g<=50247||50249<=g&&g<=50275||50277<=g&&g<=50303||50305<=g&&g<=50331||50333<=g&&g<=50359||50361<=g&&g<=50387||50389<=g&&g<=50415||50417<=g&&g<=50443||50445<=g&&g<=50471||50473<=g&&g<=50499||50501<=g&&g<=50527||50529<=g&&g<=50555||50557<=g&&g<=50583||50585<=g&&g<=50611||50613<=g&&g<=50639||50641<=g&&g<=50667||50669<=g&&g<=50695||50697<=g&&g<=50723||50725<=g&&g<=50751||50753<=g&&g<=50779||50781<=g&&g<=50807||50809<=g&&g<=50835||50837<=g&&g<=50863||50865<=g&&g<=50891||50893<=g&&g<=50919||50921<=g&&g<=50947||50949<=g&&g<=50975||50977<=g&&g<=51003||51005<=g&&g<=51031||51033<=g&&g<=51059||51061<=g&&g<=51087||51089<=g&&g<=51115||51117<=g&&g<=51143||51145<=g&&g<=51171||51173<=g&&g<=51199||51201<=g&&g<=51227||51229<=g&&g<=51255||51257<=g&&g<=51283||51285<=g&&g<=51311||51313<=g&&g<=51339||51341<=g&&g<=51367||51369<=g&&g<=51395||51397<=g&&g<=51423||51425<=g&&g<=51451||51453<=g&&g<=51479||51481<=g&&g<=51507||51509<=g&&g<=51535||51537<=g&&g<=51563||51565<=g&&g<=51591||51593<=g&&g<=51619||51621<=g&&g<=51647||51649<=g&&g<=51675||51677<=g&&g<=51703||51705<=g&&g<=51731||51733<=g&&g<=51759||51761<=g&&g<=51787||51789<=g&&g<=51815||51817<=g&&g<=51843||51845<=g&&g<=51871||51873<=g&&g<=51899||51901<=g&&g<=51927||51929<=g&&g<=51955||51957<=g&&g<=51983||51985<=g&&g<=52011||52013<=g&&g<=52039||52041<=g&&g<=52067||52069<=g&&g<=52095||52097<=g&&g<=52123||52125<=g&&g<=52151||52153<=g&&g<=52179||52181<=g&&g<=52207||52209<=g&&g<=52235||52237<=g&&g<=52263||52265<=g&&g<=52291||52293<=g&&g<=52319||52321<=g&&g<=52347||52349<=g&&g<=52375||52377<=g&&g<=52403||52405<=g&&g<=52431||52433<=g&&g<=52459||52461<=g&&g<=52487||52489<=g&&g<=52515||52517<=g&&g<=52543||52545<=g&&g<=52571||52573<=g&&g<=52599||52601<=g&&g<=52627||52629<=g&&g<=52655||52657<=g&&g<=52683||52685<=g&&g<=52711||52713<=g&&g<=52739||52741<=g&&g<=52767||52769<=g&&g<=52795||52797<=g&&g<=52823||52825<=g&&g<=52851||52853<=g&&g<=52879||52881<=g&&g<=52907||52909<=g&&g<=52935||52937<=g&&g<=52963||52965<=g&&g<=52991||52993<=g&&g<=53019||53021<=g&&g<=53047||53049<=g&&g<=53075||53077<=g&&g<=53103||53105<=g&&g<=53131||53133<=g&&g<=53159||53161<=g&&g<=53187||53189<=g&&g<=53215||53217<=g&&g<=53243||53245<=g&&g<=53271||53273<=g&&g<=53299||53301<=g&&g<=53327||53329<=g&&g<=53355||53357<=g&&g<=53383||53385<=g&&g<=53411||53413<=g&&g<=53439||53441<=g&&g<=53467||53469<=g&&g<=53495||53497<=g&&g<=53523||53525<=g&&g<=53551||53553<=g&&g<=53579||53581<=g&&g<=53607||53609<=g&&g<=53635||53637<=g&&g<=53663||53665<=g&&g<=53691||53693<=g&&g<=53719||53721<=g&&g<=53747||53749<=g&&g<=53775||53777<=g&&g<=53803||53805<=g&&g<=53831||53833<=g&&g<=53859||53861<=g&&g<=53887||53889<=g&&g<=53915||53917<=g&&g<=53943||53945<=g&&g<=53971||53973<=g&&g<=53999||54001<=g&&g<=54027||54029<=g&&g<=54055||54057<=g&&g<=54083||54085<=g&&g<=54111||54113<=g&&g<=54139||54141<=g&&g<=54167||54169<=g&&g<=54195||54197<=g&&g<=54223||54225<=g&&g<=54251||54253<=g&&g<=54279||54281<=g&&g<=54307||54309<=g&&g<=54335||54337<=g&&g<=54363||54365<=g&&g<=54391||54393<=g&&g<=54419||54421<=g&&g<=54447||54449<=g&&g<=54475||54477<=g&&g<=54503||54505<=g&&g<=54531||54533<=g&&g<=54559||54561<=g&&g<=54587||54589<=g&&g<=54615||54617<=g&&g<=54643||54645<=g&&g<=54671||54673<=g&&g<=54699||54701<=g&&g<=54727||54729<=g&&g<=54755||54757<=g&&g<=54783||54785<=g&&g<=54811||54813<=g&&g<=54839||54841<=g&&g<=54867||54869<=g&&g<=54895||54897<=g&&g<=54923||54925<=g&&g<=54951||54953<=g&&g<=54979||54981<=g&&g<=55007||55009<=g&&g<=55035||55037<=g&&g<=55063||55065<=g&&g<=55091||55093<=g&&g<=55119||55121<=g&&g<=55147||55149<=g&&g<=55175||55177<=g&&g<=55203?E:g==9757||g==9977||9994<=g&&g<=9997||g==127877||127938<=g&&g<=127940||g==127943||127946<=g&&g<=127948||128066<=g&&g<=128067||128070<=g&&g<=128080||g==128110||128112<=g&&g<=128120||g==128124||128129<=g&&g<=128131||128133<=g&&g<=128135||g==128170||128372<=g&&g<=128373||g==128378||g==128400||128405<=g&&g<=128406||128581<=g&&g<=128583||128587<=g&&g<=128591||g==128675||128692<=g&&g<=128694||g==128704||g==128716||129304<=g&&g<=129308||129310<=g&&g<=129311||g==129318||129328<=g&&g<=129337||129341<=g&&g<=129342||129489<=g&&g<=129501?x:127995<=g&&g<=127999?C:g==8205?R:g==9792||g==9794||9877<=g&&g<=9878||g==9992||g==10084||g==127752||g==127806||g==127859||g==127891||g==127908||g==127912||g==127979||g==127981||g==128139||128187<=g&&g<=128188||g==128295||g==128300||g==128488||g==128640||g==128658?L:128102<=g&&g<=128105?U:I}return this}typeof jb<"u"&&jb.exports&&(jb.exports=pat)});var jce=_((g4t,Hce)=>{var hat=/^(.*?)(\x1b\[[^m]+m|\x1b\]8;;.*?(\x1b\\|\u0007))/,Gb;function gat(){if(Gb)return Gb;if(typeof Intl.Segmenter<"u"){let t=new Intl.Segmenter("en",{granularity:"grapheme"});return Gb=e=>Array.from(t.segment(e),({segment:r})=>r)}else{let t=_ce(),e=new t;return Gb=r=>e.splitGraphemes(r)}}Hce.exports=(t,e=0,r=t.length)=>{if(e<0||r<0)throw new RangeError("Negative indices aren't supported by this implementation");let o=r-e,a="",n=0,u=0;for(;t.length>0;){let A=t.match(hat)||[t,t,void 0],p=gat()(A[1]),h=Math.min(e-n,p.length);p=p.slice(h);let E=Math.min(o-u,p.length);a+=p.slice(0,E).join(""),n+=h,u+=E,typeof A[2]<"u"&&(a+=A[2]),t=t.slice(A[0].length)}return a}});var rn,L1=Et(()=>{rn=process.env.YARN_IS_TEST_ENV?"0.0.0":"4.1.0"});function Vce(t,{configuration:e,json:r}){if(!e.get("enableMessageNames"))return"";let a=Wu(t===null?0:t);return!r&&t===null?Mt(e,a,"grey"):a}function yU(t,{configuration:e,json:r}){let o=Vce(t,{configuration:e,json:r});if(!o||t===null||t===0)return o;let a=wr[t],n=`https://yarnpkg.com/advanced/error-codes#${o}---${a}`.toLowerCase();return Zy(e,o,n)}async function LE({configuration:t,stdout:e,forceError:r},o){let a=await Nt.start({configuration:t,stdout:e,includeFooter:!1},async n=>{let u=!1,A=!1;for(let p of o)typeof p.option<"u"&&(p.error||r?(A=!0,n.reportError(50,p.message)):(u=!0,n.reportWarning(50,p.message)),p.callback?.());u&&!A&&n.reportSeparator()});return a.hasErrors()?a.exitCode():null}var Wce,qb,dat,Gce,qce,Ah,Kce,Yce,mat,yat,Yb,Eat,Nt,O1=Et(()=>{Wce=$e(jce()),qb=$e(td());fS();Yl();L1();Gl();dat="\xB7",Gce=["\u280B","\u2819","\u2839","\u2838","\u283C","\u2834","\u2826","\u2827","\u2807","\u280F"],qce=80,Ah=qb.default.GITHUB_ACTIONS?{start:t=>`::group::${t}
+`,end:t=>`::endgroup::
+`}:qb.default.TRAVIS?{start:t=>`travis_fold:start:${t}
+`,end:t=>`travis_fold:end:${t}
+`}:qb.default.GITLAB?{start:t=>`section_start:${Math.floor(Date.now()/1e3)}:${t.toLowerCase().replace(/\W+/g,"_")}[collapsed=true]\r\x1B[0K${t}
+`,end:t=>`section_end:${Math.floor(Date.now()/1e3)}:${t.toLowerCase().replace(/\W+/g,"_")}\r\x1B[0K`}:null,Kce=Ah!==null,Yce=new Date,mat=["iTerm.app","Apple_Terminal","WarpTerminal","vscode"].includes(process.env.TERM_PROGRAM)||!!process.env.WT_SESSION,yat=t=>t,Yb=yat({patrick:{date:[17,3],chars:["\u{1F340}","\u{1F331}"],size:40},simba:{date:[19,7],chars:["\u{1F981}","\u{1F334}"],size:40},jack:{date:[31,10],chars:["\u{1F383}","\u{1F987}"],size:40},hogsfather:{date:[31,12],chars:["\u{1F389}","\u{1F384}"],size:40},default:{chars:["=","-"],size:80}}),Eat=mat&&Object.keys(Yb).find(t=>{let e=Yb[t];return!(e.date&&(e.date[0]!==Yce.getDate()||e.date[1]!==Yce.getMonth()+1))})||"default";Nt=class extends Xs{constructor({configuration:r,stdout:o,json:a=!1,forceSectionAlignment:n=!1,includeNames:u=!0,includePrefix:A=!0,includeFooter:p=!0,includeLogs:h=!a,includeInfos:E=h,includeWarnings:I=h}){super();this.uncommitted=new Set;this.warningCount=0;this.errorCount=0;this.timerFooter=[];this.startTime=Date.now();this.indent=0;this.level=0;this.progress=new Map;this.progressTime=0;this.progressFrame=0;this.progressTimeout=null;this.progressStyle=null;this.progressMaxScaledSize=null;if(XI(this,{configuration:r}),this.configuration=r,this.forceSectionAlignment=n,this.includeNames=u,this.includePrefix=A,this.includeFooter=p,this.includeInfos=E,this.includeWarnings=I,this.json=a,this.stdout=o,r.get("enableProgressBars")&&!a&&o.isTTY&&o.columns>22){let v=r.get("progressBarStyle")||Eat;if(!Object.hasOwn(Yb,v))throw new Error("Assertion failed: Invalid progress bar style");this.progressStyle=Yb[v];let x=Math.min(this.getRecommendedLength(),80);this.progressMaxScaledSize=Math.floor(this.progressStyle.size*x/80)}}static async start(r,o){let a=new this(r),n=process.emitWarning;process.emitWarning=(u,A)=>{if(typeof u!="string"){let h=u;u=h.message,A=A??h.name}let p=typeof A<"u"?`${A}: ${u}`:u;a.reportWarning(0,p)},r.includeVersion&&a.reportInfo(0,yd(r.configuration,`Yarn ${rn}`,2));try{await o(a)}catch(u){a.reportExceptionOnce(u)}finally{await a.finalize(),process.emitWarning=n}return a}hasErrors(){return this.errorCount>0}exitCode(){return this.hasErrors()?1:0}getRecommendedLength(){let o=this.progressStyle!==null?this.stdout.columns-1:super.getRecommendedLength();return Math.max(40,o-12-this.indent*2)}startSectionSync({reportHeader:r,reportFooter:o,skipIfEmpty:a},n){let u={committed:!1,action:()=>{r?.()}};a?this.uncommitted.add(u):(u.action(),u.committed=!0);let A=Date.now();try{return n()}catch(p){throw this.reportExceptionOnce(p),p}finally{let p=Date.now();this.uncommitted.delete(u),u.committed&&o?.(p-A)}}async startSectionPromise({reportHeader:r,reportFooter:o,skipIfEmpty:a},n){let u={committed:!1,action:()=>{r?.()}};a?this.uncommitted.add(u):(u.action(),u.committed=!0);let A=Date.now();try{return await n()}catch(p){throw this.reportExceptionOnce(p),p}finally{let p=Date.now();this.uncommitted.delete(u),u.committed&&o?.(p-A)}}startTimerImpl(r,o,a){return{cb:typeof o=="function"?o:a,reportHeader:()=>{this.level+=1,this.reportInfo(null,`\u250C ${r}`),this.indent+=1,Ah!==null&&!this.json&&this.includeInfos&&this.stdout.write(Ah.start(r))},reportFooter:A=>{if(this.indent-=1,Ah!==null&&!this.json&&this.includeInfos){this.stdout.write(Ah.end(r));for(let p of this.timerFooter)p()}this.configuration.get("enableTimers")&&A>200?this.reportInfo(null,`\u2514 Completed in ${Mt(this.configuration,A,yt.DURATION)}`):this.reportInfo(null,"\u2514 Completed"),this.level-=1},skipIfEmpty:(typeof o=="function"?{}:o).skipIfEmpty}}startTimerSync(r,o,a){let{cb:n,...u}=this.startTimerImpl(r,o,a);return this.startSectionSync(u,n)}async startTimerPromise(r,o,a){let{cb:n,...u}=this.startTimerImpl(r,o,a);return this.startSectionPromise(u,n)}reportSeparator(){this.indent===0?this.writeLine(""):this.reportInfo(null,"")}reportInfo(r,o){if(!this.includeInfos)return;this.commit();let a=this.formatNameWithHyperlink(r),n=a?`${a}: `:"",u=`${this.formatPrefix(n,"blueBright")}${o}`;this.json?this.reportJson({type:"info",name:r,displayName:this.formatName(r),indent:this.formatIndent(),data:o}):this.writeLine(u)}reportWarning(r,o){if(this.warningCount+=1,!this.includeWarnings)return;this.commit();let a=this.formatNameWithHyperlink(r),n=a?`${a}: `:"";this.json?this.reportJson({type:"warning",name:r,displayName:this.formatName(r),indent:this.formatIndent(),data:o}):this.writeLine(`${this.formatPrefix(n,"yellowBright")}${o}`)}reportError(r,o){this.errorCount+=1,this.timerFooter.push(()=>this.reportErrorImpl(r,o)),this.reportErrorImpl(r,o)}reportErrorImpl(r,o){this.commit();let a=this.formatNameWithHyperlink(r),n=a?`${a}: `:"";this.json?this.reportJson({type:"error",name:r,displayName:this.formatName(r),indent:this.formatIndent(),data:o}):this.writeLine(`${this.formatPrefix(n,"redBright")}${o}`,{truncate:!1})}reportFold(r,o){if(!Ah)return;let a=`${Ah.start(r)}${o}${Ah.end(r)}`;this.timerFooter.push(()=>this.stdout.write(a))}reportProgress(r){if(this.progressStyle===null)return{...Promise.resolve(),stop:()=>{}};if(r.hasProgress&&r.hasTitle)throw new Error("Unimplemented: Progress bars can't have both progress and titles.");let o=!1,a=Promise.resolve().then(async()=>{let u={progress:r.hasProgress?0:void 0,title:r.hasTitle?"":void 0};this.progress.set(r,{definition:u,lastScaledSize:r.hasProgress?-1:void 0,lastTitle:void 0}),this.refreshProgress({delta:-1});for await(let{progress:A,title:p}of r)o||u.progress===A&&u.title===p||(u.progress=A,u.title=p,this.refreshProgress());n()}),n=()=>{o||(o=!0,this.progress.delete(r),this.refreshProgress({delta:1}))};return{...a,stop:n}}reportJson(r){this.json&&this.writeLine(`${JSON.stringify(r)}`)}async finalize(){if(!this.includeFooter)return;let r="";this.errorCount>0?r="Failed with errors":this.warningCount>0?r="Done with warnings":r="Done";let o=Mt(this.configuration,Date.now()-this.startTime,yt.DURATION),a=this.configuration.get("enableTimers")?`${r} in ${o}`:r;this.errorCount>0?this.reportError(0,a):this.warningCount>0?this.reportWarning(0,a):this.reportInfo(0,a)}writeLine(r,{truncate:o}={}){this.clearProgress({clear:!0}),this.stdout.write(`${this.truncate(r,{truncate:o})}
+`),this.writeProgress()}writeLines(r,{truncate:o}={}){this.clearProgress({delta:r.length});for(let a of r)this.stdout.write(`${this.truncate(a,{truncate:o})}
+`);this.writeProgress()}commit(){let r=this.uncommitted;this.uncommitted=new Set;for(let o of r)o.committed=!0,o.action()}clearProgress({delta:r=0,clear:o=!1}){this.progressStyle!==null&&this.progress.size+r>0&&(this.stdout.write(`\x1B[${this.progress.size+r}A`),(r>0||o)&&this.stdout.write("\x1B[0J"))}writeProgress(){if(this.progressStyle===null||(this.progressTimeout!==null&&clearTimeout(this.progressTimeout),this.progressTimeout=null,this.progress.size===0))return;let r=Date.now();r-this.progressTime>qce&&(this.progressFrame=(this.progressFrame+1)%Gce.length,this.progressTime=r);let o=Gce[this.progressFrame];for(let a of this.progress.values()){let n="";if(typeof a.lastScaledSize<"u"){let h=this.progressStyle.chars[0].repeat(a.lastScaledSize),E=this.progressStyle.chars[1].repeat(this.progressMaxScaledSize-a.lastScaledSize);n=` ${h}${E}`}let u=this.formatName(null),A=u?`${u}: `:"",p=a.definition.title?` ${a.definition.title}`:"";this.stdout.write(`${Mt(this.configuration,"\u27A4","blueBright")} ${A}${o}${n}${p}
+`)}this.progressTimeout=setTimeout(()=>{this.refreshProgress({force:!0})},qce)}refreshProgress({delta:r=0,force:o=!1}={}){let a=!1,n=!1;if(o||this.progress.size===0)a=!0;else for(let u of this.progress.values()){let A=typeof u.definition.progress<"u"?Math.trunc(this.progressMaxScaledSize*u.definition.progress):void 0,p=u.lastScaledSize;u.lastScaledSize=A;let h=u.lastTitle;if(u.lastTitle=u.definition.title,A!==p||(n=h!==u.definition.title)){a=!0;break}}a&&(this.clearProgress({delta:r,clear:n}),this.writeProgress())}truncate(r,{truncate:o}={}){return this.progressStyle===null&&(o=!1),typeof o>"u"&&(o=this.configuration.get("preferTruncatedLines")),o&&(r=(0,Wce.default)(r,0,this.stdout.columns-1)),r}formatName(r){return this.includeNames?Vce(r,{configuration:this.configuration,json:this.json}):""}formatPrefix(r,o){return this.includePrefix?`${Mt(this.configuration,"\u27A4",o)} ${r}${this.formatIndent()}`:""}formatNameWithHyperlink(r){return this.includeNames?yU(r,{configuration:this.configuration,json:this.json}):""}formatIndent(){return this.level>0||!this.forceSectionAlignment?"\u2502 ".repeat(this.indent):`${dat} `}}});var un={};Vt(un,{PackageManager:()=>Xce,detectPackageManager:()=>Zce,executePackageAccessibleBinary:()=>nue,executePackageScript:()=>Wb,executePackageShellcode:()=>EU,executeWorkspaceAccessibleBinary:()=>Sat,executeWorkspaceLifecycleScript:()=>tue,executeWorkspaceScript:()=>eue,getPackageAccessibleBinaries:()=>Kb,getWorkspaceAccessibleBinaries:()=>rue,hasPackageScript:()=>Bat,hasWorkspaceScript:()=>CU,isNodeScript:()=>wU,makeScriptEnv:()=>M1,maybeExecuteWorkspaceLifecycleScript:()=>Dat,prepareExternalProject:()=>Iat});async function fh(t,e,r,o=[]){if(process.platform==="win32"){let a=`@goto #_undefined_# 2>NUL || @title %COMSPEC% & @setlocal & @"${r}" ${o.map(n=>`"${n.replace('"','""')}"`).join(" ")} %*`;await oe.writeFilePromise(V.format({dir:t,name:e,ext:".cmd"}),a)}await oe.writeFilePromise(V.join(t,e),`#!/bin/sh
+exec "${r}" ${o.map(a=>`'${a.replace(/'/g,`'"'"'`)}'`).join(" ")} "$@"
+`,{mode:493})}async function Zce(t){let e=await Ot.tryFind(t);if(e?.packageManager){let o=UP(e.packageManager);if(o?.name){let a=`found ${JSON.stringify({packageManager:e.packageManager})} in manifest`,[n]=o.reference.split(".");switch(o.name){case"yarn":return{packageManagerField:!0,packageManager:Number(n)===1?"Yarn Classic":"Yarn",reason:a};case"npm":return{packageManagerField:!0,packageManager:"npm",reason:a};case"pnpm":return{packageManagerField:!0,packageManager:"pnpm",reason:a}}}}let r;try{r=await oe.readFilePromise(V.join(t,dr.lockfile),"utf8")}catch{}return r!==void 0?r.match(/^__metadata:$/m)?{packageManager:"Yarn",reason:'"__metadata" key found in yarn.lock'}:{packageManager:"Yarn Classic",reason:'"__metadata" key not found in yarn.lock, must be a Yarn classic lockfile'}:oe.existsSync(V.join(t,"package-lock.json"))?{packageManager:"npm",reason:`found npm's "package-lock.json" lockfile`}:oe.existsSync(V.join(t,"pnpm-lock.yaml"))?{packageManager:"pnpm",reason:`found pnpm's "pnpm-lock.yaml" lockfile`}:null}async function M1({project:t,locator:e,binFolder:r,ignoreCorepack:o,lifecycleScript:a,baseEnv:n=t?.configuration.env??process.env}){let u={};for(let[E,I]of Object.entries(n))typeof I<"u"&&(u[E.toLowerCase()!=="path"?E:"PATH"]=I);let A=ue.fromPortablePath(r);u.BERRY_BIN_FOLDER=ue.fromPortablePath(A);let p=process.env.COREPACK_ROOT&&!o?ue.join(process.env.COREPACK_ROOT,"dist/yarn.js"):process.argv[1];if(await Promise.all([fh(r,"node",process.execPath),...rn!==null?[fh(r,"run",process.execPath,[p,"run"]),fh(r,"yarn",process.execPath,[p]),fh(r,"yarnpkg",process.execPath,[p]),fh(r,"node-gyp",process.execPath,[p,"run","--top-level","node-gyp"])]:[]]),t&&(u.INIT_CWD=ue.fromPortablePath(t.configuration.startingCwd),u.PROJECT_CWD=ue.fromPortablePath(t.cwd)),u.PATH=u.PATH?`${A}${ue.delimiter}${u.PATH}`:`${A}`,u.npm_execpath=`${A}${ue.sep}yarn`,u.npm_node_execpath=`${A}${ue.sep}node`,e){if(!t)throw new Error("Assertion failed: Missing project");let E=t.tryWorkspaceByLocator(e),I=E?E.manifest.version??"":t.storedPackages.get(e.locatorHash).version??"";u.npm_package_name=fn(e),u.npm_package_version=I;let v;if(E)v=E.cwd;else{let x=t.storedPackages.get(e.locatorHash);if(!x)throw new Error(`Package for ${jr(t.configuration,e)} not found in the project`);let C=t.configuration.getLinkers(),R={project:t,report:new Nt({stdout:new ph.PassThrough,configuration:t.configuration})},L=C.find(U=>U.supportsPackage(x,R));if(!L)throw new Error(`The package ${jr(t.configuration,x)} isn't supported by any of the available linkers`);v=await L.findPackageLocation(x,R)}u.npm_package_json=ue.fromPortablePath(V.join(v,dr.manifest))}let h=rn!==null?`yarn/${rn}`:`yarn/${Df("@yarnpkg/core").version}-core`;return u.npm_config_user_agent=`${h} npm/? node/${process.version} ${process.platform} ${process.arch}`,a&&(u.npm_lifecycle_event=a),t&&await t.configuration.triggerHook(E=>E.setupScriptEnvironment,t,u,async(E,I,v)=>await fh(r,E,I,v)),u}async function Iat(t,e,{configuration:r,report:o,workspace:a=null,locator:n=null}){await wat(async()=>{await oe.mktempPromise(async u=>{let A=V.join(u,"pack.log"),p=null,{stdout:h,stderr:E}=r.getSubprocessStreams(A,{prefix:ue.fromPortablePath(t),report:o}),I=n&&Hc(n)?r1(n):n,v=I?ba(I):"an external project";h.write(`Packing ${v} from sources
+`);let x=await Zce(t),C;x!==null?(h.write(`Using ${x.packageManager} for bootstrap. Reason: ${x.reason}
+
+`),C=x.packageManager):(h.write(`No package manager configuration detected; defaulting to Yarn
+
+`),C="Yarn");let R=C==="Yarn"&&!x?.packageManagerField;await oe.mktempPromise(async L=>{let U=await M1({binFolder:L,ignoreCorepack:R}),te=new Map([["Yarn Classic",async()=>{let fe=a!==null?["workspace",a]:[],ce=V.join(t,dr.manifest),me=await oe.readFilePromise(ce),he=await qc(process.execPath,[process.argv[1],"set","version","classic","--only-if-needed","--yarn-path"],{cwd:t,env:U,stdin:p,stdout:h,stderr:E,end:1});if(he.code!==0)return he.code;await oe.writeFilePromise(ce,me),await oe.appendFilePromise(V.join(t,".npmignore"),`/.yarn
+`),h.write(`
+`),delete U.NODE_ENV;let Be=await qc("yarn",["install"],{cwd:t,env:U,stdin:p,stdout:h,stderr:E,end:1});if(Be.code!==0)return Be.code;h.write(`
+`);let we=await qc("yarn",[...fe,"pack","--filename",ue.fromPortablePath(e)],{cwd:t,env:U,stdin:p,stdout:h,stderr:E});return we.code!==0?we.code:0}],["Yarn",async()=>{let fe=a!==null?["workspace",a]:[];U.YARN_ENABLE_INLINE_BUILDS="1";let ce=V.join(t,dr.lockfile);await oe.existsPromise(ce)||await oe.writeFilePromise(ce,"");let me=await qc("yarn",[...fe,"pack","--install-if-needed","--filename",ue.fromPortablePath(e)],{cwd:t,env:U,stdin:p,stdout:h,stderr:E});return me.code!==0?me.code:0}],["npm",async()=>{if(a!==null){let Ee=new ph.PassThrough,Se=Vy(Ee);Ee.pipe(h,{end:!1});let le=await qc("npm",["--version"],{cwd:t,env:U,stdin:p,stdout:Ee,stderr:E,end:0});if(Ee.end(),le.code!==0)return h.end(),E.end(),le.code;let ne=(await Se).toString().trim();if(!kf(ne,">=7.x")){let ee=eA(null,"npm"),Ie=In(ee,ne),Fe=In(ee,">=7.x");throw new Error(`Workspaces aren't supported by ${Gn(r,Ie)}; please upgrade to ${Gn(r,Fe)} (npm has been detected as the primary package manager for ${Mt(r,t,yt.PATH)})`)}}let fe=a!==null?["--workspace",a]:[];delete U.npm_config_user_agent,delete U.npm_config_production,delete U.NPM_CONFIG_PRODUCTION,delete U.NODE_ENV;let ce=await qc("npm",["install","--legacy-peer-deps"],{cwd:t,env:U,stdin:p,stdout:h,stderr:E,end:1});if(ce.code!==0)return ce.code;let me=new ph.PassThrough,he=Vy(me);me.pipe(h);let Be=await qc("npm",["pack","--silent",...fe],{cwd:t,env:U,stdin:p,stdout:me,stderr:E});if(Be.code!==0)return Be.code;let we=(await he).toString().trim().replace(/^.*\n/s,""),g=V.resolve(t,ue.toPortablePath(we));return await oe.renamePromise(g,e),0}]]).get(C);if(typeof te>"u")throw new Error("Assertion failed: Unsupported workflow");let ae=await te();if(!(ae===0||typeof ae>"u"))throw oe.detachTemp(u),new zt(58,`Packing the package failed (exit code ${ae}, logs can be found here: ${Mt(r,A,yt.PATH)})`)})})})}async function Bat(t,e,{project:r}){let o=r.tryWorkspaceByLocator(t);if(o!==null)return CU(o,e);let a=r.storedPackages.get(t.locatorHash);if(!a)throw new Error(`Package for ${jr(r.configuration,t)} not found in the project`);return await Jl.openPromise(async n=>{let u=r.configuration,A=r.configuration.getLinkers(),p={project:r,report:new Nt({stdout:new ph.PassThrough,configuration:u})},h=A.find(x=>x.supportsPackage(a,p));if(!h)throw new Error(`The package ${jr(r.configuration,a)} isn't supported by any of the available linkers`);let E=await h.findPackageLocation(a,p),I=new gn(E,{baseFs:n});return(await Ot.find(Bt.dot,{baseFs:I})).scripts.has(e)})}async function Wb(t,e,r,{cwd:o,project:a,stdin:n,stdout:u,stderr:A}){return await oe.mktempPromise(async p=>{let{manifest:h,env:E,cwd:I}=await $ce(t,{project:a,binFolder:p,cwd:o,lifecycleScript:e}),v=h.scripts.get(e);if(typeof v>"u")return 1;let x=async()=>await TE(v,r,{cwd:I,env:E,stdin:n,stdout:u,stderr:A});return await(await a.configuration.reduceHook(R=>R.wrapScriptExecution,x,a,t,e,{script:v,args:r,cwd:I,env:E,stdin:n,stdout:u,stderr:A}))()})}async function EU(t,e,r,{cwd:o,project:a,stdin:n,stdout:u,stderr:A}){return await oe.mktempPromise(async p=>{let{env:h,cwd:E}=await $ce(t,{project:a,binFolder:p,cwd:o});return await TE(e,r,{cwd:E,env:h,stdin:n,stdout:u,stderr:A})})}async function vat(t,{binFolder:e,cwd:r,lifecycleScript:o}){let a=await M1({project:t.project,locator:t.anchoredLocator,binFolder:e,lifecycleScript:o});return await IU(e,await rue(t)),typeof r>"u"&&(r=V.dirname(await oe.realpathPromise(V.join(t.cwd,"package.json")))),{manifest:t.manifest,binFolder:e,env:a,cwd:r}}async function $ce(t,{project:e,binFolder:r,cwd:o,lifecycleScript:a}){let n=e.tryWorkspaceByLocator(t);if(n!==null)return vat(n,{binFolder:r,cwd:o,lifecycleScript:a});let u=e.storedPackages.get(t.locatorHash);if(!u)throw new Error(`Package for ${jr(e.configuration,t)} not found in the project`);return await Jl.openPromise(async A=>{let p=e.configuration,h=e.configuration.getLinkers(),E={project:e,report:new Nt({stdout:new ph.PassThrough,configuration:p})},I=h.find(L=>L.supportsPackage(u,E));if(!I)throw new Error(`The package ${jr(e.configuration,u)} isn't supported by any of the available linkers`);let v=await M1({project:e,locator:t,binFolder:r,lifecycleScript:a});await IU(r,await Kb(t,{project:e}));let x=await I.findPackageLocation(u,E),C=new gn(x,{baseFs:A}),R=await Ot.find(Bt.dot,{baseFs:C});return typeof o>"u"&&(o=x),{manifest:R,binFolder:r,env:v,cwd:o}})}async function eue(t,e,r,{cwd:o,stdin:a,stdout:n,stderr:u}){return await Wb(t.anchoredLocator,e,r,{cwd:o,project:t.project,stdin:a,stdout:n,stderr:u})}function CU(t,e){return t.manifest.scripts.has(e)}async function tue(t,e,{cwd:r,report:o}){let{configuration:a}=t.project,n=null;await oe.mktempPromise(async u=>{let A=V.join(u,`${e}.log`),p=`# This file contains the result of Yarn calling the "${e}" lifecycle script inside a workspace ("${ue.fromPortablePath(t.cwd)}")
+`,{stdout:h,stderr:E}=a.getSubprocessStreams(A,{report:o,prefix:jr(a,t.anchoredLocator),header:p});o.reportInfo(36,`Calling the "${e}" lifecycle script`);let I=await eue(t,e,[],{cwd:r,stdin:n,stdout:h,stderr:E});if(h.end(),E.end(),I!==0)throw oe.detachTemp(u),new zt(36,`${(0,Jce.default)(e)} script failed (exit code ${Mt(a,I,yt.NUMBER)}, logs can be found here: ${Mt(a,A,yt.PATH)}); run ${Mt(a,`yarn ${e}`,yt.CODE)} to investigate`)})}async function Dat(t,e,r){CU(t,e)&&await tue(t,e,r)}function wU(t){let e=V.extname(t);if(e.match(/\.[cm]?[jt]sx?$/))return!0;if(e===".exe"||e===".bin")return!1;let r=Buffer.alloc(4),o;try{o=oe.openSync(t,"r")}catch{return!0}try{oe.readSync(o,r,0,r.length,0)}finally{oe.closeSync(o)}let a=r.readUint32BE();return!(a===3405691582||a===3489328638||a===2135247942||(a&4294901760)===1297743872)}async function Kb(t,{project:e}){let r=e.configuration,o=new Map,a=e.storedPackages.get(t.locatorHash);if(!a)throw new Error(`Package for ${jr(r,t)} not found in the project`);let n=new ph.Writable,u=r.getLinkers(),A={project:e,report:new Nt({configuration:r,stdout:n})},p=new Set([t.locatorHash]);for(let E of a.dependencies.values()){let I=e.storedResolutions.get(E.descriptorHash);if(!I)throw new Error(`Assertion failed: The resolution (${Gn(r,E)}) should have been registered`);p.add(I)}let h=await Promise.all(Array.from(p,async E=>{let I=e.storedPackages.get(E);if(!I)throw new Error(`Assertion failed: The package (${E}) should have been registered`);if(I.bin.size===0)return sl.skip;let v=u.find(C=>C.supportsPackage(I,A));if(!v)return sl.skip;let x=null;try{x=await v.findPackageLocation(I,A)}catch(C){if(C.code==="LOCATOR_NOT_INSTALLED")return sl.skip;throw C}return{dependency:I,packageLocation:x}}));for(let E of h){if(E===sl.skip)continue;let{dependency:I,packageLocation:v}=E;for(let[x,C]of I.bin){let R=V.resolve(v,C);o.set(x,[I,ue.fromPortablePath(R),wU(R)])}}return o}async function rue(t){return await Kb(t.anchoredLocator,{project:t.project})}async function IU(t,e){await Promise.all(Array.from(e,([r,[,o,a]])=>a?fh(t,r,process.execPath,[o]):fh(t,r,o,[])))}async function nue(t,e,r,{cwd:o,project:a,stdin:n,stdout:u,stderr:A,nodeArgs:p=[],packageAccessibleBinaries:h}){h??=await Kb(t,{project:a});let E=h.get(e);if(!E)throw new Error(`Binary not found (${e}) for ${jr(a.configuration,t)}`);return await oe.mktempPromise(async I=>{let[,v]=E,x=await M1({project:a,locator:t,binFolder:I});await IU(x.BERRY_BIN_FOLDER,h);let C=wU(ue.toPortablePath(v))?qc(process.execPath,[...p,v,...r],{cwd:o,env:x,stdin:n,stdout:u,stderr:A}):qc(v,r,{cwd:o,env:x,stdin:n,stdout:u,stderr:A}),R;try{R=await C}finally{await oe.removePromise(x.BERRY_BIN_FOLDER)}return R.code})}async function Sat(t,e,r,{cwd:o,stdin:a,stdout:n,stderr:u,packageAccessibleBinaries:A}){return await nue(t.anchoredLocator,e,r,{project:t.project,cwd:o,stdin:a,stdout:n,stderr:u,packageAccessibleBinaries:A})}var Jce,zce,ph,Xce,Cat,wat,BU=Et(()=>{St();St();nA();k1();Jce=$e(mU()),zce=$e(id()),ph=ve("stream");fE();Yl();O1();L1();Db();Gl();jl();Qf();bo();Xce=(a=>(a.Yarn1="Yarn Classic",a.Yarn2="Yarn",a.Npm="npm",a.Pnpm="pnpm",a))(Xce||{});Cat=2,wat=(0,zce.default)(Cat)});var OE=_((L4t,sue)=>{"use strict";var iue=new Map([["C","cwd"],["f","file"],["z","gzip"],["P","preservePaths"],["U","unlink"],["strip-components","strip"],["stripComponents","strip"],["keep-newer","newer"],["keepNewer","newer"],["keep-newer-files","newer"],["keepNewerFiles","newer"],["k","keep"],["keep-existing","keep"],["keepExisting","keep"],["m","noMtime"],["no-mtime","noMtime"],["p","preserveOwner"],["L","follow"],["h","follow"]]);sue.exports=t=>t?Object.keys(t).map(e=>[iue.has(e)?iue.get(e):e,t[e]]).reduce((e,r)=>(e[r[0]]=r[1],e),Object.create(null)):{}});var UE=_((O4t,hue)=>{"use strict";var oue=typeof process=="object"&&process?process:{stdout:null,stderr:null},Pat=ve("events"),aue=ve("stream"),lue=ve("string_decoder").StringDecoder,Mf=Symbol("EOF"),Uf=Symbol("maybeEmitEnd"),hh=Symbol("emittedEnd"),Vb=Symbol("emittingEnd"),U1=Symbol("emittedError"),Jb=Symbol("closed"),cue=Symbol("read"),zb=Symbol("flush"),uue=Symbol("flushChunk"),ka=Symbol("encoding"),_f=Symbol("decoder"),Xb=Symbol("flowing"),_1=Symbol("paused"),ME=Symbol("resume"),Fs=Symbol("bufferLength"),vU=Symbol("bufferPush"),DU=Symbol("bufferShift"),Fo=Symbol("objectMode"),Ro=Symbol("destroyed"),SU=Symbol("emitData"),Aue=Symbol("emitEnd"),PU=Symbol("emitEnd2"),Hf=Symbol("async"),H1=t=>Promise.resolve().then(t),fue=global._MP_NO_ITERATOR_SYMBOLS_!=="1",bat=fue&&Symbol.asyncIterator||Symbol("asyncIterator not implemented"),xat=fue&&Symbol.iterator||Symbol("iterator not implemented"),kat=t=>t==="end"||t==="finish"||t==="prefinish",Qat=t=>t instanceof ArrayBuffer||typeof t=="object"&&t.constructor&&t.constructor.name==="ArrayBuffer"&&t.byteLength>=0,Fat=t=>!Buffer.isBuffer(t)&&ArrayBuffer.isView(t),Zb=class{constructor(e,r,o){this.src=e,this.dest=r,this.opts=o,this.ondrain=()=>e[ME](),r.on("drain",this.ondrain)}unpipe(){this.dest.removeListener("drain",this.ondrain)}proxyErrors(){}end(){this.unpipe(),this.opts.end&&this.dest.end()}},bU=class extends Zb{unpipe(){this.src.removeListener("error",this.proxyErrors),super.unpipe()}constructor(e,r,o){super(e,r,o),this.proxyErrors=a=>r.emit("error",a),e.on("error",this.proxyErrors)}};hue.exports=class pue extends aue{constructor(e){super(),this[Xb]=!1,this[_1]=!1,this.pipes=[],this.buffer=[],this[Fo]=e&&e.objectMode||!1,this[Fo]?this[ka]=null:this[ka]=e&&e.encoding||null,this[ka]==="buffer"&&(this[ka]=null),this[Hf]=e&&!!e.async||!1,this[_f]=this[ka]?new lue(this[ka]):null,this[Mf]=!1,this[hh]=!1,this[Vb]=!1,this[Jb]=!1,this[U1]=null,this.writable=!0,this.readable=!0,this[Fs]=0,this[Ro]=!1}get bufferLength(){return this[Fs]}get encoding(){return this[ka]}set encoding(e){if(this[Fo])throw new Error("cannot set encoding in objectMode");if(this[ka]&&e!==this[ka]&&(this[_f]&&this[_f].lastNeed||this[Fs]))throw new Error("cannot change encoding");this[ka]!==e&&(this[_f]=e?new lue(e):null,this.buffer.length&&(this.buffer=this.buffer.map(r=>this[_f].write(r)))),this[ka]=e}setEncoding(e){this.encoding=e}get objectMode(){return this[Fo]}set objectMode(e){this[Fo]=this[Fo]||!!e}get async(){return this[Hf]}set async(e){this[Hf]=this[Hf]||!!e}write(e,r,o){if(this[Mf])throw new Error("write after end");if(this[Ro])return this.emit("error",Object.assign(new Error("Cannot call write after a stream was destroyed"),{code:"ERR_STREAM_DESTROYED"})),!0;typeof r=="function"&&(o=r,r="utf8"),r||(r="utf8");let a=this[Hf]?H1:n=>n();return!this[Fo]&&!Buffer.isBuffer(e)&&(Fat(e)?e=Buffer.from(e.buffer,e.byteOffset,e.byteLength):Qat(e)?e=Buffer.from(e):typeof e!="string"&&(this.objectMode=!0)),this[Fo]?(this.flowing&&this[Fs]!==0&&this[zb](!0),this.flowing?this.emit("data",e):this[vU](e),this[Fs]!==0&&this.emit("readable"),o&&a(o),this.flowing):e.length?(typeof e=="string"&&!(r===this[ka]&&!this[_f].lastNeed)&&(e=Buffer.from(e,r)),Buffer.isBuffer(e)&&this[ka]&&(e=this[_f].write(e)),this.flowing&&this[Fs]!==0&&this[zb](!0),this.flowing?this.emit("data",e):this[vU](e),this[Fs]!==0&&this.emit("readable"),o&&a(o),this.flowing):(this[Fs]!==0&&this.emit("readable"),o&&a(o),this.flowing)}read(e){if(this[Ro])return null;if(this[Fs]===0||e===0||e>this[Fs])return this[Uf](),null;this[Fo]&&(e=null),this.buffer.length>1&&!this[Fo]&&(this.encoding?this.buffer=[this.buffer.join("")]:this.buffer=[Buffer.concat(this.buffer,this[Fs])]);let r=this[cue](e||null,this.buffer[0]);return this[Uf](),r}[cue](e,r){return e===r.length||e===null?this[DU]():(this.buffer[0]=r.slice(e),r=r.slice(0,e),this[Fs]-=e),this.emit("data",r),!this.buffer.length&&!this[Mf]&&this.emit("drain"),r}end(e,r,o){return typeof e=="function"&&(o=e,e=null),typeof r=="function"&&(o=r,r="utf8"),e&&this.write(e,r),o&&this.once("end",o),this[Mf]=!0,this.writable=!1,(this.flowing||!this[_1])&&this[Uf](),this}[ME](){this[Ro]||(this[_1]=!1,this[Xb]=!0,this.emit("resume"),this.buffer.length?this[zb]():this[Mf]?this[Uf]():this.emit("drain"))}resume(){return this[ME]()}pause(){this[Xb]=!1,this[_1]=!0}get destroyed(){return this[Ro]}get flowing(){return this[Xb]}get paused(){return this[_1]}[vU](e){this[Fo]?this[Fs]+=1:this[Fs]+=e.length,this.buffer.push(e)}[DU](){return this.buffer.length&&(this[Fo]?this[Fs]-=1:this[Fs]-=this.buffer[0].length),this.buffer.shift()}[zb](e){do;while(this[uue](this[DU]()));!e&&!this.buffer.length&&!this[Mf]&&this.emit("drain")}[uue](e){return e?(this.emit("data",e),this.flowing):!1}pipe(e,r){if(this[Ro])return;let o=this[hh];return r=r||{},e===oue.stdout||e===oue.stderr?r.end=!1:r.end=r.end!==!1,r.proxyErrors=!!r.proxyErrors,o?r.end&&e.end():(this.pipes.push(r.proxyErrors?new bU(this,e,r):new Zb(this,e,r)),this[Hf]?H1(()=>this[ME]()):this[ME]()),e}unpipe(e){let r=this.pipes.find(o=>o.dest===e);r&&(this.pipes.splice(this.pipes.indexOf(r),1),r.unpipe())}addListener(e,r){return this.on(e,r)}on(e,r){let o=super.on(e,r);return e==="data"&&!this.pipes.length&&!this.flowing?this[ME]():e==="readable"&&this[Fs]!==0?super.emit("readable"):kat(e)&&this[hh]?(super.emit(e),this.removeAllListeners(e)):e==="error"&&this[U1]&&(this[Hf]?H1(()=>r.call(this,this[U1])):r.call(this,this[U1])),o}get emittedEnd(){return this[hh]}[Uf](){!this[Vb]&&!this[hh]&&!this[Ro]&&this.buffer.length===0&&this[Mf]&&(this[Vb]=!0,this.emit("end"),this.emit("prefinish"),this.emit("finish"),this[Jb]&&this.emit("close"),this[Vb]=!1)}emit(e,r,...o){if(e!=="error"&&e!=="close"&&e!==Ro&&this[Ro])return;if(e==="data")return r?this[Hf]?H1(()=>this[SU](r)):this[SU](r):!1;if(e==="end")return this[Aue]();if(e==="close"){if(this[Jb]=!0,!this[hh]&&!this[Ro])return;let n=super.emit("close");return this.removeAllListeners("close"),n}else if(e==="error"){this[U1]=r;let n=super.emit("error",r);return this[Uf](),n}else if(e==="resume"){let n=super.emit("resume");return this[Uf](),n}else if(e==="finish"||e==="prefinish"){let n=super.emit(e);return this.removeAllListeners(e),n}let a=super.emit(e,r,...o);return this[Uf](),a}[SU](e){for(let o of this.pipes)o.dest.write(e)===!1&&this.pause();let r=super.emit("data",e);return this[Uf](),r}[Aue](){this[hh]||(this[hh]=!0,this.readable=!1,this[Hf]?H1(()=>this[PU]()):this[PU]())}[PU](){if(this[_f]){let r=this[_f].end();if(r){for(let o of this.pipes)o.dest.write(r);super.emit("data",r)}}for(let r of this.pipes)r.end();let e=super.emit("end");return this.removeAllListeners("end"),e}collect(){let e=[];this[Fo]||(e.dataLength=0);let r=this.promise();return this.on("data",o=>{e.push(o),this[Fo]||(e.dataLength+=o.length)}),r.then(()=>e)}concat(){return this[Fo]?Promise.reject(new Error("cannot concat in objectMode")):this.collect().then(e=>this[Fo]?Promise.reject(new Error("cannot concat in objectMode")):this[ka]?e.join(""):Buffer.concat(e,e.dataLength))}promise(){return new Promise((e,r)=>{this.on(Ro,()=>r(new Error("stream destroyed"))),this.on("error",o=>r(o)),this.on("end",()=>e())})}[bat](){return{next:()=>{let r=this.read();if(r!==null)return Promise.resolve({done:!1,value:r});if(this[Mf])return Promise.resolve({done:!0});let o=null,a=null,n=h=>{this.removeListener("data",u),this.removeListener("end",A),a(h)},u=h=>{this.removeListener("error",n),this.removeListener("end",A),this.pause(),o({value:h,done:!!this[Mf]})},A=()=>{this.removeListener("error",n),this.removeListener("data",u),o({done:!0})},p=()=>n(new Error("stream destroyed"));return new Promise((h,E)=>{a=E,o=h,this.once(Ro,p),this.once("error",n),this.once("end",A),this.once("data",u)})}}}[xat](){return{next:()=>{let r=this.read();return{value:r,done:r===null}}}}destroy(e){return this[Ro]?(e?this.emit("error",e):this.emit(Ro),this):(this[Ro]=!0,this.buffer.length=0,this[Fs]=0,typeof this.close=="function"&&!this[Jb]&&this.close(),e?this.emit("error",e):this.emit(Ro),this)}static isStream(e){return!!e&&(e instanceof pue||e instanceof aue||e instanceof Pat&&(typeof e.pipe=="function"||typeof e.write=="function"&&typeof e.end=="function"))}}});var due=_((M4t,gue)=>{var Rat=ve("zlib").constants||{ZLIB_VERNUM:4736};gue.exports=Object.freeze(Object.assign(Object.create(null),{Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_MEM_ERROR:-4,Z_BUF_ERROR:-5,Z_VERSION_ERROR:-6,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,DEFLATE:1,INFLATE:2,GZIP:3,GUNZIP:4,DEFLATERAW:5,INFLATERAW:6,UNZIP:7,BROTLI_DECODE:8,BROTLI_ENCODE:9,Z_MIN_WINDOWBITS:8,Z_MAX_WINDOWBITS:15,Z_DEFAULT_WINDOWBITS:15,Z_MIN_CHUNK:64,Z_MAX_CHUNK:1/0,Z_DEFAULT_CHUNK:16384,Z_MIN_MEMLEVEL:1,Z_MAX_MEMLEVEL:9,Z_DEFAULT_MEMLEVEL:8,Z_MIN_LEVEL:-1,Z_MAX_LEVEL:9,Z_DEFAULT_LEVEL:-1,BROTLI_OPERATION_PROCESS:0,BROTLI_OPERATION_FLUSH:1,BROTLI_OPERATION_FINISH:2,BROTLI_OPERATION_EMIT_METADATA:3,BROTLI_MODE_GENERIC:0,BROTLI_MODE_TEXT:1,BROTLI_MODE_FONT:2,BROTLI_DEFAULT_MODE:0,BROTLI_MIN_QUALITY:0,BROTLI_MAX_QUALITY:11,BROTLI_DEFAULT_QUALITY:11,BROTLI_MIN_WINDOW_BITS:10,BROTLI_MAX_WINDOW_BITS:24,BROTLI_LARGE_MAX_WINDOW_BITS:30,BROTLI_DEFAULT_WINDOW:22,BROTLI_MIN_INPUT_BLOCK_BITS:16,BROTLI_MAX_INPUT_BLOCK_BITS:24,BROTLI_PARAM_MODE:0,BROTLI_PARAM_QUALITY:1,BROTLI_PARAM_LGWIN:2,BROTLI_PARAM_LGBLOCK:3,BROTLI_PARAM_DISABLE_LITERAL_CONTEXT_MODELING:4,BROTLI_PARAM_SIZE_HINT:5,BROTLI_PARAM_LARGE_WINDOW:6,BROTLI_PARAM_NPOSTFIX:7,BROTLI_PARAM_NDIRECT:8,BROTLI_DECODER_RESULT_ERROR:0,BROTLI_DECODER_RESULT_SUCCESS:1,BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT:2,BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT:3,BROTLI_DECODER_PARAM_DISABLE_RING_BUFFER_REALLOCATION:0,BROTLI_DECODER_PARAM_LARGE_WINDOW:1,BROTLI_DECODER_NO_ERROR:0,BROTLI_DECODER_SUCCESS:1,BROTLI_DECODER_NEEDS_MORE_INPUT:2,BROTLI_DECODER_NEEDS_MORE_OUTPUT:3,BROTLI_DECODER_ERROR_FORMAT_EXUBERANT_NIBBLE:-1,BROTLI_DECODER_ERROR_FORMAT_RESERVED:-2,BROTLI_DECODER_ERROR_FORMAT_EXUBERANT_META_NIBBLE:-3,BROTLI_DECODER_ERROR_FORMAT_SIMPLE_HUFFMAN_ALPHABET:-4,BROTLI_DECODER_ERROR_FORMAT_SIMPLE_HUFFMAN_SAME:-5,BROTLI_DECODER_ERROR_FORMAT_CL_SPACE:-6,BROTLI_DECODER_ERROR_FORMAT_HUFFMAN_SPACE:-7,BROTLI_DECODER_ERROR_FORMAT_CONTEXT_MAP_REPEAT:-8,BROTLI_DECODER_ERROR_FORMAT_BLOCK_LENGTH_1:-9,BROTLI_DECODER_ERROR_FORMAT_BLOCK_LENGTH_2:-10,BROTLI_DECODER_ERROR_FORMAT_TRANSFORM:-11,BROTLI_DECODER_ERROR_FORMAT_DICTIONARY:-12,BROTLI_DECODER_ERROR_FORMAT_WINDOW_BITS:-13,BROTLI_DECODER_ERROR_FORMAT_PADDING_1:-14,BROTLI_DECODER_ERROR_FORMAT_PADDING_2:-15,BROTLI_DECODER_ERROR_FORMAT_DISTANCE:-16,BROTLI_DECODER_ERROR_DICTIONARY_NOT_SET:-19,BROTLI_DECODER_ERROR_INVALID_ARGUMENTS:-20,BROTLI_DECODER_ERROR_ALLOC_CONTEXT_MODES:-21,BROTLI_DECODER_ERROR_ALLOC_TREE_GROUPS:-22,BROTLI_DECODER_ERROR_ALLOC_CONTEXT_MAP:-25,BROTLI_DECODER_ERROR_ALLOC_RING_BUFFER_1:-26,BROTLI_DECODER_ERROR_ALLOC_RING_BUFFER_2:-27,BROTLI_DECODER_ERROR_ALLOC_BLOCK_TYPE_TREES:-30,BROTLI_DECODER_ERROR_UNREACHABLE:-31},Rat))});var qU=_(cl=>{"use strict";var RU=ve("assert"),gh=ve("buffer").Buffer,Eue=ve("zlib"),Fd=cl.constants=due(),Tat=UE(),mue=gh.concat,Rd=Symbol("_superWrite"),HE=class extends Error{constructor(e){super("zlib: "+e.message),this.code=e.code,this.errno=e.errno,this.code||(this.code="ZLIB_ERROR"),this.message="zlib: "+e.message,Error.captureStackTrace(this,this.constructor)}get name(){return"ZlibError"}},Nat=Symbol("opts"),j1=Symbol("flushFlag"),yue=Symbol("finishFlushFlag"),GU=Symbol("fullFlushFlag"),ti=Symbol("handle"),$b=Symbol("onError"),_E=Symbol("sawError"),xU=Symbol("level"),kU=Symbol("strategy"),QU=Symbol("ended"),U4t=Symbol("_defaultFullFlush"),ex=class extends Tat{constructor(e,r){if(!e||typeof e!="object")throw new TypeError("invalid options for ZlibBase constructor");super(e),this[_E]=!1,this[QU]=!1,this[Nat]=e,this[j1]=e.flush,this[yue]=e.finishFlush;try{this[ti]=new Eue[r](e)}catch(o){throw new HE(o)}this[$b]=o=>{this[_E]||(this[_E]=!0,this.close(),this.emit("error",o))},this[ti].on("error",o=>this[$b](new HE(o))),this.once("end",()=>this.close)}close(){this[ti]&&(this[ti].close(),this[ti]=null,this.emit("close"))}reset(){if(!this[_E])return RU(this[ti],"zlib binding closed"),this[ti].reset()}flush(e){this.ended||(typeof e!="number"&&(e=this[GU]),this.write(Object.assign(gh.alloc(0),{[j1]:e})))}end(e,r,o){return e&&this.write(e,r),this.flush(this[yue]),this[QU]=!0,super.end(null,null,o)}get ended(){return this[QU]}write(e,r,o){if(typeof r=="function"&&(o=r,r="utf8"),typeof e=="string"&&(e=gh.from(e,r)),this[_E])return;RU(this[ti],"zlib binding closed");let a=this[ti]._handle,n=a.close;a.close=()=>{};let u=this[ti].close;this[ti].close=()=>{},gh.concat=h=>h;let A;try{let h=typeof e[j1]=="number"?e[j1]:this[j1];A=this[ti]._processChunk(e,h),gh.concat=mue}catch(h){gh.concat=mue,this[$b](new HE(h))}finally{this[ti]&&(this[ti]._handle=a,a.close=n,this[ti].close=u,this[ti].removeAllListeners("error"))}this[ti]&&this[ti].on("error",h=>this[$b](new HE(h)));let p;if(A)if(Array.isArray(A)&&A.length>0){p=this[Rd](gh.from(A[0]));for(let h=1;h<A.length;h++)p=this[Rd](A[h])}else p=this[Rd](gh.from(A));return o&&o(),p}[Rd](e){return super.write(e)}},jf=class extends ex{constructor(e,r){e=e||{},e.flush=e.flush||Fd.Z_NO_FLUSH,e.finishFlush=e.finishFlush||Fd.Z_FINISH,super(e,r),this[GU]=Fd.Z_FULL_FLUSH,this[xU]=e.level,this[kU]=e.strategy}params(e,r){if(!this[_E]){if(!this[ti])throw new Error("cannot switch params when binding is closed");if(!this[ti].params)throw new Error("not supported in this implementation");if(this[xU]!==e||this[kU]!==r){this.flush(Fd.Z_SYNC_FLUSH),RU(this[ti],"zlib binding closed");let o=this[ti].flush;this[ti].flush=(a,n)=>{this.flush(a),n()};try{this[ti].params(e,r)}finally{this[ti].flush=o}this[ti]&&(this[xU]=e,this[kU]=r)}}}},TU=class extends jf{constructor(e){super(e,"Deflate")}},NU=class extends jf{constructor(e){super(e,"Inflate")}},FU=Symbol("_portable"),LU=class extends jf{constructor(e){super(e,"Gzip"),this[FU]=e&&!!e.portable}[Rd](e){return this[FU]?(this[FU]=!1,e[9]=255,super[Rd](e)):super[Rd](e)}},OU=class extends jf{constructor(e){super(e,"Gunzip")}},MU=class extends jf{constructor(e){super(e,"DeflateRaw")}},UU=class extends jf{constructor(e){super(e,"InflateRaw")}},_U=class extends jf{constructor(e){super(e,"Unzip")}},tx=class extends ex{constructor(e,r){e=e||{},e.flush=e.flush||Fd.BROTLI_OPERATION_PROCESS,e.finishFlush=e.finishFlush||Fd.BROTLI_OPERATION_FINISH,super(e,r),this[GU]=Fd.BROTLI_OPERATION_FLUSH}},HU=class extends tx{constructor(e){super(e,"BrotliCompress")}},jU=class extends tx{constructor(e){super(e,"BrotliDecompress")}};cl.Deflate=TU;cl.Inflate=NU;cl.Gzip=LU;cl.Gunzip=OU;cl.DeflateRaw=MU;cl.InflateRaw=UU;cl.Unzip=_U;typeof Eue.BrotliCompress=="function"?(cl.BrotliCompress=HU,cl.BrotliDecompress=jU):cl.BrotliCompress=cl.BrotliDecompress=class{constructor(){throw new Error("Brotli is not supported in this version of Node.js")}}});var jE=_((j4t,Cue)=>{var Lat=process.env.TESTING_TAR_FAKE_PLATFORM||process.platform;Cue.exports=Lat!=="win32"?t=>t:t=>t&&t.replace(/\\/g,"/")});var rx=_((q4t,wue)=>{"use strict";var Oat=UE(),YU=jE(),WU=Symbol("slurp");wue.exports=class extends Oat{constructor(e,r,o){switch(super(),this.pause(),this.extended=r,this.globalExtended=o,this.header=e,this.startBlockSize=512*Math.ceil(e.size/512),this.blockRemain=this.startBlockSize,this.remain=e.size,this.type=e.type,this.meta=!1,this.ignore=!1,this.type){case"File":case"OldFile":case"Link":case"SymbolicLink":case"CharacterDevice":case"BlockDevice":case"Directory":case"FIFO":case"ContiguousFile":case"GNUDumpDir":break;case"NextFileHasLongLinkpath":case"NextFileHasLongPath":case"OldGnuLongPath":case"GlobalExtendedHeader":case"ExtendedHeader":case"OldExtendedHeader":this.meta=!0;break;default:this.ignore=!0}this.path=YU(e.path),this.mode=e.mode,this.mode&&(this.mode=this.mode&4095),this.uid=e.uid,this.gid=e.gid,this.uname=e.uname,this.gname=e.gname,this.size=e.size,this.mtime=e.mtime,this.atime=e.atime,this.ctime=e.ctime,this.linkpath=YU(e.linkpath),this.uname=e.uname,this.gname=e.gname,r&&this[WU](r),o&&this[WU](o,!0)}write(e){let r=e.length;if(r>this.blockRemain)throw new Error("writing more to entry than is appropriate");let o=this.remain,a=this.blockRemain;return this.remain=Math.max(0,o-r),this.blockRemain=Math.max(0,a-r),this.ignore?!0:o>=r?super.write(e):super.write(e.slice(0,o))}[WU](e,r){for(let o in e)e[o]!==null&&e[o]!==void 0&&!(r&&o==="path")&&(this[o]=o==="path"||o==="linkpath"?YU(e[o]):e[o])}}});var KU=_(nx=>{"use strict";nx.name=new Map([["0","File"],["","OldFile"],["1","Link"],["2","SymbolicLink"],["3","CharacterDevice"],["4","BlockDevice"],["5","Directory"],["6","FIFO"],["7","ContiguousFile"],["g","GlobalExtendedHeader"],["x","ExtendedHeader"],["A","SolarisACL"],["D","GNUDumpDir"],["I","Inode"],["K","NextFileHasLongLinkpath"],["L","NextFileHasLongPath"],["M","ContinuationFile"],["N","OldGnuLongPath"],["S","SparseFile"],["V","TapeVolumeHeader"],["X","OldExtendedHeader"]]);nx.code=new Map(Array.from(nx.name).map(t=>[t[1],t[0]]))});var Due=_((W4t,vue)=>{"use strict";var Mat=(t,e)=>{if(Number.isSafeInteger(t))t<0?_at(t,e):Uat(t,e);else throw Error("cannot encode number outside of javascript safe integer range");return e},Uat=(t,e)=>{e[0]=128;for(var r=e.length;r>1;r--)e[r-1]=t&255,t=Math.floor(t/256)},_at=(t,e)=>{e[0]=255;var r=!1;t=t*-1;for(var o=e.length;o>1;o--){var a=t&255;t=Math.floor(t/256),r?e[o-1]=Iue(a):a===0?e[o-1]=0:(r=!0,e[o-1]=Bue(a))}},Hat=t=>{let e=t[0],r=e===128?Gat(t.slice(1,t.length)):e===255?jat(t):null;if(r===null)throw Error("invalid base256 encoding");if(!Number.isSafeInteger(r))throw Error("parsed number outside of javascript safe integer range");return r},jat=t=>{for(var e=t.length,r=0,o=!1,a=e-1;a>-1;a--){var n=t[a],u;o?u=Iue(n):n===0?u=n:(o=!0,u=Bue(n)),u!==0&&(r-=u*Math.pow(256,e-a-1))}return r},Gat=t=>{for(var e=t.length,r=0,o=e-1;o>-1;o--){var a=t[o];a!==0&&(r+=a*Math.pow(256,e-o-1))}return r},Iue=t=>(255^t)&255,Bue=t=>(255^t)+1&255;vue.exports={encode:Mat,parse:Hat}});var qE=_((K4t,Pue)=>{"use strict";var VU=KU(),GE=ve("path").posix,Sue=Due(),JU=Symbol("slurp"),ul=Symbol("type"),ZU=class{constructor(e,r,o,a){this.cksumValid=!1,this.needPax=!1,this.nullBlock=!1,this.block=null,this.path=null,this.mode=null,this.uid=null,this.gid=null,this.size=null,this.mtime=null,this.cksum=null,this[ul]="0",this.linkpath=null,this.uname=null,this.gname=null,this.devmaj=0,this.devmin=0,this.atime=null,this.ctime=null,Buffer.isBuffer(e)?this.decode(e,r||0,o,a):e&&this.set(e)}decode(e,r,o,a){if(r||(r=0),!e||!(e.length>=r+512))throw new Error("need 512 bytes for header");if(this.path=Td(e,r,100),this.mode=dh(e,r+100,8),this.uid=dh(e,r+108,8),this.gid=dh(e,r+116,8),this.size=dh(e,r+124,12),this.mtime=zU(e,r+136,12),this.cksum=dh(e,r+148,12),this[JU](o),this[JU](a,!0),this[ul]=Td(e,r+156,1),this[ul]===""&&(this[ul]="0"),this[ul]==="0"&&this.path.substr(-1)==="/"&&(this[ul]="5"),this[ul]==="5"&&(this.size=0),this.linkpath=Td(e,r+157,100),e.slice(r+257,r+265).toString()==="ustar\x0000")if(this.uname=Td(e,r+265,32),this.gname=Td(e,r+297,32),this.devmaj=dh(e,r+329,8),this.devmin=dh(e,r+337,8),e[r+475]!==0){let u=Td(e,r+345,155);this.path=u+"/"+this.path}else{let u=Td(e,r+345,130);u&&(this.path=u+"/"+this.path),this.atime=zU(e,r+476,12),this.ctime=zU(e,r+488,12)}let n=8*32;for(let u=r;u<r+148;u++)n+=e[u];for(let u=r+156;u<r+512;u++)n+=e[u];this.cksumValid=n===this.cksum,this.cksum===null&&n===8*32&&(this.nullBlock=!0)}[JU](e,r){for(let o in e)e[o]!==null&&e[o]!==void 0&&!(r&&o==="path")&&(this[o]=e[o])}encode(e,r){if(e||(e=this.block=Buffer.alloc(512),r=0),r||(r=0),!(e.length>=r+512))throw new Error("need 512 bytes for header");let o=this.ctime||this.atime?130:155,a=qat(this.path||"",o),n=a[0],u=a[1];this.needPax=a[2],this.needPax=Nd(e,r,100,n)||this.needPax,this.needPax=mh(e,r+100,8,this.mode)||this.needPax,this.needPax=mh(e,r+108,8,this.uid)||this.needPax,this.needPax=mh(e,r+116,8,this.gid)||this.needPax,this.needPax=mh(e,r+124,12,this.size)||this.needPax,this.needPax=XU(e,r+136,12,this.mtime)||this.needPax,e[r+156]=this[ul].charCodeAt(0),this.needPax=Nd(e,r+157,100,this.linkpath)||this.needPax,e.write("ustar\x0000",r+257,8),this.needPax=Nd(e,r+265,32,this.uname)||this.needPax,this.needPax=Nd(e,r+297,32,this.gname)||this.needPax,this.needPax=mh(e,r+329,8,this.devmaj)||this.needPax,this.needPax=mh(e,r+337,8,this.devmin)||this.needPax,this.needPax=Nd(e,r+345,o,u)||this.needPax,e[r+475]!==0?this.needPax=Nd(e,r+345,155,u)||this.needPax:(this.needPax=Nd(e,r+345,130,u)||this.needPax,this.needPax=XU(e,r+476,12,this.atime)||this.needPax,this.needPax=XU(e,r+488,12,this.ctime)||this.needPax);let A=8*32;for(let p=r;p<r+148;p++)A+=e[p];for(let p=r+156;p<r+512;p++)A+=e[p];return this.cksum=A,mh(e,r+148,8,this.cksum),this.cksumValid=!0,this.needPax}set(e){for(let r in e)e[r]!==null&&e[r]!==void 0&&(this[r]=e[r])}get type(){return VU.name.get(this[ul])||this[ul]}get typeKey(){return this[ul]}set type(e){VU.code.has(e)?this[ul]=VU.code.get(e):this[ul]=e}},qat=(t,e)=>{let o=t,a="",n,u=GE.parse(t).root||".";if(Buffer.byteLength(o)<100)n=[o,a,!1];else{a=GE.dirname(o),o=GE.basename(o);do Buffer.byteLength(o)<=100&&Buffer.byteLength(a)<=e?n=[o,a,!1]:Buffer.byteLength(o)>100&&Buffer.byteLength(a)<=e?n=[o.substr(0,100-1),a,!0]:(o=GE.join(GE.basename(a),o),a=GE.dirname(a));while(a!==u&&!n);n||(n=[t.substr(0,100-1),"",!0])}return n},Td=(t,e,r)=>t.slice(e,e+r).toString("utf8").replace(/\0.*/,""),zU=(t,e,r)=>Yat(dh(t,e,r)),Yat=t=>t===null?null:new Date(t*1e3),dh=(t,e,r)=>t[e]&128?Sue.parse(t.slice(e,e+r)):Kat(t,e,r),Wat=t=>isNaN(t)?null:t,Kat=(t,e,r)=>Wat(parseInt(t.slice(e,e+r).toString("utf8").replace(/\0.*$/,"").trim(),8)),Vat={12:8589934591,8:2097151},mh=(t,e,r,o)=>o===null?!1:o>Vat[r]||o<0?(Sue.encode(o,t.slice(e,e+r)),!0):(Jat(t,e,r,o),!1),Jat=(t,e,r,o)=>t.write(zat(o,r),e,r,"ascii"),zat=(t,e)=>Xat(Math.floor(t).toString(8),e),Xat=(t,e)=>(t.length===e-1?t:new Array(e-t.length-1).join("0")+t+" ")+"\0",XU=(t,e,r,o)=>o===null?!1:mh(t,e,r,o.getTime()/1e3),Zat=new Array(156).join("\0"),Nd=(t,e,r,o)=>o===null?!1:(t.write(o+Zat,e,r,"utf8"),o.length!==Buffer.byteLength(o)||o.length>r);Pue.exports=ZU});var ix=_((V4t,bue)=>{"use strict";var $at=qE(),elt=ve("path"),G1=class{constructor(e,r){this.atime=e.atime||null,this.charset=e.charset||null,this.comment=e.comment||null,this.ctime=e.ctime||null,this.gid=e.gid||null,this.gname=e.gname||null,this.linkpath=e.linkpath||null,this.mtime=e.mtime||null,this.path=e.path||null,this.size=e.size||null,this.uid=e.uid||null,this.uname=e.uname||null,this.dev=e.dev||null,this.ino=e.ino||null,this.nlink=e.nlink||null,this.global=r||!1}encode(){let e=this.encodeBody();if(e==="")return null;let r=Buffer.byteLength(e),o=512*Math.ceil(1+r/512),a=Buffer.allocUnsafe(o);for(let n=0;n<512;n++)a[n]=0;new $at({path:("PaxHeader/"+elt.basename(this.path)).slice(0,99),mode:this.mode||420,uid:this.uid||null,gid:this.gid||null,size:r,mtime:this.mtime||null,type:this.global?"GlobalExtendedHeader":"ExtendedHeader",linkpath:"",uname:this.uname||"",gname:this.gname||"",devmaj:0,devmin:0,atime:this.atime||null,ctime:this.ctime||null}).encode(a),a.write(e,512,r,"utf8");for(let n=r+512;n<a.length;n++)a[n]=0;return a}encodeBody(){return this.encodeField("path")+this.encodeField("ctime")+this.encodeField("atime")+this.encodeField("dev")+this.encodeField("ino")+this.encodeField("nlink")+this.encodeField("charset")+this.encodeField("comment")+this.encodeField("gid")+this.encodeField("gname")+this.encodeField("linkpath")+this.encodeField("mtime")+this.encodeField("size")+this.encodeField("uid")+this.encodeField("uname")}encodeField(e){if(this[e]===null||this[e]===void 0)return"";let r=this[e]instanceof Date?this[e].getTime()/1e3:this[e],o=" "+(e==="dev"||e==="ino"||e==="nlink"?"SCHILY.":"")+e+"="+r+`
+`,a=Buffer.byteLength(o),n=Math.floor(Math.log(a)/Math.log(10))+1;return a+n>=Math.pow(10,n)&&(n+=1),n+a+o}};G1.parse=(t,e,r)=>new G1(tlt(rlt(t),e),r);var tlt=(t,e)=>e?Object.keys(t).reduce((r,o)=>(r[o]=t[o],r),e):t,rlt=t=>t.replace(/\n$/,"").split(`
+`).reduce(nlt,Object.create(null)),nlt=(t,e)=>{let r=parseInt(e,10);if(r!==Buffer.byteLength(e)+1)return t;e=e.substr((r+" ").length);let o=e.split("="),a=o.shift().replace(/^SCHILY\.(dev|ino|nlink)/,"$1");if(!a)return t;let n=o.join("=");return t[a]=/^([A-Z]+\.)?([mac]|birth|creation)time$/.test(a)?new Date(n*1e3):/^[0-9]+$/.test(n)?+n:n,t};bue.exports=G1});var YE=_((J4t,xue)=>{xue.exports=t=>{let e=t.length-1,r=-1;for(;e>-1&&t.charAt(e)==="/";)r=e,e--;return r===-1?t:t.slice(0,r)}});var sx=_((z4t,kue)=>{"use strict";kue.exports=t=>class extends t{warn(e,r,o={}){this.file&&(o.file=this.file),this.cwd&&(o.cwd=this.cwd),o.code=r instanceof Error&&r.code||e,o.tarCode=e,!this.strict&&o.recoverable!==!1?(r instanceof Error&&(o=Object.assign(r,o),r=r.message),this.emit("warn",o.tarCode,r,o)):r instanceof Error?this.emit("error",Object.assign(r,o)):this.emit("error",Object.assign(new Error(`${e}: ${r}`),o))}}});var e3=_((Z4t,Que)=>{"use strict";var ox=["|","<",">","?",":"],$U=ox.map(t=>String.fromCharCode(61440+t.charCodeAt(0))),ilt=new Map(ox.map((t,e)=>[t,$U[e]])),slt=new Map($U.map((t,e)=>[t,ox[e]]));Que.exports={encode:t=>ox.reduce((e,r)=>e.split(r).join(ilt.get(r)),t),decode:t=>$U.reduce((e,r)=>e.split(r).join(slt.get(r)),t)}});var t3=_(($4t,Rue)=>{var{isAbsolute:olt,parse:Fue}=ve("path").win32;Rue.exports=t=>{let e="",r=Fue(t);for(;olt(t)||r.root;){let o=t.charAt(0)==="/"&&t.slice(0,4)!=="//?/"?"/":r.root;t=t.substr(o.length),e+=o,r=Fue(t)}return[e,t]}});var Nue=_((eUt,Tue)=>{"use strict";Tue.exports=(t,e,r)=>(t&=4095,r&&(t=(t|384)&-19),e&&(t&256&&(t|=64),t&32&&(t|=8),t&4&&(t|=1)),t)});var A3=_((nUt,Jue)=>{"use strict";var jue=UE(),Gue=ix(),que=qE(),oA=ve("fs"),Lue=ve("path"),sA=jE(),alt=YE(),Yue=(t,e)=>e?(t=sA(t).replace(/^\.(\/|$)/,""),alt(e)+"/"+t):sA(t),llt=16*1024*1024,Oue=Symbol("process"),Mue=Symbol("file"),Uue=Symbol("directory"),n3=Symbol("symlink"),_ue=Symbol("hardlink"),q1=Symbol("header"),ax=Symbol("read"),i3=Symbol("lstat"),lx=Symbol("onlstat"),s3=Symbol("onread"),o3=Symbol("onreadlink"),a3=Symbol("openfile"),l3=Symbol("onopenfile"),yh=Symbol("close"),cx=Symbol("mode"),c3=Symbol("awaitDrain"),r3=Symbol("ondrain"),aA=Symbol("prefix"),Hue=Symbol("hadError"),Wue=sx(),clt=e3(),Kue=t3(),Vue=Nue(),ux=Wue(class extends jue{constructor(e,r){if(r=r||{},super(r),typeof e!="string")throw new TypeError("path is required");this.path=sA(e),this.portable=!!r.portable,this.myuid=process.getuid&&process.getuid()||0,this.myuser=process.env.USER||"",this.maxReadSize=r.maxReadSize||llt,this.linkCache=r.linkCache||new Map,this.statCache=r.statCache||new Map,this.preservePaths=!!r.preservePaths,this.cwd=sA(r.cwd||process.cwd()),this.strict=!!r.strict,this.noPax=!!r.noPax,this.noMtime=!!r.noMtime,this.mtime=r.mtime||null,this.prefix=r.prefix?sA(r.prefix):null,this.fd=null,this.blockLen=null,this.blockRemain=null,this.buf=null,this.offset=null,this.length=null,this.pos=null,this.remain=null,typeof r.onwarn=="function"&&this.on("warn",r.onwarn);let o=!1;if(!this.preservePaths){let[a,n]=Kue(this.path);a&&(this.path=n,o=a)}this.win32=!!r.win32||process.platform==="win32",this.win32&&(this.path=clt.decode(this.path.replace(/\\/g,"/")),e=e.replace(/\\/g,"/")),this.absolute=sA(r.absolute||Lue.resolve(this.cwd,e)),this.path===""&&(this.path="./"),o&&this.warn("TAR_ENTRY_INFO",`stripping ${o} from absolute path`,{entry:this,path:o+this.path}),this.statCache.has(this.absolute)?this[lx](this.statCache.get(this.absolute)):this[i3]()}emit(e,...r){return e==="error"&&(this[Hue]=!0),super.emit(e,...r)}[i3](){oA.lstat(this.absolute,(e,r)=>{if(e)return this.emit("error",e);this[lx](r)})}[lx](e){this.statCache.set(this.absolute,e),this.stat=e,e.isFile()||(e.size=0),this.type=Alt(e),this.emit("stat",e),this[Oue]()}[Oue](){switch(this.type){case"File":return this[Mue]();case"Directory":return this[Uue]();case"SymbolicLink":return this[n3]();default:return this.end()}}[cx](e){return Vue(e,this.type==="Directory",this.portable)}[aA](e){return Yue(e,this.prefix)}[q1](){this.type==="Directory"&&this.portable&&(this.noMtime=!0),this.header=new que({path:this[aA](this.path),linkpath:this.type==="Link"?this[aA](this.linkpath):this.linkpath,mode:this[cx](this.stat.mode),uid:this.portable?null:this.stat.uid,gid:this.portable?null:this.stat.gid,size:this.stat.size,mtime:this.noMtime?null:this.mtime||this.stat.mtime,type:this.type,uname:this.portable?null:this.stat.uid===this.myuid?this.myuser:"",atime:this.portable?null:this.stat.atime,ctime:this.portable?null:this.stat.ctime}),this.header.encode()&&!this.noPax&&super.write(new Gue({atime:this.portable?null:this.header.atime,ctime:this.portable?null:this.header.ctime,gid:this.portable?null:this.header.gid,mtime:this.noMtime?null:this.mtime||this.header.mtime,path:this[aA](this.path),linkpath:this.type==="Link"?this[aA](this.linkpath):this.linkpath,size:this.header.size,uid:this.portable?null:this.header.uid,uname:this.portable?null:this.header.uname,dev:this.portable?null:this.stat.dev,ino:this.portable?null:this.stat.ino,nlink:this.portable?null:this.stat.nlink}).encode()),super.write(this.header.block)}[Uue](){this.path.substr(-1)!=="/"&&(this.path+="/"),this.stat.size=0,this[q1](),this.end()}[n3](){oA.readlink(this.absolute,(e,r)=>{if(e)return this.emit("error",e);this[o3](r)})}[o3](e){this.linkpath=sA(e),this[q1](),this.end()}[_ue](e){this.type="Link",this.linkpath=sA(Lue.relative(this.cwd,e)),this.stat.size=0,this[q1](),this.end()}[Mue](){if(this.stat.nlink>1){let e=this.stat.dev+":"+this.stat.ino;if(this.linkCache.has(e)){let r=this.linkCache.get(e);if(r.indexOf(this.cwd)===0)return this[_ue](r)}this.linkCache.set(e,this.absolute)}if(this[q1](),this.stat.size===0)return this.end();this[a3]()}[a3](){oA.open(this.absolute,"r",(e,r)=>{if(e)return this.emit("error",e);this[l3](r)})}[l3](e){if(this.fd=e,this[Hue])return this[yh]();this.blockLen=512*Math.ceil(this.stat.size/512),this.blockRemain=this.blockLen;let r=Math.min(this.blockLen,this.maxReadSize);this.buf=Buffer.allocUnsafe(r),this.offset=0,this.pos=0,this.remain=this.stat.size,this.length=this.buf.length,this[ax]()}[ax](){let{fd:e,buf:r,offset:o,length:a,pos:n}=this;oA.read(e,r,o,a,n,(u,A)=>{if(u)return this[yh](()=>this.emit("error",u));this[s3](A)})}[yh](e){oA.close(this.fd,e)}[s3](e){if(e<=0&&this.remain>0){let a=new Error("encountered unexpected EOF");return a.path=this.absolute,a.syscall="read",a.code="EOF",this[yh](()=>this.emit("error",a))}if(e>this.remain){let a=new Error("did not encounter expected EOF");return a.path=this.absolute,a.syscall="read",a.code="EOF",this[yh](()=>this.emit("error",a))}if(e===this.remain)for(let a=e;a<this.length&&e<this.blockRemain;a++)this.buf[a+this.offset]=0,e++,this.remain++;let r=this.offset===0&&e===this.buf.length?this.buf:this.buf.slice(this.offset,this.offset+e);this.write(r)?this[r3]():this[c3](()=>this[r3]())}[c3](e){this.once("drain",e)}write(e){if(this.blockRemain<e.length){let r=new Error("writing more data than expected");return r.path=this.absolute,this.emit("error",r)}return this.remain-=e.length,this.blockRemain-=e.length,this.pos+=e.length,this.offset+=e.length,super.write(e)}[r3](){if(!this.remain)return this.blockRemain&&super.write(Buffer.alloc(this.blockRemain)),this[yh](e=>e?this.emit("error",e):this.end());this.offset>=this.length&&(this.buf=Buffer.allocUnsafe(Math.min(this.blockRemain,this.buf.length)),this.offset=0),this.length=this.buf.length-this.offset,this[ax]()}}),u3=class extends ux{[i3](){this[lx](oA.lstatSync(this.absolute))}[n3](){this[o3](oA.readlinkSync(this.absolute))}[a3](){this[l3](oA.openSync(this.absolute,"r"))}[ax](){let e=!0;try{let{fd:r,buf:o,offset:a,length:n,pos:u}=this,A=oA.readSync(r,o,a,n,u);this[s3](A),e=!1}finally{if(e)try{this[yh](()=>{})}catch{}}}[c3](e){e()}[yh](e){oA.closeSync(this.fd),e()}},ult=Wue(class extends jue{constructor(e,r){r=r||{},super(r),this.preservePaths=!!r.preservePaths,this.portable=!!r.portable,this.strict=!!r.strict,this.noPax=!!r.noPax,this.noMtime=!!r.noMtime,this.readEntry=e,this.type=e.type,this.type==="Directory"&&this.portable&&(this.noMtime=!0),this.prefix=r.prefix||null,this.path=sA(e.path),this.mode=this[cx](e.mode),this.uid=this.portable?null:e.uid,this.gid=this.portable?null:e.gid,this.uname=this.portable?null:e.uname,this.gname=this.portable?null:e.gname,this.size=e.size,this.mtime=this.noMtime?null:r.mtime||e.mtime,this.atime=this.portable?null:e.atime,this.ctime=this.portable?null:e.ctime,this.linkpath=sA(e.linkpath),typeof r.onwarn=="function"&&this.on("warn",r.onwarn);let o=!1;if(!this.preservePaths){let[a,n]=Kue(this.path);a&&(this.path=n,o=a)}this.remain=e.size,this.blockRemain=e.startBlockSize,this.header=new que({path:this[aA](this.path),linkpath:this.type==="Link"?this[aA](this.linkpath):this.linkpath,mode:this.mode,uid:this.portable?null:this.uid,gid:this.portable?null:this.gid,size:this.size,mtime:this.noMtime?null:this.mtime,type:this.type,uname:this.portable?null:this.uname,atime:this.portable?null:this.atime,ctime:this.portable?null:this.ctime}),o&&this.warn("TAR_ENTRY_INFO",`stripping ${o} from absolute path`,{entry:this,path:o+this.path}),this.header.encode()&&!this.noPax&&super.write(new Gue({atime:this.portable?null:this.atime,ctime:this.portable?null:this.ctime,gid:this.portable?null:this.gid,mtime:this.noMtime?null:this.mtime,path:this[aA](this.path),linkpath:this.type==="Link"?this[aA](this.linkpath):this.linkpath,size:this.size,uid:this.portable?null:this.uid,uname:this.portable?null:this.uname,dev:this.portable?null:this.readEntry.dev,ino:this.portable?null:this.readEntry.ino,nlink:this.portable?null:this.readEntry.nlink}).encode()),super.write(this.header.block),e.pipe(this)}[aA](e){return Yue(e,this.prefix)}[cx](e){return Vue(e,this.type==="Directory",this.portable)}write(e){let r=e.length;if(r>this.blockRemain)throw new Error("writing more to entry than is appropriate");return this.blockRemain-=r,super.write(e)}end(){return this.blockRemain&&super.write(Buffer.alloc(this.blockRemain)),super.end()}});ux.Sync=u3;ux.Tar=ult;var Alt=t=>t.isFile()?"File":t.isDirectory()?"Directory":t.isSymbolicLink()?"SymbolicLink":"Unsupported";Jue.exports=ux});var Ex=_((sUt,rAe)=>{"use strict";var mx=class{constructor(e,r){this.path=e||"./",this.absolute=r,this.entry=null,this.stat=null,this.readdir=null,this.pending=!1,this.ignore=!1,this.piped=!1}},flt=UE(),plt=qU(),hlt=rx(),C3=A3(),glt=C3.Sync,dlt=C3.Tar,mlt=IS(),zue=Buffer.alloc(1024),px=Symbol("onStat"),Ax=Symbol("ended"),lA=Symbol("queue"),WE=Symbol("current"),Ld=Symbol("process"),fx=Symbol("processing"),Xue=Symbol("processJob"),cA=Symbol("jobs"),f3=Symbol("jobDone"),hx=Symbol("addFSEntry"),Zue=Symbol("addTarEntry"),d3=Symbol("stat"),m3=Symbol("readdir"),gx=Symbol("onreaddir"),dx=Symbol("pipe"),$ue=Symbol("entry"),p3=Symbol("entryOpt"),y3=Symbol("writeEntryClass"),tAe=Symbol("write"),h3=Symbol("ondrain"),yx=ve("fs"),eAe=ve("path"),ylt=sx(),g3=jE(),w3=ylt(class extends flt{constructor(e){super(e),e=e||Object.create(null),this.opt=e,this.file=e.file||"",this.cwd=e.cwd||process.cwd(),this.maxReadSize=e.maxReadSize,this.preservePaths=!!e.preservePaths,this.strict=!!e.strict,this.noPax=!!e.noPax,this.prefix=g3(e.prefix||""),this.linkCache=e.linkCache||new Map,this.statCache=e.statCache||new Map,this.readdirCache=e.readdirCache||new Map,this[y3]=C3,typeof e.onwarn=="function"&&this.on("warn",e.onwarn),this.portable=!!e.portable,this.zip=null,e.gzip?(typeof e.gzip!="object"&&(e.gzip={}),this.portable&&(e.gzip.portable=!0),this.zip=new plt.Gzip(e.gzip),this.zip.on("data",r=>super.write(r)),this.zip.on("end",r=>super.end()),this.zip.on("drain",r=>this[h3]()),this.on("resume",r=>this.zip.resume())):this.on("drain",this[h3]),this.noDirRecurse=!!e.noDirRecurse,this.follow=!!e.follow,this.noMtime=!!e.noMtime,this.mtime=e.mtime||null,this.filter=typeof e.filter=="function"?e.filter:r=>!0,this[lA]=new mlt,this[cA]=0,this.jobs=+e.jobs||4,this[fx]=!1,this[Ax]=!1}[tAe](e){return super.write(e)}add(e){return this.write(e),this}end(e){return e&&this.write(e),this[Ax]=!0,this[Ld](),this}write(e){if(this[Ax])throw new Error("write after end");return e instanceof hlt?this[Zue](e):this[hx](e),this.flowing}[Zue](e){let r=g3(eAe.resolve(this.cwd,e.path));if(!this.filter(e.path,e))e.resume();else{let o=new mx(e.path,r,!1);o.entry=new dlt(e,this[p3](o)),o.entry.on("end",a=>this[f3](o)),this[cA]+=1,this[lA].push(o)}this[Ld]()}[hx](e){let r=g3(eAe.resolve(this.cwd,e));this[lA].push(new mx(e,r)),this[Ld]()}[d3](e){e.pending=!0,this[cA]+=1;let r=this.follow?"stat":"lstat";yx[r](e.absolute,(o,a)=>{e.pending=!1,this[cA]-=1,o?this.emit("error",o):this[px](e,a)})}[px](e,r){this.statCache.set(e.absolute,r),e.stat=r,this.filter(e.path,r)||(e.ignore=!0),this[Ld]()}[m3](e){e.pending=!0,this[cA]+=1,yx.readdir(e.absolute,(r,o)=>{if(e.pending=!1,this[cA]-=1,r)return this.emit("error",r);this[gx](e,o)})}[gx](e,r){this.readdirCache.set(e.absolute,r),e.readdir=r,this[Ld]()}[Ld](){if(!this[fx]){this[fx]=!0;for(let e=this[lA].head;e!==null&&this[cA]<this.jobs;e=e.next)if(this[Xue](e.value),e.value.ignore){let r=e.next;this[lA].removeNode(e),e.next=r}this[fx]=!1,this[Ax]&&!this[lA].length&&this[cA]===0&&(this.zip?this.zip.end(zue):(super.write(zue),super.end()))}}get[WE](){return this[lA]&&this[lA].head&&this[lA].head.value}[f3](e){this[lA].shift(),this[cA]-=1,this[Ld]()}[Xue](e){if(!e.pending){if(e.entry){e===this[WE]&&!e.piped&&this[dx](e);return}if(e.stat||(this.statCache.has(e.absolute)?this[px](e,this.statCache.get(e.absolute)):this[d3](e)),!!e.stat&&!e.ignore&&!(!this.noDirRecurse&&e.stat.isDirectory()&&!e.readdir&&(this.readdirCache.has(e.absolute)?this[gx](e,this.readdirCache.get(e.absolute)):this[m3](e),!e.readdir))){if(e.entry=this[$ue](e),!e.entry){e.ignore=!0;return}e===this[WE]&&!e.piped&&this[dx](e)}}}[p3](e){return{onwarn:(r,o,a)=>this.warn(r,o,a),noPax:this.noPax,cwd:this.cwd,absolute:e.absolute,preservePaths:this.preservePaths,maxReadSize:this.maxReadSize,strict:this.strict,portable:this.portable,linkCache:this.linkCache,statCache:this.statCache,noMtime:this.noMtime,mtime:this.mtime,prefix:this.prefix}}[$ue](e){this[cA]+=1;try{return new this[y3](e.path,this[p3](e)).on("end",()=>this[f3](e)).on("error",r=>this.emit("error",r))}catch(r){this.emit("error",r)}}[h3](){this[WE]&&this[WE].entry&&this[WE].entry.resume()}[dx](e){e.piped=!0,e.readdir&&e.readdir.forEach(a=>{let n=e.path,u=n==="./"?"":n.replace(/\/*$/,"/");this[hx](u+a)});let r=e.entry,o=this.zip;o?r.on("data",a=>{o.write(a)||r.pause()}):r.on("data",a=>{super.write(a)||r.pause()})}pause(){return this.zip&&this.zip.pause(),super.pause()}}),E3=class extends w3{constructor(e){super(e),this[y3]=glt}pause(){}resume(){}[d3](e){let r=this.follow?"statSync":"lstatSync";this[px](e,yx[r](e.absolute))}[m3](e,r){this[gx](e,yx.readdirSync(e.absolute))}[dx](e){let r=e.entry,o=this.zip;e.readdir&&e.readdir.forEach(a=>{let n=e.path,u=n==="./"?"":n.replace(/\/*$/,"/");this[hx](u+a)}),o?r.on("data",a=>{o.write(a)}):r.on("data",a=>{super[tAe](a)})}};w3.Sync=E3;rAe.exports=w3});var eC=_(W1=>{"use strict";var Elt=UE(),Clt=ve("events").EventEmitter,Qa=ve("fs"),v3=Qa.writev;if(!v3){let t=process.binding("fs"),e=t.FSReqWrap||t.FSReqCallback;v3=(r,o,a,n)=>{let u=(p,h)=>n(p,h,o),A=new e;A.oncomplete=u,t.writeBuffers(r,o,a,A)}}var ZE=Symbol("_autoClose"),Yc=Symbol("_close"),Y1=Symbol("_ended"),qn=Symbol("_fd"),nAe=Symbol("_finished"),Ch=Symbol("_flags"),I3=Symbol("_flush"),D3=Symbol("_handleChunk"),S3=Symbol("_makeBuf"),vx=Symbol("_mode"),Cx=Symbol("_needDrain"),zE=Symbol("_onerror"),$E=Symbol("_onopen"),B3=Symbol("_onread"),VE=Symbol("_onwrite"),wh=Symbol("_open"),Gf=Symbol("_path"),Od=Symbol("_pos"),uA=Symbol("_queue"),JE=Symbol("_read"),iAe=Symbol("_readSize"),Eh=Symbol("_reading"),wx=Symbol("_remain"),sAe=Symbol("_size"),Ix=Symbol("_write"),KE=Symbol("_writing"),Bx=Symbol("_defaultFlag"),XE=Symbol("_errored"),Dx=class extends Elt{constructor(e,r){if(r=r||{},super(r),this.readable=!0,this.writable=!1,typeof e!="string")throw new TypeError("path must be a string");this[XE]=!1,this[qn]=typeof r.fd=="number"?r.fd:null,this[Gf]=e,this[iAe]=r.readSize||16*1024*1024,this[Eh]=!1,this[sAe]=typeof r.size=="number"?r.size:1/0,this[wx]=this[sAe],this[ZE]=typeof r.autoClose=="boolean"?r.autoClose:!0,typeof this[qn]=="number"?this[JE]():this[wh]()}get fd(){return this[qn]}get path(){return this[Gf]}write(){throw new TypeError("this is a readable stream")}end(){throw new TypeError("this is a readable stream")}[wh](){Qa.open(this[Gf],"r",(e,r)=>this[$E](e,r))}[$E](e,r){e?this[zE](e):(this[qn]=r,this.emit("open",r),this[JE]())}[S3](){return Buffer.allocUnsafe(Math.min(this[iAe],this[wx]))}[JE](){if(!this[Eh]){this[Eh]=!0;let e=this[S3]();if(e.length===0)return process.nextTick(()=>this[B3](null,0,e));Qa.read(this[qn],e,0,e.length,null,(r,o,a)=>this[B3](r,o,a))}}[B3](e,r,o){this[Eh]=!1,e?this[zE](e):this[D3](r,o)&&this[JE]()}[Yc](){if(this[ZE]&&typeof this[qn]=="number"){let e=this[qn];this[qn]=null,Qa.close(e,r=>r?this.emit("error",r):this.emit("close"))}}[zE](e){this[Eh]=!0,this[Yc](),this.emit("error",e)}[D3](e,r){let o=!1;return this[wx]-=e,e>0&&(o=super.write(e<r.length?r.slice(0,e):r)),(e===0||this[wx]<=0)&&(o=!1,this[Yc](),super.end()),o}emit(e,r){switch(e){case"prefinish":case"finish":break;case"drain":typeof this[qn]=="number"&&this[JE]();break;case"error":return this[XE]?void 0:(this[XE]=!0,super.emit(e,r));default:return super.emit(e,r)}}},P3=class extends Dx{[wh](){let e=!0;try{this[$E](null,Qa.openSync(this[Gf],"r")),e=!1}finally{e&&this[Yc]()}}[JE](){let e=!0;try{if(!this[Eh]){this[Eh]=!0;do{let r=this[S3](),o=r.length===0?0:Qa.readSync(this[qn],r,0,r.length,null);if(!this[D3](o,r))break}while(!0);this[Eh]=!1}e=!1}finally{e&&this[Yc]()}}[Yc](){if(this[ZE]&&typeof this[qn]=="number"){let e=this[qn];this[qn]=null,Qa.closeSync(e),this.emit("close")}}},Sx=class extends Clt{constructor(e,r){r=r||{},super(r),this.readable=!1,this.writable=!0,this[XE]=!1,this[KE]=!1,this[Y1]=!1,this[Cx]=!1,this[uA]=[],this[Gf]=e,this[qn]=typeof r.fd=="number"?r.fd:null,this[vx]=r.mode===void 0?438:r.mode,this[Od]=typeof r.start=="number"?r.start:null,this[ZE]=typeof r.autoClose=="boolean"?r.autoClose:!0;let o=this[Od]!==null?"r+":"w";this[Bx]=r.flags===void 0,this[Ch]=this[Bx]?o:r.flags,this[qn]===null&&this[wh]()}emit(e,r){if(e==="error"){if(this[XE])return;this[XE]=!0}return super.emit(e,r)}get fd(){return this[qn]}get path(){return this[Gf]}[zE](e){this[Yc](),this[KE]=!0,this.emit("error",e)}[wh](){Qa.open(this[Gf],this[Ch],this[vx],(e,r)=>this[$E](e,r))}[$E](e,r){this[Bx]&&this[Ch]==="r+"&&e&&e.code==="ENOENT"?(this[Ch]="w",this[wh]()):e?this[zE](e):(this[qn]=r,this.emit("open",r),this[I3]())}end(e,r){return e&&this.write(e,r),this[Y1]=!0,!this[KE]&&!this[uA].length&&typeof this[qn]=="number"&&this[VE](null,0),this}write(e,r){return typeof e=="string"&&(e=Buffer.from(e,r)),this[Y1]?(this.emit("error",new Error("write() after end()")),!1):this[qn]===null||this[KE]||this[uA].length?(this[uA].push(e),this[Cx]=!0,!1):(this[KE]=!0,this[Ix](e),!0)}[Ix](e){Qa.write(this[qn],e,0,e.length,this[Od],(r,o)=>this[VE](r,o))}[VE](e,r){e?this[zE](e):(this[Od]!==null&&(this[Od]+=r),this[uA].length?this[I3]():(this[KE]=!1,this[Y1]&&!this[nAe]?(this[nAe]=!0,this[Yc](),this.emit("finish")):this[Cx]&&(this[Cx]=!1,this.emit("drain"))))}[I3](){if(this[uA].length===0)this[Y1]&&this[VE](null,0);else if(this[uA].length===1)this[Ix](this[uA].pop());else{let e=this[uA];this[uA]=[],v3(this[qn],e,this[Od],(r,o)=>this[VE](r,o))}}[Yc](){if(this[ZE]&&typeof this[qn]=="number"){let e=this[qn];this[qn]=null,Qa.close(e,r=>r?this.emit("error",r):this.emit("close"))}}},b3=class extends Sx{[wh](){let e;if(this[Bx]&&this[Ch]==="r+")try{e=Qa.openSync(this[Gf],this[Ch],this[vx])}catch(r){if(r.code==="ENOENT")return this[Ch]="w",this[wh]();throw r}else e=Qa.openSync(this[Gf],this[Ch],this[vx]);this[$E](null,e)}[Yc](){if(this[ZE]&&typeof this[qn]=="number"){let e=this[qn];this[qn]=null,Qa.closeSync(e),this.emit("close")}}[Ix](e){let r=!0;try{this[VE](null,Qa.writeSync(this[qn],e,0,e.length,this[Od])),r=!1}finally{if(r)try{this[Yc]()}catch{}}}};W1.ReadStream=Dx;W1.ReadStreamSync=P3;W1.WriteStream=Sx;W1.WriteStreamSync=b3});var Rx=_((lUt,fAe)=>{"use strict";var wlt=sx(),Ilt=qE(),Blt=ve("events"),vlt=IS(),Dlt=1024*1024,Slt=rx(),oAe=ix(),Plt=qU(),x3=Buffer.from([31,139]),Xl=Symbol("state"),Md=Symbol("writeEntry"),qf=Symbol("readEntry"),k3=Symbol("nextEntry"),aAe=Symbol("processEntry"),Zl=Symbol("extendedHeader"),K1=Symbol("globalExtendedHeader"),Ih=Symbol("meta"),lAe=Symbol("emitMeta"),fi=Symbol("buffer"),Yf=Symbol("queue"),Ud=Symbol("ended"),cAe=Symbol("emittedEnd"),_d=Symbol("emit"),Fa=Symbol("unzip"),Px=Symbol("consumeChunk"),bx=Symbol("consumeChunkSub"),Q3=Symbol("consumeBody"),uAe=Symbol("consumeMeta"),AAe=Symbol("consumeHeader"),xx=Symbol("consuming"),F3=Symbol("bufferConcat"),R3=Symbol("maybeEnd"),V1=Symbol("writing"),Bh=Symbol("aborted"),kx=Symbol("onDone"),Hd=Symbol("sawValidEntry"),Qx=Symbol("sawNullBlock"),Fx=Symbol("sawEOF"),blt=t=>!0;fAe.exports=wlt(class extends Blt{constructor(e){e=e||{},super(e),this.file=e.file||"",this[Hd]=null,this.on(kx,r=>{(this[Xl]==="begin"||this[Hd]===!1)&&this.warn("TAR_BAD_ARCHIVE","Unrecognized archive format")}),e.ondone?this.on(kx,e.ondone):this.on(kx,r=>{this.emit("prefinish"),this.emit("finish"),this.emit("end"),this.emit("close")}),this.strict=!!e.strict,this.maxMetaEntrySize=e.maxMetaEntrySize||Dlt,this.filter=typeof e.filter=="function"?e.filter:blt,this.writable=!0,this.readable=!1,this[Yf]=new vlt,this[fi]=null,this[qf]=null,this[Md]=null,this[Xl]="begin",this[Ih]="",this[Zl]=null,this[K1]=null,this[Ud]=!1,this[Fa]=null,this[Bh]=!1,this[Qx]=!1,this[Fx]=!1,typeof e.onwarn=="function"&&this.on("warn",e.onwarn),typeof e.onentry=="function"&&this.on("entry",e.onentry)}[AAe](e,r){this[Hd]===null&&(this[Hd]=!1);let o;try{o=new Ilt(e,r,this[Zl],this[K1])}catch(a){return this.warn("TAR_ENTRY_INVALID",a)}if(o.nullBlock)this[Qx]?(this[Fx]=!0,this[Xl]==="begin"&&(this[Xl]="header"),this[_d]("eof")):(this[Qx]=!0,this[_d]("nullBlock"));else if(this[Qx]=!1,!o.cksumValid)this.warn("TAR_ENTRY_INVALID","checksum failure",{header:o});else if(!o.path)this.warn("TAR_ENTRY_INVALID","path is required",{header:o});else{let a=o.type;if(/^(Symbolic)?Link$/.test(a)&&!o.linkpath)this.warn("TAR_ENTRY_INVALID","linkpath required",{header:o});else if(!/^(Symbolic)?Link$/.test(a)&&o.linkpath)this.warn("TAR_ENTRY_INVALID","linkpath forbidden",{header:o});else{let n=this[Md]=new Slt(o,this[Zl],this[K1]);if(!this[Hd])if(n.remain){let u=()=>{n.invalid||(this[Hd]=!0)};n.on("end",u)}else this[Hd]=!0;n.meta?n.size>this.maxMetaEntrySize?(n.ignore=!0,this[_d]("ignoredEntry",n),this[Xl]="ignore",n.resume()):n.size>0&&(this[Ih]="",n.on("data",u=>this[Ih]+=u),this[Xl]="meta"):(this[Zl]=null,n.ignore=n.ignore||!this.filter(n.path,n),n.ignore?(this[_d]("ignoredEntry",n),this[Xl]=n.remain?"ignore":"header",n.resume()):(n.remain?this[Xl]="body":(this[Xl]="header",n.end()),this[qf]?this[Yf].push(n):(this[Yf].push(n),this[k3]())))}}}[aAe](e){let r=!0;return e?Array.isArray(e)?this.emit.apply(this,e):(this[qf]=e,this.emit("entry",e),e.emittedEnd||(e.on("end",o=>this[k3]()),r=!1)):(this[qf]=null,r=!1),r}[k3](){do;while(this[aAe](this[Yf].shift()));if(!this[Yf].length){let e=this[qf];!e||e.flowing||e.size===e.remain?this[V1]||this.emit("drain"):e.once("drain",o=>this.emit("drain"))}}[Q3](e,r){let o=this[Md],a=o.blockRemain,n=a>=e.length&&r===0?e:e.slice(r,r+a);return o.write(n),o.blockRemain||(this[Xl]="header",this[Md]=null,o.end()),n.length}[uAe](e,r){let o=this[Md],a=this[Q3](e,r);return this[Md]||this[lAe](o),a}[_d](e,r,o){!this[Yf].length&&!this[qf]?this.emit(e,r,o):this[Yf].push([e,r,o])}[lAe](e){switch(this[_d]("meta",this[Ih]),e.type){case"ExtendedHeader":case"OldExtendedHeader":this[Zl]=oAe.parse(this[Ih],this[Zl],!1);break;case"GlobalExtendedHeader":this[K1]=oAe.parse(this[Ih],this[K1],!0);break;case"NextFileHasLongPath":case"OldGnuLongPath":this[Zl]=this[Zl]||Object.create(null),this[Zl].path=this[Ih].replace(/\0.*/,"");break;case"NextFileHasLongLinkpath":this[Zl]=this[Zl]||Object.create(null),this[Zl].linkpath=this[Ih].replace(/\0.*/,"");break;default:throw new Error("unknown meta: "+e.type)}}abort(e){this[Bh]=!0,this.emit("abort",e),this.warn("TAR_ABORT",e,{recoverable:!1})}write(e){if(this[Bh])return;if(this[Fa]===null&&e){if(this[fi]&&(e=Buffer.concat([this[fi],e]),this[fi]=null),e.length<x3.length)return this[fi]=e,!0;for(let o=0;this[Fa]===null&&o<x3.length;o++)e[o]!==x3[o]&&(this[Fa]=!1);if(this[Fa]===null){let o=this[Ud];this[Ud]=!1,this[Fa]=new Plt.Unzip,this[Fa].on("data",n=>this[Px](n)),this[Fa].on("error",n=>this.abort(n)),this[Fa].on("end",n=>{this[Ud]=!0,this[Px]()}),this[V1]=!0;let a=this[Fa][o?"end":"write"](e);return this[V1]=!1,a}}this[V1]=!0,this[Fa]?this[Fa].write(e):this[Px](e),this[V1]=!1;let r=this[Yf].length?!1:this[qf]?this[qf].flowing:!0;return!r&&!this[Yf].length&&this[qf].once("drain",o=>this.emit("drain")),r}[F3](e){e&&!this[Bh]&&(this[fi]=this[fi]?Buffer.concat([this[fi],e]):e)}[R3](){if(this[Ud]&&!this[cAe]&&!this[Bh]&&!this[xx]){this[cAe]=!0;let e=this[Md];if(e&&e.blockRemain){let r=this[fi]?this[fi].length:0;this.warn("TAR_BAD_ARCHIVE",`Truncated input (needed ${e.blockRemain} more bytes, only ${r} available)`,{entry:e}),this[fi]&&e.write(this[fi]),e.end()}this[_d](kx)}}[Px](e){if(this[xx])this[F3](e);else if(!e&&!this[fi])this[R3]();else{if(this[xx]=!0,this[fi]){this[F3](e);let r=this[fi];this[fi]=null,this[bx](r)}else this[bx](e);for(;this[fi]&&this[fi].length>=512&&!this[Bh]&&!this[Fx];){let r=this[fi];this[fi]=null,this[bx](r)}this[xx]=!1}(!this[fi]||this[Ud])&&this[R3]()}[bx](e){let r=0,o=e.length;for(;r+512<=o&&!this[Bh]&&!this[Fx];)switch(this[Xl]){case"begin":case"header":this[AAe](e,r),r+=512;break;case"ignore":case"body":r+=this[Q3](e,r);break;case"meta":r+=this[uAe](e,r);break;default:throw new Error("invalid state: "+this[Xl])}r<o&&(this[fi]?this[fi]=Buffer.concat([e.slice(r),this[fi]]):this[fi]=e.slice(r))}end(e){this[Bh]||(this[Fa]?this[Fa].end(e):(this[Ud]=!0,this.write(e)))}})});var Tx=_((cUt,dAe)=>{"use strict";var xlt=OE(),hAe=Rx(),tC=ve("fs"),klt=eC(),pAe=ve("path"),T3=YE();dAe.exports=(t,e,r)=>{typeof t=="function"?(r=t,e=null,t={}):Array.isArray(t)&&(e=t,t={}),typeof e=="function"&&(r=e,e=null),e?e=Array.from(e):e=[];let o=xlt(t);if(o.sync&&typeof r=="function")throw new TypeError("callback not supported for sync tar functions");if(!o.file&&typeof r=="function")throw new TypeError("callback only supported with file option");return e.length&&Flt(o,e),o.noResume||Qlt(o),o.file&&o.sync?Rlt(o):o.file?Tlt(o,r):gAe(o)};var Qlt=t=>{let e=t.onentry;t.onentry=e?r=>{e(r),r.resume()}:r=>r.resume()},Flt=(t,e)=>{let r=new Map(e.map(n=>[T3(n),!0])),o=t.filter,a=(n,u)=>{let A=u||pAe.parse(n).root||".",p=n===A?!1:r.has(n)?r.get(n):a(pAe.dirname(n),A);return r.set(n,p),p};t.filter=o?(n,u)=>o(n,u)&&a(T3(n)):n=>a(T3(n))},Rlt=t=>{let e=gAe(t),r=t.file,o=!0,a;try{let n=tC.statSync(r),u=t.maxReadSize||16*1024*1024;if(n.size<u)e.end(tC.readFileSync(r));else{let A=0,p=Buffer.allocUnsafe(u);for(a=tC.openSync(r,"r");A<n.size;){let h=tC.readSync(a,p,0,u,A);A+=h,e.write(p.slice(0,h))}e.end()}o=!1}finally{if(o&&a)try{tC.closeSync(a)}catch{}}},Tlt=(t,e)=>{let r=new hAe(t),o=t.maxReadSize||16*1024*1024,a=t.file,n=new Promise((u,A)=>{r.on("error",A),r.on("end",u),tC.stat(a,(p,h)=>{if(p)A(p);else{let E=new klt.ReadStream(a,{readSize:o,size:h.size});E.on("error",A),E.pipe(r)}})});return e?n.then(e,e):n},gAe=t=>new hAe(t)});var IAe=_((uUt,wAe)=>{"use strict";var Nlt=OE(),Nx=Ex(),mAe=eC(),yAe=Tx(),EAe=ve("path");wAe.exports=(t,e,r)=>{if(typeof e=="function"&&(r=e),Array.isArray(t)&&(e=t,t={}),!e||!Array.isArray(e)||!e.length)throw new TypeError("no files or directories specified");e=Array.from(e);let o=Nlt(t);if(o.sync&&typeof r=="function")throw new TypeError("callback not supported for sync tar functions");if(!o.file&&typeof r=="function")throw new TypeError("callback only supported with file option");return o.file&&o.sync?Llt(o,e):o.file?Olt(o,e,r):o.sync?Mlt(o,e):Ult(o,e)};var Llt=(t,e)=>{let r=new Nx.Sync(t),o=new mAe.WriteStreamSync(t.file,{mode:t.mode||438});r.pipe(o),CAe(r,e)},Olt=(t,e,r)=>{let o=new Nx(t),a=new mAe.WriteStream(t.file,{mode:t.mode||438});o.pipe(a);let n=new Promise((u,A)=>{a.on("error",A),a.on("close",u),o.on("error",A)});return N3(o,e),r?n.then(r,r):n},CAe=(t,e)=>{e.forEach(r=>{r.charAt(0)==="@"?yAe({file:EAe.resolve(t.cwd,r.substr(1)),sync:!0,noResume:!0,onentry:o=>t.add(o)}):t.add(r)}),t.end()},N3=(t,e)=>{for(;e.length;){let r=e.shift();if(r.charAt(0)==="@")return yAe({file:EAe.resolve(t.cwd,r.substr(1)),noResume:!0,onentry:o=>t.add(o)}).then(o=>N3(t,e));t.add(r)}t.end()},Mlt=(t,e)=>{let r=new Nx.Sync(t);return CAe(r,e),r},Ult=(t,e)=>{let r=new Nx(t);return N3(r,e),r}});var L3=_((AUt,xAe)=>{"use strict";var _lt=OE(),BAe=Ex(),Al=ve("fs"),vAe=eC(),DAe=Tx(),SAe=ve("path"),PAe=qE();xAe.exports=(t,e,r)=>{let o=_lt(t);if(!o.file)throw new TypeError("file is required");if(o.gzip)throw new TypeError("cannot append to compressed archives");if(!e||!Array.isArray(e)||!e.length)throw new TypeError("no files or directories specified");return e=Array.from(e),o.sync?Hlt(o,e):Glt(o,e,r)};var Hlt=(t,e)=>{let r=new BAe.Sync(t),o=!0,a,n;try{try{a=Al.openSync(t.file,"r+")}catch(p){if(p.code==="ENOENT")a=Al.openSync(t.file,"w+");else throw p}let u=Al.fstatSync(a),A=Buffer.alloc(512);e:for(n=0;n<u.size;n+=512){for(let E=0,I=0;E<512;E+=I){if(I=Al.readSync(a,A,E,A.length-E,n+E),n===0&&A[0]===31&&A[1]===139)throw new Error("cannot append to compressed archives");if(!I)break e}let p=new PAe(A);if(!p.cksumValid)break;let h=512*Math.ceil(p.size/512);if(n+h+512>u.size)break;n+=h,t.mtimeCache&&t.mtimeCache.set(p.path,p.mtime)}o=!1,jlt(t,r,n,a,e)}finally{if(o)try{Al.closeSync(a)}catch{}}},jlt=(t,e,r,o,a)=>{let n=new vAe.WriteStreamSync(t.file,{fd:o,start:r});e.pipe(n),qlt(e,a)},Glt=(t,e,r)=>{e=Array.from(e);let o=new BAe(t),a=(u,A,p)=>{let h=(C,R)=>{C?Al.close(u,L=>p(C)):p(null,R)},E=0;if(A===0)return h(null,0);let I=0,v=Buffer.alloc(512),x=(C,R)=>{if(C)return h(C);if(I+=R,I<512&&R)return Al.read(u,v,I,v.length-I,E+I,x);if(E===0&&v[0]===31&&v[1]===139)return h(new Error("cannot append to compressed archives"));if(I<512)return h(null,E);let L=new PAe(v);if(!L.cksumValid)return h(null,E);let U=512*Math.ceil(L.size/512);if(E+U+512>A||(E+=U+512,E>=A))return h(null,E);t.mtimeCache&&t.mtimeCache.set(L.path,L.mtime),I=0,Al.read(u,v,0,512,E,x)};Al.read(u,v,0,512,E,x)},n=new Promise((u,A)=>{o.on("error",A);let p="r+",h=(E,I)=>{if(E&&E.code==="ENOENT"&&p==="r+")return p="w+",Al.open(t.file,p,h);if(E)return A(E);Al.fstat(I,(v,x)=>{if(v)return Al.close(I,()=>A(v));a(I,x.size,(C,R)=>{if(C)return A(C);let L=new vAe.WriteStream(t.file,{fd:I,start:R});o.pipe(L),L.on("error",A),L.on("close",u),bAe(o,e)})})};Al.open(t.file,p,h)});return r?n.then(r,r):n},qlt=(t,e)=>{e.forEach(r=>{r.charAt(0)==="@"?DAe({file:SAe.resolve(t.cwd,r.substr(1)),sync:!0,noResume:!0,onentry:o=>t.add(o)}):t.add(r)}),t.end()},bAe=(t,e)=>{for(;e.length;){let r=e.shift();if(r.charAt(0)==="@")return DAe({file:SAe.resolve(t.cwd,r.substr(1)),noResume:!0,onentry:o=>t.add(o)}).then(o=>bAe(t,e));t.add(r)}t.end()}});var QAe=_((fUt,kAe)=>{"use strict";var Ylt=OE(),Wlt=L3();kAe.exports=(t,e,r)=>{let o=Ylt(t);if(!o.file)throw new TypeError("file is required");if(o.gzip)throw new TypeError("cannot append to compressed archives");if(!e||!Array.isArray(e)||!e.length)throw new TypeError("no files or directories specified");return e=Array.from(e),Klt(o),Wlt(o,e,r)};var Klt=t=>{let e=t.filter;t.mtimeCache||(t.mtimeCache=new Map),t.filter=e?(r,o)=>e(r,o)&&!(t.mtimeCache.get(r)>o.mtime):(r,o)=>!(t.mtimeCache.get(r)>o.mtime)}});var TAe=_((pUt,RAe)=>{var{promisify:FAe}=ve("util"),vh=ve("fs"),Vlt=t=>{if(!t)t={mode:511,fs:vh};else if(typeof t=="object")t={mode:511,fs:vh,...t};else if(typeof t=="number")t={mode:t,fs:vh};else if(typeof t=="string")t={mode:parseInt(t,8),fs:vh};else throw new TypeError("invalid options argument");return t.mkdir=t.mkdir||t.fs.mkdir||vh.mkdir,t.mkdirAsync=FAe(t.mkdir),t.stat=t.stat||t.fs.stat||vh.stat,t.statAsync=FAe(t.stat),t.statSync=t.statSync||t.fs.statSync||vh.statSync,t.mkdirSync=t.mkdirSync||t.fs.mkdirSync||vh.mkdirSync,t};RAe.exports=Vlt});var LAe=_((hUt,NAe)=>{var Jlt=process.platform,{resolve:zlt,parse:Xlt}=ve("path"),Zlt=t=>{if(/\0/.test(t))throw Object.assign(new TypeError("path must be a string without null bytes"),{path:t,code:"ERR_INVALID_ARG_VALUE"});if(t=zlt(t),Jlt==="win32"){let e=/[*|"<>?:]/,{root:r}=Xlt(t);if(e.test(t.substr(r.length)))throw Object.assign(new Error("Illegal characters in path."),{path:t,code:"EINVAL"})}return t};NAe.exports=Zlt});var HAe=_((gUt,_Ae)=>{var{dirname:OAe}=ve("path"),MAe=(t,e,r=void 0)=>r===e?Promise.resolve():t.statAsync(e).then(o=>o.isDirectory()?r:void 0,o=>o.code==="ENOENT"?MAe(t,OAe(e),e):void 0),UAe=(t,e,r=void 0)=>{if(r!==e)try{return t.statSync(e).isDirectory()?r:void 0}catch(o){return o.code==="ENOENT"?UAe(t,OAe(e),e):void 0}};_Ae.exports={findMade:MAe,findMadeSync:UAe}});var U3=_((dUt,GAe)=>{var{dirname:jAe}=ve("path"),O3=(t,e,r)=>{e.recursive=!1;let o=jAe(t);return o===t?e.mkdirAsync(t,e).catch(a=>{if(a.code!=="EISDIR")throw a}):e.mkdirAsync(t,e).then(()=>r||t,a=>{if(a.code==="ENOENT")return O3(o,e).then(n=>O3(t,e,n));if(a.code!=="EEXIST"&&a.code!=="EROFS")throw a;return e.statAsync(t).then(n=>{if(n.isDirectory())return r;throw a},()=>{throw a})})},M3=(t,e,r)=>{let o=jAe(t);if(e.recursive=!1,o===t)try{return e.mkdirSync(t,e)}catch(a){if(a.code!=="EISDIR")throw a;return}try{return e.mkdirSync(t,e),r||t}catch(a){if(a.code==="ENOENT")return M3(t,e,M3(o,e,r));if(a.code!=="EEXIST"&&a.code!=="EROFS")throw a;try{if(!e.statSync(t).isDirectory())throw a}catch{throw a}}};GAe.exports={mkdirpManual:O3,mkdirpManualSync:M3}});var WAe=_((mUt,YAe)=>{var{dirname:qAe}=ve("path"),{findMade:$lt,findMadeSync:ect}=HAe(),{mkdirpManual:tct,mkdirpManualSync:rct}=U3(),nct=(t,e)=>(e.recursive=!0,qAe(t)===t?e.mkdirAsync(t,e):$lt(e,t).then(o=>e.mkdirAsync(t,e).then(()=>o).catch(a=>{if(a.code==="ENOENT")return tct(t,e);throw a}))),ict=(t,e)=>{if(e.recursive=!0,qAe(t)===t)return e.mkdirSync(t,e);let o=ect(e,t);try{return e.mkdirSync(t,e),o}catch(a){if(a.code==="ENOENT")return rct(t,e);throw a}};YAe.exports={mkdirpNative:nct,mkdirpNativeSync:ict}});var zAe=_((yUt,JAe)=>{var KAe=ve("fs"),sct=process.version,_3=sct.replace(/^v/,"").split("."),VAe=+_3[0]>10||+_3[0]==10&&+_3[1]>=12,oct=VAe?t=>t.mkdir===KAe.mkdir:()=>!1,act=VAe?t=>t.mkdirSync===KAe.mkdirSync:()=>!1;JAe.exports={useNative:oct,useNativeSync:act}});var rfe=_((EUt,tfe)=>{var rC=TAe(),nC=LAe(),{mkdirpNative:XAe,mkdirpNativeSync:ZAe}=WAe(),{mkdirpManual:$Ae,mkdirpManualSync:efe}=U3(),{useNative:lct,useNativeSync:cct}=zAe(),iC=(t,e)=>(t=nC(t),e=rC(e),lct(e)?XAe(t,e):$Ae(t,e)),uct=(t,e)=>(t=nC(t),e=rC(e),cct(e)?ZAe(t,e):efe(t,e));iC.sync=uct;iC.native=(t,e)=>XAe(nC(t),rC(e));iC.manual=(t,e)=>$Ae(nC(t),rC(e));iC.nativeSync=(t,e)=>ZAe(nC(t),rC(e));iC.manualSync=(t,e)=>efe(nC(t),rC(e));tfe.exports=iC});var cfe=_((CUt,lfe)=>{"use strict";var $l=ve("fs"),jd=ve("path"),Act=$l.lchown?"lchown":"chown",fct=$l.lchownSync?"lchownSync":"chownSync",ife=$l.lchown&&!process.version.match(/v1[1-9]+\./)&&!process.version.match(/v10\.[6-9]/),nfe=(t,e,r)=>{try{return $l[fct](t,e,r)}catch(o){if(o.code!=="ENOENT")throw o}},pct=(t,e,r)=>{try{return $l.chownSync(t,e,r)}catch(o){if(o.code!=="ENOENT")throw o}},hct=ife?(t,e,r,o)=>a=>{!a||a.code!=="EISDIR"?o(a):$l.chown(t,e,r,o)}:(t,e,r,o)=>o,H3=ife?(t,e,r)=>{try{return nfe(t,e,r)}catch(o){if(o.code!=="EISDIR")throw o;pct(t,e,r)}}:(t,e,r)=>nfe(t,e,r),gct=process.version,sfe=(t,e,r)=>$l.readdir(t,e,r),dct=(t,e)=>$l.readdirSync(t,e);/^v4\./.test(gct)&&(sfe=(t,e,r)=>$l.readdir(t,r));var Lx=(t,e,r,o)=>{$l[Act](t,e,r,hct(t,e,r,a=>{o(a&&a.code!=="ENOENT"?a:null)}))},ofe=(t,e,r,o,a)=>{if(typeof e=="string")return $l.lstat(jd.resolve(t,e),(n,u)=>{if(n)return a(n.code!=="ENOENT"?n:null);u.name=e,ofe(t,u,r,o,a)});if(e.isDirectory())j3(jd.resolve(t,e.name),r,o,n=>{if(n)return a(n);let u=jd.resolve(t,e.name);Lx(u,r,o,a)});else{let n=jd.resolve(t,e.name);Lx(n,r,o,a)}},j3=(t,e,r,o)=>{sfe(t,{withFileTypes:!0},(a,n)=>{if(a){if(a.code==="ENOENT")return o();if(a.code!=="ENOTDIR"&&a.code!=="ENOTSUP")return o(a)}if(a||!n.length)return Lx(t,e,r,o);let u=n.length,A=null,p=h=>{if(!A){if(h)return o(A=h);if(--u===0)return Lx(t,e,r,o)}};n.forEach(h=>ofe(t,h,e,r,p))})},mct=(t,e,r,o)=>{if(typeof e=="string")try{let a=$l.lstatSync(jd.resolve(t,e));a.name=e,e=a}catch(a){if(a.code==="ENOENT")return;throw a}e.isDirectory()&&afe(jd.resolve(t,e.name),r,o),H3(jd.resolve(t,e.name),r,o)},afe=(t,e,r)=>{let o;try{o=dct(t,{withFileTypes:!0})}catch(a){if(a.code==="ENOENT")return;if(a.code==="ENOTDIR"||a.code==="ENOTSUP")return H3(t,e,r);throw a}return o&&o.length&&o.forEach(a=>mct(t,a,e,r)),H3(t,e,r)};lfe.exports=j3;j3.sync=afe});var pfe=_((wUt,G3)=>{"use strict";var ufe=rfe(),ec=ve("fs"),Ox=ve("path"),Afe=cfe(),Wc=jE(),Mx=class extends Error{constructor(e,r){super("Cannot extract through symbolic link"),this.path=r,this.symlink=e}get name(){return"SylinkError"}},Ux=class extends Error{constructor(e,r){super(r+": Cannot cd into '"+e+"'"),this.path=e,this.code=r}get name(){return"CwdError"}},_x=(t,e)=>t.get(Wc(e)),J1=(t,e,r)=>t.set(Wc(e),r),yct=(t,e)=>{ec.stat(t,(r,o)=>{(r||!o.isDirectory())&&(r=new Ux(t,r&&r.code||"ENOTDIR")),e(r)})};G3.exports=(t,e,r)=>{t=Wc(t);let o=e.umask,a=e.mode|448,n=(a&o)!==0,u=e.uid,A=e.gid,p=typeof u=="number"&&typeof A=="number"&&(u!==e.processUid||A!==e.processGid),h=e.preserve,E=e.unlink,I=e.cache,v=Wc(e.cwd),x=(L,U)=>{L?r(L):(J1(I,t,!0),U&&p?Afe(U,u,A,J=>x(J)):n?ec.chmod(t,a,r):r())};if(I&&_x(I,t)===!0)return x();if(t===v)return yct(t,x);if(h)return ufe(t,{mode:a}).then(L=>x(null,L),x);let R=Wc(Ox.relative(v,t)).split("/");Hx(v,R,a,I,E,v,null,x)};var Hx=(t,e,r,o,a,n,u,A)=>{if(!e.length)return A(null,u);let p=e.shift(),h=Wc(Ox.resolve(t+"/"+p));if(_x(o,h))return Hx(h,e,r,o,a,n,u,A);ec.mkdir(h,r,ffe(h,e,r,o,a,n,u,A))},ffe=(t,e,r,o,a,n,u,A)=>p=>{p?ec.lstat(t,(h,E)=>{if(h)h.path=h.path&&Wc(h.path),A(h);else if(E.isDirectory())Hx(t,e,r,o,a,n,u,A);else if(a)ec.unlink(t,I=>{if(I)return A(I);ec.mkdir(t,r,ffe(t,e,r,o,a,n,u,A))});else{if(E.isSymbolicLink())return A(new Mx(t,t+"/"+e.join("/")));A(p)}}):(u=u||t,Hx(t,e,r,o,a,n,u,A))},Ect=t=>{let e=!1,r="ENOTDIR";try{e=ec.statSync(t).isDirectory()}catch(o){r=o.code}finally{if(!e)throw new Ux(t,r)}};G3.exports.sync=(t,e)=>{t=Wc(t);let r=e.umask,o=e.mode|448,a=(o&r)!==0,n=e.uid,u=e.gid,A=typeof n=="number"&&typeof u=="number"&&(n!==e.processUid||u!==e.processGid),p=e.preserve,h=e.unlink,E=e.cache,I=Wc(e.cwd),v=L=>{J1(E,t,!0),L&&A&&Afe.sync(L,n,u),a&&ec.chmodSync(t,o)};if(E&&_x(E,t)===!0)return v();if(t===I)return Ect(I),v();if(p)return v(ufe.sync(t,o));let C=Wc(Ox.relative(I,t)).split("/"),R=null;for(let L=C.shift(),U=I;L&&(U+="/"+L);L=C.shift())if(U=Wc(Ox.resolve(U)),!_x(E,U))try{ec.mkdirSync(U,o),R=R||U,J1(E,U,!0)}catch{let te=ec.lstatSync(U);if(te.isDirectory()){J1(E,U,!0);continue}else if(h){ec.unlinkSync(U),ec.mkdirSync(U,o),R=R||U,J1(E,U,!0);continue}else if(te.isSymbolicLink())return new Mx(U,U+"/"+C.join("/"))}return v(R)}});var Y3=_((IUt,hfe)=>{var q3=Object.create(null),{hasOwnProperty:Cct}=Object.prototype;hfe.exports=t=>(Cct.call(q3,t)||(q3[t]=t.normalize("NFKD")),q3[t])});var yfe=_((BUt,mfe)=>{var gfe=ve("assert"),wct=Y3(),Ict=YE(),{join:dfe}=ve("path"),Bct=process.env.TESTING_TAR_FAKE_PLATFORM||process.platform,vct=Bct==="win32";mfe.exports=()=>{let t=new Map,e=new Map,r=h=>h.split("/").slice(0,-1).reduce((I,v)=>(I.length&&(v=dfe(I[I.length-1],v)),I.push(v||"/"),I),[]),o=new Set,a=h=>{let E=e.get(h);if(!E)throw new Error("function does not have any path reservations");return{paths:E.paths.map(I=>t.get(I)),dirs:[...E.dirs].map(I=>t.get(I))}},n=h=>{let{paths:E,dirs:I}=a(h);return E.every(v=>v[0]===h)&&I.every(v=>v[0]instanceof Set&&v[0].has(h))},u=h=>o.has(h)||!n(h)?!1:(o.add(h),h(()=>A(h)),!0),A=h=>{if(!o.has(h))return!1;let{paths:E,dirs:I}=e.get(h),v=new Set;return E.forEach(x=>{let C=t.get(x);gfe.equal(C[0],h),C.length===1?t.delete(x):(C.shift(),typeof C[0]=="function"?v.add(C[0]):C[0].forEach(R=>v.add(R)))}),I.forEach(x=>{let C=t.get(x);gfe(C[0]instanceof Set),C[0].size===1&&C.length===1?t.delete(x):C[0].size===1?(C.shift(),v.add(C[0])):C[0].delete(h)}),o.delete(h),v.forEach(x=>u(x)),!0};return{check:n,reserve:(h,E)=>{h=vct?["win32 parallelization disabled"]:h.map(v=>wct(Ict(dfe(v))).toLowerCase());let I=new Set(h.map(v=>r(v)).reduce((v,x)=>v.concat(x)));return e.set(E,{dirs:I,paths:h}),h.forEach(v=>{let x=t.get(v);x?x.push(E):t.set(v,[E])}),I.forEach(v=>{let x=t.get(v);x?x[x.length-1]instanceof Set?x[x.length-1].add(E):x.push(new Set([E])):t.set(v,[new Set([E])])}),u(E)}}}});var wfe=_((vUt,Cfe)=>{var Dct=process.platform,Sct=Dct==="win32",Pct=global.__FAKE_TESTING_FS__||ve("fs"),{O_CREAT:bct,O_TRUNC:xct,O_WRONLY:kct,UV_FS_O_FILEMAP:Efe=0}=Pct.constants,Qct=Sct&&!!Efe,Fct=512*1024,Rct=Efe|xct|bct|kct;Cfe.exports=Qct?t=>t<Fct?Rct:"w":()=>"w"});var e_=_((DUt,Nfe)=>{"use strict";var Tct=ve("assert"),Nct=Rx(),vn=ve("fs"),Lct=eC(),Wf=ve("path"),Ffe=pfe(),Ife=e3(),Oct=yfe(),Mct=t3(),fl=jE(),Uct=YE(),_ct=Y3(),Bfe=Symbol("onEntry"),V3=Symbol("checkFs"),vfe=Symbol("checkFs2"),qx=Symbol("pruneCache"),J3=Symbol("isReusable"),tc=Symbol("makeFs"),z3=Symbol("file"),X3=Symbol("directory"),Yx=Symbol("link"),Dfe=Symbol("symlink"),Sfe=Symbol("hardlink"),Pfe=Symbol("unsupported"),bfe=Symbol("checkPath"),Dh=Symbol("mkdir"),To=Symbol("onError"),jx=Symbol("pending"),xfe=Symbol("pend"),sC=Symbol("unpend"),W3=Symbol("ended"),K3=Symbol("maybeClose"),Z3=Symbol("skip"),z1=Symbol("doChown"),X1=Symbol("uid"),Z1=Symbol("gid"),$1=Symbol("checkedCwd"),Rfe=ve("crypto"),Tfe=wfe(),Hct=process.env.TESTING_TAR_FAKE_PLATFORM||process.platform,e2=Hct==="win32",jct=(t,e)=>{if(!e2)return vn.unlink(t,e);let r=t+".DELETE."+Rfe.randomBytes(16).toString("hex");vn.rename(t,r,o=>{if(o)return e(o);vn.unlink(r,e)})},Gct=t=>{if(!e2)return vn.unlinkSync(t);let e=t+".DELETE."+Rfe.randomBytes(16).toString("hex");vn.renameSync(t,e),vn.unlinkSync(e)},kfe=(t,e,r)=>t===t>>>0?t:e===e>>>0?e:r,Qfe=t=>_ct(Uct(fl(t))).toLowerCase(),qct=(t,e)=>{e=Qfe(e);for(let r of t.keys()){let o=Qfe(r);(o===e||o.indexOf(e+"/")===0)&&t.delete(r)}},Yct=t=>{for(let e of t.keys())t.delete(e)},t2=class extends Nct{constructor(e){if(e||(e={}),e.ondone=r=>{this[W3]=!0,this[K3]()},super(e),this[$1]=!1,this.reservations=Oct(),this.transform=typeof e.transform=="function"?e.transform:null,this.writable=!0,this.readable=!1,this[jx]=0,this[W3]=!1,this.dirCache=e.dirCache||new Map,typeof e.uid=="number"||typeof e.gid=="number"){if(typeof e.uid!="number"||typeof e.gid!="number")throw new TypeError("cannot set owner without number uid and gid");if(e.preserveOwner)throw new TypeError("cannot preserve owner in archive and also set owner explicitly");this.uid=e.uid,this.gid=e.gid,this.setOwner=!0}else this.uid=null,this.gid=null,this.setOwner=!1;e.preserveOwner===void 0&&typeof e.uid!="number"?this.preserveOwner=process.getuid&&process.getuid()===0:this.preserveOwner=!!e.preserveOwner,this.processUid=(this.preserveOwner||this.setOwner)&&process.getuid?process.getuid():null,this.processGid=(this.preserveOwner||this.setOwner)&&process.getgid?process.getgid():null,this.forceChown=e.forceChown===!0,this.win32=!!e.win32||e2,this.newer=!!e.newer,this.keep=!!e.keep,this.noMtime=!!e.noMtime,this.preservePaths=!!e.preservePaths,this.unlink=!!e.unlink,this.cwd=fl(Wf.resolve(e.cwd||process.cwd())),this.strip=+e.strip||0,this.processUmask=e.noChmod?0:process.umask(),this.umask=typeof e.umask=="number"?e.umask:this.processUmask,this.dmode=e.dmode||511&~this.umask,this.fmode=e.fmode||438&~this.umask,this.on("entry",r=>this[Bfe](r))}warn(e,r,o={}){return(e==="TAR_BAD_ARCHIVE"||e==="TAR_ABORT")&&(o.recoverable=!1),super.warn(e,r,o)}[K3](){this[W3]&&this[jx]===0&&(this.emit("prefinish"),this.emit("finish"),this.emit("end"),this.emit("close"))}[bfe](e){if(this.strip){let r=fl(e.path).split("/");if(r.length<this.strip)return!1;if(e.path=r.slice(this.strip).join("/"),e.type==="Link"){let o=fl(e.linkpath).split("/");if(o.length>=this.strip)e.linkpath=o.slice(this.strip).join("/");else return!1}}if(!this.preservePaths){let r=fl(e.path),o=r.split("/");if(o.includes("..")||e2&&/^[a-z]:\.\.$/i.test(o[0]))return this.warn("TAR_ENTRY_ERROR","path contains '..'",{entry:e,path:r}),!1;let[a,n]=Mct(r);a&&(e.path=n,this.warn("TAR_ENTRY_INFO",`stripping ${a} from absolute path`,{entry:e,path:r}))}if(Wf.isAbsolute(e.path)?e.absolute=fl(Wf.resolve(e.path)):e.absolute=fl(Wf.resolve(this.cwd,e.path)),!this.preservePaths&&e.absolute.indexOf(this.cwd+"/")!==0&&e.absolute!==this.cwd)return this.warn("TAR_ENTRY_ERROR","path escaped extraction target",{entry:e,path:fl(e.path),resolvedPath:e.absolute,cwd:this.cwd}),!1;if(e.absolute===this.cwd&&e.type!=="Directory"&&e.type!=="GNUDumpDir")return!1;if(this.win32){let{root:r}=Wf.win32.parse(e.absolute);e.absolute=r+Ife.encode(e.absolute.substr(r.length));let{root:o}=Wf.win32.parse(e.path);e.path=o+Ife.encode(e.path.substr(o.length))}return!0}[Bfe](e){if(!this[bfe](e))return e.resume();switch(Tct.equal(typeof e.absolute,"string"),e.type){case"Directory":case"GNUDumpDir":e.mode&&(e.mode=e.mode|448);case"File":case"OldFile":case"ContiguousFile":case"Link":case"SymbolicLink":return this[V3](e);case"CharacterDevice":case"BlockDevice":case"FIFO":default:return this[Pfe](e)}}[To](e,r){e.name==="CwdError"?this.emit("error",e):(this.warn("TAR_ENTRY_ERROR",e,{entry:r}),this[sC](),r.resume())}[Dh](e,r,o){Ffe(fl(e),{uid:this.uid,gid:this.gid,processUid:this.processUid,processGid:this.processGid,umask:this.processUmask,preserve:this.preservePaths,unlink:this.unlink,cache:this.dirCache,cwd:this.cwd,mode:r,noChmod:this.noChmod},o)}[z1](e){return this.forceChown||this.preserveOwner&&(typeof e.uid=="number"&&e.uid!==this.processUid||typeof e.gid=="number"&&e.gid!==this.processGid)||typeof this.uid=="number"&&this.uid!==this.processUid||typeof this.gid=="number"&&this.gid!==this.processGid}[X1](e){return kfe(this.uid,e.uid,this.processUid)}[Z1](e){return kfe(this.gid,e.gid,this.processGid)}[z3](e,r){let o=e.mode&4095||this.fmode,a=new Lct.WriteStream(e.absolute,{flags:Tfe(e.size),mode:o,autoClose:!1});a.on("error",p=>{a.fd&&vn.close(a.fd,()=>{}),a.write=()=>!0,this[To](p,e),r()});let n=1,u=p=>{if(p){a.fd&&vn.close(a.fd,()=>{}),this[To](p,e),r();return}--n===0&&vn.close(a.fd,h=>{h?this[To](h,e):this[sC](),r()})};a.on("finish",p=>{let h=e.absolute,E=a.fd;if(e.mtime&&!this.noMtime){n++;let I=e.atime||new Date,v=e.mtime;vn.futimes(E,I,v,x=>x?vn.utimes(h,I,v,C=>u(C&&x)):u())}if(this[z1](e)){n++;let I=this[X1](e),v=this[Z1](e);vn.fchown(E,I,v,x=>x?vn.chown(h,I,v,C=>u(C&&x)):u())}u()});let A=this.transform&&this.transform(e)||e;A!==e&&(A.on("error",p=>{this[To](p,e),r()}),e.pipe(A)),A.pipe(a)}[X3](e,r){let o=e.mode&4095||this.dmode;this[Dh](e.absolute,o,a=>{if(a){this[To](a,e),r();return}let n=1,u=A=>{--n===0&&(r(),this[sC](),e.resume())};e.mtime&&!this.noMtime&&(n++,vn.utimes(e.absolute,e.atime||new Date,e.mtime,u)),this[z1](e)&&(n++,vn.chown(e.absolute,this[X1](e),this[Z1](e),u)),u()})}[Pfe](e){e.unsupported=!0,this.warn("TAR_ENTRY_UNSUPPORTED",`unsupported entry type: ${e.type}`,{entry:e}),e.resume()}[Dfe](e,r){this[Yx](e,e.linkpath,"symlink",r)}[Sfe](e,r){let o=fl(Wf.resolve(this.cwd,e.linkpath));this[Yx](e,o,"link",r)}[xfe](){this[jx]++}[sC](){this[jx]--,this[K3]()}[Z3](e){this[sC](),e.resume()}[J3](e,r){return e.type==="File"&&!this.unlink&&r.isFile()&&r.nlink<=1&&!e2}[V3](e){this[xfe]();let r=[e.path];e.linkpath&&r.push(e.linkpath),this.reservations.reserve(r,o=>this[vfe](e,o))}[qx](e){e.type==="SymbolicLink"?Yct(this.dirCache):e.type!=="Directory"&&qct(this.dirCache,e.absolute)}[vfe](e,r){this[qx](e);let o=A=>{this[qx](e),r(A)},a=()=>{this[Dh](this.cwd,this.dmode,A=>{if(A){this[To](A,e),o();return}this[$1]=!0,n()})},n=()=>{if(e.absolute!==this.cwd){let A=fl(Wf.dirname(e.absolute));if(A!==this.cwd)return this[Dh](A,this.dmode,p=>{if(p){this[To](p,e),o();return}u()})}u()},u=()=>{vn.lstat(e.absolute,(A,p)=>{if(p&&(this.keep||this.newer&&p.mtime>e.mtime)){this[Z3](e),o();return}if(A||this[J3](e,p))return this[tc](null,e,o);if(p.isDirectory()){if(e.type==="Directory"){let h=!this.noChmod&&e.mode&&(p.mode&4095)!==e.mode,E=I=>this[tc](I,e,o);return h?vn.chmod(e.absolute,e.mode,E):E()}if(e.absolute!==this.cwd)return vn.rmdir(e.absolute,h=>this[tc](h,e,o))}if(e.absolute===this.cwd)return this[tc](null,e,o);jct(e.absolute,h=>this[tc](h,e,o))})};this[$1]?n():a()}[tc](e,r,o){if(e){this[To](e,r),o();return}switch(r.type){case"File":case"OldFile":case"ContiguousFile":return this[z3](r,o);case"Link":return this[Sfe](r,o);case"SymbolicLink":return this[Dfe](r,o);case"Directory":case"GNUDumpDir":return this[X3](r,o)}}[Yx](e,r,o,a){vn[o](r,e.absolute,n=>{n?this[To](n,e):(this[sC](),e.resume()),a()})}},Gx=t=>{try{return[null,t()]}catch(e){return[e,null]}},$3=class extends t2{[tc](e,r){return super[tc](e,r,()=>{})}[V3](e){if(this[qx](e),!this[$1]){let n=this[Dh](this.cwd,this.dmode);if(n)return this[To](n,e);this[$1]=!0}if(e.absolute!==this.cwd){let n=fl(Wf.dirname(e.absolute));if(n!==this.cwd){let u=this[Dh](n,this.dmode);if(u)return this[To](u,e)}}let[r,o]=Gx(()=>vn.lstatSync(e.absolute));if(o&&(this.keep||this.newer&&o.mtime>e.mtime))return this[Z3](e);if(r||this[J3](e,o))return this[tc](null,e);if(o.isDirectory()){if(e.type==="Directory"){let u=!this.noChmod&&e.mode&&(o.mode&4095)!==e.mode,[A]=u?Gx(()=>{vn.chmodSync(e.absolute,e.mode)}):[];return this[tc](A,e)}let[n]=Gx(()=>vn.rmdirSync(e.absolute));this[tc](n,e)}let[a]=e.absolute===this.cwd?[]:Gx(()=>Gct(e.absolute));this[tc](a,e)}[z3](e,r){let o=e.mode&4095||this.fmode,a=A=>{let p;try{vn.closeSync(n)}catch(h){p=h}(A||p)&&this[To](A||p,e),r()},n;try{n=vn.openSync(e.absolute,Tfe(e.size),o)}catch(A){return a(A)}let u=this.transform&&this.transform(e)||e;u!==e&&(u.on("error",A=>this[To](A,e)),e.pipe(u)),u.on("data",A=>{try{vn.writeSync(n,A,0,A.length)}catch(p){a(p)}}),u.on("end",A=>{let p=null;if(e.mtime&&!this.noMtime){let h=e.atime||new Date,E=e.mtime;try{vn.futimesSync(n,h,E)}catch(I){try{vn.utimesSync(e.absolute,h,E)}catch{p=I}}}if(this[z1](e)){let h=this[X1](e),E=this[Z1](e);try{vn.fchownSync(n,h,E)}catch(I){try{vn.chownSync(e.absolute,h,E)}catch{p=p||I}}}a(p)})}[X3](e,r){let o=e.mode&4095||this.dmode,a=this[Dh](e.absolute,o);if(a){this[To](a,e),r();return}if(e.mtime&&!this.noMtime)try{vn.utimesSync(e.absolute,e.atime||new Date,e.mtime)}catch{}if(this[z1](e))try{vn.chownSync(e.absolute,this[X1](e),this[Z1](e))}catch{}r(),e.resume()}[Dh](e,r){try{return Ffe.sync(fl(e),{uid:this.uid,gid:this.gid,processUid:this.processUid,processGid:this.processGid,umask:this.processUmask,preserve:this.preservePaths,unlink:this.unlink,cache:this.dirCache,cwd:this.cwd,mode:r})}catch(o){return o}}[Yx](e,r,o,a){try{vn[o+"Sync"](r,e.absolute),a(),e.resume()}catch(n){return this[To](n,e)}}};t2.Sync=$3;Nfe.exports=t2});var _fe=_((SUt,Ufe)=>{"use strict";var Wct=OE(),Wx=e_(),Ofe=ve("fs"),Mfe=eC(),Lfe=ve("path"),t_=YE();Ufe.exports=(t,e,r)=>{typeof t=="function"?(r=t,e=null,t={}):Array.isArray(t)&&(e=t,t={}),typeof e=="function"&&(r=e,e=null),e?e=Array.from(e):e=[];let o=Wct(t);if(o.sync&&typeof r=="function")throw new TypeError("callback not supported for sync tar functions");if(!o.file&&typeof r=="function")throw new TypeError("callback only supported with file option");return e.length&&Kct(o,e),o.file&&o.sync?Vct(o):o.file?Jct(o,r):o.sync?zct(o):Xct(o)};var Kct=(t,e)=>{let r=new Map(e.map(n=>[t_(n),!0])),o=t.filter,a=(n,u)=>{let A=u||Lfe.parse(n).root||".",p=n===A?!1:r.has(n)?r.get(n):a(Lfe.dirname(n),A);return r.set(n,p),p};t.filter=o?(n,u)=>o(n,u)&&a(t_(n)):n=>a(t_(n))},Vct=t=>{let e=new Wx.Sync(t),r=t.file,o=Ofe.statSync(r),a=t.maxReadSize||16*1024*1024;new Mfe.ReadStreamSync(r,{readSize:a,size:o.size}).pipe(e)},Jct=(t,e)=>{let r=new Wx(t),o=t.maxReadSize||16*1024*1024,a=t.file,n=new Promise((u,A)=>{r.on("error",A),r.on("close",u),Ofe.stat(a,(p,h)=>{if(p)A(p);else{let E=new Mfe.ReadStream(a,{readSize:o,size:h.size});E.on("error",A),E.pipe(r)}})});return e?n.then(e,e):n},zct=t=>new Wx.Sync(t),Xct=t=>new Wx(t)});var Hfe=_(us=>{"use strict";us.c=us.create=IAe();us.r=us.replace=L3();us.t=us.list=Tx();us.u=us.update=QAe();us.x=us.extract=_fe();us.Pack=Ex();us.Unpack=e_();us.Parse=Rx();us.ReadEntry=rx();us.WriteEntry=A3();us.Header=qE();us.Pax=ix();us.types=KU()});var r_,jfe,Sh,r2,n2,Gfe=Et(()=>{r_=$e(id()),jfe=ve("worker_threads"),Sh=Symbol("kTaskInfo"),r2=class{constructor(e,r){this.fn=e;this.limit=(0,r_.default)(r.poolSize)}run(e){return this.limit(()=>this.fn(e))}},n2=class{constructor(e,r){this.source=e;this.workers=[];this.limit=(0,r_.default)(r.poolSize),this.cleanupInterval=setInterval(()=>{if(this.limit.pendingCount===0&&this.limit.activeCount===0){let o=this.workers.pop();o?o.terminate():clearInterval(this.cleanupInterval)}},5e3).unref()}createWorker(){this.cleanupInterval.refresh();let e=new jfe.Worker(this.source,{eval:!0,execArgv:[...process.execArgv,"--unhandled-rejections=strict"]});return e.on("message",r=>{if(!e[Sh])throw new Error("Assertion failed: Worker sent a result without having a task assigned");e[Sh].resolve(r),e[Sh]=null,e.unref(),this.workers.push(e)}),e.on("error",r=>{e[Sh]?.reject(r),e[Sh]=null}),e.on("exit",r=>{r!==0&&e[Sh]?.reject(new Error(`Worker exited with code ${r}`)),e[Sh]=null}),e}run(e){return this.limit(()=>{let r=this.workers.pop()??this.createWorker();return r.ref(),new Promise((o,a)=>{r[Sh]={resolve:o,reject:a},r.postMessage(e)})})}}});var Yfe=_((kUt,qfe)=>{var n_;qfe.exports.getContent=()=>(typeof n_>"u"&&(n_=ve("zlib").brotliDecompressSync(Buffer.from("W59AdoE5B0+1lW4yACxzf59sEq1coBzbRXaO1qCovsdV6k+oTNb8UwDVeZtSmwrROTVHVVVTk8qQmYCmFArApvr9/82RFXNUQ6XSwkV9cCfzSZWqU8eqG2EOlQ1lOQZWbHiPlC1abHHQuTEQEPUx98MQsaye6sqb8BAdM/XEROH6EjdeCSMTKRF6Ky9QE0EnP+EoJ1W8IDiGNQjCud4QjVb6s2PneihHqUArxp4y9lu+8JV7Jd95dsF1wY2/Lxh+cn9ht/77pxkNDcL6UGn39+F5kHErJGWPfXPxIkEkw7DsdtzjYyCSY+c3UDWkSokW07JFzh1bP+V1fOLXainl63s4qOijNf4DzTiErNLrQmZ3Dztrfvy5/PrV17THg5A4OsM6qvQOB3pjkohjdnjnmED91NVbtTfyxA9yViyPKX+fpONfVhgl3kMTcWhDhO3fzLR7LicLycwgO5VlPRXZcPy9M51ll9nq8le9UYt6wJd7PPDLV7Wv3wCjwTyGlLRLKemIZuWhJrieUkVTaTAMu4u4qvWZlpa9vrZgEJroriLZYYHGQrYvzPNwzw1RHuhCGl2mdWrYuCQqtsHAbe1S/Vy9VWmZrzf6ZAANTWM4S3u9FwlEB6PkIeMganeOTBaL9OhcOcT4vk5sWgNpEvw4wg1sP4Ury8j5OssUC/7r+/bfRtMP8Yo6+7PoqlMzX3Li2jMYUyg2iIRUj+2525ep9frulVJ/W1rVEAljLhjpQHKSXbXMqjbP583vTe7hQQVHosY8S5RCSvbYgEGkvLeovH71S/PrF1MU6V61yHEPfppiZcvr2DrqyElUWhZGMpEMFDM6HIMfNtcfD79YWjg+CCpZUYcShJuNUGKpozuw3RwNYQJ+gMFyU2se7luBYUsWjFgE/a5h3/EKWn6Wo8yMRhKZla5AvalupPqw5Kso+mYz/3jNyqlHmwnPpHgLRcI3wH+8BaU0Pjw8n+/WcjG/Kh2sy/PS1yZC1Kt2pOwgwBuMUrXjXEBFW1W2wGWO/QSTszpLziLMgh8lzp6Oh93dcQjJZ46vqqtbJasFJdEG+eaIoaQIMDNyIoiFxebz4cMUrbXP2c0mF+DQXAhIf2jrXoiIatsj+vGNreOhg5TW4vHNZ8BBoQakopthDEQbJu5+iYevzNnxMMtGKrm+/pKs32CgASeQG5ikBS6chUxUM37UUOuPh93/g21lIx/fq66GQoDdKCiRb7I8KYgyg2WUtDTwiGr64/CbXNr4AEJ3cGfSR1cQYfopX6b9//fNrG9GB4DMRFerkiN09QhlKcNBIsH6WlhjjmEijribeO/Fi8pAAKgCkJlVmRTdSbJEktXs1uec+wL53gskKxBI9gAgfy2S1ZJf1Rfaq6ruHqWs8ayZb41Unsnu/l9b3/DGMOf/7y21mvH3/R/xIxIJggkQJSVFlYoqK1b16aOqNtuJNFSRMmUsy4zziw3z3Xv/K/z33g8x/o/IYsSPyGFGRKKVBpjKjAS6kZng/5EJKDIBshOkqiYJSX1AluoMZGoOyh6WGUckoJaBdI5ISm2o9qoxxlFT7e3OrcaZs2/jV7WcM6terGez7/VidrNczmo5i+X41d6saMvMLPQQSGPRnmfgoirzv5VrRUjnPV5DK11l9283RjpjLUEHIG8NGjj3rb3aoZ39PwwqyuzsXQhVSbncvGvZ9lUByUpgEiqtsrG22kWejJGF5/t7U/875/6yu7TphneW04x7odKp0WoiENKIBjScCWuIMIK5n+r7zhwgC5Bc1QwSRdSf9GHMsmcA3aouluioI19mZncdUVToIaEkoSWEkiIQCEIIrYYeijTpM16fQLdqggRcWZbvFkJPCCWtQGhVSEQ7CAhHtZUQFqWIuHrzR+9m3yFsJRs57wneKDE8SASaQKBF6qFmlBPT9/UGcFvPP3y640Dk990pSqbAKKkStlFjo0ZJlOQ2BOvuftTi3vkD3uQecz348cGHwkGzPKjgBHfT/57fO7t+Wv8rnCLIKQIGGR5BRgkyxcCbIsUUIw4YdIqAKVKcYosFr/59df7/f6/3SA/P57/BBgUFBdGoIKAgIMAaBVijAI8UYGCNDAwWMAjR5HZlEITNHzC/af895OuZdD//CSa4wQ06uIGCDsTSLAILI4wCYQSuQHgrUCAbBbVQwbGpoILeD/TWxVdbH/Dg4MPCwsDCQCAwEAg8CAQGDq98oJfJtDM5nqr5+QQ8MBn+3fT5l7awDuvzycUKQSxBvOABWiSYBUJbpNR0u/d3240cmaQ7k4+8ZxpU26yxZxGpJZQ87vjAeCF4R7BpHK3etPDERnL1zf6GpUgeGDcsOlO6zvnLRtNb42rSXsVd8rawbWg5SkjPu/5/Lr840yPn1xokzxxuX41SPS3xDQ/0t9utuH+bm3W3My2dctB6d9/2vbqpIOQeUT8G0PW0OTtWtD2VQzI9Tnnb/N7H511q172oEJmeCTPFFJ705ZcBIx4TvkYs7OJ66NOIc/8ULaOnVEGST0WDojvLhH1A/VSB3eZk/w4cCPOa5ItkeKlF5geRufms6n9mH14/vL4ChiSs7CYJ9hEiAzL9Bb3Uzjv805Z1PrshWL+oykNdT4deLPO/RxPjDkAzMfHg/2PCXJnkuSviwa8SZA5iyaBqkmowpfLWgff0miloY4OWiAYsn1D9b+HbM8TGx/XFTIZTLHTPkNW+iM1ET4qh2+1ORrwttM/Q6u+76ExmQfwPYO6cP64jZJglyI9OrAFZq4H/ZqU1KEuu/9oix2Cp5fTfDjP54ErBPJfa5m/FloQ1z8jeXTCeqWquTk/shEq8gvbvdzs5+BEF0if5tSLdrNGLCJngV/qosEy7vMPmGJTJ/dIL0M93SGsbfW8RhN0XUL6Gw/BHwHLCwk48h+1d1tPndMQiWJv8NBZMWc/uw/5wAqkQPS4rk5zlj0AayQDFcygmmvPajPNgsT4GeeNPYyRWUGHY9PbrUkbqKdn0Uza9toRAI/cZCPOKYN5SPIfAkmojg5x95Iw/DW3ZAHYfSoJSfCgckLV6ipyPNdaOvJFRvQwV5naSz6hyJG+3zn86NnvXA2V4wXRG4lgsK/Fr1BOr/31G5rF7b/de8KLKKReWvJolMrrDdMDRRZMufPHnr4R4OHkZSqG06nY66Qke5j1+P2F/qW5pGCfjr2rPCmTsbCCuVyh4aXI+/Cggi/a9U99k2CTycaazVxI1fnPvfmZSebdbRyWdd7+b7MzsLs96h0TjDhJK3ArNGE8xQtoWmE9dH7UY7bE+3sj9MJFuxY0mhq5nYZBxcBsTN1Uo05/HKmV9WHqPyXbuEKHO+zPi+OhtsP5JrHI8GGeUu31Oylwin4GUHjWmubPNI2NJj+pY5/QWFFTEfi/Za0GCCQUqa9GCFQJbGG4ZfYHLs9jCbAuzLc42nX3wCzaYooB7e03eZHJ5vr0DE8podOo34igDQP4AlgVloNmRztVWS8aTITg7Ti0pbySCs5P+SCtqdn1WpcdxXIaMrKdAhTI2vriGLN6fBTW1nnXqcdkn+2TnMxKb0rnPjwni4JmpGo1a23awqn+ZK9c0zPuyckYk+fyorrB6QEcRr2z4kmTlENAWSlSJWpBGm4Wm66xDyDRUTCDcu7TicG8t1mNFt9Jn5XOQIvbMYzU4IIANMabcqLl3uv7hNeP9k6GeUW49rMdbRl+ZqE0W1STw0fLaRB/fRMbZgc+xk4ALN13YmvM4V6eVAhDVIYusMprX1BogqXKQDd6JNtqR1dzIhuIz0kF/RK4fo1wQEAEf41kTEAGRfBLEwDH2Fyst9es98v6xR0Mw2MZ+tPJSeIVk0D7BYhSIASguNcMuNntlpn68UxiM5Ryj0p+hp03NWw5ySGEzb0fm2pJ7joHIarn1UcsJNzUovRcosbV4HEX1bilh/UwoCDYOG4eN8UYclWIBi3Oo+UQ7XXZK/R4n2D/c8GHilt7+MWDSpDrctulhzqmaMWrcyjUXpMakryFz9lVHqtIfXTlZPYzitUBFlbam0qOKiIrnL5EOufrezyoFKTXBFtrsmZdL1yVciwq7U4rlOBSwVKCgNuER9A8Y8yvPtDHr06N9Ss72ee1KZ4H6jSfrPk2Q5ewNCgsJ0Fb2E7RsxUl+tX1m3gonQTJEgITC8bTosmJPJv2X9tIALe+Wgcic/5bsAys5e701PCtY+s+IWOwWGWgTvezEkiVlIo5ST+vQVOihgK/V9SPxlqSnEA0N3Ga617+qm/Wo44sG+3Y9Kj/C+f+zCLynbb/uZ/++3irT8Y3Th1l04NtKLrnWM8mxaxdp+yXxZRZyMyNHuxmhXxi/xRdUUFG3AUefxSX3UZbi9sWETQiecYeSJq2sXQ93PGHSmEZ1JkVf4/24GAN+sVFTTv15H315+6EkLfGoTmDbQxAA+aMXj8qu2SBTe/JlkvMZTVlb8H96uVfAdpcgsG5VPs8BhTYCyLn20e6jz0nq0avsKryYNUWiz1BRANSffEbB0P309RgZV0HcF7mhcWKS82pRGxVGDMzZIcFw/LW3ZTVJj69CfACVElUiq/j1qwNHqFeOdDGG4f1KDEbECB5oZNO4qLvOxb043t+Witj9HYYkp2rVjiKyP45oyI4B1t17zds7TERQvQDRpOKB01zcfuHvtTxa3vX1adTzQTxStL6ifit7yvlATXKnetXYl5m7j1AaaT3WpaLdqR/2scgvfDYaqdcO3+Mm+eInwIZTUbbNuUN7eKEsOuG82++2Cfqj/pxl3FhAYAL80MehOVJlBV3xb9fQHzAW8jYXs5jwMAU/X23IVKT4Stzzx14BHnVGSb9+0wheHmlrhtRQz2K383DrN/HVedy+QEcj/6TICw6PSjvCNfPFc3Z9h4oSzx9LpZYeI9R5LsHwKW6TehAo0zn+vMr3O+Ihg9FTpdQLMcNvy0njMdxYloudysusBa5iKJBMvWV+ONuNF0Eja4Y+iY4NIaWaRt1w1uLFq4/YfzdLWrWEnjrKPMjksEmyt3uBLK6bRrogu2gECh6qguKeSWseJqUapS4YHoTiXkrGX9MvnXYuPY505BRJvTWpsb5bDDbMXMyUz/rM2a1pI4yeOODfLzjJyBIzOmLY5fM3vdTmy1fb9tJlzXerqK3tCccA7u34JzA3Vr8iph8RdztaZV5KVX3KT1PE9fS6R3QcMqXihHJvjzimL404D1BYc63qzYEtM6EIxel0sV8WILdqMAWAEdzNNrLHVY4M5+TbXRNeFBluT6iSWgnH+gGF3a2CSwSUIWPRt1FbFYaCzxlHreegBugCSxasmEUfRVhiIrgmCaOR2wtfHaF1omgB07clHkSSwhO2zdcFR/Dn9Zi2uIFGyrHN44UJumI8Pq/9Qaeef7mUgI5ugdKQ98ThL1ZbMdMue0bEpzk9/1ybhKAf8uzxO1xYCNNyFEUoj4FOymz1TwynidHRHwxRPMN1n8bEw0BheZZDe3o1jaA5QF9n76Np8yf7do7Ait1SznNeZOlgNGbo72d8xjWWXzL123FyjHnyZGktd/6rrC1/0fkKnLVfpPMX26vjAblX+vOzPtf97olppbUzcrkrfWv+lE4ccWDSUs5yEi2rXnvwrpJQSXxYyrs/6MHHeNYEcHb5nZucas7eiyOHoRzNG1Kmd/tRoeAzMw5R6v8TzCZGThUtv9me7/bgyZfP+uzPr15NDku/JYeWRT/k5EsseffP7tIxqNaxkL16zLx9T8XeSvyop0ilGb5SrjjyAGWb2IXsnYenlSBnGfcrEQJUbpSuFhexoBKFj9KeefYlkTB13MvDRcDaU7bOrfqt71sezJ3Xs8m/anLWaFnHLKze1Y7sCEgeb/Pio/CLPl1qC9y0p3H66/SdMT2Nm1vEXvHz7cy+EnMRBhYu1b4rbfi1p5QjkspsBeuq7JTPHpMgX94TmR50Z23utq2q40nF4vU4qGyizRLdjQ4WxZj8vHKc0o0rNtp4vSOBpxYUuCMUQlo3Km1YL92xNYiKlyl+l4ZRrsgbocbt0K7OH5+rHHhLLXin0E9pxn+Aju3VPHrsxvdLIpPVpbE26jygoTD9cCNml5Ha5LG2RniubjdNoqPEsES+aPQiDOqeXckWVv3iNCjf/282x8JDtOZMhAQqD2iwjdg6HVhTrvxfE1zqFVMM8c6uS9A/L0SQVqvmODsJ0/jKUCNqhMQ8psFo9cAsawjMfrDIgGqVAg1tpwnXd/PU2NPHcwRfm5r+qAPrQVFKvf4G9PNOInPCcSTpYOD4jS4uH9RiIIutIuWVJmRFjkmRPm65VUBcLJ0H7xvoa/KeiDAqZdORZRaHF6TdqEzAaeqXqCy+H3mwUehYRSZY4d/UtIq7azVwqfhPu61HPqUPZu5+DnC2X8UkZ4UOEnSd93h5tX8K90PpnIl0Va/dnKiIQRwBuXNzCib5p8TF70CWG2lrLNO5HpnWVtHce5YVY3ut68/CfEZUr+nSwUw8RmvsvkZxQYrNx5Jss2YNK4lZZQCVlulrKbOGPuMQk0O0ImgruewVGlD81R3BZd18XSIy6Borcl61rbGFMWckhxwjFzMX/OXjPOtr8FXpKK3pIqJM9IBYcPA5dWJv7i31QPhVtwyS8swx+pdCwT6hxNpOwyEvL9Q79J5tCckuFZEdWUgV3IBGLb309jloX/tvtc/VNeVd1XngkG1Zg6So1AlluyMpLr7pgDOvgAqS3rh2mSsZIvo+Dwxo0k/hWWPZxODeFuZF/EvrudLabM2OBg8C6I5jJNstTHgXHhZPrH3zEZFfE7k5AugJQy4jexs4J6BKGFkVOqfnbV6hYQ7JzWVusvTI0xBj+cXmO3DdFYkcv3yHpagsMwuR9rBvd9DLpt79Ov57srZoUGWhc6Ps0WhvITY7NtyLgy52JzPaTjvYsycNTc36r5qHbDW+ed9+XExiYnkqUEnZ7oUplPqC4l6ny0xL3YtKp5T01smw7STzqJzUMbyQ9C0ar0R2FKkypKbozbrMpv/ZSDo6ADF5aKWq9jLypedWYh4w06AGW9agsnpdky6pYjiasEEZk1RAVM6lJ3Ea047SI3jnQYhqyyE5VWKdJmKnS5Xd0/Zyp1RNdmJ7ht9HSV9jKuQzQRCB6nAvYt3AjIWfgfRkkeopw2LJH06C2QXFhVOzpGofvcJUshq7+SiR4w5s38AzpcYhtjpvNWpG74CcdYhRAs9lixCvQUrcA3IJj5ytWlvWs61lGpFavTRxX1GKQsuy4xVnzmEczfd109GDbGu7zy/4MuOrAFXvghaMuah0VIkzp8t2nklR6+qOX9ezylploNWrSKjU8BKzpFc0cDYVeLQgmy0TvAkT6uLdP25+JpbzDBUBjOWjtL6rqAHhfvTjlEKGNPXooErU+3X+u/YEpMMCL1C0Nb1eNKrSUYZXjO3HzhwuxZCX29ST45T7PhyAYl11OlS3YYEKQ/dyVXXlgUu88T82s5T3xjpKc7v6yAfCllpIl4rnoFhaduZHyrOhOPHeXbouHOtlq4JXxCPPlCLO04WYx1djoRtFLSAlDqnifZibFw0JY76OjekuWzN4jQOqOefTiLk0Vykq4g8UTly7/1C5sacch2VXuduh0rmAWufl3a7dZlB1txBKP4Zcmd4ddlWkcaxR+FyNbkX9V4FbkSUBk6hg8Iqq3wYQj7N4G4euCc+1WBCDUkyd8O2tFUR1D6htlR4D4+aBVGcIAAYTw/mDvlAuR8N1Ari+7Y4i66ur8A/ihyplw0luN8RAprl7HyADZFu1735kbM8ttd+3Rl+fhI4N45i27cKHtcgDmGg+BeK+DFQRsvzC5uney0WDVX2z2Cm8fHldqSuyC9iXzVfec2qUTbbIfb3l8w5C56LkTAhtTh7GkDtyK9I0BR5rzTl+0iQAiAc2tUnb1I6kDeRdtqsbpxYswRT7Nc+tYQR99phvDQ0IXHdrQ0S1NAp0hDYbbHobwm0ewhrrwxY3Re/WfjxxFdeNpfR6VymXYMSpFdNHtLMWq+5K16eqVV8zp7jGdu8s23UIhuPWRn/pL6PL4f8NBJN9PJsPXJbmoklC/P0InMyhYlpYd2/ppW70Aq4X2B1m3la9spAH1g1OznFpTi74BG50PhtFwq74sgStnQtem/bIGE6PSDkc3tdFJuVaT9GEo+QdKSVlxHNCR+sTkV2hO+lbW6C8eVv8q0rfPf/fzDR3tp+erT0mWZc3MH3F9OIArSnhG3/rg+J1IgDkwQt2MFkLfXGMvgu21JML90wxL7/muF9F4imvP1lGlhHCvGh6KMskDNE7ZDwILBrC0lYe7ciYeun8asqcUQVjZFXFRTJXa/SfEMOLQSLp80yUxcZjnndfZLmPVdKY4WyXPaKAFQPySduUAP/J2w/EtPtj98vsCT/tmJa2FpTv6aE5v9QtWVPOjxSbJV/cY3kX8gfwkXLlY6EFtaLRrdUz1+ZPMOg94QTG7AGe5Rc+nLOo50OX6zcaq2I8H3PA5j2A8ASTBgW/fmYddbGmTpeqruv+r/XglJe5SZ0QzVyaWLD61zvg0CDBBL4HjKxL9PREbv0bSZyPE1YUgq3cCJ+idIBHLphspwbuf95Lv4PB8+oXEuPaqt1bcDZfk5YSYXzlijMG02xryCZkGhSMM994k/uViDVZqKw1HQjqETjUbAMKekO23Fg8wF1r7wuSfFnHQF+Lwz+/1QknV3J15GGA3iwPeleSmUnLzCzD7936Vo/v729anvXt+eqrP26OZ4oWWNJaRpIkRWOjfIAKR++lSk9nzkVfzu7n/xRHnjrkiQnGxDhvNFHc88Vy90Zrm/fDXGwk1LDd5QJzOQxpaVQW83YN+KElXWLWiI5cReWsKYXHln3FB/WFV8stF1x3cvL5Qb+9tzsS9Dr8IF0bhvHQWITbZvzs8TusFOCwSddIVnW4OluXjCzTC5rqZ9VkzZM8kv2LQrpkoYbExJe/vnrf2Hl4/qRuM3x5VifV025PILmYkBVSTavg7iKxpC11X4lLUDBf2NnrDhgFrGuRRUm9gtuwDEnQaOC4s1kMx7cYx+Bu5qaXhpSaa1uDfBW6diCQwVNuQPePcHP3Wsy7N6dlXPS1+VEP+73eXn08S+Maf2KUq9etK1r/pvRfrHjUmSxYnl2Wt5Fz0HtQER4hv9ff1I+Hqxq8XdPLYJZN0n1/mJoDiYBmDzzjmjHK2/Y143W3Fu9TRU3HHzN1ZdImhWXcuWNEtqtMRVpJblCDhmbxRHBkA8qfnA8pm0LPSd/yg7bYM5i8gribm5fYpU+sg/3p6c4yyq4DtRzWtBmfcV96A0N+cKOpIkSamIofMJZLUlgGWttaKMq097X5gUgkwMla07ydJuBkRNQ+rbAVmxqOCsJ5YQv0+W0SPuKSP1b5wdcENfVZc+44Q/Rf6W6sSL+LCkQ2WP2pbJCoVucjzkEXYodCuI8JYwResh9NzuPgqiR5aLgivX6ZH3zNRDRHraQxvAWcE2oedkU3yedJNWxDCGVf/tMZev76pvvcSX6oowV9MdZeKnqcHxSxC/gZ1IvwTTwFOK4ShIwd5Jag2PDrD5+Lllof8hQPVsOsVvfBqoeXn1RAKVxKZ9picDQ6ZpaUt0rhcBNvXSI0NC1TDGotyRMxjfpUiboMqxBv1HVl7E/R+c7yGsL0tuMUii/zuhq83X8igEQhuuaJhuLq6yVvF4JuYKw8x0edrZNZTw97D5R3sLhqv3iCR8EJHJvp0vGGYohFOW0p3TxW9JuIx1fSIeW4RcZoDcrupaj/oOe2HaL2oNEI+TVypYntuWY0Cuy9NqwNEsfgbYq5/DDM8vZ+N0oZaoqapI16XJXbIkVeX75GOWOgV6iDAzf7Gp10aHVYCzJuu6z6NyTFrHyUU9+bPVZ189JWNiRo1Sdas6B1CeKz3Dl9B6kRhFld4vX3eRrDJqZGKZoxrAVLjqi7kNbd38P6Mh4jPdci7HWRaITWGTY1OUrRnHFjuApNNL7XyIf8k/yJ1HixJ3159gOk2d/JGqHuJWAX4PF62i5S3+ZlXd0rE/E6awcrymhVIscuTVCILwlQt014djgxoo95Alvm8zG4NyZcmXylWDIk3XZlfknjMG56+aF/L1YIPjnmvaGW5wrESakUJpl720hoF6SbCySfeUnZsyMdTsq9e03K3r0C5ooDH8dP2zCRniRMjMBGHp02Sps+1mqjglZ4ojUK4smoWRvaaiAlZKuMH8AXBr4IOmucUbWkAmvqDzW73y7gCwMPJilNzLA921HFqJ9irjyKL0LLW1nZiAvkE/T979STeZMAt6i4uMhOtODdirJh9cF5+m4sby4frGG2Ia5B1mewqHGyt2sJLPtK4xMJ23QfVT4526MbrhrKMxMezx9xteRf3ziPHI2Y7kjXY7KffQU83kQ7CVufuUuOVvl5mQd0tyS/NctQyJfMQXZLllt4gHa00EZCn70c+uvsLSlWlrytV1bjpjNPSHAunYEV/YD5/7WYTlWeueMXg56U0Gpg/KzgjLfzMrFs9wFJrAoy7g1D54l7t3rTUTIQkY7RR9YPjQ2FIGoDl21AnPpDQ5BMWAmCH6u83rsCOWD5+nqgRv83+TWxpnPy+7EVkUNm8anL7eokP/MM/YERGr3GSfbG0H9pCYYje+DUmGd+XDijgiffZ1Ouwgp7Ml9HSeM74bLMErOqygZ0VhLq2TJ7dX9DGo7vspySmWne/I9Krtpo4g3Z8QjdgAu9aqrC6VCZBWuq3pfsEaupF1V6LLhAw2r+jtEeBuoPL650ZfQ79xKO7l+W+t682dxxFvCuhDbcW6bgRtkHXi7D4PYITpvbz/Z5Nsr+xdlORSe7cQpltBg1JFFnkvBILeLlRtT3OdemPpm7J9bkj3awCHEST+X/myhfoeAM0QwkEftzDutamCMbUMb6EBmgnjCpY8y3xBG+UptsWAFQA8naA3XfH+N9YoRp+K3CPkY8LhFgjyehyWO1wrz13Hik1W6rJc1Jbcd+t+lXEy3GcgmVg9Se+cXyQiZi08v0qynYp05928QV49LjVDXD/5AevzHoZg5jiCjDmFD68Zm/Zjsb601DV9ofV6G1mx0ErIP7Cv+SrJkkSb+NKt832CknQaxH5KojT7xd+BPk2eIoLFsnUyRob5U24gZ4G3DPZKEqRLhYv7BTGeQwdP2GzwjZPKzZj4AcHrBkAzRer3QVLPNtyDXnsAQ8nPJ72YTTkdrXu8F+pVra01lPJd5ayZ2mKLXVO811pZ6EoF7vxtyk04mNyBrr7cV4QO/MljrXFAlsfYsNAjpgoutHGwusMVBOPY3jSSqrcq8z3/I/kzaUs7xzuuLgSxVydJ09JX3DViXfssrjpta+xbU9X0IY2e3njGAz7LmihM78wK0QjWs/3hoe04qu/RKERCvAdOqBImbbQ1tLNrnYuj4kExgwoeTDQEfIpNdfQ8Revh/egeW20EdrFG9opsArgiaULlEwmI9OmN0jP2BkeYZV3Tw0G7YvFe1E2TB3vZgHY9qmVo/UxTbPaQy/157SmXmk1ihnXQBrdmLw3pn1mbBzkGYfeCpuX2AXemvTODlgrv+1btlObz2dYJfTRbKEosPFlRpaL3E3uP+vkjNzKVPbieuFMOAaFQF112v4mUE7Gk+G/V/WB6QgG6o6W4Bxy/B2/KpYZmCbSOhycnsJNw/HmFqmLHI+c5/U1NpbywepSdXeQondm1LIq6voHoXQhL7Jzcn2YL3dxg4yG0aOmpKwh8DKflJw7sieJJ1vF6E2TLGUpEpiAsXybgpCkhp7jbqHELoR3pK4n7iDKovtv1eCdktP8JTTxMRV0TmmM53HsBF36TmvWZsMsF0BuF5BiwRt6IlWFbRYEE+kzsSsKhcT68QoCJgS8zC05JbeH4wQkrimbA9IrXFgOQk1OQE4uxsgJsG+0jyD1nUxfT+6QxALeMXot2PMcttzcRl7Wi3YSCrDrL8enN8KPpk+u3PqRm36kKTSXvivtI/7qVSh0rc18O6HclF+/mqrCy5PFxr5z0qB8ZbrcNEYcpmCZXlOBG2dp0P6s8p314mjvQ37D2FDx7CbhROS+H20/W4EcIC7EttsbKMbFALRGGLpVJvcYMpEzztaoErN21RZQsS3W88KOhPYrt3ycB/bX7Eh3gb1EdSzdVtJiTjr5Wd3REN/kN9Or6q+n46i8P9KfoUl8M1jbHUk8M1ca8HOp/Nuz6gkdkllTkrBemWnE8t8rmC6H7oVAxlw9mb1GNfv6H71o9hFxfHZsBdFV9sit8qVLMb0l78WBHTNo3vzSEdpVO8xOjlmJ9+cBT1Z/cxS8eBsdswEArGwYNOWwiNkawf+N0OmKHl6NfH9rbmoDGck5vIpxKfIgPxdoNGJ+cRp1ctp6A9n/C7pTTVtuBHkFWxz3bZ8BP01zusZDT37KzNGdiFz/CstKvY9Bh/5FkfA9PTZ4LKaft6JvgilvE5uuz2vjifGtJFlBKjiNYl0NcwuxQT0nsUB3XgrnYP3zJRdA6nFv3egCu+HPJm+bY5jw31JKOokp+eQrD9KMr9O2tP9kp0l1IZPGLCUBErsDizvBhaSYE8XTKZZdb+gYUmdoYwUBhr8DAuazPN3tNL6BS0jaINPtA5BiwXZ0xmT7SS1xo8qspyEmpwAnN0NLKbDC1UvNnmf2kXKMbx/fry8SbtADOB/JGTOfoSmNrQLMUapSXimQ8a3tYS8HWLN3YQm4X5kZLJFTM1Bu0BWsvp0yI72MXTYDoIo2OgjIft3HdbZkYWkZIeMDBYa/Kw+HVLaZ6tGFTba10YdLgdm/iSX+SMg+8E2bfdJvXFaz4bgSgn9oOymJefynDKXbBuo7hZYLKn2PM7IAGjwAwQNwMPcMs9Ww1AyC9bHgk+ySMtjoSqTBetnZevYOWYDDDuygzBui7isaz9kV8T+dkoIXFeCZ/xOKHqpD1Ls6JwKgQE8w1dB37wTZJ9xCONQzCbF7JJaZN9IS4GpDpQm+myyNMw6RQtF5d8YeWx1G4+6LptY3uV7z5tQqbW1qXzV92dLqkVvOjSqgDnwEC/xJFOVrJFZGBw5H5+nPzi+JY96HzKO0e096Npd5B1jRwl8be+/i6EYNVlk7VlgDgLyPstpgulB2t/PP84uDhbLmXoLpP6ELCh5BpBOhk/qFc3kVjawyKaHJS8GjpIk9QG6WULTTD+3OL0tOCIYkEgrAMu3TNolJrRqVEGtK7+LES7h4ZqPwMPCzl4i5361NOo2Z6GygSZytzkK5dq75gOEBhYHg0uVCbSteLaroZ+OsJcz17wzyNIV9J5IcufnUIUpk4lfGE6t/+IG23PMIzdyTVJVQ7Xdcd0/1tKrMXo8Xr4J1IpJTOC7k7benVh9NPSjjqOa3Ptqnm5Aex9XjOX7cPbS3GtimmKbsvX8I7aGkEXDgb8HoTi7vTXy1+dH+6FM/ksAK5fXhLWcr18WefN5HzQfgBwbYByplvv5qGdM1I70AjE/ygbl3KMzyGYZ0WYMlnZlpppcL2ffTDH8sjHkCbG4gZqMSPGk/bphoGVSNB8kmydQ3DX63CE4A0sXoHcbAgcb5XxU248Gs7cc9HHWoD01XrITCMHSYCgzFSLxfkN6cr612uCgcyiKCMR73BvqcbKB2h8FXDigPcC9YaD+rYC/+WBDyMzgMRccs4ZDZwVefBAtpzn+z/5LIVeriE5lVbQ/l9v5GtB3F1K6ed7gRv+4SIWMEW2uSy4qOtDfFlS/cF6/WDeA7kuxnrKm6MM/7Y1VeqzYTr4bIjtaSSDe9WDo5ml5SXfybMOkQWAmXQX63ezu48MipDIg7mvjv2bF3KuRV6OjDj6fPHRjV1qVXLpXxJ7LrX8dXHV9dVAs5/6PpFSvrA8NR70Xxkfmz7fBmNcCXugQvRp3GLSLHxPcdaoGZvxuOQ8HVQcPAtxxFi3Q5LhogZ/qDeYrOniwtaGtT2C/9CEqdh9GEnEqbhr2c3h6iEx+E0cfwTUVq7CryNx5Fc5aYfdz9qPj1N7CSya7dXoD6I7ioUbYTCZUpenp1cQEll049j7odeqJ1K1T9OmC3q9yhI7QwDZu/ulZrHj1tdMzFNVx40+kI3n12KfOta/rsvv9SUplRee/wK1YmgeAQc3OM1PYHbCOc+jsO2e4+I4D4z/hhfa5d26EG1jUgxOA99bstP6Vlb0CpChJurSOZ/RTv8SQOluVhErRHgQuthqKLaz3j7ELQBz2kepCH5Jk1YdNwdW/YYyudyV/MbDrw6U1LWzTFLVHv3ygfRzafIevOJQtmSHcfoa8hOigJfJEy1zfvGHFef9tNq9n0/77/HGp22zBew27poo8HbQGFQRJEwERdJRufYlv5LO5hfJ7SduokcjHLBf3Ht9PKMLIHq4YsteiUrUJJ+UGGtUe5JIAqGu7FkazFHFf6fTSxqmVKb8U07F6jgqrMDZnJHUNf2nfvD15O17SReuaZD+uR7Yd+CGsdxGdF1b5FcSl2uMJpE7upyJSfJ9ZML3APLht5xJ//PIIcrKpj4wpF8EZtHHW3ujLpTpCvQV7TdOgfub9ROpgmiXzFxjrYNMRssnEkRYoQY451tVhdjfmncuJgjJOfELONffLUzQrKUdOJIMzc8DvSChlMZs/1A851gGBxXw8FZ9K5Y0na0Is6CPhmH+wq7+lr6gjzXTbyFJipqJyIXOXj+dPWEZupl88DEF5xsxU8GYsGUUJP16LCmAqAB89b09bCe6r2TUbr80JQ0KQz5tPkoriHZkSe+rwOTx721Iy8Gp9RPwskDI4rQcy6kyUdMPR4z2Oj3tiw/YKM9wz7pGxBn/Z0DHQIFK009v3e0Fm6OneA232204HvBOu7Y55aBhSQ1L1PBNuQiAoLGWi9hcd/+X0cqMWhoyYYatueersaUzKypn+y1yNMl4AGlbCVlfdcSz9f7hnRVnz4izrrzlmz3cpK4SYTMP50pGXj52iyxS6gSuhxyeS8Waf0A7e4wpy9Wc0kwVdaR47lesMs5pu/YLawDYZkrY+69uJKon+2aWZHxpeqjXSOCB8bsjiofT5seL21o0j6usSn0p9riZ6nPGHOsoLzJCE528oloL/EaHBJa3Xhl/v/3fbN6fQF5ROZaN6VIggxdXbNfrqHp2YFseEn2dU/7cL/NOk/B/gFm8gb1OUQMnZpUGgUd8XUWmwpUY94JQ8qJQH+rIMN4tBL6lzoAYaA3Mp5KWbA21f/mlDxdE0yOZoQ9h76y3rqckrx31vnvTum9WEebNDajnYfs9Ey3J18wNSIdWF111f+oGkRyKnUCs1XWHeasRT6bVxarmiDTWzQHP9KuSL4I/UTb6nawpK337S1iRvRj5EX7jIiVu3ny1hyaKsxfC+na7SQm3OTfAYt93kArfSHkIqiwYLXWokmROOHkxYodzd5XGfPBb6YbTXGoYhP3lb8BzZQF8Vonb9emo7tXsKFSufOzkiV2yheJVbnnzDNylzPBy2+e1JHxpdR1hQPa5A0mvKXWla2zpEl2g806CpC2sJsm3xQuK0kqdJf7ODkDpEALU8v52q++Um+4GrlkeLoqLzwdfZGlWMZMjyyFoDsNRdcT5n9zFXkciyDGrIY54T4nx/9hp7T1uzrHqd8b/Z32qBItp4cKs8FKR8l+lGzucE7ZbUSQX9P5EZ/kALPuvRNLyEokUFvRqvU3hQ73DoaLc5n70GpXQmWmlzGfrw1tGiaQRwsYcb2+8IHyRStQXJduPmGw+hAZ2SGEULJ1gtf+i046u6qvhxN5EDxuNYsjF7QC1mk4INqOlnE2Qn8tN+L+1b+eQJ73zeZDaZUoo7GaOZjmZP4llv+arRCYPoMrq8zmhjTX9fsWmMwkqu0Ey1c7HKycU6HPiAUquuneaJe+2XSk2igANJG/p+utwOly+aTXBYIIxCvztX1498wYyAlUcINGdUPBaGejn/NvN3IzFsyvzK1ykPzcn/lubqN5UrDU0jQL3MBDCsBV6O4dS70aQ5aaQpyzkAVJGXXkGjmJO8NZ1zxwdpXa5U7j2nc4seEUZ1eH1ZgONhtKYVv4bMI9Bw1fs3y9UovMm3Rb4/eMsPhdGw0kIsTPLu91ub781VisKr+mvDkZZT6VIF3mcHtJqC1jtfvGIBaenMLsC4H8FLXsRRvxfVjvmoCI8ihK5P1BVp7u56ig0qTDcwxb/OC6V6Dm/KnN0hHxYOPGcD2I05/ZLviJQOAkiC0z8GgwraAcKpXIS4a2+In3xE/hD2gGDzdJbQopSfCjbfHs+K+l25YqAZoLllKtAhJONFBj6OCDTLfecYcdEkmw4hS5v4b6i/5p0kUy0gSbOtg1s//YqwfTblOfbAtpOF27jWXgFX9exa9AM8pxJtKHuGB4n4CBn/PoEWdQufTVlqXONVUrt3qGOq8iSo6eJxrOcTChWbxpNCfrWModajt79qGV1Bb7qwTlEL1hnkI3InH7Dbef98MNidiHBssPRJG2hQ+61eVrOT54CNAeARZDbPSBrddWVNiial7+QpaNwraY3sQSgOTGwIp5pY6x4aGQBM+fj0R2sniqbMybLWzDkxZow4a3yyWYk3w8kxO6q76ghtwq8lSec6jEbv/iaGHcu8cCLd3J3mbYzOwXdP77Yq/JEIz/lhkega4t7P6FZYujxG3MyalLaZf9EfT/Oo3N5fG0WYQO/HKdZ4jVev60a632JZ3PdyFTk0RTmf3XmsxIn66lOm1DsmHRd4tT28GDj1i9esJM50nEcXLdbJA8hv8ym3t5bmFPYXSfS8ZnDwklYZlqHOOYiM6jSiFWCzOYo3pIAWaCBNoVDjs7VWFHYZUdH/3KDf1plQ1RWLoNL+RxrAayRVWmjTB9NZeqSQPw2e6nhpNTKkaiLNmDy0k0eyb0O/3KM1nO2K3C/my20qhbg6iFFRPEVtr6mOEtRcHrDkRw3yM1Tx7OuaIeV3oohTbM0Q1DoPrFf+GLTfnACDqsXd9O4+KhI9KP9+WX+dzRVsx2CrdgUhcuP1Fc08AJhG+Yil+EH8RJiCkrDCkNMoVOa/Bue9V53wpHZrnMyUtDW9yC/2XMNuWBlKdq2/WS9+b2mb+eegFLSSS37H0tjACyYtrQoJ5zybG2/SWaeNVXq+zXVtRX8aXZcaqOyMsJR0+eSmy/qGextMST6SLrokyuq3SaiTH9te+OkepcPqD0avM2HTJGY6AXNQSislLzLPvZb+ONBgQjMtPZgrP9yhcmAEWQlcJvXidjCkhcj9gy3dCQPtxgvnbJrJ+k35kigVZJ2Mh0KzBXj9+TcnV9efvzdX35UrhQBuPHEd83DtibkY+N4QNJvvlOvZuKqZf65kf7x4TuksHZ1sV/GEqbgNGjbwRtMOvhc89/igkSttEGk18OkrlGPMIkC5QqMyKWn/SWI4sqwOkEIhSgeup4y5cVXaoJH6jU2jl55zdi/4Ocfphow78cHWJYTOulHdrtl5gV6MZB1U1Um4PZbs31YxbPu8YdY4zWO4lxZ1dKooyqHgiSXUbAXekqixSDW9RdHjvofjfXZKGUa1aYkdDmIgW9imeIMq+reABIwq4sXYyxtr4Z9qLe44oxq/e9zThRsj/ojZWAbHW+j1cu199UgQwcb8+/EuKCYE1BU5+fSneZc/fGKdi1Ru9J0T3cgN001enFCpRBTpmsXmmqrWhutCw8KaRvTNmld5Xa+/rx03frzNu54dIA1k07mMQ9zzxdQdblLQEIqPaWvHtY9395fGNfrShbr7f50vq5Qkelf2owO2caZlOcO3Er+dKD46KeOzv5GS9vW03Unl0yKKYqftEuqbSoKl7ESPxyNCTg1Io8iW9rDeB8eIMHDTEXsbTc+apM88T2iFus320f2l4dYM+tmeMhaofWPpTg6ucTP7wt5Nm4/2TXcbNpRhLByjasYhKaXk3Ce9YVdK9EfcD/YfHNIjXiEHu7cct9MieeLhQPjvXGzsOrvsqe3fhU9F60p4uSt7lA85KAbLzNQknvpU6d19zvdfLfjF0IZ5gJxp7qPylgRO231JbQHmjXH4uXF8gtiK6X2urzTrfIksjG9JXeppJtsr0DDeo9vtvRTbP177qM9qS/O966c714ZvQQnlwTaF9328TcdNX07x9z/awUYC8XBK2Lqm9O3kRiHHGjBIW9jgVBrqLDd0nMpj37OCR8WcfqIK7q2wuQU7F8g9f/Ee4gv/tU+9XsIqlSdwn5FU44utaGKwRs1r3ZTlTYXafnwcXbSIuwomrhZSEd9u10rWKJrKTbnoVKhUpYTvaj016zEJXn0ngdA4IjmN4lJB0JbxgmKPkO1egKe0ZtFBKM4QkDiaynmM69gd3AivSGD7lFQX1I4B4O13gVT0OOhuOcw82EXF0i4KBlQvz3OEtTGwGZKej4gW3RDJwQU+KGJ9jIXw6GXNG0p6gIn9eCH4WUVfA5A+2puDFkcMv3gGETH6kMhjHUVDWOUZNIbHBvDvwlWkwK2RJOMtHpuVyWbic5Pqm05kHbZN82jL1dHjq5ljcPKfFLcNZfGNjuGznPrvD4atSOpG/s7SVGh3R0HUFL7N7/NNGr4rbFyF1CtoSB17j9LTA8eyhxWYIENSlfRO5y4cGthwQWB5FdXRYH7YSwMvj9VWElwrgz9uiSxaJ+8TLAGZKo5ybCrjImmRFaDOFR5opwaAE0GdrYcMKw0ZVTk7QMaD2lWBqySgEgqpy+PBiUXc539No+kKbsHvQ2cD3q91S9gNsPk3b/2TBpV/bOyF4k3u3GK2taQSiJUhJ+lHhuFiDxmPtHQqVoyxahk3RRurUJPWgZW8qaouAWJj0FxxT4YJJIx1xKy0Y2X+iZmq1a/UG1/lTcKiHosU5g0NR2kecmlrExMdtkVcTDvSTbl+cc8dESdVrii0mjuvh/s2Ox7qySG42zZw+s3fD0yxBsAiWaC1wNYrtH4A56jTTYWVZqtXWfqScQSS1pQ6rjXj47NfEsJGAwQwAXZfBlBaHUVDQEqPT4H85RPR5oOOUNgXgZ8XykqB3X0uYqJk4CaJFQeIggGA93JUw6uiIkliZnV/78AvcktkMOKQITu5ta2s1LhuPbvs/f7HT74/BNUTpYlTTyhU/jLtCfZ9pkyYE6OfLyKLJDMWSHFyQGUTBWERBmAkHdAFfHNfP7EFySvRzCRQnFUuq+8djJ1CVoatembJ/isxvKZG8fohkPwaF50ymJYHKnyd4BoOQT8giWLOFnC1n8uoI6UJzunJexaVzpbumkmGIpiKtGyCeSkAOB7c6a1nIyLxmx4Ao9CAh/aAQ7b6MyQsMtfGOExeZZvLHUnf0UkWFmzOG1jljSYJn8qoZsSdptTSoPvV1N/cs7NidAQCDQal0gQQ/TAEb2B1utGcKAG7f5ktjfzwXlsZ8MVNoCFGko+d5P3GTxxBZgpv9UKWKbvEWtfYc/eSwnX5ioHZNXRZUg4L3ZT30wco6oFqsH1fPb+nWGoZCWfAf54xhsh6n8b5fVMBYqVCmwui3KxJNFI8odUxSWCkXL0mW3K1PEIM7mdxadQ3u+vmuu8wnj/A53XRv9lH80VmQc7p+TH1f39RF47KWUB4qnWU/qWrD9r4Kw0ioFItrxqPWOIsvbD66Vu2ChKb4DJVwL9jqhG3USa9uO304mlt4FN0HXkKruR8ZZk0/xESW2+W+f1w5XlTmn853Zu40TCUaF67mD/UGqtrr6HTC5uuZWJtj/35FRHjwQ48xioJ0r8DrTsc19KV1rPw0DKBixX/A4+45234wcOvpB4n93Wd0coAYLBJKfR9jH//lK5bmb4PLn1Af9FwPcOTZOpGYs3tJP94y9vMUgITcuT9fdq+cPJquFV+RSgVUl+R/ibZVKnu8TuNLzNG2bL1aOoS0J8ywYKqstEb6YBumceU4yvLEWR74YywraaG3f2ZhMw1c6bPG/hWrp3Ke1I4jG1k3UNRET7CRfxUuUtuYhXpCpiLsWYjEccIELALAP6Xp3B78Dt91qWINtbTH/9Lpefg5aAt0XaIJfw93x2HbA2MMGYmehKKmWB7n85I3A3CuthE8unbS8h8mSlcZ7/RQM5dnU0ITZhRFEO+RbiGzIyIahla6/QaxIZhocnT377A7d21nHhVrcoCpNtLioWNnNpryHwW2K5Jl+GP15GYp6VzxMl53flT3jFrMm9YtNFOAPAITKEKPlS8Rj/6NFuUlUa2yKKXvqEEFG9RhUm7nGQ3LzABKekbaucg1cQAXzUHZNssTQigeZEWDWqSwNuVQ/IEjbO5odJEpTvitbMrZ038CNJfUxb0UMuG7VgcVprjVLR1W06Ot9KL132k/z8i++v62rgbXj1e5CVkmNg01uTx4UOLz/6bNgJMWOPoi5fByOepqc34nVv29NEEOf92nu30heMH927aQsv/8cJjnpKqNzTeUGbB3WaUvlGI1/koPyWHpbT+z+PPDkAuPbCRmKf8y/GtHf3PmStmHuSNzUGOMaMnLIn1NHYapJRKKkM7+3S6meDufAFBX8BPLS3LwPjrju3popY/d2GGFEWToMlc4tUjRH7+QKndACF40SjZqwTPkGpZh89CDxQk1BUcGUeAEe2mCv2uvyI6NGNOyERe4W0yodNyHMrhhwg/EQMuiD0l+b9tUUtq/LSE8z+d780cdKwwb5JLbJ8P4awW78HBdQeAwBBZxaFLjjSmzWM//SPfnMSUGw3YxuEtlFoV0bHpiqgPH2tdsH4j4g1GlpftIPAwbFqtFW3u46HtsUF5YmiQ1yHx0N9Ppypj4XyA+FM7pICIqxzr4yWGQa4NYQd+IcNVt6J3q5a88RMJV7ZJu23SnPpX1BXpS1lG22yQBJPLrA49Qc6ktX78FgL0zfnyhUBrA61A3DOYuc44RSfajyN4YER4ZtbUbOfVz3/AFoVxV6/9Xa0QcZRt9WqlXykMu5kirOjaV2KZAUPmDQ2jzqBNZeMVsxpC8gG/jFIxO+frNi1oqLURx7TkslQqVkfpB/C4u/HiMWALHR+WzfmwcaUltOx4zYNqPOivINMvtEvwVBr1iXDiuWtSvu0WXfWCXUrMbLNCro2ebhKiFtfisjDZJ7kZRHBG25xKfQk+I4xUsXniHwpaZVkQbR90dJxO+ewahW31Pe8L15sOnkd62BwKIaWfj3W4h109daZRqycBvWd0KHrv8HhSOnNlYNw1J2VzEj96P6wrzgHorEawP1DjLNSCC661L/xXPOzH+L7q+zMoGByTKdV+MWXai59vOSCYMOjTskTKpCkrkpSSoKeHjWUQtd2fkJ3kEBNKOoQDkKHmBXxfn5NMndONF8BRsqW0G2THK6zrx67U/yvGVh9hEN18D4/wo9RUG40eTwPMxsisv5JXom/2docN0h/sST0uAe+aBrC1OQoEJ4KFH0oY6nULOPlxBaDFBbNJyro9i2Zo7mlCUdR6djebTpHRKG/9VjutrUiGMFiSZ5NSU+uLDHcGGWURaMyQFSxVp5Dp3Fs8P3PLjVK/w3jY/g66R8tHzT1LIrF0uR5ALFYeNFlnnoMOxwOFV+crRqqyiI0BOsyphteiVI2RqsK0LEx+Pot1PGqYADpOWRbg5wB0bWE1Eox24YxZyfDIuJ+7FUA+YQIUxZKGsMpAKHIopktOj9zjhilzBqZPFn3LfEK6w8bIwmbDSmiIhJslAb8m0uptn561Ncuxu1fkHqDHLnXIeSMSHmVJ6UwchWID8QqRZDVFIUCmcqAF7ZVjPuN2gguU0Y9TEfWwch2rG2vjqy8ZNIltq/4qVqGWzdil36nOfMDl+R3esg3yy9XAgN19q9oXOcEf9eN8B/rRj7WCWtpduWaIUpufaYu+TbGGsnx6EoZTTz8HWPZqfJD+p7KyGfFRSzKw+dFN+MNS/PgMm+bMtleiLZtFSQXVNlOKQLhQyCY9NJRDBD+huJ8aIN1xRfBrEGjYvvB0+RAkqVLCkzCnZ+W7Ookrt/c3xWu9GIPLcWhLE53E8RgnLPmHyvw7Gf81nEL5WpwoxfFL1DPgND0dsWN9B8OQIcJQ/uHh0s7u85h2NKgkRRdOe1mHe+KZC8UAyZW2uhH5K9RjY9M1u2H5aantJWVwKZzf+f6LQZO3ONVY4Rp+IyGZ0Om2tECVcO1BfLEYU1FgR4J5GLdgsQ6AECi3GsF1+RdzhdflkfECgA+lLgKLzWO6otNDrb+o/aqFXGqPRPd7t7IzeGt6l6gm9+ezqkhUnTkGXTriocY9NDGymE87ISY4DfBJk06+KOR+S7qJXupmMKAuB1kyzESh8SAejkwgfq7G4e2LGl2VaPbTD9368qFEGPOWv7XeZNuvQZCK7g0LK1nABVd6cSS4750n33mPhL59xGJznhdk51RhJGswlCrEH7bVoBVtflQduPTEQlbN5QHoABCzPuXO8uGNzA0Ap0Ej6WQLf3cHk3pe55lBN/GulLB5QcUgjsiNbmA3deT4fJsoXZL7tgVpUw0MSoJvhJ6nvHnt7eZDzs0Mg2YKlcWOFU5E4T61oZVmxkrCbF6iublgQpMXqohOll7S2We38ZmHis9OxuaFQzF6xqBcK76/zQz1gUjq9xuvMCoe4x4VB7pGdaMaoGlM6b/KO+FJo7jRbtOZvpok5Pr3DnVBKpUYUM8yJmx7/AQ/OmKG1pwxOZj4SvNA06++6BT0W420K2nVlck12r7C2n9aFw9QX123AmZDY85FBDmhrGaYO+Z/I3tfLqOThokLjiElzx7iKEjuwXsdRbKxo8vANkVnpup9iLFYW6UKwwhs6qoahZGCLas/yNbVuFYx6ZIY5C1XS0MwNt0AY9Wp1qjKMTfo0gcGrgdxI5CsZ2+gAzfKQpncI41RPFDgPim0ZSFDS/OrbAiTU6rIuIaf6qwvvN8GZLx9928mo8yycEVdd2McMTk2/JjB61GDpupcAMMAkztS1S3uQXzhDXz67sModD+e7V2ZKITXj8S+anlRzkF6Y3376SJH5byYvhWLkPz0OdwVuLO9wysex8ae3WLbHGVAXABxNRgp77IS96LDIEUpsBRd40saAtnnneZTAcq8UloygyNgDrZPChcLzD1SZuLyKd/QLX/98skZyLikPVrlitVOmOuYKTRes/y1rWSkFH34XbmSawYYQKFs3aD+OvD1C2k7mGkF5tDaA1RpWy/s6ed6ng/dnCFT+cZWPaFVeoegt6PR+MZ+xGKt9XmyqUqYg8eVRZ2oImB2OWbE46AgSrN3y/M0fSJvq8aXaRB6e2A+dcV36Mm4phVXWLrySgcilRuyfpbx9MeLBUX/6CenomFDJai8V8wajvigJOgbpVWSvHndJODdI37jUY/rdieHq5yYOOnwKg34dpgSwmcrfUF8V0miZDbcxUKAOCDjVD6E7w6VO7xCJ1Li8kxd/qRxCbitgPc356IA2qxlXC5KNarkslrzVV39ftBW+iGovdBF3dLgSTSGShJbY3CXw3gfoM3FpZp0JzX46ltE7gTJHPHshS4ySp2E9rbwmooGj4IwF3VPQ2IguKPrUFh/pDNmFR0jwfek9LoLF87TGdEypDNA2bJ9w84JIKZA8HA7HdmmRHnWymtO/rnebFPhZMe5lKFMp1Lp2ZQcw0RznzSw51PjbtUeuPI/abpQVGW56KSiv2NCz5JeYQiDm5HdUepQJJIMhKWTN1xfi1KVV6p2vVWt1O/A2JGI0hE+SPmpmqAMZNOEZ8QoprXZgExjLhlb1NcCd1TRWAj3m64dmyxplyvfuJeRG4xr/GwNjA7N5O0bbP2jcKisHiPgtUKL9dbdb79XVvthv7B8T+mbW9mPNddFLxkfzS/U7PEOX8DLzdZOYipY3d9kyj1ToHBrBe+BEMbn+ohRyMo8pyhovOsHW/8opMAmeiP/Ns3Vr9M889mt9DfMFU6ywCa85jTK0xqJGDqdguFafXOrOdZIo+sAOxqPWhN17jShydxYGnXpSd4Y55hzVzp8T1Dn0sHlNrZjLkDrWtyGKbuiOKRGj0oYz9d8IB5jqHT0qmqMI5zLFe3reQjh5U85Ji31ROO2GWM2+aeRpTD6E+1uBoVDQYM1uY1Nl4qbR93wSp9ttzuwqwLigzQxBrzEyp6ozcYL4dJi+zXdE2282WGIkFnsZfRCwyWDraMbzw+vG4vP8tAwVTQEqZqSeJHNcuNB43FFZXzWBagDIbffgE2jOqz9etjx9YuQXi+xlSF9Rfo1NWlp3C9jo61AxkPbgOso/eea6y8KQkjDFlgovQDnOQ6t0GbQpVsDpYetYMyJCZ8jODG4jQaDYFKU/Je1nMtzExm79vG6X/c1+4bdfCSx8ucT2ei/soj7h3ysg4ZquD+T7DQNXt93lxc4JLP1R6ZAW9UMQdlBD1/zG+XjE3hNa+OBzEN89c5dMnxBpeJeIa6mnvnQnltCi8olB9ND4Yzlx9gEw76MX/88Ql8DtT1fnykRP1oAwVyPkY0wuFwvfdTdSlju9d0rLduk+8r467ByKcCZLgMG1HXg53WjBEOijdAijdOlf0FiS49GfCos3GmTQ+hjdWIvHeXwo760bCKyciO2cLyGdXvtyICPU67T5O4cTA1g1S+dFrt8uMo2amvtyKhGYzg6W1RlGLhDPoBRWVtUwMgIze/uMe+t/bBOBO8zE2hdYofjXGci+7zoRDJocBH0HnZ4xoHfJBOgPJtLuyg14uVyXhIu0VxinwzQw3pTeV8UF5tJmz8GciCeBa3+SlHaf3TwCkm+tCH3Hn3SnWrjMsoB96u4T+UnV3wwC0+4QrWN08Wkt22pqzg8ybJKqznTx6FwUlvq7yNVAmK6Xo9qorJ/O6fa7/6jZTDZNbg3xqbwaUUbb4f5oI8NGOP3NwHtHnCf5+OqUH3imPkWWAPTUqF9C1mGurcnnBWKD8+g5BNkgphJd80Kr0My2sVlp9SQkjpUt7hGb900fU6wjDjaNpUCKL/4wsLMclKCKN5dBUS/vguEhmYYdK5WQja4jFtkUltMnybs4TC0zk2jC5Z5aqZo7P4epeWJejsVq5xDBpNlFORgSOOysoWvCwn3PWAKNH21meqQiOAfHuuT9jFu+nD24TZUAxab3NTePXNP4J59xmteabUq6lZhMO3EFi7r5YFtLlHgoPH12SdLXUf+J70OV7Z+D4Ey5XRQR+SeQbFrmPLDde8whL4+kpTCg8RxRGaOgZqYFJbpClE4lZvY3I2dqypZ85K3vBqIbuuNwvhoRvcB33NLud7TmVRfQtmJRMliQbKlsOVwPdyP59DR9dyleUhY5obrBDM9y9QaLDEt7/itJpW1nB0Tmr0F1nFfJsxhHWvf1C6M4sU5VxN7MasBD+ElmpRunNMNGpZunAHwLQP6jpsJzm5/UrzHlOjU2LiCKUVJVtGxO7gEM1KqVesWcWgKw8RuN4OZmij163zZ2rK1ZX1ZW2YLXgVaWxwkV9fqyv4WrpBO5cAz8zOdNOW87HsEzF7U39JJSlSKo7y2apMq76Gxs7ZuCjtfx+JVnX0K+OBN1+rmiaRgWwLzBm7QKrH/CWN/SlXPr1abHoiBQh/TWwVRPyB4rPXVsbl9S1ukaU7xqcJVJSi9TQfWt2yJJciQGe2q/KgUqFOpgJ14NpiEVpVb99hsMlLNkKZ9GWF6Fpp9hWY10SlMKrxLo0IM4O9SoUZq35Ur4XQ+9ZNMtHBnMpC56RieAttECj2YKsFPgpCdaaDCSP5r2MOmtu9LmQaDNGx+28eEBzg2SuBbRvG7lNrrcN8VfvhOxw5kaTYsY/Ggr8buQzl3UGbdhZpQ3enACYCU5XRVWbaiSt/9g5KboFhM+V0mwEo7aG2+tIPcZI28oCBNaloUUI4ebA0zDz625fSST/kBQGCnFu55buwkHsWPtMQV+DnRo6+8lzkGcnGkPRLkR1PvXShvo3hzBPe0fifitZwgPBQ7vo/Orv9ma7xSPjL77NHKtkNyx8cQ4oAC5UvklTmPjcsMRCWFxuKo3SqEnISP9fda/Cc3prBq4Oj5WTk20U0X/CrZ1PQZho+b6HNuJTs0lbsLxEbI0W6HpnQYBw8y84Y0KJR/nlHudtBQ8FMfqaGVCuoSDlJyUNhP4DH8iNNQl9+BARPNuFaQN5RWq7iBuMCeU40MyFjgeOaEjHjlxLr30XpbTZbDv8iJNVAanlZ36DV2dNyvcuGWfh5pyXcVl8tyyGp5Yr+JMXEG/r0FjCtJw8TCgwy/aFSmc5GJ51kPJvJ2OpiMKwhHZEkXQl0cWCCrhXU4t7FuOkUMbwrYWnoKUQC49aGbnP/EitadSUuHmCj7Q41SafioeaWxXIHkkCpsVQg8AfS/+OerIjA+fzRtzKUXavzlOtTFDgOT26zdBL0c+CUccebnI7jLa5Naze2UoRNzKaKdG6a7oEVVc3lCU62QHUOGtuGJe2mwbbgYX99EuoNfWfyuoB3YdJvvcrDdi9qPL/bjgaRo/35P/UrrbXiLBykWc4cM6K/M7uwHxi+4qahHcOAxHgcMOK14+BerHVADaCvH0Pe3DRAPXC1pMEv++Z1WYZwonsirngbBK10MSYe4tJcZS+a8tnBtMysFLWamqLQVBbPJ0+8x1IYpsrKn6KNmz5GBjofyCV0ZmQ1l7DGK5XckWrYMvE+PW+NXUCmEepnEVY8aci+jf+Zp8cyXus14i+8zFnjxSRikXZBsSC+BtZljo1glSGHxsRBI5yVhkbsfEnOEufFSoenYnawUgXBXQD8upEKhA9mZTXSISc6JY8eINQ/yB62oJaDBOU9EPzXkEobhAhmQeCNEKcpGW4HmgbsGzs4YuUylZMChBaVuALm16ppHFCkfj40yeb6kWQ+z/umzPir9+lLb3d+k+dCDDGfo0red6kZXZH0XKY8lMt/tb5sX/Akx3poK8KxbYLSsJnDV8gbx7vHCORCzv1xPuBFVGBd0WAdDahEwY5aEkqNjz6w7dqf4L2QWJXwgH+VCq9Tz1w3KuLBsP/pl3Ev1h6Sfav5/oFNaR7y9vpRrKZdS7htT4I99oZNEcqctcec7f96zWPiRAD2KKh/DLzF9IrAGUWMrNHUpmySm+QDp/MR4LAQPcyn5i4jvG16PpHdN8dyri3Yz+EbU5Bg3YSzl7MHSaC8eLh+M1reUmCQe4sNqlpLPqCkbUZDb8TTZZjTyJhbqM0qZPavRb+thQ/+0o76qoziZIPLlsQ4xZmEs8m2yujDTKlLuxzPdW1rLs+pezCTYdYySXdr87zdIrX7jGxd26FpxI0D8mOSglOuiR/uXJ2f71b8/1bhU+0HM/ncQXI6vLO2886I+8AobDDRBgh3Kw7/91tUHMjJIP8+kvB5cc/iF0AYp23GwhBZrX2UoCcT1Ag5wghhX3TNqUhB2g62PqMq4kn/2rk2APH6prHHWXGhzjJFkyHye2koTqLFZrBUhPVGG1NLWhbkU8qX0r4LgeunHxAIOB2oWHmFdzX/tCtyKB/kJ+h/lmSgBaJsOg804PrkqnohLph4cdB1U0QMKnt0ryzTIivLfapS1kC+K8UgDHO5fEKeWy9UEoPT0R3tVfm9bNFlIZDdkfIqr9d9w67h8FpIlJMpVtUNQXJbTFT8mWZSAVS7oL/AAPfuaBmujvymnrlHl5MztFcayphk5cQisKHYHLuCM3xkAfpIBVViL/3kCSIJIXHL5nVdSiV8swFNcWrzs42Lv+VGHk1bPLHTwJfczjAr/cUuVe2TcZ61VA08e2VPRig7sqvSwy0PjM0dQqHnjyD53N9FqwX31qlIrHHpbFXl6c5A8/8XqU+dAj0CfT9jt+bpBRyea16+ub+h8mW4eWP24fnn+4A9DuRx9mwutnN90/SSoLU6AzJx+8v0S+Dp1XsD1/QDT5TQJu4Ma3d0+1EbMYkG2bTRk6J5sfo5w2lgIuKXSjzKn0h55vh00mlf4nXY1+iEbCo30HkGuXmmnaZPZEO0xdSp5Ttark10imWtMr0CHAzJMi/WfBjHoPAyCy7UiWo1nF4Jortwr2lzDPjThEq9C+ZfBy+tKMvtiLOogSr4ud6qiY3Wfa3VT43Q0lL2BejlRXrTGR1el3YCXmU29YNEbaqRY6munV9svG3n8INp6gpbj/s/bc//lx3o29LHSPXq4Mh6NYgmns8ea5qb0cOh1da016TdcNdbbx2pDjSoaspK7fIpXOsD4CteZud9t1eanQ0ZalGt+Gf4L5rHi/BMctnPvIANDp2Axf8xZd/mMwS0DHbKD612GyBLvSCvR/n7RDwI1bz9Y+znGLb7QUnGWx2n4EkyMMCFs0O+5QT4ATzIsEpZSGpFg5vgoyA9Tz2bVebEsYs8BGV+7LDk+uWKU5iepEfPJ/yMR2uqT1UU9ULg1FEhvnJ6dHOlFhZKUDT9+s9+m844HolBEfCWmznikKxsKK9FeU0MG3xWAZmLCaZ7PYq5hO6wPz87JGv4lqgGgtypSvzQpHO4eMOnC7qwqeilz9losFNhXkBv4JA715QAGqYpsc8pXVvdnSPF4Ra+Er2iCnMi9SlN31bG6nH0gd54b4oy3s6iCLR5T9DpsmY+ne3Sq5pNYiMTph3hBQmzCXKS+Ng9Y12/ijofV2XI1CQbfwdiFBPEOICGHzwyf+ASuTAMCPcTxXeBYUByWHuD0utm4qFYxhGfYROabtUjSregCDnU66lMr5O0aHypiCH/T6/8gOBj3QIw+7MLRLt0rBSPMLl1JGZ9JXYkxn3hd4cuLaKLsxlOK6akgPXefERrJsr4NNSkk7fiP6FMMHc3vdh2eBVHg1txvlOKEQquB2L5YWqYIC64+JEYD7/NTsWli7qP828RrX5/HmgB9nqZSId9oteHX4llQ9WZi/I+kLVl+OA3kAUsWiz8jZLYGRwfYIgYzVnQpTp1qqGA3Yra3TDVnWmtMGfJISXqT3hrX4iVWTlsxOVQcWYCCLgCI803QAsvtknGabmux9pPRSE7fRCgOo+h4dlrKVoiyIDuaLex4XtpAWxX6PQg8dxjR6UIo/w2Zi0shixReDCq7/S7Ibq/1pt7QTrH3iI82sLNYAYOQ2S3qWMml29QvgV0q5zCVnbmGF0Ul1lYkCQUfdfeCJ07t/vniIdnFw70cNA3SY14qmbFgwZQ+VMKyAMFG1fkFadsr7GQNXxKH9bnF6IqiHTQmq9HkfLsw82/KSSiy7NP7wY4UWCzF4VL2m55y5lFxIHLSTRcM5+KnMIVfeTBHJGrmmusspmoXLToHcyysrCDcbUTep+ItWpY/nyrrzSRudw3gS3KWZIqoCNr/xs6TS4VwnSZiRso+wRXh5oHcZGqaYmf6RWzvbZZ0lLUepv7ZZRgLEjhlvRvcOg9vkk2N6LrtUZP2tRKAa4+Om5HiuUexXxKKw74ndWNfJKDHB7UhCCyIbyNQB/wZkVNV/iAo5QTni+5R2lyzqLFH49qGe7F4SZbAST0JgL0N+oumQo3FspDVfwnNmH0KFVBPiu9ws6S2i1KAN4tw2a3CoR9ba7Fu0X7heaqvb8bipfo2cbGTguwHek9Fw7W/y73EnZPUlut7VBH59lBDRORfKq2Yk1gSm+CBzUYY2bNfz7Q3yo/85ndQMxl+dr1/pWR3+dzwh3m76Mjbh3dYxc57B37b8LBo31zukj2sLH/CBfqDi33wcPuvmTpjPC4AA78QipXn4SuGTqLt0Q0fdkbnrkoeXrk8K/TwEJEf3qac/8juqWGNFIxLhXI6b8tuD7Nw85a7hVCsFD0qrKWALZDgXCMKbZ+amKYSZC+p/AxH6ydX+U3D56J5+0TzhpYRP+NtAV5UgObQYNHfiWLBtfb9FUSixLAF1m1kizPU/DJGFCAuzK52kwPnAZTJsVQb7Ss3vn2zh9t/9sNkptcr1PF82bjMx7uU+tc/+qfsblzr/aEvQ89+kmwd3ddlu7H4No/6W8EfmdZrPlN+/QDrCE9Abq6bVRZeVkysgqTvQ6lnDVaSWiFpc9cmF0vcvDhwgOl5GHTcaVXwpbzVV/jBNx70GOZloRutUG47+2wiHKPy7MvE4j4FQvuiYJVR6f2xUpKryg6ugFBqYcLfURmoD8/QPCBM7P4DMRaI4k+yeGGoUw08v88rosAomFOQFnx3Qc0zHksArHnmKlKn1P6T2Wsm4zDL1bzCHzhTHizZMayU2MIkMvi6f8NnWQlMkSvychvJpV2DHk4lYDeg7QT17EuWe8wTmzql8TaUIxhSOR898B9gO6uKjqijz3zQrGbq8fScdjorgOf0S5UVZNugETBtUFvVWt7eyh3feoFoFOjwvPVw2LnKrCkIGPwdUAriYxMW0gQ5Tr4MDhIjflSyu/Aisy8kR9tjMz5qejn1ZOX85+ayWQlipXGLHsnYB5FIWbzNmKF8YxiiVOzqGJYW8pmaLw+BjsyXBBVshM0wOjeDi+yT5cS5OW89/25+AtfQBcKNz955HLaQvQm7hlcojbAZ6Zpnm8aGICwztErGhbszKBWPdKpbxGKdnTBWi7kldME6ooVSeRiDlxZKqdll21KCbGmqJS+kAlFLjKW4q4VFomYivvKILj+YFxiFSty8aEIWw/UmOZExtyjrZ2BafUHJACP3jwZD0lXBawkr29omw42kFIQSa7/4em91l5oOZMwus1faxe48v7SFaQ3bdK8kwotDKU+Z4eVAr/rc4in2gbk7FT98wsXY4WLK1xO1D7tUD7Xfu0Jk/sT/Ptsl+RJ9SHaJuT3xwOe6vsWBcAjabYjQggvggmODoymUuk3HTP0ofsDA86c1b5gMdbKf1OTXR/4ZtyoS8QyrDpi2AVlURcxkcOaw6IKnF5L5Ftzm+8SAdC8YOf6eAcNmXvvzBn1jr/XdhjWg/AyglX4WuAHfLGx9t2H1azMYYjltTGrgyXlwlNtuZr1vdwflLSV0WuIn5LGl1wXtHhS/oCz2SXpG6duROHeJ35F4cQl0Qzorf15+j545fXBlOChl5HgQDXn4uSl7NzD3UHZsANvTZ58GQNvxQdYn5BYCWSW/KdY4FgtI/O9LniZ6Fbh8f+tfkjeP1yAcRTpJZjmRoF7z7q6OVhA8t937KTu+7g7Nt4QIxRh/vDm9rb+G2jx/jEMNsn16dQzfvaWh5MmUNy0+qrfFJkldY8vFrjPYdrLWDShuqeRYiDhzsUnbYs+lJelEN14h+t2kuL5yvxp26vEeO+xqG/VY4vxvJch460/tcjlzm7rZcl7afcdZDqgdBwo4o42ALNXe6/bSz8/U/TI4gxTSsGvLOS7IztqB99Sovw45K5DBHglGW9gdj+mnDbAYCkSuFprOu46XevHn+5yNZJMvpCpS0MzCq6xDl34ADPHBSsQmhLjuI6VD8dj/6EXma3sl/4JUG3gzTe302XbiroFT3AycY+zON4fDkXKN65srUJeY4qLl2/TYC+hYZvJtGl6Agrs/SAd0uC7veBrqB1VYIZEcwX4w6AVSGCiI2Gbq66XPzG/2zXxPzlv3Hv1+huMjf1lvi6Jw/caoZpxVps9M8ny/vg3qQW6oRrG/pmH4Uttmkf7YNUb9zCzHMWrHEuhugxDVmHO47c1PLMMdtXZPX76fWjRXcubDmbgYVvcqEDjIqbJZlAIdwvRe1jJeEVqurwY8jPSeeDvibZRPChu9TlfE82DEaWkEV4XyCEV9016P3o1KUg8afN+t0eB8+BXQAXvxyI2Xsr4FBzc9U5xIe8i8/8PT12Moflw7OcEDlBYDxkdYzypuhjeWk7Jz6PTL+pBiU//aoCItOSeJkgbaDiufl7Hh9+7buGx1T3qVQjkag7Ne0IzD6sIjow6g65QTMtdBZ9j3FjYsTsLJhTFhdxXfzQQaB1D/geI4DRVi3iCDEgMEUh+6lJ/1G9V4fjtUtJoGD+xc6cOBX5XDm4qibto1swaS4AOZTWLWMJBE9X7L5/ZDKb9ItYES9uFYVFnpbgNI28YQrmrmaH7k2lRtRvBAeW0/hOp+FjmjoNWvLikqpRjF8akeEnNF9vczEBEaXbkNhSw/8ZLvfXTJzJJZXxL6jfwUJZKAtk48s2O6ZZZ8mxHFGwwTAJbqvxjHjhCI9/3+N3ttLkGwqZDQynhBh9sXBC6H92PTOTzlqcjR+n285mqI12hWLbwdc9qs9JhCWmlvZMVlF4uYZjx3U5m/yZ+iWjZm1EpZ3CSnU93pc62TF2lW3PgO0aPqI1aHl5jkbpFPNTgroKNOvMSvPFmeuUZWh6RMqpIxmQajmACOsaViGlRMJComgWNCKc2qV2X07gJ9Dvw/6Brv8btmbY9AmGIvtx9+9CgqlNrQMMFuu4Q+gJgPlfIhj584OE+hzu/KFLID1ApAvKMS+WUYtmWevrlvArOrEEivMNIdt/wLMtvrePzV7qWnU/qupd1OCuKGLSy2QbEToQYN/mAIEkhPcejEAdYSAhtKj+UmRszPPdyk6yAUwx22Bfek6BgiGGu7e+n5cg6MFSJynB55C7nE8c25E7lvDlh0YfP6gpFCEmWNMFM6EomNCtp65121SRAVmZ6Z3Wyns2Y8FmKUftDvxRWUYcFXsu6EohvWxbhdnq3ZxOTn6k2+veE8bhg8A5hFE3t/2XxFuDShqKlfI9VShWa8KPo7lfUJFopUTYcpzyuYDn2f8ksPJp51yEWxPPE1Al8R7suvOX3NlfZg0+keWRgk/JYQood23EWSVXu/mkMRSwjPH6BZqhBVCjueSx+uFU/yPlDfB/Pm6kT3eqEhKp3joCi5gWxPO+5vlN0JWOJbxoGzXeCg5ffWsS4cBkb0CxfdSWzPPTE/vklDI6nU7BgwXFupTSFhYAsKxgXKqshlxyU2yagXiZyN2lThrNM8NRDbdiH9JmdyXZMITLMTGDPS1mSgSQ/JiKSfLVjagH515Dp1bVz+6poOqDroSu/GMLYB/XTgOi5fmwr/GgcYugSbSl1Z6wb0AqaCWqjwUNewTfQlwdW7McyAkmR9+sll9NegvqIHekfo08nBG+MwAXrn8qE3AW3rLCiSky/A+ULarVCdMfHXih2uPegLYjHoC1hzCYQB6him7aoT0CI/LNhDWX1MoZpdntUFKhfsg+wJ+3vNPsmeqJdIZ7/LNi+ioTt9cdp4PsjmGT+wRc+CVjuyuPAE2u3CFo9AHC0WzUGsC96BTqhjs5IEW0nCV+xGD5A6AR9v5nDqdeoT1m2CmSp7lAyukjBujbwC6g20qMJxnZO3o2KM5ncDYhd6J5cs7UQnZhjF4ZhnOCUtwdYSsoz1K7t4naQBbUqhjFbVhHalG39KGtCm5MmcGn8zw3WJGIpExPEcv4U3yhbms9KwAFm9wKJZCsCPQt4vJKCL5AqyzEvYGe2F8yFKy6CmgsJLmayrXdpW1rokINvJgvddOITbe95n4739iAODX/lD9kKwJ/Y+kNt6TksXkYv64cJeqC+lGqVuy5uSb1+Zou2N2eResz+8lFEk8wWhNfS/e9ZrNcLfE4LWWqitHqL4InRuDlAw6ImsJh0x0WCSL0JqP3rUMq3ayLNlcvTwRfw4KFp5Z1EGXjPbfavKNsC7+mEd5v0hq7l/NPiwvVA3Liqr6gCTiyc8an3Aswc6AiP7cqP3ZiXG1edj6NvFbqv7wldny/dqev4Yi7tRtb4sab1z3ide1bQ5U4+PLIFGKWYWPhB0f6e6iOf0EjTXXM87bT2gbLp+SjGY31HDEyfIA6NqkKM21Gy0ZvP2beVqoDM4LcCKFcCO9DrbKppwrZ9e3AXUmih0eA5c0g9DscnIK6645phhGd04u4f/3Oc4h4cy4XABsPwT5sKrMTiyX9zToPyHAjHEEfXArqBI42iOWDM8DZwPYvW2g1cCrhGI27DHDMhYN+TItROq/6wF/EqiLa5NluCDHWj9F4ET9Vv6h424XSBeYu1FdHCPaQKRFgp0i+AKFGt41mnT2FjFG85g3oE7ahTUUpGNMnO2IJgKcCOigtNxPO/kySVmd9EDOG04bnEJbDsLPb0sWi/xwBeU78/SjVlJMHGCPjcXN0+zi11Yy8bf0Q+XQHEj+e4YkbO9cAXKi1DHBbWw8Wsz5PO9oq1hrcAavLO5PC/6AuastzkoD/pg9QHkvRKBJjeVAdEL6Ylq8BnQgM3Am3VTshaX94ED6COr7O2Chn+DQRcsGqlxy12ADBWHqrXI7IfdFJ2/EpDZgc+9mxTLQzemTvTtxNbUtmBerCDKlQ4NAq3V9FGGAu8pqeJXyllKCeUq/8gJckr+i4fqBPMR1h7tKrVEzkXX3YOrZHNyyRCKZgCTOjGGU7Eke2uswdPdk6HK9WZuEQ4HzcS6FpkhbCa4zjGG5+k+iOFmxejpHtlkZS93dStoBtnp7OCpuw6JFoNB0gz2x0q2RXq+05XDBmdbl4V+Fp5sX2jk7Hl3UtfE6IdFPLzs95uEL1lDPcG3LxQGMLyz31XsQ2zU9V7CHMtd0hG9L4/lIWQeTQZAebfeeZbVnixcWXvwqBKebJXV9iyFXJrvAZ6WVb5Mku1wkDu45zIfG9W9/TzYFXgeumPn2cCb0AwkUjv/8NmXf1gJnnRmGdfW5VzpQYRM5FvVUkAYFDGMfdyC6gYKFRJ1TKBxkNrmcvXGod+DCvnuzXlbjFooPg2/GZZbyv8ati1rXNKtYoW3s6SV0rXCKX1Ti3XUszzBbYNeLe2OxEDS7jBaHv52UtQMgn3CBTI0ySLi8whRG4VsCNTwcUfynNl8lmhz9YvRfXa3Psddr4hbYebL1dk1AB0YSj4Zccg26eVBNCiE9RdKsh7GYkvMPiSbviEwBDU9I3LrXVeCpg/hFkRaDhn6fJKkcseYnxJeRZom82vX+6scTNyjRCZJWzpzkIvxKaZF7zHkYizu868bcRxxmHtM3YT4PWZcFJO11YLO/qIhKAfbO1Z1XxsYSX3ttMRc1y4Sat8/YsMCg+v9K4VT1HehLq81WEWTmUoNHsXqkzlNMRZAk70UPbdpz0mLs120/cIR66sI0II+uMvS4PDwCzomVBoVXHzIET6GfpZQbbKaUJ38uDUVLuDcoRRYFrYgFenV8W03jIzlSSq00pu0CisycxpCsB6b6TzX9IGJKrQ/L2/OY3i5+CBVRqVqqR5xILDTRJ6NUCGVhBxiBMAcxztuP8bAcbYrHheIbOlLFKLkjN9HykVn9l6b8aF9l/a4Mvydxq2DbJt5DcqSkVEX8gEyU3Ck2DDHsjQr9S2qPISG7KMNZSRK9HFImVBy4kv6O47yKVIJ8+k5SerQCdP8GwomCuLDuNI7j7WRYX8IuFrwqFDS37t9wcddrVo2/wy7Ya26tvg5Lz3DrtmNcW2RuMuPRnBDhRvRUFHpwRTmOIK3K4Z0rc1+xxLduRvjwsBsm3r2muVBTip3nTi3cmP7oQ2VVCJbeHUgYHDUSqsKP/tI6M5b/j2Mg2XJBAGZpFHRf8yCiwGv/WZsJVtlKeU/Dk2IoKvR2JcSu5OHa/xp2QYj5jeoHre0xOfJxBCM8Rp3LeiJmklCcCxcaFiy2pZCDFZWwUhgtqOri+G6aG9oB0i/t/wM9SbXWXHnMn/ffLLgcOky7DDsB8bP4dF8/BdveOA8FVH7yjcLX5wxM2R7NkdKAPxJEffmLRTM6uTPyS1EhN1g5W0aVHLqOROxT5k70APa2Au5Lx7qOAq9PuzhQFMiyxSEYzqJmKapNwwnukpoj4F9HHq9INlYjALGWWmhnZ71kel3MrsRujcKTnIgOB7M3xEozsogKTGJAkBruCYrSRtsnzCKgmwCzfbDSpqtjkGX+QyKE6mDmAORZcxk8KZav45CaY71APGYL5otIw2FNZY8EAYt2F4JC+Foycf361eKb1MqgMnQuF0jl0aUUV5R0SLi1B8CHHuB8Rj+BIL1ibkITtScp/n+HnOdkNkPJjEVLhQnt2xenLTVqqPDWUbARkPV8LjyWX0EOR4+cG5wc/7nGzb5ya6j7dPGBRH7n/VAi1Izfp/mF5zWH40J8pMcppFhjSMJ+Xu5W/VIoVmv/uuXzUkmC0WXGnMlekCaXhDKSCxW8uoToxGksGSXbUW6fHQ6xGadZUP/aPkJbFhMXin9Y2a89TyPSEBcSUZBN/T6Vofw/GQW/jQHHTDPVDbtkQR/4CD51/HT3EgC6+I19nviUNm8gUYrREmyZ9r/KP/KjvrVKckTzc27JtOVz5cHyMdvK/KSv6xpo03+/y39Mg+ieumYv/xfNq2s7uu30a/UQj+oMi+JlO63WKUbdx3XnjkeJBVCobqY6eWUEGY/jhMaH100e1sA7QdxWshrgMbZT0JH2/ufsXP5MqQ5xqEWGDNMiTJtML9W+1V2Av4v7ZKTfFwYIrmn/MIetkuZ4Td8e3slKO+PosQb97y6S+2XNMvZN+RnK8lARxTUc9axGew6btxgWUHx4VWGUyNaSYOBvqwN/lL2koBQBYt2IuL5GTe7OV4vBp/f59yitvnOL2818Q109rWNhTT/1kPkuVPMCDCeLzb/MD8XoWnlZAbon6ZpRCbaI7NWzRp65QYyVfUiFlo4tUuYO2GDTuwJkXvqgEQ12jXPXHgBXu/PCnZwcG60qaDM8uEE/vEEAVrm4MQ2b8z4xPU5/6ivVrpraqqvtGW0dkLt5GV+gtV+FxOmPxbfTy+AQiXTvmLhyhN9XLi39od+nW4RiGzxu27y06qttVEb70Lbqg+FZd51aeSGBi+d83B6ZJbs60fu8M4v6nZQosCXqt/PS7dkPH/U8dsM3/3VTJbD9iiUdyOXk3cUSLB0qRqPbs2Nz0QnUXPpwK6mIPny6+LSdxVdAduqhI/WMb98IztSYg0Z7yU1VrVqf8JZ+tyeunSOwDCsTIr9u7emT4iH74SClQzz6FaRqXNV55fOhtF+X51M3m3nBnx5xHWNonYwrv2G33n7/ZErMT3G2nmzVJd2Fnp4X3jv3SLW7CFZmpljxszjPeE9Fig5qlT2eK/9ZhlDVWiZJPsBy5ojYo+js2Fn0g+mW5Ufi2mKTG1++/5Bw7wZL4wa7SXFPxLvnRJ8viaKadtYCwK5En9llkXtmJ+z5LgI+NkZ5xNz1reksArmH72t86ohUXqIEr39SNsgRkmJxZ8ZmRfeX9eZ/PSuefdvE7o77AuOPmnZ/3luC8fDiOi8+gAhzQezDJN0xcfKwXIJx7d6i3tceC1n3FU+tBvp5R2FvZYUmcnJ3dtXLyIXLuz5t4faCWy8Ck7F5S9XPy+31uGvV/W4XuDQ1h9pxzmZpPBNYfVfwFPrKHe2LG+6Xryo6QUefvzcf+DunVZOVCG82+W0mSGeDCE/EsGsQLKIz2lU5yFkPzk+xhrsjuurF8UHGVCbTIb6xAMYz0Zj0Dh+tXf4AVjjFxUsKJp10/g8QtruA0Ek+s7lF/1B2CbQYUullfCz6ZwsfjmbClDd+V3DkxwIX5e1rb7lC2v9ptIxV8aRkFovyeMsJvuXKO5i/fX7Ooqj0Ze06l7vr3KCX3H9eLWUHbPNx3pEnx2+vdm15FT7t0rwqcg6D39fnQAGkwm7JxzoJ6Zz+D70qJ5KsrfGb/1vV3U5bcpU+5p1D679dIce+ca+59Pnb/3Pw3zWzGSf7OcMmgniWn+TyQDfNNzfdJ9f7NBPBub/0x3G/1488NAV/Cg4g+ib01r4g7z/9UibUgTHfv4GGI9elskXb10oO9LR9pJQxrwWzPuOtkXDwBUPTBFuV5QeX5PljI+bhx9GOvvc92oBb94t60z01OoXmNkP2+hATbWGKjCRTGx+iib5ZDPoI/rRxweU7z5KO+F7MBaWLtfTWn/apt4938pfR8644aW2FsT5nL0/2f72IdsWzYXhzIuZLKuU54PobxCmv7voA4DbSX/IsezcDUQp+3BLdp296rzl+bV+2gH8cuAklF2SQ3dSzi+RcefONQBITzPz51u3PAHyI4im/GHdUcPs/HGdBvT16hgCqk0tZsBN15glrNzHMX8w+oJDB6T/oIEpYkZgbtMGZB7T6dFvSAoMBbbBymMoYi7L5rc60BLPP1XRqgyoDwPGP6cHgFOtqda4A/ILekfg04EdEvhyVPwdDfe5+v/SGTNgU4tNuwgenB07cbVR0URYGBjFsBlhcuXrSWEZkU4RW2vRgQkZcG/IK7DBJpZs4vce5EnWrmPiivxxx9cVCF4RlOF4RhSGm49LQA0zUCKzDl40vBURVjE4i2AoABIpM2kVnF+2cLWkUsFYGWCnyjCQg5DTUbCdCGMiU0+2B0GFYAmbMoAOkOCUaxhqpwNhzM5mgPwEY8IGhhuTCshjQZYrAAFuTMpCGnusw0+kDTGAzcBkJz7nSGavhC/VhfEXto0AccQpHar9QYx/sJyIhwlTEnoHnxDjCxZGPKzwnpXes7wgxh6LjPDIOCPUuDwixr/oQXhU/AqlY+J7WHwHWfk7h0KMV8hGPA44Z6WPCAyLCXkgiuIXQurhUQyscYx9TSgDLlmp8DKDxYKmIpQFfyFUmnwhxjs0QigbPpPQXp1HjB+xD4lyg98QqsD/iHGBfUAcBP9BqNqwZ6NgHzfYK+FQI1t8gIFewGfE+A37UXAYObvSqw8Oxgt6JbzGEcuQeK1HLFfEazdiGdC9GiFC7vd/E3+u6NPLiMPp9WeOu+9c/sbm44nN7XGu7u3569sTfo1yTL7GseGLlxsclYZcJhyZHtJm5M8Dv3v1gj+VVmnT4g+09Oo3fmfOvHrErqK7tKnxdOQ3rzZ4ShTkKuFJKUD1hHHF39RlGBc21+ucdXHbheV92mQRpGpzDQXFkcIhoqdhVkBEyTSjKOS4Om4DTmkOCxRZqEkGikj4GuNI2dFgt1Coxw/Tjq4WaQtFrwEFcGzHBkbQZjL0JpBRowNpu+ZeCyjyiPpEgVTzO/Oe8LWnpRkd+n7vUEdzsU6osB72vhWUFIyQM0pqJ+TpQa/g6LEtjgLlZr1AHIc9O2zCM+wWOojVTh2CII9onsijRoewhaq6Kda1ixxIoFdwb2GTRIegRfFjaicURbCDoiVOY1JCwCJBicBMEaTBDo5incB6spRTOm+hUE8rMEgL+rEojmQiLBIUjeCJCLUDVmcdVrAUimxoLp0TVk2D9PHW42FMYRPIwOYgCrmCQxED6vtkKGlFZgx/SqwatVBjCRFGKLrLGfCRcmnhiyMh5WY7QsURLe1Bss0MLiSTNxlIEtf2xGpTol/cRVMERej/nGYJzSCh8AXs/abogdYMiuLI8abZ7xw5BAERHuUKnhSMcEjQmiH4xdHg9r4AFGgxt0AtI7xtIIYzVxmBF+yJiX4tkiDfwUneImkjEq5i4JSOAvnzRaj5mRV1XYddGY5wfGakknMDbhrBgWbZUUwsziPkZk0lj1xYh0IW+TyXJ3XOQQ7z1QK7He9ylPSFZgnHycU0D9Lxpng4lb6H6Yg8O7BxR5qOLohr7HXl7I7XqvcPbQSyfyRnMvGOExYoUy3khdgR47qanbA2W0Lv2XJw9GaC+Jfx4RsHuqC+/Y/xffw4xu5NKSkT8DvoZjn2KFrZmr5gl5Q4y5lA+nrPeCcRWpZnfwzA/khLAdHCxytiOEQkj1DVPwvqhb5vkeIZ7HjQnoeOaRIK28Wv9nwp2MgzsIcqz8oCOL727By4ez3Z0QAl5/NLuGm0CEcUrBquMEEh1WKxCGcj3E3kNrVIH6mObp7u3inVG7kNzzgPFzhus8oheB0VhnyOQyji7Te4dAVFy70hgZsJGf9eJrLQUQBFpPjldJ80vh5P+nRIYw6SDeQXXZWP2g2jx3eLzIoaWEj/WKCprt+DjxKqZshiLNK8k1HRB7B+ngZFU+NvcCKIHAU14fHtbKhpE+zf30RYIGcUI2IOhczCJsRaaHdWSP6lvtYdElg1DszEySDV4npI77SgH7xIV93QTUlBpF+kPZbcHERPvIijIw11PDqRg+CDHzEKguAVgoN6E482PlRV/57FwzQhcSHwo1MD+9+FIKG9gbWG3PseCjgSmKEnB+7cDCjqH4uZUwco4m+K+bWPBbBAIRIIy0dkoqoVqEolYPUJ2gCfcdDO9V4AfAecpX1II9oLD2NSYdJawCvbNFI0zoM+gy21lcwiFSBLBwYLOtJkTMlrB7RQqCOZqJx5mXTcs0BbqIYhK6wXFUccmiCKl4UvJCJ7WbinYu6lxRKH5hCr9yl6Lyse0qGfSVx71+Ienp4faUVni+yoEadhLDjkZPRM4bSnSDloYwEk68kQJWsL0msA9jz2t6pFSgwHM0sfQKQfOTkNk96zQ+Sfa6egRwedFQA/ZzBnRb5wRnHvRxdHgXIG2AEFAEGUwe+RtNT/nqQwxw5YmwA0iUGBDgpcABFzwB4qgmEngJEtzSkPGW3CnxCxw7A+BVhRA8sLNacDm4fsrytQJIspb2r3/7MVh0hTFtOkerasaH2l+WnluGgCpWYLPqRb1Twwj3RvRgervizT7mwRrA7iDLNVM6Lprug1HhxsV7AXNHc+uToZVVV8NdNIgsROQoS9sU7vI51cxHvaRWvhh/8eJQYrCwvqwJwEBk4H5kjgYyUzIlDQ+TgIHYZBQRRt3ogrnnndF7LE40nDuA1Q1LNBHN1FsCOj4wRFdIdqHvUf0dUYUNSx6pumBFTefsbKPL6mHs0D2DlojDQTYMW5RAZu+ztzvBHt8rgN0aeEgLgW4EjQ6ANc1KDS8kTvTjIUmOujhNHVUY1ney+I048aBvxQ9sRwqabu0lRCen4k6gXTDehBRwlkIyf4XCREU+FG44xYMbaDEAhCfO2LUWeryKvhKhTCgC/hnY6t46BciUxD4FclqcJ5vFxTjM+mUIjk40ljs5V5xfNd0u563fbKSKSFghkLmphLH2/y9zvx1tO9DV2QuvuMi712V8P0YTEzJGbswOrAW6iJ0xHDUUKcE3QauEy6WFQzzRRtcXsEodXlWWa9PeJmUIEznJp51+k2HsQPDXm02+cwDgbBQON4msXqLqyQIeUkUJUNcYp1UegPZI2DRdzbxemgxUh7Az8gs78wBKxNfA1HYcDeHz+VvoCWGnPiHydE7X3ywo9XFxrAFC5+GjFpTi/SXx1JwHLqQCd2M4K1nzoLf2ys4uR2XzcD4vXrZgAegHExDi5cAR2HroplkuxzRFTUOEAcvE0VE3rR9M6kRLzu3WHAabEuk2Vysp8NCxQFu7uyE7RPkY4XEBj1REdP4lgLEiQdlPrReZlHpM1rQ8QRFvnEg4rjK3nLgaOEaqWms0O+54w7SsD/vXT4y83wcjWlizQzlaaHFvnrAlaHjKPLhuh6Bdo2pxFVK7NhXEa013YWyURlROW5QVQmS4Vng5ck0mmAsf9dXIIpDtTNxNnIA65PgY2MPjJBzlTwyckAY9XVxRhgA2rrxs4m26maFIAx8iNq1DYeDvsO8xMbQHAgHrsAZItZdkLs50qe0anCwjs5gwJ71Fj1Gq4aaPeCCSZ9moegIBUgSEcIxVYpu8hfgVmvj8FgpnYPuwxMwpkh/T81NPgU1RxSS9gyHL2P/KOenW9yqMIRqSeBhrN0h5HhpoJNHYWrijKAQt7GFj2MqrK7JWulXCu4R56LMuuB0oK2OrHhyNH0yPf6IRiO9qjqf9WvYyo+n1fAB21y4lPl6G5z3r377gt35KAhEjxf2Ur3PGu4NKNDulOFYztNcqVtNtxrsNGPUalzgxAT3ds4Hn/DtorjnCSEvQaNQJyyduwvvLWRSwVMi2uIFStqWgRyglh3giHETAEB58ZQsk//bmh3kWa7RLtwsuLFgvBuGqkt9jn1sNgzDaZophtxKxjUpOE5dRw/fOhab89HB8FYhC1PLQUHWvxX/cwb/TnqSUy7NjM+0uAWFG0e2erfEEjvi8rNcMzDBIMKXzCCNwHFeVycVzpLrm4Wi8WCgqWjMk9qCNH2M9ZroQqZgFWiA+x1XUYKF5HtkLi9BrC3UiiuJ8Hi3F7O3E5erqaxBQ8XRlkntq3iovBRJ2D7l5IANc4OF4IRDy94KzVHngGycFxhWdlD0JXEVnGgJUlOA7i2EBdUfsyR+ZEFVPZJoM3afgkio6UveKbatmRSxSuBgl8NfVPNjEh7LOE9E9TK7lynCzgMRPmqOChihvSQdiglTvxYdFkskG+8qkDsT3X1mscOIl2Q25a561WRjs/uXvsYTp2tQ0SqQXSDIgpXRpDzy96akb6Gzl1cz1wx0L4yYS62MOTZxjh+YmhnhVY6RzX9kOSJiZx/g3g/FeBAW4eznGetvposI6QlqXVtd07xeC2bDWelNSnIJYgaLmEho+9cRBuJK+3g6Lt/qTi7Dy7AB3nDrarRoeYdCZXIRgdywx2+QHSGudzEleHpAwk9/HpG9dS1a/rPKT6LA2r4akfeoggnVOGnOD2W75lQHbqe7hY7irRSM0UA1mr5DFuIO2JKOJCGy878+FErM2YdMYw5qpR5FrKIUAsrmJcRv5IDBBaNNpfYRb5Cpav6ClzXpLrQADRM2PNOoAFWywM0rlVyJN81B2J8rdmcmqAW/OO/pg8FHyatmkGgqMklJ9JSfxzSncBdtmPKcRlRcIKnOWLCoYRLhjq2oEc1SeAQHa5EDbJB50LlWroHsIB7wnmcAxZQ6mudhLZRGeijpzViI6ea565HylADcjzybEwR6LE9Eh9PuoMMoikSUxhIZHQwyYE5H/qYRbMgbRUSYvd5kanBhITZwNgukZULWw1gm4eKQNkKKOXGs8XKUejCN5Nf7Kn9R2PFtqIuoxJRTBhgQY7Vivb9nGA1NFWiuJiKXICghcCcZ+W77w0o4AIcoHpCGOuoIjPE54SRhIFBH4586m2xXdjNHSRHCIrnF7Bqd38DSfjrc31OA0WHWmcuw9fkoxyPQw6R/s8kTdL1vUEcV+bo0rMpCY9qKMCK55+3k1LzfU6bZGzA6iygNXsyHB1CI8KAIDLWDGJM6zCxlHTev9yVIQEBDvjYGctDNY8CaJx0oMaGHvLW9HGxXfcr5Htu783YB3NToCFVj1MZip+jxIwz1l1JkBFFscgN4HaKisHWJmijQrwfsjdBRu6S9f5CBXpt+5OSPWtPgRnpm+3RAKd0lM4QFWMS312OpOv/EYw2BFtzejWtKfmF11lbNzcDJ0wK217mKhyzDg3CDVaPiOvTCQSyziEhzaI726kD08aiiYgGaodM62TcpYRBteHyDCzQ/mF6+OnDlJGTgpAqdzMetdDCKhN2pgOEB9bAgCF1AngECp8ex/HuyoE+W4TTGFpvEe2hLpaUeaozrysha3uZ4uBnzE54VCMMTSOBIfAITGzoAikBbBbh7RQhoB7l8HlwlGN2Q5vvALnu1aPjAMx1R0enCJ7lfuZD4qwHKrTwRZH6IF40xkuZIZQFNuPhGRjdg1elPAZDTLezSjo4Apdw3fcZR7/k95jKIgJQErcX1/IR5wMHJUOCrFQUWTRkuAPIILQCC5Rs5PH5HgzprCePEGhGGus2fJn9G7OuHcmRBS2IYv9AsXclSTixFItpoDQnd20aBNoY4AbIr8scmZWxS2OJ34HRO6N2zNBCSIrECJz9owvJOGImNmhTJKaJIPAxVhuF9mcizDfeITd4xRs8XgIz+f9l34bhXMgeAuBd1FhVltUGME4HF1Xb+qA83Afldhwma3PsGGiJCuPNpQKSq8OUnJbqJKVm0wyhWPGCBULlSIdNIMxRYC7wjHnRd++w6d6bh+TRMG2JuMesB+eN23Lk2kHKq8loSqXU8jZGSsUVnv1NZKsOCbKWVJ/UiKehmBplgtsoSO6VhAnv284m27EokSJUyfVURjwKnJO8AY4yOISagbUd3wIFvDFZ08RktQdBP3yGaqzDr3MYhzbowHgPjRlqEPGkQJYy7cReK6ZFk8bUha0C/2G7S3qKiFQ7zrIdoS2m6x/8O9nESd+qxq40NAKWQxOEdc6mSC102k4mpJcbr82XK9FrKOqg20fjzAGFWARljs/tySBCyXodJBolwr2QrtB4NwcuLCnGiTaXiCLnSRTLanLrxUZxLpM7ULHmZueiAdlZO5bBKTBbE96GqhgM58CwLRC+Qt1Fyhluy+xejM9U8uMQT/NFLnhFtK/CtLKomwOsbgTrYSq5NQTDzt3OircV21xfqmwGjRI6/I7zfK7XO0teanR4yxMF7DWTB+zoZsAU3wEiKJwoFDUJE1D9rwg4920UZMP+8dxMAPvLCK0vwIQEql2wNL4eD0FYWL/vviWj1bjVAalnGvdWuWESRpaWVLkgUsQSuVK64xgk3n9H5SBapPqAUfESHh3gMAssXUiSOE2TsAILwhneIZz35bsNbL86G4mS0ZcBAvml9jEr0e/1YiXx9QUSQGQSXyh2gnG7QwQsKreQuYkzLMVrbu+CQtCurq9+Yq/40RUErATb1FGMTNN6fEjmPEdomRYpVMj6O+R5SqBeohhGKj+RdCQtW2rmlwxbzZ01wkG9eFYpgqsejYwdD6asvtKLsnsYO9ku4UCZONJxh0JkSanoN1b9/c6p3D7n7mJVY5hB0vim5zc9cwpGjSUo90Ki1NcUe/YrrwYOeQ9p8Qk0vjoRgyDAb/xZaTXLlIQFc/uzFxafWz5BX7GHX3FCKDkV1pKpYG5/9ML/2yvc/pRK5kK+/beXLAv6G+wUPpl75Y7LOtESE7UztVw9npQQD0kKg9oG2qQ/zVRVIjd0ZtHx7/l//Klkromoer0V615VebMvZKC/gCZC7rYcGJ/hhQscNd72voiCGEdaZbLFUdUd0kWtabFdiJ4rNy9T4nnt/wuUapyPc809oCBa8+1HHfNddB3JF/GHOqCvKpVrhH/f4HnhjatCksZ/56YM2Ju+HNIGAdEnf/1YPBLMSfBByLUaS6X1KAH2bvGWxBLOF3ji803n2MHJrAq4NLvTenCpldSWjkgsspp03X9Hi0U4NNtwJ/hyVodbVwkmWgvOxClYDr2tK1C/uvvQqz6+YUitLhc+Pxv+XlYEjvlTT2KVsyEoXkqrfHLARYSP5Ru/uPkx3SvLKSFChy8LV0E3VuWJCSbETvhHSvFUe79MUvA7r3PBS3qaFKaYqPWl6GJiInzqQutRQElO1KJdBh8IfRo0aCcoP6TpSuCjxMkD47bzK70PItXBZvP/iGA37k379+rrAe2fuewHjPhIZJrm77ROeD+sU6lKh/Ql1TQCL/UMM9oJ03uic2lYnVF84tNhaLdHiCdaYedL2lW8c34YdyW3U08g9gJ7joLRhVEXVjDpgWJquuwp7/bpvq7/H7MP4wkqpVJNwHhUGZ09SnOa7MtiatgeYUQayI3atWuJ6xYwzTqp5QIG6gRVbTHbu0sYfvL6RjTDJX4ZQ4KqDU3A5qGuIinK1OJd714Szvz3C14fyTOwevy4z1MCO6ShS88zGHfvzaQIilMd4JCUxH9J4zoI7Al2wo77TZHuNtj40o7BgdVh3qJb1K5ouXE57mg0D20uF304BbumxvxtU29bcvaB1Py7iJ1yNvy6YmGfZqva94VKXaTz3caNCyy18tLd0v19D+laLFi9nLdQFPnipv6PhhNrsdjQBfWI69d/zU/PUeEYpg49RPFUWdWdoCW8ni82iIOHcJTrMTKwx96a4qSa/5i+8T4oQn+DdBkn8iTSz5HG19LtrI8Wm84ibYDOehfEFo+WNEa0DeDwryW5ZERNoGr6Fm6tBTrvdxaDLQE41j/SPyiifEYiPb1MIxuSNoAinj/2OqouDkaf+6fdro+UjX/xT6AP3gqsjrYgt4GtkRd+PrbSO+aP+7v/9kGdUhD9t1qoOSGnRPKgxKMsoZ5+SHLrMSfeKSIqX50gpmM7W0jDN6eFPjf692Ho86WUPODY/lsmld7NgJJ8bcCDuj7qtXidKR7nxe1z3FxFMV9bl13yq2SU6EudNtcXL1R4gx6XxnDv9CIF95cGvYz4tIYvDwtoxtXvKJsz++3+utiQOiq5mI5XcAKqbkvHfzDUVABDTsf3pl1mFPnfYV1GJtRnkV5woMdl6dAjnrdSFAeil/EyWONayNPEupsVtyTqm9Sv3++hfL8TfC1GNRalK8ipF57b/8Sd+/1S6FH4r2RE3V8+kHRt48QKz/grTkvS7mczMLTueOs/y3G0IadYwO17L1QmQlvWLmPxBjTylxwq+hVmM+MN/qS2UIkrqGtsxYKWLDZ64i2SkL5FL0jjApC9YLX8S0tgLt7SpshN3FskNS6IMdMkHGIgnFdGP9TIfK+adQuy009q/cRRxHL/poUczaGNhOQmtEhkrQRAkuoccsT2sSDpFaxpdE0PH/0rkLdMAYjO2hu1HqlO/fgMrLvSAk/27Wt71vTmbP354fJJdS2Dr7fqrT5vIKlpjvMeHNpQvPOC9bJlT010Nm1Moe99fj3RJqT8Y2Kvj8PusyB8EK9VcGZhsNgXYtw2+D6+F2OA7YZZqlkkvsXwI4/AgFRBPhOrQwStqboJrM2oTstLDVByF4QUmpqJ+vCx8iETlt4MdzsN6IhtbPssTIiDC6zGNVr0gs0CB4itBAFPcLt03UbxJSg5MIeayCq0W2GH+AP0Im/fDgkL2nVStqh3se/H70P+w9Kj41v6XjsabEUTOJayNL07CLqwp1W8zNcBIlxKgbFbyy2HwMPN7ggAjDgbVLzmj719U4b9nDwEjq2DCbQQfK+0eCMlMULYAYN3Y9ufxeH4c2YYNiJxdHFVTn602QEU1+MPAy4DPEagMCGui7fmptiQ2/xxicjDCTXT7VhHv+JjY/dH53Q/X/7Oyu2thRV0Nm0rJC4k1GmsY/60HGhgd1qhnRNz6h9vGJHNgnzFBkrrtCNRhzuRcKCEgv8H6xVWh1E7ZIXCds/euPUY47w/byZtMmFsCMOU+j6GNtj/dmA8rtjeAOJqCYXSgZnOlQjDCf6e8lSe6n1PPMRhSssfRhRIma02zsAKw8jOIdW5BcE2Up1fEJaSKonyYvpWLOGwsejuFJXc8jmhllNCqMUtQ42WzvAueCbV0A50z7oJO1NIuvZC4xpLCYHfH/39iEj8aK2vjtTOTdimcWfTwIevL5+b7ySDdfbgy35Ofg9Ua7NuU5lAfV9+LrcVXwOl0ms2L85wEJ8u53TIJr9Xwhd/54rxfRXsPMd3GdR5vYv9o7Qt3wGui7bUAGOgbwYETPMwQNDgwPXP/LG2imN8cT6dL7U9kFs1bQs8027XX+ZFTLZfMCd+/76gTn/ZW+ICWmc4B+5r1eSqpcPGVHZbxc2uSyYHLZLq9SOHDXO/dM6ECeDQlMJ4DaLyfQpqZSkIsmZMUlroMiR6r2nobqZxPhLB7cV/w4LM/qZIzLRcUQucFShf8eFbLJL3qDjpqjeM0HeMI5KmL6j6vJ1OaR6z2ja4RlG2NjRDOERiimvFxHvKGHHBHX/tNXctY8dUcDIYI7IPgi/GkiFellZQC92JwaHrrjAs8ENE2mXk7tdEr+KLVc9rbytgGGaTIdXVtb58Li5xdt48WB/gn82LPG9HeeL8YEvGdSPec3u3DKU2uKixbn/aVxE/OgJBxgCeXIjfpyliGPogwhIrpjkqEpk+5Sr+1Oe8NHOIJreH2g6bWM9YMuqhDdX3p+F758wBlHs7nFW3YrgJdGJ7voll0GDTOIGsqPRz2oxyvjJqD+Lpa4J2E7AnryG16R54xudPJFZ2Q7cxwmNNaz87fwqn4QIGxBqwX27gmWxwM0u48GSQOA+upysIZmx5drkW4coeoG3CY+gzK/foFvoaRmJVMxCWLnCQd2yS2kliHpVh7DWTkQLJ5TzMfYS6lzm+EP914Mh6DdmnMthl93BseLkmvq4dzLRX93fHNvmYmUcG7Wi1ykOZSDiSSxRbFoGrXtf/Glp1XudyTTtHNr+5XkCjT6Baeb+4CE7rGnZqmYCew9Z9ysA2BzyQ6/upucpGbhM6xBkE+aRAV9sKIiQzSYecVK5VZi8tobbyFVqoYcwDaSnnvM8v6Yn4Ed0d9WMGppCvuHjbqRKW8GHV4w/oWk4F8LaWNtP7ATVDB7hEYkDdNEpLscHa/riGdlTeC9C5CjZqTucdtbo2TiWEjOuJyDFHKMsV+X39/EeaWlU0Yl8XssWHoVl3mHE7BWlTVfRojx0WjfMra9QCinIBavJw17QDFb4QwdKBb8cEiUPlpu1irqErg3Q29hHeLLVDjCod4cJDLbfoTRH2PvCGnIPeOomUiKL1YKM1Saft/MU4VH6I0Rk4ufVV0AP/7XcdtIPCYnnrGMeczpiIu4ISNXRXfR9MSIj6ut64JWflXZcHoiXnIopd/94+dijQhCggJ4pjMZW0anS1cC3mYgrnTD7mIAmVu8x3De7qM66gw6S8j4BEbndE3KpPqpsrDHl4dlDlYuBalyw/yNrBnsarqBOPncpd2cqtVIIDdUaaR+5auyJ4eeW1ggALDotMtmOjHaF0VDML1aIJXs6Cdhon6vdTmrWWEFleDe9UuDS5e7+zEoFsentIJN/1zI0MJl2LlesehnmsAi7t6FhGMZE6B3XRMSseCwpYaOf16jUZKU3wjf8dhMricraoO4HtGMskZmjRI6qyMwuV12WUqlB7JjAn7OBMqA5pFm9r5+urqdUl6m6xapXOS5gHbNd+G+RG1cuxBI9ZKx5E9HY3Ijks64zYXC2u7E1e4Vr4QO4tp+8XelpGgmZeobMHwlUYDCujs+gF7xXVZqStdxgfukJs9ctUdCWBIyzb1cDXlOW+w+jtSKCoGo+p3K7Ucvbu4eyjO1qnCQ+TqMQS5urH41VLsGKhhUyMqacAfZtesFtOscWVlUTHbmRlwwwZNJKrOHRFiqLMITSwQTCnZqZQM6hZUVoUeWwnmQpGV9iuhud1eeR3u3+UEdcuDr38JsZuhTYvpzFUjBm6pIUAcQvqMJmTdUFcH5pzPArLQi2BmcqNXJZCyRW/Jj4J6ozzkiHY7kqykpsDlmLtpTIjm0o5Xs7r3IFfAmNa/5A0axc9cQHlxj1qzv4NYNaNwYi8+aUswA/HLXFkIY+u0GutDhDuWHBlLop+NstfzQMDyWqFNbRIxMurxxkVZyY3gSbEl2j7g2+N8PbIzoQ60ioPjzr0eHvcBgbABmoshyKz2oawggJEpWHYhVFYpNbKS4lho3XJKLJ1arDXsMk9FFIvVgjJk+Niw0HCJqaKW/zorT6MoU/H1Q27UXII7YBfX5vuLaoahNovISWBlf0oRctFXCUc0PRIfLoZdiXRfJzuvN20X6T/q/3oh+0TCfcj1ENLfNYMGUl355uY2frzu95jOQ21J6xa7d3ToT/ejjhND0JcxBk9x49OqL/63h1360pt/1bxfrc2T4pvydqfk7tUkodpbdSCQDdVo+t8+eJKeJtZUQeILvOJS4lHXQs710tQcQ5IfOroxKxSjCgLa9cWy/fRlqIjBJLOoYIRhTXiThOvqx2pgUCevsqjRXvzrG+VoEe3EIbilAjY/oOCSgj73/fQ1YoR866SICdI+PeTBag7nLCIECd9XQLtlLYCSZ3t6OQ75ByOudwPEEex2M5082DR3w3FC2wunQQAyrkOSerD3ky2sHZ+oZSUkIZ49zEunCfGluTvogenAm2qznqkwHFldlonHAr16fpAkh4r6JY4T7NxNt14oG8MdNqHGGBIr4GMyrU7V+E4K5bTMjbsWevC6TnBeHi17RzgTspButr/6Ug5+ZuwndJR5/XHfMC9rFLKD4cTlHyxHmf798PIaAm9NCcdzyBaq8s1uazHHnU7w8ReOQU7C+dO6086iRmxPEaX+ERmTjXVGV7929Z34c4/mxvle104m9tGNB9B/ufSe0YxYNMxBC5A7UegNulr5X6aHGp3oE4VcCJNZmOz4aahelzjDmlOIJfBYZWW9swY5cIw6tNxLHRYVwIDuxliB+iQOIHo01r1VDV28JqZsO5mKCQHuKHook4scprM1qki9GdT9xa+bIjeLR/GSfHGG5aIbgaHzd1bLGjz9OuJBD4owCLO4EvbaURsb/VrT5bG59aZDHB0zNH2LPJOQdc3zT2AK7ykHiY7SjvR01WQDg6HtrPnpq+JPuvZ5Xg27V2kxGi7E6rpWx3H5CdkA0WudhJ7ouLSF71PnyhrmvSBJ1GBdOcLIOpWl03UCzrwLt5vAAYcvHrdntQRYbbacLBG6RCQNduYKD7fDUjM64haG+wKByMzcYqkEqhmRHzwCFoR77JMA8SPFA6x3GPB0t0XAtPVqi5ayEF1EDa3cs5RGbLNnIQQlX/GidhDT0dJC/rqZrCjoeuqlTpw9fQs2mPHWhir2NhBMPI4ZVJhnX2wY7CT4GxTXm2k9DgTkiTJ4F6MHBShdWc2STCfCYUZpJQ033OCQuTxod71tG5pOsVD3p8bQFuHKC16zZvWZ04sbvYQOfSH3QELs66hlqlbNYpwLPIFnriCHrOvuIRZqYXPbmpGAuHWvh93r2X1cNS9V6ipPjiJ/+FedZzP+4KtqveiVRnXfhcD26vPp/qSyis2b+duWl+kKTmIVIzrxt3PDrt8CqBYzQE1nquB4mTkt664G82RFpLZaA49xltPqpfaz+rVcDJNMiGmjuAdDWuEsmhaZYWtKtM8KEGqSCDfmFBWWHgGRmghrzId/MKgLJAFJcX1eI3MBeoES1yvoDRSdibUuNIqHOcU06AkKEaOE43F3zAOtijFOkeLZOFpnTY3MCAEQiwoa2f3GghYiw5ZhdSclIsg6qPB4XoqAKfQbxuQi4EA4O3wBCHX3m+wgZAeKzim0QqTJ9qTBZYbtYd3vxCPvPRaE96QvMMJCWRbHbMZV4Zk+Oh4KOgtVVFvlQYI4nClKUpruOROSQnMEsncl9Y5UKO0rJd1hDddNUdKAkxdUobglOr9a1H0b6bieD3iCa8WRhivBnPbZMIY3kWGW2+nNd3hTFC547BKrtqhhq6OFgK4ezCcTv2EVg0LO1ykURqBNDGgai3uFYkqsdgDwpBLjjrT2xoZ2l0jG26hP1RAZviGHltW4V3VmSj8940stFADMhXRWwEZU/FmfplrnCdVwAeE3Oo2h+8SBvNDPNyWY3D3AOw6glGXBgXN44jYA29XLBNwDoM/3NCrb0caBaY+HZu1A+F/8qgN9Z5rxA1B0GcuBsNIL+wkrA2JIXYSitWpCOtutmxgubEyh9D18roMVBOezaNK85CY8FVhk8KtB7pWy2UhfkVCGp41jzXXuf86LeW2qu4GeT0cCDaNrJqX7T8oKWLOWNwVtLZmCAZN1mNC1Os9DGKMkmfC2vXn2lB16FC2ej2RHJLvfXNmzomqsQNDnIeQVpDXL5oTFMmwnTEv/LS7GcJ/BoKlCxi2zQGIGRZOHaYVbBOw1SJLhf15TSAIfsrAcUjA51aEcUpF3m0UkfoQqFgau5y5VhIOc13BHJ5znb0Gd1OrK5iPfOMaZpENNuyWsCbq6z7HS1q6dW7hv6biH+9PSMQp3UO5hBTfggTCT9MdYXkhUdHXxkB/El9NEtglQrm4QkzT72Q5TpYbOjm0XZunnddewIXm50LLLsgy5+fRfnrjSv8HuxLMUdAOpbP+C6rGWYz5xjdTMiBoLMQcIw0n8GPiAD5ZuvDncV9S6lHnbkcGjEJNRiW2odbQl08rHClkhcpFtHkhQ41SRT3yjjYKXGbWpnlFGkKQBkwLI/erWUPQ62W01VyssLAIL5/R7alOa+bDFH5EeRrAPLH5M1K+ppbg70im0zU7nZ2y5MqsbRyc1Z6UmuGyUt4kFHNv95lhmXxLOhXXNqzA8auDN5VX5dCU+LdnNm1FA+vUGE6qsDttLXQWhOGiiTFMHFuhwdiUt+AHd4+uV/EbdXk28R41vRI1J6y/LuckN7lKFFvyF6VBv8xYYLqGgXpIPxLDYHNxQhoF5Hhi5+opAlPnWsRYSu9tzifFAYDuRtgJZzg1LE89rsagxazu3kagHk0AU9nomAZmdtVWHR1d8eA+Ec2bWX43MivdbO9mMWH1qnfX+jSf/fQEKBOn4x4hmdC+5xeAHtwWR3WCom7QOplRtXspb8OAxiXo+Z1KnKR0/r3lGMcNwTeY8lNreTITsX+zDVUSqAh7Z9k+QbDoc6EXDrgauOmGYjfwQKadG5VBFMhvxPEyKlq0qET4tv6zetXnovqEKkoEl8hnRY9WMPxICvpJDdz0SE/JWA9JZhUrMffFYDGS9vh9UaRSLP5FMf0qeNWYaPwotDUyLIJol5OYXgGqlczSHMvTB7Cejn/PTRLUktAVCMSVb+e0L4CDj5K+w/zFwe6NIM/9iMT5Y+vUsc8mm8Dk4+6KNNqIYR0NwuVIOa/hB++O7olhkVtAwt7+xeKCS0ptzoGdvrPfnv1g+1NeksyD3xN6KLPvV9ZOQVxEfz/rf0SNVdGl/9OTFCM/7dXVO30v3943T3TTq7PX5smizy6NV6FKQA1eTcXA7edQxD23qFlIshzZpP7dVyQ3nyeWiJwmn8Cn3wAXAPI8YbeaKVUKvuLRohrOCIqOWsNnSDfbVjmszlpXcbGfF1aL66LWSJwud8ZYwc3ZIj/zzgTOjUBc+NGpEOPBPcw3VIjVleDeCll9P1W2wYXPN124GV4rOteAi146WLoQcgEwQR0tAweV7GB1E0GWqDljE6lKegn6Q6UCXLDWqxZmImV07a5/jvB6Txe3F4saWkWMT6X47Mmx/9+oagH/1n7dqQC5hapytwwupgYfwyhK710oApUiTLy/WXiAJG7vyoySS7tMgqp8fuctPcYGF2OBglDRbn43zo1bNAVo7IfyXUR9EgUotGB/sEbrvfWX4cST0+pFVQ58yUit2FgHDYyrxdVtouYgfq7GD4IZfIsxQt8qXycOC/qYlhuhHM8Poqb2of1zyJBs2tp7tUcFzqU4Iz1iA7A/Y20+EB0eQ7aE4yC/two7uAtePx08KqDivnZfZUZWQnGzt7y8wjUxAWea7oBBkzW8zxm7vfLtb8BkhWa1+HCjA8QL8hna6LupXuHDmwA7YXLHpmZDC4WNKBT7R8+BnfPerNRKoJ/aOODgmYXmke+iWPWCjxZkriYQSBnWVtzllQ5uC71u49xWKD5wUXZrXsBHY8BGhRss9/bZUHGE726bkkQRNDJx1YVCC6uyiNCSe5rBOvTTvLVSiwiYSSA1rpPfY/AO4NkQvEIh7P1vC529abQx4TVosG8W2nj53uQx2bOH0ETWi4NKbopGlmWxXzMphpd3mXJOocMyvCDXSdsOBDCxLjeCGgr2SXZCirCEQyi7CZkuMBIIZAVo66f/ge0jcE5tCgxwtxIwf+VCAQopH/ImhrKNfBIONtJLAZZcPKksTRBIRoObthRpDjnBxhlL9qcImiCMNTBSrIAYT/Hqi8Gr1wqeq+l7+vxgIZCEADHPJ4qBW14DTESKxBWJKVshcc1xlBJmEV5fNtLfxY7yXV305IPTArRTOLCGDjIoGxEyCaDcZsEvfjBPPh5/GJtNefR49PDjyXRURyGllDDAZIxBksjZso0c8NW8goYrjgmBqBUMMSiLCJMlblnglUh38ur02KOb1/4GYeYKVFiXADaPwsFnpJ1Xro7pbOyGGgCIX4ECRx4qdJRBSBLmoRmGjCswmJjKFFXduWf7JJTvZaSyCC89pwdB1QpUFAAWPjN86+Irl5QW6Nu/IakH/w2Bu8n5dDMSENEmJTNIrwHSEC+FOKrpdPH0Ks1I8oot0NkkVe7ktJhXMIhpEJGOerXZZKcOQ1SIfKQYIohK3nw9muodp7A3MLnGkfp9lmkZwIBEzTn/7FMU/FoIpdZ3mBnnHpoj9deuLOAi+zstpsFpbdV7f4auQvnpmtB7yVJi44A2Hs6m0UUqRhYTWgcciQLrkoFWW7Sajz2bAUhL3WdNxy2yyGldRUAZrmZ8YRgBJgoIJGs8TXpm20xT00ZClArN7MFgbBDTIbM0hki2uGghGAnHk0T9VtbF7AM2oFWVBkv+CdtgnVgQHsTFfV216ChmABJTFVzC55pgF4AC6KamHCJQoAhxVTXA6TlSCEqJ4dtqZYF1jVMpSveQ/Kw7zT3iCr3rDujBSUMP2ZvjG1ckAf0Dro7WIPtfWzcpSK2e2AiRW4qHoUQDSD6bgYMeCiQTCpYGcCyab3znFQ97xJpDCaTvRvPqlZOy2PpxB+L1vcuC9xcmhDGFOU8/xvhiRyTeRDVGJC8ssx9a73YxK+ZU6Ltha75lY9qwpbbA02rQqQij536gUMmWg6cQWDFragVUAExQdRvfCEJRy06Gk6O7ilxkykLgmuDZmBH/M6vxQ6nZK2zwzy1yyaDEVBRKolrDgXXu7xwY8dfN20i06Q2mjH10TCOXo55RHCwXgxmNDOMYqcIjNwgvctOrza02pXR+KCZD9g/Hwp58J4hTB+7XoxLw5YcE8pTKHKgejD+Pqup8YFCDNqSpuclOnWL8ye6sLswjKANZfRgN6yUIqOo2SjnEovNhjDf1QqIeZhsJnpSiKB9L7LsPc3QznJuN1qi84SzJtPKZxD48rO9rplibR+flamP2jB3GY5hIlTBsa7D2v4wiz8iuJihMe294xwTFg88qjPSAUyaMoQwi/jYrVhmED6EDcUXeeqQ+5vPO3EzrSGyKWHYT3yMFxo66TIyZBlZOD6TI7RWO92KqLKaoNWKtJPrXGdZVK0Kx96zBwhxtzZKgQGAI30JhLWXZkLPUzLpE34NC91zbdoClUGvNt2GHKKQ3AFyNBekrc3xphPZHaYnvAJoQs1lAACib6DvDNIMjBSvENNJ1t6iRmq1EVUyYOgaNhHSWwTlyHO2GddqocBtiw6nms0fl8qgRZdKe1pHbuxOhJMMavxGxOdN89EkqW54RPrhOdrdH4nFNjj4KXUOQnQnDuOk+/4OZw5Sg8bCCRHJDQm9R44dziKjhVSlXgxwK8gk/9vTnt0SR57y7kCStEPawBFS1U2z8KJjq2YTIG7F4kliOn1t0fSSt5dP4Z7snVm0pTGAyTusZry2EMSbXkuWqSgm62e+WP13zBuMjp2VUrGqTSkzULEHJirwHtKb24oGzXPOktN0lQY+Lg59tbs2+F26Jw/2WFplLSVoK2sreSaJNiAaeIBwItnHhMLmw9tvHflRn6b7zpF5Z3cUd5mi3nzzWbJ/mPzF/OQTDrCGA/L4d59CrIYx7HGu9psqRAOzwViIkUDvYfFFFgfTuxroa6ssIecdNlbzi3I8UfmWQQ/Iif7LSWDISAU58apzCNuP4dHZCfgyyyR1Rnx2AIMMl3vs6HBY5XZZPaCjYZBwr47aiI03DWftNs4853GsFiF4Pe0ha/h9YVGBeky9GM6/1UIr/SNWN305T7Vtb2fclF9iBVQ75z/I72Y7iIlGU/LaoV8KckQd+5o+mp4aZ4V3w6CctlMcHGDHg4rzdhsp94D90PJSj5GMhdKAJbFukVIa5X6hcuCcF0Dg6Fhk5XJu5BlmGtbgtjMU53WQsQAhMJgxjEdCOS7vr6Bbr5BD7AVthE5FyMdadb5vSoTp73RAzPrTTUQ136fVUsc+eFy+NsXfRci3tdAU7AqdhLgW0ZKXufewe+d3ctBX3nRkSV5w4Xn9rShKUqIPZxsNxAAYe5hwOniyAcEi4cqIWb09pdymun4Q6Ez+OiBnzKqOR123tnkzECOdirToXPEsfXRKrjWZDX3pHy4+p18oFiJRWY4DcEERTVlQb7pHcONaL+laz9QIfkZC1fE6mTfs8zq7IMoHww4ZVI5A2Kl9pGzsh9o/igSLbYdL93hehAtTAaNlfIEC6p7PFNdFzJ4iEq1kWwoQ3SBOYXOuOntOnEz3YYym4HkMCgpprLi0WJQAGpBwRd/ZOdPiGrx/cAMfI66Q8hUcmxmId8xsGkOut4Hl83TmE/JbXyOVWzt12sLZsxO29htCXgYZePDejIV6PB1j28cbiC22CBX+o4xgkSf+ozpiBhGzSgvB+wRdFErkRsSRWGNBg5hlKoNOYEbqpFltz7XcuhkmxEUZQnSQpnsBd7HGN0E7BWuKnWAObaAgkvJ19uJD77hc0NA9CnGSH4LkSdKz1HQ54nou4dSzQLqYMixj7ugY4EZeSHkOJ0+c2VbPd7GLwnOUKl9kytny01RFQySQY5bqMfeOVueMwTT2llN+uxnQYo0S7AV8Rekp5KonRzGR4bJjcMhHP1YKCQyBjGhG0nTbNQDDXLDAk30uUjPvwlY2+LqArCbEZHPIQa36dKZSk0JDUkca/8jXzm6vyiHjBBurFEo0opLo3hjWK06Tftr6oagpyFvsKZAUwsbAg6qOQdH9aDr18/gL60XLRCzUgAw8ZKLPOk648xpHWFgSa/TxtRkVpRXLjZCqCHFT3vMIOmRAimNeBuxhwX4xM6qp9aK+Mn5pAhgk3mleohATy2Y2zlz+uptmFafn9lH9YfCMwt3qoQS10ZVbvk782d4m1KEYc9/VJn9dXgziy3Nkv3bH+hfTJbKRHx35djSTpefozRG+7J1s9vdp/38rN4cOSK4R4MrH+s6SNlpdVUWdLLrDaXxtk+kiHVkzOyBBiUJowwrL5pDSUUhjgVkEdMAlETaTuOLIYOt/V7ds0NaBYhVEfP9E2d8/6X3gKwDZcjXyB3Yc3BA6fkKS4pI++L5oxJmSxMP5pdI0nVcb/uky8MfOryExuRhRrHFn8uJUsKO8wmGdHgIGp9N9HO3pcHGmXkaZn4KRkbUYrXlAxe/wmNkYUlVmlKM66DAs3UCPNjFUEUd1Xijuio6e0+0SmgOZBtNx4JAWN3IUWAesklPc83sD2WLw5TS7kx0DiqvAyfIOMLK6d6jCM/yshLtlflwq4/9SHLD8Ss0KpWNuUrrDjdBEBWrTOKUa6Uk7u+7YePgfaDTYddMswNeQL2qXRvd3A5lC0q8ITpVgjjW+9rDPCtGP3/fnxvXiXRHT+psWmbrdqI50aEYmXEfcPk0w9sEvDoDK+qdH9++S96mk5lGGvL++rCTZGYK4E59ZwWw8PuohB3j4ynZZXdCiBt0tAI+nKu9jivLh4dGhb7wep8yR4MflaERZqfyULOW15hpLZOlW4DPRgrsqG+eF0HQ2KbWSB5KiI5WbDNEr0xjPmFvWKiE2YlIhbxrqTmJtuSXChN6XnJFqJK2wOmG60ENbnr57LYB3RGSp5mgr9pq1IF0IxjzH9eYt+HRL13IFRVWxuL02mGySy8I3gTNOpdJLR4/x0IvCAXXQzYCVcGkgwaDqDAr3uhOjZbG34Ee+XNC3noIo5EhtoTfDM7+ZHwOr6yqDSCgrgnME1dMwrl1pLL8gPRWV3iYTTxvvUEhvoV7mpJLMzxl8z39IGfzR8B8XqkpAEkUD8BGaKYLuGV3isAiUqoGGPTc3yOpr+OEAWpRViWANa8P+izJapMGrB4kH81fT9bOouDUFx2fjZSODOEa8GeGhYMa8cIptBXBhJawfaZJrOgO3hUuhVYekMKEYPhF8/QGOcENBl96sA73cevoyTPJH2qFmCDXYJjctK+WBoLvScKTVykD+n4u0mJ2H+B7Cg8py736cpAtws6IjvUUK8Y6tIn2OxQ3IM9WQ6yzUt6xPeFMOblnrgBNqgFpAZMA9jWgmXeohtCj3E4V7gI9F5FSs/Y4em+chCFlV13fAXc8y50uoaNfgKH7OTnv8yYGY1PpEpVm3QeoeTiVFtM5moyf7wYtFFPDlrHLbiIh7X2I1PN2XBweHRj1w4/CxJ1EdA3I1gof5nRRZIhxuj7ZEyCM+w3+iNt1xbqfaMn6cBb9FXLNYLjEOKVkbEwA1C7CF6Yvk7EpX+pJs2Zpohmzo/jE2qT1v0KKrXH3s4XaT1TtCpjDuFAcejtaxiNXXkSDQ5Zp4y2qmGY9a7uGYTUzggUTeaUpomuaM1LvMikBrQSEAwGLFreK8yUUUz1T8o26VDFN0ItN+zZUFJ9wVFVhdt9AgGG4QO+mVHxLfUH72izVpOf+02wdSQGB7MzVGdh+UC+zw0Ux/axx2BlgyKzjvfeCO1ny8kdEDr+m/mFG9NvPagouWLr2Y3A9TiozJvaXcdV8QOxm73kWayLdOCDIhXpxR3Xy/zaDZW5TmPcTpV9cL5NeTFficiaNdcwhwtbd+ANFhV5Lku0kwJx+WKexiF3IITMFunNZiD38aC7HNNZiSmn8qsTdCUAtacdSncsy305/uHFOvVyYvbnPs9WfjEtiJZMFwAodMcqZwuhEcbrLDpx2T98l7Xn/KOuu0pGVO9YpJOOD7sAju4bZiw5kWJX8chwVJlgeujcXT12vfjNlIW15/YmdzeaUto7XYdVfI98mFak1jCJHGYzr4aRKyHat8KQCb1NNv+ewwJNdjMDtAaWRp5ho02huUY/DEq/rD4Pdz06BhFhBIqKOsQRGP56xTCjfm7vJyd1aA8X5KzeVyY65RJdQQ4GKjYUA92xPs+rB42iAAg6bPLBV2s44QtpTYXsNg0OU6BUDSXEe0yk5T7hPTC4ZbCQYeRfW68v4OjRATAg0CZ8NgGCeKwZUO3aWfe6qxmmULGy3XEaTrz4aefi+11+GRi6PwEn770lK6WO0JhCD1CIFtRayvC208MyXk3dTf6ChnKUw7/ywjOaaTA3E4WyLeiHp/6+quKNvfi28gGJZiLY3OaJA6JBINSZRSHbysO8OMOOdLTgosVR0xWNbdUDUdp6HZeL+RfXcGsOVkxNFFXowQXO75JW/MJO5gGd8/7JihR5LgRjH+wtg4ijdh0jdORm45kelxJotqRQRv61019R/IaO7amSqcefFKt7DpcTEEnBtDUtrwBqqeKVAoF8nfcAcqi6nphDTg3j4FX8n5zVdpIdyF6DWjEHcT1NSsJze1LXUp4cJ8bqLsjEjn/JDmiQMoSpUIweuX9PPjiaHF97F2WDkXknRXaG+OuSH+TgEX02HH1Gn290XtyjpBNwOjYUWN1Hzun8F2IIIGo+D0Yc/aF356dkwP8m8RLcY1JzL49We+/wEzm+u2o+7L99jyyDN+gG/Nvw0963FGfrGWgK3E7jrjb/rXQpQndiWBWb/czMxEzneDmC0yNDfdC9GO6/wGrjQ1eKP3KWz7Pj/ki7/PP+VXu7bYO+WNe8l95zV9z9W344lfIdfkuxE3eB+/v8w3+SQJYRrnZfyLFehwJSvQCy5644uCCbwzZqkRgOwre2dU0uCOwUlxEqNEkb5ey/FafiH0pWh95S9Tup075XH1rM8RhRg+VNn+FjN0qhj/YcvwiCbebgmfMhSYvx2UMWYox+614EJRZi+1UMaljsxrBjAFe/EowWtVTYzUnS2FSqfx9wlRK+rts2JROvKr1wkVvW1Vc5l34vgWYphtiZMTa61Txha5aoaCVPdqjhPsFURv8cg0KrBMTWj0s4x9ArljnQoJam2o37ilZt3iYLWOcfPQo5paoi4Rhkyu3vXfCDlMiAc2u5E4AL7HCGqbUb8c+wBxtHENlmWRcdjJV4OeL1jh5KNwfJ+v1NfR4lToW9n6mKL5mifNhqX5GcpPQPW7KQoPHrxn0OArwHYALduBAWTt/KcxqkEl7D4IafjYU364hopEFI2+qVCU2iGPk1dIYuNtUCJ2A12TlcWoHNinFOIvELV5Kq7IUL6XnyeamdE1ThC+gXDcUnvY0obR9eFV2SbgT7Dycl6kodeE1jSjlqOFuJQ33h6G9YBkFtb54NJ2W9GOYnjK+hIx0URWWfJHz94f0AKU2km0kRZBi4VwkWKPA/HrhY0cXvDVPyQSh2tRUSny5hrgxUmBasAgaHtbdgOYGyTOm08WZY1IcL8Qb5W2ygwvhNx0NdJwG+K3FVYxHUHSOyMOR8p9HuL/xAYEmo4W7okmW89yvHWJga2LOsBDZg0xBeaO4mrMlf+33C8n32gBqO95F5bj2YnJObeIsU76VA8i9HUZ1yVpWsXwIXY3ErR/x9ydsxq13l1pHKcJPmbOF94vZdziCnWYuIpblx8SvQsH9COA6ddAU3qTwzopJsjFTvpUj6UjRJ8OHe8ihhPPma52L6ULjx1tTaI9djzfNwZM3g/IW4vBGUG4j1C3pOiYlvdnptXoDYIYIicdI0dxNbGlux0T8tt5woPknskp/gg2r/YhlCU5vZfWacYXveE8RE1THGhpFbz1sK1v+rjB4uIFV0Awx2jEb8xrYo3eTAEWb/duzX7/vJ9oXjuM73+XlnCLTLfSD79oZJJ4FGU6U8ibJe7jbs8VwQ7VqXsam6bFO+E+8jcYrM06I+diR1i+xDW+wsmPFW+FAD6r/1vpefsbZHEFeqavi3MClk5TM9gI4mnMR3q/S46ZvcStHmlVjXjOupGCSGw9Ma4gi+xpwhrd86F77VaNHAKBKBF/1NROyo0lTl8lxry7f+MHf55VnZBJFrTVEJfwxcBMKRtF4AYqXc9rH+yFtJRg6xp5lgYx3mPnQDgp6QDsIUexARDoUYpoPskbftrS3YC9KzbBgJOrBFdeBu8IpjsAmr2PaqszmBahkYlLArKqNoFezELokqQQqijZ+WhpqTYkwVjWDwG0zMQ6FaKnH3AyaK9D74oby5hmac7amk0RK5FRvA1sSOd1PZFCz2FltbzpOTD7JMctMqi8dVmazqd/G6BANDK/e6mO6i72MQHH7B4qtIhsm/iZ65v0glwklSLh/SD1LVZmQkVYJlz2U667AOsJAE1XnLSEzsxjDgNT6QpmUwtbJ9EXBMruc7Le9CzVlYKiDAqotuBV03Ugko1g2w0N6nI4opK6fsRL4oDnGSD09IrKYSB4hBcyalktjt21bYfLUDVm71AO146LLYpWEVUOQDXib7ftI1/JDyg2D3LVSGksvYb41qvEmL1pH3vxqnKR+R580QGFHYWzQHMxedzg8zEHNXLoKYhO3wxXDUIaxtSKUpa2iKTRhwj01RH2CBslxp3GsUTeVhH07v+ose4G61OU1xfjnSQFFcR4WYkYUArgSKbfNFOkKn6nsz7oWduhT7Bk4tplLlEhvKUYOlfK48uax5XrIi4VUeHgQuWC23LmvpGo3oolb58zE4ta/LJvflNLHgjG16xWJ8x2hnEt9ycmxGnVoi/C+8YGHA6UBkr/NI3LT21UWwxfZKBhAYK6acD0LtUZ8GF7MuyA0BAP25r/vu6Glrf3F32ctXDE8IYvn9F15TwCSHeaRKI1OQ0SvXhEl3k6llj/IZ81hf/aD7lhxWW107bylYqRD117/ILaAE03JRBnmNUjtbDLbXSXyca6uR+07yA9cn7jQamnX6EBWuByUEx3IVm2f2vHyFgVOHWJXBCBspm41Gu5O367Iu/6iPtqh4f5OygwJaZS3+Y2/lG6P6246VlLV1fdC1aScU3yJcEgc2FbY1BqgqvP8kDIxvaO4tKFKiBysyJL4YVrVexnhWimYpmnKGG1ufQQpDuyT4rFXzQ1lKD03HFoe+BqJzrVsgLV8I2W96wueR9oVvGxMzqCV14Dnq7uJ4Qodb7KRrYIUztppBj8b6dDgaL1eP/YgxzzIqiWDycgou+vHjIOpCQlqTpiMebwx5Ui5QKQEhU2v+QksAbK2/H66D7n7UlLap29KudSVcqkrtaVRqS2NSqWUS6WUS11pXOpK41JfmpT60sTtfg78xuAd20f/QXdPMGMPRIxW5NmwYbd+drJZID0Jzi23S4bwr9rDJZ3KBZadczKJvgs8jf+hU+D+YiEYcmf7Bc9CN9preC+qBS7YmV//xiSXdLqIZqLPp030c2biIx033Jmm55Pt+ovf1Ofr0HyfEzPocLDXoO8DHmQMxTkYe6InTxrxzs4Ysr2F92WVkUeMX/j3LWHqkWKvVwwhvQvC9wATlcQg72OeoyhdPV1mRb7o0tnwqKelvSPLDPtwSyB8GOaqwQZyoUfYoLa0jYI2oZzFVd1RhAJ5UywUchXelk68/cHzEqD4wAdUwUlpSQ2d2HcEaS0j6ppN49zh9GPr973AWk6b2TKilt9YchTIBLRPBCMp8la5oIELdv9Md+8X4lX6IAG6CLelrsd296eXcVLu6YqoRpQvbghqS862e7soErYfjAZGJvlbidyq839jltnfWDX0GtD5I59cBuRFEJBPwn8OgwZwPba7P72Upuwxhyyasc25fIe9sFfBy4htcKihSAtBWV+L0qDFQqAHtN5lfjM2h3lcz3GHnHToBYFIUn3Bxl+INmmVTtYGpz+dD9/mPQCi8JOnVeMnxtL3ycIp1fUT51MaKDj6jmDTM4MQCnmI1L/LU8bUqQbKoMJQFdRmzIBdqj+7dJDB97k7dUDP+JqgnBO12R/iCu1QVJyGtd/ez4c0UXj8vH94qDjTE0XbLsjQ1hWznNdQjLmljaRrDNir5cQ43VwjG9I+nICbrqp0z0ngCgs3EAHY+LU9qd+EVRurg7BrIbsTWXxXEtPpAuAO8tDAPQ3yPNDWvsEFZgW1mPyqveFBOxwfrr+Ml+dCAQUjnZBSL/FHvaOlXlNH8Hlic92eOp51K0Rkuf6wIas+NcEDqddGf5cxYq41GiwAaTezpgfL3zJDVzlWdETYI5GMGJ+3jXc4V3CD9srx7V3vAWOZYBOgQ5e2YfsunDHcnhjc3aGoHsYmmEZh5dy0AZd9DXC3fLr/xyi9ulDdPIpFLlELO8xqEPrsb2k+ykg1mUeJFZ4Hdl4l0Hmv03b/4PoaJbrI1hB9GWkMTYlupatXwY8OEi0CNHEEVDZOCPt6KnN5pjQlwYX09qVJ+ChWg+NNhfFk2F8mlSenhDfQyaX6Zpsik47YUXphB6HAubiVaPWkOp3/MequolgxJklbh9rrq2maqENJsCQVO2ZOT8BIF8KWDQBDAvhCeapjyY8zO8LXl3OKxxawXJl/EWUq1ZrRw53Bybk1pxPqlFtYk4xgB6dUwLajQNCnoUvlrUYj57XV7ApqH7oXjGeZ6t594EVlaVliyQtAUkBEvp0Jqy2bMT9WUWTwZ0sRTMXYfmPN1Ghsmm4lL3PBPSQINT1t8Pt9dJU6ED8+DpLFnQseCUqzeL83wX1aup0Glf7qiJXkKa0y5WJh2Jn5vpkjeM1cwBcwVui235+SP6pbNA/3Qeiytun3d4tVl+lGzpT/hnBnKx9lbgsdP9i4/NASZvZED+DqjKeLP9z+Mf3kdijZEznRtzurPNL2QX/Hz4ypitodSfchEYEV1wnWkdHHKdDfuoQA3dzxfEgk/vMHC7XYmAXXzuPlDNLjNV40j8t0ahhTqsViC6uC0XEzrGz16eLGsf23s3EOvhfTpmHvdBn8bPufN/MaL9o1JSIvzoG8FsRLjfPkhbZ69bIYZ9gFs1dMC6TF+o4paxF/TS3SzMKPSUJj4L2Ytq/FtHUAdWmRY9xzpveq8GR0j3X9x1QkE8PLpvtGfrVomjbV9Mc2eNJvwSzeJnuyMj2mIqGdwYY+ZXGUDh818A4k0HcQvoIuha4JSicJVTCGqpbQYZLFa9+5Fjx2jaG4Wr0mjcHpvPITgQKEeSYsjJeCPRa2EMTmTWLhLYqM2xhFqg9xJ7KXi+KHxAU8iJ23E76QhPcm8Sf8A/o00jhZVoSDOFvWDWh80aba827KJmL1mzUhAJC5RruVyeRd0bybU3I9/SQcjxbvBBx4wXO3a1dC4py/8qRAheJ2vIjf+f95fAiv+fR1vZdXxVjNnd5LuRcXfyeDaokwuismr4SU9aGYF2wjwLs4lZtODBdFbT6xz7eBDsd52hT8eRt+GI1Rfkvv81PVX5ZFTu8ADneici4wT0PVckoY40joK7GC2OkMZHl+2wYqNpub5Uzw1VvuHeli4+dHm67JKpKNKgp/jtFo5RXjnw/dA7Nhhw5K05hobTzaOJyPPLlo7C1QqyHYzZ7bUvvniQo+1DjwUAdoIf24TrXIT+vGnQtY++7npPFn91EQJXQ1k1uBKpkXrCjiJ2LwdkLKcincc3HtXYve6wUXWLinYuttiw63RRRJDjGI6EXhC0mM3kk8eU9xZ+iXzdDWYBrmCJ1E0viCd+lu9zI1MoxNm1C886RQOPZB3Ix91fEgcifgwOND2pVoSS+QswJ5RYkU6uLOH7zdDuHNS/N8kyejy6N13kttkd1oL2p/wPm4fCXFn0WD3Z9yPBv2m2m/MRCCI37K1MrcUla1d6jDDtxuoRjuLHRCg37qKRa8jKkTgkDijqNHU0Wb6IIWg3YY8s7TuqIoIc8TUBRDYj4q3g9MsDcc6GGCevcLpSQ1dK1Oq+WdkDvYeXZUkMulezsX/wyJjOdrFAi0kIA94bG/HAG7dfL89nkQFxdjoIUE7AljjAEXhAl4YMCeMMZYnoDy9aRl04jzCvgNKsBvUAH+ShHgeyEtR7GPRpLJrZHx+PvxZTKe9OWO8FTJO+H5SJvlMIhvEHjIegZUkh1Xff0/z9swDthR/RrOeHjsYKxf8KKB5CJh2ww/nDFwTOzMjzwLU90JHq+C67bffmvJt0svSvo5NbF/BxId37AyRu02PCdl4l3/PNL0DxywqzqfijvvTthCEGfvJEI5dK8wz4R6USQvCSmIME/FvrAXUIdYbbsm4TnUEhRVrydofNGpjo/fprwze7Q/5bijFNWLw5ywYv2rK0uHdPRCiSsRYfna6z0poRIWYX7yao8P4vVjVIwfP7YyGp3SoJ9FoER3fnd7NDdIaYGJ1Ce2XvF9vhnzAlV7Xxcz7lzQUE9DZrmzAzXftpmY+/XjlLbnbgQWrROVnh0P9wiRq/tLhCEHd/lfiHSM2k4It2RhBnCYMl6712VENbnicdUolozdYYJcVGmC2D3sWS3XPjmX+IKCoUNCFMtMEqduPkFGLHW4K97GKqAjZ1aMBhLc0pwHK0+gZ7xm7I0LxTFbFDU0iM2xtn06MTtDcW5C5HxKrUVry1WiKPa0SMvcy9tDewbIBDwU1BiZ0RqiMlsTO8yIYxHMEC+dONybK+fTyyeUt4CSA+S8YuJ4b16c0nueON2bv07vvU1c3Zs7Z/aOQsu2M8upoAjI1FKAdpkw9UJ3IcaqTmHhuaRYhvT5ODJGyju8ZVwcV/YEZzGhLE7146+abRBiBLYExo98fzz4CBUrtGEcuGpnDpGllA0NSKEAFZRPhXhSpP0hKsXgDaLaoUvS6ThlEvmzxJK1qtPMw3oFI3AIV5pXSFPHrDgeMN+Kgz2JcsOJK5S3LDe6A3Dah+lpTmmZ6gry0feC+px2mUMHRKRA+5b9OyO5g3B8JkwxwzkYMHqV64Xgy3iqL7u6v8Ghkrtp1gdJNkDc5H0nEGxILiKQWe7OIspxIWQ56PmEi5q+gfGtzLYMSovG8bbjpsYZYBvaBoKbvkmKS29UzBiADfOQicO9uXI+vWJCeQsoOUDOe5443psXp/TeJk735q/Te8eJq3tz58yiczKhIIaOcfhVbIpZMpJWnoz0dQK8KWwT+fjmY7Fzj6abp7SUEyjqyD5jYFrPpbia6MiwhI4MQbD1BS02kAiesdSAISop2ohxRYSGeiqCZw2Vgw9RvCJSwevf5AX8aLlgOpxBGWZJZcmskSANBLgb+H2T1mN7w4zQ1mK+55RgVqtuLxvU4OPTB2aF2QjTVmdB0fPd62j1qSz0h/T5Aa8g61hQfpjuFtzhcfbscC+YsrUuLaJv550mtv2jcOYtkXTwElskOkdG5VP12jpmNfep7E7Haa2YeYCcAV2OUeM7Fl1SgOgb61ANUBvXnPY8K0zBWMYYV2bGfktrVQBlCbbaSMXlVUw+RXQyEQ2RmG8F1RJE2KqptspmfEkG04kuzNOhVgDBtb91m2DZfN/ZHFl5ShOn0eUuTurB34xgEX5ZicFBvwzWamhEs2tohLNhuaGm867E6P6jkwSXPZDdvrlVBDnFlP+mqeULyLZbhJ7lAsSEUvV77kY1YxBPrq4P8U6zR11V5B5fWKYYF8lBliw0ZTma4QtCirThLqd10iIVvscGCAQhA/ghx7gdxq7oNJPJpZZesAYKdyCohXy2qG0i4cPkPLk/bXLRO4wT3eEQDeO8uXOh8paKIWar3HuDTSqdtarIM8k64EJF0VdSBiUDHDuPBtzM2q6kcJ7fz/Caj0ruq0lQn7AQqGI5dN0IFogg+WEITLcqHdtoMd8LuUxfPpzGTaATm8pUm6TPSU6qw1J91dRBCTj3vQzNvlqK71eJxRVrN4eE9r6wyUC0vVbvUGBDyz1V3Qf0NdSjADBTYS4Mw0ZGnynAY5BbwU7wFNA+5TzISruIwaflZXXo0IVGtvf+OwTE68qP7po6b9LpgF/SiXGSjOI6PAhEQPqmkdfpPOoxuRSqWmiDHafQgdBE4Y6GUfxlikqD0S4w4Z5i4y7xvzekfN/4EJh2i0TNiPAdVFVUZ2vj00FlMY3siPFnBvViCWeknvZ6OrWlft/M+Gt5KRcW69UWOMPbptKcjcSkp4ATL5BJETSRha+dtWO7K/S940ZBkVg6vp+mYD8Qm7WKdm7ONHAcUtsTprioYOiWpTe35R2+5hU7xeDbkVQTxmXY4dGdpmMBL3NzZSSh+NofTSpVzhjO895oQWAcUybu2rnIVi6GPDrkAGYfBCLj/RV9cGdg2+9erO1oaKlKuhnbii06aptpxFO4a4eIxxbDVHrx/vSaS95xHJ8bvcA7qkbLDqlrt85UcmERctY+3GhtbbLw0zPaGrSliurPJQEt0eK7iFnwrikQ3YVBLSKnBQIT2pdFXSTTYgt7H1b+kH1CyrKdNCLn1Rt3NzBmztPlEnLxRpAwsuYsxyOJr5HjG4Fga2tkeH8kDsT8xiF1uCmTnTpyoxfkjooT5ajMmZWGMXZeoM39G7RiqWXtiVGSOFjzb2XDycVng5a4+Q4aaQTsNkB4de/m7VcHNyemYGvaIjwYdUZLaJKmqx7Qgv/Tv3rJ5IjdFgbJ2dzHYr6fTDVIhLkZsFLaYdgbQEuvJnV1r3N2dazqo0BSSL3qbmyWelH8U3nyXk5ydBopCjyggMUdo+WHnVIzn0ZfA9gQ4JNRXrW9GH04nqpbLiMFIY9bPNF+v9ACN9f0G1NsXWHk1rW5eho63W5bG0pzI+U5LNQeH7pfQkb7mWdBam7mtfjsPe6penc9T1/jSJQ/6VQaMhWLVL7O4tfxoe1Y0PzXOvya7ij+nL8+HlXvv7zslVnSbdLpw9qT83J1ZZX/Hm/qUitqEt2EMmE3sUxKXAUITIg3CZmQJgUCfNKa/04RISdQ4XAJMji38eIsKWlOIhMVy/wUA6WX2/04sh4RfZri5JPI1HrNr8n0uUaQ4PjTV0DZ5b9t0Tjg8UaLv1/NiM1Dax9P/8/34/vOfn9OcfzdNfzKSvzX0dXj/9aWHMVzruxnDCJzTJSyIlV5XXPXwpp+F/oaEZcci1uRbfPGfgLrr78lafgyBc/2GspIjvazdGUX9rW3yCwnSXRS4U4LW0o87gziLgcn7jUgVMhnQB9HOH3n3QhfwZdXhxpglZwWLhhvQH4spOA94NgEFuivMyX2s64YAOUkCS2pbI/ow3vDSl00S6PnYLaOeQw2OCygHpW9wFC18wPSqQHhoiw0ll/SVlM3dBwX2sWNkxxmhT8DUPDSnigMFVZDbhamPuokUO67yTAiA/S3PuDK76hsa7ZqcYxUxGbDeb6Lxmhz5LPA+hmggP7xaKG7qybcA+fg1FfAeXRQ+jxVZNOUYy9ctKbHa1PCJJy72iqMGAWXahsUUkIZPDMVQ/MaC6Tf9MmLrb+PbGpWSPNvVZK03ygNASystrGzsoD8KMzIFT5WC2pH0i5CND4s+KgJfm+YWPA1UuggG4mFxLa7k0BlKIpHieAhlnp3PLUB3r9syCya2MNmvEF85m2Hc6hYOTkVax6KPUu0YIomqXEGyYxdL7D+D6Jq4pcHLAjpnmtJcEsckw8IYmWwS61IEHmpoP2zPukzwS6RZ8PL+hcVwqm0DhWjNN0sMHSgP3aDiJQZiXtDVoWT8MWMIU4j0jTydjVcMrT3gl6knjWyoFkVlZle74QHoAGQL8yQXvd1kytux4je8uqmtTWB8GrK2wdbCTcNtJPL/wCIiRltp6TD0QI7rb1sJ8y1j9a4pdHbU0JaI6nCig0yYQxlW9wuLd6pR1olsY1jCs3EzFV9mIciXW5n17Fs/2JiJwrsEFcBfHBxwEGAnaKtVlU7hseSHLUvBOkQ3VpJ7iEGsI9xGathaVWQMIF9QKLJa9eQKoD7zIrvOPhssCvWgodvVjZLRiLsfskGttUYpQuUhDLqeF38/jtMFgZrnSYczxD5p6aV4/OnPnpS6/1/ypolSdopQJuVs/TADmmrmbZp44DV5ebuUCIL0pV2cnoMutbo19INDcJl29oj9UIiaOWXkFWEshEQjS81/TA4zssMiE9v+UIjgWOYQSecQXcoLehYKaBUPPGoAE/GIU88KmCMeIQ1/Rd9LhRUIjK2BiAEaHAsu3Th9SSwW1Uscpx+whqgEL70sfPFj7psdMny/LEJeILq7iO55d78FMqihWllv/6wARgzSkLqKv+n4GbwEr2+qUc6ndYSiPaY1ftGfEYNedYT+2SstDe3ebhYbC+JDxMkpJcRmV4uaeENA3rT9cDthCUmwm0uhUVW5dKVjdtkNcZUErEhOMKmp+Rf+oAXdZXTx+CAwzl9PmDnzqTq3USNOx1H6gC90oRjRimAR9Aw+WT8nXhkMYe9NsCYBggNmo9bNGboJcL9xDzl0R2tgzS3lR9LYgCqpSE6sKheWOA9wlkR6/+O+slKwTMW593pGv0NJXuKEhfbp73vfy8ponp8W6iTKpCshlb0EEmqY9TZiS0QLgmJAcZbuT64VjInymZQfCFGtkdEQGWbh20ti/UOkd0hLegmacInHY/R/w+N9VIy8hai2A3xp8v/QdJONzF933Z9gIl6/GfdxueWOC7sazCuH+Og5M6bE8KUIcwhdUt+tm41mK8CfvaIyU4jm+8v6s8dMLsFhxbMl7qJKdb2aDEHjfj2m1/q/bbj3vXyIzwtA2gCfQoDyK4DlQHAMFbL2aa22NYZ2TrdDl1Ja2wYAnIrMDML8jXmzON/2lFlXielZiLXUWGyGAevJXGJUmhhT6EVJs1wQVpmaO1HjBJqW8U/w97PKgm3B+zQsyaA84HMTpPQ7DmppZBM6OJkaDAoB6aENj9Ndt4kr68tQRkTRUilyUrqWBP2vq+NflCC3pUOc0W44/GgRrRaEGhV/wcOvhU9+8WWUmn+hC9URb6TqVHF8h4GCD7gj1KwmGpI8q6HRaq0Y0YOs45Yt+KhK/XVmOgSJhYz9Ua9O9W31ejm9VCEC7ztgeIunu9XVi0DrN2vj+in368Q1BiGZtO2rSZRDjDiweVsypc9w7m+MVP2HyDy+xNtnnsYE5xtBSfMkr6nwj6ApFbRPacPSnszgnKrvQJtEiPrwCrjcuAjhLSXTDV3rZ5SgmD4VmU2wO3OCrhEUiAoXFNYHn4VY5iglO757tatlC9QmDm9yAQxvZ7TE2AKS0tJhQYdpK8rsp8ETAnH8KQ7d4WNfmcdN4UIrt1Eme3eKWPthK0RyDDdu3KA2ZXbyUATHXw0mAICRivMHhR5bIphyCKSNod3hQ8TPaEnGyIjbPppOCNYM/Uw/ndEO4BTdA9zZQ0c8ehSZP3L5jrsSI0J+O9ix2TNR5GryOEuHzfK3XHEwU7j7xSLwPhA4WdIV40qM4Bvn1h7KsWAoSGNDQC3UVeWPlo0FUDNj9JOzanDmiBwZJwAt3hzJFRi8D8Gmj+ujK8jM5+C7k7aCSHCI3ZAt4txI81vYvGOG35dharIZhXOgMBNo5qJudkYaDYdxdb5QIEBFqKfnkI6QvvrducDR2cvMbUpSZ6Cwi3mh25DftZAZLF7LVgZE1aVCV4Gm2+Bx4JTgBEkWhbrsUebJzA/bptb9K3mgwxVwCwsoxLseT9cbjSBvgCZlyrL5XsmLA8xaV7CGAZW4FLYo2wiV8EKmJyIih4Lou/gLzWzjt0ydTTei38BPoWZDznJnWAQwiIMQNPs3+XrZdZNhto5ynSVCISl3HM8G/DsS5MnJqgMrziQNyABUT1PvQBoUawGt65jMneZ0NLcH+fDSCW0/0Uo1hw9iLEtkD4GxCIn6dzjXny0n7447lU9/zdLsrndWweMJV7UYgw8irOMc2AIlkgIO6A4WZ2SJFRjNyywDhOvMs07PfjSyIOpQaBWJdh7ZGSXuOPevuWElvIcweRaW4nMrKgjCTFcpnbgNEpodg7kpjlxv8kNDblSqdmCspHtEI715e5PN3Oq+S7SuaLRaN6ssAHt+cnt3luZn1icywD6mCL9vGU/EOduxCC1YP5b2FmHXbMKc5uiUqmhaaZHSaN2LKCc4yrEvbsTXA5KumOlHO7dSa3gq+F+KeCWFHSD7Bzwd6+BWCruCICqj5ASUGsCCsmJ7ht+hyNkg1xEZKBiPu6/juJWemwb45B7GLUSgq5uejsdvmXL8UdYTlNFivKygMiDbRlaOG3G4PZD5K+MSmFnIjC5fSraE3/gzj7/Mz/d1LoZzCCb0583s8CQNKiq19JGD4XI8zK2KT8JHCCxcEN07i+EDWMfGjs+GCvaGrm+mxfRWmib8FawsKJ4LY9IyHTXhr3JROAOrA6jcBIJzK9xqZCI8AUTrX5TEaORcwRE/VA5lTeyZKAo9sboyY2CdYsSp4mpY5nYBu9dxZuCJjOJTMm5ibo3KfYPk2hpMyZ7Hzdo7XBlX1b9rJ1qhvKaHRxCSnzqvZcmmAHzq2rguqZjEX+eFbqeLgmGfTCvshvFtqL72OR1a/ELtwpgFtciKh2d4VJxKQRPES2wUNrKaMBYqyHx/3Ebas/YmBGC546XZcGVIbEVnZz67p8CjU/UX6S+eUGGkj2bblDJaxhNI09aC4yTFTbKats7qfWbqwy/rfhjXBRMZ/ILeO0lgczV+un5SDXqJp/rSFC8iGIEobwI7aCS1Z67xeU1T7rHpFQWQWlBplMzcZ9TVl0VlAvZEQk6YSB5m4Vlo6Kmb7RYciPB5v5J6lNB8YdEvI61mbi4S2ftZeQXgUM/3fgrUnLYaZPrKdnKmvPVHJhQn8bYPIJzxKLtglxtMai5URZ3WgIxpyOMw3rrqhTpVDLf0RrbPl13mNkkxbyf9oowXAlnWc6/vlfTUkNXuC967z+8KwSLO8E+EtIYtl70UYZYbrXRPSgk1FSBVTW++ZVi+9GbwbS2ghCrWJPKOCqcd4WnydIQROf3zZMf1lVioTZ5pgXImkjMzf54WbLM1WzR7I9+P6JwVhLhuKEyI2UuCn1G+65QYw0wwgfB8EaZq0HvRsTqIaB/5iWP41KtDkbUsWXQUGS+VoZ7LLyPptS6SnAsdo0E7tb6LjNN8OAumnhxFQmmCogYSOnEneZAQHNsf2YNfmnDDADmdIiSGP4mxE4Dmox1MQgUQ6ko/gXDI9w2NYKBqsZlqaqADWfVrjwrP6tC+G4skeOr5m3xXslYI4BUbRGFdJQ7hTKmmyBhqkrXqSlRmgav6ZinEf3E3WSjeLxJ59sFDpt448Y7RIiStaIjghAs6Ju39KHo870ufxFjclJWIWY+EZ8jTpybhplOGMyUAICPUjsWyYxv8rT667tEu6Q+bT0X2FuEoiR/HK2MXAY7sBBOamBlfp1e4QZEAwTkXCejNjT2q7DRAu2TbSJT/SvpmGahPprELxTTJIcJyjcCd7Kc2rGqfU4ArEaAOLsrLN4ns2YGtDTiflIk2hKOGreHvyCw1omFBMapmOVrJADxx0TlnTNQl52VqdKjWgMBAm5gxdnhTSNoi16XI/v0mqTiSRD3Fl9nisNUgofxdUSRHirt1Gqa4ZIjUJcQZzP7mLBX7hN8mZiAYQ3lvfzZ2csb5z6xMPnCjJqNC/GzPXndAJRhjOCXRmRDitq8ljF8ejd8tVVSP1mf7AlYsZ+AUB0+kJIBYwCFdbFlBM+dQPHbGYq/F6wUMhtMQ7K0kcarTYWY44G45hMgypILMsaBwlOesgLMwcxaHDzYtTeM7QVXAzwZyf3NOBpaH1UNnfV9KL0vPFn8KmSpD+tqAwhjS47saKzjZYBa8qBsKjNGGMW4xbOhtb4FTZigkjti/JJ5r8PRf46B302hs3ubvYUA8PmJLyZ34GwXIdbA3CKEHZADBTXQN18vAB3UvLs2pR7jielWkaz6eU07t8Bin2MgpcxfAOPlr80gI/wSw3oahH2gwUNKxQjv/PjaH3nNWsEAxo+hwgJ0nhGCsx7R+pA+ZM6tvfSF/fFUTQOIHezb8rXc/EajjaO+iUn+2I6qPFFQdnh7m5z/8z/1psWd2s1eNuM/pNpi3ahsWnZFxQeegi6JVHYlfogvzR8AilTJ3m085ap9D80+DMbWaije1+JrcGSBFcW2AvcwzwGxOnEdxg8uMt/8ZytGA2Gx6TYSzeYbv373KOkFwDddsLCFKj9s75Ws/oNHRfNRhVrMocZVYvrywN63amrThr/5ezCowBVHmqaTBwb/3Fbc4a/6ugTC4k4e7y60vnT8Nv6MzikwW1PWt8ZK8kEfLaudvxgsDmEJFO96UYD/0FBIL3BakbpZA70tnae2N+fTUJZetha2dlX5DUPwWJut8aaLfTDQOh+GdWo2UxZaKI7v+73vAqBxKxP4C/pjSOQdkR8zW390LkeARNesjC1EMd+i2Hz9L89NEkgsgxWc2V/S/zXtIV9MEJ/btELUsSy7K7lZDNpeJ4+rUaIp3+vJ/iHGuvo3Nsnpak4ppmPIdHzTp9XjY3Zuwk2GSlSx0ycmp8DIMD63btFB7Jitq4mbzBQIOH4JBqAC/HRPu+TR2vhj/rPhT9zeV6vvP3r/UH/ik3stzdNIWV9Qs+yDSVvfZt2LIwGERmwB25deFqeXFDCtBiMlt+AKh9QwFzZXBmZUayEJbsg44FXiSEaSCx8Uwlm0Q46mdWalSihQO26gC5zStgjWDBi7YtNQELFt9Xu9UJ5V5bukLj5wUNKK/nPwsA5Sviv4YUgQ+aTyIG41yfB4tnrI0DGneNkz94sJg9ztQ59s2DpbMKTA2L3/Ht5WF/btC/DRvjhgtzRSnN9wXcwYDr+eOLNcH5osAKx+hzuE3DeOEqPB8UYRAcdc+2qxAcjovF8+WX5ja1u7jlRx/Cp9XN7YMRdePIMdtBvvOHYRbk8+8dJTtjHwg6dBokxIL3qKGKabZ0G31Llkoea09Usy45IdpnbxcJihR6PguvrhUNh9a+vUTo6DW2Ixz/ut7q3iMEpChdjDH7O3DqRqccrhwCnAB3WnfJcjBPmJv3kGOqECpnfhATlpUDqe4wr7oZ23kkH57nk1wzYjHkGXF5C5t5rYFNs3ZAWJakYIwQHCiTTQoPUuU9JeDuOgBfpLWzsivXqgrdUhNElFASdmcSbOvkCplgZawYrpqL3JuiWGc8SSNRmJYBKLOe3C+aAoyEgZ3t/B6Lica8Q4NLQ7J3Y+vqf5YYXVUOOLtCTRcnU45DKJmxMGHfta0iQTGoix+uI146q6KJEbuLTiRjSzt80gmxr85Ga1k05UIXZv5sqvVCAUB4L4HRfn96zFgt5bGl10QJdn59xwhgv68EAwXgeIherSIw3sv3ve/qTSD7KfHGey82s1F00Ga5yD/dtB6fLiKVp/1MpiTe3wSYS8On+XHQ/cfrv1/SgnnyURxhH7nCQ4tDCCQv/4vaCkMZI4zss9/h05SDt2iPshQbRzgXtxSCba9+dlqPHndjbffD1he5yq1bGcYPc/CTPmJJ4c/ZiQIL8vdh6lbjP8e8XKVIcV+buW3Hxj6S0nPzoGh0h8JBm0UXs/Jf6B8VlMiDiAL8ieNd0DylVW4sLfPeb0uk8y2YD9Uk9GazT2pYOg0OmsJ7gCvnAPn0oxw/JyoWSNDbItD9G2by3kSUQoFVZHBSmwqWISB/lgEGLd7n3BG/5zXHa19HUl3FKT23QQst22THHdzgntySnSbhn5MOIKX37Q/ddHOJwIN/57enFtk+Oi7TDKUpK3cV6HJC1tzSHQjtdCsy6IQZkCq88OtU2fg42NveEFBV003oepiNIc8acvw5Ffw3qEnaczU605Vzkw0yqNOSY3d8SwLYEvbh4hGyRIMaaR9HCLSs1FRdctGv5r6Z8PiayGUESV2krbYuMSwnJJNHtyLQuI1Vmk662TGVmxwFcmPXprsHximKkniz+y+idDt/B8bvfmT3QRkcHKiDsW/CCvTGlZE1t6E0GZ4rhN8HRjwzay+gDraSP1TYiwPfxgxny8mg7xsVf2E9JlmwW5i25TjLuTuKLIl9HOcIcn7AGwCmtDcB7xfnap8RbXMjs8wXiWEIYGeyd2ziZqbPwU9jOmFTOpKvP0GY2pdvjDidIn+cDmYFSwKmYIA5qzrENgzXQ1tZyw7UGnQvgAzqk7s8vP1ZECPSIpU9OCTndU5bTAZeso6XsOlZV/q4F9H0nlxyY1MCkFQLU9q+KmpAp7YoZz/cds7WGxzPsxLthCiIdpfbsSxx6z7GdR9UFqNI2kH52QTTDQlY/KuH9pacMdrUmSoVTstmCz62unCadsLZ1K9bcgMD8HOwzAvdgTqGB3fWplDsf0jMviDFx5XZweJ18X8x1evJHVdBKajwEEmgHKvJNQBUAMuUIgzCHHP2ypGSmtfaimwdb0eg7XnAULfnihjGfBIMjcMLlnIsdffJJmMS+mv8r4J2ytv4IqwaJSUlhAFPqqvAOTAdXEVBCWb1JJBpoU4xDyg+onAFd8oZKxWrHvNykpGXdlxWHBQTG7qTh3O22uTjWoWda6OaO6S5WzPFh3YctEhUYtsspD2YwljHB/HkmbJpuqckjSHCVZvErs17J6t22nxiypGwyRY+mggQFGWptb0zaurtI4epp8ydQi3I1SllZvS1osIS6q9sYrT99cJ8ousCuGEDhtQBu38eJeJfvSKdcl7FVTAoOT+fFm2iz8qPy9Dq0lVqu3FeiD8ByENOyaFmRHYVhW+BG+SEG5RQ9NszqED67NtC8e0fS9ICQ5usxswcRe9thcg+TYvH4YzZc0JfMSJQSSXn+hVnfxhVOZZOzO0Diyn3bvEkYtYdMv/cac2d5ZStdXnbR8DMWy+83BDjdKF0xAj1eFBnmzwm7N3/SA01uFH2snIkXcGa1ZVvprx/XO0uhS94JK2S7iKLVTokr7xH50Zz7faSfFqZzN2NQdlZ5Vd0iRTNRGF6ZjUvJmhPU/DWjqUjCH42jCndsNhWmdzeiTuy7g/ciXQH3clxu4AKNS7rh2iv/jribHiW/+cQqsw6TCt3S0g1bEPU04clGsotPOLnzUAkf4t1sLA7XtbCu4lc+5413blqzSLubOat3l8V2Fb+24w+j/OYgv7ixscYixqybfDdmXMe7tThzfg8aXKRY5lm15SstXgn7bTBzuVXHbb4mGO9DX5ftV8FaclhB0f3WtQXK42Z3jhu30d91pbcnq/M3BtZONK5nwrRwQ3NvhkJ2AUYyVvvDlmvM13tZZuFdvh+a6uHJw+Hk5SgUW7927fpN09wYXt3rD24Tfpl3gZ8ANcT3CKfR2QILGbcKCg/yIQwCBSoygOcna4CeMFgvT+fOZuvf3Vzqn38ptJAacpyYNk5OyIGhIElNaHHx40mqmRv27ZzaH0fGpxF7rzuTerQxWqaAagb6JG6COsQU7SbHyq/iEadI+6W0CUeHndtxPjJ1afS7hT4akwtjzlooURH1JrWI7T6VqdD5KVzFMViST3t8IZbGW2CWJ2YPy6xr8ajyVUOUykiYtgPcYCiJ0BY1Wx5Pl6J90gqYEltNr2kU7pHEBMEsWPkrQU/pi55UPaV5wfkXENcJY6hT+3NFBiZSNSwiqko+PrYVMItcJMJs0Ib/jWkjeosCeZ5rJN6JnYriorl4T9yOMOGGmwrd4vE7EKc0OXojG1woMrNaC5qsaVUmeKKp5qc1SJMNIK4e9RHwFJ3ITtRchO7di+Vhyk0y8HGHwhKzCt3bofC/Qto/D5KNkc9crmxBG+IrpKQ7wNxixoyg2oDrodYVRGf9+56qAhFRvb317jfPB92VfzA4pdqsdfzqTUEE9RAN//Ug1GPmhQqf4/rWN043F12rz7mve0PO3qIL4Mhbj/Bk73v+jjrMa29z/6OPcjtWv1eTha80cvhbHZCzG/r9/Wt3/PY0zjZ3uf4hxTmPt/m9+nL/jVGMxzudYuX+tY+2BVahXX6v1r19rzXysv//HOs7DOMNYCktf4NJubpuyDGLuUYyAOCJ2Kv8tOZb9u8BmfvV/XBuHhZy/FVB2N24X9lus2hzvngrPW1r/8ALcNakCWBw3c/7U4JvLXWgAYGbnozIkbGxfi9sOkSUQoSIZhzydA+ErjpyxjQBhvhFsUBBYJyDfRdfjIrhueryZABPvJ2wDtW4Z7lmf4RvUOBjScXqtwmIr0NGENhG9TP4pDUzQ2xtv2yANq1akAYefOoouHmQbUYulpx4reA1ju3PLJjzro+Dff1LMg2aOWpzDl+gl0pYSPkUwKPX2eMt+/0KUsKuWkWEXozkR7tQP9y7qtcu6Mn0Gvof1MiCHfCLEFX0GPfWMMUV6tPN5T4FN5qjBu42MfCJbjsk+2WAHYcFOaD6TfwU0yB5a6PRnHUIITQg/x8iIH7jHS2l8TI+btvQ/M14yA+wCDO/SlKtnHAjQMmiuU3uSrZFxWRKn94mLUlGz4+UIr3h8FPDxMmm9pfoPbOpnmBfxyMyBtKZF6QsmVl8uDdFEYnVnkXSP/Q+D5Ta3vLSGry5ibuJal2zykYfy8s+XaOUojsTxqOzyqwjxdOHunXHzuTmR3LkJtI8XWvsMeeoFfQAMK4NMH85TRGkJzK+TZe4+CK2SJcPDwavBJJDoHpiUTJZe2mLKNPxunXgPKAoWZIzhW8RBhqkmrpTMeV1NH1uZaUthYrtGMH39I4mDMZYuCStTxTvFMfs6GuyoOgdfD6FFsHbKpJFlm1P9BcLzcX4mgKj3SAzbPUA3pbTpMGwrsHKNiSKyv/c3foRLAt7dnf3EUAeQxAEHCCmgU5MrgX/akcB8EeRKU3pb1yt/F9KVN0l9UhtXpSbJXIlIIZYLW4ppLHopIxjOsFICALElBM0XIPJNpb8q4MasOB0DfJwmQ9HTVwA5jBTg1gBf+ZsFnMh/I7y7YCyxxg0YFsYMMdCSzQqglmkvjbcA7L36evgRv7+q3B1P1cXCH6+HdBejvFfNlHvD2zBP29Xr4ztDER1P+NT3PRFY3eFhGgyziTMWFWpLRNPVVHm+AUi6rh8frn99PNMuX2jxP6yaEU0ZpuLQl3QBVmhMBzA6VnA4j9LmXyjhUfYqOHJYi+O/SlgkFGEvYUM3mPD75zKFsI2ImPofIyoylLdRo+77x1s0TJHZRot4229ucccUxjY6pPTrYqQzqncyq0bfI86Kbphgv5moJqS6/5xbCNrNfr1RXVsZWvvHxgfNewdXji6dvNN7a2Dgyl9D5kEBr7K+yPqiaL2PVu//WAT8p+BGqUprktfXI8wJntx0umbH/OAIf35ZDSgycK9f+8AUxBiOIRwWjiYcdURUEaERkUWEBMPBoPDpajKqmqyW5r7yv/j1FmovcjiK5qVnmc/1ZnZF/tQaR/vH29CJ+szRjJpwVR1CIp96FILsPgXmzw6OwYgE/uLAr78akax58J+zDBryKWf2Cc0Df1yy9L9las3UhJ97KcFZn4bWhx3CzaP7U6OaHjBVYt2BEknWCiLaziS3SOTPbTqCj8bIDSGUmCr5/fm7h/XQJU2sTVvQQorT7NlDXaaq9X75wPi6aph6TVjgn6vXxX9DWB0kdMrYcgREGEvNOtSsTU12agJa5+LRnidYIGeOaaTj0pP8ui03j/F73awmi85rGP6L86BYvRmV8S9zIP2oiPswi8x8Q+uO3yhEfcftanB8S7JBsxd1AqdNVrQM+WobvHTcAXnvXOUHbHh7LuhM45UAY9Y4IykbzttFNjhhc8RW7wzkiRuNfUO7DVHHAjB+zo76rsSzGHF9I9I9hksZCaWsxV+ZgId9rud4V0mJxIu+9V0rIbxgt8EmcUomwg0WgNS2jde0BCWlZeuzgSV+uUxDkMOS525JNkGNBMqd7LdHFRazdfn5ii4qZn3yBr/3cs5ROWYFqSUxZjjuH6V1rFCrDa0Acw9WWKzUVqRZn7xevW9YW7IlUCVY2/1Mo8GHoH38kJaKmUOFMQogCLJEAXcBv+RI22SsO5bnt8M6UnPJMygDmcU6I73Y+ySSIljyww11VEHhIkNmrpc3YiTMRRVRO6FDVbH9ykMjAOC5v96jvkzgAzAeMVwdNosC9NZy/ih8UGEDy6Yw55OvgDOjN07/Gws6b8HnIfg4V0WDiJ6Fry3hceUg/DGNLDp/V8Cxf2ges1I7fdw7Mg3cadRW6+8AN2ZUW8Lcecw6JtE4DiIXWBJvv6a58xbhpv1IVLr1rPDa9cj2W/RmkYbVN9LX8t3Mi+xFO2P68yRTUrItbWV7ylL5d76uDGipHf7emIVcMATdl4NazHZUeTOXpE0SzOXSGdAw+/hCpdhrOSOpaZKY6JMtNZrUXoBrWbkyFGPoduIp+ZSBkLHMe5hdYh7LqhTBpVG6I9b8ukXhDouOhM8kyGVabSs5zTQeC9Np3DWXs88mDvqBrqhw43bcvy/pvXDc3InoyYR4FlGfLp4SGPIuUZm9wcNnQdjAj4rBrlJjHaW5Qppc4aSFGug7fys5a6CfLnQ2UKhGdA3CuY2qA3GiZnxh/QoUEzm35V3cT473mGiz+tmvuvzOSnhbSTsV+/jIXDuhSe25fRkZY39M7qYtbpqjeiE7Khpoh49fqF1ioQdWMRx0KwPD24zBO92wJ1AXOUSeRPqE6N9pTVz8jpkExZu2EBtWTHehgUWcDXtRVc2sF4AxbnoZJO+F2axpWGSrMh0kFtuU2RfTqNYSEbVukK6CcjkZkTvnms8UbA715cwG6JstodA7AuFp8zzKvXZrI8USKc9CQJVWEolFCREvrt/ocqsoEKqyKGDTSqkRf5vYJUE9pxp1QtHEDgWB/2gSotfNbym5FTk0WY2S4OWEs6NvgH+nIJDddP59NAxxrA5OpJk9MJEmy6ryrh+yFfuJm3GgXzlb/ToxLmwFu5omHqt2g1erEbjzsfyv86fEZg7DfZnApbMUwes88chSkossTsf0K5hllqYWBVpdACK/e5V2hNcZ/WIRlr8NRatD2/1emeUhJ0CDbHQ7iihTVn/0zHzNQHw1GKwerHOHhZ8ZQcUAXpRwTGzJQoFFp2nJGQFywLuHXUwB2H1P+NC5ZwkaEPte6YZHhyQtEz8nA73BleGMAs7mkGR0rJDgv4WtmNqEK9PeKsMci+aQxHGWjC5ypZ2ctEykpU+BuRmhHg0REVme+pesVKq8ymtE4elpnNtViJASBW0uCXLmtmF/cSjzQyTNct4XHRd1v2qc6t1yurLRcm3PHm9tI4Wgs+npBDXwT4p8IxhIggaHlUhVDrz10uPtMyfrCb0ydV9VIcvrax1v4EbeJGzPi4y6vOCUDOk+kBGmGWDUKuFtfmio5GDosBJV8HHt3admjLPPIJk4mbtrjPwXAmaGgI69ix0BP/1872as3ao1/Wa33WcTESRvieb0OH3/QULuhbaRUF4ksy206K5p6Eqpf2FYK3jhXRrrYi7B+8T18ZECRywzqs/LvEURWXvB4TlaMYJHUuV0m990m9uLLRrpVYC9LZj9WVjc8cDekEURG8EGTlG8a6aOMONcX5v88paktu6CF66/xCSklo/Sy+zCDCPg0hUsy+QoxZyvKB+/9h2NqJy72eKlIMxEa/0tzQSrfWvUYkW7XFcnMG5t6fu3aSi+rY1MkFWo+7IjeWwRXLhrFOopIJNIqx4li0Eq1scMpYfAfC9QK0uJYsgcQ3fnWM6w2He+D5Nxrh3uHtwZ43fvK3RyQGU6JPt5jVpHhTicGCD3trsvlFN+TAeRnvH9H5kKVRw6oxD3ZLnvH2X9BkQRutrtdjt6HgPe4a6oRUa7JWVwckOYQdVsfhzxJxjuw56V2kGYqRA+uzH2VrFBy2sROqbFG4IiHbkpyPkR2+Ej1/umKM2sty/uqcURDW7J5PiABn0eVHiMnKKUEvhjc512stWpaLufGSAVbUVOHwKzlsNQ7o4A25C4S+s7UjeRKMaJXjSUoIGFTZNwvwgui/rO5RJ5wb++m75RXi/EbtHI9UI+NCE6fQx2rG7GA0ubw1BfGBM6/KN0FADOgj288EZAFLIUZ/9e38KtaqZPGoAsadVVoeRDY8bikH2hFVG435Wmd7vCHk+eHKsHgHdHOrnv/V/EPZsx0DD/oYsDouz7kQrqw4eex09KaFbRysvXurzIpPr+dk5Dcd4AsKNs/34dK1F5o9fOKGtByRJMA7H829qcj1qhgzBcoHbRDu37FDDbzBekPuuWu6DZpEfeSgDBn6GQuhRMM2Uopcihoh4UU8w/kLN9jmubBtWGbSvh4dm0K+XDJ+vTKDYI0/RZ4nXkOe7kqb8xkppeFdOcIPePrYj+w0ZCZTOv5Ab2OeWYoTSZqERa1TirXXOihcCAS1HJJxkmlsqLFI2b1CpfNZ+iNcYn/rci66bkw/1zIjIqfn6HkFp8uIrdeI8vukKZlPpK3ubpJYfAcJmfNmXUh/GxuhQTrG7Uv+STWZdv0H3ezkMeXG2kk1bIWdKPPmmIRbdE+ACkYdVk7pKexZ1GFSpkFirlCjaQd0632wTffGX+KT/oYTbPYTKajBq/cZG2MlbDgxYlXBtf87RJeHihJpWC9+D3b5Eg5R19llDe4a+hBLI2nbYsfPt7q/gdKGQes/6KqB36PBSNYVOwdaz5psfKqHZeZaaHQxDspaExne8mzF7fUsvOqVFKCXaxWo6mz6F1flKchCz+Uik345GzoHHJ1c/zPkzTXOjO23BoJQxCmcXOT3NPnFNy5DTKr+D3q3Tc4mYZAysDmcwXb5jtJNHJFtdiIuymYfZQkqU6g6laQrVZvNlopXTbWbD0G1/cbrnrxi9NQlb+iWBqq84b8NZIXK+u3/qEl5mNcgGEhhxbcCdJbZ/PEm2zTnmaKEzvsj4rTouNdR4I9QCku/ogwBqNTn6EXAkdLjRHrO1l2sShEjWbrf2n7C5sjcbV7c5es7HeEffkiFB+XumA02ozZX2UxoxPrufsyc2G0+nfSu4KG3Wv5UBqbHQ62HRu+HS49DUS0mvEWex6IztG62nwHDLbfFXIzamCP4KCmUgXeBz3Th7QohHpa5djmWeCTyrsFGuImcVq/z5gF/C2Ls9alWnHZpBCzNPzoUZByEKvgYNK9n3D/QP63lXNXY8p+6xqDSt+ae+kfzGEi42C9ZbpiwBLJzbaQfGoezhxEEoLyDSlG75IBOm86vAUiYYq4LS/Uq6cJGDeEEwurZFF+5aVaAEbrYMLZ7Iu1JvTlUtadQLpK4umIhePTLSPvP9ntiXHGdUIGm5xQglQ95qdQdzbvCvXf8IrnE82JD2Eo5N4x8MnxS7GQ+wbI6wNUmzZlaQzqA7MpnxF6UYoxA4aeoPkpUawdov7Oqx4r+GxaC+hpVlxjI96EErXNr2ARNNFI3rLNo3vLyIcTZlz3ZhxavqNqHHq9whLnZZKIyR1YJtbG1WhcJZh1sqg7UZjuLKPC4NYfIzA2SAQE+WC0HHHZ2d7cj0pgrbAM0YO7N7gBBtGW9eErnE05XNbIuIVMzqGx1fhun/FBttKLhwDu8PmrcPPmI+PJpcT4YLR/jDBT1Eo20uCKh0nHRZXnCrwJuBGc5BxRF0a9DJBUplpZQPJEVizaM/Hn4WKTAWGMqxZOW4xfAEUYuCqIQ1LPUHFQiMvPhULkLYKhuBuZtZBv5jCTLAlNlWEr5X2DS0kNd7sPypJkqfoj3eLsuWfBYDr579b4zXW5SThJE7+AYnqGXvRMk288enXvl3aEfls0432+gwPWzBKx0lOCvbDp3eGdjbtiDa14coyBR0uiDkzsuk7hU1M3q38sA/65KRRXyoZVegyXKyQRTkUobsjDA0dZbHR11j0hBSzEDr9oHsQSYPu4kGruopxm/He1izsFPR79SgO22xO0+PGjJBLsUCBVcSLiFbLcDdIKF90EBE5ACmTfmpkX/giuBlrtXhrU6tMQ+hjzYEtsMcSO9h1DtybkdPigjEE8v1WQRBM2Unsl3Cvak6inOXovMOusAZnvbct81ohHgQ9AmNmN1C8nMbwm0kWtSJziCyVEzG8c4NxknGaxG1Obb7crQ2I/PPFRHcFdIPCX/hUyQyvzhybV7BPmeXLlYxFHuO/20W+ZXfQkTJUyb9JW9G6gNWLUwrhOUH3vhbXqVFysxLH4xl9ZuyjRK1aITiyZ/rwIeUDG9xgeXNh7GA3gAhWOBO+Yxyyj5KkH/UguBCPj4LtTmxIuSemsd+wJ3YX9yPtaCXOHKUiMu7PTjONhJ1T97qze8esC8uk/oimOYqZ6/LwtM6Slwwpq/Lw6lJugU+Odr0YpKhVXOYcjEK8//biLc38Qfo5QxsIKIawoZvBzaiApO6hvv5hi4zHZ0yWTmEmv/hwKjTsbcUliN/L1tt6WrXqmSkkNZYpSSlz6LDkFQwcJbNcykUvdSePxSQ+mlrOtP9zt4xRF2eZEGaz+Uehr/3j+yJn+PhC55ZCf/exboroi3DqZZxGkUsxFTvbBWq83FDVe9IwBtFvXrep0WAIVg7c0kjNX+UCbsZaFF1ebyKuxshuuil8G1ONpqgemLWuKByYe+onYjpjrd//C9J90XdzTzVoV9sAhCThVq0taY6lthNKsPfzalo4TeZrz5I6DNpvFi4reOkHD79C8g7jkzWshd4qdX20obbIGARP6YyjqcPbl9LCL7Xjv9KgClF78LRBdeYLlP/5iWmyGWNAVLbd2+GzNjAs29s1SkQy7WJ4koCuKC1j2Q9LPQ7wFaU7EXzB7qZLR8uifR8zzbgUT8Ns6upkXE1mkbTf9CeBkETTWup23B1tDQNayNTuOFt/1v2hmwjFjmLxAqdCxqRxZJYKR4ERq1ZBDpgf7/sIdN1FHGvG26Oy/n1I6WHhUcbsYQTul/jZ5OdEqK3p9YcJrbopnMz0PaUYTe3UxT3S3yJl/VwbdlGwJoLMdrYVdi5XlN8o1lI55sQU2RyYIHrbL+yoUSH/bEpvxJ0ARHHfYoG1cuSCyvjeBQTIWL9ahivbrtJxJwrORQFBMiWvb2CyETqvZJa5a37T3o8jNzOnApI1D2U9uXXVTVb1wTLTUJUc4RL6BVx4/Jf21B4ZY4A/7qnxyHJfeQ+lx+9G808bJldj1Eoov5KneeieCgWbbHb7jfJw0oT8PhGaPuMTirILwjg5/Wsk/Nmck8dZw8mhmg+XizS6xWMKxyOj9AtUeQMnK+VWsRsSKBfWrdxObY8vqT9MWCuKyGEyH7r0kvxyVZX5jZa991yIcvK4Jt+8YbXfcmcMmBi0AloqOsIhstCFjI2pXFg30sHCVhej381vuhJlG3pfLxfsvbZp2t3rrn1FcnenEM4XsDZPse59bRNWIbvg8h5C0iNU7WKzG+BxUksRuDRQZR1HxpSCqpXZciWTQ+6O38CjZcRfzW4/qYQsP2DEkV+1kIJIleVZ5hyBZEN1AqZDjPDbGIZbV31GOCCSbQLNTEeegFBFRIwOGA114JbEALVQJy3WInAiQhYV16mgeaARx+P1mZ6svJp3RNeiUQ+f2a1gGKeYJbZ3/woQMD/fl8zcf4tizSUzNSPWO7HX7sfYlnhOCravgPw4Ky+A5eiro3dZKXt5crgkci7UXBPwsXo2tQ4/rKSkwbMwDcTML3YiZKzK6JqgExjtSvCUYkRCq6Eic7kzO4JoIS1fIU8HFY0nCdUiwsSFOlc/BUMwGZLWOel1AnyUmsq5FOJd8K0xSWB9fA3r68gpr/fPxLBsNCEpU1bBGSMvnB0JeuSbkDLm6LucHKOr/Ctp5X3Qleza/nWlTHaFzUnnLIOPKnQwbBR3/BbyKfKEVdXE70BzS89kOI05ivBlbRyu8Ol4mt7bsNz/BOvrbSP4Xxe0EGyt/XuhxRavvVDx9usreMz7avv97it8278H2E5r7LUGCz07Wz1tn3j9LSl9uwQPxS5vvP68V7e08LC6oqSpyMEYSSWw62a9r82JuJltTQNKbaiQQ2WdXx9ABmPCbKZTv/LnW7Nk7UOQ+KUzrsxHFJlSwvVpI9khithPMXG9vV5wiO+fi1m9Ym+uEDrxTSyjlJFUKAyk6STgcSLBSEsbmSTZWcYmCZCfIjM3s2yPSV27Kt9h7FEGJlNHosoyuLCvdweC32DPBKU96Bp6P9oi4sMdSAPie1Y3FCk8DWwYm9qReCVkUErsi2rGzqal71NG56sARp6UdFtViFiUoiTktp2qufqViXkpC0R94gRDqVD77ijSWhPBZJKnezXKhsiqJJZdLGm3Z7UJ1t5udLhKNYCrLwz64U/JoOR8eq513YS8R1JCh1SRXF9limpM1bGqJyPimupIQImIxCk0B3yKjnZz25bI+39qTgUgdDLVjEOWQxTaDR6z4qAFlF7urQOvPuqJMZlcR9wETmIYUosiXBqsHBB+xF86Cp634fjvLU4/XiikoaDnvIi2gBDPVuuYR1lvYne6iTgNJCTFRc8fT1wIxtQwcKr/GPGI4VRU0phGgP+5fKJeE2LE9XerYRxUKosxqSByYY+aolqhRnkhqdB4ItMnINuNhGjheZSEsGIDa19PcyZ8bNEGxUMp1UjwzJ0txRHXsxv3D6NPUWEHAFpb+0K/KSjZVEvmd3uPtSuxWjxtLZqbwQUYQEF3DVX7PiE9+6EYyyWlCAN01lw99/b5LDjNOr8T+GSmGRBadw8qd1yuci24eSNxhfhxyh2jyMgk51hfTbz6Qbctswo5nWxyiyMQe6kJ3bl6Ro9GgeZ+Tqq87IIHfNp7hBO2eCfi6l6VY1vQXhQHvqHQWPbU071ZTk9ccifQxj56/QjaAibRgvLL6/XYm+1lybT6Jm49OA5nmht2N3o5ion4gK0VQ9Rg0gC+5wDoyd1bX2cRtW3gxcKNbBtkF/tabf1hX+NG7mO48SBedZPy2crz/SksCg/GsfNXiypznKi4xmMrBTuzCdh1NKNXb5G8CchSk5ji5gSgfPhFeWA5CxHHVFtEZLKpURlL51M8N8F5ow+nRAJbM8hPSIKZ3fBw2/aCT1lhLLR9aGHERVi+RMxMfkf4P/JLQ061Bub03JrEvMJzY2v5DBs4aVm77W8f59Ho56d2kysb4UY1jLRRm0/e6CwUIem2d3p0m98ZRDvK2BIqKW6JJ9uI0J4ZIuX1qkF8J6RBjIqgrpQbfWDO0p2Y7BhtmLbwV9CHbiP0wVs7IRAmXKQBaSp2PVaeyKOuiGI6xICo8EGNuy9kdHm1UQoPrN474rbBxoIuCYXTZr2ojsyeKdWuEAqwEREsaG568DPi5TFB+0+LrasfglEbQZvewH8dXrzMhvdbr6BLteYvXjxK/TZU+1QyZ9W/it3PAyAkI4U8xvJrsZFQL6c/ubuRqqRFNH/G91gTEdazDUK/zJAfoKr67GcmzwnbEwWKExe+GjVesohpyttrNrkiwRbaGzan+3NfFrslycziuymL+28LX83lMPewtVnW9ZRa9G2Zsy8FDOoEkQw3aCnLGq0w1Jkm9qcmhjuyJXGQH2rJMoKvtky17GmEsi623XnjdVTAK6bFdUqzj1VSVWEYCDBPCabGSk9J28kpJuTMLtxl5ftSoRAgfICsmj59GhO0JDqPkkikzmk0KFF2tQ/1wLetfqTCM1NnGi/UJo+fjD1OgJjR0kuKrVS3Ki3iZ0Dfe/HpINoNcfJBW9vgSTm6RIGHyV4xpmZw/C210rpUS2UcrNTlWHtyT46YS4YtLqULy9RJA0fH6e+AXM+TvmOdSrYKyRNPMD1Z7NVMe6kPetJp9ZyMcGKylcZJZZkAjmT7rG5OXn3mAp0FXoOGWpXd/DUhUlyQcq4qZ6fHmj4qdFKn0jAJ3hFo1TweYbIGVHFKpgcPHb4hiacVJPm1YzTzbyvm8EyV8nERtN0jsgib3NGHjLNXthkaY3xHwIKFQJjVnxCvN5fiwPMGYR7ojEpk08oUarI1YDbpYsf48tGsXGIp6h+xfbCI0nfg5IQbnTmnoQ/OcdkdNctPtdT3vZiO/OS5NXImGpdNyXhG17ADntZb/yJamaGdapl2SaSLoni6ilIzaq9GUTADyC9NGzLSZEr2e9hhGGwqIWmYEDHDF4rIKUgm2twTBKHbnANrVQTNn5SLgBU95B5O0CSlQGeun4IrxyIEntHUNtRJqFhUPd93o1oR0oV+OL2W4JOeqarHCRbU5BOd03CqfbD3hW2Afc8IJu+BCyBTCubuL/rIMrAxI6GAEmI8mtEN8IyDnVlsPL0dLh9yu5RuOKW7OFaUdm4ym9jW/w9yT2zJk/+3Jl5ZlGfBi+IXq7JyL5F5sSQ09KVaKbL7NN+hUrXCZNFsPklMijZQUUjizGv4gTSJm378lxf7MiVc9SeQzLZ+DCURzoNLN4dni0F7tVNsZ5x5uWL6nDfX7VpSMzusDc+MWvBAmyM6q2MvgtimPeRGtiImWGgZlvaOFrYiGpP2MUE5Gr7dSm0MmJmCDSPnOV3Qrs1fHIDdh7VrevjuttKwa8iqBzmDEUPGrJldpxFPOlmbIiU4hkORo4CwiY5/BuYcOhrgN2FbtRtHOenU4u1MhwOuzLtOkxWHluAzBTwu5COWHiDNhJ0usaGnCqA9i3uRXcblZVnPDgcXUGJG8cwKxpCRwuVc1zn7xCbtfBUlKs2KWf+7fr1OpeNfaMbAglAmYoxaxb3L4tsBNoAOS6c1Z9T0+p+pqaqEfWCti25d5ewy88yUgylKhghiToWKrsWVaBkn2xR6riIiESxlgNeoeBITlBJKr+acLEYIlCqC3MOP9eKK0nziSUQbSswHx61Ks34rFfYoBoK3juzf6DriXaUa0VNmqLLT43YGgS3DjFHrkTPvV/zosWk+GhvjvyFQu5UYwSUavMvsBj2K4zmtJV2dAgQNKnlRrREb5atDFx+CB2zltR+MITndz7ytlZDeFzrAEqsZppsI6qZO3tTaIxLvNpOud2GDhSVN6CO/TrF2pLnpBiMXFUkxuhk2SIuCw0skejAhFQ71DaGim2PPSsauF5uRtREOh3LHL8uyNj63Agk1vrn5YtOBtMceuZ7uYxbq52eVe1HxjOyPVN6h+VXHrcjAMuu9ZkweXOcONC5Dapv6WQjUE0+K3fIzV8JFrOTDaeHOSkokQWt4bEKKRA2BmtoFqk1uBXkUYX8reAwaqHenMGLklbbqeb3g+0tVRCrWx3VOoCBqh89X+VpoKCbOBz4BTP+LLRi9XAm3Vus7JvJliiM/SvGwa1gKYpdJKgYHM06+p3VXMAsBtMqiYs90OEzWtXr+45Ch0wDayKqA78wXWkFXjbRdf+ndfRVvROVIlUHInv4pWypTkwOL8crazteHiAnGNGf9q7u+6d4hg12kZg9l6dm6a6H5cJlO7OW9nJaoan8+jHuF08DSKglpaI5fLwjsp0YsM5Bfe9K69JALvh9+HfxA+Oc5v1zkm2A0+ZLvtyGcucqMcOoNb0P6XYkwYHhl2bnnnBDjN8iDAl1475lM2igUVxQmenhkPxSmaLmHmXLBzfdldttfjulPifeOJ12qOjgMRS/kWFOn468m25PlL/3Xd12kbEUCscrpRwEW9O2E401ZZdEdaZ0aO/Y4f/yw5xSGYbBWLYcIbRPffxgVFoUhkPfbyzHF0D6VyAf7mBSdx07Y43ka7LBYFk7Jgy7ZjlKCpgnsF+zkRUG9uj4n2CEQ1y04EpEVqTUuK7lpN9uMAXwMtOlY6O+tiNfXQyKmcZBej0YrZxfb5O59YxVJboPXKaVTbZaniu/pfVkoeiALcJQYYorskK9uqiuDacEktHaX9FqkOvKGIpQ6u+4eSh/xtkZB/jfAeA/xoiFtpBaIKxvLR1pzAU0n+wz7R0M3W9QIWp9DEgfHlJbXytG5jdBm+TAe0ve6HbmNGnLCXyaai++PTt8glGR3DWGxHkWQvGTJU4SE6iRof9En9fDnqXr6Hl7MKbxiyL3323z8ub9gSP2F4gVZJbJIWyIA7RRz/Vcz0qaOT+PkPGFtONJjGfj5hhSa6VWl/cRwKspm7jSdduLE7neOtJmpvJsbaTdtzs8pbIgjVSP0Zu8X0srNo+8pYhDFvsIjkRdqN5DyYL2YykRGMCqVtfbL924AWbQ0nipPEm8TDxxbv+cZDfYQYQL40qMKhcgwdzlgfwfiVg9Eig3ib0F8q+qqSe+PLh23oWy6+kdjzWrqck+yUiVPGb04EuTptlpA7e6Ucy/OV/dSpA3nQ3pTt+GP6XYU2YxNcX8DPraY3gsOBo/kqlEjiygiYRmJt7DgkDTL+b5aCxayxPgq2/CYqrr6fbCOpSxHxiCF2NEPK5Y4803JXpJ+ZPbguimdDeXY22yhK8VXUCLKeObqkM6cg5USCCWP20UcHGEVh0ru7pUnbuWXDTKxsj+gdtoMOK2rn4AxQYRgf7+Tvjw9M883d4ton91cnpQLSa4MTfwCQ+Xu42si6bE9qn1A2B1EBNevnKWEKumxgUHRVqqOczPlRRFm28c6IVsgDfrAW0qXQ/eT1PtvBd05Lc551juoFJCYeKPdPxHALa8WRgJ9bYL0VzfnYm5wB3C5ktu+mgXvRiVaeoADHehwt/RJdaerBxCPD8byRSVtYdcib+KQcsLPtG69hygWF6Pvc1l8hA2p1CR4IWzHkDtU5d6qMn/65+GrzaIELDFITxBVyzs7dOBMqlwPYCOFsVcJi7o/XJVxi5J3HXwN8TyPLNovItRVJ94EPhJ/3WFiTv8XNTebpJVDX/LvmmLKPrCmxwPWJsvdY272gpvEhRHpZJE0a5AW9JtaHsNYh0QVsTDZPLHzZeGTH5ckwUtnte2aIgjGwhFc9o4xeGy42y94WbkzhEw1HCHDguXcQa+PebMkakPgOvhKWuLNi/0Nrvc67gvIZF5MAejsHTEtUoz4NhlCCQkjoEYCFoNoe44xHkqRtxDZVCwuUtk3hnx42RF4tfyJD58KZyjSQhlZtFcVgIaBmhiuQHZWxyvmjlN7qo50djGPXi4YasB0km1+Q8egeK1x9U/v0lC75L+zjeGXeLd1ZBW/viuIFT0lWMEdb0jt6VM0QTsgj22bU+0TaqNkVVFgPDaMBMcirCj56B4jSA2/SpDxAgOtKBVlsuryBzIZxcFcYuLZUoYiPD8e4xSXylApdSnJurtR34ypphYEAeKXTWOCzG1StNS6laBF5MlkONNMjcNQbpvWf/wlV/xlsqr/kFvHLvk+1/gmFUw+mYRP/bdeDolQPbs+wDrh0wfYlL31HUJecDMUn8PbuN29CTlkCk+x6Ked/vbTzfHEyIScINiDvnypVBcddw9U+tMuBOEunKDr7IvQPeOkVMZE27WqwF+E7yI7de2NkA9iiy/O8T26EN1F8rnPPERKGzzW+nc+jUKUm95W2JBDd8p3HR1iR8AaLpP5SSHIUPYI4qALfnlDFJikXCTkZQfBOGP3GeGUywbzO5rXS3FM+X8JVzlptRZ/uubsqzmBN74BQOMs75QIeYvieGksLgGjOUWcUkjlV5SGlHvKqMo36glrBGUzHLI/2RDoEhY7INfYNgpqEbtDkdzBjF/n6RcroGGJOSFpUiTZCCg3z5kKHFvch8r702tpGieVjrlj1gDIvFhOfYGxS/68uUAekviCd8lobZG4r9wvkdY5ADsyi/zy0RXFRA+PUat8tCv+9GiRzEi2AihbQwL5jT81RvCkCZuCGocryWr6Zy64zOHMaF6lHud6x19m9OfqjnC1tOHUUx5gKWucUq3/dSYtWyJysPkn6nuzrmauBVPiM8N//jv/7V9PuS2/DkN3WCGOlDUN/OkGTTVikENLMKwXNuXnQizFH2bxmndqPKcIi1hHfHRwSa6lmys1lTSNAi5jF9iTc7zGedLFyfHVqjmhxY4nPsudLGh9PKWdz70PUnIDodOBnaLDeb8s+V396h70QzAg0WwPM0tSTBNYMuVB1iPpvXJcHwcpPPZNWZaYiomTrRWh0YsD2kzwliQoQyMJGzdcKjsqOaj5NrPL85YfTeC2fMgVyGPaOmXpU3KWcoaXZMI3/6wcldzvS9o8a2lGfedXJf62HXPZ8Gcwlq8cxu0itfkimM8DtEZqZTPXIs0G8qc5ZznA3sgCttv5Znj3H040FOjldDOo0EBS/qhtdnJd4lq9e20e+CTLXAkBPDPKr0MPZFV0lnG6LELZATfLf0z3gfhhIH2Z2o5rdpthwwwi5fJwp2ZSVO/reiekRVe4R9ynIDMbchnnF/PmDaGyRW7D/fEfW4qxSiGbqysqBZFNYua+OJSHSzPG+skWzUS8yTwy5hX+CNHt1AYpL+B55i+OaZXEG/nQbEic6y4P0Csns20WDTZt3kRlIbyJnSvom6q9f73A9sIuWD4fzzIxtIytU3mj+IrIV8TH5I3iD1b4uXryz9dQC944FIfwEzFlyL9zKxMqfc/cpz1l3JMTHF7hQZTDbd7Y3cZoZqyKwb+NEaLig23tOHOqJDbGBJm7k64uGFPaLKnduo9g/+3Psj//mikm/n2+xmld/eC0D6zj17o8zJL8pYnTi7fU46d9YV2h9cUT/vyyVG1NSvBGc/Q8i2LwS7jDVEUFwYrdYsfa3taR9b+QbO53RfN1KOrKLLf3vnh3ONapxElaELD3MUjqWIG9lzHiUcAUFrc6EA2nzjqIGrt4XAOa9w3LAj1FZSVmpAmZK0xOD2xY+D1/54OaHOcmBadFV1sNnMwUdofmX6LIFeGT/LoWbfUXiiOSshgDRYfAMi6K412jvQbdKuuQUPtTOxEjqhq/wyjt8y8dLAX6v+OHnOhDHdtO/XDTiK6b43UWqxPhObEawo8gMjLOqDQIZRHd6bF9p+STZby7iiDRNVGLdROpj/4GfhTD+KVF4cRH5B71F36HzGrWnayY1t0XGpyNYPb/pSDfAXhiguXnXfdCZLSxAmlo7+4fsA8okJKKmm9ym6/6fJ6AYtRPjYaOk4fcqF9mVCVvu1UhqFUeEkuIrPGciZdaqmmBBeeWrxGXjrL1A48I1nC+BCmLiZqNH+5x/WVkQium2SPW6Kp+3pXIc9PXnpm/Jlg0FpooUdaGCbwiCzYIdiOxrep55MciGooaf09pVgbaJsu8+sYv+HDuhQWOTRGvwyxA3qRs1d+diHzyf2XUf75Kc3vcS+pv8PsyR++OU1olc1Edi/KjizRnO/SFGRMBXxpRwXfWGwpJ3M2Rap6FsLkAOuahcOQGz+11d/8TiuShLlhvzUrxX/kJp6yssQHfk3mkdXEeS1asQgbktLy6oJyoQVuv7IVqC7N5SmRbZg+oYIQSyDh+ghkBdIwFe1UkkCWqyfMMuuRdFHNQ7IS2/XzLjhMhtxRwSSPzOvP+Pq4oYhHw8OHNqbPJRIy8OHpKwx/i3uwDLjN5aktJVZGfX4294J2ccfEzuztW4ZVeW+Te9RRkyyJ/qdJjdbHLXcx6qD13v+JmjKX5TY8AtXtcuvQ8bOZDX59EEL7vxgI5e54fOuKKJWXcMUA4/Mif6W6pL/2S8xw9ZS7e9MUOTwLDTqfNc9wa1g5LZoF7nF4WRGHYNFKtBXfTWVGlsemZ2ttCqCpB9AXZQ9A/gQTxU+oqFmEnxE9jeGhcGB92xsRb0WQ9fYl08P1T5p7HEe0qQbFg7RRLxeb67qqz+Ryt5U7FEB96AQN+sq/64U0ENUa1Cx7WSHHQHsx/dthVKrVEwVBqJuRAi1mcTyAlOdinuU9yiqhAYlvxMsL+jPvPJWLTpSnvhgpmixRh1CHq47Slzp2eW8ulo96weYcUt57TDyWjQ8KFF+DSXel7UInQOEPL3zsruql/P3mWPcalYYhIJqC6QL61VLkgjDl4ksmcdUC8AVlVIFbC+ZpqLalk+HL9t4DgUM3c0KBzoolWBIFkfQcYT0w8b5uniuR+lNmpv907b7nA34NlYnvnjm8SmryDoX/9JjhsXgk2r2gw9iBk+9V3LKUEBydlmXX5o433j4z944ZeMMpzsBnvjlF8lGPbhyfD1/7TbjTlVj347xarkU6OKrciFZEETA3TOMwzW28du6hjVUatZsSYbvJ7+NuvmjeMXeZ9Tg9IGm+FyjWFWl3o39fjRrphGgt7XWObmO9y4+EEPZk5UDhOeBdrSGnHXSZSJ7wJLHTJjFnknrkkULq/qHBMFpYOySxfzYogkDL4MURq+k2tBsCb5jBpQVORXVZL3wAOSCvibh/3cJxDzPI62WMBqqNAX7eWRLaATjFA26f3QDzUuhLPgTXGt1Ut/jYHCzUiu2MpSsM76ezby4c7jGKbVaXWXWcz5BWEtR6gKSfMqCZccL1acqOsVKTIT2+NIDf3soMwjmjt0Uy1GbMNzISm2B/R0F+XDvXNdpqQEEsMxy6odWV7WHabpqeyY+4t81+bxc9eQlOtWP5DDTTZ4qROsVbRM3HFtdXWi0/B1pnK7pkwlSyng801RUaRpjdzXlM1R5f5iGkHas2ik6djpByaqX6AsfG+QKwnxRsRZKvmSJ/FxIUnAoiQSAvLNSweJW1zEUlz25CIQkXpWsk3+v9ZXJyhyeoYDbuoe7w3zOlbv/c9vhuQgfJV6YTLmK2sPsvqnmzDRD50PGYp7qkuhoqzHdYw5R3jSjIa1S+3tnOd2meemdJzeU6rhO55n1XMQJ92sge2K9gS6S50diE62V4DiRVNnLXXt5sXLEfebc49rZ+0wbClTmN7N9jo8oHbW9Gkxl5os76sHqiG8jnmNp3Uzm/pHHgN/bj02D0eTjwxjOxVlw5dn4/S6T7D5Vup7uS32KkRIzgWymUcnnz+B9XXzPk7rIGG0nehTd2L1MY21EWVoNEs1Z7rDYH2MJHH+kpy2q0r55b76wUTzKbqfa4evTCPKfdJBAsST9e0OAOI0dWd9F8qm/1Y3Uv28IAzAw2DUzbQtfwiusHxNvASdaCu/THRxaIrjlOy8t+SN8Q4vew/dSsa1nzwD/041VZDOaRTFDmCICab6664kwVDRgrarUen5I0eIQw58+6DIixd0wYoB6SOM7eqgrNslpILx6RN4JNMVS1TPZaCGUr1+kar9Y+tqEAVJPZ+2NSSknInqpUVv4l7/qpKmkyfmziO1EefxzjdQWhLAKLlKe7R0Yf9fX5e786AJymfGd4BrX9SzECV8NG6/g0pexu+M+SXzapw+DXa78ZqXI+PG9rbSbnfJ7ygeGe7MVJX6pXNZz3WYMPrG22WOouuwE6Zybtb7aTrK1sL9EPMRWd0IBLBmup7lt4RkafKJB1t4AX9K/h13fgJhimJsyqa38XJf4noOdaoUxbTnBgZTtqpMaJcfciHJYV0WtuYu3W3N0qmp8k5mhHwEnofWPj6yf+Yc/ometpS4JP4V9xnoiyFGktPHfVbwhn3Thr8C0B1oela540IlxjCvWOQcthgWtbADpNhgKU2+2d7B8wDNdY8UznJ3xd7+TiJi9ECzIwU93v6SX3VuEB+BZmxNAu73Da7lE8nu8d/zvH0BwBdKZ/YOwVeDvSoXrCSr6tNwXznTbnXVEEw2IbhtfgBmWe3OYEnJSzqvVMw/OqccIEfnbK40NElzdkBd08CiI8i3mrZsBBKrzZ6BSPgPYtsZxILTvJELm1UOpdaaAOzVZ9FhyQVn3BM2MKT4u+nU2lyKdyd0q+wP7VwJR9pSIlUXoNh5adVcwpkStSnRLCpuMghS3yUcXvXOcJrMFeCgkVzmxE5yc9bHwB1QlX2+BN3uyIjKwhfye0Qi9elBSK2U/pUEYFa/aN8r2RoSwz/x6adqVw9dSjCLd/pCF/ZTijVCPD//VUtb2zS4a6Y/8iSWSVocvzUinFoF3x2RnBiXtIJ14dsaN0kvgU5CmbJT4/FFgQWqwafSUTXJzp+ZQ7jHZ0j2S1Dr92DQa7zRWAd0RCW7Gsp3kVFZpIvy0Nz5Pvt0mwI6DCw3fIWfbFq0T7BXF/a6aBOhyiZgMgFLp38WBGF4JdQgocq0MnQaHqaJULxAjGtJyV/TWyzHHfX/PZ+/+Axx9JczqSpW9z6HebPVnod9opx+Okao0o4slxPJfwbMIPD3j1h6zy0wln1DUeYxzu8Yyq6NzcG/A77hHhZeDYa0rr3FY//Ov7KetjZ4IasTduIuZ9VrHjgYC3KBg+mZCwn0bl0XiQ1YU5f5MElIZif/Pf8Gg6QQ17U0zaPtTohzI0fslCYqFbtGT3v1yfoeNEXs9mgqKL3cp6skerqdeyIIf3vfWdXcTFAZ/GmC2aYOCRuxf3Wft+zFRatfo1xdzb93KQ4Sw7u/OdXp2CWCc/aamfEx1EojPuQiHkRsmDpK9kqydFA7xzxgefiNCxaMOVzOZsk/tZIEuoY1l0SuCXjSSV04YOVhOJ31aBznGz586GZE6y+XBqGw/f+C4t/a/r5gV2u9qazOS3HaJTjezdJZP8YYj06g9yDaudUgxv3hTwe70h9wXOCy72ru22xo9pnw8u2LL2Swc8ci30BVLnD38WTeu7ibIM1ohGfj3BRk0uvojaPr0cRGfobq8SiGFM+Y5mvrGQODcseMUJk4XDkvyqB2iQxiVY/M5ZV8fwzOaA2qeGdlUafCbZUtdw/OIYhNkuzoku/INBmBvnE3EwUQRIp8NZWKAPdJfgcI5tbepgMSyupnYvJK1TSaU0APG4iTC6wDv+UQZ+mtYG9Y6Kg+5BeY5nb20wt6DOwsS3u9j44v1rfWcdpkqqVXTz7ZeqdTKXGy+ZrJDpamCzZptkG93rkYEnd/orETVGk43qkrOLlrswoIO70amHUU+bj89CwyNY/7DpTJNbecRlbUw0pGleyJeaSw83TO+kkVhPNEnMORejSLYi5W+T6sgOtOGxI2Be1+Guuv3WNM2P0iYj1YCcGZlxKIdnQgGoV5sUCKc+rmHtA6cEmHarcLql5MD1KjfTb4G5qNoM3pU47wzvRWlUrSC1YVIhq/3aq2s885/6Mq3hShzjAT2wIV3R7PussBX/jPFVQTXQ1QfQItb+jpk6d3r5y+eDlPff+yV/uX53Ixd/qMF+vH1LxcNHTC513lg6KbYzHD5JlZ1V/PMBM/OUszZZC8NAQD0k8TEqHX3nyhLuZABLNKPKzm4uiMMNoPp9pseJqCfMHmiZ/P07qv1TOClVE3zULjRDlm+bF2RwqfooCvcRYxCUa0UitL1Hwiu482BTFF9m5Kl5G1EzMxTLzcxC3hnzOnPeid3JmNeOnMUjidPHsMmnFxhmW2bN97Z0/HEBGvcFMQHTxU0+kk+MpS6gnB6dMivLzgvPcW9f6gohAY6t5Iws75yrOuYpzzjmHYNQqzjnnQg3z0E2pWV7gudPyEyNqnZZh4pcpSRDQHo59QxBUlXu1S2ibU4kUi168bHPKPXgN6fnM7JVUfK41jCCFpSVZklCR2GUGCiqKrw7QWueBm3UOfgd/77tOC4q/OU8NbQXP4ir/HOdQKzNwOzSEFepJWI55fGQniMAGK5t8NL7V9ICp9jGY6IZ5pCWO+YoQxTYMeYaCokUnJleBUPMUm4skLCeZ3pYC3zzyY8qxmGQB9Btp44V0tlnHNbFdpviyLV4AzFyIacdSyJ0XaNlXHD4mP16KZttytmrcZLEx8eQlanHpLBOzkNzSKTZZ6LxlaCKkPazs2M52heUwBpGA9F1JFuykrsp5rVqETRY5En4Bt9iZ4MUGuq9RERlpHsT5G8ZdflnCHTwGfuhRRxLvFeN9enncw1WQxgVLmX+KeB7t/kiWf9SRvT8R636FMr4QjxQ8r9D7QgSRfv+sQDTV+pI0/LkAp9AZi8PEEQeWryEFxH63vYWetj5KkG7dsB5fu0f9TWGQPnPkFR3OroXtdxjUPUgbRhAMGYfZvH+fXWy0bx7vgDS2+4ftGPmhV+snW5oj7jbB+0fIsUXCLtd8IvMQSJN4PPMQGzCWI5jR902twonvgR02IvtCGXR25hS8Cl9Yl3D8jpn2RYslxMF1QEeTyZvlQl8MWMLBwyo21u6Q7Vf6R6DIOlyGYwWDEymxivyD5IiksUqwKcnr4Wtu5SRKrx2hngj2MRKvS6Xsiun6FkXyqgQhJTqMHDjwM4qpmuPVSCAoTy0sn4vTYqE17TDWZGUcD9M2dgjOIUSlS2XqtQdDlghvhFkQhFzryOQdpsT3dM7oEuYDH+FQ8zlVtGIQ2IlLOGBzelbT6BMv2ZbsCOOCkEaHpOPZXBwy7eaiyAccqigZfpvZuKZ5uQ9XS9IYh8KiwHxooFyzGhc+izwWS2YDp2HZtm2Mx/wxBPeRQbjcGQv3rj8w9mEmgdnASCOmK4w8w5LQq/udlFyzQ04i3+s5Ei37n/n6EzyQ/7NCN2h4EkRtfvwHdXiHwQ5kZUcfA5JyvMlxLps+uBkZFhnHyXWVcodesZUrP/UBm2BgA6k+/wQ9Ch+jFpnVLHzEwDVXEAmRg3JfNaIcF+T3tD5cR86fEEAS2TYuihoowWW419gYt0hQwVs2MPIF9Yb1nPB/enqC/TsCBm8qy8T/PjcYpoq0N8uslJFOWJ7VRmtD9TY9ZgUpbRrdOITSyyn4ZPSxC6JX+R6j0lqhyY2TBcFi9YGavhP7shjksGEVkMXy6uq8E1erF2VB6MOw3ZaEqs0m8KcplOWxneym209jrPCzbH8vkH7s2qUCto8T2oTSpiNYybxFgp20V3sHpnJOJn1AmXmTVxzXM+VMnBpVzCxDz/DtdMskihJAdCDnhg2JIaOiKx/kXGNMgazS1hioqt7YITlxZHBo2XhS+IE3iLm3Jz8K8jsGgQDkHUVCxCPFpMzmF5zgLZsTThZV+GZDHFYY4kni2hpXzRjF2+KjalKmQ8Hyg6pDkKptfe7tYwbOrTldpox9j1XPmFsdL2JsVNyEZuSp6VrzX1w8J8rlbuqhKtN1LG5rzcVKzKrUlSpl8+b9GgzWjy/734/iwKxGyRBvA/TgcTKNREMhwT1YTCTvOKDlc5eOcHUlrpZ7/E5/bZBokjoWYs+zqhVnIaofuutfKBQR+XZYV59FsqxP+Pu31hfwh2KWkPKfOkPumZJENqkJLVrmx0449RLLepkU8kKJnctBw2WyHzAsSTSlNJPHIu7S9aLYCNWjpS4kCDZu0Atv+SEyJOjX2X4T6kB0BJrPQS/32fZ930stMuTdAX2lCkoubsUnR67C+Pedh66HmkGmszVfzbyCLTgIP+jfff65hRifMJgo6Rg5zWWO1WnMtRtTfs0C6z8hqNbSXjvynp9OpUT7i5heF9NIl06XEDrwfpnrIX0PO3iFaV7hXSeyIqf5HmRpAK29fi29WzKpnVAdz0X9GL9flLR2ZMlm/JA81l5Te4lbJRmgzEXdrGlb7nu4augZKm+5hKI/fGmcoVMkHC1mQFi1nmmJ8XXk8OveHvnRq4/goQE+Hiqg8MIic5NmnWw3mawYQ5ub7PWE9FA6UGqFD0rrQ3a7Dq7E1c2OLt/yLP8SdGXArLtz0QUD2pNuudhYaTrGTZlH0FiXYGppzdgGAmhu9vJJqaH8gmvtS0H/PXxM70li9TF0z7Dh9jm/cdnzJAdCvofUXFxQpfs9ksNOOk5e9htg/ux1YXon6fkrNH5Y61zpgpPKT94dnol2120KcAdwqHcMT3LQp8qjwCBwVTvXbUG5mo4iCPnav6aH/LxRyk51W2BuYpk47nRMy0Q2gUKd2yoTUSgnjOjI0zJdyG9jcjnW/xMiUpW2I/jSkEFBSEL2rzS+u4taiOMFmLhTBY4b2r/V0+ZhJNZuh9a4d+lw5ZjkW3lyGThf5cTXfGDaUfFUrL3YaBuVeabU3FIssy46a3qaoqYoD03RX857bu4ezd+1uQljHwm42uuPj11uP2v/1ngdn2MacyhEfpUYAGCeiz4ywyFkyiJRD7ca4lWbdaiFNRiHWUiYCrV6xpXhQJbNsYsdcayHrGfM5G5Od1CZoNLdXHGwzMnWzz51YCGTKo0Qc2BPTsph0mlsovLd8Ar1p0mzghdQdKcuEJ/U1Y+xfjPzceqJDxJjJS1fyDCPtGCYp4kYKiWRig69X7Ef+wctsMmTxCZCCN/ukRYyrTAKk4BUjWbxogN+LZdXuIwqq/WWYSbIEQ8nYs4uxWLh2aauTnkx16sgtsrOq6YLQj2sdYHGf/KAb9B1c1W8VFZTAjPfAdtyEN657IWApy+7+xoMePCQcTz91F/oqhClxMUR7UC2tYKU9gW7bIooR6kURMnSADm+j8iryQBvbdgOjO1mUOOY3CMKv1r/VIrmZ/d97bVHUpzjuaTle7TVVmX6xHH14WsHyNfKLEl8fVHFHZUA8PfYawqSIeW7Dc5mTCntJp1Lw6TDfTD3RfMO+Rrs3pTpcS58unVljWE6Nyezs6wN1xMBgrRxkZajAUowlkvADEWJJLPVGkvZ47sPOrISSSGftTZ3BHMVsp3cE4nbrFt4nrAz/XY0J1ZOjlaZMsayPE3SxhwmuE6MggLQl/quFhwpkQsK2LCDyJ9eh4gXH6uqkNVuxRq5A1EXOcuqgHF/vJCnv4bT8mMberW4jlRcbz9zS7vaHY7vdikDx5APl0OiNeKHHqOJf5v6I1EKPJo2blnBwfF24KRXijVNt5fFITE/8o+WAvwqF+WgiSmvUDns5Zr+ilb14GilASeeiIfTYYIIkgzEsNn0bCnheyMM5KMH5R/3nKwQINHW/TGRJwH3s+nS5elKPTSVPMWHPy/+lJqOhYvT9ICS8ekuk7zIRycwmutsdqmZBQRn8GrD2pOCwz4V8/1N0+35q0kcyQd8+SlSik6kSvZeeJFdN9niKBRV3QOSxz9wre51GGaaHF1jUKsqzUqPutwGsaHGducxZ22Rc5MDX2ZhtPwgmwI0GPugpT3TSN8ZzdugxWxy2qxSB9nH1ZId0q1PdCRDmnTYpI93TV0wwoBmIgzZyz/XTkylDxMBILLD4xwiq4nv1HcJe8EUz8Q4qk5hMBDuCkOao0FYWkKmht1cxacGWBD6qIp/ts5nw2CXV9RkDsgqWUIyY0+DSwtAmwBeXtPZCdN8wYPF6+n3JdsFM5RM3SyffrXjFA/5NXaJ5V1cfgYXR9N+/Yctb20xjjJI2deYCRop7QzNPciZn6VmTJ9CsaP1xBIajLuTqq7vCtFcvA8vs2MHSjp36AzdDQw/dRMtZcRBbgsPzwh8vkso3fDyepQL8xfsV6CpCI3mxoB61qjXJpf1CVDCFV5BIDVKKzY7wtOosy3A1VFFxuzeNUwcGxettFHKk+fSWlIO0eY73fOxlsFkuFnCj+/Zl8rgUwxFIVHxxm2gDGWhRso0s4178WB4ZOJTpF9CCXywKPdck3uFYQlr35z09NJLYBn4hUCdF+StzeOcJsEI3eJ6jjqNcjFZfA4VIHUDxZIPe/z60yb7VySdsvsbNdWAS4Jkby0sKz0HA/Zjdn7KbbngO9eEVSvvQuu26/E5xpab0vNRWNopDrwmJ38jCp76FvR62vXw9MTVlUnhT7zRMSiPt+m8zdNmLmJsYfAxg/VEXtcqiwu1/RzR1yzfOGMe1Lc0d2XHrH+StANVppQi5Lqki6OliWWZ/F1Q4BDGxSHMXjM6ZoACF1DCZJK87PdEbxKA0jL/LdHwubOeYXKQXgxTLg2oSqtNg71hvTQRD6GOU1e9Jr5zHGOZIdd8LD/h0ec4rvlZ1+dhYL8bCfOXydXfujDENWBL28m2m3McziyAwXdwrKWQGVLP6pWhflLdQ+vr2FEjGCXuajjvXNMqPwJw9yYyJ3ST0j08Nh656vjTZWC/MmFbD1Pb7y1A2ZQbsMC8gG0bzyTz5ZqskyoXjpYdAts5Wb3/w482ouXWjvlAHk92EqbyOAl/At7lSz0xnB4NUCsLq9ATkYgHu85zpvxf3MIE9gZVvpIVpo+HY+ZzbrusLF2EBevCojbkrj2sTG+1/z5e1hHuQtI8RFf6Oy4CfexlWGGuYD5XLmEVL1HX/Vx0hBZNTS3YtMq1cMQyGWgSevRJs9VEResERaTes8AOg52yqZNjYUeMK3qgd8pkmx8rzI+ia2EnJqL4CrxuyQfCoz5pYNTggrhRqP2FQjHAzUA3Ceh4xd49lcVKuijZ30VlEu+C4pzgu3XITYeUOdLExum95k1IU5ZNQ17H7f/RM4TcwTvvG2Q2ApXWBuJFVmEa49JNMaHdBZNlUz9P0KsDb21PYAvc1ne7tsKmEDJ0teXkJZ2djCUXyjgIKpvI3GHrZFUI0r/FoK/adwHJ1O3ekR52mzVdxG1RLDckA1qq4wcVc/EXdZljEVRC1w8m3pYsC51PZdfYCqibri699jW2eGhekbBzG8TbuZDXaX93BN3+Yxubb94lDQ7CsEyTc5OwbxolE35OR27pHogNPwmax3GpnrXVAFLtPszZFjoRRB9JKohosz2kMoPd3j/QF2HgrR3BPdzFHs0i3+DmqMuvfGB9B+SZwCYoETJdien0713JLcuqnVpaK3cN1OB7rYfzLMDjxw2NE+DL8XWjmj25GczSTiECkc5EsDtXfuUwL0Z+GH8/IHK0/ap17wLlIZhmGkNIfE8URq3PlJ9DmV2IR+3MuRY+Coz+rzw1GDfw7JBbOZXz4VK1OkMg1O6qdxY6kLFYmEy8Nv0vRuIOytLk2wWwkrql2UREv35P9FrQ6jlk872nRXg29G7hsf7tZAdm+CEtKgEpBSbxMfJSgkGMYbfzsAcSYLcnuFY5OWnY6HSl7B5YFHYneTfAMDUHnBSPwAPdAjfBbxF3UAx+H/ImpHVC9vfXwLZf6rc9X0DfvLY/iSV0+IFzg2MMwz6AoHbdQpnz7Gt4beKkZ6UOPUfsrpuR3n1nvoDaomX5cTr7O652k7cwpmU9zE2wCMkQ3FgfcHVWBe/Wk2jR5XEKbugvUXuEemi57XfopesvlkC67iLVM9/rNSWDq8iWxHRxG25ikTmjKj0toD2AMk4cBKixyeI4ObgI0Nj32RNAe4Ey8E0zDaOnf10AsTvDNYuwDYeUyoMN+hlZwY7hZRxJ7ifOWfDMblYILB2BezNoqL2q4/VAgTeLOWFDaMR0AJs8Qvs/Hi45Qf/mEDUnaHIpDh/p6fIPxYJQE7yR0J1HfDit2Sm9Flbw9YfMjUMGdPZw8ktFJntTBUa1EY7Cd6X8o4aJZwyqAUofT+GCoBICklbMAgAsU4mZ7+90Li+OSNKd/BdQ8bjCkoxD5C50IGWecqm46xQLkG5p3HRQxomiOzFC/XaTURHyAVjPR2kHqGH5EA1OX3ckgSzZfSBvhqsR0/z31cFZTSyUovykN1Nxv1r0Sp0CSUuE3/o1m29vHPclV9CUYmyV3oZYwfLMPegEA3VJPIkF9fbJ9dn0Tcb5rdAoBRdUTN7EG+yweCrHm2BTJlGm7fAUGKLcr/+/QsFsgEERX7LK79CSO+k0cgQJ42eOVTdufbYYhJHsJB62wHFZbKpwM8gF54gaaTPYyViMmzzZAgjZlU2rudw9FAFeD1vuwWx/PYHy4ReXJxTvC1t/CLM8WnhkVwlb80RQTrCkxy/09JDFc7h0X12Fh1WhEwnlsCpp+Pb3ZINyZtT/0654SYq0419HGSFzpjKDNRf2F4vd1Q1at18/fh/9pxvdarrg452K2S7O2hIElrpswZa/RZVUIMdKk3sRfLj2ABbYKSXOSXMp330D1EFQhk5DKKJCVeEGCh5yEsFTY7iTj/S76YuhmPZuI4WbgUsm4Eyvh7z77k9K36tIP+6xZHm+fz7DDiHqkqNuWGJL88jAjrCPfFGxcRcRN1hIM2CulB7yjVO96NEhZC96dAi5EGNVRwlUTJsdEb1Dg5VvanNopz5GdSkOb20uHD8xaFV7HUh3N89xhW7VibOe/C2pD64Jp11duH0vfJZ3vpTUR8/FNduz5hRL8AFlpZ4HFdIt5fJfmcUH/IYvbr2Jyza8y9nc3dv0Zh/smyGJwF6OYkneL3a9JdcYL04dDZ2gWycrg6ILzb8B0RZ6QFQ6w4++zUEnIVUOKaQSRbC2C9uTLI4bavLe1lO/RCrNDhp73QyWlf5ladFpW1y7qgomcf9laQBMkLRiYCgR+J2vQgB7dfZaP46EKXcRnri/sao7PtXnIT5uJDqwvk6+hjV5LhbVJ62OfBqcTI+TTSnD7bsprKsAw0UiSJHwPsL9ERGlCaqjw2/pvVRkygRbEahORxNkNBvXuwMeV0vNgZ/c+Lgtsbs8e50MW274qopVllU7FNpKM4xo2kR/iN94Fja/UpawLnaCFIHpYVmAVmLm4GKOynUW+Nl6YJffbjDGeilSD/v/oA+1WJ9W459YeuAswlo4/mDx4hTmqu/L2LY8g9XGg3MmPN+GkeZQg1UfbnJyVgn0KJHjhVg4XRCLwQIlw7hQa1uNzkJutlAyBQYpNuAkuuzwkszGPK2zH5Pyp1HeaQcb/oPAdV26nXhaU4x0Qsm4qckY4v9VOf25yshyKmTIHhhEY6NIgv3RbVrbfC+eQs5Tfiw+159cmb/8LCjQGtmgjXqofnWD+Su7hpBEAtW6zXfTb1C/zmVqsPbzNjC0qJmwT6a9Nt83IF5YWDSJZlkl/nNhWvTgOrJ5u8XrXX/+Po0oOMExVfw/HM19H5Jk2ZG4QZR6gkyuiQCNQWs0eZ8m9qedcsi7bkAbith87XLaW//LxaY95Ria91sEBAg3BCfVQBd2Y4xrUu2VSkCoCWcw6Fa1z1el4ndPhVc97xmvzYccMWz0nZ3hM/Zu002nnurqPx2JngaIK++cRPTd0lACgXGCiIp1SCw9dCxLcNFJATESSRMLW/Z2Y2Mj57u/Gpc/ir4g8rPhQpnsqYTWIYtWOKmwfXqkCykbSQ4zFAK1glqUGTzFw/ke8jwE6q94lhCRySRnMoRVhYzQT/iihgX+oLM8OHf5lmQ6jOoZYx7KM3sHDqYK4KodsippZDNwbBne/a0gYvU3oC+40SAYp/+4Y6+G+guV7OEF6HVFWzB+EzB4UjIJjHkCzjSAKA061EWc34Pa5bcEeZB/DrE+ZcC/MDG7nSUQSV6LwqT0dEYuTO4igbaRmwYg1iN6baaBTQZ1telFPosXxuSCZ3ouRqPjH9TYw+BuWwMb0/1L+a8jWByIjlNJSqFjfCKwx49j1mBZHuUC2aZDzn2akfW44D1DuGMRNFZqmNz2tM8VrQilo6UwjUkEQlaOLXdoH+T/MQqAeszaeSXRTXAXcDcQNNk4yVNzbTVPS8A534FRTUtZBw8VmZPqBU8E60XVDsF6y0OjNh4vAkU31kHUBIvLBj/mjw1RvGcMNeW708MCo1BrEMB6LdN3Sw2RnVAMth9JywAhc97ecnCxNoubJOa01K5NhwMgctFDmKDzy0tOcEQLiVuA+22LjEMM7S9iRuBuIIC8iS9wNvvqtQxPhh5Sc2VQfq1ARRgXooktad1wYa5W4koKmX/4NiWdal8S65zSV8n9gKNLASMpfn+rZlJYkYk46uPoUQchn8riOqnOyICAufbs/OWHSBeG33ovQDOMsUuP/8U8MK0A645+KmBIasBIiRRiZKBQ0AE56pGAUlTSSYqXrlGJpBsY0z7MqATDtdH2XYqtI0cy5g/z22Qg5/wQdEvPFN3iEC/C/KHB9cSG8p+d1CEuBkpEes08Yg7JxH9yWHUiZLOZt84ymuCVAAb5a+EL/PZD7oHPpWVUfKkaO/8hVb37b95L3DzojzPhxyfw6b9qHEu0/0D+c80+Xa2Tf8N/1latVBpJ/eeyDRDD3r2ZYXCTGxPITpkzahtJ+HOjQO0zq1WuKND5DT2yKtN+ysZDhmwSG9Or75YHpwqCMy7WX73Lf5EnDAA0wX/1PAowyXYtneeHSCIH/fZYRTmjkIw7jos5ek4ntFFlBzdpfpcre9P/9Afnf1/93mZYDeU/2uhlXSV3cuuChYcmqAQGMo1tzw5otRjSeyo9iVi9Xex+bsNqZkv9Zo+s9KupYFYaPiEtGLDvE3qI4JygjrTF+0W0BEwr8ohU7ewsxzL8RZKWW3A95Ze/aA23LOj2i64Je64U0Ev8fzNFQNFkQh1I5Ueru2HqLFXyl/qQ9mP3gc4XmDLDHY8xrSaRMlVQeL2//PBEGZa4z4I5fILTcNLuhM5R9hg90WTX1+mabzWDNvVxfJWldxoMbPl2cZs1aAwG+hCWGsAUpK88sDwyVJLs21bxi939ZUXoenJ3/OuTbdmv7mJ/rd39xVRZv3YOrouGitKHWHITvr+3FGiYd5Y1A709BWXXRH1tx4fnfdpDLe+fYguA3obR8EhT2i7lPtHcropu9h0ng+fi1PtVfjtwOX5AkaPX3Hdz+f6US3/vzyR8upHe3XGubEFvwZMeWYQp+heVYBPtBvYyMKpTjq+/fNPUfdN8S8TfIupaUdrNWWTu9cTO+mSzvb7hEVqgEp/WqOmqe2ZzQM2xOE8NQW9P4Gk9eaunyp9NtlwGrs65peLehilrI+Wz7x8LwjYhPmX9/H5/31zf4+2f/h3GL5qs4v4tSYJ9LGhaeuGbtqPVzuILB+r/mxJ59MSukrajcY+oxE9uOi8PennkplGn3mQV+AnhHA78mFIElGwscfW977U1bJNwsCtZZyUPh1izYiQX1g2huYjaM1Cr8UnDyw6ygCmG7+d8rFmwIKjDKEB6/snpYZJRcxTMBV8z2yxCY5teRTwZUPcT6TWDo25IbR+Z6JVrJfS467OvhyrPKNlvCRHopcmMp5jnVVRHEAlJj8kTustz0DN1HkVWqHunSx3ktivbDwOYvcqNtBbrzKwxakssu0Z8YsPq/nSfWXbD5wBctaaamOjDeoGHDxb0dgBk7t/Bv2KkedPBc+f9PMQmDHWVHk19nYTt41edpg75h8ZToDGhlpIQKCzCiHs8pef2nJSwo2l1b+hERQlthVq99L/GI5F76vwbl1z/ydKXqSZPrn4ic7yxuqw8ylV/8zT+E82Bfr09mKymXC8sSMvYagWzFa39xcWVxeGhP5Z51wFPpdXzAzbZruclszIi7a/5YrJI03p8ZsfTSIYtDVRyvzGV/GXt9ZvWPhcE9+/nSjaGBdhB/vDnpU124+u2tNI+5m6TfMQaf11RdPBHCVZ76jhQlh0ecketE+W0BK9tx7Qf8FBW/mqB157hR+kc7di2LfHUYW6NaD2lL/jijo0J/xZctolhNTD8VpLntmc7Dwy3Hd60ibNhQ/mnBN/sCdrUPsVjLaDBCEnPWsqrMp53AdBf+620c3/d2a7bLrIW4/xxY6tey1JeXu++wqpTfsq/hVG1Nn1vs1CH9iXWR6jTRffrTry5X+YzZzpI2PxVPkNj+86zKCjCqi2gIBL3Lzz7qh2/wGFgEYNcHcRObY6iOQ3fxNEZP8TSWVoN1bb53xDOw9+GyQVvDAcXq3eGhcvmD5UWpTNuXSkb452rLGk8uG7lzLi6ifLO+M5O+WAa7NayM+28b+XW1HyIcmU6ulVuTEu3WfrXSwHPI+Hj/++v+GYzuVe+2xzcZ3m1WXho5aeZfZQn8+hReWHee8xyYp59auWtOX2O8htJu81nssKqBdZkCwsYhTzDuoBIeYElTJp8wCB8SCqscnyM7VrnEE1OrFuAKTMsGYtzAy3F9csxjsJMQv7CvoAKGeHngsu5o9DcwTkWjMW8O/QHhjiLVRFadGVQmW/z+pApndr8qyOl9/Yh1nulH1a4NFUJ2YWX7hXBrj19rLX4mtWHVGWt/VUfjNKwO9ZnlRn7y9NW6dZuPR0rHdrturmpyFjrZYHKyTackcphH3FdQg0lw2pAjfJJ0sd4L0+wriBDzutmhslO/sSqCnafKWLVBh36wFsP+Kb+BlME9z2kuu4MO8CFMwMGALwsxP9ks0R1SbDIfXW5dEhfCZJ70N0KPhoTYOrHyKuMpc/5zcNQeaiIMm46c/bG7zTOZqJrXQTYD8FwXChvnB0EvSipjnuyoX2v2q6cnBDq0s+k6x7QCHbP0odeLPYbOEty1mY26Ryqe+zA6lfTZLVjRgiQ6JESxKB5cId5pzM/jr0sGHOy4B+ciA+LWZyXUx6Y/5VhxtXBJDCh6YK5LSY2PYBztfucM1cv+mSA/Dsw5E+MOSxQKLb5Mi8iH3U34nkQLyEYE3cbUY4/Nm0hHYBp3WkVyvvDdQqvg7LXHMHmveE0plPYEPgQ55dUa9CPpKTyj3J9qU22F24fHzrTPXOc8kXYWc6Z/GmgtdkEM767JHoLF4DPJhtxHagN2sMITVdZtIEAh7H7rVHHtkv4SyL5aAV1Hz45tTxSVWBjyZ5oUdwzRG1z9k8MKRL9hu2oCwnZ6SVXR8if2lGasRZ4MJaQnB0Da0KFa8Pu5aQ6fabQFy2TYTiRNv5r0zLS4A8AuG2PAbWCPCBKhqMWQHku2mXXktZgPE7sCBWgzCdpM/eza1wd8E/z3pU6qTohvW2Q2ThZwR9lx/hj6NG2Y6T4EqIKJ3S2QeDUl3E4kpAU5lfVPFxC0hLzj1FhKcNnwG3/hsTRkUi+cliVtXcO3Vtgqojt3EwbB4H0/izuvDpzfWcUxcLIPPtvfDGwPeGnU3tLfpThartLWitFL89ZxYhQ2fA4xO5b/hxGHt9yB1miaSU4irJwFQW51Jj3htGOFJPrwPN5kPeWp5MzW2Hlm+TYaSxDREc/pBwbWUBydp7Z6bzK9g7Ai9khbMyqc3F+YS9TBKyvesZJkrAckkBFOrIOiV8WOo/q1XaXwucQvvWok7apqCKhqIxvLS/ZPQC9P/s8c9n5sjWkZ7vpYeHNiSVYQeZJhK/Dkp43C7DyXsTvaZR63Wy/d+PT/WugiRrNS12CNUR54+Hd5yIvN+GUjprYMAIschc15qKPVc1O7hCy3SxWEDRPL9uQHunzORxyRlYRyXOpekzUZB+zZm6ls/m5o61sMxX2n1gEFs4sqvjhw4jNsIGj6xKXpV0aKZIWeyG8elnQqpj3GY8nAA41J9fIcwfQaUnOpQdU3f1o1F4NvdS/mwFNeExXnbclyd4lVKGSlWac0j5ZA4KxP6R0fHTGlcF5iuwswzvAtMEMEcUfeaLKUrTFIj2+LIPmca1nN3grEqaUqFFx4h0/KFevPNG8x7XslC5U3CMkSnQU4h+LbtCAIKitiKqLxsGfVGWiBmCD/b87R7Rn3zVDtf6AyPqTc0Tz5IjhyePfG2N09MCUHnp9XqeDbLWkcDgJacuRO2+trwCO9Nq++XmJpsRoQW+mgxiGYRi3P+c0eZH/2DU/m+6ouk+/BZ2uu8PZs4SBSAUs1yMERyEy/zF7Y8IQ7fKi13fbz/3dSd1zKnWAHdpCpSk1uyVMspwliVbUaTYSSG8ffRmNwIgK+nWKz8dUT8ymkeLahWkoSAmJPXSILEtD971/zR8D684RTjmMJ3HWPNOZOR2QXc0MP8H2Sz7IEMowD73rFQNRYRGjJE0UJxJ678krSeYWBKhjKTBljWZBXZZmsed3TFO4IUfOHgLzLU2CJBfw70RmsOVMaCbN88O5mmH58vHJC/thymTajsAdwoCEPycW1Zm4JJwgHvcepo1n9OLbPGsDwrsvTM9zGXZHRJK48ZgZcvkMcxnc5yBqwe400LoYH2ohK9Xzo/mRBNJtekPZWQs2wMLvNQwZqZeFLTKYoha+X9OWmC/xMIdJs7PnG7p9hrAhTs+Noo8MjtKIrhtmWrluXhB4ZZEcSs0eL1BToqNn1FPTQeb2XZyHswZONwjHZBUf0X0o8NLPquSSDSXFOHdEnb23StJ3xfGdIYzL3mviKE3f+EruVXs/psy/URNK6quc97ECM24lhXvZosjv69Rhp+EUbyTIJ1Sjnr4l3tyP4s2abZDuPCLVpnsiSY+OCXMH9QNZ5K1H3HTbEVrvjt6vp4D55CSMt8yj8zSE5JCshuWAjrXA75HkneXxvQwVnVuFJ9bCJ+BSJWZkuPD2PqOBs6RjzyV0ASDZI21ek40+u9NPDQ+zHCo0Lz4qSvolO9bd+NJ7DrVooCdvC5X4K92nWYdcohIIZH5dsSFg+Ox1E/LO+KJsHXsa4D/bD5pkc5pdzt+Ejg6VxcfN5w5uxGS14MmOiObHlWUielR9GbOIhD1rvT09LJIMkQGdSRLjKexRyoxaoIvOPcRLufA98wMCkbdzp0fi0rpDaf7nIHJZlig2SiYCw4WdOI93NPLDRaHRfqg/IDGieiTp8Tzg8lqOTvY6i4lgI1dO6OeQIIe306hEBkqiSanqOHwBJgkMtPtOlzmtmb/jbD20IAJjxqo2z8sis+jF/WfP+Dd57kHggqdB47v29mwLUvPGGgQ6bIvPo4kVmIILVLJCfhf1AXME0oQQkZ0KinxQk06Gbvsex2czL992RAh20kkIska5GWaCovA788Na/rODgXN2nZ4g0t/t5B25xhnSEYOWczzPVXNuWozhq9nuT+fppYcOXLTDlfYuErK/bzq2ziV6G02fWDAHnBM+uE7cpbFBkgspwtLLH1uwGN/zLrk8N/PBq+Lc/C+8DzN2eSbrm0D6rSHo2OBJ2xOMyCpcF92v+Ypobv1KQLZtmaYlYdTNcpPg54Ze6ELbj4lCPsZJc1BtQvRy4U6YTecjITgj/oRhGIYROwY765fdXWhL0mgBFDOzJqJPFkB47mIOLt0eNlHOBBVNYR6dnVyMoWMCqy19eRXjAUf7q0ickeBfs9p5FtJpTe8ieAH4USQlLFrU+cXsduLQc0V3h2decPaQ37T/8l46q4kpYEARy0vdOPiKoL0DDXhDhmHmILClvBMNmaBcnMm304mqwscQNZoyNZGe7+MnSJJvG7kOOzIGESJXxV31QJWgaiyREDf6+7PA3j8dUEkDsltI1AbI9Qxjz1EeUMkMclO19NtDVfakLme8X2Y/v+ERHp0PkmwTYwmQgTyQCuqhOZFA1giCmg/upboKIRv25JJ0NCUirxYyz7Ts+oMT4Ce3tgypNspKxC2+SA2LuGGYJK747xk22T79E3mvpdW1w9fDzYJ+oYeVaxCHQOrJoLjmTOK+VxipUmJ8sA6G1qoaq6UrbRfsNj1wf/oxl+7E2+yRmBdVcz4LX0jUao2Aa9BrJiY83lp5cOOuXfHFLEAOyjbLfdak9sMpg9JWNyNDnCzff3Pmm3p0/+wziRhXNEl80lDHRYeeC/foJLz94A5zavsMOnZyE4eJbzbCVrF7DG2Fv623ZZBqHl/js/af20vxvvslSoJXqXky72DXMrfnXsHtok24Qlq7me8g37uoDqrPUu46D1HqFxwapZfFG9WoQnvRq5+0GzTwTwdhpYwT+9/P5GqtSDweCvw4Q7wA1nAiXB6iIFmCjRsyY/FQLdMNVUE1DAFHXx7vGfQzWyKHGmIvcitniMpfyDS6TL9z1P4IiR2vappCAlHb+8tC+CY/J9SrOltkxSUv7Bq8NaZFMSf8SMy9XaTSnN6urSyLwr/SSYP2sHKUY+MbvGvMn0Kfy/3MmvazoOV5gWkB4RDsjLoZq9HzBFvNbuTJDehMhx+elOdMeDbjw07sLCAWX9LeCR3a+0VTFoy7aWssq1tsA7jSAT+h71nABGNXO9C9nSROxXJujo91yRUvLqXcMp9T3ddaSA6aFEthgrV1cbtwYmoyO37rL4aB+qPinRT+OAh4ONXYkB7KVbtUF7zwSe5K7TX7QdHrLVDFUVrL+2rNxoxznpvX1mAHcFr+fMeEqsG4+EuZXP7cNGmUFTuinK0nB7955vswL5WPKofpjfNTdBeYBKGFB7yVIot+deLPAE9iF0kUCDxevSNvg3roXHNG+R9nhynQv/RVysNZ0dc0VFBdYUFLYvE1Tq8fQFgyc1ukaNALxEOlpv4Cxtq2uxelsVsSJ6UX+DQbDz0YHTegNeS91wCTog5mtC+d5xrrSdz2o7hGrugHAe4kLnQ+d0GLcVHGCl9/6IdlfZ/K5H4BXmGzavettIZ1rcJEQ8SM80qb8ZMTKrJZNLM4DMMwfHuO+t0gd8BGetleiwQTjY4jMoErEVUz+MB1ZMtruCsCUMKAnf0mgZfPdgw6Kw64//4T99+5yilF3VCDSRJrxgVU+/ukB1p+J9F4sSAvh67WFB0VW4mZVFOLmfm//kf1M+xqfDTiw2TLyV2ahqeGy0fhhoKmotX35QOYf2LorRSXgiXq2g/hahJMMXP+6U2OeYzkH346DhHA3pfpDyW2pYZmrLjmNP1AdPXhUmMdEuiUJ0pmBL5NpxCxD759/YDHthrsVbFh1FsOC57gw2VAMPZjQT0ScDLFsEEel6cKG5QaMYUv16xEbOuuxdd3WilLIK9BBLPUuZINLDMtYVMoCNEUeR1WRh7lFLc7p5NuxXgkhVvC5PjbEsTKWx8hf4VqiJkpOEeSgbIxGB8N5cbF3tSR1ORVY7dohgLbqlFxzzWqU1bLN+mCmyvd0lLPJNmuQO2X7gOmrDe1z8TIIdTMAD/6zpnb9bphSRSD41qMcdypdt9G9Ws3likorZuMvPIB1VuvgwIRRo31Sug7cCQj9nESw8vQIXQCA/RcgRRLWUbpqPOxYM0HJGzvRyGN22vcF8kiTICU+wT27XGyojJKvbp5CqEeN3gbz+ZVWO8PNvNsIDx0qKmxvqyruKQJDmGVxNhLx/vC8ol8+Xz/LkemcrjAN28dkuSWTGOwBdhU6b5PrGMFAtfnwI799+kqxfsQ4dTiosaKS7xY8eEGgOnxG57b+BI2WE/u/z3mr9/hgHdMy/qIkEILGUoEShCpE/EpLMar6y2dQtHW5+xPW51HnF6fx5eyj3QqJH1YaTu6XjqiXvehTVRDiEdTQ12nNm+k71dG5i9o/TjVQnWi2Rt36B9YLSjzCgzUud8QR3pikwiICQi/BYSNMg2HDi/s6FNbbuF2mG6v14KV1Ak0BKnS/h2tksTwrcFYewqMirg5moUGHYTyypaFe/LRlGISYKieqZWgDq7r5AdRkLLw37iboOaym6l6ucxRoFyEQ7OgJ/oEuql6WCNotvBk+asBUoS3DqPoPpnc0Cckpp7Y5OwEWM3eRUFJzja1mzgbPUz6Hco8n4VX7xUghtQDwUtU9y0/jRYF6Jwpvs4nwzdVOv4NASHJTwzHWzv4QC5StgO+6Gm4xH7TOFX2AzQX7I6A4SByUAANOVc2IKOpFT4c9X+QzyQ08fXFfJJxlpv3uwF5ROP5XEJtqefGrnGAxrTQNc4JCuLD2xmqeuGSwdBvfdnYYmXzWX+E5K6GFxjHFYTAZRr6e8uRa2IrsHMle31T48cgxfKKkuK1c5xs190mqL1m56G3Nt5Av1Uj01lxiPSWr1dw7saotHRiKbw+cjAdhg7MR3dnXeBIzFVvclSrAsMwDONQ19RSlWObnhDhq/9/hVJg/7HfjnL+3uyhn6eouC1YednqaRuV1GG0S9DtoZuxXShsFiCsOaYKcmhgulSnoyv+uEfjHMFFKA8Uuu7qGhBF/lvWYF96+Hjw+fj8dQ8P8ruw6Fx2rlR74dyXV6fbotpMFEE+8Z7EYbRpuw/Vy7d8BA440WpnWg3M+GrFECxmZ1memIncmjhi0+v3gpXKyP9xFSIGQE8mVIFxyToRZ3aR9zK4EJUbm5x/FKtUnbyBCv5KbHAPDPlfEE9J7eYpP+E1pxwbiC0bWfWbZSO584CddKZDboLOfsXhCFgpf/QA2zE6raG9og/PrTfJPEhLoRTn1YWZy0/Hm1rwZMH3J+d3ONZV3Qqa6gfsVArL8KaNGalV8mNrCJFN4FUU/7I6cPVZuQQIdDdHSqGEuTBhMyVCu2aSsulPzz43yNy7o4S8FM66HH4voq4AKNco4SaShryLLrZ4t6P8JzYAXQnSXcDTQB4TYyI/zs/Bvz0mjxUC4e+nL08bs4xklcbLVPPE/MkoGulhhYSZcuB6JxrgTEKnsQ/Bhhdiveq4Lp9TaW2D6CTbbp6k3f34ep5KFVxQBJTyjChcFhQv3UPjwWWS/3qzNai0m1OhE/P83acO/tlkHrcPC8d6izuJ6Yr0pKts2UFF4snN+WiuzLjeELJcvd7r285wC63D15NPnyNew0wqvppyRedfLHWxSH++RFYuXhHzoW2d1ytqnEKdlMSTUz9yIJHx2lL31gL8KMbPXxicyAmvI6mNOofFg8sFNRDNcYi2E1DAU4lXg4Z2uN07R/kHpwJPt/Er6DtjtBS+vWAdAdaCYn8/1gZUL5OE9C7cwz2Kwte5dpi5JjNuGvzSaKUCVSUmYiMNWG7Ak3jnnnH29PejSEoHx8QQiUJmQevgAso4bDYkmcA4d/hS2xlMdFMvxrHRjbDZLBcCB4mbXOOi+YNhv1Midex1ziBbX0959JXm+vBZCnLD2lvGPmT2mJK2Kf1QnAukbfbsqw8KQbEf+xwj4ZGYB0D3VkKHHARhMzeqLJeyRiDVOBPSavJieos0MqvNn+TG8gQ7GeGIqvme6sc3MEQna0RuuToHTZv4VU5xOmXH1bQSxYBHD7sQmDNg9on8gZAl3B1+q86VPFgpR3Trxjn4/XJSKqm8omiIAJ/GVqBWOvqTwHsyTmpeWZEV0xhStKU4byhHukzhy3ohEpHNvGxX2B5HxInZ91qZJq7/R4ISHehAMQkqfV/rNVSEP2TTdV5Irtnx1k08QM76fYUYRBWFX8gySx1vmhlyyrO79Tp2m380Lw7J0wY2oabxrdQkBPicS0AqgntMt5Z7rN5lmfQzKC2rtGXuSyK+WU+jLnq8do2l7Rj7hngoDRrDMBGrEpw5aPt14edJFynESHdD2qbgle47aZPCcKSbSTWFMtH9QxpSiBXdZ9JlCoKuN2lMYejoskung1Du6U6aVAYhPtLtunQ+CP6je23SPAjDE100Kb8I5YzuvybFQYgfdPdNuvgiuKd7adJ0EIYruosunR2Eckr3SyO5E2JLd9Wk7V7wQve1SZu9MHyjm5pU90L5TPdXk4a9EC/pHpt0uRdc0D03aTwRhnd0Z006XQrlF93bJpWlELd0t006Xwp+ofvZpHkpDL/RaVKOQil0a0hRhfiX7i6ki1FwRXcIaarC8IFuG9JZFcoj3buQHIR4Q3cd0nYWfKX7FtJmFobvdJuQ6iyUS7q/QxpmIf6m+xTS5SyY6JaQxp0wbOhqSKc7oXylexNS2QnxD937kM53gr/ofoQ074ThBd0QUv4plLd0/4cUCyH+o3sI6eJPwSPdMaRpIQw3dJchnS2E8pruj5DKKMKNNjukqo6li/KJg91aq/NRxPqTNtumahhLF90zB69Zq3kUUZ612btUXY6lC2ccRNYqX0V059rsOlXja4lYn3PwX9YqjiJ812bfUnV6LBHlJwf3WauLVxHrn9psk6pyLBHdNQcvWavpKKJca7O/U3V+LBHecnCx1ursKKJ7pc0+pWo+loj1Kw5+SavsRZi12ZKq3JeI0nNwlbXaTiLWvTarqYqpRHQPHHzNWm0mEeVBm71J1cW+RLjlYMpa1UlEd6HN3qdqmkrE+oKDv7JWwyTCP9rsR6rOphJRTjh4zFpdTiLWJ9psSJV3pYvuPQfPWavxnYjyXpv9n6rtqnThJwdnWavTlYjuf232kKrNqnSx/p+Dt1mrshLhszY7pqquShfljoPbrNX5SsT6TptdpmpYlS66vzj4mbWaVyLKX2L2R1JdrkoXsNeYBSVLZ29kNlHSyt6ema5kSfZOmW2aku7Y+8BsaEqWE/YKs7Ep6cDeR2YllCw79s6ZzaGkga6nNG6FYU2Xq3Q6CuUL3UlKKKGxE0xKU8LIzsTEqoQ9O7pJGZRwys6mmbhTwgd2hmZSlkoo7IzNxEEJH9kpYVJ2SjhnZw4TWyXcsBNpUo5KmNmZ0uQSkkRzxvIPBoK3QiiRbO/JjhX544tj0ndXQze/HpsvvvWlYf93RWux/V2x6yL9P5itnmb+2lo/R37mxQOEjidb80fKkfQ5LqpD3O23M5/7EF+PaPm+8G28+GL4pujmu78r7svzonOz/+kEf229VUMwk/3+XzUCsn7JPojcLe3R9IeqmObuOv+uweQZ3d4kD2VAeSwLyoP9wfdkFgjOHS44ePvPjADYWwFXGMpbA/liREeDAZxKM2fhPB1M3ilOmiavzdk74QCuHdMx4pgzOqo5CQm4vZ7V+xL4tSAyhwul5fFPKaqhlglHdQAX548YcjmS8Y5rpcDMPXCDL10rYG4U0P/oQJLUNfeGMpnMvWdJZUXGcn+1p6pGiQy4xXJQy6JfzfuqGojeNCXpWaXSW6B5K1IVsbnBrIGdUivuVJXUrR0tnzvCAfY7rSUXO/p8+df44ljKZoJLVJXnzZ2AMdZk88w+9dgKiUzvF/7Kcdf9nwe+5JmR1T0+CnqP2HzdAZexiQRQoJFqY0mvY4zsGndu0tZMtTQ40o33DQ8IElK1W9oVHRWaHzmiV2j7lnJ8exCnuxtryBOXFpLpCHH+rXs1hEulGle3ytGcnsXRNr01bu3W8mwe9eyebUcnKTS92Bn7LOorg0EDepodhJHVjTPylhKQk4khZGT1qLy1PWieTiZjSBz8afC/Sz6Kahul2FQ9hsJYWoxFr4MWpbSaWpbReOdaGU18ABPJNGUSm/L3/Pa9qblVJhvulNkm3CsHm/SgpJlHZaEpbALHzc+HEsM+XZfHFZZEbhETo/0Z8g7RwUvrEgwsXV3et5L7pLI/yY1IdXk/rtMr4NNqn/8PtGModa6N2Db0A/WI0PE0IK8Rd4z2FfkeUcIUX74oY3+WRB/oC9QnrkousMzIirhq6BW5IGrD8VDMHWKT6BPqN3blxYhlhbxE3DRjny6QD4gu8bJEDohhxTKi/kYrOWL5iBy7993ZaFynL8h9I9YDjlWpc5fEdkC/p35HSDx1yNaI2zDa98gPjSgHvOyU6COJ/oB+ivqC6/I4YvmBPG3EdaCfIZ8aUb/guFDMJYjNHv2zUeKmPI9YXiLPGzGlsU3vkR8b0e3xckSWRgx3WLaor2glZyy35NyIyzR5/IL83Ij1EsdJGeZtEtsl+i/q/wgneHqHvGnEXbqzh9w1olRT3K+VYe6T6Cv6I2o2reSB5V9kNuJqQC/IHkQdcbwv5tKIzYx+iTo3N+X5iOVv5EUjbgZjmz4g74PoZrw8ISOI4YDlDeqqaSUDyz/IKbROlrpOP5GPQax3OJ4pdV4Hsd2hf0X90Qg7PG2QV0HcHkb7AXkbRFng5apEv1uJfoH+GvVlc10eJyz/Ic+CuD7Q3yKfg6h/4niqmK3EZkT/pOxyTTflacTyjNwmMe2NbTpH3iXRjXj5hrQSwxbLGvXvppWcsFwjN0lc7k0e18hPSayPOH5WhrmuxPaI/hP1v0Z4xdM58jqJu73RfoN8n0SZNJ0y9mMS/YR+gvrcXJVcYXlA1iSulug9ckmi7nH8VcxdEJsV+h3qQ7MrL0csf5GXSdwsjX26Rj4k0a3w8hs5JDG8w/Ie9a8mvaywBHJkF/1o7NMdco9Yw7Eo5q4RW+gN9RAEeIJsiNtqtN8iPyBKw8sHZezfrUTf0Jeoi3BVHiuWA3mKuK7oA/IJUTuOj4q5IDaBvlN2eZJuytMRywJ5jphmY5veIj8iusDLd2RBDA1LRT0NrWTDMiFnxOVs8vgJ+RmxThwvlWHeJLFN9CPqryCseBqRN4i72Wi/Ru46UQZT3H9Rxn5YiX5Af0J9DFclj1juyezE1Q69Q/ZG1MTxq2IuSWwO6FfUr2FXFiOWU+RFJ252xj59Qt43ojvg5QUyGjF8wXKG+jq0kjssn5FTKwLjOj0jHxux3uP4VqnzOontHv0b6s8g3OFpi7xqxO3CaP8GeduIssTLjRL9Pol+if4b9SRcl8cjll/kWSOuF+jvkM+NqCdY6NkJAfCraFkaGD9QCiF8Gwhft00LKIUYbUpovcK01lAKobMU34TABpDaa1kLsTqFSNOdroeWdaD0gOg6gei6bNOkcA5hwjQntIEJDXAaYR5pw8NJm95h9i7YeKQB+1EbB3ASMHvfMHvnbVrCScCIVCJ8wwjv4D8YoXQgKARqIozvqWAkPxATR1IcSVmiPhMoiCgw0gwJhTAlJ4aRkV11mIPGGWbfqGYYCkCIcDxQzcTb8As0RXTWkzbwWhF1g6sVT4yxKYqALMKyivaMCoUykhgpThI5x/adIIgADMQQBwAHecyBAWxwwAoCMpARFAxcA4Y7SGVfgEYLBhsG7hj7fAXvFuzDgV8DMdy5Tge2bEseBCwNe4C13gFogKEAAOm4g6Trl4RGbFKzQ8Uxrx02eXHMnYdVQ5950sN/Auy1h1RLA5OxesIVUC+C8QCi01+HCrt3Re44EExL0NqKVTZY/qeK/ep8ubG1yJ6HA27sxs3KH0HS89fD8c/pyWpLrByL26jbOCtR8J/QcFmet1+yKYxrDW3QYvrzB+bSW4h5p/5LQI74s/1K37rP4+qpRKdBHxdGun82VC5gw8guTA1qP12TLf1/Qd7+X/Lz9bQdoknu52vlouDfFud71pdlsW+ekz48Rd+h2l/fN1/7522Zjkh42STWQNWDzIfpMayaPOLhbVPcvk1ndK/hZ+3zKBs28/7HLpKrx/OpOFeHbz1d361en/JLIpqeA3g13yS9Ql/bqMfRWLB3EwmmAIkCaoCSQyDnnifqsMoI3H/Up/U6B/1USB3H97wJRvBd0kuSlbWlG3+wf10U6ghW9TycsGNVAvrxdFSXbKLOcHHR4XuVwK9kGlKJetDpzC8Rw3vJoLcLFJg/pQ/zAd5nG3UYCxnOuku3ll5RBtjO5iuezNGUzGEJ/f/JwDh/uhZAILpx/T05QzIkIMDQYCXeTzs0dshwhWW+dnfbo5LgEGoeDx8SSMdoE4EALST5RhvvvUMKn3HC712dv//VDPfzMnlp2Paab6jpiZZurC8n5UGm2r3Q9ZlWo35TCAoQyfCUhb3k4PHFImhsdWhpbqRfzv4Bn5RBAoEKpIIfXM1OaBUzzaKu4lXfS0ip3xPdYgrw6/vYT6aeQqoJBU37oSvHa4FKwLlSHdLOemJHvTvONuUCqjBYUYr5p0jaz//RGWmOX/om6jvzdzy5O1l8aEE3dT7LWLQoZBRA9CM9mIpKjuU8GbKJes1+ozyBP3Vd/jXV/ZSvUI/xGRc8J8fD9VIeY2d9FHWS725qYDJQA4qVVpo2fUU2ZfatF2zDFL5MCQyqpdFLEzDJe2YeQYNsFVaJFKScen/1z2PhwPnUfN+L86PVbOM71W0r9svJcC2B++XkLq/XE4kYwtAxjll1c18vXRd3swVGzNJ5ScAxi+ITfHGFCol09WzvwItKWckO78rzB84jksZ25OZh2A8YNW7FsdmNyQ2BIBVB92SB4mEefBPXMumsY5/sU63uqUI0FfTqVQIJJESIB4OX1OthXsl1KB5OLiQR6Mcm7dEzBiFA8VAxOtOkIAo1YENJq2vv5axuUb5+ADKSLOwTWkxJhvfG1loC3w4ebmZlXiLNSqQ9xB2+00caTXOPIps4g1oaHkovKiNW5Z3dpAqVoM5AyXGpJrWoo+4SOR95QH4bHKAfk0glbQEyzFkPqL8SgUVVlF0teyc1K6TostDAcxvDD5eMWPNjebLPkq2faATqKomrqsSdiESFqpdsiMqiRdJkfhRchSCD2YdGBk/oZkIPjnoywz1GU3YFxcwIyk6Rjtk7hbUWM57VEp2DFJrfDK/s/EtTsrPt1pKbveMxzDRNg5482XXr8YlNvk7z5HlI0Jl0lqPlkvHJtC76LHID6cd+0u+uzv5GI9HJBf5e8yFQb7qFmyunH2SyvphROzRe0RiL++6vyAEtuEycv/1IuaJRahOznQj+K1LOSifrW0ChOBOnyT4XEyw1Rh2adOOYC5VWXt3wCi3McJwMzpJ/InLv9Rps+zKUSjFsjLRHQQuZamiaNv9xTZayXrfVbqeRffalLcdKIVWlYXNDuRnHds/6ZCRxFvfzPb2aDdSpmqUlRO2aMB5vQDEH7QL5EYA8bX+8ZYeq1gmbA2XtvAbkBI6z6CHJOZ3TSQf8ZpkBcVqoTAfanWaF8V2CxENfDIV8QNJQT2VpCGfvDA+syAn0r4gDJ9V9cPgPVAOnjD3Qw9v4BNp5EvSgzrUrM+JgSV8Wyl/LUtYzpumTQZZYltKbVL3x/m+c+wqgd6t0hh+W4O3MEJo3oJe3pQhAaXzgQleby1/Kam9gQ5Kdm4phm6w/LeZssy1aUgAnUnPuSn9OCM74q9Oog+rHNxG6yHK+yvOobIbXUr91z0a3ZKYSnSs+chilna7YoN0tex+vkP3s+s/q5WNFMvajNSXVBKWo0T9cMRF0ewhqj+i6OQiYPak3jnunkPSJJY0Y1L+VTLb+WR+AkYTsMmYhTPnTP0PmKZg1BqHEhaKu86GVuwopNuoty9+Q1S0VsvKYlEljsVls+Xhz6cM6y4VC+sOrtK7Epz66GhR5bROSjYdl7JGa05nEwLRlGrRNluoyq8O1tdn+unbZmgidclSwkO8Jc9XI4NolhWI/Gd/vWJmol7eAIKYlcte67DWRwaIJ6v0DMgKTyP+ZimoeLZ0Hz0p8B76F70GZeckL6PADLZRt+N5U/FmKlL6BRdhUI0ZSVF1dNHi911JsPSlpQ7gw+Bk4IsQntoPiE9usgpzKA6794It9oQ8GOz7MWzotwDh+xlI+8nBYIUpt/n5W+1uPPRjJcWmxN0L0UybO2CoNvSfzeCn8i6xL5nFsRtvrST/enyKNq0ca1XFl2HCzPBVzp1jO4OI5pwODZ87TjsdoQJhqXkAr6REGbJ/4qqiu6RfsHpSUtIbjBWwydo9zvH8MYl7Y5vR+o9jbBbwewduQcBC6mVqajpdlCyi8zMIgH6wGKLsX+780DdYDUDe/4+N2+iEzD+kLvKID2w0sPUniJ0QmT/OzdrHWeDgtSLv75BAWZNJdM8BZFaCXaA9V3s5XLYmdI42NhX5MZCQsv03Dyg68a5eCNjsbf6HhrfuVLKnL7P99Wf4Vc5G6qTYv5kR44gcn0N2Vb0MT05qKtB4+5pH/a6sKfjzNn2FiRbzxJ6ipfgzHQ8GlbJV/MCg0GSToV/k3POrm77X6unqbz6QGfeazjZwN6cFpPCa8DL5kKK4fQZWJp3xI+1OQpu6ZgInmmoMzZhNosChmNtoWrgGWE+cSIQjDg5xqLXajN/HAjzxnrf+Obig/u/3m3qHk48yI8nqvCYvRHjckcOaYBxLtZhjf/xvurLC80p72jGbfMlxU37GlmCxRCv0fZlnPL+aW0aIDd4oke47jFvd4hByPXVzuiz+IY2U+noS0Qof+fmPzrpyaf+jHLDc2xv1xXGcV0zmwbQajlnJ8PBQWyTn4kpmXFHyVMfec6+vAJvoEYurng8rncNlCPb8t4SbQZvLZuZSleZe9cNPcrFCsTtnx/W3QvDuOzb08Aypwq7mU13nUfkVXQbUz0rHB+3FF6+3Xwn+Ys/IZ67c/fh6zpNftw+ZhufAvjD397bdl3zuoML/XrjDzvzlNnXstaD/XN+X2PZYpWZB+hNgM1iuCD6n/Io+ZiGRXtmff5qWEc6bHcw5lgfpJUC74IIIz1sXX37mWTe+wmKowVV4aG0pwRB+kGTX3oZJf50bzN/EzGc8F+WJcGVzAV0fcWdMo2GcvM2f+BH/lg6p/BOytTTgIE4d0Fe+bwje5GUICLwLZKm/TIGlR2SzPf6ebBrBoZOxUCRD2vFnt4yFcw4OQWxSi8D0eOX7s39u9j1wCzquuwdggcF4ZxeOzOxYMhDVY4svOAXc+Mm7+HwHgq4OKZadE8yaYBqGXPOVPJBItE6R6ouHhaJGNo5gF0r8LZav5EHPC/anMhYqvshftR+ii/u8SlMBM8bzJHztv4O5C18dvaK5UF+o8W4Dk0msk8OrSOD9yWOdZuYYclVGWPnmzKmF8ptSO86JQh3dYUGx5NaL86MmP9vZlnyiSzkq9M3SgV+uWhzaZPjaAyXSvrv3hibARRoUM61mrRxxxits3grk4Z5odNx0qBihvHV7IBTUIKN/UUNiuG0L4t+1kVaTgefuuabMNQURnp8hOezFmn/L76IsOHbL0zjvAWMh+BXmU1vlDGXFKQhp0Y6b4TkeBEaubUhc+Nqcfbaz0focTB6q07XRqxXm205nqziliGeccEzEF413cWVEkf4XlXqW4vmaGes/zO0zRan3M5JmbD7dZI8ECG2Om+J7w/uSYerRSe/j5+yv9ANYrMBrOAbzfFIxgVlNXOLwnNbynsEn52x2zziVAQ6mMbhE0jN9d4Dc62ofBen3ZlDh2GiwQRDvmMxZDW5bLiXUKMInehSKUnUFqcXAvMMiQmzoPuA+02feHVpHtCsXJNNbPMxulQsn3065Jpjx1nqbV7hm08M+NwwStnRtK/odom+yM6L2jrdmbfxEHoqLPohKVqGTXq8QYqlvert6WKFniUxQnNzpa75jSrXoSfeRPWDmvdQlpYuFpEapI8LSqoo9Him38XuFuuKK4tOqs8yAbf3Tc4u5WiU9RiJyD5/z9+hQScPUCn28ZpPj5xZ8IiAfNA+R19ezKvUdo5OpHsgDKXuEulMgW7iW7+D6AhKrvSFwg997oDvyIkxZVDs8ix5tP57JXWiofB981Gj/u/sI47u+SbJzNj1SOPcy7hw2zP//4t3kMcUL0leLBV1PYYanY5R8POezkxjYcQDGxidmlkI5A79/siu/9yda+Dz6HpOC0UmmOJCQySylO/aEkKwVOugpe7GkH9nENO3Fe4SHaYUK+vXo/VaAv1YAahUZVC2Silr9YLSpRy67llcFUxB3CCO4Uh+eMH9/x8IGZb2Yt8CGFOwrpI7ZgJzmthJlf+Mn6TaWu8VEkMlaQKauEbGN9a/+Apdydvvf2BfCLwGDxBUkYORo/k9hyGwAzb39XCdAbR9yHodMJUoBMg6qg71WEuY2TYHswCf17gCm4Ejtew8DT+OGQRR3E5L7GUJQw8prhxOG7kEIlhZm3zziCMQ3NLvS9PUG58v2AjIaxt0lo07jNZBf63tbxqP39KmEaH3zuWni5rCn0vU5mnbfVqjljr1XULd+mq+5NA/V+q8gTcxCQ8d4qyJJPf5O71QITr2Nxo94W1yoMo4wfLnsBaux6ImGO40LgO5hFtj8XmxhbhTP2GpHzjG1Ypdv1hMCf+bOJrqo3DdLi7tdR0+7DNGcVROCTqUm5rLoz9sSXS+todqbrGWZezZDwmJysltgqqqCI8HrFoTD9PzONumsNhl5HuPg4DZo/0A8rlqJWOv9IYrcLq8h0c+upLxOoNXL4L6HLdacCYI9wJ81Pi+nMOO9HEJtqyWM0ho0vTKiY2QR8Cz40P1KW1WKIz18YpwKWkSTgiRBi0KNkmAbk2U+2WCw5lxoAa+q5OLI8YoN0AgZLXSpOTOXltm4X89QMwuTaWHlFwDtZ/d96qtFSSviF3A3ae+RUPWLG988CByq7DSgvrzbfP96vV4wwAnmlHaC18dUx8Xw3zLu3xn4oWYXyKj+QjGyA8PrYSS/FyMmolJ81xqbiyhYBR/JeGQdgT8EEJPlcWg8v1MxS/5MGSqLKd+hkf+e3CBhnvmMj7jZjdciKacEFgUAESbnDZJWCuYr/Mu4nvswP3hPohdChkbloM2ZwgmLyyahYoiXIiD6MZUAzxkCSJemDgJVE/qAJKvR/t0l2mmpa/z4OB3zPYCSh/PD02DjwBm6UjxFoxUyBL8S5oaRwVQo8gH8R+wWXBGuf4R5j3hdEsrFh4uDTtqYA4+XoxfMDLipZ32SGJ6AipjO5pnF18bjnvHCj7bw3dz9hrD+XTxzPjOQos9XJqEGRZ1QC39j4BCqR38mVqCf4rPiFrernhwrwz7KewAD3TxnuS44CWcykttaNyyxozlxpE1IwjRNOV55Wfk7shCuCL2snEYa/ES//cXlayyob8/VOMhB4b5GsyevyvLeT9otlUebIqc75Hq32XGBZvniogW9cfoo+o7vzJ+6M0VPLz/ii7symgnJzsz6ptSvVPkzELrd74Wg6Gn6mc7aTBBS5bRkq6mSW/a6wOyVnUn0Qee7myZcBCm42f/K+z1rvzTd0yTzXltHMat4D7eYIYsV5gnZzkUZXnHfauAmlWff8DpmfWDdA88F572i3SRjQcYTEzC0IdCjlsTpp8secnKrZFqTurCj4c1BOpR0y4cCT24sXp7KBimdmSY1psGpmrwScwpq+w5mnptq44Y0X05pH5Sktj8F5U+4aeZbNciG8Ormh+nDJP3wS5RfqmhT3WUsAFepEIp2n5rQqpyYG2qtU1Nuu7koW1cupJJCGLBh2IgT6C3EWsLlH4lz48vVAUOiD+ezfGIdq9DL3lH3gLYpkAZbJXfnYxHdZsjaGYJ7UwtCRwz/KIiY4gNQCQGxBkvWtHBINeKSgWLALnfM0CsryFkHKAOcuzuwXZMGgLtf8rhSMQhLNCSChtFjeZUX6vk0v13WRTRLL7duIsHcADInxM3bbF2twOzG/q+BYQBJT0/VxuwACUcVpQ+kCZPbYB2O/q6JGUMdvZS96qYUIBhBAdvdv0dyUYk5q8ol2AlYZFzNhngCTDBjZOCIo1bHQflkmP1ERjMxl7pvDTcgrBUjjPh0kLlaXZ33lQVClQHOagVhsQjZ6INXPZjPWe6Dnc41NUX2yQFHjIO7Guw7WmfS272Iz5ISWm7Me4BkOY46UlhRDuGVgX7o+FXydcP89/ApD3Y/F8il3nSOBqsgGGTGyE+ZTsfQSEAUWCuKq8s35zP4C41ifGTEPEFQMJCqKiMARYhvomNab8bErXIPQ/PzRQsjBWtZvUjOklFAYnPSNuJdBMOoYK4GsVHrJ7kh/OJ0qwX8YCl/5wpxDidXGIZ1wbeIHwrvy0gGSDlYIyGOR1cDQz+DXAWS+mqvqxLK1fB7BuIypNJQ2L+vKev9EEeyQ3Eh3uzD/hupApQ5LNwPdOTiqhvbEG1kk6uB7BO1E4h626ogzJR3G4COLQuSYeU+nurqXK8PdDCtILxUghKUwJXSOzvdThqSB9wGaBzi6FzJnRiJSwmmBGgVCSXdRDmbPfhA5jKpO1X+zpXA5anfeSL+UAAG58LN1EJtXCTC1X10ELcdyFfWPOG8i2mLZicaNlwgkg7RtTIOngi2MLdimikoa2nZLQyJ9OWDWQWfXc/J6rT+Yei8a2vDOz6jVdOQXZWDUH1nJHUP7kS6p6Nye8eIIHDr2EIBvnOxkg+V4rNvIJaBiyQdKpDB6fP98AQAJb8oktTCevHpOGxoapXpNx/ssuoY+Ge/Gf1zEL0Ccdhm5jIkpaK3O51yUQmIGb/mIUB8vJfMhn9ZgPNf/ln/X8kzFS3wEczmQj2A/XJGgENUSo8uMjWjhMAODH/E3DtrApJhQSxsa75I04NPDylzzPGF3QgzHJugMAUYrGCIHgqtNBUrdto4bamASIfq6IjAa87TymMIDfExAH4SXjosqGxOPIAqy5QCRitOsSkOFyeioAXJ4SGeoRiPHhJNSAtLYe8s9rgiyC76PesQpkp6+Bo3yJWpFyaBpGrBlwWjkBPkFWUhQ4CTJkMujh4Ik3/sNkehDpgBidRDdGIoU5tBaJFHqzjTPBCPLnq2jWhrHnCRTzR7XMQqxpM1EhzuciJg9MPgiNSpSNw+WeD4BwT1bZzudtfwAxAZdXoageaOAMNH/mx+pIad1PzDEPPaqmgLHCtBARAc0goWOgpSSso+GK44NV98oqRdJpM8HIqvfQh2SYCDwifl9YvtWPeEolthTHoybormYyAK8+RFR09YVixseTlCq/3dM7BpVnM0H2XCS05s3Nvau/KOK/lHUubR1Er8n+NFxX8Jt1mCYZqTzp3F3kdBAa0CQZDIZzY8jTkFPM28Xk7J5BtoMObbr6asr1GMhVccLCtsnGqeYIXqTrgpYvsQIyZVknFEj8PSm6Lq0aceIosPfee58J+FYEcLZDA5iMG4SNArqFuAVgmSPBDZPGQtuPehLZua6Q8WokgGiNM9DOUjzPu6s2A7CwUTwzdBnE/CuPBg2RBDYUFrlVcGO+GVHA85HcY5CrMVbJDUs6oO077PhPwOi7AGToc/6DtdavKCaUzR48Da6dZXQXGbU1L1+uCE9ORUsc0yE1EKZWqbmMc1g3AzPsiVZgquyL8DHokbq0gQn8H0WJ87iuiikoZv6oCLR+DyMHelnROCzjTqhn8oMWNHgUz0PSiAwNQgK4i5yVDgFifBx4Y20ANFw7DUKro+Ifxd9uuOpKWVvZSyAS/Iab4pk+fb3U5i/0NDiQrFVLxw8yLiksK6rp+9doBZEhD4NYry4Y30KfHfQBVUwj+UMs+McSAgmDFca4tBscMeALAyzN5+mMQtefJjwCtcENxg8I3igA3F6JxsmOJI1MU2AE6TuEBk7pmyqKyO8KeCIwAUIas0a4n9HcaLlYCHptjuy9c865uWdr0pXnQhncO786WoEgyOj0e1nzPKTxHgAi8+vMpB9RxLi/QWL/rrr1D9ErMPBVKPCpsZUDTBXU0MkwVmq41+HqZkLJMSAHU36DEBoQv3rsYVkfhjnhWY9POaaIHISbTOuzsL3Qj7ffPcsBSdQeST1ntk/+Tz+OusrVMgrh0+dRXmLfPc7d42e0X/J5ikYIoOaie81cq4fAY9jmzN3x1++9xegRINnks1N0Qku/x551WvfsXPJuOiKd9p64OiOBz/UfJW6H8GwkTeHwR+DFLfaSY1FZIJYNOiaWZDZZ9NsgZvS+4iMeRLi5kIGKFo6Nmg+H7LprXHty/v8PPOHFJqtd4c45bLn3Fn3XvTT3HUPGuRAsFexWX+7bFgO5Rxq1LwhiM2skL3ALsWOGegFJo2wmuJntLH9/YsBoPj2QVCFFDPTkqcLRSDfi8sIO9YYedkEyBdGgjwaqvFIuZq4a4MJiWYXnAyoL0gcGi942iPASM7uLHPG2Qtk7Ikx0RKab7YPKLjXdILZLx6obxh6DySOcTnkw8Yce5FE+Xs4cNHcaXpw4SA9z1KQpQwWPkE2FFF2G6OtCLxhG6a8eyNkPPpYJw7ZC598/9oq3gwsB1fjNDoptmCbGrxkDVL+9ySO2JptNboncXAAxHDCNef0ouiI4m+Qp6LvQvF39IZ1f6NcKJ74QjHvQgEbkE02cCRs4oHYDy6VTh9nWDn/TvGaM4wN+GbhsRRP+KsG/j+m9Eg6A8/SGXH9xgi6uBZj+rdtv9HxeNyj6GrzmNI+Z7TySO3jV2DC3ckuBG/U5j9Wo6QbPiTzUywD6y1krpiYkwEsJQc4l+xhftIju/iL6S0eQ6ESnUz9QCbm4sPl96UVNQU2Y1SuMII4h8Cf21uWUL/wgrf8uCM/jM+Jk2ugJNa4/zAFr5j7fKiMreY/GZcRhkI0nV9U+t2zQhn9XXEACO5Cw8358AkK4kxSoiqgcGh6JToftdUJe609YOKQ2TvqTl2N78hAz1r56XMW3sEkZw4d+Pq32E+5up8GiAxBpSYuD2pK9+8QlxM8m5uoRiHjbkYB0BSqlCKqiM6ORvNcKWa3rLecWiPzDVprNhjUDctg667l9M/AiacSRsX4M0gPzNjn7RqucV037LpvHK/P15f19ea2Xjata6dP2WHw+rx9mUozPE8RguUtwhVfBhrZOpFAdy9/pYppINfgXOq2Nm+qqsfVjKL9yC95ycaAbnjALK9nSliw9fEPxYvVVyRAl9XwHQL7bEmIn+DGvN/4brD5DSUy/rOAWkPSCieHeFEhqTEPohtwkD42ZCfK9d2yykUK/PGFw68gVP9axAIenzI+bCFaVuRTLI7I3aQ7z8QGASOJqsxGCLtxL2IAb4rw9jHR9ask4XDAXOvGHIt4sv/c8FDZbVgkmeTkhykaKnRfNVatXg9IVYamP0vQ6wS5Hip8iLIhcNY1WBha1nZyxHY1327hIwNjhbHkUukRpk9htg+j2QI663LsMu3xJIeHCXebYnesZbLNJzgqx6XNBVK6tgDSNgAiAMSgKW34pvt+BGhYC1Is26Wn1tlzamSyxxJDZ6YJ82NkcATYcTTEl0oaFvgy8mQdWIG8Iuc5YPKjkdcEdEtlJy/kupeW6ccmqlkLDNVkVClRRLN5PqhCht5Nrthvrm/GVLQXABdqWp8h86xUH0WgUCPyM9gDPuwsq0LsubXHtUQkf7fS3JoKXMO0S/+lmT8G3c5AGWVH2X7K3mtuUdkbr3tFMDfFVOEpTudzsc0u2asOFVF4Rtump8xKSc/Mxowmm2aH7S1RPce1BNrptFwk4Z5E9tpm/oKRACjvNdL6WD+o+KlGyHkoC+NsHo2VoUsYpqo2Xki7QMFpKTlPsOnRB6OlTyIm5vM2yFSvmSHWkSWu3OPLZqhr4QsYGoZ+LKvVnKYp7/6gm+NGEAivHm/lomal571DRCgpkeiU9MENepFrwXL3XdOASKq49C184EbBz7YxSInkNo0/VGnaWztNRSJgPzCpwOzKfN4BEj+zzqF+4g4vlq88UzQDalkxoQDIkJnT7Lm4PTx02RHCll0ClqblnBRbcot2YWu5l7QVmbgZh5Y44Ui/zg8a/sQLBBCtO4jWh/4CGmxAtXKEJmsqHaba8tOIbitBP+IYJ/QN3Zs/y3KfXzyB2r86rxl3DZdmblJP61VdWvkfPNqibiAxOWsafQCAK77XLGFGG3D+5DIczqeWyeGYWB0knxoMBNC9hIKp5yB+gk0yiRMuwwt+eJ2p+2qgSQshwYuFhT58yurj6wxvT8AcDAtOMKRPsLR0UBMlilh0rzm/Jo1CS1Wqk0Z9wW1GcYV2PgeeQDyNOWdxULsV3f5yef8CcIEEqWENQtg1WBh2llEgB83dr7z/YPP87msMg7P+Y+IcO+b78AOyO7//KWr9+zGz8yhkvhBlODAZE7iDYUIKhu2bhzlhzdQ4guE9uQRXD0d4854fKy9sCNlRTGIB+SG3gpUn7zc14OuNXYoGZWXV55WxlhwXRn+4+Oul1p8zXfbyMdoaNjE8KeXW0EwI5xekk7c5mmRZy2lt9fsxHAWgKLYrSWZ8smKthYSDEDtjvJ6gA1btcoMJvhSMflyPph0o/BDGUgAVC8cYBdaNccm0zVKl82YP00iFtd4hbhmjLJcVlfJJqO/VpWuoJ7xLm/WsXXlEi4p1ZnnQzn1OW0LrHWIDBDUMsoTrpbot8ddoBaQo+q311EH14zvSlTucG/+KNHgjpO1POjjnMtPvixJUjpudwp1vbFcRVaZtFC44n1CBjALrDJ6V8RJdB1ok96qhH7fP3t/PsC8pVrj7mnwk4FTnKk+t7HxS+e4PWfxtdeT0T2/pFi0N7/6plUg+OGUGfxBP9bscvHGjc3WLlq/1uBeXs1f1aq1BWqFrEC1sBZ3H9NGuv99o4N190kB9SUMPomlb9Y8Cfqalu5ndNzNjlQE/pamVEUtTiJb1/h1NQ787gi0ELz/S9r3rqAjZvtRAdNnfXBRfbPLLF7Hm84SzKElEh8oTA/oQ6gKD4VpGOwvms8Y2KxhpLEyIMhIGIRZMjtU0vzuhDWnvQFdAy8fKM9SrGHAYtCoNcfoXkwVgkoVTTWRCrRqGUpA8qMS9CBoQbVTq2ryZSMBqR8UCUaz1qdjIhQLTcc9BY0L1hFFJngpscr+Nv9dvRZs5AyZFVwXKzp3h36zjH4vT2j6MvndCva7X75pgmGzbeGcBXbXRjDOFEV3VekwOyjkQ7wWIAUQ5L7l0Njod/QShLCHVZQcNnMjGQS/g3ZDlgQ7JIbfuv80UZdqntVKrBo7MUBzmL5kLIx3Qklbm7VeVglSP89JpCRNDgW4N3kK9Ni5+lV4Igayc7m0DEMWglblsjQTvWZKSXTe/App1XNunsH9Iyu2pyegCaLP7XHBNnLHaaRG9JpoN9iLUBWgWkqbUwaDhGAlgGTu+dWCMOC0MuLBDo932QNMPMTW5McPhZ16v8+9Cw/6ZO3S7XhkR+4jGfqGGxj+OgNtXvaDCvG2BbqwVxoLiRnFmV8L50YAUEG6ovLCHuRcUvMqgHzvIFr7zClksy7BHi+0DhxsB7KhQvCUR8iIpXHZ0QgHDvve8bcexTrcRTP61E5r9vItMJLX48atdb6D7ORo5SENxmRzfOLjToBzIzl7Tj12G96L8yq5vAZpZBKjIIceMQx/Nx3joS4SjaTrb9gZpF0Ec/VFW6isXEu2lM78TBlY+DcBRtU/ZLv+S5K6XYNFdUdRGOjR20m8yuGMI7DSu73Ih02IFgcym1sUPChbwbkxdgGz6xvWLxni3H99vIQn1wLoquqOIIYSfTLaSoj6hdrGVFpfXhUm4/QEycHZs+KQW/POm85zCW4r5NJLvRMYMzhLJQztb2m1Y8nI003gPFBtKJepldArVDlDS1twHr7YfwiPHyInb7kG3P2t/0IRTDO/LTn/+TXwkbq8sXk2xQF46EUgD5x67tMDxTQUyZjavcs12ynXEkWZplo+KP7Wb7/wkLqDqkgJzGjc4Fczk90ioA2eW4uhlU91LMnuNAquPzUEMo2yEDS89bKBRkEWjzi0P0t7KA8bhCbJ4oulJNaI5Z9Y0yFVdLhrRZLR1NiMtVXVQ+MxzBlGMz79/mbgkQQ81Yb2pc8nCgqvPXsRbB1yZk4qEMqv6ch8+iNPQcEMjtH0lBLQ2sOrkLV30DEFf0UDvSjzIFdtRlEcVfoEAEVV5LVILusSLdyyv96/QX/NNaV1TzWcaXQsfHyV2ph8aIbJ65fxPzP6XzUpX4S6Jw1vaQysPMrNNRswMC80QIysrGhuSU4z36Parzw69j15Myx9AzJntwUkxjO0prLs5E8uhQXaMVwmr4ULzefd7xT96pc+xsvbB0oc/6wUW7fesujOfVcGvtAQk4Jhoz41EHlgISfgYMgSP58VBUYP0eOT6vwcAdk9V53xMW6zFQNuxwyDlSejqiyTJm8Pg00fmjBpkxHeaBzi97SvKCt8wc0a4ohjpD3QvneeK+uTA2mb4+bhp2z/lnvLRqxbukm6wkrtG5Uk3aKuwiWz9a1IKCMertJ+8+J5alkTB26+TwTKB/uhlIafKN/0cJxKGn68vXx9OdV1TlBxcHpTeV4gKJlZzNcuqoAoT0GFASA7f8XBiqORewLCRgI/tiyhhin2amr6OXKYdzL7QSfNe8T7xMOVo+QOr/a9OMwlVlKFMsw5D+aFELYqiwV44/SklsVSneebpUscZ63+4QPtnbFZSQBsd8j+pZeZMKvHpckWMXAwDR1f2acoLR82VDDPKkYKhx34Kfq1D6CacIKTiHu7nFBHAijL2gTOYkmPvTjiwqAiv68XaF7SWFRzu3St2vlLGPmXsMxRiMjySiayJxojNJXh4sYPUZ/N2pRP4sr0kEn/Dw7DfZaLyiAfJhPDI/7xFKg8wWVR07lA5NxTw7DrTRaywy28T5Ff4nQqK/ezbKRde/Qitey1K+3LULLszgjcblYXIXzEgdmkPhkUraE7k2otDsLUetsM6KhSFrYuhWGccgrPDo3NyZ67MumJUORIkQykUkTmLK/eGdXGo5nSwTxCyYkI4w4y4dCdRsXtuyoE9Ko1ZDPX6MXkWbVZWwOg4qWEv3doAb+TG1l3fNvVACFfNORTxPkaBrbxHlmhBeVjx8BteuNxmQSf5aqJIdwVcCMUfdrJgH3Vr4SUeUcPZkeghHeIwticPvLGx2mWeXIMwzXPasi3Vi72hIixv6L6FUGpIlE2jUPdsEdJ9Tdlk1uIIx0iUtFpBEQdP2BmldSlJuZjoS/MJVRElqGWRwUGYXo1aKVvbvVXZhkbkmj0kLbt+YvktJa36MFVaqRWQ26jekzSsHYELWeAOqerRMdthb4+NkWbGREy7lj61W/bbE/Td+SxCPC4Ed9smy2xrHJkNy4FaOlNj4rtgiTwmZ9zbXkT3mCKn30nbLUjSurYiEgwLpbrrxtxB6As7SdkekSMlzvgnUqx78bmc4UjoNbPJc4IPSzCLzlOEBXuepMJ2uTc8uD2BagFCxcNzujjCUylmgnx9ptfRkwHTPYzCwPcLJWUM5kDt8IihgOPG/gWxFPZ0E0QxidBsh9WCMr99v0f7qCUCuE42XV0u+gISrSEnbVyTQ/2hqEwgfBJZP1DLhDbrlCqOQfuXeCdH6tbOoFZlcoqdMKzpUeeM8mIru1+F4VloI3RY8eJc44KpFsR19HDWB5xvYWyQk19lk3ESgwoQSuwUTYLFCrSde5RUz5TIfJUY+IUcZFPZB2ArqjVNmTP5kr9EP+4X0PrZ6Kp9rYRe2K2CbfPdoBRTcdLFup5SiTflSzDvLO4CxK721wFQDdEJqyc3jx0mqj1py7ls69yWW8VeBMKrsrv7NgH8AI3UtJY+rgpckbOCG7Ok6p2jx7i/1aWxSzqFaZjiWygI3z87ZItZ39NA7OJvpaTpVzt7BRQcyzUGsTjjZgOU23n84XCpjNbCVbtgPE4DW/Y9YmzJJww8wOqNnPDMM658I97Vwyurp1La+27AS9gL1jRby3mSrJ7LmtMqHb/f6Q09LEuBJSBphkw4YHgTiwwn5ObeA2FOO50cv49qQ2R/6xLSTuIoQo/uXJiL097GW/hy22X6IyK2cxE9caoTDEoOTQ38rGquIV/DPljMs9f3I1RqtHlconVUs5cbIRFaEjKo7KUB4BWMTTV3g3Q5qlwhkUWrH5F1RlVhj3PQ3/eTgRZlMmZKskRHNy6LQxzNKXr05kRe7Mr+hD0XJKDwDA7ZmGXCUtIgBS23o+jTgO1qlnoN/BANBx1QQoB9riP7R1eXKb1fd+3Heii1My6DIVNEQfVBbPIDzlljsbrJHQqOS6Xqcz29JlFpncT9+I2/45OEBG84feepVvUfSIlSe6JVtWPfnfBGou/h27Cww+Ax+dsFqcX51nhUl5pDxbqEPSAqpVU0l7x9xL7wk3nJFCHKWV0/Hk2+vDsrnO6f7YzJVMK1TH7Loq7ECFxKhPfAU5CIl2GQ46QOG8Z4uehpytma4Ji7Sgr9fcC18WfnJXaQB9sBy9tsyxAGKLNeBKnKV6gzxKPE+ZmXxpw5WZTBhyx3L53RfHpOz1xbJPMvekhzTpiiTJ29CRwlz/eETN+D4tGoP1X2oOKhSh2ziOjD+Uq02OE2gLOsC4kcwU7seUAxfpGw5PgEkrHZohT565Nczzmn/J3FXlz8u0R9iFMLrk4M4zrHzf2cMRsiaQ/nMA7aKM2BuKnoGkU/gghbLx41On3wcQML7DtOjR+W6uMhG/B3JmxSQIwANzValGtJKKjejkyIs/iVq5eICpdhrlGp3luNTatyOkuwrcZUeFOizRkDlStOKThyJJEWLSXJpI6kdP+mIKWn27B5HaGauix1/c38SYGsP0Bkq4Yty0Obz9DE5Zsgh7YSCno8os5QBNnsqsZnERDETXwyZEuBgau43iiUwZnCt6AoF9nHyqK+LPmmitKwY9ypJ4YOyuZkItARzxSTawS7iFlDP4jcjOjpuWNLC2DQBsZtG6CsY6xtyoC3oA5ajpXmKRhl3dxMpwWbxmbQgUC+VA/d2WqP2CSN/rKS4YhIwJ0ys0qHgMVMRZmuJ08a9Zeb0Qft7tezwhr333kSgjD37FEwa6PFRSk6ujOujG0bcjJb/fRk8V/iMpxd8SWca9YxCFLFQGHSByYQv6AwllF8T0zaz4CpQs/5hkyeP27f9DGQKevR1Fa0D+CiKXxMy8PEvHIo1VBUPmHpRRdqMuVYUS3x527NNKR4B5Zzv+THQhobpFbJdjXhOeV37m+8EmirGlfKoZufxfk+GdRjyEyGE//ngTTF4jN4wrRvacCGpMOO9zQGeyqMEtLySaR2LPMezKCPJclw/ZrKMHPy1Rj8RdJMFpGva+1JHmXkNFnu1srrWUmBHAzLgItNLBBNp0F6QIPYcgX72trnfSX12QmBnxze8Ai4RnyAr9MBP2PQwRwFnEjkdVQGOmiTor7qaXCOLveWwOQwCVOw62WJgRz+mtJAZAF7bHtaT7mTaRT6kUAEiMTJdibiLjKj9VHDcpb7xR3WuV1YSguYl0Ernu4SA7DMQtPd4rDxjx/WtjOkrmYdr9Jqcje5UXRAz0FGL/1Gcmn7FymzQrYsVrt9wFSQYHEot8wsszr9upIFuQ/y7bes/7rYsKGAZI2sE2zlWWwIPZJZeBOJ+Lv9EBRG7UiPTyM1SJKuIvRiZ3WOQyWHsyelwYVD6uM+aArKvpuvEZquZAcDq82sgvJF2dg3BsujSr+eBkYoWB4vjTDCLQkyyjgSu9mrbVA06U+Dht2vOcycK4o/C5qMclMLpYjZ3vZMeedjKXcL4jxXWBvnTz5NtR/5Xrlj/TvlY5iOFhXPUO9JL/axtb7PR9so7H21GozJARI8imZleVMzCR/dFRjj++EGsRdRkfRWSoHnoY7B6V6NLuL1xa2YMiwIilMqJn4JkCnALfR9+sJsNLuyX19FZh9kmlyAOffIf9JplkNYogzHGq2w/VRLz/1+pYEMuA8io6HSyH+lbCQwHCI06ZZQoCOs7TZ+uHtSwzMnXH/maqzZh3FbCngTH7Z5XXnxOd/87vcyRW4pQwe1XEfl4hKQfjKcdkst10A32tkJg2ac90Y2OFMkLTi4XdYRaQkzaWJ6pP1cYkNek0QIj/xXwYaDfL/CskJUvsT4Sn4gv+OA0hTS5PfYuhDsOHy/zBu0lfzu2piqqCOoyn9pbLReOk3Y0N8hG6RBqGVo9n7Za1NKY6RLU/LDNodiM0UpVujMDrXfTGcfC6x6x9HNZk8c5aeRFt9miZwxebMeFfstovX7vyYOp20upCjDhZelUL2R95Bg4Ju6nJlpC3uAH1uX/GHdoKtgbP7+zEKj+SnLzxlWam29dmMRPt9hdusGXXGy9UYtOsbuf8Y327Wtj9R8hTODZ79WPkU72D89QgGE/x7Gtw4DTuBDumW6RnAoti79HdCh+L15pGZlv/VK4AU+xFvbxmniIkRkVIHmI3X1eSrvcXLQA99O/2Yw+IT3rJKcbBkEmeGlAyg47W6VrvwMYavl66Kdr+pT4pX9VlsqGMswNEWfjvA3Q7E7BQ/DK6zVVwMhGD1zXHUvyCHX5PKJdYOsKZY/KjMDeiGDfw16/utSY/TQioztkH8fz9bFjj59rAWMFMW/cjwXUyNqOjezKzteG994DcvjrSlkU56iOduLM6lSACWRX106vepLm9+WqcT/i/5r8XVb1YDaOBKOqHoo0ohHikpPSySf58C/UqKmv0AKLDBs+2uDaYHkD6It+KjAWxexIQKJrf2XtCp2y6yRRqRHcnLIV3QQwHHiMAzJjnC/+yeksLL232o9HpV6CBoB40I4ECMy372eMYZaTUh9xZguCtEXNT+RAjo2IF1CfUXsJH06YFhXtFth2MSXFHrrKahSyQwOIJpcuFpgJoRgwFvhKqC7I0DrB+A0Ki2pQSaYVRQpLsaQ8xl4vWAKd7gvTS+ZIwdhxxrjLZVGaXEJKCqkk/xyyvO5ocyRotyRAw1XNcMOnpyNj54gPnlrBD5KVnlZJowhfzTwv7eF7xxppktOP2CX5rMlHD4j0kIuTBBVf0hmNuOFSMDeglSaKPE6b4qGOfCvpJ5QoKvE5VyeFDjdwPltlxyXxVLGDIg1mGWKQfVtb640DuddUtML1E87Q69oxBE+K63QEk1ubRXvS2wblMx+lfU9whmVBMgxktnCAtlutAABz/EK5lmXhDV7USykhN0Q2qBIP3Ux+OBB0epHxlIBtj+KPwjneXy5nnSOQZnbToA9F1uDQg/dqVwdah/fcQ51bR9X7N1u0BvsZ2m2JOllnXwVIadhHIlsp2/qnZldPJE0BHgAxQwnuX68i2C2n2vMzD4/lF/ck1YLr3FlA36s9dr7NHk8JvlKLhs0FhgR4R/VgjA9oyWbxsxFW0rq3pZrZUxUGPsvsmpWyRufzRpMV1AC5BeGgRIe7Pw/H8JiLJ5Pjo4fVaH9zHTMELo0aWRSF7i9NzcRM9ziLu0AfYvoXaUZYmmIpPxmm9BuuQOPWRzLgIU6Xf4oZuix0EH6q+px95FDynYbMEP5abaVR2Djkn2Vl7NCA7Sg9T72ttq6ytCmfYDmK7kNkKhSvHUJx9IuqyOzi8ToEEwGuhn7n3KkTt0kJJB5sWkXp2tTN8p/d0GmV9TeFg4ak6zX56s0MWCEuAzQjRlSZd+9Mg/e8QcNxit3wORk7J8sP1U2ffhwOHXEkEAiEoNkGGKgXP7wNmQzB0G205AFtHCRX9Jvxg4ij0s6drgX/GNwPOt1TOkYDX07V2GB7Pra/HDSoyHHpI3y6muxhNl7eIgOQGf2g5h4g35ORs/D3v8PjG3tjmXD2mhhY9ZmNk/jhNlug/MnwdGmxxziqMWiWaoFLsP0+9reYaQJj9CCO6JMMsKHsZh/9/YUwhJUxQr8rzGWklri/62FYcAWPrtAYAc7lijP6fL/5bZUYJzYE2XYvh69icx7YGRCCjOoF/pPxUG1IR3ON58vuUcRiUvqFrOtnAKxq+KmB0OWBW4elCRw+lJg+rJe+vs69EskbxNNNskxcABX38/UbnLNZ8AhNnEqxdEO+AtXEgKiZxidTlXIo7PoZyhRYw7GymIhUM4ahUK03zIwDfIbyvXzg3Z5JJ/cnE9twzGkJR18C1i9dF2VNiSX1tGXCpBq4DfYqJ5QGhvIuBA4zKnvD12TwBLlIgBDfAxYiozkpi9ebX55TQlFysSdry0HzYyCPLjzQEFIK3MgXhhcztoF/j/x7g5cdqW9gi8xjMimXsuKrhOkd626+M3LwoBu5aY63NzNGEdIqqgHHFVviOtFqoZgUjFRoTtH/vz9qT7ZgL/8k9lD2g1NM4nPPhMENKbywlwP/TnrPjwMdGtzqw1iEJOsqx70ZNb9JOcEjynVMtqBV+EB0jlzdy+b5aSzb82JMr1LMHSY3lji/6HPE32QfPEkJb0oDxiIdizwf2K0RjeobG9RWuGD2lLjdeIy5EuSfHmQCh/E+DpsgOtxLeL22HFCceiN4LCNONbUk7vsaz5D01J/00KadvUOXL0QrHoJa1ODLeA0HCewupWnCBIizlvEqvQDdRyDV4oUCsaOxqZ7xq6ro55ruSdb1cLGMBHz59+jL/pEsxtGuKyRsQYAGSU9ohh9G9NqtruHXqQNE0a0popPrB0Nift5SS9lNrKFKiZtzXOis6v4v0ObRkZkUL2boqNd4roz7vprg5JM0hcRngLFSg/KQhMMKqCRMqiGNLODz6BT8soX0EwNvgpNMYNvEc0Zg1l+0GCOlWMusuJ/i7tasra0yWorcVB3fRzBSvhcOOuiqEGz0VCHJ1CLaV1atyu/W53GtqAHEUZBq7ByV96FbeTmHbZXHgl1VAUydu3RVM9UwoQeX8QCE4rT3qlW8lpv2LaCEndco9uvEaOOWgnR40vukBGA3ARelJeQNNWI8rpUZc87UAoCM98G/DAN3GzeaWmHmeIiremLyDfvFToJ8VI5MlWYJmRNTU8K6OEAET/ikWV0zgp+XU22dBT9AT4pyttrMNM48Oe/CCEc9PoKvNOmzH4gJo5gt3IzQxYm/c59qShsKbQVDaT/uIkQt2q0NXByRJQIIjBpeEpv8MWPh0jmR7nm155Qo7u61g6pmnMFEsCoMXUxC/cfZQQ/v/K939zWU61R6jFfUnyWEhlRTXc6sW88dl3RohS9OsOl71K+o0qzyrKZOMJfpYJRDqOg4gRr2tuWR1/5ruxEgPbhjmbjf1NePHQ0Qj4NL8jPaX6t7bTj/dbmSO2WZ/OgjXgq2ctQ3X3YeL/4hbCu58/D/bQzy2F8kvMeR21VN6QSxE4BrdrvNHbbbElxoOCodA2T99NPQebAau+wKkcrppV/+k7y6thiL+dShkaKkdIYheuHEVgE361av6jJbKDgWIpfHQQno4RQWbBJAWYUHPhF0rydGxjEU6iSocSPMXsVPerXq5liAXMTqsTc+bAhunycdXOvUYyenTUaSqtaJ/TadBcaqCWChijS5E5u1cn6nprzUzpko41M/jzJzq/Zf8jK7y2rXogAdnI3Hxl1b0b569UcXUEZuxgAg4sLgG1BLvXkzjaEanYCNpl6zuCwWCZOmf4doRfn0GekCJMz2DIukybDFMLxG8tvmslBXrSyl1K/nEikIhGxYizsH/e/Y/V6vQV9JzJyMVQf0fYTQOQrkdHb+ojmw5oll0MaH7YqA8Bt1t0ayd+q48oFEi++lP6P1QEPEYSU2IJnpGGst6SQ65kjUxWqiN6L7vOGwuqXTb+0kDIaTjBqfFCVfJrAblxMQrpepgilLmY7tcLh+0z2a8HTwpMp7c5rcby/X2TvXCL7cCtaG6I8OFa2HEYVCcm+Q4s056+fDhpWfAtgXwT451PzPbtvspwWEoXBsWHC57Ea+/AhTZq1eV80uv1Q0X4DKxk7RdXIW9NR36KdwYBglVQRGT8Ydk9lSuEcUCkjR3TceiJsVkdWQcSUz557zSdDaT1LlxXVuTWNgT4wSpnSSKeFhS7Bkg/L3v2N0ZmfwxXa1V+Pbz/luimehS4K8ltpaLpidxQASUTLRQTJTTkgcaYW4GxhMSeeON91s/uqA60WYLiMs3lk0DHY4cKe6kFnmU2dGnUtNWhq486hGYgHRGiCwaJDYVYb56bp1l1f4ij9s53tCQH5I5Wkb6iUulEPhGcC5M4p2eGS3wQB9tf0BGJJ1xtGzu6oZ73JFE1qdEeyU8FuIztqA/nDAu5KsublOgWwZ117LZWdvhwkUq5QF7dsOuoaOhB3i3RJ6/Kt8b7Pn+AI/C70TX5pA+c7iNz+ZuCynOlH30wCDx6u/t7A1RtaoBYCRtJYr3KF07uNJLDJig3ktfLlgRiojpJKqgfnF55w8d46uP4ThVOoUqeQ5CDa9ndAIiFeBIKocfba1tcxIlIcjSI59suIJtCZ4PVfzbgIQO5AT0sg7lzJxOBV2iN728X/GDK8Sx5ajY4NWE623Tf3/EZts3IvqkRwd5OnTqLKmjFf8QW633PD85Mc99Jw8mHGt4VpDaiTwymXwGfDPXG5YDmOq1gm3LvZ9Vs0InjJZKTwW2HJimAnCRSYAA+EXpfB2gAMQPkrYprep67Rs6e9jsm9RRMaHVgZOi99u76u88mMwaNaf1gk4XVfgfzjE/4LuN4T4IXx/f7BHy/HR9Gnxqg0PtoTRcLoNV184D/AKVWzPySdYGrNFCAWQWc+QNWOCWZCTy6FiokCmKix+w0DGMn/O9FDdfbR12/SUUqIqWz4pn4mZd/SZvWOQ+oE+2j1aQwqPMhjCUqXrNAh3bLgAQsi6KXMmUT4zmjj0YXEh5y645e/PHDZMb78JGUmK5P04V/0gS4d//e/T8X8UIf4dDbNyqfPy5VsJpcYVE5Q+DsKihz6lUtb+/2lEio1DEoks4U7hWliZU9BWpAG6YfUTXvBl4yYMJCtv3DnBHpnTNk/8kMyCnHN5U9Ksd0ovrG9tKq1Jch+iZsIfgBxIhuNgChBz7mmORxtMNVoqmqHZ5SeOmizSenW9e+ZzQMqVOlPibnbXMb4J1vjkyNRxJZedUJ4QqluGnFWD2bhohnM3dR5jM+wE57ec+bqyXvwZweh8acevZnGamMDqHEW+D+3+xGeNREgAF2cFT7AHKfZS9z0PU3ForcwlEOENLV6nSl/Eyp7/Y55rFDEwYzOy0/HdT8P6IdLSV/XgPpHK/j848CpU61I5W+X9kfuvZxTN5ubHn89GBXRtFhmcl6pQZIOSJ4zAJOobaRndTy6PCuMbT7UTtwgeRtDRZFKsXZ5z/LqbLP3NHpRPFzcqlm2CCYluLDFJ837obXB10n6+rtq+PihsmotMdsIrb3FhnjQq8GmxiGtk6dXaxyx0XC5Ir3VMSQC0uUPunIwTTTY08AYrWwTjpDOWZtzBPPqrQ3eemxn5e96MWuuCfkdZTF5raryxFvPcmHF+ZXXpiLPH5zuX3KpBObVp9lF4tquY7MYy5wWUnBuYGjELRKXAhwVwEhzvTMap7J+lmwVYbj/Nnfj67C8sKcidYw7TlO9tncnoVZypC2CdnBUVdSiDq7mReNS89kkbMfOn18vvifJTvFLjsJac4u4jDoHM7QEqhq+GKWPXH5fVdY4h1sp6dEFEHPD5rv0SYgz2c706QKw2gyGfzFJGkb03h6xhSdmCd1xkxfaYYNo3QmQNg0N3Yau4moAB8DwoJSBj+qKoOkv/8StNmTxiAjDSeJE1YxsPdk0X7pm7Ckt9cUwU89+t1cfCAuR6U9bhufH5Fq0HgF0hFEO5Uxrx6jV4lI04Z0YlOv5x94Q6h1nDIVazgIiLQAyJmvS/rdc9zPsWD+lfDO/8GbdQcvpKicIBrps6L38K5MESAP9RJdep9YBxNXZvaIUlHisHKOI7sWy2guRvgApjQX2kX3EqeTdF5RyZ70/Kb5G5xHy/UuOzuwHscl/l3Sqy0++mblPbTXleVkFFay7m+B/Evs2MXgjKxrD88cxjBOnYHItSOhDDf2hL8sO3C2EZAZ1W4zi1aw7clrVWTazAe9+W+ZuCEGR159AFdqUPUf79kT6fg88NpsTNmfHVVL2PDcfwdUQQ5KblmNrrw2VUrXlJ1Ymi1jnSQAW8WBNmcVqh9vJfa54P0wkxX2uEMHGDBmk86aN0Zg3WRIClZ5dhVspFyW+6H+yrvgAJT1uJ2cEQI/eE8f/yBJmQzskhj+gBJffYYxC5FVD0hHQulEKJXqI32g6cUccc3DY5Ml/FLKMhZUCBT0LwTF1hGZj6/2LtPjF6qennY7mDbAcLz4JExVeJdXmcVikdkN9PSZgxwQrL9FB3B0HkyhR9ZxkPmE/PV9dV4o4Jj/7BffzkfBhDCiXOqDYJzms9DFIX3j+IyR46HnFhOeY/VBasC1FZHyg+c/t68BN3lWrBUJMPgkqngUtf8IVsm2o0uCFuuGzskQqhxt+N3Cy/un3879lVxlC15y8/QxKGzyDhaCM8bZczYbiLSgXGzWYZCvLRiuRyn5yYtrRC6Mv71mLLoTQGunBXCdV++iDOBqJZ+YuC8ILQdXGXShWC//4MZdSiLy/RMGud1ZUrZ8IL8JkzakZHQ74AxOwlgA86IeCl+xSf8UD7Ht9wYShfK8DalIQnKim3TOE902UXNKHNobKf77YwIGHk78HaGK1kPUdfBKVaEXFsYqslaC/35Kywtg4Kqha8owdQ0CrD6H0e3TIP0mxGh6i+MvgGXkkRRYF39e5XLuZPAXGJIuhSVg1KlTym6+FfalInN24TyZUuEcmNfR8IqCFraWpbKHenAN2cx6UBaWaPUYNL3GZkcKaSa0BnoaWzc/lnQVkvTzgGucNAGaNZHrlURrDnfcOTgqx0q1Ucnt71RPLybDxJfS4IHY+3C0JRUHoBjImN5etaa9+oN+1AZqsCpk7CTs0WOxiz/BdROa/x/xrmA2xp7J2jrAbEf6xwnKUzhDDIpc5BYklXaA5qOv3EC35DNg5oYUjOsSfRKUP7hWt/OW4RreinLoY8WNXx0pM3f3L6m4DE86YX/GMaowl0f6hMdZAJNY5Bpwaq3+xuN1tG8X8TSIneZZ5PDUl9auSecJMC4UQh0wxLfBAWYncMdcGZ+dsYk0G9YT15hMyYKD0l09POxQyB4wzT1GbAqyuwuEs1IB+fSBohB+jifCMhkPTLtpZXC83Vco7AqwfQug+kophAprdPBko0lYj/l0qKJKfpa1dvsrEB01Z7dEaUb/WigZeeHtHn/f9T2yClPIsC+1YG9Oj2ibn5nzC9DydtkDLVPPwOyNzeu5OVelO/KTEbU/9fRVKKFCv080gRqxw7sf2tRh9G3mB9iD4M5KRd6fhQ+guA3lUCq2ExuQqYCR1U18UZN67AAImPXuwOisJsHC5PhPqRyXciuPeShiyUNY5A2yzarAVyZ16pXab3fXllUTeJoY6sB9tWfIH2vcRjfYNHVl6mGtxHgC4q3u107xAYHio4JEU31ZRTkur7+iY4eMZQn06LMiwijKoSRByDEEtDIfmm3Xu4jM7D32dZAdhM3WU5etyhjm/52hPycVZDiMzX63ph1IlK4Awd41EyOlE2JUXf59Js0LElNaYjMDrRro419qBwZ3oW044fcKc9gzRlDTSQUdbDyhoVhwz2w2psL03KXtyJrp9zqaZcH7xDLTp25q7GijNA75d0B4hUJ1RC/uiRSE1JGftzLniPIn2g15RUYI0cNE+4SVhg4ZK0pycSelsxwy5PDz7GYhmvTuEUmYdZ7DL9syZksHgKoUNowy2lrEbzslI8wiNNvHCohhwIWyL4SQ93jRibZpS0+SizUsjt8d5gCkhDqwxDsi/zKiicbjN5Bc+SdsnJe90pIzhkTznlFOfYKah46PMiIo5xNUVlCeGaRVfcUiHMKNf5GF9KbBjX8KMn6EbT9HCDKwrGJdalA8RvVUPepa4rpA9cvIvyJ5+bpE113UST0MK6IGxaEwfMdXXOK3vduA9CGPs0ZXrvUaAfT6EgLvt0zDDT3uiU81I/EzbwOENFrrwtxp5O/EENsXg3HV3LvssMb1q5alUN+8HMfUTsBSEmozlPqBcVPpRX9WwePv3Anz0Zt1JoMcq4HaidAHTkbKgWcaFmgERxXxhIrNxjbz4enyebSB/1e0IpYjnflIOHwialFTwE/SvumrTZmG0r452E7dFzlmDW7gXyzf5fJBMjKK++H3zzf7R/sgXvx3hjpzk/g1gYrmaLWJENK9MUEaL2P7N58VUaj+0Bjk8VuBBFGep9KohYMSjDHgxZanIOxt6CaUuxcDhrPRs2nACtGxyJbnWJmNlLvx169ydPKNBPaJdLkabaUYQTy81PESkUeCQdE5DDIgbQeLNFWpc/Y5GyWcPBLvVM0D+wnd6WApf9I5SMEsJyBboHF/43hpefugj6C3BcjoDY6StPYjusmbTDbeqRPBoHiJdMFR2DWKciktYFflZYJMHpaCtkoYGsT87qgp8ajTEYOdhVPqkbPYxyz41N8btof2gYa59tSP4v/w1bw8CcH0dZ7j1ybEIZhvM/AX5EM2ehP2/eNjmB4N5b3xLH3fQaPvh2bf/bbRAsjJot6NbpKE9ugZTQ8Umvtt9URrfVf8G7Zh3K+9uAtTxXdaopSohtjq8pY+URXO9yl8BuYWSLzD0RQZ/Z3D7XNE4+xmswdryFWGcKB0jzOe3QzcL+SzAQjd57SU6IVu0cmsovvXIlra9YxSrslgX2lIt1oX6+BZTn75yii0Jr/Bi1M+nFOrLv9gO6Y+EsbVGFok5pM+stnr5yCUDTx/DMk03vT0OqdXduRFreZMdbsH2tu7Etaol0H4WJlSh1WyL+xoyiXL5Pg3Fmj+ebhqxLdbOFuxci7asobQAcS2mPdrGBknfTrYLsHsdKXfsEcjtgrhJy2OxWw10f5ToO+2rJx9Nx2PWqVorsNZjdzGKKu48dP2ys8yAO3EjkXu46gBX9Iad9T4qjUHIzvWuKYM7x4717qjZxCA2T/2Bb/DEHDyIqSh/Kh5+y5NPKKo+g0t7WLU+3KGpVi0vSbpphcQNUNbYSvmZ+TyrBtYMfVIcnFQbxnUAZWFLliuXn5Qf0TjkpjY2pggGqaQlYE3QVqQIS3yCoQCdg+X+lFejITNR4fO9ZZiONvjodHVafz8pnkja9Tb+gJmbk+YAq8rqqssZf/jYcAEeWD3FcC0dgLKgK6thqOLQ8yH/bMu8+3x0J0+GtrGZeDSvyNNvPoX7fLiWFcyXMKVs5R+kL0FKG6dBJ3quHqhnd8/AznxoVQ5Qg+deYhVoJpJhWlCHCJILnbtbKSMNh8B1TrJJ6YrWx+fJYQGBjzDCmi7GgpFsUhKzLXLVHugxY7QyAI0wfMawdXosWv9qY8QW8N1TcNgh5fNhmIw3arZtAntkdl7tODeuHiRLaf1JhlqXEMpoJz05DxhJlBkMdRMa1BNvKWgI3lo2COplJtL2CPIEdi8Ou3qm2Bo0iapO3MhI+9K011YwKFtz2RJuIG4+byZ3H3PDHpN26LNcj+v3iCKNrOWvNLQ+sBqq1qUFYifInwKxeWVmNWA0RUelDErzrvQywoRIy+b4gnObSFzbJwPYJlz3QACdYoMokGZBNZ2d3r5aSezBHduSnlIJYScruoTyPNYgl2FrxLo0nkAJHluYzwiiXuuvwp8tBGwtXgJG7nMNBO2HUlygkyMc5MvlLpYjbDy1KlqOkWxl6bbpVhVX/elhsXg91NlK2R2n0c44vbhtlzyWejVDQjWMzU6NU5ZtZKFKIU0RW4mN1VILXPxB3lNs0tcbA47skI4U9LmBblJH0kXEEPvaOXRZgPeHkFC4pKMiqd2Cl7Emj9YkNuaTSkBawWtIxUSQy1ivVvwsaivlXLH2YwbT//TCdfuTMXJTX0Zb7Yg78dCRFvDQYR8S2IDIu4qBai3gnz0UIPTe2JxbaYxkVAeVF60E5x2/TEtwmsPmrN/Ig815YMv+gApX1Ht7jN5gyM7luDrn+rMcKgjPI1NLxcF1WCQ6FzGKTc0i5apLKr6yQUB5r7G0Yb/4OuEZhAbknVRBaShVTSr1fsYVunQ8nJPbBIVemyb9+vTnWYyQIC719/gdoe7F4IRNNRdMBvsG4xcCg/3R6MJ9oeajVO85NRO4SdOTBcxW4hEsw0Mj7q6EDxJxklCC9JXL2m9Yv8kYGcbz9S4VMbPstFHaaIlo/YHjGl4+IjPyYPRJgEOUTr3WNJUySHLZmEek+7TOWaRESJ9IdYP3t0MmrIAUN2pYMPxXltg6/Do3FLgfQuTnnLgXQsCqlLMZu8IS3XG14zu6YL1Bi8H2iKygRtONpuD6/OaEjb1sTNnsJ3zhVisgU9mIxpONcIfAKJXZ4qvGefVe5R2reWTomNXrJdj/muLLL8r+WqiyJQWsrZCJr2WIbn/TTaESHa7uIrUQUdMaiaLIEfGxltqFquFGLZnFjkIVxatPPpXEKzDoDDK5LlejPvJY6BF8yPOv8s0RLVrCKsQAnuqOEHNYQWYdt/xoDXRZ5h/+o0ueAJ95BILghqSzvAJQk7GT2WhkvGFv0vE2wyX4R4tn/ZwaGaWmHQjzwbkEIhgx5OC+7DoSY4u7UQYHAePQfHFXggXue8Whc93oYEh4Z9a4XgjZ1B/agaRzRka+9Dg5N/DSNzWg0B2mF632QmorA/FAOhYaEQ5ma9qSfQDNUNFlq23NMDMyLdiZXvW1QjdTZSMoksErPAT0+A7ZHNmA5NM0AX/lJKdTk2KaphM03oSGEUlIaddOUa2z/Y/zA8T38HrekXrZfplhC4CokH0G7DkyLIX6E7ROMe6C5UBNzjBSuSvujxVRP3OUDl0HTxmtMSXUL7axup38/9OypguZxFcdR7H97Z677zi+7jNhaw/Q43Nh8YjRnWm9pOUxpS14ZC1qtd3j6Cm33zGW2opxkzd77n5XlxvYmBmAnJBa60Q4/JitqZ0Bua7SF8/Z3n6WG9jtGidyYral5nVJocUpkL7Dy3TwNfQkWVZf8CJAdI1FtPwiT2KFqrkpO17fbGQ6SrA8lhaUJkk6dTOAEgLcMsAplrHXmGZpdQTFcZzWcvdRDFF8hB4gCQSBOWl2tA8NgBGvPOSvIFOskJ1Xq0kSM93R4Gg0FtUaswpS9rUFyuqK5jO/UTkUVMTR4TOjyGJFe/ME8XGn8qwTevMkgvo95J3gjN++O0ZKlhBo8rjdJnznRIvX9X1I60b9D5ZmUs4Q2KYSsTgEdr/M3MVcetGosWmc5OjKS0ix0v/E9JiICUnwbWUtUGVAke0R/9Fmt5KN0LHYhUy/OI6gaHWwMZKUs8fQEHrzbL8qjLIyBY+TIMi0Y24b87GlH6OdFP1KuWbtd+OerEkBW4fs32jwkj9Xf1bzk7KqukB2byBkFB5JPdBkHD9SlUyCikMEJ9mq8NHWimcYounTWJAc2E61HZ0YyGh6Djk+dzM5rHcwBwMDeYM398CtC/TLdrbY9yEmrvO9UQ3j3jm0ScUEzwRoULtLMdDNNTRYp0qEhoTnc0YuysaJnNoiqtx0Sp1ZubigUy5ZNezCXPSUK5c9TPUCN1uZDtiHFA7gYqGzDOX1a+HD97ij+ELhAQLQYHh0EAruPdsY7pXrk9NLGw/ifd2dFesN486+ahwVk2XweDvdc6a3jN7aDV8AyQFc1zl0QFAYl+X6YlJl0bXwRMavzScPYU5ZYypK8Haal5Cqa9yjEtBkjzByGuwa+/B4OJM30oGtik15aGtLTqX1jqj8uOEALiF1YQRyiMz6MCA4ESIRCy1DDH+7PPygjs4MDMHCQBnpJajTezpVZGBBziMEbK6dyb01+LZAjACe0Hz8wc/nibOcZu5ppAP7eg5wQXWjDDY0g3BTfioCLqNoXUgThQWAclt5Zqj+oIUZeM6J4kfEKvzb9YYXSfZlbeGol8mJc91aK0NbR/oL7H4sVZ2+mA2PGtcPu11PYhwd2gtcVdf7getJ6gm+OmdThu720mrHApIeJiGnW+QX7gGwGWyKEdJ8QzyPBz/Llj3IQ3Gmmksns+FcPhRdajk5VCwT+pOVS0gJdrjATJIgZhCyZ/UYk+9OhzvGz79DCjxPas0sViovmgM+a/ZROJ+ZNVuCXsiYUg24Tw2lmm3Cy1y3uAOrOf0WEQCPShAGMR/2py/Q8Ok5GpbIbpuQLQDyrAEWJ6Gg+0fNwbCSXJmXkyrE1PYnDLnJyklKZVGjEgqFRSaTik0Q43rTxkIMhai6BJn9tU8bUUT4FOZ8m4Xz6N1Du48knJOdAZMUnaD8z4Q3PBxXHjEJtEMOsHHk3Nzd9TD4+UxsmGvX6UeL1KDTJK9qLsPkY3HSmxWfEP9cmjihTPCrVd3CV0fiKinUsmIZezJ7oavM+8dXVWcvBk6Aq9M+gVd4gwuYcZo5eY/MS7z773SgOukRl0xZVvw9m2tQsImtsxVutJpmNJNwAxEEfg5hy10Arag508LlfNHE3QrBDafZZsQ2rnK6YGEkp1U+GdxqB8XqbKgai3u+ifLRQ4k0vhvAq+/SdYo166uShTK/X+KRdoxGmtOCogTwqHQD0FBH8YYvaX/M+mjDNpQ+8rlLEp11cfRxbuixDo6GDkiS6A8itA1qyxEBBn9D6iRJekCboIsL8w/D9noGmgQCXURJGcQHAx7sIalBTOGLA0dETxuRxsQHAIbQb/5VKSxt/hwZXnl4ZKr7IFZSNu4Tm1COGzznReKa7PrJ63trm8vnC6dt8pmYZHUk4m0BjDaEkRWwFAIsiOolEvGQYNQ/tIlIQnqYuxRxRDb2iJOO7JF5Wo89TUlT7ceFnH8DXJoOMrgPk/9S5P2Mgb2sp88Znn0/Y0FKPHKYrdclYtFLW7YIyV9OZ32wFaOKLlHLOuT5Q176P+eCOWMorGERaZi2HAHnl496sEHiR8Oh7X2pnwTKY5wxhYJ0u5aJn+0nbJDv/6Fgyprzli2bdX7hp9eJr/8XjEFkixgGWq3MsVs+kCH4DzifaMrsaO9A6RwOT54gjcF5+oQhFW80HpofF679uLm0i9MTHgtNaWG2wyi4wax+pLSjgtPG7zhFwk4BBTfEJrZHlQFEnvL7sNdrZ+qvZnpeirXAM1g/Qy6nTfOgEQTZx6pJbmHZk59P0MiojriBmOVYLKqX2Wck5gjUyhi28vkANZBIjfyh747KzXouYDPC1YRo5oV9Npm6y84wYYOwPrPh61wO22UdwIAkkfuUz7vICIKPOCqcH1EtTW52NbBT5ATskv7WEgaahlKz6LebIBasV4aXGyyV53WWMU+OqzGLcML9k2HOcdTANPNvZwjCOuk1j1yest/1BRXF3afvXDzhUyr8yi8c5z8+gZ/jnApOY3UuKfmgkzpOhRSZfVj8SGnIAjOxeaouUjDxiD37H9j/iKPmGxkZMsKlpno6mmMegXb0SG+fYURJy9bLBBCTahkGZvpLFS5J/5BDWDHHADBa3mvtAesF+9NMDcgGUM3I1vlmlgO0S3ab3U8pVmodsLrmOH+H46w3gNOEk4mXIQ8b0JUVlAGtXnygzUpt8QpqGCg6tRuCd/LOks7jJcz9+czWJKbkq/w63gswQlrc5+uc4AZXIauCMR0R+t+vPsnVcveuguwCZUDcLcAwdB6J7SefxEGmDVYUklExLBouwTAY03bv79RGFcaS17rvoRwvcRWBUCS9e7VM/KFLYXogPSWdaRU6Txr+2cCyW4gAr1U6m2yNoqsoh4/hG5GN4oS069DlURj1T5ytym1Ladl5ghJJLxuwCnAtuEcaYUAp34zMafiCkcZMArkZBhrejESOLHdxYiwqwTGmIBO9YrR5ti5XC9ovhDa1sW0Hu1hwWm8tSNBifZT2sRL1Ce0BB3D0zu+z+caqxl5TcS1suOsb5Ofk7XuCl2fly7N1OkHKdwBy+pqfNwyP6/Jv8ERuF9snyf35nLjTQDOaOz8T+2iuEwMFoNgu1IUk8K5dF6a04fD0sC+NNaIks1CczQztRfZ1pISrKPrJjrA/ILseeDWaDAcrZwxNGvQBBQeKhp73BqdqQZZfo7VuO7iiQUTe4LvBDTFroyyIc6KFYM1iFxa+aNCtuGFemgP5uza4ma9PnT6bVpS4hrorp5rFf1xHkEx3cMbyUx8keeR1owzsG54cUOaWqGejhDHjvToREUdnuu2jukABuTeGpZg2trTYXufVdr8ydALlQOwHYGZY5opZZqVrATyOkXMqaeGDEXXNANdnL2EZf3CdZDI9RLvXkM80/SFzO5kn6bmpiJ6F1M4GiU3o5KBpz8RNeEEuNLIxbdGZY0GjWs8oOWi3K9qRUwI/ORkN37ethtYptffq7QEHy4Ivi1eZw4yffS91tOyX+xHqI4hP49O6dYYxF4x5cawlCDhEnpeU55RqYegtF8HcsQW8yaRNhL2LRBaEKQCNVRnzhltmrcG9An0NbM2G9mmykynqZN5XraGY14L13YIwc9dAGsaQ5ZKXb9NwA79O3LsDxOHU4gC4vBCB3TX5QsLfmZhjB1FvMQiwC6ZWxzv1MgUBM/kdqByquoKvSfuOVnvaT/GpLHHrEJZItpgLmqQsI7XNp2Gp5lqzUo2E7hCDnglDwX6GuH+JcBTnu9Kcfvh0uPdD/ADNhSBfavUYRqFTBsbEeJDUJPLFipg4P3IZiDKHGkMpN00OZx7N4Z7msBS2P089f9ruT/2jT1AnGA1TRKec6XWUx/BsObtN9uZzHT+hSOhd2bot12DKdqKWfjCfNZbyEhf7otYtx78voaH5s/uIRbymp3ue14LsnQPr1XLI7ROe9/ryVuX7m5+FE4KlX+5A/E5QkG30/JPgye26eW2Z+05O/FZSTOCvEQpZqFTjtnyMAPgE6aAl1UpHGB4Erel9pL4kAu110TYNPu9wN4AXJUQKHXOGhVNOETqgwtQWFHFteJKmwkVWe2ql0B4+jr8N/yHSpvP4MTN1Jyx7o0tgwh2LsetpiyRwubQpg6B4l9R9qV9kmZhNhUafSrLP7fXieeoELQVjkaGRSM7Ys2wWrwuHOUBryBhSSufZh8kd/xDCRw9+O7EsZNALhUVG6YyJHh/KJGHUU3vpsK8NHTchgokTIlgeBXpJaEtOuUk8lHFLb9N5cNvkVjixBQG7jNROeBk7g2Jorj2Cu25M7IxtCt8l2i66g45dfUEiafE/lsYBDUCieIEtNW5fbnu+VYf6TgM8iDl8sJQtZpGIg1EeCOZ8ekvIleO6UcTtweLhbYjz6S9c04iKFFMDugcQTRVtxrDu9Q0186vNM/K2Q06GzbJHmrwlIhZK6PLr+vXOY/FMfsFi9vMenWMm7jA6DQ8bynBhSBA87dUKaDcegN38ULHcpDvhSrkg5cyWnYsRIWB4SXOSfZ8elB/M0MECbSU51lBTzuzFTCuBoZHjNeE75Q6/bgvvRlIVjhf+7YX+ERUbElNGsk9+sqqJJdA6c9aMyNEVKpXA5ny+lDQ3duzuF1mjV0dOjShn6juuS+Q+vCYcpozs8FKA5SGMq+xypsIXYVt4Jcs07XBO7tiCNXbDNdWWaZoUHJuZyOnLNqXAez0uR6e7KpKIT9WCOvL5x4SI/I8g7+Hc/Wm6ZAY8WB970suiy+TDSuVqPLqqhBB0AdC21OQOerFpCSWhK5VMFEt/ZeSPC4pL08DtwzfwptR1NBc7fifmXvC7gL9BaLObwRcbY0b363FkBgpDXrnFnegeCH5Ddpg1lSNRw4zKoiRpalfOlrOJnzFkvwUT8GaDUqfoEvZ7YMumAxcV4FJACdNe7CDsGlHwNYBzpOy7ErVAJuJq1hj2PCgvaoMWZ057RzWDjhTqfiArFURXVL6MgKISPFYsslrQApKqUvOLBCTMcZ/+SZh4McV8wtoATWlENLjHcPiuONeogX8qNltWD7rYhOjCyyOT91QSU/ylrL2JXvjmsfWGN5bW6mAYLdYAi+CeUSrvwZK3cVjli4XgG9j7MROtCBjoHisX7/SIeanPEYdy5Z9t8qTTiszt2/Pg6zaH8OxR1ecGrbi3khTunWXMzczY8KGV0tJTfQSLGKewqcWek3n5pINQroHtgenj8hLHF+YF7Nqt6ORX+kdpzGHUtQu3WKxVESPmc2UdQ4xm5fX07ciuk6et6/KX0rLHy2pmDlPg5VoWVjTBypDyUWF7Bh67ar5IrY3Fh1GqB41Qn+8ra7r7m3lXaxWzBT7rOlYHhzHNAenuhLUBv1I85MrAI8yfd2kD+wSWEFdoYKSsbdgdnrIXLf2ZE/9QWDCwCDc6YMmm57C/G8oUs2sAwVnOajla26QU1rbSxIlc3vxKKvvg5OlWWFNGMn11i32W1nW+1kcakCOZxUi0Wm78Rhd4vKC+Qp1GeRK3Olkpn7G7Ih/XnlzmjXl047qR2b45t26c1NSRx+9y7MFLLXgpsseu9G54X59nycXXpmujsHIuJCsTxrsD7J+gEhFPleovW20DLGmQCSnVISXk72N3D1+vK+2aBrVb7jGRAzY7CFc9kcpNm6jZe8lVdy+GnlDbTeykAAf8TWF/zALcUreI5j74qus8ANZDsMdNcFCJxjFGJ0zFrcnF317hD8630spJaE9fReGsDtfhB4JmJ4YJPJjM3ACLmx7T/jiglBXF7QsNb/XG9Bj7e8cHMhnFI25zWgdceymf05P38xFxoMn0+u+4hP365e6trz9s9DcT5BoGPdUEc/ETMMk0Go+aOZz1MSY1tydfbv0ghbKdOVDkOLo3MY8tY7AGIEY8X8I8yae6SL/xE/vIWxi6ze7xG76d9BHmPN6ynSI5qEf4wsPv6vmKtItgJOcCWRAFI1LBssnyT2KVXIqIBKovtEWUkkgI0bgU63BDrIQggaYGceX8Yk1CLpHdo9E/2CIdhJR236z7Yffpdb8+1UPtCrbtzMlUekGpVMjkk6vfocJlQho0hSHceQY7OvMyXYkJ7VPFLyME6JmF9SUr4ujC7jg0ZfKx55RnbluE+GGmJXECIWSGO3zbh9tfqLWv+9O/dw37JZ9GeWCoBfCIfkolBvjwRcMAauD0twDAfIQeeLvzjJ/AnUc1mWt8k0YRyDcIRu8PWkbqyyx04pTCsDMXILFqQF3mguY08zDQ+HDs7cj4i8Snywt3JBoXbihJZaStB6yppZ0fIjxMcH+fMD2WOym559w6GlQ4dfijDPjXPtwENPx8DGow70Xcvqk3K8dKMjIU9X7VUoH0d9KjbD+Nxd8zgLyEFfnoUziWAtgePEvXDKw6kGx2fBOIadBqR5gojDRLgkjZsSK4N3uGDYFfLYUF9pCDhDxfANlsQjh3bRZ34B+q4C1uFWkAQ7sKGEBzbXVLYeXseh3gjg3FsEn4GhDQIBk7frIl9tTBVFIhx6i3jw6OVRcluRhg7wdRVSI6XCZusYAPOV1h02jRgJ62t6wgatTKgc0uhe/4NKdSRcyc5ClWmmrFbLsZkn4TAUlWsp93K2VBJ9ejklAM/hwVmChLzpALcb/7HL7QF0Q4Lbz0DEGFgPdlMgeGv8KJGmZ9zM0wPe8Nsjvg0TuJRNZrnrXHUkD0K3tvUSXONUsNgmrazk9A8nl/UfoK/jwNkjnaBF2i8B2ePnOGCjfV1hUGDEkTAhVArkfFYhwOXo8vJajN4km8DqAHLpgB1yOedIlj81l8Ty1gi55PrIWc3UdU9y/a2ght2T8kJvQzOpgkTpv0HQe5xKLy+ysnI4w36Ysel2UyMmyigS8Jk5+U4m+R2VWZtUqpQYRP3jCpJgsgq5ZwAolFegGZlnJX5BKUo2hRdHsM7DtVfxk3k+s+CWwUhRjuJIQaMZyIEYLxw7qIZkgBOUwW229wpxxGW++A0BuYHGqd7j2BGk4ihA51gE5mlXi3OmcgHzsFyb7yTriPpwXHx6LYVWrV/R1YTxmgJdPlcEvUA7YcMwDydk4I63YSZQj1wA0NwfY7d7dQg2bQeGJ7PcGt66NPx9edc+So3HXyDXhN9bD4Cb8mFaPPH+NEyXQRlweioFBwArjAcdiM/tpwONPCe29cwZT+eZNM/vrMC26Ier2n5pXWZ+Xsdvx4vLCrAMPiZ7ZMIJdbVyB0Ulh2GaI8My5/UpwYO30nei5LYEpw9TuR1tZ0jVJ1+1kbEo6Ik5Z2B4x841A2OKxoP24nhWbulvk7PM3x7noDY70plquZTF4asthe5lMziQVbRVHPPTBpayfYwn5XpWSR3kBiOZ0ek/iKT4e/vv2YES6s8zRiaqbbjWMND/aJ59xfNr1pWvPRrDelZtLOKxaup9HExte5GsWOvEf7xKkfMf+GwBeJDKn7fRIE4DmXdqO+DQvONb92HuWL8m4RpCFeb5VrByH3chfd5wUAg60s2YanzN7D8lSNpiV5tQgMPzbwidzsDd83oPp4NNHd7S9Ihp5G9kVyb+MSZ6llVequAJul980meX1DkMAg51yyn/n2VjC3zt/nqV8yaTwj5ei4e5UN84OuC9+XPeeqoxe8+/50VCvR4bGQ3kU0CBfr3BCUPjSfPn0vd0OJeyN3JpWSBdmUelcZKe9rSIkHcEeZcbpyZ865vKQDODmjCURCUDp41tTtCp5shgIyDf13U/i0BA37XQggD0HsGwFRw2ksWpMN83qjb/nYVxsSjyo9DbZL40iM3t1C76+6fRXUzgSbJFfFbhQot1M2nlixmq1TnKoBktkd+dbQbSz0HXGf0ItExzt4UKb1r+zMf9SWNxl5pAPGPH+8cufOA55WcPLDmyok7Lmv1XQpPPYKyyAeCCb7kaX8l/9hoxvdCzd18LrTcxdya7mQCq/1xH3dyulBmAld4TYghrmssa5NnYpqXpHi3nhWtAhQ1MvA7xUoLGE+aBOubyecogxhskugxEFzBHLJIcTQbjqVmoVhCaA2r5r9NErHnelr/kXbq8wexHSKx1jC+ts68+R72zJo/CR+KoW9yJ8jdVHree0xkfRGo4UBxmsVp/h9lZhOdz0RPFzBTNgDSVdG8H19PSTzhr/Rk9sW9xvSLHp8VU/2hizn/AQ5Pjq0CNijY7LJHu7rlk+D0qpf5rvBMJFrNPhMwhmM/nmNDDntwi2z4tdPNiriqVnLuGMIw7O8H7vuUUMsVy09M3EFbyOrti528YguvXlXrHHROd2l3PeG6qkLZ4Ku1gGXqN7ZBt/iBOMsoyy0dbx2J4u23s5R0MHn8KLytiqeqpuHWnUAwnlMnkMxwdRWVnu8iMPtHwlO6tG+2RtlxgFrGOKDwDqvYr37smr2ToofsReJzbHkp4/NMnJsVL/K+vJPi6H4RG5+lilR9BH3TdU69cFmgJldg+uSYklcbY63tkjtboHdiE0B1E7ACVkiN2wlqS24yTpJBKXafLjRAwVyvXC3RtYvP5FtD2GB4ZNgNYaO0g91DBijL/IXkCtP3LZEba2qYAyhe42YIURbLoZb42h8TEPpetykNftIbOt1v95uUW7lK21z33y8qW6Y1sdbzZNFY5AYWl2fBqw7tI39X9JAJ+YmeYBVwEvk4qZp47Rh2WwRW+4sjL7WZk6QFblBXElBfeoVKW26CM9l95wK7R70BZK8TC0xvi8h2Z/pOLUoxzltCGu4tB1t/DwgZUiTt7RVvNS7pH1+j8gIXiXSpsPGN+pbEslBw509hiuhMmIR5z2Xh31SQIqtO53u9Rj4OMmN12Mn4Pgz5Ae+J2OC8kfkDvgEyZyeG+j4Q4jpB1KACoeeZlzeSkJw24kAawnkL6c4ef/8wxRNmvVqS6wzejrZZwLYMRxDL9spy79pYyfSw3OGbjGMpviq8EhntXDiKtqPbW6cxphjIMplYVJnHMvOH6I90c0w5jfDHY3vStLOAy4OrVL/PtN9dqbXxFf/4qziwe2YQOZ/DQWOlvnmxUWvnmGEW3K2tC94iUDjifJf9o68C6nCLuds9FFFZRkYjGModnToIR6hTBNnIzXPNB1HlbmV6XvFSk+BXy/m8dKovlFmi0zCPlSfA0AvYHlHDRki33EGjiRmHXdGc+F8zQeNQ1amL0SvR/ZUvgOqBLzOlM5/1Q5L8UgjYXbutbZGGE/v+5UuUJhmJ/sJnzkj/9HlRPGPBowBRr8JuDLNtTeieXA5KbLFraTGI4efLhRve71t7Q8Lrp6pwSqW+sEN0u38Up+irLZUyBXcHSUWyWPFJpLbzH/Tc3vWfvhrXZU+KgTpo3qirB2JHbLwpUPQpCQYTO4IuLtdj6bzEdQ3FnbbSE5bamIu83kf8/s0cpzaUJx277SKe6v01R1QbbDmXPDLMVTHUp4Nba+mRS4k9xkj6Y2ac/KeOjI6vwbCWZLLQSh7jNkNWPUS+WecCfmEbn5hkN98WovUdfTxaMLhYIpourAuOxXxRGHpKvOUfjejJxTk27vmkluCiTn9fK9CYnkqNSbZJDMQfH7oaB6VcHyYv2/olLh71u+yYPJ/sqRox7f/EVSxn2BIX8pV8yzNr0g5hfJbctKGl+lJKyMLWLcw+7BXXdFYqyxvihppH929Mrp7rb57KXFPHZ4OwMatB7gPe9wdqvUtaDsq7r8ezr7MnwWQiehulZNnis2xdUhzM2qSXBLOqUIOi+w+yOYpR84DCeedjWzqLQAmMxjQEnOaLDi/n3Wpef4uaA6yKTMCXdhwQe/+rKSdFK6YQqznkLlJ4GiV+xy+xKY0j+MOPQ/ZT7BBWBK8s+KRHKZt9VhEmawZjdV5gIQAWAiyq5sCWeBgygefC1L7VilTqBADwA/EFEdDwUNQTKDqKck+Snc0zpOo6h9+WoiVNAdV9kIGUURwn0hkXYgQkO0MQHG1kaR1t+kXvgvAA59y2bJAHoQjpCd5tS5KrrdZWLCwvV5fJYmcPwlKHs/p031MqzNN8qtOYHLcLSKOxdRtF2YHSYB6P2YgB1TScFs2Ya4fCHO2X7FG+44fifUcimX/39A0fWrcpfLX+eLjMO6LNOYnDBHGoF6mhcqrrWv0iDqKK3kktnN2pFlQ1stop5lJEHGc48cqMePKQlfuEP7hcCwRnLqq6E3Efv6Uys8aj2MNps7y4hMuZrDLVbc6hPBARM/hWy0KHsTicsqBgFuar0Yfvm+FeTI6UKU3bywsoyyRa8oN8Hs4K4pLrVcvczvVDTjB9wXSpZMwN2Cdh3Utmwn6kEoZl2O9iWCtidjOogeLZhrAFAJ03gNZCjbHmnXNTm1lWUXG8Xt0lF+Hwuho6yusaznzVhRaMAptPggY3GrJScqQkhR34OkRSnJqAwp5OWLe1M2p+Ryzo2bul48CsznEnmPv8uznBRgOiQvI+Zf21dzqpF1tP9Dc8QQ/1J1x3PzOuLxZ5PE1h3UGg7bY5NbsGQ9GB2Mt5iQ00R3lmZ8iaDn2umOS0snGkKz0OWEWpFDhughMW+056I2e7eIuenn/6v369vA92nxP2vpN9pvs+SOPxEVuiY7cNq53hYTxGwKon57sqbqEi3wThftTM80pf52F9KbZycySwp4FcpnZL7sQa9cxF+Sz27PnGhzkayIdHrFIbfpMLLw97uUdnaqitPYLQlKZ3FOJi+JIf+lX1itEkWdClT/L7q18j/63Gfqud+Nu1Z6MAFu/eMqrsKnAVZKPZiFldbyQrFDTY1bBJllC+jhMhcJL0MUHq5eIob4rFyRreQhLHV8fnB2P7slnDBkrzSKmM6Qu6WYXvt+ACP9pgW1j3r+mYTGK90tktZr28DEkFZYQZt0ASeiOcfdpcVRn5gymZxE/rU0rZT483osgQWrrJYjSP5Mwm/3vhzIfOGDr517ir9m9JszZVTrRGq/3w00S3VkjfWwfvvgfxi5g5WGhXHGPwV0TwSdu44YrPzDZ3yRhfkqMVEFuPeAOIWNXIYt7cgsJt1anT6UJEoLuN6s4i+nQmkcsCkoIKzM0PDOKuLBy2oaNpH5C8aPMR03G1zCupR8CrSik4oykfioKBet3v+8fjl+5rxAyBtTFUPZc2EqsTc0drBUqPpuaMkuTu8wxHVDCW9TTYptwfZHTKy+w/P2LAkioYOkFw5Zr2+nIVkL3HKpbLcDypJqZ5Gp4eJyD4yAbwMM6ZDcsWwo2aSeELG3RR9GE+EhjBKNtMRD0uUMa13heYfnKD7rX5E1wHjA5/wTIkDQm5V47gbblfJy1004TOuF9CnFS1i1OMIxKYDI1IRts43vqnCdGSPYMldTluvsKchD6VApSOwy2PGGBaz7Ki1SPaTLlKjFwR5WHHFQ3e1h5aIRipAIju3cmwZ5EWa6kOdxVDRyfZYXc1CmJD6maypR95a8tOG4vchF2KWhqiKufAvWmbTv9dhD4u2vUmBJDm9PgYR6fpViQFdpndwwm1ynv5C/oz3/+LIWEtEqMKeptY8icP8vNLb5co81o7YFaLYPtfOQpotNjHk010i5PeRMMnBsCr9M8Uh1heiyE9IRaY+zALD+0gl+mSiYsHlk3DhUZYcknkq2FJGIc6qrASSIUIM/uCU+4X+sVmlvG2qiz0RPCm8WxrPXcWKQCkodg9wcrxB/nSC+6cd8nb5aOAOCpfexWQrhOGm9hf4ULZOF7NIYu8rB9a+N50/RASBRzalY6wUYdL+u+3eDrruR8rqfXNGBxZxL+MsJwIQzv+cDdr4HrrEVTsG4BlVKmui7D1mORqDQUlfdgw9SCgJCjWQpy/HD8jrT2ytT6W1JrlHLwSOGdtl1rndgD/2w5ZTVxywWguUnIKwM5JTZMaZKK17VmnPoG+WowlyUbcYpMLfyMWIu7JsadFzOpR4GpWLbwsQ/7EIdW5JODA/ikshwQlr8XB6zLAgS2sFQ1RolHyVpjuvdYQrbCFvXoW7vfjMRFEvad7ciUSHKmljSW3pdFkuz/KDnMiI/D0susdO5CIDmh8dkdTd3Jug6tvOq5m2lHaXHuH+FgzaQShIDp4/JvT4yrYWh6SgZCUb/dm18lBLpihclt6ZJFs27co11whwCWXd4K7treNEXBdd5scGVadVUmrQLoMLxWZV8PpnuPPRFgh/DfWBO7u4S6PAVHwwGd9JGZttQC+gyShoGXoOcF0Mjr0aHvzyP13Tn5RlhKf5sTs/BhUgYzZ2txrqBqk6C0Dde4Ba5zJfSepn+aYh5nyCDDmCNyE6+LCjEQ+XD40OKC0+nju6aj6YsnBiB9wwN8d2JJlKl7ZFwe2Mp+C8AW8bKc4t5kgGwHjGY82FhRqPUuV7U9CKXBw8XFWi45U9G5ln6k24WUaJgK+XVvs2Tgusq2RUjXYwNQ+2TnRswQXuah3cxOCYoTd9W83HMeoprlUl/yxONJhrFjVH5USpkrggfN6/KYC7tZEwRoCNdMBSdWS42fT4bvMxXHNVVULNA687PJwEDzurc37bAZmdGL4khm/3HunVzS4qNbJqbEUfGUkVERPcfcI2Wgv2eB6clVmtSuzMNll+9pCpa113U/oydfDz2Pnc9EDmhZdcrA8Q2yRmtvRrCcTeoyBcEsqfhNcKbgfNL9G9EQPnCVWAKQm6OmmojC1XHrik4ZbWqQfbzXPrG6IbR/pqVpAb/lYOBTq+ZQfJPC4wKvKHqEtAZsh9jDd8oXtJlT1vtFRLaexgDgfU4QSWHVIPKS99A3r8IJA+dnEgziRAkHXc2qNQ1nFndspYWHQjSxMHsBkBZZIdXWpIbP9k1Mn7AwuwvzsB2iHS5huvYAIBLMXLO87jf7gJlcbhqUK97rezhEaHCrhgg8vScubLh1UqzCRqMrdGywtGEbwcztA+ohnKhkmEpeGRgkOHWh7gysoOAyYPlOg5k7DMQ1nMzgJehqLDrSHp9lZunJNuzFnXmJ4JMNCtBO1OybxlQucmevodsZ6Pkgz0TS7LV1Z3P3Vry7TmqJBzc7UuZd/VqBaD0nEEc/MCekxvuX4gD0+NUoRolcJGLbiUbVBBrmrVUc3ae8XANdl+VFXEOf2VAxAKqfdQ7uZPuTGYFwkPFJbKPYEJAewF99pL8GAhLgd7zSmDFiAKosYgAwlozIDbeDonX2BHc6PEngMQAfFCALCIDIy0g5HCRHcrZ2ux0WssaMX9twa6b9MHbdPDFn1867ZtclVZEeejATSxB84NYIZJxPJSd58kEGEDIp2nIJpdqSFoRVyOiH8H2SPLjh8udfJg7zs0Yc6tJE/FB8w/j9vwr8iIYMs/eVnJL1SY7mxc16HCG48WPayQRY2vRgdDQr339d7mdru0K0H/8Kr+fRvXXLjRExiWoFq0pGbL5qnV83+POSRz9i3hUwwqP8kE/31hAMuA8IPk6iI/U/BAn+rETmhcaRqOn3TMRb62AMW5aG2gHIHNBTJSshsWlVGnPQxXQtyzoRopsuZctuiSj/8uwct7SXD4tAmw/5+xxccTgLo6KK3v3tO1UwHyn0aiW9hmUemAerC4t4vD5iIbrT2Cpwwyf1pqqCfzTem88TQXPhbWThlDR+S96p4cGsw9yuLCrhsOo28dktV1v2d798HWbMfJ6lm498KJOjqRfHB4anFb2Gx0IHx21X646G2nXL+2feY+NWRS/w5IUAGPQIXPcfS1r6J+EFTsydXFPYfA7b3i3KHw1GxHT4Vsa7X8ulQdXXNE5veDz98kHgdyJi/OHbu24Wj8cd1QVZyqomhlWcswLrk2c6MOXyA+JJvNRhBUkQimeERj/1Lj6IW0g/KB73b9K75T2BRVF/MgHTvJhnaowRvNuN/EfZ1jCtB1tAvjTltOmXflH1tcqb1tI/qNJa0zVo5J9YbW2eyin9ouaw8SFfC2oEgMeYh0jXc8/hwWrxs3hA4nc85OtKUhlfBW9po2fzsf6wHx86+qmT/kkZDY4A08XGrer4a26fLv3g5l1/Udgs4iufcrj654tbNy2JgfMtvPQuincA","base64")).toString()),n_)});var Xi={};Vt(Xi,{convertToZip:()=>tut,convertToZipWorker:()=>o_,extractArchiveTo:()=>zfe,getDefaultTaskPool:()=>Vfe,getTaskPoolForConfiguration:()=>Jfe,makeArchiveFromDirectory:()=>eut});function Zct(t,e){switch(t){case"async":return new r2(o_,{poolSize:e});case"workers":return new n2((0,s_.getContent)(),{poolSize:e});default:throw new Error(`Assertion failed: Unknown value ${t} for taskPoolMode`)}}function Vfe(){return typeof i_>"u"&&(i_=Zct("workers",Ji.availableParallelism())),i_}function Jfe(t){return typeof t>"u"?Vfe():ol($ct,t,()=>{let e=t.get("taskPoolMode"),r=t.get("taskPoolConcurrency");switch(e){case"async":return new r2(o_,{poolSize:r});case"workers":return new n2((0,s_.getContent)(),{poolSize:r});default:throw new Error(`Assertion failed: Unknown value ${e} for taskPoolMode`)}})}async function o_(t){let{tmpFile:e,tgz:r,compressionLevel:o,extractBufferOpts:a}=t,n=new zi(e,{create:!0,level:o,stats:Ea.makeDefaultStats()}),u=Buffer.from(r.buffer,r.byteOffset,r.byteLength);return await zfe(u,n,a),n.saveAndClose(),e}async function eut(t,{baseFs:e=new Tn,prefixPath:r=Bt.root,compressionLevel:o,inMemory:a=!1}={}){let n;if(a)n=new zi(null,{level:o});else{let A=await oe.mktempPromise(),p=V.join(A,"archive.zip");n=new zi(p,{create:!0,level:o})}let u=V.resolve(Bt.root,r);return await n.copyPromise(u,t,{baseFs:e,stableTime:!0,stableSort:!0}),n}async function tut(t,e={}){let r=await oe.mktempPromise(),o=V.join(r,"archive.zip"),a=e.compressionLevel??e.configuration?.get("compressionLevel")??"mixed",n={prefixPath:e.prefixPath,stripComponents:e.stripComponents};return await(e.taskPool??Jfe(e.configuration)).run({tmpFile:o,tgz:t,compressionLevel:a,extractBufferOpts:n}),new zi(o,{level:e.compressionLevel})}async function*rut(t){let e=new Kfe.default.Parse,r=new Wfe.PassThrough({objectMode:!0,autoDestroy:!0,emitClose:!0});e.on("entry",o=>{r.write(o)}),e.on("error",o=>{r.destroy(o)}),e.on("close",()=>{r.destroyed||r.end()}),e.end(t);for await(let o of r){let a=o;yield a,a.resume()}}async function zfe(t,e,{stripComponents:r=0,prefixPath:o=Bt.dot}={}){function a(n){if(n.path[0]==="/")return!0;let u=n.path.split(/\//g);return!!(u.some(A=>A==="..")||u.length<=r)}for await(let n of rut(t)){if(a(n))continue;let u=V.normalize(ue.toPortablePath(n.path)).replace(/\/$/,"").split(/\//g);if(u.length<=r)continue;let A=u.slice(r).join("/"),p=V.join(o,A),h=420;switch((n.type==="Directory"||((n.mode??0)&73)!==0)&&(h|=73),n.type){case"Directory":e.mkdirpSync(V.dirname(p),{chmod:493,utimes:[vi.SAFE_TIME,vi.SAFE_TIME]}),e.mkdirSync(p,{mode:h}),e.utimesSync(p,vi.SAFE_TIME,vi.SAFE_TIME);break;case"OldFile":case"File":e.mkdirpSync(V.dirname(p),{chmod:493,utimes:[vi.SAFE_TIME,vi.SAFE_TIME]}),e.writeFileSync(p,await Vy(n),{mode:h}),e.utimesSync(p,vi.SAFE_TIME,vi.SAFE_TIME);break;case"SymbolicLink":e.mkdirpSync(V.dirname(p),{chmod:493,utimes:[vi.SAFE_TIME,vi.SAFE_TIME]}),e.symlinkSync(n.linkpath,p),e.lutimesSync(p,vi.SAFE_TIME,vi.SAFE_TIME);break}}return e}var Wfe,Kfe,s_,i_,$ct,Xfe=Et(()=>{Ye();St();nA();Wfe=ve("stream"),Kfe=$e(Hfe());Gfe();jl();s_=$e(Yfe());$ct=new WeakMap});var $fe=_((a_,Zfe)=>{(function(t,e){typeof a_=="object"?Zfe.exports=e():typeof define=="function"&&define.amd?define(e):t.treeify=e()})(a_,function(){function t(a,n){var u=n?"\u2514":"\u251C";return a?u+="\u2500 ":u+="\u2500\u2500\u2510",u}function e(a,n){var u=[];for(var A in a)!a.hasOwnProperty(A)||n&&typeof a[A]=="function"||u.push(A);return u}function r(a,n,u,A,p,h,E){var I="",v=0,x,C,R=A.slice(0);if(R.push([n,u])&&A.length>0&&(A.forEach(function(U,J){J>0&&(I+=(U[1]?" ":"\u2502")+"  "),!C&&U[0]===n&&(C=!0)}),I+=t(a,u)+a,p&&(typeof n!="object"||n instanceof Date)&&(I+=": "+n),C&&(I+=" (circular ref.)"),E(I)),!C&&typeof n=="object"){var L=e(n,h);L.forEach(function(U){x=++v===L.length,r(U,n[U],x,R,p,h,E)})}}var o={};return o.asLines=function(a,n,u,A){var p=typeof u!="function"?u:!1;r(".",a,!1,[],n,p,A||u)},o.asTree=function(a,n,u){var A="";return r(".",a,!1,[],n,u,function(p){A+=p+`
+`}),A},o})});var $s={};Vt($s,{emitList:()=>nut,emitTree:()=>npe,treeNodeToJson:()=>rpe,treeNodeToTreeify:()=>tpe});function tpe(t,{configuration:e}){let r={},o=0,a=(n,u)=>{let A=Array.isArray(n)?n.entries():Object.entries(n);for(let[p,h]of A){if(!h)continue;let{label:E,value:I,children:v}=h,x=[];typeof E<"u"&&x.push(yd(e,E,2)),typeof I<"u"&&x.push(Mt(e,I[0],I[1])),x.length===0&&x.push(yd(e,`${p}`,2));let C=x.join(": ").trim(),R=`\0${o++}\0`,L=u[`${R}${C}`]={};typeof v<"u"&&a(v,L)}};if(typeof t.children>"u")throw new Error("The root node must only contain children");return a(t.children,r),r}function rpe(t){let e=r=>{if(typeof r.children>"u"){if(typeof r.value>"u")throw new Error("Assertion failed: Expected a value to be set if the children are missing");return Ed(r.value[0],r.value[1])}let o=Array.isArray(r.children)?r.children.entries():Object.entries(r.children??{}),a=Array.isArray(r.children)?[]:{};for(let[n,u]of o)u&&(a[iut(n)]=e(u));return typeof r.value>"u"?a:{value:Ed(r.value[0],r.value[1]),children:a}};return e(t)}function nut(t,{configuration:e,stdout:r,json:o}){let a=t.map(n=>({value:n}));npe({children:a},{configuration:e,stdout:r,json:o})}function npe(t,{configuration:e,stdout:r,json:o,separators:a=0}){if(o){let u=Array.isArray(t.children)?t.children.values():Object.values(t.children??{});for(let A of u)A&&r.write(`${JSON.stringify(rpe(A))}
+`);return}let n=(0,epe.asTree)(tpe(t,{configuration:e}),!1,!1);if(n=n.replace(/\0[0-9]+\0/g,""),a>=1&&(n=n.replace(/^([├└]─)/gm,`\u2502
+$1`).replace(/^│\n/,"")),a>=2)for(let u=0;u<2;++u)n=n.replace(/^([│ ].{2}[├│ ].{2}[^\n]+\n)(([│ ]).{2}[├└].{2}[^\n]*\n[│ ].{2}[│ ].{2}[├└]─)/gm,`$1$3  \u2502 
+$2`).replace(/^│\n/,"");if(a>=3)throw new Error("Only the first two levels are accepted by treeUtils.emitTree");r.write(n)}function iut(t){return typeof t=="string"?t.replace(/^\0[0-9]+\0/,""):t}var epe,ipe=Et(()=>{epe=$e($fe());Gl()});function i2(t){let e=t.match(sut);if(!e?.groups)throw new Error("Assertion failed: Expected the checksum to match the requested pattern");let r=e.groups.cacheVersion?parseInt(e.groups.cacheVersion):null;return{cacheKey:e.groups.cacheKey??null,cacheVersion:r,cacheSpec:e.groups.cacheSpec??null,hash:e.groups.hash}}var spe,l_,c_,Kx,Lr,sut,u_=Et(()=>{Ye();St();St();nA();spe=ve("crypto"),l_=$e(ve("fs"));Yl();nh();jl();bo();c_=Jy(process.env.YARN_CACHE_CHECKPOINT_OVERRIDE??process.env.YARN_CACHE_VERSION_OVERRIDE??9),Kx=Jy(process.env.YARN_CACHE_VERSION_OVERRIDE??10),Lr=class{constructor(e,{configuration:r,immutable:o=r.get("enableImmutableCache"),check:a=!1}){this.markedFiles=new Set;this.mutexes=new Map;this.cacheId=`-${(0,spe.randomBytes)(8).toString("hex")}.tmp`;this.configuration=r,this.cwd=e,this.immutable=o,this.check=a;let{cacheSpec:n,cacheKey:u}=Lr.getCacheKey(r);this.cacheSpec=n,this.cacheKey=u}static async find(e,{immutable:r,check:o}={}){let a=new Lr(e.get("cacheFolder"),{configuration:e,immutable:r,check:o});return await a.setup(),a}static getCacheKey(e){let r=e.get("compressionLevel"),o=r!=="mixed"?`c${r}`:"";return{cacheKey:[Kx,o].join(""),cacheSpec:o}}get mirrorCwd(){if(!this.configuration.get("enableMirror"))return null;let e=`${this.configuration.get("globalFolder")}/cache`;return e!==this.cwd?e:null}getVersionFilename(e){return`${lE(e)}-${this.cacheKey}.zip`}getChecksumFilename(e,r){let a=i2(r).hash.slice(0,10);return`${lE(e)}-${a}.zip`}isChecksumCompatible(e){if(e===null)return!1;let{cacheVersion:r,cacheSpec:o}=i2(e);if(r===null||r<c_)return!1;let a=this.configuration.get("cacheMigrationMode");return!(r<Kx&&a==="always"||o!==this.cacheSpec&&a!=="required-only")}getLocatorPath(e,r){return this.mirrorCwd===null?V.resolve(this.cwd,this.getVersionFilename(e)):r===null?V.resolve(this.cwd,this.getVersionFilename(e)):V.resolve(this.cwd,this.getChecksumFilename(e,r))}getLocatorMirrorPath(e){let r=this.mirrorCwd;return r!==null?V.resolve(r,this.getVersionFilename(e)):null}async setup(){if(!this.configuration.get("enableGlobalCache"))if(this.immutable){if(!await oe.existsPromise(this.cwd))throw new zt(56,"Cache path does not exist.")}else{await oe.mkdirPromise(this.cwd,{recursive:!0});let e=V.resolve(this.cwd,".gitignore");await oe.changeFilePromise(e,`/.gitignore
+*.flock
+*.tmp
+`)}(this.mirrorCwd||!this.immutable)&&await oe.mkdirPromise(this.mirrorCwd||this.cwd,{recursive:!0})}async fetchPackageFromCache(e,r,{onHit:o,onMiss:a,loader:n,...u}){let A=this.getLocatorMirrorPath(e),p=new Tn,h=()=>{let he=new zi,Be=V.join(Bt.root,nM(e));return he.mkdirSync(Be,{recursive:!0}),he.writeJsonSync(V.join(Be,dr.manifest),{name:fn(e),mocked:!0}),he},E=async(he,{isColdHit:Be,controlPath:we=null})=>{if(we===null&&u.unstablePackages?.has(e.locatorHash))return{isValid:!0,hash:null};let g=r&&!Be?i2(r).cacheKey:this.cacheKey,Ee=!u.skipIntegrityCheck||!r?`${g}/${await NP(he)}`:r;if(we!==null){let le=!u.skipIntegrityCheck||!r?`${this.cacheKey}/${await NP(we)}`:r;if(Ee!==le)throw new zt(18,"The remote archive doesn't match the local checksum - has the local cache been corrupted?")}let Se=null;switch(r!==null&&Ee!==r&&(this.check?Se="throw":i2(r).cacheKey!==i2(Ee).cacheKey?Se="update":Se=this.configuration.get("checksumBehavior")),Se){case null:case"update":return{isValid:!0,hash:Ee};case"ignore":return{isValid:!0,hash:r};case"reset":return{isValid:!1,hash:r};default:case"throw":throw new zt(18,"The remote archive doesn't match the expected checksum")}},I=async he=>{if(!n)throw new Error(`Cache check required but no loader configured for ${jr(this.configuration,e)}`);let Be=await n(),we=Be.getRealPath();Be.saveAndClose(),await oe.chmodPromise(we,420);let g=await E(he,{controlPath:we,isColdHit:!1});if(!g.isValid)throw new Error("Assertion failed: Expected a valid checksum");return g.hash},v=async()=>{if(A===null||!await oe.existsPromise(A)){let he=await n(),Be=he.getRealPath();return he.saveAndClose(),{source:"loader",path:Be}}return{source:"mirror",path:A}},x=async()=>{if(!n)throw new Error(`Cache entry required but missing for ${jr(this.configuration,e)}`);if(this.immutable)throw new zt(56,`Cache entry required but missing for ${jr(this.configuration,e)}`);let{path:he,source:Be}=await v(),{hash:we}=await E(he,{isColdHit:!0}),g=this.getLocatorPath(e,we),Ee=[];Be!=="mirror"&&A!==null&&Ee.push(async()=>{let le=`${A}${this.cacheId}`;await oe.copyFilePromise(he,le,l_.default.constants.COPYFILE_FICLONE),await oe.chmodPromise(le,420),await oe.renamePromise(le,A)}),(!u.mirrorWriteOnly||A===null)&&Ee.push(async()=>{let le=`${g}${this.cacheId}`;await oe.copyFilePromise(he,le,l_.default.constants.COPYFILE_FICLONE),await oe.chmodPromise(le,420),await oe.renamePromise(le,g)});let Se=u.mirrorWriteOnly?A??g:g;return await Promise.all(Ee.map(le=>le())),[!1,Se,we]},C=async()=>{let Be=(async()=>{let we=u.unstablePackages?.has(e.locatorHash),g=we||!r||this.isChecksumCompatible(r)?this.getLocatorPath(e,r):null,Ee=g!==null?this.markedFiles.has(g)||await p.existsPromise(g):!1,Se=!!u.mockedPackages?.has(e.locatorHash)&&(!this.check||!Ee),le=Se||Ee,ne=le?o:a;if(ne&&ne(),le){let ee=null,Ie=g;if(!Se)if(this.check)ee=await I(Ie);else{let Fe=await E(Ie,{isColdHit:!1});if(Fe.isValid)ee=Fe.hash;else return x()}return[Se,Ie,ee]}else{if(this.immutable&&we)throw new zt(56,`Cache entry required but missing for ${jr(this.configuration,e)}; consider defining ${de.pretty(this.configuration,"supportedArchitectures",de.Type.CODE)} to cache packages for multiple systems`);return x()}})();this.mutexes.set(e.locatorHash,Be);try{return await Be}finally{this.mutexes.delete(e.locatorHash)}};for(let he;he=this.mutexes.get(e.locatorHash);)await he;let[R,L,U]=await C();R||this.markedFiles.add(L);let J,te=R?()=>h():()=>new zi(L,{baseFs:p,readOnly:!0}),ae=new iy(()=>EL(()=>J=te(),he=>`Failed to open the cache entry for ${jr(this.configuration,e)}: ${he}`),V),fe=new Uu(L,{baseFs:ae,pathUtils:V}),ce=()=>{J?.discardAndClose()},me=u.unstablePackages?.has(e.locatorHash)?null:U;return[fe,ce,me]}},sut=/^(?:(?<cacheKey>(?<cacheVersion>[0-9]+)(?<cacheSpec>.*))\/)?(?<hash>.*)$/});var Vx,ope=Et(()=>{Vx=(r=>(r[r.SCRIPT=0]="SCRIPT",r[r.SHELLCODE=1]="SHELLCODE",r))(Vx||{})});var out,oC,A_=Et(()=>{St();Nl();Qf();bo();out=[[/^(git(?:\+(?:https|ssh))?:\/\/.*(?:\.git)?)#(.*)$/,(t,e,r,o)=>`${r}#commit=${o}`],[/^https:\/\/((?:[^/]+?)@)?codeload\.github\.com\/([^/]+\/[^/]+)\/tar\.gz\/([0-9a-f]+)$/,(t,e,r="",o,a)=>`https://${r}github.com/${o}.git#commit=${a}`],[/^https:\/\/((?:[^/]+?)@)?github\.com\/([^/]+\/[^/]+?)(?:\.git)?#([0-9a-f]+)$/,(t,e,r="",o,a)=>`https://${r}github.com/${o}.git#commit=${a}`],[/^https?:\/\/[^/]+\/(?:[^/]+\/)*(?:@.+(?:\/|(?:%2f)))?([^/]+)\/(?:-|download)\/\1-[^/]+\.tgz(?:#|$)/,t=>`npm:${t}`],[/^https:\/\/npm\.pkg\.github\.com\/download\/(?:@[^/]+)\/(?:[^/]+)\/(?:[^/]+)\/(?:[0-9a-f]+)(?:#|$)/,t=>`npm:${t}`],[/^https:\/\/npm\.fontawesome\.com\/(?:@[^/]+)\/([^/]+)\/-\/([^/]+)\/\1-\2.tgz(?:#|$)/,t=>`npm:${t}`],[/^https?:\/\/[^/]+\/.*\/(@[^/]+)\/([^/]+)\/-\/\1\/\2-(?:[.\d\w-]+)\.tgz(?:#|$)/,(t,e)=>_P({protocol:"npm:",source:null,selector:t,params:{__archiveUrl:e}})],[/^[^/]+\.tgz#[0-9a-f]+$/,t=>`npm:${t}`]],oC=class{constructor(e){this.resolver=e;this.resolutions=null}async setup(e,{report:r}){let o=V.join(e.cwd,dr.lockfile);if(!oe.existsSync(o))return;let a=await oe.readFilePromise(o,"utf8"),n=Ki(a);if(Object.hasOwn(n,"__metadata"))return;let u=this.resolutions=new Map;for(let A of Object.keys(n)){let p=s1(A);if(!p){r.reportWarning(14,`Failed to parse the string "${A}" into a proper descriptor`);continue}let h=xa(p.range)?In(p,`npm:${p.range}`):p,{version:E,resolved:I}=n[A];if(!I)continue;let v;for(let[C,R]of out){let L=I.match(C);if(L){v=R(E,...L);break}}if(!v){r.reportWarning(14,`${Gn(e.configuration,h)}: Only some patterns can be imported from legacy lockfiles (not "${I}")`);continue}let x=h;try{let C=Bd(h.range),R=s1(C.selector,!0);R&&(x=R)}catch{}u.set(h.descriptorHash,Qs(x,v))}}supportsDescriptor(e,r){return this.resolutions?this.resolutions.has(e.descriptorHash):!1}supportsLocator(e,r){return!1}shouldPersistResolution(e,r){throw new Error("Assertion failed: This resolver doesn't support resolving locators to packages")}bindDescriptor(e,r,o){return e}getResolutionDependencies(e,r){return{}}async getCandidates(e,r,o){if(!this.resolutions)throw new Error("Assertion failed: The resolution store should have been setup");let a=this.resolutions.get(e.descriptorHash);if(!a)throw new Error("Assertion failed: The resolution should have been registered");let n=$O(a),u=o.project.configuration.normalizeDependency(n);return await this.resolver.getCandidates(u,r,o)}async getSatisfying(e,r,o,a){let[n]=await this.getCandidates(e,r,a);return{locators:o.filter(u=>u.locatorHash===n.locatorHash),sorted:!1}}async resolve(e,r){throw new Error("Assertion failed: This resolver doesn't support resolving locators to packages")}}});var AA,ape=Et(()=>{Yl();O1();Gl();AA=class extends Xs{constructor({configuration:r,stdout:o,suggestInstall:a=!0}){super();this.errorCount=0;XI(this,{configuration:r}),this.configuration=r,this.stdout=o,this.suggestInstall=a}static async start(r,o){let a=new this(r);try{await o(a)}catch(n){a.reportExceptionOnce(n)}finally{await a.finalize()}return a}hasErrors(){return this.errorCount>0}exitCode(){return this.hasErrors()?1:0}reportCacheHit(r){}reportCacheMiss(r){}startSectionSync(r,o){return o()}async startSectionPromise(r,o){return await o()}startTimerSync(r,o,a){return(typeof o=="function"?o:a)()}async startTimerPromise(r,o,a){return await(typeof o=="function"?o:a)()}reportSeparator(){}reportInfo(r,o){}reportWarning(r,o){}reportError(r,o){this.errorCount+=1,this.stdout.write(`${Mt(this.configuration,"\u27A4","redBright")} ${this.formatNameWithHyperlink(r)}: ${o}
+`)}reportProgress(r){return{...Promise.resolve().then(async()=>{for await(let{}of r);}),stop:()=>{}}}reportJson(r){}reportFold(r,o){}async finalize(){this.errorCount>0&&(this.stdout.write(`
+`),this.stdout.write(`${Mt(this.configuration,"\u27A4","redBright")} Errors happened when preparing the environment required to run this command.
+`),this.suggestInstall&&this.stdout.write(`${Mt(this.configuration,"\u27A4","redBright")} This might be caused by packages being missing from the lockfile, in which case running "yarn install" might help.
+`))}formatNameWithHyperlink(r){return yU(r,{configuration:this.configuration,json:!1})}}});var aC,f_=Et(()=>{bo();aC=class{constructor(e){this.resolver=e}supportsDescriptor(e,r){return!!(r.project.storedResolutions.get(e.descriptorHash)||r.project.originalPackages.has(OP(e).locatorHash))}supportsLocator(e,r){return!!(r.project.originalPackages.has(e.locatorHash)&&!r.project.lockfileNeedsRefresh)}shouldPersistResolution(e,r){throw new Error("The shouldPersistResolution method shouldn't be called on the lockfile resolver, which would always answer yes")}bindDescriptor(e,r,o){return e}getResolutionDependencies(e,r){return this.resolver.getResolutionDependencies(e,r)}async getCandidates(e,r,o){let a=o.project.storedResolutions.get(e.descriptorHash);if(a){let u=o.project.originalPackages.get(a);if(u)return[u]}let n=o.project.originalPackages.get(OP(e).locatorHash);if(n)return[n];throw new Error("Resolution expected from the lockfile data")}async getSatisfying(e,r,o,a){let[n]=await this.getCandidates(e,r,a);return{locators:o.filter(u=>u.locatorHash===n.locatorHash),sorted:!1}}async resolve(e,r){let o=r.project.originalPackages.get(e.locatorHash);if(!o)throw new Error("The lockfile resolver isn't meant to resolve packages - they should already have been stored into a cache");return o}}});function Kf(){}function aut(t,e,r,o,a){for(var n=0,u=e.length,A=0,p=0;n<u;n++){var h=e[n];if(h.removed){if(h.value=t.join(o.slice(p,p+h.count)),p+=h.count,n&&e[n-1].added){var I=e[n-1];e[n-1]=e[n],e[n]=I}}else{if(!h.added&&a){var E=r.slice(A,A+h.count);E=E.map(function(x,C){var R=o[p+C];return R.length>x.length?R:x}),h.value=t.join(E)}else h.value=t.join(r.slice(A,A+h.count));A+=h.count,h.added||(p+=h.count)}}var v=e[u-1];return u>1&&typeof v.value=="string"&&(v.added||v.removed)&&t.equals("",v.value)&&(e[u-2].value+=v.value,e.pop()),e}function lut(t){return{newPos:t.newPos,components:t.components.slice(0)}}function cut(t,e){if(typeof t=="function")e.callback=t;else if(t)for(var r in t)t.hasOwnProperty(r)&&(e[r]=t[r]);return e}function upe(t,e,r){return r=cut(r,{ignoreWhitespace:!0}),m_.diff(t,e,r)}function uut(t,e,r){return y_.diff(t,e,r)}function Jx(t){return typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?Jx=function(e){return typeof e}:Jx=function(e){return e&&typeof Symbol=="function"&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},Jx(t)}function p_(t){return put(t)||hut(t)||gut(t)||dut()}function put(t){if(Array.isArray(t))return h_(t)}function hut(t){if(typeof Symbol<"u"&&Symbol.iterator in Object(t))return Array.from(t)}function gut(t,e){if(!!t){if(typeof t=="string")return h_(t,e);var r=Object.prototype.toString.call(t).slice(8,-1);if(r==="Object"&&t.constructor&&(r=t.constructor.name),r==="Map"||r==="Set")return Array.from(t);if(r==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r))return h_(t,e)}}function h_(t,e){(e==null||e>t.length)&&(e=t.length);for(var r=0,o=new Array(e);r<e;r++)o[r]=t[r];return o}function dut(){throw new TypeError(`Invalid attempt to spread non-iterable instance.
+In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`)}function g_(t,e,r,o,a){e=e||[],r=r||[],o&&(t=o(a,t));var n;for(n=0;n<e.length;n+=1)if(e[n]===t)return r[n];var u;if(mut.call(t)==="[object Array]"){for(e.push(t),u=new Array(t.length),r.push(u),n=0;n<t.length;n+=1)u[n]=g_(t[n],e,r,o,a);return e.pop(),r.pop(),u}if(t&&t.toJSON&&(t=t.toJSON()),Jx(t)==="object"&&t!==null){e.push(t),u={},r.push(u);var A=[],p;for(p in t)t.hasOwnProperty(p)&&A.push(p);for(A.sort(),n=0;n<A.length;n+=1)p=A[n],u[p]=g_(t[p],e,r,o,p);e.pop(),r.pop()}else u=t;return u}function Ape(t,e,r,o,a,n,u){u||(u={}),typeof u.context>"u"&&(u.context=4);var A=uut(r,o,u);if(!A)return;A.push({value:"",lines:[]});function p(U){return U.map(function(J){return" "+J})}for(var h=[],E=0,I=0,v=[],x=1,C=1,R=function(J){var te=A[J],ae=te.lines||te.value.replace(/\n$/,"").split(`
+`);if(te.lines=ae,te.added||te.removed){var fe;if(!E){var ce=A[J-1];E=x,I=C,ce&&(v=u.context>0?p(ce.lines.slice(-u.context)):[],E-=v.length,I-=v.length)}(fe=v).push.apply(fe,p_(ae.map(function(le){return(te.added?"+":"-")+le}))),te.added?C+=ae.length:x+=ae.length}else{if(E)if(ae.length<=u.context*2&&J<A.length-2){var me;(me=v).push.apply(me,p_(p(ae)))}else{var he,Be=Math.min(ae.length,u.context);(he=v).push.apply(he,p_(p(ae.slice(0,Be))));var we={oldStart:E,oldLines:x-E+Be,newStart:I,newLines:C-I+Be,lines:v};if(J>=A.length-2&&ae.length<=u.context){var g=/\n$/.test(r),Ee=/\n$/.test(o),Se=ae.length==0&&v.length>we.oldLines;!g&&Se&&r.length>0&&v.splice(we.oldLines,0,"\\ No newline at end of file"),(!g&&!Se||!Ee)&&v.push("\\ No newline at end of file")}h.push(we),E=0,I=0,v=[]}x+=ae.length,C+=ae.length}},L=0;L<A.length;L++)R(L);return{oldFileName:t,newFileName:e,oldHeader:a,newHeader:n,hunks:h}}var n3t,lpe,cpe,m_,y_,Aut,fut,mut,s2,d_,E_=Et(()=>{Kf.prototype={diff:function(e,r){var o=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{},a=o.callback;typeof o=="function"&&(a=o,o={}),this.options=o;var n=this;function u(R){return a?(setTimeout(function(){a(void 0,R)},0),!0):R}e=this.castInput(e),r=this.castInput(r),e=this.removeEmpty(this.tokenize(e)),r=this.removeEmpty(this.tokenize(r));var A=r.length,p=e.length,h=1,E=A+p;o.maxEditLength&&(E=Math.min(E,o.maxEditLength));var I=[{newPos:-1,components:[]}],v=this.extractCommon(I[0],r,e,0);if(I[0].newPos+1>=A&&v+1>=p)return u([{value:this.join(r),count:r.length}]);function x(){for(var R=-1*h;R<=h;R+=2){var L=void 0,U=I[R-1],J=I[R+1],te=(J?J.newPos:0)-R;U&&(I[R-1]=void 0);var ae=U&&U.newPos+1<A,fe=J&&0<=te&&te<p;if(!ae&&!fe){I[R]=void 0;continue}if(!ae||fe&&U.newPos<J.newPos?(L=lut(J),n.pushComponent(L.components,void 0,!0)):(L=U,L.newPos++,n.pushComponent(L.components,!0,void 0)),te=n.extractCommon(L,r,e,R),L.newPos+1>=A&&te+1>=p)return u(aut(n,L.components,r,e,n.useLongestToken));I[R]=L}h++}if(a)(function R(){setTimeout(function(){if(h>E)return a();x()||R()},0)})();else for(;h<=E;){var C=x();if(C)return C}},pushComponent:function(e,r,o){var a=e[e.length-1];a&&a.added===r&&a.removed===o?e[e.length-1]={count:a.count+1,added:r,removed:o}:e.push({count:1,added:r,removed:o})},extractCommon:function(e,r,o,a){for(var n=r.length,u=o.length,A=e.newPos,p=A-a,h=0;A+1<n&&p+1<u&&this.equals(r[A+1],o[p+1]);)A++,p++,h++;return h&&e.components.push({count:h}),e.newPos=A,p},equals:function(e,r){return this.options.comparator?this.options.comparator(e,r):e===r||this.options.ignoreCase&&e.toLowerCase()===r.toLowerCase()},removeEmpty:function(e){for(var r=[],o=0;o<e.length;o++)e[o]&&r.push(e[o]);return r},castInput:function(e){return e},tokenize:function(e){return e.split("")},join:function(e){return e.join("")}};n3t=new Kf;lpe=/^[A-Za-z\xC0-\u02C6\u02C8-\u02D7\u02DE-\u02FF\u1E00-\u1EFF]+$/,cpe=/\S/,m_=new Kf;m_.equals=function(t,e){return this.options.ignoreCase&&(t=t.toLowerCase(),e=e.toLowerCase()),t===e||this.options.ignoreWhitespace&&!cpe.test(t)&&!cpe.test(e)};m_.tokenize=function(t){for(var e=t.split(/([^\S\r\n]+|[()[\]{}'"\r\n]|\b)/),r=0;r<e.length-1;r++)!e[r+1]&&e[r+2]&&lpe.test(e[r])&&lpe.test(e[r+2])&&(e[r]+=e[r+2],e.splice(r+1,2),r--);return e};y_=new Kf;y_.tokenize=function(t){var e=[],r=t.split(/(\n|\r\n)/);r[r.length-1]||r.pop();for(var o=0;o<r.length;o++){var a=r[o];o%2&&!this.options.newlineIsToken?e[e.length-1]+=a:(this.options.ignoreWhitespace&&(a=a.trim()),e.push(a))}return e};Aut=new Kf;Aut.tokenize=function(t){return t.split(/(\S.+?[.!?])(?=\s+|$)/)};fut=new Kf;fut.tokenize=function(t){return t.split(/([{}:;,]|\s+)/)};mut=Object.prototype.toString,s2=new Kf;s2.useLongestToken=!0;s2.tokenize=y_.tokenize;s2.castInput=function(t){var e=this.options,r=e.undefinedReplacement,o=e.stringifyReplacer,a=o===void 0?function(n,u){return typeof u>"u"?r:u}:o;return typeof t=="string"?t:JSON.stringify(g_(t,null,null,a),a,"  ")};s2.equals=function(t,e){return Kf.prototype.equals.call(s2,t.replace(/,([\r\n])/g,"$1"),e.replace(/,([\r\n])/g,"$1"))};d_=new Kf;d_.tokenize=function(t){return t.slice()};d_.join=d_.removeEmpty=function(t){return t}});var ppe=_((s3t,fpe)=>{var yut=Hl(),Eut=pE(),Cut=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,wut=/^\w*$/;function Iut(t,e){if(yut(t))return!1;var r=typeof t;return r=="number"||r=="symbol"||r=="boolean"||t==null||Eut(t)?!0:wut.test(t)||!Cut.test(t)||e!=null&&t in Object(e)}fpe.exports=Iut});var dpe=_((o3t,gpe)=>{var hpe=_S(),But="Expected a function";function C_(t,e){if(typeof t!="function"||e!=null&&typeof e!="function")throw new TypeError(But);var r=function(){var o=arguments,a=e?e.apply(this,o):o[0],n=r.cache;if(n.has(a))return n.get(a);var u=t.apply(this,o);return r.cache=n.set(a,u)||n,u};return r.cache=new(C_.Cache||hpe),r}C_.Cache=hpe;gpe.exports=C_});var ype=_((a3t,mpe)=>{var vut=dpe(),Dut=500;function Sut(t){var e=vut(t,function(o){return r.size===Dut&&r.clear(),o}),r=e.cache;return e}mpe.exports=Sut});var w_=_((l3t,Epe)=>{var Put=ype(),but=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,xut=/\\(\\)?/g,kut=Put(function(t){var e=[];return t.charCodeAt(0)===46&&e.push(""),t.replace(but,function(r,o,a,n){e.push(a?n.replace(xut,"$1"):o||r)}),e});Epe.exports=kut});var Gd=_((c3t,Cpe)=>{var Qut=Hl(),Fut=ppe(),Rut=w_(),Tut=N1();function Nut(t,e){return Qut(t)?t:Fut(t,e)?[t]:Rut(Tut(t))}Cpe.exports=Nut});var lC=_((u3t,wpe)=>{var Lut=pE(),Out=1/0;function Mut(t){if(typeof t=="string"||Lut(t))return t;var e=t+"";return e=="0"&&1/t==-Out?"-0":e}wpe.exports=Mut});var zx=_((A3t,Ipe)=>{var Uut=Gd(),_ut=lC();function Hut(t,e){e=Uut(e,t);for(var r=0,o=e.length;t!=null&&r<o;)t=t[_ut(e[r++])];return r&&r==o?t:void 0}Ipe.exports=Hut});var I_=_((f3t,vpe)=>{var jut=rP(),Gut=Gd(),qut=_I(),Bpe=il(),Yut=lC();function Wut(t,e,r,o){if(!Bpe(t))return t;e=Gut(e,t);for(var a=-1,n=e.length,u=n-1,A=t;A!=null&&++a<n;){var p=Yut(e[a]),h=r;if(p==="__proto__"||p==="constructor"||p==="prototype")return t;if(a!=u){var E=A[p];h=o?o(E,p,A):void 0,h===void 0&&(h=Bpe(E)?E:qut(e[a+1])?[]:{})}jut(A,p,h),A=A[p]}return t}vpe.exports=Wut});var Spe=_((p3t,Dpe)=>{var Kut=zx(),Vut=I_(),Jut=Gd();function zut(t,e,r){for(var o=-1,a=e.length,n={};++o<a;){var u=e[o],A=Kut(t,u);r(A,u)&&Vut(n,Jut(u,t),A)}return n}Dpe.exports=zut});var bpe=_((h3t,Ppe)=>{function Xut(t,e){return t!=null&&e in Object(t)}Ppe.exports=Xut});var B_=_((g3t,xpe)=>{var Zut=Gd(),$ut=OI(),eAt=Hl(),tAt=_I(),rAt=YS(),nAt=lC();function iAt(t,e,r){e=Zut(e,t);for(var o=-1,a=e.length,n=!1;++o<a;){var u=nAt(e[o]);if(!(n=t!=null&&r(t,u)))break;t=t[u]}return n||++o!=a?n:(a=t==null?0:t.length,!!a&&rAt(a)&&tAt(u,a)&&(eAt(t)||$ut(t)))}xpe.exports=iAt});var Qpe=_((d3t,kpe)=>{var sAt=bpe(),oAt=B_();function aAt(t,e){return t!=null&&oAt(t,e,sAt)}kpe.exports=aAt});var Rpe=_((m3t,Fpe)=>{var lAt=Spe(),cAt=Qpe();function uAt(t,e){return lAt(t,e,function(r,o){return cAt(t,o)})}Fpe.exports=uAt});var Ope=_((y3t,Lpe)=>{var Tpe=pd(),AAt=OI(),fAt=Hl(),Npe=Tpe?Tpe.isConcatSpreadable:void 0;function pAt(t){return fAt(t)||AAt(t)||!!(Npe&&t&&t[Npe])}Lpe.exports=pAt});var _pe=_((E3t,Upe)=>{var hAt=GS(),gAt=Ope();function Mpe(t,e,r,o,a){var n=-1,u=t.length;for(r||(r=gAt),a||(a=[]);++n<u;){var A=t[n];e>0&&r(A)?e>1?Mpe(A,e-1,r,o,a):hAt(a,A):o||(a[a.length]=A)}return a}Upe.exports=Mpe});var jpe=_((C3t,Hpe)=>{var dAt=_pe();function mAt(t){var e=t==null?0:t.length;return e?dAt(t,1):[]}Hpe.exports=mAt});var v_=_((w3t,Gpe)=>{var yAt=jpe(),EAt=AL(),CAt=fL();function wAt(t){return CAt(EAt(t,void 0,yAt),t+"")}Gpe.exports=wAt});var D_=_((I3t,qpe)=>{var IAt=Rpe(),BAt=v_(),vAt=BAt(function(t,e){return t==null?{}:IAt(t,e)});qpe.exports=vAt});var Xx,Ype=Et(()=>{Yl();Xx=class{constructor(e){this.resolver=e}supportsDescriptor(e,r){return this.resolver.supportsDescriptor(e,r)}supportsLocator(e,r){return this.resolver.supportsLocator(e,r)}shouldPersistResolution(e,r){return this.resolver.shouldPersistResolution(e,r)}bindDescriptor(e,r,o){return this.resolver.bindDescriptor(e,r,o)}getResolutionDependencies(e,r){return this.resolver.getResolutionDependencies(e,r)}async getCandidates(e,r,o){throw new zt(20,`This package doesn't seem to be present in your lockfile; run "yarn install" to update the lockfile`)}async getSatisfying(e,r,o,a){throw new zt(20,`This package doesn't seem to be present in your lockfile; run "yarn install" to update the lockfile`)}async resolve(e,r){throw new zt(20,`This package doesn't seem to be present in your lockfile; run "yarn install" to update the lockfile`)}}});var Qi,S_=Et(()=>{Yl();Qi=class extends Xs{reportCacheHit(e){}reportCacheMiss(e){}startSectionSync(e,r){return r()}async startSectionPromise(e,r){return await r()}startTimerSync(e,r,o){return(typeof r=="function"?r:o)()}async startTimerPromise(e,r,o){return await(typeof r=="function"?r:o)()}reportSeparator(){}reportInfo(e,r){}reportWarning(e,r){}reportError(e,r){}reportProgress(e){return{...Promise.resolve().then(async()=>{for await(let{}of e);}),stop:()=>{}}}reportJson(e){}reportFold(e,r){}async finalize(){}}});var Wpe,cC,P_=Et(()=>{St();Wpe=$e(RP());fE();vd();Gl();nh();Qf();bo();cC=class{constructor(e,{project:r}){this.workspacesCwds=new Set;this.project=r,this.cwd=e}async setup(){this.manifest=await Ot.tryFind(this.cwd)??new Ot,this.relativeCwd=V.relative(this.project.cwd,this.cwd)||Bt.dot;let e=this.manifest.name?this.manifest.name:eA(null,`${this.computeCandidateName()}-${zs(this.relativeCwd).substring(0,6)}`);this.anchoredDescriptor=In(e,`${Xn.protocol}${this.relativeCwd}`),this.anchoredLocator=Qs(e,`${Xn.protocol}${this.relativeCwd}`);let r=this.manifest.workspaceDefinitions.map(({pattern:a})=>a);if(r.length===0)return;let o=await(0,Wpe.default)(r,{cwd:ue.fromPortablePath(this.cwd),onlyDirectories:!0,ignore:["**/node_modules","**/.git","**/.yarn"]});o.sort(),await o.reduce(async(a,n)=>{let u=V.resolve(this.cwd,ue.toPortablePath(n)),A=await oe.existsPromise(V.join(u,"package.json"));await a,A&&this.workspacesCwds.add(u)},Promise.resolve())}get anchoredPackage(){let e=this.project.storedPackages.get(this.anchoredLocator.locatorHash);if(!e)throw new Error(`Assertion failed: Expected workspace ${a1(this.project.configuration,this)} (${Mt(this.project.configuration,V.join(this.cwd,dr.manifest),yt.PATH)}) to have been resolved. Run "yarn install" to update the lockfile`);return e}accepts(e){let r=e.indexOf(":"),o=r!==-1?e.slice(0,r+1):null,a=r!==-1?e.slice(r+1):e;if(o===Xn.protocol&&V.normalize(a)===this.relativeCwd||o===Xn.protocol&&(a==="*"||a==="^"||a==="~"))return!0;let n=xa(a);return n?o===Xn.protocol?n.test(this.manifest.version??"0.0.0"):this.project.configuration.get("enableTransparentWorkspaces")&&this.manifest.version!==null?n.test(this.manifest.version):!1:!1}computeCandidateName(){return this.cwd===this.project.cwd?"root-workspace":`${V.basename(this.cwd)}`||"unnamed-workspace"}getRecursiveWorkspaceDependencies({dependencies:e=Ot.hardDependencies}={}){let r=new Set,o=a=>{for(let n of e)for(let u of a.manifest[n].values()){let A=this.project.tryWorkspaceByDescriptor(u);A===null||r.has(A)||(r.add(A),o(A))}};return o(this),r}getRecursiveWorkspaceDependents({dependencies:e=Ot.hardDependencies}={}){let r=new Set,o=a=>{for(let n of this.project.workspaces)e.some(A=>[...n.manifest[A].values()].some(p=>{let h=this.project.tryWorkspaceByDescriptor(p);return h!==null&&i1(h.anchoredLocator,a.anchoredLocator)}))&&!r.has(n)&&(r.add(n),o(n))};return o(this),r}getRecursiveWorkspaceChildren(){let e=new Set([this]);for(let r of e)for(let o of r.workspacesCwds){let a=this.project.workspacesByCwd.get(o);a&&e.add(a)}return e.delete(this),Array.from(e)}async persistManifest(){let e={};this.manifest.exportTo(e);let r=V.join(this.cwd,Ot.fileName),o=`${JSON.stringify(e,null,this.manifest.indent)}
+`;await oe.changeFilePromise(r,o,{automaticNewlines:!0}),this.manifest.raw=e}}});function kAt({project:t,allDescriptors:e,allResolutions:r,allPackages:o,accessibleLocators:a=new Set,optionalBuilds:n=new Set,peerRequirements:u=new Map,peerWarnings:A=[],volatileDescriptors:p=new Set}){let h=new Map,E=[],I=new Map,v=new Map,x=new Map,C=new Map,R=new Map,L=new Map(t.workspaces.map(ce=>{let me=ce.anchoredLocator.locatorHash,he=o.get(me);if(typeof he>"u")throw new Error("Assertion failed: The workspace should have an associated package");return[me,e1(he)]})),U=()=>{let ce=oe.mktempSync(),me=V.join(ce,"stacktrace.log"),he=String(E.length+1).length,Be=E.map((we,g)=>`${`${g+1}.`.padStart(he," ")} ${ba(we)}
+`).join("");throw oe.writeFileSync(me,Be),oe.detachTemp(ce),new zt(45,`Encountered a stack overflow when resolving peer dependencies; cf ${ue.fromPortablePath(me)}`)},J=ce=>{let me=r.get(ce.descriptorHash);if(typeof me>"u")throw new Error("Assertion failed: The resolution should have been registered");let he=o.get(me);if(!he)throw new Error("Assertion failed: The package could not be found");return he},te=(ce,me,he,{top:Be,optional:we})=>{E.length>1e3&&U(),E.push(me);let g=ae(ce,me,he,{top:Be,optional:we});return E.pop(),g},ae=(ce,me,he,{top:Be,optional:we})=>{if(we||n.delete(me.locatorHash),a.has(me.locatorHash))return;a.add(me.locatorHash);let g=o.get(me.locatorHash);if(!g)throw new Error(`Assertion failed: The package (${jr(t.configuration,me)}) should have been registered`);let Ee=[],Se=[],le=[],ne=[],ee=[];for(let Fe of Array.from(g.dependencies.values())){if(g.peerDependencies.has(Fe.identHash)&&g.locatorHash!==Be)continue;if(bf(Fe))throw new Error("Assertion failed: Virtual packages shouldn't be encountered when virtualizing a branch");p.delete(Fe.descriptorHash);let At=we;if(!At){let Te=g.dependenciesMeta.get(fn(Fe));if(typeof Te<"u"){let Je=Te.get(null);typeof Je<"u"&&Je.optional&&(At=!0)}}let H=r.get(Fe.descriptorHash);if(!H)throw new Error(`Assertion failed: The resolution (${Gn(t.configuration,Fe)}) should have been registered`);let at=L.get(H)||o.get(H);if(!at)throw new Error(`Assertion failed: The package (${H}, resolved from ${Gn(t.configuration,Fe)}) should have been registered`);if(at.peerDependencies.size===0){te(Fe,at,new Map,{top:Be,optional:At});continue}let Re,ke,xe=new Set,He;Se.push(()=>{Re=tM(Fe,me.locatorHash),ke=rM(at,me.locatorHash),g.dependencies.delete(Fe.identHash),g.dependencies.set(Re.identHash,Re),r.set(Re.descriptorHash,ke.locatorHash),e.set(Re.descriptorHash,Re),o.set(ke.locatorHash,ke),Ee.push([at,Re,ke])}),le.push(()=>{He=new Map;for(let Te of ke.peerDependencies.values()){let Je=g.dependencies.get(Te.identHash);if(!Je&&n1(me,Te)&&(ce.identHash===me.identHash?Je=ce:(Je=In(me,ce.range),e.set(Je.descriptorHash,Je),r.set(Je.descriptorHash,me.locatorHash),p.delete(Je.descriptorHash))),(!Je||Je.range==="missing:")&&ke.dependencies.has(Te.identHash)){ke.peerDependencies.delete(Te.identHash);continue}Je||(Je=In(Te,"missing:")),ke.dependencies.set(Je.identHash,Je),bf(Je)&&md(x,Je.descriptorHash).add(ke.locatorHash),I.set(Je.identHash,Je),Je.range==="missing:"&&xe.add(Je.identHash),He.set(Te.identHash,he.get(Te.identHash)??ke.locatorHash)}ke.dependencies=new Map(ks(ke.dependencies,([Te,Je])=>fn(Je)))}),ne.push(()=>{if(!o.has(ke.locatorHash))return;let Te=h.get(at.locatorHash);typeof Te=="number"&&Te>=2&&U();let Je=h.get(at.locatorHash),je=typeof Je<"u"?Je+1:1;h.set(at.locatorHash,je),te(Re,ke,He,{top:Be,optional:At}),h.set(at.locatorHash,je-1)}),ee.push(()=>{let Te=g.dependencies.get(Fe.identHash);if(typeof Te>"u")throw new Error("Assertion failed: Expected the peer dependency to have been turned into a dependency");let Je=r.get(Te.descriptorHash);if(typeof Je>"u")throw new Error("Assertion failed: Expected the descriptor to be registered");if(md(R,Je).add(me.locatorHash),!!o.has(ke.locatorHash)){for(let je of ke.peerDependencies.values()){let b=He.get(je.identHash);if(typeof b>"u")throw new Error("Assertion failed: Expected the peer dependency ident to be registered");Yy(Wy(C,b),fn(je)).push(ke.locatorHash)}for(let je of xe)ke.dependencies.delete(je)}})}for(let Fe of[...Se,...le])Fe();let Ie;do{Ie=!0;for(let[Fe,At,H]of Ee){let at=Wy(v,Fe.locatorHash),Re=zs(...[...H.dependencies.values()].map(Te=>{let Je=Te.range!=="missing:"?r.get(Te.descriptorHash):"missing:";if(typeof Je>"u")throw new Error(`Assertion failed: Expected the resolution for ${Gn(t.configuration,Te)} to have been registered`);return Je===Be?`${Je} (top)`:Je}),At.identHash),ke=at.get(Re);if(typeof ke>"u"){at.set(Re,At);continue}if(ke===At)continue;o.delete(H.locatorHash),e.delete(At.descriptorHash),r.delete(At.descriptorHash),a.delete(H.locatorHash);let xe=x.get(At.descriptorHash)||[],He=[g.locatorHash,...xe];x.delete(At.descriptorHash);for(let Te of He){let Je=o.get(Te);typeof Je>"u"||(Je.dependencies.get(At.identHash).descriptorHash!==ke.descriptorHash&&(Ie=!1),Je.dependencies.set(At.identHash,ke))}}}while(!Ie);for(let Fe of[...ne,...ee])Fe()};for(let ce of t.workspaces){let me=ce.anchoredLocator;p.delete(ce.anchoredDescriptor.descriptorHash),te(ce.anchoredDescriptor,me,new Map,{top:me.locatorHash,optional:!1})}let fe=new Map;for(let[ce,me]of R){let he=o.get(ce);if(typeof he>"u")throw new Error("Assertion failed: Expected the root to be registered");let Be=C.get(ce);if(!(typeof Be>"u"))for(let we of me){let g=o.get(we);if(!(typeof g>"u")&&!!t.tryWorkspaceByLocator(g))for(let[Ee,Se]of Be){let le=Js(Ee);if(g.peerDependencies.has(le.identHash))continue;let ne=`p${zs(we,Ee,ce).slice(0,5)}`;u.set(ne,{subject:we,requested:le,rootRequester:ce,allRequesters:Se});let ee=he.dependencies.get(le.identHash);if(typeof ee<"u"){let Ie=J(ee),Fe=Ie.version??"0.0.0",At=new Set;for(let at of Se){let Re=o.get(at);if(typeof Re>"u")throw new Error("Assertion failed: Expected the link to be registered");let ke=Re.peerDependencies.get(le.identHash);if(typeof ke>"u")throw new Error("Assertion failed: Expected the ident to be registered");At.add(ke.range)}if(![...At].every(at=>{if(at.startsWith(Xn.protocol)){if(!t.tryWorkspaceByLocator(Ie))return!1;at=at.slice(Xn.protocol.length),(at==="^"||at==="~")&&(at="*")}return kf(Fe,at)})){let at=ol(fe,Ie.locatorHash,()=>({type:2,requested:le,subject:Ie,dependents:new Map,requesters:new Map,links:new Map,version:Fe,hash:`p${Ie.locatorHash.slice(0,5)}`}));at.dependents.set(g.locatorHash,g),at.requesters.set(he.locatorHash,he);for(let Re of Se)at.links.set(Re,o.get(Re));A.push({type:1,subject:g,requested:le,requester:he,version:Fe,hash:ne,requirementCount:Se.length})}}else he.peerDependenciesMeta.get(Ee)?.optional||A.push({type:0,subject:g,requested:le,requester:he,hash:ne})}}}A.push(...fe.values())}function QAt(t,e){let r=wL(t.peerWarnings,"type"),o=r[2]?.map(n=>{let u=Array.from(n.links.values(),E=>{let I=t.storedPackages.get(E.locatorHash);if(typeof I>"u")throw new Error("Assertion failed: Expected the package to be registered");let v=I.peerDependencies.get(n.requested.identHash);if(typeof v>"u")throw new Error("Assertion failed: Expected the ident to be registered");return v.range}),A=n.links.size>1?"and other dependencies request":"requests",p=sM(u),h=p?cE(t.configuration,p):Mt(t.configuration,"but they have non-overlapping ranges!","redBright");return`${cs(t.configuration,n.requested)} is listed by your project with version ${o1(t.configuration,n.version)}, which doesn't satisfy what ${cs(t.configuration,n.requesters.values().next().value)} (${Mt(t.configuration,n.hash,yt.CODE)}) ${A} (${h}).`})??[],a=r[0]?.map(n=>`${jr(t.configuration,n.subject)} doesn't provide ${cs(t.configuration,n.requested)} (${Mt(t.configuration,n.hash,yt.CODE)}), requested by ${cs(t.configuration,n.requester)}.`)??[];e.startSectionSync({reportFooter:()=>{e.reportWarning(86,`Some peer dependencies are incorrectly met; run ${Mt(t.configuration,"yarn explain peer-requirements <hash>",yt.CODE)} for details, where ${Mt(t.configuration,"<hash>",yt.CODE)} is the six-letter p-prefixed code.`)},skipIfEmpty:!0},()=>{for(let n of ks(o,u=>Xy.default(u)))e.reportWarning(60,n);for(let n of ks(a,u=>Xy.default(u)))e.reportWarning(2,n)})}var Zx,$x,ek,Jpe,k_,x_,Q_,tk,DAt,SAt,Kpe,PAt,bAt,xAt,pl,b_,rk,Vpe,Pt,zpe=Et(()=>{St();St();Nl();jt();Zx=ve("crypto");E_();$x=$e(D_()),ek=$e(id()),Jpe=$e(zn()),k_=ve("util"),x_=$e(ve("v8")),Q_=$e(ve("zlib"));u_();S1();A_();f_();fE();uM();Yl();Ype();O1();S_();vd();P_();WP();Gl();nh();jl();vb();BU();Qf();bo();tk=Jy(process.env.YARN_LOCKFILE_VERSION_OVERRIDE??8),DAt=3,SAt=/ *, */g,Kpe=/\/$/,PAt=32,bAt=(0,k_.promisify)(Q_.default.gzip),xAt=(0,k_.promisify)(Q_.default.gunzip),pl=(r=>(r.UpdateLockfile="update-lockfile",r.SkipBuild="skip-build",r))(pl||{}),b_={restoreLinkersCustomData:["linkersCustomData"],restoreResolutions:["accessibleLocators","conditionalLocators","disabledLocators","optionalBuilds","storedDescriptors","storedResolutions","storedPackages","lockFileChecksum"],restoreBuildState:["skippedBuilds","storedBuildState"]},rk=(o=>(o[o.NotProvided=0]="NotProvided",o[o.NotCompatible=1]="NotCompatible",o[o.NotCompatibleAggregate=2]="NotCompatibleAggregate",o))(rk||{}),Vpe=t=>zs(`${DAt}`,t),Pt=class{constructor(e,{configuration:r}){this.resolutionAliases=new Map;this.workspaces=[];this.workspacesByCwd=new Map;this.workspacesByIdent=new Map;this.storedResolutions=new Map;this.storedDescriptors=new Map;this.storedPackages=new Map;this.storedChecksums=new Map;this.storedBuildState=new Map;this.accessibleLocators=new Set;this.conditionalLocators=new Set;this.disabledLocators=new Set;this.originalPackages=new Map;this.optionalBuilds=new Set;this.skippedBuilds=new Set;this.lockfileLastVersion=null;this.lockfileNeedsRefresh=!1;this.peerRequirements=new Map;this.peerWarnings=[];this.linkersCustomData=new Map;this.lockFileChecksum=null;this.installStateChecksum=null;this.configuration=r,this.cwd=e}static async find(e,r){if(!e.projectCwd)throw new it(`No project found in ${r}`);let o=e.projectCwd,a=r,n=null;for(;n!==e.projectCwd;){if(n=a,oe.existsSync(V.join(n,dr.manifest))){o=n;break}a=V.dirname(n)}let u=new Pt(e.projectCwd,{configuration:e});Ke.telemetry?.reportProject(u.cwd),await u.setupResolutions(),await u.setupWorkspaces(),Ke.telemetry?.reportWorkspaceCount(u.workspaces.length),Ke.telemetry?.reportDependencyCount(u.workspaces.reduce((C,R)=>C+R.manifest.dependencies.size+R.manifest.devDependencies.size,0));let A=u.tryWorkspaceByCwd(o);if(A)return{project:u,workspace:A,locator:A.anchoredLocator};let p=await u.findLocatorForLocation(`${o}/`,{strict:!0});if(p)return{project:u,locator:p,workspace:null};let h=Mt(e,u.cwd,yt.PATH),E=Mt(e,V.relative(u.cwd,o),yt.PATH),I=`- If ${h} isn't intended to be a project, remove any yarn.lock and/or package.json file there.`,v=`- If ${h} is intended to be a project, it might be that you forgot to list ${E} in its workspace configuration.`,x=`- Finally, if ${h} is fine and you intend ${E} to be treated as a completely separate project (not even a workspace), create an empty yarn.lock file in it.`;throw new it(`The nearest package directory (${Mt(e,o,yt.PATH)}) doesn't seem to be part of the project declared in ${Mt(e,u.cwd,yt.PATH)}.
+
+${[I,v,x].join(`
+`)}`)}async setupResolutions(){this.storedResolutions=new Map,this.storedDescriptors=new Map,this.storedPackages=new Map,this.lockFileChecksum=null;let e=V.join(this.cwd,dr.lockfile),r=this.configuration.get("defaultLanguageName");if(oe.existsSync(e)){let o=await oe.readFilePromise(e,"utf8");this.lockFileChecksum=Vpe(o);let a=Ki(o);if(a.__metadata){let n=a.__metadata.version,u=a.__metadata.cacheKey;this.lockfileLastVersion=n,this.lockfileNeedsRefresh=n<tk;for(let A of Object.keys(a)){if(A==="__metadata")continue;let p=a[A];if(typeof p.resolution>"u")throw new Error(`Assertion failed: Expected the lockfile entry to have a resolution field (${A})`);let h=xf(p.resolution,!0),E=new Ot;E.load(p,{yamlCompatibilityMode:!0});let I=E.version,v=E.languageName||r,x=p.linkType.toUpperCase(),C=p.conditions??null,R=E.dependencies,L=E.peerDependencies,U=E.dependenciesMeta,J=E.peerDependenciesMeta,te=E.bin;if(p.checksum!=null){let fe=typeof u<"u"&&!p.checksum.includes("/")?`${u}/${p.checksum}`:p.checksum;this.storedChecksums.set(h.locatorHash,fe)}let ae={...h,version:I,languageName:v,linkType:x,conditions:C,dependencies:R,peerDependencies:L,dependenciesMeta:U,peerDependenciesMeta:J,bin:te};this.originalPackages.set(ae.locatorHash,ae);for(let fe of A.split(SAt)){let ce=ih(fe);n<=6&&(ce=this.configuration.normalizeDependency(ce),ce=In(ce,ce.range.replace(/^patch:[^@]+@(?!npm(:|%3A))/,"$1npm%3A"))),this.storedDescriptors.set(ce.descriptorHash,ce),this.storedResolutions.set(ce.descriptorHash,h.locatorHash)}}}else o.includes("yarn lockfile v1")&&(this.lockfileLastVersion=-1)}}async setupWorkspaces(){this.workspaces=[],this.workspacesByCwd=new Map,this.workspacesByIdent=new Map;let e=new Set,r=(0,ek.default)(4),o=async(a,n)=>{if(e.has(n))return a;e.add(n);let u=new cC(n,{project:this});await r(()=>u.setup());let A=a.then(()=>{this.addWorkspace(u)});return Array.from(u.workspacesCwds).reduce(o,A)};await o(Promise.resolve(),this.cwd)}addWorkspace(e){let r=this.workspacesByIdent.get(e.anchoredLocator.identHash);if(typeof r<"u")throw new Error(`Duplicate workspace name ${cs(this.configuration,e.anchoredLocator)}: ${ue.fromPortablePath(e.cwd)} conflicts with ${ue.fromPortablePath(r.cwd)}`);this.workspaces.push(e),this.workspacesByCwd.set(e.cwd,e),this.workspacesByIdent.set(e.anchoredLocator.identHash,e)}get topLevelWorkspace(){return this.getWorkspaceByCwd(this.cwd)}tryWorkspaceByCwd(e){V.isAbsolute(e)||(e=V.resolve(this.cwd,e)),e=V.normalize(e).replace(/\/+$/,"");let r=this.workspacesByCwd.get(e);return r||null}getWorkspaceByCwd(e){let r=this.tryWorkspaceByCwd(e);if(!r)throw new Error(`Workspace not found (${e})`);return r}tryWorkspaceByFilePath(e){let r=null;for(let o of this.workspaces)V.relative(o.cwd,e).startsWith("../")||r&&r.cwd.length>=o.cwd.length||(r=o);return r||null}getWorkspaceByFilePath(e){let r=this.tryWorkspaceByFilePath(e);if(!r)throw new Error(`Workspace not found (${e})`);return r}tryWorkspaceByIdent(e){let r=this.workspacesByIdent.get(e.identHash);return typeof r>"u"?null:r}getWorkspaceByIdent(e){let r=this.tryWorkspaceByIdent(e);if(!r)throw new Error(`Workspace not found (${cs(this.configuration,e)})`);return r}tryWorkspaceByDescriptor(e){if(e.range.startsWith(Xn.protocol)){let o=e.range.slice(Xn.protocol.length);if(o!=="^"&&o!=="~"&&o!=="*"&&!xa(o))return this.tryWorkspaceByCwd(o)}let r=this.tryWorkspaceByIdent(e);return r===null||(bf(e)&&(e=t1(e)),!r.accepts(e.range))?null:r}getWorkspaceByDescriptor(e){let r=this.tryWorkspaceByDescriptor(e);if(r===null)throw new Error(`Workspace not found (${Gn(this.configuration,e)})`);return r}tryWorkspaceByLocator(e){let r=this.tryWorkspaceByIdent(e);return r===null||(Hc(e)&&(e=r1(e)),r.anchoredLocator.locatorHash!==e.locatorHash)?null:r}getWorkspaceByLocator(e){let r=this.tryWorkspaceByLocator(e);if(!r)throw new Error(`Workspace not found (${jr(this.configuration,e)})`);return r}deleteDescriptor(e){this.storedResolutions.delete(e),this.storedDescriptors.delete(e)}deleteLocator(e){this.originalPackages.delete(e),this.storedPackages.delete(e),this.accessibleLocators.delete(e)}forgetResolution(e){if("descriptorHash"in e){let r=this.storedResolutions.get(e.descriptorHash);this.deleteDescriptor(e.descriptorHash);let o=new Set(this.storedResolutions.values());typeof r<"u"&&!o.has(r)&&this.deleteLocator(r)}if("locatorHash"in e){this.deleteLocator(e.locatorHash);for(let[r,o]of this.storedResolutions)o===e.locatorHash&&this.deleteDescriptor(r)}}forgetTransientResolutions(){let e=this.configuration.makeResolver(),r=new Map;for(let[o,a]of this.storedResolutions.entries()){let n=r.get(a);n||r.set(a,n=new Set),n.add(o)}for(let o of this.originalPackages.values()){let a;try{a=e.shouldPersistResolution(o,{project:this,resolver:e})}catch{a=!1}if(!a){this.deleteLocator(o.locatorHash);let n=r.get(o.locatorHash);if(n){r.delete(o.locatorHash);for(let u of n)this.deleteDescriptor(u)}}}}forgetVirtualResolutions(){for(let e of this.storedPackages.values())for(let[r,o]of e.dependencies)bf(o)&&e.dependencies.set(r,t1(o))}getDependencyMeta(e,r){let o={},n=this.topLevelWorkspace.manifest.dependenciesMeta.get(fn(e));if(!n)return o;let u=n.get(null);if(u&&Object.assign(o,u),r===null||!Jpe.default.valid(r))return o;for(let[A,p]of n)A!==null&&A===r&&Object.assign(o,p);return o}async findLocatorForLocation(e,{strict:r=!1}={}){let o=new Qi,a=this.configuration.getLinkers(),n={project:this,report:o};for(let u of a){let A=await u.findPackageLocator(e,n);if(A){if(r&&(await u.findPackageLocation(A,n)).replace(Kpe,"")!==e.replace(Kpe,""))continue;return A}}return null}async loadUserConfig(){let e=V.join(this.cwd,".pnp.cjs");await oe.existsPromise(e)&&Df(e).setup();let r=V.join(this.cwd,"yarn.config.cjs");return await oe.existsPromise(r)?Df(r):null}async preparePackage(e,{resolver:r,resolveOptions:o}){let a=await this.configuration.getPackageExtensions(),n=this.configuration.normalizePackage(e,{packageExtensions:a});for(let[u,A]of n.dependencies){let p=await this.configuration.reduceHook(E=>E.reduceDependency,A,this,n,A,{resolver:r,resolveOptions:o});if(!n1(A,p))throw new Error("Assertion failed: The descriptor ident cannot be changed through aliases");let h=r.bindDescriptor(p,n,o);n.dependencies.set(u,h)}return n}async resolveEverything(e){if(!this.workspacesByCwd||!this.workspacesByIdent)throw new Error("Workspaces must have been setup before calling this function");this.forgetVirtualResolutions();let r=new Map(this.originalPackages),o=[];e.lockfileOnly||this.forgetTransientResolutions();let a=e.resolver||this.configuration.makeResolver(),n=new oC(a);await n.setup(this,{report:e.report});let u=e.lockfileOnly?[new Xx(a)]:[n,a],A=new Dd([new aC(a),...u]),p=new Dd([...u]),h=this.configuration.makeFetcher(),E=e.lockfileOnly?{project:this,report:e.report,resolver:A}:{project:this,report:e.report,resolver:A,fetchOptions:{project:this,cache:e.cache,checksums:this.storedChecksums,report:e.report,fetcher:h,cacheOptions:{mirrorWriteOnly:!0}}},I=new Map,v=new Map,x=new Map,C=new Map,R=new Map,L=new Map,U=this.topLevelWorkspace.anchoredLocator,J=new Set,te=[],ae=M4(),fe=this.configuration.getSupportedArchitectures();await e.report.startProgressPromise(Xs.progressViaTitle(),async le=>{let ne=async H=>{let at=await Ky(async()=>await A.resolve(H,E),He=>`${jr(this.configuration,H)}: ${He}`);if(!i1(H,at))throw new Error(`Assertion failed: The locator cannot be changed by the resolver (went from ${jr(this.configuration,H)} to ${jr(this.configuration,at)})`);C.set(at.locatorHash,at),!r.delete(at.locatorHash)&&!this.tryWorkspaceByLocator(at)&&o.push(at);let ke=await this.preparePackage(at,{resolver:A,resolveOptions:E}),xe=Uc([...ke.dependencies.values()].map(He=>At(He)));return te.push(xe),xe.catch(()=>{}),v.set(ke.locatorHash,ke),ke},ee=async H=>{let at=R.get(H.locatorHash);if(typeof at<"u")return at;let Re=Promise.resolve().then(()=>ne(H));return R.set(H.locatorHash,Re),Re},Ie=async(H,at)=>{let Re=await At(at);return I.set(H.descriptorHash,H),x.set(H.descriptorHash,Re.locatorHash),Re},Fe=async H=>{le.setTitle(Gn(this.configuration,H));let at=this.resolutionAliases.get(H.descriptorHash);if(typeof at<"u")return Ie(H,this.storedDescriptors.get(at));let Re=A.getResolutionDependencies(H,E),ke=Object.fromEntries(await Uc(Object.entries(Re).map(async([Te,Je])=>{let je=A.bindDescriptor(Je,U,E),b=await At(je);return J.add(b.locatorHash),[Te,b]}))),He=(await Ky(async()=>await A.getCandidates(H,ke,E),Te=>`${Gn(this.configuration,H)}: ${Te}`))[0];if(typeof He>"u")throw new zt(82,`${Gn(this.configuration,H)}: No candidates found`);if(e.checkResolutions){let{locators:Te}=await p.getSatisfying(H,ke,[He],{...E,resolver:p});if(!Te.find(Je=>Je.locatorHash===He.locatorHash))throw new zt(78,`Invalid resolution ${ZI(this.configuration,H,He)}`)}return I.set(H.descriptorHash,H),x.set(H.descriptorHash,He.locatorHash),ee(He)},At=H=>{let at=L.get(H.descriptorHash);if(typeof at<"u")return at;I.set(H.descriptorHash,H);let Re=Promise.resolve().then(()=>Fe(H));return L.set(H.descriptorHash,Re),Re};for(let H of this.workspaces){let at=H.anchoredDescriptor;te.push(At(at))}for(;te.length>0;){let H=[...te];te.length=0,await Uc(H)}});let ce=sl(r.values(),le=>this.tryWorkspaceByLocator(le)?sl.skip:le);if(o.length>0||ce.length>0){let le=new Set(this.workspaces.flatMap(H=>{let at=v.get(H.anchoredLocator.locatorHash);if(!at)throw new Error("Assertion failed: The workspace should have been resolved");return Array.from(at.dependencies.values(),Re=>{let ke=x.get(Re.descriptorHash);if(!ke)throw new Error("Assertion failed: The resolution should have been registered");return ke})})),ne=H=>le.has(H.locatorHash)?"0":"1",ee=H=>ba(H),Ie=ks(o,[ne,ee]),Fe=ks(ce,[ne,ee]),At=e.report.getRecommendedLength();Ie.length>0&&e.report.reportInfo(85,`${Mt(this.configuration,"+",yt.ADDED)} ${cP(this.configuration,Ie,At)}`),Fe.length>0&&e.report.reportInfo(85,`${Mt(this.configuration,"-",yt.REMOVED)} ${cP(this.configuration,Fe,At)}`)}let me=new Set(this.resolutionAliases.values()),he=new Set(v.keys()),Be=new Set,we=new Map,g=[];kAt({project:this,accessibleLocators:Be,volatileDescriptors:me,optionalBuilds:he,peerRequirements:we,peerWarnings:g,allDescriptors:I,allResolutions:x,allPackages:v});for(let le of J)he.delete(le);for(let le of me)I.delete(le),x.delete(le);let Ee=new Set,Se=new Set;for(let le of v.values())le.conditions!=null&&(!he.has(le.locatorHash)||(jP(le,fe)||(jP(le,ae)&&e.report.reportWarningOnce(77,`${jr(this.configuration,le)}: Your current architecture (${process.platform}-${process.arch}) is supported by this package, but is missing from the ${Mt(this.configuration,"supportedArchitectures",yt.SETTING)} setting`),Se.add(le.locatorHash)),Ee.add(le.locatorHash)));this.storedResolutions=x,this.storedDescriptors=I,this.storedPackages=v,this.accessibleLocators=Be,this.conditionalLocators=Ee,this.disabledLocators=Se,this.originalPackages=C,this.optionalBuilds=he,this.peerRequirements=we,this.peerWarnings=g}async fetchEverything({cache:e,report:r,fetcher:o,mode:a,persistProject:n=!0}){let u={mockedPackages:this.disabledLocators,unstablePackages:this.conditionalLocators},A=o||this.configuration.makeFetcher(),p={checksums:this.storedChecksums,project:this,cache:e,fetcher:A,report:r,cacheOptions:u},h=Array.from(new Set(ks(this.storedResolutions.values(),[C=>{let R=this.storedPackages.get(C);if(!R)throw new Error("Assertion failed: The locator should have been registered");return ba(R)}])));a==="update-lockfile"&&(h=h.filter(C=>!this.storedChecksums.has(C)));let E=!1,I=Xs.progressViaCounter(h.length);await r.reportProgress(I);let v=(0,ek.default)(PAt);if(await Uc(h.map(C=>v(async()=>{let R=this.storedPackages.get(C);if(!R)throw new Error("Assertion failed: The locator should have been registered");if(Hc(R))return;let L;try{L=await A.fetch(R,p)}catch(U){U.message=`${jr(this.configuration,R)}: ${U.message}`,r.reportExceptionOnce(U),E=U;return}L.checksum!=null?this.storedChecksums.set(R.locatorHash,L.checksum):this.storedChecksums.delete(R.locatorHash),L.releaseFs&&L.releaseFs()}).finally(()=>{I.tick()}))),E)throw E;let x=n&&a!=="update-lockfile"?await this.cacheCleanup({cache:e,report:r}):null;if(r.cacheMisses.size>0||x){let R=(await Promise.all([...r.cacheMisses].map(async ce=>{let me=this.storedPackages.get(ce),he=this.storedChecksums.get(ce)??null,Be=e.getLocatorPath(me,he);return(await oe.statPromise(Be)).size}))).reduce((ce,me)=>ce+me,0)-(x?.size??0),L=r.cacheMisses.size,U=x?.count??0,J=`${nP(L,{zero:"No new packages",one:"A package was",more:`${Mt(this.configuration,L,yt.NUMBER)} packages were`})} added to the project`,te=`${nP(U,{zero:"none were",one:"one was",more:`${Mt(this.configuration,U,yt.NUMBER)} were`})} removed`,ae=R!==0?` (${Mt(this.configuration,R,yt.SIZE_DIFF)})`:"",fe=U>0?L>0?`${J}, and ${te}${ae}.`:`${J}, but ${te}${ae}.`:`${J}${ae}.`;r.reportInfo(13,fe)}}async linkEverything({cache:e,report:r,fetcher:o,mode:a}){let n={mockedPackages:this.disabledLocators,unstablePackages:this.conditionalLocators,skipIntegrityCheck:!0},u=o||this.configuration.makeFetcher(),A={checksums:this.storedChecksums,project:this,cache:e,fetcher:u,report:r,cacheOptions:n},p=this.configuration.getLinkers(),h={project:this,report:r},E=new Map(p.map(le=>{let ne=le.makeInstaller(h),ee=le.getCustomDataKey(),Ie=this.linkersCustomData.get(ee);return typeof Ie<"u"&&ne.attachCustomData(Ie),[le,ne]})),I=new Map,v=new Map,x=new Map,C=new Map(await Uc([...this.accessibleLocators].map(async le=>{let ne=this.storedPackages.get(le);if(!ne)throw new Error("Assertion failed: The locator should have been registered");return[le,await u.fetch(ne,A)]}))),R=[],L=new Set,U=[];for(let le of this.accessibleLocators){let ne=this.storedPackages.get(le);if(typeof ne>"u")throw new Error("Assertion failed: The locator should have been registered");let ee=C.get(ne.locatorHash);if(typeof ee>"u")throw new Error("Assertion failed: The fetch result should have been registered");let Ie=[],Fe=H=>{Ie.push(H)},At=this.tryWorkspaceByLocator(ne);if(At!==null){let H=[],{scripts:at}=At.manifest;for(let ke of["preinstall","install","postinstall"])at.has(ke)&&H.push({type:0,script:ke});try{for(let[ke,xe]of E)if(ke.supportsPackage(ne,h)&&(await xe.installPackage(ne,ee,{holdFetchResult:Fe})).buildRequest!==null)throw new Error("Assertion failed: Linkers can't return build directives for workspaces; this responsibility befalls to the Yarn core")}finally{Ie.length===0?ee.releaseFs?.():R.push(Uc(Ie).catch(()=>{}).then(()=>{ee.releaseFs?.()}))}let Re=V.join(ee.packageFs.getRealPath(),ee.prefixPath);v.set(ne.locatorHash,Re),!Hc(ne)&&H.length>0&&x.set(ne.locatorHash,{buildDirectives:H,buildLocations:[Re]})}else{let H=p.find(ke=>ke.supportsPackage(ne,h));if(!H)throw new zt(12,`${jr(this.configuration,ne)} isn't supported by any available linker`);let at=E.get(H);if(!at)throw new Error("Assertion failed: The installer should have been registered");let Re;try{Re=await at.installPackage(ne,ee,{holdFetchResult:Fe})}finally{Ie.length===0?ee.releaseFs?.():R.push(Uc(Ie).then(()=>{}).then(()=>{ee.releaseFs?.()}))}I.set(ne.locatorHash,H),v.set(ne.locatorHash,Re.packageLocation),Re.buildRequest&&Re.packageLocation&&(Re.buildRequest.skipped?(L.add(ne.locatorHash),this.skippedBuilds.has(ne.locatorHash)||U.push([ne,Re.buildRequest.explain])):x.set(ne.locatorHash,{buildDirectives:Re.buildRequest.directives,buildLocations:[Re.packageLocation]}))}}let J=new Map;for(let le of this.accessibleLocators){let ne=this.storedPackages.get(le);if(!ne)throw new Error("Assertion failed: The locator should have been registered");let ee=this.tryWorkspaceByLocator(ne)!==null,Ie=async(Fe,At)=>{let H=v.get(ne.locatorHash);if(typeof H>"u")throw new Error(`Assertion failed: The package (${jr(this.configuration,ne)}) should have been registered`);let at=[];for(let Re of ne.dependencies.values()){let ke=this.storedResolutions.get(Re.descriptorHash);if(typeof ke>"u")throw new Error(`Assertion failed: The resolution (${Gn(this.configuration,Re)}, from ${jr(this.configuration,ne)})should have been registered`);let xe=this.storedPackages.get(ke);if(typeof xe>"u")throw new Error(`Assertion failed: The package (${ke}, resolved from ${Gn(this.configuration,Re)}) should have been registered`);let He=this.tryWorkspaceByLocator(xe)===null?I.get(ke):null;if(typeof He>"u")throw new Error(`Assertion failed: The package (${ke}, resolved from ${Gn(this.configuration,Re)}) should have been registered`);He===Fe||He===null?v.get(xe.locatorHash)!==null&&at.push([Re,xe]):!ee&&H!==null&&Yy(J,ke).push(H)}H!==null&&await At.attachInternalDependencies(ne,at)};if(ee)for(let[Fe,At]of E)Fe.supportsPackage(ne,h)&&await Ie(Fe,At);else{let Fe=I.get(ne.locatorHash);if(!Fe)throw new Error("Assertion failed: The linker should have been found");let At=E.get(Fe);if(!At)throw new Error("Assertion failed: The installer should have been registered");await Ie(Fe,At)}}for(let[le,ne]of J){let ee=this.storedPackages.get(le);if(!ee)throw new Error("Assertion failed: The package should have been registered");let Ie=I.get(ee.locatorHash);if(!Ie)throw new Error("Assertion failed: The linker should have been found");let Fe=E.get(Ie);if(!Fe)throw new Error("Assertion failed: The installer should have been registered");await Fe.attachExternalDependents(ee,ne)}let te=new Map;for(let[le,ne]of E){let ee=await ne.finalizeInstall();for(let Ie of ee?.records??[])Ie.buildRequest.skipped?(L.add(Ie.locator.locatorHash),this.skippedBuilds.has(Ie.locator.locatorHash)||U.push([Ie.locator,Ie.buildRequest.explain])):x.set(Ie.locator.locatorHash,{buildDirectives:Ie.buildRequest.directives,buildLocations:Ie.buildLocations});typeof ee?.customData<"u"&&te.set(le.getCustomDataKey(),ee.customData)}if(this.linkersCustomData=te,await Uc(R),a==="skip-build")return;for(let[,le]of ks(U,([ne])=>ba(ne)))le(r);let ae=new Set(this.storedPackages.keys()),fe=new Set(x.keys());for(let le of fe)ae.delete(le);let ce=(0,Zx.createHash)("sha512");ce.update(process.versions.node),await this.configuration.triggerHook(le=>le.globalHashGeneration,this,le=>{ce.update("\0"),ce.update(le)});let me=ce.digest("hex"),he=new Map,Be=le=>{let ne=he.get(le.locatorHash);if(typeof ne<"u")return ne;let ee=this.storedPackages.get(le.locatorHash);if(typeof ee>"u")throw new Error("Assertion failed: The package should have been registered");let Ie=(0,Zx.createHash)("sha512");Ie.update(le.locatorHash),he.set(le.locatorHash,"<recursive>");for(let Fe of ee.dependencies.values()){let At=this.storedResolutions.get(Fe.descriptorHash);if(typeof At>"u")throw new Error(`Assertion failed: The resolution (${Gn(this.configuration,Fe)}) should have been registered`);let H=this.storedPackages.get(At);if(typeof H>"u")throw new Error("Assertion failed: The package should have been registered");Ie.update(Be(H))}return ne=Ie.digest("hex"),he.set(le.locatorHash,ne),ne},we=(le,ne)=>{let ee=(0,Zx.createHash)("sha512");ee.update(me),ee.update(Be(le));for(let Ie of ne)ee.update(Ie);return ee.digest("hex")},g=new Map,Ee=!1,Se=le=>{let ne=new Set([le.locatorHash]);for(let ee of ne){let Ie=this.storedPackages.get(ee);if(!Ie)throw new Error("Assertion failed: The package should have been registered");for(let Fe of Ie.dependencies.values()){let At=this.storedResolutions.get(Fe.descriptorHash);if(!At)throw new Error(`Assertion failed: The resolution (${Gn(this.configuration,Fe)}) should have been registered`);if(At!==le.locatorHash&&fe.has(At))return!1;let H=this.storedPackages.get(At);if(!H)throw new Error("Assertion failed: The package should have been registered");let at=this.tryWorkspaceByLocator(H);if(at){if(at.anchoredLocator.locatorHash!==le.locatorHash&&fe.has(at.anchoredLocator.locatorHash))return!1;ne.add(at.anchoredLocator.locatorHash)}ne.add(At)}}return!0};for(;fe.size>0;){let le=fe.size,ne=[];for(let ee of fe){let Ie=this.storedPackages.get(ee);if(!Ie)throw new Error("Assertion failed: The package should have been registered");if(!Se(Ie))continue;let Fe=x.get(Ie.locatorHash);if(!Fe)throw new Error("Assertion failed: The build directive should have been registered");let At=we(Ie,Fe.buildLocations);if(this.storedBuildState.get(Ie.locatorHash)===At){g.set(Ie.locatorHash,At),fe.delete(ee);continue}Ee||(await this.persistInstallStateFile(),Ee=!0),this.storedBuildState.has(Ie.locatorHash)?r.reportInfo(8,`${jr(this.configuration,Ie)} must be rebuilt because its dependency tree changed`):r.reportInfo(7,`${jr(this.configuration,Ie)} must be built because it never has been before or the last one failed`);let H=Fe.buildLocations.map(async at=>{if(!V.isAbsolute(at))throw new Error(`Assertion failed: Expected the build location to be absolute (not ${at})`);for(let Re of Fe.buildDirectives){let ke=`# This file contains the result of Yarn building a package (${ba(Ie)})
+`;switch(Re.type){case 0:ke+=`# Script name: ${Re.script}
+`;break;case 1:ke+=`# Script code: ${Re.script}
+`;break}let xe=null;if(!await oe.mktempPromise(async Te=>{let Je=V.join(Te,"build.log"),{stdout:je,stderr:b}=this.configuration.getSubprocessStreams(Je,{header:ke,prefix:jr(this.configuration,Ie),report:r}),w;try{switch(Re.type){case 0:w=await Wb(Ie,Re.script,[],{cwd:at,project:this,stdin:xe,stdout:je,stderr:b});break;case 1:w=await EU(Ie,Re.script,[],{cwd:at,project:this,stdin:xe,stdout:je,stderr:b});break}}catch(F){b.write(F.stack),w=1}if(je.end(),b.end(),w===0)return!0;oe.detachTemp(Te);let P=`${jr(this.configuration,Ie)} couldn't be built successfully (exit code ${Mt(this.configuration,w,yt.NUMBER)}, logs can be found here: ${Mt(this.configuration,Je,yt.PATH)})`,y=this.optionalBuilds.has(Ie.locatorHash);return y?r.reportInfo(9,P):r.reportError(9,P),Kce&&r.reportFold(ue.fromPortablePath(Je),oe.readFileSync(Je,"utf8")),y}))return!1}return!0});ne.push(...H,Promise.allSettled(H).then(at=>{fe.delete(ee),at.every(Re=>Re.status==="fulfilled"&&Re.value===!0)&&g.set(Ie.locatorHash,At)}))}if(await Uc(ne),le===fe.size){let ee=Array.from(fe).map(Ie=>{let Fe=this.storedPackages.get(Ie);if(!Fe)throw new Error("Assertion failed: The package should have been registered");return jr(this.configuration,Fe)}).join(", ");r.reportError(3,`Some packages have circular dependencies that make their build order unsatisfiable - as a result they won't be built (affected packages are: ${ee})`);break}}this.storedBuildState=g,this.skippedBuilds=L}async installWithNewReport(e,r){return(await Nt.start({configuration:this.configuration,json:e.json,stdout:e.stdout,forceSectionAlignment:!0,includeLogs:!e.json&&!e.quiet,includeVersion:!0},async a=>{await this.install({...r,report:a})})).exitCode()}async install(e){let r=this.configuration.get("nodeLinker");Ke.telemetry?.reportInstall(r);let o=!1;if(await e.report.startTimerPromise("Project validation",{skipIfEmpty:!0},async()=>{this.configuration.get("enableOfflineMode")&&e.report.reportWarning(90,"Offline work is enabled; Yarn won't fetch packages from the remote registry if it can avoid it"),await this.configuration.triggerHook(E=>E.validateProject,this,{reportWarning:(E,I)=>{e.report.reportWarning(E,I)},reportError:(E,I)=>{e.report.reportError(E,I),o=!0}})}),o)return;let a=await this.configuration.getPackageExtensions();for(let E of a.values())for(let[,I]of E)for(let v of I)v.status="inactive";let n=V.join(this.cwd,dr.lockfile),u=null;if(e.immutable)try{u=await oe.readFilePromise(n,"utf8")}catch(E){throw E.code==="ENOENT"?new zt(28,"The lockfile would have been created by this install, which is explicitly forbidden."):E}await e.report.startTimerPromise("Resolution step",async()=>{await this.resolveEverything(e)}),await e.report.startTimerPromise("Post-resolution validation",{skipIfEmpty:!0},async()=>{QAt(this,e.report);for(let[,E]of a)for(let[,I]of E)for(let v of I)if(v.userProvided){let x=Mt(this.configuration,v,yt.PACKAGE_EXTENSION);switch(v.status){case"inactive":e.report.reportWarning(68,`${x}: No matching package in the dependency tree; you may not need this rule anymore.`);break;case"redundant":e.report.reportWarning(69,`${x}: This rule seems redundant when applied on the original package; the extension may have been applied upstream.`);break}}if(u!==null){let E=_g(u,this.generateLockfile());if(E!==u){let I=Ape(n,n,u,E,void 0,void 0,{maxEditLength:100});if(I){e.report.reportSeparator();for(let v of I.hunks){e.report.reportInfo(null,`@@ -${v.oldStart},${v.oldLines} +${v.newStart},${v.newLines} @@`);for(let x of v.lines)x.startsWith("+")?e.report.reportError(28,Mt(this.configuration,x,yt.ADDED)):x.startsWith("-")?e.report.reportError(28,Mt(this.configuration,x,yt.REMOVED)):e.report.reportInfo(null,Mt(this.configuration,x,"grey"))}e.report.reportSeparator()}throw new zt(28,"The lockfile would have been modified by this install, which is explicitly forbidden.")}}});for(let E of a.values())for(let[,I]of E)for(let v of I)v.userProvided&&v.status==="active"&&Ke.telemetry?.reportPackageExtension(Ed(v,yt.PACKAGE_EXTENSION));await e.report.startTimerPromise("Fetch step",async()=>{await this.fetchEverything(e)});let A=e.immutable?[...new Set(this.configuration.get("immutablePatterns"))].sort():[],p=await Promise.all(A.map(async E=>LP(E,{cwd:this.cwd})));(typeof e.persistProject>"u"||e.persistProject)&&await this.persist(),await e.report.startTimerPromise("Link step",async()=>{if(e.mode==="update-lockfile"){e.report.reportWarning(73,`Skipped due to ${Mt(this.configuration,"mode=update-lockfile",yt.CODE)}`);return}await this.linkEverything(e);let E=await Promise.all(A.map(async I=>LP(I,{cwd:this.cwd})));for(let I=0;I<A.length;++I)p[I]!==E[I]&&e.report.reportError(64,`The checksum for ${A[I]} has been modified by this install, which is explicitly forbidden.`)}),await this.persistInstallStateFile();let h=!1;await e.report.startTimerPromise("Post-install validation",{skipIfEmpty:!0},async()=>{await this.configuration.triggerHook(E=>E.validateProjectAfterInstall,this,{reportWarning:(E,I)=>{e.report.reportWarning(E,I)},reportError:(E,I)=>{e.report.reportError(E,I),h=!0}})}),!h&&await this.configuration.triggerHook(E=>E.afterAllInstalled,this,e)}generateLockfile(){let e=new Map;for(let[n,u]of this.storedResolutions.entries()){let A=e.get(u);A||e.set(u,A=new Set),A.add(n)}let r={},{cacheKey:o}=Lr.getCacheKey(this.configuration);r.__metadata={version:tk,cacheKey:o};for(let[n,u]of e.entries()){let A=this.originalPackages.get(n);if(!A)continue;let p=[];for(let I of u){let v=this.storedDescriptors.get(I);if(!v)throw new Error("Assertion failed: The descriptor should have been registered");p.push(v)}let h=p.map(I=>Pa(I)).sort().join(", "),E=new Ot;E.version=A.linkType==="HARD"?A.version:"0.0.0-use.local",E.languageName=A.languageName,E.dependencies=new Map(A.dependencies),E.peerDependencies=new Map(A.peerDependencies),E.dependenciesMeta=new Map(A.dependenciesMeta),E.peerDependenciesMeta=new Map(A.peerDependenciesMeta),E.bin=new Map(A.bin),r[h]={...E.exportTo({},{compatibilityMode:!1}),linkType:A.linkType.toLowerCase(),resolution:ba(A),checksum:this.storedChecksums.get(A.locatorHash),conditions:A.conditions||void 0}}return`${[`# This file is generated by running "yarn install" inside your project.
+`,`# Manual changes might be lost - proceed with caution!
+`].join("")}
+`+Ba(r)}async persistLockfile(){let e=V.join(this.cwd,dr.lockfile),r="";try{r=await oe.readFilePromise(e,"utf8")}catch{}let o=this.generateLockfile(),a=_g(r,o);a!==r&&(await oe.writeFilePromise(e,a),this.lockFileChecksum=Vpe(a),this.lockfileNeedsRefresh=!1)}async persistInstallStateFile(){let e=[];for(let u of Object.values(b_))e.push(...u);let r=(0,$x.default)(this,e),o=x_.default.serialize(r),a=zs(o);if(this.installStateChecksum===a)return;let n=this.configuration.get("installStatePath");await oe.mkdirPromise(V.dirname(n),{recursive:!0}),await oe.writeFilePromise(n,await bAt(o)),this.installStateChecksum=a}async restoreInstallState({restoreLinkersCustomData:e=!0,restoreResolutions:r=!0,restoreBuildState:o=!0}={}){let a=this.configuration.get("installStatePath"),n;try{let u=await xAt(await oe.readFilePromise(a));n=x_.default.deserialize(u),this.installStateChecksum=zs(u)}catch{r&&await this.applyLightResolution();return}e&&typeof n.linkersCustomData<"u"&&(this.linkersCustomData=n.linkersCustomData),o&&Object.assign(this,(0,$x.default)(n,b_.restoreBuildState)),r&&(n.lockFileChecksum===this.lockFileChecksum?Object.assign(this,(0,$x.default)(n,b_.restoreResolutions)):await this.applyLightResolution())}async applyLightResolution(){await this.resolveEverything({lockfileOnly:!0,report:new Qi}),await this.persistInstallStateFile()}async persist(){let e=(0,ek.default)(4);await Promise.all([this.persistLockfile(),...this.workspaces.map(r=>e(()=>r.persistManifest()))])}async cacheCleanup({cache:e,report:r}){if(this.configuration.get("enableGlobalCache"))return null;let o=new Set([".gitignore"]);if(!CM(e.cwd,this.cwd)||!await oe.existsPromise(e.cwd))return null;let a=[];for(let u of await oe.readdirPromise(e.cwd)){if(o.has(u))continue;let A=V.resolve(e.cwd,u);e.markedFiles.has(A)||(e.immutable?r.reportError(56,`${Mt(this.configuration,V.basename(A),"magenta")} appears to be unused and would be marked for deletion, but the cache is immutable`):a.push(oe.lstatPromise(A).then(async p=>(await oe.removePromise(A),p.size))))}if(a.length===0)return null;let n=await Promise.all(a);return{count:a.length,size:n.reduce((u,A)=>u+A,0)}}}});function FAt(t){let o=Math.floor(t.timeNow/864e5),a=t.updateInterval*864e5,n=t.state.lastUpdate??t.timeNow+a+Math.floor(a*t.randomInitialInterval),u=n+a,A=t.state.lastTips??o*864e5,p=A+864e5+8*36e5-t.timeZone,h=u<=t.timeNow,E=p<=t.timeNow,I=null;return(h||E||!t.state.lastUpdate||!t.state.lastTips)&&(I={},I.lastUpdate=h?t.timeNow:n,I.lastTips=A,I.blocks=h?{}:t.state.blocks,I.displayedTips=t.state.displayedTips),{nextState:I,triggerUpdate:h,triggerTips:E,nextTips:E?o*864e5:A}}var uC,Xpe=Et(()=>{St();L1();nh();Ib();jl();Qf();uC=class{constructor(e,r){this.values=new Map;this.hits=new Map;this.enumerators=new Map;this.nextTips=0;this.displayedTips=[];this.shouldCommitTips=!1;this.configuration=e;let o=this.getRegistryPath();this.isNew=!oe.existsSync(o),this.shouldShowTips=!1,this.sendReport(r),this.startBuffer()}commitTips(){this.shouldShowTips&&(this.shouldCommitTips=!0)}selectTip(e){let r=new Set(this.displayedTips),o=A=>A&&rn?kf(rn,A):!1,a=e.map((A,p)=>p).filter(A=>e[A]&&o(e[A]?.selector));if(a.length===0)return null;let n=a.filter(A=>!r.has(A));if(n.length===0){let A=Math.floor(a.length*.2);this.displayedTips=A>0?this.displayedTips.slice(-A):[],n=a.filter(p=>!r.has(p))}let u=n[Math.floor(Math.random()*n.length)];return this.displayedTips.push(u),this.commitTips(),e[u]}reportVersion(e){this.reportValue("version",e.replace(/-git\..*/,"-git"))}reportCommandName(e){this.reportValue("commandName",e||"<none>")}reportPluginName(e){this.reportValue("pluginName",e)}reportProject(e){this.reportEnumerator("projectCount",e)}reportInstall(e){this.reportHit("installCount",e)}reportPackageExtension(e){this.reportValue("packageExtension",e)}reportWorkspaceCount(e){this.reportValue("workspaceCount",String(e))}reportDependencyCount(e){this.reportValue("dependencyCount",String(e))}reportValue(e,r){md(this.values,e).add(r)}reportEnumerator(e,r){md(this.enumerators,e).add(zs(r))}reportHit(e,r="*"){let o=Wy(this.hits,e),a=ol(o,r,()=>0);o.set(r,a+1)}getRegistryPath(){let e=this.configuration.get("globalFolder");return V.join(e,"telemetry.json")}sendReport(e){let r=this.getRegistryPath(),o;try{o=oe.readJsonSync(r)}catch{o={}}let{nextState:a,triggerUpdate:n,triggerTips:u,nextTips:A}=FAt({state:o,timeNow:Date.now(),timeZone:new Date().getTimezoneOffset()*60*1e3,randomInitialInterval:Math.random(),updateInterval:this.configuration.get("telemetryInterval")});if(this.nextTips=A,this.displayedTips=o.displayedTips??[],a!==null)try{oe.mkdirSync(V.dirname(r),{recursive:!0}),oe.writeJsonSync(r,a)}catch{return!1}if(u&&this.configuration.get("enableTips")&&(this.shouldShowTips=!0),n){let p=o.blocks??{};if(Object.keys(p).length===0){let h=`https://browser-http-intake.logs.datadoghq.eu/v1/input/${e}?ddsource=yarn`,E=I=>O4(h,I,{configuration:this.configuration}).catch(()=>{});for(let[I,v]of Object.entries(o.blocks??{})){if(Object.keys(v).length===0)continue;let x=v;x.userId=I,x.reportType="primary";for(let L of Object.keys(x.enumerators??{}))x.enumerators[L]=x.enumerators[L].length;E(x);let C=new Map,R=20;for(let[L,U]of Object.entries(x.values))U.length>0&&C.set(L,U.slice(0,R));for(;C.size>0;){let L={};L.userId=I,L.reportType="secondary",L.metrics={};for(let[U,J]of C)L.metrics[U]=J.shift(),J.length===0&&C.delete(U);E(L)}}}}return!0}applyChanges(){let e=this.getRegistryPath(),r;try{r=oe.readJsonSync(e)}catch{r={}}let o=this.configuration.get("telemetryUserId")??"*",a=r.blocks=r.blocks??{},n=a[o]=a[o]??{};for(let u of this.hits.keys()){let A=n.hits=n.hits??{},p=A[u]=A[u]??{};for(let[h,E]of this.hits.get(u))p[h]=(p[h]??0)+E}for(let u of["values","enumerators"])for(let A of this[u].keys()){let p=n[u]=n[u]??{};p[A]=[...new Set([...p[A]??[],...this[u].get(A)??[]])]}this.shouldCommitTips&&(r.lastTips=this.nextTips,r.displayedTips=this.displayedTips),oe.mkdirSync(V.dirname(e),{recursive:!0}),oe.writeJsonSync(e,r)}startBuffer(){process.on("exit",()=>{try{this.applyChanges()}catch{}})}}});var o2={};Vt(o2,{BuildDirectiveType:()=>Vx,CACHE_CHECKPOINT:()=>c_,CACHE_VERSION:()=>Kx,Cache:()=>Lr,Configuration:()=>Ke,DEFAULT_RC_FILENAME:()=>q4,FormatType:()=>xle,InstallMode:()=>pl,LEGACY_PLUGINS:()=>v1,LOCKFILE_VERSION:()=>tk,LegacyMigrationResolver:()=>oC,LightReport:()=>AA,LinkType:()=>zy,LockfileResolver:()=>aC,Manifest:()=>Ot,MessageName:()=>wr,MultiFetcher:()=>hE,PackageExtensionStatus:()=>BL,PackageExtensionType:()=>IL,PeerWarningType:()=>rk,Project:()=>Pt,Report:()=>Xs,ReportError:()=>zt,SettingsType:()=>D1,StreamReport:()=>Nt,TAG_REGEXP:()=>FE,TelemetryManager:()=>uC,ThrowReport:()=>Qi,VirtualFetcher:()=>gE,WindowsLinkType:()=>xb,Workspace:()=>cC,WorkspaceFetcher:()=>mE,WorkspaceResolver:()=>Xn,YarnVersion:()=>rn,execUtils:()=>Ur,folderUtils:()=>YP,formatUtils:()=>de,hashUtils:()=>wn,httpUtils:()=>nn,miscUtils:()=>_e,nodeUtils:()=>Ji,parseMessageName:()=>AS,reportOptionDeprecations:()=>LE,scriptUtils:()=>un,semverUtils:()=>kr,stringifyMessageName:()=>Wu,structUtils:()=>W,tgzUtils:()=>Xi,treeUtils:()=>$s});var Ye=Et(()=>{Db();WP();Gl();nh();Ib();jl();vb();BU();Qf();bo();Xfe();ipe();u_();S1();S1();ope();A_();ape();f_();fE();fS();cM();zpe();Yl();O1();Xpe();S_();AM();fM();vd();P_();L1();Cne()});var nhe=_((K_t,l2)=>{"use strict";var TAt=process.env.TERM_PROGRAM==="Hyper",NAt=process.platform==="win32",ehe=process.platform==="linux",F_={ballotDisabled:"\u2612",ballotOff:"\u2610",ballotOn:"\u2611",bullet:"\u2022",bulletWhite:"\u25E6",fullBlock:"\u2588",heart:"\u2764",identicalTo:"\u2261",line:"\u2500",mark:"\u203B",middot:"\xB7",minus:"\uFF0D",multiplication:"\xD7",obelus:"\xF7",pencilDownRight:"\u270E",pencilRight:"\u270F",pencilUpRight:"\u2710",percent:"%",pilcrow2:"\u2761",pilcrow:"\xB6",plusMinus:"\xB1",section:"\xA7",starsOff:"\u2606",starsOn:"\u2605",upDownArrow:"\u2195"},the=Object.assign({},F_,{check:"\u221A",cross:"\xD7",ellipsisLarge:"...",ellipsis:"...",info:"i",question:"?",questionSmall:"?",pointer:">",pointerSmall:"\xBB",radioOff:"( )",radioOn:"(*)",warning:"\u203C"}),rhe=Object.assign({},F_,{ballotCross:"\u2718",check:"\u2714",cross:"\u2716",ellipsisLarge:"\u22EF",ellipsis:"\u2026",info:"\u2139",question:"?",questionFull:"\uFF1F",questionSmall:"\uFE56",pointer:ehe?"\u25B8":"\u276F",pointerSmall:ehe?"\u2023":"\u203A",radioOff:"\u25EF",radioOn:"\u25C9",warning:"\u26A0"});l2.exports=NAt&&!TAt?the:rhe;Reflect.defineProperty(l2.exports,"common",{enumerable:!1,value:F_});Reflect.defineProperty(l2.exports,"windows",{enumerable:!1,value:the});Reflect.defineProperty(l2.exports,"other",{enumerable:!1,value:rhe})});var Kc=_((V_t,R_)=>{"use strict";var LAt=t=>t!==null&&typeof t=="object"&&!Array.isArray(t),OAt=/[\u001b\u009b][[\]#;?()]*(?:(?:(?:[^\W_]*;?[^\W_]*)\u0007)|(?:(?:[0-9]{1,4}(;[0-9]{0,4})*)?[~0-9=<>cf-nqrtyA-PRZ]))/g,ihe=()=>{let t={enabled:!0,visible:!0,styles:{},keys:{}};"FORCE_COLOR"in process.env&&(t.enabled=process.env.FORCE_COLOR!=="0");let e=n=>{let u=n.open=`\x1B[${n.codes[0]}m`,A=n.close=`\x1B[${n.codes[1]}m`,p=n.regex=new RegExp(`\\u001b\\[${n.codes[1]}m`,"g");return n.wrap=(h,E)=>{h.includes(A)&&(h=h.replace(p,A+u));let I=u+h+A;return E?I.replace(/\r*\n/g,`${A}$&${u}`):I},n},r=(n,u,A)=>typeof n=="function"?n(u):n.wrap(u,A),o=(n,u)=>{if(n===""||n==null)return"";if(t.enabled===!1)return n;if(t.visible===!1)return"";let A=""+n,p=A.includes(`
+`),h=u.length;for(h>0&&u.includes("unstyle")&&(u=[...new Set(["unstyle",...u])].reverse());h-- >0;)A=r(t.styles[u[h]],A,p);return A},a=(n,u,A)=>{t.styles[n]=e({name:n,codes:u}),(t.keys[A]||(t.keys[A]=[])).push(n),Reflect.defineProperty(t,n,{configurable:!0,enumerable:!0,set(h){t.alias(n,h)},get(){let h=E=>o(E,h.stack);return Reflect.setPrototypeOf(h,t),h.stack=this.stack?this.stack.concat(n):[n],h}})};return a("reset",[0,0],"modifier"),a("bold",[1,22],"modifier"),a("dim",[2,22],"modifier"),a("italic",[3,23],"modifier"),a("underline",[4,24],"modifier"),a("inverse",[7,27],"modifier"),a("hidden",[8,28],"modifier"),a("strikethrough",[9,29],"modifier"),a("black",[30,39],"color"),a("red",[31,39],"color"),a("green",[32,39],"color"),a("yellow",[33,39],"color"),a("blue",[34,39],"color"),a("magenta",[35,39],"color"),a("cyan",[36,39],"color"),a("white",[37,39],"color"),a("gray",[90,39],"color"),a("grey",[90,39],"color"),a("bgBlack",[40,49],"bg"),a("bgRed",[41,49],"bg"),a("bgGreen",[42,49],"bg"),a("bgYellow",[43,49],"bg"),a("bgBlue",[44,49],"bg"),a("bgMagenta",[45,49],"bg"),a("bgCyan",[46,49],"bg"),a("bgWhite",[47,49],"bg"),a("blackBright",[90,39],"bright"),a("redBright",[91,39],"bright"),a("greenBright",[92,39],"bright"),a("yellowBright",[93,39],"bright"),a("blueBright",[94,39],"bright"),a("magentaBright",[95,39],"bright"),a("cyanBright",[96,39],"bright"),a("whiteBright",[97,39],"bright"),a("bgBlackBright",[100,49],"bgBright"),a("bgRedBright",[101,49],"bgBright"),a("bgGreenBright",[102,49],"bgBright"),a("bgYellowBright",[103,49],"bgBright"),a("bgBlueBright",[104,49],"bgBright"),a("bgMagentaBright",[105,49],"bgBright"),a("bgCyanBright",[106,49],"bgBright"),a("bgWhiteBright",[107,49],"bgBright"),t.ansiRegex=OAt,t.hasColor=t.hasAnsi=n=>(t.ansiRegex.lastIndex=0,typeof n=="string"&&n!==""&&t.ansiRegex.test(n)),t.alias=(n,u)=>{let A=typeof u=="string"?t[u]:u;if(typeof A!="function")throw new TypeError("Expected alias to be the name of an existing color (string) or a function");A.stack||(Reflect.defineProperty(A,"name",{value:n}),t.styles[n]=A,A.stack=[n]),Reflect.defineProperty(t,n,{configurable:!0,enumerable:!0,set(p){t.alias(n,p)},get(){let p=h=>o(h,p.stack);return Reflect.setPrototypeOf(p,t),p.stack=this.stack?this.stack.concat(A.stack):A.stack,p}})},t.theme=n=>{if(!LAt(n))throw new TypeError("Expected theme to be an object");for(let u of Object.keys(n))t.alias(u,n[u]);return t},t.alias("unstyle",n=>typeof n=="string"&&n!==""?(t.ansiRegex.lastIndex=0,n.replace(t.ansiRegex,"")):""),t.alias("noop",n=>n),t.none=t.clear=t.noop,t.stripColor=t.unstyle,t.symbols=nhe(),t.define=a,t};R_.exports=ihe();R_.exports.create=ihe});var No=_(sn=>{"use strict";var MAt=Object.prototype.toString,rc=Kc(),she=!1,T_=[],ohe={yellow:"blue",cyan:"red",green:"magenta",black:"white",blue:"yellow",red:"cyan",magenta:"green",white:"black"};sn.longest=(t,e)=>t.reduce((r,o)=>Math.max(r,e?o[e].length:o.length),0);sn.hasColor=t=>!!t&&rc.hasColor(t);var ik=sn.isObject=t=>t!==null&&typeof t=="object"&&!Array.isArray(t);sn.nativeType=t=>MAt.call(t).slice(8,-1).toLowerCase().replace(/\s/g,"");sn.isAsyncFn=t=>sn.nativeType(t)==="asyncfunction";sn.isPrimitive=t=>t!=null&&typeof t!="object"&&typeof t!="function";sn.resolve=(t,e,...r)=>typeof e=="function"?e.call(t,...r):e;sn.scrollDown=(t=[])=>[...t.slice(1),t[0]];sn.scrollUp=(t=[])=>[t.pop(),...t];sn.reorder=(t=[])=>{let e=t.slice();return e.sort((r,o)=>r.index>o.index?1:r.index<o.index?-1:0),e};sn.swap=(t,e,r)=>{let o=t.length,a=r===o?0:r<0?o-1:r,n=t[e];t[e]=t[a],t[a]=n};sn.width=(t,e=80)=>{let r=t&&t.columns?t.columns:e;return t&&typeof t.getWindowSize=="function"&&(r=t.getWindowSize()[0]),process.platform==="win32"?r-1:r};sn.height=(t,e=20)=>{let r=t&&t.rows?t.rows:e;return t&&typeof t.getWindowSize=="function"&&(r=t.getWindowSize()[1]),r};sn.wordWrap=(t,e={})=>{if(!t)return t;typeof e=="number"&&(e={width:e});let{indent:r="",newline:o=`
+`+r,width:a=80}=e,n=(o+r).match(/[^\S\n]/g)||[];a-=n.length;let u=`.{1,${a}}([\\s\\u200B]+|$)|[^\\s\\u200B]+?([\\s\\u200B]+|$)`,A=t.trim(),p=new RegExp(u,"g"),h=A.match(p)||[];return h=h.map(E=>E.replace(/\n$/,"")),e.padEnd&&(h=h.map(E=>E.padEnd(a," "))),e.padStart&&(h=h.map(E=>E.padStart(a," "))),r+h.join(o)};sn.unmute=t=>{let e=t.stack.find(o=>rc.keys.color.includes(o));return e?rc[e]:t.stack.find(o=>o.slice(2)==="bg")?rc[e.slice(2)]:o=>o};sn.pascal=t=>t?t[0].toUpperCase()+t.slice(1):"";sn.inverse=t=>{if(!t||!t.stack)return t;let e=t.stack.find(o=>rc.keys.color.includes(o));if(e){let o=rc["bg"+sn.pascal(e)];return o?o.black:t}let r=t.stack.find(o=>o.slice(0,2)==="bg");return r?rc[r.slice(2).toLowerCase()]||t:rc.none};sn.complement=t=>{if(!t||!t.stack)return t;let e=t.stack.find(o=>rc.keys.color.includes(o)),r=t.stack.find(o=>o.slice(0,2)==="bg");if(e&&!r)return rc[ohe[e]||e];if(r){let o=r.slice(2).toLowerCase(),a=ohe[o];return a&&rc["bg"+sn.pascal(a)]||t}return rc.none};sn.meridiem=t=>{let e=t.getHours(),r=t.getMinutes(),o=e>=12?"pm":"am";e=e%12;let a=e===0?12:e,n=r<10?"0"+r:r;return a+":"+n+" "+o};sn.set=(t={},e="",r)=>e.split(".").reduce((o,a,n,u)=>{let A=u.length-1>n?o[a]||{}:r;return!sn.isObject(A)&&n<u.length-1&&(A={}),o[a]=A},t);sn.get=(t={},e="",r)=>{let o=t[e]==null?e.split(".").reduce((a,n)=>a&&a[n],t):t[e];return o??r};sn.mixin=(t,e)=>{if(!ik(t))return e;if(!ik(e))return t;for(let r of Object.keys(e)){let o=Object.getOwnPropertyDescriptor(e,r);if(o.hasOwnProperty("value"))if(t.hasOwnProperty(r)&&ik(o.value)){let a=Object.getOwnPropertyDescriptor(t,r);ik(a.value)?t[r]=sn.merge({},t[r],e[r]):Reflect.defineProperty(t,r,o)}else Reflect.defineProperty(t,r,o);else Reflect.defineProperty(t,r,o)}return t};sn.merge=(...t)=>{let e={};for(let r of t)sn.mixin(e,r);return e};sn.mixinEmitter=(t,e)=>{let r=e.constructor.prototype;for(let o of Object.keys(r)){let a=r[o];typeof a=="function"?sn.define(t,o,a.bind(e)):sn.define(t,o,a)}};sn.onExit=t=>{let e=(r,o)=>{she||(she=!0,T_.forEach(a=>a()),r===!0&&process.exit(128+o))};T_.length===0&&(process.once("SIGTERM",e.bind(null,!0,15)),process.once("SIGINT",e.bind(null,!0,2)),process.once("exit",e)),T_.push(t)};sn.define=(t,e,r)=>{Reflect.defineProperty(t,e,{value:r})};sn.defineExport=(t,e,r)=>{let o;Reflect.defineProperty(t,e,{enumerable:!0,configurable:!0,set(a){o=a},get(){return o?o():r()}})}});var ahe=_(hC=>{"use strict";hC.ctrl={a:"first",b:"backward",c:"cancel",d:"deleteForward",e:"last",f:"forward",g:"reset",i:"tab",k:"cutForward",l:"reset",n:"newItem",m:"cancel",j:"submit",p:"search",r:"remove",s:"save",u:"undo",w:"cutLeft",x:"toggleCursor",v:"paste"};hC.shift={up:"shiftUp",down:"shiftDown",left:"shiftLeft",right:"shiftRight",tab:"prev"};hC.fn={up:"pageUp",down:"pageDown",left:"pageLeft",right:"pageRight",delete:"deleteForward"};hC.option={b:"backward",f:"forward",d:"cutRight",left:"cutLeft",up:"altUp",down:"altDown"};hC.keys={pageup:"pageUp",pagedown:"pageDown",home:"home",end:"end",cancel:"cancel",delete:"deleteForward",backspace:"delete",down:"down",enter:"submit",escape:"cancel",left:"left",space:"space",number:"number",return:"submit",right:"right",tab:"next",up:"up"}});var uhe=_((X_t,che)=>{"use strict";var lhe=ve("readline"),UAt=ahe(),_At=/^(?:\x1b)([a-zA-Z0-9])$/,HAt=/^(?:\x1b+)(O|N|\[|\[\[)(?:(\d+)(?:;(\d+))?([~^$])|(?:1;)?(\d+)?([a-zA-Z]))/,jAt={OP:"f1",OQ:"f2",OR:"f3",OS:"f4","[11~":"f1","[12~":"f2","[13~":"f3","[14~":"f4","[[A":"f1","[[B":"f2","[[C":"f3","[[D":"f4","[[E":"f5","[15~":"f5","[17~":"f6","[18~":"f7","[19~":"f8","[20~":"f9","[21~":"f10","[23~":"f11","[24~":"f12","[A":"up","[B":"down","[C":"right","[D":"left","[E":"clear","[F":"end","[H":"home",OA:"up",OB:"down",OC:"right",OD:"left",OE:"clear",OF:"end",OH:"home","[1~":"home","[2~":"insert","[3~":"delete","[4~":"end","[5~":"pageup","[6~":"pagedown","[[5~":"pageup","[[6~":"pagedown","[7~":"home","[8~":"end","[a":"up","[b":"down","[c":"right","[d":"left","[e":"clear","[2$":"insert","[3$":"delete","[5$":"pageup","[6$":"pagedown","[7$":"home","[8$":"end",Oa:"up",Ob:"down",Oc:"right",Od:"left",Oe:"clear","[2^":"insert","[3^":"delete","[5^":"pageup","[6^":"pagedown","[7^":"home","[8^":"end","[Z":"tab"};function GAt(t){return["[a","[b","[c","[d","[e","[2$","[3$","[5$","[6$","[7$","[8$","[Z"].includes(t)}function qAt(t){return["Oa","Ob","Oc","Od","Oe","[2^","[3^","[5^","[6^","[7^","[8^"].includes(t)}var sk=(t="",e={})=>{let r,o={name:e.name,ctrl:!1,meta:!1,shift:!1,option:!1,sequence:t,raw:t,...e};if(Buffer.isBuffer(t)?t[0]>127&&t[1]===void 0?(t[0]-=128,t="\x1B"+String(t)):t=String(t):t!==void 0&&typeof t!="string"?t=String(t):t||(t=o.sequence||""),o.sequence=o.sequence||t||o.name,t==="\r")o.raw=void 0,o.name="return";else if(t===`
+`)o.name="enter";else if(t==="	")o.name="tab";else if(t==="\b"||t==="\x7F"||t==="\x1B\x7F"||t==="\x1B\b")o.name="backspace",o.meta=t.charAt(0)==="\x1B";else if(t==="\x1B"||t==="\x1B\x1B")o.name="escape",o.meta=t.length===2;else if(t===" "||t==="\x1B ")o.name="space",o.meta=t.length===2;else if(t<="")o.name=String.fromCharCode(t.charCodeAt(0)+"a".charCodeAt(0)-1),o.ctrl=!0;else if(t.length===1&&t>="0"&&t<="9")o.name="number";else if(t.length===1&&t>="a"&&t<="z")o.name=t;else if(t.length===1&&t>="A"&&t<="Z")o.name=t.toLowerCase(),o.shift=!0;else if(r=_At.exec(t))o.meta=!0,o.shift=/^[A-Z]$/.test(r[1]);else if(r=HAt.exec(t)){let a=[...t];a[0]==="\x1B"&&a[1]==="\x1B"&&(o.option=!0);let n=[r[1],r[2],r[4],r[6]].filter(Boolean).join(""),u=(r[3]||r[5]||1)-1;o.ctrl=!!(u&4),o.meta=!!(u&10),o.shift=!!(u&1),o.code=n,o.name=jAt[n],o.shift=GAt(n)||o.shift,o.ctrl=qAt(n)||o.ctrl}return o};sk.listen=(t={},e)=>{let{stdin:r}=t;if(!r||r!==process.stdin&&!r.isTTY)throw new Error("Invalid stream passed");let o=lhe.createInterface({terminal:!0,input:r});lhe.emitKeypressEvents(r,o);let a=(A,p)=>e(A,sk(A,p),o),n=r.isRaw;return r.isTTY&&r.setRawMode(!0),r.on("keypress",a),o.resume(),()=>{r.isTTY&&r.setRawMode(n),r.removeListener("keypress",a),o.pause(),o.close()}};sk.action=(t,e,r)=>{let o={...UAt,...r};return e.ctrl?(e.action=o.ctrl[e.name],e):e.option&&o.option?(e.action=o.option[e.name],e):e.shift?(e.action=o.shift[e.name],e):(e.action=o.keys[e.name],e)};che.exports=sk});var fhe=_((Z_t,Ahe)=>{"use strict";Ahe.exports=t=>{t.timers=t.timers||{};let e=t.options.timers;if(!!e)for(let r of Object.keys(e)){let o=e[r];typeof o=="number"&&(o={interval:o}),YAt(t,r,o)}};function YAt(t,e,r={}){let o=t.timers[e]={name:e,start:Date.now(),ms:0,tick:0},a=r.interval||120;o.frames=r.frames||[],o.loading=!0;let n=setInterval(()=>{o.ms=Date.now()-o.start,o.tick++,t.render()},a);return o.stop=()=>{o.loading=!1,clearInterval(n)},Reflect.defineProperty(o,"interval",{value:n}),t.once("close",()=>o.stop()),o.stop}});var hhe=_(($_t,phe)=>{"use strict";var{define:WAt,width:KAt}=No(),N_=class{constructor(e){let r=e.options;WAt(this,"_prompt",e),this.type=e.type,this.name=e.name,this.message="",this.header="",this.footer="",this.error="",this.hint="",this.input="",this.cursor=0,this.index=0,this.lines=0,this.tick=0,this.prompt="",this.buffer="",this.width=KAt(r.stdout||process.stdout),Object.assign(this,r),this.name=this.name||this.message,this.message=this.message||this.name,this.symbols=e.symbols,this.styles=e.styles,this.required=new Set,this.cancelled=!1,this.submitted=!1}clone(){let e={...this};return e.status=this.status,e.buffer=Buffer.from(e.buffer),delete e.clone,e}set color(e){this._color=e}get color(){let e=this.prompt.styles;if(this.cancelled)return e.cancelled;if(this.submitted)return e.submitted;let r=this._color||e[this.status];return typeof r=="function"?r:e.pending}set loading(e){this._loading=e}get loading(){return typeof this._loading=="boolean"?this._loading:this.loadingChoices?"choices":!1}get status(){return this.cancelled?"cancelled":this.submitted?"submitted":"pending"}};phe.exports=N_});var dhe=_((e8t,ghe)=>{"use strict";var L_=No(),eo=Kc(),O_={default:eo.noop,noop:eo.noop,set inverse(t){this._inverse=t},get inverse(){return this._inverse||L_.inverse(this.primary)},set complement(t){this._complement=t},get complement(){return this._complement||L_.complement(this.primary)},primary:eo.cyan,success:eo.green,danger:eo.magenta,strong:eo.bold,warning:eo.yellow,muted:eo.dim,disabled:eo.gray,dark:eo.dim.gray,underline:eo.underline,set info(t){this._info=t},get info(){return this._info||this.primary},set em(t){this._em=t},get em(){return this._em||this.primary.underline},set heading(t){this._heading=t},get heading(){return this._heading||this.muted.underline},set pending(t){this._pending=t},get pending(){return this._pending||this.primary},set submitted(t){this._submitted=t},get submitted(){return this._submitted||this.success},set cancelled(t){this._cancelled=t},get cancelled(){return this._cancelled||this.danger},set typing(t){this._typing=t},get typing(){return this._typing||this.dim},set placeholder(t){this._placeholder=t},get placeholder(){return this._placeholder||this.primary.dim},set highlight(t){this._highlight=t},get highlight(){return this._highlight||this.inverse}};O_.merge=(t={})=>{t.styles&&typeof t.styles.enabled=="boolean"&&(eo.enabled=t.styles.enabled),t.styles&&typeof t.styles.visible=="boolean"&&(eo.visible=t.styles.visible);let e=L_.merge({},O_,t.styles);delete e.merge;for(let r of Object.keys(eo))e.hasOwnProperty(r)||Reflect.defineProperty(e,r,{get:()=>eo[r]});for(let r of Object.keys(eo.styles))e.hasOwnProperty(r)||Reflect.defineProperty(e,r,{get:()=>eo[r]});return e};ghe.exports=O_});var yhe=_((t8t,mhe)=>{"use strict";var M_=process.platform==="win32",Vf=Kc(),VAt=No(),U_={...Vf.symbols,upDownDoubleArrow:"\u21D5",upDownDoubleArrow2:"\u2B0D",upDownArrow:"\u2195",asterisk:"*",asterism:"\u2042",bulletWhite:"\u25E6",electricArrow:"\u2301",ellipsisLarge:"\u22EF",ellipsisSmall:"\u2026",fullBlock:"\u2588",identicalTo:"\u2261",indicator:Vf.symbols.check,leftAngle:"\u2039",mark:"\u203B",minus:"\u2212",multiplication:"\xD7",obelus:"\xF7",percent:"%",pilcrow:"\xB6",pilcrow2:"\u2761",pencilUpRight:"\u2710",pencilDownRight:"\u270E",pencilRight:"\u270F",plus:"+",plusMinus:"\xB1",pointRight:"\u261E",rightAngle:"\u203A",section:"\xA7",hexagon:{off:"\u2B21",on:"\u2B22",disabled:"\u2B22"},ballot:{on:"\u2611",off:"\u2610",disabled:"\u2612"},stars:{on:"\u2605",off:"\u2606",disabled:"\u2606"},folder:{on:"\u25BC",off:"\u25B6",disabled:"\u25B6"},prefix:{pending:Vf.symbols.question,submitted:Vf.symbols.check,cancelled:Vf.symbols.cross},separator:{pending:Vf.symbols.pointerSmall,submitted:Vf.symbols.middot,cancelled:Vf.symbols.middot},radio:{off:M_?"( )":"\u25EF",on:M_?"(*)":"\u25C9",disabled:M_?"(|)":"\u24BE"},numbers:["\u24EA","\u2460","\u2461","\u2462","\u2463","\u2464","\u2465","\u2466","\u2467","\u2468","\u2469","\u246A","\u246B","\u246C","\u246D","\u246E","\u246F","\u2470","\u2471","\u2472","\u2473","\u3251","\u3252","\u3253","\u3254","\u3255","\u3256","\u3257","\u3258","\u3259","\u325A","\u325B","\u325C","\u325D","\u325E","\u325F","\u32B1","\u32B2","\u32B3","\u32B4","\u32B5","\u32B6","\u32B7","\u32B8","\u32B9","\u32BA","\u32BB","\u32BC","\u32BD","\u32BE","\u32BF"]};U_.merge=t=>{let e=VAt.merge({},Vf.symbols,U_,t.symbols);return delete e.merge,e};mhe.exports=U_});var Che=_((r8t,Ehe)=>{"use strict";var JAt=dhe(),zAt=yhe(),XAt=No();Ehe.exports=t=>{t.options=XAt.merge({},t.options.theme,t.options),t.symbols=zAt.merge(t.options),t.styles=JAt.merge(t.options)}});var Dhe=_((Bhe,vhe)=>{"use strict";var whe=process.env.TERM_PROGRAM==="Apple_Terminal",ZAt=Kc(),__=No(),Vc=vhe.exports=Bhe,Di="\x1B[",Ihe="\x07",H_=!1,Ph=Vc.code={bell:Ihe,beep:Ihe,beginning:`${Di}G`,down:`${Di}J`,esc:Di,getPosition:`${Di}6n`,hide:`${Di}?25l`,line:`${Di}2K`,lineEnd:`${Di}K`,lineStart:`${Di}1K`,restorePosition:Di+(whe?"8":"u"),savePosition:Di+(whe?"7":"s"),screen:`${Di}2J`,show:`${Di}?25h`,up:`${Di}1J`},qd=Vc.cursor={get hidden(){return H_},hide(){return H_=!0,Ph.hide},show(){return H_=!1,Ph.show},forward:(t=1)=>`${Di}${t}C`,backward:(t=1)=>`${Di}${t}D`,nextLine:(t=1)=>`${Di}E`.repeat(t),prevLine:(t=1)=>`${Di}F`.repeat(t),up:(t=1)=>t?`${Di}${t}A`:"",down:(t=1)=>t?`${Di}${t}B`:"",right:(t=1)=>t?`${Di}${t}C`:"",left:(t=1)=>t?`${Di}${t}D`:"",to(t,e){return e?`${Di}${e+1};${t+1}H`:`${Di}${t+1}G`},move(t=0,e=0){let r="";return r+=t<0?qd.left(-t):t>0?qd.right(t):"",r+=e<0?qd.up(-e):e>0?qd.down(e):"",r},restore(t={}){let{after:e,cursor:r,initial:o,input:a,prompt:n,size:u,value:A}=t;if(o=__.isPrimitive(o)?String(o):"",a=__.isPrimitive(a)?String(a):"",A=__.isPrimitive(A)?String(A):"",u){let p=Vc.cursor.up(u)+Vc.cursor.to(n.length),h=a.length-r;return h>0&&(p+=Vc.cursor.left(h)),p}if(A||e){let p=!a&&!!o?-o.length:-a.length+r;return e&&(p-=e.length),a===""&&o&&!n.includes(o)&&(p+=o.length),Vc.cursor.move(p)}}},j_=Vc.erase={screen:Ph.screen,up:Ph.up,down:Ph.down,line:Ph.line,lineEnd:Ph.lineEnd,lineStart:Ph.lineStart,lines(t){let e="";for(let r=0;r<t;r++)e+=Vc.erase.line+(r<t-1?Vc.cursor.up(1):"");return t&&(e+=Vc.code.beginning),e}};Vc.clear=(t="",e=process.stdout.columns)=>{if(!e)return j_.line+qd.to(0);let r=n=>[...ZAt.unstyle(n)].length,o=t.split(/\r?\n/),a=0;for(let n of o)a+=1+Math.floor(Math.max(r(n)-1,0)/e);return(j_.line+qd.prevLine()).repeat(a-1)+j_.line+qd.to(0)}});var gC=_((n8t,Phe)=>{"use strict";var $At=ve("events"),She=Kc(),G_=uhe(),eft=fhe(),tft=hhe(),rft=Che(),Ra=No(),Yd=Dhe(),c2=class extends $At{constructor(e={}){super(),this.name=e.name,this.type=e.type,this.options=e,rft(this),eft(this),this.state=new tft(this),this.initial=[e.initial,e.default].find(r=>r!=null),this.stdout=e.stdout||process.stdout,this.stdin=e.stdin||process.stdin,this.scale=e.scale||1,this.term=this.options.term||process.env.TERM_PROGRAM,this.margin=ift(this.options.margin),this.setMaxListeners(0),nft(this)}async keypress(e,r={}){this.keypressed=!0;let o=G_.action(e,G_(e,r),this.options.actions);this.state.keypress=o,this.emit("keypress",e,o),this.emit("state",this.state.clone());let a=this.options[o.action]||this[o.action]||this.dispatch;if(typeof a=="function")return await a.call(this,e,o);this.alert()}alert(){delete this.state.alert,this.options.show===!1?this.emit("alert"):this.stdout.write(Yd.code.beep)}cursorHide(){this.stdout.write(Yd.cursor.hide()),Ra.onExit(()=>this.cursorShow())}cursorShow(){this.stdout.write(Yd.cursor.show())}write(e){!e||(this.stdout&&this.state.show!==!1&&this.stdout.write(e),this.state.buffer+=e)}clear(e=0){let r=this.state.buffer;this.state.buffer="",!(!r&&!e||this.options.show===!1)&&this.stdout.write(Yd.cursor.down(e)+Yd.clear(r,this.width))}restore(){if(this.state.closed||this.options.show===!1)return;let{prompt:e,after:r,rest:o}=this.sections(),{cursor:a,initial:n="",input:u="",value:A=""}=this,p=this.state.size=o.length,h={after:r,cursor:a,initial:n,input:u,prompt:e,size:p,value:A},E=Yd.cursor.restore(h);E&&this.stdout.write(E)}sections(){let{buffer:e,input:r,prompt:o}=this.state;o=She.unstyle(o);let a=She.unstyle(e),n=a.indexOf(o),u=a.slice(0,n),p=a.slice(n).split(`
+`),h=p[0],E=p[p.length-1],v=(o+(r?" "+r:"")).length,x=v<h.length?h.slice(v+1):"";return{header:u,prompt:h,after:x,rest:p.slice(1),last:E}}async submit(){this.state.submitted=!0,this.state.validating=!0,this.options.onSubmit&&await this.options.onSubmit.call(this,this.name,this.value,this);let e=this.state.error||await this.validate(this.value,this.state);if(e!==!0){let r=`
+`+this.symbols.pointer+" ";typeof e=="string"?r+=e.trim():r+="Invalid input",this.state.error=`
+`+this.styles.danger(r),this.state.submitted=!1,await this.render(),await this.alert(),this.state.validating=!1,this.state.error=void 0;return}this.state.validating=!1,await this.render(),await this.close(),this.value=await this.result(this.value),this.emit("submit",this.value)}async cancel(e){this.state.cancelled=this.state.submitted=!0,await this.render(),await this.close(),typeof this.options.onCancel=="function"&&await this.options.onCancel.call(this,this.name,this.value,this),this.emit("cancel",await this.error(e))}async close(){this.state.closed=!0;try{let e=this.sections(),r=Math.ceil(e.prompt.length/this.width);e.rest&&this.write(Yd.cursor.down(e.rest.length)),this.write(`
+`.repeat(r))}catch{}this.emit("close")}start(){!this.stop&&this.options.show!==!1&&(this.stop=G_.listen(this,this.keypress.bind(this)),this.once("close",this.stop))}async skip(){return this.skipped=this.options.skip===!0,typeof this.options.skip=="function"&&(this.skipped=await this.options.skip.call(this,this.name,this.value)),this.skipped}async initialize(){let{format:e,options:r,result:o}=this;if(this.format=()=>e.call(this,this.value),this.result=()=>o.call(this,this.value),typeof r.initial=="function"&&(this.initial=await r.initial.call(this,this)),typeof r.onRun=="function"&&await r.onRun.call(this,this),typeof r.onSubmit=="function"){let a=r.onSubmit.bind(this),n=this.submit.bind(this);delete this.options.onSubmit,this.submit=async()=>(await a(this.name,this.value,this),n())}await this.start(),await this.render()}render(){throw new Error("expected prompt to have a custom render method")}run(){return new Promise(async(e,r)=>{if(this.once("submit",e),this.once("cancel",r),await this.skip())return this.render=()=>{},this.submit();await this.initialize(),this.emit("run")})}async element(e,r,o){let{options:a,state:n,symbols:u,timers:A}=this,p=A&&A[e];n.timer=p;let h=a[e]||n[e]||u[e],E=r&&r[e]!=null?r[e]:await h;if(E==="")return E;let I=await this.resolve(E,n,r,o);return!I&&r&&r[e]?this.resolve(h,n,r,o):I}async prefix(){let e=await this.element("prefix")||this.symbols,r=this.timers&&this.timers.prefix,o=this.state;return o.timer=r,Ra.isObject(e)&&(e=e[o.status]||e.pending),Ra.hasColor(e)?e:(this.styles[o.status]||this.styles.pending)(e)}async message(){let e=await this.element("message");return Ra.hasColor(e)?e:this.styles.strong(e)}async separator(){let e=await this.element("separator")||this.symbols,r=this.timers&&this.timers.separator,o=this.state;o.timer=r;let a=e[o.status]||e.pending||o.separator,n=await this.resolve(a,o);return Ra.isObject(n)&&(n=n[o.status]||n.pending),Ra.hasColor(n)?n:this.styles.muted(n)}async pointer(e,r){let o=await this.element("pointer",e,r);if(typeof o=="string"&&Ra.hasColor(o))return o;if(o){let a=this.styles,n=this.index===r,u=n?a.primary:h=>h,A=await this.resolve(o[n?"on":"off"]||o,this.state),p=Ra.hasColor(A)?A:u(A);return n?p:" ".repeat(A.length)}}async indicator(e,r){let o=await this.element("indicator",e,r);if(typeof o=="string"&&Ra.hasColor(o))return o;if(o){let a=this.styles,n=e.enabled===!0,u=n?a.success:a.dark,A=o[n?"on":"off"]||o;return Ra.hasColor(A)?A:u(A)}return""}body(){return null}footer(){if(this.state.status==="pending")return this.element("footer")}header(){if(this.state.status==="pending")return this.element("header")}async hint(){if(this.state.status==="pending"&&!this.isValue(this.state.input)){let e=await this.element("hint");return Ra.hasColor(e)?e:this.styles.muted(e)}}error(e){return this.state.submitted?"":e||this.state.error}format(e){return e}result(e){return e}validate(e){return this.options.required===!0?this.isValue(e):!0}isValue(e){return e!=null&&e!==""}resolve(e,...r){return Ra.resolve(this,e,...r)}get base(){return c2.prototype}get style(){return this.styles[this.state.status]}get height(){return this.options.rows||Ra.height(this.stdout,25)}get width(){return this.options.columns||Ra.width(this.stdout,80)}get size(){return{width:this.width,height:this.height}}set cursor(e){this.state.cursor=e}get cursor(){return this.state.cursor}set input(e){this.state.input=e}get input(){return this.state.input}set value(e){this.state.value=e}get value(){let{input:e,value:r}=this.state,o=[r,e].find(this.isValue.bind(this));return this.isValue(o)?o:this.initial}static get prompt(){return e=>new this(e).run()}};function nft(t){let e=a=>t[a]===void 0||typeof t[a]=="function",r=["actions","choices","initial","margin","roles","styles","symbols","theme","timers","value"],o=["body","footer","error","header","hint","indicator","message","prefix","separator","skip"];for(let a of Object.keys(t.options)){if(r.includes(a)||/^on[A-Z]/.test(a))continue;let n=t.options[a];typeof n=="function"&&e(a)?o.includes(a)||(t[a]=n.bind(t)):typeof t[a]!="function"&&(t[a]=n)}}function ift(t){typeof t=="number"&&(t=[t,t,t,t]);let e=[].concat(t||[]),r=a=>a%2===0?`
+`:" ",o=[];for(let a=0;a<4;a++){let n=r(a);e[a]?o.push(n.repeat(e[a])):o.push("")}return o}Phe.exports=c2});var khe=_((i8t,xhe)=>{"use strict";var sft=No(),bhe={default(t,e){return e},checkbox(t,e){throw new Error("checkbox role is not implemented yet")},editable(t,e){throw new Error("editable role is not implemented yet")},expandable(t,e){throw new Error("expandable role is not implemented yet")},heading(t,e){return e.disabled="",e.indicator=[e.indicator," "].find(r=>r!=null),e.message=e.message||"",e},input(t,e){throw new Error("input role is not implemented yet")},option(t,e){return bhe.default(t,e)},radio(t,e){throw new Error("radio role is not implemented yet")},separator(t,e){return e.disabled="",e.indicator=[e.indicator," "].find(r=>r!=null),e.message=e.message||t.symbols.line.repeat(5),e},spacer(t,e){return e}};xhe.exports=(t,e={})=>{let r=sft.merge({},bhe,e.roles);return r[t]||r.default}});var u2=_((s8t,Rhe)=>{"use strict";var oft=Kc(),aft=gC(),lft=khe(),ok=No(),{reorder:q_,scrollUp:cft,scrollDown:uft,isObject:Qhe,swap:Aft}=ok,Y_=class extends aft{constructor(e){super(e),this.cursorHide(),this.maxSelected=e.maxSelected||1/0,this.multiple=e.multiple||!1,this.initial=e.initial||0,this.delay=e.delay||0,this.longest=0,this.num=""}async initialize(){typeof this.options.initial=="function"&&(this.initial=await this.options.initial.call(this)),await this.reset(!0),await super.initialize()}async reset(){let{choices:e,initial:r,autofocus:o,suggest:a}=this.options;if(this.state._choices=[],this.state.choices=[],this.choices=await Promise.all(await this.toChoices(e)),this.choices.forEach(n=>n.enabled=!1),typeof a!="function"&&this.selectable.length===0)throw new Error("At least one choice must be selectable");Qhe(r)&&(r=Object.keys(r)),Array.isArray(r)?(o!=null&&(this.index=this.findIndex(o)),r.forEach(n=>this.enable(this.find(n))),await this.render()):(o!=null&&(r=o),typeof r=="string"&&(r=this.findIndex(r)),typeof r=="number"&&r>-1&&(this.index=Math.max(0,Math.min(r,this.choices.length)),this.enable(this.find(this.index)))),this.isDisabled(this.focused)&&await this.down()}async toChoices(e,r){this.state.loadingChoices=!0;let o=[],a=0,n=async(u,A)=>{typeof u=="function"&&(u=await u.call(this)),u instanceof Promise&&(u=await u);for(let p=0;p<u.length;p++){let h=u[p]=await this.toChoice(u[p],a++,A);o.push(h),h.choices&&await n(h.choices,h)}return o};return n(e,r).then(u=>(this.state.loadingChoices=!1,u))}async toChoice(e,r,o){if(typeof e=="function"&&(e=await e.call(this,this)),e instanceof Promise&&(e=await e),typeof e=="string"&&(e={name:e}),e.normalized)return e;e.normalized=!0;let a=e.value;if(e=lft(e.role,this.options)(this,e),typeof e.disabled=="string"&&!e.hint&&(e.hint=e.disabled,e.disabled=!0),e.disabled===!0&&e.hint==null&&(e.hint="(disabled)"),e.index!=null)return e;e.name=e.name||e.key||e.title||e.value||e.message,e.message=e.message||e.name||"",e.value=[e.value,e.name].find(this.isValue.bind(this)),e.input="",e.index=r,e.cursor=0,ok.define(e,"parent",o),e.level=o?o.level+1:1,e.indent==null&&(e.indent=o?o.indent+"  ":e.indent||""),e.path=o?o.path+"."+e.name:e.name,e.enabled=!!(this.multiple&&!this.isDisabled(e)&&(e.enabled||this.isSelected(e))),this.isDisabled(e)||(this.longest=Math.max(this.longest,oft.unstyle(e.message).length));let u={...e};return e.reset=(A=u.input,p=u.value)=>{for(let h of Object.keys(u))e[h]=u[h];e.input=A,e.value=p},a==null&&typeof e.initial=="function"&&(e.input=await e.initial.call(this,this.state,e,r)),e}async onChoice(e,r){this.emit("choice",e,r,this),typeof e.onChoice=="function"&&await e.onChoice.call(this,this.state,e,r)}async addChoice(e,r,o){let a=await this.toChoice(e,r,o);return this.choices.push(a),this.index=this.choices.length-1,this.limit=this.choices.length,a}async newItem(e,r,o){let a={name:"New choice name?",editable:!0,newChoice:!0,...e},n=await this.addChoice(a,r,o);return n.updateChoice=()=>{delete n.newChoice,n.name=n.message=n.input,n.input="",n.cursor=0},this.render()}indent(e){return e.indent==null?e.level>1?"  ".repeat(e.level-1):"":e.indent}dispatch(e,r){if(this.multiple&&this[r.name])return this[r.name]();this.alert()}focus(e,r){return typeof r!="boolean"&&(r=e.enabled),r&&!e.enabled&&this.selected.length>=this.maxSelected?this.alert():(this.index=e.index,e.enabled=r&&!this.isDisabled(e),e)}space(){return this.multiple?(this.toggle(this.focused),this.render()):this.alert()}a(){if(this.maxSelected<this.choices.length)return this.alert();let e=this.selectable.every(r=>r.enabled);return this.choices.forEach(r=>r.enabled=!e),this.render()}i(){return this.choices.length-this.selected.length>this.maxSelected?this.alert():(this.choices.forEach(e=>e.enabled=!e.enabled),this.render())}g(e=this.focused){return this.choices.some(r=>!!r.parent)?(this.toggle(e.parent&&!e.choices?e.parent:e),this.render()):this.a()}toggle(e,r){if(!e.enabled&&this.selected.length>=this.maxSelected)return this.alert();typeof r!="boolean"&&(r=!e.enabled),e.enabled=r,e.choices&&e.choices.forEach(a=>this.toggle(a,r));let o=e.parent;for(;o;){let a=o.choices.filter(n=>this.isDisabled(n));o.enabled=a.every(n=>n.enabled===!0),o=o.parent}return Fhe(this,this.choices),this.emit("toggle",e,this),e}enable(e){return this.selected.length>=this.maxSelected?this.alert():(e.enabled=!this.isDisabled(e),e.choices&&e.choices.forEach(this.enable.bind(this)),e)}disable(e){return e.enabled=!1,e.choices&&e.choices.forEach(this.disable.bind(this)),e}number(e){this.num+=e;let r=o=>{let a=Number(o);if(a>this.choices.length-1)return this.alert();let n=this.focused,u=this.choices.find(A=>a===A.index);if(!u.enabled&&this.selected.length>=this.maxSelected)return this.alert();if(this.visible.indexOf(u)===-1){let A=q_(this.choices),p=A.indexOf(u);if(n.index>p){let h=A.slice(p,p+this.limit),E=A.filter(I=>!h.includes(I));this.choices=h.concat(E)}else{let h=p-this.limit+1;this.choices=A.slice(h).concat(A.slice(0,h))}}return this.index=this.choices.indexOf(u),this.toggle(this.focused),this.render()};return clearTimeout(this.numberTimeout),new Promise(o=>{let a=this.choices.length,n=this.num,u=(A=!1,p)=>{clearTimeout(this.numberTimeout),A&&(p=r(n)),this.num="",o(p)};if(n==="0"||n.length===1&&Number(n+"0")>a)return u(!0);if(Number(n)>a)return u(!1,this.alert());this.numberTimeout=setTimeout(()=>u(!0),this.delay)})}home(){return this.choices=q_(this.choices),this.index=0,this.render()}end(){let e=this.choices.length-this.limit,r=q_(this.choices);return this.choices=r.slice(e).concat(r.slice(0,e)),this.index=this.limit-1,this.render()}first(){return this.index=0,this.render()}last(){return this.index=this.visible.length-1,this.render()}prev(){return this.visible.length<=1?this.alert():this.up()}next(){return this.visible.length<=1?this.alert():this.down()}right(){return this.cursor>=this.input.length?this.alert():(this.cursor++,this.render())}left(){return this.cursor<=0?this.alert():(this.cursor--,this.render())}up(){let e=this.choices.length,r=this.visible.length,o=this.index;return this.options.scroll===!1&&o===0?this.alert():e>r&&o===0?this.scrollUp():(this.index=(o-1%e+e)%e,this.isDisabled()?this.up():this.render())}down(){let e=this.choices.length,r=this.visible.length,o=this.index;return this.options.scroll===!1&&o===r-1?this.alert():e>r&&o===r-1?this.scrollDown():(this.index=(o+1)%e,this.isDisabled()?this.down():this.render())}scrollUp(e=0){return this.choices=cft(this.choices),this.index=e,this.isDisabled()?this.up():this.render()}scrollDown(e=this.visible.length-1){return this.choices=uft(this.choices),this.index=e,this.isDisabled()?this.down():this.render()}async shiftUp(){if(this.options.sort===!0){this.sorting=!0,this.swap(this.index-1),await this.up(),this.sorting=!1;return}return this.scrollUp(this.index)}async shiftDown(){if(this.options.sort===!0){this.sorting=!0,this.swap(this.index+1),await this.down(),this.sorting=!1;return}return this.scrollDown(this.index)}pageUp(){return this.visible.length<=1?this.alert():(this.limit=Math.max(this.limit-1,0),this.index=Math.min(this.limit-1,this.index),this._limit=this.limit,this.isDisabled()?this.up():this.render())}pageDown(){return this.visible.length>=this.choices.length?this.alert():(this.index=Math.max(0,this.index),this.limit=Math.min(this.limit+1,this.choices.length),this._limit=this.limit,this.isDisabled()?this.down():this.render())}swap(e){Aft(this.choices,this.index,e)}isDisabled(e=this.focused){return e&&["disabled","collapsed","hidden","completing","readonly"].some(o=>e[o]===!0)?!0:e&&e.role==="heading"}isEnabled(e=this.focused){if(Array.isArray(e))return e.every(r=>this.isEnabled(r));if(e.choices){let r=e.choices.filter(o=>!this.isDisabled(o));return e.enabled&&r.every(o=>this.isEnabled(o))}return e.enabled&&!this.isDisabled(e)}isChoice(e,r){return e.name===r||e.index===Number(r)}isSelected(e){return Array.isArray(this.initial)?this.initial.some(r=>this.isChoice(e,r)):this.isChoice(e,this.initial)}map(e=[],r="value"){return[].concat(e||[]).reduce((o,a)=>(o[a]=this.find(a,r),o),{})}filter(e,r){let a=typeof e=="function"?e:(A,p)=>[A.name,p].includes(e),u=(this.options.multiple?this.state._choices:this.choices).filter(a);return r?u.map(A=>A[r]):u}find(e,r){if(Qhe(e))return r?e[r]:e;let a=typeof e=="function"?e:(u,A)=>[u.name,A].includes(e),n=this.choices.find(a);if(n)return r?n[r]:n}findIndex(e){return this.choices.indexOf(this.find(e))}async submit(){let e=this.focused;if(!e)return this.alert();if(e.newChoice)return e.input?(e.updateChoice(),this.render()):this.alert();if(this.choices.some(u=>u.newChoice))return this.alert();let{reorder:r,sort:o}=this.options,a=this.multiple===!0,n=this.selected;return n===void 0?this.alert():(Array.isArray(n)&&r!==!1&&o!==!0&&(n=ok.reorder(n)),this.value=a?n.map(u=>u.name):n.name,super.submit())}set choices(e=[]){this.state._choices=this.state._choices||[],this.state.choices=e;for(let r of e)this.state._choices.some(o=>o.name===r.name)||this.state._choices.push(r);if(!this._initial&&this.options.initial){this._initial=!0;let r=this.initial;if(typeof r=="string"||typeof r=="number"){let o=this.find(r);o&&(this.initial=o.index,this.focus(o,!0))}}}get choices(){return Fhe(this,this.state.choices||[])}set visible(e){this.state.visible=e}get visible(){return(this.state.visible||this.choices).slice(0,this.limit)}set limit(e){this.state.limit=e}get limit(){let{state:e,options:r,choices:o}=this,a=e.limit||this._limit||r.limit||o.length;return Math.min(a,this.height)}set value(e){super.value=e}get value(){return typeof super.value!="string"&&super.value===this.initial?this.input:super.value}set index(e){this.state.index=e}get index(){return Math.max(0,this.state?this.state.index:0)}get enabled(){return this.filter(this.isEnabled.bind(this))}get focused(){let e=this.choices[this.index];return e&&this.state.submitted&&this.multiple!==!0&&(e.enabled=!0),e}get selectable(){return this.choices.filter(e=>!this.isDisabled(e))}get selected(){return this.multiple?this.enabled:this.focused}};function Fhe(t,e){if(e instanceof Promise)return e;if(typeof e=="function"){if(ok.isAsyncFn(e))return e;e=e.call(t,t)}for(let r of e){if(Array.isArray(r.choices)){let o=r.choices.filter(a=>!t.isDisabled(a));r.enabled=o.every(a=>a.enabled===!0)}t.isDisabled(r)===!0&&delete r.enabled}return e}Rhe.exports=Y_});var bh=_((o8t,The)=>{"use strict";var fft=u2(),W_=No(),K_=class extends fft{constructor(e){super(e),this.emptyError=this.options.emptyError||"No items were selected"}async dispatch(e,r){if(this.multiple)return this[r.name]?await this[r.name](e,r):await super.dispatch(e,r);this.alert()}separator(){if(this.options.separator)return super.separator();let e=this.styles.muted(this.symbols.ellipsis);return this.state.submitted?super.separator():e}pointer(e,r){return!this.multiple||this.options.pointer?super.pointer(e,r):""}indicator(e,r){return this.multiple?super.indicator(e,r):""}choiceMessage(e,r){let o=this.resolve(e.message,this.state,e,r);return e.role==="heading"&&!W_.hasColor(o)&&(o=this.styles.strong(o)),this.resolve(o,this.state,e,r)}choiceSeparator(){return":"}async renderChoice(e,r){await this.onChoice(e,r);let o=this.index===r,a=await this.pointer(e,r),n=await this.indicator(e,r)+(e.pad||""),u=await this.resolve(e.hint,this.state,e,r);u&&!W_.hasColor(u)&&(u=this.styles.muted(u));let A=this.indent(e),p=await this.choiceMessage(e,r),h=()=>[this.margin[3],A+a+n,p,this.margin[1],u].filter(Boolean).join(" ");return e.role==="heading"?h():e.disabled?(W_.hasColor(p)||(p=this.styles.disabled(p)),h()):(o&&(p=this.styles.em(p)),h())}async renderChoices(){if(this.state.loading==="choices")return this.styles.warning("Loading choices");if(this.state.submitted)return"";let e=this.visible.map(async(n,u)=>await this.renderChoice(n,u)),r=await Promise.all(e);r.length||r.push(this.styles.danger("No matching choices"));let o=this.margin[0]+r.join(`
+`),a;return this.options.choicesHeader&&(a=await this.resolve(this.options.choicesHeader,this.state)),[a,o].filter(Boolean).join(`
+`)}format(){return!this.state.submitted||this.state.cancelled?"":Array.isArray(this.selected)?this.selected.map(e=>this.styles.primary(e.name)).join(", "):this.styles.primary(this.selected.name)}async render(){let{submitted:e,size:r}=this.state,o="",a=await this.header(),n=await this.prefix(),u=await this.separator(),A=await this.message();this.options.promptLine!==!1&&(o=[n,A,u,""].join(" "),this.state.prompt=o);let p=await this.format(),h=await this.error()||await this.hint(),E=await this.renderChoices(),I=await this.footer();p&&(o+=p),h&&!o.includes(h)&&(o+=" "+h),e&&!p&&!E.trim()&&this.multiple&&this.emptyError!=null&&(o+=this.styles.danger(this.emptyError)),this.clear(r),this.write([a,o,E,I].filter(Boolean).join(`
+`)),this.write(this.margin[2]),this.restore()}};The.exports=K_});var Lhe=_((a8t,Nhe)=>{"use strict";var pft=bh(),hft=(t,e)=>{let r=t.toLowerCase();return o=>{let n=o.toLowerCase().indexOf(r),u=e(o.slice(n,n+r.length));return n>=0?o.slice(0,n)+u+o.slice(n+r.length):o}},V_=class extends pft{constructor(e){super(e),this.cursorShow()}moveCursor(e){this.state.cursor+=e}dispatch(e){return this.append(e)}space(e){return this.options.multiple?super.space(e):this.append(e)}append(e){let{cursor:r,input:o}=this.state;return this.input=o.slice(0,r)+e+o.slice(r),this.moveCursor(1),this.complete()}delete(){let{cursor:e,input:r}=this.state;return r?(this.input=r.slice(0,e-1)+r.slice(e),this.moveCursor(-1),this.complete()):this.alert()}deleteForward(){let{cursor:e,input:r}=this.state;return r[e]===void 0?this.alert():(this.input=`${r}`.slice(0,e)+`${r}`.slice(e+1),this.complete())}number(e){return this.append(e)}async complete(){this.completing=!0,this.choices=await this.suggest(this.input,this.state._choices),this.state.limit=void 0,this.index=Math.min(Math.max(this.visible.length-1,0),this.index),await this.render(),this.completing=!1}suggest(e=this.input,r=this.state._choices){if(typeof this.options.suggest=="function")return this.options.suggest.call(this,e,r);let o=e.toLowerCase();return r.filter(a=>a.message.toLowerCase().includes(o))}pointer(){return""}format(){if(!this.focused)return this.input;if(this.options.multiple&&this.state.submitted)return this.selected.map(e=>this.styles.primary(e.message)).join(", ");if(this.state.submitted){let e=this.value=this.input=this.focused.value;return this.styles.primary(e)}return this.input}async render(){if(this.state.status!=="pending")return super.render();let e=this.options.highlight?this.options.highlight.bind(this):this.styles.placeholder,r=hft(this.input,e),o=this.choices;this.choices=o.map(a=>({...a,message:r(a.message)})),await super.render(),this.choices=o}submit(){return this.options.multiple&&(this.value=this.selected.map(e=>e.name)),super.submit()}};Nhe.exports=V_});var z_=_((l8t,Ohe)=>{"use strict";var J_=No();Ohe.exports=(t,e={})=>{t.cursorHide();let{input:r="",initial:o="",pos:a,showCursor:n=!0,color:u}=e,A=u||t.styles.placeholder,p=J_.inverse(t.styles.primary),h=R=>p(t.styles.black(R)),E=r,I=" ",v=h(I);if(t.blink&&t.blink.off===!0&&(h=R=>R,v=""),n&&a===0&&o===""&&r==="")return h(I);if(n&&a===0&&(r===o||r===""))return h(o[0])+A(o.slice(1));o=J_.isPrimitive(o)?`${o}`:"",r=J_.isPrimitive(r)?`${r}`:"";let x=o&&o.startsWith(r)&&o!==r,C=x?h(o[r.length]):v;if(a!==r.length&&n===!0&&(E=r.slice(0,a)+h(r[a])+r.slice(a+1),C=""),n===!1&&(C=""),x){let R=t.styles.unstyle(E+C);return E+C+A(o.slice(R.length))}return E+C}});var ak=_((c8t,Mhe)=>{"use strict";var gft=Kc(),dft=bh(),mft=z_(),X_=class extends dft{constructor(e){super({...e,multiple:!0}),this.type="form",this.initial=this.options.initial,this.align=[this.options.align,"right"].find(r=>r!=null),this.emptyError="",this.values={}}async reset(e){return await super.reset(),e===!0&&(this._index=this.index),this.index=this._index,this.values={},this.choices.forEach(r=>r.reset&&r.reset()),this.render()}dispatch(e){return!!e&&this.append(e)}append(e){let r=this.focused;if(!r)return this.alert();let{cursor:o,input:a}=r;return r.value=r.input=a.slice(0,o)+e+a.slice(o),r.cursor++,this.render()}delete(){let e=this.focused;if(!e||e.cursor<=0)return this.alert();let{cursor:r,input:o}=e;return e.value=e.input=o.slice(0,r-1)+o.slice(r),e.cursor--,this.render()}deleteForward(){let e=this.focused;if(!e)return this.alert();let{cursor:r,input:o}=e;if(o[r]===void 0)return this.alert();let a=`${o}`.slice(0,r)+`${o}`.slice(r+1);return e.value=e.input=a,this.render()}right(){let e=this.focused;return e?e.cursor>=e.input.length?this.alert():(e.cursor++,this.render()):this.alert()}left(){let e=this.focused;return e?e.cursor<=0?this.alert():(e.cursor--,this.render()):this.alert()}space(e,r){return this.dispatch(e,r)}number(e,r){return this.dispatch(e,r)}next(){let e=this.focused;if(!e)return this.alert();let{initial:r,input:o}=e;return r&&r.startsWith(o)&&o!==r?(e.value=e.input=r,e.cursor=e.value.length,this.render()):super.next()}prev(){let e=this.focused;return e?e.cursor===0?super.prev():(e.value=e.input="",e.cursor=0,this.render()):this.alert()}separator(){return""}format(e){return this.state.submitted?"":super.format(e)}pointer(){return""}indicator(e){return e.input?"\u29BF":"\u2299"}async choiceSeparator(e,r){let o=await this.resolve(e.separator,this.state,e,r)||":";return o?" "+this.styles.disabled(o):""}async renderChoice(e,r){await this.onChoice(e,r);let{state:o,styles:a}=this,{cursor:n,initial:u="",name:A,hint:p,input:h=""}=e,{muted:E,submitted:I,primary:v,danger:x}=a,C=p,R=this.index===r,L=e.validate||(()=>!0),U=await this.choiceSeparator(e,r),J=e.message;this.align==="right"&&(J=J.padStart(this.longest+1," ")),this.align==="left"&&(J=J.padEnd(this.longest+1," "));let te=this.values[A]=h||u,ae=h?"success":"dark";await L.call(e,te,this.state)!==!0&&(ae="danger");let fe=a[ae],ce=fe(await this.indicator(e,r))+(e.pad||""),me=this.indent(e),he=()=>[me,ce,J+U,h,C].filter(Boolean).join(" ");if(o.submitted)return J=gft.unstyle(J),h=I(h),C="",he();if(e.format)h=await e.format.call(this,h,e,r);else{let Be=this.styles.muted;h=mft(this,{input:h,initial:u,pos:n,showCursor:R,color:Be})}return this.isValue(h)||(h=this.styles.muted(this.symbols.ellipsis)),e.result&&(this.values[A]=await e.result.call(this,te,e,r)),R&&(J=v(J)),e.error?h+=(h?" ":"")+x(e.error.trim()):e.hint&&(h+=(h?" ":"")+E(e.hint.trim())),he()}async submit(){return this.value=this.values,super.base.submit.call(this)}};Mhe.exports=X_});var Z_=_((u8t,_he)=>{"use strict";var yft=ak(),Eft=()=>{throw new Error("expected prompt to have a custom authenticate method")},Uhe=(t=Eft)=>{class e extends yft{constructor(o){super(o)}async submit(){this.value=await t.call(this,this.values,this.state),super.base.submit.call(this)}static create(o){return Uhe(o)}}return e};_he.exports=Uhe()});var Ghe=_((A8t,jhe)=>{"use strict";var Cft=Z_();function wft(t,e){return t.username===this.options.username&&t.password===this.options.password}var Hhe=(t=wft)=>{let e=[{name:"username",message:"username"},{name:"password",message:"password",format(o){return this.options.showPassword?o:(this.state.submitted?this.styles.primary:this.styles.muted)(this.symbols.asterisk.repeat(o.length))}}];class r extends Cft.create(t){constructor(a){super({...a,choices:e})}static create(a){return Hhe(a)}}return r};jhe.exports=Hhe()});var lk=_((f8t,qhe)=>{"use strict";var Ift=gC(),{isPrimitive:Bft,hasColor:vft}=No(),$_=class extends Ift{constructor(e){super(e),this.cursorHide()}async initialize(){let e=await this.resolve(this.initial,this.state);this.input=await this.cast(e),await super.initialize()}dispatch(e){return this.isValue(e)?(this.input=e,this.submit()):this.alert()}format(e){let{styles:r,state:o}=this;return o.submitted?r.success(e):r.primary(e)}cast(e){return this.isTrue(e)}isTrue(e){return/^[ty1]/i.test(e)}isFalse(e){return/^[fn0]/i.test(e)}isValue(e){return Bft(e)&&(this.isTrue(e)||this.isFalse(e))}async hint(){if(this.state.status==="pending"){let e=await this.element("hint");return vft(e)?e:this.styles.muted(e)}}async render(){let{input:e,size:r}=this.state,o=await this.prefix(),a=await this.separator(),n=await this.message(),u=this.styles.muted(this.default),A=[o,n,u,a].filter(Boolean).join(" ");this.state.prompt=A;let p=await this.header(),h=this.value=this.cast(e),E=await this.format(h),I=await this.error()||await this.hint(),v=await this.footer();I&&!A.includes(I)&&(E+=" "+I),A+=" "+E,this.clear(r),this.write([p,A,v].filter(Boolean).join(`
+`)),this.restore()}set value(e){super.value=e}get value(){return this.cast(super.value)}};qhe.exports=$_});var Whe=_((p8t,Yhe)=>{"use strict";var Dft=lk(),e8=class extends Dft{constructor(e){super(e),this.default=this.options.default||(this.initial?"(Y/n)":"(y/N)")}};Yhe.exports=e8});var Vhe=_((h8t,Khe)=>{"use strict";var Sft=bh(),Pft=ak(),dC=Pft.prototype,t8=class extends Sft{constructor(e){super({...e,multiple:!0}),this.align=[this.options.align,"left"].find(r=>r!=null),this.emptyError="",this.values={}}dispatch(e,r){let o=this.focused,a=o.parent||{};return!o.editable&&!a.editable&&(e==="a"||e==="i")?super[e]():dC.dispatch.call(this,e,r)}append(e,r){return dC.append.call(this,e,r)}delete(e,r){return dC.delete.call(this,e,r)}space(e){return this.focused.editable?this.append(e):super.space()}number(e){return this.focused.editable?this.append(e):super.number(e)}next(){return this.focused.editable?dC.next.call(this):super.next()}prev(){return this.focused.editable?dC.prev.call(this):super.prev()}async indicator(e,r){let o=e.indicator||"",a=e.editable?o:super.indicator(e,r);return await this.resolve(a,this.state,e,r)||""}indent(e){return e.role==="heading"?"":e.editable?" ":"  "}async renderChoice(e,r){return e.indent="",e.editable?dC.renderChoice.call(this,e,r):super.renderChoice(e,r)}error(){return""}footer(){return this.state.error}async validate(){let e=!0;for(let r of this.choices){if(typeof r.validate!="function"||r.role==="heading")continue;let o=r.parent?this.value[r.parent.name]:this.value;if(r.editable?o=r.value===r.name?r.initial||"":r.value:this.isDisabled(r)||(o=r.enabled===!0),e=await r.validate(o,this.state),e!==!0)break}return e!==!0&&(this.state.error=typeof e=="string"?e:"Invalid Input"),e}submit(){if(this.focused.newChoice===!0)return super.submit();if(this.choices.some(e=>e.newChoice))return this.alert();this.value={};for(let e of this.choices){let r=e.parent?this.value[e.parent.name]:this.value;if(e.role==="heading"){this.value[e.name]={};continue}e.editable?r[e.name]=e.value===e.name?e.initial||"":e.value:this.isDisabled(e)||(r[e.name]=e.enabled===!0)}return this.base.submit.call(this)}};Khe.exports=t8});var Wd=_((g8t,Jhe)=>{"use strict";var bft=gC(),xft=z_(),{isPrimitive:kft}=No(),r8=class extends bft{constructor(e){super(e),this.initial=kft(this.initial)?String(this.initial):"",this.initial&&this.cursorHide(),this.state.prevCursor=0,this.state.clipboard=[]}async keypress(e,r={}){let o=this.state.prevKeypress;return this.state.prevKeypress=r,this.options.multiline===!0&&r.name==="return"&&(!o||o.name!=="return")?this.append(`
+`,r):super.keypress(e,r)}moveCursor(e){this.cursor+=e}reset(){return this.input=this.value="",this.cursor=0,this.render()}dispatch(e,r){if(!e||r.ctrl||r.code)return this.alert();this.append(e)}append(e){let{cursor:r,input:o}=this.state;this.input=`${o}`.slice(0,r)+e+`${o}`.slice(r),this.moveCursor(String(e).length),this.render()}insert(e){this.append(e)}delete(){let{cursor:e,input:r}=this.state;if(e<=0)return this.alert();this.input=`${r}`.slice(0,e-1)+`${r}`.slice(e),this.moveCursor(-1),this.render()}deleteForward(){let{cursor:e,input:r}=this.state;if(r[e]===void 0)return this.alert();this.input=`${r}`.slice(0,e)+`${r}`.slice(e+1),this.render()}cutForward(){let e=this.cursor;if(this.input.length<=e)return this.alert();this.state.clipboard.push(this.input.slice(e)),this.input=this.input.slice(0,e),this.render()}cutLeft(){let e=this.cursor;if(e===0)return this.alert();let r=this.input.slice(0,e),o=this.input.slice(e),a=r.split(" ");this.state.clipboard.push(a.pop()),this.input=a.join(" "),this.cursor=this.input.length,this.input+=o,this.render()}paste(){if(!this.state.clipboard.length)return this.alert();this.insert(this.state.clipboard.pop()),this.render()}toggleCursor(){this.state.prevCursor?(this.cursor=this.state.prevCursor,this.state.prevCursor=0):(this.state.prevCursor=this.cursor,this.cursor=0),this.render()}first(){this.cursor=0,this.render()}last(){this.cursor=this.input.length-1,this.render()}next(){let e=this.initial!=null?String(this.initial):"";if(!e||!e.startsWith(this.input))return this.alert();this.input=this.initial,this.cursor=this.initial.length,this.render()}prev(){if(!this.input)return this.alert();this.reset()}backward(){return this.left()}forward(){return this.right()}right(){return this.cursor>=this.input.length?this.alert():(this.moveCursor(1),this.render())}left(){return this.cursor<=0?this.alert():(this.moveCursor(-1),this.render())}isValue(e){return!!e}async format(e=this.value){let r=await this.resolve(this.initial,this.state);return this.state.submitted?this.styles.submitted(e||r):xft(this,{input:e,initial:r,pos:this.cursor})}async render(){let e=this.state.size,r=await this.prefix(),o=await this.separator(),a=await this.message(),n=[r,a,o].filter(Boolean).join(" ");this.state.prompt=n;let u=await this.header(),A=await this.format(),p=await this.error()||await this.hint(),h=await this.footer();p&&!A.includes(p)&&(A+=" "+p),n+=" "+A,this.clear(e),this.write([u,n,h].filter(Boolean).join(`
+`)),this.restore()}};Jhe.exports=r8});var Xhe=_((d8t,zhe)=>{"use strict";var Qft=t=>t.filter((e,r)=>t.lastIndexOf(e)===r),ck=t=>Qft(t).filter(Boolean);zhe.exports=(t,e={},r="")=>{let{past:o=[],present:a=""}=e,n,u;switch(t){case"prev":case"undo":return n=o.slice(0,o.length-1),u=o[o.length-1]||"",{past:ck([r,...n]),present:u};case"next":case"redo":return n=o.slice(1),u=o[0]||"",{past:ck([...n,r]),present:u};case"save":return{past:ck([...o,r]),present:""};case"remove":return u=ck(o.filter(A=>A!==r)),a="",u.length&&(a=u.pop()),{past:u,present:a};default:throw new Error(`Invalid action: "${t}"`)}}});var i8=_((m8t,$he)=>{"use strict";var Fft=Wd(),Zhe=Xhe(),n8=class extends Fft{constructor(e){super(e);let r=this.options.history;if(r&&r.store){let o=r.values||this.initial;this.autosave=!!r.autosave,this.store=r.store,this.data=this.store.get("values")||{past:[],present:o},this.initial=this.data.present||this.data.past[this.data.past.length-1]}}completion(e){return this.store?(this.data=Zhe(e,this.data,this.input),this.data.present?(this.input=this.data.present,this.cursor=this.input.length,this.render()):this.alert()):this.alert()}altUp(){return this.completion("prev")}altDown(){return this.completion("next")}prev(){return this.save(),super.prev()}save(){!this.store||(this.data=Zhe("save",this.data,this.input),this.store.set("values",this.data))}submit(){return this.store&&this.autosave===!0&&this.save(),super.submit()}};$he.exports=n8});var t0e=_((y8t,e0e)=>{"use strict";var Rft=Wd(),s8=class extends Rft{format(){return""}};e0e.exports=s8});var n0e=_((E8t,r0e)=>{"use strict";var Tft=Wd(),o8=class extends Tft{constructor(e={}){super(e),this.sep=this.options.separator||/, */,this.initial=e.initial||""}split(e=this.value){return e?String(e).split(this.sep):[]}format(){let e=this.state.submitted?this.styles.primary:r=>r;return this.list.map(e).join(", ")}async submit(e){let r=this.state.error||await this.validate(this.list,this.state);return r!==!0?(this.state.error=r,super.submit()):(this.value=this.list,super.submit())}get list(){return this.split()}};r0e.exports=o8});var s0e=_((C8t,i0e)=>{"use strict";var Nft=bh(),a8=class extends Nft{constructor(e){super({...e,multiple:!0})}};i0e.exports=a8});var c8=_((w8t,o0e)=>{"use strict";var Lft=Wd(),l8=class extends Lft{constructor(e={}){super({style:"number",...e}),this.min=this.isValue(e.min)?this.toNumber(e.min):-1/0,this.max=this.isValue(e.max)?this.toNumber(e.max):1/0,this.delay=e.delay!=null?e.delay:1e3,this.float=e.float!==!1,this.round=e.round===!0||e.float===!1,this.major=e.major||10,this.minor=e.minor||1,this.initial=e.initial!=null?e.initial:"",this.input=String(this.initial),this.cursor=this.input.length,this.cursorShow()}append(e){return!/[-+.]/.test(e)||e==="."&&this.input.includes(".")?this.alert("invalid number"):super.append(e)}number(e){return super.append(e)}next(){return this.input&&this.input!==this.initial?this.alert():this.isValue(this.initial)?(this.input=this.initial,this.cursor=String(this.initial).length,this.render()):this.alert()}up(e){let r=e||this.minor,o=this.toNumber(this.input);return o>this.max+r?this.alert():(this.input=`${o+r}`,this.render())}down(e){let r=e||this.minor,o=this.toNumber(this.input);return o<this.min-r?this.alert():(this.input=`${o-r}`,this.render())}shiftDown(){return this.down(this.major)}shiftUp(){return this.up(this.major)}format(e=this.input){return typeof this.options.format=="function"?this.options.format.call(this,e):this.styles.info(e)}toNumber(e=""){return this.float?+e:Math.round(+e)}isValue(e){return/^[-+]?[0-9]+((\.)|(\.[0-9]+))?$/.test(e)}submit(){let e=[this.input,this.initial].find(r=>this.isValue(r));return this.value=this.toNumber(e||0),super.submit()}};o0e.exports=l8});var l0e=_((I8t,a0e)=>{a0e.exports=c8()});var u0e=_((B8t,c0e)=>{"use strict";var Oft=Wd(),u8=class extends Oft{constructor(e){super(e),this.cursorShow()}format(e=this.input){return this.keypressed?(this.state.submitted?this.styles.primary:this.styles.muted)(this.symbols.asterisk.repeat(e.length)):""}};c0e.exports=u8});var p0e=_((v8t,f0e)=>{"use strict";var Mft=Kc(),Uft=u2(),A0e=No(),A8=class extends Uft{constructor(e={}){super(e),this.widths=[].concat(e.messageWidth||50),this.align=[].concat(e.align||"left"),this.linebreak=e.linebreak||!1,this.edgeLength=e.edgeLength||3,this.newline=e.newline||`
+   `;let r=e.startNumber||1;typeof this.scale=="number"&&(this.scaleKey=!1,this.scale=Array(this.scale).fill(0).map((o,a)=>({name:a+r})))}async reset(){return this.tableized=!1,await super.reset(),this.render()}tableize(){if(this.tableized===!0)return;this.tableized=!0;let e=0;for(let r of this.choices){e=Math.max(e,r.message.length),r.scaleIndex=r.initial||2,r.scale=[];for(let o=0;o<this.scale.length;o++)r.scale.push({index:o})}this.widths[0]=Math.min(this.widths[0],e+3)}async dispatch(e,r){if(this.multiple)return this[r.name]?await this[r.name](e,r):await super.dispatch(e,r);this.alert()}heading(e,r,o){return this.styles.strong(e)}separator(){return this.styles.muted(this.symbols.ellipsis)}right(){let e=this.focused;return e.scaleIndex>=this.scale.length-1?this.alert():(e.scaleIndex++,this.render())}left(){let e=this.focused;return e.scaleIndex<=0?this.alert():(e.scaleIndex--,this.render())}indent(){return""}format(){return this.state.submitted?this.choices.map(r=>this.styles.info(r.index)).join(", "):""}pointer(){return""}renderScaleKey(){return this.scaleKey===!1||this.state.submitted?"":["",...this.scale.map(o=>`   ${o.name} - ${o.message}`)].map(o=>this.styles.muted(o)).join(`
+`)}renderScaleHeading(e){let r=this.scale.map(p=>p.name);typeof this.options.renderScaleHeading=="function"&&(r=this.options.renderScaleHeading.call(this,e));let o=this.scaleLength-r.join("").length,a=Math.round(o/(r.length-1)),u=r.map(p=>this.styles.strong(p)).join(" ".repeat(a)),A=" ".repeat(this.widths[0]);return this.margin[3]+A+this.margin[1]+u}scaleIndicator(e,r,o){if(typeof this.options.scaleIndicator=="function")return this.options.scaleIndicator.call(this,e,r,o);let a=e.scaleIndex===r.index;return r.disabled?this.styles.hint(this.symbols.radio.disabled):a?this.styles.success(this.symbols.radio.on):this.symbols.radio.off}renderScale(e,r){let o=e.scale.map(n=>this.scaleIndicator(e,n,r)),a=this.term==="Hyper"?"":" ";return o.join(a+this.symbols.line.repeat(this.edgeLength))}async renderChoice(e,r){await this.onChoice(e,r);let o=this.index===r,a=await this.pointer(e,r),n=await e.hint;n&&!A0e.hasColor(n)&&(n=this.styles.muted(n));let u=C=>this.margin[3]+C.replace(/\s+$/,"").padEnd(this.widths[0]," "),A=this.newline,p=this.indent(e),h=await this.resolve(e.message,this.state,e,r),E=await this.renderScale(e,r),I=this.margin[1]+this.margin[3];this.scaleLength=Mft.unstyle(E).length,this.widths[0]=Math.min(this.widths[0],this.width-this.scaleLength-I.length);let x=A0e.wordWrap(h,{width:this.widths[0],newline:A}).split(`
+`).map(C=>u(C)+this.margin[1]);return o&&(E=this.styles.info(E),x=x.map(C=>this.styles.info(C))),x[0]+=E,this.linebreak&&x.push(""),[p+a,x.join(`
+`)].filter(Boolean)}async renderChoices(){if(this.state.submitted)return"";this.tableize();let e=this.visible.map(async(a,n)=>await this.renderChoice(a,n)),r=await Promise.all(e),o=await this.renderScaleHeading();return this.margin[0]+[o,...r.map(a=>a.join(" "))].join(`
+`)}async render(){let{submitted:e,size:r}=this.state,o=await this.prefix(),a=await this.separator(),n=await this.message(),u="";this.options.promptLine!==!1&&(u=[o,n,a,""].join(" "),this.state.prompt=u);let A=await this.header(),p=await this.format(),h=await this.renderScaleKey(),E=await this.error()||await this.hint(),I=await this.renderChoices(),v=await this.footer(),x=this.emptyError;p&&(u+=p),E&&!u.includes(E)&&(u+=" "+E),e&&!p&&!I.trim()&&this.multiple&&x!=null&&(u+=this.styles.danger(x)),this.clear(r),this.write([A,u,h,I,v].filter(Boolean).join(`
+`)),this.state.submitted||this.write(this.margin[2]),this.restore()}submit(){this.value={};for(let e of this.choices)this.value[e.name]=e.scaleIndex;return this.base.submit.call(this)}};f0e.exports=A8});var d0e=_((D8t,g0e)=>{"use strict";var h0e=Kc(),_ft=(t="")=>typeof t=="string"?t.replace(/^['"]|['"]$/g,""):"",p8=class{constructor(e){this.name=e.key,this.field=e.field||{},this.value=_ft(e.initial||this.field.initial||""),this.message=e.message||this.name,this.cursor=0,this.input="",this.lines=[]}},Hft=async(t={},e={},r=o=>o)=>{let o=new Set,a=t.fields||[],n=t.template,u=[],A=[],p=[],h=1;typeof n=="function"&&(n=await n());let E=-1,I=()=>n[++E],v=()=>n[E+1],x=C=>{C.line=h,u.push(C)};for(x({type:"bos",value:""});E<n.length-1;){let C=I();if(/^[^\S\n ]$/.test(C)){x({type:"text",value:C});continue}if(C===`
+`){x({type:"newline",value:C}),h++;continue}if(C==="\\"){C+=I(),x({type:"text",value:C});continue}if((C==="$"||C==="#"||C==="{")&&v()==="{"){let L=I();C+=L;let U={type:"template",open:C,inner:"",close:"",value:C},J;for(;J=I();){if(J==="}"){v()==="}"&&(J+=I()),U.value+=J,U.close=J;break}J===":"?(U.initial="",U.key=U.inner):U.initial!==void 0&&(U.initial+=J),U.value+=J,U.inner+=J}U.template=U.open+(U.initial||U.inner)+U.close,U.key=U.key||U.inner,e.hasOwnProperty(U.key)&&(U.initial=e[U.key]),U=r(U),x(U),p.push(U.key),o.add(U.key);let te=A.find(ae=>ae.name===U.key);U.field=a.find(ae=>ae.name===U.key),te||(te=new p8(U),A.push(te)),te.lines.push(U.line-1);continue}let R=u[u.length-1];R.type==="text"&&R.line===h?R.value+=C:x({type:"text",value:C})}return x({type:"eos",value:""}),{input:n,tabstops:u,unique:o,keys:p,items:A}};g0e.exports=async t=>{let e=t.options,r=new Set(e.required===!0?[]:e.required||[]),o={...e.values,...e.initial},{tabstops:a,items:n,keys:u}=await Hft(e,o),A=f8("result",t,e),p=f8("format",t,e),h=f8("validate",t,e,!0),E=t.isValue.bind(t);return async(I={},v=!1)=>{let x=0;I.required=r,I.items=n,I.keys=u,I.output="";let C=async(J,te,ae,fe)=>{let ce=await h(J,te,ae,fe);return ce===!1?"Invalid field "+ae.name:ce};for(let J of a){let te=J.value,ae=J.key;if(J.type!=="template"){te&&(I.output+=te);continue}if(J.type==="template"){let fe=n.find(we=>we.name===ae);e.required===!0&&I.required.add(fe.name);let ce=[fe.input,I.values[fe.value],fe.value,te].find(E),he=(fe.field||{}).message||J.inner;if(v){let we=await C(I.values[ae],I,fe,x);if(we&&typeof we=="string"||we===!1){I.invalid.set(ae,we);continue}I.invalid.delete(ae);let g=await A(I.values[ae],I,fe,x);I.output+=h0e.unstyle(g);continue}fe.placeholder=!1;let Be=te;te=await p(te,I,fe,x),ce!==te?(I.values[ae]=ce,te=t.styles.typing(ce),I.missing.delete(he)):(I.values[ae]=void 0,ce=`<${he}>`,te=t.styles.primary(ce),fe.placeholder=!0,I.required.has(ae)&&I.missing.add(he)),I.missing.has(he)&&I.validating&&(te=t.styles.warning(ce)),I.invalid.has(ae)&&I.validating&&(te=t.styles.danger(ce)),x===I.index&&(Be!==te?te=t.styles.underline(te):te=t.styles.heading(h0e.unstyle(te))),x++}te&&(I.output+=te)}let R=I.output.split(`
+`).map(J=>" "+J),L=n.length,U=0;for(let J of n)I.invalid.has(J.name)&&J.lines.forEach(te=>{R[te][0]===" "&&(R[te]=I.styles.danger(I.symbols.bullet)+R[te].slice(1))}),t.isValue(I.values[J.name])&&U++;return I.completed=(U/L*100).toFixed(0),I.output=R.join(`
+`),I.output}};function f8(t,e,r,o){return(a,n,u,A)=>typeof u.field[t]=="function"?u.field[t].call(e,a,n,u,A):[o,a].find(p=>e.isValue(p))}});var y0e=_((S8t,m0e)=>{"use strict";var jft=Kc(),Gft=d0e(),qft=gC(),h8=class extends qft{constructor(e){super(e),this.cursorHide(),this.reset(!0)}async initialize(){this.interpolate=await Gft(this),await super.initialize()}async reset(e){this.state.keys=[],this.state.invalid=new Map,this.state.missing=new Set,this.state.completed=0,this.state.values={},e!==!0&&(await this.initialize(),await this.render())}moveCursor(e){let r=this.getItem();this.cursor+=e,r.cursor+=e}dispatch(e,r){if(!r.code&&!r.ctrl&&e!=null&&this.getItem()){this.append(e,r);return}this.alert()}append(e,r){let o=this.getItem(),a=o.input.slice(0,this.cursor),n=o.input.slice(this.cursor);this.input=o.input=`${a}${e}${n}`,this.moveCursor(1),this.render()}delete(){let e=this.getItem();if(this.cursor<=0||!e.input)return this.alert();let r=e.input.slice(this.cursor),o=e.input.slice(0,this.cursor-1);this.input=e.input=`${o}${r}`,this.moveCursor(-1),this.render()}increment(e){return e>=this.state.keys.length-1?0:e+1}decrement(e){return e<=0?this.state.keys.length-1:e-1}first(){this.state.index=0,this.render()}last(){this.state.index=this.state.keys.length-1,this.render()}right(){if(this.cursor>=this.input.length)return this.alert();this.moveCursor(1),this.render()}left(){if(this.cursor<=0)return this.alert();this.moveCursor(-1),this.render()}prev(){this.state.index=this.decrement(this.state.index),this.getItem(),this.render()}next(){this.state.index=this.increment(this.state.index),this.getItem(),this.render()}up(){this.prev()}down(){this.next()}format(e){let r=this.state.completed<100?this.styles.warning:this.styles.success;return this.state.submitted===!0&&this.state.completed!==100&&(r=this.styles.danger),r(`${this.state.completed}% completed`)}async render(){let{index:e,keys:r=[],submitted:o,size:a}=this.state,n=[this.options.newline,`
+`].find(J=>J!=null),u=await this.prefix(),A=await this.separator(),p=await this.message(),h=[u,p,A].filter(Boolean).join(" ");this.state.prompt=h;let E=await this.header(),I=await this.error()||"",v=await this.hint()||"",x=o?"":await this.interpolate(this.state),C=this.state.key=r[e]||"",R=await this.format(C),L=await this.footer();R&&(h+=" "+R),v&&!R&&this.state.completed===0&&(h+=" "+v),this.clear(a);let U=[E,h,x,L,I.trim()];this.write(U.filter(Boolean).join(n)),this.restore()}getItem(e){let{items:r,keys:o,index:a}=this.state,n=r.find(u=>u.name===o[a]);return n&&n.input!=null&&(this.input=n.input,this.cursor=n.cursor),n}async submit(){typeof this.interpolate!="function"&&await this.initialize(),await this.interpolate(this.state,!0);let{invalid:e,missing:r,output:o,values:a}=this.state;if(e.size){let A="";for(let[p,h]of e)A+=`Invalid ${p}: ${h}
+`;return this.state.error=A,super.submit()}if(r.size)return this.state.error="Required: "+[...r.keys()].join(", "),super.submit();let u=jft.unstyle(o).split(`
+`).map(A=>A.slice(1)).join(`
+`);return this.value={values:a,result:u},super.submit()}};m0e.exports=h8});var C0e=_((P8t,E0e)=>{"use strict";var Yft="(Use <shift>+<up/down> to sort)",Wft=bh(),g8=class extends Wft{constructor(e){super({...e,reorder:!1,sort:!0,multiple:!0}),this.state.hint=[this.options.hint,Yft].find(this.isValue.bind(this))}indicator(){return""}async renderChoice(e,r){let o=await super.renderChoice(e,r),a=this.symbols.identicalTo+" ",n=this.index===r&&this.sorting?this.styles.muted(a):"  ";return this.options.drag===!1&&(n=""),this.options.numbered===!0?n+`${r+1} - `+o:n+o}get selected(){return this.choices}submit(){return this.value=this.choices.map(e=>e.value),super.submit()}};E0e.exports=g8});var I0e=_((b8t,w0e)=>{"use strict";var Kft=u2(),d8=class extends Kft{constructor(e={}){if(super(e),this.emptyError=e.emptyError||"No items were selected",this.term=process.env.TERM_PROGRAM,!this.options.header){let r=["","4 - Strongly Agree","3 - Agree","2 - Neutral","1 - Disagree","0 - Strongly Disagree",""];r=r.map(o=>this.styles.muted(o)),this.state.header=r.join(`
+   `)}}async toChoices(...e){if(this.createdScales)return!1;this.createdScales=!0;let r=await super.toChoices(...e);for(let o of r)o.scale=Vft(5,this.options),o.scaleIdx=2;return r}dispatch(){this.alert()}space(){let e=this.focused,r=e.scale[e.scaleIdx],o=r.selected;return e.scale.forEach(a=>a.selected=!1),r.selected=!o,this.render()}indicator(){return""}pointer(){return""}separator(){return this.styles.muted(this.symbols.ellipsis)}right(){let e=this.focused;return e.scaleIdx>=e.scale.length-1?this.alert():(e.scaleIdx++,this.render())}left(){let e=this.focused;return e.scaleIdx<=0?this.alert():(e.scaleIdx--,this.render())}indent(){return"   "}async renderChoice(e,r){await this.onChoice(e,r);let o=this.index===r,a=this.term==="Hyper",n=a?9:8,u=a?"":" ",A=this.symbols.line.repeat(n),p=" ".repeat(n+(a?0:1)),h=te=>(te?this.styles.success("\u25C9"):"\u25EF")+u,E=r+1+".",I=o?this.styles.heading:this.styles.noop,v=await this.resolve(e.message,this.state,e,r),x=this.indent(e),C=x+e.scale.map((te,ae)=>h(ae===e.scaleIdx)).join(A),R=te=>te===e.scaleIdx?I(te):te,L=x+e.scale.map((te,ae)=>R(ae)).join(p),U=()=>[E,v].filter(Boolean).join(" "),J=()=>[U(),C,L," "].filter(Boolean).join(`
+`);return o&&(C=this.styles.cyan(C),L=this.styles.cyan(L)),J()}async renderChoices(){if(this.state.submitted)return"";let e=this.visible.map(async(o,a)=>await this.renderChoice(o,a)),r=await Promise.all(e);return r.length||r.push(this.styles.danger("No matching choices")),r.join(`
+`)}format(){return this.state.submitted?this.choices.map(r=>this.styles.info(r.scaleIdx)).join(", "):""}async render(){let{submitted:e,size:r}=this.state,o=await this.prefix(),a=await this.separator(),n=await this.message(),u=[o,n,a].filter(Boolean).join(" ");this.state.prompt=u;let A=await this.header(),p=await this.format(),h=await this.error()||await this.hint(),E=await this.renderChoices(),I=await this.footer();(p||!h)&&(u+=" "+p),h&&!u.includes(h)&&(u+=" "+h),e&&!p&&!E&&this.multiple&&this.type!=="form"&&(u+=this.styles.danger(this.emptyError)),this.clear(r),this.write([u,A,E,I].filter(Boolean).join(`
+`)),this.restore()}submit(){this.value={};for(let e of this.choices)this.value[e.name]=e.scaleIdx;return this.base.submit.call(this)}};function Vft(t,e={}){if(Array.isArray(e.scale))return e.scale.map(o=>({...o}));let r=[];for(let o=1;o<t+1;o++)r.push({i:o,selected:!1});return r}w0e.exports=d8});var v0e=_((x8t,B0e)=>{B0e.exports=i8()});var S0e=_((k8t,D0e)=>{"use strict";var Jft=lk(),m8=class extends Jft{async initialize(){await super.initialize(),this.value=this.initial=!!this.options.initial,this.disabled=this.options.disabled||"no",this.enabled=this.options.enabled||"yes",await this.render()}reset(){this.value=this.initial,this.render()}delete(){this.alert()}toggle(){this.value=!this.value,this.render()}enable(){if(this.value===!0)return this.alert();this.value=!0,this.render()}disable(){if(this.value===!1)return this.alert();this.value=!1,this.render()}up(){this.toggle()}down(){this.toggle()}right(){this.toggle()}left(){this.toggle()}next(){this.toggle()}prev(){this.toggle()}dispatch(e="",r){switch(e.toLowerCase()){case" ":return this.toggle();case"1":case"y":case"t":return this.enable();case"0":case"n":case"f":return this.disable();default:return this.alert()}}format(){let e=o=>this.styles.primary.underline(o);return[this.value?this.disabled:e(this.disabled),this.value?e(this.enabled):this.enabled].join(this.styles.muted(" / "))}async render(){let{size:e}=this.state,r=await this.header(),o=await this.prefix(),a=await this.separator(),n=await this.message(),u=await this.format(),A=await this.error()||await this.hint(),p=await this.footer(),h=[o,n,a,u].join(" ");this.state.prompt=h,A&&!h.includes(A)&&(h+=" "+A),this.clear(e),this.write([r,h,p].filter(Boolean).join(`
+`)),this.write(this.margin[2]),this.restore()}};D0e.exports=m8});var b0e=_((Q8t,P0e)=>{"use strict";var zft=bh(),y8=class extends zft{constructor(e){if(super(e),typeof this.options.correctChoice!="number"||this.options.correctChoice<0)throw new Error("Please specify the index of the correct answer from the list of choices")}async toChoices(e,r){let o=await super.toChoices(e,r);if(o.length<2)throw new Error("Please give at least two choices to the user");if(this.options.correctChoice>o.length)throw new Error("Please specify the index of the correct answer from the list of choices");return o}check(e){return e.index===this.options.correctChoice}async result(e){return{selectedAnswer:e,correctAnswer:this.options.choices[this.options.correctChoice].value,correct:await this.check(this.state)}}};P0e.exports=y8});var k0e=_(E8=>{"use strict";var x0e=No(),As=(t,e)=>{x0e.defineExport(E8,t,e),x0e.defineExport(E8,t.toLowerCase(),e)};As("AutoComplete",()=>Lhe());As("BasicAuth",()=>Ghe());As("Confirm",()=>Whe());As("Editable",()=>Vhe());As("Form",()=>ak());As("Input",()=>i8());As("Invisible",()=>t0e());As("List",()=>n0e());As("MultiSelect",()=>s0e());As("Numeral",()=>l0e());As("Password",()=>u0e());As("Scale",()=>p0e());As("Select",()=>bh());As("Snippet",()=>y0e());As("Sort",()=>C0e());As("Survey",()=>I0e());As("Text",()=>v0e());As("Toggle",()=>S0e());As("Quiz",()=>b0e())});var F0e=_((R8t,Q0e)=>{Q0e.exports={ArrayPrompt:u2(),AuthPrompt:Z_(),BooleanPrompt:lk(),NumberPrompt:c8(),StringPrompt:Wd()}});var f2=_((T8t,T0e)=>{"use strict";var R0e=ve("assert"),w8=ve("events"),xh=No(),Jc=class extends w8{constructor(e,r){super(),this.options=xh.merge({},e),this.answers={...r}}register(e,r){if(xh.isObject(e)){for(let a of Object.keys(e))this.register(a,e[a]);return this}R0e.equal(typeof r,"function","expected a function");let o=e.toLowerCase();return r.prototype instanceof this.Prompt?this.prompts[o]=r:this.prompts[o]=r(this.Prompt,this),this}async prompt(e=[]){for(let r of[].concat(e))try{typeof r=="function"&&(r=await r.call(this)),await this.ask(xh.merge({},this.options,r))}catch(o){return Promise.reject(o)}return this.answers}async ask(e){typeof e=="function"&&(e=await e.call(this));let r=xh.merge({},this.options,e),{type:o,name:a}=e,{set:n,get:u}=xh;if(typeof o=="function"&&(o=await o.call(this,e,this.answers)),!o)return this.answers[a];R0e(this.prompts[o],`Prompt "${o}" is not registered`);let A=new this.prompts[o](r),p=u(this.answers,a);A.state.answers=this.answers,A.enquirer=this,a&&A.on("submit",E=>{this.emit("answer",a,E,A),n(this.answers,a,E)});let h=A.emit.bind(A);return A.emit=(...E)=>(this.emit.call(this,...E),h(...E)),this.emit("prompt",A,this),r.autofill&&p!=null?(A.value=A.input=p,r.autofill==="show"&&await A.submit()):p=A.value=await A.run(),p}use(e){return e.call(this,this),this}set Prompt(e){this._Prompt=e}get Prompt(){return this._Prompt||this.constructor.Prompt}get prompts(){return this.constructor.prompts}static set Prompt(e){this._Prompt=e}static get Prompt(){return this._Prompt||gC()}static get prompts(){return k0e()}static get types(){return F0e()}static get prompt(){let e=(r,...o)=>{let a=new this(...o),n=a.emit.bind(a);return a.emit=(...u)=>(e.emit(...u),n(...u)),a.prompt(r)};return xh.mixinEmitter(e,new w8),e}};xh.mixinEmitter(Jc,new w8);var C8=Jc.prompts;for(let t of Object.keys(C8)){let e=t.toLowerCase(),r=o=>new C8[t](o).run();Jc.prompt[e]=r,Jc[e]=r,Jc[t]||Reflect.defineProperty(Jc,t,{get:()=>C8[t]})}var A2=t=>{xh.defineExport(Jc,t,()=>Jc.types[t])};A2("ArrayPrompt");A2("AuthPrompt");A2("BooleanPrompt");A2("NumberPrompt");A2("StringPrompt");T0e.exports=Jc});var d2=_((dHt,H0e)=>{var rpt=zx();function npt(t,e,r){var o=t==null?void 0:rpt(t,e);return o===void 0?r:o}H0e.exports=npt});var q0e=_((IHt,G0e)=>{function ipt(t,e){for(var r=-1,o=t==null?0:t.length;++r<o&&e(t[r],r,t)!==!1;);return t}G0e.exports=ipt});var W0e=_((BHt,Y0e)=>{var spt=dd(),opt=zS();function apt(t,e){return t&&spt(e,opt(e),t)}Y0e.exports=apt});var V0e=_((vHt,K0e)=>{var lpt=dd(),cpt=qy();function upt(t,e){return t&&lpt(e,cpt(e),t)}K0e.exports=upt});var z0e=_((DHt,J0e)=>{var Apt=dd(),fpt=qS();function ppt(t,e){return Apt(t,fpt(t),e)}J0e.exports=ppt});var P8=_((SHt,X0e)=>{var hpt=GS(),gpt=tP(),dpt=qS(),mpt=WN(),ypt=Object.getOwnPropertySymbols,Ept=ypt?function(t){for(var e=[];t;)hpt(e,dpt(t)),t=gpt(t);return e}:mpt;X0e.exports=Ept});var $0e=_((PHt,Z0e)=>{var Cpt=dd(),wpt=P8();function Ipt(t,e){return Cpt(t,wpt(t),e)}Z0e.exports=Ipt});var b8=_((bHt,ege)=>{var Bpt=YN(),vpt=P8(),Dpt=qy();function Spt(t){return Bpt(t,Dpt,vpt)}ege.exports=Spt});var rge=_((xHt,tge)=>{var Ppt=Object.prototype,bpt=Ppt.hasOwnProperty;function xpt(t){var e=t.length,r=new t.constructor(e);return e&&typeof t[0]=="string"&&bpt.call(t,"index")&&(r.index=t.index,r.input=t.input),r}tge.exports=xpt});var ige=_((kHt,nge)=>{var kpt=$S();function Qpt(t,e){var r=e?kpt(t.buffer):t.buffer;return new t.constructor(r,t.byteOffset,t.byteLength)}nge.exports=Qpt});var oge=_((QHt,sge)=>{var Fpt=/\w*$/;function Rpt(t){var e=new t.constructor(t.source,Fpt.exec(t));return e.lastIndex=t.lastIndex,e}sge.exports=Rpt});var Age=_((FHt,uge)=>{var age=pd(),lge=age?age.prototype:void 0,cge=lge?lge.valueOf:void 0;function Tpt(t){return cge?Object(cge.call(t)):{}}uge.exports=Tpt});var pge=_((RHt,fge)=>{var Npt=$S(),Lpt=ige(),Opt=oge(),Mpt=Age(),Upt=oL(),_pt="[object Boolean]",Hpt="[object Date]",jpt="[object Map]",Gpt="[object Number]",qpt="[object RegExp]",Ypt="[object Set]",Wpt="[object String]",Kpt="[object Symbol]",Vpt="[object ArrayBuffer]",Jpt="[object DataView]",zpt="[object Float32Array]",Xpt="[object Float64Array]",Zpt="[object Int8Array]",$pt="[object Int16Array]",eht="[object Int32Array]",tht="[object Uint8Array]",rht="[object Uint8ClampedArray]",nht="[object Uint16Array]",iht="[object Uint32Array]";function sht(t,e,r){var o=t.constructor;switch(e){case Vpt:return Npt(t);case _pt:case Hpt:return new o(+t);case Jpt:return Lpt(t,r);case zpt:case Xpt:case Zpt:case $pt:case eht:case tht:case rht:case nht:case iht:return Upt(t,r);case jpt:return new o;case Gpt:case Wpt:return new o(t);case qpt:return Opt(t);case Ypt:return new o;case Kpt:return Mpt(t)}}fge.exports=sht});var gge=_((THt,hge)=>{var oht=qI(),aht=Ju(),lht="[object Map]";function cht(t){return aht(t)&&oht(t)==lht}hge.exports=cht});var Ege=_((NHt,yge)=>{var uht=gge(),Aht=WS(),dge=KS(),mge=dge&&dge.isMap,fht=mge?Aht(mge):uht;yge.exports=fht});var wge=_((LHt,Cge)=>{var pht=qI(),hht=Ju(),ght="[object Set]";function dht(t){return hht(t)&&pht(t)==ght}Cge.exports=dht});var Dge=_((OHt,vge)=>{var mht=wge(),yht=WS(),Ige=KS(),Bge=Ige&&Ige.isSet,Eht=Bge?yht(Bge):mht;vge.exports=Eht});var x8=_((MHt,xge)=>{var Cht=HS(),wht=q0e(),Iht=rP(),Bht=W0e(),vht=V0e(),Dht=sL(),Sht=eP(),Pht=z0e(),bht=$0e(),xht=zN(),kht=b8(),Qht=qI(),Fht=rge(),Rht=pge(),Tht=aL(),Nht=Hl(),Lht=UI(),Oht=Ege(),Mht=il(),Uht=Dge(),_ht=zS(),Hht=qy(),jht=1,Ght=2,qht=4,Sge="[object Arguments]",Yht="[object Array]",Wht="[object Boolean]",Kht="[object Date]",Vht="[object Error]",Pge="[object Function]",Jht="[object GeneratorFunction]",zht="[object Map]",Xht="[object Number]",bge="[object Object]",Zht="[object RegExp]",$ht="[object Set]",e0t="[object String]",t0t="[object Symbol]",r0t="[object WeakMap]",n0t="[object ArrayBuffer]",i0t="[object DataView]",s0t="[object Float32Array]",o0t="[object Float64Array]",a0t="[object Int8Array]",l0t="[object Int16Array]",c0t="[object Int32Array]",u0t="[object Uint8Array]",A0t="[object Uint8ClampedArray]",f0t="[object Uint16Array]",p0t="[object Uint32Array]",ri={};ri[Sge]=ri[Yht]=ri[n0t]=ri[i0t]=ri[Wht]=ri[Kht]=ri[s0t]=ri[o0t]=ri[a0t]=ri[l0t]=ri[c0t]=ri[zht]=ri[Xht]=ri[bge]=ri[Zht]=ri[$ht]=ri[e0t]=ri[t0t]=ri[u0t]=ri[A0t]=ri[f0t]=ri[p0t]=!0;ri[Vht]=ri[Pge]=ri[r0t]=!1;function Ak(t,e,r,o,a,n){var u,A=e&jht,p=e&Ght,h=e&qht;if(r&&(u=a?r(t,o,a,n):r(t)),u!==void 0)return u;if(!Mht(t))return t;var E=Nht(t);if(E){if(u=Fht(t),!A)return Sht(t,u)}else{var I=Qht(t),v=I==Pge||I==Jht;if(Lht(t))return Dht(t,A);if(I==bge||I==Sge||v&&!a){if(u=p||v?{}:Tht(t),!A)return p?bht(t,vht(u,t)):Pht(t,Bht(u,t))}else{if(!ri[I])return a?t:{};u=Rht(t,I,A)}}n||(n=new Cht);var x=n.get(t);if(x)return x;n.set(t,u),Uht(t)?t.forEach(function(L){u.add(Ak(L,e,r,L,t,n))}):Oht(t)&&t.forEach(function(L,U){u.set(U,Ak(L,e,r,U,t,n))});var C=h?p?kht:xht:p?Hht:_ht,R=E?void 0:C(t);return wht(R||t,function(L,U){R&&(U=L,L=t[U]),Iht(u,U,Ak(L,e,r,U,t,n))}),u}xge.exports=Ak});var k8=_((UHt,kge)=>{var h0t=x8(),g0t=1,d0t=4;function m0t(t){return h0t(t,g0t|d0t)}kge.exports=m0t});var Q8=_((_Ht,Qge)=>{var y0t=I_();function E0t(t,e,r){return t==null?t:y0t(t,e,r)}Qge.exports=E0t});var Lge=_((WHt,Nge)=>{var C0t=Object.prototype,w0t=C0t.hasOwnProperty;function I0t(t,e){return t!=null&&w0t.call(t,e)}Nge.exports=I0t});var Mge=_((KHt,Oge)=>{var B0t=Lge(),v0t=B_();function D0t(t,e){return t!=null&&v0t(t,e,B0t)}Oge.exports=D0t});var _ge=_((VHt,Uge)=>{function S0t(t){var e=t==null?0:t.length;return e?t[e-1]:void 0}Uge.exports=S0t});var jge=_((JHt,Hge)=>{var P0t=zx(),b0t=pU();function x0t(t,e){return e.length<2?t:P0t(t,b0t(e,0,-1))}Hge.exports=x0t});var R8=_((zHt,Gge)=>{var k0t=Gd(),Q0t=_ge(),F0t=jge(),R0t=lC();function T0t(t,e){return e=k0t(e,t),t=F0t(t,e),t==null||delete t[R0t(Q0t(e))]}Gge.exports=T0t});var T8=_((XHt,qge)=>{var N0t=R8();function L0t(t,e){return t==null?!0:N0t(t,e)}qge.exports=L0t});var Jge=_((S6t,U0t)=>{U0t.exports={name:"@yarnpkg/cli",version:"4.1.0",license:"BSD-2-Clause",main:"./sources/index.ts",exports:{".":"./sources/index.ts","./polyfills":"./sources/polyfills.ts","./package.json":"./package.json"},dependencies:{"@yarnpkg/core":"workspace:^","@yarnpkg/fslib":"workspace:^","@yarnpkg/libzip":"workspace:^","@yarnpkg/parsers":"workspace:^","@yarnpkg/plugin-compat":"workspace:^","@yarnpkg/plugin-constraints":"workspace:^","@yarnpkg/plugin-dlx":"workspace:^","@yarnpkg/plugin-essentials":"workspace:^","@yarnpkg/plugin-exec":"workspace:^","@yarnpkg/plugin-file":"workspace:^","@yarnpkg/plugin-git":"workspace:^","@yarnpkg/plugin-github":"workspace:^","@yarnpkg/plugin-http":"workspace:^","@yarnpkg/plugin-init":"workspace:^","@yarnpkg/plugin-interactive-tools":"workspace:^","@yarnpkg/plugin-link":"workspace:^","@yarnpkg/plugin-nm":"workspace:^","@yarnpkg/plugin-npm":"workspace:^","@yarnpkg/plugin-npm-cli":"workspace:^","@yarnpkg/plugin-pack":"workspace:^","@yarnpkg/plugin-patch":"workspace:^","@yarnpkg/plugin-pnp":"workspace:^","@yarnpkg/plugin-pnpm":"workspace:^","@yarnpkg/plugin-stage":"workspace:^","@yarnpkg/plugin-typescript":"workspace:^","@yarnpkg/plugin-version":"workspace:^","@yarnpkg/plugin-workspace-tools":"workspace:^","@yarnpkg/shell":"workspace:^","ci-info":"^3.2.0",clipanion:"^4.0.0-rc.2",semver:"^7.1.2",tslib:"^2.4.0",typanion:"^3.14.0"},devDependencies:{"@types/semver":"^7.1.0","@yarnpkg/builder":"workspace:^","@yarnpkg/monorepo":"workspace:^","@yarnpkg/pnpify":"workspace:^"},peerDependencies:{"@yarnpkg/core":"workspace:^"},scripts:{postpack:"rm -rf lib",prepack:'run build:compile "$(pwd)"',"build:cli+hook":"run build:pnp:hook && builder build bundle","build:cli":"builder build bundle","run:cli":"builder run","update-local":"run build:cli --no-git-hash && rsync -a --delete bundles/ bin/"},publishConfig:{main:"./lib/index.js",bin:null,exports:{".":"./lib/index.js","./package.json":"./package.json"}},files:["/lib/**/*","!/lib/pluginConfiguration.*","!/lib/cli.*"],"@yarnpkg/builder":{bundles:{standard:["@yarnpkg/plugin-essentials","@yarnpkg/plugin-compat","@yarnpkg/plugin-constraints","@yarnpkg/plugin-dlx","@yarnpkg/plugin-exec","@yarnpkg/plugin-file","@yarnpkg/plugin-git","@yarnpkg/plugin-github","@yarnpkg/plugin-http","@yarnpkg/plugin-init","@yarnpkg/plugin-interactive-tools","@yarnpkg/plugin-link","@yarnpkg/plugin-nm","@yarnpkg/plugin-npm","@yarnpkg/plugin-npm-cli","@yarnpkg/plugin-pack","@yarnpkg/plugin-patch","@yarnpkg/plugin-pnp","@yarnpkg/plugin-pnpm","@yarnpkg/plugin-stage","@yarnpkg/plugin-typescript","@yarnpkg/plugin-version","@yarnpkg/plugin-workspace-tools"]}},repository:{type:"git",url:"ssh://git@github.com/yarnpkg/berry.git",directory:"packages/yarnpkg-cli"},engines:{node:">=18.12.0"}}});var G8=_((n9t,ade)=>{"use strict";ade.exports=function(e,r){r===!0&&(r=0);var o="";if(typeof e=="string")try{o=new URL(e).protocol}catch{}else e&&e.constructor===URL&&(o=e.protocol);var a=o.split(/\:|\+/).filter(Boolean);return typeof r=="number"?a[r]:a}});var cde=_((i9t,lde)=>{"use strict";var igt=G8();function sgt(t){var e={protocols:[],protocol:null,port:null,resource:"",host:"",user:"",password:"",pathname:"",hash:"",search:"",href:t,query:{},parse_failed:!1};try{var r=new URL(t);e.protocols=igt(r),e.protocol=e.protocols[0],e.port=r.port,e.resource=r.hostname,e.host=r.host,e.user=r.username||"",e.password=r.password||"",e.pathname=r.pathname,e.hash=r.hash.slice(1),e.search=r.search.slice(1),e.href=r.href,e.query=Object.fromEntries(r.searchParams)}catch{e.protocols=["file"],e.protocol=e.protocols[0],e.port="",e.resource="",e.user="",e.pathname="",e.hash="",e.search="",e.href=t,e.query={},e.parse_failed=!0}return e}lde.exports=sgt});var fde=_((s9t,Ade)=>{"use strict";var ogt=cde();function agt(t){return t&&typeof t=="object"&&"default"in t?t:{default:t}}var lgt=agt(ogt),cgt="text/plain",ugt="us-ascii",ude=(t,e)=>e.some(r=>r instanceof RegExp?r.test(t):r===t),Agt=(t,{stripHash:e})=>{let r=/^data:(?<type>[^,]*?),(?<data>[^#]*?)(?:#(?<hash>.*))?$/.exec(t);if(!r)throw new Error(`Invalid URL: ${t}`);let{type:o,data:a,hash:n}=r.groups,u=o.split(";");n=e?"":n;let A=!1;u[u.length-1]==="base64"&&(u.pop(),A=!0);let p=(u.shift()||"").toLowerCase(),E=[...u.map(I=>{let[v,x=""]=I.split("=").map(C=>C.trim());return v==="charset"&&(x=x.toLowerCase(),x===ugt)?"":`${v}${x?`=${x}`:""}`}).filter(Boolean)];return A&&E.push("base64"),(E.length>0||p&&p!==cgt)&&E.unshift(p),`data:${E.join(";")},${A?a.trim():a}${n?`#${n}`:""}`};function fgt(t,e){if(e={defaultProtocol:"http:",normalizeProtocol:!0,forceHttp:!1,forceHttps:!1,stripAuthentication:!0,stripHash:!1,stripTextFragment:!0,stripWWW:!0,removeQueryParameters:[/^utm_\w+/i],removeTrailingSlash:!0,removeSingleSlash:!0,removeDirectoryIndex:!1,sortQueryParameters:!0,...e},t=t.trim(),/^data:/i.test(t))return Agt(t,e);if(/^view-source:/i.test(t))throw new Error("`view-source:` is not supported as it is a non-standard protocol");let r=t.startsWith("//");!r&&/^\.*\//.test(t)||(t=t.replace(/^(?!(?:\w+:)?\/\/)|^\/\//,e.defaultProtocol));let a=new URL(t);if(e.forceHttp&&e.forceHttps)throw new Error("The `forceHttp` and `forceHttps` options cannot be used together");if(e.forceHttp&&a.protocol==="https:"&&(a.protocol="http:"),e.forceHttps&&a.protocol==="http:"&&(a.protocol="https:"),e.stripAuthentication&&(a.username="",a.password=""),e.stripHash?a.hash="":e.stripTextFragment&&(a.hash=a.hash.replace(/#?:~:text.*?$/i,"")),a.pathname){let u=/\b[a-z][a-z\d+\-.]{1,50}:\/\//g,A=0,p="";for(;;){let E=u.exec(a.pathname);if(!E)break;let I=E[0],v=E.index,x=a.pathname.slice(A,v);p+=x.replace(/\/{2,}/g,"/"),p+=I,A=v+I.length}let h=a.pathname.slice(A,a.pathname.length);p+=h.replace(/\/{2,}/g,"/"),a.pathname=p}if(a.pathname)try{a.pathname=decodeURI(a.pathname)}catch{}if(e.removeDirectoryIndex===!0&&(e.removeDirectoryIndex=[/^index\.[a-z]+$/]),Array.isArray(e.removeDirectoryIndex)&&e.removeDirectoryIndex.length>0){let u=a.pathname.split("/"),A=u[u.length-1];ude(A,e.removeDirectoryIndex)&&(u=u.slice(0,-1),a.pathname=u.slice(1).join("/")+"/")}if(a.hostname&&(a.hostname=a.hostname.replace(/\.$/,""),e.stripWWW&&/^www\.(?!www\.)[a-z\-\d]{1,63}\.[a-z.\-\d]{2,63}$/.test(a.hostname)&&(a.hostname=a.hostname.replace(/^www\./,""))),Array.isArray(e.removeQueryParameters))for(let u of[...a.searchParams.keys()])ude(u,e.removeQueryParameters)&&a.searchParams.delete(u);if(e.removeQueryParameters===!0&&(a.search=""),e.sortQueryParameters){a.searchParams.sort();try{a.search=decodeURIComponent(a.search)}catch{}}e.removeTrailingSlash&&(a.pathname=a.pathname.replace(/\/$/,""));let n=t;return t=a.toString(),!e.removeSingleSlash&&a.pathname==="/"&&!n.endsWith("/")&&a.hash===""&&(t=t.replace(/\/$/,"")),(e.removeTrailingSlash||a.pathname==="/")&&a.hash===""&&e.removeSingleSlash&&(t=t.replace(/\/$/,"")),r&&!e.normalizeProtocol&&(t=t.replace(/^http:\/\//,"//")),e.stripProtocol&&(t=t.replace(/^(?:https?:)?\/\//,"")),t}var q8=(t,e=!1)=>{let r=/^(?:([a-z_][a-z0-9_-]{0,31})@|https?:\/\/)([\w\.\-@]+)[\/:]([\~,\.\w,\-,\_,\/]+?(?:\.git|\/)?)$/,o=n=>{let u=new Error(n);throw u.subject_url=t,u};(typeof t!="string"||!t.trim())&&o("Invalid url."),t.length>q8.MAX_INPUT_LENGTH&&o("Input exceeds maximum length. If needed, change the value of parseUrl.MAX_INPUT_LENGTH."),e&&(typeof e!="object"&&(e={stripHash:!1}),t=fgt(t,e));let a=lgt.default(t);if(a.parse_failed){let n=a.href.match(r);n?(a.protocols=["ssh"],a.protocol="ssh",a.resource=n[2],a.host=n[2],a.user=n[1],a.pathname=`/${n[3]}`,a.parse_failed=!1):o("URL parsing failed.")}return a};q8.MAX_INPUT_LENGTH=2048;Ade.exports=q8});var gde=_((o9t,hde)=>{"use strict";var pgt=G8();function pde(t){if(Array.isArray(t))return t.indexOf("ssh")!==-1||t.indexOf("rsync")!==-1;if(typeof t!="string")return!1;var e=pgt(t);if(t=t.substring(t.indexOf("://")+3),pde(e))return!0;var r=new RegExp(".([a-zA-Z\\d]+):(\\d+)/");return!t.match(r)&&t.indexOf("@")<t.indexOf(":")}hde.exports=pde});var yde=_((a9t,mde)=>{"use strict";var hgt=fde(),dde=gde();function ggt(t){var e=hgt(t);return e.token="",e.password==="x-oauth-basic"?e.token=e.user:e.user==="x-token-auth"&&(e.token=e.password),dde(e.protocols)||e.protocols.length===0&&dde(t)?e.protocol="ssh":e.protocols.length?e.protocol=e.protocols[0]:(e.protocol="file",e.protocols=["file"]),e.href=e.href.replace(/\/$/,""),e}mde.exports=ggt});var Cde=_((l9t,Ede)=>{"use strict";var dgt=yde();function Y8(t){if(typeof t!="string")throw new Error("The url must be a string.");var e=/^([a-z\d-]{1,39})\/([-\.\w]{1,100})$/i;e.test(t)&&(t="https://github.com/"+t);var r=dgt(t),o=r.resource.split("."),a=null;switch(r.toString=function(L){return Y8.stringify(this,L)},r.source=o.length>2?o.slice(1-o.length).join("."):r.source=r.resource,r.git_suffix=/\.git$/.test(r.pathname),r.name=decodeURIComponent((r.pathname||r.href).replace(/(^\/)|(\/$)/g,"").replace(/\.git$/,"")),r.owner=decodeURIComponent(r.user),r.source){case"git.cloudforge.com":r.owner=r.user,r.organization=o[0],r.source="cloudforge.com";break;case"visualstudio.com":if(r.resource==="vs-ssh.visualstudio.com"){a=r.name.split("/"),a.length===4&&(r.organization=a[1],r.owner=a[2],r.name=a[3],r.full_name=a[2]+"/"+a[3]);break}else{a=r.name.split("/"),a.length===2?(r.owner=a[1],r.name=a[1],r.full_name="_git/"+r.name):a.length===3?(r.name=a[2],a[0]==="DefaultCollection"?(r.owner=a[2],r.organization=a[0],r.full_name=r.organization+"/_git/"+r.name):(r.owner=a[0],r.full_name=r.owner+"/_git/"+r.name)):a.length===4&&(r.organization=a[0],r.owner=a[1],r.name=a[3],r.full_name=r.organization+"/"+r.owner+"/_git/"+r.name);break}case"dev.azure.com":case"azure.com":if(r.resource==="ssh.dev.azure.com"){a=r.name.split("/"),a.length===4&&(r.organization=a[1],r.owner=a[2],r.name=a[3]);break}else{a=r.name.split("/"),a.length===5?(r.organization=a[0],r.owner=a[1],r.name=a[4],r.full_name="_git/"+r.name):a.length===3?(r.name=a[2],a[0]==="DefaultCollection"?(r.owner=a[2],r.organization=a[0],r.full_name=r.organization+"/_git/"+r.name):(r.owner=a[0],r.full_name=r.owner+"/_git/"+r.name)):a.length===4&&(r.organization=a[0],r.owner=a[1],r.name=a[3],r.full_name=r.organization+"/"+r.owner+"/_git/"+r.name),r.query&&r.query.path&&(r.filepath=r.query.path.replace(/^\/+/g,"")),r.query&&r.query.version&&(r.ref=r.query.version.replace(/^GB/,""));break}default:a=r.name.split("/");var n=a.length-1;if(a.length>=2){var u=a.indexOf("-",2),A=a.indexOf("blob",2),p=a.indexOf("tree",2),h=a.indexOf("commit",2),E=a.indexOf("src",2),I=a.indexOf("raw",2),v=a.indexOf("edit",2);n=u>0?u-1:A>0?A-1:p>0?p-1:h>0?h-1:E>0?E-1:I>0?I-1:v>0?v-1:n,r.owner=a.slice(0,n).join("/"),r.name=a[n],h&&(r.commit=a[n+2])}r.ref="",r.filepathtype="",r.filepath="";var x=a.length>n&&a[n+1]==="-"?n+1:n;a.length>x+2&&["raw","src","blob","tree","edit"].indexOf(a[x+1])>=0&&(r.filepathtype=a[x+1],r.ref=a[x+2],a.length>x+3&&(r.filepath=a.slice(x+3).join("/"))),r.organization=r.owner;break}r.full_name||(r.full_name=r.owner,r.name&&(r.full_name&&(r.full_name+="/"),r.full_name+=r.name)),r.owner.startsWith("scm/")&&(r.source="bitbucket-server",r.owner=r.owner.replace("scm/",""),r.organization=r.owner,r.full_name=r.owner+"/"+r.name);var C=/(projects|users)\/(.*?)\/repos\/(.*?)((\/.*$)|$)/,R=C.exec(r.pathname);return R!=null&&(r.source="bitbucket-server",R[1]==="users"?r.owner="~"+R[2]:r.owner=R[2],r.organization=r.owner,r.name=R[3],a=R[4].split("/"),a.length>1&&(["raw","browse"].indexOf(a[1])>=0?(r.filepathtype=a[1],a.length>2&&(r.filepath=a.slice(2).join("/"))):a[1]==="commits"&&a.length>2&&(r.commit=a[2])),r.full_name=r.owner+"/"+r.name,r.query.at?r.ref=r.query.at:r.ref=""),r}Y8.stringify=function(t,e){e=e||(t.protocols&&t.protocols.length?t.protocols.join("+"):t.protocol);var r=t.port?":"+t.port:"",o=t.user||"git",a=t.git_suffix?".git":"";switch(e){case"ssh":return r?"ssh://"+o+"@"+t.resource+r+"/"+t.full_name+a:o+"@"+t.resource+":"+t.full_name+a;case"git+ssh":case"ssh+git":case"ftp":case"ftps":return e+"://"+o+"@"+t.resource+r+"/"+t.full_name+a;case"http":case"https":var n=t.token?mgt(t):t.user&&(t.protocols.includes("http")||t.protocols.includes("https"))?t.user+"@":"";return e+"://"+n+t.resource+r+"/"+ygt(t)+a;default:return t.href}};function mgt(t){switch(t.source){case"bitbucket.org":return"x-token-auth:"+t.token+"@";default:return t.token+"@"}}function ygt(t){switch(t.source){case"bitbucket-server":return"scm/"+t.full_name;default:return""+t.full_name}}Ede.exports=Y8});var Lde=_((H5t,Nde)=>{var xgt=Hb(),kgt=eP(),Qgt=Hl(),Fgt=pE(),Rgt=w_(),Tgt=lC(),Ngt=N1();function Lgt(t){return Qgt(t)?xgt(t,Tgt):Fgt(t)?[t]:kgt(Rgt(Ngt(t)))}Nde.exports=Lgt});function _gt(t,e){return e===1&&Ugt.has(t[0])}function B2(t){let e=Array.isArray(t)?t:(0,Ude.default)(t);return e.map((o,a)=>Ogt.test(o)?`[${o}]`:Mgt.test(o)&&!_gt(e,a)?`.${o}`:`[${JSON.stringify(o)}]`).join("").replace(/^\./,"")}function Hgt(t,e){let r=[];if(e.methodName!==null&&r.push(de.pretty(t,e.methodName,de.Type.CODE)),e.file!==null){let o=[];o.push(de.pretty(t,e.file,de.Type.PATH)),e.line!==null&&(o.push(de.pretty(t,e.line,de.Type.NUMBER)),e.column!==null&&o.push(de.pretty(t,e.column,de.Type.NUMBER))),r.push(`(${o.join(de.pretty(t,":","grey"))})`)}return r.join(" ")}function gk(t,{manifestUpdates:e,reportedErrors:r},{fix:o}={}){let a=new Map,n=new Map,u=[...r.keys()].map(A=>[A,new Map]);for(let[A,p]of[...u,...e]){let h=r.get(A)?.map(x=>({text:x,fixable:!1}))??[],E=!1,I=t.getWorkspaceByCwd(A),v=I.manifest.exportTo({});for(let[x,C]of p){if(C.size>1){let R=[...C].map(([L,U])=>{let J=de.pretty(t.configuration,L,de.Type.INSPECT),te=U.size>0?Hgt(t.configuration,U.values().next().value):null;return te!==null?`
+${J} at ${te}`:`
+${J}`}).join("");h.push({text:`Conflict detected in constraint targeting ${de.pretty(t.configuration,x,de.Type.CODE)}; conflicting values are:${R}`,fixable:!1})}else{let[[R]]=C,L=(0,Ode.default)(v,x);if(JSON.stringify(L)===JSON.stringify(R))continue;if(!o){let U=typeof L>"u"?`Missing field ${de.pretty(t.configuration,x,de.Type.CODE)}; expected ${de.pretty(t.configuration,R,de.Type.INSPECT)}`:typeof R>"u"?`Extraneous field ${de.pretty(t.configuration,x,de.Type.CODE)} currently set to ${de.pretty(t.configuration,L,de.Type.INSPECT)}`:`Invalid field ${de.pretty(t.configuration,x,de.Type.CODE)}; expected ${de.pretty(t.configuration,R,de.Type.INSPECT)}, found ${de.pretty(t.configuration,L,de.Type.INSPECT)}`;h.push({text:U,fixable:!0});continue}typeof R>"u"?(0,_de.default)(v,x):(0,Mde.default)(v,x,R),E=!0}E&&a.set(I,v)}h.length>0&&n.set(I,h)}return{changedWorkspaces:a,remainingErrors:n}}function Hde(t,{configuration:e}){let r={children:[]};for(let[o,a]of t){let n=[];for(let A of a){let p=A.text.split(/\n/);A.fixable&&(p[0]=`${de.pretty(e,"\u2699","gray")} ${p[0]}`),n.push({value:de.tuple(de.Type.NO_HINT,p[0]),children:p.slice(1).map(h=>({value:de.tuple(de.Type.NO_HINT,h)}))})}let u={value:de.tuple(de.Type.LOCATOR,o.anchoredLocator),children:_e.sortMap(n,A=>A.value[1])};r.children.push(u)}return r.children=_e.sortMap(r.children,o=>o.value[1]),r}var Ode,Mde,Ude,_de,wC,Ogt,Mgt,Ugt,v2=Et(()=>{Ye();Ode=$e(d2()),Mde=$e(Q8()),Ude=$e(Lde()),_de=$e(T8()),wC=class{constructor(e){this.indexedFields=e;this.items=[];this.indexes={};this.clear()}clear(){this.items=[];for(let e of this.indexedFields)this.indexes[e]=new Map}insert(e){this.items.push(e);for(let r of this.indexedFields){let o=Object.hasOwn(e,r)?e[r]:void 0;if(typeof o>"u")continue;_e.getArrayWithDefault(this.indexes[r],o).push(e)}return e}find(e){if(typeof e>"u")return this.items;let r=Object.entries(e);if(r.length===0)return this.items;let o=[],a;for(let[u,A]of r){let p=u,h=Object.hasOwn(this.indexes,p)?this.indexes[p]:void 0;if(typeof h>"u"){o.push([p,A]);continue}let E=new Set(h.get(A)??[]);if(E.size===0)return[];if(typeof a>"u")a=E;else for(let I of a)E.has(I)||a.delete(I);if(a.size===0)break}let n=[...a??[]];return o.length>0&&(n=n.filter(u=>{for(let[A,p]of o)if(!(typeof p<"u"?Object.hasOwn(u,A)&&u[A]===p:Object.hasOwn(u,A)===!1))return!1;return!0})),n}},Ogt=/^[0-9]+$/,Mgt=/^[a-zA-Z0-9_]+$/,Ugt=new Set(["scripts",...Ot.allDependencies])});var jde=_(($5t,sH)=>{var jgt;(function(t){var e=function(){return{"append/2":[new t.type.Rule(new t.type.Term("append",[new t.type.Var("X"),new t.type.Var("L")]),new t.type.Term("foldl",[new t.type.Term("append",[]),new t.type.Var("X"),new t.type.Term("[]",[]),new t.type.Var("L")]))],"append/3":[new t.type.Rule(new t.type.Term("append",[new t.type.Term("[]",[]),new t.type.Var("X"),new t.type.Var("X")]),null),new t.type.Rule(new t.type.Term("append",[new t.type.Term(".",[new t.type.Var("H"),new t.type.Var("T")]),new t.type.Var("X"),new t.type.Term(".",[new t.type.Var("H"),new t.type.Var("S")])]),new t.type.Term("append",[new t.type.Var("T"),new t.type.Var("X"),new t.type.Var("S")]))],"member/2":[new t.type.Rule(new t.type.Term("member",[new t.type.Var("X"),new t.type.Term(".",[new t.type.Var("X"),new t.type.Var("_")])]),null),new t.type.Rule(new t.type.Term("member",[new t.type.Var("X"),new t.type.Term(".",[new t.type.Var("_"),new t.type.Var("Xs")])]),new t.type.Term("member",[new t.type.Var("X"),new t.type.Var("Xs")]))],"permutation/2":[new t.type.Rule(new t.type.Term("permutation",[new t.type.Term("[]",[]),new t.type.Term("[]",[])]),null),new t.type.Rule(new t.type.Term("permutation",[new t.type.Term(".",[new t.type.Var("H"),new t.type.Var("T")]),new t.type.Var("S")]),new t.type.Term(",",[new t.type.Term("permutation",[new t.type.Var("T"),new t.type.Var("P")]),new t.type.Term(",",[new t.type.Term("append",[new t.type.Var("X"),new t.type.Var("Y"),new t.type.Var("P")]),new t.type.Term("append",[new t.type.Var("X"),new t.type.Term(".",[new t.type.Var("H"),new t.type.Var("Y")]),new t.type.Var("S")])])]))],"maplist/2":[new t.type.Rule(new t.type.Term("maplist",[new t.type.Var("_"),new t.type.Term("[]",[])]),null),new t.type.Rule(new t.type.Term("maplist",[new t.type.Var("P"),new t.type.Term(".",[new t.type.Var("X"),new t.type.Var("Xs")])]),new t.type.Term(",",[new t.type.Term("call",[new t.type.Var("P"),new t.type.Var("X")]),new t.type.Term("maplist",[new t.type.Var("P"),new t.type.Var("Xs")])]))],"maplist/3":[new t.type.Rule(new t.type.Term("maplist",[new t.type.Var("_"),new t.type.Term("[]",[]),new t.type.Term("[]",[])]),null),new t.type.Rule(new t.type.Term("maplist",[new t.type.Var("P"),new t.type.Term(".",[new t.type.Var("A"),new t.type.Var("As")]),new t.type.Term(".",[new t.type.Var("B"),new t.type.Var("Bs")])]),new t.type.Term(",",[new t.type.Term("call",[new t.type.Var("P"),new t.type.Var("A"),new t.type.Var("B")]),new t.type.Term("maplist",[new t.type.Var("P"),new t.type.Var("As"),new t.type.Var("Bs")])]))],"maplist/4":[new t.type.Rule(new t.type.Term("maplist",[new t.type.Var("_"),new t.type.Term("[]",[]),new t.type.Term("[]",[]),new t.type.Term("[]",[])]),null),new t.type.Rule(new t.type.Term("maplist",[new t.type.Var("P"),new t.type.Term(".",[new t.type.Var("A"),new t.type.Var("As")]),new t.type.Term(".",[new t.type.Var("B"),new t.type.Var("Bs")]),new t.type.Term(".",[new t.type.Var("C"),new t.type.Var("Cs")])]),new t.type.Term(",",[new t.type.Term("call",[new t.type.Var("P"),new t.type.Var("A"),new t.type.Var("B"),new t.type.Var("C")]),new t.type.Term("maplist",[new t.type.Var("P"),new t.type.Var("As"),new t.type.Var("Bs"),new t.type.Var("Cs")])]))],"maplist/5":[new t.type.Rule(new t.type.Term("maplist",[new t.type.Var("_"),new t.type.Term("[]",[]),new t.type.Term("[]",[]),new t.type.Term("[]",[]),new t.type.Term("[]",[])]),null),new t.type.Rule(new t.type.Term("maplist",[new t.type.Var("P"),new t.type.Term(".",[new t.type.Var("A"),new t.type.Var("As")]),new t.type.Term(".",[new t.type.Var("B"),new t.type.Var("Bs")]),new t.type.Term(".",[new t.type.Var("C"),new t.type.Var("Cs")]),new t.type.Term(".",[new t.type.Var("D"),new t.type.Var("Ds")])]),new t.type.Term(",",[new t.type.Term("call",[new t.type.Var("P"),new t.type.Var("A"),new t.type.Var("B"),new t.type.Var("C"),new t.type.Var("D")]),new t.type.Term("maplist",[new t.type.Var("P"),new t.type.Var("As"),new t.type.Var("Bs"),new t.type.Var("Cs"),new t.type.Var("Ds")])]))],"maplist/6":[new t.type.Rule(new t.type.Term("maplist",[new t.type.Var("_"),new t.type.Term("[]",[]),new t.type.Term("[]",[]),new t.type.Term("[]",[]),new t.type.Term("[]",[]),new t.type.Term("[]",[])]),null),new t.type.Rule(new t.type.Term("maplist",[new t.type.Var("P"),new t.type.Term(".",[new t.type.Var("A"),new t.type.Var("As")]),new t.type.Term(".",[new t.type.Var("B"),new t.type.Var("Bs")]),new t.type.Term(".",[new t.type.Var("C"),new t.type.Var("Cs")]),new t.type.Term(".",[new t.type.Var("D"),new t.type.Var("Ds")]),new t.type.Term(".",[new t.type.Var("E"),new t.type.Var("Es")])]),new t.type.Term(",",[new t.type.Term("call",[new t.type.Var("P"),new t.type.Var("A"),new t.type.Var("B"),new t.type.Var("C"),new t.type.Var("D"),new t.type.Var("E")]),new t.type.Term("maplist",[new t.type.Var("P"),new t.type.Var("As"),new t.type.Var("Bs"),new t.type.Var("Cs"),new t.type.Var("Ds"),new t.type.Var("Es")])]))],"maplist/7":[new t.type.Rule(new t.type.Term("maplist",[new t.type.Var("_"),new t.type.Term("[]",[]),new t.type.Term("[]",[]),new t.type.Term("[]",[]),new t.type.Term("[]",[]),new t.type.Term("[]",[]),new t.type.Term("[]",[])]),null),new t.type.Rule(new t.type.Term("maplist",[new t.type.Var("P"),new t.type.Term(".",[new t.type.Var("A"),new t.type.Var("As")]),new t.type.Term(".",[new t.type.Var("B"),new t.type.Var("Bs")]),new t.type.Term(".",[new t.type.Var("C"),new t.type.Var("Cs")]),new t.type.Term(".",[new t.type.Var("D"),new t.type.Var("Ds")]),new t.type.Term(".",[new t.type.Var("E"),new t.type.Var("Es")]),new t.type.Term(".",[new t.type.Var("F"),new t.type.Var("Fs")])]),new t.type.Term(",",[new t.type.Term("call",[new t.type.Var("P"),new t.type.Var("A"),new t.type.Var("B"),new t.type.Var("C"),new t.type.Var("D"),new t.type.Var("E"),new t.type.Var("F")]),new t.type.Term("maplist",[new t.type.Var("P"),new t.type.Var("As"),new t.type.Var("Bs"),new t.type.Var("Cs"),new t.type.Var("Ds"),new t.type.Var("Es"),new t.type.Var("Fs")])]))],"maplist/8":[new t.type.Rule(new t.type.Term("maplist",[new t.type.Var("_"),new t.type.Term("[]",[]),new t.type.Term("[]",[]),new t.type.Term("[]",[]),new t.type.Term("[]",[]),new t.type.Term("[]",[]),new t.type.Term("[]",[]),new t.type.Term("[]",[])]),null),new t.type.Rule(new t.type.Term("maplist",[new t.type.Var("P"),new t.type.Term(".",[new t.type.Var("A"),new t.type.Var("As")]),new t.type.Term(".",[new t.type.Var("B"),new t.type.Var("Bs")]),new t.type.Term(".",[new t.type.Var("C"),new t.type.Var("Cs")]),new t.type.Term(".",[new t.type.Var("D"),new t.type.Var("Ds")]),new t.type.Term(".",[new t.type.Var("E"),new t.type.Var("Es")]),new t.type.Term(".",[new t.type.Var("F"),new t.type.Var("Fs")]),new t.type.Term(".",[new t.type.Var("G"),new t.type.Var("Gs")])]),new t.type.Term(",",[new t.type.Term("call",[new t.type.Var("P"),new t.type.Var("A"),new t.type.Var("B"),new t.type.Var("C"),new t.type.Var("D"),new t.type.Var("E"),new t.type.Var("F"),new t.type.Var("G")]),new t.type.Term("maplist",[new t.type.Var("P"),new t.type.Var("As"),new t.type.Var("Bs"),new t.type.Var("Cs"),new t.type.Var("Ds"),new t.type.Var("Es"),new t.type.Var("Fs"),new t.type.Var("Gs")])]))],"include/3":[new t.type.Rule(new t.type.Term("include",[new t.type.Var("_"),new t.type.Term("[]",[]),new t.type.Term("[]",[])]),null),new t.type.Rule(new t.type.Term("include",[new t.type.Var("P"),new t.type.Term(".",[new t.type.Var("H"),new t.type.Var("T")]),new t.type.Var("L")]),new t.type.Term(",",[new t.type.Term("=..",[new t.type.Var("P"),new t.type.Var("A")]),new t.type.Term(",",[new t.type.Term("append",[new t.type.Var("A"),new t.type.Term(".",[new t.type.Var("H"),new t.type.Term("[]",[])]),new t.type.Var("B")]),new t.type.Term(",",[new t.type.Term("=..",[new t.type.Var("F"),new t.type.Var("B")]),new t.type.Term(",",[new t.type.Term(";",[new t.type.Term(",",[new t.type.Term("call",[new t.type.Var("F")]),new t.type.Term(",",[new t.type.Term("=",[new t.type.Var("L"),new t.type.Term(".",[new t.type.Var("H"),new t.type.Var("S")])]),new t.type.Term("!",[])])]),new t.type.Term("=",[new t.type.Var("L"),new t.type.Var("S")])]),new t.type.Term("include",[new t.type.Var("P"),new t.type.Var("T"),new t.type.Var("S")])])])])]))],"exclude/3":[new t.type.Rule(new t.type.Term("exclude",[new t.type.Var("_"),new t.type.Term("[]",[]),new t.type.Term("[]",[])]),null),new t.type.Rule(new t.type.Term("exclude",[new t.type.Var("P"),new t.type.Term(".",[new t.type.Var("H"),new t.type.Var("T")]),new t.type.Var("S")]),new t.type.Term(",",[new t.type.Term("exclude",[new t.type.Var("P"),new t.type.Var("T"),new t.type.Var("E")]),new t.type.Term(",",[new t.type.Term("=..",[new t.type.Var("P"),new t.type.Var("L")]),new t.type.Term(",",[new t.type.Term("append",[new t.type.Var("L"),new t.type.Term(".",[new t.type.Var("H"),new t.type.Term("[]",[])]),new t.type.Var("Q")]),new t.type.Term(",",[new t.type.Term("=..",[new t.type.Var("R"),new t.type.Var("Q")]),new t.type.Term(";",[new t.type.Term(",",[new t.type.Term("call",[new t.type.Var("R")]),new t.type.Term(",",[new t.type.Term("!",[]),new t.type.Term("=",[new t.type.Var("S"),new t.type.Var("E")])])]),new t.type.Term("=",[new t.type.Var("S"),new t.type.Term(".",[new t.type.Var("H"),new t.type.Var("E")])])])])])])]))],"foldl/4":[new t.type.Rule(new t.type.Term("foldl",[new t.type.Var("_"),new t.type.Term("[]",[]),new t.type.Var("I"),new t.type.Var("I")]),null),new t.type.Rule(new t.type.Term("foldl",[new t.type.Var("P"),new t.type.Term(".",[new t.type.Var("H"),new t.type.Var("T")]),new t.type.Var("I"),new t.type.Var("R")]),new t.type.Term(",",[new t.type.Term("=..",[new t.type.Var("P"),new t.type.Var("L")]),new t.type.Term(",",[new t.type.Term("append",[new t.type.Var("L"),new t.type.Term(".",[new t.type.Var("I"),new t.type.Term(".",[new t.type.Var("H"),new t.type.Term(".",[new t.type.Var("X"),new t.type.Term("[]",[])])])]),new t.type.Var("L2")]),new t.type.Term(",",[new t.type.Term("=..",[new t.type.Var("P2"),new t.type.Var("L2")]),new t.type.Term(",",[new t.type.Term("call",[new t.type.Var("P2")]),new t.type.Term("foldl",[new t.type.Var("P"),new t.type.Var("T"),new t.type.Var("X"),new t.type.Var("R")])])])])]))],"select/3":[new t.type.Rule(new t.type.Term("select",[new t.type.Var("E"),new t.type.Term(".",[new t.type.Var("E"),new t.type.Var("Xs")]),new t.type.Var("Xs")]),null),new t.type.Rule(new t.type.Term("select",[new t.type.Var("E"),new t.type.Term(".",[new t.type.Var("X"),new t.type.Var("Xs")]),new t.type.Term(".",[new t.type.Var("X"),new t.type.Var("Ys")])]),new t.type.Term("select",[new t.type.Var("E"),new t.type.Var("Xs"),new t.type.Var("Ys")]))],"sum_list/2":[new t.type.Rule(new t.type.Term("sum_list",[new t.type.Term("[]",[]),new t.type.Num(0,!1)]),null),new t.type.Rule(new t.type.Term("sum_list",[new t.type.Term(".",[new t.type.Var("X"),new t.type.Var("Xs")]),new t.type.Var("S")]),new t.type.Term(",",[new t.type.Term("sum_list",[new t.type.Var("Xs"),new t.type.Var("Y")]),new t.type.Term("is",[new t.type.Var("S"),new t.type.Term("+",[new t.type.Var("X"),new t.type.Var("Y")])])]))],"max_list/2":[new t.type.Rule(new t.type.Term("max_list",[new t.type.Term(".",[new t.type.Var("X"),new t.type.Term("[]",[])]),new t.type.Var("X")]),null),new t.type.Rule(new t.type.Term("max_list",[new t.type.Term(".",[new t.type.Var("X"),new t.type.Var("Xs")]),new t.type.Var("S")]),new t.type.Term(",",[new t.type.Term("max_list",[new t.type.Var("Xs"),new t.type.Var("Y")]),new t.type.Term(";",[new t.type.Term(",",[new t.type.Term(">=",[new t.type.Var("X"),new t.type.Var("Y")]),new t.type.Term(",",[new t.type.Term("=",[new t.type.Var("S"),new t.type.Var("X")]),new t.type.Term("!",[])])]),new t.type.Term("=",[new t.type.Var("S"),new t.type.Var("Y")])])]))],"min_list/2":[new t.type.Rule(new t.type.Term("min_list",[new t.type.Term(".",[new t.type.Var("X"),new t.type.Term("[]",[])]),new t.type.Var("X")]),null),new t.type.Rule(new t.type.Term("min_list",[new t.type.Term(".",[new t.type.Var("X"),new t.type.Var("Xs")]),new t.type.Var("S")]),new t.type.Term(",",[new t.type.Term("min_list",[new t.type.Var("Xs"),new t.type.Var("Y")]),new t.type.Term(";",[new t.type.Term(",",[new t.type.Term("=<",[new t.type.Var("X"),new t.type.Var("Y")]),new t.type.Term(",",[new t.type.Term("=",[new t.type.Var("S"),new t.type.Var("X")]),new t.type.Term("!",[])])]),new t.type.Term("=",[new t.type.Var("S"),new t.type.Var("Y")])])]))],"prod_list/2":[new t.type.Rule(new t.type.Term("prod_list",[new t.type.Term("[]",[]),new t.type.Num(1,!1)]),null),new t.type.Rule(new t.type.Term("prod_list",[new t.type.Term(".",[new t.type.Var("X"),new t.type.Var("Xs")]),new t.type.Var("S")]),new t.type.Term(",",[new t.type.Term("prod_list",[new t.type.Var("Xs"),new t.type.Var("Y")]),new t.type.Term("is",[new t.type.Var("S"),new t.type.Term("*",[new t.type.Var("X"),new t.type.Var("Y")])])]))],"last/2":[new t.type.Rule(new t.type.Term("last",[new t.type.Term(".",[new t.type.Var("X"),new t.type.Term("[]",[])]),new t.type.Var("X")]),null),new t.type.Rule(new t.type.Term("last",[new t.type.Term(".",[new t.type.Var("_"),new t.type.Var("Xs")]),new t.type.Var("X")]),new t.type.Term("last",[new t.type.Var("Xs"),new t.type.Var("X")]))],"prefix/2":[new t.type.Rule(new t.type.Term("prefix",[new t.type.Var("Part"),new t.type.Var("Whole")]),new t.type.Term("append",[new t.type.Var("Part"),new t.type.Var("_"),new t.type.Var("Whole")]))],"nth0/3":[new t.type.Rule(new t.type.Term("nth0",[new t.type.Var("X"),new t.type.Var("Y"),new t.type.Var("Z")]),new t.type.Term(";",[new t.type.Term("->",[new t.type.Term("var",[new t.type.Var("X")]),new t.type.Term("nth",[new t.type.Num(0,!1),new t.type.Var("X"),new t.type.Var("Y"),new t.type.Var("Z"),new t.type.Var("_")])]),new t.type.Term(",",[new t.type.Term(">=",[new t.type.Var("X"),new t.type.Num(0,!1)]),new t.type.Term(",",[new t.type.Term("nth",[new t.type.Num(0,!1),new t.type.Var("X"),new t.type.Var("Y"),new t.type.Var("Z"),new t.type.Var("_")]),new t.type.Term("!",[])])])]))],"nth1/3":[new t.type.Rule(new t.type.Term("nth1",[new t.type.Var("X"),new t.type.Var("Y"),new t.type.Var("Z")]),new t.type.Term(";",[new t.type.Term("->",[new t.type.Term("var",[new t.type.Var("X")]),new t.type.Term("nth",[new t.type.Num(1,!1),new t.type.Var("X"),new t.type.Var("Y"),new t.type.Var("Z"),new t.type.Var("_")])]),new t.type.Term(",",[new t.type.Term(">",[new t.type.Var("X"),new t.type.Num(0,!1)]),new t.type.Term(",",[new t.type.Term("nth",[new t.type.Num(1,!1),new t.type.Var("X"),new t.type.Var("Y"),new t.type.Var("Z"),new t.type.Var("_")]),new t.type.Term("!",[])])])]))],"nth0/4":[new t.type.Rule(new t.type.Term("nth0",[new t.type.Var("X"),new t.type.Var("Y"),new t.type.Var("Z"),new t.type.Var("W")]),new t.type.Term(";",[new t.type.Term("->",[new t.type.Term("var",[new t.type.Var("X")]),new t.type.Term("nth",[new t.type.Num(0,!1),new t.type.Var("X"),new t.type.Var("Y"),new t.type.Var("Z"),new t.type.Var("W")])]),new t.type.Term(",",[new t.type.Term(">=",[new t.type.Var("X"),new t.type.Num(0,!1)]),new t.type.Term(",",[new t.type.Term("nth",[new t.type.Num(0,!1),new t.type.Var("X"),new t.type.Var("Y"),new t.type.Var("Z"),new t.type.Var("W")]),new t.type.Term("!",[])])])]))],"nth1/4":[new t.type.Rule(new t.type.Term("nth1",[new t.type.Var("X"),new t.type.Var("Y"),new t.type.Var("Z"),new t.type.Var("W")]),new t.type.Term(";",[new t.type.Term("->",[new t.type.Term("var",[new t.type.Var("X")]),new t.type.Term("nth",[new t.type.Num(1,!1),new t.type.Var("X"),new t.type.Var("Y"),new t.type.Var("Z"),new t.type.Var("W")])]),new t.type.Term(",",[new t.type.Term(">",[new t.type.Var("X"),new t.type.Num(0,!1)]),new t.type.Term(",",[new t.type.Term("nth",[new t.type.Num(1,!1),new t.type.Var("X"),new t.type.Var("Y"),new t.type.Var("Z"),new t.type.Var("W")]),new t.type.Term("!",[])])])]))],"nth/5":[new t.type.Rule(new t.type.Term("nth",[new t.type.Var("N"),new t.type.Var("N"),new t.type.Term(".",[new t.type.Var("X"),new t.type.Var("Xs")]),new t.type.Var("X"),new t.type.Var("Xs")]),null),new t.type.Rule(new t.type.Term("nth",[new t.type.Var("N"),new t.type.Var("O"),new t.type.Term(".",[new t.type.Var("X"),new t.type.Var("Xs")]),new t.type.Var("Y"),new t.type.Term(".",[new t.type.Var("X"),new t.type.Var("Ys")])]),new t.type.Term(",",[new t.type.Term("is",[new t.type.Var("M"),new t.type.Term("+",[new t.type.Var("N"),new t.type.Num(1,!1)])]),new t.type.Term("nth",[new t.type.Var("M"),new t.type.Var("O"),new t.type.Var("Xs"),new t.type.Var("Y"),new t.type.Var("Ys")])]))],"length/2":function(o,a,n){var u=n.args[0],A=n.args[1];if(!t.type.is_variable(A)&&!t.type.is_integer(A))o.throw_error(t.error.type("integer",A,n.indicator));else if(t.type.is_integer(A)&&A.value<0)o.throw_error(t.error.domain("not_less_than_zero",A,n.indicator));else{var p=new t.type.Term("length",[u,new t.type.Num(0,!1),A]);t.type.is_integer(A)&&(p=new t.type.Term(",",[p,new t.type.Term("!",[])])),o.prepend([new t.type.State(a.goal.replace(p),a.substitution,a)])}},"length/3":[new t.type.Rule(new t.type.Term("length",[new t.type.Term("[]",[]),new t.type.Var("N"),new t.type.Var("N")]),null),new t.type.Rule(new t.type.Term("length",[new t.type.Term(".",[new t.type.Var("_"),new t.type.Var("X")]),new t.type.Var("A"),new t.type.Var("N")]),new t.type.Term(",",[new t.type.Term("succ",[new t.type.Var("A"),new t.type.Var("B")]),new t.type.Term("length",[new t.type.Var("X"),new t.type.Var("B"),new t.type.Var("N")])]))],"replicate/3":function(o,a,n){var u=n.args[0],A=n.args[1],p=n.args[2];if(t.type.is_variable(A))o.throw_error(t.error.instantiation(n.indicator));else if(!t.type.is_integer(A))o.throw_error(t.error.type("integer",A,n.indicator));else if(A.value<0)o.throw_error(t.error.domain("not_less_than_zero",A,n.indicator));else if(!t.type.is_variable(p)&&!t.type.is_list(p))o.throw_error(t.error.type("list",p,n.indicator));else{for(var h=new t.type.Term("[]"),E=0;E<A.value;E++)h=new t.type.Term(".",[u,h]);o.prepend([new t.type.State(a.goal.replace(new t.type.Term("=",[h,p])),a.substitution,a)])}},"sort/2":function(o,a,n){var u=n.args[0],A=n.args[1];if(t.type.is_variable(u))o.throw_error(t.error.instantiation(n.indicator));else if(!t.type.is_variable(A)&&!t.type.is_fully_list(A))o.throw_error(t.error.type("list",A,n.indicator));else{for(var p=[],h=u;h.indicator==="./2";)p.push(h.args[0]),h=h.args[1];if(t.type.is_variable(h))o.throw_error(t.error.instantiation(n.indicator));else if(!t.type.is_empty_list(h))o.throw_error(t.error.type("list",u,n.indicator));else{for(var E=p.sort(t.compare),I=E.length-1;I>0;I--)E[I].equals(E[I-1])&&E.splice(I,1);for(var v=new t.type.Term("[]"),I=E.length-1;I>=0;I--)v=new t.type.Term(".",[E[I],v]);o.prepend([new t.type.State(a.goal.replace(new t.type.Term("=",[v,A])),a.substitution,a)])}}},"msort/2":function(o,a,n){var u=n.args[0],A=n.args[1];if(t.type.is_variable(u))o.throw_error(t.error.instantiation(n.indicator));else if(!t.type.is_variable(A)&&!t.type.is_fully_list(A))o.throw_error(t.error.type("list",A,n.indicator));else{for(var p=[],h=u;h.indicator==="./2";)p.push(h.args[0]),h=h.args[1];if(t.type.is_variable(h))o.throw_error(t.error.instantiation(n.indicator));else if(!t.type.is_empty_list(h))o.throw_error(t.error.type("list",u,n.indicator));else{for(var E=p.sort(t.compare),I=new t.type.Term("[]"),v=E.length-1;v>=0;v--)I=new t.type.Term(".",[E[v],I]);o.prepend([new t.type.State(a.goal.replace(new t.type.Term("=",[I,A])),a.substitution,a)])}}},"keysort/2":function(o,a,n){var u=n.args[0],A=n.args[1];if(t.type.is_variable(u))o.throw_error(t.error.instantiation(n.indicator));else if(!t.type.is_variable(A)&&!t.type.is_fully_list(A))o.throw_error(t.error.type("list",A,n.indicator));else{for(var p=[],h,E=u;E.indicator==="./2";){if(h=E.args[0],t.type.is_variable(h)){o.throw_error(t.error.instantiation(n.indicator));return}else if(!t.type.is_term(h)||h.indicator!=="-/2"){o.throw_error(t.error.type("pair",h,n.indicator));return}h.args[0].pair=h.args[1],p.push(h.args[0]),E=E.args[1]}if(t.type.is_variable(E))o.throw_error(t.error.instantiation(n.indicator));else if(!t.type.is_empty_list(E))o.throw_error(t.error.type("list",u,n.indicator));else{for(var I=p.sort(t.compare),v=new t.type.Term("[]"),x=I.length-1;x>=0;x--)v=new t.type.Term(".",[new t.type.Term("-",[I[x],I[x].pair]),v]),delete I[x].pair;o.prepend([new t.type.State(a.goal.replace(new t.type.Term("=",[v,A])),a.substitution,a)])}}},"take/3":function(o,a,n){var u=n.args[0],A=n.args[1],p=n.args[2];if(t.type.is_variable(A)||t.type.is_variable(u))o.throw_error(t.error.instantiation(n.indicator));else if(!t.type.is_list(A))o.throw_error(t.error.type("list",A,n.indicator));else if(!t.type.is_integer(u))o.throw_error(t.error.type("integer",u,n.indicator));else if(!t.type.is_variable(p)&&!t.type.is_list(p))o.throw_error(t.error.type("list",p,n.indicator));else{for(var h=u.value,E=[],I=A;h>0&&I.indicator==="./2";)E.push(I.args[0]),I=I.args[1],h--;if(h===0){for(var v=new t.type.Term("[]"),h=E.length-1;h>=0;h--)v=new t.type.Term(".",[E[h],v]);o.prepend([new t.type.State(a.goal.replace(new t.type.Term("=",[v,p])),a.substitution,a)])}}},"drop/3":function(o,a,n){var u=n.args[0],A=n.args[1],p=n.args[2];if(t.type.is_variable(A)||t.type.is_variable(u))o.throw_error(t.error.instantiation(n.indicator));else if(!t.type.is_list(A))o.throw_error(t.error.type("list",A,n.indicator));else if(!t.type.is_integer(u))o.throw_error(t.error.type("integer",u,n.indicator));else if(!t.type.is_variable(p)&&!t.type.is_list(p))o.throw_error(t.error.type("list",p,n.indicator));else{for(var h=u.value,E=[],I=A;h>0&&I.indicator==="./2";)E.push(I.args[0]),I=I.args[1],h--;h===0&&o.prepend([new t.type.State(a.goal.replace(new t.type.Term("=",[I,p])),a.substitution,a)])}},"reverse/2":function(o,a,n){var u=n.args[0],A=n.args[1],p=t.type.is_instantiated_list(u),h=t.type.is_instantiated_list(A);if(t.type.is_variable(u)&&t.type.is_variable(A))o.throw_error(t.error.instantiation(n.indicator));else if(!t.type.is_variable(u)&&!t.type.is_fully_list(u))o.throw_error(t.error.type("list",u,n.indicator));else if(!t.type.is_variable(A)&&!t.type.is_fully_list(A))o.throw_error(t.error.type("list",A,n.indicator));else if(!p&&!h)o.throw_error(t.error.instantiation(n.indicator));else{for(var E=p?u:A,I=new t.type.Term("[]",[]);E.indicator==="./2";)I=new t.type.Term(".",[E.args[0],I]),E=E.args[1];o.prepend([new t.type.State(a.goal.replace(new t.type.Term("=",[I,p?A:u])),a.substitution,a)])}},"list_to_set/2":function(o,a,n){var u=n.args[0],A=n.args[1];if(t.type.is_variable(u))o.throw_error(t.error.instantiation(n.indicator));else{for(var p=u,h=[];p.indicator==="./2";)h.push(p.args[0]),p=p.args[1];if(t.type.is_variable(p))o.throw_error(t.error.instantiation(n.indicator));else if(!t.type.is_term(p)||p.indicator!=="[]/0")o.throw_error(t.error.type("list",u,n.indicator));else{for(var E=[],I=new t.type.Term("[]",[]),v,x=0;x<h.length;x++){v=!1;for(var C=0;C<E.length&&!v;C++)v=t.compare(h[x],E[C])===0;v||E.push(h[x])}for(x=E.length-1;x>=0;x--)I=new t.type.Term(".",[E[x],I]);o.prepend([new t.type.State(a.goal.replace(new t.type.Term("=",[A,I])),a.substitution,a)])}}}}},r=["append/2","append/3","member/2","permutation/2","maplist/2","maplist/3","maplist/4","maplist/5","maplist/6","maplist/7","maplist/8","include/3","exclude/3","foldl/4","sum_list/2","max_list/2","min_list/2","prod_list/2","last/2","prefix/2","nth0/3","nth1/3","nth0/4","nth1/4","length/2","replicate/3","select/3","sort/2","msort/2","keysort/2","take/3","drop/3","reverse/2","list_to_set/2"];typeof sH<"u"?sH.exports=function(o){t=o,new t.type.Module("lists",e(),r)}:new t.type.Module("lists",e(),r)})(jgt)});var nme=_(Yr=>{"use strict";var $d=process.platform==="win32",oH="aes-256-cbc",Ggt="sha256",Yde="The current environment doesn't support interactive reading from TTY.",Yn=ve("fs"),Gde=process.binding("tty_wrap").TTY,lH=ve("child_process"),c0=ve("path"),cH={prompt:"> ",hideEchoBack:!1,mask:"*",limit:[],limitMessage:"Input another, please.$<( [)limit(])>",defaultInput:"",trueValue:[],falseValue:[],caseSensitive:!1,keepWhitespace:!1,encoding:"utf8",bufferSize:1024,print:void 0,history:!0,cd:!1,phContent:void 0,preCheck:void 0},zf="none",Xc,BC,qde=!1,l0,mk,aH,qgt=0,hH="",Zd=[],yk,Wde=!1,uH=!1,D2=!1;function Kde(t){function e(r){return r.replace(/[^\w\u0080-\uFFFF]/g,function(o){return"#"+o.charCodeAt(0)+";"})}return mk.concat(function(r){var o=[];return Object.keys(r).forEach(function(a){r[a]==="boolean"?t[a]&&o.push("--"+a):r[a]==="string"&&t[a]&&o.push("--"+a,e(t[a]))}),o}({display:"string",displayOnly:"boolean",keyIn:"boolean",hideEchoBack:"boolean",mask:"string",limit:"string",caseSensitive:"boolean"}))}function Ygt(t,e){function r(U){var J,te="",ae;for(aH=aH||ve("os").tmpdir();;){J=c0.join(aH,U+te);try{ae=Yn.openSync(J,"wx")}catch(fe){if(fe.code==="EEXIST"){te++;continue}else throw fe}Yn.closeSync(ae);break}return J}var o,a,n,u={},A,p,h=r("readline-sync.stdout"),E=r("readline-sync.stderr"),I=r("readline-sync.exit"),v=r("readline-sync.done"),x=ve("crypto"),C,R,L;C=x.createHash(Ggt),C.update(""+process.pid+qgt+++Math.random()),L=C.digest("hex"),R=x.createDecipher(oH,L),o=Kde(t),$d?(a=process.env.ComSpec||"cmd.exe",process.env.Q='"',n=["/V:ON","/S","/C","(%Q%"+a+"%Q% /V:ON /S /C %Q%%Q%"+l0+"%Q%"+o.map(function(U){return" %Q%"+U+"%Q%"}).join("")+" & (echo !ERRORLEVEL!)>%Q%"+I+"%Q%%Q%) 2>%Q%"+E+"%Q% |%Q%"+process.execPath+"%Q% %Q%"+__dirname+"\\encrypt.js%Q% %Q%"+oH+"%Q% %Q%"+L+"%Q% >%Q%"+h+"%Q% & (echo 1)>%Q%"+v+"%Q%"]):(a="/bin/sh",n=["-c",'("'+l0+'"'+o.map(function(U){return" '"+U.replace(/'/g,"'\\''")+"'"}).join("")+'; echo $?>"'+I+'") 2>"'+E+'" |"'+process.execPath+'" "'+__dirname+'/encrypt.js" "'+oH+'" "'+L+'" >"'+h+'"; echo 1 >"'+v+'"']),D2&&D2("_execFileSync",o);try{lH.spawn(a,n,e)}catch(U){u.error=new Error(U.message),u.error.method="_execFileSync - spawn",u.error.program=a,u.error.args=n}for(;Yn.readFileSync(v,{encoding:t.encoding}).trim()!=="1";);return(A=Yn.readFileSync(I,{encoding:t.encoding}).trim())==="0"?u.input=R.update(Yn.readFileSync(h,{encoding:"binary"}),"hex",t.encoding)+R.final(t.encoding):(p=Yn.readFileSync(E,{encoding:t.encoding}).trim(),u.error=new Error(Yde+(p?`
+`+p:"")),u.error.method="_execFileSync",u.error.program=a,u.error.args=n,u.error.extMessage=p,u.error.exitCode=+A),Yn.unlinkSync(h),Yn.unlinkSync(E),Yn.unlinkSync(I),Yn.unlinkSync(v),u}function Wgt(t){var e,r={},o,a={env:process.env,encoding:t.encoding};if(l0||($d?process.env.PSModulePath?(l0="powershell.exe",mk=["-ExecutionPolicy","Bypass","-File",__dirname+"\\read.ps1"]):(l0="cscript.exe",mk=["//nologo",__dirname+"\\read.cs.js"]):(l0="/bin/sh",mk=[__dirname+"/read.sh"])),$d&&!process.env.PSModulePath&&(a.stdio=[process.stdin]),lH.execFileSync){e=Kde(t),D2&&D2("execFileSync",e);try{r.input=lH.execFileSync(l0,e,a)}catch(n){o=n.stderr?(n.stderr+"").trim():"",r.error=new Error(Yde+(o?`
+`+o:"")),r.error.method="execFileSync",r.error.program=l0,r.error.args=e,r.error.extMessage=o,r.error.exitCode=n.status,r.error.code=n.code,r.error.signal=n.signal}}else r=Ygt(t,a);return r.error||(r.input=r.input.replace(/^\s*'|'\s*$/g,""),t.display=""),r}function AH(t){var e="",r=t.display,o=!t.display&&t.keyIn&&t.hideEchoBack&&!t.mask;function a(){var n=Wgt(t);if(n.error)throw n.error;return n.input}return uH&&uH(t),function(){var n,u,A;function p(){return n||(n=process.binding("fs"),u=process.binding("constants")),n}if(typeof zf=="string")if(zf=null,$d){if(A=function(h){var E=h.replace(/^\D+/,"").split("."),I=0;return(E[0]=+E[0])&&(I+=E[0]*1e4),(E[1]=+E[1])&&(I+=E[1]*100),(E[2]=+E[2])&&(I+=E[2]),I}(process.version),!(A>=20302&&A<40204||A>=5e4&&A<50100||A>=50600&&A<60200)&&process.stdin.isTTY)process.stdin.pause(),zf=process.stdin.fd,BC=process.stdin._handle;else try{zf=p().open("CONIN$",u.O_RDWR,parseInt("0666",8)),BC=new Gde(zf,!0)}catch{}if(process.stdout.isTTY)Xc=process.stdout.fd;else{try{Xc=Yn.openSync("\\\\.\\CON","w")}catch{}if(typeof Xc!="number")try{Xc=p().open("CONOUT$",u.O_RDWR,parseInt("0666",8))}catch{}}}else{if(process.stdin.isTTY){process.stdin.pause();try{zf=Yn.openSync("/dev/tty","r"),BC=process.stdin._handle}catch{}}else try{zf=Yn.openSync("/dev/tty","r"),BC=new Gde(zf,!1)}catch{}if(process.stdout.isTTY)Xc=process.stdout.fd;else try{Xc=Yn.openSync("/dev/tty","w")}catch{}}}(),function(){var n,u,A=!t.hideEchoBack&&!t.keyIn,p,h,E,I,v;yk="";function x(C){return C===qde?!0:BC.setRawMode(C)!==0?!1:(qde=C,!0)}if(Wde||!BC||typeof Xc!="number"&&(t.display||!A)){e=a();return}if(t.display&&(Yn.writeSync(Xc,t.display),t.display=""),!t.displayOnly){if(!x(!A)){e=a();return}for(h=t.keyIn?1:t.bufferSize,p=Buffer.allocUnsafe&&Buffer.alloc?Buffer.alloc(h):new Buffer(h),t.keyIn&&t.limit&&(u=new RegExp("[^"+t.limit+"]","g"+(t.caseSensitive?"":"i")));;){E=0;try{E=Yn.readSync(zf,p,0,h)}catch(C){if(C.code!=="EOF"){x(!1),e+=a();return}}if(E>0?(I=p.toString(t.encoding,0,E),yk+=I):(I=`
+`,yk+=String.fromCharCode(0)),I&&typeof(v=(I.match(/^(.*?)[\r\n]/)||[])[1])=="string"&&(I=v,n=!0),I&&(I=I.replace(/[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g,"")),I&&u&&(I=I.replace(u,"")),I&&(A||(t.hideEchoBack?t.mask&&Yn.writeSync(Xc,new Array(I.length+1).join(t.mask)):Yn.writeSync(Xc,I)),e+=I),!t.keyIn&&n||t.keyIn&&e.length>=h)break}!A&&!o&&Yn.writeSync(Xc,`
+`),x(!1)}}(),t.print&&!o&&t.print(r+(t.displayOnly?"":(t.hideEchoBack?new Array(e.length+1).join(t.mask):e)+`
+`),t.encoding),t.displayOnly?"":hH=t.keepWhitespace||t.keyIn?e:e.trim()}function Kgt(t,e){var r=[];function o(a){a!=null&&(Array.isArray(a)?a.forEach(o):(!e||e(a))&&r.push(a))}return o(t),r}function gH(t){return t.replace(/[\x00-\x7f]/g,function(e){return"\\x"+("00"+e.charCodeAt().toString(16)).substr(-2)})}function Rs(){var t=Array.prototype.slice.call(arguments),e,r;return t.length&&typeof t[0]=="boolean"&&(r=t.shift(),r&&(e=Object.keys(cH),t.unshift(cH))),t.reduce(function(o,a){return a==null||(a.hasOwnProperty("noEchoBack")&&!a.hasOwnProperty("hideEchoBack")&&(a.hideEchoBack=a.noEchoBack,delete a.noEchoBack),a.hasOwnProperty("noTrim")&&!a.hasOwnProperty("keepWhitespace")&&(a.keepWhitespace=a.noTrim,delete a.noTrim),r||(e=Object.keys(a)),e.forEach(function(n){var u;if(!!a.hasOwnProperty(n))switch(u=a[n],n){case"mask":case"limitMessage":case"defaultInput":case"encoding":u=u!=null?u+"":"",u&&n!=="limitMessage"&&(u=u.replace(/[\r\n]/g,"")),o[n]=u;break;case"bufferSize":!isNaN(u=parseInt(u,10))&&typeof u=="number"&&(o[n]=u);break;case"displayOnly":case"keyIn":case"hideEchoBack":case"caseSensitive":case"keepWhitespace":case"history":case"cd":o[n]=!!u;break;case"limit":case"trueValue":case"falseValue":o[n]=Kgt(u,function(A){var p=typeof A;return p==="string"||p==="number"||p==="function"||A instanceof RegExp}).map(function(A){return typeof A=="string"?A.replace(/[\r\n]/g,""):A});break;case"print":case"phContent":case"preCheck":o[n]=typeof u=="function"?u:void 0;break;case"prompt":case"display":o[n]=u??"";break}})),o},{})}function fH(t,e,r){return e.some(function(o){var a=typeof o;return a==="string"?r?t===o:t.toLowerCase()===o.toLowerCase():a==="number"?parseFloat(t)===o:a==="function"?o(t):o instanceof RegExp?o.test(t):!1})}function dH(t,e){var r=c0.normalize($d?(process.env.HOMEDRIVE||"")+(process.env.HOMEPATH||""):process.env.HOME||"").replace(/[\/\\]+$/,"");return t=c0.normalize(t),e?t.replace(/^~(?=\/|\\|$)/,r):t.replace(new RegExp("^"+gH(r)+"(?=\\/|\\\\|$)",$d?"i":""),"~")}function vC(t,e){var r="(?:\\(([\\s\\S]*?)\\))?(\\w+|.-.)(?:\\(([\\s\\S]*?)\\))?",o=new RegExp("(\\$)?(\\$<"+r+">)","g"),a=new RegExp("(\\$)?(\\$\\{"+r+"\\})","g");function n(u,A,p,h,E,I){var v;return A||typeof(v=e(E))!="string"?p:v?(h||"")+v+(I||""):""}return t.replace(o,n).replace(a,n)}function Vde(t,e,r){var o,a=[],n=-1,u=0,A="",p;function h(E,I){return I.length>3?(E.push(I[0]+"..."+I[I.length-1]),p=!0):I.length&&(E=E.concat(I)),E}return o=t.reduce(function(E,I){return E.concat((I+"").split(""))},[]).reduce(function(E,I){var v,x;return e||(I=I.toLowerCase()),v=/^\d$/.test(I)?1:/^[A-Z]$/.test(I)?2:/^[a-z]$/.test(I)?3:0,r&&v===0?A+=I:(x=I.charCodeAt(0),v&&v===n&&x===u+1?a.push(I):(E=h(E,a),a=[I],n=v),u=x),E},[]),o=h(o,a),A&&(o.push(A),p=!0),{values:o,suppressed:p}}function Jde(t,e){return t.join(t.length>2?", ":e?" / ":"/")}function zde(t,e){var r,o,a={},n;if(e.phContent&&(r=e.phContent(t,e)),typeof r!="string")switch(t){case"hideEchoBack":case"mask":case"defaultInput":case"caseSensitive":case"keepWhitespace":case"encoding":case"bufferSize":case"history":case"cd":r=e.hasOwnProperty(t)?typeof e[t]=="boolean"?e[t]?"on":"off":e[t]+"":"";break;case"limit":case"trueValue":case"falseValue":o=e[e.hasOwnProperty(t+"Src")?t+"Src":t],e.keyIn?(a=Vde(o,e.caseSensitive),o=a.values):o=o.filter(function(u){var A=typeof u;return A==="string"||A==="number"}),r=Jde(o,a.suppressed);break;case"limitCount":case"limitCountNotZero":r=e[e.hasOwnProperty("limitSrc")?"limitSrc":"limit"].length,r=r||t!=="limitCountNotZero"?r+"":"";break;case"lastInput":r=hH;break;case"cwd":case"CWD":case"cwdHome":r=process.cwd(),t==="CWD"?r=c0.basename(r):t==="cwdHome"&&(r=dH(r));break;case"date":case"time":case"localeDate":case"localeTime":r=new Date()["to"+t.replace(/^./,function(u){return u.toUpperCase()})+"String"]();break;default:typeof(n=(t.match(/^history_m(\d+)$/)||[])[1])=="string"&&(r=Zd[Zd.length-n]||"")}return r}function Xde(t){var e=/^(.)-(.)$/.exec(t),r="",o,a,n,u;if(!e)return null;for(o=e[1].charCodeAt(0),a=e[2].charCodeAt(0),u=o<a?1:-1,n=o;n!==a+u;n+=u)r+=String.fromCharCode(n);return r}function pH(t){var e=new RegExp(/(\s*)(?:("|')(.*?)(?:\2|$)|(\S+))/g),r,o="",a=[],n;for(t=t.trim();r=e.exec(t);)n=r[3]||r[4]||"",r[1]&&(a.push(o),o=""),o+=n;return o&&a.push(o),a}function Zde(t,e){return e.trueValue.length&&fH(t,e.trueValue,e.caseSensitive)?!0:e.falseValue.length&&fH(t,e.falseValue,e.caseSensitive)?!1:t}function $de(t){var e,r,o,a,n,u,A;function p(E){return zde(E,t)}function h(E){t.display+=(/[^\r\n]$/.test(t.display)?`
+`:"")+E}for(t.limitSrc=t.limit,t.displaySrc=t.display,t.limit="",t.display=vC(t.display+"",p);;){if(e=AH(t),r=!1,o="",t.defaultInput&&!e&&(e=t.defaultInput),t.history&&((a=/^\s*\!(?:\!|-1)(:p)?\s*$/.exec(e))?(n=Zd[0]||"",a[1]?r=!0:e=n,h(n+`
+`),r||(t.displayOnly=!0,AH(t),t.displayOnly=!1)):e&&e!==Zd[Zd.length-1]&&(Zd=[e])),!r&&t.cd&&e)switch(u=pH(e),u[0].toLowerCase()){case"cd":if(u[1])try{process.chdir(dH(u[1],!0))}catch(E){h(E+"")}r=!0;break;case"pwd":h(process.cwd()),r=!0;break}if(!r&&t.preCheck&&(A=t.preCheck(e,t),e=A.res,A.forceNext&&(r=!0)),!r){if(!t.limitSrc.length||fH(e,t.limitSrc,t.caseSensitive))break;t.limitMessage&&(o=vC(t.limitMessage,p))}h((o?o+`
+`:"")+vC(t.displaySrc+"",p))}return Zde(e,t)}Yr._DBG_set_useExt=function(t){Wde=t};Yr._DBG_set_checkOptions=function(t){uH=t};Yr._DBG_set_checkMethod=function(t){D2=t};Yr._DBG_clearHistory=function(){hH="",Zd=[]};Yr.setDefaultOptions=function(t){return cH=Rs(!0,t),Rs(!0)};Yr.question=function(t,e){return $de(Rs(Rs(!0,e),{display:t}))};Yr.prompt=function(t){var e=Rs(!0,t);return e.display=e.prompt,$de(e)};Yr.keyIn=function(t,e){var r=Rs(Rs(!0,e),{display:t,keyIn:!0,keepWhitespace:!0});return r.limitSrc=r.limit.filter(function(o){var a=typeof o;return a==="string"||a==="number"}).map(function(o){return vC(o+"",Xde)}),r.limit=gH(r.limitSrc.join("")),["trueValue","falseValue"].forEach(function(o){r[o]=r[o].reduce(function(a,n){var u=typeof n;return u==="string"||u==="number"?a=a.concat((n+"").split("")):a.push(n),a},[])}),r.display=vC(r.display+"",function(o){return zde(o,r)}),Zde(AH(r),r)};Yr.questionEMail=function(t,e){return t==null&&(t="Input e-mail address: "),Yr.question(t,Rs({hideEchoBack:!1,limit:/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/,limitMessage:"Input valid e-mail address, please.",trueValue:null,falseValue:null},e,{keepWhitespace:!1,cd:!1}))};Yr.questionNewPassword=function(t,e){var r,o,a,n=Rs({hideEchoBack:!0,mask:"*",limitMessage:`It can include: $<charlist>
+And the length must be: $<length>`,trueValue:null,falseValue:null,caseSensitive:!0},e,{history:!1,cd:!1,phContent:function(x){return x==="charlist"?r.text:x==="length"?o+"..."+a:null}}),u,A,p,h,E,I,v;for(e=e||{},u=vC(e.charlist?e.charlist+"":"$<!-~>",Xde),(isNaN(o=parseInt(e.min,10))||typeof o!="number")&&(o=12),(isNaN(a=parseInt(e.max,10))||typeof a!="number")&&(a=24),h=new RegExp("^["+gH(u)+"]{"+o+","+a+"}$"),r=Vde([u],n.caseSensitive,!0),r.text=Jde(r.values,r.suppressed),A=e.confirmMessage!=null?e.confirmMessage:"Reinput a same one to confirm it: ",p=e.unmatchMessage!=null?e.unmatchMessage:"It differs from first one. Hit only the Enter key if you want to retry from first one.",t==null&&(t="Input new password: "),E=n.limitMessage;!v;)n.limit=h,n.limitMessage=E,I=Yr.question(t,n),n.limit=[I,""],n.limitMessage=p,v=Yr.question(A,n);return I};function eme(t,e,r){var o;function a(n){return o=r(n),!isNaN(o)&&typeof o=="number"}return Yr.question(t,Rs({limitMessage:"Input valid number, please."},e,{limit:a,cd:!1})),o}Yr.questionInt=function(t,e){return eme(t,e,function(r){return parseInt(r,10)})};Yr.questionFloat=function(t,e){return eme(t,e,parseFloat)};Yr.questionPath=function(t,e){var r,o="",a=Rs({hideEchoBack:!1,limitMessage:`$<error(
+)>Input valid path, please.$<( Min:)min>$<( Max:)max>`,history:!0,cd:!0},e,{keepWhitespace:!1,limit:function(n){var u,A,p;n=dH(n,!0),o="";function h(E){E.split(/\/|\\/).reduce(function(I,v){var x=c0.resolve(I+=v+c0.sep);if(!Yn.existsSync(x))Yn.mkdirSync(x);else if(!Yn.statSync(x).isDirectory())throw new Error("Non directory already exists: "+x);return I},"")}try{if(u=Yn.existsSync(n),r=u?Yn.realpathSync(n):c0.resolve(n),!e.hasOwnProperty("exists")&&!u||typeof e.exists=="boolean"&&e.exists!==u)return o=(u?"Already exists":"No such file or directory")+": "+r,!1;if(!u&&e.create&&(e.isDirectory?h(r):(h(c0.dirname(r)),Yn.closeSync(Yn.openSync(r,"w"))),r=Yn.realpathSync(r)),u&&(e.min||e.max||e.isFile||e.isDirectory)){if(A=Yn.statSync(r),e.isFile&&!A.isFile())return o="Not file: "+r,!1;if(e.isDirectory&&!A.isDirectory())return o="Not directory: "+r,!1;if(e.min&&A.size<+e.min||e.max&&A.size>+e.max)return o="Size "+A.size+" is out of range: "+r,!1}if(typeof e.validate=="function"&&(p=e.validate(r))!==!0)return typeof p=="string"&&(o=p),!1}catch(E){return o=E+"",!1}return!0},phContent:function(n){return n==="error"?o:n!=="min"&&n!=="max"?null:e.hasOwnProperty(n)?e[n]+"":""}});return e=e||{},t==null&&(t='Input path (you can "cd" and "pwd"): '),Yr.question(t,a),r};function tme(t,e){var r={},o={};return typeof t=="object"?(Object.keys(t).forEach(function(a){typeof t[a]=="function"&&(o[e.caseSensitive?a:a.toLowerCase()]=t[a])}),r.preCheck=function(a){var n;return r.args=pH(a),n=r.args[0]||"",e.caseSensitive||(n=n.toLowerCase()),r.hRes=n!=="_"&&o.hasOwnProperty(n)?o[n].apply(a,r.args.slice(1)):o.hasOwnProperty("_")?o._.apply(a,r.args):null,{res:a,forceNext:!1}},o.hasOwnProperty("_")||(r.limit=function(){var a=r.args[0]||"";return e.caseSensitive||(a=a.toLowerCase()),o.hasOwnProperty(a)})):r.preCheck=function(a){return r.args=pH(a),r.hRes=typeof t=="function"?t.apply(a,r.args):!0,{res:a,forceNext:!1}},r}Yr.promptCL=function(t,e){var r=Rs({hideEchoBack:!1,limitMessage:"Requested command is not available.",caseSensitive:!1,history:!0},e),o=tme(t,r);return r.limit=o.limit,r.preCheck=o.preCheck,Yr.prompt(r),o.args};Yr.promptLoop=function(t,e){for(var r=Rs({hideEchoBack:!1,trueValue:null,falseValue:null,caseSensitive:!1,history:!0},e);!t(Yr.prompt(r)););};Yr.promptCLLoop=function(t,e){var r=Rs({hideEchoBack:!1,limitMessage:"Requested command is not available.",caseSensitive:!1,history:!0},e),o=tme(t,r);for(r.limit=o.limit,r.preCheck=o.preCheck;Yr.prompt(r),!o.hRes;);};Yr.promptSimShell=function(t){return Yr.prompt(Rs({hideEchoBack:!1,history:!0},t,{prompt:function(){return $d?"$<cwd>>":(process.env.USER||"")+(process.env.HOSTNAME?"@"+process.env.HOSTNAME.replace(/\..*$/,""):"")+":$<cwdHome>$ "}()}))};function rme(t,e,r){var o;return t==null&&(t="Are you sure? "),(!e||e.guide!==!1)&&(t+="")&&(t=t.replace(/\s*:?\s*$/,"")+" [y/n]: "),o=Yr.keyIn(t,Rs(e,{hideEchoBack:!1,limit:r,trueValue:"y",falseValue:"n",caseSensitive:!1})),typeof o=="boolean"?o:""}Yr.keyInYN=function(t,e){return rme(t,e)};Yr.keyInYNStrict=function(t,e){return rme(t,e,"yn")};Yr.keyInPause=function(t,e){t==null&&(t="Continue..."),(!e||e.guide!==!1)&&(t+="")&&(t=t.replace(/\s+$/,"")+" (Hit any key)"),Yr.keyIn(t,Rs({limit:null},e,{hideEchoBack:!0,mask:""}))};Yr.keyInSelect=function(t,e,r){var o=Rs({hideEchoBack:!1},r,{trueValue:null,falseValue:null,caseSensitive:!1,phContent:function(p){return p==="itemsCount"?t.length+"":p==="firstItem"?(t[0]+"").trim():p==="lastItem"?(t[t.length-1]+"").trim():null}}),a="",n={},u=49,A=`
+`;if(!Array.isArray(t)||!t.length||t.length>35)throw"`items` must be Array (max length: 35).";return t.forEach(function(p,h){var E=String.fromCharCode(u);a+=E,n[E]=h,A+="["+E+"] "+(p+"").trim()+`
+`,u=u===57?97:u+1}),(!r||r.cancel!==!1)&&(a+="0",n[0]=-1,A+="[0] "+(r&&r.cancel!=null&&typeof r.cancel!="boolean"?(r.cancel+"").trim():"CANCEL")+`
+`),o.limit=a,A+=`
+`,e==null&&(e="Choose one from list: "),(e+="")&&((!r||r.guide!==!1)&&(e=e.replace(/\s*:?\s*$/,"")+" [$<limit>]: "),A+=e),n[Yr.keyIn(A,o).toLowerCase()]};Yr.getRawInput=function(){return yk};function S2(t,e){var r;return e.length&&(r={},r[t]=e[0]),Yr.setDefaultOptions(r)[t]}Yr.setPrint=function(){return S2("print",arguments)};Yr.setPrompt=function(){return S2("prompt",arguments)};Yr.setEncoding=function(){return S2("encoding",arguments)};Yr.setMask=function(){return S2("mask",arguments)};Yr.setBufferSize=function(){return S2("bufferSize",arguments)}});var mH=_((t7t,hl)=>{(function(){var t={major:0,minor:2,patch:66,status:"beta"};tau_file_system={files:{},open:function(w,P,y){var F=tau_file_system.files[w];if(!F){if(y==="read")return null;F={path:w,text:"",type:P,get:function(z,X){return X===this.text.length||X>this.text.length?"end_of_file":this.text.substring(X,X+z)},put:function(z,X){return X==="end_of_file"?(this.text+=z,!0):X==="past_end_of_file"?null:(this.text=this.text.substring(0,X)+z+this.text.substring(X+z.length),!0)},get_byte:function(z){if(z==="end_of_stream")return-1;var X=Math.floor(z/2);if(this.text.length<=X)return-1;var Z=n(this.text[Math.floor(z/2)],0);return z%2===0?Z&255:Z/256>>>0},put_byte:function(z,X){var Z=X==="end_of_stream"?this.text.length:Math.floor(X/2);if(this.text.length<Z)return null;var ie=this.text.length===Z?-1:n(this.text[Math.floor(X/2)],0);return X%2===0?(ie=ie/256>>>0,ie=(ie&255)<<8|z&255):(ie=ie&255,ie=(z&255)<<8|ie&255),this.text.length===Z?this.text+=u(ie):this.text=this.text.substring(0,Z)+u(ie)+this.text.substring(Z+1),!0},flush:function(){return!0},close:function(){var z=tau_file_system.files[this.path];return z?!0:null}},tau_file_system.files[w]=F}return y==="write"&&(F.text=""),F}},tau_user_input={buffer:"",get:function(w,P){for(var y;tau_user_input.buffer.length<w;)y=window.prompt(),y&&(tau_user_input.buffer+=y);return y=tau_user_input.buffer.substr(0,w),tau_user_input.buffer=tau_user_input.buffer.substr(w),y}},tau_user_output={put:function(w,P){return console.log(w),!0},flush:function(){return!0}},nodejs_file_system={open:function(w,P,y){var F=ve("fs"),z=F.openSync(w,y[0]);return y==="read"&&!F.existsSync(w)?null:{get:function(X,Z){var ie=new Buffer(X);return F.readSync(z,ie,0,X,Z),ie.toString()},put:function(X,Z){var ie=Buffer.from(X);if(Z==="end_of_file")F.writeSync(z,ie);else{if(Z==="past_end_of_file")return null;F.writeSync(z,ie,0,ie.length,Z)}return!0},get_byte:function(X){return null},put_byte:function(X,Z){return null},flush:function(){return!0},close:function(){return F.closeSync(z),!0}}}},nodejs_user_input={buffer:"",get:function(w,P){for(var y,F=nme();nodejs_user_input.buffer.length<w;)nodejs_user_input.buffer+=F.question();return y=nodejs_user_input.buffer.substr(0,w),nodejs_user_input.buffer=nodejs_user_input.buffer.substr(w),y}},nodejs_user_output={put:function(w,P){return process.stdout.write(w),!0},flush:function(){return!0}};var e;Array.prototype.indexOf?e=function(w,P){return w.indexOf(P)}:e=function(w,P){for(var y=w.length,F=0;F<y;F++)if(P===w[F])return F;return-1};var r=function(w,P){if(w.length!==0){for(var y=w[0],F=w.length,z=1;z<F;z++)y=P(y,w[z]);return y}},o;Array.prototype.map?o=function(w,P){return w.map(P)}:o=function(w,P){for(var y=[],F=w.length,z=0;z<F;z++)y.push(P(w[z]));return y};var a;Array.prototype.filter?a=function(w,P){return w.filter(P)}:a=function(w,P){for(var y=[],F=w.length,z=0;z<F;z++)P(w[z])&&y.push(w[z]);return y};var n;String.prototype.codePointAt?n=function(w,P){return w.codePointAt(P)}:n=function(w,P){return w.charCodeAt(P)};var u;String.fromCodePoint?u=function(){return String.fromCodePoint.apply(null,arguments)}:u=function(){return String.fromCharCode.apply(null,arguments)};var A=0,p=1,h=/(\\a)|(\\b)|(\\f)|(\\n)|(\\r)|(\\t)|(\\v)|\\x([0-9a-fA-F]+)\\|\\([0-7]+)\\|(\\\\)|(\\')|('')|(\\")|(\\`)|(\\.)|(.)/g,E={"\\a":7,"\\b":8,"\\f":12,"\\n":10,"\\r":13,"\\t":9,"\\v":11};function I(w){var P=[],y=!1;return w.replace(h,function(F,z,X,Z,ie,Pe,Ne,ot,dt,Gt,$t,bt,an,Qr,mr,br,Wr){switch(!0){case dt!==void 0:return P.push(parseInt(dt,16)),"";case Gt!==void 0:return P.push(parseInt(Gt,8)),"";case $t!==void 0:case bt!==void 0:case an!==void 0:case Qr!==void 0:case mr!==void 0:return P.push(n(F.substr(1),0)),"";case Wr!==void 0:return P.push(n(Wr,0)),"";case br!==void 0:y=!0;default:return P.push(E[F]),""}}),y?null:P}function v(w,P){var y="";if(w.length<2)return w;try{w=w.replace(/\\([0-7]+)\\/g,function(Z,ie){return u(parseInt(ie,8))}),w=w.replace(/\\x([0-9a-fA-F]+)\\/g,function(Z,ie){return u(parseInt(ie,16))})}catch{return null}for(var F=0;F<w.length;F++){var z=w.charAt(F),X=w.charAt(F+1);if(z===P&&X===P)F++,y+=P;else if(z==="\\")if(["a","b","f","n","r","t","v","'",'"',"\\","a","\b","\f",`
+`,"\r","	","\v"].indexOf(X)!==-1)switch(F+=1,X){case"a":y+="a";break;case"b":y+="\b";break;case"f":y+="\f";break;case"n":y+=`
+`;break;case"r":y+="\r";break;case"t":y+="	";break;case"v":y+="\v";break;case"'":y+="'";break;case'"':y+='"';break;case"\\":y+="\\";break}else return null;else y+=z}return y}function x(w){for(var P="",y=0;y<w.length;y++)switch(w.charAt(y)){case"'":P+="\\'";break;case"\\":P+="\\\\";break;case"\b":P+="\\b";break;case"\f":P+="\\f";break;case`
+`:P+="\\n";break;case"\r":P+="\\r";break;case"	":P+="\\t";break;case"\v":P+="\\v";break;default:P+=w.charAt(y);break}return P}function C(w){var P=w.substr(2);switch(w.substr(0,2).toLowerCase()){case"0x":return parseInt(P,16);case"0b":return parseInt(P,2);case"0o":return parseInt(P,8);case"0'":return I(P)[0];default:return parseFloat(w)}}var R={whitespace:/^\s*(?:(?:%.*)|(?:\/\*(?:\n|\r|.)*?\*\/)|(?:\s+))\s*/,variable:/^(?:[A-Z_][a-zA-Z0-9_]*)/,atom:/^(\!|,|;|[a-z][0-9a-zA-Z_]*|[#\$\&\*\+\-\.\/\:\<\=\>\?\@\^\~\\]+|'(?:[^']*?(?:\\(?:x?\d+)?\\)*(?:'')*(?:\\')*)*')/,number:/^(?:0o[0-7]+|0x[0-9a-fA-F]+|0b[01]+|0'(?:''|\\[abfnrtv\\'"`]|\\x?\d+\\|[^\\])|\d+(?:\.\d+(?:[eE][+-]?\d+)?)?)/,string:/^(?:"([^"]|""|\\")*"|`([^`]|``|\\`)*`)/,l_brace:/^(?:\[)/,r_brace:/^(?:\])/,l_bracket:/^(?:\{)/,r_bracket:/^(?:\})/,bar:/^(?:\|)/,l_paren:/^(?:\()/,r_paren:/^(?:\))/};function L(w,P){return w.get_flag("char_conversion").id==="on"?P.replace(/./g,function(y){return w.get_char_conversion(y)}):P}function U(w){this.thread=w,this.text="",this.tokens=[]}U.prototype.set_last_tokens=function(w){return this.tokens=w},U.prototype.new_text=function(w){this.text=w,this.tokens=[]},U.prototype.get_tokens=function(w){var P,y=0,F=0,z=0,X=[],Z=!1;if(w){var ie=this.tokens[w-1];y=ie.len,P=L(this.thread,this.text.substr(ie.len)),F=ie.line,z=ie.start}else P=this.text;if(/^\s*$/.test(P))return null;for(;P!=="";){var Pe=[],Ne=!1;if(/^\n/.exec(P)!==null){F++,z=0,y++,P=P.replace(/\n/,""),Z=!0;continue}for(var ot in R)if(R.hasOwnProperty(ot)){var dt=R[ot].exec(P);dt&&Pe.push({value:dt[0],name:ot,matches:dt})}if(!Pe.length)return this.set_last_tokens([{value:P,matches:[],name:"lexical",line:F,start:z}]);var ie=r(Pe,function(Qr,mr){return Qr.value.length>=mr.value.length?Qr:mr});switch(ie.start=z,ie.line=F,P=P.replace(ie.value,""),z+=ie.value.length,y+=ie.value.length,ie.name){case"atom":ie.raw=ie.value,ie.value.charAt(0)==="'"&&(ie.value=v(ie.value.substr(1,ie.value.length-2),"'"),ie.value===null&&(ie.name="lexical",ie.value="unknown escape sequence"));break;case"number":ie.float=ie.value.substring(0,2)!=="0x"&&ie.value.match(/[.eE]/)!==null&&ie.value!=="0'.",ie.value=C(ie.value),ie.blank=Ne;break;case"string":var Gt=ie.value.charAt(0);ie.value=v(ie.value.substr(1,ie.value.length-2),Gt),ie.value===null&&(ie.name="lexical",ie.value="unknown escape sequence");break;case"whitespace":var $t=X[X.length-1];$t&&($t.space=!0),Ne=!0;continue;case"r_bracket":X.length>0&&X[X.length-1].name==="l_bracket"&&(ie=X.pop(),ie.name="atom",ie.value="{}",ie.raw="{}",ie.space=!1);break;case"r_brace":X.length>0&&X[X.length-1].name==="l_brace"&&(ie=X.pop(),ie.name="atom",ie.value="[]",ie.raw="[]",ie.space=!1);break}ie.len=y,X.push(ie),Ne=!1}var bt=this.set_last_tokens(X);return bt.length===0?null:bt};function J(w,P,y,F,z){if(!P[y])return{type:A,value:b.error.syntax(P[y-1],"expression expected",!0)};var X;if(F==="0"){var Z=P[y];switch(Z.name){case"number":return{type:p,len:y+1,value:new b.type.Num(Z.value,Z.float)};case"variable":return{type:p,len:y+1,value:new b.type.Var(Z.value)};case"string":var ie;switch(w.get_flag("double_quotes").id){case"atom":ie=new H(Z.value,[]);break;case"codes":ie=new H("[]",[]);for(var Pe=Z.value.length-1;Pe>=0;Pe--)ie=new H(".",[new b.type.Num(n(Z.value,Pe),!1),ie]);break;case"chars":ie=new H("[]",[]);for(var Pe=Z.value.length-1;Pe>=0;Pe--)ie=new H(".",[new b.type.Term(Z.value.charAt(Pe),[]),ie]);break}return{type:p,len:y+1,value:ie};case"l_paren":var bt=J(w,P,y+1,w.__get_max_priority(),!0);return bt.type!==p?bt:P[bt.len]&&P[bt.len].name==="r_paren"?(bt.len++,bt):{type:A,derived:!0,value:b.error.syntax(P[bt.len]?P[bt.len]:P[bt.len-1],") or operator expected",!P[bt.len])};case"l_bracket":var bt=J(w,P,y+1,w.__get_max_priority(),!0);return bt.type!==p?bt:P[bt.len]&&P[bt.len].name==="r_bracket"?(bt.len++,bt.value=new H("{}",[bt.value]),bt):{type:A,derived:!0,value:b.error.syntax(P[bt.len]?P[bt.len]:P[bt.len-1],"} or operator expected",!P[bt.len])}}var Ne=te(w,P,y,z);return Ne.type===p||Ne.derived||(Ne=ae(w,P,y),Ne.type===p||Ne.derived)?Ne:{type:A,derived:!1,value:b.error.syntax(P[y],"unexpected token")}}var ot=w.__get_max_priority(),dt=w.__get_next_priority(F),Gt=y;if(P[y].name==="atom"&&P[y+1]&&(P[y].space||P[y+1].name!=="l_paren")){var Z=P[y++],$t=w.__lookup_operator_classes(F,Z.value);if($t&&$t.indexOf("fy")>-1){var bt=J(w,P,y,F,z);if(bt.type!==A)return Z.value==="-"&&!Z.space&&b.type.is_number(bt.value)?{value:new b.type.Num(-bt.value.value,bt.value.is_float),len:bt.len,type:p}:{value:new b.type.Term(Z.value,[bt.value]),len:bt.len,type:p};X=bt}else if($t&&$t.indexOf("fx")>-1){var bt=J(w,P,y,dt,z);if(bt.type!==A)return{value:new b.type.Term(Z.value,[bt.value]),len:bt.len,type:p};X=bt}}y=Gt;var bt=J(w,P,y,dt,z);if(bt.type===p){y=bt.len;var Z=P[y];if(P[y]&&(P[y].name==="atom"&&w.__lookup_operator_classes(F,Z.value)||P[y].name==="bar"&&w.__lookup_operator_classes(F,"|"))){var an=dt,Qr=F,$t=w.__lookup_operator_classes(F,Z.value);if($t.indexOf("xf")>-1)return{value:new b.type.Term(Z.value,[bt.value]),len:++bt.len,type:p};if($t.indexOf("xfx")>-1){var mr=J(w,P,y+1,an,z);return mr.type===p?{value:new b.type.Term(Z.value,[bt.value,mr.value]),len:mr.len,type:p}:(mr.derived=!0,mr)}else if($t.indexOf("xfy")>-1){var mr=J(w,P,y+1,Qr,z);return mr.type===p?{value:new b.type.Term(Z.value,[bt.value,mr.value]),len:mr.len,type:p}:(mr.derived=!0,mr)}else if(bt.type!==A)for(;;){y=bt.len;var Z=P[y];if(Z&&Z.name==="atom"&&w.__lookup_operator_classes(F,Z.value)){var $t=w.__lookup_operator_classes(F,Z.value);if($t.indexOf("yf")>-1)bt={value:new b.type.Term(Z.value,[bt.value]),len:++y,type:p};else if($t.indexOf("yfx")>-1){var mr=J(w,P,++y,an,z);if(mr.type===A)return mr.derived=!0,mr;y=mr.len,bt={value:new b.type.Term(Z.value,[bt.value,mr.value]),len:y,type:p}}else break}else break}}else X={type:A,value:b.error.syntax(P[bt.len-1],"operator expected")};return bt}return bt}function te(w,P,y,F){if(!P[y]||P[y].name==="atom"&&P[y].raw==="."&&!F&&(P[y].space||!P[y+1]||P[y+1].name!=="l_paren"))return{type:A,derived:!1,value:b.error.syntax(P[y-1],"unfounded token")};var z=P[y],X=[];if(P[y].name==="atom"&&P[y].raw!==","){if(y++,P[y-1].space)return{type:p,len:y,value:new b.type.Term(z.value,X)};if(P[y]&&P[y].name==="l_paren"){if(P[y+1]&&P[y+1].name==="r_paren")return{type:A,derived:!0,value:b.error.syntax(P[y+1],"argument expected")};var Z=J(w,P,++y,"999",!0);if(Z.type===A)return Z.derived?Z:{type:A,derived:!0,value:b.error.syntax(P[y]?P[y]:P[y-1],"argument expected",!P[y])};for(X.push(Z.value),y=Z.len;P[y]&&P[y].name==="atom"&&P[y].value===",";){if(Z=J(w,P,y+1,"999",!0),Z.type===A)return Z.derived?Z:{type:A,derived:!0,value:b.error.syntax(P[y+1]?P[y+1]:P[y],"argument expected",!P[y+1])};X.push(Z.value),y=Z.len}if(P[y]&&P[y].name==="r_paren")y++;else return{type:A,derived:!0,value:b.error.syntax(P[y]?P[y]:P[y-1],", or ) expected",!P[y])}}return{type:p,len:y,value:new b.type.Term(z.value,X)}}return{type:A,derived:!1,value:b.error.syntax(P[y],"term expected")}}function ae(w,P,y){if(!P[y])return{type:A,derived:!1,value:b.error.syntax(P[y-1],"[ expected")};if(P[y]&&P[y].name==="l_brace"){var F=J(w,P,++y,"999",!0),z=[F.value],X=void 0;if(F.type===A)return P[y]&&P[y].name==="r_brace"?{type:p,len:y+1,value:new b.type.Term("[]",[])}:{type:A,derived:!0,value:b.error.syntax(P[y],"] expected")};for(y=F.len;P[y]&&P[y].name==="atom"&&P[y].value===",";){if(F=J(w,P,y+1,"999",!0),F.type===A)return F.derived?F:{type:A,derived:!0,value:b.error.syntax(P[y+1]?P[y+1]:P[y],"argument expected",!P[y+1])};z.push(F.value),y=F.len}var Z=!1;if(P[y]&&P[y].name==="bar"){if(Z=!0,F=J(w,P,y+1,"999",!0),F.type===A)return F.derived?F:{type:A,derived:!0,value:b.error.syntax(P[y+1]?P[y+1]:P[y],"argument expected",!P[y+1])};X=F.value,y=F.len}return P[y]&&P[y].name==="r_brace"?{type:p,len:y+1,value:g(z,X)}:{type:A,derived:!0,value:b.error.syntax(P[y]?P[y]:P[y-1],Z?"] expected":", or | or ] expected",!P[y])}}return{type:A,derived:!1,value:b.error.syntax(P[y],"list expected")}}function fe(w,P,y){var F=P[y].line,z=J(w,P,y,w.__get_max_priority(),!1),X=null,Z;if(z.type!==A)if(y=z.len,P[y]&&P[y].name==="atom"&&P[y].raw===".")if(y++,b.type.is_term(z.value)){if(z.value.indicator===":-/2"?(X=new b.type.Rule(z.value.args[0],we(z.value.args[1])),Z={value:X,len:y,type:p}):z.value.indicator==="-->/2"?(X=he(new b.type.Rule(z.value.args[0],z.value.args[1]),w),X.body=we(X.body),Z={value:X,len:y,type:b.type.is_rule(X)?p:A}):(X=new b.type.Rule(z.value,null),Z={value:X,len:y,type:p}),X){var ie=X.singleton_variables();ie.length>0&&w.throw_warning(b.warning.singleton(ie,X.head.indicator,F))}return Z}else return{type:A,value:b.error.syntax(P[y],"callable expected")};else return{type:A,value:b.error.syntax(P[y]?P[y]:P[y-1],". or operator expected")};return z}function ce(w,P,y){y=y||{},y.from=y.from?y.from:"$tau-js",y.reconsult=y.reconsult!==void 0?y.reconsult:!0;var F=new U(w),z={},X;F.new_text(P);var Z=0,ie=F.get_tokens(Z);do{if(ie===null||!ie[Z])break;var Pe=fe(w,ie,Z);if(Pe.type===A)return new H("throw",[Pe.value]);if(Pe.value.body===null&&Pe.value.head.indicator==="?-/1"){var Ne=new Je(w.session);Ne.add_goal(Pe.value.head.args[0]),Ne.answer(function(dt){b.type.is_error(dt)?w.throw_warning(dt.args[0]):(dt===!1||dt===null)&&w.throw_warning(b.warning.failed_goal(Pe.value.head.args[0],Pe.len))}),Z=Pe.len;var ot=!0}else if(Pe.value.body===null&&Pe.value.head.indicator===":-/1"){var ot=w.run_directive(Pe.value.head.args[0]);Z=Pe.len,Pe.value.head.args[0].indicator==="char_conversion/2"&&(ie=F.get_tokens(Z),Z=0)}else{X=Pe.value.head.indicator,y.reconsult!==!1&&z[X]!==!0&&!w.is_multifile_predicate(X)&&(w.session.rules[X]=a(w.session.rules[X]||[],function(Gt){return Gt.dynamic}),z[X]=!0);var ot=w.add_rule(Pe.value,y);Z=Pe.len}if(!ot)return ot}while(!0);return!0}function me(w,P){var y=new U(w);y.new_text(P);var F=0;do{var z=y.get_tokens(F);if(z===null)break;var X=J(w,z,0,w.__get_max_priority(),!1);if(X.type!==A){var Z=X.len,ie=Z;if(z[Z]&&z[Z].name==="atom"&&z[Z].raw===".")w.add_goal(we(X.value));else{var Pe=z[Z];return new H("throw",[b.error.syntax(Pe||z[Z-1],". or operator expected",!Pe)])}F=X.len+1}else return new H("throw",[X.value])}while(!0);return!0}function he(w,P){w=w.rename(P);var y=P.next_free_variable(),F=Be(w.body,y,P);return F.error?F.value:(w.body=F.value,w.head.args=w.head.args.concat([y,F.variable]),w.head=new H(w.head.id,w.head.args),w)}function Be(w,P,y){var F;if(b.type.is_term(w)&&w.indicator==="!/0")return{value:w,variable:P,error:!1};if(b.type.is_term(w)&&w.indicator===",/2"){var z=Be(w.args[0],P,y);if(z.error)return z;var X=Be(w.args[1],z.variable,y);return X.error?X:{value:new H(",",[z.value,X.value]),variable:X.variable,error:!1}}else{if(b.type.is_term(w)&&w.indicator==="{}/1")return{value:w.args[0],variable:P,error:!1};if(b.type.is_empty_list(w))return{value:new H("true",[]),variable:P,error:!1};if(b.type.is_list(w)){F=y.next_free_variable();for(var Z=w,ie;Z.indicator==="./2";)ie=Z,Z=Z.args[1];return b.type.is_variable(Z)?{value:b.error.instantiation("DCG"),variable:P,error:!0}:b.type.is_empty_list(Z)?(ie.args[1]=F,{value:new H("=",[P,w]),variable:F,error:!1}):{value:b.error.type("list",w,"DCG"),variable:P,error:!0}}else return b.type.is_callable(w)?(F=y.next_free_variable(),w.args=w.args.concat([P,F]),w=new H(w.id,w.args),{value:w,variable:F,error:!1}):{value:b.error.type("callable",w,"DCG"),variable:P,error:!0}}}function we(w){return b.type.is_variable(w)?new H("call",[w]):b.type.is_term(w)&&[",/2",";/2","->/2"].indexOf(w.indicator)!==-1?new H(w.id,[we(w.args[0]),we(w.args[1])]):w}function g(w,P){for(var y=P||new b.type.Term("[]",[]),F=w.length-1;F>=0;F--)y=new b.type.Term(".",[w[F],y]);return y}function Ee(w,P){for(var y=w.length-1;y>=0;y--)w[y]===P&&w.splice(y,1)}function Se(w){for(var P={},y=[],F=0;F<w.length;F++)w[F]in P||(y.push(w[F]),P[w[F]]=!0);return y}function le(w,P,y,F){if(w.session.rules[y]!==null){for(var z=0;z<w.session.rules[y].length;z++)if(w.session.rules[y][z]===F){w.session.rules[y].splice(z,1),w.success(P);break}}}function ne(w){return function(P,y,F){var z=F.args[0],X=F.args.slice(1,w);if(b.type.is_variable(z))P.throw_error(b.error.instantiation(P.level));else if(!b.type.is_callable(z))P.throw_error(b.error.type("callable",z,P.level));else{var Z=new H(z.id,z.args.concat(X));P.prepend([new xe(y.goal.replace(Z),y.substitution,y)])}}}function ee(w){for(var P=w.length-1;P>=0;P--)if(w.charAt(P)==="/")return new H("/",[new H(w.substring(0,P)),new Fe(parseInt(w.substring(P+1)),!1)])}function Ie(w){this.id=w}function Fe(w,P){this.is_float=P!==void 0?P:parseInt(w)!==w,this.value=this.is_float?w:parseInt(w)}var At=0;function H(w,P,y){this.ref=y||++At,this.id=w,this.args=P||[],this.indicator=w+"/"+this.args.length}var at=0;function Re(w,P,y,F,z,X){this.id=at++,this.stream=w,this.mode=P,this.alias=y,this.type=F!==void 0?F:"text",this.reposition=z!==void 0?z:!0,this.eof_action=X!==void 0?X:"eof_code",this.position=this.mode==="append"?"end_of_stream":0,this.output=this.mode==="write"||this.mode==="append",this.input=this.mode==="read"}function ke(w){w=w||{},this.links=w}function xe(w,P,y){P=P||new ke,y=y||null,this.goal=w,this.substitution=P,this.parent=y}function He(w,P,y){this.head=w,this.body=P,this.dynamic=y||!1}function Te(w){w=w===void 0||w<=0?1e3:w,this.rules={},this.src_predicates={},this.rename=0,this.modules=[],this.thread=new Je(this),this.total_threads=1,this.renamed_variables={},this.public_predicates={},this.multifile_predicates={},this.limit=w,this.streams={user_input:new Re(typeof hl<"u"&&hl.exports?nodejs_user_input:tau_user_input,"read","user_input","text",!1,"reset"),user_output:new Re(typeof hl<"u"&&hl.exports?nodejs_user_output:tau_user_output,"write","user_output","text",!1,"eof_code")},this.file_system=typeof hl<"u"&&hl.exports?nodejs_file_system:tau_file_system,this.standard_input=this.streams.user_input,this.standard_output=this.streams.user_output,this.current_input=this.streams.user_input,this.current_output=this.streams.user_output,this.format_success=function(P){return P.substitution},this.format_error=function(P){return P.goal},this.flag={bounded:b.flag.bounded.value,max_integer:b.flag.max_integer.value,min_integer:b.flag.min_integer.value,integer_rounding_function:b.flag.integer_rounding_function.value,char_conversion:b.flag.char_conversion.value,debug:b.flag.debug.value,max_arity:b.flag.max_arity.value,unknown:b.flag.unknown.value,double_quotes:b.flag.double_quotes.value,occurs_check:b.flag.occurs_check.value,dialect:b.flag.dialect.value,version_data:b.flag.version_data.value,nodejs:b.flag.nodejs.value},this.__loaded_modules=[],this.__char_conversion={},this.__operators={1200:{":-":["fx","xfx"],"-->":["xfx"],"?-":["fx"]},1100:{";":["xfy"]},1050:{"->":["xfy"]},1e3:{",":["xfy"]},900:{"\\+":["fy"]},700:{"=":["xfx"],"\\=":["xfx"],"==":["xfx"],"\\==":["xfx"],"@<":["xfx"],"@=<":["xfx"],"@>":["xfx"],"@>=":["xfx"],"=..":["xfx"],is:["xfx"],"=:=":["xfx"],"=\\=":["xfx"],"<":["xfx"],"=<":["xfx"],">":["xfx"],">=":["xfx"]},600:{":":["xfy"]},500:{"+":["yfx"],"-":["yfx"],"/\\":["yfx"],"\\/":["yfx"]},400:{"*":["yfx"],"/":["yfx"],"//":["yfx"],rem:["yfx"],mod:["yfx"],"<<":["yfx"],">>":["yfx"]},200:{"**":["xfx"],"^":["xfy"],"-":["fy"],"+":["fy"],"\\":["fy"]}}}function Je(w){this.epoch=Date.now(),this.session=w,this.session.total_threads++,this.total_steps=0,this.cpu_time=0,this.cpu_time_last=0,this.points=[],this.debugger=!1,this.debugger_states=[],this.level="top_level/0",this.__calls=[],this.current_limit=this.session.limit,this.warnings=[]}function je(w,P,y){this.id=w,this.rules=P,this.exports=y,b.module[w]=this}je.prototype.exports_predicate=function(w){return this.exports.indexOf(w)!==-1},Ie.prototype.unify=function(w,P){if(P&&e(w.variables(),this.id)!==-1&&!b.type.is_variable(w))return null;var y={};return y[this.id]=w,new ke(y)},Fe.prototype.unify=function(w,P){return b.type.is_number(w)&&this.value===w.value&&this.is_float===w.is_float?new ke:null},H.prototype.unify=function(w,P){if(b.type.is_term(w)&&this.indicator===w.indicator){for(var y=new ke,F=0;F<this.args.length;F++){var z=b.unify(this.args[F].apply(y),w.args[F].apply(y),P);if(z===null)return null;for(var X in z.links)y.links[X]=z.links[X];y=y.apply(z)}return y}return null},Re.prototype.unify=function(w,P){return b.type.is_stream(w)&&this.id===w.id?new ke:null},Ie.prototype.toString=function(w){return this.id},Fe.prototype.toString=function(w){return this.is_float&&e(this.value.toString(),".")===-1?this.value+".0":this.value.toString()},H.prototype.toString=function(w,P,y){if(w=w||{},w.quoted=w.quoted===void 0?!0:w.quoted,w.ignore_ops=w.ignore_ops===void 0?!1:w.ignore_ops,w.numbervars=w.numbervars===void 0?!1:w.numbervars,P=P===void 0?1200:P,y=y===void 0?"":y,w.numbervars&&this.indicator==="$VAR/1"&&b.type.is_integer(this.args[0])&&this.args[0].value>=0){var F=this.args[0].value,z=Math.floor(F/26),X=F%26;return"ABCDEFGHIJKLMNOPQRSTUVWXYZ"[X]+(z!==0?z:"")}switch(this.indicator){case"[]/0":case"{}/0":case"!/0":return this.id;case"{}/1":return"{"+this.args[0].toString(w)+"}";case"./2":for(var Z="["+this.args[0].toString(w),ie=this.args[1];ie.indicator==="./2";)Z+=", "+ie.args[0].toString(w),ie=ie.args[1];return ie.indicator!=="[]/0"&&(Z+="|"+ie.toString(w)),Z+="]",Z;case",/2":return"("+this.args[0].toString(w)+", "+this.args[1].toString(w)+")";default:var Pe=this.id,Ne=w.session?w.session.lookup_operator(this.id,this.args.length):null;if(w.session===void 0||w.ignore_ops||Ne===null)return w.quoted&&!/^(!|,|;|[a-z][0-9a-zA-Z_]*)$/.test(Pe)&&Pe!=="{}"&&Pe!=="[]"&&(Pe="'"+x(Pe)+"'"),Pe+(this.args.length?"("+o(this.args,function($t){return $t.toString(w)}).join(", ")+")":"");var ot=Ne.priority>P.priority||Ne.priority===P.priority&&(Ne.class==="xfy"&&this.indicator!==P.indicator||Ne.class==="yfx"&&this.indicator!==P.indicator||this.indicator===P.indicator&&Ne.class==="yfx"&&y==="right"||this.indicator===P.indicator&&Ne.class==="xfy"&&y==="left");Ne.indicator=this.indicator;var dt=ot?"(":"",Gt=ot?")":"";return this.args.length===0?"("+this.id+")":["fy","fx"].indexOf(Ne.class)!==-1?dt+Pe+" "+this.args[0].toString(w,Ne)+Gt:["yf","xf"].indexOf(Ne.class)!==-1?dt+this.args[0].toString(w,Ne)+" "+Pe+Gt:dt+this.args[0].toString(w,Ne,"left")+" "+this.id+" "+this.args[1].toString(w,Ne,"right")+Gt}},Re.prototype.toString=function(w){return"<stream>("+this.id+")"},ke.prototype.toString=function(w){var P="{";for(var y in this.links)!this.links.hasOwnProperty(y)||(P!=="{"&&(P+=", "),P+=y+"/"+this.links[y].toString(w));return P+="}",P},xe.prototype.toString=function(w){return this.goal===null?"<"+this.substitution.toString(w)+">":"<"+this.goal.toString(w)+", "+this.substitution.toString(w)+">"},He.prototype.toString=function(w){return this.body?this.head.toString(w)+" :- "+this.body.toString(w)+".":this.head.toString(w)+"."},Te.prototype.toString=function(w){for(var P="",y=0;y<this.modules.length;y++)P+=":- use_module(library("+this.modules[y]+`)).
+`;P+=`
+`;for(key in this.rules)for(y=0;y<this.rules[key].length;y++)P+=this.rules[key][y].toString(w),P+=`
+`;return P},Ie.prototype.clone=function(){return new Ie(this.id)},Fe.prototype.clone=function(){return new Fe(this.value,this.is_float)},H.prototype.clone=function(){return new H(this.id,o(this.args,function(w){return w.clone()}))},Re.prototype.clone=function(){return new Stram(this.stream,this.mode,this.alias,this.type,this.reposition,this.eof_action)},ke.prototype.clone=function(){var w={};for(var P in this.links)!this.links.hasOwnProperty(P)||(w[P]=this.links[P].clone());return new ke(w)},xe.prototype.clone=function(){return new xe(this.goal.clone(),this.substitution.clone(),this.parent)},He.prototype.clone=function(){return new He(this.head.clone(),this.body!==null?this.body.clone():null)},Ie.prototype.equals=function(w){return b.type.is_variable(w)&&this.id===w.id},Fe.prototype.equals=function(w){return b.type.is_number(w)&&this.value===w.value&&this.is_float===w.is_float},H.prototype.equals=function(w){if(!b.type.is_term(w)||this.indicator!==w.indicator)return!1;for(var P=0;P<this.args.length;P++)if(!this.args[P].equals(w.args[P]))return!1;return!0},Re.prototype.equals=function(w){return b.type.is_stream(w)&&this.id===w.id},ke.prototype.equals=function(w){var P;if(!b.type.is_substitution(w))return!1;for(P in this.links)if(!!this.links.hasOwnProperty(P)&&(!w.links[P]||!this.links[P].equals(w.links[P])))return!1;for(P in w.links)if(!!w.links.hasOwnProperty(P)&&!this.links[P])return!1;return!0},xe.prototype.equals=function(w){return b.type.is_state(w)&&this.goal.equals(w.goal)&&this.substitution.equals(w.substitution)&&this.parent===w.parent},He.prototype.equals=function(w){return b.type.is_rule(w)&&this.head.equals(w.head)&&(this.body===null&&w.body===null||this.body!==null&&this.body.equals(w.body))},Ie.prototype.rename=function(w){return w.get_free_variable(this)},Fe.prototype.rename=function(w){return this},H.prototype.rename=function(w){return new H(this.id,o(this.args,function(P){return P.rename(w)}))},Re.prototype.rename=function(w){return this},He.prototype.rename=function(w){return new He(this.head.rename(w),this.body!==null?this.body.rename(w):null)},Ie.prototype.variables=function(){return[this.id]},Fe.prototype.variables=function(){return[]},H.prototype.variables=function(){return[].concat.apply([],o(this.args,function(w){return w.variables()}))},Re.prototype.variables=function(){return[]},He.prototype.variables=function(){return this.body===null?this.head.variables():this.head.variables().concat(this.body.variables())},Ie.prototype.apply=function(w){return w.lookup(this.id)?w.lookup(this.id):this},Fe.prototype.apply=function(w){return this},H.prototype.apply=function(w){if(this.indicator==="./2"){for(var P=[],y=this;y.indicator==="./2";)P.push(y.args[0].apply(w)),y=y.args[1];for(var F=y.apply(w),z=P.length-1;z>=0;z--)F=new H(".",[P[z],F]);return F}return new H(this.id,o(this.args,function(X){return X.apply(w)}),this.ref)},Re.prototype.apply=function(w){return this},He.prototype.apply=function(w){return new He(this.head.apply(w),this.body!==null?this.body.apply(w):null)},ke.prototype.apply=function(w){var P,y={};for(P in this.links)!this.links.hasOwnProperty(P)||(y[P]=this.links[P].apply(w));return new ke(y)},H.prototype.select=function(){for(var w=this;w.indicator===",/2";)w=w.args[0];return w},H.prototype.replace=function(w){return this.indicator===",/2"?this.args[0].indicator===",/2"?new H(",",[this.args[0].replace(w),this.args[1]]):w===null?this.args[1]:new H(",",[w,this.args[1]]):w},H.prototype.search=function(w){if(b.type.is_term(w)&&w.ref!==void 0&&this.ref===w.ref)return!0;for(var P=0;P<this.args.length;P++)if(b.type.is_term(this.args[P])&&this.args[P].search(w))return!0;return!1},Te.prototype.get_current_input=function(){return this.current_input},Je.prototype.get_current_input=function(){return this.session.get_current_input()},Te.prototype.get_current_output=function(){return this.current_output},Je.prototype.get_current_output=function(){return this.session.get_current_output()},Te.prototype.set_current_input=function(w){this.current_input=w},Je.prototype.set_current_input=function(w){return this.session.set_current_input(w)},Te.prototype.set_current_output=function(w){this.current_input=w},Je.prototype.set_current_output=function(w){return this.session.set_current_output(w)},Te.prototype.get_stream_by_alias=function(w){return this.streams[w]},Je.prototype.get_stream_by_alias=function(w){return this.session.get_stream_by_alias(w)},Te.prototype.file_system_open=function(w,P,y){return this.file_system.open(w,P,y)},Je.prototype.file_system_open=function(w,P,y){return this.session.file_system_open(w,P,y)},Te.prototype.get_char_conversion=function(w){return this.__char_conversion[w]||w},Je.prototype.get_char_conversion=function(w){return this.session.get_char_conversion(w)},Te.prototype.parse=function(w){return this.thread.parse(w)},Je.prototype.parse=function(w){var P=new U(this);P.new_text(w);var y=P.get_tokens();if(y===null)return!1;var F=J(this,y,0,this.__get_max_priority(),!1);return F.len!==y.length?!1:{value:F.value,expr:F,tokens:y}},Te.prototype.get_flag=function(w){return this.flag[w]},Je.prototype.get_flag=function(w){return this.session.get_flag(w)},Te.prototype.add_rule=function(w,P){return P=P||{},P.from=P.from?P.from:"$tau-js",this.src_predicates[w.head.indicator]=P.from,this.rules[w.head.indicator]||(this.rules[w.head.indicator]=[]),this.rules[w.head.indicator].push(w),this.public_predicates.hasOwnProperty(w.head.indicator)||(this.public_predicates[w.head.indicator]=!1),!0},Je.prototype.add_rule=function(w,P){return this.session.add_rule(w,P)},Te.prototype.run_directive=function(w){this.thread.run_directive(w)},Je.prototype.run_directive=function(w){return b.type.is_directive(w)?(b.directive[w.indicator](this,w),!0):!1},Te.prototype.__get_max_priority=function(){return"1200"},Je.prototype.__get_max_priority=function(){return this.session.__get_max_priority()},Te.prototype.__get_next_priority=function(w){var P=0;w=parseInt(w);for(var y in this.__operators)if(!!this.__operators.hasOwnProperty(y)){var F=parseInt(y);F>P&&F<w&&(P=F)}return P.toString()},Je.prototype.__get_next_priority=function(w){return this.session.__get_next_priority(w)},Te.prototype.__lookup_operator_classes=function(w,P){return this.__operators.hasOwnProperty(w)&&this.__operators[w][P]instanceof Array&&this.__operators[w][P]||!1},Je.prototype.__lookup_operator_classes=function(w,P){return this.session.__lookup_operator_classes(w,P)},Te.prototype.lookup_operator=function(w,P){for(var y in this.__operators)if(this.__operators[y][w]){for(var F=0;F<this.__operators[y][w].length;F++)if(P===0||this.__operators[y][w][F].length===P+1)return{priority:y,class:this.__operators[y][w][F]}}return null},Je.prototype.lookup_operator=function(w,P){return this.session.lookup_operator(w,P)},Te.prototype.throw_warning=function(w){this.thread.throw_warning(w)},Je.prototype.throw_warning=function(w){this.warnings.push(w)},Te.prototype.get_warnings=function(){return this.thread.get_warnings()},Je.prototype.get_warnings=function(){return this.warnings},Te.prototype.add_goal=function(w,P){this.thread.add_goal(w,P)},Je.prototype.add_goal=function(w,P,y){y=y||null,P===!0&&(this.points=[]);for(var F=w.variables(),z={},X=0;X<F.length;X++)z[F[X]]=new Ie(F[X]);this.points.push(new xe(w,new ke(z),y))},Te.prototype.consult=function(w,P){return this.thread.consult(w,P)},Je.prototype.consult=function(w,P){var y="";if(typeof w=="string"){y=w;var F=y.length;if(y.substring(F-3,F)===".pl"&&document.getElementById(y)){var z=document.getElementById(y),X=z.getAttribute("type");X!==null&&X.replace(/ /g,"").toLowerCase()==="text/prolog"&&(y=z.text)}}else if(w.nodeName)switch(w.nodeName.toLowerCase()){case"input":case"textarea":y=w.value;break;default:y=w.innerHTML;break}else return!1;return this.warnings=[],ce(this,y,P)},Te.prototype.query=function(w){return this.thread.query(w)},Je.prototype.query=function(w){return this.points=[],this.debugger_points=[],me(this,w)},Te.prototype.head_point=function(){return this.thread.head_point()},Je.prototype.head_point=function(){return this.points[this.points.length-1]},Te.prototype.get_free_variable=function(w){return this.thread.get_free_variable(w)},Je.prototype.get_free_variable=function(w){var P=[];if(w.id==="_"||this.session.renamed_variables[w.id]===void 0){for(this.session.rename++,this.points.length>0&&(P=this.head_point().substitution.domain());e(P,b.format_variable(this.session.rename))!==-1;)this.session.rename++;if(w.id==="_")return new Ie(b.format_variable(this.session.rename));this.session.renamed_variables[w.id]=b.format_variable(this.session.rename)}return new Ie(this.session.renamed_variables[w.id])},Te.prototype.next_free_variable=function(){return this.thread.next_free_variable()},Je.prototype.next_free_variable=function(){this.session.rename++;var w=[];for(this.points.length>0&&(w=this.head_point().substitution.domain());e(w,b.format_variable(this.session.rename))!==-1;)this.session.rename++;return new Ie(b.format_variable(this.session.rename))},Te.prototype.is_public_predicate=function(w){return!this.public_predicates.hasOwnProperty(w)||this.public_predicates[w]===!0},Je.prototype.is_public_predicate=function(w){return this.session.is_public_predicate(w)},Te.prototype.is_multifile_predicate=function(w){return this.multifile_predicates.hasOwnProperty(w)&&this.multifile_predicates[w]===!0},Je.prototype.is_multifile_predicate=function(w){return this.session.is_multifile_predicate(w)},Te.prototype.prepend=function(w){return this.thread.prepend(w)},Je.prototype.prepend=function(w){for(var P=w.length-1;P>=0;P--)this.points.push(w[P])},Te.prototype.success=function(w,P){return this.thread.success(w,P)},Je.prototype.success=function(w,y){var y=typeof y>"u"?w:y;this.prepend([new xe(w.goal.replace(null),w.substitution,y)])},Te.prototype.throw_error=function(w){return this.thread.throw_error(w)},Je.prototype.throw_error=function(w){this.prepend([new xe(new H("throw",[w]),new ke,null,null)])},Te.prototype.step_rule=function(w,P){return this.thread.step_rule(w,P)},Je.prototype.step_rule=function(w,P){var y=P.indicator;if(w==="user"&&(w=null),w===null&&this.session.rules.hasOwnProperty(y))return this.session.rules[y];for(var F=w===null?this.session.modules:e(this.session.modules,w)===-1?[]:[w],z=0;z<F.length;z++){var X=b.module[F[z]];if(X.rules.hasOwnProperty(y)&&(X.rules.hasOwnProperty(this.level)||X.exports_predicate(y)))return b.module[F[z]].rules[y]}return null},Te.prototype.step=function(){return this.thread.step()},Je.prototype.step=function(){if(this.points.length!==0){var w=!1,P=this.points.pop();if(this.debugger&&this.debugger_states.push(P),b.type.is_term(P.goal)){var y=P.goal.select(),F=null,z=[];if(y!==null){this.total_steps++;for(var X=P;X.parent!==null&&X.parent.goal.search(y);)X=X.parent;if(this.level=X.parent===null?"top_level/0":X.parent.goal.select().indicator,b.type.is_term(y)&&y.indicator===":/2"&&(F=y.args[0].id,y=y.args[1]),F===null&&b.type.is_builtin(y))this.__call_indicator=y.indicator,w=b.predicate[y.indicator](this,P,y);else{var Z=this.step_rule(F,y);if(Z===null)this.session.rules.hasOwnProperty(y.indicator)||(this.get_flag("unknown").id==="error"?this.throw_error(b.error.existence("procedure",y.indicator,this.level)):this.get_flag("unknown").id==="warning"&&this.throw_warning("unknown procedure "+y.indicator+" (from "+this.level+")"));else if(Z instanceof Function)w=Z(this,P,y);else{for(var ie in Z)if(!!Z.hasOwnProperty(ie)){var Pe=Z[ie];this.session.renamed_variables={},Pe=Pe.rename(this);var Ne=this.get_flag("occurs_check").indicator==="true/0",ot=new xe,dt=b.unify(y,Pe.head,Ne);dt!==null&&(ot.goal=P.goal.replace(Pe.body),ot.goal!==null&&(ot.goal=ot.goal.apply(dt)),ot.substitution=P.substitution.apply(dt),ot.parent=P,z.push(ot))}this.prepend(z)}}}}else b.type.is_variable(P.goal)?this.throw_error(b.error.instantiation(this.level)):this.throw_error(b.error.type("callable",P.goal,this.level));return w}},Te.prototype.answer=function(w){return this.thread.answer(w)},Je.prototype.answer=function(w){w=w||function(P){},this.__calls.push(w),!(this.__calls.length>1)&&this.again()},Te.prototype.answers=function(w,P,y){return this.thread.answers(w,P,y)},Je.prototype.answers=function(w,P,y){var F=P||1e3,z=this;if(P<=0){y&&y();return}this.answer(function(X){w(X),X!==!1?setTimeout(function(){z.answers(w,P-1,y)},1):y&&y()})},Te.prototype.again=function(w){return this.thread.again(w)},Je.prototype.again=function(w){for(var P,y=Date.now();this.__calls.length>0;){for(this.warnings=[],w!==!1&&(this.current_limit=this.session.limit);this.current_limit>0&&this.points.length>0&&this.head_point().goal!==null&&!b.type.is_error(this.head_point().goal);)if(this.current_limit--,this.step()===!0)return;var F=Date.now();this.cpu_time_last=F-y,this.cpu_time+=this.cpu_time_last;var z=this.__calls.shift();this.current_limit<=0?z(null):this.points.length===0?z(!1):b.type.is_error(this.head_point().goal)?(P=this.session.format_error(this.points.pop()),this.points=[],z(P)):(this.debugger&&this.debugger_states.push(this.head_point()),P=this.session.format_success(this.points.pop()),z(P))}},Te.prototype.unfold=function(w){if(w.body===null)return!1;var P=w.head,y=w.body,F=y.select(),z=new Je(this),X=[];z.add_goal(F),z.step();for(var Z=z.points.length-1;Z>=0;Z--){var ie=z.points[Z],Pe=P.apply(ie.substitution),Ne=y.replace(ie.goal);Ne!==null&&(Ne=Ne.apply(ie.substitution)),X.push(new He(Pe,Ne))}var ot=this.rules[P.indicator],dt=e(ot,w);return X.length>0&&dt!==-1?(ot.splice.apply(ot,[dt,1].concat(X)),!0):!1},Je.prototype.unfold=function(w){return this.session.unfold(w)},Ie.prototype.interpret=function(w){return b.error.instantiation(w.level)},Fe.prototype.interpret=function(w){return this},H.prototype.interpret=function(w){return b.type.is_unitary_list(this)?this.args[0].interpret(w):b.operate(w,this)},Ie.prototype.compare=function(w){return this.id<w.id?-1:this.id>w.id?1:0},Fe.prototype.compare=function(w){if(this.value===w.value&&this.is_float===w.is_float)return 0;if(this.value<w.value||this.value===w.value&&this.is_float&&!w.is_float)return-1;if(this.value>w.value)return 1},H.prototype.compare=function(w){if(this.args.length<w.args.length||this.args.length===w.args.length&&this.id<w.id)return-1;if(this.args.length>w.args.length||this.args.length===w.args.length&&this.id>w.id)return 1;for(var P=0;P<this.args.length;P++){var y=b.compare(this.args[P],w.args[P]);if(y!==0)return y}return 0},ke.prototype.lookup=function(w){return this.links[w]?this.links[w]:null},ke.prototype.filter=function(w){var P={};for(var y in this.links)if(!!this.links.hasOwnProperty(y)){var F=this.links[y];w(y,F)&&(P[y]=F)}return new ke(P)},ke.prototype.exclude=function(w){var P={};for(var y in this.links)!this.links.hasOwnProperty(y)||e(w,y)===-1&&(P[y]=this.links[y]);return new ke(P)},ke.prototype.add=function(w,P){this.links[w]=P},ke.prototype.domain=function(w){var P=w===!0?function(z){return z}:function(z){return new Ie(z)},y=[];for(var F in this.links)y.push(P(F));return y},Ie.prototype.compile=function(){return'new pl.type.Var("'+this.id.toString()+'")'},Fe.prototype.compile=function(){return"new pl.type.Num("+this.value.toString()+", "+this.is_float.toString()+")"},H.prototype.compile=function(){return'new pl.type.Term("'+this.id.replace(/"/g,'\\"')+'", ['+o(this.args,function(w){return w.compile()})+"])"},He.prototype.compile=function(){return"new pl.type.Rule("+this.head.compile()+", "+(this.body===null?"null":this.body.compile())+")"},Te.prototype.compile=function(){var w,P=[],y;for(var F in this.rules)if(!!this.rules.hasOwnProperty(F)){var z=this.rules[F];y=[],w='"'+F+'": [';for(var X=0;X<z.length;X++)y.push(z[X].compile());w+=y.join(),w+="]",P.push(w)}return"{"+P.join()+"};"},Ie.prototype.toJavaScript=function(){},Fe.prototype.toJavaScript=function(){return this.value},H.prototype.toJavaScript=function(){if(this.args.length===0&&this.indicator!=="[]/0")return this.id;if(b.type.is_list(this)){for(var w=[],P=this,y;P.indicator==="./2";){if(y=P.args[0].toJavaScript(),y===void 0)return;w.push(y),P=P.args[1]}if(P.indicator==="[]/0")return w}},He.prototype.singleton_variables=function(){var w=this.head.variables(),P={},y=[];this.body!==null&&(w=w.concat(this.body.variables()));for(var F=0;F<w.length;F++)P[w[F]]===void 0&&(P[w[F]]=0),P[w[F]]++;for(var z in P)z!=="_"&&P[z]===1&&y.push(z);return y};var b={__env:typeof hl<"u"&&hl.exports?global:window,module:{},version:t,parser:{tokenizer:U,expression:J},utils:{str_indicator:ee,codePointAt:n,fromCodePoint:u},statistics:{getCountTerms:function(){return At}},fromJavaScript:{test:{boolean:function(w){return w===!0||w===!1},number:function(w){return typeof w=="number"},string:function(w){return typeof w=="string"},list:function(w){return w instanceof Array},variable:function(w){return w===void 0},any:function(w){return!0}},conversion:{boolean:function(w){return new H(w?"true":"false",[])},number:function(w){return new Fe(w,w%1!==0)},string:function(w){return new H(w,[])},list:function(w){for(var P=[],y,F=0;F<w.length;F++){if(y=b.fromJavaScript.apply(w[F]),y===void 0)return;P.push(y)}return g(P)},variable:function(w){return new Ie("_")},any:function(w){}},apply:function(w){for(var P in b.fromJavaScript.test)if(P!=="any"&&b.fromJavaScript.test[P](w))return b.fromJavaScript.conversion[P](w);return b.fromJavaScript.conversion.any(w)}},type:{Var:Ie,Num:Fe,Term:H,Rule:He,State:xe,Stream:Re,Module:je,Thread:Je,Session:Te,Substitution:ke,order:[Ie,Fe,H,Re],compare:function(w,P){var y=e(b.type.order,w.constructor),F=e(b.type.order,P.constructor);if(y<F)return-1;if(y>F)return 1;if(w.constructor===Fe){if(w.is_float&&P.is_float)return 0;if(w.is_float)return-1;if(P.is_float)return 1}return 0},is_substitution:function(w){return w instanceof ke},is_state:function(w){return w instanceof xe},is_rule:function(w){return w instanceof He},is_variable:function(w){return w instanceof Ie},is_stream:function(w){return w instanceof Re},is_anonymous_var:function(w){return w instanceof Ie&&w.id==="_"},is_callable:function(w){return w instanceof H},is_number:function(w){return w instanceof Fe},is_integer:function(w){return w instanceof Fe&&!w.is_float},is_float:function(w){return w instanceof Fe&&w.is_float},is_term:function(w){return w instanceof H},is_atom:function(w){return w instanceof H&&w.args.length===0},is_ground:function(w){if(w instanceof Ie)return!1;if(w instanceof H){for(var P=0;P<w.args.length;P++)if(!b.type.is_ground(w.args[P]))return!1}return!0},is_atomic:function(w){return w instanceof H&&w.args.length===0||w instanceof Fe},is_compound:function(w){return w instanceof H&&w.args.length>0},is_list:function(w){return w instanceof H&&(w.indicator==="[]/0"||w.indicator==="./2")},is_empty_list:function(w){return w instanceof H&&w.indicator==="[]/0"},is_non_empty_list:function(w){return w instanceof H&&w.indicator==="./2"},is_fully_list:function(w){for(;w instanceof H&&w.indicator==="./2";)w=w.args[1];return w instanceof Ie||w instanceof H&&w.indicator==="[]/0"},is_instantiated_list:function(w){for(;w instanceof H&&w.indicator==="./2";)w=w.args[1];return w instanceof H&&w.indicator==="[]/0"},is_unitary_list:function(w){return w instanceof H&&w.indicator==="./2"&&w.args[1]instanceof H&&w.args[1].indicator==="[]/0"},is_character:function(w){return w instanceof H&&(w.id.length===1||w.id.length>0&&w.id.length<=2&&n(w.id,0)>=65536)},is_character_code:function(w){return w instanceof Fe&&!w.is_float&&w.value>=0&&w.value<=1114111},is_byte:function(w){return w instanceof Fe&&!w.is_float&&w.value>=0&&w.value<=255},is_operator:function(w){return w instanceof H&&b.arithmetic.evaluation[w.indicator]},is_directive:function(w){return w instanceof H&&b.directive[w.indicator]!==void 0},is_builtin:function(w){return w instanceof H&&b.predicate[w.indicator]!==void 0},is_error:function(w){return w instanceof H&&w.indicator==="throw/1"},is_predicate_indicator:function(w){return w instanceof H&&w.indicator==="//2"&&w.args[0]instanceof H&&w.args[0].args.length===0&&w.args[1]instanceof Fe&&w.args[1].is_float===!1},is_flag:function(w){return w instanceof H&&w.args.length===0&&b.flag[w.id]!==void 0},is_value_flag:function(w,P){if(!b.type.is_flag(w))return!1;for(var y in b.flag[w.id].allowed)if(!!b.flag[w.id].allowed.hasOwnProperty(y)&&b.flag[w.id].allowed[y].equals(P))return!0;return!1},is_io_mode:function(w){return b.type.is_atom(w)&&["read","write","append"].indexOf(w.id)!==-1},is_stream_option:function(w){return b.type.is_term(w)&&(w.indicator==="alias/1"&&b.type.is_atom(w.args[0])||w.indicator==="reposition/1"&&b.type.is_atom(w.args[0])&&(w.args[0].id==="true"||w.args[0].id==="false")||w.indicator==="type/1"&&b.type.is_atom(w.args[0])&&(w.args[0].id==="text"||w.args[0].id==="binary")||w.indicator==="eof_action/1"&&b.type.is_atom(w.args[0])&&(w.args[0].id==="error"||w.args[0].id==="eof_code"||w.args[0].id==="reset"))},is_stream_position:function(w){return b.type.is_integer(w)&&w.value>=0||b.type.is_atom(w)&&(w.id==="end_of_stream"||w.id==="past_end_of_stream")},is_stream_property:function(w){return b.type.is_term(w)&&(w.indicator==="input/0"||w.indicator==="output/0"||w.indicator==="alias/1"&&(b.type.is_variable(w.args[0])||b.type.is_atom(w.args[0]))||w.indicator==="file_name/1"&&(b.type.is_variable(w.args[0])||b.type.is_atom(w.args[0]))||w.indicator==="position/1"&&(b.type.is_variable(w.args[0])||b.type.is_stream_position(w.args[0]))||w.indicator==="reposition/1"&&(b.type.is_variable(w.args[0])||b.type.is_atom(w.args[0])&&(w.args[0].id==="true"||w.args[0].id==="false"))||w.indicator==="type/1"&&(b.type.is_variable(w.args[0])||b.type.is_atom(w.args[0])&&(w.args[0].id==="text"||w.args[0].id==="binary"))||w.indicator==="mode/1"&&(b.type.is_variable(w.args[0])||b.type.is_atom(w.args[0])&&(w.args[0].id==="read"||w.args[0].id==="write"||w.args[0].id==="append"))||w.indicator==="eof_action/1"&&(b.type.is_variable(w.args[0])||b.type.is_atom(w.args[0])&&(w.args[0].id==="error"||w.args[0].id==="eof_code"||w.args[0].id==="reset"))||w.indicator==="end_of_stream/1"&&(b.type.is_variable(w.args[0])||b.type.is_atom(w.args[0])&&(w.args[0].id==="at"||w.args[0].id==="past"||w.args[0].id==="not")))},is_streamable:function(w){return w.__proto__.stream!==void 0},is_read_option:function(w){return b.type.is_term(w)&&["variables/1","variable_names/1","singletons/1"].indexOf(w.indicator)!==-1},is_write_option:function(w){return b.type.is_term(w)&&(w.indicator==="quoted/1"&&b.type.is_atom(w.args[0])&&(w.args[0].id==="true"||w.args[0].id==="false")||w.indicator==="ignore_ops/1"&&b.type.is_atom(w.args[0])&&(w.args[0].id==="true"||w.args[0].id==="false")||w.indicator==="numbervars/1"&&b.type.is_atom(w.args[0])&&(w.args[0].id==="true"||w.args[0].id==="false"))},is_close_option:function(w){return b.type.is_term(w)&&w.indicator==="force/1"&&b.type.is_atom(w.args[0])&&(w.args[0].id==="true"||w.args[0].id==="false")},is_modifiable_flag:function(w){return b.type.is_flag(w)&&b.flag[w.id].changeable},is_module:function(w){return w instanceof H&&w.indicator==="library/1"&&w.args[0]instanceof H&&w.args[0].args.length===0&&b.module[w.args[0].id]!==void 0}},arithmetic:{evaluation:{"e/0":{type_args:null,type_result:!0,fn:function(w){return Math.E}},"pi/0":{type_args:null,type_result:!0,fn:function(w){return Math.PI}},"tau/0":{type_args:null,type_result:!0,fn:function(w){return 2*Math.PI}},"epsilon/0":{type_args:null,type_result:!0,fn:function(w){return Number.EPSILON}},"+/1":{type_args:null,type_result:null,fn:function(w,P){return w}},"-/1":{type_args:null,type_result:null,fn:function(w,P){return-w}},"\\/1":{type_args:!1,type_result:!1,fn:function(w,P){return~w}},"abs/1":{type_args:null,type_result:null,fn:function(w,P){return Math.abs(w)}},"sign/1":{type_args:null,type_result:null,fn:function(w,P){return Math.sign(w)}},"float_integer_part/1":{type_args:!0,type_result:!1,fn:function(w,P){return parseInt(w)}},"float_fractional_part/1":{type_args:!0,type_result:!0,fn:function(w,P){return w-parseInt(w)}},"float/1":{type_args:null,type_result:!0,fn:function(w,P){return parseFloat(w)}},"floor/1":{type_args:!0,type_result:!1,fn:function(w,P){return Math.floor(w)}},"truncate/1":{type_args:!0,type_result:!1,fn:function(w,P){return parseInt(w)}},"round/1":{type_args:!0,type_result:!1,fn:function(w,P){return Math.round(w)}},"ceiling/1":{type_args:!0,type_result:!1,fn:function(w,P){return Math.ceil(w)}},"sin/1":{type_args:null,type_result:!0,fn:function(w,P){return Math.sin(w)}},"cos/1":{type_args:null,type_result:!0,fn:function(w,P){return Math.cos(w)}},"tan/1":{type_args:null,type_result:!0,fn:function(w,P){return Math.tan(w)}},"asin/1":{type_args:null,type_result:!0,fn:function(w,P){return Math.asin(w)}},"acos/1":{type_args:null,type_result:!0,fn:function(w,P){return Math.acos(w)}},"atan/1":{type_args:null,type_result:!0,fn:function(w,P){return Math.atan(w)}},"atan2/2":{type_args:null,type_result:!0,fn:function(w,P,y){return Math.atan2(w,P)}},"exp/1":{type_args:null,type_result:!0,fn:function(w,P){return Math.exp(w)}},"sqrt/1":{type_args:null,type_result:!0,fn:function(w,P){return Math.sqrt(w)}},"log/1":{type_args:null,type_result:!0,fn:function(w,P){return w>0?Math.log(w):b.error.evaluation("undefined",P.__call_indicator)}},"+/2":{type_args:null,type_result:null,fn:function(w,P,y){return w+P}},"-/2":{type_args:null,type_result:null,fn:function(w,P,y){return w-P}},"*/2":{type_args:null,type_result:null,fn:function(w,P,y){return w*P}},"//2":{type_args:null,type_result:!0,fn:function(w,P,y){return P?w/P:b.error.evaluation("zero_division",y.__call_indicator)}},"///2":{type_args:!1,type_result:!1,fn:function(w,P,y){return P?parseInt(w/P):b.error.evaluation("zero_division",y.__call_indicator)}},"**/2":{type_args:null,type_result:!0,fn:function(w,P,y){return Math.pow(w,P)}},"^/2":{type_args:null,type_result:null,fn:function(w,P,y){return Math.pow(w,P)}},"<</2":{type_args:!1,type_result:!1,fn:function(w,P,y){return w<<P}},">>/2":{type_args:!1,type_result:!1,fn:function(w,P,y){return w>>P}},"/\\/2":{type_args:!1,type_result:!1,fn:function(w,P,y){return w&P}},"\\//2":{type_args:!1,type_result:!1,fn:function(w,P,y){return w|P}},"xor/2":{type_args:!1,type_result:!1,fn:function(w,P,y){return w^P}},"rem/2":{type_args:!1,type_result:!1,fn:function(w,P,y){return P?w%P:b.error.evaluation("zero_division",y.__call_indicator)}},"mod/2":{type_args:!1,type_result:!1,fn:function(w,P,y){return P?w-parseInt(w/P)*P:b.error.evaluation("zero_division",y.__call_indicator)}},"max/2":{type_args:null,type_result:null,fn:function(w,P,y){return Math.max(w,P)}},"min/2":{type_args:null,type_result:null,fn:function(w,P,y){return Math.min(w,P)}}}},directive:{"dynamic/1":function(w,P){var y=P.args[0];if(b.type.is_variable(y))w.throw_error(b.error.instantiation(P.indicator));else if(!b.type.is_compound(y)||y.indicator!=="//2")w.throw_error(b.error.type("predicate_indicator",y,P.indicator));else if(b.type.is_variable(y.args[0])||b.type.is_variable(y.args[1]))w.throw_error(b.error.instantiation(P.indicator));else if(!b.type.is_atom(y.args[0]))w.throw_error(b.error.type("atom",y.args[0],P.indicator));else if(!b.type.is_integer(y.args[1]))w.throw_error(b.error.type("integer",y.args[1],P.indicator));else{var F=P.args[0].args[0].id+"/"+P.args[0].args[1].value;w.session.public_predicates[F]=!0,w.session.rules[F]||(w.session.rules[F]=[])}},"multifile/1":function(w,P){var y=P.args[0];b.type.is_variable(y)?w.throw_error(b.error.instantiation(P.indicator)):!b.type.is_compound(y)||y.indicator!=="//2"?w.throw_error(b.error.type("predicate_indicator",y,P.indicator)):b.type.is_variable(y.args[0])||b.type.is_variable(y.args[1])?w.throw_error(b.error.instantiation(P.indicator)):b.type.is_atom(y.args[0])?b.type.is_integer(y.args[1])?w.session.multifile_predicates[P.args[0].args[0].id+"/"+P.args[0].args[1].value]=!0:w.throw_error(b.error.type("integer",y.args[1],P.indicator)):w.throw_error(b.error.type("atom",y.args[0],P.indicator))},"set_prolog_flag/2":function(w,P){var y=P.args[0],F=P.args[1];b.type.is_variable(y)||b.type.is_variable(F)?w.throw_error(b.error.instantiation(P.indicator)):b.type.is_atom(y)?b.type.is_flag(y)?b.type.is_value_flag(y,F)?b.type.is_modifiable_flag(y)?w.session.flag[y.id]=F:w.throw_error(b.error.permission("modify","flag",y)):w.throw_error(b.error.domain("flag_value",new H("+",[y,F]),P.indicator)):w.throw_error(b.error.domain("prolog_flag",y,P.indicator)):w.throw_error(b.error.type("atom",y,P.indicator))},"use_module/1":function(w,P){var y=P.args[0];if(b.type.is_variable(y))w.throw_error(b.error.instantiation(P.indicator));else if(!b.type.is_term(y))w.throw_error(b.error.type("term",y,P.indicator));else if(b.type.is_module(y)){var F=y.args[0].id;e(w.session.modules,F)===-1&&w.session.modules.push(F)}},"char_conversion/2":function(w,P){var y=P.args[0],F=P.args[1];b.type.is_variable(y)||b.type.is_variable(F)?w.throw_error(b.error.instantiation(P.indicator)):b.type.is_character(y)?b.type.is_character(F)?y.id===F.id?delete w.session.__char_conversion[y.id]:w.session.__char_conversion[y.id]=F.id:w.throw_error(b.error.type("character",F,P.indicator)):w.throw_error(b.error.type("character",y,P.indicator))},"op/3":function(w,P){var y=P.args[0],F=P.args[1],z=P.args[2];if(b.type.is_variable(y)||b.type.is_variable(F)||b.type.is_variable(z))w.throw_error(b.error.instantiation(P.indicator));else if(!b.type.is_integer(y))w.throw_error(b.error.type("integer",y,P.indicator));else if(!b.type.is_atom(F))w.throw_error(b.error.type("atom",F,P.indicator));else if(!b.type.is_atom(z))w.throw_error(b.error.type("atom",z,P.indicator));else if(y.value<0||y.value>1200)w.throw_error(b.error.domain("operator_priority",y,P.indicator));else if(z.id===",")w.throw_error(b.error.permission("modify","operator",z,P.indicator));else if(z.id==="|"&&(y.value<1001||F.id.length!==3))w.throw_error(b.error.permission("modify","operator",z,P.indicator));else if(["fy","fx","yf","xf","xfx","yfx","xfy"].indexOf(F.id)===-1)w.throw_error(b.error.domain("operator_specifier",F,P.indicator));else{var X={prefix:null,infix:null,postfix:null};for(var Z in w.session.__operators)if(!!w.session.__operators.hasOwnProperty(Z)){var ie=w.session.__operators[Z][z.id];ie&&(e(ie,"fx")!==-1&&(X.prefix={priority:Z,type:"fx"}),e(ie,"fy")!==-1&&(X.prefix={priority:Z,type:"fy"}),e(ie,"xf")!==-1&&(X.postfix={priority:Z,type:"xf"}),e(ie,"yf")!==-1&&(X.postfix={priority:Z,type:"yf"}),e(ie,"xfx")!==-1&&(X.infix={priority:Z,type:"xfx"}),e(ie,"xfy")!==-1&&(X.infix={priority:Z,type:"xfy"}),e(ie,"yfx")!==-1&&(X.infix={priority:Z,type:"yfx"}))}var Pe;switch(F.id){case"fy":case"fx":Pe="prefix";break;case"yf":case"xf":Pe="postfix";break;default:Pe="infix";break}if(((X.prefix&&Pe==="prefix"||X.postfix&&Pe==="postfix"||X.infix&&Pe==="infix")&&X[Pe].type!==F.id||X.infix&&Pe==="postfix"||X.postfix&&Pe==="infix")&&y.value!==0)w.throw_error(b.error.permission("create","operator",z,P.indicator));else return X[Pe]&&(Ee(w.session.__operators[X[Pe].priority][z.id],F.id),w.session.__operators[X[Pe].priority][z.id].length===0&&delete w.session.__operators[X[Pe].priority][z.id]),y.value>0&&(w.session.__operators[y.value]||(w.session.__operators[y.value.toString()]={}),w.session.__operators[y.value][z.id]||(w.session.__operators[y.value][z.id]=[]),w.session.__operators[y.value][z.id].push(F.id)),!0}}},predicate:{"op/3":function(w,P,y){b.directive["op/3"](w,y)&&w.success(P)},"current_op/3":function(w,P,y){var F=y.args[0],z=y.args[1],X=y.args[2],Z=[];for(var ie in w.session.__operators)for(var Pe in w.session.__operators[ie])for(var Ne=0;Ne<w.session.__operators[ie][Pe].length;Ne++)Z.push(new xe(P.goal.replace(new H(",",[new H("=",[new Fe(ie,!1),F]),new H(",",[new H("=",[new H(w.session.__operators[ie][Pe][Ne],[]),z]),new H("=",[new H(Pe,[]),X])])])),P.substitution,P));w.prepend(Z)},";/2":function(w,P,y){if(b.type.is_term(y.args[0])&&y.args[0].indicator==="->/2"){var F=w.points,z=w.session.format_success,X=w.session.format_error;w.session.format_success=function(Ne){return Ne.substitution},w.session.format_error=function(Ne){return Ne.goal},w.points=[new xe(y.args[0].args[0],P.substitution,P)];var Z=function(Ne){w.points=F,w.session.format_success=z,w.session.format_error=X,Ne===!1?w.prepend([new xe(P.goal.replace(y.args[1]),P.substitution,P)]):b.type.is_error(Ne)?w.throw_error(Ne.args[0]):Ne===null?(w.prepend([P]),w.__calls.shift()(null)):w.prepend([new xe(P.goal.replace(y.args[0].args[1]).apply(Ne),P.substitution.apply(Ne),P)])};w.__calls.unshift(Z)}else{var ie=new xe(P.goal.replace(y.args[0]),P.substitution,P),Pe=new xe(P.goal.replace(y.args[1]),P.substitution,P);w.prepend([ie,Pe])}},"!/0":function(w,P,y){var F,z,X=[];for(F=P,z=null;F.parent!==null&&F.parent.goal.search(y);)if(z=F,F=F.parent,F.goal!==null){var Z=F.goal.select();if(Z&&Z.id==="call"&&Z.search(y)){F=z;break}}for(var ie=w.points.length-1;ie>=0;ie--){for(var Pe=w.points[ie],Ne=Pe.parent;Ne!==null&&Ne!==F.parent;)Ne=Ne.parent;Ne===null&&Ne!==F.parent&&X.push(Pe)}w.points=X.reverse(),w.success(P)},"\\+/1":function(w,P,y){var F=y.args[0];b.type.is_variable(F)?w.throw_error(b.error.instantiation(w.level)):b.type.is_callable(F)?w.prepend([new xe(P.goal.replace(new H(",",[new H(",",[new H("call",[F]),new H("!",[])]),new H("fail",[])])),P.substitution,P),new xe(P.goal.replace(null),P.substitution,P)]):w.throw_error(b.error.type("callable",F,w.level))},"->/2":function(w,P,y){var F=P.goal.replace(new H(",",[y.args[0],new H(",",[new H("!"),y.args[1]])]));w.prepend([new xe(F,P.substitution,P)])},"fail/0":function(w,P,y){},"false/0":function(w,P,y){},"true/0":function(w,P,y){w.success(P)},"call/1":ne(1),"call/2":ne(2),"call/3":ne(3),"call/4":ne(4),"call/5":ne(5),"call/6":ne(6),"call/7":ne(7),"call/8":ne(8),"once/1":function(w,P,y){var F=y.args[0];w.prepend([new xe(P.goal.replace(new H(",",[new H("call",[F]),new H("!",[])])),P.substitution,P)])},"forall/2":function(w,P,y){var F=y.args[0],z=y.args[1];w.prepend([new xe(P.goal.replace(new H("\\+",[new H(",",[new H("call",[F]),new H("\\+",[new H("call",[z])])])])),P.substitution,P)])},"repeat/0":function(w,P,y){w.prepend([new xe(P.goal.replace(null),P.substitution,P),P])},"throw/1":function(w,P,y){b.type.is_variable(y.args[0])?w.throw_error(b.error.instantiation(w.level)):w.throw_error(y.args[0])},"catch/3":function(w,P,y){var F=w.points;w.points=[],w.prepend([new xe(y.args[0],P.substitution,P)]);var z=w.session.format_success,X=w.session.format_error;w.session.format_success=function(ie){return ie.substitution},w.session.format_error=function(ie){return ie.goal};var Z=function(ie){var Pe=w.points;if(w.points=F,w.session.format_success=z,w.session.format_error=X,b.type.is_error(ie)){for(var Ne=[],ot=w.points.length-1;ot>=0;ot--){for(var $t=w.points[ot],dt=$t.parent;dt!==null&&dt!==P.parent;)dt=dt.parent;dt===null&&dt!==P.parent&&Ne.push($t)}w.points=Ne;var Gt=w.get_flag("occurs_check").indicator==="true/0",$t=new xe,bt=b.unify(ie.args[0],y.args[1],Gt);bt!==null?($t.substitution=P.substitution.apply(bt),$t.goal=P.goal.replace(y.args[2]).apply(bt),$t.parent=P,w.prepend([$t])):w.throw_error(ie.args[0])}else if(ie!==!1){for(var an=ie===null?[]:[new xe(P.goal.apply(ie).replace(null),P.substitution.apply(ie),P)],Qr=[],ot=Pe.length-1;ot>=0;ot--){Qr.push(Pe[ot]);var mr=Pe[ot].goal!==null?Pe[ot].goal.select():null;if(b.type.is_term(mr)&&mr.indicator==="!/0")break}var br=o(Qr,function(Wr){return Wr.goal===null&&(Wr.goal=new H("true",[])),Wr=new xe(P.goal.replace(new H("catch",[Wr.goal,y.args[1],y.args[2]])),P.substitution.apply(Wr.substitution),Wr.parent),Wr.exclude=y.args[0].variables(),Wr}).reverse();w.prepend(br),w.prepend(an),ie===null&&(this.current_limit=0,w.__calls.shift()(null))}};w.__calls.unshift(Z)},"=/2":function(w,P,y){var F=w.get_flag("occurs_check").indicator==="true/0",z=new xe,X=b.unify(y.args[0],y.args[1],F);X!==null&&(z.goal=P.goal.apply(X).replace(null),z.substitution=P.substitution.apply(X),z.parent=P,w.prepend([z]))},"unify_with_occurs_check/2":function(w,P,y){var F=new xe,z=b.unify(y.args[0],y.args[1],!0);z!==null&&(F.goal=P.goal.apply(z).replace(null),F.substitution=P.substitution.apply(z),F.parent=P,w.prepend([F]))},"\\=/2":function(w,P,y){var F=w.get_flag("occurs_check").indicator==="true/0",z=b.unify(y.args[0],y.args[1],F);z===null&&w.success(P)},"subsumes_term/2":function(w,P,y){var F=w.get_flag("occurs_check").indicator==="true/0",z=b.unify(y.args[1],y.args[0],F);z!==null&&y.args[1].apply(z).equals(y.args[1])&&w.success(P)},"findall/3":function(w,P,y){var F=y.args[0],z=y.args[1],X=y.args[2];if(b.type.is_variable(z))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_callable(z))w.throw_error(b.error.type("callable",z,y.indicator));else if(!b.type.is_variable(X)&&!b.type.is_list(X))w.throw_error(b.error.type("list",X,y.indicator));else{var Z=w.next_free_variable(),ie=new H(",",[z,new H("=",[Z,F])]),Pe=w.points,Ne=w.session.limit,ot=w.session.format_success;w.session.format_success=function($t){return $t.substitution},w.add_goal(ie,!0,P);var dt=[],Gt=function($t){if($t!==!1&&$t!==null&&!b.type.is_error($t))w.__calls.unshift(Gt),dt.push($t.links[Z.id]),w.session.limit=w.current_limit;else if(w.points=Pe,w.session.limit=Ne,w.session.format_success=ot,b.type.is_error($t))w.throw_error($t.args[0]);else if(w.current_limit>0){for(var bt=new H("[]"),an=dt.length-1;an>=0;an--)bt=new H(".",[dt[an],bt]);w.prepend([new xe(P.goal.replace(new H("=",[X,bt])),P.substitution,P)])}};w.__calls.unshift(Gt)}},"bagof/3":function(w,P,y){var F,z=y.args[0],X=y.args[1],Z=y.args[2];if(b.type.is_variable(X))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_callable(X))w.throw_error(b.error.type("callable",X,y.indicator));else if(!b.type.is_variable(Z)&&!b.type.is_list(Z))w.throw_error(b.error.type("list",Z,y.indicator));else{var ie=w.next_free_variable(),Pe;X.indicator==="^/2"?(Pe=X.args[0].variables(),X=X.args[1]):Pe=[],Pe=Pe.concat(z.variables());for(var Ne=X.variables().filter(function(br){return e(Pe,br)===-1}),ot=new H("[]"),dt=Ne.length-1;dt>=0;dt--)ot=new H(".",[new Ie(Ne[dt]),ot]);var Gt=new H(",",[X,new H("=",[ie,new H(",",[ot,z])])]),$t=w.points,bt=w.session.limit,an=w.session.format_success;w.session.format_success=function(br){return br.substitution},w.add_goal(Gt,!0,P);var Qr=[],mr=function(br){if(br!==!1&&br!==null&&!b.type.is_error(br)){w.__calls.unshift(mr);var Wr=!1,Kn=br.links[ie.id].args[0],Ns=br.links[ie.id].args[1];for(var Ti in Qr)if(!!Qr.hasOwnProperty(Ti)){var ps=Qr[Ti];if(ps.variables.equals(Kn)){ps.answers.push(Ns),Wr=!0;break}}Wr||Qr.push({variables:Kn,answers:[Ns]}),w.session.limit=w.current_limit}else if(w.points=$t,w.session.limit=bt,w.session.format_success=an,b.type.is_error(br))w.throw_error(br.args[0]);else if(w.current_limit>0){for(var io=[],Pi=0;Pi<Qr.length;Pi++){br=Qr[Pi].answers;for(var Ls=new H("[]"),so=br.length-1;so>=0;so--)Ls=new H(".",[br[so],Ls]);io.push(new xe(P.goal.replace(new H(",",[new H("=",[ot,Qr[Pi].variables]),new H("=",[Z,Ls])])),P.substitution,P))}w.prepend(io)}};w.__calls.unshift(mr)}},"setof/3":function(w,P,y){var F,z=y.args[0],X=y.args[1],Z=y.args[2];if(b.type.is_variable(X))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_callable(X))w.throw_error(b.error.type("callable",X,y.indicator));else if(!b.type.is_variable(Z)&&!b.type.is_list(Z))w.throw_error(b.error.type("list",Z,y.indicator));else{var ie=w.next_free_variable(),Pe;X.indicator==="^/2"?(Pe=X.args[0].variables(),X=X.args[1]):Pe=[],Pe=Pe.concat(z.variables());for(var Ne=X.variables().filter(function(br){return e(Pe,br)===-1}),ot=new H("[]"),dt=Ne.length-1;dt>=0;dt--)ot=new H(".",[new Ie(Ne[dt]),ot]);var Gt=new H(",",[X,new H("=",[ie,new H(",",[ot,z])])]),$t=w.points,bt=w.session.limit,an=w.session.format_success;w.session.format_success=function(br){return br.substitution},w.add_goal(Gt,!0,P);var Qr=[],mr=function(br){if(br!==!1&&br!==null&&!b.type.is_error(br)){w.__calls.unshift(mr);var Wr=!1,Kn=br.links[ie.id].args[0],Ns=br.links[ie.id].args[1];for(var Ti in Qr)if(!!Qr.hasOwnProperty(Ti)){var ps=Qr[Ti];if(ps.variables.equals(Kn)){ps.answers.push(Ns),Wr=!0;break}}Wr||Qr.push({variables:Kn,answers:[Ns]}),w.session.limit=w.current_limit}else if(w.points=$t,w.session.limit=bt,w.session.format_success=an,b.type.is_error(br))w.throw_error(br.args[0]);else if(w.current_limit>0){for(var io=[],Pi=0;Pi<Qr.length;Pi++){br=Qr[Pi].answers.sort(b.compare);for(var Ls=new H("[]"),so=br.length-1;so>=0;so--)Ls=new H(".",[br[so],Ls]);io.push(new xe(P.goal.replace(new H(",",[new H("=",[ot,Qr[Pi].variables]),new H("=",[Z,Ls])])),P.substitution,P))}w.prepend(io)}};w.__calls.unshift(mr)}},"functor/3":function(w,P,y){var F,z=y.args[0],X=y.args[1],Z=y.args[2];if(b.type.is_variable(z)&&(b.type.is_variable(X)||b.type.is_variable(Z)))w.throw_error(b.error.instantiation("functor/3"));else if(!b.type.is_variable(Z)&&!b.type.is_integer(Z))w.throw_error(b.error.type("integer",y.args[2],"functor/3"));else if(!b.type.is_variable(X)&&!b.type.is_atomic(X))w.throw_error(b.error.type("atomic",y.args[1],"functor/3"));else if(b.type.is_integer(X)&&b.type.is_integer(Z)&&Z.value!==0)w.throw_error(b.error.type("atom",y.args[1],"functor/3"));else if(b.type.is_variable(z)){if(y.args[2].value>=0){for(var ie=[],Pe=0;Pe<Z.value;Pe++)ie.push(w.next_free_variable());var Ne=b.type.is_integer(X)?X:new H(X.id,ie);w.prepend([new xe(P.goal.replace(new H("=",[z,Ne])),P.substitution,P)])}}else{var ot=b.type.is_integer(z)?z:new H(z.id,[]),dt=b.type.is_integer(z)?new Fe(0,!1):new Fe(z.args.length,!1),Gt=new H(",",[new H("=",[ot,X]),new H("=",[dt,Z])]);w.prepend([new xe(P.goal.replace(Gt),P.substitution,P)])}},"arg/3":function(w,P,y){if(b.type.is_variable(y.args[0])||b.type.is_variable(y.args[1]))w.throw_error(b.error.instantiation(y.indicator));else if(y.args[0].value<0)w.throw_error(b.error.domain("not_less_than_zero",y.args[0],y.indicator));else if(!b.type.is_compound(y.args[1]))w.throw_error(b.error.type("compound",y.args[1],y.indicator));else{var F=y.args[0].value;if(F>0&&F<=y.args[1].args.length){var z=new H("=",[y.args[1].args[F-1],y.args[2]]);w.prepend([new xe(P.goal.replace(z),P.substitution,P)])}}},"=../2":function(w,P,y){var F;if(b.type.is_variable(y.args[0])&&(b.type.is_variable(y.args[1])||b.type.is_non_empty_list(y.args[1])&&b.type.is_variable(y.args[1].args[0])))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_fully_list(y.args[1]))w.throw_error(b.error.type("list",y.args[1],y.indicator));else if(b.type.is_variable(y.args[0])){if(!b.type.is_variable(y.args[1])){var X=[];for(F=y.args[1].args[1];F.indicator==="./2";)X.push(F.args[0]),F=F.args[1];b.type.is_variable(y.args[0])&&b.type.is_variable(F)?w.throw_error(b.error.instantiation(y.indicator)):X.length===0&&b.type.is_compound(y.args[1].args[0])?w.throw_error(b.error.type("atomic",y.args[1].args[0],y.indicator)):X.length>0&&(b.type.is_compound(y.args[1].args[0])||b.type.is_number(y.args[1].args[0]))?w.throw_error(b.error.type("atom",y.args[1].args[0],y.indicator)):X.length===0?w.prepend([new xe(P.goal.replace(new H("=",[y.args[1].args[0],y.args[0]],P)),P.substitution,P)]):w.prepend([new xe(P.goal.replace(new H("=",[new H(y.args[1].args[0].id,X),y.args[0]])),P.substitution,P)])}}else{if(b.type.is_atomic(y.args[0]))F=new H(".",[y.args[0],new H("[]")]);else{F=new H("[]");for(var z=y.args[0].args.length-1;z>=0;z--)F=new H(".",[y.args[0].args[z],F]);F=new H(".",[new H(y.args[0].id),F])}w.prepend([new xe(P.goal.replace(new H("=",[F,y.args[1]])),P.substitution,P)])}},"copy_term/2":function(w,P,y){var F=y.args[0].rename(w);w.prepend([new xe(P.goal.replace(new H("=",[F,y.args[1]])),P.substitution,P.parent)])},"term_variables/2":function(w,P,y){var F=y.args[0],z=y.args[1];if(!b.type.is_fully_list(z))w.throw_error(b.error.type("list",z,y.indicator));else{var X=g(o(Se(F.variables()),function(Z){return new Ie(Z)}));w.prepend([new xe(P.goal.replace(new H("=",[z,X])),P.substitution,P)])}},"clause/2":function(w,P,y){if(b.type.is_variable(y.args[0]))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_callable(y.args[0]))w.throw_error(b.error.type("callable",y.args[0],y.indicator));else if(!b.type.is_variable(y.args[1])&&!b.type.is_callable(y.args[1]))w.throw_error(b.error.type("callable",y.args[1],y.indicator));else if(w.session.rules[y.args[0].indicator]!==void 0)if(w.is_public_predicate(y.args[0].indicator)){var F=[];for(var z in w.session.rules[y.args[0].indicator])if(!!w.session.rules[y.args[0].indicator].hasOwnProperty(z)){var X=w.session.rules[y.args[0].indicator][z];w.session.renamed_variables={},X=X.rename(w),X.body===null&&(X.body=new H("true"));var Z=new H(",",[new H("=",[X.head,y.args[0]]),new H("=",[X.body,y.args[1]])]);F.push(new xe(P.goal.replace(Z),P.substitution,P))}w.prepend(F)}else w.throw_error(b.error.permission("access","private_procedure",y.args[0].indicator,y.indicator))},"current_predicate/1":function(w,P,y){var F=y.args[0];if(!b.type.is_variable(F)&&(!b.type.is_compound(F)||F.indicator!=="//2"))w.throw_error(b.error.type("predicate_indicator",F,y.indicator));else if(!b.type.is_variable(F)&&!b.type.is_variable(F.args[0])&&!b.type.is_atom(F.args[0]))w.throw_error(b.error.type("atom",F.args[0],y.indicator));else if(!b.type.is_variable(F)&&!b.type.is_variable(F.args[1])&&!b.type.is_integer(F.args[1]))w.throw_error(b.error.type("integer",F.args[1],y.indicator));else{var z=[];for(var X in w.session.rules)if(!!w.session.rules.hasOwnProperty(X)){var Z=X.lastIndexOf("/"),ie=X.substr(0,Z),Pe=parseInt(X.substr(Z+1,X.length-(Z+1))),Ne=new H("/",[new H(ie),new Fe(Pe,!1)]),ot=new H("=",[Ne,F]);z.push(new xe(P.goal.replace(ot),P.substitution,P))}w.prepend(z)}},"asserta/1":function(w,P,y){if(b.type.is_variable(y.args[0]))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_callable(y.args[0]))w.throw_error(b.error.type("callable",y.args[0],y.indicator));else{var F,z;y.args[0].indicator===":-/2"?(F=y.args[0].args[0],z=we(y.args[0].args[1])):(F=y.args[0],z=null),b.type.is_callable(F)?z!==null&&!b.type.is_callable(z)?w.throw_error(b.error.type("callable",z,y.indicator)):w.is_public_predicate(F.indicator)?(w.session.rules[F.indicator]===void 0&&(w.session.rules[F.indicator]=[]),w.session.public_predicates[F.indicator]=!0,w.session.rules[F.indicator]=[new He(F,z,!0)].concat(w.session.rules[F.indicator]),w.success(P)):w.throw_error(b.error.permission("modify","static_procedure",F.indicator,y.indicator)):w.throw_error(b.error.type("callable",F,y.indicator))}},"assertz/1":function(w,P,y){if(b.type.is_variable(y.args[0]))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_callable(y.args[0]))w.throw_error(b.error.type("callable",y.args[0],y.indicator));else{var F,z;y.args[0].indicator===":-/2"?(F=y.args[0].args[0],z=we(y.args[0].args[1])):(F=y.args[0],z=null),b.type.is_callable(F)?z!==null&&!b.type.is_callable(z)?w.throw_error(b.error.type("callable",z,y.indicator)):w.is_public_predicate(F.indicator)?(w.session.rules[F.indicator]===void 0&&(w.session.rules[F.indicator]=[]),w.session.public_predicates[F.indicator]=!0,w.session.rules[F.indicator].push(new He(F,z,!0)),w.success(P)):w.throw_error(b.error.permission("modify","static_procedure",F.indicator,y.indicator)):w.throw_error(b.error.type("callable",F,y.indicator))}},"retract/1":function(w,P,y){if(b.type.is_variable(y.args[0]))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_callable(y.args[0]))w.throw_error(b.error.type("callable",y.args[0],y.indicator));else{var F,z;if(y.args[0].indicator===":-/2"?(F=y.args[0].args[0],z=y.args[0].args[1]):(F=y.args[0],z=new H("true")),typeof P.retract>"u")if(w.is_public_predicate(F.indicator)){if(w.session.rules[F.indicator]!==void 0){for(var X=[],Z=0;Z<w.session.rules[F.indicator].length;Z++){w.session.renamed_variables={};var ie=w.session.rules[F.indicator][Z],Pe=ie.rename(w);Pe.body===null&&(Pe.body=new H("true",[]));var Ne=w.get_flag("occurs_check").indicator==="true/0",ot=b.unify(new H(",",[F,z]),new H(",",[Pe.head,Pe.body]),Ne);if(ot!==null){var dt=new xe(P.goal.replace(new H(",",[new H("retract",[new H(":-",[F,z])]),new H(",",[new H("=",[F,Pe.head]),new H("=",[z,Pe.body])])])),P.substitution,P);dt.retract=ie,X.push(dt)}}w.prepend(X)}}else w.throw_error(b.error.permission("modify","static_procedure",F.indicator,y.indicator));else le(w,P,F.indicator,P.retract)}},"retractall/1":function(w,P,y){var F=y.args[0];b.type.is_variable(F)?w.throw_error(b.error.instantiation(y.indicator)):b.type.is_callable(F)?w.prepend([new xe(P.goal.replace(new H(",",[new H("retract",[new b.type.Term(":-",[F,new Ie("_")])]),new H("fail",[])])),P.substitution,P),new xe(P.goal.replace(null),P.substitution,P)]):w.throw_error(b.error.type("callable",F,y.indicator))},"abolish/1":function(w,P,y){if(b.type.is_variable(y.args[0])||b.type.is_term(y.args[0])&&y.args[0].indicator==="//2"&&(b.type.is_variable(y.args[0].args[0])||b.type.is_variable(y.args[0].args[1])))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_term(y.args[0])||y.args[0].indicator!=="//2")w.throw_error(b.error.type("predicate_indicator",y.args[0],y.indicator));else if(!b.type.is_atom(y.args[0].args[0]))w.throw_error(b.error.type("atom",y.args[0].args[0],y.indicator));else if(!b.type.is_integer(y.args[0].args[1]))w.throw_error(b.error.type("integer",y.args[0].args[1],y.indicator));else if(y.args[0].args[1].value<0)w.throw_error(b.error.domain("not_less_than_zero",y.args[0].args[1],y.indicator));else if(b.type.is_number(w.get_flag("max_arity"))&&y.args[0].args[1].value>w.get_flag("max_arity").value)w.throw_error(b.error.representation("max_arity",y.indicator));else{var F=y.args[0].args[0].id+"/"+y.args[0].args[1].value;w.is_public_predicate(F)?(delete w.session.rules[F],w.success(P)):w.throw_error(b.error.permission("modify","static_procedure",F,y.indicator))}},"atom_length/2":function(w,P,y){if(b.type.is_variable(y.args[0]))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_atom(y.args[0]))w.throw_error(b.error.type("atom",y.args[0],y.indicator));else if(!b.type.is_variable(y.args[1])&&!b.type.is_integer(y.args[1]))w.throw_error(b.error.type("integer",y.args[1],y.indicator));else if(b.type.is_integer(y.args[1])&&y.args[1].value<0)w.throw_error(b.error.domain("not_less_than_zero",y.args[1],y.indicator));else{var F=new Fe(y.args[0].id.length,!1);w.prepend([new xe(P.goal.replace(new H("=",[F,y.args[1]])),P.substitution,P)])}},"atom_concat/3":function(w,P,y){var F,z,X=y.args[0],Z=y.args[1],ie=y.args[2];if(b.type.is_variable(ie)&&(b.type.is_variable(X)||b.type.is_variable(Z)))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_variable(X)&&!b.type.is_atom(X))w.throw_error(b.error.type("atom",X,y.indicator));else if(!b.type.is_variable(Z)&&!b.type.is_atom(Z))w.throw_error(b.error.type("atom",Z,y.indicator));else if(!b.type.is_variable(ie)&&!b.type.is_atom(ie))w.throw_error(b.error.type("atom",ie,y.indicator));else{var Pe=b.type.is_variable(X),Ne=b.type.is_variable(Z);if(!Pe&&!Ne)z=new H("=",[ie,new H(X.id+Z.id)]),w.prepend([new xe(P.goal.replace(z),P.substitution,P)]);else if(Pe&&!Ne)F=ie.id.substr(0,ie.id.length-Z.id.length),F+Z.id===ie.id&&(z=new H("=",[X,new H(F)]),w.prepend([new xe(P.goal.replace(z),P.substitution,P)]));else if(Ne&&!Pe)F=ie.id.substr(X.id.length),X.id+F===ie.id&&(z=new H("=",[Z,new H(F)]),w.prepend([new xe(P.goal.replace(z),P.substitution,P)]));else{for(var ot=[],dt=0;dt<=ie.id.length;dt++){var Gt=new H(ie.id.substr(0,dt)),$t=new H(ie.id.substr(dt));z=new H(",",[new H("=",[Gt,X]),new H("=",[$t,Z])]),ot.push(new xe(P.goal.replace(z),P.substitution,P))}w.prepend(ot)}}},"sub_atom/5":function(w,P,y){var F,z=y.args[0],X=y.args[1],Z=y.args[2],ie=y.args[3],Pe=y.args[4];if(b.type.is_variable(z))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_variable(X)&&!b.type.is_integer(X))w.throw_error(b.error.type("integer",X,y.indicator));else if(!b.type.is_variable(Z)&&!b.type.is_integer(Z))w.throw_error(b.error.type("integer",Z,y.indicator));else if(!b.type.is_variable(ie)&&!b.type.is_integer(ie))w.throw_error(b.error.type("integer",ie,y.indicator));else if(b.type.is_integer(X)&&X.value<0)w.throw_error(b.error.domain("not_less_than_zero",X,y.indicator));else if(b.type.is_integer(Z)&&Z.value<0)w.throw_error(b.error.domain("not_less_than_zero",Z,y.indicator));else if(b.type.is_integer(ie)&&ie.value<0)w.throw_error(b.error.domain("not_less_than_zero",ie,y.indicator));else{var Ne=[],ot=[],dt=[];if(b.type.is_variable(X))for(F=0;F<=z.id.length;F++)Ne.push(F);else Ne.push(X.value);if(b.type.is_variable(Z))for(F=0;F<=z.id.length;F++)ot.push(F);else ot.push(Z.value);if(b.type.is_variable(ie))for(F=0;F<=z.id.length;F++)dt.push(F);else dt.push(ie.value);var Gt=[];for(var $t in Ne)if(!!Ne.hasOwnProperty($t)){F=Ne[$t];for(var bt in ot)if(!!ot.hasOwnProperty(bt)){var an=ot[bt],Qr=z.id.length-F-an;if(e(dt,Qr)!==-1&&F+an+Qr===z.id.length){var mr=z.id.substr(F,an);if(z.id===z.id.substr(0,F)+mr+z.id.substr(F+an,Qr)){var br=new H("=",[new H(mr),Pe]),Wr=new H("=",[X,new Fe(F)]),Kn=new H("=",[Z,new Fe(an)]),Ns=new H("=",[ie,new Fe(Qr)]),Ti=new H(",",[new H(",",[new H(",",[Wr,Kn]),Ns]),br]);Gt.push(new xe(P.goal.replace(Ti),P.substitution,P))}}}}w.prepend(Gt)}},"atom_chars/2":function(w,P,y){var F=y.args[0],z=y.args[1];if(b.type.is_variable(F)&&b.type.is_variable(z))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_variable(F)&&!b.type.is_atom(F))w.throw_error(b.error.type("atom",F,y.indicator));else if(b.type.is_variable(F)){for(var ie=z,Pe=b.type.is_variable(F),Ne="";ie.indicator==="./2";){if(b.type.is_character(ie.args[0]))Ne+=ie.args[0].id;else if(b.type.is_variable(ie.args[0])&&Pe){w.throw_error(b.error.instantiation(y.indicator));return}else if(!b.type.is_variable(ie.args[0])){w.throw_error(b.error.type("character",ie.args[0],y.indicator));return}ie=ie.args[1]}b.type.is_variable(ie)&&Pe?w.throw_error(b.error.instantiation(y.indicator)):!b.type.is_empty_list(ie)&&!b.type.is_variable(ie)?w.throw_error(b.error.type("list",z,y.indicator)):w.prepend([new xe(P.goal.replace(new H("=",[new H(Ne),F])),P.substitution,P)])}else{for(var X=new H("[]"),Z=F.id.length-1;Z>=0;Z--)X=new H(".",[new H(F.id.charAt(Z)),X]);w.prepend([new xe(P.goal.replace(new H("=",[z,X])),P.substitution,P)])}},"atom_codes/2":function(w,P,y){var F=y.args[0],z=y.args[1];if(b.type.is_variable(F)&&b.type.is_variable(z))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_variable(F)&&!b.type.is_atom(F))w.throw_error(b.error.type("atom",F,y.indicator));else if(b.type.is_variable(F)){for(var ie=z,Pe=b.type.is_variable(F),Ne="";ie.indicator==="./2";){if(b.type.is_character_code(ie.args[0]))Ne+=u(ie.args[0].value);else if(b.type.is_variable(ie.args[0])&&Pe){w.throw_error(b.error.instantiation(y.indicator));return}else if(!b.type.is_variable(ie.args[0])){w.throw_error(b.error.representation("character_code",y.indicator));return}ie=ie.args[1]}b.type.is_variable(ie)&&Pe?w.throw_error(b.error.instantiation(y.indicator)):!b.type.is_empty_list(ie)&&!b.type.is_variable(ie)?w.throw_error(b.error.type("list",z,y.indicator)):w.prepend([new xe(P.goal.replace(new H("=",[new H(Ne),F])),P.substitution,P)])}else{for(var X=new H("[]"),Z=F.id.length-1;Z>=0;Z--)X=new H(".",[new Fe(n(F.id,Z),!1),X]);w.prepend([new xe(P.goal.replace(new H("=",[z,X])),P.substitution,P)])}},"char_code/2":function(w,P,y){var F=y.args[0],z=y.args[1];if(b.type.is_variable(F)&&b.type.is_variable(z))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_variable(F)&&!b.type.is_character(F))w.throw_error(b.error.type("character",F,y.indicator));else if(!b.type.is_variable(z)&&!b.type.is_integer(z))w.throw_error(b.error.type("integer",z,y.indicator));else if(!b.type.is_variable(z)&&!b.type.is_character_code(z))w.throw_error(b.error.representation("character_code",y.indicator));else if(b.type.is_variable(z)){var X=new Fe(n(F.id,0),!1);w.prepend([new xe(P.goal.replace(new H("=",[X,z])),P.substitution,P)])}else{var Z=new H(u(z.value));w.prepend([new xe(P.goal.replace(new H("=",[Z,F])),P.substitution,P)])}},"number_chars/2":function(w,P,y){var F,z=y.args[0],X=y.args[1];if(b.type.is_variable(z)&&b.type.is_variable(X))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_variable(z)&&!b.type.is_number(z))w.throw_error(b.error.type("number",z,y.indicator));else if(!b.type.is_variable(X)&&!b.type.is_list(X))w.throw_error(b.error.type("list",X,y.indicator));else{var Z=b.type.is_variable(z);if(!b.type.is_variable(X)){var ie=X,Pe=!0;for(F="";ie.indicator==="./2";){if(b.type.is_character(ie.args[0]))F+=ie.args[0].id;else if(b.type.is_variable(ie.args[0]))Pe=!1;else if(!b.type.is_variable(ie.args[0])){w.throw_error(b.error.type("character",ie.args[0],y.indicator));return}ie=ie.args[1]}if(Pe=Pe&&b.type.is_empty_list(ie),!b.type.is_empty_list(ie)&&!b.type.is_variable(ie)){w.throw_error(b.error.type("list",X,y.indicator));return}if(!Pe&&Z){w.throw_error(b.error.instantiation(y.indicator));return}else if(Pe)if(b.type.is_variable(ie)&&Z){w.throw_error(b.error.instantiation(y.indicator));return}else{var Ne=w.parse(F),ot=Ne.value;!b.type.is_number(ot)||Ne.tokens[Ne.tokens.length-1].space?w.throw_error(b.error.syntax_by_predicate("parseable_number",y.indicator)):w.prepend([new xe(P.goal.replace(new H("=",[z,ot])),P.substitution,P)]);return}}if(!Z){F=z.toString();for(var dt=new H("[]"),Gt=F.length-1;Gt>=0;Gt--)dt=new H(".",[new H(F.charAt(Gt)),dt]);w.prepend([new xe(P.goal.replace(new H("=",[X,dt])),P.substitution,P)])}}},"number_codes/2":function(w,P,y){var F,z=y.args[0],X=y.args[1];if(b.type.is_variable(z)&&b.type.is_variable(X))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_variable(z)&&!b.type.is_number(z))w.throw_error(b.error.type("number",z,y.indicator));else if(!b.type.is_variable(X)&&!b.type.is_list(X))w.throw_error(b.error.type("list",X,y.indicator));else{var Z=b.type.is_variable(z);if(!b.type.is_variable(X)){var ie=X,Pe=!0;for(F="";ie.indicator==="./2";){if(b.type.is_character_code(ie.args[0]))F+=u(ie.args[0].value);else if(b.type.is_variable(ie.args[0]))Pe=!1;else if(!b.type.is_variable(ie.args[0])){w.throw_error(b.error.type("character_code",ie.args[0],y.indicator));return}ie=ie.args[1]}if(Pe=Pe&&b.type.is_empty_list(ie),!b.type.is_empty_list(ie)&&!b.type.is_variable(ie)){w.throw_error(b.error.type("list",X,y.indicator));return}if(!Pe&&Z){w.throw_error(b.error.instantiation(y.indicator));return}else if(Pe)if(b.type.is_variable(ie)&&Z){w.throw_error(b.error.instantiation(y.indicator));return}else{var Ne=w.parse(F),ot=Ne.value;!b.type.is_number(ot)||Ne.tokens[Ne.tokens.length-1].space?w.throw_error(b.error.syntax_by_predicate("parseable_number",y.indicator)):w.prepend([new xe(P.goal.replace(new H("=",[z,ot])),P.substitution,P)]);return}}if(!Z){F=z.toString();for(var dt=new H("[]"),Gt=F.length-1;Gt>=0;Gt--)dt=new H(".",[new Fe(n(F,Gt),!1),dt]);w.prepend([new xe(P.goal.replace(new H("=",[X,dt])),P.substitution,P)])}}},"upcase_atom/2":function(w,P,y){var F=y.args[0],z=y.args[1];b.type.is_variable(F)?w.throw_error(b.error.instantiation(y.indicator)):b.type.is_atom(F)?!b.type.is_variable(z)&&!b.type.is_atom(z)?w.throw_error(b.error.type("atom",z,y.indicator)):w.prepend([new xe(P.goal.replace(new H("=",[z,new H(F.id.toUpperCase(),[])])),P.substitution,P)]):w.throw_error(b.error.type("atom",F,y.indicator))},"downcase_atom/2":function(w,P,y){var F=y.args[0],z=y.args[1];b.type.is_variable(F)?w.throw_error(b.error.instantiation(y.indicator)):b.type.is_atom(F)?!b.type.is_variable(z)&&!b.type.is_atom(z)?w.throw_error(b.error.type("atom",z,y.indicator)):w.prepend([new xe(P.goal.replace(new H("=",[z,new H(F.id.toLowerCase(),[])])),P.substitution,P)]):w.throw_error(b.error.type("atom",F,y.indicator))},"atomic_list_concat/2":function(w,P,y){var F=y.args[0],z=y.args[1];w.prepend([new xe(P.goal.replace(new H("atomic_list_concat",[F,new H("",[]),z])),P.substitution,P)])},"atomic_list_concat/3":function(w,P,y){var F=y.args[0],z=y.args[1],X=y.args[2];if(b.type.is_variable(z)||b.type.is_variable(F)&&b.type.is_variable(X))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_variable(F)&&!b.type.is_list(F))w.throw_error(b.error.type("list",F,y.indicator));else if(!b.type.is_variable(X)&&!b.type.is_atom(X))w.throw_error(b.error.type("atom",X,y.indicator));else if(b.type.is_variable(X)){for(var ie="",Pe=F;b.type.is_term(Pe)&&Pe.indicator==="./2";){if(!b.type.is_atom(Pe.args[0])&&!b.type.is_number(Pe.args[0])){w.throw_error(b.error.type("atomic",Pe.args[0],y.indicator));return}ie!==""&&(ie+=z.id),b.type.is_atom(Pe.args[0])?ie+=Pe.args[0].id:ie+=""+Pe.args[0].value,Pe=Pe.args[1]}ie=new H(ie,[]),b.type.is_variable(Pe)?w.throw_error(b.error.instantiation(y.indicator)):!b.type.is_term(Pe)||Pe.indicator!=="[]/0"?w.throw_error(b.error.type("list",F,y.indicator)):w.prepend([new xe(P.goal.replace(new H("=",[ie,X])),P.substitution,P)])}else{var Z=g(o(X.id.split(z.id),function(Ne){return new H(Ne,[])}));w.prepend([new xe(P.goal.replace(new H("=",[Z,F])),P.substitution,P)])}},"@=</2":function(w,P,y){b.compare(y.args[0],y.args[1])<=0&&w.success(P)},"==/2":function(w,P,y){b.compare(y.args[0],y.args[1])===0&&w.success(P)},"\\==/2":function(w,P,y){b.compare(y.args[0],y.args[1])!==0&&w.success(P)},"@</2":function(w,P,y){b.compare(y.args[0],y.args[1])<0&&w.success(P)},"@>/2":function(w,P,y){b.compare(y.args[0],y.args[1])>0&&w.success(P)},"@>=/2":function(w,P,y){b.compare(y.args[0],y.args[1])>=0&&w.success(P)},"compare/3":function(w,P,y){var F=y.args[0],z=y.args[1],X=y.args[2];if(!b.type.is_variable(F)&&!b.type.is_atom(F))w.throw_error(b.error.type("atom",F,y.indicator));else if(b.type.is_atom(F)&&["<",">","="].indexOf(F.id)===-1)w.throw_error(b.type.domain("order",F,y.indicator));else{var Z=b.compare(z,X);Z=Z===0?"=":Z===-1?"<":">",w.prepend([new xe(P.goal.replace(new H("=",[F,new H(Z,[])])),P.substitution,P)])}},"is/2":function(w,P,y){var F=y.args[1].interpret(w);b.type.is_number(F)?w.prepend([new xe(P.goal.replace(new H("=",[y.args[0],F],w.level)),P.substitution,P)]):w.throw_error(F)},"between/3":function(w,P,y){var F=y.args[0],z=y.args[1],X=y.args[2];if(b.type.is_variable(F)||b.type.is_variable(z))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_integer(F))w.throw_error(b.error.type("integer",F,y.indicator));else if(!b.type.is_integer(z))w.throw_error(b.error.type("integer",z,y.indicator));else if(!b.type.is_variable(X)&&!b.type.is_integer(X))w.throw_error(b.error.type("integer",X,y.indicator));else if(b.type.is_variable(X)){var Z=[new xe(P.goal.replace(new H("=",[X,F])),P.substitution,P)];F.value<z.value&&Z.push(new xe(P.goal.replace(new H("between",[new Fe(F.value+1,!1),z,X])),P.substitution,P)),w.prepend(Z)}else F.value<=X.value&&z.value>=X.value&&w.success(P)},"succ/2":function(w,P,y){var F=y.args[0],z=y.args[1];b.type.is_variable(F)&&b.type.is_variable(z)?w.throw_error(b.error.instantiation(y.indicator)):!b.type.is_variable(F)&&!b.type.is_integer(F)?w.throw_error(b.error.type("integer",F,y.indicator)):!b.type.is_variable(z)&&!b.type.is_integer(z)?w.throw_error(b.error.type("integer",z,y.indicator)):!b.type.is_variable(F)&&F.value<0?w.throw_error(b.error.domain("not_less_than_zero",F,y.indicator)):!b.type.is_variable(z)&&z.value<0?w.throw_error(b.error.domain("not_less_than_zero",z,y.indicator)):(b.type.is_variable(z)||z.value>0)&&(b.type.is_variable(F)?w.prepend([new xe(P.goal.replace(new H("=",[F,new Fe(z.value-1,!1)])),P.substitution,P)]):w.prepend([new xe(P.goal.replace(new H("=",[z,new Fe(F.value+1,!1)])),P.substitution,P)]))},"=:=/2":function(w,P,y){var F=b.arithmetic_compare(w,y.args[0],y.args[1]);b.type.is_term(F)?w.throw_error(F):F===0&&w.success(P)},"=\\=/2":function(w,P,y){var F=b.arithmetic_compare(w,y.args[0],y.args[1]);b.type.is_term(F)?w.throw_error(F):F!==0&&w.success(P)},"</2":function(w,P,y){var F=b.arithmetic_compare(w,y.args[0],y.args[1]);b.type.is_term(F)?w.throw_error(F):F<0&&w.success(P)},"=</2":function(w,P,y){var F=b.arithmetic_compare(w,y.args[0],y.args[1]);b.type.is_term(F)?w.throw_error(F):F<=0&&w.success(P)},">/2":function(w,P,y){var F=b.arithmetic_compare(w,y.args[0],y.args[1]);b.type.is_term(F)?w.throw_error(F):F>0&&w.success(P)},">=/2":function(w,P,y){var F=b.arithmetic_compare(w,y.args[0],y.args[1]);b.type.is_term(F)?w.throw_error(F):F>=0&&w.success(P)},"var/1":function(w,P,y){b.type.is_variable(y.args[0])&&w.success(P)},"atom/1":function(w,P,y){b.type.is_atom(y.args[0])&&w.success(P)},"atomic/1":function(w,P,y){b.type.is_atomic(y.args[0])&&w.success(P)},"compound/1":function(w,P,y){b.type.is_compound(y.args[0])&&w.success(P)},"integer/1":function(w,P,y){b.type.is_integer(y.args[0])&&w.success(P)},"float/1":function(w,P,y){b.type.is_float(y.args[0])&&w.success(P)},"number/1":function(w,P,y){b.type.is_number(y.args[0])&&w.success(P)},"nonvar/1":function(w,P,y){b.type.is_variable(y.args[0])||w.success(P)},"ground/1":function(w,P,y){y.variables().length===0&&w.success(P)},"acyclic_term/1":function(w,P,y){for(var F=P.substitution.apply(P.substitution),z=y.args[0].variables(),X=0;X<z.length;X++)if(P.substitution.links[z[X]]!==void 0&&!P.substitution.links[z[X]].equals(F.links[z[X]]))return;w.success(P)},"callable/1":function(w,P,y){b.type.is_callable(y.args[0])&&w.success(P)},"is_list/1":function(w,P,y){for(var F=y.args[0];b.type.is_term(F)&&F.indicator==="./2";)F=F.args[1];b.type.is_term(F)&&F.indicator==="[]/0"&&w.success(P)},"current_input/1":function(w,P,y){var F=y.args[0];!b.type.is_variable(F)&&!b.type.is_stream(F)&&!b.type.is_atom(F)?w.throw_error(b.error.domain("stream",F,y.indicator)):(b.type.is_atom(F)&&w.get_stream_by_alias(F.id)&&(F=w.get_stream_by_alias(F.id)),w.prepend([new xe(P.goal.replace(new H("=",[F,w.get_current_input()])),P.substitution,P)]))},"current_output/1":function(w,P,y){var F=y.args[0];!b.type.is_variable(F)&&!b.type.is_stream(F)&&!b.type.is_atom(F)?w.throw_error(b.error.domain("stream_or_alias",F,y.indicator)):(b.type.is_atom(F)&&w.get_stream_by_alias(F.id)&&(F=w.get_stream_by_alias(F.id)),w.prepend([new xe(P.goal.replace(new H("=",[F,w.get_current_output()])),P.substitution,P)]))},"set_input/1":function(w,P,y){var F=y.args[0],z=b.type.is_stream(F)?F:w.get_stream_by_alias(F.id);b.type.is_variable(F)?w.throw_error(b.error.instantiation(y.indicator)):!b.type.is_variable(F)&&!b.type.is_stream(F)&&!b.type.is_atom(F)?w.throw_error(b.error.domain("stream_or_alias",F,y.indicator)):b.type.is_stream(z)?z.output===!0?w.throw_error(b.error.permission("input","stream",F,y.indicator)):(w.set_current_input(z),w.success(P)):w.throw_error(b.error.existence("stream",F,y.indicator))},"set_output/1":function(w,P,y){var F=y.args[0],z=b.type.is_stream(F)?F:w.get_stream_by_alias(F.id);b.type.is_variable(F)?w.throw_error(b.error.instantiation(y.indicator)):!b.type.is_variable(F)&&!b.type.is_stream(F)&&!b.type.is_atom(F)?w.throw_error(b.error.domain("stream_or_alias",F,y.indicator)):b.type.is_stream(z)?z.input===!0?w.throw_error(b.error.permission("output","stream",F,y.indicator)):(w.set_current_output(z),w.success(P)):w.throw_error(b.error.existence("stream",F,y.indicator))},"open/3":function(w,P,y){var F=y.args[0],z=y.args[1],X=y.args[2];w.prepend([new xe(P.goal.replace(new H("open",[F,z,X,new H("[]",[])])),P.substitution,P)])},"open/4":function(w,P,y){var F=y.args[0],z=y.args[1],X=y.args[2],Z=y.args[3];if(b.type.is_variable(F)||b.type.is_variable(z))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_variable(z)&&!b.type.is_atom(z))w.throw_error(b.error.type("atom",z,y.indicator));else if(!b.type.is_list(Z))w.throw_error(b.error.type("list",Z,y.indicator));else if(!b.type.is_variable(X))w.throw_error(b.error.type("variable",X,y.indicator));else if(!b.type.is_atom(F)&&!b.type.is_streamable(F))w.throw_error(b.error.domain("source_sink",F,y.indicator));else if(!b.type.is_io_mode(z))w.throw_error(b.error.domain("io_mode",z,y.indicator));else{for(var ie={},Pe=Z,Ne;b.type.is_term(Pe)&&Pe.indicator==="./2";){if(Ne=Pe.args[0],b.type.is_variable(Ne)){w.throw_error(b.error.instantiation(y.indicator));return}else if(!b.type.is_stream_option(Ne)){w.throw_error(b.error.domain("stream_option",Ne,y.indicator));return}ie[Ne.id]=Ne.args[0].id,Pe=Pe.args[1]}if(Pe.indicator!=="[]/0"){b.type.is_variable(Pe)?w.throw_error(b.error.instantiation(y.indicator)):w.throw_error(b.error.type("list",Z,y.indicator));return}else{var ot=ie.alias;if(ot&&w.get_stream_by_alias(ot)){w.throw_error(b.error.permission("open","source_sink",new H("alias",[new H(ot,[])]),y.indicator));return}ie.type||(ie.type="text");var dt;if(b.type.is_atom(F)?dt=w.file_system_open(F.id,ie.type,z.id):dt=F.stream(ie.type,z.id),dt===!1){w.throw_error(b.error.permission("open","source_sink",F,y.indicator));return}else if(dt===null){w.throw_error(b.error.existence("source_sink",F,y.indicator));return}var Gt=new Re(dt,z.id,ie.alias,ie.type,ie.reposition==="true",ie.eof_action);ot?w.session.streams[ot]=Gt:w.session.streams[Gt.id]=Gt,w.prepend([new xe(P.goal.replace(new H("=",[X,Gt])),P.substitution,P)])}}},"close/1":function(w,P,y){var F=y.args[0];w.prepend([new xe(P.goal.replace(new H("close",[F,new H("[]",[])])),P.substitution,P)])},"close/2":function(w,P,y){var F=y.args[0],z=y.args[1],X=b.type.is_stream(F)?F:w.get_stream_by_alias(F.id);if(b.type.is_variable(F)||b.type.is_variable(z))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_list(z))w.throw_error(b.error.type("list",z,y.indicator));else if(!b.type.is_stream(F)&&!b.type.is_atom(F))w.throw_error(b.error.domain("stream_or_alias",F,y.indicator));else if(!b.type.is_stream(X)||X.stream===null)w.throw_error(b.error.existence("stream",F,y.indicator));else{for(var Z={},ie=z,Pe;b.type.is_term(ie)&&ie.indicator==="./2";){if(Pe=ie.args[0],b.type.is_variable(Pe)){w.throw_error(b.error.instantiation(y.indicator));return}else if(!b.type.is_close_option(Pe)){w.throw_error(b.error.domain("close_option",Pe,y.indicator));return}Z[Pe.id]=Pe.args[0].id==="true",ie=ie.args[1]}if(ie.indicator!=="[]/0"){b.type.is_variable(ie)?w.throw_error(b.error.instantiation(y.indicator)):w.throw_error(b.error.type("list",z,y.indicator));return}else{if(X===w.session.standard_input||X===w.session.standard_output){w.success(P);return}else X===w.session.current_input?w.session.current_input=w.session.standard_input:X===w.session.current_output&&(w.session.current_output=w.session.current_output);X.alias!==null?delete w.session.streams[X.alias]:delete w.session.streams[X.id],X.output&&X.stream.flush();var Ne=X.stream.close();X.stream=null,(Z.force===!0||Ne===!0)&&w.success(P)}}},"flush_output/0":function(w,P,y){w.prepend([new xe(P.goal.replace(new H(",",[new H("current_output",[new Ie("S")]),new H("flush_output",[new Ie("S")])])),P.substitution,P)])},"flush_output/1":function(w,P,y){var F=y.args[0],z=b.type.is_stream(F)?F:w.get_stream_by_alias(F.id);b.type.is_variable(F)?w.throw_error(b.error.instantiation(y.indicator)):!b.type.is_stream(F)&&!b.type.is_atom(F)?w.throw_error(b.error.domain("stream_or_alias",F,y.indicator)):!b.type.is_stream(z)||z.stream===null?w.throw_error(b.error.existence("stream",F,y.indicator)):F.input===!0?w.throw_error(b.error.permission("output","stream",output,y.indicator)):(z.stream.flush(),w.success(P))},"stream_property/2":function(w,P,y){var F=y.args[0],z=y.args[1],X=b.type.is_stream(F)?F:w.get_stream_by_alias(F.id);if(!b.type.is_variable(F)&&!b.type.is_stream(F)&&!b.type.is_atom(F))w.throw_error(b.error.domain("stream_or_alias",F,y.indicator));else if(!b.type.is_variable(F)&&(!b.type.is_stream(X)||X.stream===null))w.throw_error(b.error.existence("stream",F,y.indicator));else if(!b.type.is_variable(z)&&!b.type.is_stream_property(z))w.throw_error(b.error.domain("stream_property",z,y.indicator));else{var Z=[],ie=[];if(!b.type.is_variable(F))Z.push(X);else for(var Pe in w.session.streams)Z.push(w.session.streams[Pe]);for(var Ne=0;Ne<Z.length;Ne++){var ot=[];Z[Ne].filename&&ot.push(new H("file_name",[new H(Z[Ne].file_name,[])])),ot.push(new H("mode",[new H(Z[Ne].mode,[])])),ot.push(new H(Z[Ne].input?"input":"output",[])),Z[Ne].alias&&ot.push(new H("alias",[new H(Z[Ne].alias,[])])),ot.push(new H("position",[typeof Z[Ne].position=="number"?new Fe(Z[Ne].position,!1):new H(Z[Ne].position,[])])),ot.push(new H("end_of_stream",[new H(Z[Ne].position==="end_of_stream"?"at":Z[Ne].position==="past_end_of_stream"?"past":"not",[])])),ot.push(new H("eof_action",[new H(Z[Ne].eof_action,[])])),ot.push(new H("reposition",[new H(Z[Ne].reposition?"true":"false",[])])),ot.push(new H("type",[new H(Z[Ne].type,[])]));for(var dt=0;dt<ot.length;dt++)ie.push(new xe(P.goal.replace(new H(",",[new H("=",[b.type.is_variable(F)?F:X,Z[Ne]]),new H("=",[z,ot[dt]])])),P.substitution,P))}w.prepend(ie)}},"at_end_of_stream/0":function(w,P,y){w.prepend([new xe(P.goal.replace(new H(",",[new H("current_input",[new Ie("S")]),new H(",",[new H("stream_property",[new Ie("S"),new H("end_of_stream",[new Ie("E")])]),new H(",",[new H("!",[]),new H(";",[new H("=",[new Ie("E"),new H("at",[])]),new H("=",[new Ie("E"),new H("past",[])])])])])])),P.substitution,P)])},"at_end_of_stream/1":function(w,P,y){var F=y.args[0];w.prepend([new xe(P.goal.replace(new H(",",[new H("stream_property",[F,new H("end_of_stream",[new Ie("E")])]),new H(",",[new H("!",[]),new H(";",[new H("=",[new Ie("E"),new H("at",[])]),new H("=",[new Ie("E"),new H("past",[])])])])])),P.substitution,P)])},"set_stream_position/2":function(w,P,y){var F=y.args[0],z=y.args[1],X=b.type.is_stream(F)?F:w.get_stream_by_alias(F.id);b.type.is_variable(F)||b.type.is_variable(z)?w.throw_error(b.error.instantiation(y.indicator)):!b.type.is_stream(F)&&!b.type.is_atom(F)?w.throw_error(b.error.domain("stream_or_alias",F,y.indicator)):!b.type.is_stream(X)||X.stream===null?w.throw_error(b.error.existence("stream",F,y.indicator)):b.type.is_stream_position(z)?X.reposition===!1?w.throw_error(b.error.permission("reposition","stream",F,y.indicator)):(b.type.is_integer(z)?X.position=z.value:X.position=z.id,w.success(P)):w.throw_error(b.error.domain("stream_position",z,y.indicator))},"get_char/1":function(w,P,y){var F=y.args[0];w.prepend([new xe(P.goal.replace(new H(",",[new H("current_input",[new Ie("S")]),new H("get_char",[new Ie("S"),F])])),P.substitution,P)])},"get_char/2":function(w,P,y){var F=y.args[0],z=y.args[1],X=b.type.is_stream(F)?F:w.get_stream_by_alias(F.id);if(b.type.is_variable(F))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_variable(z)&&!b.type.is_character(z))w.throw_error(b.error.type("in_character",z,y.indicator));else if(!b.type.is_stream(F)&&!b.type.is_atom(F))w.throw_error(b.error.domain("stream_or_alias",F,y.indicator));else if(!b.type.is_stream(X)||X.stream===null)w.throw_error(b.error.existence("stream",F,y.indicator));else if(X.output)w.throw_error(b.error.permission("input","stream",F,y.indicator));else if(X.type==="binary")w.throw_error(b.error.permission("input","binary_stream",F,y.indicator));else if(X.position==="past_end_of_stream"&&X.eof_action==="error")w.throw_error(b.error.permission("input","past_end_of_stream",F,y.indicator));else{var Z;if(X.position==="end_of_stream")Z="end_of_file",X.position="past_end_of_stream";else{if(Z=X.stream.get(1,X.position),Z===null){w.throw_error(b.error.representation("character",y.indicator));return}X.position++}w.prepend([new xe(P.goal.replace(new H("=",[new H(Z,[]),z])),P.substitution,P)])}},"get_code/1":function(w,P,y){var F=y.args[0];w.prepend([new xe(P.goal.replace(new H(",",[new H("current_input",[new Ie("S")]),new H("get_code",[new Ie("S"),F])])),P.substitution,P)])},"get_code/2":function(w,P,y){var F=y.args[0],z=y.args[1],X=b.type.is_stream(F)?F:w.get_stream_by_alias(F.id);if(b.type.is_variable(F))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_variable(z)&&!b.type.is_integer(z))w.throw_error(b.error.type("integer",char,y.indicator));else if(!b.type.is_variable(F)&&!b.type.is_stream(F)&&!b.type.is_atom(F))w.throw_error(b.error.domain("stream_or_alias",F,y.indicator));else if(!b.type.is_stream(X)||X.stream===null)w.throw_error(b.error.existence("stream",F,y.indicator));else if(X.output)w.throw_error(b.error.permission("input","stream",F,y.indicator));else if(X.type==="binary")w.throw_error(b.error.permission("input","binary_stream",F,y.indicator));else if(X.position==="past_end_of_stream"&&X.eof_action==="error")w.throw_error(b.error.permission("input","past_end_of_stream",F,y.indicator));else{var Z;if(X.position==="end_of_stream")Z=-1,X.position="past_end_of_stream";else{if(Z=X.stream.get(1,X.position),Z===null){w.throw_error(b.error.representation("character",y.indicator));return}Z=n(Z,0),X.position++}w.prepend([new xe(P.goal.replace(new H("=",[new Fe(Z,!1),z])),P.substitution,P)])}},"peek_char/1":function(w,P,y){var F=y.args[0];w.prepend([new xe(P.goal.replace(new H(",",[new H("current_input",[new Ie("S")]),new H("peek_char",[new Ie("S"),F])])),P.substitution,P)])},"peek_char/2":function(w,P,y){var F=y.args[0],z=y.args[1],X=b.type.is_stream(F)?F:w.get_stream_by_alias(F.id);if(b.type.is_variable(F))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_variable(z)&&!b.type.is_character(z))w.throw_error(b.error.type("in_character",z,y.indicator));else if(!b.type.is_stream(F)&&!b.type.is_atom(F))w.throw_error(b.error.domain("stream_or_alias",F,y.indicator));else if(!b.type.is_stream(X)||X.stream===null)w.throw_error(b.error.existence("stream",F,y.indicator));else if(X.output)w.throw_error(b.error.permission("input","stream",F,y.indicator));else if(X.type==="binary")w.throw_error(b.error.permission("input","binary_stream",F,y.indicator));else if(X.position==="past_end_of_stream"&&X.eof_action==="error")w.throw_error(b.error.permission("input","past_end_of_stream",F,y.indicator));else{var Z;if(X.position==="end_of_stream")Z="end_of_file",X.position="past_end_of_stream";else if(Z=X.stream.get(1,X.position),Z===null){w.throw_error(b.error.representation("character",y.indicator));return}w.prepend([new xe(P.goal.replace(new H("=",[new H(Z,[]),z])),P.substitution,P)])}},"peek_code/1":function(w,P,y){var F=y.args[0];w.prepend([new xe(P.goal.replace(new H(",",[new H("current_input",[new Ie("S")]),new H("peek_code",[new Ie("S"),F])])),P.substitution,P)])},"peek_code/2":function(w,P,y){var F=y.args[0],z=y.args[1],X=b.type.is_stream(F)?F:w.get_stream_by_alias(F.id);if(b.type.is_variable(F))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_variable(z)&&!b.type.is_integer(z))w.throw_error(b.error.type("integer",char,y.indicator));else if(!b.type.is_variable(F)&&!b.type.is_stream(F)&&!b.type.is_atom(F))w.throw_error(b.error.domain("stream_or_alias",F,y.indicator));else if(!b.type.is_stream(X)||X.stream===null)w.throw_error(b.error.existence("stream",F,y.indicator));else if(X.output)w.throw_error(b.error.permission("input","stream",F,y.indicator));else if(X.type==="binary")w.throw_error(b.error.permission("input","binary_stream",F,y.indicator));else if(X.position==="past_end_of_stream"&&X.eof_action==="error")w.throw_error(b.error.permission("input","past_end_of_stream",F,y.indicator));else{var Z;if(X.position==="end_of_stream")Z=-1,X.position="past_end_of_stream";else{if(Z=X.stream.get(1,X.position),Z===null){w.throw_error(b.error.representation("character",y.indicator));return}Z=n(Z,0)}w.prepend([new xe(P.goal.replace(new H("=",[new Fe(Z,!1),z])),P.substitution,P)])}},"put_char/1":function(w,P,y){var F=y.args[0];w.prepend([new xe(P.goal.replace(new H(",",[new H("current_output",[new Ie("S")]),new H("put_char",[new Ie("S"),F])])),P.substitution,P)])},"put_char/2":function(w,P,y){var F=y.args[0],z=y.args[1],X=b.type.is_stream(F)?F:w.get_stream_by_alias(F.id);b.type.is_variable(F)||b.type.is_variable(z)?w.throw_error(b.error.instantiation(y.indicator)):b.type.is_character(z)?!b.type.is_variable(F)&&!b.type.is_stream(F)&&!b.type.is_atom(F)?w.throw_error(b.error.domain("stream_or_alias",F,y.indicator)):!b.type.is_stream(X)||X.stream===null?w.throw_error(b.error.existence("stream",F,y.indicator)):X.input?w.throw_error(b.error.permission("output","stream",F,y.indicator)):X.type==="binary"?w.throw_error(b.error.permission("output","binary_stream",F,y.indicator)):X.stream.put(z.id,X.position)&&(typeof X.position=="number"&&X.position++,w.success(P)):w.throw_error(b.error.type("character",z,y.indicator))},"put_code/1":function(w,P,y){var F=y.args[0];w.prepend([new xe(P.goal.replace(new H(",",[new H("current_output",[new Ie("S")]),new H("put_code",[new Ie("S"),F])])),P.substitution,P)])},"put_code/2":function(w,P,y){var F=y.args[0],z=y.args[1],X=b.type.is_stream(F)?F:w.get_stream_by_alias(F.id);b.type.is_variable(F)||b.type.is_variable(z)?w.throw_error(b.error.instantiation(y.indicator)):b.type.is_integer(z)?b.type.is_character_code(z)?!b.type.is_variable(F)&&!b.type.is_stream(F)&&!b.type.is_atom(F)?w.throw_error(b.error.domain("stream_or_alias",F,y.indicator)):!b.type.is_stream(X)||X.stream===null?w.throw_error(b.error.existence("stream",F,y.indicator)):X.input?w.throw_error(b.error.permission("output","stream",F,y.indicator)):X.type==="binary"?w.throw_error(b.error.permission("output","binary_stream",F,y.indicator)):X.stream.put_char(u(z.value),X.position)&&(typeof X.position=="number"&&X.position++,w.success(P)):w.throw_error(b.error.representation("character_code",y.indicator)):w.throw_error(b.error.type("integer",z,y.indicator))},"nl/0":function(w,P,y){w.prepend([new xe(P.goal.replace(new H(",",[new H("current_output",[new Ie("S")]),new H("put_char",[new Ie("S"),new H(`
+`,[])])])),P.substitution,P)])},"nl/1":function(w,P,y){var F=y.args[0];w.prepend([new xe(P.goal.replace(new H("put_char",[F,new H(`
+`,[])])),P.substitution,P)])},"get_byte/1":function(w,P,y){var F=y.args[0];w.prepend([new xe(P.goal.replace(new H(",",[new H("current_input",[new Ie("S")]),new H("get_byte",[new Ie("S"),F])])),P.substitution,P)])},"get_byte/2":function(w,P,y){var F=y.args[0],z=y.args[1],X=b.type.is_stream(F)?F:w.get_stream_by_alias(F.id);if(b.type.is_variable(F))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_variable(z)&&!b.type.is_byte(z))w.throw_error(b.error.type("in_byte",char,y.indicator));else if(!b.type.is_stream(F)&&!b.type.is_atom(F))w.throw_error(b.error.domain("stream_or_alias",F,y.indicator));else if(!b.type.is_stream(X)||X.stream===null)w.throw_error(b.error.existence("stream",F,y.indicator));else if(X.output)w.throw_error(b.error.permission("input","stream",F,y.indicator));else if(X.type==="text")w.throw_error(b.error.permission("input","text_stream",F,y.indicator));else if(X.position==="past_end_of_stream"&&X.eof_action==="error")w.throw_error(b.error.permission("input","past_end_of_stream",F,y.indicator));else{var Z;if(X.position==="end_of_stream")Z="end_of_file",X.position="past_end_of_stream";else{if(Z=X.stream.get_byte(X.position),Z===null){w.throw_error(b.error.representation("byte",y.indicator));return}X.position++}w.prepend([new xe(P.goal.replace(new H("=",[new Fe(Z,!1),z])),P.substitution,P)])}},"peek_byte/1":function(w,P,y){var F=y.args[0];w.prepend([new xe(P.goal.replace(new H(",",[new H("current_input",[new Ie("S")]),new H("peek_byte",[new Ie("S"),F])])),P.substitution,P)])},"peek_byte/2":function(w,P,y){var F=y.args[0],z=y.args[1],X=b.type.is_stream(F)?F:w.get_stream_by_alias(F.id);if(b.type.is_variable(F))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_variable(z)&&!b.type.is_byte(z))w.throw_error(b.error.type("in_byte",char,y.indicator));else if(!b.type.is_stream(F)&&!b.type.is_atom(F))w.throw_error(b.error.domain("stream_or_alias",F,y.indicator));else if(!b.type.is_stream(X)||X.stream===null)w.throw_error(b.error.existence("stream",F,y.indicator));else if(X.output)w.throw_error(b.error.permission("input","stream",F,y.indicator));else if(X.type==="text")w.throw_error(b.error.permission("input","text_stream",F,y.indicator));else if(X.position==="past_end_of_stream"&&X.eof_action==="error")w.throw_error(b.error.permission("input","past_end_of_stream",F,y.indicator));else{var Z;if(X.position==="end_of_stream")Z="end_of_file",X.position="past_end_of_stream";else if(Z=X.stream.get_byte(X.position),Z===null){w.throw_error(b.error.representation("byte",y.indicator));return}w.prepend([new xe(P.goal.replace(new H("=",[new Fe(Z,!1),z])),P.substitution,P)])}},"put_byte/1":function(w,P,y){var F=y.args[0];w.prepend([new xe(P.goal.replace(new H(",",[new H("current_output",[new Ie("S")]),new H("put_byte",[new Ie("S"),F])])),P.substitution,P)])},"put_byte/2":function(w,P,y){var F=y.args[0],z=y.args[1],X=b.type.is_stream(F)?F:w.get_stream_by_alias(F.id);b.type.is_variable(F)||b.type.is_variable(z)?w.throw_error(b.error.instantiation(y.indicator)):b.type.is_byte(z)?!b.type.is_variable(F)&&!b.type.is_stream(F)&&!b.type.is_atom(F)?w.throw_error(b.error.domain("stream_or_alias",F,y.indicator)):!b.type.is_stream(X)||X.stream===null?w.throw_error(b.error.existence("stream",F,y.indicator)):X.input?w.throw_error(b.error.permission("output","stream",F,y.indicator)):X.type==="text"?w.throw_error(b.error.permission("output","text_stream",F,y.indicator)):X.stream.put_byte(z.value,X.position)&&(typeof X.position=="number"&&X.position++,w.success(P)):w.throw_error(b.error.type("byte",z,y.indicator))},"read/1":function(w,P,y){var F=y.args[0];w.prepend([new xe(P.goal.replace(new H(",",[new H("current_input",[new Ie("S")]),new H("read_term",[new Ie("S"),F,new H("[]",[])])])),P.substitution,P)])},"read/2":function(w,P,y){var F=y.args[0],z=y.args[1];w.prepend([new xe(P.goal.replace(new H("read_term",[F,z,new H("[]",[])])),P.substitution,P)])},"read_term/2":function(w,P,y){var F=y.args[0],z=y.args[1];w.prepend([new xe(P.goal.replace(new H(",",[new H("current_input",[new Ie("S")]),new H("read_term",[new Ie("S"),F,z])])),P.substitution,P)])},"read_term/3":function(w,P,y){var F=y.args[0],z=y.args[1],X=y.args[2],Z=b.type.is_stream(F)?F:w.get_stream_by_alias(F.id);if(b.type.is_variable(F)||b.type.is_variable(X))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_list(X))w.throw_error(b.error.type("list",X,y.indicator));else if(!b.type.is_stream(F)&&!b.type.is_atom(F))w.throw_error(b.error.domain("stream_or_alias",F,y.indicator));else if(!b.type.is_stream(Z)||Z.stream===null)w.throw_error(b.error.existence("stream",F,y.indicator));else if(Z.output)w.throw_error(b.error.permission("input","stream",F,y.indicator));else if(Z.type==="binary")w.throw_error(b.error.permission("input","binary_stream",F,y.indicator));else if(Z.position==="past_end_of_stream"&&Z.eof_action==="error")w.throw_error(b.error.permission("input","past_end_of_stream",F,y.indicator));else{for(var ie={},Pe=X,Ne;b.type.is_term(Pe)&&Pe.indicator==="./2";){if(Ne=Pe.args[0],b.type.is_variable(Ne)){w.throw_error(b.error.instantiation(y.indicator));return}else if(!b.type.is_read_option(Ne)){w.throw_error(b.error.domain("read_option",Ne,y.indicator));return}ie[Ne.id]=Ne.args[0],Pe=Pe.args[1]}if(Pe.indicator!=="[]/0"){b.type.is_variable(Pe)?w.throw_error(b.error.instantiation(y.indicator)):w.throw_error(b.error.type("list",X,y.indicator));return}else{for(var ot,dt,Gt,$t="",bt=[],an=null;an===null||an.name!=="atom"||an.value!=="."||Gt.type===A&&b.flatten_error(new H("throw",[Gt.value])).found==="token_not_found";){if(ot=Z.stream.get(1,Z.position),ot===null){w.throw_error(b.error.representation("character",y.indicator));return}if(ot==="end_of_file"||ot==="past_end_of_file"){Gt?w.throw_error(b.error.syntax(bt[Gt.len-1],". or expression expected",!1)):w.throw_error(b.error.syntax(null,"token not found",!0));return}Z.position++,$t+=ot,dt=new U(w),dt.new_text($t),bt=dt.get_tokens(),an=bt!==null&&bt.length>0?bt[bt.length-1]:null,bt!==null&&(Gt=J(w,bt,0,w.__get_max_priority(),!1))}if(Gt.type===p&&Gt.len===bt.length-1&&an.value==="."){Gt=Gt.value.rename(w);var Qr=new H("=",[z,Gt]);if(ie.variables){var mr=g(o(Se(Gt.variables()),function(br){return new Ie(br)}));Qr=new H(",",[Qr,new H("=",[ie.variables,mr])])}if(ie.variable_names){var mr=g(o(Se(Gt.variables()),function(Wr){var Kn;for(Kn in w.session.renamed_variables)if(w.session.renamed_variables.hasOwnProperty(Kn)&&w.session.renamed_variables[Kn]===Wr)break;return new H("=",[new H(Kn,[]),new Ie(Wr)])}));Qr=new H(",",[Qr,new H("=",[ie.variable_names,mr])])}if(ie.singletons){var mr=g(o(new He(Gt,null).singleton_variables(),function(Wr){var Kn;for(Kn in w.session.renamed_variables)if(w.session.renamed_variables.hasOwnProperty(Kn)&&w.session.renamed_variables[Kn]===Wr)break;return new H("=",[new H(Kn,[]),new Ie(Wr)])}));Qr=new H(",",[Qr,new H("=",[ie.singletons,mr])])}w.prepend([new xe(P.goal.replace(Qr),P.substitution,P)])}else Gt.type===p?w.throw_error(b.error.syntax(bt[Gt.len],"unexpected token",!1)):w.throw_error(Gt.value)}}},"write/1":function(w,P,y){var F=y.args[0];w.prepend([new xe(P.goal.replace(new H(",",[new H("current_output",[new Ie("S")]),new H("write",[new Ie("S"),F])])),P.substitution,P)])},"write/2":function(w,P,y){var F=y.args[0],z=y.args[1];w.prepend([new xe(P.goal.replace(new H("write_term",[F,z,new H(".",[new H("quoted",[new H("false",[])]),new H(".",[new H("ignore_ops",[new H("false")]),new H(".",[new H("numbervars",[new H("true")]),new H("[]",[])])])])])),P.substitution,P)])},"writeq/1":function(w,P,y){var F=y.args[0];w.prepend([new xe(P.goal.replace(new H(",",[new H("current_output",[new Ie("S")]),new H("writeq",[new Ie("S"),F])])),P.substitution,P)])},"writeq/2":function(w,P,y){var F=y.args[0],z=y.args[1];w.prepend([new xe(P.goal.replace(new H("write_term",[F,z,new H(".",[new H("quoted",[new H("true",[])]),new H(".",[new H("ignore_ops",[new H("false")]),new H(".",[new H("numbervars",[new H("true")]),new H("[]",[])])])])])),P.substitution,P)])},"write_canonical/1":function(w,P,y){var F=y.args[0];w.prepend([new xe(P.goal.replace(new H(",",[new H("current_output",[new Ie("S")]),new H("write_canonical",[new Ie("S"),F])])),P.substitution,P)])},"write_canonical/2":function(w,P,y){var F=y.args[0],z=y.args[1];w.prepend([new xe(P.goal.replace(new H("write_term",[F,z,new H(".",[new H("quoted",[new H("true",[])]),new H(".",[new H("ignore_ops",[new H("true")]),new H(".",[new H("numbervars",[new H("false")]),new H("[]",[])])])])])),P.substitution,P)])},"write_term/2":function(w,P,y){var F=y.args[0],z=y.args[1];w.prepend([new xe(P.goal.replace(new H(",",[new H("current_output",[new Ie("S")]),new H("write_term",[new Ie("S"),F,z])])),P.substitution,P)])},"write_term/3":function(w,P,y){var F=y.args[0],z=y.args[1],X=y.args[2],Z=b.type.is_stream(F)?F:w.get_stream_by_alias(F.id);if(b.type.is_variable(F)||b.type.is_variable(X))w.throw_error(b.error.instantiation(y.indicator));else if(!b.type.is_list(X))w.throw_error(b.error.type("list",X,y.indicator));else if(!b.type.is_stream(F)&&!b.type.is_atom(F))w.throw_error(b.error.domain("stream_or_alias",F,y.indicator));else if(!b.type.is_stream(Z)||Z.stream===null)w.throw_error(b.error.existence("stream",F,y.indicator));else if(Z.input)w.throw_error(b.error.permission("output","stream",F,y.indicator));else if(Z.type==="binary")w.throw_error(b.error.permission("output","binary_stream",F,y.indicator));else if(Z.position==="past_end_of_stream"&&Z.eof_action==="error")w.throw_error(b.error.permission("output","past_end_of_stream",F,y.indicator));else{for(var ie={},Pe=X,Ne;b.type.is_term(Pe)&&Pe.indicator==="./2";){if(Ne=Pe.args[0],b.type.is_variable(Ne)){w.throw_error(b.error.instantiation(y.indicator));return}else if(!b.type.is_write_option(Ne)){w.throw_error(b.error.domain("write_option",Ne,y.indicator));return}ie[Ne.id]=Ne.args[0].id==="true",Pe=Pe.args[1]}if(Pe.indicator!=="[]/0"){b.type.is_variable(Pe)?w.throw_error(b.error.instantiation(y.indicator)):w.throw_error(b.error.type("list",X,y.indicator));return}else{ie.session=w.session;var ot=z.toString(ie);Z.stream.put(ot,Z.position),typeof Z.position=="number"&&(Z.position+=ot.length),w.success(P)}}},"halt/0":function(w,P,y){w.points=[]},"halt/1":function(w,P,y){var F=y.args[0];b.type.is_variable(F)?w.throw_error(b.error.instantiation(y.indicator)):b.type.is_integer(F)?w.points=[]:w.throw_error(b.error.type("integer",F,y.indicator))},"current_prolog_flag/2":function(w,P,y){var F=y.args[0],z=y.args[1];if(!b.type.is_variable(F)&&!b.type.is_atom(F))w.throw_error(b.error.type("atom",F,y.indicator));else if(!b.type.is_variable(F)&&!b.type.is_flag(F))w.throw_error(b.error.domain("prolog_flag",F,y.indicator));else{var X=[];for(var Z in b.flag)if(!!b.flag.hasOwnProperty(Z)){var ie=new H(",",[new H("=",[new H(Z),F]),new H("=",[w.get_flag(Z),z])]);X.push(new xe(P.goal.replace(ie),P.substitution,P))}w.prepend(X)}},"set_prolog_flag/2":function(w,P,y){var F=y.args[0],z=y.args[1];b.type.is_variable(F)||b.type.is_variable(z)?w.throw_error(b.error.instantiation(y.indicator)):b.type.is_atom(F)?b.type.is_flag(F)?b.type.is_value_flag(F,z)?b.type.is_modifiable_flag(F)?(w.session.flag[F.id]=z,w.success(P)):w.throw_error(b.error.permission("modify","flag",F)):w.throw_error(b.error.domain("flag_value",new H("+",[F,z]),y.indicator)):w.throw_error(b.error.domain("prolog_flag",F,y.indicator)):w.throw_error(b.error.type("atom",F,y.indicator))}},flag:{bounded:{allowed:[new H("true"),new H("false")],value:new H("true"),changeable:!1},max_integer:{allowed:[new Fe(Number.MAX_SAFE_INTEGER)],value:new Fe(Number.MAX_SAFE_INTEGER),changeable:!1},min_integer:{allowed:[new Fe(Number.MIN_SAFE_INTEGER)],value:new Fe(Number.MIN_SAFE_INTEGER),changeable:!1},integer_rounding_function:{allowed:[new H("down"),new H("toward_zero")],value:new H("toward_zero"),changeable:!1},char_conversion:{allowed:[new H("on"),new H("off")],value:new H("on"),changeable:!0},debug:{allowed:[new H("on"),new H("off")],value:new H("off"),changeable:!0},max_arity:{allowed:[new H("unbounded")],value:new H("unbounded"),changeable:!1},unknown:{allowed:[new H("error"),new H("fail"),new H("warning")],value:new H("error"),changeable:!0},double_quotes:{allowed:[new H("chars"),new H("codes"),new H("atom")],value:new H("codes"),changeable:!0},occurs_check:{allowed:[new H("false"),new H("true")],value:new H("false"),changeable:!0},dialect:{allowed:[new H("tau")],value:new H("tau"),changeable:!1},version_data:{allowed:[new H("tau",[new Fe(t.major,!1),new Fe(t.minor,!1),new Fe(t.patch,!1),new H(t.status)])],value:new H("tau",[new Fe(t.major,!1),new Fe(t.minor,!1),new Fe(t.patch,!1),new H(t.status)]),changeable:!1},nodejs:{allowed:[new H("yes"),new H("no")],value:new H(typeof hl<"u"&&hl.exports?"yes":"no"),changeable:!1}},unify:function(w,P,y){y=y===void 0?!1:y;for(var F=[{left:w,right:P}],z={};F.length!==0;){var X=F.pop();if(w=X.left,P=X.right,b.type.is_term(w)&&b.type.is_term(P)){if(w.indicator!==P.indicator)return null;for(var Z=0;Z<w.args.length;Z++)F.push({left:w.args[Z],right:P.args[Z]})}else if(b.type.is_number(w)&&b.type.is_number(P)){if(w.value!==P.value||w.is_float!==P.is_float)return null}else if(b.type.is_variable(w)){if(b.type.is_variable(P)&&w.id===P.id)continue;if(y===!0&&P.variables().indexOf(w.id)!==-1)return null;if(w.id!=="_"){var ie=new ke;ie.add(w.id,P);for(var Z=0;Z<F.length;Z++)F[Z].left=F[Z].left.apply(ie),F[Z].right=F[Z].right.apply(ie);for(var Z in z)z[Z]=z[Z].apply(ie);z[w.id]=P}}else if(b.type.is_variable(P))F.push({left:P,right:w});else if(w.unify!==void 0){if(!w.unify(P))return null}else return null}return new ke(z)},compare:function(w,P){var y=b.type.compare(w,P);return y!==0?y:w.compare(P)},arithmetic_compare:function(w,P,y){var F=P.interpret(w);if(b.type.is_number(F)){var z=y.interpret(w);return b.type.is_number(z)?F.value<z.value?-1:F.value>z.value?1:0:z}else return F},operate:function(w,P){if(b.type.is_operator(P)){for(var y=b.type.is_operator(P),F=[],z,X=!1,Z=0;Z<P.args.length;Z++){if(z=P.args[Z].interpret(w),b.type.is_number(z)){if(y.type_args!==null&&z.is_float!==y.type_args)return b.error.type(y.type_args?"float":"integer",z,w.__call_indicator);F.push(z.value)}else return z;X=X||z.is_float}return F.push(w),z=b.arithmetic.evaluation[P.indicator].fn.apply(this,F),X=y.type_result===null?X:y.type_result,b.type.is_term(z)?z:z===Number.POSITIVE_INFINITY||z===Number.NEGATIVE_INFINITY?b.error.evaluation("overflow",w.__call_indicator):X===!1&&w.get_flag("bounded").id==="true"&&(z>w.get_flag("max_integer").value||z<w.get_flag("min_integer").value)?b.error.evaluation("int_overflow",w.__call_indicator):new Fe(z,X)}else return b.error.type("evaluable",P.indicator,w.__call_indicator)},error:{existence:function(w,P,y){return typeof P=="string"&&(P=ee(P)),new H("error",[new H("existence_error",[new H(w),P]),ee(y)])},type:function(w,P,y){return new H("error",[new H("type_error",[new H(w),P]),ee(y)])},instantiation:function(w){return new H("error",[new H("instantiation_error"),ee(w)])},domain:function(w,P,y){return new H("error",[new H("domain_error",[new H(w),P]),ee(y)])},representation:function(w,P){return new H("error",[new H("representation_error",[new H(w)]),ee(P)])},permission:function(w,P,y,F){return new H("error",[new H("permission_error",[new H(w),new H(P),y]),ee(F)])},evaluation:function(w,P){return new H("error",[new H("evaluation_error",[new H(w)]),ee(P)])},syntax:function(w,P,y){w=w||{value:"",line:0,column:0,matches:[""],start:0};var F=y&&w.matches.length>0?w.start+w.matches[0].length:w.start,z=y?new H("token_not_found"):new H("found",[new H(w.value.toString())]),X=new H(".",[new H("line",[new Fe(w.line+1)]),new H(".",[new H("column",[new Fe(F+1)]),new H(".",[z,new H("[]",[])])])]);return new H("error",[new H("syntax_error",[new H(P)]),X])},syntax_by_predicate:function(w,P){return new H("error",[new H("syntax_error",[new H(w)]),ee(P)])}},warning:{singleton:function(w,P,y){for(var F=new H("[]"),z=w.length-1;z>=0;z--)F=new H(".",[new Ie(w[z]),F]);return new H("warning",[new H("singleton_variables",[F,ee(P)]),new H(".",[new H("line",[new Fe(y,!1)]),new H("[]")])])},failed_goal:function(w,P){return new H("warning",[new H("failed_goal",[w]),new H(".",[new H("line",[new Fe(P,!1)]),new H("[]")])])}},format_variable:function(w){return"_"+w},format_answer:function(w,P,F){P instanceof Te&&(P=P.thread);var F=F||{};if(F.session=P?P.session:void 0,b.type.is_error(w))return"uncaught exception: "+w.args[0].toString();if(w===!1)return"false.";if(w===null)return"limit exceeded ;";var z=0,X="";if(b.type.is_substitution(w)){var Z=w.domain(!0);w=w.filter(function(Ne,ot){return!b.type.is_variable(ot)||Z.indexOf(ot.id)!==-1&&Ne!==ot.id})}for(var ie in w.links)!w.links.hasOwnProperty(ie)||(z++,X!==""&&(X+=", "),X+=ie.toString(F)+" = "+w.links[ie].toString(F));var Pe=typeof P>"u"||P.points.length>0?" ;":".";return z===0?"true"+Pe:X+Pe},flatten_error:function(w){if(!b.type.is_error(w))return null;w=w.args[0];var P={};return P.type=w.args[0].id,P.thrown=P.type==="syntax_error"?null:w.args[1].id,P.expected=null,P.found=null,P.representation=null,P.existence=null,P.existence_type=null,P.line=null,P.column=null,P.permission_operation=null,P.permission_type=null,P.evaluation_type=null,P.type==="type_error"||P.type==="domain_error"?(P.expected=w.args[0].args[0].id,P.found=w.args[0].args[1].toString()):P.type==="syntax_error"?w.args[1].indicator==="./2"?(P.expected=w.args[0].args[0].id,P.found=w.args[1].args[1].args[1].args[0],P.found=P.found.id==="token_not_found"?P.found.id:P.found.args[0].id,P.line=w.args[1].args[0].args[0].value,P.column=w.args[1].args[1].args[0].args[0].value):P.thrown=w.args[1].id:P.type==="permission_error"?(P.found=w.args[0].args[2].toString(),P.permission_operation=w.args[0].args[0].id,P.permission_type=w.args[0].args[1].id):P.type==="evaluation_error"?P.evaluation_type=w.args[0].args[0].id:P.type==="representation_error"?P.representation=w.args[0].args[0].id:P.type==="existence_error"&&(P.existence=w.args[0].args[1].toString(),P.existence_type=w.args[0].args[0].id),P},create:function(w){return new b.type.Session(w)}};typeof hl<"u"?hl.exports=b:window.pl=b})()});function ime(t,e,r){t.prepend(r.map(o=>new Ta.default.type.State(e.goal.replace(o),e.substitution,e)))}function yH(t){let e=ome.get(t.session);if(e==null)throw new Error("Assertion failed: A project should have been registered for the active session");return e}function ame(t,e){ome.set(t,e),t.consult(`:- use_module(library(${zgt.id})).`)}var EH,Ta,sme,u0,Vgt,Jgt,ome,zgt,lme=Et(()=>{Ye();EH=$e(d2()),Ta=$e(mH()),sme=$e(ve("vm")),{is_atom:u0,is_variable:Vgt,is_instantiated_list:Jgt}=Ta.default.type;ome=new WeakMap;zgt=new Ta.default.type.Module("constraints",{["project_workspaces_by_descriptor/3"]:(t,e,r)=>{let[o,a,n]=r.args;if(!u0(o)||!u0(a)){t.throw_error(Ta.default.error.instantiation(r.indicator));return}let u=W.parseIdent(o.id),A=W.makeDescriptor(u,a.id),h=yH(t).tryWorkspaceByDescriptor(A);Vgt(n)&&h!==null&&ime(t,e,[new Ta.default.type.Term("=",[n,new Ta.default.type.Term(String(h.relativeCwd))])]),u0(n)&&h!==null&&h.relativeCwd===n.id&&t.success(e)},["workspace_field/3"]:(t,e,r)=>{let[o,a,n]=r.args;if(!u0(o)||!u0(a)){t.throw_error(Ta.default.error.instantiation(r.indicator));return}let A=yH(t).tryWorkspaceByCwd(o.id);if(A==null)return;let p=(0,EH.default)(A.manifest.raw,a.id);typeof p>"u"||ime(t,e,[new Ta.default.type.Term("=",[n,new Ta.default.type.Term(typeof p=="object"?JSON.stringify(p):p)])])},["workspace_field_test/3"]:(t,e,r)=>{let[o,a,n]=r.args;t.prepend([new Ta.default.type.State(e.goal.replace(new Ta.default.type.Term("workspace_field_test",[o,a,n,new Ta.default.type.Term("[]",[])])),e.substitution,e)])},["workspace_field_test/4"]:(t,e,r)=>{let[o,a,n,u]=r.args;if(!u0(o)||!u0(a)||!u0(n)||!Jgt(u)){t.throw_error(Ta.default.error.instantiation(r.indicator));return}let p=yH(t).tryWorkspaceByCwd(o.id);if(p==null)return;let h=(0,EH.default)(p.manifest.raw,a.id);if(typeof h>"u")return;let E={$$:h};for(let[v,x]of u.toJavaScript().entries())E[`$${v}`]=x;sme.default.runInNewContext(n.id,E)&&t.success(e)}},["project_workspaces_by_descriptor/3","workspace_field/3","workspace_field_test/3","workspace_field_test/4"])});var b2={};Vt(b2,{Constraints:()=>P2,DependencyType:()=>fme});function to(t){if(t instanceof DC.default.type.Num)return t.value;if(t instanceof DC.default.type.Term)switch(t.indicator){case"throw/1":return to(t.args[0]);case"error/1":return to(t.args[0]);case"error/2":if(t.args[0]instanceof DC.default.type.Term&&t.args[0].indicator==="syntax_error/1")return Object.assign(to(t.args[0]),...to(t.args[1]));{let e=to(t.args[0]);return e.message+=` (in ${to(t.args[1])})`,e}case"syntax_error/1":return new zt(43,`Syntax error: ${to(t.args[0])}`);case"existence_error/2":return new zt(44,`Existence error: ${to(t.args[0])} ${to(t.args[1])} not found`);case"instantiation_error/0":return new zt(75,"Instantiation error: an argument is variable when an instantiated argument was expected");case"line/1":return{line:to(t.args[0])};case"column/1":return{column:to(t.args[0])};case"found/1":return{found:to(t.args[0])};case"./2":return[to(t.args[0])].concat(to(t.args[1]));case"//2":return`${to(t.args[0])}/${to(t.args[1])}`;default:return t.id}throw`couldn't pretty print because of unsupported node ${t}`}function ume(t){let e;try{e=to(t)}catch(r){throw typeof r=="string"?new zt(42,`Unknown error: ${t} (note: ${r})`):r}return typeof e.line<"u"&&typeof e.column<"u"&&(e.message+=` at line ${e.line}, column ${e.column}`),e}function em(t){return t.id==="null"?null:`${t.toJavaScript()}`}function Xgt(t){if(t.id==="null")return null;{let e=t.toJavaScript();if(typeof e!="string")return JSON.stringify(e);try{return JSON.stringify(JSON.parse(e))}catch{return JSON.stringify(e)}}}function A0(t){return typeof t=="string"?`'${t}'`:"[]"}var Ame,DC,fme,cme,CH,P2,x2=Et(()=>{Ye();Ye();St();Ame=$e(jde()),DC=$e(mH());v2();lme();(0,Ame.default)(DC.default);fme=(o=>(o.Dependencies="dependencies",o.DevDependencies="devDependencies",o.PeerDependencies="peerDependencies",o))(fme||{}),cme=["dependencies","devDependencies","peerDependencies"];CH=class{constructor(e,r){let o=1e3*e.workspaces.length;this.session=DC.default.create(o),ame(this.session,e),this.session.consult(":- use_module(library(lists))."),this.session.consult(r)}fetchNextAnswer(){return new Promise(e=>{this.session.answer(r=>{e(r)})})}async*makeQuery(e){let r=this.session.query(e);if(r!==!0)throw ume(r);for(;;){let o=await this.fetchNextAnswer();if(o===null)throw new zt(79,"Resolution limit exceeded");if(!o)break;if(o.id==="throw")throw ume(o);yield o}}};P2=class{constructor(e){this.source="";this.project=e;let r=e.configuration.get("constraintsPath");oe.existsSync(r)&&(this.source=oe.readFileSync(r,"utf8"))}static async find(e){return new P2(e)}getProjectDatabase(){let e="";for(let r of cme)e+=`dependency_type(${r}).
+`;for(let r of this.project.workspacesByCwd.values()){let o=r.relativeCwd;e+=`workspace(${A0(o)}).
+`,e+=`workspace_ident(${A0(o)}, ${A0(W.stringifyIdent(r.anchoredLocator))}).
+`,e+=`workspace_version(${A0(o)}, ${A0(r.manifest.version)}).
+`;for(let a of cme)for(let n of r.manifest[a].values())e+=`workspace_has_dependency(${A0(o)}, ${A0(W.stringifyIdent(n))}, ${A0(n.range)}, ${a}).
+`}return e+=`workspace(_) :- false.
+`,e+=`workspace_ident(_, _) :- false.
+`,e+=`workspace_version(_, _) :- false.
+`,e+=`workspace_has_dependency(_, _, _, _) :- false.
+`,e}getDeclarations(){let e="";return e+=`gen_enforced_dependency(_, _, _, _) :- false.
+`,e+=`gen_enforced_field(_, _, _) :- false.
+`,e}get fullSource(){return`${this.getProjectDatabase()}
+${this.source}
+${this.getDeclarations()}`}createSession(){return new CH(this.project,this.fullSource)}async processClassic(){let e=this.createSession();return{enforcedDependencies:await this.genEnforcedDependencies(e),enforcedFields:await this.genEnforcedFields(e)}}async process(){let{enforcedDependencies:e,enforcedFields:r}=await this.processClassic(),o=new Map;for(let{workspace:a,dependencyIdent:n,dependencyRange:u,dependencyType:A}of e){let p=B2([A,W.stringifyIdent(n)]),h=_e.getMapWithDefault(o,a.cwd);_e.getMapWithDefault(h,p).set(u??void 0,new Set)}for(let{workspace:a,fieldPath:n,fieldValue:u}of r){let A=B2(n),p=_e.getMapWithDefault(o,a.cwd);_e.getMapWithDefault(p,A).set(JSON.parse(u)??void 0,new Set)}return{manifestUpdates:o,reportedErrors:new Map}}async genEnforcedDependencies(e){let r=[];for await(let o of e.makeQuery("workspace(WorkspaceCwd), dependency_type(DependencyType), gen_enforced_dependency(WorkspaceCwd, DependencyIdent, DependencyRange, DependencyType).")){let a=V.resolve(this.project.cwd,em(o.links.WorkspaceCwd)),n=em(o.links.DependencyIdent),u=em(o.links.DependencyRange),A=em(o.links.DependencyType);if(a===null||n===null)throw new Error("Invalid rule");let p=this.project.getWorkspaceByCwd(a),h=W.parseIdent(n);r.push({workspace:p,dependencyIdent:h,dependencyRange:u,dependencyType:A})}return _e.sortMap(r,[({dependencyRange:o})=>o!==null?"0":"1",({workspace:o})=>W.stringifyIdent(o.anchoredLocator),({dependencyIdent:o})=>W.stringifyIdent(o)])}async genEnforcedFields(e){let r=[];for await(let o of e.makeQuery("workspace(WorkspaceCwd), gen_enforced_field(WorkspaceCwd, FieldPath, FieldValue).")){let a=V.resolve(this.project.cwd,em(o.links.WorkspaceCwd)),n=em(o.links.FieldPath),u=Xgt(o.links.FieldValue);if(a===null||n===null)throw new Error("Invalid rule");let A=this.project.getWorkspaceByCwd(a);r.push({workspace:A,fieldPath:n,fieldValue:u})}return _e.sortMap(r,[({workspace:o})=>W.stringifyIdent(o.anchoredLocator),({fieldPath:o})=>o])}async*query(e){let r=this.createSession();for await(let o of r.makeQuery(e)){let a={};for(let[n,u]of Object.entries(o.links))n!=="_"&&(a[n]=em(u));yield a}}}});var wme=_(Ik=>{"use strict";Object.defineProperty(Ik,"__esModule",{value:!0});function q2(t){let e=[...t.caches],r=e.shift();return r===void 0?Cme():{get(o,a,n={miss:()=>Promise.resolve()}){return r.get(o,a,n).catch(()=>q2({caches:e}).get(o,a,n))},set(o,a){return r.set(o,a).catch(()=>q2({caches:e}).set(o,a))},delete(o){return r.delete(o).catch(()=>q2({caches:e}).delete(o))},clear(){return r.clear().catch(()=>q2({caches:e}).clear())}}}function Cme(){return{get(t,e,r={miss:()=>Promise.resolve()}){return e().then(a=>Promise.all([a,r.miss(a)])).then(([a])=>a)},set(t,e){return Promise.resolve(e)},delete(t){return Promise.resolve()},clear(){return Promise.resolve()}}}Ik.createFallbackableCache=q2;Ik.createNullCache=Cme});var Bme=_((QWt,Ime)=>{Ime.exports=wme()});var vme=_(TH=>{"use strict";Object.defineProperty(TH,"__esModule",{value:!0});function ddt(t={serializable:!0}){let e={};return{get(r,o,a={miss:()=>Promise.resolve()}){let n=JSON.stringify(r);if(n in e)return Promise.resolve(t.serializable?JSON.parse(e[n]):e[n]);let u=o(),A=a&&a.miss||(()=>Promise.resolve());return u.then(p=>A(p)).then(()=>u)},set(r,o){return e[JSON.stringify(r)]=t.serializable?JSON.stringify(o):o,Promise.resolve(o)},delete(r){return delete e[JSON.stringify(r)],Promise.resolve()},clear(){return e={},Promise.resolve()}}}TH.createInMemoryCache=ddt});var Sme=_((RWt,Dme)=>{Dme.exports=vme()});var bme=_(Zc=>{"use strict";Object.defineProperty(Zc,"__esModule",{value:!0});function mdt(t,e,r){let o={"x-algolia-api-key":r,"x-algolia-application-id":e};return{headers(){return t===NH.WithinHeaders?o:{}},queryParameters(){return t===NH.WithinQueryParameters?o:{}}}}function ydt(t){let e=0,r=()=>(e++,new Promise(o=>{setTimeout(()=>{o(t(r))},Math.min(100*e,1e3))}));return t(r)}function Pme(t,e=(r,o)=>Promise.resolve()){return Object.assign(t,{wait(r){return Pme(t.then(o=>Promise.all([e(o,r),o])).then(o=>o[1]))}})}function Edt(t){let e=t.length-1;for(e;e>0;e--){let r=Math.floor(Math.random()*(e+1)),o=t[e];t[e]=t[r],t[r]=o}return t}function Cdt(t,e){return e&&Object.keys(e).forEach(r=>{t[r]=e[r](t)}),t}function wdt(t,...e){let r=0;return t.replace(/%s/g,()=>encodeURIComponent(e[r++]))}var Idt="4.14.2",Bdt=t=>()=>t.transporter.requester.destroy(),NH={WithinQueryParameters:0,WithinHeaders:1};Zc.AuthMode=NH;Zc.addMethods=Cdt;Zc.createAuth=mdt;Zc.createRetryablePromise=ydt;Zc.createWaitablePromise=Pme;Zc.destroy=Bdt;Zc.encode=wdt;Zc.shuffle=Edt;Zc.version=Idt});var Y2=_((NWt,xme)=>{xme.exports=bme()});var kme=_(LH=>{"use strict";Object.defineProperty(LH,"__esModule",{value:!0});var vdt={Delete:"DELETE",Get:"GET",Post:"POST",Put:"PUT"};LH.MethodEnum=vdt});var W2=_((OWt,Qme)=>{Qme.exports=kme()});var Wme=_(Fi=>{"use strict";Object.defineProperty(Fi,"__esModule",{value:!0});var Rme=W2();function OH(t,e){let r=t||{},o=r.data||{};return Object.keys(r).forEach(a=>{["timeout","headers","queryParameters","data","cacheable"].indexOf(a)===-1&&(o[a]=r[a])}),{data:Object.entries(o).length>0?o:void 0,timeout:r.timeout||e,headers:r.headers||{},queryParameters:r.queryParameters||{},cacheable:r.cacheable}}var K2={Read:1,Write:2,Any:3},xC={Up:1,Down:2,Timeouted:3},Tme=2*60*1e3;function UH(t,e=xC.Up){return{...t,status:e,lastUpdate:Date.now()}}function Nme(t){return t.status===xC.Up||Date.now()-t.lastUpdate>Tme}function Lme(t){return t.status===xC.Timeouted&&Date.now()-t.lastUpdate<=Tme}function _H(t){return typeof t=="string"?{protocol:"https",url:t,accept:K2.Any}:{protocol:t.protocol||"https",url:t.url,accept:t.accept||K2.Any}}function Ddt(t,e){return Promise.all(e.map(r=>t.get(r,()=>Promise.resolve(UH(r))))).then(r=>{let o=r.filter(A=>Nme(A)),a=r.filter(A=>Lme(A)),n=[...o,...a],u=n.length>0?n.map(A=>_H(A)):e;return{getTimeout(A,p){return(a.length===0&&A===0?1:a.length+3+A)*p},statelessHosts:u}})}var Sdt=({isTimedOut:t,status:e})=>!t&&~~e===0,Pdt=t=>{let e=t.status;return t.isTimedOut||Sdt(t)||~~(e/100)!==2&&~~(e/100)!==4},bdt=({status:t})=>~~(t/100)===2,xdt=(t,e)=>Pdt(t)?e.onRetry(t):bdt(t)?e.onSuccess(t):e.onFail(t);function Fme(t,e,r,o){let a=[],n=Hme(r,o),u=jme(t,o),A=r.method,p=r.method!==Rme.MethodEnum.Get?{}:{...r.data,...o.data},h={"x-algolia-agent":t.userAgent.value,...t.queryParameters,...p,...o.queryParameters},E=0,I=(v,x)=>{let C=v.pop();if(C===void 0)throw Yme(MH(a));let R={data:n,headers:u,method:A,url:Ume(C,r.path,h),connectTimeout:x(E,t.timeouts.connect),responseTimeout:x(E,o.timeout)},L=J=>{let te={request:R,response:J,host:C,triesLeft:v.length};return a.push(te),te},U={onSuccess:J=>Ome(J),onRetry(J){let te=L(J);return J.isTimedOut&&E++,Promise.all([t.logger.info("Retryable failure",HH(te)),t.hostsCache.set(C,UH(C,J.isTimedOut?xC.Timeouted:xC.Down))]).then(()=>I(v,x))},onFail(J){throw L(J),Mme(J,MH(a))}};return t.requester.send(R).then(J=>xdt(J,U))};return Ddt(t.hostsCache,e).then(v=>I([...v.statelessHosts].reverse(),v.getTimeout))}function kdt(t){let{hostsCache:e,logger:r,requester:o,requestsCache:a,responsesCache:n,timeouts:u,userAgent:A,hosts:p,queryParameters:h,headers:E}=t,I={hostsCache:e,logger:r,requester:o,requestsCache:a,responsesCache:n,timeouts:u,userAgent:A,headers:E,queryParameters:h,hosts:p.map(v=>_H(v)),read(v,x){let C=OH(x,I.timeouts.read),R=()=>Fme(I,I.hosts.filter(J=>(J.accept&K2.Read)!==0),v,C);if((C.cacheable!==void 0?C.cacheable:v.cacheable)!==!0)return R();let U={request:v,mappedRequestOptions:C,transporter:{queryParameters:I.queryParameters,headers:I.headers}};return I.responsesCache.get(U,()=>I.requestsCache.get(U,()=>I.requestsCache.set(U,R()).then(J=>Promise.all([I.requestsCache.delete(U),J]),J=>Promise.all([I.requestsCache.delete(U),Promise.reject(J)])).then(([J,te])=>te)),{miss:J=>I.responsesCache.set(U,J)})},write(v,x){return Fme(I,I.hosts.filter(C=>(C.accept&K2.Write)!==0),v,OH(x,I.timeouts.write))}};return I}function Qdt(t){let e={value:`Algolia for JavaScript (${t})`,add(r){let o=`; ${r.segment}${r.version!==void 0?` (${r.version})`:""}`;return e.value.indexOf(o)===-1&&(e.value=`${e.value}${o}`),e}};return e}function Ome(t){try{return JSON.parse(t.content)}catch(e){throw qme(e.message,t)}}function Mme({content:t,status:e},r){let o=t;try{o=JSON.parse(t).message}catch{}return Gme(o,e,r)}function Fdt(t,...e){let r=0;return t.replace(/%s/g,()=>encodeURIComponent(e[r++]))}function Ume(t,e,r){let o=_me(r),a=`${t.protocol}://${t.url}/${e.charAt(0)==="/"?e.substr(1):e}`;return o.length&&(a+=`?${o}`),a}function _me(t){let e=r=>Object.prototype.toString.call(r)==="[object Object]"||Object.prototype.toString.call(r)==="[object Array]";return Object.keys(t).map(r=>Fdt("%s=%s",r,e(t[r])?JSON.stringify(t[r]):t[r])).join("&")}function Hme(t,e){if(t.method===Rme.MethodEnum.Get||t.data===void 0&&e.data===void 0)return;let r=Array.isArray(t.data)?t.data:{...t.data,...e.data};return JSON.stringify(r)}function jme(t,e){let r={...t.headers,...e.headers},o={};return Object.keys(r).forEach(a=>{let n=r[a];o[a.toLowerCase()]=n}),o}function MH(t){return t.map(e=>HH(e))}function HH(t){let e=t.request.headers["x-algolia-api-key"]?{"x-algolia-api-key":"*****"}:{};return{...t,request:{...t.request,headers:{...t.request.headers,...e}}}}function Gme(t,e,r){return{name:"ApiError",message:t,status:e,transporterStackTrace:r}}function qme(t,e){return{name:"DeserializationError",message:t,response:e}}function Yme(t){return{name:"RetryError",message:"Unreachable hosts - your application id may be incorrect. If the error persists, contact support@algolia.com.",transporterStackTrace:t}}Fi.CallEnum=K2;Fi.HostStatusEnum=xC;Fi.createApiError=Gme;Fi.createDeserializationError=qme;Fi.createMappedRequestOptions=OH;Fi.createRetryError=Yme;Fi.createStatefulHost=UH;Fi.createStatelessHost=_H;Fi.createTransporter=kdt;Fi.createUserAgent=Qdt;Fi.deserializeFailure=Mme;Fi.deserializeSuccess=Ome;Fi.isStatefulHostTimeouted=Lme;Fi.isStatefulHostUp=Nme;Fi.serializeData=Hme;Fi.serializeHeaders=jme;Fi.serializeQueryParameters=_me;Fi.serializeUrl=Ume;Fi.stackFrameWithoutCredentials=HH;Fi.stackTraceWithoutCredentials=MH});var V2=_((UWt,Kme)=>{Kme.exports=Wme()});var Vme=_(m0=>{"use strict";Object.defineProperty(m0,"__esModule",{value:!0});var kC=Y2(),Rdt=V2(),J2=W2(),Tdt=t=>{let e=t.region||"us",r=kC.createAuth(kC.AuthMode.WithinHeaders,t.appId,t.apiKey),o=Rdt.createTransporter({hosts:[{url:`analytics.${e}.algolia.com`}],...t,headers:{...r.headers(),"content-type":"application/json",...t.headers},queryParameters:{...r.queryParameters(),...t.queryParameters}}),a=t.appId;return kC.addMethods({appId:a,transporter:o},t.methods)},Ndt=t=>(e,r)=>t.transporter.write({method:J2.MethodEnum.Post,path:"2/abtests",data:e},r),Ldt=t=>(e,r)=>t.transporter.write({method:J2.MethodEnum.Delete,path:kC.encode("2/abtests/%s",e)},r),Odt=t=>(e,r)=>t.transporter.read({method:J2.MethodEnum.Get,path:kC.encode("2/abtests/%s",e)},r),Mdt=t=>e=>t.transporter.read({method:J2.MethodEnum.Get,path:"2/abtests"},e),Udt=t=>(e,r)=>t.transporter.write({method:J2.MethodEnum.Post,path:kC.encode("2/abtests/%s/stop",e)},r);m0.addABTest=Ndt;m0.createAnalyticsClient=Tdt;m0.deleteABTest=Ldt;m0.getABTest=Odt;m0.getABTests=Mdt;m0.stopABTest=Udt});var zme=_((HWt,Jme)=>{Jme.exports=Vme()});var Zme=_(z2=>{"use strict";Object.defineProperty(z2,"__esModule",{value:!0});var jH=Y2(),_dt=V2(),Xme=W2(),Hdt=t=>{let e=t.region||"us",r=jH.createAuth(jH.AuthMode.WithinHeaders,t.appId,t.apiKey),o=_dt.createTransporter({hosts:[{url:`personalization.${e}.algolia.com`}],...t,headers:{...r.headers(),"content-type":"application/json",...t.headers},queryParameters:{...r.queryParameters(),...t.queryParameters}});return jH.addMethods({appId:t.appId,transporter:o},t.methods)},jdt=t=>e=>t.transporter.read({method:Xme.MethodEnum.Get,path:"1/strategies/personalization"},e),Gdt=t=>(e,r)=>t.transporter.write({method:Xme.MethodEnum.Post,path:"1/strategies/personalization",data:e},r);z2.createPersonalizationClient=Hdt;z2.getPersonalizationStrategy=jdt;z2.setPersonalizationStrategy=Gdt});var eye=_((GWt,$me)=>{$me.exports=Zme()});var hye=_(Ft=>{"use strict";Object.defineProperty(Ft,"__esModule",{value:!0});var qt=Y2(),Na=V2(),Ir=W2(),qdt=ve("crypto");function Bk(t){let e=r=>t.request(r).then(o=>{if(t.batch!==void 0&&t.batch(o.hits),!t.shouldStop(o))return o.cursor?e({cursor:o.cursor}):e({page:(r.page||0)+1})});return e({})}var Ydt=t=>{let e=t.appId,r=qt.createAuth(t.authMode!==void 0?t.authMode:qt.AuthMode.WithinHeaders,e,t.apiKey),o=Na.createTransporter({hosts:[{url:`${e}-dsn.algolia.net`,accept:Na.CallEnum.Read},{url:`${e}.algolia.net`,accept:Na.CallEnum.Write}].concat(qt.shuffle([{url:`${e}-1.algolianet.com`},{url:`${e}-2.algolianet.com`},{url:`${e}-3.algolianet.com`}])),...t,headers:{...r.headers(),"content-type":"application/x-www-form-urlencoded",...t.headers},queryParameters:{...r.queryParameters(),...t.queryParameters}}),a={transporter:o,appId:e,addAlgoliaAgent(n,u){o.userAgent.add({segment:n,version:u})},clearCache(){return Promise.all([o.requestsCache.clear(),o.responsesCache.clear()]).then(()=>{})}};return qt.addMethods(a,t.methods)};function tye(){return{name:"MissingObjectIDError",message:"All objects must have an unique objectID (like a primary key) to be valid. Algolia is also able to generate objectIDs automatically but *it's not recommended*. To do it, use the `{'autoGenerateObjectIDIfNotExist': true}` option."}}function rye(){return{name:"ObjectNotFoundError",message:"Object not found."}}function nye(){return{name:"ValidUntilNotFoundError",message:"ValidUntil not found in given secured api key."}}var Wdt=t=>(e,r)=>{let{queryParameters:o,...a}=r||{},n={acl:e,...o!==void 0?{queryParameters:o}:{}},u=(A,p)=>qt.createRetryablePromise(h=>X2(t)(A.key,p).catch(E=>{if(E.status!==404)throw E;return h()}));return qt.createWaitablePromise(t.transporter.write({method:Ir.MethodEnum.Post,path:"1/keys",data:n},a),u)},Kdt=t=>(e,r,o)=>{let a=Na.createMappedRequestOptions(o);return a.queryParameters["X-Algolia-User-ID"]=e,t.transporter.write({method:Ir.MethodEnum.Post,path:"1/clusters/mapping",data:{cluster:r}},a)},Vdt=t=>(e,r,o)=>t.transporter.write({method:Ir.MethodEnum.Post,path:"1/clusters/mapping/batch",data:{users:e,cluster:r}},o),Jdt=t=>(e,r)=>qt.createWaitablePromise(t.transporter.write({method:Ir.MethodEnum.Post,path:qt.encode("/1/dictionaries/%s/batch",e),data:{clearExistingDictionaryEntries:!0,requests:{action:"addEntry",body:[]}}},r),(o,a)=>QC(t)(o.taskID,a)),vk=t=>(e,r,o)=>{let a=(n,u)=>Z2(t)(e,{methods:{waitTask:Zi}}).waitTask(n.taskID,u);return qt.createWaitablePromise(t.transporter.write({method:Ir.MethodEnum.Post,path:qt.encode("1/indexes/%s/operation",e),data:{operation:"copy",destination:r}},o),a)},zdt=t=>(e,r,o)=>vk(t)(e,r,{...o,scope:[Sk.Rules]}),Xdt=t=>(e,r,o)=>vk(t)(e,r,{...o,scope:[Sk.Settings]}),Zdt=t=>(e,r,o)=>vk(t)(e,r,{...o,scope:[Sk.Synonyms]}),$dt=t=>(e,r)=>e.method===Ir.MethodEnum.Get?t.transporter.read(e,r):t.transporter.write(e,r),emt=t=>(e,r)=>{let o=(a,n)=>qt.createRetryablePromise(u=>X2(t)(e,n).then(u).catch(A=>{if(A.status!==404)throw A}));return qt.createWaitablePromise(t.transporter.write({method:Ir.MethodEnum.Delete,path:qt.encode("1/keys/%s",e)},r),o)},tmt=t=>(e,r,o)=>{let a=r.map(n=>({action:"deleteEntry",body:{objectID:n}}));return qt.createWaitablePromise(t.transporter.write({method:Ir.MethodEnum.Post,path:qt.encode("/1/dictionaries/%s/batch",e),data:{clearExistingDictionaryEntries:!1,requests:a}},o),(n,u)=>QC(t)(n.taskID,u))},rmt=()=>(t,e)=>{let r=Na.serializeQueryParameters(e),o=qdt.createHmac("sha256",t).update(r).digest("hex");return Buffer.from(o+r).toString("base64")},X2=t=>(e,r)=>t.transporter.read({method:Ir.MethodEnum.Get,path:qt.encode("1/keys/%s",e)},r),iye=t=>(e,r)=>t.transporter.read({method:Ir.MethodEnum.Get,path:qt.encode("1/task/%s",e.toString())},r),nmt=t=>e=>t.transporter.read({method:Ir.MethodEnum.Get,path:"/1/dictionaries/*/settings"},e),imt=t=>e=>t.transporter.read({method:Ir.MethodEnum.Get,path:"1/logs"},e),smt=()=>t=>{let e=Buffer.from(t,"base64").toString("ascii"),r=/validUntil=(\d+)/,o=e.match(r);if(o===null)throw nye();return parseInt(o[1],10)-Math.round(new Date().getTime()/1e3)},omt=t=>e=>t.transporter.read({method:Ir.MethodEnum.Get,path:"1/clusters/mapping/top"},e),amt=t=>(e,r)=>t.transporter.read({method:Ir.MethodEnum.Get,path:qt.encode("1/clusters/mapping/%s",e)},r),lmt=t=>e=>{let{retrieveMappings:r,...o}=e||{};return r===!0&&(o.getClusters=!0),t.transporter.read({method:Ir.MethodEnum.Get,path:"1/clusters/mapping/pending"},o)},Z2=t=>(e,r={})=>{let o={transporter:t.transporter,appId:t.appId,indexName:e};return qt.addMethods(o,r.methods)},cmt=t=>e=>t.transporter.read({method:Ir.MethodEnum.Get,path:"1/keys"},e),umt=t=>e=>t.transporter.read({method:Ir.MethodEnum.Get,path:"1/clusters"},e),Amt=t=>e=>t.transporter.read({method:Ir.MethodEnum.Get,path:"1/indexes"},e),fmt=t=>e=>t.transporter.read({method:Ir.MethodEnum.Get,path:"1/clusters/mapping"},e),pmt=t=>(e,r,o)=>{let a=(n,u)=>Z2(t)(e,{methods:{waitTask:Zi}}).waitTask(n.taskID,u);return qt.createWaitablePromise(t.transporter.write({method:Ir.MethodEnum.Post,path:qt.encode("1/indexes/%s/operation",e),data:{operation:"move",destination:r}},o),a)},hmt=t=>(e,r)=>{let o=(a,n)=>Promise.all(Object.keys(a.taskID).map(u=>Z2(t)(u,{methods:{waitTask:Zi}}).waitTask(a.taskID[u],n)));return qt.createWaitablePromise(t.transporter.write({method:Ir.MethodEnum.Post,path:"1/indexes/*/batch",data:{requests:e}},r),o)},gmt=t=>(e,r)=>t.transporter.read({method:Ir.MethodEnum.Post,path:"1/indexes/*/objects",data:{requests:e}},r),dmt=t=>(e,r)=>{let o=e.map(a=>({...a,params:Na.serializeQueryParameters(a.params||{})}));return t.transporter.read({method:Ir.MethodEnum.Post,path:"1/indexes/*/queries",data:{requests:o},cacheable:!0},r)},mmt=t=>(e,r)=>Promise.all(e.map(o=>{let{facetName:a,facetQuery:n,...u}=o.params;return Z2(t)(o.indexName,{methods:{searchForFacetValues:Aye}}).searchForFacetValues(a,n,{...r,...u})})),ymt=t=>(e,r)=>{let o=Na.createMappedRequestOptions(r);return o.queryParameters["X-Algolia-User-ID"]=e,t.transporter.write({method:Ir.MethodEnum.Delete,path:"1/clusters/mapping"},o)},Emt=t=>(e,r,o)=>{let a=r.map(n=>({action:"addEntry",body:n}));return qt.createWaitablePromise(t.transporter.write({method:Ir.MethodEnum.Post,path:qt.encode("/1/dictionaries/%s/batch",e),data:{clearExistingDictionaryEntries:!0,requests:a}},o),(n,u)=>QC(t)(n.taskID,u))},Cmt=t=>(e,r)=>{let o=(a,n)=>qt.createRetryablePromise(u=>X2(t)(e,n).catch(A=>{if(A.status!==404)throw A;return u()}));return qt.createWaitablePromise(t.transporter.write({method:Ir.MethodEnum.Post,path:qt.encode("1/keys/%s/restore",e)},r),o)},wmt=t=>(e,r,o)=>{let a=r.map(n=>({action:"addEntry",body:n}));return qt.createWaitablePromise(t.transporter.write({method:Ir.MethodEnum.Post,path:qt.encode("/1/dictionaries/%s/batch",e),data:{clearExistingDictionaryEntries:!1,requests:a}},o),(n,u)=>QC(t)(n.taskID,u))},Imt=t=>(e,r,o)=>t.transporter.read({method:Ir.MethodEnum.Post,path:qt.encode("/1/dictionaries/%s/search",e),data:{query:r},cacheable:!0},o),Bmt=t=>(e,r)=>t.transporter.read({method:Ir.MethodEnum.Post,path:"1/clusters/mapping/search",data:{query:e}},r),vmt=t=>(e,r)=>qt.createWaitablePromise(t.transporter.write({method:Ir.MethodEnum.Put,path:"/1/dictionaries/*/settings",data:e},r),(o,a)=>QC(t)(o.taskID,a)),Dmt=t=>(e,r)=>{let o=Object.assign({},r),{queryParameters:a,...n}=r||{},u=a?{queryParameters:a}:{},A=["acl","indexes","referers","restrictSources","queryParameters","description","maxQueriesPerIPPerHour","maxHitsPerQuery"],p=E=>Object.keys(o).filter(I=>A.indexOf(I)!==-1).every(I=>E[I]===o[I]),h=(E,I)=>qt.createRetryablePromise(v=>X2(t)(e,I).then(x=>p(x)?Promise.resolve():v()));return qt.createWaitablePromise(t.transporter.write({method:Ir.MethodEnum.Put,path:qt.encode("1/keys/%s",e),data:u},n),h)},QC=t=>(e,r)=>qt.createRetryablePromise(o=>iye(t)(e,r).then(a=>a.status!=="published"?o():void 0)),sye=t=>(e,r)=>{let o=(a,n)=>Zi(t)(a.taskID,n);return qt.createWaitablePromise(t.transporter.write({method:Ir.MethodEnum.Post,path:qt.encode("1/indexes/%s/batch",t.indexName),data:{requests:e}},r),o)},Smt=t=>e=>Bk({shouldStop:r=>r.cursor===void 0,...e,request:r=>t.transporter.read({method:Ir.MethodEnum.Post,path:qt.encode("1/indexes/%s/browse",t.indexName),data:r},e)}),Pmt=t=>e=>{let r={hitsPerPage:1e3,...e};return Bk({shouldStop:o=>o.hits.length<r.hitsPerPage,...r,request(o){return fye(t)("",{...r,...o}).then(a=>({...a,hits:a.hits.map(n=>(delete n._highlightResult,n))}))}})},bmt=t=>e=>{let r={hitsPerPage:1e3,...e};return Bk({shouldStop:o=>o.hits.length<r.hitsPerPage,...r,request(o){return pye(t)("",{...r,...o}).then(a=>({...a,hits:a.hits.map(n=>(delete n._highlightResult,n))}))}})},Dk=t=>(e,r,o)=>{let{batchSize:a,...n}=o||{},u={taskIDs:[],objectIDs:[]},A=(p=0)=>{let h=[],E;for(E=p;E<e.length&&(h.push(e[E]),h.length!==(a||1e3));E++);return h.length===0?Promise.resolve(u):sye(t)(h.map(I=>({action:r,body:I})),n).then(I=>(u.objectIDs=u.objectIDs.concat(I.objectIDs),u.taskIDs.push(I.taskID),E++,A(E)))};return qt.createWaitablePromise(A(),(p,h)=>Promise.all(p.taskIDs.map(E=>Zi(t)(E,h))))},xmt=t=>e=>qt.createWaitablePromise(t.transporter.write({method:Ir.MethodEnum.Post,path:qt.encode("1/indexes/%s/clear",t.indexName)},e),(r,o)=>Zi(t)(r.taskID,o)),kmt=t=>e=>{let{forwardToReplicas:r,...o}=e||{},a=Na.createMappedRequestOptions(o);return r&&(a.queryParameters.forwardToReplicas=1),qt.createWaitablePromise(t.transporter.write({method:Ir.MethodEnum.Post,path:qt.encode("1/indexes/%s/rules/clear",t.indexName)},a),(n,u)=>Zi(t)(n.taskID,u))},Qmt=t=>e=>{let{forwardToReplicas:r,...o}=e||{},a=Na.createMappedRequestOptions(o);return r&&(a.queryParameters.forwardToReplicas=1),qt.createWaitablePromise(t.transporter.write({method:Ir.MethodEnum.Post,path:qt.encode("1/indexes/%s/synonyms/clear",t.indexName)},a),(n,u)=>Zi(t)(n.taskID,u))},Fmt=t=>(e,r)=>qt.createWaitablePromise(t.transporter.write({method:Ir.MethodEnum.Post,path:qt.encode("1/indexes/%s/deleteByQuery",t.indexName),data:e},r),(o,a)=>Zi(t)(o.taskID,a)),Rmt=t=>e=>qt.createWaitablePromise(t.transporter.write({method:Ir.MethodEnum.Delete,path:qt.encode("1/indexes/%s",t.indexName)},e),(r,o)=>Zi(t)(r.taskID,o)),Tmt=t=>(e,r)=>qt.createWaitablePromise(oye(t)([e],r).then(o=>({taskID:o.taskIDs[0]})),(o,a)=>Zi(t)(o.taskID,a)),oye=t=>(e,r)=>{let o=e.map(a=>({objectID:a}));return Dk(t)(o,nm.DeleteObject,r)},Nmt=t=>(e,r)=>{let{forwardToReplicas:o,...a}=r||{},n=Na.createMappedRequestOptions(a);return o&&(n.queryParameters.forwardToReplicas=1),qt.createWaitablePromise(t.transporter.write({method:Ir.MethodEnum.Delete,path:qt.encode("1/indexes/%s/rules/%s",t.indexName,e)},n),(u,A)=>Zi(t)(u.taskID,A))},Lmt=t=>(e,r)=>{let{forwardToReplicas:o,...a}=r||{},n=Na.createMappedRequestOptions(a);return o&&(n.queryParameters.forwardToReplicas=1),qt.createWaitablePromise(t.transporter.write({method:Ir.MethodEnum.Delete,path:qt.encode("1/indexes/%s/synonyms/%s",t.indexName,e)},n),(u,A)=>Zi(t)(u.taskID,A))},Omt=t=>e=>aye(t)(e).then(()=>!0).catch(r=>{if(r.status!==404)throw r;return!1}),Mmt=t=>(e,r,o)=>t.transporter.read({method:Ir.MethodEnum.Post,path:qt.encode("1/answers/%s/prediction",t.indexName),data:{query:e,queryLanguages:r},cacheable:!0},o),Umt=t=>(e,r)=>{let{query:o,paginate:a,...n}=r||{},u=0,A=()=>uye(t)(o||"",{...n,page:u}).then(p=>{for(let[h,E]of Object.entries(p.hits))if(e(E))return{object:E,position:parseInt(h,10),page:u};if(u++,a===!1||u>=p.nbPages)throw rye();return A()});return A()},_mt=t=>(e,r)=>t.transporter.read({method:Ir.MethodEnum.Get,path:qt.encode("1/indexes/%s/%s",t.indexName,e)},r),Hmt=()=>(t,e)=>{for(let[r,o]of Object.entries(t.hits))if(o.objectID===e)return parseInt(r,10);return-1},jmt=t=>(e,r)=>{let{attributesToRetrieve:o,...a}=r||{},n=e.map(u=>({indexName:t.indexName,objectID:u,...o?{attributesToRetrieve:o}:{}}));return t.transporter.read({method:Ir.MethodEnum.Post,path:"1/indexes/*/objects",data:{requests:n}},a)},Gmt=t=>(e,r)=>t.transporter.read({method:Ir.MethodEnum.Get,path:qt.encode("1/indexes/%s/rules/%s",t.indexName,e)},r),aye=t=>e=>t.transporter.read({method:Ir.MethodEnum.Get,path:qt.encode("1/indexes/%s/settings",t.indexName),data:{getVersion:2}},e),qmt=t=>(e,r)=>t.transporter.read({method:Ir.MethodEnum.Get,path:qt.encode("1/indexes/%s/synonyms/%s",t.indexName,e)},r),lye=t=>(e,r)=>t.transporter.read({method:Ir.MethodEnum.Get,path:qt.encode("1/indexes/%s/task/%s",t.indexName,e.toString())},r),Ymt=t=>(e,r)=>qt.createWaitablePromise(cye(t)([e],r).then(o=>({objectID:o.objectIDs[0],taskID:o.taskIDs[0]})),(o,a)=>Zi(t)(o.taskID,a)),cye=t=>(e,r)=>{let{createIfNotExists:o,...a}=r||{},n=o?nm.PartialUpdateObject:nm.PartialUpdateObjectNoCreate;return Dk(t)(e,n,a)},Wmt=t=>(e,r)=>{let{safe:o,autoGenerateObjectIDIfNotExist:a,batchSize:n,...u}=r||{},A=(C,R,L,U)=>qt.createWaitablePromise(t.transporter.write({method:Ir.MethodEnum.Post,path:qt.encode("1/indexes/%s/operation",C),data:{operation:L,destination:R}},U),(J,te)=>Zi(t)(J.taskID,te)),p=Math.random().toString(36).substring(7),h=`${t.indexName}_tmp_${p}`,E=GH({appId:t.appId,transporter:t.transporter,indexName:h}),I=[],v=A(t.indexName,h,"copy",{...u,scope:["settings","synonyms","rules"]});I.push(v);let x=(o?v.wait(u):v).then(()=>{let C=E(e,{...u,autoGenerateObjectIDIfNotExist:a,batchSize:n});return I.push(C),o?C.wait(u):C}).then(()=>{let C=A(h,t.indexName,"move",u);return I.push(C),o?C.wait(u):C}).then(()=>Promise.all(I)).then(([C,R,L])=>({objectIDs:R.objectIDs,taskIDs:[C.taskID,...R.taskIDs,L.taskID]}));return qt.createWaitablePromise(x,(C,R)=>Promise.all(I.map(L=>L.wait(R))))},Kmt=t=>(e,r)=>qH(t)(e,{...r,clearExistingRules:!0}),Vmt=t=>(e,r)=>YH(t)(e,{...r,clearExistingSynonyms:!0}),Jmt=t=>(e,r)=>qt.createWaitablePromise(GH(t)([e],r).then(o=>({objectID:o.objectIDs[0],taskID:o.taskIDs[0]})),(o,a)=>Zi(t)(o.taskID,a)),GH=t=>(e,r)=>{let{autoGenerateObjectIDIfNotExist:o,...a}=r||{},n=o?nm.AddObject:nm.UpdateObject;if(n===nm.UpdateObject){for(let u of e)if(u.objectID===void 0)return qt.createWaitablePromise(Promise.reject(tye()))}return Dk(t)(e,n,a)},zmt=t=>(e,r)=>qH(t)([e],r),qH=t=>(e,r)=>{let{forwardToReplicas:o,clearExistingRules:a,...n}=r||{},u=Na.createMappedRequestOptions(n);return o&&(u.queryParameters.forwardToReplicas=1),a&&(u.queryParameters.clearExistingRules=1),qt.createWaitablePromise(t.transporter.write({method:Ir.MethodEnum.Post,path:qt.encode("1/indexes/%s/rules/batch",t.indexName),data:e},u),(A,p)=>Zi(t)(A.taskID,p))},Xmt=t=>(e,r)=>YH(t)([e],r),YH=t=>(e,r)=>{let{forwardToReplicas:o,clearExistingSynonyms:a,replaceExistingSynonyms:n,...u}=r||{},A=Na.createMappedRequestOptions(u);return o&&(A.queryParameters.forwardToReplicas=1),(n||a)&&(A.queryParameters.replaceExistingSynonyms=1),qt.createWaitablePromise(t.transporter.write({method:Ir.MethodEnum.Post,path:qt.encode("1/indexes/%s/synonyms/batch",t.indexName),data:e},A),(p,h)=>Zi(t)(p.taskID,h))},uye=t=>(e,r)=>t.transporter.read({method:Ir.MethodEnum.Post,path:qt.encode("1/indexes/%s/query",t.indexName),data:{query:e},cacheable:!0},r),Aye=t=>(e,r,o)=>t.transporter.read({method:Ir.MethodEnum.Post,path:qt.encode("1/indexes/%s/facets/%s/query",t.indexName,e),data:{facetQuery:r},cacheable:!0},o),fye=t=>(e,r)=>t.transporter.read({method:Ir.MethodEnum.Post,path:qt.encode("1/indexes/%s/rules/search",t.indexName),data:{query:e}},r),pye=t=>(e,r)=>t.transporter.read({method:Ir.MethodEnum.Post,path:qt.encode("1/indexes/%s/synonyms/search",t.indexName),data:{query:e}},r),Zmt=t=>(e,r)=>{let{forwardToReplicas:o,...a}=r||{},n=Na.createMappedRequestOptions(a);return o&&(n.queryParameters.forwardToReplicas=1),qt.createWaitablePromise(t.transporter.write({method:Ir.MethodEnum.Put,path:qt.encode("1/indexes/%s/settings",t.indexName),data:e},n),(u,A)=>Zi(t)(u.taskID,A))},Zi=t=>(e,r)=>qt.createRetryablePromise(o=>lye(t)(e,r).then(a=>a.status!=="published"?o():void 0)),$mt={AddObject:"addObject",Analytics:"analytics",Browser:"browse",DeleteIndex:"deleteIndex",DeleteObject:"deleteObject",EditSettings:"editSettings",ListIndexes:"listIndexes",Logs:"logs",Personalization:"personalization",Recommendation:"recommendation",Search:"search",SeeUnretrievableAttributes:"seeUnretrievableAttributes",Settings:"settings",Usage:"usage"},nm={AddObject:"addObject",UpdateObject:"updateObject",PartialUpdateObject:"partialUpdateObject",PartialUpdateObjectNoCreate:"partialUpdateObjectNoCreate",DeleteObject:"deleteObject",DeleteIndex:"delete",ClearIndex:"clear"},Sk={Settings:"settings",Synonyms:"synonyms",Rules:"rules"},eyt={None:"none",StopIfEnoughMatches:"stopIfEnoughMatches"},tyt={Synonym:"synonym",OneWaySynonym:"oneWaySynonym",AltCorrection1:"altCorrection1",AltCorrection2:"altCorrection2",Placeholder:"placeholder"};Ft.ApiKeyACLEnum=$mt;Ft.BatchActionEnum=nm;Ft.ScopeEnum=Sk;Ft.StrategyEnum=eyt;Ft.SynonymEnum=tyt;Ft.addApiKey=Wdt;Ft.assignUserID=Kdt;Ft.assignUserIDs=Vdt;Ft.batch=sye;Ft.browseObjects=Smt;Ft.browseRules=Pmt;Ft.browseSynonyms=bmt;Ft.chunkedBatch=Dk;Ft.clearDictionaryEntries=Jdt;Ft.clearObjects=xmt;Ft.clearRules=kmt;Ft.clearSynonyms=Qmt;Ft.copyIndex=vk;Ft.copyRules=zdt;Ft.copySettings=Xdt;Ft.copySynonyms=Zdt;Ft.createBrowsablePromise=Bk;Ft.createMissingObjectIDError=tye;Ft.createObjectNotFoundError=rye;Ft.createSearchClient=Ydt;Ft.createValidUntilNotFoundError=nye;Ft.customRequest=$dt;Ft.deleteApiKey=emt;Ft.deleteBy=Fmt;Ft.deleteDictionaryEntries=tmt;Ft.deleteIndex=Rmt;Ft.deleteObject=Tmt;Ft.deleteObjects=oye;Ft.deleteRule=Nmt;Ft.deleteSynonym=Lmt;Ft.exists=Omt;Ft.findAnswers=Mmt;Ft.findObject=Umt;Ft.generateSecuredApiKey=rmt;Ft.getApiKey=X2;Ft.getAppTask=iye;Ft.getDictionarySettings=nmt;Ft.getLogs=imt;Ft.getObject=_mt;Ft.getObjectPosition=Hmt;Ft.getObjects=jmt;Ft.getRule=Gmt;Ft.getSecuredApiKeyRemainingValidity=smt;Ft.getSettings=aye;Ft.getSynonym=qmt;Ft.getTask=lye;Ft.getTopUserIDs=omt;Ft.getUserID=amt;Ft.hasPendingMappings=lmt;Ft.initIndex=Z2;Ft.listApiKeys=cmt;Ft.listClusters=umt;Ft.listIndices=Amt;Ft.listUserIDs=fmt;Ft.moveIndex=pmt;Ft.multipleBatch=hmt;Ft.multipleGetObjects=gmt;Ft.multipleQueries=dmt;Ft.multipleSearchForFacetValues=mmt;Ft.partialUpdateObject=Ymt;Ft.partialUpdateObjects=cye;Ft.removeUserID=ymt;Ft.replaceAllObjects=Wmt;Ft.replaceAllRules=Kmt;Ft.replaceAllSynonyms=Vmt;Ft.replaceDictionaryEntries=Emt;Ft.restoreApiKey=Cmt;Ft.saveDictionaryEntries=wmt;Ft.saveObject=Jmt;Ft.saveObjects=GH;Ft.saveRule=zmt;Ft.saveRules=qH;Ft.saveSynonym=Xmt;Ft.saveSynonyms=YH;Ft.search=uye;Ft.searchDictionaryEntries=Imt;Ft.searchForFacetValues=Aye;Ft.searchRules=fye;Ft.searchSynonyms=pye;Ft.searchUserIDs=Bmt;Ft.setDictionarySettings=vmt;Ft.setSettings=Zmt;Ft.updateApiKey=Dmt;Ft.waitAppTask=QC;Ft.waitTask=Zi});var dye=_((YWt,gye)=>{gye.exports=hye()});var mye=_(Pk=>{"use strict";Object.defineProperty(Pk,"__esModule",{value:!0});function ryt(){return{debug(t,e){return Promise.resolve()},info(t,e){return Promise.resolve()},error(t,e){return Promise.resolve()}}}var nyt={Debug:1,Info:2,Error:3};Pk.LogLevelEnum=nyt;Pk.createNullLogger=ryt});var Eye=_((KWt,yye)=>{yye.exports=mye()});var Bye=_(WH=>{"use strict";Object.defineProperty(WH,"__esModule",{value:!0});var Cye=ve("http"),wye=ve("https"),iyt=ve("url"),Iye={keepAlive:!0},syt=new Cye.Agent(Iye),oyt=new wye.Agent(Iye);function ayt({agent:t,httpAgent:e,httpsAgent:r,requesterOptions:o={}}={}){let a=e||t||syt,n=r||t||oyt;return{send(u){return new Promise(A=>{let p=iyt.parse(u.url),h=p.query===null?p.pathname:`${p.pathname}?${p.query}`,E={...o,agent:p.protocol==="https:"?n:a,hostname:p.hostname,path:h,method:u.method,headers:{...o&&o.headers?o.headers:{},...u.headers},...p.port!==void 0?{port:p.port||""}:{}},I=(p.protocol==="https:"?wye:Cye).request(E,R=>{let L=[];R.on("data",U=>{L=L.concat(U)}),R.on("end",()=>{clearTimeout(x),clearTimeout(C),A({status:R.statusCode||0,content:Buffer.concat(L).toString(),isTimedOut:!1})})}),v=(R,L)=>setTimeout(()=>{I.abort(),A({status:0,content:L,isTimedOut:!0})},R*1e3),x=v(u.connectTimeout,"Connection timeout"),C;I.on("error",R=>{clearTimeout(x),clearTimeout(C),A({status:0,content:R.message,isTimedOut:!1})}),I.once("response",()=>{clearTimeout(x),C=v(u.responseTimeout,"Socket timeout")}),u.data!==void 0&&I.write(u.data),I.end()})},destroy(){return a.destroy(),n.destroy(),Promise.resolve()}}}WH.createNodeHttpRequester=ayt});var Dye=_((JWt,vye)=>{vye.exports=Bye()});var xye=_((zWt,bye)=>{"use strict";var Sye=Bme(),lyt=Sme(),FC=zme(),VH=Y2(),KH=eye(),Ut=dye(),cyt=Eye(),uyt=Dye(),Ayt=V2();function Pye(t,e,r){let o={appId:t,apiKey:e,timeouts:{connect:2,read:5,write:30},requester:uyt.createNodeHttpRequester(),logger:cyt.createNullLogger(),responsesCache:Sye.createNullCache(),requestsCache:Sye.createNullCache(),hostsCache:lyt.createInMemoryCache(),userAgent:Ayt.createUserAgent(VH.version).add({segment:"Node.js",version:process.versions.node})},a={...o,...r},n=()=>u=>KH.createPersonalizationClient({...o,...u,methods:{getPersonalizationStrategy:KH.getPersonalizationStrategy,setPersonalizationStrategy:KH.setPersonalizationStrategy}});return Ut.createSearchClient({...a,methods:{search:Ut.multipleQueries,searchForFacetValues:Ut.multipleSearchForFacetValues,multipleBatch:Ut.multipleBatch,multipleGetObjects:Ut.multipleGetObjects,multipleQueries:Ut.multipleQueries,copyIndex:Ut.copyIndex,copySettings:Ut.copySettings,copyRules:Ut.copyRules,copySynonyms:Ut.copySynonyms,moveIndex:Ut.moveIndex,listIndices:Ut.listIndices,getLogs:Ut.getLogs,listClusters:Ut.listClusters,multipleSearchForFacetValues:Ut.multipleSearchForFacetValues,getApiKey:Ut.getApiKey,addApiKey:Ut.addApiKey,listApiKeys:Ut.listApiKeys,updateApiKey:Ut.updateApiKey,deleteApiKey:Ut.deleteApiKey,restoreApiKey:Ut.restoreApiKey,assignUserID:Ut.assignUserID,assignUserIDs:Ut.assignUserIDs,getUserID:Ut.getUserID,searchUserIDs:Ut.searchUserIDs,listUserIDs:Ut.listUserIDs,getTopUserIDs:Ut.getTopUserIDs,removeUserID:Ut.removeUserID,hasPendingMappings:Ut.hasPendingMappings,generateSecuredApiKey:Ut.generateSecuredApiKey,getSecuredApiKeyRemainingValidity:Ut.getSecuredApiKeyRemainingValidity,destroy:VH.destroy,clearDictionaryEntries:Ut.clearDictionaryEntries,deleteDictionaryEntries:Ut.deleteDictionaryEntries,getDictionarySettings:Ut.getDictionarySettings,getAppTask:Ut.getAppTask,replaceDictionaryEntries:Ut.replaceDictionaryEntries,saveDictionaryEntries:Ut.saveDictionaryEntries,searchDictionaryEntries:Ut.searchDictionaryEntries,setDictionarySettings:Ut.setDictionarySettings,waitAppTask:Ut.waitAppTask,customRequest:Ut.customRequest,initIndex:u=>A=>Ut.initIndex(u)(A,{methods:{batch:Ut.batch,delete:Ut.deleteIndex,findAnswers:Ut.findAnswers,getObject:Ut.getObject,getObjects:Ut.getObjects,saveObject:Ut.saveObject,saveObjects:Ut.saveObjects,search:Ut.search,searchForFacetValues:Ut.searchForFacetValues,waitTask:Ut.waitTask,setSettings:Ut.setSettings,getSettings:Ut.getSettings,partialUpdateObject:Ut.partialUpdateObject,partialUpdateObjects:Ut.partialUpdateObjects,deleteObject:Ut.deleteObject,deleteObjects:Ut.deleteObjects,deleteBy:Ut.deleteBy,clearObjects:Ut.clearObjects,browseObjects:Ut.browseObjects,getObjectPosition:Ut.getObjectPosition,findObject:Ut.findObject,exists:Ut.exists,saveSynonym:Ut.saveSynonym,saveSynonyms:Ut.saveSynonyms,getSynonym:Ut.getSynonym,searchSynonyms:Ut.searchSynonyms,browseSynonyms:Ut.browseSynonyms,deleteSynonym:Ut.deleteSynonym,clearSynonyms:Ut.clearSynonyms,replaceAllObjects:Ut.replaceAllObjects,replaceAllSynonyms:Ut.replaceAllSynonyms,searchRules:Ut.searchRules,getRule:Ut.getRule,deleteRule:Ut.deleteRule,saveRule:Ut.saveRule,saveRules:Ut.saveRules,replaceAllRules:Ut.replaceAllRules,browseRules:Ut.browseRules,clearRules:Ut.clearRules}}),initAnalytics:()=>u=>FC.createAnalyticsClient({...o,...u,methods:{addABTest:FC.addABTest,getABTest:FC.getABTest,getABTests:FC.getABTests,stopABTest:FC.stopABTest,deleteABTest:FC.deleteABTest}}),initPersonalization:n,initRecommendation:()=>u=>(a.logger.info("The `initRecommendation` method is deprecated. Use `initPersonalization` instead."),n()(u))}})}Pye.version=VH.version;bye.exports=Pye});var zH=_((XWt,JH)=>{var kye=xye();JH.exports=kye;JH.exports.default=kye});var $H=_(($Wt,Rye)=>{"use strict";var Fye=Object.getOwnPropertySymbols,pyt=Object.prototype.hasOwnProperty,hyt=Object.prototype.propertyIsEnumerable;function gyt(t){if(t==null)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(t)}function dyt(){try{if(!Object.assign)return!1;var t=new String("abc");if(t[5]="de",Object.getOwnPropertyNames(t)[0]==="5")return!1;for(var e={},r=0;r<10;r++)e["_"+String.fromCharCode(r)]=r;var o=Object.getOwnPropertyNames(e).map(function(n){return e[n]});if(o.join("")!=="0123456789")return!1;var a={};return"abcdefghijklmnopqrst".split("").forEach(function(n){a[n]=n}),Object.keys(Object.assign({},a)).join("")==="abcdefghijklmnopqrst"}catch{return!1}}Rye.exports=dyt()?Object.assign:function(t,e){for(var r,o=gyt(t),a,n=1;n<arguments.length;n++){r=Object(arguments[n]);for(var u in r)pyt.call(r,u)&&(o[u]=r[u]);if(Fye){a=Fye(r);for(var A=0;A<a.length;A++)hyt.call(r,a[A])&&(o[a[A]]=r[a[A]])}}return o}});var Yye=_(Nn=>{"use strict";var i6=$H(),$c=typeof Symbol=="function"&&Symbol.for,$2=$c?Symbol.for("react.element"):60103,myt=$c?Symbol.for("react.portal"):60106,yyt=$c?Symbol.for("react.fragment"):60107,Eyt=$c?Symbol.for("react.strict_mode"):60108,Cyt=$c?Symbol.for("react.profiler"):60114,wyt=$c?Symbol.for("react.provider"):60109,Iyt=$c?Symbol.for("react.context"):60110,Byt=$c?Symbol.for("react.forward_ref"):60112,vyt=$c?Symbol.for("react.suspense"):60113,Dyt=$c?Symbol.for("react.memo"):60115,Syt=$c?Symbol.for("react.lazy"):60116,Tye=typeof Symbol=="function"&&Symbol.iterator;function eB(t){for(var e="https://reactjs.org/docs/error-decoder.html?invariant="+t,r=1;r<arguments.length;r++)e+="&args[]="+encodeURIComponent(arguments[r]);return"Minified React error #"+t+"; visit "+e+" for the full message or use the non-minified dev environment for full errors and additional helpful warnings."}var Nye={isMounted:function(){return!1},enqueueForceUpdate:function(){},enqueueReplaceState:function(){},enqueueSetState:function(){}},Lye={};function RC(t,e,r){this.props=t,this.context=e,this.refs=Lye,this.updater=r||Nye}RC.prototype.isReactComponent={};RC.prototype.setState=function(t,e){if(typeof t!="object"&&typeof t!="function"&&t!=null)throw Error(eB(85));this.updater.enqueueSetState(this,t,e,"setState")};RC.prototype.forceUpdate=function(t){this.updater.enqueueForceUpdate(this,t,"forceUpdate")};function Oye(){}Oye.prototype=RC.prototype;function s6(t,e,r){this.props=t,this.context=e,this.refs=Lye,this.updater=r||Nye}var o6=s6.prototype=new Oye;o6.constructor=s6;i6(o6,RC.prototype);o6.isPureReactComponent=!0;var a6={current:null},Mye=Object.prototype.hasOwnProperty,Uye={key:!0,ref:!0,__self:!0,__source:!0};function _ye(t,e,r){var o,a={},n=null,u=null;if(e!=null)for(o in e.ref!==void 0&&(u=e.ref),e.key!==void 0&&(n=""+e.key),e)Mye.call(e,o)&&!Uye.hasOwnProperty(o)&&(a[o]=e[o]);var A=arguments.length-2;if(A===1)a.children=r;else if(1<A){for(var p=Array(A),h=0;h<A;h++)p[h]=arguments[h+2];a.children=p}if(t&&t.defaultProps)for(o in A=t.defaultProps,A)a[o]===void 0&&(a[o]=A[o]);return{$$typeof:$2,type:t,key:n,ref:u,props:a,_owner:a6.current}}function Pyt(t,e){return{$$typeof:$2,type:t.type,key:e,ref:t.ref,props:t.props,_owner:t._owner}}function l6(t){return typeof t=="object"&&t!==null&&t.$$typeof===$2}function byt(t){var e={"=":"=0",":":"=2"};return"$"+(""+t).replace(/[=:]/g,function(r){return e[r]})}var Hye=/\/+/g,bk=[];function jye(t,e,r,o){if(bk.length){var a=bk.pop();return a.result=t,a.keyPrefix=e,a.func=r,a.context=o,a.count=0,a}return{result:t,keyPrefix:e,func:r,context:o,count:0}}function Gye(t){t.result=null,t.keyPrefix=null,t.func=null,t.context=null,t.count=0,10>bk.length&&bk.push(t)}function t6(t,e,r,o){var a=typeof t;(a==="undefined"||a==="boolean")&&(t=null);var n=!1;if(t===null)n=!0;else switch(a){case"string":case"number":n=!0;break;case"object":switch(t.$$typeof){case $2:case myt:n=!0}}if(n)return r(o,t,e===""?"."+e6(t,0):e),1;if(n=0,e=e===""?".":e+":",Array.isArray(t))for(var u=0;u<t.length;u++){a=t[u];var A=e+e6(a,u);n+=t6(a,A,r,o)}else if(t===null||typeof t!="object"?A=null:(A=Tye&&t[Tye]||t["@@iterator"],A=typeof A=="function"?A:null),typeof A=="function")for(t=A.call(t),u=0;!(a=t.next()).done;)a=a.value,A=e+e6(a,u++),n+=t6(a,A,r,o);else if(a==="object")throw r=""+t,Error(eB(31,r==="[object Object]"?"object with keys {"+Object.keys(t).join(", ")+"}":r,""));return n}function r6(t,e,r){return t==null?0:t6(t,"",e,r)}function e6(t,e){return typeof t=="object"&&t!==null&&t.key!=null?byt(t.key):e.toString(36)}function xyt(t,e){t.func.call(t.context,e,t.count++)}function kyt(t,e,r){var o=t.result,a=t.keyPrefix;t=t.func.call(t.context,e,t.count++),Array.isArray(t)?n6(t,o,r,function(n){return n}):t!=null&&(l6(t)&&(t=Pyt(t,a+(!t.key||e&&e.key===t.key?"":(""+t.key).replace(Hye,"$&/")+"/")+r)),o.push(t))}function n6(t,e,r,o,a){var n="";r!=null&&(n=(""+r).replace(Hye,"$&/")+"/"),e=jye(e,n,o,a),r6(t,kyt,e),Gye(e)}var qye={current:null};function Xf(){var t=qye.current;if(t===null)throw Error(eB(321));return t}var Qyt={ReactCurrentDispatcher:qye,ReactCurrentBatchConfig:{suspense:null},ReactCurrentOwner:a6,IsSomeRendererActing:{current:!1},assign:i6};Nn.Children={map:function(t,e,r){if(t==null)return t;var o=[];return n6(t,o,null,e,r),o},forEach:function(t,e,r){if(t==null)return t;e=jye(null,null,e,r),r6(t,xyt,e),Gye(e)},count:function(t){return r6(t,function(){return null},null)},toArray:function(t){var e=[];return n6(t,e,null,function(r){return r}),e},only:function(t){if(!l6(t))throw Error(eB(143));return t}};Nn.Component=RC;Nn.Fragment=yyt;Nn.Profiler=Cyt;Nn.PureComponent=s6;Nn.StrictMode=Eyt;Nn.Suspense=vyt;Nn.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED=Qyt;Nn.cloneElement=function(t,e,r){if(t==null)throw Error(eB(267,t));var o=i6({},t.props),a=t.key,n=t.ref,u=t._owner;if(e!=null){if(e.ref!==void 0&&(n=e.ref,u=a6.current),e.key!==void 0&&(a=""+e.key),t.type&&t.type.defaultProps)var A=t.type.defaultProps;for(p in e)Mye.call(e,p)&&!Uye.hasOwnProperty(p)&&(o[p]=e[p]===void 0&&A!==void 0?A[p]:e[p])}var p=arguments.length-2;if(p===1)o.children=r;else if(1<p){A=Array(p);for(var h=0;h<p;h++)A[h]=arguments[h+2];o.children=A}return{$$typeof:$2,type:t.type,key:a,ref:n,props:o,_owner:u}};Nn.createContext=function(t,e){return e===void 0&&(e=null),t={$$typeof:Iyt,_calculateChangedBits:e,_currentValue:t,_currentValue2:t,_threadCount:0,Provider:null,Consumer:null},t.Provider={$$typeof:wyt,_context:t},t.Consumer=t};Nn.createElement=_ye;Nn.createFactory=function(t){var e=_ye.bind(null,t);return e.type=t,e};Nn.createRef=function(){return{current:null}};Nn.forwardRef=function(t){return{$$typeof:Byt,render:t}};Nn.isValidElement=l6;Nn.lazy=function(t){return{$$typeof:Syt,_ctor:t,_status:-1,_result:null}};Nn.memo=function(t,e){return{$$typeof:Dyt,type:t,compare:e===void 0?null:e}};Nn.useCallback=function(t,e){return Xf().useCallback(t,e)};Nn.useContext=function(t,e){return Xf().useContext(t,e)};Nn.useDebugValue=function(){};Nn.useEffect=function(t,e){return Xf().useEffect(t,e)};Nn.useImperativeHandle=function(t,e,r){return Xf().useImperativeHandle(t,e,r)};Nn.useLayoutEffect=function(t,e){return Xf().useLayoutEffect(t,e)};Nn.useMemo=function(t,e){return Xf().useMemo(t,e)};Nn.useReducer=function(t,e,r){return Xf().useReducer(t,e,r)};Nn.useRef=function(t){return Xf().useRef(t)};Nn.useState=function(t){return Xf().useState(t)};Nn.version="16.13.1"});var on=_((tKt,Wye)=>{"use strict";Wye.exports=Yye()});var u6=_((rKt,c6)=>{"use strict";var An=c6.exports;c6.exports.default=An;var Ln="\x1B[",tB="\x1B]",TC="\x07",xk=";",Kye=process.env.TERM_PROGRAM==="Apple_Terminal";An.cursorTo=(t,e)=>{if(typeof t!="number")throw new TypeError("The `x` argument is required");return typeof e!="number"?Ln+(t+1)+"G":Ln+(e+1)+";"+(t+1)+"H"};An.cursorMove=(t,e)=>{if(typeof t!="number")throw new TypeError("The `x` argument is required");let r="";return t<0?r+=Ln+-t+"D":t>0&&(r+=Ln+t+"C"),e<0?r+=Ln+-e+"A":e>0&&(r+=Ln+e+"B"),r};An.cursorUp=(t=1)=>Ln+t+"A";An.cursorDown=(t=1)=>Ln+t+"B";An.cursorForward=(t=1)=>Ln+t+"C";An.cursorBackward=(t=1)=>Ln+t+"D";An.cursorLeft=Ln+"G";An.cursorSavePosition=Kye?"\x1B7":Ln+"s";An.cursorRestorePosition=Kye?"\x1B8":Ln+"u";An.cursorGetPosition=Ln+"6n";An.cursorNextLine=Ln+"E";An.cursorPrevLine=Ln+"F";An.cursorHide=Ln+"?25l";An.cursorShow=Ln+"?25h";An.eraseLines=t=>{let e="";for(let r=0;r<t;r++)e+=An.eraseLine+(r<t-1?An.cursorUp():"");return t&&(e+=An.cursorLeft),e};An.eraseEndLine=Ln+"K";An.eraseStartLine=Ln+"1K";An.eraseLine=Ln+"2K";An.eraseDown=Ln+"J";An.eraseUp=Ln+"1J";An.eraseScreen=Ln+"2J";An.scrollUp=Ln+"S";An.scrollDown=Ln+"T";An.clearScreen="\x1Bc";An.clearTerminal=process.platform==="win32"?`${An.eraseScreen}${Ln}0f`:`${An.eraseScreen}${Ln}3J${Ln}H`;An.beep=TC;An.link=(t,e)=>[tB,"8",xk,xk,e,TC,t,tB,"8",xk,xk,TC].join("");An.image=(t,e={})=>{let r=`${tB}1337;File=inline=1`;return e.width&&(r+=`;width=${e.width}`),e.height&&(r+=`;height=${e.height}`),e.preserveAspectRatio===!1&&(r+=";preserveAspectRatio=0"),r+":"+t.toString("base64")+TC};An.iTerm={setCwd:(t=process.cwd())=>`${tB}50;CurrentDir=${t}${TC}`,annotation:(t,e={})=>{let r=`${tB}1337;`,o=typeof e.x<"u",a=typeof e.y<"u";if((o||a)&&!(o&&a&&typeof e.length<"u"))throw new Error("`x`, `y` and `length` must be defined when `x` or `y` is defined");return t=t.replace(/\|/g,""),r+=e.isHidden?"AddHiddenAnnotation=":"AddAnnotation=",e.length>0?r+=(o?[t,e.length,e.x,e.y]:[e.length,t]).join("|"):r+=t,r+TC}}});var Jye=_((nKt,A6)=>{"use strict";var Vye=(t,e)=>{for(let r of Reflect.ownKeys(e))Object.defineProperty(t,r,Object.getOwnPropertyDescriptor(e,r));return t};A6.exports=Vye;A6.exports.default=Vye});var Xye=_((iKt,Qk)=>{"use strict";var Fyt=Jye(),kk=new WeakMap,zye=(t,e={})=>{if(typeof t!="function")throw new TypeError("Expected a function");let r,o=0,a=t.displayName||t.name||"<anonymous>",n=function(...u){if(kk.set(n,++o),o===1)r=t.apply(this,u),t=null;else if(e.throw===!0)throw new Error(`Function \`${a}\` can only be called once`);return r};return Fyt(n,t),kk.set(n,o),n};Qk.exports=zye;Qk.exports.default=zye;Qk.exports.callCount=t=>{if(!kk.has(t))throw new Error(`The given function \`${t.name}\` is not wrapped by the \`onetime\` package`);return kk.get(t)}});var Zye=_((sKt,Fk)=>{Fk.exports=["SIGABRT","SIGALRM","SIGHUP","SIGINT","SIGTERM"];process.platform!=="win32"&&Fk.exports.push("SIGVTALRM","SIGXCPU","SIGXFSZ","SIGUSR2","SIGTRAP","SIGSYS","SIGQUIT","SIGIOT");process.platform==="linux"&&Fk.exports.push("SIGIO","SIGPOLL","SIGPWR","SIGSTKFLT","SIGUNUSED")});var h6=_((oKt,OC)=>{var Ei=global.process,im=function(t){return t&&typeof t=="object"&&typeof t.removeListener=="function"&&typeof t.emit=="function"&&typeof t.reallyExit=="function"&&typeof t.listeners=="function"&&typeof t.kill=="function"&&typeof t.pid=="number"&&typeof t.on=="function"};im(Ei)?($ye=ve("assert"),NC=Zye(),eEe=/^win/i.test(Ei.platform),rB=ve("events"),typeof rB!="function"&&(rB=rB.EventEmitter),Ei.__signal_exit_emitter__?Ts=Ei.__signal_exit_emitter__:(Ts=Ei.__signal_exit_emitter__=new rB,Ts.count=0,Ts.emitted={}),Ts.infinite||(Ts.setMaxListeners(1/0),Ts.infinite=!0),OC.exports=function(t,e){if(!im(global.process))return function(){};$ye.equal(typeof t,"function","a callback must be provided for exit handler"),LC===!1&&f6();var r="exit";e&&e.alwaysLast&&(r="afterexit");var o=function(){Ts.removeListener(r,t),Ts.listeners("exit").length===0&&Ts.listeners("afterexit").length===0&&Rk()};return Ts.on(r,t),o},Rk=function(){!LC||!im(global.process)||(LC=!1,NC.forEach(function(e){try{Ei.removeListener(e,Tk[e])}catch{}}),Ei.emit=Nk,Ei.reallyExit=p6,Ts.count-=1)},OC.exports.unload=Rk,sm=function(e,r,o){Ts.emitted[e]||(Ts.emitted[e]=!0,Ts.emit(e,r,o))},Tk={},NC.forEach(function(t){Tk[t]=function(){if(!!im(global.process)){var r=Ei.listeners(t);r.length===Ts.count&&(Rk(),sm("exit",null,t),sm("afterexit",null,t),eEe&&t==="SIGHUP"&&(t="SIGINT"),Ei.kill(Ei.pid,t))}}}),OC.exports.signals=function(){return NC},LC=!1,f6=function(){LC||!im(global.process)||(LC=!0,Ts.count+=1,NC=NC.filter(function(e){try{return Ei.on(e,Tk[e]),!0}catch{return!1}}),Ei.emit=rEe,Ei.reallyExit=tEe)},OC.exports.load=f6,p6=Ei.reallyExit,tEe=function(e){!im(global.process)||(Ei.exitCode=e||0,sm("exit",Ei.exitCode,null),sm("afterexit",Ei.exitCode,null),p6.call(Ei,Ei.exitCode))},Nk=Ei.emit,rEe=function(e,r){if(e==="exit"&&im(global.process)){r!==void 0&&(Ei.exitCode=r);var o=Nk.apply(this,arguments);return sm("exit",Ei.exitCode,null),sm("afterexit",Ei.exitCode,null),o}else return Nk.apply(this,arguments)}):OC.exports=function(){return function(){}};var $ye,NC,eEe,rB,Ts,Rk,sm,Tk,LC,f6,p6,tEe,Nk,rEe});var iEe=_((aKt,nEe)=>{"use strict";var Ryt=Xye(),Tyt=h6();nEe.exports=Ryt(()=>{Tyt(()=>{process.stderr.write("\x1B[?25h")},{alwaysLast:!0})})});var g6=_(MC=>{"use strict";var Nyt=iEe(),Lk=!1;MC.show=(t=process.stderr)=>{!t.isTTY||(Lk=!1,t.write("\x1B[?25h"))};MC.hide=(t=process.stderr)=>{!t.isTTY||(Nyt(),Lk=!0,t.write("\x1B[?25l"))};MC.toggle=(t,e)=>{t!==void 0&&(Lk=t),Lk?MC.show(e):MC.hide(e)}});var lEe=_(nB=>{"use strict";var aEe=nB&&nB.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(nB,"__esModule",{value:!0});var sEe=aEe(u6()),oEe=aEe(g6()),Lyt=(t,{showCursor:e=!1}={})=>{let r=0,o="",a=!1,n=u=>{!e&&!a&&(oEe.default.hide(),a=!0);let A=u+`
+`;A!==o&&(o=A,t.write(sEe.default.eraseLines(r)+A),r=A.split(`
+`).length)};return n.clear=()=>{t.write(sEe.default.eraseLines(r)),o="",r=0},n.done=()=>{o="",r=0,e||(oEe.default.show(),a=!1)},n};nB.default={create:Lyt}});var cEe=_((uKt,Oyt)=>{Oyt.exports=[{name:"AppVeyor",constant:"APPVEYOR",env:"APPVEYOR",pr:"APPVEYOR_PULL_REQUEST_NUMBER"},{name:"Azure Pipelines",constant:"AZURE_PIPELINES",env:"SYSTEM_TEAMFOUNDATIONCOLLECTIONURI",pr:"SYSTEM_PULLREQUEST_PULLREQUESTID"},{name:"Bamboo",constant:"BAMBOO",env:"bamboo_planKey"},{name:"Bitbucket Pipelines",constant:"BITBUCKET",env:"BITBUCKET_COMMIT",pr:"BITBUCKET_PR_ID"},{name:"Bitrise",constant:"BITRISE",env:"BITRISE_IO",pr:"BITRISE_PULL_REQUEST"},{name:"Buddy",constant:"BUDDY",env:"BUDDY_WORKSPACE_ID",pr:"BUDDY_EXECUTION_PULL_REQUEST_ID"},{name:"Buildkite",constant:"BUILDKITE",env:"BUILDKITE",pr:{env:"BUILDKITE_PULL_REQUEST",ne:"false"}},{name:"CircleCI",constant:"CIRCLE",env:"CIRCLECI",pr:"CIRCLE_PULL_REQUEST"},{name:"Cirrus CI",constant:"CIRRUS",env:"CIRRUS_CI",pr:"CIRRUS_PR"},{name:"AWS CodeBuild",constant:"CODEBUILD",env:"CODEBUILD_BUILD_ARN"},{name:"Codeship",constant:"CODESHIP",env:{CI_NAME:"codeship"}},{name:"Drone",constant:"DRONE",env:"DRONE",pr:{DRONE_BUILD_EVENT:"pull_request"}},{name:"dsari",constant:"DSARI",env:"DSARI"},{name:"GitLab CI",constant:"GITLAB",env:"GITLAB_CI"},{name:"GoCD",constant:"GOCD",env:"GO_PIPELINE_LABEL"},{name:"Hudson",constant:"HUDSON",env:"HUDSON_URL"},{name:"Jenkins",constant:"JENKINS",env:["JENKINS_URL","BUILD_ID"],pr:{any:["ghprbPullId","CHANGE_ID"]}},{name:"Magnum CI",constant:"MAGNUM",env:"MAGNUM"},{name:"Netlify CI",constant:"NETLIFY",env:"NETLIFY_BUILD_BASE",pr:{env:"PULL_REQUEST",ne:"false"}},{name:"Sail CI",constant:"SAIL",env:"SAILCI",pr:"SAIL_PULL_REQUEST_NUMBER"},{name:"Semaphore",constant:"SEMAPHORE",env:"SEMAPHORE",pr:"PULL_REQUEST_NUMBER"},{name:"Shippable",constant:"SHIPPABLE",env:"SHIPPABLE",pr:{IS_PULL_REQUEST:"true"}},{name:"Solano CI",constant:"SOLANO",env:"TDDIUM",pr:"TDDIUM_PR_ID"},{name:"Strider CD",constant:"STRIDER",env:"STRIDER"},{name:"TaskCluster",constant:"TASKCLUSTER",env:["TASK_ID","RUN_ID"]},{name:"TeamCity",constant:"TEAMCITY",env:"TEAMCITY_VERSION"},{name:"Travis CI",constant:"TRAVIS",env:"TRAVIS",pr:{env:"TRAVIS_PULL_REQUEST",ne:"false"}}]});var fEe=_(gl=>{"use strict";var AEe=cEe(),pA=process.env;Object.defineProperty(gl,"_vendors",{value:AEe.map(function(t){return t.constant})});gl.name=null;gl.isPR=null;AEe.forEach(function(t){var e=Array.isArray(t.env)?t.env:[t.env],r=e.every(function(o){return uEe(o)});if(gl[t.constant]=r,r)switch(gl.name=t.name,typeof t.pr){case"string":gl.isPR=!!pA[t.pr];break;case"object":"env"in t.pr?gl.isPR=t.pr.env in pA&&pA[t.pr.env]!==t.pr.ne:"any"in t.pr?gl.isPR=t.pr.any.some(function(o){return!!pA[o]}):gl.isPR=uEe(t.pr);break;default:gl.isPR=null}});gl.isCI=!!(pA.CI||pA.CONTINUOUS_INTEGRATION||pA.BUILD_NUMBER||pA.RUN_ID||gl.name);function uEe(t){return typeof t=="string"?!!pA[t]:Object.keys(t).every(function(e){return pA[e]===t[e]})}});var hEe=_((fKt,pEe)=>{"use strict";pEe.exports=fEe().isCI});var dEe=_((pKt,gEe)=>{"use strict";var Myt=t=>{let e=new Set;do for(let r of Reflect.ownKeys(t))e.add([t,r]);while((t=Reflect.getPrototypeOf(t))&&t!==Object.prototype);return e};gEe.exports=(t,{include:e,exclude:r}={})=>{let o=a=>{let n=u=>typeof u=="string"?a===u:u.test(a);return e?e.some(n):r?!r.some(n):!0};for(let[a,n]of Myt(t.constructor.prototype)){if(n==="constructor"||!o(n))continue;let u=Reflect.getOwnPropertyDescriptor(a,n);u&&typeof u.value=="function"&&(t[n]=t[n].bind(t))}return t}});var BEe=_(kn=>{"use strict";Object.defineProperty(kn,"__esModule",{value:!0});var _C,oB,Hk,jk,I6;typeof window>"u"||typeof MessageChannel!="function"?(UC=null,d6=null,m6=function(){if(UC!==null)try{var t=kn.unstable_now();UC(!0,t),UC=null}catch(e){throw setTimeout(m6,0),e}},mEe=Date.now(),kn.unstable_now=function(){return Date.now()-mEe},_C=function(t){UC!==null?setTimeout(_C,0,t):(UC=t,setTimeout(m6,0))},oB=function(t,e){d6=setTimeout(t,e)},Hk=function(){clearTimeout(d6)},jk=function(){return!1},I6=kn.unstable_forceFrameRate=function(){}):(Ok=window.performance,y6=window.Date,yEe=window.setTimeout,EEe=window.clearTimeout,typeof console<"u"&&(CEe=window.cancelAnimationFrame,typeof window.requestAnimationFrame!="function"&&console.error("This browser doesn't support requestAnimationFrame. Make sure that you load a polyfill in older browsers. https://fb.me/react-polyfills"),typeof CEe!="function"&&console.error("This browser doesn't support cancelAnimationFrame. Make sure that you load a polyfill in older browsers. https://fb.me/react-polyfills")),typeof Ok=="object"&&typeof Ok.now=="function"?kn.unstable_now=function(){return Ok.now()}:(wEe=y6.now(),kn.unstable_now=function(){return y6.now()-wEe}),iB=!1,sB=null,Mk=-1,E6=5,C6=0,jk=function(){return kn.unstable_now()>=C6},I6=function(){},kn.unstable_forceFrameRate=function(t){0>t||125<t?console.error("forceFrameRate takes a positive int between 0 and 125, forcing framerates higher than 125 fps is not unsupported"):E6=0<t?Math.floor(1e3/t):5},w6=new MessageChannel,Uk=w6.port2,w6.port1.onmessage=function(){if(sB!==null){var t=kn.unstable_now();C6=t+E6;try{sB(!0,t)?Uk.postMessage(null):(iB=!1,sB=null)}catch(e){throw Uk.postMessage(null),e}}else iB=!1},_C=function(t){sB=t,iB||(iB=!0,Uk.postMessage(null))},oB=function(t,e){Mk=yEe(function(){t(kn.unstable_now())},e)},Hk=function(){EEe(Mk),Mk=-1});var UC,d6,m6,mEe,Ok,y6,yEe,EEe,CEe,wEe,iB,sB,Mk,E6,C6,w6,Uk;function B6(t,e){var r=t.length;t.push(e);e:for(;;){var o=Math.floor((r-1)/2),a=t[o];if(a!==void 0&&0<_k(a,e))t[o]=e,t[r]=a,r=o;else break e}}function nc(t){return t=t[0],t===void 0?null:t}function Gk(t){var e=t[0];if(e!==void 0){var r=t.pop();if(r!==e){t[0]=r;e:for(var o=0,a=t.length;o<a;){var n=2*(o+1)-1,u=t[n],A=n+1,p=t[A];if(u!==void 0&&0>_k(u,r))p!==void 0&&0>_k(p,u)?(t[o]=p,t[A]=r,o=A):(t[o]=u,t[n]=r,o=n);else if(p!==void 0&&0>_k(p,r))t[o]=p,t[A]=r,o=A;else break e}}return e}return null}function _k(t,e){var r=t.sortIndex-e.sortIndex;return r!==0?r:t.id-e.id}var eu=[],y0=[],Uyt=1,na=null,Lo=3,qk=!1,om=!1,aB=!1;function Yk(t){for(var e=nc(y0);e!==null;){if(e.callback===null)Gk(y0);else if(e.startTime<=t)Gk(y0),e.sortIndex=e.expirationTime,B6(eu,e);else break;e=nc(y0)}}function v6(t){if(aB=!1,Yk(t),!om)if(nc(eu)!==null)om=!0,_C(D6);else{var e=nc(y0);e!==null&&oB(v6,e.startTime-t)}}function D6(t,e){om=!1,aB&&(aB=!1,Hk()),qk=!0;var r=Lo;try{for(Yk(e),na=nc(eu);na!==null&&(!(na.expirationTime>e)||t&&!jk());){var o=na.callback;if(o!==null){na.callback=null,Lo=na.priorityLevel;var a=o(na.expirationTime<=e);e=kn.unstable_now(),typeof a=="function"?na.callback=a:na===nc(eu)&&Gk(eu),Yk(e)}else Gk(eu);na=nc(eu)}if(na!==null)var n=!0;else{var u=nc(y0);u!==null&&oB(v6,u.startTime-e),n=!1}return n}finally{na=null,Lo=r,qk=!1}}function IEe(t){switch(t){case 1:return-1;case 2:return 250;case 5:return 1073741823;case 4:return 1e4;default:return 5e3}}var _yt=I6;kn.unstable_ImmediatePriority=1;kn.unstable_UserBlockingPriority=2;kn.unstable_NormalPriority=3;kn.unstable_IdlePriority=5;kn.unstable_LowPriority=4;kn.unstable_runWithPriority=function(t,e){switch(t){case 1:case 2:case 3:case 4:case 5:break;default:t=3}var r=Lo;Lo=t;try{return e()}finally{Lo=r}};kn.unstable_next=function(t){switch(Lo){case 1:case 2:case 3:var e=3;break;default:e=Lo}var r=Lo;Lo=e;try{return t()}finally{Lo=r}};kn.unstable_scheduleCallback=function(t,e,r){var o=kn.unstable_now();if(typeof r=="object"&&r!==null){var a=r.delay;a=typeof a=="number"&&0<a?o+a:o,r=typeof r.timeout=="number"?r.timeout:IEe(t)}else r=IEe(t),a=o;return r=a+r,t={id:Uyt++,callback:e,priorityLevel:t,startTime:a,expirationTime:r,sortIndex:-1},a>o?(t.sortIndex=a,B6(y0,t),nc(eu)===null&&t===nc(y0)&&(aB?Hk():aB=!0,oB(v6,a-o))):(t.sortIndex=r,B6(eu,t),om||qk||(om=!0,_C(D6))),t};kn.unstable_cancelCallback=function(t){t.callback=null};kn.unstable_wrapCallback=function(t){var e=Lo;return function(){var r=Lo;Lo=e;try{return t.apply(this,arguments)}finally{Lo=r}}};kn.unstable_getCurrentPriorityLevel=function(){return Lo};kn.unstable_shouldYield=function(){var t=kn.unstable_now();Yk(t);var e=nc(eu);return e!==na&&na!==null&&e!==null&&e.callback!==null&&e.startTime<=t&&e.expirationTime<na.expirationTime||jk()};kn.unstable_requestPaint=_yt;kn.unstable_continueExecution=function(){om||qk||(om=!0,_C(D6))};kn.unstable_pauseExecution=function(){};kn.unstable_getFirstCallbackNode=function(){return nc(eu)};kn.unstable_Profiling=null});var S6=_((gKt,vEe)=>{"use strict";vEe.exports=BEe()});var DEe=_((dKt,lB)=>{lB.exports=function t(e){"use strict";var r=$H(),o=on(),a=S6();function n(S){for(var D="https://reactjs.org/docs/error-decoder.html?invariant="+S,T=1;T<arguments.length;T++)D+="&args[]="+encodeURIComponent(arguments[T]);return"Minified React error #"+S+"; visit "+D+" for the full message or use the non-minified dev environment for full errors and additional helpful warnings."}var u=o.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;u.hasOwnProperty("ReactCurrentDispatcher")||(u.ReactCurrentDispatcher={current:null}),u.hasOwnProperty("ReactCurrentBatchConfig")||(u.ReactCurrentBatchConfig={suspense:null});var A=typeof Symbol=="function"&&Symbol.for,p=A?Symbol.for("react.element"):60103,h=A?Symbol.for("react.portal"):60106,E=A?Symbol.for("react.fragment"):60107,I=A?Symbol.for("react.strict_mode"):60108,v=A?Symbol.for("react.profiler"):60114,x=A?Symbol.for("react.provider"):60109,C=A?Symbol.for("react.context"):60110,R=A?Symbol.for("react.concurrent_mode"):60111,L=A?Symbol.for("react.forward_ref"):60112,U=A?Symbol.for("react.suspense"):60113,J=A?Symbol.for("react.suspense_list"):60120,te=A?Symbol.for("react.memo"):60115,ae=A?Symbol.for("react.lazy"):60116;A&&Symbol.for("react.fundamental"),A&&Symbol.for("react.responder"),A&&Symbol.for("react.scope");var fe=typeof Symbol=="function"&&Symbol.iterator;function ce(S){return S===null||typeof S!="object"?null:(S=fe&&S[fe]||S["@@iterator"],typeof S=="function"?S:null)}function me(S){if(S._status===-1){S._status=0;var D=S._ctor;D=D(),S._result=D,D.then(function(T){S._status===0&&(T=T.default,S._status=1,S._result=T)},function(T){S._status===0&&(S._status=2,S._result=T)})}}function he(S){if(S==null)return null;if(typeof S=="function")return S.displayName||S.name||null;if(typeof S=="string")return S;switch(S){case E:return"Fragment";case h:return"Portal";case v:return"Profiler";case I:return"StrictMode";case U:return"Suspense";case J:return"SuspenseList"}if(typeof S=="object")switch(S.$$typeof){case C:return"Context.Consumer";case x:return"Context.Provider";case L:var D=S.render;return D=D.displayName||D.name||"",S.displayName||(D!==""?"ForwardRef("+D+")":"ForwardRef");case te:return he(S.type);case ae:if(S=S._status===1?S._result:null)return he(S)}return null}function Be(S){var D=S,T=S;if(S.alternate)for(;D.return;)D=D.return;else{S=D;do D=S,(D.effectTag&1026)!==0&&(T=D.return),S=D.return;while(S)}return D.tag===3?T:null}function we(S){if(Be(S)!==S)throw Error(n(188))}function g(S){var D=S.alternate;if(!D){if(D=Be(S),D===null)throw Error(n(188));return D!==S?null:S}for(var T=S,j=D;;){var Y=T.return;if(Y===null)break;var Ae=Y.alternate;if(Ae===null){if(j=Y.return,j!==null){T=j;continue}break}if(Y.child===Ae.child){for(Ae=Y.child;Ae;){if(Ae===T)return we(Y),S;if(Ae===j)return we(Y),D;Ae=Ae.sibling}throw Error(n(188))}if(T.return!==j.return)T=Y,j=Ae;else{for(var De=!1,vt=Y.child;vt;){if(vt===T){De=!0,T=Y,j=Ae;break}if(vt===j){De=!0,j=Y,T=Ae;break}vt=vt.sibling}if(!De){for(vt=Ae.child;vt;){if(vt===T){De=!0,T=Ae,j=Y;break}if(vt===j){De=!0,j=Ae,T=Y;break}vt=vt.sibling}if(!De)throw Error(n(189))}}if(T.alternate!==j)throw Error(n(190))}if(T.tag!==3)throw Error(n(188));return T.stateNode.current===T?S:D}function Ee(S){if(S=g(S),!S)return null;for(var D=S;;){if(D.tag===5||D.tag===6)return D;if(D.child)D.child.return=D,D=D.child;else{if(D===S)break;for(;!D.sibling;){if(!D.return||D.return===S)return null;D=D.return}D.sibling.return=D.return,D=D.sibling}}return null}function Se(S){if(S=g(S),!S)return null;for(var D=S;;){if(D.tag===5||D.tag===6)return D;if(D.child&&D.tag!==4)D.child.return=D,D=D.child;else{if(D===S)break;for(;!D.sibling;){if(!D.return||D.return===S)return null;D=D.return}D.sibling.return=D.return,D=D.sibling}}return null}var le=e.getPublicInstance,ne=e.getRootHostContext,ee=e.getChildHostContext,Ie=e.prepareForCommit,Fe=e.resetAfterCommit,At=e.createInstance,H=e.appendInitialChild,at=e.finalizeInitialChildren,Re=e.prepareUpdate,ke=e.shouldSetTextContent,xe=e.shouldDeprioritizeSubtree,He=e.createTextInstance,Te=e.setTimeout,Je=e.clearTimeout,je=e.noTimeout,b=e.isPrimaryRenderer,w=e.supportsMutation,P=e.supportsPersistence,y=e.supportsHydration,F=e.appendChild,z=e.appendChildToContainer,X=e.commitTextUpdate,Z=e.commitMount,ie=e.commitUpdate,Pe=e.insertBefore,Ne=e.insertInContainerBefore,ot=e.removeChild,dt=e.removeChildFromContainer,Gt=e.resetTextContent,$t=e.hideInstance,bt=e.hideTextInstance,an=e.unhideInstance,Qr=e.unhideTextInstance,mr=e.cloneInstance,br=e.createContainerChildSet,Wr=e.appendChildToContainerChildSet,Kn=e.finalizeContainerChildren,Ns=e.replaceContainerChildren,Ti=e.cloneHiddenInstance,ps=e.cloneHiddenTextInstance,io=e.canHydrateInstance,Pi=e.canHydrateTextInstance,Ls=e.isSuspenseInstancePending,so=e.isSuspenseInstanceFallback,cc=e.getNextHydratableSibling,cu=e.getFirstHydratableChild,lp=e.hydrateInstance,cp=e.hydrateTextInstance,Os=e.getNextHydratableInstanceAfterSuspenseInstance,Dn=e.commitHydratedContainer,oo=e.commitHydratedSuspenseInstance,Ms=/^(.*)[\\\/]/;function ml(S){var D="";do{e:switch(S.tag){case 3:case 4:case 6:case 7:case 10:case 9:var T="";break e;default:var j=S._debugOwner,Y=S._debugSource,Ae=he(S.type);T=null,j&&(T=he(j.type)),j=Ae,Ae="",Y?Ae=" (at "+Y.fileName.replace(Ms,"")+":"+Y.lineNumber+")":T&&(Ae=" (created by "+T+")"),T=`
+    in `+(j||"Unknown")+Ae}D+=T,S=S.return}while(S);return D}var yl=[],ao=-1;function Vn(S){0>ao||(S.current=yl[ao],yl[ao]=null,ao--)}function On(S,D){ao++,yl[ao]=S.current,S.current=D}var Ni={},Mn={current:Ni},_i={current:!1},tr=Ni;function Oe(S,D){var T=S.type.contextTypes;if(!T)return Ni;var j=S.stateNode;if(j&&j.__reactInternalMemoizedUnmaskedChildContext===D)return j.__reactInternalMemoizedMaskedChildContext;var Y={},Ae;for(Ae in T)Y[Ae]=D[Ae];return j&&(S=S.stateNode,S.__reactInternalMemoizedUnmaskedChildContext=D,S.__reactInternalMemoizedMaskedChildContext=Y),Y}function ii(S){return S=S.childContextTypes,S!=null}function Ma(S){Vn(_i,S),Vn(Mn,S)}function hr(S){Vn(_i,S),Vn(Mn,S)}function uc(S,D,T){if(Mn.current!==Ni)throw Error(n(168));On(Mn,D,S),On(_i,T,S)}function uu(S,D,T){var j=S.stateNode;if(S=D.childContextTypes,typeof j.getChildContext!="function")return T;j=j.getChildContext();for(var Y in j)if(!(Y in S))throw Error(n(108,he(D)||"Unknown",Y));return r({},T,{},j)}function Ac(S){var D=S.stateNode;return D=D&&D.__reactInternalMemoizedMergedChildContext||Ni,tr=Mn.current,On(Mn,D,S),On(_i,_i.current,S),!0}function El(S,D,T){var j=S.stateNode;if(!j)throw Error(n(169));T?(D=uu(S,D,tr),j.__reactInternalMemoizedMergedChildContext=D,Vn(_i,S),Vn(Mn,S),On(Mn,D,S)):Vn(_i,S),On(_i,T,S)}var DA=a.unstable_runWithPriority,Au=a.unstable_scheduleCallback,Ce=a.unstable_cancelCallback,Rt=a.unstable_shouldYield,fc=a.unstable_requestPaint,Hi=a.unstable_now,fu=a.unstable_getCurrentPriorityLevel,Yt=a.unstable_ImmediatePriority,Cl=a.unstable_UserBlockingPriority,SA=a.unstable_NormalPriority,up=a.unstable_LowPriority,pc=a.unstable_IdlePriority,PA={},Qn=fc!==void 0?fc:function(){},hi=null,hc=null,bA=!1,sa=Hi(),Li=1e4>sa?Hi:function(){return Hi()-sa};function _o(){switch(fu()){case Yt:return 99;case Cl:return 98;case SA:return 97;case up:return 96;case pc:return 95;default:throw Error(n(332))}}function Ze(S){switch(S){case 99:return Yt;case 98:return Cl;case 97:return SA;case 96:return up;case 95:return pc;default:throw Error(n(332))}}function lo(S,D){return S=Ze(S),DA(S,D)}function gc(S,D,T){return S=Ze(S),Au(S,D,T)}function pu(S){return hi===null?(hi=[S],hc=Au(Yt,hu)):hi.push(S),PA}function ji(){if(hc!==null){var S=hc;hc=null,Ce(S)}hu()}function hu(){if(!bA&&hi!==null){bA=!0;var S=0;try{var D=hi;lo(99,function(){for(;S<D.length;S++){var T=D[S];do T=T(!0);while(T!==null)}}),hi=null}catch(T){throw hi!==null&&(hi=hi.slice(S+1)),Au(Yt,ji),T}finally{bA=!1}}}var xA=3;function Ua(S,D,T){return T/=10,1073741821-(((1073741821-S+D/10)/T|0)+1)*T}function dc(S,D){return S===D&&(S!==0||1/S===1/D)||S!==S&&D!==D}var hs=typeof Object.is=="function"?Object.is:dc,_t=Object.prototype.hasOwnProperty;function Fn(S,D){if(hs(S,D))return!0;if(typeof S!="object"||S===null||typeof D!="object"||D===null)return!1;var T=Object.keys(S),j=Object.keys(D);if(T.length!==j.length)return!1;for(j=0;j<T.length;j++)if(!_t.call(D,T[j])||!hs(S[T[j]],D[T[j]]))return!1;return!0}function Ci(S,D){if(S&&S.defaultProps){D=r({},D),S=S.defaultProps;for(var T in S)D[T]===void 0&&(D[T]=S[T])}return D}var oa={current:null},co=null,Us=null,aa=null;function la(){aa=Us=co=null}function Ho(S,D){var T=S.type._context;b?(On(oa,T._currentValue,S),T._currentValue=D):(On(oa,T._currentValue2,S),T._currentValue2=D)}function wi(S){var D=oa.current;Vn(oa,S),S=S.type._context,b?S._currentValue=D:S._currentValue2=D}function gs(S,D){for(;S!==null;){var T=S.alternate;if(S.childExpirationTime<D)S.childExpirationTime=D,T!==null&&T.childExpirationTime<D&&(T.childExpirationTime=D);else if(T!==null&&T.childExpirationTime<D)T.childExpirationTime=D;else break;S=S.return}}function ds(S,D){co=S,aa=Us=null,S=S.dependencies,S!==null&&S.firstContext!==null&&(S.expirationTime>=D&&(Go=!0),S.firstContext=null)}function ms(S,D){if(aa!==S&&D!==!1&&D!==0)if((typeof D!="number"||D===1073741823)&&(aa=S,D=1073741823),D={context:S,observedBits:D,next:null},Us===null){if(co===null)throw Error(n(308));Us=D,co.dependencies={expirationTime:0,firstContext:D,responders:null}}else Us=Us.next=D;return b?S._currentValue:S._currentValue2}var _s=!1;function Un(S){return{baseState:S,firstUpdate:null,lastUpdate:null,firstCapturedUpdate:null,lastCapturedUpdate:null,firstEffect:null,lastEffect:null,firstCapturedEffect:null,lastCapturedEffect:null}}function Sn(S){return{baseState:S.baseState,firstUpdate:S.firstUpdate,lastUpdate:S.lastUpdate,firstCapturedUpdate:null,lastCapturedUpdate:null,firstEffect:null,lastEffect:null,firstCapturedEffect:null,lastCapturedEffect:null}}function ys(S,D){return{expirationTime:S,suspenseConfig:D,tag:0,payload:null,callback:null,next:null,nextEffect:null}}function We(S,D){S.lastUpdate===null?S.firstUpdate=S.lastUpdate=D:(S.lastUpdate.next=D,S.lastUpdate=D)}function tt(S,D){var T=S.alternate;if(T===null){var j=S.updateQueue,Y=null;j===null&&(j=S.updateQueue=Un(S.memoizedState))}else j=S.updateQueue,Y=T.updateQueue,j===null?Y===null?(j=S.updateQueue=Un(S.memoizedState),Y=T.updateQueue=Un(T.memoizedState)):j=S.updateQueue=Sn(Y):Y===null&&(Y=T.updateQueue=Sn(j));Y===null||j===Y?We(j,D):j.lastUpdate===null||Y.lastUpdate===null?(We(j,D),We(Y,D)):(We(j,D),Y.lastUpdate=D)}function It(S,D){var T=S.updateQueue;T=T===null?S.updateQueue=Un(S.memoizedState):nr(S,T),T.lastCapturedUpdate===null?T.firstCapturedUpdate=T.lastCapturedUpdate=D:(T.lastCapturedUpdate.next=D,T.lastCapturedUpdate=D)}function nr(S,D){var T=S.alternate;return T!==null&&D===T.updateQueue&&(D=S.updateQueue=Sn(D)),D}function $(S,D,T,j,Y,Ae){switch(T.tag){case 1:return S=T.payload,typeof S=="function"?S.call(Ae,j,Y):S;case 3:S.effectTag=S.effectTag&-4097|64;case 0:if(S=T.payload,Y=typeof S=="function"?S.call(Ae,j,Y):S,Y==null)break;return r({},j,Y);case 2:_s=!0}return j}function ye(S,D,T,j,Y){_s=!1,D=nr(S,D);for(var Ae=D.baseState,De=null,vt=0,wt=D.firstUpdate,xt=Ae;wt!==null;){var _r=wt.expirationTime;_r<Y?(De===null&&(De=wt,Ae=xt),vt<_r&&(vt=_r)):(Pw(_r,wt.suspenseConfig),xt=$(S,D,wt,xt,T,j),wt.callback!==null&&(S.effectTag|=32,wt.nextEffect=null,D.lastEffect===null?D.firstEffect=D.lastEffect=wt:(D.lastEffect.nextEffect=wt,D.lastEffect=wt))),wt=wt.next}for(_r=null,wt=D.firstCapturedUpdate;wt!==null;){var is=wt.expirationTime;is<Y?(_r===null&&(_r=wt,De===null&&(Ae=xt)),vt<is&&(vt=is)):(xt=$(S,D,wt,xt,T,j),wt.callback!==null&&(S.effectTag|=32,wt.nextEffect=null,D.lastCapturedEffect===null?D.firstCapturedEffect=D.lastCapturedEffect=wt:(D.lastCapturedEffect.nextEffect=wt,D.lastCapturedEffect=wt))),wt=wt.next}De===null&&(D.lastUpdate=null),_r===null?D.lastCapturedUpdate=null:S.effectTag|=32,De===null&&_r===null&&(Ae=xt),D.baseState=Ae,D.firstUpdate=De,D.firstCapturedUpdate=_r,Hm(vt),S.expirationTime=vt,S.memoizedState=xt}function Le(S,D,T){D.firstCapturedUpdate!==null&&(D.lastUpdate!==null&&(D.lastUpdate.next=D.firstCapturedUpdate,D.lastUpdate=D.lastCapturedUpdate),D.firstCapturedUpdate=D.lastCapturedUpdate=null),pt(D.firstEffect,T),D.firstEffect=D.lastEffect=null,pt(D.firstCapturedEffect,T),D.firstCapturedEffect=D.lastCapturedEffect=null}function pt(S,D){for(;S!==null;){var T=S.callback;if(T!==null){S.callback=null;var j=D;if(typeof T!="function")throw Error(n(191,T));T.call(j)}S=S.nextEffect}}var ht=u.ReactCurrentBatchConfig,Tt=new o.Component().refs;function er(S,D,T,j){D=S.memoizedState,T=T(j,D),T=T==null?D:r({},D,T),S.memoizedState=T,j=S.updateQueue,j!==null&&S.expirationTime===0&&(j.baseState=T)}var $r={isMounted:function(S){return(S=S._reactInternalFiber)?Be(S)===S:!1},enqueueSetState:function(S,D,T){S=S._reactInternalFiber;var j=ga(),Y=ht.suspense;j=jA(j,S,Y),Y=ys(j,Y),Y.payload=D,T!=null&&(Y.callback=T),tt(S,Y),Pc(S,j)},enqueueReplaceState:function(S,D,T){S=S._reactInternalFiber;var j=ga(),Y=ht.suspense;j=jA(j,S,Y),Y=ys(j,Y),Y.tag=1,Y.payload=D,T!=null&&(Y.callback=T),tt(S,Y),Pc(S,j)},enqueueForceUpdate:function(S,D){S=S._reactInternalFiber;var T=ga(),j=ht.suspense;T=jA(T,S,j),j=ys(T,j),j.tag=2,D!=null&&(j.callback=D),tt(S,j),Pc(S,T)}};function Gi(S,D,T,j,Y,Ae,De){return S=S.stateNode,typeof S.shouldComponentUpdate=="function"?S.shouldComponentUpdate(j,Ae,De):D.prototype&&D.prototype.isPureReactComponent?!Fn(T,j)||!Fn(Y,Ae):!0}function es(S,D,T){var j=!1,Y=Ni,Ae=D.contextType;return typeof Ae=="object"&&Ae!==null?Ae=ms(Ae):(Y=ii(D)?tr:Mn.current,j=D.contextTypes,Ae=(j=j!=null)?Oe(S,Y):Ni),D=new D(T,Ae),S.memoizedState=D.state!==null&&D.state!==void 0?D.state:null,D.updater=$r,S.stateNode=D,D._reactInternalFiber=S,j&&(S=S.stateNode,S.__reactInternalMemoizedUnmaskedChildContext=Y,S.__reactInternalMemoizedMaskedChildContext=Ae),D}function bi(S,D,T,j){S=D.state,typeof D.componentWillReceiveProps=="function"&&D.componentWillReceiveProps(T,j),typeof D.UNSAFE_componentWillReceiveProps=="function"&&D.UNSAFE_componentWillReceiveProps(T,j),D.state!==S&&$r.enqueueReplaceState(D,D.state,null)}function jo(S,D,T,j){var Y=S.stateNode;Y.props=T,Y.state=S.memoizedState,Y.refs=Tt;var Ae=D.contextType;typeof Ae=="object"&&Ae!==null?Y.context=ms(Ae):(Ae=ii(D)?tr:Mn.current,Y.context=Oe(S,Ae)),Ae=S.updateQueue,Ae!==null&&(ye(S,Ae,T,Y,j),Y.state=S.memoizedState),Ae=D.getDerivedStateFromProps,typeof Ae=="function"&&(er(S,D,Ae,T),Y.state=S.memoizedState),typeof D.getDerivedStateFromProps=="function"||typeof Y.getSnapshotBeforeUpdate=="function"||typeof Y.UNSAFE_componentWillMount!="function"&&typeof Y.componentWillMount!="function"||(D=Y.state,typeof Y.componentWillMount=="function"&&Y.componentWillMount(),typeof Y.UNSAFE_componentWillMount=="function"&&Y.UNSAFE_componentWillMount(),D!==Y.state&&$r.enqueueReplaceState(Y,Y.state,null),Ae=S.updateQueue,Ae!==null&&(ye(S,Ae,T,Y,j),Y.state=S.memoizedState)),typeof Y.componentDidMount=="function"&&(S.effectTag|=4)}var kA=Array.isArray;function QA(S,D,T){if(S=T.ref,S!==null&&typeof S!="function"&&typeof S!="object"){if(T._owner){if(T=T._owner,T){if(T.tag!==1)throw Error(n(309));var j=T.stateNode}if(!j)throw Error(n(147,S));var Y=""+S;return D!==null&&D.ref!==null&&typeof D.ref=="function"&&D.ref._stringRef===Y?D.ref:(D=function(Ae){var De=j.refs;De===Tt&&(De=j.refs={}),Ae===null?delete De[Y]:De[Y]=Ae},D._stringRef=Y,D)}if(typeof S!="string")throw Error(n(284));if(!T._owner)throw Error(n(290,S))}return S}function Ap(S,D){if(S.type!=="textarea")throw Error(n(31,Object.prototype.toString.call(D)==="[object Object]"?"object with keys {"+Object.keys(D).join(", ")+"}":D,""))}function ig(S){function D(rt,Ve){if(S){var ft=rt.lastEffect;ft!==null?(ft.nextEffect=Ve,rt.lastEffect=Ve):rt.firstEffect=rt.lastEffect=Ve,Ve.nextEffect=null,Ve.effectTag=8}}function T(rt,Ve){if(!S)return null;for(;Ve!==null;)D(rt,Ve),Ve=Ve.sibling;return null}function j(rt,Ve){for(rt=new Map;Ve!==null;)Ve.key!==null?rt.set(Ve.key,Ve):rt.set(Ve.index,Ve),Ve=Ve.sibling;return rt}function Y(rt,Ve,ft){return rt=WA(rt,Ve,ft),rt.index=0,rt.sibling=null,rt}function Ae(rt,Ve,ft){return rt.index=ft,S?(ft=rt.alternate,ft!==null?(ft=ft.index,ft<Ve?(rt.effectTag=2,Ve):ft):(rt.effectTag=2,Ve)):Ve}function De(rt){return S&&rt.alternate===null&&(rt.effectTag=2),rt}function vt(rt,Ve,ft,Wt){return Ve===null||Ve.tag!==6?(Ve=Fw(ft,rt.mode,Wt),Ve.return=rt,Ve):(Ve=Y(Ve,ft,Wt),Ve.return=rt,Ve)}function wt(rt,Ve,ft,Wt){return Ve!==null&&Ve.elementType===ft.type?(Wt=Y(Ve,ft.props,Wt),Wt.ref=QA(rt,Ve,ft),Wt.return=rt,Wt):(Wt=jm(ft.type,ft.key,ft.props,null,rt.mode,Wt),Wt.ref=QA(rt,Ve,ft),Wt.return=rt,Wt)}function xt(rt,Ve,ft,Wt){return Ve===null||Ve.tag!==4||Ve.stateNode.containerInfo!==ft.containerInfo||Ve.stateNode.implementation!==ft.implementation?(Ve=Rw(ft,rt.mode,Wt),Ve.return=rt,Ve):(Ve=Y(Ve,ft.children||[],Wt),Ve.return=rt,Ve)}function _r(rt,Ve,ft,Wt,vr){return Ve===null||Ve.tag!==7?(Ve=bu(ft,rt.mode,Wt,vr),Ve.return=rt,Ve):(Ve=Y(Ve,ft,Wt),Ve.return=rt,Ve)}function is(rt,Ve,ft){if(typeof Ve=="string"||typeof Ve=="number")return Ve=Fw(""+Ve,rt.mode,ft),Ve.return=rt,Ve;if(typeof Ve=="object"&&Ve!==null){switch(Ve.$$typeof){case p:return ft=jm(Ve.type,Ve.key,Ve.props,null,rt.mode,ft),ft.ref=QA(rt,null,Ve),ft.return=rt,ft;case h:return Ve=Rw(Ve,rt.mode,ft),Ve.return=rt,Ve}if(kA(Ve)||ce(Ve))return Ve=bu(Ve,rt.mode,ft,null),Ve.return=rt,Ve;Ap(rt,Ve)}return null}function di(rt,Ve,ft,Wt){var vr=Ve!==null?Ve.key:null;if(typeof ft=="string"||typeof ft=="number")return vr!==null?null:vt(rt,Ve,""+ft,Wt);if(typeof ft=="object"&&ft!==null){switch(ft.$$typeof){case p:return ft.key===vr?ft.type===E?_r(rt,Ve,ft.props.children,Wt,vr):wt(rt,Ve,ft,Wt):null;case h:return ft.key===vr?xt(rt,Ve,ft,Wt):null}if(kA(ft)||ce(ft))return vr!==null?null:_r(rt,Ve,ft,Wt,null);Ap(rt,ft)}return null}function po(rt,Ve,ft,Wt,vr){if(typeof Wt=="string"||typeof Wt=="number")return rt=rt.get(ft)||null,vt(Ve,rt,""+Wt,vr);if(typeof Wt=="object"&&Wt!==null){switch(Wt.$$typeof){case p:return rt=rt.get(Wt.key===null?ft:Wt.key)||null,Wt.type===E?_r(Ve,rt,Wt.props.children,vr,Wt.key):wt(Ve,rt,Wt,vr);case h:return rt=rt.get(Wt.key===null?ft:Wt.key)||null,xt(Ve,rt,Wt,vr)}if(kA(Wt)||ce(Wt))return rt=rt.get(ft)||null,_r(Ve,rt,Wt,vr,null);Ap(Ve,Wt)}return null}function VA(rt,Ve,ft,Wt){for(var vr=null,Pn=null,Fr=Ve,bn=Ve=0,ai=null;Fr!==null&&bn<ft.length;bn++){Fr.index>bn?(ai=Fr,Fr=null):ai=Fr.sibling;var tn=di(rt,Fr,ft[bn],Wt);if(tn===null){Fr===null&&(Fr=ai);break}S&&Fr&&tn.alternate===null&&D(rt,Fr),Ve=Ae(tn,Ve,bn),Pn===null?vr=tn:Pn.sibling=tn,Pn=tn,Fr=ai}if(bn===ft.length)return T(rt,Fr),vr;if(Fr===null){for(;bn<ft.length;bn++)Fr=is(rt,ft[bn],Wt),Fr!==null&&(Ve=Ae(Fr,Ve,bn),Pn===null?vr=Fr:Pn.sibling=Fr,Pn=Fr);return vr}for(Fr=j(rt,Fr);bn<ft.length;bn++)ai=po(Fr,rt,bn,ft[bn],Wt),ai!==null&&(S&&ai.alternate!==null&&Fr.delete(ai.key===null?bn:ai.key),Ve=Ae(ai,Ve,bn),Pn===null?vr=ai:Pn.sibling=ai,Pn=ai);return S&&Fr.forEach(function(ho){return D(rt,ho)}),vr}function Yo(rt,Ve,ft,Wt){var vr=ce(ft);if(typeof vr!="function")throw Error(n(150));if(ft=vr.call(ft),ft==null)throw Error(n(151));for(var Pn=vr=null,Fr=Ve,bn=Ve=0,ai=null,tn=ft.next();Fr!==null&&!tn.done;bn++,tn=ft.next()){Fr.index>bn?(ai=Fr,Fr=null):ai=Fr.sibling;var ho=di(rt,Fr,tn.value,Wt);if(ho===null){Fr===null&&(Fr=ai);break}S&&Fr&&ho.alternate===null&&D(rt,Fr),Ve=Ae(ho,Ve,bn),Pn===null?vr=ho:Pn.sibling=ho,Pn=ho,Fr=ai}if(tn.done)return T(rt,Fr),vr;if(Fr===null){for(;!tn.done;bn++,tn=ft.next())tn=is(rt,tn.value,Wt),tn!==null&&(Ve=Ae(tn,Ve,bn),Pn===null?vr=tn:Pn.sibling=tn,Pn=tn);return vr}for(Fr=j(rt,Fr);!tn.done;bn++,tn=ft.next())tn=po(Fr,rt,bn,tn.value,Wt),tn!==null&&(S&&tn.alternate!==null&&Fr.delete(tn.key===null?bn:tn.key),Ve=Ae(tn,Ve,bn),Pn===null?vr=tn:Pn.sibling=tn,Pn=tn);return S&&Fr.forEach(function(vF){return D(rt,vF)}),vr}return function(rt,Ve,ft,Wt){var vr=typeof ft=="object"&&ft!==null&&ft.type===E&&ft.key===null;vr&&(ft=ft.props.children);var Pn=typeof ft=="object"&&ft!==null;if(Pn)switch(ft.$$typeof){case p:e:{for(Pn=ft.key,vr=Ve;vr!==null;){if(vr.key===Pn)if(vr.tag===7?ft.type===E:vr.elementType===ft.type){T(rt,vr.sibling),Ve=Y(vr,ft.type===E?ft.props.children:ft.props,Wt),Ve.ref=QA(rt,vr,ft),Ve.return=rt,rt=Ve;break e}else{T(rt,vr);break}else D(rt,vr);vr=vr.sibling}ft.type===E?(Ve=bu(ft.props.children,rt.mode,Wt,ft.key),Ve.return=rt,rt=Ve):(Wt=jm(ft.type,ft.key,ft.props,null,rt.mode,Wt),Wt.ref=QA(rt,Ve,ft),Wt.return=rt,rt=Wt)}return De(rt);case h:e:{for(vr=ft.key;Ve!==null;){if(Ve.key===vr)if(Ve.tag===4&&Ve.stateNode.containerInfo===ft.containerInfo&&Ve.stateNode.implementation===ft.implementation){T(rt,Ve.sibling),Ve=Y(Ve,ft.children||[],Wt),Ve.return=rt,rt=Ve;break e}else{T(rt,Ve);break}else D(rt,Ve);Ve=Ve.sibling}Ve=Rw(ft,rt.mode,Wt),Ve.return=rt,rt=Ve}return De(rt)}if(typeof ft=="string"||typeof ft=="number")return ft=""+ft,Ve!==null&&Ve.tag===6?(T(rt,Ve.sibling),Ve=Y(Ve,ft,Wt),Ve.return=rt,rt=Ve):(T(rt,Ve),Ve=Fw(ft,rt.mode,Wt),Ve.return=rt,rt=Ve),De(rt);if(kA(ft))return VA(rt,Ve,ft,Wt);if(ce(ft))return Yo(rt,Ve,ft,Wt);if(Pn&&Ap(rt,ft),typeof ft>"u"&&!vr)switch(rt.tag){case 1:case 0:throw rt=rt.type,Error(n(152,rt.displayName||rt.name||"Component"))}return T(rt,Ve)}}var gu=ig(!0),sg=ig(!1),du={},uo={current:du},FA={current:du},mc={current:du};function ca(S){if(S===du)throw Error(n(174));return S}function og(S,D){On(mc,D,S),On(FA,S,S),On(uo,du,S),D=ne(D),Vn(uo,S),On(uo,D,S)}function yc(S){Vn(uo,S),Vn(FA,S),Vn(mc,S)}function Pm(S){var D=ca(mc.current),T=ca(uo.current);D=ee(T,S.type,D),T!==D&&(On(FA,S,S),On(uo,D,S))}function ag(S){FA.current===S&&(Vn(uo,S),Vn(FA,S))}var $n={current:0};function fp(S){for(var D=S;D!==null;){if(D.tag===13){var T=D.memoizedState;if(T!==null&&(T=T.dehydrated,T===null||Ls(T)||so(T)))return D}else if(D.tag===19&&D.memoizedProps.revealOrder!==void 0){if((D.effectTag&64)!==0)return D}else if(D.child!==null){D.child.return=D,D=D.child;continue}if(D===S)break;for(;D.sibling===null;){if(D.return===null||D.return===S)return null;D=D.return}D.sibling.return=D.return,D=D.sibling}return null}function lg(S,D){return{responder:S,props:D}}var RA=u.ReactCurrentDispatcher,Hs=u.ReactCurrentBatchConfig,mu=0,Ha=null,qi=null,ua=null,yu=null,Es=null,Ec=null,Cc=0,q=null,Dt=0,wl=!1,xi=null,wc=0;function ct(){throw Error(n(321))}function Eu(S,D){if(D===null)return!1;for(var T=0;T<D.length&&T<S.length;T++)if(!hs(S[T],D[T]))return!1;return!0}function cg(S,D,T,j,Y,Ae){if(mu=Ae,Ha=D,ua=S!==null?S.memoizedState:null,RA.current=ua===null?Ew:km,D=T(j,Y),wl){do wl=!1,wc+=1,ua=S!==null?S.memoizedState:null,Ec=yu,q=Es=qi=null,RA.current=km,D=T(j,Y);while(wl);xi=null,wc=0}if(RA.current=wu,S=Ha,S.memoizedState=yu,S.expirationTime=Cc,S.updateQueue=q,S.effectTag|=Dt,S=qi!==null&&qi.next!==null,mu=0,Ec=Es=yu=ua=qi=Ha=null,Cc=0,q=null,Dt=0,S)throw Error(n(300));return D}function yw(){RA.current=wu,mu=0,Ec=Es=yu=ua=qi=Ha=null,Cc=0,q=null,Dt=0,wl=!1,xi=null,wc=0}function TA(){var S={memoizedState:null,baseState:null,queue:null,baseUpdate:null,next:null};return Es===null?yu=Es=S:Es=Es.next=S,Es}function pp(){if(Ec!==null)Es=Ec,Ec=Es.next,qi=ua,ua=qi!==null?qi.next:null;else{if(ua===null)throw Error(n(310));qi=ua;var S={memoizedState:qi.memoizedState,baseState:qi.baseState,queue:qi.queue,baseUpdate:qi.baseUpdate,next:null};Es=Es===null?yu=S:Es.next=S,ua=qi.next}return Es}function Br(S,D){return typeof D=="function"?D(S):D}function Cs(S){var D=pp(),T=D.queue;if(T===null)throw Error(n(311));if(T.lastRenderedReducer=S,0<wc){var j=T.dispatch;if(xi!==null){var Y=xi.get(T);if(Y!==void 0){xi.delete(T);var Ae=D.memoizedState;do Ae=S(Ae,Y.action),Y=Y.next;while(Y!==null);return hs(Ae,D.memoizedState)||(Go=!0),D.memoizedState=Ae,D.baseUpdate===T.last&&(D.baseState=Ae),T.lastRenderedState=Ae,[Ae,j]}}return[D.memoizedState,j]}j=T.last;var De=D.baseUpdate;if(Ae=D.baseState,De!==null?(j!==null&&(j.next=null),j=De.next):j=j!==null?j.next:null,j!==null){var vt=Y=null,wt=j,xt=!1;do{var _r=wt.expirationTime;_r<mu?(xt||(xt=!0,vt=De,Y=Ae),_r>Cc&&(Cc=_r,Hm(Cc))):(Pw(_r,wt.suspenseConfig),Ae=wt.eagerReducer===S?wt.eagerState:S(Ae,wt.action)),De=wt,wt=wt.next}while(wt!==null&&wt!==j);xt||(vt=De,Y=Ae),hs(Ae,D.memoizedState)||(Go=!0),D.memoizedState=Ae,D.baseUpdate=vt,D.baseState=Y,T.lastRenderedState=Ae}return[D.memoizedState,T.dispatch]}function ug(S){var D=TA();return typeof S=="function"&&(S=S()),D.memoizedState=D.baseState=S,S=D.queue={last:null,dispatch:null,lastRenderedReducer:Br,lastRenderedState:S},S=S.dispatch=gg.bind(null,Ha,S),[D.memoizedState,S]}function Ag(S){return Cs(Br,S)}function fg(S,D,T,j){return S={tag:S,create:D,destroy:T,deps:j,next:null},q===null?(q={lastEffect:null},q.lastEffect=S.next=S):(D=q.lastEffect,D===null?q.lastEffect=S.next=S:(T=D.next,D.next=S,S.next=T,q.lastEffect=S)),S}function hp(S,D,T,j){var Y=TA();Dt|=S,Y.memoizedState=fg(D,T,void 0,j===void 0?null:j)}function Ic(S,D,T,j){var Y=pp();j=j===void 0?null:j;var Ae=void 0;if(qi!==null){var De=qi.memoizedState;if(Ae=De.destroy,j!==null&&Eu(j,De.deps)){fg(0,T,Ae,j);return}}Dt|=S,Y.memoizedState=fg(D,T,Ae,j)}function Ct(S,D){return hp(516,192,S,D)}function bm(S,D){return Ic(516,192,S,D)}function pg(S,D){if(typeof D=="function")return S=S(),D(S),function(){D(null)};if(D!=null)return S=S(),D.current=S,function(){D.current=null}}function hg(){}function Cu(S,D){return TA().memoizedState=[S,D===void 0?null:D],S}function xm(S,D){var T=pp();D=D===void 0?null:D;var j=T.memoizedState;return j!==null&&D!==null&&Eu(D,j[1])?j[0]:(T.memoizedState=[S,D],S)}function gg(S,D,T){if(!(25>wc))throw Error(n(301));var j=S.alternate;if(S===Ha||j!==null&&j===Ha)if(wl=!0,S={expirationTime:mu,suspenseConfig:null,action:T,eagerReducer:null,eagerState:null,next:null},xi===null&&(xi=new Map),T=xi.get(D),T===void 0)xi.set(D,S);else{for(D=T;D.next!==null;)D=D.next;D.next=S}else{var Y=ga(),Ae=ht.suspense;Y=jA(Y,S,Ae),Ae={expirationTime:Y,suspenseConfig:Ae,action:T,eagerReducer:null,eagerState:null,next:null};var De=D.last;if(De===null)Ae.next=Ae;else{var vt=De.next;vt!==null&&(Ae.next=vt),De.next=Ae}if(D.last=Ae,S.expirationTime===0&&(j===null||j.expirationTime===0)&&(j=D.lastRenderedReducer,j!==null))try{var wt=D.lastRenderedState,xt=j(wt,T);if(Ae.eagerReducer=j,Ae.eagerState=xt,hs(xt,wt))return}catch{}finally{}Pc(S,Y)}}var wu={readContext:ms,useCallback:ct,useContext:ct,useEffect:ct,useImperativeHandle:ct,useLayoutEffect:ct,useMemo:ct,useReducer:ct,useRef:ct,useState:ct,useDebugValue:ct,useResponder:ct,useDeferredValue:ct,useTransition:ct},Ew={readContext:ms,useCallback:Cu,useContext:ms,useEffect:Ct,useImperativeHandle:function(S,D,T){return T=T!=null?T.concat([S]):null,hp(4,36,pg.bind(null,D,S),T)},useLayoutEffect:function(S,D){return hp(4,36,S,D)},useMemo:function(S,D){var T=TA();return D=D===void 0?null:D,S=S(),T.memoizedState=[S,D],S},useReducer:function(S,D,T){var j=TA();return D=T!==void 0?T(D):D,j.memoizedState=j.baseState=D,S=j.queue={last:null,dispatch:null,lastRenderedReducer:S,lastRenderedState:D},S=S.dispatch=gg.bind(null,Ha,S),[j.memoizedState,S]},useRef:function(S){var D=TA();return S={current:S},D.memoizedState=S},useState:ug,useDebugValue:hg,useResponder:lg,useDeferredValue:function(S,D){var T=ug(S),j=T[0],Y=T[1];return Ct(function(){a.unstable_next(function(){var Ae=Hs.suspense;Hs.suspense=D===void 0?null:D;try{Y(S)}finally{Hs.suspense=Ae}})},[S,D]),j},useTransition:function(S){var D=ug(!1),T=D[0],j=D[1];return[Cu(function(Y){j(!0),a.unstable_next(function(){var Ae=Hs.suspense;Hs.suspense=S===void 0?null:S;try{j(!1),Y()}finally{Hs.suspense=Ae}})},[S,T]),T]}},km={readContext:ms,useCallback:xm,useContext:ms,useEffect:bm,useImperativeHandle:function(S,D,T){return T=T!=null?T.concat([S]):null,Ic(4,36,pg.bind(null,D,S),T)},useLayoutEffect:function(S,D){return Ic(4,36,S,D)},useMemo:function(S,D){var T=pp();D=D===void 0?null:D;var j=T.memoizedState;return j!==null&&D!==null&&Eu(D,j[1])?j[0]:(S=S(),T.memoizedState=[S,D],S)},useReducer:Cs,useRef:function(){return pp().memoizedState},useState:Ag,useDebugValue:hg,useResponder:lg,useDeferredValue:function(S,D){var T=Ag(S),j=T[0],Y=T[1];return bm(function(){a.unstable_next(function(){var Ae=Hs.suspense;Hs.suspense=D===void 0?null:D;try{Y(S)}finally{Hs.suspense=Ae}})},[S,D]),j},useTransition:function(S){var D=Ag(!1),T=D[0],j=D[1];return[xm(function(Y){j(!0),a.unstable_next(function(){var Ae=Hs.suspense;Hs.suspense=S===void 0?null:S;try{j(!1),Y()}finally{Hs.suspense=Ae}})},[S,T]),T]}},Aa=null,Bc=null,Il=!1;function Iu(S,D){var T=Dl(5,null,null,0);T.elementType="DELETED",T.type="DELETED",T.stateNode=D,T.return=S,T.effectTag=8,S.lastEffect!==null?(S.lastEffect.nextEffect=T,S.lastEffect=T):S.firstEffect=S.lastEffect=T}function dg(S,D){switch(S.tag){case 5:return D=io(D,S.type,S.pendingProps),D!==null?(S.stateNode=D,!0):!1;case 6:return D=Pi(D,S.pendingProps),D!==null?(S.stateNode=D,!0):!1;case 13:return!1;default:return!1}}function NA(S){if(Il){var D=Bc;if(D){var T=D;if(!dg(S,D)){if(D=cc(T),!D||!dg(S,D)){S.effectTag=S.effectTag&-1025|2,Il=!1,Aa=S;return}Iu(Aa,T)}Aa=S,Bc=cu(D)}else S.effectTag=S.effectTag&-1025|2,Il=!1,Aa=S}}function gp(S){for(S=S.return;S!==null&&S.tag!==5&&S.tag!==3&&S.tag!==13;)S=S.return;Aa=S}function ja(S){if(!y||S!==Aa)return!1;if(!Il)return gp(S),Il=!0,!1;var D=S.type;if(S.tag!==5||D!=="head"&&D!=="body"&&!ke(D,S.memoizedProps))for(D=Bc;D;)Iu(S,D),D=cc(D);if(gp(S),S.tag===13){if(!y)throw Error(n(316));if(S=S.memoizedState,S=S!==null?S.dehydrated:null,!S)throw Error(n(317));Bc=Os(S)}else Bc=Aa?cc(S.stateNode):null;return!0}function mg(){y&&(Bc=Aa=null,Il=!1)}var dp=u.ReactCurrentOwner,Go=!1;function ws(S,D,T,j){D.child=S===null?sg(D,null,T,j):gu(D,S.child,T,j)}function Ii(S,D,T,j,Y){T=T.render;var Ae=D.ref;return ds(D,Y),j=cg(S,D,T,j,Ae,Y),S!==null&&!Go?(D.updateQueue=S.updateQueue,D.effectTag&=-517,S.expirationTime<=Y&&(S.expirationTime=0),si(S,D,Y)):(D.effectTag|=1,ws(S,D,j,Y),D.child)}function Qm(S,D,T,j,Y,Ae){if(S===null){var De=T.type;return typeof De=="function"&&!Qw(De)&&De.defaultProps===void 0&&T.compare===null&&T.defaultProps===void 0?(D.tag=15,D.type=De,Fm(S,D,De,j,Y,Ae)):(S=jm(T.type,null,j,null,D.mode,Ae),S.ref=D.ref,S.return=D,D.child=S)}return De=S.child,Y<Ae&&(Y=De.memoizedProps,T=T.compare,T=T!==null?T:Fn,T(Y,j)&&S.ref===D.ref)?si(S,D,Ae):(D.effectTag|=1,S=WA(De,j,Ae),S.ref=D.ref,S.return=D,D.child=S)}function Fm(S,D,T,j,Y,Ae){return S!==null&&Fn(S.memoizedProps,j)&&S.ref===D.ref&&(Go=!1,Y<Ae)?si(S,D,Ae):LA(S,D,T,j,Ae)}function qo(S,D){var T=D.ref;(S===null&&T!==null||S!==null&&S.ref!==T)&&(D.effectTag|=128)}function LA(S,D,T,j,Y){var Ae=ii(T)?tr:Mn.current;return Ae=Oe(D,Ae),ds(D,Y),T=cg(S,D,T,j,Ae,Y),S!==null&&!Go?(D.updateQueue=S.updateQueue,D.effectTag&=-517,S.expirationTime<=Y&&(S.expirationTime=0),si(S,D,Y)):(D.effectTag|=1,ws(S,D,T,Y),D.child)}function mp(S,D,T,j,Y){if(ii(T)){var Ae=!0;Ac(D)}else Ae=!1;if(ds(D,Y),D.stateNode===null)S!==null&&(S.alternate=null,D.alternate=null,D.effectTag|=2),es(D,T,j,Y),jo(D,T,j,Y),j=!0;else if(S===null){var De=D.stateNode,vt=D.memoizedProps;De.props=vt;var wt=De.context,xt=T.contextType;typeof xt=="object"&&xt!==null?xt=ms(xt):(xt=ii(T)?tr:Mn.current,xt=Oe(D,xt));var _r=T.getDerivedStateFromProps,is=typeof _r=="function"||typeof De.getSnapshotBeforeUpdate=="function";is||typeof De.UNSAFE_componentWillReceiveProps!="function"&&typeof De.componentWillReceiveProps!="function"||(vt!==j||wt!==xt)&&bi(D,De,j,xt),_s=!1;var di=D.memoizedState;wt=De.state=di;var po=D.updateQueue;po!==null&&(ye(D,po,j,De,Y),wt=D.memoizedState),vt!==j||di!==wt||_i.current||_s?(typeof _r=="function"&&(er(D,T,_r,j),wt=D.memoizedState),(vt=_s||Gi(D,T,vt,j,di,wt,xt))?(is||typeof De.UNSAFE_componentWillMount!="function"&&typeof De.componentWillMount!="function"||(typeof De.componentWillMount=="function"&&De.componentWillMount(),typeof De.UNSAFE_componentWillMount=="function"&&De.UNSAFE_componentWillMount()),typeof De.componentDidMount=="function"&&(D.effectTag|=4)):(typeof De.componentDidMount=="function"&&(D.effectTag|=4),D.memoizedProps=j,D.memoizedState=wt),De.props=j,De.state=wt,De.context=xt,j=vt):(typeof De.componentDidMount=="function"&&(D.effectTag|=4),j=!1)}else De=D.stateNode,vt=D.memoizedProps,De.props=D.type===D.elementType?vt:Ci(D.type,vt),wt=De.context,xt=T.contextType,typeof xt=="object"&&xt!==null?xt=ms(xt):(xt=ii(T)?tr:Mn.current,xt=Oe(D,xt)),_r=T.getDerivedStateFromProps,(is=typeof _r=="function"||typeof De.getSnapshotBeforeUpdate=="function")||typeof De.UNSAFE_componentWillReceiveProps!="function"&&typeof De.componentWillReceiveProps!="function"||(vt!==j||wt!==xt)&&bi(D,De,j,xt),_s=!1,wt=D.memoizedState,di=De.state=wt,po=D.updateQueue,po!==null&&(ye(D,po,j,De,Y),di=D.memoizedState),vt!==j||wt!==di||_i.current||_s?(typeof _r=="function"&&(er(D,T,_r,j),di=D.memoizedState),(_r=_s||Gi(D,T,vt,j,wt,di,xt))?(is||typeof De.UNSAFE_componentWillUpdate!="function"&&typeof De.componentWillUpdate!="function"||(typeof De.componentWillUpdate=="function"&&De.componentWillUpdate(j,di,xt),typeof De.UNSAFE_componentWillUpdate=="function"&&De.UNSAFE_componentWillUpdate(j,di,xt)),typeof De.componentDidUpdate=="function"&&(D.effectTag|=4),typeof De.getSnapshotBeforeUpdate=="function"&&(D.effectTag|=256)):(typeof De.componentDidUpdate!="function"||vt===S.memoizedProps&&wt===S.memoizedState||(D.effectTag|=4),typeof De.getSnapshotBeforeUpdate!="function"||vt===S.memoizedProps&&wt===S.memoizedState||(D.effectTag|=256),D.memoizedProps=j,D.memoizedState=di),De.props=j,De.state=di,De.context=xt,j=_r):(typeof De.componentDidUpdate!="function"||vt===S.memoizedProps&&wt===S.memoizedState||(D.effectTag|=4),typeof De.getSnapshotBeforeUpdate!="function"||vt===S.memoizedProps&&wt===S.memoizedState||(D.effectTag|=256),j=!1);return yp(S,D,T,j,Ae,Y)}function yp(S,D,T,j,Y,Ae){qo(S,D);var De=(D.effectTag&64)!==0;if(!j&&!De)return Y&&El(D,T,!1),si(S,D,Ae);j=D.stateNode,dp.current=D;var vt=De&&typeof T.getDerivedStateFromError!="function"?null:j.render();return D.effectTag|=1,S!==null&&De?(D.child=gu(D,S.child,null,Ae),D.child=gu(D,null,vt,Ae)):ws(S,D,vt,Ae),D.memoizedState=j.state,Y&&El(D,T,!0),D.child}function yg(S){var D=S.stateNode;D.pendingContext?uc(S,D.pendingContext,D.pendingContext!==D.context):D.context&&uc(S,D.context,!1),og(S,D.containerInfo)}var fa={dehydrated:null,retryTime:0};function ln(S,D,T){var j=D.mode,Y=D.pendingProps,Ae=$n.current,De=!1,vt;if((vt=(D.effectTag&64)!==0)||(vt=(Ae&2)!==0&&(S===null||S.memoizedState!==null)),vt?(De=!0,D.effectTag&=-65):S!==null&&S.memoizedState===null||Y.fallback===void 0||Y.unstable_avoidThisFallback===!0||(Ae|=1),On($n,Ae&1,D),S===null){if(Y.fallback!==void 0&&NA(D),De){if(De=Y.fallback,Y=bu(null,j,0,null),Y.return=D,(D.mode&2)===0)for(S=D.memoizedState!==null?D.child.child:D.child,Y.child=S;S!==null;)S.return=Y,S=S.sibling;return T=bu(De,j,T,null),T.return=D,Y.sibling=T,D.memoizedState=fa,D.child=Y,T}return j=Y.children,D.memoizedState=null,D.child=sg(D,null,j,T)}if(S.memoizedState!==null){if(S=S.child,j=S.sibling,De){if(Y=Y.fallback,T=WA(S,S.pendingProps,0),T.return=D,(D.mode&2)===0&&(De=D.memoizedState!==null?D.child.child:D.child,De!==S.child))for(T.child=De;De!==null;)De.return=T,De=De.sibling;return j=WA(j,Y,j.expirationTime),j.return=D,T.sibling=j,T.childExpirationTime=0,D.memoizedState=fa,D.child=T,j}return T=gu(D,S.child,Y.children,T),D.memoizedState=null,D.child=T}if(S=S.child,De){if(De=Y.fallback,Y=bu(null,j,0,null),Y.return=D,Y.child=S,S!==null&&(S.return=Y),(D.mode&2)===0)for(S=D.memoizedState!==null?D.child.child:D.child,Y.child=S;S!==null;)S.return=Y,S=S.sibling;return T=bu(De,j,T,null),T.return=D,Y.sibling=T,T.effectTag|=2,Y.childExpirationTime=0,D.memoizedState=fa,D.child=Y,T}return D.memoizedState=null,D.child=gu(D,S,Y.children,T)}function Ao(S,D){S.expirationTime<D&&(S.expirationTime=D);var T=S.alternate;T!==null&&T.expirationTime<D&&(T.expirationTime=D),gs(S.return,D)}function OA(S,D,T,j,Y,Ae){var De=S.memoizedState;De===null?S.memoizedState={isBackwards:D,rendering:null,last:j,tail:T,tailExpiration:0,tailMode:Y,lastEffect:Ae}:(De.isBackwards=D,De.rendering=null,De.last=j,De.tail=T,De.tailExpiration=0,De.tailMode=Y,De.lastEffect=Ae)}function Ga(S,D,T){var j=D.pendingProps,Y=j.revealOrder,Ae=j.tail;if(ws(S,D,j.children,T),j=$n.current,(j&2)!==0)j=j&1|2,D.effectTag|=64;else{if(S!==null&&(S.effectTag&64)!==0)e:for(S=D.child;S!==null;){if(S.tag===13)S.memoizedState!==null&&Ao(S,T);else if(S.tag===19)Ao(S,T);else if(S.child!==null){S.child.return=S,S=S.child;continue}if(S===D)break e;for(;S.sibling===null;){if(S.return===null||S.return===D)break e;S=S.return}S.sibling.return=S.return,S=S.sibling}j&=1}if(On($n,j,D),(D.mode&2)===0)D.memoizedState=null;else switch(Y){case"forwards":for(T=D.child,Y=null;T!==null;)S=T.alternate,S!==null&&fp(S)===null&&(Y=T),T=T.sibling;T=Y,T===null?(Y=D.child,D.child=null):(Y=T.sibling,T.sibling=null),OA(D,!1,Y,T,Ae,D.lastEffect);break;case"backwards":for(T=null,Y=D.child,D.child=null;Y!==null;){if(S=Y.alternate,S!==null&&fp(S)===null){D.child=Y;break}S=Y.sibling,Y.sibling=T,T=Y,Y=S}OA(D,!0,T,null,Ae,D.lastEffect);break;case"together":OA(D,!1,null,null,void 0,D.lastEffect);break;default:D.memoizedState=null}return D.child}function si(S,D,T){S!==null&&(D.dependencies=S.dependencies);var j=D.expirationTime;if(j!==0&&Hm(j),D.childExpirationTime<T)return null;if(S!==null&&D.child!==S.child)throw Error(n(153));if(D.child!==null){for(S=D.child,T=WA(S,S.pendingProps,S.expirationTime),D.child=T,T.return=D;S.sibling!==null;)S=S.sibling,T=T.sibling=WA(S,S.pendingProps,S.expirationTime),T.return=D;T.sibling=null}return D.child}function pa(S){S.effectTag|=4}var vc,Bl,ts,qr;if(w)vc=function(S,D){for(var T=D.child;T!==null;){if(T.tag===5||T.tag===6)H(S,T.stateNode);else if(T.tag!==4&&T.child!==null){T.child.return=T,T=T.child;continue}if(T===D)break;for(;T.sibling===null;){if(T.return===null||T.return===D)return;T=T.return}T.sibling.return=T.return,T=T.sibling}},Bl=function(){},ts=function(S,D,T,j,Y){if(S=S.memoizedProps,S!==j){var Ae=D.stateNode,De=ca(uo.current);T=Re(Ae,T,S,j,Y,De),(D.updateQueue=T)&&pa(D)}},qr=function(S,D,T,j){T!==j&&pa(D)};else if(P){vc=function(S,D,T,j){for(var Y=D.child;Y!==null;){if(Y.tag===5){var Ae=Y.stateNode;T&&j&&(Ae=Ti(Ae,Y.type,Y.memoizedProps,Y)),H(S,Ae)}else if(Y.tag===6)Ae=Y.stateNode,T&&j&&(Ae=ps(Ae,Y.memoizedProps,Y)),H(S,Ae);else if(Y.tag!==4){if(Y.tag===13&&(Y.effectTag&4)!==0&&(Ae=Y.memoizedState!==null)){var De=Y.child;if(De!==null&&(De.child!==null&&(De.child.return=De,vc(S,De,!0,Ae)),Ae=De.sibling,Ae!==null)){Ae.return=Y,Y=Ae;continue}}if(Y.child!==null){Y.child.return=Y,Y=Y.child;continue}}if(Y===D)break;for(;Y.sibling===null;){if(Y.return===null||Y.return===D)return;Y=Y.return}Y.sibling.return=Y.return,Y=Y.sibling}};var Ep=function(S,D,T,j){for(var Y=D.child;Y!==null;){if(Y.tag===5){var Ae=Y.stateNode;T&&j&&(Ae=Ti(Ae,Y.type,Y.memoizedProps,Y)),Wr(S,Ae)}else if(Y.tag===6)Ae=Y.stateNode,T&&j&&(Ae=ps(Ae,Y.memoizedProps,Y)),Wr(S,Ae);else if(Y.tag!==4){if(Y.tag===13&&(Y.effectTag&4)!==0&&(Ae=Y.memoizedState!==null)){var De=Y.child;if(De!==null&&(De.child!==null&&(De.child.return=De,Ep(S,De,!0,Ae)),Ae=De.sibling,Ae!==null)){Ae.return=Y,Y=Ae;continue}}if(Y.child!==null){Y.child.return=Y,Y=Y.child;continue}}if(Y===D)break;for(;Y.sibling===null;){if(Y.return===null||Y.return===D)return;Y=Y.return}Y.sibling.return=Y.return,Y=Y.sibling}};Bl=function(S){var D=S.stateNode;if(S.firstEffect!==null){var T=D.containerInfo,j=br(T);Ep(j,S,!1,!1),D.pendingChildren=j,pa(S),Kn(T,j)}},ts=function(S,D,T,j,Y){var Ae=S.stateNode,De=S.memoizedProps;if((S=D.firstEffect===null)&&De===j)D.stateNode=Ae;else{var vt=D.stateNode,wt=ca(uo.current),xt=null;De!==j&&(xt=Re(vt,T,De,j,Y,wt)),S&&xt===null?D.stateNode=Ae:(Ae=mr(Ae,xt,T,De,j,D,S,vt),at(Ae,T,j,Y,wt)&&pa(D),D.stateNode=Ae,S?pa(D):vc(Ae,D,!1,!1))}},qr=function(S,D,T,j){T!==j&&(S=ca(mc.current),T=ca(uo.current),D.stateNode=He(j,S,T,D),pa(D))}}else Bl=function(){},ts=function(){},qr=function(){};function Dc(S,D){switch(S.tailMode){case"hidden":D=S.tail;for(var T=null;D!==null;)D.alternate!==null&&(T=D),D=D.sibling;T===null?S.tail=null:T.sibling=null;break;case"collapsed":T=S.tail;for(var j=null;T!==null;)T.alternate!==null&&(j=T),T=T.sibling;j===null?D||S.tail===null?S.tail=null:S.tail.sibling=null:j.sibling=null}}function Cw(S){switch(S.tag){case 1:ii(S.type)&&Ma(S);var D=S.effectTag;return D&4096?(S.effectTag=D&-4097|64,S):null;case 3:if(yc(S),hr(S),D=S.effectTag,(D&64)!==0)throw Error(n(285));return S.effectTag=D&-4097|64,S;case 5:return ag(S),null;case 13:return Vn($n,S),D=S.effectTag,D&4096?(S.effectTag=D&-4097|64,S):null;case 19:return Vn($n,S),null;case 4:return yc(S),null;case 10:return wi(S),null;default:return null}}function Eg(S,D){return{value:S,source:D,stack:ml(D)}}var Cg=typeof WeakSet=="function"?WeakSet:Set;function qa(S,D){var T=D.source,j=D.stack;j===null&&T!==null&&(j=ml(T)),T!==null&&he(T.type),D=D.value,S!==null&&S.tag===1&&he(S.type);try{console.error(D)}catch(Y){setTimeout(function(){throw Y})}}function Rm(S,D){try{D.props=S.memoizedProps,D.state=S.memoizedState,D.componentWillUnmount()}catch(T){YA(S,T)}}function wg(S){var D=S.ref;if(D!==null)if(typeof D=="function")try{D(null)}catch(T){YA(S,T)}else D.current=null}function Qt(S,D){switch(D.tag){case 0:case 11:case 15:N(2,0,D);break;case 1:if(D.effectTag&256&&S!==null){var T=S.memoizedProps,j=S.memoizedState;S=D.stateNode,D=S.getSnapshotBeforeUpdate(D.elementType===D.type?T:Ci(D.type,T),j),S.__reactInternalSnapshotBeforeUpdate=D}break;case 3:case 5:case 6:case 4:case 17:break;default:throw Error(n(163))}}function N(S,D,T){if(T=T.updateQueue,T=T!==null?T.lastEffect:null,T!==null){var j=T=T.next;do{if((j.tag&S)!==0){var Y=j.destroy;j.destroy=void 0,Y!==void 0&&Y()}(j.tag&D)!==0&&(Y=j.create,j.destroy=Y()),j=j.next}while(j!==T)}}function K(S,D,T){switch(typeof kw=="function"&&kw(D),D.tag){case 0:case 11:case 14:case 15:if(S=D.updateQueue,S!==null&&(S=S.lastEffect,S!==null)){var j=S.next;lo(97<T?97:T,function(){var Y=j;do{var Ae=Y.destroy;if(Ae!==void 0){var De=D;try{Ae()}catch(vt){YA(De,vt)}}Y=Y.next}while(Y!==j)})}break;case 1:wg(D),T=D.stateNode,typeof T.componentWillUnmount=="function"&&Rm(D,T);break;case 5:wg(D);break;case 4:w?Cr(S,D,T):P&&ze(D)}}function re(S,D,T){for(var j=D;;)if(K(S,j,T),j.child===null||w&&j.tag===4){if(j===D)break;for(;j.sibling===null;){if(j.return===null||j.return===D)return;j=j.return}j.sibling.return=j.return,j=j.sibling}else j.child.return=j,j=j.child}function pe(S){var D=S.alternate;S.return=null,S.child=null,S.memoizedState=null,S.updateQueue=null,S.dependencies=null,S.alternate=null,S.firstEffect=null,S.lastEffect=null,S.pendingProps=null,S.memoizedProps=null,D!==null&&pe(D)}function ze(S){if(P){S=S.stateNode.containerInfo;var D=br(S);Ns(S,D)}}function mt(S){return S.tag===5||S.tag===3||S.tag===4}function fr(S){if(w){e:{for(var D=S.return;D!==null;){if(mt(D)){var T=D;break e}D=D.return}throw Error(n(160))}switch(D=T.stateNode,T.tag){case 5:var j=!1;break;case 3:D=D.containerInfo,j=!0;break;case 4:D=D.containerInfo,j=!0;break;default:throw Error(n(161))}T.effectTag&16&&(Gt(D),T.effectTag&=-17);e:t:for(T=S;;){for(;T.sibling===null;){if(T.return===null||mt(T.return)){T=null;break e}T=T.return}for(T.sibling.return=T.return,T=T.sibling;T.tag!==5&&T.tag!==6&&T.tag!==18;){if(T.effectTag&2||T.child===null||T.tag===4)continue t;T.child.return=T,T=T.child}if(!(T.effectTag&2)){T=T.stateNode;break e}}for(var Y=S;;){var Ae=Y.tag===5||Y.tag===6;if(Ae)Ae=Ae?Y.stateNode:Y.stateNode.instance,T?j?Ne(D,Ae,T):Pe(D,Ae,T):j?z(D,Ae):F(D,Ae);else if(Y.tag!==4&&Y.child!==null){Y.child.return=Y,Y=Y.child;continue}if(Y===S)break;for(;Y.sibling===null;){if(Y.return===null||Y.return===S)return;Y=Y.return}Y.sibling.return=Y.return,Y=Y.sibling}}}function Cr(S,D,T){for(var j=D,Y=!1,Ae,De;;){if(!Y){Y=j.return;e:for(;;){if(Y===null)throw Error(n(160));switch(Ae=Y.stateNode,Y.tag){case 5:De=!1;break e;case 3:Ae=Ae.containerInfo,De=!0;break e;case 4:Ae=Ae.containerInfo,De=!0;break e}Y=Y.return}Y=!0}if(j.tag===5||j.tag===6)re(S,j,T),De?dt(Ae,j.stateNode):ot(Ae,j.stateNode);else if(j.tag===4){if(j.child!==null){Ae=j.stateNode.containerInfo,De=!0,j.child.return=j,j=j.child;continue}}else if(K(S,j,T),j.child!==null){j.child.return=j,j=j.child;continue}if(j===D)break;for(;j.sibling===null;){if(j.return===null||j.return===D)return;j=j.return,j.tag===4&&(Y=!1)}j.sibling.return=j.return,j=j.sibling}}function yn(S,D){if(w)switch(D.tag){case 0:case 11:case 14:case 15:N(4,8,D);break;case 1:break;case 5:var T=D.stateNode;if(T!=null){var j=D.memoizedProps;S=S!==null?S.memoizedProps:j;var Y=D.type,Ae=D.updateQueue;D.updateQueue=null,Ae!==null&&ie(T,Ae,Y,S,j,D)}break;case 6:if(D.stateNode===null)throw Error(n(162));T=D.memoizedProps,X(D.stateNode,S!==null?S.memoizedProps:T,T);break;case 3:y&&(D=D.stateNode,D.hydrate&&(D.hydrate=!1,Dn(D.containerInfo)));break;case 12:break;case 13:oi(D),Oi(D);break;case 19:Oi(D);break;case 17:break;case 20:break;case 21:break;default:throw Error(n(163))}else{switch(D.tag){case 0:case 11:case 14:case 15:N(4,8,D);return;case 12:return;case 13:oi(D),Oi(D);return;case 19:Oi(D);return;case 3:y&&(T=D.stateNode,T.hydrate&&(T.hydrate=!1,Dn(T.containerInfo)))}e:if(P)switch(D.tag){case 1:case 5:case 6:case 20:break e;case 3:case 4:D=D.stateNode,Ns(D.containerInfo,D.pendingChildren);break e;default:throw Error(n(163))}}}function oi(S){var D=S;if(S.memoizedState===null)var T=!1;else T=!0,D=S.child,Bw=Li();if(w&&D!==null){e:if(S=D,w)for(D=S;;){if(D.tag===5){var j=D.stateNode;T?$t(j):an(D.stateNode,D.memoizedProps)}else if(D.tag===6)j=D.stateNode,T?bt(j):Qr(j,D.memoizedProps);else if(D.tag===13&&D.memoizedState!==null&&D.memoizedState.dehydrated===null){j=D.child.sibling,j.return=D,D=j;continue}else if(D.child!==null){D.child.return=D,D=D.child;continue}if(D===S)break e;for(;D.sibling===null;){if(D.return===null||D.return===S)break e;D=D.return}D.sibling.return=D.return,D=D.sibling}}}function Oi(S){var D=S.updateQueue;if(D!==null){S.updateQueue=null;var T=S.stateNode;T===null&&(T=S.stateNode=new Cg),D.forEach(function(j){var Y=yF.bind(null,S,j);T.has(j)||(T.add(j),j.then(Y,Y))})}}var Ig=typeof WeakMap=="function"?WeakMap:Map;function qv(S,D,T){T=ys(T,null),T.tag=3,T.payload={element:null};var j=D.value;return T.callback=function(){vu||(vu=!0,Mm=j),qa(S,D)},T}function Yv(S,D,T){T=ys(T,null),T.tag=3;var j=S.type.getDerivedStateFromError;if(typeof j=="function"){var Y=D.value;T.payload=function(){return qa(S,D),j(Y)}}var Ae=S.stateNode;return Ae!==null&&typeof Ae.componentDidCatch=="function"&&(T.callback=function(){typeof j!="function"&&(Du===null?Du=new Set([this]):Du.add(this),qa(S,D));var De=D.stack;this.componentDidCatch(D.value,{componentStack:De!==null?De:""})}),T}var ww=Math.ceil,Cp=u.ReactCurrentDispatcher,Iw=u.ReactCurrentOwner,En=0,Tm=8,rs=16,js=32,Bu=0,Nm=1,Bi=2,ha=3,vl=4,Sc=5,yr=En,gi=null,Or=null,ns=0,Yi=Bu,Lm=null,Ya=1073741823,MA=1073741823,Om=null,wp=0,UA=!1,Bw=0,vw=500,sr=null,vu=!1,Mm=null,Du=null,Ip=!1,Bg=null,_A=90,HA=null,vg=0,Dw=null,Um=0;function ga(){return(yr&(rs|js))!==En?1073741821-(Li()/10|0):Um!==0?Um:Um=1073741821-(Li()/10|0)}function jA(S,D,T){if(D=D.mode,(D&2)===0)return 1073741823;var j=_o();if((D&4)===0)return j===99?1073741823:1073741822;if((yr&rs)!==En)return ns;if(T!==null)S=Ua(S,T.timeoutMs|0||5e3,250);else switch(j){case 99:S=1073741823;break;case 98:S=Ua(S,150,100);break;case 97:case 96:S=Ua(S,5e3,250);break;case 95:S=2;break;default:throw Error(n(326))}return gi!==null&&S===ns&&--S,S}function Pc(S,D){if(50<vg)throw vg=0,Dw=null,Error(n(185));if(S=Dg(S,D),S!==null){var T=_o();D===1073741823?(yr&Tm)!==En&&(yr&(rs|js))===En?Sw(S):(fo(S),yr===En&&ji()):fo(S),(yr&4)===En||T!==98&&T!==99||(HA===null?HA=new Map([[S,D]]):(T=HA.get(S),(T===void 0||T>D)&&HA.set(S,D)))}}function Dg(S,D){S.expirationTime<D&&(S.expirationTime=D);var T=S.alternate;T!==null&&T.expirationTime<D&&(T.expirationTime=D);var j=S.return,Y=null;if(j===null&&S.tag===3)Y=S.stateNode;else for(;j!==null;){if(T=j.alternate,j.childExpirationTime<D&&(j.childExpirationTime=D),T!==null&&T.childExpirationTime<D&&(T.childExpirationTime=D),j.return===null&&j.tag===3){Y=j.stateNode;break}j=j.return}return Y!==null&&(gi===Y&&(Hm(D),Yi===vl&&KA(Y,ns)),eD(Y,D)),Y}function _m(S){var D=S.lastExpiredTime;return D!==0||(D=S.firstPendingTime,!$v(S,D))?D:(D=S.lastPingedTime,S=S.nextKnownPendingLevel,D>S?D:S)}function fo(S){if(S.lastExpiredTime!==0)S.callbackExpirationTime=1073741823,S.callbackPriority=99,S.callbackNode=pu(Sw.bind(null,S));else{var D=_m(S),T=S.callbackNode;if(D===0)T!==null&&(S.callbackNode=null,S.callbackExpirationTime=0,S.callbackPriority=90);else{var j=ga();if(D===1073741823?j=99:D===1||D===2?j=95:(j=10*(1073741821-D)-10*(1073741821-j),j=0>=j?99:250>=j?98:5250>=j?97:95),T!==null){var Y=S.callbackPriority;if(S.callbackExpirationTime===D&&Y>=j)return;T!==PA&&Ce(T)}S.callbackExpirationTime=D,S.callbackPriority=j,D=D===1073741823?pu(Sw.bind(null,S)):gc(j,Wv.bind(null,S),{timeout:10*(1073741821-D)-Li()}),S.callbackNode=D}}}function Wv(S,D){if(Um=0,D)return D=ga(),Gm(S,D),fo(S),null;var T=_m(S);if(T!==0){if(D=S.callbackNode,(yr&(rs|js))!==En)throw Error(n(327));if(Bp(),S===gi&&T===ns||Su(S,T),Or!==null){var j=yr;yr|=rs;var Y=qA(S);do try{pF();break}catch(vt){GA(S,vt)}while(1);if(la(),yr=j,Cp.current=Y,Yi===Nm)throw D=Lm,Su(S,T),KA(S,T),fo(S),D;if(Or===null)switch(Y=S.finishedWork=S.current.alternate,S.finishedExpirationTime=T,j=Yi,gi=null,j){case Bu:case Nm:throw Error(n(345));case Bi:Gm(S,2<T?2:T);break;case ha:if(KA(S,T),j=S.lastSuspendedTime,T===j&&(S.nextKnownPendingLevel=bw(Y)),Ya===1073741823&&(Y=Bw+vw-Li(),10<Y)){if(UA){var Ae=S.lastPingedTime;if(Ae===0||Ae>=T){S.lastPingedTime=T,Su(S,T);break}}if(Ae=_m(S),Ae!==0&&Ae!==T)break;if(j!==0&&j!==T){S.lastPingedTime=j;break}S.timeoutHandle=Te(Pu.bind(null,S),Y);break}Pu(S);break;case vl:if(KA(S,T),j=S.lastSuspendedTime,T===j&&(S.nextKnownPendingLevel=bw(Y)),UA&&(Y=S.lastPingedTime,Y===0||Y>=T)){S.lastPingedTime=T,Su(S,T);break}if(Y=_m(S),Y!==0&&Y!==T)break;if(j!==0&&j!==T){S.lastPingedTime=j;break}if(MA!==1073741823?j=10*(1073741821-MA)-Li():Ya===1073741823?j=0:(j=10*(1073741821-Ya)-5e3,Y=Li(),T=10*(1073741821-T)-Y,j=Y-j,0>j&&(j=0),j=(120>j?120:480>j?480:1080>j?1080:1920>j?1920:3e3>j?3e3:4320>j?4320:1960*ww(j/1960))-j,T<j&&(j=T)),10<j){S.timeoutHandle=Te(Pu.bind(null,S),j);break}Pu(S);break;case Sc:if(Ya!==1073741823&&Om!==null){Ae=Ya;var De=Om;if(j=De.busyMinDurationMs|0,0>=j?j=0:(Y=De.busyDelayMs|0,Ae=Li()-(10*(1073741821-Ae)-(De.timeoutMs|0||5e3)),j=Ae<=Y?0:Y+j-Ae),10<j){KA(S,T),S.timeoutHandle=Te(Pu.bind(null,S),j);break}}Pu(S);break;default:throw Error(n(329))}if(fo(S),S.callbackNode===D)return Wv.bind(null,S)}}return null}function Sw(S){var D=S.lastExpiredTime;if(D=D!==0?D:1073741823,S.finishedExpirationTime===D)Pu(S);else{if((yr&(rs|js))!==En)throw Error(n(327));if(Bp(),S===gi&&D===ns||Su(S,D),Or!==null){var T=yr;yr|=rs;var j=qA(S);do try{fF();break}catch(Y){GA(S,Y)}while(1);if(la(),yr=T,Cp.current=j,Yi===Nm)throw T=Lm,Su(S,D),KA(S,D),fo(S),T;if(Or!==null)throw Error(n(261));S.finishedWork=S.current.alternate,S.finishedExpirationTime=D,gi=null,Pu(S),fo(S)}}return null}function Kv(S,D){Gm(S,D),fo(S),(yr&(rs|js))===En&&ji()}function AF(){if(HA!==null){var S=HA;HA=null,S.forEach(function(D,T){Gm(T,D),fo(T)}),ji()}}function Vv(S,D){if((yr&(rs|js))!==En)throw Error(n(187));var T=yr;yr|=1;try{return lo(99,S.bind(null,D))}finally{yr=T,ji()}}function Su(S,D){S.finishedWork=null,S.finishedExpirationTime=0;var T=S.timeoutHandle;if(T!==je&&(S.timeoutHandle=je,Je(T)),Or!==null)for(T=Or.return;T!==null;){var j=T;switch(j.tag){case 1:var Y=j.type.childContextTypes;Y!=null&&Ma(j);break;case 3:yc(j),hr(j);break;case 5:ag(j);break;case 4:yc(j);break;case 13:Vn($n,j);break;case 19:Vn($n,j);break;case 10:wi(j)}T=T.return}gi=S,Or=WA(S.current,null,D),ns=D,Yi=Bu,Lm=null,MA=Ya=1073741823,Om=null,wp=0,UA=!1}function GA(S,D){do{try{if(la(),yw(),Or===null||Or.return===null)return Yi=Nm,Lm=D,null;e:{var T=S,j=Or.return,Y=Or,Ae=D;if(D=ns,Y.effectTag|=2048,Y.firstEffect=Y.lastEffect=null,Ae!==null&&typeof Ae=="object"&&typeof Ae.then=="function"){var De=Ae,vt=($n.current&1)!==0,wt=j;do{var xt;if(xt=wt.tag===13){var _r=wt.memoizedState;if(_r!==null)xt=_r.dehydrated!==null;else{var is=wt.memoizedProps;xt=is.fallback===void 0?!1:is.unstable_avoidThisFallback!==!0?!0:!vt}}if(xt){var di=wt.updateQueue;if(di===null){var po=new Set;po.add(De),wt.updateQueue=po}else di.add(De);if((wt.mode&2)===0){if(wt.effectTag|=64,Y.effectTag&=-2981,Y.tag===1)if(Y.alternate===null)Y.tag=17;else{var VA=ys(1073741823,null);VA.tag=2,tt(Y,VA)}Y.expirationTime=1073741823;break e}Ae=void 0,Y=D;var Yo=T.pingCache;if(Yo===null?(Yo=T.pingCache=new Ig,Ae=new Set,Yo.set(De,Ae)):(Ae=Yo.get(De),Ae===void 0&&(Ae=new Set,Yo.set(De,Ae))),!Ae.has(Y)){Ae.add(Y);var rt=mF.bind(null,T,De,Y);De.then(rt,rt)}wt.effectTag|=4096,wt.expirationTime=D;break e}wt=wt.return}while(wt!==null);Ae=Error((he(Y.type)||"A React component")+` suspended while rendering, but no fallback UI was specified.
+
+Add a <Suspense fallback=...> component higher in the tree to provide a loading indicator or placeholder to display.`+ml(Y))}Yi!==Sc&&(Yi=Bi),Ae=Eg(Ae,Y),wt=j;do{switch(wt.tag){case 3:De=Ae,wt.effectTag|=4096,wt.expirationTime=D;var Ve=qv(wt,De,D);It(wt,Ve);break e;case 1:De=Ae;var ft=wt.type,Wt=wt.stateNode;if((wt.effectTag&64)===0&&(typeof ft.getDerivedStateFromError=="function"||Wt!==null&&typeof Wt.componentDidCatch=="function"&&(Du===null||!Du.has(Wt)))){wt.effectTag|=4096,wt.expirationTime=D;var vr=Yv(wt,De,D);It(wt,vr);break e}}wt=wt.return}while(wt!==null)}Or=zv(Or)}catch(Pn){D=Pn;continue}break}while(1)}function qA(){var S=Cp.current;return Cp.current=wu,S===null?wu:S}function Pw(S,D){S<Ya&&2<S&&(Ya=S),D!==null&&S<MA&&2<S&&(MA=S,Om=D)}function Hm(S){S>wp&&(wp=S)}function fF(){for(;Or!==null;)Or=Jv(Or)}function pF(){for(;Or!==null&&!Rt();)Or=Jv(Or)}function Jv(S){var D=Zv(S.alternate,S,ns);return S.memoizedProps=S.pendingProps,D===null&&(D=zv(S)),Iw.current=null,D}function zv(S){Or=S;do{var D=Or.alternate;if(S=Or.return,(Or.effectTag&2048)===0){e:{var T=D;D=Or;var j=ns,Y=D.pendingProps;switch(D.tag){case 2:break;case 16:break;case 15:case 0:break;case 1:ii(D.type)&&Ma(D);break;case 3:yc(D),hr(D),Y=D.stateNode,Y.pendingContext&&(Y.context=Y.pendingContext,Y.pendingContext=null),(T===null||T.child===null)&&ja(D)&&pa(D),Bl(D);break;case 5:ag(D);var Ae=ca(mc.current);if(j=D.type,T!==null&&D.stateNode!=null)ts(T,D,j,Y,Ae),T.ref!==D.ref&&(D.effectTag|=128);else if(Y){if(T=ca(uo.current),ja(D)){if(Y=D,!y)throw Error(n(175));T=lp(Y.stateNode,Y.type,Y.memoizedProps,Ae,T,Y),Y.updateQueue=T,T=T!==null,T&&pa(D)}else{var De=At(j,Y,Ae,T,D);vc(De,D,!1,!1),D.stateNode=De,at(De,j,Y,Ae,T)&&pa(D)}D.ref!==null&&(D.effectTag|=128)}else if(D.stateNode===null)throw Error(n(166));break;case 6:if(T&&D.stateNode!=null)qr(T,D,T.memoizedProps,Y);else{if(typeof Y!="string"&&D.stateNode===null)throw Error(n(166));if(T=ca(mc.current),Ae=ca(uo.current),ja(D)){if(T=D,!y)throw Error(n(176));(T=cp(T.stateNode,T.memoizedProps,T))&&pa(D)}else D.stateNode=He(Y,T,Ae,D)}break;case 11:break;case 13:if(Vn($n,D),Y=D.memoizedState,(D.effectTag&64)!==0){D.expirationTime=j;break e}Y=Y!==null,Ae=!1,T===null?D.memoizedProps.fallback!==void 0&&ja(D):(j=T.memoizedState,Ae=j!==null,Y||j===null||(j=T.child.sibling,j!==null&&(De=D.firstEffect,De!==null?(D.firstEffect=j,j.nextEffect=De):(D.firstEffect=D.lastEffect=j,j.nextEffect=null),j.effectTag=8))),Y&&!Ae&&(D.mode&2)!==0&&(T===null&&D.memoizedProps.unstable_avoidThisFallback!==!0||($n.current&1)!==0?Yi===Bu&&(Yi=ha):((Yi===Bu||Yi===ha)&&(Yi=vl),wp!==0&&gi!==null&&(KA(gi,ns),eD(gi,wp)))),P&&Y&&(D.effectTag|=4),w&&(Y||Ae)&&(D.effectTag|=4);break;case 7:break;case 8:break;case 12:break;case 4:yc(D),Bl(D);break;case 10:wi(D);break;case 9:break;case 14:break;case 17:ii(D.type)&&Ma(D);break;case 19:if(Vn($n,D),Y=D.memoizedState,Y===null)break;if(Ae=(D.effectTag&64)!==0,De=Y.rendering,De===null){if(Ae)Dc(Y,!1);else if(Yi!==Bu||T!==null&&(T.effectTag&64)!==0)for(T=D.child;T!==null;){if(De=fp(T),De!==null){for(D.effectTag|=64,Dc(Y,!1),T=De.updateQueue,T!==null&&(D.updateQueue=T,D.effectTag|=4),Y.lastEffect===null&&(D.firstEffect=null),D.lastEffect=Y.lastEffect,T=j,Y=D.child;Y!==null;)Ae=Y,j=T,Ae.effectTag&=2,Ae.nextEffect=null,Ae.firstEffect=null,Ae.lastEffect=null,De=Ae.alternate,De===null?(Ae.childExpirationTime=0,Ae.expirationTime=j,Ae.child=null,Ae.memoizedProps=null,Ae.memoizedState=null,Ae.updateQueue=null,Ae.dependencies=null):(Ae.childExpirationTime=De.childExpirationTime,Ae.expirationTime=De.expirationTime,Ae.child=De.child,Ae.memoizedProps=De.memoizedProps,Ae.memoizedState=De.memoizedState,Ae.updateQueue=De.updateQueue,j=De.dependencies,Ae.dependencies=j===null?null:{expirationTime:j.expirationTime,firstContext:j.firstContext,responders:j.responders}),Y=Y.sibling;On($n,$n.current&1|2,D),D=D.child;break e}T=T.sibling}}else{if(!Ae)if(T=fp(De),T!==null){if(D.effectTag|=64,Ae=!0,T=T.updateQueue,T!==null&&(D.updateQueue=T,D.effectTag|=4),Dc(Y,!0),Y.tail===null&&Y.tailMode==="hidden"&&!De.alternate){D=D.lastEffect=Y.lastEffect,D!==null&&(D.nextEffect=null);break}}else Li()>Y.tailExpiration&&1<j&&(D.effectTag|=64,Ae=!0,Dc(Y,!1),D.expirationTime=D.childExpirationTime=j-1);Y.isBackwards?(De.sibling=D.child,D.child=De):(T=Y.last,T!==null?T.sibling=De:D.child=De,Y.last=De)}if(Y.tail!==null){Y.tailExpiration===0&&(Y.tailExpiration=Li()+500),T=Y.tail,Y.rendering=T,Y.tail=T.sibling,Y.lastEffect=D.lastEffect,T.sibling=null,Y=$n.current,Y=Ae?Y&1|2:Y&1,On($n,Y,D),D=T;break e}break;case 20:break;case 21:break;default:throw Error(n(156,D.tag))}D=null}if(T=Or,ns===1||T.childExpirationTime!==1){for(Y=0,Ae=T.child;Ae!==null;)j=Ae.expirationTime,De=Ae.childExpirationTime,j>Y&&(Y=j),De>Y&&(Y=De),Ae=Ae.sibling;T.childExpirationTime=Y}if(D!==null)return D;S!==null&&(S.effectTag&2048)===0&&(S.firstEffect===null&&(S.firstEffect=Or.firstEffect),Or.lastEffect!==null&&(S.lastEffect!==null&&(S.lastEffect.nextEffect=Or.firstEffect),S.lastEffect=Or.lastEffect),1<Or.effectTag&&(S.lastEffect!==null?S.lastEffect.nextEffect=Or:S.firstEffect=Or,S.lastEffect=Or))}else{if(D=Cw(Or,ns),D!==null)return D.effectTag&=2047,D;S!==null&&(S.firstEffect=S.lastEffect=null,S.effectTag|=2048)}if(D=Or.sibling,D!==null)return D;Or=S}while(Or!==null);return Yi===Bu&&(Yi=Sc),null}function bw(S){var D=S.expirationTime;return S=S.childExpirationTime,D>S?D:S}function Pu(S){var D=_o();return lo(99,hF.bind(null,S,D)),null}function hF(S,D){do Bp();while(Bg!==null);if((yr&(rs|js))!==En)throw Error(n(327));var T=S.finishedWork,j=S.finishedExpirationTime;if(T===null)return null;if(S.finishedWork=null,S.finishedExpirationTime=0,T===S.current)throw Error(n(177));S.callbackNode=null,S.callbackExpirationTime=0,S.callbackPriority=90,S.nextKnownPendingLevel=0;var Y=bw(T);if(S.firstPendingTime=Y,j<=S.lastSuspendedTime?S.firstSuspendedTime=S.lastSuspendedTime=S.nextKnownPendingLevel=0:j<=S.firstSuspendedTime&&(S.firstSuspendedTime=j-1),j<=S.lastPingedTime&&(S.lastPingedTime=0),j<=S.lastExpiredTime&&(S.lastExpiredTime=0),S===gi&&(Or=gi=null,ns=0),1<T.effectTag?T.lastEffect!==null?(T.lastEffect.nextEffect=T,Y=T.firstEffect):Y=T:Y=T.firstEffect,Y!==null){var Ae=yr;yr|=js,Iw.current=null,Ie(S.containerInfo),sr=Y;do try{gF()}catch(ho){if(sr===null)throw Error(n(330));YA(sr,ho),sr=sr.nextEffect}while(sr!==null);sr=Y;do try{for(var De=S,vt=D;sr!==null;){var wt=sr.effectTag;if(wt&16&&w&&Gt(sr.stateNode),wt&128){var xt=sr.alternate;if(xt!==null){var _r=xt.ref;_r!==null&&(typeof _r=="function"?_r(null):_r.current=null)}}switch(wt&1038){case 2:fr(sr),sr.effectTag&=-3;break;case 6:fr(sr),sr.effectTag&=-3,yn(sr.alternate,sr);break;case 1024:sr.effectTag&=-1025;break;case 1028:sr.effectTag&=-1025,yn(sr.alternate,sr);break;case 4:yn(sr.alternate,sr);break;case 8:var is=De,di=sr,po=vt;w?Cr(is,di,po):re(is,di,po),pe(di)}sr=sr.nextEffect}}catch(ho){if(sr===null)throw Error(n(330));YA(sr,ho),sr=sr.nextEffect}while(sr!==null);Fe(S.containerInfo),S.current=T,sr=Y;do try{for(wt=j;sr!==null;){var VA=sr.effectTag;if(VA&36){var Yo=sr.alternate;switch(xt=sr,_r=wt,xt.tag){case 0:case 11:case 15:N(16,32,xt);break;case 1:var rt=xt.stateNode;if(xt.effectTag&4)if(Yo===null)rt.componentDidMount();else{var Ve=xt.elementType===xt.type?Yo.memoizedProps:Ci(xt.type,Yo.memoizedProps);rt.componentDidUpdate(Ve,Yo.memoizedState,rt.__reactInternalSnapshotBeforeUpdate)}var ft=xt.updateQueue;ft!==null&&Le(xt,ft,rt,_r);break;case 3:var Wt=xt.updateQueue;if(Wt!==null){if(De=null,xt.child!==null)switch(xt.child.tag){case 5:De=le(xt.child.stateNode);break;case 1:De=xt.child.stateNode}Le(xt,Wt,De,_r)}break;case 5:var vr=xt.stateNode;Yo===null&&xt.effectTag&4&&Z(vr,xt.type,xt.memoizedProps,xt);break;case 6:break;case 4:break;case 12:break;case 13:if(y&&xt.memoizedState===null){var Pn=xt.alternate;if(Pn!==null){var Fr=Pn.memoizedState;if(Fr!==null){var bn=Fr.dehydrated;bn!==null&&oo(bn)}}}break;case 19:case 17:case 20:case 21:break;default:throw Error(n(163))}}if(VA&128){xt=void 0;var ai=sr.ref;if(ai!==null){var tn=sr.stateNode;switch(sr.tag){case 5:xt=le(tn);break;default:xt=tn}typeof ai=="function"?ai(xt):ai.current=xt}}sr=sr.nextEffect}}catch(ho){if(sr===null)throw Error(n(330));YA(sr,ho),sr=sr.nextEffect}while(sr!==null);sr=null,Qn(),yr=Ae}else S.current=T;if(Ip)Ip=!1,Bg=S,_A=D;else for(sr=Y;sr!==null;)D=sr.nextEffect,sr.nextEffect=null,sr=D;if(D=S.firstPendingTime,D===0&&(Du=null),D===1073741823?S===Dw?vg++:(vg=0,Dw=S):vg=0,typeof xw=="function"&&xw(T.stateNode,j),fo(S),vu)throw vu=!1,S=Mm,Mm=null,S;return(yr&Tm)!==En||ji(),null}function gF(){for(;sr!==null;){var S=sr.effectTag;(S&256)!==0&&Qt(sr.alternate,sr),(S&512)===0||Ip||(Ip=!0,gc(97,function(){return Bp(),null})),sr=sr.nextEffect}}function Bp(){if(_A!==90){var S=97<_A?97:_A;return _A=90,lo(S,dF)}}function dF(){if(Bg===null)return!1;var S=Bg;if(Bg=null,(yr&(rs|js))!==En)throw Error(n(331));var D=yr;for(yr|=js,S=S.current.firstEffect;S!==null;){try{var T=S;if((T.effectTag&512)!==0)switch(T.tag){case 0:case 11:case 15:N(128,0,T),N(0,64,T)}}catch(j){if(S===null)throw Error(n(330));YA(S,j)}T=S.nextEffect,S.nextEffect=null,S=T}return yr=D,ji(),!0}function Xv(S,D,T){D=Eg(T,D),D=qv(S,D,1073741823),tt(S,D),S=Dg(S,1073741823),S!==null&&fo(S)}function YA(S,D){if(S.tag===3)Xv(S,S,D);else for(var T=S.return;T!==null;){if(T.tag===3){Xv(T,S,D);break}else if(T.tag===1){var j=T.stateNode;if(typeof T.type.getDerivedStateFromError=="function"||typeof j.componentDidCatch=="function"&&(Du===null||!Du.has(j))){S=Eg(D,S),S=Yv(T,S,1073741823),tt(T,S),T=Dg(T,1073741823),T!==null&&fo(T);break}}T=T.return}}function mF(S,D,T){var j=S.pingCache;j!==null&&j.delete(D),gi===S&&ns===T?Yi===vl||Yi===ha&&Ya===1073741823&&Li()-Bw<vw?Su(S,ns):UA=!0:$v(S,T)&&(D=S.lastPingedTime,D!==0&&D<T||(S.lastPingedTime=T,S.finishedExpirationTime===T&&(S.finishedExpirationTime=0,S.finishedWork=null),fo(S)))}function yF(S,D){var T=S.stateNode;T!==null&&T.delete(D),D=0,D===0&&(D=ga(),D=jA(D,S,null)),S=Dg(S,D),S!==null&&fo(S)}var Zv;Zv=function(S,D,T){var j=D.expirationTime;if(S!==null){var Y=D.pendingProps;if(S.memoizedProps!==Y||_i.current)Go=!0;else{if(j<T){switch(Go=!1,D.tag){case 3:yg(D),mg();break;case 5:if(Pm(D),D.mode&4&&T!==1&&xe(D.type,Y))return D.expirationTime=D.childExpirationTime=1,null;break;case 1:ii(D.type)&&Ac(D);break;case 4:og(D,D.stateNode.containerInfo);break;case 10:Ho(D,D.memoizedProps.value);break;case 13:if(D.memoizedState!==null)return j=D.child.childExpirationTime,j!==0&&j>=T?ln(S,D,T):(On($n,$n.current&1,D),D=si(S,D,T),D!==null?D.sibling:null);On($n,$n.current&1,D);break;case 19:if(j=D.childExpirationTime>=T,(S.effectTag&64)!==0){if(j)return Ga(S,D,T);D.effectTag|=64}if(Y=D.memoizedState,Y!==null&&(Y.rendering=null,Y.tail=null),On($n,$n.current,D),!j)return null}return si(S,D,T)}Go=!1}}else Go=!1;switch(D.expirationTime=0,D.tag){case 2:if(j=D.type,S!==null&&(S.alternate=null,D.alternate=null,D.effectTag|=2),S=D.pendingProps,Y=Oe(D,Mn.current),ds(D,T),Y=cg(null,D,j,S,Y,T),D.effectTag|=1,typeof Y=="object"&&Y!==null&&typeof Y.render=="function"&&Y.$$typeof===void 0){if(D.tag=1,yw(),ii(j)){var Ae=!0;Ac(D)}else Ae=!1;D.memoizedState=Y.state!==null&&Y.state!==void 0?Y.state:null;var De=j.getDerivedStateFromProps;typeof De=="function"&&er(D,j,De,S),Y.updater=$r,D.stateNode=Y,Y._reactInternalFiber=D,jo(D,j,S,T),D=yp(null,D,j,!0,Ae,T)}else D.tag=0,ws(null,D,Y,T),D=D.child;return D;case 16:if(Y=D.elementType,S!==null&&(S.alternate=null,D.alternate=null,D.effectTag|=2),S=D.pendingProps,me(Y),Y._status!==1)throw Y._result;switch(Y=Y._result,D.type=Y,Ae=D.tag=wF(Y),S=Ci(Y,S),Ae){case 0:D=LA(null,D,Y,S,T);break;case 1:D=mp(null,D,Y,S,T);break;case 11:D=Ii(null,D,Y,S,T);break;case 14:D=Qm(null,D,Y,Ci(Y.type,S),j,T);break;default:throw Error(n(306,Y,""))}return D;case 0:return j=D.type,Y=D.pendingProps,Y=D.elementType===j?Y:Ci(j,Y),LA(S,D,j,Y,T);case 1:return j=D.type,Y=D.pendingProps,Y=D.elementType===j?Y:Ci(j,Y),mp(S,D,j,Y,T);case 3:if(yg(D),j=D.updateQueue,j===null)throw Error(n(282));if(Y=D.memoizedState,Y=Y!==null?Y.element:null,ye(D,j,D.pendingProps,null,T),j=D.memoizedState.element,j===Y)mg(),D=si(S,D,T);else{if((Y=D.stateNode.hydrate)&&(y?(Bc=cu(D.stateNode.containerInfo),Aa=D,Y=Il=!0):Y=!1),Y)for(T=sg(D,null,j,T),D.child=T;T;)T.effectTag=T.effectTag&-3|1024,T=T.sibling;else ws(S,D,j,T),mg();D=D.child}return D;case 5:return Pm(D),S===null&&NA(D),j=D.type,Y=D.pendingProps,Ae=S!==null?S.memoizedProps:null,De=Y.children,ke(j,Y)?De=null:Ae!==null&&ke(j,Ae)&&(D.effectTag|=16),qo(S,D),D.mode&4&&T!==1&&xe(j,Y)?(D.expirationTime=D.childExpirationTime=1,D=null):(ws(S,D,De,T),D=D.child),D;case 6:return S===null&&NA(D),null;case 13:return ln(S,D,T);case 4:return og(D,D.stateNode.containerInfo),j=D.pendingProps,S===null?D.child=gu(D,null,j,T):ws(S,D,j,T),D.child;case 11:return j=D.type,Y=D.pendingProps,Y=D.elementType===j?Y:Ci(j,Y),Ii(S,D,j,Y,T);case 7:return ws(S,D,D.pendingProps,T),D.child;case 8:return ws(S,D,D.pendingProps.children,T),D.child;case 12:return ws(S,D,D.pendingProps.children,T),D.child;case 10:e:{if(j=D.type._context,Y=D.pendingProps,De=D.memoizedProps,Ae=Y.value,Ho(D,Ae),De!==null){var vt=De.value;if(Ae=hs(vt,Ae)?0:(typeof j._calculateChangedBits=="function"?j._calculateChangedBits(vt,Ae):1073741823)|0,Ae===0){if(De.children===Y.children&&!_i.current){D=si(S,D,T);break e}}else for(vt=D.child,vt!==null&&(vt.return=D);vt!==null;){var wt=vt.dependencies;if(wt!==null){De=vt.child;for(var xt=wt.firstContext;xt!==null;){if(xt.context===j&&(xt.observedBits&Ae)!==0){vt.tag===1&&(xt=ys(T,null),xt.tag=2,tt(vt,xt)),vt.expirationTime<T&&(vt.expirationTime=T),xt=vt.alternate,xt!==null&&xt.expirationTime<T&&(xt.expirationTime=T),gs(vt.return,T),wt.expirationTime<T&&(wt.expirationTime=T);break}xt=xt.next}}else De=vt.tag===10&&vt.type===D.type?null:vt.child;if(De!==null)De.return=vt;else for(De=vt;De!==null;){if(De===D){De=null;break}if(vt=De.sibling,vt!==null){vt.return=De.return,De=vt;break}De=De.return}vt=De}}ws(S,D,Y.children,T),D=D.child}return D;case 9:return Y=D.type,Ae=D.pendingProps,j=Ae.children,ds(D,T),Y=ms(Y,Ae.unstable_observedBits),j=j(Y),D.effectTag|=1,ws(S,D,j,T),D.child;case 14:return Y=D.type,Ae=Ci(Y,D.pendingProps),Ae=Ci(Y.type,Ae),Qm(S,D,Y,Ae,j,T);case 15:return Fm(S,D,D.type,D.pendingProps,j,T);case 17:return j=D.type,Y=D.pendingProps,Y=D.elementType===j?Y:Ci(j,Y),S!==null&&(S.alternate=null,D.alternate=null,D.effectTag|=2),D.tag=1,ii(j)?(S=!0,Ac(D)):S=!1,ds(D,T),es(D,j,Y,T),jo(D,j,Y,T),yp(null,D,j,!0,S,T);case 19:return Ga(S,D,T)}throw Error(n(156,D.tag))};var xw=null,kw=null;function EF(S){if(typeof __REACT_DEVTOOLS_GLOBAL_HOOK__>"u")return!1;var D=__REACT_DEVTOOLS_GLOBAL_HOOK__;if(D.isDisabled||!D.supportsFiber)return!0;try{var T=D.inject(S);xw=function(j){try{D.onCommitFiberRoot(T,j,void 0,(j.current.effectTag&64)===64)}catch{}},kw=function(j){try{D.onCommitFiberUnmount(T,j)}catch{}}}catch{}return!0}function CF(S,D,T,j){this.tag=S,this.key=T,this.sibling=this.child=this.return=this.stateNode=this.type=this.elementType=null,this.index=0,this.ref=null,this.pendingProps=D,this.dependencies=this.memoizedState=this.updateQueue=this.memoizedProps=null,this.mode=j,this.effectTag=0,this.lastEffect=this.firstEffect=this.nextEffect=null,this.childExpirationTime=this.expirationTime=0,this.alternate=null}function Dl(S,D,T,j){return new CF(S,D,T,j)}function Qw(S){return S=S.prototype,!(!S||!S.isReactComponent)}function wF(S){if(typeof S=="function")return Qw(S)?1:0;if(S!=null){if(S=S.$$typeof,S===L)return 11;if(S===te)return 14}return 2}function WA(S,D){var T=S.alternate;return T===null?(T=Dl(S.tag,D,S.key,S.mode),T.elementType=S.elementType,T.type=S.type,T.stateNode=S.stateNode,T.alternate=S,S.alternate=T):(T.pendingProps=D,T.effectTag=0,T.nextEffect=null,T.firstEffect=null,T.lastEffect=null),T.childExpirationTime=S.childExpirationTime,T.expirationTime=S.expirationTime,T.child=S.child,T.memoizedProps=S.memoizedProps,T.memoizedState=S.memoizedState,T.updateQueue=S.updateQueue,D=S.dependencies,T.dependencies=D===null?null:{expirationTime:D.expirationTime,firstContext:D.firstContext,responders:D.responders},T.sibling=S.sibling,T.index=S.index,T.ref=S.ref,T}function jm(S,D,T,j,Y,Ae){var De=2;if(j=S,typeof S=="function")Qw(S)&&(De=1);else if(typeof S=="string")De=5;else e:switch(S){case E:return bu(T.children,Y,Ae,D);case R:De=8,Y|=7;break;case I:De=8,Y|=1;break;case v:return S=Dl(12,T,D,Y|8),S.elementType=v,S.type=v,S.expirationTime=Ae,S;case U:return S=Dl(13,T,D,Y),S.type=U,S.elementType=U,S.expirationTime=Ae,S;case J:return S=Dl(19,T,D,Y),S.elementType=J,S.expirationTime=Ae,S;default:if(typeof S=="object"&&S!==null)switch(S.$$typeof){case x:De=10;break e;case C:De=9;break e;case L:De=11;break e;case te:De=14;break e;case ae:De=16,j=null;break e}throw Error(n(130,S==null?S:typeof S,""))}return D=Dl(De,T,D,Y),D.elementType=S,D.type=j,D.expirationTime=Ae,D}function bu(S,D,T,j){return S=Dl(7,S,j,D),S.expirationTime=T,S}function Fw(S,D,T){return S=Dl(6,S,null,D),S.expirationTime=T,S}function Rw(S,D,T){return D=Dl(4,S.children!==null?S.children:[],S.key,D),D.expirationTime=T,D.stateNode={containerInfo:S.containerInfo,pendingChildren:null,implementation:S.implementation},D}function IF(S,D,T){this.tag=D,this.current=null,this.containerInfo=S,this.pingCache=this.pendingChildren=null,this.finishedExpirationTime=0,this.finishedWork=null,this.timeoutHandle=je,this.pendingContext=this.context=null,this.hydrate=T,this.callbackNode=null,this.callbackPriority=90,this.lastExpiredTime=this.lastPingedTime=this.nextKnownPendingLevel=this.lastSuspendedTime=this.firstSuspendedTime=this.firstPendingTime=0}function $v(S,D){var T=S.firstSuspendedTime;return S=S.lastSuspendedTime,T!==0&&T>=D&&S<=D}function KA(S,D){var T=S.firstSuspendedTime,j=S.lastSuspendedTime;T<D&&(S.firstSuspendedTime=D),(j>D||T===0)&&(S.lastSuspendedTime=D),D<=S.lastPingedTime&&(S.lastPingedTime=0),D<=S.lastExpiredTime&&(S.lastExpiredTime=0)}function eD(S,D){D>S.firstPendingTime&&(S.firstPendingTime=D);var T=S.firstSuspendedTime;T!==0&&(D>=T?S.firstSuspendedTime=S.lastSuspendedTime=S.nextKnownPendingLevel=0:D>=S.lastSuspendedTime&&(S.lastSuspendedTime=D+1),D>S.nextKnownPendingLevel&&(S.nextKnownPendingLevel=D))}function Gm(S,D){var T=S.lastExpiredTime;(T===0||T>D)&&(S.lastExpiredTime=D)}function tD(S){var D=S._reactInternalFiber;if(D===void 0)throw typeof S.render=="function"?Error(n(188)):Error(n(268,Object.keys(S)));return S=Ee(D),S===null?null:S.stateNode}function rD(S,D){S=S.memoizedState,S!==null&&S.dehydrated!==null&&S.retryTime<D&&(S.retryTime=D)}function qm(S,D){rD(S,D),(S=S.alternate)&&rD(S,D)}var nD={createContainer:function(S,D,T){return S=new IF(S,D,T),D=Dl(3,null,null,D===2?7:D===1?3:0),S.current=D,D.stateNode=S},updateContainer:function(S,D,T,j){var Y=D.current,Ae=ga(),De=ht.suspense;Ae=jA(Ae,Y,De);e:if(T){T=T._reactInternalFiber;t:{if(Be(T)!==T||T.tag!==1)throw Error(n(170));var vt=T;do{switch(vt.tag){case 3:vt=vt.stateNode.context;break t;case 1:if(ii(vt.type)){vt=vt.stateNode.__reactInternalMemoizedMergedChildContext;break t}}vt=vt.return}while(vt!==null);throw Error(n(171))}if(T.tag===1){var wt=T.type;if(ii(wt)){T=uu(T,wt,vt);break e}}T=vt}else T=Ni;return D.context===null?D.context=T:D.pendingContext=T,D=ys(Ae,De),D.payload={element:S},j=j===void 0?null:j,j!==null&&(D.callback=j),tt(Y,D),Pc(Y,Ae),Ae},batchedEventUpdates:function(S,D){var T=yr;yr|=2;try{return S(D)}finally{yr=T,yr===En&&ji()}},batchedUpdates:function(S,D){var T=yr;yr|=1;try{return S(D)}finally{yr=T,yr===En&&ji()}},unbatchedUpdates:function(S,D){var T=yr;yr&=-2,yr|=Tm;try{return S(D)}finally{yr=T,yr===En&&ji()}},deferredUpdates:function(S){return lo(97,S)},syncUpdates:function(S,D,T,j){return lo(99,S.bind(null,D,T,j))},discreteUpdates:function(S,D,T,j){var Y=yr;yr|=4;try{return lo(98,S.bind(null,D,T,j))}finally{yr=Y,yr===En&&ji()}},flushDiscreteUpdates:function(){(yr&(1|rs|js))===En&&(AF(),Bp())},flushControlled:function(S){var D=yr;yr|=1;try{lo(99,S)}finally{yr=D,yr===En&&ji()}},flushSync:Vv,flushPassiveEffects:Bp,IsThisRendererActing:{current:!1},getPublicRootInstance:function(S){if(S=S.current,!S.child)return null;switch(S.child.tag){case 5:return le(S.child.stateNode);default:return S.child.stateNode}},attemptSynchronousHydration:function(S){switch(S.tag){case 3:var D=S.stateNode;D.hydrate&&Kv(D,D.firstPendingTime);break;case 13:Vv(function(){return Pc(S,1073741823)}),D=Ua(ga(),150,100),qm(S,D)}},attemptUserBlockingHydration:function(S){if(S.tag===13){var D=Ua(ga(),150,100);Pc(S,D),qm(S,D)}},attemptContinuousHydration:function(S){if(S.tag===13){ga();var D=xA++;Pc(S,D),qm(S,D)}},attemptHydrationAtCurrentPriority:function(S){if(S.tag===13){var D=ga();D=jA(D,S,null),Pc(S,D),qm(S,D)}},findHostInstance:tD,findHostInstanceWithWarning:function(S){return tD(S)},findHostInstanceWithNoPortals:function(S){return S=Se(S),S===null?null:S.tag===20?S.stateNode.instance:S.stateNode},shouldSuspend:function(){return!1},injectIntoDevTools:function(S){var D=S.findFiberByHostInstance;return EF(r({},S,{overrideHookState:null,overrideProps:null,setSuspenseHandler:null,scheduleUpdate:null,currentDispatcherRef:u.ReactCurrentDispatcher,findHostInstanceByFiber:function(T){return T=Ee(T),T===null?null:T.stateNode},findFiberByHostInstance:function(T){return D?D(T):null},findHostInstancesForRefresh:null,scheduleRefresh:null,scheduleRoot:null,setRefreshHandler:null,getCurrentFiber:null}))}};lB.exports=nD.default||nD;var BF=lB.exports;return lB.exports=t,BF}});var PEe=_((mKt,SEe)=>{"use strict";SEe.exports=DEe()});var xEe=_((yKt,bEe)=>{"use strict";var Hyt={ALIGN_COUNT:8,ALIGN_AUTO:0,ALIGN_FLEX_START:1,ALIGN_CENTER:2,ALIGN_FLEX_END:3,ALIGN_STRETCH:4,ALIGN_BASELINE:5,ALIGN_SPACE_BETWEEN:6,ALIGN_SPACE_AROUND:7,DIMENSION_COUNT:2,DIMENSION_WIDTH:0,DIMENSION_HEIGHT:1,DIRECTION_COUNT:3,DIRECTION_INHERIT:0,DIRECTION_LTR:1,DIRECTION_RTL:2,DISPLAY_COUNT:2,DISPLAY_FLEX:0,DISPLAY_NONE:1,EDGE_COUNT:9,EDGE_LEFT:0,EDGE_TOP:1,EDGE_RIGHT:2,EDGE_BOTTOM:3,EDGE_START:4,EDGE_END:5,EDGE_HORIZONTAL:6,EDGE_VERTICAL:7,EDGE_ALL:8,EXPERIMENTAL_FEATURE_COUNT:1,EXPERIMENTAL_FEATURE_WEB_FLEX_BASIS:0,FLEX_DIRECTION_COUNT:4,FLEX_DIRECTION_COLUMN:0,FLEX_DIRECTION_COLUMN_REVERSE:1,FLEX_DIRECTION_ROW:2,FLEX_DIRECTION_ROW_REVERSE:3,JUSTIFY_COUNT:6,JUSTIFY_FLEX_START:0,JUSTIFY_CENTER:1,JUSTIFY_FLEX_END:2,JUSTIFY_SPACE_BETWEEN:3,JUSTIFY_SPACE_AROUND:4,JUSTIFY_SPACE_EVENLY:5,LOG_LEVEL_COUNT:6,LOG_LEVEL_ERROR:0,LOG_LEVEL_WARN:1,LOG_LEVEL_INFO:2,LOG_LEVEL_DEBUG:3,LOG_LEVEL_VERBOSE:4,LOG_LEVEL_FATAL:5,MEASURE_MODE_COUNT:3,MEASURE_MODE_UNDEFINED:0,MEASURE_MODE_EXACTLY:1,MEASURE_MODE_AT_MOST:2,NODE_TYPE_COUNT:2,NODE_TYPE_DEFAULT:0,NODE_TYPE_TEXT:1,OVERFLOW_COUNT:3,OVERFLOW_VISIBLE:0,OVERFLOW_HIDDEN:1,OVERFLOW_SCROLL:2,POSITION_TYPE_COUNT:2,POSITION_TYPE_RELATIVE:0,POSITION_TYPE_ABSOLUTE:1,PRINT_OPTIONS_COUNT:3,PRINT_OPTIONS_LAYOUT:1,PRINT_OPTIONS_STYLE:2,PRINT_OPTIONS_CHILDREN:4,UNIT_COUNT:4,UNIT_UNDEFINED:0,UNIT_POINT:1,UNIT_PERCENT:2,UNIT_AUTO:3,WRAP_COUNT:3,WRAP_NO_WRAP:0,WRAP_WRAP:1,WRAP_WRAP_REVERSE:2};bEe.exports=Hyt});var REe=_((EKt,FEe)=>{"use strict";var jyt=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var r=arguments[e];for(var o in r)Object.prototype.hasOwnProperty.call(r,o)&&(t[o]=r[o])}return t},Wk=function(){function t(e,r){for(var o=0;o<r.length;o++){var a=r[o];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}}return function(e,r,o){return r&&t(e.prototype,r),o&&t(e,o),e}}();function P6(t,e,r){return e in t?Object.defineProperty(t,e,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[e]=r,t}function b6(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}var tu=xEe(),Gyt=function(){function t(e,r,o,a,n,u){b6(this,t),this.left=e,this.right=r,this.top=o,this.bottom=a,this.width=n,this.height=u}return Wk(t,[{key:"fromJS",value:function(r){r(this.left,this.right,this.top,this.bottom,this.width,this.height)}},{key:"toString",value:function(){return"<Layout#"+this.left+":"+this.right+";"+this.top+":"+this.bottom+";"+this.width+":"+this.height+">"}}]),t}(),kEe=function(){Wk(t,null,[{key:"fromJS",value:function(r){var o=r.width,a=r.height;return new t(o,a)}}]);function t(e,r){b6(this,t),this.width=e,this.height=r}return Wk(t,[{key:"fromJS",value:function(r){r(this.width,this.height)}},{key:"toString",value:function(){return"<Size#"+this.width+"x"+this.height+">"}}]),t}(),QEe=function(){function t(e,r){b6(this,t),this.unit=e,this.value=r}return Wk(t,[{key:"fromJS",value:function(r){r(this.unit,this.value)}},{key:"toString",value:function(){switch(this.unit){case tu.UNIT_POINT:return String(this.value);case tu.UNIT_PERCENT:return this.value+"%";case tu.UNIT_AUTO:return"auto";default:return this.value+"?"}}},{key:"valueOf",value:function(){return this.value}}]),t}();FEe.exports=function(t,e){function r(u,A,p){var h=u[A];u[A]=function(){for(var E=arguments.length,I=Array(E),v=0;v<E;v++)I[v]=arguments[v];return p.call.apply(p,[this,h].concat(I))}}for(var o=["setPosition","setMargin","setFlexBasis","setWidth","setHeight","setMinWidth","setMinHeight","setMaxWidth","setMaxHeight","setPadding"],a=function(){var A,p=o[n],h=(A={},P6(A,tu.UNIT_POINT,e.Node.prototype[p]),P6(A,tu.UNIT_PERCENT,e.Node.prototype[p+"Percent"]),P6(A,tu.UNIT_AUTO,e.Node.prototype[p+"Auto"]),A);r(e.Node.prototype,p,function(E){for(var I=arguments.length,v=Array(I>1?I-1:0),x=1;x<I;x++)v[x-1]=arguments[x];var C=v.pop(),R=void 0,L=void 0;if(C==="auto")R=tu.UNIT_AUTO,L=void 0;else if(C instanceof QEe)R=C.unit,L=C.valueOf();else if(R=typeof C=="string"&&C.endsWith("%")?tu.UNIT_PERCENT:tu.UNIT_POINT,L=parseFloat(C),!Number.isNaN(C)&&Number.isNaN(L))throw new Error("Invalid value "+C+" for "+p);if(!h[R])throw new Error('Failed to execute "'+p+`": Unsupported unit '`+C+"'");if(L!==void 0){var U;return(U=h[R]).call.apply(U,[this].concat(v,[L]))}else{var J;return(J=h[R]).call.apply(J,[this].concat(v))}})},n=0;n<o.length;n++)a();return r(e.Config.prototype,"free",function(){e.Config.destroy(this)}),r(e.Node,"create",function(u,A){return A?e.Node.createWithConfig(A):e.Node.createDefault()}),r(e.Node.prototype,"free",function(){e.Node.destroy(this)}),r(e.Node.prototype,"freeRecursive",function(){for(var u=0,A=this.getChildCount();u<A;++u)this.getChild(0).freeRecursive();this.free()}),r(e.Node.prototype,"setMeasureFunc",function(u,A){return A?u.call(this,function(){return kEe.fromJS(A.apply(void 0,arguments))}):this.unsetMeasureFunc()}),r(e.Node.prototype,"calculateLayout",function(u){var A=arguments.length>1&&arguments[1]!==void 0?arguments[1]:NaN,p=arguments.length>2&&arguments[2]!==void 0?arguments[2]:NaN,h=arguments.length>3&&arguments[3]!==void 0?arguments[3]:tu.DIRECTION_LTR;return u.call(this,A,p,h)}),jyt({Config:e.Config,Node:e.Node,Layout:t("Layout",Gyt),Size:t("Size",kEe),Value:t("Value",QEe),getInstanceCount:function(){return e.getInstanceCount.apply(e,arguments)}},tu)}});var TEe=_((exports,module)=>{(function(t,e){typeof define=="function"&&define.amd?define([],function(){return e}):typeof module=="object"&&module.exports?module.exports=e:(t.nbind=t.nbind||{}).init=e})(exports,function(Module,cb){typeof Module=="function"&&(cb=Module,Module={}),Module.onRuntimeInitialized=function(t,e){return function(){t&&t.apply(this,arguments);try{Module.ccall("nbind_init")}catch(r){e(r);return}e(null,{bind:Module._nbind_value,reflect:Module.NBind.reflect,queryType:Module.NBind.queryType,toggleLightGC:Module.toggleLightGC,lib:Module})}}(Module.onRuntimeInitialized,cb);var Module;Module||(Module=(typeof Module<"u"?Module:null)||{});var moduleOverrides={};for(var key in Module)Module.hasOwnProperty(key)&&(moduleOverrides[key]=Module[key]);var ENVIRONMENT_IS_WEB=!1,ENVIRONMENT_IS_WORKER=!1,ENVIRONMENT_IS_NODE=!1,ENVIRONMENT_IS_SHELL=!1;if(Module.ENVIRONMENT)if(Module.ENVIRONMENT==="WEB")ENVIRONMENT_IS_WEB=!0;else if(Module.ENVIRONMENT==="WORKER")ENVIRONMENT_IS_WORKER=!0;else if(Module.ENVIRONMENT==="NODE")ENVIRONMENT_IS_NODE=!0;else if(Module.ENVIRONMENT==="SHELL")ENVIRONMENT_IS_SHELL=!0;else throw new Error("The provided Module['ENVIRONMENT'] value is not valid. It must be one of: WEB|WORKER|NODE|SHELL.");else ENVIRONMENT_IS_WEB=typeof window=="object",ENVIRONMENT_IS_WORKER=typeof importScripts=="function",ENVIRONMENT_IS_NODE=typeof process=="object"&&typeof ve=="function"&&!ENVIRONMENT_IS_WEB&&!ENVIRONMENT_IS_WORKER,ENVIRONMENT_IS_SHELL=!ENVIRONMENT_IS_WEB&&!ENVIRONMENT_IS_NODE&&!ENVIRONMENT_IS_WORKER;if(ENVIRONMENT_IS_NODE){Module.print||(Module.print=console.log),Module.printErr||(Module.printErr=console.warn);var nodeFS,nodePath;Module.read=function(e,r){nodeFS||(nodeFS={}("")),nodePath||(nodePath={}("")),e=nodePath.normalize(e);var o=nodeFS.readFileSync(e);return r?o:o.toString()},Module.readBinary=function(e){var r=Module.read(e,!0);return r.buffer||(r=new Uint8Array(r)),assert(r.buffer),r},Module.load=function(e){globalEval(read(e))},Module.thisProgram||(process.argv.length>1?Module.thisProgram=process.argv[1].replace(/\\/g,"/"):Module.thisProgram="unknown-program"),Module.arguments=process.argv.slice(2),typeof module<"u"&&(module.exports=Module),Module.inspect=function(){return"[Emscripten Module object]"}}else if(ENVIRONMENT_IS_SHELL)Module.print||(Module.print=print),typeof printErr<"u"&&(Module.printErr=printErr),typeof read<"u"?Module.read=read:Module.read=function(){throw"no read() available"},Module.readBinary=function(e){if(typeof readbuffer=="function")return new Uint8Array(readbuffer(e));var r=read(e,"binary");return assert(typeof r=="object"),r},typeof scriptArgs<"u"?Module.arguments=scriptArgs:typeof arguments<"u"&&(Module.arguments=arguments),typeof quit=="function"&&(Module.quit=function(t,e){quit(t)});else if(ENVIRONMENT_IS_WEB||ENVIRONMENT_IS_WORKER){if(Module.read=function(e){var r=new XMLHttpRequest;return r.open("GET",e,!1),r.send(null),r.responseText},ENVIRONMENT_IS_WORKER&&(Module.readBinary=function(e){var r=new XMLHttpRequest;return r.open("GET",e,!1),r.responseType="arraybuffer",r.send(null),new Uint8Array(r.response)}),Module.readAsync=function(e,r,o){var a=new XMLHttpRequest;a.open("GET",e,!0),a.responseType="arraybuffer",a.onload=function(){a.status==200||a.status==0&&a.response?r(a.response):o()},a.onerror=o,a.send(null)},typeof arguments<"u"&&(Module.arguments=arguments),typeof console<"u")Module.print||(Module.print=function(e){console.log(e)}),Module.printErr||(Module.printErr=function(e){console.warn(e)});else{var TRY_USE_DUMP=!1;Module.print||(Module.print=TRY_USE_DUMP&&typeof dump<"u"?function(t){dump(t)}:function(t){})}ENVIRONMENT_IS_WORKER&&(Module.load=importScripts),typeof Module.setWindowTitle>"u"&&(Module.setWindowTitle=function(t){document.title=t})}else throw"Unknown runtime environment. Where are we?";function globalEval(t){eval.call(null,t)}!Module.load&&Module.read&&(Module.load=function(e){globalEval(Module.read(e))}),Module.print||(Module.print=function(){}),Module.printErr||(Module.printErr=Module.print),Module.arguments||(Module.arguments=[]),Module.thisProgram||(Module.thisProgram="./this.program"),Module.quit||(Module.quit=function(t,e){throw e}),Module.print=Module.print,Module.printErr=Module.printErr,Module.preRun=[],Module.postRun=[];for(var key in moduleOverrides)moduleOverrides.hasOwnProperty(key)&&(Module[key]=moduleOverrides[key]);moduleOverrides=void 0;var Runtime={setTempRet0:function(t){return tempRet0=t,t},getTempRet0:function(){return tempRet0},stackSave:function(){return STACKTOP},stackRestore:function(t){STACKTOP=t},getNativeTypeSize:function(t){switch(t){case"i1":case"i8":return 1;case"i16":return 2;case"i32":return 4;case"i64":return 8;case"float":return 4;case"double":return 8;default:{if(t[t.length-1]==="*")return Runtime.QUANTUM_SIZE;if(t[0]==="i"){var e=parseInt(t.substr(1));return assert(e%8===0),e/8}else return 0}}},getNativeFieldSize:function(t){return Math.max(Runtime.getNativeTypeSize(t),Runtime.QUANTUM_SIZE)},STACK_ALIGN:16,prepVararg:function(t,e){return e==="double"||e==="i64"?t&7&&(assert((t&7)===4),t+=4):assert((t&3)===0),t},getAlignSize:function(t,e,r){return!r&&(t=="i64"||t=="double")?8:t?Math.min(e||(t?Runtime.getNativeFieldSize(t):0),Runtime.QUANTUM_SIZE):Math.min(e,8)},dynCall:function(t,e,r){return r&&r.length?Module["dynCall_"+t].apply(null,[e].concat(r)):Module["dynCall_"+t].call(null,e)},functionPointers:[],addFunction:function(t){for(var e=0;e<Runtime.functionPointers.length;e++)if(!Runtime.functionPointers[e])return Runtime.functionPointers[e]=t,2*(1+e);throw"Finished up all reserved function pointers. Use a higher value for RESERVED_FUNCTION_POINTERS."},removeFunction:function(t){Runtime.functionPointers[(t-2)/2]=null},warnOnce:function(t){Runtime.warnOnce.shown||(Runtime.warnOnce.shown={}),Runtime.warnOnce.shown[t]||(Runtime.warnOnce.shown[t]=1,Module.printErr(t))},funcWrappers:{},getFuncWrapper:function(t,e){if(!!t){assert(e),Runtime.funcWrappers[e]||(Runtime.funcWrappers[e]={});var r=Runtime.funcWrappers[e];return r[t]||(e.length===1?r[t]=function(){return Runtime.dynCall(e,t)}:e.length===2?r[t]=function(a){return Runtime.dynCall(e,t,[a])}:r[t]=function(){return Runtime.dynCall(e,t,Array.prototype.slice.call(arguments))}),r[t]}},getCompilerSetting:function(t){throw"You must build with -s RETAIN_COMPILER_SETTINGS=1 for Runtime.getCompilerSetting or emscripten_get_compiler_setting to work"},stackAlloc:function(t){var e=STACKTOP;return STACKTOP=STACKTOP+t|0,STACKTOP=STACKTOP+15&-16,e},staticAlloc:function(t){var e=STATICTOP;return STATICTOP=STATICTOP+t|0,STATICTOP=STATICTOP+15&-16,e},dynamicAlloc:function(t){var e=HEAP32[DYNAMICTOP_PTR>>2],r=(e+t+15|0)&-16;if(HEAP32[DYNAMICTOP_PTR>>2]=r,r>=TOTAL_MEMORY){var o=enlargeMemory();if(!o)return HEAP32[DYNAMICTOP_PTR>>2]=e,0}return e},alignMemory:function(t,e){var r=t=Math.ceil(t/(e||16))*(e||16);return r},makeBigInt:function(t,e,r){var o=r?+(t>>>0)+ +(e>>>0)*4294967296:+(t>>>0)+ +(e|0)*4294967296;return o},GLOBAL_BASE:8,QUANTUM_SIZE:4,__dummy__:0};Module.Runtime=Runtime;var ABORT=0,EXITSTATUS=0;function assert(t,e){t||abort("Assertion failed: "+e)}function getCFunc(ident){var func=Module["_"+ident];if(!func)try{func=eval("_"+ident)}catch(t){}return assert(func,"Cannot call unknown function "+ident+" (perhaps LLVM optimizations or closure removed it?)"),func}var cwrap,ccall;(function(){var JSfuncs={stackSave:function(){Runtime.stackSave()},stackRestore:function(){Runtime.stackRestore()},arrayToC:function(t){var e=Runtime.stackAlloc(t.length);return writeArrayToMemory(t,e),e},stringToC:function(t){var e=0;if(t!=null&&t!==0){var r=(t.length<<2)+1;e=Runtime.stackAlloc(r),stringToUTF8(t,e,r)}return e}},toC={string:JSfuncs.stringToC,array:JSfuncs.arrayToC};ccall=function(e,r,o,a,n){var u=getCFunc(e),A=[],p=0;if(a)for(var h=0;h<a.length;h++){var E=toC[o[h]];E?(p===0&&(p=Runtime.stackSave()),A[h]=E(a[h])):A[h]=a[h]}var I=u.apply(null,A);if(r==="string"&&(I=Pointer_stringify(I)),p!==0){if(n&&n.async){EmterpreterAsync.asyncFinalizers.push(function(){Runtime.stackRestore(p)});return}Runtime.stackRestore(p)}return I};var sourceRegex=/^function\s*[a-zA-Z$_0-9]*\s*\(([^)]*)\)\s*{\s*([^*]*?)[\s;]*(?:return\s*(.*?)[;\s]*)?}$/;function parseJSFunc(t){var e=t.toString().match(sourceRegex).slice(1);return{arguments:e[0],body:e[1],returnValue:e[2]}}var JSsource=null;function ensureJSsource(){if(!JSsource){JSsource={};for(var t in JSfuncs)JSfuncs.hasOwnProperty(t)&&(JSsource[t]=parseJSFunc(JSfuncs[t]))}}cwrap=function cwrap(ident,returnType,argTypes){argTypes=argTypes||[];var cfunc=getCFunc(ident),numericArgs=argTypes.every(function(t){return t==="number"}),numericRet=returnType!=="string";if(numericRet&&numericArgs)return cfunc;var argNames=argTypes.map(function(t,e){return"$"+e}),funcstr="(function("+argNames.join(",")+") {",nargs=argTypes.length;if(!numericArgs){ensureJSsource(),funcstr+="var stack = "+JSsource.stackSave.body+";";for(var i=0;i<nargs;i++){var arg=argNames[i],type=argTypes[i];if(type!=="number"){var convertCode=JSsource[type+"ToC"];funcstr+="var "+convertCode.arguments+" = "+arg+";",funcstr+=convertCode.body+";",funcstr+=arg+"=("+convertCode.returnValue+");"}}}var cfuncname=parseJSFunc(function(){return cfunc}).returnValue;if(funcstr+="var ret = "+cfuncname+"("+argNames.join(",")+");",!numericRet){var strgfy=parseJSFunc(function(){return Pointer_stringify}).returnValue;funcstr+="ret = "+strgfy+"(ret);"}return numericArgs||(ensureJSsource(),funcstr+=JSsource.stackRestore.body.replace("()","(stack)")+";"),funcstr+="return ret})",eval(funcstr)}})(),Module.ccall=ccall,Module.cwrap=cwrap;function setValue(t,e,r,o){switch(r=r||"i8",r.charAt(r.length-1)==="*"&&(r="i32"),r){case"i1":HEAP8[t>>0]=e;break;case"i8":HEAP8[t>>0]=e;break;case"i16":HEAP16[t>>1]=e;break;case"i32":HEAP32[t>>2]=e;break;case"i64":tempI64=[e>>>0,(tempDouble=e,+Math_abs(tempDouble)>=1?tempDouble>0?(Math_min(+Math_floor(tempDouble/4294967296),4294967295)|0)>>>0:~~+Math_ceil((tempDouble-+(~~tempDouble>>>0))/4294967296)>>>0:0)],HEAP32[t>>2]=tempI64[0],HEAP32[t+4>>2]=tempI64[1];break;case"float":HEAPF32[t>>2]=e;break;case"double":HEAPF64[t>>3]=e;break;default:abort("invalid type for setValue: "+r)}}Module.setValue=setValue;function getValue(t,e,r){switch(e=e||"i8",e.charAt(e.length-1)==="*"&&(e="i32"),e){case"i1":return HEAP8[t>>0];case"i8":return HEAP8[t>>0];case"i16":return HEAP16[t>>1];case"i32":return HEAP32[t>>2];case"i64":return HEAP32[t>>2];case"float":return HEAPF32[t>>2];case"double":return HEAPF64[t>>3];default:abort("invalid type for setValue: "+e)}return null}Module.getValue=getValue;var ALLOC_NORMAL=0,ALLOC_STACK=1,ALLOC_STATIC=2,ALLOC_DYNAMIC=3,ALLOC_NONE=4;Module.ALLOC_NORMAL=ALLOC_NORMAL,Module.ALLOC_STACK=ALLOC_STACK,Module.ALLOC_STATIC=ALLOC_STATIC,Module.ALLOC_DYNAMIC=ALLOC_DYNAMIC,Module.ALLOC_NONE=ALLOC_NONE;function allocate(t,e,r,o){var a,n;typeof t=="number"?(a=!0,n=t):(a=!1,n=t.length);var u=typeof e=="string"?e:null,A;if(r==ALLOC_NONE?A=o:A=[typeof _malloc=="function"?_malloc:Runtime.staticAlloc,Runtime.stackAlloc,Runtime.staticAlloc,Runtime.dynamicAlloc][r===void 0?ALLOC_STATIC:r](Math.max(n,u?1:e.length)),a){var o=A,p;for(assert((A&3)==0),p=A+(n&-4);o<p;o+=4)HEAP32[o>>2]=0;for(p=A+n;o<p;)HEAP8[o++>>0]=0;return A}if(u==="i8")return t.subarray||t.slice?HEAPU8.set(t,A):HEAPU8.set(new Uint8Array(t),A),A;for(var h=0,E,I,v;h<n;){var x=t[h];if(typeof x=="function"&&(x=Runtime.getFunctionIndex(x)),E=u||e[h],E===0){h++;continue}E=="i64"&&(E="i32"),setValue(A+h,x,E),v!==E&&(I=Runtime.getNativeTypeSize(E),v=E),h+=I}return A}Module.allocate=allocate;function getMemory(t){return staticSealed?runtimeInitialized?_malloc(t):Runtime.dynamicAlloc(t):Runtime.staticAlloc(t)}Module.getMemory=getMemory;function Pointer_stringify(t,e){if(e===0||!t)return"";for(var r=0,o,a=0;o=HEAPU8[t+a>>0],r|=o,!(o==0&&!e||(a++,e&&a==e)););e||(e=a);var n="";if(r<128){for(var u=1024,A;e>0;)A=String.fromCharCode.apply(String,HEAPU8.subarray(t,t+Math.min(e,u))),n=n?n+A:A,t+=u,e-=u;return n}return Module.UTF8ToString(t)}Module.Pointer_stringify=Pointer_stringify;function AsciiToString(t){for(var e="";;){var r=HEAP8[t++>>0];if(!r)return e;e+=String.fromCharCode(r)}}Module.AsciiToString=AsciiToString;function stringToAscii(t,e){return writeAsciiToMemory(t,e,!1)}Module.stringToAscii=stringToAscii;var UTF8Decoder=typeof TextDecoder<"u"?new TextDecoder("utf8"):void 0;function UTF8ArrayToString(t,e){for(var r=e;t[r];)++r;if(r-e>16&&t.subarray&&UTF8Decoder)return UTF8Decoder.decode(t.subarray(e,r));for(var o,a,n,u,A,p,h="";;){if(o=t[e++],!o)return h;if(!(o&128)){h+=String.fromCharCode(o);continue}if(a=t[e++]&63,(o&224)==192){h+=String.fromCharCode((o&31)<<6|a);continue}if(n=t[e++]&63,(o&240)==224?o=(o&15)<<12|a<<6|n:(u=t[e++]&63,(o&248)==240?o=(o&7)<<18|a<<12|n<<6|u:(A=t[e++]&63,(o&252)==248?o=(o&3)<<24|a<<18|n<<12|u<<6|A:(p=t[e++]&63,o=(o&1)<<30|a<<24|n<<18|u<<12|A<<6|p))),o<65536)h+=String.fromCharCode(o);else{var E=o-65536;h+=String.fromCharCode(55296|E>>10,56320|E&1023)}}}Module.UTF8ArrayToString=UTF8ArrayToString;function UTF8ToString(t){return UTF8ArrayToString(HEAPU8,t)}Module.UTF8ToString=UTF8ToString;function stringToUTF8Array(t,e,r,o){if(!(o>0))return 0;for(var a=r,n=r+o-1,u=0;u<t.length;++u){var A=t.charCodeAt(u);if(A>=55296&&A<=57343&&(A=65536+((A&1023)<<10)|t.charCodeAt(++u)&1023),A<=127){if(r>=n)break;e[r++]=A}else if(A<=2047){if(r+1>=n)break;e[r++]=192|A>>6,e[r++]=128|A&63}else if(A<=65535){if(r+2>=n)break;e[r++]=224|A>>12,e[r++]=128|A>>6&63,e[r++]=128|A&63}else if(A<=2097151){if(r+3>=n)break;e[r++]=240|A>>18,e[r++]=128|A>>12&63,e[r++]=128|A>>6&63,e[r++]=128|A&63}else if(A<=67108863){if(r+4>=n)break;e[r++]=248|A>>24,e[r++]=128|A>>18&63,e[r++]=128|A>>12&63,e[r++]=128|A>>6&63,e[r++]=128|A&63}else{if(r+5>=n)break;e[r++]=252|A>>30,e[r++]=128|A>>24&63,e[r++]=128|A>>18&63,e[r++]=128|A>>12&63,e[r++]=128|A>>6&63,e[r++]=128|A&63}}return e[r]=0,r-a}Module.stringToUTF8Array=stringToUTF8Array;function stringToUTF8(t,e,r){return stringToUTF8Array(t,HEAPU8,e,r)}Module.stringToUTF8=stringToUTF8;function lengthBytesUTF8(t){for(var e=0,r=0;r<t.length;++r){var o=t.charCodeAt(r);o>=55296&&o<=57343&&(o=65536+((o&1023)<<10)|t.charCodeAt(++r)&1023),o<=127?++e:o<=2047?e+=2:o<=65535?e+=3:o<=2097151?e+=4:o<=67108863?e+=5:e+=6}return e}Module.lengthBytesUTF8=lengthBytesUTF8;var UTF16Decoder=typeof TextDecoder<"u"?new TextDecoder("utf-16le"):void 0;function demangle(t){var e=Module.___cxa_demangle||Module.__cxa_demangle;if(e){try{var r=t.substr(1),o=lengthBytesUTF8(r)+1,a=_malloc(o);stringToUTF8(r,a,o);var n=_malloc(4),u=e(a,0,0,n);if(getValue(n,"i32")===0&&u)return Pointer_stringify(u)}catch{}finally{a&&_free(a),n&&_free(n),u&&_free(u)}return t}return Runtime.warnOnce("warning: build with  -s DEMANGLE_SUPPORT=1  to link in libcxxabi demangling"),t}function demangleAll(t){var e=/__Z[\w\d_]+/g;return t.replace(e,function(r){var o=demangle(r);return r===o?r:r+" ["+o+"]"})}function jsStackTrace(){var t=new Error;if(!t.stack){try{throw new Error(0)}catch(e){t=e}if(!t.stack)return"(no stack trace available)"}return t.stack.toString()}function stackTrace(){var t=jsStackTrace();return Module.extraStackTrace&&(t+=`
+`+Module.extraStackTrace()),demangleAll(t)}Module.stackTrace=stackTrace;var HEAP,buffer,HEAP8,HEAPU8,HEAP16,HEAPU16,HEAP32,HEAPU32,HEAPF32,HEAPF64;function updateGlobalBufferViews(){Module.HEAP8=HEAP8=new Int8Array(buffer),Module.HEAP16=HEAP16=new Int16Array(buffer),Module.HEAP32=HEAP32=new Int32Array(buffer),Module.HEAPU8=HEAPU8=new Uint8Array(buffer),Module.HEAPU16=HEAPU16=new Uint16Array(buffer),Module.HEAPU32=HEAPU32=new Uint32Array(buffer),Module.HEAPF32=HEAPF32=new Float32Array(buffer),Module.HEAPF64=HEAPF64=new Float64Array(buffer)}var STATIC_BASE,STATICTOP,staticSealed,STACK_BASE,STACKTOP,STACK_MAX,DYNAMIC_BASE,DYNAMICTOP_PTR;STATIC_BASE=STATICTOP=STACK_BASE=STACKTOP=STACK_MAX=DYNAMIC_BASE=DYNAMICTOP_PTR=0,staticSealed=!1;function abortOnCannotGrowMemory(){abort("Cannot enlarge memory arrays. Either (1) compile with  -s TOTAL_MEMORY=X  with X higher than the current value "+TOTAL_MEMORY+", (2) compile with  -s ALLOW_MEMORY_GROWTH=1  which allows increasing the size at runtime but prevents some optimizations, (3) set Module.TOTAL_MEMORY to a higher value before the program runs, or (4) if you want malloc to return NULL (0) instead of this abort, compile with  -s ABORTING_MALLOC=0 ")}function enlargeMemory(){abortOnCannotGrowMemory()}var TOTAL_STACK=Module.TOTAL_STACK||5242880,TOTAL_MEMORY=Module.TOTAL_MEMORY||134217728;TOTAL_MEMORY<TOTAL_STACK&&Module.printErr("TOTAL_MEMORY should be larger than TOTAL_STACK, was "+TOTAL_MEMORY+"! (TOTAL_STACK="+TOTAL_STACK+")"),Module.buffer?buffer=Module.buffer:buffer=new ArrayBuffer(TOTAL_MEMORY),updateGlobalBufferViews();function getTotalMemory(){return TOTAL_MEMORY}if(HEAP32[0]=1668509029,HEAP16[1]=25459,HEAPU8[2]!==115||HEAPU8[3]!==99)throw"Runtime error: expected the system to be little-endian!";Module.HEAP=HEAP,Module.buffer=buffer,Module.HEAP8=HEAP8,Module.HEAP16=HEAP16,Module.HEAP32=HEAP32,Module.HEAPU8=HEAPU8,Module.HEAPU16=HEAPU16,Module.HEAPU32=HEAPU32,Module.HEAPF32=HEAPF32,Module.HEAPF64=HEAPF64;function callRuntimeCallbacks(t){for(;t.length>0;){var e=t.shift();if(typeof e=="function"){e();continue}var r=e.func;typeof r=="number"?e.arg===void 0?Module.dynCall_v(r):Module.dynCall_vi(r,e.arg):r(e.arg===void 0?null:e.arg)}}var __ATPRERUN__=[],__ATINIT__=[],__ATMAIN__=[],__ATEXIT__=[],__ATPOSTRUN__=[],runtimeInitialized=!1,runtimeExited=!1;function preRun(){if(Module.preRun)for(typeof Module.preRun=="function"&&(Module.preRun=[Module.preRun]);Module.preRun.length;)addOnPreRun(Module.preRun.shift());callRuntimeCallbacks(__ATPRERUN__)}function ensureInitRuntime(){runtimeInitialized||(runtimeInitialized=!0,callRuntimeCallbacks(__ATINIT__))}function preMain(){callRuntimeCallbacks(__ATMAIN__)}function exitRuntime(){callRuntimeCallbacks(__ATEXIT__),runtimeExited=!0}function postRun(){if(Module.postRun)for(typeof Module.postRun=="function"&&(Module.postRun=[Module.postRun]);Module.postRun.length;)addOnPostRun(Module.postRun.shift());callRuntimeCallbacks(__ATPOSTRUN__)}function addOnPreRun(t){__ATPRERUN__.unshift(t)}Module.addOnPreRun=addOnPreRun;function addOnInit(t){__ATINIT__.unshift(t)}Module.addOnInit=addOnInit;function addOnPreMain(t){__ATMAIN__.unshift(t)}Module.addOnPreMain=addOnPreMain;function addOnExit(t){__ATEXIT__.unshift(t)}Module.addOnExit=addOnExit;function addOnPostRun(t){__ATPOSTRUN__.unshift(t)}Module.addOnPostRun=addOnPostRun;function intArrayFromString(t,e,r){var o=r>0?r:lengthBytesUTF8(t)+1,a=new Array(o),n=stringToUTF8Array(t,a,0,a.length);return e&&(a.length=n),a}Module.intArrayFromString=intArrayFromString;function intArrayToString(t){for(var e=[],r=0;r<t.length;r++){var o=t[r];o>255&&(o&=255),e.push(String.fromCharCode(o))}return e.join("")}Module.intArrayToString=intArrayToString;function writeStringToMemory(t,e,r){Runtime.warnOnce("writeStringToMemory is deprecated and should not be called! Use stringToUTF8() instead!");var o,a;r&&(a=e+lengthBytesUTF8(t),o=HEAP8[a]),stringToUTF8(t,e,1/0),r&&(HEAP8[a]=o)}Module.writeStringToMemory=writeStringToMemory;function writeArrayToMemory(t,e){HEAP8.set(t,e)}Module.writeArrayToMemory=writeArrayToMemory;function writeAsciiToMemory(t,e,r){for(var o=0;o<t.length;++o)HEAP8[e++>>0]=t.charCodeAt(o);r||(HEAP8[e>>0]=0)}if(Module.writeAsciiToMemory=writeAsciiToMemory,(!Math.imul||Math.imul(4294967295,5)!==-5)&&(Math.imul=function t(e,r){var o=e>>>16,a=e&65535,n=r>>>16,u=r&65535;return a*u+(o*u+a*n<<16)|0}),Math.imul=Math.imul,!Math.fround){var froundBuffer=new Float32Array(1);Math.fround=function(t){return froundBuffer[0]=t,froundBuffer[0]}}Math.fround=Math.fround,Math.clz32||(Math.clz32=function(t){t=t>>>0;for(var e=0;e<32;e++)if(t&1<<31-e)return e;return 32}),Math.clz32=Math.clz32,Math.trunc||(Math.trunc=function(t){return t<0?Math.ceil(t):Math.floor(t)}),Math.trunc=Math.trunc;var Math_abs=Math.abs,Math_cos=Math.cos,Math_sin=Math.sin,Math_tan=Math.tan,Math_acos=Math.acos,Math_asin=Math.asin,Math_atan=Math.atan,Math_atan2=Math.atan2,Math_exp=Math.exp,Math_log=Math.log,Math_sqrt=Math.sqrt,Math_ceil=Math.ceil,Math_floor=Math.floor,Math_pow=Math.pow,Math_imul=Math.imul,Math_fround=Math.fround,Math_round=Math.round,Math_min=Math.min,Math_clz32=Math.clz32,Math_trunc=Math.trunc,runDependencies=0,runDependencyWatcher=null,dependenciesFulfilled=null;function getUniqueRunDependency(t){return t}function addRunDependency(t){runDependencies++,Module.monitorRunDependencies&&Module.monitorRunDependencies(runDependencies)}Module.addRunDependency=addRunDependency;function removeRunDependency(t){if(runDependencies--,Module.monitorRunDependencies&&Module.monitorRunDependencies(runDependencies),runDependencies==0&&(runDependencyWatcher!==null&&(clearInterval(runDependencyWatcher),runDependencyWatcher=null),dependenciesFulfilled)){var e=dependenciesFulfilled;dependenciesFulfilled=null,e()}}Module.removeRunDependency=removeRunDependency,Module.preloadedImages={},Module.preloadedAudios={};var ASM_CONSTS=[function(t,e,r,o,a,n,u,A){return _nbind.callbackSignatureList[t].apply(this,arguments)}];function _emscripten_asm_const_iiiiiiii(t,e,r,o,a,n,u,A){return ASM_CONSTS[t](e,r,o,a,n,u,A)}function _emscripten_asm_const_iiiii(t,e,r,o,a){return ASM_CONSTS[t](e,r,o,a)}function _emscripten_asm_const_iiidddddd(t,e,r,o,a,n,u,A,p){return ASM_CONSTS[t](e,r,o,a,n,u,A,p)}function _emscripten_asm_const_iiididi(t,e,r,o,a,n,u){return ASM_CONSTS[t](e,r,o,a,n,u)}function _emscripten_asm_const_iiii(t,e,r,o){return ASM_CONSTS[t](e,r,o)}function _emscripten_asm_const_iiiid(t,e,r,o,a){return ASM_CONSTS[t](e,r,o,a)}function _emscripten_asm_const_iiiiii(t,e,r,o,a,n){return ASM_CONSTS[t](e,r,o,a,n)}STATIC_BASE=Runtime.GLOBAL_BASE,STATICTOP=STATIC_BASE+12800,__ATINIT__.push({func:function(){__GLOBAL__sub_I_Yoga_cpp()}},{func:function(){__GLOBAL__sub_I_nbind_cc()}},{func:function(){__GLOBAL__sub_I_common_cc()}},{func:function(){__GLOBAL__sub_I_Binding_cc()}}),allocate([0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,127,0,0,192,127,0,0,192,127,0,0,192,127,3,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,3,0,0,0,0,0,192,127,3,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,127,0,0,192,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,127,0,0,0,0,0,0,0,0,255,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,127,0,0,192,127,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,0,0,128,191,0,0,128,191,0,0,192,127,0,0,0,0,0,0,0,0,0,0,128,63,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,3,0,0,0,1,0,0,0,2,0,0,0,0,0,0,0,190,12,0,0,200,12,0,0,208,12,0,0,216,12,0,0,230,12,0,0,242,12,0,0,1,0,0,0,3,0,0,0,0,0,0,0,2,0,0,0,0,0,192,127,3,0,0,0,180,45,0,0,181,45,0,0,182,45,0,0,181,45,0,0,182,45,0,0,0,0,0,0,0,0,0,0,1,0,0,0,2,0,0,0,3,0,0,0,1,0,0,0,4,0,0,0,183,45,0,0,181,45,0,0,181,45,0,0,181,45,0,0,181,45,0,0,181,45,0,0,181,45,0,0,184,45,0,0,185,45,0,0,181,45,0,0,181,45,0,0,182,45,0,0,186,45,0,0,185,45,0,0,148,4,0,0,3,0,0,0,187,45,0,0,164,4,0,0,188,45,0,0,2,0,0,0,189,45,0,0,164,4,0,0,188,45,0,0,185,45,0,0,164,4,0,0,185,45,0,0,164,4,0,0,188,45,0,0,181,45,0,0,182,45,0,0,181,45,0,0,0,0,0,0,0,0,0,0,1,0,0,0,5,0,0,0,6,0,0,0,1,0,0,0,7,0,0,0,183,45,0,0,182,45,0,0,181,45,0,0,190,45,0,0,190,45,0,0,182,45,0,0,182,45,0,0,185,45,0,0,181,45,0,0,185,45,0,0,182,45,0,0,181,45,0,0,185,45,0,0,182,45,0,0,185,45,0,0,48,5,0,0,3,0,0,0,56,5,0,0,1,0,0,0,189,45,0,0,185,45,0,0,164,4,0,0,76,5,0,0,2,0,0,0,191,45,0,0,186,45,0,0,182,45,0,0,185,45,0,0,192,45,0,0,185,45,0,0,182,45,0,0,186,45,0,0,185,45,0,0,76,5,0,0,76,5,0,0,136,5,0,0,182,45,0,0,181,45,0,0,2,0,0,0,190,45,0,0,136,5,0,0,56,19,0,0,156,5,0,0,2,0,0,0,184,45,0,0,0,0,0,0,0,0,0,0,1,0,0,0,8,0,0,0,9,0,0,0,1,0,0,0,10,0,0,0,204,5,0,0,181,45,0,0,181,45,0,0,2,0,0,0,180,45,0,0,204,5,0,0,2,0,0,0,195,45,0,0,236,5,0,0,97,19,0,0,198,45,0,0,211,45,0,0,212,45,0,0,213,45,0,0,214,45,0,0,215,45,0,0,188,45,0,0,182,45,0,0,216,45,0,0,217,45,0,0,218,45,0,0,219,45,0,0,192,45,0,0,181,45,0,0,0,0,0,0,185,45,0,0,110,19,0,0,186,45,0,0,115,19,0,0,221,45,0,0,120,19,0,0,148,4,0,0,132,19,0,0,96,6,0,0,145,19,0,0,222,45,0,0,164,19,0,0,223,45,0,0,173,19,0,0,0,0,0,0,3,0,0,0,104,6,0,0,1,0,0,0,187,45,0,0,0,0,0,0,0,0,0,0,1,0,0,0,11,0,0,0,12,0,0,0,1,0,0,0,13,0,0,0,185,45,0,0,224,45,0,0,164,6,0,0,188,45,0,0,172,6,0,0,180,6,0,0,2,0,0,0,188,6,0,0,7,0,0,0,224,45,0,0,7,0,0,0,164,6,0,0,1,0,0,0,213,45,0,0,185,45,0,0,224,45,0,0,172,6,0,0,185,45,0,0,224,45,0,0,164,6,0,0,185,45,0,0,224,45,0,0,211,45,0,0,211,45,0,0,222,45,0,0,211,45,0,0,224,45,0,0,222,45,0,0,211,45,0,0,224,45,0,0,172,6,0,0,222,45,0,0,211,45,0,0,224,45,0,0,188,45,0,0,222,45,0,0,211,45,0,0,40,7,0,0,188,45,0,0,2,0,0,0,224,45,0,0,185,45,0,0,188,45,0,0,188,45,0,0,188,45,0,0,188,45,0,0,222,45,0,0,224,45,0,0,148,4,0,0,185,45,0,0,148,4,0,0,148,4,0,0,148,4,0,0,148,4,0,0,148,4,0,0,185,45,0,0,164,6,0,0,148,4,0,0,0,0,0,0,0,0,0,0,1,0,0,0,14,0,0,0,15,0,0,0,1,0,0,0,16,0,0,0,148,7,0,0,2,0,0,0,225,45,0,0,183,45,0,0,188,45,0,0,168,7,0,0,5,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,2,0,0,0,234,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,148,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,9,0,0,5,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,2,0,0,0,242,45,0,0,0,4,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,255,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,67,111,117,108,100,32,110,111,116,32,97,108,108,111,99,97,116,101,32,109,101,109,111,114,121,32,102,111,114,32,110,111,100,101,0,67,97,110,110,111,116,32,114,101,115,101,116,32,97,32,110,111,100,101,32,119,104,105,99,104,32,115,116,105,108,108,32,104,97,115,32,99,104,105,108,100,114,101,110,32,97,116,116,97,99,104,101,100,0,67,97,110,110,111,116,32,114,101,115,101,116,32,97,32,110,111,100,101,32,115,116,105,108,108,32,97,116,116,97,99,104,101,100,32,116,111,32,97,32,112,97,114,101,110,116,0,67,111,117,108,100,32,110,111,116,32,97,108,108,111,99,97,116,101,32,109,101,109,111,114,121,32,102,111,114,32,99,111,110,102,105,103,0,67,97,110,110,111,116,32,115,101,116,32,109,101,97,115,117,114,101,32,102,117,110,99,116,105,111,110,58,32,78,111,100,101,115,32,119,105,116,104,32,109,101,97,115,117,114,101,32,102,117,110,99,116,105,111,110,115,32,99,97,110,110,111,116,32,104,97,118,101,32,99,104,105,108,100,114,101,110,46,0,67,104,105,108,100,32,97,108,114,101,97,100,121,32,104,97,115,32,97,32,112,97,114,101,110,116,44,32,105,116,32,109,117,115,116,32,98,101,32,114,101,109,111,118,101,100,32,102,105,114,115,116,46,0,67,97,110,110,111,116,32,97,100,100,32,99,104,105,108,100,58,32,78,111,100,101,115,32,119,105,116,104,32,109,101,97,115,117,114,101,32,102,117,110,99,116,105,111,110,115,32,99,97,110,110,111,116,32,104,97,118,101,32,99,104,105,108,100,114,101,110,46,0,79,110,108,121,32,108,101,97,102,32,110,111,100,101,115,32,119,105,116,104,32,99,117,115,116,111,109,32,109,101,97,115,117,114,101,32,102,117,110,99,116,105,111,110,115,115,104,111,117,108,100,32,109,97,110,117,97,108,108,121,32,109,97,114,107,32,116,104,101,109,115,101,108,118,101,115,32,97,115,32,100,105,114,116,121,0,67,97,110,110,111,116,32,103,101,116,32,108,97,121,111,117,116,32,112,114,111,112,101,114,116,105,101,115,32,111,102,32,109,117,108,116,105,45,101,100,103,101,32,115,104,111,114,116,104,97,110,100,115,0,37,115,37,100,46,123,91,115,107,105,112,112,101,100,93,32,0,119,109,58,32,37,115,44,32,104,109,58,32,37,115,44,32,97,119,58,32,37,102,32,97,104,58,32,37,102,32,61,62,32,100,58,32,40,37,102,44,32,37,102,41,32,37,115,10,0,37,115,37,100,46,123,37,115,0,42,0,119,109,58,32,37,115,44,32,104,109,58,32,37,115,44,32,97,119,58,32,37,102,32,97,104,58,32,37,102,32,37,115,10,0,37,115,37,100,46,125,37,115,0,119,109,58,32,37,115,44,32,104,109,58,32,37,115,44,32,100,58,32,40,37,102,44,32,37,102,41,32,37,115,10,0,79,117,116,32,111,102,32,99,97,99,104,101,32,101,110,116,114,105,101,115,33,10,0,83,99,97,108,101,32,102,97,99,116,111,114,32,115,104,111,117,108,100,32,110,111,116,32,98,101,32,108,101,115,115,32,116,104,97,110,32,122,101,114,111,0,105,110,105,116,105,97,108,0,37,115,10,0,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,0,85,78,68,69,70,73,78,69,68,0,69,88,65,67,84,76,89,0,65,84,95,77,79,83,84,0,76,65,89,95,85,78,68,69,70,73,78,69,68,0,76,65,89,95,69,88,65,67,84,76,89,0,76,65,89,95,65,84,95,77,79,83,84,0,97,118,97,105,108,97,98,108,101,87,105,100,116,104,32,105,115,32,105,110,100,101,102,105,110,105,116,101,32,115,111,32,119,105,100,116,104,77,101,97,115,117,114,101,77,111,100,101,32,109,117,115,116,32,98,101,32,89,71,77,101,97,115,117,114,101,77,111,100,101,85,110,100,101,102,105,110,101,100,0,97,118,97,105,108,97,98,108,101,72,101,105,103,104,116,32,105,115,32,105,110,100,101,102,105,110,105,116,101,32,115,111,32,104,101,105,103,104,116,77,101,97,115,117,114,101,77,111,100,101,32,109,117,115,116,32,98,101,32,89,71,77,101,97,115,117,114,101,77,111,100,101,85,110,100,101,102,105,110,101,100,0,102,108,101,120,0,115,116,114,101,116,99,104,0,109,117,108,116,105,108,105,110,101,45,115,116,114,101,116,99,104,0,69,120,112,101,99,116,101,100,32,110,111,100,101,32,116,111,32,104,97,118,101,32,99,117,115,116,111,109,32,109,101,97,115,117,114,101,32,102,117,110,99,116,105,111,110,0,109,101,97,115,117,114,101,0,69,120,112,101,99,116,32,99,117,115,116,111,109,32,98,97,115,101,108,105,110,101,32,102,117,110,99,116,105,111,110,32,116,111,32,110,111,116,32,114,101,116,117,114,110,32,78,97,78,0,97,98,115,45,109,101,97,115,117,114,101,0,97,98,115,45,108,97,121,111,117,116,0,78,111,100,101,0,99,114,101,97,116,101,68,101,102,97,117,108,116,0,99,114,101,97,116,101,87,105,116,104,67,111,110,102,105,103,0,100,101,115,116,114,111,121,0,114,101,115,101,116,0,99,111,112,121,83,116,121,108,101,0,115,101,116,80,111,115,105,116,105,111,110,84,121,112,101,0,115,101,116,80,111,115,105,116,105,111,110,0,115,101,116,80,111,115,105,116,105,111,110,80,101,114,99,101,110,116,0,115,101,116,65,108,105,103,110,67,111,110,116,101,110,116,0,115,101,116,65,108,105,103,110,73,116,101,109,115,0,115,101,116,65,108,105,103,110,83,101,108,102,0,115,101,116,70,108,101,120,68,105,114,101,99,116,105,111,110,0,115,101,116,70,108,101,120,87,114,97,112,0,115,101,116,74,117,115,116,105,102,121,67,111,110,116,101,110,116,0,115,101,116,77,97,114,103,105,110,0,115,101,116,77,97,114,103,105,110,80,101,114,99,101,110,116,0,115,101,116,77,97,114,103,105,110,65,117,116,111,0,115,101,116,79,118,101,114,102,108,111,119,0,115,101,116,68,105,115,112,108,97,121,0,115,101,116,70,108,101,120,0,115,101,116,70,108,101,120,66,97,115,105,115,0,115,101,116,70,108,101,120,66,97,115,105,115,80,101,114,99,101,110,116,0,115,101,116,70,108,101,120,71,114,111,119,0,115,101,116,70,108,101,120,83,104,114,105,110,107,0,115,101,116,87,105,100,116,104,0,115,101,116,87,105,100,116,104,80,101,114,99,101,110,116,0,115,101,116,87,105,100,116,104,65,117,116,111,0,115,101,116,72,101,105,103,104,116,0,115,101,116,72,101,105,103,104,116,80,101,114,99,101,110,116,0,115,101,116,72,101,105,103,104,116,65,117,116,111,0,115,101,116,77,105,110,87,105,100,116,104,0,115,101,116,77,105,110,87,105,100,116,104,80,101,114,99,101,110,116,0,115,101,116,77,105,110,72,101,105,103,104,116,0,115,101,116,77,105,110,72,101,105,103,104,116,80,101,114,99,101,110,116,0,115,101,116,77,97,120,87,105,100,116,104,0,115,101,116,77,97,120,87,105,100,116,104,80,101,114,99,101,110,116,0,115,101,116,77,97,120,72,101,105,103,104,116,0,115,101,116,77,97,120,72,101,105,103,104,116,80,101,114,99,101,110,116,0,115,101,116,65,115,112,101,99,116,82,97,116,105,111,0,115,101,116,66,111,114,100,101,114,0,115,101,116,80,97,100,100,105,110,103,0,115,101,116,80,97,100,100,105,110,103,80,101,114,99,101,110,116,0,103,101,116,80,111,115,105,116,105,111,110,84,121,112,101,0,103,101,116,80,111,115,105,116,105,111,110,0,103,101,116,65,108,105,103,110,67,111,110,116,101,110,116,0,103,101,116,65,108,105,103,110,73,116,101,109,115,0,103,101,116,65,108,105,103,110,83,101,108,102,0,103,101,116,70,108,101,120,68,105,114,101,99,116,105,111,110,0,103,101,116,70,108,101,120,87,114,97,112,0,103,101,116,74,117,115,116,105,102,121,67,111,110,116,101,110,116,0,103,101,116,77,97,114,103,105,110,0,103,101,116,70,108,101,120,66,97,115,105,115,0,103,101,116,70,108,101,120,71,114,111,119,0,103,101,116,70,108,101,120,83,104,114,105,110,107,0,103,101,116,87,105,100,116,104,0,103,101,116,72,101,105,103,104,116,0,103,101,116,77,105,110,87,105,100,116,104,0,103,101,116,77,105,110,72,101,105,103,104,116,0,103,101,116,77,97,120,87,105,100,116,104,0,103,101,116,77,97,120,72,101,105,103,104,116,0,103,101,116,65,115,112,101,99,116,82,97,116,105,111,0,103,101,116,66,111,114,100,101,114,0,103,101,116,79,118,101,114,102,108,111,119,0,103,101,116,68,105,115,112,108,97,121,0,103,101,116,80,97,100,100,105,110,103,0,105,110,115,101,114,116,67,104,105,108,100,0,114,101,109,111,118,101,67,104,105,108,100,0,103,101,116,67,104,105,108,100,67,111,117,110,116,0,103,101,116,80,97,114,101,110,116,0,103,101,116,67,104,105,108,100,0,115,101,116,77,101,97,115,117,114,101,70,117,110,99,0,117,110,115,101,116,77,101,97,115,117,114,101,70,117,110,99,0,109,97,114,107,68,105,114,116,121,0,105,115,68,105,114,116,121,0,99,97,108,99,117,108,97,116,101,76,97,121,111,117,116,0,103,101,116,67,111,109,112,117,116,101,100,76,101,102,116,0,103,101,116,67,111,109,112,117,116,101,100,82,105,103,104,116,0,103,101,116,67,111,109,112,117,116,101,100,84,111,112,0,103,101,116,67,111,109,112,117,116,101,100,66,111,116,116,111,109,0,103,101,116,67,111,109,112,117,116,101,100,87,105,100,116,104,0,103,101,116,67,111,109,112,117,116,101,100,72,101,105,103,104,116,0,103,101,116,67,111,109,112,117,116,101,100,76,97,121,111,117,116,0,103,101,116,67,111,109,112,117,116,101,100,77,97,114,103,105,110,0,103,101,116,67,111,109,112,117,116,101,100,66,111,114,100,101,114,0,103,101,116,67,111,109,112,117,116,101,100,80,97,100,100,105,110,103,0,67,111,110,102,105,103,0,99,114,101,97,116,101,0,115,101,116,69,120,112,101,114,105,109,101,110,116,97,108,70,101,97,116,117,114,101,69,110,97,98,108,101,100,0,115,101,116,80,111,105,110,116,83,99,97,108,101,70,97,99,116,111,114,0,105,115,69,120,112,101,114,105,109,101,110,116,97,108,70,101,97,116,117,114,101,69,110,97,98,108,101,100,0,86,97,108,117,101,0,76,97,121,111,117,116,0,83,105,122,101,0,103,101,116,73,110,115,116,97,110,99,101,67,111,117,110,116,0,73,110,116,54,52,0,1,1,1,2,2,4,4,4,4,8,8,4,8,118,111,105,100,0,98,111,111,108,0,115,116,100,58,58,115,116,114,105,110,103,0,99,98,70,117,110,99,116,105,111,110,32,38,0,99,111,110,115,116,32,99,98,70,117,110,99,116,105,111,110,32,38,0,69,120,116,101,114,110,97,108,0,66,117,102,102,101,114,0,78,66,105,110,100,73,68,0,78,66,105,110,100,0,98,105,110,100,95,118,97,108,117,101,0,114,101,102,108,101,99,116,0,113,117,101,114,121,84,121,112,101,0,108,97,108,108,111,99,0,108,114,101,115,101,116,0,123,114,101,116,117,114,110,40,95,110,98,105,110,100,46,99,97,108,108,98,97,99,107,83,105,103,110,97,116,117,114,101,76,105,115,116,91,36,48,93,46,97,112,112,108,121,40,116,104,105,115,44,97,114,103,117,109,101,110,116,115,41,41,59,125,0,95,110,98,105,110,100,95,110,101,119,0,17,0,10,0,17,17,17,0,0,0,0,5,0,0,0,0,0,0,9,0,0,0,0,11,0,0,0,0,0,0,0,0,17,0,15,10,17,17,17,3,10,7,0,1,19,9,11,11,0,0,9,6,11,0,0,11,0,6,17,0,0,0,17,17,17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,17,0,10,10,17,17,17,0,10,0,0,2,0,9,11,0,0,0,9,0,11,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,12,0,0,0,0,9,12,0,0,0,0,0,12,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14,0,0,0,0,0,0,0,0,0,0,0,13,0,0,0,4,13,0,0,0,0,9,14,0,0,0,0,0,14,0,0,14,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,15,0,0,0,0,9,16,0,0,0,0,0,16,0,0,16,0,0,18,0,0,0,18,18,18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,0,0,0,18,18,18,0,0,0,0,0,0,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,10,0,0,0,0,10,0,0,0,0,9,11,0,0,0,0,0,11,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,12,0,0,0,0,9,12,0,0,0,0,0,12,0,0,12,0,0,45,43,32,32,32,48,88,48,120,0,40,110,117,108,108,41,0,45,48,88,43,48,88,32,48,88,45,48,120,43,48,120,32,48,120,0,105,110,102,0,73,78,70,0,110,97,110,0,78,65,78,0,48,49,50,51,52,53,54,55,56,57,65,66,67,68,69,70,46,0,84,33,34,25,13,1,2,3,17,75,28,12,16,4,11,29,18,30,39,104,110,111,112,113,98,32,5,6,15,19,20,21,26,8,22,7,40,36,23,24,9,10,14,27,31,37,35,131,130,125,38,42,43,60,61,62,63,67,71,74,77,88,89,90,91,92,93,94,95,96,97,99,100,101,102,103,105,106,107,108,114,115,116,121,122,123,124,0,73,108,108,101,103,97,108,32,98,121,116,101,32,115,101,113,117,101,110,99,101,0,68,111,109,97,105,110,32,101,114,114,111,114,0,82,101,115,117,108,116,32,110,111,116,32,114,101,112,114,101,115,101,110,116,97,98,108,101,0,78,111,116,32,97,32,116,116,121,0,80,101,114,109,105,115,115,105,111,110,32,100,101,110,105,101,100,0,79,112,101,114,97,116,105,111,110,32,110,111,116,32,112,101,114,109,105,116,116,101,100,0,78,111,32,115,117,99,104,32,102,105,108,101,32,111,114,32,100,105,114,101,99,116,111,114,121,0,78,111,32,115,117,99,104,32,112,114,111,99,101,115,115,0,70,105,108,101,32,101,120,105,115,116,115,0,86,97,108,117,101,32,116,111,111,32,108,97,114,103,101,32,102,111,114,32,100,97,116,97,32,116,121,112,101,0,78,111,32,115,112,97,99,101,32,108,101,102,116,32,111,110,32,100,101,118,105,99,101,0,79,117,116,32,111,102,32,109,101,109,111,114,121,0,82,101,115,111,117,114,99,101,32,98,117,115,121,0,73,110,116,101,114,114,117,112,116,101,100,32,115,121,115,116,101,109,32,99,97,108,108,0,82,101,115,111,117,114,99,101,32,116,101,109,112,111,114,97,114,105,108,121,32,117,110,97,118,97,105,108,97,98,108,101,0,73,110,118,97,108,105,100,32,115,101,101,107,0,67,114,111,115,115,45,100,101,118,105,99,101,32,108,105,110,107,0,82,101,97,100,45,111,110,108,121,32,102,105,108,101,32,115,121,115,116,101,109,0,68,105,114,101,99,116,111,114,121,32,110,111,116,32,101,109,112,116,121,0,67,111,110,110,101,99,116,105,111,110,32,114,101,115,101,116,32,98,121,32,112,101,101,114,0,79,112,101,114,97,116,105,111,110,32,116,105,109,101,100,32,111,117,116,0,67,111,110,110,101,99,116,105,111,110,32,114,101,102,117,115,101,100,0,72,111,115,116,32,105,115,32,100,111,119,110,0,72,111,115,116,32,105,115,32,117,110,114,101,97,99,104,97,98,108,101,0,65,100,100,114,101,115,115,32,105,110,32,117,115,101,0,66,114,111,107,101,110,32,112,105,112,101,0,73,47,79,32,101,114,114,111,114,0,78,111,32,115,117,99,104,32,100,101,118,105,99,101,32,111,114,32,97,100,100,114,101,115,115,0,66,108,111,99,107,32,100,101,118,105,99,101,32,114,101,113,117,105,114,101,100,0,78,111,32,115,117,99,104,32,100,101,118,105,99,101,0,78,111,116,32,97,32,100,105,114,101,99,116,111,114,121,0,73,115,32,97,32,100,105,114,101,99,116,111,114,121,0,84,101,120,116,32,102,105,108,101,32,98,117,115,121,0,69,120,101,99,32,102,111,114,109,97,116,32,101,114,114,111,114,0,73,110,118,97,108,105,100,32,97,114,103,117,109,101,110,116,0,65,114,103,117,109,101,110,116,32,108,105,115,116,32,116,111,111,32,108,111,110,103,0,83,121,109,98,111,108,105,99,32,108,105,110,107,32,108,111,111,112,0,70,105,108,101,110,97,109,101,32,116,111,111,32,108,111,110,103,0,84,111,111,32,109,97,110,121,32,111,112,101,110,32,102,105,108,101,115,32,105,110,32,115,121,115,116,101,109,0,78,111,32,102,105,108,101,32,100,101,115,99,114,105,112,116,111,114,115,32,97,118,97,105,108,97,98,108,101,0,66,97,100,32,102,105,108,101,32,100,101,115,99,114,105,112,116,111,114,0,78,111,32,99,104,105,108,100,32,112,114,111,99,101,115,115,0,66,97,100,32,97,100,100,114,101,115,115,0,70,105,108,101,32,116,111,111,32,108,97,114,103,101,0,84,111,111,32,109,97,110,121,32,108,105,110,107,115,0,78,111,32,108,111,99,107,115,32,97,118,97,105,108,97,98,108,101,0,82,101,115,111,117,114,99,101,32,100,101,97,100,108,111,99,107,32,119,111,117,108,100,32,111,99,99,117,114,0,83,116,97,116,101,32,110,111,116,32,114,101,99,111,118,101,114,97,98,108,101,0,80,114,101,118,105,111,117,115,32,111,119,110,101,114,32,100,105,101,100,0,79,112,101,114,97,116,105,111,110,32,99,97,110,99,101,108,101,100,0,70,117,110,99,116,105,111,110,32,110,111,116,32,105,109,112,108,101,109,101,110,116,101,100,0,78,111,32,109,101,115,115,97,103,101,32,111,102,32,100,101,115,105,114,101,100,32,116,121,112,101,0,73,100,101,110,116,105,102,105,101,114,32,114,101,109,111,118,101,100,0,68,101,118,105,99,101,32,110,111,116,32,97,32,115,116,114,101,97,109,0,78,111,32,100,97,116,97,32,97,118,97,105,108,97,98,108,101,0,68,101,118,105,99,101,32,116,105,109,101,111,117,116,0,79,117,116,32,111,102,32,115,116,114,101,97,109,115,32,114,101,115,111,117,114,99,101,115,0,76,105,110,107,32,104,97,115,32,98,101,101,110,32,115,101,118,101,114,101,100,0,80,114,111,116,111,99,111,108,32,101,114,114,111,114,0,66,97,100,32,109,101,115,115,97,103,101,0,70,105,108,101,32,100,101,115,99,114,105,112,116,111,114,32,105,110,32,98,97,100,32,115,116,97,116,101,0,78,111,116,32,97,32,115,111,99,107,101,116,0,68,101,115,116,105,110,97,116,105,111,110,32,97,100,100,114,101,115,115,32,114,101,113,117,105,114,101,100,0,77,101,115,115,97,103,101,32,116,111,111,32,108,97,114,103,101,0,80,114,111,116,111,99,111,108,32,119,114,111,110,103,32,116,121,112,101,32,102,111,114,32,115,111,99,107,101,116,0,80,114,111,116,111,99,111,108,32,110,111,116,32,97,118,97,105,108,97,98,108,101,0,80,114,111,116,111,99,111,108,32,110,111,116,32,115,117,112,112,111,114,116,101,100,0,83,111,99,107,101,116,32,116,121,112,101,32,110,111,116,32,115,117,112,112,111,114,116,101,100,0,78,111,116,32,115,117,112,112,111,114,116,101,100,0,80,114,111,116,111,99,111,108,32,102,97,109,105,108,121,32,110,111,116,32,115,117,112,112,111,114,116,101,100,0,65,100,100,114,101,115,115,32,102,97,109,105,108,121,32,110,111,116,32,115,117,112,112,111,114,116,101,100,32,98,121,32,112,114,111,116,111,99,111,108,0,65,100,100,114,101,115,115,32,110,111,116,32,97,118,97,105,108,97,98,108,101,0,78,101,116,119,111,114,107,32,105,115,32,100,111,119,110,0,78,101,116,119,111,114,107,32,117,110,114,101,97,99,104,97,98,108,101,0,67,111,110,110,101,99,116,105,111,110,32,114,101,115,101,116,32,98,121,32,110,101,116,119,111,114,107,0,67,111,110,110,101,99,116,105,111,110,32,97,98,111,114,116,101,100,0,78,111,32,98,117,102,102,101,114,32,115,112,97,99,101,32,97,118,97,105,108,97,98,108,101,0,83,111,99,107,101,116,32,105,115,32,99,111,110,110,101,99,116,101,100,0,83,111,99,107,101,116,32,110,111,116,32,99,111,110,110,101,99,116,101,100,0,67,97,110,110,111,116,32,115,101,110,100,32,97,102,116,101,114,32,115,111,99,107,101,116,32,115,104,117,116,100,111,119,110,0,79,112,101,114,97,116,105,111,110,32,97,108,114,101,97,100,121,32,105,110,32,112,114,111,103,114,101,115,115,0,79,112,101,114,97,116,105,111,110,32,105,110,32,112,114,111,103,114,101,115,115,0,83,116,97,108,101,32,102,105,108,101,32,104,97,110,100,108,101,0,82,101,109,111,116,101,32,73,47,79,32,101,114,114,111,114,0,81,117,111,116,97,32,101,120,99,101,101,100,101,100,0,78,111,32,109,101,100,105,117,109,32,102,111,117,110,100,0,87,114,111,110,103,32,109,101,100,105,117,109,32,116,121,112,101,0,78,111,32,101,114,114,111,114,32,105,110,102,111,114,109,97,116,105,111,110,0,0],"i8",ALLOC_NONE,Runtime.GLOBAL_BASE);var tempDoublePtr=STATICTOP;STATICTOP+=16;function _atexit(t,e){__ATEXIT__.unshift({func:t,arg:e})}function ___cxa_atexit(){return _atexit.apply(null,arguments)}function _abort(){Module.abort()}function __ZN8facebook4yoga14YGNodeToStringEPNSt3__212basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEP6YGNode14YGPrintOptionsj(){Module.printErr("missing function: _ZN8facebook4yoga14YGNodeToStringEPNSt3__212basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEP6YGNode14YGPrintOptionsj"),abort(-1)}function __decorate(t,e,r,o){var a=arguments.length,n=a<3?e:o===null?o=Object.getOwnPropertyDescriptor(e,r):o,u;if(typeof Reflect=="object"&&typeof Reflect.decorate=="function")n=Reflect.decorate(t,e,r,o);else for(var A=t.length-1;A>=0;A--)(u=t[A])&&(n=(a<3?u(n):a>3?u(e,r,n):u(e,r))||n);return a>3&&n&&Object.defineProperty(e,r,n),n}function _defineHidden(t){return function(e,r){Object.defineProperty(e,r,{configurable:!1,enumerable:!1,value:t,writable:!0})}}var _nbind={};function __nbind_free_external(t){_nbind.externalList[t].dereference(t)}function __nbind_reference_external(t){_nbind.externalList[t].reference()}function _llvm_stackrestore(t){var e=_llvm_stacksave,r=e.LLVM_SAVEDSTACKS[t];e.LLVM_SAVEDSTACKS.splice(t,1),Runtime.stackRestore(r)}function __nbind_register_pool(t,e,r,o){_nbind.Pool.pageSize=t,_nbind.Pool.usedPtr=e/4,_nbind.Pool.rootPtr=r,_nbind.Pool.pagePtr=o/4,HEAP32[e/4]=16909060,HEAP8[e]==1&&(_nbind.bigEndian=!0),HEAP32[e/4]=0,_nbind.makeTypeKindTbl=(n={},n[1024]=_nbind.PrimitiveType,n[64]=_nbind.Int64Type,n[2048]=_nbind.BindClass,n[3072]=_nbind.BindClassPtr,n[4096]=_nbind.SharedClassPtr,n[5120]=_nbind.ArrayType,n[6144]=_nbind.ArrayType,n[7168]=_nbind.CStringType,n[9216]=_nbind.CallbackType,n[10240]=_nbind.BindType,n),_nbind.makeTypeNameTbl={Buffer:_nbind.BufferType,External:_nbind.ExternalType,Int64:_nbind.Int64Type,_nbind_new:_nbind.CreateValueType,bool:_nbind.BooleanType,"cbFunction &":_nbind.CallbackType,"const cbFunction &":_nbind.CallbackType,"const std::string &":_nbind.StringType,"std::string":_nbind.StringType},Module.toggleLightGC=_nbind.toggleLightGC,_nbind.callUpcast=Module.dynCall_ii;var a=_nbind.makeType(_nbind.constructType,{flags:2048,id:0,name:""});a.proto=Module,_nbind.BindClass.list.push(a);var n}function _emscripten_set_main_loop_timing(t,e){if(Browser.mainLoop.timingMode=t,Browser.mainLoop.timingValue=e,!Browser.mainLoop.func)return 1;if(t==0)Browser.mainLoop.scheduler=function(){var u=Math.max(0,Browser.mainLoop.tickStartTime+e-_emscripten_get_now())|0;setTimeout(Browser.mainLoop.runner,u)},Browser.mainLoop.method="timeout";else if(t==1)Browser.mainLoop.scheduler=function(){Browser.requestAnimationFrame(Browser.mainLoop.runner)},Browser.mainLoop.method="rAF";else if(t==2){if(!window.setImmediate){let n=function(u){u.source===window&&u.data===o&&(u.stopPropagation(),r.shift()())};var a=n,r=[],o="setimmediate";window.addEventListener("message",n,!0),window.setImmediate=function(A){r.push(A),ENVIRONMENT_IS_WORKER?(Module.setImmediates===void 0&&(Module.setImmediates=[]),Module.setImmediates.push(A),window.postMessage({target:o})):window.postMessage(o,"*")}}Browser.mainLoop.scheduler=function(){window.setImmediate(Browser.mainLoop.runner)},Browser.mainLoop.method="immediate"}return 0}function _emscripten_get_now(){abort()}function _emscripten_set_main_loop(t,e,r,o,a){Module.noExitRuntime=!0,assert(!Browser.mainLoop.func,"emscripten_set_main_loop: there can only be one main loop function at once: call emscripten_cancel_main_loop to cancel the previous one before setting a new one with different parameters."),Browser.mainLoop.func=t,Browser.mainLoop.arg=o;var n;typeof o<"u"?n=function(){Module.dynCall_vi(t,o)}:n=function(){Module.dynCall_v(t)};var u=Browser.mainLoop.currentlyRunningMainloop;if(Browser.mainLoop.runner=function(){if(!ABORT){if(Browser.mainLoop.queue.length>0){var p=Date.now(),h=Browser.mainLoop.queue.shift();if(h.func(h.arg),Browser.mainLoop.remainingBlockers){var E=Browser.mainLoop.remainingBlockers,I=E%1==0?E-1:Math.floor(E);h.counted?Browser.mainLoop.remainingBlockers=I:(I=I+.5,Browser.mainLoop.remainingBlockers=(8*E+I)/9)}if(console.log('main loop blocker "'+h.name+'" took '+(Date.now()-p)+" ms"),Browser.mainLoop.updateStatus(),u<Browser.mainLoop.currentlyRunningMainloop)return;setTimeout(Browser.mainLoop.runner,0);return}if(!(u<Browser.mainLoop.currentlyRunningMainloop)){if(Browser.mainLoop.currentFrameNumber=Browser.mainLoop.currentFrameNumber+1|0,Browser.mainLoop.timingMode==1&&Browser.mainLoop.timingValue>1&&Browser.mainLoop.currentFrameNumber%Browser.mainLoop.timingValue!=0){Browser.mainLoop.scheduler();return}else Browser.mainLoop.timingMode==0&&(Browser.mainLoop.tickStartTime=_emscripten_get_now());Browser.mainLoop.method==="timeout"&&Module.ctx&&(Module.printErr("Looks like you are rendering without using requestAnimationFrame for the main loop. You should use 0 for the frame rate in emscripten_set_main_loop in order to use requestAnimationFrame, as that can greatly improve your frame rates!"),Browser.mainLoop.method=""),Browser.mainLoop.runIter(n),!(u<Browser.mainLoop.currentlyRunningMainloop)&&(typeof SDL=="object"&&SDL.audio&&SDL.audio.queueNewAudioData&&SDL.audio.queueNewAudioData(),Browser.mainLoop.scheduler())}}},a||(e&&e>0?_emscripten_set_main_loop_timing(0,1e3/e):_emscripten_set_main_loop_timing(1,1),Browser.mainLoop.scheduler()),r)throw"SimulateInfiniteLoop"}var Browser={mainLoop:{scheduler:null,method:"",currentlyRunningMainloop:0,func:null,arg:0,timingMode:0,timingValue:0,currentFrameNumber:0,queue:[],pause:function(){Browser.mainLoop.scheduler=null,Browser.mainLoop.currentlyRunningMainloop++},resume:function(){Browser.mainLoop.currentlyRunningMainloop++;var t=Browser.mainLoop.timingMode,e=Browser.mainLoop.timingValue,r=Browser.mainLoop.func;Browser.mainLoop.func=null,_emscripten_set_main_loop(r,0,!1,Browser.mainLoop.arg,!0),_emscripten_set_main_loop_timing(t,e),Browser.mainLoop.scheduler()},updateStatus:function(){if(Module.setStatus){var t=Module.statusMessage||"Please wait...",e=Browser.mainLoop.remainingBlockers,r=Browser.mainLoop.expectedBlockers;e?e<r?Module.setStatus(t+" ("+(r-e)+"/"+r+")"):Module.setStatus(t):Module.setStatus("")}},runIter:function(t){if(!ABORT){if(Module.preMainLoop){var e=Module.preMainLoop();if(e===!1)return}try{t()}catch(r){if(r instanceof ExitStatus)return;throw r&&typeof r=="object"&&r.stack&&Module.printErr("exception thrown: "+[r,r.stack]),r}Module.postMainLoop&&Module.postMainLoop()}}},isFullscreen:!1,pointerLock:!1,moduleContextCreatedCallbacks:[],workers:[],init:function(){if(Module.preloadPlugins||(Module.preloadPlugins=[]),Browser.initted)return;Browser.initted=!0;try{new Blob,Browser.hasBlobConstructor=!0}catch{Browser.hasBlobConstructor=!1,console.log("warning: no blob constructor, cannot create blobs with mimetypes")}Browser.BlobBuilder=typeof MozBlobBuilder<"u"?MozBlobBuilder:typeof WebKitBlobBuilder<"u"?WebKitBlobBuilder:Browser.hasBlobConstructor?null:console.log("warning: no BlobBuilder"),Browser.URLObject=typeof window<"u"?window.URL?window.URL:window.webkitURL:void 0,!Module.noImageDecoding&&typeof Browser.URLObject>"u"&&(console.log("warning: Browser does not support creating object URLs. Built-in browser image decoding will not be available."),Module.noImageDecoding=!0);var t={};t.canHandle=function(n){return!Module.noImageDecoding&&/\.(jpg|jpeg|png|bmp)$/i.test(n)},t.handle=function(n,u,A,p){var h=null;if(Browser.hasBlobConstructor)try{h=new Blob([n],{type:Browser.getMimetype(u)}),h.size!==n.length&&(h=new Blob([new Uint8Array(n).buffer],{type:Browser.getMimetype(u)}))}catch(x){Runtime.warnOnce("Blob constructor present but fails: "+x+"; falling back to blob builder")}if(!h){var E=new Browser.BlobBuilder;E.append(new Uint8Array(n).buffer),h=E.getBlob()}var I=Browser.URLObject.createObjectURL(h),v=new Image;v.onload=function(){assert(v.complete,"Image "+u+" could not be decoded");var C=document.createElement("canvas");C.width=v.width,C.height=v.height;var R=C.getContext("2d");R.drawImage(v,0,0),Module.preloadedImages[u]=C,Browser.URLObject.revokeObjectURL(I),A&&A(n)},v.onerror=function(C){console.log("Image "+I+" could not be decoded"),p&&p()},v.src=I},Module.preloadPlugins.push(t);var e={};e.canHandle=function(n){return!Module.noAudioDecoding&&n.substr(-4)in{".ogg":1,".wav":1,".mp3":1}},e.handle=function(n,u,A,p){var h=!1;function E(R){h||(h=!0,Module.preloadedAudios[u]=R,A&&A(n))}function I(){h||(h=!0,Module.preloadedAudios[u]=new Audio,p&&p())}if(Browser.hasBlobConstructor){try{var v=new Blob([n],{type:Browser.getMimetype(u)})}catch{return I()}var x=Browser.URLObject.createObjectURL(v),C=new Audio;C.addEventListener("canplaythrough",function(){E(C)},!1),C.onerror=function(L){if(h)return;console.log("warning: browser could not fully decode audio "+u+", trying slower base64 approach");function U(J){for(var te="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",ae="=",fe="",ce=0,me=0,he=0;he<J.length;he++)for(ce=ce<<8|J[he],me+=8;me>=6;){var Be=ce>>me-6&63;me-=6,fe+=te[Be]}return me==2?(fe+=te[(ce&3)<<4],fe+=ae+ae):me==4&&(fe+=te[(ce&15)<<2],fe+=ae),fe}C.src="data:audio/x-"+u.substr(-3)+";base64,"+U(n),E(C)},C.src=x,Browser.safeSetTimeout(function(){E(C)},1e4)}else return I()},Module.preloadPlugins.push(e);function r(){Browser.pointerLock=document.pointerLockElement===Module.canvas||document.mozPointerLockElement===Module.canvas||document.webkitPointerLockElement===Module.canvas||document.msPointerLockElement===Module.canvas}var o=Module.canvas;o&&(o.requestPointerLock=o.requestPointerLock||o.mozRequestPointerLock||o.webkitRequestPointerLock||o.msRequestPointerLock||function(){},o.exitPointerLock=document.exitPointerLock||document.mozExitPointerLock||document.webkitExitPointerLock||document.msExitPointerLock||function(){},o.exitPointerLock=o.exitPointerLock.bind(document),document.addEventListener("pointerlockchange",r,!1),document.addEventListener("mozpointerlockchange",r,!1),document.addEventListener("webkitpointerlockchange",r,!1),document.addEventListener("mspointerlockchange",r,!1),Module.elementPointerLock&&o.addEventListener("click",function(a){!Browser.pointerLock&&Module.canvas.requestPointerLock&&(Module.canvas.requestPointerLock(),a.preventDefault())},!1))},createContext:function(t,e,r,o){if(e&&Module.ctx&&t==Module.canvas)return Module.ctx;var a,n;if(e){var u={antialias:!1,alpha:!1};if(o)for(var A in o)u[A]=o[A];n=GL.createContext(t,u),n&&(a=GL.getContext(n).GLctx)}else a=t.getContext("2d");return a?(r&&(e||assert(typeof GLctx>"u","cannot set in module if GLctx is used, but we are a non-GL context that would replace it"),Module.ctx=a,e&&GL.makeContextCurrent(n),Module.useWebGL=e,Browser.moduleContextCreatedCallbacks.forEach(function(p){p()}),Browser.init()),a):null},destroyContext:function(t,e,r){},fullscreenHandlersInstalled:!1,lockPointer:void 0,resizeCanvas:void 0,requestFullscreen:function(t,e,r){Browser.lockPointer=t,Browser.resizeCanvas=e,Browser.vrDevice=r,typeof Browser.lockPointer>"u"&&(Browser.lockPointer=!0),typeof Browser.resizeCanvas>"u"&&(Browser.resizeCanvas=!1),typeof Browser.vrDevice>"u"&&(Browser.vrDevice=null);var o=Module.canvas;function a(){Browser.isFullscreen=!1;var u=o.parentNode;(document.fullscreenElement||document.mozFullScreenElement||document.msFullscreenElement||document.webkitFullscreenElement||document.webkitCurrentFullScreenElement)===u?(o.exitFullscreen=document.exitFullscreen||document.cancelFullScreen||document.mozCancelFullScreen||document.msExitFullscreen||document.webkitCancelFullScreen||function(){},o.exitFullscreen=o.exitFullscreen.bind(document),Browser.lockPointer&&o.requestPointerLock(),Browser.isFullscreen=!0,Browser.resizeCanvas&&Browser.setFullscreenCanvasSize()):(u.parentNode.insertBefore(o,u),u.parentNode.removeChild(u),Browser.resizeCanvas&&Browser.setWindowedCanvasSize()),Module.onFullScreen&&Module.onFullScreen(Browser.isFullscreen),Module.onFullscreen&&Module.onFullscreen(Browser.isFullscreen),Browser.updateCanvasDimensions(o)}Browser.fullscreenHandlersInstalled||(Browser.fullscreenHandlersInstalled=!0,document.addEventListener("fullscreenchange",a,!1),document.addEventListener("mozfullscreenchange",a,!1),document.addEventListener("webkitfullscreenchange",a,!1),document.addEventListener("MSFullscreenChange",a,!1));var n=document.createElement("div");o.parentNode.insertBefore(n,o),n.appendChild(o),n.requestFullscreen=n.requestFullscreen||n.mozRequestFullScreen||n.msRequestFullscreen||(n.webkitRequestFullscreen?function(){n.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT)}:null)||(n.webkitRequestFullScreen?function(){n.webkitRequestFullScreen(Element.ALLOW_KEYBOARD_INPUT)}:null),r?n.requestFullscreen({vrDisplay:r}):n.requestFullscreen()},requestFullScreen:function(t,e,r){return Module.printErr("Browser.requestFullScreen() is deprecated. Please call Browser.requestFullscreen instead."),Browser.requestFullScreen=function(o,a,n){return Browser.requestFullscreen(o,a,n)},Browser.requestFullscreen(t,e,r)},nextRAF:0,fakeRequestAnimationFrame:function(t){var e=Date.now();if(Browser.nextRAF===0)Browser.nextRAF=e+1e3/60;else for(;e+2>=Browser.nextRAF;)Browser.nextRAF+=1e3/60;var r=Math.max(Browser.nextRAF-e,0);setTimeout(t,r)},requestAnimationFrame:function t(e){typeof window>"u"?Browser.fakeRequestAnimationFrame(e):(window.requestAnimationFrame||(window.requestAnimationFrame=window.requestAnimationFrame||window.mozRequestAnimationFrame||window.webkitRequestAnimationFrame||window.msRequestAnimationFrame||window.oRequestAnimationFrame||Browser.fakeRequestAnimationFrame),window.requestAnimationFrame(e))},safeCallback:function(t){return function(){if(!ABORT)return t.apply(null,arguments)}},allowAsyncCallbacks:!0,queuedAsyncCallbacks:[],pauseAsyncCallbacks:function(){Browser.allowAsyncCallbacks=!1},resumeAsyncCallbacks:function(){if(Browser.allowAsyncCallbacks=!0,Browser.queuedAsyncCallbacks.length>0){var t=Browser.queuedAsyncCallbacks;Browser.queuedAsyncCallbacks=[],t.forEach(function(e){e()})}},safeRequestAnimationFrame:function(t){return Browser.requestAnimationFrame(function(){ABORT||(Browser.allowAsyncCallbacks?t():Browser.queuedAsyncCallbacks.push(t))})},safeSetTimeout:function(t,e){return Module.noExitRuntime=!0,setTimeout(function(){ABORT||(Browser.allowAsyncCallbacks?t():Browser.queuedAsyncCallbacks.push(t))},e)},safeSetInterval:function(t,e){return Module.noExitRuntime=!0,setInterval(function(){ABORT||Browser.allowAsyncCallbacks&&t()},e)},getMimetype:function(t){return{jpg:"image/jpeg",jpeg:"image/jpeg",png:"image/png",bmp:"image/bmp",ogg:"audio/ogg",wav:"audio/wav",mp3:"audio/mpeg"}[t.substr(t.lastIndexOf(".")+1)]},getUserMedia:function(t){window.getUserMedia||(window.getUserMedia=navigator.getUserMedia||navigator.mozGetUserMedia),window.getUserMedia(t)},getMovementX:function(t){return t.movementX||t.mozMovementX||t.webkitMovementX||0},getMovementY:function(t){return t.movementY||t.mozMovementY||t.webkitMovementY||0},getMouseWheelDelta:function(t){var e=0;switch(t.type){case"DOMMouseScroll":e=t.detail;break;case"mousewheel":e=t.wheelDelta;break;case"wheel":e=t.deltaY;break;default:throw"unrecognized mouse wheel event: "+t.type}return e},mouseX:0,mouseY:0,mouseMovementX:0,mouseMovementY:0,touches:{},lastTouches:{},calculateMouseEvent:function(t){if(Browser.pointerLock)t.type!="mousemove"&&"mozMovementX"in t?Browser.mouseMovementX=Browser.mouseMovementY=0:(Browser.mouseMovementX=Browser.getMovementX(t),Browser.mouseMovementY=Browser.getMovementY(t)),typeof SDL<"u"?(Browser.mouseX=SDL.mouseX+Browser.mouseMovementX,Browser.mouseY=SDL.mouseY+Browser.mouseMovementY):(Browser.mouseX+=Browser.mouseMovementX,Browser.mouseY+=Browser.mouseMovementY);else{var e=Module.canvas.getBoundingClientRect(),r=Module.canvas.width,o=Module.canvas.height,a=typeof window.scrollX<"u"?window.scrollX:window.pageXOffset,n=typeof window.scrollY<"u"?window.scrollY:window.pageYOffset;if(t.type==="touchstart"||t.type==="touchend"||t.type==="touchmove"){var u=t.touch;if(u===void 0)return;var A=u.pageX-(a+e.left),p=u.pageY-(n+e.top);A=A*(r/e.width),p=p*(o/e.height);var h={x:A,y:p};if(t.type==="touchstart")Browser.lastTouches[u.identifier]=h,Browser.touches[u.identifier]=h;else if(t.type==="touchend"||t.type==="touchmove"){var E=Browser.touches[u.identifier];E||(E=h),Browser.lastTouches[u.identifier]=E,Browser.touches[u.identifier]=h}return}var I=t.pageX-(a+e.left),v=t.pageY-(n+e.top);I=I*(r/e.width),v=v*(o/e.height),Browser.mouseMovementX=I-Browser.mouseX,Browser.mouseMovementY=v-Browser.mouseY,Browser.mouseX=I,Browser.mouseY=v}},asyncLoad:function(t,e,r,o){var a=o?"":"al "+t;Module.readAsync(t,function(n){assert(n,'Loading data file "'+t+'" failed (no arrayBuffer).'),e(new Uint8Array(n)),a&&removeRunDependency(a)},function(n){if(r)r();else throw'Loading data file "'+t+'" failed.'}),a&&addRunDependency(a)},resizeListeners:[],updateResizeListeners:function(){var t=Module.canvas;Browser.resizeListeners.forEach(function(e){e(t.width,t.height)})},setCanvasSize:function(t,e,r){var o=Module.canvas;Browser.updateCanvasDimensions(o,t,e),r||Browser.updateResizeListeners()},windowedWidth:0,windowedHeight:0,setFullscreenCanvasSize:function(){if(typeof SDL<"u"){var t=HEAPU32[SDL.screen+Runtime.QUANTUM_SIZE*0>>2];t=t|8388608,HEAP32[SDL.screen+Runtime.QUANTUM_SIZE*0>>2]=t}Browser.updateResizeListeners()},setWindowedCanvasSize:function(){if(typeof SDL<"u"){var t=HEAPU32[SDL.screen+Runtime.QUANTUM_SIZE*0>>2];t=t&-8388609,HEAP32[SDL.screen+Runtime.QUANTUM_SIZE*0>>2]=t}Browser.updateResizeListeners()},updateCanvasDimensions:function(t,e,r){e&&r?(t.widthNative=e,t.heightNative=r):(e=t.widthNative,r=t.heightNative);var o=e,a=r;if(Module.forcedAspectRatio&&Module.forcedAspectRatio>0&&(o/a<Module.forcedAspectRatio?o=Math.round(a*Module.forcedAspectRatio):a=Math.round(o/Module.forcedAspectRatio)),(document.fullscreenElement||document.mozFullScreenElement||document.msFullscreenElement||document.webkitFullscreenElement||document.webkitCurrentFullScreenElement)===t.parentNode&&typeof screen<"u"){var n=Math.min(screen.width/o,screen.height/a);o=Math.round(o*n),a=Math.round(a*n)}Browser.resizeCanvas?(t.width!=o&&(t.width=o),t.height!=a&&(t.height=a),typeof t.style<"u"&&(t.style.removeProperty("width"),t.style.removeProperty("height"))):(t.width!=e&&(t.width=e),t.height!=r&&(t.height=r),typeof t.style<"u"&&(o!=e||a!=r?(t.style.setProperty("width",o+"px","important"),t.style.setProperty("height",a+"px","important")):(t.style.removeProperty("width"),t.style.removeProperty("height"))))},wgetRequests:{},nextWgetRequestHandle:0,getNextWgetRequestHandle:function(){var t=Browser.nextWgetRequestHandle;return Browser.nextWgetRequestHandle++,t}},SYSCALLS={varargs:0,get:function(t){SYSCALLS.varargs+=4;var e=HEAP32[SYSCALLS.varargs-4>>2];return e},getStr:function(){var t=Pointer_stringify(SYSCALLS.get());return t},get64:function(){var t=SYSCALLS.get(),e=SYSCALLS.get();return t>=0?assert(e===0):assert(e===-1),t},getZero:function(){assert(SYSCALLS.get()===0)}};function ___syscall6(t,e){SYSCALLS.varargs=e;try{var r=SYSCALLS.getStreamFromFD();return FS.close(r),0}catch(o){return(typeof FS>"u"||!(o instanceof FS.ErrnoError))&&abort(o),-o.errno}}function ___syscall54(t,e){SYSCALLS.varargs=e;try{return 0}catch(r){return(typeof FS>"u"||!(r instanceof FS.ErrnoError))&&abort(r),-r.errno}}function _typeModule(t){var e=[[0,1,"X"],[1,1,"const X"],[128,1,"X *"],[256,1,"X &"],[384,1,"X &&"],[512,1,"std::shared_ptr<X>"],[640,1,"std::unique_ptr<X>"],[5120,1,"std::vector<X>"],[6144,2,"std::array<X, Y>"],[9216,-1,"std::function<X (Y)>"]];function r(p,h,E,I,v,x){if(h==1){var C=I&896;(C==128||C==256||C==384)&&(p="X const")}var R;return x?R=E.replace("X",p).replace("Y",v):R=p.replace("X",E).replace("Y",v),R.replace(/([*&]) (?=[*&])/g,"$1")}function o(p,h,E,I,v){throw new Error(p+" type "+E.replace("X",h+"?")+(I?" with flag "+I:"")+" in "+v)}function a(p,h,E,I,v,x,C,R){x===void 0&&(x="X"),R===void 0&&(R=1);var L=E(p);if(L)return L;var U=I(p),J=U.placeholderFlag,te=e[J];C&&te&&(x=r(C[2],C[0],x,te[0],"?",!0));var ae;J==0&&(ae="Unbound"),J>=10&&(ae="Corrupt"),R>20&&(ae="Deeply nested"),ae&&o(ae,p,x,J,v||"?");var fe=U.paramList[0],ce=a(fe,h,E,I,v,x,te,R+1),me,he={flags:te[0],id:p,name:"",paramList:[ce]},Be=[],we="?";switch(U.placeholderFlag){case 1:me=ce.spec;break;case 2:if((ce.flags&15360)==1024&&ce.spec.ptrSize==1){he.flags=7168;break}case 3:case 6:case 5:me=ce.spec,ce.flags&15360;break;case 8:we=""+U.paramList[1],he.paramList.push(U.paramList[1]);break;case 9:for(var g=0,Ee=U.paramList[1];g<Ee.length;g++){var Se=Ee[g],le=a(Se,h,E,I,v,x,te,R+1);Be.push(le.name),he.paramList.push(le)}we=Be.join(", ");break;default:break}if(he.name=r(te[2],te[0],ce.name,ce.flags,we),me){for(var ne=0,ee=Object.keys(me);ne<ee.length;ne++){var Ie=ee[ne];he[Ie]=he[Ie]||me[Ie]}he.flags|=me.flags}return n(h,he)}function n(p,h){var E=h.flags,I=E&896,v=E&15360;return!h.name&&v==1024&&(h.ptrSize==1?h.name=(E&16?"":(E&8?"un":"")+"signed ")+"char":h.name=(E&8?"u":"")+(E&32?"float":"int")+(h.ptrSize*8+"_t")),h.ptrSize==8&&!(E&32)&&(v=64),v==2048&&(I==512||I==640?v=4096:I&&(v=3072)),p(v,h)}var u=function(){function p(h){this.id=h.id,this.name=h.name,this.flags=h.flags,this.spec=h}return p.prototype.toString=function(){return this.name},p}(),A={Type:u,getComplexType:a,makeType:n,structureList:e};return t.output=A,t.output||A}function __nbind_register_type(t,e){var r=_nbind.readAsciiString(e),o={flags:10240,id:t,name:r};_nbind.makeType(_nbind.constructType,o)}function __nbind_register_callback_signature(t,e){var r=_nbind.readTypeIdList(t,e),o=_nbind.callbackSignatureList.length;return _nbind.callbackSignatureList[o]=_nbind.makeJSCaller(r),o}function __extends(t,e){for(var r in e)e.hasOwnProperty(r)&&(t[r]=e[r]);function o(){this.constructor=t}o.prototype=e.prototype,t.prototype=new o}function __nbind_register_class(t,e,r,o,a,n,u){var A=_nbind.readAsciiString(u),p=_nbind.readPolicyList(e),h=HEAPU32.subarray(t/4,t/4+2),E={flags:2048|(p.Value?2:0),id:h[0],name:A},I=_nbind.makeType(_nbind.constructType,E);I.ptrType=_nbind.getComplexType(h[1],_nbind.constructType,_nbind.getType,_nbind.queryType),I.destroy=_nbind.makeMethodCaller(I.ptrType,{boundID:E.id,flags:0,name:"destroy",num:0,ptr:n,title:I.name+".free",typeList:["void","uint32_t","uint32_t"]}),a&&(I.superIdList=Array.prototype.slice.call(HEAPU32.subarray(r/4,r/4+a)),I.upcastList=Array.prototype.slice.call(HEAPU32.subarray(o/4,o/4+a))),Module[I.name]=I.makeBound(p),_nbind.BindClass.list.push(I)}function _removeAccessorPrefix(t){var e=/^[Gg]et_?([A-Z]?([A-Z]?))/;return t.replace(e,function(r,o,a){return a?o:o.toLowerCase()})}function __nbind_register_function(t,e,r,o,a,n,u,A,p,h){var E=_nbind.getType(t),I=_nbind.readPolicyList(e),v=_nbind.readTypeIdList(r,o),x;if(u==5)x=[{direct:a,name:"__nbindConstructor",ptr:0,title:E.name+" constructor",typeList:["uint32_t"].concat(v.slice(1))},{direct:n,name:"__nbindValueConstructor",ptr:0,title:E.name+" value constructor",typeList:["void","uint32_t"].concat(v.slice(1))}];else{var C=_nbind.readAsciiString(A),R=(E.name&&E.name+".")+C;(u==3||u==4)&&(C=_removeAccessorPrefix(C)),x=[{boundID:t,direct:n,name:C,ptr:a,title:R,typeList:v}]}for(var L=0,U=x;L<U.length;L++){var J=U[L];J.signatureType=u,J.policyTbl=I,J.num=p,J.flags=h,E.addMethod(J)}}function _nbind_value(t,e){_nbind.typeNameTbl[t]||_nbind.throwError("Unknown value type "+t),Module.NBind.bind_value(t,e),_defineHidden(_nbind.typeNameTbl[t].proto.prototype.__nbindValueConstructor)(e.prototype,"__nbindValueConstructor")}Module._nbind_value=_nbind_value;function __nbind_get_value_object(t,e){var r=_nbind.popValue(t);if(!r.fromJS)throw new Error("Object "+r+" has no fromJS function");r.fromJS(function(){r.__nbindValueConstructor.apply(this,Array.prototype.concat.apply([e],arguments))})}function _emscripten_memcpy_big(t,e,r){return HEAPU8.set(HEAPU8.subarray(e,e+r),t),t}function __nbind_register_primitive(t,e,r){var o={flags:1024|r,id:t,ptrSize:e};_nbind.makeType(_nbind.constructType,o)}var cttz_i8=allocate([8,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,6,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,7,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,6,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0],"i8",ALLOC_STATIC);function ___setErrNo(t){return Module.___errno_location&&(HEAP32[Module.___errno_location()>>2]=t),t}function _llvm_stacksave(){var t=_llvm_stacksave;return t.LLVM_SAVEDSTACKS||(t.LLVM_SAVEDSTACKS=[]),t.LLVM_SAVEDSTACKS.push(Runtime.stackSave()),t.LLVM_SAVEDSTACKS.length-1}function ___syscall140(t,e){SYSCALLS.varargs=e;try{var r=SYSCALLS.getStreamFromFD(),o=SYSCALLS.get(),a=SYSCALLS.get(),n=SYSCALLS.get(),u=SYSCALLS.get(),A=a;return FS.llseek(r,A,u),HEAP32[n>>2]=r.position,r.getdents&&A===0&&u===0&&(r.getdents=null),0}catch(p){return(typeof FS>"u"||!(p instanceof FS.ErrnoError))&&abort(p),-p.errno}}function ___syscall146(t,e){SYSCALLS.varargs=e;try{var r=SYSCALLS.get(),o=SYSCALLS.get(),a=SYSCALLS.get(),n=0;___syscall146.buffer||(___syscall146.buffers=[null,[],[]],___syscall146.printChar=function(E,I){var v=___syscall146.buffers[E];assert(v),I===0||I===10?((E===1?Module.print:Module.printErr)(UTF8ArrayToString(v,0)),v.length=0):v.push(I)});for(var u=0;u<a;u++){for(var A=HEAP32[o+u*8>>2],p=HEAP32[o+(u*8+4)>>2],h=0;h<p;h++)___syscall146.printChar(r,HEAPU8[A+h]);n+=p}return n}catch(E){return(typeof FS>"u"||!(E instanceof FS.ErrnoError))&&abort(E),-E.errno}}function __nbind_finish(){for(var t=0,e=_nbind.BindClass.list;t<e.length;t++){var r=e[t];r.finish()}}var ___dso_handle=STATICTOP;STATICTOP+=16,function(_nbind){var typeIdTbl={};_nbind.typeNameTbl={};var Pool=function(){function t(){}return t.lalloc=function(e){e=e+7&-8;var r=HEAPU32[t.usedPtr];if(e>t.pageSize/2||e>t.pageSize-r){var o=_nbind.typeNameTbl.NBind.proto;return o.lalloc(e)}else return HEAPU32[t.usedPtr]=r+e,t.rootPtr+r},t.lreset=function(e,r){var o=HEAPU32[t.pagePtr];if(o){var a=_nbind.typeNameTbl.NBind.proto;a.lreset(e,r)}else HEAPU32[t.usedPtr]=e},t}();_nbind.Pool=Pool;function constructType(t,e){var r=t==10240?_nbind.makeTypeNameTbl[e.name]||_nbind.BindType:_nbind.makeTypeKindTbl[t],o=new r(e);return typeIdTbl[e.id]=o,_nbind.typeNameTbl[e.name]=o,o}_nbind.constructType=constructType;function getType(t){return typeIdTbl[t]}_nbind.getType=getType;function queryType(t){var e=HEAPU8[t],r=_nbind.structureList[e][1];t/=4,r<0&&(++t,r=HEAPU32[t]+1);var o=Array.prototype.slice.call(HEAPU32.subarray(t+1,t+1+r));return e==9&&(o=[o[0],o.slice(1)]),{paramList:o,placeholderFlag:e}}_nbind.queryType=queryType;function getTypes(t,e){return t.map(function(r){return typeof r=="number"?_nbind.getComplexType(r,constructType,getType,queryType,e):_nbind.typeNameTbl[r]})}_nbind.getTypes=getTypes;function readTypeIdList(t,e){return Array.prototype.slice.call(HEAPU32,t/4,t/4+e)}_nbind.readTypeIdList=readTypeIdList;function readAsciiString(t){for(var e=t;HEAPU8[e++];);return String.fromCharCode.apply("",HEAPU8.subarray(t,e-1))}_nbind.readAsciiString=readAsciiString;function readPolicyList(t){var e={};if(t)for(;;){var r=HEAPU32[t/4];if(!r)break;e[readAsciiString(r)]=!0,t+=4}return e}_nbind.readPolicyList=readPolicyList;function getDynCall(t,e){var r={float32_t:"d",float64_t:"d",int64_t:"d",uint64_t:"d",void:"v"},o=t.map(function(n){return r[n.name]||"i"}).join(""),a=Module["dynCall_"+o];if(!a)throw new Error("dynCall_"+o+" not found for "+e+"("+t.map(function(n){return n.name}).join(", ")+")");return a}_nbind.getDynCall=getDynCall;function addMethod(t,e,r,o){var a=t[e];t.hasOwnProperty(e)&&a?((a.arity||a.arity===0)&&(a=_nbind.makeOverloader(a,a.arity),t[e]=a),a.addMethod(r,o)):(r.arity=o,t[e]=r)}_nbind.addMethod=addMethod;function throwError(t){throw new Error(t)}_nbind.throwError=throwError,_nbind.bigEndian=!1,_a=_typeModule(_typeModule),_nbind.Type=_a.Type,_nbind.makeType=_a.makeType,_nbind.getComplexType=_a.getComplexType,_nbind.structureList=_a.structureList;var BindType=function(t){__extends(e,t);function e(){var r=t!==null&&t.apply(this,arguments)||this;return r.heap=HEAPU32,r.ptrSize=4,r}return e.prototype.needsWireRead=function(r){return!!this.wireRead||!!this.makeWireRead},e.prototype.needsWireWrite=function(r){return!!this.wireWrite||!!this.makeWireWrite},e}(_nbind.Type);_nbind.BindType=BindType;var PrimitiveType=function(t){__extends(e,t);function e(r){var o=t.call(this,r)||this,a=r.flags&32?{32:HEAPF32,64:HEAPF64}:r.flags&8?{8:HEAPU8,16:HEAPU16,32:HEAPU32}:{8:HEAP8,16:HEAP16,32:HEAP32};return o.heap=a[r.ptrSize*8],o.ptrSize=r.ptrSize,o}return e.prototype.needsWireWrite=function(r){return!!r&&!!r.Strict},e.prototype.makeWireWrite=function(r,o){return o&&o.Strict&&function(a){if(typeof a=="number")return a;throw new Error("Type mismatch")}},e}(BindType);_nbind.PrimitiveType=PrimitiveType;function pushCString(t,e){if(t==null){if(e&&e.Nullable)return 0;throw new Error("Type mismatch")}if(e&&e.Strict){if(typeof t!="string")throw new Error("Type mismatch")}else t=t.toString();var r=Module.lengthBytesUTF8(t)+1,o=_nbind.Pool.lalloc(r);return Module.stringToUTF8Array(t,HEAPU8,o,r),o}_nbind.pushCString=pushCString;function popCString(t){return t===0?null:Module.Pointer_stringify(t)}_nbind.popCString=popCString;var CStringType=function(t){__extends(e,t);function e(){var r=t!==null&&t.apply(this,arguments)||this;return r.wireRead=popCString,r.wireWrite=pushCString,r.readResources=[_nbind.resources.pool],r.writeResources=[_nbind.resources.pool],r}return e.prototype.makeWireWrite=function(r,o){return function(a){return pushCString(a,o)}},e}(BindType);_nbind.CStringType=CStringType;var BooleanType=function(t){__extends(e,t);function e(){var r=t!==null&&t.apply(this,arguments)||this;return r.wireRead=function(o){return!!o},r}return e.prototype.needsWireWrite=function(r){return!!r&&!!r.Strict},e.prototype.makeWireRead=function(r){return"!!("+r+")"},e.prototype.makeWireWrite=function(r,o){return o&&o.Strict&&function(a){if(typeof a=="boolean")return a;throw new Error("Type mismatch")}||r},e}(BindType);_nbind.BooleanType=BooleanType;var Wrapper=function(){function t(){}return t.prototype.persist=function(){this.__nbindState|=1},t}();_nbind.Wrapper=Wrapper;function makeBound(t,e){var r=function(o){__extends(a,o);function a(n,u,A,p){var h=o.call(this)||this;if(!(h instanceof a))return new(Function.prototype.bind.apply(a,Array.prototype.concat.apply([null],arguments)));var E=u,I=A,v=p;if(n!==_nbind.ptrMarker){var x=h.__nbindConstructor.apply(h,arguments);E=4608,v=HEAPU32[x/4],I=HEAPU32[x/4+1]}var C={configurable:!0,enumerable:!1,value:null,writable:!1},R={__nbindFlags:E,__nbindPtr:I};v&&(R.__nbindShared=v,_nbind.mark(h));for(var L=0,U=Object.keys(R);L<U.length;L++){var J=U[L];C.value=R[J],Object.defineProperty(h,J,C)}return _defineHidden(0)(h,"__nbindState"),h}return a.prototype.free=function(){e.destroy.call(this,this.__nbindShared,this.__nbindFlags),this.__nbindState|=2,disableMember(this,"__nbindShared"),disableMember(this,"__nbindPtr")},a}(Wrapper);return __decorate([_defineHidden()],r.prototype,"__nbindConstructor",void 0),__decorate([_defineHidden()],r.prototype,"__nbindValueConstructor",void 0),__decorate([_defineHidden(t)],r.prototype,"__nbindPolicies",void 0),r}_nbind.makeBound=makeBound;function disableMember(t,e){function r(){throw new Error("Accessing deleted object")}Object.defineProperty(t,e,{configurable:!1,enumerable:!1,get:r,set:r})}_nbind.ptrMarker={};var BindClass=function(t){__extends(e,t);function e(r){var o=t.call(this,r)||this;return o.wireRead=function(a){return _nbind.popValue(a,o.ptrType)},o.wireWrite=function(a){return pushPointer(a,o.ptrType,!0)},o.pendingSuperCount=0,o.ready=!1,o.methodTbl={},r.paramList?(o.classType=r.paramList[0].classType,o.proto=o.classType.proto):o.classType=o,o}return e.prototype.makeBound=function(r){var o=_nbind.makeBound(r,this);return this.proto=o,this.ptrType.proto=o,o},e.prototype.addMethod=function(r){var o=this.methodTbl[r.name]||[];o.push(r),this.methodTbl[r.name]=o},e.prototype.registerMethods=function(r,o){for(var a,n=0,u=Object.keys(r.methodTbl);n<u.length;n++)for(var A=u[n],p=r.methodTbl[A],h=0,E=p;h<E.length;h++){var I=E[h],v=void 0,x=void 0;if(v=this.proto.prototype,!(o&&I.signatureType!=1))switch(I.signatureType){case 1:v=this.proto;case 5:x=_nbind.makeCaller(I),_nbind.addMethod(v,I.name,x,I.typeList.length-1);break;case 4:a=_nbind.makeMethodCaller(r.ptrType,I);break;case 3:Object.defineProperty(v,I.name,{configurable:!0,enumerable:!1,get:_nbind.makeMethodCaller(r.ptrType,I),set:a});break;case 2:x=_nbind.makeMethodCaller(r.ptrType,I),_nbind.addMethod(v,I.name,x,I.typeList.length-1);break;default:break}}},e.prototype.registerSuperMethods=function(r,o,a){if(!a[r.name]){a[r.name]=!0;for(var n=0,u,A=0,p=r.superIdList||[];A<p.length;A++){var h=p[A],E=_nbind.getType(h);n++<o||o<0?u=-1:u=0,this.registerSuperMethods(E,u,a)}this.registerMethods(r,o<0)}},e.prototype.finish=function(){if(this.ready)return this;this.ready=!0,this.superList=(this.superIdList||[]).map(function(a){return _nbind.getType(a).finish()});var r=this.proto;if(this.superList.length){var o=function(){this.constructor=r};o.prototype=this.superList[0].proto.prototype,r.prototype=new o}return r!=Module&&(r.prototype.__nbindType=this),this.registerSuperMethods(this,1,{}),this},e.prototype.upcastStep=function(r,o){if(r==this)return o;for(var a=0;a<this.superList.length;++a){var n=this.superList[a].upcastStep(r,_nbind.callUpcast(this.upcastList[a],o));if(n)return n}return 0},e}(_nbind.BindType);BindClass.list=[],_nbind.BindClass=BindClass;function popPointer(t,e){return t?new e.proto(_nbind.ptrMarker,e.flags,t):null}_nbind.popPointer=popPointer;function pushPointer(t,e,r){if(!(t instanceof _nbind.Wrapper)){if(r)return _nbind.pushValue(t);throw new Error("Type mismatch")}var o=t.__nbindPtr,a=t.__nbindType.classType,n=e.classType;if(t instanceof e.proto)for(;a!=n;)o=_nbind.callUpcast(a.upcastList[0],o),a=a.superList[0];else if(o=a.upcastStep(n,o),!o)throw new Error("Type mismatch");return o}_nbind.pushPointer=pushPointer;function pushMutablePointer(t,e){var r=pushPointer(t,e);if(t.__nbindFlags&1)throw new Error("Passing a const value as a non-const argument");return r}var BindClassPtr=function(t){__extends(e,t);function e(r){var o=t.call(this,r)||this;o.classType=r.paramList[0].classType,o.proto=o.classType.proto;var a=r.flags&1,n=(o.flags&896)==256&&r.flags&2,u=a?pushPointer:pushMutablePointer,A=n?_nbind.popValue:popPointer;return o.makeWireWrite=function(p,h){return h.Nullable?function(E){return E?u(E,o):0}:function(E){return u(E,o)}},o.wireRead=function(p){return A(p,o)},o.wireWrite=function(p){return u(p,o)},o}return e}(_nbind.BindType);_nbind.BindClassPtr=BindClassPtr;function popShared(t,e){var r=HEAPU32[t/4],o=HEAPU32[t/4+1];return o?new e.proto(_nbind.ptrMarker,e.flags,o,r):null}_nbind.popShared=popShared;function pushShared(t,e){if(!(t instanceof e.proto))throw new Error("Type mismatch");return t.__nbindShared}function pushMutableShared(t,e){if(!(t instanceof e.proto))throw new Error("Type mismatch");if(t.__nbindFlags&1)throw new Error("Passing a const value as a non-const argument");return t.__nbindShared}var SharedClassPtr=function(t){__extends(e,t);function e(r){var o=t.call(this,r)||this;o.readResources=[_nbind.resources.pool],o.classType=r.paramList[0].classType,o.proto=o.classType.proto;var a=r.flags&1,n=a?pushShared:pushMutableShared;return o.wireRead=function(u){return popShared(u,o)},o.wireWrite=function(u){return n(u,o)},o}return e}(_nbind.BindType);_nbind.SharedClassPtr=SharedClassPtr,_nbind.externalList=[0];var firstFreeExternal=0,External=function(){function t(e){this.refCount=1,this.data=e}return t.prototype.register=function(){var e=firstFreeExternal;return e?firstFreeExternal=_nbind.externalList[e]:e=_nbind.externalList.length,_nbind.externalList[e]=this,e},t.prototype.reference=function(){++this.refCount},t.prototype.dereference=function(e){--this.refCount==0&&(this.free&&this.free(),_nbind.externalList[e]=firstFreeExternal,firstFreeExternal=e)},t}();_nbind.External=External;function popExternal(t){var e=_nbind.externalList[t];return e.dereference(t),e.data}function pushExternal(t){var e=new External(t);return e.reference(),e.register()}var ExternalType=function(t){__extends(e,t);function e(){var r=t!==null&&t.apply(this,arguments)||this;return r.wireRead=popExternal,r.wireWrite=pushExternal,r}return e}(_nbind.BindType);_nbind.ExternalType=ExternalType,_nbind.callbackSignatureList=[];var CallbackType=function(t){__extends(e,t);function e(){var r=t!==null&&t.apply(this,arguments)||this;return r.wireWrite=function(o){return typeof o!="function"&&_nbind.throwError("Type mismatch"),new _nbind.External(o).register()},r}return e}(_nbind.BindType);_nbind.CallbackType=CallbackType,_nbind.valueList=[0];var firstFreeValue=0;function pushValue(t){var e=firstFreeValue;return e?firstFreeValue=_nbind.valueList[e]:e=_nbind.valueList.length,_nbind.valueList[e]=t,e*2+1}_nbind.pushValue=pushValue;function popValue(t,e){if(t||_nbind.throwError("Value type JavaScript class is missing or not registered"),t&1){t>>=1;var r=_nbind.valueList[t];return _nbind.valueList[t]=firstFreeValue,firstFreeValue=t,r}else{if(e)return _nbind.popShared(t,e);throw new Error("Invalid value slot "+t)}}_nbind.popValue=popValue;var valueBase=18446744073709552e3;function push64(t){return typeof t=="number"?t:pushValue(t)*4096+valueBase}function pop64(t){return t<valueBase?t:popValue((t-valueBase)/4096)}var CreateValueType=function(t){__extends(e,t);function e(){return t!==null&&t.apply(this,arguments)||this}return e.prototype.makeWireWrite=function(r){return"(_nbind.pushValue(new "+r+"))"},e}(_nbind.BindType);_nbind.CreateValueType=CreateValueType;var Int64Type=function(t){__extends(e,t);function e(){var r=t!==null&&t.apply(this,arguments)||this;return r.wireWrite=push64,r.wireRead=pop64,r}return e}(_nbind.BindType);_nbind.Int64Type=Int64Type;function pushArray(t,e){if(!t)return 0;var r=t.length;if((e.size||e.size===0)&&r<e.size)throw new Error("Type mismatch");var o=e.memberType.ptrSize,a=_nbind.Pool.lalloc(4+r*o);HEAPU32[a/4]=r;var n=e.memberType.heap,u=(a+4)/o,A=e.memberType.wireWrite,p=0;if(A)for(;p<r;)n[u++]=A(t[p++]);else for(;p<r;)n[u++]=t[p++];return a}_nbind.pushArray=pushArray;function popArray(t,e){if(t===0)return null;var r=HEAPU32[t/4],o=new Array(r),a=e.memberType.heap;t=(t+4)/e.memberType.ptrSize;var n=e.memberType.wireRead,u=0;if(n)for(;u<r;)o[u++]=n(a[t++]);else for(;u<r;)o[u++]=a[t++];return o}_nbind.popArray=popArray;var ArrayType=function(t){__extends(e,t);function e(r){var o=t.call(this,r)||this;return o.wireRead=function(a){return popArray(a,o)},o.wireWrite=function(a){return pushArray(a,o)},o.readResources=[_nbind.resources.pool],o.writeResources=[_nbind.resources.pool],o.memberType=r.paramList[0],r.paramList[1]&&(o.size=r.paramList[1]),o}return e}(_nbind.BindType);_nbind.ArrayType=ArrayType;function pushString(t,e){if(t==null)if(e&&e.Nullable)t="";else throw new Error("Type mismatch");if(e&&e.Strict){if(typeof t!="string")throw new Error("Type mismatch")}else t=t.toString();var r=Module.lengthBytesUTF8(t),o=_nbind.Pool.lalloc(4+r+1);return HEAPU32[o/4]=r,Module.stringToUTF8Array(t,HEAPU8,o+4,r+1),o}_nbind.pushString=pushString;function popString(t){if(t===0)return null;var e=HEAPU32[t/4];return Module.Pointer_stringify(t+4,e)}_nbind.popString=popString;var StringType=function(t){__extends(e,t);function e(){var r=t!==null&&t.apply(this,arguments)||this;return r.wireRead=popString,r.wireWrite=pushString,r.readResources=[_nbind.resources.pool],r.writeResources=[_nbind.resources.pool],r}return e.prototype.makeWireWrite=function(r,o){return function(a){return pushString(a,o)}},e}(_nbind.BindType);_nbind.StringType=StringType;function makeArgList(t){return Array.apply(null,Array(t)).map(function(e,r){return"a"+(r+1)})}function anyNeedsWireWrite(t,e){return t.reduce(function(r,o){return r||o.needsWireWrite(e)},!1)}function anyNeedsWireRead(t,e){return t.reduce(function(r,o){return r||!!o.needsWireRead(e)},!1)}function makeWireRead(t,e,r,o){var a=t.length;return r.makeWireRead?r.makeWireRead(o,t,a):r.wireRead?(t[a]=r.wireRead,"(convertParamList["+a+"]("+o+"))"):o}function makeWireWrite(t,e,r,o){var a,n=t.length;return r.makeWireWrite?a=r.makeWireWrite(o,e,t,n):a=r.wireWrite,a?typeof a=="string"?a:(t[n]=a,"(convertParamList["+n+"]("+o+"))"):o}function buildCallerFunction(dynCall,ptrType,ptr,num,policyTbl,needsWireWrite,prefix,returnType,argTypeList,mask,err){var argList=makeArgList(argTypeList.length),convertParamList=[],callExpression=makeWireRead(convertParamList,policyTbl,returnType,"dynCall("+[prefix].concat(argList.map(function(t,e){return makeWireWrite(convertParamList,policyTbl,argTypeList[e],t)})).join(",")+")"),resourceSet=_nbind.listResources([returnType],argTypeList),sourceCode="function("+argList.join(",")+"){"+(mask?"this.__nbindFlags&mask&&err();":"")+resourceSet.makeOpen()+"var r="+callExpression+";"+resourceSet.makeClose()+"return r;}";return eval("("+sourceCode+")")}function buildJSCallerFunction(returnType,argTypeList){var argList=makeArgList(argTypeList.length),convertParamList=[],callExpression=makeWireWrite(convertParamList,null,returnType,"_nbind.externalList[num].data("+argList.map(function(t,e){return makeWireRead(convertParamList,null,argTypeList[e],t)}).join(",")+")"),resourceSet=_nbind.listResources(argTypeList,[returnType]);resourceSet.remove(_nbind.resources.pool);var sourceCode="function("+["dummy","num"].concat(argList).join(",")+"){"+resourceSet.makeOpen()+"var r="+callExpression+";"+resourceSet.makeClose()+"return r;}";return eval("("+sourceCode+")")}_nbind.buildJSCallerFunction=buildJSCallerFunction;function makeJSCaller(t){var e=t.length-1,r=_nbind.getTypes(t,"callback"),o=r[0],a=r.slice(1),n=anyNeedsWireRead(a,null),u=o.needsWireWrite(null);if(!u&&!n)switch(e){case 0:return function(A,p){return _nbind.externalList[p].data()};case 1:return function(A,p,h){return _nbind.externalList[p].data(h)};case 2:return function(A,p,h,E){return _nbind.externalList[p].data(h,E)};case 3:return function(A,p,h,E,I){return _nbind.externalList[p].data(h,E,I)};default:break}return buildJSCallerFunction(o,a)}_nbind.makeJSCaller=makeJSCaller;function makeMethodCaller(t,e){var r=e.typeList.length-1,o=e.typeList.slice(0);o.splice(1,0,"uint32_t",e.boundID);var a=_nbind.getTypes(o,e.title),n=a[0],u=a.slice(3),A=n.needsWireRead(e.policyTbl),p=anyNeedsWireWrite(u,e.policyTbl),h=e.ptr,E=e.num,I=_nbind.getDynCall(a,e.title),v=~e.flags&1;function x(){throw new Error("Calling a non-const method on a const object")}if(!A&&!p)switch(r){case 0:return function(){return this.__nbindFlags&v?x():I(h,E,_nbind.pushPointer(this,t))};case 1:return function(C){return this.__nbindFlags&v?x():I(h,E,_nbind.pushPointer(this,t),C)};case 2:return function(C,R){return this.__nbindFlags&v?x():I(h,E,_nbind.pushPointer(this,t),C,R)};case 3:return function(C,R,L){return this.__nbindFlags&v?x():I(h,E,_nbind.pushPointer(this,t),C,R,L)};default:break}return buildCallerFunction(I,t,h,E,e.policyTbl,p,"ptr,num,pushPointer(this,ptrType)",n,u,v,x)}_nbind.makeMethodCaller=makeMethodCaller;function makeCaller(t){var e=t.typeList.length-1,r=_nbind.getTypes(t.typeList,t.title),o=r[0],a=r.slice(1),n=o.needsWireRead(t.policyTbl),u=anyNeedsWireWrite(a,t.policyTbl),A=t.direct,p=t.ptr;if(t.direct&&!n&&!u){var h=_nbind.getDynCall(r,t.title);switch(e){case 0:return function(){return h(A)};case 1:return function(x){return h(A,x)};case 2:return function(x,C){return h(A,x,C)};case 3:return function(x,C,R){return h(A,x,C,R)};default:break}p=0}var E;if(p){var I=t.typeList.slice(0);I.splice(1,0,"uint32_t"),r=_nbind.getTypes(I,t.title),E="ptr,num"}else p=A,E="ptr";var v=_nbind.getDynCall(r,t.title);return buildCallerFunction(v,null,p,t.num,t.policyTbl,u,E,o,a)}_nbind.makeCaller=makeCaller;function makeOverloader(t,e){var r=[];function o(){return r[arguments.length].apply(this,arguments)}return o.addMethod=function(a,n){r[n]=a},o.addMethod(t,e),o}_nbind.makeOverloader=makeOverloader;var Resource=function(){function t(e,r){var o=this;this.makeOpen=function(){return Object.keys(o.openTbl).join("")},this.makeClose=function(){return Object.keys(o.closeTbl).join("")},this.openTbl={},this.closeTbl={},e&&(this.openTbl[e]=!0),r&&(this.closeTbl[r]=!0)}return t.prototype.add=function(e){for(var r=0,o=Object.keys(e.openTbl);r<o.length;r++){var a=o[r];this.openTbl[a]=!0}for(var n=0,u=Object.keys(e.closeTbl);n<u.length;n++){var a=u[n];this.closeTbl[a]=!0}},t.prototype.remove=function(e){for(var r=0,o=Object.keys(e.openTbl);r<o.length;r++){var a=o[r];delete this.openTbl[a]}for(var n=0,u=Object.keys(e.closeTbl);n<u.length;n++){var a=u[n];delete this.closeTbl[a]}},t}();_nbind.Resource=Resource;function listResources(t,e){for(var r=new Resource,o=0,a=t;o<a.length;o++)for(var n=a[o],u=0,A=n.readResources||[];u<A.length;u++){var p=A[u];r.add(p)}for(var h=0,E=e;h<E.length;h++)for(var n=E[h],I=0,v=n.writeResources||[];I<v.length;I++){var p=v[I];r.add(p)}return r}_nbind.listResources=listResources,_nbind.resources={pool:new Resource("var used=HEAPU32[_nbind.Pool.usedPtr],page=HEAPU32[_nbind.Pool.pagePtr];","_nbind.Pool.lreset(used,page);")};var ExternalBuffer=function(t){__extends(e,t);function e(r,o){var a=t.call(this,r)||this;return a.ptr=o,a}return e.prototype.free=function(){_free(this.ptr)},e}(_nbind.External);function getBuffer(t){return t instanceof ArrayBuffer?new Uint8Array(t):t instanceof DataView?new Uint8Array(t.buffer,t.byteOffset,t.byteLength):t}function pushBuffer(t,e){if(t==null&&e&&e.Nullable&&(t=[]),typeof t!="object")throw new Error("Type mismatch");var r=t,o=r.byteLength||r.length;if(!o&&o!==0&&r.byteLength!==0)throw new Error("Type mismatch");var a=_nbind.Pool.lalloc(8),n=_malloc(o),u=a/4;return HEAPU32[u++]=o,HEAPU32[u++]=n,HEAPU32[u++]=new ExternalBuffer(t,n).register(),HEAPU8.set(getBuffer(t),n),a}var BufferType=function(t){__extends(e,t);function e(){var r=t!==null&&t.apply(this,arguments)||this;return r.wireWrite=pushBuffer,r.readResources=[_nbind.resources.pool],r.writeResources=[_nbind.resources.pool],r}return e.prototype.makeWireWrite=function(r,o){return function(a){return pushBuffer(a,o)}},e}(_nbind.BindType);_nbind.BufferType=BufferType;function commitBuffer(t,e,r){var o=_nbind.externalList[t].data,a=Buffer;if(typeof Buffer!="function"&&(a=function(){}),!(o instanceof Array)){var n=HEAPU8.subarray(e,e+r);if(o instanceof a){var u=void 0;typeof Buffer.from=="function"&&Buffer.from.length>=3?u=Buffer.from(n):u=new Buffer(n),u.copy(o)}else getBuffer(o).set(n)}}_nbind.commitBuffer=commitBuffer;var dirtyList=[],gcTimer=0;function sweep(){for(var t=0,e=dirtyList;t<e.length;t++){var r=e[t];r.__nbindState&3||r.free()}dirtyList=[],gcTimer=0}_nbind.mark=function(t){};function toggleLightGC(t){t?_nbind.mark=function(e){dirtyList.push(e),gcTimer||(gcTimer=setTimeout(sweep,0))}:_nbind.mark=function(e){}}_nbind.toggleLightGC=toggleLightGC}(_nbind),Module.requestFullScreen=function t(e,r,o){Module.printErr("Module.requestFullScreen is deprecated. Please call Module.requestFullscreen instead."),Module.requestFullScreen=Module.requestFullscreen,Browser.requestFullScreen(e,r,o)},Module.requestFullscreen=function t(e,r,o){Browser.requestFullscreen(e,r,o)},Module.requestAnimationFrame=function t(e){Browser.requestAnimationFrame(e)},Module.setCanvasSize=function t(e,r,o){Browser.setCanvasSize(e,r,o)},Module.pauseMainLoop=function t(){Browser.mainLoop.pause()},Module.resumeMainLoop=function t(){Browser.mainLoop.resume()},Module.getUserMedia=function t(){Browser.getUserMedia()},Module.createContext=function t(e,r,o,a){return Browser.createContext(e,r,o,a)},ENVIRONMENT_IS_NODE?_emscripten_get_now=function(){var e=process.hrtime();return e[0]*1e3+e[1]/1e6}:typeof dateNow<"u"?_emscripten_get_now=dateNow:typeof self=="object"&&self.performance&&typeof self.performance.now=="function"?_emscripten_get_now=function(){return self.performance.now()}:typeof performance=="object"&&typeof performance.now=="function"?_emscripten_get_now=function(){return performance.now()}:_emscripten_get_now=Date.now,__ATEXIT__.push(function(){var t=Module._fflush;t&&t(0);var e=___syscall146.printChar;if(!!e){var r=___syscall146.buffers;r[1].length&&e(1,10),r[2].length&&e(2,10)}}),DYNAMICTOP_PTR=allocate(1,"i32",ALLOC_STATIC),STACK_BASE=STACKTOP=Runtime.alignMemory(STATICTOP),STACK_MAX=STACK_BASE+TOTAL_STACK,DYNAMIC_BASE=Runtime.alignMemory(STACK_MAX),HEAP32[DYNAMICTOP_PTR>>2]=DYNAMIC_BASE,staticSealed=!0;function invoke_viiiii(t,e,r,o,a,n){try{Module.dynCall_viiiii(t,e,r,o,a,n)}catch(u){if(typeof u!="number"&&u!=="longjmp")throw u;Module.setThrew(1,0)}}function invoke_vif(t,e,r){try{Module.dynCall_vif(t,e,r)}catch(o){if(typeof o!="number"&&o!=="longjmp")throw o;Module.setThrew(1,0)}}function invoke_vid(t,e,r){try{Module.dynCall_vid(t,e,r)}catch(o){if(typeof o!="number"&&o!=="longjmp")throw o;Module.setThrew(1,0)}}function invoke_fiff(t,e,r,o){try{return Module.dynCall_fiff(t,e,r,o)}catch(a){if(typeof a!="number"&&a!=="longjmp")throw a;Module.setThrew(1,0)}}function invoke_vi(t,e){try{Module.dynCall_vi(t,e)}catch(r){if(typeof r!="number"&&r!=="longjmp")throw r;Module.setThrew(1,0)}}function invoke_vii(t,e,r){try{Module.dynCall_vii(t,e,r)}catch(o){if(typeof o!="number"&&o!=="longjmp")throw o;Module.setThrew(1,0)}}function invoke_ii(t,e){try{return Module.dynCall_ii(t,e)}catch(r){if(typeof r!="number"&&r!=="longjmp")throw r;Module.setThrew(1,0)}}function invoke_viddi(t,e,r,o,a){try{Module.dynCall_viddi(t,e,r,o,a)}catch(n){if(typeof n!="number"&&n!=="longjmp")throw n;Module.setThrew(1,0)}}function invoke_vidd(t,e,r,o){try{Module.dynCall_vidd(t,e,r,o)}catch(a){if(typeof a!="number"&&a!=="longjmp")throw a;Module.setThrew(1,0)}}function invoke_iiii(t,e,r,o){try{return Module.dynCall_iiii(t,e,r,o)}catch(a){if(typeof a!="number"&&a!=="longjmp")throw a;Module.setThrew(1,0)}}function invoke_diii(t,e,r,o){try{return Module.dynCall_diii(t,e,r,o)}catch(a){if(typeof a!="number"&&a!=="longjmp")throw a;Module.setThrew(1,0)}}function invoke_di(t,e){try{return Module.dynCall_di(t,e)}catch(r){if(typeof r!="number"&&r!=="longjmp")throw r;Module.setThrew(1,0)}}function invoke_iid(t,e,r){try{return Module.dynCall_iid(t,e,r)}catch(o){if(typeof o!="number"&&o!=="longjmp")throw o;Module.setThrew(1,0)}}function invoke_iii(t,e,r){try{return Module.dynCall_iii(t,e,r)}catch(o){if(typeof o!="number"&&o!=="longjmp")throw o;Module.setThrew(1,0)}}function invoke_viiddi(t,e,r,o,a,n){try{Module.dynCall_viiddi(t,e,r,o,a,n)}catch(u){if(typeof u!="number"&&u!=="longjmp")throw u;Module.setThrew(1,0)}}function invoke_viiiiii(t,e,r,o,a,n,u){try{Module.dynCall_viiiiii(t,e,r,o,a,n,u)}catch(A){if(typeof A!="number"&&A!=="longjmp")throw A;Module.setThrew(1,0)}}function invoke_dii(t,e,r){try{return Module.dynCall_dii(t,e,r)}catch(o){if(typeof o!="number"&&o!=="longjmp")throw o;Module.setThrew(1,0)}}function invoke_i(t){try{return Module.dynCall_i(t)}catch(e){if(typeof e!="number"&&e!=="longjmp")throw e;Module.setThrew(1,0)}}function invoke_iiiiii(t,e,r,o,a,n){try{return Module.dynCall_iiiiii(t,e,r,o,a,n)}catch(u){if(typeof u!="number"&&u!=="longjmp")throw u;Module.setThrew(1,0)}}function invoke_viiid(t,e,r,o,a){try{Module.dynCall_viiid(t,e,r,o,a)}catch(n){if(typeof n!="number"&&n!=="longjmp")throw n;Module.setThrew(1,0)}}function invoke_viififi(t,e,r,o,a,n,u){try{Module.dynCall_viififi(t,e,r,o,a,n,u)}catch(A){if(typeof A!="number"&&A!=="longjmp")throw A;Module.setThrew(1,0)}}function invoke_viii(t,e,r,o){try{Module.dynCall_viii(t,e,r,o)}catch(a){if(typeof a!="number"&&a!=="longjmp")throw a;Module.setThrew(1,0)}}function invoke_v(t){try{Module.dynCall_v(t)}catch(e){if(typeof e!="number"&&e!=="longjmp")throw e;Module.setThrew(1,0)}}function invoke_viid(t,e,r,o){try{Module.dynCall_viid(t,e,r,o)}catch(a){if(typeof a!="number"&&a!=="longjmp")throw a;Module.setThrew(1,0)}}function invoke_idd(t,e,r){try{return Module.dynCall_idd(t,e,r)}catch(o){if(typeof o!="number"&&o!=="longjmp")throw o;Module.setThrew(1,0)}}function invoke_viiii(t,e,r,o,a){try{Module.dynCall_viiii(t,e,r,o,a)}catch(n){if(typeof n!="number"&&n!=="longjmp")throw n;Module.setThrew(1,0)}}Module.asmGlobalArg={Math,Int8Array,Int16Array,Int32Array,Uint8Array,Uint16Array,Uint32Array,Float32Array,Float64Array,NaN:NaN,Infinity:1/0},Module.asmLibraryArg={abort,assert,enlargeMemory,getTotalMemory,abortOnCannotGrowMemory,invoke_viiiii,invoke_vif,invoke_vid,invoke_fiff,invoke_vi,invoke_vii,invoke_ii,invoke_viddi,invoke_vidd,invoke_iiii,invoke_diii,invoke_di,invoke_iid,invoke_iii,invoke_viiddi,invoke_viiiiii,invoke_dii,invoke_i,invoke_iiiiii,invoke_viiid,invoke_viififi,invoke_viii,invoke_v,invoke_viid,invoke_idd,invoke_viiii,_emscripten_asm_const_iiiii,_emscripten_asm_const_iiidddddd,_emscripten_asm_const_iiiid,__nbind_reference_external,_emscripten_asm_const_iiiiiiii,_removeAccessorPrefix,_typeModule,__nbind_register_pool,__decorate,_llvm_stackrestore,___cxa_atexit,__extends,__nbind_get_value_object,__ZN8facebook4yoga14YGNodeToStringEPNSt3__212basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEP6YGNode14YGPrintOptionsj,_emscripten_set_main_loop_timing,__nbind_register_primitive,__nbind_register_type,_emscripten_memcpy_big,__nbind_register_function,___setErrNo,__nbind_register_class,__nbind_finish,_abort,_nbind_value,_llvm_stacksave,___syscall54,_defineHidden,_emscripten_set_main_loop,_emscripten_get_now,__nbind_register_callback_signature,_emscripten_asm_const_iiiiii,__nbind_free_external,_emscripten_asm_const_iiii,_emscripten_asm_const_iiididi,___syscall6,_atexit,___syscall140,___syscall146,DYNAMICTOP_PTR,tempDoublePtr,ABORT,STACKTOP,STACK_MAX,cttz_i8,___dso_handle};var asm=function(t,e,r){var o=new t.Int8Array(r),a=new t.Int16Array(r),n=new t.Int32Array(r),u=new t.Uint8Array(r),A=new t.Uint16Array(r),p=new t.Uint32Array(r),h=new t.Float32Array(r),E=new t.Float64Array(r),I=e.DYNAMICTOP_PTR|0,v=e.tempDoublePtr|0,x=e.ABORT|0,C=e.STACKTOP|0,R=e.STACK_MAX|0,L=e.cttz_i8|0,U=e.___dso_handle|0,J=0,te=0,ae=0,fe=0,ce=t.NaN,me=t.Infinity,he=0,Be=0,we=0,g=0,Ee=0,Se=0,le=t.Math.floor,ne=t.Math.abs,ee=t.Math.sqrt,Ie=t.Math.pow,Fe=t.Math.cos,At=t.Math.sin,H=t.Math.tan,at=t.Math.acos,Re=t.Math.asin,ke=t.Math.atan,xe=t.Math.atan2,He=t.Math.exp,Te=t.Math.log,Je=t.Math.ceil,je=t.Math.imul,b=t.Math.min,w=t.Math.max,P=t.Math.clz32,y=t.Math.fround,F=e.abort,z=e.assert,X=e.enlargeMemory,Z=e.getTotalMemory,ie=e.abortOnCannotGrowMemory,Pe=e.invoke_viiiii,Ne=e.invoke_vif,ot=e.invoke_vid,dt=e.invoke_fiff,Gt=e.invoke_vi,$t=e.invoke_vii,bt=e.invoke_ii,an=e.invoke_viddi,Qr=e.invoke_vidd,mr=e.invoke_iiii,br=e.invoke_diii,Wr=e.invoke_di,Kn=e.invoke_iid,Ns=e.invoke_iii,Ti=e.invoke_viiddi,ps=e.invoke_viiiiii,io=e.invoke_dii,Pi=e.invoke_i,Ls=e.invoke_iiiiii,so=e.invoke_viiid,cc=e.invoke_viififi,cu=e.invoke_viii,lp=e.invoke_v,cp=e.invoke_viid,Os=e.invoke_idd,Dn=e.invoke_viiii,oo=e._emscripten_asm_const_iiiii,Ms=e._emscripten_asm_const_iiidddddd,ml=e._emscripten_asm_const_iiiid,yl=e.__nbind_reference_external,ao=e._emscripten_asm_const_iiiiiiii,Vn=e._removeAccessorPrefix,On=e._typeModule,Ni=e.__nbind_register_pool,Mn=e.__decorate,_i=e._llvm_stackrestore,tr=e.___cxa_atexit,Oe=e.__extends,ii=e.__nbind_get_value_object,Ma=e.__ZN8facebook4yoga14YGNodeToStringEPNSt3__212basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEP6YGNode14YGPrintOptionsj,hr=e._emscripten_set_main_loop_timing,uc=e.__nbind_register_primitive,uu=e.__nbind_register_type,Ac=e._emscripten_memcpy_big,El=e.__nbind_register_function,DA=e.___setErrNo,Au=e.__nbind_register_class,Ce=e.__nbind_finish,Rt=e._abort,fc=e._nbind_value,Hi=e._llvm_stacksave,fu=e.___syscall54,Yt=e._defineHidden,Cl=e._emscripten_set_main_loop,SA=e._emscripten_get_now,up=e.__nbind_register_callback_signature,pc=e._emscripten_asm_const_iiiiii,PA=e.__nbind_free_external,Qn=e._emscripten_asm_const_iiii,hi=e._emscripten_asm_const_iiididi,hc=e.___syscall6,bA=e._atexit,sa=e.___syscall140,Li=e.___syscall146,_o=y(0);let Ze=y(0);function lo(s){s=s|0;var l=0;return l=C,C=C+s|0,C=C+15&-16,l|0}function gc(){return C|0}function pu(s){s=s|0,C=s}function ji(s,l){s=s|0,l=l|0,C=s,R=l}function hu(s,l){s=s|0,l=l|0,J||(J=s,te=l)}function xA(s){s=s|0,Se=s}function Ua(){return Se|0}function dc(){var s=0,l=0;Dr(8104,8,400)|0,Dr(8504,408,540)|0,s=9044,l=s+44|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));o[9088]=0,o[9089]=1,n[2273]=0,n[2274]=948,n[2275]=948,tr(17,8104,U|0)|0}function hs(s){s=s|0,pt(s+948|0)}function _t(s){return s=y(s),((Du(s)|0)&2147483647)>>>0>2139095040|0}function Fn(s,l,c){s=s|0,l=l|0,c=c|0;e:do if(n[s+(l<<3)+4>>2]|0)s=s+(l<<3)|0;else{if((l|2|0)==3&&n[s+60>>2]|0){s=s+56|0;break}switch(l|0){case 0:case 2:case 4:case 5:{if(n[s+52>>2]|0){s=s+48|0;break e}break}default:}if(n[s+68>>2]|0){s=s+64|0;break}else{s=(l|1|0)==5?948:c;break}}while(0);return s|0}function Ci(s){s=s|0;var l=0;return l=pD(1e3)|0,oa(s,(l|0)!=0,2456),n[2276]=(n[2276]|0)+1,Dr(l|0,8104,1e3)|0,o[s+2>>0]|0&&(n[l+4>>2]=2,n[l+12>>2]=4),n[l+976>>2]=s,l|0}function oa(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0;d=C,C=C+16|0,f=d,l||(n[f>>2]=c,Eg(s,5,3197,f)),C=d}function co(){return Ci(956)|0}function Us(s){s=s|0;var l=0;return l=Kt(1e3)|0,aa(l,s),oa(n[s+976>>2]|0,1,2456),n[2276]=(n[2276]|0)+1,n[l+944>>2]=0,l|0}function aa(s,l){s=s|0,l=l|0;var c=0;Dr(s|0,l|0,948)|0,Rm(s+948|0,l+948|0),c=s+960|0,s=l+960|0,l=c+40|0;do n[c>>2]=n[s>>2],c=c+4|0,s=s+4|0;while((c|0)<(l|0))}function la(s){s=s|0;var l=0,c=0,f=0,d=0;if(l=s+944|0,c=n[l>>2]|0,c|0&&(Ho(c+948|0,s)|0,n[l>>2]=0),c=wi(s)|0,c|0){l=0;do n[(gs(s,l)|0)+944>>2]=0,l=l+1|0;while((l|0)!=(c|0))}c=s+948|0,f=n[c>>2]|0,d=s+952|0,l=n[d>>2]|0,(l|0)!=(f|0)&&(n[d>>2]=l+(~((l+-4-f|0)>>>2)<<2)),ds(c),hD(s),n[2276]=(n[2276]|0)+-1}function Ho(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0;f=n[s>>2]|0,k=s+4|0,c=n[k>>2]|0,m=c;e:do if((f|0)==(c|0))d=f,B=4;else for(s=f;;){if((n[s>>2]|0)==(l|0)){d=s,B=4;break e}if(s=s+4|0,(s|0)==(c|0)){s=0;break}}while(0);return(B|0)==4&&((d|0)!=(c|0)?(f=d+4|0,s=m-f|0,l=s>>2,l&&(Mw(d|0,f|0,s|0)|0,c=n[k>>2]|0),s=d+(l<<2)|0,(c|0)==(s|0)||(n[k>>2]=c+(~((c+-4-s|0)>>>2)<<2)),s=1):s=0),s|0}function wi(s){return s=s|0,(n[s+952>>2]|0)-(n[s+948>>2]|0)>>2|0}function gs(s,l){s=s|0,l=l|0;var c=0;return c=n[s+948>>2]|0,(n[s+952>>2]|0)-c>>2>>>0>l>>>0?s=n[c+(l<<2)>>2]|0:s=0,s|0}function ds(s){s=s|0;var l=0,c=0,f=0,d=0;f=C,C=C+32|0,l=f,d=n[s>>2]|0,c=(n[s+4>>2]|0)-d|0,((n[s+8>>2]|0)-d|0)>>>0>c>>>0&&(d=c>>2,Ip(l,d,d,s+8|0),Bg(s,l),_A(l)),C=f}function ms(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0;M=wi(s)|0;do if(M|0){if((n[(gs(s,0)|0)+944>>2]|0)==(s|0)){if(!(Ho(s+948|0,l)|0))break;Dr(l+400|0,8504,540)|0,n[l+944>>2]=0,Le(s);break}B=n[(n[s+976>>2]|0)+12>>2]|0,k=s+948|0,Q=(B|0)==0,c=0,m=0;do f=n[(n[k>>2]|0)+(m<<2)>>2]|0,(f|0)==(l|0)?Le(s):(d=Us(f)|0,n[(n[k>>2]|0)+(c<<2)>>2]=d,n[d+944>>2]=s,Q||TR[B&15](f,d,s,c),c=c+1|0),m=m+1|0;while((m|0)!=(M|0));if(c>>>0<M>>>0){Q=s+948|0,k=s+952|0,B=c,c=n[k>>2]|0;do m=(n[Q>>2]|0)+(B<<2)|0,f=m+4|0,d=c-f|0,l=d>>2,l&&(Mw(m|0,f|0,d|0)|0,c=n[k>>2]|0),d=c,f=m+(l<<2)|0,(d|0)!=(f|0)&&(c=d+(~((d+-4-f|0)>>>2)<<2)|0,n[k>>2]=c),B=B+1|0;while((B|0)!=(M|0))}}while(0)}function _s(s){s=s|0;var l=0,c=0,f=0,d=0;Un(s,(wi(s)|0)==0,2491),Un(s,(n[s+944>>2]|0)==0,2545),l=s+948|0,c=n[l>>2]|0,f=s+952|0,d=n[f>>2]|0,(d|0)!=(c|0)&&(n[f>>2]=d+(~((d+-4-c|0)>>>2)<<2)),ds(l),l=s+976|0,c=n[l>>2]|0,Dr(s|0,8104,1e3)|0,o[c+2>>0]|0&&(n[s+4>>2]=2,n[s+12>>2]=4),n[l>>2]=c}function Un(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0;d=C,C=C+16|0,f=d,l||(n[f>>2]=c,Ao(s,5,3197,f)),C=d}function Sn(){return n[2276]|0}function ys(){var s=0;return s=pD(20)|0,We((s|0)!=0,2592),n[2277]=(n[2277]|0)+1,n[s>>2]=n[239],n[s+4>>2]=n[240],n[s+8>>2]=n[241],n[s+12>>2]=n[242],n[s+16>>2]=n[243],s|0}function We(s,l){s=s|0,l=l|0;var c=0,f=0;f=C,C=C+16|0,c=f,s||(n[c>>2]=l,Ao(0,5,3197,c)),C=f}function tt(s){s=s|0,hD(s),n[2277]=(n[2277]|0)+-1}function It(s,l){s=s|0,l=l|0;var c=0;l?(Un(s,(wi(s)|0)==0,2629),c=1):(c=0,l=0),n[s+964>>2]=l,n[s+988>>2]=c}function nr(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;f=C,C=C+16|0,m=f+8|0,d=f+4|0,B=f,n[d>>2]=l,Un(s,(n[l+944>>2]|0)==0,2709),Un(s,(n[s+964>>2]|0)==0,2763),$(s),l=s+948|0,n[B>>2]=(n[l>>2]|0)+(c<<2),n[m>>2]=n[B>>2],ye(l,m,d)|0,n[(n[d>>2]|0)+944>>2]=s,Le(s),C=f}function $(s){s=s|0;var l=0,c=0,f=0,d=0,m=0,B=0,k=0;if(c=wi(s)|0,c|0&&(n[(gs(s,0)|0)+944>>2]|0)!=(s|0)){f=n[(n[s+976>>2]|0)+12>>2]|0,d=s+948|0,m=(f|0)==0,l=0;do B=n[(n[d>>2]|0)+(l<<2)>>2]|0,k=Us(B)|0,n[(n[d>>2]|0)+(l<<2)>>2]=k,n[k+944>>2]=s,m||TR[f&15](B,k,s,l),l=l+1|0;while((l|0)!=(c|0))}}function ye(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0,qe=0,Me=0,Qe=0,et=0,Xe=0;et=C,C=C+64|0,G=et+52|0,k=et+48|0,se=et+28|0,qe=et+24|0,Me=et+20|0,Qe=et,f=n[s>>2]|0,m=f,l=f+((n[l>>2]|0)-m>>2<<2)|0,f=s+4|0,d=n[f>>2]|0,B=s+8|0;do if(d>>>0<(n[B>>2]|0)>>>0){if((l|0)==(d|0)){n[l>>2]=n[c>>2],n[f>>2]=(n[f>>2]|0)+4;break}HA(s,l,d,l+4|0),l>>>0<=c>>>0&&(c=(n[f>>2]|0)>>>0>c>>>0?c+4|0:c),n[l>>2]=n[c>>2]}else{f=(d-m>>2)+1|0,d=N(s)|0,d>>>0<f>>>0&&zr(s),O=n[s>>2]|0,M=(n[B>>2]|0)-O|0,m=M>>1,Ip(Qe,M>>2>>>0<d>>>1>>>0?m>>>0<f>>>0?f:m:d,l-O>>2,s+8|0),O=Qe+8|0,f=n[O>>2]|0,m=Qe+12|0,M=n[m>>2]|0,B=M,Q=f;do if((f|0)==(M|0)){if(M=Qe+4|0,f=n[M>>2]|0,Xe=n[Qe>>2]|0,d=Xe,f>>>0<=Xe>>>0){f=B-d>>1,f=(f|0)==0?1:f,Ip(se,f,f>>>2,n[Qe+16>>2]|0),n[qe>>2]=n[M>>2],n[Me>>2]=n[O>>2],n[k>>2]=n[qe>>2],n[G>>2]=n[Me>>2],Dw(se,k,G),f=n[Qe>>2]|0,n[Qe>>2]=n[se>>2],n[se>>2]=f,f=se+4|0,Xe=n[M>>2]|0,n[M>>2]=n[f>>2],n[f>>2]=Xe,f=se+8|0,Xe=n[O>>2]|0,n[O>>2]=n[f>>2],n[f>>2]=Xe,f=se+12|0,Xe=n[m>>2]|0,n[m>>2]=n[f>>2],n[f>>2]=Xe,_A(se),f=n[O>>2]|0;break}m=f,B=((m-d>>2)+1|0)/-2|0,k=f+(B<<2)|0,d=Q-m|0,m=d>>2,m&&(Mw(k|0,f|0,d|0)|0,f=n[M>>2]|0),Xe=k+(m<<2)|0,n[O>>2]=Xe,n[M>>2]=f+(B<<2),f=Xe}while(0);n[f>>2]=n[c>>2],n[O>>2]=(n[O>>2]|0)+4,l=vg(s,Qe,l)|0,_A(Qe)}while(0);return C=et,l|0}function Le(s){s=s|0;var l=0;do{if(l=s+984|0,o[l>>0]|0)break;o[l>>0]=1,h[s+504>>2]=y(ce),s=n[s+944>>2]|0}while((s|0)!=0)}function pt(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~((l+-4-f|0)>>>2)<<2)),gt(c))}function ht(s){return s=s|0,n[s+944>>2]|0}function Tt(s){s=s|0,Un(s,(n[s+964>>2]|0)!=0,2832),Le(s)}function er(s){return s=s|0,(o[s+984>>0]|0)!=0|0}function $r(s,l){s=s|0,l=l|0,QUe(s,l,400)|0&&(Dr(s|0,l|0,400)|0,Le(s))}function Gi(s){s=s|0;var l=Ze;return l=y(h[s+44>>2]),s=_t(l)|0,y(s?y(0):l)}function es(s){s=s|0;var l=Ze;return l=y(h[s+48>>2]),_t(l)|0&&(l=o[(n[s+976>>2]|0)+2>>0]|0?y(1):y(0)),y(l)}function bi(s,l){s=s|0,l=l|0,n[s+980>>2]=l}function jo(s){return s=s|0,n[s+980>>2]|0}function kA(s,l){s=s|0,l=l|0;var c=0;c=s+4|0,(n[c>>2]|0)!=(l|0)&&(n[c>>2]=l,Le(s))}function QA(s){return s=s|0,n[s+4>>2]|0}function Ap(s,l){s=s|0,l=l|0;var c=0;c=s+8|0,(n[c>>2]|0)!=(l|0)&&(n[c>>2]=l,Le(s))}function ig(s){return s=s|0,n[s+8>>2]|0}function gu(s,l){s=s|0,l=l|0;var c=0;c=s+12|0,(n[c>>2]|0)!=(l|0)&&(n[c>>2]=l,Le(s))}function sg(s){return s=s|0,n[s+12>>2]|0}function du(s,l){s=s|0,l=l|0;var c=0;c=s+16|0,(n[c>>2]|0)!=(l|0)&&(n[c>>2]=l,Le(s))}function uo(s){return s=s|0,n[s+16>>2]|0}function FA(s,l){s=s|0,l=l|0;var c=0;c=s+20|0,(n[c>>2]|0)!=(l|0)&&(n[c>>2]=l,Le(s))}function mc(s){return s=s|0,n[s+20>>2]|0}function ca(s,l){s=s|0,l=l|0;var c=0;c=s+24|0,(n[c>>2]|0)!=(l|0)&&(n[c>>2]=l,Le(s))}function og(s){return s=s|0,n[s+24>>2]|0}function yc(s,l){s=s|0,l=l|0;var c=0;c=s+28|0,(n[c>>2]|0)!=(l|0)&&(n[c>>2]=l,Le(s))}function Pm(s){return s=s|0,n[s+28>>2]|0}function ag(s,l){s=s|0,l=l|0;var c=0;c=s+32|0,(n[c>>2]|0)!=(l|0)&&(n[c>>2]=l,Le(s))}function $n(s){return s=s|0,n[s+32>>2]|0}function fp(s,l){s=s|0,l=l|0;var c=0;c=s+36|0,(n[c>>2]|0)!=(l|0)&&(n[c>>2]=l,Le(s))}function lg(s){return s=s|0,n[s+36>>2]|0}function RA(s,l){s=s|0,l=y(l);var c=0;c=s+40|0,y(h[c>>2])!=l&&(h[c>>2]=l,Le(s))}function Hs(s,l){s=s|0,l=y(l);var c=0;c=s+44|0,y(h[c>>2])!=l&&(h[c>>2]=l,Le(s))}function mu(s,l){s=s|0,l=y(l);var c=0;c=s+48|0,y(h[c>>2])!=l&&(h[c>>2]=l,Le(s))}function Ha(s,l){s=s|0,l=y(l);var c=0,f=0,d=0,m=0;m=_t(l)|0,c=(m^1)&1,f=s+52|0,d=s+56|0,m|y(h[f>>2])==l&&(n[d>>2]|0)==(c|0)||(h[f>>2]=l,n[d>>2]=c,Le(s))}function qi(s,l){s=s|0,l=y(l);var c=0,f=0;f=s+52|0,c=s+56|0,y(h[f>>2])==l&&(n[c>>2]|0)==2||(h[f>>2]=l,f=_t(l)|0,n[c>>2]=f?3:2,Le(s))}function ua(s,l){s=s|0,l=l|0;var c=0,f=0;f=l+52|0,c=n[f+4>>2]|0,l=s,n[l>>2]=n[f>>2],n[l+4>>2]=c}function yu(s,l,c){s=s|0,l=l|0,c=y(c);var f=0,d=0,m=0;m=_t(c)|0,f=(m^1)&1,d=s+132+(l<<3)|0,l=s+132+(l<<3)+4|0,m|y(h[d>>2])==c&&(n[l>>2]|0)==(f|0)||(h[d>>2]=c,n[l>>2]=f,Le(s))}function Es(s,l,c){s=s|0,l=l|0,c=y(c);var f=0,d=0,m=0;m=_t(c)|0,f=m?0:2,d=s+132+(l<<3)|0,l=s+132+(l<<3)+4|0,m|y(h[d>>2])==c&&(n[l>>2]|0)==(f|0)||(h[d>>2]=c,n[l>>2]=f,Le(s))}function Ec(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=l+132+(c<<3)|0,l=n[f+4>>2]|0,c=s,n[c>>2]=n[f>>2],n[c+4>>2]=l}function Cc(s,l,c){s=s|0,l=l|0,c=y(c);var f=0,d=0,m=0;m=_t(c)|0,f=(m^1)&1,d=s+60+(l<<3)|0,l=s+60+(l<<3)+4|0,m|y(h[d>>2])==c&&(n[l>>2]|0)==(f|0)||(h[d>>2]=c,n[l>>2]=f,Le(s))}function q(s,l,c){s=s|0,l=l|0,c=y(c);var f=0,d=0,m=0;m=_t(c)|0,f=m?0:2,d=s+60+(l<<3)|0,l=s+60+(l<<3)+4|0,m|y(h[d>>2])==c&&(n[l>>2]|0)==(f|0)||(h[d>>2]=c,n[l>>2]=f,Le(s))}function Dt(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=l+60+(c<<3)|0,l=n[f+4>>2]|0,c=s,n[c>>2]=n[f>>2],n[c+4>>2]=l}function wl(s,l){s=s|0,l=l|0;var c=0;c=s+60+(l<<3)+4|0,(n[c>>2]|0)!=3&&(h[s+60+(l<<3)>>2]=y(ce),n[c>>2]=3,Le(s))}function xi(s,l,c){s=s|0,l=l|0,c=y(c);var f=0,d=0,m=0;m=_t(c)|0,f=(m^1)&1,d=s+204+(l<<3)|0,l=s+204+(l<<3)+4|0,m|y(h[d>>2])==c&&(n[l>>2]|0)==(f|0)||(h[d>>2]=c,n[l>>2]=f,Le(s))}function wc(s,l,c){s=s|0,l=l|0,c=y(c);var f=0,d=0,m=0;m=_t(c)|0,f=m?0:2,d=s+204+(l<<3)|0,l=s+204+(l<<3)+4|0,m|y(h[d>>2])==c&&(n[l>>2]|0)==(f|0)||(h[d>>2]=c,n[l>>2]=f,Le(s))}function ct(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=l+204+(c<<3)|0,l=n[f+4>>2]|0,c=s,n[c>>2]=n[f>>2],n[c+4>>2]=l}function Eu(s,l,c){s=s|0,l=l|0,c=y(c);var f=0,d=0,m=0;m=_t(c)|0,f=(m^1)&1,d=s+276+(l<<3)|0,l=s+276+(l<<3)+4|0,m|y(h[d>>2])==c&&(n[l>>2]|0)==(f|0)||(h[d>>2]=c,n[l>>2]=f,Le(s))}function cg(s,l){return s=s|0,l=l|0,y(h[s+276+(l<<3)>>2])}function yw(s,l){s=s|0,l=y(l);var c=0,f=0,d=0,m=0;m=_t(l)|0,c=(m^1)&1,f=s+348|0,d=s+352|0,m|y(h[f>>2])==l&&(n[d>>2]|0)==(c|0)||(h[f>>2]=l,n[d>>2]=c,Le(s))}function TA(s,l){s=s|0,l=y(l);var c=0,f=0;f=s+348|0,c=s+352|0,y(h[f>>2])==l&&(n[c>>2]|0)==2||(h[f>>2]=l,f=_t(l)|0,n[c>>2]=f?3:2,Le(s))}function pp(s){s=s|0;var l=0;l=s+352|0,(n[l>>2]|0)!=3&&(h[s+348>>2]=y(ce),n[l>>2]=3,Le(s))}function Br(s,l){s=s|0,l=l|0;var c=0,f=0;f=l+348|0,c=n[f+4>>2]|0,l=s,n[l>>2]=n[f>>2],n[l+4>>2]=c}function Cs(s,l){s=s|0,l=y(l);var c=0,f=0,d=0,m=0;m=_t(l)|0,c=(m^1)&1,f=s+356|0,d=s+360|0,m|y(h[f>>2])==l&&(n[d>>2]|0)==(c|0)||(h[f>>2]=l,n[d>>2]=c,Le(s))}function ug(s,l){s=s|0,l=y(l);var c=0,f=0;f=s+356|0,c=s+360|0,y(h[f>>2])==l&&(n[c>>2]|0)==2||(h[f>>2]=l,f=_t(l)|0,n[c>>2]=f?3:2,Le(s))}function Ag(s){s=s|0;var l=0;l=s+360|0,(n[l>>2]|0)!=3&&(h[s+356>>2]=y(ce),n[l>>2]=3,Le(s))}function fg(s,l){s=s|0,l=l|0;var c=0,f=0;f=l+356|0,c=n[f+4>>2]|0,l=s,n[l>>2]=n[f>>2],n[l+4>>2]=c}function hp(s,l){s=s|0,l=y(l);var c=0,f=0,d=0,m=0;m=_t(l)|0,c=(m^1)&1,f=s+364|0,d=s+368|0,m|y(h[f>>2])==l&&(n[d>>2]|0)==(c|0)||(h[f>>2]=l,n[d>>2]=c,Le(s))}function Ic(s,l){s=s|0,l=y(l);var c=0,f=0,d=0,m=0;m=_t(l)|0,c=m?0:2,f=s+364|0,d=s+368|0,m|y(h[f>>2])==l&&(n[d>>2]|0)==(c|0)||(h[f>>2]=l,n[d>>2]=c,Le(s))}function Ct(s,l){s=s|0,l=l|0;var c=0,f=0;f=l+364|0,c=n[f+4>>2]|0,l=s,n[l>>2]=n[f>>2],n[l+4>>2]=c}function bm(s,l){s=s|0,l=y(l);var c=0,f=0,d=0,m=0;m=_t(l)|0,c=(m^1)&1,f=s+372|0,d=s+376|0,m|y(h[f>>2])==l&&(n[d>>2]|0)==(c|0)||(h[f>>2]=l,n[d>>2]=c,Le(s))}function pg(s,l){s=s|0,l=y(l);var c=0,f=0,d=0,m=0;m=_t(l)|0,c=m?0:2,f=s+372|0,d=s+376|0,m|y(h[f>>2])==l&&(n[d>>2]|0)==(c|0)||(h[f>>2]=l,n[d>>2]=c,Le(s))}function hg(s,l){s=s|0,l=l|0;var c=0,f=0;f=l+372|0,c=n[f+4>>2]|0,l=s,n[l>>2]=n[f>>2],n[l+4>>2]=c}function Cu(s,l){s=s|0,l=y(l);var c=0,f=0,d=0,m=0;m=_t(l)|0,c=(m^1)&1,f=s+380|0,d=s+384|0,m|y(h[f>>2])==l&&(n[d>>2]|0)==(c|0)||(h[f>>2]=l,n[d>>2]=c,Le(s))}function xm(s,l){s=s|0,l=y(l);var c=0,f=0,d=0,m=0;m=_t(l)|0,c=m?0:2,f=s+380|0,d=s+384|0,m|y(h[f>>2])==l&&(n[d>>2]|0)==(c|0)||(h[f>>2]=l,n[d>>2]=c,Le(s))}function gg(s,l){s=s|0,l=l|0;var c=0,f=0;f=l+380|0,c=n[f+4>>2]|0,l=s,n[l>>2]=n[f>>2],n[l+4>>2]=c}function wu(s,l){s=s|0,l=y(l);var c=0,f=0,d=0,m=0;m=_t(l)|0,c=(m^1)&1,f=s+388|0,d=s+392|0,m|y(h[f>>2])==l&&(n[d>>2]|0)==(c|0)||(h[f>>2]=l,n[d>>2]=c,Le(s))}function Ew(s,l){s=s|0,l=y(l);var c=0,f=0,d=0,m=0;m=_t(l)|0,c=m?0:2,f=s+388|0,d=s+392|0,m|y(h[f>>2])==l&&(n[d>>2]|0)==(c|0)||(h[f>>2]=l,n[d>>2]=c,Le(s))}function km(s,l){s=s|0,l=l|0;var c=0,f=0;f=l+388|0,c=n[f+4>>2]|0,l=s,n[l>>2]=n[f>>2],n[l+4>>2]=c}function Aa(s,l){s=s|0,l=y(l);var c=0;c=s+396|0,y(h[c>>2])!=l&&(h[c>>2]=l,Le(s))}function Bc(s){return s=s|0,y(h[s+396>>2])}function Il(s){return s=s|0,y(h[s+400>>2])}function Iu(s){return s=s|0,y(h[s+404>>2])}function dg(s){return s=s|0,y(h[s+408>>2])}function NA(s){return s=s|0,y(h[s+412>>2])}function gp(s){return s=s|0,y(h[s+416>>2])}function ja(s){return s=s|0,y(h[s+420>>2])}function mg(s,l){switch(s=s|0,l=l|0,Un(s,(l|0)<6,2918),l|0){case 0:{l=(n[s+496>>2]|0)==2?5:4;break}case 2:{l=(n[s+496>>2]|0)==2?4:5;break}default:}return y(h[s+424+(l<<2)>>2])}function dp(s,l){switch(s=s|0,l=l|0,Un(s,(l|0)<6,2918),l|0){case 0:{l=(n[s+496>>2]|0)==2?5:4;break}case 2:{l=(n[s+496>>2]|0)==2?4:5;break}default:}return y(h[s+448+(l<<2)>>2])}function Go(s,l){switch(s=s|0,l=l|0,Un(s,(l|0)<6,2918),l|0){case 0:{l=(n[s+496>>2]|0)==2?5:4;break}case 2:{l=(n[s+496>>2]|0)==2?4:5;break}default:}return y(h[s+472+(l<<2)>>2])}function ws(s,l){s=s|0,l=l|0;var c=0,f=Ze;return c=n[s+4>>2]|0,(c|0)==(n[l+4>>2]|0)?c?(f=y(h[s>>2]),s=y(ne(y(f-y(h[l>>2]))))<y(999999974e-13)):s=1:s=0,s|0}function Ii(s,l){s=y(s),l=y(l);var c=0;return _t(s)|0?c=_t(l)|0:c=y(ne(y(s-l)))<y(999999974e-13),c|0}function Qm(s,l){s=s|0,l=l|0,Fm(s,l)}function Fm(s,l){s=s|0,l=l|0;var c=0,f=0;c=C,C=C+16|0,f=c+4|0,n[f>>2]=0,n[f+4>>2]=0,n[f+8>>2]=0,Ma(f|0,s|0,l|0,0),Ao(s,3,(o[f+11>>0]|0)<0?n[f>>2]|0:f,c),e3e(f),C=c}function qo(s,l,c,f){s=y(s),l=y(l),c=c|0,f=f|0;var d=Ze;s=y(s*l),d=y(bR(s,y(1)));do if(Ii(d,y(0))|0)s=y(s-d);else{if(s=y(s-d),Ii(d,y(1))|0){s=y(s+y(1));break}if(c){s=y(s+y(1));break}f||(d>y(.5)?d=y(1):(f=Ii(d,y(.5))|0,d=y(f?1:0)),s=y(s+d))}while(0);return y(s/l)}function LA(s,l,c,f,d,m,B,k,Q,M,O,G,se){s=s|0,l=y(l),c=c|0,f=y(f),d=d|0,m=y(m),B=B|0,k=y(k),Q=y(Q),M=y(M),O=y(O),G=y(G),se=se|0;var qe=0,Me=Ze,Qe=Ze,et=Ze,Xe=Ze,lt=Ze,Ue=Ze;return Q<y(0)|M<y(0)?se=0:((se|0)!=0&&(Me=y(h[se+4>>2]),Me!=y(0))?(et=y(qo(l,Me,0,0)),Xe=y(qo(f,Me,0,0)),Qe=y(qo(m,Me,0,0)),Me=y(qo(k,Me,0,0))):(Qe=m,et=l,Me=k,Xe=f),(d|0)==(s|0)?qe=Ii(Qe,et)|0:qe=0,(B|0)==(c|0)?se=Ii(Me,Xe)|0:se=0,!qe&&(lt=y(l-O),!(mp(s,lt,Q)|0))&&!(yp(s,lt,d,Q)|0)?qe=yg(s,lt,d,m,Q)|0:qe=1,!se&&(Ue=y(f-G),!(mp(c,Ue,M)|0))&&!(yp(c,Ue,B,M)|0)?se=yg(c,Ue,B,k,M)|0:se=1,se=qe&se),se|0}function mp(s,l,c){return s=s|0,l=y(l),c=y(c),(s|0)==1?s=Ii(l,c)|0:s=0,s|0}function yp(s,l,c,f){return s=s|0,l=y(l),c=c|0,f=y(f),(s|0)==2&(c|0)==0?l>=f?s=1:s=Ii(l,f)|0:s=0,s|0}function yg(s,l,c,f,d){return s=s|0,l=y(l),c=c|0,f=y(f),d=y(d),(s|0)==2&(c|0)==2&f>l?d<=l?s=1:s=Ii(l,d)|0:s=0,s|0}function fa(s,l,c,f,d,m,B,k,Q,M,O){s=s|0,l=y(l),c=y(c),f=f|0,d=d|0,m=m|0,B=y(B),k=y(k),Q=Q|0,M=M|0,O=O|0;var G=0,se=0,qe=0,Me=0,Qe=Ze,et=Ze,Xe=0,lt=0,Ue=0,Ge=0,Lt=0,Mr=0,or=0,Xt=0,Sr=0,Nr=0,ir=0,xn=Ze,go=Ze,mo=Ze,yo=0,ya=0;ir=C,C=C+160|0,Xt=ir+152|0,or=ir+120|0,Mr=ir+104|0,Ue=ir+72|0,Me=ir+56|0,Lt=ir+8|0,lt=ir,Ge=(n[2279]|0)+1|0,n[2279]=Ge,Sr=s+984|0,(o[Sr>>0]|0)!=0&&(n[s+512>>2]|0)!=(n[2278]|0)?Xe=4:(n[s+516>>2]|0)==(f|0)?Nr=0:Xe=4,(Xe|0)==4&&(n[s+520>>2]=0,n[s+924>>2]=-1,n[s+928>>2]=-1,h[s+932>>2]=y(-1),h[s+936>>2]=y(-1),Nr=1);e:do if(n[s+964>>2]|0)if(Qe=y(ln(s,2,B)),et=y(ln(s,0,B)),G=s+916|0,mo=y(h[G>>2]),go=y(h[s+920>>2]),xn=y(h[s+932>>2]),LA(d,l,m,c,n[s+924>>2]|0,mo,n[s+928>>2]|0,go,xn,y(h[s+936>>2]),Qe,et,O)|0)Xe=22;else if(qe=n[s+520>>2]|0,!qe)Xe=21;else for(se=0;;){if(G=s+524+(se*24|0)|0,xn=y(h[G>>2]),go=y(h[s+524+(se*24|0)+4>>2]),mo=y(h[s+524+(se*24|0)+16>>2]),LA(d,l,m,c,n[s+524+(se*24|0)+8>>2]|0,xn,n[s+524+(se*24|0)+12>>2]|0,go,mo,y(h[s+524+(se*24|0)+20>>2]),Qe,et,O)|0){Xe=22;break e}if(se=se+1|0,se>>>0>=qe>>>0){Xe=21;break}}else{if(Q){if(G=s+916|0,!(Ii(y(h[G>>2]),l)|0)){Xe=21;break}if(!(Ii(y(h[s+920>>2]),c)|0)){Xe=21;break}if((n[s+924>>2]|0)!=(d|0)){Xe=21;break}G=(n[s+928>>2]|0)==(m|0)?G:0,Xe=22;break}if(qe=n[s+520>>2]|0,!qe)Xe=21;else for(se=0;;){if(G=s+524+(se*24|0)|0,Ii(y(h[G>>2]),l)|0&&Ii(y(h[s+524+(se*24|0)+4>>2]),c)|0&&(n[s+524+(se*24|0)+8>>2]|0)==(d|0)&&(n[s+524+(se*24|0)+12>>2]|0)==(m|0)){Xe=22;break e}if(se=se+1|0,se>>>0>=qe>>>0){Xe=21;break}}}while(0);do if((Xe|0)==21)o[11697]|0?(G=0,Xe=28):(G=0,Xe=31);else if((Xe|0)==22){if(se=(o[11697]|0)!=0,!((G|0)!=0&(Nr^1)))if(se){Xe=28;break}else{Xe=31;break}Me=G+16|0,n[s+908>>2]=n[Me>>2],qe=G+20|0,n[s+912>>2]=n[qe>>2],(o[11698]|0)==0|se^1||(n[lt>>2]=OA(Ge)|0,n[lt+4>>2]=Ge,Ao(s,4,2972,lt),se=n[s+972>>2]|0,se|0&&tf[se&127](s),d=Ga(d,Q)|0,m=Ga(m,Q)|0,ya=+y(h[Me>>2]),yo=+y(h[qe>>2]),n[Lt>>2]=d,n[Lt+4>>2]=m,E[Lt+8>>3]=+l,E[Lt+16>>3]=+c,E[Lt+24>>3]=ya,E[Lt+32>>3]=yo,n[Lt+40>>2]=M,Ao(s,4,2989,Lt))}while(0);return(Xe|0)==28&&(se=OA(Ge)|0,n[Me>>2]=se,n[Me+4>>2]=Ge,n[Me+8>>2]=Nr?3047:11699,Ao(s,4,3038,Me),se=n[s+972>>2]|0,se|0&&tf[se&127](s),Lt=Ga(d,Q)|0,Xe=Ga(m,Q)|0,n[Ue>>2]=Lt,n[Ue+4>>2]=Xe,E[Ue+8>>3]=+l,E[Ue+16>>3]=+c,n[Ue+24>>2]=M,Ao(s,4,3049,Ue),Xe=31),(Xe|0)==31&&(si(s,l,c,f,d,m,B,k,Q,O),o[11697]|0&&(se=n[2279]|0,Lt=OA(se)|0,n[Mr>>2]=Lt,n[Mr+4>>2]=se,n[Mr+8>>2]=Nr?3047:11699,Ao(s,4,3083,Mr),se=n[s+972>>2]|0,se|0&&tf[se&127](s),Lt=Ga(d,Q)|0,Mr=Ga(m,Q)|0,yo=+y(h[s+908>>2]),ya=+y(h[s+912>>2]),n[or>>2]=Lt,n[or+4>>2]=Mr,E[or+8>>3]=yo,E[or+16>>3]=ya,n[or+24>>2]=M,Ao(s,4,3092,or)),n[s+516>>2]=f,G||(se=s+520|0,G=n[se>>2]|0,(G|0)==16&&(o[11697]|0&&Ao(s,4,3124,Xt),n[se>>2]=0,G=0),Q?G=s+916|0:(n[se>>2]=G+1,G=s+524+(G*24|0)|0),h[G>>2]=l,h[G+4>>2]=c,n[G+8>>2]=d,n[G+12>>2]=m,n[G+16>>2]=n[s+908>>2],n[G+20>>2]=n[s+912>>2],G=0)),Q&&(n[s+416>>2]=n[s+908>>2],n[s+420>>2]=n[s+912>>2],o[s+985>>0]=1,o[Sr>>0]=0),n[2279]=(n[2279]|0)+-1,n[s+512>>2]=n[2278],C=ir,Nr|(G|0)==0|0}function ln(s,l,c){s=s|0,l=l|0,c=y(c);var f=Ze;return f=y(K(s,l,c)),y(f+y(re(s,l,c)))}function Ao(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0;m=C,C=C+16|0,d=m,n[d>>2]=f,s?f=n[s+976>>2]|0:f=0,Cg(f,s,l,c,d),C=m}function OA(s){return s=s|0,(s>>>0>60?3201:3201+(60-s)|0)|0}function Ga(s,l){s=s|0,l=l|0;var c=0,f=0,d=0;return d=C,C=C+32|0,c=d+12|0,f=d,n[c>>2]=n[254],n[c+4>>2]=n[255],n[c+8>>2]=n[256],n[f>>2]=n[257],n[f+4>>2]=n[258],n[f+8>>2]=n[259],(s|0)>2?s=11699:s=n[(l?f:c)+(s<<2)>>2]|0,C=d,s|0}function si(s,l,c,f,d,m,B,k,Q,M){s=s|0,l=y(l),c=y(c),f=f|0,d=d|0,m=m|0,B=y(B),k=y(k),Q=Q|0,M=M|0;var O=0,G=0,se=0,qe=0,Me=Ze,Qe=Ze,et=Ze,Xe=Ze,lt=Ze,Ue=Ze,Ge=Ze,Lt=0,Mr=0,or=0,Xt=Ze,Sr=Ze,Nr=0,ir=Ze,xn=0,go=0,mo=0,yo=0,ya=0,Fp=0,Rp=0,bl=0,Tp=0,Fu=0,Ru=0,Np=0,Lp=0,Op=0,Xr=0,xl=0,Mp=0,xc=0,Up=Ze,_p=Ze,Tu=Ze,Nu=Ze,kc=Ze,Gs=0,za=0,Wo=0,kl=0,nf=0,sf=Ze,Lu=Ze,of=Ze,af=Ze,qs=Ze,vs=Ze,Ql=0,Rn=Ze,lf=Ze,Eo=Ze,Qc=Ze,Co=Ze,Fc=Ze,cf=0,uf=0,Rc=Ze,Ys=Ze,Fl=0,Af=0,ff=0,pf=0,xr=Ze,Jn=0,Ds=0,wo=0,Ws=0,Rr=0,ur=0,Rl=0,Jt=Ze,hf=0,li=0;Rl=C,C=C+16|0,Gs=Rl+12|0,za=Rl+8|0,Wo=Rl+4|0,kl=Rl,Un(s,(d|0)==0|(_t(l)|0)^1,3326),Un(s,(m|0)==0|(_t(c)|0)^1,3406),Ds=mt(s,f)|0,n[s+496>>2]=Ds,Rr=fr(2,Ds)|0,ur=fr(0,Ds)|0,h[s+440>>2]=y(K(s,Rr,B)),h[s+444>>2]=y(re(s,Rr,B)),h[s+428>>2]=y(K(s,ur,B)),h[s+436>>2]=y(re(s,ur,B)),h[s+464>>2]=y(Cr(s,Rr)),h[s+468>>2]=y(yn(s,Rr)),h[s+452>>2]=y(Cr(s,ur)),h[s+460>>2]=y(yn(s,ur)),h[s+488>>2]=y(oi(s,Rr,B)),h[s+492>>2]=y(Oi(s,Rr,B)),h[s+476>>2]=y(oi(s,ur,B)),h[s+484>>2]=y(Oi(s,ur,B));do if(n[s+964>>2]|0)Ig(s,l,c,d,m,B,k);else{if(wo=s+948|0,Ws=(n[s+952>>2]|0)-(n[wo>>2]|0)>>2,!Ws){qv(s,l,c,d,m,B,k);break}if(!Q&&Yv(s,l,c,d,m,B,k)|0)break;$(s),xl=s+508|0,o[xl>>0]=0,Rr=fr(n[s+4>>2]|0,Ds)|0,ur=ww(Rr,Ds)|0,Jn=pe(Rr)|0,Mp=n[s+8>>2]|0,Af=s+28|0,xc=(n[Af>>2]|0)!=0,Co=Jn?B:k,Rc=Jn?k:B,Up=y(Cp(s,Rr,B)),_p=y(Iw(s,Rr,B)),Me=y(Cp(s,ur,B)),Fc=y(En(s,Rr,B)),Ys=y(En(s,ur,B)),or=Jn?d:m,Fl=Jn?m:d,xr=Jn?Fc:Ys,lt=Jn?Ys:Fc,Qc=y(ln(s,2,B)),Xe=y(ln(s,0,B)),Qe=y(y(qr(s+364|0,B))-xr),et=y(y(qr(s+380|0,B))-xr),Ue=y(y(qr(s+372|0,k))-lt),Ge=y(y(qr(s+388|0,k))-lt),Tu=Jn?Qe:Ue,Nu=Jn?et:Ge,Qc=y(l-Qc),l=y(Qc-xr),_t(l)|0?xr=l:xr=y(_n(y(Tg(l,et)),Qe)),lf=y(c-Xe),l=y(lf-lt),_t(l)|0?Eo=l:Eo=y(_n(y(Tg(l,Ge)),Ue)),Qe=Jn?xr:Eo,Rn=Jn?Eo:xr;e:do if((or|0)==1)for(f=0,G=0;;){if(O=gs(s,G)|0,!f)y(rs(O))>y(0)&&y(js(O))>y(0)?f=O:f=0;else if(Tm(O)|0){qe=0;break e}if(G=G+1|0,G>>>0>=Ws>>>0){qe=f;break}}else qe=0;while(0);Lt=qe+500|0,Mr=qe+504|0,f=0,O=0,l=y(0),se=0;do{if(G=n[(n[wo>>2]|0)+(se<<2)>>2]|0,(n[G+36>>2]|0)==1)Bu(G),o[G+985>>0]=1,o[G+984>>0]=0;else{Bl(G),Q&&Ep(G,mt(G,Ds)|0,Qe,Rn,xr);do if((n[G+24>>2]|0)!=1)if((G|0)==(qe|0)){n[Lt>>2]=n[2278],h[Mr>>2]=y(0);break}else{Nm(s,G,xr,d,Eo,xr,Eo,m,Ds,M);break}else O|0&&(n[O+960>>2]=G),n[G+960>>2]=0,O=G,f=(f|0)==0?G:f;while(0);vs=y(h[G+504>>2]),l=y(l+y(vs+y(ln(G,Rr,xr))))}se=se+1|0}while((se|0)!=(Ws|0));for(mo=l>Qe,Ql=xc&((or|0)==2&mo)?1:or,xn=(Fl|0)==1,ya=xn&(Q^1),Fp=(Ql|0)==1,Rp=(Ql|0)==2,bl=976+(Rr<<2)|0,Tp=(Fl|2|0)==2,Op=xn&(xc^1),Fu=1040+(ur<<2)|0,Ru=1040+(Rr<<2)|0,Np=976+(ur<<2)|0,Lp=(Fl|0)!=1,mo=xc&((or|0)!=0&mo),go=s+976|0,xn=xn^1,l=Qe,Nr=0,yo=0,vs=y(0),kc=y(0);;){e:do if(Nr>>>0<Ws>>>0)for(Mr=n[wo>>2]|0,se=0,Ge=y(0),Ue=y(0),et=y(0),Qe=y(0),G=0,O=0,qe=Nr;;){if(Lt=n[Mr+(qe<<2)>>2]|0,(n[Lt+36>>2]|0)!=1&&(n[Lt+940>>2]=yo,(n[Lt+24>>2]|0)!=1)){if(Xe=y(ln(Lt,Rr,xr)),Xr=n[bl>>2]|0,c=y(qr(Lt+380+(Xr<<3)|0,Co)),lt=y(h[Lt+504>>2]),c=y(Tg(c,lt)),c=y(_n(y(qr(Lt+364+(Xr<<3)|0,Co)),c)),xc&(se|0)!=0&y(Xe+y(Ue+c))>l){m=se,Xe=Ge,or=qe;break e}Xe=y(Xe+c),c=y(Ue+Xe),Xe=y(Ge+Xe),Tm(Lt)|0&&(et=y(et+y(rs(Lt))),Qe=y(Qe-y(lt*y(js(Lt))))),O|0&&(n[O+960>>2]=Lt),n[Lt+960>>2]=0,se=se+1|0,O=Lt,G=(G|0)==0?Lt:G}else Xe=Ge,c=Ue;if(qe=qe+1|0,qe>>>0<Ws>>>0)Ge=Xe,Ue=c;else{m=se,or=qe;break}}else m=0,Xe=y(0),et=y(0),Qe=y(0),G=0,or=Nr;while(0);Xr=et>y(0)&et<y(1),Xt=Xr?y(1):et,Xr=Qe>y(0)&Qe<y(1),Ge=Xr?y(1):Qe;do if(Fp)Xr=51;else if(Xe<Tu&((_t(Tu)|0)^1))l=Tu,Xr=51;else if(Xe>Nu&((_t(Nu)|0)^1))l=Nu,Xr=51;else if(o[(n[go>>2]|0)+3>>0]|0)Xr=51;else{if(Xt!=y(0)&&y(rs(s))!=y(0)){Xr=53;break}l=Xe,Xr=53}while(0);if((Xr|0)==51&&(Xr=0,_t(l)|0?Xr=53:(Sr=y(l-Xe),ir=l)),(Xr|0)==53&&(Xr=0,Xe<y(0)?(Sr=y(-Xe),ir=l):(Sr=y(0),ir=l)),!ya&&(nf=(G|0)==0,!nf)){se=n[bl>>2]|0,qe=Sr<y(0),lt=y(Sr/Ge),Lt=Sr>y(0),Ue=y(Sr/Xt),et=y(0),Xe=y(0),l=y(0),O=G;do c=y(qr(O+380+(se<<3)|0,Co)),Qe=y(qr(O+364+(se<<3)|0,Co)),Qe=y(Tg(c,y(_n(Qe,y(h[O+504>>2]))))),qe?(c=y(Qe*y(js(O))),c!=y(-0)&&(Jt=y(Qe-y(lt*c)),sf=y(Bi(O,Rr,Jt,ir,xr)),Jt!=sf)&&(et=y(et-y(sf-Qe)),l=y(l+c))):Lt&&(Lu=y(rs(O)),Lu!=y(0))&&(Jt=y(Qe+y(Ue*Lu)),of=y(Bi(O,Rr,Jt,ir,xr)),Jt!=of)&&(et=y(et-y(of-Qe)),Xe=y(Xe-Lu)),O=n[O+960>>2]|0;while((O|0)!=0);if(l=y(Ge+l),Qe=y(Sr+et),nf)l=y(0);else{lt=y(Xt+Xe),qe=n[bl>>2]|0,Lt=Qe<y(0),Mr=l==y(0),Ue=y(Qe/l),se=Qe>y(0),lt=y(Qe/lt),l=y(0);do{Jt=y(qr(G+380+(qe<<3)|0,Co)),et=y(qr(G+364+(qe<<3)|0,Co)),et=y(Tg(Jt,y(_n(et,y(h[G+504>>2]))))),Lt?(Jt=y(et*y(js(G))),Qe=y(-Jt),Jt!=y(-0)?(Jt=y(Ue*Qe),Qe=y(Bi(G,Rr,y(et+(Mr?Qe:Jt)),ir,xr))):Qe=et):se&&(af=y(rs(G)),af!=y(0))?Qe=y(Bi(G,Rr,y(et+y(lt*af)),ir,xr)):Qe=et,l=y(l-y(Qe-et)),Xe=y(ln(G,Rr,xr)),c=y(ln(G,ur,xr)),Qe=y(Qe+Xe),h[za>>2]=Qe,n[kl>>2]=1,et=y(h[G+396>>2]);e:do if(_t(et)|0){O=_t(Rn)|0;do if(!O){if(mo|(ts(G,ur,Rn)|0|xn)||(ha(s,G)|0)!=4||(n[(vl(G,ur)|0)+4>>2]|0)==3||(n[(Sc(G,ur)|0)+4>>2]|0)==3)break;h[Gs>>2]=Rn,n[Wo>>2]=1;break e}while(0);if(ts(G,ur,Rn)|0){O=n[G+992+(n[Np>>2]<<2)>>2]|0,Jt=y(c+y(qr(O,Rn))),h[Gs>>2]=Jt,O=Lp&(n[O+4>>2]|0)==2,n[Wo>>2]=((_t(Jt)|0|O)^1)&1;break}else{h[Gs>>2]=Rn,n[Wo>>2]=O?0:2;break}}else Jt=y(Qe-Xe),Xt=y(Jt/et),Jt=y(et*Jt),n[Wo>>2]=1,h[Gs>>2]=y(c+(Jn?Xt:Jt));while(0);yr(G,Rr,ir,xr,kl,za),yr(G,ur,Rn,xr,Wo,Gs);do if(!(ts(G,ur,Rn)|0)&&(ha(s,G)|0)==4){if((n[(vl(G,ur)|0)+4>>2]|0)==3){O=0;break}O=(n[(Sc(G,ur)|0)+4>>2]|0)!=3}else O=0;while(0);Jt=y(h[za>>2]),Xt=y(h[Gs>>2]),hf=n[kl>>2]|0,li=n[Wo>>2]|0,fa(G,Jn?Jt:Xt,Jn?Xt:Jt,Ds,Jn?hf:li,Jn?li:hf,xr,Eo,Q&(O^1),3488,M)|0,o[xl>>0]=o[xl>>0]|o[G+508>>0],G=n[G+960>>2]|0}while((G|0)!=0)}}else l=y(0);if(l=y(Sr+l),li=l<y(0)&1,o[xl>>0]=li|u[xl>>0],Rp&l>y(0)?(O=n[bl>>2]|0,(n[s+364+(O<<3)+4>>2]|0)!=0&&(qs=y(qr(s+364+(O<<3)|0,Co)),qs>=y(0))?Qe=y(_n(y(0),y(qs-y(ir-l)))):Qe=y(0)):Qe=l,Lt=Nr>>>0<or>>>0,Lt){qe=n[wo>>2]|0,se=Nr,O=0;do G=n[qe+(se<<2)>>2]|0,n[G+24>>2]|0||(O=((n[(vl(G,Rr)|0)+4>>2]|0)==3&1)+O|0,O=O+((n[(Sc(G,Rr)|0)+4>>2]|0)==3&1)|0),se=se+1|0;while((se|0)!=(or|0));O?(Xe=y(0),c=y(0)):Xr=101}else Xr=101;e:do if((Xr|0)==101)switch(Xr=0,Mp|0){case 1:{O=0,Xe=y(Qe*y(.5)),c=y(0);break e}case 2:{O=0,Xe=Qe,c=y(0);break e}case 3:{if(m>>>0<=1){O=0,Xe=y(0),c=y(0);break e}c=y((m+-1|0)>>>0),O=0,Xe=y(0),c=y(y(_n(Qe,y(0)))/c);break e}case 5:{c=y(Qe/y((m+1|0)>>>0)),O=0,Xe=c;break e}case 4:{c=y(Qe/y(m>>>0)),O=0,Xe=y(c*y(.5));break e}default:{O=0,Xe=y(0),c=y(0);break e}}while(0);if(l=y(Up+Xe),Lt){et=y(Qe/y(O|0)),se=n[wo>>2]|0,G=Nr,Qe=y(0);do{O=n[se+(G<<2)>>2]|0;e:do if((n[O+36>>2]|0)!=1){switch(n[O+24>>2]|0){case 1:{if(gi(O,Rr)|0){if(!Q)break e;Jt=y(Or(O,Rr,ir)),Jt=y(Jt+y(Cr(s,Rr))),Jt=y(Jt+y(K(O,Rr,xr))),h[O+400+(n[Ru>>2]<<2)>>2]=Jt;break e}break}case 0:if(li=(n[(vl(O,Rr)|0)+4>>2]|0)==3,Jt=y(et+l),l=li?Jt:l,Q&&(li=O+400+(n[Ru>>2]<<2)|0,h[li>>2]=y(l+y(h[li>>2]))),li=(n[(Sc(O,Rr)|0)+4>>2]|0)==3,Jt=y(et+l),l=li?Jt:l,ya){Jt=y(c+y(ln(O,Rr,xr))),Qe=Rn,l=y(l+y(Jt+y(h[O+504>>2])));break e}else{l=y(l+y(c+y(ns(O,Rr,xr)))),Qe=y(_n(Qe,y(ns(O,ur,xr))));break e}default:}Q&&(Jt=y(Xe+y(Cr(s,Rr))),li=O+400+(n[Ru>>2]<<2)|0,h[li>>2]=y(Jt+y(h[li>>2])))}while(0);G=G+1|0}while((G|0)!=(or|0))}else Qe=y(0);if(c=y(_p+l),Tp?Xe=y(y(Bi(s,ur,y(Ys+Qe),Rc,B))-Ys):Xe=Rn,et=y(y(Bi(s,ur,y(Ys+(Op?Rn:Qe)),Rc,B))-Ys),Lt&Q){G=Nr;do{se=n[(n[wo>>2]|0)+(G<<2)>>2]|0;do if((n[se+36>>2]|0)!=1){if((n[se+24>>2]|0)==1){if(gi(se,ur)|0){if(Jt=y(Or(se,ur,Rn)),Jt=y(Jt+y(Cr(s,ur))),Jt=y(Jt+y(K(se,ur,xr))),O=n[Fu>>2]|0,h[se+400+(O<<2)>>2]=Jt,!(_t(Jt)|0))break}else O=n[Fu>>2]|0;Jt=y(Cr(s,ur)),h[se+400+(O<<2)>>2]=y(Jt+y(K(se,ur,xr)));break}O=ha(s,se)|0;do if((O|0)==4){if((n[(vl(se,ur)|0)+4>>2]|0)==3){Xr=139;break}if((n[(Sc(se,ur)|0)+4>>2]|0)==3){Xr=139;break}if(ts(se,ur,Rn)|0){l=Me;break}hf=n[se+908+(n[bl>>2]<<2)>>2]|0,n[Gs>>2]=hf,l=y(h[se+396>>2]),li=_t(l)|0,Qe=(n[v>>2]=hf,y(h[v>>2])),li?l=et:(Sr=y(ln(se,ur,xr)),Jt=y(Qe/l),l=y(l*Qe),l=y(Sr+(Jn?Jt:l))),h[za>>2]=l,h[Gs>>2]=y(y(ln(se,Rr,xr))+Qe),n[Wo>>2]=1,n[kl>>2]=1,yr(se,Rr,ir,xr,Wo,Gs),yr(se,ur,Rn,xr,kl,za),l=y(h[Gs>>2]),Sr=y(h[za>>2]),Jt=Jn?l:Sr,l=Jn?Sr:l,li=((_t(Jt)|0)^1)&1,fa(se,Jt,l,Ds,li,((_t(l)|0)^1)&1,xr,Eo,1,3493,M)|0,l=Me}else Xr=139;while(0);e:do if((Xr|0)==139){Xr=0,l=y(Xe-y(ns(se,ur,xr)));do if((n[(vl(se,ur)|0)+4>>2]|0)==3){if((n[(Sc(se,ur)|0)+4>>2]|0)!=3)break;l=y(Me+y(_n(y(0),y(l*y(.5)))));break e}while(0);if((n[(Sc(se,ur)|0)+4>>2]|0)==3){l=Me;break}if((n[(vl(se,ur)|0)+4>>2]|0)==3){l=y(Me+y(_n(y(0),l)));break}switch(O|0){case 1:{l=Me;break e}case 2:{l=y(Me+y(l*y(.5)));break e}default:{l=y(Me+l);break e}}}while(0);Jt=y(vs+l),li=se+400+(n[Fu>>2]<<2)|0,h[li>>2]=y(Jt+y(h[li>>2]))}while(0);G=G+1|0}while((G|0)!=(or|0))}if(vs=y(vs+et),kc=y(_n(kc,c)),m=yo+1|0,or>>>0>=Ws>>>0)break;l=ir,Nr=or,yo=m}do if(Q){if(O=m>>>0>1,!O&&!(Yi(s)|0))break;if(!(_t(Rn)|0)){l=y(Rn-vs);e:do switch(n[s+12>>2]|0){case 3:{Me=y(Me+l),Ue=y(0);break}case 2:{Me=y(Me+y(l*y(.5))),Ue=y(0);break}case 4:{Rn>vs?Ue=y(l/y(m>>>0)):Ue=y(0);break}case 7:if(Rn>vs){Me=y(Me+y(l/y(m<<1>>>0))),Ue=y(l/y(m>>>0)),Ue=O?Ue:y(0);break e}else{Me=y(Me+y(l*y(.5))),Ue=y(0);break e}case 6:{Ue=y(l/y(yo>>>0)),Ue=Rn>vs&O?Ue:y(0);break}default:Ue=y(0)}while(0);if(m|0)for(Lt=1040+(ur<<2)|0,Mr=976+(ur<<2)|0,qe=0,G=0;;){e:do if(G>>>0<Ws>>>0)for(Qe=y(0),et=y(0),l=y(0),se=G;;){O=n[(n[wo>>2]|0)+(se<<2)>>2]|0;do if((n[O+36>>2]|0)!=1&&(n[O+24>>2]|0)==0){if((n[O+940>>2]|0)!=(qe|0))break e;if(Lm(O,ur)|0&&(Jt=y(h[O+908+(n[Mr>>2]<<2)>>2]),l=y(_n(l,y(Jt+y(ln(O,ur,xr)))))),(ha(s,O)|0)!=5)break;qs=y(Ya(O)),qs=y(qs+y(K(O,0,xr))),Jt=y(h[O+912>>2]),Jt=y(y(Jt+y(ln(O,0,xr)))-qs),qs=y(_n(et,qs)),Jt=y(_n(Qe,Jt)),Qe=Jt,et=qs,l=y(_n(l,y(qs+Jt)))}while(0);if(O=se+1|0,O>>>0<Ws>>>0)se=O;else{se=O;break}}else et=y(0),l=y(0),se=G;while(0);if(lt=y(Ue+l),c=Me,Me=y(Me+lt),G>>>0<se>>>0){Xe=y(c+et),O=G;do{G=n[(n[wo>>2]|0)+(O<<2)>>2]|0;e:do if((n[G+36>>2]|0)!=1&&(n[G+24>>2]|0)==0)switch(ha(s,G)|0){case 1:{Jt=y(c+y(K(G,ur,xr))),h[G+400+(n[Lt>>2]<<2)>>2]=Jt;break e}case 3:{Jt=y(y(Me-y(re(G,ur,xr)))-y(h[G+908+(n[Mr>>2]<<2)>>2])),h[G+400+(n[Lt>>2]<<2)>>2]=Jt;break e}case 2:{Jt=y(c+y(y(lt-y(h[G+908+(n[Mr>>2]<<2)>>2]))*y(.5))),h[G+400+(n[Lt>>2]<<2)>>2]=Jt;break e}case 4:{if(Jt=y(c+y(K(G,ur,xr))),h[G+400+(n[Lt>>2]<<2)>>2]=Jt,ts(G,ur,Rn)|0||(Jn?(Qe=y(h[G+908>>2]),l=y(Qe+y(ln(G,Rr,xr))),et=lt):(et=y(h[G+912>>2]),et=y(et+y(ln(G,ur,xr))),l=lt,Qe=y(h[G+908>>2])),Ii(l,Qe)|0&&Ii(et,y(h[G+912>>2]))|0))break e;fa(G,l,et,Ds,1,1,xr,Eo,1,3501,M)|0;break e}case 5:{h[G+404>>2]=y(y(Xe-y(Ya(G)))+y(Or(G,0,Rn)));break e}default:break e}while(0);O=O+1|0}while((O|0)!=(se|0))}if(qe=qe+1|0,(qe|0)==(m|0))break;G=se}}}while(0);if(h[s+908>>2]=y(Bi(s,2,Qc,B,B)),h[s+912>>2]=y(Bi(s,0,lf,k,B)),(Ql|0)!=0&&(cf=n[s+32>>2]|0,uf=(Ql|0)==2,!(uf&(cf|0)!=2))?uf&(cf|0)==2&&(l=y(Fc+ir),l=y(_n(y(Tg(l,y(MA(s,Rr,kc,Co)))),Fc)),Xr=198):(l=y(Bi(s,Rr,kc,Co,B)),Xr=198),(Xr|0)==198&&(h[s+908+(n[976+(Rr<<2)>>2]<<2)>>2]=l),(Fl|0)!=0&&(ff=n[s+32>>2]|0,pf=(Fl|0)==2,!(pf&(ff|0)!=2))?pf&(ff|0)==2&&(l=y(Ys+Rn),l=y(_n(y(Tg(l,y(MA(s,ur,y(Ys+vs),Rc)))),Ys)),Xr=204):(l=y(Bi(s,ur,y(Ys+vs),Rc,B)),Xr=204),(Xr|0)==204&&(h[s+908+(n[976+(ur<<2)>>2]<<2)>>2]=l),Q){if((n[Af>>2]|0)==2){G=976+(ur<<2)|0,se=1040+(ur<<2)|0,O=0;do qe=gs(s,O)|0,n[qe+24>>2]|0||(hf=n[G>>2]|0,Jt=y(h[s+908+(hf<<2)>>2]),li=qe+400+(n[se>>2]<<2)|0,Jt=y(Jt-y(h[li>>2])),h[li>>2]=y(Jt-y(h[qe+908+(hf<<2)>>2]))),O=O+1|0;while((O|0)!=(Ws|0))}if(f|0){O=Jn?Ql:d;do Om(s,f,xr,O,Eo,Ds,M),f=n[f+960>>2]|0;while((f|0)!=0)}if(O=(Rr|2|0)==3,G=(ur|2|0)==3,O|G){f=0;do se=n[(n[wo>>2]|0)+(f<<2)>>2]|0,(n[se+36>>2]|0)!=1&&(O&&wp(s,se,Rr),G&&wp(s,se,ur)),f=f+1|0;while((f|0)!=(Ws|0))}}}while(0);C=Rl}function pa(s,l){s=s|0,l=y(l);var c=0;oa(s,l>=y(0),3147),c=l==y(0),h[s+4>>2]=c?y(0):l}function vc(s,l,c,f){s=s|0,l=y(l),c=y(c),f=f|0;var d=Ze,m=Ze,B=0,k=0,Q=0;n[2278]=(n[2278]|0)+1,Bl(s),ts(s,2,l)|0?(d=y(qr(n[s+992>>2]|0,l)),Q=1,d=y(d+y(ln(s,2,l)))):(d=y(qr(s+380|0,l)),d>=y(0)?Q=2:(Q=((_t(l)|0)^1)&1,d=l)),ts(s,0,c)|0?(m=y(qr(n[s+996>>2]|0,c)),k=1,m=y(m+y(ln(s,0,l)))):(m=y(qr(s+388|0,c)),m>=y(0)?k=2:(k=((_t(c)|0)^1)&1,m=c)),B=s+976|0,fa(s,d,m,f,Q,k,l,c,1,3189,n[B>>2]|0)|0&&(Ep(s,n[s+496>>2]|0,l,c,l),Dc(s,y(h[(n[B>>2]|0)+4>>2]),y(0),y(0)),o[11696]|0)&&Qm(s,7)}function Bl(s){s=s|0;var l=0,c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0;k=C,C=C+32|0,B=k+24|0,m=k+16|0,f=k+8|0,d=k,c=0;do l=s+380+(c<<3)|0,(n[s+380+(c<<3)+4>>2]|0)!=0&&(Q=l,M=n[Q+4>>2]|0,O=f,n[O>>2]=n[Q>>2],n[O+4>>2]=M,O=s+364+(c<<3)|0,M=n[O+4>>2]|0,Q=d,n[Q>>2]=n[O>>2],n[Q+4>>2]=M,n[m>>2]=n[f>>2],n[m+4>>2]=n[f+4>>2],n[B>>2]=n[d>>2],n[B+4>>2]=n[d+4>>2],ws(m,B)|0)||(l=s+348+(c<<3)|0),n[s+992+(c<<2)>>2]=l,c=c+1|0;while((c|0)!=2);C=k}function ts(s,l,c){s=s|0,l=l|0,c=y(c);var f=0;switch(s=n[s+992+(n[976+(l<<2)>>2]<<2)>>2]|0,n[s+4>>2]|0){case 0:case 3:{s=0;break}case 1:{y(h[s>>2])<y(0)?s=0:f=5;break}case 2:{y(h[s>>2])<y(0)?s=0:s=(_t(c)|0)^1;break}default:f=5}return(f|0)==5&&(s=1),s|0}function qr(s,l){switch(s=s|0,l=y(l),n[s+4>>2]|0){case 2:{l=y(y(y(h[s>>2])*l)/y(100));break}case 1:{l=y(h[s>>2]);break}default:l=y(ce)}return y(l)}function Ep(s,l,c,f,d){s=s|0,l=l|0,c=y(c),f=y(f),d=y(d);var m=0,B=Ze;l=n[s+944>>2]|0?l:1,m=fr(n[s+4>>2]|0,l)|0,l=ww(m,l)|0,c=y(Mm(s,m,c)),f=y(Mm(s,l,f)),B=y(c+y(K(s,m,d))),h[s+400+(n[1040+(m<<2)>>2]<<2)>>2]=B,c=y(c+y(re(s,m,d))),h[s+400+(n[1e3+(m<<2)>>2]<<2)>>2]=c,c=y(f+y(K(s,l,d))),h[s+400+(n[1040+(l<<2)>>2]<<2)>>2]=c,d=y(f+y(re(s,l,d))),h[s+400+(n[1e3+(l<<2)>>2]<<2)>>2]=d}function Dc(s,l,c,f){s=s|0,l=y(l),c=y(c),f=y(f);var d=0,m=0,B=Ze,k=Ze,Q=0,M=0,O=Ze,G=0,se=Ze,qe=Ze,Me=Ze,Qe=Ze;if(l!=y(0)&&(d=s+400|0,Qe=y(h[d>>2]),m=s+404|0,Me=y(h[m>>2]),G=s+416|0,qe=y(h[G>>2]),M=s+420|0,B=y(h[M>>2]),se=y(Qe+c),O=y(Me+f),f=y(se+qe),k=y(O+B),Q=(n[s+988>>2]|0)==1,h[d>>2]=y(qo(Qe,l,0,Q)),h[m>>2]=y(qo(Me,l,0,Q)),c=y(bR(y(qe*l),y(1))),Ii(c,y(0))|0?m=0:m=(Ii(c,y(1))|0)^1,c=y(bR(y(B*l),y(1))),Ii(c,y(0))|0?d=0:d=(Ii(c,y(1))|0)^1,Qe=y(qo(f,l,Q&m,Q&(m^1))),h[G>>2]=y(Qe-y(qo(se,l,0,Q))),Qe=y(qo(k,l,Q&d,Q&(d^1))),h[M>>2]=y(Qe-y(qo(O,l,0,Q))),m=(n[s+952>>2]|0)-(n[s+948>>2]|0)>>2,m|0)){d=0;do Dc(gs(s,d)|0,l,se,O),d=d+1|0;while((d|0)!=(m|0))}}function Cw(s,l,c,f,d){switch(s=s|0,l=l|0,c=c|0,f=f|0,d=d|0,c|0){case 5:case 0:{s=i7(n[489]|0,f,d)|0;break}default:s=zUe(f,d)|0}return s|0}function Eg(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0;d=C,C=C+16|0,m=d,n[m>>2]=f,Cg(s,0,l,c,m),C=d}function Cg(s,l,c,f,d){if(s=s|0,l=l|0,c=c|0,f=f|0,d=d|0,s=s|0?s:956,D7[n[s+8>>2]&1](s,l,c,f,d)|0,(c|0)==5)Rt();else return}function qa(s,l,c){s=s|0,l=l|0,c=c|0,o[s+l>>0]=c&1}function Rm(s,l){s=s|0,l=l|0;var c=0,f=0;n[s>>2]=0,n[s+4>>2]=0,n[s+8>>2]=0,c=l+4|0,f=(n[c>>2]|0)-(n[l>>2]|0)>>2,f|0&&(wg(s,f),Qt(s,n[l>>2]|0,n[c>>2]|0,f))}function wg(s,l){s=s|0,l=l|0;var c=0;if((N(s)|0)>>>0<l>>>0&&zr(s),l>>>0>1073741823)Rt();else{c=Kt(l<<2)|0,n[s+4>>2]=c,n[s>>2]=c,n[s+8>>2]=c+(l<<2);return}}function Qt(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0,f=s+4|0,s=c-l|0,(s|0)>0&&(Dr(n[f>>2]|0,l|0,s|0)|0,n[f>>2]=(n[f>>2]|0)+(s>>>2<<2))}function N(s){return s=s|0,1073741823}function K(s,l,c){return s=s|0,l=l|0,c=y(c),pe(l)|0&&(n[s+96>>2]|0)!=0?s=s+92|0:s=Fn(s+60|0,n[1040+(l<<2)>>2]|0,992)|0,y(ze(s,c))}function re(s,l,c){return s=s|0,l=l|0,c=y(c),pe(l)|0&&(n[s+104>>2]|0)!=0?s=s+100|0:s=Fn(s+60|0,n[1e3+(l<<2)>>2]|0,992)|0,y(ze(s,c))}function pe(s){return s=s|0,(s|1|0)==3|0}function ze(s,l){return s=s|0,l=y(l),(n[s+4>>2]|0)==3?l=y(0):l=y(qr(s,l)),y(l)}function mt(s,l){return s=s|0,l=l|0,s=n[s>>2]|0,((s|0)==0?(l|0)>1?l:1:s)|0}function fr(s,l){s=s|0,l=l|0;var c=0;e:do if((l|0)==2){switch(s|0){case 2:{s=3;break e}case 3:break;default:{c=4;break e}}s=2}else c=4;while(0);return s|0}function Cr(s,l){s=s|0,l=l|0;var c=Ze;return pe(l)|0&&(n[s+312>>2]|0)!=0&&(c=y(h[s+308>>2]),c>=y(0))||(c=y(_n(y(h[(Fn(s+276|0,n[1040+(l<<2)>>2]|0,992)|0)>>2]),y(0)))),y(c)}function yn(s,l){s=s|0,l=l|0;var c=Ze;return pe(l)|0&&(n[s+320>>2]|0)!=0&&(c=y(h[s+316>>2]),c>=y(0))||(c=y(_n(y(h[(Fn(s+276|0,n[1e3+(l<<2)>>2]|0,992)|0)>>2]),y(0)))),y(c)}function oi(s,l,c){s=s|0,l=l|0,c=y(c);var f=Ze;return pe(l)|0&&(n[s+240>>2]|0)!=0&&(f=y(qr(s+236|0,c)),f>=y(0))||(f=y(_n(y(qr(Fn(s+204|0,n[1040+(l<<2)>>2]|0,992)|0,c)),y(0)))),y(f)}function Oi(s,l,c){s=s|0,l=l|0,c=y(c);var f=Ze;return pe(l)|0&&(n[s+248>>2]|0)!=0&&(f=y(qr(s+244|0,c)),f>=y(0))||(f=y(_n(y(qr(Fn(s+204|0,n[1e3+(l<<2)>>2]|0,992)|0,c)),y(0)))),y(f)}function Ig(s,l,c,f,d,m,B){s=s|0,l=y(l),c=y(c),f=f|0,d=d|0,m=y(m),B=y(B);var k=Ze,Q=Ze,M=Ze,O=Ze,G=Ze,se=Ze,qe=0,Me=0,Qe=0;Qe=C,C=C+16|0,qe=Qe,Me=s+964|0,Un(s,(n[Me>>2]|0)!=0,3519),k=y(En(s,2,l)),Q=y(En(s,0,l)),M=y(ln(s,2,l)),O=y(ln(s,0,l)),_t(l)|0?G=l:G=y(_n(y(0),y(y(l-M)-k))),_t(c)|0?se=c:se=y(_n(y(0),y(y(c-O)-Q))),(f|0)==1&(d|0)==1?(h[s+908>>2]=y(Bi(s,2,y(l-M),m,m)),l=y(Bi(s,0,y(c-O),B,m))):(S7[n[Me>>2]&1](qe,s,G,f,se,d),G=y(k+y(h[qe>>2])),se=y(l-M),h[s+908>>2]=y(Bi(s,2,(f|2|0)==2?G:se,m,m)),se=y(Q+y(h[qe+4>>2])),l=y(c-O),l=y(Bi(s,0,(d|2|0)==2?se:l,B,m))),h[s+912>>2]=l,C=Qe}function qv(s,l,c,f,d,m,B){s=s|0,l=y(l),c=y(c),f=f|0,d=d|0,m=y(m),B=y(B);var k=Ze,Q=Ze,M=Ze,O=Ze;M=y(En(s,2,m)),k=y(En(s,0,m)),O=y(ln(s,2,m)),Q=y(ln(s,0,m)),l=y(l-O),h[s+908>>2]=y(Bi(s,2,(f|2|0)==2?M:l,m,m)),c=y(c-Q),h[s+912>>2]=y(Bi(s,0,(d|2|0)==2?k:c,B,m))}function Yv(s,l,c,f,d,m,B){s=s|0,l=y(l),c=y(c),f=f|0,d=d|0,m=y(m),B=y(B);var k=0,Q=Ze,M=Ze;return k=(f|0)==2,!(l<=y(0)&k)&&!(c<=y(0)&(d|0)==2)&&!((f|0)==1&(d|0)==1)?s=0:(Q=y(ln(s,0,m)),M=y(ln(s,2,m)),k=l<y(0)&k|(_t(l)|0),l=y(l-M),h[s+908>>2]=y(Bi(s,2,k?y(0):l,m,m)),l=y(c-Q),k=c<y(0)&(d|0)==2|(_t(c)|0),h[s+912>>2]=y(Bi(s,0,k?y(0):l,B,m)),s=1),s|0}function ww(s,l){return s=s|0,l=l|0,UA(s)|0?s=fr(2,l)|0:s=0,s|0}function Cp(s,l,c){return s=s|0,l=l|0,c=y(c),c=y(oi(s,l,c)),y(c+y(Cr(s,l)))}function Iw(s,l,c){return s=s|0,l=l|0,c=y(c),c=y(Oi(s,l,c)),y(c+y(yn(s,l)))}function En(s,l,c){s=s|0,l=l|0,c=y(c);var f=Ze;return f=y(Cp(s,l,c)),y(f+y(Iw(s,l,c)))}function Tm(s){return s=s|0,n[s+24>>2]|0?s=0:y(rs(s))!=y(0)?s=1:s=y(js(s))!=y(0),s|0}function rs(s){s=s|0;var l=Ze;if(n[s+944>>2]|0){if(l=y(h[s+44>>2]),_t(l)|0)return l=y(h[s+40>>2]),s=l>y(0)&((_t(l)|0)^1),y(s?l:y(0))}else l=y(0);return y(l)}function js(s){s=s|0;var l=Ze,c=0,f=Ze;do if(n[s+944>>2]|0){if(l=y(h[s+48>>2]),_t(l)|0){if(c=o[(n[s+976>>2]|0)+2>>0]|0,c<<24>>24==0&&(f=y(h[s+40>>2]),f<y(0)&((_t(f)|0)^1))){l=y(-f);break}l=c<<24>>24?y(1):y(0)}}else l=y(0);while(0);return y(l)}function Bu(s){s=s|0;var l=0,c=0;if(Xm(s+400|0,0,540)|0,o[s+985>>0]=1,$(s),c=wi(s)|0,c|0){l=s+948|0,s=0;do Bu(n[(n[l>>2]|0)+(s<<2)>>2]|0),s=s+1|0;while((s|0)!=(c|0))}}function Nm(s,l,c,f,d,m,B,k,Q,M){s=s|0,l=l|0,c=y(c),f=f|0,d=y(d),m=y(m),B=y(B),k=k|0,Q=Q|0,M=M|0;var O=0,G=Ze,se=0,qe=0,Me=Ze,Qe=Ze,et=0,Xe=Ze,lt=0,Ue=Ze,Ge=0,Lt=0,Mr=0,or=0,Xt=0,Sr=0,Nr=0,ir=0,xn=0,go=0;xn=C,C=C+16|0,Mr=xn+12|0,or=xn+8|0,Xt=xn+4|0,Sr=xn,ir=fr(n[s+4>>2]|0,Q)|0,Ge=pe(ir)|0,G=y(qr(Bw(l)|0,Ge?m:B)),Lt=ts(l,2,m)|0,Nr=ts(l,0,B)|0;do if(!(_t(G)|0)&&!(_t(Ge?c:d)|0)){if(O=l+504|0,!(_t(y(h[O>>2]))|0)&&(!(vw(n[l+976>>2]|0,0)|0)||(n[l+500>>2]|0)==(n[2278]|0)))break;h[O>>2]=y(_n(G,y(En(l,ir,m))))}else se=7;while(0);do if((se|0)==7){if(lt=Ge^1,!(lt|Lt^1)){B=y(qr(n[l+992>>2]|0,m)),h[l+504>>2]=y(_n(B,y(En(l,2,m))));break}if(!(Ge|Nr^1)){B=y(qr(n[l+996>>2]|0,B)),h[l+504>>2]=y(_n(B,y(En(l,0,m))));break}h[Mr>>2]=y(ce),h[or>>2]=y(ce),n[Xt>>2]=0,n[Sr>>2]=0,Xe=y(ln(l,2,m)),Ue=y(ln(l,0,m)),Lt?(Me=y(Xe+y(qr(n[l+992>>2]|0,m))),h[Mr>>2]=Me,n[Xt>>2]=1,qe=1):(qe=0,Me=y(ce)),Nr?(G=y(Ue+y(qr(n[l+996>>2]|0,B))),h[or>>2]=G,n[Sr>>2]=1,O=1):(O=0,G=y(ce)),se=n[s+32>>2]|0,Ge&(se|0)==2?se=2:_t(Me)|0&&!(_t(c)|0)&&(h[Mr>>2]=c,n[Xt>>2]=2,qe=2,Me=c),!((se|0)==2&lt)&&_t(G)|0&&!(_t(d)|0)&&(h[or>>2]=d,n[Sr>>2]=2,O=2,G=d),Qe=y(h[l+396>>2]),et=_t(Qe)|0;do if(et)se=qe;else{if((qe|0)==1&lt){h[or>>2]=y(y(Me-Xe)/Qe),n[Sr>>2]=1,O=1,se=1;break}Ge&(O|0)==1?(h[Mr>>2]=y(Qe*y(G-Ue)),n[Xt>>2]=1,O=1,se=1):se=qe}while(0);go=_t(c)|0,qe=(ha(s,l)|0)!=4,!(Ge|Lt|((f|0)!=1|go)|(qe|(se|0)==1))&&(h[Mr>>2]=c,n[Xt>>2]=1,!et)&&(h[or>>2]=y(y(c-Xe)/Qe),n[Sr>>2]=1,O=1),!(Nr|lt|((k|0)!=1|(_t(d)|0))|(qe|(O|0)==1))&&(h[or>>2]=d,n[Sr>>2]=1,!et)&&(h[Mr>>2]=y(Qe*y(d-Ue)),n[Xt>>2]=1),yr(l,2,m,m,Xt,Mr),yr(l,0,B,m,Sr,or),c=y(h[Mr>>2]),d=y(h[or>>2]),fa(l,c,d,Q,n[Xt>>2]|0,n[Sr>>2]|0,m,B,0,3565,M)|0,B=y(h[l+908+(n[976+(ir<<2)>>2]<<2)>>2]),h[l+504>>2]=y(_n(B,y(En(l,ir,m))))}while(0);n[l+500>>2]=n[2278],C=xn}function Bi(s,l,c,f,d){return s=s|0,l=l|0,c=y(c),f=y(f),d=y(d),f=y(MA(s,l,c,f)),y(_n(f,y(En(s,l,d))))}function ha(s,l){return s=s|0,l=l|0,l=l+20|0,l=n[((n[l>>2]|0)==0?s+16|0:l)>>2]|0,(l|0)==5&&UA(n[s+4>>2]|0)|0&&(l=1),l|0}function vl(s,l){return s=s|0,l=l|0,pe(l)|0&&(n[s+96>>2]|0)!=0?l=4:l=n[1040+(l<<2)>>2]|0,s+60+(l<<3)|0}function Sc(s,l){return s=s|0,l=l|0,pe(l)|0&&(n[s+104>>2]|0)!=0?l=5:l=n[1e3+(l<<2)>>2]|0,s+60+(l<<3)|0}function yr(s,l,c,f,d,m){switch(s=s|0,l=l|0,c=y(c),f=y(f),d=d|0,m=m|0,c=y(qr(s+380+(n[976+(l<<2)>>2]<<3)|0,c)),c=y(c+y(ln(s,l,f))),n[d>>2]|0){case 2:case 1:{d=_t(c)|0,f=y(h[m>>2]),h[m>>2]=d|f<c?f:c;break}case 0:{_t(c)|0||(n[d>>2]=2,h[m>>2]=c);break}default:}}function gi(s,l){return s=s|0,l=l|0,s=s+132|0,pe(l)|0&&(n[(Fn(s,4,948)|0)+4>>2]|0)!=0?s=1:s=(n[(Fn(s,n[1040+(l<<2)>>2]|0,948)|0)+4>>2]|0)!=0,s|0}function Or(s,l,c){s=s|0,l=l|0,c=y(c);var f=0,d=0;return s=s+132|0,pe(l)|0&&(f=Fn(s,4,948)|0,(n[f+4>>2]|0)!=0)?d=4:(f=Fn(s,n[1040+(l<<2)>>2]|0,948)|0,n[f+4>>2]|0?d=4:c=y(0)),(d|0)==4&&(c=y(qr(f,c))),y(c)}function ns(s,l,c){s=s|0,l=l|0,c=y(c);var f=Ze;return f=y(h[s+908+(n[976+(l<<2)>>2]<<2)>>2]),f=y(f+y(K(s,l,c))),y(f+y(re(s,l,c)))}function Yi(s){s=s|0;var l=0,c=0,f=0;e:do if(UA(n[s+4>>2]|0)|0)l=0;else if((n[s+16>>2]|0)!=5)if(c=wi(s)|0,!c)l=0;else for(l=0;;){if(f=gs(s,l)|0,(n[f+24>>2]|0)==0&&(n[f+20>>2]|0)==5){l=1;break e}if(l=l+1|0,l>>>0>=c>>>0){l=0;break}}else l=1;while(0);return l|0}function Lm(s,l){s=s|0,l=l|0;var c=Ze;return c=y(h[s+908+(n[976+(l<<2)>>2]<<2)>>2]),c>=y(0)&((_t(c)|0)^1)|0}function Ya(s){s=s|0;var l=Ze,c=0,f=0,d=0,m=0,B=0,k=0,Q=Ze;if(c=n[s+968>>2]|0,c)Q=y(h[s+908>>2]),l=y(h[s+912>>2]),l=y(w7[c&0](s,Q,l)),Un(s,(_t(l)|0)^1,3573);else{m=wi(s)|0;do if(m|0){for(c=0,d=0;;){if(f=gs(s,d)|0,n[f+940>>2]|0){B=8;break}if((n[f+24>>2]|0)!=1)if(k=(ha(s,f)|0)==5,k){c=f;break}else c=(c|0)==0?f:c;if(d=d+1|0,d>>>0>=m>>>0){B=8;break}}if((B|0)==8&&!c)break;return l=y(Ya(c)),y(l+y(h[c+404>>2]))}while(0);l=y(h[s+912>>2])}return y(l)}function MA(s,l,c,f){s=s|0,l=l|0,c=y(c),f=y(f);var d=Ze,m=0;return UA(l)|0?(l=1,m=3):pe(l)|0?(l=0,m=3):(f=y(ce),d=y(ce)),(m|0)==3&&(d=y(qr(s+364+(l<<3)|0,f)),f=y(qr(s+380+(l<<3)|0,f))),m=f<c&(f>=y(0)&((_t(f)|0)^1)),c=m?f:c,m=d>=y(0)&((_t(d)|0)^1)&c<d,y(m?d:c)}function Om(s,l,c,f,d,m,B){s=s|0,l=l|0,c=y(c),f=f|0,d=y(d),m=m|0,B=B|0;var k=Ze,Q=Ze,M=0,O=0,G=Ze,se=Ze,qe=Ze,Me=0,Qe=0,et=0,Xe=0,lt=Ze,Ue=0;et=fr(n[s+4>>2]|0,m)|0,Me=ww(et,m)|0,Qe=pe(et)|0,G=y(ln(l,2,c)),se=y(ln(l,0,c)),ts(l,2,c)|0?k=y(G+y(qr(n[l+992>>2]|0,c))):gi(l,2)|0&&sr(l,2)|0?(k=y(h[s+908>>2]),Q=y(Cr(s,2)),Q=y(k-y(Q+y(yn(s,2)))),k=y(Or(l,2,c)),k=y(Bi(l,2,y(Q-y(k+y(vu(l,2,c)))),c,c))):k=y(ce),ts(l,0,d)|0?Q=y(se+y(qr(n[l+996>>2]|0,d))):gi(l,0)|0&&sr(l,0)|0?(Q=y(h[s+912>>2]),lt=y(Cr(s,0)),lt=y(Q-y(lt+y(yn(s,0)))),Q=y(Or(l,0,d)),Q=y(Bi(l,0,y(lt-y(Q+y(vu(l,0,d)))),d,c))):Q=y(ce),M=_t(k)|0,O=_t(Q)|0;do if(M^O&&(qe=y(h[l+396>>2]),!(_t(qe)|0)))if(M){k=y(G+y(y(Q-se)*qe));break}else{lt=y(se+y(y(k-G)/qe)),Q=O?lt:Q;break}while(0);O=_t(k)|0,M=_t(Q)|0,O|M&&(Ue=(O^1)&1,f=c>y(0)&((f|0)!=0&O),k=Qe?k:f?c:k,fa(l,k,Q,m,Qe?Ue:f?2:Ue,O&(M^1)&1,k,Q,0,3623,B)|0,k=y(h[l+908>>2]),k=y(k+y(ln(l,2,c))),Q=y(h[l+912>>2]),Q=y(Q+y(ln(l,0,c)))),fa(l,k,Q,m,1,1,k,Q,1,3635,B)|0,sr(l,et)|0&&!(gi(l,et)|0)?(Ue=n[976+(et<<2)>>2]|0,lt=y(h[s+908+(Ue<<2)>>2]),lt=y(lt-y(h[l+908+(Ue<<2)>>2])),lt=y(lt-y(yn(s,et))),lt=y(lt-y(re(l,et,c))),lt=y(lt-y(vu(l,et,Qe?c:d))),h[l+400+(n[1040+(et<<2)>>2]<<2)>>2]=lt):Xe=21;do if((Xe|0)==21){if(!(gi(l,et)|0)&&(n[s+8>>2]|0)==1){Ue=n[976+(et<<2)>>2]|0,lt=y(h[s+908+(Ue<<2)>>2]),lt=y(y(lt-y(h[l+908+(Ue<<2)>>2]))*y(.5)),h[l+400+(n[1040+(et<<2)>>2]<<2)>>2]=lt;break}!(gi(l,et)|0)&&(n[s+8>>2]|0)==2&&(Ue=n[976+(et<<2)>>2]|0,lt=y(h[s+908+(Ue<<2)>>2]),lt=y(lt-y(h[l+908+(Ue<<2)>>2])),h[l+400+(n[1040+(et<<2)>>2]<<2)>>2]=lt)}while(0);sr(l,Me)|0&&!(gi(l,Me)|0)?(Ue=n[976+(Me<<2)>>2]|0,lt=y(h[s+908+(Ue<<2)>>2]),lt=y(lt-y(h[l+908+(Ue<<2)>>2])),lt=y(lt-y(yn(s,Me))),lt=y(lt-y(re(l,Me,c))),lt=y(lt-y(vu(l,Me,Qe?d:c))),h[l+400+(n[1040+(Me<<2)>>2]<<2)>>2]=lt):Xe=30;do if((Xe|0)==30&&!(gi(l,Me)|0)){if((ha(s,l)|0)==2){Ue=n[976+(Me<<2)>>2]|0,lt=y(h[s+908+(Ue<<2)>>2]),lt=y(y(lt-y(h[l+908+(Ue<<2)>>2]))*y(.5)),h[l+400+(n[1040+(Me<<2)>>2]<<2)>>2]=lt;break}Ue=(ha(s,l)|0)==3,Ue^(n[s+28>>2]|0)==2&&(Ue=n[976+(Me<<2)>>2]|0,lt=y(h[s+908+(Ue<<2)>>2]),lt=y(lt-y(h[l+908+(Ue<<2)>>2])),h[l+400+(n[1040+(Me<<2)>>2]<<2)>>2]=lt)}while(0)}function wp(s,l,c){s=s|0,l=l|0,c=c|0;var f=Ze,d=0;d=n[976+(c<<2)>>2]|0,f=y(h[l+908+(d<<2)>>2]),f=y(y(h[s+908+(d<<2)>>2])-f),f=y(f-y(h[l+400+(n[1040+(c<<2)>>2]<<2)>>2])),h[l+400+(n[1e3+(c<<2)>>2]<<2)>>2]=f}function UA(s){return s=s|0,(s|1|0)==1|0}function Bw(s){s=s|0;var l=Ze;switch(n[s+56>>2]|0){case 0:case 3:{l=y(h[s+40>>2]),l>y(0)&((_t(l)|0)^1)?s=o[(n[s+976>>2]|0)+2>>0]|0?1056:992:s=1056;break}default:s=s+52|0}return s|0}function vw(s,l){return s=s|0,l=l|0,(o[s+l>>0]|0)!=0|0}function sr(s,l){return s=s|0,l=l|0,s=s+132|0,pe(l)|0&&(n[(Fn(s,5,948)|0)+4>>2]|0)!=0?s=1:s=(n[(Fn(s,n[1e3+(l<<2)>>2]|0,948)|0)+4>>2]|0)!=0,s|0}function vu(s,l,c){s=s|0,l=l|0,c=y(c);var f=0,d=0;return s=s+132|0,pe(l)|0&&(f=Fn(s,5,948)|0,(n[f+4>>2]|0)!=0)?d=4:(f=Fn(s,n[1e3+(l<<2)>>2]|0,948)|0,n[f+4>>2]|0?d=4:c=y(0)),(d|0)==4&&(c=y(qr(f,c))),y(c)}function Mm(s,l,c){return s=s|0,l=l|0,c=y(c),gi(s,l)|0?c=y(Or(s,l,c)):c=y(-y(vu(s,l,c))),y(c)}function Du(s){return s=y(s),h[v>>2]=s,n[v>>2]|0|0}function Ip(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>1073741823)Rt();else{d=Kt(l<<2)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c<<2)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l<<2)}function Bg(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(0-(d>>2)<<2)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function _A(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~((f+-4-l|0)>>>2)<<2)),s=n[s>>2]|0,s|0&&gt(s)}function HA(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0;if(B=s+4|0,k=n[B>>2]|0,d=k-f|0,m=d>>2,s=l+(m<<2)|0,s>>>0<c>>>0){f=k;do n[f>>2]=n[s>>2],s=s+4|0,f=(n[B>>2]|0)+4|0,n[B>>2]=f;while(s>>>0<c>>>0)}m|0&&Mw(k+(0-m<<2)|0,l|0,d|0)|0}function vg(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0;return k=l+4|0,Q=n[k>>2]|0,d=n[s>>2]|0,B=c,m=B-d|0,f=Q+(0-(m>>2)<<2)|0,n[k>>2]=f,(m|0)>0&&Dr(f|0,d|0,m|0)|0,d=s+4|0,m=l+8|0,f=(n[d>>2]|0)-B|0,(f|0)>0&&(Dr(n[m>>2]|0,c|0,f|0)|0,n[m>>2]=(n[m>>2]|0)+(f>>>2<<2)),B=n[s>>2]|0,n[s>>2]=n[k>>2],n[k>>2]=B,B=n[d>>2]|0,n[d>>2]=n[m>>2],n[m>>2]=B,B=s+8|0,c=l+12|0,s=n[B>>2]|0,n[B>>2]=n[c>>2],n[c>>2]=s,n[l>>2]=n[k>>2],Q|0}function Dw(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;if(B=n[l>>2]|0,m=n[c>>2]|0,(B|0)!=(m|0)){d=s+8|0,c=((m+-4-B|0)>>>2)+1|0,s=B,f=n[d>>2]|0;do n[f>>2]=n[s>>2],f=(n[d>>2]|0)+4|0,n[d>>2]=f,s=s+4|0;while((s|0)!=(m|0));n[l>>2]=B+(c<<2)}}function Um(){dc()}function ga(){var s=0;return s=Kt(4)|0,jA(s),s|0}function jA(s){s=s|0,n[s>>2]=ys()|0}function Pc(s){s=s|0,s|0&&(Dg(s),gt(s))}function Dg(s){s=s|0,tt(n[s>>2]|0)}function _m(s,l,c){s=s|0,l=l|0,c=c|0,qa(n[s>>2]|0,l,c)}function fo(s,l){s=s|0,l=y(l),pa(n[s>>2]|0,l)}function Wv(s,l){return s=s|0,l=l|0,vw(n[s>>2]|0,l)|0}function Sw(){var s=0;return s=Kt(8)|0,Kv(s,0),s|0}function Kv(s,l){s=s|0,l=l|0,l?l=Ci(n[l>>2]|0)|0:l=co()|0,n[s>>2]=l,n[s+4>>2]=0,bi(l,s)}function AF(s){s=s|0;var l=0;return l=Kt(8)|0,Kv(l,s),l|0}function Vv(s){s=s|0,s|0&&(Su(s),gt(s))}function Su(s){s=s|0;var l=0;la(n[s>>2]|0),l=s+4|0,s=n[l>>2]|0,n[l>>2]=0,s|0&&(GA(s),gt(s))}function GA(s){s=s|0,qA(s)}function qA(s){s=s|0,s=n[s>>2]|0,s|0&&PA(s|0)}function Pw(s){return s=s|0,jo(s)|0}function Hm(s){s=s|0;var l=0,c=0;c=s+4|0,l=n[c>>2]|0,n[c>>2]=0,l|0&&(GA(l),gt(l)),_s(n[s>>2]|0)}function fF(s,l){s=s|0,l=l|0,$r(n[s>>2]|0,n[l>>2]|0)}function pF(s,l){s=s|0,l=l|0,ca(n[s>>2]|0,l)}function Jv(s,l,c){s=s|0,l=l|0,c=+c,yu(n[s>>2]|0,l,y(c))}function zv(s,l,c){s=s|0,l=l|0,c=+c,Es(n[s>>2]|0,l,y(c))}function bw(s,l){s=s|0,l=l|0,gu(n[s>>2]|0,l)}function Pu(s,l){s=s|0,l=l|0,du(n[s>>2]|0,l)}function hF(s,l){s=s|0,l=l|0,FA(n[s>>2]|0,l)}function gF(s,l){s=s|0,l=l|0,kA(n[s>>2]|0,l)}function Bp(s,l){s=s|0,l=l|0,yc(n[s>>2]|0,l)}function dF(s,l){s=s|0,l=l|0,Ap(n[s>>2]|0,l)}function Xv(s,l,c){s=s|0,l=l|0,c=+c,Cc(n[s>>2]|0,l,y(c))}function YA(s,l,c){s=s|0,l=l|0,c=+c,q(n[s>>2]|0,l,y(c))}function mF(s,l){s=s|0,l=l|0,wl(n[s>>2]|0,l)}function yF(s,l){s=s|0,l=l|0,ag(n[s>>2]|0,l)}function Zv(s,l){s=s|0,l=l|0,fp(n[s>>2]|0,l)}function xw(s,l){s=s|0,l=+l,RA(n[s>>2]|0,y(l))}function kw(s,l){s=s|0,l=+l,Ha(n[s>>2]|0,y(l))}function EF(s,l){s=s|0,l=+l,qi(n[s>>2]|0,y(l))}function CF(s,l){s=s|0,l=+l,Hs(n[s>>2]|0,y(l))}function Dl(s,l){s=s|0,l=+l,mu(n[s>>2]|0,y(l))}function Qw(s,l){s=s|0,l=+l,yw(n[s>>2]|0,y(l))}function wF(s,l){s=s|0,l=+l,TA(n[s>>2]|0,y(l))}function WA(s){s=s|0,pp(n[s>>2]|0)}function jm(s,l){s=s|0,l=+l,Cs(n[s>>2]|0,y(l))}function bu(s,l){s=s|0,l=+l,ug(n[s>>2]|0,y(l))}function Fw(s){s=s|0,Ag(n[s>>2]|0)}function Rw(s,l){s=s|0,l=+l,hp(n[s>>2]|0,y(l))}function IF(s,l){s=s|0,l=+l,Ic(n[s>>2]|0,y(l))}function $v(s,l){s=s|0,l=+l,bm(n[s>>2]|0,y(l))}function KA(s,l){s=s|0,l=+l,pg(n[s>>2]|0,y(l))}function eD(s,l){s=s|0,l=+l,Cu(n[s>>2]|0,y(l))}function Gm(s,l){s=s|0,l=+l,xm(n[s>>2]|0,y(l))}function tD(s,l){s=s|0,l=+l,wu(n[s>>2]|0,y(l))}function rD(s,l){s=s|0,l=+l,Ew(n[s>>2]|0,y(l))}function qm(s,l){s=s|0,l=+l,Aa(n[s>>2]|0,y(l))}function nD(s,l,c){s=s|0,l=l|0,c=+c,Eu(n[s>>2]|0,l,y(c))}function BF(s,l,c){s=s|0,l=l|0,c=+c,xi(n[s>>2]|0,l,y(c))}function S(s,l,c){s=s|0,l=l|0,c=+c,wc(n[s>>2]|0,l,y(c))}function D(s){return s=s|0,og(n[s>>2]|0)|0}function T(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0;f=C,C=C+16|0,d=f,Ec(d,n[l>>2]|0,c),j(s,d),C=f}function j(s,l){s=s|0,l=l|0,Y(s,n[l+4>>2]|0,+y(h[l>>2]))}function Y(s,l,c){s=s|0,l=l|0,c=+c,n[s>>2]=l,E[s+8>>3]=c}function Ae(s){return s=s|0,sg(n[s>>2]|0)|0}function De(s){return s=s|0,uo(n[s>>2]|0)|0}function vt(s){return s=s|0,mc(n[s>>2]|0)|0}function wt(s){return s=s|0,QA(n[s>>2]|0)|0}function xt(s){return s=s|0,Pm(n[s>>2]|0)|0}function _r(s){return s=s|0,ig(n[s>>2]|0)|0}function is(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0;f=C,C=C+16|0,d=f,Dt(d,n[l>>2]|0,c),j(s,d),C=f}function di(s){return s=s|0,$n(n[s>>2]|0)|0}function po(s){return s=s|0,lg(n[s>>2]|0)|0}function VA(s,l){s=s|0,l=l|0;var c=0,f=0;c=C,C=C+16|0,f=c,ua(f,n[l>>2]|0),j(s,f),C=c}function Yo(s){return s=s|0,+ +y(Gi(n[s>>2]|0))}function rt(s){return s=s|0,+ +y(es(n[s>>2]|0))}function Ve(s,l){s=s|0,l=l|0;var c=0,f=0;c=C,C=C+16|0,f=c,Br(f,n[l>>2]|0),j(s,f),C=c}function ft(s,l){s=s|0,l=l|0;var c=0,f=0;c=C,C=C+16|0,f=c,fg(f,n[l>>2]|0),j(s,f),C=c}function Wt(s,l){s=s|0,l=l|0;var c=0,f=0;c=C,C=C+16|0,f=c,Ct(f,n[l>>2]|0),j(s,f),C=c}function vr(s,l){s=s|0,l=l|0;var c=0,f=0;c=C,C=C+16|0,f=c,hg(f,n[l>>2]|0),j(s,f),C=c}function Pn(s,l){s=s|0,l=l|0;var c=0,f=0;c=C,C=C+16|0,f=c,gg(f,n[l>>2]|0),j(s,f),C=c}function Fr(s,l){s=s|0,l=l|0;var c=0,f=0;c=C,C=C+16|0,f=c,km(f,n[l>>2]|0),j(s,f),C=c}function bn(s){return s=s|0,+ +y(Bc(n[s>>2]|0))}function ai(s,l){return s=s|0,l=l|0,+ +y(cg(n[s>>2]|0,l))}function tn(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0;f=C,C=C+16|0,d=f,ct(d,n[l>>2]|0,c),j(s,d),C=f}function ho(s,l,c){s=s|0,l=l|0,c=c|0,nr(n[s>>2]|0,n[l>>2]|0,c)}function vF(s,l){s=s|0,l=l|0,ms(n[s>>2]|0,n[l>>2]|0)}function eve(s){return s=s|0,wi(n[s>>2]|0)|0}function tve(s){return s=s|0,s=ht(n[s>>2]|0)|0,s?s=Pw(s)|0:s=0,s|0}function rve(s,l){return s=s|0,l=l|0,s=gs(n[s>>2]|0,l)|0,s?s=Pw(s)|0:s=0,s|0}function nve(s,l){s=s|0,l=l|0;var c=0,f=0;f=Kt(4)|0,zq(f,l),c=s+4|0,l=n[c>>2]|0,n[c>>2]=f,l|0&&(GA(l),gt(l)),It(n[s>>2]|0,1)}function zq(s,l){s=s|0,l=l|0,gve(s,l)}function ive(s,l,c,f,d,m){s=s|0,l=l|0,c=y(c),f=f|0,d=y(d),m=m|0;var B=0,k=0;B=C,C=C+16|0,k=B,sve(k,jo(l)|0,+c,f,+d,m),h[s>>2]=y(+E[k>>3]),h[s+4>>2]=y(+E[k+8>>3]),C=B}function sve(s,l,c,f,d,m){s=s|0,l=l|0,c=+c,f=f|0,d=+d,m=m|0;var B=0,k=0,Q=0,M=0,O=0;B=C,C=C+32|0,O=B+8|0,M=B+20|0,Q=B,k=B+16|0,E[O>>3]=c,n[M>>2]=f,E[Q>>3]=d,n[k>>2]=m,ove(s,n[l+4>>2]|0,O,M,Q,k),C=B}function ove(s,l,c,f,d,m){s=s|0,l=l|0,c=c|0,f=f|0,d=d|0,m=m|0;var B=0,k=0;B=C,C=C+16|0,k=B,Ka(k),l=da(l)|0,ave(s,l,+E[c>>3],n[f>>2]|0,+E[d>>3],n[m>>2]|0),Va(k),C=B}function da(s){return s=s|0,n[s>>2]|0}function ave(s,l,c,f,d,m){s=s|0,l=l|0,c=+c,f=f|0,d=+d,m=m|0;var B=0;B=Sl(lve()|0)|0,c=+JA(c),f=DF(f)|0,d=+JA(d),cve(s,hi(0,B|0,l|0,+c,f|0,+d,DF(m)|0)|0)}function lve(){var s=0;return o[7608]|0||(pve(9120),s=7608,n[s>>2]=1,n[s+4>>2]=0),9120}function Sl(s){return s=s|0,n[s+8>>2]|0}function JA(s){return s=+s,+ +SF(s)}function DF(s){return s=s|0,Zq(s)|0}function cve(s,l){s=s|0,l=l|0;var c=0,f=0,d=0;d=C,C=C+32|0,c=d,f=l,f&1?(uve(c,0),ii(f|0,c|0)|0,Ave(s,c),fve(c)):(n[s>>2]=n[l>>2],n[s+4>>2]=n[l+4>>2],n[s+8>>2]=n[l+8>>2],n[s+12>>2]=n[l+12>>2]),C=d}function uve(s,l){s=s|0,l=l|0,Xq(s,l),n[s+8>>2]=0,o[s+24>>0]=0}function Ave(s,l){s=s|0,l=l|0,l=l+8|0,n[s>>2]=n[l>>2],n[s+4>>2]=n[l+4>>2],n[s+8>>2]=n[l+8>>2],n[s+12>>2]=n[l+12>>2]}function fve(s){s=s|0,o[s+24>>0]=0}function Xq(s,l){s=s|0,l=l|0,n[s>>2]=l}function Zq(s){return s=s|0,s|0}function SF(s){return s=+s,+s}function pve(s){s=s|0,Pl(s,hve()|0,4)}function hve(){return 1064}function Pl(s,l,c){s=s|0,l=l|0,c=c|0,n[s>>2]=l,n[s+4>>2]=c,n[s+8>>2]=up(l|0,c+1|0)|0}function gve(s,l){s=s|0,l=l|0,l=n[l>>2]|0,n[s>>2]=l,yl(l|0)}function dve(s){s=s|0;var l=0,c=0;c=s+4|0,l=n[c>>2]|0,n[c>>2]=0,l|0&&(GA(l),gt(l)),It(n[s>>2]|0,0)}function mve(s){s=s|0,Tt(n[s>>2]|0)}function yve(s){return s=s|0,er(n[s>>2]|0)|0}function Eve(s,l,c,f){s=s|0,l=+l,c=+c,f=f|0,vc(n[s>>2]|0,y(l),y(c),f)}function Cve(s){return s=s|0,+ +y(Il(n[s>>2]|0))}function wve(s){return s=s|0,+ +y(dg(n[s>>2]|0))}function Ive(s){return s=s|0,+ +y(Iu(n[s>>2]|0))}function Bve(s){return s=s|0,+ +y(NA(n[s>>2]|0))}function vve(s){return s=s|0,+ +y(gp(n[s>>2]|0))}function Dve(s){return s=s|0,+ +y(ja(n[s>>2]|0))}function Sve(s,l){s=s|0,l=l|0,E[s>>3]=+y(Il(n[l>>2]|0)),E[s+8>>3]=+y(dg(n[l>>2]|0)),E[s+16>>3]=+y(Iu(n[l>>2]|0)),E[s+24>>3]=+y(NA(n[l>>2]|0)),E[s+32>>3]=+y(gp(n[l>>2]|0)),E[s+40>>3]=+y(ja(n[l>>2]|0))}function Pve(s,l){return s=s|0,l=l|0,+ +y(mg(n[s>>2]|0,l))}function bve(s,l){return s=s|0,l=l|0,+ +y(dp(n[s>>2]|0,l))}function xve(s,l){return s=s|0,l=l|0,+ +y(Go(n[s>>2]|0,l))}function kve(){return Sn()|0}function Qve(){Fve(),Rve(),Tve(),Nve(),Lve(),Ove()}function Fve(){LNe(11713,4938,1)}function Rve(){tNe(10448)}function Tve(){LTe(10408)}function Nve(){sTe(10324)}function Lve(){pFe(10096)}function Ove(){Mve(9132)}function Mve(s){s=s|0;var l=0,c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0,qe=0,Me=0,Qe=0,et=0,Xe=0,lt=0,Ue=0,Ge=0,Lt=0,Mr=0,or=0,Xt=0,Sr=0,Nr=0,ir=0,xn=0,go=0,mo=0,yo=0,ya=0,Fp=0,Rp=0,bl=0,Tp=0,Fu=0,Ru=0,Np=0,Lp=0,Op=0,Xr=0,xl=0,Mp=0,xc=0,Up=0,_p=0,Tu=0,Nu=0,kc=0,Gs=0,za=0,Wo=0,kl=0,nf=0,sf=0,Lu=0,of=0,af=0,qs=0,vs=0,Ql=0,Rn=0,lf=0,Eo=0,Qc=0,Co=0,Fc=0,cf=0,uf=0,Rc=0,Ys=0,Fl=0,Af=0,ff=0,pf=0,xr=0,Jn=0,Ds=0,wo=0,Ws=0,Rr=0,ur=0,Rl=0;l=C,C=C+672|0,c=l+656|0,Rl=l+648|0,ur=l+640|0,Rr=l+632|0,Ws=l+624|0,wo=l+616|0,Ds=l+608|0,Jn=l+600|0,xr=l+592|0,pf=l+584|0,ff=l+576|0,Af=l+568|0,Fl=l+560|0,Ys=l+552|0,Rc=l+544|0,uf=l+536|0,cf=l+528|0,Fc=l+520|0,Co=l+512|0,Qc=l+504|0,Eo=l+496|0,lf=l+488|0,Rn=l+480|0,Ql=l+472|0,vs=l+464|0,qs=l+456|0,af=l+448|0,of=l+440|0,Lu=l+432|0,sf=l+424|0,nf=l+416|0,kl=l+408|0,Wo=l+400|0,za=l+392|0,Gs=l+384|0,kc=l+376|0,Nu=l+368|0,Tu=l+360|0,_p=l+352|0,Up=l+344|0,xc=l+336|0,Mp=l+328|0,xl=l+320|0,Xr=l+312|0,Op=l+304|0,Lp=l+296|0,Np=l+288|0,Ru=l+280|0,Fu=l+272|0,Tp=l+264|0,bl=l+256|0,Rp=l+248|0,Fp=l+240|0,ya=l+232|0,yo=l+224|0,mo=l+216|0,go=l+208|0,xn=l+200|0,ir=l+192|0,Nr=l+184|0,Sr=l+176|0,Xt=l+168|0,or=l+160|0,Mr=l+152|0,Lt=l+144|0,Ge=l+136|0,Ue=l+128|0,lt=l+120|0,Xe=l+112|0,et=l+104|0,Qe=l+96|0,Me=l+88|0,qe=l+80|0,se=l+72|0,G=l+64|0,O=l+56|0,M=l+48|0,Q=l+40|0,k=l+32|0,B=l+24|0,m=l+16|0,d=l+8|0,f=l,Uve(s,3646),_ve(s,3651,2)|0,Hve(s,3665,2)|0,jve(s,3682,18)|0,n[Rl>>2]=19,n[Rl+4>>2]=0,n[c>>2]=n[Rl>>2],n[c+4>>2]=n[Rl+4>>2],Tw(s,3690,c)|0,n[ur>>2]=1,n[ur+4>>2]=0,n[c>>2]=n[ur>>2],n[c+4>>2]=n[ur+4>>2],Gve(s,3696,c)|0,n[Rr>>2]=2,n[Rr+4>>2]=0,n[c>>2]=n[Rr>>2],n[c+4>>2]=n[Rr+4>>2],xu(s,3706,c)|0,n[Ws>>2]=1,n[Ws+4>>2]=0,n[c>>2]=n[Ws>>2],n[c+4>>2]=n[Ws+4>>2],Sg(s,3722,c)|0,n[wo>>2]=2,n[wo+4>>2]=0,n[c>>2]=n[wo>>2],n[c+4>>2]=n[wo+4>>2],Sg(s,3734,c)|0,n[Ds>>2]=3,n[Ds+4>>2]=0,n[c>>2]=n[Ds>>2],n[c+4>>2]=n[Ds+4>>2],xu(s,3753,c)|0,n[Jn>>2]=4,n[Jn+4>>2]=0,n[c>>2]=n[Jn>>2],n[c+4>>2]=n[Jn+4>>2],xu(s,3769,c)|0,n[xr>>2]=5,n[xr+4>>2]=0,n[c>>2]=n[xr>>2],n[c+4>>2]=n[xr+4>>2],xu(s,3783,c)|0,n[pf>>2]=6,n[pf+4>>2]=0,n[c>>2]=n[pf>>2],n[c+4>>2]=n[pf+4>>2],xu(s,3796,c)|0,n[ff>>2]=7,n[ff+4>>2]=0,n[c>>2]=n[ff>>2],n[c+4>>2]=n[ff+4>>2],xu(s,3813,c)|0,n[Af>>2]=8,n[Af+4>>2]=0,n[c>>2]=n[Af>>2],n[c+4>>2]=n[Af+4>>2],xu(s,3825,c)|0,n[Fl>>2]=3,n[Fl+4>>2]=0,n[c>>2]=n[Fl>>2],n[c+4>>2]=n[Fl+4>>2],Sg(s,3843,c)|0,n[Ys>>2]=4,n[Ys+4>>2]=0,n[c>>2]=n[Ys>>2],n[c+4>>2]=n[Ys+4>>2],Sg(s,3853,c)|0,n[Rc>>2]=9,n[Rc+4>>2]=0,n[c>>2]=n[Rc>>2],n[c+4>>2]=n[Rc+4>>2],xu(s,3870,c)|0,n[uf>>2]=10,n[uf+4>>2]=0,n[c>>2]=n[uf>>2],n[c+4>>2]=n[uf+4>>2],xu(s,3884,c)|0,n[cf>>2]=11,n[cf+4>>2]=0,n[c>>2]=n[cf>>2],n[c+4>>2]=n[cf+4>>2],xu(s,3896,c)|0,n[Fc>>2]=1,n[Fc+4>>2]=0,n[c>>2]=n[Fc>>2],n[c+4>>2]=n[Fc+4>>2],Is(s,3907,c)|0,n[Co>>2]=2,n[Co+4>>2]=0,n[c>>2]=n[Co>>2],n[c+4>>2]=n[Co+4>>2],Is(s,3915,c)|0,n[Qc>>2]=3,n[Qc+4>>2]=0,n[c>>2]=n[Qc>>2],n[c+4>>2]=n[Qc+4>>2],Is(s,3928,c)|0,n[Eo>>2]=4,n[Eo+4>>2]=0,n[c>>2]=n[Eo>>2],n[c+4>>2]=n[Eo+4>>2],Is(s,3948,c)|0,n[lf>>2]=5,n[lf+4>>2]=0,n[c>>2]=n[lf>>2],n[c+4>>2]=n[lf+4>>2],Is(s,3960,c)|0,n[Rn>>2]=6,n[Rn+4>>2]=0,n[c>>2]=n[Rn>>2],n[c+4>>2]=n[Rn+4>>2],Is(s,3974,c)|0,n[Ql>>2]=7,n[Ql+4>>2]=0,n[c>>2]=n[Ql>>2],n[c+4>>2]=n[Ql+4>>2],Is(s,3983,c)|0,n[vs>>2]=20,n[vs+4>>2]=0,n[c>>2]=n[vs>>2],n[c+4>>2]=n[vs+4>>2],Tw(s,3999,c)|0,n[qs>>2]=8,n[qs+4>>2]=0,n[c>>2]=n[qs>>2],n[c+4>>2]=n[qs+4>>2],Is(s,4012,c)|0,n[af>>2]=9,n[af+4>>2]=0,n[c>>2]=n[af>>2],n[c+4>>2]=n[af+4>>2],Is(s,4022,c)|0,n[of>>2]=21,n[of+4>>2]=0,n[c>>2]=n[of>>2],n[c+4>>2]=n[of+4>>2],Tw(s,4039,c)|0,n[Lu>>2]=10,n[Lu+4>>2]=0,n[c>>2]=n[Lu>>2],n[c+4>>2]=n[Lu+4>>2],Is(s,4053,c)|0,n[sf>>2]=11,n[sf+4>>2]=0,n[c>>2]=n[sf>>2],n[c+4>>2]=n[sf+4>>2],Is(s,4065,c)|0,n[nf>>2]=12,n[nf+4>>2]=0,n[c>>2]=n[nf>>2],n[c+4>>2]=n[nf+4>>2],Is(s,4084,c)|0,n[kl>>2]=13,n[kl+4>>2]=0,n[c>>2]=n[kl>>2],n[c+4>>2]=n[kl+4>>2],Is(s,4097,c)|0,n[Wo>>2]=14,n[Wo+4>>2]=0,n[c>>2]=n[Wo>>2],n[c+4>>2]=n[Wo+4>>2],Is(s,4117,c)|0,n[za>>2]=15,n[za+4>>2]=0,n[c>>2]=n[za>>2],n[c+4>>2]=n[za+4>>2],Is(s,4129,c)|0,n[Gs>>2]=16,n[Gs+4>>2]=0,n[c>>2]=n[Gs>>2],n[c+4>>2]=n[Gs+4>>2],Is(s,4148,c)|0,n[kc>>2]=17,n[kc+4>>2]=0,n[c>>2]=n[kc>>2],n[c+4>>2]=n[kc+4>>2],Is(s,4161,c)|0,n[Nu>>2]=18,n[Nu+4>>2]=0,n[c>>2]=n[Nu>>2],n[c+4>>2]=n[Nu+4>>2],Is(s,4181,c)|0,n[Tu>>2]=5,n[Tu+4>>2]=0,n[c>>2]=n[Tu>>2],n[c+4>>2]=n[Tu+4>>2],Sg(s,4196,c)|0,n[_p>>2]=6,n[_p+4>>2]=0,n[c>>2]=n[_p>>2],n[c+4>>2]=n[_p+4>>2],Sg(s,4206,c)|0,n[Up>>2]=7,n[Up+4>>2]=0,n[c>>2]=n[Up>>2],n[c+4>>2]=n[Up+4>>2],Sg(s,4217,c)|0,n[xc>>2]=3,n[xc+4>>2]=0,n[c>>2]=n[xc>>2],n[c+4>>2]=n[xc+4>>2],zA(s,4235,c)|0,n[Mp>>2]=1,n[Mp+4>>2]=0,n[c>>2]=n[Mp>>2],n[c+4>>2]=n[Mp+4>>2],PF(s,4251,c)|0,n[xl>>2]=4,n[xl+4>>2]=0,n[c>>2]=n[xl>>2],n[c+4>>2]=n[xl+4>>2],zA(s,4263,c)|0,n[Xr>>2]=5,n[Xr+4>>2]=0,n[c>>2]=n[Xr>>2],n[c+4>>2]=n[Xr+4>>2],zA(s,4279,c)|0,n[Op>>2]=6,n[Op+4>>2]=0,n[c>>2]=n[Op>>2],n[c+4>>2]=n[Op+4>>2],zA(s,4293,c)|0,n[Lp>>2]=7,n[Lp+4>>2]=0,n[c>>2]=n[Lp>>2],n[c+4>>2]=n[Lp+4>>2],zA(s,4306,c)|0,n[Np>>2]=8,n[Np+4>>2]=0,n[c>>2]=n[Np>>2],n[c+4>>2]=n[Np+4>>2],zA(s,4323,c)|0,n[Ru>>2]=9,n[Ru+4>>2]=0,n[c>>2]=n[Ru>>2],n[c+4>>2]=n[Ru+4>>2],zA(s,4335,c)|0,n[Fu>>2]=2,n[Fu+4>>2]=0,n[c>>2]=n[Fu>>2],n[c+4>>2]=n[Fu+4>>2],PF(s,4353,c)|0,n[Tp>>2]=12,n[Tp+4>>2]=0,n[c>>2]=n[Tp>>2],n[c+4>>2]=n[Tp+4>>2],Pg(s,4363,c)|0,n[bl>>2]=1,n[bl+4>>2]=0,n[c>>2]=n[bl>>2],n[c+4>>2]=n[bl+4>>2],XA(s,4376,c)|0,n[Rp>>2]=2,n[Rp+4>>2]=0,n[c>>2]=n[Rp>>2],n[c+4>>2]=n[Rp+4>>2],XA(s,4388,c)|0,n[Fp>>2]=13,n[Fp+4>>2]=0,n[c>>2]=n[Fp>>2],n[c+4>>2]=n[Fp+4>>2],Pg(s,4402,c)|0,n[ya>>2]=14,n[ya+4>>2]=0,n[c>>2]=n[ya>>2],n[c+4>>2]=n[ya+4>>2],Pg(s,4411,c)|0,n[yo>>2]=15,n[yo+4>>2]=0,n[c>>2]=n[yo>>2],n[c+4>>2]=n[yo+4>>2],Pg(s,4421,c)|0,n[mo>>2]=16,n[mo+4>>2]=0,n[c>>2]=n[mo>>2],n[c+4>>2]=n[mo+4>>2],Pg(s,4433,c)|0,n[go>>2]=17,n[go+4>>2]=0,n[c>>2]=n[go>>2],n[c+4>>2]=n[go+4>>2],Pg(s,4446,c)|0,n[xn>>2]=18,n[xn+4>>2]=0,n[c>>2]=n[xn>>2],n[c+4>>2]=n[xn+4>>2],Pg(s,4458,c)|0,n[ir>>2]=3,n[ir+4>>2]=0,n[c>>2]=n[ir>>2],n[c+4>>2]=n[ir+4>>2],XA(s,4471,c)|0,n[Nr>>2]=1,n[Nr+4>>2]=0,n[c>>2]=n[Nr>>2],n[c+4>>2]=n[Nr+4>>2],iD(s,4486,c)|0,n[Sr>>2]=10,n[Sr+4>>2]=0,n[c>>2]=n[Sr>>2],n[c+4>>2]=n[Sr+4>>2],zA(s,4496,c)|0,n[Xt>>2]=11,n[Xt+4>>2]=0,n[c>>2]=n[Xt>>2],n[c+4>>2]=n[Xt+4>>2],zA(s,4508,c)|0,n[or>>2]=3,n[or+4>>2]=0,n[c>>2]=n[or>>2],n[c+4>>2]=n[or+4>>2],PF(s,4519,c)|0,n[Mr>>2]=4,n[Mr+4>>2]=0,n[c>>2]=n[Mr>>2],n[c+4>>2]=n[Mr+4>>2],qve(s,4530,c)|0,n[Lt>>2]=19,n[Lt+4>>2]=0,n[c>>2]=n[Lt>>2],n[c+4>>2]=n[Lt+4>>2],Yve(s,4542,c)|0,n[Ge>>2]=12,n[Ge+4>>2]=0,n[c>>2]=n[Ge>>2],n[c+4>>2]=n[Ge+4>>2],Wve(s,4554,c)|0,n[Ue>>2]=13,n[Ue+4>>2]=0,n[c>>2]=n[Ue>>2],n[c+4>>2]=n[Ue+4>>2],Kve(s,4568,c)|0,n[lt>>2]=2,n[lt+4>>2]=0,n[c>>2]=n[lt>>2],n[c+4>>2]=n[lt+4>>2],Vve(s,4578,c)|0,n[Xe>>2]=20,n[Xe+4>>2]=0,n[c>>2]=n[Xe>>2],n[c+4>>2]=n[Xe+4>>2],Jve(s,4587,c)|0,n[et>>2]=22,n[et+4>>2]=0,n[c>>2]=n[et>>2],n[c+4>>2]=n[et+4>>2],Tw(s,4602,c)|0,n[Qe>>2]=23,n[Qe+4>>2]=0,n[c>>2]=n[Qe>>2],n[c+4>>2]=n[Qe+4>>2],Tw(s,4619,c)|0,n[Me>>2]=14,n[Me+4>>2]=0,n[c>>2]=n[Me>>2],n[c+4>>2]=n[Me+4>>2],zve(s,4629,c)|0,n[qe>>2]=1,n[qe+4>>2]=0,n[c>>2]=n[qe>>2],n[c+4>>2]=n[qe+4>>2],Xve(s,4637,c)|0,n[se>>2]=4,n[se+4>>2]=0,n[c>>2]=n[se>>2],n[c+4>>2]=n[se+4>>2],XA(s,4653,c)|0,n[G>>2]=5,n[G+4>>2]=0,n[c>>2]=n[G>>2],n[c+4>>2]=n[G+4>>2],XA(s,4669,c)|0,n[O>>2]=6,n[O+4>>2]=0,n[c>>2]=n[O>>2],n[c+4>>2]=n[O+4>>2],XA(s,4686,c)|0,n[M>>2]=7,n[M+4>>2]=0,n[c>>2]=n[M>>2],n[c+4>>2]=n[M+4>>2],XA(s,4701,c)|0,n[Q>>2]=8,n[Q+4>>2]=0,n[c>>2]=n[Q>>2],n[c+4>>2]=n[Q+4>>2],XA(s,4719,c)|0,n[k>>2]=9,n[k+4>>2]=0,n[c>>2]=n[k>>2],n[c+4>>2]=n[k+4>>2],XA(s,4736,c)|0,n[B>>2]=21,n[B+4>>2]=0,n[c>>2]=n[B>>2],n[c+4>>2]=n[B+4>>2],Zve(s,4754,c)|0,n[m>>2]=2,n[m+4>>2]=0,n[c>>2]=n[m>>2],n[c+4>>2]=n[m+4>>2],iD(s,4772,c)|0,n[d>>2]=3,n[d+4>>2]=0,n[c>>2]=n[d>>2],n[c+4>>2]=n[d+4>>2],iD(s,4790,c)|0,n[f>>2]=4,n[f+4>>2]=0,n[c>>2]=n[f>>2],n[c+4>>2]=n[f+4>>2],iD(s,4808,c)|0,C=l}function Uve(s,l){s=s|0,l=l|0;var c=0;c=iFe()|0,n[s>>2]=c,sFe(c,l),xp(n[s>>2]|0)}function _ve(s,l,c){return s=s|0,l=l|0,c=c|0,qQe(s,pn(l)|0,c,0),s|0}function Hve(s,l,c){return s=s|0,l=l|0,c=c|0,bQe(s,pn(l)|0,c,0),s|0}function jve(s,l,c){return s=s|0,l=l|0,c=c|0,hQe(s,pn(l)|0,c,0),s|0}function Tw(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=n[c+4>>2]|0,n[m>>2]=n[c>>2],n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],Zke(s,l,d),C=f,s|0}function Gve(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=n[c+4>>2]|0,n[m>>2]=n[c>>2],n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],Rke(s,l,d),C=f,s|0}function xu(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=n[c+4>>2]|0,n[m>>2]=n[c>>2],n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],mke(s,l,d),C=f,s|0}function Sg(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=n[c+4>>2]|0,n[m>>2]=n[c>>2],n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],tke(s,l,d),C=f,s|0}function Is(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=n[c+4>>2]|0,n[m>>2]=n[c>>2],n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],Uxe(s,l,d),C=f,s|0}function zA(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=n[c+4>>2]|0,n[m>>2]=n[c>>2],n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],Bxe(s,l,d),C=f,s|0}function PF(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=n[c+4>>2]|0,n[m>>2]=n[c>>2],n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],axe(s,l,d),C=f,s|0}function Pg(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=n[c+4>>2]|0,n[m>>2]=n[c>>2],n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],Rbe(s,l,d),C=f,s|0}function XA(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=n[c+4>>2]|0,n[m>>2]=n[c>>2],n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],mbe(s,l,d),C=f,s|0}function iD(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=n[c+4>>2]|0,n[m>>2]=n[c>>2],n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],tbe(s,l,d),C=f,s|0}function qve(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=n[c+4>>2]|0,n[m>>2]=n[c>>2],n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],UPe(s,l,d),C=f,s|0}function Yve(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=n[c+4>>2]|0,n[m>>2]=n[c>>2],n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],BPe(s,l,d),C=f,s|0}function Wve(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=n[c+4>>2]|0,n[m>>2]=n[c>>2],n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],lPe(s,l,d),C=f,s|0}function Kve(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=n[c+4>>2]|0,n[m>>2]=n[c>>2],n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],KSe(s,l,d),C=f,s|0}function Vve(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=n[c+4>>2]|0,n[m>>2]=n[c>>2],n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],kSe(s,l,d),C=f,s|0}function Jve(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=n[c+4>>2]|0,n[m>>2]=n[c>>2],n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],pSe(s,l,d),C=f,s|0}function zve(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=n[c+4>>2]|0,n[m>>2]=n[c>>2],n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],XDe(s,l,d),C=f,s|0}function Xve(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=n[c+4>>2]|0,n[m>>2]=n[c>>2],n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],RDe(s,l,d),C=f,s|0}function Zve(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=n[c+4>>2]|0,n[m>>2]=n[c>>2],n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],$ve(s,l,d),C=f,s|0}function $ve(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+16|0,d=f+8|0,m=f,k=n[c>>2]|0,B=n[c+4>>2]|0,c=pn(l)|0,n[m>>2]=k,n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],eDe(s,c,d,1),C=f}function pn(s){return s=s|0,s|0}function eDe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0,Q=0,M=0,O=0;d=C,C=C+32|0,m=d+16|0,O=d+8|0,k=d,M=n[c>>2]|0,Q=n[c+4>>2]|0,B=n[s>>2]|0,s=bF()|0,n[O>>2]=M,n[O+4>>2]=Q,n[m>>2]=n[O>>2],n[m+4>>2]=n[O+4>>2],c=tDe(m)|0,n[k>>2]=M,n[k+4>>2]=Q,n[m>>2]=n[k>>2],n[m+4>>2]=n[k+4>>2],hn(B,l,s,c,rDe(m,f)|0,f),C=d}function bF(){var s=0,l=0;if(o[7616]|0||(t9(9136),tr(24,9136,U|0)|0,l=7616,n[l>>2]=1,n[l+4>>2]=0),!(Tr(9136)|0)){s=9136,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));t9(9136)}return 9136}function tDe(s){return s=s|0,0}function rDe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0;return O=C,C=C+32|0,d=O+24|0,B=O+16|0,k=O,Q=O+8|0,m=n[s>>2]|0,f=n[s+4>>2]|0,n[k>>2]=m,n[k+4>>2]=f,G=bF()|0,M=G+24|0,s=gr(l,4)|0,n[Q>>2]=s,l=G+28|0,c=n[l>>2]|0,c>>>0<(n[G+32>>2]|0)>>>0?(n[B>>2]=m,n[B+4>>2]=f,n[d>>2]=n[B>>2],n[d+4>>2]=n[B+4>>2],e9(c,d,s),s=(n[l>>2]|0)+12|0,n[l>>2]=s):(sDe(M,k,Q),s=n[l>>2]|0),C=O,((s-(n[M>>2]|0)|0)/12|0)+-1|0}function hn(s,l,c,f,d,m){s=s|0,l=l|0,c=c|0,f=f|0,d=d|0,m=m|0;var B=0,k=0,Q=0,M=0,O=0,G=0,se=0,qe=0;B=C,C=C+32|0,se=B+24|0,G=B+20|0,Q=B+16|0,O=B+12|0,M=B+8|0,k=B+4|0,qe=B,n[G>>2]=l,n[Q>>2]=c,n[O>>2]=f,n[M>>2]=d,n[k>>2]=m,m=s+28|0,n[qe>>2]=n[m>>2],n[se>>2]=n[qe>>2],nDe(s+24|0,se,G,O,M,Q,k)|0,n[m>>2]=n[n[m>>2]>>2],C=B}function nDe(s,l,c,f,d,m,B){return s=s|0,l=l|0,c=c|0,f=f|0,d=d|0,m=m|0,B=B|0,s=iDe(l)|0,l=Kt(24)|0,$q(l+4|0,n[c>>2]|0,n[f>>2]|0,n[d>>2]|0,n[m>>2]|0,n[B>>2]|0),n[l>>2]=n[s>>2],n[s>>2]=l,l|0}function iDe(s){return s=s|0,n[s>>2]|0}function $q(s,l,c,f,d,m){s=s|0,l=l|0,c=c|0,f=f|0,d=d|0,m=m|0,n[s>>2]=l,n[s+4>>2]=c,n[s+8>>2]=f,n[s+12>>2]=d,n[s+16>>2]=m}function gr(s,l){return s=s|0,l=l|0,l|s|0}function e9(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=n[l+4>>2]|0,n[s>>2]=n[l>>2],n[s+4>>2]=f,n[s+8>>2]=c}function sDe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0;if(M=C,C=C+48|0,f=M+32|0,B=M+24|0,k=M,Q=s+4|0,d=(((n[Q>>2]|0)-(n[s>>2]|0)|0)/12|0)+1|0,m=oDe(s)|0,m>>>0<d>>>0)zr(s);else{O=n[s>>2]|0,se=((n[s+8>>2]|0)-O|0)/12|0,G=se<<1,aDe(k,se>>>0<m>>>1>>>0?G>>>0<d>>>0?d:G:m,((n[Q>>2]|0)-O|0)/12|0,s+8|0),Q=k+8|0,m=n[Q>>2]|0,d=n[l+4>>2]|0,c=n[c>>2]|0,n[B>>2]=n[l>>2],n[B+4>>2]=d,n[f>>2]=n[B>>2],n[f+4>>2]=n[B+4>>2],e9(m,f,c),n[Q>>2]=(n[Q>>2]|0)+12,lDe(s,k),cDe(k),C=M;return}}function oDe(s){return s=s|0,357913941}function aDe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>357913941)Rt();else{d=Kt(l*12|0)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c*12|0)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l*12|0)}function lDe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(((d|0)/-12|0)*12|0)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function cDe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~(((f+-12-l|0)>>>0)/12|0)*12|0)),s=n[s>>2]|0,s|0&&gt(s)}function t9(s){s=s|0,fDe(s)}function uDe(s){s=s|0,ADe(s+24|0)}function Tr(s){return s=s|0,n[s>>2]|0}function ADe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~(((l+-12-f|0)>>>0)/12|0)*12|0)),gt(c))}function fDe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,2,3,l,pDe()|0,0),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function Kr(){return 9228}function pDe(){return 1140}function hDe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0;return c=C,C=C+16|0,f=c+8|0,d=c,m=gDe(s)|0,s=n[m+4>>2]|0,n[d>>2]=n[m>>2],n[d+4>>2]=s,n[f>>2]=n[d>>2],n[f+4>>2]=n[d+4>>2],l=dDe(l,f)|0,C=c,l|0}function Vr(s,l,c,f,d,m){s=s|0,l=l|0,c=c|0,f=f|0,d=d|0,m=m|0,n[s>>2]=l,n[s+4>>2]=c,n[s+8>>2]=f,n[s+12>>2]=d,n[s+16>>2]=m}function gDe(s){return s=s|0,(n[(bF()|0)+24>>2]|0)+(s*12|0)|0}function dDe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0;return d=C,C=C+48|0,f=d,c=n[l>>2]|0,l=n[l+4>>2]|0,s=s+(l>>1)|0,l&1&&(c=n[(n[s>>2]|0)+c>>2]|0),rf[c&31](f,s),f=mDe(f)|0,C=d,f|0}function mDe(s){s=s|0;var l=0,c=0,f=0,d=0;return d=C,C=C+32|0,l=d+12|0,c=d,f=xF(r9()|0)|0,f?(kF(l,f),QF(c,l),yDe(s,c),s=FF(l)|0):s=EDe(s)|0,C=d,s|0}function r9(){var s=0;return o[7632]|0||(xDe(9184),tr(25,9184,U|0)|0,s=7632,n[s>>2]=1,n[s+4>>2]=0),9184}function xF(s){return s=s|0,n[s+36>>2]|0}function kF(s,l){s=s|0,l=l|0,n[s>>2]=l,n[s+4>>2]=s,n[s+8>>2]=0}function QF(s,l){s=s|0,l=l|0,n[s>>2]=n[l>>2],n[s+4>>2]=n[l+4>>2],n[s+8>>2]=0}function yDe(s,l){s=s|0,l=l|0,BDe(l,s,s+8|0,s+16|0,s+24|0,s+32|0,s+40|0)|0}function FF(s){return s=s|0,n[(n[s+4>>2]|0)+8>>2]|0}function EDe(s){s=s|0;var l=0,c=0,f=0,d=0,m=0,B=0,k=0,Q=0;Q=C,C=C+16|0,c=Q+4|0,f=Q,d=Wa(8)|0,m=d,B=Kt(48)|0,k=B,l=k+48|0;do n[k>>2]=n[s>>2],k=k+4|0,s=s+4|0;while((k|0)<(l|0));return l=m+4|0,n[l>>2]=B,k=Kt(8)|0,B=n[l>>2]|0,n[f>>2]=0,n[c>>2]=n[f>>2],n9(k,B,c),n[d>>2]=k,C=Q,m|0}function n9(s,l,c){s=s|0,l=l|0,c=c|0,n[s>>2]=l,c=Kt(16)|0,n[c+4>>2]=0,n[c+8>>2]=0,n[c>>2]=1092,n[c+12>>2]=l,n[s+4>>2]=c}function CDe(s){s=s|0,zm(s),gt(s)}function wDe(s){s=s|0,s=n[s+12>>2]|0,s|0&&gt(s)}function IDe(s){s=s|0,gt(s)}function BDe(s,l,c,f,d,m,B){return s=s|0,l=l|0,c=c|0,f=f|0,d=d|0,m=m|0,B=B|0,m=vDe(n[s>>2]|0,l,c,f,d,m,B)|0,B=s+4|0,n[(n[B>>2]|0)+8>>2]=m,n[(n[B>>2]|0)+8>>2]|0}function vDe(s,l,c,f,d,m,B){s=s|0,l=l|0,c=c|0,f=f|0,d=d|0,m=m|0,B=B|0;var k=0,Q=0;return k=C,C=C+16|0,Q=k,Ka(Q),s=da(s)|0,B=DDe(s,+E[l>>3],+E[c>>3],+E[f>>3],+E[d>>3],+E[m>>3],+E[B>>3])|0,Va(Q),C=k,B|0}function DDe(s,l,c,f,d,m,B){s=s|0,l=+l,c=+c,f=+f,d=+d,m=+m,B=+B;var k=0;return k=Sl(SDe()|0)|0,l=+JA(l),c=+JA(c),f=+JA(f),d=+JA(d),m=+JA(m),Ms(0,k|0,s|0,+l,+c,+f,+d,+m,+ +JA(B))|0}function SDe(){var s=0;return o[7624]|0||(PDe(9172),s=7624,n[s>>2]=1,n[s+4>>2]=0),9172}function PDe(s){s=s|0,Pl(s,bDe()|0,6)}function bDe(){return 1112}function xDe(s){s=s|0,vp(s)}function kDe(s){s=s|0,i9(s+24|0),s9(s+16|0)}function i9(s){s=s|0,FDe(s)}function s9(s){s=s|0,QDe(s)}function QDe(s){s=s|0;var l=0,c=0;if(l=n[s>>2]|0,l|0)do c=l,l=n[l>>2]|0,gt(c);while((l|0)!=0);n[s>>2]=0}function FDe(s){s=s|0;var l=0,c=0;if(l=n[s>>2]|0,l|0)do c=l,l=n[l>>2]|0,gt(c);while((l|0)!=0);n[s>>2]=0}function vp(s){s=s|0;var l=0;n[s+16>>2]=0,n[s+20>>2]=0,l=s+24|0,n[l>>2]=0,n[s+28>>2]=l,n[s+36>>2]=0,o[s+40>>0]=0,o[s+41>>0]=0}function RDe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+16|0,d=f+8|0,m=f,k=n[c>>2]|0,B=n[c+4>>2]|0,c=pn(l)|0,n[m>>2]=k,n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],TDe(s,c,d,0),C=f}function TDe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0,Q=0,M=0,O=0;d=C,C=C+32|0,m=d+16|0,O=d+8|0,k=d,M=n[c>>2]|0,Q=n[c+4>>2]|0,B=n[s>>2]|0,s=RF()|0,n[O>>2]=M,n[O+4>>2]=Q,n[m>>2]=n[O>>2],n[m+4>>2]=n[O+4>>2],c=NDe(m)|0,n[k>>2]=M,n[k+4>>2]=Q,n[m>>2]=n[k>>2],n[m+4>>2]=n[k+4>>2],hn(B,l,s,c,LDe(m,f)|0,f),C=d}function RF(){var s=0,l=0;if(o[7640]|0||(a9(9232),tr(26,9232,U|0)|0,l=7640,n[l>>2]=1,n[l+4>>2]=0),!(Tr(9232)|0)){s=9232,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));a9(9232)}return 9232}function NDe(s){return s=s|0,0}function LDe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0;return O=C,C=C+32|0,d=O+24|0,B=O+16|0,k=O,Q=O+8|0,m=n[s>>2]|0,f=n[s+4>>2]|0,n[k>>2]=m,n[k+4>>2]=f,G=RF()|0,M=G+24|0,s=gr(l,4)|0,n[Q>>2]=s,l=G+28|0,c=n[l>>2]|0,c>>>0<(n[G+32>>2]|0)>>>0?(n[B>>2]=m,n[B+4>>2]=f,n[d>>2]=n[B>>2],n[d+4>>2]=n[B+4>>2],o9(c,d,s),s=(n[l>>2]|0)+12|0,n[l>>2]=s):(ODe(M,k,Q),s=n[l>>2]|0),C=O,((s-(n[M>>2]|0)|0)/12|0)+-1|0}function o9(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=n[l+4>>2]|0,n[s>>2]=n[l>>2],n[s+4>>2]=f,n[s+8>>2]=c}function ODe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0;if(M=C,C=C+48|0,f=M+32|0,B=M+24|0,k=M,Q=s+4|0,d=(((n[Q>>2]|0)-(n[s>>2]|0)|0)/12|0)+1|0,m=MDe(s)|0,m>>>0<d>>>0)zr(s);else{O=n[s>>2]|0,se=((n[s+8>>2]|0)-O|0)/12|0,G=se<<1,UDe(k,se>>>0<m>>>1>>>0?G>>>0<d>>>0?d:G:m,((n[Q>>2]|0)-O|0)/12|0,s+8|0),Q=k+8|0,m=n[Q>>2]|0,d=n[l+4>>2]|0,c=n[c>>2]|0,n[B>>2]=n[l>>2],n[B+4>>2]=d,n[f>>2]=n[B>>2],n[f+4>>2]=n[B+4>>2],o9(m,f,c),n[Q>>2]=(n[Q>>2]|0)+12,_De(s,k),HDe(k),C=M;return}}function MDe(s){return s=s|0,357913941}function UDe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>357913941)Rt();else{d=Kt(l*12|0)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c*12|0)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l*12|0)}function _De(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(((d|0)/-12|0)*12|0)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function HDe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~(((f+-12-l|0)>>>0)/12|0)*12|0)),s=n[s>>2]|0,s|0&&gt(s)}function a9(s){s=s|0,qDe(s)}function jDe(s){s=s|0,GDe(s+24|0)}function GDe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~(((l+-12-f|0)>>>0)/12|0)*12|0)),gt(c))}function qDe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,2,1,l,YDe()|0,3),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function YDe(){return 1144}function WDe(s,l,c,f,d){s=s|0,l=l|0,c=+c,f=+f,d=d|0;var m=0,B=0,k=0,Q=0;m=C,C=C+16|0,B=m+8|0,k=m,Q=KDe(s)|0,s=n[Q+4>>2]|0,n[k>>2]=n[Q>>2],n[k+4>>2]=s,n[B>>2]=n[k>>2],n[B+4>>2]=n[k+4>>2],VDe(l,B,c,f,d),C=m}function KDe(s){return s=s|0,(n[(RF()|0)+24>>2]|0)+(s*12|0)|0}function VDe(s,l,c,f,d){s=s|0,l=l|0,c=+c,f=+f,d=d|0;var m=0,B=0,k=0,Q=0,M=0;M=C,C=C+16|0,B=M+2|0,k=M+1|0,Q=M,m=n[l>>2]|0,l=n[l+4>>2]|0,s=s+(l>>1)|0,l&1&&(m=n[(n[s>>2]|0)+m>>2]|0),ku(B,c),c=+Qu(B,c),ku(k,f),f=+Qu(k,f),ZA(Q,d),Q=$A(Q,d)|0,I7[m&1](s,c,f,Q),C=M}function ku(s,l){s=s|0,l=+l}function Qu(s,l){return s=s|0,l=+l,+ +zDe(l)}function ZA(s,l){s=s|0,l=l|0}function $A(s,l){return s=s|0,l=l|0,JDe(l)|0}function JDe(s){return s=s|0,s|0}function zDe(s){return s=+s,+s}function XDe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+16|0,d=f+8|0,m=f,k=n[c>>2]|0,B=n[c+4>>2]|0,c=pn(l)|0,n[m>>2]=k,n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],ZDe(s,c,d,1),C=f}function ZDe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0,Q=0,M=0,O=0;d=C,C=C+32|0,m=d+16|0,O=d+8|0,k=d,M=n[c>>2]|0,Q=n[c+4>>2]|0,B=n[s>>2]|0,s=TF()|0,n[O>>2]=M,n[O+4>>2]=Q,n[m>>2]=n[O>>2],n[m+4>>2]=n[O+4>>2],c=$De(m)|0,n[k>>2]=M,n[k+4>>2]=Q,n[m>>2]=n[k>>2],n[m+4>>2]=n[k+4>>2],hn(B,l,s,c,eSe(m,f)|0,f),C=d}function TF(){var s=0,l=0;if(o[7648]|0||(c9(9268),tr(27,9268,U|0)|0,l=7648,n[l>>2]=1,n[l+4>>2]=0),!(Tr(9268)|0)){s=9268,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));c9(9268)}return 9268}function $De(s){return s=s|0,0}function eSe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0;return O=C,C=C+32|0,d=O+24|0,B=O+16|0,k=O,Q=O+8|0,m=n[s>>2]|0,f=n[s+4>>2]|0,n[k>>2]=m,n[k+4>>2]=f,G=TF()|0,M=G+24|0,s=gr(l,4)|0,n[Q>>2]=s,l=G+28|0,c=n[l>>2]|0,c>>>0<(n[G+32>>2]|0)>>>0?(n[B>>2]=m,n[B+4>>2]=f,n[d>>2]=n[B>>2],n[d+4>>2]=n[B+4>>2],l9(c,d,s),s=(n[l>>2]|0)+12|0,n[l>>2]=s):(tSe(M,k,Q),s=n[l>>2]|0),C=O,((s-(n[M>>2]|0)|0)/12|0)+-1|0}function l9(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=n[l+4>>2]|0,n[s>>2]=n[l>>2],n[s+4>>2]=f,n[s+8>>2]=c}function tSe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0;if(M=C,C=C+48|0,f=M+32|0,B=M+24|0,k=M,Q=s+4|0,d=(((n[Q>>2]|0)-(n[s>>2]|0)|0)/12|0)+1|0,m=rSe(s)|0,m>>>0<d>>>0)zr(s);else{O=n[s>>2]|0,se=((n[s+8>>2]|0)-O|0)/12|0,G=se<<1,nSe(k,se>>>0<m>>>1>>>0?G>>>0<d>>>0?d:G:m,((n[Q>>2]|0)-O|0)/12|0,s+8|0),Q=k+8|0,m=n[Q>>2]|0,d=n[l+4>>2]|0,c=n[c>>2]|0,n[B>>2]=n[l>>2],n[B+4>>2]=d,n[f>>2]=n[B>>2],n[f+4>>2]=n[B+4>>2],l9(m,f,c),n[Q>>2]=(n[Q>>2]|0)+12,iSe(s,k),sSe(k),C=M;return}}function rSe(s){return s=s|0,357913941}function nSe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>357913941)Rt();else{d=Kt(l*12|0)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c*12|0)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l*12|0)}function iSe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(((d|0)/-12|0)*12|0)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function sSe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~(((f+-12-l|0)>>>0)/12|0)*12|0)),s=n[s>>2]|0,s|0&&gt(s)}function c9(s){s=s|0,lSe(s)}function oSe(s){s=s|0,aSe(s+24|0)}function aSe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~(((l+-12-f|0)>>>0)/12|0)*12|0)),gt(c))}function lSe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,2,4,l,cSe()|0,0),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function cSe(){return 1160}function uSe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0;return c=C,C=C+16|0,f=c+8|0,d=c,m=ASe(s)|0,s=n[m+4>>2]|0,n[d>>2]=n[m>>2],n[d+4>>2]=s,n[f>>2]=n[d>>2],n[f+4>>2]=n[d+4>>2],l=fSe(l,f)|0,C=c,l|0}function ASe(s){return s=s|0,(n[(TF()|0)+24>>2]|0)+(s*12|0)|0}function fSe(s,l){s=s|0,l=l|0;var c=0;return c=n[l>>2]|0,l=n[l+4>>2]|0,s=s+(l>>1)|0,l&1&&(c=n[(n[s>>2]|0)+c>>2]|0),u9(Lg[c&31](s)|0)|0}function u9(s){return s=s|0,s&1|0}function pSe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+16|0,d=f+8|0,m=f,k=n[c>>2]|0,B=n[c+4>>2]|0,c=pn(l)|0,n[m>>2]=k,n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],hSe(s,c,d,0),C=f}function hSe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0,Q=0,M=0,O=0;d=C,C=C+32|0,m=d+16|0,O=d+8|0,k=d,M=n[c>>2]|0,Q=n[c+4>>2]|0,B=n[s>>2]|0,s=NF()|0,n[O>>2]=M,n[O+4>>2]=Q,n[m>>2]=n[O>>2],n[m+4>>2]=n[O+4>>2],c=gSe(m)|0,n[k>>2]=M,n[k+4>>2]=Q,n[m>>2]=n[k>>2],n[m+4>>2]=n[k+4>>2],hn(B,l,s,c,dSe(m,f)|0,f),C=d}function NF(){var s=0,l=0;if(o[7656]|0||(f9(9304),tr(28,9304,U|0)|0,l=7656,n[l>>2]=1,n[l+4>>2]=0),!(Tr(9304)|0)){s=9304,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));f9(9304)}return 9304}function gSe(s){return s=s|0,0}function dSe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0;return O=C,C=C+32|0,d=O+24|0,B=O+16|0,k=O,Q=O+8|0,m=n[s>>2]|0,f=n[s+4>>2]|0,n[k>>2]=m,n[k+4>>2]=f,G=NF()|0,M=G+24|0,s=gr(l,4)|0,n[Q>>2]=s,l=G+28|0,c=n[l>>2]|0,c>>>0<(n[G+32>>2]|0)>>>0?(n[B>>2]=m,n[B+4>>2]=f,n[d>>2]=n[B>>2],n[d+4>>2]=n[B+4>>2],A9(c,d,s),s=(n[l>>2]|0)+12|0,n[l>>2]=s):(mSe(M,k,Q),s=n[l>>2]|0),C=O,((s-(n[M>>2]|0)|0)/12|0)+-1|0}function A9(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=n[l+4>>2]|0,n[s>>2]=n[l>>2],n[s+4>>2]=f,n[s+8>>2]=c}function mSe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0;if(M=C,C=C+48|0,f=M+32|0,B=M+24|0,k=M,Q=s+4|0,d=(((n[Q>>2]|0)-(n[s>>2]|0)|0)/12|0)+1|0,m=ySe(s)|0,m>>>0<d>>>0)zr(s);else{O=n[s>>2]|0,se=((n[s+8>>2]|0)-O|0)/12|0,G=se<<1,ESe(k,se>>>0<m>>>1>>>0?G>>>0<d>>>0?d:G:m,((n[Q>>2]|0)-O|0)/12|0,s+8|0),Q=k+8|0,m=n[Q>>2]|0,d=n[l+4>>2]|0,c=n[c>>2]|0,n[B>>2]=n[l>>2],n[B+4>>2]=d,n[f>>2]=n[B>>2],n[f+4>>2]=n[B+4>>2],A9(m,f,c),n[Q>>2]=(n[Q>>2]|0)+12,CSe(s,k),wSe(k),C=M;return}}function ySe(s){return s=s|0,357913941}function ESe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>357913941)Rt();else{d=Kt(l*12|0)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c*12|0)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l*12|0)}function CSe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(((d|0)/-12|0)*12|0)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function wSe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~(((f+-12-l|0)>>>0)/12|0)*12|0)),s=n[s>>2]|0,s|0&&gt(s)}function f9(s){s=s|0,vSe(s)}function ISe(s){s=s|0,BSe(s+24|0)}function BSe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~(((l+-12-f|0)>>>0)/12|0)*12|0)),gt(c))}function vSe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,2,5,l,DSe()|0,1),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function DSe(){return 1164}function SSe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;f=C,C=C+16|0,d=f+8|0,m=f,B=PSe(s)|0,s=n[B+4>>2]|0,n[m>>2]=n[B>>2],n[m+4>>2]=s,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],bSe(l,d,c),C=f}function PSe(s){return s=s|0,(n[(NF()|0)+24>>2]|0)+(s*12|0)|0}function bSe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0;m=C,C=C+16|0,d=m,f=n[l>>2]|0,l=n[l+4>>2]|0,s=s+(l>>1)|0,l&1&&(f=n[(n[s>>2]|0)+f>>2]|0),Dp(d,c),c=Sp(d,c)|0,rf[f&31](s,c),Pp(d),C=m}function Dp(s,l){s=s|0,l=l|0,xSe(s,l)}function Sp(s,l){return s=s|0,l=l|0,s|0}function Pp(s){s=s|0,GA(s)}function xSe(s,l){s=s|0,l=l|0,LF(s,l)}function LF(s,l){s=s|0,l=l|0,n[s>>2]=l}function kSe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+16|0,d=f+8|0,m=f,k=n[c>>2]|0,B=n[c+4>>2]|0,c=pn(l)|0,n[m>>2]=k,n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],QSe(s,c,d,0),C=f}function QSe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0,Q=0,M=0,O=0;d=C,C=C+32|0,m=d+16|0,O=d+8|0,k=d,M=n[c>>2]|0,Q=n[c+4>>2]|0,B=n[s>>2]|0,s=OF()|0,n[O>>2]=M,n[O+4>>2]=Q,n[m>>2]=n[O>>2],n[m+4>>2]=n[O+4>>2],c=FSe(m)|0,n[k>>2]=M,n[k+4>>2]=Q,n[m>>2]=n[k>>2],n[m+4>>2]=n[k+4>>2],hn(B,l,s,c,RSe(m,f)|0,f),C=d}function OF(){var s=0,l=0;if(o[7664]|0||(h9(9340),tr(29,9340,U|0)|0,l=7664,n[l>>2]=1,n[l+4>>2]=0),!(Tr(9340)|0)){s=9340,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));h9(9340)}return 9340}function FSe(s){return s=s|0,0}function RSe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0;return O=C,C=C+32|0,d=O+24|0,B=O+16|0,k=O,Q=O+8|0,m=n[s>>2]|0,f=n[s+4>>2]|0,n[k>>2]=m,n[k+4>>2]=f,G=OF()|0,M=G+24|0,s=gr(l,4)|0,n[Q>>2]=s,l=G+28|0,c=n[l>>2]|0,c>>>0<(n[G+32>>2]|0)>>>0?(n[B>>2]=m,n[B+4>>2]=f,n[d>>2]=n[B>>2],n[d+4>>2]=n[B+4>>2],p9(c,d,s),s=(n[l>>2]|0)+12|0,n[l>>2]=s):(TSe(M,k,Q),s=n[l>>2]|0),C=O,((s-(n[M>>2]|0)|0)/12|0)+-1|0}function p9(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=n[l+4>>2]|0,n[s>>2]=n[l>>2],n[s+4>>2]=f,n[s+8>>2]=c}function TSe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0;if(M=C,C=C+48|0,f=M+32|0,B=M+24|0,k=M,Q=s+4|0,d=(((n[Q>>2]|0)-(n[s>>2]|0)|0)/12|0)+1|0,m=NSe(s)|0,m>>>0<d>>>0)zr(s);else{O=n[s>>2]|0,se=((n[s+8>>2]|0)-O|0)/12|0,G=se<<1,LSe(k,se>>>0<m>>>1>>>0?G>>>0<d>>>0?d:G:m,((n[Q>>2]|0)-O|0)/12|0,s+8|0),Q=k+8|0,m=n[Q>>2]|0,d=n[l+4>>2]|0,c=n[c>>2]|0,n[B>>2]=n[l>>2],n[B+4>>2]=d,n[f>>2]=n[B>>2],n[f+4>>2]=n[B+4>>2],p9(m,f,c),n[Q>>2]=(n[Q>>2]|0)+12,OSe(s,k),MSe(k),C=M;return}}function NSe(s){return s=s|0,357913941}function LSe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>357913941)Rt();else{d=Kt(l*12|0)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c*12|0)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l*12|0)}function OSe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(((d|0)/-12|0)*12|0)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function MSe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~(((f+-12-l|0)>>>0)/12|0)*12|0)),s=n[s>>2]|0,s|0&&gt(s)}function h9(s){s=s|0,HSe(s)}function USe(s){s=s|0,_Se(s+24|0)}function _Se(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~(((l+-12-f|0)>>>0)/12|0)*12|0)),gt(c))}function HSe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,2,4,l,jSe()|0,1),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function jSe(){return 1180}function GSe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=qSe(s)|0,s=n[B+4>>2]|0,n[m>>2]=n[B>>2],n[m+4>>2]=s,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],c=YSe(l,d,c)|0,C=f,c|0}function qSe(s){return s=s|0,(n[(OF()|0)+24>>2]|0)+(s*12|0)|0}function YSe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0;return m=C,C=C+16|0,d=m,f=n[l>>2]|0,l=n[l+4>>2]|0,s=s+(l>>1)|0,l&1&&(f=n[(n[s>>2]|0)+f>>2]|0),bg(d,c),d=xg(d,c)|0,d=sD(RR[f&15](s,d)|0)|0,C=m,d|0}function bg(s,l){s=s|0,l=l|0}function xg(s,l){return s=s|0,l=l|0,WSe(l)|0}function sD(s){return s=s|0,s|0}function WSe(s){return s=s|0,s|0}function KSe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+16|0,d=f+8|0,m=f,k=n[c>>2]|0,B=n[c+4>>2]|0,c=pn(l)|0,n[m>>2]=k,n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],VSe(s,c,d,0),C=f}function VSe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0,Q=0,M=0,O=0;d=C,C=C+32|0,m=d+16|0,O=d+8|0,k=d,M=n[c>>2]|0,Q=n[c+4>>2]|0,B=n[s>>2]|0,s=MF()|0,n[O>>2]=M,n[O+4>>2]=Q,n[m>>2]=n[O>>2],n[m+4>>2]=n[O+4>>2],c=JSe(m)|0,n[k>>2]=M,n[k+4>>2]=Q,n[m>>2]=n[k>>2],n[m+4>>2]=n[k+4>>2],hn(B,l,s,c,zSe(m,f)|0,f),C=d}function MF(){var s=0,l=0;if(o[7672]|0||(d9(9376),tr(30,9376,U|0)|0,l=7672,n[l>>2]=1,n[l+4>>2]=0),!(Tr(9376)|0)){s=9376,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));d9(9376)}return 9376}function JSe(s){return s=s|0,0}function zSe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0;return O=C,C=C+32|0,d=O+24|0,B=O+16|0,k=O,Q=O+8|0,m=n[s>>2]|0,f=n[s+4>>2]|0,n[k>>2]=m,n[k+4>>2]=f,G=MF()|0,M=G+24|0,s=gr(l,4)|0,n[Q>>2]=s,l=G+28|0,c=n[l>>2]|0,c>>>0<(n[G+32>>2]|0)>>>0?(n[B>>2]=m,n[B+4>>2]=f,n[d>>2]=n[B>>2],n[d+4>>2]=n[B+4>>2],g9(c,d,s),s=(n[l>>2]|0)+12|0,n[l>>2]=s):(XSe(M,k,Q),s=n[l>>2]|0),C=O,((s-(n[M>>2]|0)|0)/12|0)+-1|0}function g9(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=n[l+4>>2]|0,n[s>>2]=n[l>>2],n[s+4>>2]=f,n[s+8>>2]=c}function XSe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0;if(M=C,C=C+48|0,f=M+32|0,B=M+24|0,k=M,Q=s+4|0,d=(((n[Q>>2]|0)-(n[s>>2]|0)|0)/12|0)+1|0,m=ZSe(s)|0,m>>>0<d>>>0)zr(s);else{O=n[s>>2]|0,se=((n[s+8>>2]|0)-O|0)/12|0,G=se<<1,$Se(k,se>>>0<m>>>1>>>0?G>>>0<d>>>0?d:G:m,((n[Q>>2]|0)-O|0)/12|0,s+8|0),Q=k+8|0,m=n[Q>>2]|0,d=n[l+4>>2]|0,c=n[c>>2]|0,n[B>>2]=n[l>>2],n[B+4>>2]=d,n[f>>2]=n[B>>2],n[f+4>>2]=n[B+4>>2],g9(m,f,c),n[Q>>2]=(n[Q>>2]|0)+12,ePe(s,k),tPe(k),C=M;return}}function ZSe(s){return s=s|0,357913941}function $Se(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>357913941)Rt();else{d=Kt(l*12|0)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c*12|0)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l*12|0)}function ePe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(((d|0)/-12|0)*12|0)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function tPe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~(((f+-12-l|0)>>>0)/12|0)*12|0)),s=n[s>>2]|0,s|0&&gt(s)}function d9(s){s=s|0,iPe(s)}function rPe(s){s=s|0,nPe(s+24|0)}function nPe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~(((l+-12-f|0)>>>0)/12|0)*12|0)),gt(c))}function iPe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,2,5,l,m9()|0,0),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function m9(){return 1196}function sPe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0;return c=C,C=C+16|0,f=c+8|0,d=c,m=oPe(s)|0,s=n[m+4>>2]|0,n[d>>2]=n[m>>2],n[d+4>>2]=s,n[f>>2]=n[d>>2],n[f+4>>2]=n[d+4>>2],l=aPe(l,f)|0,C=c,l|0}function oPe(s){return s=s|0,(n[(MF()|0)+24>>2]|0)+(s*12|0)|0}function aPe(s,l){s=s|0,l=l|0;var c=0;return c=n[l>>2]|0,l=n[l+4>>2]|0,s=s+(l>>1)|0,l&1&&(c=n[(n[s>>2]|0)+c>>2]|0),sD(Lg[c&31](s)|0)|0}function lPe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+16|0,d=f+8|0,m=f,k=n[c>>2]|0,B=n[c+4>>2]|0,c=pn(l)|0,n[m>>2]=k,n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],cPe(s,c,d,1),C=f}function cPe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0,Q=0,M=0,O=0;d=C,C=C+32|0,m=d+16|0,O=d+8|0,k=d,M=n[c>>2]|0,Q=n[c+4>>2]|0,B=n[s>>2]|0,s=UF()|0,n[O>>2]=M,n[O+4>>2]=Q,n[m>>2]=n[O>>2],n[m+4>>2]=n[O+4>>2],c=uPe(m)|0,n[k>>2]=M,n[k+4>>2]=Q,n[m>>2]=n[k>>2],n[m+4>>2]=n[k+4>>2],hn(B,l,s,c,APe(m,f)|0,f),C=d}function UF(){var s=0,l=0;if(o[7680]|0||(E9(9412),tr(31,9412,U|0)|0,l=7680,n[l>>2]=1,n[l+4>>2]=0),!(Tr(9412)|0)){s=9412,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));E9(9412)}return 9412}function uPe(s){return s=s|0,0}function APe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0;return O=C,C=C+32|0,d=O+24|0,B=O+16|0,k=O,Q=O+8|0,m=n[s>>2]|0,f=n[s+4>>2]|0,n[k>>2]=m,n[k+4>>2]=f,G=UF()|0,M=G+24|0,s=gr(l,4)|0,n[Q>>2]=s,l=G+28|0,c=n[l>>2]|0,c>>>0<(n[G+32>>2]|0)>>>0?(n[B>>2]=m,n[B+4>>2]=f,n[d>>2]=n[B>>2],n[d+4>>2]=n[B+4>>2],y9(c,d,s),s=(n[l>>2]|0)+12|0,n[l>>2]=s):(fPe(M,k,Q),s=n[l>>2]|0),C=O,((s-(n[M>>2]|0)|0)/12|0)+-1|0}function y9(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=n[l+4>>2]|0,n[s>>2]=n[l>>2],n[s+4>>2]=f,n[s+8>>2]=c}function fPe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0;if(M=C,C=C+48|0,f=M+32|0,B=M+24|0,k=M,Q=s+4|0,d=(((n[Q>>2]|0)-(n[s>>2]|0)|0)/12|0)+1|0,m=pPe(s)|0,m>>>0<d>>>0)zr(s);else{O=n[s>>2]|0,se=((n[s+8>>2]|0)-O|0)/12|0,G=se<<1,hPe(k,se>>>0<m>>>1>>>0?G>>>0<d>>>0?d:G:m,((n[Q>>2]|0)-O|0)/12|0,s+8|0),Q=k+8|0,m=n[Q>>2]|0,d=n[l+4>>2]|0,c=n[c>>2]|0,n[B>>2]=n[l>>2],n[B+4>>2]=d,n[f>>2]=n[B>>2],n[f+4>>2]=n[B+4>>2],y9(m,f,c),n[Q>>2]=(n[Q>>2]|0)+12,gPe(s,k),dPe(k),C=M;return}}function pPe(s){return s=s|0,357913941}function hPe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>357913941)Rt();else{d=Kt(l*12|0)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c*12|0)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l*12|0)}function gPe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(((d|0)/-12|0)*12|0)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function dPe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~(((f+-12-l|0)>>>0)/12|0)*12|0)),s=n[s>>2]|0,s|0&&gt(s)}function E9(s){s=s|0,EPe(s)}function mPe(s){s=s|0,yPe(s+24|0)}function yPe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~(((l+-12-f|0)>>>0)/12|0)*12|0)),gt(c))}function EPe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,2,6,l,C9()|0,0),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function C9(){return 1200}function CPe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0;return c=C,C=C+16|0,f=c+8|0,d=c,m=wPe(s)|0,s=n[m+4>>2]|0,n[d>>2]=n[m>>2],n[d+4>>2]=s,n[f>>2]=n[d>>2],n[f+4>>2]=n[d+4>>2],l=IPe(l,f)|0,C=c,l|0}function wPe(s){return s=s|0,(n[(UF()|0)+24>>2]|0)+(s*12|0)|0}function IPe(s,l){s=s|0,l=l|0;var c=0;return c=n[l>>2]|0,l=n[l+4>>2]|0,s=s+(l>>1)|0,l&1&&(c=n[(n[s>>2]|0)+c>>2]|0),oD(Lg[c&31](s)|0)|0}function oD(s){return s=s|0,s|0}function BPe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+16|0,d=f+8|0,m=f,k=n[c>>2]|0,B=n[c+4>>2]|0,c=pn(l)|0,n[m>>2]=k,n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],vPe(s,c,d,0),C=f}function vPe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0,Q=0,M=0,O=0;d=C,C=C+32|0,m=d+16|0,O=d+8|0,k=d,M=n[c>>2]|0,Q=n[c+4>>2]|0,B=n[s>>2]|0,s=_F()|0,n[O>>2]=M,n[O+4>>2]=Q,n[m>>2]=n[O>>2],n[m+4>>2]=n[O+4>>2],c=DPe(m)|0,n[k>>2]=M,n[k+4>>2]=Q,n[m>>2]=n[k>>2],n[m+4>>2]=n[k+4>>2],hn(B,l,s,c,SPe(m,f)|0,f),C=d}function _F(){var s=0,l=0;if(o[7688]|0||(I9(9448),tr(32,9448,U|0)|0,l=7688,n[l>>2]=1,n[l+4>>2]=0),!(Tr(9448)|0)){s=9448,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));I9(9448)}return 9448}function DPe(s){return s=s|0,0}function SPe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0;return O=C,C=C+32|0,d=O+24|0,B=O+16|0,k=O,Q=O+8|0,m=n[s>>2]|0,f=n[s+4>>2]|0,n[k>>2]=m,n[k+4>>2]=f,G=_F()|0,M=G+24|0,s=gr(l,4)|0,n[Q>>2]=s,l=G+28|0,c=n[l>>2]|0,c>>>0<(n[G+32>>2]|0)>>>0?(n[B>>2]=m,n[B+4>>2]=f,n[d>>2]=n[B>>2],n[d+4>>2]=n[B+4>>2],w9(c,d,s),s=(n[l>>2]|0)+12|0,n[l>>2]=s):(PPe(M,k,Q),s=n[l>>2]|0),C=O,((s-(n[M>>2]|0)|0)/12|0)+-1|0}function w9(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=n[l+4>>2]|0,n[s>>2]=n[l>>2],n[s+4>>2]=f,n[s+8>>2]=c}function PPe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0;if(M=C,C=C+48|0,f=M+32|0,B=M+24|0,k=M,Q=s+4|0,d=(((n[Q>>2]|0)-(n[s>>2]|0)|0)/12|0)+1|0,m=bPe(s)|0,m>>>0<d>>>0)zr(s);else{O=n[s>>2]|0,se=((n[s+8>>2]|0)-O|0)/12|0,G=se<<1,xPe(k,se>>>0<m>>>1>>>0?G>>>0<d>>>0?d:G:m,((n[Q>>2]|0)-O|0)/12|0,s+8|0),Q=k+8|0,m=n[Q>>2]|0,d=n[l+4>>2]|0,c=n[c>>2]|0,n[B>>2]=n[l>>2],n[B+4>>2]=d,n[f>>2]=n[B>>2],n[f+4>>2]=n[B+4>>2],w9(m,f,c),n[Q>>2]=(n[Q>>2]|0)+12,kPe(s,k),QPe(k),C=M;return}}function bPe(s){return s=s|0,357913941}function xPe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>357913941)Rt();else{d=Kt(l*12|0)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c*12|0)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l*12|0)}function kPe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(((d|0)/-12|0)*12|0)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function QPe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~(((f+-12-l|0)>>>0)/12|0)*12|0)),s=n[s>>2]|0,s|0&&gt(s)}function I9(s){s=s|0,TPe(s)}function FPe(s){s=s|0,RPe(s+24|0)}function RPe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~(((l+-12-f|0)>>>0)/12|0)*12|0)),gt(c))}function TPe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,2,6,l,B9()|0,1),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function B9(){return 1204}function NPe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;f=C,C=C+16|0,d=f+8|0,m=f,B=LPe(s)|0,s=n[B+4>>2]|0,n[m>>2]=n[B>>2],n[m+4>>2]=s,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],OPe(l,d,c),C=f}function LPe(s){return s=s|0,(n[(_F()|0)+24>>2]|0)+(s*12|0)|0}function OPe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0;m=C,C=C+16|0,d=m,f=n[l>>2]|0,l=n[l+4>>2]|0,s=s+(l>>1)|0,l&1&&(f=n[(n[s>>2]|0)+f>>2]|0),HF(d,c),d=jF(d,c)|0,rf[f&31](s,d),C=m}function HF(s,l){s=s|0,l=l|0}function jF(s,l){return s=s|0,l=l|0,MPe(l)|0}function MPe(s){return s=s|0,s|0}function UPe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+16|0,d=f+8|0,m=f,k=n[c>>2]|0,B=n[c+4>>2]|0,c=pn(l)|0,n[m>>2]=k,n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],_Pe(s,c,d,0),C=f}function _Pe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0,Q=0,M=0,O=0;d=C,C=C+32|0,m=d+16|0,O=d+8|0,k=d,M=n[c>>2]|0,Q=n[c+4>>2]|0,B=n[s>>2]|0,s=GF()|0,n[O>>2]=M,n[O+4>>2]=Q,n[m>>2]=n[O>>2],n[m+4>>2]=n[O+4>>2],c=HPe(m)|0,n[k>>2]=M,n[k+4>>2]=Q,n[m>>2]=n[k>>2],n[m+4>>2]=n[k+4>>2],hn(B,l,s,c,jPe(m,f)|0,f),C=d}function GF(){var s=0,l=0;if(o[7696]|0||(D9(9484),tr(33,9484,U|0)|0,l=7696,n[l>>2]=1,n[l+4>>2]=0),!(Tr(9484)|0)){s=9484,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));D9(9484)}return 9484}function HPe(s){return s=s|0,0}function jPe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0;return O=C,C=C+32|0,d=O+24|0,B=O+16|0,k=O,Q=O+8|0,m=n[s>>2]|0,f=n[s+4>>2]|0,n[k>>2]=m,n[k+4>>2]=f,G=GF()|0,M=G+24|0,s=gr(l,4)|0,n[Q>>2]=s,l=G+28|0,c=n[l>>2]|0,c>>>0<(n[G+32>>2]|0)>>>0?(n[B>>2]=m,n[B+4>>2]=f,n[d>>2]=n[B>>2],n[d+4>>2]=n[B+4>>2],v9(c,d,s),s=(n[l>>2]|0)+12|0,n[l>>2]=s):(GPe(M,k,Q),s=n[l>>2]|0),C=O,((s-(n[M>>2]|0)|0)/12|0)+-1|0}function v9(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=n[l+4>>2]|0,n[s>>2]=n[l>>2],n[s+4>>2]=f,n[s+8>>2]=c}function GPe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0;if(M=C,C=C+48|0,f=M+32|0,B=M+24|0,k=M,Q=s+4|0,d=(((n[Q>>2]|0)-(n[s>>2]|0)|0)/12|0)+1|0,m=qPe(s)|0,m>>>0<d>>>0)zr(s);else{O=n[s>>2]|0,se=((n[s+8>>2]|0)-O|0)/12|0,G=se<<1,YPe(k,se>>>0<m>>>1>>>0?G>>>0<d>>>0?d:G:m,((n[Q>>2]|0)-O|0)/12|0,s+8|0),Q=k+8|0,m=n[Q>>2]|0,d=n[l+4>>2]|0,c=n[c>>2]|0,n[B>>2]=n[l>>2],n[B+4>>2]=d,n[f>>2]=n[B>>2],n[f+4>>2]=n[B+4>>2],v9(m,f,c),n[Q>>2]=(n[Q>>2]|0)+12,WPe(s,k),KPe(k),C=M;return}}function qPe(s){return s=s|0,357913941}function YPe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>357913941)Rt();else{d=Kt(l*12|0)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c*12|0)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l*12|0)}function WPe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(((d|0)/-12|0)*12|0)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function KPe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~(((f+-12-l|0)>>>0)/12|0)*12|0)),s=n[s>>2]|0,s|0&&gt(s)}function D9(s){s=s|0,zPe(s)}function VPe(s){s=s|0,JPe(s+24|0)}function JPe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~(((l+-12-f|0)>>>0)/12|0)*12|0)),gt(c))}function zPe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,2,1,l,XPe()|0,2),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function XPe(){return 1212}function ZPe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0;d=C,C=C+16|0,m=d+8|0,B=d,k=$Pe(s)|0,s=n[k+4>>2]|0,n[B>>2]=n[k>>2],n[B+4>>2]=s,n[m>>2]=n[B>>2],n[m+4>>2]=n[B+4>>2],ebe(l,m,c,f),C=d}function $Pe(s){return s=s|0,(n[(GF()|0)+24>>2]|0)+(s*12|0)|0}function ebe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0;k=C,C=C+16|0,m=k+1|0,B=k,d=n[l>>2]|0,l=n[l+4>>2]|0,s=s+(l>>1)|0,l&1&&(d=n[(n[s>>2]|0)+d>>2]|0),HF(m,c),m=jF(m,c)|0,bg(B,f),B=xg(B,f)|0,Hw[d&15](s,m,B),C=k}function tbe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+16|0,d=f+8|0,m=f,k=n[c>>2]|0,B=n[c+4>>2]|0,c=pn(l)|0,n[m>>2]=k,n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],rbe(s,c,d,1),C=f}function rbe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0,Q=0,M=0,O=0;d=C,C=C+32|0,m=d+16|0,O=d+8|0,k=d,M=n[c>>2]|0,Q=n[c+4>>2]|0,B=n[s>>2]|0,s=qF()|0,n[O>>2]=M,n[O+4>>2]=Q,n[m>>2]=n[O>>2],n[m+4>>2]=n[O+4>>2],c=nbe(m)|0,n[k>>2]=M,n[k+4>>2]=Q,n[m>>2]=n[k>>2],n[m+4>>2]=n[k+4>>2],hn(B,l,s,c,ibe(m,f)|0,f),C=d}function qF(){var s=0,l=0;if(o[7704]|0||(P9(9520),tr(34,9520,U|0)|0,l=7704,n[l>>2]=1,n[l+4>>2]=0),!(Tr(9520)|0)){s=9520,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));P9(9520)}return 9520}function nbe(s){return s=s|0,0}function ibe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0;return O=C,C=C+32|0,d=O+24|0,B=O+16|0,k=O,Q=O+8|0,m=n[s>>2]|0,f=n[s+4>>2]|0,n[k>>2]=m,n[k+4>>2]=f,G=qF()|0,M=G+24|0,s=gr(l,4)|0,n[Q>>2]=s,l=G+28|0,c=n[l>>2]|0,c>>>0<(n[G+32>>2]|0)>>>0?(n[B>>2]=m,n[B+4>>2]=f,n[d>>2]=n[B>>2],n[d+4>>2]=n[B+4>>2],S9(c,d,s),s=(n[l>>2]|0)+12|0,n[l>>2]=s):(sbe(M,k,Q),s=n[l>>2]|0),C=O,((s-(n[M>>2]|0)|0)/12|0)+-1|0}function S9(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=n[l+4>>2]|0,n[s>>2]=n[l>>2],n[s+4>>2]=f,n[s+8>>2]=c}function sbe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0;if(M=C,C=C+48|0,f=M+32|0,B=M+24|0,k=M,Q=s+4|0,d=(((n[Q>>2]|0)-(n[s>>2]|0)|0)/12|0)+1|0,m=obe(s)|0,m>>>0<d>>>0)zr(s);else{O=n[s>>2]|0,se=((n[s+8>>2]|0)-O|0)/12|0,G=se<<1,abe(k,se>>>0<m>>>1>>>0?G>>>0<d>>>0?d:G:m,((n[Q>>2]|0)-O|0)/12|0,s+8|0),Q=k+8|0,m=n[Q>>2]|0,d=n[l+4>>2]|0,c=n[c>>2]|0,n[B>>2]=n[l>>2],n[B+4>>2]=d,n[f>>2]=n[B>>2],n[f+4>>2]=n[B+4>>2],S9(m,f,c),n[Q>>2]=(n[Q>>2]|0)+12,lbe(s,k),cbe(k),C=M;return}}function obe(s){return s=s|0,357913941}function abe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>357913941)Rt();else{d=Kt(l*12|0)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c*12|0)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l*12|0)}function lbe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(((d|0)/-12|0)*12|0)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function cbe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~(((f+-12-l|0)>>>0)/12|0)*12|0)),s=n[s>>2]|0,s|0&&gt(s)}function P9(s){s=s|0,fbe(s)}function ube(s){s=s|0,Abe(s+24|0)}function Abe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~(((l+-12-f|0)>>>0)/12|0)*12|0)),gt(c))}function fbe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,2,1,l,pbe()|0,1),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function pbe(){return 1224}function hbe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;return d=C,C=C+16|0,m=d+8|0,B=d,k=gbe(s)|0,s=n[k+4>>2]|0,n[B>>2]=n[k>>2],n[B+4>>2]=s,n[m>>2]=n[B>>2],n[m+4>>2]=n[B+4>>2],f=+dbe(l,m,c),C=d,+f}function gbe(s){return s=s|0,(n[(qF()|0)+24>>2]|0)+(s*12|0)|0}function dbe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return m=C,C=C+16|0,d=m,f=n[l>>2]|0,l=n[l+4>>2]|0,s=s+(l>>1)|0,l&1&&(f=n[(n[s>>2]|0)+f>>2]|0),ZA(d,c),d=$A(d,c)|0,B=+SF(+v7[f&7](s,d)),C=m,+B}function mbe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+16|0,d=f+8|0,m=f,k=n[c>>2]|0,B=n[c+4>>2]|0,c=pn(l)|0,n[m>>2]=k,n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],ybe(s,c,d,1),C=f}function ybe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0,Q=0,M=0,O=0;d=C,C=C+32|0,m=d+16|0,O=d+8|0,k=d,M=n[c>>2]|0,Q=n[c+4>>2]|0,B=n[s>>2]|0,s=YF()|0,n[O>>2]=M,n[O+4>>2]=Q,n[m>>2]=n[O>>2],n[m+4>>2]=n[O+4>>2],c=Ebe(m)|0,n[k>>2]=M,n[k+4>>2]=Q,n[m>>2]=n[k>>2],n[m+4>>2]=n[k+4>>2],hn(B,l,s,c,Cbe(m,f)|0,f),C=d}function YF(){var s=0,l=0;if(o[7712]|0||(x9(9556),tr(35,9556,U|0)|0,l=7712,n[l>>2]=1,n[l+4>>2]=0),!(Tr(9556)|0)){s=9556,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));x9(9556)}return 9556}function Ebe(s){return s=s|0,0}function Cbe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0;return O=C,C=C+32|0,d=O+24|0,B=O+16|0,k=O,Q=O+8|0,m=n[s>>2]|0,f=n[s+4>>2]|0,n[k>>2]=m,n[k+4>>2]=f,G=YF()|0,M=G+24|0,s=gr(l,4)|0,n[Q>>2]=s,l=G+28|0,c=n[l>>2]|0,c>>>0<(n[G+32>>2]|0)>>>0?(n[B>>2]=m,n[B+4>>2]=f,n[d>>2]=n[B>>2],n[d+4>>2]=n[B+4>>2],b9(c,d,s),s=(n[l>>2]|0)+12|0,n[l>>2]=s):(wbe(M,k,Q),s=n[l>>2]|0),C=O,((s-(n[M>>2]|0)|0)/12|0)+-1|0}function b9(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=n[l+4>>2]|0,n[s>>2]=n[l>>2],n[s+4>>2]=f,n[s+8>>2]=c}function wbe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0;if(M=C,C=C+48|0,f=M+32|0,B=M+24|0,k=M,Q=s+4|0,d=(((n[Q>>2]|0)-(n[s>>2]|0)|0)/12|0)+1|0,m=Ibe(s)|0,m>>>0<d>>>0)zr(s);else{O=n[s>>2]|0,se=((n[s+8>>2]|0)-O|0)/12|0,G=se<<1,Bbe(k,se>>>0<m>>>1>>>0?G>>>0<d>>>0?d:G:m,((n[Q>>2]|0)-O|0)/12|0,s+8|0),Q=k+8|0,m=n[Q>>2]|0,d=n[l+4>>2]|0,c=n[c>>2]|0,n[B>>2]=n[l>>2],n[B+4>>2]=d,n[f>>2]=n[B>>2],n[f+4>>2]=n[B+4>>2],b9(m,f,c),n[Q>>2]=(n[Q>>2]|0)+12,vbe(s,k),Dbe(k),C=M;return}}function Ibe(s){return s=s|0,357913941}function Bbe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>357913941)Rt();else{d=Kt(l*12|0)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c*12|0)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l*12|0)}function vbe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(((d|0)/-12|0)*12|0)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function Dbe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~(((f+-12-l|0)>>>0)/12|0)*12|0)),s=n[s>>2]|0,s|0&&gt(s)}function x9(s){s=s|0,bbe(s)}function Sbe(s){s=s|0,Pbe(s+24|0)}function Pbe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~(((l+-12-f|0)>>>0)/12|0)*12|0)),gt(c))}function bbe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,2,5,l,xbe()|0,0),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function xbe(){return 1232}function kbe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=Qbe(s)|0,s=n[B+4>>2]|0,n[m>>2]=n[B>>2],n[m+4>>2]=s,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],c=+Fbe(l,d),C=f,+c}function Qbe(s){return s=s|0,(n[(YF()|0)+24>>2]|0)+(s*12|0)|0}function Fbe(s,l){s=s|0,l=l|0;var c=0;return c=n[l>>2]|0,l=n[l+4>>2]|0,s=s+(l>>1)|0,l&1&&(c=n[(n[s>>2]|0)+c>>2]|0),+ +SF(+B7[c&15](s))}function Rbe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+16|0,d=f+8|0,m=f,k=n[c>>2]|0,B=n[c+4>>2]|0,c=pn(l)|0,n[m>>2]=k,n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],Tbe(s,c,d,1),C=f}function Tbe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0,Q=0,M=0,O=0;d=C,C=C+32|0,m=d+16|0,O=d+8|0,k=d,M=n[c>>2]|0,Q=n[c+4>>2]|0,B=n[s>>2]|0,s=WF()|0,n[O>>2]=M,n[O+4>>2]=Q,n[m>>2]=n[O>>2],n[m+4>>2]=n[O+4>>2],c=Nbe(m)|0,n[k>>2]=M,n[k+4>>2]=Q,n[m>>2]=n[k>>2],n[m+4>>2]=n[k+4>>2],hn(B,l,s,c,Lbe(m,f)|0,f),C=d}function WF(){var s=0,l=0;if(o[7720]|0||(Q9(9592),tr(36,9592,U|0)|0,l=7720,n[l>>2]=1,n[l+4>>2]=0),!(Tr(9592)|0)){s=9592,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));Q9(9592)}return 9592}function Nbe(s){return s=s|0,0}function Lbe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0;return O=C,C=C+32|0,d=O+24|0,B=O+16|0,k=O,Q=O+8|0,m=n[s>>2]|0,f=n[s+4>>2]|0,n[k>>2]=m,n[k+4>>2]=f,G=WF()|0,M=G+24|0,s=gr(l,4)|0,n[Q>>2]=s,l=G+28|0,c=n[l>>2]|0,c>>>0<(n[G+32>>2]|0)>>>0?(n[B>>2]=m,n[B+4>>2]=f,n[d>>2]=n[B>>2],n[d+4>>2]=n[B+4>>2],k9(c,d,s),s=(n[l>>2]|0)+12|0,n[l>>2]=s):(Obe(M,k,Q),s=n[l>>2]|0),C=O,((s-(n[M>>2]|0)|0)/12|0)+-1|0}function k9(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=n[l+4>>2]|0,n[s>>2]=n[l>>2],n[s+4>>2]=f,n[s+8>>2]=c}function Obe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0;if(M=C,C=C+48|0,f=M+32|0,B=M+24|0,k=M,Q=s+4|0,d=(((n[Q>>2]|0)-(n[s>>2]|0)|0)/12|0)+1|0,m=Mbe(s)|0,m>>>0<d>>>0)zr(s);else{O=n[s>>2]|0,se=((n[s+8>>2]|0)-O|0)/12|0,G=se<<1,Ube(k,se>>>0<m>>>1>>>0?G>>>0<d>>>0?d:G:m,((n[Q>>2]|0)-O|0)/12|0,s+8|0),Q=k+8|0,m=n[Q>>2]|0,d=n[l+4>>2]|0,c=n[c>>2]|0,n[B>>2]=n[l>>2],n[B+4>>2]=d,n[f>>2]=n[B>>2],n[f+4>>2]=n[B+4>>2],k9(m,f,c),n[Q>>2]=(n[Q>>2]|0)+12,_be(s,k),Hbe(k),C=M;return}}function Mbe(s){return s=s|0,357913941}function Ube(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>357913941)Rt();else{d=Kt(l*12|0)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c*12|0)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l*12|0)}function _be(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(((d|0)/-12|0)*12|0)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function Hbe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~(((f+-12-l|0)>>>0)/12|0)*12|0)),s=n[s>>2]|0,s|0&&gt(s)}function Q9(s){s=s|0,qbe(s)}function jbe(s){s=s|0,Gbe(s+24|0)}function Gbe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~(((l+-12-f|0)>>>0)/12|0)*12|0)),gt(c))}function qbe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,2,7,l,Ybe()|0,0),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function Ybe(){return 1276}function Wbe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0;return c=C,C=C+16|0,f=c+8|0,d=c,m=Kbe(s)|0,s=n[m+4>>2]|0,n[d>>2]=n[m>>2],n[d+4>>2]=s,n[f>>2]=n[d>>2],n[f+4>>2]=n[d+4>>2],l=Vbe(l,f)|0,C=c,l|0}function Kbe(s){return s=s|0,(n[(WF()|0)+24>>2]|0)+(s*12|0)|0}function Vbe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0;return d=C,C=C+16|0,f=d,c=n[l>>2]|0,l=n[l+4>>2]|0,s=s+(l>>1)|0,l&1&&(c=n[(n[s>>2]|0)+c>>2]|0),rf[c&31](f,s),f=F9(f)|0,C=d,f|0}function F9(s){s=s|0;var l=0,c=0,f=0,d=0;return d=C,C=C+32|0,l=d+12|0,c=d,f=xF(R9()|0)|0,f?(kF(l,f),QF(c,l),Jbe(s,c),s=FF(l)|0):s=zbe(s)|0,C=d,s|0}function R9(){var s=0;return o[7736]|0||(oxe(9640),tr(25,9640,U|0)|0,s=7736,n[s>>2]=1,n[s+4>>2]=0),9640}function Jbe(s,l){s=s|0,l=l|0,exe(l,s,s+8|0)|0}function zbe(s){s=s|0;var l=0,c=0,f=0,d=0,m=0,B=0,k=0;return c=C,C=C+16|0,d=c+4|0,B=c,f=Wa(8)|0,l=f,k=Kt(16)|0,n[k>>2]=n[s>>2],n[k+4>>2]=n[s+4>>2],n[k+8>>2]=n[s+8>>2],n[k+12>>2]=n[s+12>>2],m=l+4|0,n[m>>2]=k,s=Kt(8)|0,m=n[m>>2]|0,n[B>>2]=0,n[d>>2]=n[B>>2],KF(s,m,d),n[f>>2]=s,C=c,l|0}function KF(s,l,c){s=s|0,l=l|0,c=c|0,n[s>>2]=l,c=Kt(16)|0,n[c+4>>2]=0,n[c+8>>2]=0,n[c>>2]=1244,n[c+12>>2]=l,n[s+4>>2]=c}function Xbe(s){s=s|0,zm(s),gt(s)}function Zbe(s){s=s|0,s=n[s+12>>2]|0,s|0&&gt(s)}function $be(s){s=s|0,gt(s)}function exe(s,l,c){return s=s|0,l=l|0,c=c|0,l=txe(n[s>>2]|0,l,c)|0,c=s+4|0,n[(n[c>>2]|0)+8>>2]=l,n[(n[c>>2]|0)+8>>2]|0}function txe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0;return f=C,C=C+16|0,d=f,Ka(d),s=da(s)|0,c=rxe(s,n[l>>2]|0,+E[c>>3])|0,Va(d),C=f,c|0}function rxe(s,l,c){s=s|0,l=l|0,c=+c;var f=0;return f=Sl(nxe()|0)|0,l=DF(l)|0,ml(0,f|0,s|0,l|0,+ +JA(c))|0}function nxe(){var s=0;return o[7728]|0||(ixe(9628),s=7728,n[s>>2]=1,n[s+4>>2]=0),9628}function ixe(s){s=s|0,Pl(s,sxe()|0,2)}function sxe(){return 1264}function oxe(s){s=s|0,vp(s)}function axe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+16|0,d=f+8|0,m=f,k=n[c>>2]|0,B=n[c+4>>2]|0,c=pn(l)|0,n[m>>2]=k,n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],lxe(s,c,d,1),C=f}function lxe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0,Q=0,M=0,O=0;d=C,C=C+32|0,m=d+16|0,O=d+8|0,k=d,M=n[c>>2]|0,Q=n[c+4>>2]|0,B=n[s>>2]|0,s=VF()|0,n[O>>2]=M,n[O+4>>2]=Q,n[m>>2]=n[O>>2],n[m+4>>2]=n[O+4>>2],c=cxe(m)|0,n[k>>2]=M,n[k+4>>2]=Q,n[m>>2]=n[k>>2],n[m+4>>2]=n[k+4>>2],hn(B,l,s,c,uxe(m,f)|0,f),C=d}function VF(){var s=0,l=0;if(o[7744]|0||(N9(9684),tr(37,9684,U|0)|0,l=7744,n[l>>2]=1,n[l+4>>2]=0),!(Tr(9684)|0)){s=9684,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));N9(9684)}return 9684}function cxe(s){return s=s|0,0}function uxe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0;return O=C,C=C+32|0,d=O+24|0,B=O+16|0,k=O,Q=O+8|0,m=n[s>>2]|0,f=n[s+4>>2]|0,n[k>>2]=m,n[k+4>>2]=f,G=VF()|0,M=G+24|0,s=gr(l,4)|0,n[Q>>2]=s,l=G+28|0,c=n[l>>2]|0,c>>>0<(n[G+32>>2]|0)>>>0?(n[B>>2]=m,n[B+4>>2]=f,n[d>>2]=n[B>>2],n[d+4>>2]=n[B+4>>2],T9(c,d,s),s=(n[l>>2]|0)+12|0,n[l>>2]=s):(Axe(M,k,Q),s=n[l>>2]|0),C=O,((s-(n[M>>2]|0)|0)/12|0)+-1|0}function T9(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=n[l+4>>2]|0,n[s>>2]=n[l>>2],n[s+4>>2]=f,n[s+8>>2]=c}function Axe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0;if(M=C,C=C+48|0,f=M+32|0,B=M+24|0,k=M,Q=s+4|0,d=(((n[Q>>2]|0)-(n[s>>2]|0)|0)/12|0)+1|0,m=fxe(s)|0,m>>>0<d>>>0)zr(s);else{O=n[s>>2]|0,se=((n[s+8>>2]|0)-O|0)/12|0,G=se<<1,pxe(k,se>>>0<m>>>1>>>0?G>>>0<d>>>0?d:G:m,((n[Q>>2]|0)-O|0)/12|0,s+8|0),Q=k+8|0,m=n[Q>>2]|0,d=n[l+4>>2]|0,c=n[c>>2]|0,n[B>>2]=n[l>>2],n[B+4>>2]=d,n[f>>2]=n[B>>2],n[f+4>>2]=n[B+4>>2],T9(m,f,c),n[Q>>2]=(n[Q>>2]|0)+12,hxe(s,k),gxe(k),C=M;return}}function fxe(s){return s=s|0,357913941}function pxe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>357913941)Rt();else{d=Kt(l*12|0)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c*12|0)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l*12|0)}function hxe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(((d|0)/-12|0)*12|0)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function gxe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~(((f+-12-l|0)>>>0)/12|0)*12|0)),s=n[s>>2]|0,s|0&&gt(s)}function N9(s){s=s|0,yxe(s)}function dxe(s){s=s|0,mxe(s+24|0)}function mxe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~(((l+-12-f|0)>>>0)/12|0)*12|0)),gt(c))}function yxe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,2,5,l,Exe()|0,1),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function Exe(){return 1280}function Cxe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=wxe(s)|0,s=n[B+4>>2]|0,n[m>>2]=n[B>>2],n[m+4>>2]=s,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],c=Ixe(l,d,c)|0,C=f,c|0}function wxe(s){return s=s|0,(n[(VF()|0)+24>>2]|0)+(s*12|0)|0}function Ixe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return B=C,C=C+32|0,d=B,m=B+16|0,f=n[l>>2]|0,l=n[l+4>>2]|0,s=s+(l>>1)|0,l&1&&(f=n[(n[s>>2]|0)+f>>2]|0),ZA(m,c),m=$A(m,c)|0,Hw[f&15](d,s,m),m=F9(d)|0,C=B,m|0}function Bxe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+16|0,d=f+8|0,m=f,k=n[c>>2]|0,B=n[c+4>>2]|0,c=pn(l)|0,n[m>>2]=k,n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],vxe(s,c,d,1),C=f}function vxe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0,Q=0,M=0,O=0;d=C,C=C+32|0,m=d+16|0,O=d+8|0,k=d,M=n[c>>2]|0,Q=n[c+4>>2]|0,B=n[s>>2]|0,s=JF()|0,n[O>>2]=M,n[O+4>>2]=Q,n[m>>2]=n[O>>2],n[m+4>>2]=n[O+4>>2],c=Dxe(m)|0,n[k>>2]=M,n[k+4>>2]=Q,n[m>>2]=n[k>>2],n[m+4>>2]=n[k+4>>2],hn(B,l,s,c,Sxe(m,f)|0,f),C=d}function JF(){var s=0,l=0;if(o[7752]|0||(O9(9720),tr(38,9720,U|0)|0,l=7752,n[l>>2]=1,n[l+4>>2]=0),!(Tr(9720)|0)){s=9720,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));O9(9720)}return 9720}function Dxe(s){return s=s|0,0}function Sxe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0;return O=C,C=C+32|0,d=O+24|0,B=O+16|0,k=O,Q=O+8|0,m=n[s>>2]|0,f=n[s+4>>2]|0,n[k>>2]=m,n[k+4>>2]=f,G=JF()|0,M=G+24|0,s=gr(l,4)|0,n[Q>>2]=s,l=G+28|0,c=n[l>>2]|0,c>>>0<(n[G+32>>2]|0)>>>0?(n[B>>2]=m,n[B+4>>2]=f,n[d>>2]=n[B>>2],n[d+4>>2]=n[B+4>>2],L9(c,d,s),s=(n[l>>2]|0)+12|0,n[l>>2]=s):(Pxe(M,k,Q),s=n[l>>2]|0),C=O,((s-(n[M>>2]|0)|0)/12|0)+-1|0}function L9(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=n[l+4>>2]|0,n[s>>2]=n[l>>2],n[s+4>>2]=f,n[s+8>>2]=c}function Pxe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0;if(M=C,C=C+48|0,f=M+32|0,B=M+24|0,k=M,Q=s+4|0,d=(((n[Q>>2]|0)-(n[s>>2]|0)|0)/12|0)+1|0,m=bxe(s)|0,m>>>0<d>>>0)zr(s);else{O=n[s>>2]|0,se=((n[s+8>>2]|0)-O|0)/12|0,G=se<<1,xxe(k,se>>>0<m>>>1>>>0?G>>>0<d>>>0?d:G:m,((n[Q>>2]|0)-O|0)/12|0,s+8|0),Q=k+8|0,m=n[Q>>2]|0,d=n[l+4>>2]|0,c=n[c>>2]|0,n[B>>2]=n[l>>2],n[B+4>>2]=d,n[f>>2]=n[B>>2],n[f+4>>2]=n[B+4>>2],L9(m,f,c),n[Q>>2]=(n[Q>>2]|0)+12,kxe(s,k),Qxe(k),C=M;return}}function bxe(s){return s=s|0,357913941}function xxe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>357913941)Rt();else{d=Kt(l*12|0)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c*12|0)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l*12|0)}function kxe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(((d|0)/-12|0)*12|0)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function Qxe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~(((f+-12-l|0)>>>0)/12|0)*12|0)),s=n[s>>2]|0,s|0&&gt(s)}function O9(s){s=s|0,Txe(s)}function Fxe(s){s=s|0,Rxe(s+24|0)}function Rxe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~(((l+-12-f|0)>>>0)/12|0)*12|0)),gt(c))}function Txe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,2,8,l,Nxe()|0,0),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function Nxe(){return 1288}function Lxe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0;return c=C,C=C+16|0,f=c+8|0,d=c,m=Oxe(s)|0,s=n[m+4>>2]|0,n[d>>2]=n[m>>2],n[d+4>>2]=s,n[f>>2]=n[d>>2],n[f+4>>2]=n[d+4>>2],l=Mxe(l,f)|0,C=c,l|0}function Oxe(s){return s=s|0,(n[(JF()|0)+24>>2]|0)+(s*12|0)|0}function Mxe(s,l){s=s|0,l=l|0;var c=0;return c=n[l>>2]|0,l=n[l+4>>2]|0,s=s+(l>>1)|0,l&1&&(c=n[(n[s>>2]|0)+c>>2]|0),Zq(Lg[c&31](s)|0)|0}function Uxe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+16|0,d=f+8|0,m=f,k=n[c>>2]|0,B=n[c+4>>2]|0,c=pn(l)|0,n[m>>2]=k,n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],_xe(s,c,d,0),C=f}function _xe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0,Q=0,M=0,O=0;d=C,C=C+32|0,m=d+16|0,O=d+8|0,k=d,M=n[c>>2]|0,Q=n[c+4>>2]|0,B=n[s>>2]|0,s=zF()|0,n[O>>2]=M,n[O+4>>2]=Q,n[m>>2]=n[O>>2],n[m+4>>2]=n[O+4>>2],c=Hxe(m)|0,n[k>>2]=M,n[k+4>>2]=Q,n[m>>2]=n[k>>2],n[m+4>>2]=n[k+4>>2],hn(B,l,s,c,jxe(m,f)|0,f),C=d}function zF(){var s=0,l=0;if(o[7760]|0||(U9(9756),tr(39,9756,U|0)|0,l=7760,n[l>>2]=1,n[l+4>>2]=0),!(Tr(9756)|0)){s=9756,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));U9(9756)}return 9756}function Hxe(s){return s=s|0,0}function jxe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0;return O=C,C=C+32|0,d=O+24|0,B=O+16|0,k=O,Q=O+8|0,m=n[s>>2]|0,f=n[s+4>>2]|0,n[k>>2]=m,n[k+4>>2]=f,G=zF()|0,M=G+24|0,s=gr(l,4)|0,n[Q>>2]=s,l=G+28|0,c=n[l>>2]|0,c>>>0<(n[G+32>>2]|0)>>>0?(n[B>>2]=m,n[B+4>>2]=f,n[d>>2]=n[B>>2],n[d+4>>2]=n[B+4>>2],M9(c,d,s),s=(n[l>>2]|0)+12|0,n[l>>2]=s):(Gxe(M,k,Q),s=n[l>>2]|0),C=O,((s-(n[M>>2]|0)|0)/12|0)+-1|0}function M9(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=n[l+4>>2]|0,n[s>>2]=n[l>>2],n[s+4>>2]=f,n[s+8>>2]=c}function Gxe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0;if(M=C,C=C+48|0,f=M+32|0,B=M+24|0,k=M,Q=s+4|0,d=(((n[Q>>2]|0)-(n[s>>2]|0)|0)/12|0)+1|0,m=qxe(s)|0,m>>>0<d>>>0)zr(s);else{O=n[s>>2]|0,se=((n[s+8>>2]|0)-O|0)/12|0,G=se<<1,Yxe(k,se>>>0<m>>>1>>>0?G>>>0<d>>>0?d:G:m,((n[Q>>2]|0)-O|0)/12|0,s+8|0),Q=k+8|0,m=n[Q>>2]|0,d=n[l+4>>2]|0,c=n[c>>2]|0,n[B>>2]=n[l>>2],n[B+4>>2]=d,n[f>>2]=n[B>>2],n[f+4>>2]=n[B+4>>2],M9(m,f,c),n[Q>>2]=(n[Q>>2]|0)+12,Wxe(s,k),Kxe(k),C=M;return}}function qxe(s){return s=s|0,357913941}function Yxe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>357913941)Rt();else{d=Kt(l*12|0)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c*12|0)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l*12|0)}function Wxe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(((d|0)/-12|0)*12|0)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function Kxe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~(((f+-12-l|0)>>>0)/12|0)*12|0)),s=n[s>>2]|0,s|0&&gt(s)}function U9(s){s=s|0,zxe(s)}function Vxe(s){s=s|0,Jxe(s+24|0)}function Jxe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~(((l+-12-f|0)>>>0)/12|0)*12|0)),gt(c))}function zxe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,2,8,l,Xxe()|0,1),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function Xxe(){return 1292}function Zxe(s,l,c){s=s|0,l=l|0,c=+c;var f=0,d=0,m=0,B=0;f=C,C=C+16|0,d=f+8|0,m=f,B=$xe(s)|0,s=n[B+4>>2]|0,n[m>>2]=n[B>>2],n[m+4>>2]=s,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],eke(l,d,c),C=f}function $xe(s){return s=s|0,(n[(zF()|0)+24>>2]|0)+(s*12|0)|0}function eke(s,l,c){s=s|0,l=l|0,c=+c;var f=0,d=0,m=0;m=C,C=C+16|0,d=m,f=n[l>>2]|0,l=n[l+4>>2]|0,s=s+(l>>1)|0,l&1&&(f=n[(n[s>>2]|0)+f>>2]|0),ku(d,c),c=+Qu(d,c),C7[f&31](s,c),C=m}function tke(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+16|0,d=f+8|0,m=f,k=n[c>>2]|0,B=n[c+4>>2]|0,c=pn(l)|0,n[m>>2]=k,n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],rke(s,c,d,0),C=f}function rke(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0,Q=0,M=0,O=0;d=C,C=C+32|0,m=d+16|0,O=d+8|0,k=d,M=n[c>>2]|0,Q=n[c+4>>2]|0,B=n[s>>2]|0,s=XF()|0,n[O>>2]=M,n[O+4>>2]=Q,n[m>>2]=n[O>>2],n[m+4>>2]=n[O+4>>2],c=nke(m)|0,n[k>>2]=M,n[k+4>>2]=Q,n[m>>2]=n[k>>2],n[m+4>>2]=n[k+4>>2],hn(B,l,s,c,ike(m,f)|0,f),C=d}function XF(){var s=0,l=0;if(o[7768]|0||(H9(9792),tr(40,9792,U|0)|0,l=7768,n[l>>2]=1,n[l+4>>2]=0),!(Tr(9792)|0)){s=9792,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));H9(9792)}return 9792}function nke(s){return s=s|0,0}function ike(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0;return O=C,C=C+32|0,d=O+24|0,B=O+16|0,k=O,Q=O+8|0,m=n[s>>2]|0,f=n[s+4>>2]|0,n[k>>2]=m,n[k+4>>2]=f,G=XF()|0,M=G+24|0,s=gr(l,4)|0,n[Q>>2]=s,l=G+28|0,c=n[l>>2]|0,c>>>0<(n[G+32>>2]|0)>>>0?(n[B>>2]=m,n[B+4>>2]=f,n[d>>2]=n[B>>2],n[d+4>>2]=n[B+4>>2],_9(c,d,s),s=(n[l>>2]|0)+12|0,n[l>>2]=s):(ske(M,k,Q),s=n[l>>2]|0),C=O,((s-(n[M>>2]|0)|0)/12|0)+-1|0}function _9(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=n[l+4>>2]|0,n[s>>2]=n[l>>2],n[s+4>>2]=f,n[s+8>>2]=c}function ske(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0;if(M=C,C=C+48|0,f=M+32|0,B=M+24|0,k=M,Q=s+4|0,d=(((n[Q>>2]|0)-(n[s>>2]|0)|0)/12|0)+1|0,m=oke(s)|0,m>>>0<d>>>0)zr(s);else{O=n[s>>2]|0,se=((n[s+8>>2]|0)-O|0)/12|0,G=se<<1,ake(k,se>>>0<m>>>1>>>0?G>>>0<d>>>0?d:G:m,((n[Q>>2]|0)-O|0)/12|0,s+8|0),Q=k+8|0,m=n[Q>>2]|0,d=n[l+4>>2]|0,c=n[c>>2]|0,n[B>>2]=n[l>>2],n[B+4>>2]=d,n[f>>2]=n[B>>2],n[f+4>>2]=n[B+4>>2],_9(m,f,c),n[Q>>2]=(n[Q>>2]|0)+12,lke(s,k),cke(k),C=M;return}}function oke(s){return s=s|0,357913941}function ake(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>357913941)Rt();else{d=Kt(l*12|0)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c*12|0)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l*12|0)}function lke(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(((d|0)/-12|0)*12|0)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function cke(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~(((f+-12-l|0)>>>0)/12|0)*12|0)),s=n[s>>2]|0,s|0&&gt(s)}function H9(s){s=s|0,fke(s)}function uke(s){s=s|0,Ake(s+24|0)}function Ake(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~(((l+-12-f|0)>>>0)/12|0)*12|0)),gt(c))}function fke(s){s=s|0;var l=0;l=Kr()|0,Vr(s,2,1,l,pke()|0,2),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function pke(){return 1300}function hke(s,l,c,f){s=s|0,l=l|0,c=c|0,f=+f;var d=0,m=0,B=0,k=0;d=C,C=C+16|0,m=d+8|0,B=d,k=gke(s)|0,s=n[k+4>>2]|0,n[B>>2]=n[k>>2],n[B+4>>2]=s,n[m>>2]=n[B>>2],n[m+4>>2]=n[B+4>>2],dke(l,m,c,f),C=d}function gke(s){return s=s|0,(n[(XF()|0)+24>>2]|0)+(s*12|0)|0}function dke(s,l,c,f){s=s|0,l=l|0,c=c|0,f=+f;var d=0,m=0,B=0,k=0;k=C,C=C+16|0,m=k+1|0,B=k,d=n[l>>2]|0,l=n[l+4>>2]|0,s=s+(l>>1)|0,l&1&&(d=n[(n[s>>2]|0)+d>>2]|0),ZA(m,c),m=$A(m,c)|0,ku(B,f),f=+Qu(B,f),b7[d&15](s,m,f),C=k}function mke(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+16|0,d=f+8|0,m=f,k=n[c>>2]|0,B=n[c+4>>2]|0,c=pn(l)|0,n[m>>2]=k,n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],yke(s,c,d,0),C=f}function yke(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0,Q=0,M=0,O=0;d=C,C=C+32|0,m=d+16|0,O=d+8|0,k=d,M=n[c>>2]|0,Q=n[c+4>>2]|0,B=n[s>>2]|0,s=ZF()|0,n[O>>2]=M,n[O+4>>2]=Q,n[m>>2]=n[O>>2],n[m+4>>2]=n[O+4>>2],c=Eke(m)|0,n[k>>2]=M,n[k+4>>2]=Q,n[m>>2]=n[k>>2],n[m+4>>2]=n[k+4>>2],hn(B,l,s,c,Cke(m,f)|0,f),C=d}function ZF(){var s=0,l=0;if(o[7776]|0||(G9(9828),tr(41,9828,U|0)|0,l=7776,n[l>>2]=1,n[l+4>>2]=0),!(Tr(9828)|0)){s=9828,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));G9(9828)}return 9828}function Eke(s){return s=s|0,0}function Cke(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0;return O=C,C=C+32|0,d=O+24|0,B=O+16|0,k=O,Q=O+8|0,m=n[s>>2]|0,f=n[s+4>>2]|0,n[k>>2]=m,n[k+4>>2]=f,G=ZF()|0,M=G+24|0,s=gr(l,4)|0,n[Q>>2]=s,l=G+28|0,c=n[l>>2]|0,c>>>0<(n[G+32>>2]|0)>>>0?(n[B>>2]=m,n[B+4>>2]=f,n[d>>2]=n[B>>2],n[d+4>>2]=n[B+4>>2],j9(c,d,s),s=(n[l>>2]|0)+12|0,n[l>>2]=s):(wke(M,k,Q),s=n[l>>2]|0),C=O,((s-(n[M>>2]|0)|0)/12|0)+-1|0}function j9(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=n[l+4>>2]|0,n[s>>2]=n[l>>2],n[s+4>>2]=f,n[s+8>>2]=c}function wke(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0;if(M=C,C=C+48|0,f=M+32|0,B=M+24|0,k=M,Q=s+4|0,d=(((n[Q>>2]|0)-(n[s>>2]|0)|0)/12|0)+1|0,m=Ike(s)|0,m>>>0<d>>>0)zr(s);else{O=n[s>>2]|0,se=((n[s+8>>2]|0)-O|0)/12|0,G=se<<1,Bke(k,se>>>0<m>>>1>>>0?G>>>0<d>>>0?d:G:m,((n[Q>>2]|0)-O|0)/12|0,s+8|0),Q=k+8|0,m=n[Q>>2]|0,d=n[l+4>>2]|0,c=n[c>>2]|0,n[B>>2]=n[l>>2],n[B+4>>2]=d,n[f>>2]=n[B>>2],n[f+4>>2]=n[B+4>>2],j9(m,f,c),n[Q>>2]=(n[Q>>2]|0)+12,vke(s,k),Dke(k),C=M;return}}function Ike(s){return s=s|0,357913941}function Bke(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>357913941)Rt();else{d=Kt(l*12|0)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c*12|0)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l*12|0)}function vke(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(((d|0)/-12|0)*12|0)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function Dke(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~(((f+-12-l|0)>>>0)/12|0)*12|0)),s=n[s>>2]|0,s|0&&gt(s)}function G9(s){s=s|0,bke(s)}function Ske(s){s=s|0,Pke(s+24|0)}function Pke(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~(((l+-12-f|0)>>>0)/12|0)*12|0)),gt(c))}function bke(s){s=s|0;var l=0;l=Kr()|0,Vr(s,2,7,l,xke()|0,1),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function xke(){return 1312}function kke(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;f=C,C=C+16|0,d=f+8|0,m=f,B=Qke(s)|0,s=n[B+4>>2]|0,n[m>>2]=n[B>>2],n[m+4>>2]=s,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],Fke(l,d,c),C=f}function Qke(s){return s=s|0,(n[(ZF()|0)+24>>2]|0)+(s*12|0)|0}function Fke(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0;m=C,C=C+16|0,d=m,f=n[l>>2]|0,l=n[l+4>>2]|0,s=s+(l>>1)|0,l&1&&(f=n[(n[s>>2]|0)+f>>2]|0),ZA(d,c),d=$A(d,c)|0,rf[f&31](s,d),C=m}function Rke(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+16|0,d=f+8|0,m=f,k=n[c>>2]|0,B=n[c+4>>2]|0,c=pn(l)|0,n[m>>2]=k,n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],Tke(s,c,d,0),C=f}function Tke(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0,Q=0,M=0,O=0;d=C,C=C+32|0,m=d+16|0,O=d+8|0,k=d,M=n[c>>2]|0,Q=n[c+4>>2]|0,B=n[s>>2]|0,s=$F()|0,n[O>>2]=M,n[O+4>>2]=Q,n[m>>2]=n[O>>2],n[m+4>>2]=n[O+4>>2],c=Nke(m)|0,n[k>>2]=M,n[k+4>>2]=Q,n[m>>2]=n[k>>2],n[m+4>>2]=n[k+4>>2],hn(B,l,s,c,Lke(m,f)|0,f),C=d}function $F(){var s=0,l=0;if(o[7784]|0||(Y9(9864),tr(42,9864,U|0)|0,l=7784,n[l>>2]=1,n[l+4>>2]=0),!(Tr(9864)|0)){s=9864,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));Y9(9864)}return 9864}function Nke(s){return s=s|0,0}function Lke(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0;return O=C,C=C+32|0,d=O+24|0,B=O+16|0,k=O,Q=O+8|0,m=n[s>>2]|0,f=n[s+4>>2]|0,n[k>>2]=m,n[k+4>>2]=f,G=$F()|0,M=G+24|0,s=gr(l,4)|0,n[Q>>2]=s,l=G+28|0,c=n[l>>2]|0,c>>>0<(n[G+32>>2]|0)>>>0?(n[B>>2]=m,n[B+4>>2]=f,n[d>>2]=n[B>>2],n[d+4>>2]=n[B+4>>2],q9(c,d,s),s=(n[l>>2]|0)+12|0,n[l>>2]=s):(Oke(M,k,Q),s=n[l>>2]|0),C=O,((s-(n[M>>2]|0)|0)/12|0)+-1|0}function q9(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=n[l+4>>2]|0,n[s>>2]=n[l>>2],n[s+4>>2]=f,n[s+8>>2]=c}function Oke(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0;if(M=C,C=C+48|0,f=M+32|0,B=M+24|0,k=M,Q=s+4|0,d=(((n[Q>>2]|0)-(n[s>>2]|0)|0)/12|0)+1|0,m=Mke(s)|0,m>>>0<d>>>0)zr(s);else{O=n[s>>2]|0,se=((n[s+8>>2]|0)-O|0)/12|0,G=se<<1,Uke(k,se>>>0<m>>>1>>>0?G>>>0<d>>>0?d:G:m,((n[Q>>2]|0)-O|0)/12|0,s+8|0),Q=k+8|0,m=n[Q>>2]|0,d=n[l+4>>2]|0,c=n[c>>2]|0,n[B>>2]=n[l>>2],n[B+4>>2]=d,n[f>>2]=n[B>>2],n[f+4>>2]=n[B+4>>2],q9(m,f,c),n[Q>>2]=(n[Q>>2]|0)+12,_ke(s,k),Hke(k),C=M;return}}function Mke(s){return s=s|0,357913941}function Uke(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>357913941)Rt();else{d=Kt(l*12|0)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c*12|0)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l*12|0)}function _ke(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(((d|0)/-12|0)*12|0)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function Hke(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~(((f+-12-l|0)>>>0)/12|0)*12|0)),s=n[s>>2]|0,s|0&&gt(s)}function Y9(s){s=s|0,qke(s)}function jke(s){s=s|0,Gke(s+24|0)}function Gke(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~(((l+-12-f|0)>>>0)/12|0)*12|0)),gt(c))}function qke(s){s=s|0;var l=0;l=Kr()|0,Vr(s,2,8,l,Yke()|0,1),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function Yke(){return 1320}function Wke(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;f=C,C=C+16|0,d=f+8|0,m=f,B=Kke(s)|0,s=n[B+4>>2]|0,n[m>>2]=n[B>>2],n[m+4>>2]=s,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],Vke(l,d,c),C=f}function Kke(s){return s=s|0,(n[($F()|0)+24>>2]|0)+(s*12|0)|0}function Vke(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0;m=C,C=C+16|0,d=m,f=n[l>>2]|0,l=n[l+4>>2]|0,s=s+(l>>1)|0,l&1&&(f=n[(n[s>>2]|0)+f>>2]|0),Jke(d,c),d=zke(d,c)|0,rf[f&31](s,d),C=m}function Jke(s,l){s=s|0,l=l|0}function zke(s,l){return s=s|0,l=l|0,Xke(l)|0}function Xke(s){return s=s|0,s|0}function Zke(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+16|0,d=f+8|0,m=f,k=n[c>>2]|0,B=n[c+4>>2]|0,c=pn(l)|0,n[m>>2]=k,n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],$ke(s,c,d,0),C=f}function $ke(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0,Q=0,M=0,O=0;d=C,C=C+32|0,m=d+16|0,O=d+8|0,k=d,M=n[c>>2]|0,Q=n[c+4>>2]|0,B=n[s>>2]|0,s=eR()|0,n[O>>2]=M,n[O+4>>2]=Q,n[m>>2]=n[O>>2],n[m+4>>2]=n[O+4>>2],c=eQe(m)|0,n[k>>2]=M,n[k+4>>2]=Q,n[m>>2]=n[k>>2],n[m+4>>2]=n[k+4>>2],hn(B,l,s,c,tQe(m,f)|0,f),C=d}function eR(){var s=0,l=0;if(o[7792]|0||(K9(9900),tr(43,9900,U|0)|0,l=7792,n[l>>2]=1,n[l+4>>2]=0),!(Tr(9900)|0)){s=9900,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));K9(9900)}return 9900}function eQe(s){return s=s|0,0}function tQe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0;return O=C,C=C+32|0,d=O+24|0,B=O+16|0,k=O,Q=O+8|0,m=n[s>>2]|0,f=n[s+4>>2]|0,n[k>>2]=m,n[k+4>>2]=f,G=eR()|0,M=G+24|0,s=gr(l,4)|0,n[Q>>2]=s,l=G+28|0,c=n[l>>2]|0,c>>>0<(n[G+32>>2]|0)>>>0?(n[B>>2]=m,n[B+4>>2]=f,n[d>>2]=n[B>>2],n[d+4>>2]=n[B+4>>2],W9(c,d,s),s=(n[l>>2]|0)+12|0,n[l>>2]=s):(rQe(M,k,Q),s=n[l>>2]|0),C=O,((s-(n[M>>2]|0)|0)/12|0)+-1|0}function W9(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=n[l+4>>2]|0,n[s>>2]=n[l>>2],n[s+4>>2]=f,n[s+8>>2]=c}function rQe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0;if(M=C,C=C+48|0,f=M+32|0,B=M+24|0,k=M,Q=s+4|0,d=(((n[Q>>2]|0)-(n[s>>2]|0)|0)/12|0)+1|0,m=nQe(s)|0,m>>>0<d>>>0)zr(s);else{O=n[s>>2]|0,se=((n[s+8>>2]|0)-O|0)/12|0,G=se<<1,iQe(k,se>>>0<m>>>1>>>0?G>>>0<d>>>0?d:G:m,((n[Q>>2]|0)-O|0)/12|0,s+8|0),Q=k+8|0,m=n[Q>>2]|0,d=n[l+4>>2]|0,c=n[c>>2]|0,n[B>>2]=n[l>>2],n[B+4>>2]=d,n[f>>2]=n[B>>2],n[f+4>>2]=n[B+4>>2],W9(m,f,c),n[Q>>2]=(n[Q>>2]|0)+12,sQe(s,k),oQe(k),C=M;return}}function nQe(s){return s=s|0,357913941}function iQe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>357913941)Rt();else{d=Kt(l*12|0)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c*12|0)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l*12|0)}function sQe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(((d|0)/-12|0)*12|0)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function oQe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~(((f+-12-l|0)>>>0)/12|0)*12|0)),s=n[s>>2]|0,s|0&&gt(s)}function K9(s){s=s|0,cQe(s)}function aQe(s){s=s|0,lQe(s+24|0)}function lQe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~(((l+-12-f|0)>>>0)/12|0)*12|0)),gt(c))}function cQe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,2,22,l,uQe()|0,0),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function uQe(){return 1344}function AQe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0;c=C,C=C+16|0,f=c+8|0,d=c,m=fQe(s)|0,s=n[m+4>>2]|0,n[d>>2]=n[m>>2],n[d+4>>2]=s,n[f>>2]=n[d>>2],n[f+4>>2]=n[d+4>>2],pQe(l,f),C=c}function fQe(s){return s=s|0,(n[(eR()|0)+24>>2]|0)+(s*12|0)|0}function pQe(s,l){s=s|0,l=l|0;var c=0;c=n[l>>2]|0,l=n[l+4>>2]|0,s=s+(l>>1)|0,l&1&&(c=n[(n[s>>2]|0)+c>>2]|0),tf[c&127](s)}function hQe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0;m=n[s>>2]|0,d=tR()|0,s=gQe(c)|0,hn(m,l,d,s,dQe(c,f)|0,f)}function tR(){var s=0,l=0;if(o[7800]|0||(J9(9936),tr(44,9936,U|0)|0,l=7800,n[l>>2]=1,n[l+4>>2]=0),!(Tr(9936)|0)){s=9936,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));J9(9936)}return 9936}function gQe(s){return s=s|0,s|0}function dQe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0;return k=C,C=C+16|0,d=k,m=k+4|0,n[d>>2]=s,Q=tR()|0,B=Q+24|0,l=gr(l,4)|0,n[m>>2]=l,c=Q+28|0,f=n[c>>2]|0,f>>>0<(n[Q+32>>2]|0)>>>0?(V9(f,s,l),l=(n[c>>2]|0)+8|0,n[c>>2]=l):(mQe(B,d,m),l=n[c>>2]|0),C=k,(l-(n[B>>2]|0)>>3)+-1|0}function V9(s,l,c){s=s|0,l=l|0,c=c|0,n[s>>2]=l,n[s+4>>2]=c}function mQe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0;if(k=C,C=C+32|0,d=k,m=s+4|0,B=((n[m>>2]|0)-(n[s>>2]|0)>>3)+1|0,f=yQe(s)|0,f>>>0<B>>>0)zr(s);else{Q=n[s>>2]|0,O=(n[s+8>>2]|0)-Q|0,M=O>>2,EQe(d,O>>3>>>0<f>>>1>>>0?M>>>0<B>>>0?B:M:f,(n[m>>2]|0)-Q>>3,s+8|0),B=d+8|0,V9(n[B>>2]|0,n[l>>2]|0,n[c>>2]|0),n[B>>2]=(n[B>>2]|0)+8,CQe(s,d),wQe(d),C=k;return}}function yQe(s){return s=s|0,536870911}function EQe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>536870911)Rt();else{d=Kt(l<<3)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c<<3)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l<<3)}function CQe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(0-(d>>3)<<3)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function wQe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~((f+-8-l|0)>>>3)<<3)),s=n[s>>2]|0,s|0&&gt(s)}function J9(s){s=s|0,vQe(s)}function IQe(s){s=s|0,BQe(s+24|0)}function BQe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~((l+-8-f|0)>>>3)<<3)),gt(c))}function vQe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,1,23,l,B9()|0,1),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function DQe(s,l){s=s|0,l=l|0,PQe(n[(SQe(s)|0)>>2]|0,l)}function SQe(s){return s=s|0,(n[(tR()|0)+24>>2]|0)+(s<<3)|0}function PQe(s,l){s=s|0,l=l|0;var c=0,f=0;c=C,C=C+16|0,f=c,HF(f,l),l=jF(f,l)|0,tf[s&127](l),C=c}function bQe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0;m=n[s>>2]|0,d=rR()|0,s=xQe(c)|0,hn(m,l,d,s,kQe(c,f)|0,f)}function rR(){var s=0,l=0;if(o[7808]|0||(X9(9972),tr(45,9972,U|0)|0,l=7808,n[l>>2]=1,n[l+4>>2]=0),!(Tr(9972)|0)){s=9972,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));X9(9972)}return 9972}function xQe(s){return s=s|0,s|0}function kQe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0;return k=C,C=C+16|0,d=k,m=k+4|0,n[d>>2]=s,Q=rR()|0,B=Q+24|0,l=gr(l,4)|0,n[m>>2]=l,c=Q+28|0,f=n[c>>2]|0,f>>>0<(n[Q+32>>2]|0)>>>0?(z9(f,s,l),l=(n[c>>2]|0)+8|0,n[c>>2]=l):(QQe(B,d,m),l=n[c>>2]|0),C=k,(l-(n[B>>2]|0)>>3)+-1|0}function z9(s,l,c){s=s|0,l=l|0,c=c|0,n[s>>2]=l,n[s+4>>2]=c}function QQe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0;if(k=C,C=C+32|0,d=k,m=s+4|0,B=((n[m>>2]|0)-(n[s>>2]|0)>>3)+1|0,f=FQe(s)|0,f>>>0<B>>>0)zr(s);else{Q=n[s>>2]|0,O=(n[s+8>>2]|0)-Q|0,M=O>>2,RQe(d,O>>3>>>0<f>>>1>>>0?M>>>0<B>>>0?B:M:f,(n[m>>2]|0)-Q>>3,s+8|0),B=d+8|0,z9(n[B>>2]|0,n[l>>2]|0,n[c>>2]|0),n[B>>2]=(n[B>>2]|0)+8,TQe(s,d),NQe(d),C=k;return}}function FQe(s){return s=s|0,536870911}function RQe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>536870911)Rt();else{d=Kt(l<<3)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c<<3)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l<<3)}function TQe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(0-(d>>3)<<3)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function NQe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~((f+-8-l|0)>>>3)<<3)),s=n[s>>2]|0,s|0&&gt(s)}function X9(s){s=s|0,MQe(s)}function LQe(s){s=s|0,OQe(s+24|0)}function OQe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~((l+-8-f|0)>>>3)<<3)),gt(c))}function MQe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,1,9,l,UQe()|0,1),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function UQe(){return 1348}function _Qe(s,l){return s=s|0,l=l|0,jQe(n[(HQe(s)|0)>>2]|0,l)|0}function HQe(s){return s=s|0,(n[(rR()|0)+24>>2]|0)+(s<<3)|0}function jQe(s,l){s=s|0,l=l|0;var c=0,f=0;return c=C,C=C+16|0,f=c,Z9(f,l),l=$9(f,l)|0,l=sD(Lg[s&31](l)|0)|0,C=c,l|0}function Z9(s,l){s=s|0,l=l|0}function $9(s,l){return s=s|0,l=l|0,GQe(l)|0}function GQe(s){return s=s|0,s|0}function qQe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0;m=n[s>>2]|0,d=nR()|0,s=YQe(c)|0,hn(m,l,d,s,WQe(c,f)|0,f)}function nR(){var s=0,l=0;if(o[7816]|0||(t5(10008),tr(46,10008,U|0)|0,l=7816,n[l>>2]=1,n[l+4>>2]=0),!(Tr(10008)|0)){s=10008,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));t5(10008)}return 10008}function YQe(s){return s=s|0,s|0}function WQe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0;return k=C,C=C+16|0,d=k,m=k+4|0,n[d>>2]=s,Q=nR()|0,B=Q+24|0,l=gr(l,4)|0,n[m>>2]=l,c=Q+28|0,f=n[c>>2]|0,f>>>0<(n[Q+32>>2]|0)>>>0?(e5(f,s,l),l=(n[c>>2]|0)+8|0,n[c>>2]=l):(KQe(B,d,m),l=n[c>>2]|0),C=k,(l-(n[B>>2]|0)>>3)+-1|0}function e5(s,l,c){s=s|0,l=l|0,c=c|0,n[s>>2]=l,n[s+4>>2]=c}function KQe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0;if(k=C,C=C+32|0,d=k,m=s+4|0,B=((n[m>>2]|0)-(n[s>>2]|0)>>3)+1|0,f=VQe(s)|0,f>>>0<B>>>0)zr(s);else{Q=n[s>>2]|0,O=(n[s+8>>2]|0)-Q|0,M=O>>2,JQe(d,O>>3>>>0<f>>>1>>>0?M>>>0<B>>>0?B:M:f,(n[m>>2]|0)-Q>>3,s+8|0),B=d+8|0,e5(n[B>>2]|0,n[l>>2]|0,n[c>>2]|0),n[B>>2]=(n[B>>2]|0)+8,zQe(s,d),XQe(d),C=k;return}}function VQe(s){return s=s|0,536870911}function JQe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>536870911)Rt();else{d=Kt(l<<3)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c<<3)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l<<3)}function zQe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(0-(d>>3)<<3)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function XQe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~((f+-8-l|0)>>>3)<<3)),s=n[s>>2]|0,s|0&&gt(s)}function t5(s){s=s|0,eFe(s)}function ZQe(s){s=s|0,$Qe(s+24|0)}function $Qe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~((l+-8-f|0)>>>3)<<3)),gt(c))}function eFe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,1,15,l,m9()|0,0),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function tFe(s){return s=s|0,nFe(n[(rFe(s)|0)>>2]|0)|0}function rFe(s){return s=s|0,(n[(nR()|0)+24>>2]|0)+(s<<3)|0}function nFe(s){return s=s|0,sD(CD[s&7]()|0)|0}function iFe(){var s=0;return o[7832]|0||(fFe(10052),tr(25,10052,U|0)|0,s=7832,n[s>>2]=1,n[s+4>>2]=0),10052}function sFe(s,l){s=s|0,l=l|0,n[s>>2]=oFe()|0,n[s+4>>2]=aFe()|0,n[s+12>>2]=l,n[s+8>>2]=lFe()|0,n[s+32>>2]=2}function oFe(){return 11709}function aFe(){return 1188}function lFe(){return aD()|0}function cFe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0,(bp(f,896)|0)==512?c|0&&(uFe(c),gt(c)):l|0&&(Su(l),gt(l))}function bp(s,l){return s=s|0,l=l|0,l&s|0}function uFe(s){s=s|0,s=n[s+4>>2]|0,s|0&&kp(s)}function aD(){var s=0;return o[7824]|0||(n[2511]=AFe()|0,n[2512]=0,s=7824,n[s>>2]=1,n[s+4>>2]=0),10044}function AFe(){return 0}function fFe(s){s=s|0,vp(s)}function pFe(s){s=s|0;var l=0,c=0,f=0,d=0,m=0;l=C,C=C+32|0,c=l+24|0,m=l+16|0,d=l+8|0,f=l,hFe(s,4827),gFe(s,4834,3)|0,dFe(s,3682,47)|0,n[m>>2]=9,n[m+4>>2]=0,n[c>>2]=n[m>>2],n[c+4>>2]=n[m+4>>2],mFe(s,4841,c)|0,n[d>>2]=1,n[d+4>>2]=0,n[c>>2]=n[d>>2],n[c+4>>2]=n[d+4>>2],yFe(s,4871,c)|0,n[f>>2]=10,n[f+4>>2]=0,n[c>>2]=n[f>>2],n[c+4>>2]=n[f+4>>2],EFe(s,4891,c)|0,C=l}function hFe(s,l){s=s|0,l=l|0;var c=0;c=XRe()|0,n[s>>2]=c,ZRe(c,l),xp(n[s>>2]|0)}function gFe(s,l,c){return s=s|0,l=l|0,c=c|0,NRe(s,pn(l)|0,c,0),s|0}function dFe(s,l,c){return s=s|0,l=l|0,c=c|0,CRe(s,pn(l)|0,c,0),s|0}function mFe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=n[c+4>>2]|0,n[m>>2]=n[c>>2],n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],tRe(s,l,d),C=f,s|0}function yFe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=n[c+4>>2]|0,n[m>>2]=n[c>>2],n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],LFe(s,l,d),C=f,s|0}function EFe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=n[c+4>>2]|0,n[m>>2]=n[c>>2],n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],CFe(s,l,d),C=f,s|0}function CFe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+16|0,d=f+8|0,m=f,k=n[c>>2]|0,B=n[c+4>>2]|0,c=pn(l)|0,n[m>>2]=k,n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],wFe(s,c,d,1),C=f}function wFe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0,Q=0,M=0,O=0;d=C,C=C+32|0,m=d+16|0,O=d+8|0,k=d,M=n[c>>2]|0,Q=n[c+4>>2]|0,B=n[s>>2]|0,s=iR()|0,n[O>>2]=M,n[O+4>>2]=Q,n[m>>2]=n[O>>2],n[m+4>>2]=n[O+4>>2],c=IFe(m)|0,n[k>>2]=M,n[k+4>>2]=Q,n[m>>2]=n[k>>2],n[m+4>>2]=n[k+4>>2],hn(B,l,s,c,BFe(m,f)|0,f),C=d}function iR(){var s=0,l=0;if(o[7840]|0||(n5(10100),tr(48,10100,U|0)|0,l=7840,n[l>>2]=1,n[l+4>>2]=0),!(Tr(10100)|0)){s=10100,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));n5(10100)}return 10100}function IFe(s){return s=s|0,0}function BFe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0;return O=C,C=C+32|0,d=O+24|0,B=O+16|0,k=O,Q=O+8|0,m=n[s>>2]|0,f=n[s+4>>2]|0,n[k>>2]=m,n[k+4>>2]=f,G=iR()|0,M=G+24|0,s=gr(l,4)|0,n[Q>>2]=s,l=G+28|0,c=n[l>>2]|0,c>>>0<(n[G+32>>2]|0)>>>0?(n[B>>2]=m,n[B+4>>2]=f,n[d>>2]=n[B>>2],n[d+4>>2]=n[B+4>>2],r5(c,d,s),s=(n[l>>2]|0)+12|0,n[l>>2]=s):(vFe(M,k,Q),s=n[l>>2]|0),C=O,((s-(n[M>>2]|0)|0)/12|0)+-1|0}function r5(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=n[l+4>>2]|0,n[s>>2]=n[l>>2],n[s+4>>2]=f,n[s+8>>2]=c}function vFe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0;if(M=C,C=C+48|0,f=M+32|0,B=M+24|0,k=M,Q=s+4|0,d=(((n[Q>>2]|0)-(n[s>>2]|0)|0)/12|0)+1|0,m=DFe(s)|0,m>>>0<d>>>0)zr(s);else{O=n[s>>2]|0,se=((n[s+8>>2]|0)-O|0)/12|0,G=se<<1,SFe(k,se>>>0<m>>>1>>>0?G>>>0<d>>>0?d:G:m,((n[Q>>2]|0)-O|0)/12|0,s+8|0),Q=k+8|0,m=n[Q>>2]|0,d=n[l+4>>2]|0,c=n[c>>2]|0,n[B>>2]=n[l>>2],n[B+4>>2]=d,n[f>>2]=n[B>>2],n[f+4>>2]=n[B+4>>2],r5(m,f,c),n[Q>>2]=(n[Q>>2]|0)+12,PFe(s,k),bFe(k),C=M;return}}function DFe(s){return s=s|0,357913941}function SFe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>357913941)Rt();else{d=Kt(l*12|0)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c*12|0)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l*12|0)}function PFe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(((d|0)/-12|0)*12|0)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function bFe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~(((f+-12-l|0)>>>0)/12|0)*12|0)),s=n[s>>2]|0,s|0&&gt(s)}function n5(s){s=s|0,QFe(s)}function xFe(s){s=s|0,kFe(s+24|0)}function kFe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~(((l+-12-f|0)>>>0)/12|0)*12|0)),gt(c))}function QFe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,2,6,l,FFe()|0,1),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function FFe(){return 1364}function RFe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;return f=C,C=C+16|0,d=f+8|0,m=f,B=TFe(s)|0,s=n[B+4>>2]|0,n[m>>2]=n[B>>2],n[m+4>>2]=s,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],c=NFe(l,d,c)|0,C=f,c|0}function TFe(s){return s=s|0,(n[(iR()|0)+24>>2]|0)+(s*12|0)|0}function NFe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0;return m=C,C=C+16|0,d=m,f=n[l>>2]|0,l=n[l+4>>2]|0,s=s+(l>>1)|0,l&1&&(f=n[(n[s>>2]|0)+f>>2]|0),ZA(d,c),d=$A(d,c)|0,d=u9(RR[f&15](s,d)|0)|0,C=m,d|0}function LFe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+16|0,d=f+8|0,m=f,k=n[c>>2]|0,B=n[c+4>>2]|0,c=pn(l)|0,n[m>>2]=k,n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],OFe(s,c,d,0),C=f}function OFe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0,Q=0,M=0,O=0;d=C,C=C+32|0,m=d+16|0,O=d+8|0,k=d,M=n[c>>2]|0,Q=n[c+4>>2]|0,B=n[s>>2]|0,s=sR()|0,n[O>>2]=M,n[O+4>>2]=Q,n[m>>2]=n[O>>2],n[m+4>>2]=n[O+4>>2],c=MFe(m)|0,n[k>>2]=M,n[k+4>>2]=Q,n[m>>2]=n[k>>2],n[m+4>>2]=n[k+4>>2],hn(B,l,s,c,UFe(m,f)|0,f),C=d}function sR(){var s=0,l=0;if(o[7848]|0||(s5(10136),tr(49,10136,U|0)|0,l=7848,n[l>>2]=1,n[l+4>>2]=0),!(Tr(10136)|0)){s=10136,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));s5(10136)}return 10136}function MFe(s){return s=s|0,0}function UFe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0;return O=C,C=C+32|0,d=O+24|0,B=O+16|0,k=O,Q=O+8|0,m=n[s>>2]|0,f=n[s+4>>2]|0,n[k>>2]=m,n[k+4>>2]=f,G=sR()|0,M=G+24|0,s=gr(l,4)|0,n[Q>>2]=s,l=G+28|0,c=n[l>>2]|0,c>>>0<(n[G+32>>2]|0)>>>0?(n[B>>2]=m,n[B+4>>2]=f,n[d>>2]=n[B>>2],n[d+4>>2]=n[B+4>>2],i5(c,d,s),s=(n[l>>2]|0)+12|0,n[l>>2]=s):(_Fe(M,k,Q),s=n[l>>2]|0),C=O,((s-(n[M>>2]|0)|0)/12|0)+-1|0}function i5(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=n[l+4>>2]|0,n[s>>2]=n[l>>2],n[s+4>>2]=f,n[s+8>>2]=c}function _Fe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0;if(M=C,C=C+48|0,f=M+32|0,B=M+24|0,k=M,Q=s+4|0,d=(((n[Q>>2]|0)-(n[s>>2]|0)|0)/12|0)+1|0,m=HFe(s)|0,m>>>0<d>>>0)zr(s);else{O=n[s>>2]|0,se=((n[s+8>>2]|0)-O|0)/12|0,G=se<<1,jFe(k,se>>>0<m>>>1>>>0?G>>>0<d>>>0?d:G:m,((n[Q>>2]|0)-O|0)/12|0,s+8|0),Q=k+8|0,m=n[Q>>2]|0,d=n[l+4>>2]|0,c=n[c>>2]|0,n[B>>2]=n[l>>2],n[B+4>>2]=d,n[f>>2]=n[B>>2],n[f+4>>2]=n[B+4>>2],i5(m,f,c),n[Q>>2]=(n[Q>>2]|0)+12,GFe(s,k),qFe(k),C=M;return}}function HFe(s){return s=s|0,357913941}function jFe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>357913941)Rt();else{d=Kt(l*12|0)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c*12|0)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l*12|0)}function GFe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(((d|0)/-12|0)*12|0)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function qFe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~(((f+-12-l|0)>>>0)/12|0)*12|0)),s=n[s>>2]|0,s|0&&gt(s)}function s5(s){s=s|0,KFe(s)}function YFe(s){s=s|0,WFe(s+24|0)}function WFe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~(((l+-12-f|0)>>>0)/12|0)*12|0)),gt(c))}function KFe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,2,9,l,VFe()|0,1),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function VFe(){return 1372}function JFe(s,l,c){s=s|0,l=l|0,c=+c;var f=0,d=0,m=0,B=0;f=C,C=C+16|0,d=f+8|0,m=f,B=zFe(s)|0,s=n[B+4>>2]|0,n[m>>2]=n[B>>2],n[m+4>>2]=s,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],XFe(l,d,c),C=f}function zFe(s){return s=s|0,(n[(sR()|0)+24>>2]|0)+(s*12|0)|0}function XFe(s,l,c){s=s|0,l=l|0,c=+c;var f=0,d=0,m=0,B=Ze;m=C,C=C+16|0,d=m,f=n[l>>2]|0,l=n[l+4>>2]|0,s=s+(l>>1)|0,l&1&&(f=n[(n[s>>2]|0)+f>>2]|0),ZFe(d,c),B=y($Fe(d,c)),E7[f&1](s,B),C=m}function ZFe(s,l){s=s|0,l=+l}function $Fe(s,l){return s=s|0,l=+l,y(eRe(l))}function eRe(s){return s=+s,y(s)}function tRe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+16|0,d=f+8|0,m=f,k=n[c>>2]|0,B=n[c+4>>2]|0,c=pn(l)|0,n[m>>2]=k,n[m+4>>2]=B,n[d>>2]=n[m>>2],n[d+4>>2]=n[m+4>>2],rRe(s,c,d,0),C=f}function rRe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0,Q=0,M=0,O=0;d=C,C=C+32|0,m=d+16|0,O=d+8|0,k=d,M=n[c>>2]|0,Q=n[c+4>>2]|0,B=n[s>>2]|0,s=oR()|0,n[O>>2]=M,n[O+4>>2]=Q,n[m>>2]=n[O>>2],n[m+4>>2]=n[O+4>>2],c=nRe(m)|0,n[k>>2]=M,n[k+4>>2]=Q,n[m>>2]=n[k>>2],n[m+4>>2]=n[k+4>>2],hn(B,l,s,c,iRe(m,f)|0,f),C=d}function oR(){var s=0,l=0;if(o[7856]|0||(a5(10172),tr(50,10172,U|0)|0,l=7856,n[l>>2]=1,n[l+4>>2]=0),!(Tr(10172)|0)){s=10172,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));a5(10172)}return 10172}function nRe(s){return s=s|0,0}function iRe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0;return O=C,C=C+32|0,d=O+24|0,B=O+16|0,k=O,Q=O+8|0,m=n[s>>2]|0,f=n[s+4>>2]|0,n[k>>2]=m,n[k+4>>2]=f,G=oR()|0,M=G+24|0,s=gr(l,4)|0,n[Q>>2]=s,l=G+28|0,c=n[l>>2]|0,c>>>0<(n[G+32>>2]|0)>>>0?(n[B>>2]=m,n[B+4>>2]=f,n[d>>2]=n[B>>2],n[d+4>>2]=n[B+4>>2],o5(c,d,s),s=(n[l>>2]|0)+12|0,n[l>>2]=s):(sRe(M,k,Q),s=n[l>>2]|0),C=O,((s-(n[M>>2]|0)|0)/12|0)+-1|0}function o5(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=n[l+4>>2]|0,n[s>>2]=n[l>>2],n[s+4>>2]=f,n[s+8>>2]=c}function sRe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0;if(M=C,C=C+48|0,f=M+32|0,B=M+24|0,k=M,Q=s+4|0,d=(((n[Q>>2]|0)-(n[s>>2]|0)|0)/12|0)+1|0,m=oRe(s)|0,m>>>0<d>>>0)zr(s);else{O=n[s>>2]|0,se=((n[s+8>>2]|0)-O|0)/12|0,G=se<<1,aRe(k,se>>>0<m>>>1>>>0?G>>>0<d>>>0?d:G:m,((n[Q>>2]|0)-O|0)/12|0,s+8|0),Q=k+8|0,m=n[Q>>2]|0,d=n[l+4>>2]|0,c=n[c>>2]|0,n[B>>2]=n[l>>2],n[B+4>>2]=d,n[f>>2]=n[B>>2],n[f+4>>2]=n[B+4>>2],o5(m,f,c),n[Q>>2]=(n[Q>>2]|0)+12,lRe(s,k),cRe(k),C=M;return}}function oRe(s){return s=s|0,357913941}function aRe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>357913941)Rt();else{d=Kt(l*12|0)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c*12|0)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l*12|0)}function lRe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(((d|0)/-12|0)*12|0)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function cRe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~(((f+-12-l|0)>>>0)/12|0)*12|0)),s=n[s>>2]|0,s|0&&gt(s)}function a5(s){s=s|0,fRe(s)}function uRe(s){s=s|0,ARe(s+24|0)}function ARe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~(((l+-12-f|0)>>>0)/12|0)*12|0)),gt(c))}function fRe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,2,3,l,pRe()|0,2),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function pRe(){return 1380}function hRe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0;d=C,C=C+16|0,m=d+8|0,B=d,k=gRe(s)|0,s=n[k+4>>2]|0,n[B>>2]=n[k>>2],n[B+4>>2]=s,n[m>>2]=n[B>>2],n[m+4>>2]=n[B+4>>2],dRe(l,m,c,f),C=d}function gRe(s){return s=s|0,(n[(oR()|0)+24>>2]|0)+(s*12|0)|0}function dRe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0;k=C,C=C+16|0,m=k+1|0,B=k,d=n[l>>2]|0,l=n[l+4>>2]|0,s=s+(l>>1)|0,l&1&&(d=n[(n[s>>2]|0)+d>>2]|0),ZA(m,c),m=$A(m,c)|0,mRe(B,f),B=yRe(B,f)|0,Hw[d&15](s,m,B),C=k}function mRe(s,l){s=s|0,l=l|0}function yRe(s,l){return s=s|0,l=l|0,ERe(l)|0}function ERe(s){return s=s|0,(s|0)!=0|0}function CRe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0;m=n[s>>2]|0,d=aR()|0,s=wRe(c)|0,hn(m,l,d,s,IRe(c,f)|0,f)}function aR(){var s=0,l=0;if(o[7864]|0||(c5(10208),tr(51,10208,U|0)|0,l=7864,n[l>>2]=1,n[l+4>>2]=0),!(Tr(10208)|0)){s=10208,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));c5(10208)}return 10208}function wRe(s){return s=s|0,s|0}function IRe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0;return k=C,C=C+16|0,d=k,m=k+4|0,n[d>>2]=s,Q=aR()|0,B=Q+24|0,l=gr(l,4)|0,n[m>>2]=l,c=Q+28|0,f=n[c>>2]|0,f>>>0<(n[Q+32>>2]|0)>>>0?(l5(f,s,l),l=(n[c>>2]|0)+8|0,n[c>>2]=l):(BRe(B,d,m),l=n[c>>2]|0),C=k,(l-(n[B>>2]|0)>>3)+-1|0}function l5(s,l,c){s=s|0,l=l|0,c=c|0,n[s>>2]=l,n[s+4>>2]=c}function BRe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0;if(k=C,C=C+32|0,d=k,m=s+4|0,B=((n[m>>2]|0)-(n[s>>2]|0)>>3)+1|0,f=vRe(s)|0,f>>>0<B>>>0)zr(s);else{Q=n[s>>2]|0,O=(n[s+8>>2]|0)-Q|0,M=O>>2,DRe(d,O>>3>>>0<f>>>1>>>0?M>>>0<B>>>0?B:M:f,(n[m>>2]|0)-Q>>3,s+8|0),B=d+8|0,l5(n[B>>2]|0,n[l>>2]|0,n[c>>2]|0),n[B>>2]=(n[B>>2]|0)+8,SRe(s,d),PRe(d),C=k;return}}function vRe(s){return s=s|0,536870911}function DRe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>536870911)Rt();else{d=Kt(l<<3)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c<<3)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l<<3)}function SRe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(0-(d>>3)<<3)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function PRe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~((f+-8-l|0)>>>3)<<3)),s=n[s>>2]|0,s|0&&gt(s)}function c5(s){s=s|0,kRe(s)}function bRe(s){s=s|0,xRe(s+24|0)}function xRe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~((l+-8-f|0)>>>3)<<3)),gt(c))}function kRe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,1,24,l,QRe()|0,1),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function QRe(){return 1392}function FRe(s,l){s=s|0,l=l|0,TRe(n[(RRe(s)|0)>>2]|0,l)}function RRe(s){return s=s|0,(n[(aR()|0)+24>>2]|0)+(s<<3)|0}function TRe(s,l){s=s|0,l=l|0;var c=0,f=0;c=C,C=C+16|0,f=c,Z9(f,l),l=$9(f,l)|0,tf[s&127](l),C=c}function NRe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0;m=n[s>>2]|0,d=lR()|0,s=LRe(c)|0,hn(m,l,d,s,ORe(c,f)|0,f)}function lR(){var s=0,l=0;if(o[7872]|0||(A5(10244),tr(52,10244,U|0)|0,l=7872,n[l>>2]=1,n[l+4>>2]=0),!(Tr(10244)|0)){s=10244,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));A5(10244)}return 10244}function LRe(s){return s=s|0,s|0}function ORe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0;return k=C,C=C+16|0,d=k,m=k+4|0,n[d>>2]=s,Q=lR()|0,B=Q+24|0,l=gr(l,4)|0,n[m>>2]=l,c=Q+28|0,f=n[c>>2]|0,f>>>0<(n[Q+32>>2]|0)>>>0?(u5(f,s,l),l=(n[c>>2]|0)+8|0,n[c>>2]=l):(MRe(B,d,m),l=n[c>>2]|0),C=k,(l-(n[B>>2]|0)>>3)+-1|0}function u5(s,l,c){s=s|0,l=l|0,c=c|0,n[s>>2]=l,n[s+4>>2]=c}function MRe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0;if(k=C,C=C+32|0,d=k,m=s+4|0,B=((n[m>>2]|0)-(n[s>>2]|0)>>3)+1|0,f=URe(s)|0,f>>>0<B>>>0)zr(s);else{Q=n[s>>2]|0,O=(n[s+8>>2]|0)-Q|0,M=O>>2,_Re(d,O>>3>>>0<f>>>1>>>0?M>>>0<B>>>0?B:M:f,(n[m>>2]|0)-Q>>3,s+8|0),B=d+8|0,u5(n[B>>2]|0,n[l>>2]|0,n[c>>2]|0),n[B>>2]=(n[B>>2]|0)+8,HRe(s,d),jRe(d),C=k;return}}function URe(s){return s=s|0,536870911}function _Re(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>536870911)Rt();else{d=Kt(l<<3)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c<<3)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l<<3)}function HRe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(0-(d>>3)<<3)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function jRe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~((f+-8-l|0)>>>3)<<3)),s=n[s>>2]|0,s|0&&gt(s)}function A5(s){s=s|0,YRe(s)}function GRe(s){s=s|0,qRe(s+24|0)}function qRe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~((l+-8-f|0)>>>3)<<3)),gt(c))}function YRe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,1,16,l,WRe()|0,0),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function WRe(){return 1400}function KRe(s){return s=s|0,JRe(n[(VRe(s)|0)>>2]|0)|0}function VRe(s){return s=s|0,(n[(lR()|0)+24>>2]|0)+(s<<3)|0}function JRe(s){return s=s|0,zRe(CD[s&7]()|0)|0}function zRe(s){return s=s|0,s|0}function XRe(){var s=0;return o[7880]|0||(iTe(10280),tr(25,10280,U|0)|0,s=7880,n[s>>2]=1,n[s+4>>2]=0),10280}function ZRe(s,l){s=s|0,l=l|0,n[s>>2]=$Re()|0,n[s+4>>2]=eTe()|0,n[s+12>>2]=l,n[s+8>>2]=tTe()|0,n[s+32>>2]=4}function $Re(){return 11711}function eTe(){return 1356}function tTe(){return aD()|0}function rTe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0,(bp(f,896)|0)==512?c|0&&(nTe(c),gt(c)):l|0&&(Dg(l),gt(l))}function nTe(s){s=s|0,s=n[s+4>>2]|0,s|0&&kp(s)}function iTe(s){s=s|0,vp(s)}function sTe(s){s=s|0,oTe(s,4920),aTe(s)|0,lTe(s)|0}function oTe(s,l){s=s|0,l=l|0;var c=0;c=R9()|0,n[s>>2]=c,xTe(c,l),xp(n[s>>2]|0)}function aTe(s){s=s|0;var l=0;return l=n[s>>2]|0,kg(l,ETe()|0),s|0}function lTe(s){s=s|0;var l=0;return l=n[s>>2]|0,kg(l,cTe()|0),s|0}function cTe(){var s=0;return o[7888]|0||(f5(10328),tr(53,10328,U|0)|0,s=7888,n[s>>2]=1,n[s+4>>2]=0),Tr(10328)|0||f5(10328),10328}function kg(s,l){s=s|0,l=l|0,hn(s,0,l,0,0,0)}function f5(s){s=s|0,fTe(s),Qg(s,10)}function uTe(s){s=s|0,ATe(s+24|0)}function ATe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~((l+-8-f|0)>>>3)<<3)),gt(c))}function fTe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,5,1,l,dTe()|0,2),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function pTe(s,l,c){s=s|0,l=l|0,c=+c,hTe(s,l,c)}function Qg(s,l){s=s|0,l=l|0,n[s+20>>2]=l}function hTe(s,l,c){s=s|0,l=l|0,c=+c;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+16|0,m=f+8|0,k=f+13|0,d=f,B=f+12|0,ZA(k,l),n[m>>2]=$A(k,l)|0,ku(B,c),E[d>>3]=+Qu(B,c),gTe(s,m,d),C=f}function gTe(s,l,c){s=s|0,l=l|0,c=c|0,Y(s+8|0,n[l>>2]|0,+E[c>>3]),o[s+24>>0]=1}function dTe(){return 1404}function mTe(s,l){return s=s|0,l=+l,yTe(s,l)|0}function yTe(s,l){s=s|0,l=+l;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0;return f=C,C=C+16|0,m=f+4|0,B=f+8|0,k=f,d=Wa(8)|0,c=d,Q=Kt(16)|0,ZA(m,s),s=$A(m,s)|0,ku(B,l),Y(Q,s,+Qu(B,l)),B=c+4|0,n[B>>2]=Q,s=Kt(8)|0,B=n[B>>2]|0,n[k>>2]=0,n[m>>2]=n[k>>2],KF(s,B,m),n[d>>2]=s,C=f,c|0}function ETe(){var s=0;return o[7896]|0||(p5(10364),tr(54,10364,U|0)|0,s=7896,n[s>>2]=1,n[s+4>>2]=0),Tr(10364)|0||p5(10364),10364}function p5(s){s=s|0,ITe(s),Qg(s,55)}function CTe(s){s=s|0,wTe(s+24|0)}function wTe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~((l+-8-f|0)>>>3)<<3)),gt(c))}function ITe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,5,4,l,STe()|0,0),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function BTe(s){s=s|0,vTe(s)}function vTe(s){s=s|0,DTe(s)}function DTe(s){s=s|0,h5(s+8|0),o[s+24>>0]=1}function h5(s){s=s|0,n[s>>2]=0,E[s+8>>3]=0}function STe(){return 1424}function PTe(){return bTe()|0}function bTe(){var s=0,l=0,c=0,f=0,d=0,m=0,B=0;return l=C,C=C+16|0,d=l+4|0,B=l,c=Wa(8)|0,s=c,f=Kt(16)|0,h5(f),m=s+4|0,n[m>>2]=f,f=Kt(8)|0,m=n[m>>2]|0,n[B>>2]=0,n[d>>2]=n[B>>2],KF(f,m,d),n[c>>2]=f,C=l,s|0}function xTe(s,l){s=s|0,l=l|0,n[s>>2]=kTe()|0,n[s+4>>2]=QTe()|0,n[s+12>>2]=l,n[s+8>>2]=FTe()|0,n[s+32>>2]=5}function kTe(){return 11710}function QTe(){return 1416}function FTe(){return lD()|0}function RTe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0,(bp(f,896)|0)==512?c|0&&(TTe(c),gt(c)):l|0&&gt(l)}function TTe(s){s=s|0,s=n[s+4>>2]|0,s|0&&kp(s)}function lD(){var s=0;return o[7904]|0||(n[2600]=NTe()|0,n[2601]=0,s=7904,n[s>>2]=1,n[s+4>>2]=0),10400}function NTe(){return n[357]|0}function LTe(s){s=s|0,OTe(s,4926),MTe(s)|0}function OTe(s,l){s=s|0,l=l|0;var c=0;c=r9()|0,n[s>>2]=c,JTe(c,l),xp(n[s>>2]|0)}function MTe(s){s=s|0;var l=0;return l=n[s>>2]|0,kg(l,UTe()|0),s|0}function UTe(){var s=0;return o[7912]|0||(g5(10412),tr(56,10412,U|0)|0,s=7912,n[s>>2]=1,n[s+4>>2]=0),Tr(10412)|0||g5(10412),10412}function g5(s){s=s|0,jTe(s),Qg(s,57)}function _Te(s){s=s|0,HTe(s+24|0)}function HTe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~((l+-8-f|0)>>>3)<<3)),gt(c))}function jTe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,5,5,l,WTe()|0,0),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function GTe(s){s=s|0,qTe(s)}function qTe(s){s=s|0,YTe(s)}function YTe(s){s=s|0;var l=0,c=0;l=s+8|0,c=l+48|0;do n[l>>2]=0,l=l+4|0;while((l|0)<(c|0));o[s+56>>0]=1}function WTe(){return 1432}function KTe(){return VTe()|0}function VTe(){var s=0,l=0,c=0,f=0,d=0,m=0,B=0,k=0;B=C,C=C+16|0,s=B+4|0,l=B,c=Wa(8)|0,f=c,d=Kt(48)|0,m=d,k=m+48|0;do n[m>>2]=0,m=m+4|0;while((m|0)<(k|0));return m=f+4|0,n[m>>2]=d,k=Kt(8)|0,m=n[m>>2]|0,n[l>>2]=0,n[s>>2]=n[l>>2],n9(k,m,s),n[c>>2]=k,C=B,f|0}function JTe(s,l){s=s|0,l=l|0,n[s>>2]=zTe()|0,n[s+4>>2]=XTe()|0,n[s+12>>2]=l,n[s+8>>2]=ZTe()|0,n[s+32>>2]=6}function zTe(){return 11704}function XTe(){return 1436}function ZTe(){return lD()|0}function $Te(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0,(bp(f,896)|0)==512?c|0&&(eNe(c),gt(c)):l|0&&gt(l)}function eNe(s){s=s|0,s=n[s+4>>2]|0,s|0&&kp(s)}function tNe(s){s=s|0,rNe(s,4933),nNe(s)|0,iNe(s)|0}function rNe(s,l){s=s|0,l=l|0;var c=0;c=bNe()|0,n[s>>2]=c,xNe(c,l),xp(n[s>>2]|0)}function nNe(s){s=s|0;var l=0;return l=n[s>>2]|0,kg(l,yNe()|0),s|0}function iNe(s){s=s|0;var l=0;return l=n[s>>2]|0,kg(l,sNe()|0),s|0}function sNe(){var s=0;return o[7920]|0||(d5(10452),tr(58,10452,U|0)|0,s=7920,n[s>>2]=1,n[s+4>>2]=0),Tr(10452)|0||d5(10452),10452}function d5(s){s=s|0,lNe(s),Qg(s,1)}function oNe(s){s=s|0,aNe(s+24|0)}function aNe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~((l+-8-f|0)>>>3)<<3)),gt(c))}function lNe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,5,1,l,fNe()|0,2),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function cNe(s,l,c){s=s|0,l=+l,c=+c,uNe(s,l,c)}function uNe(s,l,c){s=s|0,l=+l,c=+c;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+32|0,m=f+8|0,k=f+17|0,d=f,B=f+16|0,ku(k,l),E[m>>3]=+Qu(k,l),ku(B,c),E[d>>3]=+Qu(B,c),ANe(s,m,d),C=f}function ANe(s,l,c){s=s|0,l=l|0,c=c|0,m5(s+8|0,+E[l>>3],+E[c>>3]),o[s+24>>0]=1}function m5(s,l,c){s=s|0,l=+l,c=+c,E[s>>3]=l,E[s+8>>3]=c}function fNe(){return 1472}function pNe(s,l){return s=+s,l=+l,hNe(s,l)|0}function hNe(s,l){s=+s,l=+l;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0;return f=C,C=C+16|0,B=f+4|0,k=f+8|0,Q=f,d=Wa(8)|0,c=d,m=Kt(16)|0,ku(B,s),s=+Qu(B,s),ku(k,l),m5(m,s,+Qu(k,l)),k=c+4|0,n[k>>2]=m,m=Kt(8)|0,k=n[k>>2]|0,n[Q>>2]=0,n[B>>2]=n[Q>>2],y5(m,k,B),n[d>>2]=m,C=f,c|0}function y5(s,l,c){s=s|0,l=l|0,c=c|0,n[s>>2]=l,c=Kt(16)|0,n[c+4>>2]=0,n[c+8>>2]=0,n[c>>2]=1452,n[c+12>>2]=l,n[s+4>>2]=c}function gNe(s){s=s|0,zm(s),gt(s)}function dNe(s){s=s|0,s=n[s+12>>2]|0,s|0&&gt(s)}function mNe(s){s=s|0,gt(s)}function yNe(){var s=0;return o[7928]|0||(E5(10488),tr(59,10488,U|0)|0,s=7928,n[s>>2]=1,n[s+4>>2]=0),Tr(10488)|0||E5(10488),10488}function E5(s){s=s|0,wNe(s),Qg(s,60)}function ENe(s){s=s|0,CNe(s+24|0)}function CNe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~((l+-8-f|0)>>>3)<<3)),gt(c))}function wNe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,5,6,l,DNe()|0,0),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function INe(s){s=s|0,BNe(s)}function BNe(s){s=s|0,vNe(s)}function vNe(s){s=s|0,C5(s+8|0),o[s+24>>0]=1}function C5(s){s=s|0,n[s>>2]=0,n[s+4>>2]=0,n[s+8>>2]=0,n[s+12>>2]=0}function DNe(){return 1492}function SNe(){return PNe()|0}function PNe(){var s=0,l=0,c=0,f=0,d=0,m=0,B=0;return l=C,C=C+16|0,d=l+4|0,B=l,c=Wa(8)|0,s=c,f=Kt(16)|0,C5(f),m=s+4|0,n[m>>2]=f,f=Kt(8)|0,m=n[m>>2]|0,n[B>>2]=0,n[d>>2]=n[B>>2],y5(f,m,d),n[c>>2]=f,C=l,s|0}function bNe(){var s=0;return o[7936]|0||(NNe(10524),tr(25,10524,U|0)|0,s=7936,n[s>>2]=1,n[s+4>>2]=0),10524}function xNe(s,l){s=s|0,l=l|0,n[s>>2]=kNe()|0,n[s+4>>2]=QNe()|0,n[s+12>>2]=l,n[s+8>>2]=FNe()|0,n[s+32>>2]=7}function kNe(){return 11700}function QNe(){return 1484}function FNe(){return lD()|0}function RNe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0,(bp(f,896)|0)==512?c|0&&(TNe(c),gt(c)):l|0&&gt(l)}function TNe(s){s=s|0,s=n[s+4>>2]|0,s|0&&kp(s)}function NNe(s){s=s|0,vp(s)}function LNe(s,l,c){s=s|0,l=l|0,c=c|0,s=pn(l)|0,l=ONe(c)|0,c=MNe(c,0)|0,hLe(s,l,c,cR()|0,0)}function ONe(s){return s=s|0,s|0}function MNe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0;return k=C,C=C+16|0,d=k,m=k+4|0,n[d>>2]=s,Q=cR()|0,B=Q+24|0,l=gr(l,4)|0,n[m>>2]=l,c=Q+28|0,f=n[c>>2]|0,f>>>0<(n[Q+32>>2]|0)>>>0?(I5(f,s,l),l=(n[c>>2]|0)+8|0,n[c>>2]=l):(YNe(B,d,m),l=n[c>>2]|0),C=k,(l-(n[B>>2]|0)>>3)+-1|0}function cR(){var s=0,l=0;if(o[7944]|0||(w5(10568),tr(61,10568,U|0)|0,l=7944,n[l>>2]=1,n[l+4>>2]=0),!(Tr(10568)|0)){s=10568,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));w5(10568)}return 10568}function w5(s){s=s|0,HNe(s)}function UNe(s){s=s|0,_Ne(s+24|0)}function _Ne(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~((l+-8-f|0)>>>3)<<3)),gt(c))}function HNe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,1,17,l,C9()|0,0),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function jNe(s){return s=s|0,qNe(n[(GNe(s)|0)>>2]|0)|0}function GNe(s){return s=s|0,(n[(cR()|0)+24>>2]|0)+(s<<3)|0}function qNe(s){return s=s|0,oD(CD[s&7]()|0)|0}function I5(s,l,c){s=s|0,l=l|0,c=c|0,n[s>>2]=l,n[s+4>>2]=c}function YNe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0;if(k=C,C=C+32|0,d=k,m=s+4|0,B=((n[m>>2]|0)-(n[s>>2]|0)>>3)+1|0,f=WNe(s)|0,f>>>0<B>>>0)zr(s);else{Q=n[s>>2]|0,O=(n[s+8>>2]|0)-Q|0,M=O>>2,KNe(d,O>>3>>>0<f>>>1>>>0?M>>>0<B>>>0?B:M:f,(n[m>>2]|0)-Q>>3,s+8|0),B=d+8|0,I5(n[B>>2]|0,n[l>>2]|0,n[c>>2]|0),n[B>>2]=(n[B>>2]|0)+8,VNe(s,d),JNe(d),C=k;return}}function WNe(s){return s=s|0,536870911}function KNe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>536870911)Rt();else{d=Kt(l<<3)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c<<3)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l<<3)}function VNe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(0-(d>>3)<<3)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function JNe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~((f+-8-l|0)>>>3)<<3)),s=n[s>>2]|0,s|0&&gt(s)}function zNe(){XNe()}function XNe(){ZNe(10604)}function ZNe(s){s=s|0,$Ne(s,4955)}function $Ne(s,l){s=s|0,l=l|0;var c=0;c=eLe()|0,n[s>>2]=c,tLe(c,l),xp(n[s>>2]|0)}function eLe(){var s=0;return o[7952]|0||(uLe(10612),tr(25,10612,U|0)|0,s=7952,n[s>>2]=1,n[s+4>>2]=0),10612}function tLe(s,l){s=s|0,l=l|0,n[s>>2]=sLe()|0,n[s+4>>2]=oLe()|0,n[s+12>>2]=l,n[s+8>>2]=aLe()|0,n[s+32>>2]=8}function xp(s){s=s|0;var l=0,c=0;l=C,C=C+16|0,c=l,Ym()|0,n[c>>2]=s,rLe(10608,c),C=l}function Ym(){return o[11714]|0||(n[2652]=0,tr(62,10608,U|0)|0,o[11714]=1),10608}function rLe(s,l){s=s|0,l=l|0;var c=0;c=Kt(8)|0,n[c+4>>2]=n[l>>2],n[c>>2]=n[s>>2],n[s>>2]=c}function nLe(s){s=s|0,iLe(s)}function iLe(s){s=s|0;var l=0,c=0;if(l=n[s>>2]|0,l|0)do c=l,l=n[l>>2]|0,gt(c);while((l|0)!=0);n[s>>2]=0}function sLe(){return 11715}function oLe(){return 1496}function aLe(){return aD()|0}function lLe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0,(bp(f,896)|0)==512?c|0&&(cLe(c),gt(c)):l|0&&gt(l)}function cLe(s){s=s|0,s=n[s+4>>2]|0,s|0&&kp(s)}function uLe(s){s=s|0,vp(s)}function ALe(s,l){s=s|0,l=l|0;var c=0,f=0;Ym()|0,c=n[2652]|0;e:do if(c|0){for(;f=n[c+4>>2]|0,!(f|0&&(n7(uR(f)|0,s)|0)==0);)if(c=n[c>>2]|0,!c)break e;fLe(f,l)}while(0)}function uR(s){return s=s|0,n[s+12>>2]|0}function fLe(s,l){s=s|0,l=l|0;var c=0;s=s+36|0,c=n[s>>2]|0,c|0&&(GA(c),gt(c)),c=Kt(4)|0,zq(c,l),n[s>>2]=c}function AR(){return o[11716]|0||(n[2664]=0,tr(63,10656,U|0)|0,o[11716]=1),10656}function B5(){var s=0;return o[11717]|0?s=n[2665]|0:(pLe(),n[2665]=1504,o[11717]=1,s=1504),s|0}function pLe(){o[11740]|0||(o[11718]=gr(gr(8,0)|0,0)|0,o[11719]=gr(gr(0,0)|0,0)|0,o[11720]=gr(gr(0,16)|0,0)|0,o[11721]=gr(gr(8,0)|0,0)|0,o[11722]=gr(gr(0,0)|0,0)|0,o[11723]=gr(gr(8,0)|0,0)|0,o[11724]=gr(gr(0,0)|0,0)|0,o[11725]=gr(gr(8,0)|0,0)|0,o[11726]=gr(gr(0,0)|0,0)|0,o[11727]=gr(gr(8,0)|0,0)|0,o[11728]=gr(gr(0,0)|0,0)|0,o[11729]=gr(gr(0,0)|0,32)|0,o[11730]=gr(gr(0,0)|0,32)|0,o[11740]=1)}function v5(){return 1572}function hLe(s,l,c,f,d){s=s|0,l=l|0,c=c|0,f=f|0,d=d|0;var m=0,B=0,k=0,Q=0,M=0,O=0;m=C,C=C+32|0,O=m+16|0,M=m+12|0,Q=m+8|0,k=m+4|0,B=m,n[O>>2]=s,n[M>>2]=l,n[Q>>2]=c,n[k>>2]=f,n[B>>2]=d,AR()|0,gLe(10656,O,M,Q,k,B),C=m}function gLe(s,l,c,f,d,m){s=s|0,l=l|0,c=c|0,f=f|0,d=d|0,m=m|0;var B=0;B=Kt(24)|0,$q(B+4|0,n[l>>2]|0,n[c>>2]|0,n[f>>2]|0,n[d>>2]|0,n[m>>2]|0),n[B>>2]=n[s>>2],n[s>>2]=B}function D5(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0,qe=0,Me=0,Qe=0,et=0,Xe=0,lt=0;if(lt=C,C=C+32|0,Me=lt+20|0,Qe=lt+8|0,et=lt+4|0,Xe=lt,l=n[l>>2]|0,l|0){qe=Me+4|0,Q=Me+8|0,M=Qe+4|0,O=Qe+8|0,G=Qe+8|0,se=Me+8|0;do{if(B=l+4|0,k=fR(B)|0,k|0){if(d=Nw(k)|0,n[Me>>2]=0,n[qe>>2]=0,n[Q>>2]=0,f=(Lw(k)|0)+1|0,dLe(Me,f),f|0)for(;f=f+-1|0,bc(Qe,n[d>>2]|0),m=n[qe>>2]|0,m>>>0<(n[se>>2]|0)>>>0?(n[m>>2]=n[Qe>>2],n[qe>>2]=(n[qe>>2]|0)+4):pR(Me,Qe),f;)d=d+4|0;f=Ow(k)|0,n[Qe>>2]=0,n[M>>2]=0,n[O>>2]=0;e:do if(n[f>>2]|0)for(d=0,m=0;;){if((d|0)==(m|0)?mLe(Qe,f):(n[d>>2]=n[f>>2],n[M>>2]=(n[M>>2]|0)+4),f=f+4|0,!(n[f>>2]|0))break e;d=n[M>>2]|0,m=n[G>>2]|0}while(0);n[et>>2]=cD(B)|0,n[Xe>>2]=Tr(k)|0,yLe(c,s,et,Xe,Me,Qe),hR(Qe),ef(Me)}l=n[l>>2]|0}while((l|0)!=0)}C=lt}function fR(s){return s=s|0,n[s+12>>2]|0}function Nw(s){return s=s|0,n[s+12>>2]|0}function Lw(s){return s=s|0,n[s+16>>2]|0}function dLe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0;d=C,C=C+32|0,c=d,f=n[s>>2]|0,(n[s+8>>2]|0)-f>>2>>>0<l>>>0&&(R5(c,l,(n[s+4>>2]|0)-f>>2,s+8|0),T5(s,c),N5(c)),C=d}function pR(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0;if(B=C,C=C+32|0,c=B,f=s+4|0,d=((n[f>>2]|0)-(n[s>>2]|0)>>2)+1|0,m=F5(s)|0,m>>>0<d>>>0)zr(s);else{k=n[s>>2]|0,M=(n[s+8>>2]|0)-k|0,Q=M>>1,R5(c,M>>2>>>0<m>>>1>>>0?Q>>>0<d>>>0?d:Q:m,(n[f>>2]|0)-k>>2,s+8|0),m=c+8|0,n[n[m>>2]>>2]=n[l>>2],n[m>>2]=(n[m>>2]|0)+4,T5(s,c),N5(c),C=B;return}}function Ow(s){return s=s|0,n[s+8>>2]|0}function mLe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0;if(B=C,C=C+32|0,c=B,f=s+4|0,d=((n[f>>2]|0)-(n[s>>2]|0)>>2)+1|0,m=Q5(s)|0,m>>>0<d>>>0)zr(s);else{k=n[s>>2]|0,M=(n[s+8>>2]|0)-k|0,Q=M>>1,OLe(c,M>>2>>>0<m>>>1>>>0?Q>>>0<d>>>0?d:Q:m,(n[f>>2]|0)-k>>2,s+8|0),m=c+8|0,n[n[m>>2]>>2]=n[l>>2],n[m>>2]=(n[m>>2]|0)+4,MLe(s,c),ULe(c),C=B;return}}function cD(s){return s=s|0,n[s>>2]|0}function yLe(s,l,c,f,d,m){s=s|0,l=l|0,c=c|0,f=f|0,d=d|0,m=m|0,ELe(s,l,c,f,d,m)}function hR(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~((l+-4-f|0)>>>2)<<2)),gt(c))}function ef(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~((l+-4-f|0)>>>2)<<2)),gt(c))}function ELe(s,l,c,f,d,m){s=s|0,l=l|0,c=c|0,f=f|0,d=d|0,m=m|0;var B=0,k=0,Q=0,M=0,O=0,G=0;B=C,C=C+48|0,O=B+40|0,k=B+32|0,G=B+24|0,Q=B+12|0,M=B,Ka(k),s=da(s)|0,n[G>>2]=n[l>>2],c=n[c>>2]|0,f=n[f>>2]|0,gR(Q,d),CLe(M,m),n[O>>2]=n[G>>2],wLe(s,O,c,f,Q,M),hR(M),ef(Q),Va(k),C=B}function gR(s,l){s=s|0,l=l|0;var c=0,f=0;n[s>>2]=0,n[s+4>>2]=0,n[s+8>>2]=0,c=l+4|0,f=(n[c>>2]|0)-(n[l>>2]|0)>>2,f|0&&(NLe(s,f),LLe(s,n[l>>2]|0,n[c>>2]|0,f))}function CLe(s,l){s=s|0,l=l|0;var c=0,f=0;n[s>>2]=0,n[s+4>>2]=0,n[s+8>>2]=0,c=l+4|0,f=(n[c>>2]|0)-(n[l>>2]|0)>>2,f|0&&(RLe(s,f),TLe(s,n[l>>2]|0,n[c>>2]|0,f))}function wLe(s,l,c,f,d,m){s=s|0,l=l|0,c=c|0,f=f|0,d=d|0,m=m|0;var B=0,k=0,Q=0,M=0,O=0,G=0;B=C,C=C+32|0,O=B+28|0,G=B+24|0,k=B+12|0,Q=B,M=Sl(ILe()|0)|0,n[G>>2]=n[l>>2],n[O>>2]=n[G>>2],l=Fg(O)|0,c=S5(c)|0,f=dR(f)|0,n[k>>2]=n[d>>2],O=d+4|0,n[k+4>>2]=n[O>>2],G=d+8|0,n[k+8>>2]=n[G>>2],n[G>>2]=0,n[O>>2]=0,n[d>>2]=0,d=mR(k)|0,n[Q>>2]=n[m>>2],O=m+4|0,n[Q+4>>2]=n[O>>2],G=m+8|0,n[Q+8>>2]=n[G>>2],n[G>>2]=0,n[O>>2]=0,n[m>>2]=0,ao(0,M|0,s|0,l|0,c|0,f|0,d|0,BLe(Q)|0)|0,hR(Q),ef(k),C=B}function ILe(){var s=0;return o[7968]|0||(QLe(10708),s=7968,n[s>>2]=1,n[s+4>>2]=0),10708}function Fg(s){return s=s|0,b5(s)|0}function S5(s){return s=s|0,P5(s)|0}function dR(s){return s=s|0,oD(s)|0}function mR(s){return s=s|0,DLe(s)|0}function BLe(s){return s=s|0,vLe(s)|0}function vLe(s){s=s|0;var l=0,c=0,f=0;if(f=(n[s+4>>2]|0)-(n[s>>2]|0)|0,c=f>>2,f=Wa(f+4|0)|0,n[f>>2]=c,c|0){l=0;do n[f+4+(l<<2)>>2]=P5(n[(n[s>>2]|0)+(l<<2)>>2]|0)|0,l=l+1|0;while((l|0)!=(c|0))}return f|0}function P5(s){return s=s|0,s|0}function DLe(s){s=s|0;var l=0,c=0,f=0;if(f=(n[s+4>>2]|0)-(n[s>>2]|0)|0,c=f>>2,f=Wa(f+4|0)|0,n[f>>2]=c,c|0){l=0;do n[f+4+(l<<2)>>2]=b5((n[s>>2]|0)+(l<<2)|0)|0,l=l+1|0;while((l|0)!=(c|0))}return f|0}function b5(s){s=s|0;var l=0,c=0,f=0,d=0;return d=C,C=C+32|0,l=d+12|0,c=d,f=xF(x5()|0)|0,f?(kF(l,f),QF(c,l),aUe(s,c),s=FF(l)|0):s=SLe(s)|0,C=d,s|0}function x5(){var s=0;return o[7960]|0||(kLe(10664),tr(25,10664,U|0)|0,s=7960,n[s>>2]=1,n[s+4>>2]=0),10664}function SLe(s){s=s|0;var l=0,c=0,f=0,d=0,m=0,B=0,k=0;return c=C,C=C+16|0,d=c+4|0,B=c,f=Wa(8)|0,l=f,k=Kt(4)|0,n[k>>2]=n[s>>2],m=l+4|0,n[m>>2]=k,s=Kt(8)|0,m=n[m>>2]|0,n[B>>2]=0,n[d>>2]=n[B>>2],k5(s,m,d),n[f>>2]=s,C=c,l|0}function k5(s,l,c){s=s|0,l=l|0,c=c|0,n[s>>2]=l,c=Kt(16)|0,n[c+4>>2]=0,n[c+8>>2]=0,n[c>>2]=1656,n[c+12>>2]=l,n[s+4>>2]=c}function PLe(s){s=s|0,zm(s),gt(s)}function bLe(s){s=s|0,s=n[s+12>>2]|0,s|0&&gt(s)}function xLe(s){s=s|0,gt(s)}function kLe(s){s=s|0,vp(s)}function QLe(s){s=s|0,Pl(s,FLe()|0,5)}function FLe(){return 1676}function RLe(s,l){s=s|0,l=l|0;var c=0;if((Q5(s)|0)>>>0<l>>>0&&zr(s),l>>>0>1073741823)Rt();else{c=Kt(l<<2)|0,n[s+4>>2]=c,n[s>>2]=c,n[s+8>>2]=c+(l<<2);return}}function TLe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0,f=s+4|0,s=c-l|0,(s|0)>0&&(Dr(n[f>>2]|0,l|0,s|0)|0,n[f>>2]=(n[f>>2]|0)+(s>>>2<<2))}function Q5(s){return s=s|0,1073741823}function NLe(s,l){s=s|0,l=l|0;var c=0;if((F5(s)|0)>>>0<l>>>0&&zr(s),l>>>0>1073741823)Rt();else{c=Kt(l<<2)|0,n[s+4>>2]=c,n[s>>2]=c,n[s+8>>2]=c+(l<<2);return}}function LLe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0,f=s+4|0,s=c-l|0,(s|0)>0&&(Dr(n[f>>2]|0,l|0,s|0)|0,n[f>>2]=(n[f>>2]|0)+(s>>>2<<2))}function F5(s){return s=s|0,1073741823}function OLe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>1073741823)Rt();else{d=Kt(l<<2)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c<<2)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l<<2)}function MLe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(0-(d>>2)<<2)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function ULe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~((f+-4-l|0)>>>2)<<2)),s=n[s>>2]|0,s|0&&gt(s)}function R5(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>1073741823)Rt();else{d=Kt(l<<2)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c<<2)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l<<2)}function T5(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(0-(d>>2)<<2)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function N5(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~((f+-4-l|0)>>>2)<<2)),s=n[s>>2]|0,s|0&&gt(s)}function _Le(s,l,c,f,d){s=s|0,l=l|0,c=c|0,f=f|0,d=d|0;var m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0,qe=0,Me=0,Qe=0;if(Qe=C,C=C+32|0,O=Qe+20|0,G=Qe+12|0,M=Qe+16|0,se=Qe+4|0,qe=Qe,Me=Qe+8|0,k=B5()|0,m=n[k>>2]|0,B=n[m>>2]|0,B|0)for(Q=n[k+8>>2]|0,k=n[k+4>>2]|0;bc(O,B),HLe(s,O,k,Q),m=m+4|0,B=n[m>>2]|0,B;)Q=Q+1|0,k=k+1|0;if(m=v5()|0,B=n[m>>2]|0,B|0)do bc(O,B),n[G>>2]=n[m+4>>2],jLe(l,O,G),m=m+8|0,B=n[m>>2]|0;while((B|0)!=0);if(m=n[(Ym()|0)>>2]|0,m|0)do l=n[m+4>>2]|0,bc(O,n[(Wm(l)|0)>>2]|0),n[G>>2]=uR(l)|0,GLe(c,O,G),m=n[m>>2]|0;while((m|0)!=0);if(bc(M,0),m=AR()|0,n[O>>2]=n[M>>2],D5(O,m,d),m=n[(Ym()|0)>>2]|0,m|0){s=O+4|0,l=O+8|0,c=O+8|0;do{if(Q=n[m+4>>2]|0,bc(G,n[(Wm(Q)|0)>>2]|0),qLe(se,L5(Q)|0),B=n[se>>2]|0,B|0){n[O>>2]=0,n[s>>2]=0,n[l>>2]=0;do bc(qe,n[(Wm(n[B+4>>2]|0)|0)>>2]|0),k=n[s>>2]|0,k>>>0<(n[c>>2]|0)>>>0?(n[k>>2]=n[qe>>2],n[s>>2]=(n[s>>2]|0)+4):pR(O,qe),B=n[B>>2]|0;while((B|0)!=0);YLe(f,G,O),ef(O)}n[Me>>2]=n[G>>2],M=O5(Q)|0,n[O>>2]=n[Me>>2],D5(O,M,d),s9(se),m=n[m>>2]|0}while((m|0)!=0)}C=Qe}function HLe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0,nOe(s,l,c,f)}function jLe(s,l,c){s=s|0,l=l|0,c=c|0,rOe(s,l,c)}function Wm(s){return s=s|0,s|0}function GLe(s,l,c){s=s|0,l=l|0,c=c|0,ZLe(s,l,c)}function L5(s){return s=s|0,s+16|0}function qLe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0;if(m=C,C=C+16|0,d=m+8|0,c=m,n[s>>2]=0,f=n[l>>2]|0,n[d>>2]=f,n[c>>2]=s,c=XLe(c)|0,f|0){if(f=Kt(12)|0,B=(M5(d)|0)+4|0,s=n[B+4>>2]|0,l=f+4|0,n[l>>2]=n[B>>2],n[l+4>>2]=s,l=n[n[d>>2]>>2]|0,n[d>>2]=l,!l)s=f;else for(l=f;s=Kt(12)|0,Q=(M5(d)|0)+4|0,k=n[Q+4>>2]|0,B=s+4|0,n[B>>2]=n[Q>>2],n[B+4>>2]=k,n[l>>2]=s,B=n[n[d>>2]>>2]|0,n[d>>2]=B,B;)l=s;n[s>>2]=n[c>>2],n[c>>2]=f}C=m}function YLe(s,l,c){s=s|0,l=l|0,c=c|0,WLe(s,l,c)}function O5(s){return s=s|0,s+24|0}function WLe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+32|0,B=f+24|0,d=f+16|0,k=f+12|0,m=f,Ka(d),s=da(s)|0,n[k>>2]=n[l>>2],gR(m,c),n[B>>2]=n[k>>2],KLe(s,B,m),ef(m),Va(d),C=f}function KLe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;f=C,C=C+32|0,B=f+16|0,k=f+12|0,d=f,m=Sl(VLe()|0)|0,n[k>>2]=n[l>>2],n[B>>2]=n[k>>2],l=Fg(B)|0,n[d>>2]=n[c>>2],B=c+4|0,n[d+4>>2]=n[B>>2],k=c+8|0,n[d+8>>2]=n[k>>2],n[k>>2]=0,n[B>>2]=0,n[c>>2]=0,oo(0,m|0,s|0,l|0,mR(d)|0)|0,ef(d),C=f}function VLe(){var s=0;return o[7976]|0||(JLe(10720),s=7976,n[s>>2]=1,n[s+4>>2]=0),10720}function JLe(s){s=s|0,Pl(s,zLe()|0,2)}function zLe(){return 1732}function XLe(s){return s=s|0,n[s>>2]|0}function M5(s){return s=s|0,n[s>>2]|0}function ZLe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;f=C,C=C+32|0,m=f+16|0,d=f+8|0,B=f,Ka(d),s=da(s)|0,n[B>>2]=n[l>>2],c=n[c>>2]|0,n[m>>2]=n[B>>2],U5(s,m,c),Va(d),C=f}function U5(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;f=C,C=C+16|0,m=f+4|0,B=f,d=Sl($Le()|0)|0,n[B>>2]=n[l>>2],n[m>>2]=n[B>>2],l=Fg(m)|0,oo(0,d|0,s|0,l|0,S5(c)|0)|0,C=f}function $Le(){var s=0;return o[7984]|0||(eOe(10732),s=7984,n[s>>2]=1,n[s+4>>2]=0),10732}function eOe(s){s=s|0,Pl(s,tOe()|0,2)}function tOe(){return 1744}function rOe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;f=C,C=C+32|0,m=f+16|0,d=f+8|0,B=f,Ka(d),s=da(s)|0,n[B>>2]=n[l>>2],c=n[c>>2]|0,n[m>>2]=n[B>>2],U5(s,m,c),Va(d),C=f}function nOe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0;d=C,C=C+32|0,B=d+16|0,m=d+8|0,k=d,Ka(m),s=da(s)|0,n[k>>2]=n[l>>2],c=o[c>>0]|0,f=o[f>>0]|0,n[B>>2]=n[k>>2],iOe(s,B,c,f),Va(m),C=d}function iOe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0;d=C,C=C+16|0,B=d+4|0,k=d,m=Sl(sOe()|0)|0,n[k>>2]=n[l>>2],n[B>>2]=n[k>>2],l=Fg(B)|0,c=Km(c)|0,pc(0,m|0,s|0,l|0,c|0,Km(f)|0)|0,C=d}function sOe(){var s=0;return o[7992]|0||(aOe(10744),s=7992,n[s>>2]=1,n[s+4>>2]=0),10744}function Km(s){return s=s|0,oOe(s)|0}function oOe(s){return s=s|0,s&255|0}function aOe(s){s=s|0,Pl(s,lOe()|0,3)}function lOe(){return 1756}function cOe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0;switch(se=C,C=C+32|0,k=se+8|0,Q=se+4|0,M=se+20|0,O=se,LF(s,0),f=oUe(l)|0,n[k>>2]=0,G=k+4|0,n[G>>2]=0,n[k+8>>2]=0,f<<24>>24){case 0:{o[M>>0]=0,uOe(Q,c,M),uD(s,Q)|0,qA(Q);break}case 8:{G=BR(l)|0,o[M>>0]=8,bc(O,n[G+4>>2]|0),AOe(Q,c,M,O,G+8|0),uD(s,Q)|0,qA(Q);break}case 9:{if(m=BR(l)|0,l=n[m+4>>2]|0,l|0)for(B=k+8|0,d=m+12|0;l=l+-1|0,bc(Q,n[d>>2]|0),f=n[G>>2]|0,f>>>0<(n[B>>2]|0)>>>0?(n[f>>2]=n[Q>>2],n[G>>2]=(n[G>>2]|0)+4):pR(k,Q),l;)d=d+4|0;o[M>>0]=9,bc(O,n[m+8>>2]|0),fOe(Q,c,M,O,k),uD(s,Q)|0,qA(Q);break}default:G=BR(l)|0,o[M>>0]=f,bc(O,n[G+4>>2]|0),pOe(Q,c,M,O),uD(s,Q)|0,qA(Q)}ef(k),C=se}function uOe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0;f=C,C=C+16|0,d=f,Ka(d),l=da(l)|0,SOe(s,l,o[c>>0]|0),Va(d),C=f}function uD(s,l){s=s|0,l=l|0;var c=0;return c=n[s>>2]|0,c|0&&PA(c|0),n[s>>2]=n[l>>2],n[l>>2]=0,s|0}function AOe(s,l,c,f,d){s=s|0,l=l|0,c=c|0,f=f|0,d=d|0;var m=0,B=0,k=0,Q=0;m=C,C=C+32|0,k=m+16|0,B=m+8|0,Q=m,Ka(B),l=da(l)|0,c=o[c>>0]|0,n[Q>>2]=n[f>>2],d=n[d>>2]|0,n[k>>2]=n[Q>>2],IOe(s,l,c,k,d),Va(B),C=m}function fOe(s,l,c,f,d){s=s|0,l=l|0,c=c|0,f=f|0,d=d|0;var m=0,B=0,k=0,Q=0,M=0;m=C,C=C+32|0,Q=m+24|0,B=m+16|0,M=m+12|0,k=m,Ka(B),l=da(l)|0,c=o[c>>0]|0,n[M>>2]=n[f>>2],gR(k,d),n[Q>>2]=n[M>>2],yOe(s,l,c,Q,k),ef(k),Va(B),C=m}function pOe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0;d=C,C=C+32|0,B=d+16|0,m=d+8|0,k=d,Ka(m),l=da(l)|0,c=o[c>>0]|0,n[k>>2]=n[f>>2],n[B>>2]=n[k>>2],hOe(s,l,c,B),Va(m),C=d}function hOe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0,B=0,k=0;d=C,C=C+16|0,m=d+4|0,k=d,B=Sl(gOe()|0)|0,c=Km(c)|0,n[k>>2]=n[f>>2],n[m>>2]=n[k>>2],AD(s,oo(0,B|0,l|0,c|0,Fg(m)|0)|0),C=d}function gOe(){var s=0;return o[8e3]|0||(dOe(10756),s=8e3,n[s>>2]=1,n[s+4>>2]=0),10756}function AD(s,l){s=s|0,l=l|0,LF(s,l)}function dOe(s){s=s|0,Pl(s,mOe()|0,2)}function mOe(){return 1772}function yOe(s,l,c,f,d){s=s|0,l=l|0,c=c|0,f=f|0,d=d|0;var m=0,B=0,k=0,Q=0,M=0;m=C,C=C+32|0,Q=m+16|0,M=m+12|0,B=m,k=Sl(EOe()|0)|0,c=Km(c)|0,n[M>>2]=n[f>>2],n[Q>>2]=n[M>>2],f=Fg(Q)|0,n[B>>2]=n[d>>2],Q=d+4|0,n[B+4>>2]=n[Q>>2],M=d+8|0,n[B+8>>2]=n[M>>2],n[M>>2]=0,n[Q>>2]=0,n[d>>2]=0,AD(s,pc(0,k|0,l|0,c|0,f|0,mR(B)|0)|0),ef(B),C=m}function EOe(){var s=0;return o[8008]|0||(COe(10768),s=8008,n[s>>2]=1,n[s+4>>2]=0),10768}function COe(s){s=s|0,Pl(s,wOe()|0,3)}function wOe(){return 1784}function IOe(s,l,c,f,d){s=s|0,l=l|0,c=c|0,f=f|0,d=d|0;var m=0,B=0,k=0,Q=0;m=C,C=C+16|0,k=m+4|0,Q=m,B=Sl(BOe()|0)|0,c=Km(c)|0,n[Q>>2]=n[f>>2],n[k>>2]=n[Q>>2],f=Fg(k)|0,AD(s,pc(0,B|0,l|0,c|0,f|0,dR(d)|0)|0),C=m}function BOe(){var s=0;return o[8016]|0||(vOe(10780),s=8016,n[s>>2]=1,n[s+4>>2]=0),10780}function vOe(s){s=s|0,Pl(s,DOe()|0,3)}function DOe(){return 1800}function SOe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;f=Sl(POe()|0)|0,AD(s,Qn(0,f|0,l|0,Km(c)|0)|0)}function POe(){var s=0;return o[8024]|0||(bOe(10792),s=8024,n[s>>2]=1,n[s+4>>2]=0),10792}function bOe(s){s=s|0,Pl(s,xOe()|0,1)}function xOe(){return 1816}function kOe(){QOe(),FOe(),ROe()}function QOe(){n[2702]=p7(65536)|0}function FOe(){$Oe(10856)}function ROe(){TOe(10816)}function TOe(s){s=s|0,NOe(s,5044),LOe(s)|0}function NOe(s,l){s=s|0,l=l|0;var c=0;c=x5()|0,n[s>>2]=c,KOe(c,l),xp(n[s>>2]|0)}function LOe(s){s=s|0;var l=0;return l=n[s>>2]|0,kg(l,OOe()|0),s|0}function OOe(){var s=0;return o[8032]|0||(_5(10820),tr(64,10820,U|0)|0,s=8032,n[s>>2]=1,n[s+4>>2]=0),Tr(10820)|0||_5(10820),10820}function _5(s){s=s|0,_Oe(s),Qg(s,25)}function MOe(s){s=s|0,UOe(s+24|0)}function UOe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~((l+-8-f|0)>>>3)<<3)),gt(c))}function _Oe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,5,18,l,qOe()|0,1),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function HOe(s,l){s=s|0,l=l|0,jOe(s,l)}function jOe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0;c=C,C=C+16|0,f=c,d=c+4|0,bg(d,l),n[f>>2]=xg(d,l)|0,GOe(s,f),C=c}function GOe(s,l){s=s|0,l=l|0,H5(s+4|0,n[l>>2]|0),o[s+8>>0]=1}function H5(s,l){s=s|0,l=l|0,n[s>>2]=l}function qOe(){return 1824}function YOe(s){return s=s|0,WOe(s)|0}function WOe(s){s=s|0;var l=0,c=0,f=0,d=0,m=0,B=0,k=0;return c=C,C=C+16|0,d=c+4|0,B=c,f=Wa(8)|0,l=f,k=Kt(4)|0,bg(d,s),H5(k,xg(d,s)|0),m=l+4|0,n[m>>2]=k,s=Kt(8)|0,m=n[m>>2]|0,n[B>>2]=0,n[d>>2]=n[B>>2],k5(s,m,d),n[f>>2]=s,C=c,l|0}function Wa(s){s=s|0;var l=0,c=0;return s=s+7&-8,s>>>0<=32768&&(l=n[2701]|0,s>>>0<=(65536-l|0)>>>0)?(c=(n[2702]|0)+l|0,n[2701]=l+s,s=c):(s=p7(s+8|0)|0,n[s>>2]=n[2703],n[2703]=s,s=s+8|0),s|0}function KOe(s,l){s=s|0,l=l|0,n[s>>2]=VOe()|0,n[s+4>>2]=JOe()|0,n[s+12>>2]=l,n[s+8>>2]=zOe()|0,n[s+32>>2]=9}function VOe(){return 11744}function JOe(){return 1832}function zOe(){return lD()|0}function XOe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0,(bp(f,896)|0)==512?c|0&&(ZOe(c),gt(c)):l|0&&gt(l)}function ZOe(s){s=s|0,s=n[s+4>>2]|0,s|0&&kp(s)}function $Oe(s){s=s|0,eMe(s,5052),tMe(s)|0,rMe(s,5058,26)|0,nMe(s,5069,1)|0,iMe(s,5077,10)|0,sMe(s,5087,19)|0,oMe(s,5094,27)|0}function eMe(s,l){s=s|0,l=l|0;var c=0;c=Z4e()|0,n[s>>2]=c,$4e(c,l),xp(n[s>>2]|0)}function tMe(s){s=s|0;var l=0;return l=n[s>>2]|0,kg(l,M4e()|0),s|0}function rMe(s,l,c){return s=s|0,l=l|0,c=c|0,C4e(s,pn(l)|0,c,0),s|0}function nMe(s,l,c){return s=s|0,l=l|0,c=c|0,s4e(s,pn(l)|0,c,0),s|0}function iMe(s,l,c){return s=s|0,l=l|0,c=c|0,OMe(s,pn(l)|0,c,0),s|0}function sMe(s,l,c){return s=s|0,l=l|0,c=c|0,IMe(s,pn(l)|0,c,0),s|0}function j5(s,l){s=s|0,l=l|0;var c=0,f=0;e:for(;;){for(c=n[2703]|0;;){if((c|0)==(l|0))break e;if(f=n[c>>2]|0,n[2703]=f,!c)c=f;else break}gt(c)}n[2701]=s}function oMe(s,l,c){return s=s|0,l=l|0,c=c|0,aMe(s,pn(l)|0,c,0),s|0}function aMe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0;m=n[s>>2]|0,d=yR()|0,s=lMe(c)|0,hn(m,l,d,s,cMe(c,f)|0,f)}function yR(){var s=0,l=0;if(o[8040]|0||(q5(10860),tr(65,10860,U|0)|0,l=8040,n[l>>2]=1,n[l+4>>2]=0),!(Tr(10860)|0)){s=10860,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));q5(10860)}return 10860}function lMe(s){return s=s|0,s|0}function cMe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0;return k=C,C=C+16|0,d=k,m=k+4|0,n[d>>2]=s,Q=yR()|0,B=Q+24|0,l=gr(l,4)|0,n[m>>2]=l,c=Q+28|0,f=n[c>>2]|0,f>>>0<(n[Q+32>>2]|0)>>>0?(G5(f,s,l),l=(n[c>>2]|0)+8|0,n[c>>2]=l):(uMe(B,d,m),l=n[c>>2]|0),C=k,(l-(n[B>>2]|0)>>3)+-1|0}function G5(s,l,c){s=s|0,l=l|0,c=c|0,n[s>>2]=l,n[s+4>>2]=c}function uMe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0;if(k=C,C=C+32|0,d=k,m=s+4|0,B=((n[m>>2]|0)-(n[s>>2]|0)>>3)+1|0,f=AMe(s)|0,f>>>0<B>>>0)zr(s);else{Q=n[s>>2]|0,O=(n[s+8>>2]|0)-Q|0,M=O>>2,fMe(d,O>>3>>>0<f>>>1>>>0?M>>>0<B>>>0?B:M:f,(n[m>>2]|0)-Q>>3,s+8|0),B=d+8|0,G5(n[B>>2]|0,n[l>>2]|0,n[c>>2]|0),n[B>>2]=(n[B>>2]|0)+8,pMe(s,d),hMe(d),C=k;return}}function AMe(s){return s=s|0,536870911}function fMe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>536870911)Rt();else{d=Kt(l<<3)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c<<3)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l<<3)}function pMe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(0-(d>>3)<<3)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function hMe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~((f+-8-l|0)>>>3)<<3)),s=n[s>>2]|0,s|0&&gt(s)}function q5(s){s=s|0,mMe(s)}function gMe(s){s=s|0,dMe(s+24|0)}function dMe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~((l+-8-f|0)>>>3)<<3)),gt(c))}function mMe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,1,11,l,yMe()|0,2),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function yMe(){return 1840}function EMe(s,l,c){s=s|0,l=l|0,c=c|0,wMe(n[(CMe(s)|0)>>2]|0,l,c)}function CMe(s){return s=s|0,(n[(yR()|0)+24>>2]|0)+(s<<3)|0}function wMe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0;f=C,C=C+16|0,m=f+1|0,d=f,bg(m,l),l=xg(m,l)|0,bg(d,c),c=xg(d,c)|0,rf[s&31](l,c),C=f}function IMe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0;m=n[s>>2]|0,d=ER()|0,s=BMe(c)|0,hn(m,l,d,s,vMe(c,f)|0,f)}function ER(){var s=0,l=0;if(o[8048]|0||(W5(10896),tr(66,10896,U|0)|0,l=8048,n[l>>2]=1,n[l+4>>2]=0),!(Tr(10896)|0)){s=10896,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));W5(10896)}return 10896}function BMe(s){return s=s|0,s|0}function vMe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0;return k=C,C=C+16|0,d=k,m=k+4|0,n[d>>2]=s,Q=ER()|0,B=Q+24|0,l=gr(l,4)|0,n[m>>2]=l,c=Q+28|0,f=n[c>>2]|0,f>>>0<(n[Q+32>>2]|0)>>>0?(Y5(f,s,l),l=(n[c>>2]|0)+8|0,n[c>>2]=l):(DMe(B,d,m),l=n[c>>2]|0),C=k,(l-(n[B>>2]|0)>>3)+-1|0}function Y5(s,l,c){s=s|0,l=l|0,c=c|0,n[s>>2]=l,n[s+4>>2]=c}function DMe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0;if(k=C,C=C+32|0,d=k,m=s+4|0,B=((n[m>>2]|0)-(n[s>>2]|0)>>3)+1|0,f=SMe(s)|0,f>>>0<B>>>0)zr(s);else{Q=n[s>>2]|0,O=(n[s+8>>2]|0)-Q|0,M=O>>2,PMe(d,O>>3>>>0<f>>>1>>>0?M>>>0<B>>>0?B:M:f,(n[m>>2]|0)-Q>>3,s+8|0),B=d+8|0,Y5(n[B>>2]|0,n[l>>2]|0,n[c>>2]|0),n[B>>2]=(n[B>>2]|0)+8,bMe(s,d),xMe(d),C=k;return}}function SMe(s){return s=s|0,536870911}function PMe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>536870911)Rt();else{d=Kt(l<<3)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c<<3)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l<<3)}function bMe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(0-(d>>3)<<3)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function xMe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~((f+-8-l|0)>>>3)<<3)),s=n[s>>2]|0,s|0&&gt(s)}function W5(s){s=s|0,FMe(s)}function kMe(s){s=s|0,QMe(s+24|0)}function QMe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~((l+-8-f|0)>>>3)<<3)),gt(c))}function FMe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,1,11,l,RMe()|0,1),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function RMe(){return 1852}function TMe(s,l){return s=s|0,l=l|0,LMe(n[(NMe(s)|0)>>2]|0,l)|0}function NMe(s){return s=s|0,(n[(ER()|0)+24>>2]|0)+(s<<3)|0}function LMe(s,l){s=s|0,l=l|0;var c=0,f=0;return c=C,C=C+16|0,f=c,bg(f,l),l=xg(f,l)|0,l=oD(Lg[s&31](l)|0)|0,C=c,l|0}function OMe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0;m=n[s>>2]|0,d=CR()|0,s=MMe(c)|0,hn(m,l,d,s,UMe(c,f)|0,f)}function CR(){var s=0,l=0;if(o[8056]|0||(V5(10932),tr(67,10932,U|0)|0,l=8056,n[l>>2]=1,n[l+4>>2]=0),!(Tr(10932)|0)){s=10932,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));V5(10932)}return 10932}function MMe(s){return s=s|0,s|0}function UMe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0;return k=C,C=C+16|0,d=k,m=k+4|0,n[d>>2]=s,Q=CR()|0,B=Q+24|0,l=gr(l,4)|0,n[m>>2]=l,c=Q+28|0,f=n[c>>2]|0,f>>>0<(n[Q+32>>2]|0)>>>0?(K5(f,s,l),l=(n[c>>2]|0)+8|0,n[c>>2]=l):(_Me(B,d,m),l=n[c>>2]|0),C=k,(l-(n[B>>2]|0)>>3)+-1|0}function K5(s,l,c){s=s|0,l=l|0,c=c|0,n[s>>2]=l,n[s+4>>2]=c}function _Me(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0;if(k=C,C=C+32|0,d=k,m=s+4|0,B=((n[m>>2]|0)-(n[s>>2]|0)>>3)+1|0,f=HMe(s)|0,f>>>0<B>>>0)zr(s);else{Q=n[s>>2]|0,O=(n[s+8>>2]|0)-Q|0,M=O>>2,jMe(d,O>>3>>>0<f>>>1>>>0?M>>>0<B>>>0?B:M:f,(n[m>>2]|0)-Q>>3,s+8|0),B=d+8|0,K5(n[B>>2]|0,n[l>>2]|0,n[c>>2]|0),n[B>>2]=(n[B>>2]|0)+8,GMe(s,d),qMe(d),C=k;return}}function HMe(s){return s=s|0,536870911}function jMe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>536870911)Rt();else{d=Kt(l<<3)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c<<3)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l<<3)}function GMe(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(0-(d>>3)<<3)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function qMe(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~((f+-8-l|0)>>>3)<<3)),s=n[s>>2]|0,s|0&&gt(s)}function V5(s){s=s|0,KMe(s)}function YMe(s){s=s|0,WMe(s+24|0)}function WMe(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~((l+-8-f|0)>>>3)<<3)),gt(c))}function KMe(s){s=s|0;var l=0;l=Kr()|0,Vr(s,1,7,l,VMe()|0,2),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function VMe(){return 1860}function JMe(s,l,c){return s=s|0,l=l|0,c=c|0,XMe(n[(zMe(s)|0)>>2]|0,l,c)|0}function zMe(s){return s=s|0,(n[(CR()|0)+24>>2]|0)+(s<<3)|0}function XMe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0;return f=C,C=C+32|0,B=f+12|0,m=f+8|0,k=f,Q=f+16|0,d=f+4|0,ZMe(Q,l),$Me(k,Q,l),Dp(d,c),c=Sp(d,c)|0,n[B>>2]=n[k>>2],Hw[s&15](m,B,c),c=e4e(m)|0,qA(m),Pp(d),C=f,c|0}function ZMe(s,l){s=s|0,l=l|0}function $Me(s,l,c){s=s|0,l=l|0,c=c|0,t4e(s,c)}function e4e(s){return s=s|0,da(s)|0}function t4e(s,l){s=s|0,l=l|0;var c=0,f=0,d=0;d=C,C=C+16|0,c=d,f=l,f&1?(r4e(c,0),ii(f|0,c|0)|0,n4e(s,c),i4e(c)):n[s>>2]=n[l>>2],C=d}function r4e(s,l){s=s|0,l=l|0,Xq(s,l),n[s+4>>2]=0,o[s+8>>0]=0}function n4e(s,l){s=s|0,l=l|0,n[s>>2]=n[l+4>>2]}function i4e(s){s=s|0,o[s+8>>0]=0}function s4e(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0;m=n[s>>2]|0,d=wR()|0,s=o4e(c)|0,hn(m,l,d,s,a4e(c,f)|0,f)}function wR(){var s=0,l=0;if(o[8064]|0||(z5(10968),tr(68,10968,U|0)|0,l=8064,n[l>>2]=1,n[l+4>>2]=0),!(Tr(10968)|0)){s=10968,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));z5(10968)}return 10968}function o4e(s){return s=s|0,s|0}function a4e(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0;return k=C,C=C+16|0,d=k,m=k+4|0,n[d>>2]=s,Q=wR()|0,B=Q+24|0,l=gr(l,4)|0,n[m>>2]=l,c=Q+28|0,f=n[c>>2]|0,f>>>0<(n[Q+32>>2]|0)>>>0?(J5(f,s,l),l=(n[c>>2]|0)+8|0,n[c>>2]=l):(l4e(B,d,m),l=n[c>>2]|0),C=k,(l-(n[B>>2]|0)>>3)+-1|0}function J5(s,l,c){s=s|0,l=l|0,c=c|0,n[s>>2]=l,n[s+4>>2]=c}function l4e(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0;if(k=C,C=C+32|0,d=k,m=s+4|0,B=((n[m>>2]|0)-(n[s>>2]|0)>>3)+1|0,f=c4e(s)|0,f>>>0<B>>>0)zr(s);else{Q=n[s>>2]|0,O=(n[s+8>>2]|0)-Q|0,M=O>>2,u4e(d,O>>3>>>0<f>>>1>>>0?M>>>0<B>>>0?B:M:f,(n[m>>2]|0)-Q>>3,s+8|0),B=d+8|0,J5(n[B>>2]|0,n[l>>2]|0,n[c>>2]|0),n[B>>2]=(n[B>>2]|0)+8,A4e(s,d),f4e(d),C=k;return}}function c4e(s){return s=s|0,536870911}function u4e(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>536870911)Rt();else{d=Kt(l<<3)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c<<3)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l<<3)}function A4e(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(0-(d>>3)<<3)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function f4e(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~((f+-8-l|0)>>>3)<<3)),s=n[s>>2]|0,s|0&&gt(s)}function z5(s){s=s|0,g4e(s)}function p4e(s){s=s|0,h4e(s+24|0)}function h4e(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~((l+-8-f|0)>>>3)<<3)),gt(c))}function g4e(s){s=s|0;var l=0;l=Kr()|0,Vr(s,1,1,l,d4e()|0,5),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function d4e(){return 1872}function m4e(s,l,c,f,d,m){s=s|0,l=l|0,c=c|0,f=f|0,d=d|0,m=m|0,E4e(n[(y4e(s)|0)>>2]|0,l,c,f,d,m)}function y4e(s){return s=s|0,(n[(wR()|0)+24>>2]|0)+(s<<3)|0}function E4e(s,l,c,f,d,m){s=s|0,l=l|0,c=c|0,f=f|0,d=d|0,m=m|0;var B=0,k=0,Q=0,M=0,O=0,G=0;B=C,C=C+32|0,k=B+16|0,Q=B+12|0,M=B+8|0,O=B+4|0,G=B,Dp(k,l),l=Sp(k,l)|0,Dp(Q,c),c=Sp(Q,c)|0,Dp(M,f),f=Sp(M,f)|0,Dp(O,d),d=Sp(O,d)|0,Dp(G,m),m=Sp(G,m)|0,y7[s&1](l,c,f,d,m),Pp(G),Pp(O),Pp(M),Pp(Q),Pp(k),C=B}function C4e(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0;m=n[s>>2]|0,d=IR()|0,s=w4e(c)|0,hn(m,l,d,s,I4e(c,f)|0,f)}function IR(){var s=0,l=0;if(o[8072]|0||(Z5(11004),tr(69,11004,U|0)|0,l=8072,n[l>>2]=1,n[l+4>>2]=0),!(Tr(11004)|0)){s=11004,l=s+36|0;do n[s>>2]=0,s=s+4|0;while((s|0)<(l|0));Z5(11004)}return 11004}function w4e(s){return s=s|0,s|0}function I4e(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0,k=0,Q=0;return k=C,C=C+16|0,d=k,m=k+4|0,n[d>>2]=s,Q=IR()|0,B=Q+24|0,l=gr(l,4)|0,n[m>>2]=l,c=Q+28|0,f=n[c>>2]|0,f>>>0<(n[Q+32>>2]|0)>>>0?(X5(f,s,l),l=(n[c>>2]|0)+8|0,n[c>>2]=l):(B4e(B,d,m),l=n[c>>2]|0),C=k,(l-(n[B>>2]|0)>>3)+-1|0}function X5(s,l,c){s=s|0,l=l|0,c=c|0,n[s>>2]=l,n[s+4>>2]=c}function B4e(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0;if(k=C,C=C+32|0,d=k,m=s+4|0,B=((n[m>>2]|0)-(n[s>>2]|0)>>3)+1|0,f=v4e(s)|0,f>>>0<B>>>0)zr(s);else{Q=n[s>>2]|0,O=(n[s+8>>2]|0)-Q|0,M=O>>2,D4e(d,O>>3>>>0<f>>>1>>>0?M>>>0<B>>>0?B:M:f,(n[m>>2]|0)-Q>>3,s+8|0),B=d+8|0,X5(n[B>>2]|0,n[l>>2]|0,n[c>>2]|0),n[B>>2]=(n[B>>2]|0)+8,S4e(s,d),P4e(d),C=k;return}}function v4e(s){return s=s|0,536870911}function D4e(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0;n[s+12>>2]=0,n[s+16>>2]=f;do if(l)if(l>>>0>536870911)Rt();else{d=Kt(l<<3)|0;break}else d=0;while(0);n[s>>2]=d,f=d+(c<<3)|0,n[s+8>>2]=f,n[s+4>>2]=f,n[s+12>>2]=d+(l<<3)}function S4e(s,l){s=s|0,l=l|0;var c=0,f=0,d=0,m=0,B=0;f=n[s>>2]|0,B=s+4|0,m=l+4|0,d=(n[B>>2]|0)-f|0,c=(n[m>>2]|0)+(0-(d>>3)<<3)|0,n[m>>2]=c,(d|0)>0?(Dr(c|0,f|0,d|0)|0,f=m,c=n[m>>2]|0):f=m,m=n[s>>2]|0,n[s>>2]=c,n[f>>2]=m,m=l+8|0,d=n[B>>2]|0,n[B>>2]=n[m>>2],n[m>>2]=d,m=s+8|0,B=l+12|0,s=n[m>>2]|0,n[m>>2]=n[B>>2],n[B>>2]=s,n[l>>2]=n[f>>2]}function P4e(s){s=s|0;var l=0,c=0,f=0;l=n[s+4>>2]|0,c=s+8|0,f=n[c>>2]|0,(f|0)!=(l|0)&&(n[c>>2]=f+(~((f+-8-l|0)>>>3)<<3)),s=n[s>>2]|0,s|0&&gt(s)}function Z5(s){s=s|0,k4e(s)}function b4e(s){s=s|0,x4e(s+24|0)}function x4e(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~((l+-8-f|0)>>>3)<<3)),gt(c))}function k4e(s){s=s|0;var l=0;l=Kr()|0,Vr(s,1,12,l,Q4e()|0,2),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function Q4e(){return 1896}function F4e(s,l,c){s=s|0,l=l|0,c=c|0,T4e(n[(R4e(s)|0)>>2]|0,l,c)}function R4e(s){return s=s|0,(n[(IR()|0)+24>>2]|0)+(s<<3)|0}function T4e(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0;f=C,C=C+16|0,m=f+4|0,d=f,N4e(m,l),l=L4e(m,l)|0,Dp(d,c),c=Sp(d,c)|0,rf[s&31](l,c),Pp(d),C=f}function N4e(s,l){s=s|0,l=l|0}function L4e(s,l){return s=s|0,l=l|0,O4e(l)|0}function O4e(s){return s=s|0,s|0}function M4e(){var s=0;return o[8080]|0||($5(11040),tr(70,11040,U|0)|0,s=8080,n[s>>2]=1,n[s+4>>2]=0),Tr(11040)|0||$5(11040),11040}function $5(s){s=s|0,H4e(s),Qg(s,71)}function U4e(s){s=s|0,_4e(s+24|0)}function _4e(s){s=s|0;var l=0,c=0,f=0;c=n[s>>2]|0,f=c,c|0&&(s=s+4|0,l=n[s>>2]|0,(l|0)!=(c|0)&&(n[s>>2]=l+(~((l+-8-f|0)>>>3)<<3)),gt(c))}function H4e(s){s=s|0;var l=0;l=Kr()|0,Vr(s,5,7,l,Y4e()|0,0),n[s+24>>2]=0,n[s+28>>2]=0,n[s+32>>2]=0}function j4e(s){s=s|0,G4e(s)}function G4e(s){s=s|0,q4e(s)}function q4e(s){s=s|0,o[s+8>>0]=1}function Y4e(){return 1936}function W4e(){return K4e()|0}function K4e(){var s=0,l=0,c=0,f=0,d=0,m=0,B=0;return l=C,C=C+16|0,d=l+4|0,B=l,c=Wa(8)|0,s=c,m=s+4|0,n[m>>2]=Kt(1)|0,f=Kt(8)|0,m=n[m>>2]|0,n[B>>2]=0,n[d>>2]=n[B>>2],V4e(f,m,d),n[c>>2]=f,C=l,s|0}function V4e(s,l,c){s=s|0,l=l|0,c=c|0,n[s>>2]=l,c=Kt(16)|0,n[c+4>>2]=0,n[c+8>>2]=0,n[c>>2]=1916,n[c+12>>2]=l,n[s+4>>2]=c}function J4e(s){s=s|0,zm(s),gt(s)}function z4e(s){s=s|0,s=n[s+12>>2]|0,s|0&&gt(s)}function X4e(s){s=s|0,gt(s)}function Z4e(){var s=0;return o[8088]|0||(sUe(11076),tr(25,11076,U|0)|0,s=8088,n[s>>2]=1,n[s+4>>2]=0),11076}function $4e(s,l){s=s|0,l=l|0,n[s>>2]=eUe()|0,n[s+4>>2]=tUe()|0,n[s+12>>2]=l,n[s+8>>2]=rUe()|0,n[s+32>>2]=10}function eUe(){return 11745}function tUe(){return 1940}function rUe(){return aD()|0}function nUe(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0,(bp(f,896)|0)==512?c|0&&(iUe(c),gt(c)):l|0&&gt(l)}function iUe(s){s=s|0,s=n[s+4>>2]|0,s|0&&kp(s)}function sUe(s){s=s|0,vp(s)}function bc(s,l){s=s|0,l=l|0,n[s>>2]=l}function BR(s){return s=s|0,n[s>>2]|0}function oUe(s){return s=s|0,o[n[s>>2]>>0]|0}function aUe(s,l){s=s|0,l=l|0;var c=0,f=0;c=C,C=C+16|0,f=c,n[f>>2]=n[s>>2],lUe(l,f)|0,C=c}function lUe(s,l){s=s|0,l=l|0;var c=0;return c=cUe(n[s>>2]|0,l)|0,l=s+4|0,n[(n[l>>2]|0)+8>>2]=c,n[(n[l>>2]|0)+8>>2]|0}function cUe(s,l){s=s|0,l=l|0;var c=0,f=0;return c=C,C=C+16|0,f=c,Ka(f),s=da(s)|0,l=uUe(s,n[l>>2]|0)|0,Va(f),C=c,l|0}function Ka(s){s=s|0,n[s>>2]=n[2701],n[s+4>>2]=n[2703]}function uUe(s,l){s=s|0,l=l|0;var c=0;return c=Sl(AUe()|0)|0,Qn(0,c|0,s|0,dR(l)|0)|0}function Va(s){s=s|0,j5(n[s>>2]|0,n[s+4>>2]|0)}function AUe(){var s=0;return o[8096]|0||(fUe(11120),s=8096,n[s>>2]=1,n[s+4>>2]=0),11120}function fUe(s){s=s|0,Pl(s,pUe()|0,1)}function pUe(){return 1948}function hUe(){gUe()}function gUe(){var s=0,l=0,c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0,qe=0,Me=0,Qe=0;if(Me=C,C=C+16|0,O=Me+4|0,G=Me,Ni(65536,10804,n[2702]|0,10812),c=B5()|0,l=n[c>>2]|0,s=n[l>>2]|0,s|0)for(f=n[c+8>>2]|0,c=n[c+4>>2]|0;uc(s|0,u[c>>0]|0|0,o[f>>0]|0),l=l+4|0,s=n[l>>2]|0,s;)f=f+1|0,c=c+1|0;if(s=v5()|0,l=n[s>>2]|0,l|0)do uu(l|0,n[s+4>>2]|0),s=s+8|0,l=n[s>>2]|0;while((l|0)!=0);uu(dUe()|0,5167),M=Ym()|0,s=n[M>>2]|0;e:do if(s|0){do mUe(n[s+4>>2]|0),s=n[s>>2]|0;while((s|0)!=0);if(s=n[M>>2]|0,s|0){Q=M;do{for(;d=s,s=n[s>>2]|0,d=n[d+4>>2]|0,!!(yUe(d)|0);)if(n[G>>2]=Q,n[O>>2]=n[G>>2],EUe(M,O)|0,!s)break e;if(CUe(d),Q=n[Q>>2]|0,l=e7(d)|0,m=Hi()|0,B=C,C=C+((1*(l<<2)|0)+15&-16)|0,k=C,C=C+((1*(l<<2)|0)+15&-16)|0,l=n[(L5(d)|0)>>2]|0,l|0)for(c=B,f=k;n[c>>2]=n[(Wm(n[l+4>>2]|0)|0)>>2],n[f>>2]=n[l+8>>2],l=n[l>>2]|0,l;)c=c+4|0,f=f+4|0;Qe=Wm(d)|0,l=wUe(d)|0,c=e7(d)|0,f=IUe(d)|0,Au(Qe|0,l|0,B|0,k|0,c|0,f|0,uR(d)|0),_i(m|0)}while((s|0)!=0)}}while(0);if(s=n[(AR()|0)>>2]|0,s|0)do Qe=s+4|0,M=fR(Qe)|0,d=Ow(M)|0,m=Nw(M)|0,B=(Lw(M)|0)+1|0,k=fD(M)|0,Q=t7(Qe)|0,M=Tr(M)|0,O=cD(Qe)|0,G=vR(Qe)|0,El(0,d|0,m|0,B|0,k|0,Q|0,M|0,O|0,G|0,DR(Qe)|0),s=n[s>>2]|0;while((s|0)!=0);s=n[(Ym()|0)>>2]|0;e:do if(s|0){t:for(;;){if(l=n[s+4>>2]|0,l|0&&(se=n[(Wm(l)|0)>>2]|0,qe=n[(O5(l)|0)>>2]|0,qe|0)){c=qe;do{l=c+4|0,f=fR(l)|0;r:do if(f|0)switch(Tr(f)|0){case 0:break t;case 4:case 3:case 2:{k=Ow(f)|0,Q=Nw(f)|0,M=(Lw(f)|0)+1|0,O=fD(f)|0,G=Tr(f)|0,Qe=cD(l)|0,El(se|0,k|0,Q|0,M|0,O|0,0,G|0,Qe|0,vR(l)|0,DR(l)|0);break r}case 1:{B=Ow(f)|0,k=Nw(f)|0,Q=(Lw(f)|0)+1|0,M=fD(f)|0,O=t7(l)|0,G=Tr(f)|0,Qe=cD(l)|0,El(se|0,B|0,k|0,Q|0,M|0,O|0,G|0,Qe|0,vR(l)|0,DR(l)|0);break r}case 5:{M=Ow(f)|0,O=Nw(f)|0,G=(Lw(f)|0)+1|0,Qe=fD(f)|0,El(se|0,M|0,O|0,G|0,Qe|0,BUe(f)|0,Tr(f)|0,0,0,0);break r}default:break r}while(0);c=n[c>>2]|0}while((c|0)!=0)}if(s=n[s>>2]|0,!s)break e}Rt()}while(0);Ce(),C=Me}function dUe(){return 11703}function mUe(s){s=s|0,o[s+40>>0]=0}function yUe(s){return s=s|0,(o[s+40>>0]|0)!=0|0}function EUe(s,l){return s=s|0,l=l|0,l=vUe(l)|0,s=n[l>>2]|0,n[l>>2]=n[s>>2],gt(s),n[l>>2]|0}function CUe(s){s=s|0,o[s+40>>0]=1}function e7(s){return s=s|0,n[s+20>>2]|0}function wUe(s){return s=s|0,n[s+8>>2]|0}function IUe(s){return s=s|0,n[s+32>>2]|0}function fD(s){return s=s|0,n[s+4>>2]|0}function t7(s){return s=s|0,n[s+4>>2]|0}function vR(s){return s=s|0,n[s+8>>2]|0}function DR(s){return s=s|0,n[s+16>>2]|0}function BUe(s){return s=s|0,n[s+20>>2]|0}function vUe(s){return s=s|0,n[s>>2]|0}function pD(s){s=s|0;var l=0,c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0,qe=0,Me=0,Qe=0,et=0,Xe=0,lt=0,Ue=0,Ge=0,Lt=0;Lt=C,C=C+16|0,se=Lt;do if(s>>>0<245){if(M=s>>>0<11?16:s+11&-8,s=M>>>3,G=n[2783]|0,c=G>>>s,c&3|0)return l=(c&1^1)+s|0,s=11172+(l<<1<<2)|0,c=s+8|0,f=n[c>>2]|0,d=f+8|0,m=n[d>>2]|0,(s|0)==(m|0)?n[2783]=G&~(1<<l):(n[m+12>>2]=s,n[c>>2]=m),Ge=l<<3,n[f+4>>2]=Ge|3,Ge=f+Ge+4|0,n[Ge>>2]=n[Ge>>2]|1,Ge=d,C=Lt,Ge|0;if(O=n[2785]|0,M>>>0>O>>>0){if(c|0)return l=2<<s,l=c<<s&(l|0-l),l=(l&0-l)+-1|0,B=l>>>12&16,l=l>>>B,c=l>>>5&8,l=l>>>c,d=l>>>2&4,l=l>>>d,s=l>>>1&2,l=l>>>s,f=l>>>1&1,f=(c|B|d|s|f)+(l>>>f)|0,l=11172+(f<<1<<2)|0,s=l+8|0,d=n[s>>2]|0,B=d+8|0,c=n[B>>2]|0,(l|0)==(c|0)?(s=G&~(1<<f),n[2783]=s):(n[c+12>>2]=l,n[s>>2]=c,s=G),m=(f<<3)-M|0,n[d+4>>2]=M|3,f=d+M|0,n[f+4>>2]=m|1,n[f+m>>2]=m,O|0&&(d=n[2788]|0,l=O>>>3,c=11172+(l<<1<<2)|0,l=1<<l,s&l?(s=c+8|0,l=n[s>>2]|0):(n[2783]=s|l,l=c,s=c+8|0),n[s>>2]=d,n[l+12>>2]=d,n[d+8>>2]=l,n[d+12>>2]=c),n[2785]=m,n[2788]=f,Ge=B,C=Lt,Ge|0;if(k=n[2784]|0,k){if(c=(k&0-k)+-1|0,B=c>>>12&16,c=c>>>B,m=c>>>5&8,c=c>>>m,Q=c>>>2&4,c=c>>>Q,f=c>>>1&2,c=c>>>f,s=c>>>1&1,s=n[11436+((m|B|Q|f|s)+(c>>>s)<<2)>>2]|0,c=(n[s+4>>2]&-8)-M|0,f=n[s+16+(((n[s+16>>2]|0)==0&1)<<2)>>2]|0,!f)Q=s,m=c;else{do B=(n[f+4>>2]&-8)-M|0,Q=B>>>0<c>>>0,c=Q?B:c,s=Q?f:s,f=n[f+16+(((n[f+16>>2]|0)==0&1)<<2)>>2]|0;while((f|0)!=0);Q=s,m=c}if(B=Q+M|0,Q>>>0<B>>>0){d=n[Q+24>>2]|0,l=n[Q+12>>2]|0;do if((l|0)==(Q|0)){if(s=Q+20|0,l=n[s>>2]|0,!l&&(s=Q+16|0,l=n[s>>2]|0,!l)){c=0;break}for(;;){if(c=l+20|0,f=n[c>>2]|0,f|0){l=f,s=c;continue}if(c=l+16|0,f=n[c>>2]|0,f)l=f,s=c;else break}n[s>>2]=0,c=l}else c=n[Q+8>>2]|0,n[c+12>>2]=l,n[l+8>>2]=c,c=l;while(0);do if(d|0){if(l=n[Q+28>>2]|0,s=11436+(l<<2)|0,(Q|0)==(n[s>>2]|0)){if(n[s>>2]=c,!c){n[2784]=k&~(1<<l);break}}else if(n[d+16+(((n[d+16>>2]|0)!=(Q|0)&1)<<2)>>2]=c,!c)break;n[c+24>>2]=d,l=n[Q+16>>2]|0,l|0&&(n[c+16>>2]=l,n[l+24>>2]=c),l=n[Q+20>>2]|0,l|0&&(n[c+20>>2]=l,n[l+24>>2]=c)}while(0);return m>>>0<16?(Ge=m+M|0,n[Q+4>>2]=Ge|3,Ge=Q+Ge+4|0,n[Ge>>2]=n[Ge>>2]|1):(n[Q+4>>2]=M|3,n[B+4>>2]=m|1,n[B+m>>2]=m,O|0&&(f=n[2788]|0,l=O>>>3,c=11172+(l<<1<<2)|0,l=1<<l,G&l?(s=c+8|0,l=n[s>>2]|0):(n[2783]=G|l,l=c,s=c+8|0),n[s>>2]=f,n[l+12>>2]=f,n[f+8>>2]=l,n[f+12>>2]=c),n[2785]=m,n[2788]=B),Ge=Q+8|0,C=Lt,Ge|0}else G=M}else G=M}else G=M}else if(s>>>0<=4294967231)if(s=s+11|0,M=s&-8,Q=n[2784]|0,Q){f=0-M|0,s=s>>>8,s?M>>>0>16777215?k=31:(G=(s+1048320|0)>>>16&8,Ue=s<<G,O=(Ue+520192|0)>>>16&4,Ue=Ue<<O,k=(Ue+245760|0)>>>16&2,k=14-(O|G|k)+(Ue<<k>>>15)|0,k=M>>>(k+7|0)&1|k<<1):k=0,c=n[11436+(k<<2)>>2]|0;e:do if(!c)c=0,s=0,Ue=57;else for(s=0,B=M<<((k|0)==31?0:25-(k>>>1)|0),m=0;;){if(d=(n[c+4>>2]&-8)-M|0,d>>>0<f>>>0)if(d)s=c,f=d;else{s=c,f=0,d=c,Ue=61;break e}if(d=n[c+20>>2]|0,c=n[c+16+(B>>>31<<2)>>2]|0,m=(d|0)==0|(d|0)==(c|0)?m:d,d=(c|0)==0,d){c=m,Ue=57;break}else B=B<<((d^1)&1)}while(0);if((Ue|0)==57){if((c|0)==0&(s|0)==0){if(s=2<<k,s=Q&(s|0-s),!s){G=M;break}G=(s&0-s)+-1|0,B=G>>>12&16,G=G>>>B,m=G>>>5&8,G=G>>>m,k=G>>>2&4,G=G>>>k,O=G>>>1&2,G=G>>>O,c=G>>>1&1,s=0,c=n[11436+((m|B|k|O|c)+(G>>>c)<<2)>>2]|0}c?(d=c,Ue=61):(k=s,B=f)}if((Ue|0)==61)for(;;)if(Ue=0,c=(n[d+4>>2]&-8)-M|0,G=c>>>0<f>>>0,c=G?c:f,s=G?d:s,d=n[d+16+(((n[d+16>>2]|0)==0&1)<<2)>>2]|0,d)f=c,Ue=61;else{k=s,B=c;break}if((k|0)!=0&&B>>>0<((n[2785]|0)-M|0)>>>0){if(m=k+M|0,k>>>0>=m>>>0)return Ge=0,C=Lt,Ge|0;d=n[k+24>>2]|0,l=n[k+12>>2]|0;do if((l|0)==(k|0)){if(s=k+20|0,l=n[s>>2]|0,!l&&(s=k+16|0,l=n[s>>2]|0,!l)){l=0;break}for(;;){if(c=l+20|0,f=n[c>>2]|0,f|0){l=f,s=c;continue}if(c=l+16|0,f=n[c>>2]|0,f)l=f,s=c;else break}n[s>>2]=0}else Ge=n[k+8>>2]|0,n[Ge+12>>2]=l,n[l+8>>2]=Ge;while(0);do if(d){if(s=n[k+28>>2]|0,c=11436+(s<<2)|0,(k|0)==(n[c>>2]|0)){if(n[c>>2]=l,!l){f=Q&~(1<<s),n[2784]=f;break}}else if(n[d+16+(((n[d+16>>2]|0)!=(k|0)&1)<<2)>>2]=l,!l){f=Q;break}n[l+24>>2]=d,s=n[k+16>>2]|0,s|0&&(n[l+16>>2]=s,n[s+24>>2]=l),s=n[k+20>>2]|0,s&&(n[l+20>>2]=s,n[s+24>>2]=l),f=Q}else f=Q;while(0);do if(B>>>0>=16){if(n[k+4>>2]=M|3,n[m+4>>2]=B|1,n[m+B>>2]=B,l=B>>>3,B>>>0<256){c=11172+(l<<1<<2)|0,s=n[2783]|0,l=1<<l,s&l?(s=c+8|0,l=n[s>>2]|0):(n[2783]=s|l,l=c,s=c+8|0),n[s>>2]=m,n[l+12>>2]=m,n[m+8>>2]=l,n[m+12>>2]=c;break}if(l=B>>>8,l?B>>>0>16777215?l=31:(Ue=(l+1048320|0)>>>16&8,Ge=l<<Ue,lt=(Ge+520192|0)>>>16&4,Ge=Ge<<lt,l=(Ge+245760|0)>>>16&2,l=14-(lt|Ue|l)+(Ge<<l>>>15)|0,l=B>>>(l+7|0)&1|l<<1):l=0,c=11436+(l<<2)|0,n[m+28>>2]=l,s=m+16|0,n[s+4>>2]=0,n[s>>2]=0,s=1<<l,!(f&s)){n[2784]=f|s,n[c>>2]=m,n[m+24>>2]=c,n[m+12>>2]=m,n[m+8>>2]=m;break}for(s=B<<((l|0)==31?0:25-(l>>>1)|0),c=n[c>>2]|0;;){if((n[c+4>>2]&-8|0)==(B|0)){Ue=97;break}if(f=c+16+(s>>>31<<2)|0,l=n[f>>2]|0,l)s=s<<1,c=l;else{Ue=96;break}}if((Ue|0)==96){n[f>>2]=m,n[m+24>>2]=c,n[m+12>>2]=m,n[m+8>>2]=m;break}else if((Ue|0)==97){Ue=c+8|0,Ge=n[Ue>>2]|0,n[Ge+12>>2]=m,n[Ue>>2]=m,n[m+8>>2]=Ge,n[m+12>>2]=c,n[m+24>>2]=0;break}}else Ge=B+M|0,n[k+4>>2]=Ge|3,Ge=k+Ge+4|0,n[Ge>>2]=n[Ge>>2]|1;while(0);return Ge=k+8|0,C=Lt,Ge|0}else G=M}else G=M;else G=-1;while(0);if(c=n[2785]|0,c>>>0>=G>>>0)return l=c-G|0,s=n[2788]|0,l>>>0>15?(Ge=s+G|0,n[2788]=Ge,n[2785]=l,n[Ge+4>>2]=l|1,n[Ge+l>>2]=l,n[s+4>>2]=G|3):(n[2785]=0,n[2788]=0,n[s+4>>2]=c|3,Ge=s+c+4|0,n[Ge>>2]=n[Ge>>2]|1),Ge=s+8|0,C=Lt,Ge|0;if(B=n[2786]|0,B>>>0>G>>>0)return lt=B-G|0,n[2786]=lt,Ge=n[2789]|0,Ue=Ge+G|0,n[2789]=Ue,n[Ue+4>>2]=lt|1,n[Ge+4>>2]=G|3,Ge=Ge+8|0,C=Lt,Ge|0;if(n[2901]|0?s=n[2903]|0:(n[2903]=4096,n[2902]=4096,n[2904]=-1,n[2905]=-1,n[2906]=0,n[2894]=0,s=se&-16^1431655768,n[se>>2]=s,n[2901]=s,s=4096),k=G+48|0,Q=G+47|0,m=s+Q|0,d=0-s|0,M=m&d,M>>>0<=G>>>0||(s=n[2893]|0,s|0&&(O=n[2891]|0,se=O+M|0,se>>>0<=O>>>0|se>>>0>s>>>0)))return Ge=0,C=Lt,Ge|0;e:do if(n[2894]&4)l=0,Ue=133;else{c=n[2789]|0;t:do if(c){for(f=11580;s=n[f>>2]|0,!(s>>>0<=c>>>0&&(Qe=f+4|0,(s+(n[Qe>>2]|0)|0)>>>0>c>>>0));)if(s=n[f+8>>2]|0,s)f=s;else{Ue=118;break t}if(l=m-B&d,l>>>0<2147483647)if(s=Qp(l|0)|0,(s|0)==((n[f>>2]|0)+(n[Qe>>2]|0)|0)){if((s|0)!=-1){B=l,m=s,Ue=135;break e}}else f=s,Ue=126;else l=0}else Ue=118;while(0);do if((Ue|0)==118)if(c=Qp(0)|0,(c|0)!=-1&&(l=c,qe=n[2902]|0,Me=qe+-1|0,l=((Me&l|0)==0?0:(Me+l&0-qe)-l|0)+M|0,qe=n[2891]|0,Me=l+qe|0,l>>>0>G>>>0&l>>>0<2147483647)){if(Qe=n[2893]|0,Qe|0&&Me>>>0<=qe>>>0|Me>>>0>Qe>>>0){l=0;break}if(s=Qp(l|0)|0,(s|0)==(c|0)){B=l,m=c,Ue=135;break e}else f=s,Ue=126}else l=0;while(0);do if((Ue|0)==126){if(c=0-l|0,!(k>>>0>l>>>0&(l>>>0<2147483647&(f|0)!=-1)))if((f|0)==-1){l=0;break}else{B=l,m=f,Ue=135;break e}if(s=n[2903]|0,s=Q-l+s&0-s,s>>>0>=2147483647){B=l,m=f,Ue=135;break e}if((Qp(s|0)|0)==-1){Qp(c|0)|0,l=0;break}else{B=s+l|0,m=f,Ue=135;break e}}while(0);n[2894]=n[2894]|4,Ue=133}while(0);if((Ue|0)==133&&M>>>0<2147483647&&(lt=Qp(M|0)|0,Qe=Qp(0)|0,et=Qe-lt|0,Xe=et>>>0>(G+40|0)>>>0,!((lt|0)==-1|Xe^1|lt>>>0<Qe>>>0&((lt|0)!=-1&(Qe|0)!=-1)^1))&&(B=Xe?et:l,m=lt,Ue=135),(Ue|0)==135){l=(n[2891]|0)+B|0,n[2891]=l,l>>>0>(n[2892]|0)>>>0&&(n[2892]=l),Q=n[2789]|0;do if(Q){for(l=11580;;){if(s=n[l>>2]|0,c=l+4|0,f=n[c>>2]|0,(m|0)==(s+f|0)){Ue=145;break}if(d=n[l+8>>2]|0,d)l=d;else break}if((Ue|0)==145&&(n[l+12>>2]&8|0)==0&&Q>>>0<m>>>0&Q>>>0>=s>>>0){n[c>>2]=f+B,Ge=Q+8|0,Ge=(Ge&7|0)==0?0:0-Ge&7,Ue=Q+Ge|0,Ge=(n[2786]|0)+(B-Ge)|0,n[2789]=Ue,n[2786]=Ge,n[Ue+4>>2]=Ge|1,n[Ue+Ge+4>>2]=40,n[2790]=n[2905];break}for(m>>>0<(n[2787]|0)>>>0&&(n[2787]=m),c=m+B|0,l=11580;;){if((n[l>>2]|0)==(c|0)){Ue=153;break}if(s=n[l+8>>2]|0,s)l=s;else break}if((Ue|0)==153&&(n[l+12>>2]&8|0)==0){n[l>>2]=m,O=l+4|0,n[O>>2]=(n[O>>2]|0)+B,O=m+8|0,O=m+((O&7|0)==0?0:0-O&7)|0,l=c+8|0,l=c+((l&7|0)==0?0:0-l&7)|0,M=O+G|0,k=l-O-G|0,n[O+4>>2]=G|3;do if((l|0)!=(Q|0)){if((l|0)==(n[2788]|0)){Ge=(n[2785]|0)+k|0,n[2785]=Ge,n[2788]=M,n[M+4>>2]=Ge|1,n[M+Ge>>2]=Ge;break}if(s=n[l+4>>2]|0,(s&3|0)==1){B=s&-8,f=s>>>3;e:do if(s>>>0<256)if(s=n[l+8>>2]|0,c=n[l+12>>2]|0,(c|0)==(s|0)){n[2783]=n[2783]&~(1<<f);break}else{n[s+12>>2]=c,n[c+8>>2]=s;break}else{m=n[l+24>>2]|0,s=n[l+12>>2]|0;do if((s|0)==(l|0)){if(f=l+16|0,c=f+4|0,s=n[c>>2]|0,!s)if(s=n[f>>2]|0,s)c=f;else{s=0;break}for(;;){if(f=s+20|0,d=n[f>>2]|0,d|0){s=d,c=f;continue}if(f=s+16|0,d=n[f>>2]|0,d)s=d,c=f;else break}n[c>>2]=0}else Ge=n[l+8>>2]|0,n[Ge+12>>2]=s,n[s+8>>2]=Ge;while(0);if(!m)break;c=n[l+28>>2]|0,f=11436+(c<<2)|0;do if((l|0)!=(n[f>>2]|0)){if(n[m+16+(((n[m+16>>2]|0)!=(l|0)&1)<<2)>>2]=s,!s)break e}else{if(n[f>>2]=s,s|0)break;n[2784]=n[2784]&~(1<<c);break e}while(0);if(n[s+24>>2]=m,c=l+16|0,f=n[c>>2]|0,f|0&&(n[s+16>>2]=f,n[f+24>>2]=s),c=n[c+4>>2]|0,!c)break;n[s+20>>2]=c,n[c+24>>2]=s}while(0);l=l+B|0,d=B+k|0}else d=k;if(l=l+4|0,n[l>>2]=n[l>>2]&-2,n[M+4>>2]=d|1,n[M+d>>2]=d,l=d>>>3,d>>>0<256){c=11172+(l<<1<<2)|0,s=n[2783]|0,l=1<<l,s&l?(s=c+8|0,l=n[s>>2]|0):(n[2783]=s|l,l=c,s=c+8|0),n[s>>2]=M,n[l+12>>2]=M,n[M+8>>2]=l,n[M+12>>2]=c;break}l=d>>>8;do if(!l)l=0;else{if(d>>>0>16777215){l=31;break}Ue=(l+1048320|0)>>>16&8,Ge=l<<Ue,lt=(Ge+520192|0)>>>16&4,Ge=Ge<<lt,l=(Ge+245760|0)>>>16&2,l=14-(lt|Ue|l)+(Ge<<l>>>15)|0,l=d>>>(l+7|0)&1|l<<1}while(0);if(f=11436+(l<<2)|0,n[M+28>>2]=l,s=M+16|0,n[s+4>>2]=0,n[s>>2]=0,s=n[2784]|0,c=1<<l,!(s&c)){n[2784]=s|c,n[f>>2]=M,n[M+24>>2]=f,n[M+12>>2]=M,n[M+8>>2]=M;break}for(s=d<<((l|0)==31?0:25-(l>>>1)|0),c=n[f>>2]|0;;){if((n[c+4>>2]&-8|0)==(d|0)){Ue=194;break}if(f=c+16+(s>>>31<<2)|0,l=n[f>>2]|0,l)s=s<<1,c=l;else{Ue=193;break}}if((Ue|0)==193){n[f>>2]=M,n[M+24>>2]=c,n[M+12>>2]=M,n[M+8>>2]=M;break}else if((Ue|0)==194){Ue=c+8|0,Ge=n[Ue>>2]|0,n[Ge+12>>2]=M,n[Ue>>2]=M,n[M+8>>2]=Ge,n[M+12>>2]=c,n[M+24>>2]=0;break}}else Ge=(n[2786]|0)+k|0,n[2786]=Ge,n[2789]=M,n[M+4>>2]=Ge|1;while(0);return Ge=O+8|0,C=Lt,Ge|0}for(l=11580;s=n[l>>2]|0,!(s>>>0<=Q>>>0&&(Ge=s+(n[l+4>>2]|0)|0,Ge>>>0>Q>>>0));)l=n[l+8>>2]|0;d=Ge+-47|0,s=d+8|0,s=d+((s&7|0)==0?0:0-s&7)|0,d=Q+16|0,s=s>>>0<d>>>0?Q:s,l=s+8|0,c=m+8|0,c=(c&7|0)==0?0:0-c&7,Ue=m+c|0,c=B+-40-c|0,n[2789]=Ue,n[2786]=c,n[Ue+4>>2]=c|1,n[Ue+c+4>>2]=40,n[2790]=n[2905],c=s+4|0,n[c>>2]=27,n[l>>2]=n[2895],n[l+4>>2]=n[2896],n[l+8>>2]=n[2897],n[l+12>>2]=n[2898],n[2895]=m,n[2896]=B,n[2898]=0,n[2897]=l,l=s+24|0;do Ue=l,l=l+4|0,n[l>>2]=7;while((Ue+8|0)>>>0<Ge>>>0);if((s|0)!=(Q|0)){if(m=s-Q|0,n[c>>2]=n[c>>2]&-2,n[Q+4>>2]=m|1,n[s>>2]=m,l=m>>>3,m>>>0<256){c=11172+(l<<1<<2)|0,s=n[2783]|0,l=1<<l,s&l?(s=c+8|0,l=n[s>>2]|0):(n[2783]=s|l,l=c,s=c+8|0),n[s>>2]=Q,n[l+12>>2]=Q,n[Q+8>>2]=l,n[Q+12>>2]=c;break}if(l=m>>>8,l?m>>>0>16777215?c=31:(Ue=(l+1048320|0)>>>16&8,Ge=l<<Ue,lt=(Ge+520192|0)>>>16&4,Ge=Ge<<lt,c=(Ge+245760|0)>>>16&2,c=14-(lt|Ue|c)+(Ge<<c>>>15)|0,c=m>>>(c+7|0)&1|c<<1):c=0,f=11436+(c<<2)|0,n[Q+28>>2]=c,n[Q+20>>2]=0,n[d>>2]=0,l=n[2784]|0,s=1<<c,!(l&s)){n[2784]=l|s,n[f>>2]=Q,n[Q+24>>2]=f,n[Q+12>>2]=Q,n[Q+8>>2]=Q;break}for(s=m<<((c|0)==31?0:25-(c>>>1)|0),c=n[f>>2]|0;;){if((n[c+4>>2]&-8|0)==(m|0)){Ue=216;break}if(f=c+16+(s>>>31<<2)|0,l=n[f>>2]|0,l)s=s<<1,c=l;else{Ue=215;break}}if((Ue|0)==215){n[f>>2]=Q,n[Q+24>>2]=c,n[Q+12>>2]=Q,n[Q+8>>2]=Q;break}else if((Ue|0)==216){Ue=c+8|0,Ge=n[Ue>>2]|0,n[Ge+12>>2]=Q,n[Ue>>2]=Q,n[Q+8>>2]=Ge,n[Q+12>>2]=c,n[Q+24>>2]=0;break}}}else{Ge=n[2787]|0,(Ge|0)==0|m>>>0<Ge>>>0&&(n[2787]=m),n[2895]=m,n[2896]=B,n[2898]=0,n[2792]=n[2901],n[2791]=-1,l=0;do Ge=11172+(l<<1<<2)|0,n[Ge+12>>2]=Ge,n[Ge+8>>2]=Ge,l=l+1|0;while((l|0)!=32);Ge=m+8|0,Ge=(Ge&7|0)==0?0:0-Ge&7,Ue=m+Ge|0,Ge=B+-40-Ge|0,n[2789]=Ue,n[2786]=Ge,n[Ue+4>>2]=Ge|1,n[Ue+Ge+4>>2]=40,n[2790]=n[2905]}while(0);if(l=n[2786]|0,l>>>0>G>>>0)return lt=l-G|0,n[2786]=lt,Ge=n[2789]|0,Ue=Ge+G|0,n[2789]=Ue,n[Ue+4>>2]=lt|1,n[Ge+4>>2]=G|3,Ge=Ge+8|0,C=Lt,Ge|0}return n[(Vm()|0)>>2]=12,Ge=0,C=Lt,Ge|0}function hD(s){s=s|0;var l=0,c=0,f=0,d=0,m=0,B=0,k=0,Q=0;if(!!s){c=s+-8|0,d=n[2787]|0,s=n[s+-4>>2]|0,l=s&-8,Q=c+l|0;do if(s&1)k=c,B=c;else{if(f=n[c>>2]|0,!(s&3)||(B=c+(0-f)|0,m=f+l|0,B>>>0<d>>>0))return;if((B|0)==(n[2788]|0)){if(s=Q+4|0,l=n[s>>2]|0,(l&3|0)!=3){k=B,l=m;break}n[2785]=m,n[s>>2]=l&-2,n[B+4>>2]=m|1,n[B+m>>2]=m;return}if(c=f>>>3,f>>>0<256)if(s=n[B+8>>2]|0,l=n[B+12>>2]|0,(l|0)==(s|0)){n[2783]=n[2783]&~(1<<c),k=B,l=m;break}else{n[s+12>>2]=l,n[l+8>>2]=s,k=B,l=m;break}d=n[B+24>>2]|0,s=n[B+12>>2]|0;do if((s|0)==(B|0)){if(c=B+16|0,l=c+4|0,s=n[l>>2]|0,!s)if(s=n[c>>2]|0,s)l=c;else{s=0;break}for(;;){if(c=s+20|0,f=n[c>>2]|0,f|0){s=f,l=c;continue}if(c=s+16|0,f=n[c>>2]|0,f)s=f,l=c;else break}n[l>>2]=0}else k=n[B+8>>2]|0,n[k+12>>2]=s,n[s+8>>2]=k;while(0);if(d){if(l=n[B+28>>2]|0,c=11436+(l<<2)|0,(B|0)==(n[c>>2]|0)){if(n[c>>2]=s,!s){n[2784]=n[2784]&~(1<<l),k=B,l=m;break}}else if(n[d+16+(((n[d+16>>2]|0)!=(B|0)&1)<<2)>>2]=s,!s){k=B,l=m;break}n[s+24>>2]=d,l=B+16|0,c=n[l>>2]|0,c|0&&(n[s+16>>2]=c,n[c+24>>2]=s),l=n[l+4>>2]|0,l?(n[s+20>>2]=l,n[l+24>>2]=s,k=B,l=m):(k=B,l=m)}else k=B,l=m}while(0);if(!(B>>>0>=Q>>>0)&&(s=Q+4|0,f=n[s>>2]|0,!!(f&1))){if(f&2)n[s>>2]=f&-2,n[k+4>>2]=l|1,n[B+l>>2]=l,d=l;else{if(s=n[2788]|0,(Q|0)==(n[2789]|0)){if(Q=(n[2786]|0)+l|0,n[2786]=Q,n[2789]=k,n[k+4>>2]=Q|1,(k|0)!=(s|0))return;n[2788]=0,n[2785]=0;return}if((Q|0)==(s|0)){Q=(n[2785]|0)+l|0,n[2785]=Q,n[2788]=B,n[k+4>>2]=Q|1,n[B+Q>>2]=Q;return}d=(f&-8)+l|0,c=f>>>3;do if(f>>>0<256)if(l=n[Q+8>>2]|0,s=n[Q+12>>2]|0,(s|0)==(l|0)){n[2783]=n[2783]&~(1<<c);break}else{n[l+12>>2]=s,n[s+8>>2]=l;break}else{m=n[Q+24>>2]|0,s=n[Q+12>>2]|0;do if((s|0)==(Q|0)){if(c=Q+16|0,l=c+4|0,s=n[l>>2]|0,!s)if(s=n[c>>2]|0,s)l=c;else{c=0;break}for(;;){if(c=s+20|0,f=n[c>>2]|0,f|0){s=f,l=c;continue}if(c=s+16|0,f=n[c>>2]|0,f)s=f,l=c;else break}n[l>>2]=0,c=s}else c=n[Q+8>>2]|0,n[c+12>>2]=s,n[s+8>>2]=c,c=s;while(0);if(m|0){if(s=n[Q+28>>2]|0,l=11436+(s<<2)|0,(Q|0)==(n[l>>2]|0)){if(n[l>>2]=c,!c){n[2784]=n[2784]&~(1<<s);break}}else if(n[m+16+(((n[m+16>>2]|0)!=(Q|0)&1)<<2)>>2]=c,!c)break;n[c+24>>2]=m,s=Q+16|0,l=n[s>>2]|0,l|0&&(n[c+16>>2]=l,n[l+24>>2]=c),s=n[s+4>>2]|0,s|0&&(n[c+20>>2]=s,n[s+24>>2]=c)}}while(0);if(n[k+4>>2]=d|1,n[B+d>>2]=d,(k|0)==(n[2788]|0)){n[2785]=d;return}}if(s=d>>>3,d>>>0<256){c=11172+(s<<1<<2)|0,l=n[2783]|0,s=1<<s,l&s?(l=c+8|0,s=n[l>>2]|0):(n[2783]=l|s,s=c,l=c+8|0),n[l>>2]=k,n[s+12>>2]=k,n[k+8>>2]=s,n[k+12>>2]=c;return}s=d>>>8,s?d>>>0>16777215?s=31:(B=(s+1048320|0)>>>16&8,Q=s<<B,m=(Q+520192|0)>>>16&4,Q=Q<<m,s=(Q+245760|0)>>>16&2,s=14-(m|B|s)+(Q<<s>>>15)|0,s=d>>>(s+7|0)&1|s<<1):s=0,f=11436+(s<<2)|0,n[k+28>>2]=s,n[k+20>>2]=0,n[k+16>>2]=0,l=n[2784]|0,c=1<<s;do if(l&c){for(l=d<<((s|0)==31?0:25-(s>>>1)|0),c=n[f>>2]|0;;){if((n[c+4>>2]&-8|0)==(d|0)){s=73;break}if(f=c+16+(l>>>31<<2)|0,s=n[f>>2]|0,s)l=l<<1,c=s;else{s=72;break}}if((s|0)==72){n[f>>2]=k,n[k+24>>2]=c,n[k+12>>2]=k,n[k+8>>2]=k;break}else if((s|0)==73){B=c+8|0,Q=n[B>>2]|0,n[Q+12>>2]=k,n[B>>2]=k,n[k+8>>2]=Q,n[k+12>>2]=c,n[k+24>>2]=0;break}}else n[2784]=l|c,n[f>>2]=k,n[k+24>>2]=f,n[k+12>>2]=k,n[k+8>>2]=k;while(0);if(Q=(n[2791]|0)+-1|0,n[2791]=Q,!Q)s=11588;else return;for(;s=n[s>>2]|0,s;)s=s+8|0;n[2791]=-1}}}function DUe(){return 11628}function SUe(s){s=s|0;var l=0,c=0;return l=C,C=C+16|0,c=l,n[c>>2]=xUe(n[s+60>>2]|0)|0,s=gD(hc(6,c|0)|0)|0,C=l,s|0}function r7(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0,qe=0;G=C,C=C+48|0,M=G+16|0,m=G,d=G+32|0,k=s+28|0,f=n[k>>2]|0,n[d>>2]=f,Q=s+20|0,f=(n[Q>>2]|0)-f|0,n[d+4>>2]=f,n[d+8>>2]=l,n[d+12>>2]=c,f=f+c|0,B=s+60|0,n[m>>2]=n[B>>2],n[m+4>>2]=d,n[m+8>>2]=2,m=gD(Li(146,m|0)|0)|0;e:do if((f|0)!=(m|0)){for(l=2;!((m|0)<0);)if(f=f-m|0,qe=n[d+4>>2]|0,se=m>>>0>qe>>>0,d=se?d+8|0:d,l=(se<<31>>31)+l|0,qe=m-(se?qe:0)|0,n[d>>2]=(n[d>>2]|0)+qe,se=d+4|0,n[se>>2]=(n[se>>2]|0)-qe,n[M>>2]=n[B>>2],n[M+4>>2]=d,n[M+8>>2]=l,m=gD(Li(146,M|0)|0)|0,(f|0)==(m|0)){O=3;break e}n[s+16>>2]=0,n[k>>2]=0,n[Q>>2]=0,n[s>>2]=n[s>>2]|32,(l|0)==2?c=0:c=c-(n[d+4>>2]|0)|0}else O=3;while(0);return(O|0)==3&&(qe=n[s+44>>2]|0,n[s+16>>2]=qe+(n[s+48>>2]|0),n[k>>2]=qe,n[Q>>2]=qe),C=G,c|0}function PUe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0;return d=C,C=C+32|0,m=d,f=d+20|0,n[m>>2]=n[s+60>>2],n[m+4>>2]=0,n[m+8>>2]=l,n[m+12>>2]=f,n[m+16>>2]=c,(gD(sa(140,m|0)|0)|0)<0?(n[f>>2]=-1,s=-1):s=n[f>>2]|0,C=d,s|0}function gD(s){return s=s|0,s>>>0>4294963200&&(n[(Vm()|0)>>2]=0-s,s=-1),s|0}function Vm(){return(bUe()|0)+64|0}function bUe(){return SR()|0}function SR(){return 2084}function xUe(s){return s=s|0,s|0}function kUe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0;return d=C,C=C+32|0,f=d,n[s+36>>2]=1,(n[s>>2]&64|0)==0&&(n[f>>2]=n[s+60>>2],n[f+4>>2]=21523,n[f+8>>2]=d+16,fu(54,f|0)|0)&&(o[s+75>>0]=-1),f=r7(s,l,c)|0,C=d,f|0}function n7(s,l){s=s|0,l=l|0;var c=0,f=0;if(c=o[s>>0]|0,f=o[l>>0]|0,c<<24>>24==0||c<<24>>24!=f<<24>>24)s=f;else{do s=s+1|0,l=l+1|0,c=o[s>>0]|0,f=o[l>>0]|0;while(!(c<<24>>24==0||c<<24>>24!=f<<24>>24));s=f}return(c&255)-(s&255)|0}function QUe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0;e:do if(!c)s=0;else{for(;f=o[s>>0]|0,d=o[l>>0]|0,f<<24>>24==d<<24>>24;)if(c=c+-1|0,c)s=s+1|0,l=l+1|0;else{s=0;break e}s=(f&255)-(d&255)|0}while(0);return s|0}function i7(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0,qe=0,Me=0,Qe=0;Qe=C,C=C+224|0,O=Qe+120|0,G=Qe+80|0,qe=Qe,Me=Qe+136|0,f=G,d=f+40|0;do n[f>>2]=0,f=f+4|0;while((f|0)<(d|0));return n[O>>2]=n[c>>2],(PR(0,l,O,qe,G)|0)<0?c=-1:((n[s+76>>2]|0)>-1?se=FUe(s)|0:se=0,c=n[s>>2]|0,M=c&32,(o[s+74>>0]|0)<1&&(n[s>>2]=c&-33),f=s+48|0,n[f>>2]|0?c=PR(s,l,O,qe,G)|0:(d=s+44|0,m=n[d>>2]|0,n[d>>2]=Me,B=s+28|0,n[B>>2]=Me,k=s+20|0,n[k>>2]=Me,n[f>>2]=80,Q=s+16|0,n[Q>>2]=Me+80,c=PR(s,l,O,qe,G)|0,m&&(ED[n[s+36>>2]&7](s,0,0)|0,c=(n[k>>2]|0)==0?-1:c,n[d>>2]=m,n[f>>2]=0,n[Q>>2]=0,n[B>>2]=0,n[k>>2]=0)),f=n[s>>2]|0,n[s>>2]=f|M,se|0&&RUe(s),c=(f&32|0)==0?c:-1),C=Qe,c|0}function PR(s,l,c,f,d){s=s|0,l=l|0,c=c|0,f=f|0,d=d|0;var m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0,qe=0,Me=0,Qe=0,et=0,Xe=0,lt=0,Ue=0,Ge=0,Lt=0,Mr=0,or=0,Xt=0,Sr=0,Nr=0,ir=0;ir=C,C=C+64|0,or=ir+16|0,Xt=ir,Lt=ir+24|0,Sr=ir+8|0,Nr=ir+20|0,n[or>>2]=l,lt=(s|0)!=0,Ue=Lt+40|0,Ge=Ue,Lt=Lt+39|0,Mr=Sr+4|0,B=0,m=0,O=0;e:for(;;){do if((m|0)>-1)if((B|0)>(2147483647-m|0)){n[(Vm()|0)>>2]=75,m=-1;break}else{m=B+m|0;break}while(0);if(B=o[l>>0]|0,B<<24>>24)k=l;else{Xe=87;break}t:for(;;){switch(B<<24>>24){case 37:{B=k,Xe=9;break t}case 0:{B=k;break t}default:}et=k+1|0,n[or>>2]=et,B=o[et>>0]|0,k=et}t:do if((Xe|0)==9)for(;;){if(Xe=0,(o[k+1>>0]|0)!=37)break t;if(B=B+1|0,k=k+2|0,n[or>>2]=k,(o[k>>0]|0)==37)Xe=9;else break}while(0);if(B=B-l|0,lt&&ss(s,l,B),B|0){l=k;continue}Q=k+1|0,B=(o[Q>>0]|0)+-48|0,B>>>0<10?(et=(o[k+2>>0]|0)==36,Qe=et?B:-1,O=et?1:O,Q=et?k+3|0:Q):Qe=-1,n[or>>2]=Q,B=o[Q>>0]|0,k=(B<<24>>24)+-32|0;t:do if(k>>>0<32)for(M=0,G=B;;){if(B=1<<k,!(B&75913)){B=G;break t}if(M=B|M,Q=Q+1|0,n[or>>2]=Q,B=o[Q>>0]|0,k=(B<<24>>24)+-32|0,k>>>0>=32)break;G=B}else M=0;while(0);if(B<<24>>24==42){if(k=Q+1|0,B=(o[k>>0]|0)+-48|0,B>>>0<10&&(o[Q+2>>0]|0)==36)n[d+(B<<2)>>2]=10,B=n[f+((o[k>>0]|0)+-48<<3)>>2]|0,O=1,Q=Q+3|0;else{if(O|0){m=-1;break}lt?(O=(n[c>>2]|0)+(4-1)&~(4-1),B=n[O>>2]|0,n[c>>2]=O+4,O=0,Q=k):(B=0,O=0,Q=k)}n[or>>2]=Q,et=(B|0)<0,B=et?0-B|0:B,M=et?M|8192:M}else{if(B=s7(or)|0,(B|0)<0){m=-1;break}Q=n[or>>2]|0}do if((o[Q>>0]|0)==46){if((o[Q+1>>0]|0)!=42){n[or>>2]=Q+1,k=s7(or)|0,Q=n[or>>2]|0;break}if(G=Q+2|0,k=(o[G>>0]|0)+-48|0,k>>>0<10&&(o[Q+3>>0]|0)==36){n[d+(k<<2)>>2]=10,k=n[f+((o[G>>0]|0)+-48<<3)>>2]|0,Q=Q+4|0,n[or>>2]=Q;break}if(O|0){m=-1;break e}lt?(et=(n[c>>2]|0)+(4-1)&~(4-1),k=n[et>>2]|0,n[c>>2]=et+4):k=0,n[or>>2]=G,Q=G}else k=-1;while(0);for(Me=0;;){if(((o[Q>>0]|0)+-65|0)>>>0>57){m=-1;break e}if(et=Q+1|0,n[or>>2]=et,G=o[(o[Q>>0]|0)+-65+(5178+(Me*58|0))>>0]|0,se=G&255,(se+-1|0)>>>0<8)Me=se,Q=et;else break}if(!(G<<24>>24)){m=-1;break}qe=(Qe|0)>-1;do if(G<<24>>24==19)if(qe){m=-1;break e}else Xe=49;else{if(qe){n[d+(Qe<<2)>>2]=se,qe=f+(Qe<<3)|0,Qe=n[qe+4>>2]|0,Xe=Xt,n[Xe>>2]=n[qe>>2],n[Xe+4>>2]=Qe,Xe=49;break}if(!lt){m=0;break e}o7(Xt,se,c)}while(0);if((Xe|0)==49&&(Xe=0,!lt)){B=0,l=et;continue}Q=o[Q>>0]|0,Q=(Me|0)!=0&(Q&15|0)==3?Q&-33:Q,qe=M&-65537,Qe=(M&8192|0)==0?M:qe;t:do switch(Q|0){case 110:switch((Me&255)<<24>>24){case 0:{n[n[Xt>>2]>>2]=m,B=0,l=et;continue e}case 1:{n[n[Xt>>2]>>2]=m,B=0,l=et;continue e}case 2:{B=n[Xt>>2]|0,n[B>>2]=m,n[B+4>>2]=((m|0)<0)<<31>>31,B=0,l=et;continue e}case 3:{a[n[Xt>>2]>>1]=m,B=0,l=et;continue e}case 4:{o[n[Xt>>2]>>0]=m,B=0,l=et;continue e}case 6:{n[n[Xt>>2]>>2]=m,B=0,l=et;continue e}case 7:{B=n[Xt>>2]|0,n[B>>2]=m,n[B+4>>2]=((m|0)<0)<<31>>31,B=0,l=et;continue e}default:{B=0,l=et;continue e}}case 112:{Q=120,k=k>>>0>8?k:8,l=Qe|8,Xe=61;break}case 88:case 120:{l=Qe,Xe=61;break}case 111:{Q=Xt,l=n[Q>>2]|0,Q=n[Q+4>>2]|0,se=NUe(l,Q,Ue)|0,qe=Ge-se|0,M=0,G=5642,k=(Qe&8|0)==0|(k|0)>(qe|0)?k:qe+1|0,qe=Qe,Xe=67;break}case 105:case 100:if(Q=Xt,l=n[Q>>2]|0,Q=n[Q+4>>2]|0,(Q|0)<0){l=dD(0,0,l|0,Q|0)|0,Q=Se,M=Xt,n[M>>2]=l,n[M+4>>2]=Q,M=1,G=5642,Xe=66;break t}else{M=(Qe&2049|0)!=0&1,G=(Qe&2048|0)==0?(Qe&1|0)==0?5642:5644:5643,Xe=66;break t}case 117:{Q=Xt,M=0,G=5642,l=n[Q>>2]|0,Q=n[Q+4>>2]|0,Xe=66;break}case 99:{o[Lt>>0]=n[Xt>>2],l=Lt,M=0,G=5642,se=Ue,Q=1,k=qe;break}case 109:{Q=LUe(n[(Vm()|0)>>2]|0)|0,Xe=71;break}case 115:{Q=n[Xt>>2]|0,Q=Q|0?Q:5652,Xe=71;break}case 67:{n[Sr>>2]=n[Xt>>2],n[Mr>>2]=0,n[Xt>>2]=Sr,se=-1,Q=Sr,Xe=75;break}case 83:{l=n[Xt>>2]|0,k?(se=k,Q=l,Xe=75):(Bs(s,32,B,0,Qe),l=0,Xe=84);break}case 65:case 71:case 70:case 69:case 97:case 103:case 102:case 101:{B=MUe(s,+E[Xt>>3],B,k,Qe,Q)|0,l=et;continue e}default:M=0,G=5642,se=Ue,Q=k,k=Qe}while(0);t:do if((Xe|0)==61)Qe=Xt,Me=n[Qe>>2]|0,Qe=n[Qe+4>>2]|0,se=TUe(Me,Qe,Ue,Q&32)|0,G=(l&8|0)==0|(Me|0)==0&(Qe|0)==0,M=G?0:2,G=G?5642:5642+(Q>>4)|0,qe=l,l=Me,Q=Qe,Xe=67;else if((Xe|0)==66)se=Jm(l,Q,Ue)|0,qe=Qe,Xe=67;else if((Xe|0)==71)Xe=0,Qe=OUe(Q,0,k)|0,Me=(Qe|0)==0,l=Q,M=0,G=5642,se=Me?Q+k|0:Qe,Q=Me?k:Qe-Q|0,k=qe;else if((Xe|0)==75){for(Xe=0,G=Q,l=0,k=0;M=n[G>>2]|0,!(!M||(k=a7(Nr,M)|0,(k|0)<0|k>>>0>(se-l|0)>>>0));)if(l=k+l|0,se>>>0>l>>>0)G=G+4|0;else break;if((k|0)<0){m=-1;break e}if(Bs(s,32,B,l,Qe),!l)l=0,Xe=84;else for(M=0;;){if(k=n[Q>>2]|0,!k){Xe=84;break t}if(k=a7(Nr,k)|0,M=k+M|0,(M|0)>(l|0)){Xe=84;break t}if(ss(s,Nr,k),M>>>0>=l>>>0){Xe=84;break}else Q=Q+4|0}}while(0);if((Xe|0)==67)Xe=0,Q=(l|0)!=0|(Q|0)!=0,Qe=(k|0)!=0|Q,Q=((Q^1)&1)+(Ge-se)|0,l=Qe?se:Ue,se=Ue,Q=Qe?(k|0)>(Q|0)?k:Q:k,k=(k|0)>-1?qe&-65537:qe;else if((Xe|0)==84){Xe=0,Bs(s,32,B,l,Qe^8192),B=(B|0)>(l|0)?B:l,l=et;continue}Me=se-l|0,qe=(Q|0)<(Me|0)?Me:Q,Qe=qe+M|0,B=(B|0)<(Qe|0)?Qe:B,Bs(s,32,B,Qe,k),ss(s,G,M),Bs(s,48,B,Qe,k^65536),Bs(s,48,qe,Me,0),ss(s,l,Me),Bs(s,32,B,Qe,k^8192),l=et}e:do if((Xe|0)==87&&!s)if(!O)m=0;else{for(m=1;l=n[d+(m<<2)>>2]|0,!!l;)if(o7(f+(m<<3)|0,l,c),m=m+1|0,(m|0)>=10){m=1;break e}for(;;){if(n[d+(m<<2)>>2]|0){m=-1;break e}if(m=m+1|0,(m|0)>=10){m=1;break}}}while(0);return C=ir,m|0}function FUe(s){return s=s|0,0}function RUe(s){s=s|0}function ss(s,l,c){s=s|0,l=l|0,c=c|0,n[s>>2]&32||KUe(l,c,s)|0}function s7(s){s=s|0;var l=0,c=0,f=0;if(c=n[s>>2]|0,f=(o[c>>0]|0)+-48|0,f>>>0<10){l=0;do l=f+(l*10|0)|0,c=c+1|0,n[s>>2]=c,f=(o[c>>0]|0)+-48|0;while(f>>>0<10)}else l=0;return l|0}function o7(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0;e:do if(l>>>0<=20)do switch(l|0){case 9:{f=(n[c>>2]|0)+(4-1)&~(4-1),l=n[f>>2]|0,n[c>>2]=f+4,n[s>>2]=l;break e}case 10:{f=(n[c>>2]|0)+(4-1)&~(4-1),l=n[f>>2]|0,n[c>>2]=f+4,f=s,n[f>>2]=l,n[f+4>>2]=((l|0)<0)<<31>>31;break e}case 11:{f=(n[c>>2]|0)+(4-1)&~(4-1),l=n[f>>2]|0,n[c>>2]=f+4,f=s,n[f>>2]=l,n[f+4>>2]=0;break e}case 12:{f=(n[c>>2]|0)+(8-1)&~(8-1),l=f,d=n[l>>2]|0,l=n[l+4>>2]|0,n[c>>2]=f+8,f=s,n[f>>2]=d,n[f+4>>2]=l;break e}case 13:{d=(n[c>>2]|0)+(4-1)&~(4-1),f=n[d>>2]|0,n[c>>2]=d+4,f=(f&65535)<<16>>16,d=s,n[d>>2]=f,n[d+4>>2]=((f|0)<0)<<31>>31;break e}case 14:{d=(n[c>>2]|0)+(4-1)&~(4-1),f=n[d>>2]|0,n[c>>2]=d+4,d=s,n[d>>2]=f&65535,n[d+4>>2]=0;break e}case 15:{d=(n[c>>2]|0)+(4-1)&~(4-1),f=n[d>>2]|0,n[c>>2]=d+4,f=(f&255)<<24>>24,d=s,n[d>>2]=f,n[d+4>>2]=((f|0)<0)<<31>>31;break e}case 16:{d=(n[c>>2]|0)+(4-1)&~(4-1),f=n[d>>2]|0,n[c>>2]=d+4,d=s,n[d>>2]=f&255,n[d+4>>2]=0;break e}case 17:{d=(n[c>>2]|0)+(8-1)&~(8-1),m=+E[d>>3],n[c>>2]=d+8,E[s>>3]=m;break e}case 18:{d=(n[c>>2]|0)+(8-1)&~(8-1),m=+E[d>>3],n[c>>2]=d+8,E[s>>3]=m;break e}default:break e}while(0);while(0)}function TUe(s,l,c,f){if(s=s|0,l=l|0,c=c|0,f=f|0,!((s|0)==0&(l|0)==0))do c=c+-1|0,o[c>>0]=u[5694+(s&15)>>0]|0|f,s=mD(s|0,l|0,4)|0,l=Se;while(!((s|0)==0&(l|0)==0));return c|0}function NUe(s,l,c){if(s=s|0,l=l|0,c=c|0,!((s|0)==0&(l|0)==0))do c=c+-1|0,o[c>>0]=s&7|48,s=mD(s|0,l|0,3)|0,l=Se;while(!((s|0)==0&(l|0)==0));return c|0}function Jm(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;if(l>>>0>0|(l|0)==0&s>>>0>4294967295){for(;f=QR(s|0,l|0,10,0)|0,c=c+-1|0,o[c>>0]=f&255|48,f=s,s=kR(s|0,l|0,10,0)|0,l>>>0>9|(l|0)==9&f>>>0>4294967295;)l=Se;l=s}else l=s;if(l)for(;c=c+-1|0,o[c>>0]=(l>>>0)%10|0|48,!(l>>>0<10);)l=(l>>>0)/10|0;return c|0}function LUe(s){return s=s|0,GUe(s,n[(jUe()|0)+188>>2]|0)|0}function OUe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;m=l&255,f=(c|0)!=0;e:do if(f&(s&3|0)!=0)for(d=l&255;;){if((o[s>>0]|0)==d<<24>>24){B=6;break e}if(s=s+1|0,c=c+-1|0,f=(c|0)!=0,!(f&(s&3|0)!=0)){B=5;break}}else B=5;while(0);(B|0)==5&&(f?B=6:c=0);e:do if((B|0)==6&&(d=l&255,(o[s>>0]|0)!=d<<24>>24)){f=je(m,16843009)|0;t:do if(c>>>0>3){for(;m=n[s>>2]^f,!((m&-2139062144^-2139062144)&m+-16843009|0);)if(s=s+4|0,c=c+-4|0,c>>>0<=3){B=11;break t}}else B=11;while(0);if((B|0)==11&&!c){c=0;break}for(;;){if((o[s>>0]|0)==d<<24>>24)break e;if(s=s+1|0,c=c+-1|0,!c){c=0;break}}}while(0);return(c|0?s:0)|0}function Bs(s,l,c,f,d){s=s|0,l=l|0,c=c|0,f=f|0,d=d|0;var m=0,B=0;if(B=C,C=C+256|0,m=B,(c|0)>(f|0)&(d&73728|0)==0){if(d=c-f|0,Xm(m|0,l|0,(d>>>0<256?d:256)|0)|0,d>>>0>255){l=c-f|0;do ss(s,m,256),d=d+-256|0;while(d>>>0>255);d=l&255}ss(s,m,d)}C=B}function a7(s,l){return s=s|0,l=l|0,s?s=_Ue(s,l,0)|0:s=0,s|0}function MUe(s,l,c,f,d,m){s=s|0,l=+l,c=c|0,f=f|0,d=d|0,m=m|0;var B=0,k=0,Q=0,M=0,O=0,G=0,se=0,qe=0,Me=0,Qe=0,et=0,Xe=0,lt=0,Ue=0,Ge=0,Lt=0,Mr=0,or=0,Xt=0,Sr=0,Nr=0,ir=0,xn=0;xn=C,C=C+560|0,Q=xn+8|0,et=xn,ir=xn+524|0,Nr=ir,M=xn+512|0,n[et>>2]=0,Sr=M+12|0,l7(l)|0,(Se|0)<0?(l=-l,or=1,Mr=5659):(or=(d&2049|0)!=0&1,Mr=(d&2048|0)==0?(d&1|0)==0?5660:5665:5662),l7(l)|0,Xt=Se&2146435072;do if(Xt>>>0<2146435072|(Xt|0)==2146435072&0<0){if(qe=+UUe(l,et)*2,B=qe!=0,B&&(n[et>>2]=(n[et>>2]|0)+-1),lt=m|32,(lt|0)==97){Me=m&32,se=(Me|0)==0?Mr:Mr+9|0,G=or|2,B=12-f|0;do if(f>>>0>11|(B|0)==0)l=qe;else{l=8;do B=B+-1|0,l=l*16;while((B|0)!=0);if((o[se>>0]|0)==45){l=-(l+(-qe-l));break}else{l=qe+l-l;break}}while(0);k=n[et>>2]|0,B=(k|0)<0?0-k|0:k,B=Jm(B,((B|0)<0)<<31>>31,Sr)|0,(B|0)==(Sr|0)&&(B=M+11|0,o[B>>0]=48),o[B+-1>>0]=(k>>31&2)+43,O=B+-2|0,o[O>>0]=m+15,M=(f|0)<1,Q=(d&8|0)==0,B=ir;do Xt=~~l,k=B+1|0,o[B>>0]=u[5694+Xt>>0]|Me,l=(l-+(Xt|0))*16,(k-Nr|0)==1&&!(Q&(M&l==0))?(o[k>>0]=46,B=B+2|0):B=k;while(l!=0);Xt=B-Nr|0,Nr=Sr-O|0,Sr=(f|0)!=0&(Xt+-2|0)<(f|0)?f+2|0:Xt,B=Nr+G+Sr|0,Bs(s,32,c,B,d),ss(s,se,G),Bs(s,48,c,B,d^65536),ss(s,ir,Xt),Bs(s,48,Sr-Xt|0,0,0),ss(s,O,Nr),Bs(s,32,c,B,d^8192);break}k=(f|0)<0?6:f,B?(B=(n[et>>2]|0)+-28|0,n[et>>2]=B,l=qe*268435456):(l=qe,B=n[et>>2]|0),Xt=(B|0)<0?Q:Q+288|0,Q=Xt;do Ge=~~l>>>0,n[Q>>2]=Ge,Q=Q+4|0,l=(l-+(Ge>>>0))*1e9;while(l!=0);if((B|0)>0)for(M=Xt,G=Q;;){if(O=(B|0)<29?B:29,B=G+-4|0,B>>>0>=M>>>0){Q=0;do Ue=h7(n[B>>2]|0,0,O|0)|0,Ue=xR(Ue|0,Se|0,Q|0,0)|0,Ge=Se,Xe=QR(Ue|0,Ge|0,1e9,0)|0,n[B>>2]=Xe,Q=kR(Ue|0,Ge|0,1e9,0)|0,B=B+-4|0;while(B>>>0>=M>>>0);Q&&(M=M+-4|0,n[M>>2]=Q)}for(Q=G;!(Q>>>0<=M>>>0);)if(B=Q+-4|0,!(n[B>>2]|0))Q=B;else break;if(B=(n[et>>2]|0)-O|0,n[et>>2]=B,(B|0)>0)G=Q;else break}else M=Xt;if((B|0)<0){f=((k+25|0)/9|0)+1|0,Qe=(lt|0)==102;do{if(Me=0-B|0,Me=(Me|0)<9?Me:9,M>>>0<Q>>>0){O=(1<<Me)+-1|0,G=1e9>>>Me,se=0,B=M;do Ge=n[B>>2]|0,n[B>>2]=(Ge>>>Me)+se,se=je(Ge&O,G)|0,B=B+4|0;while(B>>>0<Q>>>0);B=(n[M>>2]|0)==0?M+4|0:M,se?(n[Q>>2]=se,M=B,B=Q+4|0):(M=B,B=Q)}else M=(n[M>>2]|0)==0?M+4|0:M,B=Q;Q=Qe?Xt:M,Q=(B-Q>>2|0)>(f|0)?Q+(f<<2)|0:B,B=(n[et>>2]|0)+Me|0,n[et>>2]=B}while((B|0)<0);B=M,f=Q}else B=M,f=Q;if(Ge=Xt,B>>>0<f>>>0){if(Q=(Ge-B>>2)*9|0,O=n[B>>2]|0,O>>>0>=10){M=10;do M=M*10|0,Q=Q+1|0;while(O>>>0>=M>>>0)}}else Q=0;if(Qe=(lt|0)==103,Xe=(k|0)!=0,M=k-((lt|0)!=102?Q:0)+((Xe&Qe)<<31>>31)|0,(M|0)<(((f-Ge>>2)*9|0)+-9|0)){if(M=M+9216|0,Me=Xt+4+(((M|0)/9|0)+-1024<<2)|0,M=((M|0)%9|0)+1|0,(M|0)<9){O=10;do O=O*10|0,M=M+1|0;while((M|0)!=9)}else O=10;if(G=n[Me>>2]|0,se=(G>>>0)%(O>>>0)|0,M=(Me+4|0)==(f|0),M&(se|0)==0)M=Me;else if(qe=(((G>>>0)/(O>>>0)|0)&1|0)==0?9007199254740992:9007199254740994,Ue=(O|0)/2|0,l=se>>>0<Ue>>>0?.5:M&(se|0)==(Ue|0)?1:1.5,or&&(Ue=(o[Mr>>0]|0)==45,l=Ue?-l:l,qe=Ue?-qe:qe),M=G-se|0,n[Me>>2]=M,qe+l!=qe){if(Ue=M+O|0,n[Me>>2]=Ue,Ue>>>0>999999999)for(Q=Me;M=Q+-4|0,n[Q>>2]=0,M>>>0<B>>>0&&(B=B+-4|0,n[B>>2]=0),Ue=(n[M>>2]|0)+1|0,n[M>>2]=Ue,Ue>>>0>999999999;)Q=M;else M=Me;if(Q=(Ge-B>>2)*9|0,G=n[B>>2]|0,G>>>0>=10){O=10;do O=O*10|0,Q=Q+1|0;while(G>>>0>=O>>>0)}}else M=Me;M=M+4|0,M=f>>>0>M>>>0?M:f,Ue=B}else M=f,Ue=B;for(lt=M;;){if(lt>>>0<=Ue>>>0){et=0;break}if(B=lt+-4|0,!(n[B>>2]|0))lt=B;else{et=1;break}}f=0-Q|0;do if(Qe)if(B=((Xe^1)&1)+k|0,(B|0)>(Q|0)&(Q|0)>-5?(O=m+-1|0,k=B+-1-Q|0):(O=m+-2|0,k=B+-1|0),B=d&8,B)Me=B;else{if(et&&(Lt=n[lt+-4>>2]|0,(Lt|0)!=0))if((Lt>>>0)%10|0)M=0;else{M=0,B=10;do B=B*10|0,M=M+1|0;while(!((Lt>>>0)%(B>>>0)|0|0))}else M=9;if(B=((lt-Ge>>2)*9|0)+-9|0,(O|32|0)==102){Me=B-M|0,Me=(Me|0)>0?Me:0,k=(k|0)<(Me|0)?k:Me,Me=0;break}else{Me=B+Q-M|0,Me=(Me|0)>0?Me:0,k=(k|0)<(Me|0)?k:Me,Me=0;break}}else O=m,Me=d&8;while(0);if(Qe=k|Me,G=(Qe|0)!=0&1,se=(O|32|0)==102,se)Xe=0,B=(Q|0)>0?Q:0;else{if(B=(Q|0)<0?f:Q,B=Jm(B,((B|0)<0)<<31>>31,Sr)|0,M=Sr,(M-B|0)<2)do B=B+-1|0,o[B>>0]=48;while((M-B|0)<2);o[B+-1>>0]=(Q>>31&2)+43,B=B+-2|0,o[B>>0]=O,Xe=B,B=M-B|0}if(B=or+1+k+G+B|0,Bs(s,32,c,B,d),ss(s,Mr,or),Bs(s,48,c,B,d^65536),se){O=Ue>>>0>Xt>>>0?Xt:Ue,Me=ir+9|0,G=Me,se=ir+8|0,M=O;do{if(Q=Jm(n[M>>2]|0,0,Me)|0,(M|0)==(O|0))(Q|0)==(Me|0)&&(o[se>>0]=48,Q=se);else if(Q>>>0>ir>>>0){Xm(ir|0,48,Q-Nr|0)|0;do Q=Q+-1|0;while(Q>>>0>ir>>>0)}ss(s,Q,G-Q|0),M=M+4|0}while(M>>>0<=Xt>>>0);if(Qe|0&&ss(s,5710,1),M>>>0<lt>>>0&(k|0)>0)for(;;){if(Q=Jm(n[M>>2]|0,0,Me)|0,Q>>>0>ir>>>0){Xm(ir|0,48,Q-Nr|0)|0;do Q=Q+-1|0;while(Q>>>0>ir>>>0)}if(ss(s,Q,(k|0)<9?k:9),M=M+4|0,Q=k+-9|0,M>>>0<lt>>>0&(k|0)>9)k=Q;else{k=Q;break}}Bs(s,48,k+9|0,9,0)}else{if(Qe=et?lt:Ue+4|0,(k|0)>-1){et=ir+9|0,Me=(Me|0)==0,f=et,G=0-Nr|0,se=ir+8|0,O=Ue;do{Q=Jm(n[O>>2]|0,0,et)|0,(Q|0)==(et|0)&&(o[se>>0]=48,Q=se);do if((O|0)==(Ue|0)){if(M=Q+1|0,ss(s,Q,1),Me&(k|0)<1){Q=M;break}ss(s,5710,1),Q=M}else{if(Q>>>0<=ir>>>0)break;Xm(ir|0,48,Q+G|0)|0;do Q=Q+-1|0;while(Q>>>0>ir>>>0)}while(0);Nr=f-Q|0,ss(s,Q,(k|0)>(Nr|0)?Nr:k),k=k-Nr|0,O=O+4|0}while(O>>>0<Qe>>>0&(k|0)>-1)}Bs(s,48,k+18|0,18,0),ss(s,Xe,Sr-Xe|0)}Bs(s,32,c,B,d^8192)}else ir=(m&32|0)!=0,B=or+3|0,Bs(s,32,c,B,d&-65537),ss(s,Mr,or),ss(s,l!=l|!1?ir?5686:5690:ir?5678:5682,3),Bs(s,32,c,B,d^8192);while(0);return C=xn,((B|0)<(c|0)?c:B)|0}function l7(s){s=+s;var l=0;return E[v>>3]=s,l=n[v>>2]|0,Se=n[v+4>>2]|0,l|0}function UUe(s,l){return s=+s,l=l|0,+ +c7(s,l)}function c7(s,l){s=+s,l=l|0;var c=0,f=0,d=0;switch(E[v>>3]=s,c=n[v>>2]|0,f=n[v+4>>2]|0,d=mD(c|0,f|0,52)|0,d&2047){case 0:{s!=0?(s=+c7(s*18446744073709552e3,l),c=(n[l>>2]|0)+-64|0):c=0,n[l>>2]=c;break}case 2047:break;default:n[l>>2]=(d&2047)+-1022,n[v>>2]=c,n[v+4>>2]=f&-2146435073|1071644672,s=+E[v>>3]}return+s}function _Ue(s,l,c){s=s|0,l=l|0,c=c|0;do if(s){if(l>>>0<128){o[s>>0]=l,s=1;break}if(!(n[n[(HUe()|0)+188>>2]>>2]|0))if((l&-128|0)==57216){o[s>>0]=l,s=1;break}else{n[(Vm()|0)>>2]=84,s=-1;break}if(l>>>0<2048){o[s>>0]=l>>>6|192,o[s+1>>0]=l&63|128,s=2;break}if(l>>>0<55296|(l&-8192|0)==57344){o[s>>0]=l>>>12|224,o[s+1>>0]=l>>>6&63|128,o[s+2>>0]=l&63|128,s=3;break}if((l+-65536|0)>>>0<1048576){o[s>>0]=l>>>18|240,o[s+1>>0]=l>>>12&63|128,o[s+2>>0]=l>>>6&63|128,o[s+3>>0]=l&63|128,s=4;break}else{n[(Vm()|0)>>2]=84,s=-1;break}}else s=1;while(0);return s|0}function HUe(){return SR()|0}function jUe(){return SR()|0}function GUe(s,l){s=s|0,l=l|0;var c=0,f=0;for(f=0;;){if((u[5712+f>>0]|0)==(s|0)){s=2;break}if(c=f+1|0,(c|0)==87){c=5800,f=87,s=5;break}else f=c}if((s|0)==2&&(f?(c=5800,s=5):c=5800),(s|0)==5)for(;;){do s=c,c=c+1|0;while((o[s>>0]|0)!=0);if(f=f+-1|0,f)s=5;else break}return qUe(c,n[l+20>>2]|0)|0}function qUe(s,l){return s=s|0,l=l|0,YUe(s,l)|0}function YUe(s,l){return s=s|0,l=l|0,l?l=WUe(n[l>>2]|0,n[l+4>>2]|0,s)|0:l=0,(l|0?l:s)|0}function WUe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0;se=(n[s>>2]|0)+1794895138|0,m=Rg(n[s+8>>2]|0,se)|0,f=Rg(n[s+12>>2]|0,se)|0,d=Rg(n[s+16>>2]|0,se)|0;e:do if(m>>>0<l>>>2>>>0&&(G=l-(m<<2)|0,f>>>0<G>>>0&d>>>0<G>>>0)&&((d|f)&3|0)==0){for(G=f>>>2,O=d>>>2,M=0;;){if(k=m>>>1,Q=M+k|0,B=Q<<1,d=B+G|0,f=Rg(n[s+(d<<2)>>2]|0,se)|0,d=Rg(n[s+(d+1<<2)>>2]|0,se)|0,!(d>>>0<l>>>0&f>>>0<(l-d|0)>>>0)){f=0;break e}if(o[s+(d+f)>>0]|0){f=0;break e}if(f=n7(c,s+d|0)|0,!f)break;if(f=(f|0)<0,(m|0)==1){f=0;break e}else M=f?M:Q,m=f?k:m-k|0}f=B+O|0,d=Rg(n[s+(f<<2)>>2]|0,se)|0,f=Rg(n[s+(f+1<<2)>>2]|0,se)|0,f>>>0<l>>>0&d>>>0<(l-f|0)>>>0?f=(o[s+(f+d)>>0]|0)==0?s+f|0:0:f=0}else f=0;while(0);return f|0}function Rg(s,l){s=s|0,l=l|0;var c=0;return c=m7(s|0)|0,((l|0)==0?s:c)|0}function KUe(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0,k=0;f=c+16|0,d=n[f>>2]|0,d?m=5:VUe(c)|0?f=0:(d=n[f>>2]|0,m=5);e:do if((m|0)==5){if(k=c+20|0,B=n[k>>2]|0,f=B,(d-B|0)>>>0<l>>>0){f=ED[n[c+36>>2]&7](c,s,l)|0;break}t:do if((o[c+75>>0]|0)>-1){for(B=l;;){if(!B){m=0,d=s;break t}if(d=B+-1|0,(o[s+d>>0]|0)==10)break;B=d}if(f=ED[n[c+36>>2]&7](c,s,B)|0,f>>>0<B>>>0)break e;m=B,d=s+B|0,l=l-B|0,f=n[k>>2]|0}else m=0,d=s;while(0);Dr(f|0,d|0,l|0)|0,n[k>>2]=(n[k>>2]|0)+l,f=m+l|0}while(0);return f|0}function VUe(s){s=s|0;var l=0,c=0;return l=s+74|0,c=o[l>>0]|0,o[l>>0]=c+255|c,l=n[s>>2]|0,l&8?(n[s>>2]=l|32,s=-1):(n[s+8>>2]=0,n[s+4>>2]=0,c=n[s+44>>2]|0,n[s+28>>2]=c,n[s+20>>2]=c,n[s+16>>2]=c+(n[s+48>>2]|0),s=0),s|0}function _n(s,l){s=y(s),l=y(l);var c=0,f=0;c=u7(s)|0;do if((c&2147483647)>>>0<=2139095040){if(f=u7(l)|0,(f&2147483647)>>>0<=2139095040)if((f^c|0)<0){s=(c|0)<0?l:s;break}else{s=s<l?l:s;break}}else s=l;while(0);return y(s)}function u7(s){return s=y(s),h[v>>2]=s,n[v>>2]|0|0}function Tg(s,l){s=y(s),l=y(l);var c=0,f=0;c=A7(s)|0;do if((c&2147483647)>>>0<=2139095040){if(f=A7(l)|0,(f&2147483647)>>>0<=2139095040)if((f^c|0)<0){s=(c|0)<0?s:l;break}else{s=s<l?s:l;break}}else s=l;while(0);return y(s)}function A7(s){return s=y(s),h[v>>2]=s,n[v>>2]|0|0}function bR(s,l){s=y(s),l=y(l);var c=0,f=0,d=0,m=0,B=0,k=0,Q=0,M=0;m=(h[v>>2]=s,n[v>>2]|0),k=(h[v>>2]=l,n[v>>2]|0),c=m>>>23&255,B=k>>>23&255,Q=m&-2147483648,d=k<<1;e:do if((d|0)!=0&&!((c|0)==255|((JUe(l)|0)&2147483647)>>>0>2139095040)){if(f=m<<1,f>>>0<=d>>>0)return l=y(s*y(0)),y((f|0)==(d|0)?l:s);if(c)f=m&8388607|8388608;else{if(c=m<<9,(c|0)>-1){f=c,c=0;do c=c+-1|0,f=f<<1;while((f|0)>-1)}else c=0;f=m<<1-c}if(B)k=k&8388607|8388608;else{if(m=k<<9,(m|0)>-1){d=0;do d=d+-1|0,m=m<<1;while((m|0)>-1)}else d=0;B=d,k=k<<1-d}d=f-k|0,m=(d|0)>-1;t:do if((c|0)>(B|0)){for(;;){if(m)if(d)f=d;else break;if(f=f<<1,c=c+-1|0,d=f-k|0,m=(d|0)>-1,(c|0)<=(B|0))break t}l=y(s*y(0));break e}while(0);if(m)if(d)f=d;else{l=y(s*y(0));break}if(f>>>0<8388608)do f=f<<1,c=c+-1|0;while(f>>>0<8388608);(c|0)>0?c=f+-8388608|c<<23:c=f>>>(1-c|0),l=(n[v>>2]=c|Q,y(h[v>>2]))}else M=3;while(0);return(M|0)==3&&(l=y(s*l),l=y(l/l)),y(l)}function JUe(s){return s=y(s),h[v>>2]=s,n[v>>2]|0|0}function zUe(s,l){return s=s|0,l=l|0,i7(n[582]|0,s,l)|0}function zr(s){s=s|0,Rt()}function zm(s){s=s|0}function XUe(s,l){return s=s|0,l=l|0,0}function ZUe(s){return s=s|0,(f7(s+4|0)|0)==-1?(tf[n[(n[s>>2]|0)+8>>2]&127](s),s=1):s=0,s|0}function f7(s){s=s|0;var l=0;return l=n[s>>2]|0,n[s>>2]=l+-1,l+-1|0}function kp(s){s=s|0,ZUe(s)|0&&$Ue(s)}function $Ue(s){s=s|0;var l=0;l=s+8|0,(n[l>>2]|0)!=0&&(f7(l)|0)!=-1||tf[n[(n[s>>2]|0)+16>>2]&127](s)}function Kt(s){s=s|0;var l=0;for(l=(s|0)==0?1:s;s=pD(l)|0,!(s|0);){if(s=t3e()|0,!s){s=0;break}P7[s&0]()}return s|0}function p7(s){return s=s|0,Kt(s)|0}function gt(s){s=s|0,hD(s)}function e3e(s){s=s|0,(o[s+11>>0]|0)<0&&gt(n[s>>2]|0)}function t3e(){var s=0;return s=n[2923]|0,n[2923]=s+0,s|0}function r3e(){}function dD(s,l,c,f){return s=s|0,l=l|0,c=c|0,f=f|0,f=l-f-(c>>>0>s>>>0|0)>>>0,Se=f,s-c>>>0|0|0}function xR(s,l,c,f){return s=s|0,l=l|0,c=c|0,f=f|0,c=s+c>>>0,Se=l+f+(c>>>0<s>>>0|0)>>>0,c|0|0}function Xm(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0,B=0;if(m=s+c|0,l=l&255,(c|0)>=67){for(;s&3;)o[s>>0]=l,s=s+1|0;for(f=m&-4|0,d=f-64|0,B=l|l<<8|l<<16|l<<24;(s|0)<=(d|0);)n[s>>2]=B,n[s+4>>2]=B,n[s+8>>2]=B,n[s+12>>2]=B,n[s+16>>2]=B,n[s+20>>2]=B,n[s+24>>2]=B,n[s+28>>2]=B,n[s+32>>2]=B,n[s+36>>2]=B,n[s+40>>2]=B,n[s+44>>2]=B,n[s+48>>2]=B,n[s+52>>2]=B,n[s+56>>2]=B,n[s+60>>2]=B,s=s+64|0;for(;(s|0)<(f|0);)n[s>>2]=B,s=s+4|0}for(;(s|0)<(m|0);)o[s>>0]=l,s=s+1|0;return m-c|0}function h7(s,l,c){return s=s|0,l=l|0,c=c|0,(c|0)<32?(Se=l<<c|(s&(1<<c)-1<<32-c)>>>32-c,s<<c):(Se=s<<c-32,0)}function mD(s,l,c){return s=s|0,l=l|0,c=c|0,(c|0)<32?(Se=l>>>c,s>>>c|(l&(1<<c)-1)<<32-c):(Se=0,l>>>c-32|0)}function Dr(s,l,c){s=s|0,l=l|0,c=c|0;var f=0,d=0,m=0;if((c|0)>=8192)return Ac(s|0,l|0,c|0)|0;if(m=s|0,d=s+c|0,(s&3)==(l&3)){for(;s&3;){if(!c)return m|0;o[s>>0]=o[l>>0]|0,s=s+1|0,l=l+1|0,c=c-1|0}for(c=d&-4|0,f=c-64|0;(s|0)<=(f|0);)n[s>>2]=n[l>>2],n[s+4>>2]=n[l+4>>2],n[s+8>>2]=n[l+8>>2],n[s+12>>2]=n[l+12>>2],n[s+16>>2]=n[l+16>>2],n[s+20>>2]=n[l+20>>2],n[s+24>>2]=n[l+24>>2],n[s+28>>2]=n[l+28>>2],n[s+32>>2]=n[l+32>>2],n[s+36>>2]=n[l+36>>2],n[s+40>>2]=n[l+40>>2],n[s+44>>2]=n[l+44>>2],n[s+48>>2]=n[l+48>>2],n[s+52>>2]=n[l+52>>2],n[s+56>>2]=n[l+56>>2],n[s+60>>2]=n[l+60>>2],s=s+64|0,l=l+64|0;for(;(s|0)<(c|0);)n[s>>2]=n[l>>2],s=s+4|0,l=l+4|0}else for(c=d-4|0;(s|0)<(c|0);)o[s>>0]=o[l>>0]|0,o[s+1>>0]=o[l+1>>0]|0,o[s+2>>0]=o[l+2>>0]|0,o[s+3>>0]=o[l+3>>0]|0,s=s+4|0,l=l+4|0;for(;(s|0)<(d|0);)o[s>>0]=o[l>>0]|0,s=s+1|0,l=l+1|0;return m|0}function g7(s){s=s|0;var l=0;return l=o[L+(s&255)>>0]|0,(l|0)<8?l|0:(l=o[L+(s>>8&255)>>0]|0,(l|0)<8?l+8|0:(l=o[L+(s>>16&255)>>0]|0,(l|0)<8?l+16|0:(o[L+(s>>>24)>>0]|0)+24|0))}function d7(s,l,c,f,d){s=s|0,l=l|0,c=c|0,f=f|0,d=d|0;var m=0,B=0,k=0,Q=0,M=0,O=0,G=0,se=0,qe=0,Me=0;if(O=s,Q=l,M=Q,B=c,se=f,k=se,!M)return m=(d|0)!=0,k?m?(n[d>>2]=s|0,n[d+4>>2]=l&0,se=0,d=0,Se=se,d|0):(se=0,d=0,Se=se,d|0):(m&&(n[d>>2]=(O>>>0)%(B>>>0),n[d+4>>2]=0),se=0,d=(O>>>0)/(B>>>0)>>>0,Se=se,d|0);m=(k|0)==0;do if(B){if(!m){if(m=(P(k|0)|0)-(P(M|0)|0)|0,m>>>0<=31){G=m+1|0,k=31-m|0,l=m-31>>31,B=G,s=O>>>(G>>>0)&l|M<<k,l=M>>>(G>>>0)&l,m=0,k=O<<k;break}return d?(n[d>>2]=s|0,n[d+4>>2]=Q|l&0,se=0,d=0,Se=se,d|0):(se=0,d=0,Se=se,d|0)}if(m=B-1|0,m&B|0){k=(P(B|0)|0)+33-(P(M|0)|0)|0,Me=64-k|0,G=32-k|0,Q=G>>31,qe=k-32|0,l=qe>>31,B=k,s=G-1>>31&M>>>(qe>>>0)|(M<<G|O>>>(k>>>0))&l,l=l&M>>>(k>>>0),m=O<<Me&Q,k=(M<<Me|O>>>(qe>>>0))&Q|O<<G&k-33>>31;break}return d|0&&(n[d>>2]=m&O,n[d+4>>2]=0),(B|0)==1?(qe=Q|l&0,Me=s|0|0,Se=qe,Me|0):(Me=g7(B|0)|0,qe=M>>>(Me>>>0)|0,Me=M<<32-Me|O>>>(Me>>>0)|0,Se=qe,Me|0)}else{if(m)return d|0&&(n[d>>2]=(M>>>0)%(B>>>0),n[d+4>>2]=0),qe=0,Me=(M>>>0)/(B>>>0)>>>0,Se=qe,Me|0;if(!O)return d|0&&(n[d>>2]=0,n[d+4>>2]=(M>>>0)%(k>>>0)),qe=0,Me=(M>>>0)/(k>>>0)>>>0,Se=qe,Me|0;if(m=k-1|0,!(m&k))return d|0&&(n[d>>2]=s|0,n[d+4>>2]=m&M|l&0),qe=0,Me=M>>>((g7(k|0)|0)>>>0),Se=qe,Me|0;if(m=(P(k|0)|0)-(P(M|0)|0)|0,m>>>0<=30){l=m+1|0,k=31-m|0,B=l,s=M<<k|O>>>(l>>>0),l=M>>>(l>>>0),m=0,k=O<<k;break}return d?(n[d>>2]=s|0,n[d+4>>2]=Q|l&0,qe=0,Me=0,Se=qe,Me|0):(qe=0,Me=0,Se=qe,Me|0)}while(0);if(!B)M=k,Q=0,k=0;else{G=c|0|0,O=se|f&0,M=xR(G|0,O|0,-1,-1)|0,c=Se,Q=k,k=0;do f=Q,Q=m>>>31|Q<<1,m=k|m<<1,f=s<<1|f>>>31|0,se=s>>>31|l<<1|0,dD(M|0,c|0,f|0,se|0)|0,Me=Se,qe=Me>>31|((Me|0)<0?-1:0)<<1,k=qe&1,s=dD(f|0,se|0,qe&G|0,(((Me|0)<0?-1:0)>>31|((Me|0)<0?-1:0)<<1)&O|0)|0,l=Se,B=B-1|0;while((B|0)!=0);M=Q,Q=0}return B=0,d|0&&(n[d>>2]=s,n[d+4>>2]=l),qe=(m|0)>>>31|(M|B)<<1|(B<<1|m>>>31)&0|Q,Me=(m<<1|0>>>31)&-2|k,Se=qe,Me|0}function kR(s,l,c,f){return s=s|0,l=l|0,c=c|0,f=f|0,d7(s,l,c,f,0)|0}function Qp(s){s=s|0;var l=0,c=0;return c=s+15&-16|0,l=n[I>>2]|0,s=l+c|0,(c|0)>0&(s|0)<(l|0)|(s|0)<0?(ie()|0,DA(12),-1):(n[I>>2]=s,(s|0)>(Z()|0)&&(X()|0)==0?(n[I>>2]=l,DA(12),-1):l|0)}function Mw(s,l,c){s=s|0,l=l|0,c=c|0;var f=0;if((l|0)<(s|0)&(s|0)<(l+c|0)){for(f=s,l=l+c|0,s=s+c|0;(c|0)>0;)s=s-1|0,l=l-1|0,c=c-1|0,o[s>>0]=o[l>>0]|0;s=f}else Dr(s,l,c)|0;return s|0}function QR(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0;var d=0,m=0;return m=C,C=C+16|0,d=m|0,d7(s,l,c,f,d)|0,C=m,Se=n[d+4>>2]|0,n[d>>2]|0|0}function m7(s){return s=s|0,(s&255)<<24|(s>>8&255)<<16|(s>>16&255)<<8|s>>>24|0}function n3e(s,l,c,f,d,m){s=s|0,l=l|0,c=c|0,f=f|0,d=d|0,m=m|0,y7[s&1](l|0,c|0,f|0,d|0,m|0)}function i3e(s,l,c){s=s|0,l=l|0,c=y(c),E7[s&1](l|0,y(c))}function s3e(s,l,c){s=s|0,l=l|0,c=+c,C7[s&31](l|0,+c)}function o3e(s,l,c,f){return s=s|0,l=l|0,c=y(c),f=y(f),y(w7[s&0](l|0,y(c),y(f)))}function a3e(s,l){s=s|0,l=l|0,tf[s&127](l|0)}function l3e(s,l,c){s=s|0,l=l|0,c=c|0,rf[s&31](l|0,c|0)}function c3e(s,l){return s=s|0,l=l|0,Lg[s&31](l|0)|0}function u3e(s,l,c,f,d){s=s|0,l=l|0,c=+c,f=+f,d=d|0,I7[s&1](l|0,+c,+f,d|0)}function A3e(s,l,c,f){s=s|0,l=l|0,c=+c,f=+f,Y3e[s&1](l|0,+c,+f)}function f3e(s,l,c,f){return s=s|0,l=l|0,c=c|0,f=f|0,ED[s&7](l|0,c|0,f|0)|0}function p3e(s,l,c,f){return s=s|0,l=l|0,c=c|0,f=f|0,+W3e[s&1](l|0,c|0,f|0)}function h3e(s,l){return s=s|0,l=l|0,+B7[s&15](l|0)}function g3e(s,l,c){return s=s|0,l=l|0,c=+c,K3e[s&1](l|0,+c)|0}function d3e(s,l,c){return s=s|0,l=l|0,c=c|0,RR[s&15](l|0,c|0)|0}function m3e(s,l,c,f,d,m){s=s|0,l=l|0,c=c|0,f=+f,d=+d,m=m|0,V3e[s&1](l|0,c|0,+f,+d,m|0)}function y3e(s,l,c,f,d,m,B){s=s|0,l=l|0,c=c|0,f=f|0,d=d|0,m=m|0,B=B|0,J3e[s&1](l|0,c|0,f|0,d|0,m|0,B|0)}function E3e(s,l,c){return s=s|0,l=l|0,c=c|0,+v7[s&7](l|0,c|0)}function C3e(s){return s=s|0,CD[s&7]()|0}function w3e(s,l,c,f,d,m){return s=s|0,l=l|0,c=c|0,f=f|0,d=d|0,m=m|0,D7[s&1](l|0,c|0,f|0,d|0,m|0)|0}function I3e(s,l,c,f,d){s=s|0,l=l|0,c=c|0,f=f|0,d=+d,z3e[s&1](l|0,c|0,f|0,+d)}function B3e(s,l,c,f,d,m,B){s=s|0,l=l|0,c=c|0,f=y(f),d=d|0,m=y(m),B=B|0,S7[s&1](l|0,c|0,y(f),d|0,y(m),B|0)}function v3e(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0,Hw[s&15](l|0,c|0,f|0)}function D3e(s){s=s|0,P7[s&0]()}function S3e(s,l,c,f){s=s|0,l=l|0,c=c|0,f=+f,b7[s&15](l|0,c|0,+f)}function P3e(s,l,c){return s=s|0,l=+l,c=+c,X3e[s&1](+l,+c)|0}function b3e(s,l,c,f,d){s=s|0,l=l|0,c=c|0,f=f|0,d=d|0,TR[s&15](l|0,c|0,f|0,d|0)}function x3e(s,l,c,f,d){s=s|0,l=l|0,c=c|0,f=f|0,d=d|0,F(0)}function k3e(s,l){s=s|0,l=y(l),F(1)}function ma(s,l){s=s|0,l=+l,F(2)}function Q3e(s,l,c){return s=s|0,l=y(l),c=y(c),F(3),Ze}function Er(s){s=s|0,F(4)}function Uw(s,l){s=s|0,l=l|0,F(5)}function Ja(s){return s=s|0,F(6),0}function F3e(s,l,c,f){s=s|0,l=+l,c=+c,f=f|0,F(7)}function R3e(s,l,c){s=s|0,l=+l,c=+c,F(8)}function T3e(s,l,c){return s=s|0,l=l|0,c=c|0,F(9),0}function N3e(s,l,c){return s=s|0,l=l|0,c=c|0,F(10),0}function Ng(s){return s=s|0,F(11),0}function L3e(s,l){return s=s|0,l=+l,F(12),0}function _w(s,l){return s=s|0,l=l|0,F(13),0}function O3e(s,l,c,f,d){s=s|0,l=l|0,c=+c,f=+f,d=d|0,F(14)}function M3e(s,l,c,f,d,m){s=s|0,l=l|0,c=c|0,f=f|0,d=d|0,m=m|0,F(15)}function FR(s,l){return s=s|0,l=l|0,F(16),0}function U3e(){return F(17),0}function _3e(s,l,c,f,d){return s=s|0,l=l|0,c=c|0,f=f|0,d=d|0,F(18),0}function H3e(s,l,c,f){s=s|0,l=l|0,c=c|0,f=+f,F(19)}function j3e(s,l,c,f,d,m){s=s|0,l=l|0,c=y(c),f=f|0,d=y(d),m=m|0,F(20)}function yD(s,l,c){s=s|0,l=l|0,c=c|0,F(21)}function G3e(){F(22)}function Zm(s,l,c){s=s|0,l=l|0,c=+c,F(23)}function q3e(s,l){return s=+s,l=+l,F(24),0}function $m(s,l,c,f){s=s|0,l=l|0,c=c|0,f=f|0,F(25)}var y7=[x3e,_Le],E7=[k3e,fo],C7=[ma,xw,kw,EF,CF,Dl,Qw,wF,jm,bu,Rw,IF,$v,KA,eD,Gm,tD,rD,qm,ma,ma,ma,ma,ma,ma,ma,ma,ma,ma,ma,ma,ma],w7=[Q3e],tf=[Er,zm,CDe,wDe,IDe,Xbe,Zbe,$be,gNe,dNe,mNe,PLe,bLe,xLe,J4e,z4e,X4e,hs,Vv,Hm,WA,Fw,dve,mve,uDe,kDe,jDe,oSe,ISe,USe,rPe,mPe,FPe,VPe,ube,Sbe,jbe,dxe,Fxe,Vxe,uke,Ske,jke,aQe,IQe,LQe,ZQe,Pc,xFe,YFe,uRe,bRe,GRe,uTe,CTe,BTe,_Te,GTe,oNe,ENe,INe,UNe,nLe,i9,MOe,gMe,kMe,YMe,p4e,b4e,U4e,j4e,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er,Er],rf=[Uw,fF,pF,bw,Pu,hF,gF,Bp,dF,mF,yF,Zv,VA,Ve,ft,Wt,vr,Pn,Fr,vF,nve,Sve,AQe,DQe,FRe,HOe,ALe,j5,Uw,Uw,Uw,Uw],Lg=[Ja,SUe,AF,D,Ae,De,vt,wt,xt,_r,di,po,eve,tve,yve,tFe,KRe,jNe,YOe,Wa,Ja,Ja,Ja,Ja,Ja,Ja,Ja,Ja,Ja,Ja,Ja,Ja],I7=[F3e,Eve],Y3e=[R3e,cNe],ED=[T3e,r7,PUe,kUe,GSe,Cxe,RFe,JMe],W3e=[N3e,hbe],B7=[Ng,Yo,rt,bn,Cve,wve,Ive,Bve,vve,Dve,Ng,Ng,Ng,Ng,Ng,Ng],K3e=[L3e,mTe],RR=[_w,XUe,rve,hDe,uSe,sPe,CPe,Wbe,Lxe,_Qe,Wv,TMe,_w,_w,_w,_w],V3e=[O3e,WDe],J3e=[M3e,m4e],v7=[FR,ai,Pve,bve,xve,kbe,FR,FR],CD=[U3e,kve,Sw,ga,PTe,KTe,SNe,W4e],D7=[_3e,Cw],z3e=[H3e,hke],S7=[j3e,ive],Hw=[yD,T,is,tn,ho,SSe,NPe,kke,Wke,_m,cOe,EMe,F4e,yD,yD,yD],P7=[G3e],b7=[Zm,Jv,zv,Xv,YA,nD,BF,S,Zxe,JFe,pTe,Zm,Zm,Zm,Zm,Zm],X3e=[q3e,pNe],TR=[$m,ZPe,cFe,hRe,rTe,RTe,$Te,RNe,lLe,XOe,nUe,$m,$m,$m,$m,$m];return{_llvm_bswap_i32:m7,dynCall_idd:P3e,dynCall_i:C3e,_i64Subtract:dD,___udivdi3:kR,dynCall_vif:i3e,setThrew:hu,dynCall_viii:v3e,_bitshift64Lshr:mD,_bitshift64Shl:h7,dynCall_vi:a3e,dynCall_viiddi:m3e,dynCall_diii:p3e,dynCall_iii:d3e,_memset:Xm,_sbrk:Qp,_memcpy:Dr,__GLOBAL__sub_I_Yoga_cpp:Um,dynCall_vii:l3e,___uremdi3:QR,dynCall_vid:s3e,stackAlloc:lo,_nbind_init:hUe,getTempRet0:Ua,dynCall_di:h3e,dynCall_iid:g3e,setTempRet0:xA,_i64Add:xR,dynCall_fiff:o3e,dynCall_iiii:f3e,_emscripten_get_global_libc:DUe,dynCall_viid:S3e,dynCall_viiid:I3e,dynCall_viififi:B3e,dynCall_ii:c3e,__GLOBAL__sub_I_Binding_cc:kOe,dynCall_viiii:b3e,dynCall_iiiiii:w3e,stackSave:gc,dynCall_viiiii:n3e,__GLOBAL__sub_I_nbind_cc:Qve,dynCall_vidd:A3e,_free:hD,runPostSets:r3e,dynCall_viiiiii:y3e,establishStackSpace:ji,_memmove:Mw,stackRestore:pu,_malloc:pD,__GLOBAL__sub_I_common_cc:zNe,dynCall_viddi:u3e,dynCall_dii:E3e,dynCall_v:D3e}}(Module.asmGlobalArg,Module.asmLibraryArg,buffer),_llvm_bswap_i32=Module._llvm_bswap_i32=asm._llvm_bswap_i32,getTempRet0=Module.getTempRet0=asm.getTempRet0,___udivdi3=Module.___udivdi3=asm.___udivdi3,setThrew=Module.setThrew=asm.setThrew,_bitshift64Lshr=Module._bitshift64Lshr=asm._bitshift64Lshr,_bitshift64Shl=Module._bitshift64Shl=asm._bitshift64Shl,_memset=Module._memset=asm._memset,_sbrk=Module._sbrk=asm._sbrk,_memcpy=Module._memcpy=asm._memcpy,stackAlloc=Module.stackAlloc=asm.stackAlloc,___uremdi3=Module.___uremdi3=asm.___uremdi3,_nbind_init=Module._nbind_init=asm._nbind_init,_i64Subtract=Module._i64Subtract=asm._i64Subtract,setTempRet0=Module.setTempRet0=asm.setTempRet0,_i64Add=Module._i64Add=asm._i64Add,_emscripten_get_global_libc=Module._emscripten_get_global_libc=asm._emscripten_get_global_libc,__GLOBAL__sub_I_Yoga_cpp=Module.__GLOBAL__sub_I_Yoga_cpp=asm.__GLOBAL__sub_I_Yoga_cpp,__GLOBAL__sub_I_Binding_cc=Module.__GLOBAL__sub_I_Binding_cc=asm.__GLOBAL__sub_I_Binding_cc,stackSave=Module.stackSave=asm.stackSave,__GLOBAL__sub_I_nbind_cc=Module.__GLOBAL__sub_I_nbind_cc=asm.__GLOBAL__sub_I_nbind_cc,_free=Module._free=asm._free,runPostSets=Module.runPostSets=asm.runPostSets,establishStackSpace=Module.establishStackSpace=asm.establishStackSpace,_memmove=Module._memmove=asm._memmove,stackRestore=Module.stackRestore=asm.stackRestore,_malloc=Module._malloc=asm._malloc,__GLOBAL__sub_I_common_cc=Module.__GLOBAL__sub_I_common_cc=asm.__GLOBAL__sub_I_common_cc,dynCall_viiiii=Module.dynCall_viiiii=asm.dynCall_viiiii,dynCall_vif=Module.dynCall_vif=asm.dynCall_vif,dynCall_vid=Module.dynCall_vid=asm.dynCall_vid,dynCall_fiff=Module.dynCall_fiff=asm.dynCall_fiff,dynCall_vi=Module.dynCall_vi=asm.dynCall_vi,dynCall_vii=Module.dynCall_vii=asm.dynCall_vii,dynCall_ii=Module.dynCall_ii=asm.dynCall_ii,dynCall_viddi=Module.dynCall_viddi=asm.dynCall_viddi,dynCall_vidd=Module.dynCall_vidd=asm.dynCall_vidd,dynCall_iiii=Module.dynCall_iiii=asm.dynCall_iiii,dynCall_diii=Module.dynCall_diii=asm.dynCall_diii,dynCall_di=Module.dynCall_di=asm.dynCall_di,dynCall_iid=Module.dynCall_iid=asm.dynCall_iid,dynCall_iii=Module.dynCall_iii=asm.dynCall_iii,dynCall_viiddi=Module.dynCall_viiddi=asm.dynCall_viiddi,dynCall_viiiiii=Module.dynCall_viiiiii=asm.dynCall_viiiiii,dynCall_dii=Module.dynCall_dii=asm.dynCall_dii,dynCall_i=Module.dynCall_i=asm.dynCall_i,dynCall_iiiiii=Module.dynCall_iiiiii=asm.dynCall_iiiiii,dynCall_viiid=Module.dynCall_viiid=asm.dynCall_viiid,dynCall_viififi=Module.dynCall_viififi=asm.dynCall_viififi,dynCall_viii=Module.dynCall_viii=asm.dynCall_viii,dynCall_v=Module.dynCall_v=asm.dynCall_v,dynCall_viid=Module.dynCall_viid=asm.dynCall_viid,dynCall_idd=Module.dynCall_idd=asm.dynCall_idd,dynCall_viiii=Module.dynCall_viiii=asm.dynCall_viiii;Runtime.stackAlloc=Module.stackAlloc,Runtime.stackSave=Module.stackSave,Runtime.stackRestore=Module.stackRestore,Runtime.establishStackSpace=Module.establishStackSpace,Runtime.setTempRet0=Module.setTempRet0,Runtime.getTempRet0=Module.getTempRet0,Module.asm=asm;function ExitStatus(t){this.name="ExitStatus",this.message="Program terminated with exit("+t+")",this.status=t}ExitStatus.prototype=new Error,ExitStatus.prototype.constructor=ExitStatus;var initialStackTop,preloadStartTime=null,calledMain=!1;dependenciesFulfilled=function t(){Module.calledRun||run(),Module.calledRun||(dependenciesFulfilled=t)},Module.callMain=Module.callMain=function t(e){e=e||[],ensureInitRuntime();var r=e.length+1;function o(){for(var p=0;p<4-1;p++)a.push(0)}var a=[allocate(intArrayFromString(Module.thisProgram),"i8",ALLOC_NORMAL)];o();for(var n=0;n<r-1;n=n+1)a.push(allocate(intArrayFromString(e[n]),"i8",ALLOC_NORMAL)),o();a.push(0),a=allocate(a,"i32",ALLOC_NORMAL);try{var u=Module._main(r,a,0);exit(u,!0)}catch(p){if(p instanceof ExitStatus)return;if(p=="SimulateInfiniteLoop"){Module.noExitRuntime=!0;return}else{var A=p;p&&typeof p=="object"&&p.stack&&(A=[p,p.stack]),Module.printErr("exception thrown: "+A),Module.quit(1,p)}}finally{calledMain=!0}};function run(t){if(t=t||Module.arguments,preloadStartTime===null&&(preloadStartTime=Date.now()),runDependencies>0||(preRun(),runDependencies>0)||Module.calledRun)return;function e(){Module.calledRun||(Module.calledRun=!0,!ABORT&&(ensureInitRuntime(),preMain(),Module.onRuntimeInitialized&&Module.onRuntimeInitialized(),Module._main&&shouldRunNow&&Module.callMain(t),postRun()))}Module.setStatus?(Module.setStatus("Running..."),setTimeout(function(){setTimeout(function(){Module.setStatus("")},1),e()},1)):e()}Module.run=Module.run=run;function exit(t,e){e&&Module.noExitRuntime||(Module.noExitRuntime||(ABORT=!0,EXITSTATUS=t,STACKTOP=initialStackTop,exitRuntime(),Module.onExit&&Module.onExit(t)),ENVIRONMENT_IS_NODE&&process.exit(t),Module.quit(t,new ExitStatus(t)))}Module.exit=Module.exit=exit;var abortDecorators=[];function abort(t){Module.onAbort&&Module.onAbort(t),t!==void 0?(Module.print(t),Module.printErr(t),t=JSON.stringify(t)):t="",ABORT=!0,EXITSTATUS=1;var e=`
+If this abort() is unexpected, build with -s ASSERTIONS=1 which can give more information.`,r="abort("+t+") at "+stackTrace()+e;throw abortDecorators&&abortDecorators.forEach(function(o){r=o(r,t)}),r}if(Module.abort=Module.abort=abort,Module.preInit)for(typeof Module.preInit=="function"&&(Module.preInit=[Module.preInit]);Module.preInit.length>0;)Module.preInit.pop()();var shouldRunNow=!0;Module.noInitialRun&&(shouldRunNow=!1),run()})});var am=_((wKt,NEe)=>{"use strict";var qyt=REe(),Yyt=TEe(),x6=!1,k6=null;Yyt({},function(t,e){if(!x6){if(x6=!0,t)throw t;k6=e}});if(!x6)throw new Error("Failed to load the yoga module - it needed to be loaded synchronously, but didn't");NEe.exports=qyt(k6.bind,k6.lib)});var F6=_((IKt,Q6)=>{"use strict";var LEe=t=>Number.isNaN(t)?!1:t>=4352&&(t<=4447||t===9001||t===9002||11904<=t&&t<=12871&&t!==12351||12880<=t&&t<=19903||19968<=t&&t<=42182||43360<=t&&t<=43388||44032<=t&&t<=55203||63744<=t&&t<=64255||65040<=t&&t<=65049||65072<=t&&t<=65131||65281<=t&&t<=65376||65504<=t&&t<=65510||110592<=t&&t<=110593||127488<=t&&t<=127569||131072<=t&&t<=262141);Q6.exports=LEe;Q6.exports.default=LEe});var MEe=_((BKt,OEe)=>{"use strict";OEe.exports=function(){return/\uD83C\uDFF4\uDB40\uDC67\uDB40\uDC62(?:\uDB40\uDC65\uDB40\uDC6E\uDB40\uDC67|\uDB40\uDC73\uDB40\uDC63\uDB40\uDC74|\uDB40\uDC77\uDB40\uDC6C\uDB40\uDC73)\uDB40\uDC7F|\uD83D\uDC68(?:\uD83C\uDFFC\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68\uD83C\uDFFB|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFF\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFE])|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFE\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFD])|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFD\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB\uDFFC])|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\u200D(?:\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D)?\uD83D\uDC68|(?:\uD83D[\uDC68\uDC69])\u200D(?:\uD83D\uDC66\u200D\uD83D\uDC66|\uD83D\uDC67\u200D(?:\uD83D[\uDC66\uDC67]))|\uD83D\uDC66\u200D\uD83D\uDC66|\uD83D\uDC67\u200D(?:\uD83D[\uDC66\uDC67])|(?:\uD83D[\uDC68\uDC69])\u200D(?:\uD83D[\uDC66\uDC67])|[\u2695\u2696\u2708]\uFE0F|\uD83D[\uDC66\uDC67]|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|(?:\uD83C\uDFFB\u200D[\u2695\u2696\u2708]|\uD83C\uDFFF\u200D[\u2695\u2696\u2708]|\uD83C\uDFFE\u200D[\u2695\u2696\u2708]|\uD83C\uDFFD\u200D[\u2695\u2696\u2708]|\uD83C\uDFFC\u200D[\u2695\u2696\u2708])\uFE0F|\uD83C\uDFFB\u200D(?:\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C[\uDFFB-\uDFFF])|(?:\uD83E\uDDD1\uD83C\uDFFB\u200D\uD83E\uDD1D\u200D\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFC\u200D\uD83E\uDD1D\u200D\uD83D\uDC69)\uD83C\uDFFB|\uD83E\uDDD1(?:\uD83C\uDFFF\u200D\uD83E\uDD1D\u200D\uD83E\uDDD1(?:\uD83C[\uDFFB-\uDFFF])|\u200D\uD83E\uDD1D\u200D\uD83E\uDDD1)|(?:\uD83E\uDDD1\uD83C\uDFFE\u200D\uD83E\uDD1D\u200D\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFF\u200D\uD83E\uDD1D\u200D(?:\uD83D[\uDC68\uDC69]))(?:\uD83C[\uDFFB-\uDFFE])|(?:\uD83E\uDDD1\uD83C\uDFFC\u200D\uD83E\uDD1D\u200D\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFD\u200D\uD83E\uDD1D\u200D\uD83D\uDC69)(?:\uD83C[\uDFFB\uDFFC])|\uD83D\uDC69(?:\uD83C\uDFFE\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFD\uDFFF])|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFC\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB\uDFFD-\uDFFF])|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFB\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFC-\uDFFF])|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFD\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF])|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\u200D(?:\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D(?:\uD83D[\uDC68\uDC69])|\uD83D[\uDC68\uDC69])|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFF\u200D(?:\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD]))|\uD83D\uDC69\u200D\uD83D\uDC69\u200D(?:\uD83D\uDC66\u200D\uD83D\uDC66|\uD83D\uDC67\u200D(?:\uD83D[\uDC66\uDC67]))|(?:\uD83E\uDDD1\uD83C\uDFFD\u200D\uD83E\uDD1D\u200D\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFE\u200D\uD83E\uDD1D\u200D\uD83D\uDC69)(?:\uD83C[\uDFFB-\uDFFD])|\uD83D\uDC69\u200D\uD83D\uDC66\u200D\uD83D\uDC66|\uD83D\uDC69\u200D\uD83D\uDC69\u200D(?:\uD83D[\uDC66\uDC67])|(?:\uD83D\uDC41\uFE0F\u200D\uD83D\uDDE8|\uD83D\uDC69(?:\uD83C\uDFFF\u200D[\u2695\u2696\u2708]|\uD83C\uDFFE\u200D[\u2695\u2696\u2708]|\uD83C\uDFFC\u200D[\u2695\u2696\u2708]|\uD83C\uDFFB\u200D[\u2695\u2696\u2708]|\uD83C\uDFFD\u200D[\u2695\u2696\u2708]|\u200D[\u2695\u2696\u2708])|(?:(?:\u26F9|\uD83C[\uDFCB\uDFCC]|\uD83D\uDD75)\uFE0F|\uD83D\uDC6F|\uD83E[\uDD3C\uDDDE\uDDDF])\u200D[\u2640\u2642]|(?:\u26F9|\uD83C[\uDFCB\uDFCC]|\uD83D\uDD75)(?:\uD83C[\uDFFB-\uDFFF])\u200D[\u2640\u2642]|(?:\uD83C[\uDFC3\uDFC4\uDFCA]|\uD83D[\uDC6E\uDC71\uDC73\uDC77\uDC81\uDC82\uDC86\uDC87\uDE45-\uDE47\uDE4B\uDE4D\uDE4E\uDEA3\uDEB4-\uDEB6]|\uD83E[\uDD26\uDD37-\uDD39\uDD3D\uDD3E\uDDB8\uDDB9\uDDCD-\uDDCF\uDDD6-\uDDDD])(?:(?:\uD83C[\uDFFB-\uDFFF])\u200D[\u2640\u2642]|\u200D[\u2640\u2642])|\uD83C\uDFF4\u200D\u2620)\uFE0F|\uD83D\uDC69\u200D\uD83D\uDC67\u200D(?:\uD83D[\uDC66\uDC67])|\uD83C\uDFF3\uFE0F\u200D\uD83C\uDF08|\uD83D\uDC15\u200D\uD83E\uDDBA|\uD83D\uDC69\u200D\uD83D\uDC66|\uD83D\uDC69\u200D\uD83D\uDC67|\uD83C\uDDFD\uD83C\uDDF0|\uD83C\uDDF4\uD83C\uDDF2|\uD83C\uDDF6\uD83C\uDDE6|[#\*0-9]\uFE0F\u20E3|\uD83C\uDDE7(?:\uD83C[\uDDE6\uDDE7\uDDE9-\uDDEF\uDDF1-\uDDF4\uDDF6-\uDDF9\uDDFB\uDDFC\uDDFE\uDDFF])|\uD83C\uDDF9(?:\uD83C[\uDDE6\uDDE8\uDDE9\uDDEB-\uDDED\uDDEF-\uDDF4\uDDF7\uDDF9\uDDFB\uDDFC\uDDFF])|\uD83C\uDDEA(?:\uD83C[\uDDE6\uDDE8\uDDEA\uDDEC\uDDED\uDDF7-\uDDFA])|\uD83E\uDDD1(?:\uD83C[\uDFFB-\uDFFF])|\uD83C\uDDF7(?:\uD83C[\uDDEA\uDDF4\uDDF8\uDDFA\uDDFC])|\uD83D\uDC69(?:\uD83C[\uDFFB-\uDFFF])|\uD83C\uDDF2(?:\uD83C[\uDDE6\uDDE8-\uDDED\uDDF0-\uDDFF])|\uD83C\uDDE6(?:\uD83C[\uDDE8-\uDDEC\uDDEE\uDDF1\uDDF2\uDDF4\uDDF6-\uDDFA\uDDFC\uDDFD\uDDFF])|\uD83C\uDDF0(?:\uD83C[\uDDEA\uDDEC-\uDDEE\uDDF2\uDDF3\uDDF5\uDDF7\uDDFC\uDDFE\uDDFF])|\uD83C\uDDED(?:\uD83C[\uDDF0\uDDF2\uDDF3\uDDF7\uDDF9\uDDFA])|\uD83C\uDDE9(?:\uD83C[\uDDEA\uDDEC\uDDEF\uDDF0\uDDF2\uDDF4\uDDFF])|\uD83C\uDDFE(?:\uD83C[\uDDEA\uDDF9])|\uD83C\uDDEC(?:\uD83C[\uDDE6\uDDE7\uDDE9-\uDDEE\uDDF1-\uDDF3\uDDF5-\uDDFA\uDDFC\uDDFE])|\uD83C\uDDF8(?:\uD83C[\uDDE6-\uDDEA\uDDEC-\uDDF4\uDDF7-\uDDF9\uDDFB\uDDFD-\uDDFF])|\uD83C\uDDEB(?:\uD83C[\uDDEE-\uDDF0\uDDF2\uDDF4\uDDF7])|\uD83C\uDDF5(?:\uD83C[\uDDE6\uDDEA-\uDDED\uDDF0-\uDDF3\uDDF7-\uDDF9\uDDFC\uDDFE])|\uD83C\uDDFB(?:\uD83C[\uDDE6\uDDE8\uDDEA\uDDEC\uDDEE\uDDF3\uDDFA])|\uD83C\uDDF3(?:\uD83C[\uDDE6\uDDE8\uDDEA-\uDDEC\uDDEE\uDDF1\uDDF4\uDDF5\uDDF7\uDDFA\uDDFF])|\uD83C\uDDE8(?:\uD83C[\uDDE6\uDDE8\uDDE9\uDDEB-\uDDEE\uDDF0-\uDDF5\uDDF7\uDDFA-\uDDFF])|\uD83C\uDDF1(?:\uD83C[\uDDE6-\uDDE8\uDDEE\uDDF0\uDDF7-\uDDFB\uDDFE])|\uD83C\uDDFF(?:\uD83C[\uDDE6\uDDF2\uDDFC])|\uD83C\uDDFC(?:\uD83C[\uDDEB\uDDF8])|\uD83C\uDDFA(?:\uD83C[\uDDE6\uDDEC\uDDF2\uDDF3\uDDF8\uDDFE\uDDFF])|\uD83C\uDDEE(?:\uD83C[\uDDE8-\uDDEA\uDDF1-\uDDF4\uDDF6-\uDDF9])|\uD83C\uDDEF(?:\uD83C[\uDDEA\uDDF2\uDDF4\uDDF5])|(?:\uD83C[\uDFC3\uDFC4\uDFCA]|\uD83D[\uDC6E\uDC71\uDC73\uDC77\uDC81\uDC82\uDC86\uDC87\uDE45-\uDE47\uDE4B\uDE4D\uDE4E\uDEA3\uDEB4-\uDEB6]|\uD83E[\uDD26\uDD37-\uDD39\uDD3D\uDD3E\uDDB8\uDDB9\uDDCD-\uDDCF\uDDD6-\uDDDD])(?:\uD83C[\uDFFB-\uDFFF])|(?:\u26F9|\uD83C[\uDFCB\uDFCC]|\uD83D\uDD75)(?:\uD83C[\uDFFB-\uDFFF])|(?:[\u261D\u270A-\u270D]|\uD83C[\uDF85\uDFC2\uDFC7]|\uD83D[\uDC42\uDC43\uDC46-\uDC50\uDC66\uDC67\uDC6B-\uDC6D\uDC70\uDC72\uDC74-\uDC76\uDC78\uDC7C\uDC83\uDC85\uDCAA\uDD74\uDD7A\uDD90\uDD95\uDD96\uDE4C\uDE4F\uDEC0\uDECC]|\uD83E[\uDD0F\uDD18-\uDD1C\uDD1E\uDD1F\uDD30-\uDD36\uDDB5\uDDB6\uDDBB\uDDD2-\uDDD5])(?:\uD83C[\uDFFB-\uDFFF])|(?:[\u231A\u231B\u23E9-\u23EC\u23F0\u23F3\u25FD\u25FE\u2614\u2615\u2648-\u2653\u267F\u2693\u26A1\u26AA\u26AB\u26BD\u26BE\u26C4\u26C5\u26CE\u26D4\u26EA\u26F2\u26F3\u26F5\u26FA\u26FD\u2705\u270A\u270B\u2728\u274C\u274E\u2753-\u2755\u2757\u2795-\u2797\u27B0\u27BF\u2B1B\u2B1C\u2B50\u2B55]|\uD83C[\uDC04\uDCCF\uDD8E\uDD91-\uDD9A\uDDE6-\uDDFF\uDE01\uDE1A\uDE2F\uDE32-\uDE36\uDE38-\uDE3A\uDE50\uDE51\uDF00-\uDF20\uDF2D-\uDF35\uDF37-\uDF7C\uDF7E-\uDF93\uDFA0-\uDFCA\uDFCF-\uDFD3\uDFE0-\uDFF0\uDFF4\uDFF8-\uDFFF]|\uD83D[\uDC00-\uDC3E\uDC40\uDC42-\uDCFC\uDCFF-\uDD3D\uDD4B-\uDD4E\uDD50-\uDD67\uDD7A\uDD95\uDD96\uDDA4\uDDFB-\uDE4F\uDE80-\uDEC5\uDECC\uDED0-\uDED2\uDED5\uDEEB\uDEEC\uDEF4-\uDEFA\uDFE0-\uDFEB]|\uD83E[\uDD0D-\uDD3A\uDD3C-\uDD45\uDD47-\uDD71\uDD73-\uDD76\uDD7A-\uDDA2\uDDA5-\uDDAA\uDDAE-\uDDCA\uDDCD-\uDDFF\uDE70-\uDE73\uDE78-\uDE7A\uDE80-\uDE82\uDE90-\uDE95])|(?:[#\*0-9\xA9\xAE\u203C\u2049\u2122\u2139\u2194-\u2199\u21A9\u21AA\u231A\u231B\u2328\u23CF\u23E9-\u23F3\u23F8-\u23FA\u24C2\u25AA\u25AB\u25B6\u25C0\u25FB-\u25FE\u2600-\u2604\u260E\u2611\u2614\u2615\u2618\u261D\u2620\u2622\u2623\u2626\u262A\u262E\u262F\u2638-\u263A\u2640\u2642\u2648-\u2653\u265F\u2660\u2663\u2665\u2666\u2668\u267B\u267E\u267F\u2692-\u2697\u2699\u269B\u269C\u26A0\u26A1\u26AA\u26AB\u26B0\u26B1\u26BD\u26BE\u26C4\u26C5\u26C8\u26CE\u26CF\u26D1\u26D3\u26D4\u26E9\u26EA\u26F0-\u26F5\u26F7-\u26FA\u26FD\u2702\u2705\u2708-\u270D\u270F\u2712\u2714\u2716\u271D\u2721\u2728\u2733\u2734\u2744\u2747\u274C\u274E\u2753-\u2755\u2757\u2763\u2764\u2795-\u2797\u27A1\u27B0\u27BF\u2934\u2935\u2B05-\u2B07\u2B1B\u2B1C\u2B50\u2B55\u3030\u303D\u3297\u3299]|\uD83C[\uDC04\uDCCF\uDD70\uDD71\uDD7E\uDD7F\uDD8E\uDD91-\uDD9A\uDDE6-\uDDFF\uDE01\uDE02\uDE1A\uDE2F\uDE32-\uDE3A\uDE50\uDE51\uDF00-\uDF21\uDF24-\uDF93\uDF96\uDF97\uDF99-\uDF9B\uDF9E-\uDFF0\uDFF3-\uDFF5\uDFF7-\uDFFF]|\uD83D[\uDC00-\uDCFD\uDCFF-\uDD3D\uDD49-\uDD4E\uDD50-\uDD67\uDD6F\uDD70\uDD73-\uDD7A\uDD87\uDD8A-\uDD8D\uDD90\uDD95\uDD96\uDDA4\uDDA5\uDDA8\uDDB1\uDDB2\uDDBC\uDDC2-\uDDC4\uDDD1-\uDDD3\uDDDC-\uDDDE\uDDE1\uDDE3\uDDE8\uDDEF\uDDF3\uDDFA-\uDE4F\uDE80-\uDEC5\uDECB-\uDED2\uDED5\uDEE0-\uDEE5\uDEE9\uDEEB\uDEEC\uDEF0\uDEF3-\uDEFA\uDFE0-\uDFEB]|\uD83E[\uDD0D-\uDD3A\uDD3C-\uDD45\uDD47-\uDD71\uDD73-\uDD76\uDD7A-\uDDA2\uDDA5-\uDDAA\uDDAE-\uDDCA\uDDCD-\uDDFF\uDE70-\uDE73\uDE78-\uDE7A\uDE80-\uDE82\uDE90-\uDE95])\uFE0F|(?:[\u261D\u26F9\u270A-\u270D]|\uD83C[\uDF85\uDFC2-\uDFC4\uDFC7\uDFCA-\uDFCC]|\uD83D[\uDC42\uDC43\uDC46-\uDC50\uDC66-\uDC78\uDC7C\uDC81-\uDC83\uDC85-\uDC87\uDC8F\uDC91\uDCAA\uDD74\uDD75\uDD7A\uDD90\uDD95\uDD96\uDE45-\uDE47\uDE4B-\uDE4F\uDEA3\uDEB4-\uDEB6\uDEC0\uDECC]|\uD83E[\uDD0F\uDD18-\uDD1F\uDD26\uDD30-\uDD39\uDD3C-\uDD3E\uDDB5\uDDB6\uDDB8\uDDB9\uDDBB\uDDCD-\uDDCF\uDDD1-\uDDDD])/g}});var Kk=_((vKt,R6)=>{"use strict";var Wyt=OS(),Kyt=F6(),Vyt=MEe(),UEe=t=>{if(typeof t!="string"||t.length===0||(t=Wyt(t),t.length===0))return 0;t=t.replace(Vyt(),"  ");let e=0;for(let r=0;r<t.length;r++){let o=t.codePointAt(r);o<=31||o>=127&&o<=159||o>=768&&o<=879||(o>65535&&r++,e+=Kyt(o)?2:1)}return e};R6.exports=UEe;R6.exports.default=UEe});var N6=_((DKt,T6)=>{"use strict";var Jyt=Kk(),_Ee=t=>{let e=0;for(let r of t.split(`
+`))e=Math.max(e,Jyt(r));return e};T6.exports=_Ee;T6.exports.default=_Ee});var HEe=_(cB=>{"use strict";var zyt=cB&&cB.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(cB,"__esModule",{value:!0});var Xyt=zyt(N6()),L6={};cB.default=t=>{if(t.length===0)return{width:0,height:0};if(L6[t])return L6[t];let e=Xyt.default(t),r=t.split(`
+`).length;return L6[t]={width:e,height:r},{width:e,height:r}}});var jEe=_(uB=>{"use strict";var Zyt=uB&&uB.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(uB,"__esModule",{value:!0});var dn=Zyt(am()),$yt=(t,e)=>{"position"in e&&t.setPositionType(e.position==="absolute"?dn.default.POSITION_TYPE_ABSOLUTE:dn.default.POSITION_TYPE_RELATIVE)},eEt=(t,e)=>{"marginLeft"in e&&t.setMargin(dn.default.EDGE_START,e.marginLeft||0),"marginRight"in e&&t.setMargin(dn.default.EDGE_END,e.marginRight||0),"marginTop"in e&&t.setMargin(dn.default.EDGE_TOP,e.marginTop||0),"marginBottom"in e&&t.setMargin(dn.default.EDGE_BOTTOM,e.marginBottom||0)},tEt=(t,e)=>{"paddingLeft"in e&&t.setPadding(dn.default.EDGE_LEFT,e.paddingLeft||0),"paddingRight"in e&&t.setPadding(dn.default.EDGE_RIGHT,e.paddingRight||0),"paddingTop"in e&&t.setPadding(dn.default.EDGE_TOP,e.paddingTop||0),"paddingBottom"in e&&t.setPadding(dn.default.EDGE_BOTTOM,e.paddingBottom||0)},rEt=(t,e)=>{var r;"flexGrow"in e&&t.setFlexGrow((r=e.flexGrow)!==null&&r!==void 0?r:0),"flexShrink"in e&&t.setFlexShrink(typeof e.flexShrink=="number"?e.flexShrink:1),"flexDirection"in e&&(e.flexDirection==="row"&&t.setFlexDirection(dn.default.FLEX_DIRECTION_ROW),e.flexDirection==="row-reverse"&&t.setFlexDirection(dn.default.FLEX_DIRECTION_ROW_REVERSE),e.flexDirection==="column"&&t.setFlexDirection(dn.default.FLEX_DIRECTION_COLUMN),e.flexDirection==="column-reverse"&&t.setFlexDirection(dn.default.FLEX_DIRECTION_COLUMN_REVERSE)),"flexBasis"in e&&(typeof e.flexBasis=="number"?t.setFlexBasis(e.flexBasis):typeof e.flexBasis=="string"?t.setFlexBasisPercent(Number.parseInt(e.flexBasis,10)):t.setFlexBasis(NaN)),"alignItems"in e&&((e.alignItems==="stretch"||!e.alignItems)&&t.setAlignItems(dn.default.ALIGN_STRETCH),e.alignItems==="flex-start"&&t.setAlignItems(dn.default.ALIGN_FLEX_START),e.alignItems==="center"&&t.setAlignItems(dn.default.ALIGN_CENTER),e.alignItems==="flex-end"&&t.setAlignItems(dn.default.ALIGN_FLEX_END)),"alignSelf"in e&&((e.alignSelf==="auto"||!e.alignSelf)&&t.setAlignSelf(dn.default.ALIGN_AUTO),e.alignSelf==="flex-start"&&t.setAlignSelf(dn.default.ALIGN_FLEX_START),e.alignSelf==="center"&&t.setAlignSelf(dn.default.ALIGN_CENTER),e.alignSelf==="flex-end"&&t.setAlignSelf(dn.default.ALIGN_FLEX_END)),"justifyContent"in e&&((e.justifyContent==="flex-start"||!e.justifyContent)&&t.setJustifyContent(dn.default.JUSTIFY_FLEX_START),e.justifyContent==="center"&&t.setJustifyContent(dn.default.JUSTIFY_CENTER),e.justifyContent==="flex-end"&&t.setJustifyContent(dn.default.JUSTIFY_FLEX_END),e.justifyContent==="space-between"&&t.setJustifyContent(dn.default.JUSTIFY_SPACE_BETWEEN),e.justifyContent==="space-around"&&t.setJustifyContent(dn.default.JUSTIFY_SPACE_AROUND))},nEt=(t,e)=>{var r,o;"width"in e&&(typeof e.width=="number"?t.setWidth(e.width):typeof e.width=="string"?t.setWidthPercent(Number.parseInt(e.width,10)):t.setWidthAuto()),"height"in e&&(typeof e.height=="number"?t.setHeight(e.height):typeof e.height=="string"?t.setHeightPercent(Number.parseInt(e.height,10)):t.setHeightAuto()),"minWidth"in e&&(typeof e.minWidth=="string"?t.setMinWidthPercent(Number.parseInt(e.minWidth,10)):t.setMinWidth((r=e.minWidth)!==null&&r!==void 0?r:0)),"minHeight"in e&&(typeof e.minHeight=="string"?t.setMinHeightPercent(Number.parseInt(e.minHeight,10)):t.setMinHeight((o=e.minHeight)!==null&&o!==void 0?o:0))},iEt=(t,e)=>{"display"in e&&t.setDisplay(e.display==="flex"?dn.default.DISPLAY_FLEX:dn.default.DISPLAY_NONE)},sEt=(t,e)=>{if("borderStyle"in e){let r=typeof e.borderStyle=="string"?1:0;t.setBorder(dn.default.EDGE_TOP,r),t.setBorder(dn.default.EDGE_BOTTOM,r),t.setBorder(dn.default.EDGE_LEFT,r),t.setBorder(dn.default.EDGE_RIGHT,r)}};uB.default=(t,e={})=>{$yt(t,e),eEt(t,e),tEt(t,e),rEt(t,e),nEt(t,e),iEt(t,e),sEt(t,e)}});var YEe=_((bKt,qEe)=>{"use strict";var AB=Kk(),oEt=OS(),aEt=DI(),M6=new Set(["\x1B","\x9B"]),lEt=39,GEe=t=>`${M6.values().next().value}[${t}m`,cEt=t=>t.split(" ").map(e=>AB(e)),O6=(t,e,r)=>{let o=[...e],a=!1,n=AB(oEt(t[t.length-1]));for(let[u,A]of o.entries()){let p=AB(A);if(n+p<=r?t[t.length-1]+=A:(t.push(A),n=0),M6.has(A))a=!0;else if(a&&A==="m"){a=!1;continue}a||(n+=p,n===r&&u<o.length-1&&(t.push(""),n=0))}!n&&t[t.length-1].length>0&&t.length>1&&(t[t.length-2]+=t.pop())},uEt=t=>{let e=t.split(" "),r=e.length;for(;r>0&&!(AB(e[r-1])>0);)r--;return r===e.length?t:e.slice(0,r).join(" ")+e.slice(r).join("")},AEt=(t,e,r={})=>{if(r.trim!==!1&&t.trim()==="")return"";let o="",a="",n,u=cEt(t),A=[""];for(let[p,h]of t.split(" ").entries()){r.trim!==!1&&(A[A.length-1]=A[A.length-1].trimLeft());let E=AB(A[A.length-1]);if(p!==0&&(E>=e&&(r.wordWrap===!1||r.trim===!1)&&(A.push(""),E=0),(E>0||r.trim===!1)&&(A[A.length-1]+=" ",E++)),r.hard&&u[p]>e){let I=e-E,v=1+Math.floor((u[p]-I-1)/e);Math.floor((u[p]-1)/e)<v&&A.push(""),O6(A,h,e);continue}if(E+u[p]>e&&E>0&&u[p]>0){if(r.wordWrap===!1&&E<e){O6(A,h,e);continue}A.push("")}if(E+u[p]>e&&r.wordWrap===!1){O6(A,h,e);continue}A[A.length-1]+=h}r.trim!==!1&&(A=A.map(uEt)),o=A.join(`
+`);for(let[p,h]of[...o].entries()){if(a+=h,M6.has(h)){let I=parseFloat(/\d[^m]*/.exec(o.slice(p,p+4)));n=I===lEt?null:I}let E=aEt.codes.get(Number(n));n&&E&&(o[p+1]===`
+`?a+=GEe(E):h===`
+`&&(a+=GEe(n)))}return a};qEe.exports=(t,e,r)=>String(t).normalize().replace(/\r\n/g,`
+`).split(`
+`).map(o=>AEt(o,e,r)).join(`
+`)});var VEe=_((xKt,KEe)=>{"use strict";var WEe="[\uD800-\uDBFF][\uDC00-\uDFFF]",fEt=t=>t&&t.exact?new RegExp(`^${WEe}$`):new RegExp(WEe,"g");KEe.exports=fEt});var U6=_((kKt,ZEe)=>{"use strict";var pEt=F6(),hEt=VEe(),JEe=DI(),XEe=["\x1B","\x9B"],Vk=t=>`${XEe[0]}[${t}m`,zEe=(t,e,r)=>{let o=[];t=[...t];for(let a of t){let n=a;a.match(";")&&(a=a.split(";")[0][0]+"0");let u=JEe.codes.get(parseInt(a,10));if(u){let A=t.indexOf(u.toString());A>=0?t.splice(A,1):o.push(Vk(e?u:n))}else if(e){o.push(Vk(0));break}else o.push(Vk(n))}if(e&&(o=o.filter((a,n)=>o.indexOf(a)===n),r!==void 0)){let a=Vk(JEe.codes.get(parseInt(r,10)));o=o.reduce((n,u)=>u===a?[u,...n]:[...n,u],[])}return o.join("")};ZEe.exports=(t,e,r)=>{let o=[...t.normalize()],a=[];r=typeof r=="number"?r:o.length;let n=!1,u,A=0,p="";for(let[h,E]of o.entries()){let I=!1;if(XEe.includes(E)){let v=/\d[^m]*/.exec(t.slice(h,h+18));u=v&&v.length>0?v[0]:void 0,A<r&&(n=!0,u!==void 0&&a.push(u))}else n&&E==="m"&&(n=!1,I=!0);if(!n&&!I&&++A,!hEt({exact:!0}).test(E)&&pEt(E.codePointAt())&&++A,A>e&&A<=r)p+=E;else if(A===e&&!n&&u!==void 0)p=zEe(a);else if(A>=r){p+=zEe(a,!0,u);break}}return p}});var eCe=_((QKt,$Ee)=>{"use strict";var E0=U6(),gEt=Kk();function Jk(t,e,r){if(t.charAt(e)===" ")return e;for(let o=1;o<=3;o++)if(r){if(t.charAt(e+o)===" ")return e+o}else if(t.charAt(e-o)===" ")return e-o;return e}$Ee.exports=(t,e,r)=>{r={position:"end",preferTruncationOnSpace:!1,...r};let{position:o,space:a,preferTruncationOnSpace:n}=r,u="\u2026",A=1;if(typeof t!="string")throw new TypeError(`Expected \`input\` to be a string, got ${typeof t}`);if(typeof e!="number")throw new TypeError(`Expected \`columns\` to be a number, got ${typeof e}`);if(e<1)return"";if(e===1)return u;let p=gEt(t);if(p<=e)return t;if(o==="start"){if(n){let h=Jk(t,p-e+1,!0);return u+E0(t,h,p).trim()}return a===!0&&(u+=" ",A=2),u+E0(t,p-e+A,p)}if(o==="middle"){a===!0&&(u=" "+u+" ",A=3);let h=Math.floor(e/2);if(n){let E=Jk(t,h),I=Jk(t,p-(e-h)+1,!0);return E0(t,0,E)+u+E0(t,I,p).trim()}return E0(t,0,h)+u+E0(t,p-(e-h)+A,p)}if(o==="end"){if(n){let h=Jk(t,e-1);return E0(t,0,h)+u}return a===!0&&(u=" "+u,A=2),E0(t,0,e-A)+u}throw new Error(`Expected \`options.position\` to be either \`start\`, \`middle\` or \`end\`, got ${o}`)}});var H6=_(fB=>{"use strict";var tCe=fB&&fB.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(fB,"__esModule",{value:!0});var dEt=tCe(YEe()),mEt=tCe(eCe()),_6={};fB.default=(t,e,r)=>{let o=t+String(e)+String(r);if(_6[o])return _6[o];let a=t;if(r==="wrap"&&(a=dEt.default(t,e,{trim:!1,hard:!0})),r.startsWith("truncate")){let n="end";r==="truncate-middle"&&(n="middle"),r==="truncate-start"&&(n="start"),a=mEt.default(t,e,{position:n})}return _6[o]=a,a}});var G6=_(j6=>{"use strict";Object.defineProperty(j6,"__esModule",{value:!0});var rCe=t=>{let e="";if(t.childNodes.length>0)for(let r of t.childNodes){let o="";r.nodeName==="#text"?o=r.nodeValue:((r.nodeName==="ink-text"||r.nodeName==="ink-virtual-text")&&(o=rCe(r)),o.length>0&&typeof r.internal_transform=="function"&&(o=r.internal_transform(o))),e+=o}return e};j6.default=rCe});var q6=_(pi=>{"use strict";var pB=pi&&pi.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(pi,"__esModule",{value:!0});pi.setTextNodeValue=pi.createTextNode=pi.setStyle=pi.setAttribute=pi.removeChildNode=pi.insertBeforeNode=pi.appendChildNode=pi.createNode=pi.TEXT_NAME=void 0;var yEt=pB(am()),nCe=pB(HEe()),EEt=pB(jEe()),CEt=pB(H6()),wEt=pB(G6());pi.TEXT_NAME="#text";pi.createNode=t=>{var e;let r={nodeName:t,style:{},attributes:{},childNodes:[],parentNode:null,yogaNode:t==="ink-virtual-text"?void 0:yEt.default.Node.create()};return t==="ink-text"&&((e=r.yogaNode)===null||e===void 0||e.setMeasureFunc(IEt.bind(null,r))),r};pi.appendChildNode=(t,e)=>{var r;e.parentNode&&pi.removeChildNode(e.parentNode,e),e.parentNode=t,t.childNodes.push(e),e.yogaNode&&((r=t.yogaNode)===null||r===void 0||r.insertChild(e.yogaNode,t.yogaNode.getChildCount())),(t.nodeName==="ink-text"||t.nodeName==="ink-virtual-text")&&zk(t)};pi.insertBeforeNode=(t,e,r)=>{var o,a;e.parentNode&&pi.removeChildNode(e.parentNode,e),e.parentNode=t;let n=t.childNodes.indexOf(r);if(n>=0){t.childNodes.splice(n,0,e),e.yogaNode&&((o=t.yogaNode)===null||o===void 0||o.insertChild(e.yogaNode,n));return}t.childNodes.push(e),e.yogaNode&&((a=t.yogaNode)===null||a===void 0||a.insertChild(e.yogaNode,t.yogaNode.getChildCount())),(t.nodeName==="ink-text"||t.nodeName==="ink-virtual-text")&&zk(t)};pi.removeChildNode=(t,e)=>{var r,o;e.yogaNode&&((o=(r=e.parentNode)===null||r===void 0?void 0:r.yogaNode)===null||o===void 0||o.removeChild(e.yogaNode)),e.parentNode=null;let a=t.childNodes.indexOf(e);a>=0&&t.childNodes.splice(a,1),(t.nodeName==="ink-text"||t.nodeName==="ink-virtual-text")&&zk(t)};pi.setAttribute=(t,e,r)=>{t.attributes[e]=r};pi.setStyle=(t,e)=>{t.style=e,t.yogaNode&&EEt.default(t.yogaNode,e)};pi.createTextNode=t=>{let e={nodeName:"#text",nodeValue:t,yogaNode:void 0,parentNode:null,style:{}};return pi.setTextNodeValue(e,t),e};var IEt=function(t,e){var r,o;let a=t.nodeName==="#text"?t.nodeValue:wEt.default(t),n=nCe.default(a);if(n.width<=e||n.width>=1&&e>0&&e<1)return n;let u=(o=(r=t.style)===null||r===void 0?void 0:r.textWrap)!==null&&o!==void 0?o:"wrap",A=CEt.default(a,e,u);return nCe.default(A)},iCe=t=>{var e;if(!(!t||!t.parentNode))return(e=t.yogaNode)!==null&&e!==void 0?e:iCe(t.parentNode)},zk=t=>{let e=iCe(t);e?.markDirty()};pi.setTextNodeValue=(t,e)=>{typeof e!="string"&&(e=String(e)),t.nodeValue=e,zk(t)}});var cCe=_(hB=>{"use strict";var lCe=hB&&hB.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(hB,"__esModule",{value:!0});var sCe=S6(),BEt=lCe(PEe()),oCe=lCe(am()),Oo=q6(),aCe=t=>{t?.unsetMeasureFunc(),t?.freeRecursive()};hB.default=BEt.default({schedulePassiveEffects:sCe.unstable_scheduleCallback,cancelPassiveEffects:sCe.unstable_cancelCallback,now:Date.now,getRootHostContext:()=>({isInsideText:!1}),prepareForCommit:()=>{},resetAfterCommit:t=>{if(t.isStaticDirty){t.isStaticDirty=!1,typeof t.onImmediateRender=="function"&&t.onImmediateRender();return}typeof t.onRender=="function"&&t.onRender()},getChildHostContext:(t,e)=>{let r=t.isInsideText,o=e==="ink-text"||e==="ink-virtual-text";return r===o?t:{isInsideText:o}},shouldSetTextContent:()=>!1,createInstance:(t,e,r,o)=>{if(o.isInsideText&&t==="ink-box")throw new Error("<Box> can\u2019t be nested inside <Text> component");let a=t==="ink-text"&&o.isInsideText?"ink-virtual-text":t,n=Oo.createNode(a);for(let[u,A]of Object.entries(e))u!=="children"&&(u==="style"?Oo.setStyle(n,A):u==="internal_transform"?n.internal_transform=A:u==="internal_static"?n.internal_static=!0:Oo.setAttribute(n,u,A));return n},createTextInstance:(t,e,r)=>{if(!r.isInsideText)throw new Error(`Text string "${t}" must be rendered inside <Text> component`);return Oo.createTextNode(t)},resetTextContent:()=>{},hideTextInstance:t=>{Oo.setTextNodeValue(t,"")},unhideTextInstance:(t,e)=>{Oo.setTextNodeValue(t,e)},getPublicInstance:t=>t,hideInstance:t=>{var e;(e=t.yogaNode)===null||e===void 0||e.setDisplay(oCe.default.DISPLAY_NONE)},unhideInstance:t=>{var e;(e=t.yogaNode)===null||e===void 0||e.setDisplay(oCe.default.DISPLAY_FLEX)},appendInitialChild:Oo.appendChildNode,appendChild:Oo.appendChildNode,insertBefore:Oo.insertBeforeNode,finalizeInitialChildren:(t,e,r,o)=>(t.internal_static&&(o.isStaticDirty=!0,o.staticNode=t),!1),supportsMutation:!0,appendChildToContainer:Oo.appendChildNode,insertInContainerBefore:Oo.insertBeforeNode,removeChildFromContainer:(t,e)=>{Oo.removeChildNode(t,e),aCe(e.yogaNode)},prepareUpdate:(t,e,r,o,a)=>{t.internal_static&&(a.isStaticDirty=!0);let n={},u=Object.keys(o);for(let A of u)if(o[A]!==r[A]){if(A==="style"&&typeof o.style=="object"&&typeof r.style=="object"){let h=o.style,E=r.style,I=Object.keys(h);for(let v of I){if(v==="borderStyle"||v==="borderColor"){if(typeof n.style!="object"){let x={};n.style=x}n.style.borderStyle=h.borderStyle,n.style.borderColor=h.borderColor}if(h[v]!==E[v]){if(typeof n.style!="object"){let x={};n.style=x}n.style[v]=h[v]}}continue}n[A]=o[A]}return n},commitUpdate:(t,e)=>{for(let[r,o]of Object.entries(e))r!=="children"&&(r==="style"?Oo.setStyle(t,o):r==="internal_transform"?t.internal_transform=o:r==="internal_static"?t.internal_static=!0:Oo.setAttribute(t,r,o))},commitTextUpdate:(t,e,r)=>{Oo.setTextNodeValue(t,r)},removeChild:(t,e)=>{Oo.removeChildNode(t,e),aCe(e.yogaNode)}})});var ACe=_((LKt,uCe)=>{"use strict";uCe.exports=(t,e=1,r)=>{if(r={indent:" ",includeEmptyLines:!1,...r},typeof t!="string")throw new TypeError(`Expected \`input\` to be a \`string\`, got \`${typeof t}\``);if(typeof e!="number")throw new TypeError(`Expected \`count\` to be a \`number\`, got \`${typeof e}\``);if(typeof r.indent!="string")throw new TypeError(`Expected \`options.indent\` to be a \`string\`, got \`${typeof r.indent}\``);if(e===0)return t;let o=r.includeEmptyLines?/^/gm:/^(?!\s*$)/gm;return t.replace(o,r.indent.repeat(e))}});var fCe=_(gB=>{"use strict";var vEt=gB&&gB.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(gB,"__esModule",{value:!0});var Xk=vEt(am());gB.default=t=>t.getComputedWidth()-t.getComputedPadding(Xk.default.EDGE_LEFT)-t.getComputedPadding(Xk.default.EDGE_RIGHT)-t.getComputedBorder(Xk.default.EDGE_LEFT)-t.getComputedBorder(Xk.default.EDGE_RIGHT)});var pCe=_((MKt,DEt)=>{DEt.exports={single:{topLeft:"\u250C",topRight:"\u2510",bottomRight:"\u2518",bottomLeft:"\u2514",vertical:"\u2502",horizontal:"\u2500"},double:{topLeft:"\u2554",topRight:"\u2557",bottomRight:"\u255D",bottomLeft:"\u255A",vertical:"\u2551",horizontal:"\u2550"},round:{topLeft:"\u256D",topRight:"\u256E",bottomRight:"\u256F",bottomLeft:"\u2570",vertical:"\u2502",horizontal:"\u2500"},bold:{topLeft:"\u250F",topRight:"\u2513",bottomRight:"\u251B",bottomLeft:"\u2517",vertical:"\u2503",horizontal:"\u2501"},singleDouble:{topLeft:"\u2553",topRight:"\u2556",bottomRight:"\u255C",bottomLeft:"\u2559",vertical:"\u2551",horizontal:"\u2500"},doubleSingle:{topLeft:"\u2552",topRight:"\u2555",bottomRight:"\u255B",bottomLeft:"\u2558",vertical:"\u2502",horizontal:"\u2550"},classic:{topLeft:"+",topRight:"+",bottomRight:"+",bottomLeft:"+",vertical:"|",horizontal:"-"}}});var gCe=_((UKt,Y6)=>{"use strict";var hCe=pCe();Y6.exports=hCe;Y6.exports.default=hCe});var mCe=_((_Kt,dCe)=>{"use strict";var SEt=(t,e,r)=>{let o=t.indexOf(e);if(o===-1)return t;let a=e.length,n=0,u="";do u+=t.substr(n,o-n)+e+r,n=o+a,o=t.indexOf(e,n);while(o!==-1);return u+=t.substr(n),u},PEt=(t,e,r,o)=>{let a=0,n="";do{let u=t[o-1]==="\r";n+=t.substr(a,(u?o-1:o)-a)+e+(u?`\r
+`:`
+`)+r,a=o+1,o=t.indexOf(`
+`,a)}while(o!==-1);return n+=t.substr(a),n};dCe.exports={stringReplaceAll:SEt,stringEncaseCRLFWithFirstIndex:PEt}});var ICe=_((HKt,wCe)=>{"use strict";var bEt=/(?:\\(u(?:[a-f\d]{4}|\{[a-f\d]{1,6}\})|x[a-f\d]{2}|.))|(?:\{(~)?(\w+(?:\([^)]*\))?(?:\.\w+(?:\([^)]*\))?)*)(?:[ \t]|(?=\r?\n)))|(\})|((?:.|[\r\n\f])+?)/gi,yCe=/(?:^|\.)(\w+)(?:\(([^)]*)\))?/g,xEt=/^(['"])((?:\\.|(?!\1)[^\\])*)\1$/,kEt=/\\(u(?:[a-f\d]{4}|{[a-f\d]{1,6}})|x[a-f\d]{2}|.)|([^\\])/gi,QEt=new Map([["n",`
+`],["r","\r"],["t","	"],["b","\b"],["f","\f"],["v","\v"],["0","\0"],["\\","\\"],["e","\x1B"],["a","\x07"]]);function CCe(t){let e=t[0]==="u",r=t[1]==="{";return e&&!r&&t.length===5||t[0]==="x"&&t.length===3?String.fromCharCode(parseInt(t.slice(1),16)):e&&r?String.fromCodePoint(parseInt(t.slice(2,-1),16)):QEt.get(t)||t}function FEt(t,e){let r=[],o=e.trim().split(/\s*,\s*/g),a;for(let n of o){let u=Number(n);if(!Number.isNaN(u))r.push(u);else if(a=n.match(xEt))r.push(a[2].replace(kEt,(A,p,h)=>p?CCe(p):h));else throw new Error(`Invalid Chalk template style argument: ${n} (in style '${t}')`)}return r}function REt(t){yCe.lastIndex=0;let e=[],r;for(;(r=yCe.exec(t))!==null;){let o=r[1];if(r[2]){let a=FEt(o,r[2]);e.push([o].concat(a))}else e.push([o])}return e}function ECe(t,e){let r={};for(let a of e)for(let n of a.styles)r[n[0]]=a.inverse?null:n.slice(1);let o=t;for(let[a,n]of Object.entries(r))if(!!Array.isArray(n)){if(!(a in o))throw new Error(`Unknown Chalk style: ${a}`);o=n.length>0?o[a](...n):o[a]}return o}wCe.exports=(t,e)=>{let r=[],o=[],a=[];if(e.replace(bEt,(n,u,A,p,h,E)=>{if(u)a.push(CCe(u));else if(p){let I=a.join("");a=[],o.push(r.length===0?I:ECe(t,r)(I)),r.push({inverse:A,styles:REt(p)})}else if(h){if(r.length===0)throw new Error("Found extraneous } in Chalk template literal");o.push(ECe(t,r)(a.join(""))),a=[],r.pop()}else a.push(E)}),o.push(a.join("")),r.length>0){let n=`Chalk template literal is missing ${r.length} closing bracket${r.length===1?"":"s"} (\`}\`)`;throw new Error(n)}return o.join("")}});var rQ=_((jKt,bCe)=>{"use strict";var dB=DI(),{stdout:K6,stderr:V6}=dN(),{stringReplaceAll:TEt,stringEncaseCRLFWithFirstIndex:NEt}=mCe(),{isArray:Zk}=Array,vCe=["ansi","ansi","ansi256","ansi16m"],HC=Object.create(null),LEt=(t,e={})=>{if(e.level&&!(Number.isInteger(e.level)&&e.level>=0&&e.level<=3))throw new Error("The `level` option should be an integer from 0 to 3");let r=K6?K6.level:0;t.level=e.level===void 0?r:e.level},J6=class{constructor(e){return DCe(e)}},DCe=t=>{let e={};return LEt(e,t),e.template=(...r)=>PCe(e.template,...r),Object.setPrototypeOf(e,$k.prototype),Object.setPrototypeOf(e.template,e),e.template.constructor=()=>{throw new Error("`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.")},e.template.Instance=J6,e.template};function $k(t){return DCe(t)}for(let[t,e]of Object.entries(dB))HC[t]={get(){let r=eQ(this,z6(e.open,e.close,this._styler),this._isEmpty);return Object.defineProperty(this,t,{value:r}),r}};HC.visible={get(){let t=eQ(this,this._styler,!0);return Object.defineProperty(this,"visible",{value:t}),t}};var SCe=["rgb","hex","keyword","hsl","hsv","hwb","ansi","ansi256"];for(let t of SCe)HC[t]={get(){let{level:e}=this;return function(...r){let o=z6(dB.color[vCe[e]][t](...r),dB.color.close,this._styler);return eQ(this,o,this._isEmpty)}}};for(let t of SCe){let e="bg"+t[0].toUpperCase()+t.slice(1);HC[e]={get(){let{level:r}=this;return function(...o){let a=z6(dB.bgColor[vCe[r]][t](...o),dB.bgColor.close,this._styler);return eQ(this,a,this._isEmpty)}}}}var OEt=Object.defineProperties(()=>{},{...HC,level:{enumerable:!0,get(){return this._generator.level},set(t){this._generator.level=t}}}),z6=(t,e,r)=>{let o,a;return r===void 0?(o=t,a=e):(o=r.openAll+t,a=e+r.closeAll),{open:t,close:e,openAll:o,closeAll:a,parent:r}},eQ=(t,e,r)=>{let o=(...a)=>Zk(a[0])&&Zk(a[0].raw)?BCe(o,PCe(o,...a)):BCe(o,a.length===1?""+a[0]:a.join(" "));return Object.setPrototypeOf(o,OEt),o._generator=t,o._styler=e,o._isEmpty=r,o},BCe=(t,e)=>{if(t.level<=0||!e)return t._isEmpty?"":e;let r=t._styler;if(r===void 0)return e;let{openAll:o,closeAll:a}=r;if(e.indexOf("\x1B")!==-1)for(;r!==void 0;)e=TEt(e,r.close,r.open),r=r.parent;let n=e.indexOf(`
+`);return n!==-1&&(e=NEt(e,a,o,n)),o+e+a},W6,PCe=(t,...e)=>{let[r]=e;if(!Zk(r)||!Zk(r.raw))return e.join(" ");let o=e.slice(1),a=[r.raw[0]];for(let n=1;n<r.length;n++)a.push(String(o[n-1]).replace(/[{}\\]/g,"\\$&"),String(r.raw[n]));return W6===void 0&&(W6=ICe()),W6(t,a.join(""))};Object.defineProperties($k.prototype,HC);var tQ=$k();tQ.supportsColor=K6;tQ.stderr=$k({level:V6?V6.level:0});tQ.stderr.supportsColor=V6;bCe.exports=tQ});var X6=_(yB=>{"use strict";var MEt=yB&&yB.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(yB,"__esModule",{value:!0});var mB=MEt(rQ()),UEt=/^(rgb|hsl|hsv|hwb)\(\s?(\d+),\s?(\d+),\s?(\d+)\s?\)$/,_Et=/^(ansi|ansi256)\(\s?(\d+)\s?\)$/,nQ=(t,e)=>e==="foreground"?t:"bg"+t[0].toUpperCase()+t.slice(1);yB.default=(t,e,r)=>{if(!e)return t;if(e in mB.default){let a=nQ(e,r);return mB.default[a](t)}if(e.startsWith("#")){let a=nQ("hex",r);return mB.default[a](e)(t)}if(e.startsWith("ansi")){let a=_Et.exec(e);if(!a)return t;let n=nQ(a[1],r),u=Number(a[2]);return mB.default[n](u)(t)}if(e.startsWith("rgb")||e.startsWith("hsl")||e.startsWith("hsv")||e.startsWith("hwb")){let a=UEt.exec(e);if(!a)return t;let n=nQ(a[1],r),u=Number(a[2]),A=Number(a[3]),p=Number(a[4]);return mB.default[n](u,A,p)(t)}return t}});var kCe=_(EB=>{"use strict";var xCe=EB&&EB.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(EB,"__esModule",{value:!0});var HEt=xCe(gCe()),Z6=xCe(X6());EB.default=(t,e,r,o)=>{if(typeof r.style.borderStyle=="string"){let a=r.yogaNode.getComputedWidth(),n=r.yogaNode.getComputedHeight(),u=r.style.borderColor,A=HEt.default[r.style.borderStyle],p=Z6.default(A.topLeft+A.horizontal.repeat(a-2)+A.topRight,u,"foreground"),h=(Z6.default(A.vertical,u,"foreground")+`
+`).repeat(n-2),E=Z6.default(A.bottomLeft+A.horizontal.repeat(a-2)+A.bottomRight,u,"foreground");o.write(t,e,p,{transformers:[]}),o.write(t,e+1,h,{transformers:[]}),o.write(t+a-1,e+1,h,{transformers:[]}),o.write(t,e+n-1,E,{transformers:[]})}}});var FCe=_(CB=>{"use strict";var lm=CB&&CB.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(CB,"__esModule",{value:!0});var jEt=lm(am()),GEt=lm(N6()),qEt=lm(ACe()),YEt=lm(H6()),WEt=lm(fCe()),KEt=lm(G6()),VEt=lm(kCe()),JEt=(t,e)=>{var r;let o=(r=t.childNodes[0])===null||r===void 0?void 0:r.yogaNode;if(o){let a=o.getComputedLeft(),n=o.getComputedTop();e=`
+`.repeat(n)+qEt.default(e,a)}return e},QCe=(t,e,r)=>{var o;let{offsetX:a=0,offsetY:n=0,transformers:u=[],skipStaticElements:A}=r;if(A&&t.internal_static)return;let{yogaNode:p}=t;if(p){if(p.getDisplay()===jEt.default.DISPLAY_NONE)return;let h=a+p.getComputedLeft(),E=n+p.getComputedTop(),I=u;if(typeof t.internal_transform=="function"&&(I=[t.internal_transform,...u]),t.nodeName==="ink-text"){let v=KEt.default(t);if(v.length>0){let x=GEt.default(v),C=WEt.default(p);if(x>C){let R=(o=t.style.textWrap)!==null&&o!==void 0?o:"wrap";v=YEt.default(v,C,R)}v=JEt(t,v),e.write(h,E,v,{transformers:I})}return}if(t.nodeName==="ink-box"&&VEt.default(h,E,t,e),t.nodeName==="ink-root"||t.nodeName==="ink-box")for(let v of t.childNodes)QCe(v,e,{offsetX:h,offsetY:E,transformers:I,skipStaticElements:A})}};CB.default=QCe});var TCe=_((WKt,RCe)=>{"use strict";RCe.exports=t=>{t=Object.assign({onlyFirst:!1},t);let e=["[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)","(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))"].join("|");return new RegExp(e,t.onlyFirst?void 0:"g")}});var LCe=_((KKt,$6)=>{"use strict";var zEt=TCe(),NCe=t=>typeof t=="string"?t.replace(zEt(),""):t;$6.exports=NCe;$6.exports.default=NCe});var UCe=_((VKt,MCe)=>{"use strict";var OCe="[\uD800-\uDBFF][\uDC00-\uDFFF]";MCe.exports=t=>t&&t.exact?new RegExp(`^${OCe}$`):new RegExp(OCe,"g")});var HCe=_((JKt,ej)=>{"use strict";var XEt=LCe(),ZEt=UCe(),_Ce=t=>XEt(t).replace(ZEt()," ").length;ej.exports=_Ce;ej.exports.default=_Ce});var qCe=_(wB=>{"use strict";var GCe=wB&&wB.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(wB,"__esModule",{value:!0});var jCe=GCe(U6()),$Et=GCe(HCe()),tj=class{constructor(e){this.writes=[];let{width:r,height:o}=e;this.width=r,this.height=o}write(e,r,o,a){let{transformers:n}=a;!o||this.writes.push({x:e,y:r,text:o,transformers:n})}get(){let e=[];for(let o=0;o<this.height;o++)e.push(" ".repeat(this.width));for(let o of this.writes){let{x:a,y:n,text:u,transformers:A}=o,p=u.split(`
+`),h=0;for(let E of p){let I=e[n+h];if(!I)continue;let v=$Et.default(E);for(let x of A)E=x(E);e[n+h]=jCe.default(I,0,a)+E+jCe.default(I,a+v),h++}}return{output:e.map(o=>o.trimRight()).join(`
+`),height:e.length}}};wB.default=tj});var KCe=_(IB=>{"use strict";var rj=IB&&IB.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(IB,"__esModule",{value:!0});var eCt=rj(am()),YCe=rj(FCe()),WCe=rj(qCe());IB.default=(t,e)=>{var r;if(t.yogaNode.setWidth(e),t.yogaNode){t.yogaNode.calculateLayout(void 0,void 0,eCt.default.DIRECTION_LTR);let o=new WCe.default({width:t.yogaNode.getComputedWidth(),height:t.yogaNode.getComputedHeight()});YCe.default(t,o,{skipStaticElements:!0});let a;!((r=t.staticNode)===null||r===void 0)&&r.yogaNode&&(a=new WCe.default({width:t.staticNode.yogaNode.getComputedWidth(),height:t.staticNode.yogaNode.getComputedHeight()}),YCe.default(t.staticNode,a,{skipStaticElements:!1}));let{output:n,height:u}=o.get();return{output:n,outputHeight:u,staticOutput:a?`${a.get().output}
+`:""}}return{output:"",outputHeight:0,staticOutput:""}}});var XCe=_((ZKt,zCe)=>{"use strict";var VCe=ve("stream"),JCe=["assert","count","countReset","debug","dir","dirxml","error","group","groupCollapsed","groupEnd","info","log","table","time","timeEnd","timeLog","trace","warn"],nj={},tCt=t=>{let e=new VCe.PassThrough,r=new VCe.PassThrough;e.write=a=>t("stdout",a),r.write=a=>t("stderr",a);let o=new console.Console(e,r);for(let a of JCe)nj[a]=console[a],console[a]=o[a];return()=>{for(let a of JCe)console[a]=nj[a];nj={}}};zCe.exports=tCt});var sj=_(ij=>{"use strict";Object.defineProperty(ij,"__esModule",{value:!0});ij.default=new WeakMap});var aj=_(oj=>{"use strict";Object.defineProperty(oj,"__esModule",{value:!0});var rCt=on(),ZCe=rCt.createContext({exit:()=>{}});ZCe.displayName="InternalAppContext";oj.default=ZCe});var cj=_(lj=>{"use strict";Object.defineProperty(lj,"__esModule",{value:!0});var nCt=on(),$Ce=nCt.createContext({stdin:void 0,setRawMode:()=>{},isRawModeSupported:!1,internal_exitOnCtrlC:!0});$Ce.displayName="InternalStdinContext";lj.default=$Ce});var Aj=_(uj=>{"use strict";Object.defineProperty(uj,"__esModule",{value:!0});var iCt=on(),ewe=iCt.createContext({stdout:void 0,write:()=>{}});ewe.displayName="InternalStdoutContext";uj.default=ewe});var pj=_(fj=>{"use strict";Object.defineProperty(fj,"__esModule",{value:!0});var sCt=on(),twe=sCt.createContext({stderr:void 0,write:()=>{}});twe.displayName="InternalStderrContext";fj.default=twe});var iQ=_(hj=>{"use strict";Object.defineProperty(hj,"__esModule",{value:!0});var oCt=on(),rwe=oCt.createContext({activeId:void 0,add:()=>{},remove:()=>{},activate:()=>{},deactivate:()=>{},enableFocus:()=>{},disableFocus:()=>{},focusNext:()=>{},focusPrevious:()=>{}});rwe.displayName="InternalFocusContext";hj.default=rwe});var iwe=_((sVt,nwe)=>{"use strict";var aCt=/[|\\{}()[\]^$+*?.-]/g;nwe.exports=t=>{if(typeof t!="string")throw new TypeError("Expected a string");return t.replace(aCt,"\\$&")}});var lwe=_((oVt,awe)=>{"use strict";var lCt=iwe(),cCt=typeof process=="object"&&process&&typeof process.cwd=="function"?process.cwd():".",owe=[].concat(ve("module").builtinModules,"bootstrap_node","node").map(t=>new RegExp(`(?:\\((?:node:)?${t}(?:\\.js)?:\\d+:\\d+\\)$|^\\s*at (?:node:)?${t}(?:\\.js)?:\\d+:\\d+$)`));owe.push(/\((?:node:)?internal\/[^:]+:\d+:\d+\)$/,/\s*at (?:node:)?internal\/[^:]+:\d+:\d+$/,/\/\.node-spawn-wrap-\w+-\w+\/node:\d+:\d+\)?$/);var BB=class{constructor(e){e={ignoredPackages:[],...e},"internals"in e||(e.internals=BB.nodeInternals()),"cwd"in e||(e.cwd=cCt),this._cwd=e.cwd.replace(/\\/g,"/"),this._internals=[].concat(e.internals,uCt(e.ignoredPackages)),this._wrapCallSite=e.wrapCallSite||!1}static nodeInternals(){return[...owe]}clean(e,r=0){r=" ".repeat(r),Array.isArray(e)||(e=e.split(`
+`)),!/^\s*at /.test(e[0])&&/^\s*at /.test(e[1])&&(e=e.slice(1));let o=!1,a=null,n=[];return e.forEach(u=>{if(u=u.replace(/\\/g,"/"),this._internals.some(p=>p.test(u)))return;let A=/^\s*at /.test(u);o?u=u.trimEnd().replace(/^(\s+)at /,"$1"):(u=u.trim(),A&&(u=u.slice(3))),u=u.replace(`${this._cwd}/`,""),u&&(A?(a&&(n.push(a),a=null),n.push(u)):(o=!0,a=u))}),n.map(u=>`${r}${u}
+`).join("")}captureString(e,r=this.captureString){typeof e=="function"&&(r=e,e=1/0);let{stackTraceLimit:o}=Error;e&&(Error.stackTraceLimit=e);let a={};Error.captureStackTrace(a,r);let{stack:n}=a;return Error.stackTraceLimit=o,this.clean(n)}capture(e,r=this.capture){typeof e=="function"&&(r=e,e=1/0);let{prepareStackTrace:o,stackTraceLimit:a}=Error;Error.prepareStackTrace=(A,p)=>this._wrapCallSite?p.map(this._wrapCallSite):p,e&&(Error.stackTraceLimit=e);let n={};Error.captureStackTrace(n,r);let{stack:u}=n;return Object.assign(Error,{prepareStackTrace:o,stackTraceLimit:a}),u}at(e=this.at){let[r]=this.capture(1,e);if(!r)return{};let o={line:r.getLineNumber(),column:r.getColumnNumber()};swe(o,r.getFileName(),this._cwd),r.isConstructor()&&(o.constructor=!0),r.isEval()&&(o.evalOrigin=r.getEvalOrigin()),r.isNative()&&(o.native=!0);let a;try{a=r.getTypeName()}catch{}a&&a!=="Object"&&a!=="[object Object]"&&(o.type=a);let n=r.getFunctionName();n&&(o.function=n);let u=r.getMethodName();return u&&n!==u&&(o.method=u),o}parseLine(e){let r=e&&e.match(ACt);if(!r)return null;let o=r[1]==="new",a=r[2],n=r[3],u=r[4],A=Number(r[5]),p=Number(r[6]),h=r[7],E=r[8],I=r[9],v=r[10]==="native",x=r[11]===")",C,R={};if(E&&(R.line=Number(E)),I&&(R.column=Number(I)),x&&h){let L=0;for(let U=h.length-1;U>0;U--)if(h.charAt(U)===")")L++;else if(h.charAt(U)==="("&&h.charAt(U-1)===" "&&(L--,L===-1&&h.charAt(U-1)===" ")){let J=h.slice(0,U-1);h=h.slice(U+1),a+=` (${J}`;break}}if(a){let L=a.match(fCt);L&&(a=L[1],C=L[2])}return swe(R,h,this._cwd),o&&(R.constructor=!0),n&&(R.evalOrigin=n,R.evalLine=A,R.evalColumn=p,R.evalFile=u&&u.replace(/\\/g,"/")),v&&(R.native=!0),a&&(R.function=a),C&&a!==C&&(R.method=C),R}};function swe(t,e,r){e&&(e=e.replace(/\\/g,"/"),e.startsWith(`${r}/`)&&(e=e.slice(r.length+1)),t.file=e)}function uCt(t){if(t.length===0)return[];let e=t.map(r=>lCt(r));return new RegExp(`[/\\\\]node_modules[/\\\\](?:${e.join("|")})[/\\\\][^:]+:\\d+:\\d+`)}var ACt=new RegExp("^(?:\\s*at )?(?:(new) )?(?:(.*?) \\()?(?:eval at ([^ ]+) \\((.+?):(\\d+):(\\d+)\\), )?(?:(.+?):(\\d+):(\\d+)|(native))(\\)?)$"),fCt=/^(.*?) \[as (.*?)\]$/;awe.exports=BB});var uwe=_((aVt,cwe)=>{"use strict";cwe.exports=(t,e)=>t.replace(/^\t+/gm,r=>" ".repeat(r.length*(e||2)))});var fwe=_((lVt,Awe)=>{"use strict";var pCt=uwe(),hCt=(t,e)=>{let r=[],o=t-e,a=t+e;for(let n=o;n<=a;n++)r.push(n);return r};Awe.exports=(t,e,r)=>{if(typeof t!="string")throw new TypeError("Source code is missing.");if(!e||e<1)throw new TypeError("Line number must start from `1`.");if(t=pCt(t).split(/\r?\n/),!(e>t.length))return r={around:3,...r},hCt(e,r.around).filter(o=>t[o-1]!==void 0).map(o=>({line:o,value:t[o-1]}))}});var sQ=_(ru=>{"use strict";var gCt=ru&&ru.__createBinding||(Object.create?function(t,e,r,o){o===void 0&&(o=r),Object.defineProperty(t,o,{enumerable:!0,get:function(){return e[r]}})}:function(t,e,r,o){o===void 0&&(o=r),t[o]=e[r]}),dCt=ru&&ru.__setModuleDefault||(Object.create?function(t,e){Object.defineProperty(t,"default",{enumerable:!0,value:e})}:function(t,e){t.default=e}),mCt=ru&&ru.__importStar||function(t){if(t&&t.__esModule)return t;var e={};if(t!=null)for(var r in t)r!=="default"&&Object.hasOwnProperty.call(t,r)&&gCt(e,t,r);return dCt(e,t),e},yCt=ru&&ru.__rest||function(t,e){var r={};for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.indexOf(o)<0&&(r[o]=t[o]);if(t!=null&&typeof Object.getOwnPropertySymbols=="function")for(var a=0,o=Object.getOwnPropertySymbols(t);a<o.length;a++)e.indexOf(o[a])<0&&Object.prototype.propertyIsEnumerable.call(t,o[a])&&(r[o[a]]=t[o[a]]);return r};Object.defineProperty(ru,"__esModule",{value:!0});var pwe=mCt(on()),gj=pwe.forwardRef((t,e)=>{var{children:r}=t,o=yCt(t,["children"]);let a=Object.assign(Object.assign({},o),{marginLeft:o.marginLeft||o.marginX||o.margin||0,marginRight:o.marginRight||o.marginX||o.margin||0,marginTop:o.marginTop||o.marginY||o.margin||0,marginBottom:o.marginBottom||o.marginY||o.margin||0,paddingLeft:o.paddingLeft||o.paddingX||o.padding||0,paddingRight:o.paddingRight||o.paddingX||o.padding||0,paddingTop:o.paddingTop||o.paddingY||o.padding||0,paddingBottom:o.paddingBottom||o.paddingY||o.padding||0});return pwe.default.createElement("ink-box",{ref:e,style:a},r)});gj.displayName="Box";gj.defaultProps={flexDirection:"row",flexGrow:0,flexShrink:1};ru.default=gj});var yj=_(vB=>{"use strict";var dj=vB&&vB.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(vB,"__esModule",{value:!0});var ECt=dj(on()),jC=dj(rQ()),hwe=dj(X6()),mj=({color:t,backgroundColor:e,dimColor:r,bold:o,italic:a,underline:n,strikethrough:u,inverse:A,wrap:p,children:h})=>{if(h==null)return null;let E=I=>(r&&(I=jC.default.dim(I)),t&&(I=hwe.default(I,t,"foreground")),e&&(I=hwe.default(I,e,"background")),o&&(I=jC.default.bold(I)),a&&(I=jC.default.italic(I)),n&&(I=jC.default.underline(I)),u&&(I=jC.default.strikethrough(I)),A&&(I=jC.default.inverse(I)),I);return ECt.default.createElement("ink-text",{style:{flexGrow:0,flexShrink:1,flexDirection:"row",textWrap:p},internal_transform:E},h)};mj.displayName="Text";mj.defaultProps={dimColor:!1,bold:!1,italic:!1,underline:!1,strikethrough:!1,wrap:"wrap"};vB.default=mj});var ywe=_(nu=>{"use strict";var CCt=nu&&nu.__createBinding||(Object.create?function(t,e,r,o){o===void 0&&(o=r),Object.defineProperty(t,o,{enumerable:!0,get:function(){return e[r]}})}:function(t,e,r,o){o===void 0&&(o=r),t[o]=e[r]}),wCt=nu&&nu.__setModuleDefault||(Object.create?function(t,e){Object.defineProperty(t,"default",{enumerable:!0,value:e})}:function(t,e){t.default=e}),ICt=nu&&nu.__importStar||function(t){if(t&&t.__esModule)return t;var e={};if(t!=null)for(var r in t)r!=="default"&&Object.hasOwnProperty.call(t,r)&&CCt(e,t,r);return wCt(e,t),e},DB=nu&&nu.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(nu,"__esModule",{value:!0});var gwe=ICt(ve("fs")),fs=DB(on()),dwe=DB(lwe()),BCt=DB(fwe()),Zf=DB(sQ()),hA=DB(yj()),mwe=new dwe.default({cwd:process.cwd(),internals:dwe.default.nodeInternals()}),vCt=({error:t})=>{let e=t.stack?t.stack.split(`
+`).slice(1):void 0,r=e?mwe.parseLine(e[0]):void 0,o,a=0;if(r?.file&&r?.line&&gwe.existsSync(r.file)){let n=gwe.readFileSync(r.file,"utf8");if(o=BCt.default(n,r.line),o)for(let{line:u}of o)a=Math.max(a,String(u).length)}return fs.default.createElement(Zf.default,{flexDirection:"column",padding:1},fs.default.createElement(Zf.default,null,fs.default.createElement(hA.default,{backgroundColor:"red",color:"white"}," ","ERROR"," "),fs.default.createElement(hA.default,null," ",t.message)),r&&fs.default.createElement(Zf.default,{marginTop:1},fs.default.createElement(hA.default,{dimColor:!0},r.file,":",r.line,":",r.column)),r&&o&&fs.default.createElement(Zf.default,{marginTop:1,flexDirection:"column"},o.map(({line:n,value:u})=>fs.default.createElement(Zf.default,{key:n},fs.default.createElement(Zf.default,{width:a+1},fs.default.createElement(hA.default,{dimColor:n!==r.line,backgroundColor:n===r.line?"red":void 0,color:n===r.line?"white":void 0},String(n).padStart(a," "),":")),fs.default.createElement(hA.default,{key:n,backgroundColor:n===r.line?"red":void 0,color:n===r.line?"white":void 0}," "+u)))),t.stack&&fs.default.createElement(Zf.default,{marginTop:1,flexDirection:"column"},t.stack.split(`
+`).slice(1).map(n=>{let u=mwe.parseLine(n);return u?fs.default.createElement(Zf.default,{key:n},fs.default.createElement(hA.default,{dimColor:!0},"- "),fs.default.createElement(hA.default,{dimColor:!0,bold:!0},u.function),fs.default.createElement(hA.default,{dimColor:!0,color:"gray"}," ","(",u.file,":",u.line,":",u.column,")")):fs.default.createElement(Zf.default,{key:n},fs.default.createElement(hA.default,{dimColor:!0},"- "),fs.default.createElement(hA.default,{dimColor:!0,bold:!0},n))})))};nu.default=vCt});var Cwe=_(iu=>{"use strict";var DCt=iu&&iu.__createBinding||(Object.create?function(t,e,r,o){o===void 0&&(o=r),Object.defineProperty(t,o,{enumerable:!0,get:function(){return e[r]}})}:function(t,e,r,o){o===void 0&&(o=r),t[o]=e[r]}),SCt=iu&&iu.__setModuleDefault||(Object.create?function(t,e){Object.defineProperty(t,"default",{enumerable:!0,value:e})}:function(t,e){t.default=e}),PCt=iu&&iu.__importStar||function(t){if(t&&t.__esModule)return t;var e={};if(t!=null)for(var r in t)r!=="default"&&Object.hasOwnProperty.call(t,r)&&DCt(e,t,r);return SCt(e,t),e},um=iu&&iu.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(iu,"__esModule",{value:!0});var cm=PCt(on()),Ewe=um(g6()),bCt=um(aj()),xCt=um(cj()),kCt=um(Aj()),QCt=um(pj()),FCt=um(iQ()),RCt=um(ywe()),TCt="	",NCt="\x1B[Z",LCt="\x1B",oQ=class extends cm.PureComponent{constructor(){super(...arguments),this.state={isFocusEnabled:!0,activeFocusId:void 0,focusables:[],error:void 0},this.rawModeEnabledCount=0,this.handleSetRawMode=e=>{let{stdin:r}=this.props;if(!this.isRawModeSupported())throw r===process.stdin?new Error(`Raw mode is not supported on the current process.stdin, which Ink uses as input stream by default.
+Read about how to prevent this error on https://github.com/vadimdemedes/ink/#israwmodesupported`):new Error(`Raw mode is not supported on the stdin provided to Ink.
+Read about how to prevent this error on https://github.com/vadimdemedes/ink/#israwmodesupported`);if(r.setEncoding("utf8"),e){this.rawModeEnabledCount===0&&(r.addListener("data",this.handleInput),r.resume(),r.setRawMode(!0)),this.rawModeEnabledCount++;return}--this.rawModeEnabledCount===0&&(r.setRawMode(!1),r.removeListener("data",this.handleInput),r.pause())},this.handleInput=e=>{e===""&&this.props.exitOnCtrlC&&this.handleExit(),e===LCt&&this.state.activeFocusId&&this.setState({activeFocusId:void 0}),this.state.isFocusEnabled&&this.state.focusables.length>0&&(e===TCt&&this.focusNext(),e===NCt&&this.focusPrevious())},this.handleExit=e=>{this.isRawModeSupported()&&this.handleSetRawMode(!1),this.props.onExit(e)},this.enableFocus=()=>{this.setState({isFocusEnabled:!0})},this.disableFocus=()=>{this.setState({isFocusEnabled:!1})},this.focusNext=()=>{this.setState(e=>{let r=e.focusables[0].id;return{activeFocusId:this.findNextFocusable(e)||r}})},this.focusPrevious=()=>{this.setState(e=>{let r=e.focusables[e.focusables.length-1].id;return{activeFocusId:this.findPreviousFocusable(e)||r}})},this.addFocusable=(e,{autoFocus:r})=>{this.setState(o=>{let a=o.activeFocusId;return!a&&r&&(a=e),{activeFocusId:a,focusables:[...o.focusables,{id:e,isActive:!0}]}})},this.removeFocusable=e=>{this.setState(r=>({activeFocusId:r.activeFocusId===e?void 0:r.activeFocusId,focusables:r.focusables.filter(o=>o.id!==e)}))},this.activateFocusable=e=>{this.setState(r=>({focusables:r.focusables.map(o=>o.id!==e?o:{id:e,isActive:!0})}))},this.deactivateFocusable=e=>{this.setState(r=>({activeFocusId:r.activeFocusId===e?void 0:r.activeFocusId,focusables:r.focusables.map(o=>o.id!==e?o:{id:e,isActive:!1})}))},this.findNextFocusable=e=>{let r=e.focusables.findIndex(o=>o.id===e.activeFocusId);for(let o=r+1;o<e.focusables.length;o++)if(e.focusables[o].isActive)return e.focusables[o].id},this.findPreviousFocusable=e=>{let r=e.focusables.findIndex(o=>o.id===e.activeFocusId);for(let o=r-1;o>=0;o--)if(e.focusables[o].isActive)return e.focusables[o].id}}static getDerivedStateFromError(e){return{error:e}}isRawModeSupported(){return this.props.stdin.isTTY}render(){return cm.default.createElement(bCt.default.Provider,{value:{exit:this.handleExit}},cm.default.createElement(xCt.default.Provider,{value:{stdin:this.props.stdin,setRawMode:this.handleSetRawMode,isRawModeSupported:this.isRawModeSupported(),internal_exitOnCtrlC:this.props.exitOnCtrlC}},cm.default.createElement(kCt.default.Provider,{value:{stdout:this.props.stdout,write:this.props.writeToStdout}},cm.default.createElement(QCt.default.Provider,{value:{stderr:this.props.stderr,write:this.props.writeToStderr}},cm.default.createElement(FCt.default.Provider,{value:{activeId:this.state.activeFocusId,add:this.addFocusable,remove:this.removeFocusable,activate:this.activateFocusable,deactivate:this.deactivateFocusable,enableFocus:this.enableFocus,disableFocus:this.disableFocus,focusNext:this.focusNext,focusPrevious:this.focusPrevious}},this.state.error?cm.default.createElement(RCt.default,{error:this.state.error}):this.props.children)))))}componentDidMount(){Ewe.default.hide(this.props.stdout)}componentWillUnmount(){Ewe.default.show(this.props.stdout),this.isRawModeSupported()&&this.handleSetRawMode(!1)}componentDidCatch(e){this.handleExit(e)}};iu.default=oQ;oQ.displayName="InternalApp"});var Bwe=_(su=>{"use strict";var OCt=su&&su.__createBinding||(Object.create?function(t,e,r,o){o===void 0&&(o=r),Object.defineProperty(t,o,{enumerable:!0,get:function(){return e[r]}})}:function(t,e,r,o){o===void 0&&(o=r),t[o]=e[r]}),MCt=su&&su.__setModuleDefault||(Object.create?function(t,e){Object.defineProperty(t,"default",{enumerable:!0,value:e})}:function(t,e){t.default=e}),UCt=su&&su.__importStar||function(t){if(t&&t.__esModule)return t;var e={};if(t!=null)for(var r in t)r!=="default"&&Object.hasOwnProperty.call(t,r)&&OCt(e,t,r);return MCt(e,t),e},ou=su&&su.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(su,"__esModule",{value:!0});var _Ct=ou(on()),wwe=lM(),HCt=ou(lEe()),jCt=ou(u6()),GCt=ou(hEe()),qCt=ou(dEe()),Ej=ou(cCe()),YCt=ou(KCe()),WCt=ou(h6()),KCt=ou(XCe()),VCt=UCt(q6()),JCt=ou(sj()),zCt=ou(Cwe()),GC=process.env.CI==="false"?!1:GCt.default,Iwe=()=>{},Cj=class{constructor(e){this.resolveExitPromise=()=>{},this.rejectExitPromise=()=>{},this.unsubscribeExit=()=>{},this.onRender=()=>{if(this.isUnmounted)return;let{output:r,outputHeight:o,staticOutput:a}=YCt.default(this.rootNode,this.options.stdout.columns||80),n=a&&a!==`
+`;if(this.options.debug){n&&(this.fullStaticOutput+=a),this.options.stdout.write(this.fullStaticOutput+r);return}if(GC){n&&this.options.stdout.write(a),this.lastOutput=r;return}if(n&&(this.fullStaticOutput+=a),o>=this.options.stdout.rows){this.options.stdout.write(jCt.default.clearTerminal+this.fullStaticOutput+r),this.lastOutput=r;return}n&&(this.log.clear(),this.options.stdout.write(a),this.log(r)),!n&&r!==this.lastOutput&&this.throttledLog(r),this.lastOutput=r},qCt.default(this),this.options=e,this.rootNode=VCt.createNode("ink-root"),this.rootNode.onRender=e.debug?this.onRender:wwe(this.onRender,32,{leading:!0,trailing:!0}),this.rootNode.onImmediateRender=this.onRender,this.log=HCt.default.create(e.stdout),this.throttledLog=e.debug?this.log:wwe(this.log,void 0,{leading:!0,trailing:!0}),this.isUnmounted=!1,this.lastOutput="",this.fullStaticOutput="",this.container=Ej.default.createContainer(this.rootNode,!1,!1),this.unsubscribeExit=WCt.default(this.unmount,{alwaysLast:!1}),e.patchConsole&&this.patchConsole(),GC||(e.stdout.on("resize",this.onRender),this.unsubscribeResize=()=>{e.stdout.off("resize",this.onRender)})}render(e){let r=_Ct.default.createElement(zCt.default,{stdin:this.options.stdin,stdout:this.options.stdout,stderr:this.options.stderr,writeToStdout:this.writeToStdout,writeToStderr:this.writeToStderr,exitOnCtrlC:this.options.exitOnCtrlC,onExit:this.unmount},e);Ej.default.updateContainer(r,this.container,null,Iwe)}writeToStdout(e){if(!this.isUnmounted){if(this.options.debug){this.options.stdout.write(e+this.fullStaticOutput+this.lastOutput);return}if(GC){this.options.stdout.write(e);return}this.log.clear(),this.options.stdout.write(e),this.log(this.lastOutput)}}writeToStderr(e){if(!this.isUnmounted){if(this.options.debug){this.options.stderr.write(e),this.options.stdout.write(this.fullStaticOutput+this.lastOutput);return}if(GC){this.options.stderr.write(e);return}this.log.clear(),this.options.stderr.write(e),this.log(this.lastOutput)}}unmount(e){this.isUnmounted||(this.onRender(),this.unsubscribeExit(),typeof this.restoreConsole=="function"&&this.restoreConsole(),typeof this.unsubscribeResize=="function"&&this.unsubscribeResize(),GC?this.options.stdout.write(this.lastOutput+`
+`):this.options.debug||this.log.done(),this.isUnmounted=!0,Ej.default.updateContainer(null,this.container,null,Iwe),JCt.default.delete(this.options.stdout),e instanceof Error?this.rejectExitPromise(e):this.resolveExitPromise())}waitUntilExit(){return this.exitPromise||(this.exitPromise=new Promise((e,r)=>{this.resolveExitPromise=e,this.rejectExitPromise=r})),this.exitPromise}clear(){!GC&&!this.options.debug&&this.log.clear()}patchConsole(){this.options.debug||(this.restoreConsole=KCt.default((e,r)=>{e==="stdout"&&this.writeToStdout(r),e==="stderr"&&(r.startsWith("The above error occurred")||this.writeToStderr(r))}))}};su.default=Cj});var Dwe=_(SB=>{"use strict";var vwe=SB&&SB.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(SB,"__esModule",{value:!0});var XCt=vwe(Bwe()),aQ=vwe(sj()),ZCt=ve("stream"),$Ct=(t,e)=>{let r=Object.assign({stdout:process.stdout,stdin:process.stdin,stderr:process.stderr,debug:!1,exitOnCtrlC:!0,patchConsole:!0},ewt(e)),o=twt(r.stdout,()=>new XCt.default(r));return o.render(t),{rerender:o.render,unmount:()=>o.unmount(),waitUntilExit:o.waitUntilExit,cleanup:()=>aQ.default.delete(r.stdout),clear:o.clear}};SB.default=$Ct;var ewt=(t={})=>t instanceof ZCt.Stream?{stdout:t,stdin:process.stdin}:t,twt=(t,e)=>{let r;return aQ.default.has(t)?r=aQ.default.get(t):(r=e(),aQ.default.set(t,r)),r}});var Pwe=_($f=>{"use strict";var rwt=$f&&$f.__createBinding||(Object.create?function(t,e,r,o){o===void 0&&(o=r),Object.defineProperty(t,o,{enumerable:!0,get:function(){return e[r]}})}:function(t,e,r,o){o===void 0&&(o=r),t[o]=e[r]}),nwt=$f&&$f.__setModuleDefault||(Object.create?function(t,e){Object.defineProperty(t,"default",{enumerable:!0,value:e})}:function(t,e){t.default=e}),iwt=$f&&$f.__importStar||function(t){if(t&&t.__esModule)return t;var e={};if(t!=null)for(var r in t)r!=="default"&&Object.hasOwnProperty.call(t,r)&&rwt(e,t,r);return nwt(e,t),e};Object.defineProperty($f,"__esModule",{value:!0});var PB=iwt(on()),Swe=t=>{let{items:e,children:r,style:o}=t,[a,n]=PB.useState(0),u=PB.useMemo(()=>e.slice(a),[e,a]);PB.useLayoutEffect(()=>{n(e.length)},[e.length]);let A=u.map((h,E)=>r(h,a+E)),p=PB.useMemo(()=>Object.assign({position:"absolute",flexDirection:"column"},o),[o]);return PB.default.createElement("ink-box",{internal_static:!0,style:p},A)};Swe.displayName="Static";$f.default=Swe});var xwe=_(bB=>{"use strict";var swt=bB&&bB.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(bB,"__esModule",{value:!0});var owt=swt(on()),bwe=({children:t,transform:e})=>t==null?null:owt.default.createElement("ink-text",{style:{flexGrow:0,flexShrink:1,flexDirection:"row"},internal_transform:e},t);bwe.displayName="Transform";bB.default=bwe});var Qwe=_(xB=>{"use strict";var awt=xB&&xB.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(xB,"__esModule",{value:!0});var lwt=awt(on()),kwe=({count:t=1})=>lwt.default.createElement("ink-text",null,`
+`.repeat(t));kwe.displayName="Newline";xB.default=kwe});var Twe=_(kB=>{"use strict";var Fwe=kB&&kB.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(kB,"__esModule",{value:!0});var cwt=Fwe(on()),uwt=Fwe(sQ()),Rwe=()=>cwt.default.createElement(uwt.default,{flexGrow:1});Rwe.displayName="Spacer";kB.default=Rwe});var lQ=_(QB=>{"use strict";var Awt=QB&&QB.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(QB,"__esModule",{value:!0});var fwt=on(),pwt=Awt(cj()),hwt=()=>fwt.useContext(pwt.default);QB.default=hwt});var Lwe=_(FB=>{"use strict";var gwt=FB&&FB.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(FB,"__esModule",{value:!0});var Nwe=on(),dwt=gwt(lQ()),mwt=(t,e={})=>{let{stdin:r,setRawMode:o,internal_exitOnCtrlC:a}=dwt.default();Nwe.useEffect(()=>{if(e.isActive!==!1)return o(!0),()=>{o(!1)}},[e.isActive,o]),Nwe.useEffect(()=>{if(e.isActive===!1)return;let n=u=>{let A=String(u),p={upArrow:A==="\x1B[A",downArrow:A==="\x1B[B",leftArrow:A==="\x1B[D",rightArrow:A==="\x1B[C",pageDown:A==="\x1B[6~",pageUp:A==="\x1B[5~",return:A==="\r",escape:A==="\x1B",ctrl:!1,shift:!1,tab:A==="	"||A==="\x1B[Z",backspace:A==="\b",delete:A==="\x7F"||A==="\x1B[3~",meta:!1};A<=""&&!p.return&&(A=String.fromCharCode(A.charCodeAt(0)+"a".charCodeAt(0)-1),p.ctrl=!0),A.startsWith("\x1B")&&(A=A.slice(1),p.meta=!0);let h=A>="A"&&A<="Z",E=A>="\u0410"&&A<="\u042F";A.length===1&&(h||E)&&(p.shift=!0),p.tab&&A==="[Z"&&(p.shift=!0),(p.tab||p.backspace||p.delete)&&(A=""),(!(A==="c"&&p.ctrl)||!a)&&t(A,p)};return r?.on("data",n),()=>{r?.off("data",n)}},[e.isActive,r,a,t])};FB.default=mwt});var Owe=_(RB=>{"use strict";var ywt=RB&&RB.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(RB,"__esModule",{value:!0});var Ewt=on(),Cwt=ywt(aj()),wwt=()=>Ewt.useContext(Cwt.default);RB.default=wwt});var Mwe=_(TB=>{"use strict";var Iwt=TB&&TB.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(TB,"__esModule",{value:!0});var Bwt=on(),vwt=Iwt(Aj()),Dwt=()=>Bwt.useContext(vwt.default);TB.default=Dwt});var Uwe=_(NB=>{"use strict";var Swt=NB&&NB.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(NB,"__esModule",{value:!0});var Pwt=on(),bwt=Swt(pj()),xwt=()=>Pwt.useContext(bwt.default);NB.default=xwt});var Hwe=_(OB=>{"use strict";var _we=OB&&OB.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(OB,"__esModule",{value:!0});var LB=on(),kwt=_we(iQ()),Qwt=_we(lQ()),Fwt=({isActive:t=!0,autoFocus:e=!1}={})=>{let{isRawModeSupported:r,setRawMode:o}=Qwt.default(),{activeId:a,add:n,remove:u,activate:A,deactivate:p}=LB.useContext(kwt.default),h=LB.useMemo(()=>Math.random().toString().slice(2,7),[]);return LB.useEffect(()=>(n(h,{autoFocus:e}),()=>{u(h)}),[h,e]),LB.useEffect(()=>{t?A(h):p(h)},[t,h]),LB.useEffect(()=>{if(!(!r||!t))return o(!0),()=>{o(!1)}},[t]),{isFocused:Boolean(h)&&a===h}};OB.default=Fwt});var jwe=_(MB=>{"use strict";var Rwt=MB&&MB.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(MB,"__esModule",{value:!0});var Twt=on(),Nwt=Rwt(iQ()),Lwt=()=>{let t=Twt.useContext(Nwt.default);return{enableFocus:t.enableFocus,disableFocus:t.disableFocus,focusNext:t.focusNext,focusPrevious:t.focusPrevious}};MB.default=Lwt});var Gwe=_(wj=>{"use strict";Object.defineProperty(wj,"__esModule",{value:!0});wj.default=t=>{var e,r,o,a;return{width:(r=(e=t.yogaNode)===null||e===void 0?void 0:e.getComputedWidth())!==null&&r!==void 0?r:0,height:(a=(o=t.yogaNode)===null||o===void 0?void 0:o.getComputedHeight())!==null&&a!==void 0?a:0}}});var ic=_(ro=>{"use strict";Object.defineProperty(ro,"__esModule",{value:!0});var Owt=Dwe();Object.defineProperty(ro,"render",{enumerable:!0,get:function(){return Owt.default}});var Mwt=sQ();Object.defineProperty(ro,"Box",{enumerable:!0,get:function(){return Mwt.default}});var Uwt=yj();Object.defineProperty(ro,"Text",{enumerable:!0,get:function(){return Uwt.default}});var _wt=Pwe();Object.defineProperty(ro,"Static",{enumerable:!0,get:function(){return _wt.default}});var Hwt=xwe();Object.defineProperty(ro,"Transform",{enumerable:!0,get:function(){return Hwt.default}});var jwt=Qwe();Object.defineProperty(ro,"Newline",{enumerable:!0,get:function(){return jwt.default}});var Gwt=Twe();Object.defineProperty(ro,"Spacer",{enumerable:!0,get:function(){return Gwt.default}});var qwt=Lwe();Object.defineProperty(ro,"useInput",{enumerable:!0,get:function(){return qwt.default}});var Ywt=Owe();Object.defineProperty(ro,"useApp",{enumerable:!0,get:function(){return Ywt.default}});var Wwt=lQ();Object.defineProperty(ro,"useStdin",{enumerable:!0,get:function(){return Wwt.default}});var Kwt=Mwe();Object.defineProperty(ro,"useStdout",{enumerable:!0,get:function(){return Kwt.default}});var Vwt=Uwe();Object.defineProperty(ro,"useStderr",{enumerable:!0,get:function(){return Vwt.default}});var Jwt=Hwe();Object.defineProperty(ro,"useFocus",{enumerable:!0,get:function(){return Jwt.default}});var zwt=jwe();Object.defineProperty(ro,"useFocusManager",{enumerable:!0,get:function(){return zwt.default}});var Xwt=Gwe();Object.defineProperty(ro,"measureElement",{enumerable:!0,get:function(){return Xwt.default}})});var Bj={};Vt(Bj,{Gem:()=>Ij});var qwe,Am,Ij,cQ=Et(()=>{qwe=$e(ic()),Am=$e(on()),Ij=(0,Am.memo)(({active:t})=>{let e=(0,Am.useMemo)(()=>t?"\u25C9":"\u25EF",[t]),r=(0,Am.useMemo)(()=>t?"green":"yellow",[t]);return Am.default.createElement(qwe.Text,{color:r},e)})});var Wwe={};Vt(Wwe,{useKeypress:()=>fm});function fm({active:t},e,r){let{stdin:o}=(0,Ywe.useStdin)(),a=(0,uQ.useCallback)((n,u)=>e(n,u),r);(0,uQ.useEffect)(()=>{if(!(!t||!o))return o.on("keypress",a),()=>{o.off("keypress",a)}},[t,a,o])}var Ywe,uQ,UB=Et(()=>{Ywe=$e(ic()),uQ=$e(on())});var Vwe={};Vt(Vwe,{FocusRequest:()=>Kwe,useFocusRequest:()=>vj});var Kwe,vj,Dj=Et(()=>{UB();Kwe=(r=>(r.BEFORE="before",r.AFTER="after",r))(Kwe||{}),vj=function({active:t},e,r){fm({active:t},(o,a)=>{a.name==="tab"&&(a.shift?e("before"):e("after"))},r)}});var Jwe={};Vt(Jwe,{useListInput:()=>_B});var _B,AQ=Et(()=>{UB();_B=function(t,e,{active:r,minus:o,plus:a,set:n,loop:u=!0}){fm({active:r},(A,p)=>{let h=e.indexOf(t);switch(p.name){case o:{let E=h-1;if(u){n(e[(e.length+E)%e.length]);return}if(E<0)return;n(e[E])}break;case a:{let E=h+1;if(u){n(e[E%e.length]);return}if(E>=e.length)return;n(e[E])}break}},[e,t,a,n,u])}});var fQ={};Vt(fQ,{ScrollableItems:()=>Zwt});var C0,La,Zwt,pQ=Et(()=>{C0=$e(ic()),La=$e(on());Dj();AQ();Zwt=({active:t=!0,children:e=[],radius:r=10,size:o=1,loop:a=!0,onFocusRequest:n,willReachEnd:u})=>{let A=L=>{if(L.key===null)throw new Error("Expected all children to have a key");return L.key},p=La.default.Children.map(e,L=>A(L)),h=p[0],[E,I]=(0,La.useState)(h),v=p.indexOf(E);(0,La.useEffect)(()=>{p.includes(E)||I(h)},[e]),(0,La.useEffect)(()=>{u&&v>=p.length-2&&u()},[v]),vj({active:t&&!!n},L=>{n?.(L)},[n]),_B(E,p,{active:t,minus:"up",plus:"down",set:I,loop:a});let x=v-r,C=v+r;C>p.length&&(x-=C-p.length,C=p.length),x<0&&(C+=-x,x=0),C>=p.length&&(C=p.length-1);let R=[];for(let L=x;L<=C;++L){let U=p[L],J=t&&U===E;R.push(La.default.createElement(C0.Box,{key:U,height:o},La.default.createElement(C0.Box,{marginLeft:1,marginRight:1},La.default.createElement(C0.Text,null,J?La.default.createElement(C0.Text,{color:"cyan",bold:!0},">"):" ")),La.default.createElement(C0.Box,null,La.default.cloneElement(e[L],{active:J}))))}return La.default.createElement(C0.Box,{flexDirection:"column",width:"100%"},R)}});var zwe,ep,Xwe,Sj,Zwe,Pj=Et(()=>{zwe=$e(ic()),ep=$e(on()),Xwe=ve("readline"),Sj=ep.default.createContext(null),Zwe=({children:t})=>{let{stdin:e,setRawMode:r}=(0,zwe.useStdin)();(0,ep.useEffect)(()=>{r&&r(!0),e&&(0,Xwe.emitKeypressEvents)(e)},[e,r]);let[o,a]=(0,ep.useState)(new Map),n=(0,ep.useMemo)(()=>({getAll:()=>o,get:u=>o.get(u),set:(u,A)=>a(new Map([...o,[u,A]]))}),[o,a]);return ep.default.createElement(Sj.Provider,{value:n,children:t})}});var bj={};Vt(bj,{useMinistore:()=>$wt});function $wt(t,e){let r=(0,hQ.useContext)(Sj);if(r===null)throw new Error("Expected this hook to run with a ministore context attached");if(typeof t>"u")return r.getAll();let o=(0,hQ.useCallback)(n=>{r.set(t,n)},[t,r.set]),a=r.get(t);return typeof a>"u"&&(a=e),[a,o]}var hQ,xj=Et(()=>{hQ=$e(on());Pj()});var dQ={};Vt(dQ,{renderForm:()=>eIt});async function eIt(t,e,{stdin:r,stdout:o,stderr:a}){let n,u=p=>{let{exit:h}=(0,gQ.useApp)();fm({active:!0},(E,I)=>{I.name==="return"&&(n=p,h())},[h,p])},{waitUntilExit:A}=(0,gQ.render)(kj.default.createElement(Zwe,null,kj.default.createElement(t,{...e,useSubmit:u})),{stdin:r,stdout:o,stderr:a});return await A(),n}var gQ,kj,mQ=Et(()=>{gQ=$e(ic()),kj=$e(on());Pj();UB()});var rIe=_(HB=>{"use strict";Object.defineProperty(HB,"__esModule",{value:!0});HB.UncontrolledTextInput=void 0;var eIe=on(),Qj=on(),$we=ic(),pm=rQ(),tIe=({value:t,placeholder:e="",focus:r=!0,mask:o,highlightPastedText:a=!1,showCursor:n=!0,onChange:u,onSubmit:A})=>{let[{cursorOffset:p,cursorWidth:h},E]=Qj.useState({cursorOffset:(t||"").length,cursorWidth:0});Qj.useEffect(()=>{E(R=>{if(!r||!n)return R;let L=t||"";return R.cursorOffset>L.length-1?{cursorOffset:L.length,cursorWidth:0}:R})},[t,r,n]);let I=a?h:0,v=o?o.repeat(t.length):t,x=v,C=e?pm.grey(e):void 0;if(n&&r){C=e.length>0?pm.inverse(e[0])+pm.grey(e.slice(1)):pm.inverse(" "),x=v.length>0?"":pm.inverse(" ");let R=0;for(let L of v)R>=p-I&&R<=p?x+=pm.inverse(L):x+=L,R++;v.length>0&&p===v.length&&(x+=pm.inverse(" "))}return $we.useInput((R,L)=>{if(L.upArrow||L.downArrow||L.ctrl&&R==="c"||L.tab||L.shift&&L.tab)return;if(L.return){A&&A(t);return}let U=p,J=t,te=0;L.leftArrow?n&&U--:L.rightArrow?n&&U++:L.backspace||L.delete?p>0&&(J=t.slice(0,p-1)+t.slice(p,t.length),U--):(J=t.slice(0,p)+R+t.slice(p,t.length),U+=R.length,R.length>1&&(te=R.length)),p<0&&(U=0),p>t.length&&(U=t.length),E({cursorOffset:U,cursorWidth:te}),J!==t&&u(J)},{isActive:r}),eIe.createElement($we.Text,null,e?v.length>0?x:C:x)};HB.default=tIe;HB.UncontrolledTextInput=t=>{let[e,r]=Qj.useState("");return eIe.createElement(tIe,Object.assign({},t,{value:e,onChange:r}))}});var sIe={};Vt(sIe,{Pad:()=>Fj});var nIe,iIe,Fj,Rj=Et(()=>{nIe=$e(ic()),iIe=$e(on()),Fj=({length:t,active:e})=>{if(t===0)return null;let r=t>1?` ${"-".repeat(t-1)}`:" ";return iIe.default.createElement(nIe.Text,{dimColor:!e},r)}});var oIe={};Vt(oIe,{ItemOptions:()=>tIt});var GB,I0,tIt,aIe=Et(()=>{GB=$e(ic()),I0=$e(on());AQ();cQ();Rj();tIt=function({active:t,skewer:e,options:r,value:o,onChange:a,sizes:n=[]}){let u=r.filter(({label:p})=>!!p).map(({value:p})=>p),A=r.findIndex(p=>p.value===o&&p.label!="");return _B(o,u,{active:t,minus:"left",plus:"right",set:a}),I0.default.createElement(I0.default.Fragment,null,r.map(({label:p},h)=>{let E=h===A,I=n[h]-1||0,v=p.replace(/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,""),x=Math.max(0,I-v.length-2);return p?I0.default.createElement(GB.Box,{key:p,width:I,marginLeft:1},I0.default.createElement(GB.Text,{wrap:"truncate"},I0.default.createElement(Ij,{active:E})," ",p),e?I0.default.createElement(Fj,{active:t,length:x}):null):I0.default.createElement(GB.Box,{key:`spacer-${h}`,width:I,marginLeft:1})}))}});var BIe=_((zJt,IIe)=>{var jj;IIe.exports=()=>(typeof jj>"u"&&(jj=ve("zlib").brotliDecompressSync(Buffer.from("W2lyVjG25TS5HRg3/v82z3FCUZE5ZdUOx67hxYumSrGrXlC27VoE6c3qLuji/+ZrqGpaUhljG+A+AbqlVVVJofCOQBdGp0nGgHlKkBcc+xq86CbKYCGrD9xbP07y9URAeL3JfXv+0PdHwTZJtSO3kaRyqF7t0zjnQSpMUtRc/G8uNXkL4OT26hyKbIIIvTZCkxpyjO/wEJ/+Y87snFxOLxq3kQz/JwV2XVjEkxUDjneUsIdkLfxbU8MWQS/pP1bW3Eoj3NaMbnhp8BZxOj+japGQXO5bTfPvz+tQCsLXpKWE7BWSyavV16ZowXC3rhob0tYT/1vOTmdSY8Jk5crk8VfE25UfaLbUQm01bDazfz4vX4drlSPXtLZMNBjZIxmSrt1rLf3s92r//fmaPj2rjteV03utpVrYmDxtU4PbuyC0EJjgbQjLsThXqsPX1jdlm1PbZLi0b96006wChAS3mfsCjiAU5v+cvsqMQPhuFlgV8v/S7F1KN7Tqp/lfv+sM5RUOGTnJKcgqTvaLygM47La2euYEXBX2an7rr6l8CVgwsYypvVARZ79H2rfBg5PAX1qLGtPnow9JYlrznD0WXCMkA5KG/AzWxdoGI7YnIXjK13k89GfAJeY4u1rHIhHwQgyYGxFkISq4xYWXwMNXvdNfLvL54We2p+/MaG4jgVogG3lnC7sHqwDn4URJLGqo9Xzc3QXbyq78rOrpgcaAPSgokX+yvGmIkmAZOSOtH/1o/tPnx+7unajJM5+nqqubYgAtsFHmb8JcC4I63jAJGj+s3zwePJiitfb4ZjLJBlgwhID0hr/ZEBE/bZfo++l0XBNuxyurBHb1N33pnh0sOL4AhGimlcWndUjlAMTuQZl2LhVBiM53b4pabFk+nzUQtsPTTgJFXTyDs0gOvzlaTJATcnAY/3/Nz+V2/mNKXIInXkxBO8iumMMvvinNCJZuWu9H7yowgwSjGNhujoYwAT/A/v/7flqOPFA0aBlnMgWRPGHYMsbnWnn9c86+m/jvG6EcmlUFoAWC7DVEW6DNjL/nnPt+fVeYqgKbAtBjSI7jaKyJnE0DKVaQKYtAamTtaW/fz/5Akkj7gyR6lGC7u25tmBlC1igzJ3W9eElZYZTp+9bMOvD/2/v5SScBbsZzRHhUdc7dazq8niBp0g9OERnG2nufqtt63a2R+n/nCNAsbhwBRK8lhwnZyAaU+e/90uxzz30vkUgQFAtksSVQ1Qt7L7b+qv4xdgJgLVsva311RHuzG4547zn3Rr1770sJ72VilPky8YV8mQghE+R8ZiYwQQBkvgTASoCsGrCq1ANSUgdLXR1DLf2DWnvZiyArQiyWIkSy6i9V6lkkzbpZE1H9l3WzZtvC/8tutTkx1jfsMfwxxzbGG9P8ljmGOf7/79er3fceuH+G0zUNTorKXAoAKNW8M68QAluVuPLy82YKAMZWaHa6y5MRlbKrKvAfzaXdl+T+7NFchS8bF2uPQZVI2Goiq1vHRLUbDw7P3hIKZDFADMSj/uNgWnvwVd8EFFJACXimGnxfN25ngq/41tbu20WcWHiiiQSaRR78/3cp751HX2nPKG5JqRqgBEv10AQnGKCiEoUgLn5cwRCEN/3t3gYSTCJNtS9JA0uwVFqmKyyBwgVqQiq6/bL+POj5/yf3Fvc1tG93oEIWsuyoEsSuolV71ZhZpeOP4dlW33+O6K4K/rvbv1PqKFJhUQJi5FgTxjiDYCBO1PZFD+C2//+Hl/Aq6M9TQi+IjTEYDBBGjkglStiQFqHVU//3ArYXRJPbFeFj8wcMmjZDK15IBFlOIGrEdlqRmZ28/xQuDHGCChMUIoIKQRRQocIQQ5zDF6ZwMYUCWwzkef3m/v/5evteaN3/I46I2CIiNKGJiIgITUTRRNRAxBLFTIkSNVAils7/f1TeBaT/Cw44ICAgwCDAUg2sysCqDAwsdYHBggULFoyqAfHVPf1jb96nZW13wIALBlxwQUBAQLQKCDCItAbRKiAgKwW4koFXMjggbTv02+oPozAu2gGDAURKe8POrXzx8zsDrA7DxRBtVl1nApkNEO48yYC30LQRRLuRIN4QzKJAJjo7c/eiLSUjZYfyj0FZAP+skffTx8I7lkyIu7DoVfD3YvPQ9jZsxyt4saLzQmuCuLAdVAcSJN/+3Uz4WF7etQpZKboPdryC3/a3mn1A9BgrKR676q3OttKrwtawtnz63iIpa6Id3UBV+sdXrMWfZ/AditY84rTjVUAetNw/d3Y5XcF4dIwL2HHRApq87xy/a1M7ZctUvgz0Dp+elzEkGIzvNEb6AxbJBp/wKxGN+ZIG1xzJV7WIJFeVeySGVaVCV2KwfhnNe/qcOKe57td8Wl9keat+qcb5ZeC1/lRD9TsO213sX7OGtMqSdkXAA2T9QNJmvRthWfSZjf0bJ/AquFR6i4svcJ+ltH3XMNHVE/Hfb4m9t3IUH/Y7UK3q//pruN3Z9xYobwNh4VOa2cKT9iEGEivRS9RnDdQrCiqV3Ppv9TOZrvfCH0f2BwPj3X/YtRGkB0kCkeh9/kL9y5fqfULnGD506V/NZJ3Zm52H+2wgj+NQ6v8scYnlpA5vxsmuYuQEveUQh6/FsxRJLGeNfJY4KywNrcEsCXsyvk2YLVHDELUHsyRngarJ+JRbozjVL99j5aTtSV4OJPDvcfTJ3yk4/Hs5MubvTDy+pbAKjLchoq03W3Tf24ic9X2vBZH0TJ1V99+tt4Hp6KOsDgcVvjzelC8PrNlvo3hW9aFxpo34h8dSXshLbhcbBtl+P/dXs+43rBxPnaBM1/GI3Ac4TxQa+Y2AjZgt6yDMCb//0RkaibPGCvwgES+QGgqGIsD2gGuXMmBoZfLNW0GIQc0g5/sVpFpj6jrH1vh3jjNyhQxFwK2dKkOU3vWKTiDt4W9eDSQQslj0627AbD5/0uAuaRATW3y7+hkw1Wc9/0szFAFUXphGsgFma/ibJzkq0AyiFSuG01dCsRHXRe3a0Ddj7xtGJtHxF77UwXUru2u52G+mzqUEiSY/+ENXcpjeLLdPEwsk9j94svWjTydEefKfT6we8vAb2hN4IcuMIWfroYkLZ4p49D/VKPCv1BIB7JVDaweFERb1di2p69CVa+v96wlm8IA3L63yXBCpvlC5PhkZFvn/v9HXcnm/vOhzDYxlRAZYdnp8ktTolfuVCoi3G39S4ImyJxnsTSm7WUQg1UaH9QucpH+1/oreDn3mGjkYK6jtD7r6aeO5MhB90YzmOBSjv1kGvRBmTrpt3M7Mu7Ywjyy8wvbNCb7FbKMMYZmddX+P4PCDEunwxKaxUXG3zOHFdXb2/p7E47jHnnt2frXX6KPRA3EqwAdhZz01hghEMOcvXqZ8lgNX7peTnP+ambjy+ZXPX9z8svNEx08CfAqRFMTGwHUETcLwcKuihXts6mk9DUwqLI7jJxkgD9FtqKCPBGTfViWxHgnKDbaqPB1IYC6tyr6Y6LJikyU1Po+gnMisexHzFtoC1+AVfTYta1E3bbHFQcOEBcZVzp+ooPtOUw4JcirmMBDC3b8RyF1NtsfpxEF12xBxLfhIZv3ms9mQGlPp4kTDxwe2kfwPWFlr0J8O1AhH2s4LnBdPRfmYac1OprcRjLgD8DMlqa7AwGWUU+iPY/ErD1LOUdCeMGmPqND8q6dssxBONYln1/KpM4WaEvZlRXiox9JJasPXXNp5Bt8Pw4k0Z3Yi99gnlnssE5XvCvNkOTFUTmSNjfSAyQn0+wp9i/faidNJKRud1Jy0x1aKFhLpKRQx8Hg7Fo5s7ADHWtOjq7MIjjRHFoXD4wl3krFbWvlnc7rfoyYCNIPfY7ACNIOopwaGKEkztqwLJ0Ym643V9+0kxtO9MKEXBwmcaEdHrw6Ag3bAczdgHu0F++6cmHyKdmLW1xsB+Xc7mjfFF+c2/DPYDjfDc73VHqeH6sbW68P0beFX9MYs8LvmDvypjWLaYp3M213DzRMpcaJfwl+sX0JepLCTIgGcbCbibplytqU8o9ZocbdSElPZ6+ltwkXTS9ccfobsTqzc2oS9eZ+sllAvaSJw/cFrRX7mf8ky7dbVVV3KjZ3NFtKU8abrgcPtZlmu36+R5ENK2Abq9gPYrD5PP8DmYmB28/zwZttEvR3bm3I2UDfls5y+vp6hOYFkGocCSZOu8YGEhxt9fpROSW7P1j92UlungyFh8L6ukP+thvZbvBgZ9GpJjaY3gqNbdP5WUVmkqm4kzSj7RL6LxtX+ibLcl/Lv+dxukeGmtejLk9jcV2KmKne3baD0le4MF7i5htSpUVayiIQfE5bVJkoYbaZh/bSJAycOIXuX6AcJ6hz7akRYUhQHis2tIdWHGr49U38hzCKdT4xi3Qha5Vd48h+EZzjmmzVZ5dWkdaZDBUM7iYUWLC4Zfj2hINNB5pA2Irk9Ko96bLDHM+1HCbptLjgDlN4buSj53qi7wQJpaloce3Xh9xIbLkzLUglFWrIV9htk6mMMp312WiF5CWxf9PqEFhRz1BWfyKn2PpoQOleRvToQklptXHrS8CtFTrDk1KRKog6zVFJFjeiNBzWukv7o7+PAsz0lGft7RuD1hy+ZybScPL6bHBzPzVd7Rn1O9+wN/R2aqx9XatKsnhImLO8NlX1oZdiK42BEwfSxRvaxGKDm2TX64Xf+3dkUerehQUioP83F4MvSMEmpBDGqcCgculKBYWDDg4WQiMwyP8dlGERoYgSpNDODvFN0GXoWa2/K76DJA31yClhSOJS6Wb14TBisqArycJet0pxm7j0DvRZTnslSGkCuE/hc7fGZxLDygVtYEIQbWxxE2jQCU21S2kvsCiZK4nmmfshHU6QPTQmt3SwAkmFEuHg8g9MsjFATbHMjiffrCVMN7Yv2m6SxqH++8fRngcytMNq4DIQnC1pcyODo8sWMjvbqZtc2DXsd2+NWfvqpuyiLFkxFyGILSG5kRcoT1qNQ9KfL4lnqyv7h4yn4+147TFRM57tTB4XykBR41Fm5LoXdNPyryqzd+a4GWJ8oypA77JW/ztil+S6eW0+Ij0VFqmmslOfiOrk25JC0bbIYQ4gWnJawxnYYMm9YGKJtLs+QDo05tP8Pv2iB3Vq4Gq28qbuj1lQnE0ozLRWNzP60Edq3fGtwFmCIcrkieV9U5APpA/l9li+lYUugSbaDbXnhcGeqy0o3fWPrU1wxX1pBxVit4RPXsa1ReiMqMRwOLCRXuzeXMJ+DP5Kcn7z15HBh8sRK9UhndmzGm5sKdasXKKC1j5YDJp/HfKHEXi6KkJifz5GOhJiew2rW6ojstlOdTGpNu8SOriY5VKnAK5UwkNwuUJF1yfjwC1RrFZZ4x0aIoAhOwKrZStGontZ6UotVzt9wdpZbtrVoKIMKhsgyCKnCEcxcPTPPY2IZuC3XMPgucLKetTrDssq0WwsJTQez1h32Y1m5KBbmxmZSIM32fhPzs20zydngWirE3uNFowsyucdX5DzZgW3g3r//XYDgxiZDex6RnmWo04ePjaqrWww5tfqIu4sf0G55e0Qnq4YykaeYkgk21RPnhzMcJ5NZi7sxhNIVS1HJjJazbHMvRgHKUhNUwRzLZctLeM4q1KqzVQ82URL0WCN0Sdn5bJE6GEmBI7OxuTkq1UKR8JIL01ZPXBYmLAu3h6V7vtDURWfNMn/XZHqTx3JavXLpbzgidXI+cucA6aMhwR7XRsVmhRitulmGoJPvVCxstoENfDqpEAvyHmtPTchU+88Jqf6aT0DSS5SCsjZKbxVda1MfIG+ImAyyCoAVjxlUqTvk20Kt02iYjvZmcc5UZsPE7Y0AeWsN4QCGg8Oto88sKLk6kUxAWOG5xcCZ2R67sKlDT+5JWWgp7qguTWmCB3sgDQnxEOimtWrqRi5YKR8PeaR1KgqZj3lkqJOMz5OPxVLTe6NAQ10tRxv7iMmiz3oUJZNlZxtQ1J8r8iWr6qZhIzzzoXzblZkMBPPlbuKsEA02IWBnMDMlStFT3Xn9hlOcvky7Ix7bVXYVRv3IogiM34RyNeB9TnLoDKxTsfLOpCFSPtzG8xHNL2Io+aPscjjcPPhhu0HJe6DTH3BulOSukiyTjAgVN2zdzLjvzvEnqzgvQPljK3wmOU/5nVtT4idPRttle+o8HTBHsrx3ZzbdNVEY6eY3/GRIRsX/ZDwy/toCeh7miWr5mRx3ap3UW1bsMJ/VXjmdMqcSxzwB3F24S43RFSS+KMOx2Y9TqrJC5z1z8AQvRs6QMjQ/b2xRsqXHqSFIyFAdxORvduIBBJHucDdV4WcYR+3aPeJQx4TRSX2A2VS5vJjFijuy7iN46FJGgQ5wTu91GU7JryPO22bdLN8T6qcslwLXWcLXAbxoHxQFzUZ13DQ8nqX7ew0WYHHKl1Ivnr9qtMWlvYOfbqw6q175CrqwiLZQ7w1YBjzbq2m4riTW3QZJcNIYMvCAI7C4x8HtvNmJn48hn65wezgO52Gfbw6NZDphNCULiXXFEl7aBnEdTWuhzZG9Y2yj7i3jya3+r2+OAsWKRIW2bI+xLB0gP5vRyrqR1a3tNUv1cUODI7/9UR5m/Fsb20K3LKCjxiC31oieoUbE3b1ii1w3reH4mnVr82cSj0PRZ7nRNEfd+kjC8rWxBbloqy8UUlN7CxmbSiAhfeHqIXARRnjdkg63WOySdTvm9HWKH/5yeAyVluOtPMd/8o0wxYyre3xtxDDDcWsXdUVVadqKZtKYua1+GKPCydU05gbTRXGcXZA9MrgDw+R4q1Tf7aSOP3jq+DJdCvXZLxG9CgIBplsF5W07+uygfUx8vAyzMy/v5Eu+x5E2i/Um8TqljVurQKeTixzIILLz218Cdt7xqFedfgEyLlaHrHLZydgp+7hz8isZdT+tvyNqocSc80jL9flKajNAzoFFmUxjC4CNqrYH15N94xZVocImlyTsjlGx7DrYbV4VGLhFurWJJHESgLFObriVQp3E9qhcwLo6DGJ2rpt/wrquh6gxEDHUeAV9UIams500/fcvrGDr2prxDy1TZn70aBca8y5PI/z/phjJJGzVVTwRgNe5zJ/X8PsnHqwOJVk/PIDvbN//10oKi6Qsz+jGyQFyR6HuRL0piPj1Wzt2nEmnP7HNIujrDuyIPtRAHPiQEJWQ7rk8m0JCBGc5gV499rASTZGoyYEFrhVzlLlsz10kSv9iIZkNXTqAvRcEsQAc+MdrPGXks/tLQxzwp4O3Ool53MTtwzW4bMAxLVcPFGL67jmJ9Gq0ZgXWg6N6oQHTAyZ+OKdo+SmMwEW+bw5ISXW0Kp1s9oQ3DP2+awpu+qwSqdPI+LuTjUUeWw7uVsey5Wtq6cx5jnoxP0T2b9AXb69fvPFxGFNSqfm5eG4HMP5xRxyxQ++Pucucgp8qTK9Bx7OH7x1PxJ3sNlhu+knWw/sW3eGHn217h95h+q8Pb6IxH7b6YaUbxw2BA4XFJ9/5656B3rItJ1Klqi8XpxMD8s+Br1HMr5+9ONkB03mC2sMzaHClJfbE802itMt+T1mOzJnU8kEzPNaih2I+7dM62U1At9eSi7ojMt/H2CjiSs/VzxKeW6gFSy9jdaXkTLAak0ki6CzdmeTVUCCON+FaWysp2KBW7MFoYTtMOC2jeg9H1xn10ieu8etyte+lVFsCIlyYIvi0GI0hmJdy3L34fOCXhWUbngovxx91cpV/njZJNJdUm1Thy/TXjD4fNoCSiEsrGzw476ZJeojQrnQU3UtStBQQRaHVp4Mh32WH7bYmCJqTBdX40DwHM2gTG/a1qDw6ZRHY1qFt72dj9z1woocwGQVjKt1ZofxVbyT1e+xTmeEznY8CRoudtiw+S9l1lZA3Wldbgq3YjtUSwgm7/6okEEg6O0TItH89a+YDksW1cZGdb8csVeUZe45kPNWff458o+OmHS6PiFtc9yW7uP7Ud8TY62VPSpSmfBVc64nuSnpbzRlNS50YDAUWJ7TDTljMS80yHptlXoAXajzkI66mobL/uiwlY7PMzOMwP2al8w5eqNcYVqHDSsEmlylVEc8y+gWG+pVBVOe/8DVULBpsLoZuiZYhkpWBrmqKQ0m3Ad3bWDQArAIMeZGcUp8m6iDeAEuOOB7V3HarHmQA61yP4mRRe4zkOJwefmPRqcVg7FP2k7BLbAzNcKw0FzzOHJRY0bNz9IalL7Kz9+SDq+WZPXE05OXiSC1IeGfG1cOPlGaZiNxJZUDfJcKxWCP5ecrl8z4LI2EOVws8QuLqXOwra2FH6CvCYD81DW1+TNMaq0IRrrT5ybFf4Bwl7nP1oFDEfxRUroUTW2NxECrzqZOhPbaQt1xWcRzkeXuOvrhuQEZK/XrD+Wgm5XmVTIDsCsLNPbyhFRrruAuhWXiazYJjF7I+ep3m7KJpo36V9BiyX+NG1UYCwQcp1eJ6cJc+7amyyiiyvk4NDF0zJbXKlfu+F+rfxgq951Tu+zO9aneE4q6/zWBRXE5tm7AZgskpPx5jEreuf8lipvienohzvgBE7TyxZYz/6H7bNG1C+W4dnnoKCg5dLcg5ZE1Ve2CILox0666d7efv/DScm4DObfXdUtA1Bsf22GbWUYhdngkjXCnEkU6WI687hyxgObdbKspHOKk49nh585ZdWW4Dkc/ELfy2+67NqZFgHsLU/eqwRAoWkzqRikN8bBsAfeMPHDezOaMMOpBy4QDznpy45xU6cf0kuzszj6Z0gJOk/4ExevhL1J3p7CtS/bNLp+fb9nDEoiOinJyKUGRyo4HbrD0xA32eKFSHRUR6jOpu9561pAne+/wdEyZM4iXXh0Mgod9KqOUQiypTuthVLu1HQnZUBju1XMakgJE+VNmvMvMyMXNgLH66YC1rj3LNXv69b9NUxcnvOgWuCEMNJ+VLOd00Jx7blR+XY+/AKrmktBiOdWJr0CTN7UL7RAyXL83bMLyhe4C2PK82bHRKssnlZa3z9hqEWTpH20n1cfLPbPzD60Gvu7B5wmIR44vChc5DbBp1qaI2kEHvZB7rfTDeeRAUvtVpDWCdLeSvOho1n2v/vMBTBaQzUpyM+6UTZ5v+Y3+dJ12eb5JyudSOuhRujHJWPdWTzPhCasNx5II3ZtYlsBwyg6VCaUflo6y/qLo6y5kjs6yldeM08u+zCEL5JiMfQ26ZnvNflO9sqlZt/pRhkm+nW6CkHbHbBwFAl++NaY+DqHwnBw2S13pqrTuUjwYSHwpQAnWFO5RuQk8fwCUFUDyeL8K7TVKGkeFxWNSXJWP7cn51zpyfjAXv37YZlo+T7Tttf+MWaOweN70NuDK+whs3fsEG2B+AaMn82kCSmX371WxnWx6ANqPlscex4eXQyGtASSzbYHisJoZX0ltDKETPjsCILDMaa5uhknBTKRtKjF9TyPht/HyPF7W8hGisZdo/6H7dEKOhLlDDhPrzXdO3NeT+uG3ubtvQWV9oZjXHEltbIOH3V06QqgUA+v88IXXVhyyOAHG1KMB69NWd9VzZ9ETaRXz66zb69xb/U5Vj7DjuYWA5HmguJ+fVVzypw9OSDyXwm8xwm52jh2TvBC+kCeG4hYCOa8adcE6oSJhJnDhWpqqJI5BH0xyWsMaI1MNYo+EXJ611QMx1FN4utffo0/Cx1U4BnR0LgteUotgYkSZwPoqNsca2J5S0Huu9hRtctW/bpo68evzmq+CaauXZiwuaaVO+DFpNVkvgbAs2DtBzpccrF3yJC11pFEy4QQHxHGnPufcI9B4rAXsgvQ9qbWwEcPHWmEOCSjQmJoHbdi6Z2XoTsj2dy6bx3dH327hGf3PE/FbxanXls5X3PkSljCdb2eN17L6/S7SuHtCDzttuV/tZU5hHanOuCCYwd0w/naAlrZabUkXNUJsY+gvLPnhlWXK9Qj7PPTmCN5R0VgF2N9HM7UORpoKBFs+QobT7zgUudQrH067p/MqGa2tgg0tdt0Up6ACaC59aR3upT+NLOR3s2L1Ncj9ZvtlSSA9C/CDKaI9/3qQY7zc5WTedifAngLLIkvfsqzOsclKf2M/ZjZY0qpKY9qxVFJPLygpqQov+VNdasDtCpB0jkJSLp7We+spmbJ/m2pn3x+3VMi/R9obIUfIRNshcVu/7dTHXhiPSp4l0tyLUI/DQj/ybLtP1zZo8u2UEZj35/NpewCUYsvRXOjta7OUOmol4caEe+DCBbX/hOK5dOU4yyHj0SH6VkEsjHHceaSnARJxXifI8DPaxvIyBv6jTrGLSfAu5zAdj6x760bDUVEaHfruso5rDpqP5wMkp7n2kVoez1ribHW4WuuPVC4so8UpJRA+DSSCcS7qacivSXvuP3RSLUlREGsKuqta5OMl5/oZ5FzpiTAWjD3IRpPPnqAkhAfx6yyax+ntf8TYj4r1+fUDMY6sdASRltgS7d/+hdhH7z77xesx4gLrd5Voqcp/bcV6tzbN8aWHm5xCUmh1GAdqMYacyr+hHvWBJJ+qePjriqzx9S9VXm8mf+zWZZUcYc/zqO7qX8lj+5IObVCSJK7mZLZXR0myfmIuHlc5xQ3bBZS8Z8XHTDOiqjPDxKo2Q/JRZ+QGpm5ZckEhf94vela1/p5E3w2yGeIHVuLdD/yuMXEEmW/3Zs0G8T99lNRcvy3NV2TF+gsaPNe1hVyefaR3FZB61t8qQ3sO1936+oDGtqD469FLEGMe3kGt33Tv39xwz2/dGINGMy3yfayx55EaNw7jRVdVG7WbebTvnCOGpj6cMyQalsxYYinZ/qww6OV3Hw/Xo/e2TkNZe+Jzhh9hxozLOTjew4MY9kseXwfQNxNj0cIMChze8sciQXorkbh55MY86j75oxrQPwnuS39woPzAE7rJYLdzkPBts/F1D7Yu/zCdtg3LfFKtY3yuiePu9CVoVPLLmq13q0xu9e9zbE5d0HPb4NWSvq0xzslSe6eVa/YjIbv9RSA9wt/bLO9t1/PIhfTpxZVkEybgQEm5Dhr9ymjdqQwM3IpIyneZmxzvQ51eU5TltykWeZO/TtYxIrU5RHkFE+Sz6Eg7x270lTMWSL/nGe1OLXgUl3sPrU64MPd63VrpVT5jlTlFZPYo9jBpETE5d62SCHlH0oqNQSJQ027FCShCr6IxvWQuzzphXm6bRsiS8qmydaN/6pW5i6jCrDIPBFf7+gJG0m2VUyykUkbmO2KKZJYBcAZncV4GtIYUAxlxhQaGlQ8O3wl2dngAm5LwoiMsFyExEIAnPVRivpXKif1yY8UMCbM8K5HEZSGUqdn93k+kCWW5Iso4Eg525srHnIKCPZnOMBHChl5dhhQ87ZyvFHSvEjvw6QIkuiVjuSb2kBAHGYuFhDN41ULbCeZminW1IyCfBM4HALqN1nh9fBI5tQlYUH/3q3gt/lNAutBJYkPc46M8zPg9CdkmUHdDbkDqxDa6cqyKExFJR9mKkPdrbab2iwZOlhzyOu+P5GFjYTEGUgevlH3nCRMki4zm0Po1qXSvSxnDcp470jNSpMeuMuLniKRouM4asPBPl5cYEBgkFxWZ/KgVip1xiFGcl+UvHS5lolJarkSfKdTdAexloV0CbrS+jP+gG+pRJzyjdLMqYo4yeqDb4PA0yGCvYo0dOplDhQRoh+D7bNW+nyvg/+876wyQG0hqpKb06hTizJ7oNPl+DDMZKj+iSq2nUEsrPFcm5vfjbXSjDy9ynhgGgR1Hge5W8JB0/+bi6iTeHOrLORaxtaeCF97Sw2TqH12ptKFdWJJKL5QDiUbwz264HrZ0nZ+80ggGbEIGyzC+9n7blyvIWYOpJ//FRthXSEqYowIScTRcAeOqIf/mlKPwgI4gATI4AkUS8dXJZqshUGy6OWA0gkgcQ153gtU8BTDOzJPy4R5JF4ezrRKbAUEXsYr8kp78DQPsbaH9AXJU3aYxH1DLgupMpVGYF/nrzrQhELQNud6xTmRgwjXV7zcpi75qs5cRY62NZt2cJAHQJguJ73rbH94vyM/UO084tnbeT9OIXEsZJxa7/dFcC8BUpNjbY/hkXj5zFkqVbOESCsA9HcKP/bhn0BY+3KuQ2q9IdPaLqUHPXNmx/J2VxSrJDwZBLtyAQoCg5I5yvLOjfOOAfvNzB13svArmVEVTzaHnF9hqohcn32hiUJBkw9g/TqAJ9FjKxm2H6OozYFBiRSfC2QUY2YwpiZQC02QB46qC16bvgBygl3Kfqs6XI9KniDGwbzQ11FKlMiRnzCCdOKBrjJYo5dE6aGIGq2OOsRPrfDMhJPUNmcY4saH8DJSDRpfz0XRV0aLboWaeLbBrafzgi/OQOmAOfaiez0bDtSbSo9Wh4+S772iT5G1WWD3P7yXjGx/0gLvGLZ+DBD9b14xxS8f4EI7XjMw4Jerfi3IjrIZIzGR71Nh53EavZ9dDB96OFTczfXZyKHYzrHhMHWi3L8DX/cHk1neTe+MQxPoVKveUZ8XPEVZ0jTGk0OYH5NhvOB7zQD5Mq7Cayy2F/4f0AK7Tx9kqlvcu7xJuXuA4Q1z6Xt68W5TPcjHW2TQb4I8jwKLDNECnOVu2O2bcPQzpXzhAqG++EJ8mYbYaE+kSm0GpTWl+L2Swhu+q7rXGov2tWs3K0MSCWeetdkx1L4Rv5v5+FBey7JLdGYB633zeD/0K8Y17u6oytKO4+cq4IiJWX1DDnLW+eNIs/iUY3FcMG1Z0tEeS2oBVVyA/FoTiEUDY0bUlRq1LfXDHG4c0d4xX9j5yvW8ZGU90N5EyO0mbfQlJAExJ6UAE3I57fFYT9B6mF/jnY8cptoiiVgwF9W51fQhQXGXCEaFroPNW6ZOa32B9Q2GGhiEIAjMsCWdPQ8ffo5DFQvKSLlCSAL/d9Dq29daNK9BlwpxrxqBx89hujuu3X+pyCAxud7h4mM4yNSbpb/+tFV2kwyGq4TRScx5dYI+2GrW6rFhMM8glc+bxWbdfqJZ8r8YE9HQM+K4/6MjUyJMgWXbBcTWttg1FJvGmB8pJAXx0VKRWX14nP7QanK7Fm/UGuryyiR/LLB8PSiLVGTBWp2POxEPtGNG2ruLwxdOZkqy93y0KnYrt8cjJsCdXVGROJy+3DGtfbDwjQrQL63RnotgDtDyjvCKvvzwYrUpneddWda0FfCPT5H8GcRlQKKTvuWp6ylqFw4NVLa7CzlBQWUncKJh96oJfGCOa0JFRQ3eHY5y1rNRrHYz086KWEhP1wJmnna7oy687NBBYI+BY7O+tLHsxTMITJxq1j8jQtiB2qbXEAJEVSOlgL1bN94Y7xi6pgKsUsJHNarjqpUh+kXeXvXiYA86gZpilYq6J1N/TlJO6H4hA4jA+i0Z+G7NOE75X3BgtG7laPlBmLJ+1fEgOGeOIIiE6OxBsd9L3eoKK/VNzHbaKwYmT7KsFmCrWEBsMssCIIlFXYyhBzl5WbequGXoq3DmhHA+0PqL4SRC+/Dq8yM7SfW2Viecoqq77aZP2ZtE7/EADIiqC+noYiFdQlWVejt+Zsl0IO1rtYra/dsXECkeiStTx6uYNlJg4RzLNG/ybwGH6IccFgRoPjydoob2mJ4wbHOvnSrMY4/rjfX2iPLhVZiPlll94qslj+YiswwmQKGely+XMOX++Kj5NsbxktPse8T6ptJa65th1UztCLy1txbjvje8f1PCLfOD2eHOsuhW8xyKkg5lx4RI5DuwzLdX2PYD33cXUqP3i7LoR+8ABatcU3oWnXQ9mqPmXQEpts2hFUTz+ufPky14uRemySkE08ddDQrAiDSRY+ou0XRFQA4MoCwcY7ndI3kASd+rTSn7ipz+crqyjB5j61xEgPTASKKW8YJCwGwGlBSsH6jYOkT5DnQb+BkMCCJHWzkTCvSUu1cx9acKLpp/3cHpc96Q85yLZZtzkWNwn3Nh1jKT0+mLs2gY6bqf3snF5mcydqKlzgGfbmq+bB1Jhh/QF3mky+nGOMfK47An1l1XsmQ/SGvQAqhN2CZ+/l/5PwkH3BHUzKO+yuN26w5bW3Dsvve0Un3c2nDh8s4nTedfIgUTrWs7pJT7gT+0BFpKXeMOJ9v8BWvW5Skm7rY+AtXfI3jcradYZcWOF1WSj8O8RI1dsFD//5yWa1/wkO/40TXDyQ4y0La/8d7C58fvPIosSOImKAMjuA7yVp/eLPh94bAMOS4LaCcIDD2sC2KRtbsP0Dbr/ZmyazWDqAz2SVYrrVUoaYtvWK0S0Zo31aB/TLspYXkxLjNLQ1iZszsdSCyjRQwVGfiYYGBMccUqqJfVonc2Ysbvan6ixmTguwwLd+gGFyNh771CfzDdCdqDO4GsfDpek7ei/o/f2U57uSMygHaz2YoXwePGIKX8ZFUHovJHEFKXj8U2wn3bcM0a/1+rGgQMxnMggJ4W952z+mpxCYSnH9M+s1GGv0ljH5E1P2G9P9xb6vyYACH3k8X4udVxieXQ+6ZdqK7YCMh8GBZJaGTS/mF0VbxbqDfOvHAMeaF3a2+pZBFZlHiaO3mK6grKM9h26duB0xkoR9092if/Ase4w3iZ25+1F8vYXHIsXByFU4hMAJKwAwW05km8+pHKDGcokfFpCShlQJiJNlrfCKbfB680iwlphGZAHBi0l4zEgMX7j19dnBxy1ezb281VtvHT6L2ZaBLAa3qAT092xAd9BmvLvbvhIYg9yrju5jsdT9Hfw3KjId6cf6x4fw6J4NLYxgbI2vsdq/uOi9jOF1Z9wv6toch4P0SBOaqy3iwKG+d4W+bKr3uTi8RiDYdK0gDQtn1KHftK4vF8FmddmTPmx4xTBHWksbS+d2HlJXeNywqZh81LrASXHrH6iyfiWVPYDFhhXhgxsleF3VMGlEpFy2RgFGqYcF/QjBY7N439OpAzF0cDGJuGx4wMIxmnrEj75vJ/H1ZUnaK8nTlKSpvPUdMuzrH/FBhVMefsShu/iCwGeTvyzAl60fA/3EFYL39eSByWcZXy+cQYLe+uJFidhvbcin+0JmoIV8hruFyNUGvPponpL0Ai4mH1/Fzfddor9q95nGl+x1U+UT4hv+s4c2LM6Zte+dzzVZMLdtkU8u6WfPRysWOOblQQj8ObxPdIMpRko8rEseESzWRjs4+34j7RxYVCg2yqIvGHFjcYjTal5ck8kV8eU0FFtBmB8fib31rN7WuFT1s4GkYSN5Pzf6qmCwS/oHS9AthGaHIb3eYsZy7flsAECv6L9Jr8mAgUafFnOcM8W+SHqdRpT1MUunMqZp5taaWwcFOUKiMTLhiYv6q7aYzeLXb10A2VyrLcJIX3+ypF5+oHIoRDo/TYyMhiuXjtNp3CignQDdnoFuBdDzANX3VdJHY0qLR4cIsqjNB6L1e6jqo6RzLOVJOxDiRFTp2UoPYtp6ED9zI6jVvGLpD3waKkCy+XyVPXDpa0SS2uJVY4jhVYv/6NFSqKf28jGyTn1AsF6WoHUsBFwIFWmaFP0OaPqmJUVf37yAkQ9Isb6Dmr6ZienomhqQTuZRtWNbrGdkr8d9Ms3WEOQNJceAfpa2hdgZnZJC/nj37Vqx3vUiADtNxeTTvq8riiDmSvAfvyjB31uv/jAVZO/uVRf199Pef9XsW9+xsSO/cPfZHVI8+kpPbDdMCHeru6feq9KmGg/tOW8LwB95N4cDJkUjCDI5oaXoMtY19A5QXGw9jkiH5qFa5BGw5jjR5X0klrhRZDx2BBeKtZnWEhMzYEzc1crU3MNULRIunsHLBwXu5s+GxRlp1ybt8V7819d8BZESWiSfMqPFLB63MH46wmVV5YexqwUrNBGDPfJd4kg83h5+HZx/ZMF9wLWCtsFnlfBWRfkN3GvjyZjH+N0nQIJDzMpU903SGn00lLTvnpCqANlc/8pwFVvx9uJm7cIM6KTXDlYnAL4Plz/aU8/GH3AtDfEPCheuQmAA9mfJ2yOm/aEbOBXEwcvcaL3KJ8caX+h/5GcFYXPBx8iinQAXpEPCxbHcF0YfRWvKk8UhN+Thnlc0FKosTdslfSb6mj9R3FDikwdjD0emRFakAXMKz0FCj8J+z/P+2+e4zxP8kp9r/G4GxXtBEdu3IEd1xDZpRg71yxTSrEeLVdU0eYK+Qt5L1PoHdSmpzgXrdgPrtf8bUWsOilZf759dP6NZFEM+uRlTBSafsWB3dN2EZ4WdZubTp1Mvvt3adcAKAiFWjoDl7AhILBsJmOkjoCKIlL2L6y3BparXPGiU3CFHhlUAsCsBCIZA6/tcr7+CAHptkp0FId36/ul6TScZyfROCvUc0y7qiJXg5gHtDuiWDXR7gHYBJPE/rzeBmLZe72BSt4vraGsB0NADkq2D/5v5ps+Yth6ASR10tLUAaOjBt95vup306wvadc1mRZCrOEkP+HRe9/3blNXyTrESaZ3EswUV7+evb8QFEeTqT1IEEOzxr2rcWVYS/cc0fKB5SoC+3NOM9YhPD0QclvWnA+h1nqIkQizxUkGtzo/TN8esV9H3Qj7BgH8tELFQmsF6gSNMjfhM9TBYVGFkWQYGcTEMrDEs2oVdX4YZ1no9+pQAwKy4h7teoxELUbla3Lmi1XeM19uxpxgtHiUfsvUwfkEGhvobb+kVadkcDdFuJiJWxtPe+/XVy/r5v+DZgehdn+F+oKl3PkvAddrp+wnopQEakyUSsyFpfE0liM281e9ToAE+jQrvzEoYOOLmMOqu5nDs/jyi/6RPy+LoJvhSTPnrli2IXdbS/ggU4Vk6/ooiq8NvFsd08D+992hjIhhH/ScVWJOr24PpInM/3gCCwkvXGxIbF1ZvncrxObf+LO8vvmihYuT2Ool6e1W/YTRNVXW4yi/L21ndU67l9wX9PkWazXUaaFNl3YB4NfYuP57X4gHBJubquQdMBA6Vngn3cvMw34c89x0ysrFssNMY7p/Di32HgSLsEgF1y3KxRp7TdC9+lQQtC24nKikfqJwHIVsYYRUSmnp6g930VVjh1lQzDyAf96fcOU90BgTd/Bmyy1haXirmKePcGZklqPMDebAdXIyYczR4UcusgT3saTV2GZXMo7I71dyWJ5IvCkgXDWQFHDMODRdvT45W5Q/KW4avp2Tk0zjVRGo+szaMPv/B7lhpeMhGdGoP3RMxFUzJGcxqcgc36C/aZmpomWovSC7X6XYLI7MZ4KhYhl6sEnMLaoEQgja15fA1HbYoCC+w5YmETmzbepiZFV37XBK6q39jSPLBo8bWGS0uAc8qaKwrrszIA0ISqYoP2xHA3NIlofLBMpeA3Fs6MHd6n8KFPBbg4aNMXoQ9mXQPRR1f4TuXzxPdccDTbcUO7mCUMaa/a/urc7Xfa1PzW31cPEbn43obF44MNwgst3Uv4OtBA8Nazbzn1EEjo6rnQfv7L0rUbKmShwIK4sGDG2a8OhaHBs8n8g3zfxPNlfVJTeyc0V7mQLInBl00KYHGDqCDzM5jiHcPi7FD994VfOz/ky2gFLTwrQg+YDDZrsnx05SPBcuVYzbTokMxYm3SIhkrSZucu+zujHZtYWdjFn7Z4GQWcPrjZmCezW1wH/HsADQbuZKO5bRFZR0eDRLoC5UAuLxLPpa5GCIQpr8kqXKrOnUa3pvVZyzNPCa44fkgl14qWs47Lq2ruyZNm1TXz3tExYWHz/t13oJaz4emfBh8ZtVeDfVrBV9lsJqOHT6Ix90NmGJ/PUwnLdMRMk1Ph+bxIC1NtnDQ4mAtbk7JUIvVn15s8xzVWf8CpJXpmu20lKbQTquA7eVY6vk5ftWbNuOzyiXRtYVdJl29vF2jlNvoq+ZN3P1zSc0yebdkvBnDu9QlGb1j9SqSC17//yLCKyqdDb79VKpaI/VMy0lHzKi7xC9Qb7cI907yh/0i5xgkCvalK8zMpvKIQT7u5+iBlBZd/3lBc1FXHF8fMkREYaWPoEvvhUBMvcJ+T45KKs0mwW4rUhLAXnS9wPXa3tjZfRZShCxT075O+uIj21DKVgqndqIy/p1PbDglspKniCySPxZ79okC5kG39BF/dalHj/6ZDBiwzwUorAfwBq3hQSyNbE5jbLewFmljpbLb4SmSwRuQYcS2i4uM30yjUiLGrsWpNiOnc8hIzyrbKA09VTCfafeIVIYchQ+SZvHXNKIOKLkTY0XgnSJy0a1DV/ENKwOIOc0OdWkYTTB63npf4RfaE3E1qjRxGR4Ma9lE8nBB/OG4zMzJ7LQK7Cf58kq7ela5qvjWDEGA99ywnGNvJeypLpcVIDAHO5N7uTlH9CmjlT8Cn7dSLbaSz/Bk8vb1+Gha+sCJxI815Oxw8f18ZaFgsijDLh6nToX4+EgO48Glj/2PHFPab5GJCRFBOW2agy+aGk80rwx/+4nx54GmHEY3VK9o1iFcMvfQyzwY0n/phO8fufXVtzvofa7+hgcZC4s2reyZxhp/4ZA/KoWTqsuDR3NFPZpanofBtyLp8ycCRbiQrC0D/u9BJmzZMfzle7ybBhvq75CNXQJoLnVxIdj7Ze1lIa/6yL2kOLVssKLIY1mOehmfMuI9ckmwysD6nmsYE5Jk8VDiGuljQ5GTiJDrJ7azDmwl9T2d85ez9hy+r6XMl8sdIwYC+VGEzr91bFgbwKqXSePAgDtZT4sMbYc4tbQjmTsIslOodpQLfMw8P3K0xz/lHDHt+CUXzcEWpjvKwyJiUB5QdcjdHbYv1HUsT5pla5WEWk+xMavI+eVchPNcv5dS9T/bPt4p5Ut+uK83O533EnEWKUN+cftUzar17WGG7/unsxdF3GYoYnVon/35qncpIFvzFU5GKjKP7wDJ2PyQXodrg1cetK05s4CIF3xLROVoOPJdxcElzVhgv1tTOfiZhqwLwP6vXgttEjwFaX2GrLZcv0vpD72Xvjlfna8nzQXe3uh9vbH/adhjOS4egdSnPoeUJz+HVPMf7n/m0rgzQtRR1VKFAAcZkNE2wghS1JHHrtgUSE8FKaNgffD4LbqAHRWdtVbVDaOwY1J3MXZObI1eTX6Wq+/4lsc3Kr57PlNcQX35BqoSU8aBA93n7CeHMAAcTJKxH7I1eVfAewfi159uepfTYeKbo7TfqsgEd+jLD4A+QW0pDKI37WGKif7jiSW56e81ibm8penpiJ7UtqOZSdjGYbFDJbtWrqkQ14xYvu9JeoGFkjXShhdb8eM5FZO0znpjN39X4UJMkMyuA7iXA2Itm62Zf5r8bnYe6OY00AkuJ10vgEdhFXQpkiSCXruWAisMXH0G/q0i+hZhZruV1ieKpWDn1IMKNMhnZnFyaz0zHt8d37AlyN0wcY+BlBP0G3vumS/OITodhBp6nqwpbOICisrrSHK4ll6Z6tvAvxYb0vDmVQl1IfUeXYq9IncBRQ+1heluhysMtSfsKzKb3uOAMNRsPtpm3NCCpe7ndldDZyVFNud2Lm2HG7vPwS2hhj78Z3Pi9XYe8J1lrmE17AcVUrZLMOmbZpBusJAybMLSQ5PWzr/d1jMPNaiGOtX7JK1Y1daqrDThH7g2qXJaYF7uTc2GfsIshdQU0grPpBSfsupmVZdCeaaetXQhH2rfLmY/eZgrtU6Y2sxdDdF8YDXI+Udgg9Ln3ca1gO4R1CLoNOkb7Dz524V2QLN6+XlukJAmgdjx8ZRjPO1QSE0sD+LcsjuZmcyf7sUt3b4mzdU/pZIVi7iSoCutBo/k9rlqNcRCtqwYoDIVF7diScPUdDrRz5NnuSV8bibhH/xho4NuUiaKHL7MzJiujVA+BmyGm54QgbfZNvjlaTm+ZO0SV50rdKPjdgxql6f82XN0hcDAQzrpPTfQ7K+wrbjvDm5Jmg8RpTEZHdhfwklHqq3tDvSmUw8UnnS44jbL7JqXVEzkGWmK4BPpNKzepNlJ+8CeDr2T61K9cdGNIbYh2iWf4ULpTumPcG0LCK70ty5p6brzDFU3i6jLo/HVYmHNTGbcMJGn3ubSa4SedwT5dC+xGF/ZE1QViWNgJCUFiJhMxUs2GDe/itu95oijbHKp66LUjKX/eslCZChRVADwq6cWFKOdyz9J7dE5NifWDgHGm9l2LOMcM/1pqcxLhwpRKfWVqw5qsHy+BgUCPN+A9o7Q7YpUWvHajBERF0p1PgIQsU6nO6ZgywFXSWFvTFrsztg+uyNjkIwROZr++JDZUIeRZm8MPIYJB5h9+nmrPRJhI3hZKFjl4YeSYH9D7r9wu8/e/u5d19VX6brqzFxxP+PtLDzFmdLqdHh5RdjPaiHK+97ZiWUdpDOWPqUPqISqAH0EE4aPBESwJom4gxNl9znC9GBmB/Y2RS7iU3JHBn+cghH0w0B3AwIJwXVkcSMW5Kj49CEo12a1DJKT3GOTCLfjIhrJSVPyc5fJ+1nlSVC+Ps8bJl9D2xURdSKMI4UzKn8yDqJi+UAScLXQVzgmYDygJJdB6uS439uxNsESYDyO+DQwq+S0X34RmGhfXN5PijNMnmTcR+Iiw0QdYDzw2XtgagSc6i8yTwyLyHlQZCNsFzh4u+CVjvuLOWkp2VWkR1X7AicYJQvTepINw+A5hC2yVG5t9RHnxGJ7k11/s+XiMIG1tMHdFLDGF04MocAjS0rrnrvWB26YZvjsltpefByBdmTdjY3Nai+M5TEXYI9j80jmaNjPQrqzo5SBLPLiKJpbL6gBV2sVgvyt2tH5iDPbSv5XkTCMiM+j3ybodlottc4VzuAYJwQEGSgl3wlwAIOgkqxYAZuztDsiy1PQV0zCZoyL0GhRJ2Jy5/gZjWyfB4BFaNHGv/AsffzuboJImS+jQNis/Un6B17IYR+rxFjDkqPBWewZZruIvaXZ82e0kWazeD9jYiFtsUYkbOT52H3NiYxENTq20QZmrM5KcguOiiUzCavZP9clyW+SeV59VuZ+y040Rl6Ig0IuZXEjdNDmBYHO7shqWtScv0Yw8C5rckrOJ1ToDdt2rnIIx52GhUX+tmU1Py3jCWTF+SjcW/u46dBnoLnaGDK8DJtDjirOGJ9cEpQPr6YgigcRk5buR01yqpTc3SmhKBIrO+FmEsPp5TwBSZ3+8aLTWE09ypEt/fvMhCy0um1b8I2W7xmfmzV5pjk21jgYEpfjLMyCGBIv3s9sRQSh2D14/O+/fwym8EJeK2T0J75W0IBDs33PbHqOzuIKkV7UM2PQKcyQJ2bDCMLUMRMcRxx4nQGa7CydiZGqI2VZnn/AnCBjMcFBsJq5fDI9/+ylTYzzsZ+Y28cFiuJTJTFoAZJLEGDSJgpwMbXI4O4rqnNr4PgZK8y9QA/XRYHIcBu8VDjMjBsAOK6wTuvyie8lcSFIoGnXub3qLpvPNVYsV2xF5lkMQdd7jjFyrjwO+fgNHeHxJmXs7Z4DtnJstNBXchmRGVleF4Be9I1kneWEDRGTL0ajJCoeQ8oDQL9PLBtd0s1jYp/ceYuT5v/bgZlvCOaoXh3/omvQBPk0grBpxiAaJdsvS9l8NWJCGfbfTfUrZb3g9IidACh7D9H96u9O3dj2v0yKYe5T4sA7v8f7qbr1Dd2fI5SHUZWeSUgHQ2OEtkia0gzDyxayxOAkJ2Gvh4gVefIVm06omMfBDZFFDmEw78EaecfxP4HMvuiOjyV41432jSLA+DmhmO4rs71glBMG83bK1u3SXaR2gcHqQrqv+J2E4s1TdGiFKTbkUd/YjOfZdf09F+HleXEBnnnj0dXXpOBXYak9iyQ5UillFW/gLIEeC5PmEDoSdHvI8PIsGpOLGq8kIKNBxVrGyAAbW0HG+D+5R4ZNvnRuy4aoV8LquNE3I6XWmrpyiYUhUWzfQWckUXEOPTWicL/s2BbgIIDQmD4A7rczAJfCaihCAcj1RvTKQrLIKROOvWMQrzAvoOB9yWJcDzZoij9UEA+7nK9NqQ49xyJqWkbSC39CRPZ4AD4IjTTH3F4Z8mSo3NVNR4II9Lh3U1JPZ2TetPsz76X+fXIKwIJsY6KO4FuweO88ne4CTyl2bmtppG/RDSbqwW44+sKvPlMfln+vCEc04dTgNM0ZwaptINxD/Y9k6B6pZ3d58yY3AqTdFHchyYvGvCpsDOExhUEu1X1ic7IKLQj2EpgmVYJJ6AV0LMi0GF9qGmvoqfcOG8FtX4Neh8tP1RZ1aHH3rzIynYN5oJnf1wzoRKSRl0lAWNof+x3iq7v3v9D/2VpSAze7X5BO5hzijT1I/hW7tT45gB8hgZzVy5sUQN+zbJrIzJOW9ZKQvYR7F0VTFBjhggtdM/JjEORmTDI+7547Sfrtv+g34YQD30ZZFelc1C/WqeKxtWwD33HQIdS+fOJ6lUCjZYnH84QNu9/w5WQlKp9sh/FvkDpGBnvF5c/8itQ7tKXpRwjDKQDDeJrK1maLsQRCOo1AqUjNOn0fpd4kvPjON/SZhxL4yhTRABYRMYUK0vgv2+htb+zQ0OxrD014L64Xvfn4bX9yjVbosOA098bjt8q9NAIPodExowkJUDjZgaNJTAghH2r3FLsy8dkgVrR2ez+5ZKszNMmFMEJ5IU5zBYbHIVnpuBCbInp2tasE2tUQ/Ce6BOI6DPeAMiEGSUWDAj5CMtw5zRnEDY4QSndo7cA8II/uRnCvP37aO6EqnqH9djVLGYLRs9gQnceyXqakIoEx5hDvYfIC3hSKI/6QzZdg8NY0uxgbpSe9RdXkNX2u9VwklCGl5+SyDgD5MBRKKP3TJcBpS44qlBIpo7KdGHcVvT+xvcpSJWbpY0TJnHiUu6K8pUhmXzQKE84t4cuqusAQEmiJjNfWn0e3MMhhxEG+QtRxy1CjVwsMxXCB3YAdUwI+TXzdoLHNPDiRNlJB1JILlPdbK0q6UpkY2WuixCPBggz+ZStPXobWbnPZmCAP495WX8nfUf+Dfj/e8Y8v9XoEROtlUisTilMKRE8yc/MKeD44gfQjeEMPz6NOt0hWQNON298LSiRuuhZ8GXWQpe/0nMlc2I2dV69eDQwKnHVPrO/L2GHvCIXrReTCS5grWpjXzFahUApbtUf9rXh6UsUCHOep0JKh4Qz7TqxoJFpjGFDNNIaFtlChBN0BhWU7ij2qMK2CjWUf5nlIRzwZ4puTz+cBUNqMdr/SURLNKTjauYsoc+dCHfJoGI3n4+xj9h0rd6ICNGIPA8HW13jF/TbEbHWEXnWt2Gjxzm+jew4P16bj10a9/s53N5Owooe2Ew4YvUEwy0aqUL6RhavkgxsPwrt6gdg+SCS2g16/1z5zPCrA9xaRIYM88uVWao4a45PduwtANHAmAMeOSwg1AGWpm3HAO85pSBmlzrgH4BNFmhiE8m8pgAVBS9951NgEO8Lo149bmAhzV+wmz4hinyiR66wRE+sOnljz2LyIrO5HBStxbU2tzpFBB3umYp7Ks/v2Ilf/9AfPDxWhKPegSQyODQrPtSJKMNxcwOI3SfPJkuWmb2/Qr6rLd2K1wfEFiQEfNv2inAokCaZROEHRoLNMoS5QTC4O+yh1txcSeW3X3NHpuO1SOHt57o7cI2lAxrUgmAbh2HnEtgxXRhkqmZFBsxx1qdi+WjxX+PSue4XeOOzfc7fQ47c5t2v56VXabT4Cl8k7VaycjbXlSF6HtGeQjBgNmk85LVjrrJtkj/U8BRb31eJIvDCAULeKG7vuNUhO9/QdZ4ZBKH4SOK+XAxVqFXLia2V2dmpwiFfcUQlxFydORuFo/iKigHJ0bbChawHldTbliND0myrIJuM+SuKZT4xdQrv5IB9AKpvJDg94lJxtfQxS7+VTzSQJf+2MUSU5qyMiYZ8LXiDFjmNUUMsPYz6nNqpONrL5bAd4H5k3GvC9ZKjIfcT44+HINTrqvsrvoN3TSa4nUMhPNQuYlsQYRB2O8QDWTLMkpV8iZ3HcQA/DK3nSRkJNqSNS6EaMOUWWIilMIQuEfdHl/0VK2WaVYKUJHpOwPO4yNdKyedOzNo13avXIDM+tYl4a8zPoS+SJ4TWKHItoc7/c4dBc1HABJTel95vPnv6pd+fntvW2ICn+xcYUqltDYtcVmDqiYhZ52vxVUW6UbgDVy53Zh5VBe+MtHvVVTNscE/7x7/YzeEq4ee9axqxwUIfh4X3AwKBk7Q6uxc+W/eQCQSm9yXi1qkDSSq4fW4AKthDugibBUzuuuG6F88BD+T5xpdc1qfYTEIUNC4F1WscQ3K6UHjLM7dGzFOG0wzPuLE+OG2XawO1noQLk5qQH+Ne9wN/GBX7z3NmFqyvqgwHMwWI/cDSrANsTnI/A8KCstB/4N3jNv+Z3pk05+L+lMbL/thpW1v9j4MhMeNQ3qJJ4q9s/znv+uRZBmbmLqgR3lxDItaJsvBBB1TfsTuaqvUQlzd1m0DV1+4aI0MKQYiBs8ZUrsTmhKtQHlRyvPqEJQCQozrtS7hEaT6AhXtomeUyiJThqXUoX91MOvb0hhbru0VQDNjYjxkPKtSoi9cbAgNF2kDC9QV4SpIF2kHe3gwZ4y0d7XxiWc9AHhxPdqHN+ekAjyBHDjQhFucVezUDsr6VPxJd0TnrJR/ntBp9DXQ8ZhThg5yhGzztjh0ELxwOJxtCYqvkD1kcGDJUOoZXW7z8Mf1AG4JIDXMCNvYBlZ1vbaz0gk9bZuACTELy3AFgf37cBhLya+1/8ku/62eTm3StPe3hIe2G1S6HTx9F2HIP2FWuNsxNXblpPVvl59fcUdV+iBMGGVG3fwjMeALFBQxY+ADGwA6rlFie88JZKYx4bzYlhYFArtwOnN8+pbdWUvr/1bU3T95/dtipKd/gv+J7l3c8uFhVyOGYaVxM/limYtU4FiU2d6SaYw+aoHGGiMHLdoux7WBCnyPWF8sQIP2N/6NmmO4mQ0Yyf+JCtTdty370qfh0thtwJC3lSGGclrSCkZdJsmLTtF8RnDQHIs6+XJABAs6h1h2a2v1tzfwva53jZopxdWR5nyCHPd/d6CDOPAf1Mn+DmqeweTHnAqaPJuY81979wDXyG9sjw58brvePt/j94fXBoWBepgDVOnJsEdhMzDd7cLVPmgpmeBPwHnPqCQfAM3gTu1H0dOQIzs7y//w9jigAc0F2c8GO4ZAXHY/5DFHrOpLyqcNjSJJSfAeAVW2mZ9UB9BQ6OwG8HcHQE/jgKf/8/eEq4z9UrYgFsarFpl8KD80MnrjatughbBEU2bEaYXPl6VFghwjFiay1asKAG3BuKCmywuSebx50HRZK360y0kHjY8nUFglcEZTheEI3h5rMaUMMMlMStgxeNbkWENQwuUhgygCRUFjYhxGUDVyu0AqbKAAdSYaAAocBBsB0JUxJXL74DQYVguRoVQAtICNQShjLwSJhy8BmgfoYpYQPDjYUGipiJ5wpAgBsLVYhZxHrxSdgRA9gNLH7kS47k9kb4Ul24fmPbCRAHHGVb7Sdi9on5SDyOGJPQO/iEmF0wc+Jxjves9J7lFTGLmBWCJ8UZoc7lATH7Qg/CE/E7lHaJ72HZLWTlUw6FmM1RO/F0xDkr/YrAsExQH4ms+I0QIzyygZll2LeCPOCSlaooE1hmqBpCXvAXQrXLN2K2RmWEvOErCW0YImL2hP2CyLf4A6EG/I+YVdgnRG/4BaFmw54NwTFusKegb1F7vIeBfoLPiNkb9oOgHzi70msMDqYLegpe44D5gnitB8znxGs3YJ4wvDohQuHrr4nnU/rtZUR/evmR4+4jl0/Y/Lplc3OYq3t7+fP1EX8GOSbf4tDx1csNDpRjLhMOSt/TcuD5mj+9esVzpXla7vEM3Xn1hKfMiVcP2DV0m5YtTgf+8GqDU6IkVwknpQTFM8YVv1JXYFzYXK9z1tlNtyjv07JIIcU+11BQlhIOET1OswYSyccZRSHH+WETcExzWKDIQl0yUETBdcxSqqPBPkKhHj9NO7palEcoOiY0wLEdGhiB3WToXCCjxgDifs0NKyjqAfWJApHlrXlPuO7lzky2fbd3qKO52GBUeQ973whySkbIGSXtJ+R0p1dw9NgWR4FKt94gjsOOAzbhCfYROpi1gQHBUA9onsijxoDwCFV1U6zbkAaQQa/g3sJGiQGBVfVpaicURbCDohFNQ1JCwCaBImClFFJhB0exzmAHsuRjOj9CoZ4WYBAr+bRojuQibBKIynAiQhuA1VmHBWwFRe1oLl0wJldJ+vXO43FIYRfIoBYgCrmCQxET8n0y5DSvAKMx/IpYNbKis4QII1T9+QS6Xs4NfHEkpNJtxyozoKI9mFaVwcVo8iYLiWPbjl1hShIyu/QIQ2b6P6VZQjdIqGIBe78qOqBxgyI7cvzWbXZBAoKBBE92BU8KRtgmaNwQ4uJocJtYAA7UzA1QaglvK0ThzEXB4pa9KMmXRTHUt3BStCjsRMcOBo7pSFB/jQh1P5LKLuuwKxcjnKRpKey4AreNoZdJe64oAuYQSjdiLiW1KEKhDd/Xs6N5DlJ4gWKGZqcWEHW91SxhN7kYyyTtrorHU+kPMCeWZwY1NaXs5IK6xF7nzm53qfzI0Mqg/fWcycUHTVigTPVQN2InilwnB2N2G1bPbdk77Jkg/j3cv+JAZ+THfxvfx49j7J7krDwBP8MwabJN0WhXjgWNUgodzwTi673ozURtDpn5NAD/enMDySxmC1E4RKk0CWf/MihnfN8Inieo454H7k3TpJagDN9sfzXYyBOwhypPygY4vnccAtjAtuxogJsH6ldx27BajChYOq4wQSHFbDZbzM1wkCQsW5au16bfnm/fKMWbhKXOWO8qMLzBK0fgbVQY8mUBIYO3L7h0laR3O0cCdxMy/lomstBOAEWU7OfpNjG7Ho76uE9jGVwQ5NuuyjvtjqPHD4vKRAkspH9CRGNduQPvJBTdkMVUqTkno5AAIA89C4rmyC84CUQOhlLw9HY2lLJMdu+vImyQM4oBsYRCZmEXUj9UWy+k9Gpf2x4JTGaJmTkZRFbXfXrHSj4xA10YopubvCghQ/tYnimwHqWhTEdK6njEaYBQgO8zCoSJHAQHxSbuWnlP0fwnFo/jhMSZAT86NXD8KAQJ+yuYLeQh9lDAkcAKPTpwHyZAUX5aLAIDoIhfKZbXPlbAAoVIYM0fgZmzWlCVakBLE5SE72Ggee0XAN+A7jK6TSMoG49DUqG8vYD/PWpWKVGFWEPRyL6SWaQAZOnAYEMrzIeUvHZAA4U6kovTgTm9SdsV7S7QI1QnoYBVGgf4BLIy3nKyMi5lqlUs4XOw6oteRTwk/5m40TV33hOeb47Y0NmiOmrEcRob+pKRnngsek6pgeQMgnFahiRfWpCOCThK2dmS1UoUDlbW34NSnzo5TpMuChTov8aaoCcHnZQAP2cwF1h95hrJfRhdHAXqaWAHZgB4UQtp08in6f+GBHPogLUJQJU7FGihwAUQsQDsoSIY1gaY+NKc8jnT5eIHRGw7rV8BTJTAchC+00mr+9pjW1Aki7nvyO78vBOHSFVX46SetuxqfeX6mnKcdYlStwFv0y1ZJuaR7s1k266vy9ifLIIZIN1hpuhGEG+J3ude33qD9ozWoY+tTkZlHtcNNZIgoZMaft9ci/uUo4v0n/+kF61Fhw4kCqYKG8rEnAQGjs/MkcC7SmZEoKDzYRDaToOCJF2+iRY687YrZIm7o4ZxE6AoJ4M4ugxjR0bHCQroFtk8tUBAV2fAU2fOL5sS9Hxvn6Yd4Tod8D2AugeOknIC2rGeyCBvZ2eO3wzN3WETYq9iAuJagCNe4xEIQYNTcxPHA2QoMGEECeMrJrOpxRvi9IOPAZ/IXhQutbFrNJUxnxuIciZ2BTrQTgK1kpN8BRKiKbCDcUadNG0JJhCYSP+z8ZDsZFAQuBLVMJCMmIuxdZyUc6VxEHw+iYTzeL6kmJ1NoRCpd0eN3UbrlpfbxP6S2/Amiq0GKxLNaGLOfrrGrzfirad7G4z4ry89QsVe+4therdYOJIydmAG8CPUzOlE4SghLhhaJgwTAMiomdYYM+b2AMR258eceu7dYQJVOMGxnHedd8PBoh850RBPu30K46AfQ2g8z7JYnYlVdUgp8dRpQ5pCXUj6saxzsAmDuzgttBDpwYATcONvDQFrE18XozBg7/ef6liATqU54ZCjovY+8eFnKysmMMLFjyNG2unZ9y9EErAcO9CJ3YRg+09/zeKuscSR8b5jBtjbd8wA3APjYhxcuAI6Dh2NZZLMdXLx1dqJHhEH7yEx4ZIxHshrxNu93U84Vg9lfpd6xBJYoChshgtu7QzNc8oTAwKjHnvS04SswQTOD3Lp4JzWTJTlK6moxSzwOQ9lxhfkl1078XWfys6u+qEzbicB/8/S4S9Xw8vFlC5l4UTtPlzIsQ2sDjlJFwwxrAu0ao4jCltrx7CM6EHbZ4aM/YyoPJdI6q/5zJOBTyJpCTH2P5PzCkSCorl0N+SB3yMabGDwkQmiMPhJSR/R6tJqCPAWasvIzkNyWQXJWcYGGKFT24nYGzvMTWwAy77s9AK4YHxB5sOVtvKEjsQebxa2FNimpsTXYFZPDfQmKO/VdAgZKYhAKol80a5rZ0bVMRnGuj9sVLWHXY4m1pom/f/UoOF5ZJlXSAamEsF/yCHFOkSiPQX2ST0ylJxlQVQdrgpuiijkFM4ABvMG3tO9qMoNzlon6wcXt8lLURaHbN6GtvkUTUeOpvs+1nfecbvCoOrGcMRv9vumAj5o8xMfKye3D+fth2+/a49sNQSCnzftpbvJFi7NaJvuSDi24yRX2mrFA5MH/poVQVcIKcm9jSfyC9sqjnOSEDZMGoM4Ze04nnlrI+cEjNU1xIaJsjfMdAJ7iIMhoCYDg3Nr6GuH/sPQrFMW6z+0T49X3S4I76aR9sWulANs9iJH04qmO3MtDOrS6vdIOL5327XYnA9dRKCRaLuwNPQy+0/86Tf58RSTmH9tHnpfg2somjLdrX9PIF0sqjDBKR8nGFTFgim8CcjO4+K80lly8W02m80kWTqq35AQPlp/0XotVCETsEoMgL0+lCnhIrLtE7dhAnurrc/lZFic28tpvGOXi2lsQweGKi0Te2zirIq445HDq0mAmtYBF4IRtw94LzVHnoCO4dDiWTliqq3EVnGi75yhRvbSQkJSxTHH4ffNoNwqhipz/zeMjNax4Ilqj7USiUMExYgFdI21DoX0ozkemqBW96ciQyKjL84wj54U06Tv3zGtRL8kGl0QC2Y4XjFIxFFF9VrKJjI/L1PndPF5kaXP7F76OKE6G4ews5LIt0osU3EA+XzLGzPh68K5DdppXITaNyXMmQaGeNsY1o8MjVyopDOu6e9fAxjCgpUi3o8FOKHX3iznGctX12aEdIeEXdqfUtxdymYHWtHtY3SAItI4i5mMvnGWrhQt2MPJxwq7kPa6uAAf5KU2YAQDS92MI6HYMIECjoLb3ufpou7xJs4Np3c0weMvZlSPXbuu/5rwQ7J8psClTqLFSRxVhR+ReiwfmlBsu54Oiu1EKqmbMIDomjvnNuJalL4ISv35cn7iqJUZsw44yIQrOZZDFhjVWMCinPlWThBUFG/OscsMBwtdCTjIRU3qDY2skgvzXowKIJramnl2odDp+xdAQ19uMqcm6B7+5V/KLwVvFy26QaAoJeQn0p3+2Kc7g7tsh5TjMqLgDCcpMeGQxVnDQmyBJzgxgYd0uDB1zPodE+XK+T2KBRwK53EOWOTjaoskUOsM5Bq8VoqdfCpJl4bzrAE5XnztTAHOQ+sg5GX3eEdMMscYCTgS+ozcE+fDlFW0ZsStgkNoP19EOCQhYleQ2KHIwQunKiCbhwpDmbuY58qTxcZR6ACcBmj2tP+taLGhEMzonBAV+ngqB0vB9W5eJOwUnC6JxvsCuwBGjcScZ/K77yUoShgIonYIYawjGLyYNncw0nRg8A4q3IHU3M7spiUiK3jF/rVM9rdXkYR/fj+c0krwodCZxPAN6cnFZ4+Drf4nkibx4dYgjitzdKuzKQlPdBRg1cvn61Gp+zaVZT40YHUW0Lg9Gg4BoRNhYCqXNqLEqdZBtGR16X+pK8MuGBDycTmWD+sABoEnJYaabvWQt6ZHxmrdLfDWdnNrpn6cywIFVTMKM25AiiJzyixIbi0qqUFSA7gdcdF7bBWxS4PxAcjpEQpkmCT/D1agr24+U/Ifs6fETPi2+2ILFrSymiBEFl/h7fmJuv4/w2IXwZYcX0xryr9Kisx9RzfHscTX4KadtViMWQ8H1vbmj4DrTydhSLIHh5Wr/rRTMYzdnkYiCtUOmbbMsF11DarNOB+EDbpC8b339G5qm6OCdJZrZV52zBSpErku6QC5JxUGZuoEaASZr44n+feVE322CKcxNNFixaVFVsoeqjNvB0PW9m5Cws8xK/J87ZDQTiQwAo1gZKUVUgLSekJxAlViPA5Heck+Qk3iAdzNR8cB5G42Ol1QayuVYEDkrI8g6eA3YvVuvGicmBzn4QuwGZ+0gdE9pIsunhEgU+sshQr74OKvVz/t5GuAbaaiRgCy4sbCXLLqXOCkVJhXlDMiTUMNZ4ErVEyABUre5vH5EIa03iNPMJRTZtT1X+R/adY1KznSYCWScYiY+JY8BxRLaIxHpTy509MAakNgPMDAOsfYrLY7O+MUMYzeb2tsjgYiXZ2MwNkbX3CWI+ZiAz1Zol5FJvgQS4/sQ/MwwvyhBx606KD8DIz4/883QOzCyscBnnCXlWhdeoB/JDADyt0eyv1eKBMcai2zd2ikzugcG4TrgMIaa6XctVFGtIOZyoJw8yDblTzPxnS4H3iCZFww+NVqgQeHpDSgjYQOXR4WQ42JbEiZk1HFEptYIrGQWJDkv0l3KyZDTSe1KnXm8TB2nTPGDQST2yVB5H3ftct2LLIkA1UzO58Rn0FOyYAB9jPYB6GBtT2/Fgp4MFmjaLK6Bq8fQEM1luH3EUzDHnZgPERjgRLYfVSgvTKtaC9Uo9qkIbxEO8/fiLv8QAZHKxzn2e2jR0yVny0OsIvjvSufhfehAbDsmcAsPpvi24Kq1eRClLn62ny7krwuhAHUPRVnDijECpYJoePRIOeqyi5hTqMkeGBWExoupeCNlhSzXBQOkjTETjJlmNy+WRHnIt6BMqWWO5ceyXgdVI4nw0wpeBusbDCUgn5TEd6q7lJqDbdZvmeyM75LJJKCHirSia6iMDaW9nOcXk0FeiVMbgzBsA43s+JtxX2uL4k2jYpd7X3HeS6XD1tPXm0MeMsTBexZ2CN2DBNgxDeABCTHPjKamPEI40sFLmMbDbVjf3NqRoDjeYTWF3hdCFFCgQuU4yvxMQgb8+Pm69doNd7rUK1tHHeW2nRhGABum+KGSBb75WulOw9Bwv0HLnuxTfLfcS5exZMDvMgCW80skjSNkzCBpcrVfUA478r3FLNrr5+NpPkgZwEBOVNH1Ir4sVZXolhfVAOwjAtgKpZBtWurFFAr15C8RnDMzWve38DC62xE8vGRo+LPFxGwdlmlnrLNKNjDbQ5PUkKLYESw4Bh3yssUQf0dUQyJfjTpSFJcChaVhrWmTxrgpJ69cB7e1ZNGTk8aJutf3WrZIaZO9nM09I1j4iPhkJcVkX571Y/3jnb3nLsLvcbwEFEVm7Vf88wpGJlZoK6DIxXXFG17oH86eMF7SINPoIrViZgEA/7gedCySLKI6YtntstH6OzhOSFwymCM6YPnfyv0MTEl98lrzd2pXea3eUcPlbtlwhoTtdvsU6vyTkLcZmcC1lbIcvXZjFXt5qrOLDr+mv/guXZ0WUTyes0oetJ9M8/kkNBAlaJeOB8aX+RZSBw13vaxiIaYpWxq8cVR1W3TRa1rsZ2JToswKSrhPChwi1IM63GuuQMUJA98+1SnIzddB3KC/cAl6AtR+SrhPzX4WnjjqpDE7O/clAF7489t2spA8pt/Pi3uCNZk+CDkRk2lYDtIgL1bvKGohM9bPPHlqlPs4GRVBVyaLenunes5v/kjkspsTUrtvKXZbDF0m3Bv+PKZH26ZxZu4NZxJE1wOva0noT3r4L5XfXbVkFpdzmJ5NnxXLDzH/dKTWeNsCIqX0lKPDriI8K585zc3n6Y7ZXlNiND2fqEedHVSJyaYkTpLrpfiqfZxmaTg11Glwat6HBVGTNT60tBmoiT41BnbQTKjUqRNtQw+dPUa6KidIf+QpguDjxJHD4y7Nup6LyDF1ibzH0QMOO636tPqy7bib7jiF0xG4ugo6A9YL7wT1qlUpW36vN/uKqTsGSa1m077nc6lYfEZxOeRYoa2VkI4cR82v+w9j/exvzC4r2OBdCCQkqDTaBhdGGXlBfMDUEyNj3vM2316b9f/n6WPwysYnOMGi6FHldHaw3wWyb6uxmbgOxnx5kWg1ob9FdKygrHopZYzWGYcSLaZObjLRb58volMcHlcxpCgascmYPNQ9UjEmUK8Xd+rwpn/fsbbPXUG1g6f9vmawA7puKibTMbtRzMqAnGsKzgk5dnfzoUmBPYn/MJ2u02GloOPzxWTudiu2y3EfqX5eDduNeB7cR2/XIEP6vC36MC9HL+L+LewUy7sX+eqVlX7vlS5RNre+/ctJA52uQw3DH/fQF2F1LKH+cvJiELsC5qeANw6NjLVEhNIyV+tFMlPT5H/zq3GDh1EcaosuTY0gtfT2Vbm4GM4yvUYGdhj701xIstP01feJRnQXSVdxok8iXRS0rg2Xa35ZOh0ErEDWu+ZULQ5VdIQ0XYAy381KeSDoIUgTs/XG2uBzrudx2B3ABwaEO8hiClflCjPP8eRDYkdoIjn952OqouD0ZXxcbc+YOUr+w//HCTeCqxNH0FhCdOSG5/vG+lY8yf80z98xcA+WP82C7XAZEGUCMp5ylLlxdskNxFS8c0iou0qEsx4upOv3SWr9ya4bvT7furN0koi4Nj+O0wqXZgAJbtuQse6OOi1gvEYj7N6+zw3F1FMH6wtMgPzaJDITfE+1xcfguQleVqaw4PTseQ9ZEryc2iBWnxuUKGptv6otPpwv9dfF1utgtSajcMpvAtVuqbnf1NSUwEMOb68NW0Lp8j/9mMZmVCeRTpDL0/L0qFDPG8kK3qRn8NJsM61kKeJdY+RPMFN9iH1+496KD9uBNfFqMaitZUERuGph5+8c/+0NHqSGbQyIjeX92q6tnLiJE8ULcdD0u53QzCoebzj30M4LMkxVLgdH4zq3OhRtS0GuRcN/zSBRa/XmcJ5Q3FYj1CwK9A1thgElRYbefEGyYhv6U+k4QDQjsHq+PuWwJr7S5Uit8jXJDpn3dGwUdjGUTitQ32ikfWBLBYG2ekOa/3UUSbmfkdVDqXooQmpigUA1ujiAY07dMgR2i+VpN2wpsH1e+/OvwCllyMIojP9VtgBcYz9CfXc4E9oEpGvX3ogWq8+sJQQF86bm1lIyuUv9PcqkrrmOD+Bgx5q9AERNThtW01yNm2O4Pdh/zzSctH3j4s9n4b176Lr3XjNg5ONo8VD6Y5aez9HeDMG2PqgdTUMzI0MiT0MfVII+USsDhE07uwysFajOi7PBYDMNRASOJUTHQCk9XsmbPXtwNvxSC9i74ByEBOQsMF0riu2v2KBDgQRa4KBtAmD6YoV8SVQAlhDWWCZX2uwAwIB3ebd2z5hQ/OQqJYeXOzj/tuh/5LTk+NH+lg7GmxD4xNPkCxZLCAY2oV5q3idz+CZHJf3k4xMsOFugB5quD8B+JyzguY1/3qya0y535yPgTPvYAwVhLgubfyIXyEC8IDBhzEDqDnsfswcxFIUxRdX+ekPzR1AZj18EnAZ4BGD/FR1Wbw1N8Wmw9V/zhH5cULBaJDFeo0P0+5Pz+l2PnnKyvtrC6vkbNpWSJwZGYh2NANUCErYHXW0dQ2PKySTUQzUkGts6GsZe5L0WE5KHBVfWvzxeoHVYdS2WaGw9Us03ntEufSPhynLBJANYaivnj9DD9j5ZmA8zbm/AqQVOBxyDHOVliJXiPhD5VSe6t0BR2H7I3P89YgCUVynaQ2s2JoqBEO/9ZnATKn4D4TnicXYdzN9KBZALC26+2QVGfN5oVZKLijNLYvN5s/wIfmNqqEl6LZ1F2xTSLquQyMVSgbBH4l+3CB2v7/WV/vKECZsU7jf1aPeO9EZuvUBMljnGt7y9+R3QLE06zaVEXRYza8RHs3XQJ48aGFAnGE3Pl1N6ZBPcl0sZv7kSePIilg+ITyf1knjFSvEbyNWXXtVWzPBKeiZBAFT3k50afAIDWhuV1tiG1+cT+ePMhD4xZo2Fc+0BvvrfM3EdzPlPFrwDXX6i3UpVGidSwi6L1dKaJYOpik3XCFnLeSjZzaJvL6nRdPUH10n/Txrz5T8mPJSyP0qqWTJVXjdmDy70uVQtF/Tqr+aIn1gUrsdv4aZuP0fIyGTwqJUnBbka3y4kYUz3i9OTOmtju8244il8WurvmzGBc1DVruH1yCacYMywiEQI10lE7UqQ0SVO/ze0e5ypo6xoDgYY9wKxtux/Bgvay/IimszOFTz8oOK7wNrj6NwvybsCl/nay+8rbL9IE+GyM5aX75UlyifV4frXfqzfJEXg5RE5wvNFTeNec/7G0VUtEK1xjoHoGWFI+LjCXqAVVM1+PeaCsUEFwYW6c7GRnaICNBrcTzzJS/NFELLjaE8ZhfLG/MmB8ik+pE0fO+UHUCp171ZdS1bN4FO7DebWAUdbRwnUBMFf0/bIJ9vijyApPUrA/sJOC1fSfTpEDzj6wciq/vDWxrg601pL59fwXG6gAGxDhyXK1iW9S/lhIu09NPY/WuBBcm0L09MVyFc7QholfC04JrXuUc74+siGgRIX+z1oHr5mo3zO0bKgw4Zej3MSIH4gh7mHtO6h3V4YYu7wZH1BopXcrTL/vuh4bs1cb12sJK1Lu1jm7jMzGcDbVqtM8JkYIzlHMkWNbDj9eFfQ0PQK1wuaRfE57fXKrTgCkFYshib4DjWuYvLAnQajPeOpGyoIQ/kyn5srrJRWC4cwg6MZGegnbaACJksiSVYwVw5NbaVtlBBCXHuCS0/631NLc+iy3S3Uxl2A1lQW2zedKR4E16jevwFXcuxAN7Wsr+C+Qvqhg7IA2h3tA6jdBhLzH3SdSFJd1p9WiwFrIkC9ZYdtbrGUyYLxKUoiQTlFPnACopfufyUppZEZfYnyWn+Z4Fm3WHGrQliB+oGD+Sxw6LWjE4toMgXoJQId007UBULMSwdGHFNhAyOhSWmGaTe0NVmOon7AG+y2iHyK+3jKkLJL9LLIqx/iFdUD9rLPKWI2Ove0m9LtIFDPBuNch9WOrlObnwRdMCv3a6HdlCYNW/dy1HXGWNzT6LMG7pvsAMmJES+PjwoJifV6z4PJHe0CyhT/tv72KNAW6JcOUGWMSrnVqCrjKuwZmFYN/uYzSQB77xUc7ir1thC20V5YwOxutqKaL9ysm49ydCI9gdBl1+6FiXL60lJ2FlFFfVhYqN05iXdRgpDL8Mh9vDr1poYXhp9tSDAvH6ZSZJstBXkmCzcWAsW6DkN7ZjlAPyKZq0lRJYXwzsVbpXfvr1bsUFWzdgjMtC2zY0Mnrw2OVfbTvPeCri0o2oZZDLZOtQFZVqeKklY4fNy9ZqctMo9HP8bCNXV5WSRa4OtFcskZmjQIZLqzEL1dRmlKtReBKwJOzgTim2axdva2UEntbqE7o6rVv48h3nJdq25QV2qerka76lgRYcI3m7XxAdmkREZqOOVfB1QuA7+EvTbUT6e6fkuisNNZ/TkXnA1nwRrxE7TG96reZtxdu3TeNsVjKtfNqMmCWxj2a6OaKhk951G70YSRd54VbnmrOayfg9n6d/RulHiMWmeIo/o+tl43gqsmrGyiXGlK0BfpZ/YHajQ4tmKYlBFcnKpIsltxNdxQhnJiBKNhIj9kGSfLpuoada05AZZnnqKxoL2lehZQ/e6MOp3yb+fEZcuDj1/EDPFQrueUxoqVg1t1EJccQ11mEzLZYYos5idLVJYGrUE5nmu5Lo2yq/4s/VRYBDP845g6zQXxi8PiI+15/MsJ+aavJ7XuQO/BaaEAJA044se6SA4x91p7v9VYNWNwUT0+fnagB+qW+TIbB5cgWyVFmDvUJA2F6ifyfJP9xCmZL7CKWqK6PKicwbVmcxloDLyOeLO4BsjvN2zN6GhtHLEKdsebw+bwC6wvmrNCabptAtYJYlPJTLsDCkOVKfl1cRFw7ZWZNk6NdjroikjFFLOzghylBMCx0PsxsbJMPtwaVzc4dMdcr5hN0oBoRrw+2vn7UXVglBqJggTorq0U7QkwyKngaZC9ulm2GVF85E4cLdp35T/q92gie0QBQ8DdIAO+Yw5MpruUtdws+3vb3qLJTHUnkTlfB/Kh/56NeK4FPlIhhljh08+VXn+PpBw47C2c6v4uFmbJ8WPJO/XpTBl5WFaG3EQ6Jpqcp1PXl0Jb3vLSg/zy1zi2uJWZOXH5RJozhUSpWKdmEHFCFxYe7qIw/c3ku4jELUBVYxA1og7TXzLtwIEnuwS9PDYXrvmWyPo0M4M5sfJErCdjwqqIRw/rqDnVdjMW2pxOkESH8cKUFc5YRYgbvuyBFpTHs0ptdLR2TfIOfRkQNhfaCoK7DRzWq7QeH3RA8vzYCaAUq994nu/F5QVrJ1myHVFX0Ow/VwZ7hR5l/g304ZjgVaVZyJS0nV5YUonT5RA1OWJ5AesoT3ktNEmSHXjpr4xt9MOogBDOiZcWvNDQyWytCI5jj1F3VpnWtcF475x1QVAoeTDtDP+6YiaNE7YFnTUe/25I3DHKxX8iQV5pZQph6X9x34qG8T4Mtx2ngPT2oCvyjmGGFO3FIykl6O50zh3Wn/NFMnRLg/4cnAZzy401Qle/du27/5OQ6sP8rPOnin9QXwfQP4Hpv2MYoUNZdC9ALW0QW1CbKWAmmxsx1AnCBxd5ZOx4HDTUDkscds0Z5AXb7tO69bNyM/1midhF6dC27ESGDhMENtC28QZBFEL1WPlMEBvpqnVNkOetIeQoosiqWgaFBhbZqJG25Vjoc36GN/yYwIfr7xljRgmsOFcu8WCXhdfTyTwFgIzOIPPb8cRscfOt548DU/900TAhWq+wwIweE3Q2zVzD+AKL6mHcY/CJyzvgLRwqLTxXqtDXaG1npwPZ9PepZyOtnemRr7l85j8hJOoCevAs7WG69hoVnEit+zSm55iHjjzgQIIusWLRLTgkN/D/eZiwOXLDuwJkNBrq90TVioDTLJyG3Pok4pA5F7b1E1TdOiWw7NhipNFt5oRBhKP1yh5l1U6Qrxe2MZyiwXzcF8IDK1VbSEj+1VFWF3OOQclylZTE3xU/yVnIhHTOkqs5FtbQaqGrueWe8HVxVm0w471NPtpSEUwUqFLqMI6WbRpkJQQbFOSbyR/lgWJl/j0nonqFZPr5iqUYDodKhdJXfx86ASFyNM7+3DpRpeyU3TknbUCtAmI1qDD3m5Ec2JmuYHUoVx4DDYmXqRWAK5chz9kSpZHugidWUIXMyv1ROnvC3MSCHf2cb9NCSQO+rcqBbLoGP6HB6KcpP6gzauPoxWOC1+LiG3Xl2N9KXWaBNz6hettGyVApFDcNOF+dtjl0wjK1HdbenQ1/DgJDi4S9+P5CqzgyFJtu5W3nMhL7Sf1QByNk2yJKW14h37po8wY86yOq8lpHpYgecSUL00oZ8w/u0bwKHeYDn6mWebJkhIte/EmyAvUyTFxpUpWKdWZUHqWOnCYUlyZJV5u5jDBLPqGsb/ZKTaoWsgNF3Xsru4A5eRBmwwkSBv2KGUXFOlA6o7KmRD1QeRQTWWCo/G3Ab6LvuDC2+TkRLbvVTQ7A8FGh1V6xvhRSJSGyq1a8cEX4knn32rCmy9vb0IC2VBabcbliolI/7gv/luspNplBwisv9gUpT9x6BasBKxiy9yf1jlgt3iwd+gIb7pAh+C1yrSfXAvvmOp9wyDGtl2WvB49CiFzYYRcDaNWExL+FNnhOqG93D1+REHjQIWL96mdV7NCgNPB+xtuqD75q4aFHc7QKExALAbkvfV8BaIwFnrwMaSSo870nkaGXlxDKW6BIMokM2xjxr6lgZd3npb4Vxg5ar6aZMqmt+Jm7LI4B+apyjmpLHogpFa3OXyXMBiL8XFbisHdA7DrlYAPm0zNehxhe+CN6s0ErGP5ext69e1IqcDz77bOqoHwP468hlll0MrcfAj6REdvNdYHtxxahcSF98QXuTNp7L2ZsoE1x+poRBfr6zJUTeg2p+Tqe1LCNWQj5BYDXRGEYsiTQAjjCXuMKc+rnNRsrZJcL/NK6AU2jqyaD+4/LsliwZjl5TVqM5iDJiMZE9VBG4MUI++ZcHrlbhuChw65neuRFJC072uzcinSjB0Yoj74lIN0ghtqdDCl3+xZOvw2DxOEfwwEW80csTEnIJOF1DoRWLCVyVaIyhf25xu6QcRnDp4cZPH6QjBuKitrFRHn78Mv1u29nL5RYg9zXcX0NajWdod7LZSNow+14wJmpvU2AuexJjrUfp6XNA8PuYX/PBn/RH9AIo7p3pmLvuIbkED4abolLM/ELK03iTD7nH4+zx0vAXLyIjGuvqPlMMluaPngdu06tI7as4V1PxZagkGRSN3E/tNPXOn/YFeCNRqaxcQP/0AVKY4x1/huyghMiAs2FbaGE6iCoAGWzV/4+7DLy/agcxkjK4xMTe2X2IB6Q39/anGkBRu/XCDLJon5KDBqk3e0URxm5kE4t6RjCFK50/xUASu3EP/1cfTI0qzYmC22Lxh4oWOrvF0MkKBcmTBPbTEl5r6kluCPSI7qWtXOuK61EGwrj85qj0rdggmWVzHG3LsdJlil2BLHgsJSIVx8xXhTacwHJ6e4o/ApL7pYpsZwUuO909ZHPBMMyTKGsHUkh/pjZ+kZFR0cXC8iu3X1xZLu4caQyFKwPhcKVnfaIYot+WR2CH+6rdwWCEOYxuguZEN/9XtUKgKcPHFwucBgDKFPYU19HntSnZwAaL8Z7IQzHB3z05idGFhN6nJsdNULIUDzLPVMSzPrih2HIFfcK1A469Vkv5uadeYk8WYwYXEo9pf6CF/a5HicJ47PIQsqoXnuF4CK3pClRYIir2CbT6jaNRuwfvDHRei01WQc9XT+PXKM44bgK0z5W2t5MiGxc7cJRZ6oCEdn7g7BsOhLoRcuOR+485Jit/QbSqxmrJNokD+Iw4ld1LS0Rvi28bNz1Zei+g0wigQX26elR2MYfjkP/QwE1zzIcz7UQ5JZRU7U/zCYlaTdgm+KFMTxb4rxT0Gt0kSjSQlp0+Awqbw2tSd5dVG1skq1K0+fgOW0+zU3SVBZgmkQiK3vp7QvgIoveH2TadP+to1Xn/2PzkVJVhfXoc9CG93Js+GKtN6AIR8NDOZAubP+B/X270RhlppBEuP9fHGmspJ9zoG9+91+Lf14+1NekszL37bwkGvf09ZuQlgEwX/M/4jMSAwqf9uSYuCXxLp0x/fyvQdzmjk2nrkxT236Y0sVVagRzEekj0Df7eeeiEMfUaqQEU3W1OLgBSlMp4korO5eALqfvgAXAPI8YR9ZUBoFX/FgkY4zgqKVvegzhM62hYfOmm0TZ5udIWBcFtkiabq8GyMGdWgLB805Ezg/AnHm+8dCjJv3MF9VIdY2ggcv5Px9qWyJC1+uOgsTPBs614CLnjvYamaQC4AJqmoZqKgoCfPL1GkpsDM046uos4AgKhjggnAvX7mQ5PNrbfw5QO9dbLi7WKRxFTCWcwNIlyMLoFTVuvwrm4cOBPhFVJ67g3A21fwYRlbId6YwVTIw9vGw8AiJ3dxVOCWVtpiYVQP1+27kyTo4GzMVmLJm9fdxvrlV2YDuPpGfYuqTQCDTQfvxGi033l8aFE9Pi4yqBPSckbhYGoOaxvnsgBupBSc/VaQib1KzRiuhZ6XvEIdFaJlWu8Eoz8dRyv6u/fHwSdm09bdrjyoUTYGRRr1LGLwj1uYTMeBpwf3UxTJ/qAY7KAzpbipEv4Cy/KqHKrNvxRdFe80HzF9DE3DGDfc4bRLGS9rYx7SUwHcnQ/YsAh9ev9iBjQzi3PDdVK/w4U2AnTC6Y9OqoYHCBhSK/Y3uQOp5e1baS6Cf/Dh4wpNHLU1SSbHUg/cXpF4KyE3pl3Lc5VYH7wu96WV9Z1QUuci5PB/EizFgg8INVkb76iozQO9vmBJHYjQyclGDQrPzsjDRfHiewCj6Gu+sZpUCMwlE5zr/OgQfAJ4MQS9kQvr/hjDcQ6ONCV+JBvuw0Mar70k9pk7bPWis1ouKiorKTqgMqA4jk6x4S1HCHNPG88lQK90Rb/sSR7Eur4wyig/H22kIEmaxD7ibkDEpbAFP1oBr/4VtCziq1sJzMEDdwYDpOxcKKFI+5E0Itc37Djg4kQkFzHV5VNm/gMG1M27TFiOupY5w9Iz19lspNEQYqjBQqECIV5j+whABtnHQtTN88xHCIhwxASHvSZThtrQGkugoEFVHRNmKRDXHQSrMPnh7t03+o9hT37WZ6x9Ke6EDYWENfTKUDIs3DiC1XeB3fjnrn9VPYruSu0/3sWf9TJqnSDFFDCTZRZEoUk45jRTcW/IGlSuKEUHUMmYMyiIgyRyPW+CDke7yVWLlM+JtU4MQUwUVywq4rusQJsHbPlztrJ3drAFA+BYSDjwrdL5AiJLLsxlGQRUMY9MIo2ZA023X+fnejWCWx7ueAoRQtQwVBUDii2m+cQbmi0oL/9u/J+kAfg2B+8n5dDUykMhyJW6QjgnSMV4axFFNp+PHF2lGvJdpINRNBHOnxOP8YgxSOjYBqBjVxpOd0g92oaAkWhEmyqvVTqSp+nGX9w2Mr3K4h3+McRnAgNjNKf/Fp2j4fSCU9r71mlH0oTxSf7ZkcS+SxlNROqqtlXITU9CVMT9Viv+eC+X4/N2roD+bRpfSxKwIae1yLCbQRMDVaguuSe+zmS5p7v2k8LhBFjmOVQSU4SrIG8MAsFUgIEnxaVKpbWNNZR/ppFT+zDYMzgZGHTJLaYgijTMWvJF1OIndb+VkzNxhA2JeKbL4j9oGJ8Vi6l5c3hfJylQRA4hMlXXRQ1cGBxMUgK8FZSMBTUXI8qomTttBFqDVdCgjX7hpXeCYf2ntQ2qntFN2cUHLaoDjpODkqtOZY5uaJGAGMVuQBlB4aIKQmrrYCEmYj9upNAuQgWIajhmx2KhJkqULXI3WV6m+iscevc2+mNIHUb1GpbCs6H82gPSEb7Gg//nJx9jldZ56yjyMsUj8ZtcY4T2/jn9ofd+iDM1dxu+KrfmRjWVJmMICXatEp8KQrv9AAcqWzScf3mLCauWqAJgAditfCUJWKxJGw6NbipxpylGguuBJq1H8p1YUgFKwV8fBzywK+VFJqcrmbLUaBMvC3zkw4K+it1JkeTAY1fsRG9MQpZ5W9LKL3BmlGkYzBMN9Vwgdc9MD59o7I9T3RWhwC8VqSJePgzlRcKcOhYEv3yWQrpRTU3V39ns/ybnEoAYvSdXSk9Q6Rfpj/UndIpKgRGT+cRCt5yD4VTdI0CEU3RFj9KlbSQ+w2kDwpBRF/lis35tgjWGCC5NBgTPlLW2Rq5XWxPb+/oRfdoW1eXBqdhqzF+ywIsPTVCHDqgZv/+vI8CQIVgYtAt8r3jFCcR/jCiM9YMGEMeRlhD9maOXT8B60IK7x4COOMlev3a1xHQmNPstaHnsEwUhV54kx4UDw9GiK3F3k+Cg2y2KTygPWMLFKrWHOKymyxCcM82t7a4YMGQYr/9UY1pKbNDqzzayH9DkUupf6tnVZMrVWgBtWiXzqA8D5zHx9ObYwjcz+FNb4BqAyMssFmICcSN+LpmkcxFxBsiHa3aBF6jYSSUwYOxKNLBgsu+dQdbRL4mkD4jZYh5WGkUAqmofdKKH2rFbCRqHwJRxW+oPonTPVpz7xZSUyOhCuUIebA/H0QLU/BruSoVYnDHtOd/gfzB2mBK2IIFJM2Cf/rcB8fzISNfQqpWygSoFa4UuPfz4kmjzn7YVF0hyGD/FAXjtoo0JvwiAhIlyxPMPxnFif9YcIW/Pd+NKtIytXFMY0GadJm3QzGMaYVIOyK2/Z7C4rRF9eincYHzku6yKwjQozZrN0S07Kx5RW5kF0cOJs2paquyTnY3Pwk03l2Q/BrajBX2FVKJWIU9Ba+2BJlgt/4FFBL5COjf3iwvi3g3+vztJ95En1sqKL28xBcj99bAk/pX+t/lwwhwkjgNSDHXcx3UIY9zDWppsqwSncDhqBCBnUtjadNawQ4F1ZF8f6MkW9pqcKX1H0h6vfGuQFdeFAXm0sHIkuTl5vHGSbcYW6VkN+HLLLkuQQH4DAJ0yRI1EcZiltr09oKLqVc4PruKmKpWlIaf8t95kafJUEUe8hHUnL/w4WFNjZ6JtR0Gt9FPTvq7qRPZXVvvWW7IHLgR3Y5CH/RL+ZHSosYkeB6IwsfknKXT/zi+mxYWJ4FzzFScvcwx5iDNic7jehUCDoz3GEcp30NBZ6Gd1tTUrh2P1GERY7gYDSznHMUOVai3KgSFbhfSEu1vWakAE+vDJ+WA2DDnTaWkfF+FgicW+yDW4sYjTGhtQbprSnzuluiFUU2/HJh2WAvatAEuj2pXL2Ib1by346he2A4zS3AnBysu572SHl7dy0ZTa9WYWuKHS8/M4oFigyxImdh+PiyD7RORo/b9rgSPLnalTz7pi2DHL9FJSF+WFEjJnnGcW8bqf3WBJFSGVqFb/qLKPUyKwVmyV97VUtaVVfXy5AlFUzdugQDVGYZdT6G19uGNtjfaPZeoOPSKhZv+Qbp30kZ0tUrhAOiBXzxiBNWjeqmjqd7C8SgSzbftH9JhahCpRMX8UnaA0QN3K2+EB02hqi4GrmBj95HHgjmFzvzk7Ta4kRHDE33IwhAYHumnODRckFA5KLPnfST3T4husXNsAx8DpRp1BoojUWW3xgF3KxMeyz6y7A6Ld8Si60CCEjxtqyGLd3GKFPTI1bWS4Eq2KBIkWAbW9xNJ9pmSweiCIOSRIdblQdM+CRVfpgUWZ9fSSTWxaz4iQD7k1SfTF1ShPCQPlip676ztlxW2x0JKhhOlM8PVlizGVGa4JZe1A5juikJBADd+bxQrZeZpVYJkZOtEPQXdF5rLUVmTzPR9oEFWibSZaYjLRdA08R5SOSCZ7T515Vx7XsYjw6r4hwmSyjNARrU6CwSbyUyzL2jVfmqsMUHeaKEe58XC1klGR9FI0YF9SnkhQdHQ6PDYe3TMT10pA9EYI0pRTaU1UmwJwrF9gpH5PkAzPFyQX65/woCbEjsegh1tQBzZEzE6JkGdJQn646fb0kj4gX70CxWOIShFT76rBOcVz06yYWVV1GzmxHg6wAJhZm03oREjenZd/Ll79BnzgXPFMXfOpBEWXWkdLWQ5ay9cDSpOlpsy4MLKIix1MW+LA69Ao71AIf5rxOFMYGc8SRTDW1XzoueVBNmIgJr1rPKId5cvfGyXffL6bZhWfzR6n+sPgmYG24rUFt4cqq+id9ra4Ua4FGsfIrE18eLgZxZLmXYLon/q10+WTEnWM/ViPJOp3+BunSO/HVY+jNf9/IzeHDUqiMdDKR/zPETiHHVWlvcy0S8C9NMn3KYytCZ+QYopeJyMey+raUlFaOgBsFdcAsiHSR+sPaQuiO57evG1WC4hwGfVamffd+zF/hMQDbkB75G3Y/3YTr8CnFCrL64NuCjaEgjiUsoFLf+MnyM0DRJoZmPk9WChOiWefI4oeN1Ib8DoN5deIyMAUCvtjB42xHexdlfAKOMGtrf8UtZfP7r2ZDRFGZVbLijGYiewWZsnBWJix9glByx20Nx7Q70qbgz4NotfvAsj9yCxofWJyQ3yN5fVsF9up0qTAwejKzMs8ncJCRxTUuttN2oBXikv3lsIDLcum0vB6zQql6sCldYccNwylowZ0FTrpSEu6HKrdfwuwNrh3UympsFsBoi0YFd4VaQNa2MVAUtAYa272uE8K05fDx+f6taI1MOvdtj01L2bGxlk6fxOuI++tJxh7YBWIEHF/T6P598p48LftcMe7r+9MEGyKwFoZzf+JiDy07g4EHkEyP82omiuXtYtJwzjyOzc7NxaND7/qpmTpHhhfTsJJime9vYSGnR52hfLKOhMtKvpursmG6TVxBg2IbWSBOymC51mocJUbjCVOZelHEJmSKxC1mHSflbmBkXehNHjtK56IMm96rGyx07NNX20mwnhhOwDxuhn7FK0RDqOYwpud3BLchpp47MArD4themlg3SGDhW7hnyk61mix0ztfCxAN2MUyA1XBpIMPA1QQy9WoTYiS0dQK06x47uBzouaJiQnyQJcEzf5ofXFZXVgbVXtAA5x4uoVOeu9R6MKuLi4B2jcQ4cHyVWmIDfSl31RaJi/GX2DdvhT8dsYNidUlIhiggPYGVUti665aIRaI0D2hizLJm6UAI/zBBHKUS4qIONOD/ZZksU2GUhsWD+Ivp28nUXRqC4vLgJyODOwe8GeChYaE8d4hsBnFhJLYBtCy4mgDbwKXQk7DVBChGD4Tfv0BjHH2gx92vAry/9pBcjhyF+FGw3DtYI1QhLiXdoanQdqbUqGZ+nebtNSdm8hPQUHnO3Z+mKCxcLuiaDykhPqhVX59joYN3DI1lWtk1JWsZXYuha0ttcAat/BZQk8vcj4Elcdh9XFRoIw33Ai0JUx2q/IKdP036FpJ+VdcNfzPFlMtuLlOCr/BWOyL9W4CV6ZRAYax6wRMPJxPt2nJyAcreDsZMSGl7ljhsw1U2nLKrn67Khj7gKY48OlQaJTrYQDQQY6bys6U2SItXoz0iHPhnx9/ojbdcmCt+hs/TkteoLWbqmbBEMtZGxEBdQmwTeVb5bovyHqW7Xqa7IQs7aciWm0+70XF9RMPYw+lStmtDCxoHhAEndgZoBay/qEqUNRa6spBUJaeMvOLURkaoIEE7CFPcKH5Na5zrWdLA6oIQBLkjtgzvlSZqcK96m2VbeLSjS4l2t7Ys5lJ7RZHzhVc9vGMr+M75S6qIlNW/5YUsH+T0z/4hGB1JgR2cjOI8zGdoy0UCtWjpeQSaNyha/Xzlt4GH9cLIJS3rPphT9ugMtg2FHGDROHkdoBCf4LzC/rKygIMju9qnLLibp4PSZ3qdgu6eeub+2pmXl0jGYmrKWYhrpxdpnsKHdtk7WJA76dcnXeYVka6zNGFClrmin7BDbqAJmK1jC9YQL7IIArrGsxxXBjMLE7CSwZq6ztX7sWb8/PYpxXpAub3NuX8is5jbvUhtGC6AzNQc5jlVMJBWeGHT98n6A76sP+Ut9ZtTOCZ/xTAdc1FcA3ZQ3ETImo6l+JqFBA+WecFKE2bWbh/3m5TKsD+5M3l/o42gvzs4qPB74MPGRrGGUCJDnbQ1iBwTgd+IswjQ2of9v4fASTNoM+S2FkQNPDuOFof5EPw1/r/Vmt/CtwOGFkyCIRXB7ZAEY/mzgHBr/sYxJ9d0KM/npG7OCmsZNMkPcA96VBzK/nb6UovVwxURACR9VrqgC3XcsvnU5uIuNlWUk8E37KqJMbs1IHldLzSuKNztMLIvnW54kJ0oXOBe4I0e2RIJDLFmUbfqcOn5SdVdWjC7W9ucphMgMgCdaa/9k5DB1FN8+uFTaM2vCZkL5yMElBaFfTX16okhqe+mHEhfnIb8yCeACxjOgSTPBJQZv2E+iLf67VuKluspMHJFCabsUB4nsUQCwbJULlriG6oH/LhDivR05ELFE5LB5obkYpSGbh31wnpdOFpT0nJsIucjD2davUZb8xk7GJN32L9vAkXSoJVh/IO1dxCpzMa3UukaEuOhTkxaKqAu+VeVQylFxdKji8nJ8Zm04rgCDSbIhaYu5vURoCalcCmQvHMHyAnYXRPWgUtXGPUs7zQlZWnthegw0IhCKE7YjCRUAUxd8rh3n+8rB8RJUgSKyxQsycsYDBH2K93oEU1Hi+t9+7J0yCKtWngwxn2m/sYDTXTY8fwadlA6eFKPBKFAhWqH3RV96LqFVCK8BMSC5zDk6rPruph1sB7/Kp431qiYXExx8D8wNZeLaA9lezFPbMNJ3ZhfIE56fF8t+4Mw0Na4G8elQ4fS6NKE9kSwquJEhJGY6Qy3f8PobLgzkk/T3S9Y62zwRqsvcSllkEqivMic30YtZCcmf4Ry5XaEL4sq3Et7Fa8SpYr3/kxf/3MYwLKfmzQohNZZJOi0G2x70ar9M8qR01aFAqvR8E6wssFVgVZxEaEOSx6X3IHtxhPxOjdhJHJ1Nt1tntK6etYnJ4cZdVS8/uWz91aR/O09xbdJuNsUPGFqNHo5LGPIksXZ78ajIc9abEdiUtWmE8GNAWr8FjAa8tRYluIpTCpFvE2YSkkfnLRsrelVy4Wrg21JvAw48x0LMK6WoqhhbS9TxReGZnUGtXZodhIejkRhFQ+sl6FxTGiQmM+AAL5mrdMC5U2+HW6VLFs8TJYxjlp6EHNfOEjEsO3lF74HYNslkoCOW7U1wEtvYQFT8De2X2CXVg6hskwyLHeZJuHH29Y4eijc7Sbr+brweJV6FvaaJssSW8J6e1i/KLkltE+bstHR4/cMOhwM+AbABTtwosSduxRmLdCk2wdeW3MyFF8vIaLiBiNtVbCSs8RV0nkpTSyvFUJH12s097i5fZugYpiF55qX0tIO47n0st3UmS5nFeCLW64WCo+3mgS/fWZSXRLuDTsP52Uqbm28pQGlRGDcjaThbju1NyyjoESMU+lYy6dhKicPkyCli7ww77Ocu9umBzj2Em0j5wQpFI5GgpcKTLFbHzq64L15TCYYta6moujlEuLVSIYpwzEoeVgPBJoauNSQTskTh6Q4nok33hvsDpdwwOkoosNV4sG1SId4covWSSJUKVkjwMOrdAmUGY3DK5jkQNd/7xFNWxOjhoNRRp6UM28UV3NW5J/NjSH+bBtAXcg7q2zZnk0dVZu4SJSs5QFyb4ZRXbIWV8wdjFcjlut1Pz5jM957d8k2XSH85jhe+IBYtDq26xWYjsKbJa3iN6PgPgW4Tj00iHdYeF/FJNyYKFnLE7VC/5Phx+1TyOIBk7hzNq1x/GRrEO2J6/PQHNLyMCiPEIcHQXkDoTIQ7XAyietOX623AKZJEHoMFB1ew5fmdkykb+srB5p/A2sQFKxf3EjMiXl6I8trxhW+4T1FTACPJTSKzntIV5L9NWHwgj3romlS9GQeBKxnt/aHBCia+N+2/fh2o2hHOI5v/JDXU4pkt0AIqdwZhJ4ZGQ6V0jXJQ8LNyeJiRTFvfg5NUwWdPEDhY7pinnUWIiI7svdzaKs2BHcEvZMcOEKV7Zb38itO5gjSqEjiuILrYCmfrAm4EOgsfESlp03bUT/7qnljHmOuCDHRrQeylUQRf/U4S5c+dI9/+Rh9AFA5igS/ckKtauLmJaLcneU7P/l0OntGtpHVmkYqeiA9b0TGmSa3AsXLKe3jbZ+2MAw949i8iOLbrylRDQoqwjuEgvFA2GooxFSfgjj6rq/tBZvMNsOsEakHZVwH+jJHS0J02mLaqkyYo+loiGEBs4IbOl/NjO2ipGKqqNlReXYoVLWPMa/ZDVw1F6NSsAbHTE2guQhdLF4xcp6YdcoWdOJJjt41Xt8WRu4eKTAArRiusHGUY6OcdKiyl+pLh7NZbuovMjqESxPpRoxNZ6ntjDDn6g8Ul0VWjHwiOuUbIRcINSbxwJDa5qRNiEmrkMs2ys1gYLEw0Ene+VLI9CxGNIj5SraMSuHyZHdy0BL3nOzX2wsFZddQjAIqNtwa2oE4mlFvNjmI9LghQUiDf9DC4MsmK6OrfJ/IYuME5yUGCHEqLo3gtumHftUryruuInXnosZmDY/lQ+AOeJ/p+5Sr+SHlkkPeKymNqOcwvRxVepdX3OHhr9JJ6nfwRRHkd3MMDdhBBHaPe6c5qIkXV0Fsore/IJngYtFfBkr81qLpP6KE3LsWqY/OQVTdcSVL1E0lYd/T58+2N6hLXV5SzD4fFVBk52EhZkTBgq1IpT+McWb+yzx7E6+CHUZle3Id25pOGEqvKEYaZfO48vDYUh3UzUKqooNQ0MFs6XN/Sfl28CeunTYTi1v/Hq3+INgXWWNK16tJznWEfC73nFCK1bp9mylyok/cP7w/QJIXPQI35M6ziL7ABtYAAnPVhLcZqHUGwPF23gShIxiwt/ht3w3N7Kp/+HTC4UnDDkU4p/ZKtwLExP16LQrTcZFCr1fTYu8LqeUv6hk77OeN0E0LOqurrvFbKjZ56OL1D2IfvKkxnMgneo2vdiafbFktKFmv61FH1/mHj1Bx1App121fDblkluNMBGG1fRaO53ZoOsWkrj4Av9q8TjQsj98uvnf9BUCqoeHunWsNScySB/qNf+EdX5y8qdjwVY3vhQIlP6tInnCIHUha2NQfIK/zDiGcmD5UWNpig4q5+o4o4eN4rrczwpuCmLJxRRptin0AKfDsjhbZm+eGMrQ6lxxa4vk6TkD1bHBsSTFlffAzntdaM7w8CJ1+y7Een7EOisIVWrpmw+m8NKFV0wSeMjKkwVN5vbzfQg554FZLEqOYUZJXWo39qRMOLE8YxXm4MeiI0UCuC7KbXlMUmIN4fe4t8UguCrfkHt5X2SAbtKZaU0VVVJ2Zzkxvrjdf3YE/WEXH1sBTf6C9J1hxCyJEw/Qk2sTAMj5ZLhBSgnPzHZIh/Nv2eEmncoF5F4JNom8CT8N/4hT4cDwzDGXw3UxnoW88aHgvqhle1ZkP/97kl3Q6jm6iz8eHGOfMxKccNu5N08vRdofjJ+rTdei+TUUZtH22w9APAw8yGuNkjj3Vo4eN6G5nCLngQjezcogkhq/8WJNXPSBue4WQyddA+GZiCpjo55vMdYpS+tkyKSJG507mkXrW6uCIM8Pe30IIt6PcVNhAYeERVs0MdJECr6GcpEXbU4RMeVMdFVQW3pNOvP3e5iRAccsHVN5deZ6OziS8cNNa9qlrFo717ev3jeZ3i7UcHybLiFr+YK3RIBPQlDEWk+HBckYJF9z/meo+kuyV90J06QqHW9fb2PaB9HOclDpdFOn084UNZm3W2bbtMyJ+8ynsgZFR/k5GpYv/P5hl/1dWDR0ThvgESCIGRBwBSc4/yqB34S1t96Wfceo+95FFY7YcpBOEGIf0CjpIJIV9NUYqCCR+IVqXDiJDW4QnnpdWI7RfWvZkefDTDjZhCCS1YGx8kjVRq1SzVjj96bT/Nt8CYJUMn+aNy4yd4cuFU4rrpyzHtJLk4FuCjU/shlC+h0B9a9o0NT/qIod5GKqEeIYk2KL6u0UHLvywu2MHjC0aMko5Vprdw67KDd6ifSk5fns77dNEEUXyG8RD1RnL1Oy2QBa3rJrkvIZi1RV2ErAxILCWBHnq6pVtCPxQCG6qagI+x4ArLPQQPoCV35uT+uWi2lvrYKRccIMCi605O52SAHfgm4bn0yDSA23pO1xiVsneK9+xd9yz9+TDzVtEeSkUUISt41PwJfyo77QUS+lZ3iQ21+2p40m3RiKe609bFQ2OCO6v0Ej6dxkjQ6KtwcpNkGo3aSo6/j0ztI3jBUcYPhzNmPh5z3iDc0U3qS6C3r23HzCUCbYFSxeBAWqb3qAxvKDo3cYo8vt5DaZUWKg3VcDlZgPcHj/d/jZaXTtR0TwqhkpRBTvsqxeslpea9zNSQeZ1iio3gZ1XCXTe6bTbX7u+RZ7OsDXYX0a6E8JEN/zVTvCTg5gLXZpiDZg7TvD7mip2eaI0JcOF9ASmSR5SURGO1xTGybC/TContYSu0PHF+mrXIqNWVFW6td4occ5uJJ0/qk6n30b9hRknjZni5aHqw8U0UDRDebIARkXNURcwMgjz37wjwJBfu52XpzqUBWdoBdfP5xR3NDDfuf5CtKlsCAr9w53A0bkzx4RAlRtYl4xgB6cUwMUjTwimoIflHUbiZ7ZOdpXs77omxuNMRe8+MYOy9M3xeAbAeQiffFDLyo+daL6v7MjjfuDmFhMgsCdvM3UbmgZcUc9suIcEtsbyEk9v65ssEwPCw8BbNDzjkaA0g49bU13OptYyqRAsFqtFV+ow5WzmuJv54ZVTeN1UQkkYJ+nG8lfkd+pm3ffbYHRZ2/Tx3WIzaHc315dfQ7j3lY9VAhnt3gl5/KElzOzZ7sLVtR8vfnf9bdrfpbT4CT/VVztLXWv1oE/xc9pUVf1Y0n0IRYiqywzryBjjJuivg0KAtn4479MX/zWDh1qsrA03zuP55KbHN54tH5cpUXKmYIvFJVblSBfXYTnda8WtY/tvb8Mc/CimrWHvdBn8ZPufV/OYF6y7PFY350Bes1rvtAGDEnjZq85maoXaQGA2NYjVww1ZliJ+mVqUiYgvSUZD4KOYdm/FtHNw6+Ix/wwooRS9Kjwa3eNd+SEVyaTwsum+m18QjdNWTb9vgif9GszjbfJHa9N9qkLaCe/QKxZH6fBpBx9ABn0H4Rr0wnRJUDpJKJJV5Fk7D6MsXv/Ag+CpZgxZ2Wo3qRyOO0tldwww4HJsEl9gMdYCm0ZmmkVGlRGlde7IylHcxYHATju8JaJGnifPbp/9NA6XRbgQz8r6AC6bW7WXbd1H0Vt/VycgoJHf329kO9v3otv3ORtyr5+Es8HiO0igoFBjnyPOhSuJiVU1vPCn8D+x47Ww2hm9vCrG6ur4QXIOFxp5l0H1hV66i0avZDLLQzFv2Ea473Q6GuQZ+C02NKVBPDTQ9mWetoI/b8IPoyHKH+l9h/L6U7bwEzyADJ6gnrLM82K1JCLFuBb8iqzBejoBWZ5fN4EA5e5qURPR+IZ7R7rY8PnepkuyRLhR2eHPMxrNvWL8+9FAMCu2aKE0jqHW0oMNC7r+5KLxYIH2GoJf7aU3dYMe50GPXAk+6gEdTD+hYy3y29rh7oKof/AlafxduxdEHm1nCXNQw/VUxj4CDjBoh0zlBZdzo2t69bAxLmWrbXSoRkQxZyAq4i0x6MSjHled+7/G2bn1PC10jU7S4LL+Jt3NrpGOZCF3dtKlnsSqxD4JE/ZVx73IO0ggdvY5zfUgcyNVObE6rmPlbnO8aVXgDx6NLvfWRi/x4uZVe0pKueSBLHedjNxHg/uffEQb1pzxxjEQgiMyaGpldzGu2j7VYQfueTAb3i10Qol+HCswNMfgCTpBwp7rF8IKr9F5DQ7eMaS7p0VFdsMAT0BvHYOil33xhiH2UgAVRyjXP4JPuhYfaQ7iRhsheuy0o4xczt7bOeEhk4ckqqMKBA0JrGJhNSYo1Xp+Z15kY2MMNCSwijHGgFUWHBQGrGKMMUIgKattbcnbCrxbBbxbBbxHBLwLQlxxkgXtfZNrm8jj78eXw/EYMXeENkuyheeiLO+GYXyVwH1xYIXCCqTGL//3bhPGATsGYP0ZES+GWLTQe/VBdJZgOMMPZ/AcVwznjWdhaXvB01Vw0x52Pyzzx2EcuYSUmjjCfWkmX7UyRvtNeE7KJL1+Fmn6B3rsGk8n15ClllgLnHUiTMMA43KoSFJCTHApe9uD7sH8xfUkvkItMaf26gkum8c63H+t++sc09vnTjo0lFUsa2o27fYGN8quo0Iu5AQvtOolOckxi8KoWlzB6xcV48f3jYxGp7TiFZKu864z4CLH1AfJDTQRR8W2Ot/XmDMvUFT3bTUhzxkNjTUUVofb0wbcME/nXiP5bFPmgQRmjRNVpF0c7hEiNfgHhSEHDfrfjnSM2tpIGGV+hnCYvGJr12VEQ6npYdGFloy1MUHOqnRC6B74rBS2l+fyWNAw9EiIZoVL0jTQR8mIdRS3432sAlrVywgpZPs0L3tE8wXsGe8a+6jOIfVYJDfL2Bza22MYk3sUlceEn1Gxv1C77BBFtmc1LfE0GYj2DJHxeDCoVTKtNZxltma3lxHHwpth6dXE4Z5cOZ/pckJ5BJLvopCuJo735KdTp18mTvfkr3NIv01c3JNbZ0rvmObscOZSVQUkU0sVqnnCOA61mZkGO5n557qeX2A7G0fGSG6NuAyrnW6PgBYTauM0P/Gi2wQhRRBMYGTyB+JRYlSszA7j4FWb6zVe7mLRgAwWoLTKEyZpydBmD9VsSA+s2KTL1Okpb3T6k8+S4qpTygv7d4cRNCxG6OLS1IkrSglMD4vlHkW5lcWTVNLmqugBOFpietpVKqaqQ576YCjPaVcEfEBAhNpX7N8Zy+2F7YthignOwYDRq1zODHwZj/Vl3/bfMFQK3zoNIaodIDceeQIRXUmVBDJ39llAOc6EQvu9pHBR0Fc4vpX9lmBpwTg+OGt07gEb0DsQ3NVDUlx6UDFjANYvr00c7smV85muJpRHIPkuCumXieM9+enU6beJ0z356xzSu4mLe3LrTKx3CqYgho5x+M1sihkykl+eTvg5AR4K20Q+vkk0durJtDuVlpoCBa0wNPpGjW7oSq6db41aYoebEuBfmLqh0+Adaya8xszMFENTLoVO9IQgGyl1CmRlkvn11V8FMMiEqTDaSsh3CXCbVcWVEqSLAAeBP1epPO2vqBE0LuZ6TTnOa/ntxUS99kftJ10YcOYtGTsNotP7z9HqU2n02/TpAW8gy9iQf5huVW7/uH/G2hk2ba3KRevXk8U3Qe+fgjPviawFmNjs09k3Ki/UG2uVSfiZ3B23RY2ZewCdAV2IUSI8mi4pwQMry4UaoDZonfa8LxzBsSzSXJwZe6PWqgvKEnC1tDL3WNEEyqDjCetwkkkeVMUQgaumMJbN+BENpnNemNOhdADvpsfVmmDFjh9vjhw+xa3TqMIrtnXvuyiY+V90Mej1y3LNhzZttqw696xfHinobJcYtUDiZLhYQXb7xa0s8JNM7m+uWv4A2cZIaFvOQMznqn4v32hsDOKx1fU+szXb1FVFnpLuMiW60BMy76Epe9IM32KSoSUNOmpKTapiDxMIDEEDvJhiYRCLwYi7yeRmRS/QgvwdDKpRThbZK7wmekBBZV9ZctQ+E2kY0zHzRlMo9M7ESiQmG93+DdnKWu9XlieSd8CFCoAMU3o5Cxw6r4cOuDR0dYXzwd0Er3mmkDsEdNVHbASrOB66bgwLjFHVbdNzzlsrOCqsD26uescEvAUTZopNtSpMMuroKdVBWe8YOygB6b6dVWdZcwNko8hhsXSzTWgTC9sOWNtu7RoHNjTfYOMlpK+kHl2AySZTdbS0ueWFAvDRz/1gJ4AKsEdNd7OiHdF/UjDzQ48vNGLgd7VXeA3aEJ9TtqVjVAf8vE6Mo29UaOKlYFRUz1wGdKpMx4wvhvIWemHT6Xpf6CR/PYuFA8yUoAbhXWC6AaDo13n82Ij60P2QmNZIwo4UAJ5OzNh8sl5eDKqrceRQjD8TrFfUcVrq0drTqTf1uzkjtXmumajYl1vi9O86S3M/goliMEdfIZNiaAJbfMbroPac79bjSkOWWAd92Khg3xc7No9md050cRBS7xOqOKMg8JalL25DNr7hkzeLwY8jXZ0Y5sHGw2dNJwRe5+bKSEbZdUTKVNPT6E87n62s5ThPiHY7VdrKbZ9HTE5A/EAYGVlYeOrOwLa3X6zZNKisYnTGNo6LWG03rXm8E002Jk2rAdUa95VXTnrIeB410Z15VLclF9Xl985UaxYSInzawRZstl3IHI32BxpV7fWXQTwoaeF9Ki7IbvLEe34IjPATA8IJ7YtaF8ikbonxh7lctE9JRcGHjSDEAMfBBqZMpbqcRS4eBEkk11zoeMQpNMp8EIjob40iH4hEl0WJ45A63JQoUB2pMZ2kdkoWpSjHxWWHMXbOoNX9U7TsTov2KRJFWbKW4IrFSQ0gSkvYfYONRAl7E4jXb1++fUXh6mKEYNMW40G4M1Si0Z+uxkALAlB/RSajHXZGjJjQ5jYdSf5orDFJSJ4By7AdXr0XNPvqsK7ucZ3Uj1WLFEwKZ758XnTMDlX1z7Wj93L0pONaUfABBS2OjeYfTKVyPs7RBhAV4OUor9qDGH3cHatb3kVJQik3ONF+PNMMu0t6wpheFyi5ZftcPQ4dHw3XktI8iqUOi7SPd92XxY7892MFpO5qntWV9NO2qssUA/JtDiIDJ53qg2SxgPbnJH4f7tqeBc9/uf7LdEvZlYHrwAeRvP+jxZYsaST9C732aaWRvr4ovw5XdfltaHJdUYptWaqECDgUcUBIkapAi5BP1PoPiAg5QVQPlZD+KcuLCsXMKZNEYlHr8wyUY2r3EygOiOhpSjWQB6b8NdmWRDfgjd7nHVB25VdvrPnS45uw908rI3Z3rV84+98/j9/Pqj+/TnH4Whd/fWV/H109/j/UlzbbddGi6cJk5miuMDH50w2p4OowOh9JD//yoXgYBU909x1sxL4g6Z37FFKbY5TKk/a3dGW3GG3mZJ6PvugtiPu4cmVi7yL0oEMWt42voE+PbkhYvI5uhGv45aWhBDgop0UOhhtMQHJTkBU4NoF5+sWmRn+eohjUApIvNKsSI1ECfP0iYDRDo+fpbJnyEGxwaEA9hntBoajW35FODKau8IaG8sffatquDuMsvrhyksOs8CdACn7LTxSGCtORq5nTp70EKmM3GkbH/mYcLo8n/YbCjbOOxTFQMZsl5/k5XKXlgS8u6w8CBSKQ+wvdXaXgATgFp74Rzv1Hpa9SRTZNTbbDJW4627oSKmH9gSs/ohRcKmwISTEl+EwT15gHoLDiOJ2nM+vfRjY1tynVv6GEp7kjHQPYmP5g92UGfjPMyBU+Og1lEGvUEI3TnX3aBY/VUS24luQ7zIbjiem2tZfLiioqjiwTB5vr9XF+A3x7ywWLdGQPD+MN7PeAb3K+zhZOiRWbg2KvOr1OI6qccGQsMw4+w/K/iGQelzs0yEkkYFCePBTE/BRhrAR3KVQ5Jq/r4s41n/kisEvkyRCz8rbCOGXXvqKUppoZig70x28QkTwjqa/KJJyEL2YKctorVRfsPQiD4N4zRqd6kmaB+6oIZ6Z7JzwKDYD6zAzqdV9Xuee2hOnNLR5bWgoIr6bMoH/v48aldmz5C4CjmPB2yj8czGBrbed+Ql1LvMYNjd4dE2KLRMIqExlRhpxaGEzzS/VIehKyHLvwTOdTFU/noEiXgHYR8/YFis3ockxaJADC5gq9AT2FxlaevcgjX46yDEFikhuryyFiAMcQl9Xql34F8RPcByQYvX0lKRLAz4z5lqefFX7B2vD4IcxmxEms3S/Jy1U1Rf08ZaJoHXfHn19htNBfRzXhcILIvzXNHXegSvyk1hz+qj1LsrQmQMu5s/TAAemRBfdpE4DV5eZmX6J6pLvjk1NjiLYGvw8DUSJcDNc2KWfGpJ//ApFVhIoBkAwPNX0yOM7LDGgpilulBE5jVlHhBL5DxUHjUwmIRUUpQCVDKkoBiShdauu/+lwoqEZUbM1y06CAc4X6adPZb+39UqHLriNbGjT98kuIgv9zlJ0vMvFxo0uW5xsn4BmKgwcJdzvz0y0rOKaTm4fbDcCY0RcSqIAodHEKL8HrW4Ak7rSWy4KRmb/rHGjYlSed2OdDpQ3h5l3ZMk/n4XYBhbQyotLPS274SJ8+diXwfsKKkuBBl/yqsFwezOg2eZs5n8jseCPAFqmk3+IUb+umrJfgCv05fd1h584U7F0lkDuVpQGBloVBGxTVBfHwKjEvx9+IJxUL2LMDxrSC26D8tEU6QzsJHkbmTQ+fqfRWPZh7qosBrBYXad+sgX4G+DBnzbH/++o3GwVPmJ23pzN0j2RtMFGYzVL78P+dU0QD6UFft1Ug8oaWdhBJPKithdFObLcBJSnEeC0p+tdmpkyxBtkXFGXbRARWtvrVtRUy4xC54jUhOolbPkZ5jP5fGou11ehrSGQ3zJ8u/2OirRsZ3w2vjzLRAX9FN09QX8wKxxqOK9Pslhy/BSNUmQA6dD00MFvnDQ40Hu9tZrbTKOh7O/tTvSiw4dCCJeNA0Zy1PV7MQSm+fZXY9e0Nh53ruSeAWgLSBHoeA9iuXY0BwBBay9l0GdnWRdky3fZdiS06TEByJ2ENzUjGzEnK/zZHUUQdlbqJ3EqFyiIkfCwc60SDze/n6KSSb6gqFTM0DBLDqVql+Wfg+0kl4a7HDmNrAjwfyOxiCeVOU2BKTBS8fTg0WJZ9Y1arn0Q7bwrQl77AonFOcLfxahxasxh/GY9++zB5fzrMTaGhFwd2o9WqQKtmgOdq1hJpP9tcL8PnPMFG0rM0H1W69GOfAAjkOgUr8vXJ49UpUvyGjEU5SlFi3TiILtYX42lneKIuXzM9uCPf9NHVW6KmLvCGxzl39pyD4rX0aXy/OKA/Ab9VUGMYqlV7N5+nZcCAB9a0LF92IufKxkrFf4Ak7k6zc/1XacrZveuEhNIPVNhcQr9VcM8NBHNfbUq5zXaDdooRTTDPSOD5OYK3GE81D66e8oJg9GFFHKCepxBcJClxFS4pzLe/ijFsUSr6fLAJc+UzVESn20wQ4/WUHgEjbFVbqpgMkb7oZD8FmBKO1XP03DWi/c44bgolXLtKONtdKrp2pNa5ZGjmu7KL2ZU7yEAT9RIPpqCAwQrig5ogq6IYkpik1QFe/vetHvGTJZEROP0snBH4TG2M/x2RCbCAG1io2+BIms5FjsCsHsUO6GJAfmM7mth0ZLgJHJ6TyFEakH16X8QfKVYJ/UAhaDBaLYJmAMlQLJxKR6BvWONbA9WAoq1F4Zx1IxIkmibjU3V1WBICJRdb4BofD4TqDP7HQfXDlXG9NgeS18bSjgoJntADeq+OGxkAEys46/hzdasKQauQBghvGmVh5mZjwNl4ZJogoQJ96kZfnBYMgua3258OJJ29pNUWJjkPhYfMj+gGv9uAFaH7OFgOW1ZeCWAGm+TgkesUYAyLlkR7bNPqGc4vDOcKfSiBkMAKohDLuAR7sohzVSxQupBJWXm98jMTVs4MJE0IxUAhXLx6ik/kIlkBlRNQNWY6zh5+xI7WcWCOhMa3zD/kIoLxK6Gmm4ESQk4MQNns3j3sOY5O+jo8iryKU4T83HWeDIj2+dETC1gGdQ6UDmIKYUsXXgA0yLzBtUeZzH0xqJzLlT6MlEU7X4QyluhAik1FegmIpcHSuceD+cigPjseVz39G6N3buvWQWNRGlUUg5SiQsMcRIIlFsIOOE4KqEQJxer1M7DDxPs0650OfH7gwZQSqDUM9pxM/Jx63LtHLqgoT0lMbreV5CSMZiUhOjfzdpQ1ym22jgmnOXvZ6YYWXbYUbDa3heBBJOvr3Z+u5shynXK3KHWazRWi0J6e8u655XhODl2C0IeURugtvwli/TQG7gfzn2NnHXhNQcwNikvFrsa9XvgadRACuTq1wty7O8a5EKZ7rNS9B3fcL+LT0GLymBYvXiU7V/jeMxGu4qaAqEqMFIPSCvBaSnTf9ZscQBv4kogEWMzGPisiezs9sQ095BCjvYSgm8cep0NyW2bvYeWsylDUexYE9mBDgRfuJjK4/RD5vigUeiYAT7hXoj3pB5b2+z+701VtmMAisjz+eSUG+hRDleOWoD0MpmnPwVD5KeAESYW7aef8QeCwGEVjVwihRSsD18+TGq1ldiPiCmZWQq+5AQvZPbh+T5rwwoYNQhxOJIEltlAWIhG+ZSLvtytpMHCXgLQXLmfynULrVgX4FjjNkLw+0GQ5LWIda4UsvPcXbwqbTGRzZJwrK9uTYn89SZw2Qdr7rIFtwJV9WfWTdmSB85pZBYQUJdWHLk0wh+bn1eB15aDiAD0ptAe6PBksYdKzS9kenfehyefanhi8UxCzsBZn6egM10pOCfgUzgZyS1tZDyJdJyT+P2xC+wkdM0Lw1OGCKrg3JHaSY7c++EOgcWt/kf/aqjKUb4i8gXUvYCBHHvMWGLcr0S2dtglW8kOuDL+t6EJYFE5n6g/wwmuCmSsN6makGvWTTzkQFC+iGGAot8EeKlntpV9c3vKke1TK5CwpN2Q6NqP8WTDvmkCtZiwSuGWICW4WoS1CNT0ThlJ3E2zu36g8FXN+j0i6xXhmgmKyh2B3QmJ4gWCx809KCehpk1vKBfO609UhIqse3bF6EucgKrcFcr/CoA4X3rhFCaS8WmN0tb0uapOWvvmYLTZLfXkrIPxMsRyp7SIMWBL7LNWguKf7qaQLPBm896fvD8FST7APhGKGlVd98CLm9vHoFhQSynmBjTV+AFRo+9TNYGy9IMgq1BQ0DgpnNeFx4hqC6Prb6gUMcx5ZKCvPtEu8LhDzuFwx81a5mTnNcv3LpMxZyYZS+yqOFGEU+kT8XeHGSmDcUWxm7HtQ8/LNiGPdB/jPvJYyK8V8T6MOrACHovi1tuBDYUsa86spwdHYBTLAW+WbzLOClnfGLB07SDASEtGXcgo7LQOh5qy2tXCQ9fVrCDDlhHOJAHBM7Likka4rLoKK61gZecvwGrdVm2CFjaPa5FXghjNq517gd6sgwlvUyfF58974kHyoEVCqqonCP0rDgkXjY5BEviraqSlb3Agv65THESNFA2WjgmSmUwYMe0385sY7RQgzthIlguAtBKv39Z7094ec/yFmE0rxQsx0K14nUpw6h8SOH4hKAMCLlEFFasVXeZ7/892nnVUuepgL7C1JRpJcSa1pKGBbVOGoBHTzK/QKtyA5QmDOMRnY8pDBCkst4D5OFZjqf6YDmdz6SIpvVOMkhy1K0sCdzK2YrMrS8YAXJYj7u0TjvZw1M6CRAfeZosij4BBzu9435AqrEwsJjBM28cNIAqILkcq7bMBBO6kg5UmtAwEBl7Di+95NI2hFXu/W9uJSrNBJMPcWf04Uh6kMj8NhH5HeWXoUatrjoh3QGh/fp59iQl+5j/BtsikMq2/fcl/DfXzn3CcWyg+iqHLjzAFtj+/dAORAR5D1YcWQojCPWvqP34zer+R02K6P9QSs6E+Ar698wDCDSAPkV3XLCKI7guJ3baj+njkS1dUpuXChNs7yY1WzqR2MKyi+AJIiv2BjHChE5YIBsAaiNdumYdfvw9hYkDXAY1HC34ykQQ0pbxiuH0buYvEui88jS7kdqwdAGFty4gdjDicByuUR3qnEKiEc4xq/D635CLowQcOvicUfXkr3Yv2v8/J7afT9nhaPEAA9PU+w0T1SwU2IdSBc+GACOVBgA3192wtAJ22vPZjSmNHWdKMoXv2+pF2YIdmVWEpdBBjAePnbM8iIxBRX2xqETaI3hpQyKd734aU/XO3FgwGMH30CA3TeE7yzJ5F/iKfdZ9be/Lpud6zGPqT3NtR0NzU/aLp0KEkmA4dqJHWrwAJFBlUK8c9/+WaPPLVLazbxBpF8A81RsVq2RCIEF6DNU5pdIq9Jf34fcKTK+26zTVdZPrj/EBxbkyrek/PVPwrBScWFhbBingdibR56DO9yeKn8705oA35ldhtJaEvTr9dTyn8BkOQFCzZU7tHAV976F45E9asK7TGF0qvY+KsD+9iqqU0Z/vIrMagCLjrIOH19dIhPreUe/7TX5TLMDvBweaz1I/aP2e8HKA8SbIp/i338wvRkRRvi2WDZApiAKa8UDfiFhkL6gFNL6mcN9GX+PLWdOZuCCvWc5djaefNXHIPH2mxdOp3tB0XrdFDr1H6mOFrCId/zZ8cDgCrMTeDP+I8hkWciP/a23vhcSgJJoXYtQRpvKM/Fw5+/8twkgcwKYMGJ3SX9X9PvcsYEB7pNOqLOvNk1ydVs2bYHe5qPEsl8O8r+Osa2+U+aSVmXckxxtYpMJznlbJ0dstMMNzVYIo9dRDE6BsaG0Zl1TgcKZOJXozyZLhB0/BwMUAX47R63yAPf+CX/2epHfLyv5t8+9e57/Ruh3O5pukqpEYOCFacmGb/l9iCvEhDgiDWg+7oV426lAsZOMFJ+A7mwRw3LQcIyMBFc88l1g/SAN5sjGcnQvw8JJ/EOKZrSWZgqt0D+sOwFK3ltiHDN4xUXwsbBwGLV8mOtKs+Qep8UzQcZyl/Rexce5pFreBF/HxJIPioipnc3U4/KxhXHJ4+64nUn3s8mLHO382PGfvO6BUMhjK37jwVuVbWvXoCPHhZLdk1rxfnyV3XG8J0rmTPLzb7JDNDqZ9zi2v2zNDIaXr2RQRCrrnq12EFkdLaYj+U/2LpxF1uRZZ8zJ0JCO+YsjaexQ3zjmWOX5I78t7h53jYDgnARJNqEHF/WKQbPLlnQ3ulcslB3NP6iwqm0w1jNHg579Gg03OQ/HAy7Y+md2snRhzuo82Rx1e4U/TrxFWQPz2bHD8SGUd7+ICvAe61Z8qUjCPoJf3gROsECpn+JB5QYQ4m9xjn6Q7t0RUr51nkQsc2ISNDlA6z+WpOSsSWVFSSoGSMEWwhHV4kGtjxHmaezH5ctUCq3dsR6tUEbr8P1KBWFnJjZd3aWLqXCKokLvqQRFV8fWlE4B8yFk5EkJgmZRRdOj4qqjOTh/RlGJ+dcR9GhEd85uo7xI+0QLdZCTW+jUqLt/nDIOXI4Rww6dvSkSSY0kEL/Iq2xo6xq1B1gWskj3Nur5hCzRpy7WdnSEQnHezkXUVeBkBkIsmeOuMMnOQt6wzU664AvT+66/gQYlABBMNIE2EwN6r4Glt/S3v6cpy+wGR1ncojrQBduB0tCgP3bQ2fm2VPC3riVZin74Wsakn7+fgcd5P1GG/1RTTFzNoQklrLE62mM4NA/+0GQ0xBJHOflFv+NMqSaBUSLiBHaLnDH+mik/XZTjhp/bybz3ZcT9oAjvZW5HL3/MsyZk3ly8mlChvpd3TlF3Sb47wLdVAed/P1LYXo0+44KGB2Cq8B8LRn0UnU/Jv4Fw4/hQqIBfIvbVg7fUbOcTi/xe5s5vlhKpqawn+uJtoarn3cR4XY66RGugC/yQ85TUWTuTlWyLgglm+coyAC+UFoCQb2wQfKigpsqMbGbtwbXrDPfG97wj4PiVeHr3L2ltrepIBN3w7LJ1bpgZJVjsq0ySuI/jC6BLXDz5z0cjoQb/x0/XFvlOGs7jAqV6G1YNZGokUdChGDyWsTWGREsk6Hz7FBbHsqwsbtXvKKgi8YnRT6slAc8j6Y/SmxYj3CI+N1UPmdHACvNc6krhWkohm0OfHbTJMmLjJRoGkn3NyKs2VS0/RLjv5z+eZeoSoXCeamtvy00riMs50RnlGtRITqzSHuwzmtkhYOvSD36kbJ8dJipR84f8v6R6uafz+yeAIW3BTZY0bhDwy8hLbvirJGtI0mQp2LlRjhdBbGNwt7DitpIiyMRGIgv5MyHq+kQn7pwP2JdNliYO2tXRbm7CZsqJLNgGm7yiD4AVlerEJzXvCywa8WFpe0PTzGefIS+Ad9RoBNJjehPfr9nWiFK5ZU30GBI7RO/KFs85w/RIYQLVhX1QaE5yQYE1VrudykUtjnwhAkdwCl1J3Z+JT/QpYeTyrSzQadn8nJUcYkfxXufQ8Xzn2/gDccIfoYubTApD0C+OQfjpgNc3aMTnOs/cWu36jJZZFS1+RC3y7pPIZtJ8f62kLwPfqMppITghHeCoK50TA5PMxVteKYySaJKhW6rNrO+dJpQ3tZyaqnu3A4lOthkQu7ZHmEFW+tTP9MdkaNxhZyAq6+L02MN1GZ9ixfvZrWh+PaWAQE1A+TYllBVEChyhUGoI8cfgqmcUrQfbGttq0Ppm9NaCLl+SFUW34NVYE4V5EGMzL76JB1jnsm/iv7jt/wvr0iwsujeAzS7fVXpnmshAsVYFfJwYl36mjzDEEqEKrOAq/jAulFgsecPhikJeWXllQW7xewW5NzqZF0tNKh51tY5g3pO1TQ38LtE3wSFbs2w8k2xxiJGyGEAUbPKzapcyNQcfVmkJ/bqW7013LE7s8oSQzxZOuligLH+pv603cuuupH0uP0i2cJfr1PyV2/I+ywizcH20qtOP9QqLDA2R7uG8LQ+7d7Sq3uj7MuwXJGwJ1cCBuc75LW0msVB+WMd9lysysEWsA9EdCDWsGashElh2Ft4nT+kpHxEB02TOoxPh3ZQuPoYrhP8oRuzcIHZAsme22xuYHJEsB9Gk76maFqjjkCM7DdqtYw/ZZVJdHcCxyGD2r2PGKWPTT+PHMlme8+VLi56oX0Cmdv9cLATptIZE9TjzaFBHlbYLfnOCDg9L7ylMfRCzJ1h25L+XztqPPOjS925KjlloNFvp5yV9iSAdEegj9tRcVJDYEd2F2HPvDusSCJxqQ/jcVjyMML6XwY0dXmY/tifcO+2Q2FcZgv5zV0fEH/4NoHiuCshXIBwKXfeONn/ceeHx4lv/1karMeo7qzpqAY2JD9NOFKRzYPjnhk+aonD//5iC4PA7UxjuNPQWZLdtiZe2tkseesuj+/qztqOO43+n9344k78BokYhmb7XVHHMmYHWzrk21DFMmVOx5ytUXa5D/T7ZtJwj4rb/NpoWILenR8XwVuxKCFwc325BnriZnaOG8FT39TWWhPv/OHgxinGlcSdtRwQ6qabQcg+XEp02eof/pD5P7mtn9HVO9BhHy4fdudtOWLBQd/05oByu9uFit1vxa/3QvKmAQq32wFQ8cJ2IKGj5iwcykcCAgSFG6BmSEmShR8xGjRM/Oczaf1LXWfxrdxEUQB6CtJQOV0cgpIkI9OK5Se+VqqxCQBvm82hdOQ8sdfRM371loOwVGCN47T9RkQtoQs2s4oNrOwTxsP2w94mEHVnfccDxNix3+sJfzMoFca2t1Sk4OyLWhp7HusV9T76VzmUV0WLPjwKuVlL7JLP7O0jW1v+bYH8Eu7yNwzS5Iv1UlSY0P9a02ixO5bA6xw0JbAcX9IuXSMNBwCzZOGdBD2mz9ZReZvmDedHRPhdRFnqFQA61kGJlQ1ruKqiz/cNRyaS6wSZjbqQvwltiAcpxNjTrBmoWE/T4azalk3cjzDihIW6s8bjbhHHNNt/mTYyLtC38gXNd0Pykt5Fkc9Le+ajOIbZsjdKFJ/gOOFYnY5QO3ds/kTqTpl4PsLgCVXdWduh89NAGz4OUx9Zm7tubRYwwTWqJ3OENDFCR2VswHXgZ4tRGX+9yVVARGQG0x9eI30ORRj5zcwBtWqnn6+TUBfbSI788+nX+KmFR5Fdf8NaPzM90fZ5O36Tl0ORxJ+E+cEhf1UzZ5c7Nzdk6/LQJq6axpzg/0zzfE9m5JjbMCd6vkXz1zSE+U3LlvS5WOhV2/uX9sCSMX8N890cCe9uiiY2t01dCwGwaZoCBMwRCdTnacYm/jvGZn79P8vOwZGTxoBi3rit3xtZhTm+pZV5MmrlkQ6wzFNj/B0LgtIi45Iwd6YBgpnckXLwsSHDFg0PliOiBIskXskT94JrJDmhGwHMJA3WyygUFWh8/jYd1eCi6SGcABNZFKbBWtcO+CxO8CQFrqh0lGOlMDMGYk1ostHL9t8Vg/H6FhcPrpCGxV6kgocvHEUXD2JIFGL9rh4riA1j9rllEs/yaPjvd4pl0tFBizP4Zj1HW1PWCwwD5cDIO+7PT0QL19V8btjCSCgStvreg4v6rKmuLIGg736pCKQwkBBzhVdAF54xpChPTJ/nCmyyS/XfmzJ8F4I5JL+VDdYQGnZC8738rdAge2jGk1/2GELoQvhmAwN+4QGvpooxPW3a0v/MeMkMsAswvEtTuZ54hQAqQvWO/uhdQ3pZFMe3rQvzUfvjhQiviHx08aGitNxW/Ac29XvMbdyzCCC2MqtjwdzrS+VQkCReR29RuMEV/EUpa+BeWkNYZzA1UdtFVr6QoqQASp9WisIoMg9rL+iPvNC4fWNcXilPpBe6MVSPZ1qGBj/qBX8A9AtKpgT0ZFAqBnuzk2X53o+4kiXqYf+VMgnE2kcnJSPXS3tanvrf+ImHQFGwIGNMfMlr8GLS1tXldV5Wyq+dzDRlGAWvEVRf72SsNybUOWtFVjwgjsl30GBH1bmSkQgtrrUFo0aVbVeVKsLNhDgTQHLwKApbf4eapWh2GGULXHONiSKi1gSafohMAt7ant8Ug0OAPgexRDAE3bW9IvynGgUsGUEuNqVnu178tZDuPaQcotapl5q8eOUkhZir2BRTWCJTRlCcfhMGACIuBO4YIPxppX8g4NGkQ11ckkhNAqN33wOkMFKAWwJk+DcJOeF/K7y7YCohsy70i2iG6GnZFlVQitqr40cA9l59332PP19U7nfH6mIWd5d9ukuT2wVncj311s8bd/7m8I3AiI5HhOpHGAmsL8SrFCzpIcxQK5RRhBvWkXqzAUi6ru/vLv98OtPePcvs/6Lq1jQW2ZUK/9SWDAppTAVQOlaQOKdo9S+U8OR9ZRw6+OLLg7VBkIXfEzZ0hQm/XzGThI0iEpL9mipIKe9UomFvu6sqJtVs1CDhzrqr7plkbNQiRdc6kjK6pbVldtr3xpumJwn7M1FNiLRAl5mBruK3b+hBY6H1Q+c7d+9obnBndCu6kUjMfVn0aVRwpWKzQy2qUaoc/kXAPwqaSpHK9/oeYE3w5DbUYjI/TvD3d58PSSU2Yp0yZZQwKHBUwBXoFGiV0iiFSimUYlJUCgodTqSm04b+3Lv/DRgaUV3kaHE0yUssmNRnW02uKAHNHc1PS8WWrZc7R2qwZkBIJo8oBranwPy8aExGJPHBgd9/kRHzB/+sGCRimSNPgT/w08qW/i2jNyMRH/2szbPyhbWiCfuj/dkSpOyaJmNrQpZEawUhbTzKLZL5m5umoNdlB27MIB6soZK4Q//AsO4bpYy1oQYupSjVtj3UZaxc+7cPjOsVaYqtYIm/XtzFf0+YARJ6ZWw5AiKMpWYea2ZXkx+bgCaEbLCXCTbImWPq62LxichuO7rH+LFuzNoiiONN8gToF783o1L+4wKIvyrqDqwiMz/QhNdvF6a+5f1qcPxI0kGzEXYCdzutaOn0+X3A6bgT8h5f5Ttsedsu6FzjMw+j1gQ3KRu+VYtscEkOiZU+uJmn2GrsGPabEDkUgPF2cuS7ks5iBPanRLkHfZq6CXX5i78pAe+KudZs10gORsu+5d1eQviJ3YN1EqVl4onBEhCpW3pNc7Okbun6TGCLv8MMGV/E3Uu/JByhRBK5XvrbRsIy9S8/XRFYRYMfD/Gnn9cdmMJOItHi0AyHnaM1QRVqraMVof7ohYXr2oyU65PXrP0Na0u+3FZJFra/UynxPqGQvFdRMYcoPwYCeEGbICAe8KuO8pgPdafy/LofIzWXPIEKkFtsC+Hj9keRlMIyGG4ookiKZxmycyMPxXCoizyifkKHygoK5gYyAOCpt+ajOM/RC6DY57ja6xYZ8KIS4kH8oO72zYlhzpdvhTODN463DjpvwOch+DhXRYOInoWvrXLjjzzhr2lk0/m7Ao79dfOQlfbTje0DU9edQum3/gy4caRak9VdmkloEo3XbuRBZsU7rql+3iBE24kkdXiYFV6Dj2y8RigXadb6RlqbP595lr1wZ0x3mqRKSrqlrXRP+Sr//teXAY3sh79XZqGQDDfvr0EtZ2NV3swm3U4J5nLxDCiZXfZostj5OSGrKZOZ8JN8NcrUXoRrVb0yFKPvnuJdEioDMWOOdzFbxDDL8pQaTAv5DlvT5xrFOyQ8Yj6dIAFwva0kNVN4Kk5chWsuaY9tHPR9XWHhxu2ohV/VR+G4uRHTownpLKI+HT8mMORdpjLzDR+fVSEXPywIgaWGOspzmZS5wWUFJezv5GZyxkCfRsQPUChHdGmG8waqTgSKmi0MixcAEMm5LXFzvzg+wgqv1V/80PlHVsLbSvZTwWcH5hKGpmvXLaVkZP1jckOtcdsc1DPpUcaBe3zxW+EGy2udK+mvtCt9w8W0wZvdMBaoixQCT0J9tOnfbE2efYRKouJVaUSuFVPdwsUiLI67UVXRJA7AGDe9FJJ2w+TYNCyyVqmOYBdblVoKahS9WIr09VKOUSpHAxK33nyl4HWoL+c2QM+M0Q49FghPnKdR8rVVKzkWSwPMBFTpJQW7KDHi2XVbXaKLMkNVPgXkXMl9IjeKNTKUs6pRGIoydigK/MJpCD9Xj5R1x2rfpDVKhpcyyhD/AGRcRiBb6RB+NFxxrHZPwTXbYCZP5pW5dUskq/aTN+dKvuRsNYwzXEgHu5oonqg2RLpWfXDzXQ3u9qfEZk48kVKBc2cpRLpNS5okJznL6suYrkXZZmmKUaDOAhD50yu1A7zO6WeLuwN3vuh1cMPfLrPclwLjIBuBR9HOFBUgbTPfMxBg9Qe/B+sAsfAO2lCRCa+QcUxs0UeBhKfdsjM0yQHv9luYbokGfMq7DqDFa4CEvlILTw5ZWiJGSvo6lyvDOQWcre9Fo2ONBP8tvMXUNlw59+YVDlk4iwQOMUc7WAv2cllxEVovgIUJoSYlERFaLvzHFipFWeklovD0OM6UZcIkS0HLS4KkuWrYXyBlPkHSJOdd4f87iJMRNbXru+nUpndre/Z4axtpATqbHo9ACUUUyFeCgSRqcFQJVfnQW24d3j5ztJ7VJ6fu96vgkOUlh3O4UXQK2/YigzbPOyVDuvNkjGneMvRLeI/vGyo7GDqsWOV95K64X7kxzsg1tg+ncHelkf/ugZvVrdjexfaB3/b6ECasw7x1/WER77dM0ShvXqb0MP3544Q9GD2mRmWVTzZj1V/Sqi/l/oPH6xheuExDnXkNRUx2MztQAMUyTb4s9Boisvaiw/X6MYIHUiV1q0d7Q9iwLRiIK0B4C2Z/7WdAHtgb8SkiN1jPuYr2zdgUZpzt85MHWJvc1p3R0vUHTcLK95H3MztzxBhhhotUlgkqxZyfKZRf+26PqODdbMYp8DPbWh+pnGP1cA1arGmP19URjLvWlAg3JcXX1ZEJ0goVM9mXxxbGxrIiFCsgkUylHSSTfinYS4bSQ2B9MKjVtUVBZIq+izuW0yr2Z6D3k3uuHeL379zxaw8NWkmgch7ill6m5aAQyIkcySu340JJ5UsGiHSKb79lLFTRN8dg3JbloYWU/xsQBonZb3d7etkL0v1dkVWB+yXlcnJVmEPVPHw64tu1V02aLO0HYaVK/OzG0FvVBi6wWYiN1ZsNRXfwsqHOEQceeqV66YxSLg72S23VHNDgFk2O9+nNr4IKj5EFSisB3yiv01q62mq0Cp8zplS4GVl8DKya+85cGwA2ImGfVniocEJhjBPT0VCSBj42ZcLDMjgnCjyXs+SWf383faW8nondolHLmVVdiEEjI5pWN/eB+c12qi+OCU3+Ih0lgLNgtw+8ERH5KsfZuefbYkMWfGYCxsR11yTlt40ZC2Uy+R8Jw2Vjmg54hTBPnh4rBsAHYq3F/MgXcS/uDjSsf/Fxn6j7PlVJvf3Y6/hdic0mtUqTepfbTKofr6e0qs4PAGwn279fhkpYXurYu2U1lGzBOdD35Z7Ke7812g1DRapmbUHh88DqNT8oxUm38pnskB8QwTZKexsKqUbJtPKGUovsqdp+ccb8Yznb73Ft06DasN1LeHxx/Uqu/25jKpkG5prucMzYnuNOovrbI9H1qpjWBElhbIM9wO9kVDaPlkRiGisfgCE7mahG6uic1a7HokZghUthEZVMJNeVG6oaV6nXQFM+ReuOjyNgS81lrX0KdREZVT+/T4ge769il9Hjqy5QKqXA4oGedgkICpf6aVNKve0hnbWZYXW3/nmfTzq/gPardh5y/2IrHTVGcEmfftIQq34J8lFIw6LL3iU9CTyNqlTQMZRr5m2w9003myQfPpXeco+amNXzOBxGo8Y/YpnWGqvhkVUZl8e3PG0Jjz/5SaaRfpQtnCFwjUefJeRn/GcoA6/vTp0Xvxu95e9DI/eY9XdE7dDlorhMEIP8Y81XTVZCufNmcz3sgYh2GhrS40DErhBrom2dTikn2NmyJOWYA31+SpyE2vy5Wm5BfafBrNbi7aa3y7QWuvMm9HsJg1HhsYvT2hbrShBho2QVf0Sl0wbR+Sw4uZJGkwIOs50m4trjWlAkGmqYI5Toq07mVBWj1jHebPRSumkumEvys9s1N974uUyo1X8smNav8yq8NTLXq8vXVqGFZnu+AK2IJa2tmon7+3SWaYM1y7NMYZqX5VlxPNhQ565wEwlIRcZBoGQenf24UE7eHeY6YO0xUyUNjbDZPnqA1nHG1qos0Ba33W2od6JtOWJUnlZOoNSqSsUhUGnGJ9h29uQms9TpTSdnjmTd7jkwG7md9nfN659eLn2bhPSV4ix2jUrQaG0NXkPhna+KuTpf0A1QcBM5Q7xmfbBHe9GA+FnjzOa54GWFNbGGWHis9u8jdgFv6xItpU1bdoMUY45etjWqgj56JfSU7UvX/V36USPL0GbKQytfwo+ft3jU/XQbFxtF6xXTZxGWTgNpjOxR+3C0N1pVRtOYsv9TJojf8g6sSOGqAkHHZ7kGJkHkDsHU5TWybF+zGs3jZotx4UTaJTTn+OycVmEgpbroCKTivpH23e//OX9kJxjqBA03Ob7cUrHNziXuPd6Vs2dIV84nuZLuwcFNuOehy0wXG0NGYqIhlxSb9yXdWeQHHaikqnQlFGJbDZ1L8nxlWLvl/U8LrCqXKdlOwtcsM8ZTHo1WDzY9m4l2Fw45LkkciRjhj87MqW7MeES9+tQ49QeEpVbzuTKyWpDXrY3KUDjzidZKt61FY3i2gwuDVHyMprNeYMfqhtFuy9cne3IHUgqlwQeNnFhs7wgdRlvWhLZzNB3p1sTGHRM6hcegJ/rwKUi2lnwojGgQW28efsl8vhOdnwqXG+22i4Y6GtK0k6BKu2mHBBYLBd4E3OoOElDU2UHPk0SlWVN5AgnlGxUKz0nOQxmmQYY8rFlBtxh+BITouXNQx1JMUMXQzQu/sBlYVQXDg1pm1W7fTGElwyVyVoTvz2g/0EAS3Bj/qiRdztNfbz5lx/+uANw8/YaNl3koJwlHgfLHFGkn7IXLOPXOH3/lTDgnMdKW3Wi3TwZiDaO0mySlYD/z6tbQTKYdybJ1XFl2UIcrobFZDNQHhF1MvV/5pA98DlYpMJWUyncpbojUrLRg8fcXGRo6X4RK30IxDinUTHT64e8gnPyu7HMXCU8QsYh4axaeCvq9ghiKvDan6GlrhrZLoUCFlcEri5alOAgyKpsBIiIJQHXSl0b2VSxCmLCmx1ubWmU6hj5jCWyBI+bYwbOz78GRHJcXZEXAn3FlBMHkvcROCQ+kO0nKQUeXTXaRNTj/vQ15tGWSBmOawGi468s4pyE8OkqjWoqAqFI9Fv0lEMYxxnES4JzCfLJf6xMJ6O3EcAV0g8Jf+FjJDK/PHJ8jOKbs8fO5DEWezgBuF8R2wIMO1aFKAo76isoFrGCsA3tgJ+gebXGFGqUwKY15OKdPD32UqeUrREf2zCHSqLxvMzg4vrkwdmg5AAtWxiZxJUKhhxRnfsq94UI8PYm249iQ8o9MY8uJttiaHUna4WScZHJXJADQFplGwg7WvejsnjOrwSopQIJpDmSm2jzxpahSLxq6/Mr9K6hcQ4+OZsXorZDzuMw6IhCO/ndUb93DP0gvOLS+MMZg1g9zuBlUkNhA2NqftMh4esF06WYc5pv3p0LD7padW7Kwv+q2plb9eqYLSZFlSmLKIdovuXmDTC4ulVIxnWqjx+IUH0zt2LTzS7+MURdnWRDms99xnoz+7EjhcoaPwbQ+N/q7k3VTQH9Yp1jGcRy5FFK1t21Q5+WGr55LpRiEvwP0dZB2IAdz4ApTOsDyJdy0NSg8z13DXI2RX3VT/CrGGsTI9zq4tlQBrB3/IzudsObHX8HaPxLc3FYN2rZeAD7JuBW9OdexVA1GufX9HF0LR5NHth9jFTDwsM1AK2jxB4+/WfIO45M1rI3eGnV9sFXrkTEYdt4dR1cBb99EC3/osz/TiipR22NtYK3pEZbg9IQ12ZHxY0gA64MnPukD/bzBXaIkYtM2PokS0BjZdWj7jqnHLt5SuhPBj+x2wnQ0J/r3MdO0S8EaJmdXp6CK0iCJO045DfgknNZSu1l3tFUMaLpWAHu/p6zab7uJUBYkMxw4dW9MGkdmqAoyNYrKTaKeMj/bxwFo+7M41Rpv9+r6DyOlhxmmjNkbErh/hy8uQUdWrYwv351oVTR/ctRPK4Yps1eQe8GBTSoOayVt07AmMpqNtw12oCsKOYr0VI47sYtxdk1gne2XdkhWyL+C0ptoywCRPVRU4K8chKQ6El+AAd3183l4tuEqH3ci01TqEVg2RNw3cE6G8JU4aG6Z31L8SWRCUzogSQdR0pRbV94klR8kNfVVzeHPjb+Ajad/aY8USbgD/GVPnUe2h8Z7KD19M5p+2Gp0NUZ7Cfl38jhP3VOhYJfNfr9UHo66kD8iRuNnfEJR9kEYR6d/jYl/MefkYdZwdKjuw+UMDW5JMz4Rr4Taz1P39Z38lCvFbpggV/i3EqWqHl9Ti5iwWmSR7vKS7/JLRObKU0ccbbvveoh2xFzjT9+Q4u94Z0yYO3wStFh0Be/xYg0yNs5yfkmm3YWtLkffy6+6FpVe9KSZ8/b9tmzaxXbXUpVcWxMy9nnszwXWv61tslZILrnSj0OSouUMee16eBzTUgSgBqq049iYMqhqbXa8kiWgNkiSeLQM+KvZ8MeUUNsbOI7Jb56ZIFAd9KyOHZ4VfIUB0yGM/7UXw51LORSeI6KROZYuKeoUJJREONQBC1cduENBQCHUaYv0CJQMk6biJlVcDzQCPV6c6RnznHm36WqaHOBrfytaZoG22qD2jrAAQeQo0WTq/y2aPxfPFoz474ReA5CRN3FdCra1gGSo1gtgJboK6V1mymMeIZdYScWqNwEf62dTavH9Rk7qPauzE2JRSo1o5IOV0VVBHBjNWnBBMSKh0VGhw9yJPUEyM885qKeSisujhGIZYbJirRepYAjGJ6VlwTqOgPdTU8BLNdzZcFGaJAx+9FTU2JEFr/dPovBtNCExk9fBCTcvMT+i8ZF0IiWro1/v5BhdRz7rVt97Xdk+eMC22mRX2Jx5TnL4tEEL10a2pAtfv4hRoVhN6JDr5l/Ecep1GOQtbRiu8Om8kNjdkOT/KPP1phH9LwtaCLbW/pVppsVXn6l4/w8oeMz7Zvt4/x1+7N4DbM0We7Zgo5fgq8ftUz58zWMOnJTgYwnMbHB/vH4dlLj7IYo8LcG9YS7l4FqY9K4+R+NysjUXKMWhsh3K6Qz7KDJYJE2OOsUrfz85i/4+aBQ/f8aVeZ9CZ0q4XjSSA6KQfYGJD5vr2RLxI3M1qVft1QuhFeAEMsoZSYlCpjRxAp6mEhFsfmOTJE/L0CwJRCoyU0fL6pDU1atCDyNMGRhJn4vVJfPCnvgOaIAj2sarWwSfCvyjNdp8uAPqQCS2uqFg/qlrw1jWVgQsvpqlhL4oZ+zkXPphZXS+iWD4EROvqgqxi1KV+ErdI4dU/aakPJ8Foqg43qo8WEpAim69CWN0ytOdImVFVFUyKx5nNRuz4kTU3260uN3KgZK8XG9+8lN+VAoxRde6bkLuIytBTCQS7KFOSZCzF9Bh1Zx4qpoSkCUsURrlFT6FR1t5T00x+v8HcyoAobWpZvRFCVFoe/SYFT0rKP28t3YoMQCKE2M+ug6WEzgnclghmnipv4EgvO4fDoLnTTj8e4fjjweKafDm815EW0BIZ6u1NErlYyeBXhRxnEi2FGc93zh6JhiTQ9+RAmMkTWRQhWUNaTDxX893bDdmRsC/Kw1Dt1KZjEmDwpf2QldUKNQtzyclGk1l+mjKdjUhmUUdJCGs2cCCm4mIwVbQtCTZsZyqL6TNgUaylGpai/vrEVWU2T6YrS19oV9Wki+bRfMHvMHamKJiNHE1LUzgIvShqFtWDYWfkl6QKMZyVsnAAPFai5f2Pp1FDw3StN8uzDRHhCbcg+o9l0uqBxE4EFeJz1IZ1I4MnXIafdqGbP2DwC0zCjkeyemW5MbCe8fuwJ4FppGn+W9OjZddcodP+2DjJGgep1rcK3NsY7YXZAk6lHCXXXi6NSvleZzcDNyxA6/vQVvALKBX/w72emjP6rxWWn/jeN0/dGicHbY24hyFIiOBLVVDSDLeBBI7AHoEfOsJF1HYhNGYuZHtAcnlvlZvf9gXtJL8GCYfxEtuUzlZiX4khVkVzXHs9FuhxqAT1bjxxErRTmwCdp1M6B2coWiCbalJw+LqLKBQ/IIy8Z2FuBSuDSIi001B6nC6nOSJCKeNQ5xSsNiSlf2EJJjjDXW4Da8WKi3GRo/faSwsI6w+xOGs7i3wxn/nkIXWwJpe6InDl38mt7Y7sIGjttXbzvZ5Go0+f2g3ug4kRFajtjZq+0lbnStlIWvVkWUEzo8H0ZY31mSXFLY0Kttooz29SjnaK5JIGFIvzotAV3KdRjBl3c0YbRlU7PbxV8YPtcro1+gah0CG4QwNSFPBi7HxhG9FRVTUITKJ8u8VuTtCRpc3G6RwP9inD2LjYGNR54UW07ZiVK/ErqmLshAGYVM2aGiuDljQsOcnBP0/LrcuvU9GbSxtDi7+y3DzPBner+0iQNXKf3TBlPo9qPal5M6qfxW7t0dByEYKeYwPrNmGw9O5+7u7G6lK2oTzr+VjrEkEq+EgIHSGwaNUs1ks/kyXOVn3BIFChYXfUo2Xg8QUlRSbya9I0Mb+is0phdTfzX5JMg/ytZWKI7j5Lw5zIn+/US0JPqWWfWse2+cDBgZRJBkcVJRllTY4BEo+IwuTwh3Zl9irH2rRMoLvNif1bKuMij5S77SNdljEi8bFdVKzT5VSlSFDEGCaFEwN1z0pbSRYTMiJfbirCv1S2SFA+CiZXD1/H5NUJAZMScGmznE0UCS53oey7+tmP6CNml3XGh9IlSfVeh/55q/AmdcU91LhvDQ2P3161Y4vB8m6kyMKbWEDlnJwjiIPk3Exjqh/eM/27Dab2TYOWnU+1F7C2RH15NhaptRgBWEaKIKYAHfJzRzxHeuUC1a2POEE55NmrybayX0Elk6l0+SGE5L9NI4p2wTzSPLQquUUFTUX6MzEU+iQrgT0V4ZIgUFypbKcYI813VD2SXHBRRK9C1Or8u4ApzWgSadkahWNh69K5mkBSXHt6M/0XoklsKm6UC681kBkDL9JHqXROOGyTcsQPTwAlixohpn/AQF7eW5uel4izF2d7BLJubLLbrKywuzURdD4/FGuXFtTFH/F5kFCSgnh5ISrnTmVYx+cw7I/Kpdf6qsvcUxHPvNcGTgRjnNidJ/RpeEBTeyVfxH9zBalQgPtk1AbhSF1FaYmFF+lrBgOIL86rcRJoyk57mDbabCxhKTjhAgavk5EjoFS0fKOIArd4CCsVSGMfpcgAS0HKHw/GicpFTqN+10Gy6EJiyd0tZE6WZUrq6eYV6sVIV3oj8eXMtzsTFU9TLChlJjonFan2ic3mqgIWL8nRJOH4ALI1GXoLpd96BtYmpH7gCwiizSjW+BpB8NZrDy+W13e5XYpgTh5h3E8I219UpvQ1/8vuUe35CX+44kXZ+VJ9KJGjI6a2lkcvkgW6vtiLRvJnZqEVMo3mC7KzSeZScYHLAzKnGkV35emcdONALnZzkyJV+UUktjYj6HWFOcTLBhbYdYMPKidZONx5vWZ6fNeXbtrRdHssDajZtBgFDRlpPJ57IUQG7SN3NQ27AQLLsS68dH8Vkhj0k7Gy1vJ7zdyG4PhTBkOi7FnsaF5MH+GALsfa810/x240jA4ZN6DpMGIK2PS0S6uzJNW1qZgEQ6LzkiBQMhJR16DO32sAR5NUKvaOcpl3Jq3c53ocjndd5qiQLgIny7gwJDrlh4g1Ygd77ChlyoIjxb3IrmQG5Djeg7ow5QSMgpoWhRDITSYc1189olt2ukqTJCrNbP+dwV7hYLDX9wYWBLyhM1RSzy4zL7tYge8eCDdeUZNb//Z+lUdy390TUhvXOnsKo2aXRBTmBCyRF2FqsYVa9EcMNt4f71CIhYsZSGeYgE5Ligm1b2eczIbIWC6wszd/7VibMnVbzyKcEMJ+uCwVnnW76bCnsRA8NaJ/8OuI9GVO1JgZfoqPZ21E8jc0s9Wam1y5uOCNz0S58XUFL+GQPuNxBQu06B9Zi1wJ9BzmmXtTAkCk0piVGi0jpIK0eZ9coetxPZzaIhOt/PoVklI8wsdYF7VHBNOAAWqu9wEtxeJ8c2k7W1ssLDE0f5I1irUjjlX3WKk0gxRRDDHLVLT0P9MhQ8mpEP3pStUcHNoWy7a9WwzsjoSHSLXjpg5WR2vr0hMjSc4PS4HkP44Ta7HmDSIyhytjl9YQCM7JJW778jqYjPSN898uzkzABffg4aFSGHTnoaAbfG02C1AU9lfBEvSoBaWVtJCGVrJYxNTRHTc1kQZqFaJDHIKYX8jeEpI1L4mTBS5dfv1dITYX5K6ap245YWhINkPXy/yvdBVjJ13fQIY/8fNG/q5Em916jtG8mWSQySlcFiTFm8SaJIKQw/IUr6tCVewigG0SqNCr5w4LF6zPP+BZIgbQMmsivi+YqFVdNUI9XrL7+6veBCVfU0NtO3pnbalUpU1qCAvp5S+MkTMMKap6j99iFV3DwnrRSS8L4vPym0L3YfLVFKc91xapKod+jAepKUGllfJSH2Dfj0jrD81wpkjA5YWLbWtL+buwO9n3xH+vcvPFzlHGEzCJJEb/HlcmTZe4eGtSF8rMQZcryzDe9aFFO9ePSwEiPe2yYRKvoBRmIjxSEgUpui5h5lSwa3vz+y2vxfTT5ZPH465VHUGMRhhsA40NTu+aw58HPJN//q2S6lWZBAdjr8KsKSv5hq/lZYD3AFXqi8YVBS1y2HHK0MMg9VqLgSpmvnu66iwKQyBLEYEMk3fnkskzX1MikC9x+8tekocsFxmQUmEztkOcoKyGTwY7ISjoD5drwt2uC1WLqIvisFIrXJJzY372XJMgDJQlV2h758v6fqyT8SYJel1RzDEWD3mt28Plkh0A3CnlFa1XJ+qkU/vS4MRPFmCo8xQqOuRwKea6grbBsM0tHSXeC1Sm0ZXEUyfwLuHVk8iYqkg/ysw3EDAaEQf2SHWAaO7fMB2HNB0ucNx92BoJ4sMskyTih+CvUrL5+TR5X3+tLyD434ly7tOwpKOnPCPl+cU+9vDjwXoDAr2zV1DaJaDCDLgQmmS4HCd39xZ9KQe/jRWj9/Chzk+mTTkP/RtOvzYPTKiABMCBl7JioB7NgCNs4XDbzllV8tnaQqRtVYc5CkP+ny1FZruVeX+yHAszGqAmk47emL3NQdbzVnerUtpN27P13V3iFNVJ4FnL4tpJfroR4roR8Ev8kiCQ+0GVB8sF6NNZAS3Ul5v/6DvetBGG/lUiaLsMcfgWHusD2qw70EmgJQfTcoCHeYaV9jHEZaru1IKkshNiPSrzpu1/+g8aGNl29UzoNKtdgVoSxakYGW04yCQ03W9IPS7Rzz14ly7lwwtKSfUnLpNvJluT5HM2hQAHPChxRRvORg8UmhGjSqiiIJlJN7ueoeknM9XFWt4yBJjqIz9Q7rq+Q/DBpXS7BuCeM+OSKyizIk/mPA56Vd2b193hddDObZXj9CVghYUGXKPpgqh1pweKDWQkD1uFIFwgFUgyuW7V5q6FTIb1DiY/TG1ZjfgOFY/AFOCCMH+yjTbnl0rT9FrRbTPsJ4n5WIimKHJPmCYvHn/vSLVwT1IIRAChAjgGpaTlFDkB+xtr/irq5b1mfKgCrPNwU5l3l9JtiW+pXUhtJ+JfeTG0J5To7xnfIDqAbmJUe3uTIA/I09hpNA1QbqrnDEHq3CZcztZ8KK4lHDpUQG0xZe7xe+qQV3dhTg7OMsvlrWCXWt7E4aUl7iDK9dDRLG4GL2q1+aj4ZBKj1c0wnYIiaOqJw4C+esgl0oj8FUtmmp1BFP1PNChBWWT17ILGymOvchYVAr+qo5rSt51QBuimV4M0rKQUOadRifwgfjnJsvw9H9SS7dRWkn0pQQ1I6YCeEY8G7A2mW4dMuEH3eQgRqiVFcxZgNBQEptvw1j7xBehMOM8dYilocufkCXDS2dJvbIIHojiocHs3iHI9/Nle7GY5deGUCjSoW2YXvijR4gxb5uidgwvbAnUE69e8O9yueG4LyCH82Kyic72AeMyxQi6yRCKT1YCsi9gQZC764pxX44BC6lNBaNC5XxrSK90dgQerX6nl+TDaUpZLCPL9rzCpKGvZIeLUAev5UXToImiqimdXcgjzgUZGxCnJBvA0KtfcGtc/rVdHqTMwEeSHLLMW21grPD1TUWsOCrCAoC8PlFU8jQad0A9tq3Ot0+pjZdVVYHB2Awl2BthgRkEd+hDqgNOBhkxMOCaUvEmKS8/lssgDgaKKa7nC2ThGTLkgBapXJW6HkY111H1ba8qa0EzQPFrU69Ah5subqrcSkITfiRGnK7GBjKUqFP5j78MK94N4hV/yU3XzvpWr2KTisZ3YuKF/8Z5nwjfE/iBqJU4f4Cc2Ss/IQwGt0PZ2b8NXdubECSTfwqHb830tx+L3bkMHr/6JIYP+vJjsrryYv+A5V90Jgj3T9B4ndAI2Zm2nzlMtTVLwgLDfxfaqacPQt6Nrfhwjs/pQrSPJeq+qXcMxQEP9TLusygk+eltlY1AumPOy2gbWwLWJzyZWxSCLBZAmHHgI1liH0VGOReKeQkiWMzZPfo45rPC/Ibu9Vwgk/tfxo5gDVtD1DVntOYI3qADAIMsV5QM4kVRSGWNq2C7ME0xqaDSLyMVqveUW5V06/FLG8py2GaLkivQOSyeQK6RdxSULHOPGXKMGb/S0y9+QMMSU4LypECyG1A8T9na22m1F9X70mucMikeedd1Abr84jv1tKlLfnxqkBsSDS6LamQ03kjUWu6XgG0ewFhmkXd61UwxccQTZKX3d8VfIzR5o8GsmJQtIYP8wXMNc/BxrCrcUDpcyFhTP3PReV7MjeZV7rHeOH+P0c+lreBqoeKRlzsaprQ7pXj415chnFbYDpafo46dBJu5HEyJzwwE/ff95F++EDW/A0O7VyGO5DQV8VZLmma0QvY9Sb9d2uSeizEfP5kFN+8q8ZwiLJ1gq4zmJanWTbCuyaRsFAYzdmZ9ss6nlCs+Pjy9lCwFNJvNY5a4JGp9MoXS62+FLskB06nAsOhw3ilL/a5+fgv6ZBmwYLLjzKIUV0nMm3Ir6770ITk+HAY5vGidnCwy1TCO3lZoj54ZUFWC0xKNGUrJ2L3hXNRQJbs1v8H8wvyohxO4bSCkCtRj2jJl61YSPO3EaJJ4svodBVXygD9S5UkLIfUtskr4ddPrkk8+iLFdjzFuH9BnDG96JsBVUqV2AxcpNxCiZt1qgMeRheFu/NXwjiCOXOQxs9gNKnRkKtlvy71cl7lQ7z7LW74YM5V9mJ4Zjth+NGVVnJaAXWYh50w3c8/O+0B0HEjPYW3T9YCbGIjJjJRKpJo1kSZdLeuDEau+AEjcoRI3u+BdnD7MGx7C5Ab5FbeH3zY3U6VCMl9XVBqsNmk4lwJR6jDlDOt3m3UT4SYzyZhH+MFEN5MbrAyqRXN/ZkgdEr9Z1W1JnMsWD8ZXTk3eWdjdtLlghYX4JnSuoa+p9v7lAvmFXbLcma1t4v0cNk+5jecnRX6feKxNTFPB032+p/h0PYMUT3yXkVktPhdTLvh3bmVCwffMfdpj1j05yd45HlnZu88Pdrc1mh6r4vJvY5CgeHdbOs6cKpkNYUHq99a2RSNemyHtNx2Iqbz4G+zbv2OKiX+frnEcq+8cd4E5fK3L9Swpnps4PntPPX7aN9YNmlg84u9PS83WpAXvOEvPqSiGngk3Il3WQLDiuRh72/tKsvgXUkh9TGqdG4pszXL3EIs3yLG4ESdzQRDtL25yLytz7+MYcScQC7Mb9SLHY2cDRE1dMNeA5m3L0pDntG4EjTglU5UR9sCGpd/NO+/pcpybFByrvrZMnKx0907NP1mVqvxnCXYh+vrPFyiSnLgDBX3iGxfEId5ox6TrsB4JJaLa0ZhKUyEPC3mffLi7Njjc5xwKpvtaVh3jEG2ED81sW2SEEa6LtRB/eFGUcW6lXoCw9IDH9g0ziO7i7XNhJroksnpoUsYI9/ITG8YvLYrHPgP3wP/CD8isZt3ZsmnZXcXkZATH/28C+QYgbSb4ft51ZyRGyeUJqV2m0GePKOC6spqiud23fDlNQDbqE9kEdPJQGPTLnKokbjcqBLXGQ1IJqTfYmeJhhVwVmXFq/pXi0mHG8vY+w+pPFyE5cVKz2fEeV15GJjRmLJ6wRlA1TF+xMjV++5npVyaLxsHGSpS2cRZvzIIVht1IbKua7vu0KFxFjY+VXSsXbVNLvXrGGPThMjLznKAMXodZgNKT8lb/QFKJGfz90f58i5b+pOf07/XbHPvvplNqWVPW8ElQRmCrlG/SFWdMCnxuKkXfXKMMJnZzgMjSIbOpAJoguXKHV6/UTvcpPKVILuqR9f6sGONNn3DKz1qQ8LlMU7YFeiJFwQYLIKWWbgeVkjWgdmtv1HqYzFSstnn+gAJGKCOyHZ5iRgQdYrG+yhDQF9XUM40A5W2KBaj1xMnmkgW2m1i5ogAojXEJ4gUYJRhFaGI+vHdz6mI6YSMtj85reGbv1b6KhSZNbl1yVTGiX4q94Z2hxfJnZrerwqF7dZF619NNm5f58wV31cU+t1lzW/vx/aLbMZYGML0NqN1bpvO+Jwi95/sTS/z3/Zgnx7aXu060GJQSgAwQ9j7x7+6GKc7jkk8HPGcufOgL7p9EhnHH7il0AWuTRbMAIKedBVGYdRqHFRn3J7SMyhWXB6JBXAhFNZDDoJiDHh93QDqnbtIi9Kj4cQzHxvnxuDNi31ZNg2A7B9v9/ikR60kEZTkwNKyeQqnWuRKwOpnT/tbuVRj2/pOasU2Ba/36UEltOlkhbrWwQMIjTJ4edolKLVE0ITdjsqvBDM6voCdC7OPsx2UFVNliW8EZIUTj3rMJW9ZoytvOIjIWPGEUEvVJeuTPzZ7o5dJh+rh6k2QeI+XgS1Z7hAdfgPP3dezBJ0zDArS/Z5YJY++WSnvyNa4MQ1g+AdUjRNdSJYMwpk9LInvSAtEWpKNAbIRzNsVqUknx+QqwgRBQzN3QoHOiiX4EnhQkBMZTi87c5rEqqe85hfW3e/iWM/zqLhP7+w56m9ThBzj2ruEE/erVIAeLEmNvhmy/oMdiWtC7K5Ra5z6ovHNk7J829IZRXh6YMX6IjFKe6yXRH5wiPPEGU6br7n8XoiLdCWL1WlIRSbCqIS6HaWLzrWMjxdbUqNe0mHJOtOzxa1E5PaZz8cy+pNyKhkwo5aV61Lu1x40YZQozj11jiUzx3Lg3QY9lThTQCe9nCynvuMtE6oSHwIIPzZBJ6o7KArn2kwpoMr80SWIBa1YsIXiDDiJSE3DXegC8qV4mLWm0rEq0tA5gl7QMljdwD8c5xCwvinFfhPwgxq9rSyRZRKfqow3UcxAPtbY46sAI8HVdi+/lwUOd0POYK1PyTpr7jvL7nUaxwSpT6C/zmRgt0Nq6jyYdv+Abf7Hs1ZIfZqaCBX68KAW5jU0QYRTU2uFMhRnHDZENTrKf0tBdlw41TjYbEx+LDMfOQmurpTLofmym0nP5FYtfCIMFUDUlOub+8ANOt2Jax3Ad9CJaaH21t+N52Dpn2W0TxrKltL96qhgp0HRhzquq8ugyIxH3QKlZdtKELHgH56qPMTY+Fgj3tHhjg2TlHOmxnDjzxAIBEnOJkg2LF7K2eipWRRwWIbsoXav5oP+f2NlZlZlhqCGQuid7OTy97YfY472AdJVvyWBUymR19Vla93RLZfOh3SHJc+e7GD5ONlnJqHvGVjIq8g+wbb1T+8o1UX4q0aLC6J73mYUK+9M4e2DPgjUxr+mE/rWU4saUWHHFSXu+ffuJ5TB6m3Nb65M+GB6x2cjjDZY6fyWKK67U2A2t1pr5XurI9zE33Ylt/prSrteFDI0H71GHoqlhZE/O77u+HOTTPTrM2yhu5SvT0YgbHInlEpAnX/NB9TWN/bFqkM7069GyPYgcSptQFpYDR7MUG6o5hPCICTzWmDPUYWVZm2+uZ6tgclbv9Xz/hUeRdo9kRFHsBD5OWUAmwO54D8bS2Y/1PVcA7sTcgB1hwQa6lt9s1z9EhMiR++rqXyTbrPriMCXM/6a8PnrqBX/XrXCi7v1/OMiptunMPmFR+BiCGG2u++K4NgxZKeNuPcKSlw4Ia/Bz7w7IwtZ2bYB6gHs5EVkVXUlnYSzomLgJIyXxVcVUT+WgISV/eeXW4q+dOEEVJfSx4xTymncnapUfv4m7/rxKqsShq0BHmh3qMT/hQahaAAIOSNijqffG23xT786Ak5QvDO+AJj4q5qDJ8Elf/IBA0kuK6+vHapUovKbnjin3enHg0PZeSgqS9bzque3SSF2rTz58YYg6rHh9k+WdzqItsGN2PL4VJz5cDnTitzFnnEEvTCLqqu8H9VhETtWJWlkaGPSu4nd040c4Hhl2VoWTjRz9SsTRIdNmaa5KUWR52EH1EgX2wR+WPBI3/mDi63Z3FI2PIzyaEfMlgT/Q+PLF/5h1eia7aG7wSRAWd5goS6Gm0vFH8YbojtsXDQgDUJxpehq/E+EhGXFvGuQcNjiXlbDDdOhhsU0Ibc/A/PYMGA3wGY4fV2d7uXEYF6NFmB4pAHz6pMAqXSDvjMxQnsau9Idd2ovJb/HL2aP+GKAr5RN7p8TLlTypF4PJd7RPwXwbnVIvXUURD2zoYM1PyLwC53iRGbOgi7Bg4jc+4RIknZyB6OiS6+xgeY8iiBcxb7VsmBmtrjbggqHpPQltp5OKpeTRnJu0hpda0iRmcxeTK8z9F9YxYROPqr/flkqjS2F5TH9GiGr+ykCiKWfLhrU5LL9fNUUg8aI+JiOIRYX2Web9jLu7zhHejk7NvDWMllRDhuJ3XO8CxaEqY/6E7brQYjDwXxhuD0u67RaJ2Fbtk0c01eod6IckQ2kx/B+rNqcCe4opwrSPW8H1wONLRTz837/y5Y1XOiwz5Scv21WGdvSQpdXQuQd9ck5wMlrUMdd9RrhyYl91GYgLpfNjBQ2BmaITpxJhiIl29+VxvJ2zQ89lWOpwNMgV/hBYRzSERftSytZpVbjkAHzT7PuSMuWGYB8GtlbeoitYIfp3mOoLpXbruIeSuBW4GExHP1a0Q5Bl5BVDFfByaDQ9zRO+4EBM6VHNXxBLmFl3zRcf8Q8ecizPhUwaG8ZtnzH/ptPd1CtG/9tqiCrhoHIzlSffhQkcNu5J0Oedc0THB5xg7vHwIdLRneDi1u+zL4iXhRejY1offDHKfwd/ZT3svH/J2KYhY+pHHqtF8NUf6pTwYErFchSe8+4rmI2Z02d4cIWJyJH/Xb+GA/igZ3XR5rFWJxvzICIKFGKrjr2i0/0KRUAvSkGbDaoqvMrl6VrwXVHHjp3oAdvf2VWdDdBZXOhsNYxjpNiMS3p/+NkKM7pfdtieTT8TlU/E/TsE/fwYHDPhSVv9jKAc+TJ07xExL2IWUf7J2qsRaqB9jnivc4ENCw6Y9KmkNTIP4GEO5dnWDjJIy3BSGZ1/7yehRrx80FmO0/5j0MwZVv/TIA2r7fee9nftYb1Xl6ud62ROy2FK5fjWUBxdvoZY908gt1eU7iK5cb9ilBdxun7hJcLlFuxuQ2yq6snwsjHrXsuIOxSO0ADy2lrghZNid1HG3jqn4Ugf4KIoj6Uwp3p4MwrJBOLYZKwAIZVzlvkymNTRMG8TI2zmr14D35NBqKJMTK+f6M2qgPKaD6lV6nigYPo7wpYql/otejFk5s6x6Nw/EGnTEPnUWk0VXlJqxEda4Q0BmCDHjGR+3R1lWFpW6VxMPsOyTmkywSMiiQQ92+XPO+rjxNa3hybyutv0SvPSL6ZLQ6uBDW0WP/1OORb6zj9Ok1mt7OMJmal9MpUaLwlYSrTzMZm3TbcJAHsIsaQSeGPSKiMShwNSWvZyV+EUEHf6cmGUR5xeX4WGWZICftecLJH+jkpZGWvI0aiaFbGQoNg+vY9eYkXjSUKdQwlD3UKS5T7hUHv0KwpHJexLjfu5u78Ox9lggYqIdUUYAzMupgTjYJeqFKYFA8lNK5m6F/KDVZpUAS+pmbC7nxppuf715GxWeEpxO8E721pVLHA/WFQJ6/84Ve6XXgg/41JcFiEOkskN4QoTGCjiueG7pae6WTBdTyBHQin31NisU9uXcd57eNa9dwYX+ldHhpGbHRrZi4dU+jjr8AO/xfMAtW4Mx3emJbiqvxxgLv5ykmZzI3hoiNskbhel7a88ecL9XAAJ55TltZ9MFOZWmjczHay4WsL8kcbJPw6TIph2LC4NEb3mxSojKQ2Ly2QOFaQiTzMhFoGJRkBU7HMk8Uy3GDYZ8Rl2rrKXEbqxKVumfw4CbJg77UaXcuE146exmYRfsF36ZocVG55mmz2nr5P541lklEeZC0QXe/vBDDibW0K54+iUHaL8stdRntS1vTkEOCdv2TpWbhhjDEQXY4yB6LLgQGg1jDHGSImptHO65b08DyyvLWkNLGOil7kkCDjmzDLQB1SVJ+wjaTRUAoVqgpdGQ3mMV1m9WLi92WkNAyQs7CqSpUvIEFvMQDmFkQoBrbXuu13piD/e9yuvRUHxndPkUCV4EljJb2IWtTIHV0NDWKMeg5WYe0hyivDsdGUTSuNljEXqC4UMprphHnGRY65tRAUVfZ6jIGvRivF1INQ0yaYiistRqrem2w9P4phyLA4zA3r1tXEXGcKqTVfGdp7kc7Z8AdDwgsN2KIXhaYmW/BQdyOQDpnC+zRXrxmRrlhvlUfN2eemXMkOi0ldrljqHhubCMsbK+zbzXZgPMLgcsnItGWzV1bV6tboBqwWL8w9wy53Ci3htov0aFZGRZsKDLkHGLX5exBV2YWEDNEqXhKrxHu087uESSBWSxcy/RDz1d9mXZ+bYwf6jse4WKOWteKTkaY4uFmKI8vVnBbbJ15fMIWcDMYlOWzxOHWFgCZvggdBvNrjQ4eZHidKtu9aLz9pRnygO0ucxuaXF2bXw/vaDwkdwhzEbhgRkNu3gZ2ZLHhiEa9ga281xO0be8NPG6RZniYNmeH/3NTxLotE1z2QeAmkRkCeOsQEjSYIZ0W8KBS4lBjssWS3FMgLuzCniOXwhbcLskpV2Rs0S4gAeEDMfnTBn+OLCQmIP3b0uzh6yB0vvIBhchwBwmMTQjZRghX9HKSjqrCJsyvR6+K0vgkX5tSPYFno/SnIM7pYtcbXCFUJ5VQafkh1GBvfPcHAxVfflSCDI5xfmJ+NU2GhVO4w1+hmH0/SNMcHZibB8Xdmmm90hc5QHYWYCIdU4cvgO08JY8RldPvzAuz/Uva6KRhACO3bxB+ucttU0+hwn25InYVgQ0+iQeH4yFwgNi7Aw/AF9HjnL77N2rnFm7jGuRWmInaFpsBhIlGo6ceGLyFPBeMFzPubUsTGeSsBhYifphcyBWLhz/a6h9zMTzARGGjM1Y9RzLIq9ah9JOW7GFCyOfG0Hkbv+c8b+HHuJf1ZojxpOgsju+3/o8A6FNciyVn5NSJpQpk8qm96HCdkwMowjeJUCRJ+0TWc+/w6baGAFkS+fQQ/ix6BFdtZcEn/MIS0gElKIcqkcUdAFAxtcIS6jEI8IIJlsFRdFHZTo0t/pbIxbJqgHa3YxkqJ6o5pO+D9tPcH+vTANXlWaKf67LilMGWm/LbS63HT8clobrg7VxdSQVaS4bXTjEEq7puSTy+c+CD/5s4xSb4VON07NCBbLIzUljH1OXHLItQrIYoF1ab02V78X5UMoDbHdBsWq5Srx8xRycnAnAXXLVMYanWb7h4H4a9/OCdgmy2W5kH1KjJXUm+WimbZr78ypnJNZHVFm3iQWs3qmXLNTqYqZZ/AU37hfJlGVAIJe4A0XSFyYFRqNFzjXmEki8/ToDpRXJ7dPMI5kHpozWAof+wGxjPaIpMC/d4QpAOKjcBh7wrCY3dxME5y2POHkUyUubAhFKkNxGbm27lXTRnHRfCLzOiV8wG9VHYLk7RF1bwc3cOnN6SRlLTGrPmjpdXwswgvVje9unpqelv/FGTuRL3i7jlWZqmOBK2vNfmKWclesls3b98swmL/ud8AvEsCqJvkx3gboi3rKFBIX+WTwQYIiHnOI46/faQVXF+JqucWf9NcLyY9chuLZcm3qRZnJl0vx/gmFIiJf92P1WShLKpJV/nrW+rGAgNUpASoyJGqKMtmoFNCUzLyYi0ptyJqZLtsLJXjOBR2XyUhgoizBlFKNnrIAputFteErpqWuZAg2btEH39ExMijq19mDE2pfhAIdyN5B85P9276XWmRIvDX5qvDYxY346MjFIv5946HroWjg6UyrV7M0b1uxcsG3z/TyYwNBPlphClnHyGktdVWnO9dWjDmWC6wBhSRfC8U25V0/fuE67WxivC6mkS6dLiJ0GP15vo34HnbAhSlf4V0r0pLTdAvyNYDGXn9m35ZN2u+UFrBG/prvX5/YBrHkNb5HHgqviWLsVskGMHtWl0t5LPkhoRkOrCbfclkI/8RH6Qx9EayjxRFIVK5tXGJ8Hcb4l/t2z1+9+gycACIf/VggHeOFT+YqhD3c7nCKTFzYmmi/ihC3pQN1rfFBcYVIwOvgSmBdbuXyhx9zXyw9ecR5d/OqEfq0Ld1ytrHa+Bo3JQ6hsS7D1ELP0CYiaCJ87qTWUMjgWluTUV75Tyk+TWxu+OEUG6LQ6Q1N2JN0G8ptRAe5wGr3OpTDTlpOWvgbWP3Z69L0APH8BTp5t3Ku9MhZ8Xvv9s5Eu2s4ZXIHcKR1DI9y0Mfqo8jAc2c711VDvpqQAggD27/Oh3TiKGaoGq7DuDzA7HHAMS4T2QQKtf5IJbZQMIyVRFkZ2M7BYCwlWf9viEhR+5bgS0MOBSGJ2e8zPdhFLYTxwpw4LhJHlOqTetk+jMQ2bNK4984fLhyShGuAXAYeaFIidR8i9aB6Lth2bPSOSpwqVZ+bFf5FJ42PY9QU7dgU/eVb283NvfmbPjdi7IMBO73+fN/m5o6OF6W38SmsMS9lk58nNQEwL4UfmWEfUmWWq+OthnibNRrqw8ecBWAhYxqs1SlXhm+TdI5AdtihuGB7zvx4bufkMHMze1vPDpY62fL0UwcWUqnsCDEFwnJSkEmL2EXlp+uV0KCWuzkOTtuBdwIce3VSsB9jkTMHsq4zHzhOq9w9i2MarOGYrnJBVJdMKtj3lhUt2ftmg10eJTyygv8Wi7eRacRRIhFI+eg+LzoZsfkCi9NNmfpvGR4GKejeRMwZVCwUnm+K6tRY5HsJpNZ4ehV0sVH3a22SolucPbBw6fppVbxUlisBK8fB9loQ3xFreEBGkN4dxYBC0YGe/u4ftJW4lXKQo2YP8p5WlLgP9r0poiSxBGmlaQDzXiI7yMBic2OeYOY5AxI6x+geUfxV+bdSQJnhD7fXHolRnutJTWLaaq80fqfQdlufpIQtx7LEX1VI3EsNgP6AvaabfFJ5r8EZ1ZuUuKuu41Ad9sLsjaYHKWG7Uu4Nc/GX6ftM3WXm9MtHx7OuF9fnAaK0LJYlaUCElCPYkNIKJbsVS6n7+uqgV1cm6exPa3VLsBYL7ieAInfXBYa3KbvTcrNSVHIqmKMOU2ZYlvMkbTbGeDeJUbMAgaa+pQUoJQShgE00ESLqxSK6oKyqYua7+eBITSi0kTNMAkotciuPfw3Hw/dN6OhxndJcEzhxS7s2bF/ebFMyHQNMH2TBtsaQ6EVA9m9ZfyRegQfThM6peXC4WY2lF5t1TcPnBJKYDv3DxQB98mU5MDLqGpXuvl7Tn9GSW0cjDzh6Ih5PLxOEkOgiJginJ4sJiUfoyc0HuV+xjjUIkIDLnk3kJOCWNm3KNGGpY1MRK97//JCTanc4sTzt7lJ8hrrLJS/8EQdGFYIcLzUPAt65otOw9kSMsedjuok21Zx/y6SRgcDnTsG6OIU7ZfuFFxn+OMkXp2ap8C7J4/dUr3schpkOjy5zVEsaYfGwyw0QHIaoRg3rpUbKHR4oAImjZ4s1adJg7FFL28aR6Bnlu8CCljUt16nASmtcs226g5zuGRGnHXLqo31TDEbo0pINfcX5p/qxKftxIgBYdnicPrCW/Ra+S9gbppAmhlK18oOLcE0YQpCSYKEFTw0DXYWnxrTA934Vfm7gZ/3gmZfRZLa2VbwsGI2wBhHjCm/RAhuvj5rmM44WL6ffyWrpwcXZhaNvnXagE37nv5ddZHkXmk7hooDarwBRF0zLcSGF5NaGzO2RuuHQ3J6f+0luRhzKVDS1ngaFiHHPk3YdzwfBaCeeU2gHTDzVx0P3Da6fugrY5caBwIV7JwT6tkUoZf/yuZ8rl0v2i9BUxEb1IaDYGsXWJbM8AUq4wqsZSIFCx3JHOI86SQOqkCq0yPD9w8TecdbKHdl8+Jxds8oe2oFW9yNZxWBS3CTrh3eKptL/HEbxSFCcvCXkoTRIpgShTSwuV2ArIwYF+0FK4BcJc9eb4BsNi1+ic+L5pefAUvAzgT/PyMjl45xOwcJ4i2o66jRKBSUBOhSArigYjj/s8fevmQK8MemU59+oqY44J8j41u4m5edgwDJs/FtuyiXfepNWdN6CBrjryTmE55elp6O4uFfse0yQf0V8cOT7cgcs93ePZ662JoU/8UbLIDFvE7mb03YuYGxi/nCkFrxNxFpwXV2o7Vef/gTLd05Y3qTy3JUdk96J4h5UOVOykOqiNksXJ5al8ndBgT0YF3sw+crRMQEM8iCyGJ2Sj/tYGE2moG6p/5q4eP2Dz7AEWJ2N8i52qcmGxN6+adNpIu5BHafMe81+6+xliU5Xfii/DKTX2bPptOvT0LU/gIRHmMMr37YwxDVgs5vDbVYfcyg7D02+iRtcBgtD/umcG8pnchetr71H9WEhc1cdevOSW+kQwK3L1KHQTUr78MS476rXXytd+00J2/oylYKPAGXV8YBE5oPYsI2a6MBckHViuTymJTvBRk4YPTvpcCNccG1aduXxJC1EkSdJRijQLb7UVDzBwwEKdeUXejSK6ODZuW7e/xdbhoHpQI4svcTp4+Ex83VTLylNZ6Fhw6KoXbkLHyvnW+3/zJYxAjCkexTRlQNnxaAHX/qN1RXM6x0nrFpMFLmZAI7hsqmsBYmrwIUDlelAk9ijR6qVJtJex6vm6m0z7Kywu7zq+GjYFD0Lj/Tuctqmg4XpMLoKduIkKj6Bl821FzzxWQejuhdkpULtL7I3ZfS2r5sGdHxm789lsZKykO1vkTqR90NxTvIDOuSmSXLsa+zB6dLVQ0hTvk1DXoft//4zhNzJ6yhdMkuBym198TEpMY0BdVPD0NaC07KpTxRM175X6qO5hdjY1/q2wqsQamgLyxEnnWDG4gtlt2PnrcLze72TjhCkfweXvnzf34rGbnclOGKrWedFsTEK5YZpQLN1/KDCNn9SlzkcGkvo8mjiDcm30PlUno2VgJJ4RelobWhZ57woYedeiHdwxnNT8ebltVcgG9iB8y5pcBCGZTw8dxj2oVEST9b1Ss3dHgfip0F1IJdqW1t0IUX5YU7W0IwgesdU+VSSnp6kOcJu7I/0FYbglbUAIO5sj46R97o56vK+h6hxn5wKbIIaIdGYIqXe7cvlJQdrp2aXCrABSb7de8BnAZ48JfXvVkoR+Lohi+cwgQe1BSQg4VwE6/WOWK7icuST+HGNqNH7q9B9iJSHYMppbEQisSgM/c8U0iEvNOJOO4fX0le/YsiQfQMET5DcClZOGkwVysIGobAsrkjsgO5ifnLyWvU/jsSdlKXMN4vJSlekchMR4co9yWsl86cFu289N8KLoSsLzPrHyRPM6DEtKgmuh0jkJfJSgkGKYb2O8AhiIOCTF4AM5ahhI+xKLhxZ5HeYvKtgNTYHnBRPpgd6b7oJfo2WB5kQd5BoQmxz8b9eBttuzg+PPo+98/L+JFbQWhCszyBjGPZRBPplY8w8oFLHa9NYetIqoNOIXQgzcLyE8wUUZvtBP1xNiMf5bsQLI27Ww+wEM59cwY1FgSsyWbFVT8JFl8fJYkt/jtoh6r7lt9O+l+5wPAfSdR+pTn0vlpIPrwx7FFeziGIby6dnVKZ3i2h3oYyTeQlyaLI8jvqQmjT2PH0CaM/GDBRtumHA+tfFJHZzgLMwWwpI6by9Qz8tC3gyvI6D2MPIqQpO7SaVwPwOeHCXhsIrodc9gq+VacKGUJmxC5u6j/Y+IC56he7CISQoaHQp9jfwfPl3xlKgRQNHtO/c5xfTkjXltfKCn58wdw4Z7LOH8y8sNHqcKnNUm1pSSDDlTxslnTF2DVBKiwoXaCxhsSwMVUwAc1RmGvnD3u9UYpaovfyvScWq4nrZBpF76SA1p1wqtwOxALf7x22fso0kvWVz0WQUfNH2AVTPr+wOUMD8GA3KwXQcxydl9w7xDDsRY/n1AnFWEGtMkTtpzlTobxW9YLNA0hLkd3/N7us7h13JARpTzPzSqxCrBj1zZ3YibuucPApMT4Hx4WT6KuV8GzRK3gVZZGCyLbZfncvxEGzKKcq0PZ4yh8gddgBvVTAPwMCSwtj4lRsJl3Ejp0ZhdOpY/sGt0JpBGMlT4l0WCJfZloc7QjacA2qw1QxPxmLclJY1mCG7tmpFjw/fiwCvBy61YbLFnkJ5/MWFBBl/YX3HMB9tBE8KlrA2LIJcbk06e6GXYxbX8fD+nPv9utCNV3Moc+Li9dfkhXJi5P9pXzznVRr790H6SN1os7lmY3+x2D9fwXb/5fPjxX8a0i2mCijvWNBqdlZaoLnUBQu2BhVqpAopVrrcs+CXa49igZ2c5ZxVKg103wV1oDFD3BCysFBVuYQCRk5kOJHDHaWt3zVfDNl4cJsSQAPnTLA0vRLq9Ud/UvpYRQ5yd1nz0/32RQ4IaZ+c9MMcW5qmDg6CfRqLSk3bVLTCQpoAC7W1kXRPvU1FkSMrihzZogNCEioBC2prKKJnNHgJj2wK1dRnqDCGos3NmbMzgzra6yBcR69zg3bdKeY9/rWpr67xx32d/3g1+JnboSmpG2ln1+TRmlJRho+qphw4qhAjlQvQjX/U7/jmFk+cU9E+Z3XAt6nl5oF0RGKBcI5CS/gXW14TOMbtqaOhM7QPycugaBfmX03RGj0gktPEDel1ECekBpKCu5EFaxuxOslst6VG/La28mdKq/bQot3N4FspA/A2nbLZ00uKZBL3H0wDYIKsVdz2LQhd0XNIYK+uv9oPI2FKPLQo7u2u6o7nxzzEWJ4FCtihTr9GdXkumuqTViifEufjgbJd6nD77gzrKsBwodCoiHlp4/5uESV5xRbzR3ovFzozwSMLWKv9CTJaO9dbAw6sRYKI7242a3fYBZi5To6LbviiCpaTdTsU3EyTIdGUmQaR73jtN2QpS9YudjIqAtfDwkD4iZkDyByW7CTwi/fALsetYCvr+SgHGAEEvxYynlcjLy0dOSsMWyhGf8Zx8nPlX0qxbXgC08e9dHOW3YC+5lBJVY83OTapBDlMZLYQK9gFNuuv7GTIMtRauuG1cur1JVtgkEyDmEaP63/mk7FUGzzIuAXddt7dEBvyKHBdlm8zzmsKkS4xITeVFUOMfyCnn0tMPKdi+myDfpBbCCUIkW7V+g507NHnXPmN8an+2Nz8+XdRQZbIBk16gGpYNJh/364hJJJA9a7yw/QPqKx1jkhWfd4ENi4qJ+wTqj6Y70goHjVmXaJJWll2MjXw6Dr0ervB201//jaOKDjDIV3xfx7VP/ZJwgQlbhComCCn18gAcuAqjUdqQn/aK/u87wbMQBGx38ry8cnazE4WxWFh3m9tIMCIFJRYCe2iIUPcMGu7FAZCyTp+0myJnX6atlx2pep82/ZqtJHAZIajP3SGz1rvlonXnuu6OB+pOQ+Q3yix6HtKswSCUUJ06lpJJGM6kv1wNqBAEgmkicTwbq5EMkv3f5x/jFMcBqnMiIplaqwSXIk0rQpWWPfpgTO4dig7TPAI1MrYIqfmU9ShD5HnIdDhomcJ0TYZJU2GhlU+2+hHfFXXAtntLHfPLb5hmphRvFiZ+3Jqb1/vrAAu3yGzrIYTgiNtcP/XQqLqr6a+EEaDYZz669BeJfVnPtnGK+zXFXfB+D3A4MOyw8CYE3CCBCyXGFAbdn4OZShvWHK3/hxinrfCf4Zi9nGeELbkhWjDlB6vEcTkLjJoFbnqTMTaRG/MeLvMoMY2vdCneWHMLxZNz8eoOPyPGkcoLDdUhmO6/8j99fJmW0j/VHr60B9uPci7T1utw5J0x4Fs1ZfzlIVY0d9wDEs2scda6iij5w1XPCspclNzdUqTiBFZLtJuzyYZ+NeoCdQTZvNlRTfB0mNDhNlk6S5PBFtrrpZM5ySEUUFLafv3Valb8RNngrWj2A/BDr6HRr08bgNFN95B1AyLywY/ZpAV0bxnDC3vu9O7DMY+6+Ch/Sqmb74arHZCJtheTM2nCJ5P7y27F+mziCihpsV2Ydq/AKzOePCT8fzxJSc4YhuxO4D7dY1DBxuqX8SNxd2AJvImfsDZ7CtYMZxcPbjvcuD9QoGPRGiIJtLSuutCvaRoNZnMPX6YklP+UJKLj+mLBD/m6FJAXwo/XisaFRaMwg760H/UC22fcgKeVGTUII/ltm395btII/o/2k8jIsfZosf/OA/ELcC65SA6yEd1Ga6TshnpKzy0S456ZKEuPomT4rVxVDLdJBap72UUjOHaKIXnM+8oMI35O/wN2PQfZMFkAU2nijZ28luwsXOgpuIqnp50h7iYWaJybH3InDFKOTtsd6TR5it563BxapUYQsqiwVlww8nSjO8E8KJJdXd+k6Jd/3fwhb1BP8Nh+HYS+b/qHgv1D+Sfjf129U9+wj/Wfq0Ul5Q/1a/zH7r2djDXYM8NSUTHyBtal4Sfa4Pa76x+ubsU/9vf0KFVCQoqLw8+aaPgGD8lMA8/WZBBY7P+Obj8xzwhE0CT/OfnUSaT5NkSP99FETro94MV+TkFpdxhnM3SFZ0w5+V9AEqTja48Tv/RKoT4cfq0ybAWyj+0MvA+6/QUtvVm9QhKB4JoTZsdc6cmEA5SM2ryPpLS1p9v8j49m3rLvT6oXarG31Qq52xu5lqWcr/E570Tn1bgFHLga+sdwau6eUBSvUDpIIH7laun2bojeNBacCyzDpRuA+5UqznkjDcc8l9PPaNoMoETkvebH2qDreVap//kIuFC3UD5AFtm+MPZJ0+dE1ZOosD7SPmkcVU1D2OUCuVz7JrE8wLKRfrpR6LJSutxm8uD4gz8LLqS621WpFHL5xvijDQ7sgP/y8qRDYs6ZQ0zdSVDnY6U1l+/V1sgO4LqTv3he4k7wl/oLn8/5u3eVnK5Vh6+ClIMzkVIPJTjHy618M3sOCj251+zZ9V4WrvS3q1ft5Gr9BVGM+jZeAuBopRzcj8GmuQS79cfHuydyLsgl4xdsGXpUUUutH5obk85TvyHf0mK9mrNqP6w1bbsz2Yk7RKPI/zzGpYtdtLo1wWOcsr+V109UrZ5JHhG+pHUutzReb5EKbtd43a9xF3tryoggLQQvKbI693npboY8GK7Gslm9udfrMlbh69ySoOkuOPNzEN5rZv0N4Wu+lJyf8H+M0FRG9C3dB2/nvrJ+hSmv3jLiz+UbtX7DySIe19kY9F6zDytiSuHfVTI/x9K5EHj9nflaY3+XAiOOfO2Z7D47o0Co/iV3cTPCUsT7K4Jpzlxaom1LNiXJ+5WB4yhFDtp1bz3tSrynLQo1VpnBE4QoGhPAYZ7WYUjDQ5X3G2jVLMDJ6kJv3ly9GedC7xYqbzZdS2jAihqQ2PQ5+Mjdx3pDBP5WgmeMgn+k+uvqnWlpVhAtid0+ecN5rRQ0RIndW4qiZNRWoJ2jcbnO9fAGh2JU2hR2G22sgQRt8iu4DH8ErXGCbcT5WjxGRh2rvjXOhzql33LrBYuBh61turIhRCtI79Tsz/3DKk+vm8xqDUIq2afP//amJCdElZnvVvvFnDF74sUNdM/MS6O7BjAIWFmOhVg9VY6Ms+vIRW4Nh2qB4nKGK6iABH/VuwD+UjevjzRlU8qUVt1Gh9KIoT8k/YlFERpxZuR1bceYHL1MptuRcN0anauQh50mKnbuoMgn9z2GX2rm/MV82JcKZ9Qe7MPRVTOhU44hkFUgaId8Zj5OUaqWlNWiZeumcz31FduJvm7SIe8XX6FY5jQkfJnvix9th9fz0sv8Tr3K/19zvF/K4oOfinB2ZE6jZR1xafcU9tEeVqC175nOoz4VJLfeuB1x/Bf6Tzbs+nnxEPF3DvRd5RdwYsDKxP+Ktj2mWEzMvxWkq/9wGYZGT5VvOkz63FFeVOCPx0J2tyv630roMEIp37MUs7KdFkDQP/qryUu/f8djHbT95GtGOfXW38BDfPDzS9by+DP/hzaDvpS47C/4Wd4jX0rwd94f+zeysdtOzNh+Wfp/ipf5WzhDy5M2VZuKKhL8zYzFwG+lteUYmQRozw7ib3aPYvuKvwpTtZ8F2vrdDY0m+4/Q7gOvxtmN7wxHN2cXRpWtt0vGi1KNW7slK3xYJdlNJ7c9nJpPLuL8tJ4aa9cmUb7c9mb9t718s7UvY/ywXRyr3w0rd1n6VbNoZc7q/Ahyler2UflX6ujj1lOViufevlp5hjlwTx5UB6ZDx6yrM2Lz72cmdOXKL+RX+9z2Lg5uejD4oY3MXxz8+J/ORzdXHrbh5NN+CeG524O/unDyvbgsg9ntotfsrx1nV56vXO19+2hvva5eRvDL9ujyxiuXB391etfiq/fxTPr9BKVy4ecP2U90QnaimVpKtCRzz0SYMPngAbwm+9P+A34ZOGmgT81/94331BL/tjjf4BvL9RjAzTwnx47QMlfjFegjv/skQEH3u7xBFjx57G5g+nY7qmEc80XphrOkp/x4385rQ6LXF7kbX141Yej/DUcvFyO8pcd/ul/F/LvfPj3BK78PKI9wVAWeSjTR4Jj138Abfn4hu/hL0+lvO2pk5BSyj1V0slmieqSYJH76nLpkL4SJPeguxV8NCbA1I+RVxlLn/Obh6HyUBFl3HTm7I3faZzNRNe6CLAfguG4UN44Owh6UVId92RD+161XTk5IdSln0nXPaAR7J6lD71Y7DdwluSszWzSOVT32IHVr6bJaseMECDRIyWIQfPgDvNOZ34ce1kw5mTBPzgRHxazOC+nPDD/K8OMq4NJYELTBXNbTGx6AOdq9zlnrl70yQD5d2DInxhzWKBQbPNlXkQ+6m7E8yBeQjAm7jaiHH9s2kI6ANO60yqU94frFF4HZa85gs17w2lMp7Ah8CHOL6nWoB9JSeUf5fpSm2wv3D4+dKZ75jjli7CznDP500BrswlmfHdJ9BYuAJ9NNuI6UBu0hxGarrJoAwEOY/dbo45tl/CXRPLRCuo+fHJqeaSqwMaSPdGiuGeI2ubsnxhSJPoN21EXErLTS66OkD+1ozRjLfBgLCE5OwbWhArXht3LSXX6TKEvWibDcCJt/NemZaTBHwBw2x4DagV5QJQMRy2A8ly0y64lrcF4nNgRKkCZT9Jm7mfXuDrgn+a9K3VSdUJ62yCzcbKCP8qO8cfQo23HSPElRBVO6GyDwKkv43AkISnMr6p5uISkJeYfo8JShs+A2/4NiaMjkXzlsCpr7xy6t8BUEdu5mTYOAun9Wdx5deb6ziiKhZF59t/4YmB7wk+n9pb8KMPVdpe0VopenrOKEaGy4XGI3bf8OYw8vuUOskTTSnAUZeEqCnKpMe8Nox0pJteB5/Mg7y1PJ2e2wso3ybHTWIaIjn5IOTaygOTsPLPTeZXtHYAXs0PYmFXn4vzCXqYIWF/1jJMkYTkkgYp0ZB0Svyx0HtWr7S6FzyF861EnbVNRRUJRGd9aXrJ7AHp/9nnmsvNla0jPdtPDwpsTS7CCzJMIX4clPW8WYOW9iN/TKPW62X7vxqf710ATNZqXugRriPLGw7vPRV5uwikdNbFhBFjkLmrMRR+rmp3cIWS7WawgGD+9bEN6pM/ncMgZWUUkz6XqMVGTfcyauZXO5ueOtrLNVNh/YhFYOLOo4ocPIzbDBo6uS1yWdmmkSFrshfDqZUGrYt5nPJ4AWNScXCPPHUCnJTmXHlB196NRezX0Uv9uBjThMV113pYke5dQhUpWmnFK+2QNCH79IaXjozOuDM5TZGcZ3gGmDWaIKP7IE1WWoi0W6fFlGTSPaz27wVuRMKVEjYoT7/hBuXrlieY9rmWndKHiHiFRoqMQ/1h0gwYEQW1FVF00Dv6kKhM1ABvs/905oj37rhmq9QdE1p+cI5onRwxPHv/eGKOjB6b00OvzOh1kqyWFw0lIW47ceWt9BXCk1/bNz0s0JUYLejMdxDAMw7j9OafJi/zHrvnZdEfVffot6HTdHc6eJQxEKmC5HiE4CpH5j9kbE4Zolxe9vtt+7u9O6p5TqQPs0BYqTanZLWGS5SxJtKJOs5FAevvoy2gERlTQr1N8PqZ6YjaNFNcuTENBSkjsoUNkWRq67/1r/hhYd45wymE8ibPmmc7M6YDsamb4CbZf8kGGUIZ56F2vGIgKixglaaI4kdB7T15JMrcgQDuWAlPWaBbUZWkWe37HNIUbcuTsITDf0iRIcgH/TmQGW86EZtI8P5yrGZYvH5+8sB+mTKbtCNwhDEj4c2JRnYlLwgnice9h2nhGL77NszYgvPvC9DyXYXdEJIkbj5khl88wl8F9DqIW7E4DrYvxoRayUj0/mh9JIN2mN5SdtWADLPxew5CRelnYIoMpauH7NW2J+RIPc5g0O3u+odtnCBvi9Nwo+sjgKI3oumGmlevmBYFXFsmh1OzxAjUlOnpGPTUdZG7fxXk4a+B0g3BMVvER3YcCL/2sSi7ZUFKMc0fU2XurJH1XHN8ZwrjsvSaO0vSNr+RetfdjyvwbNaGkvsp5Hysw41ZSuJctivy+Th12Gk7xRoJ8QjXq6Vvizf0o3qzZBunOI1JtuieS9OiYMHdQP5BF3nrETbcdofXu6P16CphPTsJ4yzw6T0NIDslqWA7oWAv8HkneWR7fy1DRuVV4Yi18Ai5VYkaGC2/vMxo4Szr2XEIXAOJ7pM1rstFnd/qp4WGWQ4XmxUdFSb9kx7obX3rPoRYN9ORtoRJ/pfs065BLVAKBzK8rNgQMn71uQt4ZX5StY08D/Gf7QZNsTrPL+ZvQ0aGy+Lj53MGNmKwWPNkR0fy4skxEj6ovYxaRsGett6eHRZIhMqAzSWI8hT1KmVELdNG5h3gpF75nfkAg8nbu9EhcWncozf8cRC7LEsVGyURguLAT5/GORn64KDTaD/UHJEZUjyQ9ngdcXsvRyV5nMRFs5MoJ/RwS5PB2GpXIQEk0KVUdhy/AJIGBdt/pMqc183ecrYcWRGDMWNXmeVlkFr24/+wZ/ybPPQhc8DRofNfenm1Bat5Yg0CHbfF5NLECU3CBSlbI76I+YI5AmhAislNBkQ9q0snQbd/j+Gzm5duOCMFOOglB1ig3w0xQFH5nfljLf3YwcM6u0xNE+rudvCPXOEM6YtByjue5as5NizF8Ndv96Ty99NCBi3a40t5FQvb3TcfWuURvo+kTC+aAc8IH14m7NDZIciFFWHr5YwsW43veJZfnZj54VZyb/4X3YcYuz2R9E0i/NQQdGzxpe4IRWYXrovs1XxHNrV8JyLYt07QkjLpZbhL83NALXWj7MVHIxzhpDqpNiF4u3Amz6XwkBGfEnzAMwzBix2Bn/bK7C21JGi2AYmbWRPTJAgjPXczBpdvDJsqZoKIpzKOzk4sxdExgtaUvr2I84Gh/FYkzEvxrVjvPQjqt6V0ELwA/iqSERYs6v5jdThx6ruju8MwLzh7ym/Zf3ktnNTEFDChieakbB18RtHegAW/IMMwcBLaUd6IhE5SLM/l2OlFV+BiiRlOmJtLzffwESfJtI9dhR8YgQuSquKseqBJUjSUS4kZ/fxbY+6cDKmlAdguJ2gC5nmHsOcoDKplBbqqWfnuoyp7U5Yz3y+znNzzCo/NBkm1iLAEykAdSQT00JxLIGkFQ88G9VFchZMOeXJKOpkTk1ULmmZZdf3AC/OTWliHVRlmJuMUXqWERNwyTxBX/PcMm26d/Iu+1tLp2+Hq4WdAv9LByDeIQSD0ZFNecSdz3CiNVSowP1sHQWlVjtXSl7YLdpgfuTz/m0p14mz0S86JqzmfhC4larRFwDXrNxITHWysPbty1K76YBchB2Wa5z5rUfjhlUNrqZmSIk+X7b858U4/un30mEeOKJolPGuq46NBz4R6dhLcf3GFObZ9Bx05u4jDxzUbYKnaPoa3wt/W2DFLN42t81v5zeyned79ESfAqNU/mHexa5vbcK7hdtAlXSGs38x3kexfVQfVZyl3nIUr9gkOj9LJ4oxpVaC969ZN2gwb+6SCslHFi//uZXK0VicdDgR9niBfAGk6Ey0MUJEuwcUNmLB6qZbqhKqiGIeDoy+M9g35mS+RQQ+xFbuUMUfkLmUaX6XeO2h8hseNVTVNIIGp7f1kI3+TnhHpVZ4usuOSFXYO3xrQo5oQfibm3i1Sa09u1lWVR+Fc6adAeVo5ybHyDd435U+hzuZ9Z034WtDwvMC0gHIKdUTdjNXqeYKvZjTy5AZ3p8MOT8pwJz2Z82ImdBcTiS9o7oUN7v2jKgnE3bY1ldYttAFc64Cf0PQuYYOxqB7q3k8SpWM7N8bEuueLFpZRb5nOq+1oLyUGTYilMsLYubhdOTE1mx2/9xTBQf1S8k8IfBwEPpxob0kO5apfqghc+yV2pvWY/KHq9Bao4Smt5X63ZmHHOc/PaGuwATsuf75hQNRgXfymTy5+bJo2yYkeUs/Xk4DfPfB/mpfJR5TC9cX6K7gKTILTwgLdSZNGvTvwZ4EnsIokCgcerd+RtUA+da84o/+PsMAX6l75KeTgr+pqGCqorLGhJLL7G6fUDCEtmbosUDXqBeKjU1F/AWNt296I0dkvipPQCn2bjoQej4wa0hrz3GmBS1MGM9qXzXGM9idt+FNfIFf0goDqJC53PXdBiXJSxwtcf+mFZ36cyuV+AV9is2n0rrWFdqzDREDHjvNJm/OSEimwWzSwOwzAM356jfjfIHbCRXrbXIsFEo+OITOBKRNUMPnAd2fIa7ooAlDBgZ79J4OWzHYPOigPuv//E/XeuckpRN9RgksSacQHV/j7pgZbfSTReLMjLoas1RUfFVmIm1dRiZv6v/1H9DLsaH434MNlycpem4anh8lG4oaCpaPV9+QDmnxh6K8WlYIm69kO4mgRTzJx/epNjHiP5h5+OQwSw92X6Q4ltqaEZK645TT8QXX241FiHBDrliZIZgW/TKUTsg29fP+CxrQZ7VWwY9ZbDgif4cBkQjP1YUI8EnEwxbJDH5anCBqVGTOHLNSsR27pr8fWdVsoSyGsQwSx1rmQDy0xL2BQKQjRFXoeVkUc5xe3O6aRbMR5J4ZYwOf62BLHy1kfIX6EaYmYKzpFkoGwMxkdDuXGxN3UkNXnV2C2aocC2alTcc43qlNXyTbrg5kq3tNQzSbYrUPul+4Ap603tMzFyCDUzwI++c+Z2vW5YEsXguBZjHHeq3bdR/dqNZQpK6yYjr3xA9dbroECEUWO9EvoOHMmIfZzE8DJ0CJ3AAD1XIMVSllE66nwsWPMBCdv7UUjj9hr3RbIIEyDlPoF9e5ysqIxSr26eQqjHDd7Gs3kV1vuDzTwbCA8damqsL+sqLmmCQ1glMfbS8b6wfCJfPt+/y5GpHC7wzVuHJLkl0xhsATZVuu8T61iBwPU5sGP/fbpK8T5EOLW4qLHiEi9WfLgBYHr8huc2voQN1pP7f4/563c44B3Tsj4ipNBChhKBEkTqRHwKi/HqekunULT1OfvTVucRp9fn8aXsI50KSR9W2o6ul46o131oE9UQ4tHUUNepzRvp+5WR+QtaP061UJ1o9sYd+gdWC8q8AgN17jfEkZ7YJAJiAsJvAWGjTMOhwws7+tSWW7gdptvrtWAldQINQaq0f0erJDF8azDWngKjIm6OZqFBB6G8smXhnnw0pZgEGKpnaiWog+s6+UEUpCz8N+4mqLnsZqpeLnMUKBfh0CzoiT6Bbqoe1giaLTxZ/mqAFOGtwyi6TyY39AmJqSc2OTsBVrN3UVCSs03tJs5GD5N+hzLPZ+HVewWIIfVA8BLVfctPo0UBOmeKr/PJ8E2Vjn9DQEjyE8Px1g4+kIuU7YAvehousd80TpX9AM0FuyNgOIgcFEBDzpUNyGhqhQ9H/R/kMwlNfH0xn2Sc5eb9bkAe0Xg+l1Bb6rmxaxygMS10jXOCgvjwdoaqXrhkMPRbXza2WNl81h8huavhBcZxBSFwmYb+3nLkmtgK7FzJXt/U+DFIsbyipHjtHCfbdbcJaq/ZeeitjTfQb9XIdFYcIr3l6xWcuzEqLZ1YCq+PHEyHoQPz0d1ZFzgSc9WbHNWqwDAMwzjUNbVU5dimJ0T46v9foRTYf+y3o5y/N3vo5ykqbgtWXrZ62kYldRjtEnR76GZsFwqbBQhrjqmCHBqYLtXp6Io/7tE4R3ARygOFrru6BkSR/5Y12JcePh58Pj5/3cOD/C4sOpedK9VeOPfl1em2qDYTRZBPvCdxGG3a7kP18i0fgQNOtNqZVgMzvloxBIvZWZYnZiK3Jo7Y9Pq9YKUy8n9chYgB0JMJVWBcsk7EmV3kvQwuROXGJucfxSpVJ2+ggr8SG9wDQ/4XxFNSu3nKT3jNKccGYstGVv1m2UjuPGAnnemQm6CzX3E4AlbKHz3AdoxOa2iv6MNz600yD9JSKMV5dWHm8tPxphY8WfD9yfkdjnVVt4Km+gE7lcIyvGljRmqV/NgaQmQTeBXFv6wOXH1WLgEC3c2RUihhLkzYTInQrpmkbPrTs88NMvfuKCEvhbMuh9+LqCsAyjVKuImkIe+iiy3e7Sj/iQ1AV4J0F/A0kMfEmMiP83Pwb4/JY4VA+Pvpy9PGLCNZpfEy1TwxfzKKRnpYIWGmHLjeiQY4k9Bp7EOw4YVYrzquy+dUWtsgOsm2mydpdz++nqdSBRcUAaU8IwqXBcVL99B4cJnkv95sDSrt5lToxDx/96mDfzaZx+3DwrHe4k5iuiI96SpbdlCReHJzPporM643hCxXr/f6tjPcQuvw9eTT54jXMJOKr6Zc0fkXS10s0p8vkZWLV8R8aFvn9Yoap1AnJfHk1I8cSGS8ttS9tQA/ivHzFwYncsLrSGqjzmHx4HJBDURzHKLtBBTwVOLVoKEdbvfOUf7BqcDTbfwK+s4YLYVvL1hHgLWg2N+PtQHVyyQhvQv3cI+i8HWuHWauyYybBr80WqlAVYmJ2EgDlhvwJN65Z5w9/f0oktLBMTFEopBZ0Dq4gDIOmw1JJjDOHb7UdgYT3dSLcWx0I2w2y4XAQeIm17ho/mDY75RIHXudM8jW11MefaW5PnyWgtyw9paxD5k9pqRtSj8U5wJpmz376oNCUOzHPsdIeCTmAdC9ldAhB0HYzI0qy6WsEUg1zoS0mryY3iKNzGrzJ7mxPMFORjiiar6n+vENDNHJGpFbrs5B0yZ+lVOcTtlxNa1EMeDRwy4E5gyYfSJ/IGQJd4ffqnMlD1bKEd26cQ5+v5yUSiqvKBoiwKexFaiVjv4k8J6Mk5pXVmTFNIYUbSnOG8qRLlP4sl6IRGQzL9sVtscRcWL2vVamiev/kaBEBzpQTIJK39d6DRXhD9l0nReSa3a8dRMPkLN+XyEGUUXhF7LMUsebZoac8uxuvY7d5h/Ni0PytIFNqGl8KzUJAT7nEpCK4B7TreUeq3dZJv0MSssqbZn7koi/M2rU1Q6vNVj6nrFviW8loDGME7EpwdpJOwyFv5/USCEmujvSJgWvdP8nrVIYTnQzqaZQZro/SEMKsaH7QtqmIOh6l8YUhkqXXboahfKF7qJLZRTiNd2+S9ej4F+61y7NozA80EWX8kUoF3T/dimOQvxH97FLNy+Cj3RPXZqOwvCB7qZL66NQntL90EkOQpzT7bq0OQie6L51aXUQhq90U5fqQShv6X7r0nAQ4jHdQ5e2B8EN3dcujRfC8JJu3aWrtVB+0L3tUlkL8YnuvkvXa8EPdH93aV4Lw290mpSjUArdOaRoQnymO4R0Mwp2dKeQpiYMV3SbkNZNKPd0lyE5CfGc7jakzSL4RvdnSKtFGP6lW4VUF6G8p/s9pGER4m+6zyFtF8FEt4Q07oVhS1dDutoL5R+6NyGVvRBv6N6FdL0X/Eb3PaR5LwyP6IaQ8lehvKD7L6RYCfE/3aeQbn4VPNA9hzSthOEj3Tak9Uooz+h+CalMItxpi1Oq6lRqlGtO9udWXU8ihmttsUnVMJUa9Rcnr9mqeRJRfmmLy1Rtp1LDmpPIVuWriHqpLW5TNb6WGsMlJ/9mq+Ikwv+1xZ+pujqVGuU7Jx+zVTevIobv2mKVqnIqNeoNJ0/Zqukkotxoi99TdX0qNbzl5ObcqvVJRD3TFp9TNZ9KjeGMkx/SKkcRZm2xpCqPpUbZcbLLVm1mEcNOW9RUxVxq1G+cfMtWrWYR5Zu2eJOqm2Op4Z6TKVtVZxH1nbZ4l6ppLjWGd5z8lq0aZhH+0BbfU7WeS43yhJOHbNV2FjE80RZDqlyWGvUVJ1+zVeOliPJKW/yXqs2m1PA3J+ts1dVGRP2pLT6larUpNYafnLzNVpWNCF+0xXOq6qbUKLec3GerrjcihlttsU3VsCk16l+c/J2tmjciyl9i8UtSbTelBhw1ZkHJ0jkamU2UdOboyExXsowcXTFbdSUdOHrPbOhKljVHhdnYlHTi6AOzEkqWPUfXzOZQ0kDXUxo3wjDQ5Vm6moRyR3eREkpo7AWT0pUwsjcxcVbCkT3dpIxKuGJv1U0clPCevaGblLUSCntjM3FSwgf2SpiUvRKu2ZvDxEYJd+xFmpSTEmb2pjQZV+Uhrc8cij61Yj+Vfjgvfd6VnO+Tib9gDf7lO+nHi7d9uqz5/TENzt8fv74Y4n9nff3yt3+4Nq+G/O32KXZtGe/aP7GfSrzZXu0rmHOn9NtX2Hx1oYKe4PtAYYbvCfcTvj8i1k7v1f/XEviHK7QRvw3qfwXYDnfBMvcva4anZ861buv3q7jedn/CP26w6aib/gJdOUDdOUBdxqDo1AOA3oC6doDbXx+WsH2Hq+ElsLFLdKJxABQdocGXqaHjcfbOaqokXufKGXa5cJqeAk53jk7uiu6cr3NDO1y/5q//tZZwkN8Ynv4EyLuNAyftEPj+w+Gb9YqNb/+T0Zh7wyWoQatHgM8wJMDgqgPKBLNx7qu0vnb7JHG7FeH0DZk7VSa9JNATY9+kV7M/ddI4xyPW71knWK1OOklqs5U2N5s5dqsTuZcKsStys9ccOL+Kb5l/md+69XgWxS2Yo5tuu1E4Pi/9uK0Zk/OqDr1tP/790xX4fxx+y99G1o9dx21q8/WB758v44D/cDK/7qdGugYHN3FQky8d7OvG+4dHBekkmi9dko4KTQb26Q3af3FLOb1YxNP9nbORvdLNdBGueDWErdKMZ/fKyZy+ipNNemvc2J/LnXnSs97ZTC5SaGqzM/Y4pHekvQbgbjsCjJzdORMNmADvVAzBf3SOygubI42ppEt00Y29X8H/Tf5BNJsoxarpMRTG0qMVvQ1alNJbalma8eBWmUy8B1RCVGiE9EU/mLp7ZbbioCxW4aNytEqflDTzoKw0hZVCX9e2vw8lxmO6LfcbLIncIGZGxwvkAVHhqf9gGC3/tdU1reQBywG5QrxnPM9nyM+IoeM5lDa3Rpx39CPqCaHjcUTeIm4ZHRvyHaKEKe7ulGl3kcQu0FeoD+xKrrAsyIr40NEbckG0huejYq6IbaLPqF/Zl0cTlg1yi/jYjX1+h/yEqImnNXJAjGcsE+pvtJITltfIsXtXLybjeb5DHjsxjHhuSptrEucj+hfUfxESjxXZOvEpjI475PtOlCOe9krsIondEf0p6iNuy/2E5T/kVSduAv0C+diJ9oLnlWIuQWwP6G+NEnfl14TlMfK6E3Ma2/wK+aET9YCnE7J0YjxgOUc9o5VcsHxCzp14nyYPd8gvnRjWeJ6VcT5P4nyN/gP1J8IFHl8i7zpxmw6OkPtGlGaKL4Myzrskdg39HjW7VvKI5TMyG/FhRC/IHkQb8fxFMZdObBf096hLd1d+nbD8jbxpxMfR2OYr5Mcg6oKnB2QEMZ6wPEfddK1kYHmDnEKrsrTz/B35EMSwx/OF0uYhiPM9+j+o/3XCHo9b5C6IT0ej44i8D6Ks8PRBid3+TOxW6M9QH3e35X7G8j9yHcTNEf0F8msQ7Vc8P1XMzsR2Qr9W9nlOd+VhwvILuUliPhjbfIk8JFEnPH1FOhPjBsuA+nfXSs5YbpCrJN4fTB4G5OckhhOe3yrj3M7E+Qn9O+r/nfCKx0vkbRK3B6PjFvkuiTJrOmXaTUnsZvQnqL+6XckNlm/ImsSHNfoOuSTRjnj+oZhrENsN+i3qt25fHk9Y/kJuk/i4Nvb5BvkpibrB02/IIYnxEssr1L+69JKwBHJkH7vJ2Odb5BExwHNRzLUT59A76jEI8AjZEJ+a0fEc+R5ROp6ulGn38kzsOvoadRV25b5hOSKvEDcNfUQ+IlrH871iLohtoO+VfV6ku/JwwrJCXiPmxdjmF8gPiBp4+hdZEGPD0lCfhlayY5mRM+L9YvJwjfyCGBLP75Vx3iZxnugn1B9BOONxQt4hbhej44Dcd6KMpvhyp0y78UzsRvQH1PuwK3nC8gWZnfiwR6/I3omWeP5HMZcktkf0D6j/hH1ZTVieIm868XFv7PM18mMn6hFPj5DRifEFywXqs9BK7rG8RU69CIzn+RfyoRPDAc8vlDYPSZwf0L+ifg/CAY/nyF0nPq2Mjs+R950oazx9VGJ3SGK3Rv8N9Um4LfcnLD+Q607crNBfIr92ol1gpjPdBQgP9y1Qml7OGBxCPYcQe08pZwyOYXxDq8eQyhmD8w2Yv4jAZxME39PIcSRyBLODKu+J5szBAUVyQJn35D+fNTyMkRn1Hka8ZwqPY2JH5D3tHkW6xzGo4lUc6hnKo+j2KJLvqfYM5UFNjer2oLI9Av+/WCr5GO2LMm+1dleumlXuSyttKuFDiTZO8aYoq629VmKysi+W2I7NsUTrre+rctxq/W05NM2eYtLdl0Mr7bz/oJy2dv2qxGwV+1I+76dDeCix7c1+VPpWm/blupnty1TGaQgfS7TNtr8rRhNaV6+hD4H/AA6im3hV2LAxhOCCZmuc+xnruGqi27VdM/zE21tOhpzjvzLGZls/t11r00VJhdNlTSIOl1hzuIJx13bG1f1ZWI/t9OW8Uusc8cWTZldrbgL4mbKUp7+tRLaNcX4CunMb6Qxl6sFx/KCUuFsrrKitaq/ZHOjLBN4ZaFgDzTAKgLNL3i+WG4qZOgqqQC0/4aB3s4onXPYuFxVgXrbSKt63eDznsCwEUBVML9bkg+QsSJxmBpkv62tmVEop5mGrz28Rwxi88Bm/A5t9gVmByDmQK7oNy+I2kAEjOuWU2Br88Mh6TvKPyOE7eC5/cPb3yiIP/Qaz5OyQ6q5f2J5DWOJjMrL/rtqf1F4HFYzHjJonKDwbREqHORaP6SYvJKnswmVHs1xM4YJn8sagqd1yiCyXLOoDbXIfGey7KsNrBaPDsoetMBy2WF4HB62dp582lqrPzrCo2R0y2XCin2nzkZe4Q4fVEe/q6/UA+EJ+kvCCfFtPRAmuGdqkqVLsfBov7e+OAiezeHWKPSy4AJd4uVi/OzDQ8kBefnfoSOOmiUsUZ79c9fMgw4e8z/58CwvMLc7F5RJeRjeKsC7McNKW0jpqjDPA82S44qQ8RRl1mBf5W3H13KKkOQZR89e3Dh1izuTuxTAu1YyZFyhCSUYWjtNrteUuWOL1zOYivzMc6xjNTgsQjfjmScnxQ+dwcAkofA68ffwbVMRNFStxtxAEDwZBG99Ymk5yP7uoXniI/MF+I3/EIZBF4CKi0ngl+jGA0UR2zANzjlAKPVz9e8yhDB4SmOTQ4eMb1ALCIGtGWB3R/RBzuBoSURvFAf71Ppck6s5c1aHIxmxUGcdaCPhUi5Pz7DRu28UfNkk1IK7QX8Up5n4F0isCECwmaPZWxqDhie/xqLaw+hYvqAVvV0WaDoUJKmD8ozt7BCbzSKGngwQVa/XO5yn0pNmFX1ulC74Cd3EZMHheiHw8pMe69RLUOgYvtXXIpG8IUbQ65/X0VQdtcupYLNUzUCEV5SGDfErwpQxeSj4xR2TF5RT1PKjAFSpy9JZp9FgumuOH2HzKQ3Tjn8NNlvXHpz42zI4BEvDtV3HSwZwSj0FJ6lffn6k271oDrL44b/uKgExT38yukYVJ0gKLsvOhFyV0UvYQhfux84D4S86xm3dxH0oweprHll7q1MYgUA8vXmlkQ98Y7EjJiJ3xp6wYR3pRkypIMynUW1HTEgthOj8HomL9vbHlebKhH9UclK49spqD9CUQgiGKdxY/nnCTZ6YaRIciUI1/vMXNKb/uAM6Lm/Y5DaJJ/baRAxnmcz/Cr+spYsIRlJp2Um/vFjogUUFeClwENNCpfm98RhNYNPDkMamEINtIqGTWVZ07Ka62hELXD8g3KTBo1zhhDBM4o5MKwZGeWdqF8hXh+6hVoYwuTfVUulHAcGLEiS+l8W69yjl6q4XVKWdlp2iLwCGzYuIUU2k6xF85guStpogozA4UZtb4vBPDHsT3WIY/D5VJGuSaUCkBJE1mtnDKuULmSROdL41Q1KwWYNn8PZ6ShFdbR+vuTadCwm0a8ZOnW6c4n1un11VOGuZAtiQt6ZAZZD6dH2S/CB7WoX9K4g+/zrx7a4InZ3hsc2YmP/hLNC+vCGHrbyfyLGKUHW1Xh69R2oN0ZCbIe0zSXcWjVDMmfeH9MZPDOZrVRkBmJIsEJXNNjCNzKYJSfzzmQQnmW800CtJEJCcR0OKdhLe+vrLbuBe4roJxiMRL3hRmKqBx29xNKV0ZdveJqxeF6dEyVfNTZ2GqyYzm9U1zPPbymTGsUHIm4qaLX83M5GTP/GAOX1oJjtQEmWzYDoiJIcgXvuqmG9lXL91YVXNO3Es5DNOQsLCwmqbWk80vh5btZ+58PeptF4Z3vvoXNokh4De47hjms+nk5jUbxul/WbDnd7vOX+3a7euqneq71rSbOmin+OvDWftt47rqFcSHANZzT1ubDBAyWVk9bYydSYcz3SBTGxpnjV+teTJ3kmno1nWqllb5yfbTH1M05YYW2FnljJFkSXx8Km8bknNNBrVcszLC+KIiCUOc4jZAVbzUoZczSI8SJ7L4TFpxMqjov0jKTwuNBXG/wPItPwu8wVLWajmX1tTOJGmO6BepB7Ij9GNRyLbTBcy+k/NAXgIvbseluGtH8UQuY0l6MG890XZbkswuk5fP8SVrHM34ygSRFU3MYaaQGus8ti1NNBiiJdigHa57F+7+zPOWdEW2jrDjsowFPkPRpTVyaTPMTQMzlnYVDAUo4/KoR4uwOrDv+aV9hMjCnALVvdTeahUtRVWa1dGKvNhJ8CcdZcyO4HcwwP6SahRF9gG/uasYyzV+M3Y4k+wnhEcC1myC9LQHZbaYK6mpSIILZOVVPGtMgDrQz3RsMG/wEDQBpRNt6+imKg++XrJ7vobwyAi0WwTVbb/sMvRCicbS/YKdcBYvtNLCtbA3g6aP8xQylRcQFKFyQiT7o3kTDZRMU+zxTSgfnXSpSgldaPWafIHd7XeCPmOvMWeX+OIIX2JBXy5fwGNl4bIgNiO229iMsJPC7oZvXghcKi/Sq0oT7brb+myLmwWC3DXKbQfR593svVQhszXjlLSSl1hiLxEqmhT1wu81tj6jHOdOleTj6THgyWNcylXc1g48x4nv/C+11nHbXf2/d16Td3amhmN5ap3t00I0+PyEhFEnlB8rAgMyPMMl7ya+79tIZI1QHj7A4mEWjjotZwi1HRGjqm7RIfJpQqcT+tD59j1MY0u3WyF1EOeUtE9OhXXThqv/sMhSggAWgefUfn+/JnzrmB9Hehbduk7Xx79fX2BxU3ZPiKjYoL+yVC6Z99PmL/s8CkgP3ZdbwbBMUnBp7wLgLSwUeQXVAEhSVUB2xlKpR7d1jkCA9ceuAiGyEFxIO5NpVqvIRlishTnIBchPF6zYxOk64mrk7g7H0FTgcDXQqnlSBBe+6E0rbGzJ7MFyiY0aDvltrpq0/95vLefG5nTPOSDP3EILapWFztGBRzyUVEqNbl/ShIfJS/pEhwqr3F2LS53dOC79b67aMTO4r41CAYk/ELW/9CuplZSc+4feCCOo9TcD35WE0qlzf9/fijGhTSKhSWc5yuDiMH/9Ra/HEj6AIXBxfnzKf3kQk7Z8Mx2+8XP1TXnVUrY7/gIRD7n/G/LNHeSAXjZ4wMNfF1wCjzT5+bR89oNtqBxBjee6lRYbvPUAHHh3Hm2nehE1FaEMeAbAvmGvQjz+zV7i2kWqJFyHKMzqxWQxl4e/z/524+8smDG4AXbaYvb4fwC9ZSzaQVfW4oLak0MuyLbF2XF77g7sj/1qtDGXfrYNSjAvtg5sn1ifI70eN7uOTa8F+e2/0LQuDolGjGjsHVDWLbslxv5q/3OG7gzYoKs3d+HtE7kvtZgOrxS5m9BD0txkiSrOobBdBQBtBxabgGIExSCLT9PSLyNU7b56xV3K+t9gnMnZg7MPRNKccG+cbHvM1d5vm/nqmiMNwO9eyuEFxbk03iH+SNWJeZlt12jOWvlZU+BaFOi8lnXI+jzFUkAdT6+6AZlcYOKBYR3LyP/VzCI6KjJDObSXubdVLevTKyTeZy3/GehPwwpv7HburfqNhBpUU2zOuuhjMDxaHdai0quQuqVNtyxZ18h7wi93psWM7YH2afuFoC7JM7yM91Pd4LCSkZNTDC/XMJjyWRkvIR9/lxzWNUQ8cFwu+aohfu1yVBGCYQ1gxGzbRNgLLosnBgtUF87oLkvkgE3dI1E1e7rc5qHNfNZans2zXvBfddHi80aVqDKiNxrjp7Igixu5Mb4VWCAh8FM/Zq+WvBTDXuIMWiRVzTPtZ+Z5T9MXBaeyrAvERetKolU0zy6KOGgwuK6bP5dZcOAVXBWeACIOI0D1bG0gV5zhfQlkqQrHShwGB9vsbb1UpXKDl0dx/L+PlOnnRwebyaN7HdWq9ryQmcQ9wiFrOMDaunBgxF0C2Oh2phoo7gi5kPnIBCpkSxStpSpgrioXrnx+Xec752LewVnX7S3qnY5NHkO+GlTcFzLaFfnShYducdaaUv4RMyxzzLSN409on3GHyqnTnU/J5fYJNDXeu+Y7J9FZLpCO22T8tRz9s38w8SDrwAetyIWWraaR/CqANPfRX0K+/+/vOAF6A/yGIn+s2PX3isvxf3j0IbcbdH6CpjXzplfhBUgbYxfXCCykE9FV0leeiFPgzFzJsvMMeU2SjmF3vAPxOwlsDZ/8Jh3EG5opkBdZm5KB9mmi1fKxWWW+ZhCCkz1Ivn5LTx0hy1uZ4ax9lgcoJbL62eiO1xSGnGrLvXZpoDdSP79oLuCNJt8FFvZc6dbKhed8JWpL6FyH6da0X4jgacD9vADRtvs6z3e3P4WuEWpdV8uUSND7VFHWT3+0pNu+d8M8Y43q+Tr35Y00ui4qhdh35rTbE6Ocy/6wQ/HQaQu3r/K9mKehbtIq74uq9RxW7It6fqTORehKG71rVZfiWFbodV1LGFAJH6vVTR4PR+U//r9+o2tEhi/bdZqKxZjl8s48TyKDV9C/26hLUX75M95YmCpx2RfU3usDjOl7hNqIlfDl/9vtWetVtrV/dt8457qDUU86145Z45eaqHHX9PTxdXfp1aNdZpkba4wCxf6J68e6+LESXO2bYAecKmyCtTdC4q3JGFgzqNixziPC2pdy4l67xlXOu0oM7YXIGLmCa3l5qsqy3k33ObWDCWveCtxoUXvXRfrWvmvGQJ/LblWX0eaypsp3+Z02g2wooKoSvOxe6tgaunZhZQyvHZYDmwUmjvk160jPSpXwFR+iAbNuJBT1i7Xj2D9zwzpd6VHrtmKu+Ns/c2GoL/u3TcJRK134pwe7/Vfdjx1PJebS97wNESYIqhKX1rw6EjL0V8wL3xHt1A6G6ZXwWfkuSFuh9iny1KnLPCzzxjoAfOrMAkG1M2oF65cBsOBpW1Plu8oAu1a3e2grzhYrBK6ff9pvWOc/i7iuJSxvDIoQL4nzLM3KWahDyLo3yWPoOkdvMJ8faN5YEyfHX6MBS023neAtTp+viUSshZnFXz11J5fcyjLBIhUrwc3Fees2ZjJFDbp7GiLFfDBEVuRB9Zi8ST165HIp2smxa96w8F1HMsMIngHLeHfP4k+379Scdo85+QxRaj/u9sJZpFWEN5ktis7Bn8kdXgvL8+bYHh537WGyH8YBupO12cmmIeZoY7MU/QTQz1AMzp7myRUZ3vDzBuDIwtYdWNs6qHJj2DPra5h8xTLC+br4K7y0TwUp/4RoZq/8BZa57Omdrd9ZMwMqTos9H367M0+MtBuFn2UOQLCDkq96Y8aQNjm++a+AeyqGYnn0ECZ1+rqRX0l683AAXvHEbHjM1w53nyuYjCFELoAZWpNGVR4W2+iepz126AmC6Rt0HH2M3mb40MZwvvb4H4lcxd8Ix/ap6rbLhTbSAZrjg57Whum9MWO+djj1mg8KtVGepx3GaJHeugQ6kwO1yxHS4rQQ/eRplvGIb9jRDYRc7c12qCusb6M7nuYkXkO3xAUS1J4AKdRbcGOEXO3snmVQ44+J24iUs/207VhiZCMdR3NSjzyZsRvTZ+jTuQZtE7NR3t/OFO/baVMF25jj6yPrDmeZXuiCE9QeNxqtNzkXQF87Y57EfsQHN3rI1X6uHjM595T/djDibK/Kn+EtU08uDIL6nL6P2YznRaXZiJCvnVWv7emkbWTG2WeM8HWyMcNMvbrSbuCdzY3yGdpj53xrgxc6efr0V5BWvj7RbNI2vIm7xhQ9oOESae1bQwo9nX6BlLoxqr2YwH3hVbCN95Zm+TESGQBebAoPGYlmm0i7s4aNl9uf/gRMkB9lRvxcU6w9Sv4OP8sF/h3IYcNIUqnsU4bV5vK5Qh1UreJH13utxxHfj8nc1acuht9Dr/YCV91UtfQvn4vuq4WsWrr0uzDRAKa6hCwD15bp8BJGSB5001wiv71M5gOR4nuggpAdj7VlZUEfUnvuLlF9yQk8cc26Q5d4snNgdHy/aS9RX/NlefFTElLNj4lr1B5bgcMFEFX75UVRRsmfAHwWNiH1W2HVX45QmShG8gKFwqgG9leY/RF7uwKHcp7N2VgvvzTbuPS8uoesgRt+Mor+2VR/zfnaHkaWE89sQtygaNCvNP5C/2l+9O282Kv2Hivwb3yBZwr7LopJRK6IMS7fSRxXNQhCmqbkVpc8HlN3O0NuQ2P5SrmxeGIbbudP4L62hQmcb4zuN/Ocip7BQQMmHwe4RHIdMuoiIJioeB8bnBjc2CctnKz2eoPx4Zbwo5Bvc8dcc0D8kxbdrptXwbeQtaa+gLj74kQHaAFkuzV5dh2QMvm2ZUnuWxeNLvSKNdGvzJfUdeBSFsX0K/lOQc+wqNXqIkrd965d8EAPMHN/KUbiblgpgQ72dKPZrt2kn5DeuGfZaulp+PiiZnsRJOadnisvYOTXHw0vb3m+es/trNnn+PndH76tZowxj7nWK2eVoyvyMor9g59d1KPFvtX2faA/JXAZBaQp/kmCUufizV4UFbdm2/8T/FFrSbP6+8NyyfANmHdxa9ITTEPLa94Wii0Wj+60dL63N9uDtbo+KyPRlun7jqBksngZSKv39+T26nbQY4HqUqE+ZZl3yXVxjVOfb8hpj/2KTOMsMbFSKjLNX58Y/TZI3uucENcesRdjjVPG5mu3PbQsMo1zwkAswZ5ZNxcjSUPRsYiXJ4142mVj++tDWjw/XyRiYVTC3G8XZ1G/bFRLQWYfm+fk9tgq+DhyIjbhn/aZS/hlyr0sNW2ozPh8cmHiG8yFSLaKtnNoTMZSiiwSA5+k8oiwDVfN+UswmM8brwFNbXNCMAchBEBV6CZyw8tPXQiocO+MfoiACXKs2vOUAagNNSfq9fWU85qyMBdXmEESUhsGSh8HOwGKT94h5kxtYT4JLPNbML8gxf+MBMhESEHCoZFMeP/ZBa2PRFmgCyj6qUC2nBNzfmQbpyQil0pivnDOjgmAGl4Qao38wcuvZIxJdNIIdaf/ejOU6czsQ4eoZdGjP9LUIg6G1DXB+iBlw60yIrk2J93TFJIy0FjxxoXjUFwigg6VydtcIobZBG4iM/8ZCkyLoXTQf+TFO0KDwsV8ayhGrAPvNHHghstxS6hMP6KwvlJjsqUSLgXuzMIExRf6VADR3L9RyG+XM0/O0et/036XiIEh5zoIx2GseQKle3dw3agXCsHLJ0zPpSpba++K27jL6dHmZIjImpIalwkNryGNgC811FOKo5feg1iOP2REolsBplLCxqSlxMn/IfdOD3pBkth+Y+dchvK8j7vi9MXGm+9DjN9MNe6sdoae2gcgyDF1KnuPhkCCDWZE3Hdp12MdbBAX3lBhpO7FnWTdqX9xqwF8jave1pgyZUMrhKHSKE2jSu0mEo4MlSHYxjG88EbPdpMWh2CsCQNUQXJYggRx/IV5sNph2I3AvqI2wE+QBw6om7Ht86pH6iR/10fnxBi/ucZ/5/X4Bxw+++r/xdUfBmZ+00p2Zys+NC7YUNqZUId9CEBQ0uFymjVET86BTY8j4WT05zKvMO0UZVrKA9vtGRqHsANQnx4gxwL8o56JdgBjHLf/gTWxNvo+G/9vanCaFPxC0o1rNOkBemHD7ZxOh75YP0eo/aI4Tcnm3AWDp9iI7TPva+oKzcK1nFNd0olLV6wdZ/Cb6kQsY9eqFVBOUgunWaODPey0QIisfvIB2M7H4YSmWeCBXifSrW37VEhUrmMhZpVIvjuascyNaNTIHxmod+jKHG0gXAGxCSrSyiTLYJDpyCHAI6fUXwi/CY+XitVqS6DzFHVJE8HsbuU66EQu92VXCecMtU7R73DgO+AuEc3vkppdNbNttrhaiBF2p79sFStdZhn8EEdFmiaq3wtmOJiCO+NjJVocvN2b46Hm1VGKC7tZLbNcQgUzo5OMK3Xl19IQNjKsxcPf90QDCy+CiS3A111OGKLPy2kWMVaxTpdQ6ZbaQ2seR3JSxZUm58PKrxt9hwaTeD80jAaLK8GfKdGG6Dgm1B21WqVAEvU0JhyGbXHmc2SFa8Bl971MW8YajQI5Mcc2GKGYl8Iv6DIHeD9zCvokNWn5n4l/4+IHnGehCxFz0XVY4/E3Zn4M1EjfrD06YTYeUug9NgSk8SVkXXNFJFIxqHUR3txH4YNghqSGVsWYhuTwnRK5plagWBpKM+Htse/lLBOTyqkEIUnq102/Ahmlh7lgeLC4bpXHjZ9cwYOxFo5SthVLTmGyiHgTbGKJjotrcZkxmBvziO6PE7mQWUEhXHeJcE47quhCEzmhsEReEzoj88GqcBvPqD8DYkpNdYSmEkWtgpXutee+hk7lTUDkhgU+8p36GHxcOJmUGGfaIKN7ZRSmrrQYHwV1NavxJ9W7tMGT7Hb2FON+mpFjgEaWHBF677tdcWbRbNPkKt6LxCi35aj1x7ackAtjf4ATrP1JYMGUNAO09zFvxRblIlnCDqiew5Sm54/F0duAnFdj0a00g7pvauduq0EqMzm425uXAIJ64XhpBAksMzmuNSalWEuWgwmotqucJa43mPceBMbDfZfEK6Lzr0lTVXCuopQFex+BvZa2d7EEsQcvoB51H9vmBGrLpoLYdiMhn9tG0RMVFvVKyI9N47YUWyWCzCspPnMt7okTWbMoR8nkBy4WfiFaGYQ1cnARSFmXW/zfnA0q0KO7+ZCtveoSxGA8JCRtHjWaSMLTOoJhF2S457k4IGwcDbBr1uf4K1S/jaYbq4ai94LhrAuNkXIMpY41ZFJueeFCiTGyILx0+ndFvMg7CBupVdRqyMsIhPb65IB27/6sWCjlYcaIaWkZ4Dx/Jjd0Xp6laMyy2dQrP1fkBkP+KFNkVV8K+QXNAlc29SGq9+tHGr2GSM+3sFKUJMVqv+fuDXDaqzVhoGDj+MOEmgOkHOsQRLeZtViK+u5Z1B5Iw2MuC9UFDc8jje+LrROxKmGpTbv4YULrqfSuPON/1mbSSPeKDhZSFHVyEqFmi+DUKgB/EaJwt5it8/CG4M1hbi9oyCBTjF6P/xg5vNDaOy1G9QPvZM5CEil07+tagbQdQ+U/hI/arOS02v9ELEKKHuliE45GUnijg/aGDu3XFGQmaU3J24BM6kkmDJtmcv7cYT9lmYdiC/U6Bksgfxi0Bg8TPtK1KNcx3qw558cappxQaF2xB4IkllRYCqBBV902LB79pY6IyL9zGsoFeYSAgAkY+E0Y2mFDYUFBJA0/9nrcmeKn2fWNYabkLQ8nu5MC7gwGL56dgTpjsUnTkAkaedMM/NxyuiINgCuANBAt1cJWmdP51Im7YH8hq5OPg/ZMoURj7tHcIyhlOUxfDUPSVeqzoOLME1BJnBSN5lVhy94XqG2FnSHD/EU4tI36mNjTKbMlOsfRCyrmjQs73Dw0qNVgdPbQ+Rds/OKeZ3TiWKrxUC4Pr2Vho1E14XARNmp4VDwgFw8nqggjbtmaQuoDNicvtLxe85Wn43KmgblBG5bzhVj3v1trO0x8aFzT+0fkjsvv6aVhCPNTbTTWdEiIXehgXZJgpig9HRoPOfuEZ+Nw2wb0ysEvd8Ah/G066o2g13oer+M1KSSEIJN+AkMkW/5AyxFTRHSoiNjU6BILO8bTAa1lML3GUTxOL0Q/oWpnOzcF30sg1/ZAnQExEa8rVIg6Vf6NdFbzzt9PRZToflbTenTc+kVD7j4juNe4r/nSxX02dgZ8hUX3jj7ue1kCq2mgCyNTpfVz5+4P9WKJorz8wOY/j2IM9XJZv86jBrsnatwm4luCsURNc4IkHzjjYeDIXwisfoxmvpL6XHfVEowUZ1cnwv+pBijl/Y1tSBZAOVTBj8wSo4DhP+jTkTIfKyKnqp7I9MCUm9FP0q9UHmtRwMNqF1xdt+Hmh8mhH04Pw86sRTyBzlok8QjPKoHIxV7zeyNDRGFqIwDm5nSG3PXZ6gicIMLFLDk8m3QrEUKzN140lEpf+zUrO+oQxqUV5bUOvSX+83kQrxCDnqjoGcyn0NThDojt4fWyGVS1J2me7X+rG8tjSQ0WD8PGYdfGlVtIVo8SD9fIGnXGh3Inp3fOHwfgGw+QCWoLDSfh1eikFutgMxgSgFfVAmrNcC7yd/C4YfSxna5dAidK991KWY+t4IYcmi5D6eIk8hBv+nVSNokikfJYH3k55BZCVhR/xOG7GsvS74wL3v1oqeTq80QzyiGZO+CwG7yB1LEIxHhaPWGwv644n/0vEsBAK1fL9enXXTJbH7b8PLfO8jk2rvyeJyw3wfJ5YixHjSXDeh06+LwxB8/HWJ6DscB3AL6pmq3zdRjSJOqxW+nhNyMshBMVVrg2d1hpXls1g+2o+FTrn42PstZIXAcrkP+vOlzHRkENjc/qxfDBOHB/yc9nNL/GK4+fAdtl0cPnsXomFX6fPaF0eAKyjWF55a7wV8BAk3USUbQqND9bhWJx/wdnw5O/A4YXGNQDj0TGsEbPx7AHMTyfgf0aIlQfiC7igEvtweouwCUnl93QtHvicv8OOtB0woFUZ1hXEWJajSp5Hvx3JB5zLdKnWBn0UNFAaXJpPpNQVBeNT1QuCWpK03oVh9wtLBxM4AUKd5LjP41PbRbtTNEO17mwrheAbxSPX0a4biRtKGGsQVG9EbI/9mWD5gBLpXjc6zDyAIpF93Zq0v31MxuiUYZEL4b5i7rZl1S35nY9Qm8zxlRudVLs6RPZwti8hZr2tKqn5fXOLahe4LAnaoh5v8/H+vsWJ6/iGgaXpC/H76tt2fuik4qXX3rpUDrXRveGOWSq8hK/6RTgR1XVloafm363w7EXkyzMOunc+lW4yC1fM75UV2d/K0wA66NusPq7+LzIPyfD41uHBYIGzaYekkM8qFgMBSilWe31QrlU2m4vzKf1b5lqbjLjtNyMFra6zovVXxVUxUa5DRqEqzsqTM0rm7YisomZdDPiVAbaCH/YAJrOWYwD4Ki/j9c9OR6AjF5kUkc1shVwpPZDSQa+ankfkzeCniQrGzpBWC8n/QX5AjN/cliG5KMEkTmO2W4ihA/z/Th2Bd6WTU0hb/htK8C8kyMONZU3Y2rv9bxnGk1ABxcpez6p0gfsvtYOxrKGtjVustzZgVipaRbqo6enhp2IAHW/aAvlqE562G3hjOElTi8/zS+E+Ukfr2ekHqo+eKuxfsXvlNmvt7WJ1qZeBrLHxPu+FJcE3ycaKZtvQR5515gmJK6WroJLY2Rg36KKG7yafHBWcJUzps4AHjy+wMyZxD2oquto6jpUijqy5ZnZCOkoVAVHpoGdnkTEUXpm9TcA5c0PzDOgRA6fN1QrBnexLJrAKHbBrk30gYl8XN3cBKQ/0keZokOGapFAXkwoKjLVMp4XG9mGVopsIi7sZYjlXDfbbjU7lMGHS9XT/fnbcbfdWFlDsNyu8V7WHRCCaVbhhody2/S8Q3G/dSjqSPWlRdqXXMRIXa7lzRm4Y1EA7w63HTVw3klrfqKux0k36Zi87zKDjpvrkw7fg7mXFQK1Z6RrDdmxNw7ifsE8LonbqfcOpogD6HIXyILMTYr09uFdgZ1pKKuW7tKCgCwaxNgYVQqGuzfA37ZqdxS/ATnnyxxENMYcD4pZPdS3cQGN+W1idJmIUOWJTvAHk4RJZ6jXSgdrUw43fO6vrtYT9dlzRfhHq+dAnVCqZT5OU8V8i3pS4zfr3dL6llA6T5gNVhhSo2Oqpnr6oBSZmuBli1u52bd8LBS3XAjxRB+6gH33sPunae1iO/Ag0nco4L1CscIjjN7BaU94lFHyNDNhJp5JMSQucqGVjuT1Oh0itn7Atndy+ofx2qFvbyEGwblUojxtXotr7+Yf/DWHdTm2Z5OH9ZWQfgMfjZj/r+s7N+aZfLwmOH1CIxEh2eqJT9queKBe0pvY99z4Zcatxne93eG6gVgb89TnU2L4GhjEMI2qbKCZF8pF6T0arPR4lKFVB24sHTAYr1mJsNAKOQdx4pP09dUDeJYEZlZhHR/nE8+GmCAZ3uFYt6OKb1Jb1isaeO6XT14OpJ+ayE1dcEFttmvC17dxOTqPEIx2TOzbkkNTdj7/uYXr3HDXzlT2bPkcmVue99zCvYp8pcrFe7XgkG9B4+5isFLJbWSe1edqK555sIXqXheye9FvyooVZqpStNv7LzMmw2ZntPg7yH8AVsH+LFfoNNExehEakx3mb6bycHBSdUwnJoQiRx3sHURnC2fgFYTlkQsLcuINFr/gTMVpXzmJ7J+9UBWiLzTa+xiLJdv3xB1bTZriwXyf8DPhkMfGak9mGgVoowEtvd8Bi2zgpxhOrHPeD6BswBA+NkK7W3iLZ6clbJ3iG9CON2Qs2lQL0pJYMLeHsNbN483vt/nGl5/MLMCEcUBHztGI3hoksUGa+3ZtM/JmKLcqh18/5jeytZdpknPaQTFp/7o2/r90lzrx77ZYjfFtIK8krXbkDw8laho39bkf84TrUe2GfLqiBtO43xHnbuCvGF6W5X3B74ZZP1dFuJv5nSLWQ9mN13d4MPZud+BxXsvV1WRmdKhzOipOtbu3hwWUM58Jxjixz1qGW+BmRzzxUAA/OwJx7LARdzkUR93EiCNiEdJh+3YaT8OiL2IPp9uuWtLfqKFMLjPs9IeZHTNp8cpLbBsX3rmwzXZmjv7MbkVTvp8xrcOaeDr4goxmfpomsw7Yj/ujsxABz04WIpw6EWlW61R4DuIQxohOnEhuy+pGuDedDmZUVz0SEgiL8XHL1AKZqtmnUzjli0NCgbZxwULYQnNb1Fn2u9dKlZYBvQ5H4W4vkra/ccgiQhvFJWXi5uDIby7AXxThpZqQvvfuKYx+MCWFwxRlS6tfVqTcSo3pDU0RD+CqngwPBDlXbsv0zySFNYLGZ/CCuX14FyfwaujTwS1er/HZgRT2J9wVBtQTqqdkufuA/9AnHX7LQJPHGSZJ34n1pqiO3gtSPDfmRyUwqC9GdTn8xY4eBkqrcZRpuGlZCM2b6/dJIiv51PAC8H88KbebUrDf8oRqWu6U3uxL0fxsi0womL+bESz/FhuCEHx1l+wqTLv6yR1FR4w7YaDbspvRRKwOQ1VEmkxo1Zr2+utOgSsp22thnlLjcTOKVMrwKTCzYSQ84kmJRg3bKu7SDK7dtrjwcc393wneiMyUVmZDicIayZqnai22e8goGOKxjWJ5o1KSRmq0faPgEQTxignwCN0BiNTd/dpvrc5CkDgJHmSvVvRoQ4y1iOYTntX2C+xinboVVNbnOzj3d5TFms8gPzCc7xd6IYIr3ewBItuMPZHeh03PfS2g+yzM8GC4C8GkQFCEckuHpHoSaPFzVyTW54SxfM4YC+ZSliab9e6iNrvvyOwOJnEMST9V9RKxrWA+hLqofUbcvFD65HsnJm+EnV5eya0h3IKKfo54xOmjtVOeQVmPIUA9iH+cAbtLCI7qc33PNrDnctDL5IGRiwXwWKN1pWA+alVJ6lTX28HENih77dRnp6usxPNFYb5HqW+jWQ/LQD2IV4pwB2JOEebT8bs/bR7ivhxOSN1an/0yXwggCogH88yLYlxIWjCZasEQaPMFx8NSY8BH/VjfhVxV/Mz64j1Rf0gwrj2f3RA/hCWHzqe0SdHf1w1BrI9iLw9yHuf3AiuhoqHDz5taPOKJkNzxIOorfGPkvTHI41lNh7eie019x4l3u7AGSnrNEceIyNrGpEZ6/wHKFKv5hss3TOvi5O5+qiUorlL4XTewJMNp4mbcReq8Roq+6sqWE7CygpPGXa/TC3mqr+FJjFKYUQ7Yr+jvr+SnV1ptmH7MwWbuxjMbGlCuSYrGwk3ofQzrzuqF/ENOCZ8Ie0eVaM/fTbD3OODi0byH88yx094JlVnuVjEjZR9WvxQyaEbfg0UNc4YWDADSn3c4b2v3if66OeRPsgPnh0d4XrBi/t4lDXPYpUe+FPckPHpmuZTwUwSzQK+J9wgUZfdRvcw62AAUtE57Qxc52AhZ5OhpGFLTnec0orQOxH4OT68sTKNVDdfcQ/sYXWwwjmdzxj/2yHtKZQUa6UOeFHhruMh3qFEdWAnnAckSj+tYm5MQ54K4IlPV0UXpEdnLR0lP3aogLMVX6M/I+D0d1j3qUSdkSijk5zTTkZtlCsH3naVi7l8QiHeRw/tkDM+C1WslMFtcF+1vtVaNbHTW4FLLTwmsKt48yq3YjgEW7y+rwKorSbosbtv2coebdlqxRpa/l4g1ySx3TXepirBFwMxinK6qAAlead1QjLpp8R9ihxQ543exWxUNyF/Ypk1tH9dA7zqsOf1xUhZj+d0DK24cQNwdFZ2b7bjEchM9tRb+n5tA6yxQ8JrB/1qSW6WMOqXsqG+8hM+9sCsJ9uLdUaDdnOvxLImC1NnlDVJz5rDvgE6uhmRy/ggesBZI2CEvcB5AeQrm5G7h9iPLG2017dw4ZJyAHrlqKIwyfwM1sbzaP29cG2ZuvtyJ9rKt+p3H7bqk+pLht4nBt50r8uOtdfykg5RFI+FHFFZv0Vk17X0wzVDrB/uLg3Cco4eK95gbdUgVKRqSxKs7qneRZ31O5deIjo8JNvv5KvF42x7rzGN25vlfc4BXyMAov7/69JWcu2+97asjXP6niA2A9K8ZfuVf2M+FVFCa8K7p5w+PVImy9+jJ5k+S1D9lAQtyQPb71IyXGp2/siAKI7gsk/ytX2dIFAkDFj36mE350WHw65Qf5IwO8OTIv8RTx0NkvCdHDpipv9HAacK/RwSPV97GOeGM7zX7XzbO1cBRP+RryryFp+StkZo4blBy94icYnRS5hi+fZaDArwZOnUlQBTcsXfojINTuYMTRh0sYPvzDAGKkmyxNUhf6TG+p17723jhuEr29QFOMm0PuzsqQRpgdKVX6IXwBnmvib7/eMFFi3ZJbMWnjNChMagUAMfnETjJb5e8pFbVD0IScPTBsB+iflFFJ+0iQXSSBrMGzVwhpjOhhYDOKbkwkw8SzEGaYKhHsPJ1b8dsL2yv2/pNTNWlOsVV/QalZpOrYfz9oTTpaQ9TTKpW3GSM3P1ZH05M9ZdxYql+FyW1kjM8FhH4wQihZtd4B7FSvSLeFTGytExCeH1/p4astmMZDd8SsutCRLAia7XES6txld8RKhRExmk2CEHch8XvLHqLTWs4xXR+fYWUsX1PU/1SNiuqgQjsqwNeRNdUh3XxekYSdUCSDirdB8AsM24vnouMw6EyBAdOJuuPXtCNbmJgD6s7E9JNGUZTOq/lZnlPBf3xZVSn27dGJYLceRLiZq/RSyI2Mq7RpTtmPgc/zj/fQjViUfcDGax+xbLrnmW1OMK85bHUXnTDgMioC0jKit0tUOBQC6PBw8lSnGORNjbhs8Npy4zOv5TGKGVXmTTM0YswzRfl2xGGJyIlcmFh26N1QZcRLF5W6GyXafCse8R1CWlN8dKxHgjFMtqcmfcOoqtYAgWh+Am3equhTkbnih2+q7dMdKkhx/aOlS4IXr0wEa4EZFj2UME+Pis20kQWOm+O0yFWDef+pFTdr4IUpsNsRmFvX/XBda9pA7809isBpFW2l+9xbsYjllEGRoW+KxN0SAXuoeFn8XOvaUV9h5EA8gaHM4CpVftJX+wydFx1cHx8yKH+2fq4cXPtLlvT5/cGk4Y+2JQqRZweQ0cy4Dqi5/pR2RDBCoLmmjH4d4LVu8OtJNk7JeI3ZLJK3X7AryrV6jFCfVemWyR2YVGmO4B/sNYDWWTOlnaqTSvZc122r9pZt96xRwPEmstH4RWMgO8gByAg/WiORrqYkr0h3HOok7N/iCTlZnBaMDZKjbB0FE4dvSu2eTIrFMxpMItqMK/z7g86/nFjOXETv9XGobQtc4DxpPhRm3uEtSx7kNPJ2y8Ak2CRqdfeWR/QYI3glw1j6yXjAI2Of85pcjHWc2ZziQrL+YsMl/0hjoyVPWKzaBn5PVd3k2EncYlfmxQVeeDQ05pDsWo5I50c4gT0fMRWVwOGtleV5nkq9N23PAZt0prIuFBp0bIV/L6mxKhik8AEhBo0tk6tRI0wPPtSTF5FprpUu8abZ/iXWMRL1FCNxunpwhUI9HaRcD4Mm+dFAF4We/VEZYmNG3uHB+LHAnu21iAIZmx6uR2dvbxcZMYKlRab0z9aAI64oZ34tw26xa93uoFn6wtYkVpj+5QUFLK0UEABpVbUQEib7LNQcJC8EmCbvJGMy3PMK42fJ5GlrOk7cOgchKYUowImfTPp043cxb9uJ4f6N5k+xKMR4Ts7T9CCS2htVZ6NhsMAQvwjfzd53qdKaGlqlxpXk0bJKYSdlWbR/lYGhi8UmbsCtKvj2Vfmt3lX+LAUdWdxmThullLZV0HiXD8+mUnSOQ7ydcXD7nvklYdwVfLVirw5hcNfpq5P1rq6hb/k3nK/q8bi9hkq4ZA7+pzPGZVBUCXBFC0kgX19iDyjzW5CIrbHfs7eQsYZZLGukbJwS9Kjg1Up7R/vGUFN0dnaUTLchJm+MzFCEBLRO43RJTqvcaUxzfTdmP5t5pVpnEcaJOrQLD821PQVznlaNeNC9K1KzZh2pqMhlbRBDMD1ZIH0m/csWvPmH7Y2N1v3kV21+wcqgJ3JQzeAyQsKAbrnX7+k4K4vyZ8QDKChxVpSzRA3RC+aRxamPf30bdOcEZuzONZstk0h+ndqyIWTCfBQb5aIO6OR//aE6N/W5DGphMFZqTHx9wKQ729r2jr/DK74pY/pQ7cHAvK4HrLsmTnjZc63Cs+74RxveWqTIxK7HQgFGocKMeETNkw686AobTvF0gRGm+XdQUmGglWB+TmRnZTo9TPPzCIGoIQIxPsFY2jkqMf56apezJkvrG513WIB0t+QAwOx+WrkQTLj1OQPtWbvvfoful/a3rjVakEnMfAz70BCMHSu/YuPsgllV4R50Sk5asT1qIvlg8jgqEm9Yecz7OHidwKuasepGAblXV6nB8M4O1k20oBe/GXUmJuvimAfxnEqSAQ7qbrfIOlectc8Sb8If38maAljRJji1F/ki+XPi4akiuxhzyVv8NnBi8XbgE8ccuLFzegKYn26fHE4JYr+ajeP3AKUkzo56ryy05mulQ9TmkTWPc830IfFhlC/sEN3J1psss9tXZ7H2DUR8/hjUKFMr1dG+LYpDXBwijWLwX48SG/7d5NBzg0ZU0t8AsArCnbJ6boj4CQ3tJWU8zfGqRCq8YH77JOmIyEz2V68QJO7fPcPSA1rEOLDmj6O5BG2ncz8h9dTd7a0qS4Zer14WC1/JwGnhJsGawVJhbo2qSKcZjXVLfrJ2ox8wqZpnKcZiLEYIXk5a0ebSIzVtiydH+VH0fKtC9OiF7REJNxgF1ZKHqDB23ieAvblL/dVrs83dlStNd7cENvSWk3pWGBpOn9YpbkHOI4bB8Uh5nmOU/eeelFNtcJdFQiqFaO1yFT8cedWGLTactVfewAzGcNKFwpn3M3nhfUspV5Q30+sWvfmJr/itXJZeCz9xXdyRbF5cGi38CZF14+mtD8OLQUkQqPVpxnJnyf0zQ6x9SYB6hi67o3yEbXgpJ86fcekeVqaFON2q62qXtc3Pny5VKZo2NDkzGedr4bO8sDSin2WK82sZ0in4+iUZwFc6/XezbUg7M0zg0pI2N5NhP4r0bu/DZdGjDfk8zunhrrcrRgKFFa81pDfEZYqYbQgdN92PVzm2hQTB1ZMN3VgLWli1RPmfuazcTmbo5FuiEEJmutpyQPp29JnmdicVSaXtn41TtmWDN/215X31ahgF06LLbC5tIuM6B7X7ITh66SFYLY5zbw7rJzJj9nr7YWCSXGcebpmaMGh8K0fmhJN8Oextl+NM9hpc3ZLDPtMLKScK9wVVkEC1G7nsj1ilUJI2L4GFQ2HRcnz3+l1GAQqSL2F7KNR1PofTVEKtcvqwpYDAzXeu/s6uTO/px3AC7ojC2h93oRj6RXbfKLCZIctIZ22BjMrqNHq2QoUfSBOQcAFe94ZtbLbL05jeyN8G1n9VZ6y3LEvUgFYrchgIAxtYa5MhYpIHU0EuCDxJnRyCZgAHdIBXch4A0nv4qrv3DBJEsJ+ruIbfCaQJ7oYlmhvulWHWNx+X8vDMyo4bW7Lx+YDwkQexWHLZOPUnelPN04pCCuL9xUrBBr1vhmiJxOHRIiwxtkaJHI9RzYGtZ2DR4NF0JA5PVLZZ/K4KsWz5smcNEHCGPvl7u6I5tHwtCxbkMGbNcuoSnc3s/5GABFeUQQ6RUmZbCgUsrEX95y7bKD08OKTZ3UEc8RGmcOd3Q1RcBT4qq9+fwHXLrdy++BQ6oLRmtoyRX0VJf568bUHsEdBlmZN7qTCjl1EGlcde0V8eO6ISZwFDZNT8etzBPHjd2xmuczKWpwu7oszT1XZbc8SH5wNMqm/umBNuuvfZi59kpltnya/BCFNRaa4ZuAkYypPp3uWnPDbITPRmpJY8bezyZvf9yJtTN4MUnqywQXnTW9JieSlIbSnvL7pi/rcoZQb7cPaPffR6qDMHFttzGZPpVVqQVjnTFx6qwPzS2b/LEOcua50NNfCZp7IAEtRB0sl6G4eByEVOg1uxemuMaaKMZAuW9VbJoidNHCxD3mO8JgpYWd9t8BsjZWn88pWvCAPKyy6cLR9rX/HnW5G9gnW1Ot64bHi8J348MB8R5tN8y1eosAuZuwSjNily4ASodd54YMhYgv3u7jf/6A7VlQWQZ5QTb5Y+bahR+UAS3SwSPAHdodcLHLiQICauBqJzOlocdjt+gCFcYTFvlNuKzh/ie+SD+tKGwP5GEGnbhUT9J9h0tI+RARzEYLDWJmzmSgo+vyXzn7GTIga8KL7/+buZpiJc3acHqBxYU73JpDOMyG+Xs5WY/364mqsNBfdWYTEoI3sDjcNA6fSoOMqD1VYHB7PY6SBGzJjY2i1pC05d8CxdiEjUCe9ST/iSI9WxX1V0bQq/WGqokYNHqLKO0kLzHPzXV3RxLTmfqJEQ+/eGHECdPehWXzeVRuZID/fRnbWvun4PJySz8tBnsGrYxQAdJfiU8n1rycstC1/0nwrybd/y8cfxu2PCeojkHj2i7vjFoIOUcBz+5tbcIXjGvYCnF50ehfGcSsY6QC7cfgAjGW4PtYuicXnSoTpq0gm1zvEfD4Coxlva0E/PnMdIVyzddOy9dZeZmXk4v+/5gnheIAya7OSwAK0wY/rVzKvGYFSH4MgM/E6g99OGrhmbW7etIeHpaKIR1YcNglyEPQa3cIqlPuH7+jrghu4ly6AjffhNkkckS/MNJ5yqMG2dImzCj8mxDPfHN5wcG2Omm1DAd2LM5eZWJDZCmCTYB0nkrNBOD4z0B6Qr+4AwT3RE8IN8JB8ZeiaHLyAn/vYPwvKEEoyQou18Xt3QRBN6Dlz8GpCLKwzncnwlFhaSCLAzR2dAwPff60yt700v4NB/aImxHapKRY/dMPBvuf9xaeqvinKziK5v2RvHgpmqyyqGrOMLIDksiIJRhlCUieGOjgnVwskiH37BgBwseHrkmfYxAxNxcz6wvbCzTSF/FkizziYemFGE+Q7AQlxedZvpwnRJbQjikw7IAIoye+AmcRifCoxuS7grC8dETxqjOKwYuUHIssJDyx4Ft4mKtLs2lMh3aT9qlzG07gtqB7MW2ScaUgLi8zEuMFNq1v1bma5jTRt75c5/qulOtqLaZibHz2TYvIpg9ZDUiS8VFGGMk82KSCqJsat/R3p5tcQBh2XK3sxKLkeXTPD9akgBjS5NvFyYJCIb0qaDbdzFq++j/26/cRWEUaBXcVMrIUfOR/Pz/ceOTk8l7uonjOxccDB4BdNdmW+RtxF27BXQBxEDIEbrBcFkklo7fQQjbh9WsTEfY7LCDfPGB+Zqvm8pQMuRsjc4HTXHeofbmdtWSe8b+pvzTtWNWN4JjJNCMrNRhcsM/gCgtNxggpDWg1581DhXCXQimBHhsm/v3cUohDUAhJqNplVmr3UAXTwkLsYC5AI46GAWz4X8EUhLowv76qRqYYjMHvQCe8GZq7CRFobmjwGvYb+P0YeGPv/LdKFiDARDwSmwi/E46GLr/3/3t6AY/oabzTQU4X90aKAZTslJLRaTD3GIYyv/3BAjT0BiQ8XaTpAZaqmmgPhjGro7ql3tdi06OWIaY+tM4rLqkzVydwhHLQBw2w5T9PrOPHvzRcNxCIj6k5JzqPn3kzjJcilW8WLcxrxS0lXA9eUXV0IVxWJLa1uSxHuYw1MehEgy+IymGKumd7HeR1gJTQm8A5vSGrc8XQ8Ij/oDwkQoIZZJeiblmw79t3hGHpBRGPiG4DWYA9VkS2HfR6qVrwSrcRkSyjZv+YUNDD9guSBRWL2Dvm4zdw8VufqWJ2rY3U7DXBunWV6QJXlu1Y/vbGTiYP2uPGKAYnb8P8X/fb2MEsplSKLZJIhJ6FYxbokqiFuNeTrUsfxc6AY1qgNQuCRlAejxLsYhes9zkPW2Hw4Y5E1hSZ4idUZPtw4OYKktX+AHkjm+QPJ3HggK86VvXneL0JbnYbB0d4qZ1ogaVq0s7HrjGExS3+1eAxeXUfSslWrN4lZsPs2LJYz2GoVMrDS4kptRDiMuVT8Yn5qSiATWeoJj4iJ/+YNeaadfdT1QWJYmIL+NLPwARuThQv49YY+wZL66ZXtyWwakvoRq7PUND3Bd/7ZyXOSO5jFd9Nnpr/v8xN+aGAgLSOMkPdHli1f7/qyHkaS0TcMz5dPoP1znj7rCszFnfKM7Mlp4MPIEhj0yVu1z/3jJQpPH/ksAvCSlKij0xrSsYl30UXMijcsV9QJwFZBVIocJ2Aq6hwln7gp0s3mmBtZGpMN3DsDLWulfdtrzwEqN9AVqOKF/rBENROztatl3jyZiAXNvTmzO0sT0WomJ4CTij9F3vqNbar5CpOgZkTRhFfCcH3qEF7IYiKDySbqtWgGfolrTkzU3XOWfJaXUVEDiU8qduARxz09jzTLZRNBb2zXJsL43FwM6e8p+UBOFjyWMAvwnO0o+eEbVB51SS/NlbNpAJpNcoQJP9X7HBN+pttuU6lYn267iBA2JiBqq/wVgZ2lHEpEhU729F37Xw3fJZquV135Clnavy76pztFkx9CPJPgqpSPSNX4trP0GDUAaVfTzABNlJ2SZSe2M9daZ7sSLb3nO0Hy8aHTboZpm6sxTHxsrOBqtssiAjgBXpr1wuQ313IO+PrMwMwXqaqkOURYWVrO0JsvVKtlPW65gTfrxX23QpUnXba6AsLOAHyZivAMDINpiyplVIpsXiKGrEy3ONflkgHWGDfx/0z+Y8NaOXhceNzabgM4pXTQpOHGs68v8QV6EGgQanJKCZ9XC+PvAhBzYNEENPSNbsONvH/FeyhDzIYahxzdHSIkrmfeYiPfj+Q7zrRSumHf0beEOgIoW40hm3+ninCVg0N3QbAz07A4s/ceRwQtu4LozLfyZQzKEfiitRVLU36uPDYz5h9KH+LpTo+SoMdoQbcsklRiXdaZV9akRucSALOyJ2S+GbKcwK6WzRJ5VMkUe9v5/5I9ZiEP3G83mKXkxPys62uhGywl0euAlB6LRTEhAR1mHueBhiGNRAcoWT2RLFAj8UrICGezm1pGVqcH/jnXhC5TLeIsEqYX97nlcvVtZn6IsoK/V77BRTd0ZWDb6sYtBzF9T351zBFnGOSNybxbWFu30VeQ68eYB1DAuFSrbv5evhCegzv4qn6Z3bNIK53I8JMVGOb51RW0L2gv01o0ImpTA9yXVZdmll6wutijMsWx4eLyVY5KIY8o8GkTxpWlS3gq+PmyjUr+3DrZY17bD2zxGVFrc2L22tqW7nIyWHRlZc30fAkUZvys4Ww68YDz3lqaoCKrY8wmnwRgToDv/UYDw7UIsWjw/WKeHV5yeaXLjaUTlaorr5FgESJEkK92E2qnO0lihogzbwal9txLuYPxCnkSKOp4ruPVDAv9/upcvV6h/sBCFvZeVFu/1NHzIPkZBvtDObaSsckozFgBMZTyVkHH282XBHYvc+1URTPGBoChjCzCtCvNrIrY7se8aFCHg5aSMEh6LpBQD3YyuSIH9824oyvuk3fEHQOzbv0f9UUrEQpIjENf3x3ngcRRQMrl0wfXH4/WXE9DmF9l6ni4nTXyWK+oJ5FfFqKx+xUw2KKVI29luQrsl1OAScApEPFpnkBsgfaPVkgZThQAABZ+44Jb9I9dAMgUVPCjLVioSrUAvAxeevXUhb1xO9iWqUtFzDaY0X3XnmfKHTKDL93ePEC9JUYUhsZxk68U7GE13jm/5dFIfx0CXy6vXmEwzvsV1WEPEk3eGPq+Y3nqY5xKSsAJcat8sCyJIA6XZS9bVUMfF2RSVG691gvHvYrYjEJD/6izmP4f1JfxVH2OmRKuKZx8D8l2ltEJW1Ghg3nPsMIKdK3YrY0nckcSJfLFlQ8zMhB9Q9u7F6KNDfczh0T6Lzi0Qc9tfUS3WPgMHGiVabnrj8+uUl++xn2yUwQa5///8Gwg7V1fRtqf9RcZ73w94tGd1MHP+eJclJ9b7Cx2dpTvv+9CChRepoZtJEm1/qV1KQKlmOmCa/7R2scBULWpNXModHTaZOVVchzT+pOY+ogxRP2jh/z4TM4Kcik3tizH1WIRo6NveLwiCw76MZ+ITWGRvEetLZSC8imG0pdoV4g3H3qMCpvwZD2WESgvqg1X6FoCDjMZMWycLB3W5JQmfGb8f+kln5V7OeYrKN/NxxiDbINgo59I9tbrUA5plqMGeX6lKmaY3ZVHJ41tgnVIwvjD5vJgKDsCjGRorQID9TAOFALmdwkLWKCCMZWV8iX1bVeErw2arDAQ2/EdqA0wNGJgtX1OL6cBoW/Eeoe+goTKtJgiEkznwmKaGBJBfAm3TFcO03ow+k+UCjMCvN8/zRbnRC7Eugb0cSlOMJprrc42kK7s1rR8VFyVaUL9w3n4ypo1BboJ3YqKGyIFgKwrwc11Z+xXmmua/Sp0Pjas1oECBAn2Ly8RbGTGS8tKHcDDrh7Vy0k7VZX8/fQ6b3u+rARFedfCOulWqlH+aDTvHGJ5an02OavR1auJcparaln66TNLf+s10MxrpjU6lHx51w/2R+oxZS0Wq96q1eGatyxUlehheSXNWem7OiGovhbbF9VbnVkclCdK9crs7WE264ctXjmYuFk8Jins6cSQn/hjkMGQ2xNk4b37rZmFtYCq5kwRx6JlEz/KCmfDu9UZDqgNxvMvU42KloIo4qpvVqdPjdvinRgQXhq759nB4/fyYGrT2ArwOvO2aAsvVpALVuXKze/A2TBZzsbpBf04ms5ryaXSuc0bn2XoLjgwzqXAq/c2zNcIhep7Z7g34uc73KY9rJj6BAezU45CAT3gWuKmElsBJ7iW1k23qIviqCrDeZCxq6YLqgyydU2gI0F5ELk9CTPfepVu7+62jbivU5WoDIn6ac/XJY2W7rmoCCc0EFh3oW0GMgiJcyysyJD7MGfOtlHpBoY9ONbxHNhQNtUv72CoziGnWyUcKOpecFK9jiDdoPyHw4R+Zad4VlzIiSCBBxBtYLKyNYybwjRAB6QqJYrQkj0xFFGxzqeEQEhg+mnO1I2So4sh+dyTFSbgDZ2sa0zaktgFb+CCmZK3uqgVs+oFoFsWKEf6uJWZJkzcZHrir3LXlqR8yBAtdonRejyA1K4EArJwMapfdu7fVaSwAVHghg46JfqJmGS9htvumAPYMT7R99GlXdIxGnc6udtH14di1QHwK/TdijXZgpB8DX4SJSG6Aa2R9PYCweQGT0v8vsBgc6067o9lkpaKBXMXx244kPzxHGLc/Hsa9PbEEHEPwsl/ykIDvvVazx4eyQpE2vI8KfPgIaSrjEOdG+6L+DBO0+yg7oFNwwgOhbq0NiJGWAtBzFYxDX9jxsqm1kFAxjCPEp3JQpq5LDCfo2LoOm7MlA0N13niOMRwG5fpQq1CSnWbMEMX5LGgnyvEwcruxQhpABH4WdhHr7VBPxUI/YVfx6sw8e/YMdnsAzMIJwEoKD7aO4Q7XbvAkpgi9PSqM+ZfmyVwBkfp19N3VkUrFzyYGK8glGamkz9sus+upEd3JfJsufs678s32kIpipTdIsY7HHwhQEolQcI2sWysGJWVSXd68R2P/HlDgGxFdc0IhtuSkpTDxiTw37qM+Rv11hQmaxEJ0bdYES+St1hthceIXRmEyGFDC+PLi4U9jypOwW9uBqwUafjafGVRD1UZBxOJuVR1YLwqFdIIqV4LDIFmwRfllEtmmW3jn/pnERwTJyoKoXks8yY0KiIM6BX/hAS0HNnf1l5gaqIwIhF4X4Osao+bgHB+V5HMrEiqHC7jczOlMcBS3KE0LxZRMc8s3D7meiRMziFe3oPsfj3hR1SWLYgUGfFj2fmAA6mWq8hhPjbvMNjpP8hzZXIDSwUWJyIL5oDL0S3BaBIh9fsIBw/UucLASaYpW56A3pEsACQslqysskSKWn9NN2vFZGGvt1U+8u8vmkWJbu5LTTKJdTPoq12PS2jAhiUOExHsRFWyrmWcLd+d7Nj3N5VEx1J/qCyinAMB3WulABJKSwN01YxPBf0s/x6BSeouokh9AksBpRjokvhvE9LlhF7bwAxD2wV3m9ag8hDS9jjcHqNTKt2cFkwZZZtUUtHghUvQzVHUxZR+EfXtsyAYKLY98iMy99SN7d/QjjDtZH6PUpT+Gb3TlMFcCpDRo4J7E7tYUo/Kz1AT1nYZxU3HDWM+v8PUI52CVskXNIDiyA3E2wo+p47S1WnaEuPuWxOuMZ1WYcwh6dDq9PRpkOYRc65QyiCVT22lQYLAjl4jIuA+w/fn4NOJGtQx6O7GOVVeNX9Vjt7SmuEM29yqByHvPtwRAOy/2P6/h44HkNcMtX1Z3e1qpQgoG4VScc/4La8CtH53P5wzbiIk8+00EKlOYrTRwGnjjfOpS+l/i93ZYDHhbfdMgNP2V4JW3Qvsd6yaoZN9qIqEgOjkpJyYFhOYq4rewoPsIwHxH3LYfGpquSJgMsPRxGv27ZWyl2Is5fTAkM86ehRn9UgtXQR06JsFh/Exj3tne8KCwZ3kB/VA1yyIiybqsMYgQ1+EM9QTt6HHjue0z4GeGMS7nNxC5ylBIIpuKmkFNU70UP6oTjHnbmelhIbLNIQ2jKlAfX9SQSdS/23Pe/TgPMUbfsR12+mZrsBmbwelKmV9Ikq+nHzWxd5NlxqVA/4nFeC67y6j2+b90ygZUl//2qUo/HXeinI+EmfUZiUPK9V5AN4nVE057Ybwd+qqwQ/ymP+xgywnUySk2P4vsc3BXWQmjkI8nAvQ117yUqVGpUoeS7H7cAvkyaagTIkS2R2dhEM/nboddGcEq4SKbd6XxMkm3zYVhJ5kQ9tbzBm2+Gv2h7i+s81/F93Yu4wyNvltX7JUCaeM08tTTrdK8TLkEmd3CbE64YY0CPx9EuNy59a9InSRSpZ/gnhQF4Xr2x8nF54eyhaNtv2lTXaCGUjnijZDi25DVaPq7tVkMEwz7Vo8n9QDUD0kA48GUr+Y9PL9Gzx7RETR2R0hzZn18lHqwM82Y/WCd7SdxLGDDV4MPDyTWfYR3e/58OUSITxB6AFa1nzVTXdt6bl1TbShbd08gjlMXv3KBBawtSEPU1wttlnv8EJLMh6kmfuFBbg7JGT5OBjUY+YGQWfoC6A9/g3c6omuFQpSln+rnp44wwE+7bdvUCktAh6jphq47LzRhIZO3oWoQRfhM3hjqIlG/Kyd8Y4eoJsxw2cR7n5bqHWD7229YweHFQfXBYzO2l3aPz2VAy0nxiXEqOdWrgPlbHWJ4XoGT7x/+G2txyg6rCO+9Fx6StVm5pbqagx/snIV+bmGnnsfPggn0qSJ8PZ3ztfd2X5jSeS2pXdiH4Ms0MUrqCQRRphRJVc0h1U6Ni126FYqJoDDGOGdb4HNEEuQogskE7YnQkLGthkVHeoxxEnyb11Tsn6YjOTDs4V+ONtYsDdCIpVoSc1gWmSAnbF2Wedc6++aJZPtX+iWiY1s4yvvMrD8+h7LuJSHRJ+t3NlxMRn0eZ/tgrBt3+v+lFbgx1ZIChO+cvx3XZ6lEayeCkj2nZ+p1450zQ4S1b8+ynlu3eHAa1Rada5uXog9G2tTe5uP+MbLTQwAl1M6YGCfY2C76Wpz4+WiNfHLxLQ32S0jBk5jmyztAyhBDsGhJv2fMUFEdRTSsmAPnzhYseuxYYSOPEiXJNJ5KQYB4epsCS4Vle5l7T173eIc9RhPuVG8rLXgK/Uw9zBkmwuq3WJ3jznwYLjQns5GHL/c1AFrEQI0lJUAzmb4trBoBy3HQ2hn91K8M4y+DA97psXtMbM3oJaHHgdcVq68aVFsCnghf49FlBgGvV6sJBdRKApiPkM7/KL2tcbmCS5EkqxU67EuKgYcteYnCLZkhm/RcOE2DxOrby1zvoZUzxpq3Eq+HohwP2vJ7JYcPVhN7S9Jru3E6ReB0fxtTeOb/eGR0ljS7V6FZE8SfkJ9//Tt8KHd7e8XNtONdx6l3wyA4cZX53G5erdPQKghxELM9JfB7p48933j2I+sx7vpIU0Lb7KcQrnmAyJ3d4/GfBZqKJP+hs806rW5dKE/Yv39hG8BKMedgiW4XFdXDj8RtCmDF3JTwWsA8rrgxLPoPZsv//gfii0vgWebC2gf7dwYx/s8IQ7bWjYtKqSQ39Iz9OEHLR7zGL7x+7WpvjVgu+fRvcGJI+Ex6/lY1u5uDcj/vEw+xBlO1ZvJMfebeA6o6TH5ypWOq+JL2BOBgzD5BX+HByDFi18/97cfeXt4DW9S+mQxCH2K62k/UZuW3D/Et3nR2TI6n+LXh7kemihhW77PwKHiI4bSjPr6yufM0uMVjtUCzeU4C3x3gAzxlvHBZeBkwkRM6v0a4A6AMy9X9zkYAIMetc9mP3pMZqobrFLxIx5oHFG/bTxNnvX+sT6MbonAmyfU/LvMs4kEeNs1MR0PX5fZZFCkyLXd3N9s/RF5qAoibb3XaNNOv94Xrd42gTnc4CDZKX8gevb2hkGVV2SD9big5EdgCS2LglQ/2jZ10lkTR/Gl/wJjvEdQiHvWHWrtWR0WrWahl7c0oQDyCUPJeuknZsKjOGfBx53djSZztdkYj/w10TFGB5Qcqq39wFlH6dPCgN7EQPrOb8VAiuLsHKY0CA3/iXV3XoBrnsdYa6yYI75pLZGqkfUZaRP8eKaWdxDbemuNZInUUAl6EyecByhXhnfXEsIln1zSZlBEvBxeZ+y2kYYX5TrXsVqtvi6E9zlNJ5dn7gZv/mPrkTj6ZunfsKBX/AEsM7LumtBbh0qHn5zY/+eqrnEzdivPPh63W7p4bFFnioGhweX+HU3YJe7jgYiiNATiS5HWpqfoeShwaXSzqnf9Im6slmWzHUDRRG95qjM5VeSuUtgUxPnNeDdayyK5QGPGoFPrWAR6CRoLlUxttO4lQ0GIJHjJuSGLooJRC3inEB2VoyllA1LSOCi37hTDeE7rWLSvX8sGp+BeSWkJ93gD09TXeKkuy4lzeZbeyIIeUW3mCP8sxw1qCGBpraJMkXohc/AZLTPxGl6+oChLTKBzKNem9pzIfUlnn4r2AT8mBFndnFhFNEM3RUDfXnw3P/NRtbYlYHhELIM0GDlq489NaguqMnUdnA4fKCQw16yDhKjJxdyx6M4+RMRNFOQLVGzco6obzm6ea5H/+s/y6mLAyXYyQ2MynkGkkhshCK1tz3P53Q6+JXInGIE54gEBFjxKHgltl1PyLPAZwn6G2YV5Q7UCYoswFB3zfPmWxAjVkaNdCYlyn0aE/LRJnx2ULi0svfYM7RGGSk672+YObSTpurLHjznGxmnqyYHQmE4SwGFmu0p1DTTliUT5g5uN2DCLfHV+UfimRZ+Wp5nK3gencKKN4M1iziVrhsvBWCg3KfOuwYH1u4fv+WS4v//VNKDskLTgF/HdJMsInj1Ql/IGluN7HGYSIwotul2vqWs89blqpN/eIFbEphXQW1P0yghtpCtt8woeY5u00uSyDQ3eqBsZTMObgn8Ymli3E+gC1gjFNUZedZj6SJOpCFP86JE2VX2RUZ1drWCp2pUY3yc8rKaqafgYQePK/oaD5bhGlgYqa7RaxC5xxxU3p7iGBj5uia+dcGNKK5Fm0SEKZUCqO+3dG9X9BEZiPDKVSFLcarKQd3Gnh7fNwvan05861PJNcyvOANXeVHd+dMitR+/R/B0kPum+F9DrfbdFQ6Ttopy63rqA652+aIH0oOyD6VTzZwVqdwNwmcDCXixsT6RmIJx7End0fnrlbMltwObwEugPZvGKxxvHxJL3QHSEMExOCIatp4ZNfb06UDhMgRU0Crx2n9eYTZKMsNwfdt0ukjJxYeD3qhnCsYRkndxoijU+X+QKQG2DBwaLWY4QUWYwSuwsBpsyH/lHXBhR8XEgTr6StpoZ8vMxYC9JRmVkUlHvsiIghbG5NR1tmuQrb3lylUyx2iB9DCES/aE8QJAIJxru/ZhpqQVxnCtDUYCOFwwtAtM+YesAucYjrhWIH1JImdc2HfFpkcTXJXLIZ4kBfISWd3iMa/VmVphXCc4C5RXxNLKNEUlVUhGazj7fB+epIbWdRxOqEOVltgCwCFN7MB8ArF9Jl755PuPBFimY3QTLjTpG2CKv8xX10DcEoEqWR0OZ2+lBoWQYw/rRdoSXsx/WIQWKdKo9+5YHhuxZ316HG+uMU4hbo3mddflNPmNbTaoHBrOV1HpfqjtV5HIw7IwJ0ISu3hafRxA0ay/a9JXKwHB8rAJJwDnwRPTFRChod2SDtjTxbsdyztd8vDNOfTmpsA78lau2IuAgy/TbHGhM+tUtUN0qiRkZGUq+lZejkPC6n5pBWhdO80tnGMzPBzOsbsXLiHgTVqHAxvClg9EDgsfQ6mP/zy7zcGiNhNjzqoqw7Vorpm/aB/AiXzLW4qPY8m7o6ffR9ehJpVk8k/GLS7X8yQaApthkpEFu8/eWjgeG5W2sSCeTzfuuKv1ULTqfBouRa/nseUr4jpw+bJuIHU0JK1Yq6cOkB2HYHFpARhckEVrKqa99eObxL60MXRzvAOj2AGACE0HDVzh2hIMWpka8BrOcrW/mJId8Ka2msmUrpgCCUT84WUxBNd/s5N+AtdyW8eQ6flnjjjfie7vAIqBjVNxnHeXiWtIr4Vt9/RsSrAKnGgd8NuWXAXSS341pv6KTnzq9F26G2EJZoEyesEBROyvJ2PMqhwFOLlBzVDpvd4WtapTuGKrBDHHM2ySzYcBkNHoYyZ4wWpFlzoKPL8u9W6Fiqqe/ZfwN0eZSaIW7U6JKcXTVZWPr1a0euc3BWNqkMFUtHBiRQGpKFiPtrjOId9sBEH5kFVAL0q6P9Dhkjondnv6jaMBbKA0JT7nNSRzI4XylCP5g1ZkWrnOyueIaDE+eovS6j88/wtI9cJbGpJ6MHeN4HLq30xrqqBQYDVtD1jW8nZzjtwGk7H9WqObFV7WPel5dVz9w9e5qqKFO9X3dkM5g/3ttvgmXidgNId/2rp8dqFWGESD8R0HhmuxWKaEsXip4llz86vOGzVQ2OEj2vqd5G32vG5X0dQLR1rtkukxUWnrcsJ/qBq3JiKhqxATr0SgmX8HbC4K46x7Y6bj8kryH/lsAbo77PJHhXxawOc4xRA75DvzPHpXfYTxzw5cF65YrVydjkpZp6fk15FxRo9yyTcEHln/4F4fww/A/XL93PPblXUTzNaAsoSzp7CERL03aEeA7IrsPhdWGXaYSatdMoSHZodD61sdmIKGc6Pm4BjfgNa/L6RVLU3yvGctL4T6f9NqDqMPdJzYf2u4a626cvr9Sw1Nt73SPcOvvQA11eVOgGIY5n6FVVH44iEiv2fdAYK6WUdmxl3ro6CfLyXi6SnR5FZNvCfKDRoTaZx/B0gXWjNWPRcxmFJXAPHuPRykb0UXWWGfjv9TpmzKej2HxUxv+PXaOJz9qARbn2xcKdmwJ7YYSU/4yiwhTYLcl/IJ7MheqB5didWgPoZogK68cJesPJ9ybcumRuxVHk92lqCj70gGoVTmTwjLngPe2P8n0FA3DoOa6Zv0f0GQ4cbH9GRijNuRGR1ON0lfi2G/CyRSA0/cIETsenf5/Hzg+mPZ8PFdglLCCs+eI0M7fjr4MICs9Hx2zyeDDsoyMKG87kjrh5qj2zfR2JnT0s3SsYQfbrIMJp3tqtQOHR4gkua+GA+S44upEMuGYB0+lQ7JWGtK8+uPK295cmv9Fnbt5zVeVFpvy5S2/2Tu006ztJQK4xVW29SnaHmoQ2r2qbZsMZYlUmV0dg3SzEGcYzNsXp/JU5YLyPrTTXHpp/BKnBeE/MhWmv/W+pJRf6ecFSMjOhwQfr7/IpyN5jltq7JPOQJ5YaJkt8lEP9wmuT/MFm7IcXaE8ZY3Pi046Cnvt6xYVe5L8T/Xkovbehc98foN48erP/o94ea1OS78kufhLMUK0Cjtdvd7dvkIzLZSMd+hBKbbv4qAzNDLCzkDUzC04Es5jhuWmwLumwsFw6s3jEmM9JiNHuG/TKVXmrXtfPypgK+Hkv1dryRfzaQaLeFpqDLU0xanjhEUS1DcVUg72+m1OFN9AdKolC03GKrnFdBs93s5pJhx1RrsACUfKKRj/GC8hRgaQTMlToKJ/uPXQyn7+CADVGe+B63XfL2WgMLvlZVaK65991CXSSTJJvFC0zu+3aSADmvoKTeLvYyP9BOe4KiTdzyWfHCUJaJDFG7/seIKv6UUmM2VJL9mQopkexiuPju9fc6oqDBVOMqSw7S2qz0fYhE1DSGcZ2KLxx6CAgTBqQFsdvIFYHLEl+0PZqSk8WzPU2xwpA5Pp3vNlJTF5vEFOnFMYDFxmWjy6cneSbIcZv4DxVSi9femjaX8nEOUxwN63d3TBZbzG00w8ixfM1neyQ1z3zc1jYN6CtoqlpzE/zBgSUM+HANRlv6/vyhUIZhMx7lQP0TqakW8tVxFghnldWRRwhzNLJQtkzwznAW5+q7Xw311mTnPQaVsBxIXIb5t5FB6GgSgxrqmwWibk+48uh33oa2CpjszkNebxP66NRAO8jAquciXjw6RSK590sgAzZayKlXEeaTJVLt7K0hn0PzqFoLe68M2eP3c9GLVaqkhVyajX8b2f+JCUTOAXUjVyJwaJhYV9bDbv8eHIwAd5OuQqNzE1UBEbct0ifDQBVI5VE/hxXImpQlq1stmzGpPfMspu+i7Iv3SxIeBonu/ptu4SoVrvPGifR8yQ8XrFMisq/VWwUB/9A6cVrZzOtocTDGc0jjH32vsJEEv1eeHERbzYsmqV1Cc7kE5S5MepDCThueCk9PQVgQpIQOLrbItWbeRlK9qjl+Kd7c6IdWrbotNo5UUrsH64+G1LdhPJ3cqppiJ5CR7G+CsxmyyEoxwTxckwJR6/CQylnkKub2L+fuB//5S0LM3ojhL+PzImEI/1USWWWp0/BPcg9uwJvVf8iaQNXkd3gGvPOPxNJzkM/Wveyi7X7Ieq3gVncMzclGXJDiis1sR/28jyzRhtb0sGN+S309faC8aH02hRdAFDuXdQ3UFVGFM6PGL/iXqIYs+Dc/5z7ju/6t3lPXn+HzRtqYCGddWHIZrtq5Y2IMNreU9P5XVONbl2gkmzqZsL5T/Xzn+0fL32gONXmf2MGv+qZ+GFp8URm3U511X5V05u+bJQBRu+pCjlK8uMsR2PWtHEOrqycLi3QjQYJBAKMyZmtNBkQBROd8nrejKYif1U50G1dH4kLjBeGee4Wu+eDaakLibqfMwNNFaaZoI9xiSDImafCa4/uLq6s59gS47w5aET59caTLwQq4dNX9CBwfxI3HuwpXoW1a2JmGM/6eMBJq5zpl9Gtb1CZse2k48TT3ji1mkDeVHWpcsznXoJo3HZ70cy9+JIsV60vkWLfR45DW181Wex0dg3PewaeHAPRznFYxq0TZE4a54QWB9N6ouk4iHsYEfhzcxHjB3QuCJDdDxwtdMmTPXWcxjM04Zfbg2toUdw2pM/3OhpN2ii+4EsWWHehsIVVrj7QRjr3Q666dJDL0HTr8SAb83T/YP7oBfuQ6pMvSYhm63gFE2QdxQnOH1m/Po2O/NZxy/my/BzrE0tUBZQtheTKXWzi0W7FD1rkSpW39EsHMbEg3kmj2/guVJLBdiZsB5dlJqGAIFyhjC/Jj+QNeoaB0Pt9ujeJIab4sPq/CM6IYThGoAbfFuXINsIg3Su1c38plmAZ8z6ilzAekYu+gL9mnpZkp/444+XhZT0gag6EiCe+XYFrccaOZe5h/TQVimVeOjIMwhBLkH52ZHnI1edk++NoLeQeFaqCbVS6+KeFfOozZf9pb0HobK+QWVY+wSGXjUUBCxfoZEHZQVNeBhqCso47BQvwvJc5sGTvPhnbuu+CyBz/LrVnrML8kuIusK91hb/gIixGkSixbRz3JFrHn0AanWRoZTHE0wDLarYlSJK//OXAuSOBxg6B+7lZL7S8vJv65yUnVMuSSFyGR/W+3dLRIICv4ZYhIcZtK1Fbx94pqzo+RNZ/9ReFiIr8kVHshfOV71kPjpe7zM2Kic7wdfbQCkOjl8Yp8cc3XTET9UNEMMC09p4UJ4Ofu/QpKPaCJPvoXbs9QQ4qyzoSAQeIVJQMTjNQC2V5Dfuo56L8PY26xO4wU9X3Ro7PdGJav39mZ9wxunaCHzdMnhpV9J/36UrXkDFmTxUS0Oylt1LHe+tXFqWXp3aUzoA3douFKXlCVHP6OPEXXrgkXJehcQGad/aoOiWmmHTwXoRgUqHX7X0iHtnDC7Jy1Xosp8pkBDy929fzAIDlzb3j8nN3EnQu3mDGThu98DToWb/DX+ftTzC5ubbs6tWYeZGxIOXxdV7Msa+mNqnAfY8xGk7lvVXZigPznXYlKcivqqswj5eY3xafEJfY1sAtzEemm97HYxXLDo+7O7Fr6EAVBzC2S7VGuQ1AtwQk01jhtgg7kUHR/z0R3qxTEz5KHfFf4R8Pp0G+Dh9zj9oAoudemWBPL1sLOCT2c0XS4rGI7eL+S2P7wPT+91NOCw9myIg9uC1ZLWbqt+SaTmXLOEb3LbNVJ+7v3/tutes9f07b7gsZ70fUJ8r4Phrlf+V7y2Itz58iUgc6jFTSbqP0eQoqwjQkVtjm0OiJygNJY9RK8tpZA4YoIEFX4Ul5Rm4iQsx98DKbUHi6SQnPmWgJkvjeNeDPK3Bv+CDliSR2MZ3GJEwNu11lh8GDmIOA92w+Mq0bwwnpZGJv2TnKzjleh5XKDlx8P1mo6JuJx11mCikyzOWFTsUz1QAxMJ3X2XCxuFGyZGZmLKzB7zRTyVCzbZs0eve39UMflyu9OCUfUVgqDqqPSnfyGgLjJ/Jfk6/vDbk0kuojra48h8k+SGAwus59bQGVtcSb568Pe+33NCghYx012cX1YJBugaAi6GZtBTp/WIqB12fFuWlKG+BvOJ+xjh6mN6XJimUHtQa3+PfKOlCXy/T1tF7PAF9VFWb+C0Z8bI3YqzRukqrJZ1TS8XsXvK3wFde298qAqus+LrhFa1RywpTbP0RFOjmKAnChfhBh1DCK6izck/tcPRhGc50VF5s/+4ZcqwvkDmcD8qiJ326lpPbtAGGdrd+nGRTV1XtvBmC0qOQHeBbtDy3YuIfMQ+wQin+wWN8W8rdfuidsIyd/QNbITvqdwhrWTj79mkA/zjztraDcmIYAUPWc4TFBj+e3oL6FRxhiBp40YjmBCHiRP0+gvHPfmj5mPjrOVGc/kGGYPXn+IGz4P6GkXcb+cogB5DPTgwKIkDhA6+gxySVSzzEMf+j+zDw8c9/UNYBk1HFvOdrcssUEhLo4bTra6mYcfiqCy7s3gx1EFvydcclIyeVy1xPNLwH8bXZ5C7kvWCXZANrlApAi4hk/AsF9kwoUw9KMpiMxD4DKfcichfbb3HBrSOlvvUa0fA4lHpWcupDZEWI+p3SiD5hQKkiS4gE8fFBMkF0cyxmUdgxhTh6lGVeyN0EIOw4DWjQd4g2Rk8FJrlJ/D5V/JfyIVYuD0uBld16zvSqW2sXwg8pYG+to/nt2GzLrEq47D9g4xUJnLw20UVkrS1bUTbrrhvDRpCQ/X9F/eGaqmCPVpYCYZuXCPX4L+QsYO64WPqYS7l8/LJwE6Su0QI6vGaNCTa3Q2i58wDs6EDchUgsfN+6APV5DO8e7Hp9FuR29wX9k+zWPidhK7alAjv3JBCSGxem+WvZl3XRXpIuwly7ugIkDC9nhfNEtqUtdj+oNd6M7ViHrdvyJxzNjSMznhZui9ZTU2LX7r+XA98duHdMaPVvz/P4mhiHX7hWjb9EPd+bca7Hu+J6SEVG1ZzI3tG3m+V8uZhzVTzC9RwpsOZWkyjEvegM85K3Jkl3vFGjY554n4/BLy8EhHZVjAFIbZYAmw/e2Xf4D2BlV9dsAun1hv6poQNcEQyv+GGczG66QBwicyvCmqSjZDdEl2iQNTf331sE30tY8htoVxnK1jQ=","base64")).toString()),jj)});var qIe=_((wzt,GIe)=>{var Xj=Symbol("arg flag"),Oa=class extends Error{constructor(e,r){super(e),this.name="ArgError",this.code=r,Object.setPrototypeOf(this,Oa.prototype)}};function sv(t,{argv:e=process.argv.slice(2),permissive:r=!1,stopAtPositional:o=!1}={}){if(!t)throw new Oa("argument specification object is required","ARG_CONFIG_NO_SPEC");let a={_:[]},n={},u={};for(let A of Object.keys(t)){if(!A)throw new Oa("argument key cannot be an empty string","ARG_CONFIG_EMPTY_KEY");if(A[0]!=="-")throw new Oa(`argument key must start with '-' but found: '${A}'`,"ARG_CONFIG_NONOPT_KEY");if(A.length===1)throw new Oa(`argument key must have a name; singular '-' keys are not allowed: ${A}`,"ARG_CONFIG_NONAME_KEY");if(typeof t[A]=="string"){n[A]=t[A];continue}let p=t[A],h=!1;if(Array.isArray(p)&&p.length===1&&typeof p[0]=="function"){let[E]=p;p=(I,v,x=[])=>(x.push(E(I,v,x[x.length-1])),x),h=E===Boolean||E[Xj]===!0}else if(typeof p=="function")h=p===Boolean||p[Xj]===!0;else throw new Oa(`type missing or not a function or valid array type: ${A}`,"ARG_CONFIG_VAD_TYPE");if(A[1]!=="-"&&A.length>2)throw new Oa(`short argument keys (with a single hyphen) must have only one character: ${A}`,"ARG_CONFIG_SHORTOPT_TOOLONG");u[A]=[p,h]}for(let A=0,p=e.length;A<p;A++){let h=e[A];if(o&&a._.length>0){a._=a._.concat(e.slice(A));break}if(h==="--"){a._=a._.concat(e.slice(A+1));break}if(h.length>1&&h[0]==="-"){let E=h[1]==="-"||h.length===2?[h]:h.slice(1).split("").map(I=>`-${I}`);for(let I=0;I<E.length;I++){let v=E[I],[x,C]=v[1]==="-"?v.split(/=(.*)/,2):[v,void 0],R=x;for(;R in n;)R=n[R];if(!(R in u))if(r){a._.push(v);continue}else throw new Oa(`unknown or unexpected option: ${x}`,"ARG_UNKNOWN_OPTION");let[L,U]=u[R];if(!U&&I+1<E.length)throw new Oa(`option requires argument (but was followed by another short argument): ${x}`,"ARG_MISSING_REQUIRED_SHORTARG");if(U)a[R]=L(!0,R,a[R]);else if(C===void 0){if(e.length<A+2||e[A+1].length>1&&e[A+1][0]==="-"&&!(e[A+1].match(/^-?\d*(\.(?=\d))?\d*$/)&&(L===Number||typeof BigInt<"u"&&L===BigInt))){let J=x===R?"":` (alias for ${R})`;throw new Oa(`option requires argument: ${x}${J}`,"ARG_MISSING_REQUIRED_LONGARG")}a[R]=L(e[A+1],R,a[R]),++A}else a[R]=L(C,R,a[R])}}else a._.push(h)}return a}sv.flag=t=>(t[Xj]=!0,t);sv.COUNT=sv.flag((t,e,r)=>(r||0)+1);sv.ArgError=Oa;GIe.exports=sv});var ZIe=_((Jzt,XIe)=>{var tG;XIe.exports=()=>(typeof tG>"u"&&(tG=ve("zlib").brotliDecompressSync(Buffer.from("W7ARIYpg4wCC8FROo6Kks34QYF28MR6pl2BlUKxsBKU1lU+64Dq8fBQI+jgD3GGlvTP65avav3++npUGzK2Z0qn0wpSq4ZxgYinvCQR4WKhlQp7/uWd9JR1W3GIWYcoQhBfGR4Ph2qbStDpWsM/FqIl0Gh8h0KbrD9P731TdvUwRaUg+w8fuODpSlwknecit/TuhNBx4Pt2qqgmmNcPjn1h1nVlgTbJWQcxUy55NtZb5eq6OBqxWHA2dYyWcD5VzImWVblUbw6xkvrIDv4/5om3SID0yPv163/RzIwn4LlLlSpXEa2yQrCKVouhP97l9imMwSw6MFiCK+w3+enKtud193xuDWdYA5JaIT66xLpOxkcviH2+oMAIpm8WyavmvgDAFLkS0O7et5JwReT2hR/G+cyoeCQD37EyYoTYZss2AZcXU+/aHzP8/bmq3zel/s4UQkgAhUGy7+82XZf5zFtMWguk/gjSycDDHAHvsD9X+cZe46XDzhwOSEGDwACRiKFHDWbPhB4UzvTQNC4ZDU9g1rY9ng4OI42BcS8edERWUrn9NL972HAvkxiWHizory+SpAw9cxYRk3n9Enw9jSQ433izwxT12iFX5s5I+l7DV/lEHEr3AWeWtvMJKcYAZA9tpI7PLUWId4niI/C3oe4yZ+7oD6wAnMf+XAemIK6VSg3oO7OePC1gtn+9WCClQdnejdzAS/0ozZMGOdfaGmfeqxqSyhxXSX191Ow9Ii/Lgqcy/YqDXOFxs2f9fT8Efidd1OQ7GmZjit2xAXiBsGE+7JLlmyKMFdYBHyeUE2eNKqRQ70nDF4TUA2iLLYQ5bUK4CKPuivenoVnLnCW/FfFxRyQL2H6Pig+mik3dS8SuZPAPWs4Hk6uCbZUi+KU2u7/OtSFDaEI9ZTHjrnBuAGxySg2flD5vFGsrdfJOrWUzvQjnAulbAF0KMRAjN2fD4IlsJIccKrwL6vPJoPQISfj2bwpW9zUradgicxTU5wAFptaRTB4WTiqujuV2lZNHl+yHiXNNwKgkmcmILR8ZtRU3KeUffr5vBt3IsmofYnuox/o2d/HugXyUfTv4/Pqm7RQpG9fJVvbCGt/c0NU0zOVxkTT+2xdzZR2tQrT6PfsUuuAuLVD5N8DSmLjUPfyTK3YMv31xcYBzofukO9CubJcb+2IuIZtFnUlSLYN3ngNDkFRZGhELhu7CzB6nRGMxV2GcjNmA+wDfBQVvy03FY8N3pC93aHTMnqJoA7HlVSr/DVN9Q2CNX3Uj7uzmnK5B1UB63oZ7BlqIUBeeixMVneki+KKH51wvQ2ADUj7O7Tz70/KtLSCKlo8tvhBV9nSxSuTylbvlFDjCrjSjdrXxLOfMuqsmx2LRkx3TTD2zvK/9B1pacYu/mPI5eMLNO5qUWoGU1NLqFprSBhifv+Cl0jNxqlDTs7LZk4EwsLqkD4U25FBVSarY7HNXvSqH6SRKYfZ2Lly95r2DeUbXi30WT0bp6Hfm98fBPiq9WZq+88HqW0WH6giJD6sCFCTiwSF30jWJnAfnUqgiuXd3JFpiwMU5BJIcEBzWQ6yazve6L4dtl909aLocDwqAdw+Ovz8GijOisUm4pL3bE4bSmsfly8wHi0AqWEKJ+M2hxheIujsQengKyfciw9pJHr00kHXBSXfE3Ud9HzQ6LneHjd0+L/yBVDm69HsZgqLZIhDqHyIZndi4lYewElUOl1JA/1xfiB2zVtTHKa/sBI90vZ7DDWe6IGrJFIE5XiyY2hVBvrlx4GYsPqwY3GumJujJTcwRvFibFJLW0U2p+Kch5KXt2YuIXUGwPElc1lwzfOW5NuMcWVjW0gIAAwmiVT6any5o8anys2C51fZkFw/owEhDTjKUSXvu8UYnuwPQsX5xN1UN2QNwEgj56YWPom4khizKu1uiBw6jYlOkInRHXmcdH6vq9REXdP3JuGJP5mnSGk14iNNCJSechf5iUTmuky/6hjHaFrx7syRt4OZimxSIthu17o/ONEmK2ujDRq7VF09REI/G1deBmDwXGO5w1WI9Nlsv6ZboW2k+0xKUjk5NF1vMLUcV5RJDZQ0l7Cw+Lfw1LF1Tn3PPrDa8diMgihsHiB/NHUFKNQ0GUFWPLlLdI3htJi5YRFT1xjTPMWeV2EiXngEz5AAQYtBabksFFy/uM1dXuTJ7f8hA6Rm4a3dKcJcWQy/rFPCnCXupEahB2xRoSGVwG+fuI8SltzQ8SsTUmxCg8ZNko0Eu5/pTz5wYjMl86WBSZCsVSq2bm+v1M5jOinrIext3sUjE5xBbX3FjmrcpOGlyReAActcs/YtR+xbsTmLtF7cxF/FrCfjnGoj6xDydd+zlPYILOlm3jQr43urlDHosvh8x4B7DBBFX4O0NLUtM0KktpJUo0HbHvM3rZjxj6pWtqroOlEne3EA1X2QedR9wYH2v1SdYVBxG8DqzrMpbYyCalUaDL1LsG31Ylk3YQz27gcYpNq4lXLKMvUpI4pzzzfA0tm56VeFEFrFJ5Gup+cav3IvRAx0n+I45iShfUQIzNGRXkGDfNZD1DY4kbCT7HgoZa5tF3ccrIw5DfnyHqkaseqWs0Z8VpWtvyDnUzIM2EzYondzX0g+HHmbu6MhBvNJF+xt8WfUVlqSzNS3W611WGBAdta/4mIDasd6YZk/c5nw95UQKzY0S1O2Zj3ioPp9ix2sXS0XFa+VykU2lXeB8SXc4I+zjcmmThiiVVNk9rX7pREGTJOcNcF6+ls2jpyu+8oTg+TO94R4l+wddtmHq/Fv8tHPrzuCkzUWePEFNdMJp9C2li5F5bC+DnqZxwPkaiTkF7FLXdat+k+Dq2uF62+dvmUi0oVgM4YD8dAAy07InOH1x53oIccm7m+I0kJpyW59hooNbrnc5Zkzh4r+JLK2OVT3WKTVBwRSEK1l5wpb0fr8vkCpCYZ4+RCJHezCnfqXr5koZo377jS647XrKpfYqnfGJsvUYkvWlKBrKUyVVM2ZWlhQO4XEKAfPEkN63DhO/o8tIK9DUtY2gG52hXTOGInT9mDL98LHB5LXY3T20UY6nj2Di9t4tOS54yagHzkkh64flMqApLfxY71xlqqlczSVlfvlz/DMoqfjcjonJHvx4bC6+C43RxR4tuzD64GxlBysw7Wt2vCDz/Yn2leZL0G8IL8+Tm+kk8vWGcRlypZ7UjesdNnIhfnsjzOhEnTnkulxVAXanoRcw5dDYtfU51sMfESSRyK1H+YMHjZwCpElSjntWczGnMyb4rqOvYgoR81JphJBoMumd5IJl9Ht+qrMPg8Wgwyzx6jS7tJc1cM8PuGWHtxD+8PCC/afx6aASh3a79BuDtjQ9rdTNGvaVv1UOZ0NqMsGwz+a+MJJ8m27FS326u20hLvfxUyioAx5+WKSmNKX/UVnB4vwe35hdfsGW/9Rspm6AtpWkXdS5x/R8hY3/E35a84fg1uy1nzZLkdWE2EiyVppjvwtanXeYoTt+nWwPe77glOP6M7rq47ohaPHO6bgAIPbZ0zNydNbRkuohW1qThbGZrHBoBYtNiANhbh/nDqaKFg5nYbde9dsEbIgzh09AjM84eE7Q7M9W+sGDLWyvf+mgsmKZLYLwm15/sLxw8TF2SspIa3CQC/jYDl698s+mSlnNmnvbSYz4AuI/vSLMCQAjvc/sq4zsOzd+Pg6F7D4n5k/5sE9dlF3T/Ac6VCyF136K6no9ldPUdSdpoYWGse85PTaTo+p8vLugOhfUzOw/QQhP2qXGQSJd9XF95wvObCQmU0D65T8wTxQpHE8wBP1N0mEikx/XvlX2PvoogMUcE7L/Ny4q1GLzlfWt1Gf2gUN1FQ9doqC7mzUtIoK4NWTBs6/1G0ltd1zm7eXT7z5wClwdCAiJL8o4FQJd0zAd8FW+aJt6W09ufZUtMKiUmF5/QFFZTtWA9bYLERKLMN2Pq0hIStoH4WAK+51mUG1mvfT6WrZnBX5gTqjFH08Y3i2ju8/vmXPznEO2sZu9P6wxX31+jkeM51x933qGypHrV2PxSyMMo3SNJ/5nz3cmHft1b0MSWMFzkNHO2aE0keZU/9UpEZcs1f5cRCQzArPQTmTjZhvXMVXyCAHwVXw6xS619ps46XQLuI/bOa9YS628lkpWnCSckaz8JqpZ6ki6JreMpnSZ5sO8qipMaOCbUDTRi687hHDGsmx4HwKgp62Vq8SePZPSAxapZQVfUPwavxhtB21UOEMJVVpsjn7CU2cr2Zau73QA2V/J8eq/8pVAenzan1m44Z6E4a6yG1YQNbVbqBusYKr0L0NtgczDfeYL+e8+22u2QtqZkTwbEzyRNq3HiBUhdSRqowypZ5aWr1rC0UHfRaUaWRMo1BJQgm4gLpzFUXSSrr/HpgalAcsJQSL88x/JFtXDnhiRAzvLSHds6VHSy83PRA66t14s3SsQpBo6QBYjc/tfJvUr59PafpXud4EmC3u8u9QTA5p/ImbwVfl/3GLfLn6RZrjetoVNZDyepm2eJ6D4xuLPalVhxOF/UT558S3wxpFNtSLqXevQQvEcSqDlk+XBoOXQiNPYs6aHBKQf6J0Ob0Upoot6d9uqN93COXAFB+DzC2+06q52Awtw6PbGDkt3LyxkQX6qi4U+uvsbADCFOpLDO6drNzZBp79pG3jim+BbqqC51ivZzZ+ZcuLAxdnBh71I4a1TMY3rnjdye0IJO/E3wbMXhI723R9ivM/GQRRwjV/mzpsKmE83genP3QHwmBD4wbecU6Xd9C3m6X+tZtzflLslX6VfGzXenq/ufPDl062eQHpNtd7+4o58v52Juq1+9O0vpl7q44iulAk08zJKMl8ViuSv6ZGJ8JEMyAB0GAi9NQfkKZRdo8uJFna4+pl0RQX/x1JxgI9IEtto7GDL90nlsGiORu9kAV4XW5Z/FV4FfpVl0EgpquK4ZN0j7zdFO5aKd2NM0ev/RB9697nw3Ev6lwKn2OyT4Vfo7i3rxKrnTpxlmjPYGxK28MBY2sec0pfaOfcrC0xwqI+IQe2ZMBCdnEZjDnPxSp1aGM7c7AbXe08Ava/L0YobwLnOqzMvh9sTYTsg8DVI9nl9azEn06E+CORe89w4Zo2uC0DETbpKYGgI4cvrM7H7RDV57Nzp/SWkoP7uwfBXnudSQB0JK8Iqjc9ut4Rr/pf7WThdHEfqY9z2vHoRUyPXNOUaekuH63dqgefi0Udt8ZU79iBusfeF8HU6ycrCxLD5sSNyXCLOvU4khfvTVXFA1lj/35hfHtDPm6r2Zf3i4R/o4tJ5knYPx/ZWN+Pn6d9/hPopvS2t5PdI/sDjiq2VyCbRGfhOdWN1qMAAApShxlBY54GYfxuIJBe07pPSCT94/3fcQOdP7tRhTzJp7DZBCP1WCP/slnfozu7EehpDBZF81TXHt0gznmdls3kujsXjtQnryeYR6mxDsDjFuzJxbKpmY3HeW8PPqnb6e7Um8FHHcyWTLkRb0ENnDM+YfGm3FwWsUZBWup64xSsR2g1ysTbouG7K1jBjh8qb0B+MTiiTf06gaeUuZHWm2vKeF896130XPYhanhdbMN8x8zmfb/bXHqkVOG5BUD49cAdulzEKKLaNq/zPpCpAS4TWemL/H3Gb8GDMtpbJ7Vy3toY8NOaUi6r+HtLthk/R6Re2d9bbGLab7XykgqnUvI2973UqK2ihdAAkdsxaBvNXuYWl8RBvEvVz3TBntF1XS2B19UjVK14+z81PUundKogcMDctprz/NEaqR6OEOXVI4SO7LyvX4AFdx7ZdrT/C2WDdMTOsmica4kmrZPe/fkcdvzjHzcUJwXe6TdIqV1+q2QdVKB1mMjNzWX9Yiq0MJY0RLwmWX65cy5/I8+o/9O4nJvAJXXidrDw7KqH6fpu37Q/t8+c3KoHRs2k4twTIQ71SA/ZA+hx5Axz8ouCN5CoXx7ikoLTft+9FiVwj691c4mCGHWnUnRiDD1v1YYP0oWAirxD2vR9pIzlazk0K9PHcj49WLOESj0WSZqBpC3bDs5iy6yFfeC3tmCqSypY6f8EpiMRuJqyWE2UKxbademCKsB4xKQQbncHDjKgwiZUtG9YpN1iacfU2tqhoTAdZKf/m6n7y3h5eN3r2eNDuk3jDL7sJWPzjB0Oxlq4iI4gzvxOslQJAqJ84T0f62nVoMta7dvL72Erv4hQsPRXE2TfHIecZQP30Xw+YWNKyqCQ445GUJHnAJwrernWJ36JuQbF9uzLqauGdc4A2pUtg0HM+slFO2JAh1PaCs4YhdwvWOidnC0up/bN1lXVdB5x21XRrzvrBfWG2CIw/oCDYaoNL8x4q02UYh8DZ8skXNmxqFab5mhkAFy2IapMWGGefM26cLikVB1gZf7OTCVO8vWBy8BkuvBzw/4wlhhJy+x7LnVlgvYdFbqaKiRGriHrUXEG0xK6sNSTpG4ZzZQfHsE7p56qDH45TykVeJSbPJ7lRh+moVKgSiIa5LTQhdHQQyipG2c4oFFhIhhlcysYkhUJ2vc9nu92AWP9rKx1gGep94W1BWBwE/7Vju3C3EvSruGiLYvau/1qPTdUYIPcgVIoUs4dnIzaNxgyb2rYcCAyTK8ZFOCFelXfytG/FkLfVgUhAINhm8VlccS3k2c/Po3KCJ/R2hwRgZSMLvubw4xxTfOQffbN0+bPOAWNCbluuj98rUCvSTI3cKUMhoE7NJg4sU3GlYWo8122g/FiBbXD0EDbWRTRPmMRuZ2Yl9dh0mQUlbgp/oG0KZZm9lLQoUzCk+2+v7osgqYYMpQIa00JCuJ3+rqyPbkFd3CNIOqaHzTo3LgmHqylqiPWsBXRzYTnevLl8nOQ3Dsv7o6AIu7XNVwUGwnpC/C9nECwhx/4r7h4gz8UTrdhAph/lUBHSK8PEdB9svVR4u0TVcwjzQ+3Tdi7FYqybf3VBUq1vxlhZBQ0yfkG/vYiT2FQg+w8STdo7j3NpmEs/5ZoRyPuXTZf/jBnFL/4e03PEDg2KPggy+2bKZef/SLNTbXxvf5PgEhdw5qiChR2AOiHs6w/q+9ceTAGfL0gfbnAWDrnqMzPL8hPlOvPuznt2w5g9ugruKCW/uiFKx7hVb2OleW/eELjyI8SACg5gqSSoXPFWDiUgGdJphnRfTtasUasrBJhcHSNfDz53zJnaulLUPfeDjOq6Qj2JKFtISsbyUASCRT9hhssRoLADlHthZQqaolEKGE05vHyze/2oDqSKmLYvd5FFe3Hn+x+jVBEiSKruicfr5IJ79xV9rz4P7iMFU3jT7xUh2NGtsDmTh5sovZ21zgCpEt49C9mDUEyVfiOVr+mGcvdhC8jgxL4+eNXtATqDWFuMFrUyCA3DaUo+b8lT3K1w0ytzV4AIt0zkL5sJz8syXhBQTP+Tgip44e85KCTGLOSHn05jQ/sPmm0/CWAPxfqssCMrz0B3e52V4v+0GtZiigxuRZbw+R74qQ5C4PWeMd/chcStKl+mAtfnn1/zpBvpQq0xqeRewCiFvmZ5/ofcZv3+nQp8Ahok995o52XGqFLkWS4YWUCHcNjfHG1kxkjAcwyd2jx6f5yefOBDZkmRTs4gm5qz1U2dz5V4mIPrdy5y1+a2nfAPT/+UvQH54ye6zuF633W8nr608uNeKc7HtWSfOIMNfFigNHwg3T0oF2sB2tuKWydLc0LdxG7dxizbZyohDY9f5olzYf69PReJ/gs68RByk1OkejxEdmq5NCMVYcEQXSTEjbMxf+QP1BkBIxCvnFx/eE7xxfkE/E1VEoTivNkRJv2TWg/ke0S+p/zOFa4W8tQUoOmxoWyBMrbMXr/vExC0A6AOW9gPKtpRnulSmrjDalI2R+33cBVHldx3fQAZGL6eBtRWIpT5dmX9caSouWLkaMLk3g+MNKRNYSup8tFiVmztoyOewyk+rOzznaFOafi4tcIOGjAYoDgk4NSmtvZwZRMku2aNM/PNnQsU7RRJdc5VOmlxPDaRnsl3FqT/lSYKhE+K5BQUVb3A13Kh0qcvzEY9eCCYs8PpnN+tum7HMqFQPpEI4E1k8nl3/rc3b9T8U4r81xIur+O8Kcf8Q84zX/nrMMKBcXGHVWbRAbQz9ubYmNyeafFFn6LIl+TKhZ+r2e8lwGEDmEyn7F+j9od8L1iTnjt43WmYxW5QtLz0M4/7BUDLmLY5wZoppjdyPdRYzAge9td2s5n6HL9jUYGZkR2Ygy7zfypxGPjg050XPpG6bKbiV0B39Ogu3PSh0wBh746o7U+orZye5usdAI2dda2d6zK6+Tjc/mqfdNm5hWPwRrfb16Hs4e3mVPwxlF5k6eAfII3bQf/Yd5bm5gzpxFwOsRkN/bmfA+7cQ90ltCcafzaPktSb6OWOosoZxK/lUr5ERE5VlV3eVjH7u/dvDfce67x/u9foe/Wyb81F2Ce2XuiRMSZZP9Tolx9+FNrGeg8HvAc2ErwikS5yHcuWZ/niczUiA+EAbqdIKOnjCdNKsrrDTz27DlXsabpK77qVD1PUhnV56li2h2lCoV12Jn+TyaL6R17k4//K+f8ZRUNYG+fIgy1cJOZqvwvAnMjLei8Lw6FkNlt9VdZX5FYMRElv6MIZwocObU2UZshcGc0eW9pgURHT6bPPtttz6h3VPeH9fy6hBWeA5EhqejJEjNjo5sJnoeiKKu9UWou8vNBiG0lG3zhhdn7IJXFJYiWNq+hTQfqxxtMsHdT/+VNdIjfDjPQbD9RFnA5+ez/KEL6OtwQBC0ghr2PXze5mkmUhlTBfW3vOpyfJIXouvn1PAssDLeVKvGYi51QASmxRv+2sIAitMHnN/TUEYNjmkXGMwH4KMbNYpeIaUK9xS3nwdX1zXAJM/OSUVd9VtREJ+T7sWJEjU2J/Y6DzWQS5ZpnIxVjhrf2+aaXLL9qHHgymnWjixaFF87OO/p9Pj6flmMgEDid3f/xLrFk5e4xnzZX1scZfV/lUp8gUSoQNyPMUAHeMeA1Q3fxycKghgTUM21JxVMKz65dQEjBqK+/O8lfe8AW4mYjrH/7iTAGfSxYJCjkYSsTilYYbbjKn4AwwCFsfKxYxtZaSapXfl7IlwdFWa5eclRVxUTcaKGWbC8BVtYwXFvR4K8ubwanth1TExJHpiGw6PguR2L8gi3OqpA6b5wTpiwXsn9rlKAgES4x4hQSzbSMCie7xkHiqfnXuT5XgPgCpdv5tQtvhQ4bYpO4VNeOXcBiIrHwTj72hhb9yWSg9EhRicf3G6MgShk43pF6oKJPYHrw6XraN7NyHEKmMD2p+Ioxh6lwQoSLLskfqqXCH4KDpjrWLPsIeKVVtZcYOVhotesH197Pi/w0WvOIj5/oNipek04BnScL5lPCKAr58r+98AGfSP9G3iZgDrRAhBbnAcInXSSjTjEaQE93BoT/IHEVReY8yu9nf9jaHvJQZ4fDSGqQ8vQhCQXPmt3AYaowr3chn+HYKfQQGxv+X6as3qVFPycR2IzniXbS/GwUSuy3FzQbgeqgaBMyHn5RqI4c9nxOsnMlJFNZl+ltVaVW7jXRHDkZlIwClPtjU5Jvik1koRhI8op05O6puFW15BmYfDZdzHAzdU8MM+FQt9z+bhM9zLeInquwjTlNnUpQpMR/MwUesJThF1Ch+PFam0s70/JkW+DFBfef+F/+nt/RqGNyriAV2QSCy/S7Wqs6oG46C8I8CPvnS81sHxeWCUUFyHYP/LSFag1qI6VbfF4lvEgOVc1lHZHmJkuCe4zDqGGMvtEYaV+7nEAQHvQAuT7MKSQ+rjWjDSJTb+tFX3tee+6Tg/8elxgoesK1zeHiMML/jTxePUxr8AIsyhefAGQ/wbvavxEd1HUYbRQd8Ud5Wzh5K4WVT7G1MqX3h02ZWUJQSk7UpDXWxG3VAeRR1cPjmUV/Z3KoA3wqy1Tw7hLrDpXFHUjghyvQqj/Up49huIDcNwihjjfwXL/2p0SQrtxQZZRGOLJVhYYbmBFLBrKtRdWPeAiz6Q7YqroU/pBXTdQfC23VfvYbOybMTT09qASwU7y6PDxGgXED6EvsL/xVN7KN7NMcG4DMttY0nR5X2tNYN3B0sJYNNuzlasDtIQBvtKG9JHodRaJ+d8+Oxydn7eTbf+NaFl92b6/hZWKOHU98mW97LWLlkMptCrvss1W086D6genzIg5dfrkoUfaJh1I83bdbQ2Slm7VyyugSqPUMIXlkjKl564PJ9PzErCd+xeXl4178hKGIkxrFDXq8aYNZvutwLkNkjV0KoTyHmw/deP+y/H/3S5pKrxf0peWKYTunn9c6jKMGhn88m30+GebhAzrU6WFo5CPTWbGSkoo5l0DPte89re5I5PmWiRchJK9aXcCSeuoTbXq4mrd89YFu0GAkTQRrbwRYEug4sIQdvuIJWBsTTLxBZEF90PQqpwi6LpZfUXrbtfpFqLQjldvbPktKya/opNcv78fDQ5jOdbUfgCErmKwqgulQzYs2CVQNe2ipWlOw+HhlE5PMT9TL3WscTQAf203ASMpW6nIobAcFY1hZ8PUjwgVPkALPdMFqHghtDSZCHlm+IE7xgkd1JNVchpcxBsQh1Pc95JKMcRyy6ud21vcYxrD+UtkElSkcGgH2LA3ye4blF2u2XU/W4orxE+mwZlgy7oCL00TJB0pWaoKOG+Ocr8KFMnzKteeYYVvZ3uFs9z3FbF1FlM4F6yoZDYEOsrJQdaZbgjPT+Kxh+iB9kK1P/osleeSaVtGyQ/1MXoYWkN/z2cQ0mJL0fw2NyO6G+MCrj8Wc1sqfwegffdvS2sX/3RlqhMhpiGohiur7AlsY9JfQ9OAqW7pboUQR/zCfCqz0kZBBS2x7QYMfxVXd3Za/3PXbBot5J72U7QchKi4TXpLfqOR/mNhqU+5CWXj7t4U93SJrx+h2p1DyBQE917Xzm1/TZAJuhdhHPSl6AA3RndnK3O7jLWlfWHYcKYqPwh33FIwoendIbV2lzhIFzOLTPkHilK8hqKa0qN92V+Hy+c2Vlfo3bAL+FWH4YNIVH5oWxsCKI31pKLfeeRMgMDns3G1Ip75SfytxdTKwDd/dNtt/Xy7A/HbRT4DOOuxgK3F/N5+RJk+nxpkIkqmfSBgG4asXy06/m9G4GTW2loYWITbGS5PQNozEczRckdh2Y8GUrn0eWaCd1Z2vF9sOKAnR2moz01wccHKqVCXimE6picR0WbgdxilnXKf/rXplEOZmLX5X8xwU9xcf/p6Aq/SB5cricYy4tP2Ka4aOBXw5evocVyqFrjTMcgCBxnsm2MzADbc6E2CJP/Eq4VIwhByhtcMLAP2ip2qYxpwOb5Bv9DIQC2EeUyLCxPG+gQ9rkgXOAxtB9ohD6IAD2MP1hCmh5FLi2yjPm4Ia5BmDcheX4q+nq6UsywZmf4KWMaiH74wac9kMtmDJvdHbS6mm6LZAXM4N69ac/x5CUwJvUrGNGPlxnouPBimn9yR/oj2x6ICjf3fCBHcL55q6+HUVimnAt+F/AooObpsAWaPydWRYQ16LIA9upjnetlKyMeW7oA0UeUj9d8OCJan5+HIu+C8cikD/zJwm6iRg5b9F0DwkH4Yk2hY9/uEf4Yy3jlb5S2LgfSwlgfzfuIAfux8VOsjws5dixbB9n3RBV6cMZ1Se67fa/xQoAC/UhdF38/0HIfHuBYsaELKgbo4DH/f8Frez5M59xg8umadHAh1rxK6KgYrj6ZJTWuGjLWyKPmBXafliuVLJwLGvk6kKtFa01ed9koek+vCr7Hwlq1XdO9178D123f7w96wuPp9CSLCUChOkNp/+2CmQLqVapvKWT+4K16qCZNtWrvnsW2TczthXtH9NSmdf5cWbSmrYzquiQV951uqm0bKy53RPR1z9tRFTeV5aLJiw2xlIs4hD9FDlgemkg4A/E5L6KNkZuxFYYt9R4FShsDPRw4a9brRYwg/Vb/F0KcB3AJAjCH8c1TBnG9cY2g+s4xeKMOa00EsKiXDf23BfKnQypB2JdoQeFJWH5YEwdbyU4lewqdn/0Mi9yWlMREfVJXUYx8k2O03Kh5tlg6loSt2y3ccNBjC11bLfO027ZmSZbtOgrvjKwi0L6Qb0o28G2EWqBtGlN/0gLH+x1t3gALZOwu7jsDpUfExRHxDSsOfWVYlHlKTZajNQ930iEVtg47PHsuUO0ksL9p1uJhyDMJ+CxAlT8ImsX4hRyOTztbiCY50YsVFFw1qY3FITUX4tmycMNceKpBLges0g53HA/04h8LG+9K7vSE96YTfOEAnKtuxQVmIiIwWJhLisNbnvB5Tq+8cjhviAvRnVJ45gdS5Yg4OUq+vVz1nF7Dhh5nmocr9iRIM+g4xY8yO7c1ZV0QW62/LMw6IihSKLz9LtrEhYtQUDLSIBzt3SEEq8rBFtPNSgPvghAtxQGSLCP9pqKunRw+Lt0AI8pVgijwTvqWeT7XjmiuX6412mNTGmYZh5Z8Oo7T8cbpmyEYExweWxkdXiL3Du+ckyhPiU3ipokzPhHSd97aEaLVW+r10O9MreCOr/E1vebX+Nqe4h2KfSZ+XlDCorJz/CGVYywVGz5IQteOzcK5iwEGaaMCmwrWecHIuUrOEslCQspK75kNaWVloog6xfhLr8pdU/8eR892F91FlH3j0GlkAiOF2XBmGuDZG9T9TX61DlkgDuxJsT17UmzPqoNAcPdeE17UWUj4djMObgUx3BANPJcokux9UREJtbyAHWlZqpndacoS2Ns7qEXQxBFvEjx9nMrAYFtmsynUxph7zzAs4nmp/SUUzY0+uPUroZ4BCBsnUqYXdpTe0GBD6Suu7Rz/TkCnj27WTZnkTC5nuu3vb6k9ndZHx/57Ztum87X9br3bi23bsu3ltm/51ucVB7aP289aj7etZnts+5VDZ/tevoFdqaHt/lxnJvRu9kh9Z1You1zJOHyRTfqmxmhFoxc2MJwfRlx0IG3IpHYoLCeI1V5VVuJYAEL1UxGcZL4rcVyxMLo9n8OUn91yaPhsTCZAs5ebqdldbXpbAmqL/Rg4Qb07DLn04qEOr+zbyEh7gaIgbNg8MUsmAFStC0v/2baA8bGUHiHqqcIhqPLwpTqNdetLo+GSkUEyB5tdxm73e7AL95HOD7dkzGMQrc51qeSCNZesjRUZVJY/IIdJW7/I2lE3l6ky28uEe9jPuVYeG+Bk/qDUcRZVw1iRK46b82YC6JrUHA6+7ef/lqWUz4oex3exMXTWnQtCKgOU6Kg0JZmhzLjU09IQa/G6n0iG1KIOoq9c9UKgPUp9QW8N218SSa+vNE+Cak+VMELOsBOHVxxWYAJNqfTrwJ4oiMlVzzTfjj6syHSlnRVWSgdmLJtNziTxl78QIuYZoFm77ompzVpo9ptl5Dg1l6UrDfHjUrU4KlzrsziNNTtvkmH02st5depUplibmkI0XcL44YRI0BWiglmMkFMa5d1127ECzBW2XiHQqNISnHU3nGQNRlS5eXRI4CBtCWAQ4Q8nuJK93Z8wg80CCK4QGUeULS+hA2d3AWSGPnIS47NGiUtCvjXyLuRUyi3PMTe/EkR+Zxsv55QHz4dvAyznLyJX9f1eU9QJKNJNW+C3MputmO5VjWdC0qrgwXeHoYLXGmEKZjN8SrF/hLtQF0En/vIWLCduPoTgUZca0UImzjnVHJkLP6CCfnROUe2tga59whQXDvTdX/NGT9bFPFUt3FrreQx8yw7j21H8PJEOhiaI7WmX3ikIl4lKulA4avsMvnnp6Vv6HwbEI1g6PHChKgBuskHTebkk+V4c+CMh++uax7RnX3kO0LgB2gAbplUmUqbGfAWWZk16nRblqB3kPMoNLKFRy8h8/JYP//824/gmRVh2dePM1m5r6Ps4M0Etrmsut6Hz+7qrX9cpv+P4GAT/qaUzkyD8mQ8jVy+ewsDafvIGVK9Rvb5KeUiMpi1Qr52uzF2/xpPXfsxzGrOGtxT3FgyMLnIqT5twrVybx/CN30uVvJiYlWPhWP7PoTZOLXYacacPh21lG7AaMhs8ZsLN5Brrnwp/gIqNhj9hCxffaZ6JzdUrhJmayYPNsVX/RO4NWz82ZvHFvn6pAdM1kEepta0VpqUpMu8jYvz1YILmsCjocN2IyDvbftxK2nXTdeCjLKvauDCTwXftoWPe0F2A9ri0n7gx/PHkchZtBanh4rzULjzT1Rxx0lyOsXXMTmzznkMJlm/1fV5cdR1wb6tuomMte9L8AEKJ5aXo4U8v6mQhZPnuVWPqpjW5NunOBc7gF9WPI7N/GzmZrYhhY95EGIkcNJkbgcFZEnydFkKRzqOnx/foq+UMAljFJZmPa5X9shRQotb9Z9uz2AgZTaeJCkGxQWc7rLcv58b1Msga+HARCamyTGRhRUqdUGqbSEavKR/56fFJXDh6rspJVJZF/iKmrJn9SiDTGKs0ZZiKyRyLPphO5pE/tk9OAW3mQIsLv4i5Zp5N5o984tTP1H1q30c4/DfvOcB0k3Ua8P1Hd8uZ2RbDxh24Czve/h7bzPTYD9J0+H6SSPYffW63xzHr5C/feXXWbOfKQHej+vVLaTolVfQR6vaXegiZTj7zisMrgK+aoukwA1zXr+U7GseAXprGF4iu3a6sVPm3fIe+yMByQBbKAUFwvTf0SBSsyivkFj0WyIWNNE06b92vpQqDtaxVtW6FsNUm4QR3XHcTPuZikFqolsNDpOct1ewROlDxI9Z2uBHuST3aCbk66LdDk0Nt98/W25Sr1xaCgNyu9j8gLvrgeuU4cqKT6d4+/gVQkFtVx4vj3UuNl+JBW4PohAnz4PyMRQsbW2SDMLiRrJMvfOsqD7+XASuJvonj41FgUR7OA7ae1Q43xn6ED5JQ/Qgh7tEPghyOxty+OOB/zfnq9i5VhBnD2aokG+kGa/KJPfKQ1mrrj+XW1gfZOKtt3f15x3/BtW1F/sXwkMi72qnurLrytIRFopWcYgN4FvXFEZELNxY1sq/BeXCo0VN0oBKWTAe8Hx5HNwqQOcs8juAqZTchDhynxrZco0QC3lyljTB5SlI/Q5lnFlwTg8dubtTVIUzXI6wyOlxVcFqiQA6CIxpaICe7exyDD+wF530RCju0Cy/3bVFiV9V5i1vIgq6nFnhBagB3uJ5ZVurA1aSae/I1fYtHD/tQ2LeTBoDPTroGpNFZyRJm3R33RNOPL0S/UW203AkxHNakcUuucU85Jb7Zx35K60yz1oW2Pepq1E7K/JCYrTIJvy2lc1wqb/B3fc0i5MZQ2PUt1p00IVdya/EpEjSEevT+S2wjpnlmoDLBCKU9S/XPbcccNhyHI3TcPPTG+JiAABcX6Yil/CyFK5E8fi7zQVS5HzsJRbnbsmnNT0PDE5am5Qn9lYMOcxVEmbFq7ux44fSqT33MmAXjkQ0B5XNsAobdzo2lASWKjvDdafQLxaN18DuncpTD/VGP9FfmfonBayWq5eOWaPeBf2rlP+pb6e/Q2JdRoTSSh6AK/c3fyoWbUWUOcweRIlrx3SXH1sqCeNP9EHI5if0Zb0sNwtvRrgbXU69nTO2ga3unOeIQxgWDDGBfexQygGXar+fN2tcu4TTuN/mb/kefmc71f8zP1yGeMrk76OuYLYEJR/qvFOSvwggW1jHUUQC5lSss3/RlyA+Vn2Co66U/93+LkgCuyLhlVh4BdjDJEBXJiwimWid60BKQWct9LBR+e8iHinq2+Qg4+W5HH/gQkiu3rCfKonc3Bk122Pg0WqSbrZF968tipt/33Yi/vgGrdXLQP/FpWKv8+XzaX29q8qLHSWSqk63llks+pzwNUC473CvjxPRYRrMaZRYFOQIsI36VBeNWgM8w3NkvTJIU","base64")).toString()),tG)});var n1e=_((aG,lG)=>{(function(t){aG&&typeof aG=="object"&&typeof lG<"u"?lG.exports=t():typeof define=="function"&&define.amd?define([],t):typeof window<"u"?window.isWindows=t():typeof global<"u"?global.isWindows=t():typeof self<"u"?self.isWindows=t():this.isWindows=t()})(function(){"use strict";return function(){return process&&(process.platform==="win32"||/^(msys|cygwin)$/.test(process.env.OSTYPE))}})});var a1e=_((KXt,o1e)=>{"use strict";cG.ifExists=ZIt;var YC=ve("util"),sc=ve("path"),i1e=n1e(),JIt=/^#!\s*(?:\/usr\/bin\/env)?\s*([^ \t]+)(.*)$/,zIt={createPwshFile:!0,createCmdFile:i1e(),fs:ve("fs")},XIt=new Map([[".js","node"],[".cjs","node"],[".mjs","node"],[".cmd","cmd"],[".bat","cmd"],[".ps1","pwsh"],[".sh","sh"]]);function s1e(t){let e={...zIt,...t},r=e.fs;return e.fs_={chmod:r.chmod?YC.promisify(r.chmod):async()=>{},mkdir:YC.promisify(r.mkdir),readFile:YC.promisify(r.readFile),stat:YC.promisify(r.stat),unlink:YC.promisify(r.unlink),writeFile:YC.promisify(r.writeFile)},e}async function cG(t,e,r){let o=s1e(r);await o.fs_.stat(t),await e1t(t,e,o)}function ZIt(t,e,r){return cG(t,e,r).catch(()=>{})}function $It(t,e){return e.fs_.unlink(t).catch(()=>{})}async function e1t(t,e,r){let o=await s1t(t,r);return await t1t(e,r),r1t(t,e,o,r)}function t1t(t,e){return e.fs_.mkdir(sc.dirname(t),{recursive:!0})}function r1t(t,e,r,o){let a=s1e(o),n=[{generator:l1t,extension:""}];return a.createCmdFile&&n.push({generator:a1t,extension:".cmd"}),a.createPwshFile&&n.push({generator:c1t,extension:".ps1"}),Promise.all(n.map(u=>o1t(t,e+u.extension,r,u.generator,a)))}function n1t(t,e){return $It(t,e)}function i1t(t,e){return u1t(t,e)}async function s1t(t,e){let a=(await e.fs_.readFile(t,"utf8")).trim().split(/\r*\n/)[0].match(JIt);if(!a){let n=sc.extname(t).toLowerCase();return{program:XIt.get(n)||null,additionalArgs:""}}return{program:a[1],additionalArgs:a[2]}}async function o1t(t,e,r,o,a){let n=a.preserveSymlinks?"--preserve-symlinks":"",u=[r.additionalArgs,n].filter(A=>A).join(" ");return a=Object.assign({},a,{prog:r.program,args:u}),await n1t(e,a),await a.fs_.writeFile(e,o(t,e,a),"utf8"),i1t(e,a)}function a1t(t,e,r){let a=sc.relative(sc.dirname(e),t).split("/").join("\\"),n=sc.isAbsolute(a)?`"${a}"`:`"%~dp0\\${a}"`,u,A=r.prog,p=r.args||"",h=uG(r.nodePath).win32;A?(u=`"%~dp0\\${A}.exe"`,a=n):(A=n,p="",a="");let E=r.progArgs?`${r.progArgs.join(" ")} `:"",I=h?`@SET NODE_PATH=${h}\r
+`:"";return u?I+=`@IF EXIST ${u} (\r
+  ${u} ${p} ${a} ${E}%*\r
+) ELSE (\r
+  @SETLOCAL\r
+  @SET PATHEXT=%PATHEXT:;.JS;=;%\r
+  ${A} ${p} ${a} ${E}%*\r
+)\r
+`:I+=`@${A} ${p} ${a} ${E}%*\r
+`,I}function l1t(t,e,r){let o=sc.relative(sc.dirname(e),t),a=r.prog&&r.prog.split("\\").join("/"),n;o=o.split("\\").join("/");let u=sc.isAbsolute(o)?`"${o}"`:`"$basedir/${o}"`,A=r.args||"",p=uG(r.nodePath).posix;a?(n=`"$basedir/${r.prog}"`,o=u):(a=u,A="",o="");let h=r.progArgs?`${r.progArgs.join(" ")} `:"",E=`#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\\\,/,g')")
+
+case \`uname\` in
+    *CYGWIN*) basedir=\`cygpath -w "$basedir"\`;;
+esac
+
+`,I=r.nodePath?`export NODE_PATH="${p}"
+`:"";return n?E+=`${I}if [ -x ${n} ]; then
+  exec ${n} ${A} ${o} ${h}"$@"
+else
+  exec ${a} ${A} ${o} ${h}"$@"
+fi
+`:E+=`${I}${a} ${A} ${o} ${h}"$@"
+exit $?
+`,E}function c1t(t,e,r){let o=sc.relative(sc.dirname(e),t),a=r.prog&&r.prog.split("\\").join("/"),n=a&&`"${a}$exe"`,u;o=o.split("\\").join("/");let A=sc.isAbsolute(o)?`"${o}"`:`"$basedir/${o}"`,p=r.args||"",h=uG(r.nodePath),E=h.win32,I=h.posix;n?(u=`"$basedir/${r.prog}$exe"`,o=A):(n=A,p="",o="");let v=r.progArgs?`${r.progArgs.join(" ")} `:"",x=`#!/usr/bin/env pwsh
+$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
+
+$exe=""
+${r.nodePath?`$env_node_path=$env:NODE_PATH
+$env:NODE_PATH="${E}"
+`:""}if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
+  # Fix case when both the Windows and Linux builds of Node
+  # are installed in the same directory
+  $exe=".exe"
+}`;return r.nodePath&&(x+=` else {
+  $env:NODE_PATH="${I}"
+}`),u?x+=`
+$ret=0
+if (Test-Path ${u}) {
+  # Support pipeline input
+  if ($MyInvocation.ExpectingInput) {
+    $input | & ${u} ${p} ${o} ${v}$args
+  } else {
+    & ${u} ${p} ${o} ${v}$args
+  }
+  $ret=$LASTEXITCODE
+} else {
+  # Support pipeline input
+  if ($MyInvocation.ExpectingInput) {
+    $input | & ${n} ${p} ${o} ${v}$args
+  } else {
+    & ${n} ${p} ${o} ${v}$args
+  }
+  $ret=$LASTEXITCODE
+}
+${r.nodePath?`$env:NODE_PATH=$env_node_path
+`:""}exit $ret
+`:x+=`
+# Support pipeline input
+if ($MyInvocation.ExpectingInput) {
+  $input | & ${n} ${p} ${o} ${v}$args
+} else {
+  & ${n} ${p} ${o} ${v}$args
+}
+${r.nodePath?`$env:NODE_PATH=$env_node_path
+`:""}exit $LASTEXITCODE
+`,x}function u1t(t,e){return e.fs_.chmod(t,493)}function uG(t){if(!t)return{win32:"",posix:""};let e=typeof t=="string"?t.split(sc.delimiter):Array.from(t),r={};for(let o=0;o<e.length;o++){let a=e[o].split("/").join("\\"),n=i1e()?e[o].split("\\").join("/").replace(/^([^:\\/]*):/,(u,A)=>`/mnt/${A.toLowerCase()}`):e[o];r.win32=r.win32?`${r.win32};${a}`:a,r.posix=r.posix?`${r.posix}:${n}`:n,r[o]={win32:a,posix:n}}return r}o1e.exports=cG});var vG=_((h$t,b1e)=>{b1e.exports=ve("stream")});var F1e=_((g$t,Q1e)=>{"use strict";function x1e(t,e){var r=Object.keys(t);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(t);e&&(o=o.filter(function(a){return Object.getOwnPropertyDescriptor(t,a).enumerable})),r.push.apply(r,o)}return r}function O1t(t){for(var e=1;e<arguments.length;e++){var r=arguments[e]!=null?arguments[e]:{};e%2?x1e(Object(r),!0).forEach(function(o){M1t(t,o,r[o])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):x1e(Object(r)).forEach(function(o){Object.defineProperty(t,o,Object.getOwnPropertyDescriptor(r,o))})}return t}function M1t(t,e,r){return e in t?Object.defineProperty(t,e,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[e]=r,t}function U1t(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function k1e(t,e){for(var r=0;r<e.length;r++){var o=e[r];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}function _1t(t,e,r){return e&&k1e(t.prototype,e),r&&k1e(t,r),t}var H1t=ve("buffer"),xQ=H1t.Buffer,j1t=ve("util"),DG=j1t.inspect,G1t=DG&&DG.custom||"inspect";function q1t(t,e,r){xQ.prototype.copy.call(t,e,r)}Q1e.exports=function(){function t(){U1t(this,t),this.head=null,this.tail=null,this.length=0}return _1t(t,[{key:"push",value:function(r){var o={data:r,next:null};this.length>0?this.tail.next=o:this.head=o,this.tail=o,++this.length}},{key:"unshift",value:function(r){var o={data:r,next:this.head};this.length===0&&(this.tail=o),this.head=o,++this.length}},{key:"shift",value:function(){if(this.length!==0){var r=this.head.data;return this.length===1?this.head=this.tail=null:this.head=this.head.next,--this.length,r}}},{key:"clear",value:function(){this.head=this.tail=null,this.length=0}},{key:"join",value:function(r){if(this.length===0)return"";for(var o=this.head,a=""+o.data;o=o.next;)a+=r+o.data;return a}},{key:"concat",value:function(r){if(this.length===0)return xQ.alloc(0);for(var o=xQ.allocUnsafe(r>>>0),a=this.head,n=0;a;)q1t(a.data,o,n),n+=a.data.length,a=a.next;return o}},{key:"consume",value:function(r,o){var a;return r<this.head.data.length?(a=this.head.data.slice(0,r),this.head.data=this.head.data.slice(r)):r===this.head.data.length?a=this.shift():a=o?this._getString(r):this._getBuffer(r),a}},{key:"first",value:function(){return this.head.data}},{key:"_getString",value:function(r){var o=this.head,a=1,n=o.data;for(r-=n.length;o=o.next;){var u=o.data,A=r>u.length?u.length:r;if(A===u.length?n+=u:n+=u.slice(0,r),r-=A,r===0){A===u.length?(++a,o.next?this.head=o.next:this.head=this.tail=null):(this.head=o,o.data=u.slice(A));break}++a}return this.length-=a,n}},{key:"_getBuffer",value:function(r){var o=xQ.allocUnsafe(r),a=this.head,n=1;for(a.data.copy(o),r-=a.data.length;a=a.next;){var u=a.data,A=r>u.length?u.length:r;if(u.copy(o,o.length-r,0,A),r-=A,r===0){A===u.length?(++n,a.next?this.head=a.next:this.head=this.tail=null):(this.head=a,a.data=u.slice(A));break}++n}return this.length-=n,o}},{key:G1t,value:function(r,o){return DG(this,O1t({},o,{depth:0,customInspect:!1}))}}]),t}()});var PG=_((d$t,T1e)=>{"use strict";function Y1t(t,e){var r=this,o=this._readableState&&this._readableState.destroyed,a=this._writableState&&this._writableState.destroyed;return o||a?(e?e(t):t&&(this._writableState?this._writableState.errorEmitted||(this._writableState.errorEmitted=!0,process.nextTick(SG,this,t)):process.nextTick(SG,this,t)),this):(this._readableState&&(this._readableState.destroyed=!0),this._writableState&&(this._writableState.destroyed=!0),this._destroy(t||null,function(n){!e&&n?r._writableState?r._writableState.errorEmitted?process.nextTick(kQ,r):(r._writableState.errorEmitted=!0,process.nextTick(R1e,r,n)):process.nextTick(R1e,r,n):e?(process.nextTick(kQ,r),e(n)):process.nextTick(kQ,r)}),this)}function R1e(t,e){SG(t,e),kQ(t)}function kQ(t){t._writableState&&!t._writableState.emitClose||t._readableState&&!t._readableState.emitClose||t.emit("close")}function W1t(){this._readableState&&(this._readableState.destroyed=!1,this._readableState.reading=!1,this._readableState.ended=!1,this._readableState.endEmitted=!1),this._writableState&&(this._writableState.destroyed=!1,this._writableState.ended=!1,this._writableState.ending=!1,this._writableState.finalCalled=!1,this._writableState.prefinished=!1,this._writableState.finished=!1,this._writableState.errorEmitted=!1)}function SG(t,e){t.emit("error",e)}function K1t(t,e){var r=t._readableState,o=t._writableState;r&&r.autoDestroy||o&&o.autoDestroy?t.destroy(e):t.emit("error",e)}T1e.exports={destroy:Y1t,undestroy:W1t,errorOrDestroy:K1t}});var Q0=_((m$t,O1e)=>{"use strict";var L1e={};function ac(t,e,r){r||(r=Error);function o(n,u,A){return typeof e=="string"?e:e(n,u,A)}class a extends r{constructor(u,A,p){super(o(u,A,p))}}a.prototype.name=r.name,a.prototype.code=t,L1e[t]=a}function N1e(t,e){if(Array.isArray(t)){let r=t.length;return t=t.map(o=>String(o)),r>2?`one of ${e} ${t.slice(0,r-1).join(", ")}, or `+t[r-1]:r===2?`one of ${e} ${t[0]} or ${t[1]}`:`of ${e} ${t[0]}`}else return`of ${e} ${String(t)}`}function V1t(t,e,r){return t.substr(!r||r<0?0:+r,e.length)===e}function J1t(t,e,r){return(r===void 0||r>t.length)&&(r=t.length),t.substring(r-e.length,r)===e}function z1t(t,e,r){return typeof r!="number"&&(r=0),r+e.length>t.length?!1:t.indexOf(e,r)!==-1}ac("ERR_INVALID_OPT_VALUE",function(t,e){return'The value "'+e+'" is invalid for option "'+t+'"'},TypeError);ac("ERR_INVALID_ARG_TYPE",function(t,e,r){let o;typeof e=="string"&&V1t(e,"not ")?(o="must not be",e=e.replace(/^not /,"")):o="must be";let a;if(J1t(t," argument"))a=`The ${t} ${o} ${N1e(e,"type")}`;else{let n=z1t(t,".")?"property":"argument";a=`The "${t}" ${n} ${o} ${N1e(e,"type")}`}return a+=`. Received type ${typeof r}`,a},TypeError);ac("ERR_STREAM_PUSH_AFTER_EOF","stream.push() after EOF");ac("ERR_METHOD_NOT_IMPLEMENTED",function(t){return"The "+t+" method is not implemented"});ac("ERR_STREAM_PREMATURE_CLOSE","Premature close");ac("ERR_STREAM_DESTROYED",function(t){return"Cannot call "+t+" after a stream was destroyed"});ac("ERR_MULTIPLE_CALLBACK","Callback called multiple times");ac("ERR_STREAM_CANNOT_PIPE","Cannot pipe, not readable");ac("ERR_STREAM_WRITE_AFTER_END","write after end");ac("ERR_STREAM_NULL_VALUES","May not write null values to stream",TypeError);ac("ERR_UNKNOWN_ENCODING",function(t){return"Unknown encoding: "+t},TypeError);ac("ERR_STREAM_UNSHIFT_AFTER_END_EVENT","stream.unshift() after end event");O1e.exports.codes=L1e});var bG=_((y$t,M1e)=>{"use strict";var X1t=Q0().codes.ERR_INVALID_OPT_VALUE;function Z1t(t,e,r){return t.highWaterMark!=null?t.highWaterMark:e?t[r]:null}function $1t(t,e,r,o){var a=Z1t(e,o,r);if(a!=null){if(!(isFinite(a)&&Math.floor(a)===a)||a<0){var n=o?r:"highWaterMark";throw new X1t(n,a)}return Math.floor(a)}return t.objectMode?16:16*1024}M1e.exports={getHighWaterMark:$1t}});var U1e=_((E$t,xG)=>{typeof Object.create=="function"?xG.exports=function(e,r){r&&(e.super_=r,e.prototype=Object.create(r.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}))}:xG.exports=function(e,r){if(r){e.super_=r;var o=function(){};o.prototype=r.prototype,e.prototype=new o,e.prototype.constructor=e}}});var F0=_((C$t,QG)=>{try{if(kG=ve("util"),typeof kG.inherits!="function")throw"";QG.exports=kG.inherits}catch{QG.exports=U1e()}var kG});var H1e=_((w$t,_1e)=>{_1e.exports=ve("util").deprecate});var TG=_((I$t,K1e)=>{"use strict";K1e.exports=Ri;function G1e(t){var e=this;this.next=null,this.entry=null,this.finish=function(){S2t(e,t)}}var zC;Ri.WritableState=mv;var e2t={deprecate:H1e()},q1e=vG(),FQ=ve("buffer").Buffer,t2t=global.Uint8Array||function(){};function r2t(t){return FQ.from(t)}function n2t(t){return FQ.isBuffer(t)||t instanceof t2t}var RG=PG(),i2t=bG(),s2t=i2t.getHighWaterMark,R0=Q0().codes,o2t=R0.ERR_INVALID_ARG_TYPE,a2t=R0.ERR_METHOD_NOT_IMPLEMENTED,l2t=R0.ERR_MULTIPLE_CALLBACK,c2t=R0.ERR_STREAM_CANNOT_PIPE,u2t=R0.ERR_STREAM_DESTROYED,A2t=R0.ERR_STREAM_NULL_VALUES,f2t=R0.ERR_STREAM_WRITE_AFTER_END,p2t=R0.ERR_UNKNOWN_ENCODING,XC=RG.errorOrDestroy;F0()(Ri,q1e);function h2t(){}function mv(t,e,r){zC=zC||Cm(),t=t||{},typeof r!="boolean"&&(r=e instanceof zC),this.objectMode=!!t.objectMode,r&&(this.objectMode=this.objectMode||!!t.writableObjectMode),this.highWaterMark=s2t(this,t,"writableHighWaterMark",r),this.finalCalled=!1,this.needDrain=!1,this.ending=!1,this.ended=!1,this.finished=!1,this.destroyed=!1;var o=t.decodeStrings===!1;this.decodeStrings=!o,this.defaultEncoding=t.defaultEncoding||"utf8",this.length=0,this.writing=!1,this.corked=0,this.sync=!0,this.bufferProcessing=!1,this.onwrite=function(a){w2t(e,a)},this.writecb=null,this.writelen=0,this.bufferedRequest=null,this.lastBufferedRequest=null,this.pendingcb=0,this.prefinished=!1,this.errorEmitted=!1,this.emitClose=t.emitClose!==!1,this.autoDestroy=!!t.autoDestroy,this.bufferedRequestCount=0,this.corkedRequestsFree=new G1e(this)}mv.prototype.getBuffer=function(){for(var e=this.bufferedRequest,r=[];e;)r.push(e),e=e.next;return r};(function(){try{Object.defineProperty(mv.prototype,"buffer",{get:e2t.deprecate(function(){return this.getBuffer()},"_writableState.buffer is deprecated. Use _writableState.getBuffer instead.","DEP0003")})}catch{}})();var QQ;typeof Symbol=="function"&&Symbol.hasInstance&&typeof Function.prototype[Symbol.hasInstance]=="function"?(QQ=Function.prototype[Symbol.hasInstance],Object.defineProperty(Ri,Symbol.hasInstance,{value:function(e){return QQ.call(this,e)?!0:this!==Ri?!1:e&&e._writableState instanceof mv}})):QQ=function(e){return e instanceof this};function Ri(t){zC=zC||Cm();var e=this instanceof zC;if(!e&&!QQ.call(Ri,this))return new Ri(t);this._writableState=new mv(t,this,e),this.writable=!0,t&&(typeof t.write=="function"&&(this._write=t.write),typeof t.writev=="function"&&(this._writev=t.writev),typeof t.destroy=="function"&&(this._destroy=t.destroy),typeof t.final=="function"&&(this._final=t.final)),q1e.call(this)}Ri.prototype.pipe=function(){XC(this,new c2t)};function g2t(t,e){var r=new f2t;XC(t,r),process.nextTick(e,r)}function d2t(t,e,r,o){var a;return r===null?a=new A2t:typeof r!="string"&&!e.objectMode&&(a=new o2t("chunk",["string","Buffer"],r)),a?(XC(t,a),process.nextTick(o,a),!1):!0}Ri.prototype.write=function(t,e,r){var o=this._writableState,a=!1,n=!o.objectMode&&n2t(t);return n&&!FQ.isBuffer(t)&&(t=r2t(t)),typeof e=="function"&&(r=e,e=null),n?e="buffer":e||(e=o.defaultEncoding),typeof r!="function"&&(r=h2t),o.ending?g2t(this,r):(n||d2t(this,o,t,r))&&(o.pendingcb++,a=y2t(this,o,n,t,e,r)),a};Ri.prototype.cork=function(){this._writableState.corked++};Ri.prototype.uncork=function(){var t=this._writableState;t.corked&&(t.corked--,!t.writing&&!t.corked&&!t.bufferProcessing&&t.bufferedRequest&&Y1e(this,t))};Ri.prototype.setDefaultEncoding=function(e){if(typeof e=="string"&&(e=e.toLowerCase()),!(["hex","utf8","utf-8","ascii","binary","base64","ucs2","ucs-2","utf16le","utf-16le","raw"].indexOf((e+"").toLowerCase())>-1))throw new p2t(e);return this._writableState.defaultEncoding=e,this};Object.defineProperty(Ri.prototype,"writableBuffer",{enumerable:!1,get:function(){return this._writableState&&this._writableState.getBuffer()}});function m2t(t,e,r){return!t.objectMode&&t.decodeStrings!==!1&&typeof e=="string"&&(e=FQ.from(e,r)),e}Object.defineProperty(Ri.prototype,"writableHighWaterMark",{enumerable:!1,get:function(){return this._writableState.highWaterMark}});function y2t(t,e,r,o,a,n){if(!r){var u=m2t(e,o,a);o!==u&&(r=!0,a="buffer",o=u)}var A=e.objectMode?1:o.length;e.length+=A;var p=e.length<e.highWaterMark;if(p||(e.needDrain=!0),e.writing||e.corked){var h=e.lastBufferedRequest;e.lastBufferedRequest={chunk:o,encoding:a,isBuf:r,callback:n,next:null},h?h.next=e.lastBufferedRequest:e.bufferedRequest=e.lastBufferedRequest,e.bufferedRequestCount+=1}else FG(t,e,!1,A,o,a,n);return p}function FG(t,e,r,o,a,n,u){e.writelen=o,e.writecb=u,e.writing=!0,e.sync=!0,e.destroyed?e.onwrite(new u2t("write")):r?t._writev(a,e.onwrite):t._write(a,n,e.onwrite),e.sync=!1}function E2t(t,e,r,o,a){--e.pendingcb,r?(process.nextTick(a,o),process.nextTick(dv,t,e),t._writableState.errorEmitted=!0,XC(t,o)):(a(o),t._writableState.errorEmitted=!0,XC(t,o),dv(t,e))}function C2t(t){t.writing=!1,t.writecb=null,t.length-=t.writelen,t.writelen=0}function w2t(t,e){var r=t._writableState,o=r.sync,a=r.writecb;if(typeof a!="function")throw new l2t;if(C2t(r),e)E2t(t,r,o,e,a);else{var n=W1e(r)||t.destroyed;!n&&!r.corked&&!r.bufferProcessing&&r.bufferedRequest&&Y1e(t,r),o?process.nextTick(j1e,t,r,n,a):j1e(t,r,n,a)}}function j1e(t,e,r,o){r||I2t(t,e),e.pendingcb--,o(),dv(t,e)}function I2t(t,e){e.length===0&&e.needDrain&&(e.needDrain=!1,t.emit("drain"))}function Y1e(t,e){e.bufferProcessing=!0;var r=e.bufferedRequest;if(t._writev&&r&&r.next){var o=e.bufferedRequestCount,a=new Array(o),n=e.corkedRequestsFree;n.entry=r;for(var u=0,A=!0;r;)a[u]=r,r.isBuf||(A=!1),r=r.next,u+=1;a.allBuffers=A,FG(t,e,!0,e.length,a,"",n.finish),e.pendingcb++,e.lastBufferedRequest=null,n.next?(e.corkedRequestsFree=n.next,n.next=null):e.corkedRequestsFree=new G1e(e),e.bufferedRequestCount=0}else{for(;r;){var p=r.chunk,h=r.encoding,E=r.callback,I=e.objectMode?1:p.length;if(FG(t,e,!1,I,p,h,E),r=r.next,e.bufferedRequestCount--,e.writing)break}r===null&&(e.lastBufferedRequest=null)}e.bufferedRequest=r,e.bufferProcessing=!1}Ri.prototype._write=function(t,e,r){r(new a2t("_write()"))};Ri.prototype._writev=null;Ri.prototype.end=function(t,e,r){var o=this._writableState;return typeof t=="function"?(r=t,t=null,e=null):typeof e=="function"&&(r=e,e=null),t!=null&&this.write(t,e),o.corked&&(o.corked=1,this.uncork()),o.ending||D2t(this,o,r),this};Object.defineProperty(Ri.prototype,"writableLength",{enumerable:!1,get:function(){return this._writableState.length}});function W1e(t){return t.ending&&t.length===0&&t.bufferedRequest===null&&!t.finished&&!t.writing}function B2t(t,e){t._final(function(r){e.pendingcb--,r&&XC(t,r),e.prefinished=!0,t.emit("prefinish"),dv(t,e)})}function v2t(t,e){!e.prefinished&&!e.finalCalled&&(typeof t._final=="function"&&!e.destroyed?(e.pendingcb++,e.finalCalled=!0,process.nextTick(B2t,t,e)):(e.prefinished=!0,t.emit("prefinish")))}function dv(t,e){var r=W1e(e);if(r&&(v2t(t,e),e.pendingcb===0&&(e.finished=!0,t.emit("finish"),e.autoDestroy))){var o=t._readableState;(!o||o.autoDestroy&&o.endEmitted)&&t.destroy()}return r}function D2t(t,e,r){e.ending=!0,dv(t,e),r&&(e.finished?process.nextTick(r):t.once("finish",r)),e.ended=!0,t.writable=!1}function S2t(t,e,r){var o=t.entry;for(t.entry=null;o;){var a=o.callback;e.pendingcb--,a(r),o=o.next}e.corkedRequestsFree.next=t}Object.defineProperty(Ri.prototype,"destroyed",{enumerable:!1,get:function(){return this._writableState===void 0?!1:this._writableState.destroyed},set:function(e){!this._writableState||(this._writableState.destroyed=e)}});Ri.prototype.destroy=RG.destroy;Ri.prototype._undestroy=RG.undestroy;Ri.prototype._destroy=function(t,e){e(t)}});var Cm=_((B$t,J1e)=>{"use strict";var P2t=Object.keys||function(t){var e=[];for(var r in t)e.push(r);return e};J1e.exports=EA;var V1e=OG(),LG=TG();F0()(EA,V1e);for(NG=P2t(LG.prototype),RQ=0;RQ<NG.length;RQ++)TQ=NG[RQ],EA.prototype[TQ]||(EA.prototype[TQ]=LG.prototype[TQ]);var NG,TQ,RQ;function EA(t){if(!(this instanceof EA))return new EA(t);V1e.call(this,t),LG.call(this,t),this.allowHalfOpen=!0,t&&(t.readable===!1&&(this.readable=!1),t.writable===!1&&(this.writable=!1),t.allowHalfOpen===!1&&(this.allowHalfOpen=!1,this.once("end",b2t)))}Object.defineProperty(EA.prototype,"writableHighWaterMark",{enumerable:!1,get:function(){return this._writableState.highWaterMark}});Object.defineProperty(EA.prototype,"writableBuffer",{enumerable:!1,get:function(){return this._writableState&&this._writableState.getBuffer()}});Object.defineProperty(EA.prototype,"writableLength",{enumerable:!1,get:function(){return this._writableState.length}});function b2t(){this._writableState.ended||process.nextTick(x2t,this)}function x2t(t){t.end()}Object.defineProperty(EA.prototype,"destroyed",{enumerable:!1,get:function(){return this._readableState===void 0||this._writableState===void 0?!1:this._readableState.destroyed&&this._writableState.destroyed},set:function(e){this._readableState===void 0||this._writableState===void 0||(this._readableState.destroyed=e,this._writableState.destroyed=e)}})});var Z1e=_((MG,X1e)=>{var NQ=ve("buffer"),ip=NQ.Buffer;function z1e(t,e){for(var r in t)e[r]=t[r]}ip.from&&ip.alloc&&ip.allocUnsafe&&ip.allocUnsafeSlow?X1e.exports=NQ:(z1e(NQ,MG),MG.Buffer=ZC);function ZC(t,e,r){return ip(t,e,r)}z1e(ip,ZC);ZC.from=function(t,e,r){if(typeof t=="number")throw new TypeError("Argument must not be a number");return ip(t,e,r)};ZC.alloc=function(t,e,r){if(typeof t!="number")throw new TypeError("Argument must be a number");var o=ip(t);return e!==void 0?typeof r=="string"?o.fill(e,r):o.fill(e):o.fill(0),o};ZC.allocUnsafe=function(t){if(typeof t!="number")throw new TypeError("Argument must be a number");return ip(t)};ZC.allocUnsafeSlow=function(t){if(typeof t!="number")throw new TypeError("Argument must be a number");return NQ.SlowBuffer(t)}});var HG=_(e2e=>{"use strict";var _G=Z1e().Buffer,$1e=_G.isEncoding||function(t){switch(t=""+t,t&&t.toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":case"raw":return!0;default:return!1}};function k2t(t){if(!t)return"utf8";for(var e;;)switch(t){case"utf8":case"utf-8":return"utf8";case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return"utf16le";case"latin1":case"binary":return"latin1";case"base64":case"ascii":case"hex":return t;default:if(e)return;t=(""+t).toLowerCase(),e=!0}}function Q2t(t){var e=k2t(t);if(typeof e!="string"&&(_G.isEncoding===$1e||!$1e(t)))throw new Error("Unknown encoding: "+t);return e||t}e2e.StringDecoder=yv;function yv(t){this.encoding=Q2t(t);var e;switch(this.encoding){case"utf16le":this.text=O2t,this.end=M2t,e=4;break;case"utf8":this.fillLast=T2t,e=4;break;case"base64":this.text=U2t,this.end=_2t,e=3;break;default:this.write=H2t,this.end=j2t;return}this.lastNeed=0,this.lastTotal=0,this.lastChar=_G.allocUnsafe(e)}yv.prototype.write=function(t){if(t.length===0)return"";var e,r;if(this.lastNeed){if(e=this.fillLast(t),e===void 0)return"";r=this.lastNeed,this.lastNeed=0}else r=0;return r<t.length?e?e+this.text(t,r):this.text(t,r):e||""};yv.prototype.end=L2t;yv.prototype.text=N2t;yv.prototype.fillLast=function(t){if(this.lastNeed<=t.length)return t.copy(this.lastChar,this.lastTotal-this.lastNeed,0,this.lastNeed),this.lastChar.toString(this.encoding,0,this.lastTotal);t.copy(this.lastChar,this.lastTotal-this.lastNeed,0,t.length),this.lastNeed-=t.length};function UG(t){return t<=127?0:t>>5===6?2:t>>4===14?3:t>>3===30?4:t>>6===2?-1:-2}function F2t(t,e,r){var o=e.length-1;if(o<r)return 0;var a=UG(e[o]);return a>=0?(a>0&&(t.lastNeed=a-1),a):--o<r||a===-2?0:(a=UG(e[o]),a>=0?(a>0&&(t.lastNeed=a-2),a):--o<r||a===-2?0:(a=UG(e[o]),a>=0?(a>0&&(a===2?a=0:t.lastNeed=a-3),a):0))}function R2t(t,e,r){if((e[0]&192)!==128)return t.lastNeed=0,"\uFFFD";if(t.lastNeed>1&&e.length>1){if((e[1]&192)!==128)return t.lastNeed=1,"\uFFFD";if(t.lastNeed>2&&e.length>2&&(e[2]&192)!==128)return t.lastNeed=2,"\uFFFD"}}function T2t(t){var e=this.lastTotal-this.lastNeed,r=R2t(this,t,e);if(r!==void 0)return r;if(this.lastNeed<=t.length)return t.copy(this.lastChar,e,0,this.lastNeed),this.lastChar.toString(this.encoding,0,this.lastTotal);t.copy(this.lastChar,e,0,t.length),this.lastNeed-=t.length}function N2t(t,e){var r=F2t(this,t,e);if(!this.lastNeed)return t.toString("utf8",e);this.lastTotal=r;var o=t.length-(r-this.lastNeed);return t.copy(this.lastChar,0,o),t.toString("utf8",e,o)}function L2t(t){var e=t&&t.length?this.write(t):"";return this.lastNeed?e+"\uFFFD":e}function O2t(t,e){if((t.length-e)%2===0){var r=t.toString("utf16le",e);if(r){var o=r.charCodeAt(r.length-1);if(o>=55296&&o<=56319)return this.lastNeed=2,this.lastTotal=4,this.lastChar[0]=t[t.length-2],this.lastChar[1]=t[t.length-1],r.slice(0,-1)}return r}return this.lastNeed=1,this.lastTotal=2,this.lastChar[0]=t[t.length-1],t.toString("utf16le",e,t.length-1)}function M2t(t){var e=t&&t.length?this.write(t):"";if(this.lastNeed){var r=this.lastTotal-this.lastNeed;return e+this.lastChar.toString("utf16le",0,r)}return e}function U2t(t,e){var r=(t.length-e)%3;return r===0?t.toString("base64",e):(this.lastNeed=3-r,this.lastTotal=3,r===1?this.lastChar[0]=t[t.length-1]:(this.lastChar[0]=t[t.length-2],this.lastChar[1]=t[t.length-1]),t.toString("base64",e,t.length-r))}function _2t(t){var e=t&&t.length?this.write(t):"";return this.lastNeed?e+this.lastChar.toString("base64",0,3-this.lastNeed):e}function H2t(t){return t.toString(this.encoding)}function j2t(t){return t&&t.length?this.write(t):""}});var LQ=_((D$t,n2e)=>{"use strict";var t2e=Q0().codes.ERR_STREAM_PREMATURE_CLOSE;function G2t(t){var e=!1;return function(){if(!e){e=!0;for(var r=arguments.length,o=new Array(r),a=0;a<r;a++)o[a]=arguments[a];t.apply(this,o)}}}function q2t(){}function Y2t(t){return t.setHeader&&typeof t.abort=="function"}function r2e(t,e,r){if(typeof e=="function")return r2e(t,null,e);e||(e={}),r=G2t(r||q2t);var o=e.readable||e.readable!==!1&&t.readable,a=e.writable||e.writable!==!1&&t.writable,n=function(){t.writable||A()},u=t._writableState&&t._writableState.finished,A=function(){a=!1,u=!0,o||r.call(t)},p=t._readableState&&t._readableState.endEmitted,h=function(){o=!1,p=!0,a||r.call(t)},E=function(C){r.call(t,C)},I=function(){var C;if(o&&!p)return(!t._readableState||!t._readableState.ended)&&(C=new t2e),r.call(t,C);if(a&&!u)return(!t._writableState||!t._writableState.ended)&&(C=new t2e),r.call(t,C)},v=function(){t.req.on("finish",A)};return Y2t(t)?(t.on("complete",A),t.on("abort",I),t.req?v():t.on("request",v)):a&&!t._writableState&&(t.on("end",n),t.on("close",n)),t.on("end",h),t.on("finish",A),e.error!==!1&&t.on("error",E),t.on("close",I),function(){t.removeListener("complete",A),t.removeListener("abort",I),t.removeListener("request",v),t.req&&t.req.removeListener("finish",A),t.removeListener("end",n),t.removeListener("close",n),t.removeListener("finish",A),t.removeListener("end",h),t.removeListener("error",E),t.removeListener("close",I)}}n2e.exports=r2e});var s2e=_((S$t,i2e)=>{"use strict";var OQ;function T0(t,e,r){return e in t?Object.defineProperty(t,e,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[e]=r,t}var W2t=LQ(),N0=Symbol("lastResolve"),wm=Symbol("lastReject"),Ev=Symbol("error"),MQ=Symbol("ended"),Im=Symbol("lastPromise"),jG=Symbol("handlePromise"),Bm=Symbol("stream");function L0(t,e){return{value:t,done:e}}function K2t(t){var e=t[N0];if(e!==null){var r=t[Bm].read();r!==null&&(t[Im]=null,t[N0]=null,t[wm]=null,e(L0(r,!1)))}}function V2t(t){process.nextTick(K2t,t)}function J2t(t,e){return function(r,o){t.then(function(){if(e[MQ]){r(L0(void 0,!0));return}e[jG](r,o)},o)}}var z2t=Object.getPrototypeOf(function(){}),X2t=Object.setPrototypeOf((OQ={get stream(){return this[Bm]},next:function(){var e=this,r=this[Ev];if(r!==null)return Promise.reject(r);if(this[MQ])return Promise.resolve(L0(void 0,!0));if(this[Bm].destroyed)return new Promise(function(u,A){process.nextTick(function(){e[Ev]?A(e[Ev]):u(L0(void 0,!0))})});var o=this[Im],a;if(o)a=new Promise(J2t(o,this));else{var n=this[Bm].read();if(n!==null)return Promise.resolve(L0(n,!1));a=new Promise(this[jG])}return this[Im]=a,a}},T0(OQ,Symbol.asyncIterator,function(){return this}),T0(OQ,"return",function(){var e=this;return new Promise(function(r,o){e[Bm].destroy(null,function(a){if(a){o(a);return}r(L0(void 0,!0))})})}),OQ),z2t),Z2t=function(e){var r,o=Object.create(X2t,(r={},T0(r,Bm,{value:e,writable:!0}),T0(r,N0,{value:null,writable:!0}),T0(r,wm,{value:null,writable:!0}),T0(r,Ev,{value:null,writable:!0}),T0(r,MQ,{value:e._readableState.endEmitted,writable:!0}),T0(r,jG,{value:function(n,u){var A=o[Bm].read();A?(o[Im]=null,o[N0]=null,o[wm]=null,n(L0(A,!1))):(o[N0]=n,o[wm]=u)},writable:!0}),r));return o[Im]=null,W2t(e,function(a){if(a&&a.code!=="ERR_STREAM_PREMATURE_CLOSE"){var n=o[wm];n!==null&&(o[Im]=null,o[N0]=null,o[wm]=null,n(a)),o[Ev]=a;return}var u=o[N0];u!==null&&(o[Im]=null,o[N0]=null,o[wm]=null,u(L0(void 0,!0))),o[MQ]=!0}),e.on("readable",V2t.bind(null,o)),o};i2e.exports=Z2t});var c2e=_((P$t,l2e)=>{"use strict";function o2e(t,e,r,o,a,n,u){try{var A=t[n](u),p=A.value}catch(h){r(h);return}A.done?e(p):Promise.resolve(p).then(o,a)}function $2t(t){return function(){var e=this,r=arguments;return new Promise(function(o,a){var n=t.apply(e,r);function u(p){o2e(n,o,a,u,A,"next",p)}function A(p){o2e(n,o,a,u,A,"throw",p)}u(void 0)})}}function a2e(t,e){var r=Object.keys(t);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(t);e&&(o=o.filter(function(a){return Object.getOwnPropertyDescriptor(t,a).enumerable})),r.push.apply(r,o)}return r}function eBt(t){for(var e=1;e<arguments.length;e++){var r=arguments[e]!=null?arguments[e]:{};e%2?a2e(Object(r),!0).forEach(function(o){tBt(t,o,r[o])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):a2e(Object(r)).forEach(function(o){Object.defineProperty(t,o,Object.getOwnPropertyDescriptor(r,o))})}return t}function tBt(t,e,r){return e in t?Object.defineProperty(t,e,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[e]=r,t}var rBt=Q0().codes.ERR_INVALID_ARG_TYPE;function nBt(t,e,r){var o;if(e&&typeof e.next=="function")o=e;else if(e&&e[Symbol.asyncIterator])o=e[Symbol.asyncIterator]();else if(e&&e[Symbol.iterator])o=e[Symbol.iterator]();else throw new rBt("iterable",["Iterable"],e);var a=new t(eBt({objectMode:!0},r)),n=!1;a._read=function(){n||(n=!0,u())};function u(){return A.apply(this,arguments)}function A(){return A=$2t(function*(){try{var p=yield o.next(),h=p.value,E=p.done;E?a.push(null):a.push(yield h)?u():n=!1}catch(I){a.destroy(I)}}),A.apply(this,arguments)}return a}l2e.exports=nBt});var OG=_((x$t,E2e)=>{"use strict";E2e.exports=mn;var $C;mn.ReadableState=p2e;var b$t=ve("events").EventEmitter,f2e=function(e,r){return e.listeners(r).length},wv=vG(),UQ=ve("buffer").Buffer,iBt=global.Uint8Array||function(){};function sBt(t){return UQ.from(t)}function oBt(t){return UQ.isBuffer(t)||t instanceof iBt}var GG=ve("util"),en;GG&&GG.debuglog?en=GG.debuglog("stream"):en=function(){};var aBt=F1e(),zG=PG(),lBt=bG(),cBt=lBt.getHighWaterMark,_Q=Q0().codes,uBt=_Q.ERR_INVALID_ARG_TYPE,ABt=_Q.ERR_STREAM_PUSH_AFTER_EOF,fBt=_Q.ERR_METHOD_NOT_IMPLEMENTED,pBt=_Q.ERR_STREAM_UNSHIFT_AFTER_END_EVENT,ew,qG,YG;F0()(mn,wv);var Cv=zG.errorOrDestroy,WG=["error","close","destroy","pause","resume"];function hBt(t,e,r){if(typeof t.prependListener=="function")return t.prependListener(e,r);!t._events||!t._events[e]?t.on(e,r):Array.isArray(t._events[e])?t._events[e].unshift(r):t._events[e]=[r,t._events[e]]}function p2e(t,e,r){$C=$C||Cm(),t=t||{},typeof r!="boolean"&&(r=e instanceof $C),this.objectMode=!!t.objectMode,r&&(this.objectMode=this.objectMode||!!t.readableObjectMode),this.highWaterMark=cBt(this,t,"readableHighWaterMark",r),this.buffer=new aBt,this.length=0,this.pipes=null,this.pipesCount=0,this.flowing=null,this.ended=!1,this.endEmitted=!1,this.reading=!1,this.sync=!0,this.needReadable=!1,this.emittedReadable=!1,this.readableListening=!1,this.resumeScheduled=!1,this.paused=!0,this.emitClose=t.emitClose!==!1,this.autoDestroy=!!t.autoDestroy,this.destroyed=!1,this.defaultEncoding=t.defaultEncoding||"utf8",this.awaitDrain=0,this.readingMore=!1,this.decoder=null,this.encoding=null,t.encoding&&(ew||(ew=HG().StringDecoder),this.decoder=new ew(t.encoding),this.encoding=t.encoding)}function mn(t){if($C=$C||Cm(),!(this instanceof mn))return new mn(t);var e=this instanceof $C;this._readableState=new p2e(t,this,e),this.readable=!0,t&&(typeof t.read=="function"&&(this._read=t.read),typeof t.destroy=="function"&&(this._destroy=t.destroy)),wv.call(this)}Object.defineProperty(mn.prototype,"destroyed",{enumerable:!1,get:function(){return this._readableState===void 0?!1:this._readableState.destroyed},set:function(e){!this._readableState||(this._readableState.destroyed=e)}});mn.prototype.destroy=zG.destroy;mn.prototype._undestroy=zG.undestroy;mn.prototype._destroy=function(t,e){e(t)};mn.prototype.push=function(t,e){var r=this._readableState,o;return r.objectMode?o=!0:typeof t=="string"&&(e=e||r.defaultEncoding,e!==r.encoding&&(t=UQ.from(t,e),e=""),o=!0),h2e(this,t,e,!1,o)};mn.prototype.unshift=function(t){return h2e(this,t,null,!0,!1)};function h2e(t,e,r,o,a){en("readableAddChunk",e);var n=t._readableState;if(e===null)n.reading=!1,mBt(t,n);else{var u;if(a||(u=gBt(n,e)),u)Cv(t,u);else if(n.objectMode||e&&e.length>0)if(typeof e!="string"&&!n.objectMode&&Object.getPrototypeOf(e)!==UQ.prototype&&(e=sBt(e)),o)n.endEmitted?Cv(t,new pBt):KG(t,n,e,!0);else if(n.ended)Cv(t,new ABt);else{if(n.destroyed)return!1;n.reading=!1,n.decoder&&!r?(e=n.decoder.write(e),n.objectMode||e.length!==0?KG(t,n,e,!1):JG(t,n)):KG(t,n,e,!1)}else o||(n.reading=!1,JG(t,n))}return!n.ended&&(n.length<n.highWaterMark||n.length===0)}function KG(t,e,r,o){e.flowing&&e.length===0&&!e.sync?(e.awaitDrain=0,t.emit("data",r)):(e.length+=e.objectMode?1:r.length,o?e.buffer.unshift(r):e.buffer.push(r),e.needReadable&&HQ(t)),JG(t,e)}function gBt(t,e){var r;return!oBt(e)&&typeof e!="string"&&e!==void 0&&!t.objectMode&&(r=new uBt("chunk",["string","Buffer","Uint8Array"],e)),r}mn.prototype.isPaused=function(){return this._readableState.flowing===!1};mn.prototype.setEncoding=function(t){ew||(ew=HG().StringDecoder);var e=new ew(t);this._readableState.decoder=e,this._readableState.encoding=this._readableState.decoder.encoding;for(var r=this._readableState.buffer.head,o="";r!==null;)o+=e.write(r.data),r=r.next;return this._readableState.buffer.clear(),o!==""&&this._readableState.buffer.push(o),this._readableState.length=o.length,this};var u2e=1073741824;function dBt(t){return t>=u2e?t=u2e:(t--,t|=t>>>1,t|=t>>>2,t|=t>>>4,t|=t>>>8,t|=t>>>16,t++),t}function A2e(t,e){return t<=0||e.length===0&&e.ended?0:e.objectMode?1:t!==t?e.flowing&&e.length?e.buffer.head.data.length:e.length:(t>e.highWaterMark&&(e.highWaterMark=dBt(t)),t<=e.length?t:e.ended?e.length:(e.needReadable=!0,0))}mn.prototype.read=function(t){en("read",t),t=parseInt(t,10);var e=this._readableState,r=t;if(t!==0&&(e.emittedReadable=!1),t===0&&e.needReadable&&((e.highWaterMark!==0?e.length>=e.highWaterMark:e.length>0)||e.ended))return en("read: emitReadable",e.length,e.ended),e.length===0&&e.ended?VG(this):HQ(this),null;if(t=A2e(t,e),t===0&&e.ended)return e.length===0&&VG(this),null;var o=e.needReadable;en("need readable",o),(e.length===0||e.length-t<e.highWaterMark)&&(o=!0,en("length less than watermark",o)),e.ended||e.reading?(o=!1,en("reading or ended",o)):o&&(en("do read"),e.reading=!0,e.sync=!0,e.length===0&&(e.needReadable=!0),this._read(e.highWaterMark),e.sync=!1,e.reading||(t=A2e(r,e)));var a;return t>0?a=m2e(t,e):a=null,a===null?(e.needReadable=e.length<=e.highWaterMark,t=0):(e.length-=t,e.awaitDrain=0),e.length===0&&(e.ended||(e.needReadable=!0),r!==t&&e.ended&&VG(this)),a!==null&&this.emit("data",a),a};function mBt(t,e){if(en("onEofChunk"),!e.ended){if(e.decoder){var r=e.decoder.end();r&&r.length&&(e.buffer.push(r),e.length+=e.objectMode?1:r.length)}e.ended=!0,e.sync?HQ(t):(e.needReadable=!1,e.emittedReadable||(e.emittedReadable=!0,g2e(t)))}}function HQ(t){var e=t._readableState;en("emitReadable",e.needReadable,e.emittedReadable),e.needReadable=!1,e.emittedReadable||(en("emitReadable",e.flowing),e.emittedReadable=!0,process.nextTick(g2e,t))}function g2e(t){var e=t._readableState;en("emitReadable_",e.destroyed,e.length,e.ended),!e.destroyed&&(e.length||e.ended)&&(t.emit("readable"),e.emittedReadable=!1),e.needReadable=!e.flowing&&!e.ended&&e.length<=e.highWaterMark,XG(t)}function JG(t,e){e.readingMore||(e.readingMore=!0,process.nextTick(yBt,t,e))}function yBt(t,e){for(;!e.reading&&!e.ended&&(e.length<e.highWaterMark||e.flowing&&e.length===0);){var r=e.length;if(en("maybeReadMore read 0"),t.read(0),r===e.length)break}e.readingMore=!1}mn.prototype._read=function(t){Cv(this,new fBt("_read()"))};mn.prototype.pipe=function(t,e){var r=this,o=this._readableState;switch(o.pipesCount){case 0:o.pipes=t;break;case 1:o.pipes=[o.pipes,t];break;default:o.pipes.push(t);break}o.pipesCount+=1,en("pipe count=%d opts=%j",o.pipesCount,e);var a=(!e||e.end!==!1)&&t!==process.stdout&&t!==process.stderr,n=a?A:R;o.endEmitted?process.nextTick(n):r.once("end",n),t.on("unpipe",u);function u(L,U){en("onunpipe"),L===r&&U&&U.hasUnpiped===!1&&(U.hasUnpiped=!0,E())}function A(){en("onend"),t.end()}var p=EBt(r);t.on("drain",p);var h=!1;function E(){en("cleanup"),t.removeListener("close",x),t.removeListener("finish",C),t.removeListener("drain",p),t.removeListener("error",v),t.removeListener("unpipe",u),r.removeListener("end",A),r.removeListener("end",R),r.removeListener("data",I),h=!0,o.awaitDrain&&(!t._writableState||t._writableState.needDrain)&&p()}r.on("data",I);function I(L){en("ondata");var U=t.write(L);en("dest.write",U),U===!1&&((o.pipesCount===1&&o.pipes===t||o.pipesCount>1&&y2e(o.pipes,t)!==-1)&&!h&&(en("false write response, pause",o.awaitDrain),o.awaitDrain++),r.pause())}function v(L){en("onerror",L),R(),t.removeListener("error",v),f2e(t,"error")===0&&Cv(t,L)}hBt(t,"error",v);function x(){t.removeListener("finish",C),R()}t.once("close",x);function C(){en("onfinish"),t.removeListener("close",x),R()}t.once("finish",C);function R(){en("unpipe"),r.unpipe(t)}return t.emit("pipe",r),o.flowing||(en("pipe resume"),r.resume()),t};function EBt(t){return function(){var r=t._readableState;en("pipeOnDrain",r.awaitDrain),r.awaitDrain&&r.awaitDrain--,r.awaitDrain===0&&f2e(t,"data")&&(r.flowing=!0,XG(t))}}mn.prototype.unpipe=function(t){var e=this._readableState,r={hasUnpiped:!1};if(e.pipesCount===0)return this;if(e.pipesCount===1)return t&&t!==e.pipes?this:(t||(t=e.pipes),e.pipes=null,e.pipesCount=0,e.flowing=!1,t&&t.emit("unpipe",this,r),this);if(!t){var o=e.pipes,a=e.pipesCount;e.pipes=null,e.pipesCount=0,e.flowing=!1;for(var n=0;n<a;n++)o[n].emit("unpipe",this,{hasUnpiped:!1});return this}var u=y2e(e.pipes,t);return u===-1?this:(e.pipes.splice(u,1),e.pipesCount-=1,e.pipesCount===1&&(e.pipes=e.pipes[0]),t.emit("unpipe",this,r),this)};mn.prototype.on=function(t,e){var r=wv.prototype.on.call(this,t,e),o=this._readableState;return t==="data"?(o.readableListening=this.listenerCount("readable")>0,o.flowing!==!1&&this.resume()):t==="readable"&&!o.endEmitted&&!o.readableListening&&(o.readableListening=o.needReadable=!0,o.flowing=!1,o.emittedReadable=!1,en("on readable",o.length,o.reading),o.length?HQ(this):o.reading||process.nextTick(CBt,this)),r};mn.prototype.addListener=mn.prototype.on;mn.prototype.removeListener=function(t,e){var r=wv.prototype.removeListener.call(this,t,e);return t==="readable"&&process.nextTick(d2e,this),r};mn.prototype.removeAllListeners=function(t){var e=wv.prototype.removeAllListeners.apply(this,arguments);return(t==="readable"||t===void 0)&&process.nextTick(d2e,this),e};function d2e(t){var e=t._readableState;e.readableListening=t.listenerCount("readable")>0,e.resumeScheduled&&!e.paused?e.flowing=!0:t.listenerCount("data")>0&&t.resume()}function CBt(t){en("readable nexttick read 0"),t.read(0)}mn.prototype.resume=function(){var t=this._readableState;return t.flowing||(en("resume"),t.flowing=!t.readableListening,wBt(this,t)),t.paused=!1,this};function wBt(t,e){e.resumeScheduled||(e.resumeScheduled=!0,process.nextTick(IBt,t,e))}function IBt(t,e){en("resume",e.reading),e.reading||t.read(0),e.resumeScheduled=!1,t.emit("resume"),XG(t),e.flowing&&!e.reading&&t.read(0)}mn.prototype.pause=function(){return en("call pause flowing=%j",this._readableState.flowing),this._readableState.flowing!==!1&&(en("pause"),this._readableState.flowing=!1,this.emit("pause")),this._readableState.paused=!0,this};function XG(t){var e=t._readableState;for(en("flow",e.flowing);e.flowing&&t.read()!==null;);}mn.prototype.wrap=function(t){var e=this,r=this._readableState,o=!1;t.on("end",function(){if(en("wrapped end"),r.decoder&&!r.ended){var u=r.decoder.end();u&&u.length&&e.push(u)}e.push(null)}),t.on("data",function(u){if(en("wrapped data"),r.decoder&&(u=r.decoder.write(u)),!(r.objectMode&&u==null)&&!(!r.objectMode&&(!u||!u.length))){var A=e.push(u);A||(o=!0,t.pause())}});for(var a in t)this[a]===void 0&&typeof t[a]=="function"&&(this[a]=function(A){return function(){return t[A].apply(t,arguments)}}(a));for(var n=0;n<WG.length;n++)t.on(WG[n],this.emit.bind(this,WG[n]));return this._read=function(u){en("wrapped _read",u),o&&(o=!1,t.resume())},this};typeof Symbol=="function"&&(mn.prototype[Symbol.asyncIterator]=function(){return qG===void 0&&(qG=s2e()),qG(this)});Object.defineProperty(mn.prototype,"readableHighWaterMark",{enumerable:!1,get:function(){return this._readableState.highWaterMark}});Object.defineProperty(mn.prototype,"readableBuffer",{enumerable:!1,get:function(){return this._readableState&&this._readableState.buffer}});Object.defineProperty(mn.prototype,"readableFlowing",{enumerable:!1,get:function(){return this._readableState.flowing},set:function(e){this._readableState&&(this._readableState.flowing=e)}});mn._fromList=m2e;Object.defineProperty(mn.prototype,"readableLength",{enumerable:!1,get:function(){return this._readableState.length}});function m2e(t,e){if(e.length===0)return null;var r;return e.objectMode?r=e.buffer.shift():!t||t>=e.length?(e.decoder?r=e.buffer.join(""):e.buffer.length===1?r=e.buffer.first():r=e.buffer.concat(e.length),e.buffer.clear()):r=e.buffer.consume(t,e.decoder),r}function VG(t){var e=t._readableState;en("endReadable",e.endEmitted),e.endEmitted||(e.ended=!0,process.nextTick(BBt,e,t))}function BBt(t,e){if(en("endReadableNT",t.endEmitted,t.length),!t.endEmitted&&t.length===0&&(t.endEmitted=!0,e.readable=!1,e.emit("end"),t.autoDestroy)){var r=e._writableState;(!r||r.autoDestroy&&r.finished)&&e.destroy()}}typeof Symbol=="function"&&(mn.from=function(t,e){return YG===void 0&&(YG=c2e()),YG(mn,t,e)});function y2e(t,e){for(var r=0,o=t.length;r<o;r++)if(t[r]===e)return r;return-1}});var ZG=_((k$t,w2e)=>{"use strict";w2e.exports=sp;var jQ=Q0().codes,vBt=jQ.ERR_METHOD_NOT_IMPLEMENTED,DBt=jQ.ERR_MULTIPLE_CALLBACK,SBt=jQ.ERR_TRANSFORM_ALREADY_TRANSFORMING,PBt=jQ.ERR_TRANSFORM_WITH_LENGTH_0,GQ=Cm();F0()(sp,GQ);function bBt(t,e){var r=this._transformState;r.transforming=!1;var o=r.writecb;if(o===null)return this.emit("error",new DBt);r.writechunk=null,r.writecb=null,e!=null&&this.push(e),o(t);var a=this._readableState;a.reading=!1,(a.needReadable||a.length<a.highWaterMark)&&this._read(a.highWaterMark)}function sp(t){if(!(this instanceof sp))return new sp(t);GQ.call(this,t),this._transformState={afterTransform:bBt.bind(this),needTransform:!1,transforming:!1,writecb:null,writechunk:null,writeencoding:null},this._readableState.needReadable=!0,this._readableState.sync=!1,t&&(typeof t.transform=="function"&&(this._transform=t.transform),typeof t.flush=="function"&&(this._flush=t.flush)),this.on("prefinish",xBt)}function xBt(){var t=this;typeof this._flush=="function"&&!this._readableState.destroyed?this._flush(function(e,r){C2e(t,e,r)}):C2e(this,null,null)}sp.prototype.push=function(t,e){return this._transformState.needTransform=!1,GQ.prototype.push.call(this,t,e)};sp.prototype._transform=function(t,e,r){r(new vBt("_transform()"))};sp.prototype._write=function(t,e,r){var o=this._transformState;if(o.writecb=r,o.writechunk=t,o.writeencoding=e,!o.transforming){var a=this._readableState;(o.needTransform||a.needReadable||a.length<a.highWaterMark)&&this._read(a.highWaterMark)}};sp.prototype._read=function(t){var e=this._transformState;e.writechunk!==null&&!e.transforming?(e.transforming=!0,this._transform(e.writechunk,e.writeencoding,e.afterTransform)):e.needTransform=!0};sp.prototype._destroy=function(t,e){GQ.prototype._destroy.call(this,t,function(r){e(r)})};function C2e(t,e,r){if(e)return t.emit("error",e);if(r!=null&&t.push(r),t._writableState.length)throw new PBt;if(t._transformState.transforming)throw new SBt;return t.push(null)}});var v2e=_((Q$t,B2e)=>{"use strict";B2e.exports=Iv;var I2e=ZG();F0()(Iv,I2e);function Iv(t){if(!(this instanceof Iv))return new Iv(t);I2e.call(this,t)}Iv.prototype._transform=function(t,e,r){r(null,t)}});var x2e=_((F$t,b2e)=>{"use strict";var $G;function kBt(t){var e=!1;return function(){e||(e=!0,t.apply(void 0,arguments))}}var P2e=Q0().codes,QBt=P2e.ERR_MISSING_ARGS,FBt=P2e.ERR_STREAM_DESTROYED;function D2e(t){if(t)throw t}function RBt(t){return t.setHeader&&typeof t.abort=="function"}function TBt(t,e,r,o){o=kBt(o);var a=!1;t.on("close",function(){a=!0}),$G===void 0&&($G=LQ()),$G(t,{readable:e,writable:r},function(u){if(u)return o(u);a=!0,o()});var n=!1;return function(u){if(!a&&!n){if(n=!0,RBt(t))return t.abort();if(typeof t.destroy=="function")return t.destroy();o(u||new FBt("pipe"))}}}function S2e(t){t()}function NBt(t,e){return t.pipe(e)}function LBt(t){return!t.length||typeof t[t.length-1]!="function"?D2e:t.pop()}function OBt(){for(var t=arguments.length,e=new Array(t),r=0;r<t;r++)e[r]=arguments[r];var o=LBt(e);if(Array.isArray(e[0])&&(e=e[0]),e.length<2)throw new QBt("streams");var a,n=e.map(function(u,A){var p=A<e.length-1,h=A>0;return TBt(u,p,h,function(E){a||(a=E),E&&n.forEach(S2e),!p&&(n.forEach(S2e),o(a))})});return e.reduce(NBt)}b2e.exports=OBt});var tw=_((lc,vv)=>{var Bv=ve("stream");process.env.READABLE_STREAM==="disable"&&Bv?(vv.exports=Bv.Readable,Object.assign(vv.exports,Bv),vv.exports.Stream=Bv):(lc=vv.exports=OG(),lc.Stream=Bv||lc,lc.Readable=lc,lc.Writable=TG(),lc.Duplex=Cm(),lc.Transform=ZG(),lc.PassThrough=v2e(),lc.finished=LQ(),lc.pipeline=x2e())});var F2e=_((R$t,Q2e)=>{"use strict";var{Buffer:lu}=ve("buffer"),k2e=Symbol.for("BufferList");function ni(t){if(!(this instanceof ni))return new ni(t);ni._init.call(this,t)}ni._init=function(e){Object.defineProperty(this,k2e,{value:!0}),this._bufs=[],this.length=0,e&&this.append(e)};ni.prototype._new=function(e){return new ni(e)};ni.prototype._offset=function(e){if(e===0)return[0,0];let r=0;for(let o=0;o<this._bufs.length;o++){let a=r+this._bufs[o].length;if(e<a||o===this._bufs.length-1)return[o,e-r];r=a}};ni.prototype._reverseOffset=function(t){let e=t[0],r=t[1];for(let o=0;o<e;o++)r+=this._bufs[o].length;return r};ni.prototype.get=function(e){if(e>this.length||e<0)return;let r=this._offset(e);return this._bufs[r[0]][r[1]]};ni.prototype.slice=function(e,r){return typeof e=="number"&&e<0&&(e+=this.length),typeof r=="number"&&r<0&&(r+=this.length),this.copy(null,0,e,r)};ni.prototype.copy=function(e,r,o,a){if((typeof o!="number"||o<0)&&(o=0),(typeof a!="number"||a>this.length)&&(a=this.length),o>=this.length||a<=0)return e||lu.alloc(0);let n=!!e,u=this._offset(o),A=a-o,p=A,h=n&&r||0,E=u[1];if(o===0&&a===this.length){if(!n)return this._bufs.length===1?this._bufs[0]:lu.concat(this._bufs,this.length);for(let I=0;I<this._bufs.length;I++)this._bufs[I].copy(e,h),h+=this._bufs[I].length;return e}if(p<=this._bufs[u[0]].length-E)return n?this._bufs[u[0]].copy(e,r,E,E+p):this._bufs[u[0]].slice(E,E+p);n||(e=lu.allocUnsafe(A));for(let I=u[0];I<this._bufs.length;I++){let v=this._bufs[I].length-E;if(p>v)this._bufs[I].copy(e,h,E),h+=v;else{this._bufs[I].copy(e,h,E,E+p),h+=v;break}p-=v,E&&(E=0)}return e.length>h?e.slice(0,h):e};ni.prototype.shallowSlice=function(e,r){if(e=e||0,r=typeof r!="number"?this.length:r,e<0&&(e+=this.length),r<0&&(r+=this.length),e===r)return this._new();let o=this._offset(e),a=this._offset(r),n=this._bufs.slice(o[0],a[0]+1);return a[1]===0?n.pop():n[n.length-1]=n[n.length-1].slice(0,a[1]),o[1]!==0&&(n[0]=n[0].slice(o[1])),this._new(n)};ni.prototype.toString=function(e,r,o){return this.slice(r,o).toString(e)};ni.prototype.consume=function(e){if(e=Math.trunc(e),Number.isNaN(e)||e<=0)return this;for(;this._bufs.length;)if(e>=this._bufs[0].length)e-=this._bufs[0].length,this.length-=this._bufs[0].length,this._bufs.shift();else{this._bufs[0]=this._bufs[0].slice(e),this.length-=e;break}return this};ni.prototype.duplicate=function(){let e=this._new();for(let r=0;r<this._bufs.length;r++)e.append(this._bufs[r]);return e};ni.prototype.append=function(e){if(e==null)return this;if(e.buffer)this._appendBuffer(lu.from(e.buffer,e.byteOffset,e.byteLength));else if(Array.isArray(e))for(let r=0;r<e.length;r++)this.append(e[r]);else if(this._isBufferList(e))for(let r=0;r<e._bufs.length;r++)this.append(e._bufs[r]);else typeof e=="number"&&(e=e.toString()),this._appendBuffer(lu.from(e));return this};ni.prototype._appendBuffer=function(e){this._bufs.push(e),this.length+=e.length};ni.prototype.indexOf=function(t,e,r){if(r===void 0&&typeof e=="string"&&(r=e,e=void 0),typeof t=="function"||Array.isArray(t))throw new TypeError('The "value" argument must be one of type string, Buffer, BufferList, or Uint8Array.');if(typeof t=="number"?t=lu.from([t]):typeof t=="string"?t=lu.from(t,r):this._isBufferList(t)?t=t.slice():Array.isArray(t.buffer)?t=lu.from(t.buffer,t.byteOffset,t.byteLength):lu.isBuffer(t)||(t=lu.from(t)),e=Number(e||0),isNaN(e)&&(e=0),e<0&&(e=this.length+e),e<0&&(e=0),t.length===0)return e>this.length?this.length:e;let o=this._offset(e),a=o[0],n=o[1];for(;a<this._bufs.length;a++){let u=this._bufs[a];for(;n<u.length;)if(u.length-n>=t.length){let p=u.indexOf(t,n);if(p!==-1)return this._reverseOffset([a,p]);n=u.length-t.length+1}else{let p=this._reverseOffset([a,n]);if(this._match(p,t))return p;n++}n=0}return-1};ni.prototype._match=function(t,e){if(this.length-t<e.length)return!1;for(let r=0;r<e.length;r++)if(this.get(t+r)!==e[r])return!1;return!0};(function(){let t={readDoubleBE:8,readDoubleLE:8,readFloatBE:4,readFloatLE:4,readInt32BE:4,readInt32LE:4,readUInt32BE:4,readUInt32LE:4,readInt16BE:2,readInt16LE:2,readUInt16BE:2,readUInt16LE:2,readInt8:1,readUInt8:1,readIntBE:null,readIntLE:null,readUIntBE:null,readUIntLE:null};for(let e in t)(function(r){t[r]===null?ni.prototype[r]=function(o,a){return this.slice(o,o+a)[r](0,a)}:ni.prototype[r]=function(o=0){return this.slice(o,o+t[r])[r](0)}})(e)})();ni.prototype._isBufferList=function(e){return e instanceof ni||ni.isBufferList(e)};ni.isBufferList=function(e){return e!=null&&e[k2e]};Q2e.exports=ni});var R2e=_((T$t,qQ)=>{"use strict";var eq=tw().Duplex,MBt=F0(),Dv=F2e();function Uo(t){if(!(this instanceof Uo))return new Uo(t);if(typeof t=="function"){this._callback=t;let e=function(o){this._callback&&(this._callback(o),this._callback=null)}.bind(this);this.on("pipe",function(o){o.on("error",e)}),this.on("unpipe",function(o){o.removeListener("error",e)}),t=null}Dv._init.call(this,t),eq.call(this)}MBt(Uo,eq);Object.assign(Uo.prototype,Dv.prototype);Uo.prototype._new=function(e){return new Uo(e)};Uo.prototype._write=function(e,r,o){this._appendBuffer(e),typeof o=="function"&&o()};Uo.prototype._read=function(e){if(!this.length)return this.push(null);e=Math.min(e,this.length),this.push(this.slice(0,e)),this.consume(e)};Uo.prototype.end=function(e){eq.prototype.end.call(this,e),this._callback&&(this._callback(null,this.slice()),this._callback=null)};Uo.prototype._destroy=function(e,r){this._bufs.length=0,this.length=0,r(e)};Uo.prototype._isBufferList=function(e){return e instanceof Uo||e instanceof Dv||Uo.isBufferList(e)};Uo.isBufferList=Dv.isBufferList;qQ.exports=Uo;qQ.exports.BufferListStream=Uo;qQ.exports.BufferList=Dv});var nq=_(nw=>{var UBt=Buffer.alloc,_Bt="0000000000000000000",HBt="7777777777777777777",T2e="0".charCodeAt(0),N2e=Buffer.from("ustar\0","binary"),jBt=Buffer.from("00","binary"),GBt=Buffer.from("ustar ","binary"),qBt=Buffer.from(" \0","binary"),YBt=parseInt("7777",8),Sv=257,rq=263,WBt=function(t,e,r){return typeof t!="number"?r:(t=~~t,t>=e?e:t>=0||(t+=e,t>=0)?t:0)},KBt=function(t){switch(t){case 0:return"file";case 1:return"link";case 2:return"symlink";case 3:return"character-device";case 4:return"block-device";case 5:return"directory";case 6:return"fifo";case 7:return"contiguous-file";case 72:return"pax-header";case 55:return"pax-global-header";case 27:return"gnu-long-link-path";case 28:case 30:return"gnu-long-path"}return null},VBt=function(t){switch(t){case"file":return 0;case"link":return 1;case"symlink":return 2;case"character-device":return 3;case"block-device":return 4;case"directory":return 5;case"fifo":return 6;case"contiguous-file":return 7;case"pax-header":return 72}return 0},L2e=function(t,e,r,o){for(;r<o;r++)if(t[r]===e)return r;return o},O2e=function(t){for(var e=256,r=0;r<148;r++)e+=t[r];for(var o=156;o<512;o++)e+=t[o];return e},O0=function(t,e){return t=t.toString(8),t.length>e?HBt.slice(0,e)+" ":_Bt.slice(0,e-t.length)+t+" "};function JBt(t){var e;if(t[0]===128)e=!0;else if(t[0]===255)e=!1;else return null;for(var r=[],o=t.length-1;o>0;o--){var a=t[o];e?r.push(a):r.push(255-a)}var n=0,u=r.length;for(o=0;o<u;o++)n+=r[o]*Math.pow(256,o);return e?n:-1*n}var M0=function(t,e,r){if(t=t.slice(e,e+r),e=0,t[e]&128)return JBt(t);for(;e<t.length&&t[e]===32;)e++;for(var o=WBt(L2e(t,32,e,t.length),t.length,t.length);e<o&&t[e]===0;)e++;return o===e?0:parseInt(t.slice(e,o).toString(),8)},rw=function(t,e,r,o){return t.slice(e,L2e(t,0,e,e+r)).toString(o)},tq=function(t){var e=Buffer.byteLength(t),r=Math.floor(Math.log(e)/Math.log(10))+1;return e+r>=Math.pow(10,r)&&r++,e+r+t};nw.decodeLongPath=function(t,e){return rw(t,0,t.length,e)};nw.encodePax=function(t){var e="";t.name&&(e+=tq(" path="+t.name+`
+`)),t.linkname&&(e+=tq(" linkpath="+t.linkname+`
+`));var r=t.pax;if(r)for(var o in r)e+=tq(" "+o+"="+r[o]+`
+`);return Buffer.from(e)};nw.decodePax=function(t){for(var e={};t.length;){for(var r=0;r<t.length&&t[r]!==32;)r++;var o=parseInt(t.slice(0,r).toString(),10);if(!o)return e;var a=t.slice(r+1,o-1).toString(),n=a.indexOf("=");if(n===-1)return e;e[a.slice(0,n)]=a.slice(n+1),t=t.slice(o)}return e};nw.encode=function(t){var e=UBt(512),r=t.name,o="";if(t.typeflag===5&&r[r.length-1]!=="/"&&(r+="/"),Buffer.byteLength(r)!==r.length)return null;for(;Buffer.byteLength(r)>100;){var a=r.indexOf("/");if(a===-1)return null;o+=o?"/"+r.slice(0,a):r.slice(0,a),r=r.slice(a+1)}return Buffer.byteLength(r)>100||Buffer.byteLength(o)>155||t.linkname&&Buffer.byteLength(t.linkname)>100?null:(e.write(r),e.write(O0(t.mode&YBt,6),100),e.write(O0(t.uid,6),108),e.write(O0(t.gid,6),116),e.write(O0(t.size,11),124),e.write(O0(t.mtime.getTime()/1e3|0,11),136),e[156]=T2e+VBt(t.type),t.linkname&&e.write(t.linkname,157),N2e.copy(e,Sv),jBt.copy(e,rq),t.uname&&e.write(t.uname,265),t.gname&&e.write(t.gname,297),e.write(O0(t.devmajor||0,6),329),e.write(O0(t.devminor||0,6),337),o&&e.write(o,345),e.write(O0(O2e(e),6),148),e)};nw.decode=function(t,e,r){var o=t[156]===0?0:t[156]-T2e,a=rw(t,0,100,e),n=M0(t,100,8),u=M0(t,108,8),A=M0(t,116,8),p=M0(t,124,12),h=M0(t,136,12),E=KBt(o),I=t[157]===0?null:rw(t,157,100,e),v=rw(t,265,32),x=rw(t,297,32),C=M0(t,329,8),R=M0(t,337,8),L=O2e(t);if(L===8*32)return null;if(L!==M0(t,148,8))throw new Error("Invalid tar header. Maybe the tar is corrupted or it needs to be gunzipped?");if(N2e.compare(t,Sv,Sv+6)===0)t[345]&&(a=rw(t,345,155,e)+"/"+a);else if(!(GBt.compare(t,Sv,Sv+6)===0&&qBt.compare(t,rq,rq+2)===0)){if(!r)throw new Error("Invalid tar header: unknown format.")}return o===0&&a&&a[a.length-1]==="/"&&(o=5),{name:a,mode:n,uid:u,gid:A,size:p,mtime:new Date(1e3*h),type:E,linkname:I,uname:v,gname:x,devmajor:C,devminor:R}}});var q2e=_((L$t,G2e)=>{var U2e=ve("util"),zBt=R2e(),Pv=nq(),_2e=tw().Writable,H2e=tw().PassThrough,j2e=function(){},M2e=function(t){return t&=511,t&&512-t},XBt=function(t,e){var r=new YQ(t,e);return r.end(),r},ZBt=function(t,e){return e.path&&(t.name=e.path),e.linkpath&&(t.linkname=e.linkpath),e.size&&(t.size=parseInt(e.size,10)),t.pax=e,t},YQ=function(t,e){this._parent=t,this.offset=e,H2e.call(this,{autoDestroy:!1})};U2e.inherits(YQ,H2e);YQ.prototype.destroy=function(t){this._parent.destroy(t)};var op=function(t){if(!(this instanceof op))return new op(t);_2e.call(this,t),t=t||{},this._offset=0,this._buffer=zBt(),this._missing=0,this._partial=!1,this._onparse=j2e,this._header=null,this._stream=null,this._overflow=null,this._cb=null,this._locked=!1,this._destroyed=!1,this._pax=null,this._paxGlobal=null,this._gnuLongPath=null,this._gnuLongLinkPath=null;var e=this,r=e._buffer,o=function(){e._continue()},a=function(v){if(e._locked=!1,v)return e.destroy(v);e._stream||o()},n=function(){e._stream=null;var v=M2e(e._header.size);v?e._parse(v,u):e._parse(512,I),e._locked||o()},u=function(){e._buffer.consume(M2e(e._header.size)),e._parse(512,I),o()},A=function(){var v=e._header.size;e._paxGlobal=Pv.decodePax(r.slice(0,v)),r.consume(v),n()},p=function(){var v=e._header.size;e._pax=Pv.decodePax(r.slice(0,v)),e._paxGlobal&&(e._pax=Object.assign({},e._paxGlobal,e._pax)),r.consume(v),n()},h=function(){var v=e._header.size;this._gnuLongPath=Pv.decodeLongPath(r.slice(0,v),t.filenameEncoding),r.consume(v),n()},E=function(){var v=e._header.size;this._gnuLongLinkPath=Pv.decodeLongPath(r.slice(0,v),t.filenameEncoding),r.consume(v),n()},I=function(){var v=e._offset,x;try{x=e._header=Pv.decode(r.slice(0,512),t.filenameEncoding,t.allowUnknownFormat)}catch(C){e.emit("error",C)}if(r.consume(512),!x){e._parse(512,I),o();return}if(x.type==="gnu-long-path"){e._parse(x.size,h),o();return}if(x.type==="gnu-long-link-path"){e._parse(x.size,E),o();return}if(x.type==="pax-global-header"){e._parse(x.size,A),o();return}if(x.type==="pax-header"){e._parse(x.size,p),o();return}if(e._gnuLongPath&&(x.name=e._gnuLongPath,e._gnuLongPath=null),e._gnuLongLinkPath&&(x.linkname=e._gnuLongLinkPath,e._gnuLongLinkPath=null),e._pax&&(e._header=x=ZBt(x,e._pax),e._pax=null),e._locked=!0,!x.size||x.type==="directory"){e._parse(512,I),e.emit("entry",x,XBt(e,v),a);return}e._stream=new YQ(e,v),e.emit("entry",x,e._stream,a),e._parse(x.size,n),o()};this._onheader=I,this._parse(512,I)};U2e.inherits(op,_2e);op.prototype.destroy=function(t){this._destroyed||(this._destroyed=!0,t&&this.emit("error",t),this.emit("close"),this._stream&&this._stream.emit("close"))};op.prototype._parse=function(t,e){this._destroyed||(this._offset+=t,this._missing=t,e===this._onheader&&(this._partial=!1),this._onparse=e)};op.prototype._continue=function(){if(!this._destroyed){var t=this._cb;this._cb=j2e,this._overflow?this._write(this._overflow,void 0,t):t()}};op.prototype._write=function(t,e,r){if(!this._destroyed){var o=this._stream,a=this._buffer,n=this._missing;if(t.length&&(this._partial=!0),t.length<n)return this._missing-=t.length,this._overflow=null,o?o.write(t,r):(a.append(t),r());this._cb=r,this._missing=0;var u=null;t.length>n&&(u=t.slice(n),t=t.slice(0,n)),o?o.end(t):a.append(t),this._overflow=u,this._onparse()}};op.prototype._final=function(t){if(this._partial)return this.destroy(new Error("Unexpected end of data"));t()};G2e.exports=op});var W2e=_((O$t,Y2e)=>{Y2e.exports=ve("fs").constants||ve("constants")});var X2e=_((M$t,z2e)=>{var iw=W2e(),K2e=LM(),KQ=F0(),$Bt=Buffer.alloc,V2e=tw().Readable,sw=tw().Writable,evt=ve("string_decoder").StringDecoder,WQ=nq(),tvt=parseInt("755",8),rvt=parseInt("644",8),J2e=$Bt(1024),sq=function(){},iq=function(t,e){e&=511,e&&t.push(J2e.slice(0,512-e))};function nvt(t){switch(t&iw.S_IFMT){case iw.S_IFBLK:return"block-device";case iw.S_IFCHR:return"character-device";case iw.S_IFDIR:return"directory";case iw.S_IFIFO:return"fifo";case iw.S_IFLNK:return"symlink"}return"file"}var VQ=function(t){sw.call(this),this.written=0,this._to=t,this._destroyed=!1};KQ(VQ,sw);VQ.prototype._write=function(t,e,r){if(this.written+=t.length,this._to.push(t))return r();this._to._drain=r};VQ.prototype.destroy=function(){this._destroyed||(this._destroyed=!0,this.emit("close"))};var JQ=function(){sw.call(this),this.linkname="",this._decoder=new evt("utf-8"),this._destroyed=!1};KQ(JQ,sw);JQ.prototype._write=function(t,e,r){this.linkname+=this._decoder.write(t),r()};JQ.prototype.destroy=function(){this._destroyed||(this._destroyed=!0,this.emit("close"))};var bv=function(){sw.call(this),this._destroyed=!1};KQ(bv,sw);bv.prototype._write=function(t,e,r){r(new Error("No body allowed for this entry"))};bv.prototype.destroy=function(){this._destroyed||(this._destroyed=!0,this.emit("close"))};var CA=function(t){if(!(this instanceof CA))return new CA(t);V2e.call(this,t),this._drain=sq,this._finalized=!1,this._finalizing=!1,this._destroyed=!1,this._stream=null};KQ(CA,V2e);CA.prototype.entry=function(t,e,r){if(this._stream)throw new Error("already piping an entry");if(!(this._finalized||this._destroyed)){typeof e=="function"&&(r=e,e=null),r||(r=sq);var o=this;if((!t.size||t.type==="symlink")&&(t.size=0),t.type||(t.type=nvt(t.mode)),t.mode||(t.mode=t.type==="directory"?tvt:rvt),t.uid||(t.uid=0),t.gid||(t.gid=0),t.mtime||(t.mtime=new Date),typeof e=="string"&&(e=Buffer.from(e)),Buffer.isBuffer(e)){t.size=e.length,this._encode(t);var a=this.push(e);return iq(o,t.size),a?process.nextTick(r):this._drain=r,new bv}if(t.type==="symlink"&&!t.linkname){var n=new JQ;return K2e(n,function(A){if(A)return o.destroy(),r(A);t.linkname=n.linkname,o._encode(t),r()}),n}if(this._encode(t),t.type!=="file"&&t.type!=="contiguous-file")return process.nextTick(r),new bv;var u=new VQ(this);return this._stream=u,K2e(u,function(A){if(o._stream=null,A)return o.destroy(),r(A);if(u.written!==t.size)return o.destroy(),r(new Error("size mismatch"));iq(o,t.size),o._finalizing&&o.finalize(),r()}),u}};CA.prototype.finalize=function(){if(this._stream){this._finalizing=!0;return}this._finalized||(this._finalized=!0,this.push(J2e),this.push(null))};CA.prototype.destroy=function(t){this._destroyed||(this._destroyed=!0,t&&this.emit("error",t),this.emit("close"),this._stream&&this._stream.destroy&&this._stream.destroy())};CA.prototype._encode=function(t){if(!t.pax){var e=WQ.encode(t);if(e){this.push(e);return}}this._encodePax(t)};CA.prototype._encodePax=function(t){var e=WQ.encodePax({name:t.name,linkname:t.linkname,pax:t.pax}),r={name:"PaxHeader",mode:t.mode,uid:t.uid,gid:t.gid,size:e.length,mtime:t.mtime,type:"pax-header",linkname:t.linkname&&"PaxHeader",uname:t.uname,gname:t.gname,devmajor:t.devmajor,devminor:t.devminor};this.push(WQ.encode(r)),this.push(e),iq(this,e.length),r.size=t.size,r.type=t.type,this.push(WQ.encode(r))};CA.prototype._read=function(t){var e=this._drain;this._drain=sq,e()};z2e.exports=CA});var Z2e=_(oq=>{oq.extract=q2e();oq.pack=X2e()});var uBe=_((ier,cBe)=>{"use strict";var vm=class{constructor(e,r,o){this.__specs=e||{},Object.keys(this.__specs).forEach(a=>{if(typeof this.__specs[a]=="string"){let n=this.__specs[a],u=this.__specs[n];if(u){let A=u.aliases||[];A.push(a,n),u.aliases=[...new Set(A)],this.__specs[a]=u}else throw new Error(`Alias refers to invalid key: ${n} -> ${a}`)}}),this.__opts=r||{},this.__providers=aBe(o.filter(a=>a!=null&&typeof a=="object")),this.__isFiggyPudding=!0}get(e){return fq(this,e,!0)}get[Symbol.toStringTag](){return"FiggyPudding"}forEach(e,r=this){for(let[o,a]of this.entries())e.call(r,a,o,this)}toJSON(){let e={};return this.forEach((r,o)=>{e[o]=r}),e}*entries(e){for(let o of Object.keys(this.__specs))yield[o,this.get(o)];let r=e||this.__opts.other;if(r){let o=new Set;for(let a of this.__providers){let n=a.entries?a.entries(r):yvt(a);for(let[u,A]of n)r(u)&&!o.has(u)&&(o.add(u),yield[u,A])}}}*[Symbol.iterator](){for(let[e,r]of this.entries())yield[e,r]}*keys(){for(let[e]of this.entries())yield e}*values(){for(let[,e]of this.entries())yield e}concat(...e){return new Proxy(new vm(this.__specs,this.__opts,aBe(this.__providers).concat(e)),lBe)}};try{let t=ve("util");vm.prototype[t.inspect.custom]=function(e,r){return this[Symbol.toStringTag]+" "+t.inspect(this.toJSON(),r)}}catch{}function dvt(t){throw Object.assign(new Error(`invalid config key requested: ${t}`),{code:"EBADKEY"})}function fq(t,e,r){let o=t.__specs[e];if(r&&!o&&(!t.__opts.other||!t.__opts.other(e)))dvt(e);else{o||(o={});let a;for(let n of t.__providers){if(a=oBe(e,n),a===void 0&&o.aliases&&o.aliases.length){for(let u of o.aliases)if(u!==e&&(a=oBe(u,n),a!==void 0))break}if(a!==void 0)break}return a===void 0&&o.default!==void 0?typeof o.default=="function"?o.default(t):o.default:a}}function oBe(t,e){let r;return e.__isFiggyPudding?r=fq(e,t,!1):typeof e.get=="function"?r=e.get(t):r=e[t],r}var lBe={has(t,e){return e in t.__specs&&fq(t,e,!1)!==void 0},ownKeys(t){return Object.keys(t.__specs)},get(t,e){return typeof e=="symbol"||e.slice(0,2)==="__"||e in vm.prototype?t[e]:t.get(e)},set(t,e,r){if(typeof e=="symbol"||e.slice(0,2)==="__")return t[e]=r,!0;throw new Error("figgyPudding options cannot be modified. Use .concat() instead.")},deleteProperty(){throw new Error("figgyPudding options cannot be deleted. Use .concat() and shadow them instead.")}};cBe.exports=mvt;function mvt(t,e){function r(...o){return new Proxy(new vm(t,e,o),lBe)}return r}function aBe(t){let e=[];return t.forEach(r=>e.unshift(r)),e}function yvt(t){return Object.keys(t).map(e=>[e,t[e]])}});var pBe=_((ser,BA)=>{"use strict";var kv=ve("crypto"),Evt=uBe(),Cvt=ve("stream").Transform,ABe=["sha256","sha384","sha512"],wvt=/^[a-z0-9+/]+(?:=?=?)$/i,Ivt=/^([^-]+)-([^?]+)([?\S*]*)$/,Bvt=/^([^-]+)-([A-Za-z0-9+/=]{44,88})(\?[\x21-\x7E]*)*$/,vvt=/^[\x21-\x7E]+$/,ia=Evt({algorithms:{default:["sha512"]},error:{default:!1},integrity:{},options:{default:[]},pickAlgorithm:{default:()=>Fvt},Promise:{default:()=>Promise},sep:{default:" "},single:{default:!1},size:{},strict:{default:!1}}),_0=class{get isHash(){return!0}constructor(e,r){r=ia(r);let o=!!r.strict;this.source=e.trim();let a=this.source.match(o?Bvt:Ivt);if(!a||o&&!ABe.some(u=>u===a[1]))return;this.algorithm=a[1],this.digest=a[2];let n=a[3];this.options=n?n.slice(1).split("?"):[]}hexDigest(){return this.digest&&Buffer.from(this.digest,"base64").toString("hex")}toJSON(){return this.toString()}toString(e){if(e=ia(e),e.strict&&!(ABe.some(o=>o===this.algorithm)&&this.digest.match(wvt)&&(this.options||[]).every(o=>o.match(vvt))))return"";let r=this.options&&this.options.length?`?${this.options.join("?")}`:"";return`${this.algorithm}-${this.digest}${r}`}},Dm=class{get isIntegrity(){return!0}toJSON(){return this.toString()}toString(e){e=ia(e);let r=e.sep||" ";return e.strict&&(r=r.replace(/\S+/g," ")),Object.keys(this).map(o=>this[o].map(a=>_0.prototype.toString.call(a,e)).filter(a=>a.length).join(r)).filter(o=>o.length).join(r)}concat(e,r){r=ia(r);let o=typeof e=="string"?e:xv(e,r);return IA(`${this.toString(r)} ${o}`,r)}hexDigest(){return IA(this,{single:!0}).hexDigest()}match(e,r){r=ia(r);let o=IA(e,r),a=o.pickAlgorithm(r);return this[a]&&o[a]&&this[a].find(n=>o[a].find(u=>n.digest===u.digest))||!1}pickAlgorithm(e){e=ia(e);let r=e.pickAlgorithm,o=Object.keys(this);if(!o.length)throw new Error(`No algorithms available for ${JSON.stringify(this.toString())}`);return o.reduce((a,n)=>r(a,n)||a)}};BA.exports.parse=IA;function IA(t,e){if(e=ia(e),typeof t=="string")return pq(t,e);if(t.algorithm&&t.digest){let r=new Dm;return r[t.algorithm]=[t],pq(xv(r,e),e)}else return pq(xv(t,e),e)}function pq(t,e){return e.single?new _0(t,e):t.trim().split(/\s+/).reduce((r,o)=>{let a=new _0(o,e);if(a.algorithm&&a.digest){let n=a.algorithm;r[n]||(r[n]=[]),r[n].push(a)}return r},new Dm)}BA.exports.stringify=xv;function xv(t,e){return e=ia(e),t.algorithm&&t.digest?_0.prototype.toString.call(t,e):typeof t=="string"?xv(IA(t,e),e):Dm.prototype.toString.call(t,e)}BA.exports.fromHex=Dvt;function Dvt(t,e,r){r=ia(r);let o=r.options&&r.options.length?`?${r.options.join("?")}`:"";return IA(`${e}-${Buffer.from(t,"hex").toString("base64")}${o}`,r)}BA.exports.fromData=Svt;function Svt(t,e){e=ia(e);let r=e.algorithms,o=e.options&&e.options.length?`?${e.options.join("?")}`:"";return r.reduce((a,n)=>{let u=kv.createHash(n).update(t).digest("base64"),A=new _0(`${n}-${u}${o}`,e);if(A.algorithm&&A.digest){let p=A.algorithm;a[p]||(a[p]=[]),a[p].push(A)}return a},new Dm)}BA.exports.fromStream=Pvt;function Pvt(t,e){e=ia(e);let r=e.Promise||Promise,o=hq(e);return new r((a,n)=>{t.pipe(o),t.on("error",n),o.on("error",n);let u;o.on("integrity",A=>{u=A}),o.on("end",()=>a(u)),o.on("data",()=>{})})}BA.exports.checkData=bvt;function bvt(t,e,r){if(r=ia(r),e=IA(e,r),!Object.keys(e).length){if(r.error)throw Object.assign(new Error("No valid integrity hashes to check against"),{code:"EINTEGRITY"});return!1}let o=e.pickAlgorithm(r),a=kv.createHash(o).update(t).digest("base64"),n=IA({algorithm:o,digest:a}),u=n.match(e,r);if(u||!r.error)return u;if(typeof r.size=="number"&&t.length!==r.size){let A=new Error(`data size mismatch when checking ${e}.
+  Wanted: ${r.size}
+  Found: ${t.length}`);throw A.code="EBADSIZE",A.found=t.length,A.expected=r.size,A.sri=e,A}else{let A=new Error(`Integrity checksum failed when using ${o}: Wanted ${e}, but got ${n}. (${t.length} bytes)`);throw A.code="EINTEGRITY",A.found=n,A.expected=e,A.algorithm=o,A.sri=e,A}}BA.exports.checkStream=xvt;function xvt(t,e,r){r=ia(r);let o=r.Promise||Promise,a=hq(r.concat({integrity:e}));return new o((n,u)=>{t.pipe(a),t.on("error",u),a.on("error",u);let A;a.on("verified",p=>{A=p}),a.on("end",()=>n(A)),a.on("data",()=>{})})}BA.exports.integrityStream=hq;function hq(t){t=ia(t);let e=t.integrity&&IA(t.integrity,t),r=e&&Object.keys(e).length,o=r&&e.pickAlgorithm(t),a=r&&e[o],n=Array.from(new Set(t.algorithms.concat(o?[o]:[]))),u=n.map(kv.createHash),A=0,p=new Cvt({transform(h,E,I){A+=h.length,u.forEach(v=>v.update(h,E)),I(null,h,E)}}).on("end",()=>{let h=t.options&&t.options.length?`?${t.options.join("?")}`:"",E=IA(u.map((v,x)=>`${n[x]}-${v.digest("base64")}${h}`).join(" "),t),I=r&&E.match(e,t);if(typeof t.size=="number"&&A!==t.size){let v=new Error(`stream size mismatch when checking ${e}.
+  Wanted: ${t.size}
+  Found: ${A}`);v.code="EBADSIZE",v.found=A,v.expected=t.size,v.sri=e,p.emit("error",v)}else if(t.integrity&&!I){let v=new Error(`${e} integrity checksum failed when using ${o}: wanted ${a} but got ${E}. (${A} bytes)`);v.code="EINTEGRITY",v.found=E,v.expected=a,v.algorithm=o,v.sri=e,p.emit("error",v)}else p.emit("size",A),p.emit("integrity",E),I&&p.emit("verified",I)});return p}BA.exports.create=kvt;function kvt(t){t=ia(t);let e=t.algorithms,r=t.options.length?`?${t.options.join("?")}`:"",o=e.map(kv.createHash);return{update:function(a,n){return o.forEach(u=>u.update(a,n)),this},digest:function(a){return e.reduce((u,A)=>{let p=o.shift().digest("base64"),h=new _0(`${A}-${p}${r}`,t);if(h.algorithm&&h.digest){let E=h.algorithm;u[E]||(u[E]=[]),u[E].push(h)}return u},new Dm)}}}var Qvt=new Set(kv.getHashes()),fBe=["md5","whirlpool","sha1","sha224","sha256","sha384","sha512","sha3","sha3-256","sha3-384","sha3-512","sha3_256","sha3_384","sha3_512"].filter(t=>Qvt.has(t));function Fvt(t,e){return fBe.indexOf(t.toLowerCase())>=fBe.indexOf(e.toLowerCase())?t:e}});var jBe=_((lir,HBe)=>{var FDt=lL();function RDt(t){return FDt(t)?void 0:t}HBe.exports=RDt});var qBe=_((cir,GBe)=>{var TDt=Hb(),NDt=x8(),LDt=R8(),ODt=Gd(),MDt=dd(),UDt=jBe(),_Dt=v_(),HDt=b8(),jDt=1,GDt=2,qDt=4,YDt=_Dt(function(t,e){var r={};if(t==null)return r;var o=!1;e=TDt(e,function(n){return n=ODt(n,t),o||(o=n.length>1),n}),MDt(t,HDt(t),r),o&&(r=NDt(r,jDt|GDt|qDt,UDt));for(var a=e.length;a--;)LDt(r,e[a]);return r});GBe.exports=YDt});St();Ye();St();var JBe=ve("child_process"),zBe=$e(td());jt();var AC=new Map([]);var a2={};Vt(a2,{BaseCommand:()=>ut,WorkspaceRequiredError:()=>rr,getCli:()=>$pe,getDynamicLibs:()=>Zpe,getPluginConfiguration:()=>pC,openWorkspace:()=>fC,pluginCommands:()=>AC,runExit:()=>nk});jt();var ut=class extends nt{constructor(){super(...arguments);this.cwd=ge.String("--cwd",{hidden:!0})}validateAndExecute(){if(typeof this.cwd<"u")throw new it("The --cwd option is ambiguous when used anywhere else than the very first parameter provided in the command line, before even the command path");return super.validateAndExecute()}};Ye();St();jt();var rr=class extends it{constructor(e,r){let o=V.relative(e,r),a=V.join(e,Ot.fileName);super(`This command can only be run from within a workspace of your project (${o} isn't a workspace of ${a}).`)}};Ye();St();nA();Nl();k1();jt();var RAt=$e(zn());Za();var Zpe=()=>new Map([["@yarnpkg/cli",a2],["@yarnpkg/core",o2],["@yarnpkg/fslib",Vw],["@yarnpkg/libzip",x1],["@yarnpkg/parsers",rI],["@yarnpkg/shell",T1],["clipanion",hI],["semver",RAt],["typanion",Vo]]);Ye();async function fC(t,e){let{project:r,workspace:o}=await Pt.find(t,e);if(!o)throw new rr(r.cwd,e);return o}Ye();St();nA();Nl();k1();jt();var eSt=$e(zn());Za();var $8={};Vt($8,{AddCommand:()=>kh,BinCommand:()=>Qh,CacheCleanCommand:()=>Fh,ClipanionCommand:()=>Kd,ConfigCommand:()=>Lh,ConfigGetCommand:()=>Rh,ConfigSetCommand:()=>Th,ConfigUnsetCommand:()=>Nh,DedupeCommand:()=>Oh,EntryCommand:()=>mC,ExecCommand:()=>Mh,ExplainCommand:()=>Hh,ExplainPeerRequirementsCommand:()=>Uh,HelpCommand:()=>Vd,InfoCommand:()=>jh,LinkCommand:()=>qh,NodeCommand:()=>Yh,PluginCheckCommand:()=>Wh,PluginImportCommand:()=>Jh,PluginImportSourcesCommand:()=>zh,PluginListCommand:()=>Kh,PluginRemoveCommand:()=>Xh,PluginRuntimeCommand:()=>Zh,RebuildCommand:()=>$h,RemoveCommand:()=>e0,RunCommand:()=>t0,RunIndexCommand:()=>Xd,SetResolutionCommand:()=>r0,SetVersionCommand:()=>_h,SetVersionSourcesCommand:()=>Vh,UnlinkCommand:()=>n0,UpCommand:()=>Jf,VersionCommand:()=>Jd,WhyCommand:()=>i0,WorkspaceCommand:()=>a0,WorkspacesListCommand:()=>o0,YarnCommand:()=>Gh,dedupeUtils:()=>pk,default:()=>Sgt,suggestUtils:()=>zc});var kde=$e(td());Ye();Ye();Ye();jt();var _0e=$e(f2());Za();var zc={};Vt(zc,{Modifier:()=>B8,Strategy:()=>uk,Target:()=>p2,WorkspaceModifier:()=>N0e,applyModifier:()=>$ft,extractDescriptorFromPath:()=>v8,extractRangeModifier:()=>L0e,fetchDescriptorFrom:()=>D8,findProjectDescriptors:()=>U0e,getModifier:()=>h2,getSuggestedDescriptors:()=>g2,makeWorkspaceDescriptor:()=>M0e,toWorkspaceModifier:()=>O0e});Ye();Ye();St();var I8=$e(zn()),Xft="workspace:",p2=(o=>(o.REGULAR="dependencies",o.DEVELOPMENT="devDependencies",o.PEER="peerDependencies",o))(p2||{}),B8=(o=>(o.CARET="^",o.TILDE="~",o.EXACT="",o))(B8||{}),N0e=(o=>(o.CARET="^",o.TILDE="~",o.EXACT="*",o))(N0e||{}),uk=(n=>(n.KEEP="keep",n.REUSE="reuse",n.PROJECT="project",n.LATEST="latest",n.CACHE="cache",n))(uk||{});function h2(t,e){return t.exact?"":t.caret?"^":t.tilde?"~":e.configuration.get("defaultSemverRangePrefix")}var Zft=/^([\^~]?)[0-9]+(?:\.[0-9]+){0,2}(?:-\S+)?$/;function L0e(t,{project:e}){let r=t.match(Zft);return r?r[1]:e.configuration.get("defaultSemverRangePrefix")}function $ft(t,e){let{protocol:r,source:o,params:a,selector:n}=W.parseRange(t.range);return I8.default.valid(n)&&(n=`${e}${t.range}`),W.makeDescriptor(t,W.makeRange({protocol:r,source:o,params:a,selector:n}))}function O0e(t){switch(t){case"^":return"^";case"~":return"~";case"":return"*";default:throw new Error(`Assertion failed: Unknown modifier: "${t}"`)}}function M0e(t,e){return W.makeDescriptor(t.anchoredDescriptor,`${Xft}${O0e(e)}`)}async function U0e(t,{project:e,target:r}){let o=new Map,a=n=>{let u=o.get(n.descriptorHash);return u||o.set(n.descriptorHash,u={descriptor:n,locators:[]}),u};for(let n of e.workspaces)if(r==="peerDependencies"){let u=n.manifest.peerDependencies.get(t.identHash);u!==void 0&&a(u).locators.push(n.anchoredLocator)}else{let u=n.manifest.dependencies.get(t.identHash),A=n.manifest.devDependencies.get(t.identHash);r==="devDependencies"?A!==void 0?a(A).locators.push(n.anchoredLocator):u!==void 0&&a(u).locators.push(n.anchoredLocator):u!==void 0?a(u).locators.push(n.anchoredLocator):A!==void 0&&a(A).locators.push(n.anchoredLocator)}return o}async function v8(t,{cwd:e,workspace:r}){return await ept(async o=>{V.isAbsolute(t)||(t=V.relative(r.cwd,V.resolve(e,t)),t.match(/^\.{0,2}\//)||(t=`./${t}`));let{project:a}=r,n=await D8(W.makeIdent(null,"archive"),t,{project:r.project,cache:o,workspace:r});if(!n)throw new Error("Assertion failed: The descriptor should have been found");let u=new Qi,A=a.configuration.makeResolver(),p=a.configuration.makeFetcher(),h={checksums:a.storedChecksums,project:a,cache:o,fetcher:p,report:u,resolver:A},E=A.bindDescriptor(n,r.anchoredLocator,h),I=W.convertDescriptorToLocator(E),v=await p.fetch(I,h),x=await Ot.find(v.prefixPath,{baseFs:v.packageFs});if(!x.name)throw new Error("Target path doesn't have a name");return W.makeDescriptor(x.name,t)})}async function g2(t,{project:e,workspace:r,cache:o,target:a,fixed:n,modifier:u,strategies:A,maxResults:p=1/0}){if(!(p>=0))throw new Error(`Invalid maxResults (${p})`);let[h,E]=t.range!=="unknown"?n||kr.validRange(t.range)||!t.range.match(/^[a-z0-9._-]+$/i)?[t.range,"latest"]:["unknown",t.range]:["unknown","latest"];if(h!=="unknown")return{suggestions:[{descriptor:t,name:`Use ${W.prettyDescriptor(e.configuration,t)}`,reason:"(unambiguous explicit request)"}],rejections:[]};let I=typeof r<"u"&&r!==null&&r.manifest[a].get(t.identHash)||null,v=[],x=[],C=async R=>{try{await R()}catch(L){x.push(L)}};for(let R of A){if(v.length>=p)break;switch(R){case"keep":await C(async()=>{I&&v.push({descriptor:I,name:`Keep ${W.prettyDescriptor(e.configuration,I)}`,reason:"(no changes)"})});break;case"reuse":await C(async()=>{for(let{descriptor:L,locators:U}of(await U0e(t,{project:e,target:a})).values()){if(U.length===1&&U[0].locatorHash===r.anchoredLocator.locatorHash&&A.includes("keep"))continue;let J=`(originally used by ${W.prettyLocator(e.configuration,U[0])}`;J+=U.length>1?` and ${U.length-1} other${U.length>2?"s":""})`:")",v.push({descriptor:L,name:`Reuse ${W.prettyDescriptor(e.configuration,L)}`,reason:J})}});break;case"cache":await C(async()=>{for(let L of e.storedDescriptors.values())L.identHash===t.identHash&&v.push({descriptor:L,name:`Reuse ${W.prettyDescriptor(e.configuration,L)}`,reason:"(already used somewhere in the lockfile)"})});break;case"project":await C(async()=>{if(r.manifest.name!==null&&t.identHash===r.manifest.name.identHash)return;let L=e.tryWorkspaceByIdent(t);if(L===null)return;let U=M0e(L,u);v.push({descriptor:U,name:`Attach ${W.prettyDescriptor(e.configuration,U)}`,reason:`(local workspace at ${de.pretty(e.configuration,L.relativeCwd,de.Type.PATH)})`})});break;case"latest":{let L=e.configuration.get("enableNetwork"),U=e.configuration.get("enableOfflineMode");await C(async()=>{if(a==="peerDependencies")v.push({descriptor:W.makeDescriptor(t,"*"),name:"Use *",reason:"(catch-all peer dependency pattern)"});else if(!L&&!U)v.push({descriptor:null,name:"Resolve from latest",reason:de.pretty(e.configuration,"(unavailable because enableNetwork is toggled off)","grey")});else{let J=await D8(t,E,{project:e,cache:o,workspace:r,modifier:u});J&&v.push({descriptor:J,name:`Use ${W.prettyDescriptor(e.configuration,J)}`,reason:`(resolved from ${U?"the cache":"latest"})`})}})}break}}return{suggestions:v.slice(0,p),rejections:x.slice(0,p)}}async function D8(t,e,{project:r,cache:o,workspace:a,preserveModifier:n=!0,modifier:u}){let A=r.configuration.normalizeDependency(W.makeDescriptor(t,e)),p=new Qi,h=r.configuration.makeFetcher(),E=r.configuration.makeResolver(),I={project:r,fetcher:h,cache:o,checksums:r.storedChecksums,report:p,cacheOptions:{skipIntegrityCheck:!0}},v={...I,resolver:E,fetchOptions:I},x=E.bindDescriptor(A,a.anchoredLocator,v),C=await E.getCandidates(x,{},v);if(C.length===0)return null;let R=C[0],{protocol:L,source:U,params:J,selector:te}=W.parseRange(W.convertToManifestRange(R.reference));if(L===r.configuration.get("defaultProtocol")&&(L=null),I8.default.valid(te)){let ae=te;if(typeof u<"u")te=u+te;else if(n!==!1){let me=typeof n=="string"?n:A.range;te=L0e(me,{project:r})+te}let fe=W.makeDescriptor(R,W.makeRange({protocol:L,source:U,params:J,selector:te}));(await E.getCandidates(r.configuration.normalizeDependency(fe),{},v)).length!==1&&(te=ae)}return W.makeDescriptor(R,W.makeRange({protocol:L,source:U,params:J,selector:te}))}async function ept(t){return await oe.mktempPromise(async e=>{let r=Ke.create(e);return r.useWithSource(e,{enableMirror:!1,compressionLevel:0},e,{overwrite:!0}),await t(new Lr(e,{configuration:r,check:!1,immutable:!1}))})}var kh=class extends ut{constructor(){super(...arguments);this.json=ge.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.fixed=ge.Boolean("-F,--fixed",!1,{description:"Store dependency tags as-is instead of resolving them"});this.exact=ge.Boolean("-E,--exact",!1,{description:"Don't use any semver modifier on the resolved range"});this.tilde=ge.Boolean("-T,--tilde",!1,{description:"Use the `~` semver modifier on the resolved range"});this.caret=ge.Boolean("-C,--caret",!1,{description:"Use the `^` semver modifier on the resolved range"});this.dev=ge.Boolean("-D,--dev",!1,{description:"Add a package as a dev dependency"});this.peer=ge.Boolean("-P,--peer",!1,{description:"Add a package as a peer dependency"});this.optional=ge.Boolean("-O,--optional",!1,{description:"Add / upgrade a package to an optional regular / peer dependency"});this.preferDev=ge.Boolean("--prefer-dev",!1,{description:"Add / upgrade a package to a dev dependency"});this.interactive=ge.Boolean("-i,--interactive",{description:"Reuse the specified package from other workspaces in the project"});this.cached=ge.Boolean("--cached",!1,{description:"Reuse the highest version already used somewhere within the project"});this.mode=ge.String("--mode",{description:"Change what artifacts installs generate",validator:Ks(pl)});this.silent=ge.Boolean("--silent",{hidden:!0});this.packages=ge.Rest()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd),n=await Lr.find(r);if(!a)throw new rr(o.cwd,this.context.cwd);await o.restoreInstallState({restoreResolutions:!1});let u=this.fixed,A=this.interactive??r.get("preferInteractive"),p=A||r.get("preferReuse"),h=h2(this,o),E=[p?"reuse":void 0,"project",this.cached?"cache":void 0,"latest"].filter(U=>typeof U<"u"),I=A?1/0:1,v=await Promise.all(this.packages.map(async U=>{let J=U.match(/^\.{0,2}\//)?await v8(U,{cwd:this.context.cwd,workspace:a}):W.tryParseDescriptor(U),te=U.match(/^(https?:|git@github)/);if(te)throw new it(`It seems you are trying to add a package using a ${de.pretty(r,`${te[0]}...`,de.Type.RANGE)} url; we now require package names to be explicitly specified.
+Try running the command again with the package name prefixed: ${de.pretty(r,"yarn add",de.Type.CODE)} ${de.pretty(r,W.makeDescriptor(W.makeIdent(null,"my-package"),`${te[0]}...`),de.Type.DESCRIPTOR)}`);if(!J)throw new it(`The ${de.pretty(r,U,de.Type.CODE)} string didn't match the required format (package-name@range). Did you perhaps forget to explicitly reference the package name?`);let ae=tpt(a,J,{dev:this.dev,peer:this.peer,preferDev:this.preferDev,optional:this.optional});return await Promise.all(ae.map(async ce=>{let me=await g2(J,{project:o,workspace:a,cache:n,fixed:u,target:ce,modifier:h,strategies:E,maxResults:I});return{request:J,suggestedDescriptors:me,target:ce}}))})).then(U=>U.flat()),x=await AA.start({configuration:r,stdout:this.context.stdout,suggestInstall:!1},async U=>{for(let{request:J,suggestedDescriptors:{suggestions:te,rejections:ae}}of v)if(te.filter(ce=>ce.descriptor!==null).length===0){let[ce]=ae;if(typeof ce>"u")throw new Error("Assertion failed: Expected an error to have been set");o.configuration.get("enableNetwork")?U.reportError(27,`${W.prettyDescriptor(r,J)} can't be resolved to a satisfying range`):U.reportError(27,`${W.prettyDescriptor(r,J)} can't be resolved to a satisfying range (note: network resolution has been disabled)`),U.reportSeparator(),U.reportExceptionOnce(ce)}});if(x.hasErrors())return x.exitCode();let C=!1,R=[],L=[];for(let{suggestedDescriptors:{suggestions:U},target:J}of v){let te,ae=U.filter(he=>he.descriptor!==null),fe=ae[0].descriptor,ce=ae.every(he=>W.areDescriptorsEqual(he.descriptor,fe));ae.length===1||ce?te=fe:(C=!0,{answer:te}=await(0,_0e.prompt)({type:"select",name:"answer",message:"Which range do you want to use?",choices:U.map(({descriptor:he,name:Be,reason:we})=>he?{name:Be,hint:we,descriptor:he}:{name:Be,hint:we,disabled:!0}),onCancel:()=>process.exit(130),result(he){return this.find(he,"descriptor")},stdin:this.context.stdin,stdout:this.context.stdout}));let me=a.manifest[J].get(te.identHash);(typeof me>"u"||me.descriptorHash!==te.descriptorHash)&&(a.manifest[J].set(te.identHash,te),this.optional&&(J==="dependencies"?a.manifest.ensureDependencyMeta({...te,range:"unknown"}).optional=!0:J==="peerDependencies"&&(a.manifest.ensurePeerDependencyMeta({...te,range:"unknown"}).optional=!0)),typeof me>"u"?R.push([a,J,te,E]):L.push([a,J,me,te]))}return await r.triggerMultipleHooks(U=>U.afterWorkspaceDependencyAddition,R),await r.triggerMultipleHooks(U=>U.afterWorkspaceDependencyReplacement,L),C&&this.context.stdout.write(`
+`),await o.installWithNewReport({json:this.json,stdout:this.context.stdout,quiet:this.context.quiet},{cache:n,mode:this.mode})}};kh.paths=[["add"]],kh.usage=nt.Usage({description:"add dependencies to the project",details:"\n      This command adds a package to the package.json for the nearest workspace.\n\n      - If it didn't exist before, the package will by default be added to the regular `dependencies` field, but this behavior can be overriden thanks to the `-D,--dev` flag (which will cause the dependency to be added to the `devDependencies` field instead) and the `-P,--peer` flag (which will do the same but for `peerDependencies`).\n\n      - If the package was already listed in your dependencies, it will by default be upgraded whether it's part of your `dependencies` or `devDependencies` (it won't ever update `peerDependencies`, though).\n\n      - If set, the `--prefer-dev` flag will operate as a more flexible `-D,--dev` in that it will add the package to your `devDependencies` if it isn't already listed in either `dependencies` or `devDependencies`, but it will also happily upgrade your `dependencies` if that's what you already use (whereas `-D,--dev` would throw an exception).\n\n      - If set, the `-O,--optional` flag will add the package to the `optionalDependencies` field and, in combination with the `-P,--peer` flag, it will add the package as an optional peer dependency. If the package was already listed in your `dependencies`, it will be upgraded to `optionalDependencies`. If the package was already listed in your `peerDependencies`, in combination with the `-P,--peer` flag, it will be upgraded to an optional peer dependency: `\"peerDependenciesMeta\": { \"<package>\": { \"optional\": true } }`\n\n      - If the added package doesn't specify a range at all its `latest` tag will be resolved and the returned version will be used to generate a new semver range (using the `^` modifier by default unless otherwise configured via the `defaultSemverRangePrefix` configuration, or the `~` modifier if `-T,--tilde` is specified, or no modifier at all if `-E,--exact` is specified). Two exceptions to this rule: the first one is that if the package is a workspace then its local version will be used, and the second one is that if you use `-P,--peer` the default range will be `*` and won't be resolved at all.\n\n      - If the added package specifies a range (such as `^1.0.0`, `latest`, or `rc`), Yarn will add this range as-is in the resulting package.json entry (in particular, tags such as `rc` will be encoded as-is rather than being converted into a semver range).\n\n      If the `--cached` option is used, Yarn will preferably reuse the highest version already used somewhere within the project, even if through a transitive dependency.\n\n      If the `-i,--interactive` option is used (or if the `preferInteractive` settings is toggled on) the command will first try to check whether other workspaces in the project use the specified package and, if so, will offer to reuse them.\n\n      If the `--mode=<mode>` option is set, Yarn will change which artifacts are generated. The modes currently supported are:\n\n      - `skip-build` will not run the build scripts at all. Note that this is different from setting `enableScripts` to false because the latter will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run.\n\n      - `update-lockfile` will skip the link step altogether, and only fetch packages that are missing from the lockfile (or that have no associated checksums). This mode is typically used by tools like Renovate or Dependabot to keep a lockfile up-to-date without incurring the full install cost.\n\n      For a compilation of all the supported protocols, please consult the dedicated page from our website: https://yarnpkg.com/protocols.\n    ",examples:[["Add a regular package to the current workspace","$0 add lodash"],["Add a specific version for a package to the current workspace","$0 add lodash@1.2.3"],["Add a package from a GitHub repository (the master branch) to the current workspace using a URL","$0 add lodash@https://github.com/lodash/lodash"],["Add a package from a GitHub repository (the master branch) to the current workspace using the GitHub protocol","$0 add lodash@github:lodash/lodash"],["Add a package from a GitHub repository (the master branch) to the current workspace using the GitHub protocol (shorthand)","$0 add lodash@lodash/lodash"],["Add a package from a specific branch of a GitHub repository to the current workspace using the GitHub protocol (shorthand)","$0 add lodash-es@lodash/lodash#es"]]});function tpt(t,e,{dev:r,peer:o,preferDev:a,optional:n}){let u=t.manifest["dependencies"].has(e.identHash),A=t.manifest["devDependencies"].has(e.identHash),p=t.manifest["peerDependencies"].has(e.identHash);if((r||o)&&u)throw new it(`Package "${W.prettyIdent(t.project.configuration,e)}" is already listed as a regular dependency - remove the -D,-P flags or remove it from your dependencies first`);if(!r&&!o&&p)throw new it(`Package "${W.prettyIdent(t.project.configuration,e)}" is already listed as a peer dependency - use either of -D or -P, or remove it from your peer dependencies first`);if(n&&A)throw new it(`Package "${W.prettyIdent(t.project.configuration,e)}" is already listed as a dev dependency - remove the -O flag or remove it from your dev dependencies first`);if(n&&!o&&p)throw new it(`Package "${W.prettyIdent(t.project.configuration,e)}" is already listed as a peer dependency - remove the -O flag or add the -P flag or remove it from your peer dependencies first`);if((r||a)&&n)throw new it(`Package "${W.prettyIdent(t.project.configuration,e)}" cannot simultaneously be a dev dependency and an optional dependency`);let h=[];return o&&h.push("peerDependencies"),(r||a)&&h.push("devDependencies"),n&&h.push("dependencies"),h.length>0?h:A?["devDependencies"]:p?["peerDependencies"]:["dependencies"]}Ye();Ye();jt();var Qh=class extends ut{constructor(){super(...arguments);this.verbose=ge.Boolean("-v,--verbose",!1,{description:"Print both the binary name and the locator of the package that provides the binary"});this.json=ge.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.name=ge.String({required:!1})}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,locator:a}=await Pt.find(r,this.context.cwd);if(await o.restoreInstallState(),this.name){let A=(await un.getPackageAccessibleBinaries(a,{project:o})).get(this.name);if(!A)throw new it(`Couldn't find a binary named "${this.name}" for package "${W.prettyLocator(r,a)}"`);let[,p]=A;return this.context.stdout.write(`${p}
+`),0}return(await Nt.start({configuration:r,json:this.json,stdout:this.context.stdout},async u=>{let A=await un.getPackageAccessibleBinaries(a,{project:o}),h=Array.from(A.keys()).reduce((E,I)=>Math.max(E,I.length),0);for(let[E,[I,v]]of A)u.reportJson({name:E,source:W.stringifyIdent(I),path:v});if(this.verbose)for(let[E,[I]]of A)u.reportInfo(null,`${E.padEnd(h," ")}   ${W.prettyLocator(r,I)}`);else for(let E of A.keys())u.reportInfo(null,E)})).exitCode()}};Qh.paths=[["bin"]],Qh.usage=nt.Usage({description:"get the path to a binary script",details:`
+      When used without arguments, this command will print the list of all the binaries available in the current workspace. Adding the \`-v,--verbose\` flag will cause the output to contain both the binary name and the locator of the package that provides the binary.
+
+      When an argument is specified, this command will just print the path to the binary on the standard output and exit. Note that the reported path may be stored within a zip archive.
+    `,examples:[["List all the available binaries","$0 bin"],["Print the path to a specific binary","$0 bin eslint"]]});Ye();St();jt();var Fh=class extends ut{constructor(){super(...arguments);this.mirror=ge.Boolean("--mirror",!1,{description:"Remove the global cache files instead of the local cache files"});this.all=ge.Boolean("--all",!1,{description:"Remove both the global cache files and the local cache files of the current project"})}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),o=await Lr.find(r);return(await Nt.start({configuration:r,stdout:this.context.stdout},async()=>{let n=(this.all||this.mirror)&&o.mirrorCwd!==null,u=!this.mirror;n&&(await oe.removePromise(o.mirrorCwd),await r.triggerHook(A=>A.cleanGlobalArtifacts,r)),u&&await oe.removePromise(o.cwd)})).exitCode()}};Fh.paths=[["cache","clean"],["cache","clear"]],Fh.usage=nt.Usage({description:"remove the shared cache files",details:`
+      This command will remove all the files from the cache.
+    `,examples:[["Remove all the local archives","$0 cache clean"],["Remove all the archives stored in the ~/.yarn directory","$0 cache clean --mirror"]]});Ye();jt();var j0e=$e(d2()),S8=ve("util"),Rh=class extends ut{constructor(){super(...arguments);this.why=ge.Boolean("--why",!1,{description:"Print the explanation for why a setting has its value"});this.json=ge.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.unsafe=ge.Boolean("--no-redacted",!1,{description:"Don't redact secrets (such as tokens) from the output"});this.name=ge.String()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),o=this.name.replace(/[.[].*$/,""),a=this.name.replace(/^[^.[]*/,"");if(typeof r.settings.get(o)>"u")throw new it(`Couldn't find a configuration settings named "${o}"`);let u=r.getSpecial(o,{hideSecrets:!this.unsafe,getNativePaths:!0}),A=_e.convertMapsToIndexableObjects(u),p=a?(0,j0e.default)(A,a):A,h=await Nt.start({configuration:r,includeFooter:!1,json:this.json,stdout:this.context.stdout},async E=>{E.reportJson(p)});if(!this.json){if(typeof p=="string")return this.context.stdout.write(`${p}
+`),h.exitCode();S8.inspect.styles.name="cyan",this.context.stdout.write(`${(0,S8.inspect)(p,{depth:1/0,colors:r.get("enableColors"),compact:!1})}
+`)}return h.exitCode()}};Rh.paths=[["config","get"]],Rh.usage=nt.Usage({description:"read a configuration settings",details:`
+      This command will print a configuration setting.
+
+      Secrets (such as tokens) will be redacted from the output by default. If this behavior isn't desired, set the \`--no-redacted\` to get the untransformed value.
+    `,examples:[["Print a simple configuration setting","yarn config get yarnPath"],["Print a complex configuration setting","yarn config get packageExtensions"],["Print a nested field from the configuration",`yarn config get 'npmScopes["my-company"].npmRegistryServer'`],["Print a token from the configuration","yarn config get npmAuthToken --no-redacted"],["Print a configuration setting as JSON","yarn config get packageExtensions --json"]]});Ye();jt();var Fge=$e(k8()),Rge=$e(d2()),Tge=$e(Q8()),F8=ve("util"),Th=class extends ut{constructor(){super(...arguments);this.json=ge.Boolean("--json",!1,{description:"Set complex configuration settings to JSON values"});this.home=ge.Boolean("-H,--home",!1,{description:"Update the home configuration instead of the project configuration"});this.name=ge.String();this.value=ge.String()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),o=()=>{if(!r.projectCwd)throw new it("This command must be run from within a project folder");return r.projectCwd},a=this.name.replace(/[.[].*$/,""),n=this.name.replace(/^[^.[]*\.?/,"");if(typeof r.settings.get(a)>"u")throw new it(`Couldn't find a configuration settings named "${a}"`);if(a==="enableStrictSettings")throw new it("This setting only affects the file it's in, and thus cannot be set from the CLI");let A=this.json?JSON.parse(this.value):this.value;await(this.home?C=>Ke.updateHomeConfiguration(C):C=>Ke.updateConfiguration(o(),C))(C=>{if(n){let R=(0,Fge.default)(C);return(0,Tge.default)(R,this.name,A),R}else return{...C,[a]:A}});let E=(await Ke.find(this.context.cwd,this.context.plugins)).getSpecial(a,{hideSecrets:!0,getNativePaths:!0}),I=_e.convertMapsToIndexableObjects(E),v=n?(0,Rge.default)(I,n):I;return(await Nt.start({configuration:r,includeFooter:!1,stdout:this.context.stdout},async C=>{F8.inspect.styles.name="cyan",C.reportInfo(0,`Successfully set ${this.name} to ${(0,F8.inspect)(v,{depth:1/0,colors:r.get("enableColors"),compact:!1})}`)})).exitCode()}};Th.paths=[["config","set"]],Th.usage=nt.Usage({description:"change a configuration settings",details:`
+      This command will set a configuration setting.
+
+      When used without the \`--json\` flag, it can only set a simple configuration setting (a string, a number, or a boolean).
+
+      When used with the \`--json\` flag, it can set both simple and complex configuration settings, including Arrays and Objects.
+    `,examples:[["Set a simple configuration setting (a string, a number, or a boolean)","yarn config set initScope myScope"],["Set a simple configuration setting (a string, a number, or a boolean) using the `--json` flag",'yarn config set initScope --json \\"myScope\\"'],["Set a complex configuration setting (an Array) using the `--json` flag",`yarn config set unsafeHttpWhitelist --json '["*.example.com", "example.com"]'`],["Set a complex configuration setting (an Object) using the `--json` flag",`yarn config set packageExtensions --json '{ "@babel/parser@*": { "dependencies": { "@babel/types": "*" } } }'`],["Set a nested configuration setting",'yarn config set npmScopes.company.npmRegistryServer "https://npm.example.com"'],["Set a nested configuration setting using indexed access for non-simple keys",`yarn config set 'npmRegistries["//npm.example.com"].npmAuthToken' "ffffffff-ffff-ffff-ffff-ffffffffffff"`]]});Ye();jt();var Yge=$e(k8()),Wge=$e(Mge()),Kge=$e(T8()),Nh=class extends ut{constructor(){super(...arguments);this.home=ge.Boolean("-H,--home",!1,{description:"Update the home configuration instead of the project configuration"});this.name=ge.String()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),o=()=>{if(!r.projectCwd)throw new it("This command must be run from within a project folder");return r.projectCwd},a=this.name.replace(/[.[].*$/,""),n=this.name.replace(/^[^.[]*\.?/,"");if(typeof r.settings.get(a)>"u")throw new it(`Couldn't find a configuration settings named "${a}"`);let A=this.home?h=>Ke.updateHomeConfiguration(h):h=>Ke.updateConfiguration(o(),h);return(await Nt.start({configuration:r,includeFooter:!1,stdout:this.context.stdout},async h=>{let E=!1;await A(I=>{if(!(0,Wge.default)(I,this.name))return h.reportWarning(0,`Configuration doesn't contain setting ${this.name}; there is nothing to unset`),E=!0,I;let v=n?(0,Yge.default)(I):{...I};return(0,Kge.default)(v,this.name),v}),E||h.reportInfo(0,`Successfully unset ${this.name}`)})).exitCode()}};Nh.paths=[["config","unset"]],Nh.usage=nt.Usage({description:"unset a configuration setting",details:`
+      This command will unset a configuration setting.
+    `,examples:[["Unset a simple configuration setting","yarn config unset initScope"],["Unset a complex configuration setting","yarn config unset packageExtensions"],["Unset a nested configuration setting","yarn config unset npmScopes.company.npmRegistryServer"]]});Ye();St();jt();var fk=ve("util"),Lh=class extends ut{constructor(){super(...arguments);this.noDefaults=ge.Boolean("--no-defaults",!1,{description:"Omit the default values from the display"});this.json=ge.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.verbose=ge.Boolean("-v,--verbose",{hidden:!0});this.why=ge.Boolean("--why",{hidden:!0});this.names=ge.Rest()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins,{strict:!1}),o=await LE({configuration:r,stdout:this.context.stdout,forceError:this.json},[{option:this.verbose,message:"The --verbose option is deprecated, the settings' descriptions are now always displayed"},{option:this.why,message:"The --why option is deprecated, the settings' sources are now always displayed"}]);if(o!==null)return o;let a=this.names.length>0?[...new Set(this.names)].sort():[...r.settings.keys()].sort(),n,u=await Nt.start({configuration:r,json:this.json,stdout:this.context.stdout,includeFooter:!1},async A=>{if(r.invalid.size>0&&!this.json){for(let[p,h]of r.invalid)A.reportError(34,`Invalid configuration key "${p}" in ${h}`);A.reportSeparator()}if(this.json)for(let p of a){let h=r.settings.get(p);typeof h>"u"&&A.reportError(34,`No configuration key named "${p}"`);let E=r.getSpecial(p,{hideSecrets:!0,getNativePaths:!0}),I=r.sources.get(p)??"<default>",v=I&&I[0]!=="<"?ue.fromPortablePath(I):I;A.reportJson({key:p,effective:E,source:v,...h})}else{let p={breakLength:1/0,colors:r.get("enableColors"),maxArrayLength:2},h={},E={children:h};for(let I of a){if(this.noDefaults&&!r.sources.has(I))continue;let v=r.settings.get(I),x=r.sources.get(I)??"<default>",C=r.getSpecial(I,{hideSecrets:!0,getNativePaths:!0}),R={Description:{label:"Description",value:de.tuple(de.Type.MARKDOWN,{text:v.description,format:this.cli.format(),paragraphs:!1})},Source:{label:"Source",value:de.tuple(x[0]==="<"?de.Type.CODE:de.Type.PATH,x)}};h[I]={value:de.tuple(de.Type.CODE,I),children:R};let L=(U,J)=>{for(let[te,ae]of J)if(ae instanceof Map){let fe={};U[te]={children:fe},L(fe,ae)}else U[te]={label:te,value:de.tuple(de.Type.NO_HINT,(0,fk.inspect)(ae,p))}};C instanceof Map?L(R,C):R.Value={label:"Value",value:de.tuple(de.Type.NO_HINT,(0,fk.inspect)(C,p))}}a.length!==1&&(n=void 0),$s.emitTree(E,{configuration:r,json:this.json,stdout:this.context.stdout,separators:2})}});if(!this.json&&typeof n<"u"){let A=a[0],p=(0,fk.inspect)(r.getSpecial(A,{hideSecrets:!0,getNativePaths:!0}),{colors:r.get("enableColors")});this.context.stdout.write(`
+`),this.context.stdout.write(`${p}
+`)}return u.exitCode()}};Lh.paths=[["config"]],Lh.usage=nt.Usage({description:"display the current configuration",details:`
+      This command prints the current active configuration settings.
+    `,examples:[["Print the active configuration settings","$0 config"]]});Ye();jt();Za();var pk={};Vt(pk,{Strategy:()=>m2,acceptedStrategies:()=>O0t,dedupe:()=>N8});Ye();Ye();var Vge=$e(Zo()),m2=(e=>(e.HIGHEST="highest",e))(m2||{}),O0t=new Set(Object.values(m2)),M0t={highest:async(t,e,{resolver:r,fetcher:o,resolveOptions:a,fetchOptions:n})=>{let u=new Map;for(let[p,h]of t.storedResolutions){let E=t.storedDescriptors.get(p);if(typeof E>"u")throw new Error(`Assertion failed: The descriptor (${p}) should have been registered`);_e.getSetWithDefault(u,E.identHash).add(h)}let A=new Map(_e.mapAndFilter(t.storedDescriptors.values(),p=>W.isVirtualDescriptor(p)?_e.mapAndFilter.skip:[p.descriptorHash,_e.makeDeferred()]));for(let p of t.storedDescriptors.values()){let h=A.get(p.descriptorHash);if(typeof h>"u")throw new Error(`Assertion failed: The descriptor (${p.descriptorHash}) should have been registered`);let E=t.storedResolutions.get(p.descriptorHash);if(typeof E>"u")throw new Error(`Assertion failed: The resolution (${p.descriptorHash}) should have been registered`);let I=t.originalPackages.get(E);if(typeof I>"u")throw new Error(`Assertion failed: The package (${E}) should have been registered`);Promise.resolve().then(async()=>{let v=r.getResolutionDependencies(p,a),x=Object.fromEntries(await _e.allSettledSafe(Object.entries(v).map(async([te,ae])=>{let fe=A.get(ae.descriptorHash);if(typeof fe>"u")throw new Error(`Assertion failed: The descriptor (${ae.descriptorHash}) should have been registered`);let ce=await fe.promise;if(!ce)throw new Error("Assertion failed: Expected the dependency to have been through the dedupe process itself");return[te,ce.updatedPackage]})));if(e.length&&!Vge.default.isMatch(W.stringifyIdent(p),e)||!r.shouldPersistResolution(I,a))return I;let C=u.get(p.identHash);if(typeof C>"u")throw new Error(`Assertion failed: The resolutions (${p.identHash}) should have been registered`);if(C.size===1)return I;let R=[...C].map(te=>{let ae=t.originalPackages.get(te);if(typeof ae>"u")throw new Error(`Assertion failed: The package (${te}) should have been registered`);return ae}),L=await r.getSatisfying(p,x,R,a),U=L.locators?.[0];if(typeof U>"u"||!L.sorted)return I;let J=t.originalPackages.get(U.locatorHash);if(typeof J>"u")throw new Error(`Assertion failed: The package (${U.locatorHash}) should have been registered`);return J}).then(async v=>{let x=await t.preparePackage(v,{resolver:r,resolveOptions:a});h.resolve({descriptor:p,currentPackage:I,updatedPackage:v,resolvedPackage:x})}).catch(v=>{h.reject(v)})}return[...A.values()].map(p=>p.promise)}};async function N8(t,{strategy:e,patterns:r,cache:o,report:a}){let{configuration:n}=t,u=new Qi,A=n.makeResolver(),p=n.makeFetcher(),h={cache:o,checksums:t.storedChecksums,fetcher:p,project:t,report:u,cacheOptions:{skipIntegrityCheck:!0}},E={project:t,resolver:A,report:u,fetchOptions:h};return await a.startTimerPromise("Deduplication step",async()=>{let I=M0t[e],v=await I(t,r,{resolver:A,resolveOptions:E,fetcher:p,fetchOptions:h}),x=Xs.progressViaCounter(v.length);await a.reportProgress(x);let C=0;await Promise.all(v.map(U=>U.then(J=>{if(J===null||J.currentPackage.locatorHash===J.updatedPackage.locatorHash)return;C++;let{descriptor:te,currentPackage:ae,updatedPackage:fe}=J;a.reportInfo(0,`${W.prettyDescriptor(n,te)} can be deduped from ${W.prettyLocator(n,ae)} to ${W.prettyLocator(n,fe)}`),a.reportJson({descriptor:W.stringifyDescriptor(te),currentResolution:W.stringifyLocator(ae),updatedResolution:W.stringifyLocator(fe)}),t.storedResolutions.set(te.descriptorHash,fe.locatorHash)}).finally(()=>x.tick())));let R;switch(C){case 0:R="No packages";break;case 1:R="One package";break;default:R=`${C} packages`}let L=de.pretty(n,e,de.Type.CODE);return a.reportInfo(0,`${R} can be deduped using the ${L} strategy`),C})}var Oh=class extends ut{constructor(){super(...arguments);this.strategy=ge.String("-s,--strategy","highest",{description:"The strategy to use when deduping dependencies",validator:Ks(m2)});this.check=ge.Boolean("-c,--check",!1,{description:"Exit with exit code 1 when duplicates are found, without persisting the dependency tree"});this.json=ge.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.mode=ge.String("--mode",{description:"Change what artifacts installs generate",validator:Ks(pl)});this.patterns=ge.Rest()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o}=await Pt.find(r,this.context.cwd),a=await Lr.find(r);await o.restoreInstallState({restoreResolutions:!1});let n=0,u=await Nt.start({configuration:r,includeFooter:!1,stdout:this.context.stdout,json:this.json},async A=>{n=await N8(o,{strategy:this.strategy,patterns:this.patterns,cache:a,report:A})});return u.hasErrors()?u.exitCode():this.check?n?1:0:await o.installWithNewReport({json:this.json,stdout:this.context.stdout},{cache:a,mode:this.mode})}};Oh.paths=[["dedupe"]],Oh.usage=nt.Usage({description:"deduplicate dependencies with overlapping ranges",details:"\n      Duplicates are defined as descriptors with overlapping ranges being resolved and locked to different locators. They are a natural consequence of Yarn's deterministic installs, but they can sometimes pile up and unnecessarily increase the size of your project.\n\n      This command dedupes dependencies in the current project using different strategies (only one is implemented at the moment):\n\n      - `highest`: Reuses (where possible) the locators with the highest versions. This means that dependencies can only be upgraded, never downgraded. It's also guaranteed that it never takes more than a single pass to dedupe the entire dependency tree.\n\n      **Note:** Even though it never produces a wrong dependency tree, this command should be used with caution, as it modifies the dependency tree, which can sometimes cause problems when packages don't strictly follow semver recommendations. Because of this, it is recommended to also review the changes manually.\n\n      If set, the `-c,--check` flag will only report the found duplicates, without persisting the modified dependency tree. If changes are found, the command will exit with a non-zero exit code, making it suitable for CI purposes.\n\n      If the `--mode=<mode>` option is set, Yarn will change which artifacts are generated. The modes currently supported are:\n\n      - `skip-build` will not run the build scripts at all. Note that this is different from setting `enableScripts` to false because the latter will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run.\n\n      - `update-lockfile` will skip the link step altogether, and only fetch packages that are missing from the lockfile (or that have no associated checksums). This mode is typically used by tools like Renovate or Dependabot to keep a lockfile up-to-date without incurring the full install cost.\n\n      This command accepts glob patterns as arguments (if valid Idents and supported by [micromatch](https://github.com/micromatch/micromatch)). Make sure to escape the patterns, to prevent your own shell from trying to expand them.\n\n      ### In-depth explanation:\n\n      Yarn doesn't deduplicate dependencies by default, otherwise installs wouldn't be deterministic and the lockfile would be useless. What it actually does is that it tries to not duplicate dependencies in the first place.\n\n      **Example:** If `foo@^2.3.4` (a dependency of a dependency) has already been resolved to `foo@2.3.4`, running `yarn add foo@*`will cause Yarn to reuse `foo@2.3.4`, even if the latest `foo` is actually `foo@2.10.14`, thus preventing unnecessary duplication.\n\n      Duplication happens when Yarn can't unlock dependencies that have already been locked inside the lockfile.\n\n      **Example:** If `foo@^2.3.4` (a dependency of a dependency) has already been resolved to `foo@2.3.4`, running `yarn add foo@2.10.14` will cause Yarn to install `foo@2.10.14` because the existing resolution doesn't satisfy the range `2.10.14`. This behavior can lead to (sometimes) unwanted duplication, since now the lockfile contains 2 separate resolutions for the 2 `foo` descriptors, even though they have overlapping ranges, which means that the lockfile can be simplified so that both descriptors resolve to `foo@2.10.14`.\n    ",examples:[["Dedupe all packages","$0 dedupe"],["Dedupe all packages using a specific strategy","$0 dedupe --strategy highest"],["Dedupe a specific package","$0 dedupe lodash"],["Dedupe all packages with the `@babel/*` scope","$0 dedupe '@babel/*'"],["Check for duplicates (can be used as a CI step)","$0 dedupe --check"]]});Ye();jt();var Kd=class extends ut{async execute(){let{plugins:e}=await Ke.find(this.context.cwd,this.context.plugins),r=[];for(let u of e){let{commands:A}=u[1];if(A){let h=as.from(A).definitions();r.push([u[0],h])}}let o=this.cli.definitions(),a=(u,A)=>u.split(" ").slice(1).join()===A.split(" ").slice(1).join(),n=Jge()["@yarnpkg/builder"].bundles.standard;for(let u of r){let A=u[1];for(let p of A)o.find(h=>a(h.path,p.path)).plugin={name:u[0],isDefault:n.includes(u[0])}}this.context.stdout.write(`${JSON.stringify(o,null,2)}
+`)}};Kd.paths=[["--clipanion=definitions"]];var Vd=class extends ut{async execute(){this.context.stdout.write(this.cli.usage(null))}};Vd.paths=[["help"],["--help"],["-h"]];Ye();St();jt();var mC=class extends ut{constructor(){super(...arguments);this.leadingArgument=ge.String();this.args=ge.Proxy()}async execute(){if(this.leadingArgument.match(/[\\/]/)&&!W.tryParseIdent(this.leadingArgument)){let r=V.resolve(this.context.cwd,ue.toPortablePath(this.leadingArgument));return await this.cli.run(this.args,{cwd:r})}else return await this.cli.run(["run",this.leadingArgument,...this.args])}};Ye();var Jd=class extends ut{async execute(){this.context.stdout.write(`${rn||"<unknown>"}
+`)}};Jd.paths=[["-v"],["--version"]];Ye();Ye();jt();var Mh=class extends ut{constructor(){super(...arguments);this.commandName=ge.String();this.args=ge.Proxy()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,locator:a}=await Pt.find(r,this.context.cwd);return await o.restoreInstallState(),await un.executePackageShellcode(a,this.commandName,this.args,{cwd:this.context.cwd,stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr,project:o})}};Mh.paths=[["exec"]],Mh.usage=nt.Usage({description:"execute a shell script",details:`
+      This command simply executes a shell script within the context of the root directory of the active workspace using the portable shell.
+
+      It also makes sure to call it in a way that's compatible with the current project (for example, on PnP projects the environment will be setup in such a way that PnP will be correctly injected into the environment).
+    `,examples:[["Execute a single shell command","$0 exec echo Hello World"],["Execute a shell script",'$0 exec "tsc & babel src --out-dir lib"']]});Ye();jt();Za();var Uh=class extends ut{constructor(){super(...arguments);this.hash=ge.String({validator:oS(Cy(),[oI(/^p[0-9a-f]{5}$/)])})}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o}=await Pt.find(r,this.context.cwd);return await o.restoreInstallState({restoreResolutions:!1}),await o.applyLightResolution(),await _0t(this.hash,o,{stdout:this.context.stdout})}};Uh.paths=[["explain","peer-requirements"]],Uh.usage=nt.Usage({description:"explain a set of peer requirements",details:`
+      A set of peer requirements represents all peer requirements that a dependent must satisfy when providing a given peer request to a requester and its descendants.
+
+      When the hash argument is specified, this command prints a detailed explanation of all requirements of the set corresponding to the hash and whether they're satisfied or not.
+
+      When used without arguments, this command lists all sets of peer requirements and the corresponding hash that can be used to get detailed information about a given set.
+
+      **Note:** A hash is a six-letter p-prefixed code that can be obtained from peer dependency warnings or from the list of all peer requirements (\`yarn explain peer-requirements\`).
+    `,examples:[["Explain the corresponding set of peer requirements for a hash","$0 explain peer-requirements p1a4ed"],["List all sets of peer requirements","$0 explain peer-requirements"]]});async function _0t(t,e,r){let o=e.peerWarnings.find(n=>n.hash===t);if(typeof o>"u")throw new Error(`No peerDependency requirements found for hash: "${t}"`);return(await Nt.start({configuration:e.configuration,stdout:r.stdout,includeFooter:!1,includePrefix:!1},async n=>{let u=de.mark(e.configuration);switch(o.type){case 2:{n.reportInfo(0,`We have a problem with ${de.pretty(e.configuration,o.requested,de.Type.IDENT)}, which is provided with version ${W.prettyReference(e.configuration,o.version)}.`),n.reportInfo(0,"It is needed by the following direct dependencies of workspaces in your project:"),n.reportSeparator();for(let h of o.requesters.values()){let E=e.storedPackages.get(h.locatorHash);if(!E)throw new Error("Assertion failed: Expected the package to be registered");let I=E?.peerDependencies.get(o.requested.identHash);if(!I)throw new Error("Assertion failed: Expected the package to list the peer dependency");let v=kr.satisfiesWithPrereleases(o.version,I.range)?u.Check:u.Cross;n.reportInfo(null,`  ${v} ${W.prettyLocator(e.configuration,h)} (via ${W.prettyRange(e.configuration,I.range)})`)}let A=[...o.links.values()].filter(h=>!o.requesters.has(h.locatorHash));if(A.length>0){n.reportSeparator(),n.reportInfo(0,`However, those packages themselves have more dependencies listing ${W.prettyIdent(e.configuration,o.requested)} as peer dependency:`),n.reportSeparator();for(let h of A){let E=e.storedPackages.get(h.locatorHash);if(!E)throw new Error("Assertion failed: Expected the package to be registered");let I=E?.peerDependencies.get(o.requested.identHash);if(!I)throw new Error("Assertion failed: Expected the package to list the peer dependency");let v=kr.satisfiesWithPrereleases(o.version,I.range)?u.Check:u.Cross;n.reportInfo(null,`  ${v} ${W.prettyLocator(e.configuration,h)} (via ${W.prettyRange(e.configuration,I.range)})`)}}let p=Array.from(o.links.values(),h=>{let E=e.storedPackages.get(h.locatorHash);if(typeof E>"u")throw new Error("Assertion failed: Expected the package to be registered");let I=E.peerDependencies.get(o.requested.identHash);if(typeof I>"u")throw new Error("Assertion failed: Expected the ident to be registered");return I.range});if(p.length>1){let h=kr.simplifyRanges(p);n.reportSeparator(),h===null?(n.reportInfo(0,"Unfortunately, put together, we found no single range that can satisfy all those peer requirements."),n.reportInfo(0,`Your best option may be to try to upgrade some dependencies with ${de.pretty(e.configuration,"yarn up",de.Type.CODE)}, or silence the warning via ${de.pretty(e.configuration,"logFilters",de.Type.CODE)}.`)):n.reportInfo(0,`Put together, the final range we computed is ${de.pretty(e.configuration,h,de.Type.RANGE)}`)}}break;default:n.reportInfo(0,`The ${de.pretty(e.configuration,"yarn explain peer-requirements",de.Type.CODE)} command doesn't support this warning type yet.`);break}})).exitCode()}Ye();jt();Za();Ye();Ye();St();jt();var zge=$e(zn()),_h=class extends ut{constructor(){super(...arguments);this.useYarnPath=ge.Boolean("--yarn-path",{description:"Set the yarnPath setting even if the version can be accessed by Corepack"});this.onlyIfNeeded=ge.Boolean("--only-if-needed",!1,{description:"Only lock the Yarn version if it isn't already locked"});this.version=ge.String()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins);if(this.onlyIfNeeded&&r.get("yarnPath")){let A=r.sources.get("yarnPath");if(!A)throw new Error("Assertion failed: Expected 'yarnPath' to have a source");let p=r.projectCwd??r.startingCwd;if(V.contains(p,A))return 0}let o=()=>{if(typeof rn>"u")throw new it("The --install flag can only be used without explicit version specifier from the Yarn CLI");return`file://${process.argv[1]}`},a,n=(A,p)=>({version:p,url:A.replace(/\{\}/g,p)});if(this.version==="self")a={url:o(),version:rn??"self"};else if(this.version==="latest"||this.version==="berry"||this.version==="stable")a=n("https://repo.yarnpkg.com/{}/packages/yarnpkg-cli/bin/yarn.js",await y2(r,"stable"));else if(this.version==="canary")a=n("https://repo.yarnpkg.com/{}/packages/yarnpkg-cli/bin/yarn.js",await y2(r,"canary"));else if(this.version==="classic")a={url:"https://classic.yarnpkg.com/latest.js",version:"classic"};else if(this.version.match(/^https?:/))a={url:this.version,version:"remote"};else if(this.version.match(/^\.{0,2}[\\/]/)||ue.isAbsolute(this.version))a={url:`file://${V.resolve(ue.toPortablePath(this.version))}`,version:"file"};else if(kr.satisfiesWithPrereleases(this.version,">=2.0.0"))a=n("https://repo.yarnpkg.com/{}/packages/yarnpkg-cli/bin/yarn.js",this.version);else if(kr.satisfiesWithPrereleases(this.version,"^0.x || ^1.x"))a=n("https://github.com/yarnpkg/yarn/releases/download/v{}/yarn-{}.js",this.version);else if(kr.validRange(this.version))a=n("https://repo.yarnpkg.com/{}/packages/yarnpkg-cli/bin/yarn.js",await H0t(r,this.version));else throw new it(`Invalid version descriptor "${this.version}"`);return(await Nt.start({configuration:r,stdout:this.context.stdout,includeLogs:!this.context.quiet},async A=>{let p=async()=>{let h="file://";return a.url.startsWith(h)?(A.reportInfo(0,`Retrieving ${de.pretty(r,a.url,de.Type.PATH)}`),await oe.readFilePromise(a.url.slice(h.length))):(A.reportInfo(0,`Downloading ${de.pretty(r,a.url,de.Type.URL)}`),await nn.get(a.url,{configuration:r}))};await L8(r,a.version,p,{report:A,useYarnPath:this.useYarnPath})})).exitCode()}};_h.paths=[["set","version"]],_h.usage=nt.Usage({description:"lock the Yarn version used by the project",details:"\n      This command will set a specific release of Yarn to be used by Corepack: https://nodejs.org/api/corepack.html.\n\n      By default it only will set the `packageManager` field at the root of your project, but if the referenced release cannot be represented this way, if you already have `yarnPath` configured, or if you set the `--yarn-path` command line flag, then the release will also be downloaded from the Yarn GitHub repository, stored inside your project, and referenced via the `yarnPath` settings from your project `.yarnrc.yml` file.\n\n      A very good use case for this command is to enforce the version of Yarn used by any single member of your team inside the same project - by doing this you ensure that you have control over Yarn upgrades and downgrades (including on your deployment servers), and get rid of most of the headaches related to someone using a slightly different version and getting different behavior.\n\n      The version specifier can be:\n\n      - a tag:\n        - `latest` / `berry` / `stable` -> the most recent stable berry (`>=2.0.0`) release\n        - `canary` -> the most recent canary (release candidate) berry (`>=2.0.0`) release\n        - `classic` -> the most recent classic (`^0.x || ^1.x`) release\n\n      - a semver range (e.g. `2.x`) -> the most recent version satisfying the range (limited to berry releases)\n\n      - a semver version (e.g. `2.4.1`, `1.22.1`)\n\n      - a local file referenced through either a relative or absolute path\n\n      - `self` -> the version used to invoke the command\n    ",examples:[["Download the latest release from the Yarn repository","$0 set version latest"],["Download the latest canary release from the Yarn repository","$0 set version canary"],["Download the latest classic release from the Yarn repository","$0 set version classic"],["Download the most recent Yarn 3 build","$0 set version 3.x"],["Download a specific Yarn 2 build","$0 set version 2.0.0-rc.30"],["Switch back to a specific Yarn 1 release","$0 set version 1.22.1"],["Use a release from the local filesystem","$0 set version ./yarn.cjs"],["Use a release from a URL","$0 set version https://repo.yarnpkg.com/3.1.0/packages/yarnpkg-cli/bin/yarn.js"],["Download the version used to invoke the command","$0 set version self"]]});async function H0t(t,e){let o=(await nn.get("https://repo.yarnpkg.com/tags",{configuration:t,jsonResponse:!0})).tags.filter(a=>kr.satisfiesWithPrereleases(a,e));if(o.length===0)throw new it(`No matching release found for range ${de.pretty(t,e,de.Type.RANGE)}.`);return o[0]}async function y2(t,e){let r=await nn.get("https://repo.yarnpkg.com/tags",{configuration:t,jsonResponse:!0});if(!r.latest[e])throw new it(`Tag ${de.pretty(t,e,de.Type.RANGE)} not found`);return r.latest[e]}async function L8(t,e,r,{report:o,useYarnPath:a}){let n,u=async()=>(typeof n>"u"&&(n=await r()),n);if(e===null){let te=await u();await oe.mktempPromise(async ae=>{let fe=V.join(ae,"yarn.cjs");await oe.writeFilePromise(fe,te);let{stdout:ce}=await Ur.execvp(process.execPath,[ue.fromPortablePath(fe),"--version"],{cwd:ae,env:{...t.env,YARN_IGNORE_PATH:"1"}});if(e=ce.trim(),!zge.default.valid(e))throw new Error(`Invalid semver version. ${de.pretty(t,"yarn --version",de.Type.CODE)} returned:
+${e}`)})}let A=t.projectCwd??t.startingCwd,p=V.resolve(A,".yarn/releases"),h=V.resolve(p,`yarn-${e}.cjs`),E=V.relative(t.startingCwd,h),I=_e.isTaggedYarnVersion(e),v=t.get("yarnPath"),x=!I,C=x||!!v||!!a;if(a===!1){if(x)throw new zt(0,"You explicitly opted out of yarnPath usage in your command line, but the version you specified cannot be represented by Corepack");C=!1}else!C&&!process.env.COREPACK_ROOT&&(o.reportWarning(0,`You don't seem to have ${de.applyHyperlink(t,"Corepack","https://nodejs.org/api/corepack.html")} enabled; we'll have to rely on ${de.applyHyperlink(t,"yarnPath","https://yarnpkg.com/configuration/yarnrc#yarnPath")} instead`),C=!0);if(C){let te=await u();o.reportInfo(0,`Saving the new release in ${de.pretty(t,E,"magenta")}`),await oe.removePromise(V.dirname(h)),await oe.mkdirPromise(V.dirname(h),{recursive:!0}),await oe.writeFilePromise(h,te,{mode:493}),await Ke.updateConfiguration(A,{yarnPath:V.relative(A,h)})}else await oe.removePromise(V.dirname(h)),await Ke.updateConfiguration(A,{yarnPath:Ke.deleteProperty});let R=await Ot.tryFind(A)||new Ot;R.packageManager=`yarn@${I?e:await y2(t,"stable")}`;let L={};R.exportTo(L);let U=V.join(A,Ot.fileName),J=`${JSON.stringify(L,null,R.indent)}
+`;return await oe.changeFilePromise(U,J,{automaticNewlines:!0}),{bundleVersion:e}}function Xge(t){return wr[AS(t)]}var j0t=/## (?<code>YN[0-9]{4}) - `(?<name>[A-Z_]+)`\n\n(?<details>(?:.(?!##))+)/gs;async function G0t(t){let r=`https://repo.yarnpkg.com/${_e.isTaggedYarnVersion(rn)?rn:await y2(t,"canary")}/packages/gatsby/content/advanced/error-codes.md`,o=await nn.get(r,{configuration:t});return new Map(Array.from(o.toString().matchAll(j0t),({groups:a})=>{if(!a)throw new Error("Assertion failed: Expected the match to have been successful");let n=Xge(a.code);if(a.name!==n)throw new Error(`Assertion failed: Invalid error code data: Expected "${a.name}" to be named "${n}"`);return[a.code,a.details]}))}var Hh=class extends ut{constructor(){super(...arguments);this.code=ge.String({required:!1,validator:aI(Cy(),[oI(/^YN[0-9]{4}$/)])});this.json=ge.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"})}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins);if(typeof this.code<"u"){let o=Xge(this.code),a=de.pretty(r,o,de.Type.CODE),n=this.cli.format().header(`${this.code} - ${a}`),A=(await G0t(r)).get(this.code),p=typeof A<"u"?de.jsonOrPretty(this.json,r,de.tuple(de.Type.MARKDOWN,{text:A,format:this.cli.format(),paragraphs:!0})):`This error code does not have a description.
+
+You can help us by editing this page on GitHub \u{1F642}:
+${de.jsonOrPretty(this.json,r,de.tuple(de.Type.URL,"https://github.com/yarnpkg/berry/blob/master/packages/gatsby/content/advanced/error-codes.md"))}
+`;this.json?this.context.stdout.write(`${JSON.stringify({code:this.code,name:o,details:p})}
+`):this.context.stdout.write(`${n}
+
+${p}
+`)}else{let o={children:_e.mapAndFilter(Object.entries(wr),([a,n])=>Number.isNaN(Number(a))?_e.mapAndFilter.skip:{label:Wu(Number(a)),value:de.tuple(de.Type.CODE,n)})};$s.emitTree(o,{configuration:r,stdout:this.context.stdout,json:this.json})}}};Hh.paths=[["explain"]],Hh.usage=nt.Usage({description:"explain an error code",details:`
+      When the code argument is specified, this command prints its name and its details.
+
+      When used without arguments, this command lists all error codes and their names.
+    `,examples:[["Explain an error code","$0 explain YN0006"],["List all error codes","$0 explain"]]});Ye();St();jt();var Zge=$e(Zo()),jh=class extends ut{constructor(){super(...arguments);this.all=ge.Boolean("-A,--all",!1,{description:"Print versions of a package from the whole project"});this.recursive=ge.Boolean("-R,--recursive",!1,{description:"Print information for all packages, including transitive dependencies"});this.extra=ge.Array("-X,--extra",[],{description:"An array of requests of extra data provided by plugins"});this.cache=ge.Boolean("--cache",!1,{description:"Print information about the cache entry of a package (path, size, checksum)"});this.dependents=ge.Boolean("--dependents",!1,{description:"Print all dependents for each matching package"});this.manifest=ge.Boolean("--manifest",!1,{description:"Print data obtained by looking at the package archive (license, homepage, ...)"});this.nameOnly=ge.Boolean("--name-only",!1,{description:"Only print the name for the matching packages"});this.virtuals=ge.Boolean("--virtuals",!1,{description:"Print each instance of the virtual packages"});this.json=ge.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.patterns=ge.Rest()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd),n=await Lr.find(r);if(!a&&!this.all)throw new rr(o.cwd,this.context.cwd);await o.restoreInstallState();let u=new Set(this.extra);this.cache&&u.add("cache"),this.dependents&&u.add("dependents"),this.manifest&&u.add("manifest");let A=(ae,{recursive:fe})=>{let ce=ae.anchoredLocator.locatorHash,me=new Map,he=[ce];for(;he.length>0;){let Be=he.shift();if(me.has(Be))continue;let we=o.storedPackages.get(Be);if(typeof we>"u")throw new Error("Assertion failed: Expected the package to be registered");if(me.set(Be,we),W.isVirtualLocator(we)&&he.push(W.devirtualizeLocator(we).locatorHash),!(!fe&&Be!==ce))for(let g of we.dependencies.values()){let Ee=o.storedResolutions.get(g.descriptorHash);if(typeof Ee>"u")throw new Error("Assertion failed: Expected the resolution to be registered");he.push(Ee)}}return me.values()},p=({recursive:ae})=>{let fe=new Map;for(let ce of o.workspaces)for(let me of A(ce,{recursive:ae}))fe.set(me.locatorHash,me);return fe.values()},h=({all:ae,recursive:fe})=>ae&&fe?o.storedPackages.values():ae?p({recursive:fe}):A(a,{recursive:fe}),E=({all:ae,recursive:fe})=>{let ce=h({all:ae,recursive:fe}),me=this.patterns.map(we=>{let g=W.parseLocator(we),Ee=Zge.default.makeRe(W.stringifyIdent(g)),Se=W.isVirtualLocator(g),le=Se?W.devirtualizeLocator(g):g;return ne=>{let ee=W.stringifyIdent(ne);if(!Ee.test(ee))return!1;if(g.reference==="unknown")return!0;let Ie=W.isVirtualLocator(ne),Fe=Ie?W.devirtualizeLocator(ne):ne;return!(Se&&Ie&&g.reference!==ne.reference||le.reference!==Fe.reference)}}),he=_e.sortMap([...ce],we=>W.stringifyLocator(we));return{selection:he.filter(we=>me.length===0||me.some(g=>g(we))),sortedLookup:he}},{selection:I,sortedLookup:v}=E({all:this.all,recursive:this.recursive});if(I.length===0)throw new it("No package matched your request");let x=new Map;if(this.dependents)for(let ae of v)for(let fe of ae.dependencies.values()){let ce=o.storedResolutions.get(fe.descriptorHash);if(typeof ce>"u")throw new Error("Assertion failed: Expected the resolution to be registered");_e.getArrayWithDefault(x,ce).push(ae)}let C=new Map;for(let ae of v){if(!W.isVirtualLocator(ae))continue;let fe=W.devirtualizeLocator(ae);_e.getArrayWithDefault(C,fe.locatorHash).push(ae)}let R={},L={children:R},U=r.makeFetcher(),J={project:o,fetcher:U,cache:n,checksums:o.storedChecksums,report:new Qi,cacheOptions:{skipIntegrityCheck:!0}},te=[async(ae,fe,ce)=>{if(!fe.has("manifest"))return;let me=await U.fetch(ae,J),he;try{he=await Ot.find(me.prefixPath,{baseFs:me.packageFs})}finally{me.releaseFs?.()}ce("Manifest",{License:de.tuple(de.Type.NO_HINT,he.license),Homepage:de.tuple(de.Type.URL,he.raw.homepage??null)})},async(ae,fe,ce)=>{if(!fe.has("cache"))return;let me=o.storedChecksums.get(ae.locatorHash)??null,he=n.getLocatorPath(ae,me),Be;if(he!==null)try{Be=await oe.statPromise(he)}catch{}let we=typeof Be<"u"?[Be.size,de.Type.SIZE]:void 0;ce("Cache",{Checksum:de.tuple(de.Type.NO_HINT,me),Path:de.tuple(de.Type.PATH,he),Size:we})}];for(let ae of I){let fe=W.isVirtualLocator(ae);if(!this.virtuals&&fe)continue;let ce={},me={value:[ae,de.Type.LOCATOR],children:ce};if(R[W.stringifyLocator(ae)]=me,this.nameOnly){delete me.children;continue}let he=C.get(ae.locatorHash);typeof he<"u"&&(ce.Instances={label:"Instances",value:de.tuple(de.Type.NUMBER,he.length)}),ce.Version={label:"Version",value:de.tuple(de.Type.NO_HINT,ae.version)};let Be=(g,Ee)=>{let Se={};if(ce[g]=Se,Array.isArray(Ee))Se.children=Ee.map(le=>({value:le}));else{let le={};Se.children=le;for(let[ne,ee]of Object.entries(Ee))typeof ee>"u"||(le[ne]={label:ne,value:ee})}};if(!fe){for(let g of te)await g(ae,u,Be);await r.triggerHook(g=>g.fetchPackageInfo,ae,u,Be)}ae.bin.size>0&&!fe&&Be("Exported Binaries",[...ae.bin.keys()].map(g=>de.tuple(de.Type.PATH,g)));let we=x.get(ae.locatorHash);typeof we<"u"&&we.length>0&&Be("Dependents",we.map(g=>de.tuple(de.Type.LOCATOR,g))),ae.dependencies.size>0&&!fe&&Be("Dependencies",[...ae.dependencies.values()].map(g=>{let Ee=o.storedResolutions.get(g.descriptorHash),Se=typeof Ee<"u"?o.storedPackages.get(Ee)??null:null;return de.tuple(de.Type.RESOLUTION,{descriptor:g,locator:Se})})),ae.peerDependencies.size>0&&fe&&Be("Peer dependencies",[...ae.peerDependencies.values()].map(g=>{let Ee=ae.dependencies.get(g.identHash),Se=typeof Ee<"u"?o.storedResolutions.get(Ee.descriptorHash)??null:null,le=Se!==null?o.storedPackages.get(Se)??null:null;return de.tuple(de.Type.RESOLUTION,{descriptor:g,locator:le})}))}$s.emitTree(L,{configuration:r,json:this.json,stdout:this.context.stdout,separators:this.nameOnly?0:2})}};jh.paths=[["info"]],jh.usage=nt.Usage({description:"see information related to packages",details:"\n      This command prints various information related to the specified packages, accepting glob patterns.\n\n      By default, if the locator reference is missing, Yarn will default to print the information about all the matching direct dependencies of the package for the active workspace. To instead print all versions of the package that are direct dependencies of any of your workspaces, use the `-A,--all` flag. Adding the `-R,--recursive` flag will also report transitive dependencies.\n\n      Some fields will be hidden by default in order to keep the output readable, but can be selectively displayed by using additional options (`--dependents`, `--manifest`, `--virtuals`, ...) described in the option descriptions.\n\n      Note that this command will only print the information directly related to the selected packages - if you wish to know why the package is there in the first place, use `yarn why` which will do just that (it also provides a `-R,--recursive` flag that may be of some help).\n    ",examples:[["Show information about Lodash","$0 info lodash"]]});Ye();St();Nl();var hk=$e(td());jt();var O8=$e(zn());Za();var q0t=[{selector:t=>t===-1,name:"nodeLinker",value:"node-modules"},{selector:t=>t!==-1&&t<8,name:"enableGlobalCache",value:!1},{selector:t=>t!==-1&&t<8,name:"compressionLevel",value:"mixed"}],Gh=class extends ut{constructor(){super(...arguments);this.json=ge.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.immutable=ge.Boolean("--immutable",{description:"Abort with an error exit code if the lockfile was to be modified"});this.immutableCache=ge.Boolean("--immutable-cache",{description:"Abort with an error exit code if the cache folder was to be modified"});this.refreshLockfile=ge.Boolean("--refresh-lockfile",{description:"Refresh the package metadata stored in the lockfile"});this.checkCache=ge.Boolean("--check-cache",{description:"Always refetch the packages and ensure that their checksums are consistent"});this.checkResolutions=ge.Boolean("--check-resolutions",{description:"Validates that the package resolutions are coherent"});this.inlineBuilds=ge.Boolean("--inline-builds",{description:"Verbosely print the output of the build steps of dependencies"});this.mode=ge.String("--mode",{description:"Change what artifacts installs generate",validator:Ks(pl)});this.cacheFolder=ge.String("--cache-folder",{hidden:!0});this.frozenLockfile=ge.Boolean("--frozen-lockfile",{hidden:!0});this.ignoreEngines=ge.Boolean("--ignore-engines",{hidden:!0});this.nonInteractive=ge.Boolean("--non-interactive",{hidden:!0});this.preferOffline=ge.Boolean("--prefer-offline",{hidden:!0});this.production=ge.Boolean("--production",{hidden:!0});this.registry=ge.String("--registry",{hidden:!0});this.silent=ge.Boolean("--silent",{hidden:!0});this.networkTimeout=ge.String("--network-timeout",{hidden:!0})}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins);typeof this.inlineBuilds<"u"&&r.useWithSource("<cli>",{enableInlineBuilds:this.inlineBuilds},r.startingCwd,{overwrite:!0});let o=!!process.env.FUNCTION_TARGET||!!process.env.GOOGLE_RUNTIME,a=await LE({configuration:r,stdout:this.context.stdout},[{option:this.ignoreEngines,message:"The --ignore-engines option is deprecated; engine checking isn't a core feature anymore",error:!hk.default.VERCEL},{option:this.registry,message:"The --registry option is deprecated; prefer setting npmRegistryServer in your .yarnrc.yml file"},{option:this.preferOffline,message:"The --prefer-offline flag is deprecated; use the --cached flag with 'yarn add' instead",error:!hk.default.VERCEL},{option:this.production,message:"The --production option is deprecated on 'install'; use 'yarn workspaces focus' instead",error:!0},{option:this.nonInteractive,message:"The --non-interactive option is deprecated",error:!o},{option:this.frozenLockfile,message:"The --frozen-lockfile option is deprecated; use --immutable and/or --immutable-cache instead",callback:()=>this.immutable=this.frozenLockfile},{option:this.cacheFolder,message:"The cache-folder option has been deprecated; use rc settings instead",error:!hk.default.NETLIFY}]);if(a!==null)return a;let n=this.mode==="update-lockfile";if(n&&(this.immutable||this.immutableCache))throw new it(`${de.pretty(r,"--immutable",de.Type.CODE)} and ${de.pretty(r,"--immutable-cache",de.Type.CODE)} cannot be used with ${de.pretty(r,"--mode=update-lockfile",de.Type.CODE)}`);let u=(this.immutable??r.get("enableImmutableInstalls"))&&!n,A=this.immutableCache&&!n;if(r.projectCwd!==null){let R=await Nt.start({configuration:r,json:this.json,stdout:this.context.stdout,includeFooter:!1},async L=>{let U=!1;await K0t(r,u)&&(L.reportInfo(48,"Automatically removed core plugins that are now builtins \u{1F44D}"),U=!0),await W0t(r,u)&&(L.reportInfo(48,"Automatically fixed merge conflicts \u{1F44D}"),U=!0),U&&L.reportSeparator()});if(R.hasErrors())return R.exitCode()}if(r.projectCwd!==null){let R=await Nt.start({configuration:r,json:this.json,stdout:this.context.stdout,includeFooter:!1},async L=>{if(Ke.telemetry?.isNew)Ke.telemetry.commitTips(),L.reportInfo(65,"Yarn will periodically gather anonymous telemetry: https://yarnpkg.com/advanced/telemetry"),L.reportInfo(65,`Run ${de.pretty(r,"yarn config set --home enableTelemetry 0",de.Type.CODE)} to disable`),L.reportSeparator();else if(Ke.telemetry?.shouldShowTips){let U=await nn.get("https://repo.yarnpkg.com/tags",{configuration:r,jsonResponse:!0}).catch(()=>null);if(U!==null){let J=null;if(rn!==null){let ae=O8.default.prerelease(rn)?"canary":"stable",fe=U.latest[ae];O8.default.gt(fe,rn)&&(J=[ae,fe])}if(J)Ke.telemetry.commitTips(),L.reportInfo(88,`${de.applyStyle(r,`A new ${J[0]} version of Yarn is available:`,de.Style.BOLD)} ${W.prettyReference(r,J[1])}!`),L.reportInfo(88,`Upgrade now by running ${de.pretty(r,`yarn set version ${J[1]}`,de.Type.CODE)}`),L.reportSeparator();else{let te=Ke.telemetry.selectTip(U.tips);te&&(L.reportInfo(89,de.pretty(r,te.message,de.Type.MARKDOWN_INLINE)),te.url&&L.reportInfo(89,`Learn more at ${te.url}`),L.reportSeparator())}}}});if(R.hasErrors())return R.exitCode()}let{project:p,workspace:h}=await Pt.find(r,this.context.cwd),E=p.lockfileLastVersion;if(E!==null){let R=await Nt.start({configuration:r,json:this.json,stdout:this.context.stdout,includeFooter:!1},async L=>{let U={};for(let J of q0t)J.selector(E)&&typeof r.sources.get(J.name)>"u"&&(r.use("<compat>",{[J.name]:J.value},p.cwd,{overwrite:!0}),U[J.name]=J.value);Object.keys(U).length>0&&(await Ke.updateConfiguration(p.cwd,U),L.reportInfo(87,"Migrated your project to the latest Yarn version \u{1F680}"),L.reportSeparator())});if(R.hasErrors())return R.exitCode()}let I=await Lr.find(r,{immutable:A,check:this.checkCache});if(!h)throw new rr(p.cwd,this.context.cwd);await p.restoreInstallState({restoreResolutions:!1});let v=r.get("enableHardenedMode");v&&typeof r.sources.get("enableHardenedMode")>"u"&&await Nt.start({configuration:r,json:this.json,stdout:this.context.stdout,includeFooter:!1},async R=>{R.reportWarning(0,"Yarn detected that the current workflow is executed from a public pull request. For safety the hardened mode has been enabled."),R.reportWarning(0,`It will prevent malicious lockfile manipulations, in exchange for a slower install time. You can opt-out if necessary; check our ${de.applyHyperlink(r,"documentation","https://yarnpkg.com/features/security#hardened-mode")} for more details.`),R.reportSeparator()}),(this.refreshLockfile??v)&&(p.lockfileNeedsRefresh=!0);let x=this.checkResolutions??v;return(await Nt.start({configuration:r,json:this.json,stdout:this.context.stdout,forceSectionAlignment:!0,includeLogs:!0,includeVersion:!0},async R=>{await p.install({cache:I,report:R,immutable:u,checkResolutions:x,mode:this.mode})})).exitCode()}};Gh.paths=[["install"],nt.Default],Gh.usage=nt.Usage({description:"install the project dependencies",details:"\n      This command sets up your project if needed. The installation is split into four different steps that each have their own characteristics:\n\n      - **Resolution:** First the package manager will resolve your dependencies. The exact way a dependency version is privileged over another isn't standardized outside of the regular semver guarantees. If a package doesn't resolve to what you would expect, check that all dependencies are correctly declared (also check our website for more information: ).\n\n      - **Fetch:** Then we download all the dependencies if needed, and make sure that they're all stored within our cache (check the value of `cacheFolder` in `yarn config` to see where the cache files are stored).\n\n      - **Link:** Then we send the dependency tree information to internal plugins tasked with writing them on the disk in some form (for example by generating the .pnp.cjs file you might know).\n\n      - **Build:** Once the dependency tree has been written on the disk, the package manager will now be free to run the build scripts for all packages that might need it, in a topological order compatible with the way they depend on one another. See https://yarnpkg.com/advanced/lifecycle-scripts for detail.\n\n      Note that running this command is not part of the recommended workflow. Yarn supports zero-installs, which means that as long as you store your cache and your .pnp.cjs file inside your repository, everything will work without requiring any install right after cloning your repository or switching branches.\n\n      If the `--immutable` option is set (defaults to true on CI), Yarn will abort with an error exit code if the lockfile was to be modified (other paths can be added using the `immutablePatterns` configuration setting). For backward compatibility we offer an alias under the name of `--frozen-lockfile`, but it will be removed in a later release.\n\n      If the `--immutable-cache` option is set, Yarn will abort with an error exit code if the cache folder was to be modified (either because files would be added, or because they'd be removed).\n\n      If the `--refresh-lockfile` option is set, Yarn will keep the same resolution for the packages currently in the lockfile but will refresh their metadata. If used together with `--immutable`, it can validate that the lockfile information are consistent. This flag is enabled by default when Yarn detects it runs within a pull request context.\n\n      If the `--check-cache` option is set, Yarn will always refetch the packages and will ensure that their checksum matches what's 1/ described in the lockfile 2/ inside the existing cache files (if present). This is recommended as part of your CI workflow if you're both following the Zero-Installs model and accepting PRs from third-parties, as they'd otherwise have the ability to alter the checked-in packages before submitting them.\n\n      If the `--inline-builds` option is set, Yarn will verbosely print the output of the build steps of your dependencies (instead of writing them into individual files). This is likely useful mostly for debug purposes only when using Docker-like environments.\n\n      If the `--mode=<mode>` option is set, Yarn will change which artifacts are generated. The modes currently supported are:\n\n      - `skip-build` will not run the build scripts at all. Note that this is different from setting `enableScripts` to false because the latter will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run.\n\n      - `update-lockfile` will skip the link step altogether, and only fetch packages that are missing from the lockfile (or that have no associated checksums). This mode is typically used by tools like Renovate or Dependabot to keep a lockfile up-to-date without incurring the full install cost.\n    ",examples:[["Install the project","$0 install"],["Validate a project when using Zero-Installs","$0 install --immutable --immutable-cache"],["Validate a project when using Zero-Installs (slightly safer if you accept external PRs)","$0 install --immutable --immutable-cache --check-cache"]]});var Y0t="<<<<<<<";async function W0t(t,e){if(!t.projectCwd)return!1;let r=V.join(t.projectCwd,dr.lockfile);if(!await oe.existsPromise(r)||!(await oe.readFilePromise(r,"utf8")).includes(Y0t))return!1;if(e)throw new zt(47,"Cannot autofix a lockfile when running an immutable install");let a=await Ur.execvp("git",["rev-parse","MERGE_HEAD","HEAD"],{cwd:t.projectCwd});if(a.code!==0&&(a=await Ur.execvp("git",["rev-parse","REBASE_HEAD","HEAD"],{cwd:t.projectCwd})),a.code!==0&&(a=await Ur.execvp("git",["rev-parse","CHERRY_PICK_HEAD","HEAD"],{cwd:t.projectCwd})),a.code!==0)throw new zt(83,"Git returned an error when trying to find the commits pertaining to the conflict");let n=await Promise.all(a.stdout.trim().split(/\n/).map(async A=>{let p=await Ur.execvp("git",["show",`${A}:./${dr.lockfile}`],{cwd:t.projectCwd});if(p.code!==0)throw new zt(83,`Git returned an error when trying to access the lockfile content in ${A}`);try{return Ki(p.stdout)}catch{throw new zt(46,"A variant of the conflicting lockfile failed to parse")}}));n=n.filter(A=>!!A.__metadata);for(let A of n){if(A.__metadata.version<7)for(let p of Object.keys(A)){if(p==="__metadata")continue;let h=W.parseDescriptor(p,!0),E=t.normalizeDependency(h),I=W.stringifyDescriptor(E);I!==p&&(A[I]=A[p],delete A[p])}for(let p of Object.keys(A)){if(p==="__metadata")continue;let h=A[p].checksum;typeof h=="string"&&h.includes("/")||(A[p].checksum=`${A.__metadata.cacheKey}/${h}`)}}let u=Object.assign({},...n);u.__metadata.version=`${Math.min(...n.map(A=>parseInt(A.__metadata.version??0)))}`,u.__metadata.cacheKey="merged";for(let[A,p]of Object.entries(u))typeof p=="string"&&delete u[A];return await oe.changeFilePromise(r,Ba(u),{automaticNewlines:!0}),!0}async function K0t(t,e){if(!t.projectCwd)return!1;let r=[],o=V.join(t.projectCwd,".yarn/plugins/@yarnpkg");return await Ke.updateConfiguration(t.projectCwd,{plugins:n=>{if(!Array.isArray(n))return n;let u=n.filter(A=>{if(!A.path)return!0;let p=V.resolve(t.projectCwd,A.path),h=v1.has(A.spec)&&V.contains(o,p);return h&&r.push(p),!h});return u.length===0?Ke.deleteProperty:u.length===n.length?n:u}},{immutable:e})?(await Promise.all(r.map(async n=>{await oe.removePromise(n)})),!0):!1}Ye();St();jt();var qh=class extends ut{constructor(){super(...arguments);this.all=ge.Boolean("-A,--all",!1,{description:"Link all workspaces belonging to the target projects to the current one"});this.private=ge.Boolean("-p,--private",!1,{description:"Also link private workspaces belonging to the target projects to the current one"});this.relative=ge.Boolean("-r,--relative",!1,{description:"Link workspaces using relative paths instead of absolute paths"});this.destinations=ge.Rest()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd),n=await Lr.find(r);if(!a)throw new rr(o.cwd,this.context.cwd);await o.restoreInstallState({restoreResolutions:!1});let u=o.topLevelWorkspace,A=[];for(let p of this.destinations){let h=V.resolve(this.context.cwd,ue.toPortablePath(p)),E=await Ke.find(h,this.context.plugins,{useRc:!1,strict:!1}),{project:I,workspace:v}=await Pt.find(E,h);if(o.cwd===I.cwd)throw new it(`Invalid destination '${p}'; Can't link the project to itself`);if(!v)throw new rr(I.cwd,h);if(this.all){let x=!1;for(let C of I.workspaces)C.manifest.name&&(!C.manifest.private||this.private)&&(A.push(C),x=!0);if(!x)throw new it(`No workspace found to be linked in the target project: ${p}`)}else{if(!v.manifest.name)throw new it(`The target workspace at '${p}' doesn't have a name and thus cannot be linked`);if(v.manifest.private&&!this.private)throw new it(`The target workspace at '${p}' is marked private - use the --private flag to link it anyway`);A.push(v)}}for(let p of A){let h=W.stringifyIdent(p.anchoredLocator),E=this.relative?V.relative(o.cwd,p.cwd):p.cwd;u.manifest.resolutions.push({pattern:{descriptor:{fullName:h}},reference:`portal:${E}`})}return await o.installWithNewReport({stdout:this.context.stdout},{cache:n})}};qh.paths=[["link"]],qh.usage=nt.Usage({description:"connect the local project to another one",details:"\n      This command will set a new `resolutions` field in the project-level manifest and point it to the workspace at the specified location (even if part of another project).\n    ",examples:[["Register one or more remote workspaces for use in the current project","$0 link ~/ts-loader ~/jest"],["Register all workspaces from a remote project for use in the current project","$0 link ~/jest --all"]]});jt();var Yh=class extends ut{constructor(){super(...arguments);this.args=ge.Proxy()}async execute(){return this.cli.run(["exec","node",...this.args])}};Yh.paths=[["node"]],Yh.usage=nt.Usage({description:"run node with the hook already setup",details:`
+      This command simply runs Node. It also makes sure to call it in a way that's compatible with the current project (for example, on PnP projects the environment will be setup in such a way that PnP will be correctly injected into the environment).
+
+      The Node process will use the exact same version of Node as the one used to run Yarn itself, which might be a good way to ensure that your commands always use a consistent Node version.
+    `,examples:[["Run a Node script","$0 node ./my-script.js"]]});Ye();jt();var Wh=class extends ut{constructor(){super(...arguments);this.json=ge.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"})}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),o=await Ke.findRcFiles(this.context.cwd);return(await Nt.start({configuration:r,json:this.json,stdout:this.context.stdout},async n=>{for(let u of o)if(!!u.data?.plugins)for(let A of u.data.plugins){if(!A.checksum||!A.spec.match(/^https?:/))continue;let p=await nn.get(A.spec,{configuration:r}),h=wn.makeHash(p);if(A.checksum===h)continue;let E=de.pretty(r,A.path,de.Type.PATH),I=de.pretty(r,A.spec,de.Type.URL),v=`${E} is different from the file provided by ${I}`;n.reportJson({...A,newChecksum:h}),n.reportError(0,v)}})).exitCode()}};Wh.paths=[["plugin","check"]],Wh.usage=nt.Usage({category:"Plugin-related commands",description:"find all third-party plugins that differ from their own spec",details:`
+      Check only the plugins from https.
+
+      If this command detects any plugin differences in the CI environment, it will throw an error.
+    `,examples:[["find all third-party plugins that differ from their own spec","$0 plugin check"]]});Ye();Ye();St();jt();var nde=ve("os");Ye();St();jt();var $ge=ve("os");Ye();Nl();jt();var V0t="https://raw.githubusercontent.com/yarnpkg/berry/master/plugins.yml";async function zd(t,e){let r=await nn.get(V0t,{configuration:t}),o=Ki(r.toString());return Object.fromEntries(Object.entries(o).filter(([a,n])=>!e||kr.satisfiesWithPrereleases(e,n.range??"<4.0.0-rc.1")))}var Kh=class extends ut{constructor(){super(...arguments);this.json=ge.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"})}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins);return(await Nt.start({configuration:r,json:this.json,stdout:this.context.stdout},async a=>{let n=await zd(r,rn);for(let[u,{experimental:A,...p}]of Object.entries(n)){let h=u;A&&(h+=" [experimental]"),a.reportJson({name:u,experimental:A,...p}),a.reportInfo(null,h)}})).exitCode()}};Kh.paths=[["plugin","list"]],Kh.usage=nt.Usage({category:"Plugin-related commands",description:"list the available official plugins",details:"\n      This command prints the plugins available directly from the Yarn repository. Only those plugins can be referenced by name in `yarn plugin import`.\n    ",examples:[["List the official plugins","$0 plugin list"]]});var J0t=/^[0-9]+$/,z0t=process.platform==="win32";function ede(t){return J0t.test(t)?`pull/${t}/head`:t}var X0t=({repository:t,branch:e},r)=>[["git","init",ue.fromPortablePath(r)],["git","remote","add","origin",t],["git","fetch","origin","--depth=1",ede(e)],["git","reset","--hard","FETCH_HEAD"]],Z0t=({branch:t})=>[["git","fetch","origin","--depth=1",ede(t),"--force"],["git","reset","--hard","FETCH_HEAD"],["git","clean","-dfx","-e","packages/yarnpkg-cli/bundles"]],$0t=({plugins:t,noMinify:e},r,o)=>[["yarn","build:cli",...new Array().concat(...t.map(a=>["--plugin",V.resolve(o,a)])),...e?["--no-minify"]:[],"|"],[z0t?"move":"mv","packages/yarnpkg-cli/bundles/yarn.js",ue.fromPortablePath(r),"|"]],Vh=class extends ut{constructor(){super(...arguments);this.installPath=ge.String("--path",{description:"The path where the repository should be cloned to"});this.repository=ge.String("--repository","https://github.com/yarnpkg/berry.git",{description:"The repository that should be cloned"});this.branch=ge.String("--branch","master",{description:"The branch of the repository that should be cloned"});this.plugins=ge.Array("--plugin",[],{description:"An array of additional plugins that should be included in the bundle"});this.dryRun=ge.Boolean("-n,--dry-run",!1,{description:"If set, the bundle will be built but not added to the project"});this.noMinify=ge.Boolean("--no-minify",!1,{description:"Build a bundle for development (debugging) - non-minified and non-mangled"});this.force=ge.Boolean("-f,--force",!1,{description:"Always clone the repository instead of trying to fetch the latest commits"});this.skipPlugins=ge.Boolean("--skip-plugins",!1,{description:"Skip updating the contrib plugins"})}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o}=await Pt.find(r,this.context.cwd),a=typeof this.installPath<"u"?V.resolve(this.context.cwd,ue.toPortablePath(this.installPath)):V.resolve(ue.toPortablePath((0,$ge.tmpdir)()),"yarnpkg-sources",wn.makeHash(this.repository).slice(0,6));return(await Nt.start({configuration:r,stdout:this.context.stdout},async u=>{await M8(this,{configuration:r,report:u,target:a}),u.reportSeparator(),u.reportInfo(0,"Building a fresh bundle"),u.reportSeparator();let A=await Ur.execvp("git",["rev-parse","--short","HEAD"],{cwd:a,strict:!0}),p=V.join(a,`packages/yarnpkg-cli/bundles/yarn-${A.stdout.trim()}.js`);oe.existsSync(p)||(await E2($0t(this,p,a),{configuration:r,context:this.context,target:a}),u.reportSeparator());let h=await oe.readFilePromise(p);if(!this.dryRun){let{bundleVersion:E}=await L8(r,null,async()=>h,{report:u});this.skipPlugins||await egt(this,E,{project:o,report:u,target:a})}})).exitCode()}};Vh.paths=[["set","version","from","sources"]],Vh.usage=nt.Usage({description:"build Yarn from master",details:`
+      This command will clone the Yarn repository into a temporary folder, then build it. The resulting bundle will then be copied into the local project.
+
+      By default, it also updates all contrib plugins to the same commit the bundle is built from. This behavior can be disabled by using the \`--skip-plugins\` flag.
+    `,examples:[["Build Yarn from master","$0 set version from sources"]]});async function E2(t,{configuration:e,context:r,target:o}){for(let[a,...n]of t){let u=n[n.length-1]==="|";if(u&&n.pop(),u)await Ur.pipevp(a,n,{cwd:o,stdin:r.stdin,stdout:r.stdout,stderr:r.stderr,strict:!0});else{r.stdout.write(`${de.pretty(e,`  $ ${[a,...n].join(" ")}`,"grey")}
+`);try{await Ur.execvp(a,n,{cwd:o,strict:!0})}catch(A){throw r.stdout.write(A.stdout||A.stack),A}}}}async function M8(t,{configuration:e,report:r,target:o}){let a=!1;if(!t.force&&oe.existsSync(V.join(o,".git"))){r.reportInfo(0,"Fetching the latest commits"),r.reportSeparator();try{await E2(Z0t(t),{configuration:e,context:t.context,target:o}),a=!0}catch{r.reportSeparator(),r.reportWarning(0,"Repository update failed; we'll try to regenerate it")}}a||(r.reportInfo(0,"Cloning the remote repository"),r.reportSeparator(),await oe.removePromise(o),await oe.mkdirPromise(o,{recursive:!0}),await E2(X0t(t,o),{configuration:e,context:t.context,target:o}))}async function egt(t,e,{project:r,report:o,target:a}){let n=await zd(r.configuration,e),u=new Set(Object.keys(n));for(let A of r.configuration.plugins.keys())!u.has(A)||await U8(A,t,{project:r,report:o,target:a})}Ye();Ye();St();jt();var tde=$e(zn()),rde=ve("vm");var Jh=class extends ut{constructor(){super(...arguments);this.name=ge.String();this.checksum=ge.Boolean("--checksum",!0,{description:"Whether to care if this plugin is modified"})}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins);return(await Nt.start({configuration:r,stdout:this.context.stdout},async a=>{let{project:n}=await Pt.find(r,this.context.cwd),u,A;if(this.name.match(/^\.{0,2}[\\/]/)||ue.isAbsolute(this.name)){let p=V.resolve(this.context.cwd,ue.toPortablePath(this.name));a.reportInfo(0,`Reading ${de.pretty(r,p,de.Type.PATH)}`),u=V.relative(n.cwd,p),A=await oe.readFilePromise(p)}else{let p;if(this.name.match(/^https?:/)){try{new URL(this.name)}catch{throw new zt(52,`Plugin specifier "${this.name}" is neither a plugin name nor a valid url`)}u=this.name,p=this.name}else{let h=W.parseLocator(this.name.replace(/^((@yarnpkg\/)?plugin-)?/,"@yarnpkg/plugin-"));if(h.reference!=="unknown"&&!tde.default.valid(h.reference))throw new zt(0,"Official plugins only accept strict version references. Use an explicit URL if you wish to download them from another location.");let E=W.stringifyIdent(h),I=await zd(r,rn);if(!Object.hasOwn(I,E)){let v=`Couldn't find a plugin named ${W.prettyIdent(r,h)} on the remote registry.
+`;throw r.plugins.has(E)?v+=`A plugin named ${W.prettyIdent(r,h)} is already installed; possibly attempting to import a built-in plugin.`:v+=`Note that only the plugins referenced on our website (${de.pretty(r,"https://github.com/yarnpkg/berry/blob/master/plugins.yml",de.Type.URL)}) can be referenced by their name; any other plugin will have to be referenced through its public url (for example ${de.pretty(r,"https://github.com/yarnpkg/berry/raw/master/packages/plugin-typescript/bin/%40yarnpkg/plugin-typescript.js",de.Type.URL)}).`,new zt(51,v)}u=E,p=I[E].url,h.reference!=="unknown"?p=p.replace(/\/master\//,`/${E}/${h.reference}/`):rn!==null&&(p=p.replace(/\/master\//,`/@yarnpkg/cli/${rn}/`))}a.reportInfo(0,`Downloading ${de.pretty(r,p,"green")}`),A=await nn.get(p,{configuration:r})}await _8(u,A,{checksum:this.checksum,project:n,report:a})})).exitCode()}};Jh.paths=[["plugin","import"]],Jh.usage=nt.Usage({category:"Plugin-related commands",description:"download a plugin",details:`
+      This command downloads the specified plugin from its remote location and updates the configuration to reference it in further CLI invocations.
+
+      Three types of plugin references are accepted:
+
+      - If the plugin is stored within the Yarn repository, it can be referenced by name.
+      - Third-party plugins can be referenced directly through their public urls.
+      - Local plugins can be referenced by their path on the disk.
+
+      If the \`--no-checksum\` option is set, Yarn will no longer care if the plugin is modified.
+
+      Plugins cannot be downloaded from the npm registry, and aren't allowed to have dependencies (they need to be bundled into a single file, possibly thanks to the \`@yarnpkg/builder\` package).
+    `,examples:[['Download and activate the "@yarnpkg/plugin-exec" plugin',"$0 plugin import @yarnpkg/plugin-exec"],['Download and activate the "@yarnpkg/plugin-exec" plugin (shorthand)',"$0 plugin import exec"],["Download and activate a community plugin","$0 plugin import https://example.org/path/to/plugin.js"],["Activate a local plugin","$0 plugin import ./path/to/plugin.js"]]});async function _8(t,e,{checksum:r=!0,project:o,report:a}){let{configuration:n}=o,u={},A={exports:u};(0,rde.runInNewContext)(e.toString(),{module:A,exports:u});let h=`.yarn/plugins/${A.exports.name}.cjs`,E=V.resolve(o.cwd,h);a.reportInfo(0,`Saving the new plugin in ${de.pretty(n,h,"magenta")}`),await oe.mkdirPromise(V.dirname(E),{recursive:!0}),await oe.writeFilePromise(E,e);let I={path:h,spec:t};r&&(I.checksum=wn.makeHash(e)),await Ke.addPlugin(o.cwd,[I])}var tgt=({pluginName:t,noMinify:e},r)=>[["yarn",`build:${t}`,...e?["--no-minify"]:[],"|"]],zh=class extends ut{constructor(){super(...arguments);this.installPath=ge.String("--path",{description:"The path where the repository should be cloned to"});this.repository=ge.String("--repository","https://github.com/yarnpkg/berry.git",{description:"The repository that should be cloned"});this.branch=ge.String("--branch","master",{description:"The branch of the repository that should be cloned"});this.noMinify=ge.Boolean("--no-minify",!1,{description:"Build a plugin for development (debugging) - non-minified and non-mangled"});this.force=ge.Boolean("-f,--force",!1,{description:"Always clone the repository instead of trying to fetch the latest commits"});this.name=ge.String()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),o=typeof this.installPath<"u"?V.resolve(this.context.cwd,ue.toPortablePath(this.installPath)):V.resolve(ue.toPortablePath((0,nde.tmpdir)()),"yarnpkg-sources",wn.makeHash(this.repository).slice(0,6));return(await Nt.start({configuration:r,stdout:this.context.stdout},async n=>{let{project:u}=await Pt.find(r,this.context.cwd),A=W.parseIdent(this.name.replace(/^((@yarnpkg\/)?plugin-)?/,"@yarnpkg/plugin-")),p=W.stringifyIdent(A),h=await zd(r,rn);if(!Object.hasOwn(h,p))throw new zt(51,`Couldn't find a plugin named "${p}" on the remote registry. Note that only the plugins referenced on our website (https://github.com/yarnpkg/berry/blob/master/plugins.yml) can be built and imported from sources.`);let E=p;await M8(this,{configuration:r,report:n,target:o}),await U8(E,this,{project:u,report:n,target:o})})).exitCode()}};zh.paths=[["plugin","import","from","sources"]],zh.usage=nt.Usage({category:"Plugin-related commands",description:"build a plugin from sources",details:`
+      This command clones the Yarn repository into a temporary folder, builds the specified contrib plugin and updates the configuration to reference it in further CLI invocations.
+
+      The plugins can be referenced by their short name if sourced from the official Yarn repository.
+    `,examples:[['Build and activate the "@yarnpkg/plugin-exec" plugin',"$0 plugin import from sources @yarnpkg/plugin-exec"],['Build and activate the "@yarnpkg/plugin-exec" plugin (shorthand)',"$0 plugin import from sources exec"]]});async function U8(t,{context:e,noMinify:r},{project:o,report:a,target:n}){let u=t.replace(/@yarnpkg\//,""),{configuration:A}=o;a.reportSeparator(),a.reportInfo(0,`Building a fresh ${u}`),a.reportSeparator(),await E2(tgt({pluginName:u,noMinify:r},n),{configuration:A,context:e,target:n}),a.reportSeparator();let p=V.resolve(n,`packages/${u}/bundles/${t}.js`),h=await oe.readFilePromise(p);await _8(t,h,{project:o,report:a})}Ye();St();jt();var Xh=class extends ut{constructor(){super(...arguments);this.name=ge.String()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o}=await Pt.find(r,this.context.cwd);return(await Nt.start({configuration:r,stdout:this.context.stdout},async n=>{let u=this.name,A=W.parseIdent(u);if(!r.plugins.has(u))throw new it(`${W.prettyIdent(r,A)} isn't referenced by the current configuration`);let p=`.yarn/plugins/${u}.cjs`,h=V.resolve(o.cwd,p);oe.existsSync(h)&&(n.reportInfo(0,`Removing ${de.pretty(r,p,de.Type.PATH)}...`),await oe.removePromise(h)),n.reportInfo(0,"Updating the configuration..."),await Ke.updateConfiguration(o.cwd,{plugins:E=>{if(!Array.isArray(E))return E;let I=E.filter(v=>v.path!==p);return I.length===0?Ke.deleteProperty:I.length===E.length?E:I}})})).exitCode()}};Xh.paths=[["plugin","remove"]],Xh.usage=nt.Usage({category:"Plugin-related commands",description:"remove a plugin",details:`
+      This command deletes the specified plugin from the .yarn/plugins folder and removes it from the configuration.
+
+      **Note:** The plugins have to be referenced by their name property, which can be obtained using the \`yarn plugin runtime\` command. Shorthands are not allowed.
+   `,examples:[["Remove a plugin imported from the Yarn repository","$0 plugin remove @yarnpkg/plugin-typescript"],["Remove a plugin imported from a local file","$0 plugin remove my-local-plugin"]]});Ye();jt();var Zh=class extends ut{constructor(){super(...arguments);this.json=ge.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"})}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins);return(await Nt.start({configuration:r,json:this.json,stdout:this.context.stdout},async a=>{for(let n of r.plugins.keys()){let u=this.context.plugins.plugins.has(n),A=n;u&&(A+=" [builtin]"),a.reportJson({name:n,builtin:u}),a.reportInfo(null,`${A}`)}})).exitCode()}};Zh.paths=[["plugin","runtime"]],Zh.usage=nt.Usage({category:"Plugin-related commands",description:"list the active plugins",details:`
+      This command prints the currently active plugins. Will be displayed both builtin plugins and external plugins.
+    `,examples:[["List the currently active plugins","$0 plugin runtime"]]});Ye();Ye();jt();var $h=class extends ut{constructor(){super(...arguments);this.idents=ge.Rest()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd),n=await Lr.find(r);if(!a)throw new rr(o.cwd,this.context.cwd);let u=new Set;for(let A of this.idents)u.add(W.parseIdent(A).identHash);if(await o.restoreInstallState({restoreResolutions:!1}),await o.resolveEverything({cache:n,report:new Qi}),u.size>0)for(let A of o.storedPackages.values())u.has(A.identHash)&&(o.storedBuildState.delete(A.locatorHash),o.skippedBuilds.delete(A.locatorHash));else o.storedBuildState.clear(),o.skippedBuilds.clear();return await o.installWithNewReport({stdout:this.context.stdout,quiet:this.context.quiet},{cache:n})}};$h.paths=[["rebuild"]],$h.usage=nt.Usage({description:"rebuild the project's native packages",details:`
+      This command will automatically cause Yarn to forget about previous compilations of the given packages and to run them again.
+
+      Note that while Yarn forgets the compilation, the previous artifacts aren't erased from the filesystem and may affect the next builds (in good or bad). To avoid this, you may remove the .yarn/unplugged folder, or any other relevant location where packages might have been stored (Yarn may offer a way to do that automatically in the future).
+
+      By default all packages will be rebuilt, but you can filter the list by specifying the names of the packages you want to clear from memory.
+    `,examples:[["Rebuild all packages","$0 rebuild"],["Rebuild fsevents only","$0 rebuild fsevents"]]});Ye();Ye();Ye();jt();var H8=$e(Zo());Za();var e0=class extends ut{constructor(){super(...arguments);this.all=ge.Boolean("-A,--all",!1,{description:"Apply the operation to all workspaces from the current project"});this.mode=ge.String("--mode",{description:"Change what artifacts installs generate",validator:Ks(pl)});this.patterns=ge.Rest()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd),n=await Lr.find(r);if(!a)throw new rr(o.cwd,this.context.cwd);await o.restoreInstallState({restoreResolutions:!1});let u=this.all?o.workspaces:[a],A=["dependencies","devDependencies","peerDependencies"],p=[],h=!1,E=[];for(let C of this.patterns){let R=!1,L=W.parseIdent(C);for(let U of u){let J=[...U.manifest.peerDependenciesMeta.keys()];for(let te of(0,H8.default)(J,C))U.manifest.peerDependenciesMeta.delete(te),h=!0,R=!0;for(let te of A){let ae=U.manifest.getForScope(te),fe=[...ae.values()].map(ce=>W.stringifyIdent(ce));for(let ce of(0,H8.default)(fe,W.stringifyIdent(L))){let{identHash:me}=W.parseIdent(ce),he=ae.get(me);if(typeof he>"u")throw new Error("Assertion failed: Expected the descriptor to be registered");U.manifest[te].delete(me),E.push([U,te,he]),h=!0,R=!0}}}R||p.push(C)}let I=p.length>1?"Patterns":"Pattern",v=p.length>1?"don't":"doesn't",x=this.all?"any":"this";if(p.length>0)throw new it(`${I} ${de.prettyList(r,p,de.Type.CODE)} ${v} match any packages referenced by ${x} workspace`);return h?(await r.triggerMultipleHooks(C=>C.afterWorkspaceDependencyRemoval,E),await o.installWithNewReport({stdout:this.context.stdout},{cache:n,mode:this.mode})):0}};e0.paths=[["remove"]],e0.usage=nt.Usage({description:"remove dependencies from the project",details:`
+      This command will remove the packages matching the specified patterns from the current workspace.
+
+      If the \`--mode=<mode>\` option is set, Yarn will change which artifacts are generated. The modes currently supported are:
+
+      - \`skip-build\` will not run the build scripts at all. Note that this is different from setting \`enableScripts\` to false because the latter will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run.
+
+      - \`update-lockfile\` will skip the link step altogether, and only fetch packages that are missing from the lockfile (or that have no associated checksums). This mode is typically used by tools like Renovate or Dependabot to keep a lockfile up-to-date without incurring the full install cost.
+
+      This command accepts glob patterns as arguments (if valid Idents and supported by [micromatch](https://github.com/micromatch/micromatch)). Make sure to escape the patterns, to prevent your own shell from trying to expand them.
+    `,examples:[["Remove a dependency from the current project","$0 remove lodash"],["Remove a dependency from all workspaces at once","$0 remove lodash --all"],["Remove all dependencies starting with `eslint-`","$0 remove 'eslint-*'"],["Remove all dependencies with the `@babel` scope","$0 remove '@babel/*'"],["Remove all dependencies matching `react-dom` or `react-helmet`","$0 remove 'react-{dom,helmet}'"]]});Ye();Ye();jt();var ide=ve("util"),Xd=class extends ut{constructor(){super(...arguments);this.json=ge.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"})}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd);if(!a)throw new rr(o.cwd,this.context.cwd);return(await Nt.start({configuration:r,stdout:this.context.stdout,json:this.json},async u=>{let A=a.manifest.scripts,p=_e.sortMap(A.keys(),I=>I),h={breakLength:1/0,colors:r.get("enableColors"),maxArrayLength:2},E=p.reduce((I,v)=>Math.max(I,v.length),0);for(let[I,v]of A.entries())u.reportInfo(null,`${I.padEnd(E," ")}   ${(0,ide.inspect)(v,h)}`),u.reportJson({name:I,script:v})})).exitCode()}};Xd.paths=[["run"]];Ye();Ye();jt();var t0=class extends ut{constructor(){super(...arguments);this.inspect=ge.String("--inspect",!1,{tolerateBoolean:!0,description:"Forwarded to the underlying Node process when executing a binary"});this.inspectBrk=ge.String("--inspect-brk",!1,{tolerateBoolean:!0,description:"Forwarded to the underlying Node process when executing a binary"});this.topLevel=ge.Boolean("-T,--top-level",!1,{description:"Check the root workspace for scripts and/or binaries instead of the current one"});this.binariesOnly=ge.Boolean("-B,--binaries-only",!1,{description:"Ignore any user defined scripts and only check for binaries"});this.require=ge.String("--require",{description:"Forwarded to the underlying Node process when executing a binary"});this.silent=ge.Boolean("--silent",{hidden:!0});this.scriptName=ge.String();this.args=ge.Proxy()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a,locator:n}=await Pt.find(r,this.context.cwd);await o.restoreInstallState();let u=this.topLevel?o.topLevelWorkspace.anchoredLocator:n;if(!this.binariesOnly&&await un.hasPackageScript(u,this.scriptName,{project:o}))return await un.executePackageScript(u,this.scriptName,this.args,{project:o,stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr});let A=await un.getPackageAccessibleBinaries(u,{project:o});if(A.get(this.scriptName)){let h=[];return this.inspect&&(typeof this.inspect=="string"?h.push(`--inspect=${this.inspect}`):h.push("--inspect")),this.inspectBrk&&(typeof this.inspectBrk=="string"?h.push(`--inspect-brk=${this.inspectBrk}`):h.push("--inspect-brk")),this.require&&h.push(`--require=${this.require}`),await un.executePackageAccessibleBinary(u,this.scriptName,this.args,{cwd:this.context.cwd,project:o,stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr,nodeArgs:h,packageAccessibleBinaries:A})}if(!this.topLevel&&!this.binariesOnly&&a&&this.scriptName.includes(":")){let E=(await Promise.all(o.workspaces.map(async I=>I.manifest.scripts.has(this.scriptName)?I:null))).filter(I=>I!==null);if(E.length===1)return await un.executeWorkspaceScript(E[0],this.scriptName,this.args,{stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr})}if(this.topLevel)throw this.scriptName==="node-gyp"?new it(`Couldn't find a script name "${this.scriptName}" in the top-level (used by ${W.prettyLocator(r,n)}). This typically happens because some package depends on "node-gyp" to build itself, but didn't list it in their dependencies. To fix that, please run "yarn add node-gyp" into your top-level workspace. You also can open an issue on the repository of the specified package to suggest them to use an optional peer dependency.`):new it(`Couldn't find a script name "${this.scriptName}" in the top-level (used by ${W.prettyLocator(r,n)}).`);{if(this.scriptName==="global")throw new it("The 'yarn global' commands have been removed in 2.x - consider using 'yarn dlx' or a third-party plugin instead");let h=[this.scriptName].concat(this.args);for(let[E,I]of AC)for(let v of I)if(h.length>=v.length&&JSON.stringify(h.slice(0,v.length))===JSON.stringify(v))throw new it(`Couldn't find a script named "${this.scriptName}", but a matching command can be found in the ${E} plugin. You can install it with "yarn plugin import ${E}".`);throw new it(`Couldn't find a script named "${this.scriptName}".`)}}};t0.paths=[["run"]],t0.usage=nt.Usage({description:"run a script defined in the package.json",details:`
+      This command will run a tool. The exact tool that will be executed will depend on the current state of your workspace:
+
+      - If the \`scripts\` field from your local package.json contains a matching script name, its definition will get executed.
+
+      - Otherwise, if one of the local workspace's dependencies exposes a binary with a matching name, this binary will get executed.
+
+      - Otherwise, if the specified name contains a colon character and if one of the workspaces in the project contains exactly one script with a matching name, then this script will get executed.
+
+      Whatever happens, the cwd of the spawned process will be the workspace that declares the script (which makes it possible to call commands cross-workspaces using the third syntax).
+    `,examples:[["Run the tests from the local workspace","$0 run test"],['Same thing, but without the "run" keyword',"$0 test"],["Inspect Webpack while running","$0 run --inspect-brk webpack"]]});Ye();Ye();jt();var r0=class extends ut{constructor(){super(...arguments);this.descriptor=ge.String();this.resolution=ge.String()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd),n=await Lr.find(r);if(await o.restoreInstallState({restoreResolutions:!1}),!a)throw new rr(o.cwd,this.context.cwd);let u=W.parseDescriptor(this.descriptor,!0),A=W.makeDescriptor(u,this.resolution);return o.storedDescriptors.set(u.descriptorHash,u),o.storedDescriptors.set(A.descriptorHash,A),o.resolutionAliases.set(u.descriptorHash,A.descriptorHash),await o.installWithNewReport({stdout:this.context.stdout},{cache:n})}};r0.paths=[["set","resolution"]],r0.usage=nt.Usage({description:"enforce a package resolution",details:'\n      This command updates the resolution table so that `descriptor` is resolved by `resolution`.\n\n      Note that by default this command only affect the current resolution table - meaning that this "manual override" will disappear if you remove the lockfile, or if the package disappear from the table. If you wish to make the enforced resolution persist whatever happens, edit the `resolutions` field in your top-level manifest.\n\n      Note that no attempt is made at validating that `resolution` is a valid resolution entry for `descriptor`.\n    ',examples:[["Force all instances of lodash@npm:^1.2.3 to resolve to 1.5.0","$0 set resolution lodash@npm:^1.2.3 1.5.0"]]});Ye();St();jt();var sde=$e(Zo()),n0=class extends ut{constructor(){super(...arguments);this.all=ge.Boolean("-A,--all",!1,{description:"Unlink all workspaces belonging to the target project from the current one"});this.leadingArguments=ge.Rest()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd),n=await Lr.find(r);if(!a)throw new rr(o.cwd,this.context.cwd);let u=o.topLevelWorkspace,A=new Set;if(this.leadingArguments.length===0&&this.all)for(let{pattern:p,reference:h}of u.manifest.resolutions)h.startsWith("portal:")&&A.add(p.descriptor.fullName);if(this.leadingArguments.length>0)for(let p of this.leadingArguments){let h=V.resolve(this.context.cwd,ue.toPortablePath(p));if(_e.isPathLike(p)){let E=await Ke.find(h,this.context.plugins,{useRc:!1,strict:!1}),{project:I,workspace:v}=await Pt.find(E,h);if(!v)throw new rr(I.cwd,h);if(this.all){for(let x of I.workspaces)x.manifest.name&&A.add(W.stringifyIdent(x.anchoredLocator));if(A.size===0)throw new it("No workspace found to be unlinked in the target project")}else{if(!v.manifest.name)throw new it("The target workspace doesn't have a name and thus cannot be unlinked");A.add(W.stringifyIdent(v.anchoredLocator))}}else{let E=[...u.manifest.resolutions.map(({pattern:I})=>I.descriptor.fullName)];for(let I of(0,sde.default)(E,p))A.add(I)}}return u.manifest.resolutions=u.manifest.resolutions.filter(({pattern:p})=>!A.has(p.descriptor.fullName)),await o.installWithNewReport({stdout:this.context.stdout,quiet:this.context.quiet},{cache:n})}};n0.paths=[["unlink"]],n0.usage=nt.Usage({description:"disconnect the local project from another one",details:`
+      This command will remove any resolutions in the project-level manifest that would have been added via a yarn link with similar arguments.
+    `,examples:[["Unregister a remote workspace in the current project","$0 unlink ~/ts-loader"],["Unregister all workspaces from a remote project in the current project","$0 unlink ~/jest --all"],["Unregister all previously linked workspaces","$0 unlink --all"],["Unregister all workspaces matching a glob","$0 unlink '@babel/*' 'pkg-{a,b}'"]]});Ye();Ye();Ye();jt();var ode=$e(f2()),j8=$e(Zo());Za();var Jf=class extends ut{constructor(){super(...arguments);this.interactive=ge.Boolean("-i,--interactive",{description:"Offer various choices, depending on the detected upgrade paths"});this.fixed=ge.Boolean("-F,--fixed",!1,{description:"Store dependency tags as-is instead of resolving them"});this.exact=ge.Boolean("-E,--exact",!1,{description:"Don't use any semver modifier on the resolved range"});this.tilde=ge.Boolean("-T,--tilde",!1,{description:"Use the `~` semver modifier on the resolved range"});this.caret=ge.Boolean("-C,--caret",!1,{description:"Use the `^` semver modifier on the resolved range"});this.recursive=ge.Boolean("-R,--recursive",!1,{description:"Resolve again ALL resolutions for those packages"});this.mode=ge.String("--mode",{description:"Change what artifacts installs generate",validator:Ks(pl)});this.patterns=ge.Rest()}async execute(){return this.recursive?await this.executeUpRecursive():await this.executeUpClassic()}async executeUpRecursive(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd),n=await Lr.find(r);if(!a)throw new rr(o.cwd,this.context.cwd);await o.restoreInstallState({restoreResolutions:!1});let u=[...o.storedDescriptors.values()],A=u.map(E=>W.stringifyIdent(E)),p=new Set;for(let E of this.patterns){if(W.parseDescriptor(E).range!=="unknown")throw new it("Ranges aren't allowed when using --recursive");for(let I of(0,j8.default)(A,E)){let v=W.parseIdent(I);p.add(v.identHash)}}let h=u.filter(E=>p.has(E.identHash));for(let E of h)o.storedDescriptors.delete(E.descriptorHash),o.storedResolutions.delete(E.descriptorHash);return await o.installWithNewReport({stdout:this.context.stdout},{cache:n,mode:this.mode})}async executeUpClassic(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd),n=await Lr.find(r);if(!a)throw new rr(o.cwd,this.context.cwd);await o.restoreInstallState({restoreResolutions:!1});let u=this.fixed,A=this.interactive??r.get("preferInteractive"),p=h2(this,o),h=A?["keep","reuse","project","latest"]:["project","latest"],E=[],I=[];for(let L of this.patterns){let U=!1,J=W.parseDescriptor(L),te=W.stringifyIdent(J);for(let ae of o.workspaces)for(let fe of["dependencies","devDependencies"]){let me=[...ae.manifest.getForScope(fe).values()].map(Be=>W.stringifyIdent(Be)),he=te==="*"?me:(0,j8.default)(me,te);for(let Be of he){let we=W.parseIdent(Be),g=ae.manifest[fe].get(we.identHash);if(typeof g>"u")throw new Error("Assertion failed: Expected the descriptor to be registered");let Ee=W.makeDescriptor(we,J.range);E.push(Promise.resolve().then(async()=>[ae,fe,g,await g2(Ee,{project:o,workspace:ae,cache:n,target:fe,fixed:u,modifier:p,strategies:h})])),U=!0}}U||I.push(L)}if(I.length>1)throw new it(`Patterns ${de.prettyList(r,I,de.Type.CODE)} don't match any packages referenced by any workspace`);if(I.length>0)throw new it(`Pattern ${de.prettyList(r,I,de.Type.CODE)} doesn't match any packages referenced by any workspace`);let v=await Promise.all(E),x=await AA.start({configuration:r,stdout:this.context.stdout,suggestInstall:!1},async L=>{for(let[,,U,{suggestions:J,rejections:te}]of v){let ae=J.filter(fe=>fe.descriptor!==null);if(ae.length===0){let[fe]=te;if(typeof fe>"u")throw new Error("Assertion failed: Expected an error to have been set");let ce=this.cli.error(fe);o.configuration.get("enableNetwork")?L.reportError(27,`${W.prettyDescriptor(r,U)} can't be resolved to a satisfying range
+
+${ce}`):L.reportError(27,`${W.prettyDescriptor(r,U)} can't be resolved to a satisfying range (note: network resolution has been disabled)
+
+${ce}`)}else ae.length>1&&!A&&L.reportError(27,`${W.prettyDescriptor(r,U)} has multiple possible upgrade strategies; use -i to disambiguate manually`)}});if(x.hasErrors())return x.exitCode();let C=!1,R=[];for(let[L,U,,{suggestions:J}]of v){let te,ae=J.filter(he=>he.descriptor!==null),fe=ae[0].descriptor,ce=ae.every(he=>W.areDescriptorsEqual(he.descriptor,fe));ae.length===1||ce?te=fe:(C=!0,{answer:te}=await(0,ode.prompt)({type:"select",name:"answer",message:`Which range do you want to use in ${W.prettyWorkspace(r,L)} \u276F ${U}?`,choices:J.map(({descriptor:he,name:Be,reason:we})=>he?{name:Be,hint:we,descriptor:he}:{name:Be,hint:we,disabled:!0}),onCancel:()=>process.exit(130),result(he){return this.find(he,"descriptor")},stdin:this.context.stdin,stdout:this.context.stdout}));let me=L.manifest[U].get(te.identHash);if(typeof me>"u")throw new Error("Assertion failed: This descriptor should have a matching entry");if(me.descriptorHash!==te.descriptorHash)L.manifest[U].set(te.identHash,te),R.push([L,U,me,te]);else{let he=r.makeResolver(),Be={project:o,resolver:he},we=r.normalizeDependency(me),g=he.bindDescriptor(we,L.anchoredLocator,Be);o.forgetResolution(g)}}return await r.triggerMultipleHooks(L=>L.afterWorkspaceDependencyReplacement,R),C&&this.context.stdout.write(`
+`),await o.installWithNewReport({stdout:this.context.stdout},{cache:n,mode:this.mode})}};Jf.paths=[["up"]],Jf.usage=nt.Usage({description:"upgrade dependencies across the project",details:"\n      This command upgrades the packages matching the list of specified patterns to their latest available version across the whole project (regardless of whether they're part of `dependencies` or `devDependencies` - `peerDependencies` won't be affected). This is a project-wide command: all workspaces will be upgraded in the process.\n\n      If `-R,--recursive` is set the command will change behavior and no other switch will be allowed. When operating under this mode `yarn up` will force all ranges matching the selected packages to be resolved again (often to the highest available versions) before being stored in the lockfile. It however won't touch your manifests anymore, so depending on your needs you might want to run both `yarn up` and `yarn up -R` to cover all bases.\n\n      If `-i,--interactive` is set (or if the `preferInteractive` settings is toggled on) the command will offer various choices, depending on the detected upgrade paths. Some upgrades require this flag in order to resolve ambiguities.\n\n      The, `-C,--caret`, `-E,--exact` and  `-T,--tilde` options have the same meaning as in the `add` command (they change the modifier used when the range is missing or a tag, and are ignored when the range is explicitly set).\n\n      If the `--mode=<mode>` option is set, Yarn will change which artifacts are generated. The modes currently supported are:\n\n      - `skip-build` will not run the build scripts at all. Note that this is different from setting `enableScripts` to false because the latter will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run.\n\n      - `update-lockfile` will skip the link step altogether, and only fetch packages that are missing from the lockfile (or that have no associated checksums). This mode is typically used by tools like Renovate or Dependabot to keep a lockfile up-to-date without incurring the full install cost.\n\n      Generally you can see `yarn up` as a counterpart to what was `yarn upgrade --latest` in Yarn 1 (ie it ignores the ranges previously listed in your manifests), but unlike `yarn upgrade` which only upgraded dependencies in the current workspace, `yarn up` will upgrade all workspaces at the same time.\n\n      This command accepts glob patterns as arguments (if valid Descriptors and supported by [micromatch](https://github.com/micromatch/micromatch)). Make sure to escape the patterns, to prevent your own shell from trying to expand them.\n\n      **Note:** The ranges have to be static, only the package scopes and names can contain glob patterns.\n    ",examples:[["Upgrade all instances of lodash to the latest release","$0 up lodash"],["Upgrade all instances of lodash to the latest release, but ask confirmation for each","$0 up lodash -i"],["Upgrade all instances of lodash to 1.2.3","$0 up lodash@1.2.3"],["Upgrade all instances of packages with the `@babel` scope to the latest release","$0 up '@babel/*'"],["Upgrade all instances of packages containing the word `jest` to the latest release","$0 up '*jest*'"],["Upgrade all instances of packages with the `@babel` scope to 7.0.0","$0 up '@babel/*@7.0.0'"]]}),Jf.schema=[cI("recursive",qu.Forbids,["interactive","exact","tilde","caret"],{ignore:[void 0,!1]})];Ye();Ye();Ye();jt();var i0=class extends ut{constructor(){super(...arguments);this.recursive=ge.Boolean("-R,--recursive",!1,{description:"List, for each workspace, what are all the paths that lead to the dependency"});this.json=ge.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.peers=ge.Boolean("--peers",!1,{description:"Also print the peer dependencies that match the specified name"});this.package=ge.String()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd);if(!a)throw new rr(o.cwd,this.context.cwd);await o.restoreInstallState();let n=W.parseIdent(this.package).identHash,u=this.recursive?ngt(o,n,{configuration:r,peers:this.peers}):rgt(o,n,{configuration:r,peers:this.peers});$s.emitTree(u,{configuration:r,stdout:this.context.stdout,json:this.json,separators:1})}};i0.paths=[["why"]],i0.usage=nt.Usage({description:"display the reason why a package is needed",details:`
+      This command prints the exact reasons why a package appears in the dependency tree.
+
+      If \`-R,--recursive\` is set, the listing will go in depth and will list, for each workspaces, what are all the paths that lead to the dependency. Note that the display is somewhat optimized in that it will not print the package listing twice for a single package, so if you see a leaf named "Foo" when looking for "Bar", it means that "Foo" already got printed higher in the tree.
+    `,examples:[["Explain why lodash is used in your project","$0 why lodash"]]});function rgt(t,e,{configuration:r,peers:o}){let a=_e.sortMap(t.storedPackages.values(),A=>W.stringifyLocator(A)),n={},u={children:n};for(let A of a){let p={};for(let E of A.dependencies.values()){if(!o&&A.peerDependencies.has(E.identHash))continue;let I=t.storedResolutions.get(E.descriptorHash);if(!I)throw new Error("Assertion failed: The resolution should have been registered");let v=t.storedPackages.get(I);if(!v)throw new Error("Assertion failed: The package should have been registered");if(v.identHash!==e)continue;{let C=W.stringifyLocator(A);n[C]={value:[A,de.Type.LOCATOR],children:p}}let x=W.stringifyLocator(v);p[x]={value:[{descriptor:E,locator:v},de.Type.DEPENDENT]}}}return u}function ngt(t,e,{configuration:r,peers:o}){let a=_e.sortMap(t.workspaces,v=>W.stringifyLocator(v.anchoredLocator)),n=new Set,u=new Set,A=v=>{if(n.has(v.locatorHash))return u.has(v.locatorHash);if(n.add(v.locatorHash),v.identHash===e)return u.add(v.locatorHash),!0;let x=!1;v.identHash===e&&(x=!0);for(let C of v.dependencies.values()){if(!o&&v.peerDependencies.has(C.identHash))continue;let R=t.storedResolutions.get(C.descriptorHash);if(!R)throw new Error("Assertion failed: The resolution should have been registered");let L=t.storedPackages.get(R);if(!L)throw new Error("Assertion failed: The package should have been registered");A(L)&&(x=!0)}return x&&u.add(v.locatorHash),x};for(let v of a)A(v.anchoredPackage);let p=new Set,h={},E={children:h},I=(v,x,C)=>{if(!u.has(v.locatorHash))return;let R=C!==null?de.tuple(de.Type.DEPENDENT,{locator:v,descriptor:C}):de.tuple(de.Type.LOCATOR,v),L={},U={value:R,children:L},J=W.stringifyLocator(v);if(x[J]=U,!p.has(v.locatorHash)&&(p.add(v.locatorHash),!(C!==null&&t.tryWorkspaceByLocator(v))))for(let te of v.dependencies.values()){if(!o&&v.peerDependencies.has(te.identHash))continue;let ae=t.storedResolutions.get(te.descriptorHash);if(!ae)throw new Error("Assertion failed: The resolution should have been registered");let fe=t.storedPackages.get(ae);if(!fe)throw new Error("Assertion failed: The package should have been registered");I(fe,L,te)}};for(let v of a)I(v.anchoredPackage,h,null);return E}Ye();var Z8={};Vt(Z8,{GitFetcher:()=>w2,GitResolver:()=>I2,default:()=>vgt,gitUtils:()=>ra});Ye();St();var ra={};Vt(ra,{TreeishProtocols:()=>C2,clone:()=>X8,fetchBase:()=>bde,fetchChangedFiles:()=>xde,fetchChangedWorkspaces:()=>Igt,fetchRoot:()=>Pde,isGitUrl:()=>CC,lsRemote:()=>Sde,normalizeLocator:()=>wgt,normalizeRepoUrl:()=>yC,resolveUrl:()=>z8,splitRepoUrl:()=>s0,validateRepoUrl:()=>J8});Ye();St();jt();var Bde=$e(Cde()),vde=$e(mU()),EC=$e(ve("querystring")),K8=$e(zn());function W8(t,e,r){let o=t.indexOf(r);return t.lastIndexOf(e,o>-1?o:1/0)}function wde(t){try{return new URL(t)}catch{return}}function Egt(t){let e=W8(t,"@","#"),r=W8(t,":","#");return r>e&&(t=`${t.slice(0,r)}/${t.slice(r+1)}`),W8(t,":","#")===-1&&t.indexOf("//")===-1&&(t=`ssh://${t}`),t}function Ide(t){return wde(t)||wde(Egt(t))}function yC(t,{git:e=!1}={}){if(t=t.replace(/^git\+https:/,"https:"),t=t.replace(/^(?:github:|https:\/\/github\.com\/|git:\/\/github\.com\/)?(?!\.{1,2}\/)([a-zA-Z0-9._-]+)\/(?!\.{1,2}(?:#|$))([a-zA-Z0-9._-]+?)(?:\.git)?(#.*)?$/,"https://github.com/$1/$2.git$3"),t=t.replace(/^https:\/\/github\.com\/(?!\.{1,2}\/)([a-zA-Z0-9._-]+)\/(?!\.{1,2}(?:#|$))([a-zA-Z0-9._-]+?)\/tarball\/(.+)?$/,"https://github.com/$1/$2.git#$3"),e){let r=Ide(t);r&&(t=r.href),t=t.replace(/^git\+([^:]+):/,"$1:")}return t}function Dde(){return{...process.env,GIT_SSH_COMMAND:process.env.GIT_SSH_COMMAND||`${process.env.GIT_SSH||"ssh"} -o BatchMode=yes`}}var Cgt=[/^ssh:/,/^git(?:\+[^:]+)?:/,/^(?:git\+)?https?:[^#]+\/[^#]+(?:\.git)(?:#.*)?$/,/^git@[^#]+\/[^#]+\.git(?:#.*)?$/,/^(?:github:|https:\/\/github\.com\/)?(?!\.{1,2}\/)([a-zA-Z._0-9-]+)\/(?!\.{1,2}(?:#|$))([a-zA-Z._0-9-]+?)(?:\.git)?(?:#.*)?$/,/^https:\/\/github\.com\/(?!\.{1,2}\/)([a-zA-Z0-9._-]+)\/(?!\.{1,2}(?:#|$))([a-zA-Z0-9._-]+?)\/tarball\/(.+)?$/],C2=(a=>(a.Commit="commit",a.Head="head",a.Tag="tag",a.Semver="semver",a))(C2||{});function CC(t){return t?Cgt.some(e=>!!t.match(e)):!1}function s0(t){t=yC(t);let e=t.indexOf("#");if(e===-1)return{repo:t,treeish:{protocol:"head",request:"HEAD"},extra:{}};let r=t.slice(0,e),o=t.slice(e+1);if(o.match(/^[a-z]+=/)){let a=EC.default.parse(o);for(let[p,h]of Object.entries(a))if(typeof h!="string")throw new Error(`Assertion failed: The ${p} parameter must be a literal string`);let n=Object.values(C2).find(p=>Object.hasOwn(a,p)),[u,A]=typeof n<"u"?[n,a[n]]:["head","HEAD"];for(let p of Object.values(C2))delete a[p];return{repo:r,treeish:{protocol:u,request:A},extra:a}}else{let a=o.indexOf(":"),[n,u]=a===-1?[null,o]:[o.slice(0,a),o.slice(a+1)];return{repo:r,treeish:{protocol:n,request:u},extra:{}}}}function wgt(t){return W.makeLocator(t,yC(t.reference))}function J8(t,{configuration:e}){let r=yC(t,{git:!0});if(!nn.getNetworkSettings(`https://${(0,Bde.default)(r).resource}`,{configuration:e}).enableNetwork)throw new zt(80,`Request to '${r}' has been blocked because of your configuration settings`);return r}async function Sde(t,e){let r=J8(t,{configuration:e}),o=await V8("listing refs",["ls-remote",r],{cwd:e.startingCwd,env:Dde()},{configuration:e,normalizedRepoUrl:r}),a=new Map,n=/^([a-f0-9]{40})\t([^\n]+)/gm,u;for(;(u=n.exec(o.stdout))!==null;)a.set(u[2],u[1]);return a}async function z8(t,e){let{repo:r,treeish:{protocol:o,request:a},extra:n}=s0(t),u=await Sde(r,e),A=(h,E)=>{switch(h){case"commit":{if(!E.match(/^[a-f0-9]{40}$/))throw new Error("Invalid commit hash");return EC.default.stringify({...n,commit:E})}case"head":{let I=u.get(E==="HEAD"?E:`refs/heads/${E}`);if(typeof I>"u")throw new Error(`Unknown head ("${E}")`);return EC.default.stringify({...n,commit:I})}case"tag":{let I=u.get(`refs/tags/${E}`);if(typeof I>"u")throw new Error(`Unknown tag ("${E}")`);return EC.default.stringify({...n,commit:I})}case"semver":{let I=kr.validRange(E);if(!I)throw new Error(`Invalid range ("${E}")`);let v=new Map([...u.entries()].filter(([C])=>C.startsWith("refs/tags/")).map(([C,R])=>[K8.default.parse(C.slice(10)),R]).filter(C=>C[0]!==null)),x=K8.default.maxSatisfying([...v.keys()],I);if(x===null)throw new Error(`No matching range ("${E}")`);return EC.default.stringify({...n,commit:v.get(x)})}case null:{let I;if((I=p("commit",E))!==null||(I=p("tag",E))!==null||(I=p("head",E))!==null)return I;throw E.match(/^[a-f0-9]+$/)?new Error(`Couldn't resolve "${E}" as either a commit, a tag, or a head - if a commit, use the 40-characters commit hash`):new Error(`Couldn't resolve "${E}" as either a commit, a tag, or a head`)}default:throw new Error(`Invalid Git resolution protocol ("${h}")`)}},p=(h,E)=>{try{return A(h,E)}catch{return null}};return yC(`${r}#${A(o,a)}`)}async function X8(t,e){return await e.getLimit("cloneConcurrency")(async()=>{let{repo:r,treeish:{protocol:o,request:a}}=s0(t);if(o!=="commit")throw new Error("Invalid treeish protocol when cloning");let n=J8(r,{configuration:e}),u=await oe.mktempPromise(),A={cwd:u,env:Dde()};return await V8("cloning the repository",["clone","-c core.autocrlf=false",n,ue.fromPortablePath(u)],A,{configuration:e,normalizedRepoUrl:n}),await V8("switching branch",["checkout",`${a}`],A,{configuration:e,normalizedRepoUrl:n}),u})}async function Pde(t){let e,r=t;do{if(e=r,await oe.existsPromise(V.join(e,".git")))return e;r=V.dirname(e)}while(r!==e);return null}async function bde(t,{baseRefs:e}){if(e.length===0)throw new it("Can't run this command with zero base refs specified.");let r=[];for(let A of e){let{code:p}=await Ur.execvp("git",["merge-base",A,"HEAD"],{cwd:t});p===0&&r.push(A)}if(r.length===0)throw new it(`No ancestor could be found between any of HEAD and ${e.join(", ")}`);let{stdout:o}=await Ur.execvp("git",["merge-base","HEAD",...r],{cwd:t,strict:!0}),a=o.trim(),{stdout:n}=await Ur.execvp("git",["show","--quiet","--pretty=format:%s",a],{cwd:t,strict:!0}),u=n.trim();return{hash:a,title:u}}async function xde(t,{base:e,project:r}){let o=_e.buildIgnorePattern(r.configuration.get("changesetIgnorePatterns")),{stdout:a}=await Ur.execvp("git",["diff","--name-only",`${e}`],{cwd:t,strict:!0}),n=a.split(/\r\n|\r|\n/).filter(h=>h.length>0).map(h=>V.resolve(t,ue.toPortablePath(h))),{stdout:u}=await Ur.execvp("git",["ls-files","--others","--exclude-standard"],{cwd:t,strict:!0}),A=u.split(/\r\n|\r|\n/).filter(h=>h.length>0).map(h=>V.resolve(t,ue.toPortablePath(h))),p=[...new Set([...n,...A].sort())];return o?p.filter(h=>!V.relative(r.cwd,h).match(o)):p}async function Igt({ref:t,project:e}){if(e.configuration.projectCwd===null)throw new it("This command can only be run from within a Yarn project");let r=[V.resolve(e.cwd,dr.lockfile),V.resolve(e.cwd,e.configuration.get("cacheFolder")),V.resolve(e.cwd,e.configuration.get("installStatePath")),V.resolve(e.cwd,e.configuration.get("virtualFolder"))];await e.configuration.triggerHook(u=>u.populateYarnPaths,e,u=>{u!=null&&r.push(u)});let o=await Pde(e.configuration.projectCwd);if(o==null)throw new it("This command can only be run on Git repositories");let a=await bde(o,{baseRefs:typeof t=="string"?[t]:e.configuration.get("changesetBaseRefs")}),n=await xde(o,{base:a.hash,project:e});return new Set(_e.mapAndFilter(n,u=>{let A=e.tryWorkspaceByFilePath(u);return A===null?_e.mapAndFilter.skip:r.some(p=>u.startsWith(p))?_e.mapAndFilter.skip:A}))}async function V8(t,e,r,{configuration:o,normalizedRepoUrl:a}){try{return await Ur.execvp("git",e,{...r,strict:!0})}catch(n){if(!(n instanceof Ur.ExecError))throw n;let u=n.reportExtra,A=n.stderr.toString();throw new zt(1,`Failed ${t}`,p=>{p.reportError(1,`  ${de.prettyField(o,{label:"Repository URL",value:de.tuple(de.Type.URL,a)})}`);for(let h of A.matchAll(/^(.+?): (.*)$/gm)){let[,E,I]=h;E=E.toLowerCase();let v=E==="error"?"Error":`${(0,vde.default)(E)} Error`;p.reportError(1,`  ${de.prettyField(o,{label:v,value:de.tuple(de.Type.NO_HINT,I)})}`)}u?.(p)})}}var w2=class{supports(e,r){return CC(e.reference)}getLocalPath(e,r){return null}async fetch(e,r){let o=r.checksums.get(e.locatorHash)||null,a=new Map(r.checksums);a.set(e.locatorHash,o);let n={...r,checksums:a},u=await this.downloadHosted(e,n);if(u!==null)return u;let[A,p,h]=await r.cache.fetchPackageFromCache(e,o,{onHit:()=>r.report.reportCacheHit(e),onMiss:()=>r.report.reportCacheMiss(e,`${W.prettyLocator(r.project.configuration,e)} can't be found in the cache and will be fetched from the remote repository`),loader:()=>this.cloneFromRemote(e,n),...r.cacheOptions});return{packageFs:A,releaseFs:p,prefixPath:W.getIdentVendorPath(e),checksum:h}}async downloadHosted(e,r){return r.project.configuration.reduceHook(o=>o.fetchHostedRepository,null,e,r)}async cloneFromRemote(e,r){let o=await X8(e.reference,r.project.configuration),a=s0(e.reference),n=V.join(o,"package.tgz");await un.prepareExternalProject(o,n,{configuration:r.project.configuration,report:r.report,workspace:a.extra.workspace,locator:e});let u=await oe.readFilePromise(n);return await _e.releaseAfterUseAsync(async()=>await Xi.convertToZip(u,{configuration:r.project.configuration,prefixPath:W.getIdentVendorPath(e),stripComponents:1}))}};Ye();Ye();var I2=class{supportsDescriptor(e,r){return CC(e.range)}supportsLocator(e,r){return CC(e.reference)}shouldPersistResolution(e,r){return!0}bindDescriptor(e,r,o){return e}getResolutionDependencies(e,r){return{}}async getCandidates(e,r,o){let a=await z8(e.range,o.project.configuration);return[W.makeLocator(e,a)]}async getSatisfying(e,r,o,a){let n=s0(e.range);return{locators:o.filter(A=>{if(A.identHash!==e.identHash)return!1;let p=s0(A.reference);return!(n.repo!==p.repo||n.treeish.protocol==="commit"&&n.treeish.request!==p.treeish.request)}),sorted:!1}}async resolve(e,r){if(!r.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let o=await r.fetchOptions.fetcher.fetch(e,r.fetchOptions),a=await _e.releaseAfterUseAsync(async()=>await Ot.find(o.prefixPath,{baseFs:o.packageFs}),o.releaseFs);return{...e,version:a.version||"0.0.0",languageName:a.languageName||r.project.configuration.get("defaultLanguageName"),linkType:"HARD",conditions:a.getConditions(),dependencies:r.project.configuration.normalizeDependencyMap(a.dependencies),peerDependencies:a.peerDependencies,dependenciesMeta:a.dependenciesMeta,peerDependenciesMeta:a.peerDependenciesMeta,bin:a.bin}}};var Bgt={configuration:{changesetBaseRefs:{description:"The base git refs that the current HEAD is compared against when detecting changes. Supports git branches, tags, and commits.",type:"STRING",isArray:!0,isNullable:!1,default:["master","origin/master","upstream/master","main","origin/main","upstream/main"]},changesetIgnorePatterns:{description:"Array of glob patterns; files matching them will be ignored when fetching the changed files",type:"STRING",default:[],isArray:!0},cloneConcurrency:{description:"Maximal number of concurrent clones",type:"NUMBER",default:2}},fetchers:[w2],resolvers:[I2]};var vgt=Bgt;jt();var o0=class extends ut{constructor(){super(...arguments);this.since=ge.String("--since",{description:"Only include workspaces that have been changed since the specified ref.",tolerateBoolean:!0});this.recursive=ge.Boolean("-R,--recursive",!1,{description:"Find packages via dependencies/devDependencies instead of using the workspaces field"});this.noPrivate=ge.Boolean("--no-private",{description:"Exclude workspaces that have the private field set to true"});this.verbose=ge.Boolean("-v,--verbose",!1,{description:"Also return the cross-dependencies between workspaces"});this.json=ge.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"})}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o}=await Pt.find(r,this.context.cwd);return(await Nt.start({configuration:r,json:this.json,stdout:this.context.stdout},async n=>{let u=this.since?await ra.fetchChangedWorkspaces({ref:this.since,project:o}):o.workspaces,A=new Set(u);if(this.recursive)for(let p of[...u].map(h=>h.getRecursiveWorkspaceDependents()))for(let h of p)A.add(h);for(let p of A){let{manifest:h}=p;if(h.private&&this.noPrivate)continue;let E;if(this.verbose){let I=new Set,v=new Set;for(let x of Ot.hardDependencies)for(let[C,R]of h.getForScope(x)){let L=o.tryWorkspaceByDescriptor(R);L===null?o.workspacesByIdent.has(C)&&v.add(R):I.add(L)}E={workspaceDependencies:Array.from(I).map(x=>x.relativeCwd),mismatchedWorkspaceDependencies:Array.from(v).map(x=>W.stringifyDescriptor(x))}}n.reportInfo(null,`${p.relativeCwd}`),n.reportJson({location:p.relativeCwd,name:h.name?W.stringifyIdent(h.name):null,...E})}})).exitCode()}};o0.paths=[["workspaces","list"]],o0.usage=nt.Usage({category:"Workspace-related commands",description:"list all available workspaces",details:"\n      This command will print the list of all workspaces in the project.\n\n      - If `--since` is set, Yarn will only list workspaces that have been modified since the specified ref. By default Yarn will use the refs specified by the `changesetBaseRefs` configuration option.\n\n      - If `-R,--recursive` is set, Yarn will find workspaces to run the command on by recursively evaluating `dependencies` and `devDependencies` fields, instead of looking at the `workspaces` fields.\n\n      - If `--no-private` is set, Yarn will not list any workspaces that have the `private` field set to `true`.\n\n      - If both the `-v,--verbose` and `--json` options are set, Yarn will also return the cross-dependencies between each workspaces (useful when you wish to automatically generate Buck / Bazel rules).\n    "});Ye();Ye();jt();var a0=class extends ut{constructor(){super(...arguments);this.workspaceName=ge.String();this.commandName=ge.String();this.args=ge.Proxy()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd);if(!a)throw new rr(o.cwd,this.context.cwd);let n=o.workspaces,u=new Map(n.map(p=>[W.stringifyIdent(p.anchoredLocator),p])),A=u.get(this.workspaceName);if(A===void 0){let p=Array.from(u.keys()).sort();throw new it(`Workspace '${this.workspaceName}' not found. Did you mean any of the following:
+  - ${p.join(`
+  - `)}?`)}return this.cli.run([this.commandName,...this.args],{cwd:A.cwd})}};a0.paths=[["workspace"]],a0.usage=nt.Usage({category:"Workspace-related commands",description:"run a command within the specified workspace",details:`
+      This command will run a given sub-command on a single workspace.
+    `,examples:[["Add a package to a single workspace","yarn workspace components add -D react"],["Run build script on a single workspace","yarn workspace components run build"]]});var Dgt={configuration:{enableImmutableInstalls:{description:"If true (the default on CI), prevents the install command from modifying the lockfile",type:"BOOLEAN",default:kde.isCI},defaultSemverRangePrefix:{description:"The default save prefix: '^', '~' or ''",type:"STRING",values:["^","~",""],default:"^"},preferReuse:{description:"If true, `yarn add` will attempt to reuse the most common dependency range in other workspaces.",type:"BOOLEAN",default:!1}},commands:[Fh,Rh,Th,Nh,r0,Vh,_h,o0,Kd,Vd,mC,Jd,kh,Qh,Lh,Oh,Mh,Uh,Hh,jh,Gh,qh,n0,Yh,Wh,zh,Jh,Xh,Kh,Zh,$h,e0,Xd,t0,Jf,i0,a0]},Sgt=Dgt;var iH={};Vt(iH,{default:()=>bgt});Ye();var kt={optional:!0},eH=[["@tailwindcss/aspect-ratio@<0.2.1",{peerDependencies:{tailwindcss:"^2.0.2"}}],["@tailwindcss/line-clamp@<0.2.1",{peerDependencies:{tailwindcss:"^2.0.2"}}],["@fullhuman/postcss-purgecss@3.1.3 || 3.1.3-alpha.0",{peerDependencies:{postcss:"^8.0.0"}}],["@samverschueren/stream-to-observable@<0.3.1",{peerDependenciesMeta:{rxjs:kt,zenObservable:kt}}],["any-observable@<0.5.1",{peerDependenciesMeta:{rxjs:kt,zenObservable:kt}}],["@pm2/agent@<1.0.4",{dependencies:{debug:"*"}}],["debug@<4.2.0",{peerDependenciesMeta:{["supports-color"]:kt}}],["got@<11",{dependencies:{["@types/responselike"]:"^1.0.0",["@types/keyv"]:"^3.1.1"}}],["cacheable-lookup@<4.1.2",{dependencies:{["@types/keyv"]:"^3.1.1"}}],["http-link-dataloader@*",{peerDependencies:{graphql:"^0.13.1 || ^14.0.0"}}],["typescript-language-server@*",{dependencies:{["vscode-jsonrpc"]:"^5.0.1",["vscode-languageserver-protocol"]:"^3.15.0"}}],["postcss-syntax@*",{peerDependenciesMeta:{["postcss-html"]:kt,["postcss-jsx"]:kt,["postcss-less"]:kt,["postcss-markdown"]:kt,["postcss-scss"]:kt}}],["jss-plugin-rule-value-function@<=10.1.1",{dependencies:{["tiny-warning"]:"^1.0.2"}}],["ink-select-input@<4.1.0",{peerDependencies:{react:"^16.8.2"}}],["license-webpack-plugin@<2.3.18",{peerDependenciesMeta:{webpack:kt}}],["snowpack@>=3.3.0",{dependencies:{["node-gyp"]:"^7.1.0"}}],["promise-inflight@*",{peerDependenciesMeta:{bluebird:kt}}],["reactcss@*",{peerDependencies:{react:"*"}}],["react-color@<=2.19.0",{peerDependencies:{react:"*"}}],["gatsby-plugin-i18n@*",{dependencies:{ramda:"^0.24.1"}}],["useragent@^2.0.0",{dependencies:{request:"^2.88.0",yamlparser:"0.0.x",semver:"5.5.x"}}],["@apollographql/apollo-tools@<=0.5.2",{peerDependencies:{graphql:"^14.2.1 || ^15.0.0"}}],["material-table@^2.0.0",{dependencies:{"@babel/runtime":"^7.11.2"}}],["@babel/parser@*",{dependencies:{"@babel/types":"^7.8.3"}}],["fork-ts-checker-webpack-plugin@<=6.3.4",{peerDependencies:{eslint:">= 6",typescript:">= 2.7",webpack:">= 4","vue-template-compiler":"*"},peerDependenciesMeta:{eslint:kt,"vue-template-compiler":kt}}],["rc-animate@<=3.1.1",{peerDependencies:{react:">=16.9.0","react-dom":">=16.9.0"}}],["react-bootstrap-table2-paginator@*",{dependencies:{classnames:"^2.2.6"}}],["react-draggable@<=4.4.3",{peerDependencies:{react:">= 16.3.0","react-dom":">= 16.3.0"}}],["apollo-upload-client@<14",{peerDependencies:{graphql:"14 - 15"}}],["react-instantsearch-core@<=6.7.0",{peerDependencies:{algoliasearch:">= 3.1 < 5"}}],["react-instantsearch-dom@<=6.7.0",{dependencies:{"react-fast-compare":"^3.0.0"}}],["ws@<7.2.1",{peerDependencies:{bufferutil:"^4.0.1","utf-8-validate":"^5.0.2"},peerDependenciesMeta:{bufferutil:kt,"utf-8-validate":kt}}],["react-portal@<4.2.2",{peerDependencies:{"react-dom":"^15.0.0-0 || ^16.0.0-0 || ^17.0.0-0"}}],["react-scripts@<=4.0.1",{peerDependencies:{react:"*"}}],["testcafe@<=1.10.1",{dependencies:{"@babel/plugin-transform-for-of":"^7.12.1","@babel/runtime":"^7.12.5"}}],["testcafe-legacy-api@<=4.2.0",{dependencies:{"testcafe-hammerhead":"^17.0.1","read-file-relative":"^1.2.0"}}],["@google-cloud/firestore@<=4.9.3",{dependencies:{protobufjs:"^6.8.6"}}],["gatsby-source-apiserver@*",{dependencies:{["babel-polyfill"]:"^6.26.0"}}],["@webpack-cli/package-utils@<=1.0.1-alpha.4",{dependencies:{["cross-spawn"]:"^7.0.3"}}],["gatsby-remark-prismjs@<3.3.28",{dependencies:{lodash:"^4"}}],["gatsby-plugin-favicon@*",{peerDependencies:{webpack:"*"}}],["gatsby-plugin-sharp@<=4.6.0-next.3",{dependencies:{debug:"^4.3.1"}}],["gatsby-react-router-scroll@<=5.6.0-next.0",{dependencies:{["prop-types"]:"^15.7.2"}}],["@rebass/forms@*",{dependencies:{["@styled-system/should-forward-prop"]:"^5.0.0"},peerDependencies:{react:"^16.8.6"}}],["rebass@*",{peerDependencies:{react:"^16.8.6"}}],["@ant-design/react-slick@<=0.28.3",{peerDependencies:{react:">=16.0.0"}}],["mqtt@<4.2.7",{dependencies:{duplexify:"^4.1.1"}}],["vue-cli-plugin-vuetify@<=2.0.3",{dependencies:{semver:"^6.3.0"},peerDependenciesMeta:{"sass-loader":kt,"vuetify-loader":kt}}],["vue-cli-plugin-vuetify@<=2.0.4",{dependencies:{"null-loader":"^3.0.0"}}],["vue-cli-plugin-vuetify@>=2.4.3",{peerDependencies:{vue:"*"}}],["@vuetify/cli-plugin-utils@<=0.0.4",{dependencies:{semver:"^6.3.0"},peerDependenciesMeta:{"sass-loader":kt}}],["@vue/cli-plugin-typescript@<=5.0.0-alpha.0",{dependencies:{"babel-loader":"^8.1.0"}}],["@vue/cli-plugin-typescript@<=5.0.0-beta.0",{dependencies:{"@babel/core":"^7.12.16"},peerDependencies:{"vue-template-compiler":"^2.0.0"},peerDependenciesMeta:{"vue-template-compiler":kt}}],["cordova-ios@<=6.3.0",{dependencies:{underscore:"^1.9.2"}}],["cordova-lib@<=10.0.1",{dependencies:{underscore:"^1.9.2"}}],["git-node-fs@*",{peerDependencies:{"js-git":"^0.7.8"},peerDependenciesMeta:{"js-git":kt}}],["consolidate@<0.16.0",{peerDependencies:{mustache:"^3.0.0"},peerDependenciesMeta:{mustache:kt}}],["consolidate@<=0.16.0",{peerDependencies:{velocityjs:"^2.0.1",tinyliquid:"^0.2.34","liquid-node":"^3.0.1",jade:"^1.11.0","then-jade":"*",dust:"^0.3.0","dustjs-helpers":"^1.7.4","dustjs-linkedin":"^2.7.5",swig:"^1.4.2","swig-templates":"^2.0.3","razor-tmpl":"^1.3.1",atpl:">=0.7.6",liquor:"^0.0.5",twig:"^1.15.2",ejs:"^3.1.5",eco:"^1.1.0-rc-3",jazz:"^0.0.18",jqtpl:"~1.1.0",hamljs:"^0.6.2",hamlet:"^0.3.3",whiskers:"^0.4.0","haml-coffee":"^1.14.1","hogan.js":"^3.0.2",templayed:">=0.2.3",handlebars:"^4.7.6",underscore:"^1.11.0",lodash:"^4.17.20",pug:"^3.0.0","then-pug":"*",qejs:"^3.0.5",walrus:"^0.10.1",mustache:"^4.0.1",just:"^0.1.8",ect:"^0.5.9",mote:"^0.2.0",toffee:"^0.3.6",dot:"^1.1.3","bracket-template":"^1.1.5",ractive:"^1.3.12",nunjucks:"^3.2.2",htmling:"^0.0.8","babel-core":"^6.26.3",plates:"~0.4.11","react-dom":"^16.13.1",react:"^16.13.1","arc-templates":"^0.5.3",vash:"^0.13.0",slm:"^2.0.0",marko:"^3.14.4",teacup:"^2.0.0","coffee-script":"^1.12.7",squirrelly:"^5.1.0",twing:"^5.0.2"},peerDependenciesMeta:{velocityjs:kt,tinyliquid:kt,"liquid-node":kt,jade:kt,"then-jade":kt,dust:kt,"dustjs-helpers":kt,"dustjs-linkedin":kt,swig:kt,"swig-templates":kt,"razor-tmpl":kt,atpl:kt,liquor:kt,twig:kt,ejs:kt,eco:kt,jazz:kt,jqtpl:kt,hamljs:kt,hamlet:kt,whiskers:kt,"haml-coffee":kt,"hogan.js":kt,templayed:kt,handlebars:kt,underscore:kt,lodash:kt,pug:kt,"then-pug":kt,qejs:kt,walrus:kt,mustache:kt,just:kt,ect:kt,mote:kt,toffee:kt,dot:kt,"bracket-template":kt,ractive:kt,nunjucks:kt,htmling:kt,"babel-core":kt,plates:kt,"react-dom":kt,react:kt,"arc-templates":kt,vash:kt,slm:kt,marko:kt,teacup:kt,"coffee-script":kt,squirrelly:kt,twing:kt}}],["vue-loader@<=16.3.3",{peerDependencies:{"@vue/compiler-sfc":"^3.0.8",webpack:"^4.1.0 || ^5.0.0-0"},peerDependenciesMeta:{"@vue/compiler-sfc":kt}}],["vue-loader@^16.7.0",{peerDependencies:{"@vue/compiler-sfc":"^3.0.8",vue:"^3.2.13"},peerDependenciesMeta:{"@vue/compiler-sfc":kt,vue:kt}}],["scss-parser@<=1.0.5",{dependencies:{lodash:"^4.17.21"}}],["query-ast@<1.0.5",{dependencies:{lodash:"^4.17.21"}}],["redux-thunk@<=2.3.0",{peerDependencies:{redux:"^4.0.0"}}],["skypack@<=0.3.2",{dependencies:{tar:"^6.1.0"}}],["@npmcli/metavuln-calculator@<2.0.0",{dependencies:{"json-parse-even-better-errors":"^2.3.1"}}],["bin-links@<2.3.0",{dependencies:{"mkdirp-infer-owner":"^1.0.2"}}],["rollup-plugin-polyfill-node@<=0.8.0",{peerDependencies:{rollup:"^1.20.0 || ^2.0.0"}}],["snowpack@<3.8.6",{dependencies:{"magic-string":"^0.25.7"}}],["elm-webpack-loader@*",{dependencies:{temp:"^0.9.4"}}],["winston-transport@<=4.4.0",{dependencies:{logform:"^2.2.0"}}],["jest-vue-preprocessor@*",{dependencies:{"@babel/core":"7.8.7","@babel/template":"7.8.6"},peerDependencies:{pug:"^2.0.4"},peerDependenciesMeta:{pug:kt}}],["redux-persist@*",{peerDependencies:{react:">=16"},peerDependenciesMeta:{react:kt}}],["sodium@>=3",{dependencies:{"node-gyp":"^3.8.0"}}],["babel-plugin-graphql-tag@<=3.1.0",{peerDependencies:{graphql:"^14.0.0 || ^15.0.0"}}],["@playwright/test@<=1.14.1",{dependencies:{"jest-matcher-utils":"^26.4.2"}}],...["babel-plugin-remove-graphql-queries@<3.14.0-next.1","babel-preset-gatsby-package@<1.14.0-next.1","create-gatsby@<1.14.0-next.1","gatsby-admin@<0.24.0-next.1","gatsby-cli@<3.14.0-next.1","gatsby-core-utils@<2.14.0-next.1","gatsby-design-tokens@<3.14.0-next.1","gatsby-legacy-polyfills@<1.14.0-next.1","gatsby-plugin-benchmark-reporting@<1.14.0-next.1","gatsby-plugin-graphql-config@<0.23.0-next.1","gatsby-plugin-image@<1.14.0-next.1","gatsby-plugin-mdx@<2.14.0-next.1","gatsby-plugin-netlify-cms@<5.14.0-next.1","gatsby-plugin-no-sourcemaps@<3.14.0-next.1","gatsby-plugin-page-creator@<3.14.0-next.1","gatsby-plugin-preact@<5.14.0-next.1","gatsby-plugin-preload-fonts@<2.14.0-next.1","gatsby-plugin-schema-snapshot@<2.14.0-next.1","gatsby-plugin-styletron@<6.14.0-next.1","gatsby-plugin-subfont@<3.14.0-next.1","gatsby-plugin-utils@<1.14.0-next.1","gatsby-recipes@<0.25.0-next.1","gatsby-source-shopify@<5.6.0-next.1","gatsby-source-wikipedia@<3.14.0-next.1","gatsby-transformer-screenshot@<3.14.0-next.1","gatsby-worker@<0.5.0-next.1"].map(t=>[t,{dependencies:{"@babel/runtime":"^7.14.8"}}]),["gatsby-core-utils@<2.14.0-next.1",{dependencies:{got:"8.3.2"}}],["gatsby-plugin-gatsby-cloud@<=3.1.0-next.0",{dependencies:{"gatsby-core-utils":"^2.13.0-next.0"}}],["gatsby-plugin-gatsby-cloud@<=3.2.0-next.1",{peerDependencies:{webpack:"*"}}],["babel-plugin-remove-graphql-queries@<=3.14.0-next.1",{dependencies:{"gatsby-core-utils":"^2.8.0-next.1"}}],["gatsby-plugin-netlify@3.13.0-next.1",{dependencies:{"gatsby-core-utils":"^2.13.0-next.0"}}],["clipanion-v3-codemod@<=0.2.0",{peerDependencies:{jscodeshift:"^0.11.0"}}],["react-live@*",{peerDependencies:{"react-dom":"*",react:"*"}}],["webpack@<4.44.1",{peerDependenciesMeta:{"webpack-cli":kt,"webpack-command":kt}}],["webpack@<5.0.0-beta.23",{peerDependenciesMeta:{"webpack-cli":kt}}],["webpack-dev-server@<3.10.2",{peerDependenciesMeta:{"webpack-cli":kt}}],["@docusaurus/responsive-loader@<1.5.0",{peerDependenciesMeta:{sharp:kt,jimp:kt}}],["eslint-module-utils@*",{peerDependenciesMeta:{"eslint-import-resolver-node":kt,"eslint-import-resolver-typescript":kt,"eslint-import-resolver-webpack":kt,"@typescript-eslint/parser":kt}}],["eslint-plugin-import@*",{peerDependenciesMeta:{"@typescript-eslint/parser":kt}}],["critters-webpack-plugin@<3.0.2",{peerDependenciesMeta:{"html-webpack-plugin":kt}}],["terser@<=5.10.0",{dependencies:{acorn:"^8.5.0"}}],["babel-preset-react-app@10.0.x <10.0.2",{dependencies:{"@babel/plugin-proposal-private-property-in-object":"^7.16.7"}}],["eslint-config-react-app@*",{peerDependenciesMeta:{typescript:kt}}],["@vue/eslint-config-typescript@<11.0.0",{peerDependenciesMeta:{typescript:kt}}],["unplugin-vue2-script-setup@<0.9.1",{peerDependencies:{"@vue/composition-api":"^1.4.3","@vue/runtime-dom":"^3.2.26"}}],["@cypress/snapshot@*",{dependencies:{debug:"^3.2.7"}}],["auto-relay@<=0.14.0",{peerDependencies:{"reflect-metadata":"^0.1.13"}}],["vue-template-babel-compiler@<1.2.0",{peerDependencies:{["vue-template-compiler"]:"^2.6.0"}}],["@parcel/transformer-image@<2.5.0",{peerDependencies:{["@parcel/core"]:"*"}}],["@parcel/transformer-js@<2.5.0",{peerDependencies:{["@parcel/core"]:"*"}}],["parcel@*",{peerDependenciesMeta:{["@parcel/core"]:kt}}],["react-scripts@*",{peerDependencies:{eslint:"*"}}],["focus-trap-react@^8.0.0",{dependencies:{tabbable:"^5.3.2"}}],["react-rnd@<10.3.7",{peerDependencies:{react:">=16.3.0","react-dom":">=16.3.0"}}],["connect-mongo@<5.0.0",{peerDependencies:{"express-session":"^1.17.1"}}],["vue-i18n@<9",{peerDependencies:{vue:"^2"}}],["vue-router@<4",{peerDependencies:{vue:"^2"}}],["unified@<10",{dependencies:{"@types/unist":"^2.0.0"}}],["react-github-btn@<=1.3.0",{peerDependencies:{react:">=16.3.0"}}],["react-dev-utils@*",{peerDependencies:{typescript:">=2.7",webpack:">=4"},peerDependenciesMeta:{typescript:kt}}],["@asyncapi/react-component@<=1.0.0-next.39",{peerDependencies:{react:">=16.8.0","react-dom":">=16.8.0"}}],["xo@*",{peerDependencies:{webpack:">=1.11.0"},peerDependenciesMeta:{webpack:kt}}],["babel-plugin-remove-graphql-queries@<=4.20.0-next.0",{dependencies:{"@babel/types":"^7.15.4"}}],["gatsby-plugin-page-creator@<=4.20.0-next.1",{dependencies:{"fs-extra":"^10.1.0"}}],["gatsby-plugin-utils@<=3.14.0-next.1",{dependencies:{fastq:"^1.13.0"},peerDependencies:{graphql:"^15.0.0"}}],["gatsby-plugin-mdx@<3.1.0-next.1",{dependencies:{mkdirp:"^1.0.4"}}],["gatsby-plugin-mdx@^2",{peerDependencies:{gatsby:"^3.0.0-next"}}],["fdir@<=5.2.0",{peerDependencies:{picomatch:"2.x"},peerDependenciesMeta:{picomatch:kt}}],["babel-plugin-transform-typescript-metadata@<=0.3.2",{peerDependencies:{"@babel/core":"^7","@babel/traverse":"^7"},peerDependenciesMeta:{"@babel/traverse":kt}}],["graphql-compose@>=9.0.10",{peerDependencies:{graphql:"^14.2.0 || ^15.0.0 || ^16.0.0"}}],["vite-plugin-vuetify@<=1.0.2",{peerDependencies:{vue:"^3.0.0"}}],["webpack-plugin-vuetify@<=2.0.1",{peerDependencies:{vue:"^3.2.6"}}]];var tH;function Qde(){return typeof tH>"u"&&(tH=ve("zlib").brotliDecompressSync(Buffer.from("G7weAByFTVk3Vs7UfHhq4yykgEM7pbW7TI43SG2S5tvGrwHBAzdz+s/npQ6tgEvobvxisrPIadkXeUAJotBn5bDZ5kAhcRqsIHe3F75Walet5hNalwgFDtxb0BiDUjiUQkjG0yW2hto9HPgiCkm316d6bC0kST72YN7D7rfkhCE9x4J0XwB0yavalxpUu2t9xszHrmtwalOxT7VslsxWcB1qpqZwERUra4psWhTV8BgwWeizurec82Caf1ABL11YMfbf8FJ9JBceZOkgmvrQPbC9DUldX/yMbmX06UQluCEjSwUoyO+EZPIjofr+/oAZUck2enraRD+oWLlnlYnj8xB+gwSo9lmmks4fXv574qSqcWA6z21uYkzMu3EWj+K23RxeQlLqiE35/rC8GcS4CGkKHKKq+zAIQwD9iRDNfiAqueLLpicFFrNsAI4zeTD/eO9MHcnRa5m8UT+M2+V+AkFST4BlKneiAQRSdST8KEAIyFlULt6wa9EBd0Ds28VmpaxquJdVt+nwdEs5xUskI13OVtFyY0UrQIRAlCuvvWivvlSKQfTO+2Q8OyUR1W5RvetaPz4jD27hdtwHFFA1Ptx6Ee/t2cY2rg2G46M1pNDRf2pWhvpy8pqMnuI3++4OF3+7OFIWXGjh+o7Nr2jNvbiYcQdQS1h903/jVFgOpA0yJ78z+x759bFA0rq+6aY5qPB4FzS3oYoLupDUhD9nDz6F6H7hpnlMf18KNKDu4IKjTWwrAnY6MFQw1W6ymOALHlFyCZmQhldg1MQHaMVVQTVgDC60TfaBqG++Y8PEoFhN/PBTZT175KNP/BlHDYGOOBmnBdzqJKplZ/ljiVG0ZBzfqeBRrrUkn6rA54462SgiliKoYVnbeptMdXNfAuaupIEi0bApF10TlgHfmEJAPUVidRVFyDupSem5po5vErPqWKhKbUIp0LozpYsIKK57dM/HKr+nguF+7924IIWMICkQ8JUigs9D+W+c4LnNoRtPPKNRUiCYmP+Jfo2lfKCKw8qpraEeWU3uiNRO6zcyKQoXPR5htmzzLznke7b4YbXW3I1lIRzmgG02Udb58U+7TpwyN7XymCgH+wuPDthZVQvRZuEP+SnLtMicz9m5zASWOBiAcLmkuFlTKuHspSIhCBD0yUPKcxu81A+4YD78rA2vtwsUEday9WNyrShyrl60rWmA+SmbYZkQOwFJWArxRYYc5jGhA5ikxYw1rx3ei4NmeX/lKiwpZ9Ln1tV2Ae7sArvxuVLbJjqJRjW1vFXAyHpvLG+8MJ6T2Ubx5M2KDa2SN6vuIGxJ9WQM9Mk3Q7aCNiZONXllhqq24DmoLbQfW2rYWsOgHWjtOmIQMyMKdiHZDjoyIq5+U700nZ6odJAoYXPQBvFNiQ78d5jaXliBqLTJEqUCwi+LiH2mx92EmNKDsJL74Z613+3lf20pxkV1+erOrjj8pW00vsPaahKUM+05ssd5uwM7K482KWEf3TCwlg/o3e5ngto7qSMz7YteIgCsF1UOcsLk7F7MxWbvrPMY473ew0G+noVL8EPbkmEMftMSeL6HFub/zy+2JQ==","base64")).toString()),tH}var rH;function Fde(){return typeof rH>"u"&&(rH=ve("zlib").brotliDecompressSync(Buffer.from("G8MSIIzURnVBnObTcvb3XE6v2S9Qgc2K801Oa5otNKEtK8BINZNcaQHy+9/vf/WXBimwutXC33P2DPc64pps5rz7NGGWaOKNSPL4Y2KRE8twut2lFOIN+OXPtRmPMRhMTILib2bEQx43az2I5d3YS8Roa5UZpF/ujHb3Djd3GDvYUfvFYSUQ39vb2cmifp/rgB4J/65JK3wRBTvMBoNBmn3mbXC63/gbBkW/2IRPri0O8bcsRBsmarF328pAln04nyJFkwUAvNu934supAqLtyerZZpJ8I8suJHhf/ocMV+scKwa8NOiDKIPXw6Ex/EEZD6TEGaW8N5zvNHYF10l6Lfooj7D5W2k3dgvQSbp2Wv8TGOayS978gxlOLVjTGXs66ozewbrjwElLtyrYNnWTfzzdEutgROUFPVMhnMoy8EjJLLlWwIEoySxliim9kYW30JUHiPVyjt0iAw/ZpPmCbUCltYPnq6ZNblIKhTNhqS/oqC9iya5sGKZTOVsTEg34n92uZTf2iPpcZih8rPW8CzA+adIGmyCPcKdLMsBLShd+zuEbTrqpwuh+DLmracZcjPC5Sdf5odDAhKpFuOsQS67RT+1VgWWygSv3YwxDnylc04/PYuaMeIzhBkLrvs7e/OUzRTF56MmfY6rI63QtEjEQzq637zQqJ39nNhu3NmoRRhW/086bHGBUtx0PE0j3aEGvkdh9WJC8y8j8mqqke9/dQ5la+Q3ba4RlhvTbnfQhPDDab3tUifkjKuOsp13mXEmO00Mu88F/M67R7LXfoFDFLNtgCSWjWX+3Jn1371pJTK9xPBiMJafvDjtFyAzu8rxeQ0TKMQXNPs5xxiBOd+BRJP8KP88XPtJIbZKh/cdW8KvBUkpqKpGoiIaA32c3/JnQr4efXt85mXvidOvn/eU3Pase1typLYBalJ14mCso9h79nuMOuCa/kZAOkJHmTjP5RM2WNoPasZUAnT1TAE/NH25hUxcQv6hQWR/m1PKk4ooXMcM4SR1iYU3fUohvqk4RY2hbmTVVIXv6TvqO+0doOjgeVFAcom+RlwJQmOVH7pr1Q9LoJT6n1DeQEB+NHygsATbIwTcOKZlJsY8G4+suX1uQLjUWwLjjs0mvSvZcLTpIGAekeR7GCgl8eo3ndAqEe2XCav4huliHjdbIPBsGJuPX7lrO9HX1UbXRH5opOe1x6JsOSgHZR+EaxuXVhpLLxm6jk1LJtZfHSc6BKPun3CpYYVMJGwEUyk8MTGG0XL5MfEwaXpnc9TKnBmlGn6nHiGREc3ysn47XIBDzA+YvFdjZzVIEDcKGpS6PbUJehFRjEne8D0lVU1XuRtlgszq6pTNlQ/3MzNOEgCWPyTct22V2mEi2krizn5VDo9B19/X2DB3hCGRMM7ONbtnAcIx/OWB1u5uPbW1gsH8irXxT/IzG0PoXWYjhbMsH3KTuoOl5o17PulcgvsfTSnKFM354GWI8luqZnrswWjiXy3G+Vbyo1KMopFmmvBwNELgaS8z8dNZchx/Cl/xjddxhMcyqtzFyONb2Zdu90NkI8pAeufe7YlXrp53v8Dj/l8vWeVspRKBGXScBBPI/HinSTGmLDOGGOCIyH0JFdOZx0gWsacNlQLJMIrBhqRxXxHF/5pseWwejlAAvZ3klZSDSYY8mkToaWejXhgNomeGtx1DTLEUFMRkgF5yFB22WYdJnaWN14r1YJj81hGi45+jrADS5nYRhCiSlCJJ1nL8pYX+HDSMhdTEWyRcgHVp/IsUIZYMfT+YYncUQPgcxNGCHfZ88vDdrcUuaGIl6zhAsiaq7R5dfqrqXH/JcBhfjT8D0azayIyEz75Nxp6YkcyDxlJq3EXnJUpqDohJJOysL1t1uNiHESlvsxPb5cpbW0+ICZqJmUZus1BMW0F5IVBODLIo2zHHjA0=","base64")).toString()),rH}var nH;function Rde(){return typeof nH>"u"&&(nH=ve("zlib").brotliDecompressSync(Buffer.from("myokOYNtw17PbUOKp0zW/Aq2MbB1HYfXVhXy4xf2hJGHPckzY9fwKoRIe4MaUI8FnAwYvPGbplWEHkMYoqITweIbJd2+bR8bEDiUx7ZiaPJJBIivNvrd1c/m6qxbAA9FK9XfUfbrpO6dYuxdTbqvzbzYukUOADwGcHJ7L4Ai2kHRiG3bs1mE7HAQl/GqP8+GNWU//sSUtkFi5KmpSBLIFZCWlJGbs9CZ9TTVnD5pRZjHwlFOTX9RK3DKHeyfbzP/8/P1cA+eQMjYZC9Tl/Xe7Mkk9KQZWUayo8aWPXoilKU0SI+CT2csSl+jKkx3ApCQONm7/1VlSfIn6PSoI305trNURNcgrPDfnKhs7WDMTokI9dv90IP03sgRkWW2qr+mUouQAC9mnQUSzmT2xWyySmmaBpgPnNz7oNDJlJ3GNP072r1CSRLKGqSvRaX/vW9qpSTkq0SOI0cGvY7Q2ogbZCyKXONsttl69Hn3vgu1AbREAygBBGUojpNZQ80a+8x9/ze6m5RAgiuC47xPok1Sn6/P4raUA8diPDGW1Dof7U4QJPvj1E+ac28s6YbtW89dSo/rE5IPWMcm4PzPUtIzusKx0NyoKMtS0YcsOYDpz7ddd0TnDskidtLldC1ae71HPy4NJ3QT6UO6LJngzJr0XwU24oLgjCvNA2nm9/nLz1RLM8sgJfqmH26QGQBz4Iw03X1freeDFhgjU1dXV5Vw9nwZGCJIHcdOs35viWyfHDDC0H+vplXls5RUtQ1otvo97O7h/TGEdCaDKj/jK1+XTXZBNqr6DbVac95G4pyjJr9MhgTOuvB8EG7YDOK0SQDNMYA45n90nfjeR5UaH73G37vsFTuJZtw0crm7tDvjJGg/YB/5GaAg9t+T1u48DmoNVRjWTsccFgID4B4gyIz/It2SGSlltUrbYw5Bsf1++A6xhHIWJ/q3/WwZNtOd3rP/poUQIIRAgVrcIkXLIfN6IoppVhL62ILN+8mqwEjMXpqMafpziwlLQBIQ+1f4eNmyP7uPGu3ZSk05QhhiVIiPZ6rNO+NTenHk0kD5yyKlWYxlxqbpn/7qAssjEFxRTpyDkJFmM+svzd9KinPfsc4WINgcY7++2j66397dJiICIpIzMIhtKMu4nr/Pr6TLFvZ7WWIIYqUjsYztlVrAtsvxVAiobkFzcrUJ05N//hN1DbP23gZQcWurONBe/EtQvZWvXP0DAf29Z3L/nvLbU65zHviVNiRA2y+7ezQeuh78BdqQ7gS/XvE2zy+LN73cti48mqu6rl15K7e3mB2xpoP5TC9d4X1SiI8bQy3Xp0VWfflrJPlTojGhFRTCHc28HhNBbhmADW2DEwY58crvKoaodD9FfD1ZhvMV+2grR0MsHTDBEI+AfkujJXLjF2jcKN/kFFBNOr8LNGMIaAoWdajO4VMufLSc2Dbsql+icHVCpbll+yC3g2FDe7bufeOy2cLtufmEd/8yzBOJTdrvKIZP46z/2gR6WzzsIVFR+B8Tcr9a1/6VkxPK0dMUKjtA4OztpzofBI/m/wUYIDURnmGhSOg5R/kbNO2fmls0C+vxIk6si1kv9gQifYSDJh6UpchkTXbn6yKO6OUAhewnn8Yfyk0OtC2pQqj6Fx5pk0wuXpWZCnsXxHW2OrsYdIV8ME8nmjYHBYGFyPh3DDmowULuiUdbDBaNmT5SxV68yAJuLQUPF1f5vDzs1LMNU0Sxc5As/qHeeDBOG7e3hiADCXp2dxOVETgc6+zrU6QYMDOEDVMl6dn95/FXZsg3Xo8ZIInB529NkFkmye5lvzQRSB69fJxOo8w4sk6L7ZqdfLzrblqcukJ3c3X6XdbofkF9gqZQBuzRxDxg7voMxXHQ0Ah8RnzyAM6OrmqJIEgFERvXXqueYswPd77euO5j6kVgLCJtNp8UiUEMJDoFSiJ7oMxLCMwQdwjQODv6qUUuKlnDmc4WCfUiOOlviKPcskXhQdWH8WSZP8ZSsQBLYkQN0onRsGLr7K+Yc3MC6i9S8aea3Mt+Jj2NE8wJDqYJY1/MhSUUmWHhXUoL9PKU7aPBsAijXjgiLnYomUU5CimQs5WxBYjkoxLhEDW5jegT5yxtr6wiUAl6P7UqnGAB7UE9iJyect/EneJ5nGBHK6BKeW1ek7llykhu/CFhqZU6ERECyLbY14ZhPF8XFEhmHr9BBEI3uYAm8+hvsMgQ3ToSjjPzkLNvAu0+szoiWZa3SfnKd/j2+Gjzv/sw8F65Tht9s4/OIga4F4XmEr0VzILlb/jT7A0CQjYUTN+F4n4Hqc7wuBbRO82LeIqehOr9yEKG511nbpdNelJCbTSnyi8jWHFF8tQPA3xB6vK4A1LLpWYMVpDlvK1Q4o1Vjesp2D2JsWdZfJyV8+/CxgIpUU7KupBckWXOK2RtlyImpmQSpBwDTozV7Tbr11zCoenEz1z24adlkprPMYJTiPW6mZMZN8eU/BXsFwXKKBdzMASF672QnnLTU23WHtQ4d4e9CNWd4hOvviTVBEHtcNyDxnFQkmccMXeOOaaMv63R1aHSZe52d9U1SOw+fFy5cHS2Nz8JMqB4Ly6mFhcZ/Mh8AwQFE1ZQ8JN6NfGLLd6J+QlXXrhEfjk6cMufzkAXOQlrsxDCuqwx273C+bmaGfmCCzJSZPVFzmASgHvbw7dd2W5GZH5wQxQHIUqxLwqMv1+3K9HHUiL2jjRQvFhsdtMZS+k6OvccRqKNy5k+puOdwDjPb267tg+DNdotKY/uaXBuxG36B85bR2tLD3+RYrZZh7scZUa3dQsLCLN5hYd4Xhu4tcbUWdRtnjxHmrOzJgrbjluGSjtU5DaV6B7WAhDPrhdMKXqhCDRwVVqES4qKBQft4p0TXSocQB9R35GwwwHyLd/UMDlhO/VqS+XGdS9cw7VOYegUBDXW0KtkDqi8DuVLPg9pinOHyoBxHwbLewJAvB6ypEg/lakJhOvhJ4a8CKAgZFqDgKKnyqwIqvFal6Yhyd2akKfI1pNjYYqII+KBSaeMiK8jFCLv2VKJnlKELMQRNWnEyUNnOb1uBs5bgIoKh3COK1bi9Qx7THzd9CRBVXr7QiWRk5UH+g4iWUJMvkNCIkfII38VSc/Wz02b6t/28nMZOt8Ev0coi7jHX0IFk9+eXLEO+pn+tqj5moeEZ6jdDOGX6xBw4/YS6ETfiOW9nZdKXCE2AWMRhri+qkQejoFjias5SBREyHsi1z3OCOvcJaP4icJlL1GkF03ZoFFvOjz9H2gCh+ZeiKt2kX15T29bs0G097WqRUhy0DZ4TEGcl9i3UqnlXq+HhKHWujDriLE0084ozfSwZh0z2VY1/nlQS2DmldPKL5VhK2c17br/i1SNLlKxWZhhpGV8i84bRPVyXFf3H4rrVtUtorlUid6UJYR0WVuJOpw9iMoo2gN0zqxQxnMi7KVri+seQ8F4ENh10H3sYgHN3bn5F8Z5Iiqc5VYmYcvNc3sWxZ2SmCOnyThUU99iEr9gQazSepVqEgvrMgvJThbnDWMssqezL2un4d34nnv1Pt6ZUJw7i43SH0eXNW1uHnyTmyMA/4+ielWEsk3tjrI1VJ4LPfoPNnHjikkNg+ED8Vm/XBOWBXiywj7vXTbckeK9kHR1/D0ar5ZzBFDuBL07t6oa64qB1K6Bd+RnjqZ3o8aNg9XcxpLYx/8Ve9sfCAbZOKtDr8LNAAPjxZRbaiXAfiWu/R1oazh67Ift76r4W+vjxbQyEILg6Rkr3saJOZp4Wi4zrFtx/GVDBvvXg0U57YOTePlDs1El9VvEtxwO3PfkPyUCoBHu1jOaFhW0Pyfx3RWHdJoOTs7HR19Ok1jMB4NWrYGjDTq/Xn2exALi3CJVrylPDie2UrjUiZO5/aFIlcMLfVcsXKZVBsXlIfJcDT14QYmJGcQy5skGYlEzPtpwAYDj5G6RCapwZqQx2qXJvRqGskYAQDOv0uprBsZS5pG/xwJmWmTfG1Zt5z6+8ekxjGnHsuXxy2KxMp6z4gIAcxMCTGH3hDpmOzOhlu0RAOBO8QjNJomX4+WxmJmuQL/tHlw98MJUjXfFPKYRN8dmCsEKALHzS4dn+9PJ6MXHYJ64NBY509n90EK+ndrDcEN44znEb5NNxG84seECAEnH8LLbFM41CDbacbi7ZqSsEQA4TReFY3pUI901w4n30gZ8X6dZtCvTAyT0dxUyAAC6Fgnk/+b252fdZutRNwaYaX/CIcBqt9lZFEC6NteTN9Dl2XdfzfkOGboXxBCe5D2MSv1dxVsAgMYNKMsmomwM47p6Yow5p8lXCFJ7bfZ0HxBtfioTAIinoHnhIQ/XPIiBn7XcQGWJPS/FjItWWwCgyOFVhs3hzbVH1ZjhkMsuAYAWVZqT3j1zQep8Kno4tBJ6GB76uwpsAYDByb4upvAIlCjtNRHTCCgqawQASjKiaEwD/oCiH82DN+6MxuBleX2RVwEwuFls1Iw7/DqaSbuWdwA+U+mtK6kfHsx8hEW2AEDg2FinDA+Hk2+3yirC4RQ3AgCaKkrGNB0dM/G50m0wOn4ZUWci6kmAhevvKmQAAJRKDTX2Gmh+tovnqYqZsdkugE4V9rfQgfQw1Uvnd0Zd0v3AgJ7kl5BK93cVbwEAylj8NPY6agZPgedjRdDYaPfibouR0kwA4EQH05xnPrP2X53HjRu2LNdOY1yx4QIAFbx0GsKZwo3FitK+crfFUHIJAKy2oj9Sck0z/nBh/LCHL8u4wCUbLgBQwk2bFUX45MZkUNojd5sMJZsAQETnhM1i85t5dakx6cmfyrsoBCsAhjqL1RbVV0LTvTsj0+xzSXwi20tjt1xcKsYFAELMPmRjuI/DVNzDYZY1AgAhMYCgUOGj5tDqyj6kyuW0Ji/jksDPqkowP0j32cv5CIimnjMeQd9k8XuRgD0JT9kOgyQlaGAASjpyRXjyK3a9AIteWGjRFfxAfNjmwZwKnXCxwNXAyK9/ZXS0bkGvgRpe9jA9lVe9Xuj7xKsuYuCzuJuCi86JmXHZNzd5tXV+gGo2bzmKvAOMj6cxAOdNPVihmKF/9c9nF80Wg+0iYnc+l7Ui0xNrJEglfYdc2o6RrcWrCXoht0PRvSG033HewHCBwsOms9zH6SyvL+Scyg1IwqS98FzhNPSqfucGCu/iP/Thi88Kv57mhEAB0oQRL13kV/QJsZvw8InCQZHq2vS+MdI7wggWI/0846j3Drg7mSmoJaYdkzmsTon3tMxlNamOcVNhu2Fvt/nGAb83k6olKFlDdGmFo1dMSgpkPLSAPC0m6CrXHl2zFGXo79AXAwsndpx7eUZ+YLcRLCCPqN6euOIxPeTuPgas4FnLIFNFOvPNB/y+1hCZDPpwE8aeoDtW2bY4NnjEcpspwXV4a/G9wSP9+e99U+SOcvl1W7YMGMJyG+ceHvIgbYQ+5aKbZnIeV5KoJoGi2cqwOTc+QIsXr4/SUBRokduyxMK+9cZjAuTjblISaZnxDwHLQiWwgkW6tivTetNSSiJjMkRxNycOyvgUeHIv7lEzXwVTJFu+QOh4OdZqf716IXoe6fPcMeZ8EszP73eQKh/PksT2NueTV7GgiUMDr+kZEQkRCGrQdpo6CSxh9EfKX7RF7vcobxqlic1FreQOQdooMQx8rCPUuzHqqT+nfnMcg4HAO6D6WJnA6XgNbMwfJN+ezu2cELlTl9QiO87k5VmCwuuWnrj/K9Iz+w+l1hYuF/XsGm+IOcM7f3n0ub+bXW+/Hv57B1C1qMC4+qEIYEzoH2NiN/T+6jhqux8uOgQCYdqHsPVcrq9aF1Vbjct/rfW+87pra7ABRZO0/EHEOfAx5mIf96SFDUJ/7ToS676zN28JQEjohiej3/JBR4/bdhMAoslcpCpbmNQxmh1BpvGJmwsmz/0VHG29trMDa7oAeNN4C3I0WXpYBTwJWLqSmE4A1kHpzJYZbMgMpTBYxKaARqJrUpe/lfXUjQP5THsao+BChaq5ZRNyqMf2AhlMm9WLtNVhH/HcNvftdfhHPGd/H6srkSV3PJYR6NfEOpR0nsoqFje2SxTfttKb8GYcyglY65cpKNPbagloSaxmASZmIK4HIOhXVQLFmfNCwW+iyNLZSDhnd8A7PVtJI3iPCEmAXdrlNUm8mTpZOICKlrXAz/ECENvXJIIwKj6v54AEKS8u0SRxzoZxcSTs57uqdYdt2fVq8AcM1yCbDvl6lW/B5QrSY7EyyuKATr1+JCHWfU4bl6oyt4fhHPlIb/TKV6ICrGsSO7cBxbI9sIIR/+iGqC5LsTHhmrBBvoTzvXC3MPHcz18buz02M9m7HXN3zwR3uJENJ2a0Ek0OyxqXNGekj4WjVazJKFeXNZV8/T2j1Oh+7E0Od7KhhDTidrAQo6DnY+iredEblfCN0jniwAPbt22Uu1zmns6WXvc6qtQU9hX0deV8KPSwXN9TeIygxG0iJxztKQs8HOcAz+eqamqXLlztrDjulwXytPZPmyVIgrm0+i09bmsDTAT+ei75ZxR628RrFihxJfTHTm5BleN1a21caMGyAE1UOX7bNCeMGmz9EiGoqXwxadRubweozfpsKZKNC3c/EbLjXgJ6TDi2g+/jfUrGybYdb0pzkqNZOSkwksZnCpkBAA0nGhpVeDUkpd0aVokmAGAhny7PgYIqgR1uIzcr+rTmVvJuRZNbCE7IRuEQ/HbFO530+nhtMyfrNGsdeM7ODACADCWKJOX4UNplJt+wLJoAgLxFG12+BZquFOjlVFzZF4F3q56KyEmoW+GMuTO/6Zxs3xViKgCj1UhLiHDh5FD8bT5zsj0Xj05zsqRZS+DEygwAZBlJ1HJ5YcUy2lkakkUTALgSEnS5AVKqAWxEecuyla2/IvlFKOAfvIfo3N2RnrqEazifhQh0OcasZgDAjsAV1BPuWu7M2bnQhbfNdhvwbm/M99E828YKvnss/weenrXXIb91rPfEmISGFeWem3GYnbBQmDWWZ4a19yQTuV+iG2HYTPWQP3w4KlFUlC1ttt0/yHq/EMaAVn0zGclp7AuuekSsZLpmnr2qcZnLC05lSBkXv4gQ6ryV/8RO0W/FfHRWOFRqBbyy3fvICktEi7V+rJrRlzzv2CSHkDdc1h+5n0INOmzm4VWcHgtMw0QtyJC4cywKFJrrPZdALc8GX98mKGVdib6cKh04CPKj/eW9vX/pxSY5JtWjuT40n42aRw8+zHLOFMgyYxil6gyR5dFK2W9rDdGG1WAwy+z6WHVWP9lJhFARZ9mVzU3niqbIKhTj0gWko4I9wo9m7VnrUg/hmuaOs0+gcu+UjuoGCf1Mo3vrdTodu2fQwtSjAreXU60jc2trFhCPCsWgG/7eDj+5t89h+LLC8MpP4VbmlhjvgvmowZKIgPJHQdhHurhLF151q4hYBJnVBCm8+u52YOQeIncUB0E+h5AREL4QEugaJ9CQptw5OG6MfFvEo3BYi2FCNyi7+Xwlkh3oIQMdOoZb8YXcnueiCbpvScyypRJSPAii06YHXL/7PFP+q6mvkf8fOLncLrI4UxWcQS6VMQMAI7hCN4SvbHrxpbudNnsEGNYmifD6rzIBgIhi8VIP7+gPZPwf7h7eu/DvLjZqxBSZx+rdPM0XCJhTcgyvjYznHHfMrMPH7nS6wZWqQDAYV3fBfoB/ybucOVmc3muIdTkWtxoMN9xTbNZF/VK3HYUj82FoXWr8jxrpzw3n+1c/rEfJepVUKE1y9sLix73q5sYjuzEHOOS+d394Nue61xNw2BgqyFD4f3dNYJ9pD19t8K7aMHDoO0ZLP2c0G4oIf/VYQCigayvDr2L8x95UQ7af7U+NsdNt3ZLqkqMcteOL3aG6M1709s/GnmqDuZXoEcbI6oxxncKPivl3+PzW6WRwYc+ZK3kONxHfjo1oQF5cmWjc+EfpfuOZ9c/G/zLv+djrosA8kKEJ8gV3sltLj4vQCZJHnH/0Fel4d1ir4WRpuBfpANXM8VRUVVZWtMI3hHlw9vzfq4cBhBQhVe7WaNatcCOwZGcGACSQpQh7QSm9RDVktndAhk0TAHDAp1X3KoJv16MEAOriXFgrJjeDH82KpqtGhLt8dIWpeWPr/MH2y0u7Q4tIrsIqByCMCIFWatLu8au6Y7NHkpfPlDAj5Kl4ygEIQ0Ksb7h0tTzpaW/27yvbRqTwIyTr7LA5n636GeHjei0zAIAzPk+KMJKKYgTFZnsTFFg0AYAm53Oqut/l1NhuEgAwiHKzmo6gex27r7zCuvnFnPVTPcHZYXM+A1GXksmvZWYAQEQoa5lnFImMOzPfEFCzTAx2QwQwHVmZrzo9q6mF/sKEDS9hkRb+SONryWg03GANqUW6tc+0YGtdbe0MlCK13f2gO8jNv6Cr2gA6KwVA8++MhK9thw+o0248DaW4Cu9f3RxKLpMjQwtvCfsCkap+ptW6alNMEPo3h1o8yY1UhhwrZT9jGwnSKCB7VkSSdZ0RfgAvWrafxjIvDf+gHTXooINo+R0NroJuV1HW3XK2PFx4tuqvm9WVumcEuj2wMq6LCr+moUNdpH23whnUYNHkXH8WAjMk3QauP1slJ+j68nU/uR/Yozr32Mm8fzxf1Cs5H/RPnNhdGEHpMFrkvhmHOfKOTW1DjrHff54jaxKPdu9mce6hutUdIIpcj7R0mBX6wgIZG5Fy6JyHXE+24WpWbFoBMONcMbj5RWIz+suFG9p2vHmYAoB+rTYweS7ujVHjHHiUW74O7zysX1xzkQy1asmrPMjAtb7n8qEdD9xZO8IB4XO99vjYhv9upzWf9YElgFCVQf3rZeD+HDe4iv3iq20xZvLBWdJ/pKVLs6EF0YR0gOTFD3poXu/w3kFNjOF9V1F6rY71tNgyoxHXYHMaGZjiqK8+QlkMuQcXicYJS/X3Oe/3eyjrSdsocHRGJikZaAsnYbEyQEhxyZGNBdFJMuy/p5W4DIWNFmgIu/vtldeZ4hKsKYWBgtaNx9Z/0WAdpEo4u7gd9lsPSiWggF84QodbkbEhzffZa3bH2oWMqbsV3GCGURFwU8YbhewRuBbExRdnvs0HLgCf/8Tu1ct52k5bUy76brA4YIaN2iGbLMZG9W6kop6m2iRrqrcLpbUC0Yl1wRcSstow908IUYpRxHC/5jMNRre4YuhsVo2wwZg1NOIAd+tZa9+6QkqkRluivO0U3w6VHCH1eVwufBUzsMqUcfZ8/+uIH/OClemfT0SN16wrAhbdKxy99XdBp5jztvLB0g142HiVoOgu4iTfOe6iFltLg7FpCTXaBIyj5prf/rP+ETIglgZLXDPIWbGgMd3ElxmOjbP+7nQmO7Q17nuzlPV8oig/POSS/kQVTRPX4maOvjGLfXu3sb8cqG5t/i75anJS04qqhjNBllLLxYQNiVCbRL7o54AhMDARQsOZYqC4zzh1fIVLX8xDzUaLtoP2tZajJNbNBIAEBTx69PNM2bVrnUTEvDLOiMqv9T6yQ+/8XQOfnMxvJj53mRnDSgmAsFgWXePD9tBz2uSVpC8Ww9kVdMjcbr8FPj8rpQ7SaX8GqkMujfC248Gzk3JP6HuldmioPC7VaN641N2Vz7wzLqhWavkzh742tI9oU7hi8eE3DPb1Z5oGcy2Na76nyrjaj2KCgt/PYSLx50RaK2jYaP650BFHbHQhs3gfyrL3mZd5enHe6g0R86eoePBYhXkwVtjD240fhGjsUln5/uCI9yIpkzRPP1X+fcpSz75dc5j0z2fdXAUf3RO06um72yyI0+SXipgBgCPEGTLPKH5e43IVTyQuUUyUdneqhh0wgi0TALB+cVi/okcOcMalRtc6tf0737PASgq41lGtxfPeM+3VZ/WGImniPmjUYWg8R9M8yW3nCV+3dR9/3xOOUl0uERI9zVAAXtUxtb8ZJ53SzF34OdL4wTuBtT4gqwtW37DRYYgwYmN0FKygJJmEC1PX/1mcvgxlN/+QnN6mIwDoHRvY3FziDKkfdEXvGof+zoElPQMNFmmmhLF61GTFRm171mxws8cdbwGZxhRzE40XzjhPAKtDt56YeF/aaa8BMQbmZjP+LkF76GOMxDHwM4Pz12NZrIf6r6/VXCDHJ/Hlr37esCXzJLQPuzfmiqX7zWKdzHPNCCWI0oIRWRWefgNtbKw89O5bloWL5UV7snrMUZPcZmQMZJEY12MKhrNnuP8/gMl+cfiiDyOqBCftmQV9XtSuQ5tc22PrXGRrCHr7BRS2oX3SezBvhnZukEzNJ+PdS6oGh4Ksulsk1d3B8N8Rn8+Pk6+nGtCvgRaezzdaEKS77Cv9OqRWeFu7FjHm41zjAIAfxpWNc3OfaR68CsZaZkiXNGWtMY12pvGb/DF52/Y/ssKNrjVAK5tVXQeC3zTrrO8kWY2Gi57NpbsH5JaQn5vWq/7C63rZttiocMSCo1zxolEazm9sxjlSmYenXKmpyGN/HYx0niWHGjFfM2z63nzsVA3dCZsliTUHdDhG2FjzvK/RBNwUMD0X4u2N+QOkQiU8UMD93+G/6lZBE8Q8iuYhAstcxzj24yjhCdhwYF9CTOQbegoTYKUduxQgaxipaFGsj/NbTrP++D5w1jA1HHSOqphuQg0Dw5Fgw7DhfWR7sKY5FYVujUwZTTUlalFgVXMjX08bLM7GyhRX3nHv50+Mjc2q4NRAVBtj8lL68nanh9uPHnZKVadUz8GN8b3+V57ACw/r2bj1Y7MGUanwYSLMJmTMvkwnopFRUOuYhStwVj53OrMQx0GrGlfNH2eJHYmwBsP9LswV1sIJhqWYH+28WH0idZtl4CXTGPZg4IW1gWX9H0tibmXHnsD5KV+fgv4X66bs2QimD8cj1BDncbX1CbEtsW12stJXLlWaK5f0Xz76A/EjPa1irGk+Vj3v8vP0UeEdvzG92mBKtikxPb+6cFmW1G6jhJ90wkH23QRsJl1gVj5MlEq2LCXwPsCn5OIzDLVp3AUxLYP3fehn7FzhlZipZzyPGQd7dE7pMRJursRtQXWbN1Lfk7gS8yxw0hUA7FD5Au7WAfGwwxFHuUlOHCd1aJd5jg6Echoa2HZA/jliwr2H0ItVdujNA0h2LArBNeLN7FZVioqQhBNmgB0vJvRRHHcWOu26VLQwXXI4pWWWpzjca+tuid/jdnlthDIujSLEJuXGy7Bn3+F1aCo82Zwwam5t9B66zxxz4my3psWcYQd9FeWKImEOgQjMQuy/tJjHz3ji4QH3rqEvGp5bQgOsWzHXheLEw4qMabeRh0p/wh8s5retnyfzV+W/168ouvSvnhDH8PedGBU+x42Yt7nzqnK3+RqvrOdEUWY3kzcGXxOExXBehWCUeGkDEl1YMYbaO5KL1a+y1QXHLyr4E9R4AYTBuqMTNmZ71/4brVbkarw06yqNUqOJM1mX946tbPs4lzYm7EmUl+ls7/GBFSBElzHZJVRarmVkkDFGsCyGKCQ2pBvQjkC+FiSh59Grci5bFW7MrKTvNAU6Sf787MLQCP86S92VpS7ZJt91riXMAMCFkOtlvpzQdlNojprFUh8AdzY70WN7Gux5YyYAcFifkWfAPQqb28BcOfR2JdpWXz8AcBAkLaEUQPUxn9VQIBc7BUWJP+/AEDbB7sHZnAGjNd9XL+8G72pcko0gVs2YEtuG3mWzzUAs2UI+yGqZrQ3khL/dgKBcRQKgEVH4Nrotrw2mz2G1gX0Ey3lInkIDCWDO/XujPSY+Ym7fq4NDZjN089UlficvhQsSwCwSxZYtlUbv94Zzz0GncpU0oseS416fVr1udZiAuBgrYwYAOkDSzNVghrB9jJjsg6NHjrdYX4/w8acqmgAAxsJ7pc0OWo3pbTFd1X4AAIXYRZQXNYc+Gs0NxhZilX8JwhYGES386+0z+oqqyjHdPRh/EMM5Q/7BTnHQC17SOyzOQvrLKQBD1kvNAAAFAMhc/UwISJvBYFeHwNYxVOZf8pydMge3XBxuVY7hYn63bgk8Szx91OKYB1wOojWeBD7eONfNfawWRG/el+u6Gz/g7d6YZUJdf3d3eJ5M4DPBxZhHJZHwjbn+fKJ+lY77N2It7kGHeb0FF0XReKKnNsekxQlTnQeEtMiJ1MLS5OUWtc8wxoyQlmejaBAEl7daJvZfZoIrdD7v7sZ8B8y7yy6/H9k1eS7t0i1Zd5PCdln2cKmIGQBYUS2BVTNXhBW4qoqo7GjbRcLxNrI+EwAQ7uwJYHB/2zWgeun9wU0SHDKL9cj+6XGZ/Ty05Mvar2sv1uE4vc514e1Zh2rajQvHyWe1XxYWAwC1Ol7weZTMcjDrbrmseuRTWcvwT1DVrcfoNedTkkVSGv+lGfbLTDdCxPILl+GfoAbSIwiQSaZhocp4H3Jnv/NA0rheA+OScoAkbEeSsjluupOke+WvlfUUC0HKUIFwEBR62YgLwVWDN7JG1MxYEdPlNfwVOmaJdr58rkle0E5/gHAeeXYUzmdWofPT/pQ2NyZ3tJz2/iR5Lm0K3MhUE6zL0WNjBgC6A5uuemLDg8OXrwhcHxX3+1kbdu6W6VyBJgCwThbNSJDGs4GpZT8g00452SJV9xcEAJ52E9UYC2q0ZhZpOCWzB0TDmTLEUDQctO0HR0POWQVyNCRpyrWJXOeY9BC6y6HksQc9pQqbDQijZouDYbwy+0SYI3/fFkzbVXRFDzvqdMx+I1A3P5EE8+lhQD0mCBLA/PvXqNYxS75ofDU1Nu/QF58CcUwaJIAZJZqP1iHoPapPN574pNqYMkYI/udnf3EXd+SPNSsXri5jBgCqzXAZUEkNZt5iby9K+6yf5RG0sWkCALMwY9qwYLtSzu38nK0GAUAbnhhRIlyl+zBwSxur4bH5Z8BDw8AN47T3DlGVO96aT+zddSIUpw30xmFPdHJGj8zwczidszJL+bFqjmskkuriW+EwSgccLZH0B8dRsc9z/CVxjJ8SpQ4iYscY8S7/smJRDfB/9uy23Jwf2LGm8Y837c7qxFHmRW6DHx1I00YfQtpFV4DlF1si2SiSFbvrM/EdXx1bh3fg4Kq4uSWyCj9pZO0FHIvwhCp+ZdFuSXaPaLmjyBgn84bcSCT6IzC349C5rJJgOZ+oEp7WSJad52wyM++n1Pq5aM1c5YZMiS7AmnaUsgpgXNDJ1RfWdHc5/tVDQb6N+BznC13HRqJchCYi5lbxsfOtX695sqP4qQ5lAwdZLYsXL85u9WNEPapzYCNtBRMQrgrsOSMVVaYG0PT5SSN8nmWqFQ67Lm7HHVlnU2hDE2x9fJdfwKYmSzJeT5EDFWgtyeMwYnLuf3mHL4CBdId+FhbTYjyPx2nXo9Qd+yjIResf++mMLr+ySD8gnH79gJ3qx3WITAzcQ0l3mtXvyScDn25PXneWEb4m1o9mokhOYkz7Xr5n8jLE1xgPvtoR2kpG4Le20My2JYYFQYUzDBJ8E6e7c1VzVhriC0VMRRI5uwf6/g97SmEAMhEXoQTvGA6azSrJ4eYXItc9ijoxScjfePMq+sDKlChuPNuRKVsd+01l3/linWIUu8qFucJBUR+fw2DD32yMx1d7lMyi8T4x73uf7bLvqbb6+DcQT3IGvXLbZw+3y6eWu1w3gkUzFlupNHy9w1R8gEFoNTJK0Dx6zZlZcDg77HkKrSHo9c3CDUrFMUlpS4fzx3IfdhzHkr37lz07xxuuFXNHCt5cnMkzvxm4+IPjDcGVa5W1B86mkWKjywvvWQcASIap80co05StxdijlFe77zBOjbkUVnuYNj/bZJYUd59KanZozWeNNzp09H/FFxErpfYwvTg1zK3YQ98+44PHejPM9Z1OwDsa5i5PT1C1bG04kJ7oPztZ9DkFf4b4VazzydVVUuEKfeEV/O4QRp51pyyXDqp9SX9YKEy/7kpY0xeTJtOL18tk0zVW664Bw0Z/R5LNnWTcXREOn/tW785gYmPAQtbN8B3nNOG75W1yxiSa8AGoQXpRCpwpGA1lH2c49Gnk7xv8i4rrvo8r5eOp31dLIUiHQ6sLa+L+OX0AMNJtuAEDS9GYvRFYQhNRpSP+DprTodPaHCE3UN+ul5KJ41fyYLeCCIm8PAh6DxG8GZKLqwuDLSpqGMV9jgA4SAe4zoeB4dkvAq1Ka7Q2a1kOkJSEOax/v16DcjpGwwAd5v0cCaE9CJ4uHJA5NGshclANpr66iKWBBGhSMpAolSml/kqFMnotQVW2WvtNOg3Q12D3xq6axmtgxPb0sV59is9SpWP+AYhc49Ga6mssXcgb8txsZjv/HbGz/lMJcmqT7iRxEH5vIS9Bp+4L0cs6kdq344efk9qd3tbtl2BUdXrLGBEWl1ilpcIoOrU2acuFgyUWjn9ZFcY9sYyaLrmND/ZTV2KpMFtYSzDHt8wduLCNvSsneS7R1eJwBOs+Jk9idKkP5LQKx/I9z6mNCUyEJ4QcWCw0tFe1LQCtLA/d9firEDlbKK7EZUQcXNgDIi6kTwiqv5D/6Rd4dlBxESN6J3OqMVfdRd7N5rVMIIBEqnFHVIpS8uElJhJJtKlAA0p5lmj8Uf5/ajInNVMBZVqe7G++hVyVqhhLebnNaCIz7kCWe8WylN3dVMJGJslC2EJjGqHCrpModMc+wqno/Tis7qwlSO4Paa/hu1FiW7a2uWnH9x+kri66yirZuOMsXLuPaMK3a027m+r3EqaiFIar9s7Q4kSN367Kbfvlq8JQ0YsnoMomQRLSXOH0NihcMldyUYMwkB83aAwKRRUbm4PWczVM2GTFofoyEvBIdE9xb4/ipvyqGdUbMuK5PZ8fYWzY71Q5A1zfsW8ZeDxNulA/0tlJfGvjb6mcjW8FX+mWt9WqwUJXtwzm5SiGsU+1LeWfyV5ca4Db3Z62pB4ufnEPc53wej1A+j5r/OqahsZtpjPHr0LrpvWjesYXgf1L3w8yXU9A+/Pg2nkpXR4tpqkgiYL1qWIaiUGq4/WmJR1/5SyW827JNeLXQ6Xo4iHWCEjHCv60fh/ZrKeyouxDesDjssMuyST09tWJBjGkGfhiE5Xyfkj4o3XbvnjEOZT6t6Z5457eI3RCPu+QlhTEBi6S2ROotQSm06D1E/FN3CtriG4gQNceAmUuRspKABdBGO2gaqbp3he3ghnppOd3ZwMtRDTjHYmusrIohO6O3tVcvPM3q3WefS9mf99l682G22XzGA3eZDf/D/7Hm4sNl98inr2G2/WO23pDufnHmOAlDL4Li/wmH/V7QwbvbxDK0ES+7GLE+uPoUWs9vjXFSIudZay1w0Ku12t2yVe+hi+cjWaqh1P6dalu3aEaA85uvMUrORBQznO+6RUbSGaiq6EI83IPQ3hozGuN4ivfboGKuhRvfLKUSXbkRJ7bVRXX32m1ox3tHzm5Nly4DWnPBdy28l/IDemmC7p02xZXlXP06MDsjK/m1MC0LtvkW1efjsrRSmt8lwTMm3Q/wtCDhUaDHg+vH3qCKdZ1pogmiaA9GHTVKMsigXSz9gmjbPNF4GZp/kCf0uHnamiuDGUGHWjxDp9OAByJsqk9azJFDsSjIxvXJBpipzcxGMjHUz8buIelCoEWRYg02SXKJDWtsxu3AsIlJJqKrnrkRbdRB2mTBUcVmBMeCfSKYkgx5Fdevk6rrc5oOStXNAhDZNIVr1FPYSX5d6SThvI2emYeOqX8DRJI63R91s0C06JAXixQ1b69CEKFBSywtWXDOEGRi71ZHalE0XVC7Fw8pdI6zypnjkFZ7IG07lDZZtymJPmJG+S4kyWOl6d30GxDXf0xHgtoWx+UxPqzpoN154uGpm3uFk42kO6T1t2NTxbROb7pLPn7qPwX3DQitsBM1pa/bQlaZlxCpjXuc7Jod/DHdBW+MalAudYPI/vKFyXIXfXcb2pFjAbnrtVVI1qrTwFoV11Bp513oOEyjxBxdX23XyYo3msj4oqL7DydfiCpA3ZlTxe8Ogl0nBwHTne0troi96m02j9e6u6YeXV0qj2tzP7buAOZt/R0yhaJGueYxzTl6MVv5Xr3cLZc62y0IjeKe0XY4YobAF1mv1Q0Ei/EXlC3fumabhmnKO3LKU28NTRVPI+HN+rPk8U++kGdVRTPBG39vsjk886grUOkPx9uMvmcPJZ7MGdZ2sir4IMecyXVzy5pmoUpWEY66VSnD7eClfuLyu065PzTHv0ib2pq66sZHGgCyVUBk0TucmOQBiivN1Zt2UfgP6RHHWz8eB3ZG5Q3EOG5I2xCcFmUAUx3WdFwRjguo7J8nqElRtZ5a7dxEAScee2boKSRAbZMeEpNjIEwmXR0pwPA+02gUJNqLiUfoW6d6vcaGwAu3mLorSQTUBlRcFRF0+c0sPdUhNCutgX7SAsrxuroWoa77Cwf05DmRXdgeCYXOiexgx+DnNKyCYucodTCTPnlosslyD9DDklt2zRLSl7eGj8grxoj6AVuElReZsbWMrkFiiXBtEbweRCxPJEwbnxwXSmXWmUR3TrCqKzB1Gx41AFGvFrWH/z/TlcbIiUBbx/Bwapoe72jI2f9zB11UrFCyULGBE3YJJtnANJ8a5w6hJJLL9zmYeCpSieYHAso6kgfGOYducYgvuuKASPGdkuZnBD5jV5vvnQBPpQZM6CT+ow/KQ5JuomfN+43k9I6fvrI17OfWZNIh6JNqRLZ0mmn7Ab8jhWuVtJ2AT6uJhc5imarW/KSJKny3AVbWh3T+tUtbYR6oHLjDOwrpHqwKbEENnO80AzruJ67V8veLIte6IVMx32e02aDAMpKBiKuBfpvizJ3i3/WHQECUMu2Rge3MjZIKzYb4huTkP/Vf62O/jP+xOgnFp0aMNbiRopbwFNA/zr/anA2wMLM8+5+l/CylUsEOf2ySqeJlLFhWljOI3AUrclmZqVQNRt5/DyDEuZjS9atYuedNPa9abcFcM9MhvKxJZrbjlxdKqXL9mkAsImNu3fKNEzXry1dem53x+3nWHE7CkHzozUyFCNml03PBpDNef/vz9pL9IcAO6DpBb06cijsHH5QK9X7MQgmnSBA/mI+U1vZrj2r3GljZ4F6d5YlZD8yLzjYpB2DAN/KeBWJyTF3aHn0qwCDpJ0pgAmdR1oAHmOLI1swLfiPZ/DtVFjAj96R47VyvdyP1udklaPg43e+X8pr8S9Fb2xRKat55SssEPf2CXpjg4ndTB4cVDF8BozbrzEPi/mRuVVZdnEEaO5eUZaFTW3aLAzw76mvejIstmcHPzZlpdAg4iTWgcKN1U1uK2XMgR+lbDJWXWJXEK651wWj44Kpq5+zm94s3ndJJ0SuSubrQ98uOMW2doKwgE/ZwjePzo85FY9ZMhaTL+eweYoh6fpTXff+AUOD2BHZqUZ91gHyNq3hJrJ/IR6ZrJsbRO8wwsNzXkGDbToKoglrODKqAK52WaYt9cokI8k5K0cVyhtkTjWaAmC3Azqiaos3npGtn+Hvgvr3df/s9P/0IlM8DfGrWxcP7cbflQPCkqVZNdovZBw/qNx2d3oeYua1oJ2HmHk/pzkDOWw/MrBod1elk0yrE2QpuSTvkqcqpOR+OXzeSlMTinzF/Ioqd59LPm9nn55vLpAsZ2KaVRO6Ge3qBgBuUMGLAeYMHZxOJNW5sA1jt+ocBvUK962GZ9FZkfWG1WqjPvVq+dUaBHRbEfAQIbfWXXSVTZBKu5bTLW7g/Lst8Ao7/wGAKRD0UfwsGoyP3a4LzK4ZPozYW5luhHfWH3XAXbwCNAGhejwBtAnugHkvBy4kx+4GWPU3bQcAWFXL9Iyv9bEay/TSWUTttmNUN7Xjl4cb6GZqpOk4BRztq6RtlOrSmwcAoANmzHG3BdLkmfSB3JHZQUDVyoYYIDcOqJA8fXe+UX3Qu+HzJkimn1b6XY9s+n8Wug2wX7S/947EGtgKQmNypNQVF8X94v1m/ow0ZaZyE+83VdsAwmC6nNx8X+rd8HlzL8zMqfikmz6TsQ6p/bZ/lP4U59sT7pXZmN9/rAXxuiDWaPV9hfAC45S+bQD32myezF3oEp6hnRm+z3/Nd3dX68+00kKcVYJDcDXFpbJuAEDPr4HXw2Vdl3ya2bmea5d3Lgc18xUS7tAsKisCCXc0M7pL4ix02YpojYgJa91FnGwCVVK7nm7RXudfItC3O/8BgN45kHvix2NQJrulBGrBxZkFdRR/YQG58QrmsNBsZeif0wEtKvFd6cI/lWifkIqz6pY46o0P3VLkAGrNpbIuAOAcZBH7YuS/q8fUPcfQ/Prq8WX86uegppvz6h2bJetJEHWMqMKndLMFMQB7ztIUsdyzowAAkD3EV8CAfz3k7oC31exjazi2YrchS71bBwCwDeKeLeHSuNBLClHcUG+RzTSVSx+biu+LsKSsIR9H/hCHdOyaBMYqqvKBl4YLKz7utjy1IBDODI2FLm6lk1fU0Not+h9efOnfFN7KoeYv27dTVeUA9FJbeaVpEvhya/2bba2fvvR3+lJ86nmlJWr2iE84E1LD9iVHPbYr7HJVEWXqWlXgUjk3ALACq8HIkiGh3GTwRk7syZByiOXVj3ZWpi7Fy1eIiMIwcvOKJJxXEEWGm0mcPExFyhABAGs0LWolwbKrYKJTLaJPY3/cGhQz2vUPAHBlSBqKH9npz4LkmuFSIQKVyyI4gX9pipPIXlEm0yvHMcKcK3mxbCItJQt0l3eESOviE1dTWlKwRfh97Ea647yQPduUV3KljiuHOkhSMxteD4ZRvWXEiK+Dd59wcz1a4py5qzqGyOC8CAz2seG1LeGqbUtUcMcQFNz9iAnuuJdXUIVu8vtptNttyed3HAHBMBZKuREOrCYa2J1gYFdigU3n1VMTCawgEDhIr/vSzG9sSeYbEwQc+qdhM1VNBLAPAcAyJISCZ38zvRYX2Lk/NPDDc+Zf3tJTPdE9IQ9eKAWzrR91UZWsCyGcnXCVMMWmvMxZogWBgimbAgDgLs5JP+6hbS5zzthoh454oYu6NwFWTRVHqVMRXEs/lQcAHCLg4vkRbqo651u701r/HjO9bN6edvF9wsTWSaaN4kkCk2Fld8aVTVAz69SpGBgESssnBgniTrsqewutePqY3RMOfLMNrhmOtt1uujgvzcHjLrWIqd86eANkdBng6jNtjvfWGM2U6zouhEK9pGljjGqjDJ5IrL58s24AwJqaALwAs7IZFrC55u7qKuC6hTBjh8V4gWF3ScwlfyuA1YcIAICCVjWSYF2z4dfpPnD3Ov/ueq1RxOvefwBAJUjp9X60kpgzax4C7mxDfNO67AwuztDfJoprqZVcOFHg3uHW+wFcouZkyhJjlGr33CpgGq6HXaGAJe8qRgFnMaY9XgJ7+toBAJdQ0JD5AvEShHHbhYS6ht5KDwmC15sHAMgHnmzgpvOWVYNsscwUOlyRBrkV2VNSgx2KhqmowVaPQKG0oByXt6zcwh5OeqfJ/JDP0EI1vTGEd+TIYlZW1DPkP9bgt3tS9wuq5wRjAwjlaJ3cW32kEfkY9CN5N/UpP1Ckd4h7FnaOspX0fj6AL9X4ZxTJX0JxTjo2gHseNo/SpxRd63o9zfbeqUQIxfoKwNakVtUEuLvhUlk3AJBH59/rQbO5XXgOtV26Gi/JW+jVdHVFOXVUI17BVRK1euhbhwgAYEiwc2kSLGvu8lzsw/dy5V+u8dP8yX8AgEvhq9H4sQpf17VmMPge6OI4zVR9GTW9sqRaAy1oFuiK3oe3oOW5RCnThwJrO3RKSM9g6YyE7g/5e9xTdLwb7SWj5XwGYhfhil/LbQAAJJ/qYNw2jVNQ9drP7L+R0lkiqoLUXTNIfKYwcwN6Jzbn7wrwOJsyjDLg2W45G7OAOR2FnQAASEuKqmGWzFcJKu0fB4y9K1cmHoBZ/fGt2QEAZgsIUQ2liHpR1Znx4EWoiWPhRfRipwR4CY5BiwMXp7v9JswpUAv/RspkglJflPRVhWTSJMhqggl8ownH+jubb8RL68ouw8vD8VxnXsGOe9wnLc1q4Z9jMwQALg+CxDSN2mQLMTsB6rZmQKOdnDyJAAvNefgSPv4NWVVurmBxAFZrgwTLwmNnDSIAwBm6KPVF0yDy0CC1V/2XzqaJU2n7PwCQIcgNzZ+tVFbFW3pzG7yljbfBW1/RbfIlrdbtA5E+BTuaZsHiupiPv+Paf9k89jrId737l0cv+Ze8VbpBBPD5vwus5k8irdwbdV4zi1GjlMMMTfiAYwTeGZGsIbeYDlmxgn/PKn4cdSDTPVba92Ged+3PgCJhd6fj6tXjZbe7bttBvwKyiMlYL6u2RIMYgVcHoZOF2MsZXniOFXpIZe56JLP57wRh8PsamhOXpcsMqGik4l158x4myxJKvd4YleImJVBCKM35UwBA0qaSTDOflt6kLLrttOKwsWr9FJaHbOqtvK45Lw8AGKRXk8F4dTGcGhdSTw0ygg2psV62sITUptcgdkFu7ViUWSZJ15xm+cxdKD2rySq5fTJL9Mfh5ah5emHoCwGH9y2612XPSNpUlkvsoVeiR+Ftd3BolxE5FWut65yIdmfSeYYAwFiDX42EnQVzI5sxByxjz+9OrRsa9NEWHrx6d6VDmDqXxOgApKwIzpwrvNZdTEMSbS84i84/3CBYEgXd+w8AhIS2e+2fnQRODbfN5oJwxxgvCHeuLWqlB5K2CXSvROUM0m1O3NfyInFSXhc5hjjZ0UAShFy7w64nDbmrvDHPEuVu72oHAIwqyDM78JkolAcetzNxKBJorThVUTVYui8PAEBpeFXVkB6OSwVEk2fkAoGR2cqC0MoGF0Fo0P+Dco0L9+MOTq/mI/qM5gTn+zYartkbQ1BDjlRF5ST0XPDTTPR6mrhwvU6rNYAAhtZJ0FPusrpGfGvwvYTfSQNH9g5xf7pGmeCxa6GvxmakfvOD4zrV1gDub9eblqZssI7Jg5rmE2+t4eAu5lE1wZJYJ89qEzgA4H788aE2srmHgDnGzlvrl9UsJNyew6LQQBVdEiUCbVkR0zP+/1p3UbWtIo/cXpTKOv/SO7KhRunq/QcAMoByDftnK0VNw5zZ3CbcMsbbhFvXtmulFxy2LMAGHJn7WQtNV2KbcnOd+gZTk6WQ7+797of7OlPiIxKTL/oyYf+hIa3nAJj8Hw4fe11/c/fjG38K/rgcfSBz/KsoewDmwvJ4lJkhbbegCmkXHAETWCSoeRyQIesstpkOo4TU+w7KF0clmRA9loatjXSjzdFXgzmjVPSevHg6FbkD4fEY2UfMc9OXWRWVA3hU3XofrjzdBH/tVYYrDqHv6a7TLSVjLgPrEXn1dMpkqtUfhMkkfnYrlj1N4W2GbnCRDeKeOWfqaekBua0GKHrX2RTWEgNJnKhdBtXHiULVl+sa/s3HpC7z1leidfVCl20g3T468nIPJLtU175MBMm2302Jm6V7qW7HT6fVBfYXtcKph/JqpgodL2ylVja2Zj/YOCOJxNk8XW3U+A+iazuVThhAB9c7aI8m2Xq6SyFgWb5pzApeJKxkSyQu6NrWj2q8QCbE5Fgs9YKus/SArv/aQP+Ajn+bK/25viI/nw53L08G9GBfCsBJzEdoogT8bk8LSwYtqgkNabvvXwGsHkTuSguv9Q3IX2mtuu9bLc7SvEhvzDeow0zdaSzM3dXwKn2qfO25cmBxUheCwwdtyDMItbAufwKwTbODOe9Uy/Q1P029GfQFvh4+uNcoHcPwEXMy8ySGj96Tw6erSyP29ZhbxtpE1xzDZ6s4gwQzfTbesuOdWasn29905We4MPscQt3aAYwXrb68Yz6Eb4Rrbyb9ep9unVTtFl8WuP7DQlrnE3sjDxNRGxr/hOv8ma33jK7yKcMWJslT2AITTgEiSXdond7eTxePHKvf3HDQ8TDyV2JTsdd4VDcZBmWVb0NIPW/sWTZ7Hc7KwF9TSVsGblUxVhvvrMWBATWSYBwfJneDrnpfYkq3iEOcHrTZKJGfxO6s+46u7r1pMnX7jGjB+CzMfAHBH8TpTj13tUJ1GCLOA/FNRhk7RBLgGI+NaCbE2iuJbTwIERtv/6duG+df3Bs5SXkE6ad5EnfsdcABgCRQVLGySgxI2DKwoN50rL2pxczNRqxomisspekxacYyuz8jXNsoUTcTnQ/bUDuwdXsF8aeBDXZTHVbh1rSpbsPt1TeiQNZv4AeK42sQLUvJ51dheFlLNC62Vi0cqtdGHJvHKFJopA3+7umXXIIDbh0+zB4AkMnxV2cQqeyLEVKcn6xcfv+PLZOF4ntKnr/gqe87xCrmGqKOsCZ3ipjFqeTM1nH66rbxQaTYY0zCUpVXwDJTXDVhqeUJsGzINfG63CvIBQ1b7gNP/F8k1lskuyplRebdApS15diWUNmdT2y57XC0jaR84ylFMRgZrOqevarmmavaw6xV1T8qGN2DUt/95r6J0RrQ/8cdo/tnRAapnGrytgtFYsMhZCl1HwLy9p3Dur1+JtMbz/4R0xj6TF51z5cKhZpJDlRQ7jjw7VSjtmrG7Xa6oHTJVwmmIR00uudWk2DFf2DXLtlQkfJH6aXyoqIWv+pAAbTD971tc5TOAM67uDOue9G7e3/eS8ZSn4LzVlNYFk7JrEUKy+nTstcZCkvms+P1LfYvbrOupAEOIv+kt3BkjuwvnPNxJSZkHWhCzilXcaarLP4fLGPT+zXFV5ujIgcYCdH8wlC7Kx4ghxfpydnDus6tW8z4ZXwFn47NT/cc+1XtX98FB4DVBtufjMuvm1L1A6R/ihhno7J5hV7Q/G/fNm9X2+W23Y8pJAISUzR1a7Z5xw7dy3PIvyJ6SRxf2V9Jm6auWc2S9FT7fa2i+hLCugJc6TEBANwNZKr1kU5LXUUJ2JV/RBGreGNnqgOxyuMXqJvEqtBHUs8CA1hts4+o11pt0dc2US5rWOl4GhE8F40EbNoDAOyR175yFqETP7wFibCmtkAGhtizfirQkEtRagzoo1WwzCBWDVNnCawlu87vchzRHQdhItQSNryeXGKlJVeOrcGbS9P+hwDAKtQq5r4siLR03OUG9EaqXAHlnuveA0c++/q7GIrj7gTqwjPLBd2S2WuDZguIvQENOcR2F6M3tHR1aEDY9VLqJnx3hOApDKP1r/2hG0DwRccjAVWbrQLrFXtH8fKldnzSnP1f+003gHvk9ZuzrU1B/iQesa7LD2bKxN0br//r9S4Oql3LMLEvBLZSDKMUXqFraiYAQBndkh4akcGClHpRAo7Q5PjZLlopDerQviJpgJ4VbTu0WOzWVq9FgdbefSfb+VztE8QdZrYGEAC40eL0Zw4QZtiMIC8T9wKfxKFcUTphwT1RgJSCdagoKeTBLhsz0n0kFPzZ+nxjHvzz/XhTcp03PMIqDeATXVE4SXYV4AYO8hsTu1DM4HJS99ccBF0EoAFgTsYReHI9630CyqIAGgAdLocFUOr5AABUJBa3PBYpBRwZ40foCaBoWP/nO/oUefny86OjQt1gWcrBbj7mQ4GdqkXWwSR5kMZrl7Zu7PiXXajxrHEppJjHzCFxYKHrmwGsZlLjsvNIFXyniKt4y1gLkL1trCVSIX1g4QYKvB3O0e+o+qBFj2Wv83cuwbovLUcU/M2qq695mLTbC2+Mw8mNhtLBrjlJt/hSnvL3NW3sL81qfZlo+aI6ysZd8v3uu9bW8uraGgRYfx9apTC0BK5NJgCAC0hHpkcB2CX/qCFWe8bONGVideQTaCZkGhZsbCS2ALpHFABgNQiOIIJAwgL9KotStdimWPHfHb9Bsrp8AF4JC8tZ9mkDAOq4mq0WJuwBr7FrP0F0YaNZsymwQS5uHtiQlGoVubdcmLAVD67sTFULnKOZ0oTXzQlLVeDy0pN2KX2WXYFGeVbKFJkrMOs3kuYCr4Z5bxq8ghy7GaIr9UAEADcEr819hxBdx3F3WGhXZ61clQoByWQb43uzNbOVbe39oOXc8LbOkaRm+2sxKWF4KzV37xM2tsokhZEu8aDYJI0+zSGmjPOX8uQ++3BmKg1eyZR9PgciPc7x3a99+ekjPKf8wuHK/7tp1TSrtb2ioIWJLZwlyG0yAQC2gOu2PU4VrUkVJbhoAZp92ygW5NEzsUqAz1RyujTkqRSwLZEIAWJZEboN1IXzEAAAER5BhAz/gSX23JSnJV5wXJGyG7UBgPQj07WqImctF/nV+TyuqDJrmgeKY4i9JcaJhhJsqdTYjF+AmJRxve5MRvmKWVkCh/5hhNmSXTmD2XYR5sLBGZF5dwY0T44tRGSrByIAWDWYhPtuSZSV2+4OqGPKVvGWHqw0W+Xgm52aSbr+fqAHBm4zfuNryMjIZNSQBys7VEP1CYikQDUcYrF5cEw2uTL4PpPhozMXnWRb4WiGrn+Xy20AMQwtsreXR/bB97GbmZtff2kd7sjWn5et+d0GcMe25l1EQsIft2e8mfTtdGnQd2o7Nr1Z7yuXH/Lv6soNSK3vQrEUVtC6mgkAoGOWcqEejp5iM9xNAclOv4rL6v1nfUKbpUEbHRdJKC5DRRuu3jTcrS21BdGkN6tD0GgiiQmy2gBADcQWx1YaCBcvEYzWlqqHTRJCBuMlmjtt4xmy2LUXUgyepS32x9qIwVeKsD5VOB63sfBvpYVA9fyL/TPkW3mrT+Wg9jdlr9v+N8Q2S9v3DJld5FW718aI8qRR1fModPd8Qf/fs/E9uBf7eIIq3zDUtDbtFTCX+S6lSGX2c7hoaKFN+uTHvvwpMcy6Liu5TY9qGnk5ZOe/GS6jf9/nbaII30Q56A8hopnWy9/1TagEiubk/4C7JRQ+pWDbH7m2bacBAIr//HLLp1ZOttR1D7rcVtu2c6U17lbJv+59+jU12MA5c93ALk3lYRhOPIXCVTP58YincDs+AICpXWJb4684HN6aVd7893TTJLhmichf7Xw9y14WAGBnv6ZWQbi0eyzRKUZqhZzZvtIOM6l2FxdXZwni8YfVntuG9UVeqLfZwHad05ur1DvXpHTp0lueTCu+CwYcyyZfkzeuR0s3OV+nd2VU77YBTP5UjsdMagfHmLOcxXu+9aE9jPi15GOf6yN5kVpP7yK8sbriAap5wJ46zw4H6EoU6EymYVfGQtoxdm1EhJurAvvzEAAAiTsQRDxUbdEJe5vfIJF9gwi+VK+mbw8A6Nsq3aSKlCY10meWtXvAISdbcubceMjZtkw85/mRJuHsxJfiXMhfQpHmFT2x4eYqoXS2AGauwqX1yuvaJaD1YXxwV50jFolKgC7WTa+JSpTG+UELplldhr1SMMUMxXcVdiveLsLLRvdGJv+3jG23L3uYrPXVqfjnQvCXp4tuuGHddy5LN7RdmYv0iwOEXI4RkgSjS5xLZvlmgyC94+3dKV9UGMOqmIgvClKfkXmc0qrXB+YRAOAsqvqKt6saQHsDlhCNecI7Xem/cO3LWQFUHn5O5ZpvQhwjTkn8xZkbX8+XgFCaSrswSa6/w1zEZKQMcxQoTZtvKC+lciIPmgfV1OOlIIrKn1OZ+IWZtILnvhPQqmbdMwmwn/3raG5whE958KmqvVz27eg+zZHNWpQOB8kYps/RnzS8uFMDcx2EvjAEZPnBwdSOtvOBmv9nE07U+S1wU0NOl6dJ/d9+4CJBJwZIOUBIYfFLIfcww9UnKX0/DNC1HNxbH6hzyLvIeBlx0gL8+/WAlfIDmMtQnTMZu3Yqk1OS/ECnOC2mBM+U2UboUSdBoycbuTiauJjUzh6gicXbTMyyIC97hg3tmEUA6HEmtYIm0ZzzncpwaEC/x+aU6NP2cgLv7kl6Js4UiaO+g8ixOfQqEYQhk52BR0mndS6C115qZEYSrzpDAjd/+X2EoF0Q287bmORTqxV8RVrcIYj8tztRhPP56vggMqSeKqE/NKkjaSp0LhNxTjUBkNqVdhsjQaJoDosP9G1s/UwUjL2fM48/7rY5cZgL+i3VK3WoZw6MFRgr+0XAXIUPIvIgfsA/vEOk3qa1RT2v76siEVqCMBUAX5LjN698DfaFh5bATk2VKC6bo26mEt2s/ylvkQFypUlo6c8KGL2k4GOBvEBr1OPifHMzmy/xcEm4f/1PBNbnGPzcnWHf/8JtKlz3MzDD5WC2VVurQzNs19QauRnFuBvhhrPHSG4qxbUjLjHaE6cYbYVbjO4xjjHaaBzk+Tla6YNHO6MddvoVYdsQd+RBOAgR4MPU01zrFrGa0dbYzWgnuHy0J7bTFwPpsZ/RLWFBv/syGdz28aLRzeBHo13wpNGW0Ui/8abR/cefRg8IHjXaDZ8a3RheZTUGKynwx7NMw6WRyv7jXW2GcMPGvKeQ2M2hRxkSiJGbKSA1iw2me2ept/XIUYbSqKZa1E/DcS0wqBLSdb8YdXg6JT2xQ4qrjwPy7Y+uItBIyXGr3k/CDu+q5EJ9gtqIc1oRswM5UWikhcShkABZPbpGIVXZTZYJ1zWWLiWr+k+smZG5o2i4lne88Esu2/d9X4TnQN+qmbUeiGkdKOn44uEkeiVV5nTx3mlMVEFmt9Pu3CZTx/FWpjtTVXF8x/pmhABAqjMmKcm6GG5npGE3y4wzsLslGc7pZWX7TDKUNPshYxKQp3WJpZ2/lKdlwYdbH/LUmNaGz7enJd2N7A/1LRu/zfSeJmEIF3qdYmlWsV2knkjZEybdQQkDs/0oAAB3ABcNg/k6jdeCBFTbf2APM826sXLvqkdr5ZfYXSMM3Bq6dWP3jI/kjoXZtiKA3Zi78xAAAEnVsYnU9YVLwqnab5DI6Y5qiu7bAwCmMy9LVZLCnqUPCpUdggYXcia6TYjqYmKiK9ygTDfCaavNd8HBNq/YpezJVxyhQeHGY095kW7OltexN3eFhy7CI4fqJuXdxkxoBqRu6TL6oOXlksUvYcbi0Urdy50nAUAjheqp2Wk3ADSHUIPFfC13nLtEDW4WUZ9uF1+dlpAZtkrWV1MNZugnBABgA1E1cl2Me2vokpnZXGg8kNmzB415AmKuIZhwieGagkaa41Tje6N97ovRf+Q9w0/XUH4ZAn4edAgQO+qKbOIJp+ILcc/zZRe8ptDRAQTln5n551WHAAEF5dsfJm6p5Nf2kU4O3YeEr4pggvK/Ti9nVC9LUPtDOWpnVRMejCiBk1lcjAIA5NmsBNzZHkRJrFdFCXWWf40l1i6dZ7oZ979Be8JAR2JdRyLpMi5Rgit9ogCAGxC3xyPi9UG9hZHEvh5UL7tvDwDoS3WzV0VK42vpM4s6geOQE5+cOdcecrakIZ7bmxh6XNr1tdl4EApgV/Su0ZZylVBc9sfUsmspt/qyODXW8cC+t4d/Y7Nuw1/Ytg7v9AGyXHrIxLRVLNIq8LyS7NLAbfpLAIC7Iu7uMQ3dHVSs5iCkx/4LW8jbZ6TwI6OuI1brO+KR11iOp7Tj02amX8HSlGOEcHs+AIBciKfHPstMGxpIYzVDGjW43skCAIxqIEzRUwL6IEzMmcAN2bdUQOkyw0QZwpHpxtVuFfGafw+ZIKjC3TDawDksaEY+gWV58lbOyvPilSfgY1ORmc3d5FcTcEzBbVaxN/dxKBerJ8wlYvmCdfWjAABrsne2uoogYwHGgB3nmdOAvcLAAeCUSHIM7LHddpXj+jptyVAkkemsFCOI7kyExxdwBa12wwMASC9IWvzQBVGE2aTr/w2iIi5m5oLUijYGEHNhVx6Xe0u5StweGcDzCm5pnozeL8Tq2p2Q10kVjCmp9nh06FHOffiGyKV9zHmmaPxPPtZO3cEss+XenxZoPDK8s9u6D4nGCO9rljKTRGI0FnyMWRxvA6CxtfMkAJhVo8aLnXYDwFwJmh0zH4p7+RIPNAvqtkPJwwF29VXgKWgE7yQEACZeCC0yHDgLyqjDqLo1NJpeLRGqLG0NocqGECD31diYqSPZOfjr4BYz5s1F3wccycdr01KJ8nm9J60c/R3wWOjA+Xdtiak4ZlVc2NvdV2EUwir0tWFQqR8FAFCJWH3w0zUAcFMW4HmSwom9Xnb0dSmmVS+/wG4LgwOAq7aRTmMxe9y1a0d0761/nocAAIiWJJEtQqQzEYtCcr3aAACuCxCkFRVpiR/mIAYxm9ySQ4QYHxfzuohAQmalFG/I/yDetXlV716w5SqpygZFvSXBVlpM1ODoklyqMlFDpbnfVBtIcIzBarzLgYRReWwgDGFsjwfUEGOyWu9JAEBThTnvtBsAoF4UiDN9dtcYjkA67uBArGqpwkG9g6IXBrWZEAA4HwcAV45zE5xSQ8OeKBFqLG2RUGNDSJCxHIOzBdIc25+Dge+l9wKtvCM/zb87SkwFGFVhC8/kUNVAJ3IlhTfeU01VUgAAHnoZfdQjmEFK3S0BlUGCejV+doXelAY36L0S6YilczlRAAD1pJxFHEnEJ3/cMuh0YoFViwcAChBPuOyw8LW2NBsy14nbt4UKxNcWlBZt3Y15LbMTXFchQl5d8S7DSWsnHfUsowYmXrxGs/fB8Q6aG3qbELtom0BK0UNAvgpKACBhNrW7AaAOKO5T75GwDDZxZz/F3ShQZhi0OR5H00L9iejX9vB/g1cOvaB//HchiZ7gECAIIL89PqLZo3jp/WQbA/EnxiQAIP/1Hc11zA6rmPrTYcntnQxzJ130gLkUAIBApHqjKgZMbGFHaQTNB1gaNOSNkkpRBwsSty1aynZri5BFBCedCNDVeADAB7AA0oLDnAbFxwVauDUY/h5Mjv2Jr24f0bTFfMSeo6vRddVe0Tbk8M43T8RfqOGRgYHUdfHIuquIu9uzuMAEADhh2IZhUmkh1RyExdl/mxoISQPnnDPpAL4ylcHEmnMKhZRNeVSJgt+fTfkd3vX9dZHz/ySWdwNdlXlbYU9TqzqliUdDr2Xc6VcSeFXOmjuCB+9mAQBQKjAZy2Wvb2UVJC5jMs+zXb0Gm2NiVpWBIFTY/ZIqVtsKcZNW/V20aS4nKVY0uBanaiLTHM2UJrxqTmbwUT+THwnn/HuIRJrw6e7pcdnwV/H99OGWcfLeY4SbqBtV7QvjH8jLc/0mhHkBeDeL81IAAPdgqXfA1bUAa/bz0ibF7rNlxF/Btm2wJljYSHtA17zYFethQE2mvbB1d9UpODknm8i3Z92VkJ37BonkXMcVpji9PfEAAKGupErqsfjR+BmFQ02xpqA51os0LC4WrljVJY36/41Y1AOWms35RwhGoo695X5u4JQY2gIGyGrZJQ/IuheVei8xVBt3YV6H3D8+KBddVoKA3hT6rAqqA8Kfmx7WFEOUHcoJzm9NRt10ud0gPG6Gnuq+lm/F359bB2THNM06K3K9V0GIXRHm9lP340ul9V3x53IPead1DQks1eua5sGKz94AQdrTW6HPwohGwLi4GqrjkwbYGipP6LW7A+fgtJABGTVZEeEcffSBRG09jkopT/oOa/4nUu4sKTKY0TT1kJ6hS+Ihg2bZIOCLKUnTBrdCdeSfobxBNjcTQZIlAwIN0IRsaLzIDwILCMwVZmK2K962r7YXVtilHqKtG6Pk4VFmm6zeo++QdcF533FfU830kLPWIIchGDP1zYcV3i+3CweDSEhRrsaccBHsLDano2UUOnkfy5E7rbgCKsYhxPAwl9mZnjclUYJisLEWaV3gWe4ezOmusWBTGgX1TQZRWUM4XJ++8YT4itJUUBeqljvZGdDlynbdoN3qLK2GtKCJeqBGF+K9QiaPt6ZMHg8jk0f7rz3q+60pk0fN9SNhCvw3Wt6SJ0gBKTDnGi89OtO7bv3/BhSZE138UbBCFDtkosic3QRAOPseCVC4FWTy2LW8WB5l75MlxtPvaYwcsspPW2BpkOM+rMOv4Eimx3oP2kKnvweN1Q9o3ByCVttfep8MdfqQFEgDoy506u7amSuy4JWGZt7LkVbPIWAus0PH57z0JCIguqR5RjrxULio6DXU9VoCIQ2kQ1ZFHY9ReEc0o6Kg+iRQPk2Gc+OrDIXClzwJKO4kBAACX3EzkYSVGeBCsEz2PYxuzkHGU4B0jJftmYZ0gf/gYaB0LfoLg+Vd9ePALl6diUC/CtDddwL9ztpw40iV36QD1zUw+chimS9cNn1XkeT/0jzpzRt84Z7tWvmR33T5VALkGbxE6SH7okKBXbmQ7LkLQLK/oed9A7d9MqF9b9wrKW2hyyV2QoWtC4u14uflLUJ/hR6KTjTnLUU5Ru2pWl3UKpDa0WUHZ4zVe7tRAAD1IVZRwKxIh5fYJcg/170Cxtr0bp1nXex/CtDVwqDLQBdEUtcSTPfvAgATCLcniVKX+WAHRGBXIvfxD3yT7HFDPAAgSsKU/SPOBbMHYs3BmuKCBBtjSSJ1TapJiRaM91ZB7XUge7UDdjzUVFPRNZ26IedQUzOOJk4vgEN7BOwZ4AgzzC5Mcsqov3n64GIxUsL5xrbZbvB2d5MJAOwTxIaGU8JCsQlBQGRlu18DF65kragXKJQamtu9t2v9XRzbxAnVydiBeyDL4IJys0U2Wyi3IyDIBlGjPZ1sLWiz6zel0/C2sXzVEt/raEJMzL+jC0wN86phsLVaTfjpLgb1zq7zUQAAUWg7HeK7XORMDXCG49ZrenvdZ11z9VfQZRt0EXRZSV3EPXW7eAGAHjOwREtjxURTFK5F5mhijCn07gEAq7SsMCl1ix89qcZz4SzOxBN749CIiaNDcCm1QZODd+7pMbZIx/7tPakkurwownWoMZ4YQjMlQQMCWXi6beuZVCKLRhio0W0NJlcrEwDW0HhIlTGgIPBGl1EE7mLPkgmzsEEzphx2Zeq6zdtpqYQU4t/+7A8gxBC/mTr/xhL9KZOu2fnSE4YXsvEdQDzVoTVtt1BiWEByKQBAgJbqQqEE3IWyu8/mZQHtWLGBFnSUpAWV4wUABKQs2gWVTAy39PXuAQC7UalhUiz5Q0wvcwKcUHxubsUBcD08ZQUM4DpQ7N/4Sur5p1qWdyQ78P944p/aF3jkw/+q7sG/KmZ2fbGrY7JVVaelp1LKY2BRmRm2RqGJHdSk/Ns1VpmjV+w4xn4qMy1Lwfh7lfPc8czved0zkLq4f8v6iR8TfV65kgMAjNC8uKW0MlrOjf67BtWncVdaAIAIfSlcrksBg01JGc681nWsxRWZGFqLa5ZEbBZdxd5TUMZ/ym4pFGiT+YGjV/swz1+wDsGvtZygnurzECG8KbTk3LWSAgBUMWsWN3QzRHHQQVb8t4p+dXRP8kz1ZbylR8IgWkTJnoMaR2qMahFAWIDZvAsAbMCds4oOubQUTncmYrg+2hQPAGAJ2/YPinBoNrGEE2PMIZy1pQhCnvk2CVWWgA01O15XKws1R6OJrTUA0COARgBofVhsWH8T+uBiMXIFZMa2IRPE9W4yAQC6hSDscIp4URAtCJBsFZnUwAXUShWKmz/RGjK1kRAASFX59RrWroGDF7qh2dQmf0XVzIaL74PojEs7e3wQ3Z5vjBqE2EM3GatY5Px8aFhyHsKBlTfLLc0U86G3lFQvs4kCFa3ur9fTNeHpZ1QLD+ejAABqAVhT752cgcsGdHPQVfapZ6r862f2rmUQZ/au5XNLzqDjhC0KM+7dBQBmG0oNJFEaZaDlAVmxK1E9wP2/SdJuiAcAtJIg2i7ibhnmcQ8kbDS1s90oiV4mlnvDdkkvZE5IGQV607zuzj1ovmJqmv/djAedS1Moy2t6+FKlKey16bWJwjEeARsLnI6F2ao54cqo2TQJf2VrjMKtRrbZCYpV3E0mAHC6IbZ6OCW2UWydICBuqb1cAxduWqyoPUVOEWz2FAIAuOqmnOGsiZOI3DAzbCK37GyCyL02BEWI7ijTUUz6zzt5s8PZcap3saGlunmNNjG0X8kTC1cOmY5iTwoAoHV5FH9s1T4GKbVKAt6MBvXOXWRHljerkbm6iyv9fKacTDVK+OyKCX6tGBN1p8ILAGTQzbioLmibE+fsShxU9y2DZOIBgGgRJX52AoWyaMKaKVQyLdJxcS1kPRyoUmoayrLrbCQJ+PVFH8LJ7pDAWUaall07DH5YZm53ovpgSYLRggrDJUTb2VQoyaiLvljJbUt3VqZMACgt4jBqdLCSg6u+tgSKPCZnPIcbqi+AtV0sUM+LMqILCf25QN+r9QFEG+J56J5veJLpY93FTJdQKRxpSNBPC3qIGHaKb70QK5cCAKxq4o/N7cAgpWIJuAvlEmgAShwIGOEUoHO8AICBiosqQ5/32Gc6sTiEbDwAYIAF0Cw4zGlQfFygxVSDCd/rTsT3xDX8663G82lovCjGPJryDG8ovhfvwZt1D6/NouVDiMtWdVnWShF6UNYEABBgcWv0TAk4Q50781r2LDk+PfPMBwQhc0Cp7I0vzihD2fuSyqVaCn98RKCCqpY7TmICilFfnBKemj091fJc1WdD99N9bofk2GBRw9uHNSU0f/vRyH0Ee0SAbOm72nMuqpfYixsuXxgxQVkh7FSfCNS/KBKLxFfVoIVR8/ULBGd9Zn8o69WzpSMdtTHzjPAAUvnSpMuN7+mD4YYcAGBkSjwFcv7UnXhtWW2VdtlZc1Mw+yhdbj8LAGAI8hRsF+9ov1yM5OVypq+Wad6H8DZkYt9OH/0E7+Cewx+CG2dLmV/OJCzoCFLHJjgdNiuEWqKVVqx2KHOEEpchH19GvOICWsBY6g1v5ZoP/BwPZstvFYItjTDgQL7cvGjH2HmzXxoW86gVm2RssziEw3e5WfZNjhJiS8Sg2GbC0UJM6E1kkB1jmXoRoSeoUa+IOyrvJeeQLAVrfNh5nZwxDyGWrtSJQ4KyCZvyyFUims1rbn9syTUt2VNhxlYoblRsST9xHNESl7df6lnWz/cJZqW8k5P93jWrdyA57w2d7WAfSXb2owAAdh2gliK9yUNsYWxAK8c98H2KpdghtXiDGKvuFNtFj7nzPbUuaKtf43om8spQkloNi+jrN8gyyCZ/vhyIgHuWUJT0RB5mdy6LdpCg+GXJUmqHaY2HlyPG0+VfpOMocI25hQouxbVhV06thMIIN1HLcMKZUc9AfLZfU2Uz3L0LANgaX9uXHzF7VtHW8FtPmh1XonDLGxUlTPfEAwCiVpav5BnZP8YCOpGM7jes0qxHsMkg3rCqeIFEQIbwhrXb2fpmQsvhbzprCEWydiwBh0QjluelSSUFVCh2JqZQpE4OWIUi00bYLtl/SqiK3JaLDlDkxbXtPSK1e8oEgAxAG4y6ByKnLYKrCc2w/q2SudbKbh7jE7fRTwgAqFTuRpCI5jiloMwuz0SGgrLMjhYKMAIiLmjpjJltCElT8uKkIiSqvTxFJg3QxNdzl7dN9C1sB8la5Hfx5pUOZuUC1eUTsVcpzCnVUouVFABAZCltl+metZLcW4YloMGnPZqQWVNzBisxOAByvADAAoyJ9lGGWmDvSlxPvDhYvXsAwEZ4e6AUGf2kgr6DFTRnwEtHTTBeI7q3wJHvAB26Oz19C+xw4hlGODit34XuA84eTURPgE0Egco5tI/cFWyqBbknGFUH8tq5rS7CQ0+ZAKAmqFpGFZpIta5BYSCXLVCMGulMnfn+AdNPCADsbRW1wApx65dcBxNkNgvgW4BEdmyBLSIEOk02bOgEJnxDwrmHX7cL3i/LyyvSSf/njPoub3PrPhygWGK4AeRSAAAAEeoNzYlAAEzNLZjE4ADO8QIAjdppUe7ApBOXQ52NBwAItgASWMxJEHy8AMt3HigGLzBSYJgdb9qF7jL2bDmn2BlP7I1vkryCQFlV50AJtuhACcbV0uWx7TotM8qUCQDQogyjlg5WarC1tFKgzK3NxI/J2sb3QFmwPxSdBf+KfdgjW9lcCvf36YEAka747TsATQo+YH7Rdnp+D+ojEuWK/+9UmDWP44rBieECJpcCAAxgqV7AisABkJoL6MRgA8rxAgAFJioamvUtdDoxYFXjAQACLPlDzFzQ3DTodXBCsQ5Cvi9AfvXW+bNn0eF/N/zZ237eTYNaG/jHR8P9cZj1zu/hE7tzrjeqg8hH2Bn4tCV3WQEyrTIdQbTBBADIAqluGrIxm11zEFDTAsSCXULDVnf87BGETp+ZAqD5TKx+zN+73fn4ZF/zhgb+sc/f7AGZ/6Hmr4fqL+ovfuHzGTO7ezvWeFc0Gs20TZVGuiKsVSvCdeKkIVqyVdj9E7swVsO+oNg4BxhHJ1Vw6nYSLy2VVAupeEZTXfpSHpZqW1OskUp1X99emt4mlpLSLNi7xCrf5K3S3N5oKhTP5BwfyL+vCqRHp+j0YydgquPjrtaUcjr9gzMpNKxVwKQiQyHMHMBzPwoAoCrAiJ3u7KbfxIZlA5ojHv/9xlRcc245mCC4TkFWAVKBS6elsbNzOwGAgOZoGyuJdlhUUJPEdibKSrgrTUZbiwcA0hA3/jm3smSRMmymIRcbZ4Vh8q7dFu8xtDN8X6BlKXCH3p54zQW9sz9xbtHBlIA36HDKxiM6mjLyhE72bvOMyVXKBIAqFjwOqB1e5HF0sJdFdwSKnpQy1HOVUOonBABEAjca4ty3QJY8s6UVyjBla2T2VqDsrIDYLmjPGCe7wXk30/4hZT/OVeqfAnAaL8+jkI4W6u/rPjGVtOeLFRhr/vWc/15VrJtpOiQGtrBY+5cF4qYUAEAEDNvpzq6nQmyYAtCs+Ulc9aeNvjBZU3NAZb8g7iBeVhcAIJiI6KTPTgusXYmLcCjrllxPPACwvn13EJHLPLK3tsYXMlcaPy2gQ/EJONsW2PJ9QAXXcxZYvsUKJycisCDLi4SBZRdw65cVwpBjiWBJUkv+gEBDaoeFBZ2c2SmdZrHL1diLPkl9GNkWVryk6eknEwDYhxJ0fKo9XhIci0C3gklxxgjcuSCxkkV8ewtkPyEAMKb7O8gAtzGF3gIRZso5Hgc7ztbBRBA6OLvmPCBcr3DvNhgfKruE6Ca9eZ2HoZX3sH+ixbBRW0sBAHjASHWjVATigE7NCcDIIA7Fqi4AoANHFgFEOpFgcvEAQHbbPiyMAGrQvFkYHR8TLPkusBncIITAssRMpl3ATqulcwz2JgLHUk0/SyAgMU0abRA+0yt2JtV4JWNBy9HtmFsK2TIBoMDi1MJoBcFuhfPH4NJYoLiPnR6XU2E/r/06+vHahq0plQ4ezYrvLijQiwcCRLfit+8JNGOqvRRU25RGtOlyZCv+u53A5QW37uO1ghLDApJLAQAW6Eh9s5PQAsaAM1aABZWaIziJwQWQ1QUAFuyoaO89zsJJJwJ0NR4A8IEWQAVo4PSBy8bA6OQ7wWJwgcP+wVd/EzhQ4DkLk6Ojmtek7ZzAMZ/z8tQi8OG2jASAHicw35m/WWmajZ0SVR9C8NrGiTPzAU+iUsHPQ6+EfzSbEd0V5O3RaFIKEAE2fcnu0OtlgzBVi/tNwFTUvMluysKn52D1RlL8Cyu1AIJWQvINVXtP7cHiq+HxiYvOShaliRSMZQuEH/hMSAn9JDBNJGhrqdZMgPAXEeiXeXqIudqvUYV0u1tjXIItxdG1aGMvym258Siwd5ZDdag4Ko+Cqq4MCIYj9mAXGia0XmowCDh+fLt+wqCpAnYkCE31BgDoQZGZ+6PuWJwuKo7WTFWQP5+xWeZZAADrKMqSXraz3v3NN9o/DUjDmZsOCC2ATDw+LEDpA5GntzUvVVcERw1M2DPrYKP2TTgIkZxsGlvZw3SKGTYxgYMAMbxnLjmnaYL5XLM359w2a44yo9Czk02j5/q+sy7aIvsUbuNuPbYCQAc4uCCfm/PKD7bNNwmx8fmP+AigXYGo0b7v9KYF+dfdyuo7jtZFjBR2U9MFANoQWxD5DNRVC2Aq0bvOLQ4itwcA4MQ3UaAUTpRwVqby248WlMLmiaarFirB2BaQUYdcy8DtKJiDsPfN+d3TkVcjBVID7JzthZpCDmCRDkUUGG6r4MC4Wm0HJtVqPDDrp28fuKWNZQKACjiNUVWD5+oc1IDu8VWMLEpoX1AIAGjPnoV0sJHzLLmCKTmxzNaeGKNxoS+SbbxPiOzzi2RxOQhWQgyhcJzMzb1uukCdQm4CGUVejiaW4Psx08XtXhOxHcBvb64AcD0v3wvnV/obYBT4yKs+7nPXnG8z7hj0Mc9eXQBAYgkif8SEgXaD2JVYMl47OL17AMCpSuFAKWxcsqOd5VdkwDyt+XBbdBg+MUp2W3TsMwAdBD7BAXz4YLGgw793XGEY4cXpLWGFkdKJZKW2JQFYqbOSDazUu5IRrDTF5Da5oRlkywQAMkeKVc0C2fSgIVGiZAi4vX+gegkBgE1e+hYgjuuVIYADZJmcPqhvgRNl+zBwI4iKts1B7ChzQ+Xh0OvJdj9Dn4OP2H/GwlGY9twKAB0K4oJ8bqb+8j2MsiARWECn5gwiMVgAs7oAQIGQRQKRThSHko0HAAaM6AFo3hyMjo8FVvLB4ATv+a/bQQYUzy6uMFjhxal3YYWh04lkpVYkAVipfZINrNQ5yQhW6lNyG9zQNLNlAgCZw82qZgFfetCQIFEyC88eD5s1av1xerpoDVXe0VH39OwKAB2fop+cA4jCx/N5OKiGpLVxs4vQ/ZbRowh8enQFgA6acV6++/j3SP9FsQjEAZWaEzAjgzgUqroAgA4cWURw0onkkLPxAECDFj0DKmxu8g1ZuGxMjC75ILAZPCDYv+idtupGHicjCXLzvPuxj3cpZO0GpzaErbZRh058gxt/nPxtZUSbIIcokB/OV/2lH+bE1zQtfR+8589/74szR3zJ2s2er13ze8KKVZmsz1VAPbyh9LK/Vba4htUeD4zL5bJtkRRPEogj3ZxV65vHsm1pHd139989wC1iZot75rHOekdAGOBAGDsUBTqxD6+QoLmPrRG/7HjIQYS6qtfPU4+HqBiBT3D2CdhYvjTAGeYyWvdShbZKAAic3wIQwfnl71m8V194kM6ta30FHy/QZx2o7tQlf3kk9Bn95BJxloBnEtzviC2zDBFiEiRlixDjXXmWTTF9dmtqfRDv5LAk8BHSmGZbURL3KKXfF44rE4oj4v/UbQN9hXDEZwPKZ10ExSryBoVTkNcoCRq6SSanceelem4UrIeEJMORvHtJLNberdX236A79DUSz9RTNcgyzyhvq48zLlfJe4i4Kj1uPDeKokzSQ4RKWSx3Pdxk7Jc29S5TX3ld2JjktqwyvzLQCBQqnp1642yMDK0ODMKI9jk1Sb2TSrRulED8qOgo7DJb2x8OwSxmVsRgj134OZwQSDPbIdNcTgb43XLyKXFb+Ue0CMxpCHV5iQWIEd1Jjcu33SkHqlv9/CNC58I66E8CJj09TDSmQrZa2TWSFDTH8wTkzI80SvBjTBZlThClOIYtYGwtjw1OEQ+wOo3jnQgwkshIWkDDKr46JpnVYXD+SEDco1xbO6DvzP8uQJw0J3yluaVBo8S2Je49QhPgAZnJiKTysYwrGVxGPyUZ72cDZ7SRc76chqYAfNb5tFBAVMhpHV+vWeUuMB13Dshosql+rpDjDaPrQhCzUsv0RZxm+jlIaedAGr1p3drp5x7iNJ9HYInVV4PJKyLnCOKsGIyITqx8Uk8ShjhJJzBlU3hzKoGsCvqGCvrHitWnbfKN6vI36juAjUbrYCyEH5vIy6jET8TsUGq9go7VaQs2Qeu2/mW0rBvKwtFojLl0FUyJ67oCWd/2ghWGTsm1KPk+gw7/ZoTMbnptBcgzVB8xbD936OSa1miYlTpt1YYJi2goLqMASE5EG9m6aQOb1GGcW1bHfAaQwpnMIPPb/jhbGnOw+BY6BM66isCpgdLag2obCMtAksn85QLIDTVcOZPiFFYR3vij/QyNVbIr6fpQ1pvdRO0n+sdZl35CrZQfssMNHo5IOD8Fv2Mn7xXFYsPxD5eIFjdFDskn8ot4AjZxSSrEjAsphC7Wr1qPvFFUtk1CH5zlekTSoVb1tegk3eQ5De/5G1wv67FCRnbRNXxfHvoYv6O341Hsd2KJvibWZ1H4tdingqvpcOkmKK44qP+4Fwfw9C5r1KwtmgnV6XNY/lMJMX1uqgN/WBwpxAKteGeLyloPUzA6LvKT91Nr6OvqnN+rXzYhLe0bj66UemRZhoxYsN13V1QWP/ccxux9hy81nfN2ogNbckk8e90nLaFDMirboiMEK2vhAbdH9hR9LrUhWZqcURwBuZFk+/ZHaxTc8KltdtMjM8LNHKP+bkNnD1OTP8zTQ8w9juPXkcbQ8kCuBd57QOjWJciEWCQ86vhMC6WAYeFaz25JaF3pdtmUwlaCEbGLl+mczXbawC5OObLdVgXHohwe2plnYBnLYWinF+0rwDDO9qpcPx6kniQAOPRJqS12C/V+Il/cQhE+o0AOzJzahw2JN2JYRseAs23m/UaNLwHcFh2P9PtdjehBxdRC8cMKzYCkgOT+w8Xmk7nNUuIKKGIH0GEDgGj33laB/nPmTcP5u8L1W8DxX13yIOc1bDJ3VcNB/RAKE+X6Y8CX/7GXCvRBB7yv/+pJekBAV/tGSg7A2Jus260FRXSaj6Zf6j6nl9Wcwa72JlafCbChuN1XqXnccgmefcsUlaHPbBLBwDSZhkQeVGACwxskUDrRtxOYszM9Md5bpHjRNzXAy4713U7FRNEZq1wBCNcP9JY7qEQeSR69oGy35RbrZLntDSSJFXHnF2HcMOMum6WoCvZWBXM7k/RyfhoLxQmvzfI+I0z4XnncZRMIEnAtnyDItRzdV8xTSsY+zVqBYVcNXrsyfROf2b79+nBvmYN5gWgVkzrNxVwCpVHQp2KaIAcgStuVcAEa85DtiyZ9VB9NaFcR9SizcIZqw1btcRVRKqIuKY8WK9fZ8Xi2yxjZiMe8s+Y7s7GO6dwfyBQi6qCkK8V/XRyHrUK7/o0rmClfmOSRsInCh/XL/bMRo5LPs1Qa0mR2LIm8hq9OEQ4VXmpNC9JNyCuG5UcofVu9xanjfQARta4hTJLeMjBnoSGH3ewUtFvE/wu51/pPiQyMaTrqCEh141yQCvouYJyZZZZrtIRs1OuwdYh67wVT1yD4ZxtGdqbEaMhEaDCz0B7+Dap4aIeo99+brYZJvwXwXw0AVwB6A6ibKPFzF5KA3GHYROMVDGKlODHWQd6z+9AZ1p91IGwuMGvt7QrQ356/9Pby6/uw+/bn+rJdPQ5OvGcd/v9eHti1RQvp8PnPV/jXOdpl5lVX8fwFuh8wtc9p2KB9s1yGzQ6+aOj54COFkt53yXWrggtnyj3saPboNeThoiXrXxCW+w6Llpb/icAy9nCjlbNBs93q/oiCOzFFgWLGxyXm/ykY6O9BVeTQoC9d1zspnB1TvxQEZLV6SUkBa+ZzxcpVaqXt+V/l+fztvfKsDlAKPoW568N7zSoqQGyisFk7slboPiAkYe7cTJQFO/KYWQTOKGAV3a+4ymuHlH29KMVL1L84l57AGY9ILf/tMwBAOnXYIlf8l5LyfAdADsTgiyfnb4Z1YNd3X+jw9zwpHxJwnW2JXJzscPzlhpO/nN4/EqGPC0Pr7tXHPYeCC1zk3qNTow5tS3zKRdvSQz8Hn0dAXxaKDLl0njwnBPMmT/5VYa/J75RNgGrYvFJ/P6/o1x+Jv5TOs490+sqTVc8bHaM283oNiNng8iOENP8MQ6RyGCG0/GcWIsThRkJnRVjFk44jxNacS6y09WGE2M65xErpHIwWGFFf9Kw0zfzdmVtQ3oWATzkK3OgUHqzepVwFbmEhbF8gtWA8GuNNXO3JwP9EWfUEwDDDxUVFYL4VYflrL7A6FZcGiqZeuZhJPD5a57R78h4IaTNLqclTHJVDnSui3C1CkRumCD0zBrqBGzm7UuRfZwVAf560dOS6u1DWthbPBvNhWfgDZ5ERWV1FDjlUDfCbORQFEN7XLsaEbmqKb2T1NM3h2DLPt4jfUjxLq59/6dG2mgrqSoqnnWibBi8qQol22xsJuiNjVqjRf7zK4uCeXc94UYESY359duKet9miALrY/5HUV96gqPIFFoJO4Z8ChYT8GDVD4e4osaXj+32NGq6pPIDt0lHqmkApLLtCaWXNIl1l8qDXMlAqeWvHp+/gHkWrX7wGJJjKOK6v2HLxWUO0Mx+PoUu84gvHQFmfrLRWiMeX4d/dpnms8C7IkZJnzjm5DZkvNANSXrsnTQN7g3q0jWG9qTe8Rfga2uNFIhC4gF2fM5Rca4FGX/PrzKSzRX6Hnobe7MpMswoPBGR8HoVnpfjaVHkKflqOEH10yCf68/WE1lKnttrxd6K3dAN3FNZm3YKHSXn81/PmAPutp3f2QVocZMBYflNQEKs0VfXP4QKQKe2zEJIp4a/+pvIYdd+UgFenq45EV8WiclDbZsf32WQd3yer9Xg76/X4khV7vN6ajcHNkPpZQxpnBZ0FbQeHXoWtf1ydzX8ct/2P51MA45ufChivnhIgNAQl5Plnr8vSyRFhylgJ6B+iFFdskXl5I2qmosRiMJHsCs8kwUywPj6L82pte7arcHiSSmJCdeMJ/c4xOOhia3/70l3F3VxmGglCS2TZhmMeOotQsi0X+NcwvWZKWiykjfjm1v7QCeVznBFZtiMfjCZQXnvUe29MeCt3tSVx07csncWgHAitmkoxzS7N9bqzlM9ps5pjXvGhRyCg1I1kUmzZ1Rxhj1bSWijncQinqWRcNBSVjtpFw92LgUSVQj/QI8UE98HKCpg4hasGSkc7xhrVSVsZ7UGT4nsNdF+VpwbkyTERHas6zSzwxH6scfc02tmwVCcYH6yXvPMSv3nO5FBX19dcgopiLY2SBTtbacfCEmsOuwB3V4wX63SnHGEMoeFIolVTbrJi44rRuZC8M3CWM/iGO9Gt73Q8g3ZuffUum1rCrmSiqFNihkXqy+DwKDBVjr7puCm9YZQ1ZM7QlUwUcqckr18+jkz50pJigdQSuU7nb74hU8i0xLBgacnWVhW9JSt68cmYOCaOjHnPaL5Aoqx6buhCKJSbm21tUk6l5ZJRdD0ZRd92aURxMfSeCdMSFYWYySafmqaZpIjlTEuobGnJ3CwsRbJXTXKx0BIyg8yKgpYoy4CWyCkgY7dnyfhfOYXuWOlWpZoKw1RSMTMX2Z/sqlRRUU4FFc9B+Yn+cU7JxDOyK0xiRbIlxlmTsimE4Vvy84WZffM1vIvq1jbVoAZZaQZNCAF8kRAFLnAaC9l62ZWqNUcXGTefRXbxteMC/LLx95re2iXmFF+7edOL7Ln1P5QJ0q3KEr6iV1pL/hI0NlcmcQm7RC2xyj4Mc16vyybJv/lI8MQBnznChE20AyGxFz1TS83J5wFJU44qJAEJCkJXboi77hBQEgBbYvDPuvQlkdnFu46FmMdIgiFzftsifd9pYWpe8KxMfW6YgyUVAaimLzIY2JTDM4sSjTCvL2mjGvEr38wHavwj+8Wn2fmehA9Jz2vyB68RnAKZgtfJEG58BEJ5gNctf5xTQvDKy3VpRU1e33ULKy+7TVmPUecra12afSmoKAoNfpOzURLgHlzRR+Md7eARC0zrolckL3XQbWYmWKuXSq0o5f0qjhDHM1Qi6FrpxHEm7Xj7i2TW5OUVnpZ0I6xMSQkUwiD5ARc5EcqjlGCcp0xFwGdgN26Qt9TiIBVb3rlb162f4fxMyYtXNPk755+pXftHlH25trJ7O8v8f+k+ftWP84uceezn8n/eKr8CUveeB66v04heBH07OQ3pZi5D1VRZlUrZOyMeGL+TNg8TMqeNSy3jVxwSguCrAt/3cQDeLZxwUGcjoIpehAXKlPwKWiEQQLlyZJqiny2RADy0RKEIWlOrPe78tcgPgAzr2wdFsuHIi4YMfLXC0mkA8dY7NrR2yDulu5L76Q6P+3ruvm9VVF+43h020EC4eB+iSxR2MVzqCvcn4WOuMgnNtEHwshhXq21xbdXUBbxSP0ym4NWPfcdnZRKI/sjRayysOytO3GHL+LBFU/gkATTAhwMbajL+u9yGJibTPU5eFuN2alvcXtbd2sQF7QdhGhTmJFyPtURNpsepEZkEoDHuWnQSVPw6YHV1wyjeEug1zJhS/xnRgwEEbXA3SPTmoZ0FeE5zS3DPIaRSMoU/NAC2FPpMQQPAzoDizbEhDLgka5Cvpgyi0wB+vwCa4Uamx3EFCgJGJH9FbgBDM8kqteqer9ujqwOoDL4LZiYoqxhMyRR+NwCYoeFJEsUFPe+xrWdkplYNBmDp/Y4w2DRHL0LNJU68bIT/fS7j7DsPibrpqNX6QhDxceCjByaFxwfzxymfRUI79LDlc9bpOZxXdvfLhwqS5F3tgfqa+KmRLBlDfAVz7rXVSR71grGqMf5MqcSnkoEtSxVkeo2x1xgbCuBOT2LHTuP8WSMERDIy79lbMAn51sSsN5vqj14FqOqrQSdz0UP9NfhkBNrXomFwj0HLBokjmb/rNSW88/56Yz0jpDQ1Rhphc9MXb8P/i4NnYOul2DEQPi91zdLZpr9aE2v23b8rGtrG2/dpa2JG7+kfG1+3ADfLsEzIk9acVTdFTft/B0a7v7wpfMu+Y/WdI6hjrUaPQb+YczTf1i30zlRdPPXppOqBgooWtEPLEM6M+eu/fBzaex19Sqn+OnpNsKGnhDPh2BRegpQ+pVRC+moAcbVUtrGvbpFTseIcVaSUqgNWbKgYUQFTevZwbh46POsyq5j5ppaqx2k1RsOSjMg4bwq4MCzMtL4AODUwY50v/ZtPsKJtmW/YtVmpaGnSXwiyLsnfPNb+BghFYK8pD1J07MFw6Id7Fm7ilhZZQ38BhjNwxnluIjKviPJJGjyBLW3PaY+55wD69Clp2eCMJ0/SZ0zwg3Z5tQd9f586CVzhjjm4bzkVUwZY2P3L148/Ae+LgIOFixPZrDXNcWNP5k4NLPWRJ05FT4+T9YoeUeFkXPuU/On5WihVFiptxU1ya4HN2mPPnz1Za0T91y6JDDxxYE3WPn96/tS4vtECFXfm9NrWPj/go/96y59Mj5jxJ9PTk+m1T88RpyfTI1qE80Q4gT9wBWBmvqz72mt3f3mJPk6aNfDXLntKTuxBkb/G2QMQOdvWFfIH0HW5Lrg6O90zMj9tVFylXe7F/2pt3nilJXId8i6mz/uCm2bsjX5GUGzzbT0DPqXntLhva/pDoPP1lwMyITAJC21LG2C9p5spPQf6cjplPdRuTcjpKq+nRzdyzNqv/jb48W6dw3h/bT013vxyKJ1oA+neCWuR/aJBdGjnXjf7C161mE84RdVI+gJ+eAj7ElbIl2HtFX5AgULnJ5ylaEbt16jgD7QKqAcIgFpAAYJB+ANk9HsaWohnT5sWBdJmMP27KouxOnBiOfOA9Q2FoJMV8eSwjfSiV/13/5Lwb5Hg9DonpluJRdxWH5rCM0ECdCXrNXQXssnYyPUMAbWT7vzyKXqd/1P3jT69cFqxwaG7s6NlGB5TnBFfF2qZORmBGZGWCBgh7MmrjI2R1pifUv+5Dhqju4u9UQostckxUCQgEamkTcMjkJmfOv15DpQR0NN/5yMYLIAjQIHs8xdO0uZRlT9bTNoLifWWj+BkUyTGoi/SXzInuyP5Maringtqm2RCIlEE2AG8AI0gh5veO2lqnxQdlPYmyqKPss5KmTAjUU2A4KEnHzzGNObKSH/YDIul15sDk080XqLB09vDJ03JlNutP5vqf3MAJmm3uOqyZwfK/FGVWahm5GmDma54BAAodDDhuxpI+wfnwOYXymGit1ZufnGqvPwy37HF2MGo5/v7YocC3+fxLm1LNgecj+E/CONd+pYf+AJnCkyiW6/KU00GaSdE/QL7zv39ajIz7U6TunrqOtq25+Ea8rTzGq0TSyPU5P7tMwCAQjVbKO6NxlpJsZSp28OZLRyBrSu9jvvq+9nTn6uipxsK3eJSxQd0s9meL6z2CFw8gCC8+6XVJlEnJbTLJplrPVwBHXbG0fGdh1SkD8ut01EV5R3xW2XvkKKnIxv5tt2dTYp6jnxHSwxXY0UzZBIeCvJlhSA8hbsXogevZiwZgLUE+roO0Vob0QAA3wEGLVvn6hATEss/RKYiHmWsEIdcsCrN2y9pJchxG6K7g65F6BQDnFIETXExx2OM9bZpqIY+ZvAZDVeDKXM9xDqxx6FNuxGaxmnqEzVGVQ7ta+n5jVEl1mjUHRxDZP1qyS2/VBWTcemuivbyS1eemKVyBQIBC2e4w22Ox43wGadtLCy5urhKEuQ6oy7Y58xae2fEJ3/p5OJB8Kde8DRJQ951N1hgvqaEpdMXpJ7FIf9f+Oa6aoPNJrLW6wM558I0kLGs3FIJgwthe9EOGDtTOBS7SFlgl6zpkhfhRYcNn5T3tGjLPwCDl/CSPw3z1LUYnfEQeLbUzHvDdkhxx+FN6InTxsCN7lHukrmqhRYNfSdFOkDNHpxg4U5RULZUmOzZzb8qnityKIbDbLuJ0wHnrJMTRybUSxFKGWFK8qtc43T2uZo5WaM4Wq2HoviOZKi9ib3LLfYiC2Tr7sFo9AF2A/UNjPrCt/0HchVnDfiU5MadxeZIU7vgGNp2v/7ReG8/SmZyMjYlxQVEtNF5ytI2+/R66bEI1/d0ssgpYVgaS2tQTrMnSTFO6uDNmNI4OJ5e8qJ5MWQAhE2EJWdEoA1kvyYStEXNFejDIWURlyhWQxyVy4q58UqP1r1rXcRAOjWorD7A61LTT6e8wN/74DIdLfLMzw1zbVPTgoKQsM58rMILy+WccuhDbFsxJA+Xp4r4AZvZLdt5iBau5ObRZc7ArJqVQA/Mit/qVBJrH1tLtEz0wUjdrhMpCpiAiqDQNyF0DvV1mcefzCOrYDtl4jIy0OBIdlTmnV0VGK4Noq04opYJDs4Qg1NLcLgbWnCSBMfuIQ8nS3DuDG64RIIzZjDF5eRffIo0wbsE84vl3bCe7CMyR4C8M6k2PtUgvN+KJtY+pig9iBN7iGGnERdiC2zoPoXqYZJo6Rvpa1c/WFKLD5BUX05JYd9NP659L8qFtunpBgnUwPSy3iGKM8eL7LegFHtjOUcVqZie4KGr2OB2d6ABAKqlWKMTk8JWvXF1AmYJuCRzvYlnMaN5cwmaTY2wp3ji2auxnVQa2Xe+i3er6CnEKUsQYuuDmpDjDDEkJSHnbmgheRIS3UMeqZKQ6gxuZEpCCjOYkhnxmnxF3u385TmrXv/B5WH1lltYffZnox8ag2OoXKDyKbLgLcXsfsaiG9zgEDYyY4HWDXvuFXTQdRw+q08E4MS4X2Az+XOYvzAAHnjQx6FtmBvNT9Z+bYm0juaDb5ldNaIUaVF6DZTR0rUmb3dykmZ99BBuY3xSZ5hdjf/HRN3U1wcBsE43Vdety/sCS8XAkyov0WAw3jRCqAFnd0IAMNpCw6N/ONEgzMD7BzcIOQ4drG1KuuaLzVEyxMg3QBbj6XoR1GUOf40E9cRDfevAdtPsfUP89e4OvuBF773E1w1HDdcNbZ23EqRRseK5B6K1Bk3Qa5eMEOBEpW0oZGB1bHBzBTYRH8eUgvM+L94q+fXrEcfxr6+3xgEGFiuzD1Ngg11tAEBdVILn0awMXoUJnTDvEp4Q+OEuMHejOXZTbUn0XS8+mhV2fDBGRP/lyK4+u6YLNOzTa5IrZ3pW2uHLnxFCmtcocpKDnfde3UMYcBspqrCepDlOTFQiev7aZEnmz0HT6iklNoGIqyIQ+ytzYKJ5zjwQ4j/uOsck/qNa5ykmQYjvVR59ncWc/+6NvOXftZZFv4P+aFmftWiQDbF697D4u0ifxVhKfD7dKM2lttxE/nfwp0j8vB2p7gZ9zS4aHP2R0RINpaFmrELDzdAyXqPh3ZA3vqUmJba7IjWZ4tobIVTjs8YMhB6lPejXRNyeO5m//Aq4XP3BT+Jvt8L67cdIdmVN1hB/ZuoRf7WCSLsZ4Qp8OnAjes345PBfsul+HMaxhq4HJkc+bbsMSM6v/b6Uc8aXAKxy+2F1eDGku6Nu+axgyN6EMFfo+8eu13M1HiA3uN0t9aYHNXvdTm3Wewmb2N0RAHR7YWvlXq9gO5ejPqLV8TXfTd27gNwtNcvRLgxZew3mn6zI7/qe5lJppif+7pF3ZwpQgSU4mHrgIq7Qz/+OTvaicSCPfPX+MZ96ta7s37saX1Q5l+YXIdXN4yqq6qsERw9IGC64qyEfcwOuZqyCU3ZRdCrlN6q/86v+iDwxtnRxcSkkiACWKY7XhtAdzP3m4oX7TB6W265qvrGOYczNnVRwswhW2zsCgFT8djX3eiOCd78QOzTAcyGczxy/PFzZtFo7kuP2pu7pDcj1/QiXm0FyWLTPc7jVHrubY+9PoAEAORLJea4VnPOGBhzs3k447K8NQ/rjqJnkIQjI2RI5Ly7jpmRT0indTYilFQjjJjFTXnpCqq/AQXA+zUeTQ9vRwEm6hc272KvXsqK0DfrD4dCHaZr2ve5G/CGzJ1KSs7OxQmF5dikNYu2Zq7KBCf8F/mAJdEas8+C+yAlL+RsYsGrLqMbclzMZlYeWnNHzjss/C+tjTP/S1afSZhORrZZQ2d6T+G6VzYKcFbclSHfnbYlQ95QwrR/8VWZWaELMde6EMG4RcmW4MyxzGdMVv+bCqlp/sPYPgsGbyp9hVeYPKq+wZtyUHeJoBv/+QkdjvUkW+lSh1d7WTsWB9gkoPrL4tl8l/Z0s8/r1dZkSbvXWsMkh5IMEYNauyeCvWj3kTPOgSar1UpK+3OAKQSn75nN3z+Q3KZe+iTurd+xfD/zAb3e23KmfBvm5ff77TN9J+Rp2drzd/HvzJ/zjLzMZz/TbdKi/FxN+vWlP30W4bmennXnce3npewUwfOWH9vlycwQy/d1Lg3z+cpIzc6exekQIcXlrFCjh++ZlkXOp2KbNmJ7m7Ic12GpW2KL665wtaoavFKrb5ETza9kXNRwqRG2HB1WoORDjMs0JJLCLyFYG2xkoVk375+o6pJJ3ggEAas2cmUBhuFJMxwJVhVmd+rBBABtuM7+meG7kzksFzRkO9jTFcwvnTtoovfFeAu8zTLcI2QNMhmVOB7fILncC2x7yVBV/oJoZjPk6moZIBS9WA1mUfo1Of7GX7oocB7cWU93Xv1Ah2+HkWSExxgSnrVvtXahA6x9iCcSd9glVK+Wqb6FIuHnuyznvZnRO6Zvnfbjl0ZwVE2Xg52I0VOhUeifaZqzdZWXjaBwNf3O7aHYz1GOK0jA4dO2wvNHS+O61gOJCMxVl7MQz8C5L+DqPn/KZ1k9PweV94yiyr6PuXnUp4tD1P3G3Yrvid/Fe3TCwl6t/XKENIJWpcNU3RnkTwWIa9D1U+ax3XHDT0t6ehwpuxD9qZFQLb3eojE5rp0OVyuU4H2CGN+8xEaSSxtVbWhqqVJYzDjySY/GB7Tj/zgdWGqPuYlupabrRWEyXgboGz6Tphsrwftxgtz0SVBocZ7BBI+DCwQUdgFsPeegVpD3owwiwfRFw3W+bL41+fJA0enp6KUq271hMfR1g41LeVj8+mp9mez4hqId8gu7t91Z799G+emWkHc2wkhgiPdmN1PvdRnMXErdSVPt3FVnHO4wpgi5BV+Nt5Yambm4lj/qo4/YlNSU0vIw6TWaoUXtEaWJZE9yvYTT2entzCJoI2xBqVpJq4ytgirga3v0o+ceWfwjTtMsDHiLKbfeE0Yh87s6S9bv7seWfXKaJsu2gtN6N6ZwoZVvh6jwpZ9dEdPVzl1dQ6FQJTCi1s0Lb0lgB9cKBFCfPY7qQBegfP+cARwCLzQ+zltC1kPWRxSVCj90DCE8fVftE6u54gl1HbegIAHLCHYtPLXQ+4nAUX6a+dL1ie2nrEhfqm+Q1NY4qOBPb/NigYI4rnHhV9s9XU2jF3gkGAKyM4WzdzyY3XGUXleir9HJnfKHuPZ8Pm0WW4fVF+fT3c1Nykong+3xW9Levf0zCeaUt7vqa3feYU6X59rrZacGpWbiWjqu5B1ziHXOhe21Bt8nKPhdqlatFmnqawWZtUmB7BetVQJMSbigA2KFHShC62NUxOTp2hJOwUNIlQKhKwoJXYxj15iaLVcwi0U0WG19oObP4kd8fz3zsNsLlOFsXv7/m391ftv3R//5F1NP32fz/TUXKP7bt9eO+3qyUyip/84teAHDB39E9hdbBL/KU2EkoMiyXc5aOLl6nqeVdRepe4XPaqPgSCJsBAADZxGCenpjEQrBZEFM280Gw0z7PwoM07M5mMABgOhqwVWX1i3Y1nclJxB3GZOPMawyVGrnXp4hSlHNnxpCGdDGJNBofRASR0OIYqVayhRsUGG6R4AYFl78gqWd/piTH11G0lLTwYpUt89rlvdjlFyKWJlWlP9XaFVK5Q9dz400Hgrrm7kYIAA5rdKjyD09aSi6K/vUid/TcNz3OtAkuN1TsOGhrMBwvusHZnu6NjKDa4Q87jZDGUM9CSRN9RfxGPwlZkHUTLz25uOxNZdd6eBCkBwcACCvToweYq7aPa33Cq1k4NXb1tumpPG0UKVxtNAMANoKd2bm2J5OlINtZH49H/7pm4TVd6F0FDnTH9Ixg90MpBksN+i6QAvvkiOtE4BobRwS1cUlT0ORzzbiw5X0vdovd2b0rI7tVHQ/BKKA4OkAUlQg+CbHYzxmOgA4YGXRiG/DRebS13FKZ7sXnUXVv8iETVW19lapCES2LL6/n9PHzP/9V18Pi3+Y8ZKFsXqmkF/q3y2uydmSp/5eyZYhUywGtM3le5V5rtAGJXBNckEBaRbRL5nkLT41uGxNJaxftQQVezp39YzV4t7yBsDfbTLcXHC2BMdOefOU2BKC2ShhFQcRlZ0ln8YQC2UgmFI7v5UMGOFZhYxneLH7lx7a2B29elQ2/Qx6wfnrPI4DDG0BMIeRCrD8sLovriXpqL+hApzNqWlDfOBbJYOsmAcAGXZWPOhT9MVTZfF0ID8g5/GJ2C5Lf+wJ62XsbjerQs5l5c9CeYc4CEOmCyYUBAIe2RKw148Gv87YcDb5X5oU/9+7+euelv+4DvBwNOpGZo7El50zvDjw39F4peDSLU55v97mNNd+aOhgAsE67xC6AiiKzibMZxyWcZmtn9zHdm/G8TOhBtOzGZs4KBRx37ew8O2RvEh9kagb1sYaYqSvUlxlapseob+UvTOOo6YOvM2ComTp/eeCT7mjj0ptPAr/VXXHec9rIMZOl6VmK0fSMXAgAAFwAMu9wCsAnBAkANwSz1wCJQKcF2dMTBgCoFqTLXC22C79VdOJ0jQeXwaHM0Z1HHATGwa5uAI1rRwC6UvkuN2jk5UmQFLZswIf09YRlUtcbgegju6SBfIq/kOZGpS2xE6gtnFV6W8YGMQ+NTW9p1ovQa1sK6NzAZLoYXcJg3FlsUtuOcpyL/tfqXtaPjljSbkyX/Y3pp1Es/WAhNznXtI830pLp6dUlDxmHYrfsz03/BdIOFPiDW80EP673qPYg97MK/jhv4/5JJvrYp1+ae+rqZkyGVZA4HKQx6UsoHSEfP5KdW6TkC2EKzNV6MNmqlS4uRpBku2Y1oYvekBQPf9o9pGwP9a5bt/RCemnDSeD2dxT4XSJyYZnIhk4GV9WDAwBcNbxp8zILb8YqnBMwdrWEMDN2NroZAyOMNpoBAJBQ6uzxmp7XG+vucb/bFdcfeqjuWwc6lqin1xnDMkDmWSQXCmd4P+6QqixI1Hcc5oYqDzUaE6praBGqkLrpLwiN/5QwI46k6XuBSIAMlgjlecZo6b7qJl6QuoHU09uKmqDUXNHTKdjOJbX3JFMY6BII4qaQZWjWtY7k425MgfPNBACAKV0PsWAhN5XX9I8bdZIpHnUJxxijKJhMKaddDlfMooqBQd8lpk8VGyTetgTW6Kg8rtyGBGurlC0kbW+x2h0rdGAYjl8Ewrs/Ur8fbL0G2SheGILvE8BFnBXrSEunXozlCcLOnZ4asbzj59zzCOAwA4RIK0iZIUR9ZFGJVNPqmWB7sa9KaEJsZ5QhVPo+AgCXRaqzH7PC40dDn+KrLpgO32w53nES/LMeNspbgl6Bmawanz1m1rufQcJywwJptNBz+thAw3CfapCsTcr01nLxCk1YtipJG8ALp3PcvhnpQZ7Xovate8ope250DNJxLGUK3qTRyVjZa3ist+PmXZvOf47OK/a6C+LWtc99xHQ1Q0B2GVxlfVIm1BdwQDTyWZV3BfF+a+CLr/5VFu5vnHLnlsrt5TqMX7vrTOpn5LvR7Kfn5ydhU/p/B3ztk9KjXQxM3Sc777IRbghPiEsrEU7bOY7eEeRVgSl/iGyuNsrGzHF3no1wSmJlzQqZaiVCnG6WmTGcFrsMysG0J4IBbRFS1o4m0WAF84jSnbdZ7023B99YM/F7lT9J+thWP1vy5pkEVxsBAIADZI/ZiSFHluDe7HBmfeITzOEAauxzcY1TmSHcXAwGAGxmmOwK+GvM+GpleqEwTi8kXDDbA1EKkg49TUJ2F7tOQHTuuNGNyn451r1QpVxWyHCVf6D0gGWCRmmJXQKitCMZAuU6Yu/IruOsWi3YWC6h9ozAal8K7gly1m1kjohMf0AA4BV0QR6uG21t/P6FGtrNLMeFdNgiElQ3H+cOUhS6IZGrMfwZY8rTy/WCpHMrvIWXJ/HlXhAf60U65589VXUbIFHtCi/EAQBk4mUYYE22vpBQvYvTecuAzkFDYe2C4GBnbyBm+8wAAKKgZz+H6HL8+Vyc9bs1KYU7VF1Ue2y3oKIHPbh0/l3DSbq16BPgJpV8gktnzApQ/UwyDrqX97cCpyFIWIATsw3TELXsogrElGBQn0iz4igTkUgZHB5Y6DnjYqhulAwCATm+tJiGvm313PZdFNWLmi6hwVS5om4kSl/fRwBwXrCR9djdZoU4dZfL6XEAwLnEuIcS7pwojkEW26VrAe5umDKqwJYGo+0KWN5wv60GuXFWXN3mYzQt7P5qFS5vgfJqOAd/IL+cfyEBHOiBkLKEtEL2Rxa3KA27BxSeP7JOCVudUSzXwY0fAcBCeFV77PXCGcKoUki6IfhzJJ+TWULPecVaBGD+mawrn9OxexqMm+XGBEHs86jkTBomsxkMAMjlT3PViFi/coDtUjjFrX1F+L6KP0v6y16qrlf5as9Res7nrupwbVh+iJ2V6vY/ya5yb+7Wjx9/4/XPI6fyGtkNlGJ2umqoCKnIwXSbniDPr6oHeTS43X4wAOCK0WD23AXIAi2sOO9JahdI6M7bBdweB/tJgcU4dy6BAkWIc1AXExM+09AY45Idh3cak4JhctSsRuygipr1yljUyD9pwFda5uYnJhFmn5zmGpJ3Jmbz47Y7BAxd8JhYkTnj7AvRg45w2xfS+YLC477YHvkbjxm7LKdi4LLRfUJjUxgAEJgcnAsugzm14rhZKaVw7c4zGmrYEZY6cS5anQdEOncyOgsd+2UFxbFCMsG4WCY5BzEr7LJoaI1gWAKuy9vZUsONPdqtgAJSlw6FHvsFLP4hFluZP0kLc/SL7+kvoOKVs6fYsKrdRtMS1VR/QAAwWtixhUic0LSk3FoU7kjZylX9pCGbawkW739C8xLMP/YM699DpMdUREekhBqqbIxzycZl4tVp7Y6Q1QDqlJ+lFlKG2COPYTxMNzIX85Mlx64PtOlBsM8/e2jsAHrZdwIA9MaRljOd+26fY2lGzEtUwkRgRxZyA+yT1eEC0jJbLMjtPjMAQAuYbUfb9YB2yTEUAdTOPxUg9lzoigDrnDG6ABnPoqjRlpv3d3S6KTOUPRLtbjButjkZ5swudwJb6y+4KpSr7Rt5WpQL4wV7EGjMM8cC9ORZuCxHX6R2xXDaMuboF+8zYQwP4QbbyjSBZqolz3BOcf090GCZy6pr4fhsBN5Wnqx+l2h2NwoAAMKGnGz9QqchXmULsl2d95RFYVqXGF5TmoMTRSkQ7Tbi0lp87OKfoZY9fHUfbvV/7llfCDI8fuCKCkN2POr5fHsG5+pDyHlA2rpdQIhXyuBzCNcdDFfk3HIcvGUE3yovXVrYv/LiMQ2oFkuFNsC0kcG4hbois828n906/zy70yp5SLJLztjFYACAtZ+rlQ6p3vB8pq6KcajpEfSCJH7dxviRDP3Gwn3qq85DE53Z0RHcdDedwO4zOx6wMbZghLqarqM3sy3Cq01hAMA19w8uuQvIA2xacXHGy4CVOvTO7fDBYM+NrQIrpOk1JINKF7WeJvdgwjnDCyG62nNxhBoPMegYQrnZBdOF0xGhAsGAmbraSWG2X0MQWgQLe0ZqcVeXfM1v8BH1Czfft3T4e3dz7vFTYjSDwly8WFChgPyWkZJ9BSVw7dJP5ZHzu6qfJE+ipieZYU4D+MwC0sIlXMeplfELFV3b6CRAHA093RZczTDJfB6OevjDrbWZ1tl5KWzOXIA9LfSU96Ea+nJBGAAQ/amuaol190zSaSVzYAbAa8OpwsWKI507LykoujjYkxDHHadNclBVBv7oGrVC1P2AIJSzdBU5qhsF/tgRmn73r7h9nNjw29+jd2Y3KRQGg72pQ4l/hMxvg8r00+Sbkr3Bp+He2noaOLBrmXmKC87wQbYpaGs8xOw0oC330LKjgbYCf2HHRO1se0DLTJBrP2S92OWRu96HzhdDVQZBVDW+nipiTkqJBQprYUSZIqOW5OFpJKW7P5cBMurbBXwbpmEjXjI7Bqok+uODrqPt7ejx6xRuwxY9yXcY2AVGbjRwidSdcaPngiybAb0pa9vQCRenlty+J9k6tYujpF1+eMsR7g0TNcac/TfRBV7cFcy/W135X9TjmP/12xcfRPinEBCdzm+TQJtIAjx+b0o/n9CTDdTgy0tYfBw4KP5t4Nn2QGtaJciysN/Vn+d93Xxt9H3kZ8pAEHk5rdvb7/oXgj0Ttzu7w/8GklrNd9yzjX738ouTRLto7PuZXhQL7U0LNpDQw7cuLxNYv1KO0s6RMsv91vo2Qz9R5a8J3dixsHaDmevZAQAGo4ljXoQG9AUc4xeeeIKgZPXWEagsbRehuNEMADCJluxoi8AB7LEE5LDzLwbpcaKby2SHz52iLmT4Khh+Ju0QpPE5WbMak4Cf2Wqfz6zo8zxvVgHWrT6pXxzxqBOIXwmbVsndZ5MYVQBU6DY3BuTpsIvZrQ1D9IzHYM5uIiKfk+HF9MTPYC3ug0pCj5/HlpxOV/9UmYIfbGsdW8XQz5jTQlOypzPjQw00lxZlQKNEz6qBbWyrKATYip/RhaHGVQa84Y53LAAAXRH1/fLeDW7Hd+xRQ13ONtngQIi4xbBQkLY1huK6gTxb25W15cSqsuouu9uFWkxzkQeohcX2dlCHbjeGW3zvEf+s+8mEfTwe1J3cf/6aZMxPhiuuZtJs6uooSLfPN7UranjlzWAAwI00bG5r/YxrWxWlUwrpfTy3Qz9VlvSLOfuvOjFMjkGcVhxOaSfaVMCy2WGFYa0BLmKQrC3MyT4Hyz4jDYHaDAYA4KSBcR0GmUSbOj3Xa6NyM8bZOC/Q5rNu2n+snQ7lyGmKOw+Bs6uAm481utE8wQtpLkOVyOIXyivkv633TezEyrAAvCniiaB2n5JTY6HjcYgeAyoqr4OdFEBkbYRjZrLRxUBf2rZwtf/3Z28NX2UmqObHrI9ljBD+q90TchQvhGQVWBBETLEMGUJiaKHqCAnBQE3FLa2onAfEAOY8KOokYxm1srLy90I1nUl8Yd64TfGfN6Hj78jt++y9bnyaGLZm5KIBAGBTSypc0eica70dDa4jBW+bmO3znzkcB1Sn58hzlyallOiqmbGLwQCAk94A3e11LtC+lRT4JOMWEzJVnDt26G1XuxjhlrnaYW2i4i2N1bBTEWNU8qJGnz/QqnIjlW4SEXJU6rCnA4tlTgMdInY5GTpsBMMpqNOdB3S5kjq3PNrbHkiNkkQCUhgqyaInpbUg9JFTwGpIsv2tUfc3o+6vRd3bmLqfpa7asCS1eaNOYRpsBKp1yPa3St0vUlfAS+J1S1c/S109xZjUJp06AnzeITwh2WLs9W+FqQg12W76q7ZtAtDcNltgXANgEGo4GAM9EM7nuXF0BCBxK7FooNfNinXbHT6Ct+5T4+VzY64si7Rr5SO3wu3PKvvI6Ex1f2KxJSso8UxKGy4DXrkeyKc91OB8w6Qx1OP5lnoLQtX2r17/UX418X4Ldyt1ek0OvCZp7dF+gef1b4LHWfgV6lEqKGXqUoAalwa1WeN/8v2HqPllp4EYknAB9q1qzYhdfRTkTmbvAVywxwwAOBhic0baOAEgrkHxVYsZR5m5j9JjVurRJql+ZjmWCst0/t21V9qwd7lkKhQy8fSq0brUYp4cKucVYKFcsqZJlVwQZk+vxOhT14JpO6aHqX8FdmfxXHyUo9OjnxZ/eu/0T5zS0i85zqQ6SJ/OewPsbdY6VAqnBUncTXs2CpdDTZyDoj52SXqNeIgitL+QoDYqITymHAeV6LzgnAltqWjHc2aAQKQOtBBsbSvYFYQjRA/bGbWd2OwtlbCgoUtojLdkuqlvbdQw17cAAEymFLqp7YvGkHicqxLnBidzqZw7SKnaYnQxlKSdKFusJjJoB96uVvCGltaWu7FJtlD1NaIt15Bsgfha/ZYpku3Z1SV+daOjxtUiO+Zznh1P0/kqGIuaev2hfJbXn0/vzYuyQnaifkyVT1p70sADI+NZFXBZFcE1LfTr+WBNch33hAEAuUYDzljrTMahPJYA","base64")).toString()),nH}var Tde=new Map([[W.makeIdent(null,"fsevents").identHash,Qde],[W.makeIdent(null,"resolve").identHash,Fde],[W.makeIdent(null,"typescript").identHash,Rde]]),Pgt={hooks:{registerPackageExtensions:async(t,e)=>{for(let[r,o]of eH)e(W.parseDescriptor(r,!0),o)},getBuiltinPatch:async(t,e)=>{let r="compat/";if(!e.startsWith(r))return;let o=W.parseIdent(e.slice(r.length)),a=Tde.get(o.identHash)?.();return typeof a<"u"?a:null},reduceDependency:async(t,e,r,o)=>typeof Tde.get(t.identHash)>"u"?t:W.makeDescriptor(t,W.makeRange({protocol:"patch:",source:W.stringifyDescriptor(t),selector:`optional!builtin<compat/${W.stringifyIdent(t)}>`,params:null}))}},bgt=Pgt;var wH={};Vt(wH,{ConstraintsCheckCommand:()=>h0,ConstraintsQueryCommand:()=>f0,ConstraintsSourceCommand:()=>p0,default:()=>tdt});Ye();Ye();v2();var IC=class{constructor(e){this.project=e}createEnvironment(){let e=new wC(["cwd","ident"]),r=new wC(["workspace","type","ident"]),o=new wC(["ident"]),a={manifestUpdates:new Map,reportedErrors:new Map},n=new Map,u=new Map;for(let A of this.project.storedPackages.values()){let p=Array.from(A.peerDependencies.values(),h=>[W.stringifyIdent(h),h.range]);n.set(A.locatorHash,{workspace:null,ident:W.stringifyIdent(A),version:A.version,dependencies:new Map,peerDependencies:new Map(p.filter(([h])=>A.peerDependenciesMeta.get(h)?.optional!==!0)),optionalPeerDependencies:new Map(p.filter(([h])=>A.peerDependenciesMeta.get(h)?.optional===!0))})}for(let A of this.project.storedPackages.values()){let p=n.get(A.locatorHash);p.dependencies=new Map(Array.from(A.dependencies.values(),h=>{let E=this.project.storedResolutions.get(h.descriptorHash);if(typeof E>"u")throw new Error("Assertion failed: The resolution should have been registered");let I=n.get(E);if(typeof I>"u")throw new Error("Assertion failed: The package should have been registered");return[W.stringifyIdent(h),I]})),p.dependencies.delete(p.ident)}for(let A of this.project.workspaces){let p=W.stringifyIdent(A.anchoredLocator),h=A.manifest.exportTo({}),E=n.get(A.anchoredLocator.locatorHash);if(typeof E>"u")throw new Error("Assertion failed: The package should have been registered");let I=(R,L,{caller:U=Ji.getCaller()}={})=>{let J=B2(R),te=_e.getMapWithDefault(a.manifestUpdates,A.cwd),ae=_e.getMapWithDefault(te,J),fe=_e.getSetWithDefault(ae,L);U!==null&&fe.add(U)},v=R=>I(R,void 0,{caller:Ji.getCaller()}),x=R=>{_e.getArrayWithDefault(a.reportedErrors,A.cwd).push(R)},C=e.insert({cwd:A.relativeCwd,ident:p,manifest:h,pkg:E,set:I,unset:v,error:x});u.set(A,C);for(let R of Ot.allDependencies)for(let L of A.manifest[R].values()){let U=W.stringifyIdent(L),J=()=>{I([R,U],void 0,{caller:Ji.getCaller()})},te=fe=>{I([R,U],fe,{caller:Ji.getCaller()})},ae=null;if(R!=="peerDependencies"&&(R!=="dependencies"||!A.manifest.devDependencies.has(L.identHash))){let fe=A.anchoredPackage.dependencies.get(L.identHash);if(fe){if(typeof fe>"u")throw new Error("Assertion failed: The dependency should have been registered");let ce=this.project.storedResolutions.get(fe.descriptorHash);if(typeof ce>"u")throw new Error("Assertion failed: The resolution should have been registered");let me=n.get(ce);if(typeof me>"u")throw new Error("Assertion failed: The package should have been registered");ae=me}}r.insert({workspace:C,ident:U,range:L.range,type:R,resolution:ae,update:te,delete:J,error:x})}}for(let A of this.project.storedPackages.values()){let p=this.project.tryWorkspaceByLocator(A);if(!p)continue;let h=u.get(p);if(typeof h>"u")throw new Error("Assertion failed: The workspace should have been registered");let E=n.get(A.locatorHash);if(typeof E>"u")throw new Error("Assertion failed: The package should have been registered");E.workspace=h}return{workspaces:e,dependencies:r,packages:o,result:a}}async process(){let e=this.createEnvironment(),r={Yarn:{workspace:a=>e.workspaces.find(a)[0]??null,workspaces:a=>e.workspaces.find(a),dependency:a=>e.dependencies.find(a)[0]??null,dependencies:a=>e.dependencies.find(a),package:a=>e.packages.find(a)[0]??null,packages:a=>e.packages.find(a)}},o=await this.project.loadUserConfig();return o?.constraints?(await o.constraints(r),e.result):null}};Ye();Ye();jt();var f0=class extends ut{constructor(){super(...arguments);this.json=ge.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.query=ge.String()}async execute(){let{Constraints:r}=await Promise.resolve().then(()=>(x2(),b2)),o=await Ke.find(this.context.cwd,this.context.plugins),{project:a}=await Pt.find(o,this.context.cwd),n=await r.find(a),u=this.query;return u.endsWith(".")||(u=`${u}.`),(await Nt.start({configuration:o,json:this.json,stdout:this.context.stdout},async p=>{for await(let h of n.query(u)){let E=Array.from(Object.entries(h)),I=E.length,v=E.reduce((x,[C])=>Math.max(x,C.length),0);for(let x=0;x<I;x++){let[C,R]=E[x];p.reportInfo(null,`${$gt(x,I)}${C.padEnd(v," ")} = ${Zgt(R)}`)}p.reportJson(h)}})).exitCode()}};f0.paths=[["constraints","query"]],f0.usage=nt.Usage({category:"Constraints-related commands",description:"query the constraints fact database",details:`
+      This command will output all matches to the given prolog query.
+    `,examples:[["List all dependencies throughout the workspace","yarn constraints query 'workspace_has_dependency(_, DependencyName, _, _).'"]]});function Zgt(t){return typeof t!="string"?`${t}`:t.match(/^[a-zA-Z][a-zA-Z0-9_]+$/)?t:`'${t}'`}function $gt(t,e){let r=t===0,o=t===e-1;return r&&o?"":r?"\u250C ":o?"\u2514 ":"\u2502 "}Ye();jt();var p0=class extends ut{constructor(){super(...arguments);this.verbose=ge.Boolean("-v,--verbose",!1,{description:"Also print the fact database automatically compiled from the workspace manifests"})}async execute(){let{Constraints:r}=await Promise.resolve().then(()=>(x2(),b2)),o=await Ke.find(this.context.cwd,this.context.plugins),{project:a}=await Pt.find(o,this.context.cwd),n=await r.find(a);this.context.stdout.write(this.verbose?n.fullSource:n.source)}};p0.paths=[["constraints","source"]],p0.usage=nt.Usage({category:"Constraints-related commands",description:"print the source code for the constraints",details:"\n      This command will print the Prolog source code used by the constraints engine. Adding the `-v,--verbose` flag will print the *full* source code, including the fact database automatically compiled from the workspace manifests.\n    ",examples:[["Prints the source code","yarn constraints source"],["Print the source code and the fact database","yarn constraints source -v"]]});Ye();Ye();jt();v2();var h0=class extends ut{constructor(){super(...arguments);this.fix=ge.Boolean("--fix",!1,{description:"Attempt to automatically fix unambiguous issues, following a multi-pass process"});this.json=ge.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"})}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o}=await Pt.find(r,this.context.cwd);await o.restoreInstallState();let a=await o.loadUserConfig(),n;if(a?.constraints)n=new IC(o);else{let{Constraints:h}=await Promise.resolve().then(()=>(x2(),b2));n=await h.find(o)}let u,A=!1,p=!1;for(let h=this.fix?10:1;h>0;--h){let E=await n.process();if(!E)break;let{changedWorkspaces:I,remainingErrors:v}=gk(o,E,{fix:this.fix}),x=[];for(let[C,R]of I){let L=C.manifest.indent;C.manifest=new Ot,C.manifest.indent=L,C.manifest.load(R),x.push(C.persistManifest())}if(await Promise.all(x),!(I.size>0&&h>1)){u=Hde(v,{configuration:r}),A=!1,p=!0;for(let[,C]of v)for(let R of C)R.fixable?A=!0:p=!1}}if(u.children.length===0)return 0;if(A){let h=p?`Those errors can all be fixed by running ${de.pretty(r,"yarn constraints --fix",de.Type.CODE)}`:`Errors prefixed by '\u2699' can be fixed by running ${de.pretty(r,"yarn constraints --fix",de.Type.CODE)}`;await Nt.start({configuration:r,stdout:this.context.stdout,includeNames:!1,includeFooter:!1},async E=>{E.reportInfo(0,h),E.reportSeparator()})}return u.children=_e.sortMap(u.children,h=>h.value[1]),$s.emitTree(u,{configuration:r,stdout:this.context.stdout,json:this.json,separators:1}),1}};h0.paths=[["constraints"]],h0.usage=nt.Usage({category:"Constraints-related commands",description:"check that the project constraints are met",details:`
+      This command will run constraints on your project and emit errors for each one that is found but isn't met. If any error is emitted the process will exit with a non-zero exit code.
+
+      If the \`--fix\` flag is used, Yarn will attempt to automatically fix the issues the best it can, following a multi-pass process (with a maximum of 10 iterations). Some ambiguous patterns cannot be autofixed, in which case you'll have to manually specify the right resolution.
+
+      For more information as to how to write constraints, please consult our dedicated page on our website: https://yarnpkg.com/features/constraints.
+    `,examples:[["Check that all constraints are satisfied","yarn constraints"],["Autofix all unmet constraints","yarn constraints --fix"]]});v2();var edt={configuration:{enableConstraintsChecks:{description:"If true, constraints will run during installs",type:"BOOLEAN",default:!1},constraintsPath:{description:"The path of the constraints file.",type:"ABSOLUTE_PATH",default:"./constraints.pro"}},commands:[f0,p0,h0],hooks:{async validateProjectAfterInstall(t,{reportError:e}){if(!t.configuration.get("enableConstraintsChecks"))return;let r=await t.loadUserConfig(),o;if(r?.constraints)o=new IC(t);else{let{Constraints:u}=await Promise.resolve().then(()=>(x2(),b2));o=await u.find(t)}let a=await o.process();if(!a)return;let{remainingErrors:n}=gk(t,a);if(n.size!==0)if(t.configuration.isCI)for(let[u,A]of n)for(let p of A)e(84,`${de.pretty(t.configuration,u.anchoredLocator,de.Type.IDENT)}: ${p.text}`);else e(84,`Constraint check failed; run ${de.pretty(t.configuration,"yarn constraints",de.Type.CODE)} for more details`)}}},tdt=edt;var IH={};Vt(IH,{CreateCommand:()=>tm,DlxCommand:()=>g0,default:()=>ndt});Ye();jt();var tm=class extends ut{constructor(){super(...arguments);this.pkg=ge.String("-p,--package",{description:"The package to run the provided command from"});this.quiet=ge.Boolean("-q,--quiet",!1,{description:"Only report critical errors instead of printing the full install logs"});this.command=ge.String();this.args=ge.Proxy()}async execute(){let r=[];this.pkg&&r.push("--package",this.pkg),this.quiet&&r.push("--quiet");let o=this.command.replace(/^(@[^@/]+)(@|$)/,"$1/create$2"),a=W.parseDescriptor(o),n=a.name.match(/^create(-|$)/)?a:a.scope?W.makeIdent(a.scope,`create-${a.name}`):W.makeIdent(null,`create-${a.name}`),u=W.stringifyIdent(n);return a.range!=="unknown"&&(u+=`@${a.range}`),this.cli.run(["dlx",...r,u,...this.args])}};tm.paths=[["create"]];Ye();Ye();St();jt();var g0=class extends ut{constructor(){super(...arguments);this.packages=ge.Array("-p,--package",{description:"The package(s) to install before running the command"});this.quiet=ge.Boolean("-q,--quiet",!1,{description:"Only report critical errors instead of printing the full install logs"});this.command=ge.String();this.args=ge.Proxy()}async execute(){return Ke.telemetry=null,await oe.mktempPromise(async r=>{let o=V.join(r,`dlx-${process.pid}`);await oe.mkdirPromise(o),await oe.writeFilePromise(V.join(o,"package.json"),`{}
+`),await oe.writeFilePromise(V.join(o,"yarn.lock"),"");let a=V.join(o,".yarnrc.yml"),n=await Ke.findProjectCwd(this.context.cwd),A={enableGlobalCache:!(await Ke.find(this.context.cwd,null,{strict:!1})).get("enableGlobalCache"),enableTelemetry:!1,logFilters:[{code:Wu(68),level:de.LogLevel.Discard}]},p=n!==null?V.join(n,".yarnrc.yml"):null;p!==null&&oe.existsSync(p)?(await oe.copyFilePromise(p,a),await Ke.updateConfiguration(o,L=>{let U=_e.toMerged(L,A);return Array.isArray(L.plugins)&&(U.plugins=L.plugins.map(J=>{let te=typeof J=="string"?J:J.path,ae=ue.isAbsolute(te)?te:ue.resolve(ue.fromPortablePath(n),te);return typeof J=="string"?ae:{path:ae,spec:J.spec}})),U})):await oe.writeJsonPromise(a,A);let h=this.packages??[this.command],E=W.parseDescriptor(this.command).name,I=await this.cli.run(["add","--fixed","--",...h],{cwd:o,quiet:this.quiet});if(I!==0)return I;this.quiet||this.context.stdout.write(`
+`);let v=await Ke.find(o,this.context.plugins),{project:x,workspace:C}=await Pt.find(v,o);if(C===null)throw new rr(x.cwd,o);await x.restoreInstallState();let R=await un.getWorkspaceAccessibleBinaries(C);return R.has(E)===!1&&R.size===1&&typeof this.packages>"u"&&(E=Array.from(R)[0][0]),await un.executeWorkspaceAccessibleBinary(C,E,this.args,{packageAccessibleBinaries:R,cwd:this.context.cwd,stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr})})}};g0.paths=[["dlx"]],g0.usage=nt.Usage({description:"run a package in a temporary environment",details:"\n      This command will install a package within a temporary environment, and run its binary script if it contains any. The binary will run within the current cwd.\n\n      By default Yarn will download the package named `command`, but this can be changed through the use of the `-p,--package` flag which will instruct Yarn to still run the same command but from a different package.\n\n      Using `yarn dlx` as a replacement of `yarn add` isn't recommended, as it makes your project non-deterministic (Yarn doesn't keep track of the packages installed through `dlx` - neither their name, nor their version).\n    ",examples:[["Use create-react-app to create a new React app","yarn dlx create-react-app ./my-app"],["Install multiple packages for a single command",`yarn dlx -p typescript -p ts-node ts-node --transpile-only -e "console.log('hello!')"`]]});var rdt={commands:[tm,g0]},ndt=rdt;var DH={};Vt(DH,{ExecFetcher:()=>Q2,ExecResolver:()=>F2,default:()=>odt,execUtils:()=>Ek});Ye();Ye();St();var fA="exec:";var Ek={};Vt(Ek,{loadGeneratorFile:()=>k2,makeLocator:()=>vH,makeSpec:()=>pme,parseSpec:()=>BH});Ye();St();function BH(t){let{params:e,selector:r}=W.parseRange(t),o=ue.toPortablePath(r);return{parentLocator:e&&typeof e.locator=="string"?W.parseLocator(e.locator):null,path:o}}function pme({parentLocator:t,path:e,generatorHash:r,protocol:o}){let a=t!==null?{locator:W.stringifyLocator(t)}:{},n=typeof r<"u"?{hash:r}:{};return W.makeRange({protocol:o,source:e,selector:e,params:{...n,...a}})}function vH(t,{parentLocator:e,path:r,generatorHash:o,protocol:a}){return W.makeLocator(t,pme({parentLocator:e,path:r,generatorHash:o,protocol:a}))}async function k2(t,e,r){let{parentLocator:o,path:a}=W.parseFileStyleRange(t,{protocol:e}),n=V.isAbsolute(a)?{packageFs:new gn(Bt.root),prefixPath:Bt.dot,localPath:Bt.root}:await r.fetcher.fetch(o,r),u=n.localPath?{packageFs:new gn(Bt.root),prefixPath:V.relative(Bt.root,n.localPath)}:n;n!==u&&n.releaseFs&&n.releaseFs();let A=u.packageFs,p=V.join(u.prefixPath,a);return await A.readFilePromise(p,"utf8")}var Q2=class{supports(e,r){return!!e.reference.startsWith(fA)}getLocalPath(e,r){let{parentLocator:o,path:a}=W.parseFileStyleRange(e.reference,{protocol:fA});if(V.isAbsolute(a))return a;let n=r.fetcher.getLocalPath(o,r);return n===null?null:V.resolve(n,a)}async fetch(e,r){let o=r.checksums.get(e.locatorHash)||null,[a,n,u]=await r.cache.fetchPackageFromCache(e,o,{onHit:()=>r.report.reportCacheHit(e),onMiss:()=>r.report.reportCacheMiss(e),loader:()=>this.fetchFromDisk(e,r),...r.cacheOptions});return{packageFs:a,releaseFs:n,prefixPath:W.getIdentVendorPath(e),localPath:this.getLocalPath(e,r),checksum:u}}async fetchFromDisk(e,r){let o=await k2(e.reference,fA,r);return oe.mktempPromise(async a=>{let n=V.join(a,"generator.js");return await oe.writeFilePromise(n,o),oe.mktempPromise(async u=>{if(await this.generatePackage(u,e,n,r),!oe.existsSync(V.join(u,"build")))throw new Error("The script should have generated a build directory");return await Xi.makeArchiveFromDirectory(V.join(u,"build"),{prefixPath:W.getIdentVendorPath(e),compressionLevel:r.project.configuration.get("compressionLevel")})})})}async generatePackage(e,r,o,a){return await oe.mktempPromise(async n=>{let u=await un.makeScriptEnv({project:a.project,binFolder:n}),A=V.join(e,"runtime.js");return await oe.mktempPromise(async p=>{let h=V.join(p,"buildfile.log"),E=V.join(e,"generator"),I=V.join(e,"build");await oe.mkdirPromise(E),await oe.mkdirPromise(I);let v={tempDir:ue.fromPortablePath(E),buildDir:ue.fromPortablePath(I),locator:W.stringifyLocator(r)};await oe.writeFilePromise(A,`
+          // Expose 'Module' as a global variable
+          Object.defineProperty(global, 'Module', {
+            get: () => require('module'),
+            configurable: true,
+            enumerable: false,
+          });
+
+          // Expose non-hidden built-in modules as global variables
+          for (const name of Module.builtinModules.filter((name) => name !== 'module' && !name.startsWith('_'))) {
+            Object.defineProperty(global, name, {
+              get: () => require(name),
+              configurable: true,
+              enumerable: false,
+            });
+          }
+
+          // Expose the 'execEnv' global variable
+          Object.defineProperty(global, 'execEnv', {
+            value: {
+              ...${JSON.stringify(v)},
+            },
+            enumerable: true,
+          });
+        `);let x=u.NODE_OPTIONS||"",C=/\s*--require\s+\S*\.pnp\.c?js\s*/g;x=x.replace(C," ").trim(),u.NODE_OPTIONS=x;let{stdout:R,stderr:L}=a.project.configuration.getSubprocessStreams(h,{header:`# This file contains the result of Yarn generating a package (${W.stringifyLocator(r)})
+`,prefix:W.prettyLocator(a.project.configuration,r),report:a.report}),{code:U}=await Ur.pipevp(process.execPath,["--require",ue.fromPortablePath(A),ue.fromPortablePath(o),W.stringifyIdent(r)],{cwd:e,env:u,stdin:null,stdout:R,stderr:L});if(U!==0)throw oe.detachTemp(p),new Error(`Package generation failed (exit code ${U}, logs can be found here: ${de.pretty(a.project.configuration,h,de.Type.PATH)})`)})})}};Ye();Ye();var idt=2,F2=class{supportsDescriptor(e,r){return!!e.range.startsWith(fA)}supportsLocator(e,r){return!!e.reference.startsWith(fA)}shouldPersistResolution(e,r){return!1}bindDescriptor(e,r,o){return W.bindDescriptor(e,{locator:W.stringifyLocator(r)})}getResolutionDependencies(e,r){return{}}async getCandidates(e,r,o){if(!o.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let{path:a,parentLocator:n}=BH(e.range);if(n===null)throw new Error("Assertion failed: The descriptor should have been bound");let u=await k2(W.makeRange({protocol:fA,source:a,selector:a,params:{locator:W.stringifyLocator(n)}}),fA,o.fetchOptions),A=wn.makeHash(`${idt}`,u).slice(0,6);return[vH(e,{parentLocator:n,path:a,generatorHash:A,protocol:fA})]}async getSatisfying(e,r,o,a){let[n]=await this.getCandidates(e,r,a);return{locators:o.filter(u=>u.locatorHash===n.locatorHash),sorted:!1}}async resolve(e,r){if(!r.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let o=await r.fetchOptions.fetcher.fetch(e,r.fetchOptions),a=await _e.releaseAfterUseAsync(async()=>await Ot.find(o.prefixPath,{baseFs:o.packageFs}),o.releaseFs);return{...e,version:a.version||"0.0.0",languageName:a.languageName||r.project.configuration.get("defaultLanguageName"),linkType:"HARD",conditions:a.getConditions(),dependencies:r.project.configuration.normalizeDependencyMap(a.dependencies),peerDependencies:a.peerDependencies,dependenciesMeta:a.dependenciesMeta,peerDependenciesMeta:a.peerDependenciesMeta,bin:a.bin}}};var sdt={fetchers:[Q2],resolvers:[F2]},odt=sdt;var PH={};Vt(PH,{FileFetcher:()=>L2,FileResolver:()=>O2,TarballFileFetcher:()=>M2,TarballFileResolver:()=>U2,default:()=>cdt,fileUtils:()=>rm});Ye();St();var SC=/^(?:[a-zA-Z]:[\\/]|\.{0,2}\/)/,R2=/^[^?]*\.(?:tar\.gz|tgz)(?:::.*)?$/,Ui="file:";var rm={};Vt(rm,{fetchArchiveFromLocator:()=>N2,makeArchiveFromLocator:()=>Ck,makeBufferFromLocator:()=>SH,makeLocator:()=>PC,makeSpec:()=>hme,parseSpec:()=>T2});Ye();St();function T2(t){let{params:e,selector:r}=W.parseRange(t),o=ue.toPortablePath(r);return{parentLocator:e&&typeof e.locator=="string"?W.parseLocator(e.locator):null,path:o}}function hme({parentLocator:t,path:e,hash:r,protocol:o}){let a=t!==null?{locator:W.stringifyLocator(t)}:{},n=typeof r<"u"?{hash:r}:{};return W.makeRange({protocol:o,source:e,selector:e,params:{...n,...a}})}function PC(t,{parentLocator:e,path:r,hash:o,protocol:a}){return W.makeLocator(t,hme({parentLocator:e,path:r,hash:o,protocol:a}))}async function N2(t,e){let{parentLocator:r,path:o}=W.parseFileStyleRange(t.reference,{protocol:Ui}),a=V.isAbsolute(o)?{packageFs:new gn(Bt.root),prefixPath:Bt.dot,localPath:Bt.root}:await e.fetcher.fetch(r,e),n=a.localPath?{packageFs:new gn(Bt.root),prefixPath:V.relative(Bt.root,a.localPath)}:a;a!==n&&a.releaseFs&&a.releaseFs();let u=n.packageFs,A=V.join(n.prefixPath,o);return await _e.releaseAfterUseAsync(async()=>await u.readFilePromise(A),n.releaseFs)}async function Ck(t,{protocol:e,fetchOptions:r,inMemory:o=!1}){let{parentLocator:a,path:n}=W.parseFileStyleRange(t.reference,{protocol:e}),u=V.isAbsolute(n)?{packageFs:new gn(Bt.root),prefixPath:Bt.dot,localPath:Bt.root}:await r.fetcher.fetch(a,r),A=u.localPath?{packageFs:new gn(Bt.root),prefixPath:V.relative(Bt.root,u.localPath)}:u;u!==A&&u.releaseFs&&u.releaseFs();let p=A.packageFs,h=V.join(A.prefixPath,n);return await _e.releaseAfterUseAsync(async()=>await Xi.makeArchiveFromDirectory(h,{baseFs:p,prefixPath:W.getIdentVendorPath(t),compressionLevel:r.project.configuration.get("compressionLevel"),inMemory:o}),A.releaseFs)}async function SH(t,{protocol:e,fetchOptions:r}){return(await Ck(t,{protocol:e,fetchOptions:r,inMemory:!0})).getBufferAndClose()}var L2=class{supports(e,r){return!!e.reference.startsWith(Ui)}getLocalPath(e,r){let{parentLocator:o,path:a}=W.parseFileStyleRange(e.reference,{protocol:Ui});if(V.isAbsolute(a))return a;let n=r.fetcher.getLocalPath(o,r);return n===null?null:V.resolve(n,a)}async fetch(e,r){let o=r.checksums.get(e.locatorHash)||null,[a,n,u]=await r.cache.fetchPackageFromCache(e,o,{onHit:()=>r.report.reportCacheHit(e),onMiss:()=>r.report.reportCacheMiss(e,`${W.prettyLocator(r.project.configuration,e)} can't be found in the cache and will be fetched from the disk`),loader:()=>this.fetchFromDisk(e,r),...r.cacheOptions});return{packageFs:a,releaseFs:n,prefixPath:W.getIdentVendorPath(e),localPath:this.getLocalPath(e,r),checksum:u}}async fetchFromDisk(e,r){return Ck(e,{protocol:Ui,fetchOptions:r})}};Ye();Ye();var adt=2,O2=class{supportsDescriptor(e,r){return e.range.match(SC)?!0:!!e.range.startsWith(Ui)}supportsLocator(e,r){return!!e.reference.startsWith(Ui)}shouldPersistResolution(e,r){return!1}bindDescriptor(e,r,o){return SC.test(e.range)&&(e=W.makeDescriptor(e,`${Ui}${e.range}`)),W.bindDescriptor(e,{locator:W.stringifyLocator(r)})}getResolutionDependencies(e,r){return{}}async getCandidates(e,r,o){if(!o.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let{path:a,parentLocator:n}=T2(e.range);if(n===null)throw new Error("Assertion failed: The descriptor should have been bound");let u=await SH(W.makeLocator(e,W.makeRange({protocol:Ui,source:a,selector:a,params:{locator:W.stringifyLocator(n)}})),{protocol:Ui,fetchOptions:o.fetchOptions}),A=wn.makeHash(`${adt}`,u).slice(0,6);return[PC(e,{parentLocator:n,path:a,hash:A,protocol:Ui})]}async getSatisfying(e,r,o,a){let[n]=await this.getCandidates(e,r,a);return{locators:o.filter(u=>u.locatorHash===n.locatorHash),sorted:!1}}async resolve(e,r){if(!r.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let o=await r.fetchOptions.fetcher.fetch(e,r.fetchOptions),a=await _e.releaseAfterUseAsync(async()=>await Ot.find(o.prefixPath,{baseFs:o.packageFs}),o.releaseFs);return{...e,version:a.version||"0.0.0",languageName:a.languageName||r.project.configuration.get("defaultLanguageName"),linkType:"HARD",conditions:a.getConditions(),dependencies:r.project.configuration.normalizeDependencyMap(a.dependencies),peerDependencies:a.peerDependencies,dependenciesMeta:a.dependenciesMeta,peerDependenciesMeta:a.peerDependenciesMeta,bin:a.bin}}};Ye();var M2=class{supports(e,r){return R2.test(e.reference)?!!e.reference.startsWith(Ui):!1}getLocalPath(e,r){return null}async fetch(e,r){let o=r.checksums.get(e.locatorHash)||null,[a,n,u]=await r.cache.fetchPackageFromCache(e,o,{onHit:()=>r.report.reportCacheHit(e),onMiss:()=>r.report.reportCacheMiss(e,`${W.prettyLocator(r.project.configuration,e)} can't be found in the cache and will be fetched from the disk`),loader:()=>this.fetchFromDisk(e,r),...r.cacheOptions});return{packageFs:a,releaseFs:n,prefixPath:W.getIdentVendorPath(e),checksum:u}}async fetchFromDisk(e,r){let o=await N2(e,r);return await Xi.convertToZip(o,{configuration:r.project.configuration,prefixPath:W.getIdentVendorPath(e),stripComponents:1})}};Ye();Ye();Ye();var U2=class{supportsDescriptor(e,r){return R2.test(e.range)?!!(e.range.startsWith(Ui)||SC.test(e.range)):!1}supportsLocator(e,r){return R2.test(e.reference)?!!e.reference.startsWith(Ui):!1}shouldPersistResolution(e,r){return!1}bindDescriptor(e,r,o){return SC.test(e.range)&&(e=W.makeDescriptor(e,`${Ui}${e.range}`)),W.bindDescriptor(e,{locator:W.stringifyLocator(r)})}getResolutionDependencies(e,r){return{}}async getCandidates(e,r,o){if(!o.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let{path:a,parentLocator:n}=T2(e.range);if(n===null)throw new Error("Assertion failed: The descriptor should have been bound");let u=PC(e,{parentLocator:n,path:a,hash:"",protocol:Ui}),A=await N2(u,o.fetchOptions),p=wn.makeHash(A).slice(0,6);return[PC(e,{parentLocator:n,path:a,hash:p,protocol:Ui})]}async getSatisfying(e,r,o,a){let[n]=await this.getCandidates(e,r,a);return{locators:o.filter(u=>u.locatorHash===n.locatorHash),sorted:!1}}async resolve(e,r){if(!r.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let o=await r.fetchOptions.fetcher.fetch(e,r.fetchOptions),a=await _e.releaseAfterUseAsync(async()=>await Ot.find(o.prefixPath,{baseFs:o.packageFs}),o.releaseFs);return{...e,version:a.version||"0.0.0",languageName:a.languageName||r.project.configuration.get("defaultLanguageName"),linkType:"HARD",conditions:a.getConditions(),dependencies:r.project.configuration.normalizeDependencyMap(a.dependencies),peerDependencies:a.peerDependencies,dependenciesMeta:a.dependenciesMeta,peerDependenciesMeta:a.peerDependenciesMeta,bin:a.bin}}};var ldt={fetchers:[M2,L2],resolvers:[U2,O2]},cdt=ldt;var kH={};Vt(kH,{GithubFetcher:()=>_2,default:()=>Adt,githubUtils:()=>wk});Ye();St();var wk={};Vt(wk,{invalidGithubUrlMessage:()=>mme,isGithubUrl:()=>bH,parseGithubUrl:()=>xH});var gme=$e(ve("querystring")),dme=[/^https?:\/\/(?:([^/]+?)@)?github.com\/([^/#]+)\/([^/#]+)\/tarball\/([^/#]+)(?:#(.*))?$/,/^https?:\/\/(?:([^/]+?)@)?github.com\/([^/#]+)\/([^/#]+?)(?:\.git)?(?:#(.*))?$/];function bH(t){return t?dme.some(e=>!!t.match(e)):!1}function xH(t){let e;for(let A of dme)if(e=t.match(A),e)break;if(!e)throw new Error(mme(t));let[,r,o,a,n="master"]=e,{commit:u}=gme.default.parse(n);return n=u||n.replace(/[^:]*:/,""),{auth:r,username:o,reponame:a,treeish:n}}function mme(t){return`Input cannot be parsed as a valid GitHub URL ('${t}').`}var _2=class{supports(e,r){return!!bH(e.reference)}getLocalPath(e,r){return null}async fetch(e,r){let o=r.checksums.get(e.locatorHash)||null,[a,n,u]=await r.cache.fetchPackageFromCache(e,o,{onHit:()=>r.report.reportCacheHit(e),onMiss:()=>r.report.reportCacheMiss(e,`${W.prettyLocator(r.project.configuration,e)} can't be found in the cache and will be fetched from GitHub`),loader:()=>this.fetchFromNetwork(e,r),...r.cacheOptions});return{packageFs:a,releaseFs:n,prefixPath:W.getIdentVendorPath(e),checksum:u}}async fetchFromNetwork(e,r){let o=await nn.get(this.getLocatorUrl(e,r),{configuration:r.project.configuration});return await oe.mktempPromise(async a=>{let n=new gn(a);await Xi.extractArchiveTo(o,n,{stripComponents:1});let u=ra.splitRepoUrl(e.reference),A=V.join(a,"package.tgz");await un.prepareExternalProject(a,A,{configuration:r.project.configuration,report:r.report,workspace:u.extra.workspace,locator:e});let p=await oe.readFilePromise(A);return await Xi.convertToZip(p,{configuration:r.project.configuration,prefixPath:W.getIdentVendorPath(e),stripComponents:1})})}getLocatorUrl(e,r){let{auth:o,username:a,reponame:n,treeish:u}=xH(e.reference);return`https://${o?`${o}@`:""}github.com/${a}/${n}/archive/${u}.tar.gz`}};var udt={hooks:{async fetchHostedRepository(t,e,r){if(t!==null)return t;let o=new _2;if(!o.supports(e,r))return null;try{return await o.fetch(e,r)}catch{return null}}}},Adt=udt;var QH={};Vt(QH,{TarballHttpFetcher:()=>j2,TarballHttpResolver:()=>G2,default:()=>pdt});Ye();function H2(t){let e;try{e=new URL(t)}catch{return!1}return!(e.protocol!=="http:"&&e.protocol!=="https:"||!e.pathname.match(/(\.tar\.gz|\.tgz|\/[^.]+)$/))}var j2=class{supports(e,r){return H2(e.reference)}getLocalPath(e,r){return null}async fetch(e,r){let o=r.checksums.get(e.locatorHash)||null,[a,n,u]=await r.cache.fetchPackageFromCache(e,o,{onHit:()=>r.report.reportCacheHit(e),onMiss:()=>r.report.reportCacheMiss(e,`${W.prettyLocator(r.project.configuration,e)} can't be found in the cache and will be fetched from the remote server`),loader:()=>this.fetchFromNetwork(e,r),...r.cacheOptions});return{packageFs:a,releaseFs:n,prefixPath:W.getIdentVendorPath(e),checksum:u}}async fetchFromNetwork(e,r){let o=await nn.get(e.reference,{configuration:r.project.configuration});return await Xi.convertToZip(o,{configuration:r.project.configuration,prefixPath:W.getIdentVendorPath(e),stripComponents:1})}};Ye();Ye();var G2=class{supportsDescriptor(e,r){return H2(e.range)}supportsLocator(e,r){return H2(e.reference)}shouldPersistResolution(e,r){return!0}bindDescriptor(e,r,o){return e}getResolutionDependencies(e,r){return{}}async getCandidates(e,r,o){return[W.convertDescriptorToLocator(e)]}async getSatisfying(e,r,o,a){let[n]=await this.getCandidates(e,r,a);return{locators:o.filter(u=>u.locatorHash===n.locatorHash),sorted:!1}}async resolve(e,r){if(!r.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let o=await r.fetchOptions.fetcher.fetch(e,r.fetchOptions),a=await _e.releaseAfterUseAsync(async()=>await Ot.find(o.prefixPath,{baseFs:o.packageFs}),o.releaseFs);return{...e,version:a.version||"0.0.0",languageName:a.languageName||r.project.configuration.get("defaultLanguageName"),linkType:"HARD",conditions:a.getConditions(),dependencies:r.project.configuration.normalizeDependencyMap(a.dependencies),peerDependencies:a.peerDependencies,dependenciesMeta:a.dependenciesMeta,peerDependenciesMeta:a.peerDependenciesMeta,bin:a.bin}}};var fdt={fetchers:[j2],resolvers:[G2]},pdt=fdt;var FH={};Vt(FH,{InitCommand:()=>d0,default:()=>gdt});Ye();Ye();St();jt();var d0=class extends ut{constructor(){super(...arguments);this.private=ge.Boolean("-p,--private",!1,{description:"Initialize a private package"});this.workspace=ge.Boolean("-w,--workspace",!1,{description:"Initialize a workspace root with a `packages/` directory"});this.install=ge.String("-i,--install",!1,{tolerateBoolean:!0,description:"Initialize a package with a specific bundle that will be locked in the project"});this.name=ge.String("-n,--name",{description:"Initialize a package with the given name"});this.usev2=ge.Boolean("-2",!1,{hidden:!0});this.yes=ge.Boolean("-y,--yes",{hidden:!0})}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),o=typeof this.install=="string"?this.install:this.usev2||this.install===!0?"latest":null;return o!==null?await this.executeProxy(r,o):await this.executeRegular(r)}async executeProxy(r,o){if(r.projectCwd!==null&&r.projectCwd!==this.context.cwd)throw new it("Cannot use the --install flag from within a project subdirectory");oe.existsSync(this.context.cwd)||await oe.mkdirPromise(this.context.cwd,{recursive:!0});let a=V.join(this.context.cwd,dr.lockfile);oe.existsSync(a)||await oe.writeFilePromise(a,"");let n=await this.cli.run(["set","version",o],{quiet:!0});if(n!==0)return n;let u=[];return this.private&&u.push("-p"),this.workspace&&u.push("-w"),this.name&&u.push(`-n=${this.name}`),this.yes&&u.push("-y"),await oe.mktempPromise(async A=>{let{code:p}=await Ur.pipevp("yarn",["init",...u],{cwd:this.context.cwd,stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr,env:await un.makeScriptEnv({binFolder:A})});return p})}async executeRegular(r){let o=null;try{o=(await Pt.find(r,this.context.cwd)).project}catch{o=null}oe.existsSync(this.context.cwd)||await oe.mkdirPromise(this.context.cwd,{recursive:!0});let a=await Ot.tryFind(this.context.cwd),n=a??new Ot,u=Object.fromEntries(r.get("initFields").entries());n.load(u),n.name=n.name??W.makeIdent(r.get("initScope"),this.name??V.basename(this.context.cwd)),n.packageManager=rn&&_e.isTaggedYarnVersion(rn)?`yarn@${rn}`:null,(!a&&this.workspace||this.private)&&(n.private=!0),this.workspace&&n.workspaceDefinitions.length===0&&(await oe.mkdirPromise(V.join(this.context.cwd,"packages"),{recursive:!0}),n.workspaceDefinitions=[{pattern:"packages/*"}]);let A={};n.exportTo(A);let p=V.join(this.context.cwd,Ot.fileName);await oe.changeFilePromise(p,`${JSON.stringify(A,null,2)}
+`,{automaticNewlines:!0});let h=[p],E=V.join(this.context.cwd,"README.md");if(oe.existsSync(E)||(await oe.writeFilePromise(E,`# ${W.stringifyIdent(n.name)}
+`),h.push(E)),!o||o.cwd===this.context.cwd){let I=V.join(this.context.cwd,dr.lockfile);oe.existsSync(I)||(await oe.writeFilePromise(I,""),h.push(I));let x=[".yarn/*","!.yarn/patches","!.yarn/plugins","!.yarn/releases","!.yarn/sdks","!.yarn/versions","","# Swap the comments on the following lines if you wish to use zero-installs","# In that case, don't forget to run `yarn config set enableGlobalCache false`!","# Documentation here: https://yarnpkg.com/features/caching#zero-installs","","#!.yarn/cache",".pnp.*"].map(fe=>`${fe}
+`).join(""),C=V.join(this.context.cwd,".gitignore");oe.existsSync(C)||(await oe.writeFilePromise(C,x),h.push(C));let L=["/.yarn/**            linguist-vendored","/.yarn/releases/*    binary","/.yarn/plugins/**/*  binary","/.pnp.*              binary linguist-generated"].map(fe=>`${fe}
+`).join(""),U=V.join(this.context.cwd,".gitattributes");oe.existsSync(U)||(await oe.writeFilePromise(U,L),h.push(U));let J={["*"]:{endOfLine:"lf",insertFinalNewline:!0},["*.{js,json,yml}"]:{charset:"utf-8",indentStyle:"space",indentSize:2}};_e.mergeIntoTarget(J,r.get("initEditorConfig"));let te=`root = true
+`;for(let[fe,ce]of Object.entries(J)){te+=`
+[${fe}]
+`;for(let[me,he]of Object.entries(ce)){let Be=me.replace(/[A-Z]/g,we=>`_${we.toLowerCase()}`);te+=`${Be} = ${he}
+`}}let ae=V.join(this.context.cwd,".editorconfig");oe.existsSync(ae)||(await oe.writeFilePromise(ae,te),h.push(ae)),await this.cli.run(["install"],{quiet:!0}),oe.existsSync(V.join(this.context.cwd,".git"))||(await Ur.execvp("git",["init"],{cwd:this.context.cwd}),await Ur.execvp("git",["add","--",...h],{cwd:this.context.cwd}),await Ur.execvp("git",["commit","--allow-empty","-m","First commit"],{cwd:this.context.cwd}))}}};d0.paths=[["init"]],d0.usage=nt.Usage({description:"create a new package",details:"\n      This command will setup a new package in your local directory.\n\n      If the `-p,--private` or `-w,--workspace` options are set, the package will be private by default.\n\n      If the `-w,--workspace` option is set, the package will be configured to accept a set of workspaces in the `packages/` directory.\n\n      If the `-i,--install` option is given a value, Yarn will first download it using `yarn set version` and only then forward the init call to the newly downloaded bundle. Without arguments, the downloaded bundle will be `latest`.\n\n      The initial settings of the manifest can be changed by using the `initScope` and `initFields` configuration values. Additionally, Yarn will generate an EditorConfig file whose rules can be altered via `initEditorConfig`, and will initialize a Git repository in the current directory.\n    ",examples:[["Create a new package in the local directory","yarn init"],["Create a new private package in the local directory","yarn init -p"],["Create a new package and store the Yarn release inside","yarn init -i=latest"],["Create a new private package and defines it as a workspace root","yarn init -w"]]});var hdt={configuration:{initScope:{description:"Scope used when creating packages via the init command",type:"STRING",default:null},initFields:{description:"Additional fields to set when creating packages via the init command",type:"MAP",valueDefinition:{description:"",type:"ANY"}},initEditorConfig:{description:"Extra rules to define in the generator editorconfig",type:"MAP",valueDefinition:{description:"",type:"ANY"}}},commands:[d0]},gdt=hdt;var Tj={};Vt(Tj,{SearchCommand:()=>w0,UpgradeInteractiveCommand:()=>B0,default:()=>nIt});Ye();var Eme=$e(ve("os"));function bC({stdout:t}){if(Eme.default.endianness()==="BE")throw new Error("Interactive commands cannot be used on big-endian systems because ink depends on yoga-layout-prebuilt which only supports little-endian architectures");if(!t.isTTY)throw new Error("Interactive commands can only be used inside a TTY environment")}jt();var Qye=$e(zH()),XH={appId:"OFCNCOG2CU",apiKey:"6fe4476ee5a1832882e326b506d14126",indexName:"npm-search"},fyt=(0,Qye.default)(XH.appId,XH.apiKey).initIndex(XH.indexName),ZH=async(t,e=0)=>await fyt.search(t,{analyticsTags:["yarn-plugin-interactive-tools"],attributesToRetrieve:["name","version","owner","repository","humanDownloadsLast30Days"],page:e,hitsPerPage:10});var jB=["regular","dev","peer"],w0=class extends ut{async execute(){bC(this.context);let{Gem:e}=await Promise.resolve().then(()=>(cQ(),Bj)),{ScrollableItems:r}=await Promise.resolve().then(()=>(pQ(),fQ)),{useKeypress:o}=await Promise.resolve().then(()=>(UB(),Wwe)),{useMinistore:a}=await Promise.resolve().then(()=>(xj(),bj)),{renderForm:n}=await Promise.resolve().then(()=>(mQ(),dQ)),{default:u}=await Promise.resolve().then(()=>$e(rIe())),{Box:A,Text:p}=await Promise.resolve().then(()=>$e(ic())),{default:h,useEffect:E,useState:I}=await Promise.resolve().then(()=>$e(on())),v=await Ke.find(this.context.cwd,this.context.plugins),x=()=>h.createElement(A,{flexDirection:"row"},h.createElement(A,{flexDirection:"column",width:48},h.createElement(A,null,h.createElement(p,null,"Press ",h.createElement(p,{bold:!0,color:"cyanBright"},"<up>"),"/",h.createElement(p,{bold:!0,color:"cyanBright"},"<down>")," to move between packages.")),h.createElement(A,null,h.createElement(p,null,"Press ",h.createElement(p,{bold:!0,color:"cyanBright"},"<space>")," to select a package.")),h.createElement(A,null,h.createElement(p,null,"Press ",h.createElement(p,{bold:!0,color:"cyanBright"},"<space>")," again to change the target."))),h.createElement(A,{flexDirection:"column"},h.createElement(A,{marginLeft:1},h.createElement(p,null,"Press ",h.createElement(p,{bold:!0,color:"cyanBright"},"<enter>")," to install the selected packages.")),h.createElement(A,{marginLeft:1},h.createElement(p,null,"Press ",h.createElement(p,{bold:!0,color:"cyanBright"},"<ctrl+c>")," to abort.")))),C=()=>h.createElement(h.Fragment,null,h.createElement(A,{width:15},h.createElement(p,{bold:!0,underline:!0,color:"gray"},"Owner")),h.createElement(A,{width:11},h.createElement(p,{bold:!0,underline:!0,color:"gray"},"Version")),h.createElement(A,{width:10},h.createElement(p,{bold:!0,underline:!0,color:"gray"},"Downloads"))),R=()=>h.createElement(A,{width:17},h.createElement(p,{bold:!0,underline:!0,color:"gray"},"Target")),L=({hit:he,active:Be})=>{let[we,g]=a(he.name,null);o({active:Be},(le,ne)=>{if(ne.name!=="space")return;if(!we){g(jB[0]);return}let ee=jB.indexOf(we)+1;ee===jB.length?g(null):g(jB[ee])},[we,g]);let Ee=W.parseIdent(he.name),Se=W.prettyIdent(v,Ee);return h.createElement(A,null,h.createElement(A,{width:45},h.createElement(p,{bold:!0,wrap:"wrap"},Se)),h.createElement(A,{width:14,marginLeft:1},h.createElement(p,{bold:!0,wrap:"truncate"},he.owner.name)),h.createElement(A,{width:10,marginLeft:1},h.createElement(p,{italic:!0,wrap:"truncate"},he.version)),h.createElement(A,{width:16,marginLeft:1},h.createElement(p,null,he.humanDownloadsLast30Days)))},U=({name:he,active:Be})=>{let[we]=a(he,null),g=W.parseIdent(he);return h.createElement(A,null,h.createElement(A,{width:47},h.createElement(p,{bold:!0}," - ",W.prettyIdent(v,g))),jB.map(Ee=>h.createElement(A,{key:Ee,width:14,marginLeft:1},h.createElement(p,null," ",h.createElement(e,{active:we===Ee})," ",h.createElement(p,{bold:!0},Ee)))))},J=()=>h.createElement(A,{marginTop:1},h.createElement(p,null,"Powered by Algolia.")),ae=await n(({useSubmit:he})=>{let Be=a();he(Be);let we=Array.from(Be.keys()).filter(H=>Be.get(H)!==null),[g,Ee]=I(""),[Se,le]=I(0),[ne,ee]=I([]),Ie=H=>{H.match(/\t| /)||Ee(H)},Fe=async()=>{le(0);let H=await ZH(g);H.query===g&&ee(H.hits)},At=async()=>{let H=await ZH(g,Se+1);H.query===g&&H.page-1===Se&&(le(H.page),ee([...ne,...H.hits]))};return E(()=>{g?Fe():ee([])},[g]),h.createElement(A,{flexDirection:"column"},h.createElement(x,null),h.createElement(A,{flexDirection:"row",marginTop:1},h.createElement(p,{bold:!0},"Search: "),h.createElement(A,{width:41},h.createElement(u,{value:g,onChange:Ie,placeholder:"i.e. babel, webpack, react...",showCursor:!1})),h.createElement(C,null)),ne.length?h.createElement(r,{radius:2,loop:!1,children:ne.map(H=>h.createElement(L,{key:H.name,hit:H,active:!1})),willReachEnd:At}):h.createElement(p,{color:"gray"},"Start typing..."),h.createElement(A,{flexDirection:"row",marginTop:1},h.createElement(A,{width:49},h.createElement(p,{bold:!0},"Selected:")),h.createElement(R,null)),we.length?we.map(H=>h.createElement(U,{key:H,name:H,active:!1})):h.createElement(p,{color:"gray"},"No selected packages..."),h.createElement(J,null))},{},{stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr});if(typeof ae>"u")return 1;let fe=Array.from(ae.keys()).filter(he=>ae.get(he)==="regular"),ce=Array.from(ae.keys()).filter(he=>ae.get(he)==="dev"),me=Array.from(ae.keys()).filter(he=>ae.get(he)==="peer");return fe.length&&await this.cli.run(["add",...fe]),ce.length&&await this.cli.run(["add","--dev",...ce]),me&&await this.cli.run(["add","--peer",...me]),0}};w0.paths=[["search"]],w0.usage=nt.Usage({category:"Interactive commands",description:"open the search interface",details:`
+    This command opens a fullscreen terminal interface where you can search for and install packages from the npm registry.
+    `,examples:[["Open the search window","yarn search"]]});Ye();jt();E_();var cIe=$e(zn()),lIe=/^((?:[\^~]|>=?)?)([0-9]+)(\.[0-9]+)(\.[0-9]+)((?:-\S+)?)$/,uIe=(t,e)=>t.length>0?[t.slice(0,e)].concat(uIe(t.slice(e),e)):[],B0=class extends ut{async execute(){bC(this.context);let{ItemOptions:e}=await Promise.resolve().then(()=>(aIe(),oIe)),{Pad:r}=await Promise.resolve().then(()=>(Rj(),sIe)),{ScrollableItems:o}=await Promise.resolve().then(()=>(pQ(),fQ)),{useMinistore:a}=await Promise.resolve().then(()=>(xj(),bj)),{renderForm:n}=await Promise.resolve().then(()=>(mQ(),dQ)),{Box:u,Text:A}=await Promise.resolve().then(()=>$e(ic())),{default:p,useEffect:h,useRef:E,useState:I}=await Promise.resolve().then(()=>$e(on())),v=await Ke.find(this.context.cwd,this.context.plugins),{project:x,workspace:C}=await Pt.find(v,this.context.cwd),R=await Lr.find(v);if(!C)throw new rr(x.cwd,this.context.cwd);await x.restoreInstallState({restoreResolutions:!1});let L=this.context.stdout.rows-7,U=(Ee,Se)=>{let le=upe(Ee,Se),ne="";for(let ee of le)ee.added?ne+=de.pretty(v,ee.value,"green"):ee.removed||(ne+=ee.value);return ne},J=(Ee,Se)=>{if(Ee===Se)return Se;let le=W.parseRange(Ee),ne=W.parseRange(Se),ee=le.selector.match(lIe),Ie=ne.selector.match(lIe);if(!ee||!Ie)return U(Ee,Se);let Fe=["gray","red","yellow","green","magenta"],At=null,H="";for(let at=1;at<Fe.length;++at)At!==null||ee[at]!==Ie[at]?(At===null&&(At=Fe[at-1]),H+=de.pretty(v,Ie[at],At)):H+=Ie[at];return H},te=async(Ee,Se,le)=>{let ne=await zc.fetchDescriptorFrom(Ee,le,{project:x,cache:R,preserveModifier:Se,workspace:C});return ne!==null?ne.range:Ee.range},ae=async Ee=>{let Se=cIe.default.valid(Ee.range)?`^${Ee.range}`:Ee.range,[le,ne]=await Promise.all([te(Ee,Ee.range,Se).catch(()=>null),te(Ee,Ee.range,"latest").catch(()=>null)]),ee=[{value:null,label:Ee.range}];return le&&le!==Ee.range?ee.push({value:le,label:J(Ee.range,le)}):ee.push({value:null,label:""}),ne&&ne!==le&&ne!==Ee.range?ee.push({value:ne,label:J(Ee.range,ne)}):ee.push({value:null,label:""}),ee},fe=()=>p.createElement(u,{flexDirection:"row"},p.createElement(u,{flexDirection:"column",width:49},p.createElement(u,{marginLeft:1},p.createElement(A,null,"Press ",p.createElement(A,{bold:!0,color:"cyanBright"},"<up>"),"/",p.createElement(A,{bold:!0,color:"cyanBright"},"<down>")," to select packages.")),p.createElement(u,{marginLeft:1},p.createElement(A,null,"Press ",p.createElement(A,{bold:!0,color:"cyanBright"},"<left>"),"/",p.createElement(A,{bold:!0,color:"cyanBright"},"<right>")," to select versions."))),p.createElement(u,{flexDirection:"column"},p.createElement(u,{marginLeft:1},p.createElement(A,null,"Press ",p.createElement(A,{bold:!0,color:"cyanBright"},"<enter>")," to install.")),p.createElement(u,{marginLeft:1},p.createElement(A,null,"Press ",p.createElement(A,{bold:!0,color:"cyanBright"},"<ctrl+c>")," to abort.")))),ce=()=>p.createElement(u,{flexDirection:"row",paddingTop:1,paddingBottom:1},p.createElement(u,{width:50},p.createElement(A,{bold:!0},p.createElement(A,{color:"greenBright"},"?")," Pick the packages you want to upgrade.")),p.createElement(u,{width:17},p.createElement(A,{bold:!0,underline:!0,color:"gray"},"Current")),p.createElement(u,{width:17},p.createElement(A,{bold:!0,underline:!0,color:"gray"},"Range")),p.createElement(u,{width:17},p.createElement(A,{bold:!0,underline:!0,color:"gray"},"Latest"))),me=({active:Ee,descriptor:Se,suggestions:le})=>{let[ne,ee]=a(Se.descriptorHash,null),Ie=W.stringifyIdent(Se),Fe=Math.max(0,45-Ie.length);return p.createElement(p.Fragment,null,p.createElement(u,null,p.createElement(u,{width:45},p.createElement(A,{bold:!0},W.prettyIdent(v,Se)),p.createElement(r,{active:Ee,length:Fe})),p.createElement(e,{active:Ee,options:le,value:ne,skewer:!0,onChange:ee,sizes:[17,17,17]})))},he=({dependencies:Ee})=>{let[Se,le]=I(Ee.map(()=>null)),ne=E(!0),ee=async Ie=>{let Fe=await ae(Ie);return Fe.filter(At=>At.label!=="").length<=1?null:{descriptor:Ie,suggestions:Fe}};return h(()=>()=>{ne.current=!1},[]),h(()=>{let Ie=Math.trunc(L*1.75),Fe=Ee.slice(0,Ie),At=Ee.slice(Ie),H=uIe(At,L),at=Fe.map(ee).reduce(async(Re,ke)=>{await Re;let xe=await ke;xe!==null&&(!ne.current||le(He=>{let Te=He.findIndex(je=>je===null),Je=[...He];return Je[Te]=xe,Je}))},Promise.resolve());H.reduce((Re,ke)=>Promise.all(ke.map(xe=>Promise.resolve().then(()=>ee(xe)))).then(async xe=>{xe=xe.filter(He=>He!==null),await Re,ne.current&&le(He=>{let Te=He.findIndex(Je=>Je===null);return He.slice(0,Te).concat(xe).concat(He.slice(Te+xe.length))})}),at).then(()=>{ne.current&&le(Re=>Re.filter(ke=>ke!==null))})},[]),Se.length?p.createElement(o,{radius:L>>1,children:Se.map((Ie,Fe)=>Ie!==null?p.createElement(me,{key:Fe,active:!1,descriptor:Ie.descriptor,suggestions:Ie.suggestions}):p.createElement(A,{key:Fe},"Loading..."))}):p.createElement(A,null,"No upgrades found")},we=await n(({useSubmit:Ee})=>{Ee(a());let Se=new Map;for(let ne of x.workspaces)for(let ee of["dependencies","devDependencies"])for(let Ie of ne.manifest[ee].values())x.tryWorkspaceByDescriptor(Ie)===null&&(Ie.range.startsWith("link:")||Se.set(Ie.descriptorHash,Ie));let le=_e.sortMap(Se.values(),ne=>W.stringifyDescriptor(ne));return p.createElement(u,{flexDirection:"column"},p.createElement(fe,null),p.createElement(ce,null),p.createElement(he,{dependencies:le}))},{},{stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr});if(typeof we>"u")return 1;let g=!1;for(let Ee of x.workspaces)for(let Se of["dependencies","devDependencies"]){let le=Ee.manifest[Se];for(let ne of le.values()){let ee=we.get(ne.descriptorHash);typeof ee<"u"&&ee!==null&&(le.set(ne.identHash,W.makeDescriptor(ne,ee)),g=!0)}}return g?await x.installWithNewReport({quiet:this.context.quiet,stdout:this.context.stdout},{cache:R}):0}};B0.paths=[["upgrade-interactive"]],B0.usage=nt.Usage({category:"Interactive commands",description:"open the upgrade interface",details:`
+      This command opens a fullscreen terminal interface where you can see any out of date packages used by your application, their status compared to the latest versions available on the remote registry, and select packages to upgrade.
+    `,examples:[["Open the upgrade window","yarn upgrade-interactive"]]});var rIt={commands:[w0,B0]},nIt=rIt;var Nj={};Vt(Nj,{LinkFetcher:()=>qB,LinkResolver:()=>YB,PortalFetcher:()=>WB,PortalResolver:()=>KB,default:()=>sIt});Ye();St();var tp="portal:",rp="link:";var qB=class{supports(e,r){return!!e.reference.startsWith(rp)}getLocalPath(e,r){let{parentLocator:o,path:a}=W.parseFileStyleRange(e.reference,{protocol:rp});if(V.isAbsolute(a))return a;let n=r.fetcher.getLocalPath(o,r);return n===null?null:V.resolve(n,a)}async fetch(e,r){let{parentLocator:o,path:a}=W.parseFileStyleRange(e.reference,{protocol:rp}),n=V.isAbsolute(a)?{packageFs:new gn(Bt.root),prefixPath:Bt.dot,localPath:Bt.root}:await r.fetcher.fetch(o,r),u=n.localPath?{packageFs:new gn(Bt.root),prefixPath:V.relative(Bt.root,n.localPath),localPath:Bt.root}:n;n!==u&&n.releaseFs&&n.releaseFs();let A=u.packageFs,p=V.resolve(u.localPath??u.packageFs.getRealPath(),u.prefixPath,a);return n.localPath?{packageFs:new gn(p,{baseFs:A}),releaseFs:u.releaseFs,prefixPath:Bt.dot,discardFromLookup:!0,localPath:p}:{packageFs:new _u(p,{baseFs:A}),releaseFs:u.releaseFs,prefixPath:Bt.dot,discardFromLookup:!0}}};Ye();St();var YB=class{supportsDescriptor(e,r){return!!e.range.startsWith(rp)}supportsLocator(e,r){return!!e.reference.startsWith(rp)}shouldPersistResolution(e,r){return!1}bindDescriptor(e,r,o){return W.bindDescriptor(e,{locator:W.stringifyLocator(r)})}getResolutionDependencies(e,r){return{}}async getCandidates(e,r,o){let a=e.range.slice(rp.length);return[W.makeLocator(e,`${rp}${ue.toPortablePath(a)}`)]}async getSatisfying(e,r,o,a){let[n]=await this.getCandidates(e,r,a);return{locators:o.filter(u=>u.locatorHash===n.locatorHash),sorted:!1}}async resolve(e,r){return{...e,version:"0.0.0",languageName:r.project.configuration.get("defaultLanguageName"),linkType:"SOFT",conditions:null,dependencies:new Map,peerDependencies:new Map,dependenciesMeta:new Map,peerDependenciesMeta:new Map,bin:new Map}}};Ye();St();var WB=class{supports(e,r){return!!e.reference.startsWith(tp)}getLocalPath(e,r){let{parentLocator:o,path:a}=W.parseFileStyleRange(e.reference,{protocol:tp});if(V.isAbsolute(a))return a;let n=r.fetcher.getLocalPath(o,r);return n===null?null:V.resolve(n,a)}async fetch(e,r){let{parentLocator:o,path:a}=W.parseFileStyleRange(e.reference,{protocol:tp}),n=V.isAbsolute(a)?{packageFs:new gn(Bt.root),prefixPath:Bt.dot,localPath:Bt.root}:await r.fetcher.fetch(o,r),u=n.localPath?{packageFs:new gn(Bt.root),prefixPath:V.relative(Bt.root,n.localPath),localPath:Bt.root}:n;n!==u&&n.releaseFs&&n.releaseFs();let A=u.packageFs,p=V.resolve(u.localPath??u.packageFs.getRealPath(),u.prefixPath,a);return n.localPath?{packageFs:new gn(p,{baseFs:A}),releaseFs:u.releaseFs,prefixPath:Bt.dot,localPath:p}:{packageFs:new _u(p,{baseFs:A}),releaseFs:u.releaseFs,prefixPath:Bt.dot}}};Ye();Ye();St();var KB=class{supportsDescriptor(e,r){return!!e.range.startsWith(tp)}supportsLocator(e,r){return!!e.reference.startsWith(tp)}shouldPersistResolution(e,r){return!1}bindDescriptor(e,r,o){return W.bindDescriptor(e,{locator:W.stringifyLocator(r)})}getResolutionDependencies(e,r){return{}}async getCandidates(e,r,o){let a=e.range.slice(tp.length);return[W.makeLocator(e,`${tp}${ue.toPortablePath(a)}`)]}async getSatisfying(e,r,o,a){let[n]=await this.getCandidates(e,r,a);return{locators:o.filter(u=>u.locatorHash===n.locatorHash),sorted:!1}}async resolve(e,r){if(!r.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let o=await r.fetchOptions.fetcher.fetch(e,r.fetchOptions),a=await _e.releaseAfterUseAsync(async()=>await Ot.find(o.prefixPath,{baseFs:o.packageFs}),o.releaseFs);return{...e,version:a.version||"0.0.0",languageName:a.languageName||r.project.configuration.get("defaultLanguageName"),linkType:"SOFT",conditions:a.getConditions(),dependencies:r.project.configuration.normalizeDependencyMap(a.dependencies),peerDependencies:a.peerDependencies,dependenciesMeta:a.dependenciesMeta,peerDependenciesMeta:a.peerDependenciesMeta,bin:a.bin}}};var iIt={fetchers:[qB,WB],resolvers:[YB,KB]},sIt=iIt;var yG={};Vt(yG,{NodeModulesLinker:()=>lv,NodeModulesMode:()=>hG,PnpLooseLinker:()=>cv,default:()=>w1t});St();Ye();St();St();var Oj=(t,e)=>`${t}@${e}`,AIe=(t,e)=>{let r=e.indexOf("#"),o=r>=0?e.substring(r+1):e;return Oj(t,o)};var hIe=(t,e={})=>{let r=e.debugLevel||Number(process.env.NM_DEBUG_LEVEL||-1),o=e.check||r>=9,a=e.hoistingLimits||new Map,n={check:o,debugLevel:r,hoistingLimits:a,fastLookupPossible:!0},u;n.debugLevel>=0&&(u=Date.now());let A=fIt(t,n),p=!1,h=0;do p=Mj(A,[A],new Set([A.locator]),new Map,n).anotherRoundNeeded,n.fastLookupPossible=!1,h++;while(p);if(n.debugLevel>=0&&console.log(`hoist time: ${Date.now()-u}ms, rounds: ${h}`),n.debugLevel>=1){let E=VB(A);if(Mj(A,[A],new Set([A.locator]),new Map,n).isGraphChanged)throw new Error(`The hoisting result is not terminal, prev tree:
+${E}, next tree:
+${VB(A)}`);let v=gIe(A);if(v)throw new Error(`${v}, after hoisting finished:
+${VB(A)}`)}return n.debugLevel>=2&&console.log(VB(A)),pIt(A)},oIt=t=>{let e=t[t.length-1],r=new Map,o=new Set,a=n=>{if(!o.has(n)){o.add(n);for(let u of n.hoistedDependencies.values())r.set(u.name,u);for(let u of n.dependencies.values())n.peerNames.has(u.name)||a(u)}};return a(e),r},aIt=t=>{let e=t[t.length-1],r=new Map,o=new Set,a=new Set,n=(u,A)=>{if(o.has(u))return;o.add(u);for(let h of u.hoistedDependencies.values())if(!A.has(h.name)){let E;for(let I of t)E=I.dependencies.get(h.name),E&&r.set(E.name,E)}let p=new Set;for(let h of u.dependencies.values())p.add(h.name);for(let h of u.dependencies.values())u.peerNames.has(h.name)||n(h,p)};return n(e,a),r},fIe=(t,e)=>{if(e.decoupled)return e;let{name:r,references:o,ident:a,locator:n,dependencies:u,originalDependencies:A,hoistedDependencies:p,peerNames:h,reasons:E,isHoistBorder:I,hoistPriority:v,dependencyKind:x,hoistedFrom:C,hoistedTo:R}=e,L={name:r,references:new Set(o),ident:a,locator:n,dependencies:new Map(u),originalDependencies:new Map(A),hoistedDependencies:new Map(p),peerNames:new Set(h),reasons:new Map(E),decoupled:!0,isHoistBorder:I,hoistPriority:v,dependencyKind:x,hoistedFrom:new Map(C),hoistedTo:new Map(R)},U=L.dependencies.get(r);return U&&U.ident==L.ident&&L.dependencies.set(r,L),t.dependencies.set(L.name,L),L},lIt=(t,e)=>{let r=new Map([[t.name,[t.ident]]]);for(let a of t.dependencies.values())t.peerNames.has(a.name)||r.set(a.name,[a.ident]);let o=Array.from(e.keys());o.sort((a,n)=>{let u=e.get(a),A=e.get(n);return A.hoistPriority!==u.hoistPriority?A.hoistPriority-u.hoistPriority:A.peerDependents.size!==u.peerDependents.size?A.peerDependents.size-u.peerDependents.size:A.dependents.size-u.dependents.size});for(let a of o){let n=a.substring(0,a.indexOf("@",1)),u=a.substring(n.length+1);if(!t.peerNames.has(n)){let A=r.get(n);A||(A=[],r.set(n,A)),A.indexOf(u)<0&&A.push(u)}}return r},Lj=t=>{let e=new Set,r=(o,a=new Set)=>{if(!a.has(o)){a.add(o);for(let n of o.peerNames)if(!t.peerNames.has(n)){let u=t.dependencies.get(n);u&&!e.has(u)&&r(u,a)}e.add(o)}};for(let o of t.dependencies.values())t.peerNames.has(o.name)||r(o);return e},Mj=(t,e,r,o,a,n=new Set)=>{let u=e[e.length-1];if(n.has(u))return{anotherRoundNeeded:!1,isGraphChanged:!1};n.add(u);let A=hIt(u),p=lIt(u,A),h=t==u?new Map:a.fastLookupPossible?oIt(e):aIt(e),E,I=!1,v=!1,x=new Map(Array.from(p.entries()).map(([R,L])=>[R,L[0]])),C=new Map;do{let R=AIt(t,e,r,h,x,p,o,C,a);R.isGraphChanged&&(v=!0),R.anotherRoundNeeded&&(I=!0),E=!1;for(let[L,U]of p)U.length>1&&!u.dependencies.has(L)&&(x.delete(L),U.shift(),x.set(L,U[0]),E=!0)}while(E);for(let R of u.dependencies.values())if(!u.peerNames.has(R.name)&&!r.has(R.locator)){r.add(R.locator);let L=Mj(t,[...e,R],r,C,a);L.isGraphChanged&&(v=!0),L.anotherRoundNeeded&&(I=!0),r.delete(R.locator)}return{anotherRoundNeeded:I,isGraphChanged:v}},cIt=t=>{for(let[e,r]of t.dependencies)if(!t.peerNames.has(e)&&r.ident!==t.ident)return!0;return!1},uIt=(t,e,r,o,a,n,u,A,{outputReason:p,fastLookupPossible:h})=>{let E,I=null,v=new Set;p&&(E=`${Array.from(e).map(L=>no(L)).join("\u2192")}`);let x=r[r.length-1],R=!(o.ident===x.ident);if(p&&!R&&(I="- self-reference"),R&&(R=o.dependencyKind!==1,p&&!R&&(I="- workspace")),R&&o.dependencyKind===2&&(R=!cIt(o),p&&!R&&(I="- external soft link with unhoisted dependencies")),R&&(R=x.dependencyKind!==1||x.hoistedFrom.has(o.name)||e.size===1,p&&!R&&(I=x.reasons.get(o.name))),R&&(R=!t.peerNames.has(o.name),p&&!R&&(I=`- cannot shadow peer: ${no(t.originalDependencies.get(o.name).locator)} at ${E}`)),R){let L=!1,U=a.get(o.name);if(L=!U||U.ident===o.ident,p&&!L&&(I=`- filled by: ${no(U.locator)} at ${E}`),L)for(let J=r.length-1;J>=1;J--){let ae=r[J].dependencies.get(o.name);if(ae&&ae.ident!==o.ident){L=!1;let fe=A.get(x);fe||(fe=new Set,A.set(x,fe)),fe.add(o.name),p&&(I=`- filled by ${no(ae.locator)} at ${r.slice(0,J).map(ce=>no(ce.locator)).join("\u2192")}`);break}}R=L}if(R&&(R=n.get(o.name)===o.ident,p&&!R&&(I=`- filled by: ${no(u.get(o.name)[0])} at ${E}`)),R){let L=!0,U=new Set(o.peerNames);for(let J=r.length-1;J>=1;J--){let te=r[J];for(let ae of U){if(te.peerNames.has(ae)&&te.originalDependencies.has(ae))continue;let fe=te.dependencies.get(ae);fe&&t.dependencies.get(ae)!==fe&&(J===r.length-1?v.add(fe):(v=null,L=!1,p&&(I=`- peer dependency ${no(fe.locator)} from parent ${no(te.locator)} was not hoisted to ${E}`))),U.delete(ae)}if(!L)break}R=L}if(R&&!h)for(let L of o.hoistedDependencies.values()){let U=a.get(L.name)||t.dependencies.get(L.name);if(!U||L.ident!==U.ident){R=!1,p&&(I=`- previously hoisted dependency mismatch, needed: ${no(L.locator)}, available: ${no(U?.locator)}`);break}}return v!==null&&v.size>0?{isHoistable:2,dependsOn:v,reason:I}:{isHoistable:R?0:1,reason:I}},yQ=t=>`${t.name}@${t.locator}`,AIt=(t,e,r,o,a,n,u,A,p)=>{let h=e[e.length-1],E=new Set,I=!1,v=!1,x=(U,J,te,ae,fe)=>{if(E.has(ae))return;let ce=[...J,yQ(ae)],me=[...te,yQ(ae)],he=new Map,Be=new Map;for(let le of Lj(ae)){let ne=uIt(h,r,[h,...U,ae],le,o,a,n,A,{outputReason:p.debugLevel>=2,fastLookupPossible:p.fastLookupPossible});if(Be.set(le,ne),ne.isHoistable===2)for(let ee of ne.dependsOn){let Ie=he.get(ee.name)||new Set;Ie.add(le.name),he.set(ee.name,Ie)}}let we=new Set,g=(le,ne,ee)=>{if(!we.has(le)){we.add(le),Be.set(le,{isHoistable:1,reason:ee});for(let Ie of he.get(le.name)||[])g(ae.dependencies.get(Ie),ne,p.debugLevel>=2?`- peer dependency ${no(le.locator)} from parent ${no(ae.locator)} was not hoisted`:"")}};for(let[le,ne]of Be)ne.isHoistable===1&&g(le,ne,ne.reason);let Ee=!1;for(let le of Be.keys())if(!we.has(le)){v=!0;let ne=u.get(ae);ne&&ne.has(le.name)&&(I=!0),Ee=!0,ae.dependencies.delete(le.name),ae.hoistedDependencies.set(le.name,le),ae.reasons.delete(le.name);let ee=h.dependencies.get(le.name);if(p.debugLevel>=2){let Ie=Array.from(J).concat([ae.locator]).map(At=>no(At)).join("\u2192"),Fe=h.hoistedFrom.get(le.name);Fe||(Fe=[],h.hoistedFrom.set(le.name,Fe)),Fe.push(Ie),ae.hoistedTo.set(le.name,Array.from(e).map(At=>no(At.locator)).join("\u2192"))}if(!ee)h.ident!==le.ident&&(h.dependencies.set(le.name,le),fe.add(le));else for(let Ie of le.references)ee.references.add(Ie)}if(ae.dependencyKind===2&&Ee&&(I=!0),p.check){let le=gIe(t);if(le)throw new Error(`${le}, after hoisting dependencies of ${[h,...U,ae].map(ne=>no(ne.locator)).join("\u2192")}:
+${VB(t)}`)}let Se=Lj(ae);for(let le of Se)if(we.has(le)){let ne=Be.get(le);if((a.get(le.name)===le.ident||!ae.reasons.has(le.name))&&ne.isHoistable!==0&&ae.reasons.set(le.name,ne.reason),!le.isHoistBorder&&me.indexOf(yQ(le))<0){E.add(ae);let Ie=fIe(ae,le);x([...U,ae],ce,me,Ie,R),E.delete(ae)}}},C,R=new Set(Lj(h)),L=Array.from(e).map(U=>yQ(U));do{C=R,R=new Set;for(let U of C){if(U.locator===h.locator||U.isHoistBorder)continue;let J=fIe(h,U);x([],Array.from(r),L,J,R)}}while(R.size>0);return{anotherRoundNeeded:I,isGraphChanged:v}},gIe=t=>{let e=[],r=new Set,o=new Set,a=(n,u,A)=>{if(r.has(n)||(r.add(n),o.has(n)))return;let p=new Map(u);for(let h of n.dependencies.values())n.peerNames.has(h.name)||p.set(h.name,h);for(let h of n.originalDependencies.values()){let E=p.get(h.name),I=()=>`${Array.from(o).concat([n]).map(v=>no(v.locator)).join("\u2192")}`;if(n.peerNames.has(h.name)){let v=u.get(h.name);(v!==E||!v||v.ident!==h.ident)&&e.push(`${I()} - broken peer promise: expected ${h.ident} but found ${v&&v.ident}`)}else{let v=A.hoistedFrom.get(n.name),x=n.hoistedTo.get(h.name),C=`${v?` hoisted from ${v.join(", ")}`:""}`,R=`${x?` hoisted to ${x}`:""}`,L=`${I()}${C}`;E?E.ident!==h.ident&&e.push(`${L} - broken require promise for ${h.name}${R}: expected ${h.ident}, but found: ${E.ident}`):e.push(`${L} - broken require promise: no required dependency ${h.name}${R} found`)}}o.add(n);for(let h of n.dependencies.values())n.peerNames.has(h.name)||a(h,p,n);o.delete(n)};return a(t,t.dependencies,t),e.join(`
+`)},fIt=(t,e)=>{let{identName:r,name:o,reference:a,peerNames:n}=t,u={name:o,references:new Set([a]),locator:Oj(r,a),ident:AIe(r,a),dependencies:new Map,originalDependencies:new Map,hoistedDependencies:new Map,peerNames:new Set(n),reasons:new Map,decoupled:!0,isHoistBorder:!0,hoistPriority:0,dependencyKind:1,hoistedFrom:new Map,hoistedTo:new Map},A=new Map([[t,u]]),p=(h,E)=>{let I=A.get(h),v=!!I;if(!I){let{name:x,identName:C,reference:R,peerNames:L,hoistPriority:U,dependencyKind:J}=h,te=e.hoistingLimits.get(E.locator);I={name:x,references:new Set([R]),locator:Oj(C,R),ident:AIe(C,R),dependencies:new Map,originalDependencies:new Map,hoistedDependencies:new Map,peerNames:new Set(L),reasons:new Map,decoupled:!0,isHoistBorder:te?te.has(x):!1,hoistPriority:U||0,dependencyKind:J||0,hoistedFrom:new Map,hoistedTo:new Map},A.set(h,I)}if(E.dependencies.set(h.name,I),E.originalDependencies.set(h.name,I),v){let x=new Set,C=R=>{if(!x.has(R)){x.add(R),R.decoupled=!1;for(let L of R.dependencies.values())R.peerNames.has(L.name)||C(L)}};C(I)}else for(let x of h.dependencies)p(x,I)};for(let h of t.dependencies)p(h,u);return u},Uj=t=>t.substring(0,t.indexOf("@",1)),pIt=t=>{let e={name:t.name,identName:Uj(t.locator),references:new Set(t.references),dependencies:new Set},r=new Set([t]),o=(a,n,u)=>{let A=r.has(a),p;if(n===a)p=u;else{let{name:h,references:E,locator:I}=a;p={name:h,identName:Uj(I),references:E,dependencies:new Set}}if(u.dependencies.add(p),!A){r.add(a);for(let h of a.dependencies.values())a.peerNames.has(h.name)||o(h,a,p);r.delete(a)}};for(let a of t.dependencies.values())o(a,t,e);return e},hIt=t=>{let e=new Map,r=new Set([t]),o=u=>`${u.name}@${u.ident}`,a=u=>{let A=o(u),p=e.get(A);return p||(p={dependents:new Set,peerDependents:new Set,hoistPriority:0},e.set(A,p)),p},n=(u,A)=>{let p=!!r.has(A);if(a(A).dependents.add(u.ident),!p){r.add(A);for(let E of A.dependencies.values()){let I=a(E);I.hoistPriority=Math.max(I.hoistPriority,E.hoistPriority),A.peerNames.has(E.name)?I.peerDependents.add(A.ident):n(A,E)}}};for(let u of t.dependencies.values())t.peerNames.has(u.name)||n(t,u);return e},no=t=>{if(!t)return"none";let e=t.indexOf("@",1),r=t.substring(0,e);r.endsWith("$wsroot$")&&(r=`wh:${r.replace("$wsroot$","")}`);let o=t.substring(e+1);if(o==="workspace:.")return".";if(o){let a=(o.indexOf("#")>0?o.split("#")[1]:o).replace("npm:","");return o.startsWith("virtual")&&(r=`v:${r}`),a.startsWith("workspace")&&(r=`w:${r}`,a=""),`${r}${a?`@${a}`:""}`}else return`${r}`},pIe=5e4,VB=t=>{let e=0,r=(a,n,u="")=>{if(e>pIe||n.has(a))return"";e++;let A=Array.from(a.dependencies.values()).sort((h,E)=>h.name===E.name?0:h.name>E.name?1:-1),p="";n.add(a);for(let h=0;h<A.length;h++){let E=A[h];if(!a.peerNames.has(E.name)&&E!==a){let I=a.reasons.get(E.name),v=Uj(E.locator);p+=`${u}${h<A.length-1?"\u251C\u2500":"\u2514\u2500"}${(n.has(E)?">":"")+(v!==E.name?`a:${E.name}:`:"")+no(E.locator)+(I?` ${I}`:"")}
+`,p+=r(E,n,`${u}${h<A.length-1?"\u2502 ":"  "}`)}}return n.delete(a),p};return r(t,new Set)+(e>pIe?`
+Tree is too large, part of the tree has been dunped
+`:"")};var JB=(o=>(o.WORKSPACES="workspaces",o.DEPENDENCIES="dependencies",o.NONE="none",o))(JB||{}),dIe="node_modules",v0="$wsroot$";var zB=(t,e)=>{let{packageTree:r,hoistingLimits:o,errors:a,preserveSymlinksRequired:n}=dIt(t,e),u=null;if(a.length===0){let A=hIe(r,{hoistingLimits:o});u=yIt(t,A,e)}return{tree:u,errors:a,preserveSymlinksRequired:n}},gA=t=>`${t.name}@${t.reference}`,Hj=t=>{let e=new Map;for(let[r,o]of t.entries())if(!o.dirList){let a=e.get(o.locator);a||(a={target:o.target,linkType:o.linkType,locations:[],aliases:o.aliases},e.set(o.locator,a)),a.locations.push(r)}for(let r of e.values())r.locations=r.locations.sort((o,a)=>{let n=o.split(V.delimiter).length,u=a.split(V.delimiter).length;return a===o?0:n!==u?u-n:a>o?1:-1});return e},mIe=(t,e)=>{let r=W.isVirtualLocator(t)?W.devirtualizeLocator(t):t,o=W.isVirtualLocator(e)?W.devirtualizeLocator(e):e;return W.areLocatorsEqual(r,o)},_j=(t,e,r,o)=>{if(t.linkType!=="SOFT")return!1;let a=ue.toPortablePath(r.resolveVirtual&&e.reference&&e.reference.startsWith("virtual:")?r.resolveVirtual(t.packageLocation):t.packageLocation);return V.contains(o,a)===null},gIt=t=>{let e=t.getPackageInformation(t.topLevel);if(e===null)throw new Error("Assertion failed: Expected the top-level package to have been registered");if(t.findPackageLocator(e.packageLocation)===null)throw new Error("Assertion failed: Expected the top-level package to have a physical locator");let o=ue.toPortablePath(e.packageLocation.slice(0,-1)),a=new Map,n={children:new Map},u=t.getDependencyTreeRoots(),A=new Map,p=new Set,h=(v,x)=>{let C=gA(v);if(p.has(C))return;p.add(C);let R=t.getPackageInformation(v);if(R){let L=x?gA(x):"";if(gA(v)!==L&&R.linkType==="SOFT"&&!v.reference.startsWith("link:")&&!_j(R,v,t,o)){let U=yIe(R,v,t);(!A.get(U)||v.reference.startsWith("workspace:"))&&A.set(U,v)}for(let[U,J]of R.packageDependencies)J!==null&&(R.packagePeers.has(U)||h(t.getLocator(U,J),v))}};for(let v of u)h(v,null);let E=o.split(V.sep);for(let v of A.values()){let x=t.getPackageInformation(v),R=ue.toPortablePath(x.packageLocation.slice(0,-1)).split(V.sep).slice(E.length),L=n;for(let U of R){let J=L.children.get(U);J||(J={children:new Map},L.children.set(U,J)),L=J}L.workspaceLocator=v}let I=(v,x)=>{if(v.workspaceLocator){let C=gA(x),R=a.get(C);R||(R=new Set,a.set(C,R)),R.add(v.workspaceLocator)}for(let C of v.children.values())I(C,v.workspaceLocator||x)};for(let v of n.children.values())I(v,n.workspaceLocator);return a},dIt=(t,e)=>{let r=[],o=!1,a=new Map,n=gIt(t),u=t.getPackageInformation(t.topLevel);if(u===null)throw new Error("Assertion failed: Expected the top-level package to have been registered");let A=t.findPackageLocator(u.packageLocation);if(A===null)throw new Error("Assertion failed: Expected the top-level package to have a physical locator");let p=ue.toPortablePath(u.packageLocation.slice(0,-1)),h={name:A.name,identName:A.name,reference:A.reference,peerNames:u.packagePeers,dependencies:new Set,dependencyKind:1},E=new Map,I=(x,C)=>`${gA(C)}:${x}`,v=(x,C,R,L,U,J,te,ae)=>{let fe=I(x,R),ce=E.get(fe),me=!!ce;!me&&R.name===A.name&&R.reference===A.reference&&(ce=h,E.set(fe,h));let he=_j(C,R,t,p);if(!ce){let le=0;he?le=2:C.linkType==="SOFT"&&R.name.endsWith(v0)&&(le=1),ce={name:x,identName:R.name,reference:R.reference,dependencies:new Set,peerNames:le===1?new Set:C.packagePeers,dependencyKind:le},E.set(fe,ce)}let Be;if(he?Be=2:U.linkType==="SOFT"?Be=1:Be=0,ce.hoistPriority=Math.max(ce.hoistPriority||0,Be),ae&&!he){let le=gA({name:L.identName,reference:L.reference}),ne=a.get(le)||new Set;a.set(le,ne),ne.add(ce.name)}let we=new Map(C.packageDependencies);if(e.project){let le=e.project.workspacesByCwd.get(ue.toPortablePath(C.packageLocation.slice(0,-1)));if(le){let ne=new Set([...Array.from(le.manifest.peerDependencies.values(),ee=>W.stringifyIdent(ee)),...Array.from(le.manifest.peerDependenciesMeta.keys())]);for(let ee of ne)we.has(ee)||(we.set(ee,J.get(ee)||null),ce.peerNames.add(ee))}}let g=gA({name:R.name.replace(v0,""),reference:R.reference}),Ee=n.get(g);if(Ee)for(let le of Ee)we.set(`${le.name}${v0}`,le.reference);(C!==U||C.linkType!=="SOFT"||!he&&(!e.selfReferencesByCwd||e.selfReferencesByCwd.get(te)))&&L.dependencies.add(ce);let Se=R!==A&&C.linkType==="SOFT"&&!R.name.endsWith(v0)&&!he;if(!me&&!Se){let le=new Map;for(let[ne,ee]of we)if(ee!==null){let Ie=t.getLocator(ne,ee),Fe=t.getLocator(ne.replace(v0,""),ee),At=t.getPackageInformation(Fe);if(At===null)throw new Error("Assertion failed: Expected the package to have been registered");let H=_j(At,Ie,t,p);if(e.validateExternalSoftLinks&&e.project&&H){At.packageDependencies.size>0&&(o=!0);for(let[He,Te]of At.packageDependencies)if(Te!==null){let Je=W.parseLocator(Array.isArray(Te)?`${Te[0]}@${Te[1]}`:`${He}@${Te}`);if(gA(Je)!==gA(Ie)){let je=we.get(He);if(je){let b=W.parseLocator(Array.isArray(je)?`${je[0]}@${je[1]}`:`${He}@${je}`);mIe(b,Je)||r.push({messageName:71,text:`Cannot link ${W.prettyIdent(e.project.configuration,W.parseIdent(Ie.name))} into ${W.prettyLocator(e.project.configuration,W.parseLocator(`${R.name}@${R.reference}`))} dependency ${W.prettyLocator(e.project.configuration,Je)} conflicts with parent dependency ${W.prettyLocator(e.project.configuration,b)}`})}else{let b=le.get(He);if(b){let w=b.target,P=W.parseLocator(Array.isArray(w)?`${w[0]}@${w[1]}`:`${He}@${w}`);mIe(P,Je)||r.push({messageName:71,text:`Cannot link ${W.prettyIdent(e.project.configuration,W.parseIdent(Ie.name))} into ${W.prettyLocator(e.project.configuration,W.parseLocator(`${R.name}@${R.reference}`))} dependency ${W.prettyLocator(e.project.configuration,Je)} conflicts with dependency ${W.prettyLocator(e.project.configuration,P)} from sibling portal ${W.prettyIdent(e.project.configuration,W.parseIdent(b.portal.name))}`})}else le.set(He,{target:Je.reference,portal:Ie})}}}}let at=e.hoistingLimitsByCwd?.get(te),Re=H?te:V.relative(p,ue.toPortablePath(At.packageLocation))||Bt.dot,ke=e.hoistingLimitsByCwd?.get(Re);v(ne,At,Ie,ce,C,we,Re,at==="dependencies"||ke==="dependencies"||ke==="workspaces")}}};return v(A.name,u,A,h,u,u.packageDependencies,Bt.dot,!1),{packageTree:h,hoistingLimits:a,errors:r,preserveSymlinksRequired:o}};function yIe(t,e,r){let o=r.resolveVirtual&&e.reference&&e.reference.startsWith("virtual:")?r.resolveVirtual(t.packageLocation):t.packageLocation;return ue.toPortablePath(o||t.packageLocation)}function mIt(t,e,r){let o=e.getLocator(t.name.replace(v0,""),t.reference),a=e.getPackageInformation(o);if(a===null)throw new Error("Assertion failed: Expected the package to be registered");return r.pnpifyFs?{linkType:"SOFT",target:ue.toPortablePath(a.packageLocation)}:{linkType:a.linkType,target:yIe(a,t,e)}}var yIt=(t,e,r)=>{let o=new Map,a=(E,I,v)=>{let{linkType:x,target:C}=mIt(E,t,r);return{locator:gA(E),nodePath:I,target:C,linkType:x,aliases:v}},n=E=>{let[I,v]=E.split("/");return v?{scope:I,name:v}:{scope:null,name:I}},u=new Set,A=(E,I,v)=>{if(u.has(E))return;u.add(E);let x=Array.from(E.references).sort().join("#");for(let C of E.dependencies){let R=Array.from(C.references).sort().join("#");if(C.identName===E.identName.replace(v0,"")&&R===x)continue;let L=Array.from(C.references).sort(),U={name:C.identName,reference:L[0]},{name:J,scope:te}=n(C.name),ae=te?[te,J]:[J],fe=V.join(I,dIe),ce=V.join(fe,...ae),me=`${v}/${U.name}`,he=a(U,v,L.slice(1)),Be=!1;if(he.linkType==="SOFT"&&r.project){let we=r.project.workspacesByCwd.get(he.target.slice(0,-1));Be=!!(we&&!we.manifest.name)}if(!C.name.endsWith(v0)&&!Be){let we=o.get(ce);if(we){if(we.dirList)throw new Error(`Assertion failed: ${ce} cannot merge dir node with leaf node`);{let Se=W.parseLocator(we.locator),le=W.parseLocator(he.locator);if(we.linkType!==he.linkType)throw new Error(`Assertion failed: ${ce} cannot merge nodes with different link types ${we.nodePath}/${W.stringifyLocator(Se)} and ${v}/${W.stringifyLocator(le)}`);if(Se.identHash!==le.identHash)throw new Error(`Assertion failed: ${ce} cannot merge nodes with different idents ${we.nodePath}/${W.stringifyLocator(Se)} and ${v}/s${W.stringifyLocator(le)}`);he.aliases=[...he.aliases,...we.aliases,W.parseLocator(we.locator).reference]}}o.set(ce,he);let g=ce.split("/"),Ee=g.indexOf(dIe);for(let Se=g.length-1;Ee>=0&&Se>Ee;Se--){let le=ue.toPortablePath(g.slice(0,Se).join(V.sep)),ne=g[Se],ee=o.get(le);if(!ee)o.set(le,{dirList:new Set([ne])});else if(ee.dirList){if(ee.dirList.has(ne))break;ee.dirList.add(ne)}}}A(C,he.linkType==="SOFT"?he.target:ce,me)}},p=a({name:e.name,reference:Array.from(e.references)[0]},"",[]),h=p.target;return o.set(h,p),A(e,h,""),o};Ye();Ye();St();St();nA();Nl();var oG={};Vt(oG,{PnpInstaller:()=>mm,PnpLinker:()=>P0,UnplugCommand:()=>x0,default:()=>VIt,getPnpPath:()=>b0,jsInstallUtils:()=>yA,pnpUtils:()=>av,quotePathIfNeeded:()=>r1e});St();var t1e=ve("url");Ye();Ye();St();St();var EIe={["DEFAULT"]:{collapsed:!1,next:{["*"]:"DEFAULT"}},["TOP_LEVEL"]:{collapsed:!1,next:{fallbackExclusionList:"FALLBACK_EXCLUSION_LIST",packageRegistryData:"PACKAGE_REGISTRY_DATA",["*"]:"DEFAULT"}},["FALLBACK_EXCLUSION_LIST"]:{collapsed:!1,next:{["*"]:"FALLBACK_EXCLUSION_ENTRIES"}},["FALLBACK_EXCLUSION_ENTRIES"]:{collapsed:!0,next:{["*"]:"FALLBACK_EXCLUSION_DATA"}},["FALLBACK_EXCLUSION_DATA"]:{collapsed:!0,next:{["*"]:"DEFAULT"}},["PACKAGE_REGISTRY_DATA"]:{collapsed:!1,next:{["*"]:"PACKAGE_REGISTRY_ENTRIES"}},["PACKAGE_REGISTRY_ENTRIES"]:{collapsed:!0,next:{["*"]:"PACKAGE_STORE_DATA"}},["PACKAGE_STORE_DATA"]:{collapsed:!1,next:{["*"]:"PACKAGE_STORE_ENTRIES"}},["PACKAGE_STORE_ENTRIES"]:{collapsed:!0,next:{["*"]:"PACKAGE_INFORMATION_DATA"}},["PACKAGE_INFORMATION_DATA"]:{collapsed:!1,next:{packageDependencies:"PACKAGE_DEPENDENCIES",["*"]:"DEFAULT"}},["PACKAGE_DEPENDENCIES"]:{collapsed:!1,next:{["*"]:"PACKAGE_DEPENDENCY"}},["PACKAGE_DEPENDENCY"]:{collapsed:!0,next:{["*"]:"DEFAULT"}}};function EIt(t,e,r){let o="";o+="[";for(let a=0,n=t.length;a<n;++a)o+=EQ(String(a),t[a],e,r).replace(/^ +/g,""),a+1<n&&(o+=", ");return o+="]",o}function CIt(t,e,r){let o=`${r}  `,a="";a+=r,a+=`[
+`;for(let n=0,u=t.length;n<u;++n)a+=o+EQ(String(n),t[n],e,o).replace(/^ +/,""),n+1<u&&(a+=","),a+=`
+`;return a+=r,a+="]",a}function wIt(t,e,r){let o=Object.keys(t),a="";a+="{";for(let n=0,u=o.length,A=0;n<u;++n){let p=o[n],h=t[p];typeof h>"u"||(A!==0&&(a+=", "),a+=JSON.stringify(p),a+=": ",a+=EQ(p,h,e,r).replace(/^ +/g,""),A+=1)}return a+="}",a}function IIt(t,e,r){let o=Object.keys(t),a=`${r}  `,n="";n+=r,n+=`{
+`;let u=0;for(let A=0,p=o.length;A<p;++A){let h=o[A],E=t[h];typeof E>"u"||(u!==0&&(n+=",",n+=`
+`),n+=a,n+=JSON.stringify(h),n+=": ",n+=EQ(h,E,e,a).replace(/^ +/g,""),u+=1)}return u!==0&&(n+=`
+`),n+=r,n+="}",n}function EQ(t,e,r,o){let{next:a}=EIe[r],n=a[t]||a["*"];return CIe(e,n,o)}function CIe(t,e,r){let{collapsed:o}=EIe[e];return Array.isArray(t)?o?EIt(t,e,r):CIt(t,e,r):typeof t=="object"&&t!==null?o?wIt(t,e,r):IIt(t,e,r):JSON.stringify(t)}function wIe(t){return CIe(t,"TOP_LEVEL","")}function XB(t,e){let r=Array.from(t);Array.isArray(e)||(e=[e]);let o=[];for(let n of e)o.push(r.map(u=>n(u)));let a=r.map((n,u)=>u);return a.sort((n,u)=>{for(let A of o){let p=A[n]<A[u]?-1:A[n]>A[u]?1:0;if(p!==0)return p}return 0}),a.map(n=>r[n])}function BIt(t){let e=new Map,r=XB(t.fallbackExclusionList||[],[({name:o,reference:a})=>o,({name:o,reference:a})=>a]);for(let{name:o,reference:a}of r){let n=e.get(o);typeof n>"u"&&e.set(o,n=new Set),n.add(a)}return Array.from(e).map(([o,a])=>[o,Array.from(a)])}function vIt(t){return XB(t.fallbackPool||[],([e])=>e)}function DIt(t){let e=[];for(let[r,o]of XB(t.packageRegistry,([a])=>a===null?"0":`1${a}`)){let a=[];e.push([r,a]);for(let[n,{packageLocation:u,packageDependencies:A,packagePeers:p,linkType:h,discardFromLookup:E}]of XB(o,([I])=>I===null?"0":`1${I}`)){let I=[];r!==null&&n!==null&&!A.has(r)&&I.push([r,n]);for(let[C,R]of XB(A.entries(),([L])=>L))I.push([C,R]);let v=p&&p.size>0?Array.from(p):void 0,x=E||void 0;a.push([n,{packageLocation:u,packageDependencies:I,packagePeers:v,linkType:h,discardFromLookup:x}])}}return e}function ZB(t){return{__info:["This file is automatically generated. Do not touch it, or risk","your modifications being lost."],dependencyTreeRoots:t.dependencyTreeRoots,enableTopLevelFallback:t.enableTopLevelFallback||!1,ignorePatternData:t.ignorePattern||null,fallbackExclusionList:BIt(t),fallbackPool:vIt(t),packageRegistryData:DIt(t)}}var vIe=$e(BIe());function DIe(t,e){return[t?`${t}
+`:"",`/* eslint-disable */
+`,`"use strict";
+`,`
+`,e,`
+`,(0,vIe.default)()].join("")}function SIt(t){return JSON.stringify(t,null,2)}function PIt(t){return`'${t.replace(/\\/g,"\\\\").replace(/'/g,"\\'").replace(/\n/g,`\\
+`)}'`}function bIt(t){return[`const RAW_RUNTIME_STATE =
+`,`${PIt(wIe(t))};
+
+`,`function $$SETUP_STATE(hydrateRuntimeState, basePath) {
+`,`  return hydrateRuntimeState(JSON.parse(RAW_RUNTIME_STATE), {basePath: basePath || __dirname});
+`,`}
+`].join("")}function xIt(){return[`function $$SETUP_STATE(hydrateRuntimeState, basePath) {
+`,`  const fs = require('fs');
+`,`  const path = require('path');
+`,`  const pnpDataFilepath = path.resolve(__dirname, ${JSON.stringify(dr.pnpData)});
+`,`  return hydrateRuntimeState(JSON.parse(fs.readFileSync(pnpDataFilepath, 'utf8')), {basePath: basePath || __dirname});
+`,`}
+`].join("")}function SIe(t){let e=ZB(t),r=bIt(e);return DIe(t.shebang,r)}function PIe(t){let e=ZB(t),r=xIt(),o=DIe(t.shebang,r);return{dataFile:SIt(e),loaderFile:o}}St();function Gj(t,{basePath:e}){let r=ue.toPortablePath(e),o=V.resolve(r),a=t.ignorePatternData!==null?new RegExp(t.ignorePatternData):null,n=new Map,u=new Map(t.packageRegistryData.map(([I,v])=>[I,new Map(v.map(([x,C])=>{if(I===null!=(x===null))throw new Error("Assertion failed: The name and reference should be null, or neither should");let R=C.discardFromLookup??!1,L={name:I,reference:x},U=n.get(C.packageLocation);U?(U.discardFromLookup=U.discardFromLookup&&R,R||(U.locator=L)):n.set(C.packageLocation,{locator:L,discardFromLookup:R});let J=null;return[x,{packageDependencies:new Map(C.packageDependencies),packagePeers:new Set(C.packagePeers),linkType:C.linkType,discardFromLookup:R,get packageLocation(){return J||(J=V.join(o,C.packageLocation))}}]}))])),A=new Map(t.fallbackExclusionList.map(([I,v])=>[I,new Set(v)])),p=new Map(t.fallbackPool),h=t.dependencyTreeRoots,E=t.enableTopLevelFallback;return{basePath:r,dependencyTreeRoots:h,enableTopLevelFallback:E,fallbackExclusionList:A,fallbackPool:p,ignorePattern:a,packageLocatorsByLocations:n,packageRegistry:u}}St();St();var np=ve("module"),dm=ve("url"),$j=ve("util");var Mo=ve("url");var QIe=$e(ve("assert"));var qj=Array.isArray,$B=JSON.stringify,ev=Object.getOwnPropertyNames,hm=(t,e)=>Object.prototype.hasOwnProperty.call(t,e),Yj=(t,e)=>RegExp.prototype.exec.call(t,e),Wj=(t,...e)=>RegExp.prototype[Symbol.replace].apply(t,e),D0=(t,...e)=>String.prototype.endsWith.apply(t,e),Kj=(t,...e)=>String.prototype.includes.apply(t,e),Vj=(t,...e)=>String.prototype.lastIndexOf.apply(t,e),tv=(t,...e)=>String.prototype.indexOf.apply(t,e),bIe=(t,...e)=>String.prototype.replace.apply(t,e),S0=(t,...e)=>String.prototype.slice.apply(t,e),dA=(t,...e)=>String.prototype.startsWith.apply(t,e),xIe=Map,kIe=JSON.parse;function rv(t,e,r){return class extends r{constructor(...o){super(e(...o)),this.code=t,this.name=`${r.name} [${t}]`}}}var FIe=rv("ERR_PACKAGE_IMPORT_NOT_DEFINED",(t,e,r)=>`Package import specifier "${t}" is not defined${e?` in package ${e}package.json`:""} imported from ${r}`,TypeError),Jj=rv("ERR_INVALID_MODULE_SPECIFIER",(t,e,r=void 0)=>`Invalid module "${t}" ${e}${r?` imported from ${r}`:""}`,TypeError),RIe=rv("ERR_INVALID_PACKAGE_TARGET",(t,e,r,o=!1,a=void 0)=>{let n=typeof r=="string"&&!o&&r.length&&!dA(r,"./");return e==="."?((0,QIe.default)(o===!1),`Invalid "exports" main target ${$B(r)} defined in the package config ${t}package.json${a?` imported from ${a}`:""}${n?'; targets must start with "./"':""}`):`Invalid "${o?"imports":"exports"}" target ${$B(r)} defined for '${e}' in the package config ${t}package.json${a?` imported from ${a}`:""}${n?'; targets must start with "./"':""}`},Error),nv=rv("ERR_INVALID_PACKAGE_CONFIG",(t,e,r)=>`Invalid package config ${t}${e?` while importing ${e}`:""}${r?`. ${r}`:""}`,Error),TIe=rv("ERR_PACKAGE_PATH_NOT_EXPORTED",(t,e,r=void 0)=>e==="."?`No "exports" main defined in ${t}package.json${r?` imported from ${r}`:""}`:`Package subpath '${e}' is not defined by "exports" in ${t}package.json${r?` imported from ${r}`:""}`,Error);var wQ=ve("url");function NIe(t,e){let r=Object.create(null);for(let o=0;o<e.length;o++){let a=e[o];hm(t,a)&&(r[a]=t[a])}return r}var CQ=new xIe;function kIt(t,e,r,o){let a=CQ.get(t);if(a!==void 0)return a;let n=o(t);if(n===void 0){let x={pjsonPath:t,exists:!1,main:void 0,name:void 0,type:"none",exports:void 0,imports:void 0};return CQ.set(t,x),x}let u;try{u=kIe(n)}catch(x){throw new nv(t,(r?`"${e}" from `:"")+(0,wQ.fileURLToPath)(r||e),x.message)}let{imports:A,main:p,name:h,type:E}=NIe(u,["imports","main","name","type"]),I=hm(u,"exports")?u.exports:void 0;(typeof A!="object"||A===null)&&(A=void 0),typeof p!="string"&&(p=void 0),typeof h!="string"&&(h=void 0),E!=="module"&&E!=="commonjs"&&(E="none");let v={pjsonPath:t,exists:!0,main:p,name:h,type:E,exports:I,imports:A};return CQ.set(t,v),v}function LIe(t,e){let r=new URL("./package.json",t);for(;;){let n=r.pathname;if(D0(n,"node_modules/package.json"))break;let u=kIt((0,wQ.fileURLToPath)(r),t,void 0,e);if(u.exists)return u;let A=r;if(r=new URL("../package.json",r),r.pathname===A.pathname)break}let o=(0,wQ.fileURLToPath)(r),a={pjsonPath:o,exists:!1,main:void 0,name:void 0,type:"none",exports:void 0,imports:void 0};return CQ.set(o,a),a}function QIt(t,e,r){throw new FIe(t,e&&(0,Mo.fileURLToPath)(new URL(".",e)),(0,Mo.fileURLToPath)(r))}function FIt(t,e,r,o){let a=`request is not a valid subpath for the "${r?"imports":"exports"}" resolution of ${(0,Mo.fileURLToPath)(e)}`;throw new Jj(t,a,o&&(0,Mo.fileURLToPath)(o))}function iv(t,e,r,o,a){throw typeof e=="object"&&e!==null?e=$B(e,null,""):e=`${e}`,new RIe((0,Mo.fileURLToPath)(new URL(".",r)),t,e,o,a&&(0,Mo.fileURLToPath)(a))}var OIe=/(^|\\|\/)((\.|%2e)(\.|%2e)?|(n|%6e|%4e)(o|%6f|%4f)(d|%64|%44)(e|%65|%45)(_|%5f)(m|%6d|%4d)(o|%6f|%4f)(d|%64|%44)(u|%75|%55)(l|%6c|%4c)(e|%65|%45)(s|%73|%53))(\\|\/|$)/i,MIe=/\*/g;function RIt(t,e,r,o,a,n,u,A){if(e!==""&&!n&&t[t.length-1]!=="/"&&iv(r,t,o,u,a),!dA(t,"./")){if(u&&!dA(t,"../")&&!dA(t,"/")){let I=!1;try{new URL(t),I=!0}catch{}if(!I)return n?Wj(MIe,t,()=>e):t+e}iv(r,t,o,u,a)}Yj(OIe,S0(t,2))!==null&&iv(r,t,o,u,a);let p=new URL(t,o),h=p.pathname,E=new URL(".",o).pathname;if(dA(h,E)||iv(r,t,o,u,a),e==="")return p;if(Yj(OIe,e)!==null){let I=n?bIe(r,"*",()=>e):r+e;FIt(I,o,u,a)}return n?new URL(Wj(MIe,p.href,()=>e)):new URL(e,p)}function TIt(t){let e=+t;return`${e}`!==t?!1:e>=0&&e<4294967295}function qC(t,e,r,o,a,n,u,A){if(typeof e=="string")return RIt(e,r,o,t,a,n,u,A);if(qj(e)){if(e.length===0)return null;let p;for(let h=0;h<e.length;h++){let E=e[h],I;try{I=qC(t,E,r,o,a,n,u,A)}catch(v){if(p=v,v.code==="ERR_INVALID_PACKAGE_TARGET")continue;throw v}if(I!==void 0){if(I===null){p=null;continue}return I}}if(p==null)return p;throw p}else if(typeof e=="object"&&e!==null){let p=ev(e);for(let h=0;h<p.length;h++){let E=p[h];if(TIt(E))throw new nv((0,Mo.fileURLToPath)(t),a,'"exports" cannot contain numeric property keys.')}for(let h=0;h<p.length;h++){let E=p[h];if(E==="default"||A.has(E)){let I=e[E],v=qC(t,I,r,o,a,n,u,A);if(v===void 0)continue;return v}}return}else if(e===null)return null;iv(o,e,t,u,a)}function _Ie(t,e){let r=tv(t,"*"),o=tv(e,"*"),a=r===-1?t.length:r+1,n=o===-1?e.length:o+1;return a>n?-1:n>a||r===-1?1:o===-1||t.length>e.length?-1:e.length>t.length?1:0}function NIt(t,e,r){if(typeof t=="string"||qj(t))return!0;if(typeof t!="object"||t===null)return!1;let o=ev(t),a=!1,n=0;for(let u=0;u<o.length;u++){let A=o[u],p=A===""||A[0]!==".";if(n++===0)a=p;else if(a!==p)throw new nv((0,Mo.fileURLToPath)(e),r,`"exports" cannot contain some keys starting with '.' and some not. The exports object must either be an object of package subpath keys or an object of main entry condition name keys only.`)}return a}function zj(t,e,r){throw new TIe((0,Mo.fileURLToPath)(new URL(".",e)),t,r&&(0,Mo.fileURLToPath)(r))}var UIe=new Set;function LIt(t,e,r){let o=(0,Mo.fileURLToPath)(e);UIe.has(o+"|"+t)||(UIe.add(o+"|"+t),process.emitWarning(`Use of deprecated trailing slash pattern mapping "${t}" in the "exports" field module resolution of the package at ${o}${r?` imported from ${(0,Mo.fileURLToPath)(r)}`:""}. Mapping specifiers ending in "/" is no longer supported.`,"DeprecationWarning","DEP0155"))}function HIe({packageJSONUrl:t,packageSubpath:e,exports:r,base:o,conditions:a}){if(NIt(r,t,o)&&(r={".":r}),hm(r,e)&&!Kj(e,"*")&&!D0(e,"/")){let p=r[e],h=qC(t,p,"",e,o,!1,!1,a);return h==null&&zj(e,t,o),h}let n="",u,A=ev(r);for(let p=0;p<A.length;p++){let h=A[p],E=tv(h,"*");if(E!==-1&&dA(e,S0(h,0,E))){D0(e,"/")&&LIt(e,t,o);let I=S0(h,E+1);e.length>=h.length&&D0(e,I)&&_Ie(n,h)===1&&Vj(h,"*")===E&&(n=h,u=S0(e,E,e.length-I.length))}}if(n){let p=r[n],h=qC(t,p,u,n,o,!0,!1,a);return h==null&&zj(e,t,o),h}zj(e,t,o)}function jIe({name:t,base:e,conditions:r,readFileSyncFn:o}){if(t==="#"||dA(t,"#/")||D0(t,"/")){let u="is not a valid internal imports specifier name";throw new Jj(t,u,(0,Mo.fileURLToPath)(e))}let a,n=LIe(e,o);if(n.exists){a=(0,Mo.pathToFileURL)(n.pjsonPath);let u=n.imports;if(u)if(hm(u,t)&&!Kj(t,"*")){let A=qC(a,u[t],"",t,e,!1,!0,r);if(A!=null)return A}else{let A="",p,h=ev(u);for(let E=0;E<h.length;E++){let I=h[E],v=tv(I,"*");if(v!==-1&&dA(t,S0(I,0,v))){let x=S0(I,v+1);t.length>=I.length&&D0(t,x)&&_Ie(A,I)===1&&Vj(I,"*")===v&&(A=I,p=S0(t,v,t.length-x.length))}}if(A){let E=u[A],I=qC(a,E,p,A,e,!0,!0,r);if(I!=null)return I}}}QIt(t,a,e)}St();var OIt=new Set(["BUILTIN_NODE_RESOLUTION_FAILED","MISSING_DEPENDENCY","MISSING_PEER_DEPENDENCY","QUALIFIED_PATH_RESOLUTION_FAILED","UNDECLARED_DEPENDENCY"]);function $i(t,e,r={},o){o??=OIt.has(t)?"MODULE_NOT_FOUND":t;let a={configurable:!0,writable:!0,enumerable:!1};return Object.defineProperties(new Error(e),{code:{...a,value:o},pnpCode:{...a,value:t},data:{...a,value:r}})}function au(t){return ue.normalize(ue.fromPortablePath(t))}var WIe=$e(qIe());function KIe(t){return MIt(),Zj[t]}var Zj;function MIt(){Zj||(Zj={"--conditions":[],...YIe(UIt()),...YIe(process.execArgv)})}function YIe(t){return(0,WIe.default)({"--conditions":[String],"-C":"--conditions"},{argv:t,permissive:!0})}function UIt(){let t=[],e=_It(process.env.NODE_OPTIONS||"",t);return t.length,e}function _It(t,e){let r=[],o=!1,a=!0;for(let n=0;n<t.length;++n){let u=t[n];if(u==="\\"&&o){if(n+1===t.length)return e.push(`invalid value for NODE_OPTIONS (invalid escape)
+`),r;u=t[++n]}else if(u===" "&&!o){a=!0;continue}else if(u==='"'){o=!o;continue}a?(r.push(u),a=!1):r[r.length-1]+=u}return o&&e.push(`invalid value for NODE_OPTIONS (unterminated string)
+`),r}St();var[mA,gm]=process.versions.node.split(".").map(t=>parseInt(t,10)),VIe=mA>19||mA===19&&gm>=2||mA===18&&gm>=13,Bzt=mA===20&&gm<6||mA===19&&gm>=3,vzt=mA>19||mA===19&&gm>=6,Dzt=mA>=21||mA===20&&gm>=10||mA===18&&gm>=19;function JIe(t){if(process.env.WATCH_REPORT_DEPENDENCIES&&process.send)if(t=t.map(e=>ue.fromPortablePath(mi.resolveVirtual(ue.toPortablePath(e)))),VIe)process.send({"watch:require":t});else for(let e of t)process.send({"watch:require":e})}function eG(t,e){let r=Number(process.env.PNP_ALWAYS_WARN_ON_FALLBACK)>0,o=Number(process.env.PNP_DEBUG_LEVEL),a=/^(?![a-zA-Z]:[\\/]|\\\\|\.{0,2}(?:\/|$))((?:node:)?(?:@[^/]+\/)?[^/]+)\/*(.*|)$/,n=/^(\/|\.{1,2}(\/|$))/,u=/\/$/,A=/^\.{0,2}\//,p={name:null,reference:null},h=[],E=new Set;if(t.enableTopLevelFallback===!0&&h.push(p),e.compatibilityMode!==!1)for(let Re of["react-scripts","gatsby"]){let ke=t.packageRegistry.get(Re);if(ke)for(let xe of ke.keys()){if(xe===null)throw new Error("Assertion failed: This reference shouldn't be null");h.push({name:Re,reference:xe})}}let{ignorePattern:I,packageRegistry:v,packageLocatorsByLocations:x}=t;function C(Re,ke){return{fn:Re,args:ke,error:null,result:null}}function R(Re){let ke=process.stderr?.hasColors?.()??process.stdout.isTTY,xe=(Je,je)=>`\x1B[${Je}m${je}\x1B[0m`,He=Re.error;console.error(He?xe("31;1",`\u2716 ${Re.error?.message.replace(/\n.*/s,"")}`):xe("33;1","\u203C Resolution")),Re.args.length>0&&console.error();for(let Je of Re.args)console.error(`  ${xe("37;1","In \u2190")} ${(0,$j.inspect)(Je,{colors:ke,compact:!0})}`);Re.result&&(console.error(),console.error(`  ${xe("37;1","Out \u2192")} ${(0,$j.inspect)(Re.result,{colors:ke,compact:!0})}`));let Te=new Error().stack.match(/(?<=^ +)at.*/gm)?.slice(2)??[];if(Te.length>0){console.error();for(let Je of Te)console.error(`  ${xe("38;5;244",Je)}`)}console.error()}function L(Re,ke){if(e.allowDebug===!1)return ke;if(Number.isFinite(o)){if(o>=2)return(...xe)=>{let He=C(Re,xe);try{return He.result=ke(...xe)}catch(Te){throw He.error=Te}finally{R(He)}};if(o>=1)return(...xe)=>{try{return ke(...xe)}catch(He){let Te=C(Re,xe);throw Te.error=He,R(Te),He}}}return ke}function U(Re){let ke=g(Re);if(!ke)throw $i("INTERNAL","Couldn't find a matching entry in the dependency tree for the specified parent (this is probably an internal error)");return ke}function J(Re){if(Re.name===null)return!0;for(let ke of t.dependencyTreeRoots)if(ke.name===Re.name&&ke.reference===Re.reference)return!0;return!1}let te=new Set(["node","require",...KIe("--conditions")]);function ae(Re,ke=te,xe){let He=le(V.join(Re,"internal.js"),{resolveIgnored:!0,includeDiscardFromLookup:!0});if(He===null)throw $i("INTERNAL",`The locator that owns the "${Re}" path can't be found inside the dependency tree (this is probably an internal error)`);let{packageLocation:Te}=U(He),Je=V.join(Te,dr.manifest);if(!e.fakeFs.existsSync(Je))return null;let je=JSON.parse(e.fakeFs.readFileSync(Je,"utf8"));if(je.exports==null)return null;let b=V.contains(Te,Re);if(b===null)throw $i("INTERNAL","unqualifiedPath doesn't contain the packageLocation (this is probably an internal error)");b!=="."&&!A.test(b)&&(b=`./${b}`);try{let w=HIe({packageJSONUrl:(0,dm.pathToFileURL)(ue.fromPortablePath(Je)),packageSubpath:b,exports:je.exports,base:xe?(0,dm.pathToFileURL)(ue.fromPortablePath(xe)):null,conditions:ke});return ue.toPortablePath((0,dm.fileURLToPath)(w))}catch(w){throw $i("EXPORTS_RESOLUTION_FAILED",w.message,{unqualifiedPath:au(Re),locator:He,pkgJson:je,subpath:au(b),conditions:ke},w.code)}}function fe(Re,ke,{extensions:xe}){let He;try{ke.push(Re),He=e.fakeFs.statSync(Re)}catch{}if(He&&!He.isDirectory())return e.fakeFs.realpathSync(Re);if(He&&He.isDirectory()){let Te;try{Te=JSON.parse(e.fakeFs.readFileSync(V.join(Re,dr.manifest),"utf8"))}catch{}let Je;if(Te&&Te.main&&(Je=V.resolve(Re,Te.main)),Je&&Je!==Re){let je=fe(Je,ke,{extensions:xe});if(je!==null)return je}}for(let Te=0,Je=xe.length;Te<Je;Te++){let je=`${Re}${xe[Te]}`;if(ke.push(je),e.fakeFs.existsSync(je))return je}if(He&&He.isDirectory())for(let Te=0,Je=xe.length;Te<Je;Te++){let je=V.format({dir:Re,name:"index",ext:xe[Te]});if(ke.push(je),e.fakeFs.existsSync(je))return je}return null}function ce(Re){let ke=new np.Module(Re,null);return ke.filename=Re,ke.paths=np.Module._nodeModulePaths(Re),ke}function me(Re,ke){return ke.endsWith("/")&&(ke=V.join(ke,"internal.js")),np.Module._resolveFilename(ue.fromPortablePath(Re),ce(ue.fromPortablePath(ke)),!1,{plugnplay:!1})}function he(Re){if(I===null)return!1;let ke=V.contains(t.basePath,Re);return ke===null?!1:!!I.test(ke.replace(/\/$/,""))}let Be={std:3,resolveVirtual:1,getAllLocators:1},we=p;function g({name:Re,reference:ke}){let xe=v.get(Re);if(!xe)return null;let He=xe.get(ke);return He||null}function Ee({name:Re,reference:ke}){let xe=[];for(let[He,Te]of v)if(He!==null)for(let[Je,je]of Te)Je===null||je.packageDependencies.get(Re)!==ke||He===Re&&Je===ke||xe.push({name:He,reference:Je});return xe}function Se(Re,ke){let xe=new Map,He=new Set,Te=je=>{let b=JSON.stringify(je.name);if(He.has(b))return;He.add(b);let w=Ee(je);for(let P of w)if(U(P).packagePeers.has(Re))Te(P);else{let F=xe.get(P.name);typeof F>"u"&&xe.set(P.name,F=new Set),F.add(P.reference)}};Te(ke);let Je=[];for(let je of[...xe.keys()].sort())for(let b of[...xe.get(je)].sort())Je.push({name:je,reference:b});return Je}function le(Re,{resolveIgnored:ke=!1,includeDiscardFromLookup:xe=!1}={}){if(he(Re)&&!ke)return null;let He=V.relative(t.basePath,Re);He.match(n)||(He=`./${He}`),He.endsWith("/")||(He=`${He}/`);do{let Te=x.get(He);if(typeof Te>"u"||Te.discardFromLookup&&!xe){He=He.substring(0,He.lastIndexOf("/",He.length-2)+1);continue}return Te.locator}while(He!=="");return null}function ne(Re){try{return e.fakeFs.readFileSync(ue.toPortablePath(Re),"utf8")}catch(ke){if(ke.code==="ENOENT")return;throw ke}}function ee(Re,ke,{considerBuiltins:xe=!0}={}){if(Re.startsWith("#"))throw new Error("resolveToUnqualified can not handle private import mappings");if(Re==="pnpapi")return ue.toPortablePath(e.pnpapiResolution);if(xe&&(0,np.isBuiltin)(Re))return null;let He=au(Re),Te=ke&&au(ke);if(ke&&he(ke)&&(!V.isAbsolute(Re)||le(Re)===null)){let b=me(Re,ke);if(b===!1)throw $i("BUILTIN_NODE_RESOLUTION_FAILED",`The builtin node resolution algorithm was unable to resolve the requested module (it didn't go through the pnp resolver because the issuer was explicitely ignored by the regexp)
+
+Require request: "${He}"
+Required by: ${Te}
+`,{request:He,issuer:Te});return ue.toPortablePath(b)}let Je,je=Re.match(a);if(je){if(!ke)throw $i("API_ERROR","The resolveToUnqualified function must be called with a valid issuer when the path isn't a builtin nor absolute",{request:He,issuer:Te});let[,b,w]=je,P=le(ke);if(!P){let Ne=me(Re,ke);if(Ne===!1)throw $i("BUILTIN_NODE_RESOLUTION_FAILED",`The builtin node resolution algorithm was unable to resolve the requested module (it didn't go through the pnp resolver because the issuer doesn't seem to be part of the Yarn-managed dependency tree).
+
+Require path: "${He}"
+Required by: ${Te}
+`,{request:He,issuer:Te});return ue.toPortablePath(Ne)}let F=U(P).packageDependencies.get(b),z=null;if(F==null&&P.name!==null){let Ne=t.fallbackExclusionList.get(P.name);if(!Ne||!Ne.has(P.reference)){for(let dt=0,Gt=h.length;dt<Gt;++dt){let bt=U(h[dt]).packageDependencies.get(b);if(bt!=null){r?z=bt:F=bt;break}}if(t.enableTopLevelFallback&&F==null&&z===null){let dt=t.fallbackPool.get(b);dt!=null&&(z=dt)}}}let X=null;if(F===null)if(J(P))X=$i("MISSING_PEER_DEPENDENCY",`Your application tried to access ${b} (a peer dependency); this isn't allowed as there is no ancestor to satisfy the requirement. Use a devDependency if needed.
+
+Required package: ${b}${b!==He?` (via "${He}")`:""}
+Required by: ${Te}
+`,{request:He,issuer:Te,dependencyName:b});else{let Ne=Se(b,P);Ne.every(ot=>J(ot))?X=$i("MISSING_PEER_DEPENDENCY",`${P.name} tried to access ${b} (a peer dependency) but it isn't provided by your application; this makes the require call ambiguous and unsound.
+
+Required package: ${b}${b!==He?` (via "${He}")`:""}
+Required by: ${P.name}@${P.reference} (via ${Te})
+${Ne.map(ot=>`Ancestor breaking the chain: ${ot.name}@${ot.reference}
+`).join("")}
+`,{request:He,issuer:Te,issuerLocator:Object.assign({},P),dependencyName:b,brokenAncestors:Ne}):X=$i("MISSING_PEER_DEPENDENCY",`${P.name} tried to access ${b} (a peer dependency) but it isn't provided by its ancestors; this makes the require call ambiguous and unsound.
+
+Required package: ${b}${b!==He?` (via "${He}")`:""}
+Required by: ${P.name}@${P.reference} (via ${Te})
+
+${Ne.map(ot=>`Ancestor breaking the chain: ${ot.name}@${ot.reference}
+`).join("")}
+`,{request:He,issuer:Te,issuerLocator:Object.assign({},P),dependencyName:b,brokenAncestors:Ne})}else F===void 0&&(!xe&&(0,np.isBuiltin)(Re)?J(P)?X=$i("UNDECLARED_DEPENDENCY",`Your application tried to access ${b}. While this module is usually interpreted as a Node builtin, your resolver is running inside a non-Node resolution context where such builtins are ignored. Since ${b} isn't otherwise declared in your dependencies, this makes the require call ambiguous and unsound.
+
+Required package: ${b}${b!==He?` (via "${He}")`:""}
+Required by: ${Te}
+`,{request:He,issuer:Te,dependencyName:b}):X=$i("UNDECLARED_DEPENDENCY",`${P.name} tried to access ${b}. While this module is usually interpreted as a Node builtin, your resolver is running inside a non-Node resolution context where such builtins are ignored. Since ${b} isn't otherwise declared in ${P.name}'s dependencies, this makes the require call ambiguous and unsound.
+
+Required package: ${b}${b!==He?` (via "${He}")`:""}
+Required by: ${Te}
+`,{request:He,issuer:Te,issuerLocator:Object.assign({},P),dependencyName:b}):J(P)?X=$i("UNDECLARED_DEPENDENCY",`Your application tried to access ${b}, but it isn't declared in your dependencies; this makes the require call ambiguous and unsound.
+
+Required package: ${b}${b!==He?` (via "${He}")`:""}
+Required by: ${Te}
+`,{request:He,issuer:Te,dependencyName:b}):X=$i("UNDECLARED_DEPENDENCY",`${P.name} tried to access ${b}, but it isn't declared in its dependencies; this makes the require call ambiguous and unsound.
+
+Required package: ${b}${b!==He?` (via "${He}")`:""}
+Required by: ${P.name}@${P.reference} (via ${Te})
+`,{request:He,issuer:Te,issuerLocator:Object.assign({},P),dependencyName:b}));if(F==null){if(z===null||X===null)throw X||new Error("Assertion failed: Expected an error to have been set");F=z;let Ne=X.message.replace(/\n.*/g,"");X.message=Ne,!E.has(Ne)&&o!==0&&(E.add(Ne),process.emitWarning(X))}let Z=Array.isArray(F)?{name:F[0],reference:F[1]}:{name:b,reference:F},ie=U(Z);if(!ie.packageLocation)throw $i("MISSING_DEPENDENCY",`A dependency seems valid but didn't get installed for some reason. This might be caused by a partial install, such as dev vs prod.
+
+Required package: ${Z.name}@${Z.reference}${Z.name!==He?` (via "${He}")`:""}
+Required by: ${P.name}@${P.reference} (via ${Te})
+`,{request:He,issuer:Te,dependencyLocator:Object.assign({},Z)});let Pe=ie.packageLocation;w?Je=V.join(Pe,w):Je=Pe}else if(V.isAbsolute(Re))Je=V.normalize(Re);else{if(!ke)throw $i("API_ERROR","The resolveToUnqualified function must be called with a valid issuer when the path isn't a builtin nor absolute",{request:He,issuer:Te});let b=V.resolve(ke);ke.match(u)?Je=V.normalize(V.join(b,Re)):Je=V.normalize(V.join(V.dirname(b),Re))}return V.normalize(Je)}function Ie(Re,ke,xe=te,He){if(n.test(Re))return ke;let Te=ae(ke,xe,He);return Te?V.normalize(Te):ke}function Fe(Re,{extensions:ke=Object.keys(np.Module._extensions)}={}){let xe=[],He=fe(Re,xe,{extensions:ke});if(He)return V.normalize(He);{JIe(xe.map(je=>ue.fromPortablePath(je)));let Te=au(Re),Je=le(Re);if(Je){let{packageLocation:je}=U(Je),b=!0;try{e.fakeFs.accessSync(je)}catch(w){if(w?.code==="ENOENT")b=!1;else{let P=(w?.message??w??"empty exception thrown").replace(/^[A-Z]/,y=>y.toLowerCase());throw $i("QUALIFIED_PATH_RESOLUTION_FAILED",`Required package exists but could not be accessed (${P}).
+
+Missing package: ${Je.name}@${Je.reference}
+Expected package location: ${au(je)}
+`,{unqualifiedPath:Te,extensions:ke})}}if(!b){let w=je.includes("/unplugged/")?"Required unplugged package missing from disk. This may happen when switching branches without running installs (unplugged packages must be fully materialized on disk to work).":"Required package missing from disk. If you keep your packages inside your repository then restarting the Node process may be enough. Otherwise, try to run an install first.";throw $i("QUALIFIED_PATH_RESOLUTION_FAILED",`${w}
+
+Missing package: ${Je.name}@${Je.reference}
+Expected package location: ${au(je)}
+`,{unqualifiedPath:Te,extensions:ke})}}throw $i("QUALIFIED_PATH_RESOLUTION_FAILED",`Qualified path resolution failed: we looked for the following paths, but none could be accessed.
+
+Source path: ${Te}
+${xe.map(je=>`Not found: ${au(je)}
+`).join("")}`,{unqualifiedPath:Te,extensions:ke})}}function At(Re,ke,xe){if(!ke)throw new Error("Assertion failed: An issuer is required to resolve private import mappings");let He=jIe({name:Re,base:(0,dm.pathToFileURL)(ue.fromPortablePath(ke)),conditions:xe.conditions??te,readFileSyncFn:ne});if(He instanceof URL)return Fe(ue.toPortablePath((0,dm.fileURLToPath)(He)),{extensions:xe.extensions});if(He.startsWith("#"))throw new Error("Mapping from one private import to another isn't allowed");return H(He,ke,xe)}function H(Re,ke,xe={}){try{if(Re.startsWith("#"))return At(Re,ke,xe);let{considerBuiltins:He,extensions:Te,conditions:Je}=xe,je=ee(Re,ke,{considerBuiltins:He});if(Re==="pnpapi")return je;if(je===null)return null;let b=()=>ke!==null?he(ke):!1,w=(!He||!(0,np.isBuiltin)(Re))&&!b()?Ie(Re,je,Je,ke):je;return Fe(w,{extensions:Te})}catch(He){throw Object.hasOwn(He,"pnpCode")&&Object.assign(He.data,{request:au(Re),issuer:ke&&au(ke)}),He}}function at(Re){let ke=V.normalize(Re),xe=mi.resolveVirtual(ke);return xe!==ke?xe:null}return{VERSIONS:Be,topLevel:we,getLocator:(Re,ke)=>Array.isArray(ke)?{name:ke[0],reference:ke[1]}:{name:Re,reference:ke},getDependencyTreeRoots:()=>[...t.dependencyTreeRoots],getAllLocators(){let Re=[];for(let[ke,xe]of v)for(let He of xe.keys())ke!==null&&He!==null&&Re.push({name:ke,reference:He});return Re},getPackageInformation:Re=>{let ke=g(Re);if(ke===null)return null;let xe=ue.fromPortablePath(ke.packageLocation);return{...ke,packageLocation:xe}},findPackageLocator:Re=>le(ue.toPortablePath(Re)),resolveToUnqualified:L("resolveToUnqualified",(Re,ke,xe)=>{let He=ke!==null?ue.toPortablePath(ke):null,Te=ee(ue.toPortablePath(Re),He,xe);return Te===null?null:ue.fromPortablePath(Te)}),resolveUnqualified:L("resolveUnqualified",(Re,ke)=>ue.fromPortablePath(Fe(ue.toPortablePath(Re),ke))),resolveRequest:L("resolveRequest",(Re,ke,xe)=>{let He=ke!==null?ue.toPortablePath(ke):null,Te=H(ue.toPortablePath(Re),He,xe);return Te===null?null:ue.fromPortablePath(Te)}),resolveVirtual:L("resolveVirtual",Re=>{let ke=at(ue.toPortablePath(Re));return ke!==null?ue.fromPortablePath(ke):null})}}St();var zIe=(t,e,r)=>{let o=ZB(t),a=Gj(o,{basePath:e}),n=ue.join(e,dr.pnpCjs);return eG(a,{fakeFs:r,pnpapiResolution:n})};var rG=$e(ZIe());jt();var yA={};Vt(yA,{checkManifestCompatibility:()=>$Ie,extractBuildRequest:()=>IQ,getExtractHint:()=>nG,hasBindingGyp:()=>iG});Ye();St();function $Ie(t){return W.isPackageCompatible(t,Ji.getArchitectureSet())}function IQ(t,e,r,{configuration:o}){let a=[];for(let n of["preinstall","install","postinstall"])e.manifest.scripts.has(n)&&a.push({type:0,script:n});return!e.manifest.scripts.has("install")&&e.misc.hasBindingGyp&&a.push({type:1,script:"node-gyp rebuild"}),a.length===0?null:t.linkType!=="HARD"?{skipped:!0,explain:n=>n.reportWarningOnce(6,`${W.prettyLocator(o,t)} lists build scripts, but is referenced through a soft link. Soft links don't support build scripts, so they'll be ignored.`)}:r&&r.built===!1?{skipped:!0,explain:n=>n.reportInfoOnce(5,`${W.prettyLocator(o,t)} lists build scripts, but its build has been explicitly disabled through configuration.`)}:!o.get("enableScripts")&&!r.built?{skipped:!0,explain:n=>n.reportWarningOnce(4,`${W.prettyLocator(o,t)} lists build scripts, but all build scripts have been disabled.`)}:$Ie(t)?{skipped:!1,directives:a}:{skipped:!0,explain:n=>n.reportWarningOnce(76,`${W.prettyLocator(o,t)} The ${Ji.getArchitectureName()} architecture is incompatible with this package, build skipped.`)}}var jIt=new Set([".exe",".bin",".h",".hh",".hpp",".c",".cc",".cpp",".java",".jar",".node"]);function nG(t){return t.packageFs.getExtractHint({relevantExtensions:jIt})}function iG(t){let e=V.join(t.prefixPath,"binding.gyp");return t.packageFs.existsSync(e)}var av={};Vt(av,{getUnpluggedPath:()=>ov});Ye();St();function ov(t,{configuration:e}){return V.resolve(e.get("pnpUnpluggedFolder"),W.slugifyLocator(t))}var GIt=new Set([W.makeIdent(null,"open").identHash,W.makeIdent(null,"opn").identHash]),P0=class{constructor(){this.mode="strict";this.pnpCache=new Map}getCustomDataKey(){return JSON.stringify({name:"PnpLinker",version:2})}supportsPackage(e,r){return this.isEnabled(r)}async findPackageLocation(e,r){if(!this.isEnabled(r))throw new Error("Assertion failed: Expected the PnP linker to be enabled");let o=b0(r.project).cjs;if(!oe.existsSync(o))throw new it(`The project in ${de.pretty(r.project.configuration,`${r.project.cwd}/package.json`,de.Type.PATH)} doesn't seem to have been installed - running an install there might help`);let a=_e.getFactoryWithDefault(this.pnpCache,o,()=>_e.dynamicRequire(o,{cachingStrategy:_e.CachingStrategy.FsTime})),n={name:W.stringifyIdent(e),reference:e.reference},u=a.getPackageInformation(n);if(!u)throw new it(`Couldn't find ${W.prettyLocator(r.project.configuration,e)} in the currently installed PnP map - running an install might help`);return ue.toPortablePath(u.packageLocation)}async findPackageLocator(e,r){if(!this.isEnabled(r))return null;let o=b0(r.project).cjs;if(!oe.existsSync(o))return null;let n=_e.getFactoryWithDefault(this.pnpCache,o,()=>_e.dynamicRequire(o,{cachingStrategy:_e.CachingStrategy.FsTime})).findPackageLocator(ue.fromPortablePath(e));return n?W.makeLocator(W.parseIdent(n.name),n.reference):null}makeInstaller(e){return new mm(e)}isEnabled(e){return!(e.project.configuration.get("nodeLinker")!=="pnp"||e.project.configuration.get("pnpMode")!==this.mode)}},mm=class{constructor(e){this.opts=e;this.mode="strict";this.asyncActions=new _e.AsyncActions(10);this.packageRegistry=new Map;this.virtualTemplates=new Map;this.isESMLoaderRequired=!1;this.customData={store:new Map};this.unpluggedPaths=new Set;this.opts=e}attachCustomData(e){this.customData=e}async installPackage(e,r,o){let a=W.stringifyIdent(e),n=e.reference,u=!!this.opts.project.tryWorkspaceByLocator(e),A=W.isVirtualLocator(e),p=e.peerDependencies.size>0&&!A,h=!p&&!u,E=!p&&e.linkType!=="SOFT",I,v;if(h||E){let te=A?W.devirtualizeLocator(e):e;I=this.customData.store.get(te.locatorHash),typeof I>"u"&&(I=await qIt(r),e.linkType==="HARD"&&this.customData.store.set(te.locatorHash,I)),I.manifest.type==="module"&&(this.isESMLoaderRequired=!0),v=this.opts.project.getDependencyMeta(te,e.version)}let x=h?IQ(e,I,v,{configuration:this.opts.project.configuration}):null,C=E?await this.unplugPackageIfNeeded(e,I,r,v,o):r.packageFs;if(V.isAbsolute(r.prefixPath))throw new Error(`Assertion failed: Expected the prefix path (${r.prefixPath}) to be relative to the parent`);let R=V.resolve(C.getRealPath(),r.prefixPath),L=sG(this.opts.project.cwd,R),U=new Map,J=new Set;if(A){for(let te of e.peerDependencies.values())U.set(W.stringifyIdent(te),null),J.add(W.stringifyIdent(te));if(!u){let te=W.devirtualizeLocator(e);this.virtualTemplates.set(te.locatorHash,{location:sG(this.opts.project.cwd,mi.resolveVirtual(R)),locator:te})}}return _e.getMapWithDefault(this.packageRegistry,a).set(n,{packageLocation:L,packageDependencies:U,packagePeers:J,linkType:e.linkType,discardFromLookup:r.discardFromLookup||!1}),{packageLocation:R,buildRequest:x}}async attachInternalDependencies(e,r){let o=this.getPackageInformation(e);for(let[a,n]of r){let u=W.areIdentsEqual(a,n)?n.reference:[W.stringifyIdent(n),n.reference];o.packageDependencies.set(W.stringifyIdent(a),u)}}async attachExternalDependents(e,r){for(let o of r)this.getDiskInformation(o).packageDependencies.set(W.stringifyIdent(e),e.reference)}async finalizeInstall(){if(this.opts.project.configuration.get("pnpMode")!==this.mode)return;let e=b0(this.opts.project);if(this.isEsmEnabled()||await oe.removePromise(e.esmLoader),this.opts.project.configuration.get("nodeLinker")!=="pnp"){await oe.removePromise(e.cjs),await oe.removePromise(e.data),await oe.removePromise(e.esmLoader),await oe.removePromise(this.opts.project.configuration.get("pnpUnpluggedFolder"));return}for(let{locator:E,location:I}of this.virtualTemplates.values())_e.getMapWithDefault(this.packageRegistry,W.stringifyIdent(E)).set(E.reference,{packageLocation:I,packageDependencies:new Map,packagePeers:new Set,linkType:"SOFT",discardFromLookup:!1});this.packageRegistry.set(null,new Map([[null,this.getPackageInformation(this.opts.project.topLevelWorkspace.anchoredLocator)]]));let r=this.opts.project.configuration.get("pnpFallbackMode"),o=this.opts.project.workspaces.map(({anchoredLocator:E})=>({name:W.stringifyIdent(E),reference:E.reference})),a=r!=="none",n=[],u=new Map,A=_e.buildIgnorePattern([".yarn/sdks/**",...this.opts.project.configuration.get("pnpIgnorePatterns")]),p=this.packageRegistry,h=this.opts.project.configuration.get("pnpShebang");if(r==="dependencies-only")for(let E of this.opts.project.storedPackages.values())this.opts.project.tryWorkspaceByLocator(E)&&n.push({name:W.stringifyIdent(E),reference:E.reference});return await this.asyncActions.wait(),await this.finalizeInstallWithPnp({dependencyTreeRoots:o,enableTopLevelFallback:a,fallbackExclusionList:n,fallbackPool:u,ignorePattern:A,packageRegistry:p,shebang:h}),{customData:this.customData}}async transformPnpSettings(e){}isEsmEnabled(){if(this.opts.project.configuration.sources.has("pnpEnableEsmLoader"))return this.opts.project.configuration.get("pnpEnableEsmLoader");if(this.isESMLoaderRequired)return!0;for(let e of this.opts.project.workspaces)if(e.manifest.type==="module")return!0;return!1}async finalizeInstallWithPnp(e){let r=b0(this.opts.project),o=await this.locateNodeModules(e.ignorePattern);if(o.length>0){this.opts.report.reportWarning(31,"One or more node_modules have been detected and will be removed. This operation may take some time.");for(let n of o)await oe.removePromise(n)}if(await this.transformPnpSettings(e),this.opts.project.configuration.get("pnpEnableInlining")){let n=SIe(e);await oe.changeFilePromise(r.cjs,n,{automaticNewlines:!0,mode:493}),await oe.removePromise(r.data)}else{let{dataFile:n,loaderFile:u}=PIe(e);await oe.changeFilePromise(r.cjs,u,{automaticNewlines:!0,mode:493}),await oe.changeFilePromise(r.data,n,{automaticNewlines:!0,mode:420})}this.isEsmEnabled()&&(this.opts.report.reportWarning(0,"ESM support for PnP uses the experimental loader API and is therefore experimental"),await oe.changeFilePromise(r.esmLoader,(0,rG.default)(),{automaticNewlines:!0,mode:420}));let a=this.opts.project.configuration.get("pnpUnpluggedFolder");if(this.unpluggedPaths.size===0)await oe.removePromise(a);else for(let n of await oe.readdirPromise(a)){let u=V.resolve(a,n);this.unpluggedPaths.has(u)||await oe.removePromise(u)}}async locateNodeModules(e){let r=[],o=e?new RegExp(e):null;for(let a of this.opts.project.workspaces){let n=V.join(a.cwd,"node_modules");if(o&&o.test(V.relative(this.opts.project.cwd,a.cwd))||!oe.existsSync(n))continue;let u=await oe.readdirPromise(n,{withFileTypes:!0}),A=u.filter(p=>!p.isDirectory()||p.name===".bin"||!p.name.startsWith("."));if(A.length===u.length)r.push(n);else for(let p of A)r.push(V.join(n,p.name))}return r}async unplugPackageIfNeeded(e,r,o,a,n){return this.shouldBeUnplugged(e,r,a)?this.unplugPackage(e,o,n):o.packageFs}shouldBeUnplugged(e,r,o){return typeof o.unplugged<"u"?o.unplugged:GIt.has(e.identHash)||e.conditions!=null?!0:r.manifest.preferUnplugged!==null?r.manifest.preferUnplugged:!!(IQ(e,r,o,{configuration:this.opts.project.configuration})?.skipped===!1||r.misc.extractHint)}async unplugPackage(e,r,o){let a=ov(e,{configuration:this.opts.project.configuration});return this.opts.project.disabledLocators.has(e.locatorHash)?new Uu(a,{baseFs:r.packageFs,pathUtils:V}):(this.unpluggedPaths.add(a),o.holdFetchResult(this.asyncActions.set(e.locatorHash,async()=>{let n=V.join(a,r.prefixPath,".ready");await oe.existsPromise(n)||(this.opts.project.storedBuildState.delete(e.locatorHash),await oe.mkdirPromise(a,{recursive:!0}),await oe.copyPromise(a,Bt.dot,{baseFs:r.packageFs,overwrite:!1}),await oe.writeFilePromise(n,""))})),new gn(a))}getPackageInformation(e){let r=W.stringifyIdent(e),o=e.reference,a=this.packageRegistry.get(r);if(!a)throw new Error(`Assertion failed: The package information store should have been available (for ${W.prettyIdent(this.opts.project.configuration,e)})`);let n=a.get(o);if(!n)throw new Error(`Assertion failed: The package information should have been available (for ${W.prettyLocator(this.opts.project.configuration,e)})`);return n}getDiskInformation(e){let r=_e.getMapWithDefault(this.packageRegistry,"@@disk"),o=sG(this.opts.project.cwd,e);return _e.getFactoryWithDefault(r,o,()=>({packageLocation:o,packageDependencies:new Map,packagePeers:new Set,linkType:"SOFT",discardFromLookup:!1}))}};function sG(t,e){let r=V.relative(t,e);return r.match(/^\.{0,2}\//)||(r=`./${r}`),r.replace(/\/?$/,"/")}async function qIt(t){let e=await Ot.tryFind(t.prefixPath,{baseFs:t.packageFs})??new Ot,r=new Set(["preinstall","install","postinstall"]);for(let o of e.scripts.keys())r.has(o)||e.scripts.delete(o);return{manifest:{scripts:e.scripts,preferUnplugged:e.preferUnplugged,type:e.type},misc:{extractHint:nG(t),hasBindingGyp:iG(t)}}}Ye();Ye();jt();var e1e=$e(Zo());var x0=class extends ut{constructor(){super(...arguments);this.all=ge.Boolean("-A,--all",!1,{description:"Unplug direct dependencies from the entire project"});this.recursive=ge.Boolean("-R,--recursive",!1,{description:"Unplug both direct and transitive dependencies"});this.json=ge.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.patterns=ge.Rest()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd),n=await Lr.find(r);if(!a)throw new rr(o.cwd,this.context.cwd);if(r.get("nodeLinker")!=="pnp")throw new it("This command can only be used if the `nodeLinker` option is set to `pnp`");await o.restoreInstallState();let u=new Set(this.patterns),A=this.patterns.map(x=>{let C=W.parseDescriptor(x),R=C.range!=="unknown"?C:W.makeDescriptor(C,"*");if(!kr.validRange(R.range))throw new it(`The range of the descriptor patterns must be a valid semver range (${W.prettyDescriptor(r,R)})`);return L=>{let U=W.stringifyIdent(L);return!e1e.default.isMatch(U,W.stringifyIdent(R))||L.version&&!kr.satisfiesWithPrereleases(L.version,R.range)?!1:(u.delete(x),!0)}}),p=()=>{let x=[];for(let C of o.storedPackages.values())!o.tryWorkspaceByLocator(C)&&!W.isVirtualLocator(C)&&A.some(R=>R(C))&&x.push(C);return x},h=x=>{let C=new Set,R=[],L=(U,J)=>{if(C.has(U.locatorHash))return;let te=!!o.tryWorkspaceByLocator(U);if(!(J>0&&!this.recursive&&te)&&(C.add(U.locatorHash),!o.tryWorkspaceByLocator(U)&&A.some(ae=>ae(U))&&R.push(U),!(J>0&&!this.recursive)))for(let ae of U.dependencies.values()){let fe=o.storedResolutions.get(ae.descriptorHash);if(!fe)throw new Error("Assertion failed: The resolution should have been registered");let ce=o.storedPackages.get(fe);if(!ce)throw new Error("Assertion failed: The package should have been registered");L(ce,J+1)}};for(let U of x)L(U.anchoredPackage,0);return R},E,I;if(this.all&&this.recursive?(E=p(),I="the project"):this.all?(E=h(o.workspaces),I="any workspace"):(E=h([a]),I="this workspace"),u.size>1)throw new it(`Patterns ${de.prettyList(r,u,de.Type.CODE)} don't match any packages referenced by ${I}`);if(u.size>0)throw new it(`Pattern ${de.prettyList(r,u,de.Type.CODE)} doesn't match any packages referenced by ${I}`);E=_e.sortMap(E,x=>W.stringifyLocator(x));let v=await Nt.start({configuration:r,stdout:this.context.stdout,json:this.json},async x=>{for(let C of E){let R=C.version??"unknown",L=o.topLevelWorkspace.manifest.ensureDependencyMeta(W.makeDescriptor(C,R));L.unplugged=!0,x.reportInfo(0,`Will unpack ${W.prettyLocator(r,C)} to ${de.pretty(r,ov(C,{configuration:r}),de.Type.PATH)}`),x.reportJson({locator:W.stringifyLocator(C),version:R})}await o.topLevelWorkspace.persistManifest(),this.json||x.reportSeparator()});return v.hasErrors()?v.exitCode():await o.installWithNewReport({json:this.json,stdout:this.context.stdout},{cache:n})}};x0.paths=[["unplug"]],x0.usage=nt.Usage({description:"force the unpacking of a list of packages",details:"\n      This command will add the selectors matching the specified patterns to the list of packages that must be unplugged when installed.\n\n      A package being unplugged means that instead of being referenced directly through its archive, it will be unpacked at install time in the directory configured via `pnpUnpluggedFolder`. Note that unpacking packages this way is generally not recommended because it'll make it harder to store your packages within the repository. However, it's a good approach to quickly and safely debug some packages, and can even sometimes be required depending on the context (for example when the package contains shellscripts).\n\n      Running the command will set a persistent flag inside your top-level `package.json`, in the `dependenciesMeta` field. As such, to undo its effects, you'll need to revert the changes made to the manifest and run `yarn install` to apply the modification.\n\n      By default, only direct dependencies from the current workspace are affected. If `-A,--all` is set, direct dependencies from the entire project are affected. Using the `-R,--recursive` flag will affect transitive dependencies as well as direct ones.\n\n      This command accepts glob patterns inside the scope and name components (not the range). Make sure to escape the patterns to prevent your own shell from trying to expand them.\n    ",examples:[["Unplug the lodash dependency from the active workspace","yarn unplug lodash"],["Unplug all instances of lodash referenced by any workspace","yarn unplug lodash -A"],["Unplug all instances of lodash referenced by the active workspace and its dependencies","yarn unplug lodash -R"],["Unplug all instances of lodash, anywhere","yarn unplug lodash -AR"],["Unplug one specific version of lodash","yarn unplug lodash@1.2.3"],["Unplug all packages with the `@babel` scope","yarn unplug '@babel/*'"],["Unplug all packages (only for testing, not recommended)","yarn unplug -R '*'"]]});var b0=t=>({cjs:V.join(t.cwd,dr.pnpCjs),data:V.join(t.cwd,dr.pnpData),esmLoader:V.join(t.cwd,dr.pnpEsmLoader)}),r1e=t=>/\s/.test(t)?JSON.stringify(t):t;async function YIt(t,e,r){let o=/\s*--require\s+\S*\.pnp\.c?js\s*/g,a=/\s*--experimental-loader\s+\S*\.pnp\.loader\.mjs\s*/,n=(e.NODE_OPTIONS??"").replace(o," ").replace(a," ").trim();if(t.configuration.get("nodeLinker")!=="pnp"){e.NODE_OPTIONS=n;return}let u=b0(t),A=`--require ${r1e(ue.fromPortablePath(u.cjs))}`;oe.existsSync(u.esmLoader)&&(A=`${A} --experimental-loader ${(0,t1e.pathToFileURL)(ue.fromPortablePath(u.esmLoader)).href}`),oe.existsSync(u.cjs)&&(e.NODE_OPTIONS=n?`${A} ${n}`:A)}async function WIt(t,e){let r=b0(t);e(r.cjs),e(r.data),e(r.esmLoader),e(t.configuration.get("pnpUnpluggedFolder"))}var KIt={hooks:{populateYarnPaths:WIt,setupScriptEnvironment:YIt},configuration:{nodeLinker:{description:'The linker used for installing Node packages, one of: "pnp", "pnpm", or "node-modules"',type:"STRING",default:"pnp"},winLinkType:{description:"Whether Yarn should use Windows Junctions or symlinks when creating links on Windows.",type:"STRING",values:["junctions","symlinks"],default:"junctions"},pnpMode:{description:"If 'strict', generates standard PnP maps. If 'loose', merges them with the n_m resolution.",type:"STRING",default:"strict"},pnpShebang:{description:"String to prepend to the generated PnP script",type:"STRING",default:"#!/usr/bin/env node"},pnpIgnorePatterns:{description:"Array of glob patterns; files matching them will use the classic resolution",type:"STRING",default:[],isArray:!0},pnpEnableEsmLoader:{description:"If true, Yarn will generate an ESM loader (`.pnp.loader.mjs`). If this is not explicitly set Yarn tries to automatically detect whether ESM support is required.",type:"BOOLEAN",default:!1},pnpEnableInlining:{description:"If true, the PnP data will be inlined along with the generated loader",type:"BOOLEAN",default:!0},pnpFallbackMode:{description:"If true, the generated PnP loader will follow the top-level fallback rule",type:"STRING",default:"dependencies-only"},pnpUnpluggedFolder:{description:"Folder where the unplugged packages must be stored",type:"ABSOLUTE_PATH",default:"./.yarn/unplugged"}},linkers:[P0],commands:[x0]},VIt=KIt;var u1e=$e(a1e());jt();var pG=$e(ve("crypto")),A1e=$e(ve("fs")),f1e=1,Si="node_modules",BQ=".bin",p1e=".yarn-state.yml",A1t=1e3,hG=(o=>(o.CLASSIC="classic",o.HARDLINKS_LOCAL="hardlinks-local",o.HARDLINKS_GLOBAL="hardlinks-global",o))(hG||{}),lv=class{constructor(){this.installStateCache=new Map}getCustomDataKey(){return JSON.stringify({name:"NodeModulesLinker",version:3})}supportsPackage(e,r){return this.isEnabled(r)}async findPackageLocation(e,r){if(!this.isEnabled(r))throw new Error("Assertion failed: Expected the node-modules linker to be enabled");let o=r.project.tryWorkspaceByLocator(e);if(o)return o.cwd;let a=await _e.getFactoryWithDefault(this.installStateCache,r.project.cwd,async()=>await fG(r.project,{unrollAliases:!0}));if(a===null)throw new it("Couldn't find the node_modules state file - running an install might help (findPackageLocation)");let n=a.locatorMap.get(W.stringifyLocator(e));if(!n){let p=new it(`Couldn't find ${W.prettyLocator(r.project.configuration,e)} in the currently installed node_modules map - running an install might help`);throw p.code="LOCATOR_NOT_INSTALLED",p}let u=n.locations.sort((p,h)=>p.split(V.sep).length-h.split(V.sep).length),A=V.join(r.project.configuration.startingCwd,Si);return u.find(p=>V.contains(A,p))||n.locations[0]}async findPackageLocator(e,r){if(!this.isEnabled(r))return null;let o=await _e.getFactoryWithDefault(this.installStateCache,r.project.cwd,async()=>await fG(r.project,{unrollAliases:!0}));if(o===null)return null;let{locationRoot:a,segments:n}=vQ(V.resolve(e),{skipPrefix:r.project.cwd}),u=o.locationTree.get(a);if(!u)return null;let A=u.locator;for(let p of n){if(u=u.children.get(p),!u)break;A=u.locator||A}return W.parseLocator(A)}makeInstaller(e){return new AG(e)}isEnabled(e){return e.project.configuration.get("nodeLinker")==="node-modules"}},AG=class{constructor(e){this.opts=e;this.localStore=new Map;this.realLocatorChecksums=new Map;this.customData={store:new Map}}attachCustomData(e){this.customData=e}async installPackage(e,r){let o=V.resolve(r.packageFs.getRealPath(),r.prefixPath),a=this.customData.store.get(e.locatorHash);if(typeof a>"u"&&(a=await f1t(e,r),e.linkType==="HARD"&&this.customData.store.set(e.locatorHash,a)),!W.isPackageCompatible(e,this.opts.project.configuration.getSupportedArchitectures()))return{packageLocation:null,buildRequest:null};let n=new Map,u=new Set;n.has(W.stringifyIdent(e))||n.set(W.stringifyIdent(e),e.reference);let A=e;if(W.isVirtualLocator(e)){A=W.devirtualizeLocator(e);for(let E of e.peerDependencies.values())n.set(W.stringifyIdent(E),null),u.add(W.stringifyIdent(E))}let p={packageLocation:`${ue.fromPortablePath(o)}/`,packageDependencies:n,packagePeers:u,linkType:e.linkType,discardFromLookup:r.discardFromLookup??!1};this.localStore.set(e.locatorHash,{pkg:e,customPackageData:a,dependencyMeta:this.opts.project.getDependencyMeta(e,e.version),pnpNode:p});let h=r.checksum?r.checksum.substring(r.checksum.indexOf("/")+1):null;return this.realLocatorChecksums.set(A.locatorHash,h),{packageLocation:o,buildRequest:null}}async attachInternalDependencies(e,r){let o=this.localStore.get(e.locatorHash);if(typeof o>"u")throw new Error("Assertion failed: Expected information object to have been registered");for(let[a,n]of r){let u=W.areIdentsEqual(a,n)?n.reference:[W.stringifyIdent(n),n.reference];o.pnpNode.packageDependencies.set(W.stringifyIdent(a),u)}}async attachExternalDependents(e,r){throw new Error("External dependencies haven't been implemented for the node-modules linker")}async finalizeInstall(){if(this.opts.project.configuration.get("nodeLinker")!=="node-modules")return;let e=new mi({baseFs:new Jl({maxOpenFiles:80,readOnlyArchives:!0})}),r=await fG(this.opts.project),o=this.opts.project.configuration.get("nmMode");(r===null||o!==r.nmMode)&&(this.opts.project.storedBuildState.clear(),r={locatorMap:new Map,binSymlinks:new Map,locationTree:new Map,nmMode:o,mtimeMs:0});let a=new Map(this.opts.project.workspaces.map(v=>{let x=this.opts.project.configuration.get("nmHoistingLimits");try{x=_e.validateEnum(JB,v.manifest.installConfig?.hoistingLimits??x)}catch{let R=W.prettyWorkspace(this.opts.project.configuration,v);this.opts.report.reportWarning(57,`${R}: Invalid 'installConfig.hoistingLimits' value. Expected one of ${Object.values(JB).join(", ")}, using default: "${x}"`)}return[v.relativeCwd,x]})),n=new Map(this.opts.project.workspaces.map(v=>{let x=this.opts.project.configuration.get("nmSelfReferences");return x=v.manifest.installConfig?.selfReferences??x,[v.relativeCwd,x]})),u={VERSIONS:{std:1},topLevel:{name:null,reference:null},getLocator:(v,x)=>Array.isArray(x)?{name:x[0],reference:x[1]}:{name:v,reference:x},getDependencyTreeRoots:()=>this.opts.project.workspaces.map(v=>{let x=v.anchoredLocator;return{name:W.stringifyIdent(x),reference:x.reference}}),getPackageInformation:v=>{let x=v.reference===null?this.opts.project.topLevelWorkspace.anchoredLocator:W.makeLocator(W.parseIdent(v.name),v.reference),C=this.localStore.get(x.locatorHash);if(typeof C>"u")throw new Error("Assertion failed: Expected the package reference to have been registered");return C.pnpNode},findPackageLocator:v=>{let x=this.opts.project.tryWorkspaceByCwd(ue.toPortablePath(v));if(x!==null){let C=x.anchoredLocator;return{name:W.stringifyIdent(C),reference:C.reference}}throw new Error("Assertion failed: Unimplemented")},resolveToUnqualified:()=>{throw new Error("Assertion failed: Unimplemented")},resolveUnqualified:()=>{throw new Error("Assertion failed: Unimplemented")},resolveRequest:()=>{throw new Error("Assertion failed: Unimplemented")},resolveVirtual:v=>ue.fromPortablePath(mi.resolveVirtual(ue.toPortablePath(v)))},{tree:A,errors:p,preserveSymlinksRequired:h}=zB(u,{pnpifyFs:!1,validateExternalSoftLinks:!0,hoistingLimitsByCwd:a,project:this.opts.project,selfReferencesByCwd:n});if(!A){for(let{messageName:v,text:x}of p)this.opts.report.reportError(v,x);return}let E=Hj(A);await y1t(r,E,{baseFs:e,project:this.opts.project,report:this.opts.report,realLocatorChecksums:this.realLocatorChecksums,loadManifest:async v=>{let x=W.parseLocator(v),C=this.localStore.get(x.locatorHash);if(typeof C>"u")throw new Error("Assertion failed: Expected the slot to exist");return C.customPackageData.manifest}});let I=[];for(let[v,x]of E.entries()){if(m1e(v))continue;let C=W.parseLocator(v),R=this.localStore.get(C.locatorHash);if(typeof R>"u")throw new Error("Assertion failed: Expected the slot to exist");if(this.opts.project.tryWorkspaceByLocator(R.pkg))continue;let L=yA.extractBuildRequest(R.pkg,R.customPackageData,R.dependencyMeta,{configuration:this.opts.project.configuration});!L||I.push({buildLocations:x.locations,locator:C,buildRequest:L})}return h&&this.opts.report.reportWarning(72,`The application uses portals and that's why ${de.pretty(this.opts.project.configuration,"--preserve-symlinks",de.Type.CODE)} Node option is required for launching it`),{customData:this.customData,records:I}}};async function f1t(t,e){let r=await Ot.tryFind(e.prefixPath,{baseFs:e.packageFs})??new Ot,o=new Set(["preinstall","install","postinstall"]);for(let a of r.scripts.keys())o.has(a)||r.scripts.delete(a);return{manifest:{bin:r.bin,scripts:r.scripts},misc:{hasBindingGyp:yA.hasBindingGyp(e)}}}async function p1t(t,e,r,o,{installChangedByUser:a}){let n="";n+=`# Warning: This file is automatically generated. Removing it is fine, but will
+`,n+=`# cause your node_modules installation to become invalidated.
+`,n+=`
+`,n+=`__metadata:
+`,n+=`  version: ${f1e}
+`,n+=`  nmMode: ${o.value}
+`;let u=Array.from(e.keys()).sort(),A=W.stringifyLocator(t.topLevelWorkspace.anchoredLocator);for(let E of u){let I=e.get(E);n+=`
+`,n+=`${JSON.stringify(E)}:
+`,n+=`  locations:
+`;for(let v of I.locations){let x=V.contains(t.cwd,v);if(x===null)throw new Error(`Assertion failed: Expected the path to be within the project (${v})`);n+=`    - ${JSON.stringify(x)}
+`}if(I.aliases.length>0){n+=`  aliases:
+`;for(let v of I.aliases)n+=`    - ${JSON.stringify(v)}
+`}if(E===A&&r.size>0){n+=`  bin:
+`;for(let[v,x]of r){let C=V.contains(t.cwd,v);if(C===null)throw new Error(`Assertion failed: Expected the path to be within the project (${v})`);n+=`    ${JSON.stringify(C)}:
+`;for(let[R,L]of x){let U=V.relative(V.join(v,Si),L);n+=`      ${JSON.stringify(R)}: ${JSON.stringify(U)}
+`}}}}let p=t.cwd,h=V.join(p,Si,p1e);a&&await oe.removePromise(h),await oe.changeFilePromise(h,n,{automaticNewlines:!0})}async function fG(t,{unrollAliases:e=!1}={}){let r=t.cwd,o=V.join(r,Si,p1e),a;try{a=await oe.statPromise(o)}catch{}if(!a)return null;let n=Ki(await oe.readFilePromise(o,"utf8"));if(n.__metadata.version>f1e)return null;let u=n.__metadata.nmMode||"classic",A=new Map,p=new Map;delete n.__metadata;for(let[h,E]of Object.entries(n)){let I=E.locations.map(x=>V.join(r,x)),v=E.bin;if(v)for(let[x,C]of Object.entries(v)){let R=V.join(r,ue.toPortablePath(x)),L=_e.getMapWithDefault(p,R);for(let[U,J]of Object.entries(C))L.set(U,ue.toPortablePath([R,Si,J].join(V.sep)))}if(A.set(h,{target:Bt.dot,linkType:"HARD",locations:I,aliases:E.aliases||[]}),e&&E.aliases)for(let x of E.aliases){let{scope:C,name:R}=W.parseLocator(h),L=W.makeLocator(W.makeIdent(C,R),x),U=W.stringifyLocator(L);A.set(U,{target:Bt.dot,linkType:"HARD",locations:I,aliases:[]})}}return{locatorMap:A,binSymlinks:p,locationTree:h1e(A,{skipPrefix:t.cwd}),nmMode:u,mtimeMs:a.mtimeMs}}var WC=async(t,e)=>{if(t.split(V.sep).indexOf(Si)<0)throw new Error(`Assertion failed: trying to remove dir that doesn't contain node_modules: ${t}`);try{if(!e.innerLoop){let o=e.allowSymlink?await oe.statPromise(t):await oe.lstatPromise(t);if(e.allowSymlink&&!o.isDirectory()||!e.allowSymlink&&o.isSymbolicLink()){await oe.unlinkPromise(t);return}}let r=await oe.readdirPromise(t,{withFileTypes:!0});for(let o of r){let a=V.join(t,o.name);o.isDirectory()?(o.name!==Si||e&&e.innerLoop)&&await WC(a,{innerLoop:!0,contentsOnly:!1}):await oe.unlinkPromise(a)}e.contentsOnly||await oe.rmdirPromise(t)}catch(r){if(r.code!=="ENOENT"&&r.code!=="ENOTEMPTY")throw r}},l1e=4,vQ=(t,{skipPrefix:e})=>{let r=V.contains(e,t);if(r===null)throw new Error(`Assertion failed: Writing attempt prevented to ${t} which is outside project root: ${e}`);let o=r.split(V.sep).filter(p=>p!==""),a=o.indexOf(Si),n=o.slice(0,a).join(V.sep),u=V.join(e,n),A=o.slice(a);return{locationRoot:u,segments:A}},h1e=(t,{skipPrefix:e})=>{let r=new Map;if(t===null)return r;let o=()=>({children:new Map,linkType:"HARD"});for(let[a,n]of t.entries()){if(n.linkType==="SOFT"&&V.contains(e,n.target)!==null){let A=_e.getFactoryWithDefault(r,n.target,o);A.locator=a,A.linkType=n.linkType}for(let u of n.locations){let{locationRoot:A,segments:p}=vQ(u,{skipPrefix:e}),h=_e.getFactoryWithDefault(r,A,o);for(let E=0;E<p.length;++E){let I=p[E];if(I!=="."){let v=_e.getFactoryWithDefault(h.children,I,o);h.children.set(I,v),h=v}E===p.length-1&&(h.locator=a,h.linkType=n.linkType)}}}return r},gG=async(t,e,r)=>{if(process.platform==="win32"&&r==="junctions"){let o;try{o=await oe.lstatPromise(t)}catch{}if(!o||o.isDirectory()){await oe.symlinkPromise(t,e,"junction");return}}await oe.symlinkPromise(V.relative(V.dirname(e),t),e)};async function g1e(t,e,r){let o=V.join(t,`${pG.default.randomBytes(16).toString("hex")}.tmp`);try{await oe.writeFilePromise(o,r);try{await oe.linkPromise(o,e)}catch{}}finally{await oe.unlinkPromise(o)}}async function h1t({srcPath:t,dstPath:e,entry:r,globalHardlinksStore:o,baseFs:a,nmMode:n}){if(r.kind===d1e.FILE){if(n.value==="hardlinks-global"&&o&&r.digest){let A=V.join(o,r.digest.substring(0,2),`${r.digest.substring(2)}.dat`),p;try{let h=await oe.statPromise(A);if(h&&(!r.mtimeMs||h.mtimeMs>r.mtimeMs||h.mtimeMs<r.mtimeMs-A1t))if(await wn.checksumFile(A,{baseFs:oe,algorithm:"sha1"})!==r.digest){let I=V.join(o,`${pG.default.randomBytes(16).toString("hex")}.tmp`);await oe.renamePromise(A,I);let v=await a.readFilePromise(t);await oe.writeFilePromise(I,v);try{await oe.linkPromise(I,A),r.mtimeMs=new Date().getTime(),await oe.unlinkPromise(I)}catch{}}else r.mtimeMs||(r.mtimeMs=Math.ceil(h.mtimeMs));await oe.linkPromise(A,e),p=!0}catch{p=!1}if(!p){let h=await a.readFilePromise(t);await g1e(o,A,h),r.mtimeMs=new Date().getTime();try{await oe.linkPromise(A,e)}catch(E){E&&E.code&&E.code=="EXDEV"&&(n.value="hardlinks-local",await a.copyFilePromise(t,e))}}}else await a.copyFilePromise(t,e);let u=r.mode&511;u!==420&&await oe.chmodPromise(e,u)}}var d1e=(o=>(o.FILE="file",o.DIRECTORY="directory",o.SYMLINK="symlink",o))(d1e||{}),g1t=async(t,e,{baseFs:r,globalHardlinksStore:o,nmMode:a,windowsLinkType:n,packageChecksum:u})=>{await oe.mkdirPromise(t,{recursive:!0});let A=async(E=Bt.dot)=>{let I=V.join(e,E),v=await r.readdirPromise(I,{withFileTypes:!0}),x=new Map;for(let C of v){let R=V.join(E,C.name),L,U=V.join(I,C.name);if(C.isFile()){if(L={kind:"file",mode:(await r.lstatPromise(U)).mode},a.value==="hardlinks-global"){let J=await wn.checksumFile(U,{baseFs:r,algorithm:"sha1"});L.digest=J}}else if(C.isDirectory())L={kind:"directory"};else if(C.isSymbolicLink())L={kind:"symlink",symlinkTo:await r.readlinkPromise(U)};else throw new Error(`Unsupported file type (file: ${U}, mode: 0o${await r.statSync(U).mode.toString(8).padStart(6,"0")})`);if(x.set(R,L),C.isDirectory()&&R!==Si){let J=await A(R);for(let[te,ae]of J)x.set(te,ae)}}return x},p;if(a.value==="hardlinks-global"&&o&&u){let E=V.join(o,u.substring(0,2),`${u.substring(2)}.json`);try{p=new Map(Object.entries(JSON.parse(await oe.readFilePromise(E,"utf8"))))}catch{p=await A()}}else p=await A();let h=!1;for(let[E,I]of p){let v=V.join(e,E),x=V.join(t,E);if(I.kind==="directory")await oe.mkdirPromise(x,{recursive:!0});else if(I.kind==="file"){let C=I.mtimeMs;await h1t({srcPath:v,dstPath:x,entry:I,nmMode:a,baseFs:r,globalHardlinksStore:o}),I.mtimeMs!==C&&(h=!0)}else I.kind==="symlink"&&await gG(V.resolve(V.dirname(x),I.symlinkTo),x,n)}if(a.value==="hardlinks-global"&&o&&h&&u){let E=V.join(o,u.substring(0,2),`${u.substring(2)}.json`);await oe.removePromise(E),await g1e(o,E,Buffer.from(JSON.stringify(Object.fromEntries(p))))}};function d1t(t,e,r,o){let a=new Map,n=new Map,u=new Map,A=!1,p=(h,E,I,v,x)=>{let C=!0,R=V.join(h,E),L=new Set;if(E===Si||E.startsWith("@")){let J;try{J=oe.statSync(R)}catch{}C=!!J,J?J.mtimeMs>r?(A=!0,L=new Set(oe.readdirSync(R))):L=new Set(I.children.get(E).children.keys()):A=!0;let te=e.get(h);if(te){let ae=V.join(h,Si,BQ),fe;try{fe=oe.statSync(ae)}catch{}if(!fe)A=!0;else if(fe.mtimeMs>r){A=!0;let ce=new Set(oe.readdirSync(ae)),me=new Map;n.set(h,me);for(let[he,Be]of te)ce.has(he)&&me.set(he,Be)}else n.set(h,te)}}else C=x.has(E);let U=I.children.get(E);if(C){let{linkType:J,locator:te}=U,ae={children:new Map,linkType:J,locator:te};if(v.children.set(E,ae),te){let fe=_e.getSetWithDefault(u,te);fe.add(R),u.set(te,fe)}for(let fe of U.children.keys())p(R,fe,U,ae,L)}else U.locator&&o.storedBuildState.delete(W.parseLocator(U.locator).locatorHash)};for(let[h,E]of t){let{linkType:I,locator:v}=E,x={children:new Map,linkType:I,locator:v};if(a.set(h,x),v){let C=_e.getSetWithDefault(u,E.locator);C.add(h),u.set(E.locator,C)}E.children.has(Si)&&p(h,Si,E,x,new Set)}return{locationTree:a,binSymlinks:n,locatorLocations:u,installChangedByUser:A}}function m1e(t){let e=W.parseDescriptor(t);return W.isVirtualDescriptor(e)&&(e=W.devirtualizeDescriptor(e)),e.range.startsWith("link:")}async function m1t(t,e,r,{loadManifest:o}){let a=new Map;for(let[A,{locations:p}]of t){let h=m1e(A)?null:await o(A,p[0]),E=new Map;if(h)for(let[I,v]of h.bin){let x=V.join(p[0],v);v!==""&&oe.existsSync(x)&&E.set(I,v)}a.set(A,E)}let n=new Map,u=(A,p,h)=>{let E=new Map,I=V.contains(r,A);if(h.locator&&I!==null){let v=a.get(h.locator);for(let[x,C]of v){let R=V.join(A,ue.toPortablePath(C));E.set(x,R)}for(let[x,C]of h.children){let R=V.join(A,x),L=u(R,R,C);L.size>0&&n.set(A,new Map([...n.get(A)||new Map,...L]))}}else for(let[v,x]of h.children){let C=u(V.join(A,v),p,x);for(let[R,L]of C)E.set(R,L)}return E};for(let[A,p]of e){let h=u(A,A,p);h.size>0&&n.set(A,new Map([...n.get(A)||new Map,...h]))}return n}var c1e=(t,e)=>{if(!t||!e)return t===e;let r=W.parseLocator(t);W.isVirtualLocator(r)&&(r=W.devirtualizeLocator(r));let o=W.parseLocator(e);return W.isVirtualLocator(o)&&(o=W.devirtualizeLocator(o)),W.areLocatorsEqual(r,o)};function dG(t){return V.join(t.get("globalFolder"),"store")}async function y1t(t,e,{baseFs:r,project:o,report:a,loadManifest:n,realLocatorChecksums:u}){let A=V.join(o.cwd,Si),{locationTree:p,binSymlinks:h,locatorLocations:E,installChangedByUser:I}=d1t(t.locationTree,t.binSymlinks,t.mtimeMs,o),v=h1e(e,{skipPrefix:o.cwd}),x=[],C=async({srcDir:Be,dstDir:we,linkType:g,globalHardlinksStore:Ee,nmMode:Se,windowsLinkType:le,packageChecksum:ne})=>{let ee=(async()=>{try{g==="SOFT"?(await oe.mkdirPromise(V.dirname(we),{recursive:!0}),await gG(V.resolve(Be),we,le)):await g1t(we,Be,{baseFs:r,globalHardlinksStore:Ee,nmMode:Se,windowsLinkType:le,packageChecksum:ne})}catch(Ie){throw Ie.message=`While persisting ${Be} -> ${we} ${Ie.message}`,Ie}finally{ae.tick()}})().then(()=>x.splice(x.indexOf(ee),1));x.push(ee),x.length>l1e&&await Promise.race(x)},R=async(Be,we,g)=>{let Ee=(async()=>{let Se=async(le,ne,ee)=>{try{ee.innerLoop||await oe.mkdirPromise(ne,{recursive:!0});let Ie=await oe.readdirPromise(le,{withFileTypes:!0});for(let Fe of Ie){if(!ee.innerLoop&&Fe.name===BQ)continue;let At=V.join(le,Fe.name),H=V.join(ne,Fe.name);Fe.isDirectory()?(Fe.name!==Si||ee&&ee.innerLoop)&&(await oe.mkdirPromise(H,{recursive:!0}),await Se(At,H,{...ee,innerLoop:!0})):me.value==="hardlinks-local"||me.value==="hardlinks-global"?await oe.linkPromise(At,H):await oe.copyFilePromise(At,H,A1e.default.constants.COPYFILE_FICLONE)}}catch(Ie){throw ee.innerLoop||(Ie.message=`While cloning ${le} -> ${ne} ${Ie.message}`),Ie}finally{ee.innerLoop||ae.tick()}};await Se(Be,we,g)})().then(()=>x.splice(x.indexOf(Ee),1));x.push(Ee),x.length>l1e&&await Promise.race(x)},L=async(Be,we,g)=>{if(g)for(let[Ee,Se]of we.children){let le=g.children.get(Ee);await L(V.join(Be,Ee),Se,le)}else{we.children.has(Si)&&await WC(V.join(Be,Si),{contentsOnly:!1});let Ee=V.basename(Be)===Si&&v.has(V.join(V.dirname(Be),V.sep));await WC(Be,{contentsOnly:Be===A,allowSymlink:Ee})}};for(let[Be,we]of p){let g=v.get(Be);for(let[Ee,Se]of we.children){if(Ee===".")continue;let le=g&&g.children.get(Ee),ne=V.join(Be,Ee);await L(ne,Se,le)}}let U=async(Be,we,g)=>{if(g){c1e(we.locator,g.locator)||await WC(Be,{contentsOnly:we.linkType==="HARD"});for(let[Ee,Se]of we.children){let le=g.children.get(Ee);await U(V.join(Be,Ee),Se,le)}}else{we.children.has(Si)&&await WC(V.join(Be,Si),{contentsOnly:!0});let Ee=V.basename(Be)===Si&&v.has(V.join(V.dirname(Be),V.sep));await WC(Be,{contentsOnly:we.linkType==="HARD",allowSymlink:Ee})}};for(let[Be,we]of v){let g=p.get(Be);for(let[Ee,Se]of we.children){if(Ee===".")continue;let le=g&&g.children.get(Ee);await U(V.join(Be,Ee),Se,le)}}let J=new Map,te=[];for(let[Be,we]of E)for(let g of we){let{locationRoot:Ee,segments:Se}=vQ(g,{skipPrefix:o.cwd}),le=v.get(Ee),ne=Ee;if(le){for(let ee of Se)if(ne=V.join(ne,ee),le=le.children.get(ee),!le)break;if(le){let ee=c1e(le.locator,Be),Ie=e.get(le.locator),Fe=Ie.target,At=ne,H=Ie.linkType;if(ee)J.has(Fe)||J.set(Fe,At);else if(Fe!==At){let at=W.parseLocator(le.locator);W.isVirtualLocator(at)&&(at=W.devirtualizeLocator(at)),te.push({srcDir:Fe,dstDir:At,linkType:H,realLocatorHash:at.locatorHash})}}}}for(let[Be,{locations:we}]of e.entries())for(let g of we){let{locationRoot:Ee,segments:Se}=vQ(g,{skipPrefix:o.cwd}),le=p.get(Ee),ne=v.get(Ee),ee=Ee,Ie=e.get(Be),Fe=W.parseLocator(Be);W.isVirtualLocator(Fe)&&(Fe=W.devirtualizeLocator(Fe));let At=Fe.locatorHash,H=Ie.target,at=g;if(H===at)continue;let Re=Ie.linkType;for(let ke of Se)ne=ne.children.get(ke);if(!le)te.push({srcDir:H,dstDir:at,linkType:Re,realLocatorHash:At});else for(let ke of Se)if(ee=V.join(ee,ke),le=le.children.get(ke),!le){te.push({srcDir:H,dstDir:at,linkType:Re,realLocatorHash:At});break}}let ae=Xs.progressViaCounter(te.length),fe=a.reportProgress(ae),ce=o.configuration.get("nmMode"),me={value:ce},he=o.configuration.get("winLinkType");try{let Be=me.value==="hardlinks-global"?`${dG(o.configuration)}/v1`:null;if(Be&&!await oe.existsPromise(Be)){await oe.mkdirpPromise(Be);for(let g=0;g<256;g++)await oe.mkdirPromise(V.join(Be,g.toString(16).padStart(2,"0")))}for(let g of te)(g.linkType==="SOFT"||!J.has(g.srcDir))&&(J.set(g.srcDir,g.dstDir),await C({...g,globalHardlinksStore:Be,nmMode:me,windowsLinkType:he,packageChecksum:u.get(g.realLocatorHash)||null}));await Promise.all(x),x.length=0;for(let g of te){let Ee=J.get(g.srcDir);g.linkType!=="SOFT"&&g.dstDir!==Ee&&await R(Ee,g.dstDir,{nmMode:me})}await Promise.all(x),await oe.mkdirPromise(A,{recursive:!0});let we=await m1t(e,v,o.cwd,{loadManifest:n});await E1t(h,we,o.cwd,he),await p1t(o,e,we,me,{installChangedByUser:I}),ce=="hardlinks-global"&&me.value=="hardlinks-local"&&a.reportWarningOnce(74,"'nmMode' has been downgraded to 'hardlinks-local' due to global cache and install folder being on different devices")}finally{fe.stop()}}async function E1t(t,e,r,o){for(let a of t.keys()){if(V.contains(r,a)===null)throw new Error(`Assertion failed. Excepted bin symlink location to be inside project dir, instead it was at ${a}`);if(!e.has(a)){let n=V.join(a,Si,BQ);await oe.removePromise(n)}}for(let[a,n]of e){if(V.contains(r,a)===null)throw new Error(`Assertion failed. Excepted bin symlink location to be inside project dir, instead it was at ${a}`);let u=V.join(a,Si,BQ),A=t.get(a)||new Map;await oe.mkdirPromise(u,{recursive:!0});for(let p of A.keys())n.has(p)||(await oe.removePromise(V.join(u,p)),process.platform==="win32"&&await oe.removePromise(V.join(u,`${p}.cmd`)));for(let[p,h]of n){let E=A.get(p),I=V.join(u,p);E!==h&&(process.platform==="win32"?await(0,u1e.default)(ue.fromPortablePath(h),ue.fromPortablePath(I),{createPwshFile:!1}):(await oe.removePromise(I),await gG(h,I,o),V.contains(r,await oe.realpathPromise(h))!==null&&await oe.chmodPromise(h,493)))}}}Ye();St();nA();var cv=class extends P0{constructor(){super(...arguments);this.mode="loose"}makeInstaller(r){return new mG(r)}},mG=class extends mm{constructor(){super(...arguments);this.mode="loose"}async transformPnpSettings(r){let o=new mi({baseFs:new Jl({maxOpenFiles:80,readOnlyArchives:!0})}),a=zIe(r,this.opts.project.cwd,o),{tree:n,errors:u}=zB(a,{pnpifyFs:!1,project:this.opts.project});if(!n){for(let{messageName:I,text:v}of u)this.opts.report.reportError(I,v);return}let A=new Map;r.fallbackPool=A;let p=(I,v)=>{let x=W.parseLocator(v.locator),C=W.stringifyIdent(x);C===I?A.set(I,x.reference):A.set(I,[C,x.reference])},h=V.join(this.opts.project.cwd,dr.nodeModules),E=n.get(h);if(!(typeof E>"u")){if("target"in E)throw new Error("Assertion failed: Expected the root junction point to be a directory");for(let I of E.dirList){let v=V.join(h,I),x=n.get(v);if(typeof x>"u")throw new Error("Assertion failed: Expected the child to have been registered");if("target"in x)p(I,x);else for(let C of x.dirList){let R=V.join(v,C),L=n.get(R);if(typeof L>"u")throw new Error("Assertion failed: Expected the subchild to have been registered");if("target"in L)p(`${I}/${C}`,L);else throw new Error("Assertion failed: Expected the leaf junction to be a package")}}}}};var C1t={hooks:{cleanGlobalArtifacts:async t=>{let e=dG(t);await oe.removePromise(e)}},configuration:{nmHoistingLimits:{description:"Prevents packages to be hoisted past specific levels",type:"STRING",values:["workspaces","dependencies","none"],default:"none"},nmMode:{description:"Defines in which measure Yarn must use hardlinks and symlinks when generated `node_modules` directories.",type:"STRING",values:["classic","hardlinks-local","hardlinks-global"],default:"classic"},nmSelfReferences:{description:"Defines whether the linker should generate self-referencing symlinks for workspaces.",type:"BOOLEAN",default:!0}},linkers:[lv,cv]},w1t=C1t;var dq={};Vt(dq,{NpmHttpFetcher:()=>fv,NpmRemapResolver:()=>pv,NpmSemverFetcher:()=>dl,NpmSemverResolver:()=>hv,NpmTagResolver:()=>gv,default:()=>Lvt,npmConfigUtils:()=>Zn,npmHttpUtils:()=>Zr,npmPublishUtils:()=>ow});Ye();var D1e=$e(zn());var Wn="npm:";var Zr={};Vt(Zr,{AuthType:()=>I1e,customPackageError:()=>ym,del:()=>R1t,get:()=>Em,getIdentUrl:()=>DQ,getPackageMetadata:()=>JC,handleInvalidAuthenticationError:()=>k0,post:()=>Q1t,put:()=>F1t});Ye();Ye();St();var wG=$e(f2()),C1e=$e(D_()),w1e=$e(zn());var Zn={};Vt(Zn,{RegistryType:()=>y1e,getAuditRegistry:()=>I1t,getAuthConfiguration:()=>CG,getDefaultRegistry:()=>uv,getPublishRegistry:()=>B1t,getRegistryConfiguration:()=>E1e,getScopeConfiguration:()=>EG,getScopeRegistry:()=>KC,normalizeRegistry:()=>oc});var y1e=(o=>(o.AUDIT_REGISTRY="npmAuditRegistry",o.FETCH_REGISTRY="npmRegistryServer",o.PUBLISH_REGISTRY="npmPublishRegistry",o))(y1e||{});function oc(t){return t.replace(/\/$/,"")}function I1t({configuration:t}){return uv({configuration:t,type:"npmAuditRegistry"})}function B1t(t,{configuration:e}){return t.publishConfig?.registry?oc(t.publishConfig.registry):t.name?KC(t.name.scope,{configuration:e,type:"npmPublishRegistry"}):uv({configuration:e,type:"npmPublishRegistry"})}function KC(t,{configuration:e,type:r="npmRegistryServer"}){let o=EG(t,{configuration:e});if(o===null)return uv({configuration:e,type:r});let a=o.get(r);return a===null?uv({configuration:e,type:r}):oc(a)}function uv({configuration:t,type:e="npmRegistryServer"}){let r=t.get(e);return oc(r!==null?r:t.get("npmRegistryServer"))}function E1e(t,{configuration:e}){let r=e.get("npmRegistries"),o=oc(t),a=r.get(o);if(typeof a<"u")return a;let n=r.get(o.replace(/^[a-z]+:/,""));return typeof n<"u"?n:null}function EG(t,{configuration:e}){if(t===null)return null;let o=e.get("npmScopes").get(t);return o||null}function CG(t,{configuration:e,ident:r}){let o=r&&EG(r.scope,{configuration:e});return o?.get("npmAuthIdent")||o?.get("npmAuthToken")?o:E1e(t,{configuration:e})||e}var I1e=(a=>(a[a.NO_AUTH=0]="NO_AUTH",a[a.BEST_EFFORT=1]="BEST_EFFORT",a[a.CONFIGURATION=2]="CONFIGURATION",a[a.ALWAYS_AUTH=3]="ALWAYS_AUTH",a))(I1e||{});async function k0(t,{attemptedAs:e,registry:r,headers:o,configuration:a}){if(PQ(t))throw new zt(41,"Invalid OTP token");if(t.originalError?.name==="HTTPError"&&t.originalError?.response.statusCode===401)throw new zt(41,`Invalid authentication (${typeof e!="string"?`as ${await N1t(r,o,{configuration:a})}`:`attempted as ${e}`})`)}function ym(t,e){let r=t.response?.statusCode;return r?r===404?"Package not found":r>=500&&r<600?`The registry appears to be down (using a ${de.applyHyperlink(e,"local cache","https://yarnpkg.com/advanced/lexicon#local-cache")} might have protected you against such outages)`:null:null}function DQ(t){return t.scope?`/@${t.scope}%2f${t.name}`:`/${t.name}`}var B1e=new Map,v1t=new Map;async function D1t(t){return await _e.getFactoryWithDefault(B1e,t,async()=>{let e=null;try{e=await oe.readJsonPromise(t)}catch{}return e})}async function S1t(t,e,{configuration:r,cached:o,registry:a,headers:n,version:u,...A}){return await _e.getFactoryWithDefault(v1t,t,async()=>await Em(DQ(e),{...A,customErrorMessage:ym,configuration:r,registry:a,ident:e,headers:{...n,["If-None-Match"]:o?.etag,["If-Modified-Since"]:o?.lastModified},wrapNetworkRequest:async p=>async()=>{let h=await p();if(h.statusCode===304){if(o===null)throw new Error("Assertion failed: cachedMetadata should not be null");return{...h,body:o.metadata}}let E=P1t(JSON.parse(h.body.toString())),I={metadata:E,etag:h.headers.etag,lastModified:h.headers["last-modified"]};return B1e.set(t,Promise.resolve(I)),Promise.resolve().then(async()=>{let v=`${t}-${process.pid}.tmp`;await oe.mkdirPromise(V.dirname(v),{recursive:!0}),await oe.writeJsonPromise(v,I,{compact:!0}),await oe.renamePromise(v,t)}).catch(()=>{}),{...h,body:E}}}))}async function JC(t,{cache:e,project:r,registry:o,headers:a,version:n,...u}){let{configuration:A}=r;o=Av(A,{ident:t,registry:o});let p=x1t(A,o),h=V.join(p,`${W.slugifyIdent(t)}.json`),E=null;if(!r.lockfileNeedsRefresh&&(E=await D1t(h),E)){if(typeof n<"u"&&typeof E.metadata.versions[n]<"u")return E.metadata;if(A.get("enableOfflineMode")){let I=structuredClone(E.metadata),v=new Set;if(e){for(let C of Object.keys(I.versions)){let R=W.makeLocator(t,`npm:${C}`),L=e.getLocatorMirrorPath(R);(!L||!oe.existsSync(L))&&(delete I.versions[C],v.add(C))}let x=I["dist-tags"].latest;if(v.has(x)){let C=Object.keys(E.metadata.versions).sort(w1e.default.compare),R=C.indexOf(x);for(;v.has(C[R])&&R>=0;)R-=1;R>=0?I["dist-tags"].latest=C[R]:delete I["dist-tags"].latest}}return I}}return await S1t(h,t,{...u,configuration:A,cached:E,registry:o,headers:a,version:n})}var v1e=["name","dist.tarball","bin","scripts","os","cpu","libc","dependencies","dependenciesMeta","optionalDependencies","peerDependencies","peerDependenciesMeta","deprecated"];function P1t(t){return{"dist-tags":t["dist-tags"],versions:Object.fromEntries(Object.entries(t.versions).map(([e,r])=>[e,(0,C1e.default)(r,v1e)]))}}var b1t=wn.makeHash(...v1e).slice(0,6);function x1t(t,e){let r=k1t(t),o=new URL(e);return V.join(r,b1t,o.hostname)}function k1t(t){return V.join(t.get("globalFolder"),"metadata/npm")}async function Em(t,{configuration:e,headers:r,ident:o,authType:a,registry:n,...u}){n=Av(e,{ident:o,registry:n}),o&&o.scope&&typeof a>"u"&&(a=1);let A=await SQ(n,{authType:a,configuration:e,ident:o});A&&(r={...r,authorization:A});try{return await nn.get(t.charAt(0)==="/"?`${n}${t}`:t,{configuration:e,headers:r,...u})}catch(p){throw await k0(p,{registry:n,configuration:e,headers:r}),p}}async function Q1t(t,e,{attemptedAs:r,configuration:o,headers:a,ident:n,authType:u=3,registry:A,otp:p,...h}){A=Av(o,{ident:n,registry:A});let E=await SQ(A,{authType:u,configuration:o,ident:n});E&&(a={...a,authorization:E}),p&&(a={...a,...VC(p)});try{return await nn.post(A+t,e,{configuration:o,headers:a,...h})}catch(I){if(!PQ(I)||p)throw await k0(I,{attemptedAs:r,registry:A,configuration:o,headers:a}),I;p=await IG(I,{configuration:o});let v={...a,...VC(p)};try{return await nn.post(`${A}${t}`,e,{configuration:o,headers:v,...h})}catch(x){throw await k0(x,{attemptedAs:r,registry:A,configuration:o,headers:a}),x}}}async function F1t(t,e,{attemptedAs:r,configuration:o,headers:a,ident:n,authType:u=3,registry:A,otp:p,...h}){A=Av(o,{ident:n,registry:A});let E=await SQ(A,{authType:u,configuration:o,ident:n});E&&(a={...a,authorization:E}),p&&(a={...a,...VC(p)});try{return await nn.put(A+t,e,{configuration:o,headers:a,...h})}catch(I){if(!PQ(I))throw await k0(I,{attemptedAs:r,registry:A,configuration:o,headers:a}),I;p=await IG(I,{configuration:o});let v={...a,...VC(p)};try{return await nn.put(`${A}${t}`,e,{configuration:o,headers:v,...h})}catch(x){throw await k0(x,{attemptedAs:r,registry:A,configuration:o,headers:a}),x}}}async function R1t(t,{attemptedAs:e,configuration:r,headers:o,ident:a,authType:n=3,registry:u,otp:A,...p}){u=Av(r,{ident:a,registry:u});let h=await SQ(u,{authType:n,configuration:r,ident:a});h&&(o={...o,authorization:h}),A&&(o={...o,...VC(A)});try{return await nn.del(u+t,{configuration:r,headers:o,...p})}catch(E){if(!PQ(E)||A)throw await k0(E,{attemptedAs:e,registry:u,configuration:r,headers:o}),E;A=await IG(E,{configuration:r});let I={...o,...VC(A)};try{return await nn.del(`${u}${t}`,{configuration:r,headers:I,...p})}catch(v){throw await k0(v,{attemptedAs:e,registry:u,configuration:r,headers:o}),v}}}function Av(t,{ident:e,registry:r}){if(typeof r>"u"&&e)return KC(e.scope,{configuration:t});if(typeof r!="string")throw new Error("Assertion failed: The registry should be a string");return oc(r)}async function SQ(t,{authType:e=2,configuration:r,ident:o}){let a=CG(t,{configuration:r,ident:o}),n=T1t(a,e);if(!n)return null;let u=await r.reduceHook(A=>A.getNpmAuthenticationHeader,void 0,t,{configuration:r,ident:o});if(u)return u;if(a.get("npmAuthToken"))return`Bearer ${a.get("npmAuthToken")}`;if(a.get("npmAuthIdent")){let A=a.get("npmAuthIdent");return A.includes(":")?`Basic ${Buffer.from(A).toString("base64")}`:`Basic ${A}`}if(n&&e!==1)throw new zt(33,"No authentication configured for request");return null}function T1t(t,e){switch(e){case 2:return t.get("npmAlwaysAuth");case 1:case 3:return!0;case 0:return!1;default:throw new Error("Unreachable")}}async function N1t(t,e,{configuration:r}){if(typeof e>"u"||typeof e.authorization>"u")return"an anonymous user";try{return(await nn.get(new URL(`${t}/-/whoami`).href,{configuration:r,headers:e,jsonResponse:!0})).username??"an unknown user"}catch{return"an unknown user"}}async function IG(t,{configuration:e}){let r=t.originalError?.response.headers["npm-notice"];if(r&&(await Nt.start({configuration:e,stdout:process.stdout,includeFooter:!1},async a=>{if(a.reportInfo(0,r.replace(/(https?:\/\/\S+)/g,de.pretty(e,"$1",de.Type.URL))),!process.env.YARN_IS_TEST_ENV){let n=r.match(/open (https?:\/\/\S+)/i);if(n&&Ji.openUrl){let{openNow:u}=await(0,wG.prompt)({type:"confirm",name:"openNow",message:"Do you want to try to open this url now?",required:!0,initial:!0,onCancel:()=>process.exit(130)});u&&(await Ji.openUrl(n[1])||(a.reportSeparator(),a.reportWarning(0,"We failed to automatically open the url; you'll have to open it yourself in your browser of choice.")))}}}),process.stdout.write(`
+`)),process.env.YARN_IS_TEST_ENV)return process.env.YARN_INJECT_NPM_2FA_TOKEN||"";let{otp:o}=await(0,wG.prompt)({type:"password",name:"otp",message:"One-time password:",required:!0,onCancel:()=>process.exit(130)});return process.stdout.write(`
+`),o}function PQ(t){if(t.originalError?.name!=="HTTPError")return!1;try{return(t.originalError?.response.headers["www-authenticate"].split(/,\s*/).map(r=>r.toLowerCase())).includes("otp")}catch{return!1}}function VC(t){return{["npm-otp"]:t}}var fv=class{supports(e,r){if(!e.reference.startsWith(Wn))return!1;let{selector:o,params:a}=W.parseRange(e.reference);return!(!D1e.default.valid(o)||a===null||typeof a.__archiveUrl!="string")}getLocalPath(e,r){return null}async fetch(e,r){let o=r.checksums.get(e.locatorHash)||null,[a,n,u]=await r.cache.fetchPackageFromCache(e,o,{onHit:()=>r.report.reportCacheHit(e),onMiss:()=>r.report.reportCacheMiss(e,`${W.prettyLocator(r.project.configuration,e)} can't be found in the cache and will be fetched from the remote server`),loader:()=>this.fetchFromNetwork(e,r),...r.cacheOptions});return{packageFs:a,releaseFs:n,prefixPath:W.getIdentVendorPath(e),checksum:u}}async fetchFromNetwork(e,r){let{params:o}=W.parseRange(e.reference);if(o===null||typeof o.__archiveUrl!="string")throw new Error("Assertion failed: The archiveUrl querystring parameter should have been available");let a=await Em(o.__archiveUrl,{customErrorMessage:ym,configuration:r.project.configuration,ident:e});return await Xi.convertToZip(a,{configuration:r.project.configuration,prefixPath:W.getIdentVendorPath(e),stripComponents:1})}};Ye();var pv=class{supportsDescriptor(e,r){return!(!e.range.startsWith(Wn)||!W.tryParseDescriptor(e.range.slice(Wn.length),!0))}supportsLocator(e,r){return!1}shouldPersistResolution(e,r){throw new Error("Unreachable")}bindDescriptor(e,r,o){return e}getResolutionDependencies(e,r){let o=r.project.configuration.normalizeDependency(W.parseDescriptor(e.range.slice(Wn.length),!0));return r.resolver.getResolutionDependencies(o,r)}async getCandidates(e,r,o){let a=o.project.configuration.normalizeDependency(W.parseDescriptor(e.range.slice(Wn.length),!0));return await o.resolver.getCandidates(a,r,o)}async getSatisfying(e,r,o,a){let n=a.project.configuration.normalizeDependency(W.parseDescriptor(e.range.slice(Wn.length),!0));return a.resolver.getSatisfying(n,r,o,a)}resolve(e,r){throw new Error("Unreachable")}};Ye();Ye();var S1e=$e(zn());var dl=class{supports(e,r){if(!e.reference.startsWith(Wn))return!1;let o=new URL(e.reference);return!(!S1e.default.valid(o.pathname)||o.searchParams.has("__archiveUrl"))}getLocalPath(e,r){return null}async fetch(e,r){let o=r.checksums.get(e.locatorHash)||null,[a,n,u]=await r.cache.fetchPackageFromCache(e,o,{onHit:()=>r.report.reportCacheHit(e),onMiss:()=>r.report.reportCacheMiss(e,`${W.prettyLocator(r.project.configuration,e)} can't be found in the cache and will be fetched from the remote registry`),loader:()=>this.fetchFromNetwork(e,r),...r.cacheOptions});return{packageFs:a,releaseFs:n,prefixPath:W.getIdentVendorPath(e),checksum:u}}async fetchFromNetwork(e,r){let o;try{o=await Em(dl.getLocatorUrl(e),{customErrorMessage:ym,configuration:r.project.configuration,ident:e})}catch{o=await Em(dl.getLocatorUrl(e).replace(/%2f/g,"/"),{customErrorMessage:ym,configuration:r.project.configuration,ident:e})}return await Xi.convertToZip(o,{configuration:r.project.configuration,prefixPath:W.getIdentVendorPath(e),stripComponents:1})}static isConventionalTarballUrl(e,r,{configuration:o}){let a=KC(e.scope,{configuration:o}),n=dl.getLocatorUrl(e);return r=r.replace(/^https?:(\/\/(?:[^/]+\.)?npmjs.org(?:$|\/))/,"https:$1"),a=a.replace(/^https:\/\/registry\.npmjs\.org($|\/)/,"https://registry.yarnpkg.com$1"),r=r.replace(/^https:\/\/registry\.npmjs\.org($|\/)/,"https://registry.yarnpkg.com$1"),r===a+n||r===a+n.replace(/%2f/g,"/")}static getLocatorUrl(e){let r=kr.clean(e.reference.slice(Wn.length));if(r===null)throw new zt(10,"The npm semver resolver got selected, but the version isn't semver");return`${DQ(e)}/-/${e.name}-${r}.tgz`}};Ye();Ye();Ye();var BG=$e(zn());var bQ=W.makeIdent(null,"node-gyp"),L1t=/\b(node-gyp|prebuild-install)\b/,hv=class{supportsDescriptor(e,r){return e.range.startsWith(Wn)?!!kr.validRange(e.range.slice(Wn.length)):!1}supportsLocator(e,r){if(!e.reference.startsWith(Wn))return!1;let{selector:o}=W.parseRange(e.reference);return!!BG.default.valid(o)}shouldPersistResolution(e,r){return!0}bindDescriptor(e,r,o){return e}getResolutionDependencies(e,r){return{}}async getCandidates(e,r,o){let a=kr.validRange(e.range.slice(Wn.length));if(a===null)throw new Error(`Expected a valid range, got ${e.range.slice(Wn.length)}`);let n=await JC(e,{cache:o.fetchOptions?.cache,project:o.project,version:BG.default.valid(a.raw)?a.raw:void 0}),u=_e.mapAndFilter(Object.keys(n.versions),h=>{try{let E=new kr.SemVer(h);if(a.test(E))return E}catch{}return _e.mapAndFilter.skip}),A=u.filter(h=>!n.versions[h.raw].deprecated),p=A.length>0?A:u;return p.sort((h,E)=>-h.compare(E)),p.map(h=>{let E=W.makeLocator(e,`${Wn}${h.raw}`),I=n.versions[h.raw].dist.tarball;return dl.isConventionalTarballUrl(E,I,{configuration:o.project.configuration})?E:W.bindLocator(E,{__archiveUrl:I})})}async getSatisfying(e,r,o,a){let n=kr.validRange(e.range.slice(Wn.length));if(n===null)throw new Error(`Expected a valid range, got ${e.range.slice(Wn.length)}`);return{locators:_e.mapAndFilter(o,p=>{if(p.identHash!==e.identHash)return _e.mapAndFilter.skip;let h=W.tryParseRange(p.reference,{requireProtocol:Wn});if(!h)return _e.mapAndFilter.skip;let E=new kr.SemVer(h.selector);return n.test(E)?{locator:p,version:E}:_e.mapAndFilter.skip}).sort((p,h)=>-p.version.compare(h.version)).map(({locator:p})=>p),sorted:!0}}async resolve(e,r){let{selector:o}=W.parseRange(e.reference),a=kr.clean(o);if(a===null)throw new zt(10,"The npm semver resolver got selected, but the version isn't semver");let n=await JC(e,{cache:r.fetchOptions?.cache,project:r.project,version:a});if(!Object.hasOwn(n,"versions"))throw new zt(15,'Registry returned invalid data for - missing "versions" field');if(!Object.hasOwn(n.versions,a))throw new zt(16,`Registry failed to return reference "${a}"`);let u=new Ot;if(u.load(n.versions[a]),!u.dependencies.has(bQ.identHash)&&!u.peerDependencies.has(bQ.identHash)){for(let A of u.scripts.values())if(A.match(L1t)){u.dependencies.set(bQ.identHash,W.makeDescriptor(bQ,"latest"));break}}return{...e,version:a,languageName:"node",linkType:"HARD",conditions:u.getConditions(),dependencies:r.project.configuration.normalizeDependencyMap(u.dependencies),peerDependencies:u.peerDependencies,dependenciesMeta:u.dependenciesMeta,peerDependenciesMeta:u.peerDependenciesMeta,bin:u.bin}}};Ye();Ye();var P1e=$e(zn());var gv=class{supportsDescriptor(e,r){return!(!e.range.startsWith(Wn)||!FE.test(e.range.slice(Wn.length)))}supportsLocator(e,r){return!1}shouldPersistResolution(e,r){throw new Error("Unreachable")}bindDescriptor(e,r,o){return e}getResolutionDependencies(e,r){return{}}async getCandidates(e,r,o){let a=e.range.slice(Wn.length),n=await JC(e,{cache:o.fetchOptions?.cache,project:o.project});if(!Object.hasOwn(n,"dist-tags"))throw new zt(15,'Registry returned invalid data - missing "dist-tags" field');let u=n["dist-tags"];if(!Object.hasOwn(u,a))throw new zt(16,`Registry failed to return tag "${a}"`);let A=u[a],p=W.makeLocator(e,`${Wn}${A}`),h=n.versions[A].dist.tarball;return dl.isConventionalTarballUrl(p,h,{configuration:o.project.configuration})?[p]:[W.bindLocator(p,{__archiveUrl:h})]}async getSatisfying(e,r,o,a){let n=[];for(let u of o){if(u.identHash!==e.identHash)continue;let A=W.tryParseRange(u.reference,{requireProtocol:Wn});if(!(!A||!P1e.default.valid(A.selector))){if(A.params?.__archiveUrl){let p=W.makeRange({protocol:Wn,selector:A.selector,source:null,params:null}),[h]=await a.resolver.getCandidates(W.makeDescriptor(e,p),r,a);if(u.reference!==h.reference)continue}n.push(u)}}return{locators:n,sorted:!1}}async resolve(e,r){throw new Error("Unreachable")}};var ow={};Vt(ow,{getGitHead:()=>Tvt,getPublishAccess:()=>dBe,getReadmeContent:()=>mBe,makePublishBody:()=>Rvt});Ye();Ye();St();var Aq={};Vt(Aq,{PackCommand:()=>U0,default:()=>gvt,packUtils:()=>wA});Ye();Ye();Ye();St();jt();var wA={};Vt(wA,{genPackList:()=>XQ,genPackStream:()=>uq,genPackageManifest:()=>iBe,hasPackScripts:()=>lq,prepareForPack:()=>cq});Ye();St();var aq=$e(Zo()),rBe=$e(Z2e()),nBe=ve("zlib"),ivt=["/package.json","/readme","/readme.*","/license","/license.*","/licence","/licence.*","/changelog","/changelog.*"],svt=["/package.tgz",".github",".git",".hg","node_modules",".npmignore",".gitignore",".#*",".DS_Store"];async function lq(t){return!!(un.hasWorkspaceScript(t,"prepack")||un.hasWorkspaceScript(t,"postpack"))}async function cq(t,{report:e},r){await un.maybeExecuteWorkspaceLifecycleScript(t,"prepack",{report:e});try{let o=V.join(t.cwd,Ot.fileName);await oe.existsPromise(o)&&await t.manifest.loadFile(o,{baseFs:oe}),await r()}finally{await un.maybeExecuteWorkspaceLifecycleScript(t,"postpack",{report:e})}}async function uq(t,e){typeof e>"u"&&(e=await XQ(t));let r=new Set;for(let n of t.manifest.publishConfig?.executableFiles??new Set)r.add(V.normalize(n));for(let n of t.manifest.bin.values())r.add(V.normalize(n));let o=rBe.default.pack();process.nextTick(async()=>{for(let n of e){let u=V.normalize(n),A=V.resolve(t.cwd,u),p=V.join("package",u),h=await oe.lstatPromise(A),E={name:p,mtime:new Date(vi.SAFE_TIME*1e3)},I=r.has(u)?493:420,v,x,C=new Promise((L,U)=>{v=L,x=U}),R=L=>{L?x(L):v()};if(h.isFile()){let L;u==="package.json"?L=Buffer.from(JSON.stringify(await iBe(t),null,2)):L=await oe.readFilePromise(A),o.entry({...E,mode:I,type:"file"},L,R)}else h.isSymbolicLink()?o.entry({...E,mode:I,type:"symlink",linkname:await oe.readlinkPromise(A)},R):R(new Error(`Unsupported file type ${h.mode} for ${ue.fromPortablePath(u)}`));await C}o.finalize()});let a=(0,nBe.createGzip)();return o.pipe(a),a}async function iBe(t){let e=JSON.parse(JSON.stringify(t.manifest.raw));return await t.project.configuration.triggerHook(r=>r.beforeWorkspacePacking,t,e),e}async function XQ(t){let e=t.project,r=e.configuration,o={accept:[],reject:[]};for(let I of svt)o.reject.push(I);for(let I of ivt)o.accept.push(I);o.reject.push(r.get("rcFilename"));let a=I=>{if(I===null||!I.startsWith(`${t.cwd}/`))return;let v=V.relative(t.cwd,I),x=V.resolve(Bt.root,v);o.reject.push(x)};a(V.resolve(e.cwd,dr.lockfile)),a(r.get("cacheFolder")),a(r.get("globalFolder")),a(r.get("installStatePath")),a(r.get("virtualFolder")),a(r.get("yarnPath")),await r.triggerHook(I=>I.populateYarnPaths,e,I=>{a(I)});for(let I of e.workspaces){let v=V.relative(t.cwd,I.cwd);v!==""&&!v.match(/^(\.\.)?\//)&&o.reject.push(`/${v}`)}let n={accept:[],reject:[]},u=t.manifest.publishConfig?.main??t.manifest.main,A=t.manifest.publishConfig?.module??t.manifest.module,p=t.manifest.publishConfig?.browser??t.manifest.browser,h=t.manifest.publishConfig?.bin??t.manifest.bin;u!=null&&n.accept.push(V.resolve(Bt.root,u)),A!=null&&n.accept.push(V.resolve(Bt.root,A)),typeof p=="string"&&n.accept.push(V.resolve(Bt.root,p));for(let I of h.values())n.accept.push(V.resolve(Bt.root,I));if(p instanceof Map)for(let[I,v]of p.entries())n.accept.push(V.resolve(Bt.root,I)),typeof v=="string"&&n.accept.push(V.resolve(Bt.root,v));let E=t.manifest.files!==null;if(E){n.reject.push("/*");for(let I of t.manifest.files)sBe(n.accept,I,{cwd:Bt.root})}return await ovt(t.cwd,{hasExplicitFileList:E,globalList:o,ignoreList:n})}async function ovt(t,{hasExplicitFileList:e,globalList:r,ignoreList:o}){let a=[],n=new _u(t),u=[[Bt.root,[o]]];for(;u.length>0;){let[A,p]=u.pop(),h=await n.lstatPromise(A);if(!eBe(A,{globalList:r,ignoreLists:h.isDirectory()?null:p}))if(h.isDirectory()){let E=await n.readdirPromise(A),I=!1,v=!1;if(!e||A!==Bt.root)for(let R of E)I=I||R===".gitignore",v=v||R===".npmignore";let x=v?await $2e(n,A,".npmignore"):I?await $2e(n,A,".gitignore"):null,C=x!==null?[x].concat(p):p;eBe(A,{globalList:r,ignoreLists:p})&&(C=[...p,{accept:[],reject:["**/*"]}]);for(let R of E)u.push([V.resolve(A,R),C])}else(h.isFile()||h.isSymbolicLink())&&a.push(V.relative(Bt.root,A))}return a.sort()}async function $2e(t,e,r){let o={accept:[],reject:[]},a=await t.readFilePromise(V.join(e,r),"utf8");for(let n of a.split(/\n/g))sBe(o.reject,n,{cwd:e});return o}function avt(t,{cwd:e}){let r=t[0]==="!";return r&&(t=t.slice(1)),t.match(/\.{0,1}\//)&&(t=V.resolve(e,t)),r&&(t=`!${t}`),t}function sBe(t,e,{cwd:r}){let o=e.trim();o===""||o[0]==="#"||t.push(avt(o,{cwd:r}))}function eBe(t,{globalList:e,ignoreLists:r}){let o=zQ(t,e.accept);if(o!==0)return o===2;let a=zQ(t,e.reject);if(a!==0)return a===1;if(r!==null)for(let n of r){let u=zQ(t,n.accept);if(u!==0)return u===2;let A=zQ(t,n.reject);if(A!==0)return A===1}return!1}function zQ(t,e){let r=e,o=[];for(let a=0;a<e.length;++a)e[a][0]!=="!"?r!==e&&r.push(e[a]):(r===e&&(r=e.slice(0,a)),o.push(e[a].slice(1)));return tBe(t,o)?2:tBe(t,r)?1:0}function tBe(t,e){let r=e,o=[];for(let a=0;a<e.length;++a)e[a].includes("/")?r!==e&&r.push(e[a]):(r===e&&(r=e.slice(0,a)),o.push(e[a]));return!!(aq.default.isMatch(t,r,{dot:!0,nocase:!0})||aq.default.isMatch(t,o,{dot:!0,basename:!0,nocase:!0}))}var U0=class extends ut{constructor(){super(...arguments);this.installIfNeeded=ge.Boolean("--install-if-needed",!1,{description:"Run a preliminary `yarn install` if the package contains build scripts"});this.dryRun=ge.Boolean("-n,--dry-run",!1,{description:"Print the file paths without actually generating the package archive"});this.json=ge.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.out=ge.String("-o,--out",{description:"Create the archive at the specified path"});this.filename=ge.String("--filename",{hidden:!0})}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd);if(!a)throw new rr(o.cwd,this.context.cwd);await lq(a)&&(this.installIfNeeded?await o.install({cache:await Lr.find(r),report:new Qi}):await o.restoreInstallState());let n=this.out??this.filename,u=typeof n<"u"?V.resolve(this.context.cwd,lvt(n,{workspace:a})):V.resolve(a.cwd,"package.tgz");return(await Nt.start({configuration:r,stdout:this.context.stdout,json:this.json},async p=>{await cq(a,{report:p},async()=>{p.reportJson({base:ue.fromPortablePath(a.cwd)});let h=await XQ(a);for(let E of h)p.reportInfo(null,ue.fromPortablePath(E)),p.reportJson({location:ue.fromPortablePath(E)});if(!this.dryRun){let E=await uq(a,h),I=oe.createWriteStream(u);E.pipe(I),await new Promise(v=>{I.on("finish",v)})}}),this.dryRun||(p.reportInfo(0,`Package archive generated in ${de.pretty(r,u,de.Type.PATH)}`),p.reportJson({output:ue.fromPortablePath(u)}))})).exitCode()}};U0.paths=[["pack"]],U0.usage=nt.Usage({description:"generate a tarball from the active workspace",details:"\n      This command will turn the active workspace into a compressed archive suitable for publishing. The archive will by default be stored at the root of the workspace (`package.tgz`).\n\n      If the `-o,---out` is set the archive will be created at the specified path. The `%s` and `%v` variables can be used within the path and will be respectively replaced by the package name and version.\n    ",examples:[["Create an archive from the active workspace","yarn pack"],["List the files that would be made part of the workspace's archive","yarn pack --dry-run"],["Name and output the archive in a dedicated folder","yarn pack --out /artifacts/%s-%v.tgz"]]});function lvt(t,{workspace:e}){let r=t.replace("%s",cvt(e)).replace("%v",uvt(e));return ue.toPortablePath(r)}function cvt(t){return t.manifest.name!==null?W.slugifyIdent(t.manifest.name):"package"}function uvt(t){return t.manifest.version!==null?t.manifest.version:"unknown"}var Avt=["dependencies","devDependencies","peerDependencies"],fvt="workspace:",pvt=(t,e)=>{e.publishConfig&&(e.publishConfig.type&&(e.type=e.publishConfig.type),e.publishConfig.main&&(e.main=e.publishConfig.main),e.publishConfig.browser&&(e.browser=e.publishConfig.browser),e.publishConfig.module&&(e.module=e.publishConfig.module),e.publishConfig.exports&&(e.exports=e.publishConfig.exports),e.publishConfig.imports&&(e.imports=e.publishConfig.imports),e.publishConfig.bin&&(e.bin=e.publishConfig.bin));let r=t.project;for(let o of Avt)for(let a of t.manifest.getForScope(o).values()){let n=r.tryWorkspaceByDescriptor(a),u=W.parseRange(a.range);if(u.protocol===fvt)if(n===null){if(r.tryWorkspaceByIdent(a)===null)throw new zt(21,`${W.prettyDescriptor(r.configuration,a)}: No local workspace found for this range`)}else{let A;W.areDescriptorsEqual(a,n.anchoredDescriptor)||u.selector==="*"?A=n.manifest.version??"0.0.0":u.selector==="~"||u.selector==="^"?A=`${u.selector}${n.manifest.version??"0.0.0"}`:A=u.selector;let p=o==="dependencies"?W.makeDescriptor(a,"unknown"):null,h=p!==null&&t.manifest.ensureDependencyMeta(p).optional?"optionalDependencies":o;e[h][W.stringifyIdent(a)]=A}}},hvt={hooks:{beforeWorkspacePacking:pvt},commands:[U0]},gvt=hvt;var hBe=ve("crypto"),gBe=$e(pBe());async function Rvt(t,e,{access:r,tag:o,registry:a,gitHead:n}){let u=t.manifest.name,A=t.manifest.version,p=W.stringifyIdent(u),h=(0,hBe.createHash)("sha1").update(e).digest("hex"),E=gBe.default.fromData(e).toString(),I=r??dBe(t,u),v=await mBe(t),x=await wA.genPackageManifest(t),C=`${p}-${A}.tgz`,R=new URL(`${oc(a)}/${p}/-/${C}`);return{_id:p,_attachments:{[C]:{content_type:"application/octet-stream",data:e.toString("base64"),length:e.length}},name:p,access:I,["dist-tags"]:{[o]:A},versions:{[A]:{...x,_id:`${p}@${A}`,name:p,version:A,gitHead:n,dist:{shasum:h,integrity:E,tarball:R.toString()}}},readme:v}}async function Tvt(t){try{let{stdout:e}=await Ur.execvp("git",["rev-parse","--revs-only","HEAD"],{cwd:t});return e.trim()===""?void 0:e.trim()}catch{return}}function dBe(t,e){let r=t.project.configuration;return t.manifest.publishConfig&&typeof t.manifest.publishConfig.access=="string"?t.manifest.publishConfig.access:r.get("npmPublishAccess")!==null?r.get("npmPublishAccess"):e.scope?"restricted":"public"}async function mBe(t){let e=ue.toPortablePath(`${t.cwd}/README.md`),r=t.manifest.name,a=`# ${W.stringifyIdent(r)}
+`;try{a=await oe.readFilePromise(e,"utf8")}catch(n){if(n.code==="ENOENT")return a;throw n}return a}var gq={npmAlwaysAuth:{description:"URL of the selected npm registry (note: npm enterprise isn't supported)",type:"BOOLEAN",default:!1},npmAuthIdent:{description:"Authentication identity for the npm registry (_auth in npm and yarn v1)",type:"SECRET",default:null},npmAuthToken:{description:"Authentication token for the npm registry (_authToken in npm and yarn v1)",type:"SECRET",default:null}},yBe={npmAuditRegistry:{description:"Registry to query for audit reports",type:"STRING",default:null},npmPublishRegistry:{description:"Registry to push packages to",type:"STRING",default:null},npmRegistryServer:{description:"URL of the selected npm registry (note: npm enterprise isn't supported)",type:"STRING",default:"https://registry.yarnpkg.com"}},Nvt={configuration:{...gq,...yBe,npmScopes:{description:"Settings per package scope",type:"MAP",valueDefinition:{description:"",type:"SHAPE",properties:{...gq,...yBe}}},npmRegistries:{description:"Settings per registry",type:"MAP",normalizeKeys:oc,valueDefinition:{description:"",type:"SHAPE",properties:{...gq}}}},fetchers:[fv,dl],resolvers:[pv,hv,gv]},Lvt=Nvt;var Dq={};Vt(Dq,{NpmAuditCommand:()=>H0,NpmInfoCommand:()=>j0,NpmLoginCommand:()=>G0,NpmLogoutCommand:()=>q0,NpmPublishCommand:()=>Y0,NpmTagAddCommand:()=>K0,NpmTagListCommand:()=>W0,NpmTagRemoveCommand:()=>V0,NpmWhoamiCommand:()=>J0,default:()=>Gvt,npmAuditTypes:()=>Rv,npmAuditUtils:()=>ZQ});Ye();Ye();jt();var wq=$e(Zo());Za();var Rv={};Vt(Rv,{Environment:()=>Qv,Severity:()=>Fv});var Qv=(o=>(o.All="all",o.Production="production",o.Development="development",o))(Qv||{}),Fv=(n=>(n.Info="info",n.Low="low",n.Moderate="moderate",n.High="high",n.Critical="critical",n))(Fv||{});var ZQ={};Vt(ZQ,{allSeverities:()=>aw,getPackages:()=>Cq,getReportTree:()=>yq,getSeverityInclusions:()=>mq,getTopLevelDependencies:()=>Eq});Ye();var EBe=$e(zn());var aw=["info","low","moderate","high","critical"];function mq(t){if(typeof t>"u")return new Set(aw);let e=aw.indexOf(t),r=aw.slice(e);return new Set(r)}function yq(t){let e={},r={children:e};for(let[o,a]of _e.sortMap(Object.entries(t),n=>n[0]))for(let n of _e.sortMap(a,u=>`${u.id}`))e[`${o}/${n.id}`]={value:de.tuple(de.Type.IDENT,W.parseIdent(o)),children:{ID:typeof n.id<"u"&&{label:"ID",value:de.tuple(de.Type.ID,n.id)},Issue:{label:"Issue",value:de.tuple(de.Type.NO_HINT,n.title)},URL:typeof n.url<"u"&&{label:"URL",value:de.tuple(de.Type.URL,n.url)},Severity:{label:"Severity",value:de.tuple(de.Type.NO_HINT,n.severity)},["Vulnerable Versions"]:{label:"Vulnerable Versions",value:de.tuple(de.Type.RANGE,n.vulnerable_versions)},["Tree Versions"]:{label:"Tree Versions",children:[...n.versions].sort(EBe.default.compare).map(u=>({value:de.tuple(de.Type.REFERENCE,u)}))},Dependents:{label:"Dependents",children:_e.sortMap(n.dependents,u=>W.stringifyLocator(u)).map(u=>({value:de.tuple(de.Type.LOCATOR,u)}))}}};return r}function Eq(t,e,{all:r,environment:o}){let a=[],n=r?t.workspaces:[e],u=["all","production"].includes(o),A=["all","development"].includes(o);for(let p of n)for(let h of p.anchoredPackage.dependencies.values())(p.manifest.devDependencies.has(h.identHash)?!A:!u)||a.push({workspace:p,dependency:h});return a}function Cq(t,e,{recursive:r}){let o=new Map,a=new Set,n=[],u=(A,p)=>{let h=t.storedResolutions.get(p.descriptorHash);if(typeof h>"u")throw new Error("Assertion failed: The resolution should have been registered");if(!a.has(h))a.add(h);else return;let E=t.storedPackages.get(h);if(typeof E>"u")throw new Error("Assertion failed: The package should have been registered");if(W.ensureDevirtualizedLocator(E).reference.startsWith("npm:")&&E.version!==null){let v=W.stringifyIdent(E),x=_e.getMapWithDefault(o,v);_e.getArrayWithDefault(x,E.version).push(A)}if(r)for(let v of E.dependencies.values())n.push([E,v])};for(let{workspace:A,dependency:p}of e)n.push([A.anchoredLocator,p]);for(;n.length>0;){let[A,p]=n.shift();u(A,p)}return o}var H0=class extends ut{constructor(){super(...arguments);this.all=ge.Boolean("-A,--all",!1,{description:"Audit dependencies from all workspaces"});this.recursive=ge.Boolean("-R,--recursive",!1,{description:"Audit transitive dependencies as well"});this.environment=ge.String("--environment","all",{description:"Which environments to cover",validator:Ks(Qv)});this.json=ge.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.noDeprecations=ge.Boolean("--no-deprecations",!1,{description:"Don't warn about deprecated packages"});this.severity=ge.String("--severity","info",{description:"Minimal severity requested for packages to be displayed",validator:Ks(Fv)});this.excludes=ge.Array("--exclude",[],{description:"Array of glob patterns of packages to exclude from audit"});this.ignores=ge.Array("--ignore",[],{description:"Array of glob patterns of advisory ID's to ignore in the audit report"})}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd);if(!a)throw new rr(o.cwd,this.context.cwd);await o.restoreInstallState();let n=Eq(o,a,{all:this.all,environment:this.environment}),u=Cq(o,n,{recursive:this.recursive}),A=Array.from(new Set([...r.get("npmAuditExcludePackages"),...this.excludes])),p=Object.create(null);for(let[L,U]of u)A.some(J=>wq.default.isMatch(L,J))||(p[L]=[...U.keys()]);let h=Zn.getAuditRegistry({configuration:r}),E,I=await AA.start({configuration:r,stdout:this.context.stdout},async()=>{let L=Zr.post("/-/npm/v1/security/advisories/bulk",p,{authType:Zr.AuthType.BEST_EFFORT,configuration:r,jsonResponse:!0,registry:h}),U=this.noDeprecations?[]:await Promise.all(Array.from(Object.entries(p),async([te,ae])=>{let fe=await Zr.getPackageMetadata(W.parseIdent(te),{project:o});return _e.mapAndFilter(ae,ce=>{let{deprecated:me}=fe.versions[ce];return me?[te,ce,me]:_e.mapAndFilter.skip})})),J=await L;for(let[te,ae,fe]of U.flat(1))Object.hasOwn(J,te)&&J[te].some(ce=>kr.satisfiesWithPrereleases(ae,ce.vulnerable_versions))||(J[te]??=[],J[te].push({id:`${te} (deprecation)`,title:fe.trim()||"This package has been deprecated.",severity:"moderate",vulnerable_versions:ae}));E=J});if(I.hasErrors())return I.exitCode();let v=mq(this.severity),x=Array.from(new Set([...r.get("npmAuditIgnoreAdvisories"),...this.ignores])),C=Object.create(null);for(let[L,U]of Object.entries(E)){let J=U.filter(te=>!wq.default.isMatch(`${te.id}`,x)&&v.has(te.severity));J.length>0&&(C[L]=J.map(te=>{let ae=u.get(L);if(typeof ae>"u")throw new Error("Assertion failed: Expected the registry to only return packages that were requested");let fe=[...ae.keys()].filter(me=>kr.satisfiesWithPrereleases(me,te.vulnerable_versions)),ce=new Map;for(let me of fe)for(let he of ae.get(me))ce.set(he.locatorHash,he);return{...te,versions:fe,dependents:[...ce.values()]}}))}let R=Object.keys(C).length>0;return R?($s.emitTree(yq(C),{configuration:r,json:this.json,stdout:this.context.stdout,separators:2}),1):(await Nt.start({configuration:r,includeFooter:!1,json:this.json,stdout:this.context.stdout},async L=>{L.reportInfo(1,"No audit suggestions")}),R?1:0)}};H0.paths=[["npm","audit"]],H0.usage=nt.Usage({description:"perform a vulnerability audit against the installed packages",details:`
+      This command checks for known security reports on the packages you use. The reports are by default extracted from the npm registry, and may or may not be relevant to your actual program (not all vulnerabilities affect all code paths).
+
+      For consistency with our other commands the default is to only check the direct dependencies for the active workspace. To extend this search to all workspaces, use \`-A,--all\`. To extend this search to both direct and transitive dependencies, use \`-R,--recursive\`.
+
+      Applying the \`--severity\` flag will limit the audit table to vulnerabilities of the corresponding severity and above. Valid values are ${aw.map(r=>`\`${r}\``).join(", ")}.
+
+      If the \`--json\` flag is set, Yarn will print the output exactly as received from the registry. Regardless of this flag, the process will exit with a non-zero exit code if a report is found for the selected packages.
+
+      If certain packages produce false positives for a particular environment, the \`--exclude\` flag can be used to exclude any number of packages from the audit. This can also be set in the configuration file with the \`npmAuditExcludePackages\` option.
+
+      If particular advisories are needed to be ignored, the \`--ignore\` flag can be used with Advisory ID's to ignore any number of advisories in the audit report. This can also be set in the configuration file with the \`npmAuditIgnoreAdvisories\` option.
+
+      To understand the dependency tree requiring vulnerable packages, check the raw report with the \`--json\` flag or use \`yarn why package\` to get more information as to who depends on them.
+    `,examples:[["Checks for known security issues with the installed packages. The output is a list of known issues.","yarn npm audit"],["Audit dependencies in all workspaces","yarn npm audit --all"],["Limit auditing to `dependencies` (excludes `devDependencies`)","yarn npm audit --environment production"],["Show audit report as valid JSON","yarn npm audit --json"],["Audit all direct and transitive dependencies","yarn npm audit --recursive"],["Output moderate (or more severe) vulnerabilities","yarn npm audit --severity moderate"],["Exclude certain packages","yarn npm audit --exclude package1 --exclude package2"],["Ignore specific advisories","yarn npm audit --ignore 1234567 --ignore 7654321"]]});Ye();Ye();St();jt();var Iq=$e(zn()),Bq=ve("util"),j0=class extends ut{constructor(){super(...arguments);this.fields=ge.String("-f,--fields",{description:"A comma-separated list of manifest fields that should be displayed"});this.json=ge.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.packages=ge.Rest()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o}=await Pt.find(r,this.context.cwd),a=typeof this.fields<"u"?new Set(["name",...this.fields.split(/\s*,\s*/)]):null,n=[],u=!1,A=await Nt.start({configuration:r,includeFooter:!1,json:this.json,stdout:this.context.stdout},async p=>{for(let h of this.packages){let E;if(h==="."){let ae=o.topLevelWorkspace;if(!ae.manifest.name)throw new it(`Missing ${de.pretty(r,"name",de.Type.CODE)} field in ${ue.fromPortablePath(V.join(ae.cwd,dr.manifest))}`);E=W.makeDescriptor(ae.manifest.name,"unknown")}else E=W.parseDescriptor(h);let I=Zr.getIdentUrl(E),v=vq(await Zr.get(I,{configuration:r,ident:E,jsonResponse:!0,customErrorMessage:Zr.customPackageError})),x=Object.keys(v.versions).sort(Iq.default.compareLoose),R=v["dist-tags"].latest||x[x.length-1],L=kr.validRange(E.range);if(L){let ae=Iq.default.maxSatisfying(x,L);ae!==null?R=ae:(p.reportWarning(0,`Unmet range ${W.prettyRange(r,E.range)}; falling back to the latest version`),u=!0)}else Object.hasOwn(v["dist-tags"],E.range)?R=v["dist-tags"][E.range]:E.range!=="unknown"&&(p.reportWarning(0,`Unknown tag ${W.prettyRange(r,E.range)}; falling back to the latest version`),u=!0);let U=v.versions[R],J={...v,...U,version:R,versions:x},te;if(a!==null){te={};for(let ae of a){let fe=J[ae];if(typeof fe<"u")te[ae]=fe;else{p.reportWarning(1,`The ${de.pretty(r,ae,de.Type.CODE)} field doesn't exist inside ${W.prettyIdent(r,E)}'s information`),u=!0;continue}}}else this.json||(delete J.dist,delete J.readme,delete J.users),te=J;p.reportJson(te),this.json||n.push(te)}});Bq.inspect.styles.name="cyan";for(let p of n)(p!==n[0]||u)&&this.context.stdout.write(`
+`),this.context.stdout.write(`${(0,Bq.inspect)(p,{depth:1/0,colors:!0,compact:!1})}
+`);return A.exitCode()}};j0.paths=[["npm","info"]],j0.usage=nt.Usage({category:"Npm-related commands",description:"show information about a package",details:"\n      This command fetches information about a package from the npm registry and prints it in a tree format.\n\n      The package does not have to be installed locally, but needs to have been published (in particular, local changes will be ignored even for workspaces).\n\n      Append `@<range>` to the package argument to provide information specific to the latest version that satisfies the range or to the corresponding tagged version. If the range is invalid or if there is no version satisfying the range, the command will print a warning and fall back to the latest version.\n\n      If the `-f,--fields` option is set, it's a comma-separated list of fields which will be used to only display part of the package information.\n\n      By default, this command won't return the `dist`, `readme`, and `users` fields, since they are often very long. To explicitly request those fields, explicitly list them with the `--fields` flag or request the output in JSON mode.\n    ",examples:[["Show all available information about react (except the `dist`, `readme`, and `users` fields)","yarn npm info react"],["Show all available information about react as valid JSON (including the `dist`, `readme`, and `users` fields)","yarn npm info react --json"],["Show all available information about react@16.12.0","yarn npm info react@16.12.0"],["Show all available information about react@next","yarn npm info react@next"],["Show the description of react","yarn npm info react --fields description"],["Show all available versions of react","yarn npm info react --fields versions"],["Show the readme of react","yarn npm info react --fields readme"],["Show a few fields of react","yarn npm info react --fields homepage,repository"]]});function vq(t){if(Array.isArray(t)){let e=[];for(let r of t)r=vq(r),r&&e.push(r);return e}else if(typeof t=="object"&&t!==null){let e={};for(let r of Object.keys(t)){if(r.startsWith("_"))continue;let o=vq(t[r]);o&&(e[r]=o)}return e}else return t||null}Ye();Ye();jt();var CBe=$e(f2()),G0=class extends ut{constructor(){super(...arguments);this.scope=ge.String("-s,--scope",{description:"Login to the registry configured for a given scope"});this.publish=ge.Boolean("--publish",!1,{description:"Login to the publish registry"});this.alwaysAuth=ge.Boolean("--always-auth",{description:"Set the npmAlwaysAuth configuration"})}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),o=await $Q({configuration:r,cwd:this.context.cwd,publish:this.publish,scope:this.scope});return(await Nt.start({configuration:r,stdout:this.context.stdout,includeFooter:!1},async n=>{let u=await Uvt({configuration:r,registry:o,report:n,stdin:this.context.stdin,stdout:this.context.stdout}),A=await Ovt(o,u,r);return await Mvt(o,A,{alwaysAuth:this.alwaysAuth,scope:this.scope}),n.reportInfo(0,"Successfully logged in")})).exitCode()}};G0.paths=[["npm","login"]],G0.usage=nt.Usage({category:"Npm-related commands",description:"store new login info to access the npm registry",details:"\n      This command will ask you for your username, password, and 2FA One-Time-Password (when it applies). It will then modify your local configuration (in your home folder, never in the project itself) to reference the new tokens thus generated.\n\n      Adding the `-s,--scope` flag will cause the authentication to be done against whatever registry is configured for the associated scope (see also `npmScopes`).\n\n      Adding the `--publish` flag will cause the authentication to be done against the registry used when publishing the package (see also `publishConfig.registry` and `npmPublishRegistry`).\n    ",examples:[["Login to the default registry","yarn npm login"],["Login to the registry linked to the @my-scope registry","yarn npm login --scope my-scope"],["Login to the publish registry for the current package","yarn npm login --publish"]]});async function $Q({scope:t,publish:e,configuration:r,cwd:o}){return t&&e?Zn.getScopeRegistry(t,{configuration:r,type:Zn.RegistryType.PUBLISH_REGISTRY}):t?Zn.getScopeRegistry(t,{configuration:r}):e?Zn.getPublishRegistry((await fC(r,o)).manifest,{configuration:r}):Zn.getDefaultRegistry({configuration:r})}async function Ovt(t,e,r){let o=`/-/user/org.couchdb.user:${encodeURIComponent(e.name)}`,a={_id:`org.couchdb.user:${e.name}`,name:e.name,password:e.password,type:"user",roles:[],date:new Date().toISOString()},n={attemptedAs:e.name,configuration:r,registry:t,jsonResponse:!0,authType:Zr.AuthType.NO_AUTH};try{return(await Zr.put(o,a,n)).token}catch(E){if(!(E.originalError?.name==="HTTPError"&&E.originalError?.response.statusCode===409))throw E}let u={...n,authType:Zr.AuthType.NO_AUTH,headers:{authorization:`Basic ${Buffer.from(`${e.name}:${e.password}`).toString("base64")}`}},A=await Zr.get(o,u);for(let[E,I]of Object.entries(A))(!a[E]||E==="roles")&&(a[E]=I);let p=`${o}/-rev/${a._rev}`;return(await Zr.put(p,a,u)).token}async function Mvt(t,e,{alwaysAuth:r,scope:o}){let a=u=>A=>{let p=_e.isIndexableObject(A)?A:{},h=p[u],E=_e.isIndexableObject(h)?h:{};return{...p,[u]:{...E,...r!==void 0?{npmAlwaysAuth:r}:{},npmAuthToken:e}}},n=o?{npmScopes:a(o)}:{npmRegistries:a(t)};return await Ke.updateHomeConfiguration(n)}async function Uvt({configuration:t,registry:e,report:r,stdin:o,stdout:a}){r.reportInfo(0,`Logging in to ${de.pretty(t,e,de.Type.URL)}`);let n=!1;if(e.match(/^https:\/\/npm\.pkg\.github\.com(\/|$)/)&&(r.reportInfo(0,"You seem to be using the GitHub Package Registry. Tokens must be generated with the 'repo', 'write:packages', and 'read:packages' permissions."),n=!0),r.reportSeparator(),t.env.YARN_IS_TEST_ENV)return{name:t.env.YARN_INJECT_NPM_USER||"",password:t.env.YARN_INJECT_NPM_PASSWORD||""};let u=await(0,CBe.prompt)([{type:"input",name:"name",message:"Username:",required:!0,onCancel:()=>process.exit(130),stdin:o,stdout:a},{type:"password",name:"password",message:n?"Token:":"Password:",required:!0,onCancel:()=>process.exit(130),stdin:o,stdout:a}]);return r.reportSeparator(),u}Ye();Ye();jt();var lw=new Set(["npmAuthIdent","npmAuthToken"]),q0=class extends ut{constructor(){super(...arguments);this.scope=ge.String("-s,--scope",{description:"Logout of the registry configured for a given scope"});this.publish=ge.Boolean("--publish",!1,{description:"Logout of the publish registry"});this.all=ge.Boolean("-A,--all",!1,{description:"Logout of all registries"})}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),o=async()=>{let n=await $Q({configuration:r,cwd:this.context.cwd,publish:this.publish,scope:this.scope}),u=await Ke.find(this.context.cwd,this.context.plugins),A=W.makeIdent(this.scope??null,"pkg");return!Zn.getAuthConfiguration(n,{configuration:u,ident:A}).get("npmAuthToken")};return(await Nt.start({configuration:r,stdout:this.context.stdout},async n=>{if(this.all&&(await Hvt(),n.reportInfo(0,"Successfully logged out from everything")),this.scope){await wBe("npmScopes",this.scope),await o()?n.reportInfo(0,`Successfully logged out from ${this.scope}`):n.reportWarning(0,"Scope authentication settings removed, but some other ones settings still apply to it");return}let u=await $Q({configuration:r,cwd:this.context.cwd,publish:this.publish});await wBe("npmRegistries",u),await o()?n.reportInfo(0,`Successfully logged out from ${u}`):n.reportWarning(0,"Registry authentication settings removed, but some other ones settings still apply to it")})).exitCode()}};q0.paths=[["npm","logout"]],q0.usage=nt.Usage({category:"Npm-related commands",description:"logout of the npm registry",details:"\n      This command will log you out by modifying your local configuration (in your home folder, never in the project itself) to delete all credentials linked to a registry.\n\n      Adding the `-s,--scope` flag will cause the deletion to be done against whatever registry is configured for the associated scope (see also `npmScopes`).\n\n      Adding the `--publish` flag will cause the deletion to be done against the registry used when publishing the package (see also `publishConfig.registry` and `npmPublishRegistry`).\n\n      Adding the `-A,--all` flag will cause the deletion to be done against all registries and scopes.\n    ",examples:[["Logout of the default registry","yarn npm logout"],["Logout of the @my-scope scope","yarn npm logout --scope my-scope"],["Logout of the publish registry for the current package","yarn npm logout --publish"],["Logout of all registries","yarn npm logout --all"]]});function _vt(t,e){let r=t[e];if(!_e.isIndexableObject(r))return!1;let o=new Set(Object.keys(r));if([...lw].every(n=>!o.has(n)))return!1;for(let n of lw)o.delete(n);if(o.size===0)return t[e]=void 0,!0;let a={...r};for(let n of lw)delete a[n];return t[e]=a,!0}async function Hvt(){let t=e=>{let r=!1,o=_e.isIndexableObject(e)?{...e}:{};o.npmAuthToken&&(delete o.npmAuthToken,r=!0);for(let a of Object.keys(o))_vt(o,a)&&(r=!0);if(Object.keys(o).length!==0)return r?o:e};return await Ke.updateHomeConfiguration({npmRegistries:t,npmScopes:t})}async function wBe(t,e){return await Ke.updateHomeConfiguration({[t]:r=>{let o=_e.isIndexableObject(r)?r:{};if(!Object.hasOwn(o,e))return r;let a=o[e],n=_e.isIndexableObject(a)?a:{},u=new Set(Object.keys(n));if([...lw].every(p=>!u.has(p)))return r;for(let p of lw)u.delete(p);if(u.size===0)return Object.keys(o).length===1?void 0:{...o,[e]:void 0};let A={};for(let p of lw)A[p]=void 0;return{...o,[e]:{...n,...A}}}})}Ye();jt();var Y0=class extends ut{constructor(){super(...arguments);this.access=ge.String("--access",{description:"The access for the published package (public or restricted)"});this.tag=ge.String("--tag","latest",{description:"The tag on the registry that the package should be attached to"});this.tolerateRepublish=ge.Boolean("--tolerate-republish",!1,{description:"Warn and exit when republishing an already existing version of a package"});this.otp=ge.String("--otp",{description:"The OTP token to use with the command"})}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd);if(!a)throw new rr(o.cwd,this.context.cwd);if(a.manifest.private)throw new it("Private workspaces cannot be published");if(a.manifest.name===null||a.manifest.version===null)throw new it("Workspaces must have valid names and versions to be published on an external registry");await o.restoreInstallState();let n=a.manifest.name,u=a.manifest.version,A=Zn.getPublishRegistry(a.manifest,{configuration:r});return(await Nt.start({configuration:r,stdout:this.context.stdout},async h=>{if(this.tolerateRepublish)try{let E=await Zr.get(Zr.getIdentUrl(n),{configuration:r,registry:A,ident:n,jsonResponse:!0});if(!Object.hasOwn(E,"versions"))throw new zt(15,'Registry returned invalid data for - missing "versions" field');if(Object.hasOwn(E.versions,u)){h.reportWarning(0,`Registry already knows about version ${u}; skipping.`);return}}catch(E){if(E.originalError?.response?.statusCode!==404)throw E}await un.maybeExecuteWorkspaceLifecycleScript(a,"prepublish",{report:h}),await wA.prepareForPack(a,{report:h},async()=>{let E=await wA.genPackList(a);for(let R of E)h.reportInfo(null,R);let I=await wA.genPackStream(a,E),v=await _e.bufferStream(I),x=await ow.getGitHead(a.cwd),C=await ow.makePublishBody(a,v,{access:this.access,tag:this.tag,registry:A,gitHead:x});await Zr.put(Zr.getIdentUrl(n),C,{configuration:r,registry:A,ident:n,otp:this.otp,jsonResponse:!0})}),h.reportInfo(0,"Package archive published")})).exitCode()}};Y0.paths=[["npm","publish"]],Y0.usage=nt.Usage({category:"Npm-related commands",description:"publish the active workspace to the npm registry",details:'\n      This command will pack the active workspace into a fresh archive and upload it to the npm registry.\n\n      The package will by default be attached to the `latest` tag on the registry, but this behavior can be overriden by using the `--tag` option.\n\n      Note that for legacy reasons scoped packages are by default published with an access set to `restricted` (aka "private packages"). This requires you to register for a paid npm plan. In case you simply wish to publish a public scoped package to the registry (for free), just add the `--access public` flag. This behavior can be enabled by default through the `npmPublishAccess` settings.\n    ',examples:[["Publish the active workspace","yarn npm publish"]]});Ye();jt();var IBe=$e(zn());Ye();St();jt();var W0=class extends ut{constructor(){super(...arguments);this.json=ge.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.package=ge.String({required:!1})}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd),n;if(typeof this.package<"u")n=W.parseIdent(this.package);else{if(!a)throw new rr(o.cwd,this.context.cwd);if(!a.manifest.name)throw new it(`Missing 'name' field in ${ue.fromPortablePath(V.join(a.cwd,dr.manifest))}`);n=a.manifest.name}let u=await Tv(n,r),p={children:_e.sortMap(Object.entries(u),([h])=>h).map(([h,E])=>({value:de.tuple(de.Type.RESOLUTION,{descriptor:W.makeDescriptor(n,h),locator:W.makeLocator(n,E)})}))};return $s.emitTree(p,{configuration:r,json:this.json,stdout:this.context.stdout})}};W0.paths=[["npm","tag","list"]],W0.usage=nt.Usage({category:"Npm-related commands",description:"list all dist-tags of a package",details:`
+      This command will list all tags of a package from the npm registry.
+
+      If the package is not specified, Yarn will default to the current workspace.
+    `,examples:[["List all tags of package `my-pkg`","yarn npm tag list my-pkg"]]});async function Tv(t,e){let r=`/-/package${Zr.getIdentUrl(t)}/dist-tags`;return Zr.get(r,{configuration:e,ident:t,jsonResponse:!0,customErrorMessage:Zr.customPackageError})}var K0=class extends ut{constructor(){super(...arguments);this.package=ge.String();this.tag=ge.String()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd);if(!a)throw new rr(o.cwd,this.context.cwd);let n=W.parseDescriptor(this.package,!0),u=n.range;if(!IBe.default.valid(u))throw new it(`The range ${de.pretty(r,n.range,de.Type.RANGE)} must be a valid semver version`);let A=Zn.getPublishRegistry(a.manifest,{configuration:r}),p=de.pretty(r,n,de.Type.IDENT),h=de.pretty(r,u,de.Type.RANGE),E=de.pretty(r,this.tag,de.Type.CODE);return(await Nt.start({configuration:r,stdout:this.context.stdout},async v=>{let x=await Tv(n,r);Object.hasOwn(x,this.tag)&&x[this.tag]===u&&v.reportWarning(0,`Tag ${E} is already set to version ${h}`);let C=`/-/package${Zr.getIdentUrl(n)}/dist-tags/${encodeURIComponent(this.tag)}`;await Zr.put(C,u,{configuration:r,registry:A,ident:n,jsonRequest:!0,jsonResponse:!0}),v.reportInfo(0,`Tag ${E} added to version ${h} of package ${p}`)})).exitCode()}};K0.paths=[["npm","tag","add"]],K0.usage=nt.Usage({category:"Npm-related commands",description:"add a tag for a specific version of a package",details:`
+      This command will add a tag to the npm registry for a specific version of a package. If the tag already exists, it will be overwritten.
+    `,examples:[["Add a `beta` tag for version `2.3.4-beta.4` of package `my-pkg`","yarn npm tag add my-pkg@2.3.4-beta.4 beta"]]});Ye();jt();var V0=class extends ut{constructor(){super(...arguments);this.package=ge.String();this.tag=ge.String()}async execute(){if(this.tag==="latest")throw new it("The 'latest' tag cannot be removed.");let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd);if(!a)throw new rr(o.cwd,this.context.cwd);let n=W.parseIdent(this.package),u=Zn.getPublishRegistry(a.manifest,{configuration:r}),A=de.pretty(r,this.tag,de.Type.CODE),p=de.pretty(r,n,de.Type.IDENT),h=await Tv(n,r);if(!Object.hasOwn(h,this.tag))throw new it(`${A} is not a tag of package ${p}`);return(await Nt.start({configuration:r,stdout:this.context.stdout},async I=>{let v=`/-/package${Zr.getIdentUrl(n)}/dist-tags/${encodeURIComponent(this.tag)}`;await Zr.del(v,{configuration:r,registry:u,ident:n,jsonResponse:!0}),I.reportInfo(0,`Tag ${A} removed from package ${p}`)})).exitCode()}};V0.paths=[["npm","tag","remove"]],V0.usage=nt.Usage({category:"Npm-related commands",description:"remove a tag from a package",details:`
+      This command will remove a tag from a package from the npm registry.
+    `,examples:[["Remove the `beta` tag from package `my-pkg`","yarn npm tag remove my-pkg beta"]]});Ye();Ye();jt();var J0=class extends ut{constructor(){super(...arguments);this.scope=ge.String("-s,--scope",{description:"Print username for the registry configured for a given scope"});this.publish=ge.Boolean("--publish",!1,{description:"Print username for the publish registry"})}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),o;return this.scope&&this.publish?o=Zn.getScopeRegistry(this.scope,{configuration:r,type:Zn.RegistryType.PUBLISH_REGISTRY}):this.scope?o=Zn.getScopeRegistry(this.scope,{configuration:r}):this.publish?o=Zn.getPublishRegistry((await fC(r,this.context.cwd)).manifest,{configuration:r}):o=Zn.getDefaultRegistry({configuration:r}),(await Nt.start({configuration:r,stdout:this.context.stdout},async n=>{let u;try{u=await Zr.get("/-/whoami",{configuration:r,registry:o,authType:Zr.AuthType.ALWAYS_AUTH,jsonResponse:!0,ident:this.scope?W.makeIdent(this.scope,""):void 0})}catch(A){if(A.response?.statusCode===401||A.response?.statusCode===403){n.reportError(41,"Authentication failed - your credentials may have expired");return}else throw A}n.reportInfo(0,u.username)})).exitCode()}};J0.paths=[["npm","whoami"]],J0.usage=nt.Usage({category:"Npm-related commands",description:"display the name of the authenticated user",details:"\n      Print the username associated with the current authentication settings to the standard output.\n\n      When using `-s,--scope`, the username printed will be the one that matches the authentication settings of the registry associated with the given scope (those settings can be overriden using the `npmRegistries` map, and the registry associated with the scope is configured via the `npmScopes` map).\n\n      When using `--publish`, the registry we'll select will by default be the one used when publishing packages (`publishConfig.registry` or `npmPublishRegistry` if available, otherwise we'll fallback to the regular `npmRegistryServer`).\n    ",examples:[["Print username for the default registry","yarn npm whoami"],["Print username for the registry on a given scope","yarn npm whoami --scope company"]]});var jvt={configuration:{npmPublishAccess:{description:"Default access of the published packages",type:"STRING",default:null},npmAuditExcludePackages:{description:"Array of glob patterns of packages to exclude from npm audit",type:"STRING",default:[],isArray:!0},npmAuditIgnoreAdvisories:{description:"Array of glob patterns of advisory IDs to exclude from npm audit",type:"STRING",default:[],isArray:!0}},commands:[H0,j0,G0,q0,Y0,K0,W0,V0,J0]},Gvt=jvt;var Fq={};Vt(Fq,{PatchCommand:()=>Z0,PatchCommitCommand:()=>X0,PatchFetcher:()=>Uv,PatchResolver:()=>_v,default:()=>aDt,patchUtils:()=>Sm});Ye();Ye();St();nA();var Sm={};Vt(Sm,{applyPatchFile:()=>tF,diffFolders:()=>kq,ensureUnpatchedDescriptor:()=>Sq,ensureUnpatchedLocator:()=>nF,extractPackageToDisk:()=>xq,extractPatchFlags:()=>xBe,isParentRequired:()=>bq,isPatchDescriptor:()=>rF,isPatchLocator:()=>z0,loadPatchFiles:()=>Mv,makeDescriptor:()=>iF,makeLocator:()=>Pq,makePatchHash:()=>Qq,parseDescriptor:()=>Lv,parseLocator:()=>Ov,parsePatchFile:()=>Nv,unpatchDescriptor:()=>iDt,unpatchLocator:()=>sDt});Ye();St();Ye();St();var qvt=/^@@ -(\d+)(,(\d+))? \+(\d+)(,(\d+))? @@.*/;function cw(t){return V.relative(Bt.root,V.resolve(Bt.root,ue.toPortablePath(t)))}function Yvt(t){let e=t.trim().match(qvt);if(!e)throw new Error(`Bad header line: '${t}'`);return{original:{start:Math.max(Number(e[1]),1),length:Number(e[3]||1)},patched:{start:Math.max(Number(e[4]),1),length:Number(e[6]||1)}}}var Wvt=420,Kvt=493;var BBe=()=>({semverExclusivity:null,diffLineFromPath:null,diffLineToPath:null,oldMode:null,newMode:null,deletedFileMode:null,newFileMode:null,renameFrom:null,renameTo:null,beforeHash:null,afterHash:null,fromPath:null,toPath:null,hunks:null}),Vvt=t=>({header:Yvt(t),parts:[]}),Jvt={["@"]:"header",["-"]:"deletion",["+"]:"insertion",[" "]:"context",["\\"]:"pragma",undefined:"context"};function zvt(t){let e=[],r=BBe(),o="parsing header",a=null,n=null;function u(){a&&(n&&(a.parts.push(n),n=null),r.hunks.push(a),a=null)}function A(){u(),e.push(r),r=BBe()}for(let p=0;p<t.length;p++){let h=t[p];if(o==="parsing header")if(h.startsWith("@@"))o="parsing hunks",r.hunks=[],p-=1;else if(h.startsWith("diff --git ")){r&&r.diffLineFromPath&&A();let E=h.match(/^diff --git a\/(.*?) b\/(.*?)\s*$/);if(!E)throw new Error(`Bad diff line: ${h}`);r.diffLineFromPath=E[1],r.diffLineToPath=E[2]}else if(h.startsWith("old mode "))r.oldMode=h.slice(9).trim();else if(h.startsWith("new mode "))r.newMode=h.slice(9).trim();else if(h.startsWith("deleted file mode "))r.deletedFileMode=h.slice(18).trim();else if(h.startsWith("new file mode "))r.newFileMode=h.slice(14).trim();else if(h.startsWith("rename from "))r.renameFrom=h.slice(12).trim();else if(h.startsWith("rename to "))r.renameTo=h.slice(10).trim();else if(h.startsWith("index ")){let E=h.match(/(\w+)\.\.(\w+)/);if(!E)continue;r.beforeHash=E[1],r.afterHash=E[2]}else h.startsWith("semver exclusivity ")?r.semverExclusivity=h.slice(19).trim():h.startsWith("--- ")?r.fromPath=h.slice(6).trim():h.startsWith("+++ ")&&(r.toPath=h.slice(6).trim());else{let E=Jvt[h[0]]||null;switch(E){case"header":u(),a=Vvt(h);break;case null:o="parsing header",A(),p-=1;break;case"pragma":{if(!h.startsWith("\\ No newline at end of file"))throw new Error(`Unrecognized pragma in patch file: ${h}`);if(!n)throw new Error("Bad parser state: No newline at EOF pragma encountered without context");n.noNewlineAtEndOfFile=!0}break;case"context":case"deletion":case"insertion":{if(!a)throw new Error("Bad parser state: Hunk lines encountered before hunk header");n&&n.type!==E&&(a.parts.push(n),n=null),n||(n={type:E,lines:[],noNewlineAtEndOfFile:!1}),n.lines.push(h.slice(1))}break;default:_e.assertNever(E);break}}}A();for(let{hunks:p}of e)if(p)for(let h of p)Zvt(h);return e}function Xvt(t){let e=[];for(let r of t){let{semverExclusivity:o,diffLineFromPath:a,diffLineToPath:n,oldMode:u,newMode:A,deletedFileMode:p,newFileMode:h,renameFrom:E,renameTo:I,beforeHash:v,afterHash:x,fromPath:C,toPath:R,hunks:L}=r,U=E?"rename":p?"file deletion":h?"file creation":L&&L.length>0?"patch":"mode change",J=null;switch(U){case"rename":{if(!E||!I)throw new Error("Bad parser state: rename from & to not given");e.push({type:"rename",semverExclusivity:o,fromPath:cw(E),toPath:cw(I)}),J=I}break;case"file deletion":{let te=a||C;if(!te)throw new Error("Bad parse state: no path given for file deletion");e.push({type:"file deletion",semverExclusivity:o,hunk:L&&L[0]||null,path:cw(te),mode:eF(p),hash:v})}break;case"file creation":{let te=n||R;if(!te)throw new Error("Bad parse state: no path given for file creation");e.push({type:"file creation",semverExclusivity:o,hunk:L&&L[0]||null,path:cw(te),mode:eF(h),hash:x})}break;case"patch":case"mode change":J=R||n;break;default:_e.assertNever(U);break}J&&u&&A&&u!==A&&e.push({type:"mode change",semverExclusivity:o,path:cw(J),oldMode:eF(u),newMode:eF(A)}),J&&L&&L.length&&e.push({type:"patch",semverExclusivity:o,path:cw(J),hunks:L,beforeHash:v,afterHash:x})}if(e.length===0)throw new Error("Unable to parse patch file: No changes found. Make sure the patch is a valid UTF8 encoded string");return e}function eF(t){let e=parseInt(t,8)&511;if(e!==Wvt&&e!==Kvt)throw new Error(`Unexpected file mode string: ${t}`);return e}function Nv(t){let e=t.split(/\n/g);return e[e.length-1]===""&&e.pop(),Xvt(zvt(e))}function Zvt(t){let e=0,r=0;for(let{type:o,lines:a}of t.parts)switch(o){case"context":r+=a.length,e+=a.length;break;case"deletion":e+=a.length;break;case"insertion":r+=a.length;break;default:_e.assertNever(o);break}if(e!==t.header.original.length||r!==t.header.patched.length){let o=a=>a<0?a:`+${a}`;throw new Error(`hunk header integrity check failed (expected @@ ${o(t.header.original.length)} ${o(t.header.patched.length)} @@, got @@ ${o(e)} ${o(r)} @@)`)}}Ye();St();var uw=class extends Error{constructor(r,o){super(`Cannot apply hunk #${r+1}`);this.hunk=o}};async function Aw(t,e,r){let o=await t.lstatPromise(e),a=await r();typeof a<"u"&&(e=a),await t.lutimesPromise(e,o.atime,o.mtime)}async function tF(t,{baseFs:e=new Tn,dryRun:r=!1,version:o=null}={}){for(let a of t)if(!(a.semverExclusivity!==null&&o!==null&&!kr.satisfiesWithPrereleases(o,a.semverExclusivity)))switch(a.type){case"file deletion":if(r){if(!e.existsSync(a.path))throw new Error(`Trying to delete a file that doesn't exist: ${a.path}`)}else await Aw(e,V.dirname(a.path),async()=>{await e.unlinkPromise(a.path)});break;case"rename":if(r){if(!e.existsSync(a.fromPath))throw new Error(`Trying to move a file that doesn't exist: ${a.fromPath}`)}else await Aw(e,V.dirname(a.fromPath),async()=>{await Aw(e,V.dirname(a.toPath),async()=>{await Aw(e,a.fromPath,async()=>(await e.movePromise(a.fromPath,a.toPath),a.toPath))})});break;case"file creation":if(r){if(e.existsSync(a.path))throw new Error(`Trying to create a file that already exists: ${a.path}`)}else{let n=a.hunk?a.hunk.parts[0].lines.join(`
+`)+(a.hunk.parts[0].noNewlineAtEndOfFile?"":`
+`):"";await e.mkdirpPromise(V.dirname(a.path),{chmod:493,utimes:[vi.SAFE_TIME,vi.SAFE_TIME]}),await e.writeFilePromise(a.path,n,{mode:a.mode}),await e.utimesPromise(a.path,vi.SAFE_TIME,vi.SAFE_TIME)}break;case"patch":await Aw(e,a.path,async()=>{await tDt(a,{baseFs:e,dryRun:r})});break;case"mode change":{let u=(await e.statPromise(a.path)).mode;if(vBe(a.newMode)!==vBe(u))continue;await Aw(e,a.path,async()=>{await e.chmodPromise(a.path,a.newMode)})}break;default:_e.assertNever(a);break}}function vBe(t){return(t&64)>0}function DBe(t){return t.replace(/\s+$/,"")}function eDt(t,e){return DBe(t)===DBe(e)}async function tDt({hunks:t,path:e},{baseFs:r,dryRun:o=!1}){let a=await r.statSync(e).mode,u=(await r.readFileSync(e,"utf8")).split(/\n/),A=[],p=0,h=0;for(let I of t){let v=Math.max(h,I.header.patched.start+p),x=Math.max(0,v-h),C=Math.max(0,u.length-v-I.header.original.length),R=Math.max(x,C),L=0,U=0,J=null;for(;L<=R;){if(L<=x&&(U=v-L,J=SBe(I,u,U),J!==null)){L=-L;break}if(L<=C&&(U=v+L,J=SBe(I,u,U),J!==null))break;L+=1}if(J===null)throw new uw(t.indexOf(I),I);A.push(J),p+=L,h=U+I.header.original.length}if(o)return;let E=0;for(let I of A)for(let v of I)switch(v.type){case"splice":{let x=v.index+E;u.splice(x,v.numToDelete,...v.linesToInsert),E+=v.linesToInsert.length-v.numToDelete}break;case"pop":u.pop();break;case"push":u.push(v.line);break;default:_e.assertNever(v);break}await r.writeFilePromise(e,u.join(`
+`),{mode:a})}function SBe(t,e,r){let o=[];for(let a of t.parts)switch(a.type){case"context":case"deletion":{for(let n of a.lines){let u=e[r];if(u==null||!eDt(u,n))return null;r+=1}a.type==="deletion"&&(o.push({type:"splice",index:r-a.lines.length,numToDelete:a.lines.length,linesToInsert:[]}),a.noNewlineAtEndOfFile&&o.push({type:"push",line:""}))}break;case"insertion":o.push({type:"splice",index:r,numToDelete:0,linesToInsert:a.lines}),a.noNewlineAtEndOfFile&&o.push({type:"pop"});break;default:_e.assertNever(a.type);break}return o}var nDt=/^builtin<([^>]+)>$/;function fw(t,e){let{protocol:r,source:o,selector:a,params:n}=W.parseRange(t);if(r!=="patch:")throw new Error("Invalid patch range");if(o===null)throw new Error("Patch locators must explicitly define their source");let u=a?a.split(/&/).map(E=>ue.toPortablePath(E)):[],A=n&&typeof n.locator=="string"?W.parseLocator(n.locator):null,p=n&&typeof n.version=="string"?n.version:null,h=e(o);return{parentLocator:A,sourceItem:h,patchPaths:u,sourceVersion:p}}function rF(t){return t.range.startsWith("patch:")}function z0(t){return t.reference.startsWith("patch:")}function Lv(t){let{sourceItem:e,...r}=fw(t.range,W.parseDescriptor);return{...r,sourceDescriptor:e}}function Ov(t){let{sourceItem:e,...r}=fw(t.reference,W.parseLocator);return{...r,sourceLocator:e}}function iDt(t){let{sourceItem:e}=fw(t.range,W.parseDescriptor);return e}function sDt(t){let{sourceItem:e}=fw(t.reference,W.parseLocator);return e}function Sq(t){if(!rF(t))return t;let{sourceItem:e}=fw(t.range,W.parseDescriptor);return e}function nF(t){if(!z0(t))return t;let{sourceItem:e}=fw(t.reference,W.parseLocator);return e}function PBe({parentLocator:t,sourceItem:e,patchPaths:r,sourceVersion:o,patchHash:a},n){let u=t!==null?{locator:W.stringifyLocator(t)}:{},A=typeof o<"u"?{version:o}:{},p=typeof a<"u"?{hash:a}:{};return W.makeRange({protocol:"patch:",source:n(e),selector:r.join("&"),params:{...A,...p,...u}})}function iF(t,{parentLocator:e,sourceDescriptor:r,patchPaths:o}){return W.makeDescriptor(t,PBe({parentLocator:e,sourceItem:r,patchPaths:o},W.stringifyDescriptor))}function Pq(t,{parentLocator:e,sourcePackage:r,patchPaths:o,patchHash:a}){return W.makeLocator(t,PBe({parentLocator:e,sourceItem:r,sourceVersion:r.version,patchPaths:o,patchHash:a},W.stringifyLocator))}function bBe({onAbsolute:t,onRelative:e,onProject:r,onBuiltin:o},a){let n=a.lastIndexOf("!");n!==-1&&(a=a.slice(n+1));let u=a.match(nDt);return u!==null?o(u[1]):a.startsWith("~/")?r(a.slice(2)):V.isAbsolute(a)?t(a):e(a)}function xBe(t){let e=t.lastIndexOf("!");return{optional:(e!==-1?new Set(t.slice(0,e).split(/!/)):new Set).has("optional")}}function bq(t){return bBe({onAbsolute:()=>!1,onRelative:()=>!0,onProject:()=>!1,onBuiltin:()=>!1},t)}async function Mv(t,e,r){let o=t!==null?await r.fetcher.fetch(t,r):null,a=o&&o.localPath?{packageFs:new gn(Bt.root),prefixPath:V.relative(Bt.root,o.localPath)}:o;o&&o!==a&&o.releaseFs&&o.releaseFs();let n=await _e.releaseAfterUseAsync(async()=>await Promise.all(e.map(async u=>{let A=xBe(u),p=await bBe({onAbsolute:async h=>await oe.readFilePromise(h,"utf8"),onRelative:async h=>{if(a===null)throw new Error("Assertion failed: The parent locator should have been fetched");return await a.packageFs.readFilePromise(V.join(a.prefixPath,h),"utf8")},onProject:async h=>await oe.readFilePromise(V.join(r.project.cwd,h),"utf8"),onBuiltin:async h=>await r.project.configuration.firstHook(E=>E.getBuiltinPatch,r.project,h)},u);return{...A,source:p}})));for(let u of n)typeof u.source=="string"&&(u.source=u.source.replace(/\r\n?/g,`
+`));return n}async function xq(t,{cache:e,project:r}){let o=r.storedPackages.get(t.locatorHash);if(typeof o>"u")throw new Error("Assertion failed: Expected the package to be registered");let a=nF(t),n=r.storedChecksums,u=new Qi,A=await oe.mktempPromise(),p=V.join(A,"source"),h=V.join(A,"user"),E=V.join(A,".yarn-patch.json"),I=r.configuration.makeFetcher(),v=[];try{let x,C;if(t.locatorHash===a.locatorHash){let R=await I.fetch(t,{cache:e,project:r,fetcher:I,checksums:n,report:u});v.push(()=>R.releaseFs?.()),x=R,C=R}else x=await I.fetch(t,{cache:e,project:r,fetcher:I,checksums:n,report:u}),v.push(()=>x.releaseFs?.()),C=await I.fetch(t,{cache:e,project:r,fetcher:I,checksums:n,report:u}),v.push(()=>C.releaseFs?.());await Promise.all([oe.copyPromise(p,x.prefixPath,{baseFs:x.packageFs}),oe.copyPromise(h,C.prefixPath,{baseFs:C.packageFs}),oe.writeJsonPromise(E,{locator:W.stringifyLocator(t),version:o.version})])}finally{for(let x of v)x()}return oe.detachTemp(A),h}async function kq(t,e){let r=ue.fromPortablePath(t).replace(/\\/g,"/"),o=ue.fromPortablePath(e).replace(/\\/g,"/"),{stdout:a,stderr:n}=await Ur.execvp("git",["-c","core.safecrlf=false","diff","--src-prefix=a/","--dst-prefix=b/","--ignore-cr-at-eol","--full-index","--no-index","--no-renames","--text",r,o],{cwd:ue.toPortablePath(process.cwd()),env:{...process.env,GIT_CONFIG_NOSYSTEM:"1",HOME:"",XDG_CONFIG_HOME:"",USERPROFILE:""}});if(n.length>0)throw new Error(`Unable to diff directories. Make sure you have a recent version of 'git' available in PATH.
+The following error was reported by 'git':
+${n}`);let u=r.startsWith("/")?A=>A.slice(1):A=>A;return a.replace(new RegExp(`(a|b)(${_e.escapeRegExp(`/${u(r)}/`)})`,"g"),"$1/").replace(new RegExp(`(a|b)${_e.escapeRegExp(`/${u(o)}/`)}`,"g"),"$1/").replace(new RegExp(_e.escapeRegExp(`${r}/`),"g"),"").replace(new RegExp(_e.escapeRegExp(`${o}/`),"g"),"")}function Qq(t,e){let r=[];for(let{source:o}of t){if(o===null)continue;let a=Nv(o);for(let n of a){let{semverExclusivity:u,...A}=n;u!==null&&e!==null&&!kr.satisfiesWithPrereleases(e,u)||r.push(JSON.stringify(A))}}return wn.makeHash(`${3}`,...r).slice(0,6)}Ye();function kBe(t,{configuration:e,report:r}){for(let o of t.parts)for(let a of o.lines)switch(o.type){case"context":r.reportInfo(null,`  ${de.pretty(e,a,"grey")}`);break;case"deletion":r.reportError(28,`- ${de.pretty(e,a,de.Type.REMOVED)}`);break;case"insertion":r.reportError(28,`+ ${de.pretty(e,a,de.Type.ADDED)}`);break;default:_e.assertNever(o.type)}}var Uv=class{supports(e,r){return!!z0(e)}getLocalPath(e,r){return null}async fetch(e,r){let o=r.checksums.get(e.locatorHash)||null,[a,n,u]=await r.cache.fetchPackageFromCache(e,o,{onHit:()=>r.report.reportCacheHit(e),onMiss:()=>r.report.reportCacheMiss(e,`${W.prettyLocator(r.project.configuration,e)} can't be found in the cache and will be fetched from the disk`),loader:()=>this.patchPackage(e,r),...r.cacheOptions});return{packageFs:a,releaseFs:n,prefixPath:W.getIdentVendorPath(e),localPath:this.getLocalPath(e,r),checksum:u}}async patchPackage(e,r){let{parentLocator:o,sourceLocator:a,sourceVersion:n,patchPaths:u}=Ov(e),A=await Mv(o,u,r),p=await oe.mktempPromise(),h=V.join(p,"current.zip"),E=await r.fetcher.fetch(a,r),I=W.getIdentVendorPath(e),v=new zi(h,{create:!0,level:r.project.configuration.get("compressionLevel")});await _e.releaseAfterUseAsync(async()=>{await v.copyPromise(I,E.prefixPath,{baseFs:E.packageFs,stableSort:!0})},E.releaseFs),v.saveAndClose();for(let{source:x,optional:C}of A){if(x===null)continue;let R=new zi(h,{level:r.project.configuration.get("compressionLevel")}),L=new gn(V.resolve(Bt.root,I),{baseFs:R});try{await tF(Nv(x),{baseFs:L,version:n})}catch(U){if(!(U instanceof uw))throw U;let J=r.project.configuration.get("enableInlineHunks"),te=!J&&!C?" (set enableInlineHunks for details)":"",ae=`${W.prettyLocator(r.project.configuration,e)}: ${U.message}${te}`,fe=ce=>{!J||kBe(U.hunk,{configuration:r.project.configuration,report:ce})};if(R.discardAndClose(),C){r.report.reportWarningOnce(66,ae,{reportExtra:fe});continue}else throw new zt(66,ae,fe)}R.saveAndClose()}return new zi(h,{level:r.project.configuration.get("compressionLevel")})}};Ye();var _v=class{supportsDescriptor(e,r){return!!rF(e)}supportsLocator(e,r){return!!z0(e)}shouldPersistResolution(e,r){return!1}bindDescriptor(e,r,o){let{patchPaths:a}=Lv(e);return a.every(n=>!bq(n))?e:W.bindDescriptor(e,{locator:W.stringifyLocator(r)})}getResolutionDependencies(e,r){let{sourceDescriptor:o}=Lv(e);return{sourceDescriptor:r.project.configuration.normalizeDependency(o)}}async getCandidates(e,r,o){if(!o.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let{parentLocator:a,patchPaths:n}=Lv(e),u=await Mv(a,n,o.fetchOptions),A=r.sourceDescriptor;if(typeof A>"u")throw new Error("Assertion failed: The dependency should have been resolved");let p=Qq(u,A.version);return[Pq(e,{parentLocator:a,sourcePackage:A,patchPaths:n,patchHash:p})]}async getSatisfying(e,r,o,a){let[n]=await this.getCandidates(e,r,a);return{locators:o.filter(u=>u.locatorHash===n.locatorHash),sorted:!1}}async resolve(e,r){let{sourceLocator:o}=Ov(e);return{...await r.resolver.resolve(o,r),...e}}};Ye();St();jt();var X0=class extends ut{constructor(){super(...arguments);this.save=ge.Boolean("-s,--save",!1,{description:"Add the patch to your resolution entries"});this.patchFolder=ge.String()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd);if(!a)throw new rr(o.cwd,this.context.cwd);await o.restoreInstallState();let n=V.resolve(this.context.cwd,ue.toPortablePath(this.patchFolder)),u=V.join(n,"../source"),A=V.join(n,"../.yarn-patch.json");if(!oe.existsSync(u))throw new it("The argument folder didn't get created by 'yarn patch'");let p=await kq(u,n),h=await oe.readJsonPromise(A),E=W.parseLocator(h.locator,!0);if(!o.storedPackages.has(E.locatorHash))throw new it("No package found in the project for the given locator");if(!this.save){this.context.stdout.write(p);return}let I=r.get("patchFolder"),v=V.join(I,`${W.slugifyLocator(E)}.patch`);await oe.mkdirPromise(I,{recursive:!0}),await oe.writeFilePromise(v,p);let x=[],C=new Map;for(let R of o.storedPackages.values()){if(W.isVirtualLocator(R))continue;let L=R.dependencies.get(E.identHash);if(!L)continue;let U=W.ensureDevirtualizedDescriptor(L),J=Sq(U),te=o.storedResolutions.get(J.descriptorHash);if(!te)throw new Error("Assertion failed: Expected the resolution to have been registered");if(!o.storedPackages.get(te))throw new Error("Assertion failed: Expected the package to have been registered");let fe=o.tryWorkspaceByLocator(R);if(fe)x.push(fe);else{let ce=o.originalPackages.get(R.locatorHash);if(!ce)throw new Error("Assertion failed: Expected the original package to have been registered");let me=ce.dependencies.get(L.identHash);if(!me)throw new Error("Assertion failed: Expected the original dependency to have been registered");C.set(me.descriptorHash,me)}}for(let R of x)for(let L of Ot.hardDependencies){let U=R.manifest[L].get(E.identHash);if(!U)continue;let J=iF(U,{parentLocator:null,sourceDescriptor:W.convertLocatorToDescriptor(E),patchPaths:[V.join(dr.home,V.relative(o.cwd,v))]});R.manifest[L].set(U.identHash,J)}for(let R of C.values()){let L=iF(R,{parentLocator:null,sourceDescriptor:W.convertLocatorToDescriptor(E),patchPaths:[V.join(dr.home,V.relative(o.cwd,v))]});o.topLevelWorkspace.manifest.resolutions.push({pattern:{descriptor:{fullName:W.stringifyIdent(L),description:R.range}},reference:L.range})}await o.persist()}};X0.paths=[["patch-commit"]],X0.usage=nt.Usage({description:"generate a patch out of a directory",details:"\n      By default, this will print a patchfile on stdout based on the diff between the folder passed in and the original version of the package. Such file is suitable for consumption with the `patch:` protocol.\n\n      With the `-s,--save` option set, the patchfile won't be printed on stdout anymore and will instead be stored within a local file (by default kept within `.yarn/patches`, but configurable via the `patchFolder` setting). A `resolutions` entry will also be added to your top-level manifest, referencing the patched package via the `patch:` protocol.\n\n      Note that only folders generated by `yarn patch` are accepted as valid input for `yarn patch-commit`.\n    "});Ye();St();jt();var Z0=class extends ut{constructor(){super(...arguments);this.update=ge.Boolean("-u,--update",!1,{description:"Reapply local patches that already apply to this packages"});this.json=ge.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.package=ge.String()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd),n=await Lr.find(r);if(!a)throw new rr(o.cwd,this.context.cwd);await o.restoreInstallState();let u=W.parseLocator(this.package);if(u.reference==="unknown"){let A=_e.mapAndFilter([...o.storedPackages.values()],p=>p.identHash!==u.identHash?_e.mapAndFilter.skip:W.isVirtualLocator(p)?_e.mapAndFilter.skip:z0(p)!==this.update?_e.mapAndFilter.skip:p);if(A.length===0)throw new it("No package found in the project for the given locator");if(A.length>1)throw new it(`Multiple candidate packages found; explicitly choose one of them (use \`yarn why <package>\` to get more information as to who depends on them):
+${A.map(p=>`
+- ${W.prettyLocator(r,p)}`).join("")}`);u=A[0]}if(!o.storedPackages.has(u.locatorHash))throw new it("No package found in the project for the given locator");await Nt.start({configuration:r,json:this.json,stdout:this.context.stdout},async A=>{let p=nF(u),h=await xq(u,{cache:n,project:o});A.reportJson({locator:W.stringifyLocator(p),path:ue.fromPortablePath(h)});let E=this.update?" along with its current modifications":"";A.reportInfo(0,`Package ${W.prettyLocator(r,p)} got extracted with success${E}!`),A.reportInfo(0,`You can now edit the following folder: ${de.pretty(r,ue.fromPortablePath(h),"magenta")}`),A.reportInfo(0,`Once you are done run ${de.pretty(r,`yarn patch-commit -s ${process.platform==="win32"?'"':""}${ue.fromPortablePath(h)}${process.platform==="win32"?'"':""}`,"cyan")} and Yarn will store a patchfile based on your changes.`)})}};Z0.paths=[["patch"]],Z0.usage=nt.Usage({description:"prepare a package for patching",details:"\n      This command will cause a package to be extracted in a temporary directory intended to be editable at will.\n\n      Once you're done with your changes, run `yarn patch-commit -s path` (with `path` being the temporary directory you received) to generate a patchfile and register it into your top-level manifest via the `patch:` protocol. Run `yarn patch-commit -h` for more details.\n\n      Calling the command when you already have a patch won't import it by default (in other words, the default behavior is to reset existing patches). However, adding the `-u,--update` flag will import any current patch.\n    "});var oDt={configuration:{enableInlineHunks:{description:"If true, the installs will print unmatched patch hunks",type:"BOOLEAN",default:!1},patchFolder:{description:"Folder where the patch files must be written",type:"ABSOLUTE_PATH",default:"./.yarn/patches"}},commands:[X0,Z0],fetchers:[Uv],resolvers:[_v]},aDt=oDt;var Nq={};Vt(Nq,{PnpmLinker:()=>Hv,default:()=>fDt});Ye();St();jt();var Hv=class{getCustomDataKey(){return JSON.stringify({name:"PnpmLinker",version:3})}supportsPackage(e,r){return this.isEnabled(r)}async findPackageLocation(e,r){if(!this.isEnabled(r))throw new Error("Assertion failed: Expected the pnpm linker to be enabled");let o=this.getCustomDataKey(),a=r.project.linkersCustomData.get(o);if(!a)throw new it(`The project in ${de.pretty(r.project.configuration,`${r.project.cwd}/package.json`,de.Type.PATH)} doesn't seem to have been installed - running an install there might help`);let n=a.pathsByLocator.get(e.locatorHash);if(typeof n>"u")throw new it(`Couldn't find ${W.prettyLocator(r.project.configuration,e)} in the currently installed pnpm map - running an install might help`);return n.packageLocation}async findPackageLocator(e,r){if(!this.isEnabled(r))return null;let o=this.getCustomDataKey(),a=r.project.linkersCustomData.get(o);if(!a)throw new it(`The project in ${de.pretty(r.project.configuration,`${r.project.cwd}/package.json`,de.Type.PATH)} doesn't seem to have been installed - running an install there might help`);let n=e.match(/(^.*\/node_modules\/(@[^/]*\/)?[^/]+)(\/.*$)/);if(n){let p=a.locatorByPath.get(n[1]);if(p)return p}let u=e,A=e;do{A=u,u=V.dirname(A);let p=a.locatorByPath.get(A);if(p)return p}while(u!==A);return null}makeInstaller(e){return new Rq(e)}isEnabled(e){return e.project.configuration.get("nodeLinker")==="pnpm"}},Rq=class{constructor(e){this.opts=e;this.asyncActions=new _e.AsyncActions(10);this.customData={pathsByLocator:new Map,locatorByPath:new Map};this.indexFolderPromise=SD(oe,{indexPath:V.join(e.project.configuration.get("globalFolder"),"index")})}attachCustomData(e){}async installPackage(e,r,o){switch(e.linkType){case"SOFT":return this.installPackageSoft(e,r,o);case"HARD":return this.installPackageHard(e,r,o)}throw new Error("Assertion failed: Unsupported package link type")}async installPackageSoft(e,r,o){let a=V.resolve(r.packageFs.getRealPath(),r.prefixPath),n=this.opts.project.tryWorkspaceByLocator(e)?V.join(a,dr.nodeModules):null;return this.customData.pathsByLocator.set(e.locatorHash,{packageLocation:a,dependenciesLocation:n}),{packageLocation:a,buildRequest:null}}async installPackageHard(e,r,o){let a=lDt(e,{project:this.opts.project}),n=a.packageLocation;this.customData.locatorByPath.set(n,W.stringifyLocator(e)),this.customData.pathsByLocator.set(e.locatorHash,a),o.holdFetchResult(this.asyncActions.set(e.locatorHash,async()=>{await oe.mkdirPromise(n,{recursive:!0}),await oe.copyPromise(n,r.prefixPath,{baseFs:r.packageFs,overwrite:!1,linkStrategy:{type:"HardlinkFromIndex",indexPath:await this.indexFolderPromise,autoRepair:!0}})}));let A=W.isVirtualLocator(e)?W.devirtualizeLocator(e):e,p={manifest:await Ot.tryFind(r.prefixPath,{baseFs:r.packageFs})??new Ot,misc:{hasBindingGyp:yA.hasBindingGyp(r)}},h=this.opts.project.getDependencyMeta(A,e.version),E=yA.extractBuildRequest(e,p,h,{configuration:this.opts.project.configuration});return{packageLocation:n,buildRequest:E}}async attachInternalDependencies(e,r){if(this.opts.project.configuration.get("nodeLinker")!=="pnpm"||!QBe(e,{project:this.opts.project}))return;let o=this.customData.pathsByLocator.get(e.locatorHash);if(typeof o>"u")throw new Error(`Assertion failed: Expected the package to have been registered (${W.stringifyLocator(e)})`);let{dependenciesLocation:a}=o;!a||this.asyncActions.reduce(e.locatorHash,async n=>{await oe.mkdirPromise(a,{recursive:!0});let u=await cDt(a),A=new Map(u),p=[n],h=(I,v)=>{let x=v;QBe(v,{project:this.opts.project})||(this.opts.report.reportWarningOnce(0,"The pnpm linker doesn't support providing different versions to workspaces' peer dependencies"),x=W.devirtualizeLocator(v));let C=this.customData.pathsByLocator.get(x.locatorHash);if(typeof C>"u")throw new Error(`Assertion failed: Expected the package to have been registered (${W.stringifyLocator(v)})`);let R=W.stringifyIdent(I),L=V.join(a,R),U=V.relative(V.dirname(L),C.packageLocation),J=A.get(R);A.delete(R),p.push(Promise.resolve().then(async()=>{if(J){if(J.isSymbolicLink()&&await oe.readlinkPromise(L)===U)return;await oe.removePromise(L)}await oe.mkdirpPromise(V.dirname(L)),process.platform=="win32"&&this.opts.project.configuration.get("winLinkType")==="junctions"?await oe.symlinkPromise(C.packageLocation,L,"junction"):await oe.symlinkPromise(U,L)}))},E=!1;for(let[I,v]of r)I.identHash===e.identHash&&(E=!0),h(I,v);!E&&!this.opts.project.tryWorkspaceByLocator(e)&&h(W.convertLocatorToDescriptor(e),e),p.push(uDt(a,A)),await Promise.all(p)})}async attachExternalDependents(e,r){throw new Error("External dependencies haven't been implemented for the pnpm linker")}async finalizeInstall(){let e=RBe(this.opts.project);if(this.opts.project.configuration.get("nodeLinker")!=="pnpm")await oe.removePromise(e);else{let r;try{r=new Set(await oe.readdirPromise(e))}catch{r=new Set}for(let{dependenciesLocation:o}of this.customData.pathsByLocator.values()){if(!o)continue;let a=V.contains(e,o);if(a===null)continue;let[n]=a.split(V.sep);r.delete(n)}await Promise.all([...r].map(async o=>{await oe.removePromise(V.join(e,o))}))}return await this.asyncActions.wait(),await Tq(e),this.opts.project.configuration.get("nodeLinker")!=="node-modules"&&await Tq(FBe(this.opts.project)),{customData:this.customData}}};function FBe(t){return V.join(t.cwd,dr.nodeModules)}function RBe(t){return V.join(FBe(t),".store")}function lDt(t,{project:e}){let r=W.slugifyLocator(t),o=RBe(e),a=V.join(o,r,"package"),n=V.join(o,r,dr.nodeModules);return{packageLocation:a,dependenciesLocation:n}}function QBe(t,{project:e}){return!W.isVirtualLocator(t)||!e.tryWorkspaceByLocator(t)}async function cDt(t){let e=new Map,r=[];try{r=await oe.readdirPromise(t,{withFileTypes:!0})}catch(o){if(o.code!=="ENOENT")throw o}try{for(let o of r)if(!o.name.startsWith("."))if(o.name.startsWith("@")){let a=await oe.readdirPromise(V.join(t,o.name),{withFileTypes:!0});if(a.length===0)e.set(o.name,o);else for(let n of a)e.set(`${o.name}/${n.name}`,n)}else e.set(o.name,o)}catch(o){if(o.code!=="ENOENT")throw o}return e}async function uDt(t,e){let r=[],o=new Set;for(let a of e.keys()){r.push(oe.removePromise(V.join(t,a)));let n=W.tryParseIdent(a)?.scope;n&&o.add(`@${n}`)}return Promise.all(r).then(()=>Promise.all([...o].map(a=>Tq(V.join(t,a)))))}async function Tq(t){try{await oe.rmdirPromise(t)}catch(e){if(e.code!=="ENOENT"&&e.code!=="ENOTEMPTY")throw e}}var ADt={linkers:[Hv]},fDt=ADt;var jq={};Vt(jq,{StageCommand:()=>$0,default:()=>BDt,stageUtils:()=>oF});Ye();St();jt();Ye();St();var oF={};Vt(oF,{ActionType:()=>Lq,checkConsensus:()=>sF,expandDirectory:()=>Uq,findConsensus:()=>_q,findVcsRoot:()=>Oq,genCommitMessage:()=>Hq,getCommitPrefix:()=>TBe,isYarnFile:()=>Mq});St();var Lq=(n=>(n[n.CREATE=0]="CREATE",n[n.DELETE=1]="DELETE",n[n.ADD=2]="ADD",n[n.REMOVE=3]="REMOVE",n[n.MODIFY=4]="MODIFY",n))(Lq||{});async function Oq(t,{marker:e}){do if(!oe.existsSync(V.join(t,e)))t=V.dirname(t);else return t;while(t!=="/");return null}function Mq(t,{roots:e,names:r}){if(r.has(V.basename(t)))return!0;do if(!e.has(t))t=V.dirname(t);else return!0;while(t!=="/");return!1}function Uq(t){let e=[],r=[t];for(;r.length>0;){let o=r.pop(),a=oe.readdirSync(o);for(let n of a){let u=V.resolve(o,n);oe.lstatSync(u).isDirectory()?r.push(u):e.push(u)}}return e}function sF(t,e){let r=0,o=0;for(let a of t)a!=="wip"&&(e.test(a)?r+=1:o+=1);return r>=o}function _q(t){let e=sF(t,/^(\w\(\w+\):\s*)?\w+s/),r=sF(t,/^(\w\(\w+\):\s*)?[A-Z]/),o=sF(t,/^\w\(\w+\):/);return{useThirdPerson:e,useUpperCase:r,useComponent:o}}function TBe(t){return t.useComponent?"chore(yarn): ":""}var pDt=new Map([[0,"create"],[1,"delete"],[2,"add"],[3,"remove"],[4,"update"]]);function Hq(t,e){let r=TBe(t),o=[],a=e.slice().sort((n,u)=>n[0]-u[0]);for(;a.length>0;){let[n,u]=a.shift(),A=pDt.get(n);t.useUpperCase&&o.length===0&&(A=`${A[0].toUpperCase()}${A.slice(1)}`),t.useThirdPerson&&(A+="s");let p=[u];for(;a.length>0&&a[0][0]===n;){let[,E]=a.shift();p.push(E)}p.sort();let h=p.shift();p.length===1?h+=" (and one other)":p.length>1&&(h+=` (and ${p.length} others)`),o.push(`${A} ${h}`)}return`${r}${o.join(", ")}`}var hDt="Commit generated via `yarn stage`",gDt=11;async function NBe(t){let{code:e,stdout:r}=await Ur.execvp("git",["log","-1","--pretty=format:%H"],{cwd:t});return e===0?r.trim():null}async function dDt(t,e){let r=[],o=e.filter(h=>V.basename(h.path)==="package.json");for(let{action:h,path:E}of o){let I=V.relative(t,E);if(h===4){let v=await NBe(t),{stdout:x}=await Ur.execvp("git",["show",`${v}:${I}`],{cwd:t,strict:!0}),C=await Ot.fromText(x),R=await Ot.fromFile(E),L=new Map([...R.dependencies,...R.devDependencies]),U=new Map([...C.dependencies,...C.devDependencies]);for(let[J,te]of U){let ae=W.stringifyIdent(te),fe=L.get(J);fe?fe.range!==te.range&&r.push([4,`${ae} to ${fe.range}`]):r.push([3,ae])}for(let[J,te]of L)U.has(J)||r.push([2,W.stringifyIdent(te)])}else if(h===0){let v=await Ot.fromFile(E);v.name?r.push([0,W.stringifyIdent(v.name)]):r.push([0,"a package"])}else if(h===1){let v=await NBe(t),{stdout:x}=await Ur.execvp("git",["show",`${v}:${I}`],{cwd:t,strict:!0}),C=await Ot.fromText(x);C.name?r.push([1,W.stringifyIdent(C.name)]):r.push([1,"a package"])}else throw new Error("Assertion failed: Unsupported action type")}let{code:a,stdout:n}=await Ur.execvp("git",["log",`-${gDt}`,"--pretty=format:%s"],{cwd:t}),u=a===0?n.split(/\n/g).filter(h=>h!==""):[],A=_q(u);return Hq(A,r)}var mDt={[0]:[" A ","?? "],[4]:[" M "],[1]:[" D "]},yDt={[0]:["A  "],[4]:["M  "],[1]:["D  "]},LBe={async findRoot(t){return await Oq(t,{marker:".git"})},async filterChanges(t,e,r,o){let{stdout:a}=await Ur.execvp("git",["status","-s"],{cwd:t,strict:!0}),n=a.toString().split(/\n/g),u=o?.staged?yDt:mDt;return[].concat(...n.map(p=>{if(p==="")return[];let h=p.slice(0,3),E=V.resolve(t,p.slice(3));if(!o?.staged&&h==="?? "&&p.endsWith("/"))return Uq(E).map(I=>({action:0,path:I}));{let v=[0,4,1].find(x=>u[x].includes(h));return v!==void 0?[{action:v,path:E}]:[]}})).filter(p=>Mq(p.path,{roots:e,names:r}))},async genCommitMessage(t,e){return await dDt(t,e)},async makeStage(t,e){let r=e.map(o=>ue.fromPortablePath(o.path));await Ur.execvp("git",["add","--",...r],{cwd:t,strict:!0})},async makeCommit(t,e,r){let o=e.map(a=>ue.fromPortablePath(a.path));await Ur.execvp("git",["add","-N","--",...o],{cwd:t,strict:!0}),await Ur.execvp("git",["commit","-m",`${r}
+
+${hDt}
+`,"--",...o],{cwd:t,strict:!0})},async makeReset(t,e){let r=e.map(o=>ue.fromPortablePath(o.path));await Ur.execvp("git",["reset","HEAD","--",...r],{cwd:t,strict:!0})}};var EDt=[LBe],$0=class extends ut{constructor(){super(...arguments);this.commit=ge.Boolean("-c,--commit",!1,{description:"Commit the staged files"});this.reset=ge.Boolean("-r,--reset",!1,{description:"Remove all files from the staging area"});this.dryRun=ge.Boolean("-n,--dry-run",!1,{description:"Print the commit message and the list of modified files without staging / committing"});this.update=ge.Boolean("-u,--update",!1,{hidden:!0})}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o}=await Pt.find(r,this.context.cwd),{driver:a,root:n}=await CDt(o.cwd),u=[r.get("cacheFolder"),r.get("globalFolder"),r.get("virtualFolder"),r.get("yarnPath")];await r.triggerHook(I=>I.populateYarnPaths,o,I=>{u.push(I)});let A=new Set;for(let I of u)for(let v of wDt(n,I))A.add(v);let p=new Set([r.get("rcFilename"),dr.lockfile,dr.manifest]),h=await a.filterChanges(n,A,p),E=await a.genCommitMessage(n,h);if(this.dryRun)if(this.commit)this.context.stdout.write(`${E}
+`);else for(let I of h)this.context.stdout.write(`${ue.fromPortablePath(I.path)}
+`);else if(this.reset){let I=await a.filterChanges(n,A,p,{staged:!0});I.length===0?this.context.stdout.write("No staged changes found!"):await a.makeReset(n,I)}else h.length===0?this.context.stdout.write("No changes found!"):this.commit?await a.makeCommit(n,h,E):(await a.makeStage(n,h),this.context.stdout.write(E))}};$0.paths=[["stage"]],$0.usage=nt.Usage({description:"add all yarn files to your vcs",details:"\n      This command will add to your staging area the files belonging to Yarn (typically any modified `package.json` and `.yarnrc.yml` files, but also linker-generated files, cache data, etc). It will take your ignore list into account, so the cache files won't be added if the cache is ignored in a `.gitignore` file (assuming you use Git).\n\n      Running `--reset` will instead remove them from the staging area (the changes will still be there, but won't be committed until you stage them back).\n\n      Since the staging area is a non-existent concept in Mercurial, Yarn will always create a new commit when running this command on Mercurial repositories. You can get this behavior when using Git by using the `--commit` flag which will directly create a commit.\n    ",examples:[["Adds all modified project files to the staging area","yarn stage"],["Creates a new commit containing all modified project files","yarn stage --commit"]]});async function CDt(t){let e=null,r=null;for(let o of EDt)if((r=await o.findRoot(t))!==null){e=o;break}if(e===null||r===null)throw new it("No stage driver has been found for your current project");return{driver:e,root:r}}function wDt(t,e){let r=[];if(e===null)return r;for(;;){(e===t||e.startsWith(`${t}/`))&&r.push(e);let o;try{o=oe.statSync(e)}catch{break}if(o.isSymbolicLink())e=V.resolve(V.dirname(e),oe.readlinkSync(e));else break}return r}var IDt={commands:[$0]},BDt=IDt;var Gq={};Vt(Gq,{default:()=>QDt});Ye();Ye();St();var UBe=$e(zn());Ye();var OBe=$e(zH()),vDt="e8e1bd300d860104bb8c58453ffa1eb4",DDt="OFCNCOG2CU",MBe=async(t,e)=>{let r=W.stringifyIdent(t),a=SDt(e).initIndex("npm-search");try{return(await a.getObject(r,{attributesToRetrieve:["types"]})).types?.ts==="definitely-typed"}catch{return!1}},SDt=t=>(0,OBe.default)(DDt,vDt,{requester:{async send(r){try{let o=await nn.request(r.url,r.data||null,{configuration:t,headers:r.headers});return{content:o.body,isTimedOut:!1,status:o.statusCode}}catch(o){return{content:o.response.body,isTimedOut:!1,status:o.response.statusCode}}}}});var _Be=t=>t.scope?`${t.scope}__${t.name}`:`${t.name}`,PDt=async(t,e,r,o)=>{if(r.scope==="types")return;let{project:a}=t,{configuration:n}=a;if(!(n.get("tsEnableAutoTypes")??oe.existsSync(V.join(a.cwd,"tsconfig.json"))))return;let A=n.makeResolver(),p={project:a,resolver:A,report:new Qi};if(!await MBe(r,n))return;let E=_Be(r),I=W.parseRange(r.range).selector;if(!kr.validRange(I)){let L=n.normalizeDependency(r),U=await A.getCandidates(L,{},p);I=W.parseRange(U[0].reference).selector}let v=UBe.default.coerce(I);if(v===null)return;let x=`${zc.Modifier.CARET}${v.major}`,C=W.makeDescriptor(W.makeIdent("types",E),x),R=_e.mapAndFind(a.workspaces,L=>{let U=L.manifest.dependencies.get(r.identHash)?.descriptorHash,J=L.manifest.devDependencies.get(r.identHash)?.descriptorHash;if(U!==r.descriptorHash&&J!==r.descriptorHash)return _e.mapAndFind.skip;let te=[];for(let ae of Ot.allDependencies){let fe=L.manifest[ae].get(C.identHash);typeof fe>"u"||te.push([ae,fe])}return te.length===0?_e.mapAndFind.skip:te});if(typeof R<"u")for(let[L,U]of R)t.manifest[L].set(U.identHash,U);else{try{let L=n.normalizeDependency(C);if((await A.getCandidates(L,{},p)).length===0)return}catch{return}t.manifest[zc.Target.DEVELOPMENT].set(C.identHash,C)}},bDt=async(t,e,r)=>{if(r.scope==="types")return;let{project:o}=t,{configuration:a}=o;if(!(a.get("tsEnableAutoTypes")??oe.existsSync(V.join(o.cwd,"tsconfig.json"))))return;let u=_Be(r),A=W.makeIdent("types",u);for(let p of Ot.allDependencies)typeof t.manifest[p].get(A.identHash)>"u"||t.manifest[p].delete(A.identHash)},xDt=(t,e)=>{e.publishConfig&&e.publishConfig.typings&&(e.typings=e.publishConfig.typings),e.publishConfig&&e.publishConfig.types&&(e.types=e.publishConfig.types)},kDt={configuration:{tsEnableAutoTypes:{description:"Whether Yarn should auto-install @types/ dependencies on 'yarn add'",type:"BOOLEAN",isNullable:!0,default:null}},hooks:{afterWorkspaceDependencyAddition:PDt,afterWorkspaceDependencyRemoval:bDt,beforeWorkspacePacking:xDt}},QDt=kDt;var Vq={};Vt(Vq,{VersionApplyCommand:()=>eg,VersionCheckCommand:()=>tg,VersionCommand:()=>rg,default:()=>zDt,versionUtils:()=>dw});Ye();Ye();jt();var dw={};Vt(dw,{Decision:()=>hw,applyPrerelease:()=>WBe,applyReleases:()=>Kq,applyStrategy:()=>lF,clearVersionFiles:()=>qq,getUndecidedDependentWorkspaces:()=>Gv,getUndecidedWorkspaces:()=>aF,openVersionFile:()=>gw,requireMoreDecisions:()=>KDt,resolveVersionFiles:()=>jv,suggestStrategy:()=>Wq,updateVersionFiles:()=>Yq,validateReleaseDecision:()=>pw});Ye();St();Nl();jt();var YBe=$e(qBe()),vA=$e(zn()),WDt=/^(>=|[~^]|)(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(\+[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?$/,hw=(u=>(u.UNDECIDED="undecided",u.DECLINE="decline",u.MAJOR="major",u.MINOR="minor",u.PATCH="patch",u.PRERELEASE="prerelease",u))(hw||{});function pw(t){let e=vA.default.valid(t);return e||_e.validateEnum((0,YBe.default)(hw,"UNDECIDED"),t)}async function jv(t,{prerelease:e=null}={}){let r=new Map,o=t.configuration.get("deferredVersionFolder");if(!oe.existsSync(o))return r;let a=await oe.readdirPromise(o);for(let n of a){if(!n.endsWith(".yml"))continue;let u=V.join(o,n),A=await oe.readFilePromise(u,"utf8"),p=Ki(A);for(let[h,E]of Object.entries(p.releases||{})){if(E==="decline")continue;let I=W.parseIdent(h),v=t.tryWorkspaceByIdent(I);if(v===null)throw new Error(`Assertion failed: Expected a release definition file to only reference existing workspaces (${V.basename(u)} references ${h})`);if(v.manifest.version===null)throw new Error(`Assertion failed: Expected the workspace to have a version (${W.prettyLocator(t.configuration,v.anchoredLocator)})`);let x=v.manifest.raw.stableVersion??v.manifest.version,C=r.get(v),R=lF(x,pw(E));if(R===null)throw new Error(`Assertion failed: Expected ${x} to support being bumped via strategy ${E}`);let L=typeof C<"u"?vA.default.gt(R,C)?R:C:R;r.set(v,L)}}return e&&(r=new Map([...r].map(([n,u])=>[n,WBe(u,{current:n.manifest.version,prerelease:e})]))),r}async function qq(t){let e=t.configuration.get("deferredVersionFolder");!oe.existsSync(e)||await oe.removePromise(e)}async function Yq(t,e){let r=new Set(e),o=t.configuration.get("deferredVersionFolder");if(!oe.existsSync(o))return;let a=await oe.readdirPromise(o);for(let n of a){if(!n.endsWith(".yml"))continue;let u=V.join(o,n),A=await oe.readFilePromise(u,"utf8"),p=Ki(A),h=p?.releases;if(!!h){for(let E of Object.keys(h)){let I=W.parseIdent(E),v=t.tryWorkspaceByIdent(I);(v===null||r.has(v))&&delete p.releases[E]}Object.keys(p.releases).length>0?await oe.changeFilePromise(u,Ba(new Ba.PreserveOrdering(p))):await oe.unlinkPromise(u)}}}async function gw(t,{allowEmpty:e=!1}={}){let r=t.configuration;if(r.projectCwd===null)throw new it("This command can only be run from within a Yarn project");let o=await ra.fetchRoot(r.projectCwd),a=o!==null?await ra.fetchBase(o,{baseRefs:r.get("changesetBaseRefs")}):null,n=o!==null?await ra.fetchChangedFiles(o,{base:a.hash,project:t}):[],u=r.get("deferredVersionFolder"),A=n.filter(x=>V.contains(u,x)!==null);if(A.length>1)throw new it(`Your current branch contains multiple versioning files; this isn't supported:
+- ${A.map(x=>ue.fromPortablePath(x)).join(`
+- `)}`);let p=new Set(_e.mapAndFilter(n,x=>{let C=t.tryWorkspaceByFilePath(x);return C===null?_e.mapAndFilter.skip:C}));if(A.length===0&&p.size===0&&!e)return null;let h=A.length===1?A[0]:V.join(u,`${wn.makeHash(Math.random().toString()).slice(0,8)}.yml`),E=oe.existsSync(h)?await oe.readFilePromise(h,"utf8"):"{}",I=Ki(E),v=new Map;for(let x of I.declined||[]){let C=W.parseIdent(x),R=t.getWorkspaceByIdent(C);v.set(R,"decline")}for(let[x,C]of Object.entries(I.releases||{})){let R=W.parseIdent(x),L=t.getWorkspaceByIdent(R);v.set(L,pw(C))}return{project:t,root:o,baseHash:a!==null?a.hash:null,baseTitle:a!==null?a.title:null,changedFiles:new Set(n),changedWorkspaces:p,releaseRoots:new Set([...p].filter(x=>x.manifest.version!==null)),releases:v,async saveAll(){let x={},C=[],R=[];for(let L of t.workspaces){if(L.manifest.version===null)continue;let U=W.stringifyIdent(L.anchoredLocator),J=v.get(L);J==="decline"?C.push(U):typeof J<"u"?x[U]=pw(J):p.has(L)&&R.push(U)}await oe.mkdirPromise(V.dirname(h),{recursive:!0}),await oe.changeFilePromise(h,Ba(new Ba.PreserveOrdering({releases:Object.keys(x).length>0?x:void 0,declined:C.length>0?C:void 0,undecided:R.length>0?R:void 0})))}}}function KDt(t){return aF(t).size>0||Gv(t).length>0}function aF(t){let e=new Set;for(let r of t.changedWorkspaces)r.manifest.version!==null&&(t.releases.has(r)||e.add(r));return e}function Gv(t,{include:e=new Set}={}){let r=[],o=new Map(_e.mapAndFilter([...t.releases],([n,u])=>u==="decline"?_e.mapAndFilter.skip:[n.anchoredLocator.locatorHash,n])),a=new Map(_e.mapAndFilter([...t.releases],([n,u])=>u!=="decline"?_e.mapAndFilter.skip:[n.anchoredLocator.locatorHash,n]));for(let n of t.project.workspaces)if(!(!e.has(n)&&(a.has(n.anchoredLocator.locatorHash)||o.has(n.anchoredLocator.locatorHash)))&&n.manifest.version!==null)for(let u of Ot.hardDependencies)for(let A of n.manifest.getForScope(u).values()){let p=t.project.tryWorkspaceByDescriptor(A);p!==null&&o.has(p.anchoredLocator.locatorHash)&&r.push([n,p])}return r}function Wq(t,e){let r=vA.default.clean(e);for(let o of Object.values(hw))if(o!=="undecided"&&o!=="decline"&&vA.default.inc(t,o)===r)return o;return null}function lF(t,e){if(vA.default.valid(e))return e;if(t===null)throw new it(`Cannot apply the release strategy "${e}" unless the workspace already has a valid version`);if(!vA.default.valid(t))throw new it(`Cannot apply the release strategy "${e}" on a non-semver version (${t})`);let r=vA.default.inc(t,e);if(r===null)throw new it(`Cannot apply the release strategy "${e}" on the specified version (${t})`);return r}function Kq(t,e,{report:r}){let o=new Map;for(let a of t.workspaces)for(let n of Ot.allDependencies)for(let u of a.manifest[n].values()){let A=t.tryWorkspaceByDescriptor(u);if(A===null||!e.has(A))continue;_e.getArrayWithDefault(o,A).push([a,n,u.identHash])}for(let[a,n]of e){let u=a.manifest.version;a.manifest.version=n,vA.default.prerelease(n)===null?delete a.manifest.raw.stableVersion:a.manifest.raw.stableVersion||(a.manifest.raw.stableVersion=u);let A=a.manifest.name!==null?W.stringifyIdent(a.manifest.name):null;r.reportInfo(0,`${W.prettyLocator(t.configuration,a.anchoredLocator)}: Bumped to ${n}`),r.reportJson({cwd:ue.fromPortablePath(a.cwd),ident:A,oldVersion:u,newVersion:n});let p=o.get(a);if(!(typeof p>"u"))for(let[h,E,I]of p){let v=h.manifest[E].get(I);if(typeof v>"u")throw new Error("Assertion failed: The dependency should have existed");let x=v.range,C=!1;if(x.startsWith(Xn.protocol)&&(x=x.slice(Xn.protocol.length),C=!0,x===a.relativeCwd))continue;let R=x.match(WDt);if(!R){r.reportWarning(0,`Couldn't auto-upgrade range ${x} (in ${W.prettyLocator(t.configuration,h.anchoredLocator)})`);continue}let L=`${R[1]}${n}`;C&&(L=`${Xn.protocol}${L}`);let U=W.makeDescriptor(v,L);h.manifest[E].set(I,U)}}}var VDt=new Map([["%n",{extract:t=>t.length>=1?[t[0],t.slice(1)]:null,generate:(t=0)=>`${t+1}`}]]);function WBe(t,{current:e,prerelease:r}){let o=new vA.default.SemVer(e),a=o.prerelease.slice(),n=[];o.prerelease=[],o.format()!==t&&(a.length=0);let u=!0,A=r.split(/\./g);for(let p of A){let h=VDt.get(p);if(typeof h>"u")n.push(p),a[0]===p?a.shift():u=!1;else{let E=u?h.extract(a):null;E!==null&&typeof E[0]=="number"?(n.push(h.generate(E[0])),a=E[1]):(n.push(h.generate()),u=!1)}}return o.prerelease&&(o.prerelease=[]),`${t}-${n.join(".")}`}var eg=class extends ut{constructor(){super(...arguments);this.all=ge.Boolean("--all",!1,{description:"Apply the deferred version changes on all workspaces"});this.dryRun=ge.Boolean("--dry-run",!1,{description:"Print the versions without actually generating the package archive"});this.prerelease=ge.String("--prerelease",{description:"Add a prerelease identifier to new versions",tolerateBoolean:!0});this.recursive=ge.Boolean("-R,--recursive",{description:"Release the transitive workspaces as well"});this.json=ge.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"})}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd),n=await Lr.find(r);if(!a)throw new rr(o.cwd,this.context.cwd);await o.restoreInstallState({restoreResolutions:!1});let u=await Nt.start({configuration:r,json:this.json,stdout:this.context.stdout},async A=>{let p=this.prerelease?typeof this.prerelease!="boolean"?this.prerelease:"rc.%n":null,h=await jv(o,{prerelease:p}),E=new Map;if(this.all)E=h;else{let I=this.recursive?a.getRecursiveWorkspaceDependencies():[a];for(let v of I){let x=h.get(v);typeof x<"u"&&E.set(v,x)}}if(E.size===0){let I=h.size>0?" Did you want to add --all?":"";A.reportWarning(0,`The current workspace doesn't seem to require a version bump.${I}`);return}Kq(o,E,{report:A}),this.dryRun||(p||(this.all?await qq(o):await Yq(o,[...E.keys()])),A.reportSeparator())});return this.dryRun||u.hasErrors()?u.exitCode():await o.installWithNewReport({json:this.json,stdout:this.context.stdout},{cache:n})}};eg.paths=[["version","apply"]],eg.usage=nt.Usage({category:"Release-related commands",description:"apply all the deferred version bumps at once",details:`
+      This command will apply the deferred version changes and remove their definitions from the repository.
+
+      Note that if \`--prerelease\` is set, the given prerelease identifier (by default \`rc.%d\`) will be used on all new versions and the version definitions will be kept as-is.
+
+      By default only the current workspace will be bumped, but you can configure this behavior by using one of:
+
+      - \`--recursive\` to also apply the version bump on its dependencies
+      - \`--all\` to apply the version bump on all packages in the repository
+
+      Note that this command will also update the \`workspace:\` references across all your local workspaces, thus ensuring that they keep referring to the same workspaces even after the version bump.
+    `,examples:[["Apply the version change to the local workspace","yarn version apply"],["Apply the version change to all the workspaces in the local workspace","yarn version apply --all"]]});Ye();St();jt();var cF=$e(zn());var tg=class extends ut{constructor(){super(...arguments);this.interactive=ge.Boolean("-i,--interactive",{description:"Open an interactive interface used to set version bumps"})}async execute(){return this.interactive?await this.executeInteractive():await this.executeStandard()}async executeInteractive(){bC(this.context);let{Gem:r}=await Promise.resolve().then(()=>(cQ(),Bj)),{ScrollableItems:o}=await Promise.resolve().then(()=>(pQ(),fQ)),{FocusRequest:a}=await Promise.resolve().then(()=>(Dj(),Vwe)),{useListInput:n}=await Promise.resolve().then(()=>(AQ(),Jwe)),{renderForm:u}=await Promise.resolve().then(()=>(mQ(),dQ)),{Box:A,Text:p}=await Promise.resolve().then(()=>$e(ic())),{default:h,useCallback:E,useState:I}=await Promise.resolve().then(()=>$e(on())),v=await Ke.find(this.context.cwd,this.context.plugins),{project:x,workspace:C}=await Pt.find(v,this.context.cwd);if(!C)throw new rr(x.cwd,this.context.cwd);await x.restoreInstallState();let R=await gw(x);if(R===null||R.releaseRoots.size===0)return 0;if(R.root===null)throw new it("This command can only be run on Git repositories");let L=()=>h.createElement(A,{flexDirection:"row",paddingBottom:1},h.createElement(A,{flexDirection:"column",width:60},h.createElement(A,null,h.createElement(p,null,"Press ",h.createElement(p,{bold:!0,color:"cyanBright"},"<up>"),"/",h.createElement(p,{bold:!0,color:"cyanBright"},"<down>")," to select workspaces.")),h.createElement(A,null,h.createElement(p,null,"Press ",h.createElement(p,{bold:!0,color:"cyanBright"},"<left>"),"/",h.createElement(p,{bold:!0,color:"cyanBright"},"<right>")," to select release strategies."))),h.createElement(A,{flexDirection:"column"},h.createElement(A,{marginLeft:1},h.createElement(p,null,"Press ",h.createElement(p,{bold:!0,color:"cyanBright"},"<enter>")," to save.")),h.createElement(A,{marginLeft:1},h.createElement(p,null,"Press ",h.createElement(p,{bold:!0,color:"cyanBright"},"<ctrl+c>")," to abort.")))),U=({workspace:me,active:he,decision:Be,setDecision:we})=>{let g=me.manifest.raw.stableVersion??me.manifest.version;if(g===null)throw new Error(`Assertion failed: The version should have been set (${W.prettyLocator(v,me.anchoredLocator)})`);if(cF.default.prerelease(g)!==null)throw new Error(`Assertion failed: Prerelease identifiers shouldn't be found (${g})`);let Ee=["undecided","decline","patch","minor","major"];n(Be,Ee,{active:he,minus:"left",plus:"right",set:we});let Se=Be==="undecided"?h.createElement(p,{color:"yellow"},g):Be==="decline"?h.createElement(p,{color:"green"},g):h.createElement(p,null,h.createElement(p,{color:"magenta"},g)," \u2192 ",h.createElement(p,{color:"green"},cF.default.valid(Be)?Be:cF.default.inc(g,Be)));return h.createElement(A,{flexDirection:"column"},h.createElement(A,null,h.createElement(p,null,W.prettyLocator(v,me.anchoredLocator)," - ",Se)),h.createElement(A,null,Ee.map(le=>h.createElement(A,{key:le,paddingLeft:2},h.createElement(p,null,h.createElement(r,{active:le===Be})," ",le)))))},J=me=>{let he=new Set(R.releaseRoots),Be=new Map([...me].filter(([we])=>he.has(we)));for(;;){let we=Gv({project:R.project,releases:Be}),g=!1;if(we.length>0){for(let[Ee]of we)if(!he.has(Ee)){he.add(Ee),g=!0;let Se=me.get(Ee);typeof Se<"u"&&Be.set(Ee,Se)}}if(!g)break}return{relevantWorkspaces:he,relevantReleases:Be}},te=()=>{let[me,he]=I(()=>new Map(R.releases)),Be=E((we,g)=>{let Ee=new Map(me);g!=="undecided"?Ee.set(we,g):Ee.delete(we);let{relevantReleases:Se}=J(Ee);he(Se)},[me,he]);return[me,Be]},ae=({workspaces:me,releases:he})=>{let Be=[];Be.push(`${me.size} total`);let we=0,g=0;for(let Ee of me){let Se=he.get(Ee);typeof Se>"u"?g+=1:Se!=="decline"&&(we+=1)}return Be.push(`${we} release${we===1?"":"s"}`),Be.push(`${g} remaining`),h.createElement(p,{color:"yellow"},Be.join(", "))},ce=await u(({useSubmit:me})=>{let[he,Be]=te();me(he);let{relevantWorkspaces:we}=J(he),g=new Set([...we].filter(ne=>!R.releaseRoots.has(ne))),[Ee,Se]=I(0),le=E(ne=>{switch(ne){case a.BEFORE:Se(Ee-1);break;case a.AFTER:Se(Ee+1);break}},[Ee,Se]);return h.createElement(A,{flexDirection:"column"},h.createElement(L,null),h.createElement(A,null,h.createElement(p,{wrap:"wrap"},"The following files have been modified in your local checkout.")),h.createElement(A,{flexDirection:"column",marginTop:1,paddingLeft:2},[...R.changedFiles].map(ne=>h.createElement(A,{key:ne},h.createElement(p,null,h.createElement(p,{color:"grey"},ue.fromPortablePath(R.root)),ue.sep,ue.relative(ue.fromPortablePath(R.root),ue.fromPortablePath(ne)))))),R.releaseRoots.size>0&&h.createElement(h.Fragment,null,h.createElement(A,{marginTop:1},h.createElement(p,{wrap:"wrap"},"Because of those files having been modified, the following workspaces may need to be released again (note that private workspaces are also shown here, because even though they won't be published, releasing them will allow us to flag their dependents for potential re-release):")),g.size>3?h.createElement(A,{marginTop:1},h.createElement(ae,{workspaces:R.releaseRoots,releases:he})):null,h.createElement(A,{marginTop:1,flexDirection:"column"},h.createElement(o,{active:Ee%2===0,radius:1,size:2,onFocusRequest:le},[...R.releaseRoots].map(ne=>h.createElement(U,{key:ne.cwd,workspace:ne,decision:he.get(ne)||"undecided",setDecision:ee=>Be(ne,ee)}))))),g.size>0?h.createElement(h.Fragment,null,h.createElement(A,{marginTop:1},h.createElement(p,{wrap:"wrap"},"The following workspaces depend on other workspaces that have been marked for release, and thus may need to be released as well:")),h.createElement(A,null,h.createElement(p,null,"(Press ",h.createElement(p,{bold:!0,color:"cyanBright"},"<tab>")," to move the focus between the workspace groups.)")),g.size>5?h.createElement(A,{marginTop:1},h.createElement(ae,{workspaces:g,releases:he})):null,h.createElement(A,{marginTop:1,flexDirection:"column"},h.createElement(o,{active:Ee%2===1,radius:2,size:2,onFocusRequest:le},[...g].map(ne=>h.createElement(U,{key:ne.cwd,workspace:ne,decision:he.get(ne)||"undecided",setDecision:ee=>Be(ne,ee)}))))):null)},{versionFile:R},{stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr});if(typeof ce>"u")return 1;R.releases.clear();for(let[me,he]of ce)R.releases.set(me,he);await R.saveAll()}async executeStandard(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd);if(!a)throw new rr(o.cwd,this.context.cwd);return await o.restoreInstallState(),(await Nt.start({configuration:r,stdout:this.context.stdout},async u=>{let A=await gw(o);if(A===null||A.releaseRoots.size===0)return;if(A.root===null)throw new it("This command can only be run on Git repositories");if(u.reportInfo(0,`Your PR was started right after ${de.pretty(r,A.baseHash.slice(0,7),"yellow")} ${de.pretty(r,A.baseTitle,"magenta")}`),A.changedFiles.size>0){u.reportInfo(0,"You have changed the following files since then:"),u.reportSeparator();for(let v of A.changedFiles)u.reportInfo(null,`${de.pretty(r,ue.fromPortablePath(A.root),"gray")}${ue.sep}${ue.relative(ue.fromPortablePath(A.root),ue.fromPortablePath(v))}`)}let p=!1,h=!1,E=aF(A);if(E.size>0){p||u.reportSeparator();for(let v of E)u.reportError(0,`${W.prettyLocator(r,v.anchoredLocator)} has been modified but doesn't have a release strategy attached`);p=!0}let I=Gv(A);for(let[v,x]of I)h||u.reportSeparator(),u.reportError(0,`${W.prettyLocator(r,v.anchoredLocator)} doesn't have a release strategy attached, but depends on ${W.prettyWorkspace(r,x)} which is planned for release.`),h=!0;(p||h)&&(u.reportSeparator(),u.reportInfo(0,"This command detected that at least some workspaces have received modifications without explicit instructions as to how they had to be released (if needed)."),u.reportInfo(0,"To correct these errors, run `yarn version check --interactive` then follow the instructions."))})).exitCode()}};tg.paths=[["version","check"]],tg.usage=nt.Usage({category:"Release-related commands",description:"check that all the relevant packages have been bumped",details:"\n      **Warning:** This command currently requires Git.\n\n      This command will check that all the packages covered by the files listed in argument have been properly bumped or declined to bump.\n\n      In the case of a bump, the check will also cover transitive packages - meaning that should `Foo` be bumped, a package `Bar` depending on `Foo` will require a decision as to whether `Bar` will need to be bumped. This check doesn't cross packages that have declined to bump.\n\n      In case no arguments are passed to the function, the list of modified files will be generated by comparing the HEAD against `master`.\n    ",examples:[["Check whether the modified packages need a bump","yarn version check"]]});Ye();jt();var uF=$e(zn());var rg=class extends ut{constructor(){super(...arguments);this.deferred=ge.Boolean("-d,--deferred",{description:"Prepare the version to be bumped during the next release cycle"});this.immediate=ge.Boolean("-i,--immediate",{description:"Bump the version immediately"});this.strategy=ge.String()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd);if(!a)throw new rr(o.cwd,this.context.cwd);let n=r.get("preferDeferredVersions");this.deferred&&(n=!0),this.immediate&&(n=!1);let u=uF.default.valid(this.strategy),A=this.strategy==="decline",p;if(u)if(a.manifest.version!==null){let E=Wq(a.manifest.version,this.strategy);E!==null?p=E:p=this.strategy}else p=this.strategy;else{let E=a.manifest.version;if(!A){if(E===null)throw new it("Can't bump the version if there wasn't a version to begin with - use 0.0.0 as initial version then run the command again.");if(typeof E!="string"||!uF.default.valid(E))throw new it(`Can't bump the version (${E}) if it's not valid semver`)}p=pw(this.strategy)}if(!n){let I=(await jv(o)).get(a);if(typeof I<"u"&&p!=="decline"){let v=lF(a.manifest.version,p);if(uF.default.lt(v,I))throw new it(`Can't bump the version to one that would be lower than the current deferred one (${I})`)}}let h=await gw(o,{allowEmpty:!0});return h.releases.set(a,p),await h.saveAll(),n?0:await this.cli.run(["version","apply"])}};rg.paths=[["version"]],rg.usage=nt.Usage({category:"Release-related commands",description:"apply a new version to the current package",details:"\n      This command will bump the version number for the given package, following the specified strategy:\n\n      - If `major`, the first number from the semver range will be increased (`X.0.0`).\n      - If `minor`, the second number from the semver range will be increased (`0.X.0`).\n      - If `patch`, the third number from the semver range will be increased (`0.0.X`).\n      - If prefixed by `pre` (`premajor`, ...), a `-0` suffix will be set (`0.0.0-0`).\n      - If `prerelease`, the suffix will be increased (`0.0.0-X`); the third number from the semver range will also be increased if there was no suffix in the previous version.\n      - If `decline`, the nonce will be increased for `yarn version check` to pass without version bump.\n      - If a valid semver range, it will be used as new version.\n      - If unspecified, Yarn will ask you for guidance.\n\n      For more information about the `--deferred` flag, consult our documentation (https://yarnpkg.com/features/release-workflow#deferred-versioning).\n    ",examples:[["Immediately bump the version to the next major","yarn version major"],["Prepare the version to be bumped to the next major","yarn version major --deferred"]]});var JDt={configuration:{deferredVersionFolder:{description:"Folder where are stored the versioning files",type:"ABSOLUTE_PATH",default:"./.yarn/versions"},preferDeferredVersions:{description:"If true, running `yarn version` will assume the `--deferred` flag unless `--immediate` is set",type:"BOOLEAN",default:!1}},commands:[eg,tg,rg]},zDt=JDt;var Jq={};Vt(Jq,{WorkspacesFocusCommand:()=>ng,WorkspacesForeachCommand:()=>ap,default:()=>$Dt});Ye();Ye();jt();var ng=class extends ut{constructor(){super(...arguments);this.json=ge.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.production=ge.Boolean("--production",!1,{description:"Only install regular dependencies by omitting dev dependencies"});this.all=ge.Boolean("-A,--all",!1,{description:"Install the entire project"});this.workspaces=ge.Rest()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd),n=await Lr.find(r);await o.restoreInstallState({restoreResolutions:!1});let u;if(this.all)u=new Set(o.workspaces);else if(this.workspaces.length===0){if(!a)throw new rr(o.cwd,this.context.cwd);u=new Set([a])}else u=new Set(this.workspaces.map(A=>o.getWorkspaceByIdent(W.parseIdent(A))));for(let A of u)for(let p of this.production?["dependencies"]:Ot.hardDependencies)for(let h of A.manifest.getForScope(p).values()){let E=o.tryWorkspaceByDescriptor(h);E!==null&&u.add(E)}for(let A of o.workspaces)u.has(A)?this.production&&A.manifest.devDependencies.clear():(A.manifest.installConfig=A.manifest.installConfig||{},A.manifest.installConfig.selfReferences=!1,A.manifest.dependencies.clear(),A.manifest.devDependencies.clear(),A.manifest.peerDependencies.clear(),A.manifest.scripts.clear());return await o.installWithNewReport({json:this.json,stdout:this.context.stdout},{cache:n,persistProject:!1})}};ng.paths=[["workspaces","focus"]],ng.usage=nt.Usage({category:"Workspace-related commands",description:"install a single workspace and its dependencies",details:"\n      This command will run an install as if the specified workspaces (and all other workspaces they depend on) were the only ones in the project. If no workspaces are explicitly listed, the active one will be assumed.\n\n      Note that this command is only very moderately useful when using zero-installs, since the cache will contain all the packages anyway - meaning that the only difference between a full install and a focused install would just be a few extra lines in the `.pnp.cjs` file, at the cost of introducing an extra complexity.\n\n      If the `-A,--all` flag is set, the entire project will be installed. Combine with `--production` to replicate the old `yarn install --production`.\n    "});Ye();Ye();Ye();jt();var mw=$e(Zo()),VBe=$e(id());Za();var ap=class extends ut{constructor(){super(...arguments);this.from=ge.Array("--from",{description:"An array of glob pattern idents or paths from which to base any recursion"});this.all=ge.Boolean("-A,--all",{description:"Run the command on all workspaces of a project"});this.recursive=ge.Boolean("-R,--recursive",{description:"Run the command on the current workspace and all of its recursive dependencies"});this.worktree=ge.Boolean("-W,--worktree",{description:"Run the command on all workspaces of the current worktree"});this.verbose=ge.Counter("-v,--verbose",{description:"Increase level of logging verbosity up to 2 times"});this.parallel=ge.Boolean("-p,--parallel",!1,{description:"Run the commands in parallel"});this.interlaced=ge.Boolean("-i,--interlaced",!1,{description:"Print the output of commands in real-time instead of buffering it"});this.jobs=ge.String("-j,--jobs",{description:"The maximum number of parallel tasks that the execution will be limited to; or `unlimited`",validator:TT([Ks(["unlimited"]),aI(RT(),[LT(),NT(1)])])});this.topological=ge.Boolean("-t,--topological",!1,{description:"Run the command after all workspaces it depends on (regular) have finished"});this.topologicalDev=ge.Boolean("--topological-dev",!1,{description:"Run the command after all workspaces it depends on (regular + dev) have finished"});this.include=ge.Array("--include",[],{description:"An array of glob pattern idents or paths; only matching workspaces will be traversed"});this.exclude=ge.Array("--exclude",[],{description:"An array of glob pattern idents or paths; matching workspaces won't be traversed"});this.publicOnly=ge.Boolean("--no-private",{description:"Avoid running the command on private workspaces"});this.since=ge.String("--since",{description:"Only include workspaces that have been changed since the specified ref.",tolerateBoolean:!0});this.dryRun=ge.Boolean("-n,--dry-run",{description:"Print the commands that would be run, without actually running them"});this.commandName=ge.String();this.args=ge.Proxy()}async execute(){let r=await Ke.find(this.context.cwd,this.context.plugins),{project:o,workspace:a}=await Pt.find(r,this.context.cwd);if(!this.all&&!a)throw new rr(o.cwd,this.context.cwd);await o.restoreInstallState();let n=this.cli.process([this.commandName,...this.args]),u=n.path.length===1&&n.path[0]==="run"&&typeof n.scriptName<"u"?n.scriptName:null;if(n.path.length===0)throw new it("Invalid subcommand name for iteration - use the 'run' keyword if you wish to execute a script");let A=we=>{!this.dryRun||this.context.stdout.write(`${we}
+`)},p=()=>{let we=this.from.map(g=>mw.default.matcher(g));return o.workspaces.filter(g=>{let Ee=W.stringifyIdent(g.anchoredLocator),Se=g.relativeCwd;return we.some(le=>le(Ee)||le(Se))})},h=[];if(this.since?(A("Option --since is set; selecting the changed workspaces as root for workspace selection"),h=Array.from(await ra.fetchChangedWorkspaces({ref:this.since,project:o}))):this.from?(A("Option --from is set; selecting the specified workspaces"),h=[...p()]):this.worktree?(A("Option --worktree is set; selecting the current workspace"),h=[a]):this.recursive?(A("Option --recursive is set; selecting the current workspace"),h=[a]):this.all&&(A("Option --all is set; selecting all workspaces"),h=[...o.workspaces]),this.dryRun&&!this.all){for(let we of h)A(`
+- ${we.relativeCwd}
+  ${W.prettyLocator(r,we.anchoredLocator)}`);h.length>0&&A("")}let E;if(this.recursive?this.since?(A("Option --recursive --since is set; recursively selecting all dependent workspaces"),E=new Set(h.map(we=>[...we.getRecursiveWorkspaceDependents()]).flat())):(A("Option --recursive is set; recursively selecting all transitive dependencies"),E=new Set(h.map(we=>[...we.getRecursiveWorkspaceDependencies()]).flat())):this.worktree?(A("Option --worktree is set; recursively selecting all nested workspaces"),E=new Set(h.map(we=>[...we.getRecursiveWorkspaceChildren()]).flat())):E=null,E!==null&&(h=[...new Set([...h,...E])],this.dryRun))for(let we of E)A(`
+- ${we.relativeCwd}
+  ${W.prettyLocator(r,we.anchoredLocator)}`);let I=[],v=!1;if(u?.includes(":")){for(let we of o.workspaces)if(we.manifest.scripts.has(u)&&(v=!v,v===!1))break}for(let we of h){if(u&&!we.manifest.scripts.has(u)&&!v&&!(await un.getWorkspaceAccessibleBinaries(we)).has(u)){A(`Excluding ${we.relativeCwd} because it doesn't have a "${u}" script`);continue}if(!(u===r.env.npm_lifecycle_event&&we.cwd===a.cwd)){if(this.include.length>0&&!mw.default.isMatch(W.stringifyIdent(we.anchoredLocator),this.include)&&!mw.default.isMatch(we.relativeCwd,this.include)){A(`Excluding ${we.relativeCwd} because it doesn't match the --include filter`);continue}if(this.exclude.length>0&&(mw.default.isMatch(W.stringifyIdent(we.anchoredLocator),this.exclude)||mw.default.isMatch(we.relativeCwd,this.exclude))){A(`Excluding ${we.relativeCwd} because it matches the --include filter`);continue}if(this.publicOnly&&we.manifest.private===!0){A(`Excluding ${we.relativeCwd} because it's a private workspace and --no-private was set`);continue}I.push(we)}}if(this.dryRun)return 0;let x=this.verbose??(this.context.stdout.isTTY?1/0:0),C=x>0,R=x>1,L=this.parallel?this.jobs==="unlimited"?1/0:Number(this.jobs)||Math.ceil(Ji.availableParallelism()/2):1,U=L===1?!1:this.parallel,J=U?this.interlaced:!0,te=(0,VBe.default)(L),ae=new Map,fe=new Set,ce=0,me=null,he=!1,Be=await Nt.start({configuration:r,stdout:this.context.stdout,includePrefix:!1},async we=>{let g=async(Ee,{commandIndex:Se})=>{if(he)return-1;!U&&R&&Se>1&&we.reportSeparator();let le=XDt(Ee,{configuration:r,label:C,commandIndex:Se}),[ne,ee]=KBe(we,{prefix:le,interlaced:J}),[Ie,Fe]=KBe(we,{prefix:le,interlaced:J});try{R&&we.reportInfo(null,`${le?`${le} `:""}Process started`);let At=Date.now(),H=await this.cli.run([this.commandName,...this.args],{cwd:Ee.cwd,stdout:ne,stderr:Ie})||0;ne.end(),Ie.end(),await ee,await Fe;let at=Date.now();if(R){let Re=r.get("enableTimers")?`, completed in ${de.pretty(r,at-At,de.Type.DURATION)}`:"";we.reportInfo(null,`${le?`${le} `:""}Process exited (exit code ${H})${Re}`)}return H===130&&(he=!0,me=H),H}catch(At){throw ne.end(),Ie.end(),await ee,await Fe,At}};for(let Ee of I)ae.set(Ee.anchoredLocator.locatorHash,Ee);for(;ae.size>0&&!we.hasErrors();){let Ee=[];for(let[ne,ee]of ae){if(fe.has(ee.anchoredDescriptor.descriptorHash))continue;let Ie=!0;if(this.topological||this.topologicalDev){let Fe=this.topologicalDev?new Map([...ee.manifest.dependencies,...ee.manifest.devDependencies]):ee.manifest.dependencies;for(let At of Fe.values()){let H=o.tryWorkspaceByDescriptor(At);if(Ie=H===null||!ae.has(H.anchoredLocator.locatorHash),!Ie)break}}if(!!Ie&&(fe.add(ee.anchoredDescriptor.descriptorHash),Ee.push(te(async()=>{let Fe=await g(ee,{commandIndex:++ce});return ae.delete(ne),fe.delete(ee.anchoredDescriptor.descriptorHash),Fe})),!U))break}if(Ee.length===0){let ne=Array.from(ae.values()).map(ee=>W.prettyLocator(r,ee.anchoredLocator)).join(", ");we.reportError(3,`Dependency cycle detected (${ne})`);return}let le=(await Promise.all(Ee)).find(ne=>ne!==0);me===null&&(me=typeof le<"u"?1:me),(this.topological||this.topologicalDev)&&typeof le<"u"&&we.reportError(0,"The command failed for workspaces that are depended upon by other workspaces; can't satisfy the dependency graph")}});return me!==null?me:Be.exitCode()}};ap.paths=[["workspaces","foreach"]],ap.usage=nt.Usage({category:"Workspace-related commands",description:"run a command on all workspaces",details:"\n      This command will run a given sub-command on current and all its descendant workspaces. Various flags can alter the exact behavior of the command:\n\n      - If `-p,--parallel` is set, the commands will be ran in parallel; they'll by default be limited to a number of parallel tasks roughly equal to half your core number, but that can be overridden via `-j,--jobs`, or disabled by setting `-j unlimited`.\n\n      - If `-p,--parallel` and `-i,--interlaced` are both set, Yarn will print the lines from the output as it receives them. If `-i,--interlaced` wasn't set, it would instead buffer the output from each process and print the resulting buffers only after their source processes have exited.\n\n      - If `-t,--topological` is set, Yarn will only run the command after all workspaces that it depends on through the `dependencies` field have successfully finished executing. If `--topological-dev` is set, both the `dependencies` and `devDependencies` fields will be considered when figuring out the wait points.\n\n      - If `-A,--all` is set, Yarn will run the command on all the workspaces of a project.\n\n      - If `-R,--recursive` is set, Yarn will find workspaces to run the command on by recursively evaluating `dependencies` and `devDependencies` fields, instead of looking at the `workspaces` fields.\n\n      - If `-W,--worktree` is set, Yarn will find workspaces to run the command on by looking at the current worktree.\n\n      - If `--from` is set, Yarn will use the packages matching the 'from' glob as the starting point for any recursive search.\n\n      - If `--since` is set, Yarn will only run the command on workspaces that have been modified since the specified ref. By default Yarn will use the refs specified by the `changesetBaseRefs` configuration option.\n\n      - If `--dry-run` is set, Yarn will explain what it would do without actually doing anything.\n\n      - The command may apply to only some workspaces through the use of `--include` which acts as a whitelist. The `--exclude` flag will do the opposite and will be a list of packages that mustn't execute the script. Both flags accept glob patterns (if valid Idents and supported by [micromatch](https://github.com/micromatch/micromatch)). Make sure to escape the patterns, to prevent your own shell from trying to expand them.\n\n      The `-v,--verbose` flag can be passed up to twice: once to prefix output lines with the originating workspace's name, and again to include start/finish/timing log lines. Maximum verbosity is enabled by default in terminal environments.\n\n      If the command is `run` and the script being run does not exist the child workspace will be skipped without error.\n    ",examples:[["Publish all packages","yarn workspaces foreach -A npm publish --tolerate-republish"],["Run the build script on all descendant packages","yarn workspaces foreach -A run build"],["Run the build script on current and all descendant packages in parallel, building package dependencies first","yarn workspaces foreach -Apt run build"],["Run the build script on several packages and all their dependencies, building dependencies first","yarn workspaces foreach -Rpt --from '{workspace-a,workspace-b}' run build"]]}),ap.schema=[cI("all",qu.Forbids,["from","recursive","since","worktree"],{missingIf:"undefined"}),OT(["all","recursive","since","worktree"],{missingIf:"undefined"})];function KBe(t,{prefix:e,interlaced:r}){let o=t.createStreamReporter(e),a=new _e.DefaultStream;a.pipe(o,{end:!1}),a.on("finish",()=>{o.end()});let n=new Promise(A=>{o.on("finish",()=>{A(a.active)})});if(r)return[a,n];let u=new _e.BufferStream;return u.pipe(a,{end:!1}),u.on("finish",()=>{a.end()}),[u,n]}function XDt(t,{configuration:e,commandIndex:r,label:o}){if(!o)return null;let n=`[${W.stringifyIdent(t.anchoredLocator)}]:`,u=["#2E86AB","#A23B72","#F18F01","#C73E1D","#CCE2A3"],A=u[r%u.length];return de.pretty(e,n,A)}var ZDt={commands:[ng,ap]},$Dt=ZDt;var pC=()=>({modules:new Map([["@yarnpkg/cli",a2],["@yarnpkg/core",o2],["@yarnpkg/fslib",Vw],["@yarnpkg/libzip",x1],["@yarnpkg/parsers",rI],["@yarnpkg/shell",T1],["clipanion",hI],["semver",eSt],["typanion",Vo],["@yarnpkg/plugin-essentials",$8],["@yarnpkg/plugin-compat",iH],["@yarnpkg/plugin-constraints",wH],["@yarnpkg/plugin-dlx",IH],["@yarnpkg/plugin-exec",DH],["@yarnpkg/plugin-file",PH],["@yarnpkg/plugin-git",Z8],["@yarnpkg/plugin-github",kH],["@yarnpkg/plugin-http",QH],["@yarnpkg/plugin-init",FH],["@yarnpkg/plugin-interactive-tools",Tj],["@yarnpkg/plugin-link",Nj],["@yarnpkg/plugin-nm",yG],["@yarnpkg/plugin-npm",dq],["@yarnpkg/plugin-npm-cli",Dq],["@yarnpkg/plugin-pack",Aq],["@yarnpkg/plugin-patch",Fq],["@yarnpkg/plugin-pnp",oG],["@yarnpkg/plugin-pnpm",Nq],["@yarnpkg/plugin-stage",jq],["@yarnpkg/plugin-typescript",Gq],["@yarnpkg/plugin-version",Vq],["@yarnpkg/plugin-workspace-tools",Jq]]),plugins:new Set(["@yarnpkg/plugin-essentials","@yarnpkg/plugin-compat","@yarnpkg/plugin-constraints","@yarnpkg/plugin-dlx","@yarnpkg/plugin-exec","@yarnpkg/plugin-file","@yarnpkg/plugin-git","@yarnpkg/plugin-github","@yarnpkg/plugin-http","@yarnpkg/plugin-init","@yarnpkg/plugin-interactive-tools","@yarnpkg/plugin-link","@yarnpkg/plugin-nm","@yarnpkg/plugin-npm","@yarnpkg/plugin-npm-cli","@yarnpkg/plugin-pack","@yarnpkg/plugin-patch","@yarnpkg/plugin-pnp","@yarnpkg/plugin-pnpm","@yarnpkg/plugin-stage","@yarnpkg/plugin-typescript","@yarnpkg/plugin-version","@yarnpkg/plugin-workspace-tools"])});function XBe({cwd:t,pluginConfiguration:e}){let r=new as({binaryLabel:"Yarn Package Manager",binaryName:"yarn",binaryVersion:rn??"<unknown>"});return Object.assign(r,{defaultContext:{...as.defaultContext,cwd:t,plugins:e,quiet:!1,stdin:process.stdin,stdout:process.stdout,stderr:process.stderr}})}function tSt(t){if(_e.parseOptionalBoolean(process.env.YARN_IGNORE_NODE))return!0;let r=process.versions.node,o=">=18.12.0";if(kr.satisfiesWithPrereleases(r,o))return!0;let a=new it(`This tool requires a Node version compatible with ${o} (got ${r}). Upgrade Node, or set \`YARN_IGNORE_NODE=1\` in your environment.`);return as.defaultContext.stdout.write(t.error(a)),!1}async function ZBe({selfPath:t,pluginConfiguration:e}){return await Ke.find(ue.toPortablePath(process.cwd()),e,{strict:!1,usePathCheck:t})}function rSt(t,e,{yarnPath:r}){if(!oe.existsSync(r))return t.error(new Error(`The "yarn-path" option has been set, but the specified location doesn't exist (${r}).`)),1;process.on("SIGINT",()=>{});let o={stdio:"inherit",env:{...process.env,YARN_IGNORE_PATH:"1"}};try{(0,JBe.execFileSync)(process.execPath,[ue.fromPortablePath(r),...e],o)}catch(a){return a.status??1}return 0}function nSt(t,e){let r=null,o=e;return e.length>=2&&e[0]==="--cwd"?(r=ue.toPortablePath(e[1]),o=e.slice(2)):e.length>=1&&e[0].startsWith("--cwd=")?(r=ue.toPortablePath(e[0].slice(6)),o=e.slice(1)):e[0]==="add"&&e[e.length-2]==="--cwd"&&(r=ue.toPortablePath(e[e.length-1]),o=e.slice(0,e.length-2)),t.defaultContext.cwd=r!==null?V.resolve(r):V.cwd(),o}function iSt(t,{configuration:e}){if(!e.get("enableTelemetry")||zBe.isCI||!process.stdout.isTTY)return;Ke.telemetry=new uC(e,"puba9cdc10ec5790a2cf4969dd413a47270");let o=/^@yarnpkg\/plugin-(.*)$/;for(let a of e.plugins.keys())AC.has(a.match(o)?.[1]??"")&&Ke.telemetry?.reportPluginName(a);t.binaryVersion&&Ke.telemetry.reportVersion(t.binaryVersion)}function $Be(t,{configuration:e}){for(let r of e.plugins.values())for(let o of r.commands||[])t.register(o)}async function sSt(t,e,{selfPath:r,pluginConfiguration:o}){if(!tSt(t))return 1;let a=await ZBe({selfPath:r,pluginConfiguration:o}),n=a.get("yarnPath"),u=a.get("ignorePath");if(n&&!u)return rSt(t,e,{yarnPath:n});delete process.env.YARN_IGNORE_PATH;let A=nSt(t,e);iSt(t,{configuration:a}),$Be(t,{configuration:a});let p=t.process(A,t.defaultContext);return p.help||Ke.telemetry?.reportCommandName(p.path.join(" ")),await t.run(p,t.defaultContext)}async function $pe({cwd:t=V.cwd(),pluginConfiguration:e=pC()}={}){let r=XBe({cwd:t,pluginConfiguration:e}),o=await ZBe({pluginConfiguration:e,selfPath:null});return $Be(r,{configuration:o}),r}async function nk(t,{cwd:e=V.cwd(),selfPath:r,pluginConfiguration:o}){let a=XBe({cwd:e,pluginConfiguration:o});try{process.exitCode=await sSt(a,t,{selfPath:r,pluginConfiguration:o})}catch(n){as.defaultContext.stdout.write(a.error(n)),process.exitCode=1}finally{await oe.rmtempPromise()}}nk(process.argv.slice(2),{cwd:V.cwd(),selfPath:ue.toPortablePath(ue.resolve(process.argv[1])),pluginConfiguration:pC()});})();
+/*
+object-assign
+(c) Sindre Sorhus
+@license MIT
+*/
+/*!
+ * buildToken
+ * Builds OAuth token prefix (helper function)
+ *
+ * @name buildToken
+ * @function
+ * @param {GitUrl} obj The parsed Git url object.
+ * @return {String} token prefix
+ */
+/*!
+ * fill-range <https://github.com/jonschlinkert/fill-range>
+ *
+ * Copyright (c) 2014-present, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
+/*!
+ * is-extglob <https://github.com/jonschlinkert/is-extglob>
+ *
+ * Copyright (c) 2014-2016, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
+/*!
+ * is-glob <https://github.com/jonschlinkert/is-glob>
+ *
+ * Copyright (c) 2014-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+/*!
+ * is-number <https://github.com/jonschlinkert/is-number>
+ *
+ * Copyright (c) 2014-present, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+/*!
+ * is-windows <https://github.com/jonschlinkert/is-windows>
+ *
+ * Copyright © 2015-2018, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+/*!
+ * to-regex-range <https://github.com/micromatch/to-regex-range>
+ *
+ * Copyright (c) 2015-present, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+/**
+  @license
+  Copyright (c) 2015, Rebecca Turner
+
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.
+
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+  PERFORMANCE OF THIS SOFTWARE.
+ */
+/**
+  @license
+  Copyright Joyent, Inc. and other Node contributors.
+
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to permit
+  persons to whom the Software is furnished to do so, subject to the
+  following conditions:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+  NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+  OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+  USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+/**
+  @license
+  Copyright Node.js contributors. All rights reserved.
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to
+  deal in the Software without restriction, including without limitation the
+  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+  sell copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+  IN THE SOFTWARE.
+*/
+/**
+  @license
+  The MIT License (MIT)
+
+  Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com)
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+/** @license React v0.18.0
+ * scheduler.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+/** @license React v0.24.0
+ * react-reconciler.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+/** @license React v16.13.1
+ * react.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
diff --git a/.yarn/sdks/eslint/bin/eslint.js b/.yarn/sdks/eslint/bin/eslint.js
deleted file mode 100755
index 9ef98e400b47b..0000000000000
--- a/.yarn/sdks/eslint/bin/eslint.js
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = createRequire(absPnpApiPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require eslint/bin/eslint.js
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real eslint/bin/eslint.js your application uses
-module.exports = absRequire(`eslint/bin/eslint.js`);
diff --git a/.yarn/sdks/eslint/lib/api.js b/.yarn/sdks/eslint/lib/api.js
deleted file mode 100644
index 653b22bae06f4..0000000000000
--- a/.yarn/sdks/eslint/lib/api.js
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = createRequire(absPnpApiPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require eslint
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real eslint your application uses
-module.exports = absRequire(`eslint`);
diff --git a/.yarn/sdks/eslint/package.json b/.yarn/sdks/eslint/package.json
deleted file mode 100644
index 9e220ece4c0c2..0000000000000
--- a/.yarn/sdks/eslint/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "eslint",
-  "version": "8.52.0-sdk",
-  "main": "./lib/api.js",
-  "type": "commonjs"
-}
diff --git a/.yarn/sdks/integrations.yml b/.yarn/sdks/integrations.yml
deleted file mode 100644
index 7e42d1884d84d..0000000000000
--- a/.yarn/sdks/integrations.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is automatically generated by @yarnpkg/sdks.
-# Manual changes might be lost!
-
-integrations:
-  - vscode
-  - vim
diff --git a/.yarn/sdks/prettier/index.js b/.yarn/sdks/prettier/index.js
deleted file mode 100755
index 8758e367a725a..0000000000000
--- a/.yarn/sdks/prettier/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = createRequire(absPnpApiPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require prettier
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real prettier your application uses
-module.exports = absRequire(`prettier`);
diff --git a/.yarn/sdks/prettier/package.json b/.yarn/sdks/prettier/package.json
deleted file mode 100644
index 3c1bb0be150c6..0000000000000
--- a/.yarn/sdks/prettier/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "prettier",
-  "version": "3.0.0-sdk",
-  "main": "./index.js",
-  "type": "commonjs"
-}
diff --git a/.yarn/sdks/typescript/bin/tsc b/.yarn/sdks/typescript/bin/tsc
deleted file mode 100755
index 454b950b7e8f1..0000000000000
--- a/.yarn/sdks/typescript/bin/tsc
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = createRequire(absPnpApiPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/bin/tsc
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real typescript/bin/tsc your application uses
-module.exports = absRequire(`typescript/bin/tsc`);
diff --git a/.yarn/sdks/typescript/bin/tsserver b/.yarn/sdks/typescript/bin/tsserver
deleted file mode 100755
index d7a605684df95..0000000000000
--- a/.yarn/sdks/typescript/bin/tsserver
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = createRequire(absPnpApiPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/bin/tsserver
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real typescript/bin/tsserver your application uses
-module.exports = absRequire(`typescript/bin/tsserver`);
diff --git a/.yarn/sdks/typescript/lib/tsc.js b/.yarn/sdks/typescript/lib/tsc.js
deleted file mode 100644
index 2f62fc96c0a08..0000000000000
--- a/.yarn/sdks/typescript/lib/tsc.js
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = createRequire(absPnpApiPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/lib/tsc.js
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real typescript/lib/tsc.js your application uses
-module.exports = absRequire(`typescript/lib/tsc.js`);
diff --git a/.yarn/sdks/typescript/lib/tsserver.js b/.yarn/sdks/typescript/lib/tsserver.js
deleted file mode 100644
index bbb1e46501b52..0000000000000
--- a/.yarn/sdks/typescript/lib/tsserver.js
+++ /dev/null
@@ -1,225 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = createRequire(absPnpApiPath);
-
-const moduleWrapper = tsserver => {
-  if (!process.versions.pnp) {
-    return tsserver;
-  }
-
-  const {isAbsolute} = require(`path`);
-  const pnpApi = require(`pnpapi`);
-
-  const isVirtual = str => str.match(/\/(\$\$virtual|__virtual__)\//);
-  const isPortal = str => str.startsWith("portal:/");
-  const normalize = str => str.replace(/\\/g, `/`).replace(/^\/?/, `/`);
-
-  const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => {
-    return `${locator.name}@${locator.reference}`;
-  }));
-
-  // VSCode sends the zip paths to TS using the "zip://" prefix, that TS
-  // doesn't understand. This layer makes sure to remove the protocol
-  // before forwarding it to TS, and to add it back on all returned paths.
-
-  function toEditorPath(str) {
-    // We add the `zip:` prefix to both `.zip/` paths and virtual paths
-    if (isAbsolute(str) && !str.match(/^\^?(zip:|\/zip\/)/) && (str.match(/\.zip\//) || isVirtual(str))) {
-      // We also take the opportunity to turn virtual paths into physical ones;
-      // this makes it much easier to work with workspaces that list peer
-      // dependencies, since otherwise Ctrl+Click would bring us to the virtual
-      // file instances instead of the real ones.
-      //
-      // We only do this to modules owned by the the dependency tree roots.
-      // This avoids breaking the resolution when jumping inside a vendor
-      // with peer dep (otherwise jumping into react-dom would show resolution
-      // errors on react).
-      //
-      const resolved = isVirtual(str) ? pnpApi.resolveVirtual(str) : str;
-      if (resolved) {
-        const locator = pnpApi.findPackageLocator(resolved);
-        if (locator && (dependencyTreeRoots.has(`${locator.name}@${locator.reference}`) || isPortal(locator.reference))) {
-          str = resolved;
-        }
-      }
-
-      str = normalize(str);
-
-      if (str.match(/\.zip\//)) {
-        switch (hostInfo) {
-          // Absolute VSCode `Uri.fsPath`s need to start with a slash.
-          // VSCode only adds it automatically for supported schemes,
-          // so we have to do it manually for the `zip` scheme.
-          // The path needs to start with a caret otherwise VSCode doesn't handle the protocol
-          //
-          // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
-          //
-          // 2021-10-08: VSCode changed the format in 1.61.
-          // Before | ^zip:/c:/foo/bar.zip/package.json
-          // After  | ^/zip//c:/foo/bar.zip/package.json
-          //
-          // 2022-04-06: VSCode changed the format in 1.66.
-          // Before | ^/zip//c:/foo/bar.zip/package.json
-          // After  | ^/zip/c:/foo/bar.zip/package.json
-          //
-          // 2022-05-06: VSCode changed the format in 1.68
-          // Before | ^/zip/c:/foo/bar.zip/package.json
-          // After  | ^/zip//c:/foo/bar.zip/package.json
-          //
-          case `vscode <1.61`: {
-            str = `^zip:${str}`;
-          } break;
-
-          case `vscode <1.66`: {
-            str = `^/zip/${str}`;
-          } break;
-
-          case `vscode <1.68`: {
-            str = `^/zip${str}`;
-          } break;
-
-          case `vscode`: {
-            str = `^/zip/${str}`;
-          } break;
-
-          // To make "go to definition" work,
-          // We have to resolve the actual file system path from virtual path
-          // and convert scheme to supported by [vim-rzip](https://github.com/lbrayner/vim-rzip)
-          case `coc-nvim`: {
-            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
-            str = resolve(`zipfile:${str}`);
-          } break;
-
-          // Support neovim native LSP and [typescript-language-server](https://github.com/theia-ide/typescript-language-server)
-          // We have to resolve the actual file system path from virtual path,
-          // everything else is up to neovim
-          case `neovim`: {
-            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
-            str = `zipfile://${str}`;
-          } break;
-
-          default: {
-            str = `zip:${str}`;
-          } break;
-        }
-      } else {
-        str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`);
-      }
-    }
-
-    return str;
-  }
-
-  function fromEditorPath(str) {
-    switch (hostInfo) {
-      case `coc-nvim`: {
-        str = str.replace(/\.zip::/, `.zip/`);
-        // The path for coc-nvim is in format of /<pwd>/zipfile:/<pwd>/.yarn/...
-        // So in order to convert it back, we use .* to match all the thing
-        // before `zipfile:`
-        return process.platform === `win32`
-          ? str.replace(/^.*zipfile:\//, ``)
-          : str.replace(/^.*zipfile:/, ``);
-      } break;
-
-      case `neovim`: {
-        str = str.replace(/\.zip::/, `.zip/`);
-        // The path for neovim is in format of zipfile:///<pwd>/.yarn/...
-        return str.replace(/^zipfile:\/\//, ``);
-      } break;
-
-      case `vscode`:
-      default: {
-        return str.replace(/^\^?(zip:|\/zip(\/ts-nul-authority)?)\/+/, process.platform === `win32` ? `` : `/`)
-      } break;
-    }
-  }
-
-  // Force enable 'allowLocalPluginLoads'
-  // TypeScript tries to resolve plugins using a path relative to itself
-  // which doesn't work when using the global cache
-  // https://github.com/microsoft/TypeScript/blob/1b57a0395e0bff191581c9606aab92832001de62/src/server/project.ts#L2238
-  // VSCode doesn't want to enable 'allowLocalPluginLoads' due to security concerns but
-  // TypeScript already does local loads and if this code is running the user trusts the workspace
-  // https://github.com/microsoft/vscode/issues/45856
-  const ConfiguredProject = tsserver.server.ConfiguredProject;
-  const {enablePluginsWithOptions: originalEnablePluginsWithOptions} = ConfiguredProject.prototype;
-  ConfiguredProject.prototype.enablePluginsWithOptions = function() {
-    this.projectService.allowLocalPluginLoads = true;
-    return originalEnablePluginsWithOptions.apply(this, arguments);
-  };
-
-  // And here is the point where we hijack the VSCode <-> TS communications
-  // by adding ourselves in the middle. We locate everything that looks
-  // like an absolute path of ours and normalize it.
-
-  const Session = tsserver.server.Session;
-  const {onMessage: originalOnMessage, send: originalSend} = Session.prototype;
-  let hostInfo = `unknown`;
-
-  Object.assign(Session.prototype, {
-    onMessage(/** @type {string | object} */ message) {
-      const isStringMessage = typeof message === 'string';
-      const parsedMessage = isStringMessage ? JSON.parse(message) : message;
-
-      if (
-        parsedMessage != null &&
-        typeof parsedMessage === `object` &&
-        parsedMessage.arguments &&
-        typeof parsedMessage.arguments.hostInfo === `string`
-      ) {
-        hostInfo = parsedMessage.arguments.hostInfo;
-        if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK) {
-          const [, major, minor] = (process.env.VSCODE_IPC_HOOK.match(
-            // The RegExp from https://semver.org/ but without the caret at the start
-            /(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
-          ) ?? []).map(Number)
-
-          if (major === 1) {
-            if (minor < 61) {
-              hostInfo += ` <1.61`;
-            } else if (minor < 66) {
-              hostInfo += ` <1.66`;
-            } else if (minor < 68) {
-              hostInfo += ` <1.68`;
-            }
-          }
-        }
-      }
-
-      const processedMessageJSON = JSON.stringify(parsedMessage, (key, value) => {
-        return typeof value === 'string' ? fromEditorPath(value) : value;
-      });
-
-      return originalOnMessage.call(
-        this,
-        isStringMessage ? processedMessageJSON : JSON.parse(processedMessageJSON)
-      );
-    },
-
-    send(/** @type {any} */ msg) {
-      return originalSend.call(this, JSON.parse(JSON.stringify(msg, (key, value) => {
-        return typeof value === `string` ? toEditorPath(value) : value;
-      })));
-    }
-  });
-
-  return tsserver;
-};
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/lib/tsserver.js
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real typescript/lib/tsserver.js your application uses
-module.exports = moduleWrapper(absRequire(`typescript/lib/tsserver.js`));
diff --git a/.yarn/sdks/typescript/lib/tsserverlibrary.js b/.yarn/sdks/typescript/lib/tsserverlibrary.js
deleted file mode 100644
index a68f028fe1971..0000000000000
--- a/.yarn/sdks/typescript/lib/tsserverlibrary.js
+++ /dev/null
@@ -1,225 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = createRequire(absPnpApiPath);
-
-const moduleWrapper = tsserver => {
-  if (!process.versions.pnp) {
-    return tsserver;
-  }
-
-  const {isAbsolute} = require(`path`);
-  const pnpApi = require(`pnpapi`);
-
-  const isVirtual = str => str.match(/\/(\$\$virtual|__virtual__)\//);
-  const isPortal = str => str.startsWith("portal:/");
-  const normalize = str => str.replace(/\\/g, `/`).replace(/^\/?/, `/`);
-
-  const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => {
-    return `${locator.name}@${locator.reference}`;
-  }));
-
-  // VSCode sends the zip paths to TS using the "zip://" prefix, that TS
-  // doesn't understand. This layer makes sure to remove the protocol
-  // before forwarding it to TS, and to add it back on all returned paths.
-
-  function toEditorPath(str) {
-    // We add the `zip:` prefix to both `.zip/` paths and virtual paths
-    if (isAbsolute(str) && !str.match(/^\^?(zip:|\/zip\/)/) && (str.match(/\.zip\//) || isVirtual(str))) {
-      // We also take the opportunity to turn virtual paths into physical ones;
-      // this makes it much easier to work with workspaces that list peer
-      // dependencies, since otherwise Ctrl+Click would bring us to the virtual
-      // file instances instead of the real ones.
-      //
-      // We only do this to modules owned by the the dependency tree roots.
-      // This avoids breaking the resolution when jumping inside a vendor
-      // with peer dep (otherwise jumping into react-dom would show resolution
-      // errors on react).
-      //
-      const resolved = isVirtual(str) ? pnpApi.resolveVirtual(str) : str;
-      if (resolved) {
-        const locator = pnpApi.findPackageLocator(resolved);
-        if (locator && (dependencyTreeRoots.has(`${locator.name}@${locator.reference}`) || isPortal(locator.reference))) {
-          str = resolved;
-        }
-      }
-
-      str = normalize(str);
-
-      if (str.match(/\.zip\//)) {
-        switch (hostInfo) {
-          // Absolute VSCode `Uri.fsPath`s need to start with a slash.
-          // VSCode only adds it automatically for supported schemes,
-          // so we have to do it manually for the `zip` scheme.
-          // The path needs to start with a caret otherwise VSCode doesn't handle the protocol
-          //
-          // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
-          //
-          // 2021-10-08: VSCode changed the format in 1.61.
-          // Before | ^zip:/c:/foo/bar.zip/package.json
-          // After  | ^/zip//c:/foo/bar.zip/package.json
-          //
-          // 2022-04-06: VSCode changed the format in 1.66.
-          // Before | ^/zip//c:/foo/bar.zip/package.json
-          // After  | ^/zip/c:/foo/bar.zip/package.json
-          //
-          // 2022-05-06: VSCode changed the format in 1.68
-          // Before | ^/zip/c:/foo/bar.zip/package.json
-          // After  | ^/zip//c:/foo/bar.zip/package.json
-          //
-          case `vscode <1.61`: {
-            str = `^zip:${str}`;
-          } break;
-
-          case `vscode <1.66`: {
-            str = `^/zip/${str}`;
-          } break;
-
-          case `vscode <1.68`: {
-            str = `^/zip${str}`;
-          } break;
-
-          case `vscode`: {
-            str = `^/zip/${str}`;
-          } break;
-
-          // To make "go to definition" work,
-          // We have to resolve the actual file system path from virtual path
-          // and convert scheme to supported by [vim-rzip](https://github.com/lbrayner/vim-rzip)
-          case `coc-nvim`: {
-            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
-            str = resolve(`zipfile:${str}`);
-          } break;
-
-          // Support neovim native LSP and [typescript-language-server](https://github.com/theia-ide/typescript-language-server)
-          // We have to resolve the actual file system path from virtual path,
-          // everything else is up to neovim
-          case `neovim`: {
-            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
-            str = `zipfile://${str}`;
-          } break;
-
-          default: {
-            str = `zip:${str}`;
-          } break;
-        }
-      } else {
-        str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`);
-      }
-    }
-
-    return str;
-  }
-
-  function fromEditorPath(str) {
-    switch (hostInfo) {
-      case `coc-nvim`: {
-        str = str.replace(/\.zip::/, `.zip/`);
-        // The path for coc-nvim is in format of /<pwd>/zipfile:/<pwd>/.yarn/...
-        // So in order to convert it back, we use .* to match all the thing
-        // before `zipfile:`
-        return process.platform === `win32`
-          ? str.replace(/^.*zipfile:\//, ``)
-          : str.replace(/^.*zipfile:/, ``);
-      } break;
-
-      case `neovim`: {
-        str = str.replace(/\.zip::/, `.zip/`);
-        // The path for neovim is in format of zipfile:///<pwd>/.yarn/...
-        return str.replace(/^zipfile:\/\//, ``);
-      } break;
-
-      case `vscode`:
-      default: {
-        return str.replace(/^\^?(zip:|\/zip(\/ts-nul-authority)?)\/+/, process.platform === `win32` ? `` : `/`)
-      } break;
-    }
-  }
-
-  // Force enable 'allowLocalPluginLoads'
-  // TypeScript tries to resolve plugins using a path relative to itself
-  // which doesn't work when using the global cache
-  // https://github.com/microsoft/TypeScript/blob/1b57a0395e0bff191581c9606aab92832001de62/src/server/project.ts#L2238
-  // VSCode doesn't want to enable 'allowLocalPluginLoads' due to security concerns but
-  // TypeScript already does local loads and if this code is running the user trusts the workspace
-  // https://github.com/microsoft/vscode/issues/45856
-  const ConfiguredProject = tsserver.server.ConfiguredProject;
-  const {enablePluginsWithOptions: originalEnablePluginsWithOptions} = ConfiguredProject.prototype;
-  ConfiguredProject.prototype.enablePluginsWithOptions = function() {
-    this.projectService.allowLocalPluginLoads = true;
-    return originalEnablePluginsWithOptions.apply(this, arguments);
-  };
-
-  // And here is the point where we hijack the VSCode <-> TS communications
-  // by adding ourselves in the middle. We locate everything that looks
-  // like an absolute path of ours and normalize it.
-
-  const Session = tsserver.server.Session;
-  const {onMessage: originalOnMessage, send: originalSend} = Session.prototype;
-  let hostInfo = `unknown`;
-
-  Object.assign(Session.prototype, {
-    onMessage(/** @type {string | object} */ message) {
-      const isStringMessage = typeof message === 'string';
-      const parsedMessage = isStringMessage ? JSON.parse(message) : message;
-
-      if (
-        parsedMessage != null &&
-        typeof parsedMessage === `object` &&
-        parsedMessage.arguments &&
-        typeof parsedMessage.arguments.hostInfo === `string`
-      ) {
-        hostInfo = parsedMessage.arguments.hostInfo;
-        if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK) {
-          const [, major, minor] = (process.env.VSCODE_IPC_HOOK.match(
-            // The RegExp from https://semver.org/ but without the caret at the start
-            /(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
-          ) ?? []).map(Number)
-
-          if (major === 1) {
-            if (minor < 61) {
-              hostInfo += ` <1.61`;
-            } else if (minor < 66) {
-              hostInfo += ` <1.66`;
-            } else if (minor < 68) {
-              hostInfo += ` <1.68`;
-            }
-          }
-        }
-      }
-
-      const processedMessageJSON = JSON.stringify(parsedMessage, (key, value) => {
-        return typeof value === 'string' ? fromEditorPath(value) : value;
-      });
-
-      return originalOnMessage.call(
-        this,
-        isStringMessage ? processedMessageJSON : JSON.parse(processedMessageJSON)
-      );
-    },
-
-    send(/** @type {any} */ msg) {
-      return originalSend.call(this, JSON.parse(JSON.stringify(msg, (key, value) => {
-        return typeof value === `string` ? toEditorPath(value) : value;
-      })));
-    }
-  });
-
-  return tsserver;
-};
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/lib/tsserverlibrary.js
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real typescript/lib/tsserverlibrary.js your application uses
-module.exports = moduleWrapper(absRequire(`typescript/lib/tsserverlibrary.js`));
diff --git a/.yarn/sdks/typescript/lib/typescript.js b/.yarn/sdks/typescript/lib/typescript.js
deleted file mode 100644
index e14fa87beaa40..0000000000000
--- a/.yarn/sdks/typescript/lib/typescript.js
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = createRequire(absPnpApiPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/lib/typescript.js
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real typescript/lib/typescript.js your application uses
-module.exports = absRequire(`typescript/lib/typescript.js`);
diff --git a/.yarn/sdks/typescript/package.json b/.yarn/sdks/typescript/package.json
deleted file mode 100644
index 15466d2023ffc..0000000000000
--- a/.yarn/sdks/typescript/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "typescript",
-  "version": "4.8.4-sdk",
-  "main": "./lib/typescript.js",
-  "type": "commonjs"
-}
diff --git a/.yarnrc.yml b/.yarnrc.yml
index 8b481ba2ed9fe..017d8b0c4f0ab 100644
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -1,11 +1,18 @@
+compressionLevel: mixed
+
+enableGlobalCache: false
+
 enableTelemetry: false
 
-nodeLinker: pnp
+nodeLinker: node-modules
 
 packageExtensions:
   '@storybook/core-common@7.4.5':
     dependencies:
       '@storybook/react-webpack5': 7.4.5
+  'croact-css-styled@1.1.9':
+    dependencies:
+      croact: 1.0.4
   doctrine@3.0.0:
     dependencies:
       assert: 2.0.0
@@ -26,20 +33,20 @@ packageExtensions:
   react-resizable@3.0.4:
     peerDependencies:
       react-dom: 17.0.1
+  '@msagl/drawing@*':
+    dependencies:
+      queue-typescript: "^1.0.1"
+      "@esfx/collections-sortedmap": "^1.0.0"
 
 plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
-    spec: '@yarnpkg/plugin-typescript'
-  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: '@yarnpkg/plugin-interactive-tools'
   - path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
     spec: 'https://mskelton.dev/yarn-outdated/v2'
 
-yarnPath: .yarn/releases/yarn-3.6.4.cjs
+yarnPath: .yarn/releases/yarn-4.1.0.cjs
 # Uncomment the following lines if you want to use Verdaccio local npm registry. Read more at packages/README.md
-# npmScopes:
-#   grafana:
-#     npmRegistryServer: http://localhost:4873
-
-# unsafeHttpWhitelist:
-#   - 'localhost'
+#npmScopes:
+# grafana:
+#   npmRegistryServer: http://localhost:4873
+#
+#unsafeHttpWhitelist:
+# - 'localhost'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e26adac50ae78..529e6f988a139 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,1066 @@
+<!-- 11.0.0-preview START -->
+
+# 11.0.0-preview
+
+### Features and enhancements
+
+- **Alerting:** Editor role can access all provisioning API. [#85022](https://github.com/grafana/grafana/issues/85022), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **CloudWatch:** Add additional AWS/SageMaker metrics. [#85009](https://github.com/grafana/grafana/issues/85009), [@tristanburgess](https://github.com/tristanburgess)
+- **SQLStore:** Enable migration locking by default. [#84983](https://github.com/grafana/grafana/issues/84983), [@papagian](https://github.com/papagian)
+- **Auth:** Remove `oauth_skip_org_role_update_sync` as an option. [#84972](https://github.com/grafana/grafana/issues/84972), [@eleijonmarck](https://github.com/eleijonmarck)
+- **Canvas:** Add "infinite" pan / zoom functionality. [#84968](https://github.com/grafana/grafana/issues/84968), [@nmarrs](https://github.com/nmarrs)
+- **InteractiveTable:** Add expand all to column. [#84966](https://github.com/grafana/grafana/issues/84966), [@abannachGrafana](https://github.com/abannachGrafana)
+- **Snapshots:** Viewers can not create a Snapshot. [#84952](https://github.com/grafana/grafana/issues/84952), [@evictorero](https://github.com/evictorero)
+- **GenAI:** Autogenerate title and description for panels and dashboards. [#84933](https://github.com/grafana/grafana/issues/84933), [@ivanortegaalba](https://github.com/ivanortegaalba)
+- **Canvas:** Add corner radius option. [#84873](https://github.com/grafana/grafana/issues/84873), [@drew08t](https://github.com/drew08t)
+- **Alerting:** Enable simplified routing FF by default. [#84856](https://github.com/grafana/grafana/issues/84856), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Auth:** Enable case insensitive logins/emails by default. [#84840](https://github.com/grafana/grafana/issues/84840), [@eleijonmarck](https://github.com/eleijonmarck)
+- **RBAC:** Enable annotation permission update by default. [#84787](https://github.com/grafana/grafana/issues/84787), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **Azure:** Support multi-resource namespace (NetApp Volumes). [#84779](https://github.com/grafana/grafana/issues/84779), [@aangelisc](https://github.com/aangelisc)
+- **Prometheus:** Default support labels value endpoint with match param when prom type and version not set. [#84778](https://github.com/grafana/grafana/issues/84778), [@bohandley](https://github.com/bohandley)
+- **MSSQL:** Add Windows AD/Kerberos auth. [#84742](https://github.com/grafana/grafana/issues/84742), [@asimpson](https://github.com/asimpson)
+- **Chore:** Disable angular support by default. [#84738](https://github.com/grafana/grafana/issues/84738), [@tolzhabayev](https://github.com/tolzhabayev)
+- **Elasticsearch:** Remove xpack button and make includeFrozen not dependant on it. [#84734](https://github.com/grafana/grafana/issues/84734), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Plugins:** Enable feature toggle `pluginsDynamicAngularDetectionPatterns` by default. [#84723](https://github.com/grafana/grafana/issues/84723), [@xnyo](https://github.com/xnyo)
+- **Plugins:** Enable managedPluginsInstall by default. [#84721](https://github.com/grafana/grafana/issues/84721), [@oshirohugo](https://github.com/oshirohugo)
+- **Alerting:** Stop persisting silences and nflog to disk. [#84706](https://github.com/grafana/grafana/issues/84706), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Histogram:** Add support for stacking mode. [#84693](https://github.com/grafana/grafana/issues/84693), [@adela-almasan](https://github.com/adela-almasan)
+- **Datasource:** Change query filtering. [#84656](https://github.com/grafana/grafana/issues/84656), [@sunker](https://github.com/sunker)
+- **Feature toggles:** Remove redshiftAsyncQueryDataSupport and athenaAsyncQueryDataSupport feature toggles. [#84653](https://github.com/grafana/grafana/issues/84653), [@idastambuk](https://github.com/idastambuk)
+- **Teams:** Display teams page to team reader if they also have the access to list team permissions. [#84650](https://github.com/grafana/grafana/issues/84650), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **Plugins:** Enable feature toggle `enablePluginsTracingByDefault` by default. [#84645](https://github.com/grafana/grafana/issues/84645), [@xnyo](https://github.com/xnyo)
+- **NestedFolders:** Enable nested folders by default. [#84631](https://github.com/grafana/grafana/issues/84631), [@zserge](https://github.com/zserge)
+- **Canvas:** Add direction options for connections. [#84620](https://github.com/grafana/grafana/issues/84620), [@drew08t](https://github.com/drew08t)
+- **CloudWatch:** Static labels should use label name. [#84611](https://github.com/grafana/grafana/issues/84611), [@iwysiu](https://github.com/iwysiu)
+- **Tempo:** Deprecate old search. [#84498](https://github.com/grafana/grafana/issues/84498), [@joey-grafana](https://github.com/joey-grafana)
+- **Canvas:** Support dashed connection lines. [#84496](https://github.com/grafana/grafana/issues/84496), [@Develer](https://github.com/Develer)
+- **I18n:** Add Brazilian Portuguese. [#84461](https://github.com/grafana/grafana/issues/84461), [@joshhunt](https://github.com/joshhunt)
+- **I18n:** Expose current UI language in @grafana/runtime config. [#84457](https://github.com/grafana/grafana/issues/84457), [@joshhunt](https://github.com/joshhunt)
+- **Canvas:** Add snapping to vertex edit. [#84417](https://github.com/grafana/grafana/issues/84417), [@drew08t](https://github.com/drew08t)
+- **CloudWatch Logs:** Remove toggle for cloudWatchLogsMonacoEditor. [#84414](https://github.com/grafana/grafana/issues/84414), [@iwysiu](https://github.com/iwysiu)
+- **Prometheus:** Use frontend package in Prometheus DS with a feature toggle. [#84397](https://github.com/grafana/grafana/issues/84397), [@bohandley](https://github.com/bohandley)
+- **Alerting:** Show error message when error is thrown after clicking create alert f…. [#84367](https://github.com/grafana/grafana/issues/84367), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Tempo:** Remove Loki tab. [#84346](https://github.com/grafana/grafana/issues/84346), [@joey-grafana](https://github.com/joey-grafana)
+- **Storage:** Add support for listing resource history. [#84331](https://github.com/grafana/grafana/issues/84331), [@DanCech](https://github.com/DanCech)
+- **Cloudwatch:** Remove cloudWatchWildCardDimensionValues feature toggle. [#84329](https://github.com/grafana/grafana/issues/84329), [@iwysiu](https://github.com/iwysiu)
+- **Plugin Extensions:** Add prop types to component extensions. [#84295](https://github.com/grafana/grafana/issues/84295), [@leventebalogh](https://github.com/leventebalogh)
+- **Canvas:** New basic elements. [#84205](https://github.com/grafana/grafana/issues/84205), [@Develer](https://github.com/Develer)
+- **Tempo:** Update TraceQLStreaming feature toggle stage. [#84203](https://github.com/grafana/grafana/issues/84203), [@joey-grafana](https://github.com/joey-grafana)
+- **Canvas:** Add universal data link support. [#84142](https://github.com/grafana/grafana/issues/84142), [@nmarrs](https://github.com/nmarrs)
+- **Chore:** Remove repetitive words. [#84132](https://github.com/grafana/grafana/issues/84132), [@carrychair](https://github.com/carrychair)
+- **Documentation:** Updated yaml for influxdb data sources. [#84119](https://github.com/grafana/grafana/issues/84119), [@ldomesjo](https://github.com/ldomesjo)
+- **Queries:** Improve debug logging of metrics queries. [#84048](https://github.com/grafana/grafana/issues/84048), [@mmandrus](https://github.com/mmandrus)
+- **Storage:** Support listing deleted entities. [#84043](https://github.com/grafana/grafana/issues/84043), [@DanCech](https://github.com/DanCech)
+- **Explore:** Remove deprecated `query` option from `splitOpen`. [#83973](https://github.com/grafana/grafana/issues/83973), [@Elfo404](https://github.com/Elfo404)
+- **Chore:** Remove deprecated ExploreQueryFieldProps. [#83972](https://github.com/grafana/grafana/issues/83972), [@Elfo404](https://github.com/Elfo404)
+- **Chore:** Remove deprecated exploreId from QueryEditorProps. [#83971](https://github.com/grafana/grafana/issues/83971), [@Elfo404](https://github.com/Elfo404)
+- **Alerting:** Disallow invalid rule namespace UIDs in provisioning API. [#83938](https://github.com/grafana/grafana/issues/83938), [@rwwiv](https://github.com/rwwiv)
+- **Auth:** Set the default org after User login. [#83918](https://github.com/grafana/grafana/issues/83918), [@mgyongyosi](https://github.com/mgyongyosi)
+- **Canvas:** Add datalink support to rectangle and ellipse elements. [#83870](https://github.com/grafana/grafana/issues/83870), [@nmarrs](https://github.com/nmarrs)
+- **NodeGraph:** Edge color and stroke-dasharray support. [#83855](https://github.com/grafana/grafana/issues/83855), [@morrro01](https://github.com/morrro01)
+- **InfluxDB:** Add configuration option for enabling insecure gRPC connections. [#83834](https://github.com/grafana/grafana/issues/83834), [@jmickey](https://github.com/jmickey)
+- **Plugins:** Fetch instance provisioned plugins in cloud, to check full installation. [#83784](https://github.com/grafana/grafana/issues/83784), [@oshirohugo](https://github.com/oshirohugo)
+- **Alerting:** Implement correct RBAC checks for creating new notification templates. [#83767](https://github.com/grafana/grafana/issues/83767), [@gillesdemey](https://github.com/gillesdemey)
+- **Library panels:** Ensure all filters are visible on mobile . [#83759](https://github.com/grafana/grafana/issues/83759), [@ashharrison90](https://github.com/ashharrison90)
+- **AuthProxy:** Allow disabling Auth Proxy cache. [#83755](https://github.com/grafana/grafana/issues/83755), [@Jguer](https://github.com/Jguer)
+- **Switch:** Remove "transparent" prop. [#83705](https://github.com/grafana/grafana/issues/83705), [@Clarity-89](https://github.com/Clarity-89)
+- **Alerting:** Allow inserting before or after existing policy. [#83704](https://github.com/grafana/grafana/issues/83704), [@gillesdemey](https://github.com/gillesdemey)
+- **Chore:** Taint ArrayVector with `never` to further discourage. [#83681](https://github.com/grafana/grafana/issues/83681), [@joshhunt](https://github.com/joshhunt)
+- **Alerting:** Remove legacy alerting. [#83671](https://github.com/grafana/grafana/issues/83671), [@gillesdemey](https://github.com/gillesdemey)
+- **Canvas:** Add vertex control to connections. [#83653](https://github.com/grafana/grafana/issues/83653), [@drew08t](https://github.com/drew08t)
+- **Alerting:** Disable legacy alerting for ever. [#83651](https://github.com/grafana/grafana/issues/83651), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Table:** Preserve filtered value state. [#83631](https://github.com/grafana/grafana/issues/83631), [@codeincarnate](https://github.com/codeincarnate)
+- **Canvas:** Add ability to edit selected connections in the inline editor. [#83625](https://github.com/grafana/grafana/issues/83625), [@nmarrs](https://github.com/nmarrs)
+- **Auth:** Add all settings to Azure AD SSO config UI. [#83618](https://github.com/grafana/grafana/issues/83618), [@mgyongyosi](https://github.com/mgyongyosi)
+- **Cfg:** Add a setting to configure if the local file system is available. [#83616](https://github.com/grafana/grafana/issues/83616), [@mgyongyosi](https://github.com/mgyongyosi)
+- **Server:** Reload TLS certs without a server restart. [#83589](https://github.com/grafana/grafana/issues/83589), [@chalapat](https://github.com/chalapat)
+- **Accessibility:** Improve landmark markup. [#83576](https://github.com/grafana/grafana/issues/83576), [@tskarhed](https://github.com/tskarhed)
+- **Snapshots:** Change default expiration. [#83550](https://github.com/grafana/grafana/issues/83550), [@evictorero](https://github.com/evictorero)
+- **Transformations:** Add substring matcher to the 'Filter by Value' transformation. [#83548](https://github.com/grafana/grafana/issues/83548), [@timlevett](https://github.com/timlevett)
+- **Folders:** Allow listing folders with write permission. [#83527](https://github.com/grafana/grafana/issues/83527), [@papagian](https://github.com/papagian)
+- **Chore:** Remove React 17 peer deps. [#83524](https://github.com/grafana/grafana/issues/83524), [@ashharrison90](https://github.com/ashharrison90)
+- **Alerting:** Support deleting rule groups in the provisioning API. [#83514](https://github.com/grafana/grafana/issues/83514), [@joeblubaugh](https://github.com/joeblubaugh)
+- **Cloudwatch:** Bump grafana/aws-sdk-go to 0.24.0. [#83480](https://github.com/grafana/grafana/issues/83480), [@idastambuk](https://github.com/idastambuk)
+- **Alerting:** Stop persisting user-defined templates to disk. [#83456](https://github.com/grafana/grafana/issues/83456), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Transformer:** Config from Query: set threshold colours. [#83366](https://github.com/grafana/grafana/issues/83366), [@LarsStegman](https://github.com/LarsStegman)
+- **CloudWatch:** Refactor "getDimensionValuesForWildcards". [#83335](https://github.com/grafana/grafana/issues/83335), [@iwysiu](https://github.com/iwysiu)
+- **CloudWatch:** Fetch externalId from settings instead of env. [#83332](https://github.com/grafana/grafana/issues/83332), [@iwysiu](https://github.com/iwysiu)
+- **Tracing:** Add node graph panel suggestion. [#83311](https://github.com/grafana/grafana/issues/83311), [@joey-grafana](https://github.com/joey-grafana)
+- **Canvas:** Add ability to rotate elements. [#83295](https://github.com/grafana/grafana/issues/83295), [@nmarrs](https://github.com/nmarrs)
+- **Tempo:** Add support for ad-hoc filters. [#83290](https://github.com/grafana/grafana/issues/83290), [@joey-grafana](https://github.com/joey-grafana)
+- **DataTrails:** Sticky controls. [#83286](https://github.com/grafana/grafana/issues/83286), [@torkelo](https://github.com/torkelo)
+- **CloudWatch:** Move SessionCache onto the instance. [#83278](https://github.com/grafana/grafana/issues/83278), [@iwysiu](https://github.com/iwysiu)
+- **Alerting:** Deprecate max_annotations_to_keep and max_annotation_age in [alerting] configuration section. [#83266](https://github.com/grafana/grafana/issues/83266), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Annotation query:** Render query result in alert box. [#83230](https://github.com/grafana/grafana/issues/83230), [@sunker](https://github.com/sunker)
+- **Chore:** Query oauth info from a new instance. [#83229](https://github.com/grafana/grafana/issues/83229), [@linoman](https://github.com/linoman)
+- **CloudWatch:** Add Firehose kms-related metrics. [#83192](https://github.com/grafana/grafana/issues/83192), [@thepalbi](https://github.com/thepalbi)
+- **Chore:** Add go workspace. [#83191](https://github.com/grafana/grafana/issues/83191), [@toddtreece](https://github.com/toddtreece)
+- **Accessibility:** Improve HelpModal markup. [#83171](https://github.com/grafana/grafana/issues/83171), [@tskarhed](https://github.com/tskarhed)
+- **Chore:** Delete Input Datasource. [#83163](https://github.com/grafana/grafana/issues/83163), [@jackw](https://github.com/jackw)
+- **Traces:** Add traces panel suggestion. [#83089](https://github.com/grafana/grafana/issues/83089), [@joey-grafana](https://github.com/joey-grafana)
+- **CloudWatch:** Update AWS/EC2 metrics. [#83039](https://github.com/grafana/grafana/issues/83039), [@jangaraj](https://github.com/jangaraj)
+- **CloudWatch:** Update AWS/Lambda metrics. [#83038](https://github.com/grafana/grafana/issues/83038), [@jangaraj](https://github.com/jangaraj)
+- **CloudWatch:** Update AWS/ES metrics. [#83037](https://github.com/grafana/grafana/issues/83037), [@jangaraj](https://github.com/jangaraj)
+- **CloudWatch:** Update AWS/AutoScaling metrics. [#83036](https://github.com/grafana/grafana/issues/83036), [@jangaraj](https://github.com/jangaraj)
+- **CloudWatch:** Update AWS/Kafka metrics. [#83035](https://github.com/grafana/grafana/issues/83035), [@jangaraj](https://github.com/jangaraj)
+- **Page:** Use browser native scrollbars for the main page content. [#82919](https://github.com/grafana/grafana/issues/82919), [@joshhunt](https://github.com/joshhunt)
+- **Parca:** Apply template variables for labelSelector in query. [#82910](https://github.com/grafana/grafana/issues/82910), [@lzakharov](https://github.com/lzakharov)
+- **Grafana/UI:** Replace Splitter with useSplitter hook and refactor PanelEdit snapping logic to useSnappingSplitter hook . [#82895](https://github.com/grafana/grafana/issues/82895), [@torkelo](https://github.com/torkelo)
+- **Cloudwatch:** Add linting to restrict imports from core. [#82538](https://github.com/grafana/grafana/issues/82538), [@idastambuk](https://github.com/idastambuk)
+- **Grafana/icons:** Add icons package. [#82314](https://github.com/grafana/grafana/issues/82314), [@Clarity-89](https://github.com/Clarity-89)
+- **Storage:** Watch support. [#82282](https://github.com/grafana/grafana/issues/82282), [@DanCech](https://github.com/DanCech)
+- **Image Rendering:** Add settings for default width, height and scale. [#82040](https://github.com/grafana/grafana/issues/82040), [@khushijain21](https://github.com/khushijain21)
+- **AzureMonitor:** User authentication support. [#81918](https://github.com/grafana/grafana/issues/81918), [@aangelisc](https://github.com/aangelisc)
+- **Plugins:** Disable uninstall while cloud uninstall is not completed. [#81907](https://github.com/grafana/grafana/issues/81907), [@oshirohugo](https://github.com/oshirohugo)
+- **Plugins:** Disable update button when cloud install is not completed. [#81716](https://github.com/grafana/grafana/issues/81716), [@oshirohugo](https://github.com/oshirohugo)
+- **Expressions:** Sql expressions with Duckdb. [#81666](https://github.com/grafana/grafana/issues/81666), [@scottlepp](https://github.com/scottlepp)
+- **BarChart:** TooltipPlugin2. [#80920](https://github.com/grafana/grafana/issues/80920), [@leeoniya](https://github.com/leeoniya)
+- **Grafana:** Replace magic number with a constant variable in response status. [#80132](https://github.com/grafana/grafana/issues/80132), [@rlaisqls](https://github.com/rlaisqls)
+- **Alerting:** Update rule access control to explicitly check for permissions "alert.rules:read" and "folders:read". [#78289](https://github.com/grafana/grafana/issues/78289), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Alerting:** Update provisioning API to support regular permissions. [#77007](https://github.com/grafana/grafana/issues/77007), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Whitelabelling:** Override version in UI from config. (Enterprise)
+- **Alerting:** Remove legacy alerting. (Enterprise)
+- **Reporting:** Delete Deprecated Endpoint for Single Dashboard. (Enterprise)
+- **Plugins:** Add endpoint to get provisioned plugins from an instance. (Enterprise)
+- **Reporting:** Delete Deprecated Endpoint for Scheduling. (Enterprise)
+- **Reporting:** Delete Deprecated Endpoint for Email. (Enterprise)
+
+### Bug fixes
+
+- **RBAC:** Fix access checks for interactions with RBAC roles in hosted Grafana. [#85520](https://github.com/grafana/grafana/issues/85520), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **Keybindings:** Replace mod+h as help shortcut with ? . [#85449](https://github.com/grafana/grafana/issues/85449), [@tskarhed](https://github.com/tskarhed)
+- **RBAC:** Fix slow user permission search query on MySQL. [#85410](https://github.com/grafana/grafana/issues/85410), [@gamab](https://github.com/gamab)
+- **BrowseDashboards:** Add subpath to URLs on Browse Dashboards page. [#85354](https://github.com/grafana/grafana/issues/85354), [@butkovv](https://github.com/butkovv)
+- **Dashboards:** Fix issue where long ad-hoc values broke UI. [#85290](https://github.com/grafana/grafana/issues/85290), [@kaydelaney](https://github.com/kaydelaney)
+- **NodeGraph:** Fix possible metadata mismatch between nodes in graph. [#85261](https://github.com/grafana/grafana/issues/85261), [@aocenas](https://github.com/aocenas)
+- **Alerting:** Fix receiver inheritance when provisioning a notification policy. [#85193](https://github.com/grafana/grafana/issues/85193), [@julienduchesne](https://github.com/julienduchesne)
+- **AuthProxy:** Fix missing session for ldap auth proxy users. [#85136](https://github.com/grafana/grafana/issues/85136), [@Jguer](https://github.com/Jguer)
+- **RBAC:** Fix slow user permission search query on MySQL. [#85058](https://github.com/grafana/grafana/issues/85058), [@gamab](https://github.com/gamab)
+- **CloudMonitoring:** Only run query if filters are complete. [#85004](https://github.com/grafana/grafana/issues/85004), [@aangelisc](https://github.com/aangelisc)
+- **BrowseDashboards:** Add subpath to URLs on Browse Dashboards page. [#84992](https://github.com/grafana/grafana/issues/84992), [@butkovv](https://github.com/butkovv)
+- **Datasources:** Fix expressions that reference hidden queries. [#84977](https://github.com/grafana/grafana/issues/84977), [@sunker](https://github.com/sunker)
+- **Canvas:** Fix crash when trying to add wind turbine element. [#84962](https://github.com/grafana/grafana/issues/84962), [@nmarrs](https://github.com/nmarrs)
+- **InfluxDB:** Fix alias interpolation when it has $\_\_interval or multiple tags. [#84940](https://github.com/grafana/grafana/issues/84940), [@itsmylife](https://github.com/itsmylife)
+- **Alerting:** Stop returning autogen routes for non-admin on api/v2/status. [#84864](https://github.com/grafana/grafana/issues/84864), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Alerting:** Fix broken panelId links. [#84839](https://github.com/grafana/grafana/issues/84839), [@gillesdemey](https://github.com/gillesdemey)
+- **Alerting:** External AM fix parsing basic auth with escape characters. [#84681](https://github.com/grafana/grafana/issues/84681), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Alerting:** Support PromQL-style matchers. [#84672](https://github.com/grafana/grafana/issues/84672), [@gillesdemey](https://github.com/gillesdemey)
+- **FolderPicker:** Add permission filter to nested folder picker. [#84644](https://github.com/grafana/grafana/issues/84644), [@joshhunt](https://github.com/joshhunt)
+- **RolePicker:** Don't try to fetch roles for new form. [#84630](https://github.com/grafana/grafana/issues/84630), [@kalleep](https://github.com/kalleep)
+- **Pyroscope:** Fix template variable support. [#84477](https://github.com/grafana/grafana/issues/84477), [@aocenas](https://github.com/aocenas)
+- **Scenes:** Fix public dashboard email sharing section. [#84467](https://github.com/grafana/grafana/issues/84467), [@juanicabanas](https://github.com/juanicabanas)
+- **Alerting:** Fix AlertsFolderView not showing rules when using nested folders. [#84465](https://github.com/grafana/grafana/issues/84465), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Jaeger:** Fix flaky test. [#84441](https://github.com/grafana/grafana/issues/84441), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **Scenes:** Fix issue with discarding unsaved changes modal in new dashboards. [#84369](https://github.com/grafana/grafana/issues/84369), [@kaydelaney](https://github.com/kaydelaney)
+- **PostgreSQL:** Display correct initial value for tls mode. [#84356](https://github.com/grafana/grafana/issues/84356), [@gabor](https://github.com/gabor)
+- **Cloudwatch:** Fix issue with Grafana Assume Role. [#84315](https://github.com/grafana/grafana/issues/84315), [@sarahzinger](https://github.com/sarahzinger)
+- **Playlists:** Fix kiosk mode not activating when starting a playlist. [#84262](https://github.com/grafana/grafana/issues/84262), [@joshhunt](https://github.com/joshhunt)
+- **Google Cloud Monitor:** Fix `res` being accessed after it becomes `nil` in `promql_query.go`. [#84223](https://github.com/grafana/grafana/issues/84223), [@adamyeats](https://github.com/adamyeats)
+- **Elasticsearch:** Fix using of individual query time ranges when querying. [#84201](https://github.com/grafana/grafana/issues/84201), [@ivanahuckova](https://github.com/ivanahuckova)
+- **InfluxDB:** Fix for wrong query generated with template variable and non regex operator on frontend mode. [#84175](https://github.com/grafana/grafana/issues/84175), [@wasim-nihal](https://github.com/wasim-nihal)
+- **Prometheus:** Remove &lt; and &gt; from Query Builder Label Matcher operations. [#83981](https://github.com/grafana/grafana/issues/83981), [@kylebrandt](https://github.com/kylebrandt)
+- **Worker:** Use CorsWorker to avoid CORS issues. [#83976](https://github.com/grafana/grafana/issues/83976), [@ivanortegaalba](https://github.com/ivanortegaalba)
+- **Tempo:** Fix by operator to support multiple arguments. [#83947](https://github.com/grafana/grafana/issues/83947), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **Plugins Catalog:** Fix plugin details page initial flickering. [#83896](https://github.com/grafana/grafana/issues/83896), [@leventebalogh](https://github.com/leventebalogh)
+- **Loki:** Interpolate variables in live queries. [#83831](https://github.com/grafana/grafana/issues/83831), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Table Panel:** Fix condition for showing footer options. [#83801](https://github.com/grafana/grafana/issues/83801), [@codeincarnate](https://github.com/codeincarnate)
+- **Alerting:** Fix bug in screenshot service using incorrect limit. [#83786](https://github.com/grafana/grafana/issues/83786), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Alerting:** Fix editing Grafana folder via alert rule editor. [#83771](https://github.com/grafana/grafana/issues/83771), [@gillesdemey](https://github.com/gillesdemey)
+- **Cloudwatch:** Fix new ConfigEditor to add the custom namespace field . [#83762](https://github.com/grafana/grafana/issues/83762), [@idastambuk](https://github.com/idastambuk)
+- **LDAP:** Fix LDAP users authenticated via auth proxy not being able to use LDAP active sync. [#83715](https://github.com/grafana/grafana/issues/83715), [@Jguer](https://github.com/Jguer)
+- **Elasticsearch:** Fix adhoc filters not applied in frontend mode. [#83592](https://github.com/grafana/grafana/issues/83592), [@svennergr](https://github.com/svennergr)
+- **RBAC:** Fix delete team permissions on team delete. [#83442](https://github.com/grafana/grafana/issues/83442), [@gamab](https://github.com/gamab)
+- **Dashboards:** Fixes issue where panels would not refresh if time range updated while in panel view mode. [#83418](https://github.com/grafana/grafana/issues/83418), [@kaydelaney](https://github.com/kaydelaney)
+- **AzureMonitor:** Fix mishandled resources vs workspaces. [#83184](https://github.com/grafana/grafana/issues/83184), [@adamyeats](https://github.com/adamyeats)
+- **Sql:** Fix an issue with connection limits not updating when jsonData is updated. [#83175](https://github.com/grafana/grafana/issues/83175), [@jarben](https://github.com/jarben)
+- **Alerting:** Use time_intervals instead of the deprecated mute_time_intervals in a…. [#83147](https://github.com/grafana/grafana/issues/83147), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **DataFrame:** Improve typing of arrayToDataFrame helper and fix null/undefined handling. [#83104](https://github.com/grafana/grafana/issues/83104), [@aocenas](https://github.com/aocenas)
+- **Cloudwatch:** Fix filter button issue in VariableEditor. [#83082](https://github.com/grafana/grafana/issues/83082), [@wilguo](https://github.com/wilguo)
+- **Alerting:** Fix panic in provisioning filter contacts by unknown name. [#83070](https://github.com/grafana/grafana/issues/83070), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Search:** Include collapsed panels in search v2. [#83047](https://github.com/grafana/grafana/issues/83047), [@suntala](https://github.com/suntala)
+- **Plugins:** Fix loading modules that only export a default. [#82299](https://github.com/grafana/grafana/issues/82299), [@sd2k](https://github.com/sd2k)
+- **Table:** Fix units showing in footer after reductions without units. [#82081](https://github.com/grafana/grafana/issues/82081), [@codeincarnate](https://github.com/codeincarnate)
+- **AuthProxy:** Invalidate previous cached item for user when changes are made to any header. [#81445](https://github.com/grafana/grafana/issues/81445), [@klesh](https://github.com/klesh)
+- **Unit:** Add SI prefix for empty unit. [#79897](https://github.com/grafana/grafana/issues/79897), [@raymalt](https://github.com/raymalt)
+- **Variables:** Multi-select DataSource variables are inconsistently displayed in the Data source picker. [#76039](https://github.com/grafana/grafana/issues/76039), [@polibb](https://github.com/polibb)
+- **SAML:** Better error message for saml private key type errors. (Enterprise)
+- **Reporting:** Fix monthly schedule text and modify monthly schedule inputs behavior. (Enterprise)
+
+### Breaking changes
+
+In 9.3 we released a way to set `case_insensitive_login` to true. This enables, lowercased username, login for users signing up with Grafana, for more information read our [blog post](https://grafana.com/blog/2022/12/12/guide-to-using-the-new-grafana-cli-user-identity-conflict-tool-in-grafana-9.3/).
+
+If you encounter any issues with users signing up, we recommend everyone to use lowercase in their login, username otherwise refer to the blog post for how to solve any of the users that can be conflicting with their login/username. Issue [#84972](https://github.com/grafana/grafana/issues/84972)
+
+This is a breaking change for users who use uppercase in their login or emails. The users are by default now using lowercase as part of their login and emails.
+
+Before this code change, users would be able to still log in as either `aUser@user.com` or `auser@user.com`, users are now only able to login and signup with grafana using lowercasing `auser@user.com`.
+
+We recommend reviewing the [blog post](https://grafana.com/blog/2022/12/12/guide-to-using-the-new-grafana-cli-user-identity-conflict-tool-in-grafana-9.3/#:~:text=A%20user%20identity%20conflict%20occurs,more%20capitalized%20letters%20%E2%80%9Cgrafana_LOGIN%E2%80%9D.) about using the CLI and why this is important for us to consolidate our security efforts. Issue [#84840](https://github.com/grafana/grafana/issues/84840)
+
+This is a breaking change for users who have restricted the default access to annotation permissions by removing annotation related actions from the Viewer or Editor basic roles. In such cases we are not able to complete the permission migration automatically, and you will see the following log in your Grafana server logs: `basic role permissions missing annotation permissions, skipping annotation permission migration`. You will also notice that dashboard and folder permissions do not appear in the user interface. Don't worry, all the permissions that you assigned are still there, they are just not being displayed.
+
+We recommend reviewing what annotation permissions you have revoked from the basic roles (you can reference [our documentation](https://grafana.com/docs/grafana/latest/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/) to see what permissions are missing). If you are fine granting them back to the basic roles, do that, then run the following data base command: `DELETE FROM migration_log WHERE migration_id="managed dashboard permissions annotation actions migration"` and restart Grafana. This will make sure that the annotation permission migration gets run again, and this time it should succeed.
+
+If you are not willing to grant the annotation permissions back to the basic roles, please disable `annotationPermissionUpdate` feature toggle (add `annotationPermissionUpdate = false` to `[feature_toggles]` in Grafana's configuration file) and reach out to Grafana's support team. When we can learn more about your use case, we will work with you to find a solution. Issue [#84787](https://github.com/grafana/grafana/issues/84787)
+
+Angular support is turned `off` by default starting Grafana 11, you can find all the details in a [dedicated documentation page.](https://grafana.com/docs/grafana/latest/developers/angular_deprecation/)
+
+Issue [#84738](https://github.com/grafana/grafana/issues/84738)
+
+The **xpack** checkbox dependency for enabling the **Include Frozen Indices** functionality has been removed, allowing direct control over frozen indices inclusion. Users should review their datasource settings to ensure the "Include Frozen Indices" option is configured as desired, particularly if xpack was previously disabled. This change aims to simplify configuration options and may affect queries if settings are not adjusted accordingly. Issue [#84734](https://github.com/grafana/grafana/issues/84734)
+
+For data sources that extend `DataSourceWithBackend`, the `filterQuery` method is now called **before** the data source `query` method. If the `filterQuery` method assumes that some kind of query migration happens before this method is called, you now need to do the migration inside this method.
+
+Users of data source plugins that did not previously remove hidden queries will see a change of behaviour: Before this change, clicking the `Disable query` button had no impact on the query result, but starting from Grafana 11 responses associated with hidden queries will no longer be returned to the panel. Issue [#84656](https://github.com/grafana/grafana/issues/84656)
+
+SystemJS is no longer exported from `@grafana/runtime`. Plugin developers should instead rely on importing modules / packages using standard TS import syntax and npm/yarn for package installation.
+
+Issue [#84561](https://github.com/grafana/grafana/issues/84561)
+
+We've removed the Loki tab from the Tempo data source. You can still access Logs through the Loki data source or can also create a link from Tempo to Loki via our [trace to logs](https://grafana.com/docs/grafana/latest/datasources/tempo/configure-tempo-data-source/#trace-to-logs) feature. Issue [#84346](https://github.com/grafana/grafana/issues/84346)
+
+The `query` option in `splitOpen` was deprecated in `10.1` and is now being removed. Issue [#83973](https://github.com/grafana/grafana/issues/83973)
+
+Since https://github.com/grafana/grafana/pull/38942 (Grafana `8.2.0`) the `ExploreQueryFieldProps` type was deprecated and is now removed. Issue [#83972](https://github.com/grafana/grafana/issues/83972)
+
+Since https://github.com/grafana/grafana/pull/38942 `exploreId` is no longer supplied to query editors in Explore. The property was deprecated in `10.3.0` and is now removed. If your query editor needs to know from which app is being rendered, you can check the `app` prop in `QueryEditorProps`. Issue [#83971](https://github.com/grafana/grafana/issues/83971)
+
+The Vector interface that was deprecated in Grafana 10 has been further deprecated. Using it will now generate build-time Typescript errors, but remain working at runtime. If you're still using ArrayVector in your code, it should be removed immediately and replaced with plain arrays. Plugins compiled against older versions and depend on calling get/set will continue to work because the Array prototype still has a modified prototype. This will be removed in the future Issue [#83681](https://github.com/grafana/grafana/issues/83681)
+
+In Grafana 11 the legacy alerting reaches the end-of-life. Users cannot enable it and Grafana will refuse to start if the settings are not updated to run the new Grafana Alerting. Migration from legacy alerting is not available as well. Grafana 10.4.x is the last version that offers the migration.
+
+- If the setting `[alerting].enable` is set to `true` Grafana will not start and emit the log message with recommendations to change the configuration
+
+- Setting `[alerting].max_annotation_age` is replaced by `[unified_alerting.state_history.annotations].max_age`
+- Setting `[alerting].max_annotations_to_keep` is replaced by `[unified_alerting.state_history.annotations].max_annotations_to_keep`
+
+- setting `[unified_alerting].execute_alerts` does not fall back to the legacy `[alerting].execute_alerts` anymore. Instead, the default value `true` is used.
+- setting `[unified_alerting].evaluation_timeout` does not fall back to the legacy setting `[alerting].evaluation_timeout_seconds` in the case when it is either invalid or has the default value. Now, if the setting is invalid, it will cause Grafana to exit.
+- setting `[unified_alerting].min_interval` does not fall back to the legacy setting `[alerting].min_interval_seconds` in the case when it is either invalid or has the default value. Now, if the setting is invalid, it will cause Grafana to exit. Issue [#83651](https://github.com/grafana/grafana/issues/83651)
+
+We've removed React 17 as a peer dependency from our packages. Anyone using the new versions of these packages should ensure they've upgraded to React 18 following the upgrade steps: https://react.dev/blog/2022/03/08/react-18-upgrade-guide Issue [#83524](https://github.com/grafana/grafana/issues/83524)
+
+We're adding a validation between the response of the ID token HD parameter and the list of allowed domains as an extra layer of security. In the event that the HD parameter doesn't match the list of allowed domains, we're denying access to Grafana.
+
+If you set Google OAuth configuration using `api_url,` you might be using the legacy implementation of OAuth, which doesn't have the HD parameter describing the organisation the approved token comes from. This could break your login flow.
+
+This feature can be turned off through the configuration toggle `validate_hd `. Anyone using the legacy Google OAuth configuration should turn off this validation if the ID Token response doesn't have the HD parameter. Issue [#83229](https://github.com/grafana/grafana/issues/83229)
+
+The direct input datasource plugin has been removed in Grafana 11. It has been in alpha for 4 years and is superseded by [TestData](https://grafana.com/docs/grafana/latest/datasources/testdata/) that ships with Grafana.
+
+Issue [#83163](https://github.com/grafana/grafana/issues/83163)
+
+The alert rule API methods now require more permissions for users to perform changes to rules. To create a new rule or update or delete an existing one, the user must have permission to read from the folder that stores the rules (i.e. permission `folder:read` in the scope of the rule's folder) and permission to read alert rules in that folder (i.e. permission `alert.rules:read`
+
+The standard roles already have all required permissions, and therefore, neither OSS nor Grafana Enterprise users who use the fixed roles (standard roles provided by Grafana) are affected. **Only Grafana Enterprise users who create custom roles can be affected** Issue [#78289](https://github.com/grafana/grafana/issues/78289)
+
+The deprecated endpoint for rendering pdf of a single dashboard `GET /render/pdf/:dashboardID` and report model fields `dashboardId`, `dashboardName`, `dashboardUid`, and `templateVars` have been removed. Only new endpoint `GET /api/reports/render/pdfs` accepting `dashboards` list is support moving forward Issue [#6362](https://github.com/grafana/grafana/issues/6362)
+
+The deprecated old schedule setting with separate fields `hour,` `minute`, `day` have been removed. Only new schedule setting with `startDate` will be supported moving forward Issue [#6329](https://github.com/grafana/grafana/issues/6329)
+
+The deprecated `email` field to send a report via `/api/reports/email` endpoint have been removed. Only `emails` field will be supported moving forward. Issue [#6328](https://github.com/grafana/grafana/issues/6328)
+
+### Plugin development fixes & changes
+
+- **GrafanaUI:** Add new `EmptyState` component. [#84891](https://github.com/grafana/grafana/issues/84891), [@ashharrison90](https://github.com/ashharrison90)
+- **Grafana/Runtime:** Remove SystemJS export. [#84561](https://github.com/grafana/grafana/issues/84561), [@jackw](https://github.com/jackw)
+- **Grafana UI:** Add code variant to Text component. [#82318](https://github.com/grafana/grafana/issues/82318), [@tskarhed](https://github.com/tskarhed)
+
+<!-- 11.0.0-preview END -->
+<!-- 10.4.1 START -->
+
+# 10.4.1 (2024-03-20)
+
+### Features and enhancements
+
+- **Alerting:** Add "Keep Last State" backend functionality. [#84406](https://github.com/grafana/grafana/issues/84406), [@rwwiv](https://github.com/rwwiv)
+- **Postgres:** Allow disabling SNI on SSL-enabled connections. [#84249](https://github.com/grafana/grafana/issues/84249), [@papagian](https://github.com/papagian)
+- **DataQuery:** Track panel plugin id not type. [#83164](https://github.com/grafana/grafana/issues/83164), [@torkelo](https://github.com/torkelo)
+
+### Bug fixes
+
+- **Elasticsearch:** Fix legend for alerting, expressions and previously frontend queries. [#84685](https://github.com/grafana/grafana/issues/84685), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Alerting:** Fix optional fields requiring validation rule. [#84595](https://github.com/grafana/grafana/issues/84595), [@gillesdemey](https://github.com/gillesdemey)
+- **ExtSvcAccounts:** FIX prevent service account deletion. [#84511](https://github.com/grafana/grafana/issues/84511), [@gamab](https://github.com/gamab)
+- **Loki:** Fix null pointer exception in case request returned an error. [#84401](https://github.com/grafana/grafana/issues/84401), [@svennergr](https://github.com/svennergr)
+- **Dashboard:** Fix issue where out-of-view shared query panels caused blank dependent panels. [#84197](https://github.com/grafana/grafana/issues/84197), [@kaydelaney](https://github.com/kaydelaney)
+- **Auth:** Only call rotate token if we have a session expiry cookie. [#84181](https://github.com/grafana/grafana/issues/84181), [@kalleep](https://github.com/kalleep)
+- **Serviceaccounts:** Add ability to add samename SA for different orgs. [#83953](https://github.com/grafana/grafana/issues/83953), [@eleijonmarck](https://github.com/eleijonmarck)
+- **GenAI:** Update the component only when the response is fully generated. [#83895](https://github.com/grafana/grafana/issues/83895), [@ivanortegaalba](https://github.com/ivanortegaalba)
+- **Tempo:** Better fallbacks for metrics query. [#83688](https://github.com/grafana/grafana/issues/83688), [@adrapereira](https://github.com/adrapereira)
+- **Tempo:** Add template variable interpolation for filters. [#83667](https://github.com/grafana/grafana/issues/83667), [@joey-grafana](https://github.com/joey-grafana)
+- **Alerting:** Fix saving evaluation group. [#83234](https://github.com/grafana/grafana/issues/83234), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **QueryVariableEditor:** Select a variable ds does not work. [#83181](https://github.com/grafana/grafana/issues/83181), [@ivanortegaalba](https://github.com/ivanortegaalba)
+- **Logs Panel:** Add option extra UI functionality for log context. [#83129](https://github.com/grafana/grafana/issues/83129), [@svennergr](https://github.com/svennergr)
+
+<!-- 10.4.1 END -->
+<!-- 10.4.0 START -->
+
+# 10.4.0 (2024-03-06)
+
+### Features and enhancements
+
+- **AuthToken:** Remove client token rotation feature toggle. [#82886](https://github.com/grafana/grafana/issues/82886), [@kalleep](https://github.com/kalleep)
+- **Plugins:** Enable feature toggle angularDeprecationUI by default. [#82880](https://github.com/grafana/grafana/issues/82880), [@xnyo](https://github.com/xnyo)
+- **Table Component:** Improve text-wrapping behavior of cells. [#82872](https://github.com/grafana/grafana/issues/82872), [@ahuarte47](https://github.com/ahuarte47)
+- **Alerting:** Dry-run legacy upgrade on startup. [#82835](https://github.com/grafana/grafana/issues/82835), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Tempo:** Upgrade @grafana/lezer-traceql patch version to use trace metrics syntax. [#82532](https://github.com/grafana/grafana/issues/82532), [@joey-grafana](https://github.com/joey-grafana)
+- **Logs Panel:** Add CSV to download options. [#82480](https://github.com/grafana/grafana/issues/82480), [@gtk-grafana](https://github.com/gtk-grafana)
+- **Folders:** Switch order of the columns in folder table indexes so that org_id becomes first. [#82454](https://github.com/grafana/grafana/issues/82454), [@papagian](https://github.com/papagian)
+- **Logs panel:** Table UI - Guess string field types. [#82397](https://github.com/grafana/grafana/issues/82397), [@gtk-grafana](https://github.com/gtk-grafana)
+- **Alerting:** Send alerts to APIv2 when using the Alertmanager contact point. [#82373](https://github.com/grafana/grafana/issues/82373), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Alerting:** Emit warning when creating or updating unusually large groups. [#82279](https://github.com/grafana/grafana/issues/82279), [@alexweav](https://github.com/alexweav)
+- **Keybindings:** Change 'h' to 'mod+h' to open help modal. [#82253](https://github.com/grafana/grafana/issues/82253), [@tskarhed](https://github.com/tskarhed)
+- **Chore:** Update arrow and prometheus dependencies. [#82215](https://github.com/grafana/grafana/issues/82215), [@ryantxu](https://github.com/ryantxu)
+- **Alerting:** Enable group-level rule evaluation jittering by default, remove feature toggle. [#82212](https://github.com/grafana/grafana/issues/82212), [@alexweav](https://github.com/alexweav)
+- **Loki Log Context:** Always show label filters with at least one parsed label. [#82211](https://github.com/grafana/grafana/issues/82211), [@svennergr](https://github.com/svennergr)
+- **Logs Panel:** Table UI - better default column spacing. [#82205](https://github.com/grafana/grafana/issues/82205), [@gtk-grafana](https://github.com/gtk-grafana)
+- **RBAC:** Migration to remove the scope from permissions where action is alert.instances:read. [#82202](https://github.com/grafana/grafana/issues/82202), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **JWT Authentication:** Add support for specifying groups in auth.jwt for teamsync. [#82175](https://github.com/grafana/grafana/issues/82175), [@Jguer](https://github.com/Jguer)
+- **Alerting:** GA alertingPreviewUpgrade and enable by default. [#82038](https://github.com/grafana/grafana/issues/82038), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Elasticsearch:** Apply ad-hoc filters to annotation queries. [#82032](https://github.com/grafana/grafana/issues/82032), [@mikelv92](https://github.com/mikelv92)
+- **Alerting:** Show legacy provisioned alert rules warning. [#81902](https://github.com/grafana/grafana/issues/81902), [@gillesdemey](https://github.com/gillesdemey)
+- **Tempo:** Support TraceQL metrics queries. [#81886](https://github.com/grafana/grafana/issues/81886), [@adrapereira](https://github.com/adrapereira)
+- **Tempo:** Support backtick strings. [#81802](https://github.com/grafana/grafana/issues/81802), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **Dashboards:** Remove `advancedDataSourcePicker` feature toggle. [#81790](https://github.com/grafana/grafana/issues/81790), [@Sergej-Vlasov](https://github.com/Sergej-Vlasov)
+- **CloudWatch:** Remove references to pkg/infra/metrics. [#81744](https://github.com/grafana/grafana/issues/81744), [@iwysiu](https://github.com/iwysiu)
+- **Licensing:** Redact license when overriden by env variable. [#81726](https://github.com/grafana/grafana/issues/81726), [@leandro-deveikis](https://github.com/leandro-deveikis)
+- **Explore:** Disable cursor sync. [#81698](https://github.com/grafana/grafana/issues/81698), [@ifrost](https://github.com/ifrost)
+- **Tempo:** Add custom headers middleware for grpc client. [#81693](https://github.com/grafana/grafana/issues/81693), [@aocenas](https://github.com/aocenas)
+- **Chore:** Update test database initialization. [#81673](https://github.com/grafana/grafana/issues/81673), [@DanCech](https://github.com/DanCech)
+- **Elasticsearch:** Implement CheckHealth method in the backend. [#81671](https://github.com/grafana/grafana/issues/81671), [@mikelv92](https://github.com/mikelv92)
+- **Tooltips:** Hide dimension configuration when tooltip mode is hidden. [#81627](https://github.com/grafana/grafana/issues/81627), [@codeincarnate](https://github.com/codeincarnate)
+- **Alerting:** Show warning when cp does not exist and invalidate the form. [#81621](https://github.com/grafana/grafana/issues/81621), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **User:** Add uid colum to user table. [#81615](https://github.com/grafana/grafana/issues/81615), [@ryantxu](https://github.com/ryantxu)
+- **Cloudwatch:** Remove core imports from infra/log. [#81543](https://github.com/grafana/grafana/issues/81543), [@njvrzm](https://github.com/njvrzm)
+- **Alerting:** Add pagination and improved search for notification policies. [#81535](https://github.com/grafana/grafana/issues/81535), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Alerting:** Move action buttons in the alert list view. [#81341](https://github.com/grafana/grafana/issues/81341), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Grafana/ui:** Add deprecation notices to the legacy layout components. [#81328](https://github.com/grafana/grafana/issues/81328), [@Clarity-89](https://github.com/Clarity-89)
+- **Cloudwatch:** Deprecate cloudwatchNewRegionsHandler feature toggle and remove core imports from featuremgmt. [#81310](https://github.com/grafana/grafana/issues/81310), [@njvrzm](https://github.com/njvrzm)
+- **Candlestick:** Add tooltip options. [#81307](https://github.com/grafana/grafana/issues/81307), [@adela-almasan](https://github.com/adela-almasan)
+- **Folders:** Forbid performing operations on folders via dashboards HTTP API. [#81264](https://github.com/grafana/grafana/issues/81264), [@undef1nd](https://github.com/undef1nd)
+- **Feature Management:** Move awsDatasourcesNewFormStyling to Public Preview. [#81257](https://github.com/grafana/grafana/issues/81257), [@idastambuk](https://github.com/idastambuk)
+- **Alerting:** Update API to use folders' full paths. [#81214](https://github.com/grafana/grafana/issues/81214), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Datasources:** Add concurrency number to the settings. [#81212](https://github.com/grafana/grafana/issues/81212), [@itsmylife](https://github.com/itsmylife)
+- **CloudWatch:** Remove dependencies on grafana/pkg/setting. [#81208](https://github.com/grafana/grafana/issues/81208), [@iwysiu](https://github.com/iwysiu)
+- **Logs:** Table UI - Allow users to resize field selection section. [#81201](https://github.com/grafana/grafana/issues/81201), [@gtk-grafana](https://github.com/gtk-grafana)
+- **Dashboards:** Remove emptyDashboardPage feature flag. [#81188](https://github.com/grafana/grafana/issues/81188), [@Sergej-Vlasov](https://github.com/Sergej-Vlasov)
+- **Cloudwatch:** Import httpClient from grafana-plugin-sdk-go instead of grafana/infra. [#81187](https://github.com/grafana/grafana/issues/81187), [@idastambuk](https://github.com/idastambuk)
+- **Logs:** Table UI - Enable feature flag by default (GA). [#81185](https://github.com/grafana/grafana/issues/81185), [@gtk-grafana](https://github.com/gtk-grafana)
+- **Tempo:** Improve tags UX. [#81166](https://github.com/grafana/grafana/issues/81166), [@joey-grafana](https://github.com/joey-grafana)
+- **Table:** Cell inspector auto-detecting JSON. [#81152](https://github.com/grafana/grafana/issues/81152), [@gtk-grafana](https://github.com/gtk-grafana)
+- **Grafana/ui:** Add Space component. [#81145](https://github.com/grafana/grafana/issues/81145), [@Clarity-89](https://github.com/Clarity-89)
+- **Grafana/ui:** Add deprecation notice to the Form component. [#81068](https://github.com/grafana/grafana/issues/81068), [@Clarity-89](https://github.com/Clarity-89)
+- **Alerting:** Swap order between Annotations and Labels step in the alert rule form. [#81060](https://github.com/grafana/grafana/issues/81060), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Plugins:** Change managedPluginsInstall to public preview. [#81053](https://github.com/grafana/grafana/issues/81053), [@oshirohugo](https://github.com/oshirohugo)
+- **Tempo:** Add span, trace vars to trace to metrics interpolation. [#81046](https://github.com/grafana/grafana/issues/81046), [@joey-grafana](https://github.com/joey-grafana)
+- **Tempo:** Support multiple filter expressions for service graph queries. [#81037](https://github.com/grafana/grafana/issues/81037), [@domasx2](https://github.com/domasx2)
+- **Alerting:** Support for simplified notification settings in rule API. [#81011](https://github.com/grafana/grafana/issues/81011), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Plugins:** Add fuzzy search to plugins catalogue. [#81001](https://github.com/grafana/grafana/issues/81001), [@Ukochka](https://github.com/Ukochka)
+- **CloudWatch:** Only override contextDialer when using PDC. [#80992](https://github.com/grafana/grafana/issues/80992), [@leandro-deveikis](https://github.com/leandro-deveikis)
+- **Alerting:** Add a feature flag to periodically save states. [#80987](https://github.com/grafana/grafana/issues/80987), [@JohnnyQQQQ](https://github.com/JohnnyQQQQ)
+- **RBAC:** Return the underlying error instead of internal server or bad request for managed permission endpoints. [#80974](https://github.com/grafana/grafana/issues/80974), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **Correlations:** Enable correlations feature toggle by default. [#80881](https://github.com/grafana/grafana/issues/80881), [@ifrost](https://github.com/ifrost)
+- **Transformations:** Focus search input on drawer open. [#80859](https://github.com/grafana/grafana/issues/80859), [@codeincarnate](https://github.com/codeincarnate)
+- **Packaging:** Use the GRAFANA_HOME variable in postinst script on Debian. [#80853](https://github.com/grafana/grafana/issues/80853), [@denisse-dev](https://github.com/denisse-dev)
+- **Visualizations:** Hue gradient mode now applies to the line color . [#80805](https://github.com/grafana/grafana/issues/80805), [@torkelo](https://github.com/torkelo)
+- **Drawer:** Resizable via draggable edge . [#80796](https://github.com/grafana/grafana/issues/80796), [@torkelo](https://github.com/torkelo)
+- **Alerting:** Add setting to distribute rule group evaluations over time. [#80766](https://github.com/grafana/grafana/issues/80766), [@alexweav](https://github.com/alexweav)
+- **Logs Panel:** Permalink (copy shortlink). [#80764](https://github.com/grafana/grafana/issues/80764), [@gtk-grafana](https://github.com/gtk-grafana)
+- **VizTooltips:** Copy to clipboard functionality. [#80761](https://github.com/grafana/grafana/issues/80761), [@adela-almasan](https://github.com/adela-almasan)
+- **AuthN:** Support reloading SSO config after the sso settings have changed. [#80734](https://github.com/grafana/grafana/issues/80734), [@mgyongyosi](https://github.com/mgyongyosi)
+- **Logs Panel:** Add total count to logs volume panel in explore. [#80730](https://github.com/grafana/grafana/issues/80730), [@gtk-grafana](https://github.com/gtk-grafana)
+- **Caching:** Remove useCachingService feature toggle. [#80695](https://github.com/grafana/grafana/issues/80695), [@mmandrus](https://github.com/mmandrus)
+- **Table:** Support showing data links inline. . [#80691](https://github.com/grafana/grafana/issues/80691), [@ryantxu](https://github.com/ryantxu)
+- **Storage:** Add support for sortBy selector. [#80680](https://github.com/grafana/grafana/issues/80680), [@DanCech](https://github.com/DanCech)
+- **Alerting:** Add metric counting rule groups per org. [#80669](https://github.com/grafana/grafana/issues/80669), [@alexweav](https://github.com/alexweav)
+- **RBAC:** Cover plugin routes. [#80578](https://github.com/grafana/grafana/issues/80578), [@gamab](https://github.com/gamab)
+- **Profiling:** Import godeltaprof/http/pprof. [#80509](https://github.com/grafana/grafana/issues/80509), [@korniltsev](https://github.com/korniltsev)
+- **Tempo:** Add warning message when scope missing in TraceQL. [#80472](https://github.com/grafana/grafana/issues/80472), [@joey-grafana](https://github.com/joey-grafana)
+- **Cloudwatch:** Move getNextRefIdChar util from app/core/utils to @grafana/data. [#80471](https://github.com/grafana/grafana/issues/80471), [@idastambuk](https://github.com/idastambuk)
+- **DataFrame:** Add optional unique id definition. [#80428](https://github.com/grafana/grafana/issues/80428), [@aocenas](https://github.com/aocenas)
+- **Canvas:** Add element snapping and alignment. [#80407](https://github.com/grafana/grafana/issues/80407), [@nmarrs](https://github.com/nmarrs)
+- **Logs:** Add show context to dashboard panel. [#80403](https://github.com/grafana/grafana/issues/80403), [@svennergr](https://github.com/svennergr)
+- **Canvas:** Support context menu in panel edit mode. [#80335](https://github.com/grafana/grafana/issues/80335), [@nmarrs](https://github.com/nmarrs)
+- **VizTooltip:** Add sizing options. [#80306](https://github.com/grafana/grafana/issues/80306), [@Develer](https://github.com/Develer)
+- **Plugins:** Parse defaultValues correctly for nested options. [#80302](https://github.com/grafana/grafana/issues/80302), [@oshirohugo](https://github.com/oshirohugo)
+- **Geomap:** Support geojson styling properties. [#80272](https://github.com/grafana/grafana/issues/80272), [@drew08t](https://github.com/drew08t)
+- **Runtime:** Add property for disabling caching. [#80245](https://github.com/grafana/grafana/issues/80245), [@aangelisc](https://github.com/aangelisc)
+- **Alerting:** Log scheduler maxAttempts, guard against invalid retry counts, log retry errors. [#80234](https://github.com/grafana/grafana/issues/80234), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Improve integration with dashboards. [#80201](https://github.com/grafana/grafana/issues/80201), [@konrad147](https://github.com/konrad147)
+- **Transformations:** Use an explicit join seperator when converting from an array to string field. [#80169](https://github.com/grafana/grafana/issues/80169), [@ryantxu](https://github.com/ryantxu)
+- **Build:** Update plugin IDs list in build and release process. [#80160](https://github.com/grafana/grafana/issues/80160), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **NestedFolders:** Support Shared with me folder for showing items you've been granted access to. [#80141](https://github.com/grafana/grafana/issues/80141), [@joshhunt](https://github.com/joshhunt)
+- **Log Context:** Add highlighted words to log rows. [#80119](https://github.com/grafana/grafana/issues/80119), [@svennergr](https://github.com/svennergr)
+- **Tempo:** Add `}` when `{` is inserted automatically. [#80113](https://github.com/grafana/grafana/issues/80113), [@harrymaurya05](https://github.com/harrymaurya05)
+- **Time Range:** Copy-paste Time Range. [#80107](https://github.com/grafana/grafana/issues/80107), [@harisrozajac](https://github.com/harisrozajac)
+- **PanelContext:** Remove deprecated onSplitOpen. [#80087](https://github.com/grafana/grafana/issues/80087), [@harisrozajac](https://github.com/harisrozajac)
+- **Docs:** Add HAProxy rewrite information considering `serve_from_sub_path` setting. [#80062](https://github.com/grafana/grafana/issues/80062), [@simPod](https://github.com/simPod)
+- **Table:** Keep expanded rows persistent when data changes if it has unique ID. [#80031](https://github.com/grafana/grafana/issues/80031), [@aocenas](https://github.com/aocenas)
+- **SSO Config:** Add generic OAuth. [#79972](https://github.com/grafana/grafana/issues/79972), [@Clarity-89](https://github.com/Clarity-89)
+- **FeatureFlags:** Remove the unsupported/undocumented option to read flags from a file. [#79959](https://github.com/grafana/grafana/issues/79959), [@ryantxu](https://github.com/ryantxu)
+- **Transformations:** Add Group to Nested Tables Transformation. [#79952](https://github.com/grafana/grafana/issues/79952), [@codeincarnate](https://github.com/codeincarnate)
+- **Cloudwatch Metrics:** Adjust error handling. [#79911](https://github.com/grafana/grafana/issues/79911), [@idastambuk](https://github.com/idastambuk)
+- **Tempo:** Decouple Tempo from Grafana core. [#79888](https://github.com/grafana/grafana/issues/79888), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **Table Panel:** Filter column values with operators or expressions. [#79853](https://github.com/grafana/grafana/issues/79853), [@ahuarte47](https://github.com/ahuarte47)
+- **Chore:** Generate shorter UIDs. [#79843](https://github.com/grafana/grafana/issues/79843), [@ryantxu](https://github.com/ryantxu)
+- **Alerting:** MuteTiming service return errutil + GetTiming by name. [#79772](https://github.com/grafana/grafana/issues/79772), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Azure Monitor:** Add select all subscription option for ARG queries. [#79582](https://github.com/grafana/grafana/issues/79582), [@alyssabull](https://github.com/alyssabull)
+- **Alerting:** Enable sending notifications to a specific topic on Telegram. [#79546](https://github.com/grafana/grafana/issues/79546), [@th0th](https://github.com/th0th)
+- **Logs Panel:** Table UI - Reordering table columns via drag-and-drop. [#79536](https://github.com/grafana/grafana/issues/79536), [@gtk-grafana](https://github.com/gtk-grafana)
+- **Cloudwatch:** Add AWS/EMRServerless and AWS/KafkaConnect Metrics . [#79532](https://github.com/grafana/grafana/issues/79532), [@DugeraProve](https://github.com/DugeraProve)
+- **Transformations:** Move transformation help to drawer component. [#79247](https://github.com/grafana/grafana/issues/79247), [@codeincarnate](https://github.com/codeincarnate)
+- **Stat:** Support no value in spark line. [#78986](https://github.com/grafana/grafana/issues/78986), [@FOWind](https://github.com/FOWind)
+- **NodeGraph:** Use layered layout instead of force based layout. [#78957](https://github.com/grafana/grafana/issues/78957), [@aocenas](https://github.com/aocenas)
+- **Alerting:** Create alertingQueryOptimization feature flag for alert query optimization. [#78932](https://github.com/grafana/grafana/issues/78932), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Dashboard:** New EmbeddedDashboard runtime component . [#78916](https://github.com/grafana/grafana/issues/78916), [@torkelo](https://github.com/torkelo)
+- **Alerting:** Show warning when query optimized. [#78751](https://github.com/grafana/grafana/issues/78751), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Alerting:** Add support for TTL for pushover for Mimir Alertmanager. [#78687](https://github.com/grafana/grafana/issues/78687), [@gillesdemey](https://github.com/gillesdemey)
+- **Grafana/ui:** Enable removing values in multiselect opened state. [#78662](https://github.com/grafana/grafana/issues/78662), [@FOWind](https://github.com/FOWind)
+- **SQL datasources:** Consistent interval handling. [#78517](https://github.com/grafana/grafana/issues/78517), [@gabor](https://github.com/gabor)
+- **Alerting:** During legacy migration reduce the number of created silences. [#78505](https://github.com/grafana/grafana/issues/78505), [@JacobsonMT](https://github.com/JacobsonMT)
+- **UI:** New share button and toolbar reorganize. [#77563](https://github.com/grafana/grafana/issues/77563), [@evictorero](https://github.com/evictorero)
+- **Alerting:** Update rule API to address folders by UID. [#74600](https://github.com/grafana/grafana/issues/74600), [@papagian](https://github.com/papagian)
+- **Reports:** Add uid column to the database. (Enterprise)
+- **Plugins:** Add metrics for cloud plugin install. (Enterprise)
+- **RBAC:** Make seeding resilient to failed plugin loading. (Enterprise)
+- **Plugins:** Support disabling caching at a plugin instance level. (Enterprise)
+
+### Bug fixes
+
+- **Auth:** Fix email verification bypass when using basic authentication. [#82914](https://github.com/grafana/grafana/issues/82914), [@volcanonoodle](https://github.com/volcanonoodle)
+- **LibraryPanels/RBAC:** Fix issue where folder scopes weren't being correctly inherited. [#82700](https://github.com/grafana/grafana/issues/82700), [@kaydelaney](https://github.com/kaydelaney)
+- **Table Panel:** Fix display of ad-hoc filter actions. [#82442](https://github.com/grafana/grafana/issues/82442), [@codeincarnate](https://github.com/codeincarnate)
+- **Loki:** Update `@grafana/lezer-logql` to `0.2.3` containing fix for ip label name. [#82378](https://github.com/grafana/grafana/issues/82378), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Alerting:** Fix slack double pound and email summary. [#82333](https://github.com/grafana/grafana/issues/82333), [@gillesdemey](https://github.com/gillesdemey)
+- **Elasticsearch:** Fix resource calls for paths that include `:`. [#82327](https://github.com/grafana/grafana/issues/82327), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Alerting:** Return provenance of notification templates. [#82274](https://github.com/grafana/grafana/issues/82274), [@julienduchesne](https://github.com/julienduchesne)
+- **LibraryPanels:** Fix issue with repeated library panels. [#82255](https://github.com/grafana/grafana/issues/82255), [@kaydelaney](https://github.com/kaydelaney)
+- **Loki:** Fix fetching of values for label if no previous equality operator. [#82251](https://github.com/grafana/grafana/issues/82251), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Alerting:** Fix data races and improve testing. [#81994](https://github.com/grafana/grafana/issues/81994), [@diegommm](https://github.com/diegommm)
+- **chore:** Fix typo in GraphTresholdsStyleMode enum. [#81960](https://github.com/grafana/grafana/issues/81960), [@paulJonesCalian](https://github.com/paulJonesCalian)
+- **CloudWatch:** Fix code editor not resizing on mount when content height is &gt; 200px. [#81911](https://github.com/grafana/grafana/issues/81911), [@kevinwcyu](https://github.com/kevinwcyu)
+- **FieldOptions:** Revert scalable unit option as we already support this via custom prefix/suffixes . [#81893](https://github.com/grafana/grafana/issues/81893), [@torkelo](https://github.com/torkelo)
+- **Browse Dashboards:** Imported dashboards now display immediately in the dashboard list. [#81819](https://github.com/grafana/grafana/issues/81819), [@ashharrison90](https://github.com/ashharrison90)
+- **Elasticsearch:** Set middlewares from Grafana's `httpClientProvider`. [#81814](https://github.com/grafana/grafana/issues/81814), [@svennergr](https://github.com/svennergr)
+- **Folders:** Fix failure to update folder in SQLite. [#81795](https://github.com/grafana/grafana/issues/81795), [@papagian](https://github.com/papagian)
+- **Plugins:** Never disable add new data source for core plugins. [#81774](https://github.com/grafana/grafana/issues/81774), [@oshirohugo](https://github.com/oshirohugo)
+- **Alerting:** Fixes for pending period. [#81718](https://github.com/grafana/grafana/issues/81718), [@gillesdemey](https://github.com/gillesdemey)
+- **Alerting:** Fix editing group of nested folder. [#81665](https://github.com/grafana/grafana/issues/81665), [@gillesdemey](https://github.com/gillesdemey)
+- **Plugins:** Don't auto prepend app sub url to plugin asset paths. [#81658](https://github.com/grafana/grafana/issues/81658), [@wbrowne](https://github.com/wbrowne)
+- **Alerting:** Fix inconsistent AM raw config when applied via sync vs API. [#81655](https://github.com/grafana/grafana/issues/81655), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Alerting:** Fix support check for export with modifications. [#81602](https://github.com/grafana/grafana/issues/81602), [@gillesdemey](https://github.com/gillesdemey)
+- **Alerting:** Fix selecting empty contact point value for notification policy inheritance. [#81482](https://github.com/grafana/grafana/issues/81482), [@gillesdemey](https://github.com/gillesdemey)
+- **Alerting:** Fix child provisioned polices not being rendered as provisioned. [#81449](https://github.com/grafana/grafana/issues/81449), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Tempo:** Fix durations in TraceQL. [#81418](https://github.com/grafana/grafana/issues/81418), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **Logs:** Fix toggleable filters to be applied for specified query. [#81368](https://github.com/grafana/grafana/issues/81368), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Loki:** Fix label not being added to all subexpressions. [#81360](https://github.com/grafana/grafana/issues/81360), [@svennergr](https://github.com/svennergr)
+- **Loki/Elastic:** Assert queryfix value to always be string. [#81349](https://github.com/grafana/grafana/issues/81349), [@svennergr](https://github.com/svennergr)
+- **Tempo:** Add query ref in the query editor. [#81343](https://github.com/grafana/grafana/issues/81343), [@joey-grafana](https://github.com/joey-grafana)
+- **Transformations:** Use the display name of the original y field for the predicted field of the regression analysis transformation. [#81332](https://github.com/grafana/grafana/issues/81332), [@oscarkilhed](https://github.com/oscarkilhed)
+- **Field:** Fix perf regression in getUniqueFieldName(). [#81323](https://github.com/grafana/grafana/issues/81323), [@leeoniya](https://github.com/leeoniya)
+- **Alerting:** Fix scheduler to group folders by the unique key (orgID and UID). [#81303](https://github.com/grafana/grafana/issues/81303), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Alerting:** Fix migration edge-case race condition for silences. [#81206](https://github.com/grafana/grafana/issues/81206), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Explore:** Set default time range to now-1h. [#81135](https://github.com/grafana/grafana/issues/81135), [@ifrost](https://github.com/ifrost)
+- **Elasticsearch:** Fix URL creation and allowlist for `/_mapping` requests. [#80970](https://github.com/grafana/grafana/issues/80970), [@svennergr](https://github.com/svennergr)
+- **Postgres:** Handle single quotes in table names in the query editor. [#80951](https://github.com/grafana/grafana/issues/80951), [@gabor](https://github.com/gabor)
+- **Folders:** Fix creating/updating a folder whose title has leading and trailing spaces. [#80909](https://github.com/grafana/grafana/issues/80909), [@papagian](https://github.com/papagian)
+- **Loki:** Fix missing timerange in query builder values request. [#80829](https://github.com/grafana/grafana/issues/80829), [@svennergr](https://github.com/svennergr)
+- **Elasticsearch:** Fix showing of logs when `__source` is log message field. [#80804](https://github.com/grafana/grafana/issues/80804), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Pyroscope:** Fix stale value for query in query editor. [#80753](https://github.com/grafana/grafana/issues/80753), [@joey-grafana](https://github.com/joey-grafana)
+- **Stat:** Fix data links that refer to fields. [#80693](https://github.com/grafana/grafana/issues/80693), [@ajwerner](https://github.com/ajwerner)
+- **RBAC:** Clean up data source permissions after data source deletion. [#80654](https://github.com/grafana/grafana/issues/80654), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **Alerting:** Fix MuteTiming Get API to return provenance status. [#80494](https://github.com/grafana/grafana/issues/80494), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Tempo:** Fix regression caused by #79938. [#80465](https://github.com/grafana/grafana/issues/80465), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **Alerting:** Fix preview getting the correct queries from the form. [#80458](https://github.com/grafana/grafana/issues/80458), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Alerting:** Fix firing alerts title when showing active in Insights panel. [#80414](https://github.com/grafana/grafana/issues/80414), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Postgres:** Fix enabling the socks proxy. [#80361](https://github.com/grafana/grafana/issues/80361), [@gabor](https://github.com/gabor)
+- **Alerting:** Fix group filter. [#80358](https://github.com/grafana/grafana/issues/80358), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Alerting:** Increase size of kvstore value type for MySQL to LONGTEXT. [#80331](https://github.com/grafana/grafana/issues/80331), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Annotations:** Split cleanup into separate queries and deletes to avoid deadlocks on MySQL. [#80329](https://github.com/grafana/grafana/issues/80329), [@alexweav](https://github.com/alexweav)
+- **Loki:** Fix bug duplicating parsed labels across multiple log lines. [#80292](https://github.com/grafana/grafana/issues/80292), [@svennergr](https://github.com/svennergr)
+- **Alerting:** Fix NoData & Error alerts not resolving when rule is reset. [#80184](https://github.com/grafana/grafana/issues/80184), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Loki:** Fix metric time splitting to split starting with the start time. [#80085](https://github.com/grafana/grafana/issues/80085), [@svennergr](https://github.com/svennergr)
+- **Rendering:** Fix streaming panels always reaching timeout. [#80022](https://github.com/grafana/grafana/issues/80022), [@AgnesToulet](https://github.com/AgnesToulet)
+- **Plugins:** Fix colon in CallResource URL returning an error when creating plugin resource request. [#79746](https://github.com/grafana/grafana/issues/79746), [@GiedriusS](https://github.com/GiedriusS)
+- **PDF:** Fix initialization when SMTP is disabled. (Enterprise)
+- **PDF:** Fix repeated panels placement issue. (Enterprise)
+- **Report CSV:** Fix timeout with streaming panels. (Enterprise)
+- **RBAC:** Avoid repopulating removed basic role permissions if the permission scope has changed. (Enterprise)
+
+### Breaking changes
+
+We're adding a between the response of the ID token HD parameter and the list of allowed domains. This feature can be disabled through the configuration toggle `validate_hd `. Anyone using the legacy Google OAuth configuration should disable this validation if the ID Token response doesn't have the HD parameter. Issue [#83726](https://github.com/grafana/grafana/issues/83726)
+
+If you use an automated provisioning (eg, Terraform) for custom roles, and have provisioned a role that includes permission with action `alert.instances:read` and some scope, you will need to update the permission in your provisioning files by removing the scope. Issue [#82202](https://github.com/grafana/grafana/issues/82202)
+
+**The following breaking change occurs only when feature flag `nestedFolders` is enabled.**
+If the folder title contains the symbol `/` (forward-slash) the notifications created from the rules that are placed in that folder will contain an escape sequence for that symbol in the label `grafana_folder`.
+For example, the folder title is `Grafana / Folder`. Currently the label `grafana_folder` will contain the title as it is. If PR is merged - the label value will be `Grafana \/ Folder`.
+This can break notifications if notification policies have matches that match that label and folder. Issue [#81214](https://github.com/grafana/grafana/issues/81214)
+
+`PanelContext.onSplitOpen` is removed. In the context of Explore, plugins should use `field.getLinks` to get a list of data link models. Issue [#80087](https://github.com/grafana/grafana/issues/80087)
+
+The unstable alert rule API has been changed and now expects a folder UID instead of the folder title as namespace path parameter.
+I addition to this, the responses that used to return the folder title now return `<folder parent UID>/<folder title>` to uniquely identify them.
+Any consumers of the specific API should be appropriately adapted. Issue [#74600](https://github.com/grafana/grafana/issues/74600)
+
+### Plugin development fixes & changes
+
+- **Grafana/UI:** Add new Splitter component . [#82357](https://github.com/grafana/grafana/issues/82357), [@torkelo](https://github.com/torkelo)
+
+<!-- 10.4.0 END -->
+<!-- 10.3.5 START -->
+
+# 10.3.5 (2024-03-20)
+
+### Features and enhancements
+
+- **Postgres:** Allow disabling SNI on SSL-enabled connections. [#84259](https://github.com/grafana/grafana/issues/84259), [@papagian](https://github.com/papagian)
+
+### Bug fixes
+
+- **Snapshots:** Require delete within same org (backport). [#84707](https://github.com/grafana/grafana/issues/84707), [@ryantxu](https://github.com/ryantxu)
+- **Elasticsearch:** Fix legend for alerting, expressions and previously frontend queries. [#84684](https://github.com/grafana/grafana/issues/84684), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Dashboard:** Fix issue where out-of-view shared query panels caused blank dependent panels. [#84196](https://github.com/grafana/grafana/issues/84196), [@kaydelaney](https://github.com/kaydelaney)
+- **Alerting:** Fix preview getting the correct queries from the form. [#81481](https://github.com/grafana/grafana/issues/81481), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+
+<!-- 10.3.5 END -->
+<!-- 10.3.4 START -->
+
+# 10.3.4 (2024-03-06)
+
+### Features and enhancements
+
+- **Chore:** Improve domain validation for Google OAuth - Backport 83229 to v10.3.x. [#83725](https://github.com/grafana/grafana/issues/83725), [@linoman](https://github.com/linoman)
+
+### Bug fixes
+
+- **LDAP:** Fix LDAP users authenticated via auth proxy not being able to use LDAP active sync. [#83750](https://github.com/grafana/grafana/issues/83750), [@Jguer](https://github.com/Jguer)
+- **Tempo:** Add template variable interpolation for filters (#83213). [#83706](https://github.com/grafana/grafana/issues/83706), [@joey-grafana](https://github.com/joey-grafana)
+- **Elasticsearch:** Fix adhoc filters not applied in frontend mode. [#83596](https://github.com/grafana/grafana/issues/83596), [@svennergr](https://github.com/svennergr)
+- **Dashboards:** Fixes issue where panels would not refresh if time range updated while in panel view mode. [#83525](https://github.com/grafana/grafana/issues/83525), [@kaydelaney](https://github.com/kaydelaney)
+- **Auth:** Fix email verification bypass when using basic authentication. [#83484](https://github.com/grafana/grafana/issues/83484)
+- **AuthProxy:** Invalidate previous cached item for user when changes are made to any header. [#83203](https://github.com/grafana/grafana/issues/83203), [@klesh](https://github.com/klesh)
+- **LibraryPanels/RBAC:** Fix issue where folder scopes weren't being correctly inherited. [#82902](https://github.com/grafana/grafana/issues/82902), [@kaydelaney](https://github.com/kaydelaney)
+- **LibraryPanels:** Fix issue with repeated library panels. [#82259](https://github.com/grafana/grafana/issues/82259), [@kaydelaney](https://github.com/kaydelaney)
+- **Plugins:** Don't auto prepend app sub url to plugin asset paths. [#82147](https://github.com/grafana/grafana/issues/82147), [@wbrowne](https://github.com/wbrowne)
+- **Elasticsearch:** Set middlewares from Grafana's `httpClientProvider`. [#81929](https://github.com/grafana/grafana/issues/81929), [@svennergr](https://github.com/svennergr)
+- **Folders:** Fix failure to update folder in SQLite. [#81862](https://github.com/grafana/grafana/issues/81862), [@papagian](https://github.com/papagian)
+- **Loki/Elastic:** Assert queryfix value to always be string. [#81463](https://github.com/grafana/grafana/issues/81463), [@svennergr](https://github.com/svennergr)
+
+### Breaking changes
+
+We're adding a between the response of the ID token HD parameter and the list of allowed domains. This feature can be disabled through the configuration toggle `validate_hd `. Anyone using the legacy Google OAuth configuration should disable this validation if the ID Token response doesn't have the HD parameter. Issue [#83725](https://github.com/grafana/grafana/issues/83725)
+
+<!-- 10.3.4 END -->
+<!-- 10.3.3 START -->
+
+# 10.3.3 (2024-02-02)
+
+### Bug fixes
+
+- **Elasticsearch:** Fix creating of legend so it is backward compatible with frontend produced frames. [#81786](https://github.com/grafana/grafana/issues/81786), [@ivanahuckova](https://github.com/ivanahuckova)
+- **ShareModal:** Fixes url sync issue that caused issue with save drawer. [#81721](https://github.com/grafana/grafana/issues/81721), [@ivanortegaalba](https://github.com/ivanortegaalba)
+
+<!-- 10.3.3 END -->
+<!-- 10.3.1 START -->
+
+# 10.3.1 (2024-01-22)
+
+To resolve a technical issue within the Grafana release package management process, we are releasing both Grafana 10.3.0 and Grafana 10.3.1 simultaneously. The 10.3.1 release contains no breaking or functional changes from 10.3.0. Please refer to the [What’s New](https://grafana.com/docs/grafana/latest/whatsnew/whats-new-in-v10-3/) post for Grafana 10.3.0 for details on new features and changes in this release.
+
+<!-- 10.3.1 END -->
+<!-- 10.3.0 START -->
+
+# 10.3.0 (2024-01-22)
+
+To resolve a technical issue within the Grafana release package management process, we are releasing both Grafana 10.3.0 and Grafana 10.3.1 simultaneously. The 10.3.1 release contains no breaking or functional changes from 10.3.0. Please refer to the [What’s New](https://grafana.com/docs/grafana/latest/whatsnew/whats-new-in-v10-3/) post for Grafana 10.3.0 for details on new features and changes in this release.
+
+### Features and enhancements
+
+- **Alerting:** Guided legacy alerting upgrade dry-run. [#80071](https://github.com/grafana/grafana/issues/80071), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Explore:** Preserve time range when creating a dashboard panel from Explore. [#80070](https://github.com/grafana/grafana/issues/80070), [@Elfo404](https://github.com/Elfo404)
+- **Explore:** Init with mixed DS if there's no root DS in the URL and queries have multiple datasources. [#80068](https://github.com/grafana/grafana/issues/80068), [@Elfo404](https://github.com/Elfo404)
+- **QueryEditor:** Display error even if error field is empty. [#79943](https://github.com/grafana/grafana/issues/79943), [@idastambuk](https://github.com/idastambuk)
+- **K8s:** Enable api-server by default. [#79942](https://github.com/grafana/grafana/issues/79942), [@ryantxu](https://github.com/ryantxu)
+- **Parca:** Add standalone building configuration. [#79896](https://github.com/grafana/grafana/issues/79896), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **Auth:** Hide forgot password if grafana auth is disabled. [#79895](https://github.com/grafana/grafana/issues/79895), [@Jguer](https://github.com/Jguer)
+- **Plugins:** Add uninstall requested message for cloud plugins. [#79748](https://github.com/grafana/grafana/issues/79748), [@oshirohugo](https://github.com/oshirohugo)
+- **Loki:** Open log context in new tab. [#79723](https://github.com/grafana/grafana/issues/79723), [@svennergr](https://github.com/svennergr)
+- **Alerting:** Allow linking to library panels. [#79693](https://github.com/grafana/grafana/issues/79693), [@gillesdemey](https://github.com/gillesdemey)
+- **Loki:** Drop all errors in volume requests. [#79686](https://github.com/grafana/grafana/issues/79686), [@svennergr](https://github.com/svennergr)
+- **Loki Logs volume:** Added a query splitting loading indicator to the Logs Volume graph. [#79681](https://github.com/grafana/grafana/issues/79681), [@matyax](https://github.com/matyax)
+- **Plugins:** Disable add new data source for incomplete install. [#79658](https://github.com/grafana/grafana/issues/79658), [@oshirohugo](https://github.com/oshirohugo)
+- **RBAC:** Render team, service account and user list when a user can see entities but not roles attached to them. [#79642](https://github.com/grafana/grafana/issues/79642), [@kalleep](https://github.com/kalleep)
+- **InfluxDB:** Use database input for SQL configuration instead of metadata. [#79579](https://github.com/grafana/grafana/issues/79579), [@itsmylife](https://github.com/itsmylife)
+- **Tempo:** Support special characters in identifiers. [#79565](https://github.com/grafana/grafana/issues/79565), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **Alerting:** Display "Show all" button for cloud rules. [#79512](https://github.com/grafana/grafana/issues/79512), [@VikaCep](https://github.com/VikaCep)
+- **React Hook Form:** Update to v 7.49.2. [#79493](https://github.com/grafana/grafana/issues/79493), [@Clarity-89](https://github.com/Clarity-89)
+- **Loki:** Add timeRange to labels requests in LogContext to reduce loading times. [#79478](https://github.com/grafana/grafana/issues/79478), [@svennergr](https://github.com/svennergr)
+- **InfluxDB:** Enable SQL support by default. [#79474](https://github.com/grafana/grafana/issues/79474), [@itsmylife](https://github.com/itsmylife)
+- **OAuth:** Remove accessTokenExpirationCheck feature toggle. [#79455](https://github.com/grafana/grafana/issues/79455), [@mgyongyosi](https://github.com/mgyongyosi)
+- **Units:** Add scalable unit option. [#79411](https://github.com/grafana/grafana/issues/79411), [@Develer](https://github.com/Develer)
+- **Alerting:** Add export mute timings feature to the UI. [#79395](https://github.com/grafana/grafana/issues/79395), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Config:** Can add static headers to email messages. [#79365](https://github.com/grafana/grafana/issues/79365), [@owensmallwood](https://github.com/owensmallwood)
+- **Alerting:** Drop NamespaceID from responses on unstable ngalert API endpoints in favor of NamespaceUID. [#79359](https://github.com/grafana/grafana/issues/79359), [@alexweav](https://github.com/alexweav)
+- **Cloudwatch:** Update cloudwatchNewRegionsHandler to General Availability. [#79348](https://github.com/grafana/grafana/issues/79348), [@sarahzinger](https://github.com/sarahzinger)
+- **Plugins:** Include Azure settings as a part of Grafana config sent in plugin requests. [#79342](https://github.com/grafana/grafana/issues/79342), [@aangelisc](https://github.com/aangelisc)
+- **Plugins:** Add hide_angular_deprecation setting. [#79296](https://github.com/grafana/grafana/issues/79296), [@xnyo](https://github.com/xnyo)
+- **Table:** Add select/unselect all column values to table filter. [#79290](https://github.com/grafana/grafana/issues/79290), [@ahuarte47](https://github.com/ahuarte47)
+- **Anonymous:** Add configurable device limit. [#79265](https://github.com/grafana/grafana/issues/79265), [@Jguer](https://github.com/Jguer)
+- **Frontend:** Detect new assets / versions / config changes. [#79258](https://github.com/grafana/grafana/issues/79258), [@ryantxu](https://github.com/ryantxu)
+- **Plugins:** Add option to disable TLS in the socks proxy. [#79246](https://github.com/grafana/grafana/issues/79246), [@PoorlyDefinedBehaviour](https://github.com/PoorlyDefinedBehaviour)
+- **Frontend:** Reload the browser when backend configuration/assets change. [#79057](https://github.com/grafana/grafana/issues/79057), [@torkelo](https://github.com/torkelo)
+- **Chore:** Refactor dataviz aria-label e2e selectors to data-testid. [#78938](https://github.com/grafana/grafana/issues/78938), [@khushijain21](https://github.com/khushijain21)
+- **SSO:** Add GitHub auth configuration page. [#78933](https://github.com/grafana/grafana/issues/78933), [@Clarity-89](https://github.com/Clarity-89)
+- **PublicDashboards:** Add setting to disable the feature. [#78894](https://github.com/grafana/grafana/issues/78894), [@AgnesToulet](https://github.com/AgnesToulet)
+- **Variables:** Interpolate variables used in custom variable definition. [#78800](https://github.com/grafana/grafana/issues/78800), [@torkelo](https://github.com/torkelo)
+- **Table:** Highlight row on shared crosshair. [#78392](https://github.com/grafana/grafana/issues/78392), [@mdvictor](https://github.com/mdvictor)
+- **Stat:** Add Percent Change Option. [#78250](https://github.com/grafana/grafana/issues/78250), [@drew08t](https://github.com/drew08t)
+- **Plugins:** Add Command Palette extension point. [#78098](https://github.com/grafana/grafana/issues/78098), [@sd2k](https://github.com/sd2k)
+- **Transformations:** Add frame source picker to allow transforming annotations. [#77842](https://github.com/grafana/grafana/issues/77842), [@leeoniya](https://github.com/leeoniya)
+- **Pyroscope:** Send start/end with profile types query. [#77523](https://github.com/grafana/grafana/issues/77523), [@bryanhuhta](https://github.com/bryanhuhta)
+- **Explore:** Create menu for short link button. [#77336](https://github.com/grafana/grafana/issues/77336), [@gelicia](https://github.com/gelicia)
+- **Alerting:** Don't record annotations for mapped NoData transitions, when NoData is mapped to OK. [#77164](https://github.com/grafana/grafana/issues/77164), [@alexweav](https://github.com/alexweav)
+- **Canvas:** Add Pan and Zoom. [#76705](https://github.com/grafana/grafana/issues/76705), [@drew08t](https://github.com/drew08t)
+- **Alerting:** In migration, create one label per channel. [#76527](https://github.com/grafana/grafana/issues/76527), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Alerting:** Separate overlapping legacy and UA alerting routes. [#76517](https://github.com/grafana/grafana/issues/76517), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Tooltip:** Improved Timeseries and Candlestick tooltips. [#75841](https://github.com/grafana/grafana/issues/75841), [@adela-almasan](https://github.com/adela-almasan)
+- **Alerting:** Support hysteresis command expression. [#75189](https://github.com/grafana/grafana/issues/75189), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Plugins:** Add update for instance plugins. (Enterprise)
+- **React Hook Form:** Update to v 7.49.2. (Enterprise)
+- **Plugins:** Improve cloud plugins install error treatment. (Enterprise)
+
+### Bug fixes
+
+- **Transformations:** Fix bug where having NaN in the input to regression analysis transformation causes all predictions to be NaN. [#80079](https://github.com/grafana/grafana/issues/80079), [@oscarkilhed](https://github.com/oscarkilhed)
+- **Alerting:** Fix URL timestamp conversion in historian API in annotation mode. [#80026](https://github.com/grafana/grafana/issues/80026), [@alexweav](https://github.com/alexweav)
+- **Fix:** Switch component not being styled as disabled when is checked. [#80012](https://github.com/grafana/grafana/issues/80012), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Tempo:** Fix Spans table format. [#79938](https://github.com/grafana/grafana/issues/79938), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **Gauges:** Fixing broken auto sizing. [#79926](https://github.com/grafana/grafana/issues/79926), [@torkelo](https://github.com/torkelo)
+- **Barchart:** Fix percent stacking regression. [#79903](https://github.com/grafana/grafana/issues/79903), [@nmarrs](https://github.com/nmarrs)
+- **Alerting:** Fix reusing last url in tab when reopening a new tab in rule detail a…. [#79801](https://github.com/grafana/grafana/issues/79801), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Azure Monitor:** Fix multi-resource bug "Missing required region params, requested QueryParams: api-version:2017-12-01-preview...". [#79669](https://github.com/grafana/grafana/issues/79669), [@bossinc](https://github.com/bossinc)
+- **Explore:** Fix URL sync with async queries import . [#79584](https://github.com/grafana/grafana/issues/79584), [@Elfo404](https://github.com/Elfo404)
+- **Dashboards:** Skip inherited object variable names. [#79567](https://github.com/grafana/grafana/issues/79567), [@jarben](https://github.com/jarben)
+- **Alerting:** Fix queries and expressions in rule view details. [#79497](https://github.com/grafana/grafana/issues/79497), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Tempo:** Fix cache in TraceQL editor. [#79468](https://github.com/grafana/grafana/issues/79468), [@adrapereira](https://github.com/adrapereira)
+- **Nested Folders:** Fix /api/folders pagination. [#79447](https://github.com/grafana/grafana/issues/79447), [@papagian](https://github.com/papagian)
+- **Elasticsearch:** Fix modify query with backslashes. [#79430](https://github.com/grafana/grafana/issues/79430), [@svennergr](https://github.com/svennergr)
+- **Cloudwatch:** Fix errors while loading queries/datasource on Safari. [#79417](https://github.com/grafana/grafana/issues/79417), [@kevinwcyu](https://github.com/kevinwcyu)
+- **Stat:** Fix inconsistent center padding. [#79389](https://github.com/grafana/grafana/issues/79389), [@torkelo](https://github.com/torkelo)
+- **Tempo:** Fix autocompletion with strings. [#79370](https://github.com/grafana/grafana/issues/79370), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **Alerting:** Fix for data source filter on cloud rules. [#79327](https://github.com/grafana/grafana/issues/79327), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Alerting:** Fix UI inheriting mute timings from parent when calculating the polic…. [#79295](https://github.com/grafana/grafana/issues/79295), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Auth:** Fix a panic during logout when OAuth provider is not set. [#79271](https://github.com/grafana/grafana/issues/79271), [@dmihai](https://github.com/dmihai)
+- **Tempo:** Fix read-only assignment. [#79183](https://github.com/grafana/grafana/issues/79183), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **Templating:** Json interpolation of single-value default selection does not create valid json. [#79137](https://github.com/grafana/grafana/issues/79137), [@kaydelaney](https://github.com/kaydelaney)
+- **Heatmap:** Fix null options migration. [#79083](https://github.com/grafana/grafana/issues/79083), [@overvenus](https://github.com/overvenus)
+- **Dashboards:** Run shared queries even when source panel is in collapsed row. [#77792](https://github.com/grafana/grafana/issues/77792), [@kaydelaney](https://github.com/kaydelaney)
+- **PDF:** Fix support for large panels. (Enterprise)
+- **Reporting:** Fix daylight saving time support for custom schedules. (Enterprise)
+- **RBAC:** Fix role assignment removal . (Enterprise)
+
+### Breaking changes
+
+Users who have InfluxDB datasource configured with SQL querying language must update their database information. They have to enter their `bucket name` into the database field. Issue [#79579](https://github.com/grafana/grafana/issues/79579)
+
+Removes `NamespaceID` from responses of all GET routes underneath the path `/api/ruler/grafana/api/v1/rules` - 3 affected endpoints. All affected routes are not in the publicly documented or `stable` marked portion of the ngalert API. This only breaks clients who are directly using the unstable portion of the API. Such clients should use `NamespaceUID` rather than `NamespaceID` to identify namespaces. Issue [#79359](https://github.com/grafana/grafana/issues/79359)
+
+<!-- 10.3.0 END -->
+<!-- 10.2.6 START -->
+
+# 10.2.6 (2024-03-25)
+
+### Features and enhancements
+
+- **Postgres:** Allow disabling SNI on SSL-enabled connections. [#84258](https://github.com/grafana/grafana/issues/84258), [@papagian](https://github.com/papagian)
+
+### Bug fixes
+
+- **CloudMonitoring:** Only run query if filters are complete. [#85014](https://github.com/grafana/grafana/issues/85014), [@aangelisc](https://github.com/aangelisc)
+- **Snapshots:** Require delete within same org (backport). [#84730](https://github.com/grafana/grafana/issues/84730), [@ryantxu](https://github.com/ryantxu)
+- **Dashboard:** Fix issue where out-of-view shared query panels caused blank dependent panels. [#84195](https://github.com/grafana/grafana/issues/84195), [@kaydelaney](https://github.com/kaydelaney)
+- **Dashboards:** Run shared queries even when source panel is in collapsed row. [#84166](https://github.com/grafana/grafana/issues/84166), [@kaydelaney](https://github.com/kaydelaney)
+- **Prometheus:** Fix calculating rate interval when there is no interval specified. [#84082](https://github.com/grafana/grafana/issues/84082), [@itsmylife](https://github.com/itsmylife)
+- **Prometheus:** Fix $\_\_rate_interval calculation. [#84063](https://github.com/grafana/grafana/issues/84063), [@tolzhabayev](https://github.com/tolzhabayev)
+
+<!-- 10.2.6 END -->
+<!-- 10.2.5 START -->
+
+# 10.2.5 (2024-03-06)
+
+### Features and enhancements
+
+- **Alerting:** Add setting to distribute rule group evaluations over time. [#81404](https://github.com/grafana/grafana/issues/81404), [@alexweav](https://github.com/alexweav)
+
+### Bug fixes
+
+- **Cloudwatch:** Fix errors while loading queries/datasource on Safari. [#83842](https://github.com/grafana/grafana/issues/83842), [@kevinwcyu](https://github.com/kevinwcyu)
+- **Elasticsearch:** Fix adhoc filters not applied in frontend mode. [#83595](https://github.com/grafana/grafana/issues/83595), [@svennergr](https://github.com/svennergr)
+- **Auth:** Fix email verification bypass when using basic authentication. [#83489](https://github.com/grafana/grafana/issues/83489)
+- **Alerting:** Fix queries and expressions in rule view details. [#82875](https://github.com/grafana/grafana/issues/82875), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Plugins:** Don't auto prepend app sub url to plugin asset paths. [#82146](https://github.com/grafana/grafana/issues/82146), [@wbrowne](https://github.com/wbrowne)
+- **Folders:** Fix failure to update folder in SQLite. [#81861](https://github.com/grafana/grafana/issues/81861), [@papagian](https://github.com/papagian)
+
+<!-- 10.2.5 END -->
+<!-- 10.2.4 START -->
+
+# 10.2.4 (2024-01-29)
+
+### Features and enhancements
+
+- **Chore:** Upgrade Go to 1.21.5. [#79560](https://github.com/grafana/grafana/issues/79560), [@tolzhabayev](https://github.com/tolzhabayev)
+
+### Bug fixes
+
+- **Field:** Fix perf regression in getUniqueFieldName(). [#81417](https://github.com/grafana/grafana/issues/81417), [@leeoniya](https://github.com/leeoniya)
+- **Alerting:** Fix Graphite subqueries. [#80816](https://github.com/grafana/grafana/issues/80816), [@gillesdemey](https://github.com/gillesdemey)
+- **Alerting:** Fix Graphite subqueries. [#80744](https://github.com/grafana/grafana/issues/80744), [@gillesdemey](https://github.com/gillesdemey)
+- **Annotations:** Split cleanup into separate queries and deletes to avoid deadlocks on MySQL. [#80485](https://github.com/grafana/grafana/issues/80485), [@alexweav](https://github.com/alexweav)
+- **Loki:** Fix bug duplicating parsed labels across multiple log lines. [#80368](https://github.com/grafana/grafana/issues/80368), [@svennergr](https://github.com/svennergr)
+- **Alerting:** Fix NoData & Error alerts not resolving when rule is reset. [#80241](https://github.com/grafana/grafana/issues/80241), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Auth:** Fix a panic during logout when OAuth provider is not set. [#80221](https://github.com/grafana/grafana/issues/80221), [@dmihai](https://github.com/dmihai)
+- **Gauges:** Fixing broken auto sizing. [#79940](https://github.com/grafana/grafana/issues/79940), [@torkelo](https://github.com/torkelo)
+- **Templating:** Json interpolation of single-value default selection does not create valid json. [#79503](https://github.com/grafana/grafana/issues/79503), [@kaydelaney](https://github.com/kaydelaney)
+- **Tempo:** Fix cache in TraceQL editor. [#79471](https://github.com/grafana/grafana/issues/79471), [@adrapereira](https://github.com/adrapereira)
+- **Alerting:** Fix for data source filter on cloud rules. (#79327). [#79350](https://github.com/grafana/grafana/issues/79350), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+
+<!-- 10.2.4 END -->
+<!-- 10.2.3 START -->
+
+# 10.2.3 (2023-12-18)
+
+### Features and enhancements
+
+- **Auth:** Improve groups claim setup docs for AzureAD. [#79227](https://github.com/grafana/grafana/issues/79227), [@mgyongyosi](https://github.com/mgyongyosi)
+- **Alerting:** Attempt to retry retryable errors. [#79161](https://github.com/grafana/grafana/issues/79161), [@gotjosh](https://github.com/gotjosh)
+- **Unified Alerting:** Set `max_attempts` to 1 by default. [#79095](https://github.com/grafana/grafana/issues/79095), [@gotjosh](https://github.com/gotjosh)
+- **Auth:** Use SSO settings service to load social connectors + refactor. [#79005](https://github.com/grafana/grafana/issues/79005), [@mgyongyosi](https://github.com/mgyongyosi)
+- **Cloudwatch:** Update error code metrics for ES/OpenSearch. [#78990](https://github.com/grafana/grafana/issues/78990), [@siddhikhapare](https://github.com/siddhikhapare)
+- **Auth:** Add anonymous users view and stats. [#78965](https://github.com/grafana/grafana/issues/78965), [@Jguer](https://github.com/Jguer)
+- **Flamegraph:** Add table filtering for Flamegraph panel. [#78962](https://github.com/grafana/grafana/issues/78962), [@Rperry2174](https://github.com/Rperry2174)
+- **Pyroscope:** Improve label suggestions in query editor. [#78861](https://github.com/grafana/grafana/issues/78861), [@aleks-p](https://github.com/aleks-p)
+- **InfluxDB:** Introduce influxqlStreamingParser feature toggle. [#78834](https://github.com/grafana/grafana/issues/78834), [@itsmylife](https://github.com/itsmylife)
+- **Usagestats:** Add stat group for alert rule groups. [#78825](https://github.com/grafana/grafana/issues/78825), [@alexweav](https://github.com/alexweav)
+- **Auth:** Improve groups claim setup docs for AzureAD. [#78791](https://github.com/grafana/grafana/issues/78791), [@mgyongyosi](https://github.com/mgyongyosi)
+- **Loki:** Added support for "or" statements in line filters. [#78705](https://github.com/grafana/grafana/issues/78705), [@matyax](https://github.com/matyax)
+- **Cloudwatch:** Add missing metrics for AWS/IVSRealtime namespace. [#78688](https://github.com/grafana/grafana/issues/78688), [@idastambuk](https://github.com/idastambuk)
+- **Auth:** Add anonymous users view and stats. [#78685](https://github.com/grafana/grafana/issues/78685), [@eleijonmarck](https://github.com/eleijonmarck)
+- **Alerting:** Filter insights panels (grafanacloud-usage ds) by instance_id. [#78657](https://github.com/grafana/grafana/issues/78657), [@VikaCep](https://github.com/VikaCep)
+- **Login:** Improve accessibility of Login form. [#78652](https://github.com/grafana/grafana/issues/78652), [@joshhunt](https://github.com/joshhunt)
+- **Tracing:** Full text search. [#78628](https://github.com/grafana/grafana/issues/78628), [@joey-grafana](https://github.com/joey-grafana)
+- **Alerting:** In migration, fallback to '1s' for malformed min interval. [#78614](https://github.com/grafana/grafana/issues/78614), [@JacobsonMT](https://github.com/JacobsonMT)
+- **AuthProxy:** Do not allow sessions to be assigned with other methods. [#78602](https://github.com/grafana/grafana/issues/78602), [@Jguer](https://github.com/Jguer)
+- **Loki:** Filter by labels based on the type of label (structured, indexed, parsed). [#78595](https://github.com/grafana/grafana/issues/78595), [@svennergr](https://github.com/svennergr)
+- **Loki:** Add structured metadata keys to autocomplete. [#78584](https://github.com/grafana/grafana/issues/78584), [@svennergr](https://github.com/svennergr)
+- **Variables:** Remove alpha flag from variable support API. [#78573](https://github.com/grafana/grafana/issues/78573), [@sunker](https://github.com/sunker)
+- **Azure Monitor:** Add Azure Infrastructure Monitoring Dashboard. [#78498](https://github.com/grafana/grafana/issues/78498), [@JohnJMartins](https://github.com/JohnJMartins)
+- **Timeseries:** Remove cursor sync when x is not time. [#78496](https://github.com/grafana/grafana/issues/78496), [@adela-almasan](https://github.com/adela-almasan)
+- **Auth:** Load ini/env vars settings in the fallback strategy. [#78495](https://github.com/grafana/grafana/issues/78495), [@mgyongyosi](https://github.com/mgyongyosi)
+- **CloudWatch:** Add AWS Bedrock metrics definition. [#78478](https://github.com/grafana/grafana/issues/78478), [@thepalbi](https://github.com/thepalbi)
+- **SSO:** Display provider list. [#78472](https://github.com/grafana/grafana/issues/78472), [@Clarity-89](https://github.com/Clarity-89)
+- **Transformations:** Add regression analysis transformation. [#78457](https://github.com/grafana/grafana/issues/78457), [@oscarkilhed](https://github.com/oscarkilhed)
+- **Auth:** Make clientTokenRotation enabled by default. [#78384](https://github.com/grafana/grafana/issues/78384), [@mgyongyosi](https://github.com/mgyongyosi)
+- **Alerting:** In migration improve deduplication of title and group. [#78351](https://github.com/grafana/grafana/issues/78351), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Alerting:** Add clean_upgrade config and deprecate force_migration. [#78324](https://github.com/grafana/grafana/issues/78324), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Tempo:** Allow `!~` in Search tab. [#78315](https://github.com/grafana/grafana/issues/78315), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **Avatar:** Allow browser caching of /avatar/. [#78314](https://github.com/grafana/grafana/issues/78314), [@oscarkilhed](https://github.com/oscarkilhed)
+- **Transformations:** Move transformation addition into drawer. [#78299](https://github.com/grafana/grafana/issues/78299), [@codeincarnate](https://github.com/codeincarnate)
+- **Alerting:** Update rule access control to return errutil errors. [#78284](https://github.com/grafana/grafana/issues/78284), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Licensing:** Update enterprise documentation. [#78276](https://github.com/grafana/grafana/issues/78276), [@leandro-deveikis](https://github.com/leandro-deveikis)
+- **CloudWatch Logs:** Support fetching fields in monaco editor. [#78244](https://github.com/grafana/grafana/issues/78244), [@iwysiu](https://github.com/iwysiu)
+- **Server:** Automatically generate a self-signed TLS cert if needed. [#78243](https://github.com/grafana/grafana/issues/78243), [@DanCech](https://github.com/DanCech)
+- **Grafana/ui:** Move Grid out of unstable. [#78220](https://github.com/grafana/grafana/issues/78220), [@Clarity-89](https://github.com/Clarity-89)
+- **Plugins:** Add AWS/MediaLive metric for CloudWatch. [#78163](https://github.com/grafana/grafana/issues/78163), [@arabian9ts](https://github.com/arabian9ts)
+- **Transformations:** Move transformation variables to public preview. [#78148](https://github.com/grafana/grafana/issues/78148), [@oscarkilhed](https://github.com/oscarkilhed)
+- **Plugins:** Share plugin context with the component-type extensions. [#78111](https://github.com/grafana/grafana/issues/78111), [@leventebalogh](https://github.com/leventebalogh)
+- **Breadcrumbs:** Only dedupe breacrumb items for matching node names. [#78077](https://github.com/grafana/grafana/issues/78077), [@gillesdemey](https://github.com/gillesdemey)
+- **Dashboards:** Implement natural sort for query variables. [#78024](https://github.com/grafana/grafana/issues/78024), [@bobrik](https://github.com/bobrik)
+- **Alerting:** Adds the new alertingSimplifiedRouting feature toggle. [#77984](https://github.com/grafana/grafana/issues/77984), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Alerting:** Allow to clear datasource selection in panel list. [#77960](https://github.com/grafana/grafana/issues/77960), [@VikaCep](https://github.com/VikaCep)
+- **Plugins:** Share the plugin context with apps and ui-extensions. [#77933](https://github.com/grafana/grafana/issues/77933), [@leventebalogh](https://github.com/leventebalogh)
+- **InfluxDB:** Add new truthiness operators (`Is` and `Is Not`) to InfluxQL Query Builder. [#77923](https://github.com/grafana/grafana/issues/77923), [@btasker](https://github.com/btasker)
+- **Auth:** Refactor OAuth connectors' initialization. [#77919](https://github.com/grafana/grafana/issues/77919), [@mgyongyosi](https://github.com/mgyongyosi)
+- **InfluxDB:** Add support for `&gt;=` and `&lt;=` comparison operators to IQL Query Builder. [#77917](https://github.com/grafana/grafana/issues/77917), [@btasker](https://github.com/btasker)
+- **Alerting:** Add actions extension point to alert instances table view. [#77900](https://github.com/grafana/grafana/issues/77900), [@sd2k](https://github.com/sd2k)
+- **Dashboard:** Add ability to stop title/description generation. [#77896](https://github.com/grafana/grafana/issues/77896), [@adela-almasan](https://github.com/adela-almasan)
+- **Tempo:** Allow quotes in tag names and attributes. [#77864](https://github.com/grafana/grafana/issues/77864), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **Plugins:** Add grafana/user/profile/tab plugin extension point. [#77863](https://github.com/grafana/grafana/issues/77863), [@joeyorlando](https://github.com/joeyorlando)
+- **DashList:** Update links with time range and variables change. [#77850](https://github.com/grafana/grafana/issues/77850), [@torkelo](https://github.com/torkelo)
+- **Cloudwatch:** Migrate Config editor and Variable editor to new form stying under feature toggle. [#77838](https://github.com/grafana/grafana/issues/77838), [@idastambuk](https://github.com/idastambuk)
+- **InfluxDB:** Template variable support for SQL language. [#77799](https://github.com/grafana/grafana/issues/77799), [@itsmylife](https://github.com/itsmylife)
+- **Grafana/ui:** Unify flex shorthand props. [#77768](https://github.com/grafana/grafana/issues/77768), [@Clarity-89](https://github.com/Clarity-89)
+- **Explore:** Default synced to true, only show synced status if panes are split. [#77759](https://github.com/grafana/grafana/issues/77759), [@gelicia](https://github.com/gelicia)
+- **Tooltips:** Support long labels. [#77735](https://github.com/grafana/grafana/issues/77735), [@Develer](https://github.com/Develer)
+- **Logs:** Update logic to process logs dataPlane frame with labels field. [#77708](https://github.com/grafana/grafana/issues/77708), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Snapshots:** Do not return internal database ids. [#77672](https://github.com/grafana/grafana/issues/77672), [@ryantxu](https://github.com/ryantxu)
+- **Tempo:** Support comments in TraceQL. [#77646](https://github.com/grafana/grafana/issues/77646), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **Alerting:** Avoid alert list view component being unmounted every time we fetch new data. [#77631](https://github.com/grafana/grafana/issues/77631), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Swagger:** Rename annotations model. [#77605](https://github.com/grafana/grafana/issues/77605), [@julienduchesne](https://github.com/julienduchesne)
+- **Transformations:** Deduplicate names when using `extract fields` transformation. [#77569](https://github.com/grafana/grafana/issues/77569), [@oscarkilhed](https://github.com/oscarkilhed)
+- **BrowseDashboards:** Add `RadioButtonGroup` to be able to chose between 'Browse' or 'List' view. [#77561](https://github.com/grafana/grafana/issues/77561), [@eledobleefe](https://github.com/eledobleefe)
+- **Stack:** Use the component from grafana/ui. [#77543](https://github.com/grafana/grafana/issues/77543), [@Clarity-89](https://github.com/Clarity-89)
+- **Tempo:** Handle empty responses in ServiceGraph. [#77539](https://github.com/grafana/grafana/issues/77539), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **Tempo:** Embed flame graph in span details. [#77537](https://github.com/grafana/grafana/issues/77537), [@joey-grafana](https://github.com/joey-grafana)
+- **CloudWatch:** Call query method from DataSourceWithBackend to support public dashboards. [#77532](https://github.com/grafana/grafana/issues/77532), [@kevinwcyu](https://github.com/kevinwcyu)
+- **Chore:** Prepare to remove &lt;Graph /&gt; from @grafana/ui. [#77522](https://github.com/grafana/grafana/issues/77522), [@ryantxu](https://github.com/ryantxu)
+- **Grafana/ui:** Move the Stack component out of unstable. [#77495](https://github.com/grafana/grafana/issues/77495), [@Clarity-89](https://github.com/Clarity-89)
+- **Flamegraph:** Add collapsing for similar items in the stack. [#77461](https://github.com/grafana/grafana/issues/77461), [@aocenas](https://github.com/aocenas)
+- **Tempo:** Added status to hard-coded fields. [#77393](https://github.com/grafana/grafana/issues/77393), [@adrapereira](https://github.com/adrapereira)
+- **Alerting:** Adds contact point sorting and searching. [#77390](https://github.com/grafana/grafana/issues/77390), [@gillesdemey](https://github.com/gillesdemey)
+- **Loki:** Add backend functionality to parse structured metadata from Loki. [#77361](https://github.com/grafana/grafana/issues/77361), [@svennergr](https://github.com/svennergr)
+- **ValueFormats:** Use plural for time units. [#77337](https://github.com/grafana/grafana/issues/77337), [@utkarshdeepak](https://github.com/utkarshdeepak)
+- **Calculations:** Update First _ and Last _ reducers to exclude NaNs. [#77323](https://github.com/grafana/grafana/issues/77323), [@nmarrs](https://github.com/nmarrs)
+- **Chore:** Upgrade Go to 1.21.3. [#77304](https://github.com/grafana/grafana/issues/77304), [@ryantxu](https://github.com/ryantxu)
+- **Tooltip:** Improved Trend tooltip. [#77251](https://github.com/grafana/grafana/issues/77251), [@adela-almasan](https://github.com/adela-almasan)
+- **Dashboards:** Remove dummy trim dashboard api. [#77249](https://github.com/grafana/grafana/issues/77249), [@ryantxu](https://github.com/ryantxu)
+- **Alerting:** Enable feature flag alertingNoDataErrorExecution by default. [#77242](https://github.com/grafana/grafana/issues/77242), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Cloudwatch:** Add DB_PERF_INSIGHTS to Metric Math. [#77241](https://github.com/grafana/grafana/issues/77241), [@iwysiu](https://github.com/iwysiu)
+- **PluginExtensions:** Returns a clone of moment objects in context. [#77238](https://github.com/grafana/grafana/issues/77238), [@mckn](https://github.com/mckn)
+- **Logs:** Deprecated `showContextToggle` in DataSourceWithLogsContextSupport. [#77232](https://github.com/grafana/grafana/issues/77232), [@matyax](https://github.com/matyax)
+- **AzureMonitor:** Add Container Insights Syslog Dashboard. [#77229](https://github.com/grafana/grafana/issues/77229), [@JohnJMartins](https://github.com/JohnJMartins)
+- **Loki:** Add optional stream selector to fetchLabelValues API. [#77207](https://github.com/grafana/grafana/issues/77207), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Alerting:** Add support for responders to Opsgenie integration. [#77159](https://github.com/grafana/grafana/issues/77159), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Chore:** Replace crewjam/saml with the latest grafana/saml lib. [#77153](https://github.com/grafana/grafana/issues/77153), [@mgyongyosi](https://github.com/mgyongyosi)
+- **Tempo:** Add new intrinsics. [#77146](https://github.com/grafana/grafana/issues/77146), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **GrafanaUI:** Prevent code editors from 'trapping' scroll. [#77125](https://github.com/grafana/grafana/issues/77125), [@joshhunt](https://github.com/joshhunt)
+- **Plugins:** Change managed plugins installation call. [#77120](https://github.com/grafana/grafana/issues/77120), [@oshirohugo](https://github.com/oshirohugo)
+- **Alerting:** Show receiver in groups view to avoid duplication in the list. [#77109](https://github.com/grafana/grafana/issues/77109), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Alerting:** Allow more time before Alertmanager expire-resolves alerts. [#77094](https://github.com/grafana/grafana/issues/77094), [@alexweav](https://github.com/alexweav)
+- **Tempo:** Add new structural operators. [#77056](https://github.com/grafana/grafana/issues/77056), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **ServiceAccount:** Add pagination to service account table. [#77044](https://github.com/grafana/grafana/issues/77044), [@kalleep](https://github.com/kalleep)
+- **Transformations:** Cumulative and window modes for `Add field from calculation`. [#77029](https://github.com/grafana/grafana/issues/77029), [@mdvictor](https://github.com/mdvictor)
+- **Plugins:** Allow disabling angular deprecation UI for specific plugins. [#77026](https://github.com/grafana/grafana/issues/77026), [@xnyo](https://github.com/xnyo)
+- **Stat:** Add panel option to control wide layout. [#77018](https://github.com/grafana/grafana/issues/77018), [@nmarrs](https://github.com/nmarrs)
+- **Logs Panel:** Column selection for experimental table visualization in explore. [#76983](https://github.com/grafana/grafana/issues/76983), [@gtk-grafana](https://github.com/gtk-grafana)
+- **Alerting:** Update 'Create alert' to 'New alert rule' in the panel and docs. [#76950](https://github.com/grafana/grafana/issues/76950), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **InfluxDB:** Implement InfluxQL json streaming parser. [#76934](https://github.com/grafana/grafana/issues/76934), [@itsmylife](https://github.com/itsmylife)
+- **Plugins:** Improvements to NodeGraph. [#76879](https://github.com/grafana/grafana/issues/76879), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **Trace View:** Critical path highlighting. [#76857](https://github.com/grafana/grafana/issues/76857), [@adrapereira](https://github.com/adrapereira)
+- **Caching:** Enable `useCachingService` feature toggle by default. [#76845](https://github.com/grafana/grafana/issues/76845), [@mmandrus](https://github.com/mmandrus)
+- **Plugins:** Pass OTEL sampling config to plugins. [#76834](https://github.com/grafana/grafana/issues/76834), [@xnyo](https://github.com/xnyo)
+- **Transformations:** Allow Timeseries to table transformation to handle multiple time series. [#76801](https://github.com/grafana/grafana/issues/76801), [@codeincarnate](https://github.com/codeincarnate)
+- **Plugins:** Add managed instance installation resources. [#76767](https://github.com/grafana/grafana/issues/76767), [@oshirohugo](https://github.com/oshirohugo)
+- **Nav:** Design changes in MegaMenu. [#76735](https://github.com/grafana/grafana/issues/76735), [@L-M-K-B](https://github.com/L-M-K-B)
+- **Cloudwatch:** Add missing appsync metrics. [#76703](https://github.com/grafana/grafana/issues/76703), [@ctobolski](https://github.com/ctobolski)
+- **Plugins:** Add status_source label to plugin request logs. [#76676](https://github.com/grafana/grafana/issues/76676), [@xnyo](https://github.com/xnyo)
+- **Tracing:** Trace to profiles. [#76670](https://github.com/grafana/grafana/issues/76670), [@joey-grafana](https://github.com/joey-grafana)
+- **InfluxDB:** Enable InfluxDB backend mode by default. [#76641](https://github.com/grafana/grafana/issues/76641), [@itsmylife](https://github.com/itsmylife)
+- **Log Context:** Add Log Context support to mixed data sources. [#76623](https://github.com/grafana/grafana/issues/76623), [@matyax](https://github.com/matyax)
+- **Alerting:** Add Alerting menu in getPanelMenu. [#76618](https://github.com/grafana/grafana/issues/76618), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Azure monitor:** Support Logs visualization. [#76594](https://github.com/grafana/grafana/issues/76594), [@bossinc](https://github.com/bossinc)
+- **Transformations:** Support enum field conversion. [#76410](https://github.com/grafana/grafana/issues/76410), [@nmarrs](https://github.com/nmarrs)
+- **Select:** Overflow ellipsis and control over multi value wrapping . [#76405](https://github.com/grafana/grafana/issues/76405), [@torkelo](https://github.com/torkelo)
+- **Transformations:** Move debug to drawer. [#76281](https://github.com/grafana/grafana/issues/76281), [@codeincarnate](https://github.com/codeincarnate)
+- **Gauge:** Simplify gauge dimension panel options. [#76216](https://github.com/grafana/grafana/issues/76216), [@nmarrs](https://github.com/nmarrs)
+- **Loki:** Option to add derived fields based on labels. [#76162](https://github.com/grafana/grafana/issues/76162), [@5cat](https://github.com/5cat)
+- **CloudWatch:** Add missing GameLift metrics . [#76102](https://github.com/grafana/grafana/issues/76102), [@fridgepoet](https://github.com/fridgepoet)
+- **CloudWatch:** Update query batching logic. [#76075](https://github.com/grafana/grafana/issues/76075), [@iwysiu](https://github.com/iwysiu)
+- **Bar Gauge:** Add max height option. [#76042](https://github.com/grafana/grafana/issues/76042), [@Develer](https://github.com/Develer)
+- **Plugins:** Add feat toggle to install managed plugins. [#75973](https://github.com/grafana/grafana/issues/75973), [@oshirohugo](https://github.com/oshirohugo)
+- **Correlations:** Add transformations to Explore Editor. [#75930](https://github.com/grafana/grafana/issues/75930), [@gelicia](https://github.com/gelicia)
+- **Azure Monitor:** Add 5 curated dashboards for App insights troubleshooting experience. [#75916](https://github.com/grafana/grafana/issues/75916), [@yves-chan](https://github.com/yves-chan)
+- **Loki Queries:** Query Splitting enabled by default. [#75876](https://github.com/grafana/grafana/issues/75876), [@matyax](https://github.com/matyax)
+- **Alerting:** Fetch alerts from a remote Alertmanager. [#75844](https://github.com/grafana/grafana/issues/75844), [@santihernandezc](https://github.com/santihernandezc)
+- **Tooltip:** Improved Heatmap tooltip. [#75712](https://github.com/grafana/grafana/issues/75712), [@adela-almasan](https://github.com/adela-almasan)
+- **Dashboard:** DashboardGrid - don't animate if reduced-motion set. [#75540](https://github.com/grafana/grafana/issues/75540), [@dnwe](https://github.com/dnwe)
+- **SQL:** Update configuration pages. [#75525](https://github.com/grafana/grafana/issues/75525), [@gwdawson](https://github.com/gwdawson)
+- **Geomap:** Add more countries ISO 3166 Alpha-3-code to the gazetteer/countries.json. [#75311](https://github.com/grafana/grafana/issues/75311), [@alexsan92](https://github.com/alexsan92)
+- **Log Rows:** Added popover menu with filter options when a log line is selected. [#75306](https://github.com/grafana/grafana/issues/75306), [@matyax](https://github.com/matyax)
+- **Auth:** Split signout_redirect_url into per provider settings. [#75269](https://github.com/grafana/grafana/issues/75269), [@venkatbvc](https://github.com/venkatbvc)
+- **Analytics:** Add option to pass destSDKBaseURL to rudderstack load method. [#74926](https://github.com/grafana/grafana/issues/74926), [@gassiss](https://github.com/gassiss)
+- **SQL:** Add timeFilter macro to query builder. [#74575](https://github.com/grafana/grafana/issues/74575), [@zoltanbedi](https://github.com/zoltanbedi)
+- **Storage:** Unified Storage based on Entity API. [#71977](https://github.com/grafana/grafana/issues/71977), [@DanCech](https://github.com/DanCech)
+- **Policies:** Adds deprecation policy. [#68439](https://github.com/grafana/grafana/issues/68439), [@bergquist](https://github.com/bergquist)
+- **Reports:** Do not show the unsaved changes modal for URL params change. (Enterprise)
+- **Plugins:** Add endpoints to get instance plugins. (Enterprise)
+- **Swagger:** Clean up Report struct names. (Enterprise)
+- **Plugins:** Add managed installer. (Enterprise)
+- **DatasourceACL:** Remove deprecated datasource permissions endpoints. (Enterprise)
+- **RBAC:** Introduce a data source administrator role. (Enterprise)
+
+### Bug fixes
+
+- **Alerting:** Fix deleting rules in a folder with matching UID in another organization. [#79011](https://github.com/grafana/grafana/issues/79011), [@papagian](https://github.com/papagian)
+- **CloudWatch:** Correctly quote metric names with special characters. [#78958](https://github.com/grafana/grafana/issues/78958), [@iwysiu](https://github.com/iwysiu)
+- **Fix:** Use dashboard time range in prometheus variable editor. [#78950](https://github.com/grafana/grafana/issues/78950), [@itsmylife](https://github.com/itsmylife)
+- **DeleteDashboard:** Redirect to home after deleting a dashboard. [#78936](https://github.com/grafana/grafana/issues/78936), [@ivanortegaalba](https://github.com/ivanortegaalba)
+- **Alerting:** Change create/update permissions for silences. [#78920](https://github.com/grafana/grafana/issues/78920), [@VikaCep](https://github.com/VikaCep)
+- **DeleteDashboard:** Redirect to home after deleting a dashboard. [#78918](https://github.com/grafana/grafana/issues/78918), [@ivanortegaalba](https://github.com/ivanortegaalba)
+- **Alerting:** Fixes combination of multiple predicates for rule search. [#78910](https://github.com/grafana/grafana/issues/78910), [@gillesdemey](https://github.com/gillesdemey)
+- **Timeseries to table transformation:** Fix misaligned table field values if some frames are missing a label. [#78909](https://github.com/grafana/grafana/issues/78909), [@domasx2](https://github.com/domasx2)
+- **CloudWatch:** Fetch Dimension keys correctly from Dimension Picker. [#78831](https://github.com/grafana/grafana/issues/78831), [@iwysiu](https://github.com/iwysiu)
+- **Plugins:** Only preload plugins if user is authenticated. [#78805](https://github.com/grafana/grafana/issues/78805), [@marefr](https://github.com/marefr)
+- **Tempo:** Fix read-only access error. [#78801](https://github.com/grafana/grafana/issues/78801), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **Stats:** Fix unregistered unified alerting metric. [#78777](https://github.com/grafana/grafana/issues/78777), [@alexweav](https://github.com/alexweav)
+- **RBAC:** Adjust filter for acl list to check for permissions on service accounts. [#78681](https://github.com/grafana/grafana/issues/78681), [@kalleep](https://github.com/kalleep)
+- **Bug:** Fix broken ui components when angular is disabled. [#78670](https://github.com/grafana/grafana/issues/78670), [@jackw](https://github.com/jackw)
+- **Plugins:** Only set non-existing headers for core plugin requests. [#78633](https://github.com/grafana/grafana/issues/78633), [@aangelisc](https://github.com/aangelisc)
+- **CloudWatch:** Fetch Dimension keys correctly from Dimension Picker. [#78556](https://github.com/grafana/grafana/issues/78556), [@iwysiu](https://github.com/iwysiu)
+- **InfluxDB:** Parse data for table view to have parity with frontend parser. [#78551](https://github.com/grafana/grafana/issues/78551), [@itsmylife](https://github.com/itsmylife)
+- **Elasticsearch:** Fix processing of raw_data with not-recognized time format. [#78380](https://github.com/grafana/grafana/issues/78380), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Command Palette:** Fix for chinese input and keystrokes being lost in slow environments. [#78373](https://github.com/grafana/grafana/issues/78373), [@ashharrison90](https://github.com/ashharrison90)
+- **InfluxDB:** Parse data for table view to have parity with frontend parser. [#78365](https://github.com/grafana/grafana/issues/78365), [@itsmylife](https://github.com/itsmylife)
+- **FeatureToggle:** Disable `dashgpt` by default and mark it as preview. [#78348](https://github.com/grafana/grafana/issues/78348), [@ivanortegaalba](https://github.com/ivanortegaalba)
+- **Explore:** Fixes issue with adhoc filters when coming from dashboards. [#78339](https://github.com/grafana/grafana/issues/78339), [@torkelo](https://github.com/torkelo)
+- **SaveDashboardPrompt:** Reduce time to open drawer when many changes applied. [#78283](https://github.com/grafana/grafana/issues/78283), [@ivanortegaalba](https://github.com/ivanortegaalba)
+- **Elasticsearch:** Fix processing of raw_data with not-recognized time format. [#78262](https://github.com/grafana/grafana/issues/78262), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Alerting:** Fix deleting rules in a folder with matching UID in another organization. [#78258](https://github.com/grafana/grafana/issues/78258), [@papagian](https://github.com/papagian)
+- **Bug:** Fix broken ui components when angular is disabled. [#78208](https://github.com/grafana/grafana/issues/78208), [@jackw](https://github.com/jackw)
+- **Flamegraph:** Update threshold for collapsing and fix flickering. [#78206](https://github.com/grafana/grafana/issues/78206), [@aocenas](https://github.com/aocenas)
+- **Prometheus:** Fix calculating rate interval when there is no interval specified. [#78193](https://github.com/grafana/grafana/issues/78193), [@itsmylife](https://github.com/itsmylife)
+- **Variables:** Add support for aliasIDs to datasource variables (Fixes issue with Postgres datasource variables). [#78170](https://github.com/grafana/grafana/issues/78170), [@torkelo](https://github.com/torkelo)
+- **Explore:** Fix queries (cached & non) count in usage insights. [#78097](https://github.com/grafana/grafana/issues/78097), [@Elfo404](https://github.com/Elfo404)
+- **Dashboards:** Allow updating a dashboard if the user doesn't have access to the parent folder. [#78075](https://github.com/grafana/grafana/issues/78075), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **Loki:** Fix escaping in cheatsheet. [#78046](https://github.com/grafana/grafana/issues/78046), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Transformations:** Fix Timeseries to table transformation trend reduction when result is 0. [#78026](https://github.com/grafana/grafana/issues/78026), [@oserde](https://github.com/oserde)
+- **Alerting:** Fix export of notification policy to JSON. [#78021](https://github.com/grafana/grafana/issues/78021), [@rvillablanca](https://github.com/rvillablanca)
+- **Dashboards:** Fix dashboard listing when user can't list any folders. [#77983](https://github.com/grafana/grafana/issues/77983), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **Plugins:** Keep working when there is no internet access. [#77978](https://github.com/grafana/grafana/issues/77978), [@leventebalogh](https://github.com/leventebalogh)
+- **DashList:** Update variables in links when they change. [#77787](https://github.com/grafana/grafana/issues/77787), [@joshhunt](https://github.com/joshhunt)
+- **Alerting:** Disable cache in rktq when fetching export data. [#77678](https://github.com/grafana/grafana/issues/77678), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Alerting:** Fix export with modifications URL when mounted on subpath. [#77622](https://github.com/grafana/grafana/issues/77622), [@gillesdemey](https://github.com/gillesdemey)
+- **Dashboards:** Fix issue causing crashes when saving new dashboard. [#77620](https://github.com/grafana/grafana/issues/77620), [@kaydelaney](https://github.com/kaydelaney)
+- **Search:** Modify query for better performance. [#77576](https://github.com/grafana/grafana/issues/77576), [@papagian](https://github.com/papagian)
+- **CloudWatch Logs:** Add labels to alert and expression queries. [#77529](https://github.com/grafana/grafana/issues/77529), [@iwysiu](https://github.com/iwysiu)
+- **Explore:** Fix support for angular based datasource editors. [#77486](https://github.com/grafana/grafana/issues/77486), [@Elfo404](https://github.com/Elfo404)
+- **Tempo:** Fix support for `statusMessage`. [#77438](https://github.com/grafana/grafana/issues/77438), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **Plugins:** Fix status_source always being "plugin" in plugin request logs. [#77433](https://github.com/grafana/grafana/issues/77433), [@xnyo](https://github.com/xnyo)
+- **Bug Fix:** Respect data source version when provisioning. [#77428](https://github.com/grafana/grafana/issues/77428), [@andresmgot](https://github.com/andresmgot)
+- **Tempo:** Fix TraceQL autocompletion with missing `}`. [#77365](https://github.com/grafana/grafana/issues/77365), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **InfluxDB:** Fix parsing multiple tags on backend mode. [#77340](https://github.com/grafana/grafana/issues/77340), [@itsmylife](https://github.com/itsmylife)
+- **Alerting:** Apply negative matchers for route matching. [#77292](https://github.com/grafana/grafana/issues/77292), [@gillesdemey](https://github.com/gillesdemey)
+- **Explore:** Fix panes vertical scrollbar not being draggable. [#77284](https://github.com/grafana/grafana/issues/77284), [@Elfo404](https://github.com/Elfo404)
+- **Explore:** Avoid reinitializing graph on every query run. [#77281](https://github.com/grafana/grafana/issues/77281), [@Elfo404](https://github.com/Elfo404)
+- **Prometheus:** Fix $\_\_rate_interval calculation. [#77234](https://github.com/grafana/grafana/issues/77234), [@itsmylife](https://github.com/itsmylife)
+- **Organize fields transformation:** Fix re-ordering of fields using drag and drop. [#77172](https://github.com/grafana/grafana/issues/77172), [@adela-almasan](https://github.com/adela-almasan)
+- **Bug fix:** Correctly set permissions on provisioned dashboards. [#77155](https://github.com/grafana/grafana/issues/77155), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **InfluxDB:** Fix adhoc filter calls by properly checking optional parameter in metricFindQuery. [#77113](https://github.com/grafana/grafana/issues/77113), [@itsmylife](https://github.com/itsmylife)
+- **Alerting:** Fix NoRulesSplash being rendered for some seconds, faster creating a rule. [#77048](https://github.com/grafana/grafana/issues/77048), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **RBAC:** Allow scoping access to root level dashboards. [#76987](https://github.com/grafana/grafana/issues/76987), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **Alerting:** Dont show 1 firing series when no data in Expressions PreviewSummary. [#76981](https://github.com/grafana/grafana/issues/76981), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **InfluxDB:** Fix aliasing with $measurement or $m on backend mode. [#76917](https://github.com/grafana/grafana/issues/76917), [@itsmylife](https://github.com/itsmylife)
+- **InfluxDB:** Fix table parsing with backend mode. [#76899](https://github.com/grafana/grafana/issues/76899), [@itsmylife](https://github.com/itsmylife)
+- **NodeGraph:** Fix edges dataframe miscategorization. [#76842](https://github.com/grafana/grafana/issues/76842), [@lovasoa](https://github.com/lovasoa)
+- **Tooltip:** Ensure tooltip text is correctly announced by screenreaders. [#76683](https://github.com/grafana/grafana/issues/76683), [@ashharrison90](https://github.com/ashharrison90)
+- **Alerting:** Fix flaky SQLITE_BUSY when migrating with provisioned dashboards. [#76658](https://github.com/grafana/grafana/issues/76658), [@JacobsonMT](https://github.com/JacobsonMT)
+- **TraceView:** Fix cursor not matching visual guide in the timeline when resizing. [#76587](https://github.com/grafana/grafana/issues/76587), [@neel1996](https://github.com/neel1996)
+- **Search:** Fix empty folder details for nested folder items. [#76504](https://github.com/grafana/grafana/issues/76504), [@papagian](https://github.com/papagian)
+- **Alerting:** Alert rule constraint violations return as 400s in provisioning API. [#76396](https://github.com/grafana/grafana/issues/76396), [@alexweav](https://github.com/alexweav)
+- **A11y:** Fix no-static-element-interactions in xy chart editor. [#76170](https://github.com/grafana/grafana/issues/76170), [@chauchausoup](https://github.com/chauchausoup)
+- **Alerting:** Fix incorrect decoding for alert rules with % characters. [#76148](https://github.com/grafana/grafana/issues/76148), [@gillesdemey](https://github.com/gillesdemey)
+- **Chore:** Fix timeout issues when gathering prometheus datasource stats. [#74618](https://github.com/grafana/grafana/issues/74618), [@DanCech](https://github.com/DanCech)
+- **Recorded Queries:** Add org isolation (remote write target per org), and fix cross org Delete/List. (Enterprise)
+- **Auditing:** Fix missing action in alert manager routes. (Enterprise)
+- **Reporting:** Fix report not sent when creating / updating reports. (Enterprise)
+- **Recorded Queries:** Add org isolation (remote write target per org), and fix cross org Delete/List. (Enterprise)
+- **UsageInsights:** Disable frontend features when backend is disabled. (Enterprise)
+- **PresenceIndicators:** Do not retry failed views/recent API calls. (Enterprise)
+- **Analytics:** Use panel renderer rather than legacy flot graph. (Enterprise)
+- **Plugins:** Fix cloud plugins installer base url. (Enterprise)
+
+### Breaking changes
+
+In panels using the `extract fields` transformation, where one of the extracted names collides with one of the already existing fields, the extracted field will be renamed. Issue [#77569](https://github.com/grafana/grafana/issues/77569)
+
+For the existing backend mode users who have table visualization might see some inconsistencies on their panels. We have updated the table column naming. This will potentially affect field transformations and/or field overrides. To resolve this either:
+
+- Update transformation
+- Update field override Issue [#76899](https://github.com/grafana/grafana/issues/76899)
+
+For the existing backend mode users who have Transformations with the `time` field, **might** see their transformations are not working. Those panels that have broken transformations will fail to render. This is because we changed the field key. See related PR: https://github.com/grafana/grafana/pull/69865
+To resolve this either:
+
+- Remove the affected panel and re-create it
+- Select the `Time` field again
+- Edit the `time` field as `Time` for transformation in `panel.json` or `dashboard.json` Issue [#76641](https://github.com/grafana/grafana/issues/76641)
+
+The following data source permission endpoints have been removed:
+
+- `GET /datasources/:datasourceId/permissions`
+- `POST /api/datasources/:datasourceId/permissions`
+- `DELETE /datasources/:datasourceId/permissions`
+- `POST /datasources/:datasourceId/enable-permissions`
+- `POST /datasources/:datasourceId/disable-permissions`
+
+Please use the following endpoints instead:
+
+- `GET /api/access-control/datasources/:uid` for listing data source permissions
+- `POST /api/access-control/datasources/:uid/users/:id`, `POST /api/access-control/datasources/:uid/teams/:id` and `POST /api/access-control/datasources/:uid/buildInRoles/:id` for adding or removing data source permissions
+
+If you are using Terraform Grafana provider to manage data source permissions, you will need to upgrade your provider to [version 2.6.0](https://registry.terraform.io/providers/grafana/grafana/2.6.0/docs) or newer to ensure that data source permission provisioning keeps working.
+
+### Deprecations
+
+Since Grafana 10.2.3 we're deprecating the `showContextToggle` data source method. To signal support of Logs Context, it is enough to implement the `DataSourceWithLogsContextSupport` interface.
+
+**Which issue(s) does this PR fix?**:
+
+Fixes https://github.com/grafana/grafana/issues/66819
+Related with https://github.com/grafana/grafana/issues/73568 and https://github.com/grafana/grafana/issues/73565
+
+**Special notes for your reviewer:**
+
+There should be no function change with this deprecation. Issue [#77232](https://github.com/grafana/grafana/issues/77232)
+
+### Plugin development fixes & changes
+
+- **Grafana UI:** Add description to Menu component. [#77808](https://github.com/grafana/grafana/issues/77808), [@axelavargas](https://github.com/axelavargas)
+
+<!-- 10.2.3 END -->
+<!-- 10.2.2 START -->
+
+# 10.2.2 (2023-11-20)
+
+### Bug fixes
+
+- **FeatureToggle:** Disable `dashgpt` by default and mark it as preview. [#78349](https://github.com/grafana/grafana/issues/78349), [@ivanortegaalba](https://github.com/ivanortegaalba)
+- **SaveDashboardPrompt:** Reduce time to open drawer when many changes applied. [#78308](https://github.com/grafana/grafana/issues/78308), [@ivanortegaalba](https://github.com/ivanortegaalba)
+- **Alerting:** Fix export with modifications URL when mounted on subpath. [#78217](https://github.com/grafana/grafana/issues/78217), [@gillesdemey](https://github.com/gillesdemey)
+- **Explore:** Fix queries (cached & non) count in usage insights. [#78216](https://github.com/grafana/grafana/issues/78216), [@Elfo404](https://github.com/Elfo404)
+- **Plugins:** Keep working when there is no internet access. [#78092](https://github.com/grafana/grafana/issues/78092), [@leventebalogh](https://github.com/leventebalogh)
+
+<!-- 10.2.2 END -->
+<!-- 10.2.1 START -->
+
+# 10.2.1 (2023-11-13)
+
+### Features and enhancements
+
+- **Stat:** Add panel option to control wide layout. [#78012](https://github.com/grafana/grafana/issues/78012), [@nmarrs](https://github.com/nmarrs)
+
+### Bug fixes
+
+- **Dashboards:** Fix dashboard listing when user can't list any folders. [#77988](https://github.com/grafana/grafana/issues/77988), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **Search:** Modify query for better performance. [#77713](https://github.com/grafana/grafana/issues/77713), [@papagian](https://github.com/papagian)
+- **Dashboards:** Fix issue causing crashes when saving new dashboard. [#77641](https://github.com/grafana/grafana/issues/77641), [@kaydelaney](https://github.com/kaydelaney)
+- **RBAC:** Allow scoping access to root level dashboards. [#77608](https://github.com/grafana/grafana/issues/77608), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **CloudWatch Logs:** Add labels to alert and expression queries. [#77594](https://github.com/grafana/grafana/issues/77594), [@iwysiu](https://github.com/iwysiu)
+- **Bug Fix:** Respect data source version when provisioning. [#77542](https://github.com/grafana/grafana/issues/77542), [@andresmgot](https://github.com/andresmgot)
+- **Explore:** Fix support for angular based datasource editors. [#77505](https://github.com/grafana/grafana/issues/77505), [@Elfo404](https://github.com/Elfo404)
+- **Plugins:** Fix status_source always being "plugin" in plugin request logs. [#77436](https://github.com/grafana/grafana/issues/77436), [@xnyo](https://github.com/xnyo)
+- **InfluxDB:** Fix aliasing with $measurement or $m on backend mode. [#77383](https://github.com/grafana/grafana/issues/77383), [@itsmylife](https://github.com/itsmylife)
+- **InfluxDB:** Fix parsing multiple tags on backend mode. [#77382](https://github.com/grafana/grafana/issues/77382), [@itsmylife](https://github.com/itsmylife)
+- **Explore:** Fix panes vertical scrollbar not being draggable. [#77344](https://github.com/grafana/grafana/issues/77344), [@Elfo404](https://github.com/Elfo404)
+- **Explore:** Avoid reinitializing graph on every query run. [#77290](https://github.com/grafana/grafana/issues/77290), [@Elfo404](https://github.com/Elfo404)
+- **Bug fix:** Correctly set permissions on provisioned dashboards. [#77230](https://github.com/grafana/grafana/issues/77230), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **InfluxDB:** Fix adhoc filter calls by properly checking optional parameter in metricFindQuery. [#77145](https://github.com/grafana/grafana/issues/77145), [@itsmylife](https://github.com/itsmylife)
+- **InfluxDB:** Fix table parsing with backend mode. [#76990](https://github.com/grafana/grafana/issues/76990), [@itsmylife](https://github.com/itsmylife)
+- **Alerting:** Alert rule constraint violations return as 400s in provisioning API. [#76978](https://github.com/grafana/grafana/issues/76978), [@alexweav](https://github.com/alexweav)
+- **PresenceIndicators:** Do not retry failed views/recent API calls. (Enterprise)
+- **Analytics:** Use panel renderer rather than legacy flot graph. (Enterprise)
+
+### Breaking changes
+
+For the existing backend mode users who have table visualization might see some inconsistencies on their panels. We have updated the table column naming. This will potentially affect field transformations and/or field overrides. To resolve this either:
+
+- Update transformation
+- Update field override Issue [#76990](https://github.com/grafana/grafana/issues/76990)
+
+<!-- 10.2.1 END -->
 <!-- 10.2.0 START -->
 
 # 10.2.0 (2023-10-24)
@@ -249,7 +1312,7 @@
 - **Pyroscope:** Fix error when no profile types are returned. [#75143](https://github.com/grafana/grafana/issues/75143), [@aocenas](https://github.com/aocenas)
 - **BarChart:** Axes centered zero, borders, and colors. [#75136](https://github.com/grafana/grafana/issues/75136), [@leeoniya](https://github.com/leeoniya)
 - **Plugins:** Refresh plugin info after installation. [#75074](https://github.com/grafana/grafana/issues/75074), [@oshirohugo](https://github.com/oshirohugo)
-- **LDAP:** FIX Enable users on successfull login . [#75073](https://github.com/grafana/grafana/issues/75073), [@gamab](https://github.com/gamab)
+- **LDAP:** FIX Enable users on successful login . [#75073](https://github.com/grafana/grafana/issues/75073), [@gamab](https://github.com/gamab)
 - **XYChart:** Fix numerous axis options. [#75044](https://github.com/grafana/grafana/issues/75044), [@leeoniya](https://github.com/leeoniya)
 - **Trace View:** Remove "deployment.environment" default traces 2 logs tag. [#74986](https://github.com/grafana/grafana/issues/74986), [@domasx2](https://github.com/domasx2)
 - **Snapshots:** Use appUrl on snapshot list page. [#74944](https://github.com/grafana/grafana/issues/74944), [@evictorero](https://github.com/evictorero)
@@ -319,6 +1382,57 @@ Starting with 10.2, `parentRowIndex` is deprecated. It will be removed in a futu
 - **Drawer:** Make content scroll by default. [#75287](https://github.com/grafana/grafana/issues/75287), [@ashharrison90](https://github.com/ashharrison90)
 
 <!-- 10.2.0 END -->
+<!-- 10.1.9 START -->
+
+# 10.1.9 (2024-03-25)
+
+### Bug fixes
+
+- **Snapshots:** Require delete within same org (backport). [#84765](https://github.com/grafana/grafana/issues/84765), [@ryantxu](https://github.com/ryantxu)
+
+<!-- 10.1.9 END -->
+<!-- 10.1.8 START -->
+
+# 10.1.8 (2024-03-06)
+
+### Bug fixes
+
+- **Auth:** Fix email verification bypass when using basic authentication. [#83492](https://github.com/grafana/grafana/issues/83492)
+
+<!-- 10.1.8 END -->
+<!-- 10.1.7 START -->
+
+# 10.1.7 (2024-01-29)
+
+### Bug fixes
+
+- **Annotations:** Split cleanup into separate queries and deletes to avoid deadlocks on MySQL. [#80678](https://github.com/grafana/grafana/issues/80678), [@alexweav](https://github.com/alexweav)
+
+<!-- 10.1.7 END -->
+<!-- 10.1.6 START -->
+
+# 10.1.6 (2023-12-18)
+
+### Features and enhancements
+
+- **Alerting:** Attempt to retry retryable errors. [#79211](https://github.com/grafana/grafana/issues/79211), [@gotjosh](https://github.com/gotjosh)
+- **Unified Alerting:** Set `max_attempts` to 1 by default. [#79102](https://github.com/grafana/grafana/issues/79102), [@gotjosh](https://github.com/gotjosh)
+
+### Bug fixes
+
+- **Alerting:** Fix deleting rules in a folder with matching UID in another organization. [#79007](https://github.com/grafana/grafana/issues/79007), [@papagian](https://github.com/papagian)
+- **Chore:** Fix timeout issues when gathering prometheus datasource stats. [#78858](https://github.com/grafana/grafana/issues/78858), [@DanCech](https://github.com/DanCech)
+- **Provisioning:** Ensure that enterprise provisioning runs [10.1.x]. [#76686](https://github.com/grafana/grafana/issues/76686), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **Alerting:** Make shareable alert rule link work if rule name contains forward slashes. [#75950](https://github.com/grafana/grafana/issues/75950), [@domasx2](https://github.com/domasx2)
+- **Loki:** Cache extracted labels. [#75905](https://github.com/grafana/grafana/issues/75905), [@gtk-grafana](https://github.com/gtk-grafana)
+- **DataSourcePicker:** Disable autocomplete for the search input . [#75900](https://github.com/grafana/grafana/issues/75900), [@ivanortegaalba](https://github.com/ivanortegaalba)
+- **Plugins:** Refresh plugin info after installation. [#75225](https://github.com/grafana/grafana/issues/75225), [@oshirohugo](https://github.com/oshirohugo)
+- **LDAP:** FIX Enable users on successful login . [#75176](https://github.com/grafana/grafana/issues/75176), [@gamab](https://github.com/gamab)
+- **Loki:** Fix filters not being added with multiple expressions and parsers. [#75172](https://github.com/grafana/grafana/issues/75172), [@svennergr](https://github.com/svennergr)
+- **Recorded Queries:** Add org isolation (remote write target per org), and fix cross org Delete/List. (Enterprise)
+- **Auditing and UsageInsights:** FIX Loki configuration to use proxy env variables. (Enterprise)
+
+<!-- 10.1.6 END -->
 <!-- 10.1.5 START -->
 
 # 10.1.5 (2023-10-11)
@@ -421,7 +1535,7 @@ Starting with 10.2, `parentRowIndex` is deprecated. It will be removed in a futu
 - **Geomap:** Promote route + photos layer to beta, promote geojson layer to stable. [#72233](https://github.com/grafana/grafana/issues/72233), [@nmarrs](https://github.com/nmarrs)
 - **Dashboards:** Add Angular deprecation alert in data source query editor. [#72211](https://github.com/grafana/grafana/issues/72211), [@xnyo](https://github.com/xnyo)
 - **Auth:** Lock organization roles for users who are managed through an external auth provider. [#72204](https://github.com/grafana/grafana/issues/72204), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
-- **Tranformations:** True OUTER JOIN in the join by field transformation used for tabular data . [#72176](https://github.com/grafana/grafana/issues/72176), [@bohandley](https://github.com/bohandley)
+- **Transformations:** True OUTER JOIN in the join by field transformation used for tabular data . [#72176](https://github.com/grafana/grafana/issues/72176), [@bohandley](https://github.com/bohandley)
 - **NestedFolders:** Enable new nested folder picker by default for nested folders. [#72129](https://github.com/grafana/grafana/issues/72129), [@joshhunt](https://github.com/joshhunt)
 - **Alerting:** Add dashboardUID and panelID query parameters for loki state history. [#72119](https://github.com/grafana/grafana/issues/72119), [@alexweav](https://github.com/alexweav)
 - **Feature toggles management:** Define get feature toggles api. [#72106](https://github.com/grafana/grafana/issues/72106), [@jcalisto](https://github.com/jcalisto)
@@ -437,7 +1551,7 @@ Starting with 10.2, `parentRowIndex` is deprecated. It will be removed in a futu
 - **Plugin:** Remove error on invalid version. [#71951](https://github.com/grafana/grafana/issues/71951), [@oshirohugo](https://github.com/oshirohugo)
 - **Traces:** Enable showing trace ids. [#71950](https://github.com/grafana/grafana/issues/71950), [@gabor](https://github.com/gabor)
 - **RBAC:** Split non-empty scopes into `kind`, `attribute` and `identifier` fields for better search performance. [#71933](https://github.com/grafana/grafana/issues/71933), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
-- **Adminstration:** Feature toggle for feature toggle admin page. [#71887](https://github.com/grafana/grafana/issues/71887), [@IbrahimCSAE](https://github.com/IbrahimCSAE)
+- **Administration:** Feature toggle for feature toggle admin page. [#71887](https://github.com/grafana/grafana/issues/71887), [@IbrahimCSAE](https://github.com/IbrahimCSAE)
 - **Alerting:** Improve performance of matching captures. [#71828](https://github.com/grafana/grafana/issues/71828), [@grobinson-grafana](https://github.com/grobinson-grafana)
 - **CommandPalette:** Remove parent search and fuzzy search for pages. [#71825](https://github.com/grafana/grafana/issues/71825), [@tskarhed](https://github.com/tskarhed)
 - **Tracing:** Remove newTraceViewHeader feature toggle. [#71818](https://github.com/grafana/grafana/issues/71818), [@joey-grafana](https://github.com/joey-grafana)
@@ -488,7 +1602,7 @@ Starting with 10.2, `parentRowIndex` is deprecated. It will be removed in a futu
 - **Login:** Adjust error message when user exceed login attempts. [#70736](https://github.com/grafana/grafana/issues/70736), [@RoxanaAnamariaTurc](https://github.com/RoxanaAnamariaTurc)
 - **Nested folders:** Paginate child folder items. [#70730](https://github.com/grafana/grafana/issues/70730), [@ashharrison90](https://github.com/ashharrison90)
 - **Units:** Add events/messages/records/rows throughput units. [#70726](https://github.com/grafana/grafana/issues/70726), [@hhromic](https://github.com/hhromic)
-- **Plugins:** Enable feature toggles for long running queries by deafult. [#70678](https://github.com/grafana/grafana/issues/70678), [@idastambuk](https://github.com/idastambuk)
+- **Plugins:** Enable feature toggles for long running queries by default. [#70678](https://github.com/grafana/grafana/issues/70678), [@idastambuk](https://github.com/idastambuk)
 - **I18n:** Translate phrases for new Browse Dashboards. [#70654](https://github.com/grafana/grafana/issues/70654), [@Bohdanator](https://github.com/Bohdanator)
 - **Flamegraph:** Prevent cropping of tooltip by bottom of the viewport. [#70633](https://github.com/grafana/grafana/issues/70633), [@aocenas](https://github.com/aocenas)
 - **Pyroscope:** Preselect default profile type or app in the query editor dropdown. [#70624](https://github.com/grafana/grafana/issues/70624), [@aocenas](https://github.com/aocenas)
@@ -514,7 +1628,7 @@ Starting with 10.2, `parentRowIndex` is deprecated. It will be removed in a futu
 - **Geomap:** Add network layer. [#70192](https://github.com/grafana/grafana/issues/70192), [@drew08t](https://github.com/drew08t)
 - **Alerting:** Bump grafana/alerting and refactor the ImageStore/Provider to provide image URL/bytes. [#70182](https://github.com/grafana/grafana/issues/70182), [@santihernandezc](https://github.com/santihernandezc)
 - **Auth:** Support google OIDC and group fetching. [#70140](https://github.com/grafana/grafana/issues/70140), [@Jguer](https://github.com/Jguer)
-- **Alerting:** Make QueryEditor not collapsable. [#70112](https://github.com/grafana/grafana/issues/70112), [@VikaCep](https://github.com/VikaCep)
+- **Alerting:** Make QueryEditor not collapsible. [#70112](https://github.com/grafana/grafana/issues/70112), [@VikaCep](https://github.com/VikaCep)
 - **TimeSeries:** Add option to disconnect values. [#70097](https://github.com/grafana/grafana/issues/70097), [@drew08t](https://github.com/drew08t)
 - **Logs:** Add toggle behavior support for "filter for" and "filter out" label within Logs Details. [#70091](https://github.com/grafana/grafana/issues/70091), [@matyax](https://github.com/matyax)
 - **Plugins:** Periodically update public signing key. [#70080](https://github.com/grafana/grafana/issues/70080), [@andresmgot](https://github.com/andresmgot)
@@ -796,6 +1910,47 @@ Starting with 10.0, changing the folder UID is deprecated. It will be removed in
 - **Grafana/ui:** Fix margin in RadioButtonGroup option when only icon is present. [#68899](https://github.com/grafana/grafana/issues/68899), [@aocenas](https://github.com/aocenas)
 
 <!-- 10.1.0 END -->
+<!-- 10.0.13 START -->
+
+# 10.0.13 (2024-03-25)
+
+### Bug fixes
+
+- **Snapshots:** Require delete within same org (backport). [#84764](https://github.com/grafana/grafana/issues/84764), [@ryantxu](https://github.com/ryantxu)
+
+<!-- 10.0.13 END -->
+<!-- 10.0.12 START -->
+
+# 10.0.12 (2024-03-06)
+
+### Bug fixes
+
+- **Auth:** Fix email verification bypass when using basic authentication. [#83493](https://github.com/grafana/grafana/issues/83493)
+
+<!-- 10.0.12 END -->
+<!-- 10.0.11 START -->
+
+# 10.0.11 (2024-01-29)
+
+### Bug fixes
+
+- **Annotations:** Split cleanup into separate queries and deletes to avoid deadlocks on MySQL. [#80681](https://github.com/grafana/grafana/issues/80681), [@alexweav](https://github.com/alexweav)
+
+<!-- 10.0.11 END -->
+<!-- 10.0.10 START -->
+
+# 10.0.10 (2023-12-18)
+
+### Features and enhancements
+
+- **Alerting:** Attempt to retry retryable errors. [#79210](https://github.com/grafana/grafana/issues/79210), [@gotjosh](https://github.com/gotjosh)
+- **Unified Alerting:** Set `max_attempts` to 1 by default. [#79101](https://github.com/grafana/grafana/issues/79101), [@gotjosh](https://github.com/gotjosh)
+
+### Bug fixes
+
+- **Recorded Queries:** Add org isolation (remote write target per org), and fix cross org Delete/List. (Enterprise)
+
+<!-- 10.0.10 END -->
 <!-- 10.0.9 START -->
 
 # 10.0.9 (2023-10-11)
@@ -1314,6 +2469,64 @@ The `database` field has been deprecated in the Elasticsearch datasource provisi
 - **InteractiveTable:** Updated design and minor tweak to Correlactions page. [#66443](https://github.com/grafana/grafana/issues/66443), [@torkelo](https://github.com/torkelo)
 
 <!-- 10.0.0-preview END -->
+<!-- 9.5.18 START -->
+
+# 9.5.18 (2024-03-25)
+
+### Bug fixes
+
+- **Snapshots:** Require delete within same org (backport). [#84762](https://github.com/grafana/grafana/issues/84762), [@ryantxu](https://github.com/ryantxu)
+
+<!-- 9.5.18 END -->
+<!-- 9.5.17 START -->
+
+# 9.5.17 (2024-03-05)
+
+### Features and enhancements
+
+- Bump go-git to v5.11.0. [#83711](https://github.com/grafana/grafana/issues/83711), [@papagian](https://github.com/papagian)
+- **Plugins:** Bump otelgrpc instrumentation to 0.47.0. [#83674](https://github.com/grafana/grafana/issues/83674), [@wbrowne](https://github.com/wbrowne)
+
+### Bug fixes
+
+- **Auth:** Fix email verification bypass when using basic authentication. [#83494](https://github.com/grafana/grafana/issues/83494)
+
+<!-- 9.5.17 END -->
+<!-- 9.5.16 START -->
+
+# 9.5.16 (2024-01-29)
+
+### Bug fixes
+
+- **Annotations:** Split cleanup into separate queries and deletes to avoid deadlocks on MySQL. [#80682](https://github.com/grafana/grafana/issues/80682), [@alexweav](https://github.com/alexweav)
+
+<!-- 9.5.16 END -->
+<!-- 9.5.15 START -->
+
+# 9.5.15 (2023-12-18)
+
+### Features and enhancements
+
+- **Alerting:** Attempt to retry retryable errors. [#79209](https://github.com/grafana/grafana/issues/79209), [@gotjosh](https://github.com/gotjosh)
+- **Unified Alerting:** Set to 1 by default. [#79109](https://github.com/grafana/grafana/issues/79109), [@gotjosh](https://github.com/gotjosh)
+
+### Bug fixes
+
+- **Recorded Queries:** Add org isolation (remote write target per org), and fix cross org Delete/List. (Enterprise)
+
+<!-- 9.5.15 END -->
+<!-- 9.5.14 START -->
+
+# 9.5.14 (2023-11-13)
+
+### Bug fixes
+
+- **Alerting:** Fix state manager to not keep datasource_uid and ref_id labels in state after Error. [#77391](https://github.com/grafana/grafana/issues/77391), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Transformations:** Config overrides being lost when config from query transform is applied. [#75347](https://github.com/grafana/grafana/issues/75347), [@IbrahimCSAE](https://github.com/IbrahimCSAE)
+- **LDAP:** FIX Enable users on successful login . [#75192](https://github.com/grafana/grafana/issues/75192), [@gamab](https://github.com/gamab)
+- **Auditing and UsageInsights:** FIX Loki configuration to use proxy env variables. (Enterprise)
+
+<!-- 9.5.14 END -->
 <!-- 9.5.13 START -->
 
 # 9.5.13 (2023-10-11)
diff --git a/Dockerfile b/Dockerfile
index 3e558c6c6ce91..c653350e9ad2b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
 # syntax=docker/dockerfile:1
 
-ARG BASE_IMAGE=alpine:3.18.3
-ARG JS_IMAGE=node:20-alpine3.18
+ARG BASE_IMAGE=alpine:3.19.1
+ARG JS_IMAGE=node:20-alpine
 ARG JS_PLATFORM=linux/amd64
-ARG GO_IMAGE=golang:1.20.10-alpine3.18
+ARG GO_IMAGE=golang:1.22.3-alpine
 
 ARG GO_SRC=go-builder
 ARG JS_SRC=js-builder
@@ -14,16 +14,18 @@ ENV NODE_OPTIONS=--max_old_space_size=8000
 
 WORKDIR /tmp/grafana
 
-COPY package.json yarn.lock .yarnrc.yml ./
+COPY package.json project.json nx.json yarn.lock .yarnrc.yml ./
 COPY .yarn .yarn
 COPY packages packages
 COPY plugins-bundled plugins-bundled
 COPY public public
+COPY LICENSE ./
+
+RUN apk add --no-cache make build-base python3
 
 RUN yarn install --immutable
 
-COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js babel.config.json ./
-COPY public public
+COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js ./
 COPY scripts scripts
 COPY emails emails
 
@@ -38,9 +40,12 @@ ARG GO_BUILD_TAGS="oss"
 ARG WIRE_TAGS="oss"
 ARG BINGO="true"
 
-# Install build dependencies
 RUN if grep -i -q alpine /etc/issue; then \
-      apk add --no-cache gcc g++ make git; \
+      apk add --no-cache \
+          # This is required to allow building on arm64 due to https://github.com/golang/go/issues/22040
+          binutils-gold \
+          # Install build dependencies
+          gcc g++ make git; \
     fi
 
 WORKDIR /tmp/grafana
@@ -48,6 +53,13 @@ WORKDIR /tmp/grafana
 COPY go.* ./
 COPY .bingo .bingo
 
+# Include vendored dependencies
+COPY pkg/util/xorm/go.* pkg/util/xorm/
+COPY pkg/apiserver/go.* pkg/apiserver/
+COPY pkg/apimachinery/go.* pkg/apimachinery/
+COPY pkg/build/wire/go.* pkg/build/wire/
+COPY pkg/promlib/go.* pkg/promlib/
+
 RUN go mod download
 RUN if [[ "$BINGO" = "true" ]]; then \
       go install github.com/bwplotka/bingo@latest && \
@@ -65,7 +77,6 @@ COPY pkg pkg
 COPY scripts scripts
 COPY conf conf
 COPY .github .github
-COPY LICENSE ./
 
 ENV COMMIT_SHA=${COMMIT_SHA}
 ENV BUILD_BRANCH=${BUILD_BRANCH}
@@ -167,7 +178,7 @@ RUN if [ ! $(getent group "$GF_GID") ]; then \
 
 COPY --from=go-src /tmp/grafana/bin/grafana* /tmp/grafana/bin/*/grafana* ./bin/
 COPY --from=js-src /tmp/grafana/public ./public
-COPY --from=go-src /tmp/grafana/LICENSE ./
+COPY --from=js-src /tmp/grafana/LICENSE ./
 
 EXPOSE 3000
 
@@ -176,4 +187,4 @@ ARG RUN_SH=./packaging/docker/run.sh
 COPY ${RUN_SH} /run.sh
 
 USER "$GF_UID"
-ENTRYPOINT [ "/run.sh" ]
+ENTRYPOINT [ "/run.sh" ]
\ No newline at end of file
diff --git a/GOVERNANCE.md b/GOVERNANCE.md
index def47f1a1c15f..ff129a8755770 100644
--- a/GOVERNANCE.md
+++ b/GOVERNANCE.md
@@ -173,7 +173,7 @@ Supermajority votes must be called explicitly in a separate thread on the approp
 
 Votes may take the form of a single proposal, with the option to vote yes or no, or the form of multiple alternatives.
 
-A vote on a single proposal is considered successful if at least two thirds of those eligible to vote vote in favor.
+A vote on a single proposal is considered successful if at least two thirds of those eligible to vote in favor.
 
 If there are multiple alternatives, members may vote for one or more alternatives, or vote “no” to object to all alternatives. A vote on multiple alternatives is considered decided in favor of one alternative if it has received the most votes in favor, and a vote from at least two thirds of those eligible to vote. Should no alternative reach this quorum, another vote on a reduced number of options may be called separately.
 
diff --git a/HALL_OF_FAME.md b/HALL_OF_FAME.md
index 18fd83f6c2103..f895045493067 100644
--- a/HALL_OF_FAME.md
+++ b/HALL_OF_FAME.md
@@ -2,4 +2,4 @@
 
 List of previous team members that have had a big impact on the company or the product and contributed during a long period of time.
 
-- Hugo Häggmark ([School of applied technology](https://salt.study))
+- Hugo Häggmark ([Björn Lundén](https://www.bjornlunden.se/))
diff --git a/LICENSING.md b/LICENSING.md
index f8bfef7f94585..97f2c53d8e759 100644
--- a/LICENSING.md
+++ b/LICENSING.md
@@ -18,7 +18,7 @@ packaging/
 kinds/
 pkg/kinds/
 pkg/kindsys/
-pkg/registry/corekind/
+pkg/registry/schemas/
 grafana-mixin/
 public/app/plugins/datasource/tempo
 public/app/features/explore/TraceView/components
diff --git a/Makefile b/Makefile
index d26b3b4a1a2c8..0eb0e538572f1 100644
--- a/Makefile
+++ b/Makefile
@@ -7,10 +7,10 @@ WIRE_TAGS = "oss"
 -include local/Makefile
 include .bingo/Variables.mk
 
-.PHONY: all deps-go deps-js deps build-go build-backend build-server build-cli build-js build build-docker-full build-docker-full-ubuntu lint-go golangci-lint test-go test-js gen-ts test run run-frontend clean devenv devenv-down protobuf drone help gen-go gen-cue fix-cue
+.PHONY: all deps-go deps-js deps build-go build-backend build-server build-cli build-js build build-docker-full build-docker-full-ubuntu lint-go golangci-lint test-go test-js gen-ts test run run-frontend clean devenv devenv-down protobuf drone help gen-go gen-cue fix-cue gen-feature-toggles
 
 GO = go
-GO_FILES ?= ./pkg/...
+GO_FILES ?= ./pkg/... ./pkg/apiserver/... ./pkg/apimachinery/... ./pkg/promlib/...
 SH_FILES ?= $(shell find ./scripts -name *.sh)
 GO_BUILD_FLAGS += $(if $(GO_BUILD_DEV),-dev)
 GO_BUILD_FLAGS += $(if $(GO_BUILD_TAGS),-build-tags=$(GO_BUILD_TAGS))
@@ -45,12 +45,12 @@ $(NGALERT_SPEC_TARGET):
 
 $(MERGED_SPEC_TARGET): swagger-oss-gen swagger-enterprise-gen $(NGALERT_SPEC_TARGET) $(SWAGGER) ## Merge generated and ngalert API specs
 	# known conflicts DsPermissionType, AddApiKeyCommand, Json, Duration (identical models referenced by both specs)
-	$(SWAGGER) mixin $(SPEC_TARGET) $(ENTERPRISE_SPEC_TARGET) $(NGALERT_SPEC_TARGET) --ignore-conflicts -o $(MERGED_SPEC_TARGET)
+	$(SWAGGER) mixin -q $(SPEC_TARGET) $(ENTERPRISE_SPEC_TARGET) $(NGALERT_SPEC_TARGET) --ignore-conflicts -o $(MERGED_SPEC_TARGET)
 
 swagger-oss-gen: $(SWAGGER) ## Generate API Swagger specification
 	@echo "re-generating swagger for OSS"
 	rm -f $(SPEC_TARGET)
-	SWAGGER_GENERATE_EXTENSION=false $(SWAGGER) generate spec -m -w pkg/server -o $(SPEC_TARGET) \
+	SWAGGER_GENERATE_EXTENSION=false $(SWAGGER) generate spec -q -m -w pkg/server -o $(SPEC_TARGET) \
 	-x "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" \
 	-x "github.com/prometheus/alertmanager" \
 	-i pkg/api/swagger_tags.json \
@@ -66,7 +66,7 @@ else
 swagger-enterprise-gen: $(SWAGGER) ## Generate API Swagger specification
 	@echo "re-generating swagger for enterprise"
 	rm -f $(ENTERPRISE_SPEC_TARGET)
-	SWAGGER_GENERATE_EXTENSION=false $(SWAGGER) generate spec -m -w pkg/server -o $(ENTERPRISE_SPEC_TARGET) \
+	SWAGGER_GENERATE_EXTENSION=false $(SWAGGER) generate spec -q -m -w pkg/server -o $(ENTERPRISE_SPEC_TARGET) \
 	-x "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" \
 	-x "github.com/prometheus/alertmanager" \
 	-i pkg/api/swagger_tags.json \
@@ -77,7 +77,7 @@ endif
 swagger-gen: gen-go $(MERGED_SPEC_TARGET) swagger-validate
 
 swagger-validate: $(MERGED_SPEC_TARGET) $(SWAGGER) ## Validate API spec
-	$(SWAGGER) validate $(<)
+	$(SWAGGER) validate --skip-warnings $(<)
 
 swagger-clean:
 	rm -f $(SPEC_TARGET) $(MERGED_SPEC_TARGET) $(OAPI_SPEC_TARGET)
@@ -103,14 +103,23 @@ openapi3-gen: swagger-gen ## Generates OpenApi 3 specs from the Swagger 2 alread
 ##@ Building
 gen-cue: ## Do all CUE/Thema code generation
 	@echo "generate code from .cue files"
-	go generate ./pkg/plugins/plugindef
 	go generate ./kinds/gen.go
 	go generate ./public/app/plugins/gen.go
-	go generate ./pkg/kindsysreport/codegen/report.go
 
-gen-go: $(WIRE)
+gen-feature-toggles:
+## First go test run fails because it will re-generate the feature toggles.
+## Second go test run will compare the generated files and pass.
+	@echo "generate feature toggles"
+	go test -v ./pkg/services/featuremgmt/... > /dev/null 2>&1; \
+	if [ $$? -eq 0 ]; then \
+		echo "feature toggles already up-to-date"; \
+	else \
+		go test -v ./pkg/services/featuremgmt/...; \
+	fi
+
+gen-go:
 	@echo "generate go files"
-	$(WIRE) gen -tags $(WIRE_TAGS) ./pkg/server
+	$(GO) run ./pkg/build/wire/cmd/wire/main.go gen -tags $(WIRE_TAGS) ./pkg/server
 
 fix-cue: $(CUE)
 	@echo "formatting cue files"
@@ -141,11 +150,6 @@ build-js: ## Build frontend assets.
 	yarn run build
 	yarn run plugins:build-bundled
 
-build-plugins-go: ## Build decoupled plugins
-	@echo "build plugins"
-	@cd pkg/tsdb; \
-	mage -v
-
 PLUGIN_ID ?=
 
 build-plugin-go: ## Build decoupled plugins
@@ -173,7 +177,8 @@ test-go: test-go-unit test-go-integration
 .PHONY: test-go-unit
 test-go-unit: ## Run unit tests for backend with flags.
 	@echo "test backend unit tests"
-	$(GO) test -short -covermode=atomic -timeout=30m ./pkg/...
+	go list -f '{{.Dir}}/...' -m | xargs \
+	$(GO) test -short -covermode=atomic -timeout=30m
 
 .PHONY: test-go-integration
 test-go-integration: ## Run integration tests for backend with flags.
@@ -184,8 +189,8 @@ test-go-integration: ## Run integration tests for backend with flags.
 test-go-integration-alertmanager: ## Run integration tests for the remote alertmanager (config taken from the mimir_backend block).
 	@echo "test remote alertmanager integration tests"
 	$(GO) clean -testcache
-	AM_URL=http://localhost:8080 AM_TENANT_ID=test AM_PASSWORD=test \
-	$(GO) test -count=1 -run "^TestIntegrationRemoteAlertmanager" -covermode=atomic -timeout=5m ./pkg/services/ngalert/notifier/...
+	AM_URL=http://localhost:8080 AM_TENANT_ID=test \
+	$(GO) test -count=1 -run "^TestIntegrationRemoteAlertmanager" -covermode=atomic -timeout=5m ./pkg/services/ngalert/...
 
 .PHONY: test-go-integration-postgres
 test-go-integration-postgres: devenv-postgres ## Run integration tests for postgres backend with flags.
@@ -261,7 +266,7 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
 	--build-arg COMMIT_SHA=$$(git rev-parse HEAD) \
 	--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
 	--build-arg BASE_IMAGE=ubuntu:22.04 \
-	--build-arg GO_IMAGE=golang:1.20.10 \
+	--build-arg GO_IMAGE=golang:1.21.10 \
 	--tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \
 	$(DOCKER_BUILD_ARGS)
 
@@ -308,7 +313,6 @@ protobuf: ## Compile protobuf definitions
 	bash pkg/plugins/backendplugin/pluginextensionv2/generate.sh
 	bash pkg/plugins/backendplugin/secretsmanagerplugin/generate.sh
 	bash pkg/services/store/entity/generate.sh
-	bash pkg/infra/grn/generate.sh
 
 clean: ## Clean up intermediate build artifacts.
 	@echo "cleaning"
@@ -325,6 +329,7 @@ gen-ts:
 # Use this make target to regenerate the configuration YAML files when
 # you modify starlark files.
 drone: $(DRONE)
+	bash scripts/drone/env-var-check.sh
 	$(DRONE) starlark --format
 	$(DRONE) lint .drone.yml --trusted
 	$(DRONE) --server https://drone.grafana.net sign --save grafana/grafana
diff --git a/README-PSIPHON.md b/README-PSIPHON.md
new file mode 100644
index 0000000000000..1e92e27b0dafc
--- /dev/null
+++ b/README-PSIPHON.md
@@ -0,0 +1,77 @@
+# Psiphon Changes
+
+## List of Changes
+
+This is a summary of the Psiphon specific content changes.
+
+### Change default theme from dark to light
+
+- Remove conf/custom.ini from the .gitignore because we need the custom config to be used for changing the default theme from dark to light.
+- Add a conf/custom.ini which sets the default theme to light.
+- Remove theme change radio buttons from user preferences form.
+- Remove theme change option from nav menu.
+
+### Add custom Psiphon content to email templates
+
+- Remove "Grafana" specific content from email mjml and txt template files.
+- Add Psiphon/PDE specific content to email mjml and txt template files.
+- Replace Grafana logo with Psiphon logo in email header.
+- Generate corresponding new emails.
+
+### Add Psiphon colors and branding to website
+
+- Add Psiphon theme colors to a custom color file.
+- Import custom Psiphon orange colors into color palette files.
+- Add Psiphon orange colors as "primary" colors for theme color file.
+- Replace Grafana orange with Psiphon orange where it is used as an accent color throughout website.
+- Replace Grafana gradients with Psiphon orange where used as accent colors.
+- Change Favicon, appletouchicon, to Psiphon logos.
+- Change app name to Psiphon.
+- Add PDE logo as main website header logo, update sizing so it fits properly on page.
+- Change content that refers to the application as "Grafana" to "Psiphon" or "PDE".
+- Add generated scss file.
+
+### Add Psiphon branding to login page
+
+- Use Psiphon logo on login page instead of Grafana logo .
+- Use custom background image on login page.
+- Remove Grafana welcome message on login page.
+- Change App Title on login page to 'Psiphon Data Engine' instead of Grafana.
+- Remove footer links from login page.
+- Remove overlay box that doesn't work with light background to look better with our custom content.
+- Shift login box higher up on page so it looks better with background image.
+
+### Change website functionality for our requirements
+
+- Remove time range options that we don't want available.
+- Limit access to "Dashboards" option in menu to admins and editors only.
+- Remove "Help" links in nav for all users.
+- In conf/custom.ini set the news feed option to false to hide the news feed
+- Hide menu toggle option for users that are not admin or editor.
+- Hide search bar for users that are not admin or editor.
+- Update home.json file to our custom home.json file.
+
+## Upgrading
+
+These instructions will help you to upgrade to a newer version of Grafana while keeping the custom Psiphon changes.
+
+1. Decide on the release tag you would like to upgrade to from the Grafana repository.
+2. Clone the Grafana project from https://github.com/grafana/grafana and checkout the tag for the version you would like to upgrade to. For example `git checkout tags/v9.5.6`, replace v9.5.6 with the tag you are going to upgrade to. You will get a warning about being in a detached state, that is expected.
+3. It would be a good idea to make sure you can run the base version at this point. Follow the steps in the Grafana [developer guide](https://github.com/grafana/grafana/blob/main/contribute/developer-guide.md) to build and run a local version of Grafana.
+   - If you experience yarn issues, you may need to switch to Node version 16.14.2 with nvm.
+   - If you experience issues with `make run`, make sure your installed go version meets the requirement in `go.mod`.
+4. Your origin will be the grafana project at this point, but you should switch your origin to be the fork where the branch with the Psiphon changes that you will be referencing exists, and where you will be creating your new branch. For example `git remote set-url origin <ssh_remote_url>`, replacing the url with a reference to your new origin.
+5. Create and checkout a new branch named for your new Psiphon version of Grafana. For example `git checkout -b 9.5.6-psiphon`.
+6. Merge the reference branch from your new origin into your local copy of the target Grafana version `git merge origin/9.5.1-psiphon`. If you receive an error message about not being able to merge, run `git fetch --all` and try to merge again.
+7. You will now have the changes from the reference Psiphon Grafana branch merged into your new Grafana version branch. There will most likely be several changes that will have no conflicts, and some with merge conflicts that need to be worked through. The list of Psiphon Changes above is a good reference point to understand the changes made to create the Psiphon version of Grafana. You can also look at the Merge Conflicts and Upgrade Notes below for help on working through the conflicts.
+8. Once the merge is complete, run the project locally to make sure that it works. Follow the steps in the Grafana [developer guide](https://github.com/grafana/grafana/blob/main/contribute/developer-guide.md). Look at the project to make sure that there weren't any changes in the upgrade that require new customizations.
+9. It would be a good idea to look through the [Grafana changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md) for any changes you think might be relevant to our customizations. Make any relevant changes if needed.
+10. If any changes have to be made to the customizations, please update the list above to include those new changes.
+
+### Merge Conflicts and Upgrade Notes
+
+- Several `package.json` files, `lerna.json`, and possibly other files may have merge conflicts that are just changes to the version number. In this case accept the changes that are for the target version number of your upgrade.
+- All of the custom Psiphon changes, other than a few specific exceptions, should have comments that describe the change, and all of the comments should include "Psiphon" in the comment, so that it is obvious that this change is part of the Psiphon customizations.
+- The name Psiphon is also used for naming custom colors and files where possible to make it obvious that a change was part of the Psiphon customizations.
+- The `.txt` files with custom changes don't have comments in them.
+- The html files in `public/emails` are generated files and therefore the changes they contain are not commented on. These html files are generated from the email mjml templates in `/emails`. The mjml templates contain customizations, so those customizations also end up in the generated html files. The README inside `public/emails` has information on how to generate/re-generate those files. If there are changes to the mjml templates files, the html files should be re-generated.
diff --git a/README.md b/README.md
index 25b3aad7fbee8..f111b8c58cbaf 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
-![Grafana](docs/logo-horizontal.png)
+![Grafana Logo (Light)](docs/logo-horizontal.png#gh-light-mode-only)
+![Grafana Logo (Dark)](docs/logo-horizontal-dark.png#gh-dark-mode-only)
 
 The open-source platform for monitoring and observability
 
diff --git a/WORKFLOW.md b/WORKFLOW.md
index fca782e178d21..ab1821b468ffe 100644
--- a/WORKFLOW.md
+++ b/WORKFLOW.md
@@ -44,7 +44,7 @@ Once a PR is approved as per above, any team member MAY merge the PR.
 ## Backporting a PR
 
 Critical bug fixes needed for a previous minor release should be backported to the respective release branches after coordinating with the delivery team.
-Please see the [contibution guide](./contribute/merge-pull-request.md#should-the-pull-request-be-backported) for further details.
+Please see the [contribution guide](./contribute/merge-pull-request.md#should-the-pull-request-be-backported) for further details.
 
 # Release workflow
 
diff --git a/babel.config.json b/babel.config.json
deleted file mode 100644
index 28e9f48eeed54..0000000000000
--- a/babel.config.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "babelrc": false,
-  // Note: order is bottom-to-top and/or right-to-left
-  "presets": [
-    [
-      "@babel/preset-env",
-      {
-        "bugfixes": true,
-        "browserslistEnv": "dev",
-        "useBuiltIns": "entry",
-        "corejs": "3.10"
-      }
-    ],
-    [
-      "@babel/preset-typescript",
-      {
-        "allowNamespaces": true,
-        "allowDeclareFields": true
-      }
-    ],
-    [
-      "@babel/preset-react",
-      {
-        "runtime": "automatic"
-      }
-    ]
-  ],
-  "plugins": [
-    [
-      "@babel/plugin-transform-typescript",
-      {
-        "allowNamespaces": true,
-        "allowDeclareFields": true
-      }
-    ],
-    // added to mitigate https://github.com/babel/babel/issues/14289
-    // package (and following line) can be removed once the issue is fixed and released
-    "@babel/plugin-proposal-class-properties",
-    ["@babel/plugin-proposal-object-rest-spread", { "loose": true }],
-    "@babel/plugin-transform-react-constant-elements",
-    "@babel/plugin-proposal-nullish-coalescing-operator",
-    "@babel/plugin-proposal-optional-chaining",
-    "@babel/plugin-syntax-dynamic-import", // needed for `() => import()` in routes.ts
-    "angularjs-annotate",
-    "macros"
-  ],
-  "env": {
-    "production": {
-      "presets": [
-        [
-          "@babel/preset-env",
-          {
-            "browserslistEnv": "production"
-          }
-        ]
-      ]
-    },
-    "hot": {
-      "plugins": ["react-refresh/babel"]
-    }
-  }
-}
diff --git a/conf/custom.ini b/conf/custom.ini
new file mode 100644
index 0000000000000..ede91625dd38e
--- /dev/null
+++ b/conf/custom.ini
@@ -0,0 +1,1528 @@
+##################### Grafana Configuration Example #####################
+#
+# Everything has defaults so you only need to uncomment things you want to
+# change
+
+# possible values : production, development
+;app_mode = production
+
+# instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty
+;instance_name = ${HOSTNAME}
+
+# force migration will run migrations that might cause dataloss
+;force_migration = false
+
+#################################### Paths ####################################
+[paths]
+# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
+;data = /var/lib/grafana
+
+# Temporary files in `data` directory older than given duration will be removed
+;temp_data_lifetime = 24h
+
+# Directory where grafana can store logs
+;logs = /var/log/grafana
+
+# Directory where grafana will automatically scan and look for plugins
+;plugins = /var/lib/grafana/plugins
+
+# folder that contains provisioning config files that grafana will apply on startup and while running.
+;provisioning = conf/provisioning
+
+#################################### Server ####################################
+[server]
+# Protocol (http, https, h2, socket)
+;protocol = http
+
+# This is the minimum TLS version allowed. By default, this value is empty. Accepted values are: TLS1.2, TLS1.3. If nothing is set TLS1.2 would be taken
+;min_tls_version = ""
+
+# The ip address to bind to, empty will bind to all interfaces
+;http_addr =
+
+# The http port  to use
+;http_port = 3000
+
+# The public facing domain name used to access grafana from a browser
+;domain = localhost
+
+# Redirect to correct domain if host header does not match domain
+# Prevents DNS rebinding attacks
+;enforce_domain = false
+
+# The full public facing url you use in browser, used for redirects and emails
+# If you use reverse proxy and sub path specify full url (with sub path)
+;root_url = %(protocol)s://%(domain)s:%(http_port)s/
+
+# Serve Grafana from subpath specified in `root_url` setting. By default it is set to `false` for compatibility reasons.
+;serve_from_sub_path = false
+
+# Log web requests
+;router_logging = false
+
+# the path relative working path
+;static_root_path = public
+
+# enable gzip
+;enable_gzip = false
+
+# https certs & key file
+;cert_file =
+;cert_key =
+
+# Unix socket gid
+# Changing the gid of a file without privileges requires that the target group is in the group of the process and that the process is the file owner
+# It is recommended to set the gid as http server user gid
+# Not set when the value is -1
+;socket_gid =
+
+# Unix socket mode
+;socket_mode =
+
+# Unix socket path
+;socket =
+
+# CDN Url
+;cdn_url =
+
+# Sets the maximum time using a duration format (5s/5m/5ms) before timing out read of an incoming request and closing idle connections.
+# `0` means there is no timeout for reading the request.
+;read_timeout = 0
+
+# This setting enables you to specify additional headers that the server adds to HTTP(S) responses.
+[server.custom_response_headers]
+#exampleHeader1 = exampleValue1
+#exampleHeader2 = exampleValue2
+
+#################################### GRPC Server #########################
+;[grpc_server]
+;network = "tcp"
+;address = "127.0.0.1:10000"
+;use_tls = false
+;cert_file =
+;key_file =
+
+#################################### Database ####################################
+[database]
+# You can configure the database connection by specifying type, host, name, user and password
+# as separate properties or as on string using the url properties.
+
+# Either "mysql", "postgres" or "sqlite3", it's your choice
+;type = sqlite3
+;host = 127.0.0.1:3306
+;name = grafana
+;user = root
+# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
+;password =
+
+# Use either URL or the previous fields to configure the database
+# Example: mysql://user:secret@host:port/database
+;url =
+
+# For "postgres", use either "disable", "require" or "verify-full"
+# For "mysql", use either "true", "false", or "skip-verify".
+;ssl_mode = disable
+
+# Database drivers may support different transaction isolation levels.
+# Currently, only "mysql" driver supports isolation levels.
+# If the value is empty - driver's default isolation level is applied.
+# For "mysql" use "READ-UNCOMMITTED", "READ-COMMITTED", "REPEATABLE-READ" or "SERIALIZABLE".
+;isolation_level =
+
+;ca_cert_path =
+;client_key_path =
+;client_cert_path =
+;server_cert_name =
+
+# For "sqlite3" only, path relative to data_path setting
+;path = grafana.db
+
+# Max idle conn setting default is 2
+;max_idle_conn = 2
+
+# Max conn setting default is 0 (mean not set)
+;max_open_conn =
+
+# Connection Max Lifetime default is 14400 (means 14400 seconds or 4 hours)
+;conn_max_lifetime = 14400
+
+# Set to true to log the sql calls and execution times.
+;log_queries =
+
+# For "sqlite3" only. cache mode setting used for connecting to the database. (private, shared)
+;cache_mode = private
+
+# For "sqlite3" only. Enable/disable Write-Ahead Logging, https://sqlite.org/wal.html. Default is false.
+;wal = false
+
+# For "mysql" only if migrationLocking feature toggle is set. How many seconds to wait before failing to lock the database for the migrations, default is 0.
+;locking_attempt_timeout_sec = 0
+
+# For "sqlite" only. How many times to retry query in case of database is locked failures. Default is 0 (disabled).
+;query_retries = 0
+
+# For "sqlite" only. How many times to retry transaction in case of database is locked failures. Default is 5.
+;transaction_retries = 5
+
+# Set to true to add metrics and tracing for database queries.
+;instrument_queries = false
+
+################################### Data sources #########################
+[datasources]
+# Upper limit of data sources that Grafana will return. This limit is a temporary configuration and it will be deprecated when pagination will be introduced on the list data sources API.
+;datasource_limit = 5000
+
+#################################### Cache server #############################
+[remote_cache]
+# Either "redis", "memcached" or "database" default is "database"
+;type = database
+
+# cache connectionstring options
+# database: will use Grafana primary database.
+# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=0,ssl=false`. Only addr is required. ssl may be 'true', 'false', or 'insecure'.
+# memcache: 127.0.0.1:11211
+;connstr =
+
+# prefix prepended to all the keys in the remote cache
+; prefix =
+
+# This enables encryption of values stored in the remote cache
+;encryption =
+
+#################################### Data proxy ###########################
+[dataproxy]
+
+# This enables data proxy logging, default is false
+;logging = false
+
+# How long the data proxy waits to read the headers of the response before timing out, default is 30 seconds.
+# This setting also applies to core backend HTTP data sources where query requests use an HTTP client with timeout set.
+;timeout = 30
+
+# How long the data proxy waits to establish a TCP connection before timing out, default is 10 seconds.
+;dialTimeout = 10
+
+# How many seconds the data proxy waits before sending a keepalive probe request.
+;keep_alive_seconds = 30
+
+# How many seconds the data proxy waits for a successful TLS Handshake before timing out.
+;tls_handshake_timeout_seconds = 10
+
+# How many seconds the data proxy will wait for a server's first response headers after
+# fully writing the request headers if the request has an "Expect: 100-continue"
+# header. A value of 0 will result in the body being sent immediately, without
+# waiting for the server to approve.
+;expect_continue_timeout_seconds = 1
+
+# Optionally limits the total number of connections per host, including connections in the dialing,
+# active, and idle states. On limit violation, dials will block.
+# A value of zero (0) means no limit.
+;max_conns_per_host = 0
+
+# The maximum number of idle connections that Grafana will keep alive.
+;max_idle_connections = 100
+
+# How many seconds the data proxy keeps an idle connection open before timing out.
+;idle_conn_timeout_seconds = 90
+
+# If enabled and user is not anonymous, data proxy will add X-Grafana-User header with username into the request, default is false.
+;send_user_header = false
+
+# Limit the amount of bytes that will be read/accepted from responses of outgoing HTTP requests.
+;response_limit = 0
+
+# Limits the number of rows that Grafana will process from SQL data sources.
+;row_limit = 1000000
+
+# Sets a custom value for the `User-Agent` header for outgoing data proxy requests. If empty, the default value is `Grafana/<BuildVersion>` (for example `Grafana/9.0.0`).
+;user_agent =
+
+#################################### Analytics ####################################
+[analytics]
+# Server reporting, sends usage counters to stats.grafana.org every 24 hours.
+# No ip addresses are being tracked, only simple counters to track
+# running instances, dashboard and error counts. It is very helpful to us.
+# Change this option to false to disable reporting.
+;reporting_enabled = true
+
+# The name of the distributor of the Grafana instance. Ex hosted-grafana, grafana-labs
+;reporting_distributor = grafana-labs
+
+# Set to false to disable all checks to https://grafana.com
+# for new versions of grafana. The check is used
+# in some UI views to notify that a grafana update exists.
+# This option does not cause any auto updates, nor send any information
+# only a GET request to https://raw.githubusercontent.com/grafana/grafana/main/latest.json to get the latest version.
+;check_for_updates = true
+
+# Set to false to disable all checks to https://grafana.com
+# for new versions of plugins. The check is used
+# in some UI views to notify that a plugin update exists.
+# This option does not cause any auto updates, nor send any information
+# only a GET request to https://grafana.com to get the latest versions.
+;check_for_plugin_updates = true
+
+# Google Analytics universal tracking code, only enabled if you specify an id here
+;google_analytics_ua_id =
+
+# Google Analytics 4 tracking code, only enabled if you specify an id here
+;google_analytics_4_id =
+
+# When Google Analytics 4 Enhanced event measurement is enabled, we will try to avoid sending duplicate events and let Google Analytics 4 detect navigation changes, etc.
+;google_analytics_4_send_manual_page_views = false
+
+# Google Tag Manager ID, only enabled if you specify an id here
+;google_tag_manager_id =
+
+# Rudderstack write key, enabled only if rudderstack_data_plane_url is also set
+;rudderstack_write_key =
+
+# Rudderstack data plane url, enabled only if rudderstack_write_key is also set
+;rudderstack_data_plane_url =
+
+# Rudderstack SDK url, optional, only valid if rudderstack_write_key and rudderstack_data_plane_url is also set
+;rudderstack_sdk_url =
+
+# Rudderstack Config url, optional, used by Rudderstack SDK to fetch source config
+;rudderstack_config_url =
+
+# Intercom secret, optional, used to hash user_id before passing to Intercom via Rudderstack
+;intercom_secret =
+
+# Controls if the UI contains any links to user feedback forms
+;feedback_links_enabled = true
+
+#################################### Security ####################################
+[security]
+# disable creation of admin user on first start of grafana
+;disable_initial_admin_creation = false
+
+# default admin user, created on startup
+;admin_user = admin
+
+# default admin password, can be changed before first start of grafana,  or in profile settings
+;admin_password = admin
+
+# default admin email, created on startup
+;admin_email = admin@localhost
+
+# used for signing
+;secret_key = SW2YcwTIb9zpOOhoPsMm
+
+# current key provider used for envelope encryption, default to static value specified by secret_key
+;encryption_provider = secretKey.v1
+
+# list of configured key providers, space separated (Enterprise only): e.g., awskms.v1 azurekv.v1
+;available_encryption_providers =
+
+# disable gravatar profile images
+;disable_gravatar = false
+
+# data source proxy whitelist (ip_or_domain:port separated by spaces)
+;data_source_proxy_whitelist =
+
+# disable protection against brute force login attempts
+;disable_brute_force_login_protection = false
+
+# set to true if you host Grafana behind HTTPS. default is false.
+;cookie_secure = false
+
+# set cookie SameSite attribute. defaults to `lax`. can be set to "lax", "strict", "none" and "disabled"
+;cookie_samesite = lax
+
+# set to true if you want to allow browsers to render Grafana in a <frame>, <iframe>, <embed> or <object>. default is false.
+;allow_embedding = false
+
+# Set to true if you want to enable http strict transport security (HSTS) response header.
+# HSTS tells browsers that the site should only be accessed using HTTPS.
+;strict_transport_security = false
+
+# Sets how long a browser should cache HSTS. Only applied if strict_transport_security is enabled.
+;strict_transport_security_max_age_seconds = 86400
+
+# Set to true if to enable HSTS preloading option. Only applied if strict_transport_security is enabled.
+;strict_transport_security_preload = false
+
+# Set to true if to enable the HSTS includeSubDomains option. Only applied if strict_transport_security is enabled.
+;strict_transport_security_subdomains = false
+
+# Set to true to enable the X-Content-Type-Options response header.
+# The X-Content-Type-Options response HTTP header is a marker used by the server to indicate that the MIME types advertised
+# in the Content-Type headers should not be changed and be followed.
+;x_content_type_options = true
+
+# Set to true to enable the X-XSS-Protection header, which tells browsers to stop pages from loading
+# when they detect reflected cross-site scripting (XSS) attacks.
+;x_xss_protection = true
+
+# Enable adding the Content-Security-Policy header to your requests.
+# CSP allows to control resources the user agent is allowed to load and helps prevent XSS attacks.
+;content_security_policy = false
+
+# Set Content Security Policy template used when adding the Content-Security-Policy header to your requests.
+# $NONCE in the template includes a random nonce.
+# $ROOT_PATH is server.root_url without the protocol.
+;content_security_policy_template = """script-src 'self' 'unsafe-eval' 'unsafe-inline' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline' blob:;img-src * data:;base-uri 'self';connect-src 'self' grafana.com ws://$ROOT_PATH wss://$ROOT_PATH;manifest-src 'self';media-src 'none';form-action 'self';"""
+
+# Enable adding the Content-Security-Policy-Report-Only header to your requests.
+# Allows you to monitor the effects of a policy without enforcing it.
+;content_security_policy_report_only = false
+
+# Set Content Security Policy Report Only template used when adding the Content-Security-Policy-Report-Only header to your requests.
+# $NONCE in the template includes a random nonce.
+# $ROOT_PATH is server.root_url without the protocol.
+;content_security_policy_report_only_template = """script-src 'self' 'unsafe-eval' 'unsafe-inline' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline' blob:;img-src * data:;base-uri 'self';connect-src 'self' grafana.com ws://$ROOT_PATH wss://$ROOT_PATH;manifest-src 'self';media-src 'none';form-action 'self';"""
+# Controls if old angular plugins are supported or not. This will be disabled by default in future release
+;angular_support_enabled = true
+
+# List of additional allowed URLs to pass by the CSRF check, separated by spaces. Suggested when authentication comes from an IdP.
+;csrf_trusted_origins = example.com
+
+# List of allowed headers to be set by the user, separated by spaces. Suggested to use for if authentication lives behind reverse proxies.
+;csrf_additional_headers =
+
+# The CSRF check will be executed even if the request has no login cookie.
+;csrf_always_check = false
+
+# Comma-separated list of plugins ids that won't be loaded inside the frontend sandbox
+;disable_frontend_sandbox_for_plugins =
+
+[security.encryption]
+# Defines the time-to-live (TTL) for decrypted data encryption keys stored in memory (cache).
+# Please note that small values may cause performance issues due to a high frequency decryption operations.
+;data_keys_cache_ttl = 15m
+
+# Defines the frequency of data encryption keys cache cleanup interval.
+# On every interval, decrypted data encryption keys that reached the TTL are removed from the cache.
+;data_keys_cache_cleanup_interval = 1m
+
+#################################### Snapshots ###########################
+[snapshots]
+# set to false to remove snapshot functionality
+;enabled = true
+
+# snapshot sharing options
+;external_enabled = true
+;external_snapshot_url = https://snapshots.raintank.io
+;external_snapshot_name = Publish to snapshots.raintank.io
+
+# Set to true to enable this Grafana instance act as an external snapshot server and allow unauthenticated requests for
+# creating and deleting snapshots.
+;public_mode = false
+
+# remove expired snapshot
+;snapshot_remove_expired = true
+
+#################################### Dashboards History ##################
+[dashboards]
+# Number dashboard versions to keep (per dashboard). Default: 20, Minimum: 1
+;versions_to_keep = 20
+
+# Minimum dashboard refresh interval. When set, this will restrict users to set the refresh interval of a dashboard lower than given interval. Per default this is 5 seconds.
+# The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
+;min_refresh_interval = 5s
+
+# Path to the default home dashboard. If this value is empty, then Grafana uses StaticRootPath + "dashboards/home.json"
+;default_home_dashboard_path =
+
+#################################### Users ###############################
+[users]
+# disable user signup / registration
+;allow_sign_up = true
+
+# Allow non admin users to create organizations
+;allow_org_create = true
+
+# Set to true to automatically assign new users to the default organization (id 1)
+;auto_assign_org = true
+
+# Set this value to automatically add new users to the provided organization (if auto_assign_org above is set to true)
+;auto_assign_org_id = 1
+
+# Default role new users will be automatically assigned
+;auto_assign_org_role = Viewer
+
+# Require email validation before sign up completes
+;verify_email_enabled = false
+
+# Background text for the user field on the login page
+;login_hint = email or username
+;password_hint = password
+
+# Default UI theme ("dark" or "light")
+# Psiphon change - default to light theme
+default_theme = light
+
+# Default UI language (supported IETF language tag, such as en-US)
+;default_language = en-US
+
+# Path to a custom home page. Users are only redirected to this if the default home dashboard is used. It should match a frontend route and contain a leading slash.
+;home_page =
+
+# External user management, these options affect the organization users view
+;external_manage_link_url =
+;external_manage_link_name =
+;external_manage_info =
+
+# Viewers can edit/inspect dashboard settings in the browser. But not save the dashboard.
+;viewers_can_edit = false
+
+# Editors can administrate dashboard, folders and teams they create
+;editors_can_admin = false
+
+# The duration in time a user invitation remains valid before expiring. This setting should be expressed as a duration. Examples: 6h (hours), 2d (days), 1w (week). Default is 24h (24 hours). The minimum supported duration is 15m (15 minutes).
+;user_invite_max_lifetime_duration = 24h
+
+# Enter a comma-separated list of users login to hide them in the Grafana UI. These users are shown to Grafana admins and themselves.
+; hidden_users =
+
+[secretscan]
+# Enable secretscan feature
+;enabled = false
+
+# Interval to check for token leaks
+;interval = 5m
+
+# base URL of the grafana token leak check service
+;base_url = https://secret-scanning.grafana.net
+
+# URL to send outgoing webhooks to in case of detection
+;oncall_url =
+
+# Whether to revoke the token if a leak is detected or just send a notification
+;revoke = true
+
+[service_accounts]
+# Service account maximum expiration date in days.
+# When set, Grafana will not allow the creation of tokens with expiry greater than this setting.
+; token_expiration_day_limit =
+
+[auth]
+# Login cookie name
+;login_cookie_name = grafana_session
+
+# Disable usage of Grafana build-in login solution.
+;disable_login = false
+
+# The maximum lifetime (duration) an authenticated user can be inactive before being required to login at next visit. Default is 7 days (7d). This setting should be expressed as a duration, e.g. 5m (minutes), 6h (hours), 10d (days), 2w (weeks), 1M (month). The lifetime resets at each successful token rotation.
+;login_maximum_inactive_lifetime_duration =
+
+# The maximum lifetime (duration) an authenticated user can be logged in since login time before being required to login. Default is 30 days (30d). This setting should be expressed as a duration, e.g. 5m (minutes), 6h (hours), 10d (days), 2w (weeks), 1M (month).
+;login_maximum_lifetime_duration =
+
+# How often should auth tokens be rotated for authenticated users when being active. The default is each 10 minutes.
+;token_rotation_interval_minutes = 10
+
+# Set to true to disable (hide) the login form, useful if you use OAuth, defaults to false
+;disable_login_form = false
+
+# Set to true to disable the sign out link in the side menu. Useful if you use auth.proxy or auth.jwt, defaults to false
+;disable_signout_menu = false
+
+# URL to redirect the user to after sign out
+;signout_redirect_url =
+
+# Set to true to attempt login with OAuth automatically, skipping the login screen.
+# This setting is ignored if multiple OAuth providers are configured.
+# Deprecated, use auto_login option for specific provider instead.
+;oauth_auto_login = false
+
+# OAuth state max age cookie duration in seconds. Defaults to 600 seconds.
+;oauth_state_cookie_max_age = 600
+
+# Skip forced assignment of OrgID 1 or 'auto_assign_org_id' for social logins
+# Deprecated, use skip_org_role_sync option for specific provider instead.
+;oauth_skip_org_role_update_sync = false
+
+# limit of api_key seconds to live before expiration
+;api_key_max_seconds_to_live = -1
+
+# Set to true to enable SigV4 authentication option for HTTP-based datasources.
+;sigv4_auth_enabled = false
+
+# Set to true to enable verbose logging of SigV4 request signing
+;sigv4_verbose_logging = false
+
+# Set to true to enable Azure authentication option for HTTP-based datasources.
+;azure_auth_enabled = false
+
+# Set to skip the organization role from JWT login and use system's role assignment instead.
+; skip_org_role_sync = false
+
+# Use email lookup in addition to the unique ID provided by the IdP
+;oauth_allow_insecure_email_lookup = false
+
+#################################### Anonymous Auth ######################
+[auth.anonymous]
+# enable anonymous access
+;enabled = false
+
+# specify organization name that should be used for unauthenticated users
+;org_name = Main Org.
+
+# specify role for unauthenticated users
+;org_role = Viewer
+
+# mask the Grafana version number for unauthenticated users
+;hide_version = false
+
+#################################### GitHub Auth ##########################
+[auth.github]
+;name = GitHub
+;icon = github
+;enabled = false
+;allow_sign_up = true
+;auto_login = false
+;client_id = some_id
+;client_secret = some_secret
+;scopes = user:email,read:org
+;auth_url = https://github.com/login/oauth/authorize
+;token_url = https://github.com/login/oauth/access_token
+;api_url = https://api.github.com/user
+;allowed_domains =
+;team_ids =
+;allowed_organizations =
+;role_attribute_path =
+;role_attribute_strict = false
+;allow_assign_grafana_admin = false
+;skip_org_role_sync = false
+
+#################################### GitLab Auth #########################
+[auth.gitlab]
+;name = GitLab
+;icon = gitlab
+;enabled = false
+;allow_sign_up = true
+;auto_login = false
+;client_id = some_id
+;client_secret = some_secret
+;scopes = openid email profile
+;auth_url = https://gitlab.com/oauth/authorize
+;token_url = https://gitlab.com/oauth/token
+;api_url = https://gitlab.com/api/v4
+;allowed_domains =
+;allowed_groups =
+;role_attribute_path =
+;role_attribute_strict = false
+;allow_assign_grafana_admin = false
+;skip_org_role_sync = false
+;tls_skip_verify_insecure = false
+;tls_client_cert =
+;tls_client_key =
+;tls_client_ca =
+;use_pkce = true
+
+#################################### Google Auth ##########################
+[auth.google]
+;name = Google
+;icon = google
+;enabled = false
+;allow_sign_up = true
+;auto_login = false
+;client_id = some_client_id
+;client_secret = some_client_secret
+;scopes = openid email profile
+;auth_url = https://accounts.google.com/o/oauth2/v2/auth
+;token_url = https://oauth2.googleapis.com/token
+;api_url = https://openidconnect.googleapis.com/v1/userinfo
+;allowed_domains =
+;hosted_domain =
+;skip_org_role_sync = false
+;use_pkce = true
+
+#################################### Grafana.com Auth ####################
+[auth.grafana_com]
+;name = Grafana.com
+;icon = grafana
+;enabled = false
+;allow_sign_up = true
+;auto_login = false
+;client_id = some_id
+;client_secret = some_secret
+;scopes = user:email
+;allowed_organizations =
+;skip_org_role_sync = false
+
+#################################### Azure AD OAuth #######################
+[auth.azuread]
+;name = Microsoft
+;icon = microsoft
+;enabled = false
+;allow_sign_up = true
+;auto_login = false
+;client_id = some_client_id
+;client_secret = some_client_secret
+;scopes = openid email profile
+;auth_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/authorize
+;token_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/token
+;allowed_domains =
+;allowed_groups =
+;allowed_organizations =
+;role_attribute_strict = false
+;allow_assign_grafana_admin = false
+;use_pkce = true
+# prevent synchronizing users organization roles
+;skip_org_role_sync = false
+
+#################################### Okta OAuth #######################
+[auth.okta]
+;name = Okta
+;enabled = false
+;allow_sign_up = true
+;auto_login = false
+;client_id = some_id
+;client_secret = some_secret
+;scopes = openid profile email groups
+;auth_url = https://<tenant-id>.okta.com/oauth2/v1/authorize
+;token_url = https://<tenant-id>.okta.com/oauth2/v1/token
+;api_url = https://<tenant-id>.okta.com/oauth2/v1/userinfo
+;allowed_domains =
+;allowed_groups =
+;role_attribute_path =
+;role_attribute_strict = false
+;allow_assign_grafana_admin = false
+;skip_org_role_sync = false
+;use_pkce = true
+
+#################################### Generic OAuth ##########################
+[auth.generic_oauth]
+;enabled = false
+;name = OAuth
+;allow_sign_up = true
+;auto_login = false
+;client_id = some_id
+;client_secret = some_secret
+;scopes = user:email,read:org
+;empty_scopes = false
+;email_attribute_name = email:primary
+;email_attribute_path =
+;login_attribute_path =
+;name_attribute_path =
+;id_token_attribute_name =
+;auth_url = https://foo.bar/login/oauth/authorize
+;token_url = https://foo.bar/login/oauth/access_token
+;api_url = https://foo.bar/user
+;teams_url =
+;allowed_domains =
+;team_ids =
+;allowed_organizations =
+;role_attribute_path =
+;role_attribute_strict = false
+;groups_attribute_path =
+;team_ids_attribute_path =
+;tls_skip_verify_insecure = false
+;tls_client_cert =
+;tls_client_key =
+;tls_client_ca =
+;use_pkce = false
+;auth_style =
+;allow_assign_grafana_admin = false
+
+#################################### Basic Auth ##########################
+[auth.basic]
+;enabled = true
+
+#################################### Auth Proxy ##########################
+[auth.proxy]
+;enabled = false
+;header_name = X-WEBAUTH-USER
+;header_property = username
+;auto_sign_up = true
+;sync_ttl = 60
+;whitelist = 192.168.1.1, 192.168.2.1
+;headers = Email:X-User-Email, Name:X-User-Name
+# Non-ASCII strings in header values are encoded using quoted-printable encoding
+;headers_encoded = false
+# Read the auth proxy docs for details on what the setting below enables
+;enable_login_token = false
+
+#################################### Auth JWT ##########################
+[auth.jwt]
+;enabled = true
+;header_name = X-JWT-Assertion
+;email_claim = sub
+;username_claim = sub
+;jwk_set_url = https://foo.bar/.well-known/jwks.json
+;jwk_set_file = /path/to/jwks.json
+;cache_ttl = 60m
+;expect_claims = {"aud": ["foo", "bar"]}
+;key_file = /path/to/key/file
+;role_attribute_path =
+;role_attribute_strict = false
+;auto_sign_up = false
+;url_login = false
+;allow_assign_grafana_admin = false
+
+#################################### Auth LDAP ##########################
+[auth.ldap]
+;enabled = false
+;config_file = /etc/grafana/ldap.toml
+;allow_sign_up = true
+# prevent synchronizing ldap users organization roles
+;skip_org_role_sync = false
+
+# LDAP background sync (Enterprise only)
+# At 1 am every day
+;sync_cron = "0 1 * * *"
+;active_sync_enabled = true
+
+#################################### AWS ###########################
+[aws]
+# Enter a comma-separated list of allowed AWS authentication providers.
+# Options are: default (AWS SDK Default), keys (Access && secret key), credentials (Credentials field), ec2_iam_role (EC2 IAM Role)
+; allowed_auth_providers = default,keys,credentials
+
+# Allow AWS users to assume a role using temporary security credentials.
+# If true, assume role will be enabled for all AWS authentication providers that are specified in aws_auth_providers
+; assume_role_enabled = true
+
+# Specify max no of pages to be returned by the ListMetricPages API
+; list_metrics_page_limit = 500
+
+# Experimental, for use in Grafana Cloud only. Please do not set.
+; external_id =
+
+#################################### Azure ###############################
+[azure]
+# Azure cloud environment where Grafana is hosted
+# Possible values are AzureCloud, AzureChinaCloud, AzureUSGovernment and AzureGermanCloud
+# Default value is AzureCloud (i.e. public cloud)
+;cloud = AzureCloud
+
+# Specifies whether Grafana hosted in Azure service with Managed Identity configured (e.g. Azure Virtual Machines instance)
+# If enabled, the managed identity can be used for authentication of Grafana in Azure services
+# Disabled by default, needs to be explicitly enabled
+;managed_identity_enabled = false
+
+# Client ID to use for user-assigned managed identity
+# Should be set for user-assigned identity and should be empty for system-assigned identity
+;managed_identity_client_id =
+
+# Specifies whether user identity authentication (on behalf of currently signed-in user) should be enabled in datasources
+# that support it (requires AAD authentication)
+# Disabled by default, needs to be explicitly enabled
+;user_identity_enabled = false
+
+# Override token URL for Azure Active Directory
+# By default is the same as token URL configured for AAD authentication settings
+;user_identity_token_url =
+
+# Override ADD application ID which would be used to exchange users token to an access token for the datasource
+# By default is the same as used in AAD authentication or can be set to another application (for OBO flow)
+;user_identity_client_id =
+
+# Override the AAD application client secret
+# By default is the same as used in AAD authentication or can be set to another application (for OBO flow)
+;user_identity_client_secret =
+
+#################################### Role-based Access Control ###########
+[rbac]
+;permission_cache = true
+
+# Reset basic roles permissions on boot
+# Warning left to true, basic roles permissions will be reset on every boot
+#reset_basic_roles = false
+
+#################################### SMTP / Emailing ##########################
+[smtp]
+;enabled = false
+;host = localhost:25
+;user =
+# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
+;password =
+;cert_file =
+;key_file =
+;skip_verify = false
+;from_address = admin@grafana.localhost
+;from_name = Grafana
+# EHLO identity in SMTP dialog (defaults to instance_name)
+;ehlo_identity = dashboard.example.com
+# SMTP startTLS policy (defaults to 'OpportunisticStartTLS')
+;startTLS_policy = NoStartTLS
+
+[emails]
+;welcome_email_on_sign_up = false
+;templates_pattern = emails/*.html, emails/*.txt
+;content_types = text/html
+
+#################################### Logging ##########################
+[log]
+# Either "console", "file", "syslog". Default is console and  file
+# Use space to separate multiple modes, e.g. "console file"
+;mode = console file
+
+# Either "debug", "info", "warn", "error", "critical", default is "info"
+;level = info
+
+# optional settings to set different levels for specific loggers. Ex filters = sqlstore:debug
+;filters =
+
+# Set the default error message shown to users. This message is displayed instead of sensitive backend errors which should be obfuscated. Default is the same as the sample value.
+;user_facing_default_error = "please inspect Grafana server log for details"
+
+# For "console" mode only
+[log.console]
+;level =
+
+# log line format, valid options are text, console and json
+;format = console
+
+# For "file" mode only
+[log.file]
+;level =
+
+# log line format, valid options are text, console and json
+;format = text
+
+# This enables automated log rotate(switch of following options), default is true
+;log_rotate = true
+
+# Max line number of single file, default is 1000000
+;max_lines = 1000000
+
+# Max size shift of single file, default is 28 means 1 << 28, 256MB
+;max_size_shift = 28
+
+# Segment log daily, default is true
+;daily_rotate = true
+
+# Expired days of log file(delete after max days), default is 7
+;max_days = 7
+
+[log.syslog]
+;level =
+
+# log line format, valid options are text, console and json
+;format = text
+
+# Syslog network type and address. This can be udp, tcp, or unix. If left blank, the default unix endpoints will be used.
+;network =
+;address =
+
+# Syslog facility. user, daemon and local0 through local7 are valid.
+;facility =
+
+# Syslog tag. By default, the process' argv[0] is used.
+;tag =
+
+[log.frontend]
+# Should Faro javascript agent be initialized
+;enabled = false
+
+# Custom HTTP endpoint to send events to. Default will log the events to stdout.
+;custom_endpoint = /log-grafana-javascript-agent
+
+# Requests per second limit enforced an extended period, for Grafana backend log ingestion endpoint (/log).
+;log_endpoint_requests_per_second_limit = 3
+
+# Max requests accepted per short interval of time for Grafana backend log ingestion endpoint (/log).
+;log_endpoint_burst_limit = 15
+
+# Should error instrumentation be enabled, only affects Grafana Javascript Agent
+;instrumentations_errors_enabled = true
+
+# Should console instrumentation be enabled, only affects Grafana Javascript Agent
+;instrumentations_console_enabled = false
+
+# Should webvitals instrumentation be enabled, only affects Grafana Javascript Agent
+;instrumentations_webvitals_enabled = false
+
+# Api Key, only applies to Grafana Javascript Agent provider
+;api_key = testApiKey
+
+#################################### Usage Quotas ########################
+[quota]
+; enabled = false
+
+#### set quotas to -1 to make unlimited. ####
+# limit number of users per Org.
+; org_user = 10
+
+# limit number of dashboards per Org.
+; org_dashboard = 100
+
+# limit number of data_sources per Org.
+; org_data_source = 10
+
+# limit number of api_keys per Org.
+; org_api_key = 10
+
+# limit number of alerts per Org.
+;org_alert_rule = 100
+
+# limit number of orgs a user can create.
+; user_org = 10
+
+# Global limit of users.
+; global_user = -1
+
+# global limit of orgs.
+; global_org = -1
+
+# global limit of dashboards
+; global_dashboard = -1
+
+# global limit of api_keys
+; global_api_key = -1
+
+# global limit on number of logged in users.
+; global_session = -1
+
+# global limit of alerts
+;global_alert_rule = -1
+
+# global limit of correlations
+; global_correlations = -1
+
+#################################### Unified Alerting ####################
+[unified_alerting]
+#Enable the Unified Alerting sub-system and interface. When enabled we'll migrate all of your alert rules and notification channels to the new system. New alert rules will be created and your notification channels will be converted into an Alertmanager configuration. Previous data is preserved to enable backwards compatibility but new data is removed.```
+;enabled = true
+
+# Comma-separated list of organization IDs for which to disable unified alerting. Only supported if unified alerting is enabled.
+;disabled_orgs =
+
+# Specify the frequency of polling for admin config changes.
+# The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
+;admin_config_poll_interval = 60s
+
+# Specify the frequency of polling for Alertmanager config changes.
+# The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
+;alertmanager_config_poll_interval = 60s
+
+# The redis server address that should be connected to.
+;ha_redis_address =
+
+# The username that should be used to authenticate with the redis server.
+;ha_redis_username =
+
+# The password that should be used to authenticate with the redis server.
+;ha_redis_password =
+
+# The redis database, by default it's 0.
+;ha_redis_db =
+
+# A prefix that is used for every key or channel that is created on the redis server
+# as part of HA for alerting.
+;ha_redis_prefix =
+
+# The name of the cluster peer that will be used as identifier. If none is
+# provided, a random one will be generated.
+;ha_redis_peer_name =
+
+# Listen address/hostname and port to receive unified alerting messages for other Grafana instances. The port is used for both TCP and UDP. It is assumed other Grafana instances are also running on the same port. The default value is `0.0.0.0:9094`.
+;ha_listen_address = "0.0.0.0:9094"
+
+# Listen address/hostname and port to receive unified alerting messages for other Grafana instances. The port is used for both TCP and UDP. It is assumed other Grafana instances are also running on the same port. The default value is `0.0.0.0:9094`.
+;ha_advertise_address = ""
+
+# Comma-separated list of initial instances (in a format of host:port) that will form the HA cluster. Configuring this setting will enable High Availability mode for alerting.
+;ha_peers = ""
+
+# Time to wait for an instance to send a notification via the Alertmanager. In HA, each Grafana instance will
+# be assigned a position (e.g. 0, 1). We then multiply this position with the timeout to indicate how long should
+# each instance wait before sending the notification to take into account replication lag.
+# The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
+;ha_peer_timeout = "15s"
+
+# The label is an optional string to include on each packet and stream.
+# It uniquely identifies the cluster and prevents cross-communication
+# issues when sending gossip messages in an enviromenet with multiple clusters.
+;ha_label =
+
+# The interval between sending gossip messages. By lowering this value (more frequent) gossip messages are propagated
+# across cluster more quickly at the expense of increased bandwidth usage.
+# The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
+;ha_gossip_interval = "200ms"
+
+# The interval between gossip full state syncs. Setting this interval lower (more frequent) will increase convergence speeds
+# across larger clusters at the expense of increased bandwidth usage.
+# The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
+;ha_push_pull_interval = "60s"
+
+# Enable or disable alerting rule execution. The alerting UI remains visible. This option has a legacy version in the `[alerting]` section that takes precedence.
+;execute_alerts = true
+
+# Alert evaluation timeout when fetching data from the datasource. This option has a legacy version in the `[alerting]` section that takes precedence.
+# The timeout string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
+;evaluation_timeout = 30s
+
+# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. This option has a legacy version in the `[alerting]` section that takes precedence.
+;max_attempts = 3
+
+# Minimum interval to enforce between rule evaluations. Rules will be adjusted if they are less than this value  or if they are not multiple of the scheduler interval (10s). Higher values can help with resource management as we'll schedule fewer evaluations over time. This option has a legacy version in the `[alerting]` section that takes precedence.
+# The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
+;min_interval = 10s
+
+[unified_alerting.reserved_labels]
+# Comma-separated list of reserved labels added by the Grafana Alerting engine that should be disabled.
+# For example: `disabled_labels=grafana_folder`
+;disabled_labels =
+
+[unified_alerting.state_history]
+# Enable the state history functionality in Unified Alerting. The previous states of alert rules will be visible in panels and in the UI.
+; enabled = true
+
+# Select which pluggable state history backend to use. Either "annotations", "loki", or "multiple"
+# "loki" writes state history to an external Loki instance. "multiple" allows history to be written to multiple backends at once.
+# Defaults to "annotations".
+; backend = "multiple"
+
+# For "multiple" only.
+# Indicates the main backend used to serve state history queries.
+# Either "annotations" or "loki"
+; primary = "loki"
+
+# For "multiple" only.
+# Comma-separated list of additional backends to write state history data to.
+; secondaries = "annotations"
+
+# For "loki" only.
+# URL of the external Loki instance.
+# Either "loki_remote_url", or both of "loki_remote_read_url" and "loki_remote_write_url" is required for the "loki" backend.
+; loki_remote_url = "http://loki:3100"
+
+# For "loki" only.
+# URL of the external Loki's read path. To be used in configurations where Loki has separated read and write URLs.
+# Either "loki_remote_url", or both of "loki_remote_read_url" and "loki_remote_write_url" is required for the "loki" backend.
+; loki_remote_read_url = "http://loki-querier:3100"
+
+# For "loki" only.
+# URL of the external Loki's write path. To be used in configurations where Loki has separated read and write URLs.
+# Either "loki_remote_url", or both of "loki_remote_read_url" and "loki_remote_write_url" is required for the "loki" backend.
+; loki_remote_write_url = "http://loki-distributor:3100"
+
+# For "loki" only.
+# Optional tenant ID to attach to requests sent to Loki.
+; loki_tenant_id = 123
+
+# For "loki" only.
+# Optional username for basic authentication on requests sent to Loki. Can be left blank to disable basic auth.
+; loki_basic_auth_username = "myuser"
+
+# For "loki" only.
+# Optional password for basic authentication on requests sent to Loki. Can be left blank.
+; loki_basic_auth_password = "mypass"
+
+[unified_alerting.state_history.external_labels]
+# Optional extra labels to attach to outbound state history records or log streams.
+# Any number of label key-value-pairs can be provided.
+; mylabelkey = mylabelvalue
+
+#################################### Alerting ############################
+[alerting]
+# Disable legacy alerting engine & UI features
+;enabled = false
+
+# Makes it possible to turn off alert execution but alerting UI is visible
+;execute_alerts = true
+
+# Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state)
+;error_or_timeout = alerting
+
+# Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)
+;nodata_or_nullvalues = no_data
+
+# Alert notifications can include images, but rendering many images at the same time can overload the server
+# This limit will protect the server from render overloading and make sure notifications are sent out quickly
+;concurrent_render_limit = 5
+
+# Default setting for alert calculation timeout. Default value is 30
+;evaluation_timeout_seconds = 30
+
+# Default setting for alert notification timeout. Default value is 30
+;notification_timeout_seconds = 30
+
+# Default setting for max attempts to sending alert notifications. Default value is 3
+;max_attempts = 3
+
+# Makes it possible to enforce a minimal interval between evaluations, to reduce load on the backend
+;min_interval_seconds = 1
+
+# Configures for how long alert annotations are stored. Default is 0, which keeps them forever.
+# This setting should be expressed as a duration. Examples: 6h (hours), 10d (days), 2w (weeks), 1M (month).
+;max_annotation_age =
+
+# Configures max number of alert annotations that Grafana stores. Default value is 0, which keeps all alert annotations.
+;max_annotations_to_keep =
+
+#################################### Annotations #########################
+[annotations]
+# Configures the batch size for the annotation clean-up job. This setting is used for dashboard, API, and alert annotations.
+;cleanupjob_batchsize = 100
+
+# Enforces the maximum allowed length of the tags for any newly introduced annotations. It can be between 500 and 4096 inclusive (which is the respective's column length). Default value is 500.
+# Setting it to a higher value would impact performance therefore is not recommended.
+;tags_length = 500
+
+[annotations.dashboard]
+# Dashboard annotations means that annotations are associated with the dashboard they are created on.
+
+# Configures how long dashboard annotations are stored. Default is 0, which keeps them forever.
+# This setting should be expressed as a duration. Examples: 6h (hours), 10d (days), 2w (weeks), 1M (month).
+;max_age =
+
+# Configures max number of dashboard annotations that Grafana stores. Default value is 0, which keeps all dashboard annotations.
+;max_annotations_to_keep =
+
+[annotations.api]
+# API annotations means that the annotations have been created using the API without any
+# association with a dashboard.
+
+# Configures how long Grafana stores API annotations. Default is 0, which keeps them forever.
+# This setting should be expressed as a duration. Examples: 6h (hours), 10d (days), 2w (weeks), 1M (month).
+;max_age =
+
+# Configures max number of API annotations that Grafana keeps. Default value is 0, which keeps all API annotations.
+;max_annotations_to_keep =
+
+#################################### Explore #############################
+[explore]
+# Enable the Explore section
+;enabled = true
+
+#################################### Help #############################
+[help]
+# Enable the Help section
+;enabled = true
+
+#################################### Profile #############################
+[profile]
+# Enable the Profile section
+;enabled = true
+
+#################################### News #############################
+[news]
+# Enable the news feed section
+# Psiphon change - disable news feed
+news_feed_enabled = false
+
+#################################### Query #############################
+[query]
+# Set the number of data source queries that can be executed concurrently in mixed queries. Default is the number of CPUs.
+;concurrent_query_limit =
+
+#################################### Query History #############################
+[query_history]
+# Enable the Query history
+;enabled = true
+
+#################################### Internal Grafana Metrics ##########################
+# Metrics available at HTTP URL /metrics and /metrics/plugins/:pluginId
+[metrics]
+# Disable / Enable internal metrics
+;enabled           = true
+# Graphite Publish interval
+;interval_seconds  = 10
+# Disable total stats (stat_totals_*) metrics to be generated
+;disable_total_stats = false
+# The interval at which the total stats collector will update the stats. Default is 1800 seconds.
+;total_stats_collector_interval_seconds = 1800
+
+#If both are set, basic auth will be required for the metrics endpoints.
+; basic_auth_username =
+; basic_auth_password =
+
+# Metrics environment info adds dimensions to the `grafana_environment_info` metric, which
+# can expose more information about the Grafana instance.
+[metrics.environment_info]
+#exampleLabel1 = exampleValue1
+#exampleLabel2 = exampleValue2
+
+# Send internal metrics to Graphite
+[metrics.graphite]
+# Enable by setting the address setting (ex localhost:2003)
+;address =
+;prefix = prod.grafana.%(instance_name)s.
+
+#################################### Grafana.com integration  ##########################
+# Url used to import dashboards directly from Grafana.com
+[grafana_com]
+;url = https://grafana.com
+;api_url = https://grafana.com/api
+
+#################################### Distributed tracing ############
+# Opentracing is deprecated use opentelemetry instead
+[tracing.jaeger]
+# Enable by setting the address sending traces to jaeger (ex localhost:6831)
+;address = localhost:6831
+# Tag that will always be included in when creating new spans. ex (tag1:value1,tag2:value2)
+;always_included_tag = tag1:value1
+# Type specifies the type of the sampler: const, probabilistic, rateLimiting, or remote
+;sampler_type = const
+# jaeger samplerconfig param
+# for "const" sampler, 0 or 1 for always false/true respectively
+# for "probabilistic" sampler, a probability between 0 and 1
+# for "rateLimiting" sampler, the number of spans per second
+# for "remote" sampler, param is the same as for "probabilistic"
+# and indicates the initial sampling rate before the actual one
+# is received from the mothership
+;sampler_param = 1
+# sampling_server_url is the URL of a sampling manager providing a sampling strategy.
+;sampling_server_url =
+# Whether or not to use Zipkin propagation (x-b3- HTTP headers).
+;zipkin_propagation = false
+# Setting this to true disables shared RPC spans.
+# Not disabling is the most common setting when using Zipkin elsewhere in your infrastructure.
+;disable_shared_zipkin_spans = false
+
+[tracing.opentelemetry]
+# attributes that will always be included in when creating new spans. ex (key1:value1,key2:value2)
+;custom_attributes = key1:value1,key2:value2
+
+[tracing.opentelemetry.jaeger]
+# jaeger destination (ex http://localhost:14268/api/traces)
+; address = http://localhost:14268/api/traces
+# Propagation specifies the text map propagation format: w3c, jaeger
+; propagation = jaeger
+
+# This is a configuration for OTLP exporter with GRPC protocol
+[tracing.opentelemetry.otlp]
+# otlp destination (ex localhost:4317)
+; address = localhost:4317
+# Propagation specifies the text map propagation format: w3c, jaeger
+; propagation = w3c
+
+#################################### External image storage ##########################
+[external_image_storage]
+# Used for uploading images to public servers so they can be included in slack/email messages.
+# you can choose between (s3, webdav, gcs, azure_blob, local)
+;provider =
+
+[external_image_storage.s3]
+;endpoint =
+;path_style_access =
+;bucket =
+;region =
+;path =
+;access_key =
+;secret_key =
+
+[external_image_storage.webdav]
+;url =
+;public_url =
+;username =
+;password =
+
+[external_image_storage.gcs]
+;key_file =
+;bucket =
+;path =
+
+[external_image_storage.azure_blob]
+;account_name =
+;account_key =
+;container_name =
+;sas_token_expiration_days =
+
+[external_image_storage.local]
+# does not require any configuration
+
+[rendering]
+# Options to configure a remote HTTP image rendering service, e.g. using https://github.com/grafana/grafana-image-renderer.
+# URL to a remote HTTP image renderer service, e.g. http://localhost:8081/render, will enable Grafana to render panels and dashboards to PNG-images using HTTP requests to an external service.
+;server_url =
+# If the remote HTTP image renderer service runs on a different server than the Grafana server you may have to configure this to a URL where Grafana is reachable, e.g. http://grafana.domain/.
+;callback_url =
+# An auth token that will be sent to and verified by the renderer. The renderer will deny any request without an auth token matching the one configured on the renderer side.
+;renderer_token = -
+# Concurrent render request limit affects when the /render HTTP endpoint is used. Rendering many images at the same time can overload the server,
+# which this setting can help protect against by only allowing a certain amount of concurrent requests.
+;concurrent_render_request_limit = 30
+# Determines the lifetime of the render key used by the image renderer to access and render Grafana.
+# This setting should be expressed as a duration. Examples: 10s (seconds), 5m (minutes), 2h (hours).
+# Default is 5m. This should be more than enough for most deployments.
+# Change the value only if image rendering is failing and you see `Failed to get the render key from cache` in Grafana logs.
+;render_key_lifetime = 5m
+
+[panels]
+# If set to true Grafana will allow script tags in text panels. Not recommended as it enable XSS vulnerabilities.
+;disable_sanitize_html = false
+
+[plugins]
+;enable_alpha = false
+;app_tls_skip_verify_insecure = false
+# Enter a comma-separated list of plugin identifiers to identify plugins to load even if they are unsigned. Plugins with modified signatures are never loaded.
+;allow_loading_unsigned_plugins =
+# Enable or disable installing / uninstalling / updating plugins directly from within Grafana.
+;plugin_admin_enabled = false
+;plugin_admin_external_manage_enabled = false
+;plugin_catalog_url = https://grafana.com/grafana/plugins/
+# Enter a comma-separated list of plugin identifiers to hide in the plugin catalog.
+;plugin_catalog_hidden_plugins =
+# Log all backend requests for core and external plugins.
+;log_backend_requests = false
+# Disable download of the public key for verifying plugin signature.
+; public_key_retrieval_disabled = false
+# Force download of the public key for verifying plugin signature on startup. If disabled, the public key will be retrieved every 10 days.
+# Requires public_key_retrieval_disabled to be false to have any effect.
+; public_key_retrieval_on_startup = false
+
+#################################### Grafana Live ##########################################
+[live]
+# max_connections to Grafana Live WebSocket endpoint per Grafana server instance. See Grafana Live docs
+# if you are planning to make it higher than default 100 since this can require some OS and infrastructure
+# tuning. 0 disables Live, -1 means unlimited connections.
+;max_connections = 100
+
+# allowed_origins is a comma-separated list of origins that can establish connection with Grafana Live.
+# If not set then origin will be matched over root_url. Supports wildcard symbol "*".
+;allowed_origins =
+
+# engine defines an HA (high availability) engine to use for Grafana Live. By default no engine used - in
+# this case Live features work only on a single Grafana server. Available options: "redis".
+# Setting ha_engine is an EXPERIMENTAL feature.
+;ha_engine =
+
+# ha_engine_address sets a connection address for Live HA engine. Depending on engine type address format can differ.
+# For now we only support Redis connection address in "host:port" format.
+# This option is EXPERIMENTAL.
+;ha_engine_address = "127.0.0.1:6379"
+
+#################################### Grafana Image Renderer Plugin ##########################
+[plugin.grafana-image-renderer]
+# Instruct headless browser instance to use a default timezone when not provided by Grafana, e.g. when rendering panel image of alert.
+# See ICU’s metaZones.txt (https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt) for a list of supported
+# timezone IDs. Fallbacks to TZ environment variable if not set.
+;rendering_timezone =
+
+# Instruct headless browser instance to use a default language when not provided by Grafana, e.g. when rendering panel image of alert.
+# Please refer to the HTTP header Accept-Language to understand how to format this value, e.g. 'fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7, *;q=0.5'.
+;rendering_language =
+
+# Instruct headless browser instance to use a default device scale factor when not provided by Grafana, e.g. when rendering panel image of alert.
+# Default is 1. Using a higher value will produce more detailed images (higher DPI), but will require more disk space to store an image.
+;rendering_viewport_device_scale_factor =
+
+# Instruct headless browser instance whether to ignore HTTPS errors during navigation. Per default HTTPS errors are not ignored. Due to
+# the security risk it's not recommended to ignore HTTPS errors.
+;rendering_ignore_https_errors =
+
+# Instruct headless browser instance whether to capture and log verbose information when rendering an image. Default is false and will
+# only capture and log error messages. When enabled, debug messages are captured and logged as well.
+# For the verbose information to be included in the Grafana server log you have to adjust the rendering log level to debug, configure
+# [log].filter = rendering:debug.
+;rendering_verbose_logging =
+
+# Instruct headless browser instance whether to output its debug and error messages into running process of remote rendering service.
+# Default is false. This can be useful to enable (true) when troubleshooting.
+;rendering_dumpio =
+
+# Additional arguments to pass to the headless browser instance. Default is --no-sandbox. The list of Chromium flags can be found
+# here (https://peter.sh/experiments/chromium-command-line-switches/). Multiple arguments is separated with comma-character.
+;rendering_args =
+
+# You can configure the plugin to use a different browser binary instead of the pre-packaged version of Chromium.
+# Please note that this is not recommended, since you may encounter problems if the installed version of Chrome/Chromium is not
+# compatible with the plugin.
+;rendering_chrome_bin =
+
+# Instruct how headless browser instances are created. Default is 'default' and will create a new browser instance on each request.
+# Mode 'clustered' will make sure that only a maximum of browsers/incognito pages can execute concurrently.
+# Mode 'reusable' will have one browser instance and will create a new incognito page on each request.
+;rendering_mode =
+
+# When rendering_mode = clustered, you can instruct how many browsers or incognito pages can execute concurrently. Default is 'browser'
+# and will cluster using browser instances.
+# Mode 'context' will cluster using incognito pages.
+;rendering_clustering_mode =
+# When rendering_mode = clustered, you can define the maximum number of browser instances/incognito pages that can execute concurrently. Default is '5'.
+;rendering_clustering_max_concurrency =
+# When rendering_mode = clustered, you can specify the duration a rendering request can take before it will time out. Default is `30` seconds.
+;rendering_clustering_timeout =
+
+# Limit the maximum viewport width, height and device scale factor that can be requested.
+;rendering_viewport_max_width =
+;rendering_viewport_max_height =
+;rendering_viewport_max_device_scale_factor =
+
+# Change the listening host and port of the gRPC server. Default host is 127.0.0.1 and default port is 0 and will automatically assign
+# a port not in use.
+;grpc_host =
+;grpc_port =
+
+[support_bundles]
+# Enable support bundle creation (default: true)
+#enabled = true
+# Only server admins can generate and view support bundles (default: true)
+#server_admin_only = true
+# If set, bundles will be encrypted with the provided public keys separated by whitespace
+#public_keys = ""
+
+[enterprise]
+# Path to a valid Grafana Enterprise license.jwt file
+;license_path =
+
+[feature_toggles]
+# there are currently two ways to enable feature toggles in the `grafana.ini`.
+# you can either pass an array of feature you want to enable to the `enable` field or
+# configure each toggle by setting the name of the toggle to true/false. Toggles set to true/false
+# will take presidence over toggles in the `enable` list.
+
+;enable = feature1,feature2
+
+;feature1 = true
+;feature2 = false
+
+[date_formats]
+# For information on what formatting patterns that are supported https://momentjs.com/docs/#/displaying/
+
+# Default system date format used in time range picker and other places where full time is displayed
+;full_date = YYYY-MM-DD HH:mm:ss
+
+# Used by graph and other places where we only show small intervals
+;interval_second = HH:mm:ss
+;interval_minute = HH:mm
+;interval_hour = MM/DD HH:mm
+;interval_day = MM/DD
+;interval_month = YYYY-MM
+;interval_year = YYYY
+
+# Experimental feature
+;use_browser_locale = false
+
+# Default timezone for user preferences. Options are 'browser' for the browser local timezone or a timezone name from IANA Time Zone database, e.g. 'UTC' or 'Europe/Amsterdam' etc.
+;default_timezone = browser
+
+[expressions]
+# Enable or disable the expressions functionality.
+;enabled = true
+
+[geomap]
+# Set the JSON configuration for the default basemap
+;default_baselayer_config = `{
+;  "type": "xyz",
+;  "config": {
+;    "attribution": "Open street map",
+;    "url": "https://tile.openstreetmap.org/{z}/{x}/{y}.png"
+;  }
+;}`
+
+# Enable or disable loading other base map layers
+;enable_custom_baselayers = true
+
+# Move an app plugin referenced by its id (including all its pages) to a specific navigation section
+[navigation.app_sections]
+# The following will move an app plugin with the id of `my-app-id` under the `cfg` section
+# my-app-id = cfg
+
+# Move a specific app plugin page (referenced by its `path` field) to a specific navigation section
+[navigation.app_standalone_pages]
+# The following will move the page with the path "/a/my-app-id/my-page" from `my-app-id` to the `cfg` section
+# /a/my-app-id/my-page = cfg
+
+#################################### Secure Socks5 Datasource Proxy #####################################
+[secure_socks_datasource_proxy]
+; enabled = false
+; root_ca_cert =
+; client_key =
+; client_cert =
+; server_name =
+# The address of the socks5 proxy datasources should connect to
+; proxy_address =
+; show_ui = true
+
+################################## Feature Management ##############################################
+[feature_management]
+hidden_toggles =
+read_only_toggles =
\ No newline at end of file
diff --git a/conf/defaults.ini b/conf/defaults.ini
index 33ef56bce9785..d15ceb1db10df 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -9,9 +9,6 @@ app_mode = production
 # instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty
 instance_name = ${HOSTNAME}
 
-# force migration will run migrations that might cause dataloss
-force_migration = false
-
 #################################### Paths ###############################
 [paths]
 # Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
@@ -69,6 +66,9 @@ enable_gzip = false
 cert_file =
 cert_key =
 
+# Certificates file watch interval
+certs_watch_interval =
+
 # Unix socket gid
 # Changing the gid of a file without privileges requires that the target group is in the group of the process and that the process is the file owner
 # It is recommended to set the gid as http server user gid
@@ -93,6 +93,10 @@ read_timeout = 0
 #exampleHeader1 = exampleValue1
 #exampleHeader2 = exampleValue2
 
+[environment]
+# Sets whether the local file system is available for Grafana to use. Default is true for backward compatibility.
+local_file_system_available = true
+
 #################################### GRPC Server #########################
 [grpc_server]
 network = "tcp"
@@ -133,6 +137,9 @@ log_queries =
 # For "mysql", use either "true", "false", or "skip-verify".
 ssl_mode = disable
 
+# For "postregs", use either "1" to enable or "0" to disable SNI
+ssl_sni =
+
 # Database drivers may support different transaction isolation levels.
 # Currently, only "mysql" driver supports isolation levels.
 # If the value is empty - driver's default isolation level is applied.
@@ -153,7 +160,10 @@ cache_mode = private
 # For "sqlite3" only. Enable/disable Write-Ahead Logging, https://sqlite.org/wal.html. Default is false.
 wal = false
 
-# For "mysql" only if migrationLocking feature toggle is set. How many seconds to wait before failing to lock the database for the migrations, default is 0.
+# For "mysql" and "postgres". Lock the database for the migrations, default is true.
+migration_locking = true
+
+# For "mysql" and "postgres" only if migrationLocking is set. How many seconds to wait before failing to lock the database for the migrations, default is 0.
 locking_attempt_timeout_sec = 0
 
 # For "sqlite" only. How many times to retry query in case of database is locked failures. Default is 0 (disabled).
@@ -245,7 +255,7 @@ reporting_distributor = grafana-labs
 # for new versions of grafana. The check is used
 # in some UI views to notify that a grafana update exists.
 # This option does not cause any auto updates, nor send any information
-# only a GET request to https://raw.githubusercontent.com/grafana/grafana/main/latest.json to get the latest version.
+# only a GET request to https://grafana.com/api/grafana/versions/stable to get the latest version.
 check_for_updates = true
 
 # Set to false to disable all checks to https://grafana.com
@@ -375,14 +385,14 @@ content_security_policy_report_only = false
 # $ROOT_PATH is server.root_url without the protocol.
 content_security_policy_report_only_template = """script-src 'self' 'unsafe-eval' 'unsafe-inline' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline' blob:;img-src * data:;base-uri 'self';connect-src 'self' grafana.com ws://$ROOT_PATH wss://$ROOT_PATH;manifest-src 'self';media-src 'none';form-action 'self';"""
 
-# Controls if old angular plugins are supported or not. This will be disabled by default in future release
-angular_support_enabled = true
+# Controls if old angular plugins are supported or not.
+angular_support_enabled = false
 
 # The CSRF check will be executed even if the request has no login cookie.
 csrf_always_check = false
 
 # Comma-separated list of plugins ids that won't be loaded inside the frontend sandbox
-disable_frontend_sandbox_for_plugins =
+disable_frontend_sandbox_for_plugins = grafana-incident-app
 
 [security.encryption]
 # Defines the time-to-live (TTL) for decrypted data encryption keys stored in memory (cache).
@@ -428,6 +438,11 @@ default_home_dashboard_path =
 # Upper limit of data sources that Grafana will return. This limit is a temporary configuration and it will be deprecated when pagination will be introduced on the list data sources API.
 datasource_limit = 5000
 
+# Number of queries to be executed concurrently. Only for the datasource supports concurrency.
+# For now only Loki and InfluxDB (with influxql) are supporting concurrency behind the feature flags.
+# Check datasource documentations for enabling concurrency.
+concurrent_query_count = 10
+
 
 ################################### SQL Data Sources #####################
 [sql_datasources]
@@ -463,6 +478,9 @@ auto_assign_org_role = Viewer
 # Require email validation before sign up completes
 verify_email_enabled = false
 
+# Redirect to default OrgId after login
+login_default_org_id =
+
 # Background text for the user field on the login page
 login_hint = email or username
 password_hint = password
@@ -490,6 +508,9 @@ editors_can_admin = false
 # The duration in time a user invitation remains valid before expiring. This setting should be expressed as a duration. Examples: 6h (hours), 2d (days), 1w (week). Default is 24h (24 hours). The minimum supported duration is 15m (15 minutes).
 user_invite_max_lifetime_duration = 24h
 
+# The duration in time a verification email, used to update the email address of a user, remains valid before expiring. This setting should be expressed as a duration. Examples: 6h (hours), 2d (days), 1w (week). Default is 1h (1 hour).
+verification_email_max_lifetime_duration = 1h
+
 # Enter a comma-separated list of usernames to hide them in the Grafana UI. These users are shown to Grafana admins and to themselves.
 hidden_users =
 
@@ -546,10 +567,6 @@ oauth_auto_login = false
 # OAuth state max age cookie duration in seconds. Defaults to 600 seconds.
 oauth_state_cookie_max_age = 600
 
-# Skip forced assignment of OrgID 1 or 'auto_assign_org_id' for social logins
-# Deprecated, use skip_org_role_sync option for specific provider instead.
-oauth_skip_org_role_update_sync = false
-
 # limit of api_key seconds to live before expiration
 api_key_max_seconds_to_live = -1
 
@@ -565,6 +582,27 @@ azure_auth_enabled = false
 # Use email lookup in addition to the unique ID provided by the IdP
 oauth_allow_insecure_email_lookup = false
 
+# Set to true to include id of identity as a response header
+id_response_header_enabled = false
+
+# Prefix used for the id response header, X-Grafana-Identity-Id
+id_response_header_prefix = X-Grafana
+
+# List of identity namespaces to add id response headers for, separated by space.
+# Available namespaces are user, api-key and service-account.
+# The header value will encode the namespace ("user:<id>", "api-key:<id>", "service-account:<id>")
+id_response_header_namespaces = user api-key service-account
+
+#################################### SSO Settings ###########################
+[sso_settings]
+# interval for reloading the SSO Settings from the database
+# useful in high availability setups running multiple Grafana instances
+# set to 0 to disable this feature
+reload_interval = 1m
+
+# List of providers that can be configured through the SSO Settings API and UI.
+configurable_providers = github gitlab google generic_oauth azuread okta
+
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
@@ -579,6 +617,9 @@ org_role = Viewer
 # mask the Grafana version number for unauthenticated users
 hide_version = false
 
+# number of devices in total
+device_limit =
+
 #################################### GitHub Auth #########################
 [auth.github]
 name = GitHub
@@ -592,6 +633,7 @@ scopes = user:email,read:org
 auth_url = https://github.com/login/oauth/authorize
 token_url = https://github.com/login/oauth/access_token
 api_url = https://api.github.com/user
+signout_redirect_url =
 allowed_domains =
 team_ids =
 allowed_organizations =
@@ -619,6 +661,7 @@ scopes = openid email profile
 auth_url = https://gitlab.com/oauth/authorize
 token_url = https://gitlab.com/oauth/token
 api_url = https://gitlab.com/api/v4
+signout_redirect_url =
 allowed_domains =
 allowed_groups =
 role_attribute_path =
@@ -645,7 +688,9 @@ scopes = openid email profile
 auth_url = https://accounts.google.com/o/oauth2/v2/auth
 token_url = https://oauth2.googleapis.com/token
 api_url = https://openidconnect.googleapis.com/v1/userinfo
+signout_redirect_url =
 allowed_domains =
+validate_hd = true
 hosted_domain =
 allowed_groups =
 role_attribute_path =
@@ -695,6 +740,7 @@ client_secret =
 scopes = openid email profile
 auth_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/authorize
 token_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/token
+signout_redirect_url =
 allowed_domains =
 allowed_groups =
 allowed_organizations =
@@ -722,6 +768,7 @@ scopes = openid profile email groups
 auth_url = https://<tenant-id>.okta.com/oauth2/v1/authorize
 token_url = https://<tenant-id>.okta.com/oauth2/v1/token
 api_url = https://<tenant-id>.okta.com/oauth2/v1/userinfo
+signout_redirect_url =
 allowed_domains =
 allowed_groups =
 role_attribute_path =
@@ -758,6 +805,7 @@ team_ids_attribute_path =
 auth_url =
 token_url =
 api_url =
+signout_redirect_url =
 teams_url =
 allowed_domains =
 allowed_groups =
@@ -776,6 +824,14 @@ use_refresh_token = false
 #################################### Basic Auth ##########################
 [auth.basic]
 enabled = true
+# This setting will enable a stronger password policy for user's password under basic auth.
+# The password will need to comply with the following password policy
+# 1. Have a minimum of 12 characters
+# 2. Composed by at least 1 uppercase character
+# 3. Composed by at least 1 lowercase character
+# 4. Composed by at least 1 digit character
+# 5. Composed by at least 1 symbol character
+password_policy = false
 
 #################################### Auth Proxy ##########################
 [auth.proxy]
@@ -783,7 +839,7 @@ enabled = false
 header_name = X-WEBAUTH-USER
 header_property = username
 auto_sign_up = true
-sync_ttl = 60
+sync_ttl = 15
 whitelist =
 headers =
 headers_encoded = false
@@ -796,6 +852,8 @@ enable_login_token = false
 header_name =
 email_claim =
 username_claim =
+email_attribute_path =
+username_attribute_path =
 jwk_set_url =
 jwk_set_file =
 cache_ttl = 60m
@@ -804,6 +862,7 @@ key_file =
 key_id =
 role_attribute_path =
 role_attribute_strict = false
+groups_attribute_path =
 auto_sign_up = false
 url_login = false
 allow_assign_grafana_admin = false
@@ -821,7 +880,7 @@ skip_org_role_sync = false
 sync_cron = "0 1 * * *"
 active_sync_enabled = true
 
-#################################### AWS ###########################
+#################################### AWS #####################################
 [aws]
 # Enter a comma-separated list of allowed AWS authentication providers.
 # Options are: default (AWS SDK Default), keys (Access && secret key), credentials (Credentials field), ec2_iam_role (EC2 IAM Role)
@@ -837,6 +896,14 @@ list_metrics_page_limit = 500
 # Experimental, for use in Grafana Cloud only. Please do not set.
 external_id =
 
+# Sets the expiry duration of an assumed role.
+# This setting should be expressed as a duration. Examples: 6h (hours), 10d (days), 2w (weeks), 1M (month).
+session_duration = "15m"
+
+# Set the plugins that will receive AWS settings for each request (via plugin context)
+# By default this will include all Grafana Labs owned AWS plugins, or those that make use of AWS settings (ElasticSearch, Prometheus).
+forward_settings_to_plugins = cloudwatch, grafana-athena-datasource, grafana-redshift-datasource, grafana-x-ray-datasource, grafana-timestream-datasource, grafana-iot-sitewise-datasource, grafana-iot-twinmaker-app, grafana-opensearch-datasource, aws-datasource-provisioner, elasticsearch, prometheus
+
 #################################### Azure ###############################
 [azure]
 # Azure cloud environment where Grafana is hosted
@@ -876,6 +943,13 @@ workload_identity_token_file =
 # Disabled by default, needs to be explicitly enabled
 user_identity_enabled = false
 
+# Specifies whether user identity authentication fallback credentials should be enabled in data sources
+# Enabling this allows data source creators to provide fallback credentials for backend initiated requests
+# e.g. alerting, recorded queries etc.
+# Enabled by default, needs to be explicitly disabled
+# Will not have any effect if user identity is disabled above
+user_identity_fallback_credentials_enabled = true
+
 # Override token URL for Azure Active Directory
 # By default is the same as token URL configured for AAD authentication settings
 user_identity_token_url =
@@ -888,6 +962,10 @@ user_identity_client_id =
 # By default is the same as used in AAD authentication or can be set to another application (for OBO flow)
 user_identity_client_secret =
 
+# Set the plugins that will receive Azure settings for each request (via plugin context)
+# By default this will include all Grafana Labs owned Azure plugins, or those that make use of Azure settings (Azure Monitor, Azure Data Explorer, Prometheus, MSSQL).
+forward_settings_to_plugins = grafana-azure-monitor-datasource, prometheus, grafana-azure-data-explorer-datasource, mssql
+
 #################################### Role-based Access Control ###########
 [rbac]
 # If enabled, cache permissions in a in memory cache
@@ -914,6 +992,10 @@ from_address = admin@grafana.localhost
 from_name = Grafana
 ehlo_identity =
 startTLS_policy =
+enable_tracing = false
+
+[smtp.static_headers]
+# Include custom static headers in all outgoing emails
 
 [emails]
 welcome_email_on_sign_up = false
@@ -1002,6 +1084,11 @@ instrumentations_console_enabled = false
 # Should webvitals instrumentation be enabled, only affects Grafana Javascript Agent
 instrumentations_webvitals_enabled = false
 
+# level of internal logging for debugging Grafana Javascript Agent.
+# possible values are: 0 = OFF, 1 = ERROR, 2 = WARN, 3 = INFO, 4 = VERBOSE
+# more details: https://github.com/grafana/faro-web-sdk/blob/v1.3.7/docs/sources/tutorials/quick-start-browser.md#how-to-activate-debugging
+internal_logger_level = 0
+
 # Api Key, only applies to Grafana Javascript Agent provider
 api_key =
 
@@ -1052,9 +1139,13 @@ global_file = 1000
 # global limit of correlations
 global_correlations = -1
 
+# Limit of the number of alert rules per rule group.
+# This is not strictly enforced yet, but will be enforced over time.
+alerting_rule_group_rules = 100
+
 #################################### Unified Alerting ####################
 [unified_alerting]
-# Enable the Unified Alerting sub-system and interface. When enabled we'll migrate all of your alert rules and notification channels to the new system. New alert rules will be created and your notification channels will be converted into an Alertmanager configuration. Previous data is preserved to enable backwards compatibility but new data is removed when switching. When this configuration section and flag are not defined, the state is defined at runtime. See the documentation for more details.
+# Enable the Alerting sub-system and interface.
 enabled =
 
 # Comma-separated list of organization IDs for which to disable unified alerting. Only supported if unified alerting is enabled.
@@ -1121,17 +1212,17 @@ ha_gossip_interval = 200ms
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 ha_push_pull_interval = 60s
 
-# Enable or disable alerting rule execution. The alerting UI remains visible. This option has a legacy version in the `[alerting]` section that takes precedence.
+# Enable or disable alerting rule execution. The alerting UI remains visible.
 execute_alerts = true
 
-# Alert evaluation timeout when fetching data from the datasource. This option has a legacy version in the `[alerting]` section that takes precedence.
+# Alert evaluation timeout when fetching data from the datasource.
 # The timeout string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 evaluation_timeout = 30s
 
-# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. This option has a legacy version in the `[alerting]` section that takes precedence.
-max_attempts = 3
+# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. The default value is 1.
+max_attempts = 1
 
-# Minimum interval to enforce between rule evaluations. Rules will be adjusted if they are less than this value or if they are not multiple of the scheduler interval (10s). Higher values can help with resource management as we'll schedule fewer evaluations over time. This option has a legacy version in the `[alerting]` section that takes precedence.
+# Minimum interval to enforce between rule evaluations. Rules will be adjusted if they are less than this value or if they are not multiple of the scheduler interval (10s). Higher values can help with resource management as we'll schedule fewer evaluations over time.
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 min_interval = 10s
 
@@ -1140,6 +1231,14 @@ min_interval = 10s
 # (concurrent queries per rule disabled).
 max_state_save_concurrency = 1
 
+# If the feature flag 'alertingSaveStatePeriodic' is enabled, this is the interval that is used to persist the alerting instances to the database.
+# The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
+state_periodic_save_interval = 5m
+
+# Disables the smoothing of alert evaluations across their evaluation window.
+# Rules will evaluate in sync.
+disable_jitter = false
+
 [unified_alerting.screenshots]
 # Enable screenshots in notifications. You must have either installed the Grafana image rendering
 # plugin, or set up Grafana to use a remote rendering service.
@@ -1213,6 +1312,10 @@ loki_basic_auth_username =
 # Optional password for basic authentication on requests sent to Loki. Can be left blank.
 loki_basic_auth_password =
 
+# For "loki" only.
+# Optional max query length for queries sent to Loki. Default is 721h which matches the default Loki value.
+loki_max_query_length = 721h
+
 [unified_alerting.state_history.external_labels]
 # Optional extra labels to attach to outbound state history records or log streams.
 # Any number of label key-value-pairs can be provided.
@@ -1220,6 +1323,17 @@ loki_basic_auth_password =
 # ex.
 # mylabelkey = mylabelvalue
 
+[unified_alerting.state_history.annotations]
+# Controls retention of annotations automatically created while evaluating alert rules.
+# Alert state history backend must be configured to be annotations (see setting [unified_alerting.state_history].backend).
+
+# Configures how long alert annotations are stored for. Default is 0, which keeps them forever.
+# This setting should be expressed as a duration. Ex 6h (hours), 10d (days), 2w (weeks), 1M (month).
+max_age =
+
+# Configures max number of alert annotations that Grafana stores. Default value is 0, which keeps all alert annotations.
+max_annotations_to_keep =
+
 # NOTE: this configuration options are not used yet.
 [remote.alertmanager]
 
@@ -1228,53 +1342,19 @@ loki_basic_auth_password =
 enabled = false
 
 # URL of the remote Alertmanager that will replace the internal one.
+# This URL should be the root path, Grafana will automatically append an "/alertmanager" suffix for certain HTTP calls.
 # Required if `enabled` is set to `true`.
 url =
 
 # Tenant ID to use in requests to the Alertmanager.
-# It will also be used for the basic auth username.
+# It will also be used for the basic auth username if a password is configured.
 tenant =
 
 # Optional password for basic authentication.
 # If not present, the tenant ID will be set in the X-Scope-OrgID header.
 password =
 
-#################################### Alerting ############################
-[alerting]
-# Enable the legacy alerting sub-system and interface. If Unified Alerting is already enabled and you try to go back to legacy alerting, all data that is part of Unified Alerting will be deleted. When this configuration section and flag are not defined, the state is defined at runtime. See the documentation for more details.
-enabled =
-
-# Makes it possible to turn off alert execution but alerting UI is visible
-execute_alerts = true
-
-# Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state)
-error_or_timeout = alerting
-
-# Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)
-nodata_or_nullvalues = no_data
-
-# Alert notifications can include images, but rendering many images at the same time can overload the server
-# This limit will protect the server from render overloading and make sure notifications are sent out quickly
-concurrent_render_limit = 5
-
-# Default setting for alert calculation timeout. Default value is 30
-evaluation_timeout_seconds = 30
-
-# Default setting for alert notification timeout. Default value is 30
-notification_timeout_seconds = 30
-
-# Default setting for max attempts to sending alert notifications. Default value is 3
-max_attempts = 3
-
-# Makes it possible to enforce a minimal interval between evaluations, to reduce load on the backend
-min_interval_seconds = 1
-
-# Configures for how long alert annotations are stored. Default is 0, which keeps them forever.
-# This setting should be expressed as an duration. Ex 6h (hours), 10d (days), 2w (weeks), 1M (month).
-max_annotation_age =
-
-# Configures max number of alert annotations that Grafana stores. Default value is 0, which keeps all alert annotations.
-max_annotations_to_keep =
+sync_interval = 5m
 
 #################################### Annotations #########################
 [annotations]
@@ -1479,6 +1559,12 @@ concurrent_render_request_limit = 30
 # Default is 5m. This should be more than enough for most deployments.
 # Change the value only if image rendering is failing and you see `Failed to get the render key from cache` in Grafana logs.
 render_key_lifetime = 5m
+# Default width for panel screenshot
+default_image_width = 1000
+# Default height for panel screenshot
+default_image_height = 500
+# Default scale for panel screenshot
+default_image_scale = 1
 
 [panels]
 # here for to support old env variables, can remove after a few months
@@ -1507,6 +1593,10 @@ public_key_retrieval_on_startup = false
 disable_plugins =
 # Auth token for plugin installations and removal in managed instances
 install_token =
+# Comma separated list of plugin ids for which angular deprecation UI should be disabled
+hide_angular_deprecation =
+# Comma separated list of plugin ids for which environment variables should be forwarded. Used only when feature flag pluginsSkipHostEnvVars is enabled.
+forward_host_env_vars =
 
 #################################### Grafana Live ##########################################
 [live]
@@ -1562,6 +1652,10 @@ rendering_verbose_logging =
 # Default is false. This can be useful to enable (true) when troubleshooting.
 rendering_dumpio =
 
+# Instruct headless browser instance whether to register metrics for the duration of every rendering step. Default is false.
+# This can be useful to enable (true) when optimizing the rendering mode settings to improve the plugin performance or when troubleshooting.
+rendering_timing_metrics =
+
 # Additional arguments to pass to the headless browser instance. Default is --no-sandbox. The list of Chromium flags can be found
 # here (https://peter.sh/experiments/chromium-command-line-switches/). Multiple arguments is separated with comma-character.
 rendering_args =
@@ -1698,6 +1792,8 @@ server_name =
 proxy_address =
 # Determines if the secure socks proxy should be shown on the datasources page, defaults to true if the feature is enabled
 show_ui = true
+# Disables TLS in the secure socks proxy
+allow_insecure = false
 
 ################################## Feature Management ##############################################
 # Options to configure the experimental Feature Toggle Admin Page feature, which is behind the `featureToggleAdminPage` feature toggle. Use at your own risk.
@@ -1716,3 +1812,23 @@ hidden_toggles =
 
 # Disables updating specific feature toggles in the feature management page
 read_only_toggles =
+
+#################################### Public Dashboards #####################################
+[public_dashboards]
+# Set to false to disable public dashboards
+enabled = true
+
+###################################### Cloud Migration ######################################
+[cloud_migration]
+# Set to true to enable target-side migration UI
+is_target = false
+# Token used to send requests to grafana com
+gcom_api_token = ""
+# How long to wait for a request to fetch an instance to complete
+fetch_instance_timeout = 5s
+# How long to wait for a request to create an access policy to complete
+create_access_policy_timeout = 5s
+# How long to wait for a request to create to fetch an access policy to complete
+fetch_access_policy_timeout = 5s
+# How long to wait for a request to create to delete an access policy to complete
+delete_access_policy_timeout = 5s
\ No newline at end of file
diff --git a/conf/provisioning/alerting/sample.yaml b/conf/provisioning/alerting/sample.yaml
index ec41552e5310b..51836f25b3f58 100644
--- a/conf/provisioning/alerting/sample.yaml
+++ b/conf/provisioning/alerting/sample.yaml
@@ -67,6 +67,45 @@ apiVersion: 1
 #       labels:
 #         team: sre_team_1
 #       isPaused: false
+#       # optional settings that let configure notification settings applied to alerts created by this rule
+#       notification_settings:
+#          # <string> name of the receiver (contact-point) that should be used for this route
+#          receiver: grafana-default-email
+#          # <list<string>> The labels by which incoming alerts are grouped together. For example,
+#          #        multiple alerts coming in for cluster=A and alertname=LatencyHigh would
+#          #        be batched into a single group.
+#          #
+#          #        To aggregate by all possible labels, use the special value '...' as
+#          #        the sole label name, for example:
+#          #        group_by: ['...']
+#          #        This effectively disables aggregation entirely, passing through all
+#          #        alerts as-is. This is unlikely to be what you want, unless you have
+#          #        a very low alert volume or your upstream notification system performs
+#          #        its own grouping.
+#          # If defined, must contain the labels 'alertname' and 'grafana_folder', except when contains '...'
+#          group_by: ["alertname", "grafana_folder", "region"]
+#          # <list> Times when the route should be muted. These must match the name of a
+#          #        mute time interval.
+#          #        Additionally, the root node cannot have any mute times.
+#          #        When a route is muted it will not send any notifications, but
+#          #        otherwise acts normally (including ending the route-matching process
+#          #        if the `continue` option is not set)
+#          mute_time_intervals:
+#          - abc
+#          # <duration> How long to initially wait to send a notification for a group
+#          #            of alerts. Allows to collect more initial alerts for the same group.
+#          #            (Usually ~0s to few minutes).
+#          #            If not specified, the corresponding setting of the default policy is used.
+#          group_wait: 30s
+#          # <duration> How long to wait before sending a notification about new alerts that
+#          #            are added to a group of alerts for which an initial notification has
+#          #            already been sent. (Usually ~5m or more).
+#          #            If not specified, the corresponding setting of the default policy is used.
+#          group_interval: 5m
+#          # <duration>  How long to wait before sending a notification again if it has already
+#          #             been sent successfully for an alert. (Usually ~3h or more)
+#          #             If not specified, the corresponding setting of the default policy is used.
+#          repeat_interval: 4h
 
 # # List of alert rule UIDs that should be deleted
 # deleteRules:
diff --git a/conf/provisioning/datasources/sample.yaml b/conf/provisioning/datasources/sample.yaml
index 2d9bae8ee5622..98895709d5989 100644
--- a/conf/provisioning/datasources/sample.yaml
+++ b/conf/provisioning/datasources/sample.yaml
@@ -1,50 +1,71 @@
-# # config file version
+# Configuration file version
 apiVersion: 1
 
-# # list of datasources that should be deleted from the database
-#deleteDatasources:
+# # List of data sources to delete from the database.
+# deleteDatasources:
 #   - name: Graphite
 #     orgId: 1
 
-# # list of datasources to insert/update depending
-# # on what's available in the database
-#datasources:
-#   # <string, required> name of the datasource. Required
-# - name: Graphite
-#   # <string, required> datasource type. Required
-#   type: graphite
-#   # <string, required> access mode. direct or proxy. Required
-#   access: proxy
-#   # <int> org id. will default to orgId 1 if not specified
-#   orgId: 1
-#   # <string> url
-#   url: http://localhost:8080
-#   # <string> database user, if used
-#   user:
-#   # <string> database name, if used
-#   database:
-#   # <bool> enable/disable basic auth
-#   basicAuth:
-#   # <string> basic auth username
-#   basicAuthUser:
-#   # <bool> enable/disable with credentials headers
-#   withCredentials:
-#   # <bool> mark as default datasource. Max one per org
-#   isDefault:
-#   # <map> fields that will be converted to json and stored in json_data
-#   jsonData:
-#      graphiteVersion: "1.1"
-#      tlsAuth: true
-#      tlsAuthWithCACert: true
-#      httpHeaderName1: "Authorization"
-#   # <string> json object of data that will be encrypted.
-#   secureJsonData:
-#     tlsCACert: "..."
-#     tlsClientCert: "..."
-#     tlsClientKey: "..."
-#     # <openshift\kubernetes token example>
-#     httpHeaderValue1: "Bearer xf5yhfkpsnmgo"
-#   version: 1
-#   # <bool> allow users to edit datasources from the UI.
-#   editable: false
-
+# # List of data sources to insert/update depending on what's
+# # available in the database.
+# datasources:
+#   # <string, required> Sets the name you use to refer to
+#   # the data source in panels and queries.
+#   - name: Graphite
+#     # <string, required> Sets the data source type.
+#     type: graphite
+#     # <string, required> Sets the access mode, either
+#     # proxy or direct (Server or Browser in the UI).
+#     # Some data sources are incompatible with any setting
+#     # but proxy (Server).
+#     access: proxy
+#     # <int> Sets the organization id. Defaults to orgId 1.
+#     orgId: 1
+#     # <string> Sets a custom UID to reference this
+#     # data source in other parts of the configuration.
+#     # If not specified, Grafana generates one.
+#     uid: my_unique_uid
+#     # <string> Sets the data source's URL, including the
+#     # port.
+#     url: http://localhost:8080
+#     # <string> Sets the database user, if necessary.
+#     user:
+#     # <string> Sets the database name, if necessary.
+#     database:
+#     # <bool> Enables basic authorization.
+#     basicAuth:
+#     # <string> Sets the basic authorization username.
+#     basicAuthUser:
+#     # <bool> Enables credential headers.
+#     withCredentials:
+#     # <bool> Toggles whether the data source is pre-selected
+#     # for new panels. You can set only one default
+#     # data source per organization.
+#     isDefault:
+#     # <map> Fields to convert to JSON and store in jsonData.
+#     jsonData:
+#       # <string> Defines the Graphite service's version.
+#       graphiteVersion: '1.1'
+#       # <bool> Enables TLS authentication using a client
+#       # certificate configured in secureJsonData.
+#       tlsAuth: true
+#       # <bool> Enables TLS authentication using a CA
+#       # certificate.
+#       tlsAuthWithCACert: true
+#     # <map> Fields to encrypt before storing in jsonData.
+#     secureJsonData:
+#       # <string> Defines the CA cert, client cert, and
+#       # client key for encrypted authentication.
+#       tlsCACert: '...'
+#       tlsClientCert: '...'
+#       tlsClientKey: '...'
+#       # <string> Sets the database password, if necessary.
+#       password:
+#       # <string> Sets the basic authorization password.
+#       basicAuthPassword:
+#     # <int> Sets the version. Used to compare versions when
+#     # updating. Ignored when creating a new data source.
+#     version: 1
+#     # <bool> Allows users to edit data sources from the
+#     # Grafana UI.
+#     editable: false
diff --git a/conf/provisioning/notifiers/sample.yaml b/conf/provisioning/notifiers/sample.yaml
deleted file mode 100644
index 7d90983941252..0000000000000
--- a/conf/provisioning/notifiers/sample.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# # config file version
-apiVersion: 1
-
-# notifiers:
-#   - name: default-slack-temp
-#     type: slack
-#     org_name: Main Org.
-#     is_default: true
-#     uid: notifier1
-#     settings:
-#       recipient: "XXX"
-#       token: "xoxb"
-#       uploadImage: true
-#       url: https://slack.com
-#   - name: default-email
-#     type: email
-#     org_id: 1
-#     uid: notifier2
-#     is_default: false  
-#     settings:
-#       addresses: example11111@example.com
-# delete_notifiers:
-#   - name: default-slack-temp
-#     org_name: Main Org.
-#     uid: notifier1
\ No newline at end of file
diff --git a/conf/sample.ini b/conf/sample.ini
index 6b556b8144fe7..f315784fed258 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -9,9 +9,6 @@
 # instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty
 ;instance_name = ${HOSTNAME}
 
-# force migration will run migrations that might cause dataloss
-;force_migration = false
-
 #################################### Paths ####################################
 [paths]
 # Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
@@ -70,6 +67,9 @@
 ;cert_file =
 ;cert_key =
 
+# Certificates file watch interval
+;certs_watch_interval =
+
 # Unix socket gid
 # Changing the gid of a file without privileges requires that the target group is in the group of the process and that the process is the file owner
 # It is recommended to set the gid as http server user gid
@@ -123,6 +123,9 @@
 # For "mysql", use either "true", "false", or "skip-verify".
 ;ssl_mode = disable
 
+# For "postregs", use either "1" to enable or "0" to disable SNI
+;ssl_sni =
+
 # Database drivers may support different transaction isolation levels.
 # Currently, only "mysql" driver supports isolation levels.
 # If the value is empty - driver's default isolation level is applied.
@@ -155,7 +158,10 @@
 # For "sqlite3" only. Enable/disable Write-Ahead Logging, https://sqlite.org/wal.html. Default is false.
 ;wal = false
 
-# For "mysql" only if migrationLocking feature toggle is set. How many seconds to wait before failing to lock the database for the migrations, default is 0.
+# For "mysql" and "postgres" only. Lock the database for the migrations, default is true.
+;migration_locking = true
+
+# For "mysql" and "postgres" only. How many seconds to wait before failing to lock the database for the migrations, default is 0.
 ;locking_attempt_timeout_sec = 0
 
 # For "sqlite" only. How many times to retry query in case of database is locked failures. Default is 0 (disabled).
@@ -252,7 +258,7 @@
 # for new versions of grafana. The check is used
 # in some UI views to notify that a grafana update exists.
 # This option does not cause any auto updates, nor send any information
-# only a GET request to https://raw.githubusercontent.com/grafana/grafana/main/latest.json to get the latest version.
+# only a GET request to https://grafana.com/api/grafana/versions/stable to get the latest version.
 ;check_for_updates = true
 
 # Set to false to disable all checks to https://grafana.com
@@ -375,8 +381,8 @@
 # $NONCE in the template includes a random nonce.
 # $ROOT_PATH is server.root_url without the protocol.
 ;content_security_policy_report_only_template = """script-src 'self' 'unsafe-eval' 'unsafe-inline' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline' blob:;img-src * data:;base-uri 'self';connect-src 'self' grafana.com ws://$ROOT_PATH wss://$ROOT_PATH;manifest-src 'self';media-src 'none';form-action 'self';"""
-# Controls if old angular plugins are supported or not. This will be disabled by default in future release
-;angular_support_enabled = true
+# Controls if old angular plugins are supported or not.
+;angular_support_enabled = false
 
 # List of additional allowed URLs to pass by the CSRF check, separated by spaces. Suggested when authentication comes from an IdP.
 ;csrf_trusted_origins = example.com
@@ -448,6 +454,9 @@
 # Require email validation before sign up completes
 ;verify_email_enabled = false
 
+# Redirect to default OrgId after login
+;login_default_org_id =
+
 # Background text for the user field on the login page
 ;login_hint = email or username
 ;password_hint = password
@@ -475,6 +484,9 @@
 # The duration in time a user invitation remains valid before expiring. This setting should be expressed as a duration. Examples: 6h (hours), 2d (days), 1w (week). Default is 24h (24 hours). The minimum supported duration is 15m (15 minutes).
 ;user_invite_max_lifetime_duration = 24h
 
+# The duration in time a verification email, used to update the email address of a user, remains valid before expiring. This setting should be expressed as a duration. Examples: 6h (hours), 2d (days), 1w (week). Default is 1h (1 hour).
+;verification_email_max_lifetime_duration = 1h
+
 # Enter a comma-separated list of users login to hide them in the Grafana UI. These users are shown to Grafana admins and themselves.
 ; hidden_users =
 
@@ -532,10 +544,6 @@
 # OAuth state max age cookie duration in seconds. Defaults to 600 seconds.
 ;oauth_state_cookie_max_age = 600
 
-# Skip forced assignment of OrgID 1 or 'auto_assign_org_id' for social logins
-# Deprecated, use skip_org_role_sync option for specific provider instead.
-;oauth_skip_org_role_update_sync = false
-
 # limit of api_key seconds to live before expiration
 ;api_key_max_seconds_to_live = -1
 
@@ -554,6 +562,17 @@
 # Use email lookup in addition to the unique ID provided by the IdP
 ;oauth_allow_insecure_email_lookup = false
 
+# Set to true to include id of identity as a response header
+;id_response_header_enabled = false
+
+# Prefix used for the id response header, X-Grafana-Identity-Id
+;id_response_header_prefix = X-Grafana
+
+# List of identity namespaces to add id response headers for, separated by space.
+# Available namespaces are user, api-key and service-account.
+# The header value will encode the namespace ("user:<id>", "api-key:<id>", "service-account:<id>")
+;id_response_header_namespaces = user api-key service-account
+
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
@@ -581,6 +600,7 @@
 ;auth_url = https://github.com/login/oauth/authorize
 ;token_url = https://github.com/login/oauth/access_token
 ;api_url = https://api.github.com/user
+;signout_redirect_url =
 ;allowed_domains =
 ;team_ids =
 ;allowed_organizations =
@@ -602,6 +622,7 @@
 ;auth_url = https://gitlab.com/oauth/authorize
 ;token_url = https://gitlab.com/oauth/token
 ;api_url = https://gitlab.com/api/v4
+;signout_redirect_url =
 ;allowed_domains =
 ;allowed_groups =
 ;role_attribute_path =
@@ -627,7 +648,9 @@
 ;auth_url = https://accounts.google.com/o/oauth2/v2/auth
 ;token_url = https://oauth2.googleapis.com/token
 ;api_url = https://openidconnect.googleapis.com/v1/userinfo
+;signout_redirect_url =
 ;allowed_domains =
+;validate_hd =
 ;hosted_domain =
 ;allowed_groups =
 ;role_attribute_path =
@@ -661,6 +684,7 @@
 ;scopes = openid email profile
 ;auth_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/authorize
 ;token_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/token
+;signout_redirect_url =
 ;allowed_domains =
 ;allowed_groups =
 ;allowed_organizations =
@@ -682,6 +706,7 @@
 ;auth_url = https://<tenant-id>.okta.com/oauth2/v1/authorize
 ;token_url = https://<tenant-id>.okta.com/oauth2/v1/token
 ;api_url = https://<tenant-id>.okta.com/oauth2/v1/userinfo
+;signout_redirect_url =
 ;allowed_domains =
 ;allowed_groups =
 ;role_attribute_path =
@@ -708,6 +733,7 @@
 ;auth_url = https://foo.bar/login/oauth/authorize
 ;token_url = https://foo.bar/login/oauth/access_token
 ;api_url = https://foo.bar/user
+;signout_redirect_url =
 ;teams_url =
 ;allowed_domains =
 ;team_ids =
@@ -727,6 +753,7 @@
 #################################### Basic Auth ##########################
 [auth.basic]
 ;enabled = true
+;password_policy = false
 
 #################################### Auth Proxy ##########################
 [auth.proxy]
@@ -748,6 +775,8 @@
 ;header_name = X-JWT-Assertion
 ;email_claim = sub
 ;username_claim = sub
+;email_attribute_path = jmespath.email
+;username_attribute_path = jmespath.username
 ;jwk_set_url = https://foo.bar/.well-known/jwks.json
 ;jwk_set_file = /path/to/jwks.json
 ;cache_ttl = 60m
@@ -756,6 +785,7 @@
 # Use in conjunction with key_file in case the JWT token's header specifies a key ID in "kid" field
 ;key_id = some-key-id
 ;role_attribute_path =
+;groups_attribute_path =
 ;role_attribute_strict = false
 ;auto_sign_up = false
 ;url_login = false
@@ -790,6 +820,14 @@
 # Experimental, for use in Grafana Cloud only. Please do not set.
 ; external_id =
 
+# Sets the expiry duration of an assumed role.
+# This setting should be expressed as a duration. Examples: 6h (hours), 10d (days), 2w (weeks), 1M (month).
+; session_duration = "15m"
+
+# Set the plugins that will receive AWS settings for each request (via plugin context)
+# By default this will include all Grafana Labs owned AWS plugins, or those that make use of AWS settings (ElasticSearch, Prometheus).
+; forward_settings_to_plugins = cloudwatch, grafana-athena-datasource, grafana-redshift-datasource, grafana-x-ray-datasource, grafana-timestream-datasource, grafana-iot-sitewise-datasource, grafana-iot-twinmaker-app, grafana-opensearch-datasource, aws-datasource-provisioner, elasticsearch, prometheus
+
 #################################### Azure ###############################
 [azure]
 # Azure cloud environment where Grafana is hosted
@@ -829,6 +867,13 @@
 # Disabled by default, needs to be explicitly enabled
 ;user_identity_enabled = false
 
+# Specifies whether user identity authentication fallback credentials should be enabled in data sources
+# Enabling this allows data source creators to provide fallback credentials for backend initiated requests
+# e.g. alerting, recorded queries etc.
+# Enabled by default, needs to be explicitly disabled
+# Will not have any effect if user identity is disabled above
+;user_identity_fallback_credentials_enabled = true
+
 # Override token URL for Azure Active Directory
 # By default is the same as token URL configured for AAD authentication settings
 ;user_identity_token_url =
@@ -841,6 +886,10 @@
 # By default is the same as used in AAD authentication or can be set to another application (for OBO flow)
 ;user_identity_client_secret =
 
+# Set the plugins that will receive Azure settings for each request (via plugin context)
+# By default this will include all Grafana Labs owned Azure plugins, or those that make use of Azure settings (Azure Monitor, Azure Data Explorer, Prometheus, MSSQL).
+;forward_settings_to_plugins = grafana-azure-monitor-datasource, prometheus, grafana-azure-data-explorer-datasource, mssql
+
 #################################### Role-based Access Control ###########
 [rbac]
 ;permission_cache = true
@@ -868,6 +917,13 @@
 ;ehlo_identity = dashboard.example.com
 # SMTP startTLS policy (defaults to 'OpportunisticStartTLS')
 ;startTLS_policy = NoStartTLS
+# Enable trace propagation in e-mail headers, using the 'traceparent', 'tracestate' and (optionally) 'baggage' fields (defaults to false)
+;enable_tracing = false
+
+[smtp.static_headers]
+# Include custom static headers in all outgoing emails
+;Foo-Header = bar
+;Foo = bar
 
 [emails]
 ;welcome_email_on_sign_up = false
@@ -1003,6 +1059,10 @@
 # global limit of correlations
 ; global_correlations = -1
 
+# Limit of the number of alert rules per rule group.
+# This is not strictly enforced yet, but will be enforced over time.
+;alerting_rule_group_rules = 100
+
 #################################### Unified Alerting ####################
 [unified_alerting]
 #Enable the Unified Alerting sub-system and interface. When enabled we'll migrate all of your alert rules and notification channels to the new system. New alert rules will be created and your notification channels will be converted into an Alertmanager configuration. Previous data is preserved to enable backwards compatibility but new data is removed.```
@@ -1069,20 +1129,33 @@
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 ;ha_push_pull_interval = "60s"
 
-# Enable or disable alerting rule execution. The alerting UI remains visible. This option has a legacy version in the `[alerting]` section that takes precedence.
+# Enable or disable alerting rule execution. The alerting UI remains visible.
 ;execute_alerts = true
 
-# Alert evaluation timeout when fetching data from the datasource. This option has a legacy version in the `[alerting]` section that takes precedence.
+# Alert evaluation timeout when fetching data from the datasource.
 # The timeout string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 ;evaluation_timeout = 30s
 
-# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. This option has a legacy version in the `[alerting]` section that takes precedence.
-;max_attempts = 3
+# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. The default value is 1.
+;max_attempts = 1
 
-# Minimum interval to enforce between rule evaluations. Rules will be adjusted if they are less than this value  or if they are not multiple of the scheduler interval (10s). Higher values can help with resource management as we'll schedule fewer evaluations over time. This option has a legacy version in the `[alerting]` section that takes precedence.
+# Minimum interval to enforce between rule evaluations. Rules will be adjusted if they are less than this value  or if they are not multiple of the scheduler interval (10s). Higher values can help with resource management as we'll schedule fewer evaluations over time.
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 ;min_interval = 10s
 
+# This is an experimental option to add parallelization to saving alert states in the database.
+# It configures the maximum number of concurrent queries per rule evaluated. The default value is 1
+# (concurrent queries per rule disabled).
+;max_state_save_concurrency = 1
+
+# If the feature flag 'alertingSaveStatePeriodic' is enabled, this is the interval that is used to persist the alerting instances to the database.
+# The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
+;state_periodic_save_interval = 5m
+
+# Disables the smoothing of alert evaluations across their evaluation window.
+# Rules will evaluate in sync.
+;disable_jitter = false
+
 [unified_alerting.reserved_labels]
 # Comma-separated list of reserved labels added by the Grafana Alerting engine that should be disabled.
 # For example: `disabled_labels=grafana_folder`
@@ -1133,47 +1206,25 @@
 # Optional password for basic authentication on requests sent to Loki. Can be left blank.
 ; loki_basic_auth_password = "mypass"
 
+# For "loki" only.
+# Optional max query length for queries sent to Loki. Default is 721h which matches the default Loki value.
+; loki_max_query_length = 360h
+
 [unified_alerting.state_history.external_labels]
 # Optional extra labels to attach to outbound state history records or log streams.
 # Any number of label key-value-pairs can be provided.
 ; mylabelkey = mylabelvalue
 
-#################################### Alerting ############################
-[alerting]
-# Disable legacy alerting engine & UI features
-;enabled = false
-
-# Makes it possible to turn off alert execution but alerting UI is visible
-;execute_alerts = true
-
-# Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state)
-;error_or_timeout = alerting
-
-# Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)
-;nodata_or_nullvalues = no_data
-
-# Alert notifications can include images, but rendering many images at the same time can overload the server
-# This limit will protect the server from render overloading and make sure notifications are sent out quickly
-;concurrent_render_limit = 5
-
-# Default setting for alert calculation timeout. Default value is 30
-;evaluation_timeout_seconds = 30
-
-# Default setting for alert notification timeout. Default value is 30
-;notification_timeout_seconds = 30
-
-# Default setting for max attempts to sending alert notifications. Default value is 3
-;max_attempts = 3
-
-# Makes it possible to enforce a minimal interval between evaluations, to reduce load on the backend
-;min_interval_seconds = 1
+[unified_alerting.state_history.annotations]
+# This section controls retention of annotations automatically created while evaluating alert rules
+# when alerting state history backend is configured to be annotations (a setting [unified_alerting.state_history].backend
 
 # Configures for how long alert annotations are stored. Default is 0, which keeps them forever.
-# This setting should be expressed as a duration. Examples: 6h (hours), 10d (days), 2w (weeks), 1M (month).
-;max_annotation_age =
+# This setting should be expressed as an duration. Ex 6h (hours), 10d (days), 2w (weeks), 1M (month).
+max_age =
 
 # Configures max number of alert annotations that Grafana stores. Default value is 0, which keeps all alert annotations.
-;max_annotations_to_keep =
+max_annotations_to_keep =
 
 #################################### Annotations #########################
 [annotations]
@@ -1566,6 +1617,7 @@
 # The address of the socks5 proxy datasources should connect to
 ; proxy_address =
 ; show_ui = true
+; allow_insecure = false
 
 ################################## Feature Management ##############################################
 [feature_management]
@@ -1580,3 +1632,8 @@
 ;hidden_toggles =
 # Disable updating specific feature toggles in the feature management page
 ;read_only_toggles =
+
+#################################### Public Dashboards #####################################
+[public_dashboards]
+# Set to false to disable public dashboards
+;enabled = true
diff --git a/ISSUE_TRIAGE.md b/contribute/ISSUE_TRIAGE.md
similarity index 97%
rename from ISSUE_TRIAGE.md
rename to contribute/ISSUE_TRIAGE.md
index 336b6497a25ac..70ee5c5e7bc83 100644
--- a/ISSUE_TRIAGE.md
+++ b/contribute/ISSUE_TRIAGE.md
@@ -4,7 +4,7 @@ The main goal of issue triage is to categorize all incoming Grafana issues and m
 
 > **Note:** This information is for Grafana project Maintainers, Owners, and Admins. If you are a Contributor, then you will not be able to perform most of the tasks in this topic.
 
-The core maintainers of the Grafana project are responsible for categorizing all incoming issues and delegating any critical or important issue to other maintainers. Currently one maintainer each week is responsible. Besides that part, triage provides an important way to contribute to an open source project.
+The core maintainers of the Grafana project are responsible for categorizing all incoming issues and delegating any critical or important issue to other maintainers. Currently, one maintainer each week is responsible. Besides that part, triage provides an important way to contribute to an open source project.
 
 Triage helps ensure issues resolve quickly by:
 
@@ -136,13 +136,13 @@ To make it easier for everyone to understand and find issues they're searching f
 
 Depending on the issue, you might not feel all this information is needed. Use your best judgement. If you cannot triage an issue using what its author provided, explain kindly to the author that they must provide the above information to clarify the problem. Label issue with `needs more info` and add any related `area/*` or `datasource/*` labels. Alternatively, use `bot/needs more info` label and the Grafana bot will request it for you.
 
-If the author provides the standard information but you are still unable to triage the issue, request additional information. Do this kindly and politely because you are asking for more of the author's time.
+If the author provides the standard information, but you are still unable to triage the issue, request additional information. Do this kindly and politely because you are asking for more of the author's time.
 
 If the author does not respond to the requested information within the timespan of a week, close the issue with a kind note stating that the author can request for the issue to be reopened when the necessary information is provided.
 
 When you feel you have all the information needed you're ready to [categorizing the issue](#3-categorizing-an-issue).
 
-If you receive a notification with additional information provided but you are not anymore on issue triage and you feel you do not have time to handle it, you should delegate it to the current person on issue triage.
+If you receive a notification with additional information provided, but you are not anymore on issue triage and you feel you do not have time to handle it, you should delegate it to the current person on issue triage.
 
 ## 3. Categorizing an issue
 
@@ -312,7 +312,7 @@ When an issue has all basic information provided, but the triage responsible hav
 
 Investigating issues can be a very time consuming task, especially for the maintainers, given the huge number of combinations of plugins, data sources, platforms, databases, browsers, tools, hardware, integrations, versions and cloud services, etc that are being used with Grafana. There is a certain number of combinations that are more common than others, and these are in general easier for maintainers to investigate.
 
-For some other combinations it may not be possible at all for a maintainer to setup a proper test environment to investigate the issue. In these cases we really appreciate any help we can get from the community. Otherwise the issue is highly likely to be closed.
+For some other combinations it may not be possible at all for a maintainer to setup a proper test environment to investigate the issue. In these cases we really appreciate any help we can get from the community. Otherwise, the issue is highly likely to be closed.
 
 Even if you don't have the time or knowledge to investigate an issue we highly recommend that you [upvote](https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments) the issue if you happen to have the same problem. If you have further details that may help investigating the issue please provide as much information as possible.
 
diff --git a/UPGRADING_DEPENDENCIES.md b/contribute/UPGRADING_DEPENDENCIES.md
similarity index 100%
rename from UPGRADING_DEPENDENCIES.md
rename to contribute/UPGRADING_DEPENDENCIES.md
diff --git a/contribute/backend/errors.md b/contribute/backend/errors.md
index 1d3ba3c9228f4..2d79cb8a6e141 100644
--- a/contribute/backend/errors.md
+++ b/contribute/backend/errors.md
@@ -109,7 +109,7 @@ fully Go modules compatible, but can be viewed using
 ### Error source
 
 You can optionally specify an error source that describes from where an
-error originates. By default it's _server_ and means the error originates
+error originates. By default, it's _server_ and means the error originates
 from within the application, e.g. Grafana. The `errutil.WithDownstream()`
 option may be appended to the NewBase function call to denote an error
 originates from a _downstream_ server/service. The error source information
diff --git a/contribute/backend/instrumentation.md b/contribute/backend/instrumentation.md
index a845825828a7b..d6d50c19c810e 100644
--- a/contribute/backend/instrumentation.md
+++ b/contribute/backend/instrumentation.md
@@ -80,7 +80,7 @@ func doSomething(ctx context.Context) {
 
 ### Enable certain log levels for certain loggers
 
-During development it's convenient to enable certain log level, e.g. debug, for certain loggers to minimize the generated log output and make it easier to find things. See [[log.filters]](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#filters) for information how to configure this.
+During development, it's convenient to enable certain log level, e.g. debug, for certain loggers to minimize the generated log output and make it easier to find things. See [[log.filters]](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#filters) for information how to configure this.
 
 It's also possible to configure multiple loggers:
 
diff --git a/contribute/backend/style-guide.md b/contribute/backend/style-guide.md
index 08d1eb8ff99d3..a0877c3b44b63 100644
--- a/contribute/backend/style-guide.md
+++ b/contribute/backend/style-guide.md
@@ -29,13 +29,40 @@ We value clean and readable code, that is loosely coupled and covered by unit te
 
 Tests must use the standard library, `testing`. For assertions, prefer using [testify](https://github.com/stretchr/testify).
 
+### Test Suite and Database Tests
+
+We have a [testsuite](https://github.com/grafana/grafana/tree/main/pkg/tests/testsuite) package which provides utilities for package-level setup and teardown.
+
+Currently, this is just used to ensure that test databases are correctly set up and torn down, but it also provides a place we can attach future tasks.
+
+Each package SHOULD include a [TestMain](https://pkg.go.dev/testing#hdr-Main) function that calls `testsuite.Run(m)`:
+
+```go
+package mypkg
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana/pkg/tests/testsuite"
+)
+
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+```
+
+You only need to define `TestMain` in one `_test.go` file within each package.
+
+> Warning
+> For tests that use the database, you MUST define `TestMain` so that the test databases can be cleaned up properly.
+
 ### Integration Tests
 
 We run unit and integration tests separately, to help keep our CI pipeline running smoothly and provide a better developer experience.
 
 To properly mark a test as being an integration test, you must format your test function definition as follows, with the function name starting with `TestIntegration` and the check for `testing.Short()`:
 
-```
+```go
 func TestIntegrationFoo(t *testing.T) {
     if testing.Short() {
         t.Skip("skipping integration test")
@@ -51,7 +78,7 @@ func TestIntegrationFoo(t *testing.T) {
 
 Use respectively [`assert.*`](https://github.com/stretchr/testify#assert-package) functions to make assertions that
 should _not_ halt the test ("soft checks") and [`require.*`](https://github.com/stretchr/testify#require-package)
-functions to make assertions that _should_ halt the test ("hard checks"). Typically you want to use the latter type of
+functions to make assertions that _should_ halt the test ("hard checks"). Typically, you want to use the latter type of
 check to assert that errors have or have not happened, since continuing the test after such an assertion fails is
 chaotic (the system under test will be in an undefined state) and you'll often have segfaults in practice.
 
@@ -66,25 +93,23 @@ Use [`t.Cleanup`](https://golang.org/pkg/testing/#T.Cleanup) to clean up resourc
 
 ### Mock
 
-Optionally, we use [`mock.Mock`](https://github.com/stretchr/testify#mock-package) package to generate mocks. This is
-useful when you expect different behaviours of the same function.
+Optionally, we use [`mock.Mock`](https://github.com/stretchr/testify#mock-package) package to write mocks.
+This is useful when you expect different behaviors of the same function.
 
 #### Tips
 
-- Use `Once()` or `Times(n)` to make this mock only works `n` times.
-- Use `mockedClass.AssertExpectations(t)` to guarantee that the mock is called the times asked.
-  - If any mock set is not called or its expects more calls, the test fails.
+- Use `Once()` or `Times(n)` to make a method call work `n` times.
+- Use `mockedClass.AssertExpectations(t)` to guarantee that methods are called the times asked.
+  - If any method is not called the expected amount of times, the test fails.
 - You can pass `mock.Anything` as argument if you don't care about the argument passed.
-- Use `mockedClass.AssertNotCalled(t, "FunctionName")` to assert that this test is not called.
+- Use `mockedClass.AssertNotCalled(t, "MethodName")` to assert that a method was not called.
 
 #### Example
 
-This is an example to easily create a mock of an interface.
-
 Given this interface:
 
 ```go
-func MyInterface interface {
+type MyInterface interface {
     Get(ctx context.Context, id string) (Object, error)
 }
 ```
@@ -92,44 +117,43 @@ func MyInterface interface {
 Mock implementation should be like this:
 
 ```go
-import
+import "github.com/stretchr/testify/mock"
 
-func MockImplementation struct {
+type MockImplementation struct {
     mock.Mock
 }
 
-func (m *MockImplementation) Get(ctx context.Context, id string) error {
+func (m *MockImplementation) Get(ctx context.Context, id string) (Object, error) {
     args := m.Called(ctx, id) // Pass all arguments in order here
     return args.Get(0).(Object), args.Error(1)
 }
 ```
 
-And use it as the following way:
+And use it in the following way:
 
 ```go
-
 objectToReturn := Object{Message: "abc"}
 errToReturn := errors.New("my error")
 
 myMock := &MockImplementation{}
 defer myMock.AssertExpectations(t)
 
-myMock.On("Get", mock.Anything, "id1").Return(objectToReturn, errToReturn).Once()
-myMock.On("Get", mock.Anything, "id2").Return(Object{}, nil).Once()
+myMock.On("Get", mock.Anything, "id1").Return(Object{}, errToReturn).Once()
+myMock.On("Get", mock.Anything, "id2").Return(objectToReturn, nil).Once()
 
 anyService := NewService(myMock)
-resp, err := anyService.Call("id1")
 
-assert.Equal(t, resp.Message, objectToReturn.Message)
+resp, err := anyService.Call("id1")
 assert.Error(t, err, errToReturn)
 
 resp, err = anyService.Call("id2")
 assert.Nil(t, err)
+assert.Equal(t, resp.Message, objectToReturn.Message)
 ```
 
 #### Mockery
 
-When an interface to test is too big, it's annoying to mock each function manually. To avoid this, you can
+When an interface to test is too big, it may be toilsome to mock each function manually. To avoid this, you can
 use [`mockery`](https://github.com/vektra/mockery) library to generate the mocks.
 
 The command is like the following (there are more options documented if you need to use another one):
diff --git a/contribute/backend/upgrading-go-version.md b/contribute/backend/upgrading-go-version.md
new file mode 100644
index 0000000000000..e292bbddf851c
--- /dev/null
+++ b/contribute/backend/upgrading-go-version.md
@@ -0,0 +1,22 @@
+# Upgrading Go Version
+
+Notes on upgrading Go version.
+
+Example PR: https://github.com/grafana/grafana/pull/79329
+
+## The main areas that need to change during the upgrade are:
+
+- https://github.com/grafana/grafana/blob/d8ecea4ed93efb2e4d64a5ee24bc08f3805f413d/scripts/drone/variables.star#L6
+- https://github.com/grafana/grafana/blob/d8ecea4ed93efb2e4d64a5ee24bc08f3805f413d/Makefile#L264
+- https://github.com/grafana/grafana/blob/d8ecea4ed93efb2e4d64a5ee24bc08f3805f413d/Dockerfile#L6
+
+Make sure to run `make drone` so that changes to `.star` files are reflected and `drone.yml` is generated.
+
+### Additional files to change
+
+- Take a look in `.github/workflows` folder for what `go` version is being used there in various workflows.
+- Make sure to create a PR with the corresponding changes in `grafana/grafana-enterprise` repository.
+
+## Updating the go.mod file
+
+Please avoid updating the `go.mod` to the newest version unless really necessary. This ensures backwards compatibility and introduces less breaking changes. Always upgrade Go version in the runtime files above first, let them run for a couple of weeks and only then consider updating the `go.mod` file if necessary.
diff --git a/contribute/create-pull-request.md b/contribute/create-pull-request.md
index 7fe1023a8979e..0e41754ea486f 100644
--- a/contribute/create-pull-request.md
+++ b/contribute/create-pull-request.md
@@ -124,7 +124,7 @@ If you're unsure, see the existing [changelog](https://github.com/grafana/grafan
 
 The pull request title should be formatted according to `<Area>: <Summary>` (Both "Area" and "Summary" should start with a capital letter).
 
-The Grafana team _squashes_ all commits into one when we accept a pull request. The title of the pull request becomes the subject line of the squashed commit message. We still encourage contributors to write informative commit messages, as they becomes a part of the Git commit body.
+The Grafana team _squashes_ all commits into one when we accept a pull request. The title of the pull request becomes the subject line of the squashed commit message. We still encourage contributors to write informative commit messages, as they become a part of the Git commit body.
 
 We use the pull request title when we generate change logs for releases. As such, we strive to make the title as informative as possible.
 
@@ -133,7 +133,7 @@ We use the pull request title when we generate change logs for releases. As such
 
 ## Configuration changes
 
-If your PR includes configuration changes, all of the following files must be changed correspondingly:
+If your PR includes configuration changes, all the following files must be changed correspondingly:
 
 - conf/defaults.ini
 - conf/sample.ini
diff --git a/contribute/deprecation-policy.md b/contribute/deprecation-policy.md
new file mode 100644
index 0000000000000..3c305833ab1a3
--- /dev/null
+++ b/contribute/deprecation-policy.md
@@ -0,0 +1,31 @@
+# Deprecation policy
+
+We do our best to limit breaking changes and the deprecation of features to major releases. We always do our best **not** to introduce breaking changes in order to make upgrading Grafana as easy and reliable as possible. However, at times we have to introduce a breaking change by changing behavior or by removing a feature.
+
+To minimize the negative effects of removing a feature we require a deprecation plan that includes:
+
+- Determine usage levels of the feature.
+- Find alternative solutions and possible migration paths.
+- Announce deprecation of the feature.
+- Migrate users if possible
+- Give users time to adjust to the deprecation.
+- Disable the feature by default.
+- Remove the feature from the code base.
+
+Depending on the size and importance of the feature this can be a design doc or an issue. We want this to be written communication for all parties so we know it's intentional and that did a reasonable attempt to avoid breaking changes unless needed. The size of the feature also means different notice times between Depreciation and disabling as well as disabling and removal. The actual duration will depend on releases of Grafana and the table below should be used as a guide.
+
+Grafana employees can find more details in our internal docs.
+
+## Grace period between announcement and disabling feature by default
+
+| Size   | Duration   | Example                                                          |
+| ------ | ---------- | ---------------------------------------------------------------- |
+| Large  | 1-2 years  | Classic alerting, scripted dashboards, AngularJS                 |
+| Medium | 6 months   | Supported Database for Grafana's backend                         |
+| Small  | 1-3 months | Refresh OAuth access_token automatically using the refresh_token |
+
+## Announced deprecations.
+
+| Name                                                                     | Announcement Date | Disabling date | Removal Date | Description                                                                                                             | Status  |
+| ------------------------------------------------------------------------ | ----------------- | -------------- | ------------ | ----------------------------------------------------------------------------------------------------------------------- | ------- |
+| [Support for Mysql 5.7](https://github.com/grafana/grafana/issues/68446) | 2023-05-15        | October 2023   |              | MySQL 5.7 is being deprecated in October 2023 and Grafana's policy is to test against the officially supported version. | Planned |
diff --git a/contribute/developer-guide.md b/contribute/developer-guide.md
index 20163d8dbfca0..6df07b690e0d1 100644
--- a/contribute/developer-guide.md
+++ b/contribute/developer-guide.md
@@ -8,8 +8,8 @@ Make sure you have the following dependencies installed before setting up your d
 
 - [Git](https://git-scm.com/)
 - [Go](https://golang.org/dl/) (see [go.mod](../go.mod#L3) for minimum required version)
-- [Node.js (Long Term Support)](https://nodejs.org)
-- [Yarn](https://yarnpkg.com)
+- [Node.js (Long Term Support)](https://nodejs.org), with [corepack enabled](https://nodejs.org/api/corepack.html#enabling-the-feature). See [.nvmrc](../.nvmrc) for supported version. It's recommend you use a version manager such as [nvm](https://github.com/nvm-sh/nvm), [fnm](https://github.com/Schniz/fnm), or similar.
+- GCC (required for Cgo dependencies)
 
 ### macOS
 
@@ -19,7 +19,7 @@ We recommend using [Homebrew](https://brew.sh/) for installing any missing depen
 brew install git
 brew install go
 brew install node@20
-npm install -g yarn
+corepack enable
 ```
 
 ### Windows
@@ -37,14 +37,6 @@ For alternative ways of cloning the Grafana repository, please refer to [GitHub'
 
 **Warning:** Do not use `go get` to download Grafana. Recent versions of Go have added behavior which isn't compatible with the way the Grafana repository is structured.
 
-### Configure Editors
-
-For some IDEs, additional configuration may be needed for Typescript to work with [Yarn plug'n'play](https://yarnpkg.com/features/pnp).
-For [VSCode](https://yarnpkg.com/getting-started/editor-sdks#vscode) and [Vim](https://yarnpkg.com/getting-started/editor-sdks#vim),
-it's as easy as running `yarn dlx @yarnpkg/sdks vscode` or `yarn dlx @yarnpkg/sdks vim`, respectively.
-
-More information can be found [here](https://yarnpkg.com/getting-started/editor-sdks).
-
 ### Configure precommit hooks
 
 We use pre-commit hooks (via [lefthook](https://github.com/evilmartians/lefthook)) to lint, fix, and format code as you commit your changes. Previously the Grafana repository automatically installed these hook when you did `yarn install`, but they are now opt in for all contributors
@@ -84,6 +76,7 @@ After the command has finished, we can start building our source code:
 yarn start
 ```
 
+This command will generate sass theme files, build all external plugins, then build the frontend assets.
 Once `yarn start` has built the assets, it will continue to do so whenever any of the files change. This means you don't have to manually build the assets every time you change the code.
 
 > Troubleshooting: if your first build works, but after pulling updates you see unexpected errors in the "Type-checking in progress..." stage, these can be caused by the [tsbuildinfo cache supporting incremental builds](https://www.typescriptlang.org/tsconfig#incremental). You can `rm tsconfig.tsbuildinfo` and re-try.
@@ -159,7 +152,7 @@ go run build.go test
 
 ### Run SQLLite, PostgreSQL and MySQL integration tests
 
-By default grafana runs SQLite, to run test with SQLite
+By default, grafana runs SQLite, to run test with SQLite
 
 ```bash
 go test -covermode=atomic -tags=integration ./pkg/...
@@ -179,9 +172,11 @@ make test-go-integration-postgres
 
 ### Run end-to-end tests
 
-The end to end tests in Grafana use [Cypress](https://www.cypress.io/) to run automated scripts in a headless Chromium browser. Read more about our [e2e framework](/contribute/style-guides/e2e.md).
+Grafana uses [Cypress](https://www.cypress.io/) to end-to-end test core features. Core plugins use [Playwright](https://playwright.dev/) to run automated end-to-end tests. You can find more information on how to add end-to-end tests to your core plugin [here](./style-guides/e2e-plugins.md)
+
+#### Running Cypress tests
 
-To run the tests:
+To run all tests in a headless Chromium browser.
 
 ```
 yarn e2e
@@ -205,6 +200,34 @@ To choose a single test to follow in the browser as it runs, use `yarn e2e:dev`
 yarn e2e:dev
 ```
 
+#### To run the Playwright tests:
+
+**Note:** If you're using VS Code as your development editor, it's recommended to install the [Playwright test extension](https://marketplace.visualstudio.com/items?itemName=ms-playwright.playwright). It allows you to run, debug and generate Playwright tests from within the editor. For more information about the extension and how to install it, refer to the [Playwright documentation](https://playwright.dev/docs/getting-started-vscode).
+
+Each version of Playwright needs specific versions of browser binaries to operate. You will need to use the Playwright CLI to install these browsers.
+
+```
+yarn playwright install chromium
+```
+
+To run all tests in a headless Chromium browser and display results in the terminal.
+
+```
+yarn e2e:playwright
+```
+
+For a better developer experience, open the Playwright UI where you can easily walk through each step of the test and visually see what was happening before, during and after each step.
+
+```
+yarn e2e:playwright:ui
+```
+
+To open the HTML reporter for the last test run session.
+
+```
+yarn e2e:playwright:report
+```
+
 ## Configure Grafana for development
 
 The default configuration, `defaults.ini`, is located in the `conf` directory.
@@ -259,6 +282,12 @@ The resulting image will be tagged as grafana/grafana:dev.
 
 Are you having issues with setting up your environment? Here are some tips that might help.
 
+### IDE configuration
+
+Configure your IDE to use the Typescript version from the Grafana repository. The version should match the Typescript version in the package.json file, and is typically at the path `node_modules/.bin/tsc`.
+
+Previously Grafana used Yarn PnP to install frontend dependencies, which required additional special IDE configuration. This is no longer the case. If you have custom paths in your IDE for ESLint, Prettier, or Typescript, you can now remove them and use the defaults from node_modules.
+
 ### Too many open files when running `make run`
 
 Depending on your environment, you may have to increase the maximum number of open files allowed. For the rest of this section, we will assume you are on a Unix like OS (e.g. Linux/macOS), where you can control the maximum number of open files through the [ulimit](https://ss64.com/bash/ulimit.html) shell command.
@@ -302,7 +331,7 @@ For some people, typically using the bash shell, ulimit fails with an error simi
 ulimit: open files: cannot modify limit: Operation not permitted
 ```
 
-If that happens to you, chances are you've already set a lower limit and your shell won't let you set a higher one. Try looking in your shell initialization files (~/.bashrc typically), if there's already a ulimit command that you can tweak.
+If that happens to you, chances are you've already set a lower limit and your shell won't let you set a higher one. Try looking in your shell initialization files (~/.bashrc typically), if there's already an ulimit command that you can tweak.
 
 ## Next steps
 
diff --git a/contribute/drone-pipeline.md b/contribute/drone-pipeline.md
index 2d0b74db04698..b75ab2649c7d1 100644
--- a/contribute/drone-pipeline.md
+++ b/contribute/drone-pipeline.md
@@ -14,4 +14,4 @@ The Drone pipelines are built with [Starlark](https://github.com/bazelbuild/star
 - Open a PR where you can do test runs for your changes. If you need to experiment with secrets, create a PR in the [grafana-ci-sandbox repo](https://github.com/grafana/grafana-ci-sandbox), before opening a PR in the main repo.
 - Run `make drone` after making changes to the Starlark files. This builds the `.drone.yml` file.
 
-For further questions, reach out to the grafana-delivery squad.
+For further questions, reach out to the grafana-release-guild squad.
diff --git a/contribute/engineering/terminology.md b/contribute/engineering/terminology.md
index 4a833dd7fb23f..5b28cb7f4b151 100644
--- a/contribute/engineering/terminology.md
+++ b/contribute/engineering/terminology.md
@@ -6,7 +6,7 @@ This document defines technical terms used in Grafana.
 
 ## TLS/SSL
 
-The acronyms [TLS](https://en.wikipedia.org/wiki/Transport_Layer_Security) (Transport Layer Security and
+The acronyms [TLS](https://en.wikipedia.org/wiki/Transport_Layer_Security) (Transport Layer Security) and
 [SSL](https://en.wikipedia.org/wiki/SSL) (Secure Socket Layer) are both used to describe the HTTPS security layer,
 and are in practice synonymous. However, TLS is considered the current name for the technology, and SSL is considered
 [deprecated](https://tools.ietf.org/html/rfc7568).
diff --git a/contribute/feature-toggles.md b/contribute/feature-toggles.md
index 79e0178392da5..131834bcaf87d 100644
--- a/contribute/feature-toggles.md
+++ b/contribute/feature-toggles.md
@@ -5,7 +5,7 @@ This guide helps you get started adding your feature behind a feature flag in Gr
 ## Steps to adding a feature toggle
 
 1. Define the feature toggle in [registry.go](../pkg/services/featuremgmt/registry.go). To see what each feature stage means, look at the comments [here](../pkg/services/featuremgmt/features.go). If you are a community member, use the [CODEOWNERS](../.github/CODEOWNERS) file to determine which team owns the package you are updating.
-2. Run the go tests mentioned at the top of [this file](../pkg/services/featuremgmt/toggles_gen.go). This will generate all the additional files needed: `toggles_gen` for the backend, `grafana-data` for the frontend, and docs. You can run the test by running `go test ./pkg/services/featuremgmt/...`. This will say the tests failed the first time, but it will have generated the right code. If you re-run the tests, it will pass.
+2. Run the go tests mentioned at the top of [this file](../pkg/services/featuremgmt/toggles_gen.go). This will generate all the additional files needed: `toggles_gen` for the backend, `grafana-data` for the frontend, and docs. You can run the test by running `make gen-feature-toggles`.
 
 ## How to use it in the code
 
diff --git a/contribute/internationalization.md b/contribute/internationalization.md
index 726fb7b4b102c..7a0ac2a249f74 100644
--- a/contribute/internationalization.md
+++ b/contribute/internationalization.md
@@ -9,7 +9,8 @@ Grafana uses the [i18next](https://www.i18next.com/) framework for managing tran
 - Use `<Trans i18nKey="search-results.panel-link">Go to {{ pageTitle }}</Trans>` in code to add a translatable phrase
 - Translations are stored in JSON files in `public/locales/{locale}/grafana.json`
 - If a particular phrase is not available in the a language then it will fall back to English
-- To update phrases in English, edit the default phrase in both the component's source and the [English grafana.json message catalogue](../public/locales/en-US/grafana.json), then run `yarn i18n:extract`.
+- To update phrases in English, edit the default phrase in the component's source and then run `yarn i18n:extract`.
+- The single source of truth for en-US (fallback language) is in grafana/grafana, the single source of truth for any translated language is Crowdin
 - To update phrases in any translated language, edit the phrase in Crowdin. Do not edit the `{locale}/grafana.json`
 
 ## How to add a new translation phrase
@@ -40,7 +41,8 @@ const ErrorMessage = ({ id, message }) => <Trans i18nKey={`errors.${id}`}>There
 
 2. Upon reload, the default English phrase will appear on the page.
 
-3. Before submitting your PR, run the `yarn i18n:extract` command to extract the messages you added into the `grafana.json` file and make them available for translation.
+3. Before submitting your PR, run the `yarn i18n:extract` command to extract the messages you added into the `public/locales/en-US/grafana.json` file and make them available for translation.
+   **Note:** All other languages will receive their translations when they are ready to be downloaded from Crowdin.
 
 ### Plain JS usage
 
@@ -64,20 +66,26 @@ While the `t` function can technically be used outside of React functions (e.g,
 
 ## How to add a new language
 
-1. Add new locale in Crowdin and sync files to repo
-   1. Grafana OSS Crowdin project -> "dot dot dot" menu in top right -> Target languages
-   2. Grafana OSS Crowdin project -> Integrations -> Github -> Sync Now
-   3. If Crowdin's locale code is different from our IETF language tag, add a custom mapping in Project Settings -> Language mapping
-2. Update `public/app/core/internationalization/constants.ts` (add new constant, and add to `LOCALES`)
-3. Update `public/locales/i18next-parser.config.js` to add the new locale to `locales`
-4. Run `yarn i18n:extract` and commit the result
+1. Add a new locale in Crowdin
+   1. Grafana OSS Crowdin project
+   2. "dot dot dot" menu in top right
+   3. Target languages, and add the language
+   4. If Crowdin's locale code is different from our IETF language tag (such as Chinese Simplified), add a custom mapping in Project Settings -> Language mapping
+2. Sync the new (empty) language to the repo
+   1. In Grafana's Github Actions, go to [Crowdin Download Action](https://github.com/grafana/grafana/actions/workflows/i18n-crowdin-download.yml)
+   2. Select 'Run workflow', from main
+   3. The workflow will create a PR with the new language files, which can be reviewed and merged
+3. Update `public/app/core/internationalization/constants.ts`
+   1. Add a new constant for the new language
+   2. Add the new constant to the `LOCALES` array
+   3. Create a PR with the changes and merge when you are ready to release the new language (probably wait until we have translations for it)
 
 ## How translations work in Grafana
 
 Grafana uses the [i18next](https://www.i18next.com/) framework for managing translating phrases in the Grafana frontend. It:
 
 - Marks up phrases within our code for extraction
-- Extracts phrases into messages catalogues for translating in external systems
+- Extracts phrases into the default messages catalogue for translating in external systems
 - Manages the user's locale and putting the translated phrases in the UI
 
 Grafana will load the message catalogue JSON before the initial render.
@@ -189,6 +197,23 @@ Once extracted with `yarn i18n:extract` you will need to manually edit the [Engl
 }
 ```
 
+## Feedback
+
+**Please note:** This is only for proofreaders with permissions to Grafana OSS project on Crowdin.
+
+To provide feedback on translations, sign into Crowdin and follow these steps:
+
+1. Open the Grafana OSS project in Crowdin.
+2. In the left-hand menu, click on the 'Dashboard' menu item.
+3. A list of available languages appears under the 'Translations' section. Click on the one you want to comment on.
+4. There is a table with the file structure in it:
+   <br>
+   `grafana/main > public > locales > 'language denomination' > grafana.json`
+   <br>
+   Click on the `grafana.json` file.
+5. In the left-hand section, click on the 'Search in file' input and search for the string that you want to comment on. You can search in English, as it is the default language, or in the language the string is translated to.
+6. Once you have found the string, on the right hand side there is a 'Comments' section where you can send the feedback about the translation. Tag @Translated to be sure the team of linguists gets notified.
+
 ## Documentation
 
 [Grafana's documentation](https://grafana.com/docs/grafana/latest/) is not yet open for translation and should be authored in American English only.
diff --git a/contribute/merge-pull-request.md b/contribute/merge-pull-request.md
index ac81ef130ce48..8350d98a8637e 100644
--- a/contribute/merge-pull-request.md
+++ b/contribute/merge-pull-request.md
@@ -115,25 +115,12 @@ In case the pull request introduces a breaking change you should document this.
 <Breaking change description>
 ```
 
-### Should the pull request be backported?
+### Backporting
 
 Backporting is the process of copying the pull request into the version branch of one or multiple previous releases.
-This should only be done for _critical bug fixes_ and involves the intervention of a Grafana Labs employee.
-To make this decision explicit, there is a **Backport Check** that is re-evaluated automatically by adding/removing labels on the pull request.
+This is a rare exception, should only be done for _critical bug fixes_, and involves the intervention of a Grafana Labs employee.
 
-#### No backport
-
-If you don't want to backport you need to add a label named **no-backport** to the pull request.
-
-This should be the default!
-
-#### Backport
-
-If your pull request fixes a critical bug and needs to go into one or several existing release branches it should be backported.
-
-For a pull request to be backported, please add it to "Critical Bug Release" form so that the delivery team is aware that a release for a previous version needs to be made.
-Once approved, the backporting process will continue from there.
-In the meantime, set the `no-backport` label.
+If your pull request fixes a critical bug and needs to be backported, add it to the "Critical Bug Release" form so the team can approve the backport and know that a release needs to be made. Specify the correct `backport vx.x` labels for the releases the fix needs to be backported to. Once approved, the backporting process will continue from there.
 
 #### Required labels
 
diff --git a/contribute/style-guides/e2e-core.md b/contribute/style-guides/e2e-core.md
index fb2c24e0bfc8c..321f02522c9bf 100644
--- a/contribute/style-guides/e2e-core.md
+++ b/contribute/style-guides/e2e-core.md
@@ -22,4 +22,4 @@ The above commands use some utils scripts under [_\<repo-root>/e2e_](../../e2e)
 
 ## Test suites
 
-All the integration tests are located at _\<repo-root>/e2e/suite\<x>/specs_. The page objects and reusable flows are in the [_\<repo-root>/packages/grafana-e2e_](../../packages/grafana-e2e) package.
+All the integration tests are located at _\<repo-root>/e2e/suite\<x>/specs_.
diff --git a/contribute/style-guides/e2e-plugins.md b/contribute/style-guides/e2e-plugins.md
index a40b9516fa7bd..f675db96784aa 100644
--- a/contribute/style-guides/e2e-plugins.md
+++ b/contribute/style-guides/e2e-plugins.md
@@ -1,28 +1,35 @@
-# End-to-End Tests for plugins
+# end-to-end tests for plugins
 
-Be sure that you've read the [generalized E2E document](e2e.md).
+When end-to-end testing Grafana plugins, it's recommended to use the [`@grafana/plugin-e2e`](https://www.npmjs.com/package/@grafana/plugin-e2e?activeTab=readme) testing tool. `@grafana/plugin-e2e` extends [`@playwright/test`](https://playwright.dev/) capabilities with relevant fixtures, models, and expect matchers; enabling comprehensive end-to-end testing of Grafana plugins across multiple versions of Grafana. For information on how to get started with Plugin end-to-end testing and Playwright, checkout the [Get started](https://grafana.com/developers/plugin-tools/e2e-test-a-plugin/get-started) guide.
 
-## Commands
+## Adding end-to-end tests for a core plugin
+
+Playwright end-to-end tests for plugins should be added to the [`e2e/plugin-e2e`](https://github.com/grafana/grafana/tree/main/e2e/plugin-e2e) directory.
 
-- `yarn test:e2e` will run [Grafana's E2E utility](../../packages/grafana-e2e) against an already running Grafana server.
-- `yarn test:e2e:update` will run `test:e2e` but instead of asserting that screenshots match their expected fixtures, they'll be replaced with new ones.
+1. Add a new directory that has the name as your plugin [`here`](https://github.com/grafana/grafana/tree/main/e2e/plugin-e2e). This is where your plugin tests will be kept.
 
-Your running Grafana instance can be targeted by setting the `CYPRESS_BASE_URL`, `CYPRESS_USERNAME` and `CYPRESS_PASSWORD` environment variableS:
+2. Playwright uses [projects](https://playwright.dev/docs/test-projects) to logically group tests together. All tests in a project share the same configuration.
+   In the [Playwright config file](https://github.com/grafana/grafana/blob/main/playwright.config.ts), add a new project item. Make sure the `name` and the `testDir` sub directory matches the name of the directory that contains your plugin tests.
+   Adding `'authenticate'` to the list of dependencies and specifying `'playwright/.auth/admin.json'` as storage state will ensure all tests in your project will start already authenticated as an admin user. If you wish to use a different role for and perhaps test RBAC for some of your tests, please refer to the plugin-e2e [documentation](https://grafana.com/developers/plugin-tools/e2e-test-a-plugin/use-authentication).
 
-```shell
-CYPRESS_BASE_URL=https://localhost:3000 CYPRESS_USERNAME=admin CYPRESS_PASSWORD=admin yarn test:e2e
-```
+   ```ts
+   {
+      name: 'mysql',
+      testDir: path.join(testDirRoot, '/mysql'),
+      use: {
+        ...devices['Desktop Chrome'],
+        storageState: 'playwright/.auth/admin.json',
+      },
+      dependencies: ['authenticate'],
+    },
+   ```
 
-## Test suites
+3. Update the [CODEOWNERS](https://github.com/grafana/grafana/blob/main/.github/CODEOWNERS/#L315) file so that your team is owner of the tests in the directory you added in step 1.
+
+## Commands
 
-All tests are located at _\<repo-root>/cypress/integration_ by default.
+- `yarn e2e:playwright` will run all Playwright tests. Optionally, you can provide the `--project mysql` argument to run tests in a certain project.
 
-## Things to test
+The script above assumes you have Grafana running on `localhost:3000`. You may change this by providing environment variables.
 
-- Add data source (if applicable)
-- Add panel
-- Edit panel
-- Annotations (if applicable)
-- Aliases (if applicable)
-- Template variables
-- "Explore" view
+`HOST=127.0.0.1 PORT=3001 yarn e2e:playwright`
diff --git a/contribute/style-guides/e2e.md b/contribute/style-guides/e2e.md
index 76958b6d53b1f..285936f2c5b99 100644
--- a/contribute/style-guides/e2e.md
+++ b/contribute/style-guides/e2e.md
@@ -1,13 +1,13 @@
 # End-to-End tests
 
-Grafana Labs uses a minimal [homegrown solution](../../packages/grafana-e2e) built on top of [Cypress](https://cypress.io) for its end-to-end (E2E) tests.
+Grafana Labs uses a minimal [homegrown solution](../../e2e/utils/index.ts) built on top of [Cypress](https://cypress.io) for its end-to-end (E2E) tests.
 
 Important notes:
 
 - We generally store all element identifiers ([CSS selectors](https://mdn.io/docs/Web/CSS/CSS_Selectors)) within the framework for reuse and maintainability.
 - We generally do not use stubs or mocks as to fully simulate a real user.
 - Cypress' promises [do not behave as you'd expect](https://docs.cypress.io/guides/core-concepts/introduction-to-cypress.html#Mixing-Async-and-Sync-code).
-- [Testing core Grafana](e2e-core.md) is slightly different than [testing plugins](e2e-plugins.md).
+- [Testing core Grafana](e2e-core.md) is different than [testing plugins](e2e-plugins.md) - core Grafana uses Cypress whereas plugins use [Playwright test](https://playwright.dev/).
 
 ## Framework structure
 
diff --git a/contribute/style-guides/frontend.md b/contribute/style-guides/frontend.md
index c25b671a8924f..07055362fffc3 100644
--- a/contribute/style-guides/frontend.md
+++ b/contribute/style-guides/frontend.md
@@ -180,7 +180,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
 });
 ```
 
-Use hook useStyles2(getStyles) to memoize the styles generation and try to avoid passing props to the the getStyles function and instead compose classes using emotion cx function.
+Use hook useStyles2(getStyles) to memoize the styles generation and try to avoid passing props to the getStyles function and instead compose classes using emotion cx function.
 
 #### Use `ALL_CAPS` for constants.
 
diff --git a/crowdin.yml b/crowdin.yml
index cdfc752c78ac7..0d1bab25f7c40 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -1,8 +1,5 @@
 files:
-  - source: /public/locales/en-US/grafana.json
-    translation: /public/locales/%locale%/%original_file_name%
-pull_request_title: 'I18n: Crowdin sync'
-pull_request_labels:
-  - area/internationalization
-  - no-changelog
-  - no-backport
+  - type: i18next_json
+# The following are pulled from env variables
+project_id_env: CROWDIN_PROJECT_ID
+api_token_env: CROWDIN_PERSONAL_TOKEN
diff --git a/cypress.config.js b/cypress.config.js
index 856fb85f022ed..52263a9e4d00f 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -3,7 +3,6 @@ const fs = require('fs');
 const path = require('path');
 
 const benchmarkPlugin = require('./e2e/cypress/plugins/benchmark/index');
-const compareScreenshots = require('./e2e/cypress/plugins/compareScreenshots');
 const readProvisions = require('./e2e/cypress/plugins/readProvisions');
 const typescriptPreprocessor = require('./e2e/cypress/plugins/typescriptPreprocessor');
 
@@ -29,7 +28,6 @@ module.exports = defineConfig({
       }
 
       on('task', {
-        compareScreenshots,
         readProvisions: (filePaths) => readProvisions({ CWD: process.cwd(), filePaths }),
       });
 
diff --git a/devenv/alert_rules.yaml b/devenv/alert_rules.yaml
new file mode 100644
index 0000000000000..dbf2f996576ef
--- /dev/null
+++ b/devenv/alert_rules.yaml
@@ -0,0 +1,158 @@
+apiVersion: 1
+groups:
+    - orgId: 1
+      name: testEvaluationGroup
+      folder: gdev dashboards
+      interval: 5m
+      rules:
+        - uid: bddn0v6f1kgzkc
+          title: e2e-ReturnToPrevious-test
+          condition: C
+          data:
+            - refId: A
+              relativeTimeRange:
+                from: 600
+                to: 0
+              datasourceUid: PD8C576611E62080A
+              model:
+                intervalMs: 1000
+                maxDataPoints: 43200
+                refId: A
+            - refId: B
+              datasourceUid: __expr__
+              model:
+                conditions:
+                    - evaluator:
+                        params: []
+                        type: gt
+                      operator:
+                        type: and
+                      query:
+                        params:
+                            - B
+                      reducer:
+                        params: []
+                        type: last
+                      type: query
+                datasource:
+                    type: __expr__
+                    uid: __expr__
+                expression: A
+                intervalMs: 1000
+                maxDataPoints: 43200
+                reducer: last
+                refId: B
+                type: reduce
+            - refId: C
+              datasourceUid: __expr__
+              model:
+                conditions:
+                    - evaluator:
+                        params:
+                            - 0
+                        type: gt
+                      operator:
+                        type: and
+                      query:
+                        params:
+                            - C
+                      reducer:
+                        params: []
+                        type: last
+                      type: query
+                datasource:
+                    type: __expr__
+                    uid: __expr__
+                expression: B
+                intervalMs: 1000
+                maxDataPoints: 43200
+                refId: C
+                type: threshold
+          dashboardUid: j6T00KRZz
+          panelId: 7
+          noDataState: NoData
+          execErrState: Error
+          for: 5m
+          annotations:
+            __dashboardUid__: j6T00KRZz
+            __panelId__: "7"
+          labels: {}
+          isPaused: false
+    - orgId: 1
+      name: testEvaluationGroup2
+      folder: gdev dashboards
+      interval: 10m
+      rules:
+        - uid: dddyksihq7h1ca
+          title: e2e-ReturnToPrevious-test-2
+          condition: C
+          data:
+            - refId: A
+              relativeTimeRange:
+                from: 600
+                to: 0
+              datasourceUid: PD8C576611E62080A
+              model:
+                intervalMs: 1000
+                maxDataPoints: 43200
+                refId: A
+            - refId: B
+              datasourceUid: __expr__
+              model:
+                conditions:
+                    - evaluator:
+                        params: []
+                        type: gt
+                      operator:
+                        type: and
+                      query:
+                        params:
+                            - B
+                      reducer:
+                        params: []
+                        type: last
+                      type: query
+                datasource:
+                    type: __expr__
+                    uid: __expr__
+                expression: A
+                intervalMs: 1000
+                maxDataPoints: 43200
+                reducer: last
+                refId: B
+                type: reduce
+            - refId: C
+              datasourceUid: __expr__
+              model:
+                conditions:
+                    - evaluator:
+                        params:
+                            - 0
+                        type: gt
+                      operator:
+                        type: and
+                      query:
+                        params:
+                            - C
+                      reducer:
+                        params: []
+                        type: last
+                      type: query
+                datasource:
+                    type: __expr__
+                    uid: __expr__
+                expression: B
+                intervalMs: 1000
+                maxDataPoints: 43200
+                refId: C
+                type: threshold
+          dashboardUid: j6T00KRZz
+          panelId: 3
+          noDataState: NoData
+          execErrState: Error
+          for: 10m
+          annotations:
+            __dashboardUid__: j6T00KRZz
+            __panelId__: "3"
+          labels: {}
+          isPaused: false
diff --git a/devenv/bulk_alerting_dashboards/bulk_alerting_dashboards.yaml b/devenv/bulk_alerting_dashboards/bulk_alerting_dashboards.yaml
deleted file mode 100644
index 1ede5dcd30a12..0000000000000
--- a/devenv/bulk_alerting_dashboards/bulk_alerting_dashboards.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: 1
-
-providers:
- - name: 'Bulk alerting dashboards'
-   folder: 'Bulk alerting dashboards'
-   type: file
-   options:
-     path: devenv/bulk_alerting_dashboards
-
diff --git a/devenv/bulk_alerting_dashboards/dashboard.libsonnet b/devenv/bulk_alerting_dashboards/dashboard.libsonnet
deleted file mode 100644
index d19e1e1e45d6b..0000000000000
--- a/devenv/bulk_alerting_dashboards/dashboard.libsonnet
+++ /dev/null
@@ -1,169 +0,0 @@
-{
-  alertingDashboard(dashboardCounter, datasourceCounter):: {
-    title: "alerting-title-" + dashboardCounter,
-    editable: true,
-    gnetId: null,
-    graphTooltip: 0,
-    id: null,
-    links: [],
-    panels: [
-      {
-        alert: {
-          conditions: [
-            {
-              evaluator: {
-                params: [
-                  65
-                ],
-                type: "gt"
-              },
-              operator: {
-                type: "and"
-              },
-              query: {
-                params: [
-                  "A",
-                  "5m",
-                  "now"
-                ]
-              },
-              reducer: {
-                params: [],
-                type: "avg"
-              },
-              type: "query"
-            }
-          ],
-          executionErrorState: "alerting",
-          frequency: "24h",
-          handler: 1,
-          name: "bulk alerting " + dashboardCounter,
-          noDataState: "no_data",
-          notifications: []
-        },
-        aliasColors: {},
-        bars: false,
-        dashLength: 10,
-        dashes: false,
-        datasource: "gfdev-bulkalerting-" + datasourceCounter,
-        fill: 1,
-        gridPos: {
-          h: 9,
-          w: 12,
-          x: 0,
-          y: 0
-        },
-        id: 1,
-        legend: {
-          avg: false,
-          current: false,
-          max: false,
-          min: false,
-          show: true,
-          total: false,
-          values: false
-        },
-        lines: true,
-        linewidth: 1,
-        nullPointMode: "null",
-        percentage: false,
-        pointradius: 5,
-        points: false,
-        renderer: "flot",
-        seriesOverrides: [],
-        spaceLength: 10,
-        stack: false,
-        steppedLine: false,
-        targets: [
-          {
-            expr: "go_goroutines",
-            format: "time_series",
-            intervalFactor: 1,
-            refId: "A"
-          }
-        ],
-        thresholds: [
-          {
-            colorMode: "critical",
-            fill: true,
-            line: true,
-            op: "gt",
-            value: 50
-          }
-        ],
-        timeFrom: null,
-        timeShift: null,
-        title: "Panel Title",
-        tooltip: {
-          shared: true,
-          sort: 0,
-          value_type: "individual"
-        },
-        type: "graph",
-        xaxis: {
-          buckets: null,
-          mode: "time",
-          name: null,
-          show: true,
-          values: []
-        },
-        yaxes: [
-          {
-            format: "short",
-            label: null,
-            logBase: 1,
-            max: null,
-            min: null,
-            show: true
-          },
-          {
-            format: "short",
-            label: null,
-            logBase: 1,
-            max: null,
-            min: null,
-            show: true
-          }
-        ]
-      }
-    ],
-    schemaVersion: 16,
-    tags: [],
-    templating: {
-      list: []
-    },
-    time: {
-      from: "now-6h",
-      to: "now"
-    },
-    timepicker: {
-      refresh_intervals: [
-        "5s",
-        "10s",
-        "30s",
-        "1m",
-        "5m",
-        "15m",
-        "30m",
-        "1h",
-        "2h",
-        "1d"
-      ],
-      time_options: [
-        "5m",
-        "15m",
-        "1h",
-        "6h",
-        "12h",
-        "24h",
-        "2d",
-        "7d",
-        "30d"
-      ]
-    },
-    timezone: "",
-    uid: null,
-    version: 0
-  },
-}
-
diff --git a/devenv/bulk_alerting_dashboards/datasources.jsonnet b/devenv/bulk_alerting_dashboards/datasources.jsonnet
deleted file mode 100644
index 453e1a812bfe6..0000000000000
--- a/devenv/bulk_alerting_dashboards/datasources.jsonnet
+++ /dev/null
@@ -1,14 +0,0 @@
-local arr = std.range(1, 100);
-
-{
-    "apiVersion": 1,
-    "datasources": [
-        {
-            "name": 'gfdev-bulkalerting-' + counter,
-            "type": "prometheus",
-            "access": "proxy",
-            "url": "http://localhost:9090"
-        }
-        for counter in arr
-    ],
-}
diff --git a/devenv/dev-dashboards-without-uid/panel_tests_polystat.json b/devenv/dev-dashboards-without-uid/panel_tests_polystat.json
index 8b89c5bce3591..951bb78001777 100644
--- a/devenv/dev-dashboards-without-uid/panel_tests_polystat.json
+++ b/devenv/dev-dashboards-without-uid/panel_tests_polystat.json
@@ -452,6 +452,10 @@
             {
               "text": "CFP franc (XPF)",
               "value": "currencyXPF"
+            },
+            {
+              "text": "Bulgarian Lev (BGN)",
+              "value": "currencyBGN"
             }
           ],
           "text": "currency"
@@ -1611,6 +1615,10 @@
             {
               "text": "Malaysian Ringgit (RM)",
               "value": "currencyMYR"
+            },
+            {
+              "text": "Bulgarian Lev (BGN)",
+              "value": "currencyBGN"
             }
           ],
           "text": "currency"
@@ -2710,6 +2718,10 @@
             {
               "text": "Malaysian Ringgit (RM)",
               "value": "currencyMYR"
+            },
+            {
+              "text": "Bulgarian Lev (BGN)",
+              "value": "currencyBGN"
             }
           ],
           "text": "currency"
diff --git a/devenv/dev-dashboards/alerting/testdata_alerts.json b/devenv/dev-dashboards/alerting/testdata_alerts.json
deleted file mode 100644
index b76ad5ff9ed10..0000000000000
--- a/devenv/dev-dashboards/alerting/testdata_alerts.json
+++ /dev/null
@@ -1,806 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": {
-          "type": "datasource",
-          "uid": "grafana"
-        },
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "target": {
-          "limit": 100,
-          "matchAny": false,
-          "tags": [],
-          "type": "dashboard"
-        },
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "fiscalYearStartMonth": 0,
-  "graphTooltip": 0,
-  "id": 147,
-  "links": [],
-  "liveNow": false,
-  "panels": [
-    {
-      "alert": {
-        "alertRuleTags": {},
-        "conditions": [
-          {
-            "evaluator": {
-              "params": [
-                177
-              ],
-              "type": "gt"
-            },
-            "query": {
-              "params": [
-                "A",
-                "5m",
-                "now"
-              ]
-            },
-            "reducer": {
-              "params": [],
-              "type": "avg"
-            },
-            "type": "query"
-          }
-        ],
-        "enabled": true,
-        "executionErrorState": "alerting",
-        "for": "0m",
-        "frequency": "60s",
-        "handler": 1,
-        "name": "TestData - Always Alerting",
-        "noDataState": "no_data",
-        "notifications": []
-      },
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "links": []
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 7,
-        "w": 10,
-        "x": 0,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 4,
-      "isNew": true,
-      "legend": {
-        "show": true
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "connected",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "9.4.0-pre",
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "datasource": {
-            "type": "testdata",
-            "uid": "PD8C576611E62080A"
-          },
-          "refId": "A",
-          "scenario": "random_walk",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "200,445,100,150,200,220,190",
-          "target": ""
-        }
-      ],
-      "thresholds": [
-        {
-          "colorMode": "critical",
-          "fill": true,
-          "line": true,
-          "op": "gt",
-          "value": 177
-        }
-      ],
-      "timeRegions": [],
-      "title": "Always Alerting",
-      "tooltip": {
-        "msResolution": false,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "type": "graph",
-      "xaxis": {
-        "mode": "time",
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false
-      }
-    },
-    {
-      "alert": {
-        "alertRuleTags": {},
-        "conditions": [
-          {
-            "evaluator": {
-              "params": [
-                100
-              ],
-              "type": "gt"
-            },
-            "operator": {
-              "type": "and"
-            },
-            "query": {
-              "params": [
-                "A",
-                "5m",
-                "now"
-              ]
-            },
-            "reducer": {
-              "params": [],
-              "type": "avg"
-            },
-            "type": "query"
-          }
-        ],
-        "executionErrorState": "alerting",
-        "for": "900000h",
-        "frequency": "1m",
-        "handler": 1,
-        "name": "TestData - Always Pending",
-        "noDataState": "no_data",
-        "notifications": []
-      },
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "links": []
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 7,
-        "w": 10,
-        "x": 10,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 7,
-      "isNew": true,
-      "legend": {
-        "show": true
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "connected",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "datasource": {
-            "type": "testdata",
-            "uid": "PD8C576611E62080A"
-          },
-          "refId": "A",
-          "scenario": "random_walk",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "200,445,100,150,200,220,190",
-          "target": ""
-        }
-      ],
-      "thresholds": [
-        {
-          "colorMode": "critical",
-          "fill": true,
-          "line": true,
-          "op": "gt",
-          "value": 100
-        }
-      ],
-      "timeRegions": [],
-      "title": "Always Pending with For",
-      "tooltip": {
-        "msResolution": false,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "type": "graph",
-      "xaxis": {
-        "mode": "time",
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false
-      }
-    },
-    {
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
-      "gridPos": {
-        "h": 20,
-        "w": 4,
-        "x": 20,
-        "y": 0
-      },
-      "id": 9,
-      "targets": [
-        {
-          "datasource": {
-            "type": "testdata",
-            "uid": "PD8C576611E62080A"
-          },
-          "refId": "A"
-        }
-      ],
-      "title": "Alert list",
-      "type": "alertlist"
-    },
-    {
-      "alert": {
-        "alertRuleTags": {},
-        "conditions": [
-          {
-            "evaluator": {
-              "params": [
-                177
-              ],
-              "type": "gt"
-            },
-            "operator": {
-              "type": "and"
-            },
-            "query": {
-              "params": [
-                "A",
-                "15m",
-                "now"
-              ]
-            },
-            "reducer": {
-              "params": [],
-              "type": "avg"
-            },
-            "type": "query"
-          }
-        ],
-        "executionErrorState": "alerting",
-        "for": "1m",
-        "frequency": "1m",
-        "handler": 1,
-        "name": "TestData - Always Alerting For",
-        "noDataState": "no_data",
-        "notifications": []
-      },
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "links": []
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 10,
-        "x": 0,
-        "y": 7
-      },
-      "hiddenSeries": false,
-      "id": 6,
-      "isNew": true,
-      "legend": {
-        "show": true
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "connected",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "9.4.0-pre",
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "datasource": {
-            "type": "testdata",
-            "uid": "PD8C576611E62080A"
-          },
-          "refId": "A",
-          "scenario": "random_walk",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "200,445,100,150,200,220,190",
-          "target": ""
-        }
-      ],
-      "thresholds": [
-        {
-          "colorMode": "critical",
-          "fill": true,
-          "line": true,
-          "op": "gt",
-          "value": 177
-        }
-      ],
-      "timeRegions": [],
-      "title": "Always Alerting with For",
-      "tooltip": {
-        "msResolution": false,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "type": "graph",
-      "xaxis": {
-        "mode": "time",
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false
-      }
-    },
-    {
-      "alert": {
-        "conditions": [
-          {
-            "evaluator": {
-              "params": [
-                60
-              ],
-              "type": "gt"
-            },
-            "query": {
-              "params": [
-                "A",
-                "5m",
-                "now"
-              ]
-            },
-            "reducer": {
-              "params": [],
-              "type": "avg"
-            },
-            "type": "query"
-          }
-        ],
-        "enabled": true,
-        "frequency": "60s",
-        "handler": 1,
-        "name": "TestData - Always OK",
-        "noDataState": "no_data",
-        "notifications": []
-      },
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "links": []
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 10,
-        "x": 10,
-        "y": 7
-      },
-      "hiddenSeries": false,
-      "id": 3,
-      "isNew": true,
-      "legend": {
-        "show": true
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "connected",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "9.4.0-pre",
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "datasource": {
-            "type": "testdata",
-            "uid": "PD8C576611E62080A"
-          },
-          "refId": "A",
-          "scenario": "random_walk",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "1,20,90,30,5,0",
-          "target": ""
-        }
-      ],
-      "thresholds": [
-        {
-          "colorMode": "critical",
-          "fill": true,
-          "line": true,
-          "op": "gt",
-          "value": 60
-        }
-      ],
-      "timeRegions": [],
-      "title": "Always OK",
-      "tooltip": {
-        "msResolution": false,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "type": "graph",
-      "xaxis": {
-        "mode": "time",
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": "125",
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "logBase": 1,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false
-      }
-    },
-    {
-      "alert": {
-        "conditions": [
-          {
-            "evaluator": {
-              "params": [
-                1
-              ],
-              "type": "gt"
-            },
-            "operator": {
-              "type": "and"
-            },
-            "query": {
-              "params": [
-                "A",
-                "15m",
-                "now"
-              ]
-            },
-            "reducer": {
-              "params": [],
-              "type": "avg"
-            },
-            "type": "query"
-          }
-        ],
-        "executionErrorState": "alerting",
-        "for": "5m",
-        "frequency": "1m",
-        "handler": 1,
-        "name": "TestData - No data",
-        "noDataState": "no_data",
-        "notifications": []
-      },
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "links": []
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 7,
-        "w": 10,
-        "x": 0,
-        "y": 13
-      },
-      "hiddenSeries": false,
-      "id": 5,
-      "isNew": true,
-      "legend": {
-        "show": true
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "connected",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "9.4.0-pre",
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "datasource": {
-            "type": "testdata",
-            "uid": "PD8C576611E62080A"
-          },
-          "refId": "A",
-          "scenario": "random_walk",
-          "scenarioId": "no_data_points",
-          "stringInput": "",
-          "target": ""
-        }
-      ],
-      "thresholds": [
-        {
-          "colorMode": "critical",
-          "fill": true,
-          "line": true,
-          "op": "gt",
-          "value": 1
-        }
-      ],
-      "timeRegions": [],
-      "title": "No data",
-      "tooltip": {
-        "msResolution": false,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "type": "graph",
-      "xaxis": {
-        "mode": "time",
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false
-      }
-    }
-  ],
-  "schemaVersion": 37,
-  "tags": [
-    "gdev",
-    "alerting"
-  ],
-  "templating": {
-    "list": [
-      {
-        "current": {
-          "text": "TestData",
-          "value": "TestData"
-        },
-        "hide": 0,
-        "includeAll": false,
-        "label": "alert name filter",
-        "multi": false,
-        "name": "namefilter",
-        "options": [
-          {
-            "selected": true,
-            "text": "TestData",
-            "value": "TestData"
-          },
-          {
-            "selected": false,
-            "text": "Prometheus",
-            "value": "Prometheus"
-          },
-          {
-            "selected": false,
-            "text": "Graphite",
-            "value": "Graphite"
-          }
-        ],
-        "query": "TestData,Prometheus,Graphite",
-        "skipUrlSync": false,
-        "type": "custom"
-      }
-    ]
-  },
-  "time": {
-    "from": "now-6h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": [
-      "5s",
-      "10s",
-      "30s",
-      "1m",
-      "5m",
-      "15m",
-      "30m",
-      "1h",
-      "2h",
-      "1d"
-    ],
-    "time_options": [
-      "5m",
-      "15m",
-      "1h",
-      "6h",
-      "12h",
-      "24h",
-      "2d",
-      "7d",
-      "30d"
-    ]
-  },
-  "timezone": "browser",
-  "title": "Alerting with TestData",
-  "uid": "7MeksYbmk",
-  "version": 1,
-  "weekStart": ""
-}
diff --git a/devenv/dev-dashboards/datasource-loki/loki_query_splitting.json b/devenv/dev-dashboards/datasource-loki/loki_query_splitting.json
index 35285857acc69..804b354ea9da0 100644
--- a/devenv/dev-dashboards/datasource-loki/loki_query_splitting.json
+++ b/devenv/dev-dashboards/datasource-loki/loki_query_splitting.json
@@ -1,900 +1,1139 @@
 {
-    "annotations": {
-      "list": [
-        {
-          "builtIn": 1,
-          "datasource": {
-            "type": "grafana",
-            "uid": "-- Grafana --"
-          },
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations & Alerts",
-          "type": "dashboard"
-        }
-      ]
-    },
-    "editable": true,
-    "fiscalYearStartMonth": 0,
-    "graphTooltip": 0,
-    "id": 7004,
-    "links": [],
-    "liveNow": false,
-    "panels": [
+  "annotations": {
+    "list": [
       {
+        "builtIn": 1,
         "datasource": {
-          "type": "loki",
-          "uid": "gdev-loki"
+          "type": "grafana",
+          "uid": "-- Grafana --"
         },
-        "description": "Transformations:\n- Count\n- Sort by\n- Limit 10",
-        "gridPos": {
-          "h": 7,
-          "w": 12,
-          "x": 0,
-          "y": 0
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "loki",
+        "uid": "gdev-loki"
+      },
+      "description": "Transformations:\n- Count\n- Sort by\n- Limit 10",
+      "gridPos": {
+        "h": 7,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "id": 1,
+      "options": {
+        "dedupStrategy": "none",
+        "enableLogDetails": true,
+        "prettifyLogMessage": false,
+        "showCommonLabels": false,
+        "showLabels": false,
+        "showTime": false,
+        "sortOrder": "Descending",
+        "wrapLogMessage": false
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "loki",
+            "uid": "gdev-loki"
+          },
+          "editorMode": "code",
+          "expr": "{place=\"luna\"} | logfmt | label=\"val2\" | float > 60",
+          "maxLines": 5000,
+          "queryType": "range",
+          "refId": "A"
+        }
+      ],
+      "title": "Split logs",
+      "transformations": [
+        {
+          "id": "calculateField",
+          "options": {
+            "alias": "id_count",
+            "mode": "reduceRow",
+            "reduce": {
+              "include": [
+                "id"
+              ],
+              "reducer": "count"
+            },
+            "replaceFields": false
+          }
         },
-        "id": 1,
-        "options": {
-          "dedupStrategy": "none",
-          "enableLogDetails": true,
-          "prettifyLogMessage": false,
-          "showCommonLabels": false,
-          "showLabels": false,
-          "showTime": false,
-          "sortOrder": "Descending",
-          "wrapLogMessage": false
+        {
+          "id": "sortBy",
+          "options": {
+            "fields": {},
+            "sort": [
+              {
+                "desc": true,
+                "field": "tsNs"
+              }
+            ]
+          }
         },
-        "targets": [
-          {
-            "datasource": {
-              "type": "loki",
-              "uid": "gdev-loki"
-            },
-            "editorMode": "code",
-            "expr": "{place=\"luna\"} | logfmt | label=\"val2\" | float > 60",
-            "maxLines": 5000,
-            "queryType": "range",
-            "refId": "A"
+        {
+          "id": "limit",
+          "options": {
+            "limitField": 10
           }
-        ],
-        "title": "Split logs",
-        "transformations": [
-          {
-            "id": "calculateField",
-            "options": {
-              "alias": "id_count",
-              "mode": "reduceRow",
-              "reduce": {
-                "include": [
-                  "id"
-                ],
-                "reducer": "count"
-              },
-              "replaceFields": false
-            }
-          },
-          {
-            "id": "sortBy",
-            "options": {
-              "fields": {},
-              "sort": [
-                {
-                  "desc": true,
-                  "field": "tsNs"
-                }
-              ]
-            }
+        }
+      ],
+      "type": "logs"
+    },
+    {
+      "datasource": {
+        "type": "loki",
+        "uid": "gdev-loki"
+      },
+      "description": "Transformations:\n- Count\n- Sort by\n- Limit 10",
+      "gridPos": {
+        "h": 7,
+        "w": 12,
+        "x": 12,
+        "y": 0
+      },
+      "id": 2,
+      "options": {
+        "dedupStrategy": "none",
+        "enableLogDetails": true,
+        "prettifyLogMessage": false,
+        "showCommonLabels": false,
+        "showLabels": false,
+        "showTime": false,
+        "sortOrder": "Descending",
+        "wrapLogMessage": false
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "loki",
+            "uid": "gdev-loki"
           },
-          {
-            "id": "limit",
-            "options": {
-              "limitField": 10
-            }
+          "editorMode": "code",
+          "expr": "{place=\"luna\"} | logfmt | label=\"val2\" | float > 60",
+          "maxLines": 5000,
+          "queryType": "range",
+          "refId": "do-not-chunk"
+        }
+      ],
+      "title": "Logs without splitting",
+      "transformations": [
+        {
+          "id": "calculateField",
+          "options": {
+            "alias": "id_count",
+            "mode": "reduceRow",
+            "reduce": {
+              "include": [
+                "id"
+              ],
+              "reducer": "count"
+            },
+            "replaceFields": false
           }
-        ],
-        "type": "logs"
-      },
-      {
-        "datasource": {
-          "type": "loki",
-          "uid": "gdev-loki"
         },
-        "description": "Transformations:\n- Count\n- Sort by\n- Limit 10",
-        "gridPos": {
-          "h": 7,
-          "w": 12,
-          "x": 12,
-          "y": 0
-        },
-        "id": 2,
-        "options": {
-          "dedupStrategy": "none",
-          "enableLogDetails": true,
-          "prettifyLogMessage": false,
-          "showCommonLabels": false,
-          "showLabels": false,
-          "showTime": false,
-          "sortOrder": "Descending",
-          "wrapLogMessage": false
+        {
+          "id": "sortBy",
+          "options": {
+            "fields": {},
+            "sort": [
+              {
+                "desc": true,
+                "field": "tsNs"
+              }
+            ]
+          }
         },
-        "targets": [
-          {
-            "datasource": {
-              "type": "loki",
-              "uid": "gdev-loki"
+        {
+          "id": "limit",
+          "options": {}
+        }
+      ],
+      "type": "logs"
+    },
+    {
+      "datasource": {
+        "type": "loki",
+        "uid": "gdev-loki"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
             },
-            "editorMode": "code",
-            "expr": "{place=\"luna\"} | logfmt | label=\"val2\" | float > 60",
-            "maxLines": 5000,
-            "queryType": "range",
-            "refId": "do-not-chunk"
-          }
-        ],
-        "title": "Logs without splitting",
-        "transformations": [
-          {
-            "id": "calculateField",
-            "options": {
-              "alias": "id_count",
-              "mode": "reduceRow",
-              "reduce": {
-                "include": [
-                  "id"
-                ],
-                "reducer": "count"
-              },
-              "replaceFields": false
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
             }
           },
-          {
-            "id": "sortBy",
-            "options": {
-              "fields": {},
-              "sort": [
-                {
-                  "desc": true,
-                  "field": "tsNs"
-                }
-              ]
-            }
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
           },
-          {
-            "id": "limit",
-            "options": {}
-          }
-        ],
-        "type": "logs"
+          "unitScale": true
+        },
+        "overrides": []
       },
-      {
-        "datasource": {
-          "type": "loki",
-          "uid": "gdev-loki"
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 7
+      },
+      "id": 3,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
         },
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "loki",
+            "uid": "gdev-loki"
+          },
+          "editorMode": "code",
+          "expr": "count_over_time({place=\"luna\"} | logfmt | label=\"val2\" | float > 60 | drop wave, _entry, level, float, counter [$__auto])",
+          "queryType": "range",
+          "refId": "A"
+        }
+      ],
+      "title": "Split TS",
+      "transformations": [],
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "loki",
+        "uid": "gdev-loki"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
             },
-            "custom": {
-              "axisBorderShow": false,
-              "axisCenteredZero": false,
-              "axisColorMode": "text",
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "barAlignment": 0,
-              "drawStyle": "line",
-              "fillOpacity": 0,
-              "gradientMode": "none",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
-              "insertNulls": false,
-              "lineInterpolation": "linear",
-              "lineWidth": 1,
-              "pointSize": 5,
-              "scaleDistribution": {
-                "type": "linear"
-              },
-              "showPoints": "auto",
-              "spanNulls": false,
-              "stacking": {
-                "group": "A",
-                "mode": "none"
-              },
-              "thresholdsStyle": {
-                "mode": "off"
-              }
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
             },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
             }
           },
-          "overrides": []
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unitScale": true
         },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 7
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 7
+      },
+      "id": 4,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
         },
-        "id": 3,
-        "options": {
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom",
-            "showLegend": true
-          },
-          "tooltip": {
-            "mode": "single",
-            "sort": "none"
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "loki",
+            "uid": "gdev-loki"
+          },
+          "editorMode": "code",
+          "expr": "count_over_time({place=\"luna\"} | logfmt | label=\"val2\" | float > 60 | drop wave, _entry, level, float, counter [$__auto])",
+          "queryType": "range",
+          "refId": "do-not-chunk"
+        }
+      ],
+      "title": "TS without splitting",
+      "transformations": [],
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "loki",
+        "uid": "gdev-loki"
+      },
+      "gridPos": {
+        "h": 5,
+        "w": 12,
+        "x": 0,
+        "y": 15
+      },
+      "id": 5,
+      "options": {
+        "dedupStrategy": "none",
+        "enableLogDetails": true,
+        "prettifyLogMessage": false,
+        "showCommonLabels": false,
+        "showLabels": false,
+        "showTime": false,
+        "sortOrder": "Descending",
+        "wrapLogMessage": false
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "loki",
+            "uid": "gdev-loki"
+          },
+          "editorMode": "code",
+          "expr": "{place=\"luna\"} | logfmt",
+          "maxLines": 5000,
+          "queryType": "range",
+          "refId": "A"
+        }
+      ],
+      "title": "Logs with filter transformation",
+      "transformations": [
+        {
+          "id": "filterByValue",
+          "options": {
+            "filters": [
+              {
+                "config": {
+                  "id": "isNull",
+                  "options": {}
+                },
+                "fieldName": "TraceID"
+              }
+            ],
+            "match": "any",
+            "type": "exclude"
           }
-        },
-        "targets": [
-          {
-            "datasource": {
-              "type": "loki",
-              "uid": "gdev-loki"
-            },
-            "editorMode": "code",
-            "expr": "count_over_time({place=\"luna\"} | logfmt | label=\"val2\" | float > 60 | drop wave, _entry, level, float, counter [$__auto])",
-            "queryType": "range",
-            "refId": "A"
+        }
+      ],
+      "type": "logs"
+    },
+    {
+      "datasource": {
+        "type": "loki",
+        "uid": "gdev-loki"
+      },
+      "gridPos": {
+        "h": 5,
+        "w": 12,
+        "x": 12,
+        "y": 15
+      },
+      "id": 6,
+      "options": {
+        "dedupStrategy": "none",
+        "enableLogDetails": true,
+        "prettifyLogMessage": false,
+        "showCommonLabels": false,
+        "showLabels": false,
+        "showTime": false,
+        "sortOrder": "Descending",
+        "wrapLogMessage": false
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "loki",
+            "uid": "gdev-loki"
+          },
+          "editorMode": "code",
+          "expr": "{place=\"luna\"} | logfmt",
+          "maxLines": 5000,
+          "queryType": "range",
+          "refId": "do-not-chunk"
+        }
+      ],
+      "title": "Logs with filter transformation, no splitting",
+      "transformations": [
+        {
+          "id": "filterByValue",
+          "options": {
+            "filters": [
+              {
+                "config": {
+                  "id": "isNull",
+                  "options": {}
+                },
+                "fieldName": "TraceID"
+              }
+            ],
+            "match": "any",
+            "type": "exclude"
           }
-        ],
-        "title": "Split TS",
-        "transformations": [],
-        "type": "timeseries"
+        }
+      ],
+      "type": "logs"
+    },
+    {
+      "datasource": {
+        "type": "loki",
+        "uid": "gdev-loki"
       },
-      {
-        "datasource": {
-          "type": "loki",
-          "uid": "gdev-loki"
-        },
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
             },
-            "custom": {
-              "axisBorderShow": false,
-              "axisCenteredZero": false,
-              "axisColorMode": "text",
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "barAlignment": 0,
-              "drawStyle": "line",
-              "fillOpacity": 0,
-              "gradientMode": "none",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
-              "insertNulls": false,
-              "lineInterpolation": "linear",
-              "lineWidth": 1,
-              "pointSize": 5,
-              "scaleDistribution": {
-                "type": "linear"
-              },
-              "showPoints": "auto",
-              "spanNulls": false,
-              "stacking": {
-                "group": "A",
-                "mode": "none"
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
               },
-              "thresholdsStyle": {
-                "mode": "off"
+              {
+                "color": "red",
+                "value": 80
               }
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
+            ]
           },
-          "overrides": []
+          "unitScale": true
         },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 12,
-          "y": 7
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 20
+      },
+      "id": 7,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
         },
-        "id": 4,
-        "options": {
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom",
-            "showLegend": true
-          },
-          "tooltip": {
-            "mode": "single",
-            "sort": "none"
+        "showHeader": true
+      },
+      "pluginVersion": "10.3.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "loki",
+            "uid": "gdev-loki"
+          },
+          "editorMode": "code",
+          "expr": "{place=\"luna\", age=\"new\"}",
+          "maxLines": 5000,
+          "queryType": "range",
+          "refId": "A"
+        }
+      ],
+      "title": "Logs with extract fields transformation",
+      "transformations": [
+        {
+          "id": "extractFields",
+          "options": {
+            "format": "json",
+            "keepTime": true,
+            "replace": true,
+            "source": "labels"
           }
         },
-        "targets": [
-          {
-            "datasource": {
-              "type": "loki",
-              "uid": "gdev-loki"
+        {
+          "id": "calculateField",
+          "options": {
+            "alias": "Row",
+            "mode": "index",
+            "reduce": {
+              "reducer": "sum"
             },
-            "editorMode": "code",
-            "expr": "count_over_time({place=\"luna\"} | logfmt | label=\"val2\" | float > 60 | drop wave, _entry, level, float, counter [$__auto])",
-            "queryType": "range",
-            "refId": "do-not-chunk"
+            "replaceFields": false
           }
-        ],
-        "title": "TS without splitting",
-        "transformations": [],
-        "type": "timeseries"
+        }
+      ],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "type": "loki",
+        "uid": "gdev-loki"
       },
-      {
-        "datasource": {
-          "type": "loki",
-          "uid": "gdev-loki"
-        },
-        "gridPos": {
-          "h": 5,
-          "w": 12,
-          "x": 0,
-          "y": 15
-        },
-        "id": 5,
-        "options": {
-          "dedupStrategy": "none",
-          "enableLogDetails": true,
-          "prettifyLogMessage": false,
-          "showCommonLabels": false,
-          "showLabels": false,
-          "showTime": false,
-          "sortOrder": "Descending",
-          "wrapLogMessage": false
-        },
-        "targets": [
-          {
-            "datasource": {
-              "type": "loki",
-              "uid": "gdev-loki"
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
             },
-            "editorMode": "code",
-            "expr": "{place=\"luna\"} | logfmt",
-            "maxLines": 5000,
-            "queryType": "range",
-            "refId": "A"
-          }
-        ],
-        "title": "Logs with filter transformation",
-        "transformations": [
-          {
-            "id": "filterByValue",
-            "options": {
-              "filters": [
-                {
-                  "config": {
-                    "id": "isNull",
-                    "options": {}
-                  },
-                  "fieldName": "TraceID"
-                }
-              ],
-              "match": "any",
-              "type": "exclude"
-            }
-          }
-        ],
-        "type": "logs"
-      },
-      {
-        "datasource": {
-          "type": "loki",
-          "uid": "gdev-loki"
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unitScale": true
         },
-        "gridPos": {
-          "h": 5,
-          "w": 12,
-          "x": 12,
-          "y": 15
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 20
+      },
+      "id": 8,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
         },
-        "id": 6,
-        "options": {
-          "dedupStrategy": "none",
-          "enableLogDetails": true,
-          "prettifyLogMessage": false,
-          "showCommonLabels": false,
-          "showLabels": false,
-          "showTime": false,
-          "sortOrder": "Descending",
-          "wrapLogMessage": false
+        "showHeader": true
+      },
+      "pluginVersion": "10.3.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "loki",
+            "uid": "gdev-loki"
+          },
+          "editorMode": "code",
+          "expr": "{place=\"luna\", age=\"new\"}",
+          "maxLines": 5000,
+          "queryType": "range",
+          "refId": "do-not-chunk"
+        }
+      ],
+      "title": "Logs with extract fields transformation, no splitting",
+      "transformations": [
+        {
+          "id": "extractFields",
+          "options": {
+            "format": "json",
+            "keepTime": true,
+            "replace": true,
+            "source": "labels"
+          }
         },
-        "targets": [
-          {
-            "datasource": {
-              "type": "loki",
-              "uid": "gdev-loki"
+        {
+          "id": "calculateField",
+          "options": {
+            "alias": "Row",
+            "mode": "index",
+            "reduce": {
+              "reducer": "sum"
             },
-            "editorMode": "code",
-            "expr": "{place=\"luna\"} | logfmt",
-            "maxLines": 5000,
-            "queryType": "range",
-            "refId": "do-not-chunk"
-          }
-        ],
-        "title": "Logs with filter transformation, no splitting",
-        "transformations": [
-          {
-            "id": "filterByValue",
-            "options": {
-              "filters": [
-                {
-                  "config": {
-                    "id": "isNull",
-                    "options": {}
-                  },
-                  "fieldName": "TraceID"
-                }
-              ],
-              "match": "any",
-              "type": "exclude"
-            }
+            "replaceFields": false
           }
-        ],
-        "type": "logs"
+        }
+      ],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "type": "loki",
+        "uid": "gdev-loki"
       },
-      {
-        "datasource": {
-          "type": "loki",
-          "uid": "gdev-loki"
-        },
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
             },
-            "custom": {
-              "align": "auto",
-              "cellOptions": {
-                "type": "auto"
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
               },
-              "inspect": false
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
           },
-          "overrides": []
+          "unitScale": true
         },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 20
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 28
+      },
+      "id": 9,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
         },
-        "id": 7,
-        "options": {
-          "cellHeight": "sm",
-          "footer": {
-            "countRows": false,
-            "fields": "",
-            "reducer": [
-              "sum"
-            ],
-            "show": false
+        "showHeader": true
+      },
+      "pluginVersion": "10.3.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "loki",
+            "uid": "gdev-loki"
           },
-          "showHeader": true
+          "editorMode": "code",
+          "expr": "{place=\"moon\"}",
+          "maxLines": 5,
+          "queryType": "range",
+          "refId": "A"
+        }
+      ],
+      "title": "Logs with extract key=value and organize",
+      "transformations": [
+        {
+          "id": "extractFields",
+          "options": {
+            "format": "auto",
+            "keepTime": true,
+            "replace": true,
+            "source": "Line"
+          }
         },
-        "pluginVersion": "10.2.0-61469",
-        "targets": [
-          {
-            "datasource": {
-              "type": "loki",
-              "uid": "gdev-loki"
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "31": true,
+              "32": true,
+              "33": true,
+              "34": true,
+              "35": true,
+              "36": true,
+              "37": true,
+              "38": true,
+              "39": true,
+              "40": true,
+              "41": true,
+              "42": true,
+              "43": true,
+              "44": true,
+              "45": true,
+              "46": true,
+              "2023-09-20T14": true,
+              "33+00": true,
+              "caller": true,
+              "main.go": true,
+              "t": true,
+              "ts": true
             },
-            "editorMode": "code",
-            "expr": "{place=\"luna\", age=\"new\"}",
-            "maxLines": 5000,
-            "queryType": "range",
-            "refId": "A"
-          }
-        ],
-        "title": "Logs with extract fields transformation",
-        "transformations": [
-          {
-            "id": "extractFields",
-            "options": {
-              "format": "json",
-              "keepTime": true,
-              "replace": true,
-              "source": "labels"
-            }
-          },
-          {
-            "id": "calculateField",
-            "options": {
-              "alias": "Row",
-              "mode": "index",
-              "reduce": {
-                "reducer": "sum"
-              },
-              "replaceFields": false
+            "indexByName": {},
+            "renameByName": {
+              "level": "nivel",
+              "ts": ""
             }
           }
-        ],
-        "type": "table"
+        }
+      ],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "type": "loki",
+        "uid": "gdev-loki"
       },
-      {
-        "datasource": {
-          "type": "loki",
-          "uid": "gdev-loki"
-        },
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
             },
-            "custom": {
-              "align": "auto",
-              "cellOptions": {
-                "type": "auto"
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
               },
-              "inspect": false
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
           },
-          "overrides": []
+          "unitScale": true
         },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 12,
-          "y": 20
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 28
+      },
+      "id": 10,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
         },
-        "id": 8,
-        "options": {
-          "cellHeight": "sm",
-          "footer": {
-            "countRows": false,
-            "fields": "",
-            "reducer": [
-              "sum"
-            ],
-            "show": false
+        "showHeader": true
+      },
+      "pluginVersion": "10.3.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "loki",
+            "uid": "gdev-loki"
           },
-          "showHeader": true
+          "editorMode": "code",
+          "expr": "{place=\"moon\"}",
+          "maxLines": 5,
+          "queryType": "range",
+          "refId": "do-not-chunk"
+        }
+      ],
+      "title": "Logs with extract key=value and organize, no splitting",
+      "transformations": [
+        {
+          "id": "extractFields",
+          "options": {
+            "format": "auto",
+            "keepTime": true,
+            "replace": true,
+            "source": "Line"
+          }
         },
-        "pluginVersion": "10.2.0-61469",
-        "targets": [
-          {
-            "datasource": {
-              "type": "loki",
-              "uid": "gdev-loki"
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "31": true,
+              "32": true,
+              "33": true,
+              "34": true,
+              "35": true,
+              "36": true,
+              "37": true,
+              "38": true,
+              "39": true,
+              "40": true,
+              "41": true,
+              "42": true,
+              "43": true,
+              "44": true,
+              "45": true,
+              "46": true,
+              "2023-09-20T14": true,
+              "33+00": true,
+              "caller": true,
+              "main.go": true,
+              "t": true,
+              "ts": true
             },
-            "editorMode": "code",
-            "expr": "{place=\"luna\", age=\"new\"}",
-            "maxLines": 5000,
-            "queryType": "range",
-            "refId": "do-not-chunk"
-          }
-        ],
-        "title": "Logs with extract fields transformation, no splitting",
-        "transformations": [
-          {
-            "id": "extractFields",
-            "options": {
-              "format": "json",
-              "keepTime": true,
-              "replace": true,
-              "source": "labels"
-            }
-          },
-          {
-            "id": "calculateField",
-            "options": {
-              "alias": "Row",
-              "mode": "index",
-              "reduce": {
-                "reducer": "sum"
-              },
-              "replaceFields": false
+            "indexByName": {},
+            "renameByName": {
+              "level": "nivel",
+              "ts": ""
             }
           }
-        ],
-        "type": "table"
+        }
+      ],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "type": "loki",
+        "uid": "PDDA8E780A17E7EF1"
       },
-      {
-        "datasource": {
-          "type": "loki",
-          "uid": "gdev-loki"
-        },
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
             },
-            "custom": {
-              "align": "auto",
-              "cellOptions": {
-                "type": "auto"
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
               },
-              "inspect": false
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
           },
-          "overrides": []
+          "unitScale": true
         },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 28
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 36
+      },
+      "id": 11,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
         },
-        "id": 9,
-        "options": {
-          "cellHeight": "sm",
-          "footer": {
-            "countRows": false,
-            "fields": "",
-            "reducer": [
-              "sum"
-            ],
-            "show": false
+        "showHeader": true
+      },
+      "pluginVersion": "10.3.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "loki",
+            "uid": "gdev-loki"
           },
-          "showHeader": true
+          "editorMode": "code",
+          "expr": "sum(count_over_time({place=\"moon\"}[$__auto]))",
+          "maxLines": 5,
+          "queryType": "range",
+          "refId": "A",
+          "step": "1d"
+        }
+      ],
+      "title": "Metric 1d step",
+      "transformations": [
+        {
+          "id": "extractFields",
+          "options": {
+            "format": "auto",
+            "keepTime": true,
+            "replace": true,
+            "source": "Line"
+          }
         },
-        "pluginVersion": "10.2.0-61469",
-        "targets": [
-          {
-            "datasource": {
-              "type": "loki",
-              "uid": "gdev-loki"
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "31": true,
+              "32": true,
+              "33": true,
+              "34": true,
+              "35": true,
+              "36": true,
+              "37": true,
+              "38": true,
+              "39": true,
+              "40": true,
+              "41": true,
+              "42": true,
+              "43": true,
+              "44": true,
+              "45": true,
+              "46": true,
+              "2023-09-20T14": true,
+              "33+00": true,
+              "caller": true,
+              "main.go": true,
+              "t": true,
+              "ts": true
             },
-            "editorMode": "code",
-            "expr": "{place=\"moon\"}",
-            "maxLines": 5,
-            "queryType": "range",
-            "refId": "A"
-          }
-        ],
-        "title": "Logs with extract key=value and organize",
-        "transformations": [
-          {
-            "id": "extractFields",
-            "options": {
-              "format": "auto",
-              "keepTime": true,
-              "replace": true,
-              "source": "Line"
-            }
-          },
-          {
-            "id": "organize",
-            "options": {
-              "excludeByName": {
-                "31": true,
-                "32": true,
-                "33": true,
-                "34": true,
-                "35": true,
-                "36": true,
-                "37": true,
-                "38": true,
-                "39": true,
-                "40": true,
-                "41": true,
-                "42": true,
-                "43": true,
-                "44": true,
-                "45": true,
-                "46": true,
-                "2023-09-20T14": true,
-                "33+00": true,
-                "caller": true,
-                "main.go": true,
-                "t": true,
-                "ts": true
-              },
-              "indexByName": {},
-              "renameByName": {
-                "level": "nivel",
-                "ts": ""
-              }
+            "indexByName": {},
+            "renameByName": {
+              "level": "nivel",
+              "ts": ""
             }
           }
-        ],
-        "type": "table"
+        }
+      ],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "type": "loki",
+        "uid": "PDDA8E780A17E7EF1"
       },
-      {
-        "datasource": {
-          "type": "loki",
-          "uid": "gdev-loki"
-        },
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
             },
-            "custom": {
-              "align": "auto",
-              "cellOptions": {
-                "type": "auto"
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
               },
-              "inspect": false
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
           },
-          "overrides": []
+          "unitScale": true
         },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 12,
-          "y": 28
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 36
+      },
+      "id": 12,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
         },
-        "id": 10,
-        "options": {
-          "cellHeight": "sm",
-          "footer": {
-            "countRows": false,
-            "fields": "",
-            "reducer": [
-              "sum"
-            ],
-            "show": false
+        "showHeader": true
+      },
+      "pluginVersion": "10.3.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "loki",
+            "uid": "gdev-loki"
           },
-          "showHeader": true
+          "editorMode": "code",
+          "expr": "sum(count_over_time({place=\"moon\"}[$__auto]))",
+          "maxLines": 5,
+          "queryType": "range",
+          "refId": "do-not-chunk",
+          "step": "1d"
+        }
+      ],
+      "title": "Metric 1d step, no splitting",
+      "transformations": [
+        {
+          "id": "extractFields",
+          "options": {
+            "format": "auto",
+            "keepTime": true,
+            "replace": true,
+            "source": "Line"
+          }
         },
-        "pluginVersion": "10.2.0-61469",
-        "targets": [
-          {
-            "datasource": {
-              "type": "loki",
-              "uid": "gdev-loki"
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "31": true,
+              "32": true,
+              "33": true,
+              "34": true,
+              "35": true,
+              "36": true,
+              "37": true,
+              "38": true,
+              "39": true,
+              "40": true,
+              "41": true,
+              "42": true,
+              "43": true,
+              "44": true,
+              "45": true,
+              "46": true,
+              "2023-09-20T14": true,
+              "33+00": true,
+              "caller": true,
+              "main.go": true,
+              "t": true,
+              "ts": true
             },
-            "editorMode": "code",
-            "expr": "{place=\"moon\"}",
-            "maxLines": 5,
-            "queryType": "range",
-            "refId": "do-not-chunk"
-          }
-        ],
-        "title": "Logs with extract key=value and organize, no splitting",
-        "transformations": [
-          {
-            "id": "extractFields",
-            "options": {
-              "format": "auto",
-              "keepTime": true,
-              "replace": true,
-              "source": "Line"
-            }
-          },
-          {
-            "id": "organize",
-            "options": {
-              "excludeByName": {
-                "31": true,
-                "32": true,
-                "33": true,
-                "34": true,
-                "35": true,
-                "36": true,
-                "37": true,
-                "38": true,
-                "39": true,
-                "40": true,
-                "41": true,
-                "42": true,
-                "43": true,
-                "44": true,
-                "45": true,
-                "46": true,
-                "2023-09-20T14": true,
-                "33+00": true,
-                "caller": true,
-                "main.go": true,
-                "t": true,
-                "ts": true
-              },
-              "indexByName": {},
-              "renameByName": {
-                "level": "nivel",
-                "ts": ""
-              }
+            "indexByName": {},
+            "renameByName": {
+              "level": "nivel",
+              "ts": ""
             }
           }
-        ],
-        "type": "table"
-      }
-    ],
-    "refresh": "",
-    "schemaVersion": 38,
-    "tags": [],
-    "templating": {
-      "list": []
-    },
-    "time": {
-      "from": "now-6h",
-      "to": "now"
-    },
-    "timepicker": {},
-    "timezone": "",
-    "title": "Datasource tests - Loki query splitting",
-    "uid": "dc4ec947-7e6b-4c3b-be8f-0abec7b0652a",
-    "version": 13,
-    "weekStart": ""
-  }
\ No newline at end of file
+        }
+      ],
+      "type": "table"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 39,
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-5m",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Datasource tests - Loki query splitting",
+  "uid": "dc4ec947-7e6b-4c3b-be8f-0abec7b0652a",
+  "version": 2,
+  "weekStart": ""
+}
\ No newline at end of file
diff --git a/devenv/dev-dashboards/live/live-publish.json b/devenv/dev-dashboards/live/live-publish.json
new file mode 100644
index 0000000000000..1e7e26b8dfb1e
--- /dev/null
+++ b/devenv/dev-dashboards/live/live-publish.json
@@ -0,0 +1,447 @@
+{
+    "annotations": {
+      "list": [
+        {
+          "builtIn": 1,
+          "datasource": {
+            "type": "grafana",
+            "uid": "-- Grafana --"
+          },
+          "enable": true,
+          "hide": true,
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "name": "Annotations & Alerts",
+          "type": "dashboard"
+        }
+      ]
+    },
+    "editable": true,
+    "fiscalYearStartMonth": 0,
+    "graphTooltip": 0,
+    "id": 209,
+    "links": [],
+    "panels": [
+      {
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
+        "gridPos": {
+          "h": 2,
+          "w": 24,
+          "x": 0,
+          "y": 0
+        },
+        "id": 9,
+        "options": {
+          "code": {
+            "language": "plaintext",
+            "showLineNumbers": false,
+            "showMiniMap": false
+          },
+          "content": "## This dashboard requires alpha panels to be enabled!",
+          "mode": "markdown"
+        },
+        "pluginVersion": "11.0.0-pre",
+        "type": "text"
+      },
+      {
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
+        "gridPos": {
+          "h": 4,
+          "w": 15,
+          "x": 0,
+          "y": 2
+        },
+        "id": 2,
+        "options": {
+          "channel": {
+            "namespace": "devenv",
+            "path": "weather",
+            "scope": "stream"
+          },
+          "display": "none",
+          "json": {
+            "hello": "world"
+          },
+          "message": "weather,location=west,sensor=A temperature=82\nweather,location=east,sensor=A temperature=76",
+          "publish": "influx"
+        },
+        "title": "Panel Title",
+        "type": "live"
+      },
+      {
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "custom": {
+              "align": "auto",
+              "cellOptions": {
+                "type": "auto"
+              },
+              "inspect": false
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 8,
+          "w": 9,
+          "x": 15,
+          "y": 2
+        },
+        "id": 4,
+        "options": {
+          "cellHeight": "sm",
+          "footer": {
+            "countRows": false,
+            "fields": "",
+            "reducer": [
+              "sum"
+            ],
+            "show": false
+          },
+          "showHeader": true,
+          "sortBy": []
+        },
+        "pluginVersion": "11.0.0-pre",
+        "targets": [
+          {
+            "channel": "stream/devenv/weather",
+            "datasource": {
+              "type": "datasource",
+              "uid": "grafana"
+            },
+            "queryType": "measurements",
+            "refId": "A"
+          }
+        ],
+        "title": "Weather (values)",
+        "transformations": [
+          {
+            "id": "sortBy",
+            "options": {
+              "fields": {},
+              "sort": [
+                {
+                  "desc": true,
+                  "field": "time"
+                }
+              ]
+            }
+          }
+        ],
+        "type": "table"
+      },
+      {
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
+        "gridPos": {
+          "h": 4,
+          "w": 15,
+          "x": 0,
+          "y": 6
+        },
+        "id": 5,
+        "options": {
+          "channel": {
+            "namespace": "devenv",
+            "path": "weather",
+            "scope": "stream"
+          },
+          "display": "none",
+          "json": {
+            "hello": "world"
+          },
+          "message": "weather,location=west,sensor=A temperature=90\nweather,location=east,sensor=A temperature=80",
+          "publish": "influx"
+        },
+        "title": "Panel Title",
+        "type": "live"
+      },
+      {
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisBorderShow": false,
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "line",
+              "fillOpacity": 0,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 7,
+          "w": 24,
+          "x": 0,
+          "y": 10
+        },
+        "id": 1,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "channel": "stream/devenv/weather",
+            "datasource": {
+              "type": "datasource",
+              "uid": "grafana"
+            },
+            "queryType": "measurements",
+            "refId": "A"
+          },
+          {
+            "channel": "stream/devenv/weatherX",
+            "datasource": {
+              "type": "datasource",
+              "uid": "grafana"
+            },
+            "hide": false,
+            "queryType": "measurements",
+            "refId": "B"
+          }
+        ],
+        "title": "Panel Title",
+        "type": "timeseries"
+      },
+      {
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
+        "gridPos": {
+          "h": 4,
+          "w": 15,
+          "x": 0,
+          "y": 17
+        },
+        "id": 6,
+        "options": {
+          "channel": {
+            "namespace": "devenv",
+            "path": "weather",
+            "scope": "stream"
+          },
+          "display": "none",
+          "json": {
+            "hello": "world"
+          },
+          "message": "weatherX,location=west,sensor=X temperature=82\nweatherX,location=east,sensor=X temperature=76",
+          "publish": "influx"
+        },
+        "title": "Panel Title",
+        "type": "live"
+      },
+      {
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "custom": {
+              "align": "auto",
+              "cellOptions": {
+                "type": "auto"
+              },
+              "inspect": false
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 8,
+          "w": 9,
+          "x": 15,
+          "y": 17
+        },
+        "id": 7,
+        "options": {
+          "cellHeight": "sm",
+          "footer": {
+            "countRows": false,
+            "fields": "",
+            "reducer": [
+              "sum"
+            ],
+            "show": false
+          },
+          "showHeader": true,
+          "sortBy": []
+        },
+        "pluginVersion": "11.0.0-pre",
+        "targets": [
+          {
+            "channel": "stream/devenv/weatherX",
+            "datasource": {
+              "type": "datasource",
+              "uid": "grafana"
+            },
+            "queryType": "measurements",
+            "refId": "A"
+          }
+        ],
+        "title": "WeatherX (values)",
+        "transformations": [
+          {
+            "id": "sortBy",
+            "options": {
+              "fields": {},
+              "sort": [
+                {
+                  "desc": true,
+                  "field": "time"
+                }
+              ]
+            }
+          }
+        ],
+        "type": "table"
+      },
+      {
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
+        "gridPos": {
+          "h": 4,
+          "w": 15,
+          "x": 0,
+          "y": 21
+        },
+        "id": 8,
+        "options": {
+          "channel": {
+            "namespace": "devenv",
+            "path": "weather",
+            "scope": "stream"
+          },
+          "display": "none",
+          "json": {
+            "hello": "world"
+          },
+          "message": "weatherX,location=west,sensor=X temperature=90\nweatherX,location=east,sensor=X temperature=22",
+          "publish": "influx"
+        },
+        "title": "Panel Title",
+        "type": "live"
+      }
+    ],
+    "schemaVersion": 39,
+    "tags": [
+      "gdev",
+      "live-tests"
+    ],
+    "templating": {
+      "list": []
+    },
+    "time": {
+      "from": "now-1m",
+      "to": "now"
+    },
+    "timepicker": {},
+    "timezone": "browser",
+    "title": "live test",
+    "uid": "addoomtlivedev",
+    "version": 17,
+    "weekStart": ""
+  }
\ No newline at end of file
diff --git a/devenv/dev-dashboards/migrations/migrations.json b/devenv/dev-dashboards/migrations/migrations.json
index e28a753409d2b..3d13fe327f696 100644
--- a/devenv/dev-dashboards/migrations/migrations.json
+++ b/devenv/dev-dashboards/migrations/migrations.json
@@ -21,7 +21,127 @@
   "links": [
     {
       "asDropdown": false,
-      "icon": "dashboard",
+      "icon": "external link",
+      "includeVars": false,
+      "keepTime": false,
+      "tags": [],
+      "targetBlank": true,
+      "title": "Auto migrate graph panel (TRUE)",
+      "tooltip": "",
+      "type": "link",
+      "url": " /d/cdd412c4/?__feature.autoMigrateGraphPanel=true"
+    },
+    {
+      "asDropdown": false,
+      "icon": "external link",
+      "includeVars": false,
+      "keepTime": false,
+      "tags": [],
+      "targetBlank": true,
+      "title": "Auto migrate graph panel (FALSE)",
+      "tooltip": "",
+      "type": "link",
+      "url": " /d/cdd412c4/?__feature.autoMigrateGraphPanel=false"
+    },
+    {
+      "asDropdown": false,
+      "icon": "external link",
+      "includeVars": false,
+      "keepTime": false,
+      "tags": [],
+      "targetBlank": true,
+      "title": "Auto migrate table (old) panel (TRUE)",
+      "tooltip": "",
+      "type": "link",
+      "url": " /d/cdd412c4/?__feature.autoMigrateTablePanel=true"
+    },
+    {
+      "asDropdown": false,
+      "icon": "external link",
+      "includeVars": false,
+      "keepTime": false,
+      "tags": [],
+      "targetBlank": true,
+      "title": "Auto migrate table (old) panel (FALSE)",
+      "tooltip": "",
+      "type": "link",
+      "url": " /d/cdd412c4/?__feature.autoMigrateTablePanel=false"
+    },
+    {
+      "asDropdown": false,
+      "icon": "external link",
+      "includeVars": false,
+      "keepTime": false,
+      "tags": [],
+      "targetBlank": true,
+      "title": "Auto migrate piechart panel (TRUE)",
+      "tooltip": "",
+      "type": "link",
+      "url": " /d/cdd412c4/?__feature.autoMigratePiechartPanel=true"
+    },
+    {
+      "asDropdown": false,
+      "icon": "external link",
+      "includeVars": false,
+      "keepTime": false,
+      "tags": [],
+      "targetBlank": true,
+      "title": "Auto migrate piechart panel (FALSE)",
+      "tooltip": "",
+      "type": "link",
+      "url": " /d/cdd412c4/?__feature.autoMigratePiechartPanel=false"
+    },
+    {
+      "asDropdown": false,
+      "icon": "external link",
+      "includeVars": false,
+      "keepTime": false,
+      "tags": [],
+      "targetBlank": true,
+      "title": "Auto migrate worldmap panel (TRUE)",
+      "tooltip": "",
+      "type": "link",
+      "url": " /d/cdd412c4/?__feature.autoMigrateWorldmapPanel=true"
+    },
+    {
+      "asDropdown": false,
+      "icon": "external link",
+      "includeVars": false,
+      "keepTime": false,
+      "tags": [],
+      "targetBlank": true,
+      "title": "Auto migrate worldmap panel (FALSE)",
+      "tooltip": "",
+      "type": "link",
+      "url": " /d/cdd412c4/?__feature.autoMigrateWorldmapPanel=false"
+    },
+    {
+      "asDropdown": false,
+      "icon": "external link",
+      "includeVars": false,
+      "keepTime": false,
+      "tags": [],
+      "targetBlank": true,
+      "title": "Auto migrate stat panel (TRUE)",
+      "tooltip": "",
+      "type": "link",
+      "url": " /d/cdd412c4/?__feature.autoMigrateStatPanel=true"
+    },
+    {
+      "asDropdown": false,
+      "icon": "external link",
+      "includeVars": false,
+      "keepTime": false,
+      "tags": [],
+      "targetBlank": true,
+      "title": "Auto migrate stat panel (FALSE)",
+      "tooltip": "",
+      "type": "link",
+      "url": " /d/cdd412c4/?__feature.autoMigrateStatPanel=false"
+    },
+    {
+      "asDropdown": false,
+      "icon": "external link",
       "includeVars": false,
       "keepTime": false,
       "tags": [],
@@ -45,7 +165,7 @@
     },
     {
       "asDropdown": false,
-      "icon": "dashboard",
+      "icon": "external link",
       "includeVars": false,
       "keepTime": false,
       "tags": [],
@@ -72,7 +192,279 @@
   "panels": [
     {
       "aliasColors": {},
-      "bars": false,
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 11,
+        "w": 16,
+        "x": 0,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 4,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true,
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "multi",
+          "sort": "none"
+        }
+      },
+      "percentage": false,
+      "pluginVersion": "11.0.0-pre",
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "random_walk",
+          "seriesCount": 3
+        }
+      ],
+      "thresholds": [],
+      "timeRegions": [],
+      "title": "Flot graph",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "mode": "time",
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "logBase": 1,
+          "show": true
+        },
+        {
+          "format": "short",
+          "logBase": 1,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false
+      }
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "gridPos": {
+        "h": 11,
+        "w": 8,
+        "x": 16,
+        "y": 0
+      },
+      "id": 6,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "# Graph panel >> Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Status + Notes",
+      "type": "text"
+    },
+    {
+      "aliasColors": {},
+      "bars": true,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 11,
+        "w": 16,
+        "x": 0,
+        "y": 11
+      },
+      "hiddenSeries": false,
+      "id": 28,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": false,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true,
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "multi",
+          "sort": "none"
+        }
+      },
+      "percentage": false,
+      "pluginVersion": "11.0.0-pre",
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "random_walk",
+          "seriesCount": 3
+        }
+      ],
+      "thresholds": [],
+      "timeRegions": [],
+      "title": "Flot graph - x axis series mode",
+      "tooltip": {
+        "shared": false,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "mode": "series",
+        "show": true,
+        "values": [
+          "total"
+        ]
+      },
+      "yaxes": [
+        {
+          "$$hashKey": "object:88",
+          "format": "short",
+          "logBase": 1,
+          "show": true
+        },
+        {
+          "$$hashKey": "object:89",
+          "format": "short",
+          "logBase": 1,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false
+      }
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "gridPos": {
+        "h": 11,
+        "w": 8,
+        "x": 16,
+        "y": 11
+      },
+      "id": 29,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "# Graph panel >> Bar chart panel\n",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Status + Notes",
+      "type": "text"
+    },
+    {
+      "aliasColors": {},
+      "bars": true,
       "dashLength": 10,
       "dashes": false,
       "datasource": {
@@ -81,52 +473,6 @@
       },
       "fieldConfig": {
         "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 10,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
           "unit": "short"
         },
         "overrides": []
@@ -137,20 +483,20 @@
         "h": 11,
         "w": 16,
         "x": 0,
-        "y": 0
+        "y": 22
       },
       "hiddenSeries": false,
-      "id": 4,
+      "id": 30,
       "legend": {
         "avg": false,
         "current": false,
         "max": false,
         "min": false,
-        "show": true,
+        "show": false,
         "total": false,
         "values": false
       },
-      "lines": true,
+      "lines": false,
       "linewidth": 1,
       "nullPointMode": "null",
       "options": {
@@ -167,7 +513,7 @@
         }
       },
       "percentage": false,
-      "pluginVersion": "9.5.0-pre",
+      "pluginVersion": "11.0.0-pre",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -188,25 +534,27 @@
       ],
       "thresholds": [],
       "timeRegions": [],
-      "title": "Flot graph",
+      "title": "Flot graph - x axis histogram mode",
       "tooltip": {
-        "shared": true,
+        "shared": false,
         "sort": 0,
         "value_type": "individual"
       },
-      "type": "timeseries",
+      "type": "graph",
       "xaxis": {
-        "mode": "time",
+        "mode": "histogram",
         "show": true,
         "values": []
       },
       "yaxes": [
         {
+          "$$hashKey": "object:193",
           "format": "short",
           "logBase": 1,
           "show": true
         },
         {
+          "$$hashKey": "object:194",
           "format": "short",
           "logBase": 1,
           "show": true
@@ -225,19 +573,19 @@
         "h": 11,
         "w": 8,
         "x": 16,
-        "y": 0
+        "y": 22
       },
-      "id": 6,
+      "id": 31,
       "options": {
         "code": {
           "language": "plaintext",
           "showLineNumbers": false,
           "showMiniMap": false
         },
-        "content": "# Graph panel >> Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
+        "content": "# Graph panel >> Histogram panel\n",
         "mode": "markdown"
       },
-      "pluginVersion": "9.5.0-pre",
+      "pluginVersion": "11.0.0-pre",
       "targets": [
         {
           "datasource": {
@@ -261,7 +609,7 @@
         "h": 10,
         "w": 16,
         "x": 0,
-        "y": 11
+        "y": 33
       },
       "id": 2,
       "options": {
@@ -337,7 +685,7 @@
         "h": 10,
         "w": 8,
         "x": 16,
-        "y": 11
+        "y": 33
       },
       "id": 7,
       "options": {
@@ -349,7 +697,7 @@
         "content": "# Table (old) >> Table\n\nKnown issues:\n* wrapping text\n* style changes",
         "mode": "markdown"
       },
-      "pluginVersion": "9.5.0-pre",
+      "pluginVersion": "11.0.0-pre",
       "targets": [
         {
           "datasource": {
@@ -386,10 +734,9 @@
         "h": 8,
         "w": 8,
         "x": 0,
-        "y": 21
+        "y": 43
       },
       "id": 9,
-      "links": [],
       "mappingType": 1,
       "mappingTypes": [
         {
@@ -444,65 +791,186 @@
       "valueName": "avg"
     },
     {
-      "colorBackground": false,
-      "colorValue": true,
-      "colors": [
-        "#299c46",
-        "#73BF69",
-        "#d44a3a"
-      ],
       "datasource": {
         "type": "testdata",
         "uid": "PD8C576611E62080A"
       },
-      "format": "ms",
-      "gauge": {
-        "maxValue": 100,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
+      "fieldConfig": {
+        "defaults": {
+          "mappings": [
+            {
+              "options": {
+                "match": "null",
+                "result": {
+                  "text": "N/A"
+                }
+              },
+              "type": "special"
+            }
+          ],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "ms"
+        },
+        "overrides": []
       },
       "gridPos": {
         "h": 8,
         "w": 8,
         "x": 8,
-        "y": 21
+        "y": 43
       },
       "id": 23,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
+      "maxDataPoints": 100,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": [
+            "mean"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
         {
-          "name": "value to text",
-          "value": 1
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "singlestat (old, internal.  Migrated if schema < 28)",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 8,
+        "x": 16,
+        "y": 43
+      },
+      "id": 10,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
         },
+        "content": "# Singlestat >> Stat\n\nKnown issues:\n* limited options",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
         {
-          "name": "range to text",
-          "value": 2
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A"
         }
       ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "pluginVersion": "6.2.0-pre",
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "p95",
-      "prefixFontSize": "80%",
-      "rangeMaps": [
+      "title": "Status + Notes",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "gridPos": {
+        "h": 10,
+        "w": 16,
+        "x": 0,
+        "y": 51
+      },
+      "id": 24,
+      "options": {
+        "legend": {
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "pieType": "pie",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "pluginVersion": "9.5.0-pre",
+      "targets": [
         {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "random_walk_table"
         }
       ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": false,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": true
+      "title": "grafana-piechart-panel",
+      "transformations": [
+        {
+          "id": "merge",
+          "options": {
+            "reducers": []
+          }
+        }
+      ],
+      "type": "grafana-piechart-panel"
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
       },
-      "tableColumn": "",
+      "gridPos": {
+        "h": 10,
+        "w": 8,
+        "x": 16,
+        "y": 51
+      },
+      "id": 25,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "# grafana-piechart-panel >> piechart\n\nKnown issues:\n* TBD",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
       "targets": [
         {
           "datasource": {
@@ -512,18 +980,152 @@
           "refId": "A"
         }
       ],
-      "thresholds": "",
-      "title": "singlestat (old, internal.  Migrated if schema < 28)",
-      "type": "singlestat",
-      "valueFontSize": "120%",
-      "valueMaps": [
+      "title": "Status + Notes",
+      "type": "text"
+    },
+    {
+      "circleMaxSize": 30,
+      "circleMinSize": 2,
+      "colors": [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+      ],
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "decimals": 0,
+      "esMetric": "Count",
+      "gridPos": {
+        "h": 10,
+        "w": 16,
+        "x": 0,
+        "y": 61
+      },
+      "hideEmpty": false,
+      "hideZero": false,
+      "id": 26,
+      "initialZoom": 1,
+      "locationData": "countries",
+      "mapCenter": "(0°, 0°)",
+      "mapCenterLatitude": 0,
+      "mapCenterLongitude": 0,
+      "maxDataPoints": 1,
+      "mouseWheelZoom": false,
+      "options": {
+        "basemap": {
+          "name": "Basemap",
+          "type": "default"
+        },
+        "controls": {
+          "mouseWheelZoom": false,
+          "showAttribution": true,
+          "showDebug": false,
+          "showMeasure": false,
+          "showScale": false,
+          "showZoom": true
+        },
+        "layers": [
+          {
+            "config": {
+              "showLegend": true,
+              "style": {
+                "color": {
+                  "fixed": "dark-green"
+                },
+                "opacity": 0.4,
+                "rotation": {
+                  "fixed": 0,
+                  "max": 360,
+                  "min": -360,
+                  "mode": "mod"
+                },
+                "size": {
+                  "fixed": 5,
+                  "max": 30,
+                  "min": 2
+                },
+                "symbol": {
+                  "fixed": "img/icons/marker/circle.svg",
+                  "mode": "fixed"
+                },
+                "symbolAlign": {
+                  "horizontal": "center",
+                  "vertical": "center"
+                },
+                "textConfig": {
+                  "fontSize": 12,
+                  "offsetX": 0,
+                  "offsetY": 0,
+                  "textAlign": "center",
+                  "textBaseline": "middle"
+                }
+              }
+            },
+            "location": {
+              "gazetteer": "public/gazetteer/countries.json",
+              "mode": "lookup"
+            },
+            "name": "Layer 0",
+            "tooltip": true,
+            "type": "markers"
+          }
+        ],
+        "tooltip": {
+          "mode": "details"
+        },
+        "view": {
+          "allLayers": true,
+          "id": "zero",
+          "lat": 0,
+          "lon": 0,
+          "zoom": 1
+        }
+      },
+      "pluginVersion": "10.4.0-pre",
+      "showLegend": true,
+      "stickyLabels": false,
+      "tableQueryOptions": {
+        "geohashField": "geohash",
+        "latitudeField": "latitude",
+        "longitudeField": "longitude",
+        "metricField": "metric",
+        "queryType": "geohash"
+      },
+      "targets": [
         {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
+          "csvFileName": "flight_info_by_state.csv",
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_file"
         }
       ],
-      "valueName": "avg"
+      "thresholds": "0,10",
+      "title": "grafana-worldmap-panel",
+      "transformations": [
+        {
+          "id": "merge",
+          "options": {
+            "reducers": []
+          }
+        },
+        {
+          "id": "reduce",
+          "options": {
+            "reducers": [
+              "sum"
+            ]
+          }
+        }
+      ],
+      "type": "grafana-worldmap-panel",
+      "unitPlural": "",
+      "unitSingle": "",
+      "valueName": "total"
     },
     {
       "datasource": {
@@ -531,22 +1133,22 @@
         "uid": "PD8C576611E62080A"
       },
       "gridPos": {
-        "h": 8,
+        "h": 10,
         "w": 8,
         "x": 16,
-        "y": 21
+        "y": 61
       },
-      "id": 10,
+      "id": 27,
       "options": {
         "code": {
           "language": "plaintext",
           "showLineNumbers": false,
           "showMiniMap": false
         },
-        "content": "# Singlestat >> Stat\n\nKnown issues:\n* limited options",
+        "content": "# grafana-worldmap-panel >> geomap\n\nKnown issues:\n* TBD",
         "mode": "markdown"
       },
-      "pluginVersion": "9.5.0-pre",
+      "pluginVersion": "11.0.0-pre",
       "targets": [
         {
           "datasource": {
@@ -561,7 +1163,7 @@
     }
   ],
   "refresh": "",
-  "schemaVersion": 34,
+  "schemaVersion": 39,
   "tags": [
     "gdev",
     "migrations",
@@ -574,10 +1176,11 @@
     "from": "now-6h",
     "to": "now"
   },
+  "timeRangeUpdatedDuringEditOrView": false,
   "timepicker": {},
   "timezone": "",
   "title": "Devenv - Panel migrations",
   "uid": "cdd412c4",
-  "version": 6,
+  "version": 68,
   "weekStart": ""
-}
+}
\ No newline at end of file
diff --git a/devenv/dev-dashboards/panel-barchart/barchart-tooltips-legends.json b/devenv/dev-dashboards/panel-barchart/barchart-tooltips-legends.json
new file mode 100644
index 0000000000000..70deb1af0df2a
--- /dev/null
+++ b/devenv/dev-dashboards/panel-barchart/barchart-tooltips-legends.json
@@ -0,0 +1,911 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 4,
+      "panels": [],
+      "title": "Field Override - Data Links",
+      "type": "row"
+    },
+    {
+      "datasource": {},
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "fillOpacity": 80,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 1,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "column1"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "title": "google",
+                    "url": "google.com"
+                  },
+                  {
+                    "targetBlank": true,
+                    "title": "youtube",
+                    "url": "youtube.com"
+                  }
+                ]
+              },
+              {
+                "id": "custom.fillOpacity",
+                "value": 14
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "column2"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "title": "datalink column 2",
+                    "url": "grafana.com"
+                  }
+                ]
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "purple",
+                  "mode": "shades"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 9,
+        "x": 0,
+        "y": 1
+      },
+      "id": 1,
+      "options": {
+        "barRadius": 0,
+        "barWidth": 0.97,
+        "fullHighlight": false,
+        "groupWidth": 0.7,
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "orientation": "auto",
+        "showValue": "auto",
+        "stacking": "none",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        },
+        "xTickLabelRotation": 0,
+        "xTickLabelSpacing": 0
+      },
+      "pluginVersion": "9.5.0-cloud.4.a016665c",
+      "targets": [
+        {
+          "csvContent": "id,column1,column2\r\nA,1,2",
+          "datasource": {
+            "type": "testdata",
+            "uid": "o63ntNT4z"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        },
+        {
+          "csvContent": "id,column1,column2\r\nB,2,1",
+          "datasource": {
+            "type": "testdata",
+            "uid": "o63ntNT4z"
+          },
+          "hide": false,
+          "refId": "B",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Tooltip mode: Single",
+      "transformations": [
+        {
+          "id": "merge",
+          "options": {}
+        }
+      ],
+      "type": "barchart"
+    },
+    {
+      "datasource": {},
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "fillOpacity": 80,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 1,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "column1"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "title": "google",
+                    "url": "google.com"
+                  },
+                  {
+                    "targetBlank": true,
+                    "title": "youtube",
+                    "url": "youtube.com"
+                  }
+                ]
+              },
+              {
+                "id": "custom.fillOpacity",
+                "value": 14
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "column2"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "title": "datalink column 2",
+                    "url": "grafana.com"
+                  }
+                ]
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "purple",
+                  "mode": "shades"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 9,
+        "x": 9,
+        "y": 1
+      },
+      "id": 6,
+      "options": {
+        "barRadius": 0,
+        "barWidth": 0.97,
+        "fullHighlight": false,
+        "groupWidth": 0.7,
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "orientation": "auto",
+        "showValue": "auto",
+        "stacking": "none",
+        "tooltip": {
+          "mode": "multi",
+          "sort": "none"
+        },
+        "xTickLabelRotation": 0,
+        "xTickLabelSpacing": 0
+      },
+      "pluginVersion": "9.5.0-cloud.4.a016665c",
+      "targets": [
+        {
+          "csvContent": "id,column1,column2\r\nA,1,2",
+          "datasource": {
+            "type": "testdata",
+            "uid": "o63ntNT4z"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        },
+        {
+          "csvContent": "id,column1,column2\r\nB,2,1",
+          "datasource": {
+            "type": "testdata",
+            "uid": "o63ntNT4z"
+          },
+          "hide": false,
+          "refId": "B",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Tooltip mode: All",
+      "transformations": [
+        {
+          "id": "merge",
+          "options": {}
+        }
+      ],
+      "type": "barchart"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 7
+      },
+      "id": 3,
+      "panels": [],
+      "title": "Field Override - Hide Tooltip",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "fillOpacity": 80,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 1,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "field 3"
+            },
+            "properties": [
+              {
+                "id": "custom.hideFrom",
+                "value": {
+                  "legend": false,
+                  "tooltip": true,
+                  "viz": false
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 9,
+        "x": 0,
+        "y": 8
+      },
+      "id": 5,
+      "options": {
+        "barRadius": 0,
+        "barWidth": 0.97,
+        "fullHighlight": false,
+        "groupWidth": 0.7,
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "orientation": "auto",
+        "showValue": "auto",
+        "stacking": "none",
+        "tooltip": {
+          "mode": "multi",
+          "sort": "none"
+        },
+        "xTickLabelRotation": 0,
+        "xTickLabelSpacing": 0
+      },
+      "targets": [
+        {
+          "csvContent": "id, field 1, field 2, field 3\na, 20, 30, 40\nb, 40, 50, 60",
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Hide 'field 3'",
+      "type": "barchart"
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "fillOpacity": 80,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 1,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "id"
+            },
+            "properties": [
+              {
+                "id": "custom.hideFrom",
+                "value": {
+                  "legend": false,
+                  "tooltip": true,
+                  "viz": false
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 9,
+        "x": 9,
+        "y": 8
+      },
+      "id": 7,
+      "options": {
+        "barRadius": 0,
+        "barWidth": 0.97,
+        "fullHighlight": false,
+        "groupWidth": 0.7,
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "orientation": "auto",
+        "showValue": "auto",
+        "stacking": "none",
+        "tooltip": {
+          "mode": "multi",
+          "sort": "none"
+        },
+        "xTickLabelRotation": 0,
+        "xTickLabelSpacing": 0
+      },
+      "targets": [
+        {
+          "csvContent": "id, field 1, field 2, field 3\na, 20, 30, 40\nb, 40, 50, 60",
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Hide 'id'",
+      "type": "barchart"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 14
+      },
+      "id": 8,
+      "panels": [],
+      "title": "Legends - Stacking 100%",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "fixed"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "fillOpacity": 80,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 1,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "accFS2"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 7,
+        "x": 0,
+        "y": 15
+      },
+      "id": 9,
+      "options": {
+        "barRadius": 0,
+        "barWidth": 0.97,
+        "fullHighlight": false,
+        "groupWidth": 0.7,
+        "legend": {
+          "calcs": [
+            "min",
+            "max",
+            "mean",
+            "variance"
+          ],
+          "displayMode": "table",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "orientation": "auto",
+        "showValue": "auto",
+        "stacking": "percent",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        },
+        "xTickLabelRotation": 0,
+        "xTickLabelSpacing": 0
+      },
+      "targets": [
+        {
+          "csvContent": "time, value\n100000, 10\n200000, 20\n300000, 30\n400000, 40",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        },
+        {
+          "csvContent": "time, value\n100000, 500\n200000, 220\n300000, 10\n400000, 550",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "hide": false,
+          "refId": "B",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Stacking 100% Correct Legend Units (no %)",
+      "type": "barchart"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "fillOpacity": 80,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 1,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Total B"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "red",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 7,
+        "x": 7,
+        "y": 15
+      },
+      "id": 10,
+      "options": {
+        "barRadius": 0,
+        "barWidth": 0.97,
+        "fullHighlight": false,
+        "groupWidth": 0.7,
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "orientation": "auto",
+        "showValue": "auto",
+        "stacking": "percent",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        },
+        "xTickLabelRotation": 0,
+        "xTickLabelSpacing": 0
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "rawFrameContent": "[\n  {\n    \"fields\": [\n      {\n        \"name\": \"TimeGenerated\",\n        \"type\": \"time\",\n        \"values\": [\n          1687200000000\n        ]\n      },\n      {\n        \"name\": \"Total\",\n        \"type\": \"number\",\n        \"values\": [\n          200\n        ],\n        \"labels\": {\n          \"name\": \"A\"\n        }\n      },\n      {\n        \"name\": \"Total\",\n        \"type\": \"number\",\n        \"values\": [\n          180\n        ],\n        \"labels\": {\n          \"name\": \"B\"\n        }\n      }\n    ],\n    \"refId\": \"A\",\n    \"meta\": {\n      \"custom\": {\n        \"azureColumnTypes\": [\n          \"string\",\n          \"datetime\",\n          \"long\"\n        ]\n      },\n      \"type\": \"timeseries-wide\",\n      \"typeVersion\": [\n        0,\n        0\n      ]\n    }\n  }\n]",
+          "refId": "A",
+          "scenarioId": "raw_frame"
+        }
+      ],
+      "title": "Stacking 100% Legend Label Color Override",
+      "type": "barchart"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "hidden",
+            "fillOpacity": 80,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 1,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 10,
+        "x": 14,
+        "y": 15
+      },
+      "id": 11,
+      "options": {
+        "barRadius": 0.5,
+        "barWidth": 0.97,
+        "fullHighlight": false,
+        "groupWidth": 0.7,
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "orientation": "horizontal",
+        "showValue": "auto",
+        "stacking": "percent",
+        "tooltip": {
+          "mode": "multi",
+          "sort": "none"
+        },
+        "xTickLabelRotation": 0,
+        "xTickLabelSpacing": 0
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "rawFrameContent": "[\n    {\n        \"fields\": [\n            {\n                \"name\": \"Time\",\n                \"type\": \"time\",\n                \"config\": {},\n                \"values\": [\n                    1700488200000,\n                    1700488500000,\n                    1700488800000,\n                    1700489100000,\n                    1700489400000\n                ]\n            },\n            {\n                \"name\": \"Value\",\n                \"type\": \"number\",\n                \"config\": {\n                    \"displayNameFromDS\": \"f141\"\n                },\n                \"values\": [\n                    11834,\n                    26195,\n                    27496,\n                    21417\n                ],\n                \"labels\": {\n                    \"nodename\": \"z141\"\n                }\n            }\n        ],\n        \"refId\": \"A\",\n        \"meta\": {\n            \"type\": \"timeseries-multi\",\n            \"typeVersion\": [\n                0,\n                0\n            ]\n        }\n    },\n    {\n        \"fields\": [\n            {\n                \"name\": \"Time\",\n                \"type\": \"time\",\n                \"config\": {},\n                \"values\": [\n                    1700488200000,\n                    1700488500000,\n                    1700488800000,\n                    1700489100000,\n                    1700489400000\n                ]\n            },\n            {\n                \"name\": \"Value\",\n                \"type\": \"number\",\n                \"config\": {\n                    \"displayNameFromDS\": \"f131\"\n                },\n                \"values\": [\n                    11042,\n                    26646,\n                    27120,\n                    21508,\n                    19905\n                ],\n                \"labels\": {\n                    \"nodename\": \"t131\"\n                }\n            }\n        ],\n        \"refId\": \"A\",\n        \"meta\": {\n            \"type\": \"timeseries-multi\",\n            \"typeVersion\": [\n                0,\n                0\n            ]\n        }\n    },\n    {\n        \"fields\": [\n            {\n                \"name\": \"Time\",\n                \"type\": \"time\",\n                \"config\": {},\n                \"values\": [\n                    1700488200000,\n                    1700488500000,\n                    1700488800000,\n                    1700489100000,\n                    1700489400000\n                ]\n            },\n            {\n                \"name\": \"Value\",\n                \"type\": \"number\",\n                \"config\": {\n                    \"displayNameFromDS\": \"f121\"\n                },\n                \"values\": [\n                    12095,\n                    26718,\n                    26907,\n                    21483,\n                    20272\n                ],\n                \"labels\": {\n                    \"nodename\": \"k121\"\n                }\n            }\n        ],\n        \"refId\": \"A\",\n        \"meta\": {\n            \"type\": \"timeseries-multi\",\n            \"typeVersion\": [\n                0,\n                0\n            ]\n        }\n    },\n    {\n        \"fields\": [\n            {\n                \"name\": \"Time\",\n                \"type\": \"time\",\n                \"config\": {},\n                \"values\": [\n                    1700488200000,\n                    1700488500000,\n                    1700488800000,\n                    1700489100000,\n                    1700489400000\n                ]\n            },\n            {\n                \"name\": \"Value\",\n                \"type\": \"number\",\n                \"config\": {\n                    \"displayNameFromDS\": \"f111\"\n                },\n                \"values\": [\n                    641,\n                    1015,\n                    791,\n                    752,\n                    758\n                ],\n                \"labels\": {\n                    \"nodename\": \"n111\"\n                }\n            }\n        ],\n        \"refId\": \"A\",\n        \"meta\": {\n            \"type\": \"timeseries-multi\",\n            \"typeVersion\": [\n                0,\n                0\n            ]\n        }\n    },\n    {\n        \"fields\": [\n            {\n                \"name\": \"Time\",\n                \"type\": \"time\",\n                \"config\": {},\n                \"values\": [\n                    1700488200000,\n                    1700488500000,\n                    1700488800000,\n                    1700489100000,\n                    1700489400000\n                ]\n            },\n            {\n                \"name\": \"Value\",\n                \"type\": \"number\",\n                \"config\": {\n                    \"displayNameFromDS\": \"f102\"\n                },\n                \"values\": [\n                    101,\n                    167,\n                    205,\n                    181,\n                    172\n                ],\n                \"labels\": {\n                    \"nodename\": \"a102\"\n                }\n            }\n        ],\n        \"refId\": \"A\",\n        \"meta\": {\n            \"type\": \"timeseries-multi\",\n            \"typeVersion\": [\n                0,\n                0\n            ]\n        }\n    },\n    {\n        \"fields\": [\n            {\n                \"name\": \"Time\",\n                \"type\": \"time\",\n                \"config\": {},\n                \"values\": [\n                    1700488200000,\n                    1700488500000,\n                    1700488800000,\n                    1700489100000,\n                    1700489400000\n                ]\n            },\n            {\n                \"name\": \"Value\",\n                \"type\": \"number\",\n                \"config\": {\n                    \"displayNameFromDS\": \"f100\"\n                },\n                \"values\": [\n                    89,\n                    137,\n                    161,\n                    150,\n                    161\n                ],\n                \"labels\": {\n                    \"nodename\": \"v100\"\n                }\n            }\n        ],\n        \"refId\": \"A\",\n        \"meta\": {\n            \"type\": \"timeseries-multi\",\n            \"typeVersion\": [\n                0,\n                0\n            ]\n        }\n    },\n    {\n        \"fields\": [\n            {\n                \"name\": \"Time\",\n                \"type\": \"time\",\n                \"config\": {},\n                \"values\": [\n                    1700488200000,\n                    1700488500000,\n                    1700488800000,\n                    1700489100000,\n                    1700489400000\n                ]\n            },\n            {\n                \"name\": \"Value\",\n                \"type\": \"number\",\n                \"config\": {\n                    \"displayNameFromDS\": \"d141\"\n                },\n                \"values\": [\n                    11616,\n                    26053,\n                    25586,\n                    21023,\n                    19787\n                ],\n                \"labels\": {\n                    \"nodename\": \"e141\"\n                }\n            }\n        ],\n        \"refId\": \"A\",\n        \"meta\": {\n            \"type\": \"timeseries-multi\",\n            \"typeVersion\": [\n                0,\n                0\n            ]\n        }\n    },\n    {\n        \"fields\": [\n            {\n                \"name\": \"Time\",\n                \"type\": \"time\",\n                \"config\": {},\n                \"values\": [\n                    1700488200000,\n                    1700488500000,\n                    1700488800000,\n                    1700489100000,\n                    1700489400000\n                ]\n            },\n            {\n                \"name\": \"Value\",\n                \"type\": \"number\",\n                \"config\": {\n                    \"displayNameFromDS\": \"d131\"\n                },\n                \"values\": [\n                    11682,\n                    26851,\n                    26985,\n                    22475,\n                    20852\n                ],\n                \"labels\": {\n                    \"nodename\": \"r131\"\n                }\n            }\n        ],\n        \"refId\": \"A\",\n        \"meta\": {\n            \"type\": \"timeseries-multi\",\n            \"typeVersion\": [\n                0,\n                0\n            ]\n        }\n    },\n    {\n        \"fields\": [\n            {\n                \"name\": \"Time\",\n                \"type\": \"time\",\n                \"config\": {},\n                \"values\": [\n                    1700488200000,\n                    1700488500000,\n                    1700488800000,\n                    1700489100000,\n                    1700489400000\n                ]\n            },\n            {\n                \"name\": \"Value\",\n                \"type\": \"number\",\n                \"config\": {\n                    \"displayNameFromDS\": \"d121\"\n                },\n                \"values\": [\n                    12108,\n                    26379,\n                    25734,\n                    20145,\n                    19310\n                ],\n                \"labels\": {\n                    \"nodename\": \"g121\"\n                }\n            }\n        ],\n        \"refId\": \"A\",\n        \"meta\": {\n            \"type\": \"timeseries-multi\",\n            \"typeVersion\": [\n                0,\n                0\n            ]\n        }\n    },\n    {\n        \"fields\": [\n            {\n                \"name\": \"Time\",\n                \"type\": \"time\",\n                \"config\": {},\n                \"values\": [\n                    1700488200000,\n                    1700488500000,\n                    1700488800000,\n                    1700489100000,\n                    1700489400000\n                ]\n            },\n            {\n                \"name\": \"Value\",\n                \"type\": \"number\",\n                \"config\": {\n                    \"displayNameFromDS\": \"d111\"\n                },\n                \"values\": [\n                    11254,\n                    24739,\n                    25406,\n                    21239,\n                    19426\n                ],\n                \"labels\": {\n                    \"nodename\": \"q111\"\n                }\n            }\n        ],\n        \"refId\": \"A\",\n        \"meta\": {\n            \"type\": \"timeseries-multi\",\n            \"typeVersion\": [\n                0,\n                0\n            ]\n        }\n    },\n    {\n        \"fields\": [\n            {\n                \"name\": \"Time\",\n                \"type\": \"time\",\n                \"config\": {},\n                \"values\": [\n                    1700488200000,\n                    1700488500000,\n                    1700488800000,\n                    1700489100000,\n                    1700489400000\n                ]\n            },\n            {\n                \"name\": \"Value\",\n                \"type\": \"number\",\n                \"config\": {\n                    \"displayNameFromDS\": \"d102\"\n                },\n                \"values\": [\n                    168,\n                    264,\n                    288,\n                    283,\n                    267\n                ],\n                \"labels\": {\n                    \"nodename\": \"d102\"\n                }\n            }\n        ],\n        \"refId\": \"A\",\n        \"meta\": {\n            \"type\": \"timeseries-multi\",\n            \"typeVersion\": [\n                0,\n                0\n            ]\n        }\n    }\n]",
+          "refId": "A",
+          "scenarioId": "raw_frame"
+        }
+      ],
+      "title": "Stacking 100% unique legend field label when duplicate field names are present",
+      "type": "barchart"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 39,
+  "tags": [
+    "gdev",
+    "panel-tests",
+    "barchart",
+    "graph-ng"
+  ],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Panel Tests - Bar Chart Tooltips & Legends",
+  "uid": "ea33320b-bd97-4fe1-a27c-24bc61a48b41",
+  "version": 1,
+  "weekStart": ""
+}
\ No newline at end of file
diff --git a/devenv/dev-dashboards/panel-barchart/barchart-tooltips.json b/devenv/dev-dashboards/panel-barchart/barchart-tooltips.json
deleted file mode 100644
index af7820bab3549..0000000000000
--- a/devenv/dev-dashboards/panel-barchart/barchart-tooltips.json
+++ /dev/null
@@ -1,593 +0,0 @@
-{
-    "annotations": {
-      "list": [
-        {
-          "builtIn": 1,
-          "datasource": {
-            "type": "grafana",
-            "uid": "-- Grafana --"
-          },
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations & Alerts",
-          "type": "dashboard"
-        }
-      ]
-    },
-    "editable": true,
-    "fiscalYearStartMonth": 0,
-    "graphTooltip": 0,
-    "id": 301,
-    "links": [],
-    "liveNow": false,
-    "panels": [
-      {
-        "collapsed": false,
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 0
-        },
-        "id": 4,
-        "panels": [],
-        "title": "Field Override - Data Links",
-        "type": "row"
-      },
-      {
-        "datasource": {},
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
-            },
-            "custom": {
-              "axisCenteredZero": false,
-              "axisColorMode": "text",
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "fillOpacity": 80,
-              "gradientMode": "none",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
-              "lineWidth": 1,
-              "scaleDistribution": {
-                "type": "linear"
-              },
-              "thresholdsStyle": {
-                "mode": "off"
-              }
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "column1"
-              },
-              "properties": [
-                {
-                  "id": "links",
-                  "value": [
-                    {
-                      "title": "google",
-                      "url": "google.com"
-                    },
-                    {
-                      "targetBlank": true,
-                      "title": "youtube",
-                      "url": "youtube.com"
-                    }
-                  ]
-                },
-                {
-                  "id": "custom.fillOpacity",
-                  "value": 14
-                }
-              ]
-            },
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "column2"
-              },
-              "properties": [
-                {
-                  "id": "links",
-                  "value": [
-                    {
-                      "title": "datalink column 2",
-                      "url": "grafana.com"
-                    }
-                  ]
-                },
-                {
-                  "id": "color",
-                  "value": {
-                    "fixedColor": "purple",
-                    "mode": "shades"
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 6,
-          "w": 9,
-          "x": 0,
-          "y": 1
-        },
-        "id": 1,
-        "options": {
-          "barRadius": 0,
-          "barWidth": 0.97,
-          "fullHighlight": false,
-          "groupWidth": 0.7,
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom",
-            "showLegend": true
-          },
-          "orientation": "auto",
-          "showValue": "auto",
-          "stacking": "none",
-          "tooltip": {
-            "mode": "single",
-            "sort": "none"
-          },
-          "xTickLabelRotation": 0,
-          "xTickLabelSpacing": 0
-        },
-        "pluginVersion": "9.5.0-cloud.4.a016665c",
-        "targets": [
-          {
-            "csvContent": "id,column1,column2\r\nA,1,2",
-            "datasource": {
-              "type": "testdata",
-              "uid": "o63ntNT4z"
-            },
-            "refId": "A",
-            "scenarioId": "csv_content"
-          },
-          {
-            "csvContent": "id,column1,column2\r\nB,2,1",
-            "datasource": {
-              "type": "testdata",
-              "uid": "o63ntNT4z"
-            },
-            "hide": false,
-            "refId": "B",
-            "scenarioId": "csv_content"
-          }
-        ],
-        "title": "Tooltip mode: Single",
-        "transformations": [
-          {
-            "id": "merge",
-            "options": {}
-          }
-        ],
-        "type": "barchart"
-      },
-      {
-        "datasource": {},
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
-            },
-            "custom": {
-              "axisCenteredZero": false,
-              "axisColorMode": "text",
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "fillOpacity": 80,
-              "gradientMode": "none",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
-              "lineWidth": 1,
-              "scaleDistribution": {
-                "type": "linear"
-              },
-              "thresholdsStyle": {
-                "mode": "off"
-              }
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "column1"
-              },
-              "properties": [
-                {
-                  "id": "links",
-                  "value": [
-                    {
-                      "title": "google",
-                      "url": "google.com"
-                    },
-                    {
-                      "targetBlank": true,
-                      "title": "youtube",
-                      "url": "youtube.com"
-                    }
-                  ]
-                },
-                {
-                  "id": "custom.fillOpacity",
-                  "value": 14
-                }
-              ]
-            },
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "column2"
-              },
-              "properties": [
-                {
-                  "id": "links",
-                  "value": [
-                    {
-                      "title": "datalink column 2",
-                      "url": "grafana.com"
-                    }
-                  ]
-                },
-                {
-                  "id": "color",
-                  "value": {
-                    "fixedColor": "purple",
-                    "mode": "shades"
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 6,
-          "w": 9,
-          "x": 9,
-          "y": 1
-        },
-        "id": 6,
-        "options": {
-          "barRadius": 0,
-          "barWidth": 0.97,
-          "fullHighlight": false,
-          "groupWidth": 0.7,
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom",
-            "showLegend": true
-          },
-          "orientation": "auto",
-          "showValue": "auto",
-          "stacking": "none",
-          "tooltip": {
-            "mode": "multi",
-            "sort": "none"
-          },
-          "xTickLabelRotation": 0,
-          "xTickLabelSpacing": 0
-        },
-        "pluginVersion": "9.5.0-cloud.4.a016665c",
-        "targets": [
-          {
-            "csvContent": "id,column1,column2\r\nA,1,2",
-            "datasource": {
-              "type": "testdata",
-              "uid": "o63ntNT4z"
-            },
-            "refId": "A",
-            "scenarioId": "csv_content"
-          },
-          {
-            "csvContent": "id,column1,column2\r\nB,2,1",
-            "datasource": {
-              "type": "testdata",
-              "uid": "o63ntNT4z"
-            },
-            "hide": false,
-            "refId": "B",
-            "scenarioId": "csv_content"
-          }
-        ],
-        "title": "Tooltip mode: All",
-        "transformations": [
-          {
-            "id": "merge",
-            "options": {}
-          }
-        ],
-        "type": "barchart"
-      },
-      {
-        "collapsed": false,
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 7
-        },
-        "id": 3,
-        "panels": [],
-        "title": "Field Override - Hide Tooltip",
-        "type": "row"
-      },
-      {
-        "datasource": {
-          "type": "testdata",
-          "uid": "PD8C576611E62080A"
-        },
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
-            },
-            "custom": {
-              "axisCenteredZero": false,
-              "axisColorMode": "text",
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "fillOpacity": 80,
-              "gradientMode": "none",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
-              "lineWidth": 1,
-              "scaleDistribution": {
-                "type": "linear"
-              },
-              "thresholdsStyle": {
-                "mode": "off"
-              }
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "field 3"
-              },
-              "properties": [
-                {
-                  "id": "custom.hideFrom",
-                  "value": {
-                    "legend": false,
-                    "tooltip": true,
-                    "viz": false
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 6,
-          "w": 9,
-          "x": 0,
-          "y": 8
-        },
-        "id": 5,
-        "options": {
-          "barRadius": 0,
-          "barWidth": 0.97,
-          "fullHighlight": false,
-          "groupWidth": 0.7,
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom",
-            "showLegend": true
-          },
-          "orientation": "auto",
-          "showValue": "auto",
-          "stacking": "none",
-          "tooltip": {
-            "mode": "multi",
-            "sort": "none"
-          },
-          "xTickLabelRotation": 0,
-          "xTickLabelSpacing": 0
-        },
-        "targets": [
-          {
-            "csvContent": "id, field 1, field 2, field 3\na, 20, 30, 40\nb, 40, 50, 60",
-            "datasource": {
-              "type": "testdata",
-              "uid": "PD8C576611E62080A"
-            },
-            "refId": "A",
-            "scenarioId": "csv_content"
-          }
-        ],
-        "title": "Hide 'field 3'",
-        "type": "barchart"
-      },
-      {
-        "datasource": {
-          "type": "testdata",
-          "uid": "PD8C576611E62080A"
-        },
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
-            },
-            "custom": {
-              "axisCenteredZero": false,
-              "axisColorMode": "text",
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "fillOpacity": 80,
-              "gradientMode": "none",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
-              "lineWidth": 1,
-              "scaleDistribution": {
-                "type": "linear"
-              },
-              "thresholdsStyle": {
-                "mode": "off"
-              }
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "id"
-              },
-              "properties": [
-                {
-                  "id": "custom.hideFrom",
-                  "value": {
-                    "legend": false,
-                    "tooltip": true,
-                    "viz": false
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 6,
-          "w": 9,
-          "x": 9,
-          "y": 8
-        },
-        "id": 7,
-        "options": {
-          "barRadius": 0,
-          "barWidth": 0.97,
-          "fullHighlight": false,
-          "groupWidth": 0.7,
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom",
-            "showLegend": true
-          },
-          "orientation": "auto",
-          "showValue": "auto",
-          "stacking": "none",
-          "tooltip": {
-            "mode": "multi",
-            "sort": "none"
-          },
-          "xTickLabelRotation": 0,
-          "xTickLabelSpacing": 0
-        },
-        "targets": [
-          {
-            "csvContent": "id, field 1, field 2, field 3\na, 20, 30, 40\nb, 40, 50, 60",
-            "datasource": {
-              "type": "testdata",
-              "uid": "PD8C576611E62080A"
-            },
-            "refId": "A",
-            "scenarioId": "csv_content"
-          }
-        ],
-        "title": "Hide 'id'",
-        "type": "barchart"
-      }
-    ],
-    "refresh": "",
-    "schemaVersion": 38,
-      "tags": [
-        "gdev",
-        "panel-tests",
-        "barchart",
-        "graph-ng"
-      ],
-    "templating": {
-      "list": []
-    },
-    "time": {
-      "from": "now-6h",
-      "to": "now"
-    },
-    "timepicker": {},
-    "timezone": "",
-    "title": "Panel Tests - Bar Chart Tooltip",
-    "uid": "ea33320b-bd97-4fe1-a27c-24bc61a48b41",
-    "version": 12,
-    "weekStart": ""
-  }
\ No newline at end of file
diff --git a/devenv/dev-dashboards/panel-canvas/canvas-connection-examples.json b/devenv/dev-dashboards/panel-canvas/canvas-connection-examples.json
index 7e4f1202bc44b..784bfb2c86559 100644
--- a/devenv/dev-dashboards/panel-canvas/canvas-connection-examples.json
+++ b/devenv/dev-dashboards/panel-canvas/canvas-connection-examples.json
@@ -27,6 +27,2203 @@
   "links": [],
   "liveNow": false,
   "panels": [
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 22,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 5,
+      "options": {
+        "infinitePan": true,
+        "inlineEditing": false,
+        "panZoom": true,
+        "root": {
+          "background": {
+            "color": {
+              "fixed": "transparent"
+            }
+          },
+          "border": {
+            "color": {
+              "fixed": "dark-green"
+            }
+          },
+          "constraint": {
+            "horizontal": "left",
+            "vertical": "top"
+          },
+          "elements": [
+            {
+              "background": {
+                "color": {
+                  "fixed": "transparent"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                },
+                "radius": 0,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "text"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Library"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 39",
+              "placement": {
+                "height": 118,
+                "left": 1584,
+                "top": 259,
+                "width": 204
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "transparent"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-blue"
+                },
+                "radius": 0,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "light-blue"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Viewport"
+                },
+                "valign": "bottom"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "fixed": "rgb(204, 204, 220)"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": -0.8229007633587786,
+                    "y": 0.27741935483870966
+                  },
+                  "target": {
+                    "x": 1.0112359550561798,
+                    "y": -0.012987012987012988
+                  },
+                  "targetName": "Element 20",
+                  "vertices": [
+                    {
+                      "x": -0.18181818181818182,
+                      "y": 0
+                    },
+                    {
+                      "x": -0.18181818181818182,
+                      "y": 1
+                    }
+                  ]
+                },
+                {
+                  "color": {
+                    "fixed": "rgb(204, 204, 220)"
+                  },
+                  "path": "straight",
+                  "radius": {
+                    "fixed": 25,
+                    "max": 200,
+                    "min": 0
+                  },
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": -0.3068702290076336,
+                    "y": -0.47419354838709676
+                  },
+                  "target": {
+                    "x": 1.0112359550561798,
+                    "y": -0.4805194805194805
+                  },
+                  "targetName": "Element 20",
+                  "vertices": [
+                    {
+                      "x": 0.415,
+                      "y": 0
+                    },
+                    {
+                      "x": 0.4775,
+                      "y": 1
+                    }
+                  ]
+                },
+                {
+                  "color": {
+                    "fixed": "rgb(204, 204, 220)"
+                  },
+                  "direction": "reverse",
+                  "path": "straight",
+                  "radius": {
+                    "fixed": 0,
+                    "max": 200,
+                    "min": 0
+                  },
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 0.7903930131004366,
+                    "y": -0.36935483870967745
+                  },
+                  "target": {
+                    "x": 1.0120481927710843,
+                    "y": 0.024691358024691357
+                  },
+                  "targetName": "Element 35",
+                  "vertices": [
+                    {
+                      "x": -0.1607843137254902,
+                      "y": 0
+                    },
+                    {
+                      "x": -0.1607843137254902,
+                      "y": 1
+                    }
+                  ]
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 32",
+              "placement": {
+                "height": 620,
+                "left": 1163,
+                "top": 76,
+                "width": 687
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "transparent"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "#464646"
+                },
+                "radius": 0,
+                "width": 2
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#505050"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Equipment State"
+                },
+                "valign": "bottom"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 36",
+              "placement": {
+                "height": 229,
+                "left": 1340,
+                "top": 386,
+                "width": 438
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-orange"
+                },
+                "radius": 0,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Subscriptions"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 28",
+              "placement": {
+                "height": 77,
+                "left": 831,
+                "top": 339,
+                "width": 178
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-orange"
+                },
+                "radius": 0,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Subscriptions"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 27",
+              "placement": {
+                "height": 77,
+                "left": 821,
+                "top": 329,
+                "width": 178
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "light-blue"
+                },
+                "radius": 28,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Mutation"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 26",
+              "placement": {
+                "height": 77,
+                "left": 583,
+                "top": 455,
+                "width": 178
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "light-blue"
+                },
+                "radius": 28,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Mutation"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 25",
+              "placement": {
+                "height": 77,
+                "left": 573,
+                "top": 445,
+                "width": 178
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#d9d9d9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "light-blue"
+                },
+                "radius": 28,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Subscription"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 24",
+              "placement": {
+                "height": 77,
+                "left": 583,
+                "top": 338,
+                "width": 178
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "light-blue"
+                },
+                "radius": 28,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Subscription"
+                },
+                "valign": "middle"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "fixed": "rgb(204, 204, 220)"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 0.8876404494382022,
+                    "y": 0.2597402597402597
+                  },
+                  "target": {
+                    "x": -0.9775280898876404,
+                    "y": -0.012987012987012988
+                  },
+                  "targetName": "Element 19"
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 23",
+              "placement": {
+                "height": 77,
+                "left": 573,
+                "top": 328,
+                "width": 178
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "light-blue"
+                },
+                "radius": 28,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Query"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 22",
+              "placement": {
+                "height": 77,
+                "left": 583,
+                "top": 221,
+                "width": 178
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "light-blue"
+                },
+                "radius": 28,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Query"
+                },
+                "valign": "middle"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "fixed": "rgb(204, 204, 220)"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 0.8876404494382022,
+                    "y": 0.2597402597402597
+                  },
+                  "target": {
+                    "x": -0.9887640449438202,
+                    "y": -0.06493506493506493
+                  },
+                  "targetName": "Element 18"
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 21",
+              "placement": {
+                "height": 77,
+                "left": 573,
+                "top": 211,
+                "width": 178
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-blue"
+                },
+                "radius": 28,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Controllers"
+                },
+                "valign": "middle"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "fixed": "rgb(204, 204, 220)"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": -0.2247191011235955,
+                    "y": -0.4805194805194805
+                  },
+                  "target": {
+                    "x": 0.011235955056179775,
+                    "y": 0.922077922077922
+                  },
+                  "targetName": "Element 12"
+                },
+                {
+                  "color": {
+                    "fixed": "rgb(204, 204, 220)"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 0.7752808988764045,
+                    "y": 0.5194805194805194
+                  },
+                  "target": {
+                    "x": -1.0833333333333333,
+                    "y": 0.020618556701030927
+                  },
+                  "targetName": "Element 15"
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 11",
+              "placement": {
+                "height": 77,
+                "left": 273,
+                "top": 338,
+                "width": 178
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-blue"
+                },
+                "radius": 28,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Controllers"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 10",
+              "placement": {
+                "height": 77,
+                "left": 263,
+                "top": 328,
+                "width": 178
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "light-orange"
+                },
+                "size": "contain"
+              },
+              "border": {
+                "color": {
+                  "fixed": "transparent"
+                },
+                "radius": 0,
+                "width": 5
+              },
+              "config": {
+                "fill": {
+                  "fixed": "#D9D9D9"
+                },
+                "path": {
+                  "field": "",
+                  "fixed": "https://upload.wikimedia.org/wikipedia/commons/c/c8/Forme_ligne.svg",
+                  "mode": "fixed"
+                }
+              },
+              "connections": [],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 2",
+              "placement": {
+                "height": 96,
+                "left": 1390,
+                "top": 461,
+                "width": 100
+              },
+              "type": "icon"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "transparent"
+                }
+              },
+              "border": {},
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "text": {
+                  "fixed": ""
+                },
+                "valign": "middle"
+              },
+              "connections": [],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 3",
+              "placement": {
+                "height": 30,
+                "left": 1390,
+                "top": 423,
+                "width": 30
+              },
+              "type": "ellipse"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "transparent"
+                }
+              },
+              "border": {},
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "text": {
+                  "fixed": ""
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 4",
+              "placement": {
+                "height": 30,
+                "left": 1460,
+                "top": 423,
+                "width": 30
+              },
+              "type": "ellipse"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-blue"
+                },
+                "radius": 28,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Controllers"
+                },
+                "valign": "middle"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "fixed": "green"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 1,
+                    "y": 0.5
+                  },
+                  "target": {
+                    "x": -1.0112359550561798,
+                    "y": -0.012987012987012988
+                  },
+                  "targetName": "Element 16",
+                  "vertices": [
+                    {
+                      "x": 0.42748091603053434,
+                      "y": 0
+                    },
+                    {
+                      "x": 0.42748091603053434,
+                      "y": 1
+                    }
+                  ]
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 6",
+              "placement": {
+                "height": 77,
+                "left": 253,
+                "top": 318,
+                "width": 178
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-purple"
+                },
+                "width": 4
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "DB"
+                },
+                "valign": "middle"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "fixed": "rgb(204, 204, 220)"
+                  },
+                  "direction": "both",
+                  "lineStyle": "dashed",
+                  "path": "straight",
+                  "radius": {
+                    "fixed": 50,
+                    "max": 200,
+                    "min": 0
+                  },
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 0,
+                    "y": -1
+                  },
+                  "target": {
+                    "x": -0.5168539325842697,
+                    "y": 1
+                  },
+                  "targetName": "Element 6",
+                  "vertices": [
+                    {
+                      "x": 0,
+                      "y": 0.5263157894736842
+                    }
+                  ]
+                },
+                {
+                  "color": {
+                    "fixed": "rgb(204, 204, 220)"
+                  },
+                  "direction": "reverse",
+                  "lineStyle": "dashed",
+                  "path": "straight",
+                  "radius": {
+                    "fixed": 15,
+                    "max": 200,
+                    "min": 0
+                  },
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 0,
+                    "y": 1
+                  },
+                  "target": {
+                    "x": -1.0112359550561798,
+                    "y": -0.012987012987012988
+                  },
+                  "targetName": "Element 30",
+                  "vertices": [
+                    {
+                      "x": 0,
+                      "y": 1
+                    }
+                  ]
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 9",
+              "placement": {
+                "height": 75,
+                "left": 61,
+                "top": 148,
+                "width": 178
+              },
+              "type": "parallelogram"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-blue"
+                },
+                "radius": 28,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Recipes"
+                },
+                "valign": "middle"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "fixed": "rgb(204, 204, 220)"
+                  },
+                  "direction": "both",
+                  "path": "straight",
+                  "size": {
+                    "fixed": 1,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 1,
+                    "y": 0
+                  },
+                  "target": {
+                    "x": -1.0112359550561798,
+                    "y": -0.012987012987012988
+                  },
+                  "targetName": "Element 6"
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 7",
+              "placement": {
+                "height": 77,
+                "left": 38,
+                "top": 318,
+                "width": 178
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-red"
+                },
+                "width": 4
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Queue"
+                },
+                "valign": "middle"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "fixed": "rgb(204, 204, 220)"
+                  },
+                  "direction": "both",
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 0,
+                    "y": -1
+                  },
+                  "target": {
+                    "x": 0.011235955056179775,
+                    "y": 1.025974025974026
+                  },
+                  "targetName": "Element 6"
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 8",
+              "placement": {
+                "height": 75,
+                "left": 253,
+                "top": 148,
+                "width": 178
+              },
+              "type": "parallelogram"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "#5b5959"
+                },
+                "radius": 28,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Data Pipeline"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 12",
+              "placement": {
+                "height": 77,
+                "left": 253,
+                "top": 455,
+                "width": 178
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-orange"
+                },
+                "radius": 28,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Equipment"
+                },
+                "valign": "middle"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "fixed": "rgb(204, 204, 220)"
+                  },
+                  "direction": "both",
+                  "path": "straight",
+                  "size": {
+                    "fixed": 1,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": -1,
+                    "y": 0
+                  },
+                  "target": {
+                    "x": -1.0224719101123596,
+                    "y": 0.013333333333333334
+                  },
+                  "targetName": "Element 9",
+                  "vertices": [
+                    {
+                      "x": -0.9523809523809523,
+                      "y": 0
+                    },
+                    {
+                      "x": -0.9523809523809523,
+                      "y": 1
+                    }
+                  ]
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 13",
+              "placement": {
+                "height": 77,
+                "left": 38,
+                "top": 455,
+                "width": 178
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "light-blue"
+                },
+                "radius": 28,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Subscription"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 14",
+              "placement": {
+                "height": 77,
+                "left": 563,
+                "top": 318,
+                "width": 178
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "super-light-blue"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "light-blue"
+                },
+                "radius": 28,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Filter"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 15",
+              "placement": {
+                "height": 36,
+                "left": 497,
+                "rotation": 90,
+                "top": 339,
+                "width": 97
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "light-blue"
+                },
+                "radius": 28,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Query"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 16",
+              "placement": {
+                "height": 77,
+                "left": 563,
+                "top": 201,
+                "width": 178
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "light-blue"
+                },
+                "radius": 28,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Mutation"
+                },
+                "valign": "middle"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "fixed": "dark-orange"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": -1,
+                    "y": 0
+                  },
+                  "target": {
+                    "x": 1.0224719101123596,
+                    "y": -0.45454545454545453
+                  },
+                  "targetName": "Element 6",
+                  "vertices": [
+                    {
+                      "x": 0.5692307692307692,
+                      "y": 0
+                    },
+                    {
+                      "x": 0.5692307692307692,
+                      "y": 1
+                    }
+                  ]
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 17",
+              "placement": {
+                "height": 77,
+                "left": 563,
+                "top": 435,
+                "width": 178
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-orange"
+                },
+                "radius": 0,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Initial State"
+                },
+                "valign": "middle"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "fixed": "rgb(204, 204, 220)"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 1,
+                    "y": 0
+                  },
+                  "target": {
+                    "x": -0.96,
+                    "y": 0.4583333333333333
+                  },
+                  "targetName": "Element 2",
+                  "vertices": [
+                    {
+                      "x": 0.3349875930521092,
+                      "y": 0
+                    },
+                    {
+                      "x": 0.3349875930521092,
+                      "y": 0.12727272727272726
+                    },
+                    {
+                      "x": 0.826302729528536,
+                      "y": 0.13131313131313133
+                    },
+                    {
+                      "x": 0.826302729528536,
+                      "y": 1
+                    }
+                  ]
+                },
+                {
+                  "color": {
+                    "fixed": "rgb(204, 204, 220)"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 1,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 1,
+                    "y": -0.5
+                  },
+                  "target": {
+                    "x": -0.9761904761904762,
+                    "y": 0.5263157894736842
+                  },
+                  "targetName": "Element 34",
+                  "vertices": [
+                    {
+                      "x": 0.5033557046979866,
+                      "y": 0
+                    },
+                    {
+                      "x": 0.5033557046979866,
+                      "y": 1
+                    }
+                  ]
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 18",
+              "placement": {
+                "height": 77,
+                "left": 811,
+                "top": 201,
+                "width": 178
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-orange"
+                },
+                "radius": 0,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Subscriptions"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 19",
+              "placement": {
+                "height": 77,
+                "left": 811,
+                "top": 319,
+                "width": 178
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#D9D9D9"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-orange"
+                },
+                "radius": 0,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Controls"
+                },
+                "valign": "middle"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "fixed": "rgb(204, 204, 220)"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": -1,
+                    "y": 0
+                  },
+                  "target": {
+                    "x": 1.0112359550561798,
+                    "y": 0.012987012987012988
+                  },
+                  "targetName": "Element 17"
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 20",
+              "placement": {
+                "height": 77,
+                "left": 811,
+                "top": 435,
+                "width": 178
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "super-light-blue"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "orange"
+                },
+                "radius": 0,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Filter"
+                },
+                "valign": "middle"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "fixed": "rgb(204, 204, 220)"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 1,
+                    "y": -0.5
+                  },
+                  "target": {
+                    "x": -1.0238095238095237,
+                    "y": 0.10526315789473684
+                  },
+                  "targetName": "Element 33"
+                },
+                {
+                  "color": {
+                    "fixed": "rgb(204, 204, 220)"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 1,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 1,
+                    "y": 0.5
+                  },
+                  "target": {
+                    "x": -1,
+                    "y": 0.05263157894736842
+                  },
+                  "targetName": "Element 34",
+                  "vertices": [
+                    {
+                      "x": 0.5246636771300448,
+                      "y": 0
+                    },
+                    {
+                      "x": 0.5246636771300448,
+                      "y": 1
+                    }
+                  ]
+                },
+                {
+                  "color": {
+                    "fixed": "rgb(204, 204, 220)"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 1,
+                    "y": 0
+                  },
+                  "target": {
+                    "x": -0.98,
+                    "y": -0.10416666666666667
+                  },
+                  "targetName": "Element 2",
+                  "vertices": [
+                    {
+                      "x": 0.7564979480164159,
+                      "y": 0
+                    },
+                    {
+                      "x": 0.7564979480164159,
+                      "y": 1
+                    }
+                  ]
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 29",
+              "placement": {
+                "height": 36,
+                "left": 959,
+                "rotation": 270,
+                "top": 340,
+                "width": 97
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "transparent"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "green"
+                },
+                "radius": 28,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "text"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "CAD"
+                },
+                "valign": "middle"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "fixed": "rgb(204, 204, 220)"
+                  },
+                  "lineStyle": "dashed",
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 1,
+                    "y": 0
+                  },
+                  "target": {
+                    "x": -1.0112359550561798,
+                    "y": -0.012987012987012988
+                  },
+                  "targetName": "Element 31"
+                },
+                {
+                  "color": {
+                    "fixed": "rgb(204, 204, 220)"
+                  },
+                  "lineStyle": "dashed",
+                  "path": "straight",
+                  "radius": {
+                    "fixed": 15,
+                    "max": 200,
+                    "min": 0
+                  },
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 0,
+                    "y": 1
+                  },
+                  "target": {
+                    "x": -0.029411764705882353,
+                    "y": 1
+                  },
+                  "targetName": "Element 38",
+                  "vertices": [
+                    {
+                      "x": 0,
+                      "y": -0.08737864077669903
+                    },
+                    {
+                      "x": 1,
+                      "y": -0.08737864077669903
+                    }
+                  ]
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 30",
+              "placement": {
+                "height": 77,
+                "left": 564,
+                "top": 43,
+                "width": 178
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "transparent"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "green"
+                },
+                "radius": 28,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "text"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Layout"
+                },
+                "valign": "middle"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "fixed": "rgb(204, 204, 220)"
+                  },
+                  "path": "straight",
+                  "radius": {
+                    "fixed": 15,
+                    "max": 200,
+                    "min": 0
+                  },
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 1,
+                    "y": 0
+                  },
+                  "target": {
+                    "x": -0.9939759036144579,
+                    "y": 0.5061728395061729
+                  },
+                  "targetName": "Element 35",
+                  "vertices": [
+                    {
+                      "x": 0.48,
+                      "y": 0
+                    },
+                    {
+                      "x": 0.48,
+                      "y": 1
+                    }
+                  ]
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 31",
+              "placement": {
+                "height": 77,
+                "left": 812,
+                "top": 43,
+                "width": 178
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "semi-dark-red"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-orange"
+                },
+                "radius": 0,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Alerts"
+                },
+                "valign": "middle"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "fixed": "rgb(204, 204, 220)"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": 1,
+                    "y": 0
+                  },
+                  "target": {
+                    "x": 1.0337078651685394,
+                    "y": 0.45454545454545453
+                  },
+                  "targetName": "Element 20",
+                  "vertices": [
+                    {
+                      "x": -0.05240174672489083,
+                      "y": 0
+                    },
+                    {
+                      "x": -0.05240174672489083,
+                      "y": 1
+                    }
+                  ]
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 33",
+              "placement": {
+                "height": 38,
+                "left": 1137,
+                "top": 367,
+                "width": 84
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "light-green"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                },
+                "radius": 0,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "#000000"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Jobs"
+                },
+                "valign": "middle"
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 34",
+              "placement": {
+                "height": 38,
+                "left": 1137,
+                "top": 281,
+                "width": 84
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "transparent"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                },
+                "radius": 0,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "light-blue"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Viewport State"
+                },
+                "valign": "middle"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "fixed": "rgb(204, 204, 220)"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": -1,
+                    "y": 0
+                  },
+                  "target": {
+                    "x": 0.19444444444444445,
+                    "y": 0.9896907216494846
+                  },
+                  "targetName": "Element 29",
+                  "vertices": [
+                    {
+                      "x": 1,
+                      "y": 0
+                    }
+                  ]
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 35",
+              "placement": {
+                "height": 162,
+                "left": 1189,
+                "top": 98,
+                "width": 332
+              },
+              "type": "rectangle"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "semi-dark-blue"
+                },
+                "size": "contain"
+              },
+              "border": {
+                "color": {
+                  "fixed": "transparent"
+                },
+                "radius": 0,
+                "width": 5
+              },
+              "config": {
+                "fill": {
+                  "fixed": "#D9D9D9"
+                },
+                "path": {
+                  "field": "",
+                  "fixed": "img/icons/iot/pump.svg",
+                  "mode": "fixed"
+                }
+              },
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 37",
+              "placement": {
+                "height": 96,
+                "left": 1601,
+                "top": 461,
+                "width": 100
+              },
+              "type": "icon"
+            },
+            {
+              "background": {
+                "color": {
+                  "fixed": "#222020"
+                }
+              },
+              "border": {
+                "color": {
+                  "fixed": "dark-green"
+                },
+                "radius": 0,
+                "width": 3
+              },
+              "config": {
+                "align": "center",
+                "color": {
+                  "fixed": "text"
+                },
+                "size": 20,
+                "text": {
+                  "fixed": "Library"
+                },
+                "valign": "middle"
+              },
+              "connections": [
+                {
+                  "color": {
+                    "fixed": "rgb(204, 204, 220)"
+                  },
+                  "path": "straight",
+                  "size": {
+                    "fixed": 2,
+                    "max": 10,
+                    "min": 1
+                  },
+                  "source": {
+                    "x": -1,
+                    "y": 0
+                  },
+                  "target": {
+                    "x": -0.4977168949771689,
+                    "y": 1.017467248908297
+                  },
+                  "targetName": "Element 36",
+                  "vertices": [
+                    {
+                      "x": 1,
+                      "y": 0
+                    }
+                  ]
+                }
+              ],
+              "constraint": {
+                "horizontal": "left",
+                "vertical": "top"
+              },
+              "name": "Element 38",
+              "placement": {
+                "height": 118,
+                "left": 1574,
+                "top": 249,
+                "width": 204
+              },
+              "type": "rectangle"
+            }
+          ],
+          "name": "Element 1711297729286",
+          "placement": {
+            "height": 100,
+            "left": 0,
+            "rotation": 0,
+            "top": 0,
+            "width": 100
+          },
+          "type": "frame"
+        },
+        "showAdvancedTypes": true
+      },
+      "pluginVersion": "11.1.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "random_walk",
+          "seriesCount": 1
+        }
+      ],
+      "title": "Flowcharting",
+      "type": "canvas"
+    },
     {
       "datasource": {
         "type": "testdata",
@@ -42,8 +2239,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "#6ED0E0",
@@ -67,11 +2263,13 @@
         "h": 11,
         "w": 15,
         "x": 5,
-        "y": 0
+        "y": 22
       },
       "id": 4,
       "options": {
+        "infinitePan": false,
         "inlineEditing": true,
+        "panZoom": false,
         "root": {
           "background": {
             "color": {
@@ -83,6 +2281,10 @@
               "fixed": "dark-green"
             }
           },
+          "constraint": {
+            "horizontal": "left",
+            "vertical": "top"
+          },
           "elements": [
             {
               "background": {
@@ -628,11 +2830,18 @@
             }
           ],
           "name": "Element 1672955773575",
+          "placement": {
+            "height": 100,
+            "left": 0,
+            "rotation": 0,
+            "top": 0,
+            "width": 100
+          },
           "type": "frame"
         },
         "showAdvancedTypes": false
       },
-      "pluginVersion": "10.1.0-pre",
+      "pluginVersion": "11.1.0-pre",
       "targets": [
         {
           "csvContent": "gateway, product-details, product-reviews, reviews-ratings, details-checkout\n100, 56, 44, 22, 28",
@@ -669,8 +2878,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "blue",
@@ -694,11 +2902,13 @@
         "h": 15,
         "w": 15,
         "x": 5,
-        "y": 11
+        "y": 33
       },
       "id": 2,
       "options": {
+        "infinitePan": false,
         "inlineEditing": false,
+        "panZoom": false,
         "root": {
           "background": {
             "color": {
@@ -1400,7 +3610,7 @@
         },
         "showAdvancedTypes": false
       },
-      "pluginVersion": "10.1.0-pre",
+      "pluginVersion": "11.1.0-pre",
       "targets": [
         {
           "csvContent": "database_server, server_database, server_region, region_server, database2_server, server_database2\n10, 53, 35, 12, 22, 81",
@@ -1418,7 +3628,7 @@
   ],
   "refresh": "",
   "revision": 1,
-  "schemaVersion": 38,
+  "schemaVersion": 39,
   "tags": [
     "gdev",
     "panel-tests",
@@ -1431,10 +3641,11 @@
     "from": "now-6h",
     "to": "now"
   },
+  "timeRangeUpdatedDuringEditOrView": false,
   "timepicker": {},
   "timezone": "",
   "title": "Panel Tests - Canvas Connection Examples",
   "uid": "Pu8lwQAVz",
-  "version": 3,
+  "version": 6,
   "weekStart": ""
 }
\ No newline at end of file
diff --git a/devenv/dev-dashboards/panel-canvas/canvas-datalinks.json b/devenv/dev-dashboards/panel-canvas/canvas-datalinks.json
new file mode 100644
index 0000000000000..0b95594b58c3e
--- /dev/null
+++ b/devenv/dev-dashboards/panel-canvas/canvas-datalinks.json
@@ -0,0 +1,3478 @@
+{
+    "annotations": {
+        "list": [
+            {
+                "builtIn": 1,
+                "datasource": {
+                    "type": "grafana",
+                    "uid": "-- Grafana --"
+                },
+                "enable": true,
+                "hide": true,
+                "iconColor": "rgba(0, 211, 255, 1)",
+                "name": "Annotations & Alerts",
+                "type": "dashboard"
+            }
+        ]
+    },
+    "description": "",
+    "editable": true,
+    "fiscalYearStartMonth": 0,
+    "graphTooltip": 0,
+    "links": [],
+    "panels": [
+        {
+            "datasource": {
+                "type": "grafana",
+                "uid": "grafana"
+            },
+            "fieldConfig": {
+                "defaults": {
+                    "color": {
+                        "mode": "thresholds"
+                    },
+                    "mappings": [],
+                    "thresholds": {
+                        "mode": "absolute",
+                        "steps": [
+                            {
+                                "color": "green",
+                                "value": null
+                            },
+                            {
+                                "color": "red",
+                                "value": 80
+                            }
+                        ]
+                    }
+                },
+                "overrides": [
+                    {
+                        "matcher": {
+                            "id": "byName",
+                            "options": "A-hehwzd"
+                        },
+                        "properties": [
+                            {
+                                "id": "links",
+                                "value": [
+                                    {
+                                        "targetBlank": true,
+                                        "title": "A-series data link",
+                                        "url": "http://localhost:3000/d/dddouk2ygsb9cc/6114e28a-4041-5fbd-878f-b98718a90c4d?${__url_time_range}"
+                                    }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "matcher": {
+                            "id": "byName",
+                            "options": "Count (transformation)"
+                        },
+                        "properties": [
+                            {
+                                "id": "links",
+                                "value": [
+                                    {
+                                        "targetBlank": true,
+                                        "title": "Count data link",
+                                        "url": "http://localhost:3000/d/dddouk2ygsb9cc/6114e28a-4041-5fbd-878f-b98718a90c4d${__data.fields.A-series}"
+                                    }
+                                ]
+                            }
+                        ]
+                    }
+                ]
+            },
+            "gridPos": {
+                "h": 30,
+                "w": 24,
+                "x": 0,
+                "y": 0
+            },
+            "id": 1,
+            "options": {
+                "inlineEditing": false,
+                "panZoom": false,
+                "root": {
+                    "background": {
+                        "color": {
+                            "fixed": "transparent"
+                        }
+                    },
+                    "border": {
+                        "color": {
+                            "fixed": "dark-green"
+                        },
+                        "width": 0
+                    },
+                    "constraint": {
+                        "horizontal": "left",
+                        "vertical": "top"
+                    },
+                    "elements": [
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "fixed": "rgb(204, 204, 220)"
+                                },
+                                "size": 24,
+                                "text": {
+                                    "fixed": "Metric Value"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 1",
+                            "placement": {
+                                "height": 50,
+                                "left": 38,
+                                "top": 23,
+                                "width": 144
+                            },
+                            "type": "text"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "#D9D9D9"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "fixed": "#000000"
+                                },
+                                "size": 20,
+                                "text": {
+                                    "field": "A-hehwzd",
+                                    "fixed": "",
+                                    "mode": "field"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 2",
+                            "placement": {
+                                "height": 50,
+                                "left": 16,
+                                "top": 91,
+                                "width": 188
+                            },
+                            "type": "metric-value"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "field": "A-hehwzd",
+                                    "fixed": "#000000"
+                                },
+                                "size": 20,
+                                "text": {
+                                    "fixed": "Text color",
+                                    "mode": "fixed"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 3",
+                            "placement": {
+                                "height": 50,
+                                "left": 16,
+                                "top": 170,
+                                "width": 188
+                            },
+                            "type": "metric-value"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                },
+                                "image": {
+                                    "field": "Count (transformation)",
+                                    "mode": "field"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "fixed": "text"
+                                },
+                                "size": 20,
+                                "text": {
+                                    "fixed": "Background image",
+                                    "mode": "fixed"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 4",
+                            "placement": {
+                                "height": 50,
+                                "left": 16,
+                                "top": 249,
+                                "width": 188
+                            },
+                            "type": "metric-value"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "field": "A-hehwzd",
+                                    "fixed": "dark-green"
+                                },
+                                "width": 2
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "fixed": "text"
+                                },
+                                "size": 20,
+                                "text": {
+                                    "fixed": "Border",
+                                    "mode": "fixed"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 5",
+                            "placement": {
+                                "height": 50,
+                                "left": 16,
+                                "top": 328,
+                                "width": 188
+                            },
+                            "type": "metric-value"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "fixed": "text"
+                                },
+                                "size": 16,
+                                "text": {
+                                    "field": "A-hehwzd",
+                                    "mode": "field"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 6",
+                            "placement": {
+                                "height": 50,
+                                "left": 262,
+                                "top": 91,
+                                "width": 188
+                            },
+                            "type": "text"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                },
+                                "image": {
+                                    "fixed": ""
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "field": "A-hehwzd",
+                                    "fixed": "rgb(204, 204, 220)"
+                                },
+                                "size": 16,
+                                "text": {
+                                    "fixed": "Text color"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 7",
+                            "placement": {
+                                "height": 50,
+                                "left": 262,
+                                "top": 170,
+                                "width": 188
+                            },
+                            "type": "text"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                },
+                                "image": {
+                                    "field": "Count (transformation)",
+                                    "mode": "field"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "fixed": "rgb(204, 204, 220)"
+                                },
+                                "size": 16,
+                                "text": {
+                                    "fixed": "Background image"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 8",
+                            "placement": {
+                                "height": 50,
+                                "left": 262,
+                                "top": 249,
+                                "width": 188
+                            },
+                            "type": "text"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "field": "A-hehwzd",
+                                    "fixed": "dark-green"
+                                },
+                                "width": 2
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "fixed": "rgb(204, 204, 220)"
+                                },
+                                "size": 16,
+                                "text": {
+                                    "fixed": "Border"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 9",
+                            "placement": {
+                                "height": 50,
+                                "left": 262,
+                                "top": 328,
+                                "width": 188
+                            },
+                            "type": "text"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "fixed": "rgb(204, 204, 220)"
+                                },
+                                "size": 24,
+                                "text": {
+                                    "fixed": "Text"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 10",
+                            "placement": {
+                                "height": 50,
+                                "left": 284,
+                                "top": 23,
+                                "width": 144
+                            },
+                            "type": "text"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "backgroundColor": {
+                                    "fixed": "#D9D9D9"
+                                },
+                                "borderColor": {
+                                    "fixed": "transparent"
+                                },
+                                "color": {
+                                    "fixed": "#000000"
+                                },
+                                "text": {
+                                    "field": "A-hehwzd",
+                                    "mode": "field"
+                                },
+                                "valign": "middle",
+                                "width": 1
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 11",
+                            "placement": {
+                                "height": 50,
+                                "left": 530,
+                                "top": 91,
+                                "width": 188
+                            },
+                            "type": "ellipse"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "backgroundColor": {
+                                    "fixed": "#D9D9D9"
+                                },
+                                "borderColor": {
+                                    "fixed": "transparent"
+                                },
+                                "color": {
+                                    "field": "A-hehwzd",
+                                    "fixed": "#000000"
+                                },
+                                "text": {
+                                    "fixed": "Text color"
+                                },
+                                "valign": "middle",
+                                "width": 1
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 12",
+                            "placement": {
+                                "height": 50,
+                                "left": 530,
+                                "top": 170,
+                                "width": 188
+                            },
+                            "type": "ellipse"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                },
+                                "image": {
+                                    "field": "Count (transformation)",
+                                    "mode": "field"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "backgroundColor": {
+                                    "fixed": "#D9D9D9"
+                                },
+                                "borderColor": {
+                                    "fixed": "transparent"
+                                },
+                                "color": {
+                                    "fixed": "#000000"
+                                },
+                                "text": {
+                                    "fixed": "Background image"
+                                },
+                                "valign": "middle",
+                                "width": 1
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 13",
+                            "placement": {
+                                "height": 50,
+                                "left": 530,
+                                "top": 249,
+                                "width": 188
+                            },
+                            "type": "ellipse"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "field": "A-hehwzd",
+                                    "fixed": "dark-green"
+                                },
+                                "width": 2
+                            },
+                            "config": {
+                                "align": "center",
+                                "backgroundColor": {
+                                    "fixed": "#D9D9D9"
+                                },
+                                "borderColor": {
+                                    "fixed": "transparent"
+                                },
+                                "color": {
+                                    "fixed": "#000000"
+                                },
+                                "text": {
+                                    "fixed": "Border"
+                                },
+                                "valign": "middle",
+                                "width": 1
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 14",
+                            "placement": {
+                                "height": 50,
+                                "left": 530,
+                                "top": 328,
+                                "width": 188
+                            },
+                            "type": "ellipse"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "fixed": "rgb(204, 204, 220)"
+                                },
+                                "size": 24,
+                                "text": {
+                                    "fixed": "Ellipse"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 15",
+                            "placement": {
+                                "height": 50,
+                                "left": 552,
+                                "top": 23,
+                                "width": 144
+                            },
+                            "type": "text"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "#D9D9D9"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "fixed": "#000000"
+                                },
+                                "text": {
+                                    "field": "A-hehwzd",
+                                    "mode": "field"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 16",
+                            "placement": {
+                                "height": 50,
+                                "left": 798,
+                                "top": 91,
+                                "width": 188
+                            },
+                            "type": "rectangle"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "#D9D9D9"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "field": "A-hehwzd",
+                                    "fixed": "#000000"
+                                },
+                                "text": {
+                                    "fixed": "Text color"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 17",
+                            "placement": {
+                                "height": 50,
+                                "left": 798,
+                                "top": 170,
+                                "width": 188
+                            },
+                            "type": "rectangle"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "#D9D9D9"
+                                },
+                                "image": {
+                                    "field": "Count (transformation)",
+                                    "mode": "field"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "fixed": "#000000"
+                                },
+                                "text": {
+                                    "fixed": "Background image"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 18",
+                            "placement": {
+                                "height": 50,
+                                "left": 798,
+                                "top": 249,
+                                "width": 188
+                            },
+                            "type": "rectangle"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "#D9D9D9"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "field": "A-hehwzd",
+                                    "fixed": "dark-green"
+                                },
+                                "width": 2
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "fixed": "#000000"
+                                },
+                                "text": {
+                                    "fixed": "Border"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 19",
+                            "placement": {
+                                "height": 50,
+                                "left": 798,
+                                "top": 328,
+                                "width": 188
+                            },
+                            "type": "rectangle"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "fixed": "rgb(204, 204, 220)"
+                                },
+                                "size": 24,
+                                "text": {
+                                    "fixed": "Rectangle"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 20",
+                            "placement": {
+                                "height": 50,
+                                "left": 820,
+                                "top": 23,
+                                "width": 144
+                            },
+                            "type": "text"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "fill": {
+                                    "fixed": "#D9D9D9"
+                                },
+                                "path": {
+                                    "field": "A-hehwzd",
+                                    "fixed": "img/icons/unicons/question-circle.svg",
+                                    "mode": "field"
+                                }
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 21",
+                            "placement": {
+                                "height": 50,
+                                "left": 1066,
+                                "top": 91,
+                                "width": 188
+                            },
+                            "type": "icon"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "fill": {
+                                    "field": "A-hehwzd",
+                                    "fixed": "#D9D9D9"
+                                },
+                                "path": {
+                                    "fixed": "img/icons/unicons/question-circle.svg",
+                                    "mode": "fixed"
+                                }
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 22",
+                            "placement": {
+                                "height": 50,
+                                "left": 1066,
+                                "top": 170,
+                                "width": 188
+                            },
+                            "type": "icon"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                },
+                                "image": {
+                                    "field": "Count (transformation)",
+                                    "mode": "field"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "fill": {
+                                    "fixed": "#D9D9D9"
+                                },
+                                "path": {
+                                    "fixed": "img/icons/unicons/question-circle.svg",
+                                    "mode": "fixed"
+                                }
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 23",
+                            "placement": {
+                                "height": 50,
+                                "left": 1066,
+                                "top": 249,
+                                "width": 188
+                            },
+                            "type": "icon"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "field": "A-hehwzd",
+                                    "fixed": "dark-green"
+                                },
+                                "width": 2
+                            },
+                            "config": {
+                                "fill": {
+                                    "fixed": "#D9D9D9"
+                                },
+                                "path": {
+                                    "fixed": "img/icons/unicons/question-circle.svg",
+                                    "mode": "fixed"
+                                }
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 24",
+                            "placement": {
+                                "height": 50,
+                                "left": 1066,
+                                "top": 328,
+                                "width": 188
+                            },
+                            "type": "icon"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "fixed": "rgb(204, 204, 220)"
+                                },
+                                "size": 24,
+                                "text": {
+                                    "fixed": "Icon"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 25",
+                            "placement": {
+                                "height": 50,
+                                "left": 1088,
+                                "top": 23,
+                                "width": 144
+                            },
+                            "type": "text"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "statusColor": {
+                                    "field": "A-hehwzd"
+                                },
+                                "type": "Single"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 26",
+                            "placement": {
+                                "height": 90,
+                                "left": 65,
+                                "top": 516,
+                                "width": 90
+                            },
+                            "type": "server"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "field": "A-hehwzd",
+                                    "fixed": "dark-green"
+                                },
+                                "width": 2
+                            },
+                            "config": {
+                                "type": "Single"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 29",
+                            "placement": {
+                                "height": 90,
+                                "left": 65,
+                                "top": 870,
+                                "width": 90
+                            },
+                            "type": "server"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "fixed": "rgb(204, 204, 220)"
+                                },
+                                "size": 24,
+                                "text": {
+                                    "fixed": "Server"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 30",
+                            "placement": {
+                                "height": 50,
+                                "left": 38,
+                                "top": 438,
+                                "width": 144
+                            },
+                            "type": "text"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "bulbColor": {
+                                    "field": "A-hehwzd"
+                                },
+                                "statusColor": {
+                                    "fixed": "transparent"
+                                },
+                                "type": "Single"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 31",
+                            "placement": {
+                                "height": 90,
+                                "left": 65,
+                                "top": 634,
+                                "width": 90
+                            },
+                            "type": "server"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "blinkRate": {
+                                    "field": "A-hehwzd"
+                                },
+                                "bulbColor": {
+                                    "fixed": "#000000"
+                                },
+                                "statusColor": {
+                                    "fixed": "transparent"
+                                },
+                                "type": "Single"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 32",
+                            "placement": {
+                                "height": 90,
+                                "left": 65,
+                                "top": 752,
+                                "width": 90
+                            },
+                            "type": "server"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "rpm": {
+                                    "field": "A-hehwzd"
+                                },
+                                "statusColor": {
+                                    "field": "A-hehwzd"
+                                },
+                                "type": "Single"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 33",
+                            "placement": {
+                                "height": 55,
+                                "left": 329,
+                                "top": 516,
+                                "width": 55
+                            },
+                            "type": "windTurbine"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "fixed": "rgb(204, 204, 220)"
+                                },
+                                "size": 24,
+                                "text": {
+                                    "fixed": "Wind Turbine"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 35",
+                            "placement": {
+                                "height": 50,
+                                "left": 270,
+                                "top": 438,
+                                "width": 172
+                            },
+                            "type": "text"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "field": "A-hehwzd",
+                                    "fixed": "transparent"
+                                },
+                                "image": {
+                                    "field": "Count (transformation)",
+                                    "mode": "field"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "bulbColor": {
+                                    "field": "A-hehwzd"
+                                },
+                                "statusColor": {
+                                    "fixed": "transparent"
+                                },
+                                "type": "Single"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 36",
+                            "placement": {
+                                "height": 55,
+                                "left": 329,
+                                "top": 633,
+                                "width": 55
+                            },
+                            "type": "windTurbine"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "field": "Count (transformation)",
+                                    "fixed": "transparent"
+                                },
+                                "image": {
+                                    "field": "A-hehwzd",
+                                    "mode": "field"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                },
+                                "width": 0
+                            },
+                            "config": {
+                                "type": "Single"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 38",
+                            "placement": {
+                                "height": 90,
+                                "left": 65,
+                                "top": 988,
+                                "width": 90
+                            },
+                            "type": "server"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                },
+                                "image": {
+                                    "field": "",
+                                    "mode": "field"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "field": "A-hehwzd",
+                                    "fixed": "dark-green"
+                                },
+                                "width": 1
+                            },
+                            "config": {
+                                "bulbColor": {
+                                    "field": "A-hehwzd"
+                                },
+                                "statusColor": {
+                                    "fixed": "transparent"
+                                },
+                                "type": "Single"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 37",
+                            "placement": {
+                                "height": 55,
+                                "left": 329,
+                                "top": 752,
+                                "width": 55
+                            },
+                            "type": "windTurbine"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "fixed": "rgb(204, 204, 220)"
+                                },
+                                "size": 24,
+                                "text": {
+                                    "fixed": "Cloud"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 39",
+                            "placement": {
+                                "height": 50,
+                                "left": 530,
+                                "top": 438,
+                                "width": 172
+                            },
+                            "type": "text"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "#D9D9D9"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "fixed": "#000000"
+                                },
+                                "text": {
+                                    "field": "A-hehwzd",
+                                    "mode": "field"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 40",
+                            "placement": {
+                                "height": 50,
+                                "left": 530,
+                                "top": 517,
+                                "width": 188
+                            },
+                            "type": "cloud"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "#D9D9D9"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "field": "A-hehwzd",
+                                    "fixed": "#000000"
+                                },
+                                "text": {
+                                    "fixed": "Text color"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 41",
+                            "placement": {
+                                "height": 50,
+                                "left": 530,
+                                "top": 596,
+                                "width": 188
+                            },
+                            "type": "cloud"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "#D9D9D9"
+                                },
+                                "image": {
+                                    "field": "Count (transformation)",
+                                    "mode": "field"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "left",
+                                "color": {
+                                    "fixed": "#000000"
+                                },
+                                "text": {
+                                    "fixed": "Background image"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 42",
+                            "placement": {
+                                "height": 50,
+                                "left": 530,
+                                "top": 675,
+                                "width": 188
+                            },
+                            "type": "cloud"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "#D9D9D9"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "field": "A-hehwzd",
+                                    "fixed": "dark-green"
+                                },
+                                "width": 5
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "fixed": "#000000"
+                                },
+                                "text": {
+                                    "fixed": "Border"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 43",
+                            "placement": {
+                                "height": 50,
+                                "left": 530,
+                                "top": 754,
+                                "width": 188
+                            },
+                            "type": "cloud"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "fixed": "rgb(204, 204, 220)"
+                                },
+                                "size": 24,
+                                "text": {
+                                    "fixed": "Parallelogram"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 44",
+                            "placement": {
+                                "height": 50,
+                                "left": 806,
+                                "top": 438,
+                                "width": 172
+                            },
+                            "type": "text"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "#D9D9D9"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "fixed": "#000000"
+                                },
+                                "text": {
+                                    "field": "A-hehwzd",
+                                    "fixed": "",
+                                    "mode": "field"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 45",
+                            "placement": {
+                                "height": 50,
+                                "left": 798,
+                                "top": 516,
+                                "width": 188
+                            },
+                            "type": "parallelogram"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "#D9D9D9"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "field": "A-hehwzd",
+                                    "fixed": "#000000"
+                                },
+                                "text": {
+                                    "fixed": "Text color"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 46",
+                            "placement": {
+                                "height": 50,
+                                "left": 798,
+                                "top": 595,
+                                "width": 188
+                            },
+                            "type": "parallelogram"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "#D9D9D9"
+                                },
+                                "image": {
+                                    "field": "Count (transformation)",
+                                    "mode": "field"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "left",
+                                "color": {
+                                    "fixed": "#000000"
+                                },
+                                "text": {
+                                    "fixed": "Background image"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 47",
+                            "placement": {
+                                "height": 50,
+                                "left": 798,
+                                "top": 674,
+                                "width": 188
+                            },
+                            "type": "parallelogram"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "#D9D9D9"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "field": "A-hehwzd",
+                                    "fixed": "dark-green"
+                                },
+                                "width": 5
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "fixed": "#000000"
+                                },
+                                "text": {
+                                    "fixed": "Border"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 48",
+                            "placement": {
+                                "height": 50,
+                                "left": 798,
+                                "top": 753,
+                                "width": 188
+                            },
+                            "type": "parallelogram"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "transparent"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "fixed": "rgb(204, 204, 220)"
+                                },
+                                "size": 24,
+                                "text": {
+                                    "fixed": "Triangle"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 49",
+                            "placement": {
+                                "height": 50,
+                                "left": 1074,
+                                "top": 438,
+                                "width": 172
+                            },
+                            "type": "text"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "#D9D9D9"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "fixed": "#000000"
+                                },
+                                "text": {
+                                    "field": "A-hehwzd",
+                                    "fixed": "",
+                                    "mode": "field"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 50",
+                            "placement": {
+                                "height": 50,
+                                "left": 1066,
+                                "top": 516,
+                                "width": 188
+                            },
+                            "type": "triangle"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "#D9D9D9"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "field": "A-hehwzd",
+                                    "fixed": "#000000"
+                                },
+                                "text": {
+                                    "fixed": "Text color"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 51",
+                            "placement": {
+                                "height": 50,
+                                "left": 1066,
+                                "top": 595,
+                                "width": 188
+                            },
+                            "type": "triangle"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "#D9D9D9"
+                                },
+                                "image": {
+                                    "field": "Count (transformation)",
+                                    "mode": "field"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "fixed": "dark-green"
+                                }
+                            },
+                            "config": {
+                                "align": "left",
+                                "color": {
+                                    "fixed": "#000000"
+                                },
+                                "text": {
+                                    "fixed": "Background image"
+                                },
+                                "valign": "bottom"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 52",
+                            "placement": {
+                                "height": 50,
+                                "left": 1066,
+                                "top": 674,
+                                "width": 188
+                            },
+                            "type": "triangle"
+                        },
+                        {
+                            "background": {
+                                "color": {
+                                    "fixed": "#D9D9D9"
+                                }
+                            },
+                            "border": {
+                                "color": {
+                                    "field": "A-hehwzd",
+                                    "fixed": "dark-green"
+                                },
+                                "width": 5
+                            },
+                            "config": {
+                                "align": "center",
+                                "color": {
+                                    "fixed": "#000000"
+                                },
+                                "text": {
+                                    "fixed": "Border"
+                                },
+                                "valign": "middle"
+                            },
+                            "constraint": {
+                                "horizontal": "left",
+                                "vertical": "top"
+                            },
+                            "name": "Element 53",
+                            "placement": {
+                                "height": 50,
+                                "left": 1066,
+                                "top": 753,
+                                "width": 188
+                            },
+                            "type": "triangle"
+                        }
+                    ],
+                    "name": "Element 1708700648848",
+                    "placement": {
+                        "height": 100,
+                        "left": 0,
+                        "top": 0,
+                        "width": 100
+                    },
+                    "type": "frame"
+                },
+                "showAdvancedTypes": true
+            },
+            "pluginVersion": "11.0.0-pre",
+            "targets": [
+                {
+                    "datasource": {
+                        "type": "grafana",
+                        "uid": "grafana"
+                    },
+                    "queryType": "snapshot",
+                    "refId": "A",
+                    "snapshot": [
+                        {
+                            "data": {
+                                "values": [
+                                    [
+                                        1708679336805,
+                                        1708679366805,
+                                        1708679396805,
+                                        1708679426805,
+                                        1708679456805,
+                                        1708679486805,
+                                        1708679516805,
+                                        1708679546805,
+                                        1708679576805,
+                                        1708679606805,
+                                        1708679636805,
+                                        1708679666805,
+                                        1708679696805,
+                                        1708679726805,
+                                        1708679756805,
+                                        1708679786805,
+                                        1708679816805,
+                                        1708679846805,
+                                        1708679876805,
+                                        1708679906805,
+                                        1708679936805,
+                                        1708679966805,
+                                        1708679996805,
+                                        1708680026805,
+                                        1708680056805,
+                                        1708680086805,
+                                        1708680116805,
+                                        1708680146805,
+                                        1708680176805,
+                                        1708680206805,
+                                        1708680236805,
+                                        1708680266805,
+                                        1708680296805,
+                                        1708680326805,
+                                        1708680356805,
+                                        1708680386805,
+                                        1708680416805,
+                                        1708680446805,
+                                        1708680476805,
+                                        1708680506805,
+                                        1708680536805,
+                                        1708680566805,
+                                        1708680596805,
+                                        1708680626805,
+                                        1708680656805,
+                                        1708680686805,
+                                        1708680716805,
+                                        1708680746805,
+                                        1708680776805,
+                                        1708680806805,
+                                        1708680836805,
+                                        1708680866805,
+                                        1708680896805,
+                                        1708680926805,
+                                        1708680956805,
+                                        1708680986805,
+                                        1708681016805,
+                                        1708681046805,
+                                        1708681076805,
+                                        1708681106805,
+                                        1708681136805,
+                                        1708681166805,
+                                        1708681196805,
+                                        1708681226805,
+                                        1708681256805,
+                                        1708681286805,
+                                        1708681316805,
+                                        1708681346805,
+                                        1708681376805,
+                                        1708681406805,
+                                        1708681436805,
+                                        1708681466805,
+                                        1708681496805,
+                                        1708681526805,
+                                        1708681556805,
+                                        1708681586805,
+                                        1708681616805,
+                                        1708681646805,
+                                        1708681676805,
+                                        1708681706805,
+                                        1708681736805,
+                                        1708681766805,
+                                        1708681796805,
+                                        1708681826805,
+                                        1708681856805,
+                                        1708681886805,
+                                        1708681916805,
+                                        1708681946805,
+                                        1708681976805,
+                                        1708682006805,
+                                        1708682036805,
+                                        1708682066805,
+                                        1708682096805,
+                                        1708682126805,
+                                        1708682156805,
+                                        1708682186805,
+                                        1708682216805,
+                                        1708682246805,
+                                        1708682276805,
+                                        1708682306805,
+                                        1708682336805,
+                                        1708682366805,
+                                        1708682396805,
+                                        1708682426805,
+                                        1708682456805,
+                                        1708682486805,
+                                        1708682516805,
+                                        1708682546805,
+                                        1708682576805,
+                                        1708682606805,
+                                        1708682636805,
+                                        1708682666805,
+                                        1708682696805,
+                                        1708682726805,
+                                        1708682756805,
+                                        1708682786805,
+                                        1708682816805,
+                                        1708682846805,
+                                        1708682876805,
+                                        1708682906805,
+                                        1708682936805,
+                                        1708682966805,
+                                        1708682996805,
+                                        1708683026805,
+                                        1708683056805,
+                                        1708683086805,
+                                        1708683116805,
+                                        1708683146805,
+                                        1708683176805,
+                                        1708683206805,
+                                        1708683236805,
+                                        1708683266805,
+                                        1708683296805,
+                                        1708683326805,
+                                        1708683356805,
+                                        1708683386805,
+                                        1708683416805,
+                                        1708683446805,
+                                        1708683476805,
+                                        1708683506805,
+                                        1708683536805,
+                                        1708683566805,
+                                        1708683596805,
+                                        1708683626805,
+                                        1708683656805,
+                                        1708683686805,
+                                        1708683716805,
+                                        1708683746805,
+                                        1708683776805,
+                                        1708683806805,
+                                        1708683836805,
+                                        1708683866805,
+                                        1708683896805,
+                                        1708683926805,
+                                        1708683956805,
+                                        1708683986805,
+                                        1708684016805,
+                                        1708684046805,
+                                        1708684076805,
+                                        1708684106805,
+                                        1708684136805,
+                                        1708684166805,
+                                        1708684196805,
+                                        1708684226805,
+                                        1708684256805,
+                                        1708684286805,
+                                        1708684316805,
+                                        1708684346805,
+                                        1708684376805,
+                                        1708684406805,
+                                        1708684436805,
+                                        1708684466805,
+                                        1708684496805,
+                                        1708684526805,
+                                        1708684556805,
+                                        1708684586805,
+                                        1708684616805,
+                                        1708684646805,
+                                        1708684676805,
+                                        1708684706805,
+                                        1708684736805,
+                                        1708684766805,
+                                        1708684796805,
+                                        1708684826805,
+                                        1708684856805,
+                                        1708684886805,
+                                        1708684916805,
+                                        1708684946805,
+                                        1708684976805,
+                                        1708685006805,
+                                        1708685036805,
+                                        1708685066805,
+                                        1708685096805,
+                                        1708685126805,
+                                        1708685156805,
+                                        1708685186805,
+                                        1708685216805,
+                                        1708685246805,
+                                        1708685276805,
+                                        1708685306805,
+                                        1708685336805,
+                                        1708685366805,
+                                        1708685396805,
+                                        1708685426805,
+                                        1708685456805,
+                                        1708685486805,
+                                        1708685516805,
+                                        1708685546805,
+                                        1708685576805,
+                                        1708685606805,
+                                        1708685636805,
+                                        1708685666805,
+                                        1708685696805,
+                                        1708685726805,
+                                        1708685756805,
+                                        1708685786805,
+                                        1708685816805,
+                                        1708685846805,
+                                        1708685876805,
+                                        1708685906805,
+                                        1708685936805,
+                                        1708685966805,
+                                        1708685996805,
+                                        1708686026805,
+                                        1708686056805,
+                                        1708686086805,
+                                        1708686116805,
+                                        1708686146805,
+                                        1708686176805,
+                                        1708686206805,
+                                        1708686236805,
+                                        1708686266805,
+                                        1708686296805,
+                                        1708686326805,
+                                        1708686356805,
+                                        1708686386805,
+                                        1708686416805,
+                                        1708686446805,
+                                        1708686476805,
+                                        1708686506805,
+                                        1708686536805,
+                                        1708686566805,
+                                        1708686596805,
+                                        1708686626805,
+                                        1708686656805,
+                                        1708686686805,
+                                        1708686716805,
+                                        1708686746805,
+                                        1708686776805,
+                                        1708686806805,
+                                        1708686836805,
+                                        1708686866805,
+                                        1708686896805,
+                                        1708686926805,
+                                        1708686956805,
+                                        1708686986805,
+                                        1708687016805,
+                                        1708687046805,
+                                        1708687076805,
+                                        1708687106805,
+                                        1708687136805,
+                                        1708687166805,
+                                        1708687196805,
+                                        1708687226805,
+                                        1708687256805,
+                                        1708687286805,
+                                        1708687316805,
+                                        1708687346805,
+                                        1708687376805,
+                                        1708687406805,
+                                        1708687436805,
+                                        1708687466805,
+                                        1708687496805,
+                                        1708687526805,
+                                        1708687556805,
+                                        1708687586805,
+                                        1708687616805,
+                                        1708687646805,
+                                        1708687676805,
+                                        1708687706805,
+                                        1708687736805,
+                                        1708687766805,
+                                        1708687796805,
+                                        1708687826805,
+                                        1708687856805,
+                                        1708687886805,
+                                        1708687916805,
+                                        1708687946805,
+                                        1708687976805,
+                                        1708688006805,
+                                        1708688036805,
+                                        1708688066805,
+                                        1708688096805,
+                                        1708688126805,
+                                        1708688156805,
+                                        1708688186805,
+                                        1708688216805,
+                                        1708688246805,
+                                        1708688276805,
+                                        1708688306805,
+                                        1708688336805,
+                                        1708688366805,
+                                        1708688396805,
+                                        1708688426805,
+                                        1708688456805,
+                                        1708688486805,
+                                        1708688516805,
+                                        1708688546805,
+                                        1708688576805,
+                                        1708688606805,
+                                        1708688636805,
+                                        1708688666805,
+                                        1708688696805,
+                                        1708688726805,
+                                        1708688756805,
+                                        1708688786805,
+                                        1708688816805,
+                                        1708688846805,
+                                        1708688876805,
+                                        1708688906805,
+                                        1708688936805,
+                                        1708688966805,
+                                        1708688996805,
+                                        1708689026805,
+                                        1708689056805,
+                                        1708689086805,
+                                        1708689116805,
+                                        1708689146805,
+                                        1708689176805,
+                                        1708689206805,
+                                        1708689236805,
+                                        1708689266805,
+                                        1708689296805,
+                                        1708689326805,
+                                        1708689356805,
+                                        1708689386805,
+                                        1708689416805,
+                                        1708689446805,
+                                        1708689476805,
+                                        1708689506805,
+                                        1708689536805,
+                                        1708689566805,
+                                        1708689596805,
+                                        1708689626805,
+                                        1708689656805,
+                                        1708689686805,
+                                        1708689716805,
+                                        1708689746805,
+                                        1708689776805,
+                                        1708689806805,
+                                        1708689836805,
+                                        1708689866805,
+                                        1708689896805,
+                                        1708689926805,
+                                        1708689956805,
+                                        1708689986805,
+                                        1708690016805,
+                                        1708690046805,
+                                        1708690076805,
+                                        1708690106805,
+                                        1708690136805,
+                                        1708690166805,
+                                        1708690196805,
+                                        1708690226805,
+                                        1708690256805,
+                                        1708690286805,
+                                        1708690316805,
+                                        1708690346805,
+                                        1708690376805,
+                                        1708690406805,
+                                        1708690436805,
+                                        1708690466805,
+                                        1708690496805,
+                                        1708690526805,
+                                        1708690556805,
+                                        1708690586805,
+                                        1708690616805,
+                                        1708690646805,
+                                        1708690676805,
+                                        1708690706805,
+                                        1708690736805,
+                                        1708690766805,
+                                        1708690796805,
+                                        1708690826805,
+                                        1708690856805,
+                                        1708690886805,
+                                        1708690916805,
+                                        1708690946805,
+                                        1708690976805,
+                                        1708691006805,
+                                        1708691036805,
+                                        1708691066805,
+                                        1708691096805,
+                                        1708691126805,
+                                        1708691156805,
+                                        1708691186805,
+                                        1708691216805,
+                                        1708691246805,
+                                        1708691276805,
+                                        1708691306805,
+                                        1708691336805,
+                                        1708691366805,
+                                        1708691396805,
+                                        1708691426805,
+                                        1708691456805,
+                                        1708691486805,
+                                        1708691516805,
+                                        1708691546805,
+                                        1708691576805,
+                                        1708691606805,
+                                        1708691636805,
+                                        1708691666805,
+                                        1708691696805,
+                                        1708691726805,
+                                        1708691756805,
+                                        1708691786805,
+                                        1708691816805,
+                                        1708691846805,
+                                        1708691876805,
+                                        1708691906805,
+                                        1708691936805,
+                                        1708691966805,
+                                        1708691996805,
+                                        1708692026805,
+                                        1708692056805,
+                                        1708692086805,
+                                        1708692116805,
+                                        1708692146805,
+                                        1708692176805,
+                                        1708692206805,
+                                        1708692236805,
+                                        1708692266805,
+                                        1708692296805,
+                                        1708692326805,
+                                        1708692356805,
+                                        1708692386805,
+                                        1708692416805,
+                                        1708692446805,
+                                        1708692476805,
+                                        1708692506805,
+                                        1708692536805,
+                                        1708692566805,
+                                        1708692596805,
+                                        1708692626805,
+                                        1708692656805,
+                                        1708692686805,
+                                        1708692716805,
+                                        1708692746805,
+                                        1708692776805,
+                                        1708692806805,
+                                        1708692836805,
+                                        1708692866805,
+                                        1708692896805,
+                                        1708692926805,
+                                        1708692956805,
+                                        1708692986805,
+                                        1708693016805,
+                                        1708693046805,
+                                        1708693076805,
+                                        1708693106805,
+                                        1708693136805,
+                                        1708693166805,
+                                        1708693196805,
+                                        1708693226805,
+                                        1708693256805,
+                                        1708693286805,
+                                        1708693316805,
+                                        1708693346805,
+                                        1708693376805,
+                                        1708693406805,
+                                        1708693436805,
+                                        1708693466805,
+                                        1708693496805,
+                                        1708693526805,
+                                        1708693556805,
+                                        1708693586805,
+                                        1708693616805,
+                                        1708693646805,
+                                        1708693676805,
+                                        1708693706805,
+                                        1708693736805,
+                                        1708693766805,
+                                        1708693796805,
+                                        1708693826805,
+                                        1708693856805,
+                                        1708693886805,
+                                        1708693916805,
+                                        1708693946805,
+                                        1708693976805,
+                                        1708694006805,
+                                        1708694036805,
+                                        1708694066805,
+                                        1708694096805,
+                                        1708694126805,
+                                        1708694156805,
+                                        1708694186805,
+                                        1708694216805,
+                                        1708694246805,
+                                        1708694276805,
+                                        1708694306805,
+                                        1708694336805,
+                                        1708694366805,
+                                        1708694396805,
+                                        1708694426805,
+                                        1708694456805,
+                                        1708694486805,
+                                        1708694516805,
+                                        1708694546805,
+                                        1708694576805,
+                                        1708694606805,
+                                        1708694636805,
+                                        1708694666805,
+                                        1708694696805,
+                                        1708694726805,
+                                        1708694756805,
+                                        1708694786805,
+                                        1708694816805,
+                                        1708694846805,
+                                        1708694876805,
+                                        1708694906805,
+                                        1708694936805,
+                                        1708694966805,
+                                        1708694996805,
+                                        1708695026805,
+                                        1708695056805,
+                                        1708695086805,
+                                        1708695116805,
+                                        1708695146805,
+                                        1708695176805,
+                                        1708695206805,
+                                        1708695236805,
+                                        1708695266805,
+                                        1708695296805,
+                                        1708695326805,
+                                        1708695356805,
+                                        1708695386805,
+                                        1708695416805,
+                                        1708695446805,
+                                        1708695476805,
+                                        1708695506805,
+                                        1708695536805,
+                                        1708695566805,
+                                        1708695596805,
+                                        1708695626805,
+                                        1708695656805,
+                                        1708695686805,
+                                        1708695716805,
+                                        1708695746805,
+                                        1708695776805,
+                                        1708695806805,
+                                        1708695836805,
+                                        1708695866805,
+                                        1708695896805,
+                                        1708695926805,
+                                        1708695956805,
+                                        1708695986805,
+                                        1708696016805,
+                                        1708696046805,
+                                        1708696076805,
+                                        1708696106805,
+                                        1708696136805,
+                                        1708696166805,
+                                        1708696196805,
+                                        1708696226805,
+                                        1708696256805,
+                                        1708696286805,
+                                        1708696316805,
+                                        1708696346805,
+                                        1708696376805,
+                                        1708696406805,
+                                        1708696436805,
+                                        1708696466805,
+                                        1708696496805,
+                                        1708696526805,
+                                        1708696556805,
+                                        1708696586805,
+                                        1708696616805,
+                                        1708696646805,
+                                        1708696676805,
+                                        1708696706805,
+                                        1708696736805,
+                                        1708696766805,
+                                        1708696796805,
+                                        1708696826805,
+                                        1708696856805,
+                                        1708696886805,
+                                        1708696916805,
+                                        1708696946805,
+                                        1708696976805,
+                                        1708697006805,
+                                        1708697036805,
+                                        1708697066805,
+                                        1708697096805,
+                                        1708697126805,
+                                        1708697156805,
+                                        1708697186805,
+                                        1708697216805,
+                                        1708697246805,
+                                        1708697276805,
+                                        1708697306805,
+                                        1708697336805,
+                                        1708697366805,
+                                        1708697396805,
+                                        1708697426805,
+                                        1708697456805,
+                                        1708697486805,
+                                        1708697516805,
+                                        1708697546805,
+                                        1708697576805,
+                                        1708697606805,
+                                        1708697636805,
+                                        1708697666805,
+                                        1708697696805,
+                                        1708697726805,
+                                        1708697756805,
+                                        1708697786805,
+                                        1708697816805,
+                                        1708697846805,
+                                        1708697876805,
+                                        1708697906805,
+                                        1708697936805,
+                                        1708697966805,
+                                        1708697996805,
+                                        1708698026805,
+                                        1708698056805,
+                                        1708698086805,
+                                        1708698116805,
+                                        1708698146805,
+                                        1708698176805,
+                                        1708698206805,
+                                        1708698236805,
+                                        1708698266805,
+                                        1708698296805,
+                                        1708698326805,
+                                        1708698356805,
+                                        1708698386805,
+                                        1708698416805,
+                                        1708698446805,
+                                        1708698476805,
+                                        1708698506805,
+                                        1708698536805,
+                                        1708698566805,
+                                        1708698596805,
+                                        1708698626805,
+                                        1708698656805,
+                                        1708698686805,
+                                        1708698716805,
+                                        1708698746805,
+                                        1708698776805,
+                                        1708698806805,
+                                        1708698836805,
+                                        1708698866805,
+                                        1708698896805,
+                                        1708698926805,
+                                        1708698956805,
+                                        1708698986805,
+                                        1708699016805,
+                                        1708699046805,
+                                        1708699076805,
+                                        1708699106805,
+                                        1708699136805,
+                                        1708699166805,
+                                        1708699196805,
+                                        1708699226805,
+                                        1708699256805,
+                                        1708699286805,
+                                        1708699316805,
+                                        1708699346805,
+                                        1708699376805,
+                                        1708699406805,
+                                        1708699436805,
+                                        1708699466805,
+                                        1708699496805,
+                                        1708699526805,
+                                        1708699556805,
+                                        1708699586805,
+                                        1708699616805,
+                                        1708699646805,
+                                        1708699676805,
+                                        1708699706805,
+                                        1708699736805,
+                                        1708699766805,
+                                        1708699796805,
+                                        1708699826805,
+                                        1708699856805,
+                                        1708699886805,
+                                        1708699916805,
+                                        1708699946805,
+                                        1708699976805,
+                                        1708700006805,
+                                        1708700036805,
+                                        1708700066805,
+                                        1708700096805,
+                                        1708700126805,
+                                        1708700156805,
+                                        1708700186805,
+                                        1708700216805,
+                                        1708700246805,
+                                        1708700276805,
+                                        1708700306805,
+                                        1708700336805,
+                                        1708700366805,
+                                        1708700396805,
+                                        1708700426805,
+                                        1708700456805,
+                                        1708700486805,
+                                        1708700516805,
+                                        1708700546805,
+                                        1708700576805,
+                                        1708700606805,
+                                        1708700636805,
+                                        1708700666805,
+                                        1708700696805,
+                                        1708700726805,
+                                        1708700756805,
+                                        1708700786805,
+                                        1708700816805,
+                                        1708700846805,
+                                        1708700876805,
+                                        1708700906805
+                                    ],
+                                    [
+                                        61.7880220958275,
+                                        61.81270791445456,
+                                        61.829208768453746,
+                                        61.3952804521061,
+                                        61.54378204663586,
+                                        61.793292376739025,
+                                        61.89508181687579,
+                                        62.032346031223305,
+                                        62.090954811114734,
+                                        61.788446359641156,
+                                        61.34681406228381,
+                                        61.37147422434034,
+                                        61.40948125782848,
+                                        61.69144945060843,
+                                        61.790001610516114,
+                                        61.9726511399688,
+                                        62.17186395369245,
+                                        61.841593279449114,
+                                        61.81351577982158,
+                                        61.774548608665306,
+                                        61.45071912098117,
+                                        61.837381696515884,
+                                        61.65059114296433,
+                                        61.1939165193637,
+                                        61.251406089255795,
+                                        60.90456801094042,
+                                        60.56801269725712,
+                                        60.79736902333104,
+                                        60.9367183948152,
+                                        61.40785835680261,
+                                        61.621326272755965,
+                                        61.53478423246078,
+                                        61.616180375313114,
+                                        61.56950269911591,
+                                        61.419724817297585,
+                                        61.76631225002593,
+                                        62.12897242834343,
+                                        62.123394668856335,
+                                        61.84384351878861,
+                                        61.784342739352965,
+                                        61.946359707479985,
+                                        62.00854561243485,
+                                        61.949378148238175,
+                                        61.83251536870273,
+                                        62.10046102360543,
+                                        62.51955528279164,
+                                        62.43194543555232,
+                                        61.93563724102479,
+                                        61.61222776112464,
+                                        61.706572968014584,
+                                        61.25653135192282,
+                                        61.356339636867965,
+                                        61.699918128409436,
+                                        61.700832273918536,
+                                        61.48680261436916,
+                                        61.23885493750151,
+                                        60.88064816100224,
+                                        60.8061115971784,
+                                        60.48689168723215,
+                                        60.55420316390225,
+                                        60.78326551379002,
+                                        60.71763616746389,
+                                        61.0384027799684,
+                                        61.361681117105356,
+                                        61.819694140841825,
+                                        61.60303629180282,
+                                        61.13531779096821,
+                                        61.59247554276454,
+                                        62.073700396192514,
+                                        62.257393021269124,
+                                        62.433793965222456,
+                                        62.250955190991135,
+                                        61.85027922321473,
+                                        61.991414140632,
+                                        62.103475488499456,
+                                        62.1675085033716,
+                                        61.81759701584563,
+                                        61.44204189561965,
+                                        61.39004247589699,
+                                        61.84841370788845,
+                                        62.01982884908544,
+                                        62.29261477385842,
+                                        62.1881407732118,
+                                        61.77974858108549,
+                                        61.30269030921595,
+                                        61.72885233653658,
+                                        62.160061928899516,
+                                        62.13127060574461,
+                                        61.99860014382346,
+                                        62.2713524353439,
+                                        62.45360209624644,
+                                        62.45033536766769,
+                                        62.74579940152534,
+                                        62.652379007396135,
+                                        62.50461375528075,
+                                        62.4923739782267,
+                                        62.87608071230181,
+                                        62.979684959589086,
+                                        63.376138214369306,
+                                        63.66354651661235,
+                                        63.77873383844567,
+                                        64.02365055931571,
+                                        63.57333739418103,
+                                        63.569251641994995,
+                                        63.51940188659398,
+                                        63.81887126104792,
+                                        64.10808860762592,
+                                        64.26214829221084,
+                                        63.81353904099011,
+                                        63.792123977174654,
+                                        64.09459044217124,
+                                        64.49651926575704,
+                                        64.87380353415439,
+                                        65.22102686208456,
+                                        65.49078940759729,
+                                        65.83529933530703,
+                                        66.06313506256244,
+                                        66.36902912666964,
+                                        66.78048161957578,
+                                        66.85326316970041,
+                                        67.14736719324404,
+                                        67.55927886414139,
+                                        67.497025942169,
+                                        67.84593513490577,
+                                        67.47441764273138,
+                                        67.94871645670011,
+                                        68.32729017349827,
+                                        68.0857872436968,
+                                        67.93500201308075,
+                                        67.75781760651351,
+                                        67.62321694227796,
+                                        67.87687655718156,
+                                        68.03974600191707,
+                                        67.82627187210018,
+                                        68.29863099170737,
+                                        67.95842239244082,
+                                        67.56173819267319,
+                                        67.11089985276264,
+                                        67.58721546400895,
+                                        67.43817707268052,
+                                        67.63734474285276,
+                                        67.8608900819446,
+                                        68.2491098921388,
+                                        68.64222598287019,
+                                        68.93436090180123,
+                                        68.58516897681044,
+                                        68.88556663186037,
+                                        68.82509258379442,
+                                        68.43122435581691,
+                                        68.01151775860062,
+                                        68.31539501569645,
+                                        68.01224489043588,
+                                        68.21383479637454,
+                                        67.85864255481124,
+                                        67.85285437130011,
+                                        67.68770174333852,
+                                        67.78834746198736,
+                                        68.07096889676643,
+                                        68.06340992932907,
+                                        68.37116739265392,
+                                        68.25606363201948,
+                                        68.0308569092854,
+                                        68.0279418148109,
+                                        67.68837311892736,
+                                        67.98015788941186,
+                                        68.39001231797856,
+                                        68.55810426314746,
+                                        68.67055538403375,
+                                        68.24669275435873,
+                                        68.3542775530211,
+                                        67.99792233705742,
+                                        67.93848132742042,
+                                        67.54327434886798,
+                                        67.86541640645122,
+                                        67.63715332453567,
+                                        67.44863373545599,
+                                        67.54029786855584,
+                                        67.3799227903252,
+                                        67.272800723832,
+                                        67.65752571426705,
+                                        67.27217330871126,
+                                        67.36259068699385,
+                                        67.6920166495926,
+                                        67.99237921892899,
+                                        68.00526928940994,
+                                        67.67665255949264,
+                                        67.82106088034847,
+                                        68.22225474161398,
+                                        68.17103508007338,
+                                        68.1016199190692,
+                                        67.9715626706774,
+                                        68.32706440829391,
+                                        67.87634330533211,
+                                        67.97207720874553,
+                                        67.87493382264455,
+                                        67.38357737752105,
+                                        66.94768029712087,
+                                        66.67493510394992,
+                                        66.48367657533245,
+                                        66.77035937087237,
+                                        66.87685661575208,
+                                        66.68590889792685,
+                                        67.11545823298368,
+                                        67.39896920212514,
+                                        67.34979904565203,
+                                        67.19769898467558,
+                                        67.45512207826779,
+                                        67.07906680752531,
+                                        67.41541723819202,
+                                        67.15472798048341,
+                                        67.15672773264464,
+                                        67.6290223056695,
+                                        68.11240707910342,
+                                        68.40594352628086,
+                                        67.92798893549167,
+                                        67.46919856375305,
+                                        67.4835115803936,
+                                        67.63236807133978,
+                                        67.17328415938867,
+                                        67.24458272746313,
+                                        66.84593455247185,
+                                        67.01430262963748,
+                                        67.05291762336604,
+                                        67.23817875420809,
+                                        66.98941509949245,
+                                        66.68717338595964,
+                                        67.12826784930103,
+                                        66.74586515933792,
+                                        67.12397362624425,
+                                        66.91465424208462,
+                                        66.68655917540693,
+                                        66.19881496899525,
+                                        66.68817057925634,
+                                        66.37134623059349,
+                                        66.596971028669,
+                                        67.08641642499875,
+                                        67.12758650919066,
+                                        67.38518121414808,
+                                        67.46997153732326,
+                                        67.33145553844577,
+                                        67.65363406004056,
+                                        67.45595043797628,
+                                        67.24978988019829,
+                                        67.39677514651268,
+                                        67.5978323405599,
+                                        67.96140308646021,
+                                        68.00477049936622,
+                                        67.75104436464927,
+                                        67.99988077010511,
+                                        68.19366044789288,
+                                        68.49848829432483,
+                                        68.25947149341026,
+                                        68.6317723773926,
+                                        68.91668608614779,
+                                        68.8159923502771,
+                                        69.17513974647629,
+                                        69.23356802652235,
+                                        69.25309375298245,
+                                        69.21125949874141,
+                                        69.20726323550102,
+                                        68.78019883289588,
+                                        69.24667107728621,
+                                        69.1153426259508,
+                                        69.56206231608063,
+                                        69.72141422867662,
+                                        69.541238907092,
+                                        69.81884141217625,
+                                        69.53432369593423,
+                                        69.43315031151812,
+                                        69.01688148574168,
+                                        68.90923934889648,
+                                        69.13664462290991,
+                                        69.31984528071725,
+                                        69.14875943039056,
+                                        69.48885652654923,
+                                        69.88297168977773,
+                                        69.42462273878934,
+                                        69.12679413148601,
+                                        68.98123233159377,
+                                        68.7762758442149,
+                                        68.48846507574687,
+                                        68.02689832504595,
+                                        68.02852643078998,
+                                        67.555096330903,
+                                        67.4639788904284,
+                                        67.61277291577984,
+                                        67.70121565906206,
+                                        67.66817331556194,
+                                        67.84767253849441,
+                                        68.18538578924706,
+                                        68.29860737971661,
+                                        68.53693780239855,
+                                        68.59722904625475,
+                                        68.72061222893264,
+                                        68.6709989466837,
+                                        69.09400533816238,
+                                        69.20295511428635,
+                                        69.04258759148102,
+                                        68.77139467473914,
+                                        68.57756213054044,
+                                        68.67449080482191,
+                                        68.60860533532343,
+                                        69.01676017621124,
+                                        69.3052161196497,
+                                        68.89017381442457,
+                                        68.87423335356772,
+                                        68.94718162265079,
+                                        69.07199142609447,
+                                        68.79769510366016,
+                                        68.65106890757201,
+                                        68.77703094552813,
+                                        68.28258034480257,
+                                        68.39479364216955,
+                                        68.34220719427985,
+                                        68.64253416645396,
+                                        68.87725555362057,
+                                        68.5131252571485,
+                                        68.89127035251008,
+                                        68.67886068136877,
+                                        68.4447624537287,
+                                        68.00181105736998,
+                                        68.16998112143412,
+                                        68.43591872875314,
+                                        68.02705208136817,
+                                        68.45211203302853,
+                                        68.53289570629535,
+                                        68.58200283313724,
+                                        68.25718933019785,
+                                        68.36370956465593,
+                                        68.05020228727913,
+                                        68.50658655636543,
+                                        68.66449948753682,
+                                        68.2241732330651,
+                                        68.09791466418139,
+                                        67.88940531760399,
+                                        68.36978817923638,
+                                        67.96433264274425,
+                                        68.36349840881765,
+                                        68.48435193949715,
+                                        68.79844380614031,
+                                        69.02017361165895,
+                                        68.52624119834393,
+                                        68.74005315812674,
+                                        68.76067653657759,
+                                        68.27918960695276,
+                                        68.65714329915559,
+                                        68.42872809873309,
+                                        67.98192094490678,
+                                        68.02723949195821,
+                                        68.36423058076824,
+                                        68.71132274325691,
+                                        68.6730162618873,
+                                        68.2039400216969,
+                                        67.86554691576616,
+                                        67.49988053949725,
+                                        67.16307215146469,
+                                        67.0353669125758,
+                                        67.25486895820083,
+                                        66.95629780399439,
+                                        67.11477592840751,
+                                        66.64323746050167,
+                                        66.20269172026232,
+                                        66.48026858749327,
+                                        66.4824015740555,
+                                        66.09931551662274,
+                                        66.52915019033718,
+                                        66.45576884782787,
+                                        66.24667785942938,
+                                        65.81418399593981,
+                                        65.5611498094969,
+                                        65.3398959293035,
+                                        65.77646026507297,
+                                        65.39346792956597,
+                                        65.41692492067247,
+                                        65.80888038895401,
+                                        66.01134945900266,
+                                        65.80681809031556,
+                                        65.32295296805074,
+                                        65.37373854104783,
+                                        64.93533382859144,
+                                        64.7705026812803,
+                                        65.17813748381224,
+                                        65.361732144628,
+                                        64.9021692008158,
+                                        64.7544901225187,
+                                        64.89471070898715,
+                                        64.74868721773261,
+                                        65.00087272748908,
+                                        65.13124433830268,
+                                        64.86532668113782,
+                                        64.51108629312537,
+                                        64.48208116580882,
+                                        64.86340417937541,
+                                        64.5927354669956,
+                                        64.1183990008181,
+                                        63.66603997870095,
+                                        63.670535114339415,
+                                        63.179312479687646,
+                                        62.71414451358941,
+                                        62.349677869382184,
+                                        62.73321111245177,
+                                        62.63668992149067,
+                                        62.246656820357686,
+                                        62.12151749467506,
+                                        62.09114940207692,
+                                        62.13652644719604,
+                                        62.59170540130276,
+                                        62.28435878005047,
+                                        62.62555470862962,
+                                        62.73559453227453,
+                                        62.63492310358647,
+                                        62.99493118502586,
+                                        63.2621260239913,
+                                        62.99279716454684,
+                                        62.8629723908099,
+                                        63.01324605242161,
+                                        63.27456767760901,
+                                        63.11585082867133,
+                                        63.04279509050621,
+                                        63.10999097814922,
+                                        63.544265738869036,
+                                        63.11822935137409,
+                                        63.01523903936018,
+                                        63.20403674621687,
+                                        62.83896086980938,
+                                        62.41843196460615,
+                                        62.11985404869429,
+                                        62.07986319614809,
+                                        61.99277704632526,
+                                        61.668764434861785,
+                                        61.24484474074755,
+                                        61.461440830656386,
+                                        61.276838934561326,
+                                        61.190724244624434,
+                                        61.55613660124493,
+                                        61.12078454699415,
+                                        61.3276958600818,
+                                        61.6042219184118,
+                                        61.25513892816126,
+                                        61.31664892177688,
+                                        61.688070650858535,
+                                        62.01190639528168,
+                                        62.08869564629636,
+                                        61.97211569824653,
+                                        62.06419901170042,
+                                        62.32586483758532,
+                                        62.23902878995992,
+                                        62.10813808603461,
+                                        61.85578175807045,
+                                        62.23028871528028,
+                                        62.632050281179744,
+                                        62.94816419819628,
+                                        62.73043921369783,
+                                        62.23627146727455,
+                                        62.584832680453275,
+                                        62.62993353336442,
+                                        62.8749075179418,
+                                        62.48040775408503,
+                                        62.21373335340891,
+                                        61.79955494265226,
+                                        61.833015907179636,
+                                        61.39273179502193,
+                                        61.269508387088344,
+                                        61.72530078527864,
+                                        62.09495330426252,
+                                        62.151597131318645,
+                                        62.03375578347783,
+                                        62.417839543433374,
+                                        62.857582366978384,
+                                        62.57434410206618,
+                                        63.025461247334185,
+                                        62.891637883802545,
+                                        62.74129737438404,
+                                        62.686344200077194,
+                                        62.74668907124072,
+                                        62.8988624768576,
+                                        62.60573732388666,
+                                        63.025949401766745,
+                                        62.67167444177004,
+                                        62.90064380635685,
+                                        62.864966632927896,
+                                        62.75573606469665,
+                                        62.64819512833622,
+                                        62.568258206957815,
+                                        62.60577268655998,
+                                        62.15762551315059,
+                                        62.567239861872935,
+                                        62.2060758300364,
+                                        62.31900525191699,
+                                        62.28916506290531,
+                                        62.44905922260444,
+                                        62.461296429876256,
+                                        62.500385909925505,
+                                        62.650801268022704,
+                                        62.56666212391569,
+                                        62.40046878730333,
+                                        62.094243157050244,
+                                        62.53663695990193,
+                                        62.42300679544488,
+                                        62.36921559899188,
+                                        62.24670139180489,
+                                        62.569517596988945,
+                                        62.66647211282815,
+                                        62.665771463959715,
+                                        62.876380887882625,
+                                        62.45928337880216,
+                                        62.909344895815984,
+                                        62.792949925824054,
+                                        62.83068709163355,
+                                        62.69318202524612,
+                                        62.87621607310353,
+                                        63.31283919698538,
+                                        63.25629003985129,
+                                        63.705604438529726,
+                                        63.273909526061956,
+                                        63.5892070912608,
+                                        63.25172069842234,
+                                        63.29295380191922,
+                                        63.37827406047424,
+                                        63.40692971848919,
+                                        62.91617622008834,
+                                        62.78539371994352,
+                                        62.67023463643756,
+                                        62.778172553545886,
+                                        62.47010093156481,
+                                        62.73229570857713,
+                                        62.59545419552364,
+                                        63.021765325598885,
+                                        63.12625341655425,
+                                        62.78539970673421,
+                                        62.48947067386955,
+                                        62.50019409861797,
+                                        62.27827076256643,
+                                        62.32133231940964,
+                                        62.28201148707485,
+                                        62.75074499118775,
+                                        62.2850034814543,
+                                        62.11551149639342,
+                                        62.19275216451308,
+                                        61.99131816833137,
+                                        61.53708598957499,
+                                        61.935909883441674,
+                                        61.982544659526965,
+                                        62.47356745991423,
+                                        62.54325753022373,
+                                        62.146857201138765,
+                                        62.189218538018835,
+                                        62.06268691181029,
+                                        62.33603183556959,
+                                        62.82869197777662,
+                                        63.18597742858942,
+                                        63.032993740715966,
+                                        63.5325845753775,
+                                        63.562424373715885,
+                                        63.50147245681481,
+                                        63.9167851513779,
+                                        64.41348447594058,
+                                        64.47641931732102,
+                                        64.00422787602398,
+                                        63.84372934402268,
+                                        63.57536630107787,
+                                        64.06767133087304,
+                                        63.857109831163605,
+                                        63.594856285335126,
+                                        64.01811161431772,
+                                        64.07634398750827,
+                                        64.53914449236566,
+                                        64.0503925198368,
+                                        63.65098131727389,
+                                        63.68701372362301,
+                                        63.69177696813634,
+                                        63.37477814620089,
+                                        62.9056011078514,
+                                        62.51297543133976,
+                                        62.59250225336332,
+                                        62.80712544689635,
+                                        62.841367040210486,
+                                        63.01245999144349,
+                                        63.05987075936997,
+                                        62.7064932753452,
+                                        62.53562962324097,
+                                        62.31063278405174,
+                                        62.266535846784436,
+                                        62.302218124559445,
+                                        62.342098988884466,
+                                        61.85031656038063,
+                                        62.236466943962625,
+                                        62.38666354433638,
+                                        62.50448443527158,
+                                        62.2386149786552,
+                                        62.43706094747305,
+                                        62.48167927367151,
+                                        62.53256313135768,
+                                        62.78282604117919,
+                                        62.610692060658806,
+                                        62.60559562844521,
+                                        62.522478905756024,
+                                        62.11039441006909,
+                                        62.455676051055406,
+                                        62.12208142671207,
+                                        62.08989132214651,
+                                        61.60556028504288,
+                                        61.72080384449528,
+                                        61.67203415718332,
+                                        61.300028102691506,
+                                        61.2882234681282,
+                                        61.67414171824772,
+                                        61.663919195939215,
+                                        61.82126261684866,
+                                        62.14747753168045,
+                                        61.90000454947883,
+                                        61.550477655414085,
+                                        61.823665895055534,
+                                        62.2914692558774,
+                                        61.97827489307881,
+                                        62.373656454593686,
+                                        62.77509964777066,
+                                        63.03123026432718,
+                                        62.71959998560016,
+                                        62.798641799535915,
+                                        62.36309802737797,
+                                        62.187803490902276,
+                                        61.86629603436246,
+                                        61.51332614924758,
+                                        61.670529134596514,
+                                        62.01614193494398,
+                                        62.42759829956865,
+                                        62.04049015814663,
+                                        62.4879050225676,
+                                        62.534578908118796,
+                                        62.53729183335963,
+                                        62.507213724278294,
+                                        62.91741156445245,
+                                        62.80078558969012,
+                                        62.89530940332275,
+                                        62.82952275179085,
+                                        62.931001539540134,
+                                        62.715893011718826,
+                                        63.176668587903144,
+                                        63.25804897932602,
+                                        63.715274804489724,
+                                        63.25110762353138,
+                                        63.703759539930466,
+                                        63.9121877763375,
+                                        63.74483403967367,
+                                        63.278090432146044,
+                                        63.25689283100131,
+                                        63.5587547259249,
+                                        63.99611056226184,
+                                        63.711033213960846,
+                                        63.61430481648302,
+                                        63.37762519043254,
+                                        63.825084284030204,
+                                        63.65971618383464,
+                                        64.11513361026066,
+                                        64.55773804769903,
+                                        64.72114634405787,
+                                        64.92113863156139,
+                                        64.74299967907277,
+                                        64.58315181550863,
+                                        64.53895512079164,
+                                        64.29203322638713,
+                                        64.35539787981175,
+                                        64.51347297698413,
+                                        64.41240397641245,
+                                        64.37002365296716,
+                                        64.54885534394022,
+                                        65.0387758477243,
+                                        64.77700441309366,
+                                        65.18362739291737,
+                                        65.05949296204716,
+                                        64.57684960686204,
+                                        64.47443633413799,
+                                        64.25660237904727,
+                                        64.56848853603353,
+                                        64.13857108098799,
+                                        63.779464548765795,
+                                        63.940686810035814,
+                                        63.47280572727399,
+                                        63.75027671584932,
+                                        63.72842205520389,
+                                        63.28631208752196,
+                                        63.54806381048302,
+                                        63.89145142689777,
+                                        63.77801877620565,
+                                        64.22035568724904,
+                                        63.99613288560804,
+                                        64.03027098363421,
+                                        64.45100338093056,
+                                        64.4954103610469,
+                                        64.0379570128468,
+                                        64.509809400983,
+                                        64.24776908391132,
+                                        64.18308085450447,
+                                        64.02686567211323,
+                                        64.00949969057655,
+                                        64.08790624904579,
+                                        64.44413148646105,
+                                        64.436667344197,
+                                        64.925560935662,
+                                        64.4380208837763,
+                                        64.63611397061874,
+                                        64.53720467943039,
+                                        64.89043109965093,
+                                        65.02933526203901,
+                                        65.38083597755491,
+                                        65.63733460002958,
+                                        66.04889884599933,
+                                        66.15611674378638,
+                                        66.58017724018646,
+                                        66.13733327264003,
+                                        65.69321107501534,
+                                        65.92059175869956,
+                                        65.73905913370584,
+                                        65.39714875503125,
+                                        65.31355908128221,
+                                        65.75886616744013,
+                                        66.05775873128395,
+                                        65.93022978097021,
+                                        66.3107650269844
+                                    ]
+                                ]
+                            },
+                            "schema": {
+                                "fields": [
+                                    {
+                                        "config": {
+                                            "interval": 30000
+                                        },
+                                        "name": "time",
+                                        "type": "time",
+                                        "typeInfo": {
+                                            "frame": "time.Time",
+                                            "nullable": true
+                                        }
+                                    },
+                                    {
+                                        "config": {},
+                                        "labels": {},
+                                        "name": "A-hehwzd",
+                                        "type": "number",
+                                        "typeInfo": {
+                                            "frame": "float64",
+                                            "nullable": true
+                                        }
+                                    }
+                                ],
+                                "meta": {
+                                    "custom": {
+                                        "customStat": 10
+                                    },
+                                    "typeVersion": [
+                                        0,
+                                        0
+                                    ]
+                                },
+                                "refId": "A"
+                            }
+                        }
+                    ]
+                }
+            ],
+            "title": "Canvas Enhanced Data Links",
+            "transformations": [
+                {
+                    "id": "calculateField",
+                    "options": {
+                        "alias": "Count (transformation)",
+                        "mode": "reduceRow",
+                        "reduce": {
+                            "include": [
+                                "A-series"
+                            ],
+                            "reducer": "count"
+                        }
+                    }
+                }
+            ],
+            "type": "canvas"
+        }
+    ],
+    "schemaVersion": 39,
+    "tags": [
+        "gdev",
+        "panel-tests",
+        "canvas"
+    ],
+    "templating": {
+        "list": []
+    },
+    "time": {
+        "from": "now-6h",
+        "to": "now"
+    },
+    "timeRangeUpdatedDuringEditOrView": false,
+    "timepicker": {},
+    "timezone": "browser",
+    "title": "Panel Tests - Canvas Datalinks",
+    "uid": "adf95uwu7w1s0e",
+    "version": 1,
+    "weekStart": ""
+}
\ No newline at end of file
diff --git a/devenv/dev-dashboards/panel-dashlist/dashlist.json b/devenv/dev-dashboards/panel-dashlist/dashlist.json
new file mode 100644
index 0000000000000..8db5b616acd76
--- /dev/null
+++ b/devenv/dev-dashboards/panel-dashlist/dashlist.json
@@ -0,0 +1,86 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": null,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "gridPos": {
+        "h": 12,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "id": 2,
+      "options": {
+        "folderUID": "",
+        "includeVars": true,
+        "keepTime": false,
+        "maxItems": 10,
+        "query": "",
+        "showHeadings": true,
+        "showRecentlyViewed": true,
+        "showSearch": false,
+        "showStarred": false,
+        "tags": []
+      },
+      "pluginVersion": "10.3.0-pre",
+      "title": "Include time range and variables enabled",
+      "type": "dashlist"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 39,
+  "tags": ["gdev", "panel-tests"],
+  "templating": {
+    "list": [
+      {
+        "current": {
+          "selected": true,
+          "text": "A",
+          "value": "A"
+        },
+        "hide": 0,
+        "includeAll": false,
+        "multi": true,
+        "name": "server",
+        "query": "A,B,C,D",
+        "queryValue": "",
+        "skipUrlSync": false,
+        "type": "custom"
+      }
+    ]
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Panel Tests - DashList",
+  "uid": "a6801696-cc53-4196-b1f9-2403e3909185",
+  "version": 1,
+  "weekStart": ""
+}
diff --git a/devenv/dev-dashboards/panel-histogram/histogram_tests.json b/devenv/dev-dashboards/panel-histogram/histogram_tests.json
index 4399f6b67961e..60ca7a6302b7d 100644
--- a/devenv/dev-dashboards/panel-histogram/histogram_tests.json
+++ b/devenv/dev-dashboards/panel-histogram/histogram_tests.json
@@ -59,7 +59,8 @@
                 "value": 80
               }
             ]
-          }
+          },
+          "unitScale": true
         },
         "overrides": []
       },
@@ -128,7 +129,8 @@
                 "value": 80
               }
             ]
-          }
+          },
+          "unitScale": true
         },
         "overrides": []
       },
@@ -197,7 +199,8 @@
                 "value": 80
               }
             ]
-          }
+          },
+          "unitScale": true
         },
         "overrides": []
       },
@@ -279,7 +282,8 @@
                 "value": 80
               }
             ]
-          }
+          },
+          "unitScale": true
         },
         "overrides": []
       },
@@ -341,7 +345,9 @@
           },
           "custom": {
             "align": "auto",
-            "displayMode": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
             "inspect": false
           },
           "mappings": [],
@@ -356,7 +362,8 @@
                 "value": 80
               }
             ]
-          }
+          },
+          "unitScale": true
         },
         "overrides": []
       },
@@ -368,6 +375,7 @@
       },
       "id": 8,
       "options": {
+        "cellHeight": "sm",
         "footer": {
           "countRows": false,
           "fields": [],
@@ -376,9 +384,15 @@
           ],
           "show": false
         },
-        "showHeader": true
+        "showHeader": true,
+        "sortBy": [
+          {
+            "desc": true,
+            "displayName": "Height"
+          }
+        ]
       },
-      "pluginVersion": "9.4.0-pre",
+      "pluginVersion": "10.4.0-pre",
       "targets": [
         {
           "csvFileName": "weight_height.csv",
@@ -393,6 +407,7 @@
       "title": "Standalone transform - Height",
       "transformations": [
         {
+          "disabled": true,
           "id": "filterFieldsByName",
           "options": {
             "include": {
@@ -403,6 +418,7 @@
           }
         },
         {
+          "disabled": true,
           "id": "histogram",
           "options": {
             "combine": true,
@@ -424,7 +440,9 @@
           },
           "custom": {
             "align": "auto",
-            "displayMode": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
             "inspect": false
           },
           "mappings": [],
@@ -439,7 +457,8 @@
                 "value": 80
               }
             ]
-          }
+          },
+          "unitScale": true
         },
         "overrides": []
       },
@@ -451,6 +470,7 @@
       },
       "id": 9,
       "options": {
+        "cellHeight": "sm",
         "footer": {
           "countRows": false,
           "fields": [],
@@ -461,7 +481,7 @@
         },
         "showHeader": true
       },
-      "pluginVersion": "9.4.0-pre",
+      "pluginVersion": "10.4.0-pre",
       "targets": [
         {
           "csvFileName": "weight_height.csv",
@@ -527,7 +547,8 @@
                 "value": 80
               }
             ]
-          }
+          },
+          "unitScale": true
         },
         "overrides": [
           {
@@ -611,7 +632,8 @@
                 "value": 80
               }
             ]
-          }
+          },
+          "unitScale": true
         },
         "overrides": [
           {
@@ -695,7 +717,8 @@
                 "value": 80
               }
             ]
-          }
+          },
+          "unitScale": true
         },
         "overrides": [
           {
@@ -746,9 +769,157 @@
       ],
       "title": "Implict xMin",
       "type": "histogram"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "fillOpacity": 80,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 1
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 33
+      },
+      "id": 14,
+      "options": {
+        "bucketOffset": 0,
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "rawFrameContent": "[\n  {\n    \"schema\": {\n      \"refId\": \"A\",\n      \"meta\": {\n        \"custom\": {\n          \"resultType\": \"matrix\"\n        },\n        \"type\": \"heatmap-rows\",\n        \"typeVersion\": [\n          0,\n          1\n        ]\n      },\n      \"name\": \"0.005\",\n      \"fields\": [\n        {\n          \"config\": {\n            \"interval\": 1200000\n          },\n          \"name\": \"Time\",\n          \"type\": \"time\",\n          \"typeInfo\": {\n            \"frame\": \"time.Time\"\n          }\n        },\n        {\n          \"config\": {\n            \"displayNameFromDS\": \"0.005\"\n          },\n          \"labels\": {\n            \"le\": \"0.005\"\n          },\n          \"name\": \"0.005\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\"\n          }\n        },\n        {\n          \"config\": {\n            \"displayNameFromDS\": \"0.01\"\n          },\n          \"labels\": {\n            \"le\": \"0.01\"\n          },\n          \"name\": \"0.01\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\"\n          }\n        },\n        {\n          \"config\": {\n            \"displayNameFromDS\": \"0.025\"\n          },\n          \"labels\": {\n            \"le\": \"0.025\"\n          },\n          \"name\": \"0.025\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\"\n          }\n        },\n        {\n          \"config\": {\n            \"displayNameFromDS\": \"0.05\"\n          },\n          \"labels\": {\n            \"le\": \"0.05\"\n          },\n          \"name\": \"0.05\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\"\n          }\n        },\n        {\n          \"config\": {\n            \"displayNameFromDS\": \"0.1\"\n          },\n          \"labels\": {\n            \"le\": \"0.1\"\n          },\n          \"name\": \"0.1\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\"\n          }\n        },\n        {\n          \"config\": {\n            \"displayNameFromDS\": \"0.25\"\n          },\n          \"labels\": {\n            \"le\": \"0.25\"\n          },\n          \"name\": \"0.25\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\"\n          }\n        },\n        {\n          \"config\": {\n            \"displayNameFromDS\": \"0.5\"\n          },\n          \"labels\": {\n            \"le\": \"0.5\"\n          },\n          \"name\": \"0.5\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\"\n          }\n        },\n        {\n          \"config\": {\n            \"displayNameFromDS\": \"1.0\"\n          },\n          \"labels\": {\n            \"le\": \"1.0\"\n          },\n          \"name\": \"1.0\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\"\n          }\n        },\n        {\n          \"config\": {\n            \"displayNameFromDS\": \"2.5\"\n          },\n          \"labels\": {\n            \"le\": \"2.5\"\n          },\n          \"name\": \"2.5\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\"\n          }\n        },\n        {\n          \"config\": {\n            \"displayNameFromDS\": \"5.0\"\n          },\n          \"labels\": {\n            \"le\": \"5.0\"\n          },\n          \"name\": \"5.0\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\"\n          }\n        },\n        {\n          \"config\": {\n            \"displayNameFromDS\": \"10.0\"\n          },\n          \"labels\": {\n            \"le\": \"10.0\"\n          },\n          \"name\": \"10.0\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\"\n          }\n        },\n        {\n          \"config\": {\n            \"displayNameFromDS\": \"25.0\"\n          },\n          \"labels\": {\n            \"le\": \"25.0\"\n          },\n          \"name\": \"25.0\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\"\n          }\n        },\n        {\n          \"config\": {\n            \"displayNameFromDS\": \"50.0\"\n          },\n          \"labels\": {\n            \"le\": \"50.0\"\n          },\n          \"name\": \"50.0\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\"\n          }\n        },\n        {\n          \"config\": {\n            \"displayNameFromDS\": \"100.0\"\n          },\n          \"labels\": {\n            \"le\": \"100.0\"\n          },\n          \"name\": \"100.0\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\"\n          }\n        },\n        {\n          \"config\": {\n            \"displayNameFromDS\": \"+Inf\"\n          },\n          \"labels\": {\n            \"le\": \"+Inf\"\n          },\n          \"name\": \"+Inf\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\"\n          }\n        }\n      ]\n    },\n    \"data\": {\n      \"values\": [\n        [\n          1706456400000,\n          1706457600000,\n          1706458800000,\n          1706460000000,\n          1706461200000,\n          1706462400000,\n          1706463600000,\n          1706464800000,\n          1706466000000,\n          1706467200000,\n          1706468400000,\n          1706469600000,\n          1706470800000,\n          1706472000000,\n          1706473200000,\n          1706474400000,\n          1706475600000,\n          1706476800000,\n          1706478000000\n        ],\n        [\n          0.19357429718875502,\n          0.18072289156626506,\n          0.18313253012048192,\n          0.18955823293172688,\n          0.18634538152610441,\n          0.19518072289156624,\n          0.20080321285140562,\n          0.18313253012048192,\n          0.19678714859437751,\n          0.18795180722891563,\n          0.18473895582329317,\n          0.19357429718875502,\n          0.19116465863453813,\n          0.19196787148594374,\n          0.19437751004016063,\n          0.19759036144578312,\n          0.19839357429718874,\n          0.19357429718875502,\n          0.18634538152610441\n        ],\n        [\n          0.22248995983935738,\n          0.229718875502008,\n          0.22248995983935738,\n          0.22168674698795174,\n          0.2305220883534136,\n          0.21285140562248994,\n          0.2128514056224899,\n          0.22891566265060237,\n          0.22570281124497987,\n          0.22088353413654616,\n          0.22088353413654618,\n          0.21927710843373488,\n          0.21686746987951805,\n          0.22248995983935738,\n          0.21847389558232927,\n          0.21124497991967867,\n          0.216867469879518,\n          0.2200803212851405,\n          0.22329317269076304\n        ],\n        [\n          0.017670682730923704,\n          0.02329317269076303,\n          0.027309236947791138,\n          0.02168674698795181,\n          0.016867469879518093,\n          0.025702811244979917,\n          0.02008032128514059,\n          0.018473895582329314,\n          0.01124497991967871,\n          0.024899598393574307,\n          0.025702811244979862,\n          0.0208835341365462,\n          0.02409638554216864,\n          0.01927710843373498,\n          0.0208835341365462,\n          0.02248995983935742,\n          0.016867469879518093,\n          0.02008032128514059,\n          0.02329317269076303\n        ],\n        [\n          0,\n          0,\n          0.0008032128514056658,\n          0.0008032128514056658,\n          0,\n          0,\n          0,\n          0.0032128514056224966,\n          0,\n          0,\n          0.0024096385542168863,\n          0,\n          0.001606425702811276,\n          0,\n          0,\n          0.0024096385542168863,\n          0.001606425702811276,\n          0,\n          0.0008032128514056103\n        ],\n        [\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0\n        ],\n        [\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0\n        ],\n        [\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0\n        ],\n        [\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0\n        ],\n        [\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0\n        ],\n        [\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0\n        ],\n        [\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0\n        ],\n        [\n          0.06666666666666665,\n          0.06666666666666665,\n          0.06666666666666665,\n          0.06666666666666665,\n          0.06666666666666665,\n          0.06666666666666665,\n          0.06666666666666665,\n          0.06666666666666665,\n          0.06666666666666665,\n          0.06666666666666665,\n          0.06666666666666665,\n          0.06666666666666665,\n          0.06666666666666665,\n          0.06666666666666665,\n          0.06666666666666665,\n          0.06666666666666665,\n          0.06666666666666665,\n          0.06666666666666665,\n          0.06666666666666665\n        ],\n        [\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0\n        ],\n        [\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0\n        ],\n        [\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0\n        ]\n      ]\n    }\n  }\n]",
+          "refId": "A",
+          "scenarioId": "raw_frame"
+        }
+      ],
+      "title": "heatmap-rows frame",
+      "type": "histogram"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "fillOpacity": 80,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 1
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unitScale": true
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "sum(rate(cortex_request_duration_seconds{container=~\"compactor\", route=~\"(debug_pprof|metrics|ready)\"}[4m0s]))"
+            },
+            "properties": [
+              {
+                "id": "unit",
+                "value": "s"
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 33
+      },
+      "id": 15,
+      "options": {
+        "bucketOffset": 0,
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "rawFrameContent": "[\n  {\n    \"schema\": {\n      \"refId\": \"A\",\n      \"meta\": {\n        \"type\": \"heatmap-cells\",\n        \"typeVersion\": [\n          0,\n          0\n        ],\n        \"executedQueryString\": \"Expr: sum(rate(cortex_request_duration_seconds{container=~\\\"compactor\\\", route=~\\\"(debug_pprof|metrics|ready)\\\"}[4m0s]))\\nStep: 1m0s\",\n        \"preferredVisualisationType\": \"graph\"\n      },\n      \"fields\": [\n        {\n          \"name\": \"xMax\",\n          \"type\": \"time\",\n          \"typeInfo\": {\n            \"frame\": \"time.Time\"\n          },\n          \"config\": {\n            \"interval\": 60000\n          }\n        },\n        {\n          \"name\": \"yMin\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\"\n          },\n          \"labels\": {},\n          \"config\": {\n            \"displayNameFromDS\": \"sum(rate(cortex_request_duration_seconds{container=~\\\"compactor\\\", route=~\\\"(debug_pprof|metrics|ready)\\\"}[4m0s]))\"\n          }\n        },\n        {\n          \"name\": \"yMax\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\"\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"count\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\"\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"yLayout\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"int8\"\n          },\n          \"config\": {}\n        }\n      ]\n    },\n    \"data\": {\n      \"values\": [\n        [\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483460000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483520000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483580000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483640000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483700000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000,\n          1706483760000\n        ],\n        [\n          0.000012831061023768835,\n          0.000013992371264719713,\n          0.000016639827463764308,\n          0.0000181458605194507,\n          0.000019788201212326197,\n          0.000021579186437577742,\n          0.00002566212204753767,\n          0.000039576402424652394,\n          0.00020529697638030136,\n          0.0002238779402355154,\n          0.00026623723942022893,\n          0.0002903337683112112,\n          0.00031661121939721915,\n          0.00048828125,\n          0.002532889755177753,\n          0.002762135864009951,\n          0.00390625,\n          0.004259795830723663,\n          0.004645340292979379,\n          0.005065779510355506,\n          0.005524271728019902,\n          0.0060242610367497685,\n          0.006569503244169644,\n          0.007164094087536493,\n          0.0078125,\n          0.009290680585958758,\n          0.010131559020711013,\n          0.012048522073499537,\n          0.014328188175072986,\n          0.01703918332289465,\n          0.018581361171917516,\n          0.020263118041422026,\n          13.45434264405943,\n          0.000012831061023768835,\n          0.000013992371264719713,\n          0.000016639827463764308,\n          0.0000181458605194507,\n          0.000019788201212326197,\n          0.000021579186437577742,\n          0.00002566212204753767,\n          0.000039576402424652394,\n          0.0002238779402355154,\n          0.000244140625,\n          0.00026623723942022893,\n          0.0002903337683112112,\n          0.00048828125,\n          0.0021298979153618314,\n          0.002532889755177753,\n          0.002762135864009951,\n          0.00390625,\n          0.004259795830723663,\n          0.004645340292979379,\n          0.005065779510355506,\n          0.005524271728019902,\n          0.0060242610367497685,\n          0.006569503244169644,\n          0.007164094087536493,\n          0.0078125,\n          0.009290680585958758,\n          0.010131559020711013,\n          0.011048543456039804,\n          0.012048522073499537,\n          0.014328188175072986,\n          0.01703918332289465,\n          13.45434264405943,\n          0.000012831061023768835,\n          0.000013992371264719713,\n          0.000016639827463764308,\n          0.0000181458605194507,\n          0.000019788201212326197,\n          0.000021579186437577742,\n          0.00002566212204753767,\n          0.000244140625,\n          0.00026623723942022893,\n          0.0002903337683112112,\n          0.0021298979153618314,\n          0.002532889755177753,\n          0.002762135864009951,\n          0.00390625,\n          0.004259795830723663,\n          0.004645340292979379,\n          0.005065779510355506,\n          0.005524271728019902,\n          0.0060242610367497685,\n          0.006569503244169644,\n          0.007164094087536493,\n          0.0078125,\n          0.009290680585958758,\n          0.010131559020711013,\n          0.011048543456039804,\n          0.012048522073499537,\n          0.014328188175072986,\n          0.01703918332289465,\n          13.45434264405943,\n          0.000012831061023768835,\n          0.000013992371264719713,\n          0.0000152587890625,\n          0.000016639827463764308,\n          0.0000181458605194507,\n          0.000019788201212326197,\n          0.000021579186437577742,\n          0.00002566212204753767,\n          0.000244140625,\n          0.00026623723942022893,\n          0.0002903337683112112,\n          0.0021298979153618314,\n          0.002762135864009951,\n          0.00390625,\n          0.004259795830723663,\n          0.004645340292979379,\n          0.005065779510355506,\n          0.005524271728019902,\n          0.0060242610367497685,\n          0.006569503244169644,\n          0.007164094087536493,\n          0.0078125,\n          0.008519591661447326,\n          0.009290680585958758,\n          0.010131559020711013,\n          0.011048543456039804,\n          0.012048522073499537,\n          0.014328188175072986,\n          0.01703918332289465,\n          13.45434264405943,\n          0.000012831061023768835,\n          0.000013992371264719713,\n          0.0000152587890625,\n          0.000016639827463764308,\n          0.0000181458605194507,\n          0.000019788201212326197,\n          0.000021579186437577742,\n          0.00002566212204753767,\n          0.000244140625,\n          0.00026623723942022893,\n          0.0002903337683112112,\n          0.0005806675366224224,\n          0.0021298979153618314,\n          0.002762135864009951,\n          0.00390625,\n          0.004259795830723663,\n          0.004645340292979379,\n          0.005065779510355506,\n          0.005524271728019902,\n          0.0060242610367497685,\n          0.006569503244169644,\n          0.007164094087536493,\n          0.0078125,\n          0.008519591661447326,\n          0.009290680585958758,\n          0.010131559020711013,\n          0.011048543456039804,\n          0.015625,\n          13.45434264405943,\n          0.000012831061023768835,\n          0.000013992371264719713,\n          0.0000152587890625,\n          0.000016639827463764308,\n          0.0000181458605194507,\n          0.000019788201212326197,\n          0.000021579186437577742,\n          0.00002566212204753767,\n          0.000244140625,\n          0.00026623723942022893,\n          0.0002903337683112112,\n          0.00031661121939721915,\n          0.0003452669830012439,\n          0.0005806675366224224,\n          0.0021298979153618314,\n          0.002762135864009951,\n          0.00390625,\n          0.004259795830723663,\n          0.004645340292979379,\n          0.005065779510355506,\n          0.005524271728019902,\n          0.0060242610367497685,\n          0.006569503244169644,\n          0.007164094087536493,\n          0.0078125,\n          0.008519591661447326,\n          0.009290680585958758,\n          0.010131559020711013,\n          0.011048543456039804,\n          0.015625,\n          13.45434264405943\n        ],\n        [\n          0.000013992371264719713,\n          0.0000152587890625,\n          0.0000181458605194507,\n          0.000019788201212326197,\n          0.000021579186437577742,\n          0.000023532269674803783,\n          0.000027984742529439426,\n          0.000043158372875155485,\n          0.0002238779402355154,\n          0.000244140625,\n          0.0002903337683112112,\n          0.00031661121939721915,\n          0.0003452669830012439,\n          0.0005324744788404579,\n          0.002762135864009951,\n          0.0030121305183748843,\n          0.004259795830723663,\n          0.004645340292979379,\n          0.005065779510355506,\n          0.005524271728019902,\n          0.0060242610367497685,\n          0.006569503244169644,\n          0.007164094087536493,\n          0.0078125,\n          0.008519591661447326,\n          0.010131559020711013,\n          0.011048543456039804,\n          0.013139006488339287,\n          0.015625,\n          0.018581361171917516,\n          0.020263118041422026,\n          0.022097086912079608,\n          14.672064691274738,\n          0.000013992371264719713,\n          0.0000152587890625,\n          0.0000181458605194507,\n          0.000019788201212326197,\n          0.000021579186437577742,\n          0.000023532269674803783,\n          0.000027984742529439426,\n          0.000043158372875155485,\n          0.000244140625,\n          0.00026623723942022893,\n          0.0002903337683112112,\n          0.00031661121939721915,\n          0.0005324744788404579,\n          0.0023226701464896895,\n          0.002762135864009951,\n          0.0030121305183748843,\n          0.004259795830723663,\n          0.004645340292979379,\n          0.005065779510355506,\n          0.005524271728019902,\n          0.0060242610367497685,\n          0.006569503244169644,\n          0.007164094087536493,\n          0.0078125,\n          0.008519591661447326,\n          0.010131559020711013,\n          0.011048543456039804,\n          0.012048522073499537,\n          0.013139006488339287,\n          0.015625,\n          0.018581361171917516,\n          14.672064691274738,\n          0.000013992371264719713,\n          0.0000152587890625,\n          0.0000181458605194507,\n          0.000019788201212326197,\n          0.000021579186437577742,\n          0.000023532269674803783,\n          0.000027984742529439426,\n          0.00026623723942022893,\n          0.0002903337683112112,\n          0.00031661121939721915,\n          0.0023226701464896895,\n          0.002762135864009951,\n          0.0030121305183748843,\n          0.004259795830723663,\n          0.004645340292979379,\n          0.005065779510355506,\n          0.005524271728019902,\n          0.0060242610367497685,\n          0.006569503244169644,\n          0.007164094087536493,\n          0.0078125,\n          0.008519591661447326,\n          0.010131559020711013,\n          0.011048543456039804,\n          0.012048522073499537,\n          0.013139006488339287,\n          0.015625,\n          0.018581361171917516,\n          14.672064691274738,\n          0.000013992371264719713,\n          0.0000152587890625,\n          0.000016639827463764308,\n          0.0000181458605194507,\n          0.000019788201212326197,\n          0.000021579186437577742,\n          0.000023532269674803783,\n          0.000027984742529439426,\n          0.00026623723942022893,\n          0.0002903337683112112,\n          0.00031661121939721915,\n          0.0023226701464896895,\n          0.0030121305183748843,\n          0.004259795830723663,\n          0.004645340292979379,\n          0.005065779510355506,\n          0.005524271728019902,\n          0.0060242610367497685,\n          0.006569503244169644,\n          0.007164094087536493,\n          0.0078125,\n          0.008519591661447326,\n          0.009290680585958758,\n          0.010131559020711013,\n          0.011048543456039804,\n          0.012048522073499537,\n          0.013139006488339287,\n          0.015625,\n          0.018581361171917516,\n          14.672064691274738,\n          0.000013992371264719713,\n          0.0000152587890625,\n          0.000016639827463764308,\n          0.0000181458605194507,\n          0.000019788201212326197,\n          0.000021579186437577742,\n          0.000023532269674803783,\n          0.000027984742529439426,\n          0.00026623723942022893,\n          0.0002903337683112112,\n          0.00031661121939721915,\n          0.0006332224387944383,\n          0.0023226701464896895,\n          0.0030121305183748843,\n          0.004259795830723663,\n          0.004645340292979379,\n          0.005065779510355506,\n          0.005524271728019902,\n          0.0060242610367497685,\n          0.006569503244169644,\n          0.007164094087536493,\n          0.0078125,\n          0.008519591661447326,\n          0.009290680585958758,\n          0.010131559020711013,\n          0.011048543456039804,\n          0.012048522073499537,\n          0.01703918332289465,\n          14.672064691274738,\n          0.000013992371264719713,\n          0.0000152587890625,\n          0.000016639827463764308,\n          0.0000181458605194507,\n          0.000019788201212326197,\n          0.000021579186437577742,\n          0.000023532269674803783,\n          0.000027984742529439426,\n          0.00026623723942022893,\n          0.0002903337683112112,\n          0.00031661121939721915,\n          0.0003452669830012439,\n          0.00037651631479686053,\n          0.0006332224387944383,\n          0.0023226701464896895,\n          0.0030121305183748843,\n          0.004259795830723663,\n          0.004645340292979379,\n          0.005065779510355506,\n          0.005524271728019902,\n          0.0060242610367497685,\n          0.006569503244169644,\n          0.007164094087536493,\n          0.0078125,\n          0.008519591661447326,\n          0.009290680585958758,\n          0.010131559020711013,\n          0.011048543456039804,\n          0.012048522073499537,\n          0.01703918332289465,\n          14.672064691274738\n        ],\n        [\n          0.0044444444444444444,\n          0.017777777777777778,\n          0.0044444444444444444,\n          0.035555555555555556,\n          0.017777777777777778,\n          0.013333333333333332,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.008888888888888889,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.008888888888888889,\n          0.0044444444444444444,\n          0.017777777777777778,\n          0.03111111111111111,\n          0.013333333333333332,\n          0.05333333333333334,\n          0.035555555555555556,\n          0.022222222222222223,\n          0.022222222222222223,\n          0.022222222222222223,\n          0.017777777777777778,\n          0.013333333333333332,\n          0.013333333333333332,\n          0.008888888888888889,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.06666666666666667,\n          0.008888888888888889,\n          0.017777777777777778,\n          0.008888888888888889,\n          0.04,\n          0.0044444444444444444,\n          0.013333333333333332,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.013333333333333332,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.008888888888888889,\n          0.0044444444444444444,\n          0.026666666666666665,\n          0.035555555555555556,\n          0.008888888888888889,\n          0.044444444444444446,\n          0.035555555555555556,\n          0.026666666666666665,\n          0.022222222222222223,\n          0.022222222222222223,\n          0.013333333333333332,\n          0.008888888888888889,\n          0.017777777777777778,\n          0.0044444444444444444,\n          0.008888888888888889,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.06666666666666667,\n          0.008888888888888889,\n          0.017777777777777778,\n          0.017777777777777778,\n          0.04,\n          0.0044444444444444444,\n          0.008888888888888889,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.008888888888888889,\n          0.017777777777777778,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.008888888888888889,\n          0.022222222222222223,\n          0.03111111111111111,\n          0.008888888888888889,\n          0.044444444444444446,\n          0.035555555555555556,\n          0.026666666666666665,\n          0.026666666666666665,\n          0.022222222222222223,\n          0.017777777777777778,\n          0.008888888888888889,\n          0.017777777777777778,\n          0.0044444444444444444,\n          0.008888888888888889,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.06666666666666667,\n          0.008888888888888889,\n          0.017777777777777778,\n          0.0044444444444444444,\n          0.017777777777777778,\n          0.03111111111111111,\n          0.008888888888888889,\n          0.008888888888888889,\n          0.0044444444444444444,\n          0.008888888888888889,\n          0.013333333333333332,\n          0.008888888888888889,\n          0.008888888888888889,\n          0.008888888888888889,\n          0.022222222222222223,\n          0.013333333333333332,\n          0.008888888888888889,\n          0.044444444444444446,\n          0.04,\n          0.022222222222222223,\n          0.022222222222222223,\n          0.022222222222222223,\n          0.03111111111111111,\n          0.0044444444444444444,\n          0.013333333333333332,\n          0.017777777777777778,\n          0.008888888888888889,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.06666666666666667,\n          0.008888888888888889,\n          0.026666666666666665,\n          0.0044444444444444444,\n          0.013333333333333332,\n          0.022222222222222223,\n          0.008888888888888889,\n          0.013333333333333332,\n          0.0044444444444444444,\n          0.008888888888888889,\n          0.008888888888888889,\n          0.008888888888888889,\n          0.0044444444444444444,\n          0.008888888888888889,\n          0.008888888888888889,\n          0.026666666666666665,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.035555555555555556,\n          0.057777777777777775,\n          0.026666666666666665,\n          0.03111111111111111,\n          0.03111111111111111,\n          0.022222222222222223,\n          0.0044444444444444444,\n          0.013333333333333332,\n          0.013333333333333332,\n          0.008888888888888889,\n          0.0044444444444444444,\n          0.06666666666666667,\n          0.0044444444444444444,\n          0.026666666666666665,\n          0.0044444444444444444,\n          0.022222222222222223,\n          0.022222222222222223,\n          0.0044444444444444444,\n          0.013333333333333332,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.008888888888888889,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.013333333333333332,\n          0.017777777777777778,\n          0.013333333333333332,\n          0.008888888888888889,\n          0.035555555555555556,\n          0.05333333333333333,\n          0.022222222222222223,\n          0.026666666666666665,\n          0.035555555555555556,\n          0.022222222222222223,\n          0.008888888888888889,\n          0.02222222222222222,\n          0.008888888888888889,\n          0.0044444444444444444,\n          0.0044444444444444444,\n          0.06666666666666667\n        ],\n        [\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0,\n          0\n        ]\n      ]\n    }\n  }\n]",
+          "refId": "A",
+          "scenarioId": "raw_frame"
+        }
+      ],
+      "title": "heatmap-cells frame",
+      "type": "histogram"
     }
   ],
-  "schemaVersion": 37,
+  "refresh": "",
+  "schemaVersion": 39,
   "tags": [
     "gdev",
     "panel-tests",
@@ -765,6 +936,6 @@
   "timezone": "",
   "title": "Panel Tests - Histogram",
   "uid": "UTv--wqMk",
-  "version": 7,
+  "version": 29,
   "weekStart": ""
 }
diff --git a/devenv/dev-dashboards/panel-polystat/polystat_test.json b/devenv/dev-dashboards/panel-polystat/polystat_test.json
index 61be0f023b4b9..6be355ebd9918 100644
--- a/devenv/dev-dashboards/panel-polystat/polystat_test.json
+++ b/devenv/dev-dashboards/panel-polystat/polystat_test.json
@@ -449,9 +449,13 @@
               "text": "Malaysian Ringgit (RM)",
               "value": "currencyMYR"
             },
-	    {
+	          {
               "text": "CFP franc (XPF)",
               "value": "currencyXPF"
+            },
+            {
+              "text": "Bulgarian Lev (BGN)",
+              "value": "currencyBGN"
             }
           ],
           "text": "currency"
@@ -1611,6 +1615,10 @@
             {
               "text": "Malaysian Ringgit (RM)",
               "value": "currencyMYR"
+            },
+            {
+              "text": "Bulgarian Lev (BGN)",
+              "value": "currencyBGN"
             }
           ],
           "text": "currency"
@@ -2706,6 +2714,10 @@
             {
               "text": "Malaysian Ringgit (RM)",
               "value": "currencyMYR"
+            },
+            {
+              "text": "Bulgarian Lev (BGN)",
+              "value": "currencyBGN"
             }
           ],
           "text": "currency"
diff --git a/devenv/dev-dashboards/panel-stat/panel-stat-tests.json b/devenv/dev-dashboards/panel-stat/panel-stat-tests.json
index dba99155d1f20..3c5c59fd407ae 100644
--- a/devenv/dev-dashboards/panel-stat/panel-stat-tests.json
+++ b/devenv/dev-dashboards/panel-stat/panel-stat-tests.json
@@ -3,7 +3,10 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
@@ -13,18 +16,35 @@
     ]
   },
   "editable": true,
-  "gnetId": null,
+  "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
+  "id": 508,
   "links": [],
+  "liveNow": false,
   "panels": [
     {
-      "datasource": null,
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 18,
+      "panels": [],
+      "title": "Original",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "thresholds"
           },
-          "custom": {},
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -59,7 +79,7 @@
         "h": 3,
         "w": 24,
         "x": 0,
-        "y": 0
+        "y": 1
       },
       "id": 6,
       "interval": "6m",
@@ -69,19 +89,27 @@
         "justifyMode": "auto",
         "orientation": "auto",
         "reduceOptions": {
-          "calcs": ["mean"],
+          "calcs": [
+            "mean"
+          ],
           "fields": "",
           "values": false
         },
+        "showPercentChange": false,
         "sparkline": {
           "show": true
         },
-        "textMode": "auto"
+        "textMode": "auto",
+        "wideLayout": true
       },
-      "pluginVersion": "7.1.0-pre",
+      "pluginVersion": "10.3.0-pre",
       "targets": [
         {
           "alias": "__house_locations",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
           "labels": "",
           "min": 0,
           "noise": 5,
@@ -91,19 +119,18 @@
           "spread": 100
         }
       ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "",
       "type": "stat"
     },
     {
-      "datasource": null,
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "thresholds"
           },
-          "custom": {},
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -138,7 +165,7 @@
         "h": 6,
         "w": 24,
         "x": 0,
-        "y": 3
+        "y": 4
       },
       "id": 10,
       "interval": "7m",
@@ -148,19 +175,27 @@
         "justifyMode": "auto",
         "orientation": "auto",
         "reduceOptions": {
-          "calcs": ["mean"],
+          "calcs": [
+            "mean"
+          ],
           "fields": "",
           "values": false
         },
+        "showPercentChange": false,
         "sparkline": {
           "show": true
         },
-        "textMode": "auto"
+        "textMode": "auto",
+        "wideLayout": true
       },
-      "pluginVersion": "7.1.0-pre",
+      "pluginVersion": "10.3.0-pre",
       "targets": [
         {
           "alias": "__house_locations",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
           "min": 0,
           "noise": 10,
           "refId": "A",
@@ -169,19 +204,19 @@
           "spread": 10
         }
       ],
-      "timeFrom": null,
-      "timeShift": null,
       "title": "Panel Title",
       "type": "stat"
     },
     {
-      "datasource": null,
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "thresholds"
           },
-          "custom": {},
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -216,7 +251,7 @@
         "h": 6,
         "w": 24,
         "x": 0,
-        "y": 9
+        "y": 10
       },
       "id": 14,
       "interval": "7m",
@@ -226,19 +261,27 @@
         "justifyMode": "auto",
         "orientation": "auto",
         "reduceOptions": {
-          "calcs": ["mean"],
+          "calcs": [
+            "mean"
+          ],
           "fields": "",
           "values": false
         },
+        "showPercentChange": false,
         "sparkline": {
           "show": true
         },
-        "textMode": "auto"
+        "textMode": "auto",
+        "wideLayout": true
       },
-      "pluginVersion": "7.1.0-pre",
+      "pluginVersion": "10.3.0-pre",
       "targets": [
         {
           "alias": "__house_locations",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
           "min": 0,
           "noise": 10,
           "refId": "A",
@@ -247,19 +290,19 @@
           "spread": 10
         }
       ],
-      "timeFrom": null,
-      "timeShift": null,
       "title": "Panel Title",
       "type": "stat"
     },
     {
-      "datasource": null,
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "thresholds"
           },
-          "custom": {},
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -294,7 +337,7 @@
         "h": 18,
         "w": 6,
         "x": 0,
-        "y": 15
+        "y": 16
       },
       "id": 13,
       "interval": "5m",
@@ -304,19 +347,27 @@
         "justifyMode": "auto",
         "orientation": "horizontal",
         "reduceOptions": {
-          "calcs": ["mean"],
+          "calcs": [
+            "mean"
+          ],
           "fields": "",
           "values": false
         },
+        "showPercentChange": false,
         "sparkline": {
           "show": true
         },
-        "textMode": "auto"
+        "textMode": "auto",
+        "wideLayout": true
       },
-      "pluginVersion": "7.1.0-pre",
+      "pluginVersion": "10.3.0-pre",
       "targets": [
         {
           "alias": "__server_names",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
           "min": 0,
           "refId": "A",
           "scenarioId": "random_walk",
@@ -324,19 +375,19 @@
           "spread": 100
         }
       ],
-      "timeFrom": null,
-      "timeShift": null,
       "title": "Horizontal with graph",
       "type": "stat"
     },
     {
-      "datasource": null,
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "thresholds"
           },
-          "custom": {},
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -371,7 +422,7 @@
         "h": 9,
         "w": 4,
         "x": 6,
-        "y": 15
+        "y": 16
       },
       "id": 8,
       "interval": "10m",
@@ -381,59 +432,91 @@
         "justifyMode": "auto",
         "orientation": "auto",
         "reduceOptions": {
-          "calcs": ["mean"],
+          "calcs": [
+            "mean"
+          ],
           "fields": "",
           "values": false
         },
+        "showPercentChange": false,
         "sparkline": {
           "show": true
         },
-        "textMode": "auto"
+        "textMode": "auto",
+        "wideLayout": true
       },
-      "pluginVersion": "7.1.0-pre",
+      "pluginVersion": "10.3.0-pre",
       "targets": [
         {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
           "refId": "A",
           "scenarioId": "random_walk"
         },
         {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
           "refId": "B",
           "scenarioId": "random_walk"
         },
         {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
           "refId": "C",
           "scenarioId": "random_walk"
         },
         {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
           "refId": "D",
           "scenarioId": "random_walk"
         },
         {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
           "refId": "E",
           "scenarioId": "random_walk"
         },
         {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
           "refId": "F",
           "scenarioId": "random_walk"
         },
         {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
           "refId": "G",
           "scenarioId": "random_walk"
         }
       ],
-      "timeFrom": null,
-      "timeShift": null,
       "title": "Auto grid",
       "type": "stat"
     },
     {
-      "datasource": null,
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "thresholds"
           },
-          "custom": {},
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -468,7 +551,7 @@
         "h": 9,
         "w": 6,
         "x": 10,
-        "y": 15
+        "y": 16
       },
       "id": 12,
       "interval": "10m",
@@ -478,59 +561,91 @@
         "justifyMode": "auto",
         "orientation": "horizontal",
         "reduceOptions": {
-          "calcs": ["mean"],
+          "calcs": [
+            "mean"
+          ],
           "fields": "",
           "values": false
         },
+        "showPercentChange": false,
         "sparkline": {
           "show": true
         },
-        "textMode": "auto"
+        "textMode": "auto",
+        "wideLayout": true
       },
-      "pluginVersion": "7.1.0-pre",
+      "pluginVersion": "10.3.0-pre",
       "targets": [
         {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
           "refId": "A",
           "scenarioId": "random_walk"
         },
         {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
           "refId": "B",
           "scenarioId": "random_walk"
         },
         {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
           "refId": "C",
           "scenarioId": "random_walk"
         },
         {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
           "refId": "D",
           "scenarioId": "random_walk"
         },
         {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
           "refId": "E",
           "scenarioId": "random_walk"
         },
         {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
           "refId": "F",
           "scenarioId": "random_walk"
         },
         {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
           "refId": "G",
           "scenarioId": "random_walk"
         }
       ],
-      "timeFrom": null,
-      "timeShift": null,
       "title": "Horizontal",
       "type": "stat"
     },
     {
-      "datasource": null,
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "thresholds"
           },
-          "custom": {},
           "mappings": [],
           "max": 200,
           "min": 0,
@@ -567,7 +682,7 @@
         "h": 9,
         "w": 8,
         "x": 16,
-        "y": 15
+        "y": 16
       },
       "id": 15,
       "interval": "5m",
@@ -577,19 +692,27 @@
         "justifyMode": "auto",
         "orientation": "horizontal",
         "reduceOptions": {
-          "calcs": ["mean"],
+          "calcs": [
+            "mean"
+          ],
           "fields": "",
           "values": false
         },
+        "showPercentChange": false,
         "sparkline": {
           "show": true
         },
-        "textMode": "name"
+        "textMode": "name",
+        "wideLayout": true
       },
-      "pluginVersion": "7.1.0-pre",
+      "pluginVersion": "10.3.0-pre",
       "targets": [
         {
           "alias": "__server_names",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
           "max": 200,
           "min": 0,
           "noise": 5,
@@ -600,19 +723,19 @@
           "startValue": 0
         }
       ],
-      "timeFrom": null,
-      "timeShift": null,
       "title": "Text mode name",
       "type": "stat"
     },
     {
-      "datasource": null,
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "thresholds"
           },
-          "custom": {},
           "mappings": [],
           "max": 200,
           "min": 0,
@@ -649,7 +772,7 @@
         "h": 9,
         "w": 18,
         "x": 6,
-        "y": 24
+        "y": 25
       },
       "id": 16,
       "interval": "5m",
@@ -659,19 +782,27 @@
         "justifyMode": "auto",
         "orientation": "auto",
         "reduceOptions": {
-          "calcs": ["mean"],
+          "calcs": [
+            "mean"
+          ],
           "fields": "",
           "values": false
         },
+        "showPercentChange": false,
         "sparkline": {
           "show": true
         },
-        "textMode": "value"
+        "textMode": "value",
+        "wideLayout": true
       },
-      "pluginVersion": "7.1.0-pre",
+      "pluginVersion": "10.3.0-pre",
       "targets": [
         {
           "alias": "__server_names",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
           "max": 200,
           "min": 0,
           "noise": 15,
@@ -682,19 +813,19 @@
           "startValue": 0
         }
       ],
-      "timeFrom": null,
-      "timeShift": null,
       "title": "Value only",
       "type": "stat"
     },
     {
-      "datasource": null,
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "thresholds"
           },
-          "custom": {},
           "mappings": [],
           "max": 200,
           "min": 0,
@@ -731,7 +862,7 @@
         "h": 5,
         "w": 24,
         "x": 0,
-        "y": 33
+        "y": 34
       },
       "id": 17,
       "interval": "5m",
@@ -741,19 +872,27 @@
         "justifyMode": "auto",
         "orientation": "auto",
         "reduceOptions": {
-          "calcs": ["mean"],
+          "calcs": [
+            "mean"
+          ],
           "fields": "",
           "values": false
         },
+        "showPercentChange": false,
         "sparkline": {
           "show": true
         },
-        "textMode": "none"
+        "textMode": "none",
+        "wideLayout": true
       },
-      "pluginVersion": "7.1.0-pre",
+      "pluginVersion": "10.3.0-pre",
       "targets": [
         {
           "alias": "__server_names",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
           "max": 200,
           "min": 0,
           "noise": 15,
@@ -764,30 +903,1120 @@
           "startValue": 0
         }
       ],
-      "timeFrom": null,
-      "timeShift": null,
       "title": "No text",
       "type": "stat"
-    }
-  ],
-  "schemaVersion": 26,
-  "tags": [
-    "gdev",
-    "panel-tests",
-    "graph-ng"
-  ],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-6h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 39
+      },
+      "id": 19,
+      "panels": [],
+      "title": "Metrics Display",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "blue",
+                "value": null
+              },
+              {
+                "color": "green",
+                "value": 10
+              },
+              {
+                "color": "purple",
+                "value": 20
+              },
+              {
+                "color": "orange",
+                "value": 40
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "areaM2"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 24,
+        "x": 0,
+        "y": 40
+      },
+      "id": 20,
+      "interval": "6m",
+      "options": {
+        "colorMode": "background",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "mean"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": true,
+        "sparkline": {
+          "show": true
+        },
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "10.3.0-pre",
+      "targets": [
+        {
+          "alias": "__house_locations",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "labels": "",
+          "min": 0,
+          "noise": 5,
+          "refId": "A",
+          "scenarioId": "random_walk",
+          "seriesCount": 6,
+          "spread": 100
+        }
+      ],
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "blue",
+                "value": null
+              },
+              {
+                "color": "green",
+                "value": 10
+              },
+              {
+                "color": "purple",
+                "value": 20
+              },
+              {
+                "color": "orange",
+                "value": 40
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "areaM2"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 24,
+        "x": 0,
+        "y": 43
+      },
+      "id": 21,
+      "interval": "7m",
+      "options": {
+        "colorMode": "background",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "mean"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": true,
+        "sparkline": {
+          "show": true
+        },
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "10.3.0-pre",
+      "targets": [
+        {
+          "alias": "__house_locations",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "min": 0,
+          "noise": 10,
+          "refId": "A",
+          "scenarioId": "random_walk",
+          "seriesCount": 6,
+          "spread": 10
+        }
+      ],
+      "title": "Panel Title",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "blue",
+                "value": null
+              },
+              {
+                "color": "green",
+                "value": 10
+              },
+              {
+                "color": "purple",
+                "value": 20
+              },
+              {
+                "color": "orange",
+                "value": 40
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "areaM2"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 24,
+        "x": 0,
+        "y": 49
+      },
+      "id": 22,
+      "interval": "7m",
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "mean"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": true,
+        "sparkline": {
+          "show": true
+        },
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "10.3.0-pre",
+      "targets": [
+        {
+          "alias": "__house_locations",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "min": 0,
+          "noise": 10,
+          "refId": "A",
+          "scenarioId": "random_walk",
+          "seriesCount": 6,
+          "spread": 10
+        }
+      ],
+      "title": "Panel Title",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "blue",
+                "value": null
+              },
+              {
+                "color": "green",
+                "value": 10
+              },
+              {
+                "color": "purple",
+                "value": 20
+              },
+              {
+                "color": "orange",
+                "value": 40
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "areaM2"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 18,
+        "w": 6,
+        "x": 0,
+        "y": 55
+      },
+      "id": 23,
+      "interval": "5m",
+      "options": {
+        "colorMode": "background",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": [
+            "mean"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": true,
+        "sparkline": {
+          "show": true
+        },
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "10.3.0-pre",
+      "targets": [
+        {
+          "alias": "__server_names",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "min": 0,
+          "refId": "A",
+          "scenarioId": "random_walk",
+          "seriesCount": 7,
+          "spread": 100
+        }
+      ],
+      "title": "Horizontal with graph",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "blue",
+                "value": null
+              },
+              {
+                "color": "green",
+                "value": 10
+              },
+              {
+                "color": "purple",
+                "value": 20
+              },
+              {
+                "color": "orange",
+                "value": 40
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "areaM2"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 4,
+        "x": 6,
+        "y": 55
+      },
+      "id": 24,
+      "interval": "10m",
+      "options": {
+        "colorMode": "background",
+        "graphMode": "line",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "mean"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": true,
+        "sparkline": {
+          "show": true
+        },
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "10.3.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "random_walk"
+        },
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "B",
+          "scenarioId": "random_walk"
+        },
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "C",
+          "scenarioId": "random_walk"
+        },
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "D",
+          "scenarioId": "random_walk"
+        },
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "E",
+          "scenarioId": "random_walk"
+        },
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "F",
+          "scenarioId": "random_walk"
+        },
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "G",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "title": "Auto grid",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "blue",
+                "value": null
+              },
+              {
+                "color": "green",
+                "value": 10
+              },
+              {
+                "color": "purple",
+                "value": 20
+              },
+              {
+                "color": "orange",
+                "value": 40
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "areaM2"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 6,
+        "x": 10,
+        "y": 55
+      },
+      "id": 25,
+      "interval": "10m",
+      "options": {
+        "colorMode": "background",
+        "graphMode": "line",
+        "justifyMode": "auto",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": [
+            "mean"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": true,
+        "sparkline": {
+          "show": true
+        },
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "10.3.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "random_walk"
+        },
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "B",
+          "scenarioId": "random_walk"
+        },
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "C",
+          "scenarioId": "random_walk"
+        },
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "D",
+          "scenarioId": "random_walk"
+        },
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "E",
+          "scenarioId": "random_walk"
+        },
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "F",
+          "scenarioId": "random_walk"
+        },
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "G",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "title": "Horizontal",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "max": 200,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "blue",
+                "value": null
+              },
+              {
+                "color": "green",
+                "value": 10
+              },
+              {
+                "color": "purple",
+                "value": 20
+              },
+              {
+                "color": "orange",
+                "value": 40
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "areaM2"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 16,
+        "y": 55
+      },
+      "id": 26,
+      "interval": "5m",
+      "options": {
+        "colorMode": "background",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": [
+            "mean"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": true,
+        "sparkline": {
+          "show": true
+        },
+        "textMode": "name",
+        "wideLayout": true
+      },
+      "pluginVersion": "10.3.0-pre",
+      "targets": [
+        {
+          "alias": "__server_names",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "max": 200,
+          "min": 0,
+          "noise": 5,
+          "refId": "A",
+          "scenarioId": "random_walk",
+          "seriesCount": 7,
+          "spread": 20,
+          "startValue": 0
+        }
+      ],
+      "title": "Text mode name",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "max": 200,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "blue",
+                "value": null
+              },
+              {
+                "color": "green",
+                "value": 10
+              },
+              {
+                "color": "purple",
+                "value": 20
+              },
+              {
+                "color": "orange",
+                "value": 40
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "areaM2"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 18,
+        "x": 6,
+        "y": 64
+      },
+      "id": 27,
+      "interval": "5m",
+      "options": {
+        "colorMode": "background",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "mean"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": true,
+        "sparkline": {
+          "show": true
+        },
+        "textMode": "value",
+        "wideLayout": true
+      },
+      "pluginVersion": "10.3.0-pre",
+      "targets": [
+        {
+          "alias": "__server_names",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "max": 200,
+          "min": 0,
+          "noise": 15,
+          "refId": "A",
+          "scenarioId": "random_walk",
+          "seriesCount": 45,
+          "spread": 1,
+          "startValue": 0
+        }
+      ],
+      "title": "Value only",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "max": 200,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "blue",
+                "value": null
+              },
+              {
+                "color": "green",
+                "value": 10
+              },
+              {
+                "color": "purple",
+                "value": 20
+              },
+              {
+                "color": "orange",
+                "value": 40
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "areaM2"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 5,
+        "w": 24,
+        "x": 0,
+        "y": 73
+      },
+      "id": 28,
+      "interval": "5m",
+      "options": {
+        "colorMode": "background",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "mean"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": true,
+        "sparkline": {
+          "show": true
+        },
+        "textMode": "none",
+        "wideLayout": true
+      },
+      "pluginVersion": "10.3.0-pre",
+      "targets": [
+        {
+          "alias": "__server_names",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "max": 200,
+          "min": 0,
+          "noise": 15,
+          "refId": "A",
+          "scenarioId": "random_walk",
+          "seriesCount": 50,
+          "spread": 1,
+          "startValue": 0
+        }
+      ],
+      "title": "No text",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 8,
+        "x": 0,
+        "y": 78
+      },
+      "id": 29,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": true,
+        "textMode": "value",
+        "wideLayout": true
+      },
+      "pluginVersion": "10.3.0-pre",
+      "targets": [
+        {
+          "csvContent": "time, value\n2023-12-13T00:00:00Z, 0\n2023-12-13T00:00:00Z, 100",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Infinity Percent Change",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 8,
+        "x": 8,
+        "y": 78
+      },
+      "id": 30,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": true,
+        "textMode": "value",
+        "wideLayout": true
+      },
+      "pluginVersion": "10.3.0-pre",
+      "targets": [
+        {
+          "csvContent": "time, value\n2023-12-13T00:00:00Z, 0\n2023-12-13T00:00:00Z, 0",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "NaN Percent Change",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 8,
+        "x": 16,
+        "y": 78
+      },
+      "id": 31,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": true
+        },
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "10.3.0-pre",
+      "targets": [
+        {
+          "csvContent": "Name, value\nName1, 10\nName2, 20",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Value Options All",
+      "type": "stat"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 39,
+  "tags": [
+    "gdev",
+    "panel-tests",
+    "graph-ng"
+  ],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": [
+      "5s",
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ]
   },
   "timezone": "",
   "title": "Panel Tests - Stat",
   "uid": "EJ8_d9jZk",
-  "version": 1
-}
+  "version": 11,
+  "weekStart": ""
+}
\ No newline at end of file
diff --git a/devenv/dev-dashboards/panel-timeline/timeline-align-endtime.json b/devenv/dev-dashboards/panel-timeline/timeline-align-endtime.json
new file mode 100644
index 0000000000000..8542c7349b6f8
--- /dev/null
+++ b/devenv/dev-dashboards/panel-timeline/timeline-align-endtime.json
@@ -0,0 +1,271 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": 988,
+  "links": [],
+  "panels": [
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "fillOpacity": 70,
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineWidth": 0,
+            "spanNulls": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 13,
+        "w": 15,
+        "x": 0,
+        "y": 0
+      },
+      "id": 1,
+      "options": {
+        "alignValue": "left",
+        "legend": {
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "mergeValues": true,
+        "rowHeight": 0.9,
+        "showValue": "auto",
+        "tooltip": {
+          "maxHeight": 600,
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "rawFrameContent": "[\n  {\n    \"schema\": {\n      \"refId\": \"A\",\n      \"meta\": {\n        \"typeVersion\": [\n          0,\n          0\n        ]\n      },\n      \"name\": \"A\",\n      \"fields\": [\n        {\n          \"name\": \"channel\",\n          \"config\": {\n            \"selector\": \"channel\"\n          },\n          \"type\": \"string\"\n        },\n        {\n          \"name\": \"name\",\n          \"config\": {\n            \"selector\": \"name\"\n          },\n          \"type\": \"string\"\n        },\n        {\n          \"name\": \"starttime\",\n          \"config\": {\n            \"selector\": \"starttime\"\n          },\n          \"type\": \"string\"\n        },\n        {\n          \"name\": \"endtime\",\n          \"config\": {\n            \"selector\": \"endtime\"\n          },\n          \"type\": \"string\"\n        },\n        {\n          \"name\": \"duration_minutes\",\n          \"config\": {\n            \"selector\": \"duration_minutes\"\n          },\n          \"type\": \"number\"\n        },\n        {\n          \"name\": \"state\",\n          \"config\": {\n            \"selector\": \"state\"\n          },\n          \"type\": \"string\"\n        }\n      ]\n    },\n    \"data\": {\n      \"values\": [\n        [\n          \"Channel 1\",\n          \"Channel 2\",\n          \"Channel 1\",\n          \"Channel 2\"\n        ],\n        [\n          \"Event 1\",\n          \"Event 2\",\n          \"Event 3\",\n          \"Event 4\"\n        ],\n        [\n          \"2024-02-28T08:00:00Z\",\n          \"2024-02-28T09:00:00Z\",\n          \"2024-02-28T11:00:00Z\",\n          \"2024-02-28T12:30:00Z\"\n        ],\n        [\n          \"2024-02-28T10:00:00Z\",\n          \"2024-02-28T10:30:00Z\",\n          \"2024-02-28T14:00:00Z\",\n          \"2024-02-28T13:30:00Z\"\n        ],\n        [\n          120,\n          90,\n          180,\n          60\n        ],\n        [\n          \"OK\",\n          \"ERROR\",\n          \"NO_DATA\",\n          \"WARNING\"\n        ]\n      ]\n    }\n  }\n]",
+          "refId": "A",
+          "scenarioId": "raw_frame"
+        }
+      ],
+      "title": "Raw frames w/enums",
+      "transformations": [
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "channel": false,
+              "duration_minutes": true,
+              "name": true
+            },
+            "includeByName": {},
+            "indexByName": {},
+            "renameByName": {}
+          }
+        },
+        {
+          "id": "convertFieldType",
+          "options": {
+            "conversions": [
+              {
+                "destinationType": "time",
+                "enumConfig": {
+                  "text": [
+                    "2024-02-28T08:00:00Z",
+                    "2024-02-28T09:00:00Z",
+                    "2024-02-28T11:00:00Z",
+                    "2024-02-28T12:30:00Z"
+                  ]
+                },
+                "targetField": "starttime"
+              },
+              {
+                "destinationType": "time",
+                "targetField": "endtime"
+              },
+              {
+                "destinationType": "enum",
+                "enumConfig": {
+                  "text": [
+                    "OK",
+                    "ERROR",
+                    "NO_DATA",
+                    "WARNING"
+                  ]
+                },
+                "targetField": "state"
+              }
+            ],
+            "fields": {}
+          }
+        },
+        {
+          "id": "partitionByValues",
+          "options": {
+            "fields": [
+              "channel"
+            ],
+            "keepFields": false,
+            "naming": {
+              "asLabels": false
+            }
+          }
+        }
+      ],
+      "type": "state-timeline"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "fillOpacity": 70,
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineWidth": 0,
+            "spanNulls": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 12,
+        "w": 15,
+        "x": 0,
+        "y": 13
+      },
+      "id": 2,
+      "options": {
+        "alignValue": "left",
+        "legend": {
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "mergeValues": true,
+        "rowHeight": 0.9,
+        "showValue": "auto",
+        "tooltip": {
+          "maxHeight": 600,
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "alias": "Channel 1",
+          "csvContent": "starttime,endtime,state\n1709107200000,1709114400000,OK\n1709118000000,1709128800000,NO_DATA",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        },
+        {
+          "alias": "Channel 2",
+          "csvContent": "starttime,endtime,state\n1709110800000,1709116200000,ERROR\n1709123400000,1709127000000,WARNING",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "B",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "CSV content",
+      "type": "state-timeline"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 39,
+  "tags": [
+    "gdev",
+    "panel-tests",
+    "graph-ng",
+    "demo"
+  ],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "2024-02-28T07:47:21.428Z",
+    "to": "2024-02-28T14:12:43.391Z"
+  },
+  "timeRangeUpdatedDuringEditOrView": false,
+  "timepicker": {},
+  "timezone": "browser",
+  "title": "Panel Tests - StateTimeline - multiple frames with endTime",
+  "uid": "cdf3gkge5reo0f",
+  "version": 4,
+  "weekStart": ""
+}
\ No newline at end of file
diff --git a/devenv/dev-dashboards/panel-timeline/timeline-align-nulls-retain.json b/devenv/dev-dashboards/panel-timeline/timeline-align-nulls-retain.json
new file mode 100644
index 0000000000000..49907cca7714c
--- /dev/null
+++ b/devenv/dev-dashboards/panel-timeline/timeline-align-nulls-retain.json
@@ -0,0 +1,213 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": 993,
+  "links": [],
+  "panels": [
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "light-blue",
+            "mode": "fixed"
+          },
+          "custom": {
+            "fillOpacity": 20,
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineWidth": 1,
+            "spanNulls": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "blue",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Dose"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#289fb0",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Mix"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#d4b10b",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Cook"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#c900c3",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Int. Shear"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#a49225",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Ext. Shear"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#148dd7",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Transfer"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#01b70c",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 19,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 2,
+      "options": {
+        "alignValue": "center",
+        "legend": {
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": false
+        },
+        "mergeValues": false,
+        "rowHeight": 0.9,
+        "showValue": "auto",
+        "tooltip": {
+          "maxHeight": 600,
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "repeat": "CHANNEL",
+      "repeatDirection": "v",
+      "targets": [
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "rawFrameContent": "[\n  {\n    \"schema\": {\n      \"refId\": \"Dose\",\n      \"meta\": {\n        \"executedQueryString\": \"from(bucket: \\\"data\\\")\\r\\n  |> range(start: 2023-10-20T05:04:00Z, stop: 2023-10-20T07:22:00Z)\\r\\n  |> filter(fn: (r) => r[\\\"_field\\\"] == \\\"FactoryManager_Analogs_DB.A01C02U09.PHS.Dose\\\")\\r\\n  |> keep(columns: [\\\"_time\\\", \\\"_value\\\"])\\r\\n  |> map(fn: (r) => ({ \\r\\n    \\\"Dose\\\": r._value,\\r\\n    time: r._time,\\r\\n  }))\\r\\n\",\n        \"typeVersion\": [\n          0,\n          0\n        ]\n      },\n      \"fields\": [\n        {\n          \"config\": {},\n          \"labels\": {},\n          \"name\": \"time\",\n          \"type\": \"time\",\n          \"typeInfo\": {\n            \"frame\": \"time.Time\",\n            \"nullable\": true\n          }\n        },\n        {\n          \"config\": {},\n          \"labels\": {},\n          \"name\": \"Dose\",\n          \"type\": \"string\",\n          \"typeInfo\": {\n            \"frame\": \"string\",\n            \"nullable\": true\n          }\n        }\n      ]\n    },\n    \"data\": {\n      \"values\": [\n        [\n          1697781872300,\n          1697781963303,\n          1697784138453,\n          1697784160451\n        ],\n        [\n          \"Cold Water Dosing Active (150 ltrs)\",\n          null,\n          \"Hot Water Dosing Active (50 ltrs)\",\n          null\n        ]\n      ]\n    }\n  },\n  {\n    \"schema\": {\n      \"refId\": \"Mix\",\n      \"meta\": {\n        \"executedQueryString\": \"from(bucket: \\\"data\\\")\\r\\n  |> range(start: 2023-10-20T05:04:00Z, stop: 2023-10-20T07:22:00Z)\\r\\n  |> filter(fn: (r) => r[\\\"_field\\\"] == \\\"FactoryManager_Analogs_DB.A01C02U09.PHS.Mix\\\")\\r\\n  |> keep(columns: [\\\"_time\\\", \\\"_value\\\"])\\r\\n  |> map(fn: (r) => ({ \\r\\n    \\\"Mix\\\": r._value,\\r\\n    time: r._time,\\r\\n  }))\\r\\n\",\n        \"typeVersion\": [\n          0,\n          0\n        ]\n      },\n      \"fields\": [\n        {\n          \"config\": {},\n          \"labels\": {},\n          \"name\": \"time\",\n          \"type\": \"time\",\n          \"typeInfo\": {\n            \"frame\": \"time.Time\",\n            \"nullable\": true\n          }\n        },\n        {\n          \"config\": {},\n          \"labels\": {},\n          \"name\": \"Mix\",\n          \"type\": \"string\",\n          \"typeInfo\": {\n            \"frame\": \"string\",\n            \"nullable\": true\n          }\n        }\n      ]\n    },\n    \"data\": {\n      \"values\": [\n        [\n          1697778291972,\n          1697778393992,\n          1697778986994,\n          1697786485890\n        ],\n        [\n          \"Running Constant Forward\",\n          null,\n          \"Running Constant Forward\",\n          null\n        ]\n      ]\n    }\n  },\n  {\n    \"schema\": {\n      \"refId\": \"Cook\",\n      \"meta\": {\n        \"executedQueryString\": \"from(bucket: \\\"data\\\")\\r\\n  |> range(start: 2023-10-20T05:04:00Z, stop: 2023-10-20T07:22:00Z)\\r\\n  |> filter(fn: (r) => r[\\\"_field\\\"] == \\\"FactoryManager_Analogs_DB.A01C02U09.PHS.Cook\\\")\\r\\n  |> keep(columns: [\\\"_time\\\", \\\"_value\\\"])\\r\\n  |> map(fn: (r) => ({ \\r\\n    \\\"Cook\\\": r._value,\\r\\n    time: r._time,\\r\\n  }))\\r\\n\",\n        \"typeVersion\": [\n          0,\n          0\n        ]\n      },\n      \"fields\": [\n        {\n          \"config\": {},\n          \"labels\": {},\n          \"name\": \"time\",\n          \"type\": \"time\",\n          \"typeInfo\": {\n            \"frame\": \"time.Time\",\n            \"nullable\": true\n          }\n        },\n        {\n          \"config\": {},\n          \"labels\": {},\n          \"name\": \"Cook\",\n          \"type\": \"string\",\n          \"typeInfo\": {\n            \"frame\": \"string\",\n            \"nullable\": true\n          }\n        }\n      ]\n    },\n    \"data\": {\n      \"values\": [\n        [\n          1697779163986,\n          1697779921045,\n          1697780221094,\n          1697780521111,\n          1697781186192,\n          1697781786291,\n          1697783332361,\n          1697783784395,\n          1697783790397,\n          1697784146478,\n          1697784517471,\n          1697784523487,\n          1697784949480,\n          1697785369505\n        ],\n        [\n          \"Heating to Setpoint (92c)\",\n          \"Stage Time Running (5 mins)\",\n          null,\n          \"Heating to Setpoint (96c)\",\n          \"Stage Time Running (10 mins)\",\n          null,\n          \"Heating to Setpoint (92c)\",\n          \"Stage Time Running (0 mins)\",\n          null,\n          \"Heating to Setpoint (92c)\",\n          \"Stage Time Running (0 mins)\",\n          null,\n          \"CCP in Progress (7 mins)\",\n          null\n        ]\n      ]\n    }\n  },\n  {\n    \"schema\": {\n      \"refId\": \"Shear\",\n      \"meta\": {\n        \"executedQueryString\": \"from(bucket: \\\"data\\\")\\r\\n  |> range(start: 2023-10-20T05:04:00Z, stop: 2023-10-20T07:22:00Z)\\r\\n  |> filter(fn: (r) => r[\\\"_field\\\"] == \\\"FactoryManager_Analogs_DB.A01C02U09.PHS.Shear\\\")\\r\\n  |> keep(columns: [\\\"_time\\\", \\\"_value\\\"])\\r\\n  |> map(fn: (r) => ({ \\r\\n    \\\"Int. Shear\\\": r._value,\\r\\n    time: r._time,\\r\\n  }))\\r\\n\",\n        \"typeVersion\": [\n          0,\n          0\n        ]\n      },\n      \"fields\": [\n        {\n          \"config\": {},\n          \"labels\": {},\n          \"name\": \"time\",\n          \"type\": \"time\",\n          \"typeInfo\": {\n            \"frame\": \"time.Time\",\n            \"nullable\": true\n          }\n        },\n        {\n          \"config\": {},\n          \"labels\": {},\n          \"name\": \"Int. Shear\",\n          \"type\": \"string\",\n          \"typeInfo\": {\n            \"frame\": \"string\",\n            \"nullable\": true\n          }\n        }\n      ]\n    },\n    \"data\": {\n      \"values\": [\n        [\n          1697782100330,\n          1697782832342\n        ],\n        [\n          \"Shearing Active (12 mins)\",\n          null\n        ]\n      ]\n    }\n  },\n  {\n    \"schema\": {\n      \"refId\": \"Recirc\",\n      \"meta\": {\n        \"executedQueryString\": \"from(bucket: \\\"data\\\")\\r\\n  |> range(start: 2023-10-20T05:04:00Z, stop: 2023-10-20T07:22:00Z)\\r\\n  |> filter(fn: (r) => r[\\\"_field\\\"] == \\\"FactoryManager_Analogs_DB.A01C02U09.PHS.Recirc\\\")\\r\\n  |> keep(columns: [\\\"_time\\\", \\\"_value\\\"])\\r\\n  |> map(fn: (r) => ({ \\r\\n    \\\"Ext. Shear\\\": r._value,\\r\\n    time: r._time,\\r\\n  }))\\r\\n\",\n        \"typeVersion\": [\n          0,\n          0\n        ]\n      },\n      \"fields\": []\n    },\n    \"data\": {\n      \"values\": []\n    }\n  },\n  {\n    \"schema\": {\n      \"refId\": \"Transfer\",\n      \"meta\": {\n        \"executedQueryString\": \"from(bucket: \\\"data\\\")\\r\\n  |> range(start: 2023-10-20T05:04:00Z, stop: 2023-10-20T07:22:00Z)\\r\\n  |> filter(fn: (r) => r[\\\"_field\\\"] == \\\"FactoryManager_Analogs_DB.A01C02U09.PHS.Transfer\\\")\\r\\n  |> keep(columns: [\\\"_time\\\", \\\"_value\\\"])\\r\\n  |> map(fn: (r) => ({ \\r\\n    \\\"Transfer\\\": r._value,\\r\\n    time: r._time,\\r\\n  }))\\r\\n\",\n        \"typeVersion\": [\n          0,\n          0\n        ]\n      },\n      \"fields\": [\n        {\n          \"config\": {},\n          \"labels\": {},\n          \"name\": \"time\",\n          \"type\": \"time\",\n          \"typeInfo\": {\n            \"frame\": \"time.Time\",\n            \"nullable\": true\n          }\n        },\n        {\n          \"config\": {},\n          \"labels\": {},\n          \"name\": \"Transfer\",\n          \"type\": \"string\",\n          \"typeInfo\": {\n            \"frame\": \"string\",\n            \"nullable\": true\n          }\n        }\n      ]\n    },\n    \"data\": {\n      \"values\": [\n        [\n          1697785713869,\n          1697785753879,\n          1697785764887,\n          1697785875872,\n          1697786481929\n        ],\n        [\n          \"Pre-Start Drain\",\n          null,\n          \"Build Pressure (0.6 Barg)\",\n          \"Transfer in progress (0.7 Barg)\",\n          \"Wait for pressure dissipation (0.2 Barg)\"\n        ]\n      ]\n    }\n  }\n]",
+          "refId": "A",
+          "scenarioId": "raw_frame"
+        }
+      ],
+      "title": "Reproduced with embedded data",
+      "type": "state-timeline"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 39,
+  "tags": [
+    "gdev",
+    "panel-tests",
+    "graph-ng",
+    "demo"
+  ],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "2023-10-20T05:04:00.000Z",
+    "to": "2023-10-20T07:22:00.000Z"
+  },
+  "timeRangeUpdatedDuringEditOrView": false,
+  "timepicker": {},
+  "timezone": "utc",
+  "title": "Panel Tests - StateTimeline - multiple frames with nulls",
+  "uid": "edf55caay3w8wa",
+  "version": 4,
+  "weekStart": ""
+}
\ No newline at end of file
diff --git a/devenv/dev-dashboards/panel-timeseries/timeseries-bars-high-density.json b/devenv/dev-dashboards/panel-timeseries/timeseries-bars-high-density.json
new file mode 100644
index 0000000000000..49e47870c71aa
--- /dev/null
+++ b/devenv/dev-dashboards/panel-timeseries/timeseries-bars-high-density.json
@@ -0,0 +1,600 @@
+{
+    "annotations": {
+      "list": [
+        {
+          "builtIn": 1,
+          "datasource": {
+            "type": "grafana",
+            "uid": "-- Grafana --"
+          },
+          "enable": true,
+          "hide": true,
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "name": "Annotations & Alerts",
+          "type": "dashboard"
+        }
+      ]
+    },
+    "editable": true,
+    "fiscalYearStartMonth": 0,
+    "graphTooltip": 0,
+    "id": 812,
+    "links": [],
+    "liveNow": false,
+    "panels": [
+      {
+        "datasource": {
+          "type": "grafana-testdata-datasource",
+          "uid": "PD8C576611E62080A"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisBorderShow": false,
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "bars",
+              "fillOpacity": 0,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 10,
+          "w": 12,
+          "x": 0,
+          "y": 0
+        },
+        "id": 1,
+        "maxDataPoints": 500,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "grafana-testdata-datasource",
+              "uid": "PD8C576611E62080A"
+            },
+            "refId": "A",
+            "scenarioId": "random_walk",
+            "seriesCount": 1
+          }
+        ],
+        "title": "Dense (stroke only)",
+        "type": "timeseries"
+      },
+      {
+        "datasource": {
+          "type": "grafana-testdata-datasource",
+          "uid": "PD8C576611E62080A"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisBorderShow": false,
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "bars",
+              "fillOpacity": 0,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 10,
+          "w": 12,
+          "x": 12,
+          "y": 0
+        },
+        "id": 4,
+        "maxDataPoints": 50,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "grafana-testdata-datasource",
+              "uid": "PD8C576611E62080A"
+            },
+            "refId": "A",
+            "scenarioId": "random_walk",
+            "seriesCount": 1
+          }
+        ],
+        "title": "Normal (stroke only)",
+        "type": "timeseries"
+      },
+      {
+        "datasource": {
+          "type": "datasource",
+          "uid": "-- Dashboard --"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisBorderShow": false,
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "bars",
+              "fillOpacity": 60,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 0,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 10,
+          "w": 12,
+          "x": 0,
+          "y": 10
+        },
+        "id": 2,
+        "maxDataPoints": 500,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "datasource",
+              "uid": "-- Dashboard --"
+            },
+            "panelId": 1,
+            "refId": "A"
+          }
+        ],
+        "title": "Dense (fill only)",
+        "type": "timeseries"
+      },
+      {
+        "datasource": {
+          "type": "datasource",
+          "uid": "-- Dashboard --"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisBorderShow": false,
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "bars",
+              "fillOpacity": 60,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 0,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 10,
+          "w": 12,
+          "x": 12,
+          "y": 10
+        },
+        "id": 3,
+        "maxDataPoints": 50,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "datasource",
+              "uid": "-- Dashboard --"
+            },
+            "panelId": 4,
+            "refId": "A"
+          }
+        ],
+        "title": "Normal (fill only)",
+        "type": "timeseries"
+      },
+      {
+        "datasource": {
+          "type": "datasource",
+          "uid": "-- Dashboard --"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisBorderShow": false,
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "bars",
+              "fillOpacity": 20,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 10,
+          "w": 12,
+          "x": 0,
+          "y": 20
+        },
+        "id": 6,
+        "maxDataPoints": 500,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "datasource",
+              "uid": "-- Dashboard --"
+            },
+            "panelId": 1,
+            "refId": "A"
+          }
+        ],
+        "title": "Dense (stroke + fill)",
+        "type": "timeseries"
+      },
+      {
+        "datasource": {
+          "type": "datasource",
+          "uid": "-- Dashboard --"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisBorderShow": false,
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "bars",
+              "fillOpacity": 20,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 10,
+          "w": 12,
+          "x": 12,
+          "y": 20
+        },
+        "id": 5,
+        "maxDataPoints": 50,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "datasource",
+              "uid": "-- Dashboard --"
+            },
+            "panelId": 4,
+            "refId": "A"
+          }
+        ],
+        "title": "Normal (stroke + fill)",
+        "type": "timeseries"
+      }
+    ],
+    "refresh": "",
+    "schemaVersion": 39,
+    "tags": [
+      "gdev",
+      "panel-tests",
+      "graph-ng"
+    ],
+    "templating": {
+      "list": []
+    },
+    "time": {
+      "from": "now-6h",
+      "to": "now"
+    },
+    "timepicker": {},
+    "timezone": "",
+    "title": "Panel Tests - TimeSeries - bars high density (stroke + fill)",
+    "uid": "c295a76e-79d3-43b3-a688-ef0373224158",
+    "version": 3,
+    "weekStart": ""
+  }
\ No newline at end of file
diff --git a/devenv/dev-dashboards/panel-timeseries/timeseries-by-value-color-schemes.json b/devenv/dev-dashboards/panel-timeseries/timeseries-by-value-color-schemes.json
index d785a1fcaffec..1167172539746 100644
--- a/devenv/dev-dashboards/panel-timeseries/timeseries-by-value-color-schemes.json
+++ b/devenv/dev-dashboards/panel-timeseries/timeseries-by-value-color-schemes.json
@@ -516,7 +516,7 @@
           "refId": "A"
         }
       ],
-      "title": "Color line by discrete tresholds",
+      "title": "Color line by discrete thresholds",
       "type": "timeseries"
     },
     {
diff --git a/devenv/dev-dashboards/panel-timeseries/timeseries-nulls.json b/devenv/dev-dashboards/panel-timeseries/timeseries-nulls.json
index eb71cc6ca1cfb..f2ee29ebf5e8d 100644
--- a/devenv/dev-dashboards/panel-timeseries/timeseries-nulls.json
+++ b/devenv/dev-dashboards/panel-timeseries/timeseries-nulls.json
@@ -21,6 +21,7 @@
       }
     ]
   },
+  "description": "",
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
@@ -38,6 +39,295 @@
   ],
   "liveNow": false,
   "panels": [
+    {
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 44,
+      "title": "Enums",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "description": "This visualizes a time series of enumerated values, displaying minimum, maximum, and average values over time to track fluctuations and trends",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Info"
+            },
+            "properties": [
+              {
+                "id": "custom.lineInterpolation",
+                "value": "stepAfter"
+              },
+              {
+                "id": "custom.axisColorMode",
+                "value": "series"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Status"
+            },
+            "properties": [
+              {
+                "id": "custom.lineInterpolation",
+                "value": "stepAfter"
+              },
+              {
+                "id": "custom.axisColorMode",
+                "value": "series"
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 16,
+        "w": 12,
+        "x": 0,
+        "y": 1
+      },
+      "id": 45,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "rawFrameContent": "[\n  {\n    \"schema\": {\n      \"refId\": \"A\",\n      \"name\": \"A\",\n      \"fields\": [\n        {\n          \"name\": \"Time\",\n          \"type\": \"time\",\n          \"typeInfo\": {\n            \"frame\": \"time.Time\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Value\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Min\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Max\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Info\",\n          \"type\": \"string\",\n          \"typeInfo\": {\n            \"frame\": \"string\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Status\",\n          \"type\": \"string\",\n          \"typeInfo\": {\n            \"frame\": \"string\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        }\n      ]\n    },\n    \"data\": {\n      \"values\": [\n        [\n          \"2023-06-14T08:16:41Z\",\n          \"2023-06-14T08:16:50Z\",\n          \"2023-06-14T08:16:55Z\",\n          \"2023-06-14T08:17:15Z\",\n          \"2023-06-14T08:17:46Z\",\n          \"2023-06-14T08:17:59Z\",\n          \"2023-06-14T08:18:20Z\",\n          \"2023-06-14T08:18:25Z\"\n        ],\n        [\n          97.56700088585262,\n          97.51875596242603,\n          97.88367836664669,\n          97.64813860191066,\n          97.46344237059202,\n          97.06932713353162,\n          97.11185691118344,\n          97.4315327939052\n        ],\n        [\n          96.17381933561288,\n          96.86449303671965,\n          95.5851820937877,\n          96.94658694041154,\n          96.7433590164638,\n          96.74913605945137,\n          95.61938577725707,\n          96.24186355022567\n        ],\n        [\n          99.69898997339244,\n          98.68620205532211,\n          99.5800005905314,\n          98.2998754185445,\n          98.02873998081307,\n          99.01798295660049,\n          97.95260164072228,\n          98.24811606848421\n        ],\n        [\n          \"down\",\n          \"down\",\n          \"up\",\n          \"down\",\n          \"down\",\n          \"down\",\n          \"up\",\n          \"up\"\n        ],\n        [\n          \"ON\",\n          \"ON\",\n          \"OFF\",\n          \"ON\",\n          \"OFF\",\n          \"ON\",\n          \"STANDBY\",\n          \"OFF\"\n        ]\n      ]\n    }\n  }\n]",
+          "refId": "A",
+          "scenarioId": "raw_frame"
+        }
+      ],
+      "title": "Time series enums",
+      "transformations": [
+        {
+          "id": "convertFieldType",
+          "options": {
+            "conversions": [
+              {
+                "destinationType": "enum",
+                "enumConfig": {
+                  "text": [
+                    "OFF",
+                    "STANDBY",
+                    "ON"
+                  ]
+                },
+                "targetField": "Status"
+              }
+            ],
+            "fields": {}
+          }
+        }
+      ],
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "fillOpacity": 70,
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineWidth": 0,
+            "spanNulls": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 95
+              },
+              {
+                "color": "#E24D42",
+                "value": 95.5
+              },
+              {
+                "color": "#EF843C",
+                "value": 96
+              },
+              {
+                "color": "#1F78C1",
+                "value": 96.5
+              },
+              {
+                "color": "#BA43A9",
+                "value": 96.75
+              },
+              {
+                "color": "#EAB839",
+                "value": 98
+              },
+              {
+                "color": "#6ED0E0",
+                "value": 99
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 16,
+        "w": 12,
+        "x": 12,
+        "y": 1
+      },
+      "id": 46,
+      "options": {
+        "alignValue": "left",
+        "legend": {
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "mergeValues": true,
+        "rowHeight": 0.9,
+        "showValue": "auto",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "rawFrameContent": "[\n  {\n    \"schema\": {\n      \"refId\": \"A\",\n      \"name\": \"A\",\n      \"fields\": [\n        {\n          \"name\": \"Time\",\n          \"type\": \"time\",\n          \"typeInfo\": {\n            \"frame\": \"time.Time\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Value\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Min\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Max\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Status\",\n          \"type\": \"string\",\n          \"typeInfo\": {\n            \"frame\": \"string\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        }\n      ]\n    },\n    \"data\": {\n      \"values\": [\n        [\n          \"2023-06-14T08:16:41Z\",\n          \"2023-06-14T08:16:50Z\",\n          \"2023-06-14T08:16:55Z\",\n          \"2023-06-14T08:17:15Z\",\n          \"2023-06-14T08:17:46Z\",\n          \"2023-06-14T08:17:59Z\",\n          \"2023-06-14T08:18:20Z\",\n          \"2023-06-14T08:18:25Z\"\n        ],\n        [\n          97.56700088585262,\n          97.51875596242603,\n          97.88367836664669,\n          97.64813860191066,\n          97.46344237059202,\n          97.06932713353162,\n          97.11185691118344,\n          97.4315327939052\n        ],\n        [\n          96.17381933561288,\n          96.86449303671965,\n          95.5851820937877,\n          96.94658694041154,\n          96.7433590164638,\n          96.74913605945137,\n          95.61938577725707,\n          96.24186355022567\n        ],\n        [\n          99.69898997339244,\n          98.68620205532211,\n          99.5800005905314,\n          98.2998754185445,\n          98.02873998081307,\n          99.01798295660049,\n          97.95260164072228,\n          98.24811606848421\n        ],\n        [\n          \"ON\",\n          \"ON\",\n          \"OFF\",\n          \"ON\",\n          \"OFF\",\n          \"ON\",\n          \"STANDBY\",\n          \"OFF\"\n        ]\n      ]\n    }\n  }\n]",
+          "refId": "A",
+          "scenarioId": "raw_frame"
+        }
+      ],
+      "title": "State timeline enums",
+      "transformations": [
+        {
+          "id": "convertFieldType",
+          "options": {
+            "conversions": [
+              {
+                "destinationType": "enum",
+                "enumConfig": {
+                  "text": [
+                    "OFF",
+                    "STANDBY",
+                    "ON"
+                  ]
+                },
+                "targetField": "Status"
+              }
+            ],
+            "fields": {}
+          }
+        }
+      ],
+      "type": "state-timeline"
+    },
+    {
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 17
+      },
+      "id": 43,
+      "title": "Gaps and connected",
+      "type": "row"
+    },
     {
       "datasource": {
         "type": "testdata"
@@ -48,6 +338,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -100,7 +391,7 @@
         "h": 7,
         "w": 7,
         "x": 0,
-        "y": 0
+        "y": 18
       },
       "id": 3,
       "links": [],
@@ -161,6 +452,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -214,7 +506,7 @@
         "h": 7,
         "w": 8,
         "x": 7,
-        "y": 0
+        "y": 18
       },
       "id": 2,
       "links": [],
@@ -283,6 +575,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -336,7 +629,7 @@
         "h": 7,
         "w": 9,
         "x": 15,
-        "y": 0
+        "y": 18
       },
       "id": 6,
       "links": [],
@@ -424,6 +717,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -476,7 +770,7 @@
         "h": 7,
         "w": 7,
         "x": 0,
-        "y": 7
+        "y": 25
       },
       "id": 4,
       "links": [],
@@ -537,6 +831,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -590,7 +885,7 @@
         "h": 7,
         "w": 8,
         "x": 7,
-        "y": 7
+        "y": 25
       },
       "id": 5,
       "links": [],
@@ -659,6 +954,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -712,7 +1008,7 @@
         "h": 7,
         "w": 9,
         "x": 15,
-        "y": 7
+        "y": 25
       },
       "id": 7,
       "links": [],
@@ -800,6 +1096,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -883,7 +1180,7 @@
         "h": 8,
         "w": 7,
         "x": 0,
-        "y": 14
+        "y": 32
       },
       "id": 11,
       "options": {
@@ -948,6 +1245,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1031,7 +1329,7 @@
         "h": 8,
         "w": 7,
         "x": 7,
-        "y": 14
+        "y": 32
       },
       "id": 9,
       "options": {
@@ -1097,6 +1395,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1151,7 +1450,7 @@
         "h": 8,
         "w": 5,
         "x": 14,
-        "y": 14
+        "y": 32
       },
       "id": 15,
       "options": {
@@ -1187,6 +1486,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1241,7 +1541,7 @@
         "h": 8,
         "w": 5,
         "x": 19,
-        "y": 14
+        "y": 32
       },
       "id": 16,
       "options": {
@@ -1281,6 +1581,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1332,7 +1633,7 @@
         "h": 11,
         "w": 24,
         "x": 0,
-        "y": 22
+        "y": 40
       },
       "id": 18,
       "maxDataPoints": 150,
@@ -1373,6 +1674,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1424,7 +1726,7 @@
         "h": 10,
         "w": 12,
         "x": 0,
-        "y": 33
+        "y": 51
       },
       "id": 20,
       "maxDataPoints": 150,
@@ -1465,6 +1767,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1516,7 +1819,7 @@
         "h": 10,
         "w": 12,
         "x": 12,
-        "y": 33
+        "y": 51
       },
       "id": 22,
       "maxDataPoints": 150,
@@ -1557,6 +1860,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1608,7 +1912,7 @@
         "h": 10,
         "w": 8,
         "x": 0,
-        "y": 43
+        "y": 61
       },
       "id": 24,
       "maxDataPoints": 150,
@@ -1649,6 +1953,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1700,7 +2005,7 @@
         "h": 10,
         "w": 8,
         "x": 8,
-        "y": 43
+        "y": 61
       },
       "id": 26,
       "maxDataPoints": 150,
@@ -1741,6 +2046,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1792,7 +2098,7 @@
         "h": 10,
         "w": 8,
         "x": 16,
-        "y": 43
+        "y": 61
       },
       "id": 28,
       "maxDataPoints": 150,
@@ -1828,7 +2134,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 53
+        "y": 71
       },
       "id": 34,
       "panels": [],
@@ -1837,7 +2143,7 @@
     },
     {
       "datasource": {
-        "type": "testdata",
+        "type": "grafana-testdata-datasource",
         "uid": "PD8C576611E62080A"
       },
       "fieldConfig": {
@@ -1846,6 +2152,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1898,7 +2205,7 @@
         "h": 6,
         "w": 7,
         "x": 0,
-        "y": 54
+        "y": 72
       },
       "id": 32,
       "options": {
@@ -1940,6 +2247,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1992,7 +2300,7 @@
         "h": 6,
         "w": 7,
         "x": 7,
-        "y": 54
+        "y": 72
       },
       "id": 35,
       "options": {
@@ -2078,7 +2386,7 @@
         "h": 6,
         "w": 10,
         "x": 14,
-        "y": 54
+        "y": 72
       },
       "id": 39,
       "options": {
@@ -2123,6 +2431,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -2175,7 +2484,7 @@
         "h": 6,
         "w": 7,
         "x": 0,
-        "y": 60
+        "y": 78
       },
       "id": 31,
       "options": {
@@ -2215,6 +2524,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -2267,7 +2577,7 @@
         "h": 6,
         "w": 7,
         "x": 7,
-        "y": 60
+        "y": 78
       },
       "id": 36,
       "options": {
@@ -2351,7 +2661,7 @@
         "h": 6,
         "w": 10,
         "x": 14,
-        "y": 60
+        "y": 78
       },
       "id": 40,
       "options": {
@@ -2394,6 +2704,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -2446,7 +2757,7 @@
         "h": 6,
         "w": 7,
         "x": 0,
-        "y": 66
+        "y": 84
       },
       "id": 30,
       "options": {
@@ -2486,6 +2797,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -2538,7 +2850,7 @@
         "h": 6,
         "w": 7,
         "x": 7,
-        "y": 66
+        "y": 84
       },
       "id": 37,
       "options": {
@@ -2622,7 +2934,7 @@
         "h": 6,
         "w": 10,
         "x": 14,
-        "y": 66
+        "y": 84
       },
       "id": 41,
       "options": {
@@ -2665,6 +2977,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -2717,7 +3030,7 @@
         "h": 6,
         "w": 7,
         "x": 0,
-        "y": 72
+        "y": 90
       },
       "id": 29,
       "options": {
@@ -2757,6 +3070,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -2809,7 +3123,7 @@
         "h": 6,
         "w": 7,
         "x": 7,
-        "y": 72
+        "y": 90
       },
       "id": 38,
       "options": {
@@ -2893,7 +3207,7 @@
         "h": 6,
         "w": 10,
         "x": 14,
-        "y": 72
+        "y": 90
       },
       "id": 42,
       "options": {
@@ -2926,15 +3240,16 @@
       "type": "state-timeline"
     }
   ],
-  "refresh": "",
-  "schemaVersion": 38,
+  "refresh": false,
+  "schemaVersion": 39,
   "tags": [
     "gdev",
     "panel-tests",
     "graph-ng",
     "timeseries",
     "trend",
-    "state-timeline"
+    "state-timeline",
+    "transform"
   ],
   "templating": {
     "list": []
@@ -2945,8 +3260,8 @@
   },
   "timepicker": {},
   "timezone": "",
-  "title": "Panel Tests - Graph NG - Gaps and Connected",
+  "title": "Panel Tests - Graph NG - Discrete panels",
   "uid": "8mmCAF1Mz",
-  "version": 5,
+  "version": 25,
   "weekStart": ""
 }
\ No newline at end of file
diff --git a/devenv/dev-dashboards/panel-xychart/xychart-example.json b/devenv/dev-dashboards/panel-xychart/xychart-example.json
new file mode 100644
index 0000000000000..61d9761864bcd
--- /dev/null
+++ b/devenv/dev-dashboards/panel-xychart/xychart-example.json
@@ -0,0 +1,1855 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "red",
+            "mode": "fixed"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 1,
+            "pointSize": {
+              "fixed": 5
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "show": "points+lines"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 20,
+        "w": 6,
+        "x": 0,
+        "y": 0
+      },
+      "id": 2,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "series": [],
+        "seriesMapping": "auto",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "csvContent": "X,Y\n725.1,435.6\n734.1,497.2\n714.3,527.7\n683.5,548.7\n601.8,594.0\n598.5,621.7\n573.9,644.7\n525.7,695.7\n477.2,732.8\n411.8,755.3\n353.6,758.3\n422.6,736.5\n455.3,724.1\n479.2,699.2\n474.0,673.8\n434.5,662.1\n362.2,679.8\n311.2,698.8\n260.1,728.9\n213.4,771.1\n176.2,818.0\n211.2,742.6\n253.9,707.9\n309.9,668.8\n374.7,643.2\n322.8,629.9\n277.1,607.1\n237.0,616.8\n188.9,613.9\n143.0,594.1\n101.8,566.4\n178.1,590.2\n222.2,575.9\n187.9,549.1\n161.5,517.5\n128.6,506.8\n97.3,488.3\n62.4,436.0\n99.6,473.8\n138.3,477.0\n125.0,396.7\n95.6,359.2\n83.6,322.1\n81.0,289.7\n104.0,343.8\n129.3,358.4\n151.2,291.1\n124.0,242.6\n126.3,170.2\n133.7,212.8\n148.4,243.3\n167.9,262.7\n209.1,205.7\n230.1,150.3\n231.4,120.1\n316.0,120.1\n400.6,120.1\n485.2,120.1\n569.8,120.1\n569.3,166.4\n553.0,205.5\n489.2,265.7\n422.2,309.1\n353.7,343.1\n328.2,386.3\n321.6,432.6\n334.1,473.1\n357.6,500.3\n389.9,508.5\n418.8,479.9\n447.9,413.3\n480.0,379.0\n521.6,354.2\n583.9,351.6\n549.7,357.7\n571.6,376.0\n517.1,380.8\n550.3,393.2\n504.3,402.3\n489.5,425.8\n527.5,425.8\n472.7,457.2\n447.1,523.8\n538.6,435.7\n598.4,403.7\n697.8,349.1\n645.3,390.4\n712.3,373.8\n586.0,424.1\n526.9,463.3\n469.5,538.0\n540.6,477.5\n531.2,528.4\n598.6,460.1\n594.5,509.0\n651.2,460.1\n649.9,502.6\n699.4,446.1\n707.6,477.1\n722.0,442.9",
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "CNC/Routing \"Etch-A-Sketch\"",
+      "type": "xychart"
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "red",
+            "mode": "fixed"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 1,
+            "pointSize": {
+              "fixed": 5
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "show": "points"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Weight Male"
+            },
+            "properties": [
+              {
+                "id": "custom.axisLabel",
+                "value": "Weight"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Height Male"
+            },
+            "properties": [
+              {
+                "id": "custom.axisLabel",
+                "value": "Height"
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 20,
+        "w": 6,
+        "x": 6,
+        "y": 0
+      },
+      "id": 4,
+      "options": {
+        "dims": {
+          "exclude": [],
+          "frame": 0,
+          "x": "A-series"
+        },
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "series": [
+          {
+            "name": "Male",
+            "pointColor": {
+              "fixed": "#5795f2"
+            },
+            "pointSize": {
+              "fixed": 5,
+              "max": 20,
+              "min": 1
+            },
+            "x": "Height Male",
+            "y": "Weight Male"
+          },
+          {
+            "name": "Female",
+            "pointColor": {
+              "fixed": "#ff9830"
+            },
+            "pointSize": {
+              "fixed": 5,
+              "max": 20,
+              "min": 1
+            },
+            "x": "Height Female",
+            "y": "Weight Female"
+          }
+        ],
+        "seriesMapping": "manual",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "csvFileName": "weight_height.csv",
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_file"
+        }
+      ],
+      "title": "Height vs Weight Samples",
+      "transformations": [
+        {
+          "id": "partitionByValues",
+          "options": {
+            "fields": [
+              "Gender"
+            ]
+          }
+        }
+      ],
+      "type": "xychart"
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "red",
+            "mode": "fixed"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 1,
+            "pointSize": {
+              "fixed": 5
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "show": "lines"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "x^2"
+            },
+            "properties": [
+              {
+                "id": "custom.lineStyle",
+                "value": {
+                  "dash": [
+                    10,
+                    15
+                  ],
+                  "fill": "dash"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "cos(x)"
+            },
+            "properties": [
+              {
+                "id": "custom.axisLabel",
+                "value": "y"
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 17,
+        "w": 9,
+        "x": 12,
+        "y": 0
+      },
+      "id": 3,
+      "options": {
+        "dims": {
+          "frame": 0
+        },
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "series": [
+          {
+            "name": "cos(x)",
+            "pointColor": {
+              "fixed": "green"
+            },
+            "pointSize": {
+              "fixed": 5,
+              "max": 20,
+              "min": 1
+            },
+            "x": "x",
+            "y": "cos(x)"
+          },
+          {
+            "name": "x^2",
+            "pointColor": {
+              "fixed": "orange"
+            },
+            "pointSize": {
+              "fixed": 5,
+              "max": 20,
+              "min": 1
+            },
+            "x": "x2",
+            "y": "x^2"
+          },
+          {
+            "name": "sqrt(x)",
+            "pointColor": {
+              "fixed": "blue"
+            },
+            "pointSize": {
+              "fixed": 5,
+              "max": 20,
+              "min": 1
+            },
+            "x": "x3",
+            "y": "sqrt(x)"
+          },
+          {
+            "name": "-sqrt(x)",
+            "pointColor": {
+              "fixed": "purple"
+            },
+            "pointSize": {
+              "fixed": 5,
+              "max": 20,
+              "min": 1
+            },
+            "x": "x4",
+            "y": "-sqrt(x)"
+          }
+        ],
+        "seriesMapping": "manual",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "alias": "",
+          "csvContent": "x,cos(x)\n-7.5,3.4663531783502584\n-7.45,3.9308257356494076\n-7.4,4.385473275743903\n-7.35,4.829159416559378\n-7.3,5.260775173811053\n-7.25,5.679241732886949\n-7.2,6.083513145322545\n-7.15,6.472578943127236\n-7.1,6.845466664428066\n-7.05,7.201244284117942\n-7,7.539022543433046\n-6.95,7.857957172636611\n-6.9,8.157251001253568\n-6.85,8.436155950581597\n-6.8,8.693974903498253\n-6.75,8.930063446890767\n-6.7,9.143831482353194\n-6.65,9.334744701125118\n-6.6,9.502325919585296\n-6.55,9.64615627196218\n-6.5,9.765876257280235\n-6.45,9.861186637925126\n-6.4,9.931849187581927\n-6.35,9.97768728667684\n-6.3,9.998586363834152\n-6.25,9.994494182244994\n-6.2,9.965420970232175\n-6.15,9.91143939568469\n-6.1,9.832684384425844\n-6.05,9.729352782968974\n-6,9.601702866503661\n-5.95,9.450053693342275\n-5.9,9.27478430744036\n-5.85,9.076332790984132\n-5.8,8.85519516941319\n-5.75,8.611924171615208\n-5.7,8.347127848391597\n-5.65,8.061468052647157\n-5.6,7.755658785102496\n-5.55,7.430464409664099\n-5.5,7.0866977429126\n-5.45,6.725218022484659\n-5.4,6.346928759426347\n-5.35,5.952775479886061\n-5.3,5.543743361791607\n-5.25,5.120854772418407\n-5.2,4.685166713003771\n-5.15,4.237768176794282\n-5.1,3.7797774271298024\n-5.05,3.3123392023675367\n-5,2.8366218546322624\n-4.95,2.353814429544512\n-4.9,1.8651236942257576\n-4.85,1.371771121009073\n-4.8,0.874989834394464\n-4.75,0.37602152887976553\n-4.7,-0.1238866346289056\n-4.65,-0.6234851460699166\n-4.6,-1.1215252693505486\n-4.55,-1.616762163536865\n-4.5,-2.107957994307797\n-4.45,-2.593885027896261\n-4.4,-3.0733286997841933\n-4.35,-3.5450906504813195\n-4.3,-4.007991720799755\n-4.25,-4.460874899137928\n-4.2,-4.902608213406994\n-4.15,-5.332087560371543\n-4.1,-5.748239465332691\n-4.05,-6.150023765255744\n-4,-6.536436208636119\n-3.95,-6.906510965605075\n-3.9,-7.259323042001402\n-3.85,-7.593990591375079\n-3.8,-7.909677119144169\n-3.75,-8.205593573395607\n-3.7,-8.48100031710408\n-3.65,-8.73520897683938\n-3.6,-8.96758416334147\n-3.55,-9.177545059662759\n-3.5,-9.364566872907963\n-3.45,-9.528182145943047\n-3.4,-9.66798192579461\n-3.35,-9.78361678581934\n-3.3,-9.87479769908865\n-3.25,-9.941296760805463\n-3.2,-9.982947757947532\n-3.15,-9.99964658471342\n-3.1,-9.991351502732794\n-3.05,-9.958083245390611\n-3,-9.899924966004454\n-2.95,-9.81702202998454\n-2.9,-9.709581651495906\n-2.85,-9.577872375530903\n-2.8,-9.42222340668658\n-2.75,-9.243023786324635\n-2.7,-9.040721420170613\n-2.65,-8.815821958782859\n-2.6,-8.568887533689473\n-2.55,-8.30053535235222\n-2.5,-8.011436155469337\n-2.45,-7.702312540473074\n-2.4,-7.373937155412454\n-2.35,-7.027130767735539\n-2.3,-6.66276021279824\n-2.25,-6.281736227227391\n-2.2,-5.885011172553458\n-2.15,-5.473576654802709\n-2.1,-5.048461045998575\n-2.05,-4.610726913767127\n-2,-4.161468365471424\n-1.95,-3.7018083135128688\n-1.9,-3.2328956686350336\n-1.85,-2.7559024682451296\n-1.8,-2.272020946930871\n-1.75,-1.7824605564949207\n-1.7,-1.2884449429552465\n-1.65,-0.7912088880673386\n-1.6,-0.29199522301288816\n-1.55,0.20794827803092428\n-1.5,0.7073720166770291\n-1.45,1.2050276936736661\n-1.4,1.6996714290024104\n-1.35,2.1900668709304147\n-1.3,2.6749882862458736\n-1.25,3.1532236239526865\n-1.2,3.623577544766736\n-1.15,4.084874408841574\n-1.1,4.5359612142557735\n-1.05,4.97571047891727\n-1,5.403023058681398\n-0.95,5.8168308946388345\n-0.9,6.216099682706644\n-0.85,6.599831458849822\n-0.8,6.967067093471654\n-0.75,7.316888688738209\n-0.7,7.648421872844885\n-0.65,7.960837985490558\n-0.6,8.253356149096783\n-0.55,8.525245220595057\n-0.5,8.775825618903728\n-0.45,9.004471023526769\n-0.4,9.210609940028851\n-0.35,9.393727128473788\n-0.3,9.55336489125606\n-0.25,9.689124217106448\n-0.2,9.800665778412416\n-0.15,9.887710779360422\n-0.1,9.950041652780257\n-0.05,9.987502603949663\n0,10\n0.05,9.987502603949663\n0.1,9.950041652780257\n0.15,9.887710779360422\n0.2,9.800665778412416\n0.25,9.689124217106448\n0.3,9.55336489125606\n0.35,9.393727128473788\n0.4,9.210609940028851\n0.45,9.004471023526769\n0.5,8.775825618903728\n0.55,8.525245220595057\n0.6,8.253356149096783\n0.65,7.960837985490558\n0.7,7.648421872844885\n0.75,7.316888688738209\n0.8,6.967067093471654\n0.85,6.599831458849822\n0.9,6.216099682706644\n0.95,5.8168308946388345\n1,5.403023058681398\n1.05,4.97571047891727\n1.1,4.5359612142557735\n1.15,4.084874408841574\n1.2,3.623577544766736\n1.25,3.1532236239526865\n1.3,2.6749882862458736\n1.35,2.1900668709304147\n1.4,1.6996714290024104\n1.45,1.2050276936736661\n1.5,0.7073720166770291\n1.55,0.20794827803092428\n1.6,-0.29199522301288816\n1.65,-0.7912088880673386\n1.7,-1.2884449429552465\n1.75,-1.7824605564949207\n1.8,-2.272020946930871\n1.85,-2.7559024682451296\n1.9,-3.2328956686350336\n1.95,-3.7018083135128688\n2,-4.161468365471424\n2.05,-4.610726913767127\n2.1,-5.048461045998575\n2.15,-5.473576654802709\n2.2,-5.885011172553458\n2.25,-6.281736227227391\n2.3,-6.66276021279824\n2.35,-7.027130767735539\n2.4,-7.373937155412454\n2.45,-7.702312540473074\n2.5,-8.011436155469337\n2.55,-8.30053535235222\n2.6,-8.568887533689473\n2.65,-8.815821958782859\n2.7,-9.040721420170613\n2.75,-9.243023786324635\n2.8,-9.42222340668658\n2.85,-9.577872375530903\n2.9,-9.709581651495906\n2.95,-9.81702202998454\n3,-9.899924966004454\n3.05,-9.958083245390611\n3.1,-9.991351502732794\n3.15,-9.99964658471342\n3.2,-9.982947757947532\n3.25,-9.941296760805463\n3.3,-9.87479769908865\n3.35,-9.78361678581934\n3.4,-9.66798192579461\n3.45,-9.528182145943047\n3.5,-9.364566872907963\n3.55,-9.177545059662759\n3.6,-8.96758416334147\n3.65,-8.73520897683938\n3.7,-8.48100031710408\n3.75,-8.205593573395607\n3.8,-7.909677119144169\n3.85,-7.593990591375079\n3.9,-7.259323042001402\n3.95,-6.906510965605075\n4,-6.536436208636119\n4.05,-6.150023765255744\n4.1,-5.748239465332691\n4.15,-5.332087560371543\n4.2,-4.902608213406994\n4.25,-4.460874899137928\n4.3,-4.007991720799755\n4.35,-3.5450906504813195\n4.4,-3.0733286997841933\n4.45,-2.593885027896261\n4.5,-2.107957994307797\n4.55,-1.616762163536865\n4.6,-1.1215252693505486\n4.65,-0.6234851460699166\n4.7,-0.1238866346289056\n4.75,0.37602152887976553\n4.8,0.874989834394464\n4.85,1.371771121009073\n4.9,1.8651236942257576\n4.95,2.353814429544512\n5,2.8366218546322624\n5.05,3.3123392023675367\n5.1,3.7797774271298024\n5.15,4.237768176794282\n5.2,4.685166713003771\n5.25,5.120854772418407\n5.3,5.543743361791607\n5.35,5.952775479886061\n5.4,6.346928759426347\n5.45,6.725218022484659\n5.5,7.0866977429126\n5.55,7.430464409664099\n5.6,7.755658785102496\n5.65,8.061468052647157\n5.7,8.347127848391597\n5.75,8.611924171615208\n5.8,8.85519516941319\n5.85,9.076332790984132\n5.9,9.27478430744036\n5.95,9.450053693342275\n6,9.601702866503661\n6.05,9.729352782968974\n6.1,9.832684384425844\n6.15,9.91143939568469\n6.2,9.965420970232175\n6.25,9.994494182244994\n6.3,9.998586363834152\n6.35,9.97768728667684\n6.4,9.931849187581927\n6.45,9.861186637925126\n6.5,9.765876257280235\n6.55,9.64615627196218\n6.6,9.502325919585296\n6.65,9.334744701125118\n6.7,9.143831482353194\n6.75,8.930063446890767\n6.8,8.693974903498253\n6.85,8.436155950581597\n6.9,8.157251001253568\n6.95,7.857957172636611\n7,7.539022543433046\n7.05,7.201244284117942\n7.1,6.845466664428066\n7.15,6.472578943127236\n7.2,6.083513145322545\n7.25,5.679241732886949\n7.3,5.260775173811053\n7.35,4.829159416559378\n7.4,4.385473275743903\n7.45,3.9308257356494076",
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        },
+        {
+          "csvContent": "x2,x^2\n-7.5,56.25\n-7.45,55.502500000000005\n-7.4,54.760000000000005\n-7.35,54.022499999999994\n-7.3,53.29\n-7.25,52.5625\n-7.2,51.84\n-7.15,51.1225\n-7.1,50.41\n-7.05,49.7025\n-7,49\n-6.95,48.3025\n-6.9,47.61000000000001\n-6.85,46.92249999999999\n-6.8,46.239999999999995\n-6.75,45.5625\n-6.7,44.89\n-6.65,44.222500000000004\n-6.6,43.559999999999995\n-6.55,42.902499999999996\n-6.5,42.25\n-6.45,41.6025\n-6.4,40.96000000000001\n-6.35,40.3225\n-6.3,39.69\n-6.25,39.0625\n-6.2,38.440000000000005\n-6.15,37.822500000000005\n-6.1,37.209999999999994\n-6.05,36.6025\n-6,36\n-5.95,35.4025\n-5.9,34.81\n-5.85,34.2225\n-5.8,33.64\n-5.75,33.0625\n-5.7,32.49\n-5.65,31.922500000000003\n-5.6,31.359999999999996\n-5.55,30.8025\n-5.5,30.25\n-5.45,29.7025\n-5.4,29.160000000000004\n-5.35,28.622499999999995\n-5.3,28.09\n-5.25,27.5625\n-5.2,27.040000000000003\n-5.15,26.522500000000004\n-5.1,26.009999999999998\n-5.05,25.502499999999998\n-5,25\n-4.95,24.5025\n-4.9,24.010000000000005\n-4.85,23.522499999999997\n-4.8,23.04\n-4.75,22.5625\n-4.7,22.090000000000003\n-4.65,21.622500000000002\n-4.6,21.159999999999997\n-4.55,20.702499999999997\n-4.5,20.25\n-4.45,19.802500000000002\n-4.4,19.360000000000003\n-4.35,18.922499999999996\n-4.3,18.49\n-4.25,18.0625\n-4.2,17.64\n-4.15,17.222500000000004\n-4.1,16.81\n-4.05,16.4025\n-4,16\n-3.95,15.602500000000001\n-3.9,15.209999999999999\n-3.85,14.822500000000002\n-3.8,14.44\n-3.75,14.0625\n-3.7,13.690000000000001\n-3.65,13.3225\n-3.6,12.96\n-3.55,12.6025\n-3.5,12.25\n-3.45,11.902500000000002\n-3.4,11.559999999999999\n-3.35,11.2225\n-3.3,10.889999999999999\n-3.25,10.5625\n-3.2,10.240000000000002\n-3.15,9.9225\n-3.1,9.610000000000001\n-3.05,9.302499999999998\n-3,9\n-2.95,8.7025\n-2.9,8.41\n-2.85,8.1225\n-2.8,7.839999999999999\n-2.75,7.5625\n-2.7,7.290000000000001\n-2.65,7.0225\n-2.6,6.760000000000001\n-2.55,6.5024999999999995\n-2.5,6.25\n-2.45,6.002500000000001\n-2.4,5.76\n-2.35,5.522500000000001\n-2.3,5.289999999999999\n-2.25,5.0625\n-2.2,4.840000000000001\n-2.15,4.6225\n-2.1,4.41\n-2.05,4.2025\n-2,4\n-1.95,3.8024999999999998\n-1.9,3.61\n-1.85,3.4225000000000003\n-1.8,3.24\n-1.75,3.0625\n-1.7,2.8899999999999997\n-1.65,2.7224999999999997\n-1.6,2.5600000000000005\n-1.55,2.4025000000000003\n-1.5,2.25\n-1.45,2.1025\n-1.4,1.9599999999999997\n-1.35,1.8225000000000002\n-1.3,1.6900000000000002\n-1.25,1.5625\n-1.2,1.44\n-1.15,1.3224999999999998\n-1.1,1.2100000000000002\n-1.05,1.1025\n-1,1\n-0.95,0.9025\n-0.9,0.81\n-0.85,0.7224999999999999\n-0.8,0.6400000000000001\n-0.75,0.5625\n-0.7,0.48999999999999994\n-0.65,0.42250000000000004\n-0.6,0.36\n-0.55,0.30250000000000005\n-0.5,0.25\n-0.45,0.2025\n-0.4,0.16000000000000003\n-0.35,0.12249999999999998\n-0.3,0.09\n-0.25,0.0625\n-0.2,0.04000000000000001\n-0.15,0.0225\n-0.1,0.010000000000000002\n-0.05,0.0025000000000000005\n0,0\n0.05,0.0025000000000000005\n0.1,0.010000000000000002\n0.15,0.0225\n0.2,0.04000000000000001\n0.25,0.0625\n0.3,0.09\n0.35,0.12249999999999998\n0.4,0.16000000000000003\n0.45,0.2025\n0.5,0.25\n0.55,0.30250000000000005\n0.6,0.36\n0.65,0.42250000000000004\n0.7,0.48999999999999994\n0.75,0.5625\n0.8,0.6400000000000001\n0.85,0.7224999999999999\n0.9,0.81\n0.95,0.9025\n1,1\n1.05,1.1025\n1.1,1.2100000000000002\n1.15,1.3224999999999998\n1.2,1.44\n1.25,1.5625\n1.3,1.6900000000000002\n1.35,1.8225000000000002\n1.4,1.9599999999999997\n1.45,2.1025\n1.5,2.25\n1.55,2.4025000000000003\n1.6,2.5600000000000005\n1.65,2.7224999999999997\n1.7,2.8899999999999997\n1.75,3.0625\n1.8,3.24\n1.85,3.4225000000000003\n1.9,3.61\n1.95,3.8024999999999998\n2,4\n2.05,4.2025\n2.1,4.41\n2.15,4.6225\n2.2,4.840000000000001\n2.25,5.0625\n2.3,5.289999999999999\n2.35,5.522500000000001\n2.4,5.76\n2.45,6.002500000000001\n2.5,6.25\n2.55,6.5024999999999995\n2.6,6.760000000000001\n2.65,7.0225\n2.7,7.290000000000001\n2.75,7.5625\n2.8,7.839999999999999\n2.85,8.1225\n2.9,8.41\n2.95,8.7025\n3,9\n3.05,9.302499999999998\n3.1,9.610000000000001\n3.15,9.9225\n3.2,10.240000000000002\n3.25,10.5625\n3.3,10.889999999999999\n3.35,11.2225\n3.4,11.559999999999999\n3.45,11.902500000000002\n3.5,12.25\n3.55,12.6025\n3.6,12.96\n3.65,13.3225\n3.7,13.690000000000001\n3.75,14.0625\n3.8,14.44\n3.85,14.822500000000002\n3.9,15.209999999999999\n3.95,15.602500000000001\n4,16\n4.05,16.4025\n4.1,16.81\n4.15,17.222500000000004\n4.2,17.64\n4.25,18.0625\n4.3,18.49\n4.35,18.922499999999996\n4.4,19.360000000000003\n4.45,19.802500000000002\n4.5,20.25\n4.55,20.702499999999997\n4.6,21.159999999999997\n4.65,21.622500000000002\n4.7,22.090000000000003\n4.75,22.5625\n4.8,23.04\n4.85,23.522499999999997\n4.9,24.010000000000005\n4.95,24.5025\n5,25\n5.05,25.502499999999998\n5.1,26.009999999999998\n5.15,26.522500000000004\n5.2,27.040000000000003\n5.25,27.5625\n5.3,28.09\n5.35,28.622499999999995\n5.4,29.160000000000004\n5.45,29.7025\n5.5,30.25\n5.55,30.8025\n5.6,31.359999999999996\n5.65,31.922500000000003\n5.7,32.49\n5.75,33.0625\n5.8,33.64\n5.85,34.2225\n5.9,34.81\n5.95,35.4025\n6,36\n6.05,36.6025\n6.1,37.209999999999994\n6.15,37.822500000000005\n6.2,38.440000000000005\n6.25,39.0625\n6.3,39.69\n6.35,40.3225\n6.4,40.96000000000001\n6.45,41.6025\n6.5,42.25\n6.55,42.902499999999996\n6.6,43.559999999999995\n6.65,44.222500000000004\n6.7,44.89\n6.75,45.5625\n6.8,46.239999999999995\n6.85,46.92249999999999\n6.9,47.61000000000001\n6.95,48.3025\n7,49\n7.05,49.7025\n7.1,50.41\n7.15,51.1225\n7.2,51.84\n7.25,52.5625\n7.3,53.29\n7.35,54.022499999999994\n7.4,54.760000000000005\n7.45,55.502500000000005",
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "B",
+          "scenarioId": "csv_content"
+        },
+        {
+          "csvContent": "x3,sqrt(x)\n0,0\n0.05,2.23606797749979\n0.1,3.1622776601683795\n0.15,3.872983346207417\n0.2,4.47213595499958\n0.25,5\n0.3,5.47722557505166\n0.35,5.916079783099616\n0.4,6.324555320336759\n0.45,6.708203932499369\n0.5,7.0710678118654755\n0.55,7.416198487095663\n0.6,7.745966692414834\n0.65,8.062257748298551\n0.7,8.366600265340756\n0.75,8.660254037844386\n0.8,8.94427190999916\n0.85,9.219544457292887\n0.9,9.486832980505138\n0.95,9.746794344808963\n1,10\n1.05,10.2469507659596\n1.1,10.488088481701517\n1.15,10.723805294763608\n1.2,10.95445115010332\n1.25,11.180339887498949\n1.3,11.401754250991381\n1.35,11.618950038622252\n1.4,11.832159566199232\n1.45,12.041594578792296\n1.5,12.24744871391589\n1.55,12.449899597988733\n1.6,12.649110640673518\n1.65,12.84523257866513\n1.7,13.038404810405297\n1.75,13.228756555322953\n1.8,13.416407864998739\n1.85,13.601470508735442\n1.9,13.784048752090222\n1.95,13.96424004376894\n2,14.142135623730951\n2.05,14.317821063276352\n2.1,14.49137674618944\n2.15,14.66287829861518\n2.2,14.832396974191326\n2.25,15\n2.3,15.1657508881031\n2.35,15.329709716755893\n2.4,15.491933384829668\n2.45,15.652475842498529\n2.5,15.811388300841898\n2.55,15.968719422671311\n2.6,16.124515496597102\n2.65,16.278820596099706\n2.7,16.431676725154986\n2.75,16.583123951776997\n2.8,16.73320053068151\n2.85,16.881943016134134\n2.9,17.0293863659264\n2.95,17.175564037317667\n3,17.32050807568877\n3.05,17.46424919657298\n3.1,17.60681686165901\n3.15,17.74823934929885\n3.2,17.88854381999832\n3.25,18.027756377319946\n3.3,18.16590212458495\n3.35,18.303005217723125\n3.4,18.439088914585774\n3.45,18.57417562100671\n3.5,18.708286933869708\n3.55,18.84144368141677\n3.6,18.973665961010276\n3.65,19.1049731745428\n3.7,19.235384061671347\n3.75,19.364916731037084\n3.8,19.493588689617926\n3.85,19.621416870348586\n3.9,19.748417658131498\n3.95,19.87460691435179\n4,20\n4.05,20.124611797498105\n4.1,20.248456731316583\n4.15,20.37154878746336\n4.2,20.4939015319192\n4.25,20.615528128088304\n4.3,20.73644135332772\n4.35,20.85665361461421\n4.4,20.976176963403034\n4.45,21.095023109728984\n4.5,21.213203435596423\n4.55,21.330729007701542\n4.6,21.447610589527216\n4.65,21.563858652847827\n4.7,21.6794833886788\n4.75,21.79449471770337\n4.8,21.90890230020664\n4.85,22.022715545545243\n4.9,22.135943621178654\n4.95,22.24859546128699\n5,22.360679774997898\n5.05,22.47220505424423\n5.1,22.58317958127243\n5.15,22.693611435820436\n5.2,22.803508501982762\n5.25,22.9128784747792\n5.3,23.021728866442675\n5.35,23.130067012440755\n5.4,23.237900077244504\n5.45,23.345235059857504\n5.5,23.45207879911715\n5.55,23.55843797877949\n5.6,23.664319132398465\n5.65,23.769728648009426\n5.7,23.874672772626646\n5.75,23.979157616563597\n5.8,24.08318915758459\n5.85,24.186773244895647\n5.9,24.289915602982237\n5.95,24.392621835300936\n6,24.49489742783178\n6.05,24.596747752497684\n6.1,24.698178070456937\n6.15,24.79919353527449\n6.2,24.899799195977465\n6.25,25\n6.3,25.099800796022265\n6.35,25.199206336708304\n6.4,25.298221281347036\n6.45,25.39685019840059\n6.5,25.495097567963924\n6.55,25.592967784139454\n6.6,25.69046515733026\n6.65,25.787593916455258\n6.7,25.88435821108957\n6.75,25.98076211353316\n6.8,26.076809620810593\n6.85,26.1725046566048\n6.9,26.267851073127396\n6.95,26.362852652928133\n7,26.457513110645905\n7.05,26.551836094703507\n7.1,26.645825188948457\n7.15,26.739483914241873\n7.2,26.832815729997478\n7.25,26.92582403567252\n7.3,27.018512172212592\n7.35,27.11088342345192\n7.4,27.202941017470884\n7.45,27.294688127912362",
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "C",
+          "scenarioId": "csv_content"
+        },
+        {
+          "csvContent": "x4,-sqrt(x)\n0,0\n0.05,-2.23606797749979\n0.1,-3.1622776601683795\n0.15,-3.872983346207417\n0.2,-4.47213595499958\n0.25,-5\n0.3,-5.47722557505166\n0.35,-5.916079783099616\n0.4,-6.324555320336759\n0.45,-6.708203932499369\n0.5,-7.0710678118654755\n0.55,-7.416198487095663\n0.6,-7.745966692414834\n0.65,-8.062257748298551\n0.7,-8.366600265340756\n0.75,-8.660254037844386\n0.8,-8.94427190999916\n0.85,-9.219544457292887\n0.9,-9.486832980505138\n0.95,-9.746794344808963\n1,-10\n1.05,-10.2469507659596\n1.1,-10.488088481701517\n1.15,-10.723805294763608\n1.2,-10.95445115010332\n1.25,-11.180339887498949\n1.3,-11.401754250991381\n1.35,-11.618950038622252\n1.4,-11.832159566199232\n1.45,-12.041594578792296\n1.5,-12.24744871391589\n1.55,-12.449899597988733\n1.6,-12.649110640673518\n1.65,-12.84523257866513\n1.7,-13.038404810405297\n1.75,-13.228756555322953\n1.8,-13.416407864998739\n1.85,-13.601470508735442\n1.9,-13.784048752090222\n1.95,-13.96424004376894\n2,-14.142135623730951\n2.05,-14.317821063276352\n2.1,-14.49137674618944\n2.15,-14.66287829861518\n2.2,-14.832396974191326\n2.25,-15\n2.3,-15.1657508881031\n2.35,-15.329709716755893\n2.4,-15.491933384829668\n2.45,-15.652475842498529\n2.5,-15.811388300841898\n2.55,-15.968719422671311\n2.6,-16.124515496597102\n2.65,-16.278820596099706\n2.7,-16.431676725154986\n2.75,-16.583123951776997\n2.8,-16.73320053068151\n2.85,-16.881943016134134\n2.9,-17.0293863659264\n2.95,-17.175564037317667\n3,-17.32050807568877\n3.05,-17.46424919657298\n3.1,-17.60681686165901\n3.15,-17.74823934929885\n3.2,-17.88854381999832\n3.25,-18.027756377319946\n3.3,-18.16590212458495\n3.35,-18.303005217723125\n3.4,-18.439088914585774\n3.45,-18.57417562100671\n3.5,-18.708286933869708\n3.55,-18.84144368141677\n3.6,-18.973665961010276\n3.65,-19.1049731745428\n3.7,-19.235384061671347\n3.75,-19.364916731037084\n3.8,-19.493588689617926\n3.85,-19.621416870348586\n3.9,-19.748417658131498\n3.95,-19.87460691435179\n4,-20\n4.05,-20.124611797498105\n4.1,-20.248456731316583\n4.15,-20.37154878746336\n4.2,-20.4939015319192\n4.25,-20.615528128088304\n4.3,-20.73644135332772\n4.35,-20.85665361461421\n4.4,-20.976176963403034\n4.45,-21.095023109728984\n4.5,-21.213203435596423\n4.55,-21.330729007701542\n4.6,-21.447610589527216\n4.65,-21.563858652847827\n4.7,-21.6794833886788\n4.75,-21.79449471770337\n4.8,-21.90890230020664\n4.85,-22.022715545545243\n4.9,-22.135943621178654\n4.95,-22.24859546128699\n5,-22.360679774997898\n5.05,-22.47220505424423\n5.1,-22.58317958127243\n5.15,-22.693611435820436\n5.2,-22.803508501982762\n5.25,-22.9128784747792\n5.3,-23.021728866442675\n5.35,-23.130067012440755\n5.4,-23.237900077244504\n5.45,-23.345235059857504\n5.5,-23.45207879911715\n5.55,-23.55843797877949\n5.6,-23.664319132398465\n5.65,-23.769728648009426\n5.7,-23.874672772626646\n5.75,-23.979157616563597\n5.8,-24.08318915758459\n5.85,-24.186773244895647\n5.9,-24.289915602982237\n5.95,-24.392621835300936\n6,-24.49489742783178\n6.05,-24.596747752497684\n6.1,-24.698178070456937\n6.15,-24.79919353527449\n6.2,-24.899799195977465\n6.25,-25\n6.3,-25.099800796022265\n6.35,-25.199206336708304\n6.4,-25.298221281347036\n6.45,-25.39685019840059\n6.5,-25.495097567963924\n6.55,-25.592967784139454\n6.6,-25.69046515733026\n6.65,-25.787593916455258\n6.7,-25.88435821108957\n6.75,-25.98076211353316\n6.8,-26.076809620810593\n6.85,-26.1725046566048\n6.9,-26.267851073127396\n6.95,-26.362852652928133\n7,-26.457513110645905\n7.05,-26.551836094703507\n7.1,-26.645825188948457\n7.15,-26.739483914241873\n7.2,-26.832815729997478\n7.25,-26.92582403567252\n7.3,-27.018512172212592\n7.35,-27.11088342345192\n7.4,-27.202941017470884\n7.45,-27.294688127912362",
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "D",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Function Plots",
+      "type": "xychart"
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 3,
+        "x": 21,
+        "y": 0
+      },
+      "id": 10,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "---\n### XYChart\n\n- Multi-dimensional, non-timeseries data (scientific, financial, engineering)\n- Scatter plots, bubble charts, function graphs, and etch-a-sketch!\n",
+        "mode": "markdown"
+      },
+      "pluginVersion": "10.3.0-pre",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "red",
+            "mode": "fixed"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 1,
+            "pointSize": {
+              "fixed": 5
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "show": "points"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 15,
+        "w": 9,
+        "x": 12,
+        "y": 17
+      },
+      "id": 5,
+      "options": {
+        "dims": {
+          "frame": 0
+        },
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "series": [
+          {
+            "name": "Price",
+            "pointColor": {
+              "fixed": "#fade2a40"
+            },
+            "pointSize": {
+              "field": "Price",
+              "fixed": 5,
+              "max": 50,
+              "min": 1
+            },
+            "x": "Lat",
+            "y": "Lng"
+          }
+        ],
+        "seriesMapping": "manual",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "csvFileName": "flight_info_by_state.csv",
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_file"
+        }
+      ],
+      "title": "Bubble Charts",
+      "type": "xychart"
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 1,
+            "pointSize": {
+              "fixed": 5
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "show": "points"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Miles_per_Gallon USA"
+            },
+            "properties": [
+              {
+                "id": "custom.axisLabel",
+                "value": "Miles_per_Gallon"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Horsepower USA"
+            },
+            "properties": [
+              {
+                "id": "custom.axisLabel",
+                "value": "Horsepower"
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 12,
+        "w": 6,
+        "x": 0,
+        "y": 20
+      },
+      "id": 7,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "series": [
+          {
+            "name": "USA",
+            "pointColor": {
+              "fixed": "#f2495c80"
+            },
+            "pointSize": {
+              "fixed": 5,
+              "max": 20,
+              "min": 1
+            },
+            "x": "Horsepower USA",
+            "y": "Miles_per_Gallon USA"
+          },
+          {
+            "name": "Europe",
+            "pointColor": {
+              "fixed": "#5795f280"
+            },
+            "pointSize": {
+              "fixed": 5,
+              "max": 20,
+              "min": 1
+            },
+            "x": "Horsepower Europe",
+            "y": "Miles_per_Gallon Europe"
+          },
+          {
+            "name": "Japan",
+            "pointColor": {
+              "fixed": "#ff983080"
+            },
+            "pointSize": {
+              "fixed": 5,
+              "max": 20,
+              "min": 1
+            },
+            "x": "Horsepower Japan",
+            "y": "Miles_per_Gallon Japan"
+          }
+        ],
+        "seriesMapping": "manual",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "csvFileName": "automobiles.csv",
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_file"
+        }
+      ],
+      "title": "MPG vs HP (by Country)",
+      "transformations": [
+        {
+          "id": "partitionByValues",
+          "options": {
+            "fields": [
+              "Origin"
+            ]
+          }
+        }
+      ],
+      "type": "xychart"
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 1,
+            "pointSize": {
+              "fixed": 5
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "show": "points"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Miles_per_Gallon USA"
+            },
+            "properties": [
+              {
+                "id": "custom.axisLabel",
+                "value": "Miles_per_Gallon"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Acceleration USA"
+            },
+            "properties": [
+              {
+                "id": "custom.axisLabel",
+                "value": "Acceleration"
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 12,
+        "w": 6,
+        "x": 6,
+        "y": 20
+      },
+      "id": 8,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "series": [
+          {
+            "name": "USA",
+            "pointColor": {
+              "fixed": "#f2495c80"
+            },
+            "pointSize": {
+              "fixed": 5,
+              "max": 20,
+              "min": 1
+            },
+            "x": "Acceleration USA",
+            "y": "Miles_per_Gallon USA"
+          },
+          {
+            "name": "Europe",
+            "pointColor": {
+              "fixed": "#5795f280"
+            },
+            "pointSize": {
+              "fixed": 5,
+              "max": 20,
+              "min": 1
+            },
+            "x": "Acceleration Europe",
+            "y": "Miles_per_Gallon Europe"
+          },
+          {
+            "name": "Japan",
+            "pointColor": {
+              "fixed": "#ff983080"
+            },
+            "pointSize": {
+              "fixed": 5,
+              "max": 20,
+              "min": 1
+            },
+            "x": "Acceleration Japan",
+            "y": "Miles_per_Gallon Japan"
+          }
+        ],
+        "seriesMapping": "manual",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "csvFileName": "automobiles.csv",
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_file"
+        }
+      ],
+      "title": "MPG vs Acceleration (by Country)",
+      "transformations": [
+        {
+          "id": "partitionByValues",
+          "options": {
+            "fields": [
+              "Origin"
+            ]
+          }
+        }
+      ],
+      "type": "xychart"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "pointSize": {
+              "fixed": 5
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "show": "points"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 12,
+        "w": 12,
+        "x": 0,
+        "y": 32
+      },
+      "id": 11,
+      "options": {
+        "dims": {
+          "exclude": [
+            "co TLM0100"
+          ],
+          "x": "humidity TLM0100"
+        },
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "series": [
+          {
+            "pointColor": {},
+            "x": "humidity",
+            "y": "temperature"
+          }
+        ],
+        "seriesMapping": "manual",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "grafana",
+            "uid": "grafana"
+          },
+          "queryType": "snapshot",
+          "refId": "A",
+          "snapshot": [
+            {
+              "data": {
+                "values": [
+                  [
+                    1686898151000,
+                    1686898161000,
+                    1686898171000,
+                    1686898181000,
+                    1686898191000,
+                    1686898201000,
+                    1686898211000,
+                    1686898221000,
+                    1686898231000,
+                    1686898241000
+                  ],
+                  [
+                    0.4860747509084685,
+                    0.4790778553981873,
+                    0.4597786615711249,
+                    0.4478751241705323,
+                    0.44020548182152397,
+                    0.4569020188814074,
+                    0.4655250429581913,
+                    0.4819032762634117,
+                    0.491365303224968,
+                    0.5092239049148886
+                  ],
+                  [
+                    35.084960222673146,
+                    35.089101898649055,
+                    35.130020139289115,
+                    35.10251705413486,
+                    35.08184755996438,
+                    35.04582600108574,
+                    35.09077388700681,
+                    35.04096375315356,
+                    35.05647864027338,
+                    35.091800720894916
+                  ],
+                  [
+                    71.2187151336704,
+                    71.24617135003214,
+                    71.21726829714834,
+                    71.26528218716341,
+                    71.26084702358875,
+                    71.24054378677393,
+                    71.27884802991244,
+                    71.29783163616926,
+                    71.33230999794793,
+                    71.34975514559837
+                  ]
+                ]
+              },
+              "schema": {
+                "fields": [
+                  {
+                    "config": {},
+                    "name": "_time",
+                    "type": "time",
+                    "typeInfo": {
+                      "frame": "time.Time",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {
+                      "sensor_id": "TLM0100"
+                    },
+                    "name": "co",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {
+                      "sensor_id": "TLM0100"
+                    },
+                    "name": "humidity",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {
+                      "sensor_id": "TLM0100"
+                    },
+                    "name": "temperature",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  }
+                ],
+                "meta": {
+                  "executedQueryString": "import \"influxdata/influxdb/sample\"\nimport \"influxdata/influxdb/schema\"\n\nsample.data(set: \"airSensor\")\n    |> limit(n: 10)\n    |> group(columns: [\"sensor_id\"])\n    |> schema.fieldsAsCols()\n",
+                  "typeVersion": [
+                    0,
+                    0
+                  ]
+                },
+                "refId": "A"
+              }
+            },
+            {
+              "data": {
+                "values": [
+                  [
+                    1686898151000,
+                    1686898161000,
+                    1686898171000,
+                    1686898181000,
+                    1686898191000,
+                    1686898201000,
+                    1686898211000,
+                    1686898221000,
+                    1686898231000,
+                    1686898241000
+                  ],
+                  [
+                    0.4964171323208575,
+                    0.48257922637952133,
+                    0.46567087322576145,
+                    0.4467650568596856,
+                    0.4417772514767169,
+                    0.4341379534638706,
+                    0.439345038257859,
+                    0.43452737707188627,
+                    0.42417500678639164,
+                    0.40704613738954887
+                  ],
+                  [
+                    34.92662088456207,
+                    34.91464944732493,
+                    34.95985887959429,
+                    34.929238294894844,
+                    34.954103486412336,
+                    34.98895514808448,
+                    35.03476240219413,
+                    35.028863365125844,
+                    35.03717014192905,
+                    35.00775919996651
+                  ],
+                  [
+                    71.83521495327129,
+                    71.83370684393908,
+                    71.83712160725877,
+                    71.88299650060345,
+                    71.90526594972503,
+                    71.8631768515712,
+                    71.85577028152356,
+                    71.89245169322045,
+                    71.93606971457449,
+                    71.96164771829956
+                  ]
+                ]
+              },
+              "schema": {
+                "fields": [
+                  {
+                    "config": {},
+                    "name": "_time",
+                    "type": "time",
+                    "typeInfo": {
+                      "frame": "time.Time",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {
+                      "sensor_id": "TLM0101"
+                    },
+                    "name": "co",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {
+                      "sensor_id": "TLM0101"
+                    },
+                    "name": "humidity",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {
+                      "sensor_id": "TLM0101"
+                    },
+                    "name": "temperature",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  }
+                ],
+                "refId": "A"
+              }
+            },
+            {
+              "data": {
+                "values": [
+                  [
+                    1686898151000,
+                    1686898161000,
+                    1686898171000,
+                    1686898181000,
+                    1686898191000,
+                    1686898201000,
+                    1686898211000,
+                    1686898221000,
+                    1686898231000,
+                    1686898241000
+                  ],
+                  [
+                    0.4870365157212326,
+                    0.5032215395360725,
+                    0.5035259485542879,
+                    0.4841798164121083,
+                    0.483812619615984,
+                    0.4882993499867786,
+                    0.4719009580435705,
+                    0.4700689455810135,
+                    0.48112413053169706,
+                    0.4691106107162724
+                  ],
+                  [
+                    34.86359615237462,
+                    34.84629630959152,
+                    34.81771460191974,
+                    34.854640808896036,
+                    34.86699022367547,
+                    34.864319179513096,
+                    34.86915527122888,
+                    34.89889649251399,
+                    34.86576388906259,
+                    34.88622805723735
+                  ],
+                  [
+                    72.03972207916735,
+                    72.05566134520713,
+                    72.08473708469143,
+                    72.07306942754916,
+                    72.0427409958616,
+                    72.04536459775873,
+                    72.09400368933838,
+                    72.14293243585941,
+                    72.18840859469728,
+                    72.15524663568557
+                  ]
+                ]
+              },
+              "schema": {
+                "fields": [
+                  {
+                    "config": {},
+                    "name": "_time",
+                    "type": "time",
+                    "typeInfo": {
+                      "frame": "time.Time",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {
+                      "sensor_id": "TLM0102"
+                    },
+                    "name": "co",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {
+                      "sensor_id": "TLM0102"
+                    },
+                    "name": "humidity",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {
+                      "sensor_id": "TLM0102"
+                    },
+                    "name": "temperature",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  }
+                ],
+                "refId": "A"
+              }
+            },
+            {
+              "data": {
+                "values": [
+                  [
+                    1686898151000,
+                    1686898161000,
+                    1686898171000,
+                    1686898181000,
+                    1686898191000,
+                    1686898201000,
+                    1686898211000,
+                    1686898221000,
+                    1686898231000,
+                    1686898241000
+                  ],
+                  [
+                    0.3979338437168368,
+                    0.4117117830425588,
+                    0.4000376537804249,
+                    0.40114553332960723,
+                    0.3909759394807085,
+                    0.38213452854680874,
+                    0.37339826793170855,
+                    0.3624713623472977,
+                    0.35640734768856297,
+                    0.35690557816119645
+                  ],
+                  [
+                    35.16192242281515,
+                    35.19891757080395,
+                    35.23754373785834,
+                    35.25270355198698,
+                    35.29525947947623,
+                    35.272026086051184,
+                    35.275233467451635,
+                    35.23834593104291,
+                    35.25233833634368,
+                    35.22053598631417
+                  ],
+                  [
+                    71.29169927438586,
+                    71.32114142326272,
+                    71.33632903748085,
+                    71.3064635464553,
+                    71.26436580075855,
+                    71.30431517798449,
+                    71.28861822950174,
+                    71.26778760430453,
+                    71.23481860950403,
+                    71.23084180913762
+                  ]
+                ]
+              },
+              "schema": {
+                "fields": [
+                  {
+                    "config": {},
+                    "name": "_time",
+                    "type": "time",
+                    "typeInfo": {
+                      "frame": "time.Time",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {
+                      "sensor_id": "TLM0103"
+                    },
+                    "name": "co",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {
+                      "sensor_id": "TLM0103"
+                    },
+                    "name": "humidity",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {
+                      "sensor_id": "TLM0103"
+                    },
+                    "name": "temperature",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  }
+                ],
+                "refId": "A"
+              }
+            },
+            {
+              "data": {
+                "values": [
+                  [
+                    1686898151000,
+                    1686898161000,
+                    1686898171000,
+                    1686898181000,
+                    1686898191000,
+                    1686898201000,
+                    1686898211000,
+                    1686898221000,
+                    1686898231000,
+                    1686898241000
+                  ],
+                  [
+                    0.5129015632374951,
+                    0.552968955740271,
+                    0.5690444135565038,
+                    0.6050221760178951,
+                    0.5943904374498042,
+                    0.6153588301241533,
+                    0.6164375823908576,
+                    0.6059635952981327,
+                    0.6470283318343141,
+                    0.6861075098169984
+                  ],
+                  [
+                    35.75385592664215,
+                    35.753218714107504,
+                    35.72547059379115,
+                    35.74553237372676,
+                    35.73378268235891,
+                    35.747560005048086,
+                    35.769867599816735,
+                    35.73929899563808,
+                    35.705317880681875,
+                    35.65611547721327
+                  ],
+                  [
+                    73.64806558624832,
+                    73.65728412124716,
+                    73.68805520135102,
+                    73.65185281162863,
+                    73.63499402146681,
+                    73.68359308763364,
+                    73.64682180062367,
+                    73.63298265031713,
+                    73.59096788790947,
+                    73.6381949597034
+                  ]
+                ]
+              },
+              "schema": {
+                "fields": [
+                  {
+                    "config": {},
+                    "name": "_time",
+                    "type": "time",
+                    "typeInfo": {
+                      "frame": "time.Time",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {
+                      "sensor_id": "TLM0200"
+                    },
+                    "name": "co",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {
+                      "sensor_id": "TLM0200"
+                    },
+                    "name": "humidity",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {
+                      "sensor_id": "TLM0200"
+                    },
+                    "name": "temperature",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  }
+                ],
+                "refId": "A"
+              }
+            },
+            {
+              "data": {
+                "values": [
+                  [
+                    1686898151000,
+                    1686898161000,
+                    1686898171000,
+                    1686898181000,
+                    1686898191000,
+                    1686898201000,
+                    1686898211000,
+                    1686898221000,
+                    1686898231000,
+                    1686898241000
+                  ],
+                  [
+                    0.5082489903097206,
+                    0.525490999229553,
+                    0.5300688563597754,
+                    0.5351282770519872,
+                    0.533437724470923,
+                    0.5164188260958164,
+                    0.5134188770545406,
+                    0.4949993424337248,
+                    0.4960387472164697,
+                    0.5046934441184395
+                  ],
+                  [
+                    35.24972613768055,
+                    35.238916979727335,
+                    35.28758958750148,
+                    35.26413172906637,
+                    35.2875488141577,
+                    35.32420268624064,
+                    35.2932945023372,
+                    35.277959228995584,
+                    35.27901195680498,
+                    35.27056468599647
+                  ],
+                  [
+                    73.99618150289902,
+                    74.01973867729899,
+                    73.97488048626532,
+                    73.97027021897547,
+                    73.96055098802299,
+                    73.94544160099603,
+                    73.91010608315078,
+                    73.9594600253564,
+                    73.93323000030807,
+                    73.94265737589377
+                  ]
+                ]
+              },
+              "schema": {
+                "fields": [
+                  {
+                    "config": {},
+                    "name": "_time",
+                    "type": "time",
+                    "typeInfo": {
+                      "frame": "time.Time",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {
+                      "sensor_id": "TLM0201"
+                    },
+                    "name": "co",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {
+                      "sensor_id": "TLM0201"
+                    },
+                    "name": "humidity",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {
+                      "sensor_id": "TLM0201"
+                    },
+                    "name": "temperature",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  }
+                ],
+                "refId": "A"
+              }
+            },
+            {
+              "data": {
+                "values": [
+                  [
+                    1686898151000,
+                    1686898161000,
+                    1686898171000,
+                    1686898181000,
+                    1686898191000,
+                    1686898201000,
+                    1686898211000,
+                    1686898221000,
+                    1686898231000,
+                    1686898241000
+                  ],
+                  [
+                    0.4843506884938821,
+                    0.48132272563110234,
+                    0.4738268718199932,
+                    0.4929629619836042,
+                    0.4730642763470896,
+                    0.4654986284178103,
+                    0.47939137148137106,
+                    0.4729232244284411,
+                    0.48941836624955776,
+                    0.49438537058971027
+                  ],
+                  [
+                    35.6843507637763,
+                    35.67052290561625,
+                    35.651191124511904,
+                    35.682694567957775,
+                    35.71754463951193,
+                    35.73271359197846,
+                    35.76201128140823,
+                    35.72031962293351,
+                    35.76508898680512,
+                    35.77376488207177
+                  ],
+                  [
+                    75.28536533620796,
+                    75.3203884403274,
+                    75.32915092826639,
+                    75.3260291876276,
+                    75.29613126188146,
+                    75.31098782530198,
+                    75.27434784939884,
+                    75.30929861509146,
+                    75.32818662869892,
+                    75.33650169518009
+                  ]
+                ]
+              },
+              "schema": {
+                "fields": [
+                  {
+                    "config": {},
+                    "name": "_time",
+                    "type": "time",
+                    "typeInfo": {
+                      "frame": "time.Time",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {
+                      "sensor_id": "TLM0202"
+                    },
+                    "name": "co",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {
+                      "sensor_id": "TLM0202"
+                    },
+                    "name": "humidity",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {
+                      "sensor_id": "TLM0202"
+                    },
+                    "name": "temperature",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  }
+                ],
+                "refId": "A"
+              }
+            },
+            {
+              "data": {
+                "values": [
+                  [
+                    1686898151000,
+                    1686898161000,
+                    1686898171000,
+                    1686898181000,
+                    1686898191000,
+                    1686898201000,
+                    1686898211000,
+                    1686898221000,
+                    1686898231000,
+                    1686898241000
+                  ],
+                  [
+                    0.39373421338928505,
+                    0.40929905142175416,
+                    0.39727569840202215,
+                    0.415834035946844,
+                    0.413865826090914,
+                    0.4271278288285897,
+                    0.435277474574255,
+                    0.4480042029285831,
+                    0.462641109361364,
+                    0.4566678920783633
+                  ],
+                  [
+                    35.86322585633077,
+                    35.88732568460068,
+                    35.87553827435961,
+                    35.84063967239316,
+                    35.813642046057005,
+                    35.8569165461967,
+                    35.80924651587166,
+                    35.80599199551315,
+                    35.75906423980926,
+                    35.79948361256034
+                  ],
+                  [
+                    74.78112365229704,
+                    74.73821283157658,
+                    74.73019922701285,
+                    74.73280967321202,
+                    74.74885460260536,
+                    74.70880911705714,
+                    74.73346687605624,
+                    74.77682413662681,
+                    74.80562351134131,
+                    74.82881664528719
+                  ]
+                ]
+              },
+              "schema": {
+                "fields": [
+                  {
+                    "config": {},
+                    "name": "_time",
+                    "type": "time",
+                    "typeInfo": {
+                      "frame": "time.Time",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {
+                      "sensor_id": "TLM0203"
+                    },
+                    "name": "co",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {
+                      "sensor_id": "TLM0203"
+                    },
+                    "name": "humidity",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  },
+                  {
+                    "config": {},
+                    "labels": {
+                      "sensor_id": "TLM0203"
+                    },
+                    "name": "temperature",
+                    "type": "number",
+                    "typeInfo": {
+                      "frame": "float64",
+                      "nullable": true
+                    }
+                  }
+                ],
+                "refId": "A"
+              }
+            }
+          ]
+        }
+      ],
+      "title": "Multi-series Temperature vs Humidity",
+      "type": "xychart"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 39,
+  "tags": [
+    "gdev",
+    "panel-tests",
+    "xychat"
+  ],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "2022-10-07T05:04:04.516Z",
+    "to": "2022-10-07T17:04:04.516Z"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Panel Tests - XY Chart",
+  "uid": "YObbMr44k",
+  "version": 1,
+  "weekStart": ""
+}
\ No newline at end of file
diff --git a/devenv/dev-dashboards/panel-xychart/xychart-tooltip-color-test.json b/devenv/dev-dashboards/panel-xychart/xychart-tooltip-color-test.json
new file mode 100644
index 0000000000000..5ee05b7b7f9b8
--- /dev/null
+++ b/devenv/dev-dashboards/panel-xychart/xychart-tooltip-color-test.json
@@ -0,0 +1,687 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {},
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "blue",
+            "mode": "fixed"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "pointSize": {
+              "fixed": 32
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "show": "points"
+          },
+          "fieldMinMax": false,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 11,
+        "w": 7,
+        "x": 0,
+        "y": 0
+      },
+      "id": 1,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "series": [
+          {
+            "pointColor": {
+              "fixed": "orange"
+            },
+            "x": "Miles_per_Gallon",
+            "y": "Horsepower"
+          }
+        ],
+        "seriesMapping": "auto",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "csvContent": "x,y,z\n1,2,3\n3,4,5\n5,6,7",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "${DS_GDEV-TESTDATA}"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Standard options: Single color",
+      "type": "xychart"
+    },
+    {
+      "datasource": {},
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "shades"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "pointSize": {
+              "fixed": 32
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "show": "points"
+          },
+          "fieldMinMax": false,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 11,
+        "w": 7,
+        "x": 7,
+        "y": 0
+      },
+      "id": 4,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "series": [
+          {
+            "pointColor": {
+              "fixed": "orange"
+            },
+            "x": "Miles_per_Gallon",
+            "y": "Horsepower"
+          }
+        ],
+        "seriesMapping": "auto",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "csvContent": "x,y,z\n1,2,3\n3,4,5\n5,6,7",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "${DS_GDEV-TESTDATA}"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Standard options: Shades of a color",
+      "type": "xychart"
+    },
+    {
+      "datasource": {},
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "yellow",
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "pointSize": {
+              "fixed": 32
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "show": "points"
+          },
+          "fieldMinMax": false,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 11,
+        "w": 7,
+        "x": 14,
+        "y": 0
+      },
+      "id": 3,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "series": [
+          {
+            "pointColor": {
+              "fixed": "orange"
+            },
+            "x": "Miles_per_Gallon",
+            "y": "Horsepower"
+          }
+        ],
+        "seriesMapping": "auto",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "csvContent": "x,y,z\n1,2,3\n3,4,5\n5,6,7",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "${DS_GDEV-TESTDATA}"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Standard options: Classic palette",
+      "type": "xychart"
+    },
+    {
+      "datasource": {},
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "blue",
+            "mode": "fixed"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "pointSize": {
+              "fixed": 32
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "show": "points"
+          },
+          "fieldMinMax": false,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 12,
+        "w": 7,
+        "x": 0,
+        "y": 11
+      },
+      "id": 5,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "series": [
+          {
+            "pointColor": {
+              "fixed": "orange"
+            },
+            "x": "x",
+            "y": "y"
+          },
+          {
+            "pointColor": {
+              "fixed": "green"
+            },
+            "x": "x",
+            "y": "z"
+          }
+        ],
+        "seriesMapping": "manual",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "csvContent": "x,y,z\n1,2,3\n3,4,5\n5,6,7",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "${DS_GDEV-TESTDATA}"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Standard options: Single color + Mapping: Fixed color",
+      "type": "xychart"
+    },
+    {
+      "datasource": {},
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "blue",
+            "mode": "shades"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "pointSize": {
+              "fixed": 32
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "show": "points"
+          },
+          "fieldMinMax": false,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 12,
+        "w": 7,
+        "x": 7,
+        "y": 11
+      },
+      "id": 6,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "series": [
+          {
+            "pointColor": {
+              "fixed": "orange"
+            },
+            "x": "x",
+            "y": "y"
+          },
+          {
+            "pointColor": {
+              "fixed": "green"
+            },
+            "x": "x",
+            "y": "z"
+          }
+        ],
+        "seriesMapping": "manual",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "csvContent": "x,y,z\n1,2,3\n3,4,5\n5,6,7",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "${DS_GDEV-TESTDATA}"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Standard options: Shades of color + Mapping: Fixed color",
+      "type": "xychart"
+    },
+    {
+      "datasource": {},
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "blue",
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "pointSize": {
+              "fixed": 32
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "show": "points"
+          },
+          "fieldMinMax": false,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 12,
+        "w": 7,
+        "x": 14,
+        "y": 11
+      },
+      "id": 7,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "series": [
+          {
+            "pointColor": {
+              "fixed": "orange"
+            },
+            "x": "x",
+            "y": "y"
+          },
+          {
+            "pointColor": {
+              "fixed": "green"
+            },
+            "x": "x",
+            "y": "z"
+          }
+        ],
+        "seriesMapping": "manual",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "csvContent": "x,y,z\n1,2,3\n3,4,5\n5,6,7",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "${DS_GDEV-TESTDATA}"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Standard options: Classic palette + Mapping: Fixed color",
+      "type": "xychart"
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "continuous-BlYlRd"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "pointSize": {
+              "fixed": 50
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "show": "points"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 7,
+        "x": 0,
+        "y": 23
+      },
+      "id": 8,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "series": [
+          {
+            "pointColor": {
+              "field": "c",
+              "fixed": "dark-green"
+            },
+            "x": "x",
+            "y": "y"
+          }
+        ],
+        "seriesMapping": "manual",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "csvContent": "x,y,c\n0,0,0\n50,50,25\n100,100,50",
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Panel Title",
+      "type": "xychart"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 39,
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "XYChart tooltip color test",
+  "uid": "cb67db43-dd72-4ada-a313-53f46c20adcc",
+  "version": 1,
+  "weekStart": ""
+}
\ No newline at end of file
diff --git a/devenv/dev-dashboards/scenarios/tall_dashboard.json b/devenv/dev-dashboards/scenarios/tall_dashboard.json
new file mode 100644
index 0000000000000..ca87850c2b0c5
--- /dev/null
+++ b/devenv/dev-dashboards/scenarios/tall_dashboard.json
@@ -0,0 +1,1791 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": 3,
+  "links": [],
+  "panels": [
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "id": 1,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 1",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #1",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 8
+      },
+      "id": 2,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 2",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #2",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 16
+      },
+      "id": 3,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 3",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #3",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 24
+      },
+      "id": 4,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 4",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #4",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 32
+      },
+      "id": 5,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 5",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #5",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 40
+      },
+      "id": 6,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 6",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #6",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 48
+      },
+      "id": 7,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 7",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #7",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 56
+      },
+      "id": 8,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 8",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #8",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 64
+      },
+      "id": 9,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 9",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #9",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 72
+      },
+      "id": 10,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 10",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #10",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 80
+      },
+      "id": 11,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 11",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #11",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 88
+      },
+      "id": 12,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 12",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #12",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 96
+      },
+      "id": 13,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 13",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #13",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 104
+      },
+      "id": 14,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 14",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #14",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 112
+      },
+      "id": 15,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 15",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #15",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 120
+      },
+      "id": 16,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 16",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #16",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 128
+      },
+      "id": 17,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 17",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #17",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 136
+      },
+      "id": 18,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 18",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #18",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 144
+      },
+      "id": 19,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 19",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #19",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 152
+      },
+      "id": 20,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 20",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #20",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 160
+      },
+      "id": 21,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 21",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #21",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 168
+      },
+      "id": 22,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 22",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #22",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 176
+      },
+      "id": 23,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 23",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #23",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 184
+      },
+      "id": 24,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 24",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #24",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 192
+      },
+      "id": 25,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 25",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #25",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 200
+      },
+      "id": 26,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 26",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #26",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 208
+      },
+      "id": 27,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 27",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #27",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 216
+      },
+      "id": 28,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 28",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #28",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 224
+      },
+      "id": 29,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 29",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #29",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 232
+      },
+      "id": 30,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 30",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #30",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 240
+      },
+      "id": 31,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 31",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #31",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 248
+      },
+      "id": 32,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 32",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #32",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 256
+      },
+      "id": 33,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 33",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #33",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 264
+      },
+      "id": 34,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 34",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #34",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 272
+      },
+      "id": 35,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 35",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #35",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 280
+      },
+      "id": 36,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 36",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #36",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 288
+      },
+      "id": 37,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 37",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #37",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 296
+      },
+      "id": 38,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 38",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #38",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 304
+      },
+      "id": 39,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 39",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #39",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 312
+      },
+      "id": 40,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 40",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #40",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 320
+      },
+      "id": 41,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 41",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #41",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 328
+      },
+      "id": 42,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 42",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #42",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 336
+      },
+      "id": 43,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 43",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #43",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 344
+      },
+      "id": 44,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 44",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #44",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 352
+      },
+      "id": 45,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 45",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #45",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 360
+      },
+      "id": 46,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 46",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #46",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 368
+      },
+      "id": 47,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 47",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #47",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 376
+      },
+      "id": 48,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 48",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #48",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 384
+      },
+      "id": 49,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 49",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #49",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 392
+      },
+      "id": 50,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Dashboard panel 50",
+        "mode": "markdown"
+      },
+      "pluginVersion": "11.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel #50",
+      "type": "text"
+    }
+  ],
+  "schemaVersion": 39,
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timeRangeUpdatedDuringEditOrView": false,
+  "timepicker": {},
+  "timezone": "browser",
+  "title": "A tall dashboard",
+  "uid": "edediimbjhdz4b",
+  "version": 1,
+  "weekStart": ""
+}
diff --git a/devenv/dev-dashboards/transforms/regression-analysis.json b/devenv/dev-dashboards/transforms/regression-analysis.json
new file mode 100644
index 0000000000000..03e9a376cad9f
--- /dev/null
+++ b/devenv/dev-dashboards/transforms/regression-analysis.json
@@ -0,0 +1,1036 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": false,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": 764,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "id": 1,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "title": "Many points polynomial",
+      "transformations": [
+        {
+          "id": "regression",
+          "options": {
+            "degree": 3,
+            "modelType": "polynomial",
+            "order": 3,
+            "precision": 100,
+            "resolution": 100,
+            "xFieldName": "time",
+            "yFieldName": "A-series"
+          }
+        }
+      ],
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 0
+      },
+      "id": 5,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "title": "Many points linear",
+      "transformations": [
+        {
+          "id": "regression",
+          "options": {
+            "modelType": "linear",
+            "order": 3,
+            "precision": 100,
+            "resolution": 10,
+            "xFieldName": "time",
+            "yFieldName": "A-series"
+          }
+        }
+      ],
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 8
+      },
+      "id": 2,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "pluginVersion": "10.3.0-pre",
+      "targets": [
+        {
+          "csvContent": "time, val\n2023-11-20 12:09:00, 1\n2023-11-20 12:09:02, 2\n2023-11-20 12:09:03, 3\n2023-11-20 12:09:04, 4\n2023-11-20 12:09:05, 5\n2023-11-20 12:09:06, 6\n2023-11-20 12:09:07, 2\n2023-11-20 12:09:08, 3\n2023-11-20 12:09:09, 4\n2023-11-20 12:09:10, 1\n2023-11-20 12:09:11, 2\n2023-11-20 12:09:12, 3\n2023-11-20 12:09:13, 4",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Few points",
+      "transformations": [
+        {
+          "id": "convertFieldType",
+          "options": {
+            "conversions": [
+              {
+                "destinationType": "time",
+                "targetField": "time"
+              }
+            ],
+            "fields": {}
+          }
+        },
+        {
+          "id": "regression",
+          "options": {
+            "degree": 3,
+            "modelType": "polynomial",
+            "order": 3,
+            "precision": 100,
+            "xFieldName": "time",
+            "yFieldName": "val"
+          }
+        },
+        {
+          "id": "regression",
+          "options": {
+            "modelType": "linear",
+            "xFieldName": "time",
+            "yFieldName": "val"
+          }
+        }
+      ],
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 8
+      },
+      "id": 4,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "csvContent": "time, val\n2023-11-20 12:09:00, 1\n2023-11-20 12:09:02, 2\n2023-11-20 12:09:03, 3\n2023-11-20 12:09:04, 4\n2023-11-20 12:09:05, null\n2023-11-20 12:09:06, 6\n2023-11-20 12:09:07, 2\n2023-11-20 12:09:08, null\n2023-11-20 12:09:09, 4\n2023-11-20 12:09:10, 1\n2023-11-20 12:09:11, 2\n2023-11-20 12:09:12, 3\n2023-11-20 12:09:13, 4",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Data with nulls",
+      "transformations": [
+        {
+          "id": "convertFieldType",
+          "options": {
+            "conversions": [
+              {
+                "destinationType": "time",
+                "targetField": "time"
+              }
+            ],
+            "fields": {}
+          }
+        },
+        {
+          "id": "regression",
+          "options": {
+            "degree": 3,
+            "modelType": "polynomial",
+            "order": 3,
+            "precision": 100,
+            "resolution": 100,
+            "xFieldName": "time",
+            "yFieldName": "val"
+          }
+        },
+        {
+          "id": "regression",
+          "options": {
+            "modelType": "linear",
+            "xFieldName": "time",
+            "yFieldName": "val"
+          }
+        }
+      ],
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "pointSize": {
+              "fixed": 5
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "show": "points"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "y predicted linear regression"
+            },
+            "properties": [
+              {
+                "id": "custom.show",
+                "value": "lines"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "y predicted polynomial regression"
+            },
+            "properties": [
+              {
+                "id": "custom.show",
+                "value": "lines"
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 16
+      },
+      "id": 3,
+      "options": {
+        "dims": {
+          "frame": 0
+        },
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "series": [],
+        "seriesMapping": "auto",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "csvContent": "x,y\n1,4\n2,1\n3,2\n4,-2\n5,6\n3,2\n1,7\n3,9\n6,3\n5,-3\n2,-2\n7,15",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "XY Chart",
+      "transformations": [
+        {
+          "id": "regression",
+          "options": {
+            "modelType": "linear",
+            "resolution": 1,
+            "xFieldName": "x",
+            "yFieldName": "y"
+          }
+        },
+        {
+          "id": "regression",
+          "options": {
+            "modelType": "polynomial",
+            "order": 3,
+            "resolution": 100,
+            "xFieldName": "x",
+            "yFieldName": "y"
+          }
+        },
+        {
+          "id": "renameByRegex",
+          "options": {
+            "regex": "x.*",
+            "renamePattern": "x"
+          }
+        },
+        {
+          "id": "joinByField",
+          "options": {
+            "byField": "x",
+            "mode": "outer"
+          }
+        },
+        {
+          "id": "sortBy",
+          "options": {
+            "fields": {},
+            "sort": [
+              {
+                "field": "x"
+              }
+            ]
+          }
+        }
+      ],
+      "type": "xychart"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 16
+      },
+      "id": 6,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "10.3.0-pre",
+      "title": "stat panel",
+      "transformations": [
+        {
+          "id": "regression",
+          "options": {
+            "degree": 3,
+            "modelType": "polynomial",
+            "order": 3,
+            "xFieldName": "time",
+            "yFieldName": "A-series"
+          }
+        },
+        {
+          "id": "regression",
+          "options": {
+            "modelType": "linear",
+            "xFieldName": "time",
+            "yFieldName": "A-series"
+          }
+        }
+      ],
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "val predicted polynomial regression"
+            },
+            "properties": [
+              {
+                "id": "custom.showPoints",
+                "value": "never"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "val predicted linear regression"
+            },
+            "properties": [
+              {
+                "id": "custom.showPoints",
+                "value": "never"
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 24
+      },
+      "id": 7,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "pluginVersion": "10.3.0-pre",
+      "targets": [
+        {
+          "csvContent": "x, val\n6,2\n8,1\n10,5\n15,1\n22,10\n",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Trend panel",
+      "transformations": [
+        {
+          "id": "regression",
+          "options": {
+            "modelType": "polynomial",
+            "order": 3,
+            "xFieldName": "x",
+            "yFieldName": "val"
+          }
+        },
+        {
+          "id": "regression",
+          "options": {
+            "modelType": "linear",
+            "xFieldName": "x",
+            "yFieldName": "val"
+          }
+        },
+        {
+          "id": "renameByRegex",
+          "options": {
+            "regex": "x.*",
+            "renamePattern": "x"
+          }
+        },
+        {
+          "id": "joinByField",
+          "options": {
+            "byField": "x",
+            "mode": "outer"
+          }
+        }
+      ],
+      "type": "trend"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "pointSize": {
+              "fixed": 5
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "show": "points"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "baz predicted polynomial regression"
+            },
+            "properties": [
+              {
+                "id": "custom.show",
+                "value": "lines"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "baz predicted linear regression"
+            },
+            "properties": [
+              {
+                "id": "custom.show",
+                "value": "lines"
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 24
+      },
+      "id": 8,
+      "options": {
+        "dims": {
+          "exclude": [],
+          "frame": 0,
+          "x": "foo"
+        },
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "series": [
+          {
+            "pointColor": {},
+            "pointSize": {
+              "field": "baz",
+              "fixed": 50.5,
+              "max": 100,
+              "min": 1
+            },
+            "x": "foo",
+            "y": "foo"
+          }
+        ],
+        "seriesMapping": "auto",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "pluginVersion": "10.3.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "usa",
+          "usa": {
+            "mode": "values-as-rows"
+          }
+        }
+      ],
+      "title": "XY Chart",
+      "transformations": [
+        {
+          "id": "regression",
+          "options": {
+            "degree": 5,
+            "modelType": "polynomial",
+            "order": 3,
+            "xFieldName": "foo",
+            "yFieldName": "baz"
+          }
+        },
+        {
+          "id": "regression",
+          "options": {
+            "modelType": "linear",
+            "xFieldName": "foo",
+            "yFieldName": "baz"
+          }
+        },
+        {
+          "id": "joinByField",
+          "options": {
+            "byField": "foo",
+            "mode": "outer"
+          }
+        }
+      ],
+      "type": "xychart"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 39,
+  "tags": [
+    "gdev",
+    "transform"
+  ],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "2023-11-20T12:09:00.000Z",
+    "to": "2023-11-20T12:09:13.000Z"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Transforms - Regression analysis",
+  "uid": "d2d2bb99-42e4-44b8-b93e-3ad1aae31c6b",
+  "version": 39,
+  "weekStart": ""
+}
\ No newline at end of file
diff --git a/devenv/docker/blocks/auth/README.md b/devenv/docker/blocks/auth/README.md
index ed2872704b732..2046804fb9ab1 100644
--- a/devenv/docker/blocks/auth/README.md
+++ b/devenv/docker/blocks/auth/README.md
@@ -9,7 +9,7 @@ Spin up a service with the following command from the base directory of this
 repository.
 
 ```bash
-make devenv=oauth
+make devenv=auth/oauth
 ```
 
 This will add the `oauth/docker-compose` block to the `docker-compose` file used
diff --git a/devenv/docker/blocks/auth/authentik/README.md b/devenv/docker/blocks/auth/authentik/README.md
index 9fdee3b8c9376..7c02d38bb8d5f 100644
--- a/devenv/docker/blocks/auth/authentik/README.md
+++ b/devenv/docker/blocks/auth/authentik/README.md
@@ -85,8 +85,6 @@ auth_url = http://localhost:9000/application/o/authorize/
 token_url = http://localhost:9000/application/o/token/
 api_url = http://localhost:9000/application/o/userinfo/
 role_attribute_path = contains(groups[*], 'admin') && 'Admin' || contains(groups[*], 'editor') && 'Editor' || 'Viewer'
-
-[auth]
 signout_redirect_url = http://localhost:9000/application/o/grafana-oidc/end-session/
 ```
 
diff --git a/devenv/docker/blocks/auth/authentik/cloak.sql b/devenv/docker/blocks/auth/authentik/cloak.sql
index 6669bf2bf6f8a..e861be4726763 100644
--- a/devenv/docker/blocks/auth/authentik/cloak.sql
+++ b/devenv/docker/blocks/auth/authentik/cloak.sql
@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 12.13
--- Dumped by pg_dump version 12.13
+-- Dumped from database version 16.1 (Debian 16.1-1.pgdg120+1)
+-- Dumped by pg_dump version 16.1 (Debian 16.1-1.pgdg120+1)
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
@@ -178,6 +178,33 @@ CREATE TABLE public.authentik_core_group (
 
 ALTER TABLE public.authentik_core_group OWNER TO authentik;
 
+--
+-- Name: authentik_core_group_roles; Type: TABLE; Schema: public; Owner: authentik
+--
+
+CREATE TABLE public.authentik_core_group_roles (
+    id integer NOT NULL,
+    group_id uuid NOT NULL,
+    role_id uuid NOT NULL
+);
+
+
+ALTER TABLE public.authentik_core_group_roles OWNER TO authentik;
+
+--
+-- Name: authentik_core_group_roles_id_seq; Type: SEQUENCE; Schema: public; Owner: authentik
+--
+
+ALTER TABLE public.authentik_core_group_roles ALTER COLUMN id ADD GENERATED BY DEFAULT AS IDENTITY (
+    SEQUENCE NAME public.authentik_core_group_roles_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1
+);
+
+
 --
 -- Name: authentik_core_propertymapping; Type: TABLE; Schema: public; Owner: authentik
 --
@@ -198,8 +225,11 @@ ALTER TABLE public.authentik_core_propertymapping OWNER TO authentik;
 
 CREATE TABLE public.authentik_core_provider (
     id integer NOT NULL,
-    authorization_flow_id uuid NOT NULL,
-    name text NOT NULL
+    authorization_flow_id uuid,
+    name text NOT NULL,
+    authentication_flow_id uuid,
+    backchannel_application_id uuid,
+    is_backchannel boolean NOT NULL
 );
 
 
@@ -330,7 +360,8 @@ CREATE TABLE public.authentik_core_user (
     name text NOT NULL,
     password_change_date timestamp with time zone NOT NULL,
     attributes jsonb NOT NULL,
-    path text NOT NULL
+    path text NOT NULL,
+    type text NOT NULL
 );
 
 
@@ -477,6 +508,39 @@ CREATE TABLE public.authentik_crypto_certificatekeypair (
 
 ALTER TABLE public.authentik_crypto_certificatekeypair OWNER TO authentik;
 
+--
+-- Name: authentik_enterprise_license; Type: TABLE; Schema: public; Owner: authentik
+--
+
+CREATE TABLE public.authentik_enterprise_license (
+    license_uuid uuid NOT NULL,
+    key text NOT NULL,
+    name text NOT NULL,
+    expiry timestamp with time zone NOT NULL,
+    internal_users bigint NOT NULL,
+    external_users bigint NOT NULL
+);
+
+
+ALTER TABLE public.authentik_enterprise_license OWNER TO authentik;
+
+--
+-- Name: authentik_enterprise_licenseusage; Type: TABLE; Schema: public; Owner: authentik
+--
+
+CREATE TABLE public.authentik_enterprise_licenseusage (
+    expiring boolean NOT NULL,
+    expires timestamp with time zone NOT NULL,
+    usage_uuid uuid NOT NULL,
+    user_count bigint NOT NULL,
+    external_user_count bigint NOT NULL,
+    within_limits boolean NOT NULL,
+    record_date timestamp with time zone NOT NULL
+);
+
+
+ALTER TABLE public.authentik_enterprise_licenseusage OWNER TO authentik;
+
 --
 -- Name: authentik_events_event; Type: TABLE; Schema: public; Owner: authentik
 --
@@ -646,6 +710,17 @@ CREATE TABLE public.authentik_flows_stage (
 
 ALTER TABLE public.authentik_flows_stage OWNER TO authentik;
 
+--
+-- Name: authentik_install_id; Type: TABLE; Schema: public; Owner: authentik
+--
+
+CREATE TABLE public.authentik_install_id (
+    id text NOT NULL
+);
+
+
+ALTER TABLE public.authentik_install_id OWNER TO authentik;
+
 --
 -- Name: authentik_outposts_dockerserviceconnection; Type: TABLE; Schema: public; Owner: authentik
 --
@@ -749,9 +824,10 @@ ALTER TABLE public.authentik_policies_dummy_dummypolicy OWNER TO authentik;
 
 CREATE TABLE public.authentik_policies_event_matcher_eventmatcherpolicy (
     policy_ptr_id uuid NOT NULL,
-    action text NOT NULL,
-    client_ip text NOT NULL,
-    app text NOT NULL
+    action text,
+    client_ip text,
+    app text,
+    model text
 );
 
 
@@ -841,7 +917,9 @@ CREATE TABLE public.authentik_policies_policybinding (
     negate boolean NOT NULL,
     timeout integer NOT NULL,
     group_id uuid,
-    user_id integer
+    user_id integer,
+    failure_result boolean NOT NULL,
+    CONSTRAINT authentik_policies_policybinding_timeout_b41b0d57_check CHECK ((timeout >= 0))
 );
 
 
@@ -869,7 +947,9 @@ CREATE TABLE public.authentik_policies_reputation_reputation (
     ip inet NOT NULL,
     ip_geo_data jsonb NOT NULL,
     score bigint NOT NULL,
-    updated timestamp with time zone NOT NULL
+    updated timestamp with time zone NOT NULL,
+    expires timestamp with time zone NOT NULL,
+    expiring boolean NOT NULL
 );
 
 
@@ -902,7 +982,8 @@ CREATE TABLE public.authentik_providers_ldap_ldapprovider (
     gid_start_number integer NOT NULL,
     uid_start_number integer NOT NULL,
     search_mode text NOT NULL,
-    bind_mode text NOT NULL
+    bind_mode text NOT NULL,
+    mfa_support boolean NOT NULL
 );
 
 
@@ -921,7 +1002,9 @@ CREATE TABLE public.authentik_providers_oauth2_accesstoken (
     token text NOT NULL,
     _id_token text NOT NULL,
     provider_id integer NOT NULL,
-    user_id integer NOT NULL
+    user_id integer NOT NULL,
+    auth_time timestamp with time zone NOT NULL,
+    session_id character varying NOT NULL
 );
 
 
@@ -956,7 +1039,9 @@ CREATE TABLE public.authentik_providers_oauth2_authorizationcode (
     code_challenge_method character varying(255),
     provider_id integer NOT NULL,
     user_id integer NOT NULL,
-    revoked boolean NOT NULL
+    revoked boolean NOT NULL,
+    auth_time timestamp with time zone NOT NULL,
+    session_id character varying NOT NULL
 );
 
 
@@ -1070,7 +1155,9 @@ CREATE TABLE public.authentik_providers_oauth2_refreshtoken (
     provider_id integer NOT NULL,
     user_id integer NOT NULL,
     revoked boolean NOT NULL,
-    token text NOT NULL
+    token text NOT NULL,
+    auth_time timestamp with time zone NOT NULL,
+    session_id character varying NOT NULL
 );
 
 
@@ -1126,6 +1213,20 @@ CREATE TABLE public.authentik_providers_proxy_proxyprovider (
 
 ALTER TABLE public.authentik_providers_proxy_proxyprovider OWNER TO authentik;
 
+--
+-- Name: authentik_providers_radius_radiusprovider; Type: TABLE; Schema: public; Owner: authentik
+--
+
+CREATE TABLE public.authentik_providers_radius_radiusprovider (
+    provider_ptr_id integer NOT NULL,
+    shared_secret text NOT NULL,
+    client_networks text NOT NULL,
+    mfa_support boolean NOT NULL
+);
+
+
+ALTER TABLE public.authentik_providers_radius_radiusprovider OWNER TO authentik;
+
 --
 -- Name: authentik_providers_saml_samlpropertymapping; Type: TABLE; Schema: public; Owner: authentik
 --
@@ -1156,12 +1257,105 @@ CREATE TABLE public.authentik_providers_saml_samlprovider (
     signing_kp_id uuid,
     sp_binding text NOT NULL,
     verification_kp_id uuid,
-    name_id_mapping_id uuid
+    name_id_mapping_id uuid,
+    default_relay_state text NOT NULL
 );
 
 
 ALTER TABLE public.authentik_providers_saml_samlprovider OWNER TO authentik;
 
+--
+-- Name: authentik_providers_scim_scimgroup; Type: TABLE; Schema: public; Owner: authentik
+--
+
+CREATE TABLE public.authentik_providers_scim_scimgroup (
+    id text NOT NULL,
+    group_id uuid NOT NULL,
+    provider_id integer NOT NULL
+);
+
+
+ALTER TABLE public.authentik_providers_scim_scimgroup OWNER TO authentik;
+
+--
+-- Name: authentik_providers_scim_scimmapping; Type: TABLE; Schema: public; Owner: authentik
+--
+
+CREATE TABLE public.authentik_providers_scim_scimmapping (
+    propertymapping_ptr_id uuid NOT NULL
+);
+
+
+ALTER TABLE public.authentik_providers_scim_scimmapping OWNER TO authentik;
+
+--
+-- Name: authentik_providers_scim_scimprovider; Type: TABLE; Schema: public; Owner: authentik
+--
+
+CREATE TABLE public.authentik_providers_scim_scimprovider (
+    provider_ptr_id integer NOT NULL,
+    url text NOT NULL,
+    token text NOT NULL,
+    exclude_users_service_account boolean NOT NULL,
+    filter_group_id uuid
+);
+
+
+ALTER TABLE public.authentik_providers_scim_scimprovider OWNER TO authentik;
+
+--
+-- Name: authentik_providers_scim_scimprovider_property_mappings_group; Type: TABLE; Schema: public; Owner: authentik
+--
+
+CREATE TABLE public.authentik_providers_scim_scimprovider_property_mappings_group (
+    id integer NOT NULL,
+    scimprovider_id integer NOT NULL,
+    propertymapping_id uuid NOT NULL
+);
+
+
+ALTER TABLE public.authentik_providers_scim_scimprovider_property_mappings_group OWNER TO authentik;
+
+--
+-- Name: authentik_providers_scim_scimprovider_property_mappings__id_seq; Type: SEQUENCE; Schema: public; Owner: authentik
+--
+
+ALTER TABLE public.authentik_providers_scim_scimprovider_property_mappings_group ALTER COLUMN id ADD GENERATED BY DEFAULT AS IDENTITY (
+    SEQUENCE NAME public.authentik_providers_scim_scimprovider_property_mappings__id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1
+);
+
+
+--
+-- Name: authentik_providers_scim_scimuser; Type: TABLE; Schema: public; Owner: authentik
+--
+
+CREATE TABLE public.authentik_providers_scim_scimuser (
+    id text NOT NULL,
+    provider_id integer NOT NULL,
+    user_id integer NOT NULL
+);
+
+
+ALTER TABLE public.authentik_providers_scim_scimuser OWNER TO authentik;
+
+--
+-- Name: authentik_rbac_role; Type: TABLE; Schema: public; Owner: authentik
+--
+
+CREATE TABLE public.authentik_rbac_role (
+    uuid uuid NOT NULL,
+    name text NOT NULL,
+    group_id integer NOT NULL
+);
+
+
+ALTER TABLE public.authentik_rbac_role OWNER TO authentik;
+
 --
 -- Name: authentik_sources_ldap_ldappropertymapping; Type: TABLE; Schema: public; Owner: authentik
 --
@@ -1195,7 +1389,9 @@ CREATE TABLE public.authentik_sources_ldap_ldapsource (
     sync_users boolean NOT NULL,
     sync_users_password boolean NOT NULL,
     group_membership_field text NOT NULL,
-    peer_certificate_id uuid
+    peer_certificate_id uuid,
+    client_certificate_id uuid,
+    sni boolean NOT NULL
 );
 
 
@@ -1307,7 +1503,8 @@ CREATE TABLE public.authentik_sources_saml_samlsource (
     allow_idp_initiated boolean NOT NULL,
     digest_algorithm character varying(50) NOT NULL,
     signature_algorithm character varying(50) NOT NULL,
-    pre_authentication_flow_id uuid NOT NULL
+    pre_authentication_flow_id uuid NOT NULL,
+    verification_kp_id uuid
 );
 
 
@@ -1336,7 +1533,8 @@ CREATE TABLE public.authentik_stages_authenticator_duo_authenticatorduostage (
     api_hostname text NOT NULL,
     configure_flow_id uuid,
     admin_integration_key text NOT NULL,
-    admin_secret_key text NOT NULL
+    admin_secret_key text NOT NULL,
+    friendly_name text
 );
 
 
@@ -1387,7 +1585,8 @@ CREATE TABLE public.authentik_stages_authenticator_sms_authenticatorsmsstage (
     auth_password text NOT NULL,
     auth_type text NOT NULL,
     verify_only boolean NOT NULL,
-    mapping_id uuid
+    mapping_id uuid,
+    friendly_name text
 );
 
 
@@ -1433,12 +1632,74 @@ ALTER TABLE public.authentik_stages_authenticator_sms_smsdevice ALTER COLUMN id
 CREATE TABLE public.authentik_stages_authenticator_static_authenticatorstaticstage (
     stage_ptr_id uuid NOT NULL,
     token_count integer NOT NULL,
-    configure_flow_id uuid
+    configure_flow_id uuid,
+    friendly_name text,
+    token_length integer NOT NULL,
+    CONSTRAINT authentik_stages_authen_token_count_72138a40_check CHECK ((token_count >= 0)),
+    CONSTRAINT authentik_stages_authenticator_static_authen_token_length_check CHECK ((token_length >= 0))
 );
 
 
 ALTER TABLE public.authentik_stages_authenticator_static_authenticatorstaticstage OWNER TO authentik;
 
+--
+-- Name: authentik_stages_authenticator_static_staticdevice; Type: TABLE; Schema: public; Owner: authentik
+--
+
+CREATE TABLE public.authentik_stages_authenticator_static_staticdevice (
+    id integer NOT NULL,
+    name character varying(64) NOT NULL,
+    confirmed boolean NOT NULL,
+    user_id integer NOT NULL,
+    throttling_failure_count integer NOT NULL,
+    throttling_failure_timestamp timestamp with time zone,
+    CONSTRAINT otp_static_staticdevice_throttling_failure_count_check CHECK ((throttling_failure_count >= 0))
+);
+
+
+ALTER TABLE public.authentik_stages_authenticator_static_staticdevice OWNER TO authentik;
+
+--
+-- Name: authentik_stages_authenticator_static_staticdevice_id_seq; Type: SEQUENCE; Schema: public; Owner: authentik
+--
+
+ALTER TABLE public.authentik_stages_authenticator_static_staticdevice ALTER COLUMN id ADD GENERATED BY DEFAULT AS IDENTITY (
+    SEQUENCE NAME public.authentik_stages_authenticator_static_staticdevice_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1
+);
+
+
+--
+-- Name: authentik_stages_authenticator_static_statictoken; Type: TABLE; Schema: public; Owner: authentik
+--
+
+CREATE TABLE public.authentik_stages_authenticator_static_statictoken (
+    id integer NOT NULL,
+    token character varying(16) NOT NULL,
+    device_id integer NOT NULL
+);
+
+
+ALTER TABLE public.authentik_stages_authenticator_static_statictoken OWNER TO authentik;
+
+--
+-- Name: authentik_stages_authenticator_static_statictoken_id_seq; Type: SEQUENCE; Schema: public; Owner: authentik
+--
+
+ALTER TABLE public.authentik_stages_authenticator_static_statictoken ALTER COLUMN id ADD GENERATED BY DEFAULT AS IDENTITY (
+    SEQUENCE NAME public.authentik_stages_authenticator_static_statictoken_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1
+);
+
+
 --
 -- Name: authentik_stages_authenticator_totp_authenticatortotpstage; Type: TABLE; Schema: public; Owner: authentik
 --
@@ -1446,12 +1707,54 @@ ALTER TABLE public.authentik_stages_authenticator_static_authenticatorstaticstag
 CREATE TABLE public.authentik_stages_authenticator_totp_authenticatortotpstage (
     stage_ptr_id uuid NOT NULL,
     digits integer NOT NULL,
-    configure_flow_id uuid
+    configure_flow_id uuid,
+    friendly_name text
 );
 
 
 ALTER TABLE public.authentik_stages_authenticator_totp_authenticatortotpstage OWNER TO authentik;
 
+--
+-- Name: authentik_stages_authenticator_totp_totpdevice; Type: TABLE; Schema: public; Owner: authentik
+--
+
+CREATE TABLE public.authentik_stages_authenticator_totp_totpdevice (
+    id integer NOT NULL,
+    name character varying(64) NOT NULL,
+    confirmed boolean NOT NULL,
+    key character varying(80) NOT NULL,
+    step smallint NOT NULL,
+    t0 bigint NOT NULL,
+    digits smallint NOT NULL,
+    tolerance smallint NOT NULL,
+    drift smallint NOT NULL,
+    last_t bigint NOT NULL,
+    user_id integer NOT NULL,
+    throttling_failure_count integer NOT NULL,
+    throttling_failure_timestamp timestamp with time zone,
+    CONSTRAINT otp_totp_totpdevice_digits_check CHECK ((digits >= 0)),
+    CONSTRAINT otp_totp_totpdevice_step_check CHECK ((step >= 0)),
+    CONSTRAINT otp_totp_totpdevice_throttling_failure_count_check CHECK ((throttling_failure_count >= 0)),
+    CONSTRAINT otp_totp_totpdevice_tolerance_check CHECK ((tolerance >= 0))
+);
+
+
+ALTER TABLE public.authentik_stages_authenticator_totp_totpdevice OWNER TO authentik;
+
+--
+-- Name: authentik_stages_authenticator_totp_totpdevice_id_seq; Type: SEQUENCE; Schema: public; Owner: authentik
+--
+
+ALTER TABLE public.authentik_stages_authenticator_totp_totpdevice ALTER COLUMN id ADD GENERATED BY DEFAULT AS IDENTITY (
+    SEQUENCE NAME public.authentik_stages_authenticator_totp_totpdevice_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1
+);
+
+
 --
 -- Name: authentik_stages_authenticator_validate_authenticatorvalida3e25; Type: TABLE; Schema: public; Owner: authentik
 --
@@ -1503,7 +1806,8 @@ CREATE TABLE public.authentik_stages_authenticator_webauthn_authenticatewebauth4
     configure_flow_id uuid,
     user_verification text NOT NULL,
     authenticator_attachment text,
-    resident_key_requirement text NOT NULL
+    resident_key_requirement text NOT NULL,
+    friendly_name text
 );
 
 
@@ -1516,7 +1820,7 @@ ALTER TABLE public.authentik_stages_authenticator_webauthn_authenticatewebauth4b
 CREATE TABLE public.authentik_stages_authenticator_webauthn_webauthndevice (
     id integer NOT NULL,
     name text NOT NULL,
-    credential_id character varying(300) NOT NULL,
+    credential_id text NOT NULL,
     public_key text NOT NULL,
     sign_count integer NOT NULL,
     rp_id character varying(253) NOT NULL,
@@ -1606,7 +1910,8 @@ ALTER TABLE public.authentik_stages_consent_userconsent ALTER COLUMN id ADD GENE
 --
 
 CREATE TABLE public.authentik_stages_deny_denystage (
-    stage_ptr_id uuid NOT NULL
+    stage_ptr_id uuid NOT NULL,
+    deny_message text NOT NULL
 );
 
 
@@ -1752,7 +2057,9 @@ CREATE TABLE public.authentik_stages_prompt_prompt (
     "order" integer NOT NULL,
     sub_text text NOT NULL,
     placeholder_expression boolean NOT NULL,
-    name text NOT NULL
+    name text NOT NULL,
+    initial_value text NOT NULL,
+    initial_value_expression boolean NOT NULL
 );
 
 
@@ -1840,7 +2147,9 @@ ALTER TABLE public.authentik_stages_user_delete_userdeletestage OWNER TO authent
 
 CREATE TABLE public.authentik_stages_user_login_userloginstage (
     stage_ptr_id uuid NOT NULL,
-    session_duration text NOT NULL
+    session_duration text NOT NULL,
+    terminate_other_sessions boolean NOT NULL,
+    remember_me_offset text NOT NULL
 );
 
 
@@ -1866,7 +2175,8 @@ CREATE TABLE public.authentik_stages_user_write_userwritestage (
     create_users_as_inactive boolean NOT NULL,
     create_users_group_id uuid,
     user_path_template text NOT NULL,
-    user_creation_mode text NOT NULL
+    user_creation_mode text NOT NULL,
+    user_type text NOT NULL
 );
 
 
@@ -2024,122 +2334,23 @@ ALTER TABLE public.guardian_userobjectpermission ALTER COLUMN id ADD GENERATED B
 
 
 --
--- Name: otp_static_staticdevice; Type: TABLE; Schema: public; Owner: authentik
---
-
-CREATE TABLE public.otp_static_staticdevice (
-    id integer NOT NULL,
-    name character varying(64) NOT NULL,
-    confirmed boolean NOT NULL,
-    user_id integer NOT NULL,
-    throttling_failure_count integer NOT NULL,
-    throttling_failure_timestamp timestamp with time zone,
-    CONSTRAINT otp_static_staticdevice_throttling_failure_count_check CHECK ((throttling_failure_count >= 0))
-);
-
-
-ALTER TABLE public.otp_static_staticdevice OWNER TO authentik;
-
---
--- Name: otp_static_staticdevice_id_seq; Type: SEQUENCE; Schema: public; Owner: authentik
+-- Data for Name: auth_group; Type: TABLE DATA; Schema: public; Owner: authentik
 --
 
-ALTER TABLE public.otp_static_staticdevice ALTER COLUMN id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.otp_static_staticdevice_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
+COPY public.auth_group (id, name) FROM stdin;
+\.
 
 
 --
--- Name: otp_static_statictoken; Type: TABLE; Schema: public; Owner: authentik
+-- Data for Name: auth_group_permissions; Type: TABLE DATA; Schema: public; Owner: authentik
 --
 
-CREATE TABLE public.otp_static_statictoken (
-    id integer NOT NULL,
-    token character varying(16) NOT NULL,
-    device_id integer NOT NULL
-);
-
+COPY public.auth_group_permissions (id, group_id, permission_id) FROM stdin;
+\.
 
-ALTER TABLE public.otp_static_statictoken OWNER TO authentik;
 
 --
--- Name: otp_static_statictoken_id_seq; Type: SEQUENCE; Schema: public; Owner: authentik
---
-
-ALTER TABLE public.otp_static_statictoken ALTER COLUMN id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.otp_static_statictoken_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: otp_totp_totpdevice; Type: TABLE; Schema: public; Owner: authentik
---
-
-CREATE TABLE public.otp_totp_totpdevice (
-    id integer NOT NULL,
-    name character varying(64) NOT NULL,
-    confirmed boolean NOT NULL,
-    key character varying(80) NOT NULL,
-    step smallint NOT NULL,
-    t0 bigint NOT NULL,
-    digits smallint NOT NULL,
-    tolerance smallint NOT NULL,
-    drift smallint NOT NULL,
-    last_t bigint NOT NULL,
-    user_id integer NOT NULL,
-    throttling_failure_count integer NOT NULL,
-    throttling_failure_timestamp timestamp with time zone,
-    CONSTRAINT otp_totp_totpdevice_digits_check CHECK ((digits >= 0)),
-    CONSTRAINT otp_totp_totpdevice_step_check CHECK ((step >= 0)),
-    CONSTRAINT otp_totp_totpdevice_throttling_failure_count_check CHECK ((throttling_failure_count >= 0)),
-    CONSTRAINT otp_totp_totpdevice_tolerance_check CHECK ((tolerance >= 0))
-);
-
-
-ALTER TABLE public.otp_totp_totpdevice OWNER TO authentik;
-
---
--- Name: otp_totp_totpdevice_id_seq; Type: SEQUENCE; Schema: public; Owner: authentik
---
-
-ALTER TABLE public.otp_totp_totpdevice ALTER COLUMN id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.otp_totp_totpdevice_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Data for Name: auth_group; Type: TABLE DATA; Schema: public; Owner: authentik
---
-
-COPY public.auth_group (id, name) FROM stdin;
-\.
-
-
---
--- Data for Name: auth_group_permissions; Type: TABLE DATA; Schema: public; Owner: authentik
---
-
-COPY public.auth_group_permissions (id, group_id, permission_id) FROM stdin;
-\.
-
-
---
--- Data for Name: auth_permission; Type: TABLE DATA; Schema: public; Owner: authentik
+-- Data for Name: auth_permission; Type: TABLE DATA; Schema: public; Owner: authentik
 --
 
 COPY public.auth_permission (id, name, content_type_id, codename) FROM stdin;
@@ -2503,6 +2714,59 @@ COPY public.auth_permission (id, name, content_type_id, codename) FROM stdin;
 358	Can change OAuth2 Access Token	88	change_accesstoken
 359	Can delete OAuth2 Access Token	88	delete_accesstoken
 360	Can view OAuth2 Access Token	88	view_accesstoken
+361	Can add Radius Provider	89	add_radiusprovider
+362	Can change Radius Provider	89	change_radiusprovider
+363	Can delete Radius Provider	89	delete_radiusprovider
+364	Can view Radius Provider	89	view_radiusprovider
+365	Can add SCIM Mapping	90	add_scimmapping
+366	Can change SCIM Mapping	90	change_scimmapping
+367	Can delete SCIM Mapping	90	delete_scimmapping
+368	Can view SCIM Mapping	90	view_scimmapping
+369	Can add SCIM Provider	91	add_scimprovider
+370	Can change SCIM Provider	91	change_scimprovider
+371	Can delete SCIM Provider	91	delete_scimprovider
+372	Can view SCIM Provider	91	view_scimprovider
+373	Can add scim user	92	add_scimuser
+374	Can change scim user	92	change_scimuser
+375	Can delete scim user	92	delete_scimuser
+376	Can view scim user	92	view_scimuser
+377	Can add scim group	93	add_scimgroup
+378	Can change scim group	93	change_scimgroup
+379	Can delete scim group	93	delete_scimgroup
+380	Can view scim group	93	view_scimgroup
+381	Can add license	94	add_license
+382	Can change license	94	change_license
+383	Can delete license	94	delete_license
+384	Can view license	94	view_license
+385	Can add license usage	95	add_licenseusage
+386	Can change license usage	95	change_licenseusage
+387	Can delete license usage	95	delete_licenseusage
+388	Can view license usage	95	view_licenseusage
+389	Can inspect a Flow's execution	11	inspect_flow
+390	Can add Role	96	add_role
+391	Can change Role	96	change_role
+392	Can delete Role	96	delete_role
+393	Can view Role	96	view_role
+394	Can assign permissions to users	96	assign_role_permissions
+395	Can unassign permissions from users	96	unassign_role_permissions
+396	Can view system info	97	view_system_info
+397	Can view system tasks	97	view_system_tasks
+398	Can run system tasks	97	run_system_tasks
+399	Can access admin interface	97	access_admin_interface
+400	Can add Static Device	98	add_staticdevice
+401	Can change Static Device	98	change_staticdevice
+402	Can delete Static Device	98	delete_staticdevice
+403	Can view Static Device	98	view_staticdevice
+404	Can add Static Token	99	add_statictoken
+405	Can change Static Token	99	change_statictoken
+406	Can delete Static Token	99	delete_statictoken
+407	Can view Static Token	99	view_statictoken
+408	Can add TOTP Device	100	add_totpdevice
+409	Can change TOTP Device	100	change_totpdevice
+410	Can delete TOTP Device	100	delete_totpdevice
+411	Can view TOTP Device	100	view_totpdevice
+412	Can assign permissions to users	79	assign_user_permissions
+413	Can unassign permissions from users	79	unassign_user_permissions
 \.
 
 
@@ -2511,25 +2775,28 @@ COPY public.auth_permission (id, name, content_type_id, codename) FROM stdin;
 --
 
 COPY public.authentik_blueprints_blueprintinstance (created, last_updated, managed, instance_uuid, name, metadata, path, context, last_applied, last_applied_hash, status, enabled, managed_models, content) FROM stdin;
-2022-10-25 09:00:53.397894+00	2022-10-25 09:10:14.895369+00	\N	213482b6-347a-4595-ad7d-0840332a7cce	System - OAuth2 Provider - Scopes	{"name": "System - OAuth2 Provider - Scopes", "labels": {"blueprints.goauthentik.io/system": "true"}}	system/providers-oauth2.yaml	{}	2022-10-25 09:10:14.895374+00	02f2a78e41e3dfd1961f58670180c4cbc363a817ad2374703c6c00cb13ac7bd6384b6f43068fdec3234bc0670c2fc648d99d3a6e6605a5dcbf40e518533abb41	successful	t	{}	
-2022-10-25 09:00:53.310947+00	2022-10-25 09:10:09.618136+00	\N	1b7a73a0-43a3-4f2a-a7ee-12b0d13f4f24	Default - Source authentication flow	{"name": "Default - Source authentication flow", "labels": {}}	default/20-flow-default-source-authentication.yaml	{}	2022-10-25 09:10:09.618142+00	ca118ec7730cc3d4bc92ba1ae24f8a48d907334eec49ad42c4879fcb4be280ad71b4d382f695eb23dc58914fda64fe99b4fa2429859730495cd3bdaa9d9bb2e7	successful	t	{}	
-2022-10-25 09:00:53.350088+00	2022-10-25 09:10:16.645135+00	\N	92453927-91a0-4b15-8333-b2da469353d7	Default - Out-of-box-experience flow	{"name": "Default - Out-of-box-experience flow", "labels": {}}	default/91-flow-oobe.yaml	{}	2022-10-25 09:10:16.64514+00	438cbcda03cf8ede7626243ae323c52122188a11cb36a4aa558aa75b28b74994577099c8884b7527c4ef97417e62e17e13edd6f7a1984c8f7306f9a4fe81f020	successful	t	{}	
-2022-10-25 09:00:53.340402+00	2022-10-25 09:10:17.999704+00	\N	f08f67f4-fbd6-418d-bf24-e228ca2ae34e	Default - Tenant	{"name": "Default - Tenant", "labels": {}}	default/90-default-tenant.yaml	{}	2022-10-25 09:10:17.999712+00	e344cbc00fb28d259089011b56d7973851d04234d74b4c5d4dd2b84fcb9bb26c70142dafa927a768631810e2c08a65823fde450cc1e28c177be08e43f89ecf9f	successful	t	{}	
 2022-10-25 09:00:53.406863+00	2022-10-25 09:10:18.979063+00	\N	c447f75b-a332-422c-a7dd-74bae02281ef	System - SAML Provider - Mappings	{"name": "System - SAML Provider - Mappings", "labels": {"blueprints.goauthentik.io/system": "true"}}	system/providers-saml.yaml	{}	2022-10-25 09:10:18.979067+00	15301d80ffa95fa0c37bc14fe3b5aaa74224a5998f82cdbd1a701ab96f05290b05dcee25df7053282c516383a6ba9890cbaac11aeca0fe1f9717f24e3d819ae3	successful	t	{}	
-2022-10-25 09:00:53.335974+00	2022-10-25 09:10:14.729439+00	\N	1217d36b-4f47-4ae1-9a5b-d65fdd507895	Default - Events Transport & Rules	{"name": "Default - Events Transport & Rules", "labels": {}}	default/40-events-default.yaml	{}	2022-10-25 09:10:14.729446+00	2064655bcf32b92e6ca7cc8bc5c872c76937b708a25607f25586c55f2bbe1fe410ea5287f75d90dc6defaeaf0e3f9e2a933a34b8ef5a49b2abdadf1a8c92c9d7	successful	t	{}	
-2022-10-25 09:00:53.400474+00	2022-10-25 09:10:17.189551+00	\N	de836c31-6248-4155-b6d2-94f8e81ba828	System - Proxy Provider - Scopes	{"name": "System - Proxy Provider - Scopes", "labels": {"blueprints.goauthentik.io/system": "true"}}	system/providers-proxy.yaml	{}	2022-10-25 09:10:17.189557+00	c92fa491977a1a528005dd11953a6c524ae91cbb8f390938a8083211df02428168c883e75ce3b4a76484cad89310633ef34f2a8a6a272b27e1a53914ea53a8d5	successful	t	{}	
-2022-10-25 09:00:53.328036+00	2022-10-25 09:10:17.987802+00	\N	2cf975a1-1f35-4976-aaaa-b3a62d0b0c8d	Default - User settings flow	{"name": "Default - User settings flow", "labels": {}}	default/30-flow-default-user-settings-flow.yaml	{}	2022-10-25 09:10:17.987806+00	a5288e994e544ec8a37722ffd3484b893fc6c5ec689ef62450da8bab1c67af0d2a9c0b137387b43f2053d6b3f2c01c4e9f33d9f680416e1940f25323451b664a	successful	t	{}	
-2022-10-25 09:00:53.413147+00	2022-10-25 09:10:19.535643+00	\N	6c91b3d1-2c5f-435e-b678-cb1b061cb9d8	System - LDAP Source - Mappings	{"name": "System - LDAP Source - Mappings", "labels": {"blueprints.goauthentik.io/system": "true"}}	system/sources-ldap.yaml	{}	2022-10-25 09:10:19.535647+00	a764c21c655e7c65bc93ae1ddd839cea9b4726a41ad2b7ca70323d48b0676beda6a67a3b8274cfaa65ed0f4cc5c089a44aeead66ef4579c78c5761861577bbe2	successful	t	{}	
-2022-10-25 09:00:53.317415+00	2022-10-25 09:10:12.218147+00	\N	157ef54a-3fc7-4529-81c1-17fb0e83c451	Default - Source enrollment flow	{"name": "Default - Source enrollment flow", "labels": {}}	default/20-flow-default-source-enrollment.yaml	{}	2022-10-25 09:10:12.218151+00	cb2f4f1bdc25e16c15cc4ec8d6eee0322867dd6cffa8ea3b92de716c737e4131e669692c47d86c7a4a8ec6b0e30eadf1b49d607863f49dcc2718815f20935ea3	successful	t	{}	
-2022-10-25 09:00:53.281978+00	2022-10-25 09:10:17.748151+00	\N	69074314-6974-4913-ba5d-48c1496c0f64	Default - Password change flow	{"name": "Default - Password change flow", "labels": {}}	default/0-flow-password-change.yaml	{}	2022-10-25 09:10:17.748155+00	0be8cfcc5e9f619eab59f3eaf13c1ec94d1a73b2357cb7d62acb35d23cb4fc2dcbecc055c8df048a2f8d44a537e672936463d3dc02cc15e9a2f31de62ddc9a3c	successful	t	{}	
-2022-10-25 09:00:53.288147+00	2022-10-25 09:10:17.817575+00	\N	714dc451-7831-4016-b8e8-4e2e050233e1	Default - Authentication flow	{"name": "Default - Authentication flow", "labels": {}}	default/10-flow-default-authentication-flow.yaml	{}	2022-10-25 09:10:17.817579+00	eb9af60243f762b4288943af5d25f4be6633444b54be1e84a9d850ee0cf84c05c45abd0321b71587619593508b49dde279788517231bd114f10350cfcaefa272	successful	t	{}	
-2022-10-25 09:00:53.297924+00	2023-03-13 09:19:05.28134+00	\N	e47fd8ed-c357-4220-bb82-16931f998fe0	Default - TOTP MFA setup flow	{"name": "Default - TOTP MFA setup flow", "labels": {}}	default/20-flow-default-authenticator-totp-setup.yaml	{}	2023-03-13 09:19:05.281345+00	43d2dcce568cbbe0f5409f52e2250ce4aa28ca34049cfc6f284070a2c28f81e85bb11fcf797f171beb1cb7aa15d70f26175ba9010b615563cac6057fc2563104	successful	t	{}	
-2022-10-25 09:00:53.300852+00	2023-03-13 09:19:06.955701+00	\N	658a7307-9f70-4d89-93ea-b6160a092741	Default - WebAuthn MFA setup flow	{"name": "Default - WebAuthn MFA setup flow", "labels": {}}	default/20-flow-default-authenticator-webauthn-setup.yaml	{}	2023-03-13 09:19:06.955709+00	67ef724536f41c451b9a88edd01100bd9ba4460f41b88f86a1385f9df30617371d0ddb610526b0a93aa32b9918475a63db03dfcf57bf7d0b02e7b509f9d35870	successful	t	{}	
-2022-10-25 09:00:53.306829+00	2023-03-13 09:19:07.746788+00	\N	a463e186-ff86-4d2e-8c04-700e05a741af	Default - Provider authorization flow (implicit consent)	{"name": "Default - Provider authorization flow (implicit consent)", "labels": {}}	default/20-flow-default-provider-authorization-implicit-consent.yaml	{}	2023-03-13 09:19:07.746797+00	2321088d922a57fdb741f6857eb48d3090210b552a6ecadf9b08de4832f574c5231f37943da3dfda3a4fa07c900d236ace3d237710e2e986a207c758859c1ecb	successful	t	{}	
-2022-10-25 09:00:53.319721+00	2023-03-13 09:19:08.143754+00	\N	29fc34e4-d6e5-47ed-97f0-2923728a9f81	Default - Source pre-authentication flow	{"name": "Default - Source pre-authentication flow", "labels": {}}	default/20-flow-default-source-pre-authentication.yaml	{}	2023-03-13 09:19:08.143761+00	51b6b65fb60f2f925d80b38cf173e7aa1bc00a074990e8d0b0dfaae088007ceb9051d0722f41500da309af5d0c78417dfa08a40c706203c3d6ee1eb613ad564c	successful	t	{}	
-2022-10-25 09:00:53.295041+00	2023-03-13 09:19:05.301487+00	\N	2cf52321-80c1-4c45-a598-ccdd61af26aa	Default - Static MFA setup flow	{"name": "Default - Static MFA setup flow", "labels": {}}	default/20-flow-default-authenticator-static-setup.yaml	{}	2023-03-13 09:19:05.301492+00	552f08718b573593e1b643f47734a1c185d7bc9efbea9c8d3dc49e6fd5060cd979098637fa20d958f4c3c9ff375e0fde3b871c956b87ebfbb1fb9319ba073bcb	successful	t	{}	
-2022-10-25 09:00:53.303808+00	2023-03-13 09:19:07.800567+00	\N	8f64e59f-b41e-4c84-891b-492df2873c7b	Default - Provider authorization flow (explicit consent)	{"name": "Default - Provider authorization flow (explicit consent)", "labels": {}}	default/20-flow-default-provider-authorization-explicit-consent.yaml	{}	2023-03-13 09:19:07.800573+00	598eee861d8814c0dc200542f59e5d8085c140f7131e87a9fc6baf688a3e9e7b0a32e865c439084f76b11992ce056be574e5aba2664375cee287206d66d345c9	successful	t	{}	
-2022-10-25 09:00:53.291824+00	2023-03-13 09:19:04.593543+00	\N	f999866c-2729-44cd-aee3-53e3df227bd6	Default - Invalidation flow	{"name": "Default - Invalidation flow", "labels": {}}	default/10-flow-default-invalidation-flow.yaml	{}	2023-03-13 09:19:04.593549+00	a143bf2b9a1d20e2078389f7c37d213e51c52ea6a8df8f8ae7a7e6a1bb129ec4b862803aa44b8b1dbfe727e98e45cedac7a1a03632065040c87f045dcabab86a	successful	t	{}	
+2024-01-10 13:34:48.625092+00	2024-01-10 13:34:54.474912+00	\N	7adb4b0a-c9bf-4872-9220-bbe6245e3162	Default - Tenant	{"name": "Default - Tenant", "labels": {}}	default/default-tenant.yaml	{}	2024-01-10 13:34:54.474916+00	65a18916f00bcac6bb8a2fb5d05f891eb1473ef262d4d9c78afeba012efbaf1330c2141923f7ffade17472be0c19b9f0b53b40f46e66f07a35bb6d2c00922aee	successful	t	{}	
+2024-01-10 13:34:48.638166+00	2024-01-10 13:34:52.69052+00	\N	55bfa7bc-b223-41f2-b105-1f95da2685e6	Default - Events Transport & Rules	{"name": "Default - Events Transport & Rules", "labels": {}}	default/events-default.yaml	{}	2024-01-10 13:34:52.690524+00	bbee0ba3e8e51ea5290dbb2081c7c0a18f633766ff8f43c8897d68d0ea51b648cdffb345239b55cbab72d041972e80aea793d8a7a379f25aca02882f9fbf94ff	successful	t	{}	
+2024-01-10 13:34:48.645446+00	2024-01-10 13:34:53.155446+00	\N	e990d111-e8a0-4ad8-9d7e-6a5d2437a146	Default - Static MFA setup flow	{"name": "Default - Static MFA setup flow", "labels": {}}	default/flow-default-authenticator-static-setup.yaml	{}	2024-01-10 13:34:53.155449+00	552f08718b573593e1b643f47734a1c185d7bc9efbea9c8d3dc49e6fd5060cd979098637fa20d958f4c3c9ff375e0fde3b871c956b87ebfbb1fb9319ba073bcb	successful	t	{}	
+2024-01-10 13:34:48.649232+00	2024-01-10 13:34:53.730219+00	\N	e23700e3-9a34-4c4e-875d-91cfb5c4f256	Default - TOTP MFA setup flow	{"name": "Default - TOTP MFA setup flow", "labels": {}}	default/flow-default-authenticator-totp-setup.yaml	{}	2024-01-10 13:34:53.730224+00	43d2dcce568cbbe0f5409f52e2250ce4aa28ca34049cfc6f284070a2c28f81e85bb11fcf797f171beb1cb7aa15d70f26175ba9010b615563cac6057fc2563104	successful	t	{}	
+2024-01-10 13:34:48.653021+00	2024-01-10 13:34:54.090272+00	\N	d359504f-978c-45a0-b6aa-b966c6e03cd7	Default - WebAuthn MFA setup flow	{"name": "Default - WebAuthn MFA setup flow", "labels": {}}	default/flow-default-authenticator-webauthn-setup.yaml	{}	2024-01-10 13:34:54.090276+00	67ef724536f41c451b9a88edd01100bd9ba4460f41b88f86a1385f9df30617371d0ddb610526b0a93aa32b9918475a63db03dfcf57bf7d0b02e7b509f9d35870	successful	t	{}	
+2024-01-10 13:34:48.686469+00	2024-01-10 13:34:54.232304+00	\N	8a3417bb-039c-4bfe-b6ff-5d5a8911f01f	Default - Password change flow	{"name": "Default - Password change flow", "labels": {}}	default/flow-password-change.yaml	{}	2024-01-10 13:34:54.232307+00	6d7f1794e5a024d80e373fa9c9c791fa4837c690ad70d707fdf16208dec7c4b7feb490ab83f1db3e7d37f3d3ea41dfc4b06d87a221ffb208c076ff6672c27cc1	successful	t	{}	
+2024-01-10 13:34:48.641729+00	2024-01-10 13:34:54.29831+00	\N	f5735a05-808c-4889-bba5-988fcb3063b6	Default - Authentication flow	{"name": "Default - Authentication flow", "labels": {}}	default/flow-default-authentication-flow.yaml	{}	2024-01-10 13:34:54.298314+00	4a184d3cf46bcc05e3e6e2428b1100877d3b3a6ddf934a936d65f26ef81bc5cfb5481cf3128217ee3bbf4d1a83060f4b0c7b43a88546827b9e65fdaa361e8259	successful	t	{}	
+2024-01-10 13:34:48.656613+00	2024-01-10 13:34:54.329178+00	\N	a1c83a68-6d68-47ae-af9a-62c9762cf788	Default - Invalidation flow	{"name": "Default - Invalidation flow", "labels": {}}	default/flow-default-invalidation-flow.yaml	{}	2024-01-10 13:34:54.329181+00	a143bf2b9a1d20e2078389f7c37d213e51c52ea6a8df8f8ae7a7e6a1bb129ec4b862803aa44b8b1dbfe727e98e45cedac7a1a03632065040c87f045dcabab86a	successful	t	{}	
+2024-01-10 13:34:48.679748+00	2024-01-10 13:34:54.462557+00	\N	f4774725-5832-4732-a797-c06f0893fc63	Default - User settings flow	{"name": "Default - User settings flow", "labels": {}}	default/flow-default-user-settings-flow.yaml	{}	2024-01-10 13:34:54.462561+00	192e32332465563ca0ec85be2ef4057a6bb8aeb3a291503d184f66c45377caa313225dc367780ef5ea4f1c86fbddc0b7706dd4cf0a3b9f5528abc98c790a883b	successful	t	{}	
+2022-10-25 09:00:53.413147+00	2024-01-10 13:36:28.987297+00	\N	6c91b3d1-2c5f-435e-b678-cb1b061cb9d8	System - LDAP Source - Mappings	{"name": "System - LDAP Source - Mappings", "labels": {"blueprints.goauthentik.io/system": "true"}}	system/sources-ldap.yaml	{}	2024-01-10 13:36:28.987301+00	cd457d2cef04cfc24d7bbadfac35d8ee1e91b04a0a1662a18a0428e97043bdbfbe7a23b21b065d2e201c291c99f22a38b32436d76edfa86dbae3a5dc4d0ae4fc	successful	t	{}	
+2024-01-10 13:34:48.704062+00	2024-01-10 13:36:28.914859+00	\N	d2e1c529-0d50-466b-8e49-99be615d70ae	System - SCIM Provider - Mappings	{"name": "System - SCIM Provider - Mappings", "labels": {"blueprints.goauthentik.io/system": "true"}}	system/providers-scim.yaml	{}	2024-01-10 13:36:28.914863+00	02355b6b64a68ce55025b5ddfe82f1153e1cc96bb3d2dad1176eef58a2285090944db5d583dd3a196bb5b7366f023412e043e72738613dc00f943f836cfc5b77	successful	t	{}	
+2024-01-10 13:34:48.659762+00	2024-01-10 13:36:28.345301+00	\N	24622aa4-74dc-46ba-8dba-f49da993c93e	Default - Provider authorization flow (explicit consent)	{"name": "Default - Provider authorization flow (explicit consent)", "labels": {}}	default/flow-default-provider-authorization-explicit-consent.yaml	{}	2024-01-10 13:36:28.345305+00	598eee861d8814c0dc200542f59e5d8085c140f7131e87a9fc6baf688a3e9e7b0a32e865c439084f76b11992ce056be574e5aba2664375cee287206d66d345c9	successful	t	{}	
+2024-01-10 13:34:48.663845+00	2024-01-10 13:36:28.370938+00	\N	ec217fcf-60d9-4503-9e9c-345ff752a84d	Default - Provider authorization flow (implicit consent)	{"name": "Default - Provider authorization flow (implicit consent)", "labels": {}}	default/flow-default-provider-authorization-implicit-consent.yaml	{}	2024-01-10 13:36:28.370942+00	2321088d922a57fdb741f6857eb48d3090210b552a6ecadf9b08de4832f574c5231f37943da3dfda3a4fa07c900d236ace3d237710e2e986a207c758859c1ecb	successful	t	{}	
+2024-01-10 13:34:48.672318+00	2024-01-10 13:36:28.547263+00	\N	2e2d0f4b-634d-4b56-a0ea-f06b33a789be	Default - Source enrollment flow	{"name": "Default - Source enrollment flow", "labels": {}}	default/flow-default-source-enrollment.yaml	{}	2024-01-10 13:36:28.547269+00	09d441466d7e215601551bcd7c147616bf3794909f706c99c8fe527120d6fc612c1e4885c09bca433b97273e6a3fb10840d957bd7c898b14495a7bb245060792	successful	t	{}	
+2024-01-10 13:34:48.683193+00	2024-01-10 13:36:28.724385+00	\N	c0185639-17d7-4acb-bba0-f2044a8639a2	Default - Out-of-box-experience flow	{"name": "Default - Out-of-box-experience flow", "labels": {}}	default/flow-oobe.yaml	{}	2024-01-10 13:36:28.724389+00	92a35a46db8ccbcd707c6065bf07797ab7a45406e24660d921224fb534875a2e204acf9bc65bcfc3a7b6f876414f0ee6d43669fa51244022afdf1b51aac11940	successful	t	{}	
+2022-10-25 09:00:53.400474+00	2024-01-10 13:36:28.879985+00	\N	de836c31-6248-4155-b6d2-94f8e81ba828	System - Proxy Provider - Scopes	{"name": "System - Proxy Provider - Scopes", "labels": {"blueprints.goauthentik.io/system": "true"}}	system/providers-proxy.yaml	{}	2024-01-10 13:36:28.879989+00	a17fede4a19025273be4e8556cdef4b62c6a4ebc8051f6dde98657cf571f16cf7ce45388539b68e891f96184b6cde3bb2273de43643e1b6d788548cfbf0393dc	successful	t	{}	
+2022-10-25 09:00:53.397894+00	2024-01-10 13:36:28.896306+00	\N	213482b6-347a-4595-ad7d-0840332a7cce	System - OAuth2 Provider - Scopes	{"name": "System - OAuth2 Provider - Scopes", "labels": {"blueprints.goauthentik.io/system": "true"}}	system/providers-oauth2.yaml	{}	2024-01-10 13:36:28.89631+00	bef8877737dd0345a5e88ef83518cbcdd45b2345037f925dc51eb7097bdbd0c4e1565aacdf08ec3ce2c0b90f8bcba013fa8618ea12881062e4e59d87a2abf992	successful	t	{}	
+2024-01-10 13:34:48.668685+00	2024-01-10 13:36:28.445116+00	\N	4ec2089d-f691-4167-bd7c-5e569f26e126	Default - Source authentication flow	{"name": "Default - Source authentication flow", "labels": {}}	default/flow-default-source-authentication.yaml	{}	2024-01-10 13:36:28.445119+00	d86613f21394af35d554692e9868e7e714bb7cbd99a362ef3b64476edc1ffcb832443610f193d3d116685a360a1734482a7152b6b6bc8913f45be9aac3934233	successful	t	{}	
+2024-01-10 13:34:48.676012+00	2024-01-10 13:36:28.470437+00	\N	60726d29-8b4f-461a-af0e-9f53a47016fa	Default - Source pre-authentication flow	{"name": "Default - Source pre-authentication flow", "labels": {}}	default/flow-default-source-pre-authentication.yaml	{}	2024-01-10 13:36:28.470448+00	51b6b65fb60f2f925d80b38cf173e7aa1bc00a074990e8d0b0dfaae088007ceb9051d0722f41500da309af5d0c78417dfa08a40c706203c3d6ee1eb613ad564c	successful	t	{}	
+2024-01-10 13:34:48.694474+00	2024-01-10 13:36:28.845959+00	\N	018eec69-91fa-45fd-9157-153b590aadf8	Migration - Remove old prompt fields	{"name": "Migration - Remove old prompt fields", "labels": {"blueprints.goauthentik.io/description": "Migrate to 2023.2, remove unused prompt fields"}}	migrations/migrate-prompt-name.yaml	{}	2024-01-10 13:36:28.845963+00	75617432af2bb8d9cbf74db0ba9d6ec1b123811fdb40975685386c85d8fa4046cc4749a8e6f1f3e0c1068e45bf2af73914c6ede5b3d31fa2ac3195a53b94cf43	successful	t	{}	
+2024-01-10 13:34:48.697665+00	2024-01-10 13:36:28.845678+00	\N	104c603e-f3e5-4e67-b3ad-ec31a9b2a9de	authentik Bootstrap	{"name": "authentik Bootstrap", "labels": {"blueprints.goauthentik.io/system": "true", "blueprints.goauthentik.io/description": "This blueprint configures the default admin user and group, and configures them for the [Automated install](https://goauthentik.io/docs/installation/automated-install).\\n", "blueprints.goauthentik.io/system-bootstrap": "true"}}	system/bootstrap.yaml	{}	2024-01-10 13:36:28.845683+00	c572042434ffa2218c5a30a656cbf10c80c434f19c596cdd9bc6aa37897af3be3f0ab0a73e332ebafb72bdf8a1a15937fb62c9077b484602edf4a196b632aa45	successful	t	{}	
 \.
 
 
@@ -2549,29 +2816,7 @@ d7dfa1d6-58cb-4bfc-94c5-38a2e507e290	Grafana OIDC	grafana-oidc				3			f
 --
 
 COPY public.authentik_core_authenticatedsession (expires, expiring, uuid, session_key, last_ip, last_user_agent, last_used, user_id) FROM stdin;
-2023-03-27 09:19:36.714022+00	t	33fe8ba2-6652-46bc-992f-97edf89c9024	pnrgpcmuzjc6jd2ae4z3242v4le8s4dq	172.21.0.1	Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/111.0	2023-03-13 09:19:36.714338+00	1
-2023-03-27 09:20:56.674782+00	t	db2c32ff-209a-4d71-a3c0-0dee0e024878	xps84azhqco49sstac6uj8jsjm9djtky	172.21.0.1	goauthentik.io/outpost/2023.1.2	2023-03-13 09:20:56.675277+00	6
-2023-03-27 09:21:58.815582+00	t	fb2c4db2-c31e-4381-ba85-67828f436acc	mwee9onydg2kpu2bg3pth8al2zv6jlve	172.21.0.1	goauthentik.io/outpost/2023.1.2	2023-03-13 09:21:58.815791+00	6
-2023-03-27 09:22:06.761376+00	t	b183a313-ee3f-4e6f-b40a-d895aecbba25	1hhujbpdfb5muhahlo90s8523scor7dy	172.21.0.1	goauthentik.io/outpost/2023.1.2	2023-03-13 09:22:06.761575+00	6
-2023-03-27 09:22:07.83058+00	t	23261a68-1274-45cf-84c8-57591f5f13d0	2usmu6zxqajue9y7gl40brm34zh8jyhu	172.21.0.1	goauthentik.io/outpost/2023.1.2	2023-03-13 09:22:07.830772+00	8
-2023-03-27 09:26:00.688+00	t	a1ea049c-5a2a-444f-bb0f-46f0cc1b83c2	t7k0uvsutwv5j7belns84z00di5bax5b	172.21.0.1	goauthentik.io/outpost/2023.1.2	2023-03-13 09:26:00.688213+00	6
-2023-03-27 09:27:12.748587+00	t	c91473b6-670e-471f-8fdd-342a912c26a3	twvhclnfbrpdro8g787rhchxsdw99vpy	172.21.0.1	goauthentik.io/outpost/2023.1.2	2023-03-13 09:27:12.748761+00	6
-2023-03-27 09:33:04.047499+00	t	b7d2c069-b68c-4674-b542-49ee8bcab49c	7anpa8pum56ecu84q910ey1tdgqt0l7a	172.21.0.1	goauthentik.io/outpost/2023.1.2	2023-03-13 09:33:04.048038+00	6
-2023-03-27 09:36:00.677614+00	t	1b7369c6-423c-4619-a95a-554fea065bb9	asz3sdzh4l8jap3v5fwobm0p3ryb3m6z	172.21.0.1	goauthentik.io/outpost/2023.1.2	2023-03-13 09:36:00.677783+00	6
-2023-03-27 09:38:09.280265+00	t	1d06b319-18fe-40a8-88b9-09a0fad5e9e7	wgivmdoyjh4j3lk4o35lxe1rgr4mtiiz	172.21.0.1	goauthentik.io/outpost/2023.1.2	2023-03-13 09:38:09.280422+00	6
-2023-03-27 09:46:00.676548+00	t	21e81f59-9584-489a-ae72-1c9be3788b5f	4ssznhrdtmibayofismpmq9pi4ji1z8y	172.21.0.1	goauthentik.io/outpost/2023.1.2	2023-03-13 09:46:00.676691+00	6
-2023-03-27 09:56:00.696737+00	t	7fefc723-7eb0-49c2-91dd-1b1c761f6863	vservymrqbrg4iqtr3tq2u3770fi9m5w	172.21.0.1	goauthentik.io/outpost/2023.1.2	2023-03-13 09:56:00.696955+00	6
-2023-03-27 12:15:42.983641+00	t	20e56a62-42d9-4a85-9354-8ecd546adc82	4u7n2w39blisa36ljoltvi1mnvn6k7rt	172.21.0.1	goauthentik.io/outpost/2023.1.2	2023-03-13 12:15:42.983795+00	6
-2023-03-27 12:16:00.756786+00	t	543a5423-0540-4a97-bea8-dd1a2fc1ef20	tlhzjzc8dus5akchnm7e3ivh2t8a7z5o	172.21.0.1	goauthentik.io/outpost/2023.1.2	2023-03-13 12:16:00.756966+00	6
-2023-03-27 12:16:25.282349+00	t	79648ae0-368e-4b54-ab74-bf8508f99c3b	izckm6qrlxf200ikhmp245gw1ud1jni2	172.21.0.1	goauthentik.io/outpost/2023.1.2	2023-03-13 12:16:25.282588+00	6
-2023-03-27 12:17:03.669358+00	t	f743c44b-7c71-488c-a065-d5e217fa5307	fuywipgbmgx1wzyf8654z1dniyy6yl9y	172.21.0.1	goauthentik.io/outpost/2023.1.2	2023-03-13 12:17:03.669511+00	6
-2023-03-27 12:17:27.480927+00	t	0da81503-cba6-44f5-a1ea-b81a43c8cdac	7icfpl80xx04jmth4untnhgznjw1jjcp	172.21.0.1	Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/111.0	2023-03-13 12:17:27.481193+00	8
-2023-03-27 12:22:20.180659+00	t	5df911c2-797f-4b77-82d2-fa66bdb251d0	ledovmptzdsj60tfv4irprijdaycu19d	172.21.0.1	goauthentik.io/outpost/2023.1.2	2023-03-13 12:22:20.180803+00	6
-2023-03-27 12:22:37.470262+00	t	21fcd520-e1d7-45bc-9691-6c14e51b4a1b	gznzvsfyrfjr6i8qt5oyggutd89mzi19	172.21.0.1	Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/111.0	2023-03-13 12:22:37.470585+00	8
-2023-03-27 12:35:42.672958+00	t	6674325a-4a57-4ae3-995f-c0769c7cb5c2	ookwxmfok1k9id4jediu5030pvrdnzoj	172.21.0.1	goauthentik.io/outpost/2023.1.2	2023-03-13 12:35:42.673195+00	6
-2023-03-27 12:36:00.775286+00	t	bb8317b6-8aab-44bd-9762-bb0a5cdd6854	qg1f4o9q2yihtvuejx8rz0exgcoxgxcq	172.21.0.1	goauthentik.io/outpost/2023.1.2	2023-03-13 12:36:00.775486+00	6
-2023-03-27 12:36:31.723397+00	t	42645d7c-a570-44e0-a030-d3078b54d978	m7skhobmxdhmrk4c3ne1yq6xbvfzrp29	172.21.0.1	Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/111.0	2023-03-13 12:36:31.723588+00	8
-2023-03-27 12:40:53.868898+00	t	4ba1f1c1-b066-4c1f-b483-b6cd3484f634	h2zyqqyoe9kxch9blcb8e42xzagr3r02	172.21.0.1	goauthentik.io/outpost/2023.1.2	2023-03-13 12:40:53.869061+00	6
+2024-01-25 22:11:15.829855+00	t	a1b000d1-d98e-4e84-8f3a-39476361245a	3w9uc4x8na04umrd1glnat6bpldocjkg	172.20.0.8	goauthentik.io/outpost/2023.10.6	2024-01-11 22:11:15.830189+00	6
 \.
 
 
@@ -2589,21 +2834,19 @@ ca14281c-e025-4691-b5a2-3ee415920e80	extra-group	{}	\N	f
 \.
 
 
+--
+-- Data for Name: authentik_core_group_roles; Type: TABLE DATA; Schema: public; Owner: authentik
+--
+
+COPY public.authentik_core_group_roles (id, group_id, role_id) FROM stdin;
+\.
+
+
 --
 -- Data for Name: authentik_core_propertymapping; Type: TABLE DATA; Schema: public; Owner: authentik
 --
 
 COPY public.authentik_core_propertymapping (pm_uuid, name, expression, managed) FROM stdin;
-d3406e7e-2c6d-4d72-acdd-dda5513b1396	authentik default OAuth Mapping: Proxy outpost	# This mapping is used by the authentik proxy. It passes extra user attributes,\n# which are used for example for the HTTP-Basic Authentication mapping.\nreturn {\n    "ak_proxy": {\n        "user_attributes": request.user.group_attributes(request),\n        "is_superuser": request.user.is_superuser,\n    }\n}	goauthentik.io/providers/proxy/scope-proxy
-353b9d65-66ce-4fea-814b-e12c6e45a277	authentik default LDAP Mapping: Name	return ldap.get('name')	goauthentik.io/sources/ldap/default-name
-a58eb3a5-c68d-406d-a5ff-688a6a047575	authentik default LDAP Mapping: mail	return ldap.get('mail')	goauthentik.io/sources/ldap/default-mail
-a75310af-c0cf-4709-a66c-963d8c27e662	authentik default Active Directory Mapping: sAMAccountName	return ldap.get('sAMAccountName')	goauthentik.io/sources/ldap/ms-samaccountname
-b5ae1f98-a70a-4ea3-a8c5-15285a8755bc	authentik default Active Directory Mapping: userPrincipalName	return list_flatten(ldap.get('userPrincipalName'))	goauthentik.io/sources/ldap/ms-userprincipalname
-e8244e12-ed86-4f61-a0df-cfac793c267e	authentik default Active Directory Mapping: givenName	return list_flatten(ldap.get('givenName'))	goauthentik.io/sources/ldap/ms-givenName
-81c79ce4-042d-470d-9aa4-48baaa08591b	authentik default Active Directory Mapping: sn	return list_flatten(ldap.get('sn'))	goauthentik.io/sources/ldap/ms-sn
-9c13a34a-6007-4846-8c28-11d6dbd235c7	authentik default OAuth Mapping: OpenID 'openid'	# This scope is required by the OpenID-spec, and must as such exist in authentik.\n# The scope by itself does not grant any information\nreturn {}	goauthentik.io/providers/oauth2/scope-openid
-a4825145-a8d1-4fbf-b88c-70d8cc801a4a	authentik default OAuth Mapping: OpenID 'email'	return {\n    "email": request.user.email,\n    "email_verified": True\n}	goauthentik.io/providers/oauth2/scope-email
-7446364c-faec-4cab-9191-beb2889d47b7	authentik default OAuth Mapping: OpenID 'profile'	return {\n    # Because authentik only saves the user's full name, and has no concept of first and last names,\n    # the full name is used as given name.\n    # You can override this behaviour in custom mappings, i.e. `request.user.name.split(" ")`\n    "name": request.user.name,\n    "given_name": request.user.name,\n    "family_name": "",\n    "preferred_username": request.user.username,\n    "nickname": request.user.username,\n    # groups is not part of the official userinfo schema, but is a quasi-standard\n    "groups": [group.name for group in request.user.ak_groups.all()],\n}	goauthentik.io/providers/oauth2/scope-profile
 765b25ee-0e8b-4394-a56c-e27abf68f5ce	authentik default SAML Mapping: UPN	return request.user.attributes.get('upn', request.user.email)	goauthentik.io/providers/saml/upn
 ef027c1a-728f-44e5-9072-6942d3e8d15e	authentik default SAML Mapping: Name	return request.user.name	goauthentik.io/providers/saml/name
 05712cf6-0557-4ae7-95e7-3a0538962b67	authentik default SAML Mapping: Email	return request.user.email	goauthentik.io/providers/saml/email
@@ -2611,8 +2854,21 @@ b3fa1ee7-9507-4869-a29a-3c17c2482839	authentik default SAML Mapping: Username	re
 38ac59c3-e754-44e7-9790-5108a2cd027c	authentik default SAML Mapping: User ID	return request.user.pk	goauthentik.io/providers/saml/uid
 c5d93ce6-8cda-42fa-9c19-3837ba67788a	authentik default SAML Mapping: Groups	for group in request.user.ak_groups.all():\n    yield group.name	goauthentik.io/providers/saml/groups
 29fab284-b6db-433a-9c3c-7575aba47b2b	authentik default SAML Mapping: WindowsAccountname (Username)	return request.user.username	goauthentik.io/providers/saml/ms-windowsaccountname
+9c13a34a-6007-4846-8c28-11d6dbd235c7	authentik default OAuth Mapping: OpenID 'openid'	# This scope is required by the OpenID-spec, and must as such exist in authentik.\n# The scope by itself does not grant any information\nreturn {}	goauthentik.io/providers/oauth2/scope-openid
+a4825145-a8d1-4fbf-b88c-70d8cc801a4a	authentik default OAuth Mapping: OpenID 'email'	return {\n    "email": request.user.email,\n    "email_verified": True\n}	goauthentik.io/providers/oauth2/scope-email
+252edb40-34ee-4f55-8ca4-4bf0a7fb445f	authentik default SCIM Mapping: Group	return {\n    "displayName": group.name,\n}	goauthentik.io/providers/scim/group
+353b9d65-66ce-4fea-814b-e12c6e45a277	authentik default LDAP Mapping: Name	return ldap.get('name')	goauthentik.io/sources/ldap/default-name
+a58eb3a5-c68d-406d-a5ff-688a6a047575	authentik default LDAP Mapping: mail	return ldap.get('mail')	goauthentik.io/sources/ldap/default-mail
+a75310af-c0cf-4709-a66c-963d8c27e662	authentik default Active Directory Mapping: sAMAccountName	return ldap.get('sAMAccountName')	goauthentik.io/sources/ldap/ms-samaccountname
+b5ae1f98-a70a-4ea3-a8c5-15285a8755bc	authentik default Active Directory Mapping: userPrincipalName	return list_flatten(ldap.get('userPrincipalName'))	goauthentik.io/sources/ldap/ms-userprincipalname
+e8244e12-ed86-4f61-a0df-cfac793c267e	authentik default Active Directory Mapping: givenName	return list_flatten(ldap.get('givenName'))	goauthentik.io/sources/ldap/ms-givenName
+81c79ce4-042d-470d-9aa4-48baaa08591b	authentik default Active Directory Mapping: sn	return list_flatten(ldap.get('sn'))	goauthentik.io/sources/ldap/ms-sn
 0094050f-e24a-4eff-8346-712851851af9	authentik default OpenLDAP Mapping: uid	return ldap.get('uid')	goauthentik.io/sources/ldap/openldap-uid
 e8809202-4ff0-4086-b078-196e6152e826	authentik default OpenLDAP Mapping: cn	return ldap.get('cn')	goauthentik.io/sources/ldap/openldap-cn
+7446364c-faec-4cab-9191-beb2889d47b7	authentik default OAuth Mapping: OpenID 'profile'	return {\n    # Because authentik only saves the user's full name, and has no concept of first and last names,\n    # the full name is used as given name.\n    # You can override this behaviour in custom mappings, i.e. `request.user.name.split(" ")`\n    "name": request.user.name,\n    "given_name": request.user.name,\n    "preferred_username": request.user.username,\n    "nickname": request.user.username,\n    # groups is not part of the official userinfo schema, but is a quasi-standard\n    "groups": [group.name for group in request.user.ak_groups.all()],\n}	goauthentik.io/providers/oauth2/scope-profile
+200af9d0-7476-43e1-a0fb-b7a7a68dd277	authentik default LDAP Mapping: DN to User Path	dn = ldap.get("distinguishedName")\npath_elements = []\nfor pair in dn.split(","):\n    attr, _, value = pair.partition("=")\n    # Ignore elements from the Root DSE and the canonical name of the object\n    if attr.lower() in ["cn", "dc"]:\n        continue\n    path_elements.append(value)\npath_elements.reverse()\n\npath = source.get_user_path()\nif len(path_elements) > 0:\n    path = f"{path}/{'/'.join(path_elements)}"\nreturn path	goauthentik.io/sources/ldap/default-dn-path
+d3406e7e-2c6d-4d72-acdd-dda5513b1396	authentik default OAuth Mapping: Proxy outpost	# This mapping is used by the authentik proxy. It passes extra user attributes,\n# which are used for example for the HTTP-Basic Authentication mapping.\nsession_id = None\nif "token" in request.context:\n    session_id = request.context.get("token").session_id\nreturn {\n    "sid": session_id,\n    "ak_proxy": {\n        "user_attributes": request.user.group_attributes(request),\n        "is_superuser": request.user.is_superuser,\n    }\n}	goauthentik.io/providers/proxy/scope-proxy
+83a19cb8-acab-44e1-884f-a0a279ae4d2d	authentik default SCIM Mapping: User	# Some implementations require givenName and familyName to be set\ngivenName, familyName = request.user.name, " "\nformatted = request.user.name + " "\n# This default sets givenName to the name before the first space\n# and the remainder as family name\n# if the user's name has no space the givenName is the entire name\n# (this might cause issues with some SCIM implementations)\nif " " in request.user.name:\n    givenName, _, familyName = request.user.name.partition(" ")\n    formatted = request.user.name\n\n# photos supports URLs to images, however authentik might return data URIs\navatar = request.user.avatar\nphotos = None\nif "://" in avatar:\n    photos = [{"value": avatar, "type": "photo"}]\n\nlocale = request.user.locale()\nif locale == "":\n    locale = None\n\nemails = []\nif request.user.email != "":\n    emails = [{\n        "value": request.user.email,\n        "type": "other",\n        "primary": True,\n    }]\nreturn {\n    "userName": request.user.username,\n    "name": {\n        "formatted": formatted,\n        "givenName": givenName,\n        "familyName": familyName,\n    },\n    "displayName": request.user.name,\n    "photos": photos,\n    "locale": locale,\n    "active": request.user.is_active,\n    "emails": emails,\n}	goauthentik.io/providers/scim/user
 \.
 
 
@@ -2620,10 +2876,10 @@ e8809202-4ff0-4086-b078-196e6152e826	authentik default OpenLDAP Mapping: cn	retu
 -- Data for Name: authentik_core_provider; Type: TABLE DATA; Schema: public; Owner: authentik
 --
 
-COPY public.authentik_core_provider (id, authorization_flow_id, name) FROM stdin;
-1	87ca9599-5323-451c-8603-2f5bee7a0c12	grafana-ldap
-2	a7ef54bb-7959-4559-979d-9345c022e086	grafana-saml
-3	a7ef54bb-7959-4559-979d-9345c022e086	grafana-oidc
+COPY public.authentik_core_provider (id, authorization_flow_id, name, authentication_flow_id, backchannel_application_id, is_backchannel) FROM stdin;
+1	87ca9599-5323-451c-8603-2f5bee7a0c12	grafana-ldap	\N	\N	t
+3	a7ef54bb-7959-4559-979d-9345c022e086	grafana-oidc	\N	\N	f
+2	a7ef54bb-7959-4559-979d-9345c022e086	grafana-saml	\N	\N	f
 \.
 
 
@@ -2676,15 +2932,15 @@ COPY public.authentik_core_token (token_uuid, expires, expiring, description, us
 -- Data for Name: authentik_core_user; Type: TABLE DATA; Schema: public; Owner: authentik
 --
 
-COPY public.authentik_core_user (id, password, last_login, username, first_name, last_name, email, is_active, date_joined, uuid, name, password_change_date, attributes, path) FROM stdin;
-2	!n7aLj0jKk3WIaSvfbaqM1nyy6fWejHsM54lRFljX	\N	AnonymousUser				t	2022-10-25 09:01:03.467789+00	fe23113c-e658-40b0-872b-d522b6d84e95		2022-10-25 09:01:03.468042+00	{}	users
-7	pbkdf2_sha256$390000$s67BmqSPGYWQPDnZ01phY4$ky7qvH0SBsnsqeEM19AB0B4Ki8zIcmfshf7/r7aiodE=	\N	authentik-viewer			authentik-viewer@localhost	t	2022-10-25 09:56:58.979268+00	ee7aa163-4303-4c2d-99c7-293ffd9d08dd	authentik-viewer	2022-10-25 09:57:13.55852+00	{}	users
-5	pbkdf2_sha256$390000$GmvsVEytoLZGHoKB8LdomP$Xi06ESYoLZ/ijL0FZDT964KM9C9WoPhQtv6Rfl3b6Nc=	2023-01-02 16:38:22.084529+00	authentik-admin			authentik-admin@localhost	t	2022-10-25 09:37:30.689793+00	a7d3e4ed-8b75-456f-b3aa-f53f45afd3a4	authentik-admin	2022-10-25 09:37:49.480346+00	{}	users
-4	!yrI1uXKCdF0svOmz83ldwXJnWMOUY8oY52dzYNT1	\N	ak-outpost-efe635b92ce74de4977f9f25b9f36d97				t	2022-10-25 09:13:37.843347+00	a7dc29a9-11b7-4d35-aec1-260ae1ea62f5	Outpost ldap-outpost Service-Account	2022-10-25 09:13:37.843557+00	{"goauthentik.io/user/override-ips": true, "goauthentik.io/user/service-account": true}	goauthentik.io/outposts
-6	pbkdf2_sha256$390000$k0Ykknoutfj56D2AaJFxWJ$bmAmMoNISoYnUn+DQnepRd39Mp1pnY74yfAoiHwRYRc=	2023-03-13 12:40:53.895342+00	ldapservice			ldapservice@localhost	t	2022-10-25 09:49:18.218809+00	94fafa12-9abd-4567-9627-3c6998f38cca	ldapservice	2022-10-25 09:49:50.76013+00	{}	users
-1	pbkdf2_sha256$390000$c4McOkDtg2Hps9uyXGdezW$8g7sh3praXa6Jo1AHfrng1dsf8dktric2hQYlUyAGyY=	2023-03-13 09:19:36.730646+00	akadmin			admin@localhost	t	2022-10-25 09:00:53.707692+00	d719cb26-008d-4bff-8f5c-13d1bf53de25	authentik Default Admin	2022-10-25 09:09:42.841946+00	{}	users
-3	!8j4wiqLzHmjS9fUEU0e0DsXx4z8Cj8W6lXnOCbo3	\N	ak-outpost-0c24aadcf97e4720a70f72a190b0cafc				t	2022-10-25 09:01:07.984838+00	b9835bf9-2711-41ef-86d2-b07124b9fef9	Outpost authentik Embedded Outpost Service-Account	2022-10-25 09:01:07.98507+00	{"goauthentik.io/user/override-ips": true, "goauthentik.io/user/service-account": true}	goauthentik.io/outposts
-8	pbkdf2_sha256$390000$g9w4rydmb2SLrzWYyInNZZ$W5G+Y2iayJp1KIp9wHuiozJ79Mdibo3zFx+Zxvofm5s=	2023-03-13 12:36:31.74172+00	authentik-editor			authentik-editor@localhost	t	2022-10-25 09:57:43.64112+00	3678963f-023e-48b3-97a1-0910b4fbbfea	authentik-editor	2022-10-25 09:57:54.40015+00	{}	users
+COPY public.authentik_core_user (id, password, last_login, username, first_name, last_name, email, is_active, date_joined, uuid, name, password_change_date, attributes, path, type) FROM stdin;
+2	!n7aLj0jKk3WIaSvfbaqM1nyy6fWejHsM54lRFljX	\N	AnonymousUser				t	2022-10-25 09:01:03.467789+00	fe23113c-e658-40b0-872b-d522b6d84e95		2022-10-25 09:01:03.468042+00	{}	users	internal
+3	!8j4wiqLzHmjS9fUEU0e0DsXx4z8Cj8W6lXnOCbo3	\N	ak-outpost-0c24aadcf97e4720a70f72a190b0cafc				t	2022-10-25 09:01:07.984838+00	b9835bf9-2711-41ef-86d2-b07124b9fef9	Outpost authentik Embedded Outpost Service-Account	2022-10-25 09:01:07.98507+00	{"goauthentik.io/user/override-ips": true, "goauthentik.io/user/service-account": true}	goauthentik.io/outposts	internal_service_account
+4	!yrI1uXKCdF0svOmz83ldwXJnWMOUY8oY52dzYNT1	\N	ak-outpost-efe635b92ce74de4977f9f25b9f36d97				t	2022-10-25 09:13:37.843347+00	a7dc29a9-11b7-4d35-aec1-260ae1ea62f5	Outpost ldap-outpost Service-Account	2022-10-25 09:13:37.843557+00	{"goauthentik.io/user/override-ips": true, "goauthentik.io/user/service-account": true}	goauthentik.io/outposts	internal_service_account
+1	pbkdf2_sha256$600000$Z9YK1xODbvcOk3u3p0KonJ$N/S+WQZ1f9iXB734Xcc30AmE5hmV7e8EtT9cihvtc0g=	2024-01-11 22:06:44.87578+00	akadmin			admin@localhost	t	2022-10-25 09:00:53.707692+00	d719cb26-008d-4bff-8f5c-13d1bf53de25	authentik Default Admin	2022-10-25 09:09:42.841946+00	{}	users	internal
+7	pbkdf2_sha256$600000$KzvAt9vwjfcZZ2j2vUxBeo$z3TLTqCB6IGqNiuqMhOp89GqCOA8NztlPc2CuSBlz2E=	2024-01-11 22:10:28.187334+00	authentik-viewer			authentik-viewer@localhost	t	2022-10-25 09:56:58.979268+00	ee7aa163-4303-4c2d-99c7-293ffd9d08dd	authentik-viewer	2022-10-25 09:57:13.55852+00	{}	users	internal
+8	pbkdf2_sha256$600000$mvb1xpRzqjDKlTV77sIulv$7dItv/PVoaamglojWjnh/AJrm9kzs/ZFPT6hPoSqk6Y=	2024-01-11 22:10:54.084985+00	authentik-editor			authentik-editor@localhost	t	2022-10-25 09:57:43.64112+00	3678963f-023e-48b3-97a1-0910b4fbbfea	authentik-editor	2022-10-25 09:57:54.40015+00	{}	users	internal
+6	pbkdf2_sha256$600000$5yumaes8rmMgoYHBoZJccx$ZwJQzQihlRZFZU8XwPj1WbJW0ZZhdHNo4SnoSEx+xV4=	2024-01-11 22:11:15.849616+00	ldapservice			ldapservice@localhost	t	2022-10-25 09:49:18.218809+00	94fafa12-9abd-4567-9627-3c6998f38cca	ldapservice	2022-10-25 09:49:50.76013+00	{}	users	internal
+5	pbkdf2_sha256$600000$SAxnow0EApm0aOYiQX5ZsB$iAxPX8OJVoKC+Cwf3mZyK9lOf1Q+i1BVJR+ECWd7jik=	2024-01-11 22:11:16.862134+00	authentik-admin			authentik-admin@localhost	t	2022-10-25 09:37:30.689793+00	a7d3e4ed-8b75-456f-b3aa-f53f45afd3a4	authentik-admin	2022-10-25 09:37:49.480346+00	{}	users	internal
 \.
 
 
@@ -2716,10 +2972,10 @@ COPY public.authentik_core_user_groups (id, user_id, group_id) FROM stdin;
 --
 
 COPY public.authentik_core_user_user_permissions (id, user_id, permission_id) FROM stdin;
-31	4	21
-32	4	321
-33	4	348
-34	3	21
+38	4	21
+39	4	321
+40	4	348
+41	3	21
 \.
 
 
@@ -2736,10 +2992,24 @@ COPY public.authentik_core_usersourceconnection (id, created, last_updated, sour
 --
 
 COPY public.authentik_crypto_certificatekeypair (created, last_updated, kp_uuid, name, certificate_data, key_data, managed) FROM stdin;
-2022-10-25 09:01:06.131741+00	2022-10-25 09:01:06.131757+00	44404c15-dd39-48d7-8962-fcb807cd5e58	authentik Internal JWT Certificate	-----BEGIN CERTIFICATE-----\nMIIFDDCCAvSgAwIBAgIRALJo/63v/kEBhLmb280DNEgwDQYJKoZIhvcNAQELBQAw\nHjEcMBoGA1UEAwwTYXV0aGVudGlrIDIwMjIuMTAuMDAeFw0yMjEwMjQwOTAxMDZa\nFw0yMzEwMjAwOTAxMDZaMEMxFzAVBgNVBAMMDmdvYXV0aGVudGlrLmlvMRIwEAYD\nVQQKDAlhdXRoZW50aWsxFDASBgNVBAsMC1NlbGYtc2lnbmVkMIICIjANBgkqhkiG\n9w0BAQEFAAOCAg8AMIICCgKCAgEAr4h9pDBcYkN+9+USHXFUj/j9UNQop+FLBSMz\nZ7sXLViRDxzIeWJ7ejB5Qshp+4pqOQiCLrOdxYuhupkl5w8O54DigKRCFLSzXtc8\nma3mDjUssrTwd8KLKzifpjUn5A/UGq4+AL7thJekgSqwo5nkQgnW8usXWnxViFxs\nMEqIFn1+XdD9s02lhuTkdq9k6c46duUFu/3YZmEOYmJguS3cV+DkQdqIr5DUT6+l\nx8iQNx2TsOxecpyBI17Jhh03TCiaL9btcj5hQTShIA/ssMh7xsTpqloLL0WG9hVG\n4txCIelIwEtSj7EGDTYDm6w2LUgxaEaPPPYWgnEEV5VEuAcWDVTpFyhy6xAlRrMR\nmN7HocHtXjcrAftv9rDRwi0dfpAr3SQgPy9q3vYimvl6srNNyuBEOYPXdIwAiDmQ\nE7NIouRi8jpFavd8L04WWaD05TghJ4WGPIR6MSEPBFQwCKmYdWUe/TSf/OlR57h/\n4KXuci9XB6xv69MSY6Ne5wprxouEz9FQTjjTipdkOw9iOQ9G+9FAW12BmpefOR+W\nazVdXwgmMjb0o7KckKOGMBJ4KqsXajn2sw77HKazHdtIMMCdNY3/Mykmi66iqkOF\nzG+HdJBMS6YMoQ2wKmRFOcZx0VH1M4muG903CryJND9Lt4befnkN7iKH4cY3PFI5\nOXRs/asCAwEAAaMgMB4wHAYDVR0RAQH/BBIwEIIOZ29hdXRoZW50aWsuaW8wDQYJ\nKoZIhvcNAQELBQADggIBAAllqD94m0olUDvOMenW80QVS/Im4S/Vk6E06SlsDcf6\nzaZ34SVBUftcYw1KhlDIifT2JwVLBEIsnW/nInmeFsLqGGlTuYTm+CDBT/+P4lsM\nKgy7cK0OrURcG1XxQlzYZqrHQinGVR6KaT7DQlonV8a3VUV40fEnn5urfbV/wOlW\nk6mmVJ2WvwUJ81dyGOxRLX9dwoMBzhuCdnpOk7rxfFZbpg/Rn8w6rng76U98R6ta\nbrS34vpqX1bARHVssi+2syXCRgBSvHFi6Y3Ix9XeUIhLCl/0R9eRxtEn0ROIcFyA\n0HtGtXZkHAJe9+Qyy6riImmFkLNIy7AwPkE7LgES8hYChjTPAzRg2uwlqW06esxW\nOWqnZCD387Dd5ji2vRLjvuTBDzkfK2mx8nYxJmFhGBe1gV6IscNoFcyxo2S2YS05\nWzjn9zADlE7e7+BhTtA1aOc6M2NqgtACGoKUFs76spYU4RNyGwsL2UDozvYeCr8r\nbbFBwclouhekWA/B6/4+uRqA3eUxYS3tmwHKiNM/xJUt0C2AZRxbW1FyWK/ZKtrI\n1Uv73BTLyAI8YmKbZn5IITJmWb2PAbGSb90FRXhk2qZan0x/uqypx7dm0/IKKWql\nu1Z9UP6KGNUBFzVmCc8ZoRfd6qZjHCS67LlTNVMTKf5eJ7wcNVKJ3WhRuLm/99Lc\n-----END CERTIFICATE-----\n	-----BEGIN RSA PRIVATE KEY-----\nMIIJKQIBAAKCAgEAr4h9pDBcYkN+9+USHXFUj/j9UNQop+FLBSMzZ7sXLViRDxzI\neWJ7ejB5Qshp+4pqOQiCLrOdxYuhupkl5w8O54DigKRCFLSzXtc8ma3mDjUssrTw\nd8KLKzifpjUn5A/UGq4+AL7thJekgSqwo5nkQgnW8usXWnxViFxsMEqIFn1+XdD9\ns02lhuTkdq9k6c46duUFu/3YZmEOYmJguS3cV+DkQdqIr5DUT6+lx8iQNx2TsOxe\ncpyBI17Jhh03TCiaL9btcj5hQTShIA/ssMh7xsTpqloLL0WG9hVG4txCIelIwEtS\nj7EGDTYDm6w2LUgxaEaPPPYWgnEEV5VEuAcWDVTpFyhy6xAlRrMRmN7HocHtXjcr\nAftv9rDRwi0dfpAr3SQgPy9q3vYimvl6srNNyuBEOYPXdIwAiDmQE7NIouRi8jpF\navd8L04WWaD05TghJ4WGPIR6MSEPBFQwCKmYdWUe/TSf/OlR57h/4KXuci9XB6xv\n69MSY6Ne5wprxouEz9FQTjjTipdkOw9iOQ9G+9FAW12BmpefOR+WazVdXwgmMjb0\no7KckKOGMBJ4KqsXajn2sw77HKazHdtIMMCdNY3/Mykmi66iqkOFzG+HdJBMS6YM\noQ2wKmRFOcZx0VH1M4muG903CryJND9Lt4befnkN7iKH4cY3PFI5OXRs/asCAwEA\nAQKCAgBIzh2CsNZYoXMzwazaTmvLDXSQBndYbm8N0fRb1XM/CSmdcYxLIIhjfWCG\nTRb8UIRPZJKOaUyKp6gse6IHbKz7Y29O+RI5gVuWfkKx4Tl28iI4eyj0G1pa0nER\nYKHLi68nY9buu0JLyRPfyUObj9RneapQdibpDoHxfZgYDYnVfjagFfNsX8vEoAKM\noaIDAdkpAEP5HcgYarArKW/Bzt5CCtLR56Di5PjSlmF19F+wpJFiBCAGfJhpgcKn\nYE3TxlFxfz1cMbhn8brU0BYVmwoPvxPF5vQVpspcHiYZKU86voZAz90OIVgHubwU\nYQDVlkh73ixCFjXu445v/0cR50qDC0FOPJxW5P8hvtYrcTxbvNGWWAxu5v5qge/e\nuqAl+FUP4oiWqNhlh8am0OiNyQ68wtiTuwvXFot8sTXr03JYALj2QjrvaoKF0HMW\nhho9RQAsQRWwnHQY0D2/fsnTFZGof6ykgi+jPFZSNKmtTxCG5C9QQWxvkBIODrlz\nwJX7uidnnTHhY59cU4eneFkIa9pR/Th1wSEHcbxgoput5rjb5ucEqbvmvxf8EPlr\ndMuFVHmFOrkorep26X8n3Au/gG/8Ow9ORUJP3R4z8Ln9BdG5bqZc1qaa58nBamjU\n3q0UXBDrgf9OTUmRLJpaKl5YprGRG6WPbwooff69uqB/hsOW0QKCAQEAvupgNvg+\n0qxTsNeXJpAna4Tfh/i3V1B8NUr22T6v33a94IH/sAHTc3UQ2m4LulYGvnTsvN5i\n8eXmYE14xjqZK9iWrDasHZsxWTifVXF2Sy3WPhkrQJ2dyYcsDYdyIjNbFGXDuuQ1\nTgOS5fNXALbCijjEptYw8ORQL2Pp5PVWr026GnfqRG1ft84zcm7IVRvbEkb3Hcyn\nl+Owpu+ewXJL8UKAaIVprSdQgxTptEl2wImaBDuSY6MLxTI4b01GJ7ik2zeGuxgt\ni3TRx1wSYsUR/ZAuFoaRRf4dxxGySWjc8OZNZXzhZiBM9ej6o2HgPT1r4/WlpBnh\nJKUb40HOmv7/OwKCAQEA61+palUrxewfS9semHT8ZpW++BoXyk31yWnAuSL7a59t\nFmFAbkFXMMKLjV78WUihGNOhoqg5koICaswlvveU5svjFI5x80sfhZrY5+OiA9iB\n28HeTwA+OG6yb1Ja2pXCZGCQOrtKbNjqCeJu5rS2fWC1tvDn/q1duCkhtyPZXxuJ\nAGhvbiZ+effJaIk4CHJ4K9g+7NidI4za2Cxv/ob/5ewV0QwdGDKCc797K+8QvQP2\ndBBa6cOU2TcV2Kpf7W1mYQJmZfrEoKbxthjv6FCRetbKpCsHRtp7l5c0clnW2SIA\nmf4AhDWHTmlsxiSSAUi8OnX5w7530lklkUJkJ870UQKCAQEAn043ZucSlPzTAPeE\n2tri6ecAFxfE9Qjl/BpHjNOwMcmFe3c+ggGkDe2bWIkHJD9wdTBf8uGmsq7h424B\n33c6JMogQCeGy1WagharbcK1sNnYsgySeOKMrYMrkUZ6SGuODqE0CBkxGZ4Fz/eT\nm7bk8i2Yepa0U+5PspuuqizGXpV/O2LgiqSxgFCBwXULmWkbDk9FGQqStj16RHIi\niMz07aZOO+lHWwM5PYgP0y6R9utbJzkGWDnPModLbCSQ68g5V+snc6sjJgEeozoC\n5YQIFQtgSc+UHVGES35KxNLJugKShqMD+hHt5iy4J+keEjvUcW2jACHQKqHTeXiK\nC+/HzQKCAQBN07XLCRqOOUMn6+4z7wq+SOl6U/Zl2F1bGfK1xNFphq+lZMbPLh/M\naaeHOU8rno5WDTQ2+nT+8qol8hbRDEBaCDSvyWH4VnC31rm+A1DBAMf/iB0f9i6c\nrk2l7Y9JE5fRZPSL1v4G+7p3Rj3xXvOwhVfQg9vSJDUG/eK+EcaAYjRsxBuESoor\nfjlErYqvkFoX9UrpOb7L0HlUXW0ytiTLO8MC+oRsSddEup3ZqxTXywWk3vuQrDD9\nme9JUxyg/zmI/igptD9r94eY9KnvISTZf0hF/ExNq1SOjVq0LOyTo2CbipdVH/X7\ngXSMF++HKSvEENpjVQl9rihz3YYMe6vhAoIBAQCZeZfwJu5F3WdCGcZ6BULcQD2H\ntd3B+yUVZN2tsMR9QsDiwWs8Xf0J0esA8YrJe688ZS6X4Ucj/BDNaLQBKuNERiNL\n9o5Wd0YUjKHShBWuuZR4N+32Aub3vdAAgtvStRzfGQxacS3b5NCBLTwafjGJf38K\n3Hi3+KFEmuiN9Gfjq/yIv1LGTQAztu260XGKS9egBAvnJLM6NM+cexP1G+iU6oPu\nXo02upo12NGdlDi7Rx7kz8U/7EOkTeXeM3JSRN4a2v7i0lIHqN0NrfXelteywqLc\niKOIRH414k3cUMQolaDbuyhbwR86GWmFsgb87HUTRAwTUn370jPpc6S+lA1L\n-----END RSA PRIVATE KEY-----\n	goauthentik.io/crypto/jwt-managed
-2022-10-25 09:01:07.326561+00	2022-10-25 09:01:07.326585+00	6304c995-9003-4fc4-9ba2-3d32016fb04e	authentik Self-signed Certificate	-----BEGIN CERTIFICATE-----\nMIIFVDCCAzygAwIBAgIRAIquKwHdJ0cuqRSnZy/BhO0wDQYJKoZIhvcNAQELBQAw\nHjEcMBoGA1UEAwwTYXV0aGVudGlrIDIwMjIuMTAuMDAeFw0yMjEwMjQwOTAxMDda\nFw0yMzEwMjUwOTAxMDdaMFYxKjAoBgNVBAMMIWF1dGhlbnRpayBTZWxmLXNpZ25l\nZCBDZXJ0aWZpY2F0ZTESMBAGA1UECgwJYXV0aGVudGlrMRQwEgYDVQQLDAtTZWxm\nLXNpZ25lZDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAIvVUHe4feDV\n8kMLGbF25EuCnugVQpUhuwjcXrbQ9IiKvNCdw51Iagm3dpFftw+mkJ63WPTjuk+X\nyqSHvseBkStOaqsG1puq+TJ5apVix2/qVWAyQ63ERZs6kv3AJu+9hkHDNF8Vv2b5\ndXS5vvSiURZPIHh1mgZo+GepggdC2ob2wzs521b1o+2DfyNQeq5dnVM7JDV5qyRj\nXqcHd5GiPC4pUJbIw4srLAjW9oL0N7LdxcgtB+MLDxSc2KxZ64i4It3umpRx/zId\nzu3hJWuNKKr51SX3n7zUTJ0AM1MHSv6q/mbYOaiclZVzSOmhqVvEYiXFMeNCQJX0\nZuX9ZCeoS+j0NT3icmtK2enIC7S4a78nIEIwI91W5Co6oCzQHmNwffrKpYOAG4bE\n4BiY1afs2g6uam7XKYz+yixZ/fgSiGtCj7V1eeAiNy+3+hJJlvS5IS1FVTDK4BUL\nZ2h/6ZgkecjCNX0TxIsqo0F+M+7n00aRtLIDdc5w9VvAW9C5jMc0vBwWdrYHG3ZQ\nZAHvE5fRdIEVpEk8SKm9K0COuo0KX52VSRdYWTh3StDeaN9aHaF9tfoB/1rr+PEZ\n9v2BhR0bOUANaMVGUg4dZxonRGL3lYzDbsYEN+0/l2U15xZGfk6gpllFUpQi/fyc\ng/I2XI30YFBuoBhresBYTvErwqM45CQVAgMBAAGjVTBTMFEGA1UdEQEB/wRHMEWC\nQ2xabzJqU1V3WE9vcHJodUxDUjhGNXFYOXA3SVlNWmppRXpNTVh6TUwuc2VsZi1z\naWduZWQuZ29hdXRoZW50aWsuaW8wDQYJKoZIhvcNAQELBQADggIBAGNLFsJVrIDV\n170FzQ+vTu6Rcstcgefn+h7kSkALpsZeEjtZwM23Cew12iEbjUl6KUK4WXrgScE4\n7SPHOi0oInehNAVQGpiuE0J2tB8yDWkt56sPmDNYCoBR7HKLnEFHr8FRGMF/D3wD\ni0JmBH3kizpeUnEqSeEYDQpjETyla7xpYbPrUCJSgDbvB/lgYPuT682ZnfNfPGNo\nM5XU8QmkxzX9A2BtaBx04rP1rNtxS8iYNmVow0VNYhzrSMS85wvjg8cZPZkOQYC7\nbsiBIIFMRjgbWEd2GFMcJpM57pd6/uFvfIL+2V5eaH2Rbv8S1g1klrP8iN6kEV81\nr4QqKTG+lLZcxtnylHLO8EdquiSXGBp4hHxA1wC6r7DY82nVnL/yQ8VA8vh/wcH9\nhOkkjIvzwBkgV+SHgwE3c3w12sn+gRxOmWjEwbmr9mTNloADyMICftOiVU5VFF+9\nAyARrJg1n+t+IZdm6zGrE2/y3147YZtzxyoySp+RcqIzQM2BKEjk1GSSvdbBbNHZ\nu2fVFpl3/A+lZIgCYaSLwyw7dhfXnrTdHGofz2506tA7xIsjYK6etFepzPJgQmrP\n8v0MUb6tEtz201JISWAJumVDHqHxKH41RzZ0CCKmwHDtpNYCla22cGuvwPojWVJ9\nNYcW4HEgx5ppagtgwCDAVorV9HeJhfa+\n-----END CERTIFICATE-----\n	-----BEGIN RSA PRIVATE KEY-----\nMIIJKAIBAAKCAgEAi9VQd7h94NXyQwsZsXbkS4Ke6BVClSG7CNxettD0iIq80J3D\nnUhqCbd2kV+3D6aQnrdY9OO6T5fKpIe+x4GRK05qqwbWm6r5MnlqlWLHb+pVYDJD\nrcRFmzqS/cAm772GQcM0XxW/Zvl1dLm+9KJRFk8geHWaBmj4Z6mCB0LahvbDOznb\nVvWj7YN/I1B6rl2dUzskNXmrJGNepwd3kaI8LilQlsjDiyssCNb2gvQ3st3FyC0H\n4wsPFJzYrFnriLgi3e6alHH/Mh3O7eEla40oqvnVJfefvNRMnQAzUwdK/qr+Ztg5\nqJyVlXNI6aGpW8RiJcUx40JAlfRm5f1kJ6hL6PQ1PeJya0rZ6cgLtLhrvycgQjAj\n3VbkKjqgLNAeY3B9+sqlg4AbhsTgGJjVp+zaDq5qbtcpjP7KLFn9+BKIa0KPtXV5\n4CI3L7f6EkmW9LkhLUVVMMrgFQtnaH/pmCR5yMI1fRPEiyqjQX4z7ufTRpG0sgN1\nznD1W8Bb0LmMxzS8HBZ2tgcbdlBkAe8Tl9F0gRWkSTxIqb0rQI66jQpfnZVJF1hZ\nOHdK0N5o31odoX21+gH/Wuv48Rn2/YGFHRs5QA1oxUZSDh1nGidEYveVjMNuxgQ3\n7T+XZTXnFkZ+TqCmWUVSlCL9/JyD8jZcjfRgUG6gGGt6wFhO8SvCozjkJBUCAwEA\nAQKCAgA1jXVq1FpJIEbOzFKDt5/JF3ZaNcIxMSDbTOJtK2trW47iank/JDuQCxY6\nqKiIMudSEa/c4dY5o011Y5N5/rIlHrwVUeIg7gLQBNX/7jupLdqSo81toCx0PaOL\n0OpYiIIBb4wAGmkaO9Fy6awrLnrVi2pJF+jsKYlw0ec9dqoQZDLy3L6W+C5WyTSI\nxsqlOq8E8DJ21Gjp37ChUWfGe5aGq0X06WCSTO9pV0JDdtpaAzs65ZwOpO6am1MT\n9sAQtUyNKFNFJL9yZx4X1lEpdn8rs9Cg4MvpWnkY67m8Q5/CFqSlqIu0enuDKAq1\nhzdAMN7RzkrD2Vy40UgTLs8LrRWcyeO2gP/K2liz8W0wXpZmQi3gmqW9B9lFGYFZ\nKOWF3cO7vhWftinnVYPWA1SuyB2wuVbnEMvWfCsB8+lBJE+f0Blg/nOAyDr4aIJb\nKfx05m59MXGyTb+NsTNsOIjQT5PE+FsiNlnTpe9ZAqzt7FfIKac48nR/L3LBnaST\nFI7ECLUbmuBi9NEEGnJ6/D37ngZPtu4jynWlisjTkRY7EyC1MwQNhGLbPa8ad1o3\nwZxSAq1ByPdlDBlo9ZE/FeYUi7jcFi7PJv7sqUed3PEZQYDFbo91ob4uj0BGkhXC\n9D+Nrbcfy7pCJXBHKu7AGrfBXdx30LmPU2tBJTUCNBpTbbAMpQKCAQEAt09tHrI9\nJAmYhpjX2eXd/deVaIeq5h0hoVkyGi2PxaRQBtU4g+UUHILFHla0K8v7TZG1Xh0P\nBoxMlxGapac0mCTpxtOEQgoBanhze1Xvsx790wykna5WHyBV59lUGcpHz37beHDY\nF/3jBHdN6dzdXh7k/oMLCbLQi3hUEliEA0+mGYNj4nPuWc6nEXGEBgLAirjhYlVk\nvkHvkZD7mZnNOvuDetShGscd/nW/DOnhd7Erqba73C3Zr5hcIbx/sVVmUDAJBbZl\nWp9KlL86AhMfbKK1RiBaMW5qAQTIaz+uOSGm5Dsuad2MMiHUgvGzWeOOtyYbaN+k\nNkMZRQOqsrdKjwKCAQEAw0hcL6EDBBvnXKuLSOreEJwRsxMoino4igjTiq1eeI9g\nzJd+TTYysRAmhFTY1uM1V7tgR8PopbjJ0AxPQJXRFzGtR2eBqv+NL1FhJ98il+Ef\nPWuBEyf68z4nZDVXy12VxkCTQD55YEZ2VQoMSgYna3cDJuX0zPX5guSu3+phc1Jo\nbDpxx8G0QWGjdY5+2YfeFqU+0op38Dr7Jl7w57ukO2fluQ+LWdaxAO2jPvPX3CrD\np0SCwLNtgrlmdbDTKuc/vBxlvcREchQPyIxBxL6v41vrMhq2e/28m58MKR+pS7Ih\nfs1j6SRj8HU9ardMk+uj1HMk1GVPt8kASmlCECvJGwKCAQBCMTMU/4WmarSh/bUL\n4L5deChiW4LxnxlSuvOlkkg1NRUUso+6yNCPTwVA5Ewg+IJhSzkzp8iSM71AW8H9\nCTirq8Ci5CQA+L30JVSF980bYBiFyi3zJk3A5Zs/ojGFMo7ltUgo4I6Xcz0zkqUW\nyoNBBmToJoeo0+IMSsII8d+RloRC+DfsQLKTyVR4rwXeacX/Ea2JJY7ASOzqInFH\n0MrT/phGlVsrYTVKelgnoJii8N30ZaDGa+QMTTcPk5KEhXLxh7bqUiedJqH2vmqC\n70bMoqBUl0AaU2WBwqlgWNlflfA+v8QNxEtomuCy+/Yogkw5hFAneYJBec85JY7R\nA/CvAoIBAFS4P8YqBDT0Jht+EJ9BxbVPAB7AYQYyn/TCf4PaUvHawhQAZTr6GGPY\nrd0bMjeHusyk7dA0nenHkUZBEODkHiIB2zrvHMIivA2bMJsrosZhVDxBN24oGicM\n/+npen0vzJqFyVxFvkKWTx/1i/9RTCjDKQrnGJ0S2Xx/2Z4rALwXNFY/xLz0vE7h\nHRkTCNU2rJMGfYq5p+8Ap5St+7WNImLjYDY5GCuRiJjuf7P/9dX+d4NJpbAUJ55e\n8KR+Yh5q1Ku3Ziw9ybP0ICTRNHc2gvgQGKlUDXcdTYX2KkBtC/VbAk0QrhenQfQ/\n6LUzcHV79Udl7MR4b208NnQR1idN16ECggEBAK3vM6VXsIE/TTB3RHV3YjOlU6nA\nd8AB6fCucso171vXzlrMIAG/ybBvTBg2UcpaJiDJe1gvRnL/0YqZMlu8jiTzS6B+\nbphE1t2Cx6SJxZGBIMqsEFeQwB7vlCEgpNImbPvz7dKmqwkJJHrumWCRJYeFyF7y\nISUjFihgk/QcCT2HkI9aaGlfNAmyrKVzd+M4CD+W3HdDrqCkx79Zwsv6PUiZDO3p\nM5673LWPncp0Cau1Onamq9BMuMQ6x1n4GoLAo5jddh2ImWjxUjRvpVU7Ty/4I+OC\nzKO+wG6wkCOUTq6EYgxrz90f0wJxCZV3blML6RC2Hx/PHZjR7LZV5pocQ90=\n-----END RSA PRIVATE KEY-----\n	\N
-2022-10-25 09:01:08.328413+00	2022-10-25 09:01:08.328425+00	f0a78f88-adc2-47e6-82c1-d49e9e159329	authentik Self-signed Certificate	-----BEGIN CERTIFICATE-----\nMIIFUzCCAzugAwIBAgIQanwCoettS3O8glhNFB65gTANBgkqhkiG9w0BAQsFADAe\nMRwwGgYDVQQDDBNhdXRoZW50aWsgMjAyMi4xMC4wMB4XDTIyMTAyNDA5MDEwOFoX\nDTIzMTAyNTA5MDEwOFowVjEqMCgGA1UEAwwhYXV0aGVudGlrIFNlbGYtc2lnbmVk\nIENlcnRpZmljYXRlMRIwEAYDVQQKDAlhdXRoZW50aWsxFDASBgNVBAsMC1NlbGYt\nc2lnbmVkMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvBnbYXnQZBho\nj9DxExY04f9ELCT48oqdLHitJPxOy46iyfKyePWgNBvGUtqquCOy65ViNqFiXz/S\nat+5GLtXelXipqmOlBp7GfP9yTpeo0ClVfQ8vdccFGstrEaDv5nZkkKwPMfCGqVY\nwhJcxJCPUaXDDsK91YLpuLYNGJnmCHJUlHof7KSYjhn4Ie0/UtKjw5aqIoffMNup\nxs2tsdhUKz9nnKJzGm6lJeo18bOenhNmj1sYoF+xkdFENP768fAb8I39sIitlpL0\nAmPUW7PQpEQ835EwRHVoaUoQpjphuNsRGPcXOpIxkMgI2jJXDz/BGl70UZta/R8R\nGT9Oid8qm2UsOswbDUnHGMDbf1LogchOB0Wi3WgPVG8Z1sdBp5KStqDuYh+cxXwS\nD+xdfRfTzuFwsauTd0R27avWQ5e9qVjA7gQNohkVLQofy71ajrB2s/U+CoPnNIk5\nG50Ijd0K/WuE4en6e2vNxB9vTxZ0D7psc8/9wn+vtlcYn5o/gWBerBF5ptg4qjgp\nQ0f8vmifHuUztrrvI8q/wcdxjXQNfGlGZPRVArGecYEu3pxarRXhb7Bd0bzQu5Rp\nv3/IOFVL50Y1Y78TgCB/tSi5GKwkVT5WruntBPgE7IDCr3R9KqtMrE7ngon5wH2m\nhjKpkCRSa1Z4+spfw00UUENNwVcWFoUCAwEAAaNVMFMwUQYDVR0RAQH/BEcwRYJD\nOVJiZmRCRUU3c093QWp0bzN1RW9kbmNJZzFVQXBiREtlM3BJSkF0Zi5zZWxmLXNp\nZ25lZC5nb2F1dGhlbnRpay5pbzANBgkqhkiG9w0BAQsFAAOCAgEAkLqIXBRW7ffh\nrdwPkRaw/yuUN36gOnxs77j496mZMTHr2U+d/9k3gtvrZk8wB8tuL3kzsnRQp3PE\nRgJDJzlIOwFBwTkHb7Oi5Gb7ngVZKogufhgQvfCIJH2V3tgjF9Jj6/CaBfy9efy2\n4fQieSer0XB53fWL46eg5ZsHJhy4uo4Rwf3hggNtuHk3AO4SSg9iDHSthPaeMoXs\nyt5TnA2YkxHKQJRW5KjgdtqK+7D/nOzEr01chKWu94xKNSWAEh7FNRHuZhX9ppkc\nUiMtiRMY0AZXrWbLMjrbnNr7lNcrw6oze05ZNkws9NI04pytEhjbuREYvSHOUFub\n2SJg/jWPAjoh8LSAT5A97yEMtZf9x8prkbOq2fVyaNYBHhBciPFxqGMPdmDcLcvt\n5AxiTzHmgWL6B9eKdfT5wFbgbacdwtc4fNvb4g0nBipU6pKf2Rnyp2E99P7J7wx/\n/WVIPhEjovCj+2zakAxJna2Jn4AUDJBlO7xQrrPM9DCT3DWZzSX7oIr7u2mNwysw\nr0D5XhzWbzuhaNmS0gG6YUYk5xBTxjyaU0BJmcu1s9A5+a8DDGk7txJKPgAEdOtp\nQCDMNEk4usqLIEn21b9HaY0hlyGD+ae5JumwoIxoUHQtDIhJ55AM4GCn/wIitf4X\nLwH3MAd1SC3l7OGnME9gradc9SZYDmg=\n-----END CERTIFICATE-----\n	-----BEGIN RSA PRIVATE KEY-----\nMIIJKAIBAAKCAgEAvBnbYXnQZBhoj9DxExY04f9ELCT48oqdLHitJPxOy46iyfKy\nePWgNBvGUtqquCOy65ViNqFiXz/Sat+5GLtXelXipqmOlBp7GfP9yTpeo0ClVfQ8\nvdccFGstrEaDv5nZkkKwPMfCGqVYwhJcxJCPUaXDDsK91YLpuLYNGJnmCHJUlHof\n7KSYjhn4Ie0/UtKjw5aqIoffMNupxs2tsdhUKz9nnKJzGm6lJeo18bOenhNmj1sY\noF+xkdFENP768fAb8I39sIitlpL0AmPUW7PQpEQ835EwRHVoaUoQpjphuNsRGPcX\nOpIxkMgI2jJXDz/BGl70UZta/R8RGT9Oid8qm2UsOswbDUnHGMDbf1LogchOB0Wi\n3WgPVG8Z1sdBp5KStqDuYh+cxXwSD+xdfRfTzuFwsauTd0R27avWQ5e9qVjA7gQN\nohkVLQofy71ajrB2s/U+CoPnNIk5G50Ijd0K/WuE4en6e2vNxB9vTxZ0D7psc8/9\nwn+vtlcYn5o/gWBerBF5ptg4qjgpQ0f8vmifHuUztrrvI8q/wcdxjXQNfGlGZPRV\nArGecYEu3pxarRXhb7Bd0bzQu5Rpv3/IOFVL50Y1Y78TgCB/tSi5GKwkVT5Wrunt\nBPgE7IDCr3R9KqtMrE7ngon5wH2mhjKpkCRSa1Z4+spfw00UUENNwVcWFoUCAwEA\nAQKCAgAOCywq6epaHsxnuGTXVPgby3Auj5Aao6i6ckQTF9dWMU8MHteeWlBcs5oq\nA3NtjhTErAGKLKBolh5CpnNuWkZctt7WLKCdhCCevm27QWVhcOknMrX6Qn4xNBNT\n4mvhuT3aQqpfz1Y5oRCwZKiScGyS3vpiNr3vm/eRN95gcNUQ2mBgOYH6rAtLyLqS\n5eCtcVaSusP3Egfi4PObCS4nsgwOsows0KAhYBNqckMWyZ9VFAO7PkTnbF2YknQy\nNLtNpuyfGCrRrFKxhEU9jHCFbDZunT2iP3fIFK/39HSrxH4ZTBnJsGEGmXWj5ptq\nlwmS9OKY8m/xS9UOQuyG4wgdGRFYKdf/NdjQSVs19GkkWqrE1TnUBqsxnWB/7aNP\nbohXDyunDdxBgEOCnVmdXq8DiqEDRC7sVfqd4TpRTikj6W6IFdLEwlEUfOkmhI5n\ncggt/HkdtR4INNPz/tbJFKjxceH7mAJiuCyaBWz/3kD4jZeSzOnpLC71kbDWTf7v\nBEL8vjeT8EJVcsOgbNHwaFkfFmrSMxBp8IYqqaCOC8c15GoQeZ5e5fgbXvi81lzf\n9qaRH740eyF5FLOK0cFYC6FTm5NE78rMsrEaxd/Ooqid1HMNelGJmvGIpfIeuQZ+\n2qHcQIX649p8QbxzyuWXWxnjKwFHWtSoC0ibNyGO3o9bC8cEwQKCAQEAxv6APp1F\n1Ah0zcSTpv4nLRCGAcb8OnV5rw8isixVt2SBeHuxE1mTSjP6SJNiNu0iKSzN7Qmk\nyRcNp3jQG3wpUwIGVXZ4ct4Gdf42sR4XyoZ619eYGM+dR1P7GezU1vZBFxqhofti\nVgJjouAvvYjl06wPz3a0az6UuLdtbpTBxF7sebIW4Xq2ZlxufnfAo0haq9KmHOqR\nut0KO7AuAxswCWGvu/PzxdFvB1/1/UXhiGtLzuwhXePbomlHQLki6DbFAreL8TlJ\n0RxexQHiCERXUNlWyMzYQvyyB+c0IYP7cLFuspAQezsEOWgr3TtTOhWA4ln//x75\nlHAKSgFW76TQMQKCAQEA8fx+PH/QCA6EKLZMa6kVzm01D8oTetGce4r80Jva2sbq\nu437yRVe1Kya1Hqeo1gb8Ord4714FOwduqz5IdMGuhljNEaMYH4FecQjpfiNd1RN\nFreGhDJ+DNq4Nz5aVZWgVtKkmdwjZALfZpfetAAfkaR/75GwV2PKQOygjgcXpxLx\nCyFOTC0RxnrjAMsuc8cDHkw90x3iLJkEBRI5Ud7yI8lD7jCKSWUc5FiYznR/4dX6\nX6Q3+WSAp9s6grBSBHMgHYV0vMETDDtJSQT8uAYwZY/5WnXyqNqSGZJlwwEyCLvQ\nbacfYYeq4NDwdHGFHyl8hjkX/c/ojR+knSbe6bcKlQKCAQARrww2hENwVFAM+Ssl\n6/APUSiXf9dqWoY1yGKM8uOrKINY8aUK0ysDrRrQ2EgiGXCvuAuUxQaf2CyedV4J\nEz+Y4NUvQxfxHUn1smGp28LBfLHt/HrHuauAazYlV6aSc8/U/cjfXDeg7RVto/6a\nGVBTPzcoeKQP47/TqnlPGmkdylG5ftoJr54F+rDXDE1SNVvZaR7Z8v6AXKRMKZvt\nKr1aGBRF36gKLFJxlVWG7G7ecKqL+O/+KAGcrT5nwgwYFsXrN+R3y1+D9cF2QHSV\nx3z68lWEArA1Q7+OdD1tvQzbNulfdO4CBXyanWdIgb0jrEWH1/en9Fi5mDtR2Eyh\nf0QBAoIBAQDd6iTGTJw110Ihp9R7YuupjAL+QN4OYw3zSinBETzqJ0N6zqGZ7awy\nszumIfE7cQDmtizYvpfR8BrvZ9Nszn67ya5tcUko8EkLOvFKMp9hUIEFlTaaI0fv\nd+E6YEctd3M8TB5BL12RSQUgq6PDRN2ujcH5rIygB9aiJZ6zwRNS148QGvIX77j+\nYRGuV6Z47IgSj+6enigdqBHEqMrCJwe+A8P1OrSGzGBrlEhGBRaFv9rFPO9MGXvW\n87g7w4DjrcRE7m947kMOk4wIl7c++AYIDbmp2MK5UQBszRHffEgrNDnXZUzk/yqY\n02PAFZ70TfJxkQhMbg8g5GTs7Ym9oWvlAoIBAEi7Pu9KKEueC7p7ZfDBoHA5WXfV\nwAdRmJrowf5fAR2w7y56Gzglv5jaUzsdVlsUnittJ4Kh+Gy3S0lB/962N/yb/mle\nl/GSo337OI2Naq1mC/ZhT1ESHc+9bktDL979oSdj6QxOE5bk0XB/9gzq3XDFCVpy\n524xRfTUn2QTZUOeEZz8KdZRB+mjlm4n5xhAl94nwF6YXZH7FgDcP0FTfuOKoASM\n/vHQPFaL71fBnNwudmCBmF2yHjQ3qQ8w9NIZRoydqmmfXQg1rXaJ4Pfsiaz66S2M\nzZ/qxMa75ZM5U1s3qmuNZgf2KRKzy4Tn0+iBDK1mwBe5oDIUWxnEyyaIa5k=\n-----END RSA PRIVATE KEY-----\n	\N
-2022-10-25 09:01:08.654156+00	2022-10-25 09:01:08.654169+00	fd8c40c1-e491-48d1-a265-02ef85ea9a12	authentik Self-signed Certificate	-----BEGIN CERTIFICATE-----\nMIIFVDCCAzygAwIBAgIRAIwEhD3SuEWNm7TZwrVbRmAwDQYJKoZIhvcNAQELBQAw\nHjEcMBoGA1UEAwwTYXV0aGVudGlrIDIwMjIuMTAuMDAeFw0yMjEwMjQwOTAxMDha\nFw0yMzEwMjUwOTAxMDhaMFYxKjAoBgNVBAMMIWF1dGhlbnRpayBTZWxmLXNpZ25l\nZCBDZXJ0aWZpY2F0ZTESMBAGA1UECgwJYXV0aGVudGlrMRQwEgYDVQQLDAtTZWxm\nLXNpZ25lZDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKv4Thu+i4GD\ngNN6Id2fFg879TGr6WQZZW2DCsn4JgEiShtG1E4jXfzR0MaANrJU1Nn1RDd8Vp5O\n0RVso3+A21t44HVGJDiuPRYDrBaGxoKkvwb5TIq0rw8ID2XBqs+PzTXsd+fp1T94\nhRiSWFgsMuQgGXt4xH94VgHadv7oi4btZ40BuvF9oevw9S5ogbMfRnQuQe7inWlg\n6QkeyVnSAgZqT+IzuxL8y/XXIGzetQGsD/fvHz+BgWNFHwrEQd7gpOmrZSW7/SHU\nNBmP0PDONg2NQz8luFAAR1goebeZf+CqaNUWnmC/zmnNd+1wRIcuyMtmaVlBOrw1\nKgoLv6mg5rnIQB5W2BD2wBvh10+ed49Q4sKOndIej7I8lqkLm55g9VJxL7NXKk+v\n9H6bkvj4xWeXkyAONJKkzc/ggSgwOF/VVKXFR5qKuulAKYmZ+8OloB3dETKPcP7E\n+bcSX/8Z+1F3goFiUzgZms7Tlgzkp9Sy408SMssqexqqf3x4BV+eETDMKIfUosZ1\nt93hMa7nhP7VyfCf2SDV5+HP7BULbZhoepojwdtnH62zB/tp+3L/PAIfznJmJTaj\nOyLbk4fCRr5fR5F/FOO0rlnE73PIy8vEMDHvgoRbvuJM2CrCquYOEqBCX5NSsKJa\nzjp9n+LbuCJV8RSit4aX5KVNMl9XeS+DAgMBAAGjVTBTMFEGA1UdEQEB/wRHMEWC\nQ2JNMDJoVjZaWGI3ODR6bUU3ZlRoYzZRTk9nWG1ZWVY1VWpITjgwNTAuc2VsZi1z\naWduZWQuZ29hdXRoZW50aWsuaW8wDQYJKoZIhvcNAQELBQADggIBAKiDpxrkM8Nr\ngYfRPOvzOfviYdEVrcu8LJawEESKqBphFZjj30AOFSH79GdBz3ckeMdmyEAmfDh4\nijSueXJ65sgzYFjLRaG3YdjoTWMHH8tK3RK9NeOCQSrDaaIXRPdb5QGjUOmR3O6K\n+Z5vCy2mGnpeUnTit/s90NqylUn+CbVDxRqfdFushl6FPIfCGMXkLH0nTBhEDTyG\nrmgh9I6NtXI5HBAy+ZKdahcy4NE6rVqlzdvyc1jUjlP4Bwl670nzg9HFUDIGIbBf\n7OkBOt8AgZnziLP0vxmTcIa8KCtdbobdx5tIXoKsHkHsP2LrR24TbpRrfj40Ikzl\ni4ooqkQQ25SUGYjeKgX+ZQv7rWWs/3JyV3YGWSBTJI879v2+58WYXArXoGIzT1yo\nLAuPXzHMCYdHTCk7SzOtWa7g9HnqKx43jSWPc8sQg4HzubxoMzmBEthH/PXAgN8C\nGKgsATd9rpiml1FIeoJpJtCfE3F6oTdyAB73upgvQKUhTGShzwV8vCD9WERX1aXc\nu+0W4o8Zt7Oqtdj2rnqk8PQlNyn0ZsfsJYtiFPgntHLhIOh0HCY2irkQyUgFr4RU\nfjrf3PPnXzMfoa/bRuyNprMPl+R8WKU+6o0paZ3oSTkHzn/IUdNy+06JSdZDMjRM\nBdiRGnL05ZtSyoaf4dFZno2Qd0XAjYQJ\n-----END CERTIFICATE-----\n	-----BEGIN RSA PRIVATE KEY-----\nMIIJJwIBAAKCAgEAq/hOG76LgYOA03oh3Z8WDzv1MavpZBllbYMKyfgmASJKG0bU\nTiNd/NHQxoA2slTU2fVEN3xWnk7RFWyjf4DbW3jgdUYkOK49FgOsFobGgqS/BvlM\nirSvDwgPZcGqz4/NNex35+nVP3iFGJJYWCwy5CAZe3jEf3hWAdp2/uiLhu1njQG6\n8X2h6/D1LmiBsx9GdC5B7uKdaWDpCR7JWdICBmpP4jO7EvzL9dcgbN61AawP9+8f\nP4GBY0UfCsRB3uCk6atlJbv9IdQ0GY/Q8M42DY1DPyW4UABHWCh5t5l/4Kpo1Rae\nYL/Oac137XBEhy7Iy2ZpWUE6vDUqCgu/qaDmuchAHlbYEPbAG+HXT553j1Diwo6d\n0h6PsjyWqQubnmD1UnEvs1cqT6/0fpuS+PjFZ5eTIA40kqTNz+CBKDA4X9VUpcVH\nmoq66UApiZn7w6WgHd0RMo9w/sT5txJf/xn7UXeCgWJTOBmaztOWDOSn1LLjTxIy\nyyp7Gqp/fHgFX54RMMwoh9SixnW33eExrueE/tXJ8J/ZINXn4c/sFQttmGh6miPB\n22cfrbMH+2n7cv88Ah/OcmYlNqM7ItuTh8JGvl9HkX8U47SuWcTvc8jLy8QwMe+C\nhFu+4kzYKsKq5g4SoEJfk1KwolrOOn2f4tu4IlXxFKK3hpfkpU0yX1d5L4MCAwEA\nAQKCAgAkvyZRn2HIBwWcKtjZtojMMI+wUX/Jt/OIdxvzFGdqjp0vPu9W0w/eWic2\ng2csrBvfhx1Qje0kXssmvNQjBrHY1feAl8BdrD25WoeHOL1qZTG8l8DXUsyldZ90\nqvGI8L107Fai48CBk4s9OOhPzwIA5SsMyz2Rz3DxbHFI/v/xkQEzjE8aEzJqbE63\n3/T3BZPUd533Ic1pGyAwprd3zfxIyqbPOyaaZBJhMdrn6J7dAJtY62vN8ipnv/lm\nH5HDwlT66Xjvmz/33pRTcfu/uRCrzKe18qVz0ttr5xo7NT2yEDfecLrfCZ1d1l3u\nCrNZ/5FAhV21iM64MNQO2XvXD169sjEtgnH4nmeLjaDOgPq7Heu/+ZaVW23O800D\nd56z9V5B0T62cqdi1GfHfjHt2mAnNaIuJsay5hPeC/B8fL+4V/0Y/PNoszm4tMiK\nwkhvtJusyCKQ6LRu9dsKRCAVimX4HqRLPweotR22sSqbc/HcJ4j3ge7g49Cet+Hp\n+huCeQ49p0aRJdSbgiGTOqnRCYxK9kljaSkrJ36e9+5fzTH9BNsWPXwZfmq53NCH\nFoTdxBe7TojCnUiQ23P4SX6+IgVCWmbRx5MIi+w84IimQarGNbCtAqbkKZI2/ClA\n7o+04Sr9pDZb6wVrLtR/XYVLXirXA2iJvWucqLslP12irFsSoQKCAQEAwktGBVMc\nKmIqCf8woojW2vIOgaHUdGH0SzwaxcU90XWxI7fcxsSqVPs1N0jgQVqP27EiEcti\n9Y1abNHXqYiMbl1wE3yXUHr3wkb7XHfD8KSbeysX3BuYPTRHmjRLs8GFUeA6NWUu\npL0KtX4ZRwa8Ri0OOdAXiDMgmyJ+Mq9FG0oCwpW/xu3Ftw6MHfn5o6qZoCN9O4Cl\nKoCHpQ13MMZjaqawuTKw7NDaJA1HTlyRNnq1D2Hj5hkS4CRXIFgjKRrs58jxJlnt\noxHaBBBR/xawYvlZcZGZduOjxXq3vYkEpAKwtgwvIOXMlKKLY1drDKMs3xjNbeJP\ndn6pU3jSXCNQnwKCAQEA4pYC4d8h+xbC4Jy+W3r3etwxy8kwvX+FnlxoBLgcxnIe\nDsr7whYinfqa0EO760waPgO0jdW95IHT2xspYh8+Yo1PsEAM+kwCe73bVRNazD8f\nKM1xb76OVwkSLlkBhXUzF3DQJTLsMYzAHcb+iZHiXK1/BN+K2xG/QsGl8Gog3LR7\n9SsWNrJF3jr0Fsbi5586+JZCf/mjXNaZTFW8uC4TmI1K4JvC9tSibc+1qS+DEt+V\nogI3X+OEk0CNn8GBZPkjS+R7YFH0stS3F7Zs14I3YIDebVgdRDy0poK4tWrwiNlV\n3D9/9KNPFDKXJ6b/mzKyqaw83EHo4jl9bbd3TSCCnQKCAQBJulCu0pPcjXWQZ5Lo\nCm8llDbnACbjpwwRxJQQOkG0CyoV+L5Bev170/ukp/XZNuliH3xjLj+2GFaY9qQU\nxCkt9C0EaAHvW0pLIa5er1/eIEiT241pS9tgVkdZf8C+TJAvupu8CVJC1y2KI3iq\nGCc3pf9A9vMHDwevds5Wo2Xg7hvQBQ1KCo49YbrP4TzW23UCbJUoEDAcybsvacWx\n74ZoQSrMjCzRIIu2pIdLeBruhm/Qj3/wn9Em1wNs1aU6AuqlJf5EZFmlyK9nXV4Q\nI2b5l89WJj8K+2T5GhFBTg5BwneWDVeQ70LLoEaugsyvdfggDIRfz0ICIBxW/YEt\nz4TXAoIBAECWVCIAUZZaCZiu9U/sQEkEJSmaossRY4wdeQUHWiRy+QBsedD8MEfp\n3GFLPXC3068jrT7U03kkTLhjCKvQjh7XewSZbVmXewm8t52Lk9EumPovfYtFvRsw\nGb+eXWGmY7bl0F8aIduJ7GVQiNO8AtM6HT/NXK5PY75qppteFRn0VHUxH/bdYC8V\njOhFLv6pE80yP6htB1T6Ut5Afjfd4nYUqGhX3f4v5FD66SRdx7YEh4mTqicqGmtC\n9lu4c+LNZXNHoKd3FRI4siwPMv1HP/PBKCXw/P6rcy8XigEkh4XqtZ+/dgDM4Ei4\nlv+Viby6edUFpJ+AJhr+GjPBHT+d6b0CggEAceyPbVs3gHOJtGGJcIw2mr14hc1d\n08BDvIUbe0pYscZfrYf0zY2uhsHyETBcC20rSkoeDcmhY6/1XrWpDH/Anhh3Wbo/\n4Yu1/KXOd4NkmWL81ZmE6lY07Sydxk6bcLmlXcJMwkfNFzuFj67Pe2NgWdBXc1Fd\nwLZdciN5LMDRupIf9E8X3TlMGh67Vdf01tKJC1BwmJkiinBuMmlhpqJmrG+CesOK\nU9AzzGDijQ/mO1te9wTgHuAlWNwZaOzU8I/vCHT0NmIdIK0q6BUhIk+zEC0ETwCY\nSCzAby4dGEazC0l8iZKgG6xWQ8BO2B5IgGZPbMGHyowSMAPrHpjnO98/ew==\n-----END RSA PRIVATE KEY-----\n	\N
+2022-10-25 09:01:06.131741+00	2024-01-10 13:34:38.497975+00	44404c15-dd39-48d7-8962-fcb807cd5e58	authentik Internal JWT Certificate	-----BEGIN CERTIFICATE-----\nMIIFHjCCAwagAwIBAgIQF5FQmU7oSciGLNkWVbLSpzANBgkqhkiG9w0BAQsFADAd\nMRswGQYDVQQDDBJhdXRoZW50aWsgMjAyMy44LjEwHhcNMjQwMTA5MTMzNDM4WhcN\nMjUwMTA0MTMzNDM4WjBXMSswKQYDVQQDDCJhdXRoZW50aWsgSW50ZXJuYWwgSldU\nIENlcnRpZmljYXRlMRIwEAYDVQQKDAlhdXRoZW50aWsxFDASBgNVBAsMC1NlbGYt\nc2lnbmVkMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAz7YMxtUcRT+A\ni8oOZpnBHF/5NFQ15dexytyfB/ni2B0w7SjN0aoOXAY0/AHd8ykloSz9XLgDrUx+\n8qHYMX4V941DVPrFLe26UYnXNUDaLW4N6uMhJjxFzQQQ3bjMTzizJ8sbT7qAJ5yh\n2cs+IM3vHnivc/pYuM7VgLlbnPfbjYtnvpLNf94xkOaMuOX8HdbQmtlt/ARMe9mS\nhZYDkPcAkFjnxOE+dZkkKE13sZyoeghcrjaB56GZqhQ8e6Jkih6cbJ5vto5UOP8+\n9Hwe2FD//wEvRYYl2d32GREDqqrJX5ChODyL2u99z/6Zfe2UGbIYn0vF7zTYICTq\nAZgUuPzk5X2caUAVwDG1DRzu6xaU9AmNarg+MgdhKdO20F9qjJ/DJ3srSgaSLHyd\ne1XW94Pagt1mCGfPuxpuX/b0HCUhR4hQGmm76FbthkZn8VlucZc+qXuLzWyNWbI1\nNFXIpewSn5vGOyMRifCEZAXkIU0mBLp/ah8OK63Q4YoH+LnM7y1haIScVlY77AGa\nZq0wDnr5bpq5Cruylu90RsgkXqokqHmVJtKW0IQIxT5ilMpGXNnPkuwZxsFkAz2U\nlwBfKPhyrmYIIHvvLQYHohZOu/JSESqQ+KzkiRlzmdXmWciuC/G58Khz+Zoq+xas\nrR/vATcNjfkldbH6hJoV6o6gD1fO9TcCAwEAAaMgMB4wHAYDVR0RAQH/BBIwEIIO\nZ29hdXRoZW50aWsuaW8wDQYJKoZIhvcNAQELBQADggIBAG+xj/e41S2wPMmkSXx6\no88x7FhS+pCMUQqhdlCSSjweIWuIK+iTW+MHOhk9xVqwBKkO6fu1ImiDcZHv88JA\ne/dEMyqv+hfqx8MpAr6pPYfVloEY8UsafTXwGoE5bgr5SIeO2yqZ5IBEys3pC1I4\necGLEgKFJ+nNyCeC2COE7NTDQOSfYnnQQLDhBSehJU7gHJ05FJJCGwjSNp25TKEl\nT/9r7tnfgPkygu38bUHg9wRrR69gLsfgG4gkVrkgg/ac9XfKFOMstsXH/njm2CpI\nk6Kl1XrKxeJX65fFMSzHZ05NyWVRNyFH6EvLuFNehwF9fYiYFBGrLGjOD+LtnIPo\nOD+8Mx415zRAWGQzePrgK2oWuVqGAz/Rdw18vAFKHJdt0zwd1D+RzUKXNJIha40n\nyDvHIUjAGIcE5iOozoYk0VqCDzYaQDib+aYiy8UXmK7ac+AfYhH/+HmpcibQGOXx\n1XpDjkbYXosKfi9E77yOFL7Iuavgu8u4/F1OMF/yG1UxDEo/WS1mriF6e3Ec8snq\nV2taRnKmjj0vI1cRCPeLf8uoD/MoLjjyuTwmDhnIjbt24b6+bul87ZKpQtk3Ecp6\nyB7SWjTuIph3pxpwmHjRopFP7Upz7YLzU0/TViIF++pN2X65yDxiZc0zSoqJ/53I\nNfx5/oC06EbgbJieCxnHeYuB\n-----END CERTIFICATE-----\n	-----BEGIN RSA PRIVATE KEY-----\nMIIJKQIBAAKCAgEAz7YMxtUcRT+Ai8oOZpnBHF/5NFQ15dexytyfB/ni2B0w7SjN\n0aoOXAY0/AHd8ykloSz9XLgDrUx+8qHYMX4V941DVPrFLe26UYnXNUDaLW4N6uMh\nJjxFzQQQ3bjMTzizJ8sbT7qAJ5yh2cs+IM3vHnivc/pYuM7VgLlbnPfbjYtnvpLN\nf94xkOaMuOX8HdbQmtlt/ARMe9mShZYDkPcAkFjnxOE+dZkkKE13sZyoeghcrjaB\n56GZqhQ8e6Jkih6cbJ5vto5UOP8+9Hwe2FD//wEvRYYl2d32GREDqqrJX5ChODyL\n2u99z/6Zfe2UGbIYn0vF7zTYICTqAZgUuPzk5X2caUAVwDG1DRzu6xaU9AmNarg+\nMgdhKdO20F9qjJ/DJ3srSgaSLHyde1XW94Pagt1mCGfPuxpuX/b0HCUhR4hQGmm7\n6FbthkZn8VlucZc+qXuLzWyNWbI1NFXIpewSn5vGOyMRifCEZAXkIU0mBLp/ah8O\nK63Q4YoH+LnM7y1haIScVlY77AGaZq0wDnr5bpq5Cruylu90RsgkXqokqHmVJtKW\n0IQIxT5ilMpGXNnPkuwZxsFkAz2UlwBfKPhyrmYIIHvvLQYHohZOu/JSESqQ+Kzk\niRlzmdXmWciuC/G58Khz+Zoq+xasrR/vATcNjfkldbH6hJoV6o6gD1fO9TcCAwEA\nAQKCAgAl+BVl01cToYQSCaGQR9LxKOoZEru3hDJP7vxzLM62yr9C2w6koP12/Pt6\nhazY4lCqodq+tDSX3T/ngoZOpcnGMuB4DE83EhnZBeV9Kpm3bELHCTXqE2J/E5sx\nrLJMWQUG5S3c6S68DvnXIjv9Kyfm3hDUlpLZVZXZrgh9LSHJQg5428UM9sUAw+Q9\neG0Z10bSx6Q/SVnh2efa241TVpOXz2iuqK4OOSxO4bpbkVOK2zR19CjS+stoN8LG\npuzSAr59bIjnSiVDNgWAE6Bf0o65QrItd1Q7+0MdWerdq9Kb0YhnC0pVfyn0d4n/\nZwqHl/LAS82m6HYJijXsjKxdFH2S0TNzKWgUV8LC5/4pg/u27i2EHpnouzZxhzdH\nViwLRsGl/Zh90THSWWInBPvyeDxdzxxc0L5tZQp4xg3E2iYlQVMdHvlhdYjVeEzp\npqH4MqoX/QagnlcY/eZfU/sUT4fp7z+z+sukRQnWpmQVcYZKzBRtg7ya/7/Tz8GI\nfF8iLX5CMipkH+kpC+wNJfBsCYtAE1Accf+7l1Jp9LwTzF+PaPFp/X/H3N5vltdZ\n06993CzvqVqxp1PhisZVrxaMk0L3ZvYZGlSyQZN5CiPAK0EoU+cjJqiUXnAdLaJn\nSblRTrIlL1qOIq/RiLi2Mr6tSBZWZV2TaICsH/LbvSVThmnc4QKCAQEA/Rrg29oS\ntVG/NPbhD9oLAV7CpzndQT5T5HJuJ3p11/jbwv4qm3OAmHoCUNvAuFQ5d96qpKt8\nU5zvfN+htrXH2qfRWm0UI4JXL7xaCREzyj6v5GgGgap4vQDj3DghW3l01U8OYDQe\nvy29U5gt5zK68XfsSVV0i3GrWCZLlGxfLXXaRzrBXtWXMXqdaaRWNkBTJony+jjA\nd2hOfCZIFEO0ntvppLDMCtqr4hxwRSHsS4S0wmugFH89KJAOTzxtf3o6VIAyAu0Q\n+I4Dy1bwctbvFAqEZWsZ6ExrO2WxIs4MPLO8jjTsmbxulTSeOAVz9lPgYAdwjoM+\n22R2VYWeLpH8KwKCAQEA0hZAvpjk9o1NKdkQj+R5h/WCdGHFPHPD8wLE6Xv7XksX\ngoendbn9n32kHiIeAM0EV+RHr5V0d3/bT3VuYYjUZWwkxgBwN6S6/PoEImLoZZxW\nxx8KbDeZeo9nwmyGuz71dM0YMZBszV9KdpN/X4uZZeTW+4rBo+SQNbMAW9Vaenus\nqPuPcl83YtzV9Quig/2J61VOPoXw/JOtm/RVJOS31vHupneNu81Up0JILyAiArx3\n+GVYznPtWB5sXnnA/WHfpCzmAF0LFHJ3y1XwnaAnMaHpg3vvFbR7UswdO/Uhz8oz\nuoTaSbpyVq7fDRNZT1mM3gLoX89ic5TpaQhOjIgJJQKCAQEAtW0L22vQ1zn2pj+F\nCjjQhLXpL7dxmq/TsMA5p4DHcf1Hgdlwryc2+ZUTjeRHm5l77CmnBgyKPOEUZd1j\nbLWWwWxjy76+nclzN5t6ql8zUXhn2oCakV2h2FEIBDYT6x7/mVtmwZz6oS1nNcGy\nvbQGfsnojJR9yuq62J/yszyPaOW+hipeq9zM2MG8jhonVhH7yHc/vQ7rH2ycPa+v\nIR97HBgkvVGhoPIoHRcnftaXK3a/n1FIWQjvzOCd8TwufR8fKq0NrD1EWfZqT9pM\n1vSsQSBc0NnZo0ML5nK5a2ppKSXpNcJICtcgKUGjXCLEgcCT6CHNE8qORvMXQ6xY\nu6cXKwKCAQBY+NmknoXhMMhsH6SW+/DINp5wAXQRfQmQYizYoQw8y9qCCkdOYV1a\n7U/S/ynrtufO/TuqzcXMUhakGRyNK/Cfn2QXgtoDhr02JAAaO/8mAUby/19fo1BZ\nimAsA+AvbqNvOuizHPInK+MSQrcf1LQ7ZeXyE7qcWVEFnPBa9Alkc/oUeq0uh8qi\nENp/89R4x6hgRPllGz6LCVPuB1UD0eVVn5ItZ9ZbocLnLvf5FUeyFvVL+kfY71mm\nBwRoInIsHQYktmsV3lGx8CRxtcy4RLo0l9iYOaVwcMYFs7Hx0YfnQ0ATDu6PaOnB\ncj++fuJE66zv3RVidibAwmDzfXQeqgINAoIBAQD8bjzV0cSfrOOnxkAbbEbxnBgQ\nG6KFCJoy9DqS529YzhlOny6O3aFMfUljOkkZWslX5HS6Yw5TKKEWK/HD8zCbK9eM\n75C1NXPuZMxj5RG4BbHOSLMrMoDz283kjvWxrdsJYjjNFwXAGBZI4d53zjSBQGu+\nZm9u41algXeaq7mGmITusrufveRUxdpRGEjKd5mWmqY03h56sASLqTg3ED5+xsJf\nBL8khS2VpHjBpFYGm5qkvklr2teVMzXWL+HVbhNDy3ZE6ogjj07Y5JAFDL2YxkNt\n50UmS0XvKG+5K2Crfbp90Hrz7mVd6Cdh36Nk24tQaaeq8sFxoE3gaD7YDful\n-----END RSA PRIVATE KEY-----\n	goauthentik.io/crypto/jwt-managed
+2024-01-11 22:07:32.546353+00	2024-01-11 22:07:32.546366+00	3fcd5d6c-3e40-43bc-b916-c7cd3675d0f1	authentik Self-signed Certificate	-----BEGIN CERTIFICATE-----\nMIIE/TCCAuWgAwIBAgIRAK1LRDkgWUYlrpBkN5TBxu8wDQYJKoZIhvcNAQELBQAw\nHjEcMBoGA1UEAwwTYXV0aGVudGlrIDIwMjMuMTAuNjAeFw0yNDAxMTAyMjA3MzJa\nFw0zNDAxMDgyMjA3MzJaMFYxKjAoBgNVBAMMIWF1dGhlbnRpayBTZWxmLXNpZ25l\nZCBDZXJ0aWZpY2F0ZTESMBAGA1UECgwJYXV0aGVudGlrMRQwEgYDVQQLDAtTZWxm\nLXNpZ25lZDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALY9CVd1AZoE\nidS5z5x0UiXhOlvrxDeJ2gZOzpKdfQ/V6piMruOnz247vsqTWTziy3dTejuTiBA4\nvxOolWzuTu6jWs20zmbpynqfszEB9X83ag0ijpkzIgj2nvtgIkXn+ti2v4f4tdmC\n8OlY6G4tlD0NUc95VBo6qFdrsKJHmDfNsNqcsYzsxvi4QXoIXx+WILcvMFAP0wU5\ndKIg3mrTc2EO08KHqh2rXj2W6DzhBCbQUTDRnuJwH0I4wtr8QgUGbjY2l5qig2Fm\nonH0L229NUiQmo7ptp9xvj3L1Kzt8q/aEoUW3hSTRujP0Wx72U3Q86xaD3dnC1tK\nF5PXG/JBb72oRGF978kfgAhERUvkmuyAV4kvFCTWw2oZTsszOZMIbQ10lxJ5+yGg\n0AhYojNnqWiM+D03FCnXpYdMUfTmEHSxFTmYivi7RKE/uA7VjvKL/mXLqR6alQBC\nHg08bhXcZCBvJEn+LKsysAvFuwb+yauV6O8BOKL1f1PMxK0VEhzISQ9p7FB84v7d\nZLH7pCzBSb8Or3URgls0wuNVsg6WedOgdCW3KOr1JcFNEn9daEKF3uoGxJ+58k5L\ngFV1+JOO1rgAFpUlIy8+UXHEkKUIA2HnUStedNfta5Rduw0sVkrIOOxG5GF3/wlu\n7ZKoogrKWVsmBIaDHD1FRTdtkz5BbJrtAgMBAAEwDQYJKoZIhvcNAQELBQADggIB\nAAHdrZStP3QAgiQclZHmW9rgjMIFstWGj3+MbR+MxJPqTJLAjXWYiFsTWE1WrjLv\n3eoE2pszEKPV+ZLSTmSFC3N61F9u7coXXLmGq8Z01ubyzZIiyih/pJOWax+0xYkD\n+gNZ0syjgyBQ9JxaOHol0ydoQSKYEhI+BsD5GVrh1q9FBtmJhB+E3Z+qb4axd+n1\n9u9G77ZMcoAjknXZsULx9jkAQehC5+qO6+7zOdKZ5LfvQGY7K6lsKpsCuC9nC9nl\n33BeKdshrIvJwFQ60U9f8CrbAEMVKaEB6UCWlmHAVk/i3/vYW49L31UKl0d8nyxC\neg+xE9lK8xfZ18P2G5xPOXkj0qqk/byMrTYTeVCzYQstc4Vpkcr6H0ltuYF41Fcg\nHJSV4mtxv3EvkZdpPx2Iqw8td4theHjt+j7Xb3sufgBfjEcX/ZYgPOYlFCs2ScDR\nwBvpXytwd58s7pWfIYhi7mnn4LDqhLgYMOue5KpuqMTBbINGywyoiA+tr5paJOy1\n7+KFqUuymClfKtvsBWEci+a71Toy/5O0OvvqbfBkiwpjSNwvTWLiVjuTCQx9BcBP\n3ZXeKE4s3SQ9WHTi4PLpItYNpkjDDQgy7avEBGSofh9k6RNunLkOmQJDTWofPXbI\nfVB1RPV/Pi69jLSI4y4nNPSXIN6r7R6mAHv4nng+Q6Tj\n-----END CERTIFICATE-----\n	-----BEGIN RSA PRIVATE KEY-----\nMIIJKQIBAAKCAgEAtj0JV3UBmgSJ1LnPnHRSJeE6W+vEN4naBk7Okp19D9XqmIyu\n46fPbju+ypNZPOLLd1N6O5OIEDi/E6iVbO5O7qNazbTOZunKep+zMQH1fzdqDSKO\nmTMiCPae+2AiRef62La/h/i12YLw6Vjobi2UPQ1Rz3lUGjqoV2uwokeYN82w2pyx\njOzG+LhBeghfH5Ygty8wUA/TBTl0oiDeatNzYQ7TwoeqHatePZboPOEEJtBRMNGe\n4nAfQjjC2vxCBQZuNjaXmqKDYWaicfQvbb01SJCajum2n3G+PcvUrO3yr9oShRbe\nFJNG6M/RbHvZTdDzrFoPd2cLW0oXk9cb8kFvvahEYX3vyR+ACERFS+Sa7IBXiS8U\nJNbDahlOyzM5kwhtDXSXEnn7IaDQCFiiM2epaIz4PTcUKdelh0xR9OYQdLEVOZiK\n+LtEoT+4DtWO8ov+ZcupHpqVAEIeDTxuFdxkIG8kSf4sqzKwC8W7Bv7Jq5Xo7wE4\novV/U8zErRUSHMhJD2nsUHzi/t1ksfukLMFJvw6vdRGCWzTC41WyDpZ506B0Jbco\n6vUlwU0Sf11oQoXe6gbEn7nyTkuAVXX4k47WuAAWlSUjLz5RccSQpQgDYedRK150\n1+1rlF27DSxWSsg47EbkYXf/CW7tkqiiCspZWyYEhoMcPUVFN22TPkFsmu0CAwEA\nAQKCAgAJptvqzOCj1p+yK5EqWSLMrMwZeDgxNNTeRqg8LaklAJBnOfQ9THL5BKML\nOZidV+mszTgJFbw8F7VPBju7xDdb/jzd7jiMTM+ThQfJjbAB595vCaiBxqqDzQQI\njkPibfHkLnGgcvS2q2+0/Cd7RmC2hxERKvzgUsD9uE9nmOEf+33lZi0lKJk1LRUS\nsITROHNNIGuvodbsTOm3eIQvJjnTJyTiBatl3OCl5GsyZjyBDcFvE3sVxRhyumzf\nikK432lQ571JzFem/feWj3c/majLyhTVgt1QPobz4OrHqeaTl7opYFeswUwdInyW\nAU02CN4O/8oX6dY5JIhxJRBu2TZgvv0Bt2XmGjpbL9hEYWDD07ZT29/w7YdsP3Ng\nSovx0e1NZL8Lzovq9Nee31wzgMRgOdHobRku5dORQTsi9fjlf8pv2CWjFiKrUC9B\nu1h0BCOW6vfiJHix38kO/jNGFep0FzcSDKzlCh/gM2+cF93o/3CbECyQQkWpb5UQ\n8FsgEq0Of6n8uSmju3GjZbLy4dGwO5bCUZgJ2MfS1DmFd1cUSW7x7DOzRc22GShZ\nZwLiIzlQuHvPu9HZ9lbDzTD4RqFEciVqphuqU6FNMxyuchUG8rN4S2nar1tmmWoZ\nAil5IQ/YsBP1fM3bRz5ee3sUYlSb3jseEl2ofpZJx/R+dhosgQKCAQEA+as4jdCg\n4OFeByguQ4asvYEkxlHeSzUJA9nmkHuYCJY2vmMljPAAKgpfKQfeQSHwf/+bj7al\nCPQm2Ov+XV9xp3iqjxJCaSheGmeT8U49mDGSLZ9tavZEdZvT4dBWzMuFE/E8kN1i\nfzrlDCDIOxqbCdbGQsbjYrmrYiFuJEmI/BsOdFpeaLQRPFPPT0ojN1Onu5XC2/Ug\n7vRy+37CFjzVAonAjl7CDdyfndknoQOE1kWg2/ujIEJy3UcsgNuhFbGaYMihwfzn\nWtAtjSMEh/CP/3r0C68hcqX9UFmCLusgpHOJ38oA5RnlJmz+KTOFNSNfCauCMgE1\nUTWh7L7pJqIFzQKCAQEAutwTl93ZGOXOlaikQaF5CGBFH2NxSasDIW63gQTnnI6v\nB0y9YnrnlbTK0bVpEQB/7YrLLUHvYZOS/LMFkl0ebF9xkOwL0YBjF43ZeTjcvF2/\nvINN4xNQKArVLU/EblSIDqGEMIphxqPQQyrpUnik6hAOk9eSFEo3HMpMCaJEc/Xd\nNY1958G01Rvi8YHlMgEmf1p1e9AXCBlBEo84FM/wo7meFihh4Mvnk3Wh1QGaytq1\nrI2GZmKBXOlGKtKkeJaw88NO83Z+OTwGKK+rXAv1ZryM0BG+8hlzlxoeLwT+cBux\n6kN9gLnqc+VGQYK9iCgtnIh9+ac/ZfP5DZr+sd3JoQKCAQEAxU5a0zgc65svA9jt\nNtAnk1uMBG6OjkDLbw+09lm2PJL5kFwqQMcqWg74RSTCsBZySbVm6pwcsIbCbIuT\n6ZaT6xWhNI/pi9ErDRLuB7UdWDlUnFlxzyXv1EHhoINVFWOBN9FdW96ZCJMyj/MY\nSh0siQoChKNI76xrlJF2yZaTeyims6z3Dye+tz5EhxS/3+lslQI1jD6cWDs24ym5\nmHlanTbfxaN9GBdSzRvgBY8SW4OLLE4hDE13GQg2U18+XjaNGg90RinnbA048mDK\nI+Qo6G3yj4lHlaM4HVefWhTXJx9nxkONkYB1Z3ibI1Rj4Sqi4LF5oqrxx8vqu33k\nI3PHwQKCAQBtVGDeZX4ldCg4JnDcuaaAQRuQbvWU3cs6H3actYrybgV4puzUFwcy\n75IPuy3bNcij6qZQN5jhJaBF3FTxOyyWyg0/duy/SngwCt3ocF2ulMefe8/xgZZP\np27tUROkXi8xKE2YvQ7SU3yCIDRd/Zq4HGb7F5Ev7/BpFvAAXwHgO0WPlNbK5+pv\nGh7hoVfBtyyYLQw6QhmHsocBXey5OKUalnspib0i8wrum0/xujugXvEXIcM2WoJI\nI3Dbk12J9NlZ9rdV+cmGoVkVKxt/Arw1vTJCd2+aZUvdZ/mrFyfr3jht0ck3rQ/B\nea9umxlb9e4h/TaAANw2QdZBoKNO3G6hAoIBAQChAPeCURi1sB/QXHPeFUCrnyyp\njmw7Hnb06Gxr0YzDJAtWOqWkMdjCIcn9SzAyZUSFDRKGKefWKS5xYPpqbs5f/AUx\nkxkk4/GI+eH9jkvXCuRKt7+q1Na0CESCRrpHVVUhm2j4yexoYgwqqVbhyLh1e+hd\n1oS8X7V2s1Im+8L5B+q+bmJwJeU0M/38+i5+XXGSXUJyI2H6hCE+YfvTJpJ1mYSC\nAlD5ZF0Du9Uhf7a6jicphKPKnTdEjClN3AF8gVaeOsfYCWoYF3ntCUe2twARtXWD\nJL7iTTfo7lpABgzekT8BJALUQ/C3ZS1tkKvnoUIKBYIupiS5G6hTvXUYeIVk\n-----END RSA PRIVATE KEY-----\n	\N
+\.
+
+
+--
+-- Data for Name: authentik_enterprise_license; Type: TABLE DATA; Schema: public; Owner: authentik
+--
+
+COPY public.authentik_enterprise_license (license_uuid, key, name, expiry, internal_users, external_users) FROM stdin;
+\.
+
+
+--
+-- Data for Name: authentik_enterprise_licenseusage; Type: TABLE DATA; Schema: public; Owner: authentik
+--
+
+COPY public.authentik_enterprise_licenseusage (expiring, expires, usage_uuid, user_count, external_user_count, within_limits, record_date) FROM stdin;
 \.
 
 
@@ -2748,107 +3018,7 @@ COPY public.authentik_crypto_certificatekeypair (created, last_updated, kp_uuid,
 --
 
 COPY public.authentik_events_event (event_uuid, action, app, context, client_ip, created, "user", expires, expiring, tenant) FROM stdin;
-ca71d863-2b13-42fd-a836-134bdb8e13f2	system_exception	authentik.root.celery	{"message": "Traceback (most recent call last):\\ndjango.db.utils.InterfaceError: connection already closed"}	\N	2022-10-25 09:09:13.17925+00	{}	2023-10-25 09:09:13.175376+00	t	{"pk": "0b2cdade01e549bc94874f4e23b9feb9", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
-fe793d8d-5f6b-40ef-af46-b8cf221432ca	password_set	authentik.events.signals	{}	255.255.255.255	2022-10-25 09:09:42.825971+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:09:42.825304+00	t	{"pk": "981ac441d0bb4249bdd540582695859f", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
-af542ed4-b917-417a-8ca5-5f206298b936	user_write	authentik.events.signals	{"email": "admin@localhost", "created": false, "password": "********************", "component": "ak-stage-prompt", "http_request": {"args": {"query": ""}, "path": "/api/v3/flows/executor/initial-setup/", "method": "GET"}, "password_repeat": "********************", "oobe-header-text": "Welcome to authentik! Please set a password for the default admin user, akadmin."}	192.168.32.1	2022-10-25 09:09:42.969783+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:09:42.968372+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-b2f7c0a7-f389-4e88-b336-4490e21f83de	login	authentik.events.signals	{"http_request": {"args": {"query": ""}, "path": "/api/v3/flows/executor/initial-setup/", "method": "GET"}}	192.168.32.1	2022-10-25 09:09:43.014062+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:09:43.013647+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-32a35640-815b-4f6e-a259-5a535259cd66	model_updated	authentik.events.signals	{"model": {"pk": "0c24aadcf97e4720a70f72a190b0cafc", "app": "authentik_outposts", "name": "authentik Embedded Outpost", "model_name": "outpost"}, "http_request": {"args": {}, "path": "/api/v3/outposts/instances/0c24aadc-f97e-4720-a70f-72a190b0cafc/", "method": "PUT"}}	192.168.32.1	2022-10-25 09:10:11.96456+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:10:11.963869+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-e1118e2c-91c8-48ed-a5ca-d7c6e60a7378	model_created	authentik.events.signals	{"model": {"pk": 1, "app": "authentik_providers_ldap", "name": "grafana-ldap", "model_name": "ldapprovider"}, "http_request": {"args": {}, "path": "/api/v3/providers/ldap/", "method": "POST"}}	192.168.32.1	2022-10-25 09:12:08.367626+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:12:08.36694+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-ef09da1d-1893-4528-bede-2aadb7f0c77e	model_created	authentik.events.signals	{"model": {"pk": "77d294b58a504d6d8edd5b15e5871826", "app": "authentik_core", "name": "Grafana", "model_name": "application"}, "http_request": {"args": {}, "path": "/api/v3/core/applications/", "method": "POST"}}	192.168.32.1	2022-10-25 09:12:55.329043+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:12:55.328294+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-e60a1d29-8678-4e11-bfcc-c0fd2f2c464f	model_created	authentik.events.signals	{"model": {"pk": 4, "app": "authentik_core", "name": "", "model_name": "user"}, "http_request": {"args": {}, "path": "/api/v3/outposts/instances/", "method": "POST"}}	192.168.32.1	2022-10-25 09:13:37.846856+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:13:37.846108+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-2047c684-54a8-44af-8f95-46112d8543a7	model_updated	authentik.events.signals	{"model": {"pk": 4, "app": "authentik_core", "name": "Outpost ldap-outpost Service-Account", "model_name": "user"}, "http_request": {"args": {}, "path": "/api/v3/outposts/instances/", "method": "POST"}}	192.168.32.1	2022-10-25 09:13:37.856944+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:13:37.856452+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-2dc275ec-e9a6-4dce-b259-bb685e7e429f	model_created	authentik.events.signals	{"model": {"pk": "44299d02c0864d35b54e2e56bb3346f2", "app": "authentik_core", "name": "ak-outpost-efe635b9-2ce7-4de4-977f-9f25b9f36d97-api", "model_name": "token"}, "http_request": {"args": {}, "path": "/api/v3/outposts/instances/", "method": "POST"}}	192.168.32.1	2022-10-25 09:13:37.88489+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:13:37.88312+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-c7b6fea0-c89d-4125-8a23-859bf55911d9	model_created	authentik.events.signals	{"model": {"pk": "efe635b92ce74de4977f9f25b9f36d97", "app": "authentik_outposts", "name": "ldap-outpost", "model_name": "outpost"}, "http_request": {"args": {}, "path": "/api/v3/outposts/instances/", "method": "POST"}}	192.168.32.1	2022-10-25 09:13:37.890188+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:13:37.889512+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-f6ff23d7-9b7b-4424-afef-ec5ac2a574d0	secret_view	authentik.core.api.tokens	{"secret": {"pk": "44299d02c0864d35b54e2e56bb3346f2", "app": "authentik_core", "name": "ak-outpost-efe635b9-2ce7-4de4-977f-9f25b9f36d97-api", "model_name": "token"}, "http_request": {"args": {}, "path": "/api/v3/core/tokens/ak-outpost-efe635b9-2ce7-4de4-977f-9f25b9f36d97-api/view_key/", "method": "GET"}}	192.168.32.1	2022-10-25 09:15:44.834592+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:15:44.834124+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-da39c55c-e585-4d8b-b19e-7e18606b58aa	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"query": "next=%2Fif%2Fadmin%2F%23%2Foutpost%2Foutposts"}, "path": "/api/v3/flows/executor/default-authentication-flow/", "method": "GET"}, "auth_method_args": {}}	192.168.48.1	2022-10-25 09:17:04.22777+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:17:04.226384+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-3fc6a6d8-eb31-40a7-965d-c2ed92af04a6	model_updated	authentik.events.signals	{"model": {"pk": 1, "app": "authentik_providers_ldap", "name": "grafana-ldap", "model_name": "ldapprovider"}, "http_request": {"args": {}, "path": "/api/v3/providers/ldap/1/", "method": "PUT"}}	192.168.48.1	2022-10-25 09:29:26.860418+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:29:26.859915+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-ccee3640-def8-4062-a307-710b2033d31c	model_updated	authentik.events.signals	{"model": {"pk": 1, "app": "authentik_providers_ldap", "name": "grafana-ldap", "model_name": "ldapprovider"}, "http_request": {"args": {}, "path": "/api/v3/providers/ldap/1/", "method": "PUT"}}	192.168.48.1	2022-10-25 09:32:43.836453+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:32:43.835938+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-7c898c81-9586-4aae-b239-ae659ed974c1	model_created	authentik.events.signals	{"model": {"pk": 5, "app": "authentik_core", "name": "authentik-admin", "model_name": "user"}, "http_request": {"args": {}, "path": "/api/v3/core/users/", "method": "POST"}}	192.168.48.1	2022-10-25 09:37:30.692906+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:37:30.692315+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-67a1a1a8-a924-4777-a8f4-d29aef82691c	password_set	authentik.events.signals	{}	255.255.255.255	2022-10-25 09:37:47.793935+00	{"pk": 5, "email": "authentik-admin@localhost", "username": "authentik-admin"}	2023-10-25 09:37:47.793475+00	t	{"pk": "124e241c825640d9b416596b2daab8b3", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
-b895bd1d-03a2-44f1-8753-5232220d37a0	model_updated	authentik.events.signals	{"model": {"pk": 5, "app": "authentik_core", "name": "authentik-admin", "model_name": "user"}, "http_request": {"args": {}, "path": "/api/v3/core/users/5/set_password/", "method": "POST"}}	192.168.48.1	2022-10-25 09:37:47.924884+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:37:47.924462+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-54fefcce-6f93-40c6-93d1-007e77298c91	password_set	authentik.events.signals	{}	255.255.255.255	2022-10-25 09:37:49.464784+00	{"pk": 5, "email": "authentik-admin@localhost", "username": "authentik-admin"}	2023-10-25 09:37:49.464216+00	t	{"pk": "124e241c825640d9b416596b2daab8b3", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
-5ef43d7a-eac0-46c8-8681-c48dff52c46c	model_updated	authentik.events.signals	{"model": {"pk": 5, "app": "authentik_core", "name": "authentik-admin", "model_name": "user"}, "http_request": {"args": {}, "path": "/api/v3/core/users/5/set_password/", "method": "POST"}}	192.168.48.1	2022-10-25 09:37:49.602412+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:37:49.601954+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-6689eeb4-5bef-4efa-a323-dbdcb7c4c7cd	login_failed	authentik.events.signals	{"stage": {"pk": "02b4a829f9ab45d0adcc11e3c165f1c4", "app": "authentik_stages_password", "name": "default-authentication-password", "model_name": "passwordstage"}, "password": "********************", "username": "akadmin", "http_request": {"args": {"query": "goauthentik.io%2Foutpost%2Fldap=true"}, "path": "/api/v3/flows/executor/default-authentication-flow/", "method": "POST"}}	192.168.48.1	2022-10-25 09:38:11.496946+00	{"pk": 2, "email": "", "username": "AnonymousUser"}	2023-10-25 09:38:11.49223+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-16ec88aa-d907-4bf6-bfc7-e81632994434	login_failed	authentik.events.signals	{"stage": {"pk": "02b4a829f9ab45d0adcc11e3c165f1c4", "app": "authentik_stages_password", "name": "default-authentication-password", "model_name": "passwordstage"}, "password": "********************", "username": "akadmin", "http_request": {"args": {"query": "goauthentik.io%2Foutpost%2Fldap=true"}, "path": "/api/v3/flows/executor/default-authentication-flow/", "method": "POST"}}	192.168.48.1	2022-10-25 09:39:03.51403+00	{"pk": 2, "email": "", "username": "AnonymousUser"}	2023-10-25 09:39:03.509268+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-69829427-ccb3-49de-a311-f32de325b431	model_updated	authentik.events.signals	{"model": {"pk": 1, "app": "authentik_providers_ldap", "name": "grafana-ldap", "model_name": "ldapprovider"}, "http_request": {"args": {}, "path": "/api/v3/providers/ldap/1/", "method": "PUT"}}	192.168.48.1	2022-10-25 09:42:05.479394+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:42:05.478987+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-5a10fbbc-7ce4-4e1e-b5fc-201edf4fd1c7	login_failed	authentik.events.signals	{"stage": {"pk": "02b4a829f9ab45d0adcc11e3c165f1c4", "app": "authentik_stages_password", "name": "default-authentication-password", "model_name": "passwordstage"}, "password": "********************", "username": "akadmin", "http_request": {"args": {"query": "goauthentik.io%2Foutpost%2Fldap=true"}, "path": "/api/v3/flows/executor/default-authentication-flow/", "method": "POST"}}	192.168.48.1	2022-10-25 09:42:08.483874+00	{"pk": 2, "email": "", "username": "AnonymousUser"}	2023-10-25 09:42:08.477967+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-a4594d02-c239-4607-b95b-3043d3d3b565	login_failed	authentik.events.signals	{"stage": {"pk": "02b4a829f9ab45d0adcc11e3c165f1c4", "app": "authentik_stages_password", "name": "default-authentication-password", "model_name": "passwordstage"}, "password": "********************", "username": "akadmin", "http_request": {"args": {"query": "goauthentik.io%2Foutpost%2Fldap=true"}, "path": "/api/v3/flows/executor/default-authentication-flow/", "method": "POST"}}	192.168.48.1	2022-10-25 09:42:17.786095+00	{"pk": 2, "email": "", "username": "AnonymousUser"}	2023-10-25 09:42:17.780264+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-ede37431-b8b6-4b88-baaf-78a58802305c	login_failed	authentik.events.signals	{"stage": {"pk": "02b4a829f9ab45d0adcc11e3c165f1c4", "app": "authentik_stages_password", "name": "default-authentication-password", "model_name": "passwordstage"}, "password": "********************", "username": "akadmin", "http_request": {"args": {"query": "goauthentik.io%2Foutpost%2Fldap=true"}, "path": "/api/v3/flows/executor/default-authentication-flow/", "method": "POST"}}	192.168.48.1	2022-10-25 09:42:31.137414+00	{"pk": 2, "email": "", "username": "AnonymousUser"}	2023-10-25 09:42:31.132685+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-8d8dab83-750e-44f3-b5f9-e33b85e2f8b2	model_updated	authentik.events.signals	{"model": {"pk": 1, "app": "authentik_providers_ldap", "name": "grafana-ldap", "model_name": "ldapprovider"}, "http_request": {"args": {}, "path": "/api/v3/providers/ldap/1/", "method": "PUT"}}	192.168.48.1	2022-10-25 09:43:27.594287+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:43:27.59388+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-dacab0a4-45f4-43be-8471-44d99f3b8f4f	login_failed	authentik.events.signals	{"stage": {"pk": "02b4a829f9ab45d0adcc11e3c165f1c4", "app": "authentik_stages_password", "name": "default-authentication-password", "model_name": "passwordstage"}, "password": "********************", "username": "akadmin", "http_request": {"args": {"query": "goauthentik.io%2Foutpost%2Fldap=true"}, "path": "/api/v3/flows/executor/default-authentication-flow/", "method": "POST"}}	192.168.48.1	2022-10-25 09:43:30.63453+00	{"pk": 2, "email": "", "username": "AnonymousUser"}	2023-10-25 09:43:30.629991+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-12d75a37-20ee-44f4-9f1b-9f99d6dfdeea	update_available	authentik.admin.tasks	{"message": "Changelog: https://goauthentik.io/docs/releases/2022.12#fixed-in-2022121", "new_version": "2022.12.1"}	\N	2023-01-02 14:17:08.672486+00	{}	2024-01-02 14:17:08.671057+00	t	{"pk": "3fe5e3c1df6f42e1a4a934178957c3b6", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
-63133b06-3f6d-4b91-8dab-3de201e71ab5	model_updated	authentik.events.signals	{"model": {"pk": 1, "app": "authentik_providers_ldap", "name": "grafana-ldap", "model_name": "ldapprovider"}, "http_request": {"args": {}, "path": "/api/v3/providers/ldap/1/", "method": "PUT"}}	192.168.48.1	2022-10-25 09:44:12.026999+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:44:12.026611+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-8b1c946c-4713-47ff-a104-9053e97e4a70	model_created	authentik.events.signals	{"model": {"pk": "f4abcb7d5f9248908760afb9effda665", "app": "authentik_stages_identification", "name": "ldap-identification-stage", "model_name": "identificationstage"}, "http_request": {"args": {}, "path": "/api/v3/stages/identification/", "method": "POST"}}	192.168.48.1	2022-10-25 09:45:15.819069+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:45:15.81859+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-bcd2fae1-ef0b-4f9c-807d-67a66817d063	model_created	authentik.events.signals	{"model": {"pk": "95715d75025b4e5e9d2396826479906d", "app": "authentik_stages_password", "name": "ldap-authentication-password", "model_name": "passwordstage"}, "http_request": {"args": {}, "path": "/api/v3/stages/password/", "method": "POST"}}	192.168.48.1	2022-10-25 09:45:43.056738+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:45:43.056256+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-d1de4dc6-df68-493e-b13c-4379f96b5ff7	model_created	authentik.events.signals	{"model": {"pk": "8a432e545bb44199add953e198eca1dc", "app": "authentik_stages_user_login", "name": "ldap-authentication-login", "model_name": "userloginstage"}, "http_request": {"args": {}, "path": "/api/v3/stages/user_login/", "method": "POST"}}	192.168.48.1	2022-10-25 09:46:01.893085+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:46:01.892272+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-b3dfb7cf-4fd3-473c-b6ad-739962e40702	model_created	authentik.events.signals	{"model": {"pk": "87ca95995323451c86032f5bee7a0c12", "app": "authentik_flows", "name": "ldap-authentication-flow", "model_name": "flow"}, "http_request": {"args": {}, "path": "/api/v3/flows/instances/", "method": "POST"}}	192.168.48.1	2022-10-25 09:46:38.942684+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:46:38.942223+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-0aa9b970-1d95-44fa-9f79-d99b7e3ff03e	model_created	authentik.events.signals	{"model": {"pk": "585626b672d84f0f9b4e085d6a3c2ee0", "app": "authentik_flows", "name": "Flow-stage binding #10 to 87ca9599-5323-451c-8603-2f5bee7a0c12", "model_name": "flowstagebinding"}, "http_request": {"args": {}, "path": "/api/v3/flows/bindings/", "method": "POST"}}	192.168.48.1	2022-10-25 09:47:33.7108+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:47:33.710142+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-79eee3e4-65e8-4080-87e3-9e8c636a9d17	model_created	authentik.events.signals	{"model": {"pk": "1e25b2d4d52b4f198b9e65960d3a64a8", "app": "authentik_flows", "name": "Flow-stage binding #30 to 87ca9599-5323-451c-8603-2f5bee7a0c12", "model_name": "flowstagebinding"}, "http_request": {"args": {}, "path": "/api/v3/flows/bindings/", "method": "POST"}}	192.168.48.1	2022-10-25 09:47:53.392562+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:47:53.392118+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-5afcc689-ec3d-4c8b-a40b-0d5dc94b0a96	model_updated	authentik.events.signals	{"model": {"pk": "f4abcb7d5f9248908760afb9effda665", "app": "authentik_stages_identification", "name": "ldap-identification-stage", "model_name": "identificationstage"}, "http_request": {"args": {}, "path": "/api/v3/stages/identification/f4abcb7d-5f92-4890-8760-afb9effda665/", "method": "PUT"}}	192.168.48.1	2022-10-25 09:48:07.123134+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:48:07.122699+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-02a707b3-cd63-48b1-8731-734d73af8c6a	model_updated	authentik.events.signals	{"model": {"pk": 1, "app": "authentik_providers_ldap", "name": "grafana-ldap", "model_name": "ldapprovider"}, "http_request": {"args": {}, "path": "/api/v3/providers/ldap/1/", "method": "PUT"}}	192.168.48.1	2022-10-25 09:48:41.639902+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:48:41.639409+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-d4595a1a-8c5b-450f-a4de-9907facd1e94	model_created	authentik.events.signals	{"model": {"pk": 6, "app": "authentik_core", "name": "ldapservice", "model_name": "user"}, "http_request": {"args": {}, "path": "/api/v3/core/users/", "method": "POST"}}	192.168.48.1	2022-10-25 09:49:18.229623+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:49:18.228008+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-dfab21a9-ad29-4980-a762-80a1f0c42ab5	model_created	authentik.events.signals	{"model": {"pk": "a9c6327ccfca4d5ba0af421645e43c31", "app": "authentik_core", "name": "ldapsearch", "model_name": "group"}, "http_request": {"args": {}, "path": "/api/v3/core/groups/", "method": "POST"}}	192.168.48.1	2022-10-25 09:49:32.570493+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:49:32.570074+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-d273c74c-ec69-445b-87aa-0a7869c359b6	password_set	authentik.events.signals	{}	255.255.255.255	2022-10-25 09:49:44.127166+00	{"pk": 6, "email": "ldapservice@localhost", "username": "ldapservice"}	2023-10-25 09:49:44.12686+00	t	{"pk": "124e241c825640d9b416596b2daab8b3", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
-9969bf93-4d3f-4325-97db-4037c6e9ed59	model_updated	authentik.events.signals	{"model": {"pk": 6, "app": "authentik_core", "name": "ldapservice", "model_name": "user"}, "http_request": {"args": {}, "path": "/api/v3/core/users/6/set_password/", "method": "POST"}}	192.168.48.1	2022-10-25 09:49:44.253791+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:49:44.253274+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-f8e8270f-871a-41bd-b02e-f3c29e9897f8	password_set	authentik.events.signals	{}	255.255.255.255	2022-10-25 09:49:45.195476+00	{"pk": 6, "email": "ldapservice@localhost", "username": "ldapservice"}	2023-10-25 09:49:45.195113+00	t	{"pk": "669e359eaf174055957065109edc72a8", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
-a36d1d0c-a444-4dcd-b27c-297ecfce47fc	authorize_application	authentik.providers.saml.views.flows	{"flow": "a7ef54bb79594559979d9345c022e086", "http_request": {"args": {"query": "SAMLRequest=nJJBj9MwEIX%2FiuV7aicNSWttIpWtEJUWqLaFA7epM9lacuzgmQD771GzRVok1MMebc97n%2BfN3BEMfjSbic%2FhEX9MSCx%2BDz6QuTw0ckrBRCBHJsCAZNiaw%2BbTgykW2gARJnYxyFeS8bZmTJGjjV6K3baRrstWuu7zWndlX%2BaAuF6eynVV9brP39WnWq9sUeVVibUU3zCRi6GRxUJLsSOacBeIIXAjC10sM51nujjmlVnmZrlerMr6uxRbJHYBeFaemUejlI8W%2FDkSm7XWWsE4emfnEnVpQT0l6CFANh%2BIojq50LnwpBJ2LqFlJcXmb%2FP3MdA0YDpg%2Buksfn18%2BA9neeHMdmBJiv01hfcvvrcju8LJfDwe99n%2By%2BEo23lsZs4giQ8xDcC3TS43rsv6udRgYMfPsr3xzwEZOmC4U69Q7XVdPsOAu%2B0%2Bemef34DnBIEcBpZi4338dZ8QGBvJaUKp2hfkv0vZ%2FgkAAP%2F%2F&RelayState=TUVNeGt5N3FINDA5UGVEM1JuSHA1dU82TFBWUUZPSzVEcFR2U2RqQ1hrb2lOdmdKMEp8U2RLaHBycFZ6&SigAlg=http%3A%2F%2Fwww.w3.org%2F2001%2F04%2Fxmldsig-more%23rsa-sha256&Signature=w3j4ku9na9TCOBB0lF%2FHA5VTsVQb%2Fa0kuSgILzVcbLTq%2BcAcPRNmEcpVqZPHcWtIfJPw%2F%2FP0HsQhKiPm70JbrVBbZPsZO3ysTe%2Fa9bhpot1yf9HHbkFWShcT%2BA5hgap1DEvJMSZD8N5%2Fkq%2BO47s9%2F0ngZeN%2FErO41mXDrvEGXFEJfHCgU18BOAwbKN9eGj09idnldNiUJ4mm1HEbAHI935KS6buBDnLgM0dYIYZzEIBKewt7j8poD98hRyV9GnCBrN%2FH2D7yOf3IGwKBc4hdMhYbeqBKcj4MTywBEQIc1uY9nUdtRI4N1Nrfmwd2KOpribVB%2FE6musXjb%2Fxo5%2BRmvyMASQGb%2Foo1QIfDZ87lRbRNKffw8KTI7dTusJTl%2BH6mYEtWU5rd%2B6bsiSLFiLl%2F7wpFOHlynTaqte2J1Cg7RAaJt8o0V7vb3%2BpS9CxaFY%2BF8J7MLc3drOTLy9EReBgV2vmdkwS2lE92EYkOzm987nusuUGP2f8ET5oUr1udHw1w2UPdyoJHdTYiHwLUufCM1%2BgaJsoZALfzgW0vKe8ghMUrHl03M9mddynTF%2B%2F9y%2FtIp3INVoWeS6WRHhX0bwlkwBXpL675KkW7q%2F0rVYJ3m6BOt9JkzXPv3l42yQPYs8KY3TXvbwIf2m0L%2FTORX5Jnhs09rWhQrNv%2BrONgD1mUrsA%3D"}, "path": "/api/v3/flows/executor/default-provider-authorization-implicit-consent/", "method": "GET"}, "authorized_application": {"pk": "506b118040694dda9405e185f355c34d", "app": "authentik_core", "name": "Grafana SAML", "model_name": "application"}}	172.24.0.1	2023-01-02 16:31:40.277118+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2024-01-02 16:31:40.276431+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-c07b9726-c9a6-41d9-8750-298dc6c02bb9	model_updated	authentik.events.signals	{"model": {"pk": 6, "app": "authentik_core", "name": "ldapservice", "model_name": "user"}, "http_request": {"args": {}, "path": "/api/v3/core/users/6/set_password/", "method": "POST"}}	192.168.48.1	2022-10-25 09:49:45.334164+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:49:45.333246+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-0e5513c2-7946-4809-b7ad-e8ee39eb06f7	password_set	authentik.events.signals	{}	255.255.255.255	2022-10-25 09:49:50.747043+00	{"pk": 6, "email": "ldapservice@localhost", "username": "ldapservice"}	2023-10-25 09:49:50.746711+00	t	{"pk": "669e359eaf174055957065109edc72a8", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
-3c0fb3f6-a496-4f75-8748-065b52ecef2d	model_updated	authentik.events.signals	{"model": {"pk": 6, "app": "authentik_core", "name": "ldapservice", "model_name": "user"}, "http_request": {"args": {}, "path": "/api/v3/core/users/6/set_password/", "method": "POST"}}	192.168.48.1	2022-10-25 09:49:50.876408+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:49:50.87598+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-ad444c96-d144-4242-912d-df660a82dfa8	model_updated	authentik.events.signals	{"model": {"pk": 1, "app": "authentik_providers_ldap", "name": "grafana-ldap", "model_name": "ldapprovider"}, "http_request": {"args": {}, "path": "/api/v3/providers/ldap/1/", "method": "PUT"}}	192.168.48.1	2022-10-25 09:51:10.6754+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:51:10.674831+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-6c99cc35-0fd4-42ce-866f-4c733c979208	model_updated	authentik.events.signals	{"model": {"pk": 3, "app": "authentik_core", "name": "Outpost authentik Embedded Outpost Service-Account", "model_name": "user"}, "http_request": {"args": {}, "path": "/api/v3/core/users/6/metrics/", "method": "GET"}}	192.168.48.1	2022-10-25 09:52:37.060707+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:52:37.059951+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-5a428128-25a6-4b0b-8228-1c965aca57f3	login_failed	authentik.events.signals	{"stage": {"pk": "f4abcb7d5f9248908760afb9effda665", "app": "authentik_stages_identification", "name": "ldap-identification-stage", "model_name": "identificationstage"}, "password": "********************", "username": "akadmin", "http_request": {"args": {"query": "goauthentik.io%2Foutpost%2Fldap=true"}, "path": "/api/v3/flows/executor/ldap-authentication-flow/", "method": "POST"}}	192.168.48.1	2022-10-25 09:52:46.450704+00	{"pk": 2, "email": "", "username": "AnonymousUser"}	2023-10-25 09:52:46.444595+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-2fef73b5-98e6-4a7a-9b0d-ccd326d1dab6	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"query": "goauthentik.io%2Foutpost%2Fldap=true"}, "path": "/api/v3/flows/executor/ldap-authentication-flow/", "method": "GET"}, "auth_method_args": {}}	192.168.48.1	2022-10-25 09:53:30.278414+00	{"pk": 6, "email": "ldapservice@localhost", "username": "ldapservice"}	2023-10-25 09:53:30.271341+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-2a320fa4-0e4b-4350-88a9-0f3e2dafc249	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"query": "goauthentik.io%2Foutpost%2Fldap=true"}, "path": "/api/v3/flows/executor/ldap-authentication-flow/", "method": "GET"}, "auth_method_args": {}}	192.168.48.1	2022-10-25 09:53:37.391263+00	{"pk": 6, "email": "ldapservice@localhost", "username": "ldapservice"}	2023-10-25 09:53:37.387326+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-a8612adc-a554-41f0-8b4e-c097121e2e16	login_failed	authentik.events.signals	{"stage": {"pk": "f4abcb7d5f9248908760afb9effda665", "app": "authentik_stages_identification", "name": "ldap-identification-stage", "model_name": "identificationstage"}, "password": "********************", "username": "akadmin", "http_request": {"args": {"query": "goauthentik.io%2Foutpost%2Fldap=true"}, "path": "/api/v3/flows/executor/ldap-authentication-flow/", "method": "POST"}}	192.168.48.1	2022-10-25 09:53:38.124841+00	{"pk": 2, "email": "", "username": "AnonymousUser"}	2023-10-25 09:53:38.120289+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-df28e1d0-db28-4303-9c1b-a1e2bd437de2	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"query": "goauthentik.io%2Foutpost%2Fldap=true"}, "path": "/api/v3/flows/executor/ldap-authentication-flow/", "method": "GET"}, "auth_method_args": {}}	192.168.48.1	2022-10-25 09:53:47.045402+00	{"pk": 6, "email": "ldapservice@localhost", "username": "ldapservice"}	2023-10-25 09:53:47.042514+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-16e97a17-7e98-4e87-849a-3db39705f612	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"query": "goauthentik.io%2Foutpost%2Fldap=true"}, "path": "/api/v3/flows/executor/ldap-authentication-flow/", "method": "GET"}, "auth_method_args": {}}	192.168.48.1	2022-10-25 09:53:47.802321+00	{"pk": 6, "email": "ldapservice@localhost", "username": "ldapservice"}	2023-10-25 09:53:47.798122+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-39515339-d523-4c5f-8209-97efccdd7e11	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"query": "goauthentik.io%2Foutpost%2Fldap=true"}, "path": "/api/v3/flows/executor/ldap-authentication-flow/", "method": "GET"}, "auth_method_args": {}}	192.168.48.1	2022-10-25 09:54:00.215328+00	{"pk": 6, "email": "ldapservice@localhost", "username": "ldapservice"}	2023-10-25 09:54:00.210145+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-1333efce-d2f6-4ef0-bd3a-3a0276df711b	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"query": "goauthentik.io%2Foutpost%2Fldap=true"}, "path": "/api/v3/flows/executor/ldap-authentication-flow/", "method": "GET"}, "auth_method_args": {}}	192.168.48.1	2022-10-25 09:54:00.975468+00	{"pk": 5, "email": "authentik-admin@localhost", "username": "authentik-admin"}	2023-10-25 09:54:00.971761+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-7864022f-6f92-4812-8a3e-80da868b792f	model_created	authentik.events.signals	{"model": {"pk": 7, "app": "authentik_core", "name": "authentik-viewer", "model_name": "user"}, "http_request": {"args": {}, "path": "/api/v3/core/users/", "method": "POST"}}	192.168.48.1	2022-10-25 09:56:58.989276+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:56:58.988641+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-b961fe98-2057-43e6-bba0-610c0bd2aba1	password_set	authentik.events.signals	{}	255.255.255.255	2022-10-25 09:57:07.656784+00	{"pk": 7, "email": "authentik-viewer@localhost", "username": "authentik-viewer"}	2023-10-25 09:57:07.656418+00	t	{"pk": "669e359eaf174055957065109edc72a8", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
-ecdd7e58-c10f-44dd-abe6-473b698b167e	model_updated	authentik.events.signals	{"model": {"pk": 7, "app": "authentik_core", "name": "authentik-viewer", "model_name": "user"}, "http_request": {"args": {}, "path": "/api/v3/core/users/7/set_password/", "method": "POST"}}	192.168.48.1	2022-10-25 09:57:07.785245+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:57:07.784815+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-9d996d5c-3949-4a7c-a229-7572086943bb	password_set	authentik.events.signals	{}	255.255.255.255	2022-10-25 09:57:13.548415+00	{"pk": 7, "email": "authentik-viewer@localhost", "username": "authentik-viewer"}	2023-10-25 09:57:13.548084+00	t	{"pk": "124e241c825640d9b416596b2daab8b3", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
-62ba45d9-5037-4b6d-ab3f-06a76e759f9e	model_updated	authentik.events.signals	{"model": {"pk": 7, "app": "authentik_core", "name": "authentik-viewer", "model_name": "user"}, "http_request": {"args": {}, "path": "/api/v3/core/users/7/set_password/", "method": "POST"}}	192.168.48.1	2022-10-25 09:57:13.678156+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:57:13.677728+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-064c5c29-9b44-4887-88a6-7a921ba10c42	model_created	authentik.events.signals	{"model": {"pk": 8, "app": "authentik_core", "name": "authentik-editor", "model_name": "user"}, "http_request": {"args": {}, "path": "/api/v3/core/users/", "method": "POST"}}	192.168.48.1	2022-10-25 09:57:43.651383+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:57:43.650616+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-f9ea2089-5b8a-4701-95ab-eb29fc832fee	password_set	authentik.events.signals	{}	255.255.255.255	2022-10-25 09:57:52.094392+00	{"pk": 8, "email": "authentik-editor@localhost", "username": "authentik-editor"}	2023-10-25 09:57:52.094045+00	t	{"pk": "669e359eaf174055957065109edc72a8", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
-4403cff8-482b-4447-8548-37aeedbe027d	model_updated	authentik.events.signals	{"model": {"pk": 8, "app": "authentik_core", "name": "authentik-editor", "model_name": "user"}, "http_request": {"args": {}, "path": "/api/v3/core/users/8/set_password/", "method": "POST"}}	192.168.48.1	2022-10-25 09:57:52.230146+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:57:52.229464+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-2094c1e2-a954-4cbf-b58f-e7221698b1a7	password_set	authentik.events.signals	{}	255.255.255.255	2022-10-25 09:57:54.385835+00	{"pk": 8, "email": "authentik-editor@localhost", "username": "authentik-editor"}	2023-10-25 09:57:54.385364+00	t	{"pk": "124e241c825640d9b416596b2daab8b3", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
-ef60de42-c27f-46f3-9773-1c540f072ae0	model_updated	authentik.events.signals	{"model": {"pk": 8, "app": "authentik_core", "name": "authentik-editor", "model_name": "user"}, "http_request": {"args": {}, "path": "/api/v3/core/users/8/set_password/", "method": "POST"}}	192.168.48.1	2022-10-25 09:57:54.524086+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:57:54.523676+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-a8885c27-5608-4eb5-a0d1-1f19dea20bda	model_created	authentik.events.signals	{"model": {"pk": "17bb354ecea248dbb3229f9c8b53b8bb", "app": "authentik_core", "name": "admin", "model_name": "group"}, "http_request": {"args": {}, "path": "/api/v3/core/groups/", "method": "POST"}}	192.168.48.1	2022-10-25 09:58:22.075895+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:58:22.075408+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-86d0a1ed-6d6b-4422-a4b5-6f60f9918b96	model_created	authentik.events.signals	{"model": {"pk": "7e216c1b2a0f4772ac3d7bdaf7511a2e", "app": "authentik_core", "name": "editor", "model_name": "group"}, "http_request": {"args": {}, "path": "/api/v3/core/groups/", "method": "POST"}}	192.168.48.1	2022-10-25 09:58:27.448906+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:58:27.44842+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-5f4a3eb8-6118-46f7-a066-26277ac65e15	model_created	authentik.events.signals	{"model": {"pk": "10d9a55e195b41a09fe663382d5b8208", "app": "authentik_core", "name": "viewer", "model_name": "group"}, "http_request": {"args": {}, "path": "/api/v3/core/groups/", "method": "POST"}}	192.168.48.1	2022-10-25 09:58:32.144204+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:58:32.143773+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-3454a52b-238c-4cb6-8db5-64c8303e339c	model_updated	authentik.events.signals	{"model": {"pk": "17bb354ecea248dbb3229f9c8b53b8bb", "app": "authentik_core", "name": "admin", "model_name": "group"}, "http_request": {"args": {}, "path": "/api/v3/core/groups/17bb354e-cea2-48db-b322-9f9c8b53b8bb/", "method": "PUT"}}	192.168.48.1	2022-10-25 09:59:21.181345+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:59:21.180942+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-fdf81360-a8a8-4c8f-988d-2ed85c613a49	model_updated	authentik.events.signals	{"model": {"pk": "7e216c1b2a0f4772ac3d7bdaf7511a2e", "app": "authentik_core", "name": "editor", "model_name": "group"}, "http_request": {"args": {}, "path": "/api/v3/core/groups/7e216c1b-2a0f-4772-ac3d-7bdaf7511a2e/", "method": "PUT"}}	192.168.48.1	2022-10-25 09:59:30.4796+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:59:30.478673+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-a3998ed2-5beb-4a26-b395-f5b579d632ca	model_updated	authentik.events.signals	{"model": {"pk": "10d9a55e195b41a09fe663382d5b8208", "app": "authentik_core", "name": "viewer", "model_name": "group"}, "http_request": {"args": {}, "path": "/api/v3/core/groups/10d9a55e-195b-41a0-9fe6-63382d5b8208/", "method": "PUT"}}	192.168.48.1	2022-10-25 09:59:42.963339+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2023-10-25 09:59:42.962914+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-2b3c7de7-f3cb-4e4d-bbcd-36ff4d1add8e	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"query": "next=%2F"}, "path": "/api/v3/flows/executor/default-authentication-flow/", "method": "GET"}, "auth_method_args": {}}	172.24.0.1	2023-01-02 14:16:55.819839+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2024-01-02 14:16:55.819267+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-eeb1be95-4ade-4812-93b0-2c87db29716c	update_available	authentik.admin.tasks	{"message": "Changelog: https://goauthentik.io/docs/releases/2022.12#fixed-in-2022121", "new_version": "2022.12.1"}	\N	2023-01-02 14:17:08.645256+00	{}	2024-01-02 14:17:08.643976+00	t	{"pk": "3fe5e3c1df6f42e1a4a934178957c3b6", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
-fa558ccb-705b-43b8-9a2e-86d4f1d8d0a0	system_task_exception	authentik.events.monitored_tasks	{"message": "Task notification_transport encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.10/site-packages/celery/app/trace.py\\", line 451, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n  File \\"/usr/local/lib/python3.10/site-packages/sentry_sdk/integrations/celery.py\\", line 207, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.10/site-packages/sentry_sdk/_compat.py\\", line 56, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.10/site-packages/sentry_sdk/integrations/celery.py\\", line 202, in _inner\\n    return f(*args, **kwargs)\\n  File \\"/usr/local/lib/python3.10/site-packages/celery/app/trace.py\\", line 734, in __protected_call__\\n    return self.run(*args, **kwargs)\\n  File \\"/usr/local/lib/python3.10/site-packages/celery/app/autoretry.py\\", line 54, in run\\n    ret = task.retry(exc=exc, **retry_kwargs)\\n  File \\"/usr/local/lib/python3.10/site-packages/celery/app/task.py\\", line 717, in retry\\n    raise_with_context(exc)\\n  File \\"/usr/local/lib/python3.10/site-packages/celery/app/autoretry.py\\", line 34, in run\\n    return task._orig_run(*args, **kwargs)\\n  File \\"/authentik/events/tasks.py\\", line 130, in notification_transport\\n    raise exc\\n  File \\"/authentik/events/tasks.py\\", line 126, in notification_transport\\n    transport.send(notification)\\n  File \\"/authentik/events/models.py\\", line 341, in send\\n    return self.send_email(notification)\\n  File \\"/authentik/events/models.py\\", line 463, in send_email\\n    raise NotificationTransportError from exc\\nauthentik.events.models.NotificationTransportError: "}	\N	2023-01-02 14:17:13.924879+00	{}	2024-01-02 14:17:13.924102+00	t	{"pk": "3fe5e3c1df6f42e1a4a934178957c3b6", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
-c1d32b85-3711-44c1-bd8b-918eba2599e2	system_task_exception	authentik.events.monitored_tasks	{"message": "Task notification_transport encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.10/site-packages/celery/app/trace.py\\", line 451, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n  File \\"/usr/local/lib/python3.10/site-packages/sentry_sdk/integrations/celery.py\\", line 207, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.10/site-packages/sentry_sdk/_compat.py\\", line 56, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.10/site-packages/sentry_sdk/integrations/celery.py\\", line 202, in _inner\\n    return f(*args, **kwargs)\\n  File \\"/usr/local/lib/python3.10/site-packages/celery/app/trace.py\\", line 734, in __protected_call__\\n    return self.run(*args, **kwargs)\\n  File \\"/usr/local/lib/python3.10/site-packages/celery/app/autoretry.py\\", line 54, in run\\n    ret = task.retry(exc=exc, **retry_kwargs)\\n  File \\"/usr/local/lib/python3.10/site-packages/celery/app/task.py\\", line 717, in retry\\n    raise_with_context(exc)\\n  File \\"/usr/local/lib/python3.10/site-packages/celery/app/autoretry.py\\", line 34, in run\\n    return task._orig_run(*args, **kwargs)\\n  File \\"/authentik/events/tasks.py\\", line 130, in notification_transport\\n    raise exc\\n  File \\"/authentik/events/tasks.py\\", line 126, in notification_transport\\n    transport.send(notification)\\n  File \\"/authentik/events/models.py\\", line 341, in send\\n    return self.send_email(notification)\\n  File \\"/authentik/events/models.py\\", line 463, in send_email\\n    raise NotificationTransportError from exc\\nauthentik.events.models.NotificationTransportError: "}	\N	2023-01-02 14:17:14.593626+00	{}	2024-01-02 14:17:14.592229+00	t	{"pk": "3fe5e3c1df6f42e1a4a934178957c3b6", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
-521e9674-7fa5-4d70-b266-9b8048b640b0	model_created	authentik.events.signals	{"model": {"pk": 2, "app": "authentik_providers_saml", "name": "grafana-saml", "model_name": "samlprovider"}, "http_request": {"args": {}, "path": "/api/v3/providers/saml/", "method": "POST"}}	172.24.0.1	2023-01-02 14:20:39.41267+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2024-01-02 14:20:39.41213+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-8a5a4f65-cbd8-4617-a52a-515f7e008164	model_created	authentik.events.signals	{"model": {"pk": "506b118040694dda9405e185f355c34d", "app": "authentik_core", "name": "Grafana SAML", "model_name": "application"}, "http_request": {"args": {}, "path": "/api/v3/core/applications/", "method": "POST"}}	172.24.0.1	2023-01-02 14:21:07.723593+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2024-01-02 14:21:07.722493+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-7ee95403-f95f-4a94-be59-0eb1210a3b55	authorize_application	authentik.providers.saml.views.flows	{"flow": "a7ef54bb79594559979d9345c022e086", "http_request": {"args": {"query": ""}, "path": "/api/v3/flows/executor/default-provider-authorization-implicit-consent/", "method": "GET"}, "authorized_application": {"pk": "506b118040694dda9405e185f355c34d", "app": "authentik_core", "name": "Grafana SAML", "model_name": "application"}}	172.24.0.1	2023-01-02 14:21:13.310418+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2024-01-02 14:21:13.30943+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-2e67f976-24c8-4f39-9fb8-160c8df5fc48	authorize_application	authentik.providers.saml.views.flows	{"flow": "a7ef54bb79594559979d9345c022e086", "http_request": {"args": {"query": ""}, "path": "/api/v3/flows/executor/default-provider-authorization-implicit-consent/", "method": "GET"}, "authorized_application": {"pk": "506b118040694dda9405e185f355c34d", "app": "authentik_core", "name": "Grafana SAML", "model_name": "application"}}	172.24.0.1	2023-01-02 14:21:43.965265+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2024-01-02 14:21:43.964033+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-a2a95f65-9f92-496e-b577-55c844b90891	model_updated	authentik.events.signals	{"model": {"pk": 2, "app": "authentik_providers_saml", "name": "grafana-saml", "model_name": "samlprovider"}, "http_request": {"args": {}, "path": "/api/v3/providers/saml/2/", "method": "PUT"}}	172.24.0.1	2023-01-02 14:22:28.185263+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2024-01-02 14:22:28.184795+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-95797e9f-e818-4f5d-9fdb-2d499833ae4c	model_updated	authentik.events.signals	{"model": {"pk": 2, "app": "authentik_providers_saml", "name": "grafana-saml", "model_name": "samlprovider"}, "http_request": {"args": {}, "path": "/api/v3/providers/saml/2/", "method": "PUT"}}	172.24.0.1	2023-01-02 14:23:24.663957+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2024-01-02 14:23:24.663405+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-aa49c5e8-b508-4046-907e-cfdca67edf75	configuration_error	authentik.providers.saml.views.sso	{"message": "Failed to verify signature", "provider": {"pk": 2, "app": "authentik_providers_saml", "name": "grafana-saml", "model_name": "samlprovider"}}	\N	2023-01-02 16:20:27.103437+00	{}	2024-01-02 16:20:27.102874+00	t	{"pk": "69cc7a86348f4144973b0cbaaea44e3f", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
 d0c607f5-b34e-4c87-bfe3-86b6af93bff8	system_exception	authentik.root.celery	{"message": "Traceback (most recent call last):\\ndjango.db.utils.InterfaceError: connection already closed"}	\N	2023-03-13 09:19:32.449521+00	{}	2024-03-12 09:19:32.448974+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
-9aac6d1c-02e9-4e51-b705-85a86f1919df	system_task_exception	authentik.events.monitored_tasks	{"message": "Task notification_transport encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.10/site-packages/celery/app/trace.py\\", line 451, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n  File \\"/usr/local/lib/python3.10/site-packages/sentry_sdk/integrations/celery.py\\", line 207, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.10/site-packages/sentry_sdk/_compat.py\\", line 56, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.10/site-packages/sentry_sdk/integrations/celery.py\\", line 202, in _inner\\n    return f(*args, **kwargs)\\n  File \\"/usr/local/lib/python3.10/site-packages/celery/app/trace.py\\", line 734, in __protected_call__\\n    return self.run(*args, **kwargs)\\n  File \\"/usr/local/lib/python3.10/site-packages/celery/app/autoretry.py\\", line 54, in run\\n    ret = task.retry(exc=exc, **retry_kwargs)\\n  File \\"/usr/local/lib/python3.10/site-packages/celery/app/task.py\\", line 717, in retry\\n    raise_with_context(exc)\\n  File \\"/usr/local/lib/python3.10/site-packages/celery/app/autoretry.py\\", line 34, in run\\n    return task._orig_run(*args, **kwargs)\\n  File \\"/authentik/events/tasks.py\\", line 130, in notification_transport\\n    raise exc\\n  File \\"/authentik/events/tasks.py\\", line 126, in notification_transport\\n    transport.send(notification)\\n  File \\"/authentik/events/models.py\\", line 341, in send\\n    return self.send_email(notification)\\n  File \\"/authentik/events/models.py\\", line 463, in send_email\\n    raise NotificationTransportError from exc\\nauthentik.events.models.NotificationTransportError: "}	\N	2023-01-02 16:20:32.525925+00	{}	2024-01-02 16:20:32.524994+00	t	{"pk": "3fe5e3c1df6f42e1a4a934178957c3b6", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
-d93d9f43-d318-4f57-8fc5-58859aafd0a6	authorize_application	authentik.providers.saml.views.flows	{"flow": "a7ef54bb79594559979d9345c022e086", "http_request": {"args": {"query": ""}, "path": "/api/v3/flows/executor/default-provider-authorization-implicit-consent/", "method": "GET"}, "authorized_application": {"pk": "506b118040694dda9405e185f355c34d", "app": "authentik_core", "name": "Grafana SAML", "model_name": "application"}}	172.24.0.1	2023-01-02 16:20:39.35962+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2024-01-02 16:20:39.358773+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-9a1859e1-089a-46c9-a2a9-5ca91e1a14da	model_updated	authentik.events.signals	{"model": {"pk": 2, "app": "authentik_providers_saml", "name": "grafana-saml", "model_name": "samlprovider"}, "http_request": {"args": {}, "path": "/api/v3/providers/saml/2/", "method": "PUT"}}	172.24.0.1	2023-01-02 16:21:00.718418+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2024-01-02 16:21:00.717578+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-58277880-d969-4e13-ba98-dfca29dc2815	model_updated	authentik.events.signals	{"model": {"pk": 2, "app": "authentik_providers_saml", "name": "grafana-saml", "model_name": "samlprovider"}, "http_request": {"args": {}, "path": "/api/v3/providers/saml/2/", "method": "PUT"}}	172.24.0.1	2023-01-02 16:21:20.595211+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2024-01-02 16:21:20.594713+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-9c9fc310-2115-4aee-a0f0-d91abc0dae03	authorize_application	authentik.providers.saml.views.flows	{"flow": "a7ef54bb79594559979d9345c022e086", "http_request": {"args": {"query": ""}, "path": "/api/v3/flows/executor/default-provider-authorization-implicit-consent/", "method": "GET"}, "authorized_application": {"pk": "506b118040694dda9405e185f355c34d", "app": "authentik_core", "name": "Grafana SAML", "model_name": "application"}}	172.24.0.1	2023-01-02 16:21:26.679637+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2024-01-02 16:21:26.67829+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-2f1ac464-0e79-47ea-b3df-bf70f90d22c7	authorize_application	authentik.providers.saml.views.flows	{"flow": "a7ef54bb79594559979d9345c022e086", "http_request": {"args": {"query": ""}, "path": "/api/v3/flows/executor/default-provider-authorization-implicit-consent/", "method": "GET"}, "authorized_application": {"pk": "506b118040694dda9405e185f355c34d", "app": "authentik_core", "name": "Grafana SAML", "model_name": "application"}}	172.24.0.1	2023-01-02 16:21:47.199639+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2024-01-02 16:21:47.198789+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-d4549f57-3afb-4e6f-8726-be968bbc902f	model_updated	authentik.events.signals	{"model": {"pk": 2, "app": "authentik_providers_saml", "name": "grafana-saml", "model_name": "samlprovider"}, "http_request": {"args": {}, "path": "/api/v3/providers/saml/2/", "method": "PUT"}}	172.24.0.1	2023-01-02 16:22:24.896791+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2024-01-02 16:22:24.895837+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-8d6e7456-f3f6-4806-a1ae-286cd50c6e54	authorize_application	authentik.providers.saml.views.flows	{"flow": "a7ef54bb79594559979d9345c022e086", "http_request": {"args": {"query": ""}, "path": "/api/v3/flows/executor/default-provider-authorization-implicit-consent/", "method": "GET"}, "authorized_application": {"pk": "506b118040694dda9405e185f355c34d", "app": "authentik_core", "name": "Grafana SAML", "model_name": "application"}}	172.24.0.1	2023-01-02 16:22:37.062381+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2024-01-02 16:22:37.061613+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-7203b3e8-4475-498f-b837-5775a0501e86	authorize_application	authentik.providers.saml.views.flows	{"flow": "a7ef54bb79594559979d9345c022e086", "http_request": {"args": {"query": ""}, "path": "/api/v3/flows/executor/default-provider-authorization-implicit-consent/", "method": "GET"}, "authorized_application": {"pk": "506b118040694dda9405e185f355c34d", "app": "authentik_core", "name": "Grafana SAML", "model_name": "application"}}	172.24.0.1	2023-01-02 16:26:08.685203+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2024-01-02 16:26:08.684412+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-7384e1a4-157e-47dd-ad30-f0c4030a1b54	authorize_application	authentik.providers.saml.views.flows	{"flow": "a7ef54bb79594559979d9345c022e086", "http_request": {"args": {"query": "SAMLRequest=nJJBj9MwEIX%2FiuV76sRRmtbaRCpbISotUG0LB25TZ7q15NjBMwH236Nmi1QklANH2%2FPe53kzDwS9H8xm5Et4xu8jEotfvQ9krg%2BNHFMwEciRCdAjGbbmsPn4ZPQiN0CEiV0M8k4yzGuGFDna6KXYbRvpumxZl%2BeyrivbrWoN5akDrOtTpYuyWq3XS1utKnvSxVmKr5jIxdBIvcil2BGNuAvEELiROtdllhdZro%2FF0uiVKcpFWa%2B%2FSbFFYheAJ%2BWFeTBK%2BWjBXyKxWed5rmAYvLNTibq2oF4SnCFANh2Iojq50LnwohJ2LqFlJcXmT%2FOPMdDYYzpg%2BuEsfnl%2B%2BgenvHImO7Akxf6Wwrs33%2FnIbnAyH47Hfbb%2FfDjKdhqbmTJI4n1MPfC8yfXGddl5KjUY2PGrbGf%2B2SNDBwwP6g7V3tblE%2FS42%2B6jd%2Fb1P%2FCcIJDDwFJsvI8%2FHxMCYyM5jShV%2B4b8eynb3wEAAP%2F%2F&RelayState=MVFtczE2eEVENFo0amhyUEtoUFkySDJ5Wm5CRkRQWXJYaW42eTBMNTIyYkZNRENhS0Z8WkV6SHRydFZ6&SigAlg=http%3A%2F%2Fwww.w3.org%2F2001%2F04%2Fxmldsig-more%23rsa-sha256&Signature=Uds21tE5ZR3SmvxFqy9VrYyL8ujqShawaGcz0V77dayLPpeykS6JN36ZoTD4eHSPUqmHqvTziWpLC8O2IlbfANmm8%2F58AOWsxSaKjdqwlKgWeLSQUrqhDXLOdOfabzMXPFkcBg9jS7P%2FXRl4rGSyjS%2BCYTJdazdrM8w5JOBvO%2B%2B2NGfxbo1hcHbGprQTt7ScDsxt7WPcEE0GRVhEbOZAym%2Fp6ZwCGB%2FkxC%2BGN68hdbXKD%2B51X0SIdF8Apy%2BYw4nshrIqteXb6jcoTwfNQdNY25wnuJ3J4LXaE5ZqajjjIIfPFYjBsnRFuzFUed3372rahiX5ax0SWp7Fj3uxyG6%2FQil9MYSvCX1Kw0rQf5zKP%2FFohivJ3vtbgHsVa6mqgWPR%2BFyiX5xZbDi4DaHGof%2F7NM5f9g3CgcaQr5v8%2BK8eHn%2Fl1EjDlJSDr2BSJ3NX68581527VAcWZ2OjXRIeodh5DKBrQ9F9%2BTW4AEuTlRBPUWdL15209HG6MDcN5p6M0OgYh%2B6STW5FY0aqgSFBjxjXAGk%2BlKQTq%2BrpJnLQXxgJlby3%2BYkyO92Ick34NsxoaDr5ySYYtM6M%2FuZP9443t8B9xun407wdaja3CNWP8iXuM2%2FhS1JCDud%2Fb8oCq14l0sITUqUK4R%2BCEd7odJDUuSNdDjHiM%2BEW1mf3MyuB68M1dhE%3D"}, "path": "/api/v3/flows/executor/default-provider-authorization-implicit-consent/", "method": "GET"}, "authorized_application": {"pk": "506b118040694dda9405e185f355c34d", "app": "authentik_core", "name": "Grafana SAML", "model_name": "application"}}	172.24.0.1	2023-01-02 16:28:13.791097+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2024-01-02 16:28:13.789745+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-b4315108-6c82-4ff3-aeea-56a31d071961	model_updated	authentik.events.signals	{"model": {"pk": 2, "app": "authentik_providers_saml", "name": "grafana-saml", "model_name": "samlprovider"}, "http_request": {"args": {}, "path": "/api/v3/providers/saml/2/", "method": "PUT"}}	172.24.0.1	2023-01-02 16:30:58.798901+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2024-01-02 16:30:58.797248+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-439439e2-e8e7-4af6-b3ef-e563b36f674a	model_created	authentik.events.signals	{"model": {"pk": "ca14281ce0254691b5a23ee415920e80", "app": "authentik_core", "name": "extra-group", "model_name": "group"}, "http_request": {"args": {}, "path": "/api/v3/core/groups/", "method": "POST"}}	172.24.0.1	2023-01-02 16:33:50.270344+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2024-01-02 16:33:50.269707+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-c5efd86a-6999-4a7b-8fd9-305b26d96bc6	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"query": "next=%2Fapplication%2Fsaml%2Fgrafana-saml%2Fsso%2Fbinding%2Fredirect%2F%3FSAMLRequest%3DnJJBb9swDIX%252FiqC7I1t2U0%252BoDWQNhgXotqDJdtiNlelGgCx5Ir2t%252F36ImwEZMPjQoyS%252B94mPvCMY%252FGg2E5%252FCI%252F6YkFj8Hnwgc35o5JSCiUCOTIABybA1h82nB6NXuQEiTOxikFeScVkzpsjRRi%252FFbttI12VY6luLsF5bjbaobxHqQvc3T1VVV7qsir4rboq%252BRim%252BYSIXQyP1KpdiRzThLhBD4EbqXJdZXmS5PhZrU9am0Kt19V2KLRK7ADwLT8yjUcpHC%252F4Uic27PM8VjKN3di5R5w7Uc4IeAmTzgSiqJxc6F55Vws4ltKyk2Pzt%252FT4GmgZMB0w%252FncWvjw%252F%252F4ZRnzmwHlqTYX0J4%252F%252Bq7nNgFTubj8bjP9l8OR9nOUzNzBEl8iGkAXjY537gu6%252BdSg4Edv8h24Z8DMnTAcKeuUO1lWz7DgLvtPnpnX96A5wSBHAaWYuN9%252FHWfEBgbyWlCqdpX5L872f4JAAD%252F%252Fw%253D%253D%26RelayState%3DR3cwMXZJMU9xZUVaY1RZVmxVMDkwVk1DSEVkQzYzR2hBU3NNUHNkVlZxSEt1SDdrUDJ8Z2pPbHA5cFZ6%26SigAlg%3Dhttp%253A%252F%252Fwww.w3.org%252F2001%252F04%252Fxmldsig-more%2523rsa-sha256%26Signature%3DBX5F2GCFaeadEWb17AxG2mVisyVfBGrNRczpBwqe0TwTQZKySlVpaED8Vqak2hSyOC9HdKSkRmYGBJqrKPImbGzdeptgxXqlr8usnoBmxy1UF8GKrOM2ptPOqMsXargtigpS7mLatQN1spTkxyDUnfQfCknvH%252BgjQymkGDjtMtOQLEP2y3webPtuBiwv43Wl4YzojxSXALALITtANMgCqdsE8omJ%252FtuZZG2iu31j%252BJk3OTDWhZn6QBNNrV%252FMEPZOVD5CpnxagNhPC4J74rmWP2JA6Yu%252BcqFaCBTlty0do7D%252FQVvdzjHgrnAaosxltAtUkDWS47%252Fo1Ed9Jp2jTzsLzOh2%252F2EXZB7UrPIiQL28THjChuMv9ohoVrwHi6Z77SSJzJJYQmUKPC6IUg4PeoUY%252FpghlrtqxTDeghePUcLuMTusLu4wf%252BdMEvhwi20Eaz6ABr7F0TYAxnKfdEwsG%252FEIkBHa109%252Fv3YqDKKbKUuJKyUeu%252F%252Bo9YwbZG5eRDqKoBoNRbAyDOBVqXMgkTNUEhs5qtLDbOlgcim%252F5Tum5usf921zEn0Z01vGTO2bjrjdRbdJiAfAPhOj%252F69n7rJn%252FklU8NtXdiNHYZn0MLAdOKpBChjnfjehCp08n%252BG4ZcCXMe62gnD2Art0HJf30z2N76vJsoyrXMypc%252BN6WpUQSpsgb6w%253D"}, "path": "/api/v3/flows/executor/default-authentication-flow/", "method": "GET"}, "auth_method_args": {}}	172.24.0.1	2023-01-02 16:38:22.087813+00	{"pk": 5, "email": "authentik-admin@localhost", "username": "authentik-admin"}	2024-01-02 16:38:22.087203+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-0ffd3d0e-31f3-4b55-bdf7-d00160afcfdc	authorize_application	authentik.providers.saml.views.flows	{"flow": "a7ef54bb79594559979d9345c022e086", "http_request": {"args": {"query": "SAMLRequest=nJJBb9swDIX%2FiqC7I1t2U0%2BoDWQNhgXotqDJdtiNlelGgCx5Ir2t%2F36ImwEZMPjQoyS%2B94mPvCMY%2FGg2E5%2FCI%2F6YkFj8Hnwgc35o5JSCiUCOTIABybA1h82nB6NXuQEiTOxikFeScVkzpsjRRi%2FFbttI12VY6luLsF5bjbaobxHqQvc3T1VVV7qsir4rboq%2BRim%2BYSIXQyP1KpdiRzThLhBD4EbqXJdZXmS5PhZrU9am0Kt19V2KLRK7ADwLT8yjUcpHC%2F4Uic27PM8VjKN3di5R5w7Uc4IeAmTzgSiqJxc6F55Vws4ltKyk2Pzt%2FT4GmgZMB0w%2FncWvjw%2F%2F4ZRnzmwHlqTYX0J4%2F%2Bq7nNgFTubj8bjP9l8OR9nOUzNzBEl8iGkAXjY537gu6%2BdSg4Edv8h24Z8DMnTAcKeuUO1lWz7DgLvtPnpnX96A5wSBHAaWYuN9%2FHWfEBgbyWlCqdpX5L872f4JAAD%2F%2Fw%3D%3D&RelayState=R3cwMXZJMU9xZUVaY1RZVmxVMDkwVk1DSEVkQzYzR2hBU3NNUHNkVlZxSEt1SDdrUDJ8Z2pPbHA5cFZ6&SigAlg=http%3A%2F%2Fwww.w3.org%2F2001%2F04%2Fxmldsig-more%23rsa-sha256&Signature=BX5F2GCFaeadEWb17AxG2mVisyVfBGrNRczpBwqe0TwTQZKySlVpaED8Vqak2hSyOC9HdKSkRmYGBJqrKPImbGzdeptgxXqlr8usnoBmxy1UF8GKrOM2ptPOqMsXargtigpS7mLatQN1spTkxyDUnfQfCknvH%2BgjQymkGDjtMtOQLEP2y3webPtuBiwv43Wl4YzojxSXALALITtANMgCqdsE8omJ%2FtuZZG2iu31j%2BJk3OTDWhZn6QBNNrV%2FMEPZOVD5CpnxagNhPC4J74rmWP2JA6Yu%2BcqFaCBTlty0do7D%2FQVvdzjHgrnAaosxltAtUkDWS47%2Fo1Ed9Jp2jTzsLzOh2%2F2EXZB7UrPIiQL28THjChuMv9ohoVrwHi6Z77SSJzJJYQmUKPC6IUg4PeoUY%2FpghlrtqxTDeghePUcLuMTusLu4wf%2BdMEvhwi20Eaz6ABr7F0TYAxnKfdEwsG%2FEIkBHa109%2Fv3YqDKKbKUuJKyUeu%2F%2Bo9YwbZG5eRDqKoBoNRbAyDOBVqXMgkTNUEhs5qtLDbOlgcim%2F5Tum5usf921zEn0Z01vGTO2bjrjdRbdJiAfAPhOj%2F69n7rJn%2FklU8NtXdiNHYZn0MLAdOKpBChjnfjehCp08n%2BG4ZcCXMe62gnD2Art0HJf30z2N76vJsoyrXMypc%2BN6WpUQSpsgb6w%3D"}, "path": "/api/v3/flows/executor/default-provider-authorization-implicit-consent/", "method": "GET"}, "authorized_application": {"pk": "506b118040694dda9405e185f355c34d", "app": "authentik_core", "name": "Grafana SAML", "model_name": "application"}}	172.24.0.1	2023-01-02 16:38:22.508665+00	{"pk": 5, "email": "authentik-admin@localhost", "username": "authentik-admin"}	2024-01-02 16:38:22.508022+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-025e97e0-ee2c-4178-a410-2b832340a35a	authorize_application	authentik.providers.saml.views.flows	{"flow": "a7ef54bb79594559979d9345c022e086", "http_request": {"args": {"query": ""}, "path": "/api/v3/flows/executor/default-provider-authorization-implicit-consent/", "method": "GET"}, "authorized_application": {"pk": "506b118040694dda9405e185f355c34d", "app": "authentik_core", "name": "Grafana SAML", "model_name": "application"}}	172.24.0.1	2023-01-02 16:40:38.094961+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2024-01-02 16:40:38.094424+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-8cdc9b41-47bb-440b-9ce8-3fa9d7c81800	authorize_application	authentik.providers.saml.views.flows	{"flow": "a7ef54bb79594559979d9345c022e086", "http_request": {"args": {"query": "SAMLRequest=nJJBj9MwEIX%2FSuR7ajvpJsTaRCpbISotUG0LB25TZ7q15NjBMwH236Nmi1Qk1MMebc97n%2BfN3BMMfjSriU%2FhCX9MSJz9Hnwgc35oxZSCiUCOTIABybA1u9WnR1MslAEiTOxiEFeS8bZmTJGjjV5km3UrXJ%2Frpa5RN1Dp4nBodF%2FZEnVT9XWpbH1X3tW2Pmo8vBPZN0zkYmhFsVAi2xBNuAnEELgVhSrKXOlcFXtdmWVl1HJRNvq7yNZI7ALwrDwxj0ZKHy34UyQ2jVJKwjh6Z%2BcSeW5BPic4QoB8PhBFeXChd%2BFZJuxdQstSZKu%2FzT%2FEQNOAaYfpp7P49enxP5zyzJntwJLItpcU3r%2F63o7sAifzcb%2Ff5tsvu73o5rGZOYOUfYhpAL5tcr5xfX6cSw0Gdvwiuhv%2FHJChB4Z7eYXqLuvyGQbcrLfRO%2FvyBjwnCOQwsMhW3sdfDwmBsRWcJhSye0X%2Bu5TdnwAAAP%2F%2F&RelayState=VVk1bmU0UDk4clBnUnNOVk5PNFBzV3hQamFHUVgxdEszS094WUN3SEZtWnlLczg0VXV8U2F5SGhydFZ6&SigAlg=http%3A%2F%2Fwww.w3.org%2F2001%2F04%2Fxmldsig-more%23rsa-sha256&Signature=mW4CQva3Vem85Dq5yo%2BBclqHaloTreonGr4VCel4SvbiRfF5jgQDGEcxn7kcxDw8JZym8iquo7Ivx%2BM%2FuciSTWOMp2n%2FTzbkkR7QxSfYjBLUXTsoh0JBZvh2fVsJMr10rYaW%2Frig8mGmP697eEhRyma9t5HJnu6mkvE%2Biszr3qQmv85nX%2B9Ac6IBOQOsiSheeKqdZm3Yj3gb3IGZjJ5Y8xmGZSmQ%2BLbiB7AerHM8KNUqysRBoyDBcG5YTtTNao4ImNBkCxh0a45Geur3y0LwEmt0lQkY2YJzW4Uh%2B3dKCK2yRqnTZfEK7nvH37Ue0uc1Fx9zH6hjgijSqWfYAYEJWf%2B4sM%2BhMZ8tHV93bLzzaPXH%2FfhAYyo%2FMREW2AKlIYElK6dQA68wblp%2FxYXm%2BXgJoYs%2FHQqPrQLU%2BE2Bd5Me5xvUIfD2KBR3Lx9GsY8%2F0n21HTajAgxga3NuscTGlP9Is%2FLdOxfu9IY3d77ecSTTUWgkcR%2BRyEo1ApUGLWZrAp5WK1IWMbfBf0hhPmQCccjgjN%2B8kDgAE9ETst36804uotZH6VY4iuTJhdnX4EPcFl848E6BwnrnlP%2FyJ16Qb7nQGWn2zGVGFTncEtwH%2FaUb1LKp6yTuMSuSQRcqzNyFuvJDBvmWiGTbGzlt9VCbwtIVTInSI3NLin%2BMErSktt5AFVg%3D"}, "path": "/api/v3/flows/executor/default-provider-authorization-implicit-consent/", "method": "GET"}, "authorized_application": {"pk": "506b118040694dda9405e185f355c34d", "app": "authentik_core", "name": "Grafana SAML", "model_name": "application"}}	172.24.0.1	2023-01-02 16:46:04.805431+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2024-01-02 16:46:04.80479+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
 efb6497b-cd83-4e42-a2da-9ea634020d29	system_exception	authentik.root.celery	{"message": "Traceback (most recent call last):\\ndjango.db.utils.InterfaceError: connection already closed"}	\N	2023-03-13 09:18:52.857773+00	{}	2024-03-12 09:18:52.85257+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
 f2345f3c-50f4-445f-b1f1-fd3cdfc1e548	system_exception	authentik.root.celery	{"message": "Traceback (most recent call last):\\ndjango.db.utils.InterfaceError: connection already closed"}	\N	2023-03-13 09:18:55.67402+00	{}	2024-03-12 09:18:55.673476+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
 1da692a0-5369-49b1-918d-397a8fb4f6c7	system_exception	authentik.root.celery	{"message": "Traceback (most recent call last):\\ndjango.db.utils.InterfaceError: connection already closed"}	\N	2023-03-13 09:18:59.93416+00	{}	2024-03-12 09:18:59.933726+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
@@ -2906,6 +3076,7 @@ c70a59e5-58b6-4a28-b1e8-ed6d4496c16c	login	authentik.events.signals	{"auth_metho
 0811b173-1a28-4ffc-8805-f25b7b32566e	system_task_exception	authentik.events.monitored_tasks	{"message": "Task clean_expired_models encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 451, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n                 ^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 207, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/_compat.py\\", line 57, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 202, in _inner\\n    return f(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 734, in __protected_call__\\n    return self.run(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/authentik/core/tasks.py\\", line 38, in clean_expired_models\\n    for obj in objects:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 394, in __iter__\\n    self._fetch_all()\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 1867, in _fetch_all\\n    self._result_cache = list(self._iterable_class(self))\\n                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 87, in __iter__\\n    results = compiler.execute_sql(\\n              ^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/sql/compiler.py\\", line 1398, in execute_sql\\n    cursor.execute(sql, params)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/django/__init__.py\\", line 563, in execute\\n    return real_execute(self, sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 67, in execute\\n    return self._execute_with_wrappers(\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 80, in _execute_with_wrappers\\n    return executor(sql, params, many, context)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 84, in _execute\\n    with self.db.wrap_database_errors:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/utils.py\\", line 91, in __exit__\\n    raise dj_exc_value.with_traceback(traceback) from exc_value\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 89, in _execute\\n    return self.cursor.execute(sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django_prometheus/db/common.py\\", line 71, in execute\\n    return super().execute(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\ndjango.db.utils.ProgrammingError: column authentik_providers_oauth2_authorizationcode.is_open_id does not exist\\nLINE 1: ...ntik_providers_oauth2_authorizationcode\\".\\"nonce\\", \\"authentik...\\n                                                             ^\\n"}	\N	2023-03-13 10:02:00.03614+00	{}	2024-03-12 10:02:00.035596+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
 2c333a98-104b-4069-99f8-3995f8e276fe	system_task_exception	authentik.events.monitored_tasks	{"message": "Task clean_expired_models encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 451, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n                 ^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 207, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/_compat.py\\", line 57, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 202, in _inner\\n    return f(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 734, in __protected_call__\\n    return self.run(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/authentik/core/tasks.py\\", line 38, in clean_expired_models\\n    for obj in objects:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 394, in __iter__\\n    self._fetch_all()\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 1867, in _fetch_all\\n    self._result_cache = list(self._iterable_class(self))\\n                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 87, in __iter__\\n    results = compiler.execute_sql(\\n              ^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/sql/compiler.py\\", line 1398, in execute_sql\\n    cursor.execute(sql, params)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/django/__init__.py\\", line 563, in execute\\n    return real_execute(self, sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 67, in execute\\n    return self._execute_with_wrappers(\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 80, in _execute_with_wrappers\\n    return executor(sql, params, many, context)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 84, in _execute\\n    with self.db.wrap_database_errors:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/utils.py\\", line 91, in __exit__\\n    raise dj_exc_value.with_traceback(traceback) from exc_value\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 89, in _execute\\n    return self.cursor.execute(sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django_prometheus/db/common.py\\", line 71, in execute\\n    return super().execute(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\ndjango.db.utils.ProgrammingError: column authentik_providers_oauth2_authorizationcode.is_open_id does not exist\\nLINE 1: ...ntik_providers_oauth2_authorizationcode\\".\\"nonce\\", \\"authentik...\\n                                                             ^\\n"}	\N	2023-03-13 10:07:00.057378+00	{}	2024-03-12 10:07:00.056377+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
 95d26a20-b12f-45c3-9ea6-937eefbf4c8a	system_task_exception	authentik.events.monitored_tasks	{"message": "Task clean_expired_models encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 451, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n                 ^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 207, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/_compat.py\\", line 57, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 202, in _inner\\n    return f(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 734, in __protected_call__\\n    return self.run(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/authentik/core/tasks.py\\", line 38, in clean_expired_models\\n    for obj in objects:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 394, in __iter__\\n    self._fetch_all()\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 1867, in _fetch_all\\n    self._result_cache = list(self._iterable_class(self))\\n                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 87, in __iter__\\n    results = compiler.execute_sql(\\n              ^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/sql/compiler.py\\", line 1398, in execute_sql\\n    cursor.execute(sql, params)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/django/__init__.py\\", line 563, in execute\\n    return real_execute(self, sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 67, in execute\\n    return self._execute_with_wrappers(\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 80, in _execute_with_wrappers\\n    return executor(sql, params, many, context)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 84, in _execute\\n    with self.db.wrap_database_errors:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/utils.py\\", line 91, in __exit__\\n    raise dj_exc_value.with_traceback(traceback) from exc_value\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 89, in _execute\\n    return self.cursor.execute(sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django_prometheus/db/common.py\\", line 71, in execute\\n    return super().execute(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\ndjango.db.utils.ProgrammingError: column authentik_providers_oauth2_authorizationcode.is_open_id does not exist\\nLINE 1: ...ntik_providers_oauth2_authorizationcode\\".\\"nonce\\", \\"authentik...\\n                                                             ^\\n"}	\N	2023-03-13 10:12:00.043399+00	{}	2024-03-12 10:12:00.042488+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
+c9a70db7-55e2-4bec-99c7-fad51b4cbefb	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"next": "/if/admin/#/crypto/certificates"}, "path": "/api/v3/flows/executor/default-authentication-flow/", "method": "GET", "user_agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"}, "auth_method_args": {}}	172.20.0.1	2024-01-11 22:06:44.865953+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2025-01-10 22:06:44.865331+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
 509eaab6-93c5-402d-bcac-2236f3abed19	system_task_exception	authentik.events.monitored_tasks	{"message": "Task clean_expired_models encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 451, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n                 ^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 207, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/_compat.py\\", line 57, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 202, in _inner\\n    return f(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 734, in __protected_call__\\n    return self.run(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/authentik/core/tasks.py\\", line 38, in clean_expired_models\\n    for obj in objects:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 394, in __iter__\\n    self._fetch_all()\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 1867, in _fetch_all\\n    self._result_cache = list(self._iterable_class(self))\\n                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 87, in __iter__\\n    results = compiler.execute_sql(\\n              ^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/sql/compiler.py\\", line 1398, in execute_sql\\n    cursor.execute(sql, params)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/django/__init__.py\\", line 563, in execute\\n    return real_execute(self, sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 67, in execute\\n    return self._execute_with_wrappers(\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 80, in _execute_with_wrappers\\n    return executor(sql, params, many, context)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 84, in _execute\\n    with self.db.wrap_database_errors:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/utils.py\\", line 91, in __exit__\\n    raise dj_exc_value.with_traceback(traceback) from exc_value\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 89, in _execute\\n    return self.cursor.execute(sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django_prometheus/db/common.py\\", line 71, in execute\\n    return super().execute(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\ndjango.db.utils.ProgrammingError: column authentik_providers_oauth2_authorizationcode.is_open_id does not exist\\nLINE 1: ...ntik_providers_oauth2_authorizationcode\\".\\"nonce\\", \\"authentik...\\n                                                             ^\\n"}	\N	2023-03-13 10:17:00.031189+00	{}	2024-03-12 10:17:00.030686+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
 c00c8441-beb6-4486-94fb-1e908df60050	system_task_exception	authentik.events.monitored_tasks	{"message": "Task clean_expired_models encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 451, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n                 ^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 207, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/_compat.py\\", line 57, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 202, in _inner\\n    return f(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 734, in __protected_call__\\n    return self.run(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/authentik/core/tasks.py\\", line 38, in clean_expired_models\\n    for obj in objects:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 394, in __iter__\\n    self._fetch_all()\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 1867, in _fetch_all\\n    self._result_cache = list(self._iterable_class(self))\\n                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 87, in __iter__\\n    results = compiler.execute_sql(\\n              ^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/sql/compiler.py\\", line 1398, in execute_sql\\n    cursor.execute(sql, params)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/django/__init__.py\\", line 563, in execute\\n    return real_execute(self, sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 67, in execute\\n    return self._execute_with_wrappers(\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 80, in _execute_with_wrappers\\n    return executor(sql, params, many, context)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 84, in _execute\\n    with self.db.wrap_database_errors:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/utils.py\\", line 91, in __exit__\\n    raise dj_exc_value.with_traceback(traceback) from exc_value\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 89, in _execute\\n    return self.cursor.execute(sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django_prometheus/db/common.py\\", line 71, in execute\\n    return super().execute(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\ndjango.db.utils.ProgrammingError: column authentik_providers_oauth2_authorizationcode.is_open_id does not exist\\nLINE 1: ...ntik_providers_oauth2_authorizationcode\\".\\"nonce\\", \\"authentik...\\n                                                             ^\\n"}	\N	2023-03-13 10:22:00.032774+00	{}	2024-03-12 10:22:00.032273+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
 c3738939-74b3-46a0-9599-e5675a21fddf	system_task_exception	authentik.events.monitored_tasks	{"message": "Task clean_expired_models encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 451, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n                 ^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 207, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/_compat.py\\", line 57, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 202, in _inner\\n    return f(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 734, in __protected_call__\\n    return self.run(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/authentik/core/tasks.py\\", line 38, in clean_expired_models\\n    for obj in objects:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 394, in __iter__\\n    self._fetch_all()\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 1867, in _fetch_all\\n    self._result_cache = list(self._iterable_class(self))\\n                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 87, in __iter__\\n    results = compiler.execute_sql(\\n              ^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/sql/compiler.py\\", line 1398, in execute_sql\\n    cursor.execute(sql, params)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/django/__init__.py\\", line 563, in execute\\n    return real_execute(self, sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 67, in execute\\n    return self._execute_with_wrappers(\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 80, in _execute_with_wrappers\\n    return executor(sql, params, many, context)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 84, in _execute\\n    with self.db.wrap_database_errors:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/utils.py\\", line 91, in __exit__\\n    raise dj_exc_value.with_traceback(traceback) from exc_value\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 89, in _execute\\n    return self.cursor.execute(sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django_prometheus/db/common.py\\", line 71, in execute\\n    return super().execute(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\ndjango.db.utils.ProgrammingError: column authentik_providers_oauth2_authorizationcode.is_open_id does not exist\\nLINE 1: ...ntik_providers_oauth2_authorizationcode\\".\\"nonce\\", \\"authentik...\\n                                                             ^\\n"}	\N	2023-03-13 10:27:00.033048+00	{}	2024-03-12 10:27:00.032527+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
@@ -2921,12 +3092,15 @@ f581e71a-734f-4d1c-9632-e7de00452063	system_exception	authentik.root.celery	{"me
 b9f9a80a-54c0-4e99-b1b3-dbdb61a8a8e1	system_exception	authentik.root.celery	{"message": "Traceback (most recent call last):\\ndjango.db.utils.InterfaceError: connection already closed"}	\N	2023-03-13 10:55:02.921301+00	{}	2024-03-12 10:55:02.920999+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
 4306c39d-89fc-439d-afa7-92e599477417	system_exception	authentik.root.celery	{"message": "Traceback (most recent call last):\\ndjango.db.utils.InterfaceError: connection already closed"}	\N	2023-03-13 10:55:10.307515+00	{}	2024-03-12 10:55:10.30681+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
 843f8709-4e62-41b8-a98b-213645931ca1	system_task_exception	authentik.events.monitored_tasks	{"message": "Task clean_expired_models encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 451, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n                 ^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 207, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/_compat.py\\", line 57, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 202, in _inner\\n    return f(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 734, in __protected_call__\\n    return self.run(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/authentik/core/tasks.py\\", line 38, in clean_expired_models\\n    for obj in objects:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 394, in __iter__\\n    self._fetch_all()\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 1867, in _fetch_all\\n    self._result_cache = list(self._iterable_class(self))\\n                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 87, in __iter__\\n    results = compiler.execute_sql(\\n              ^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/sql/compiler.py\\", line 1398, in execute_sql\\n    cursor.execute(sql, params)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/django/__init__.py\\", line 563, in execute\\n    return real_execute(self, sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 67, in execute\\n    return self._execute_with_wrappers(\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 80, in _execute_with_wrappers\\n    return executor(sql, params, many, context)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 84, in _execute\\n    with self.db.wrap_database_errors:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/utils.py\\", line 91, in __exit__\\n    raise dj_exc_value.with_traceback(traceback) from exc_value\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 89, in _execute\\n    return self.cursor.execute(sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django_prometheus/db/common.py\\", line 71, in execute\\n    return super().execute(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\ndjango.db.utils.ProgrammingError: column authentik_providers_oauth2_authorizationcode.is_open_id does not exist\\nLINE 1: ...ntik_providers_oauth2_authorizationcode\\".\\"nonce\\", \\"authentik...\\n                                                             ^\\n"}	\N	2023-03-13 10:57:00.032694+00	{}	2024-03-12 10:57:00.031958+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
+cf434072-8f63-4112-acae-f8bb01a43709	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"query": "goauthentik.io%2Foutpost%2Fldap=true"}, "path": "/api/v3/flows/executor/ldap-authentication-flow/", "method": "GET"}, "auth_method_args": {}}	172.21.0.1	2023-03-13 12:15:42.997603+00	{"pk": 6, "email": "ldapservice@localhost", "username": "ldapservice"}	2024-03-12 12:15:42.993087+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
 62899e67-5886-49ee-88a7-8c664e2f746d	system_task_exception	authentik.events.monitored_tasks	{"message": "Task clean_expired_models encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 451, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n                 ^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 207, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/_compat.py\\", line 57, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 202, in _inner\\n    return f(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 734, in __protected_call__\\n    return self.run(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/authentik/core/tasks.py\\", line 38, in clean_expired_models\\n    for obj in objects:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 394, in __iter__\\n    self._fetch_all()\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 1867, in _fetch_all\\n    self._result_cache = list(self._iterable_class(self))\\n                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 87, in __iter__\\n    results = compiler.execute_sql(\\n              ^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/sql/compiler.py\\", line 1398, in execute_sql\\n    cursor.execute(sql, params)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/django/__init__.py\\", line 563, in execute\\n    return real_execute(self, sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 67, in execute\\n    return self._execute_with_wrappers(\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 80, in _execute_with_wrappers\\n    return executor(sql, params, many, context)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 84, in _execute\\n    with self.db.wrap_database_errors:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/utils.py\\", line 91, in __exit__\\n    raise dj_exc_value.with_traceback(traceback) from exc_value\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 89, in _execute\\n    return self.cursor.execute(sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django_prometheus/db/common.py\\", line 71, in execute\\n    return super().execute(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\ndjango.db.utils.ProgrammingError: column authentik_providers_oauth2_authorizationcode.is_open_id does not exist\\nLINE 1: ...ntik_providers_oauth2_authorizationcode\\".\\"nonce\\", \\"authentik...\\n                                                             ^\\n"}	\N	2023-03-13 11:02:00.034669+00	{}	2024-03-12 11:02:00.034074+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
 387c9985-3baf-4cd2-ad89-a64642510aaf	system_task_exception	authentik.events.monitored_tasks	{"message": "Task clean_expired_models encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 451, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n                 ^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 207, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/_compat.py\\", line 57, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 202, in _inner\\n    return f(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 734, in __protected_call__\\n    return self.run(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/authentik/core/tasks.py\\", line 38, in clean_expired_models\\n    for obj in objects:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 394, in __iter__\\n    self._fetch_all()\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 1867, in _fetch_all\\n    self._result_cache = list(self._iterable_class(self))\\n                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 87, in __iter__\\n    results = compiler.execute_sql(\\n              ^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/sql/compiler.py\\", line 1398, in execute_sql\\n    cursor.execute(sql, params)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/django/__init__.py\\", line 563, in execute\\n    return real_execute(self, sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 67, in execute\\n    return self._execute_with_wrappers(\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 80, in _execute_with_wrappers\\n    return executor(sql, params, many, context)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 84, in _execute\\n    with self.db.wrap_database_errors:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/utils.py\\", line 91, in __exit__\\n    raise dj_exc_value.with_traceback(traceback) from exc_value\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 89, in _execute\\n    return self.cursor.execute(sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django_prometheus/db/common.py\\", line 71, in execute\\n    return super().execute(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\ndjango.db.utils.ProgrammingError: column authentik_providers_oauth2_authorizationcode.is_open_id does not exist\\nLINE 1: ...ntik_providers_oauth2_authorizationcode\\".\\"nonce\\", \\"authentik...\\n                                                             ^\\n"}	\N	2023-03-13 11:07:00.025306+00	{}	2024-03-12 11:07:00.024832+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
 4f3a4faf-c73b-40ab-9d4c-27a91a60fd69	system_task_exception	authentik.events.monitored_tasks	{"message": "Task clean_expired_models encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 451, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n                 ^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 207, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/_compat.py\\", line 57, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 202, in _inner\\n    return f(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 734, in __protected_call__\\n    return self.run(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/authentik/core/tasks.py\\", line 38, in clean_expired_models\\n    for obj in objects:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 394, in __iter__\\n    self._fetch_all()\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 1867, in _fetch_all\\n    self._result_cache = list(self._iterable_class(self))\\n                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 87, in __iter__\\n    results = compiler.execute_sql(\\n              ^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/sql/compiler.py\\", line 1398, in execute_sql\\n    cursor.execute(sql, params)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/django/__init__.py\\", line 563, in execute\\n    return real_execute(self, sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 67, in execute\\n    return self._execute_with_wrappers(\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 80, in _execute_with_wrappers\\n    return executor(sql, params, many, context)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 84, in _execute\\n    with self.db.wrap_database_errors:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/utils.py\\", line 91, in __exit__\\n    raise dj_exc_value.with_traceback(traceback) from exc_value\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 89, in _execute\\n    return self.cursor.execute(sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django_prometheus/db/common.py\\", line 71, in execute\\n    return super().execute(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\ndjango.db.utils.ProgrammingError: column authentik_providers_oauth2_authorizationcode.is_open_id does not exist\\nLINE 1: ...ntik_providers_oauth2_authorizationcode\\".\\"nonce\\", \\"authentik...\\n                                                             ^\\n"}	\N	2023-03-13 11:12:00.037904+00	{}	2024-03-12 11:12:00.037441+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
 d1014f1d-f907-4ed8-bb64-50fece7cc94b	authorize_application	authentik.providers.saml.views.flows	{"flow": "a7ef54bb79594559979d9345c022e086", "http_request": {"args": {"query": "SAMLRequest=nJJBb9swDIX%2FiqC7I9lu40aoDWQNhgXotqDJdtiNkZhGgCx5Ir2t%2F36ImwEdMPiwoyS%2B94mPvCfow2DWI5%2FjE34fkVj86kMkc3lo5ZijSUCeTIQeybA1%2B%2FXHR1MttAEizOxTlG8kw7xmyImTTUGK7aaV3hUrfTy6m2bpdLVcVWWDDdjbu5uycqfG4hJq3cDtCWspvmImn2Irq4WWYks04jYSQ%2BRWVrqqC10XZX0oK1PeGV0uVk39TYoNEvsIPCnPzINRKiQL4ZyIzUprrWAYgrdTibq0oJ4znCBCMR2Ikjr66Hx8Vhmdz2hZSbH%2B0%2FxDijT2mPeYf3iLX54e%2F8GpL5zJDixJsbum8O7Vdz6yK5zMh8NhV%2Bw%2B7w%2Bym8ZmpgyyeJ9yDzxvcrnxrjhNpQYje36R3cw%2Fe2RwwHCv3qC667p8gh63m10K3r78B54zRPIYWYp1COnnQ0ZgbCXnEaXqXpF%2FL2X3OwAA%2F%2F8%3D&RelayState=YWRYcTJyV01iNlVkY2R2VWZnVFpHRkVJNlNlM0lIYzM3bmVqWjJwTVd6dWtab2QwYzd8Y2VlMzM1M2Mt&SigAlg=http%3A%2F%2Fwww.w3.org%2F2001%2F04%2Fxmldsig-more%23rsa-sha256&Signature=lUlHgH7IwMv%2F04xulllUtloFIwLWu2r%2FuyoXy4FHZ68ofaEEWzof2L7vMBv8aI3QQ91jI6eeQUjIBLO0HqaSUpadpp8ap%2Bm4cOsilBImRjoOIqpLsukzdBm4S7u1tjO5OqmeQaJmdZuBfwAWemiBEKp0DW1VCHsEDV9th%2BK%2BrptQAhVb8gfVmqRsYY13NZav0ZQOEHu7thDoDfVwQ1l6e6htxcpUFMfQvIB%2BQfB1aA5AAocVylIW1f%2B%2BtMNArDGW4VFAUpBga6lafl6cdSNhxRjPvVEdwAkLK%2BlKvhirGCM44R7ayQBTTIlrdfDaFKl3BEY8XuAnV2eQT6xSERBDyVpunPrZObQqFIp93%2Bm8vovmq8A6xNBHzkmwG%2BWPR4SoVoxIygRogkLuSxi%2B3RtXvRna7vs89sLyZgcIzDLAe6xMt%2FYHphlCvpM3yv83VqmQtPVhFKqQmqaeeJEGtB7JE5P4HK0fPReRXY65zFUeDDYpPrRbUjerI6YJogJqasG9UdZC%2BJXTW%2BAx3eNIpteqehGRXJP9FAbXUVgACS2%2FEUUJy%2FmgxkVHpK%2FUotX0DL50oHCmt0XCFMpWCUZMCXwMFXHEuO%2F%2BpSUqPOkVhX%2Bz3iWKCnUpHgF73UAbjUtgfXpA%2FGo4N3MyoDX1sNbQqPLai5iCZTRwdObBgsgQn%2FXPegw%3D"}, "path": "/api/v3/flows/executor/default-provider-authorization-implicit-consent/", "method": "GET"}, "authorized_application": {"pk": "506b118040694dda9405e185f355c34d", "app": "authentik_core", "name": "Grafana SAML", "model_name": "application"}}	172.21.0.1	2023-03-13 12:18:02.192895+00	{"pk": 8, "email": "authentik-editor@localhost", "username": "authentik-editor"}	2024-03-12 12:18:02.192123+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
 2bb35f8d-322c-4193-b09d-32aafac220b7	system_task_exception	authentik.events.monitored_tasks	{"message": "Task clean_expired_models encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 451, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n                 ^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 207, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/_compat.py\\", line 57, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 202, in _inner\\n    return f(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 734, in __protected_call__\\n    return self.run(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/authentik/core/tasks.py\\", line 38, in clean_expired_models\\n    for obj in objects:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 394, in __iter__\\n    self._fetch_all()\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 1867, in _fetch_all\\n    self._result_cache = list(self._iterable_class(self))\\n                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 87, in __iter__\\n    results = compiler.execute_sql(\\n              ^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/sql/compiler.py\\", line 1398, in execute_sql\\n    cursor.execute(sql, params)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/django/__init__.py\\", line 563, in execute\\n    return real_execute(self, sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 67, in execute\\n    return self._execute_with_wrappers(\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 80, in _execute_with_wrappers\\n    return executor(sql, params, many, context)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 84, in _execute\\n    with self.db.wrap_database_errors:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/utils.py\\", line 91, in __exit__\\n    raise dj_exc_value.with_traceback(traceback) from exc_value\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 89, in _execute\\n    return self.cursor.execute(sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django_prometheus/db/common.py\\", line 71, in execute\\n    return super().execute(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\ndjango.db.utils.ProgrammingError: column authentik_providers_oauth2_authorizationcode.is_open_id does not exist\\nLINE 1: ...ntik_providers_oauth2_authorizationcode\\".\\"nonce\\", \\"authentik...\\n                                                             ^\\n"}	\N	2023-03-13 11:17:00.043594+00	{}	2024-03-12 11:17:00.043125+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
 076a18d6-6d9b-4524-b619-cc4a0a6b5f94	system_task_exception	authentik.events.monitored_tasks	{"message": "Task clean_expired_models encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 451, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n                 ^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 207, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/_compat.py\\", line 57, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 202, in _inner\\n    return f(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 734, in __protected_call__\\n    return self.run(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/authentik/core/tasks.py\\", line 38, in clean_expired_models\\n    for obj in objects:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 394, in __iter__\\n    self._fetch_all()\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 1867, in _fetch_all\\n    self._result_cache = list(self._iterable_class(self))\\n                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 87, in __iter__\\n    results = compiler.execute_sql(\\n              ^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/sql/compiler.py\\", line 1398, in execute_sql\\n    cursor.execute(sql, params)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/django/__init__.py\\", line 563, in execute\\n    return real_execute(self, sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 67, in execute\\n    return self._execute_with_wrappers(\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 80, in _execute_with_wrappers\\n    return executor(sql, params, many, context)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 84, in _execute\\n    with self.db.wrap_database_errors:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/utils.py\\", line 91, in __exit__\\n    raise dj_exc_value.with_traceback(traceback) from exc_value\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 89, in _execute\\n    return self.cursor.execute(sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django_prometheus/db/common.py\\", line 71, in execute\\n    return super().execute(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\ndjango.db.utils.ProgrammingError: column authentik_providers_oauth2_authorizationcode.is_open_id does not exist\\nLINE 1: ...ntik_providers_oauth2_authorizationcode\\".\\"nonce\\", \\"authentik...\\n                                                             ^\\n"}	\N	2023-03-13 11:22:00.029942+00	{}	2024-03-12 11:22:00.029491+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
+05424407-2396-4a74-86e4-6b6833846bcf	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"query": "goauthentik.io%2Foutpost%2Fldap=true"}, "path": "/api/v3/flows/executor/ldap-authentication-flow/", "method": "GET"}, "auth_method_args": {}}	172.21.0.1	2023-03-13 12:16:00.769208+00	{"pk": 6, "email": "ldapservice@localhost", "username": "ldapservice"}	2024-03-12 12:16:00.765898+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+51e69755-68bd-42de-817c-bd744ea221df	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"query": "goauthentik.io%2Foutpost%2Fldap=true"}, "path": "/api/v3/flows/executor/ldap-authentication-flow/", "method": "GET"}, "auth_method_args": {}}	172.21.0.1	2023-03-13 12:16:25.296145+00	{"pk": 6, "email": "ldapservice@localhost", "username": "ldapservice"}	2024-03-12 12:16:25.291452+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
 93da91ee-16b7-4bd8-b05f-ed07b6f9e8b6	system_task_exception	authentik.events.monitored_tasks	{"message": "Task clean_expired_models encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 451, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n                 ^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 207, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/_compat.py\\", line 57, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 202, in _inner\\n    return f(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 734, in __protected_call__\\n    return self.run(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/authentik/core/tasks.py\\", line 38, in clean_expired_models\\n    for obj in objects:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 394, in __iter__\\n    self._fetch_all()\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 1867, in _fetch_all\\n    self._result_cache = list(self._iterable_class(self))\\n                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 87, in __iter__\\n    results = compiler.execute_sql(\\n              ^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/sql/compiler.py\\", line 1398, in execute_sql\\n    cursor.execute(sql, params)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/django/__init__.py\\", line 563, in execute\\n    return real_execute(self, sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 67, in execute\\n    return self._execute_with_wrappers(\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 80, in _execute_with_wrappers\\n    return executor(sql, params, many, context)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 84, in _execute\\n    with self.db.wrap_database_errors:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/utils.py\\", line 91, in __exit__\\n    raise dj_exc_value.with_traceback(traceback) from exc_value\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 89, in _execute\\n    return self.cursor.execute(sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django_prometheus/db/common.py\\", line 71, in execute\\n    return super().execute(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\ndjango.db.utils.ProgrammingError: column authentik_providers_oauth2_authorizationcode.is_open_id does not exist\\nLINE 1: ...ntik_providers_oauth2_authorizationcode\\".\\"nonce\\", \\"authentik...\\n                                                             ^\\n"}	\N	2023-03-13 11:27:00.027139+00	{}	2024-03-12 11:27:00.026677+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
 ad4eb94d-1d1b-4e70-b8dc-9f60371a3076	system_task_exception	authentik.events.monitored_tasks	{"message": "Task clean_expired_models encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 451, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n                 ^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 207, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/_compat.py\\", line 57, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 202, in _inner\\n    return f(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 734, in __protected_call__\\n    return self.run(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/authentik/core/tasks.py\\", line 38, in clean_expired_models\\n    for obj in objects:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 394, in __iter__\\n    self._fetch_all()\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 1867, in _fetch_all\\n    self._result_cache = list(self._iterable_class(self))\\n                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 87, in __iter__\\n    results = compiler.execute_sql(\\n              ^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/sql/compiler.py\\", line 1398, in execute_sql\\n    cursor.execute(sql, params)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/django/__init__.py\\", line 563, in execute\\n    return real_execute(self, sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 67, in execute\\n    return self._execute_with_wrappers(\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 80, in _execute_with_wrappers\\n    return executor(sql, params, many, context)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 84, in _execute\\n    with self.db.wrap_database_errors:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/utils.py\\", line 91, in __exit__\\n    raise dj_exc_value.with_traceback(traceback) from exc_value\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 89, in _execute\\n    return self.cursor.execute(sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django_prometheus/db/common.py\\", line 71, in execute\\n    return super().execute(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\ndjango.db.utils.ProgrammingError: column authentik_providers_oauth2_authorizationcode.is_open_id does not exist\\nLINE 1: ...ntik_providers_oauth2_authorizationcode\\".\\"nonce\\", \\"authentik...\\n                                                             ^\\n"}	\N	2023-03-13 11:32:00.028541+00	{}	2024-03-12 11:32:00.028065+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
 eb523ba5-1b16-45bb-8ae8-7a40eb463c30	system_task_exception	authentik.events.monitored_tasks	{"message": "Task clean_expired_models encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 451, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n                 ^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 207, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/_compat.py\\", line 57, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 202, in _inner\\n    return f(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 734, in __protected_call__\\n    return self.run(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/authentik/core/tasks.py\\", line 38, in clean_expired_models\\n    for obj in objects:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 394, in __iter__\\n    self._fetch_all()\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 1867, in _fetch_all\\n    self._result_cache = list(self._iterable_class(self))\\n                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 87, in __iter__\\n    results = compiler.execute_sql(\\n              ^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/sql/compiler.py\\", line 1398, in execute_sql\\n    cursor.execute(sql, params)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/django/__init__.py\\", line 563, in execute\\n    return real_execute(self, sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 67, in execute\\n    return self._execute_with_wrappers(\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 80, in _execute_with_wrappers\\n    return executor(sql, params, many, context)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 84, in _execute\\n    with self.db.wrap_database_errors:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/utils.py\\", line 91, in __exit__\\n    raise dj_exc_value.with_traceback(traceback) from exc_value\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 89, in _execute\\n    return self.cursor.execute(sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django_prometheus/db/common.py\\", line 71, in execute\\n    return super().execute(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\ndjango.db.utils.ProgrammingError: column authentik_providers_oauth2_authorizationcode.is_open_id does not exist\\nLINE 1: ...ntik_providers_oauth2_authorizationcode\\".\\"nonce\\", \\"authentik...\\n                                                             ^\\n"}	\N	2023-03-13 11:37:00.048995+00	{}	2024-03-12 11:37:00.048385+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
@@ -2944,11 +3118,9 @@ cef79b5a-c90c-4d64-b140-c9a302f31a8e	system_task_exception	authentik.events.moni
 39052e69-2537-41c7-9709-8170094bb2f0	authorize_application	authentik.providers.saml.views.flows	{"flow": "a7ef54bb79594559979d9345c022e086", "http_request": {"args": {"query": "SAMLRequest=nJJPj9MwEMW%2FiuV7asdR%2F1mbSGUrRKUFqm3hwG3WmWwtOXbwTID99ijZIi0S6oGj7Xnv53kzdwR9GOxu5Et8xO8jEotffYhkp4dajjnaBOTJRuiRLDt72n18sGahLRBhZp%2BifCMZbmuGnDi5FKQ47Gvp26JbbzfVGio0K72BrTGlgW6jn1bGadDLzpW47tp2JcVXzORTrKVZaCkORCMeIjFErqXRpip0VZTVuTS23NjSLJbb5Tcp9kjsI%2FCsvDAPVqmQHIRLIrZbrbWCYQjezSVqakE9Z%2BggQjEfiJJ68rH18VllbH1Gx0qK3Z%2Fm71Okscd8wvzDO%2Fzy%2BPAPTjVxZjtwJMXxmsK7V9%2FbkV3hZD%2Bcz8fi%2BPl0ls08NjtnkMX7lHvg2ybTzZT2XGoxsucX2dz4Z48MLTDcqTeo5roun6DHw%2F6Ygncv%2F4HnDJE8RpZiF0L6eZ8RGGvJeUSpmlfk30vZ%2FA4AAP%2F%2F&RelayState=NzhJeXNnVnNZZDZKRDd3Q3BLVmFJa3hSaXRtOTlFdjJ2ZE8xaDQ0VlE4OVhlMGVjVE98YThlZWJkMDgt&SigAlg=http%3A%2F%2Fwww.w3.org%2F2001%2F04%2Fxmldsig-more%23rsa-sha256&Signature=puFkhzy3Z5ac%2F1r3XdkaI0iEal2x1%2F0VLcr70BnL2IzjKUZifOxWx5laZoeWQnLdh1kKv1Nwnn32R53gOQkY4ofvAN81RaOB6vuJLTupOqA8XVkv2B%2Fs%2BwpfZrYgpUbxMVVJCzasr15e5%2FLd8uvDbdL6EBKJuVqhKfEP1T%2FH%2Bgnjc8WnW6yPJpAzQa3VuciZCBxkyq7SWfZabfADGwrF7PYzUniCOzXco%2FCHPuqgoPi5DNg32g4UxkgZmgCum%2B16Hf0hcT3eHUFuCkn5CA4PnnmWeDJeWiy%2B8yiYthZcfZAsZ1d0ngr58nmn9%2B3pbq5ICAC6ebpQci5NuY1nH4h%2FabMCJQsS1RDlkVpQdfWImyY3KcrgXavDKmqlWZ66dPGOP94LiFrB6hvGCrgPujvxnMUF3q54I9m2DGI9n5NA9Tx6rvClljP35bjMHV16H%2BzKsmPdInvmXtSJCf1OQC4GHAnGXsHTKLOCXqEQGFcb%2BwXVMGCCpXcguc4pWxd4wgMhc18bTANKN5%2FzlXGFWQyHLFMwC5iIuJFll4DKGC0gZTlixuGPjyiBEkCWtIIq8CZkSvKp6Dcx1CdC8gsZhJUxWxVws8IgfrL2TpL9AHlWOjZEWPYA8GiZF%2B9Cuyt%2F%2BZZCxoHl2ISx1CMR46pXirmSKWU3sAB3qDXHuv%2FaXxIt5tc%3D"}, "path": "/api/v3/flows/executor/default-provider-authorization-implicit-consent/", "method": "GET"}, "authorized_application": {"pk": "506b118040694dda9405e185f355c34d", "app": "authentik_core", "name": "Grafana SAML", "model_name": "application"}}	172.21.0.1	2023-03-13 12:18:12.851482+00	{"pk": 8, "email": "authentik-editor@localhost", "username": "authentik-editor"}	2024-03-12 12:18:12.85073+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
 0f288bb0-3131-4b6b-bd13-781b1fc8f7f1	system_task_exception	authentik.events.monitored_tasks	{"message": "Task clean_expired_models encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 451, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n                 ^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 207, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/_compat.py\\", line 57, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 202, in _inner\\n    return f(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 734, in __protected_call__\\n    return self.run(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/authentik/core/tasks.py\\", line 38, in clean_expired_models\\n    for obj in objects:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 394, in __iter__\\n    self._fetch_all()\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 1867, in _fetch_all\\n    self._result_cache = list(self._iterable_class(self))\\n                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 87, in __iter__\\n    results = compiler.execute_sql(\\n              ^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/sql/compiler.py\\", line 1398, in execute_sql\\n    cursor.execute(sql, params)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/django/__init__.py\\", line 563, in execute\\n    return real_execute(self, sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 67, in execute\\n    return self._execute_with_wrappers(\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 80, in _execute_with_wrappers\\n    return executor(sql, params, many, context)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 84, in _execute\\n    with self.db.wrap_database_errors:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/utils.py\\", line 91, in __exit__\\n    raise dj_exc_value.with_traceback(traceback) from exc_value\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 89, in _execute\\n    return self.cursor.execute(sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django_prometheus/db/common.py\\", line 71, in execute\\n    return super().execute(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\ndjango.db.utils.ProgrammingError: column authentik_providers_oauth2_authorizationcode.is_open_id does not exist\\nLINE 1: ...ntik_providers_oauth2_authorizationcode\\".\\"nonce\\", \\"authentik...\\n                                                             ^\\n"}	\N	2023-03-13 12:07:00.029026+00	{}	2024-03-12 12:07:00.028562+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
 cea6cb21-9afe-4f32-9daa-5f5e65bc6d8c	system_task_exception	authentik.events.monitored_tasks	{"message": "Task clean_expired_models encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 451, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n                 ^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 207, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/_compat.py\\", line 57, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 202, in _inner\\n    return f(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 734, in __protected_call__\\n    return self.run(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/authentik/core/tasks.py\\", line 38, in clean_expired_models\\n    for obj in objects:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 394, in __iter__\\n    self._fetch_all()\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 1867, in _fetch_all\\n    self._result_cache = list(self._iterable_class(self))\\n                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 87, in __iter__\\n    results = compiler.execute_sql(\\n              ^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/sql/compiler.py\\", line 1398, in execute_sql\\n    cursor.execute(sql, params)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/django/__init__.py\\", line 563, in execute\\n    return real_execute(self, sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 67, in execute\\n    return self._execute_with_wrappers(\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 80, in _execute_with_wrappers\\n    return executor(sql, params, many, context)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 84, in _execute\\n    with self.db.wrap_database_errors:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/utils.py\\", line 91, in __exit__\\n    raise dj_exc_value.with_traceback(traceback) from exc_value\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 89, in _execute\\n    return self.cursor.execute(sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django_prometheus/db/common.py\\", line 71, in execute\\n    return super().execute(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\ndjango.db.utils.ProgrammingError: column authentik_providers_oauth2_authorizationcode.is_open_id does not exist\\nLINE 1: ...ntik_providers_oauth2_authorizationcode\\".\\"nonce\\", \\"authentik...\\n                                                             ^\\n"}	\N	2023-03-13 12:12:00.033447+00	{}	2024-03-12 12:12:00.032956+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
-cf434072-8f63-4112-acae-f8bb01a43709	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"query": "goauthentik.io%2Foutpost%2Fldap=true"}, "path": "/api/v3/flows/executor/ldap-authentication-flow/", "method": "GET"}, "auth_method_args": {}}	172.21.0.1	2023-03-13 12:15:42.997603+00	{"pk": 6, "email": "ldapservice@localhost", "username": "ldapservice"}	2024-03-12 12:15:42.993087+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-05424407-2396-4a74-86e4-6b6833846bcf	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"query": "goauthentik.io%2Foutpost%2Fldap=true"}, "path": "/api/v3/flows/executor/ldap-authentication-flow/", "method": "GET"}, "auth_method_args": {}}	172.21.0.1	2023-03-13 12:16:00.769208+00	{"pk": 6, "email": "ldapservice@localhost", "username": "ldapservice"}	2024-03-12 12:16:00.765898+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
-51e69755-68bd-42de-817c-bd744ea221df	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"query": "goauthentik.io%2Foutpost%2Fldap=true"}, "path": "/api/v3/flows/executor/ldap-authentication-flow/", "method": "GET"}, "auth_method_args": {}}	172.21.0.1	2023-03-13 12:16:25.296145+00	{"pk": 6, "email": "ldapservice@localhost", "username": "ldapservice"}	2024-03-12 12:16:25.291452+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
 5c20ff33-9685-41f9-a1a2-db46d9e4f5d9	authorize_application	authentik.providers.saml.views.flows	{"flow": "a7ef54bb79594559979d9345c022e086", "http_request": {"args": {"query": "SAMLRequest=nJJBb9swDIX%2FiqC7K0V201ioDWQNhgXotqDJdtiNkZlGgCx5Ir2t%2F36wmwEdMOSwoyS%2B94mPvCfow2DXI5%2FjE34fkVj86kMkOz00cszRJiBPNkKPZNnZ%2FfrjozU32gIRZvYpyjeS4bpmyImTS0GK7aaRvitOZVXWxxpcZW67FTiHtTtWGmpcLQ3cGaPvXF2fllJ8xUw%2BxUaaGy3FlmjEbSSGyI002pSFLotFeVgYu1ja6vZmVa2%2BSbFBYh%2BBZ%2BWZebBKheQgnBOxrbXWCoYheDeXqKkF9ZzhBBGK%2BUCU1NHHzsdnlbHzGR0rKdZ%2Fmn9IkcYe8x7zD%2B%2Fwy9PjPzjlxJntwJEUu0sK7159r0d2gZP9cDjsit3n%2FUG289jsnEEW71Puga%2BbTDdT2nOpxcieX2R75Z89MnTAcK%2FeoNrLunyCHrebXQrevfwHnjNE8hhZinUI6edDRmBsJOcRpWpfkX8vZfs7AAD%2F%2Fw%3D%3D&RelayState=VElyVjNaN2pnbDRVd1RWM29FM2x5MVZuVlBkY2N0WXBoZ01ET2Z4d2RKU2dOUE10ZFF8YmFjMjQzNDIt&SigAlg=http%3A%2F%2Fwww.w3.org%2F2001%2F04%2Fxmldsig-more%23rsa-sha256&Signature=b5zxgS%2FAfwENvPrKFQIwHF04kGrruQL8VG3I15mtw7IOTkKWg%2BBZ6MuhG7C%2Bc4XNQfqTNtYwHNCr8FFd3STN1%2BsLv7NaBdcHjA%2BPAOZWrZc%2BsqB%2FFBpH6rWmB667UNcC9sTtlX1XS9O5vAJ%2Fln3Hb3pgV5r%2FEXcyrC1KSTiLSz6Xt6fqqopH6P7b%2FBOcAiWqvpt4J10UxXsC3huufmdg0MSGJO4ROun5dyL2NjxgASre4q9B2ka4pN3QaFdv5LOV9ptCd6EU5WJkc8rGVkvpGm2OdlrdxJi0jJy951%2FomKNGzfuR%2Bv6gWONM7aUoYUJbTKBibdC65EFVoNX%2BFnZIli9%2FK2zr00IoLqsyWkVpqZi4ziSevs%2F7XK4Hx4bFQ39E94Cs79uc6Mv1xDYa3Vf4grFkK99UUGoPBPgVrHOCRDt7SGw66ugSMktBFr7XPzJiTz%2B9Ue%2Fv4spp9J%2BuyQc1bdVFcgXIfBXwfomYvr%2BtPvc8gsIZJq2DFABStFX7OuaJOe5nKqhQuvfGMUlpFEePSOlTv2FhkH2ANMX0W%2B30pZjiOA1B7wthS6FrGJ9S6DVxqzvmfCzHFtMYPzOkLnE2hTNTjVIv%2FF5%2Bcsh8a4KT9o7KRAhXHbnrbyKA%2F1CKKJS%2FJfml7dG8eUOnGLg5BlQfTr4OS8DxxyHtFLykHPvfSQI%3D"}, "path": "/api/v3/flows/executor/default-provider-authorization-implicit-consent/", "method": "GET"}, "authorized_application": {"pk": "506b118040694dda9405e185f355c34d", "app": "authentik_core", "name": "Grafana SAML", "model_name": "application"}}	172.21.0.1	2023-03-13 12:16:46.200868+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2024-03-12 12:16:46.200309+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
 bc3357f2-1df7-47bd-8fa2-e853e44df893	authorize_application	authentik.providers.saml.views.flows	{"flow": "a7ef54bb79594559979d9345c022e086", "http_request": {"args": {"query": "SAMLRequest=nJJBb9swDIX%2FiqC7I1v2mkaoDWQNhgXotqDJdtiNkZhGgCx5Ir2t%2F36ImwEdMPjQoyS%2B94mPvCPow2DWI5%2FjI%2F4YkVj87kMkc3lo5ZijSUCeTIQeybA1%2B%2FWnB6MXpQEizOxTlK8kw7xmyImTTUGK7aaV3hUNNEtcHt%2FBaalRQ31cVo11VVNXK32ra8TjyTl7C1J8w0w%2BxVbqRSnFlmjEbSSGyK3Upa6Lsi6q%2BlBpU92YZrW4KevvUmyQ2EfgSXlmHoxSIVkI50RsVmVZKhiG4O1Uoi4tqKcMJ4hQTAeipI4%2BOh%2BfVEbnM1pWUqz%2FNn%2BfIo095j3mn97i18eH%2F3DqC2eyA0tS7K4pvH%2FxnY%2FsCifz8XDYFbsv%2B4PsprGZKYMsPqTcA8%2BbXG68K05TqcHInp9lN%2FPPHhkcMNypV6juui6focftZpeCt89vwHOGSB4jS7EOIf26zwiMreQ8olTdC%2FLfpez%2BBAAA%2F%2F8%3D&RelayState=VDBZcDVuczVpbVhzTlFMaXg0Y2k5UUk1b1N0M05LQ1YwaHVhcXlrZVJHdDBITTluOUR8ZDMxZDgxNzIt&SigAlg=http%3A%2F%2Fwww.w3.org%2F2001%2F04%2Fxmldsig-more%23rsa-sha256&Signature=wUqtpzGasm1xm0%2B21lZLUOer33uK6YPH6MphpRPlGp8veCavKzKyr%2Fk%2BC9%2Fy6YqUScqYLmFd8joiRTWq1l0rZ1o6olA8Hq1%2FTyTx6OzuzbVV9qPd6hCIqfNFgNhfSjFLXolj079hkVqzs43nILWLyUb%2FH7bfLDu6yGPqndwpuvnZiRR4R3gYtkkTKsDvA%2B2BqskaLiW%2B%2FbMVaunroA0feuPWYlS6sO9gEwN%2BmNd2y8Ny9YmTBh8D8kwUrjasqsj7VwUQvA%2FPBxHrVY1qE%2B%2Bc2a0X0JOm4eBOvrAbuUGC58vZykC%2Fo7ub%2B2iaEsuPZow9vvJdYKzXUZSrYbRIdDBNOmkBpmA4QllPjV1vEdgDCNrGWmUPU7fB4xtLyoc2X0%2Bx010L1t9Z2QuLm3lQm8pK11oBzsiMcfzXBEbdZg%2BkPTQFL2szutYG3f2V4QmSUjQhDuphAKs99%2FUunI57Qn5rrck5cBmM0J97xWzNPzceIO0uamESgaBiteqw2ywBYgxpD0vTfc7VonPXpymR6z%2BjA0UPgslrQgqZxjAdHdPACdYKdHLfFIsRLAtyzHY%2FFkh5z6lmEqT9%2BGENv%2FGph%2FRxshU3Fhj4VQaT%2FHbkz6BOug2HUAbt8WiCgp4bwd8qSYAQLKSxXButM%2BLMofSt7GHhgdW2xMGurtNGqUhjX2jDFUo%3D"}, "path": "/api/v3/flows/executor/default-provider-authorization-implicit-consent/", "method": "GET"}, "authorized_application": {"pk": "506b118040694dda9405e185f355c34d", "app": "authentik_core", "name": "Grafana SAML", "model_name": "application"}}	172.21.0.1	2023-03-13 12:16:49.912109+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2024-03-12 12:16:49.911609+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+2fe33328-90f8-4505-917b-5a6ba069ef79	model_updated	authentik.events.middleware	{"model": {"pk": 1, "app": "authentik_core", "name": "authentik Default Admin", "model_name": "user"}, "http_request": {"args": {"next": "/if/admin/#/crypto/certificates"}, "path": "/api/v3/flows/executor/default-authentication-flow/", "method": "GET", "user_agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"}}	172.20.0.1	2024-01-11 22:06:44.879979+00	{"pk": 2, "email": "", "username": "AnonymousUser"}	2025-01-10 22:06:44.879476+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
 a6bcd075-2241-45f4-93c3-ba4b69af2918	system_task_exception	authentik.events.monitored_tasks	{"message": "Task clean_expired_models encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 451, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n                 ^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 207, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/_compat.py\\", line 57, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 202, in _inner\\n    return f(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 734, in __protected_call__\\n    return self.run(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/authentik/core/tasks.py\\", line 38, in clean_expired_models\\n    for obj in objects:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 394, in __iter__\\n    self._fetch_all()\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 1867, in _fetch_all\\n    self._result_cache = list(self._iterable_class(self))\\n                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 87, in __iter__\\n    results = compiler.execute_sql(\\n              ^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/sql/compiler.py\\", line 1398, in execute_sql\\n    cursor.execute(sql, params)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/django/__init__.py\\", line 563, in execute\\n    return real_execute(self, sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 67, in execute\\n    return self._execute_with_wrappers(\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 80, in _execute_with_wrappers\\n    return executor(sql, params, many, context)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 84, in _execute\\n    with self.db.wrap_database_errors:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/utils.py\\", line 91, in __exit__\\n    raise dj_exc_value.with_traceback(traceback) from exc_value\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 89, in _execute\\n    return self.cursor.execute(sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django_prometheus/db/common.py\\", line 71, in execute\\n    return super().execute(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\ndjango.db.utils.ProgrammingError: column authentik_providers_oauth2_authorizationcode.is_open_id does not exist\\nLINE 1: ...ntik_providers_oauth2_authorizationcode\\".\\"nonce\\", \\"authentik...\\n                                                             ^\\n"}	\N	2023-03-13 12:17:00.03235+00	{}	2024-03-12 12:17:00.031758+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
 85b9d791-85e5-4c24-8c4d-36583538b4fa	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"query": "goauthentik.io%2Foutpost%2Fldap=true"}, "path": "/api/v3/flows/executor/ldap-authentication-flow/", "method": "GET"}, "auth_method_args": {}}	172.21.0.1	2023-03-13 12:17:03.682721+00	{"pk": 6, "email": "ldapservice@localhost", "username": "ldapservice"}	2024-03-12 12:17:03.67834+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
 2597fa7f-1be7-4636-9165-04f0b2dd813b	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"query": "next=%2Fapplication%2Fsaml%2Fgrafana-saml%2Fsso%2Fbinding%2Fredirect%2F%3FSAMLRequest%3DnJJBj9MwEIX%252FiuV7aidhCbE2kcpWiEoLVNvCgds0mWwtOePgmQD771GzRVok1MMebc97n%252BfN3DKMYXLrWU70gD9mZFG%252Fx0Dszg%252BNnhO5COzZEYzITjq3X3%252B6d8XKOmDGJD6SfiGZrmumFCV2MWi13TTa95mtclu%252BHfI%252BH4ayACxsVeRV%252FabEfKhtfQMW62N%252FBK2%252BYWIfqdHFymq1ZZ5xSyxA0ujCFmVmyywvD3nh8srZavWuvPmu1QZZPIEsypPI5IwJsYNwiiyuttYamKbgu6XEnFswjwkGIMiWA3M0R0%252B9p0eTsPcJOzFarf82fxeJ5xHTHtNP3%252BHXh%252Fv%252FcMozZ7GDjrXaXVJ4%252F%252Bx7PbILnN3Hw2GX7b7sD7pdxuaWDJL6ENMIct3kfOP7bFhKHZJ4edLtlX%252BOKNCDwK15gWov6%252FIZRtxudjH47ukVeElA7JFEq3UI8dddQhBstKQZtWmfkf8uZfsnAAD%252F%252Fw%253D%253D%26RelayState%3DM01VdDk4TzhnSWtVMjBDTnlWb2FZZ05GOWZjUmxSNU41Sk1UbXdVcUxHcmM1dmJac2t8YWI3YjFjYTYt%26SigAlg%3Dhttp%253A%252F%252Fwww.w3.org%252F2001%252F04%252Fxmldsig-more%2523rsa-sha256%26Signature%3DW1uiWN6vvpGfU5nA49tvVbhWp71UjMbe%252Bsao3uLOeCYRCdJAxe22GIdpdViY8iuKSWISmNRMIDp3oWlTmbg5leMgWtO1wJxdk4AxnH8dLcMBhpNhhr8VD3QvQsJZfEMPBeWDa4IeFhfn%252FCL7gBKFHi5%252BNfzZuFUESyGQ0ZhRezPyff9pSPaZacYe%252FlAB%252FFQcejoGxBBohsbeVd5OMwYy0UVPmcgIWvp72%252FYYdMY5NEpre5tbQ9KQY1TlzMHKZAbVqfdPODKxobEXYuZBtEjrRzTJJP9iEpj4XXNEezg8vYOsAeex8Iagke2pSOa%252Bg741XW6HmEWDYNF3lksMd7f7lOP8b6MbcVeVUgZcF7s5XcSPYLuTelEruz%252BJgBGbtquqmUMidbeWAfvF4oiYcPnjncwToTSRa0EE1c%252BLxJaVwBAfDOYTRkYXb7BAg19tHQ8eMpG6JaQqdWY0OSabb2%252FGObiY9SMCjqgHFVYesRm9hn5Sv5nofAjjSxnQf69WiPCNTENznRZ%252BCYezWfEkXeYvh2Qk830%252BA24FHHRUZ4mvjlWwd9fFGuxcIy88LVkFfo5MmR%252FzrXZuPOLY5hRsBo9bHTbxxmYIW9HV8Q3UxO%252BuWnvYzhF3luBdePoxi%252B%252FDy%252B%252BrVaG1VfVUx89qVwgNcksp8C8FtkXO88t%252F1sIp8Hu0I3w%253D"}, "path": "/api/v3/flows/executor/default-authentication-flow/", "method": "GET"}, "auth_method_args": {}}	172.21.0.1	2023-03-13 12:17:27.490802+00	{"pk": 8, "email": "authentik-editor@localhost", "username": "authentik-editor"}	2024-03-12 12:17:27.490352+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
@@ -2963,6 +3135,7 @@ ec35d60f-97e1-4eed-b11c-12e5388aabb9	system_task_exception	authentik.events.moni
 53020bf2-b2f1-4a00-8106-f068bfd43302	authorize_application	authentik.providers.saml.views.flows	{"flow": "a7ef54bb79594559979d9345c022e086", "http_request": {"args": {"query": "SAMLRequest=nJJBbxMxEIX%2FiuX7xo69AWp1VwqNEJEKRE3gwG3inTSWvPbimQX671G2QSoS2kOPtue9z%2FNmbgn6OLj1yOf0gD9GJBa%2F%2B5jIXR4aOZbkMlAgl6BHcuzdfv3p3pmFdkCEhUNO8oVkmNcMJXP2OUqx3TQydJXuTvZtZ9HbI5qVwdU7U4O2Gur6ja6N8X5p9MkfpfiGhUJOjTQLLcWWaMRtIobEjTTa2ErbamkPS%2BOMcfVysTI336XYIHFIwJPyzDw4pWL2EM%2BZ2N1orRUMQwx%2BKlGXFtRjgRMkqKYDUVbHkLqQHlXBLhT0rKRY%2F23%2BLicaeyx7LD%2BDx68P9%2F%2Fh2AtnsgNPUuyuKbx%2F9p2P7Aon9%2FFw2FW7L%2FuDbKexuSmDIj7k0gPPm1xuQledplKHiQM%2FyXbmnz0ydMBwq16g2uu6fIYet5tdjsE%2FvQLPBRIFTCzFOsb8664gMDaSy4hStc%2FIf5ey%2FRMAAP%2F%2F&RelayState=MUZpWUxjVUNYRUttcTdLaXRqVWhadTBkVzFmRUJhUWUwaWdkNHRRcmhsQWk2NXhzNnN8YjY3OGJlODMt&SigAlg=http%3A%2F%2Fwww.w3.org%2F2001%2F04%2Fxmldsig-more%23rsa-sha256&Signature=iEae0yzkwmmEGk7goszwfJQvGB887jfnfszCokTmcnDBxT2FvWwYM%2FQ3chK3nvYHi%2BpmVVQmlFOFeq%2But0c8zbvSHz8oDkLy%2F1aIvQejRm%2B6HOJXxKfscKwYMOczyKD%2BBFTz6qEwiqBXeCmK8ab9jRwgt4NCz77aN%2Fx320cFZFOeK%2F8MQzUj%2FgAW1l1kzFe0eK4fQ2WQqRydvYtUcUMk%2FMfFQZZL%2BysvS8AnGVt15V13ZE6b%2BaM37F%2B726vOBqjyse99cLpZsY08P6PIKr7duElXND25x1jMyqC1hEEOBCzSj9Rd9be4elzUWMDRLPzEpPgLVD05cdvt64Dp%2FIP05HFW036Xt8A37azAfr5gulR%2B1ZDlsNXbnCHAHjVSfuAiS31%2B%2B%2BwPMwCk5hWInP5b8D7uCR989om153iD61cJgUrUHdBknhikTn6hhGahKNLVf6uDNcDiqdfcAEzgnaMB2Hy1MxTpz3Ge4nmXj6wK2%2F%2BgDhPTu6JayscchroBZPt7U4oN6ryuVcuSuOToqVJvhMilGUzMP4a9yeHqv6qk7T9egBBfwIrC%2FQ%2FsfNblceIDUTLomxw3gahf0Qb1JxmsuTqCYYHSJiddmBhMUzQ4iEMjz8tqEFWo6pJZFE1SrQATH7mXEB3Ki6%2FwkyBYPq6KHV36nDYhKJT34kWcrsaoRiA%3D"}, "path": "/api/v3/flows/executor/default-provider-authorization-implicit-consent/", "method": "GET"}, "authorized_application": {"pk": "506b118040694dda9405e185f355c34d", "app": "authentik_core", "name": "Grafana SAML", "model_name": "application"}}	172.21.0.1	2023-03-13 12:22:41.756407+00	{"pk": 8, "email": "authentik-editor@localhost", "username": "authentik-editor"}	2024-03-12 12:22:41.755874+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
 33883ab6-55eb-40af-bd68-6f1b00a360c4	authorize_application	authentik.providers.saml.views.flows	{"flow": "a7ef54bb79594559979d9345c022e086", "http_request": {"args": {"query": "SAMLRequest=nJJBb9s%2BDMW%2FiqG7I1VK%2F4mF2kD%2BDYYF6LagyXbYjZXoRoAseSK9rd9%2BiJsBHTDksKMkvvcTH3lHMMTRbiY%2BpUf8NiFx9XOIiez5oRVTSTYDBbIJBiTLzh42Hx6sXigLRFg45CTeSMbrmrFkzi5HUe22rQi%2BXprGm1vjV6s1%2BnWz7lWv%2FNo40zw12rhbpVbw37JfiuoLFgo5tUIvlKh2RBPuEjEkboVW2tTK1DfmeKOt1na5Whijv4pqi8QhAc%2FKE%2FNopYzZQTxlYtsopSSMYwxuLpHnFuRzgR4S1POBKMunkHxIz7KgDwUdS1Ftfjd%2FnxNNA5YDlu%2FB4efHh79wzJkz24EjUe0vKfz%2F6ns9sguc7PvjcV%2FvPx2OopvHZucMSvUulwH4usn5Jvi6n0stJg78Iror%2FxyQwQPDnXyD6i7r8hEG3G33OQb38g94LpAoYGJRbWLMP%2B4LAmMruEwoZPeK%2FHMpu18BAAD%2F%2Fw%3D%3D&RelayState=anIybTVpRXpNb1M1cTY1STZkbTg5MnFEQ2Q5eUhyS3RmMnlhWDZrMWhtRVNCV3dieTJ8ZTU1N2E0YzIt&SigAlg=http%3A%2F%2Fwww.w3.org%2F2001%2F04%2Fxmldsig-more%23rsa-sha256&Signature=Hg4HrLcQEHmjmUoBFkreDfipeHYL03BpwjjG0oErIkjegN5cvJeK6vOKgMuecGSt07zBYnOZ7w4%2BFbztzlUA9Ck1Z4939R8cWdIHwwXWq4EBCIANuRo83ae7igPfWK%2BAa%2FRRcVRsoHwpJC0Mj5Icz4obi6JYrQDy3YdY0jwRa7d5NDiYdmi3zmF2O4gBZqZmrIdJPeDGmF%2F6Ut3%2Bbpkw8Hkc%2FVSXohyNRsedQXLT30Uc7KsNSrdfIqlhJlYFhtDLh3ZKGWXxeI3qsKDwwj%2BCmbuzk8ElQfokH1ZBievQCrZ%2FpJZnxDYWZ2ipmAZAm%2BojsE0gJCVLZT6PMMF%2FJeP98Q8Z35rVZ8fNgJ0F14OPaU%2FRad12rMTJdlnoAVAbxvIhO%2BezuftLg81VAeJmxmhqU0wPpxZjFv3c5jsC2w04QufYW6rGQ9Eqk9Aul%2BBM398CWXo2fdWqSdTK3R9k9Hu4OPMD%2BOE%2FY4TxF4aDDfoDnO2AjWz0aW0SgU4R8%2B1Mq03kZhz5WGJ%2BVV4rbvIZC3rmTU2Uu9PXSUXrFEKe%2Fh3hifwHiCfLiQd7%2FttY1syGI%2ByOjBTCpfEYc8Idbk%2BVZDuWwLHFKk6sJPZ3S65DWFY83uGSmYmhmci8NG9tpaFu47ZrTJ0XIf8uVrp7NbLuJpJQ428XqyWeyskr1QchFoA5gK0%3D"}, "path": "/api/v3/flows/executor/default-provider-authorization-implicit-consent/", "method": "GET"}, "authorized_application": {"pk": "506b118040694dda9405e185f355c34d", "app": "authentik_core", "name": "Grafana SAML", "model_name": "application"}}	172.21.0.1	2023-03-13 12:22:47.615052+00	{"pk": 8, "email": "authentik-editor@localhost", "username": "authentik-editor"}	2024-03-12 12:22:47.614547+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
 a3a94a54-ad14-44e1-b3fa-82daeded38cc	authorize_application	authentik.providers.saml.views.flows	{"flow": "a7ef54bb79594559979d9345c022e086", "http_request": {"args": {"query": "SAMLRequest=nJJBb9swDIX%2FiqC7I1lu6lqoDWQNhgXotqDJdtiNkZlGgCx5Ir2t%2F36ImwEdMOSwoyS%2B94mPvCcYwmhXE5%2FiE36fkFj8GkIke35o5ZSjTUCebIQBybKzu9XHR2sW2gIRZvYpyjeS8bpmzImTS0GKzbqVvi%2BwPkBVHg8llDfQGF0v4Q7uqmZZNb3Dm6o2eHtsbkGKr5jJp9hKs9BSbIgm3ERiiNxKo01V6Kooq31prDF2qRd1WX%2BTYo3EPgLPyhPzaJUKyUE4JWLbaK0VjGPwbi5R5xbUc4YjRCjmA1FSBx97H59Vxt5ndKykWP1p%2FiFFmgbMO8w%2FvMMvT4%2F%2F4FRnzmwHjqTYXlJ49%2Bp7PbILnOyH%2FX5bbD%2Fv9rKbx2bnDLJ4n%2FIAfN3kfOP74jiXWozs%2BUV2V%2F45IEMPDPfqDaq7rMsnGHCz3qbg3ct%2F4DlDJI%2BRpViFkH4%2BZATGVnKeUKruFfn3Una%2FAwAA%2F%2F8%3D&RelayState=M3pwWm9kRldFeml2eThQVHBQcGI1NGp6Y3VCdGE2QU4yY0Eyc05OVlZzS1hlZEpsVEx8ZmFkNjlmYzEt&SigAlg=http%3A%2F%2Fwww.w3.org%2F2001%2F04%2Fxmldsig-more%23rsa-sha256&Signature=AMKBlDIOTlPlZhLhBMQnT6S1%2FPH0luAJKcoJDqnljva%2Fc8y8ttw8hyj9%2FsZ66ghIVdelzLHGYf0zHhnQpjLTnOlss1XKigzxLfzcW4VpNzb87x%2Bo4XgtKVQg41XYUiidoaY7WhaMViAlXit93lAoSVxLSRf2bdVMKAUdze1W2PHZLzNFWb8le%2FkIc1RL9am%2FqKHPVkV7dgaZYzsGjID1buVA8nES5AbeFEa13ncP4BgqlUOhBeYnPO7uY7g6UDXOrGFpsVbg7NCy61ERbU1YZgUUcVB%2F%2Fzuyl%2Bx9oGwAnE%2FcGQ62NWS4MgcUSyC9fUhm%2Bdh1FvCPpLbmh3aAFHwJgfW1zrLZqosu2vgDWdPl%2FFy8GhrPQtxHpUsmminQqVWuB03J5RL5faXuV8KbMSyHEKBYrPL8TosM5AUC8Myc3ofAWmoSnBhHHPDjo%2FGuvjziRCyknuIgMwXASS0fOJonaYJyYGwHNOFYdRhMvP0h40y5sbZZEsDQOZI0x6PkGX41rHfsB2K6nUshcKwr7vxf8DpBblmCgby7ikD11ZQaM32MKv9Nuy91jQ2ukPBlXTOZy2fUKokK0EHs%2Fu7W1%2FB6ZlWSCyC2B0Vk7CsG2WILsRo6U%2Fhpzn9Stka1y0L59k4%2Bj6yErQsSWny06kEaCiaS%2B1Os6Epib00K8q8Mhkf8swk%3D"}, "path": "/api/v3/flows/executor/default-provider-authorization-implicit-consent/", "method": "GET"}, "authorized_application": {"pk": "506b118040694dda9405e185f355c34d", "app": "authentik_core", "name": "Grafana SAML", "model_name": "application"}}	172.21.0.1	2023-03-13 12:22:50.948601+00	{"pk": 8, "email": "authentik-editor@localhost", "username": "authentik-editor"}	2024-03-12 12:22:50.94811+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+4bd7b207-ae32-4c25-9122-1aa0c86f429a	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"goauthentik.io/outpost/ldap": "true"}, "path": "/api/v3/flows/executor/ldap-authentication-flow/", "method": "GET", "user_agent": "goauthentik.io/outpost/2023.10.6"}, "auth_method_args": {}}	172.20.0.8	2024-01-11 22:11:15.836471+00	{"pk": 6, "email": "ldapservice@localhost", "username": "ldapservice"}	2025-01-10 22:11:15.832207+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
 6e9edd91-9db5-4c23-9bcf-66a796709859	system_task_exception	authentik.events.monitored_tasks	{"message": "Task clean_expired_models encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 451, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n                 ^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 207, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/_compat.py\\", line 57, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 202, in _inner\\n    return f(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 734, in __protected_call__\\n    return self.run(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/authentik/core/tasks.py\\", line 38, in clean_expired_models\\n    for obj in objects:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 394, in __iter__\\n    self._fetch_all()\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 1867, in _fetch_all\\n    self._result_cache = list(self._iterable_class(self))\\n                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 87, in __iter__\\n    results = compiler.execute_sql(\\n              ^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/sql/compiler.py\\", line 1398, in execute_sql\\n    cursor.execute(sql, params)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/django/__init__.py\\", line 563, in execute\\n    return real_execute(self, sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 67, in execute\\n    return self._execute_with_wrappers(\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 80, in _execute_with_wrappers\\n    return executor(sql, params, many, context)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 84, in _execute\\n    with self.db.wrap_database_errors:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/utils.py\\", line 91, in __exit__\\n    raise dj_exc_value.with_traceback(traceback) from exc_value\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 89, in _execute\\n    return self.cursor.execute(sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django_prometheus/db/common.py\\", line 71, in execute\\n    return super().execute(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\ndjango.db.utils.ProgrammingError: column authentik_providers_oauth2_authorizationcode.is_open_id does not exist\\nLINE 1: ...ntik_providers_oauth2_authorizationcode\\".\\"nonce\\", \\"authentik...\\n                                                             ^\\n"}	\N	2023-03-13 12:27:00.034068+00	{}	2024-03-12 12:27:00.033459+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
 9cebce0e-a584-4b23-b496-b45994aa0097	system_task_exception	authentik.events.monitored_tasks	{"message": "Task clean_expired_models encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 451, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n                 ^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 207, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/_compat.py\\", line 57, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 202, in _inner\\n    return f(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 734, in __protected_call__\\n    return self.run(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/authentik/core/tasks.py\\", line 38, in clean_expired_models\\n    for obj in objects:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 394, in __iter__\\n    self._fetch_all()\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 1867, in _fetch_all\\n    self._result_cache = list(self._iterable_class(self))\\n                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 87, in __iter__\\n    results = compiler.execute_sql(\\n              ^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/sql/compiler.py\\", line 1398, in execute_sql\\n    cursor.execute(sql, params)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/django/__init__.py\\", line 563, in execute\\n    return real_execute(self, sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 67, in execute\\n    return self._execute_with_wrappers(\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 80, in _execute_with_wrappers\\n    return executor(sql, params, many, context)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 84, in _execute\\n    with self.db.wrap_database_errors:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/utils.py\\", line 91, in __exit__\\n    raise dj_exc_value.with_traceback(traceback) from exc_value\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 89, in _execute\\n    return self.cursor.execute(sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django_prometheus/db/common.py\\", line 71, in execute\\n    return super().execute(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\ndjango.db.utils.ProgrammingError: column authentik_providers_oauth2_authorizationcode.is_open_id does not exist\\nLINE 1: ...ntik_providers_oauth2_authorizationcode\\".\\"nonce\\", \\"authentik...\\n                                                             ^\\n"}	\N	2023-03-13 12:32:00.030109+00	{}	2024-03-12 12:32:00.02958+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
 6d9f7727-b1eb-4886-8bd1-8813397af8f2	model_created	authentik.events.middleware	{"model": {"pk": 3, "app": "authentik_providers_oauth2", "name": "grafana-oidc", "model_name": "oauth2provider"}, "http_request": {"args": {}, "path": "/api/v3/providers/oauth2/", "method": "POST"}}	172.21.0.1	2023-03-13 12:32:49.967325+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2024-03-12 12:32:49.966976+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
@@ -2972,6 +3145,7 @@ c319f061-18ad-4abe-a39d-8d952a64c49f	model_created	authentik.events.middleware	{
 34fe3cf8-47fe-4a75-bf99-74885f47b69e	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"query": "goauthentik.io%2Foutpost%2Fldap=true"}, "path": "/api/v3/flows/executor/ldap-authentication-flow/", "method": "GET"}, "auth_method_args": {}}	172.21.0.1	2023-03-13 12:36:00.789499+00	{"pk": 6, "email": "ldapservice@localhost", "username": "ldapservice"}	2024-03-12 12:36:00.784286+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
 637bc09b-af2c-4e11-9e01-e131d553a69b	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"query": "next=%2Fapplication%2Fo%2Fauthorize%2F%3Fclient_id%3D43e8d2746fe2e508325a23cdf816d6ddd12e94f1%26redirect_uri%3Dhttp%253A%252F%252Flocalhost%253A3000%252Flogin%252Fgeneric_oauth%26response_type%3Dcode%26scope%3Dopenid%2Bemail%2Bprofile%26state%3DKhwpxm9LZ-bo7yjuyBvGuTCM2Gi4pSXwJk8hCRWup-s%253D"}, "path": "/api/v3/flows/executor/default-authentication-flow/", "method": "GET"}, "auth_method_args": {}}	172.21.0.1	2023-03-13 12:36:31.733073+00	{"pk": 8, "email": "authentik-editor@localhost", "username": "authentik-editor"}	2024-03-12 12:36:31.732702+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
 530a91a4-929a-4d8e-b2ed-8f26d4e36b0e	authorize_application	authentik.providers.oauth2.views.authorize	{"flow": "a7ef54bb79594559979d9345c022e086", "scopes": "openid email profile", "http_request": {"args": {"query": "client_id=43e8d2746fe2e508325a23cdf816d6ddd12e94f1&redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Flogin%2Fgeneric_oauth&response_type=code&scope=openid+email+profile&state=Khwpxm9LZ-bo7yjuyBvGuTCM2Gi4pSXwJk8hCRWup-s%3D"}, "path": "/api/v3/flows/executor/default-provider-authorization-implicit-consent/", "method": "GET"}, "authorized_application": {"pk": "d7dfa1d658cb4bfc94c538a2e507e290", "app": "authentik_core", "name": "Grafana OIDC", "model_name": "application"}}	172.21.0.1	2023-03-13 12:36:31.983378+00	{"pk": 8, "email": "authentik-editor@localhost", "username": "authentik-editor"}	2024-03-12 12:36:31.982723+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+cad2b7aa-cc81-4767-bba1-caa28a096461	model_updated	authentik.events.middleware	{"model": {"pk": 1, "app": "authentik_core", "name": "authentik Default Admin", "model_name": "user"}, "http_request": {"args": {"next": "/if/admin/#/administration/overview"}, "path": "/api/v3/flows/executor/default-authentication-flow/", "method": "POST", "user_agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"}}	10.89.0.4	2024-01-10 13:37:34.033723+00	{"pk": 2, "email": "", "username": "AnonymousUser"}	2025-01-09 13:37:34.032188+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
 993af708-fc75-4a06-864f-54fe56c6a753	system_task_exception	authentik.events.monitored_tasks	{"message": "Task clean_expired_models encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 451, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n                 ^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 207, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/_compat.py\\", line 57, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 202, in _inner\\n    return f(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 734, in __protected_call__\\n    return self.run(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/authentik/core/tasks.py\\", line 38, in clean_expired_models\\n    for obj in objects:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 394, in __iter__\\n    self._fetch_all()\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 1867, in _fetch_all\\n    self._result_cache = list(self._iterable_class(self))\\n                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 87, in __iter__\\n    results = compiler.execute_sql(\\n              ^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/sql/compiler.py\\", line 1398, in execute_sql\\n    cursor.execute(sql, params)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/django/__init__.py\\", line 563, in execute\\n    return real_execute(self, sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 67, in execute\\n    return self._execute_with_wrappers(\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 80, in _execute_with_wrappers\\n    return executor(sql, params, many, context)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 84, in _execute\\n    with self.db.wrap_database_errors:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/utils.py\\", line 91, in __exit__\\n    raise dj_exc_value.with_traceback(traceback) from exc_value\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 89, in _execute\\n    return self.cursor.execute(sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django_prometheus/db/common.py\\", line 71, in execute\\n    return super().execute(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\ndjango.db.utils.ProgrammingError: column authentik_providers_oauth2_authorizationcode.is_open_id does not exist\\nLINE 1: ...ntik_providers_oauth2_authorizationcode\\".\\"nonce\\", \\"authentik...\\n                                                             ^\\n"}	\N	2023-03-13 12:37:00.030818+00	{}	2024-03-12 12:37:00.030297+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
 61565f70-33eb-4563-a7a7-a31a963087ee	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"query": "goauthentik.io%2Foutpost%2Fldap=true"}, "path": "/api/v3/flows/executor/ldap-authentication-flow/", "method": "GET"}, "auth_method_args": {}}	172.21.0.1	2023-03-13 12:40:53.885265+00	{"pk": 6, "email": "ldapservice@localhost", "username": "ldapservice"}	2024-03-12 12:40:53.878318+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
 fd92f349-4b74-4387-8f10-56a833ef3c44	system_task_exception	authentik.events.monitored_tasks	{"message": "Task clean_expired_models encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 451, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n                 ^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 207, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/_compat.py\\", line 57, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 202, in _inner\\n    return f(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 734, in __protected_call__\\n    return self.run(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/authentik/core/tasks.py\\", line 38, in clean_expired_models\\n    for obj in objects:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 394, in __iter__\\n    self._fetch_all()\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 1867, in _fetch_all\\n    self._result_cache = list(self._iterable_class(self))\\n                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 87, in __iter__\\n    results = compiler.execute_sql(\\n              ^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/sql/compiler.py\\", line 1398, in execute_sql\\n    cursor.execute(sql, params)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/django/__init__.py\\", line 563, in execute\\n    return real_execute(self, sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 67, in execute\\n    return self._execute_with_wrappers(\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 80, in _execute_with_wrappers\\n    return executor(sql, params, many, context)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 84, in _execute\\n    with self.db.wrap_database_errors:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/utils.py\\", line 91, in __exit__\\n    raise dj_exc_value.with_traceback(traceback) from exc_value\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 89, in _execute\\n    return self.cursor.execute(sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django_prometheus/db/common.py\\", line 71, in execute\\n    return super().execute(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\ndjango.db.utils.ProgrammingError: column authentik_providers_oauth2_authorizationcode.is_open_id does not exist\\nLINE 1: ...ntik_providers_oauth2_authorizationcode\\".\\"nonce\\", \\"authentik...\\n                                                             ^\\n"}	\N	2023-03-13 12:42:00.041363+00	{}	2024-03-12 12:42:00.040909+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
@@ -3000,6 +3174,32 @@ f05f35f9-fbe7-4838-9728-284298dd4776	system_exception	authentik.root.celery	{"me
 04362a89-dae5-4023-a99a-541668da1e9e	system_exception	authentik.root.celery	{"message": "Traceback (most recent call last):\\ndjango.db.utils.InterfaceError: connection already closed"}	\N	2023-03-13 13:55:02.882399+00	{}	2024-03-12 13:55:02.882148+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
 a934eccb-bc35-45d4-8e2a-87eaca050a30	system_exception	authentik.root.celery	{"message": "Traceback (most recent call last):\\ndjango.db.utils.InterfaceError: connection already closed"}	\N	2023-03-13 13:55:02.900363+00	{}	2024-03-12 13:55:02.900026+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
 7dc1bd11-f563-45a3-aa35-71e7699619cc	system_exception	authentik.root.celery	{"message": "Traceback (most recent call last):\\ndjango.db.utils.InterfaceError: connection already closed"}	\N	2023-03-13 13:55:05.125416+00	{}	2024-03-12 13:55:05.124542+00	t	{"pk": "8ec6ecbff1624757a9c8360797195029", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
+18adc05a-2cc7-45eb-9771-8fdbb2e3f329	system_task_exception	authentik.events.monitored_tasks	{"message": "Task blueprints_discovery encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 477, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n                 ^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 275, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/_compat.py\\", line 60, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 270, in _inner\\n    return f(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 760, in __protected_call__\\n    return self.run(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/authentik/blueprints/v1/tasks.py\\", line 145, in blueprints_discovery\\n    check_blueprint_v1_file(blueprint)\\n  File \\"/authentik/blueprints/v1/tasks.py\\", line 173, in check_blueprint_v1_file\\n    instance.save()\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/base.py\\", line 814, in save\\n    self.save_base(\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/base.py\\", line 877, in save_base\\n    updated = self._save_table(\\n              ^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/base.py\\", line 1020, in _save_table\\n    results = self._do_insert(\\n              ^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/base.py\\", line 1061, in _do_insert\\n    return manager._insert(\\n           ^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/manager.py\\", line 87, in manager_method\\n    return getattr(self.get_queryset(), name)(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 1805, in _insert\\n    return query.get_compiler(using=using).execute_sql(returning_fields)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/sql/compiler.py\\", line 1822, in execute_sql\\n    cursor.execute(sql, params)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/django/__init__.py\\", line 616, in execute\\n    return real_execute(self, sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 67, in execute\\n    return self._execute_with_wrappers(\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 80, in _execute_with_wrappers\\n    return executor(sql, params, many, context)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 84, in _execute\\n    with self.db.wrap_database_errors:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/utils.py\\", line 91, in __exit__\\n    raise dj_exc_value.with_traceback(traceback) from exc_value\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 89, in _execute\\n    return self.cursor.execute(sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django_prometheus/db/common.py\\", line 69, in execute\\n    return super().execute(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/psycopg/cursor.py\\", line 737, in execute\\n    raise ex.with_traceback(None)\\ndjango.db.utils.IntegrityError: duplicate key value violates unique constraint \\"authentik_blueprints_blueprintinstance_name_404be626_uniq\\"\\nDETAIL:  Key (name)=(Default - Tenant) already exists."}	\N	2024-01-10 13:34:47.947721+00	{}	2025-01-09 13:34:47.947069+00	t	{"pk": "9a0465281f674272822bef895fae1b75", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
+359e7883-75a9-4840-a51a-37e75a921b8b	system_task_exception	authentik.events.monitored_tasks	{"message": "Task blueprints_discovery encountered an error: Traceback (most recent call last):\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 477, in trace_task\\n    R = retval = fun(*args, **kwargs)\\n                 ^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 275, in _inner\\n    reraise(*exc_info)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/_compat.py\\", line 60, in reraise\\n    raise value\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/celery.py\\", line 270, in _inner\\n    return f(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/celery/app/trace.py\\", line 760, in __protected_call__\\n    return self.run(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/authentik/blueprints/v1/tasks.py\\", line 145, in blueprints_discovery\\n    check_blueprint_v1_file(blueprint)\\n  File \\"/authentik/blueprints/v1/tasks.py\\", line 173, in check_blueprint_v1_file\\n    instance.save()\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/base.py\\", line 814, in save\\n    self.save_base(\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/base.py\\", line 877, in save_base\\n    updated = self._save_table(\\n              ^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/base.py\\", line 1020, in _save_table\\n    results = self._do_insert(\\n              ^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/base.py\\", line 1061, in _do_insert\\n    return manager._insert(\\n           ^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/manager.py\\", line 87, in manager_method\\n    return getattr(self.get_queryset(), name)(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/query.py\\", line 1805, in _insert\\n    return query.get_compiler(using=using).execute_sql(returning_fields)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/models/sql/compiler.py\\", line 1822, in execute_sql\\n    cursor.execute(sql, params)\\n  File \\"/usr/local/lib/python3.11/site-packages/sentry_sdk/integrations/django/__init__.py\\", line 616, in execute\\n    return real_execute(self, sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 67, in execute\\n    return self._execute_with_wrappers(\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 80, in _execute_with_wrappers\\n    return executor(sql, params, many, context)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 84, in _execute\\n    with self.db.wrap_database_errors:\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/utils.py\\", line 91, in __exit__\\n    raise dj_exc_value.with_traceback(traceback) from exc_value\\n  File \\"/usr/local/lib/python3.11/site-packages/django/db/backends/utils.py\\", line 89, in _execute\\n    return self.cursor.execute(sql, params)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/django_prometheus/db/common.py\\", line 69, in execute\\n    return super().execute(*args, **kwargs)\\n           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n  File \\"/usr/local/lib/python3.11/site-packages/psycopg/cursor.py\\", line 737, in execute\\n    raise ex.with_traceback(None)\\ndjango.db.utils.IntegrityError: duplicate key value violates unique constraint \\"authentik_blueprints_blueprintinstance_name_path_982f03b6_uniq\\"\\nDETAIL:  Key (name, path)=(Default - Source pre-authentication flow, default/flow-default-source-pre-authentication.yaml) already exists."}	\N	2024-01-10 13:34:48.686741+00	{}	2025-01-09 13:34:48.686124+00	t	{"pk": "9a0465281f674272822bef895fae1b75", "app": "authentik_tenants", "name": "Tenant fallback", "model_name": "tenant"}
+d1f42ba6-00e0-446b-b170-9b822c4df6d8	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"next": "/if/admin/#/administration/overview"}, "path": "/api/v3/flows/executor/default-authentication-flow/", "method": "GET", "user_agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"}, "auth_method_args": {}}	10.89.0.4	2024-01-10 13:37:34.122453+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2025-01-09 13:37:34.121905+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+f3afa096-3cea-422d-8bc7-0b2117edde32	model_updated	authentik.events.middleware	{"model": {"pk": 1, "app": "authentik_core", "name": "authentik Default Admin", "model_name": "user"}, "http_request": {"args": {"next": "/if/admin/#/administration/overview"}, "path": "/api/v3/flows/executor/default-authentication-flow/", "method": "GET", "user_agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"}}	10.89.0.4	2024-01-10 13:37:34.136251+00	{"pk": 2, "email": "", "username": "AnonymousUser"}	2025-01-09 13:37:34.135644+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+b5999b08-6c2a-4c7b-9356-263fd74f7b5c	model_deleted	authentik.events.middleware	{"model": {"pk": "f0a78f88adc247e682c1d49e9e159329", "app": "authentik_crypto", "name": "authentik Self-signed Certificate_2", "model_name": "certificatekeypair"}, "http_request": {"args": {}, "path": "/api/v3/crypto/certificatekeypairs/f0a78f88-adc2-47e6-82c1-d49e9e159329/", "method": "DELETE", "user_agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"}}	172.20.0.1	2024-01-11 22:06:53.231803+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2025-01-10 22:06:53.231151+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+8d921b9a-8cfe-4402-8949-7e73d53a931c	model_updated	authentik.events.middleware	{"model": {"pk": 6, "app": "authentik_core", "name": "ldapservice", "model_name": "user"}, "http_request": {"args": {"goauthentik.io/outpost/ldap": "true"}, "path": "/api/v3/flows/executor/ldap-authentication-flow/", "method": "GET", "user_agent": "goauthentik.io/outpost/2023.10.6"}}	172.20.0.8	2024-01-11 22:11:15.858579+00	{"pk": 2, "email": "", "username": "AnonymousUser"}	2025-01-10 22:11:15.85419+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+e6b62e94-cac4-4ab7-8cb1-d010fb1a1fd5	model_deleted	authentik.events.middleware	{"model": {"pk": "fd8c40c1e49148d1a26502ef85ea9a12", "app": "authentik_crypto", "name": "authentik Self-signed Certificate_3", "model_name": "certificatekeypair"}, "http_request": {"args": {}, "path": "/api/v3/crypto/certificatekeypairs/fd8c40c1-e491-48d1-a265-02ef85ea9a12/", "method": "DELETE", "user_agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"}}	172.20.0.1	2024-01-11 22:06:59.939328+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2025-01-10 22:06:59.936003+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+a1d710c2-239e-400e-bad7-c53d6b3eb7aa	model_deleted	authentik.events.middleware	{"model": {"pk": "6304c99590034fc49ba23d32016fb04e", "app": "authentik_crypto", "name": "authentik Self-signed Certificate-old", "model_name": "certificatekeypair"}, "http_request": {"args": {}, "path": "/api/v3/crypto/certificatekeypairs/6304c995-9003-4fc4-9ba2-3d32016fb04e/", "method": "DELETE", "user_agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"}}	172.20.0.1	2024-01-11 22:10:04.13061+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2025-01-10 22:10:04.130083+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+5504bc47-2819-442f-b589-fbcba17e325c	model_updated	authentik.events.middleware	{"model": {"pk": 8, "app": "authentik_core", "name": "authentik-editor", "model_name": "user"}, "http_request": {"args": {"next": "/application/o/authorize/?client_id=43e8d2746fe2e508325a23cdf816d6ddd12e94f1&redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Flogin%2Fgeneric_oauth&response_type=code&scope=openid+email+profile&state=BT8hDLepiB6WQKgDYSIbOMG4bN3mam2JhqoQCA08LxU%3D"}, "path": "/api/v3/flows/executor/default-authentication-flow/", "method": "POST", "user_agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"}}	172.20.0.1	2024-01-11 22:10:53.973197+00	{"pk": 2, "email": "", "username": "AnonymousUser"}	2025-01-10 22:10:53.971822+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+4305fdab-10dd-4d90-8f00-6ef86b4b2e2a	model_updated	authentik.events.middleware	{"model": {"pk": 5, "app": "authentik_core", "name": "authentik-admin", "model_name": "user"}, "http_request": {"args": {"goauthentik.io/outpost/ldap": "true"}, "path": "/api/v3/flows/executor/ldap-authentication-flow/", "method": "POST", "user_agent": "goauthentik.io/outpost/2023.10.6"}}	172.20.0.8	2024-01-11 22:11:16.787611+00	{"pk": 2, "email": "", "username": "AnonymousUser"}	2025-01-10 22:11:16.78303+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+47643d1d-1747-47c8-b588-8afb16426f56	model_updated	authentik.events.middleware	{"model": {"pk": "6304c99590034fc49ba23d32016fb04e", "app": "authentik_crypto", "name": "authentik Self-signed Certificate-old", "model_name": "certificatekeypair"}, "http_request": {"args": {}, "path": "/api/v3/crypto/certificatekeypairs/6304c995-9003-4fc4-9ba2-3d32016fb04e/", "method": "PATCH", "user_agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"}}	172.20.0.1	2024-01-11 22:07:21.528806+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2025-01-10 22:07:21.528218+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+114e2a99-98b7-45fd-9625-96d8805161f4	model_updated	authentik.events.middleware	{"model": {"pk": 7, "app": "authentik_core", "name": "authentik-viewer", "model_name": "user"}, "http_request": {"args": {"next": "/application/o/authorize/?client_id=43e8d2746fe2e508325a23cdf816d6ddd12e94f1&redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Flogin%2Fgeneric_oauth&response_type=code&scope=openid+email+profile&state=CgTPaX9JYavq4yJ5EWmgXQ9UEPhAp6TCumANg1b1jmw%3D"}, "path": "/api/v3/flows/executor/default-authentication-flow/", "method": "POST", "user_agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"}}	172.20.0.1	2024-01-11 22:10:27.787705+00	{"pk": 2, "email": "", "username": "AnonymousUser"}	2025-01-10 22:10:27.7848+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+edd940c9-a07b-402b-9a70-87e5c4c31f74	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"next": "/application/o/authorize/?client_id=43e8d2746fe2e508325a23cdf816d6ddd12e94f1&redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Flogin%2Fgeneric_oauth&response_type=code&scope=openid+email+profile&state=BT8hDLepiB6WQKgDYSIbOMG4bN3mam2JhqoQCA08LxU%3D"}, "path": "/api/v3/flows/executor/default-authentication-flow/", "method": "GET", "user_agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"}, "auth_method_args": {}}	172.20.0.1	2024-01-11 22:10:54.076153+00	{"pk": 8, "email": "authentik-editor@localhost", "username": "authentik-editor"}	2025-01-10 22:10:54.075325+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+95d31a52-acd7-48d6-afb9-ff48c48aef43	model_updated	authentik.events.middleware	{"model": {"pk": 8, "app": "authentik_core", "name": "authentik-editor", "model_name": "user"}, "http_request": {"args": {"next": "/application/o/authorize/?client_id=43e8d2746fe2e508325a23cdf816d6ddd12e94f1&redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Flogin%2Fgeneric_oauth&response_type=code&scope=openid+email+profile&state=BT8hDLepiB6WQKgDYSIbOMG4bN3mam2JhqoQCA08LxU%3D"}, "path": "/api/v3/flows/executor/default-authentication-flow/", "method": "GET", "user_agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"}}	172.20.0.1	2024-01-11 22:10:54.08931+00	{"pk": 2, "email": "", "username": "AnonymousUser"}	2025-01-10 22:10:54.088632+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+6315b883-7b38-46cf-a91e-14ef04761a1b	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"goauthentik.io/outpost/ldap": "true"}, "path": "/api/v3/flows/executor/ldap-authentication-flow/", "method": "GET", "user_agent": "goauthentik.io/outpost/2023.10.6"}, "auth_method_args": {}}	172.20.0.8	2024-01-11 22:11:16.851466+00	{"pk": 5, "email": "authentik-admin@localhost", "username": "authentik-admin"}	2025-01-10 22:11:16.847575+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+5884597f-5ece-4a83-8171-d14b38f27227	model_updated	authentik.events.middleware	{"model": {"pk": 5, "app": "authentik_core", "name": "authentik-admin", "model_name": "user"}, "http_request": {"args": {"goauthentik.io/outpost/ldap": "true"}, "path": "/api/v3/flows/executor/ldap-authentication-flow/", "method": "GET", "user_agent": "goauthentik.io/outpost/2023.10.6"}}	172.20.0.8	2024-01-11 22:11:16.869188+00	{"pk": 2, "email": "", "username": "AnonymousUser"}	2025-01-10 22:11:16.865921+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+c3258783-f555-4fd6-acb7-6a0a5768b37c	model_created	authentik.events.middleware	{"model": {"pk": "3fcd5d6c3e4043bcb916c7cd3675d0f1", "app": "authentik_crypto", "name": "authentik Self-signed Certificate", "model_name": "certificatekeypair"}, "http_request": {"args": {}, "path": "/api/v3/crypto/certificatekeypairs/generate/", "method": "POST", "user_agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"}}	172.20.0.1	2024-01-11 22:07:32.558046+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2025-01-10 22:07:32.557502+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+e5080aed-28b1-4c28-ac1d-e663d7de0062	login	authentik.events.signals	{"auth_method": "password", "http_request": {"args": {"next": "/application/o/authorize/?client_id=43e8d2746fe2e508325a23cdf816d6ddd12e94f1&redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Flogin%2Fgeneric_oauth&response_type=code&scope=openid+email+profile&state=CgTPaX9JYavq4yJ5EWmgXQ9UEPhAp6TCumANg1b1jmw%3D"}, "path": "/api/v3/flows/executor/default-authentication-flow/", "method": "GET", "user_agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"}, "auth_method_args": {}}	172.20.0.1	2024-01-11 22:10:28.148148+00	{"pk": 7, "email": "authentik-viewer@localhost", "username": "authentik-viewer"}	2025-01-10 22:10:28.145662+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+46c5aafd-ad92-45ed-ba31-d8de54fbdf04	model_updated	authentik.events.middleware	{"model": {"pk": 7, "app": "authentik_core", "name": "authentik-viewer", "model_name": "user"}, "http_request": {"args": {"next": "/application/o/authorize/?client_id=43e8d2746fe2e508325a23cdf816d6ddd12e94f1&redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Flogin%2Fgeneric_oauth&response_type=code&scope=openid+email+profile&state=CgTPaX9JYavq4yJ5EWmgXQ9UEPhAp6TCumANg1b1jmw%3D"}, "path": "/api/v3/flows/executor/default-authentication-flow/", "method": "GET", "user_agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"}}	172.20.0.1	2024-01-11 22:10:28.20553+00	{"pk": 2, "email": "", "username": "AnonymousUser"}	2025-01-10 22:10:28.202421+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+cbbc715b-9c98-472c-be6f-5859f99f4156	authorize_application	authentik.providers.oauth2.views.authorize	{"flow": "a7ef54bb79594559979d9345c022e086", "scopes": "openid email profile", "http_request": {"args": {"scope": "openid email profile", "state": "BT8hDLepiB6WQKgDYSIbOMG4bN3mam2JhqoQCA08LxU=", "client_id": "43e8d2746fe2e508325a23cdf816d6ddd12e94f1", "redirect_uri": "http://localhost:3000/login/generic_oauth", "response_type": "code"}, "path": "/api/v3/flows/executor/default-provider-authorization-implicit-consent/", "method": "GET", "user_agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"}, "authorized_application": {"pk": "d7dfa1d658cb4bfc94c538a2e507e290", "app": "authentik_core", "name": "Grafana OIDC", "model_name": "application"}}	172.20.0.1	2024-01-11 22:10:54.310719+00	{"pk": 8, "email": "authentik-editor@localhost", "username": "authentik-editor"}	2025-01-10 22:10:54.310134+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+ebc788aa-027b-4d78-94bc-d87d6fc1cfe6	model_updated	authentik.events.middleware	{"model": {"pk": 3, "app": "authentik_providers_oauth2", "name": "grafana-oidc", "model_name": "oauth2provider"}, "http_request": {"args": {}, "path": "/api/v3/providers/oauth2/3/", "method": "PUT", "user_agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"}}	172.20.0.1	2024-01-11 22:08:00.123074+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2025-01-10 22:08:00.122462+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+161c7b5f-88fe-4930-9f0b-be5e4184a184	authorize_application	authentik.providers.oauth2.views.authorize	{"flow": "a7ef54bb79594559979d9345c022e086", "scopes": "openid email profile", "http_request": {"args": {"scope": "openid email profile", "state": "CgTPaX9JYavq4yJ5EWmgXQ9UEPhAp6TCumANg1b1jmw=", "client_id": "43e8d2746fe2e508325a23cdf816d6ddd12e94f1", "redirect_uri": "http://localhost:3000/login/generic_oauth", "response_type": "code"}, "path": "/api/v3/flows/executor/default-provider-authorization-implicit-consent/", "method": "GET", "user_agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"}, "authorized_application": {"pk": "d7dfa1d658cb4bfc94c538a2e507e290", "app": "authentik_core", "name": "Grafana OIDC", "model_name": "application"}}	172.20.0.1	2024-01-11 22:10:30.227099+00	{"pk": 7, "email": "authentik-viewer@localhost", "username": "authentik-viewer"}	2025-01-10 22:10:30.220684+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+f3cdd7de-c03d-49f4-be44-2e5d0d982faa	logout	authentik.events.signals	{"http_request": {"args": {}, "path": "/api/v3/flows/executor/default-invalidation-flow/", "method": "GET", "user_agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"}}	172.20.0.1	2024-01-11 22:11:00.005003+00	{"pk": 8, "email": "authentik-editor@localhost", "username": "authentik-editor"}	2025-01-10 22:11:00.004272+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+1b2835c2-f1ae-4c30-8b34-252a286b3ac9	model_updated	authentik.events.middleware	{"model": {"pk": 2, "app": "authentik_providers_saml", "name": "grafana-saml", "model_name": "samlprovider"}, "http_request": {"args": {}, "path": "/api/v3/providers/saml/2/", "method": "PUT", "user_agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"}}	172.20.0.1	2024-01-11 22:08:27.768122+00	{"pk": 1, "email": "admin@localhost", "username": "akadmin"}	2025-01-10 22:08:27.767604+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+302baacc-6574-4fc7-b476-a77456c33492	logout	authentik.events.signals	{"http_request": {"args": {}, "path": "/api/v3/flows/executor/default-invalidation-flow/", "method": "GET", "user_agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"}}	172.20.0.1	2024-01-11 22:10:36.768574+00	{"pk": 7, "email": "authentik-viewer@localhost", "username": "authentik-viewer"}	2025-01-10 22:10:36.768045+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
+2d580ab2-8337-4cbe-9700-dda14b3ea05f	model_updated	authentik.events.middleware	{"model": {"pk": 6, "app": "authentik_core", "name": "ldapservice", "model_name": "user"}, "http_request": {"args": {"goauthentik.io/outpost/ldap": "true"}, "path": "/api/v3/flows/executor/ldap-authentication-flow/", "method": "POST", "user_agent": "goauthentik.io/outpost/2023.10.6"}}	172.20.0.8	2024-01-11 22:11:15.749495+00	{"pk": 2, "email": "", "username": "AnonymousUser"}	2025-01-10 22:11:15.739789+00	t	{"pk": "1b45e4ae6c1b4ea89691df11c97baeef", "app": "authentik_tenants", "name": "Default tenant", "model_name": "tenant"}
 \.
 
 
@@ -3008,7 +3208,6 @@ a934eccb-bc35-45d4-8e2a-87eaca050a30	system_exception	authentik.root.celery	{"me
 --
 
 COPY public.authentik_events_notification (uuid, severity, body, created, seen, event_id, user_id) FROM stdin;
-b124e245-e4fc-457d-9171-329220ca358f	alert	Failed to verify signature	2023-01-02 16:20:28.230329+00	f	aa49c5e8-b508-4046-907e-cfdca67edf75	1
 \.
 
 
@@ -3060,20 +3259,20 @@ COPY public.authentik_events_notificationwebhookmapping (propertymapping_ptr_id)
 --
 
 COPY public.authentik_flows_flow (flow_uuid, name, slug, designation, policybindingmodel_ptr_id, title, background, compatibility_mode, layout, denied_action, authentication) FROM stdin;
-c6e83269-3b5e-4f2a-8014-f198578240c1	Welcome to authentik! Please select a username.	default-source-enrollment	enrollment	63e07f88-3fd7-4180-807f-470bb3209bac	Welcome to authentik! Please select a username.		f	stacked	message_continue	none
-7c801f5d-8952-4b95-9f6c-385af22e798d	default-oobe-setup	initial-setup	stage_configuration	db71b00d-8d55-4ce6-a1a4-8fa8be93e810	Welcome to authentik!		f	stacked	message_continue	none
-4ca3e92c-7f33-4d2f-bb5e-1efa4c6c902a	Welcome to authentik!	default-source-authentication	authentication	181928f0-b530-4858-bee9-376597ac63ed	Welcome to authentik!		f	stacked	message_continue	none
-4b14409d-da92-4b6c-91e8-bad06d0966c2	Change Password	default-password-change	stage_configuration	65c208d9-e145-4259-bb87-deecf97c3643	Change password		f	stacked	message_continue	none
-c4257191-cb7a-4120-9566-a38ba8a50248	Welcome to authentik!	default-authentication-flow	authentication	5be1e1aa-8051-417e-b03a-1a0e87cd8101	Welcome to authentik!		f	stacked	message_continue	none
-1d2dd494-c62d-438a-8d0b-f864084f883c	User settings	default-user-settings-flow	stage_configuration	71205979-10a2-41db-9e08-c05f1644f732	Update your info		f	stacked	message_continue	none
 87ca9599-5323-451c-8603-2f5bee7a0c12	ldap-authentication-flow	ldap-authentication-flow	authentication	105415a2-7753-4a7f-bdf5-ed9841420289	ldap-authentication-flow		f	stacked	message_continue	none
+4b14409d-da92-4b6c-91e8-bad06d0966c2	Change Password	default-password-change	stage_configuration	65c208d9-e145-4259-bb87-deecf97c3643	Change password		f	stacked	message_continue	require_authenticated
+c4257191-cb7a-4120-9566-a38ba8a50248	Welcome to authentik!	default-authentication-flow	authentication	5be1e1aa-8051-417e-b03a-1a0e87cd8101	Welcome to authentik!		f	stacked	message_continue	none
+2287d235-72aa-4d23-80a2-44278d7c7839	Logout	default-invalidation-flow	invalidation	7c8e66c0-7a12-42bd-901f-a88fcd742a5e	Default Invalidation Flow		f	stacked	message_continue	none
 35537410-5840-48ee-ba54-76f2a7d42617	default-authenticator-totp-setup	default-authenticator-totp-setup	stage_configuration	62e82cc0-d670-4f23-8d7b-14675757dd8c	Setup Two-Factor authentication		f	stacked	message_continue	require_authenticated
+1d2dd494-c62d-438a-8d0b-f864084f883c	User settings	default-user-settings-flow	stage_configuration	71205979-10a2-41db-9e08-c05f1644f732	Update your info		f	stacked	message_continue	require_authenticated
 0bcbad7c-01fc-4ed0-b3f1-a1671683d6b3	default-authenticator-static-setup	default-authenticator-static-setup	stage_configuration	c4f758ad-0e74-4b1a-a1bc-32ae3a370b69	Setup Static OTP Tokens		f	stacked	message_continue	require_authenticated
 611b3458-aadd-47c1-b37e-1940bc72ede7	default-authenticator-webauthn-setup	default-authenticator-webauthn-setup	stage_configuration	3d7a1eb4-72c2-44dd-bdf7-741750024ce2	Setup WebAuthn		f	stacked	message_continue	require_authenticated
 a7ef54bb-7959-4559-979d-9345c022e086	Authorize Application	default-provider-authorization-implicit-consent	authorization	cba52268-0d9a-40bd-ae7f-b723f5e05671	Redirecting to %(app)s		f	stacked	message_continue	require_authenticated
-3b01d5c4-0d46-4bfe-b37f-553a7b4d051c	Authorize Application	default-provider-authorization-explicit-consent	authorization	ab6b7aa3-82da-4972-9158-7b7fc70ab973	Redirecting to %(app)s		f	stacked	message_continue	require_authenticated
+4ca3e92c-7f33-4d2f-bb5e-1efa4c6c902a	Welcome to authentik!	default-source-authentication	authentication	181928f0-b530-4858-bee9-376597ac63ed	Welcome to authentik!		f	stacked	message_continue	require_unauthenticated
 7bd42149-dc52-445a-bd1e-4513c50d01dd	Pre-Authentication	default-source-pre-authentication	stage_configuration	081ce9e5-201f-48e9-af60-7c10076f0857	Pre-authentication		f	stacked	message_continue	none
-2287d235-72aa-4d23-80a2-44278d7c7839	Logout	default-invalidation-flow	invalidation	7c8e66c0-7a12-42bd-901f-a88fcd742a5e	Default Invalidation Flow		f	stacked	message_continue	none
+c6e83269-3b5e-4f2a-8014-f198578240c1	Welcome to authentik! Please select a username.	default-source-enrollment	enrollment	63e07f88-3fd7-4180-807f-470bb3209bac	Welcome to authentik! Please select a username.		f	stacked	message_continue	none
+7c801f5d-8952-4b95-9f6c-385af22e798d	default-oobe-setup	initial-setup	stage_configuration	db71b00d-8d55-4ce6-a1a4-8fa8be93e810	Welcome to authentik!		f	stacked	message_continue	require_superuser
+3b01d5c4-0d46-4bfe-b37f-553a7b4d051c	Authorize Application	default-provider-authorization-explicit-consent	authorization	ab6b7aa3-82da-4972-9158-7b7fc70ab973	Redirecting to %(app)s		f	stacked	message_continue	require_authenticated
 \.
 
 
@@ -3082,28 +3281,28 @@ a7ef54bb-7959-4559-979d-9345c022e086	Authorize Application	default-provider-auth
 --
 
 COPY public.authentik_flows_flowstagebinding (policybindingmodel_ptr_id, fsb_uuid, re_evaluate_policies, "order", target_id, stage_id, evaluate_on_plan, invalid_response_action) FROM stdin;
-88ddedff-15ef-4b45-86cf-0aebf0e55b25	bae6a178-c8fc-4041-b2f0-a1e44f83259f	f	0	4ca3e92c-7f33-4d2f-bb5e-1efa4c6c902a	2e18f37d-528d-4c12-b9ea-d7dbf67b56a7	t	retry
-6f6c5b88-ae7e-44ae-bdae-432893a9e4b6	534d4ed8-ca6e-4140-8a2b-77c546c67d07	t	0	c6e83269-3b5e-4f2a-8014-f198578240c1	89176b0f-7a9c-41eb-8897-6c532db04b96	t	retry
-417e795d-6832-40b6-b083-4462357471cb	9735981f-6ff9-4207-8093-47b15ba0b678	f	1	c6e83269-3b5e-4f2a-8014-f198578240c1	dfc93c1c-c398-4e8f-aa34-fdc21b6accfb	t	retry
+e4c83e8e-69f4-4993-a0c2-f99552fd76d0	585626b6-72d8-4f0f-9b4e-085d6a3c2ee0	f	10	87ca9599-5323-451c-8603-2f5bee7a0c12	f4abcb7d-5f92-4890-8760-afb9effda665	t	retry
+9fdfd009-537e-4b36-8cc8-98f62620f410	1e25b2d4-d52b-4f19-8b9e-65960d3a64a8	f	30	87ca9599-5323-451c-8603-2f5bee7a0c12	8a432e54-5bb4-4199-add9-53e198eca1dc	t	retry
+3cb69a8b-fd96-415c-95e6-f094934905d0	f7804829-283b-4e98-adc2-186ef7f2fc09	f	0	611b3458-aadd-47c1-b37e-1940bc72ede7	7dac33d8-ebb1-421c-b9d4-13aba2c28a3c	t	retry
 c0792518-ed7b-4d0f-a373-5f20c253de11	aa44b8e7-908e-466f-9e5b-467c8b380ed6	f	0	4b14409d-da92-4b6c-91e8-bad06d0966c2	366481d2-b22d-4993-9502-d367fb8ae7f1	t	retry
 dfabc06a-e2f8-401d-92c4-01e3185f7dc1	b695f5b6-73e4-4f4e-a25f-6eba4715ec1d	f	1	4b14409d-da92-4b6c-91e8-bad06d0966c2	e87982c6-2f31-4dc5-bdce-2f680601c023	t	retry
 7321fbe5-2c34-41b6-8682-6ab794e00096	dbcef3a3-9fd3-4392-87e6-7722de38c458	f	10	c4257191-cb7a-4120-9566-a38ba8a50248	44b8d668-3efe-4e44-aa7f-74849414f977	t	retry
-0a3c97a9-ac46-45cb-8718-a2984fff154a	cffd43dd-d238-4eda-8b40-31562f94b2b0	f	2	c6e83269-3b5e-4f2a-8014-f198578240c1	03fc4a51-f2e0-4844-b58b-b421ea235f34	t	retry
-b696e261-9362-4cbe-b864-eee1f3c04afe	b4a7322f-e68d-4512-a10d-69b95bceefec	f	20	c4257191-cb7a-4120-9566-a38ba8a50248	02b4a829-f9ab-45d0-adcc-11e3c165f1c4	t	retry
+b696e261-9362-4cbe-b864-eee1f3c04afe	b4a7322f-e68d-4512-a10d-69b95bceefec	t	20	c4257191-cb7a-4120-9566-a38ba8a50248	02b4a829-f9ab-45d0-adcc-11e3c165f1c4	t	retry
+4f206f06-1d5e-4725-8206-c58d48f5be6c	21bf872d-1b1b-44ee-a737-727e072d5680	f	0	35537410-5840-48ee-ba54-76f2a7d42617	0d0f2722-298b-4212-9307-640a205253bd	t	retry
 07e871ad-dc36-48ea-abf8-397cd2a612b7	60731f11-952f-4c2f-bd4c-f35310d51e84	f	30	c4257191-cb7a-4120-9566-a38ba8a50248	b461e46b-7c2f-4188-b4a7-7a4df1c2c142	t	retry
 cd0bdadb-3a40-458a-bced-d62f12dcb5aa	73c108f5-720c-46b6-922f-2aa1c9d6bf89	f	100	c4257191-cb7a-4120-9566-a38ba8a50248	58a4b17a-a21a-4c29-a3fd-6797bd7260cc	t	retry
+a67caf05-5165-441b-8e62-6f37fa9c2a0d	d8ab26bb-8bd3-4bc8-8e58-9179a5805d29	f	0	2287d235-72aa-4d23-80a2-44278d7c7839	6fce99da-2643-4784-928c-94c1b2a3ab16	t	retry
 1f1353d5-b69c-438e-822c-c13f75fdb18a	737c6465-10a1-4e8d-8fce-ab209f9b6d61	f	20	1d2dd494-c62d-438a-8d0b-f864084f883c	fa87ed01-29a6-457d-936d-4667077bba44	t	retry
 cd98a539-1b50-4d59-b4b9-4a66b98b20fe	5672aba5-f29a-412b-b0fe-15a7ab162ec8	f	100	1d2dd494-c62d-438a-8d0b-f864084f883c	9934f0fc-b4b4-44e0-a90d-7587844ac68b	t	retry
+303b1296-cc7f-4887-92fd-0ea0550fc6d4	6dbcdc89-8ac7-4159-8cda-529cabea5f58	f	0	0bcbad7c-01fc-4ed0-b3f1-a1671683d6b3	4c0a51c3-ed6a-40d6-8889-3a3e8ac13546	t	retry
+65398796-09e1-494b-af85-8bed8b491c62	2bd6d69e-1b08-4c42-bf8c-adaa4ca284ce	f	0	3b01d5c4-0d46-4bfe-b37f-553a7b4d051c	d9149797-1c7d-4b62-b193-2e745f9dbb9c	t	retry
+88ddedff-15ef-4b45-86cf-0aebf0e55b25	bae6a178-c8fc-4041-b2f0-a1e44f83259f	f	0	4ca3e92c-7f33-4d2f-bb5e-1efa4c6c902a	2e18f37d-528d-4c12-b9ea-d7dbf67b56a7	t	retry
+6f6c5b88-ae7e-44ae-bdae-432893a9e4b6	534d4ed8-ca6e-4140-8a2b-77c546c67d07	t	0	c6e83269-3b5e-4f2a-8014-f198578240c1	89176b0f-7a9c-41eb-8897-6c532db04b96	t	retry
+417e795d-6832-40b6-b083-4462357471cb	9735981f-6ff9-4207-8093-47b15ba0b678	f	1	c6e83269-3b5e-4f2a-8014-f198578240c1	dfc93c1c-c398-4e8f-aa34-fdc21b6accfb	t	retry
+0a3c97a9-ac46-45cb-8718-a2984fff154a	cffd43dd-d238-4eda-8b40-31562f94b2b0	f	2	c6e83269-3b5e-4f2a-8014-f198578240c1	03fc4a51-f2e0-4844-b58b-b421ea235f34	t	retry
 bc36ea75-31be-4dd6-b2cf-11f2e7ca7a33	744e08bc-bb8e-42f6-875a-bdf583d6a5e8	f	10	7c801f5d-8952-4b95-9f6c-385af22e798d	4b3bfdf2-31ed-4b1f-8de4-1752ef0ece92	t	retry
 563837f0-8633-46c5-8cd2-f744cb5f3591	aaa3e596-6bd8-4326-9ece-81f586cac391	t	20	7c801f5d-8952-4b95-9f6c-385af22e798d	e87982c6-2f31-4dc5-bdce-2f680601c023	f	retry
 49f5f048-9c0b-4d92-a103-e5eec6ab1ed2	dbd6f009-ee18-4461-8757-8bd99925792c	f	100	7c801f5d-8952-4b95-9f6c-385af22e798d	58a4b17a-a21a-4c29-a3fd-6797bd7260cc	t	retry
-e4c83e8e-69f4-4993-a0c2-f99552fd76d0	585626b6-72d8-4f0f-9b4e-085d6a3c2ee0	f	10	87ca9599-5323-451c-8603-2f5bee7a0c12	f4abcb7d-5f92-4890-8760-afb9effda665	t	retry
-9fdfd009-537e-4b36-8cc8-98f62620f410	1e25b2d4-d52b-4f19-8b9e-65960d3a64a8	f	30	87ca9599-5323-451c-8603-2f5bee7a0c12	8a432e54-5bb4-4199-add9-53e198eca1dc	t	retry
-a67caf05-5165-441b-8e62-6f37fa9c2a0d	d8ab26bb-8bd3-4bc8-8e58-9179a5805d29	f	0	2287d235-72aa-4d23-80a2-44278d7c7839	6fce99da-2643-4784-928c-94c1b2a3ab16	t	retry
-4f206f06-1d5e-4725-8206-c58d48f5be6c	21bf872d-1b1b-44ee-a737-727e072d5680	f	0	35537410-5840-48ee-ba54-76f2a7d42617	0d0f2722-298b-4212-9307-640a205253bd	t	retry
-303b1296-cc7f-4887-92fd-0ea0550fc6d4	6dbcdc89-8ac7-4159-8cda-529cabea5f58	f	0	0bcbad7c-01fc-4ed0-b3f1-a1671683d6b3	4c0a51c3-ed6a-40d6-8889-3a3e8ac13546	t	retry
-3cb69a8b-fd96-415c-95e6-f094934905d0	f7804829-283b-4e98-adc2-186ef7f2fc09	f	0	611b3458-aadd-47c1-b37e-1940bc72ede7	7dac33d8-ebb1-421c-b9d4-13aba2c28a3c	t	retry
-65398796-09e1-494b-af85-8bed8b491c62	2bd6d69e-1b08-4c42-bf8c-adaa4ca284ce	f	0	3b01d5c4-0d46-4bfe-b37f-553a7b4d051c	d9149797-1c7d-4b62-b193-2e745f9dbb9c	t	retry
 \.
 
 
@@ -3120,27 +3319,36 @@ COPY public.authentik_flows_flowtoken (token_ptr_id, _plan, flow_id) FROM stdin;
 --
 
 COPY public.authentik_flows_stage (stage_uuid, name) FROM stdin;
+95715d75-025b-4e5e-9d23-96826479906d	ldap-authentication-password
+8a432e54-5bb4-4199-add9-53e198eca1dc	ldap-authentication-login
+f4abcb7d-5f92-4890-8760-afb9effda665	ldap-identification-stage
+7dac33d8-ebb1-421c-b9d4-13aba2c28a3c	default-authenticator-webauthn-setup
 366481d2-b22d-4993-9502-d367fb8ae7f1	default-password-change-prompt
 02b4a829-f9ab-45d0-adcc-11e3c165f1c4	default-authentication-password
 b461e46b-7c2f-4188-b4a7-7a4df1c2c142	default-authentication-mfa-validation
 44b8d668-3efe-4e44-aa7f-74849414f977	default-authentication-identification
-58a4b17a-a21a-4c29-a3fd-6797bd7260cc	default-authentication-login
+6fce99da-2643-4784-928c-94c1b2a3ab16	default-invalidation-logout
+4c0a51c3-ed6a-40d6-8889-3a3e8ac13546	default-authenticator-static-setup
+9934f0fc-b4b4-44e0-a90d-7587844ac68b	default-user-settings-write
 fa87ed01-29a6-457d-936d-4667077bba44	default-user-settings
+0d0f2722-298b-4212-9307-640a205253bd	default-authenticator-totp-setup
+d9149797-1c7d-4b62-b193-2e745f9dbb9c	default-provider-authorization-consent
 2e18f37d-528d-4c12-b9ea-d7dbf67b56a7	default-source-authentication-login
 03fc4a51-f2e0-4844-b58b-b421ea235f34	default-source-enrollment-login
 89176b0f-7a9c-41eb-8897-6c532db04b96	default-source-enrollment-prompt
+dfc93c1c-c398-4e8f-aa34-fdc21b6accfb	default-source-enrollment-write
 4b3bfdf2-31ed-4b1f-8de4-1752ef0ece92	stage-default-oobe-password
-95715d75-025b-4e5e-9d23-96826479906d	ldap-authentication-password
-8a432e54-5bb4-4199-add9-53e198eca1dc	ldap-authentication-login
-f4abcb7d-5f92-4890-8760-afb9effda665	ldap-identification-stage
+58a4b17a-a21a-4c29-a3fd-6797bd7260cc	default-authentication-login
 e87982c6-2f31-4dc5-bdce-2f680601c023	default-password-change-write
-9934f0fc-b4b4-44e0-a90d-7587844ac68b	default-user-settings-write
-dfc93c1c-c398-4e8f-aa34-fdc21b6accfb	default-source-enrollment-write
-6fce99da-2643-4784-928c-94c1b2a3ab16	default-invalidation-logout
-0d0f2722-298b-4212-9307-640a205253bd	default-authenticator-totp-setup
-4c0a51c3-ed6a-40d6-8889-3a3e8ac13546	default-authenticator-static-setup
-7dac33d8-ebb1-421c-b9d4-13aba2c28a3c	default-authenticator-webauthn-setup
-d9149797-1c7d-4b62-b193-2e745f9dbb9c	default-provider-authorization-consent
+\.
+
+
+--
+-- Data for Name: authentik_install_id; Type: TABLE DATA; Schema: public; Owner: authentik
+--
+
+COPY public.authentik_install_id (id) FROM stdin;
+FA8GANUqMJwFg0drDlurF+ZQK2A6ohSjc4MGksUqN+A36yIA
 \.
 
 
@@ -3199,11 +3407,11 @@ COPY public.authentik_policies_dummy_dummypolicy (policy_ptr_id, result, wait_mi
 -- Data for Name: authentik_policies_event_matcher_eventmatcherpolicy; Type: TABLE DATA; Schema: public; Owner: authentik
 --
 
-COPY public.authentik_policies_event_matcher_eventmatcherpolicy (policy_ptr_id, action, client_ip, app) FROM stdin;
-70803949-828d-4c91-b717-71ad944e8e48	configuration_error		
-590a74ec-ff58-42b2-b9ba-1bc560c6724f	update_available		
-db70f174-c06b-4716-a063-67fc36823307	policy_exception		
-7168d9b3-2c2c-48d3-9c6f-7f5ea85e4408	property_mapping_exception		
+COPY public.authentik_policies_event_matcher_eventmatcherpolicy (policy_ptr_id, action, client_ip, app, model) FROM stdin;
+70803949-828d-4c91-b717-71ad944e8e48	configuration_error	\N	\N	\N
+590a74ec-ff58-42b2-b9ba-1bc560c6724f	update_available	\N	\N	\N
+db70f174-c06b-4716-a063-67fc36823307	policy_exception	\N	\N	\N
+7168d9b3-2c2c-48d3-9c6f-7f5ea85e4408	property_mapping_exception	\N	\N	\N
 \.
 
 
@@ -3220,12 +3428,14 @@ COPY public.authentik_policies_expiry_passwordexpirypolicy (policy_ptr_id, deny_
 --
 
 COPY public.authentik_policies_expression_expressionpolicy (policy_ptr_id, expression) FROM stdin;
-ac669155-b876-42a0-b998-7bfae5c3d11c	# Check if we''ve not been given a username by the external IdP\n# and trigger the enrollment flow\nreturn 'username' not in context.get('prompt_data', {})
-8721edd2-c6a9-42d8-bd81-c85d528ba9d8	# This policy ensures that this flow can only be used when the user\n# is in a SSO Flow (meaning they come from an external IdP)\nreturn ak_is_sso_flow
-515a8421-2f61-40ad-ab94-c9997612788b	from authentik.lib.config import CONFIG\nfrom authentik.core.models import (\n    USER_ATTRIBUTE_CHANGE_EMAIL,\n    USER_ATTRIBUTE_CHANGE_NAME,\n    USER_ATTRIBUTE_CHANGE_USERNAME\n)\nprompt_data = request.context.get("prompt_data")\n\nif not request.user.group_attributes(request.http_request).get(\n    USER_ATTRIBUTE_CHANGE_EMAIL, CONFIG.y_bool("default_user_change_email", True)\n):\n    if prompt_data.get("email") != request.user.email:\n        ak_message("Not allowed to change email address.")\n        return False\n\nif not request.user.group_attributes(request.http_request).get(\n    USER_ATTRIBUTE_CHANGE_NAME, CONFIG.y_bool("default_user_change_name", True)\n):\n    if prompt_data.get("name") != request.user.name:\n        ak_message("Not allowed to change name.")\n        return False\n\nif not request.user.group_attributes(request.http_request).get(\n    USER_ATTRIBUTE_CHANGE_USERNAME, CONFIG.y_bool("default_user_change_username", True)\n):\n    if prompt_data.get("username") != request.user.username:\n        ak_message("Not allowed to change username.")\n        return False\n\nreturn True
-d892bf8e-8fde-4851-95db-c8bf8b277fe8	# This policy ensures that this flow can only be used when the user\n# is in a SSO Flow (meaning they come from an external IdP)\nreturn ak_is_sso_flow
+9588cdbe-226b-4c5a-9547-3fe684ee8260	flow_plan = request.context.get("flow_plan")\nif not flow_plan:\n    return True\n# If the user does not have a backend attached to it, they haven't\n# been authenticated yet and we need the password stage\nreturn not hasattr(flow_plan.context.get("pending_user"), "backend")
+515a8421-2f61-40ad-ab94-c9997612788b	from authentik.lib.config import CONFIG\nfrom authentik.core.models import (\n    USER_ATTRIBUTE_CHANGE_EMAIL,\n    USER_ATTRIBUTE_CHANGE_NAME,\n    USER_ATTRIBUTE_CHANGE_USERNAME\n)\nprompt_data = request.context.get("prompt_data")\n\nif not request.user.group_attributes(request.http_request).get(\n    USER_ATTRIBUTE_CHANGE_EMAIL, CONFIG.get_bool("default_user_change_email", True)\n):\n    if prompt_data.get("email") != request.user.email:\n        ak_message("Not allowed to change email address.")\n        return False\n\nif not request.user.group_attributes(request.http_request).get(\n    USER_ATTRIBUTE_CHANGE_NAME, CONFIG.get_bool("default_user_change_name", True)\n):\n    if prompt_data.get("name") != request.user.name:\n        ak_message("Not allowed to change name.")\n        return False\n\nif not request.user.group_attributes(request.http_request).get(\n    USER_ATTRIBUTE_CHANGE_USERNAME, CONFIG.get_bool("default_user_change_username", True)\n):\n    if prompt_data.get("username") != request.user.username:\n        ak_message("Not allowed to change username.")\n        return False\n\nreturn True
 83952542-88c4-404d-b62f-ff22889a5047	# This policy sets the user for the currently running flow\n# by injecting "pending_user"\nakadmin = ak_user_by(username="akadmin")\ncontext["flow_plan"].context["pending_user"] = akadmin\nreturn True
 fd5bfceb-8270-41f7-abef-84a47841d0e8	# This policy ensures that the setup flow can only be\n# executed when the admin user doesn''t have a password set\nakadmin = ak_user_by(username="akadmin")\nreturn not akadmin.has_usable_password()
+fd3f6a6c-6623-489d-9d45-868df08c3b75	# This policy ensures that the setup flow can only be\n# used one time\nfrom authentik.flows.models import Flow, FlowAuthenticationRequirement\nFlow.objects.filter(slug="initial-setup").update(\n    authentication=FlowAuthenticationRequirement.REQUIRE_SUPERUSER,\n)\nreturn True
+d892bf8e-8fde-4851-95db-c8bf8b277fe8	# This policy ensures that this flow can only be used when the user\n# is in a SSO Flow (meaning they come from an external IdP)\nreturn ak_is_sso_flow
+ac669155-b876-42a0-b998-7bfae5c3d11c	# Check if we''ve not been given a username by the external IdP\n# and trigger the enrollment flow\nreturn 'username' not in context.get('prompt_data', {})
+8721edd2-c6a9-42d8-bd81-c85d528ba9d8	# This policy ensures that this flow can only be used when the user\n# is in a SSO Flow (meaning they come from an external IdP)\nreturn ak_is_sso_flow
 \.
 
 
@@ -3242,16 +3452,18 @@ COPY public.authentik_policies_password_passwordpolicy (policy_ptr_id, amount_up
 --
 
 COPY public.authentik_policies_policy (created, last_updated, policy_uuid, name, execution_logging) FROM stdin;
-2022-10-25 09:09:08.800329+00	2022-10-25 09:10:09.573205+00	d892bf8e-8fde-4851-95db-c8bf8b277fe8	default-source-authentication-if-sso	f
-2022-10-25 09:09:10.070001+00	2022-10-25 09:10:12.104261+00	ac669155-b876-42a0-b998-7bfae5c3d11c	default-source-enrollment-if-username	f
-2022-10-25 09:09:10.076908+00	2022-10-25 09:10:12.118457+00	8721edd2-c6a9-42d8-bd81-c85d528ba9d8	default-source-enrollment-if-sso	f
-2022-10-25 09:09:12.352255+00	2022-10-25 09:10:14.622156+00	70803949-828d-4c91-b717-71ad944e8e48	default-match-configuration-error	f
-2022-10-25 09:09:13.006949+00	2022-10-25 09:10:14.6496+00	590a74ec-ff58-42b2-b9ba-1bc560c6724f	default-match-update	f
-2022-10-25 09:09:13.724566+00	2022-10-25 09:10:14.67473+00	db70f174-c06b-4716-a063-67fc36823307	default-match-policy-exception	f
-2022-10-25 09:09:13.728881+00	2022-10-25 09:10:14.683346+00	7168d9b3-2c2c-48d3-9c6f-7f5ea85e4408	default-match-property-mapping-exception	f
-2022-10-25 09:09:28.773441+00	2022-10-25 09:10:16.553121+00	83952542-88c4-404d-b62f-ff22889a5047	default-oobe-prefill-user	f
-2022-10-25 09:09:28.779052+00	2022-10-25 09:10:16.560446+00	fd5bfceb-8270-41f7-abef-84a47841d0e8	default-oobe-password-usable	f
-2022-10-25 09:09:08.5634+00	2022-10-25 09:10:17.954438+00	515a8421-2f61-40ad-ab94-c9997612788b	default-user-settings-authorization	f
+2022-10-25 09:09:12.352255+00	2024-01-10 13:34:52.611461+00	70803949-828d-4c91-b717-71ad944e8e48	default-match-configuration-error	f
+2022-10-25 09:09:13.006949+00	2024-01-10 13:34:52.633986+00	590a74ec-ff58-42b2-b9ba-1bc560c6724f	default-match-update	f
+2022-10-25 09:09:13.724566+00	2024-01-10 13:34:52.656067+00	db70f174-c06b-4716-a063-67fc36823307	default-match-policy-exception	f
+2022-10-25 09:09:13.728881+00	2024-01-10 13:34:52.659921+00	7168d9b3-2c2c-48d3-9c6f-7f5ea85e4408	default-match-property-mapping-exception	f
+2024-01-10 13:34:53.197968+00	2024-01-10 13:34:54.279244+00	9588cdbe-226b-4c5a-9547-3fe684ee8260	default-authentication-flow-password-stage	f
+2022-10-25 09:09:08.5634+00	2024-01-10 13:34:54.427456+00	515a8421-2f61-40ad-ab94-c9997612788b	default-user-settings-authorization	f
+2022-10-25 09:09:10.076908+00	2024-01-10 13:36:28.483735+00	8721edd2-c6a9-42d8-bd81-c85d528ba9d8	default-source-enrollment-if-sso	f
+2022-10-25 09:09:28.773441+00	2024-01-10 13:36:28.635412+00	83952542-88c4-404d-b62f-ff22889a5047	default-oobe-prefill-user	f
+2022-10-25 09:09:28.779052+00	2024-01-10 13:36:28.638387+00	fd5bfceb-8270-41f7-abef-84a47841d0e8	default-oobe-password-usable	f
+2024-01-10 13:36:26.752962+00	2024-01-10 13:36:28.641341+00	fd3f6a6c-6623-489d-9d45-868df08c3b75	default-oobe-flow-set-authentication	f
+2022-10-25 09:09:08.800329+00	2024-01-10 13:36:28.419593+00	d892bf8e-8fde-4851-95db-c8bf8b277fe8	default-source-authentication-if-sso	f
+2022-10-25 09:09:10.070001+00	2024-01-10 13:36:28.480406+00	ac669155-b876-42a0-b998-7bfae5c3d11c	default-source-enrollment-if-username	f
 \.
 
 
@@ -3259,16 +3471,18 @@ COPY public.authentik_policies_policy (created, last_updated, policy_uuid, name,
 -- Data for Name: authentik_policies_policybinding; Type: TABLE DATA; Schema: public; Owner: authentik
 --
 
-COPY public.authentik_policies_policybinding (policy_binding_uuid, enabled, "order", policy_id, target_id, negate, timeout, group_id, user_id) FROM stdin;
-8bfc6195-0957-4be5-abb6-dcd9816a3c24	t	0	70803949-828d-4c91-b717-71ad944e8e48	1ed3e589-5391-4e46-a947-c764191091cd	f	30	\N	\N
-486d3ed0-3097-434c-8f22-da01f1938775	t	0	590a74ec-ff58-42b2-b9ba-1bc560c6724f	5d0ae86a-0f92-4329-a141-4df745aa532d	f	30	\N	\N
-c4525029-87a5-448a-bdf9-583b7c122fa5	t	0	db70f174-c06b-4716-a063-67fc36823307	2edcbba8-4015-494a-b14e-f86dfffcd52c	f	30	\N	\N
-36b5a264-eea9-4d7e-b11c-36be3efaf92e	t	1	7168d9b3-2c2c-48d3-9c6f-7f5ea85e4408	2edcbba8-4015-494a-b14e-f86dfffcd52c	f	30	\N	\N
-b69908c9-bcba-4cc8-a2e6-e7d2b8e71584	t	0	fd5bfceb-8270-41f7-abef-84a47841d0e8	db71b00d-8d55-4ce6-a1a4-8fa8be93e810	f	30	\N	\N
-0bf4412d-93f2-4e15-b747-f6b6a5c578bc	t	0	83952542-88c4-404d-b62f-ff22889a5047	563837f0-8633-46c5-8cd2-f744cb5f3591	f	30	\N	\N
-329669b7-205e-4ee0-a548-cd3376bd09ad	t	0	d892bf8e-8fde-4851-95db-c8bf8b277fe8	181928f0-b530-4858-bee9-376597ac63ed	f	30	\N	\N
-ffc7c71f-eba8-4535-bc55-1ab18fa165ef	t	0	8721edd2-c6a9-42d8-bd81-c85d528ba9d8	63e07f88-3fd7-4180-807f-470bb3209bac	f	30	\N	\N
-492fe6be-936e-4dc4-bca8-72a845fe3b08	t	0	ac669155-b876-42a0-b998-7bfae5c3d11c	6f6c5b88-ae7e-44ae-bdae-432893a9e4b6	f	30	\N	\N
+COPY public.authentik_policies_policybinding (policy_binding_uuid, enabled, "order", policy_id, target_id, negate, timeout, group_id, user_id, failure_result) FROM stdin;
+8bfc6195-0957-4be5-abb6-dcd9816a3c24	t	0	70803949-828d-4c91-b717-71ad944e8e48	1ed3e589-5391-4e46-a947-c764191091cd	f	30	\N	\N	f
+486d3ed0-3097-434c-8f22-da01f1938775	t	0	590a74ec-ff58-42b2-b9ba-1bc560c6724f	5d0ae86a-0f92-4329-a141-4df745aa532d	f	30	\N	\N	f
+c4525029-87a5-448a-bdf9-583b7c122fa5	t	0	db70f174-c06b-4716-a063-67fc36823307	2edcbba8-4015-494a-b14e-f86dfffcd52c	f	30	\N	\N	f
+36b5a264-eea9-4d7e-b11c-36be3efaf92e	t	1	7168d9b3-2c2c-48d3-9c6f-7f5ea85e4408	2edcbba8-4015-494a-b14e-f86dfffcd52c	f	30	\N	\N	f
+b5e045e7-4c90-4feb-8e4b-7604085119ad	t	10	9588cdbe-226b-4c5a-9547-3fe684ee8260	b696e261-9362-4cbe-b864-eee1f3c04afe	f	30	\N	\N	f
+ffc7c71f-eba8-4535-bc55-1ab18fa165ef	t	0	8721edd2-c6a9-42d8-bd81-c85d528ba9d8	63e07f88-3fd7-4180-807f-470bb3209bac	f	30	\N	\N	f
+492fe6be-936e-4dc4-bca8-72a845fe3b08	t	0	ac669155-b876-42a0-b998-7bfae5c3d11c	6f6c5b88-ae7e-44ae-bdae-432893a9e4b6	f	30	\N	\N	f
+b69908c9-bcba-4cc8-a2e6-e7d2b8e71584	t	0	fd5bfceb-8270-41f7-abef-84a47841d0e8	db71b00d-8d55-4ce6-a1a4-8fa8be93e810	f	30	\N	\N	f
+0bf4412d-93f2-4e15-b747-f6b6a5c578bc	t	0	83952542-88c4-404d-b62f-ff22889a5047	563837f0-8633-46c5-8cd2-f744cb5f3591	f	30	\N	\N	f
+8e567620-a250-4e98-b095-ffb0bef7af40	t	0	fd3f6a6c-6623-489d-9d45-868df08c3b75	49f5f048-9c0b-4d92-a103-e5eec6ab1ed2	f	30	\N	\N	f
+329669b7-205e-4ee0-a548-cd3376bd09ad	t	0	d892bf8e-8fde-4851-95db-c8bf8b277fe8	181928f0-b530-4858-bee9-376597ac63ed	f	30	\N	\N	f
 \.
 
 
@@ -3278,14 +3492,17 @@ ffc7c71f-eba8-4535-bc55-1ab18fa165ef	t	0	8721edd2-c6a9-42d8-bd81-c85d528ba9d8	63
 
 COPY public.authentik_policies_policybindingmodel (pbm_uuid, policy_engine_mode) FROM stdin;
 77d294b5-8a50-4d6d-8edd-5b15e5871826	any
+105415a2-7753-4a7f-bdf5-ed9841420289	any
+e4c83e8e-69f4-4993-a0c2-f99552fd76d0	any
+9fdfd009-537e-4b36-8cc8-98f62620f410	any
+506b1180-4069-4dda-9405-e185f355c34d	any
+0e32dc99-655c-42f4-aca4-f3f271e010fd	any
+d7dfa1d6-58cb-4bfc-94c5-38a2e507e290	any
+3d7a1eb4-72c2-44dd-bdf7-741750024ce2	any
+3cb69a8b-fd96-415c-95e6-f094934905d0	any
 1ed3e589-5391-4e46-a947-c764191091cd	any
 5d0ae86a-0f92-4329-a141-4df745aa532d	any
 2edcbba8-4015-494a-b14e-f86dfffcd52c	any
-db71b00d-8d55-4ce6-a1a4-8fa8be93e810	any
-bc36ea75-31be-4dd6-b2cf-11f2e7ca7a33	any
-563837f0-8633-46c5-8cd2-f744cb5f3591	any
-49f5f048-9c0b-4d92-a103-e5eec6ab1ed2	any
-65c208d9-e145-4259-bb87-deecf97c3643	any
 c0792518-ed7b-4d0f-a373-5f20c253de11	any
 dfabc06a-e2f8-401d-92c4-01e3185f7dc1	any
 5be1e1aa-8051-417e-b03a-1a0e87cd8101	any
@@ -3293,33 +3510,30 @@ dfabc06a-e2f8-401d-92c4-01e3185f7dc1	any
 b696e261-9362-4cbe-b864-eee1f3c04afe	any
 07e871ad-dc36-48ea-abf8-397cd2a612b7	any
 cd0bdadb-3a40-458a-bced-d62f12dcb5aa	any
+7c8e66c0-7a12-42bd-901f-a88fcd742a5e	any
+a67caf05-5165-441b-8e62-6f37fa9c2a0d	any
 71205979-10a2-41db-9e08-c05f1644f732	any
 1f1353d5-b69c-438e-822c-c13f75fdb18a	any
 cd98a539-1b50-4d59-b4b9-4a66b98b20fe	any
+c4f758ad-0e74-4b1a-a1bc-32ae3a370b69	any
+303b1296-cc7f-4887-92fd-0ea0550fc6d4	any
+62e82cc0-d670-4f23-8d7b-14675757dd8c	any
+4f206f06-1d5e-4725-8206-c58d48f5be6c	any
+65c208d9-e145-4259-bb87-deecf97c3643	any
+ab6b7aa3-82da-4972-9158-7b7fc70ab973	any
+65398796-09e1-494b-af85-8bed8b491c62	any
+cba52268-0d9a-40bd-ae7f-b723f5e05671	any
 181928f0-b530-4858-bee9-376597ac63ed	any
 88ddedff-15ef-4b45-86cf-0aebf0e55b25	any
+081ce9e5-201f-48e9-af60-7c10076f0857	any
 63e07f88-3fd7-4180-807f-470bb3209bac	any
 6f6c5b88-ae7e-44ae-bdae-432893a9e4b6	any
 417e795d-6832-40b6-b083-4462357471cb	any
 0a3c97a9-ac46-45cb-8718-a2984fff154a	any
-105415a2-7753-4a7f-bdf5-ed9841420289	any
-e4c83e8e-69f4-4993-a0c2-f99552fd76d0	any
-9fdfd009-537e-4b36-8cc8-98f62620f410	any
-506b1180-4069-4dda-9405-e185f355c34d	any
-0e32dc99-655c-42f4-aca4-f3f271e010fd	any
-7c8e66c0-7a12-42bd-901f-a88fcd742a5e	any
-a67caf05-5165-441b-8e62-6f37fa9c2a0d	any
-d7dfa1d6-58cb-4bfc-94c5-38a2e507e290	any
-62e82cc0-d670-4f23-8d7b-14675757dd8c	any
-4f206f06-1d5e-4725-8206-c58d48f5be6c	any
-c4f758ad-0e74-4b1a-a1bc-32ae3a370b69	any
-303b1296-cc7f-4887-92fd-0ea0550fc6d4	any
-3d7a1eb4-72c2-44dd-bdf7-741750024ce2	any
-3cb69a8b-fd96-415c-95e6-f094934905d0	any
-cba52268-0d9a-40bd-ae7f-b723f5e05671	any
-ab6b7aa3-82da-4972-9158-7b7fc70ab973	any
-65398796-09e1-494b-af85-8bed8b491c62	any
-081ce9e5-201f-48e9-af60-7c10076f0857	any
+db71b00d-8d55-4ce6-a1a4-8fa8be93e810	any
+bc36ea75-31be-4dd6-b2cf-11f2e7ca7a33	any
+563837f0-8633-46c5-8cd2-f744cb5f3591	any
+49f5f048-9c0b-4d92-a103-e5eec6ab1ed2	any
 \.
 
 
@@ -3327,18 +3541,12 @@ ab6b7aa3-82da-4972-9158-7b7fc70ab973	any
 -- Data for Name: authentik_policies_reputation_reputation; Type: TABLE DATA; Schema: public; Owner: authentik
 --
 
-COPY public.authentik_policies_reputation_reputation (reputation_uuid, identifier, ip, ip_geo_data, score, updated) FROM stdin;
-6fad70f3-701f-4811-a177-08a0f2f8706f	admin	192.168.32.1	{}	-1	2022-10-25 09:10:21.819657+00
-869cd538-3c10-477a-a152-e412430288c9	akadmin	192.168.32.1	{}	1	2022-10-25 09:10:21.829882+00
-d36ccca8-c986-4517-8110-761eac3d8be0	akadmin	192.168.48.1	{}	-2	2022-10-25 09:17:04.253267+00
-f433dfcb-3aa4-4d93-8abc-6fe2c4a77f77	ldapservice	192.168.48.1	{}	5	2022-10-25 09:53:31.155505+00
-2f00817d-e5f1-4e9d-bc4e-8210b2ca2258	authentik-admin	192.168.48.1	{}	1	2022-10-25 09:54:01.492491+00
-85999073-85b3-4f12-93b8-a98b770daa41	akadmin	172.24.0.1	{}	1	2023-01-02 14:16:56.149781+00
-0eb5ae80-8ca7-4431-bac6-2032e2e5ef97	authentik-admin	172.24.0.1	{}	1	2023-01-02 16:38:23.763498+00
-774c5225-53f8-4c7e-81f5-0c604fc2a68b	authentik-editor	172.21.0.1	{}	1	2023-03-13 09:22:01.579092+00
-11631826-9f70-42c7-91d1-dc7b9fee5522	ldapservice	172.21.0.1	{}	3	2023-03-13 09:21:07.539614+00
-706276b1-28cc-44db-8d47-e36acca22b2c	admin	172.21.0.1	{}	-1	2023-03-13 09:19:23.126928+00
-16d6956d-4d9c-429d-a135-91d5dca763e0	akadmin	172.21.0.1	{}	1	2023-03-13 09:20:07.469678+00
+COPY public.authentik_policies_reputation_reputation (reputation_uuid, identifier, ip, ip_geo_data, score, updated, expires, expiring) FROM stdin;
+12dd4686-a03a-4094-984a-7df6e32666e3	akadmin	172.20.0.1	{}	1	2024-01-11 22:06:44.922067+00	2024-01-12 22:06:44.921204+00	t
+c0783b41-a22c-4093-ab63-9038ad174bbb	authentik-viewer	172.20.0.1	{}	1	2024-01-11 22:10:28.507575+00	2024-01-12 22:10:28.498415+00	t
+318b3a5e-5b2f-4082-8b67-e1481d731d32	authentik-editor	172.20.0.1	{}	1	2024-01-11 22:10:54.126894+00	2024-01-12 22:10:54.126667+00	t
+72c0af40-7d86-4724-ac14-94e405580960	ldapservice	172.20.0.8	{}	1	2024-01-11 22:11:16.091562+00	2024-01-12 22:11:16.09075+00	t
+3d6a52ef-80aa-4774-a88f-67db06dd6933	authentik-admin	172.20.0.8	{}	1	2024-01-11 22:11:16.910702+00	2024-01-12 22:11:16.910258+00	t
 \.
 
 
@@ -3354,8 +3562,8 @@ COPY public.authentik_policies_reputation_reputationpolicy (policy_ptr_id, check
 -- Data for Name: authentik_providers_ldap_ldapprovider; Type: TABLE DATA; Schema: public; Owner: authentik
 --
 
-COPY public.authentik_providers_ldap_ldapprovider (provider_ptr_id, base_dn, search_group_id, certificate_id, tls_server_name, gid_start_number, uid_start_number, search_mode, bind_mode) FROM stdin;
-1	DC=ldap,DC=goauthentik,DC=io	a9c6327c-cfca-4d5b-a0af-421645e43c31	\N		4000	2000	direct	direct
+COPY public.authentik_providers_ldap_ldapprovider (provider_ptr_id, base_dn, search_group_id, certificate_id, tls_server_name, gid_start_number, uid_start_number, search_mode, bind_mode, mfa_support) FROM stdin;
+1	DC=ldap,DC=goauthentik,DC=io	a9c6327c-cfca-4d5b-a0af-421645e43c31	\N		4000	2000	direct	direct	t
 \.
 
 
@@ -3363,8 +3571,9 @@ COPY public.authentik_providers_ldap_ldapprovider (provider_ptr_id, base_dn, sea
 -- Data for Name: authentik_providers_oauth2_accesstoken; Type: TABLE DATA; Schema: public; Owner: authentik
 --
 
-COPY public.authentik_providers_oauth2_accesstoken (id, expires, expiring, revoked, _scope, token, _id_token, provider_id, user_id) FROM stdin;
-1	2023-03-13 12:41:32.048979+00	t	f	openid email profile	eyJhbGciOiJSUzI1NiIsImtpZCI6ImE1NmE2NjVjMGJhMTQ1MDdmY2Q0ZGU3NmZhZDdlYmNlIiwidHlwIjoiSldUIn0.eyJpc3MiOiJodHRwOi8vbG9jYWxob3N0OjkwMDAvYXBwbGljYXRpb24vby9ncmFmYW5hLW9pZGMvIiwic3ViIjoiN2YzODgwM2NmZDM4ODVkZDU3OGUxMDZiYTU4OTg1OWVlOTk3YjQyNjhlNjcyM2VlNWYwZDA1NWQxMTU2MzAwNSIsImF1ZCI6IjQzZThkMjc0NmZlMmU1MDgzMjVhMjNjZGY4MTZkNmRkZDEyZTk0ZjEiLCJleHAiOjE2Nzg3MTEyOTIsImlhdCI6MTY3ODcxMDk5MiwiYWNyIjoiZ29hdXRoZW50aWsuaW8vcHJvdmlkZXJzL29hdXRoMi9kZWZhdWx0IiwiZW1haWwiOiJhdXRoZW50aWstZWRpdG9yQGxvY2FsaG9zdCIsImVtYWlsX3ZlcmlmaWVkIjp0cnVlLCJuYW1lIjoiYXV0aGVudGlrLWVkaXRvciIsImdpdmVuX25hbWUiOiJhdXRoZW50aWstZWRpdG9yIiwiZmFtaWx5X25hbWUiOiIiLCJwcmVmZXJyZWRfdXNlcm5hbWUiOiJhdXRoZW50aWstZWRpdG9yIiwibmlja25hbWUiOiJhdXRoZW50aWstZWRpdG9yIiwiZ3JvdXBzIjpbImVkaXRvciIsImV4dHJhLWdyb3VwIl0sImF6cCI6IjQzZThkMjc0NmZlMmU1MDgzMjVhMjNjZGY4MTZkNmRkZDEyZTk0ZjEiLCJ1aWQiOiJXRkFwc1FpZ00wbGt1blZYazNCbVJTR3VhZXlPT0N5MjB6Q25ER3FBIn0.XMvIFaDw_xTJZYWiH76hZn-v9ClX9OU1zjRy7hCP6a3aPWcGkK7bVoLUvtG4EwZl5BlY7h2Ajut3mfWXbzGUJEwA0pXBb-cOgIEa9Mq_y9nQUH2kYs4Gfi9kyiU2CiCXQKtquIuoH5RjevPjaupICiZQ0PvLlT9mGR6QD6gAnVhK-PAObFOvy4_X6B0i8PM_nKTx8cr5KW4YwnORTc_VDcGia8iZICBb8ZzyBeHWUmXpDy5G4MoPDgyWWGQaURDEXZN_v-FH0sR3Iu2Mx_by4SkAIIYO-lFtlW51tbjPBItQdZQdXwzcsB_dKtrZXMFKwcyFSlvHStn5Hd3kyP7oR0EPlHCY1G3NA48i38IitpgokW8om8LLqtuYuv7HqbR0VsQOYNOSFw2y3SuUD4FYj966bYwiCF5HXWr6DDhpxYq1liRszwlM3DVfb1Mi5Cnopsqjn2vF2tCeEWJ3cTmiDQvV_MEovsBFerj89GxbnVbbWhNQ9qgr91tQNEFaSW61E7eXOKQfoU79JlCe6eMmNEEQ5YRK4gWfraeHwi_Fhmbtok_Lrhy-hv5hEq_mMN--3axi6_NVuL3JuRELuKBIpyU9y8LVSlcnvZnBhf_UfL1EQmv_u4-mROw06o96FxNNWaIBgUG3Qr9fVl01eI10Dgc8zVAlu-xLnvVwdVBuCpQ	{"iss": "http://localhost:9000/application/o/grafana-oidc/", "sub": "7f38803cfd3885dd578e106ba589859ee997b4268e6723ee5f0d055d11563005", "aud": "43e8d2746fe2e508325a23cdf816d6ddd12e94f1", "exp": 1678711292, "iat": 1678710992, "acr": "goauthentik.io/providers/oauth2/default", "email": "authentik-editor@localhost", "email_verified": true, "name": "authentik-editor", "given_name": "authentik-editor", "family_name": "", "preferred_username": "authentik-editor", "nickname": "authentik-editor", "groups": ["editor", "extra-group"]}	3	8
+COPY public.authentik_providers_oauth2_accesstoken (id, expires, expiring, revoked, _scope, token, _id_token, provider_id, user_id, auth_time, session_id) FROM stdin;
+2	2024-01-11 22:15:30.794629+00	t	f	openid email profile	eyJhbGciOiJSUzI1NiIsImtpZCI6IjRlM2MzZDFhYjJkMmU4Y2IyMTQyZGNmNDBhOTE4OTIyIiwidHlwIjoiSldUIn0.eyJpc3MiOiJodHRwOi8vc3VwcG9ydC5sYWI6OTAwMC9hcHBsaWNhdGlvbi9vL2dyYWZhbmEtb2lkYy8iLCJzdWIiOiI5ZmMxOTgyODQ0MmMzODg3MzE5YjY4ZDI0OTZjYWNiMjhlOTUwY2I2MTE3ODY3MjFkMDdkMWZiNTc5ZjM5MTk5IiwiYXVkIjoiNDNlOGQyNzQ2ZmUyZTUwODMyNWEyM2NkZjgxNmQ2ZGRkMTJlOTRmMSIsImV4cCI6MTcwNTAxMTMzMCwiaWF0IjoxNzA1MDExMDMwLCJhdXRoX3RpbWUiOjE3MDUwMTEwMjgsImFjciI6ImdvYXV0aGVudGlrLmlvL3Byb3ZpZGVycy9vYXV0aDIvZGVmYXVsdCIsImVtYWlsIjoiYXV0aGVudGlrLXZpZXdlckBsb2NhbGhvc3QiLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwibmFtZSI6ImF1dGhlbnRpay12aWV3ZXIiLCJnaXZlbl9uYW1lIjoiYXV0aGVudGlrLXZpZXdlciIsInByZWZlcnJlZF91c2VybmFtZSI6ImF1dGhlbnRpay12aWV3ZXIiLCJuaWNrbmFtZSI6ImF1dGhlbnRpay12aWV3ZXIiLCJncm91cHMiOlsidmlld2VyIl0sImF6cCI6IjQzZThkMjc0NmZlMmU1MDgzMjVhMjNjZGY4MTZkNmRkZDEyZTk0ZjEiLCJ1aWQiOiI3cGpvSVQwamxTZ1VXcHBKRkFXZ0pZem5ibDNjUWIyYU9VOWIwUGhBIn0.UtMubrWVhHvjwn6eRnIfTw08t_ay7HnKnilSKmmh9J7NE2mya7CWA8tQvwn2f70B6AvkAKOVbgxIcCmVfW7skixNQsK_aBONwanepBgPHqPXA7vS_9G18ITa5vLvgHKzWptGrMqa1PeJQzVbB4N_xXjYMF0iQPNgwZP9_Ikrod62QVuDylHFmQhr6wCiGEbcZ6WkkwZg2_j-O7ocVpOlcLlXOZkKV1eYkSMY21imk7PQE95AhEb1Zo4xdFCm7wckYpd_KtqkIcEvBwFotSQKkLfDECkdgMVCJbaP6HJUW3tIQ_vIAm0-B591SZcVCm4F6Jbe-edjfT-RIpHIlY9yAraei1k-HE3QwXKp7LzuOZSQq8TT1_x2F_U7ZePdk93gQ3BtomZ622eL24s2OfQKPYVFc80hNwAuk3LqFhMT4BeMtge33Hx46IXOJX-kOFU9I8jdIMPjfIdUJ53Ma-g8aSUdZqOP2SP6GJajWBMrMh-yyHy8D9nsUqZhWGNffwhcwa_ZDiMjrl9KBIMtdvW3IFwhVh9Ga2QQRGJsw_IN-s5tBz8neOcpQfs4y-bL2Ipb3GHMcr6vIhQvNE_Juf1lwOOL03K7Ofy4JVENIixF-hp7jGpSng-YV74eMtj3FqjafpCt-BkP7sus8bezVGDNomrQzDrp_NaKc1gqaqd2Ogk	{"iss": "http://support.lab:9000/application/o/grafana-oidc/", "sub": "9fc19828442c3887319b68d2496cacb28e950cb611786721d07d1fb579f39199", "aud": "43e8d2746fe2e508325a23cdf816d6ddd12e94f1", "exp": 1705011330, "iat": 1705011030, "auth_time": 1705011028, "acr": "goauthentik.io/providers/oauth2/default", "amr": null, "c_hash": null, "nonce": null, "at_hash": null, "claims": {"email": "authentik-viewer@localhost", "email_verified": true, "name": "authentik-viewer", "given_name": "authentik-viewer", "preferred_username": "authentik-viewer", "nickname": "authentik-viewer", "groups": ["viewer"]}}	3	7	2024-01-11 22:10:28.148148+00	0164b59fd260313483e48a466d2a652797f7e2683b98e357c4ae595e9249414e
+3	2024-01-11 22:15:54.393285+00	t	f	openid email profile	eyJhbGciOiJSUzI1NiIsImtpZCI6IjRlM2MzZDFhYjJkMmU4Y2IyMTQyZGNmNDBhOTE4OTIyIiwidHlwIjoiSldUIn0.eyJpc3MiOiJodHRwOi8vc3VwcG9ydC5sYWI6OTAwMC9hcHBsaWNhdGlvbi9vL2dyYWZhbmEtb2lkYy8iLCJzdWIiOiI3ZjM4ODAzY2ZkMzg4NWRkNTc4ZTEwNmJhNTg5ODU5ZWU5OTdiNDI2OGU2NzIzZWU1ZjBkMDU1ZDExNTYzMDA1IiwiYXVkIjoiNDNlOGQyNzQ2ZmUyZTUwODMyNWEyM2NkZjgxNmQ2ZGRkMTJlOTRmMSIsImV4cCI6MTcwNTAxMTM1NCwiaWF0IjoxNzA1MDExMDU0LCJhdXRoX3RpbWUiOjE3MDUwMTEwNTQsImFjciI6ImdvYXV0aGVudGlrLmlvL3Byb3ZpZGVycy9vYXV0aDIvZGVmYXVsdCIsImVtYWlsIjoiYXV0aGVudGlrLWVkaXRvckBsb2NhbGhvc3QiLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwibmFtZSI6ImF1dGhlbnRpay1lZGl0b3IiLCJnaXZlbl9uYW1lIjoiYXV0aGVudGlrLWVkaXRvciIsInByZWZlcnJlZF91c2VybmFtZSI6ImF1dGhlbnRpay1lZGl0b3IiLCJuaWNrbmFtZSI6ImF1dGhlbnRpay1lZGl0b3IiLCJncm91cHMiOlsiZWRpdG9yIiwiZXh0cmEtZ3JvdXAiXSwiYXpwIjoiNDNlOGQyNzQ2ZmUyZTUwODMyNWEyM2NkZjgxNmQ2ZGRkMTJlOTRmMSIsInVpZCI6Im12aE9YYTFISEk0TlVGdTlhcm9CVE9KSmh6RzQzUU1QS0JGa20xbTMifQ.azZ4QLiKWU05Gg4pGIVqKuPQE-cZwvLvM2kOlHqOGiIlPyro4h4R9WROd42plv9Onn7IGGsb8KNmfBehwX0tGR_0HTh046UBcv3AYU8HAJwGwLG2Bdz6L2Y7UloLhe-oRRvuAA_hd_CLV2YVeU_5539UAuJUIMd7WxFjBSE4jrEx0_KD8Ht8IjAlkuVpEprenLagmFz9XAsGCu-23xA7CoJeCMR9TXdLo_vP8uxQlntEoVPLomwLCdCkQxC3xo3evbiB-rjBj4pmjPXOMtrOsB5JdATKQarVNPcQE88IZ6K2kr7GuN102UOBequPEWwO_DtEC1nbXpFtTOwCrCmLkMDhz4bOxTsF0885piQxM7QkqozjhoSv1IxlHH6EPPCiwNdXmERrejNJ6yTjxXRr0zuJm2HYfEx3-2pue5b2uTjjWyh804S8Rh6Pxk1y7DbbifRV01QLMja2K8HX5mTKzRhDfHj5_i_3G1r57R2ybIzHwoVoKTL2gzSly5UJx3LhllxTByaBb_Edow7WXFy4qrTL6MeSYWZjDnajbQ2fbBH8gH1GmbABrr92SBNNhR_sj6lkytvVOIhLfcsukjjXx9-gOgNB4cpPuUXOvhCQhxEK5vnTKes8OhyBv2PBjPQgIPN_ke_QK3bZIMDqcAU8UFg8eVdfixNtrHtsqV9zy28	{"iss": "http://support.lab:9000/application/o/grafana-oidc/", "sub": "7f38803cfd3885dd578e106ba589859ee997b4268e6723ee5f0d055d11563005", "aud": "43e8d2746fe2e508325a23cdf816d6ddd12e94f1", "exp": 1705011354, "iat": 1705011054, "auth_time": 1705011054, "acr": "goauthentik.io/providers/oauth2/default", "amr": null, "c_hash": null, "nonce": null, "at_hash": null, "claims": {"email": "authentik-editor@localhost", "email_verified": true, "name": "authentik-editor", "given_name": "authentik-editor", "preferred_username": "authentik-editor", "nickname": "authentik-editor", "groups": ["editor", "extra-group"]}}	3	8	2024-01-11 22:10:54.076153+00	dcc4d376a787547e44300d834a6ca2a6c734d5beec7a995b55acc555207461dd
 \.
 
 
@@ -3372,7 +3581,7 @@ COPY public.authentik_providers_oauth2_accesstoken (id, expires, expiring, revok
 -- Data for Name: authentik_providers_oauth2_authorizationcode; Type: TABLE DATA; Schema: public; Owner: authentik
 --
 
-COPY public.authentik_providers_oauth2_authorizationcode (id, expires, expiring, _scope, code, nonce, code_challenge, code_challenge_method, provider_id, user_id, revoked) FROM stdin;
+COPY public.authentik_providers_oauth2_authorizationcode (id, expires, expiring, _scope, code, nonce, code_challenge, code_challenge_method, provider_id, user_id, revoked, auth_time, session_id) FROM stdin;
 \.
 
 
@@ -3389,7 +3598,7 @@ COPY public.authentik_providers_oauth2_devicetoken (id, expires, expiring, devic
 --
 
 COPY public.authentik_providers_oauth2_oauth2provider (provider_ptr_id, client_type, client_id, client_secret, redirect_uris, include_claims_in_id_token, refresh_token_validity, signing_key_id, sub_mode, issuer_mode, access_code_validity, access_token_validity) FROM stdin;
-3	confidential	43e8d2746fe2e508325a23cdf816d6ddd12e94f1	e50440f14a010fd69dfed85bc6c071653f22c73e2c6c8d7ba96a936937d92040936b7e5a4bcc1bf40d5cf1dc019b1db327a1a00e2183c53471fb7530d4a09d7e	.*	t	days=30	6304c995-9003-4fc4-9ba2-3d32016fb04e	hashed_user_id	per_provider	minutes=1	minutes=5
+3	confidential	43e8d2746fe2e508325a23cdf816d6ddd12e94f1	e50440f14a010fd69dfed85bc6c071653f22c73e2c6c8d7ba96a936937d92040936b7e5a4bcc1bf40d5cf1dc019b1db327a1a00e2183c53471fb7530d4a09d7e	.*	t	days=30	3fcd5d6c-3e40-43bc-b916-c7cd3675d0f1	hashed_user_id	per_provider	minutes=1	minutes=5
 \.
 
 
@@ -3405,8 +3614,9 @@ COPY public.authentik_providers_oauth2_oauth2provider_jwks_sources (id, oauth2pr
 -- Data for Name: authentik_providers_oauth2_refreshtoken; Type: TABLE DATA; Schema: public; Owner: authentik
 --
 
-COPY public.authentik_providers_oauth2_refreshtoken (id, expires, expiring, _scope, _id_token, provider_id, user_id, revoked, token) FROM stdin;
-1	2023-04-12 12:36:32.048979+00	t	openid email profile	{"iss": "http://localhost:9000/application/o/grafana-oidc/", "sub": "7f38803cfd3885dd578e106ba589859ee997b4268e6723ee5f0d055d11563005", "aud": "43e8d2746fe2e508325a23cdf816d6ddd12e94f1", "exp": 1681302992, "iat": 1678710992, "acr": "goauthentik.io/providers/oauth2/default", "at_hash": "sbPtd6pSOzPd1Tryh_o9_w", "email": "authentik-editor@localhost", "email_verified": true, "name": "authentik-editor", "given_name": "authentik-editor", "family_name": "", "preferred_username": "authentik-editor", "nickname": "authentik-editor", "groups": ["editor", "extra-group"]}	3	8	f	PyGk`BA`6ZVUI_]I/\\I`w&j@NyY~cP%>&a'TV1nz_^>2g[H1.d{f0+En=bVZ5I.y)YO9q{)^Fnf6KT09;5_s$oq="@Af/qi,/<gs9U):|5Z(|g;5XY"LF,1&@=R;L>r0
+COPY public.authentik_providers_oauth2_refreshtoken (id, expires, expiring, _scope, _id_token, provider_id, user_id, revoked, token, auth_time, session_id) FROM stdin;
+2	2024-02-10 22:10:30.794629+00	t	openid email profile	{"iss": "http://support.lab:9000/application/o/grafana-oidc/", "sub": "9fc19828442c3887319b68d2496cacb28e950cb611786721d07d1fb579f39199", "aud": "43e8d2746fe2e508325a23cdf816d6ddd12e94f1", "exp": 1707603030, "iat": 1705011031, "auth_time": 1705011028, "acr": "goauthentik.io/providers/oauth2/default", "amr": null, "c_hash": null, "nonce": null, "at_hash": "mGFSh_jKOLwb-sZBngObVw", "claims": {"email": "authentik-viewer@localhost", "email_verified": true, "name": "authentik-viewer", "given_name": "authentik-viewer", "preferred_username": "authentik-viewer", "nickname": "authentik-viewer", "groups": ["viewer"]}}	3	7	f	qEy5NMin86Yonih6sBtXgK4mFdzu4owN5DHXllqESCEGxaT96jsc2utPJrpvdbf5hlSf00Ffc3Uve6SAQtLh06P9Ycv3yBIzpTFvDi6bGcLXZPO8W9cYcfI7fsqHIXq3	2024-01-11 22:10:28.148148+00	0164b59fd260313483e48a466d2a652797f7e2683b98e357c4ae595e9249414e
+3	2024-02-10 22:10:54.393285+00	t	openid email profile	{"iss": "http://support.lab:9000/application/o/grafana-oidc/", "sub": "7f38803cfd3885dd578e106ba589859ee997b4268e6723ee5f0d055d11563005", "aud": "43e8d2746fe2e508325a23cdf816d6ddd12e94f1", "exp": 1707603054, "iat": 1705011054, "auth_time": 1705011054, "acr": "goauthentik.io/providers/oauth2/default", "amr": null, "c_hash": null, "nonce": null, "at_hash": "YdMhObdt58ReC4t7A_3USg", "claims": {"email": "authentik-editor@localhost", "email_verified": true, "name": "authentik-editor", "given_name": "authentik-editor", "preferred_username": "authentik-editor", "nickname": "authentik-editor", "groups": ["editor", "extra-group"]}}	3	8	f	QaLmuHsYcDVmmoJdfZlw2ZsI1iVypVy8sZOVt8V9RErRYWGKgAGSD56yYfrTQrLv2oseM0S2pmdR8w2fK4CIUwWKYZVimfyZpsMOteeQda7XgNLQXI9zEKooou4kRttM	2024-01-11 22:10:54.076153+00	dcc4d376a787547e44300d834a6ca2a6c734d5beec7a995b55acc555207461dd
 \.
 
 
@@ -3415,10 +3625,10 @@ COPY public.authentik_providers_oauth2_refreshtoken (id, expires, expiring, _sco
 --
 
 COPY public.authentik_providers_oauth2_scopemapping (propertymapping_ptr_id, scope_name, description) FROM stdin;
+d3406e7e-2c6d-4d72-acdd-dda5513b1396	ak_proxy	authentik Proxy - User information
 9c13a34a-6007-4846-8c28-11d6dbd235c7	openid	
 a4825145-a8d1-4fbf-b88c-70d8cc801a4a	email	Email address
 7446364c-faec-4cab-9191-beb2889d47b7	profile	General Profile Information
-d3406e7e-2c6d-4d72-acdd-dda5513b1396	ak_proxy	authentik Proxy - User information
 \.
 
 
@@ -3430,6 +3640,14 @@ COPY public.authentik_providers_proxy_proxyprovider (oauth2provider_ptr_id, inte
 \.
 
 
+--
+-- Data for Name: authentik_providers_radius_radiusprovider; Type: TABLE DATA; Schema: public; Owner: authentik
+--
+
+COPY public.authentik_providers_radius_radiusprovider (provider_ptr_id, shared_secret, client_networks, mfa_support) FROM stdin;
+\.
+
+
 --
 -- Data for Name: authentik_providers_saml_samlpropertymapping; Type: TABLE DATA; Schema: public; Owner: authentik
 --
@@ -3449,8 +3667,58 @@ c5d93ce6-8cda-42fa-9c19-3837ba67788a	http://schemas.xmlsoap.org/claims/Group	\N
 -- Data for Name: authentik_providers_saml_samlprovider; Type: TABLE DATA; Schema: public; Owner: authentik
 --
 
-COPY public.authentik_providers_saml_samlprovider (provider_ptr_id, acs_url, audience, issuer, assertion_valid_not_before, assertion_valid_not_on_or_after, session_valid_not_on_or_after, digest_algorithm, signature_algorithm, signing_kp_id, sp_binding, verification_kp_id, name_id_mapping_id) FROM stdin;
-2	http://localhost:3000/saml/acs		http://localhost:3000/saml/metadata	minutes=-5	minutes=5	minutes=86400	http://www.w3.org/2001/04/xmlenc#sha256	http://www.w3.org/2001/04/xmldsig-more#rsa-sha256	6304c995-9003-4fc4-9ba2-3d32016fb04e	post	\N	38ac59c3-e754-44e7-9790-5108a2cd027c
+COPY public.authentik_providers_saml_samlprovider (provider_ptr_id, acs_url, audience, issuer, assertion_valid_not_before, assertion_valid_not_on_or_after, session_valid_not_on_or_after, digest_algorithm, signature_algorithm, signing_kp_id, sp_binding, verification_kp_id, name_id_mapping_id, default_relay_state) FROM stdin;
+2	http://localhost:3000/saml/acs		http://localhost:3000/saml/metadata	minutes=-5	minutes=5	minutes=86400	http://www.w3.org/2001/04/xmlenc#sha256	http://www.w3.org/2001/04/xmldsig-more#rsa-sha256	3fcd5d6c-3e40-43bc-b916-c7cd3675d0f1	post	\N	38ac59c3-e754-44e7-9790-5108a2cd027c	
+\.
+
+
+--
+-- Data for Name: authentik_providers_scim_scimgroup; Type: TABLE DATA; Schema: public; Owner: authentik
+--
+
+COPY public.authentik_providers_scim_scimgroup (id, group_id, provider_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: authentik_providers_scim_scimmapping; Type: TABLE DATA; Schema: public; Owner: authentik
+--
+
+COPY public.authentik_providers_scim_scimmapping (propertymapping_ptr_id) FROM stdin;
+83a19cb8-acab-44e1-884f-a0a279ae4d2d
+252edb40-34ee-4f55-8ca4-4bf0a7fb445f
+\.
+
+
+--
+-- Data for Name: authentik_providers_scim_scimprovider; Type: TABLE DATA; Schema: public; Owner: authentik
+--
+
+COPY public.authentik_providers_scim_scimprovider (provider_ptr_id, url, token, exclude_users_service_account, filter_group_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: authentik_providers_scim_scimprovider_property_mappings_group; Type: TABLE DATA; Schema: public; Owner: authentik
+--
+
+COPY public.authentik_providers_scim_scimprovider_property_mappings_group (id, scimprovider_id, propertymapping_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: authentik_providers_scim_scimuser; Type: TABLE DATA; Schema: public; Owner: authentik
+--
+
+COPY public.authentik_providers_scim_scimuser (id, provider_id, user_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: authentik_rbac_role; Type: TABLE DATA; Schema: public; Owner: authentik
+--
+
+COPY public.authentik_rbac_role (uuid, name, group_id) FROM stdin;
 \.
 
 
@@ -3459,6 +3727,7 @@ COPY public.authentik_providers_saml_samlprovider (provider_ptr_id, acs_url, aud
 --
 
 COPY public.authentik_sources_ldap_ldappropertymapping (propertymapping_ptr_id, object_field) FROM stdin;
+200af9d0-7476-43e1-a0fb-b7a7a68dd277	path
 353b9d65-66ce-4fea-814b-e12c6e45a277	name
 a58eb3a5-c68d-406d-a5ff-688a6a047575	email
 a75310af-c0cf-4709-a66c-963d8c27e662	username
@@ -3474,7 +3743,7 @@ e8809202-4ff0-4086-b078-196e6152e826	name
 -- Data for Name: authentik_sources_ldap_ldapsource; Type: TABLE DATA; Schema: public; Owner: authentik
 --
 
-COPY public.authentik_sources_ldap_ldapsource (source_ptr_id, server_uri, bind_cn, bind_password, start_tls, base_dn, additional_user_dn, additional_group_dn, user_object_filter, group_object_filter, object_uniqueness_field, sync_groups, sync_parent_group_id, sync_users, sync_users_password, group_membership_field, peer_certificate_id) FROM stdin;
+COPY public.authentik_sources_ldap_ldapsource (source_ptr_id, server_uri, bind_cn, bind_password, start_tls, base_dn, additional_user_dn, additional_group_dn, user_object_filter, group_object_filter, object_uniqueness_field, sync_groups, sync_parent_group_id, sync_users, sync_users_password, group_membership_field, peer_certificate_id, client_certificate_id, sni) FROM stdin;
 \.
 
 
@@ -3522,7 +3791,7 @@ COPY public.authentik_sources_plex_plexsourceconnection (usersourceconnection_pt
 -- Data for Name: authentik_sources_saml_samlsource; Type: TABLE DATA; Schema: public; Owner: authentik
 --
 
-COPY public.authentik_sources_saml_samlsource (source_ptr_id, issuer, sso_url, slo_url, signing_kp_id, binding_type, temporary_user_delete_after, name_id_policy, allow_idp_initiated, digest_algorithm, signature_algorithm, pre_authentication_flow_id) FROM stdin;
+COPY public.authentik_sources_saml_samlsource (source_ptr_id, issuer, sso_url, slo_url, signing_kp_id, binding_type, temporary_user_delete_after, name_id_policy, allow_idp_initiated, digest_algorithm, signature_algorithm, pre_authentication_flow_id, verification_kp_id) FROM stdin;
 \.
 
 
@@ -3538,7 +3807,7 @@ COPY public.authentik_sources_saml_usersamlsourceconnection (usersourceconnectio
 -- Data for Name: authentik_stages_authenticator_duo_authenticatorduostage; Type: TABLE DATA; Schema: public; Owner: authentik
 --
 
-COPY public.authentik_stages_authenticator_duo_authenticatorduostage (stage_ptr_id, client_id, client_secret, api_hostname, configure_flow_id, admin_integration_key, admin_secret_key) FROM stdin;
+COPY public.authentik_stages_authenticator_duo_authenticatorduostage (stage_ptr_id, client_id, client_secret, api_hostname, configure_flow_id, admin_integration_key, admin_secret_key, friendly_name) FROM stdin;
 \.
 
 
@@ -3554,7 +3823,7 @@ COPY public.authentik_stages_authenticator_duo_duodevice (id, name, confirmed, d
 -- Data for Name: authentik_stages_authenticator_sms_authenticatorsmsstage; Type: TABLE DATA; Schema: public; Owner: authentik
 --
 
-COPY public.authentik_stages_authenticator_sms_authenticatorsmsstage (stage_ptr_id, provider, account_sid, auth, configure_flow_id, from_number, auth_password, auth_type, verify_only, mapping_id) FROM stdin;
+COPY public.authentik_stages_authenticator_sms_authenticatorsmsstage (stage_ptr_id, provider, account_sid, auth, configure_flow_id, from_number, auth_password, auth_type, verify_only, mapping_id, friendly_name) FROM stdin;
 \.
 
 
@@ -3570,8 +3839,24 @@ COPY public.authentik_stages_authenticator_sms_smsdevice (id, name, confirmed, t
 -- Data for Name: authentik_stages_authenticator_static_authenticatorstaticstage; Type: TABLE DATA; Schema: public; Owner: authentik
 --
 
-COPY public.authentik_stages_authenticator_static_authenticatorstaticstage (stage_ptr_id, token_count, configure_flow_id) FROM stdin;
-4c0a51c3-ed6a-40d6-8889-3a3e8ac13546	6	0bcbad7c-01fc-4ed0-b3f1-a1671683d6b3
+COPY public.authentik_stages_authenticator_static_authenticatorstaticstage (stage_ptr_id, token_count, configure_flow_id, friendly_name, token_length) FROM stdin;
+4c0a51c3-ed6a-40d6-8889-3a3e8ac13546	6	0bcbad7c-01fc-4ed0-b3f1-a1671683d6b3	\N	12
+\.
+
+
+--
+-- Data for Name: authentik_stages_authenticator_static_staticdevice; Type: TABLE DATA; Schema: public; Owner: authentik
+--
+
+COPY public.authentik_stages_authenticator_static_staticdevice (id, name, confirmed, user_id, throttling_failure_count, throttling_failure_timestamp) FROM stdin;
+\.
+
+
+--
+-- Data for Name: authentik_stages_authenticator_static_statictoken; Type: TABLE DATA; Schema: public; Owner: authentik
+--
+
+COPY public.authentik_stages_authenticator_static_statictoken (id, token, device_id) FROM stdin;
 \.
 
 
@@ -3579,8 +3864,16 @@ COPY public.authentik_stages_authenticator_static_authenticatorstaticstage (stag
 -- Data for Name: authentik_stages_authenticator_totp_authenticatortotpstage; Type: TABLE DATA; Schema: public; Owner: authentik
 --
 
-COPY public.authentik_stages_authenticator_totp_authenticatortotpstage (stage_ptr_id, digits, configure_flow_id) FROM stdin;
-0d0f2722-298b-4212-9307-640a205253bd	6	35537410-5840-48ee-ba54-76f2a7d42617
+COPY public.authentik_stages_authenticator_totp_authenticatortotpstage (stage_ptr_id, digits, configure_flow_id, friendly_name) FROM stdin;
+0d0f2722-298b-4212-9307-640a205253bd	6	35537410-5840-48ee-ba54-76f2a7d42617	\N
+\.
+
+
+--
+-- Data for Name: authentik_stages_authenticator_totp_totpdevice; Type: TABLE DATA; Schema: public; Owner: authentik
+--
+
+COPY public.authentik_stages_authenticator_totp_totpdevice (id, name, confirmed, key, step, t0, digits, tolerance, drift, last_t, user_id, throttling_failure_count, throttling_failure_timestamp) FROM stdin;
 \.
 
 
@@ -3605,8 +3898,8 @@ b461e46b-7c2f-4188-b4a7-7a4df1c2c142	skip	{static,totp,webauthn,duo,sms}	seconds
 -- Data for Name: authentik_stages_authenticator_webauthn_authenticatewebauth4bbe; Type: TABLE DATA; Schema: public; Owner: authentik
 --
 
-COPY public.authentik_stages_authenticator_webauthn_authenticatewebauth4bbe (stage_ptr_id, configure_flow_id, user_verification, authenticator_attachment, resident_key_requirement) FROM stdin;
-7dac33d8-ebb1-421c-b9d4-13aba2c28a3c	611b3458-aadd-47c1-b37e-1940bc72ede7	preferred	\N	preferred
+COPY public.authentik_stages_authenticator_webauthn_authenticatewebauth4bbe (stage_ptr_id, configure_flow_id, user_verification, authenticator_attachment, resident_key_requirement, friendly_name) FROM stdin;
+7dac33d8-ebb1-421c-b9d4-13aba2c28a3c	611b3458-aadd-47c1-b37e-1940bc72ede7	preferred	\N	preferred	\N
 \.
 
 
@@ -3647,7 +3940,7 @@ COPY public.authentik_stages_consent_userconsent (id, expires, expiring, applica
 -- Data for Name: authentik_stages_deny_denystage; Type: TABLE DATA; Schema: public; Owner: authentik
 --
 
-COPY public.authentik_stages_deny_denystage (stage_ptr_id) FROM stdin;
+COPY public.authentik_stages_deny_denystage (stage_ptr_id, deny_message) FROM stdin;
 \.
 
 
@@ -3672,8 +3965,8 @@ COPY public.authentik_stages_email_emailstage (stage_ptr_id, host, port, usernam
 --
 
 COPY public.authentik_stages_identification_identificationstage (stage_ptr_id, user_fields, enrollment_flow_id, recovery_flow_id, case_insensitive_matching, show_matched_user, password_stage_id, show_source_labels, passwordless_flow_id) FROM stdin;
-44b8d668-3efe-4e44-aa7f-74849414f977	{email,username}	\N	\N	t	t	\N	f	\N
 f4abcb7d-5f92-4890-8760-afb9effda665	{username,email}	\N	\N	t	t	95715d75-025b-4e5e-9d23-96826479906d	f	\N
+44b8d668-3efe-4e44-aa7f-74849414f977	{email,username}	\N	\N	t	t	\N	f	\N
 \.
 
 
@@ -3707,8 +4000,8 @@ COPY public.authentik_stages_invitation_invitationstage (stage_ptr_id, continue_
 --
 
 COPY public.authentik_stages_password_passwordstage (stage_ptr_id, backends, configure_flow_id, failed_attempts_before_cancel) FROM stdin;
-02b4a829-f9ab-45d0-adcc-11e3c165f1c4	{authentik.core.auth.InbuiltBackend,authentik.sources.ldap.auth.LDAPBackend,authentik.core.auth.TokenBackend}	4b14409d-da92-4b6c-91e8-bad06d0966c2	5
 95715d75-025b-4e5e-9d23-96826479906d	{authentik.core.auth.InbuiltBackend,authentik.core.auth.TokenBackend,authentik.sources.ldap.auth.LDAPBackend}	4b14409d-da92-4b6c-91e8-bad06d0966c2	5
+02b4a829-f9ab-45d0-adcc-11e3c165f1c4	{authentik.core.auth.InbuiltBackend,authentik.sources.ldap.auth.LDAPBackend,authentik.core.auth.TokenBackend}	4b14409d-da92-4b6c-91e8-bad06d0966c2	5
 \.
 
 
@@ -3716,14 +4009,18 @@ COPY public.authentik_stages_password_passwordstage (stage_ptr_id, backends, con
 -- Data for Name: authentik_stages_prompt_prompt; Type: TABLE DATA; Schema: public; Owner: authentik
 --
 
-COPY public.authentik_stages_prompt_prompt (prompt_uuid, field_key, label, type, required, placeholder, "order", sub_text, placeholder_expression, name) FROM stdin;
-8cbc609d-e3f5-43e6-9134-078ac015b0e6	oobe-header-text	oobe-header-text	static	t	Welcome to authentik! Please set a password for the default admin user, akadmin.	100		f	oobe-header-text_stage-default-oobe-password
-75430f27-c76f-4a41-863a-ca2603ed855d	password	Password	password	t	Password	300		f	password_default-password-change-prompt
-c75f2e96-7892-43c0-94b8-815962250d00	password_repeat	Password (repeat)	password	t	Password (repeat)	301		f	password_repeat_default-password-change-prompt
-bb10dc15-c00c-4d51-9605-9f72be503eb3	username	Username	text	t	try:\n    return user.username\nexcept:\n    return ''	200		t	username_default-source-enrollment-prompt
-daf4b9e8-80df-4d6e-95be-bae1e4c6e9b9	name	Name	text	t	try:\n    return user.name\nexcept:\n    return ''	201		t	name_default-user-settings
-640c00a0-c1cf-437f-b3a0-4eaa689b11be	email	Email	email	t	try:\n    return user.email\nexcept:\n    return ''	202		t	email_default-user-settings
-a576e417-3082-451a-8311-4149d8362889	attributes.settings.locale	Locale	ak-locale	t	try:\n    return user.attributes.get("settings", {}).get("locale", "")\nexcept:\n    return ''	203		t	attributes.settings.locale_default-user-settings
+COPY public.authentik_stages_prompt_prompt (prompt_uuid, field_key, label, type, required, placeholder, "order", sub_text, placeholder_expression, name, initial_value, initial_value_expression) FROM stdin;
+53bf385b-f5b5-46b1-bae2-52fa7febccbd	username	Username	text	t	Username	200		f	default-user-settings-field-username	try:\n    return user.username\nexcept:\n    return ''	t
+67a03d10-9859-4252-a92b-6a95210cedf5	name	Name	text	t	Name	201		f	default-user-settings-field-name	try:\n    return user.name\nexcept:\n    return ''	t
+e28c6f05-63c5-490e-9270-6d3eaef00007	email	Email	email	t	Email	202		f	default-user-settings-field-email	try:\n    return user.email\nexcept:\n    return ''	t
+d5c18367-0f00-480a-9678-c5142ed2c11f	attributes.settings.locale	Locale	ak-locale	t	Locale	203		f	default-user-settings-field-locale	try:\n    return user.attributes.get("settings", {}).get("locale", "")\nexcept:\n    return ''	t
+5d802ff7-2a30-453f-a624-95f0fbc7bb5b	password	Password	password	t	Password	300		f	default-password-change-field-password		f
+456af4e0-d665-4cfd-9d26-95b003aa7b0c	password_repeat	Password (repeat)	password	t	Password (repeat)	301		f	default-password-change-field-password-repeat		f
+9342773a-b3f5-4f5a-9b76-91fff8fbbc21	username	Username	text	t	Username	100		f	default-source-enrollment-field-username		f
+84314c23-a6e1-42a1-80f4-064e029ca290	oobe-header-text	oobe-header-text	static	t	Welcome to authentik! Please set a password for the default admin user, akadmin.	100		f	initial-setup-field-header		f
+9f75ae41-6a0b-496b-8b0d-316b024317ea	email	Email	email	t	Admin email	101		f	initial-setup-field-email		f
+a59dd42c-bf08-4c14-9951-91dcc68cdd80	password	Password	password	t	Password	300		f	initial-setup-field-password		f
+7fbf7e70-a561-42fe-8b17-12603c8971b0	password_repeat	Password (repeat)	password	t	Password (repeat)	301		f	initial-setup-field-password-repeat		f
 \.
 
 
@@ -3744,17 +4041,17 @@ fa87ed01-29a6-457d-936d-4667077bba44
 --
 
 COPY public.authentik_stages_prompt_promptstage_fields (id, promptstage_id, prompt_id) FROM stdin;
-3	366481d2-b22d-4993-9502-d367fb8ae7f1	c75f2e96-7892-43c0-94b8-815962250d00
-4	366481d2-b22d-4993-9502-d367fb8ae7f1	75430f27-c76f-4a41-863a-ca2603ed855d
-10	fa87ed01-29a6-457d-936d-4667077bba44	640c00a0-c1cf-437f-b3a0-4eaa689b11be
-11	fa87ed01-29a6-457d-936d-4667077bba44	daf4b9e8-80df-4d6e-95be-bae1e4c6e9b9
-12	fa87ed01-29a6-457d-936d-4667077bba44	a576e417-3082-451a-8311-4149d8362889
-13	fa87ed01-29a6-457d-936d-4667077bba44	bb10dc15-c00c-4d51-9605-9f72be503eb3
-14	89176b0f-7a9c-41eb-8897-6c532db04b96	bb10dc15-c00c-4d51-9605-9f72be503eb3
-19	4b3bfdf2-31ed-4b1f-8de4-1752ef0ece92	c75f2e96-7892-43c0-94b8-815962250d00
-20	4b3bfdf2-31ed-4b1f-8de4-1752ef0ece92	640c00a0-c1cf-437f-b3a0-4eaa689b11be
-21	4b3bfdf2-31ed-4b1f-8de4-1752ef0ece92	8cbc609d-e3f5-43e6-9134-078ac015b0e6
-22	4b3bfdf2-31ed-4b1f-8de4-1752ef0ece92	75430f27-c76f-4a41-863a-ca2603ed855d
+45	366481d2-b22d-4993-9502-d367fb8ae7f1	456af4e0-d665-4cfd-9d26-95b003aa7b0c
+46	366481d2-b22d-4993-9502-d367fb8ae7f1	5d802ff7-2a30-453f-a624-95f0fbc7bb5b
+51	fa87ed01-29a6-457d-936d-4667077bba44	d5c18367-0f00-480a-9678-c5142ed2c11f
+52	fa87ed01-29a6-457d-936d-4667077bba44	e28c6f05-63c5-490e-9270-6d3eaef00007
+53	fa87ed01-29a6-457d-936d-4667077bba44	67a03d10-9859-4252-a92b-6a95210cedf5
+54	fa87ed01-29a6-457d-936d-4667077bba44	53bf385b-f5b5-46b1-bae2-52fa7febccbd
+56	89176b0f-7a9c-41eb-8897-6c532db04b96	9342773a-b3f5-4f5a-9b76-91fff8fbbc21
+65	4b3bfdf2-31ed-4b1f-8de4-1752ef0ece92	a59dd42c-bf08-4c14-9951-91dcc68cdd80
+66	4b3bfdf2-31ed-4b1f-8de4-1752ef0ece92	7fbf7e70-a561-42fe-8b17-12603c8971b0
+67	4b3bfdf2-31ed-4b1f-8de4-1752ef0ece92	84314c23-a6e1-42a1-80f4-064e029ca290
+68	4b3bfdf2-31ed-4b1f-8de4-1752ef0ece92	9f75ae41-6a0b-496b-8b0d-316b024317ea
 \.
 
 
@@ -3779,11 +4076,11 @@ COPY public.authentik_stages_user_delete_userdeletestage (stage_ptr_id) FROM std
 -- Data for Name: authentik_stages_user_login_userloginstage; Type: TABLE DATA; Schema: public; Owner: authentik
 --
 
-COPY public.authentik_stages_user_login_userloginstage (stage_ptr_id, session_duration) FROM stdin;
-2e18f37d-528d-4c12-b9ea-d7dbf67b56a7	seconds=0
-03fc4a51-f2e0-4844-b58b-b421ea235f34	seconds=0
-58a4b17a-a21a-4c29-a3fd-6797bd7260cc	seconds=0
-8a432e54-5bb4-4199-add9-53e198eca1dc	seconds=0
+COPY public.authentik_stages_user_login_userloginstage (stage_ptr_id, session_duration, terminate_other_sessions, remember_me_offset) FROM stdin;
+8a432e54-5bb4-4199-add9-53e198eca1dc	seconds=0	f	seconds=0
+2e18f37d-528d-4c12-b9ea-d7dbf67b56a7	seconds=0	f	seconds=0
+03fc4a51-f2e0-4844-b58b-b421ea235f34	seconds=0	f	seconds=0
+58a4b17a-a21a-4c29-a3fd-6797bd7260cc	seconds=0	f	seconds=0
 \.
 
 
@@ -3800,10 +4097,10 @@ COPY public.authentik_stages_user_logout_userlogoutstage (stage_ptr_id) FROM std
 -- Data for Name: authentik_stages_user_write_userwritestage; Type: TABLE DATA; Schema: public; Owner: authentik
 --
 
-COPY public.authentik_stages_user_write_userwritestage (stage_ptr_id, create_users_as_inactive, create_users_group_id, user_path_template, user_creation_mode) FROM stdin;
-e87982c6-2f31-4dc5-bdce-2f680601c023	f	\N		create_when_required
-9934f0fc-b4b4-44e0-a90d-7587844ac68b	f	\N		create_when_required
-dfc93c1c-c398-4e8f-aa34-fdc21b6accfb	f	\N		create_when_required
+COPY public.authentik_stages_user_write_userwritestage (stage_ptr_id, create_users_as_inactive, create_users_group_id, user_path_template, user_creation_mode, user_type) FROM stdin;
+9934f0fc-b4b4-44e0-a90d-7587844ac68b	f	\N		never_create	external
+dfc93c1c-c398-4e8f-aa34-fdc21b6accfb	f	\N		always_create	external
+e87982c6-2f31-4dc5-bdce-2f680601c023	f	\N		never_create	external
 \.
 
 
@@ -3909,6 +4206,18 @@ COPY public.django_content_type (id, app_label, model) FROM stdin;
 86	authentik_core	application
 87	authentik_core	authenticatedsession
 88	authentik_providers_oauth2	accesstoken
+89	authentik_providers_radius	radiusprovider
+90	authentik_providers_scim	scimmapping
+91	authentik_providers_scim	scimprovider
+92	authentik_providers_scim	scimuser
+93	authentik_providers_scim	scimgroup
+94	authentik_enterprise	license
+95	authentik_enterprise	licenseusage
+96	authentik_rbac	role
+97	authentik_rbac	systempermission
+98	authentik_stages_authenticator_static	staticdevice
+99	authentik_stages_authenticator_static	statictoken
+100	authentik_stages_authenticator_totp	totpdevice
 \.
 
 
@@ -4272,10 +4581,6 @@ COPY public.django_migrations (id, app, name, applied) FROM stdin;
 356	authentik_tenants	0004_tenant_flow_device_code	2022-10-25 09:01:02.570998+00
 357	guardian	0001_initial	2022-10-25 09:01:02.818376+00
 358	guardian	0002_generic_permissions_index	2022-10-25 09:01:02.845895+00
-359	otp_static	0001_initial	2022-10-25 09:01:02.937653+00
-360	otp_static	0002_throttling	2022-10-25 09:01:02.96972+00
-361	otp_totp	0001_initial	2022-10-25 09:01:03.019116+00
-362	otp_totp	0002_auto_20190420_0723	2022-10-25 09:01:03.049858+00
 363	sessions	0001_initial	2022-10-25 09:01:03.062934+00
 364	authentik_events	0001_squashed_0019_alter_notificationtransport_webhook_url	2022-10-25 09:01:03.068999+00
 365	authentik_flows	0001_squashed_0007_auto_20200703_2059	2022-10-25 09:01:03.072173+00
@@ -4312,6 +4617,64 @@ COPY public.django_migrations (id, app, name, applied) FROM stdin;
 396	authentik_stages_prompt	0009_prompt_name	2023-03-13 09:18:49.706828+00
 397	authentik_stages_user_write	0006_userwritestage_can_create_users	2023-03-13 09:18:49.730647+00
 398	authentik_stages_user_write	0007_remove_userwritestage_can_create_users_and_more	2023-03-13 09:18:49.820103+00
+399	authentik_blueprints	0003_alter_blueprintinstance_name	2024-01-10 13:34:39.219213+00
+400	authentik_flows	0025_alter_flowstagebinding_evaluate_on_plan_and_more	2024-01-10 13:34:39.299234+00
+401	authentik_core	0025_alter_provider_authorization_flow	2024-01-10 13:34:39.346809+00
+402	authentik_providers_scim	0001_initial	2024-01-10 13:34:39.633321+00
+403	authentik_providers_scim	0002_scimuser	2024-01-10 13:34:39.643609+00
+404	authentik_providers_scim	0003_scimgroup	2024-01-10 13:34:39.651202+00
+405	authentik_providers_scim	0004_scimprovider_property_mappings_group	2024-01-10 13:34:39.657027+00
+406	authentik_providers_scim	0005_scimprovider_exclude_users_service_account_and_more	2024-01-10 13:34:39.661818+00
+407	authentik_providers_scim	0006_rename_parent_group_scimprovider_filter_group	2024-01-10 13:34:39.666202+00
+408	authentik_core	0026_alter_propertymapping_name_alter_provider_name	2024-01-10 13:34:39.853588+00
+409	authentik_core	0027_alter_user_uuid	2024-01-10 13:34:39.887946+00
+410	authentik_core	0028_provider_authentication_flow	2024-01-10 13:34:39.936054+00
+411	authentik_core	0029_provider_backchannel_applications_and_more	2024-01-10 13:34:40.231447+00
+412	authentik_core	0030_user_type	2024-01-10 13:34:40.310035+00
+413	authentik_core	0031_alter_user_type	2024-01-10 13:34:40.38953+00
+414	authentik_crypto	0004_alter_certificatekeypair_name	2024-01-10 13:34:40.462454+00
+415	authentik_enterprise	0001_initial	2024-01-10 13:34:40.481606+00
+416	authentik_enterprise	0002_rename_users_license_internal_users_and_more	2024-01-10 13:34:40.498701+00
+417	authentik_outposts	0019_alter_outpost_name_and_more	2024-01-10 13:34:40.59884+00
+418	authentik_outposts	0020_alter_outpost_type	2024-01-10 13:34:40.620184+00
+419	authentik_policies	0010_alter_policy_name	2024-01-10 13:34:40.802184+00
+420	authentik_policies_event_matcher	0022_eventmatcherpolicy_model	2024-01-10 13:34:40.814569+00
+421	authentik_policies_event_matcher	0023_alter_eventmatcherpolicy_action_and_more	2024-01-10 13:34:40.88434+00
+422	authentik_providers_ldap	0003_ldapprovider_mfa_support_and_more	2024-01-10 13:34:40.929103+00
+423	authentik_providers_oauth2	0015_accesstoken_auth_time_authorizationcode_auth_time_and_more	2024-01-10 13:34:41.000612+00
+424	authentik_providers_oauth2	0016_alter_refreshtoken_token	2024-01-10 13:34:41.036692+00
+425	authentik_providers_radius	0001_initial	2024-01-10 13:34:41.082262+00
+426	authentik_sources_ldap	0003_ldapsource_client_certificate_ldapsource_sni_and_more	2024-01-10 13:34:41.287946+00
+427	authentik_sources_saml	0013_samlsource_verification_kp_and_more	2024-01-10 13:34:41.407493+00
+428	authentik_stages_authenticator_duo	0005_authenticatorduostage_friendly_name	2024-01-10 13:34:41.430002+00
+429	authentik_stages_authenticator_sms	0006_authenticatorsmsstage_friendly_name	2024-01-10 13:34:41.453801+00
+430	authentik_stages_authenticator_static	0006_authenticatorstaticstage_friendly_name	2024-01-10 13:34:41.476862+00
+431	authentik_stages_authenticator_static	0007_authenticatorstaticstage_token_length_and_more	2024-01-10 13:34:41.511476+00
+432	authentik_stages_authenticator_totp	0007_authenticatortotpstage_friendly_name	2024-01-10 13:34:41.532451+00
+433	authentik_stages_authenticator_webauthn	0008_alter_webauthndevice_credential_id	2024-01-10 13:34:41.551282+00
+434	authentik_stages_authenticator_webauthn	0009_authenticatewebauthnstage_friendly_name	2024-01-10 13:34:41.570976+00
+435	authentik_stages_prompt	0010_alter_prompt_placeholder_alter_prompt_type	2024-01-10 13:34:41.646021+00
+436	authentik_stages_prompt	0011_prompt_initial_value_prompt_initial_value_expression_and_more	2024-01-10 13:34:41.8418+00
+437	authentik_stages_user_login	0004_userloginstage_terminate_other_sessions	2024-01-10 13:34:41.858913+00
+438	authentik_stages_user_login	0005_userloginstage_remember_me_offset	2024-01-10 13:34:41.875539+00
+439	authentik_providers_scim	0001_squashed_0006_rename_parent_group_scimprovider_filter_group	2024-01-10 13:34:41.885818+00
+359	authentik_stages_authenticator_static	0008_initial	2022-10-25 09:01:02.937653+00
+360	authentik_stages_authenticator_static	0009_throttling	2022-10-25 09:01:02.96972+00
+361	authentik_stages_authenticator_totp	0008_initial	2022-10-25 09:01:03.019116+00
+362	authentik_stages_authenticator_totp	0009_auto_20190420_0723	2022-10-25 09:01:03.049858+00
+440	authentik_rbac	0001_initial	2024-01-10 13:36:11.884953+00
+441	authentik_core	0032_group_roles	2024-01-10 13:36:12.058845+00
+442	authentik_flows	0026_alter_flow_options	2024-01-10 13:36:12.080204+00
+443	authentik_flows	0027_auto_20231028_1424	2024-01-10 13:36:12.12669+00
+444	authentik_policies	0011_policybinding_failure_result_and_more	2024-01-10 13:36:12.194152+00
+445	authentik_policies_reputation	0005_reputation_expires_reputation_expiring	2024-01-10 13:36:12.207094+00
+446	authentik_providers_oauth2	0017_accesstoken_session_id_authorizationcode_session_id_and_more	2024-01-10 13:36:12.26718+00
+447	authentik_providers_radius	0002_radiusprovider_mfa_support	2024-01-10 13:36:12.281068+00
+448	authentik_providers_saml	0013_samlprovider_default_relay_state	2024-01-10 13:36:12.302128+00
+449	authentik_rbac	0002_systempermission	2024-01-10 13:36:12.308847+00
+450	authentik_stages_authenticator_totp	0010_alter_totpdevice_key	2024-01-10 13:36:12.353573+00
+451	authentik_stages_deny	0002_denystage_deny_message	2024-01-10 13:36:12.375379+00
+452	authentik_stages_user_write	0008_userwritestage_user_type	2024-01-10 13:36:12.400547+00
 \.
 
 
@@ -4336,33 +4699,9 @@ COPY public.guardian_groupobjectpermission (id, object_pk, content_type_id, grou
 --
 
 COPY public.guardian_userobjectpermission (id, object_pk, content_type_id, permission_id, user_id) FROM stdin;
-22	efe635b9-2ce7-4de4-977f-9f25b9f36d97	15	63	4
-23	1	30	125	4
-24	0c24aadc-f97e-4720-a70f-72a190b0cafc	15	63	3
-\.
-
-
---
--- Data for Name: otp_static_staticdevice; Type: TABLE DATA; Schema: public; Owner: authentik
---
-
-COPY public.otp_static_staticdevice (id, name, confirmed, user_id, throttling_failure_count, throttling_failure_timestamp) FROM stdin;
-\.
-
-
---
--- Data for Name: otp_static_statictoken; Type: TABLE DATA; Schema: public; Owner: authentik
---
-
-COPY public.otp_static_statictoken (id, token, device_id) FROM stdin;
-\.
-
-
---
--- Data for Name: otp_totp_totpdevice; Type: TABLE DATA; Schema: public; Owner: authentik
---
-
-COPY public.otp_totp_totpdevice (id, name, confirmed, key, step, t0, digits, tolerance, drift, last_t, user_id, throttling_failure_count, throttling_failure_timestamp) FROM stdin;
+27	efe635b9-2ce7-4de4-977f-9f25b9f36d97	15	63	4
+28	1	30	125	4
+29	0c24aadc-f97e-4720-a70f-72a190b0cafc	15	63	3
 \.
 
 
@@ -4384,7 +4723,14 @@ SELECT pg_catalog.setval('public.auth_group_permissions_id_seq', 1, false);
 -- Name: auth_permission_id_seq; Type: SEQUENCE SET; Schema: public; Owner: authentik
 --
 
-SELECT pg_catalog.setval('public.auth_permission_id_seq', 360, true);
+SELECT pg_catalog.setval('public.auth_permission_id_seq', 413, true);
+
+
+--
+-- Name: authentik_core_group_roles_id_seq; Type: SEQUENCE SET; Schema: public; Owner: authentik
+--
+
+SELECT pg_catalog.setval('public.authentik_core_group_roles_id_seq', 1, false);
 
 
 --
@@ -4433,7 +4779,7 @@ SELECT pg_catalog.setval('public.authentik_core_user_pb_groups_id_seq', 7, true)
 -- Name: authentik_core_user_user_permissions_id_seq; Type: SEQUENCE SET; Schema: public; Owner: authentik
 --
 
-SELECT pg_catalog.setval('public.authentik_core_user_user_permissions_id_seq', 34, true);
+SELECT pg_catalog.setval('public.authentik_core_user_user_permissions_id_seq', 41, true);
 
 
 --
@@ -4461,14 +4807,14 @@ SELECT pg_catalog.setval('public.authentik_outposts_outpost_providers_id_seq', 1
 -- Name: authentik_providers_oauth2_accesstoken_id_seq; Type: SEQUENCE SET; Schema: public; Owner: authentik
 --
 
-SELECT pg_catalog.setval('public.authentik_providers_oauth2_accesstoken_id_seq', 1, true);
+SELECT pg_catalog.setval('public.authentik_providers_oauth2_accesstoken_id_seq', 3, true);
 
 
 --
 -- Name: authentik_providers_oauth2_authorizationcode_id_seq; Type: SEQUENCE SET; Schema: public; Owner: authentik
 --
 
-SELECT pg_catalog.setval('public.authentik_providers_oauth2_authorizationcode_id_seq', 1, true);
+SELECT pg_catalog.setval('public.authentik_providers_oauth2_authorizationcode_id_seq', 3, true);
 
 
 --
@@ -4489,7 +4835,14 @@ SELECT pg_catalog.setval('public.authentik_providers_oauth2_oauth2provider_jwks_
 -- Name: authentik_providers_oauth2_refreshtoken_id_seq; Type: SEQUENCE SET; Schema: public; Owner: authentik
 --
 
-SELECT pg_catalog.setval('public.authentik_providers_oauth2_refreshtoken_id_seq', 1, true);
+SELECT pg_catalog.setval('public.authentik_providers_oauth2_refreshtoken_id_seq', 3, true);
+
+
+--
+-- Name: authentik_providers_scim_scimprovider_property_mappings__id_seq; Type: SEQUENCE SET; Schema: public; Owner: authentik
+--
+
+SELECT pg_catalog.setval('public.authentik_providers_scim_scimprovider_property_mappings__id_seq', 1, false);
 
 
 --
@@ -4513,6 +4866,27 @@ SELECT pg_catalog.setval('public.authentik_stages_authenticator_duo_duodevice_id
 SELECT pg_catalog.setval('public.authentik_stages_authenticator_sms_smsdevice_id_seq', 1, false);
 
 
+--
+-- Name: authentik_stages_authenticator_static_staticdevice_id_seq; Type: SEQUENCE SET; Schema: public; Owner: authentik
+--
+
+SELECT pg_catalog.setval('public.authentik_stages_authenticator_static_staticdevice_id_seq', 1, false);
+
+
+--
+-- Name: authentik_stages_authenticator_static_statictoken_id_seq; Type: SEQUENCE SET; Schema: public; Owner: authentik
+--
+
+SELECT pg_catalog.setval('public.authentik_stages_authenticator_static_statictoken_id_seq', 1, false);
+
+
+--
+-- Name: authentik_stages_authenticator_totp_totpdevice_id_seq; Type: SEQUENCE SET; Schema: public; Owner: authentik
+--
+
+SELECT pg_catalog.setval('public.authentik_stages_authenticator_totp_totpdevice_id_seq', 1, false);
+
+
 --
 -- Name: authentik_stages_authenticator_validate_authenticatorval_id_seq; Type: SEQUENCE SET; Schema: public; Owner: authentik
 --
@@ -4545,7 +4919,7 @@ SELECT pg_catalog.setval('public.authentik_stages_identification_identifications
 -- Name: authentik_stages_prompt_promptstage_fields_id_seq; Type: SEQUENCE SET; Schema: public; Owner: authentik
 --
 
-SELECT pg_catalog.setval('public.authentik_stages_prompt_promptstage_fields_id_seq', 22, true);
+SELECT pg_catalog.setval('public.authentik_stages_prompt_promptstage_fields_id_seq', 68, true);
 
 
 --
@@ -4559,14 +4933,14 @@ SELECT pg_catalog.setval('public.authentik_stages_prompt_promptstage_validation_
 -- Name: django_content_type_id_seq; Type: SEQUENCE SET; Schema: public; Owner: authentik
 --
 
-SELECT pg_catalog.setval('public.django_content_type_id_seq', 88, true);
+SELECT pg_catalog.setval('public.django_content_type_id_seq', 100, true);
 
 
 --
 -- Name: django_migrations_id_seq; Type: SEQUENCE SET; Schema: public; Owner: authentik
 --
 
-SELECT pg_catalog.setval('public.django_migrations_id_seq', 398, true);
+SELECT pg_catalog.setval('public.django_migrations_id_seq', 452, true);
 
 
 --
@@ -4580,28 +4954,7 @@ SELECT pg_catalog.setval('public.guardian_groupobjectpermission_id_seq', 1, fals
 -- Name: guardian_userobjectpermission_id_seq; Type: SEQUENCE SET; Schema: public; Owner: authentik
 --
 
-SELECT pg_catalog.setval('public.guardian_userobjectpermission_id_seq', 24, true);
-
-
---
--- Name: otp_static_staticdevice_id_seq; Type: SEQUENCE SET; Schema: public; Owner: authentik
---
-
-SELECT pg_catalog.setval('public.otp_static_staticdevice_id_seq', 1, false);
-
-
---
--- Name: otp_static_statictoken_id_seq; Type: SEQUENCE SET; Schema: public; Owner: authentik
---
-
-SELECT pg_catalog.setval('public.otp_static_statictoken_id_seq', 1, false);
-
-
---
--- Name: otp_totp_totpdevice_id_seq; Type: SEQUENCE SET; Schema: public; Owner: authentik
---
-
-SELECT pg_catalog.setval('public.otp_totp_totpdevice_id_seq', 1, false);
+SELECT pg_catalog.setval('public.guardian_userobjectpermission_id_seq', 29, true);
 
 
 --
@@ -4660,6 +5013,14 @@ ALTER TABLE ONLY public.authentik_blueprints_blueprintinstance
     ADD CONSTRAINT authentik_blueprints_blueprintinstance_managed_key UNIQUE (managed);
 
 
+--
+-- Name: authentik_blueprints_blueprintinstance authentik_blueprints_blueprintinstance_name_404be626_uniq; Type: CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_blueprints_blueprintinstance
+    ADD CONSTRAINT authentik_blueprints_blueprintinstance_name_404be626_uniq UNIQUE (name);
+
+
 --
 -- Name: authentik_blueprints_blueprintinstance authentik_blueprints_blueprintinstance_name_path_982f03b6_uniq; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
@@ -4724,6 +5085,22 @@ ALTER TABLE ONLY public.authentik_core_group
     ADD CONSTRAINT authentik_core_group_pkey PRIMARY KEY (group_uuid);
 
 
+--
+-- Name: authentik_core_group_roles authentik_core_group_roles_group_id_role_id_f2df9be5_uniq; Type: CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_core_group_roles
+    ADD CONSTRAINT authentik_core_group_roles_group_id_role_id_f2df9be5_uniq UNIQUE (group_id, role_id);
+
+
+--
+-- Name: authentik_core_group_roles authentik_core_group_roles_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_core_group_roles
+    ADD CONSTRAINT authentik_core_group_roles_pkey PRIMARY KEY (id);
+
+
 --
 -- Name: authentik_core_propertymapping authentik_core_propertymapping_managed_key; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
@@ -4732,6 +5109,14 @@ ALTER TABLE ONLY public.authentik_core_propertymapping
     ADD CONSTRAINT authentik_core_propertymapping_managed_key UNIQUE (managed);
 
 
+--
+-- Name: authentik_core_propertymapping authentik_core_propertymapping_name_a457d137_uniq; Type: CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_core_propertymapping
+    ADD CONSTRAINT authentik_core_propertymapping_name_a457d137_uniq UNIQUE (name);
+
+
 --
 -- Name: authentik_core_propertymapping authentik_core_propertymapping_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
@@ -4748,6 +5133,14 @@ ALTER TABLE ONLY public.authentik_core_provider_property_mappings
     ADD CONSTRAINT authentik_core_provider__provider_id_propertymapp_cf242fa9_uniq UNIQUE (provider_id, propertymapping_id);
 
 
+--
+-- Name: authentik_core_provider authentik_core_provider_name_66fc4ef4_uniq; Type: CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_core_provider
+    ADD CONSTRAINT authentik_core_provider_name_66fc4ef4_uniq UNIQUE (name);
+
+
 --
 -- Name: authentik_core_provider authentik_core_provider_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
@@ -4892,6 +5285,14 @@ ALTER TABLE ONLY public.authentik_core_user
     ADD CONSTRAINT authentik_core_user_username_key UNIQUE (username);
 
 
+--
+-- Name: authentik_core_user authentik_core_user_uuid_c7a047d9_uniq; Type: CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_core_user
+    ADD CONSTRAINT authentik_core_user_uuid_c7a047d9_uniq UNIQUE (uuid);
+
+
 --
 -- Name: authentik_core_usersourceconnection authentik_core_usersourc_user_id_source_id_ad1f5aa7_uniq; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
@@ -4916,6 +5317,14 @@ ALTER TABLE ONLY public.authentik_crypto_certificatekeypair
     ADD CONSTRAINT authentik_crypto_certificatekeypair_managed_key UNIQUE (managed);
 
 
+--
+-- Name: authentik_crypto_certificatekeypair authentik_crypto_certificatekeypair_name_719603a4_uniq; Type: CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_crypto_certificatekeypair
+    ADD CONSTRAINT authentik_crypto_certificatekeypair_name_719603a4_uniq UNIQUE (name);
+
+
 --
 -- Name: authentik_crypto_certificatekeypair authentik_crypto_certificatekeypair_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
@@ -4924,6 +5333,22 @@ ALTER TABLE ONLY public.authentik_crypto_certificatekeypair
     ADD CONSTRAINT authentik_crypto_certificatekeypair_pkey PRIMARY KEY (kp_uuid);
 
 
+--
+-- Name: authentik_enterprise_license authentik_enterprise_license_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_enterprise_license
+    ADD CONSTRAINT authentik_enterprise_license_pkey PRIMARY KEY (license_uuid);
+
+
+--
+-- Name: authentik_enterprise_licenseusage authentik_enterprise_licenseusage_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_enterprise_licenseusage
+    ADD CONSTRAINT authentik_enterprise_licenseusage_pkey PRIMARY KEY (usage_uuid);
+
+
 --
 -- Name: authentik_events_event authentik_events_event_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
@@ -5100,6 +5525,14 @@ ALTER TABLE ONLY public.authentik_outposts_outpost
     ADD CONSTRAINT authentik_outposts_outpost_managed_key UNIQUE (managed);
 
 
+--
+-- Name: authentik_outposts_outpost authentik_outposts_outpost_name_b07e0428_uniq; Type: CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_outposts_outpost
+    ADD CONSTRAINT authentik_outposts_outpost_name_b07e0428_uniq UNIQUE (name);
+
+
 --
 -- Name: authentik_outposts_outpost authentik_outposts_outpost_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
@@ -5116,6 +5549,14 @@ ALTER TABLE ONLY public.authentik_outposts_outpost_providers
     ADD CONSTRAINT authentik_outposts_outpost_providers_pkey PRIMARY KEY (id);
 
 
+--
+-- Name: authentik_outposts_outpostserviceconnection authentik_outposts_outpostserviceconnection_name_ec30b5ea_uniq; Type: CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_outposts_outpostserviceconnection
+    ADD CONSTRAINT authentik_outposts_outpostserviceconnection_name_ec30b5ea_uniq UNIQUE (name);
+
+
 --
 -- Name: authentik_outposts_outpostserviceconnection authentik_outposts_outpostserviceconnection_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
@@ -5172,6 +5613,14 @@ ALTER TABLE ONLY public.authentik_policies_policybinding
     ADD CONSTRAINT authentik_policies_polic_policy_id_target_id_orde_0a6ac3bd_uniq UNIQUE (policy_id, target_id, "order");
 
 
+--
+-- Name: authentik_policies_policy authentik_policies_policy_name_48caa747_uniq; Type: CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_policies_policy
+    ADD CONSTRAINT authentik_policies_policy_name_48caa747_uniq UNIQUE (name);
+
+
 --
 -- Name: authentik_policies_policy authentik_policies_policy_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
@@ -5216,120 +5665,216 @@ ALTER TABLE ONLY public.authentik_policies_reputation_reputation
 -- Name: authentik_policies_reputation_reputationpolicy authentik_policies_reputation_reputationpolicy_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
 
-ALTER TABLE ONLY public.authentik_policies_reputation_reputationpolicy
-    ADD CONSTRAINT authentik_policies_reputation_reputationpolicy_pkey PRIMARY KEY (policy_ptr_id);
+ALTER TABLE ONLY public.authentik_policies_reputation_reputationpolicy
+    ADD CONSTRAINT authentik_policies_reputation_reputationpolicy_pkey PRIMARY KEY (policy_ptr_id);
+
+
+--
+-- Name: authentik_providers_ldap_ldapprovider authentik_providers_ldap_ldapprovider_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_providers_ldap_ldapprovider
+    ADD CONSTRAINT authentik_providers_ldap_ldapprovider_pkey PRIMARY KEY (provider_ptr_id);
+
+
+--
+-- Name: authentik_providers_oauth2_oauth2provider_jwks_sources authentik_providers_oaut_oauth2provider_id_oauths_5151c4b7_uniq; Type: CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_providers_oauth2_oauth2provider_jwks_sources
+    ADD CONSTRAINT authentik_providers_oaut_oauth2provider_id_oauths_5151c4b7_uniq UNIQUE (oauth2provider_id, oauthsource_id);
+
+
+--
+-- Name: authentik_providers_oauth2_accesstoken authentik_providers_oauth2_accesstoken_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_providers_oauth2_accesstoken
+    ADD CONSTRAINT authentik_providers_oauth2_accesstoken_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: authentik_providers_oauth2_authorizationcode authentik_providers_oauth2_authorizationcode_code_key; Type: CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_providers_oauth2_authorizationcode
+    ADD CONSTRAINT authentik_providers_oauth2_authorizationcode_code_key UNIQUE (code);
+
+
+--
+-- Name: authentik_providers_oauth2_authorizationcode authentik_providers_oauth2_authorizationcode_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_providers_oauth2_authorizationcode
+    ADD CONSTRAINT authentik_providers_oauth2_authorizationcode_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: authentik_providers_oauth2_devicetoken authentik_providers_oauth2_devicetoken_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_providers_oauth2_devicetoken
+    ADD CONSTRAINT authentik_providers_oauth2_devicetoken_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: authentik_providers_oauth2_oauth2provider authentik_providers_oauth2_oauth2provider_client_id_key; Type: CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_providers_oauth2_oauth2provider
+    ADD CONSTRAINT authentik_providers_oauth2_oauth2provider_client_id_key UNIQUE (client_id);
+
+
+--
+-- Name: authentik_providers_oauth2_oauth2provider_jwks_sources authentik_providers_oauth2_oauth2provider_jwks_sources_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_providers_oauth2_oauth2provider_jwks_sources
+    ADD CONSTRAINT authentik_providers_oauth2_oauth2provider_jwks_sources_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: authentik_providers_oauth2_oauth2provider authentik_providers_oauth2_oauth2provider_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_providers_oauth2_oauth2provider
+    ADD CONSTRAINT authentik_providers_oauth2_oauth2provider_pkey PRIMARY KEY (provider_ptr_id);
+
+
+--
+-- Name: authentik_providers_oauth2_refreshtoken authentik_providers_oauth2_refreshtoken_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_providers_oauth2_refreshtoken
+    ADD CONSTRAINT authentik_providers_oauth2_refreshtoken_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: authentik_providers_oauth2_scopemapping authentik_providers_oauth2_scopemapping_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_providers_oauth2_scopemapping
+    ADD CONSTRAINT authentik_providers_oauth2_scopemapping_pkey PRIMARY KEY (propertymapping_ptr_id);
+
+
+--
+-- Name: authentik_providers_proxy_proxyprovider authentik_providers_proxy_proxyprovider_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_providers_proxy_proxyprovider
+    ADD CONSTRAINT authentik_providers_proxy_proxyprovider_pkey PRIMARY KEY (oauth2provider_ptr_id);
 
 
 --
--- Name: authentik_providers_ldap_ldapprovider authentik_providers_ldap_ldapprovider_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+-- Name: authentik_providers_radius_radiusprovider authentik_providers_radius_radiusprovider_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
 
-ALTER TABLE ONLY public.authentik_providers_ldap_ldapprovider
-    ADD CONSTRAINT authentik_providers_ldap_ldapprovider_pkey PRIMARY KEY (provider_ptr_id);
+ALTER TABLE ONLY public.authentik_providers_radius_radiusprovider
+    ADD CONSTRAINT authentik_providers_radius_radiusprovider_pkey PRIMARY KEY (provider_ptr_id);
 
 
 --
--- Name: authentik_providers_oauth2_oauth2provider_jwks_sources authentik_providers_oaut_oauth2provider_id_oauths_5151c4b7_uniq; Type: CONSTRAINT; Schema: public; Owner: authentik
+-- Name: authentik_providers_saml_samlpropertymapping authentik_providers_saml_samlpropertymapping_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
 
-ALTER TABLE ONLY public.authentik_providers_oauth2_oauth2provider_jwks_sources
-    ADD CONSTRAINT authentik_providers_oaut_oauth2provider_id_oauths_5151c4b7_uniq UNIQUE (oauth2provider_id, oauthsource_id);
+ALTER TABLE ONLY public.authentik_providers_saml_samlpropertymapping
+    ADD CONSTRAINT authentik_providers_saml_samlpropertymapping_pkey PRIMARY KEY (propertymapping_ptr_id);
 
 
 --
--- Name: authentik_providers_oauth2_accesstoken authentik_providers_oauth2_accesstoken_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+-- Name: authentik_providers_saml_samlprovider authentik_providers_saml_samlprovider_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
 
-ALTER TABLE ONLY public.authentik_providers_oauth2_accesstoken
-    ADD CONSTRAINT authentik_providers_oauth2_accesstoken_pkey PRIMARY KEY (id);
+ALTER TABLE ONLY public.authentik_providers_saml_samlprovider
+    ADD CONSTRAINT authentik_providers_saml_samlprovider_pkey PRIMARY KEY (provider_ptr_id);
 
 
 --
--- Name: authentik_providers_oauth2_authorizationcode authentik_providers_oauth2_authorizationcode_code_key; Type: CONSTRAINT; Schema: public; Owner: authentik
+-- Name: authentik_providers_scim_scimgroup authentik_providers_scim_id_group_id_provider_id_9d50d292_uniq; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
 
-ALTER TABLE ONLY public.authentik_providers_oauth2_authorizationcode
-    ADD CONSTRAINT authentik_providers_oauth2_authorizationcode_code_key UNIQUE (code);
+ALTER TABLE ONLY public.authentik_providers_scim_scimgroup
+    ADD CONSTRAINT authentik_providers_scim_id_group_id_provider_id_9d50d292_uniq UNIQUE (id, group_id, provider_id);
 
 
 --
--- Name: authentik_providers_oauth2_authorizationcode authentik_providers_oauth2_authorizationcode_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+-- Name: authentik_providers_scim_scimuser authentik_providers_scim_id_user_id_provider_id_d664a1b5_uniq; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
 
-ALTER TABLE ONLY public.authentik_providers_oauth2_authorizationcode
-    ADD CONSTRAINT authentik_providers_oauth2_authorizationcode_pkey PRIMARY KEY (id);
+ALTER TABLE ONLY public.authentik_providers_scim_scimuser
+    ADD CONSTRAINT authentik_providers_scim_id_user_id_provider_id_d664a1b5_uniq UNIQUE (id, user_id, provider_id);
 
 
 --
--- Name: authentik_providers_oauth2_devicetoken authentik_providers_oauth2_devicetoken_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+-- Name: authentik_providers_scim_scimgroup authentik_providers_scim_scimgroup_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
 
-ALTER TABLE ONLY public.authentik_providers_oauth2_devicetoken
-    ADD CONSTRAINT authentik_providers_oauth2_devicetoken_pkey PRIMARY KEY (id);
+ALTER TABLE ONLY public.authentik_providers_scim_scimgroup
+    ADD CONSTRAINT authentik_providers_scim_scimgroup_pkey PRIMARY KEY (id);
 
 
 --
--- Name: authentik_providers_oauth2_oauth2provider authentik_providers_oauth2_oauth2provider_client_id_key; Type: CONSTRAINT; Schema: public; Owner: authentik
+-- Name: authentik_providers_scim_scimmapping authentik_providers_scim_scimmapping_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
 
-ALTER TABLE ONLY public.authentik_providers_oauth2_oauth2provider
-    ADD CONSTRAINT authentik_providers_oauth2_oauth2provider_client_id_key UNIQUE (client_id);
+ALTER TABLE ONLY public.authentik_providers_scim_scimmapping
+    ADD CONSTRAINT authentik_providers_scim_scimmapping_pkey PRIMARY KEY (propertymapping_ptr_id);
 
 
 --
--- Name: authentik_providers_oauth2_oauth2provider_jwks_sources authentik_providers_oauth2_oauth2provider_jwks_sources_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+-- Name: authentik_providers_scim_scimprovider_property_mappings_group authentik_providers_scim_scimprovider_id_property_32317bb5_uniq; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
 
-ALTER TABLE ONLY public.authentik_providers_oauth2_oauth2provider_jwks_sources
-    ADD CONSTRAINT authentik_providers_oauth2_oauth2provider_jwks_sources_pkey PRIMARY KEY (id);
+ALTER TABLE ONLY public.authentik_providers_scim_scimprovider_property_mappings_group
+    ADD CONSTRAINT authentik_providers_scim_scimprovider_id_property_32317bb5_uniq UNIQUE (scimprovider_id, propertymapping_id);
 
 
 --
--- Name: authentik_providers_oauth2_oauth2provider authentik_providers_oauth2_oauth2provider_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+-- Name: authentik_providers_scim_scimprovider authentik_providers_scim_scimprovider_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
 
-ALTER TABLE ONLY public.authentik_providers_oauth2_oauth2provider
-    ADD CONSTRAINT authentik_providers_oauth2_oauth2provider_pkey PRIMARY KEY (provider_ptr_id);
+ALTER TABLE ONLY public.authentik_providers_scim_scimprovider
+    ADD CONSTRAINT authentik_providers_scim_scimprovider_pkey PRIMARY KEY (provider_ptr_id);
 
 
 --
--- Name: authentik_providers_oauth2_refreshtoken authentik_providers_oauth2_refreshtoken_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+-- Name: authentik_providers_scim_scimprovider_property_mappings_group authentik_providers_scim_scimprovider_property_mappings_gr_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
 
-ALTER TABLE ONLY public.authentik_providers_oauth2_refreshtoken
-    ADD CONSTRAINT authentik_providers_oauth2_refreshtoken_pkey PRIMARY KEY (id);
+ALTER TABLE ONLY public.authentik_providers_scim_scimprovider_property_mappings_group
+    ADD CONSTRAINT authentik_providers_scim_scimprovider_property_mappings_gr_pkey PRIMARY KEY (id);
 
 
 --
--- Name: authentik_providers_oauth2_scopemapping authentik_providers_oauth2_scopemapping_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+-- Name: authentik_providers_scim_scimuser authentik_providers_scim_scimuser_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
 
-ALTER TABLE ONLY public.authentik_providers_oauth2_scopemapping
-    ADD CONSTRAINT authentik_providers_oauth2_scopemapping_pkey PRIMARY KEY (propertymapping_ptr_id);
+ALTER TABLE ONLY public.authentik_providers_scim_scimuser
+    ADD CONSTRAINT authentik_providers_scim_scimuser_pkey PRIMARY KEY (id);
 
 
 --
--- Name: authentik_providers_proxy_proxyprovider authentik_providers_proxy_proxyprovider_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+-- Name: authentik_rbac_role authentik_rbac_role_group_id_key; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
 
-ALTER TABLE ONLY public.authentik_providers_proxy_proxyprovider
-    ADD CONSTRAINT authentik_providers_proxy_proxyprovider_pkey PRIMARY KEY (oauth2provider_ptr_id);
+ALTER TABLE ONLY public.authentik_rbac_role
+    ADD CONSTRAINT authentik_rbac_role_group_id_key UNIQUE (group_id);
 
 
 --
--- Name: authentik_providers_saml_samlpropertymapping authentik_providers_saml_samlpropertymapping_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+-- Name: authentik_rbac_role authentik_rbac_role_name_key; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
 
-ALTER TABLE ONLY public.authentik_providers_saml_samlpropertymapping
-    ADD CONSTRAINT authentik_providers_saml_samlpropertymapping_pkey PRIMARY KEY (propertymapping_ptr_id);
+ALTER TABLE ONLY public.authentik_rbac_role
+    ADD CONSTRAINT authentik_rbac_role_name_key UNIQUE (name);
 
 
 --
--- Name: authentik_providers_saml_samlprovider authentik_providers_saml_samlprovider_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+-- Name: authentik_rbac_role authentik_rbac_role_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
 
-ALTER TABLE ONLY public.authentik_providers_saml_samlprovider
-    ADD CONSTRAINT authentik_providers_saml_samlprovider_pkey PRIMARY KEY (provider_ptr_id);
+ALTER TABLE ONLY public.authentik_rbac_role
+    ADD CONSTRAINT authentik_rbac_role_pkey PRIMARY KEY (uuid);
 
 
 --
@@ -5781,26 +6326,26 @@ ALTER TABLE ONLY public.guardian_userobjectpermission
 
 
 --
--- Name: otp_static_staticdevice otp_static_staticdevice_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+-- Name: authentik_stages_authenticator_static_staticdevice otp_static_staticdevice_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
 
-ALTER TABLE ONLY public.otp_static_staticdevice
+ALTER TABLE ONLY public.authentik_stages_authenticator_static_staticdevice
     ADD CONSTRAINT otp_static_staticdevice_pkey PRIMARY KEY (id);
 
 
 --
--- Name: otp_static_statictoken otp_static_statictoken_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+-- Name: authentik_stages_authenticator_static_statictoken otp_static_statictoken_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
 
-ALTER TABLE ONLY public.otp_static_statictoken
+ALTER TABLE ONLY public.authentik_stages_authenticator_static_statictoken
     ADD CONSTRAINT otp_static_statictoken_pkey PRIMARY KEY (id);
 
 
 --
--- Name: otp_totp_totpdevice otp_totp_totpdevice_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
+-- Name: authentik_stages_authenticator_totp_totpdevice otp_totp_totpdevice_pkey; Type: CONSTRAINT; Schema: public; Owner: authentik
 --
 
-ALTER TABLE ONLY public.otp_totp_totpdevice
+ALTER TABLE ONLY public.authentik_stages_authenticator_totp_totpdevice
     ADD CONSTRAINT otp_totp_totpdevice_pkey PRIMARY KEY (id);
 
 
@@ -5839,6 +6384,13 @@ CREATE INDEX auth_permission_content_type_id_2f476e4b ON public.auth_permission
 CREATE INDEX authentik_blueprints_blueprintinstance_managed_a2959093_like ON public.authentik_blueprints_blueprintinstance USING btree (managed text_pattern_ops);
 
 
+--
+-- Name: authentik_blueprints_blueprintinstance_name_404be626_like; Type: INDEX; Schema: public; Owner: authentik
+--
+
+CREATE INDEX authentik_blueprints_blueprintinstance_name_404be626_like ON public.authentik_blueprints_blueprintinstance USING btree (name text_pattern_ops);
+
+
 --
 -- Name: authentik_c_identif_d9d032_idx; Type: INDEX; Schema: public; Owner: authentik
 --
@@ -5888,6 +6440,20 @@ CREATE INDEX authentik_core_authenticatedsession_user_id_5055b6cf ON public.auth
 CREATE INDEX authentik_core_group_parent_id_c2cd3508 ON public.authentik_core_group USING btree (parent_id);
 
 
+--
+-- Name: authentik_core_group_roles_group_id_43a283e0; Type: INDEX; Schema: public; Owner: authentik
+--
+
+CREATE INDEX authentik_core_group_roles_group_id_43a283e0 ON public.authentik_core_group_roles USING btree (group_id);
+
+
+--
+-- Name: authentik_core_group_roles_role_id_5b9a84fe; Type: INDEX; Schema: public; Owner: authentik
+--
+
+CREATE INDEX authentik_core_group_roles_role_id_5b9a84fe ON public.authentik_core_group_roles USING btree (role_id);
+
+
 --
 -- Name: authentik_core_propertymapping_managed_e1718652_like; Type: INDEX; Schema: public; Owner: authentik
 --
@@ -5895,6 +6461,20 @@ CREATE INDEX authentik_core_group_parent_id_c2cd3508 ON public.authentik_core_gr
 CREATE INDEX authentik_core_propertymapping_managed_e1718652_like ON public.authentik_core_propertymapping USING btree (managed text_pattern_ops);
 
 
+--
+-- Name: authentik_core_propertymapping_name_a457d137_like; Type: INDEX; Schema: public; Owner: authentik
+--
+
+CREATE INDEX authentik_core_propertymapping_name_a457d137_like ON public.authentik_core_propertymapping USING btree (name text_pattern_ops);
+
+
+--
+-- Name: authentik_core_provider_authentication_flow_id_49dea03c; Type: INDEX; Schema: public; Owner: authentik
+--
+
+CREATE INDEX authentik_core_provider_authentication_flow_id_49dea03c ON public.authentik_core_provider USING btree (authentication_flow_id);
+
+
 --
 -- Name: authentik_core_provider_authorization_flow_id_1482437b; Type: INDEX; Schema: public; Owner: authentik
 --
@@ -5902,6 +6482,20 @@ CREATE INDEX authentik_core_propertymapping_managed_e1718652_like ON public.auth
 CREATE INDEX authentik_core_provider_authorization_flow_id_1482437b ON public.authentik_core_provider USING btree (authorization_flow_id);
 
 
+--
+-- Name: authentik_core_provider_backchannel_application_id_a972ebd6; Type: INDEX; Schema: public; Owner: authentik
+--
+
+CREATE INDEX authentik_core_provider_backchannel_application_id_a972ebd6 ON public.authentik_core_provider USING btree (backchannel_application_id);
+
+
+--
+-- Name: authentik_core_provider_name_66fc4ef4_like; Type: INDEX; Schema: public; Owner: authentik
+--
+
+CREATE INDEX authentik_core_provider_name_66fc4ef4_like ON public.authentik_core_provider USING btree (name text_pattern_ops);
+
+
 --
 -- Name: authentik_core_provider_pr_propertymapping_id_7d1de2b7; Type: INDEX; Schema: public; Owner: authentik
 --
@@ -6049,6 +6643,20 @@ CREATE INDEX authentik_core_usersourceconnection_user_id_7f305d6f ON public.auth
 CREATE INDEX authentik_crypto_certificatekeypair_managed_a997712a_like ON public.authentik_crypto_certificatekeypair USING btree (managed text_pattern_ops);
 
 
+--
+-- Name: authentik_crypto_certificatekeypair_name_719603a4_like; Type: INDEX; Schema: public; Owner: authentik
+--
+
+CREATE INDEX authentik_crypto_certificatekeypair_name_719603a4_like ON public.authentik_crypto_certificatekeypair USING btree (name text_pattern_ops);
+
+
+--
+-- Name: authentik_e_key_523e13_hash; Type: INDEX; Schema: public; Owner: authentik
+--
+
+CREATE INDEX authentik_e_key_523e13_hash ON public.authentik_enterprise_license USING hash (key);
+
+
 --
 -- Name: authentik_events_notificat_notificationrule_id_eccbe1d6; Type: INDEX; Schema: public; Owner: authentik
 --
@@ -6161,6 +6769,13 @@ CREATE INDEX authentik_outposts_dockers_tls_verification_id_769fac22 ON public.a
 CREATE INDEX authentik_outposts_outpost_managed_e03db044_like ON public.authentik_outposts_outpost USING btree (managed text_pattern_ops);
 
 
+--
+-- Name: authentik_outposts_outpost_name_b07e0428_like; Type: INDEX; Schema: public; Owner: authentik
+--
+
+CREATE INDEX authentik_outposts_outpost_name_b07e0428_like ON public.authentik_outposts_outpost USING btree (name text_pattern_ops);
+
+
 --
 -- Name: authentik_outposts_outpost_providers_outpost_id_eaaf025b; Type: INDEX; Schema: public; Owner: authentik
 --
@@ -6182,6 +6797,13 @@ CREATE INDEX authentik_outposts_outpost_providers_provider_id_7c5cb603 ON public
 CREATE INDEX authentik_outposts_outpost_service_connection_id_3eafd830 ON public.authentik_outposts_outpost USING btree (service_connection_id);
 
 
+--
+-- Name: authentik_outposts_outpostserviceconnection_name_ec30b5ea_like; Type: INDEX; Schema: public; Owner: authentik
+--
+
+CREATE INDEX authentik_outposts_outpostserviceconnection_name_ec30b5ea_like ON public.authentik_outposts_outpostserviceconnection USING btree (name text_pattern_ops);
+
+
 --
 -- Name: authentik_p_group_i_5d2d24_idx; Type: INDEX; Schema: public; Owner: authentik
 --
@@ -6252,6 +6874,13 @@ CREATE INDEX authentik_p_target__2e4d50_idx ON public.authentik_policies_policyb
 CREATE INDEX authentik_p_user_id_603323_idx ON public.authentik_policies_policybinding USING btree (user_id);
 
 
+--
+-- Name: authentik_policies_policy_name_48caa747_like; Type: INDEX; Schema: public; Owner: authentik
+--
+
+CREATE INDEX authentik_policies_policy_name_48caa747_like ON public.authentik_policies_policy USING btree (name text_pattern_ops);
+
+
 --
 -- Name: authentik_policies_policybinding_group_id_2afb13ee; Type: INDEX; Schema: public; Owner: authentik
 --
@@ -6413,6 +7042,83 @@ CREATE INDEX authentik_providers_saml_s_verification_kp_id_7b0fbd80 ON public.au
 CREATE INDEX authentik_providers_saml_samlprovider_signing_kp_id_f1bce700 ON public.authentik_providers_saml_samlprovider USING btree (signing_kp_id);
 
 
+--
+-- Name: authentik_providers_scim_s_propertymapping_id_7ea3950a; Type: INDEX; Schema: public; Owner: authentik
+--
+
+CREATE INDEX authentik_providers_scim_s_propertymapping_id_7ea3950a ON public.authentik_providers_scim_scimprovider_property_mappings_group USING btree (propertymapping_id);
+
+
+--
+-- Name: authentik_providers_scim_s_scimprovider_id_c3c41ae0; Type: INDEX; Schema: public; Owner: authentik
+--
+
+CREATE INDEX authentik_providers_scim_s_scimprovider_id_c3c41ae0 ON public.authentik_providers_scim_scimprovider_property_mappings_group USING btree (scimprovider_id);
+
+
+--
+-- Name: authentik_providers_scim_scimgroup_group_id_071f6834; Type: INDEX; Schema: public; Owner: authentik
+--
+
+CREATE INDEX authentik_providers_scim_scimgroup_group_id_071f6834 ON public.authentik_providers_scim_scimgroup USING btree (group_id);
+
+
+--
+-- Name: authentik_providers_scim_scimgroup_id_96ae7587_like; Type: INDEX; Schema: public; Owner: authentik
+--
+
+CREATE INDEX authentik_providers_scim_scimgroup_id_96ae7587_like ON public.authentik_providers_scim_scimgroup USING btree (id text_pattern_ops);
+
+
+--
+-- Name: authentik_providers_scim_scimgroup_provider_id_29f58417; Type: INDEX; Schema: public; Owner: authentik
+--
+
+CREATE INDEX authentik_providers_scim_scimgroup_provider_id_29f58417 ON public.authentik_providers_scim_scimgroup USING btree (provider_id);
+
+
+--
+-- Name: authentik_providers_scim_scimprovider_filter_group_id_1aca1276; Type: INDEX; Schema: public; Owner: authentik
+--
+
+CREATE INDEX authentik_providers_scim_scimprovider_filter_group_id_1aca1276 ON public.authentik_providers_scim_scimprovider USING btree (filter_group_id);
+
+
+--
+-- Name: authentik_providers_scim_scimuser_id_64507c6f_like; Type: INDEX; Schema: public; Owner: authentik
+--
+
+CREATE INDEX authentik_providers_scim_scimuser_id_64507c6f_like ON public.authentik_providers_scim_scimuser USING btree (id text_pattern_ops);
+
+
+--
+-- Name: authentik_providers_scim_scimuser_provider_id_08127ac7; Type: INDEX; Schema: public; Owner: authentik
+--
+
+CREATE INDEX authentik_providers_scim_scimuser_provider_id_08127ac7 ON public.authentik_providers_scim_scimuser USING btree (provider_id);
+
+
+--
+-- Name: authentik_providers_scim_scimuser_user_id_63e0ca83; Type: INDEX; Schema: public; Owner: authentik
+--
+
+CREATE INDEX authentik_providers_scim_scimuser_user_id_63e0ca83 ON public.authentik_providers_scim_scimuser USING btree (user_id);
+
+
+--
+-- Name: authentik_rbac_role_name_94e9e999_like; Type: INDEX; Schema: public; Owner: authentik
+--
+
+CREATE INDEX authentik_rbac_role_name_94e9e999_like ON public.authentik_rbac_role USING btree (name text_pattern_ops);
+
+
+--
+-- Name: authentik_sources_ldap_lda_client_certificate_id_937bc1c9; Type: INDEX; Schema: public; Owner: authentik
+--
+
+CREATE INDEX authentik_sources_ldap_lda_client_certificate_id_937bc1c9 ON public.authentik_sources_ldap_ldapsource USING btree (client_certificate_id);
+
+
 --
 -- Name: authentik_sources_ldap_lda_ldapsource_id_4eff95ce; Type: INDEX; Schema: public; Owner: authentik
 --
@@ -6456,10 +7162,10 @@ CREATE INDEX authentik_sources_saml_samlsource_signing_kp_id_faae605c ON public.
 
 
 --
--- Name: authentik_stages_authent_credential_id_4260aaee_like; Type: INDEX; Schema: public; Owner: authentik
+-- Name: authentik_sources_saml_samlsource_verification_kp_id_f76620d9; Type: INDEX; Schema: public; Owner: authentik
 --
 
-CREATE INDEX authentik_stages_authent_credential_id_4260aaee_like ON public.authentik_stages_authenticator_webauthn_webauthndevice USING btree (credential_id varchar_pattern_ops);
+CREATE INDEX authentik_sources_saml_samlsource_verification_kp_id_f76620d9 ON public.authentik_sources_saml_samlsource USING btree (verification_kp_id);
 
 
 --
@@ -6809,35 +7515,35 @@ CREATE INDEX guardian_userobjectpermission_user_id_d5c1e964 ON public.guardian_u
 -- Name: otp_static_staticdevice_user_id_7f9cff2b; Type: INDEX; Schema: public; Owner: authentik
 --
 
-CREATE INDEX otp_static_staticdevice_user_id_7f9cff2b ON public.otp_static_staticdevice USING btree (user_id);
+CREATE INDEX otp_static_staticdevice_user_id_7f9cff2b ON public.authentik_stages_authenticator_static_staticdevice USING btree (user_id);
 
 
 --
 -- Name: otp_static_statictoken_device_id_74b7c7d1; Type: INDEX; Schema: public; Owner: authentik
 --
 
-CREATE INDEX otp_static_statictoken_device_id_74b7c7d1 ON public.otp_static_statictoken USING btree (device_id);
+CREATE INDEX otp_static_statictoken_device_id_74b7c7d1 ON public.authentik_stages_authenticator_static_statictoken USING btree (device_id);
 
 
 --
 -- Name: otp_static_statictoken_token_d0a51866; Type: INDEX; Schema: public; Owner: authentik
 --
 
-CREATE INDEX otp_static_statictoken_token_d0a51866 ON public.otp_static_statictoken USING btree (token);
+CREATE INDEX otp_static_statictoken_token_d0a51866 ON public.authentik_stages_authenticator_static_statictoken USING btree (token);
 
 
 --
 -- Name: otp_static_statictoken_token_d0a51866_like; Type: INDEX; Schema: public; Owner: authentik
 --
 
-CREATE INDEX otp_static_statictoken_token_d0a51866_like ON public.otp_static_statictoken USING btree (token varchar_pattern_ops);
+CREATE INDEX otp_static_statictoken_token_d0a51866_like ON public.authentik_stages_authenticator_static_statictoken USING btree (token varchar_pattern_ops);
 
 
 --
 -- Name: otp_totp_totpdevice_user_id_0fb18292; Type: INDEX; Schema: public; Owner: authentik
 --
 
-CREATE INDEX otp_totp_totpdevice_user_id_0fb18292 ON public.otp_totp_totpdevice USING btree (user_id);
+CREATE INDEX otp_totp_totpdevice_user_id_0fb18292 ON public.authentik_stages_authenticator_totp_totpdevice USING btree (user_id);
 
 
 --
@@ -6888,6 +7594,14 @@ ALTER TABLE ONLY public.authentik_core_authenticatedsession
     ADD CONSTRAINT authentik_core_authe_user_id_5055b6cf_fk_authentik FOREIGN KEY (user_id) REFERENCES public.authentik_core_user(id) DEFERRABLE INITIALLY DEFERRED;
 
 
+--
+-- Name: authentik_core_group_roles authentik_core_group_group_id_43a283e0_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_core_group_roles
+    ADD CONSTRAINT authentik_core_group_group_id_43a283e0_fk_authentik FOREIGN KEY (group_id) REFERENCES public.authentik_core_group(group_uuid) DEFERRABLE INITIALLY DEFERRED;
+
+
 --
 -- Name: authentik_core_group authentik_core_group_parent_id_c2cd3508_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
 --
@@ -6896,6 +7610,22 @@ ALTER TABLE ONLY public.authentik_core_group
     ADD CONSTRAINT authentik_core_group_parent_id_c2cd3508_fk_authentik FOREIGN KEY (parent_id) REFERENCES public.authentik_core_group(group_uuid) DEFERRABLE INITIALLY DEFERRED;
 
 
+--
+-- Name: authentik_core_group_roles authentik_core_group_role_id_5b9a84fe_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_core_group_roles
+    ADD CONSTRAINT authentik_core_group_role_id_5b9a84fe_fk_authentik FOREIGN KEY (role_id) REFERENCES public.authentik_rbac_role(uuid) DEFERRABLE INITIALLY DEFERRED;
+
+
+--
+-- Name: authentik_core_provider authentik_core_provi_authentication_flow__49dea03c_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_core_provider
+    ADD CONSTRAINT authentik_core_provi_authentication_flow__49dea03c_fk_authentik FOREIGN KEY (authentication_flow_id) REFERENCES public.authentik_flows_flow(flow_uuid) DEFERRABLE INITIALLY DEFERRED;
+
+
 --
 -- Name: authentik_core_provider authentik_core_provi_authorization_flow_i_1482437b_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
 --
@@ -6904,6 +7634,14 @@ ALTER TABLE ONLY public.authentik_core_provider
     ADD CONSTRAINT authentik_core_provi_authorization_flow_i_1482437b_fk_authentik FOREIGN KEY (authorization_flow_id) REFERENCES public.authentik_flows_flow(flow_uuid) DEFERRABLE INITIALLY DEFERRED;
 
 
+--
+-- Name: authentik_core_provider authentik_core_provi_backchannel_applicat_a972ebd6_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_core_provider
+    ADD CONSTRAINT authentik_core_provi_backchannel_applicat_a972ebd6_fk_authentik FOREIGN KEY (backchannel_application_id) REFERENCES public.authentik_core_application(policybindingmodel_ptr_id) DEFERRABLE INITIALLY DEFERRED;
+
+
 --
 -- Name: authentik_core_provider_property_mappings authentik_core_provi_propertymapping_id_7d1de2b7_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
 --
@@ -7296,6 +8034,22 @@ ALTER TABLE ONLY public.authentik_providers_proxy_proxyprovider
     ADD CONSTRAINT authentik_providers__certificate_id_b1e0c422_fk_authentik FOREIGN KEY (certificate_id) REFERENCES public.authentik_crypto_certificatekeypair(kp_uuid) DEFERRABLE INITIALLY DEFERRED;
 
 
+--
+-- Name: authentik_providers_scim_scimprovider authentik_providers__filter_group_id_1aca1276_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_providers_scim_scimprovider
+    ADD CONSTRAINT authentik_providers__filter_group_id_1aca1276_fk_authentik FOREIGN KEY (filter_group_id) REFERENCES public.authentik_core_group(group_uuid) DEFERRABLE INITIALLY DEFERRED;
+
+
+--
+-- Name: authentik_providers_scim_scimgroup authentik_providers__group_id_071f6834_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_providers_scim_scimgroup
+    ADD CONSTRAINT authentik_providers__group_id_071f6834_fk_authentik FOREIGN KEY (group_id) REFERENCES public.authentik_core_group(group_uuid) DEFERRABLE INITIALLY DEFERRED;
+
+
 --
 -- Name: authentik_providers_saml_samlprovider authentik_providers__name_id_mapping_id_5d45f77f_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
 --
@@ -7328,6 +8082,14 @@ ALTER TABLE ONLY public.authentik_providers_oauth2_oauth2provider_jwks_sources
     ADD CONSTRAINT authentik_providers__oauthsource_id_41457c33_fk_authentik FOREIGN KEY (oauthsource_id) REFERENCES public.authentik_sources_oauth_oauthsource(source_ptr_id) DEFERRABLE INITIALLY DEFERRED;
 
 
+--
+-- Name: authentik_providers_scim_scimprovider_property_mappings_group authentik_providers__propertymapping_id_7ea3950a_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_providers_scim_scimprovider_property_mappings_group
+    ADD CONSTRAINT authentik_providers__propertymapping_id_7ea3950a_fk_authentik FOREIGN KEY (propertymapping_id) REFERENCES public.authentik_core_propertymapping(pm_uuid) DEFERRABLE INITIALLY DEFERRED;
+
+
 --
 -- Name: authentik_providers_oauth2_scopemapping authentik_providers__propertymapping_ptr__37f1d926_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
 --
@@ -7344,6 +8106,30 @@ ALTER TABLE ONLY public.authentik_providers_saml_samlpropertymapping
     ADD CONSTRAINT authentik_providers__propertymapping_ptr__812e8cfb_fk_authentik FOREIGN KEY (propertymapping_ptr_id) REFERENCES public.authentik_core_propertymapping(pm_uuid) DEFERRABLE INITIALLY DEFERRED;
 
 
+--
+-- Name: authentik_providers_scim_scimmapping authentik_providers__propertymapping_ptr__bd79ae32_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_providers_scim_scimmapping
+    ADD CONSTRAINT authentik_providers__propertymapping_ptr__bd79ae32_fk_authentik FOREIGN KEY (propertymapping_ptr_id) REFERENCES public.authentik_core_propertymapping(pm_uuid) DEFERRABLE INITIALLY DEFERRED;
+
+
+--
+-- Name: authentik_providers_scim_scimuser authentik_providers__provider_id_08127ac7_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_providers_scim_scimuser
+    ADD CONSTRAINT authentik_providers__provider_id_08127ac7_fk_authentik FOREIGN KEY (provider_id) REFERENCES public.authentik_providers_scim_scimprovider(provider_ptr_id) DEFERRABLE INITIALLY DEFERRED;
+
+
+--
+-- Name: authentik_providers_scim_scimgroup authentik_providers__provider_id_29f58417_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_providers_scim_scimgroup
+    ADD CONSTRAINT authentik_providers__provider_id_29f58417_fk_authentik FOREIGN KEY (provider_id) REFERENCES public.authentik_providers_scim_scimprovider(provider_ptr_id) DEFERRABLE INITIALLY DEFERRED;
+
+
 --
 -- Name: authentik_providers_oauth2_accesstoken authentik_providers__provider_id_40ef5d24_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
 --
@@ -7392,6 +8178,22 @@ ALTER TABLE ONLY public.authentik_providers_oauth2_oauth2provider
     ADD CONSTRAINT authentik_providers__provider_ptr_id_76903270_fk_authentik FOREIGN KEY (provider_ptr_id) REFERENCES public.authentik_core_provider(id) DEFERRABLE INITIALLY DEFERRED;
 
 
+--
+-- Name: authentik_providers_scim_scimprovider authentik_providers__provider_ptr_id_77bcf9bd_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_providers_scim_scimprovider
+    ADD CONSTRAINT authentik_providers__provider_ptr_id_77bcf9bd_fk_authentik FOREIGN KEY (provider_ptr_id) REFERENCES public.authentik_core_provider(id) DEFERRABLE INITIALLY DEFERRED;
+
+
+--
+-- Name: authentik_providers_radius_radiusprovider authentik_providers__provider_ptr_id_908e5d8a_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_providers_radius_radiusprovider
+    ADD CONSTRAINT authentik_providers__provider_ptr_id_908e5d8a_fk_authentik FOREIGN KEY (provider_ptr_id) REFERENCES public.authentik_core_provider(id) DEFERRABLE INITIALLY DEFERRED;
+
+
 --
 -- Name: authentik_providers_ldap_ldapprovider authentik_providers__provider_ptr_id_deae38fd_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
 --
@@ -7400,6 +8202,14 @@ ALTER TABLE ONLY public.authentik_providers_ldap_ldapprovider
     ADD CONSTRAINT authentik_providers__provider_ptr_id_deae38fd_fk_authentik FOREIGN KEY (provider_ptr_id) REFERENCES public.authentik_core_provider(id) DEFERRABLE INITIALLY DEFERRED;
 
 
+--
+-- Name: authentik_providers_scim_scimprovider_property_mappings_group authentik_providers__scimprovider_id_c3c41ae0_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_providers_scim_scimprovider_property_mappings_group
+    ADD CONSTRAINT authentik_providers__scimprovider_id_c3c41ae0_fk_authentik FOREIGN KEY (scimprovider_id) REFERENCES public.authentik_providers_scim_scimprovider(provider_ptr_id) DEFERRABLE INITIALLY DEFERRED;
+
+
 --
 -- Name: authentik_providers_ldap_ldapprovider authentik_providers__search_group_id_64713cfa_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
 --
@@ -7432,6 +8242,14 @@ ALTER TABLE ONLY public.authentik_providers_oauth2_devicetoken
     ADD CONSTRAINT authentik_providers__user_id_17317b6d_fk_authentik FOREIGN KEY (user_id) REFERENCES public.authentik_core_user(id) DEFERRABLE INITIALLY DEFERRED;
 
 
+--
+-- Name: authentik_providers_scim_scimuser authentik_providers__user_id_63e0ca83_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_providers_scim_scimuser
+    ADD CONSTRAINT authentik_providers__user_id_63e0ca83_fk_authentik FOREIGN KEY (user_id) REFERENCES public.authentik_core_user(id) DEFERRABLE INITIALLY DEFERRED;
+
+
 --
 -- Name: authentik_providers_oauth2_accesstoken authentik_providers__user_id_7261588f_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
 --
@@ -7464,6 +8282,22 @@ ALTER TABLE ONLY public.authentik_providers_saml_samlprovider
     ADD CONSTRAINT authentik_providers__verification_kp_id_7b0fbd80_fk_authentik FOREIGN KEY (verification_kp_id) REFERENCES public.authentik_crypto_certificatekeypair(kp_uuid) DEFERRABLE INITIALLY DEFERRED;
 
 
+--
+-- Name: authentik_rbac_role authentik_rbac_role_group_id_d8509027_fk_auth_group_id; Type: FK CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_rbac_role
+    ADD CONSTRAINT authentik_rbac_role_group_id_d8509027_fk_auth_group_id FOREIGN KEY (group_id) REFERENCES public.auth_group(id) DEFERRABLE INITIALLY DEFERRED;
+
+
+--
+-- Name: authentik_sources_ldap_ldapsource authentik_sources_ld_client_certificate_i_937bc1c9_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_sources_ldap_ldapsource
+    ADD CONSTRAINT authentik_sources_ld_client_certificate_i_937bc1c9_fk_authentik FOREIGN KEY (client_certificate_id) REFERENCES public.authentik_crypto_certificatekeypair(kp_uuid) DEFERRABLE INITIALLY DEFERRED;
+
+
 --
 -- Name: authentik_sources_ldap_ldapsource_property_mappings_group authentik_sources_ld_ldapsource_id_4eff95ce_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
 --
@@ -7576,6 +8410,14 @@ ALTER TABLE ONLY public.authentik_sources_saml_usersamlsourceconnection
     ADD CONSTRAINT authentik_sources_sa_usersourceconnection_b6d9dcfe_fk_authentik FOREIGN KEY (usersourceconnection_ptr_id) REFERENCES public.authentik_core_usersourceconnection(id) DEFERRABLE INITIALLY DEFERRED;
 
 
+--
+-- Name: authentik_sources_saml_samlsource authentik_sources_sa_verification_kp_id_f76620d9_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
+--
+
+ALTER TABLE ONLY public.authentik_sources_saml_samlsource
+    ADD CONSTRAINT authentik_sources_sa_verification_kp_id_f76620d9_fk_authentik FOREIGN KEY (verification_kp_id) REFERENCES public.authentik_crypto_certificatekeypair(kp_uuid) DEFERRABLE INITIALLY DEFERRED;
+
+
 --
 -- Name: authentik_stages_authenticator_validate_authenticatorvalida3e25 authentik_stages_aut_authenticatorvalidat_aff63c61_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
 --
@@ -8065,26 +8907,26 @@ ALTER TABLE ONLY public.guardian_userobjectpermission
 
 
 --
--- Name: otp_static_staticdevice otp_static_staticdev_user_id_7f9cff2b_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
+-- Name: authentik_stages_authenticator_static_staticdevice otp_static_staticdev_user_id_7f9cff2b_fk_authentik; Type: FK CONSTRAINT; Schema: public; Owner: authentik
 --
 
-ALTER TABLE ONLY public.otp_static_staticdevice
+ALTER TABLE ONLY public.authentik_stages_authenticator_static_staticdevice
     ADD CONSTRAINT otp_static_staticdev_user_id_7f9cff2b_fk_authentik FOREIGN KEY (user_id) REFERENCES public.authentik_core_user(id) DEFERRABLE INITIALLY DEFERRED;
 
 
 --
--- Name: otp_static_statictoken otp_static_statictok_device_id_74b7c7d1_fk_otp_stati; Type: FK CONSTRAINT; Schema: public; Owner: authentik
+-- Name: authentik_stages_authenticator_static_statictoken otp_static_statictok_device_id_74b7c7d1_fk_otp_stati; Type: FK CONSTRAINT; Schema: public; Owner: authentik
 --
 
-ALTER TABLE ONLY public.otp_static_statictoken
-    ADD CONSTRAINT otp_static_statictok_device_id_74b7c7d1_fk_otp_stati FOREIGN KEY (device_id) REFERENCES public.otp_static_staticdevice(id) DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE ONLY public.authentik_stages_authenticator_static_statictoken
+    ADD CONSTRAINT otp_static_statictok_device_id_74b7c7d1_fk_otp_stati FOREIGN KEY (device_id) REFERENCES public.authentik_stages_authenticator_static_staticdevice(id) DEFERRABLE INITIALLY DEFERRED;
 
 
 --
--- Name: otp_totp_totpdevice otp_totp_totpdevice_user_id_0fb18292_fk_authentik_core_user_id; Type: FK CONSTRAINT; Schema: public; Owner: authentik
+-- Name: authentik_stages_authenticator_totp_totpdevice otp_totp_totpdevice_user_id_0fb18292_fk_authentik_core_user_id; Type: FK CONSTRAINT; Schema: public; Owner: authentik
 --
 
-ALTER TABLE ONLY public.otp_totp_totpdevice
+ALTER TABLE ONLY public.authentik_stages_authenticator_totp_totpdevice
     ADD CONSTRAINT otp_totp_totpdevice_user_id_0fb18292_fk_authentik_core_user_id FOREIGN KEY (user_id) REFERENCES public.authentik_core_user(id) DEFERRABLE INITIALLY DEFERRED;
 
 
diff --git a/devenv/docker/blocks/auth/authentik/docker-compose.yaml b/devenv/docker/blocks/auth/authentik/docker-compose.yaml
index 6d16b4e7a36be..5457ed51460dd 100644
--- a/devenv/docker/blocks/auth/authentik/docker-compose.yaml
+++ b/devenv/docker/blocks/auth/authentik/docker-compose.yaml
@@ -1,5 +1,5 @@
   authentikdb:
-    image: docker.io/library/postgres:12-alpine
+    image: docker.io/library/postgres:16-alpine
     restart: unless-stopped
     container_name: authentikdb
     environment:
@@ -39,7 +39,7 @@
       - "authentik:authentik"
 
   authentik:
-    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2023.5.1}
+    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2023.10.6}
     restart: unless-stopped
     container_name: authentik
     command: server
@@ -66,7 +66,7 @@
       - "authentikredis:authentikredis"
 
   authentik-worker:
-    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2023.5.1}
+    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2023.10.6}
     restart: unless-stopped
     container_name: authentik-worker
     command: worker
diff --git a/devenv/docker/blocks/auth/jwt_proxy/cloak.sql b/devenv/docker/blocks/auth/jwt_proxy/cloak.sql
index 653caaa1e2223..ec1c6f005a5b7 100644
--- a/devenv/docker/blocks/auth/jwt_proxy/cloak.sql
+++ b/devenv/docker/blocks/auth/jwt_proxy/cloak.sql
@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 12.2 (Debian 12.2-2.pgdg100+1)
--- Dumped by pg_dump version 12.2 (Debian 12.2-2.pgdg100+1)
+-- Dumped from database version 16.1
+-- Dumped by pg_dump version 16.1
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
@@ -386,7 +386,7 @@ CREATE TABLE public.component_config (
     id character varying(36) NOT NULL,
     component_id character varying(36) NOT NULL,
     name character varying(255) NOT NULL,
-    value character varying(4000)
+    value text
 );
 
 
@@ -488,7 +488,8 @@ CREATE TABLE public.event_entity (
     session_id character varying(255),
     event_time bigint,
     type character varying(255),
-    user_id character varying(255)
+    user_id character varying(255),
+    details_json_long_value text
 );
 
 
@@ -1097,7 +1098,7 @@ ALTER TABLE public.resource_scope OWNER TO keycloak;
 CREATE TABLE public.resource_server (
     id character varying(36) NOT NULL,
     allow_rs_remote_mgmt boolean DEFAULT false NOT NULL,
-    policy_enforce_mode character varying(15) NOT NULL,
+    policy_enforce_mode smallint NOT NULL,
     decision_strategy smallint DEFAULT 1 NOT NULL
 );
 
@@ -1132,8 +1133,8 @@ CREATE TABLE public.resource_server_policy (
     name character varying(255) NOT NULL,
     description character varying(255),
     type character varying(255) NOT NULL,
-    decision_strategy character varying(20),
-    logic character varying(20),
+    decision_strategy smallint,
+    logic smallint,
     resource_server_id character varying(36) NOT NULL,
     owner character varying(255)
 );
@@ -1484,7 +1485,6 @@ bfbcc1e9-f129-4336-a0cd-b6960a811bd9	\N	direct-grant-validate-password	master	5f
 5a2470c4-3136-4cf0-8383-e74a413ccd48	\N	direct-grant-validate-otp	master	99865746-4232-46f0-84b5-20952fe9eb51	0	20	f	\N	\N
 47c96943-ad68-4d93-afff-ff54fc86eb0b	\N	registration-page-form	master	1695e7d2-ad80-4502-8479-8121a6e2a2f0	0	10	t	8fb96669-d28d-4173-a8f4-dc24d41c7d27	\N
 a6678624-1bd4-4793-bfac-68551cf0ac7c	\N	registration-user-creation	master	8fb96669-d28d-4173-a8f4-dc24d41c7d27	0	20	f	\N	\N
-5b45827d-5dfd-4152-a99e-373cb975ef87	\N	registration-profile-action	master	8fb96669-d28d-4173-a8f4-dc24d41c7d27	0	40	f	\N	\N
 5a2fb70d-63ae-4604-b37c-ae043d6a900d	\N	registration-password-action	master	8fb96669-d28d-4173-a8f4-dc24d41c7d27	0	50	f	\N	\N
 0b06a30e-daa7-498a-9fdb-899abbf36450	\N	registration-recaptcha-action	master	8fb96669-d28d-4173-a8f4-dc24d41c7d27	3	60	f	\N	\N
 b6ab0b5d-8184-4609-bb81-da8413dfb858	\N	reset-credentials-choose-user	master	954b046d-2b24-405e-84ee-c44ffe603df2	0	10	f	\N	\N
@@ -1511,11 +1511,6 @@ d600bb67-e258-44be-8f69-f1bae9c35a0f	\N	idp-username-password-form	master	ca3a36
 90cc39a9-cddb-49bd-b9f5-d64d03341333	\N	auth-otp-form	master	a7d23655-efbb-4950-8ab6-50dbc85681a0	0	20	f	\N	\N
 b0634301-594e-42db-9736-6c90ebbeb8b2	\N	http-basic-authenticator	master	57c56583-d91c-4399-bd15-05a1a17d48c1	0	10	f	\N	\N
 34fa4d44-716b-4b2a-b98e-aa9748154292	\N	docker-http-basic-authenticator	master	032b05cf-0007-44da-a370-b42039f6b762	0	10	f	\N	\N
-4838277a-46ea-4d95-bd86-d8dc6fdce352	\N	no-cookie-redirect	master	1c7af06b-3085-46c3-849c-34c67f581b9e	0	10	f	\N	\N
-59a349ee-20ce-42d8-b20b-8f902c09742d	\N	\N	master	1c7af06b-3085-46c3-849c-34c67f581b9e	0	20	t	85c00992-77dd-4262-8744-a9dd8521e98e	\N
-d9b5fa46-6595-4406-9841-2c0720dbf644	\N	basic-auth	master	85c00992-77dd-4262-8744-a9dd8521e98e	0	10	f	\N	\N
-3a4ee6f1-1528-47c7-aeda-f317248b3b93	\N	basic-auth-otp	master	85c00992-77dd-4262-8744-a9dd8521e98e	3	20	f	\N	\N
-014847fc-06df-4ddf-a8f2-deeb0f1eb59a	\N	auth-spnego	master	85c00992-77dd-4262-8744-a9dd8521e98e	3	30	f	\N	\N
 b46bc4f6-2fe5-44d5-b47f-36880742cf50	\N	auth-cookie	grafana	a38aeb47-f27e-4e68-82ff-7cc7371a47a7	2	10	f	\N	\N
 6cec48cc-066a-4e3e-8158-85351bfa4c27	\N	auth-spnego	grafana	a38aeb47-f27e-4e68-82ff-7cc7371a47a7	3	20	f	\N	\N
 63c55c5a-ad11-4f83-9d6e-d8ca2efcaf66	\N	identity-provider-redirector	grafana	a38aeb47-f27e-4e68-82ff-7cc7371a47a7	2	25	f	\N	\N
@@ -1530,7 +1525,6 @@ b46bc4f6-2fe5-44d5-b47f-36880742cf50	\N	auth-cookie	grafana	a38aeb47-f27e-4e68-8
 d87abeef-9f1d-46f5-9f36-acd7eaf21a72	\N	direct-grant-validate-otp	grafana	b3491338-0630-4232-97e7-a518c254b248	0	20	f	\N	\N
 4f204bab-0311-44b4-80b6-37d23fd0fd5a	\N	registration-page-form	grafana	9d02badd-cb1c-4655-bf5e-f888861433ff	0	10	t	c3ed2ad1-cfb4-49fa-8c75-cf5047527c68	\N
 2d4ee446-623c-42a0-8d4a-9f6c4f7f28ec	\N	registration-user-creation	grafana	c3ed2ad1-cfb4-49fa-8c75-cf5047527c68	0	20	f	\N	\N
-d806effc-dd17-4468-9a98-4e1c2f9e799d	\N	registration-profile-action	grafana	c3ed2ad1-cfb4-49fa-8c75-cf5047527c68	0	40	f	\N	\N
 306fa749-c191-43c6-bf04-0eb6d3d02732	\N	registration-password-action	grafana	c3ed2ad1-cfb4-49fa-8c75-cf5047527c68	0	50	f	\N	\N
 7de9bbee-eb3d-4f3e-a134-e7e8d4a6df25	\N	registration-recaptcha-action	grafana	c3ed2ad1-cfb4-49fa-8c75-cf5047527c68	3	60	f	\N	\N
 8a31d18e-1622-4eac-8eff-9434fa9cade3	\N	reset-credentials-choose-user	grafana	3085fb68-fc1f-4e1c-a8be-33fb45194b04	0	10	f	\N	\N
@@ -1557,11 +1551,6 @@ b8ce6905-73eb-493b-9ce1-408ec55e3c46	\N	conditional-user-configured	grafana	21fb
 54d7692d-c0e3-40ef-9ef9-d9e8227d618d	\N	auth-otp-form	grafana	21fbd70a-286f-431a-abc4-fbf6590fcdc3	0	20	f	\N	\N
 3722f24d-6ffb-4b20-a481-1fd8a17afdf6	\N	http-basic-authenticator	grafana	ba53abf5-9a64-4371-810b-67378eb3d781	0	10	f	\N	\N
 a700b05f-a61d-4eeb-ad75-1a3df05ed429	\N	docker-http-basic-authenticator	grafana	95e02703-f5bc-4e04-8bef-f6adc2d8173f	0	10	f	\N	\N
-035c4f94-03a6-4101-a729-f3c01ee4c490	\N	no-cookie-redirect	grafana	f397495e-d073-4ef1-babf-569a338db596	0	10	f	\N	\N
-29f310db-b302-44b2-9182-4b91648cbabf	\N	\N	grafana	f397495e-d073-4ef1-babf-569a338db596	0	20	t	56c40f89-4d69-46fd-bb18-d6c01808d2af	\N
-4e7d257c-e013-4597-a44d-b186a85606af	\N	basic-auth	grafana	56c40f89-4d69-46fd-bb18-d6c01808d2af	0	10	f	\N	\N
-2ba05817-a59f-4e72-a565-f3b4591390dc	\N	basic-auth-otp	grafana	56c40f89-4d69-46fd-bb18-d6c01808d2af	3	20	f	\N	\N
-5db9c781-6718-4674-a833-9a4ac3e8212e	\N	auth-spnego	grafana	56c40f89-4d69-46fd-bb18-d6c01808d2af	3	30	f	\N	\N
 5f032dbb-bd37-425b-af1e-ba555c7a8245	\N	\N	grafana	b478ecfb-db7e-4797-a245-8fc3b4dec884	1	30	t	b3491338-0630-4232-97e7-a518c254b248	\N
 \.
 
@@ -1589,8 +1578,6 @@ ca3a3600-552c-4849-9a9d-826c8aa3e646	Verify Existing Account by Re-authenticatio
 a7d23655-efbb-4950-8ab6-50dbc85681a0	First broker login - Conditional OTP	Flow to determine if the OTP is required for the authentication	master	basic-flow	f	t
 57c56583-d91c-4399-bd15-05a1a17d48c1	saml ecp	SAML ECP Profile Authentication Flow	master	basic-flow	t	t
 032b05cf-0007-44da-a370-b42039f6b762	docker auth	Used by Docker clients to authenticate against the IDP	master	basic-flow	t	t
-1c7af06b-3085-46c3-849c-34c67f581b9e	http challenge	An authentication flow based on challenge-response HTTP Authentication Schemes	master	basic-flow	t	t
-85c00992-77dd-4262-8744-a9dd8521e98e	Authentication Options	Authentication options.	master	basic-flow	f	t
 a38aeb47-f27e-4e68-82ff-7cc7371a47a7	browser	browser based authentication	grafana	basic-flow	t	t
 c53e357f-e276-43aa-b36c-46366a7ffd35	forms	Username, password, otp and other auth forms.	grafana	basic-flow	f	t
 cf4831e9-3e1d-452e-984e-e6d4d9eeafb5	Browser - Conditional OTP	Flow to determine if the OTP is required for the authentication	grafana	basic-flow	f	t
@@ -1609,8 +1596,6 @@ df86516c-dcb1-41a8-877e-eb8805bcac8c	User creation or linking	Flow for the exist
 21fbd70a-286f-431a-abc4-fbf6590fcdc3	First broker login - Conditional OTP	Flow to determine if the OTP is required for the authentication	grafana	basic-flow	f	t
 ba53abf5-9a64-4371-810b-67378eb3d781	saml ecp	SAML ECP Profile Authentication Flow	grafana	basic-flow	t	t
 95e02703-f5bc-4e04-8bef-f6adc2d8173f	docker auth	Used by Docker clients to authenticate against the IDP	grafana	basic-flow	t	t
-f397495e-d073-4ef1-babf-569a338db596	http challenge	An authentication flow based on challenge-response HTTP Authentication Schemes	grafana	basic-flow	t	t
-56c40f89-4d69-46fd-bb18-d6c01808d2af	Authentication Options	Authentication options.	grafana	basic-flow	f	t
 \.
 
 
@@ -1840,6 +1825,7 @@ d30340a8-630b-416e-8c93-3ccf932d34f3	false	display.on.consent.screen
 d30340a8-630b-416e-8c93-3ccf932d34f3	false	include.in.token.scope
 a96603aa-e6db-4b3e-8baa-679c75ccfc8f	false	display.on.consent.screen
 a96603aa-e6db-4b3e-8baa-679c75ccfc8f	false	include.in.token.scope
+c61f5b19-c17e-49a1-91b8-a0296411b928		gui.order
 \.
 
 
@@ -1979,6 +1965,7 @@ a8698f4f-5fa1-4baa-be05-87d03052af49	c61f5b19-c17e-49a1-91b8-a0296411b928	f
 169f1dea-80f0-4a99-8509-9abb70ab0a5c	a5bb3a5f-fd26-4be6-9557-26e20a03d33d	f
 169f1dea-80f0-4a99-8509-9abb70ab0a5c	d6ffe9fc-a03c-4496-85dc-dbb5e7754587	f
 169f1dea-80f0-4a99-8509-9abb70ab0a5c	c61f5b19-c17e-49a1-91b8-a0296411b928	f
+09b79548-8426-4c0e-8e0b-7488467532c7	c61f5b19-c17e-49a1-91b8-a0296411b928	t
 \.
 
 
@@ -2086,6 +2073,7 @@ d47557df-07ff-4cae-bedd-b584c0697852	f95566ed-b955-4668-88fc-e7413fd98615	allowe
 2ae4acc4-c6d6-4d2f-92c6-3a222a7d078a	28d2466c-5af6-4786-a8a2-c25d6cb4833f	allowed-protocol-mapper-types	oidc-sha256-pairwise-sub-mapper
 880a35e4-65a1-4697-836d-fbc46641d676	28d2466c-5af6-4786-a8a2-c25d6cb4833f	allowed-protocol-mapper-types	oidc-full-name-mapper
 b087e631-754f-4c03-8cfc-354c7e7456fe	28d2466c-5af6-4786-a8a2-c25d6cb4833f	allowed-protocol-mapper-types	oidc-usermodel-property-mapper
+258b8704-0587-4208-996f-96627992e370	80af2f23-4a51-498a-a011-732cf9cfa8f8	priority	100
 079e63d4-0862-4e63-a62f-1a168cbbc25c	28d2466c-5af6-4786-a8a2-c25d6cb4833f	allowed-protocol-mapper-types	saml-user-property-mapper
 da61fbc2-7533-4bc1-b0c4-357db9f108e4	28d2466c-5af6-4786-a8a2-c25d6cb4833f	allowed-protocol-mapper-types	oidc-address-mapper
 37a4be58-26b0-4d4a-9c41-a89b27fc25f6	28d2466c-5af6-4786-a8a2-c25d6cb4833f	allowed-protocol-mapper-types	saml-user-attribute-mapper
@@ -2112,7 +2100,6 @@ bb8c28ca-bb74-4a07-82c3-8293354517be	9877acf2-e1cc-4038-a3c2-75db29b432e0	secret
 64ea89c8-a2ce-4d2d-896d-aa49e7ca9fcc	9877acf2-e1cc-4038-a3c2-75db29b432e0	kid	7d80efc5-222b-4b6d-9b99-c3b516a59733
 bec1483f-75e7-46e8-916c-102db4cbefb5	80af2f23-4a51-498a-a011-732cf9cfa8f8	certificate	MIICnTCCAYUCBgF+u1ir8jANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdncmFmYW5hMB4XDTIyMDIwMjE2NDkxN1oXDTMyMDIwMjE2NTA1N1owEjEQMA4GA1UEAwwHZ3JhZmFuYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKg5kB303DkDs5jSW1b7b7kvKfxIJorHD+7wPz2TcisfTu7rchrqAJiR/HtsPICyAw1h5ef8fGgCJf/k0z00osl/COvK8iHUdvGUnubuKUXaVwlbyaTnnyjSMUAkx+67OCrkY9B2drtZrtVc+fwnggqCsCkpoXg97tcUyfPlcUJnanxsYbirZ5KH+/e+x1jlsuBiwxascmB4IoT/zJknk5l1IVXmSOiDgqhzKRfHhVlRijOlfKyCn/EDtiv7wyQTP9wvd97zGPJqkkF2yNxueMftJsgGkF6+CZMY71BioOWAt2V8OwI32b/1v30DhtBmKdoUNGpEeCjSk91zzZqTFZUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEABlW64QxuREB81VMGsyhj4Q5RykFaVuD5O8YlwUpmVfAVLzb0Drf54Kn4bnpnckKyYV+T+HsN4QXt81UE41xH0Aai2H3vrGH+PJf6aLPCDE+jpMqtN3n6IgImJXJPL8upMfhhWDv4nkM4uynEwWupzmrKi4oJuTETSMktJby4o6//XWnCzCVMoAGFJU4gtjBUzOMLW26zD+yc+BuUtfR3HzItVHSZKQSNSFO0kVS68RgrER8qJw07z3BOJ2bPpPM0PYyEngGMaowz/T6lI32ymGMWYMAnslthS1KAW9xcTBwnrW1nMhe5a0LPxIktys/wJtxIHZLc5sOddGT4xYklLg==
 48e8b904-1393-43a4-aaa1-30e2d9634b36	80af2f23-4a51-498a-a011-732cf9cfa8f8	privateKey	MIIEowIBAAKCAQEAqDmQHfTcOQOzmNJbVvtvuS8p/EgmiscP7vA/PZNyKx9O7utyGuoAmJH8e2w8gLIDDWHl5/x8aAIl/+TTPTSiyX8I68ryIdR28ZSe5u4pRdpXCVvJpOefKNIxQCTH7rs4KuRj0HZ2u1mu1Vz5/CeCCoKwKSmheD3u1xTJ8+VxQmdqfGxhuKtnkof7977HWOWy4GLDFqxyYHgihP/MmSeTmXUhVeZI6IOCqHMpF8eFWVGKM6V8rIKf8QO2K/vDJBM/3C933vMY8mqSQXbI3G54x+0myAaQXr4JkxjvUGKg5YC3ZXw7AjfZv/W/fQOG0GYp2hQ0akR4KNKT3XPNmpMVlQIDAQABAoIBAF3kEt3FZoyj1j97WOOJXmf7PPHDy081n1z61jEl9FjBFqse2gbPiBmfkU3JsVMbB70WYN1D/KOIX3EdZBELKbhQoMgJ826SSPi4vJ+jWYHVRTLB+h+B70E3X6mvXa+O6uB1rIgTNl2Gxp/rTtM/scLwAiZXR/n2hzGgNr9b1gT7D7kyCUIKDiJsQed2pA6ZbSDNTQQDE2qeN/Rr/+VV4XRuIIdBXn+Brap8ihjx4Gnn/SDBKM3MZoacwgS+9CZNhLjs8Ou4xD+KyitbbGGY4ZK/ZW2eSAH4ra8vVGTDK6bJrMTAE/73A23Evp/sKtRkFqcNumJ3rCykcAJorDUK48ECgYEA0TpkTwK6f2a72ncmw7Xzy4zdu+FdkI9PzWmS4IrbYOYRwsRMQLowsUPIdtU0EMrs7PRl1dSQa3/kAnw5J8wogkqVf4dJ3/lb/N5qtsjHP87N35QMXnMdE/BC6o7t5e+iRoHMloAuSBonGC9uBn1UeHWrNeLCB8+upJoSEBKbEQ0CgYEAzdSoKL4CJo31gVEqoJFPzPemsYGmV6Zl1Vj8mqMbQd8wcJoSJWbNV/3sfpIqdvOJOXQrzm+LYIbhhUnS3ZlGBmFsqUtC7dw3AqLg53msCyJLxmCIib0m/ONCY9qczV4OkUM6HVAdgzmMqqhk5ZB70IdUyStn2meqXKXLGFlLJKkCgYEAuizHTTcUVIFJ7x/PMp8ZjKqQM7pZ02Rykkm7FGr6wsJ2U2TwpTgIU/QI0RTt+3NWV5MxepBm4gEvFrcK9MrJ0QYk+RGdPttYay5Ors8B3Vlb//Jw/ypXWYKVSLpeHhiZwTuGnPT6OdZrqy2pLcUgAQBTlONt3B2FPZqLMBoeOZECgYBuCwm0bpF7x13AO4LMwaOmc6jdMfGa3s2G2MKEcjt6ZjbhnJ2i/Wk/Z/RuXvrxCZcN7nwVLDGZ88LSnftsmiuD8cZEZIZt4NRQRoBzgOtoMHfOoYGeElCr11yBQjme2nBzXTvOvCxrIfOAsfLvgOWRQSklPF2TuOSuD72bUPIJsQKBgBbeb8rIXKRRFC3A0IkKm8C51gG8mMgPdxZMKKuVhpb6D8B5aPh+WW44yNOpn7LInYI4jzf3Kv+kcj0PNH3nFaplnyCGFfmUIg27SAsRcrJcTlXtIKooZw6oPU+dQfAo11suArVAVD6OQc/7z99VoIpLN0cUHfS/g0H1dx/r/32o
-258b8704-0587-4208-996f-96627992e370	80af2f23-4a51-498a-a011-732cf9cfa8f8	priority	100
 12cd94c5-bd7e-4a5c-95e2-256b0bcf14bd	261e38de-3e1f-40a3-9200-f5aac1975701	allowed-protocol-mapper-types	oidc-address-mapper
 f33b34f1-3793-4786-a281-b286fce52f45	261e38de-3e1f-40a3-9200-f5aac1975701	allowed-protocol-mapper-types	saml-role-list-mapper
 d056c1de-9aa1-46a0-a644-fafb33088967	261e38de-3e1f-40a3-9200-f5aac1975701	allowed-protocol-mapper-types	saml-user-property-mapper
@@ -2226,11 +2213,11 @@ b4c89bc8-3945-4963-80b5-3da62e8c54ad	18a7066b-fe71-410e-9581-69f78347ec29
 --
 
 COPY public.credential (id, salt, type, user_id, created_date, user_label, secret_data, credential_data, priority) FROM stdin;
-d4b2c483-1dd3-47f6-86bf-42548009918d	\N	password	74e29604-ff35-42bb-a26d-4d0b81ef0917	1643820449817	\N	{"value":"Hou7HlbGvohOx6II0VSCP4BIGI4Cyzy+BcXbPUQe/kaMQzNU77kH2pOKZ236UPfkiCyOLe7A3oS0afExA+ymAQ==","salt":"urXvCw0KdWf9s74km4G+lA==","additionalParameters":{}}	{"hashIterations":27500,"algorithm":"pbkdf2-sha256","additionalParameters":{}}	10
 cb2bd4ed-94b8-4259-bcaa-9250c3fb28d3	\N	password	6db3c5e5-b84b-4f9d-a7a8-8d05b03c929d	1657026827644	\N	{"value":"q3Z59Nh/5bdezDEpCwEbMPu8d+VgJ5WetafXkR8l0FlsTTkSDQgW+j6GaM3seJR93p3/jCxyfsvZl062d1pq7w==","salt":"ohuHnjLnwF9dBZ38DRJJWg==","additionalParameters":{}}	{"hashIterations":27500,"algorithm":"pbkdf2-sha256","additionalParameters":{}}	10
-b58e1964-6466-40b2-879c-982b724d7f9c	\N	password	88692d07-bb9a-46cf-844c-7ff5c529cd04	1657026904515	\N	{"value":"+/0zWjiJyE3+dCOEf0SO6G3n1/LsFAVoDAZREKTfN4vQ5xJH8srJoCjxcgb+bI1crMr8gknDlFyGRy7CpYn2VQ==","salt":"v/2okNt3wGOZz+x4DjOCDQ==","additionalParameters":{}}	{"hashIterations":27500,"algorithm":"pbkdf2-sha256","additionalParameters":{}}	10
-3ff7dd8f-a299-4b51-bf5d-99665ccfd313	\N	password	8f58cbec-6e40-4bab-bff0-1c5ff899fe2e	1657026943075	\N	{"value":"nMYodMJMiq/J8g9vRPktGc7WSWnOKr6leMDZX4p9K9KgAUYeXFDSu+d29PWWn0rFn93dL0PNdIdHWNQhfkIDMg==","salt":"rmi9WLHgarmIXGukecSIig==","additionalParameters":{}}	{"hashIterations":27500,"algorithm":"pbkdf2-sha256","additionalParameters":{}}	10
 c9582964-cfdd-49a1-99fb-847604b0c78c	\N	password	1a85b7e0-4baa-420b-89f8-1cea43a540dd	1662480997923	\N	{"value":"ViNTHbpBUNdtH1qGSlip7WFI8Z9lvcGQdbL8Yw48zUgB46jVFbD1eNrOw68p3ovDwfDCIJKm34EFNbw9/uzHSg==","salt":"Z9P8RfnrQwCn0xUTpWC2DQ==","additionalParameters":{}}	{"hashIterations":27500,"algorithm":"pbkdf2-sha256","additionalParameters":{}}	10
+b58e1964-6466-40b2-879c-982b724d7f9c	\N	password	88692d07-bb9a-46cf-844c-7ff5c529cd04	1657026904515	\N	{"value":"L/GNO2HAU90A/ajXqyZyujncf+GfJiLWzNVTIDAVj1k=","salt":"L6WsIapZ+hKo0809G6c6SA==","additionalParameters":{}}	{"hashIterations":27500,"algorithm":"pbkdf2-sha256","additionalParameters":{}}	10
+d4b2c483-1dd3-47f6-86bf-42548009918d	\N	password	74e29604-ff35-42bb-a26d-4d0b81ef0917	1643820449817	\N	{"value":"GweNaTEq3+hCqr5bBhnfqUd0oAiv8G4eUBkQUqtqiTI=","salt":"z64RYF8zRJz9ko0KDrIPxw==","additionalParameters":{}}	{"hashIterations":27500,"algorithm":"pbkdf2-sha256","additionalParameters":{}}	10
+3ff7dd8f-a299-4b51-bf5d-99665ccfd313	\N	password	8f58cbec-6e40-4bab-bff0-1c5ff899fe2e	1657026943075	\N	{"value":"81KWe14rtsbn3SS6YbWzBy2SvBQhmH+0MDHkK7aXCbo=","salt":"CnzQUkkAMD1tPk1KFDDm1w==","additionalParameters":{}}	{"hashIterations":27500,"algorithm":"pbkdf2-sha256","additionalParameters":{}}	10
 \.
 
 
@@ -2239,118 +2226,125 @@ c9582964-cfdd-49a1-99fb-847604b0c78c	\N	password	1a85b7e0-4baa-420b-89f8-1cea43a
 --
 
 COPY public.databasechangelog (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id) FROM stdin;
-authn-3.4.0.CR1-refresh-token-max-reuse	glavoie@gmail.com	META-INF/jpa-changelog-authz-3.4.0.CR1.xml	2022-02-02 16:47:26.706593	49	EXECUTED	\N	addColumn tableName=REALM		\N	3.5.4	\N	\N	3820445829
-1.0.0.Final-KEYCLOAK-5461	sthorger@redhat.com	META-INF/jpa-changelog-1.0.0.Final.xml	2022-02-02 16:47:26.017844	1	EXECUTED	\N	createTable tableName=APPLICATION_DEFAULT_ROLES; createTable tableName=CLIENT; createTable tableName=CLIENT_SESSION; createTable tableName=CLIENT_SESSION_ROLE; createTable tableName=COMPOSITE_ROLE; createTable tableName=CREDENTIAL; createTable tab...		\N	3.5.4	\N	\N	3820445829
-1.0.0.Final-KEYCLOAK-5461	sthorger@redhat.com	META-INF/db2-jpa-changelog-1.0.0.Final.xml	2022-02-02 16:47:26.03122	2	MARK_RAN	\N	createTable tableName=APPLICATION_DEFAULT_ROLES; createTable tableName=CLIENT; createTable tableName=CLIENT_SESSION; createTable tableName=CLIENT_SESSION_ROLE; createTable tableName=COMPOSITE_ROLE; createTable tableName=CREDENTIAL; createTable tab...		\N	3.5.4	\N	\N	3820445829
-1.1.0.Beta1	sthorger@redhat.com	META-INF/jpa-changelog-1.1.0.Beta1.xml	2022-02-02 16:47:26.06085	3	EXECUTED	\N	delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION; createTable tableName=CLIENT_ATTRIBUTES; createTable tableName=CLIENT_SESSION_NOTE; createTable tableName=APP_NODE_REGISTRATIONS; addColumn table...		\N	3.5.4	\N	\N	3820445829
-1.1.0.Final	sthorger@redhat.com	META-INF/jpa-changelog-1.1.0.Final.xml	2022-02-02 16:47:26.065284	4	EXECUTED	\N	renameColumn newColumnName=EVENT_TIME, oldColumnName=TIME, tableName=EVENT_ENTITY		\N	3.5.4	\N	\N	3820445829
-4.8.0-KEYCLOAK-8835	sguilhen@redhat.com	META-INF/jpa-changelog-4.8.0.xml	2022-02-02 16:47:26.928034	70	EXECUTED	\N	addNotNullConstraint columnName=SSO_MAX_LIFESPAN_REMEMBER_ME, tableName=REALM; addNotNullConstraint columnName=SSO_IDLE_TIMEOUT_REMEMBER_ME, tableName=REALM		\N	3.5.4	\N	\N	3820445829
-1.2.0.Beta1	psilva@redhat.com	META-INF/jpa-changelog-1.2.0.Beta1.xml	2022-02-02 16:47:26.130908	5	EXECUTED	\N	delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION_NOTE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION; createTable tableName=PROTOCOL_MAPPER; createTable tableName=PROTOCOL_MAPPER_CONFIG; createTable tableName=...		\N	3.5.4	\N	\N	3820445829
-1.2.0.Beta1	psilva@redhat.com	META-INF/db2-jpa-changelog-1.2.0.Beta1.xml	2022-02-02 16:47:26.133863	6	MARK_RAN	\N	delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION_NOTE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION; createTable tableName=PROTOCOL_MAPPER; createTable tableName=PROTOCOL_MAPPER_CONFIG; createTable tableName=...		\N	3.5.4	\N	\N	3820445829
-1.2.0.RC1	bburke@redhat.com	META-INF/jpa-changelog-1.2.0.CR1.xml	2022-02-02 16:47:26.183318	7	EXECUTED	\N	delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION_NOTE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION_NOTE; delete tableName=USER_SESSION; createTable tableName=MIGRATION_MODEL; createTable tableName=IDENTITY_P...		\N	3.5.4	\N	\N	3820445829
-1.2.0.RC1	bburke@redhat.com	META-INF/db2-jpa-changelog-1.2.0.CR1.xml	2022-02-02 16:47:26.186858	8	MARK_RAN	\N	delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION_NOTE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION_NOTE; delete tableName=USER_SESSION; createTable tableName=MIGRATION_MODEL; createTable tableName=IDENTITY_P...		\N	3.5.4	\N	\N	3820445829
-1.2.0.Final	keycloak	META-INF/jpa-changelog-1.2.0.Final.xml	2022-02-02 16:47:26.19172	9	EXECUTED	\N	update tableName=CLIENT; update tableName=CLIENT; update tableName=CLIENT		\N	3.5.4	\N	\N	3820445829
-1.3.0	bburke@redhat.com	META-INF/jpa-changelog-1.3.0.xml	2022-02-02 16:47:26.242162	10	EXECUTED	\N	delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION_PROT_MAPPER; delete tableName=CLIENT_SESSION_NOTE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION_NOTE; delete tableName=USER_SESSION; createTable tableName=ADMI...		\N	3.5.4	\N	\N	3820445829
-1.4.0	bburke@redhat.com	META-INF/jpa-changelog-1.4.0.xml	2022-02-02 16:47:26.275929	11	EXECUTED	\N	delete tableName=CLIENT_SESSION_AUTH_STATUS; delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION_PROT_MAPPER; delete tableName=CLIENT_SESSION_NOTE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION_NOTE; delete table...		\N	3.5.4	\N	\N	3820445829
-1.4.0	bburke@redhat.com	META-INF/db2-jpa-changelog-1.4.0.xml	2022-02-02 16:47:26.278548	12	MARK_RAN	\N	delete tableName=CLIENT_SESSION_AUTH_STATUS; delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION_PROT_MAPPER; delete tableName=CLIENT_SESSION_NOTE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION_NOTE; delete table...		\N	3.5.4	\N	\N	3820445829
-1.5.0	bburke@redhat.com	META-INF/jpa-changelog-1.5.0.xml	2022-02-02 16:47:26.287616	13	EXECUTED	\N	delete tableName=CLIENT_SESSION_AUTH_STATUS; delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION_PROT_MAPPER; delete tableName=CLIENT_SESSION_NOTE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION_NOTE; delete table...		\N	3.5.4	\N	\N	3820445829
-1.6.1_from15	mposolda@redhat.com	META-INF/jpa-changelog-1.6.1.xml	2022-02-02 16:47:26.299798	14	EXECUTED	\N	addColumn tableName=REALM; addColumn tableName=KEYCLOAK_ROLE; addColumn tableName=CLIENT; createTable tableName=OFFLINE_USER_SESSION; createTable tableName=OFFLINE_CLIENT_SESSION; addPrimaryKey constraintName=CONSTRAINT_OFFL_US_SES_PK2, tableName=...		\N	3.5.4	\N	\N	3820445829
-1.6.1_from16-pre	mposolda@redhat.com	META-INF/jpa-changelog-1.6.1.xml	2022-02-02 16:47:26.302088	15	MARK_RAN	\N	delete tableName=OFFLINE_CLIENT_SESSION; delete tableName=OFFLINE_USER_SESSION		\N	3.5.4	\N	\N	3820445829
-1.6.1_from16	mposolda@redhat.com	META-INF/jpa-changelog-1.6.1.xml	2022-02-02 16:47:26.303889	16	MARK_RAN	\N	dropPrimaryKey constraintName=CONSTRAINT_OFFLINE_US_SES_PK, tableName=OFFLINE_USER_SESSION; dropPrimaryKey constraintName=CONSTRAINT_OFFLINE_CL_SES_PK, tableName=OFFLINE_CLIENT_SESSION; addColumn tableName=OFFLINE_USER_SESSION; update tableName=OF...		\N	3.5.4	\N	\N	3820445829
-1.6.1	mposolda@redhat.com	META-INF/jpa-changelog-1.6.1.xml	2022-02-02 16:47:26.306641	17	EXECUTED	\N	empty		\N	3.5.4	\N	\N	3820445829
-1.7.0	bburke@redhat.com	META-INF/jpa-changelog-1.7.0.xml	2022-02-02 16:47:26.338791	18	EXECUTED	\N	createTable tableName=KEYCLOAK_GROUP; createTable tableName=GROUP_ROLE_MAPPING; createTable tableName=GROUP_ATTRIBUTE; createTable tableName=USER_GROUP_MEMBERSHIP; createTable tableName=REALM_DEFAULT_GROUPS; addColumn tableName=IDENTITY_PROVIDER; ...		\N	3.5.4	\N	\N	3820445829
-1.8.0	mposolda@redhat.com	META-INF/jpa-changelog-1.8.0.xml	2022-02-02 16:47:26.381463	19	EXECUTED	\N	addColumn tableName=IDENTITY_PROVIDER; createTable tableName=CLIENT_TEMPLATE; createTable tableName=CLIENT_TEMPLATE_ATTRIBUTES; createTable tableName=TEMPLATE_SCOPE_MAPPING; dropNotNullConstraint columnName=CLIENT_ID, tableName=PROTOCOL_MAPPER; ad...		\N	3.5.4	\N	\N	3820445829
-1.8.0-2	keycloak	META-INF/jpa-changelog-1.8.0.xml	2022-02-02 16:47:26.390165	20	EXECUTED	\N	dropDefaultValue columnName=ALGORITHM, tableName=CREDENTIAL; update tableName=CREDENTIAL		\N	3.5.4	\N	\N	3820445829
-authz-3.4.0.CR1-resource-server-pk-change-part1	glavoie@gmail.com	META-INF/jpa-changelog-authz-3.4.0.CR1.xml	2022-02-02 16:47:26.679075	45	EXECUTED	\N	addColumn tableName=RESOURCE_SERVER_POLICY; addColumn tableName=RESOURCE_SERVER_RESOURCE; addColumn tableName=RESOURCE_SERVER_SCOPE		\N	3.5.4	\N	\N	3820445829
-1.8.0	mposolda@redhat.com	META-INF/db2-jpa-changelog-1.8.0.xml	2022-02-02 16:47:26.392862	21	MARK_RAN	\N	addColumn tableName=IDENTITY_PROVIDER; createTable tableName=CLIENT_TEMPLATE; createTable tableName=CLIENT_TEMPLATE_ATTRIBUTES; createTable tableName=TEMPLATE_SCOPE_MAPPING; dropNotNullConstraint columnName=CLIENT_ID, tableName=PROTOCOL_MAPPER; ad...		\N	3.5.4	\N	\N	3820445829
-1.8.0-2	keycloak	META-INF/db2-jpa-changelog-1.8.0.xml	2022-02-02 16:47:26.395652	22	MARK_RAN	\N	dropDefaultValue columnName=ALGORITHM, tableName=CREDENTIAL; update tableName=CREDENTIAL		\N	3.5.4	\N	\N	3820445829
-1.9.0	mposolda@redhat.com	META-INF/jpa-changelog-1.9.0.xml	2022-02-02 16:47:26.40969	23	EXECUTED	\N	update tableName=REALM; update tableName=REALM; update tableName=REALM; update tableName=REALM; update tableName=CREDENTIAL; update tableName=CREDENTIAL; update tableName=CREDENTIAL; update tableName=REALM; update tableName=REALM; customChange; dr...		\N	3.5.4	\N	\N	3820445829
-1.9.1	keycloak	META-INF/jpa-changelog-1.9.1.xml	2022-02-02 16:47:26.414344	24	EXECUTED	\N	modifyDataType columnName=PRIVATE_KEY, tableName=REALM; modifyDataType columnName=PUBLIC_KEY, tableName=REALM; modifyDataType columnName=CERTIFICATE, tableName=REALM		\N	3.5.4	\N	\N	3820445829
-1.9.1	keycloak	META-INF/db2-jpa-changelog-1.9.1.xml	2022-02-02 16:47:26.416193	25	MARK_RAN	\N	modifyDataType columnName=PRIVATE_KEY, tableName=REALM; modifyDataType columnName=CERTIFICATE, tableName=REALM		\N	3.5.4	\N	\N	3820445829
-1.9.2	keycloak	META-INF/jpa-changelog-1.9.2.xml	2022-02-02 16:47:26.437367	26	EXECUTED	\N	createIndex indexName=IDX_USER_EMAIL, tableName=USER_ENTITY; createIndex indexName=IDX_USER_ROLE_MAPPING, tableName=USER_ROLE_MAPPING; createIndex indexName=IDX_USER_GROUP_MAPPING, tableName=USER_GROUP_MEMBERSHIP; createIndex indexName=IDX_USER_CO...		\N	3.5.4	\N	\N	3820445829
-9.0.1-KEYCLOAK-12579-recreate-constraints	keycloak	META-INF/jpa-changelog-9.0.1.xml	2022-02-02 16:47:26.981645	84	MARK_RAN	\N	addUniqueConstraint constraintName=SIBLING_NAMES, tableName=KEYCLOAK_GROUP		\N	3.5.4	\N	\N	3820445829
-authz-2.0.0	psilva@redhat.com	META-INF/jpa-changelog-authz-2.0.0.xml	2022-02-02 16:47:26.481647	27	EXECUTED	\N	createTable tableName=RESOURCE_SERVER; addPrimaryKey constraintName=CONSTRAINT_FARS, tableName=RESOURCE_SERVER; addUniqueConstraint constraintName=UK_AU8TT6T700S9V50BU18WS5HA6, tableName=RESOURCE_SERVER; createTable tableName=RESOURCE_SERVER_RESOU...		\N	3.5.4	\N	\N	3820445829
-authz-2.5.1	psilva@redhat.com	META-INF/jpa-changelog-authz-2.5.1.xml	2022-02-02 16:47:26.484459	28	EXECUTED	\N	update tableName=RESOURCE_SERVER_POLICY		\N	3.5.4	\N	\N	3820445829
-2.1.0-KEYCLOAK-5461	bburke@redhat.com	META-INF/jpa-changelog-2.1.0.xml	2022-02-02 16:47:26.523006	29	EXECUTED	\N	createTable tableName=BROKER_LINK; createTable tableName=FED_USER_ATTRIBUTE; createTable tableName=FED_USER_CONSENT; createTable tableName=FED_USER_CONSENT_ROLE; createTable tableName=FED_USER_CONSENT_PROT_MAPPER; createTable tableName=FED_USER_CR...		\N	3.5.4	\N	\N	3820445829
-2.2.0	bburke@redhat.com	META-INF/jpa-changelog-2.2.0.xml	2022-02-02 16:47:26.532066	30	EXECUTED	\N	addColumn tableName=ADMIN_EVENT_ENTITY; createTable tableName=CREDENTIAL_ATTRIBUTE; createTable tableName=FED_CREDENTIAL_ATTRIBUTE; modifyDataType columnName=VALUE, tableName=CREDENTIAL; addForeignKeyConstraint baseTableName=FED_CREDENTIAL_ATTRIBU...		\N	3.5.4	\N	\N	3820445829
-2.3.0	bburke@redhat.com	META-INF/jpa-changelog-2.3.0.xml	2022-02-02 16:47:26.541837	31	EXECUTED	\N	createTable tableName=FEDERATED_USER; addPrimaryKey constraintName=CONSTR_FEDERATED_USER, tableName=FEDERATED_USER; dropDefaultValue columnName=TOTP, tableName=USER_ENTITY; dropColumn columnName=TOTP, tableName=USER_ENTITY; addColumn tableName=IDE...		\N	3.5.4	\N	\N	3820445829
-2.4.0	bburke@redhat.com	META-INF/jpa-changelog-2.4.0.xml	2022-02-02 16:47:26.545809	32	EXECUTED	\N	customChange		\N	3.5.4	\N	\N	3820445829
-2.5.0	bburke@redhat.com	META-INF/jpa-changelog-2.5.0.xml	2022-02-02 16:47:26.549823	33	EXECUTED	\N	customChange; modifyDataType columnName=USER_ID, tableName=OFFLINE_USER_SESSION		\N	3.5.4	\N	\N	3820445829
-2.5.0-unicode-oracle	hmlnarik@redhat.com	META-INF/jpa-changelog-2.5.0.xml	2022-02-02 16:47:26.55176	34	MARK_RAN	\N	modifyDataType columnName=DESCRIPTION, tableName=AUTHENTICATION_FLOW; modifyDataType columnName=DESCRIPTION, tableName=CLIENT_TEMPLATE; modifyDataType columnName=DESCRIPTION, tableName=RESOURCE_SERVER_POLICY; modifyDataType columnName=DESCRIPTION,...		\N	3.5.4	\N	\N	3820445829
-2.5.0-unicode-other-dbs	hmlnarik@redhat.com	META-INF/jpa-changelog-2.5.0.xml	2022-02-02 16:47:26.567305	35	EXECUTED	\N	modifyDataType columnName=DESCRIPTION, tableName=AUTHENTICATION_FLOW; modifyDataType columnName=DESCRIPTION, tableName=CLIENT_TEMPLATE; modifyDataType columnName=DESCRIPTION, tableName=RESOURCE_SERVER_POLICY; modifyDataType columnName=DESCRIPTION,...		\N	3.5.4	\N	\N	3820445829
-2.5.0-duplicate-email-support	slawomir@dabek.name	META-INF/jpa-changelog-2.5.0.xml	2022-02-02 16:47:26.570727	36	EXECUTED	\N	addColumn tableName=REALM		\N	3.5.4	\N	\N	3820445829
-2.5.0-unique-group-names	hmlnarik@redhat.com	META-INF/jpa-changelog-2.5.0.xml	2022-02-02 16:47:26.578396	37	EXECUTED	\N	addUniqueConstraint constraintName=SIBLING_NAMES, tableName=KEYCLOAK_GROUP		\N	3.5.4	\N	\N	3820445829
-2.5.1	bburke@redhat.com	META-INF/jpa-changelog-2.5.1.xml	2022-02-02 16:47:26.581391	38	EXECUTED	\N	addColumn tableName=FED_USER_CONSENT		\N	3.5.4	\N	\N	3820445829
-3.0.0	bburke@redhat.com	META-INF/jpa-changelog-3.0.0.xml	2022-02-02 16:47:26.584204	39	EXECUTED	\N	addColumn tableName=IDENTITY_PROVIDER		\N	3.5.4	\N	\N	3820445829
-3.2.0-fix	keycloak	META-INF/jpa-changelog-3.2.0.xml	2022-02-02 16:47:26.585877	40	MARK_RAN	\N	addNotNullConstraint columnName=REALM_ID, tableName=CLIENT_INITIAL_ACCESS		\N	3.5.4	\N	\N	3820445829
-3.2.0-fix-with-keycloak-5416	keycloak	META-INF/jpa-changelog-3.2.0.xml	2022-02-02 16:47:26.587657	41	MARK_RAN	\N	dropIndex indexName=IDX_CLIENT_INIT_ACC_REALM, tableName=CLIENT_INITIAL_ACCESS; addNotNullConstraint columnName=REALM_ID, tableName=CLIENT_INITIAL_ACCESS; createIndex indexName=IDX_CLIENT_INIT_ACC_REALM, tableName=CLIENT_INITIAL_ACCESS		\N	3.5.4	\N	\N	3820445829
-3.2.0-fix-offline-sessions	hmlnarik	META-INF/jpa-changelog-3.2.0.xml	2022-02-02 16:47:26.591561	42	EXECUTED	\N	customChange		\N	3.5.4	\N	\N	3820445829
-3.2.0-fixed	keycloak	META-INF/jpa-changelog-3.2.0.xml	2022-02-02 16:47:26.669981	43	EXECUTED	\N	addColumn tableName=REALM; dropPrimaryKey constraintName=CONSTRAINT_OFFL_CL_SES_PK2, tableName=OFFLINE_CLIENT_SESSION; dropColumn columnName=CLIENT_SESSION_ID, tableName=OFFLINE_CLIENT_SESSION; addPrimaryKey constraintName=CONSTRAINT_OFFL_CL_SES_P...		\N	3.5.4	\N	\N	3820445829
-3.3.0	keycloak	META-INF/jpa-changelog-3.3.0.xml	2022-02-02 16:47:26.673701	44	EXECUTED	\N	addColumn tableName=USER_ENTITY		\N	3.5.4	\N	\N	3820445829
-authz-3.4.0.CR1-resource-server-pk-change-part2-KEYCLOAK-6095	hmlnarik@redhat.com	META-INF/jpa-changelog-authz-3.4.0.CR1.xml	2022-02-02 16:47:26.681987	46	EXECUTED	\N	customChange		\N	3.5.4	\N	\N	3820445829
-authz-3.4.0.CR1-resource-server-pk-change-part3-fixed	glavoie@gmail.com	META-INF/jpa-changelog-authz-3.4.0.CR1.xml	2022-02-02 16:47:26.683661	47	MARK_RAN	\N	dropIndex indexName=IDX_RES_SERV_POL_RES_SERV, tableName=RESOURCE_SERVER_POLICY; dropIndex indexName=IDX_RES_SRV_RES_RES_SRV, tableName=RESOURCE_SERVER_RESOURCE; dropIndex indexName=IDX_RES_SRV_SCOPE_RES_SRV, tableName=RESOURCE_SERVER_SCOPE		\N	3.5.4	\N	\N	3820445829
-authz-3.4.0.CR1-resource-server-pk-change-part3-fixed-nodropindex	glavoie@gmail.com	META-INF/jpa-changelog-authz-3.4.0.CR1.xml	2022-02-02 16:47:26.702743	48	EXECUTED	\N	addNotNullConstraint columnName=RESOURCE_SERVER_CLIENT_ID, tableName=RESOURCE_SERVER_POLICY; addNotNullConstraint columnName=RESOURCE_SERVER_CLIENT_ID, tableName=RESOURCE_SERVER_RESOURCE; addNotNullConstraint columnName=RESOURCE_SERVER_CLIENT_ID, ...		\N	3.5.4	\N	\N	3820445829
-3.4.0	keycloak	META-INF/jpa-changelog-3.4.0.xml	2022-02-02 16:47:26.734467	50	EXECUTED	\N	addPrimaryKey constraintName=CONSTRAINT_REALM_DEFAULT_ROLES, tableName=REALM_DEFAULT_ROLES; addPrimaryKey constraintName=CONSTRAINT_COMPOSITE_ROLE, tableName=COMPOSITE_ROLE; addPrimaryKey constraintName=CONSTR_REALM_DEFAULT_GROUPS, tableName=REALM...		\N	3.5.4	\N	\N	3820445829
-3.4.0-KEYCLOAK-5230	hmlnarik@redhat.com	META-INF/jpa-changelog-3.4.0.xml	2022-02-02 16:47:26.78037	51	EXECUTED	\N	createIndex indexName=IDX_FU_ATTRIBUTE, tableName=FED_USER_ATTRIBUTE; createIndex indexName=IDX_FU_CONSENT, tableName=FED_USER_CONSENT; createIndex indexName=IDX_FU_CONSENT_RU, tableName=FED_USER_CONSENT; createIndex indexName=IDX_FU_CREDENTIAL, t...		\N	3.5.4	\N	\N	3820445829
-3.4.1	psilva@redhat.com	META-INF/jpa-changelog-3.4.1.xml	2022-02-02 16:47:26.783989	52	EXECUTED	\N	modifyDataType columnName=VALUE, tableName=CLIENT_ATTRIBUTES		\N	3.5.4	\N	\N	3820445829
-3.4.2	keycloak	META-INF/jpa-changelog-3.4.2.xml	2022-02-02 16:47:26.786619	53	EXECUTED	\N	update tableName=REALM		\N	3.5.4	\N	\N	3820445829
-3.4.2-KEYCLOAK-5172	mkanis@redhat.com	META-INF/jpa-changelog-3.4.2.xml	2022-02-02 16:47:26.788788	54	EXECUTED	\N	update tableName=CLIENT		\N	3.5.4	\N	\N	3820445829
-4.0.0-KEYCLOAK-6335	bburke@redhat.com	META-INF/jpa-changelog-4.0.0.xml	2022-02-02 16:47:26.794881	55	EXECUTED	\N	createTable tableName=CLIENT_AUTH_FLOW_BINDINGS; addPrimaryKey constraintName=C_CLI_FLOW_BIND, tableName=CLIENT_AUTH_FLOW_BINDINGS		\N	3.5.4	\N	\N	3820445829
-4.0.0-CLEANUP-UNUSED-TABLE	bburke@redhat.com	META-INF/jpa-changelog-4.0.0.xml	2022-02-02 16:47:26.799493	56	EXECUTED	\N	dropTable tableName=CLIENT_IDENTITY_PROV_MAPPING		\N	3.5.4	\N	\N	3820445829
-4.0.0-KEYCLOAK-6228	bburke@redhat.com	META-INF/jpa-changelog-4.0.0.xml	2022-02-02 16:47:26.810686	57	EXECUTED	\N	dropUniqueConstraint constraintName=UK_JKUWUVD56ONTGSUHOGM8UEWRT, tableName=USER_CONSENT; dropNotNullConstraint columnName=CLIENT_ID, tableName=USER_CONSENT; addColumn tableName=USER_CONSENT; addUniqueConstraint constraintName=UK_JKUWUVD56ONTGSUHO...		\N	3.5.4	\N	\N	3820445829
-4.0.0-KEYCLOAK-5579-fixed	mposolda@redhat.com	META-INF/jpa-changelog-4.0.0.xml	2022-02-02 16:47:26.861332	58	EXECUTED	\N	dropForeignKeyConstraint baseTableName=CLIENT_TEMPLATE_ATTRIBUTES, constraintName=FK_CL_TEMPL_ATTR_TEMPL; renameTable newTableName=CLIENT_SCOPE_ATTRIBUTES, oldTableName=CLIENT_TEMPLATE_ATTRIBUTES; renameColumn newColumnName=SCOPE_ID, oldColumnName...		\N	3.5.4	\N	\N	3820445829
-authz-4.0.0.CR1	psilva@redhat.com	META-INF/jpa-changelog-authz-4.0.0.CR1.xml	2022-02-02 16:47:26.877018	59	EXECUTED	\N	createTable tableName=RESOURCE_SERVER_PERM_TICKET; addPrimaryKey constraintName=CONSTRAINT_FAPMT, tableName=RESOURCE_SERVER_PERM_TICKET; addForeignKeyConstraint baseTableName=RESOURCE_SERVER_PERM_TICKET, constraintName=FK_FRSRHO213XCX4WNKOG82SSPMT...		\N	3.5.4	\N	\N	3820445829
-authz-4.0.0.Beta3	psilva@redhat.com	META-INF/jpa-changelog-authz-4.0.0.Beta3.xml	2022-02-02 16:47:26.881203	60	EXECUTED	\N	addColumn tableName=RESOURCE_SERVER_POLICY; addColumn tableName=RESOURCE_SERVER_PERM_TICKET; addForeignKeyConstraint baseTableName=RESOURCE_SERVER_PERM_TICKET, constraintName=FK_FRSRPO2128CX4WNKOG82SSRFY, referencedTableName=RESOURCE_SERVER_POLICY		\N	3.5.4	\N	\N	3820445829
-authz-4.2.0.Final	mhajas@redhat.com	META-INF/jpa-changelog-authz-4.2.0.Final.xml	2022-02-02 16:47:26.886177	61	EXECUTED	\N	createTable tableName=RESOURCE_URIS; addForeignKeyConstraint baseTableName=RESOURCE_URIS, constraintName=FK_RESOURCE_SERVER_URIS, referencedTableName=RESOURCE_SERVER_RESOURCE; customChange; dropColumn columnName=URI, tableName=RESOURCE_SERVER_RESO...		\N	3.5.4	\N	\N	3820445829
-authz-4.2.0.Final-KEYCLOAK-9944	hmlnarik@redhat.com	META-INF/jpa-changelog-authz-4.2.0.Final.xml	2022-02-02 16:47:26.890482	62	EXECUTED	\N	addPrimaryKey constraintName=CONSTRAINT_RESOUR_URIS_PK, tableName=RESOURCE_URIS		\N	3.5.4	\N	\N	3820445829
-4.2.0-KEYCLOAK-6313	wadahiro@gmail.com	META-INF/jpa-changelog-4.2.0.xml	2022-02-02 16:47:26.893518	63	EXECUTED	\N	addColumn tableName=REQUIRED_ACTION_PROVIDER		\N	3.5.4	\N	\N	3820445829
-4.3.0-KEYCLOAK-7984	wadahiro@gmail.com	META-INF/jpa-changelog-4.3.0.xml	2022-02-02 16:47:26.895621	64	EXECUTED	\N	update tableName=REQUIRED_ACTION_PROVIDER		\N	3.5.4	\N	\N	3820445829
-4.6.0-KEYCLOAK-7950	psilva@redhat.com	META-INF/jpa-changelog-4.6.0.xml	2022-02-02 16:47:26.89756	65	EXECUTED	\N	update tableName=RESOURCE_SERVER_RESOURCE		\N	3.5.4	\N	\N	3820445829
-4.6.0-KEYCLOAK-8377	keycloak	META-INF/jpa-changelog-4.6.0.xml	2022-02-02 16:47:26.908059	66	EXECUTED	\N	createTable tableName=ROLE_ATTRIBUTE; addPrimaryKey constraintName=CONSTRAINT_ROLE_ATTRIBUTE_PK, tableName=ROLE_ATTRIBUTE; addForeignKeyConstraint baseTableName=ROLE_ATTRIBUTE, constraintName=FK_ROLE_ATTRIBUTE_ID, referencedTableName=KEYCLOAK_ROLE...		\N	3.5.4	\N	\N	3820445829
-4.6.0-KEYCLOAK-8555	gideonray@gmail.com	META-INF/jpa-changelog-4.6.0.xml	2022-02-02 16:47:26.912693	67	EXECUTED	\N	createIndex indexName=IDX_COMPONENT_PROVIDER_TYPE, tableName=COMPONENT		\N	3.5.4	\N	\N	3820445829
-4.7.0-KEYCLOAK-1267	sguilhen@redhat.com	META-INF/jpa-changelog-4.7.0.xml	2022-02-02 16:47:26.915771	68	EXECUTED	\N	addColumn tableName=REALM		\N	3.5.4	\N	\N	3820445829
-4.7.0-KEYCLOAK-7275	keycloak	META-INF/jpa-changelog-4.7.0.xml	2022-02-02 16:47:26.924465	69	EXECUTED	\N	renameColumn newColumnName=CREATED_ON, oldColumnName=LAST_SESSION_REFRESH, tableName=OFFLINE_USER_SESSION; addNotNullConstraint columnName=CREATED_ON, tableName=OFFLINE_USER_SESSION; addColumn tableName=OFFLINE_USER_SESSION; customChange; createIn...		\N	3.5.4	\N	\N	3820445829
-authz-7.0.0-KEYCLOAK-10443	psilva@redhat.com	META-INF/jpa-changelog-authz-7.0.0.xml	2022-02-02 16:47:26.93061	71	EXECUTED	\N	addColumn tableName=RESOURCE_SERVER		\N	3.5.4	\N	\N	3820445829
-8.0.0-adding-credential-columns	keycloak	META-INF/jpa-changelog-8.0.0.xml	2022-02-02 16:47:26.933771	72	EXECUTED	\N	addColumn tableName=CREDENTIAL; addColumn tableName=FED_USER_CREDENTIAL		\N	3.5.4	\N	\N	3820445829
+1.6.1	mposolda@redhat.com	META-INF/jpa-changelog-1.6.1.xml	2022-02-02 16:47:26.306641	17	EXECUTED	9:d41d8cd98f00b204e9800998ecf8427e	empty		\N	3.5.4	\N	\N	3820445829
+authz-2.5.1	psilva@redhat.com	META-INF/jpa-changelog-authz-2.5.1.xml	2022-02-02 16:47:26.484459	28	EXECUTED	9:44bae577f551b3738740281eceb4ea70	update tableName=RESOURCE_SERVER_POLICY		\N	3.5.4	\N	\N	3820445829
 8.0.0-updating-credential-data-not-oracle	keycloak	META-INF/jpa-changelog-8.0.0.xml	2022-02-02 16:47:26.937673	73	EXECUTED	\N	update tableName=CREDENTIAL; update tableName=CREDENTIAL; update tableName=CREDENTIAL; update tableName=FED_USER_CREDENTIAL; update tableName=FED_USER_CREDENTIAL; update tableName=FED_USER_CREDENTIAL		\N	3.5.4	\N	\N	3820445829
 8.0.0-updating-credential-data-oracle	keycloak	META-INF/jpa-changelog-8.0.0.xml	2022-02-02 16:47:26.939218	74	MARK_RAN	\N	update tableName=CREDENTIAL; update tableName=CREDENTIAL; update tableName=CREDENTIAL; update tableName=FED_USER_CREDENTIAL; update tableName=FED_USER_CREDENTIAL; update tableName=FED_USER_CREDENTIAL		\N	3.5.4	\N	\N	3820445829
-8.0.0-credential-cleanup-fixed	keycloak	META-INF/jpa-changelog-8.0.0.xml	2022-02-02 16:47:26.945819	75	EXECUTED	\N	dropDefaultValue columnName=COUNTER, tableName=CREDENTIAL; dropDefaultValue columnName=DIGITS, tableName=CREDENTIAL; dropDefaultValue columnName=PERIOD, tableName=CREDENTIAL; dropDefaultValue columnName=ALGORITHM, tableName=CREDENTIAL; dropColumn ...		\N	3.5.4	\N	\N	3820445829
-8.0.0-resource-tag-support	keycloak	META-INF/jpa-changelog-8.0.0.xml	2022-02-02 16:47:26.950255	76	EXECUTED	\N	addColumn tableName=MIGRATION_MODEL; createIndex indexName=IDX_UPDATE_TIME, tableName=MIGRATION_MODEL		\N	3.5.4	\N	\N	3820445829
-9.0.0-always-display-client	keycloak	META-INF/jpa-changelog-9.0.0.xml	2022-02-02 16:47:26.955505	77	EXECUTED	\N	addColumn tableName=CLIENT		\N	3.5.4	\N	\N	3820445829
-9.0.0-drop-constraints-for-column-increase	keycloak	META-INF/jpa-changelog-9.0.0.xml	2022-02-02 16:47:26.957216	78	MARK_RAN	\N	dropUniqueConstraint constraintName=UK_FRSR6T700S9V50BU18WS5PMT, tableName=RESOURCE_SERVER_PERM_TICKET; dropUniqueConstraint constraintName=UK_FRSR6T700S9V50BU18WS5HA6, tableName=RESOURCE_SERVER_RESOURCE; dropPrimaryKey constraintName=CONSTRAINT_O...		\N	3.5.4	\N	\N	3820445829
-9.0.0-increase-column-size-federated-fk	keycloak	META-INF/jpa-changelog-9.0.0.xml	2022-02-02 16:47:26.966746	79	EXECUTED	\N	modifyDataType columnName=CLIENT_ID, tableName=FED_USER_CONSENT; modifyDataType columnName=CLIENT_REALM_CONSTRAINT, tableName=KEYCLOAK_ROLE; modifyDataType columnName=OWNER, tableName=RESOURCE_SERVER_POLICY; modifyDataType columnName=CLIENT_ID, ta...		\N	3.5.4	\N	\N	3820445829
-9.0.0-recreate-constraints-after-column-increase	keycloak	META-INF/jpa-changelog-9.0.0.xml	2022-02-02 16:47:26.969643	80	MARK_RAN	\N	addNotNullConstraint columnName=CLIENT_ID, tableName=OFFLINE_CLIENT_SESSION; addNotNullConstraint columnName=OWNER, tableName=RESOURCE_SERVER_PERM_TICKET; addNotNullConstraint columnName=REQUESTER, tableName=RESOURCE_SERVER_PERM_TICKET; addNotNull...		\N	3.5.4	\N	\N	3820445829
-9.0.1-add-index-to-client.client_id	keycloak	META-INF/jpa-changelog-9.0.1.xml	2022-02-02 16:47:26.975764	81	EXECUTED	\N	createIndex indexName=IDX_CLIENT_ID, tableName=CLIENT		\N	3.5.4	\N	\N	3820445829
-9.0.1-KEYCLOAK-12579-drop-constraints	keycloak	META-INF/jpa-changelog-9.0.1.xml	2022-02-02 16:47:26.977227	82	MARK_RAN	\N	dropUniqueConstraint constraintName=SIBLING_NAMES, tableName=KEYCLOAK_GROUP		\N	3.5.4	\N	\N	3820445829
-9.0.1-KEYCLOAK-12579-add-not-null-constraint	keycloak	META-INF/jpa-changelog-9.0.1.xml	2022-02-02 16:47:26.980058	83	EXECUTED	\N	addNotNullConstraint columnName=PARENT_GROUP, tableName=KEYCLOAK_GROUP		\N	3.5.4	\N	\N	3820445829
-9.0.1-add-index-to-events	keycloak	META-INF/jpa-changelog-9.0.1.xml	2022-02-02 16:47:26.985465	85	EXECUTED	\N	createIndex indexName=IDX_EVENT_TIME, tableName=EVENT_ENTITY		\N	3.5.4	\N	\N	3820445829
-map-remove-ri	keycloak	META-INF/jpa-changelog-11.0.0.xml	2022-02-02 16:47:26.98869	86	EXECUTED	\N	dropForeignKeyConstraint baseTableName=REALM, constraintName=FK_TRAF444KK6QRKMS7N56AIWQ5Y; dropForeignKeyConstraint baseTableName=KEYCLOAK_ROLE, constraintName=FK_KJHO5LE2C0RAL09FL8CM9WFW9		\N	3.5.4	\N	\N	3820445829
-map-remove-ri	keycloak	META-INF/jpa-changelog-12.0.0.xml	2022-02-02 16:47:26.992854	87	EXECUTED	\N	dropForeignKeyConstraint baseTableName=REALM_DEFAULT_GROUPS, constraintName=FK_DEF_GROUPS_GROUP; dropForeignKeyConstraint baseTableName=REALM_DEFAULT_ROLES, constraintName=FK_H4WPD7W4HSOOLNI3H0SW7BTJE; dropForeignKeyConstraint baseTableName=CLIENT...		\N	3.5.4	\N	\N	3820445829
-12.1.0-add-realm-localization-table	keycloak	META-INF/jpa-changelog-12.0.0.xml	2022-02-02 16:47:26.999694	88	EXECUTED	\N	createTable tableName=REALM_LOCALIZATIONS; addPrimaryKey tableName=REALM_LOCALIZATIONS		\N	3.5.4	\N	\N	3820445829
-8.0.0-updating-credential-data-not-oracle-fixed	keycloak	META-INF/jpa-changelog-8.0.0.xml	2023-01-09 14:34:23.080082	89	MARK_RAN	8:83f7a671792ca98b3cbd3a1a34862d3d	update tableName=CREDENTIAL; update tableName=CREDENTIAL; update tableName=CREDENTIAL; update tableName=FED_USER_CREDENTIAL; update tableName=FED_USER_CREDENTIAL; update tableName=FED_USER_CREDENTIAL		\N	4.8.0	\N	\N	3274862955
-8.0.0-updating-credential-data-oracle-fixed	keycloak	META-INF/jpa-changelog-8.0.0.xml	2023-01-09 14:34:23.099857	90	MARK_RAN	8:f58ad148698cf30707a6efbdf8061aa7	update tableName=CREDENTIAL; update tableName=CREDENTIAL; update tableName=CREDENTIAL; update tableName=FED_USER_CREDENTIAL; update tableName=FED_USER_CREDENTIAL; update tableName=FED_USER_CREDENTIAL		\N	4.8.0	\N	\N	3274862955
-default-roles	keycloak	META-INF/jpa-changelog-13.0.0.xml	2023-01-09 14:34:23.144776	91	EXECUTED	8:72d03345fda8e2f17093d08801947773	addColumn tableName=REALM; customChange		\N	4.8.0	\N	\N	3274862955
-default-roles-cleanup	keycloak	META-INF/jpa-changelog-13.0.0.xml	2023-01-09 14:34:23.155298	92	EXECUTED	8:61c9233951bd96ffecd9ba75f7d978a4	dropTable tableName=REALM_DEFAULT_ROLES; dropTable tableName=CLIENT_DEFAULT_ROLES		\N	4.8.0	\N	\N	3274862955
-13.0.0-KEYCLOAK-16844	keycloak	META-INF/jpa-changelog-13.0.0.xml	2023-01-09 14:34:23.162911	93	EXECUTED	8:ea82e6ad945cec250af6372767b25525	createIndex indexName=IDX_OFFLINE_USS_PRELOAD, tableName=OFFLINE_USER_SESSION		\N	4.8.0	\N	\N	3274862955
-map-remove-ri-13.0.0	keycloak	META-INF/jpa-changelog-13.0.0.xml	2023-01-09 14:34:23.17617	94	EXECUTED	8:d3f4a33f41d960ddacd7e2ef30d126b3	dropForeignKeyConstraint baseTableName=DEFAULT_CLIENT_SCOPE, constraintName=FK_R_DEF_CLI_SCOPE_SCOPE; dropForeignKeyConstraint baseTableName=CLIENT_SCOPE_CLIENT, constraintName=FK_C_CLI_SCOPE_SCOPE; dropForeignKeyConstraint baseTableName=CLIENT_SC...		\N	4.8.0	\N	\N	3274862955
-13.0.0-KEYCLOAK-17992-drop-constraints	keycloak	META-INF/jpa-changelog-13.0.0.xml	2023-01-09 14:34:23.1803	95	MARK_RAN	8:1284a27fbd049d65831cb6fc07c8a783	dropPrimaryKey constraintName=C_CLI_SCOPE_BIND, tableName=CLIENT_SCOPE_CLIENT; dropIndex indexName=IDX_CLSCOPE_CL, tableName=CLIENT_SCOPE_CLIENT; dropIndex indexName=IDX_CL_CLSCOPE, tableName=CLIENT_SCOPE_CLIENT		\N	4.8.0	\N	\N	3274862955
-13.0.0-increase-column-size-federated	keycloak	META-INF/jpa-changelog-13.0.0.xml	2023-01-09 14:34:23.190613	96	EXECUTED	8:9d11b619db2ae27c25853b8a37cd0dea	modifyDataType columnName=CLIENT_ID, tableName=CLIENT_SCOPE_CLIENT; modifyDataType columnName=SCOPE_ID, tableName=CLIENT_SCOPE_CLIENT		\N	4.8.0	\N	\N	3274862955
-13.0.0-KEYCLOAK-17992-recreate-constraints	keycloak	META-INF/jpa-changelog-13.0.0.xml	2023-01-09 14:34:23.193934	97	MARK_RAN	8:3002bb3997451bb9e8bac5c5cd8d6327	addNotNullConstraint columnName=CLIENT_ID, tableName=CLIENT_SCOPE_CLIENT; addNotNullConstraint columnName=SCOPE_ID, tableName=CLIENT_SCOPE_CLIENT; addPrimaryKey constraintName=C_CLI_SCOPE_BIND, tableName=CLIENT_SCOPE_CLIENT; createIndex indexName=...		\N	4.8.0	\N	\N	3274862955
-json-string-accomodation-fixed	keycloak	META-INF/jpa-changelog-13.0.0.xml	2023-01-09 14:34:23.202965	98	EXECUTED	8:dfbee0d6237a23ef4ccbb7a4e063c163	addColumn tableName=REALM_ATTRIBUTE; update tableName=REALM_ATTRIBUTE; dropColumn columnName=VALUE, tableName=REALM_ATTRIBUTE; renameColumn newColumnName=VALUE, oldColumnName=VALUE_NEW, tableName=REALM_ATTRIBUTE		\N	4.8.0	\N	\N	3274862955
-14.0.0-KEYCLOAK-11019	keycloak	META-INF/jpa-changelog-14.0.0.xml	2023-01-09 14:34:23.212244	99	EXECUTED	8:75f3e372df18d38c62734eebb986b960	createIndex indexName=IDX_OFFLINE_CSS_PRELOAD, tableName=OFFLINE_CLIENT_SESSION; createIndex indexName=IDX_OFFLINE_USS_BY_USER, tableName=OFFLINE_USER_SESSION; createIndex indexName=IDX_OFFLINE_USS_BY_USERSESS, tableName=OFFLINE_USER_SESSION		\N	4.8.0	\N	\N	3274862955
-14.0.0-KEYCLOAK-18286	keycloak	META-INF/jpa-changelog-14.0.0.xml	2023-01-09 14:34:23.2164	100	MARK_RAN	8:7fee73eddf84a6035691512c85637eef	createIndex indexName=IDX_CLIENT_ATT_BY_NAME_VALUE, tableName=CLIENT_ATTRIBUTES		\N	4.8.0	\N	\N	3274862955
-14.0.0-KEYCLOAK-18286-revert	keycloak	META-INF/jpa-changelog-14.0.0.xml	2023-01-09 14:34:23.227895	101	MARK_RAN	8:7a11134ab12820f999fbf3bb13c3adc8	dropIndex indexName=IDX_CLIENT_ATT_BY_NAME_VALUE, tableName=CLIENT_ATTRIBUTES		\N	4.8.0	\N	\N	3274862955
-14.0.0-KEYCLOAK-18286-supported-dbs	keycloak	META-INF/jpa-changelog-14.0.0.xml	2023-01-09 14:34:23.235491	102	EXECUTED	8:c0f6eaac1f3be773ffe54cb5b8482b70	createIndex indexName=IDX_CLIENT_ATT_BY_NAME_VALUE, tableName=CLIENT_ATTRIBUTES		\N	4.8.0	\N	\N	3274862955
-14.0.0-KEYCLOAK-18286-unsupported-dbs	keycloak	META-INF/jpa-changelog-14.0.0.xml	2023-01-09 14:34:23.238498	103	MARK_RAN	8:18186f0008b86e0f0f49b0c4d0e842ac	createIndex indexName=IDX_CLIENT_ATT_BY_NAME_VALUE, tableName=CLIENT_ATTRIBUTES		\N	4.8.0	\N	\N	3274862955
-KEYCLOAK-17267-add-index-to-user-attributes	keycloak	META-INF/jpa-changelog-14.0.0.xml	2023-01-09 14:34:23.24435	104	EXECUTED	8:09c2780bcb23b310a7019d217dc7b433	createIndex indexName=IDX_USER_ATTRIBUTE_NAME, tableName=USER_ATTRIBUTE		\N	4.8.0	\N	\N	3274862955
-KEYCLOAK-18146-add-saml-art-binding-identifier	keycloak	META-INF/jpa-changelog-14.0.0.xml	2023-01-09 14:34:23.250444	105	EXECUTED	8:276a44955eab693c970a42880197fff2	customChange		\N	4.8.0	\N	\N	3274862955
-15.0.0-KEYCLOAK-18467	keycloak	META-INF/jpa-changelog-15.0.0.xml	2023-01-09 14:34:23.261701	106	EXECUTED	8:ba8ee3b694d043f2bfc1a1079d0760d7	addColumn tableName=REALM_LOCALIZATIONS; update tableName=REALM_LOCALIZATIONS; dropColumn columnName=TEXTS, tableName=REALM_LOCALIZATIONS; renameColumn newColumnName=TEXTS, oldColumnName=TEXTS_NEW, tableName=REALM_LOCALIZATIONS; addNotNullConstrai...		\N	4.8.0	\N	\N	3274862955
-17.0.0-9562	keycloak	META-INF/jpa-changelog-17.0.0.xml	2023-01-09 14:34:23.269577	107	EXECUTED	8:5e06b1d75f5d17685485e610c2851b17	createIndex indexName=IDX_USER_SERVICE_ACCOUNT, tableName=USER_ENTITY		\N	4.8.0	\N	\N	3274862955
-18.0.0-10625-IDX_ADMIN_EVENT_TIME	keycloak	META-INF/jpa-changelog-18.0.0.xml	2023-01-09 14:34:23.276738	108	EXECUTED	8:4b80546c1dc550ac552ee7b24a4ab7c0	createIndex indexName=IDX_ADMIN_EVENT_TIME, tableName=ADMIN_EVENT_ENTITY		\N	4.8.0	\N	\N	3274862955
-19.0.0-10135	keycloak	META-INF/jpa-changelog-19.0.0.xml	2023-01-09 14:34:23.297485	109	EXECUTED	8:af510cd1bb2ab6339c45372f3e491696	customChange		\N	4.8.0	\N	\N	3274862955
-20.0.0-12964-supported-dbs	keycloak	META-INF/jpa-changelog-20.0.0.xml	2023-01-09 14:34:23.305463	110	EXECUTED	8:05c99fc610845ef66ee812b7921af0ef	createIndex indexName=IDX_GROUP_ATT_BY_NAME_VALUE, tableName=GROUP_ATTRIBUTE		\N	4.8.0	\N	\N	3274862955
-20.0.0-12964-unsupported-dbs	keycloak	META-INF/jpa-changelog-20.0.0.xml	2023-01-09 14:34:23.309005	111	MARK_RAN	8:314e803baf2f1ec315b3464e398b8247	createIndex indexName=IDX_GROUP_ATT_BY_NAME_VALUE, tableName=GROUP_ATTRIBUTE		\N	4.8.0	\N	\N	3274862955
-client-attributes-string-accomodation-fixed	keycloak	META-INF/jpa-changelog-20.0.0.xml	2023-01-09 14:34:23.318788	112	EXECUTED	8:56e4677e7e12556f70b604c573840100	addColumn tableName=CLIENT_ATTRIBUTES; update tableName=CLIENT_ATTRIBUTES; dropColumn columnName=VALUE, tableName=CLIENT_ATTRIBUTES; renameColumn newColumnName=VALUE, oldColumnName=VALUE_NEW, tableName=CLIENT_ATTRIBUTES		\N	4.8.0	\N	\N	3274862955
+3.4.2	keycloak	META-INF/jpa-changelog-3.4.2.xml	2022-02-02 16:47:26.786619	53	EXECUTED	9:8f23e334dbc59f82e0a328373ca6ced0	update tableName=REALM		\N	3.5.4	\N	\N	3820445829
+1.0.0.Final-KEYCLOAK-5461	sthorger@redhat.com	META-INF/jpa-changelog-1.0.0.Final.xml	2022-02-02 16:47:26.017844	1	EXECUTED	9:6f1016664e21e16d26517a4418f5e3df	createTable tableName=APPLICATION_DEFAULT_ROLES; createTable tableName=CLIENT; createTable tableName=CLIENT_SESSION; createTable tableName=CLIENT_SESSION_ROLE; createTable tableName=COMPOSITE_ROLE; createTable tableName=CREDENTIAL; createTable tab...		\N	3.5.4	\N	\N	3820445829
+1.0.0.Final-KEYCLOAK-5461	sthorger@redhat.com	META-INF/db2-jpa-changelog-1.0.0.Final.xml	2022-02-02 16:47:26.03122	2	MARK_RAN	9:828775b1596a07d1200ba1d49e5e3941	createTable tableName=APPLICATION_DEFAULT_ROLES; createTable tableName=CLIENT; createTable tableName=CLIENT_SESSION; createTable tableName=CLIENT_SESSION_ROLE; createTable tableName=COMPOSITE_ROLE; createTable tableName=CREDENTIAL; createTable tab...		\N	3.5.4	\N	\N	3820445829
+1.1.0.Beta1	sthorger@redhat.com	META-INF/jpa-changelog-1.1.0.Beta1.xml	2022-02-02 16:47:26.06085	3	EXECUTED	9:5f090e44a7d595883c1fb61f4b41fd38	delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION; createTable tableName=CLIENT_ATTRIBUTES; createTable tableName=CLIENT_SESSION_NOTE; createTable tableName=APP_NODE_REGISTRATIONS; addColumn table...		\N	3.5.4	\N	\N	3820445829
+1.1.0.Final	sthorger@redhat.com	META-INF/jpa-changelog-1.1.0.Final.xml	2022-02-02 16:47:26.065284	4	EXECUTED	9:c07e577387a3d2c04d1adc9aaad8730e	renameColumn newColumnName=EVENT_TIME, oldColumnName=TIME, tableName=EVENT_ENTITY		\N	3.5.4	\N	\N	3820445829
+1.2.0.Beta1	psilva@redhat.com	META-INF/jpa-changelog-1.2.0.Beta1.xml	2022-02-02 16:47:26.130908	5	EXECUTED	9:b68ce996c655922dbcd2fe6b6ae72686	delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION_NOTE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION; createTable tableName=PROTOCOL_MAPPER; createTable tableName=PROTOCOL_MAPPER_CONFIG; createTable tableName=...		\N	3.5.4	\N	\N	3820445829
+1.2.0.Beta1	psilva@redhat.com	META-INF/db2-jpa-changelog-1.2.0.Beta1.xml	2022-02-02 16:47:26.133863	6	MARK_RAN	9:543b5c9989f024fe35c6f6c5a97de88e	delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION_NOTE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION; createTable tableName=PROTOCOL_MAPPER; createTable tableName=PROTOCOL_MAPPER_CONFIG; createTable tableName=...		\N	3.5.4	\N	\N	3820445829
+1.2.0.RC1	bburke@redhat.com	META-INF/jpa-changelog-1.2.0.CR1.xml	2022-02-02 16:47:26.183318	7	EXECUTED	9:765afebbe21cf5bbca048e632df38336	delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION_NOTE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION_NOTE; delete tableName=USER_SESSION; createTable tableName=MIGRATION_MODEL; createTable tableName=IDENTITY_P...		\N	3.5.4	\N	\N	3820445829
+1.2.0.RC1	bburke@redhat.com	META-INF/db2-jpa-changelog-1.2.0.CR1.xml	2022-02-02 16:47:26.186858	8	MARK_RAN	9:db4a145ba11a6fdaefb397f6dbf829a1	delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION_NOTE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION_NOTE; delete tableName=USER_SESSION; createTable tableName=MIGRATION_MODEL; createTable tableName=IDENTITY_P...		\N	3.5.4	\N	\N	3820445829
+1.2.0.Final	keycloak	META-INF/jpa-changelog-1.2.0.Final.xml	2022-02-02 16:47:26.19172	9	EXECUTED	9:9d05c7be10cdb873f8bcb41bc3a8ab23	update tableName=CLIENT; update tableName=CLIENT; update tableName=CLIENT		\N	3.5.4	\N	\N	3820445829
+1.3.0	bburke@redhat.com	META-INF/jpa-changelog-1.3.0.xml	2022-02-02 16:47:26.242162	10	EXECUTED	9:18593702353128d53111f9b1ff0b82b8	delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION_PROT_MAPPER; delete tableName=CLIENT_SESSION_NOTE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION_NOTE; delete tableName=USER_SESSION; createTable tableName=ADMI...		\N	3.5.4	\N	\N	3820445829
+1.4.0	bburke@redhat.com	META-INF/jpa-changelog-1.4.0.xml	2022-02-02 16:47:26.275929	11	EXECUTED	9:6122efe5f090e41a85c0f1c9e52cbb62	delete tableName=CLIENT_SESSION_AUTH_STATUS; delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION_PROT_MAPPER; delete tableName=CLIENT_SESSION_NOTE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION_NOTE; delete table...		\N	3.5.4	\N	\N	3820445829
+1.4.0	bburke@redhat.com	META-INF/db2-jpa-changelog-1.4.0.xml	2022-02-02 16:47:26.278548	12	MARK_RAN	9:e1ff28bf7568451453f844c5d54bb0b5	delete tableName=CLIENT_SESSION_AUTH_STATUS; delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION_PROT_MAPPER; delete tableName=CLIENT_SESSION_NOTE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION_NOTE; delete table...		\N	3.5.4	\N	\N	3820445829
+1.5.0	bburke@redhat.com	META-INF/jpa-changelog-1.5.0.xml	2022-02-02 16:47:26.287616	13	EXECUTED	9:7af32cd8957fbc069f796b61217483fd	delete tableName=CLIENT_SESSION_AUTH_STATUS; delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION_PROT_MAPPER; delete tableName=CLIENT_SESSION_NOTE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION_NOTE; delete table...		\N	3.5.4	\N	\N	3820445829
+1.6.1_from15	mposolda@redhat.com	META-INF/jpa-changelog-1.6.1.xml	2022-02-02 16:47:26.299798	14	EXECUTED	9:6005e15e84714cd83226bf7879f54190	addColumn tableName=REALM; addColumn tableName=KEYCLOAK_ROLE; addColumn tableName=CLIENT; createTable tableName=OFFLINE_USER_SESSION; createTable tableName=OFFLINE_CLIENT_SESSION; addPrimaryKey constraintName=CONSTRAINT_OFFL_US_SES_PK2, tableName=...		\N	3.5.4	\N	\N	3820445829
+1.6.1_from16-pre	mposolda@redhat.com	META-INF/jpa-changelog-1.6.1.xml	2022-02-02 16:47:26.302088	15	MARK_RAN	9:bf656f5a2b055d07f314431cae76f06c	delete tableName=OFFLINE_CLIENT_SESSION; delete tableName=OFFLINE_USER_SESSION		\N	3.5.4	\N	\N	3820445829
+1.6.1_from16	mposolda@redhat.com	META-INF/jpa-changelog-1.6.1.xml	2022-02-02 16:47:26.303889	16	MARK_RAN	9:f8dadc9284440469dcf71e25ca6ab99b	dropPrimaryKey constraintName=CONSTRAINT_OFFLINE_US_SES_PK, tableName=OFFLINE_USER_SESSION; dropPrimaryKey constraintName=CONSTRAINT_OFFLINE_CL_SES_PK, tableName=OFFLINE_CLIENT_SESSION; addColumn tableName=OFFLINE_USER_SESSION; update tableName=OF...		\N	3.5.4	\N	\N	3820445829
+1.7.0	bburke@redhat.com	META-INF/jpa-changelog-1.7.0.xml	2022-02-02 16:47:26.338791	18	EXECUTED	9:3368ff0be4c2855ee2dd9ca813b38d8e	createTable tableName=KEYCLOAK_GROUP; createTable tableName=GROUP_ROLE_MAPPING; createTable tableName=GROUP_ATTRIBUTE; createTable tableName=USER_GROUP_MEMBERSHIP; createTable tableName=REALM_DEFAULT_GROUPS; addColumn tableName=IDENTITY_PROVIDER; ...		\N	3.5.4	\N	\N	3820445829
+1.8.0	mposolda@redhat.com	META-INF/jpa-changelog-1.8.0.xml	2022-02-02 16:47:26.381463	19	EXECUTED	9:8ac2fb5dd030b24c0570a763ed75ed20	addColumn tableName=IDENTITY_PROVIDER; createTable tableName=CLIENT_TEMPLATE; createTable tableName=CLIENT_TEMPLATE_ATTRIBUTES; createTable tableName=TEMPLATE_SCOPE_MAPPING; dropNotNullConstraint columnName=CLIENT_ID, tableName=PROTOCOL_MAPPER; ad...		\N	3.5.4	\N	\N	3820445829
+1.8.0-2	keycloak	META-INF/jpa-changelog-1.8.0.xml	2022-02-02 16:47:26.390165	20	EXECUTED	9:f91ddca9b19743db60e3057679810e6c	dropDefaultValue columnName=ALGORITHM, tableName=CREDENTIAL; update tableName=CREDENTIAL		\N	3.5.4	\N	\N	3820445829
+1.8.0	mposolda@redhat.com	META-INF/db2-jpa-changelog-1.8.0.xml	2022-02-02 16:47:26.392862	21	MARK_RAN	9:831e82914316dc8a57dc09d755f23c51	addColumn tableName=IDENTITY_PROVIDER; createTable tableName=CLIENT_TEMPLATE; createTable tableName=CLIENT_TEMPLATE_ATTRIBUTES; createTable tableName=TEMPLATE_SCOPE_MAPPING; dropNotNullConstraint columnName=CLIENT_ID, tableName=PROTOCOL_MAPPER; ad...		\N	3.5.4	\N	\N	3820445829
+1.8.0-2	keycloak	META-INF/db2-jpa-changelog-1.8.0.xml	2022-02-02 16:47:26.395652	22	MARK_RAN	9:f91ddca9b19743db60e3057679810e6c	dropDefaultValue columnName=ALGORITHM, tableName=CREDENTIAL; update tableName=CREDENTIAL		\N	3.5.4	\N	\N	3820445829
+1.9.0	mposolda@redhat.com	META-INF/jpa-changelog-1.9.0.xml	2022-02-02 16:47:26.40969	23	EXECUTED	9:bc3d0f9e823a69dc21e23e94c7a94bb1	update tableName=REALM; update tableName=REALM; update tableName=REALM; update tableName=REALM; update tableName=CREDENTIAL; update tableName=CREDENTIAL; update tableName=CREDENTIAL; update tableName=REALM; update tableName=REALM; customChange; dr...		\N	3.5.4	\N	\N	3820445829
+1.9.1	keycloak	META-INF/jpa-changelog-1.9.1.xml	2022-02-02 16:47:26.414344	24	EXECUTED	9:c9999da42f543575ab790e76439a2679	modifyDataType columnName=PRIVATE_KEY, tableName=REALM; modifyDataType columnName=PUBLIC_KEY, tableName=REALM; modifyDataType columnName=CERTIFICATE, tableName=REALM		\N	3.5.4	\N	\N	3820445829
+1.9.1	keycloak	META-INF/db2-jpa-changelog-1.9.1.xml	2022-02-02 16:47:26.416193	25	MARK_RAN	9:0d6c65c6f58732d81569e77b10ba301d	modifyDataType columnName=PRIVATE_KEY, tableName=REALM; modifyDataType columnName=CERTIFICATE, tableName=REALM		\N	3.5.4	\N	\N	3820445829
+1.9.2	keycloak	META-INF/jpa-changelog-1.9.2.xml	2022-02-02 16:47:26.437367	26	EXECUTED	9:fc576660fc016ae53d2d4778d84d86d0	createIndex indexName=IDX_USER_EMAIL, tableName=USER_ENTITY; createIndex indexName=IDX_USER_ROLE_MAPPING, tableName=USER_ROLE_MAPPING; createIndex indexName=IDX_USER_GROUP_MAPPING, tableName=USER_GROUP_MEMBERSHIP; createIndex indexName=IDX_USER_CO...		\N	3.5.4	\N	\N	3820445829
+authz-2.0.0	psilva@redhat.com	META-INF/jpa-changelog-authz-2.0.0.xml	2022-02-02 16:47:26.481647	27	EXECUTED	9:43ed6b0da89ff77206289e87eaa9c024	createTable tableName=RESOURCE_SERVER; addPrimaryKey constraintName=CONSTRAINT_FARS, tableName=RESOURCE_SERVER; addUniqueConstraint constraintName=UK_AU8TT6T700S9V50BU18WS5HA6, tableName=RESOURCE_SERVER; createTable tableName=RESOURCE_SERVER_RESOU...		\N	3.5.4	\N	\N	3820445829
+2.1.0-KEYCLOAK-5461	bburke@redhat.com	META-INF/jpa-changelog-2.1.0.xml	2022-02-02 16:47:26.523006	29	EXECUTED	9:bd88e1f833df0420b01e114533aee5e8	createTable tableName=BROKER_LINK; createTable tableName=FED_USER_ATTRIBUTE; createTable tableName=FED_USER_CONSENT; createTable tableName=FED_USER_CONSENT_ROLE; createTable tableName=FED_USER_CONSENT_PROT_MAPPER; createTable tableName=FED_USER_CR...		\N	3.5.4	\N	\N	3820445829
+2.2.0	bburke@redhat.com	META-INF/jpa-changelog-2.2.0.xml	2022-02-02 16:47:26.532066	30	EXECUTED	9:a7022af5267f019d020edfe316ef4371	addColumn tableName=ADMIN_EVENT_ENTITY; createTable tableName=CREDENTIAL_ATTRIBUTE; createTable tableName=FED_CREDENTIAL_ATTRIBUTE; modifyDataType columnName=VALUE, tableName=CREDENTIAL; addForeignKeyConstraint baseTableName=FED_CREDENTIAL_ATTRIBU...		\N	3.5.4	\N	\N	3820445829
+2.3.0	bburke@redhat.com	META-INF/jpa-changelog-2.3.0.xml	2022-02-02 16:47:26.541837	31	EXECUTED	9:fc155c394040654d6a79227e56f5e25a	createTable tableName=FEDERATED_USER; addPrimaryKey constraintName=CONSTR_FEDERATED_USER, tableName=FEDERATED_USER; dropDefaultValue columnName=TOTP, tableName=USER_ENTITY; dropColumn columnName=TOTP, tableName=USER_ENTITY; addColumn tableName=IDE...		\N	3.5.4	\N	\N	3820445829
+2.4.0	bburke@redhat.com	META-INF/jpa-changelog-2.4.0.xml	2022-02-02 16:47:26.545809	32	EXECUTED	9:eac4ffb2a14795e5dc7b426063e54d88	customChange		\N	3.5.4	\N	\N	3820445829
+2.5.0	bburke@redhat.com	META-INF/jpa-changelog-2.5.0.xml	2022-02-02 16:47:26.549823	33	EXECUTED	9:54937c05672568c4c64fc9524c1e9462	customChange; modifyDataType columnName=USER_ID, tableName=OFFLINE_USER_SESSION		\N	3.5.4	\N	\N	3820445829
+2.5.0-unicode-oracle	hmlnarik@redhat.com	META-INF/jpa-changelog-2.5.0.xml	2022-02-02 16:47:26.55176	34	MARK_RAN	9:3a32bace77c84d7678d035a7f5a8084e	modifyDataType columnName=DESCRIPTION, tableName=AUTHENTICATION_FLOW; modifyDataType columnName=DESCRIPTION, tableName=CLIENT_TEMPLATE; modifyDataType columnName=DESCRIPTION, tableName=RESOURCE_SERVER_POLICY; modifyDataType columnName=DESCRIPTION,...		\N	3.5.4	\N	\N	3820445829
+2.5.0-unicode-other-dbs	hmlnarik@redhat.com	META-INF/jpa-changelog-2.5.0.xml	2022-02-02 16:47:26.567305	35	EXECUTED	9:33d72168746f81f98ae3a1e8e0ca3554	modifyDataType columnName=DESCRIPTION, tableName=AUTHENTICATION_FLOW; modifyDataType columnName=DESCRIPTION, tableName=CLIENT_TEMPLATE; modifyDataType columnName=DESCRIPTION, tableName=RESOURCE_SERVER_POLICY; modifyDataType columnName=DESCRIPTION,...		\N	3.5.4	\N	\N	3820445829
+2.5.0-duplicate-email-support	slawomir@dabek.name	META-INF/jpa-changelog-2.5.0.xml	2022-02-02 16:47:26.570727	36	EXECUTED	9:61b6d3d7a4c0e0024b0c839da283da0c	addColumn tableName=REALM		\N	3.5.4	\N	\N	3820445829
+2.5.0-unique-group-names	hmlnarik@redhat.com	META-INF/jpa-changelog-2.5.0.xml	2022-02-02 16:47:26.578396	37	EXECUTED	9:8dcac7bdf7378e7d823cdfddebf72fda	addUniqueConstraint constraintName=SIBLING_NAMES, tableName=KEYCLOAK_GROUP		\N	3.5.4	\N	\N	3820445829
+2.5.1	bburke@redhat.com	META-INF/jpa-changelog-2.5.1.xml	2022-02-02 16:47:26.581391	38	EXECUTED	9:a2b870802540cb3faa72098db5388af3	addColumn tableName=FED_USER_CONSENT		\N	3.5.4	\N	\N	3820445829
+3.0.0	bburke@redhat.com	META-INF/jpa-changelog-3.0.0.xml	2022-02-02 16:47:26.584204	39	EXECUTED	9:132a67499ba24bcc54fb5cbdcfe7e4c0	addColumn tableName=IDENTITY_PROVIDER		\N	3.5.4	\N	\N	3820445829
+3.2.0-fix	keycloak	META-INF/jpa-changelog-3.2.0.xml	2022-02-02 16:47:26.585877	40	MARK_RAN	9:938f894c032f5430f2b0fafb1a243462	addNotNullConstraint columnName=REALM_ID, tableName=CLIENT_INITIAL_ACCESS		\N	3.5.4	\N	\N	3820445829
+3.2.0-fix-with-keycloak-5416	keycloak	META-INF/jpa-changelog-3.2.0.xml	2022-02-02 16:47:26.587657	41	MARK_RAN	9:845c332ff1874dc5d35974b0babf3006	dropIndex indexName=IDX_CLIENT_INIT_ACC_REALM, tableName=CLIENT_INITIAL_ACCESS; addNotNullConstraint columnName=REALM_ID, tableName=CLIENT_INITIAL_ACCESS; createIndex indexName=IDX_CLIENT_INIT_ACC_REALM, tableName=CLIENT_INITIAL_ACCESS		\N	3.5.4	\N	\N	3820445829
+3.2.0-fix-offline-sessions	hmlnarik	META-INF/jpa-changelog-3.2.0.xml	2022-02-02 16:47:26.591561	42	EXECUTED	9:fc86359c079781adc577c5a217e4d04c	customChange		\N	3.5.4	\N	\N	3820445829
+3.2.0-fixed	keycloak	META-INF/jpa-changelog-3.2.0.xml	2022-02-02 16:47:26.669981	43	EXECUTED	9:59a64800e3c0d09b825f8a3b444fa8f4	addColumn tableName=REALM; dropPrimaryKey constraintName=CONSTRAINT_OFFL_CL_SES_PK2, tableName=OFFLINE_CLIENT_SESSION; dropColumn columnName=CLIENT_SESSION_ID, tableName=OFFLINE_CLIENT_SESSION; addPrimaryKey constraintName=CONSTRAINT_OFFL_CL_SES_P...		\N	3.5.4	\N	\N	3820445829
+3.3.0	keycloak	META-INF/jpa-changelog-3.3.0.xml	2022-02-02 16:47:26.673701	44	EXECUTED	9:d48d6da5c6ccf667807f633fe489ce88	addColumn tableName=USER_ENTITY		\N	3.5.4	\N	\N	3820445829
+authz-3.4.0.CR1-resource-server-pk-change-part1	glavoie@gmail.com	META-INF/jpa-changelog-authz-3.4.0.CR1.xml	2022-02-02 16:47:26.679075	45	EXECUTED	9:dde36f7973e80d71fceee683bc5d2951	addColumn tableName=RESOURCE_SERVER_POLICY; addColumn tableName=RESOURCE_SERVER_RESOURCE; addColumn tableName=RESOURCE_SERVER_SCOPE		\N	3.5.4	\N	\N	3820445829
+authz-3.4.0.CR1-resource-server-pk-change-part2-KEYCLOAK-6095	hmlnarik@redhat.com	META-INF/jpa-changelog-authz-3.4.0.CR1.xml	2022-02-02 16:47:26.681987	46	EXECUTED	9:b855e9b0a406b34fa323235a0cf4f640	customChange		\N	3.5.4	\N	\N	3820445829
+authz-3.4.0.CR1-resource-server-pk-change-part3-fixed	glavoie@gmail.com	META-INF/jpa-changelog-authz-3.4.0.CR1.xml	2022-02-02 16:47:26.683661	47	MARK_RAN	9:51abbacd7b416c50c4421a8cabf7927e	dropIndex indexName=IDX_RES_SERV_POL_RES_SERV, tableName=RESOURCE_SERVER_POLICY; dropIndex indexName=IDX_RES_SRV_RES_RES_SRV, tableName=RESOURCE_SERVER_RESOURCE; dropIndex indexName=IDX_RES_SRV_SCOPE_RES_SRV, tableName=RESOURCE_SERVER_SCOPE		\N	3.5.4	\N	\N	3820445829
+authz-3.4.0.CR1-resource-server-pk-change-part3-fixed-nodropindex	glavoie@gmail.com	META-INF/jpa-changelog-authz-3.4.0.CR1.xml	2022-02-02 16:47:26.702743	48	EXECUTED	9:bdc99e567b3398bac83263d375aad143	addNotNullConstraint columnName=RESOURCE_SERVER_CLIENT_ID, tableName=RESOURCE_SERVER_POLICY; addNotNullConstraint columnName=RESOURCE_SERVER_CLIENT_ID, tableName=RESOURCE_SERVER_RESOURCE; addNotNullConstraint columnName=RESOURCE_SERVER_CLIENT_ID, ...		\N	3.5.4	\N	\N	3820445829
+authn-3.4.0.CR1-refresh-token-max-reuse	glavoie@gmail.com	META-INF/jpa-changelog-authz-3.4.0.CR1.xml	2022-02-02 16:47:26.706593	49	EXECUTED	9:d198654156881c46bfba39abd7769e69	addColumn tableName=REALM		\N	3.5.4	\N	\N	3820445829
+3.4.0	keycloak	META-INF/jpa-changelog-3.4.0.xml	2022-02-02 16:47:26.734467	50	EXECUTED	9:cfdd8736332ccdd72c5256ccb42335db	addPrimaryKey constraintName=CONSTRAINT_REALM_DEFAULT_ROLES, tableName=REALM_DEFAULT_ROLES; addPrimaryKey constraintName=CONSTRAINT_COMPOSITE_ROLE, tableName=COMPOSITE_ROLE; addPrimaryKey constraintName=CONSTR_REALM_DEFAULT_GROUPS, tableName=REALM...		\N	3.5.4	\N	\N	3820445829
+3.4.0-KEYCLOAK-5230	hmlnarik@redhat.com	META-INF/jpa-changelog-3.4.0.xml	2022-02-02 16:47:26.78037	51	EXECUTED	9:7c84de3d9bd84d7f077607c1a4dcb714	createIndex indexName=IDX_FU_ATTRIBUTE, tableName=FED_USER_ATTRIBUTE; createIndex indexName=IDX_FU_CONSENT, tableName=FED_USER_CONSENT; createIndex indexName=IDX_FU_CONSENT_RU, tableName=FED_USER_CONSENT; createIndex indexName=IDX_FU_CREDENTIAL, t...		\N	3.5.4	\N	\N	3820445829
+3.4.1	psilva@redhat.com	META-INF/jpa-changelog-3.4.1.xml	2022-02-02 16:47:26.783989	52	EXECUTED	9:5a6bb36cbefb6a9d6928452c0852af2d	modifyDataType columnName=VALUE, tableName=CLIENT_ATTRIBUTES		\N	3.5.4	\N	\N	3820445829
+3.4.2-KEYCLOAK-5172	mkanis@redhat.com	META-INF/jpa-changelog-3.4.2.xml	2022-02-02 16:47:26.788788	54	EXECUTED	9:9156214268f09d970cdf0e1564d866af	update tableName=CLIENT		\N	3.5.4	\N	\N	3820445829
+4.0.0-KEYCLOAK-6335	bburke@redhat.com	META-INF/jpa-changelog-4.0.0.xml	2022-02-02 16:47:26.794881	55	EXECUTED	9:db806613b1ed154826c02610b7dbdf74	createTable tableName=CLIENT_AUTH_FLOW_BINDINGS; addPrimaryKey constraintName=C_CLI_FLOW_BIND, tableName=CLIENT_AUTH_FLOW_BINDINGS		\N	3.5.4	\N	\N	3820445829
+4.0.0-CLEANUP-UNUSED-TABLE	bburke@redhat.com	META-INF/jpa-changelog-4.0.0.xml	2022-02-02 16:47:26.799493	56	EXECUTED	9:229a041fb72d5beac76bb94a5fa709de	dropTable tableName=CLIENT_IDENTITY_PROV_MAPPING		\N	3.5.4	\N	\N	3820445829
+4.0.0-KEYCLOAK-6228	bburke@redhat.com	META-INF/jpa-changelog-4.0.0.xml	2022-02-02 16:47:26.810686	57	EXECUTED	9:079899dade9c1e683f26b2aa9ca6ff04	dropUniqueConstraint constraintName=UK_JKUWUVD56ONTGSUHOGM8UEWRT, tableName=USER_CONSENT; dropNotNullConstraint columnName=CLIENT_ID, tableName=USER_CONSENT; addColumn tableName=USER_CONSENT; addUniqueConstraint constraintName=UK_JKUWUVD56ONTGSUHO...		\N	3.5.4	\N	\N	3820445829
+4.0.0-KEYCLOAK-5579-fixed	mposolda@redhat.com	META-INF/jpa-changelog-4.0.0.xml	2022-02-02 16:47:26.861332	58	EXECUTED	9:139b79bcbbfe903bb1c2d2a4dbf001d9	dropForeignKeyConstraint baseTableName=CLIENT_TEMPLATE_ATTRIBUTES, constraintName=FK_CL_TEMPL_ATTR_TEMPL; renameTable newTableName=CLIENT_SCOPE_ATTRIBUTES, oldTableName=CLIENT_TEMPLATE_ATTRIBUTES; renameColumn newColumnName=SCOPE_ID, oldColumnName...		\N	3.5.4	\N	\N	3820445829
+authz-4.0.0.CR1	psilva@redhat.com	META-INF/jpa-changelog-authz-4.0.0.CR1.xml	2022-02-02 16:47:26.877018	59	EXECUTED	9:b55738ad889860c625ba2bf483495a04	createTable tableName=RESOURCE_SERVER_PERM_TICKET; addPrimaryKey constraintName=CONSTRAINT_FAPMT, tableName=RESOURCE_SERVER_PERM_TICKET; addForeignKeyConstraint baseTableName=RESOURCE_SERVER_PERM_TICKET, constraintName=FK_FRSRHO213XCX4WNKOG82SSPMT...		\N	3.5.4	\N	\N	3820445829
+authz-4.0.0.Beta3	psilva@redhat.com	META-INF/jpa-changelog-authz-4.0.0.Beta3.xml	2022-02-02 16:47:26.881203	60	EXECUTED	9:e0057eac39aa8fc8e09ac6cfa4ae15fe	addColumn tableName=RESOURCE_SERVER_POLICY; addColumn tableName=RESOURCE_SERVER_PERM_TICKET; addForeignKeyConstraint baseTableName=RESOURCE_SERVER_PERM_TICKET, constraintName=FK_FRSRPO2128CX4WNKOG82SSRFY, referencedTableName=RESOURCE_SERVER_POLICY		\N	3.5.4	\N	\N	3820445829
+authz-4.2.0.Final	mhajas@redhat.com	META-INF/jpa-changelog-authz-4.2.0.Final.xml	2022-02-02 16:47:26.886177	61	EXECUTED	9:42a33806f3a0443fe0e7feeec821326c	createTable tableName=RESOURCE_URIS; addForeignKeyConstraint baseTableName=RESOURCE_URIS, constraintName=FK_RESOURCE_SERVER_URIS, referencedTableName=RESOURCE_SERVER_RESOURCE; customChange; dropColumn columnName=URI, tableName=RESOURCE_SERVER_RESO...		\N	3.5.4	\N	\N	3820445829
+authz-4.2.0.Final-KEYCLOAK-9944	hmlnarik@redhat.com	META-INF/jpa-changelog-authz-4.2.0.Final.xml	2022-02-02 16:47:26.890482	62	EXECUTED	9:9968206fca46eecc1f51db9c024bfe56	addPrimaryKey constraintName=CONSTRAINT_RESOUR_URIS_PK, tableName=RESOURCE_URIS		\N	3.5.4	\N	\N	3820445829
+4.2.0-KEYCLOAK-6313	wadahiro@gmail.com	META-INF/jpa-changelog-4.2.0.xml	2022-02-02 16:47:26.893518	63	EXECUTED	9:92143a6daea0a3f3b8f598c97ce55c3d	addColumn tableName=REQUIRED_ACTION_PROVIDER		\N	3.5.4	\N	\N	3820445829
+4.3.0-KEYCLOAK-7984	wadahiro@gmail.com	META-INF/jpa-changelog-4.3.0.xml	2022-02-02 16:47:26.895621	64	EXECUTED	9:82bab26a27195d889fb0429003b18f40	update tableName=REQUIRED_ACTION_PROVIDER		\N	3.5.4	\N	\N	3820445829
+4.6.0-KEYCLOAK-7950	psilva@redhat.com	META-INF/jpa-changelog-4.6.0.xml	2022-02-02 16:47:26.89756	65	EXECUTED	9:e590c88ddc0b38b0ae4249bbfcb5abc3	update tableName=RESOURCE_SERVER_RESOURCE		\N	3.5.4	\N	\N	3820445829
+4.6.0-KEYCLOAK-8377	keycloak	META-INF/jpa-changelog-4.6.0.xml	2022-02-02 16:47:26.908059	66	EXECUTED	9:5c1f475536118dbdc38d5d7977950cc0	createTable tableName=ROLE_ATTRIBUTE; addPrimaryKey constraintName=CONSTRAINT_ROLE_ATTRIBUTE_PK, tableName=ROLE_ATTRIBUTE; addForeignKeyConstraint baseTableName=ROLE_ATTRIBUTE, constraintName=FK_ROLE_ATTRIBUTE_ID, referencedTableName=KEYCLOAK_ROLE...		\N	3.5.4	\N	\N	3820445829
+4.6.0-KEYCLOAK-8555	gideonray@gmail.com	META-INF/jpa-changelog-4.6.0.xml	2022-02-02 16:47:26.912693	67	EXECUTED	9:e7c9f5f9c4d67ccbbcc215440c718a17	createIndex indexName=IDX_COMPONENT_PROVIDER_TYPE, tableName=COMPONENT		\N	3.5.4	\N	\N	3820445829
+4.7.0-KEYCLOAK-1267	sguilhen@redhat.com	META-INF/jpa-changelog-4.7.0.xml	2022-02-02 16:47:26.915771	68	EXECUTED	9:88e0bfdda924690d6f4e430c53447dd5	addColumn tableName=REALM		\N	3.5.4	\N	\N	3820445829
+4.7.0-KEYCLOAK-7275	keycloak	META-INF/jpa-changelog-4.7.0.xml	2022-02-02 16:47:26.924465	69	EXECUTED	9:f53177f137e1c46b6a88c59ec1cb5218	renameColumn newColumnName=CREATED_ON, oldColumnName=LAST_SESSION_REFRESH, tableName=OFFLINE_USER_SESSION; addNotNullConstraint columnName=CREATED_ON, tableName=OFFLINE_USER_SESSION; addColumn tableName=OFFLINE_USER_SESSION; customChange; createIn...		\N	3.5.4	\N	\N	3820445829
+4.8.0-KEYCLOAK-8835	sguilhen@redhat.com	META-INF/jpa-changelog-4.8.0.xml	2022-02-02 16:47:26.928034	70	EXECUTED	9:a74d33da4dc42a37ec27121580d1459f	addNotNullConstraint columnName=SSO_MAX_LIFESPAN_REMEMBER_ME, tableName=REALM; addNotNullConstraint columnName=SSO_IDLE_TIMEOUT_REMEMBER_ME, tableName=REALM		\N	3.5.4	\N	\N	3820445829
+authz-7.0.0-KEYCLOAK-10443	psilva@redhat.com	META-INF/jpa-changelog-authz-7.0.0.xml	2022-02-02 16:47:26.93061	71	EXECUTED	9:fd4ade7b90c3b67fae0bfcfcb42dfb5f	addColumn tableName=RESOURCE_SERVER		\N	3.5.4	\N	\N	3820445829
+8.0.0-adding-credential-columns	keycloak	META-INF/jpa-changelog-8.0.0.xml	2022-02-02 16:47:26.933771	72	EXECUTED	9:aa072ad090bbba210d8f18781b8cebf4	addColumn tableName=CREDENTIAL; addColumn tableName=FED_USER_CREDENTIAL		\N	3.5.4	\N	\N	3820445829
+8.0.0-credential-cleanup-fixed	keycloak	META-INF/jpa-changelog-8.0.0.xml	2022-02-02 16:47:26.945819	75	EXECUTED	9:2b9cc12779be32c5b40e2e67711a218b	dropDefaultValue columnName=COUNTER, tableName=CREDENTIAL; dropDefaultValue columnName=DIGITS, tableName=CREDENTIAL; dropDefaultValue columnName=PERIOD, tableName=CREDENTIAL; dropDefaultValue columnName=ALGORITHM, tableName=CREDENTIAL; dropColumn ...		\N	3.5.4	\N	\N	3820445829
+8.0.0-resource-tag-support	keycloak	META-INF/jpa-changelog-8.0.0.xml	2022-02-02 16:47:26.950255	76	EXECUTED	9:91fa186ce7a5af127a2d7a91ee083cc5	addColumn tableName=MIGRATION_MODEL; createIndex indexName=IDX_UPDATE_TIME, tableName=MIGRATION_MODEL		\N	3.5.4	\N	\N	3820445829
+9.0.0-always-display-client	keycloak	META-INF/jpa-changelog-9.0.0.xml	2022-02-02 16:47:26.955505	77	EXECUTED	9:6335e5c94e83a2639ccd68dd24e2e5ad	addColumn tableName=CLIENT		\N	3.5.4	\N	\N	3820445829
+9.0.0-drop-constraints-for-column-increase	keycloak	META-INF/jpa-changelog-9.0.0.xml	2022-02-02 16:47:26.957216	78	MARK_RAN	9:6bdb5658951e028bfe16fa0a8228b530	dropUniqueConstraint constraintName=UK_FRSR6T700S9V50BU18WS5PMT, tableName=RESOURCE_SERVER_PERM_TICKET; dropUniqueConstraint constraintName=UK_FRSR6T700S9V50BU18WS5HA6, tableName=RESOURCE_SERVER_RESOURCE; dropPrimaryKey constraintName=CONSTRAINT_O...		\N	3.5.4	\N	\N	3820445829
+9.0.0-increase-column-size-federated-fk	keycloak	META-INF/jpa-changelog-9.0.0.xml	2022-02-02 16:47:26.966746	79	EXECUTED	9:d5bc15a64117ccad481ce8792d4c608f	modifyDataType columnName=CLIENT_ID, tableName=FED_USER_CONSENT; modifyDataType columnName=CLIENT_REALM_CONSTRAINT, tableName=KEYCLOAK_ROLE; modifyDataType columnName=OWNER, tableName=RESOURCE_SERVER_POLICY; modifyDataType columnName=CLIENT_ID, ta...		\N	3.5.4	\N	\N	3820445829
+9.0.0-recreate-constraints-after-column-increase	keycloak	META-INF/jpa-changelog-9.0.0.xml	2022-02-02 16:47:26.969643	80	MARK_RAN	9:077cba51999515f4d3e7ad5619ab592c	addNotNullConstraint columnName=CLIENT_ID, tableName=OFFLINE_CLIENT_SESSION; addNotNullConstraint columnName=OWNER, tableName=RESOURCE_SERVER_PERM_TICKET; addNotNullConstraint columnName=REQUESTER, tableName=RESOURCE_SERVER_PERM_TICKET; addNotNull...		\N	3.5.4	\N	\N	3820445829
+9.0.1-add-index-to-client.client_id	keycloak	META-INF/jpa-changelog-9.0.1.xml	2022-02-02 16:47:26.975764	81	EXECUTED	9:be969f08a163bf47c6b9e9ead8ac2afb	createIndex indexName=IDX_CLIENT_ID, tableName=CLIENT		\N	3.5.4	\N	\N	3820445829
+9.0.1-KEYCLOAK-12579-drop-constraints	keycloak	META-INF/jpa-changelog-9.0.1.xml	2022-02-02 16:47:26.977227	82	MARK_RAN	9:6d3bb4408ba5a72f39bd8a0b301ec6e3	dropUniqueConstraint constraintName=SIBLING_NAMES, tableName=KEYCLOAK_GROUP		\N	3.5.4	\N	\N	3820445829
+9.0.1-KEYCLOAK-12579-add-not-null-constraint	keycloak	META-INF/jpa-changelog-9.0.1.xml	2022-02-02 16:47:26.980058	83	EXECUTED	9:966bda61e46bebf3cc39518fbed52fa7	addNotNullConstraint columnName=PARENT_GROUP, tableName=KEYCLOAK_GROUP		\N	3.5.4	\N	\N	3820445829
+9.0.1-KEYCLOAK-12579-recreate-constraints	keycloak	META-INF/jpa-changelog-9.0.1.xml	2022-02-02 16:47:26.981645	84	MARK_RAN	9:8dcac7bdf7378e7d823cdfddebf72fda	addUniqueConstraint constraintName=SIBLING_NAMES, tableName=KEYCLOAK_GROUP		\N	3.5.4	\N	\N	3820445829
+9.0.1-add-index-to-events	keycloak	META-INF/jpa-changelog-9.0.1.xml	2022-02-02 16:47:26.985465	85	EXECUTED	9:7d93d602352a30c0c317e6a609b56599	createIndex indexName=IDX_EVENT_TIME, tableName=EVENT_ENTITY		\N	3.5.4	\N	\N	3820445829
+map-remove-ri	keycloak	META-INF/jpa-changelog-11.0.0.xml	2022-02-02 16:47:26.98869	86	EXECUTED	9:71c5969e6cdd8d7b6f47cebc86d37627	dropForeignKeyConstraint baseTableName=REALM, constraintName=FK_TRAF444KK6QRKMS7N56AIWQ5Y; dropForeignKeyConstraint baseTableName=KEYCLOAK_ROLE, constraintName=FK_KJHO5LE2C0RAL09FL8CM9WFW9		\N	3.5.4	\N	\N	3820445829
+map-remove-ri	keycloak	META-INF/jpa-changelog-12.0.0.xml	2022-02-02 16:47:26.992854	87	EXECUTED	9:a9ba7d47f065f041b7da856a81762021	dropForeignKeyConstraint baseTableName=REALM_DEFAULT_GROUPS, constraintName=FK_DEF_GROUPS_GROUP; dropForeignKeyConstraint baseTableName=REALM_DEFAULT_ROLES, constraintName=FK_H4WPD7W4HSOOLNI3H0SW7BTJE; dropForeignKeyConstraint baseTableName=CLIENT...		\N	3.5.4	\N	\N	3820445829
+12.1.0-add-realm-localization-table	keycloak	META-INF/jpa-changelog-12.0.0.xml	2022-02-02 16:47:26.999694	88	EXECUTED	9:fffabce2bc01e1a8f5110d5278500065	createTable tableName=REALM_LOCALIZATIONS; addPrimaryKey tableName=REALM_LOCALIZATIONS		\N	3.5.4	\N	\N	3820445829
+8.0.0-updating-credential-data-not-oracle-fixed	keycloak	META-INF/jpa-changelog-8.0.0.xml	2023-01-09 14:34:23.080082	89	MARK_RAN	9:1ae6be29bab7c2aa376f6983b932be37	update tableName=CREDENTIAL; update tableName=CREDENTIAL; update tableName=CREDENTIAL; update tableName=FED_USER_CREDENTIAL; update tableName=FED_USER_CREDENTIAL; update tableName=FED_USER_CREDENTIAL		\N	4.8.0	\N	\N	3274862955
+8.0.0-updating-credential-data-oracle-fixed	keycloak	META-INF/jpa-changelog-8.0.0.xml	2023-01-09 14:34:23.099857	90	MARK_RAN	9:14706f286953fc9a25286dbd8fb30d97	update tableName=CREDENTIAL; update tableName=CREDENTIAL; update tableName=CREDENTIAL; update tableName=FED_USER_CREDENTIAL; update tableName=FED_USER_CREDENTIAL; update tableName=FED_USER_CREDENTIAL		\N	4.8.0	\N	\N	3274862955
+default-roles	keycloak	META-INF/jpa-changelog-13.0.0.xml	2023-01-09 14:34:23.144776	91	EXECUTED	9:fa8a5b5445e3857f4b010bafb5009957	addColumn tableName=REALM; customChange		\N	4.8.0	\N	\N	3274862955
+default-roles-cleanup	keycloak	META-INF/jpa-changelog-13.0.0.xml	2023-01-09 14:34:23.155298	92	EXECUTED	9:67ac3241df9a8582d591c5ed87125f39	dropTable tableName=REALM_DEFAULT_ROLES; dropTable tableName=CLIENT_DEFAULT_ROLES		\N	4.8.0	\N	\N	3274862955
+13.0.0-KEYCLOAK-16844	keycloak	META-INF/jpa-changelog-13.0.0.xml	2023-01-09 14:34:23.162911	93	EXECUTED	9:ad1194d66c937e3ffc82386c050ba089	createIndex indexName=IDX_OFFLINE_USS_PRELOAD, tableName=OFFLINE_USER_SESSION		\N	4.8.0	\N	\N	3274862955
+map-remove-ri-13.0.0	keycloak	META-INF/jpa-changelog-13.0.0.xml	2023-01-09 14:34:23.17617	94	EXECUTED	9:d9be619d94af5a2f5d07b9f003543b91	dropForeignKeyConstraint baseTableName=DEFAULT_CLIENT_SCOPE, constraintName=FK_R_DEF_CLI_SCOPE_SCOPE; dropForeignKeyConstraint baseTableName=CLIENT_SCOPE_CLIENT, constraintName=FK_C_CLI_SCOPE_SCOPE; dropForeignKeyConstraint baseTableName=CLIENT_SC...		\N	4.8.0	\N	\N	3274862955
+13.0.0-KEYCLOAK-17992-drop-constraints	keycloak	META-INF/jpa-changelog-13.0.0.xml	2023-01-09 14:34:23.1803	95	MARK_RAN	9:544d201116a0fcc5a5da0925fbbc3bde	dropPrimaryKey constraintName=C_CLI_SCOPE_BIND, tableName=CLIENT_SCOPE_CLIENT; dropIndex indexName=IDX_CLSCOPE_CL, tableName=CLIENT_SCOPE_CLIENT; dropIndex indexName=IDX_CL_CLSCOPE, tableName=CLIENT_SCOPE_CLIENT		\N	4.8.0	\N	\N	3274862955
+13.0.0-increase-column-size-federated	keycloak	META-INF/jpa-changelog-13.0.0.xml	2023-01-09 14:34:23.190613	96	EXECUTED	9:43c0c1055b6761b4b3e89de76d612ccf	modifyDataType columnName=CLIENT_ID, tableName=CLIENT_SCOPE_CLIENT; modifyDataType columnName=SCOPE_ID, tableName=CLIENT_SCOPE_CLIENT		\N	4.8.0	\N	\N	3274862955
+13.0.0-KEYCLOAK-17992-recreate-constraints	keycloak	META-INF/jpa-changelog-13.0.0.xml	2023-01-09 14:34:23.193934	97	MARK_RAN	9:8bd711fd0330f4fe980494ca43ab1139	addNotNullConstraint columnName=CLIENT_ID, tableName=CLIENT_SCOPE_CLIENT; addNotNullConstraint columnName=SCOPE_ID, tableName=CLIENT_SCOPE_CLIENT; addPrimaryKey constraintName=C_CLI_SCOPE_BIND, tableName=CLIENT_SCOPE_CLIENT; createIndex indexName=...		\N	4.8.0	\N	\N	3274862955
+json-string-accomodation-fixed	keycloak	META-INF/jpa-changelog-13.0.0.xml	2023-01-09 14:34:23.202965	98	EXECUTED	9:e07d2bc0970c348bb06fb63b1f82ddbf	addColumn tableName=REALM_ATTRIBUTE; update tableName=REALM_ATTRIBUTE; dropColumn columnName=VALUE, tableName=REALM_ATTRIBUTE; renameColumn newColumnName=VALUE, oldColumnName=VALUE_NEW, tableName=REALM_ATTRIBUTE		\N	4.8.0	\N	\N	3274862955
+14.0.0-KEYCLOAK-11019	keycloak	META-INF/jpa-changelog-14.0.0.xml	2023-01-09 14:34:23.212244	99	EXECUTED	9:24fb8611e97f29989bea412aa38d12b7	createIndex indexName=IDX_OFFLINE_CSS_PRELOAD, tableName=OFFLINE_CLIENT_SESSION; createIndex indexName=IDX_OFFLINE_USS_BY_USER, tableName=OFFLINE_USER_SESSION; createIndex indexName=IDX_OFFLINE_USS_BY_USERSESS, tableName=OFFLINE_USER_SESSION		\N	4.8.0	\N	\N	3274862955
+14.0.0-KEYCLOAK-18286	keycloak	META-INF/jpa-changelog-14.0.0.xml	2023-01-09 14:34:23.2164	100	MARK_RAN	9:259f89014ce2506ee84740cbf7163aa7	createIndex indexName=IDX_CLIENT_ATT_BY_NAME_VALUE, tableName=CLIENT_ATTRIBUTES		\N	4.8.0	\N	\N	3274862955
+14.0.0-KEYCLOAK-18286-revert	keycloak	META-INF/jpa-changelog-14.0.0.xml	2023-01-09 14:34:23.227895	101	MARK_RAN	9:04baaf56c116ed19951cbc2cca584022	dropIndex indexName=IDX_CLIENT_ATT_BY_NAME_VALUE, tableName=CLIENT_ATTRIBUTES		\N	4.8.0	\N	\N	3274862955
+14.0.0-KEYCLOAK-18286-supported-dbs	keycloak	META-INF/jpa-changelog-14.0.0.xml	2023-01-09 14:34:23.235491	102	EXECUTED	9:60ca84a0f8c94ec8c3504a5a3bc88ee8	createIndex indexName=IDX_CLIENT_ATT_BY_NAME_VALUE, tableName=CLIENT_ATTRIBUTES		\N	4.8.0	\N	\N	3274862955
+14.0.0-KEYCLOAK-18286-unsupported-dbs	keycloak	META-INF/jpa-changelog-14.0.0.xml	2023-01-09 14:34:23.238498	103	MARK_RAN	9:d3d977031d431db16e2c181ce49d73e9	createIndex indexName=IDX_CLIENT_ATT_BY_NAME_VALUE, tableName=CLIENT_ATTRIBUTES		\N	4.8.0	\N	\N	3274862955
+KEYCLOAK-17267-add-index-to-user-attributes	keycloak	META-INF/jpa-changelog-14.0.0.xml	2023-01-09 14:34:23.24435	104	EXECUTED	9:0b305d8d1277f3a89a0a53a659ad274c	createIndex indexName=IDX_USER_ATTRIBUTE_NAME, tableName=USER_ATTRIBUTE		\N	4.8.0	\N	\N	3274862955
+KEYCLOAK-18146-add-saml-art-binding-identifier	keycloak	META-INF/jpa-changelog-14.0.0.xml	2023-01-09 14:34:23.250444	105	EXECUTED	9:2c374ad2cdfe20e2905a84c8fac48460	customChange		\N	4.8.0	\N	\N	3274862955
+15.0.0-KEYCLOAK-18467	keycloak	META-INF/jpa-changelog-15.0.0.xml	2023-01-09 14:34:23.261701	106	EXECUTED	9:47a760639ac597360a8219f5b768b4de	addColumn tableName=REALM_LOCALIZATIONS; update tableName=REALM_LOCALIZATIONS; dropColumn columnName=TEXTS, tableName=REALM_LOCALIZATIONS; renameColumn newColumnName=TEXTS, oldColumnName=TEXTS_NEW, tableName=REALM_LOCALIZATIONS; addNotNullConstrai...		\N	4.8.0	\N	\N	3274862955
+17.0.0-9562	keycloak	META-INF/jpa-changelog-17.0.0.xml	2023-01-09 14:34:23.269577	107	EXECUTED	9:a6272f0576727dd8cad2522335f5d99e	createIndex indexName=IDX_USER_SERVICE_ACCOUNT, tableName=USER_ENTITY		\N	4.8.0	\N	\N	3274862955
+18.0.0-10625-IDX_ADMIN_EVENT_TIME	keycloak	META-INF/jpa-changelog-18.0.0.xml	2023-01-09 14:34:23.276738	108	EXECUTED	9:015479dbd691d9cc8669282f4828c41d	createIndex indexName=IDX_ADMIN_EVENT_TIME, tableName=ADMIN_EVENT_ENTITY		\N	4.8.0	\N	\N	3274862955
+19.0.0-10135	keycloak	META-INF/jpa-changelog-19.0.0.xml	2023-01-09 14:34:23.297485	109	EXECUTED	9:9518e495fdd22f78ad6425cc30630221	customChange		\N	4.8.0	\N	\N	3274862955
+20.0.0-12964-supported-dbs	keycloak	META-INF/jpa-changelog-20.0.0.xml	2023-01-09 14:34:23.305463	110	EXECUTED	9:e5f243877199fd96bcc842f27a1656ac	createIndex indexName=IDX_GROUP_ATT_BY_NAME_VALUE, tableName=GROUP_ATTRIBUTE		\N	4.8.0	\N	\N	3274862955
+20.0.0-12964-unsupported-dbs	keycloak	META-INF/jpa-changelog-20.0.0.xml	2023-01-09 14:34:23.309005	111	MARK_RAN	9:1a6fcaa85e20bdeae0a9ce49b41946a5	createIndex indexName=IDX_GROUP_ATT_BY_NAME_VALUE, tableName=GROUP_ATTRIBUTE		\N	4.8.0	\N	\N	3274862955
+client-attributes-string-accomodation-fixed	keycloak	META-INF/jpa-changelog-20.0.0.xml	2023-01-09 14:34:23.318788	112	EXECUTED	9:3f332e13e90739ed0c35b0b25b7822ca	addColumn tableName=CLIENT_ATTRIBUTES; update tableName=CLIENT_ATTRIBUTES; dropColumn columnName=VALUE, tableName=CLIENT_ATTRIBUTES; renameColumn newColumnName=VALUE, oldColumnName=VALUE_NEW, tableName=CLIENT_ATTRIBUTES		\N	4.8.0	\N	\N	3274862955
+21.0.2-17277	keycloak	META-INF/jpa-changelog-21.0.2.xml	2024-02-14 09:01:09.307684	113	EXECUTED	9:7ee1f7a3fb8f5588f171fb9a6ab623c0	customChange		\N	4.23.2	\N	\N	7901269232
+21.1.0-19404	keycloak	META-INF/jpa-changelog-21.1.0.xml	2024-02-14 09:01:09.324282	114	EXECUTED	9:3d7e830b52f33676b9d64f7f2b2ea634	modifyDataType columnName=DECISION_STRATEGY, tableName=RESOURCE_SERVER_POLICY; modifyDataType columnName=LOGIC, tableName=RESOURCE_SERVER_POLICY; modifyDataType columnName=POLICY_ENFORCE_MODE, tableName=RESOURCE_SERVER		\N	4.23.2	\N	\N	7901269232
+21.1.0-19404-2	keycloak	META-INF/jpa-changelog-21.1.0.xml	2024-02-14 09:01:09.327044	115	MARK_RAN	9:627d032e3ef2c06c0e1f73d2ae25c26c	addColumn tableName=RESOURCE_SERVER_POLICY; update tableName=RESOURCE_SERVER_POLICY; dropColumn columnName=DECISION_STRATEGY, tableName=RESOURCE_SERVER_POLICY; renameColumn newColumnName=DECISION_STRATEGY, oldColumnName=DECISION_STRATEGY_NEW, tabl...		\N	4.23.2	\N	\N	7901269232
+22.0.0-17484-updated	keycloak	META-INF/jpa-changelog-22.0.0.xml	2024-02-14 09:01:09.332189	116	EXECUTED	9:90af0bfd30cafc17b9f4d6eccd92b8b3	customChange		\N	4.23.2	\N	\N	7901269232
+22.0.5-24031	keycloak	META-INF/jpa-changelog-22.0.0.xml	2024-02-14 09:01:09.333603	117	MARK_RAN	9:a60d2d7b315ec2d3eba9e2f145f9df28	customChange		\N	4.23.2	\N	\N	7901269232
+23.0.0-12062	keycloak	META-INF/jpa-changelog-23.0.0.xml	2024-02-14 09:01:09.340927	118	EXECUTED	9:2168fbe728fec46ae9baf15bf80927b8	addColumn tableName=COMPONENT_CONFIG; update tableName=COMPONENT_CONFIG; dropColumn columnName=VALUE, tableName=COMPONENT_CONFIG; renameColumn newColumnName=VALUE, oldColumnName=VALUE_NEW, tableName=COMPONENT_CONFIG		\N	4.23.2	\N	\N	7901269232
+23.0.0-17258	keycloak	META-INF/jpa-changelog-23.0.0.xml	2024-02-14 09:01:09.343484	119	EXECUTED	9:36506d679a83bbfda85a27ea1864dca8	addColumn tableName=EVENT_ENTITY		\N	4.23.2	\N	\N	7901269232
 \.
 
 
@@ -2385,9 +2379,9 @@ grafana	a5bb3a5f-fd26-4be6-9557-26e20a03d33d	f
 grafana	d6ffe9fc-a03c-4496-85dc-dbb5e7754587	f
 grafana	d6077ed7-b265-4f82-9336-24614967bd5d	t
 grafana	699671ab-e7c1-4fcf-beb8-ea54f1471fc1	t
-grafana	c61f5b19-c17e-49a1-91b8-a0296411b928	f
 grafana	d30340a8-630b-416e-8c93-3ccf932d34f3	t
 master	a96603aa-e6db-4b3e-8baa-679c75ccfc8f	t
+grafana	c61f5b19-c17e-49a1-91b8-a0296411b928	t
 \.
 
 
@@ -2395,7 +2389,7 @@ master	a96603aa-e6db-4b3e-8baa-679c75ccfc8f	t
 -- Data for Name: event_entity; Type: TABLE DATA; Schema: public; Owner: keycloak
 --
 
-COPY public.event_entity (id, client_id, details_json, error, ip_address, realm_id, session_id, event_time, type, user_id) FROM stdin;
+COPY public.event_entity (id, client_id, details_json, error, ip_address, realm_id, session_id, event_time, type, user_id, details_json_long_value) FROM stdin;
 \.
 
 
@@ -2524,6 +2518,9 @@ COPY public.idp_mapper_config (idp_mapper_id, value, name) FROM stdin;
 --
 
 COPY public.keycloak_group (id, name, parent_group, realm_id) FROM stdin;
+f1975bf4-6e92-479a-923c-d7d5b65d684c	First	 	grafana
+fe974984-8b18-4925-beef-37b6cfb6af7b	Second	 	grafana
+4cc0bd0f-9071-42a9-b282-be22515156ba	Third	 	grafana
 \.
 
 
@@ -2628,6 +2625,7 @@ c9a895d1-c901-46b0-91cf-2c67902b4a93	a5a8fed6-0bca-4646-9946-2fe84175353b	t	${ro
 COPY public.migration_model (id, version, update_time) FROM stdin;
 g5slr	12.0.1	1643820448
 wupxt	20.0.2	1673274863
+y2nke	23.0.1	1707901269
 \.
 
 
@@ -2710,13 +2708,13 @@ b4854867-3bfb-409b-92a8-6ec37db17f99	phone number verified	openid-connect	oidc-u
 1fc8999a-04d9-421b-8557-e417a3750358	realm roles	openid-connect	oidc-usermodel-realm-role-mapper	\N	d6077ed7-b265-4f82-9336-24614967bd5d
 384e97dd-36ad-4b0e-af63-d0cb3a2153d4	allowed web origins	openid-connect	oidc-allowed-origins-mapper	\N	699671ab-e7c1-4fcf-beb8-ea54f1471fc1
 f03cac68-3f0e-4068-9adf-ee64567689a7	upn	openid-connect	oidc-usermodel-property-mapper	\N	c61f5b19-c17e-49a1-91b8-a0296411b928
-04183ee1-b558-4f63-839f-922d30b34a9e	groups	openid-connect	oidc-usermodel-realm-role-mapper	\N	c61f5b19-c17e-49a1-91b8-a0296411b928
 df78645e-c32b-4160-b79f-42e622d71982	locale	openid-connect	oidc-usermodel-attribute-mapper	805aebc8-9d01-42b6-bcce-6ce48ca63ef0	\N
 0108b99f-2f31-4e73-9597-cb29e0e8c486	username	openid-connect	oidc-usermodel-property-mapper	\N	f619a55a-d565-4cc0-8bf4-4dbaab5382fe
 70b0a264-a7c3-43ff-b24f-14ca4f5f118e	login	openid-connect	oidc-usermodel-property-mapper	\N	0a7c7dde-23d7-4a93-bdee-4a8963aee9a4
 2f8ee9af-b6dd-4790-9e7b-cce83a603566	name	openid-connect	oidc-full-name-mapper	\N	d4723cd4-f717-44b7-a9b0-6c32c5ecd23f
 854a81a5-8e06-4257-98ec-0e3087356223	acr loa level	openid-connect	oidc-acr-mapper	\N	d30340a8-630b-416e-8c93-3ccf932d34f3
 53832401-d27c-489e-801f-9807cdaa4b08	acr loa level	openid-connect	oidc-acr-mapper	\N	a96603aa-e6db-4b3e-8baa-679c75ccfc8f
+6814ca6a-2d7d-495d-87ad-53e12b561808	groups	openid-connect	oidc-group-membership-mapper	\N	c61f5b19-c17e-49a1-91b8-a0296411b928
 \.
 
 
@@ -2991,12 +2989,6 @@ f03cac68-3f0e-4068-9adf-ee64567689a7	true	id.token.claim
 f03cac68-3f0e-4068-9adf-ee64567689a7	true	access.token.claim
 f03cac68-3f0e-4068-9adf-ee64567689a7	upn	claim.name
 f03cac68-3f0e-4068-9adf-ee64567689a7	String	jsonType.label
-04183ee1-b558-4f63-839f-922d30b34a9e	true	multivalued
-04183ee1-b558-4f63-839f-922d30b34a9e	foo	user.attribute
-04183ee1-b558-4f63-839f-922d30b34a9e	true	id.token.claim
-04183ee1-b558-4f63-839f-922d30b34a9e	true	access.token.claim
-04183ee1-b558-4f63-839f-922d30b34a9e	groups	claim.name
-04183ee1-b558-4f63-839f-922d30b34a9e	String	jsonType.label
 df78645e-c32b-4160-b79f-42e622d71982	true	userinfo.token.claim
 df78645e-c32b-4160-b79f-42e622d71982	locale	user.attribute
 df78645e-c32b-4160-b79f-42e622d71982	true	id.token.claim
@@ -3025,6 +3017,13 @@ df78645e-c32b-4160-b79f-42e622d71982	String	jsonType.label
 854a81a5-8e06-4257-98ec-0e3087356223	true	access.token.claim
 53832401-d27c-489e-801f-9807cdaa4b08	true	id.token.claim
 53832401-d27c-489e-801f-9807cdaa4b08	true	access.token.claim
+6814ca6a-2d7d-495d-87ad-53e12b561808	true	introspection.token.claim
+6814ca6a-2d7d-495d-87ad-53e12b561808	true	userinfo.token.claim
+6814ca6a-2d7d-495d-87ad-53e12b561808	true	id.token.claim
+6814ca6a-2d7d-495d-87ad-53e12b561808	true	access.token.claim
+6814ca6a-2d7d-495d-87ad-53e12b561808	groups	claim.name
+6814ca6a-2d7d-495d-87ad-53e12b561808	false	full.path
+6814ca6a-2d7d-495d-87ad-53e12b561808	true	multivalued
 \.
 
 
@@ -3199,16 +3198,16 @@ ad4dfd2c-307a-4563-b93a-0bb726b4ccaa	VERIFY_EMAIL	Verify Email	master	t	f	VERIFY
 2c7fffa4-ff20-4015-9a97-cc6a19e698ba	UPDATE_PROFILE	Update Profile	master	t	f	UPDATE_PROFILE	40
 c76d17f4-eacf-497a-ab5a-f78936bbc50e	CONFIGURE_TOTP	Configure OTP	master	t	f	CONFIGURE_TOTP	10
 83de9f97-43df-4265-982c-5414a2b19985	UPDATE_PASSWORD	Update Password	master	t	f	UPDATE_PASSWORD	30
-9f538737-770e-4731-abd9-e98172a85d2f	terms_and_conditions	Terms and Conditions	master	f	f	terms_and_conditions	20
 306fc47e-d8ae-4bb1-b2bc-53608a44536c	update_user_locale	Update User Locale	master	t	f	update_user_locale	1000
 f158f7d8-8b7f-414c-b1bd-0dde83c91133	delete_account	Delete Account	master	f	f	delete_account	60
 969a57d1-c906-4f49-87d6-3cbba2f3898a	VERIFY_EMAIL	Verify Email	grafana	t	f	VERIFY_EMAIL	50
 233d5b8e-6f36-450f-bffd-43b82e27295c	UPDATE_PROFILE	Update Profile	grafana	t	f	UPDATE_PROFILE	40
 ab3a9aa7-3d1b-4fb1-93ad-9412142deed3	CONFIGURE_TOTP	Configure OTP	grafana	t	f	CONFIGURE_TOTP	10
 988d8e0d-35ef-4e6a-8b48-821cca56acf2	UPDATE_PASSWORD	Update Password	grafana	t	f	UPDATE_PASSWORD	30
-0e2b6144-5c2c-4dcb-92d8-00529b19a7a5	terms_and_conditions	Terms and Conditions	grafana	f	f	terms_and_conditions	20
 94993a02-f883-4f8a-a549-d48f95aabed2	update_user_locale	Update User Locale	grafana	t	f	update_user_locale	1000
 72d09b7f-acde-4b90-af9a-ea3c642a2f6d	delete_account	Delete Account	grafana	f	f	delete_account	60
+9f538737-770e-4731-abd9-e98172a85d2f	TERMS_AND_CONDITIONS	Terms and Conditions	master	f	f	TERMS_AND_CONDITIONS	20
+0e2b6144-5c2c-4dcb-92d8-00529b19a7a5	TERMS_AND_CONDITIONS	Terms and Conditions	grafana	f	f	TERMS_AND_CONDITIONS	20
 \.
 
 
@@ -3386,6 +3385,11 @@ COPY public.user_federation_provider (id, changed_sync_period, display_name, ful
 --
 
 COPY public.user_group_membership (group_id, user_id) FROM stdin;
+f1975bf4-6e92-479a-923c-d7d5b65d684c	88692d07-bb9a-46cf-844c-7ff5c529cd04
+f1975bf4-6e92-479a-923c-d7d5b65d684c	8f58cbec-6e40-4bab-bff0-1c5ff899fe2e
+fe974984-8b18-4925-beef-37b6cfb6af7b	88692d07-bb9a-46cf-844c-7ff5c529cd04
+4cc0bd0f-9071-42a9-b282-be22515156ba	6db3c5e5-b84b-4f9d-a7a8-8d05b03c929d
+4cc0bd0f-9071-42a9-b282-be22515156ba	1a85b7e0-4baa-420b-89f8-1cea43a540dd
 \.
 
 
diff --git a/devenv/docker/blocks/auth/jwt_proxy/docker-compose.yaml b/devenv/docker/blocks/auth/jwt_proxy/docker-compose.yaml
index cc18a38126c8e..618a096cd1c09 100644
--- a/devenv/docker/blocks/auth/jwt_proxy/docker-compose.yaml
+++ b/devenv/docker/blocks/auth/jwt_proxy/docker-compose.yaml
@@ -1,5 +1,5 @@
   oauthkeycloakdb:
-    image: docker.io/library/postgres:12-alpine
+    image: docker.io/library/postgres:16-alpine
     container_name: oauthkeycloakdb
     environment:
       POSTGRES_DB: keycloak
@@ -10,7 +10,7 @@
     restart: unless-stopped
 
   oauthkeycloak:
-    image: quay.io/keycloak/keycloak:21.1
+    image: quay.io/keycloak/keycloak:23.0
     container_name: oauthkeycloak
     command: start-dev
     environment:
diff --git a/devenv/docker/blocks/auth/jwt_proxy/readme.md b/devenv/docker/blocks/auth/jwt_proxy/readme.md
index f3e32d147c49c..823287f54e35d 100644
--- a/devenv/docker/blocks/auth/jwt_proxy/readme.md
+++ b/devenv/docker/blocks/auth/jwt_proxy/readme.md
@@ -24,6 +24,7 @@ expect_claims = {"iss": "http://env.grafana.local:8087/realms/grafana", "azp": "
 auto_sign_up = true
 role_attribute_path = contains(roles[*], 'grafanaadmin') && 'GrafanaAdmin' || contains(roles[*], 'admin') && 'Admin' || contains(roles[*], 'editor') && 'Editor' || 'Viewer'
 role_attribute_strict = false
+groups_attribute_path = groups[]
 allow_assign_grafana_admin = true
 ```
 
diff --git a/devenv/docker/blocks/auth/oauth/docker-compose.yaml b/devenv/docker/blocks/auth/oauth/docker-compose.yaml
index 4efaa56d11463..ba88c5d9e8f02 100644
--- a/devenv/docker/blocks/auth/oauth/docker-compose.yaml
+++ b/devenv/docker/blocks/auth/oauth/docker-compose.yaml
@@ -1,5 +1,5 @@
   oauthkeycloakdb:
-    image: docker.io/library/postgres:12-alpine
+    image: docker.io/library/postgres:16-alpine
     container_name: oauthkeycloakdb
     environment:
       POSTGRES_DB: keycloak
@@ -10,7 +10,7 @@
     restart: unless-stopped
 
   oauthkeycloak:
-    image: quay.io/keycloak/keycloak:22.0
+    image: quay.io/keycloak/keycloak:23.0
     container_name: oauthkeycloak
     command: start-dev
     environment:
diff --git a/devenv/docker/blocks/auth/oauth/readme.md b/devenv/docker/blocks/auth/oauth/readme.md
index be52927393797..cd59c21a846ca 100644
--- a/devenv/docker/blocks/auth/oauth/readme.md
+++ b/devenv/docker/blocks/auth/oauth/readme.md
@@ -10,9 +10,6 @@ make devenv sources="auth/oauth"
 Here is the conf you need to add to your configuration file (conf/custom.ini):
 
 ```ini
-[auth]
-signout_redirect_url = http://localhost:8087/realms/grafana/protocol/openid-connect/logout?post_logout_redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Flogin
-
 [auth.generic_oauth]
 enabled = true
 name = Keycloak-OAuth
@@ -28,6 +25,7 @@ auth_url = http://localhost:8087/realms/grafana/protocol/openid-connect/auth
 token_url = http://localhost:8087/realms/grafana/protocol/openid-connect/token
 role_attribute_path = contains(roles[*], 'grafanaadmin') && 'GrafanaAdmin' || contains(roles[*], 'admin') && 'Admin' || contains(roles[*], 'editor') && 'Editor' || 'Viewer'
 allow_assign_grafana_admin = true
+signout_redirect_url = http://localhost:8087/realms/grafana/protocol/openid-connect/logout?post_logout_redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Flogin
 ```
 
 ## Devenv setup jwt auth
diff --git a/devenv/docker/blocks/elastic/data/data.js b/devenv/docker/blocks/elastic/data/data.js
index 908cc4ee044b9..eb3b8c3d6241d 100644
--- a/devenv/docker/blocks/elastic/data/data.js
+++ b/devenv/docker/blocks/elastic/data/data.js
@@ -149,7 +149,8 @@ function getRandomLogItem(counter, timestamp) {
     hostname: chooseRandomElement(['hostname1', 'hostname2', 'hostname3', 'hostname4', 'hostname5', 'hostname6']),
     value: counter,
     metric: chooseRandomElement(['cpu', 'memory', 'latency']),
-    description: "this is description"
+    description: "this is description",
+    slash: "Access to the path '\\\\tkasnpo\\KASNPO\\Files\\contacts.xml' is denied."
   };
 }
 
diff --git a/devenv/docker/blocks/loki/data/data.js b/devenv/docker/blocks/loki/data/data.js
index f420e216f1a14..453d69a1f84dd 100644
--- a/devenv/docker/blocks/loki/data/data.js
+++ b/devenv/docker/blocks/loki/data/data.js
@@ -47,12 +47,12 @@ async function sleep(duration) {
   });
 }
 
-async function lokiSendLogLine(timestampNs, line, tags, nonIndexed = {}) {
+async function lokiSendLogLine(timestampNs, line, tags, structuredMetadata = {}) {
   const data = {
     streams: [
       {
         stream: tags,
-        values: [[timestampNs, line, nonIndexed]],
+        values: [[timestampNs, line, structuredMetadata]],
       },
     ],
   };
@@ -68,6 +68,18 @@ function getSineValue(counter, loopLength) {
   return Math.sin((Math.PI * 2 * counter) / loopLength);
 }
 
+function fakeTraceId() {
+  let traceId = '';
+  const chars = 'abcdef0123456789';
+  const idLength = 12;
+  let i = 0;
+  while (i < idLength) {
+    traceId += chars.charAt(Math.floor(Math.random() * chars.length));
+    i += 1;
+  }
+  return traceId;
+}
+
 function getRandomLogItem(counter) {
   const randomText = `${Math.trunc(Math.random() * 1000 * 1000 * 1000)}`;
   const maybeAnsiText = Math.random() < 0.5 ? 'with ANSI \u001b[31mpart of the text\u001b[0m' : '';
@@ -176,8 +188,8 @@ async function sendOldLogs() {
     const timestampNs = `${timestampMs}${getRandomNanosecPart()}`;
     globalCounter += 1;
     const item = getRandomLogItem(globalCounter)
-    await lokiSendLogLine(timestampNs, JSON.stringify(item), {age:'old', place:'moon', ...sharedLabels});
-    await lokiSendLogLine(timestampNs, logFmtLine(item), {age:'old', place:'luna', ...sharedLabels});
+    await lokiSendLogLine(timestampNs, JSON.stringify(item), {age:'old', place:'moon', ...sharedLabels}, {structuredMetadataKey: 'value', traceId: fakeTraceId()});
+    await lokiSendLogLine(timestampNs, logFmtLine(item), {age:'old', place:'luna', ...sharedLabels}, {structuredMetadataKey: 'value', traceId: fakeTraceId()});
   };
 }
 
@@ -187,8 +199,8 @@ async function sendNewLogs() {
     const nowMs = new Date().getTime();
     const timestampNs = `${nowMs}${getRandomNanosecPart()}`;
     const item = getRandomLogItem(globalCounter)
-    await lokiSendLogLine(timestampNs, JSON.stringify(item), {age:'new', place:'moon', ...sharedLabels}, {nonIndexed: 'value'});
-    await lokiSendLogLine(timestampNs, logFmtLine(item), {age:'new', place:'luna', ...sharedLabels}, {nonIndexed: 'value'});
+    await lokiSendLogLine(timestampNs, JSON.stringify(item), {age:'new', place:'moon', ...sharedLabels}, {structuredMetadataKey: 'value', traceId: fakeTraceId()});
+    await lokiSendLogLine(timestampNs, logFmtLine(item), {age:'new', place:'luna', ...sharedLabels}, {structuredMetadataKey: 'value', traceId: fakeTraceId()});
     const sleepDuration  = 200 + Math.random() * 800; // between 0.2 and 1 seconds
     await sleep(sleepDuration);
   }
diff --git a/devenv/docker/blocks/mimir_backend/docker-compose.yaml b/devenv/docker/blocks/mimir_backend/docker-compose.yaml
index 8666ab093cce5..2a9c2dbd98ea3 100644
--- a/devenv/docker/blocks/mimir_backend/docker-compose.yaml
+++ b/devenv/docker/blocks/mimir_backend/docker-compose.yaml
@@ -1,8 +1,9 @@
   mimir_backend:
-    image: grafana/mimir
+    image: us.gcr.io/kubernetes-dev/mimir:santihernandezc-remove_id_from_grafana_config-d3826b4f8-WIP
     container_name: mimir_backend
     command:
       - -target=backend
+      - -alertmanager.grafana-alertmanager-compatibility-enabled
   nginx:
     environment:
       - NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx
diff --git a/devenv/docker/blocks/mimir_backend/nginx/nginx.conf.template b/devenv/docker/blocks/mimir_backend/nginx/nginx.conf.template
index ba1125456439b..7ce374a378e27 100644
--- a/devenv/docker/blocks/mimir_backend/nginx/nginx.conf.template
+++ b/devenv/docker/blocks/mimir_backend/nginx/nginx.conf.template
@@ -5,9 +5,15 @@ events {}
 http {
   resolver 127.0.0.11 ipv6=off;  
 
+  # Use basic auth user in `X-Scope-OrgID` if the header is not already set.
+  map $http_x_scope_orgid $add_x_scope_orgid {
+    default $http_x_scope_orgid;
+    "" $remote_user;
+  }
+
   server {
     listen 8080;
-    proxy_set_header X-Scope-OrgID $http_x_scope_orgid;
+    proxy_set_header X-Scope-OrgID $add_x_scope_orgid;
 
     location / {
       auth_basic "Mimir Backend";
diff --git a/devenv/docker/blocks/self-instrumentation/agent.flow b/devenv/docker/blocks/self-instrumentation/agent.flow
new file mode 100644
index 0000000000000..18521ac1d49fa
--- /dev/null
+++ b/devenv/docker/blocks/self-instrumentation/agent.flow
@@ -0,0 +1,53 @@
+loki.write "default" {
+	endpoint {
+		url = "http://loki:3100/loki/api/v1/push"
+	}
+	external_labels = {}
+}
+
+logging {
+  level  = "debug"
+  format = "json"
+  write_to = [loki.write.default.receiver]
+}
+
+tracing {
+  sampling_fraction = 1
+  write_to = [otelcol.exporter.otlp.tempo.input]
+}
+
+otelcol.exporter.otlp "tempo" {
+  client {
+    endpoint = "tempo:4317"
+    tls {
+      insecure = true
+      insecure_skip_verify = true
+    }
+  }
+}
+
+faro.receiver "frontend" {
+    server {
+        listen_address = "0.0.0.0"
+        listen_port = 12347
+        cors_allowed_origins = ["*"]
+    }
+
+    output {
+        logs   = [loki.write.default.receiver]
+        traces = [otelcol.exporter.otlp.tempo.input]
+    }
+}
+
+pyroscope.write "default" {
+  endpoint {
+    url = "http://pyroscope:4040"
+  }
+}
+
+pyroscope.scrape "default" {
+  targets = [
+    {"__address__" = "host.docker.internal:6060", "service_name"="grafana"},
+  ]
+  forward_to = [pyroscope.write.default.receiver]
+}
diff --git a/devenv/docker/blocks/self-instrumentation/agent.yaml b/devenv/docker/blocks/self-instrumentation/agent.yaml
deleted file mode 100644
index aae89d2cd7268..0000000000000
--- a/devenv/docker/blocks/self-instrumentation/agent.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-logs:
-  positions_directory: /tmp/loki-pos
-  configs:
-    - name: default
-      scrape_configs: []
-      clients:
-        - url: http://host.docker.internal:3100/loki/api/v1/push
-traces:
-  configs:
-    - name: default
-      remote_write:
-        - endpoint: http://host.docker.internal:3200
-          insecure: true
-      receivers:
-        otlp:
-          protocols:
-            grpc:
-            http:
-              cors:
-                allowed_origins:
-                  - "*"
-integrations:
-  app_agent_receiver_configs:
-    - autoscrape:
-        enable: false
-      instance: "frontend"
-      logs_instance: "default"
-      traces_instance: "default"
-      server:
-        host: 0.0.0.0
-        port: 12347
-        cors_allowed_origins:
-          - "*"
-      logs_labels: # labels to add to loki log record
-        app: frontend # static value
-        kind: # value will be taken from log items. exception, log, measurement, etc
-      logs_send_timeout: 5000
-      sourcemaps:
-        download: true # will download source file, extract source map location,
-        # download source map and use it to transform stack trace locations
diff --git a/devenv/docker/blocks/self-instrumentation/docker-compose.yaml b/devenv/docker/blocks/self-instrumentation/docker-compose.yaml
index cbd2f3f76b31d..1806e0a92abe7 100644
--- a/devenv/docker/blocks/self-instrumentation/docker-compose.yaml
+++ b/devenv/docker/blocks/self-instrumentation/docker-compose.yaml
@@ -30,15 +30,22 @@
     ports:
       - "14268:14268"
       - "3200:3200"
+      - "4317:4317"
+  pyroscope:
+    image: "grafana/pyroscope:latest"
+    ports:
+      - "4040:4040"
   agent:
-    image: grafana/agent:v0.34.3
+    image: grafana/agent:v0.37.0
+    environment:
+      - AGENT_MODE=flow
     entrypoint:
       - /bin/grafana-agent
-      - -server.http.address=0.0.0.0:12345
-      - -config.file=/etc/agent/agent.yaml
-      - -enable-features=integrations-next
+      - run
+      - --server.http.listen-addr=0.0.0.0:12345
+      - /etc/agent/config.river
     volumes:
-      - ./docker/blocks/self-instrumentation/agent.yaml:/etc/agent/agent.yaml
+      - ./docker/blocks/self-instrumentation/agent.flow:/etc/agent/config.river 
     ports:
       - "12345:12345"
       - "12347:12347"
diff --git a/devenv/docker/blocks/self-instrumentation/promtail.yaml b/devenv/docker/blocks/self-instrumentation/promtail.yaml
index e3ceb813909a6..eb7787ef789e0 100644
--- a/devenv/docker/blocks/self-instrumentation/promtail.yaml
+++ b/devenv/docker/blocks/self-instrumentation/promtail.yaml
@@ -9,10 +9,10 @@ clients:
   - url: http://loki:3100/loki/api/v1/push
 
 scrape_configs:
-- job_name: hosted-grafana/grafana
+- job_name: grafana
   static_configs:
   - targets:
       - localhost
     labels:
-      job: hosted-grafana/grafana
+      job: grafana
       __path__: /var/log/grafana/*log
diff --git a/devenv/docker/blocks/self-instrumentation/readme.md b/devenv/docker/blocks/self-instrumentation/readme.md
index eb2a918ec836a..76ef72d1ed478 100644
--- a/devenv/docker/blocks/self-instrumentation/readme.md
+++ b/devenv/docker/blocks/self-instrumentation/readme.md
@@ -6,14 +6,26 @@ To run this source, in the Grafana repo root:
 make devenv sources=self-instrumentation
 ```
 
-This will setup Prometheus, Loki and Tempo.
+This will setup Prometheus, Loki, Tempo, and Pyroscope.
 
 You then need to run Grafana with those added config:
 
 ```ini
+[log.file]
+format = json
+
 [log.frontend]
 enabled = true
+custom_endpoint=http://localhost:12347/collect
 
 [tracing.opentelemetry.jaeger]
 address = http://localhost:14268/api/traces
-```
\ No newline at end of file
+```
+
+To collect profiles with pyroscope, you need to run Grafana with the following env vars:
+
+```bash
+export GF_DIAGNOSTICS_PROFILING_ENABLED=true
+export GF_DIAGNOSTICS_PROFILING_ADDR=0.0.0.0
+make run
+``````
diff --git a/devenv/docker/blocks/tempo/README.md b/devenv/docker/blocks/tempo/README.md
index c03dcb22bb895..39d586dd5c877 100644
--- a/devenv/docker/blocks/tempo/README.md
+++ b/devenv/docker/blocks/tempo/README.md
@@ -4,3 +4,10 @@ This devenv docker-compose.yaml will allow you to;
 - upload/download trace JSON files
 - view service graphs
 - search traces via Loki
+
+To send traces from grafana use this configuration;
+```
+[tracing.opentelemetry.otlp]
+# otlp destination (ex localhost:4317)
+address = localhost:4317
+```
diff --git a/devenv/docker/blocks/tempo/tempo.yaml b/devenv/docker/blocks/tempo/tempo.yaml
index 6e94ff11a8d6b..f94d4ca96e715 100644
--- a/devenv/docker/blocks/tempo/tempo.yaml
+++ b/devenv/docker/blocks/tempo/tempo.yaml
@@ -43,7 +43,6 @@ storage:
       bloom_filter_false_positive: .05 # bloom filter false positive rate.  lower values create larger filters but fewer false positives
       v2_index_downsample_bytes: 1000     # number of bytes per index record
       v2_encoding: zstd                   # block encoding/compression.  options: none, gzip, lz4-64k, lz4-256k, lz4-1M, lz4, snappy, zstd, s2
-      version: vParquet
     wal:
       path: /tmp/tempo/wal             # where to store the the wal locally
       v2_encoding: snappy              # wal encoding/compression.  options: none, gzip, lz4-64k, lz4-256k, lz4-1M, lz4, snappy, zstd, s2
@@ -51,4 +50,8 @@ storage:
       path: /tmp/tempo/blocks
 
 overrides:
-  metrics_generator_processors: [local-blocks, service-graphs, span-metrics]
+  defaults:
+    metrics_generator:
+      processors: [local-blocks, service-graphs, span-metrics]
+
+stream_over_http_enabled: true
diff --git a/devenv/docker/ha-test-unified-alerting/grafana/provisioning/alerts.jsonnet b/devenv/docker/ha-test-unified-alerting/grafana/provisioning/alerts.jsonnet
deleted file mode 100644
index f3db6a51a569f..0000000000000
--- a/devenv/docker/ha-test-unified-alerting/grafana/provisioning/alerts.jsonnet
+++ /dev/null
@@ -1,202 +0,0 @@
-local numAlerts = std.extVar('alerts');
-local condition = std.extVar('condition');
-local arr = std.range(1, numAlerts);
-
-local alertDashboardTemplate = {
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "id": null,
-  "links": [],
-  "panels": [
-    {
-      "alert": {
-        "conditions": [
-          {
-            "evaluator": {
-              "params": [
-                65
-              ],
-              "type": "gt"
-            },
-            "operator": {
-              "type": "and"
-            },
-            "query": {
-              "params": [
-                "A",
-                "5m",
-                "now"
-              ]
-            },
-            "reducer": {
-              "params": [],
-              "type": "avg"
-            },
-            "type": "query"
-          }
-        ],
-        "executionErrorState": "alerting",
-        "frequency": "10s",
-        "handler": 1,
-        "for": "1m",
-        "name": "bulk alerting",
-        "noDataState": "no_data",
-        "notifications": [
-          {
-            "id": 2
-          }
-        ]
-      },
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "Prometheus",
-      "fill": 1,
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "id": 2,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "$$hashKey": "object:117",
-          "expr": "go_goroutines",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "refId": "A"
-        }
-      ],
-      "thresholds": [
-        {
-          "colorMode": "critical",
-          "fill": true,
-          "line": true,
-          "op": "gt",
-          "value": 50
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel Title",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ]
-    }
-  ],
-  "schemaVersion": 16,
-  "tags": [],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-6h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": [
-      "5s",
-      "10s",
-      "30s",
-      "1m",
-      "5m",
-      "15m",
-      "30m",
-      "1h",
-      "2h",
-      "1d"
-    ],
-    "time_options": [
-      "5m",
-      "15m",
-      "1h",
-      "6h",
-      "12h",
-      "24h",
-      "2d",
-      "7d",
-      "30d"
-    ]
-  },
-  "timezone": "",
-  "title": "New dashboard",
-  "uid": null,
-  "version": 0
-};
-
-
-{
-  ['alert-' + std.toString(x) + '.json']:
-    alertDashboardTemplate + {
-      panels: [
-        alertDashboardTemplate.panels[0] +
-        {
-          alert+: {
-            name: 'Alert rule ' + x,
-            conditions: [
-              alertDashboardTemplate.panels[0].alert.conditions[0] +
-              {
-                evaluator+: {
-                  params: [condition]
-                }
-              },
-            ],
-          },
-        },
-      ],
-      uid: 'alert-' + x,
-      title: 'Alert ' + x
-    },
-      for x in arr
-}
\ No newline at end of file
diff --git a/devenv/docker/ha-test-unified-alerting/webhook-listener.go b/devenv/docker/ha-test-unified-alerting/webhook-listener.go
index d742db681b0e7..d14617dca0627 100644
--- a/devenv/docker/ha-test-unified-alerting/webhook-listener.go
+++ b/devenv/docker/ha-test-unified-alerting/webhook-listener.go
@@ -122,7 +122,6 @@ func main() {
 
 	waitDuration := time.Duration(waitSeconds) * time.Second
 	http.HandleFunc("/", func(writer http.ResponseWriter, request *http.Request) {
-
 		writer.WriteHeader(http.StatusOK)
 		writer.Write([]byte(landingPage))
 	})
diff --git a/devenv/docker/ha_test/alerts.sh b/devenv/docker/ha_test/alerts.sh
index f2e7b4aec6cad..0b35f0d811870 100755
--- a/devenv/docker/ha_test/alerts.sh
+++ b/devenv/docker/ha_test/alerts.sh
@@ -84,27 +84,6 @@ slack() {
 		http://admin:admin@grafana.loc/api/alert-notifications/2
 }
 
-provision() {
-	alerts=1
-	condition=65
-	while getopts ":a:c:" o; do
-    case "${o}" in
-        a)
-            alerts=${OPTARG}
-            ;;
-				c)
-            condition=${OPTARG}
-            ;;
-    esac
-	done
-	shift $((OPTIND-1))
-
-	requiresJsonnet
-
-	find grafana/provisioning/dashboards/alerts -maxdepth 1 -name 'alert*.json' -delete
-	jsonnet -m grafana/provisioning/dashboards/alerts grafana/provisioning/alerts.jsonnet --ext-code alerts=$alerts --ext-code condition=$condition
-}
-
 pause() {
 	curl -H "Content-Type: application/json" \
   -d '{"paused":true}' \
@@ -126,9 +105,6 @@ usage() {
 	echo -e "    [-u]\t\t\t url"
 	echo -e "    [-r]\t\t\t send reminders"
 	echo -e "    [-e <remind every>]\t\t default 10m\n"
-	echo -e "  provision\t provision alerts"
-	echo -e "    [-a <alert rule count>]\t default 1"
-	echo -e "    [-c <condition value>]\t default 65\n"
 	echo -e "  pause\t\t pause all alerts"
 	echo -e "  unpause\t unpause all alerts"
 }
@@ -140,8 +116,6 @@ main() {
 		setup
 	elif [[ $cmd == "slack" ]]; then
 		slack "${@:2}"
-	elif [[ $cmd == "provision" ]]; then
-		provision "${@:2}"
 	elif [[ $cmd == "pause" ]]; then
 		pause
 	elif [[ $cmd == "unpause" ]]; then
diff --git a/devenv/docker/ha_test/grafana/provisioning/alerts.jsonnet b/devenv/docker/ha_test/grafana/provisioning/alerts.jsonnet
deleted file mode 100644
index f3db6a51a569f..0000000000000
--- a/devenv/docker/ha_test/grafana/provisioning/alerts.jsonnet
+++ /dev/null
@@ -1,202 +0,0 @@
-local numAlerts = std.extVar('alerts');
-local condition = std.extVar('condition');
-local arr = std.range(1, numAlerts);
-
-local alertDashboardTemplate = {
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "id": null,
-  "links": [],
-  "panels": [
-    {
-      "alert": {
-        "conditions": [
-          {
-            "evaluator": {
-              "params": [
-                65
-              ],
-              "type": "gt"
-            },
-            "operator": {
-              "type": "and"
-            },
-            "query": {
-              "params": [
-                "A",
-                "5m",
-                "now"
-              ]
-            },
-            "reducer": {
-              "params": [],
-              "type": "avg"
-            },
-            "type": "query"
-          }
-        ],
-        "executionErrorState": "alerting",
-        "frequency": "10s",
-        "handler": 1,
-        "for": "1m",
-        "name": "bulk alerting",
-        "noDataState": "no_data",
-        "notifications": [
-          {
-            "id": 2
-          }
-        ]
-      },
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "Prometheus",
-      "fill": 1,
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "id": 2,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "$$hashKey": "object:117",
-          "expr": "go_goroutines",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "refId": "A"
-        }
-      ],
-      "thresholds": [
-        {
-          "colorMode": "critical",
-          "fill": true,
-          "line": true,
-          "op": "gt",
-          "value": 50
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel Title",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ]
-    }
-  ],
-  "schemaVersion": 16,
-  "tags": [],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-6h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": [
-      "5s",
-      "10s",
-      "30s",
-      "1m",
-      "5m",
-      "15m",
-      "30m",
-      "1h",
-      "2h",
-      "1d"
-    ],
-    "time_options": [
-      "5m",
-      "15m",
-      "1h",
-      "6h",
-      "12h",
-      "24h",
-      "2d",
-      "7d",
-      "30d"
-    ]
-  },
-  "timezone": "",
-  "title": "New dashboard",
-  "uid": null,
-  "version": 0
-};
-
-
-{
-  ['alert-' + std.toString(x) + '.json']:
-    alertDashboardTemplate + {
-      panels: [
-        alertDashboardTemplate.panels[0] +
-        {
-          alert+: {
-            name: 'Alert rule ' + x,
-            conditions: [
-              alertDashboardTemplate.panels[0].alert.conditions[0] +
-              {
-                evaluator+: {
-                  params: [condition]
-                }
-              },
-            ],
-          },
-        },
-      ],
-      uid: 'alert-' + x,
-      title: 'Alert ' + x
-    },
-      for x in arr
-}
\ No newline at end of file
diff --git a/devenv/jsonnet/Makefile b/devenv/jsonnet/Makefile
index 12798a1e9393b..96cd803168082 100644
--- a/devenv/jsonnet/Makefile
+++ b/devenv/jsonnet/Makefile
@@ -1,12 +1,7 @@
-include ../../.bingo/Variables.mk
-
 DASHBOARDS = $(shell find ../dev-dashboards -type f -name '*.json')
 TEMPLATES = $(shell find ./ -type f -name '*.tmpl')
 
-vendor: jsonnetfile.json jsonnetfile.lock.json
-	$(JB) install
-
-dev-dashboards.libsonnet: $(DASHBOARDS) $(TEMPLATES) vendor dev-dashboards.go
+dev-dashboards.libsonnet: $(DASHBOARDS) $(TEMPLATES) dev-dashboards.go
 	go generate ./
 	
-main.libsonnet: dev-dashboards.libsonnet
\ No newline at end of file
+main.libsonnet: dev-dashboards.libsonnet
diff --git a/devenv/jsonnet/dev-dashboards.libsonnet b/devenv/jsonnet/dev-dashboards.libsonnet
index d88cdfd259536..391e684fca41e 100644
--- a/devenv/jsonnet/dev-dashboards.libsonnet
+++ b/devenv/jsonnet/dev-dashboards.libsonnet
@@ -2,824 +2,132 @@
 // Generated by gen.go
 // Run `make gen-jsonnet` from repository root to regenerate.
 
-local grafana = import "grizzly/grafana.libsonnet";
-local resource = import "grizzly/resource.libsonnet";
-local dashboard = grafana.dashboard;
-
 {
-  folders: [grafana.folder.new('dev-dashboards', 'dev-dashboards')],
-  dashboards: [
-    dashboard.new('Repeating-Kitchen-Sink', import '../dev-dashboards/e2e-repeats/Repeating-Kitchen-Sink.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('Repeating-a-panel-horizontally', import '../dev-dashboards/e2e-repeats/Repeating-a-panel-horizontally.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('Repeating-a-panel-vertically', import '../dev-dashboards/e2e-repeats/Repeating-a-panel-vertically.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('Repeating-a-row-with-a-repeating-horizon', import '../dev-dashboards/e2e-repeats/Repeating-a-row-with-a-repeating-horizontal-panel.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('Repeating-a-row-with-a-repeating-vertica', import '../dev-dashboards/e2e-repeats/Repeating-a-row-with-a-repeating-vertical-panel.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('Repeating-an-empty-row', import '../dev-dashboards/e2e-repeats/Repeating-an-empty-row.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('all-panels', import '../dev-dashboards/all-panels.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('annotation-filtering', import '../dev-dashboards/annotations/annotation-filtering.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('auto_decimals', import '../dev-dashboards/panel-common/auto_decimals.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('bar-gauge-demo2', import '../dev-dashboards/datasource-testdata/bar-gauge-demo2.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('bar_gauge_demo', import '../dev-dashboards/panel-bargauge/bar_gauge_demo.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('barchart-autosizing', import '../dev-dashboards/panel-barchart/barchart-autosizing.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('barchart-label-rotation-skipping', import '../dev-dashboards/panel-barchart/barchart-label-rotation-skipping.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('barchart-thresholds-mappings', import '../dev-dashboards/panel-barchart/barchart-thresholds-mappings.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('barchart-tooltips', import '../dev-dashboards/panel-barchart/barchart-tooltips.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('candlestick', import '../dev-dashboards/panel-candlestick/candlestick.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('canvas-connection-examples', import '../dev-dashboards/panel-canvas/canvas-connection-examples.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('canvas-examples', import '../dev-dashboards/panel-canvas/canvas-examples.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('color_modes', import '../dev-dashboards/panel-common/color_modes.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('config-from-query', import '../dev-dashboards/transforms/config-from-query.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('datadata-macros', import '../dev-dashboards/feature-templating/datadata-macros.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('datagrid_metric_values', import '../dev-dashboards/panel-datagrid/datagrid_metric_values.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('demo1', import '../dev-dashboards/datasource-testdata/demo1.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('elasticsearch_complex', import '../dev-dashboards/datasource-elasticsearch/elasticsearch_complex.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('elasticsearch_migration', import '../dev-dashboards/datasource-elasticsearch/elasticsearch_migration.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('elasticsearch_simple', import '../dev-dashboards/datasource-elasticsearch/elasticsearch_simple.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('extract-json-paths', import '../dev-dashboards/transforms/extract-json-paths.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('filter', import '../dev-dashboards/transforms/filter.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('gauge-multi-series', import '../dev-dashboards/panel-gauge/gauge-multi-series.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('gauge_tests', import '../dev-dashboards/panel-gauge/gauge_tests.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('geomap-color-field', import '../dev-dashboards/panel-geomap/geomap-color-field.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('geomap-photo-layer', import '../dev-dashboards/panel-geomap/geomap-photo-layer.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('geomap-route-layer', import '../dev-dashboards/panel-geomap/geomap-route-layer.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('geomap-spatial-operations-transformer', import '../dev-dashboards/panel-geomap/geomap-spatial-operations-transformer.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('geomap-v91', import '../dev-dashboards/panel-geomap/geomap-v91.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('geomap_multi-layers', import '../dev-dashboards/panel-geomap/geomap_multi-layers.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('global-variables-and-interpolation', import '../dev-dashboards/feature-templating/global-variables-and-interpolation.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('graph-gradient-area-fills', import '../dev-dashboards/panel-graph/graph-gradient-area-fills.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('graph-shared-tooltips', import '../dev-dashboards/panel-graph/graph-shared-tooltips.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('graph-time-regions', import '../dev-dashboards/panel-graph/graph-time-regions.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('graph_tests', import '../dev-dashboards/panel-graph/graph_tests.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('graph_y_axis', import '../dev-dashboards/panel-graph/graph_y_axis.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('heatmap-calculate-log', import '../dev-dashboards/panel-heatmap/heatmap-calculate-log.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('heatmap-legacy', import '../dev-dashboards/panel-heatmap/heatmap-legacy.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('heatmap-x', import '../dev-dashboards/panel-heatmap/heatmap-x.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('histogram_tests', import '../dev-dashboards/panel-histogram/histogram_tests.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('home', import '../dev-dashboards/home.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('influxdb-logs', import '../dev-dashboards/datasource-influxdb/influxdb-logs.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('influxdb-templated', import '../dev-dashboards/datasource-influxdb/influxdb-templated.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('join-by-field', import '../dev-dashboards/transforms/join-by-field.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('join-by-labels', import '../dev-dashboards/transforms/join-by-labels.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('lazy_loading', import '../dev-dashboards/panel-common/lazy_loading.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('linked-viz', import '../dev-dashboards/panel-common/linked-viz.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('loki_fakedata', import '../dev-dashboards/datasource-loki/loki_fakedata.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('loki_query_splitting', import '../dev-dashboards/datasource-loki/loki_query_splitting.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('migrations', import '../dev-dashboards/migrations/migrations.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('mssql_fakedata', import '../dev-dashboards/datasource-mssql/mssql_fakedata.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('mssql_unittest', import '../dev-dashboards/datasource-mssql/mssql_unittest.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('mysql_fakedata', import '../dev-dashboards/datasource-mysql/mysql_fakedata.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('mysql_unittest', import '../dev-dashboards/datasource-mysql/mysql_unittest.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('new_features_in_v62', import '../dev-dashboards/datasource-testdata/new_features_in_v62.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('new_features_in_v74', import '../dev-dashboards/datasource-testdata/new_features_in_v74.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('new_features_in_v8', import '../dev-dashboards/datasource-testdata/new_features_in_v8.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('opentsdb', import '../dev-dashboards/datasource-opentsdb/opentsdb.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('opentsdb_v23', import '../dev-dashboards/datasource-opentsdb/opentsdb_v23.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('panel-geomap', import '../dev-dashboards/panel-geomap/panel-geomap.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('panel-stat-tests', import '../dev-dashboards/panel-stat/panel-stat-tests.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('panel_test_piechart', import '../dev-dashboards/panel-piechart/panel_test_piechart.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('panel_tests_bar_gauge', import '../dev-dashboards/panel-bargauge/panel_tests_bar_gauge.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('panel_tests_bar_gauge2', import '../dev-dashboards/panel-bargauge/panel_tests_bar_gauge2.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('panel_tests_flame_graph', import '../dev-dashboards/panel-flamegraph/panel_tests_flame_graph.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('panels_without_title', import '../dev-dashboards/panel-common/panels_without_title.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('polystat_test', import '../dev-dashboards/panel-polystat/polystat_test.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('postgres_fakedata', import '../dev-dashboards/datasource-postgres/postgres_fakedata.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('postgres_unittest', import '../dev-dashboards/datasource-postgres/postgres_unittest.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('relative_time_zone_support', import '../dev-dashboards/scenarios/relative_time_zone_support.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('reuse', import '../dev-dashboards/transforms/reuse.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('rows-to-fields', import '../dev-dashboards/transforms/rows-to-fields.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('shared_queries', import '../dev-dashboards/panel-common/shared_queries.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('slow_queries_and_annotations', import '../dev-dashboards/scenarios/slow_queries_and_annotations.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('table_pagination', import '../dev-dashboards/panel-table/table_pagination.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('table_sparkline_cell', import '../dev-dashboards/panel-table/table_sparkline_cell.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('table_tests', import '../dev-dashboards/panel-table/table_tests.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('table_tests_new', import '../dev-dashboards/panel-table/table_tests_new.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('templating-dashboard-links-and-variables', import '../dev-dashboards/feature-templating/templating-dashboard-links-and-variables.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('templating-repeating-panels', import '../dev-dashboards/feature-templating/templating-repeating-panels.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('templating-repeating-rows', import '../dev-dashboards/feature-templating/templating-repeating-rows.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('templating-textbox-e2e-scenarios', import '../dev-dashboards/feature-templating/templating-textbox-e2e-scenarios.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('testdata-datalinks', import '../dev-dashboards/feature-templating/testdata-datalinks.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('testdata-nested-variables', import '../dev-dashboards/feature-templating/testdata-nested-variables.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('testdata-nested-variables-drilldown', import '../dev-dashboards/feature-templating/testdata-nested-variables-drilldown.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('testdata-test-variable-output', import '../dev-dashboards/feature-templating/testdata-test-variable-output.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('testdata-variables-textbox', import '../dev-dashboards/feature-templating/testdata-variables-textbox.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('testdata-variables-that-update-on-time-c', import '../dev-dashboards/feature-templating/testdata-variables-that-update-on-time-change.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('testdata_alerts', import '../dev-dashboards/alerting/testdata_alerts.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('text-options', import '../dev-dashboards/panel-text/text-options.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('time_zone_support', import '../dev-dashboards/scenarios/time_zone_support.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeline-demo', import '../dev-dashboards/panel-timeline/timeline-demo.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeline-modes', import '../dev-dashboards/panel-timeline/timeline-modes.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeline-thresholds-mappings', import '../dev-dashboards/panel-timeline/timeline-thresholds-mappings.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries', import '../dev-dashboards/panel-timeseries/timeseries.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-by-value-color-schemes', import '../dev-dashboards/panel-timeseries/timeseries-by-value-color-schemes.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-formats', import '../dev-dashboards/panel-timeseries/timeseries-formats.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-gradient-area', import '../dev-dashboards/panel-timeseries/timeseries-gradient-area.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-hue-gradients', import '../dev-dashboards/panel-timeseries/timeseries-hue-gradients.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-nulls', import '../dev-dashboards/panel-timeseries/timeseries-nulls.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-out-of-rage', import '../dev-dashboards/panel-timeseries/timeseries-out-of-rage.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-shared-tooltip-cursor-positio', import '../dev-dashboards/panel-timeseries/timeseries-shared-tooltip-cursor-position.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-soft-limits', import '../dev-dashboards/panel-timeseries/timeseries-soft-limits.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-stacking', import '../dev-dashboards/panel-timeseries/timeseries-stacking.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-stacking2', import '../dev-dashboards/panel-timeseries/timeseries-stacking2.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-thresholds', import '../dev-dashboards/panel-timeseries/timeseries-thresholds.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-time', import '../dev-dashboards/panel-timeseries/timeseries-time.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-y-ticks-zero-decimals', import '../dev-dashboards/panel-timeseries/timeseries-y-ticks-zero-decimals.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-yaxis-ticks', import '../dev-dashboards/panel-timeseries/timeseries-yaxis-ticks.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('trend_example', import '../dev-dashboards/panel-trend/trend_example.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-  ],
-} 
\ No newline at end of file
+  dashboards+:: {
+    "Repeating-Kitchen-Sink": (import '../dev-dashboards/e2e-repeats/Repeating-Kitchen-Sink.json'),
+    "Repeating-a-panel-horizontally": (import '../dev-dashboards/e2e-repeats/Repeating-a-panel-horizontally.json'),
+    "Repeating-a-panel-vertically": (import '../dev-dashboards/e2e-repeats/Repeating-a-panel-vertically.json'),
+    "Repeating-a-row-with-a-repeating-horizon": (import '../dev-dashboards/e2e-repeats/Repeating-a-row-with-a-repeating-horizontal-panel.json'),
+    "Repeating-a-row-with-a-repeating-vertica": (import '../dev-dashboards/e2e-repeats/Repeating-a-row-with-a-repeating-vertical-panel.json'),
+    "Repeating-an-empty-row": (import '../dev-dashboards/e2e-repeats/Repeating-an-empty-row.json'),
+    "all-panels": (import '../dev-dashboards/all-panels.json'),
+    "annotation-filtering": (import '../dev-dashboards/annotations/annotation-filtering.json'),
+    "auto_decimals": (import '../dev-dashboards/panel-common/auto_decimals.json'),
+    "bar-gauge-demo2": (import '../dev-dashboards/datasource-testdata/bar-gauge-demo2.json'),
+    "bar_gauge_demo": (import '../dev-dashboards/panel-bargauge/bar_gauge_demo.json'),
+    "barchart-autosizing": (import '../dev-dashboards/panel-barchart/barchart-autosizing.json'),
+    "barchart-label-rotation-skipping": (import '../dev-dashboards/panel-barchart/barchart-label-rotation-skipping.json'),
+    "barchart-thresholds-mappings": (import '../dev-dashboards/panel-barchart/barchart-thresholds-mappings.json'),
+    "barchart-tooltips-legends": (import '../dev-dashboards/panel-barchart/barchart-tooltips-legends.json'),
+    "candlestick": (import '../dev-dashboards/panel-candlestick/candlestick.json'),
+    "canvas-connection-examples": (import '../dev-dashboards/panel-canvas/canvas-connection-examples.json'),
+    "canvas-datalinks": (import '../dev-dashboards/panel-canvas/canvas-datalinks.json'),
+    "canvas-examples": (import '../dev-dashboards/panel-canvas/canvas-examples.json'),
+    "color_modes": (import '../dev-dashboards/panel-common/color_modes.json'),
+    "config-from-query": (import '../dev-dashboards/transforms/config-from-query.json'),
+    "dashlist": (import '../dev-dashboards/panel-dashlist/dashlist.json'),
+    "datadata-macros": (import '../dev-dashboards/feature-templating/datadata-macros.json'),
+    "datagrid_metric_values": (import '../dev-dashboards/panel-datagrid/datagrid_metric_values.json'),
+    "demo1": (import '../dev-dashboards/datasource-testdata/demo1.json'),
+    "elasticsearch_complex": (import '../dev-dashboards/datasource-elasticsearch/elasticsearch_complex.json'),
+    "elasticsearch_migration": (import '../dev-dashboards/datasource-elasticsearch/elasticsearch_migration.json'),
+    "elasticsearch_simple": (import '../dev-dashboards/datasource-elasticsearch/elasticsearch_simple.json'),
+    "extract-json-paths": (import '../dev-dashboards/transforms/extract-json-paths.json'),
+    "filter": (import '../dev-dashboards/transforms/filter.json'),
+    "gauge-multi-series": (import '../dev-dashboards/panel-gauge/gauge-multi-series.json'),
+    "gauge_tests": (import '../dev-dashboards/panel-gauge/gauge_tests.json'),
+    "geomap-color-field": (import '../dev-dashboards/panel-geomap/geomap-color-field.json'),
+    "geomap-photo-layer": (import '../dev-dashboards/panel-geomap/geomap-photo-layer.json'),
+    "geomap-route-layer": (import '../dev-dashboards/panel-geomap/geomap-route-layer.json'),
+    "geomap-spatial-operations-transformer": (import '../dev-dashboards/panel-geomap/geomap-spatial-operations-transformer.json'),
+    "geomap-v91": (import '../dev-dashboards/panel-geomap/geomap-v91.json'),
+    "geomap_multi-layers": (import '../dev-dashboards/panel-geomap/geomap_multi-layers.json'),
+    "global-variables-and-interpolation": (import '../dev-dashboards/feature-templating/global-variables-and-interpolation.json'),
+    "graph-gradient-area-fills": (import '../dev-dashboards/panel-graph/graph-gradient-area-fills.json'),
+    "graph-shared-tooltips": (import '../dev-dashboards/panel-graph/graph-shared-tooltips.json'),
+    "graph-time-regions": (import '../dev-dashboards/panel-graph/graph-time-regions.json'),
+    "graph_tests": (import '../dev-dashboards/panel-graph/graph_tests.json'),
+    "graph_y_axis": (import '../dev-dashboards/panel-graph/graph_y_axis.json'),
+    "heatmap-calculate-log": (import '../dev-dashboards/panel-heatmap/heatmap-calculate-log.json'),
+    "heatmap-legacy": (import '../dev-dashboards/panel-heatmap/heatmap-legacy.json'),
+    "heatmap-x": (import '../dev-dashboards/panel-heatmap/heatmap-x.json'),
+    "histogram_tests": (import '../dev-dashboards/panel-histogram/histogram_tests.json'),
+    "home": (import '../dev-dashboards/home.json'),
+    "influxdb-logs": (import '../dev-dashboards/datasource-influxdb/influxdb-logs.json'),
+    "influxdb-templated": (import '../dev-dashboards/datasource-influxdb/influxdb-templated.json'),
+    "join-by-field": (import '../dev-dashboards/transforms/join-by-field.json'),
+    "join-by-labels": (import '../dev-dashboards/transforms/join-by-labels.json'),
+    "lazy_loading": (import '../dev-dashboards/panel-common/lazy_loading.json'),
+    "linked-viz": (import '../dev-dashboards/panel-common/linked-viz.json'),
+    "live-publish": (import '../dev-dashboards/live/live-publish.json'),
+    "loki_fakedata": (import '../dev-dashboards/datasource-loki/loki_fakedata.json'),
+    "loki_query_splitting": (import '../dev-dashboards/datasource-loki/loki_query_splitting.json'),
+    "migrations": (import '../dev-dashboards/migrations/migrations.json'),
+    "mssql_fakedata": (import '../dev-dashboards/datasource-mssql/mssql_fakedata.json'),
+    "mssql_unittest": (import '../dev-dashboards/datasource-mssql/mssql_unittest.json'),
+    "mysql_fakedata": (import '../dev-dashboards/datasource-mysql/mysql_fakedata.json'),
+    "mysql_unittest": (import '../dev-dashboards/datasource-mysql/mysql_unittest.json'),
+    "new_features_in_v62": (import '../dev-dashboards/datasource-testdata/new_features_in_v62.json'),
+    "new_features_in_v74": (import '../dev-dashboards/datasource-testdata/new_features_in_v74.json'),
+    "new_features_in_v8": (import '../dev-dashboards/datasource-testdata/new_features_in_v8.json'),
+    "opentsdb": (import '../dev-dashboards/datasource-opentsdb/opentsdb.json'),
+    "opentsdb_v23": (import '../dev-dashboards/datasource-opentsdb/opentsdb_v23.json'),
+    "panel-geomap": (import '../dev-dashboards/panel-geomap/panel-geomap.json'),
+    "panel-stat-tests": (import '../dev-dashboards/panel-stat/panel-stat-tests.json'),
+    "panel_test_piechart": (import '../dev-dashboards/panel-piechart/panel_test_piechart.json'),
+    "panel_tests_bar_gauge": (import '../dev-dashboards/panel-bargauge/panel_tests_bar_gauge.json'),
+    "panel_tests_bar_gauge2": (import '../dev-dashboards/panel-bargauge/panel_tests_bar_gauge2.json'),
+    "panel_tests_flame_graph": (import '../dev-dashboards/panel-flamegraph/panel_tests_flame_graph.json'),
+    "panels_without_title": (import '../dev-dashboards/panel-common/panels_without_title.json'),
+    "polystat_test": (import '../dev-dashboards/panel-polystat/polystat_test.json'),
+    "postgres_fakedata": (import '../dev-dashboards/datasource-postgres/postgres_fakedata.json'),
+    "postgres_unittest": (import '../dev-dashboards/datasource-postgres/postgres_unittest.json'),
+    "regression-analysis": (import '../dev-dashboards/transforms/regression-analysis.json'),
+    "relative_time_zone_support": (import '../dev-dashboards/scenarios/relative_time_zone_support.json'),
+    "reuse": (import '../dev-dashboards/transforms/reuse.json'),
+    "rows-to-fields": (import '../dev-dashboards/transforms/rows-to-fields.json'),
+    "shared_queries": (import '../dev-dashboards/panel-common/shared_queries.json'),
+    "slow_queries_and_annotations": (import '../dev-dashboards/scenarios/slow_queries_and_annotations.json'),
+    "table_pagination": (import '../dev-dashboards/panel-table/table_pagination.json'),
+    "table_sparkline_cell": (import '../dev-dashboards/panel-table/table_sparkline_cell.json'),
+    "table_tests": (import '../dev-dashboards/panel-table/table_tests.json'),
+    "table_tests_new": (import '../dev-dashboards/panel-table/table_tests_new.json'),
+    "tall_dashboard": (import '../dev-dashboards/scenarios/tall_dashboard.json'),
+    "templating-dashboard-links-and-variables": (import '../dev-dashboards/feature-templating/templating-dashboard-links-and-variables.json'),
+    "templating-repeating-panels": (import '../dev-dashboards/feature-templating/templating-repeating-panels.json'),
+    "templating-repeating-rows": (import '../dev-dashboards/feature-templating/templating-repeating-rows.json'),
+    "templating-textbox-e2e-scenarios": (import '../dev-dashboards/feature-templating/templating-textbox-e2e-scenarios.json'),
+    "testdata-datalinks": (import '../dev-dashboards/feature-templating/testdata-datalinks.json'),
+    "testdata-nested-variables": (import '../dev-dashboards/feature-templating/testdata-nested-variables.json'),
+    "testdata-nested-variables-drilldown": (import '../dev-dashboards/feature-templating/testdata-nested-variables-drilldown.json'),
+    "testdata-test-variable-output": (import '../dev-dashboards/feature-templating/testdata-test-variable-output.json'),
+    "testdata-variables-textbox": (import '../dev-dashboards/feature-templating/testdata-variables-textbox.json'),
+    "testdata-variables-that-update-on-time-c": (import '../dev-dashboards/feature-templating/testdata-variables-that-update-on-time-change.json'),
+    "text-options": (import '../dev-dashboards/panel-text/text-options.json'),
+    "time_zone_support": (import '../dev-dashboards/scenarios/time_zone_support.json'),
+    "timeline-align-endtime": (import '../dev-dashboards/panel-timeline/timeline-align-endtime.json'),
+    "timeline-align-nulls-retain": (import '../dev-dashboards/panel-timeline/timeline-align-nulls-retain.json'),
+    "timeline-demo": (import '../dev-dashboards/panel-timeline/timeline-demo.json'),
+    "timeline-modes": (import '../dev-dashboards/panel-timeline/timeline-modes.json'),
+    "timeline-thresholds-mappings": (import '../dev-dashboards/panel-timeline/timeline-thresholds-mappings.json'),
+    "timeseries": (import '../dev-dashboards/panel-timeseries/timeseries.json'),
+    "timeseries-bars-high-density": (import '../dev-dashboards/panel-timeseries/timeseries-bars-high-density.json'),
+    "timeseries-by-value-color-schemes": (import '../dev-dashboards/panel-timeseries/timeseries-by-value-color-schemes.json'),
+    "timeseries-formats": (import '../dev-dashboards/panel-timeseries/timeseries-formats.json'),
+    "timeseries-gradient-area": (import '../dev-dashboards/panel-timeseries/timeseries-gradient-area.json'),
+    "timeseries-hue-gradients": (import '../dev-dashboards/panel-timeseries/timeseries-hue-gradients.json'),
+    "timeseries-nulls": (import '../dev-dashboards/panel-timeseries/timeseries-nulls.json'),
+    "timeseries-out-of-rage": (import '../dev-dashboards/panel-timeseries/timeseries-out-of-rage.json'),
+    "timeseries-shared-tooltip-cursor-positio": (import '../dev-dashboards/panel-timeseries/timeseries-shared-tooltip-cursor-position.json'),
+    "timeseries-soft-limits": (import '../dev-dashboards/panel-timeseries/timeseries-soft-limits.json'),
+    "timeseries-stacking": (import '../dev-dashboards/panel-timeseries/timeseries-stacking.json'),
+    "timeseries-stacking2": (import '../dev-dashboards/panel-timeseries/timeseries-stacking2.json'),
+    "timeseries-thresholds": (import '../dev-dashboards/panel-timeseries/timeseries-thresholds.json'),
+    "timeseries-time": (import '../dev-dashboards/panel-timeseries/timeseries-time.json'),
+    "timeseries-y-ticks-zero-decimals": (import '../dev-dashboards/panel-timeseries/timeseries-y-ticks-zero-decimals.json'),
+    "timeseries-yaxis-ticks": (import '../dev-dashboards/panel-timeseries/timeseries-yaxis-ticks.json'),
+    "trend_example": (import '../dev-dashboards/panel-trend/trend_example.json'),
+    "xychart-example": (import '../dev-dashboards/panel-xychart/xychart-example.json'),
+    "xychart-tooltip-color-test": (import '../dev-dashboards/panel-xychart/xychart-tooltip-color-test.json'),
+  },
+} 
diff --git a/devenv/jsonnet/jsonnetfile.json b/devenv/jsonnet/jsonnetfile.json
deleted file mode 100644
index 05dbee921d7d6..0000000000000
--- a/devenv/jsonnet/jsonnetfile.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "version": 1,
-  "dependencies": [
-    {
-      "source": {
-        "git": {
-          "remote": "https://github.com/grafana/jsonnet-libs.git",
-          "subdir": "grizzly"
-        }
-      },
-      "version": "master"
-    }
-  ],
-  "legacyImports": true
-}
diff --git a/devenv/jsonnet/jsonnetfile.lock.json b/devenv/jsonnet/jsonnetfile.lock.json
deleted file mode 100644
index 9b5f26207855f..0000000000000
--- a/devenv/jsonnet/jsonnetfile.lock.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "version": 1,
-  "dependencies": [
-    {
-      "source": {
-        "git": {
-          "remote": "https://github.com/grafana/jsonnet-libs.git",
-          "subdir": "grizzly"
-        }
-      },
-      "version": "49b026e4d0aa15b0fee70ae80cc1d2bb792ee14d",
-      "sum": "yY8w1JvVAuxB3Z62R3OxDVcSRPUKIvEWQZ2ShyD7uis="
-    }
-  ],
-  "legacyImports": false
-}
diff --git a/devenv/jsonnet/tmpl/gen.libsonnet.tmpl b/devenv/jsonnet/tmpl/gen.libsonnet.tmpl
index c777d438f8c3b..373c750543159 100644
--- a/devenv/jsonnet/tmpl/gen.libsonnet.tmpl
+++ b/devenv/jsonnet/tmpl/gen.libsonnet.tmpl
@@ -2,19 +2,8 @@
 // Generated by gen.go
 // Run `make gen-jsonnet` from repository root to regenerate.
 
-local grafana = import "grizzly/grafana.libsonnet";
-local resource = import "grizzly/resource.libsonnet";
-local dashboard = grafana.dashboard;
-
 {
-  folders: [grafana.folder.new('dev-dashboards', 'dev-dashboards')],
-  dashboards: [{{range .Dashboards}}
-    dashboard.new('{{.Name}}', import '../dev-dashboards/{{.Path}}') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },{{end}}
-  ],
-} 
\ No newline at end of file
+  dashboards+:: {{`{`}}{{range .Dashboards}}
+    "{{.Name}}": (import '../dev-dashboards/{{.Path}}'),{{end}}
+  },
+} 
diff --git a/devenv/setup.sh b/devenv/setup.sh
index 906f160182788..ec1b8ea65a672 100755
--- a/devenv/setup.sh
+++ b/devenv/setup.sh
@@ -14,27 +14,6 @@ bulkDashboard() {
 		ln -s -f ../../../devenv/bulk-dashboards/bulk-dashboards.yaml ../conf/provisioning/dashboards/custom.yaml
 }
 
-bulkAlertingDashboard() {
-
-		requiresJsonnet
-
-		jsonnet -o "bulk_alerting_dashboards/bulk_alerting_datasources.yaml" ./bulk_alerting_dashboards/datasources.jsonnet
-
-		COUNTER=1
-		DS=1
-		MAX=1000
-		while [  $COUNTER -lt $MAX ]; do
-				jsonnet -o "bulk_alerting_dashboards/alerting_dashboard${COUNTER}.json" \
-					-e "local bulkDash = import 'bulk_alerting_dashboards/dashboard.libsonnet'; bulkDash.alertingDashboard(${COUNTER}, ${DS})"
-				let COUNTER=COUNTER+1
-				let DS=COUNTER/10
-				let DS=DS+1
-		done
-
-		ln -s -f ../../../devenv/bulk_alerting_dashboards/bulk_alerting_dashboards.yaml ../conf/provisioning/dashboards/custom.yaml
-		ln -s -f ../../../devenv/bulk_alerting_dashboards/bulk_alerting_datasources.yaml ../conf/provisioning/datasources/custom.yaml
-}
-
 bulkFolders() {
 	./bulk-folders/bulk-folders.sh "$1"
 	ln -s -f ../../../devenv/bulk-folders/bulk-folders.yaml ../conf/provisioning/dashboards/bulk-folders.yaml
@@ -70,12 +49,6 @@ undev() {
     rm -rf bulk-folders/Bulk\ Folder*
     echo -e "    \xE2\x9C\x94 Reverting bulk-folders provisioning"
 
-
-    # Removing generated dashboard and datasource files from bulk-alerting-dashboards
-    rm -f bulk_alerting_dashboards/alerting_dashboard*.json
-    rm -f "bulk_alerting_dashboards/bulk_alerting_datasources.yaml"
-    echo -e "    \xE2\x9C\x94 Reverting bulk-alerting-dashboards provisioning"
-
     # Removing the symlinks
     rm -f ../conf/provisioning/dashboards/custom.yaml
     rm -f ../conf/provisioning/dashboards/bulk-folders.yaml
@@ -88,7 +61,6 @@ usage() {
 	echo -e "\n"
 	echo "Usage:"
 	echo "  bulk-dashboards                      - provision 400 dashboards"
-	echo "  bulk-alerting-dashboards             - provision 400 dashboards with alerts"
 	echo "  bulk-folders [folders] [dashboards]  - provision many folders with dashboards"
 	echo "  bulk-folders                         - provision 200 folders with 3 dashboards in each"
 	echo "  no args                              - provision core datasources and dev dashboards"
@@ -104,9 +76,7 @@ main() {
 	local cmd=$1
   local arg1=$2
 
-	if [[ $cmd == "bulk-alerting-dashboards" ]]; then
-		bulkAlertingDashboard
-	elif [[ $cmd == "bulk-dashboards" ]]; then
+	if [[ $cmd == "bulk-dashboards" ]]; then
 		bulkDashboard
 	elif [[ $cmd == "bulk-folders" ]]; then
 		bulkFolders "$arg1"
diff --git a/.codespellignore b/docs/.codespellignore
similarity index 100%
rename from .codespellignore
rename to docs/.codespellignore
diff --git a/docs/Makefile b/docs/Makefile
index 167818f6068f3..36b7e4f41be64 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -7,17 +7,8 @@ MAKEFLAGS += --no-builtin-rule
 
 include docs.mk
 
-PRECHECK :=
-ifneq ($(filter oneshell,$(.FEATURES)),)
-else
-$(error This Makefile requires GNU Make version 4 or higher)
-endif
-
 .PHONY: sources/panels-visualizations/query-transform-data/transform-data/index.md
 sources/panels-visualizations/query-transform-data/transform-data/index.md: ## Generate the Transform Data page source.
-sources/panels-visualizations/query-transform-data/transform-data/index.md:
-	@$(PRECHECK)
-	cd $(CURDIR)/..
-	npx tsc ./scripts/docs/generate-transformations.ts
-	node ./scripts/docs/generate-transformations.js > $(CURDIR)/$@
+	cd $(CURDIR)/.. && npx tsc ./scripts/docs/generate-transformations.ts && \
+	node -e "require('./scripts/docs/generate-transformations').buildMarkdownContent()" && \
 	npx prettier -w $(CURDIR)/$@
diff --git a/docs/docs.mk b/docs/docs.mk
index c4ba766fb4f09..a08830d907c1b 100644
--- a/docs/docs.mk
+++ b/docs/docs.mk
@@ -34,11 +34,6 @@ endif
 # First project is considered the primary one used for doc-validator.
 PRIMARY_PROJECT := $(subst /,-,$(firstword $(subst :, ,$(firstword $(PROJECTS)))))
 
-# Name for the container.
-ifeq ($(origin DOCS_CONTAINER), undefined)
-export DOCS_CONTAINER := $(PRIMARY_PROJECT)-docs
-endif
-
 # Host port to publish container port to.
 ifeq ($(origin DOCS_HOST_PORT), undefined)
 export DOCS_HOST_PORT := 3002
diff --git a/docs/logo-horizontal-dark.png b/docs/logo-horizontal-dark.png
new file mode 100644
index 0000000000000..0ab465dd77e65
Binary files /dev/null and b/docs/logo-horizontal-dark.png differ
diff --git a/docs/make-docs b/docs/make-docs
index 94683de344c87..fc4f3d7a148f5 100755
--- a/docs/make-docs
+++ b/docs/make-docs
@@ -5,107 +5,207 @@
 # Updates should conform to the guidelines in https://keepachangelog.com/en/1.1.0/.
 # [Semantic versioning](https://semver.org/) is used to help the reader identify the significance of changes.
 # Changes are relevant to this script and the support docs.mk GNU Make interface.
-
+#
+# ## 6.1.0 (2024-04-22)
+#
+# ### Changed
+#
+# - Mount volumes with SELinux labels.
+#
+#   https://docs.docker.com/storage/bind-mounts/#configure-the-selinux-label
+#
+# ## 6.1.0 (2024-04-22)
+#
+# ### Added
+#
+# - Pseudo project for including only website resources and no website content.
+#
+#   Facilitates testing shortcodes and layout changes with a small documentation set instead of Grafana Cloud or the entire website.
+#
+# ## 6.0.1 (2024-02-28)
+#
+# ### Added
+#
+# - Suppress new errors relating to absent content introduced in https://github.com/grafana/website/pull/17561.
+#
+# ## 6.0.0 (2024-02-16)
+#
+# ### Changed
+#
+# - Require `jq` for human readable `make doc-validator` output.
+#
+# ## 5.4.0 (2024-02-12)
+#
+# ### Changed
+#
+# - Set `WEBSITE_MOUNTS=true` when a user includes the `website` project.
+#
+#   Ensures consistent behavior across repositories.
+#   To disable website mounts, add `export WEBSITE_MOUNTS := false` to your `variables.mk` or `variables.mk.local` file.
+# - Use website mounts and container volumes also when a user includes the `grafana-cloud` project.
+#
+# ## 5.3.0 (2024-02-08)
+#
+# ### Changed
+#
+# - Updated support for plugins monorepo now that multiple projects have been moved into it.
+# - Use `printf` instead of `echo` for better portability of output.
+#
+#   https://www.in-ulm.de/~mascheck/various/echo+printf/
+#
+# ## 5.2.0 (2024-01-18)
+#
+# ### Changed
+#
+# - Updated `make vale` to use latest Vale style and configuration.
+# - Updated `make vale` to use platform appropriate image.
+#
+# ## 5.1.2 (2023-11-08)
+#
+# ### Added
+#
+# - Hide manual_mount warning messages from non-debug output.
+#   Set the DEBUG environment variable to see all hidden messages.
+#
+# ## 5.1.1 (2023-10-30)
+#
+# ### Added
+#
+# - Support for Datadog and Oracle data source plugins repositories.
+#
+# ## 5.1.0 (2023-10-20)
+#
+# ### Added
+#
+# - Support for the plugins monorepo.
+#
+# ## 5.0.0 (2023-10-18)
+#
+# ### Added
+#
+# - Improved support for website repository.
+#
+#   Mount more content and provide some feedback to users that the build can take time.
+#
+# - Ability to enter the `grafana/docs-base` container with a shell using the `ENTER` environment variable.
+#
+# ### Fixed
+#
+# - Correct key combination for interrupting the process.
+#
+#   Keyboards use capital letters so this more accurately reflects the exact key combination users are expected to press.
+#
+# ### Removed
+#
+# - Imperfect implementation of container name.
+#
+#   Facilitates running `make vale` and `make docs` at once.
+#   Container names are convenient for recognition in `docker ps` but the current implementation has more downsides than upsides.
+#
+# - Forced platform specification now that multiple architecture images exist.
+#
+#  Significantly speeds up build times on larger repositories.
+#
 # ## 4.2.2 (2023-10-05)
 
 # - Added support for Jira data source and MongoDB data source plugins repositories.
-
+#
 # ## 4.2.1 (2023-09-13)
 
 # ## Fixed
-
+#
 # - Improved consistency of the webserver request loop by polling the Hugo port rather than the proxy port.
-
+#
 # ## 4.2.0 (2023-09-01)
-
+#
 # ### Added
-
+#
 # - Retry the initial webserver request up to ten times to allow for the process to start.
 #   If it is still failing after ten seconds, an error message is logged.
-
+#
 # ## 4.1.1 (2023-07-20)
-
+#
 # ### Fixed
-
+#
 # - Replaced use of `realpath` with POSIX compatible alternative to determine default value for REPOS_PATH.
-
+#
 # ## 4.1.0 (2023-06-16)
-
+#
 # ### Added
-
+#
 # - Mounts of `layouts` and `config` directories for the `website` project.
 #   Ensures that local changes to mounts or shortcodes are reflected in the development server.
-
+#
 # ### Fixed
-
+#
 # - Version inference for versioned docs pages.
 #   Pages in versioned projects now have the `versioned: true` front matter set to ensure that "version" in $.Page.Scratch is set on builds.
-
+#
 # ## 4.0.0 (2023-06-06)
-
+#
 # ### Removed
-
+#
 # - `doc-validator/%` target.
 #   The behavior of the target was not as described.
 #   Instead, to limit `doc-validator` to only specific files, refer to https://grafana.com/docs/writers-toolkit/writing-guide/tooling-and-workflows/validate-technical-documentation/#run-on-specific-files.
-
+#
 # ## 3.0.0 (2023-05-18)
-
+#
 # ### Fixed
-
+#
 # - Compatibility with the updated Make targets in the `website` repository.
 #   `docs` now runs this script itself, `server-docs` builds the site with the `docs` Hugo environment.
-
+#
 # ## 2.0.0 (2023-05-18)
-
+#
 # ### Added
-
+#
 # - Support for the grafana-cloud/frontend-observability/faro-web-sdk project.
 # - Use of `doc-validator` v2.0.x which includes breaking changes to command line options.
-
+#
 # ### Fixed
-
+#
 # - Source grafana-cloud project from website repository.
-
+#
 # ### Added
-
+#
 # - Support for running the Vale linter with `make vale`.
-
+#
 # ## 1.2.1 (2023-05-05)
-
+#
 # ### Fixed
-
+#
 # - Use `latest` tag of `grafana/vale` image by default instead of hardcoded older version.
 # - Fix mounting multiple projects broken by the changes in 1.0.1
-
+#
 # ## 1.2.0 (2023-05-05)
-
+#
 # ### Added
-
+#
 # - Support for running the Vale linter with `make vale`.
-
+#
 # ### Fixed
-
+#
 # ## 1.1.0 (2023-05-05)
-
+#
 # ### Added
-
+#
 # - Rewrite error output so it can be followed by text editors.
-
+#
 # ### Fixed
-
+#
 # - Fix `docs-debug` container process port.
-
+#
 # ## 1.0.1 (2023-05-04)
-
+#
 # ### Fixed
-
+#
 # - Ensure complete section hierarchy so that all projects have a visible menu.
-
+#
 # ## 1.0.0 (2023-05-04)
-
+#
 # ### Added
-
+#
 # - Build multiple projects simultaneously if all projects are checked out locally.
 # - Run [`doc-validator`](https://github.com/grafana/technical-documentation/tree/main/tools/cmd/doc-validator) over projects.
 # - Redirect project root to mounted version.
@@ -135,7 +235,6 @@
 
 set -ef
 
-readonly DOCS_CONTAINER="${DOCS_CONTAINER:-make-docs}"
 readonly DOCS_HOST_PORT="${DOCS_HOST_PORT:-3002}"
 readonly DOCS_IMAGE="${DOCS_IMAGE:-grafana/docs-base:latest}"
 
@@ -145,8 +244,6 @@ readonly DOC_VALIDATOR_SKIP_CHECKS="${DOC_VALIDATOR_SKIP_CHECKS:-^image-}"
 readonly HUGO_REFLINKSERRORLEVEL="${HUGO_REFLINKSERRORLEVEL:-WARNING}"
 readonly VALE_MINALERTLEVEL="${VALE_MINALERTLEVEL:-error}"
 readonly WEBSITE_EXEC="${WEBSITE_EXEC:-make server-docs}"
-# If set, the docs-base image will run a prebuild script that sets up Hugo mounts.
-readonly WEBSITE_MOUNTS="${WEBSITE_MOUNTS:-}"
 
 PODMAN="$(if command -v podman >/dev/null 2>&1; then echo podman; else echo docker; fi)"
 
@@ -217,9 +314,9 @@ SOURCES_grafana_cloud_frontend_observability_faro_web_sdk='faro-web-sdk'
 SOURCES_helm_charts_mimir_distributed='mimir'
 SOURCES_helm_charts_tempo_distributed='tempo'
 SOURCES_opentelemetry='opentelemetry-docs'
-SOURCES_plugins_grafana_jira_datasource='jira-datasource'
-SOURCES_plugins_grafana_mongodb_datasource='mongodb-datasource'
-SOURCES_plugins_grafana_splunk_datasource='splunk-datasource'
+SOURCES_plugins_grafana_datadog_datasource='datadog-datasource'
+SOURCES_plugins_grafana_oracle_datasource='oracle-datasource'
+SOURCES_resources='website'
 
 VERSIONS_as_code='UNVERSIONED'
 VERSIONS_grafana_cloud='UNVERSIONED'
@@ -229,6 +326,9 @@ VERSIONS_grafana_cloud_k6='UNVERSIONED'
 VERSIONS_grafana_cloud_data_configuration_integrations='UNVERSIONED'
 VERSIONS_grafana_cloud_frontend_observability_faro_web_sdk='UNVERSIONED'
 VERSIONS_opentelemetry='UNVERSIONED'
+VERSIONS_plugins_grafana_datadog_datasource='latest'
+VERSIONS_plugins_grafana_oracle_datasource='latest'
+VERSIONS_resources='UNVERSIONED'
 VERSIONS_technical_documentation='UNVERSIONED'
 VERSIONS_website='UNVERSIONED'
 VERSIONS_writers_toolkit='UNVERSIONED'
@@ -237,8 +337,11 @@ PATHS_grafana_cloud='content/docs/grafana-cloud'
 PATHS_helm_charts_mimir_distributed='docs/sources/helm-charts/mimir-distributed'
 PATHS_helm_charts_tempo_distributed='docs/sources/helm-charts/tempo-distributed'
 PATHS_mimir='docs/sources/mimir'
+PATHS_plugins_grafana_datadog_datasource='docs/sources'
+PATHS_plugins_grafana_oracle_datasource='docs/sources'
+PATHS_resources='content'
 PATHS_tempo='docs/sources/tempo'
-PATHS_website='content/docs'
+PATHS_website='content'
 
 # identifier STR
 # Replace characters that are not valid in an identifier with underscores.
@@ -253,6 +356,77 @@ aget() {
   eval echo '$'"$(identifier "$1")_$(identifier "$2")"
 }
 
+# src returns the project source repository name for a project.
+src() {
+  _project="$1"
+
+  case "${_project}" in
+    plugins/*)
+      if [ -z "$(aget SOURCES "${_project}")" ]; then
+        echo plugins-private
+      else
+        aget SOURCES "${_project}"
+      fi
+      ;;
+    *)
+      if [ -z "$(aget SOURCES "${_project}")" ]; then
+        echo "${_project}"
+      else
+        aget SOURCES "${_project}"
+      fi
+      ;;
+  esac
+
+  unset _project
+}
+
+# path returns the relative path within the repository that contain the docs for a project.
+path() {
+  _project="$1"
+
+  case "${_project}" in
+    plugins/*)
+      if [ -z "$(aget PATHS "${_project}")" ]; then
+        echo "${_project}/docs/sources"
+      else
+        aget PATHS "${_project}"
+      fi
+      ;;
+    *)
+      if [ -z "$(aget PATHS "${_project}")" ]; then
+        echo "docs/sources"
+      else
+        aget PATHS "${_project}"
+      fi
+  esac
+
+  unset _project
+}
+
+# version returns the version for a project. Unversioned projects return the special value 'UNVERSIONED'.
+version() {
+  _project="$1"
+
+  case "${_project}" in
+    plugins/*)
+      if [ -z "$(aget VERSIONS "${_project}")" ]; then
+        echo "UNVERSIONED"
+      else
+        aget VERSIONS "${_project}"
+      fi
+      ;;
+    *)
+    if [ -z "$(aget VERSIONS "${_project}")" ]; then
+      echo latest
+    else
+      aget VERSIONS "${_project}"
+    fi
+  esac
+
+  unset _project
+}
+
+
 # new_proj populates a new project structure.
 new_proj() {
   _project="$1"
@@ -263,31 +437,19 @@ new_proj() {
   # If version is not set, use the script mapping of project to default versions if it exists.
   # Fallback to 'latest'.
   if [ -z "${_version}" ]; then
-    if [ -z "$(aget VERSIONS "${_project}")" ]; then
-      _version=latest
-    else
-      _version="$(aget VERSIONS "${_project}")"
-    fi
+    _version="$(version "${_project}")"
   fi
 
   # If repo is not set, use the script mapping of project to repo name if it exists.
   # Fallback to using the project name.
   if [ -z "${_repo}" ]; then
-    if [ -z "$(aget SOURCES "${_project}")" ]; then
-      _repo="${_project}"
-    else
-      _repo="$(aget SOURCES "${_project}")"
-    fi
+    _repo="$(src "${_project}")"
   fi
 
   # If path is not set, use the script mapping of project to docs sources path if it exists.
   # Fallback to using 'docs/sources'.
   if [ -z "${_path}" ]; then
-    if [ -z "$(aget PATHS "${_project}")" ]; then
-      _path="docs/sources"
-    else
-      _path="$(aget PATHS "${_project}")"
-    fi
+    _path="$(path "${_project}")"
   fi
 
   echo "${_project}:${_version}:${_repo}:${_path}"
@@ -301,7 +463,7 @@ proj_url() {
 $1
 POSIX_HERESTRING
 
-  if [ "${_project}" = 'website' ]; then
+  if [ "${_project}" = website ]; then
     echo "http://localhost:${DOCS_HOST_PORT}/docs/"
 
     unset _project _version
@@ -335,8 +497,8 @@ proj_dst() {
 $1
 POSIX_HERESTRING
 
-  if [ "${_project}" = 'website' ]; then
-    echo '/hugo/content/docs'
+  if [ "${_project}" = website ]; then
+    echo '/hugo/content'
 
     unset _project _version
     return
@@ -394,7 +556,7 @@ proj_canonical() {
 $1
 POSIX_HERESTRING
 
-  if [ "${_project}" = 'website' ]; then
+  if [ "${_project}" = website ]; then
     echo '/docs'
 
     unset _project _version
@@ -441,6 +603,11 @@ POSIX_HERESTRING
         proj_to_url_src_dst_ver "$(new_proj helm-charts/mimir-distributed "${_version}")"
         proj_to_url_src_dst_ver "$(new_proj enterprise-metrics "${_version}")"
         ;;
+      resources)
+        _repo="$(repo_path website)"
+        echo "arbitrary^${_repo}/config^/hugo/config" "arbitrary^${_repo}/layouts^/hugo/layouts" "arbitrary^${_repo}/scripts^/hugo/scripts"
+        unset _repo
+        ;;
       traces)
         proj_to_url_src_dst_ver "$(new_proj tempo "${_version}")"
         proj_to_url_src_dst_ver "$(new_proj enterprise-traces "${_version}")"
@@ -463,50 +630,48 @@ await_build() {
   while [ "${i}" -ne "${max}" ]
   do
     sleep 1
-    debg "Retrying request to webserver assuming the process is still starting up."
+    debg "Retrying request to web server assuming the process is still starting up."
     i=$((i + 1))
 
     if ${req} "${url}"; then
-      echo
-      echo "View documentation locally:"
+      printf '\r\nView documentation locally:\r\n'
       for x in ${url_src_dst_vers}; do
         IFS='^' read -r url _ _ <<POSIX_HERESTRING
 $x
 POSIX_HERESTRING
 
         if [ -n "${url}" ]; then
-          if [ "${_url}" != "arbitrary" ]; then
-            echo "  ${url}"
+          if [ "${url}" != arbitrary ]; then
+            printf '\r  %s\r\n' "${url}"
           fi
         fi
       done
-      echo
-      echo 'Press Ctrl+c to stop the server'
+      printf '\r\nPress Ctrl+C to stop the server\r\n'
 
       unset i max req url
       return
     fi
   done
 
-  echo
+  printf '\r\n'
   errr 'The build was interrupted or a build error occurred, check the previous logs for possible causes.'
-  note 'You might need to use Ctrl+c to end the process.'
+  note 'You might need to use Ctrl+C to end the process.'
 
   unset i max req url
 }
 
 debg() {
   if [ -n "${DEBUG}" ]; then
-    echo "DEBG: $1" >&2
+    printf 'DEBG: %s\r\n' "$1" >&2
   fi
 }
 
 errr() {
-  echo "ERRR: $1" >&2
+  printf 'ERRR: %s\r\n' "$1" >&2
 }
 
 note() {
-  echo "NOTE: $1" >&2
+  printf 'NOTE: %s\r\n' "$1" >&2
 }
 
 url_src_dst_vers="$(url_src_dst_vers "$@")"
@@ -518,11 +683,20 @@ for arg in "$@"; do
   IFS=: read -r _project _ _repo _ <<POSIX_HERESTRING
 ${arg}
 POSIX_HERESTRING
-  if [ "${_project}" = website ]; then
+  if [ "${_project}" = website ] || [ "${_project}" = grafana-cloud ]; then
+    note "Please be patient, building the website can take some time."
+
+      # If set, the docs-base image will run a prebuild script that sets up Hugo mounts.
+    if [ "${WEBSITE_MOUNTS}" = false ]; then
+      unset WEBSITE_MOUNTS
+    else
+      readonly WEBSITE_MOUNTS=true
+    fi
+
     _repo="$(repo_path website)"
-    volumes="--volume=${_repo}/config:/hugo/config"
-    volumes="${volumes} --volume=${_repo}/layouts/partials:/hugo/layouts/partials"
-    volumes="${volumes} --volume=${_repo}/layouts/shortcodes:/hugo/layouts/shortcodes"
+    volumes="--volume=${_repo}/config:/hugo/config:z"
+    volumes="${volumes} --volume=${_repo}/layouts:/hugo/layouts:z"
+    volumes="${volumes} --volume=${_repo}/scripts:/hugo/scripts:z"
   fi
   unset _project _repo
 done
@@ -532,7 +706,7 @@ for x in ${url_src_dst_vers}; do
 $x
 POSIX_HERESTRING
 
-  if [ "${_url}" != "arbitrary" ]; then
+  if [ "${_url}" != arbitrary ]; then
     if [ ! -f "${_src}/_index.md" ]; then
       errr "Index file '${_src}/_index.md' does not exist."
       note "Is '${_src}' the correct source directory?"
@@ -540,12 +714,12 @@ POSIX_HERESTRING
     fi
   fi
 
-  debg "DEBG: Mounting '${_src}' at container path '${_dst}'"
+  debg "Mounting '${_src}' at container path '${_dst}'"
 
   if [ -z "${volumes}" ]; then
-    volumes="--volume=${_src}:${_dst}"
+    volumes="--volume=${_src}:${_dst}:z"
   else
-    volumes="${volumes} --volume=${_src}:${_dst}"
+    volumes="${volumes} --volume=${_src}:${_dst}:z"
   fi
 
   if [ -n "${_ver}" ] && [ "${_ver}" != 'UNVERSIONED' ]; then
@@ -564,12 +738,18 @@ POSIX_HERESTRING
 
 case "${image}" in
   'grafana/doc-validator')
+    if ! command -v jq >/dev/null 2>&1; then
+      errr '`jq` must be installed for the `doc-validator` target to work.'
+      note 'To install `jq`, refer to https://jqlang.github.io/jq/download/,'
+
+      exit 1
+    fi
+
     proj="$(new_proj "$1")"
-    echo
+    printf '\r\n'
     "${PODMAN}" run \
                 --init \
                 --interactive \
-                --name "${DOCS_CONTAINER}" \
                 --platform linux/amd64 \
                 --rm \
                 --tty \
@@ -577,30 +757,37 @@ case "${image}" in
                 "${DOCS_IMAGE}" \
                 "--include=${DOC_VALIDATOR_INCLUDE}" \
                 "--skip-checks=${DOC_VALIDATOR_SKIP_CHECKS}" \
-                /hugo/content/docs \
-                "$(proj_canonical "${proj}")" | sed "s#$(proj_dst "${proj}")#sources#"
+                "/hugo/content$(proj_canonical "${proj}")" \
+                "$(proj_canonical "${proj}")" \
+                | sed "s#$(proj_dst "${proj}")#sources#" \
+                | jq -r '"ERROR: \(.location.path):\(.location.range.start.line // 1):\(.location.range.start.column // 1): \(.message)" + if .suggestions[0].text then "\nSuggestion: \(.suggestions[0].text)" else "" end'
     ;;
   'grafana/vale')
     proj="$(new_proj "$1")"
-    echo
+    printf '\r\n'
     "${PODMAN}" run \
                 --init \
                 --interactive \
-                --name "${DOCS_CONTAINER}" \
-                --platform linux/amd64 \
                 --rm \
+                --workdir /etc/vale \
                 --tty \
                 ${volumes} \
                 "${DOCS_IMAGE}" \
                 "--minAlertLevel=${VALE_MINALERTLEVEL}" \
-                --config=/etc/vale/.vale.ini \
-                --output=line \
+                '--glob=*.md' \
+                --output=/etc/vale/rdjsonl.tmpl \
                 /hugo/content/docs | sed "s#$(proj_dst "${proj}")#sources#"
     ;;
   *)
     tempfile="$(mktemp -t make-docs.XXX)"
     cat <<EOF >"${tempfile}"
 #!/usr/bin/env bash
+
+tc() {
+  set \${*,,}
+  echo \${*^}
+}
+
 for redirect in ${redirects}; do
   IFS='^' read -r path ver <<<"\${redirect}"
   echo -e "---\\nredirectURL: \"\${path/\/hugo\/content/}\"\\ntype: redirect\\nversioned: true\\n---\\n" > "\${path/\${ver}/_index.md}"
@@ -609,8 +796,12 @@ done
 for x in "${url_src_dst_vers}"; do
   IFS='^' read -r _ _ dst _ <<<"\${x}"
 
+  title="\${dst%/*}"
+  title="\$(tc \${title##*/})"
   while [[ -n "\${dst}" ]]; do
-    touch "\${dst}/_index.md"
+    if [[ ! -f "\${dst}/_index.md" ]]; then
+        echo -e "---title: \${title}\\n---\\n\\n# \${title}\\n\\n{{< section >}}" > "\${dst}/_index.md"
+    fi
     dst="\${dst%/*}"
   done
 done
@@ -622,7 +813,7 @@ fi
 ${WEBSITE_EXEC}
 EOF
     chmod +x "${tempfile}"
-    volumes="${volumes} --volume=${tempfile}:/entrypoint"
+    volumes="${volumes} --volume=${tempfile}:/entrypoint:z"
     readonly volumes
 
     IFS='' read -r cmd <<EOF
@@ -630,33 +821,39 @@ ${PODMAN} run \
   --env=HUGO_REFLINKSERRORLEVEL=${HUGO_REFLINKSERRORLEVEL} \
   --init \
   --interactive \
-  --name=${DOCS_CONTAINER} \
-  --platform=linux/amd64 \
   --publish=${DOCS_HOST_PORT}:3002 \
   --publish=3003:3003 \
   --rm \
   --tty \
   ${volumes} \
-  ${DOCS_IMAGE} \
-  /entrypoint
+  ${DOCS_IMAGE}
 EOF
-    await_build http://localhost:3003 &
 
-    if [ -n "${DEBUG}" ]; then
-      ${cmd}
+    if [ -n "${ENTER}" ]; then
+      ${cmd} /bin/bash
+    elif [ -n "${DEBUG}" ]; then
+      await_build http://localhost:3003 &
+
+      debg "${cmd} /entrypoint"
+      ${cmd} /entrypoint
     else
-      ${cmd} 2>&1| sed \
-                     -e '/Web Server is available at http:\/\/localhost:3003\/ (bind address 0.0.0.0)/ d' \
-                     -e '/^hugo server/ d' \
-                     -e '/fatal: not a git repository (or any parent up to mount point \/)/ d' \
-                     -e '/Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)./ d' \
-                     -e "/Makefile:[0-9]*: warning: overriding recipe for target 'docs'/ d" \
-                     -e "/docs.mk:[0-9]*: warning: ignoring old recipe for target 'docs'/ d" \
-                     -e '/\/usr\/bin\/make -j 2 proxy hserver-docs HUGO_PORT=3003/ d' \
-                     -e '/website-proxy/ d' \
-                     -e '/rm -rf dist*/ d' \
-                     -e '/Press Ctrl+C to stop/ d' \
-                     -e '/make/ d' || echo
+      await_build http://localhost:3003 &
+
+      ${cmd} /entrypoint  2>&1\
+        | sed -u \
+              -e '/Web Server is available at http:\/\/localhost:3003\/ (bind address 0.0.0.0)/ d' \
+              -e '/^hugo server/ d' \
+              -e '/fatal: not a git repository (or any parent up to mount point \/)/ d' \
+              -e '/Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)./ d' \
+              -e "/Makefile:[0-9]*: warning: overriding recipe for target 'docs'/ d" \
+              -e "/docs.mk:[0-9]*: warning: ignoring old recipe for target 'docs'/ d" \
+              -e '/\/usr\/bin\/make -j 2 proxy hserver-docs HUGO_PORT=3003/ d' \
+              -e '/website-proxy/ d' \
+              -e '/rm -rf dist*/ d' \
+              -e '/Press Ctrl+C to stop/ d' \
+              -e '/make/ d' \
+              -e '/WARNING: The manual_mount source directory/ d' \
+              -e '/docs\/_index.md .* not found/ d'
     fi
     ;;
 esac
diff --git a/docs/sources/_index.md b/docs/sources/_index.md
index 0ea6107fb3546..da6a832281a5d 100644
--- a/docs/sources/_index.md
+++ b/docs/sources/_index.md
@@ -3,20 +3,22 @@ aliases:
   - /docs/grafana/v1.1/
   - /docs/grafana/v3.1/
   - guides/reference/admin/
-description: Open source documentation for Grafana
+cascade:
+  TEMPO_VERSION: latest
+  PYROSCOPE_VERSION: latest
+description: Guides, installation, and feature documentation
 keywords:
   - grafana
-  - open source
   - installation
   - documentation
 labels:
   products:
     - enterprise
     - oss
-title: Grafana open source documentation
+title: Grafana documentation
 ---
 
-# Grafana open source documentation
+# Grafana documentation
 
 ## Installing Grafana
 
@@ -40,6 +42,10 @@ title: Grafana open source documentation
         <img src="/static/img/logos/logo-docker.svg">
         <h5>Run Docker image</h5>
     </a>
+    <a href="{{< relref "setup-grafana/installation/kubernetes/" >}}" class="nav-cards__item nav-cards__item--install">
+        <img src="/static/img/logos/logo-kubernetes.svg">
+        <h5>Run on Kubernetes</h5>
+    </a>
     <a href="https://grafana.com/docs/grafana-cloud/" class="nav-cards__item nav-cards__item--install">
         <div class="nav-cards__icon fa fa-cloud">
         </div>
@@ -75,8 +81,8 @@ title: Grafana open source documentation
         <h4>Provisioning</h4>
         <p>Learn how to automate your Grafana configuration.</p>
     </a>
-    <a href="{{< relref "whatsnew/whats-new-in-v10-2/" >}}" class="nav-cards__item nav-cards__item--guide">
-        <h4>What's new in v10.2</h4>
+    <a href="{{< relref "whatsnew/whats-new-in-v11-0/" >}}" class="nav-cards__item nav-cards__item--guide">
+        <h4>What's new in v11.0-preview</h4>
         <p>Explore the features and enhancements in the latest release.</p>
     </a>
 
diff --git a/docs/sources/administration/api-keys/index.md b/docs/sources/administration/api-keys/index.md
index f2e1be18e751c..bc4a5b6cd0db7 100644
--- a/docs/sources/administration/api-keys/index.md
+++ b/docs/sources/administration/api-keys/index.md
@@ -17,6 +17,10 @@ weight: 700
 
 # API keys
 
+{{% admonition type="note" %}}
+Deprecated: [Service accounts]({{< relref "../service-accounts/" >}}) have replaced API keys as the primary way to authenticate applications that interact with Grafana.
+{{% /admonition %}}
+
 An API key is a randomly generated string that external systems use to interact with Grafana HTTP APIs.
 
 When you create an API key, you specify a **Role** that determines the permissions associated with the API key. Role permissions control that actions the API key can perform on Grafana resources.
@@ -48,7 +52,7 @@ To follow these instructions, you need at least one of the following:
 To create an API, complete the following steps:
 
 1. Sign in to Grafana.
-1. Click **Administration** in the left-side menu and select **API Keys**.
+1. Click **Administration** in the left-side menu, **Users and access**, and select **API Keys**.
 1. Click **Add API key**.
 1. Enter a unique name for the key.
 1. In the **Role** field, select one of the following access levels you want to assign to the key.
@@ -101,7 +105,7 @@ For more information about permissions, refer to [Roles and permissions]({{< rel
 
 To migrate all API keys to service accounts, complete the following steps:
 
-1. Sign in to Grafana, point to **Configuration** (the gear icon), and click **API Keys**.
+1. Sign in to Grafana, point to **Administration**, **Users and access**, and click **API Keys**.
 1. In the top of the page, find the section which says **Switch from API keys to service accounts**
 1. Click **Migrate to service accounts now**.
 1. A confirmation window will appear, asking to confirm the migration. Click **Yes, migrate now** if you are willing to continue.
@@ -110,7 +114,7 @@ To migrate all API keys to service accounts, complete the following steps:
 To migrate a single API key to a service account, complete the following steps:
 
 1. Sign in to Grafana.
-1. Click **Administration** in the left-side menu and select **API Keys**.
+1. Click **Administration** in the left-side menu, **Users and access**, and select **API Keys**.
 1. Find the API Key you want to migrate.
 1. Click **Migrate to service account**.
 
diff --git a/docs/sources/administration/correlations/_index.md b/docs/sources/administration/correlations/_index.md
index 5bed6c17eeb94..977849d294860 100644
--- a/docs/sources/administration/correlations/_index.md
+++ b/docs/sources/administration/correlations/_index.md
@@ -28,12 +28,7 @@ Explore visualizations that currently support showing links based on correlation
 - [Logs Panel]({{< relref "./use-correlations-in-visualizations#correlations-in-logs-panel">}})
 - [Table]({{< relref "./use-correlations-in-visualizations#correlations-in-table">}})
 
-You can configure correlations using the **Administration > Correlation** page in Grafana or with [provisioning]({{< relref "../provisioning" >}}).
-
-{{% admonition type="note" %}}
-Correlations are available in Grafana 10.0+ as an opt-in beta feature.
-Modify the Grafana [configuration file]({{< relref "../../setup-grafana/configure-grafana#configuration-file-location" >}}) to enable the `correlations` [feature toggle]({{< relref "../../setup-grafana/configure-grafana#feature_toggles" >}}) to use it.
-{{% /admonition %}}
+You can configure correlations using [provisioning]({{< relref "../provisioning" >}}), the **Administration > Plugins and data > Correlations** page in Grafana or directly in [Explore]({{< relref "../../explore/correlations-editor-in-explore" >}}).
 
 ## Example of how links work in Explore once set up
 
diff --git a/docs/sources/administration/correlations/add-permissions-to-create-new-correlations/index.md b/docs/sources/administration/correlations/add-permissions-to-create-new-correlations/index.md
index 6d12a77921932..8dbca454cac50 100644
--- a/docs/sources/administration/correlations/add-permissions-to-create-new-correlations/index.md
+++ b/docs/sources/administration/correlations/add-permissions-to-create-new-correlations/index.md
@@ -16,7 +16,7 @@ Adding access to create correlations for [Viewers and Editors]({{< relref "../..
 
 ## Add permissions to create correlations
 
-1. Go to the Administration section in Grafana.
-1. Open Users page.
+1. Go to the **Administration** section in Grafana.
+1. Under **Users and access**, open the **Users** page.
 1. Select the user to be granted access to create correlations.
 1. Add _Data sources writer_ role.
diff --git a/docs/sources/administration/correlations/create-a-new-correlation/index.md b/docs/sources/administration/correlations/create-a-new-correlation/index.md
index b458c59830e4b..225d6ca8e1c27 100644
--- a/docs/sources/administration/correlations/create-a-new-correlation/index.md
+++ b/docs/sources/administration/correlations/create-a-new-correlation/index.md
@@ -13,29 +13,14 @@ weight: 40
 
 Make sure you have permission to add new correlations. Only users with write permissions to data sources can define new correlations.
 
-## Create a correlation in Explore's Correlations Editor
-
-1. Go to Explore page.
-1. Select a data source that you would like to be [the source data source]({{< relref "../../../administration/correlations/correlation-configuration#source-data-source-and-result-field" >}}) for a new correlation.
-1. Run a query producing data in [a supported visualization]({{< relref "../../../administration/correlations#correlations" >}}).
-1. Click "+ Add" button in the top toolbar and select "Add correlation" (you can also select "Correlations Editor" from the [Command Palette]({{< relref "../../../search#command-palette" >}})).
-1. Explore is now in Correlations Editor mode indicated by a blue border and top bar. You can exit Correlations Editor using the Exit button in the top bar.
-1. The visualization is enriched with links allowing to create new correlations. Links are attached to the data that you can use to build a new query:
-   - Logs: links are displayed next to field values inside log details for each log row
-   - Table: every table cell is a link
-1. Click on a link to begin adding new correlation. Links are associated with a field that will be used as [a results field of a correlation]({{< relref "../../../administration/correlations/correlation-configuration" >}}). This means the correlation link will be created on the link you select once the correlation is saved.
-1. Explore opens a split view. Use the right pane to setup [the target query source of the correlation]({{< relref "../../../administration/correlations/correlation-configuration#target-query" >}}).
-1. Build target query using [variables syntax]({{< relref "../../../dashboards/variables/variable-syntax" >}}) with variables from the list provided at the top of the pane. The list contains sample values from the selected data row.
-1. Provide optional label and description. Label is used as the name of the link inside the visualization. It can contain variables.
-1. Click "Save" button in the top bar to save the correlation and exit Correlations Editor mode.
-1. The link used to create the correlation will be replaced with a data link in each row. The variables will be dynamically replaced with values from a selected row.
-
-Please check [an example]({{< relref "../../../administration/correlations/use-correlations-editor-in-explore" >}}) to see how to create a sample correlation using test data source.
+## Create a correlation in Explore's correlations editor
+
+To learn more, refer to Explore's [documentation]({{< relref "../../../explore/correlations-editor-in-explore" >}}) about building correlations in Explore.
 
 ## Create a correlation in Administration page
 
-1. Go to the Administration section in Grafana.
-1. Open Correlations page.
+1. Go to the **Administration** section in Grafana.
+1. Under **Plugins and data**, open the **Correlations** page.
 1. Click the “Add” button in the top right corner.
 1. Provide a **label** for the correlation.
 1. Provide an optional **description**.
diff --git a/docs/sources/administration/correlations/use-correlations-editor-in-explore/index.md b/docs/sources/administration/correlations/use-correlations-editor-in-explore/index.md
deleted file mode 100644
index a8bdcfcdf52fe..0000000000000
--- a/docs/sources/administration/correlations/use-correlations-editor-in-explore/index.md
+++ /dev/null
@@ -1,57 +0,0 @@
----
-labels:
-  products:
-    - enterprise
-    - oss
-title: Use Correlations Editor in Explore
-weight: 70
----
-
-# Use Correlations Editor in Explore
-
-## Before you begin
-
-This example shows how to create a correlation using Correlations Editor in Explore.
-
-Correlations allow you to use results of one query to run a new query in any data source. In this example you will run a query that renders tabular data. The data will be used to run a different query that yields a graph result.
-
-Please make sure you have set up [a test data source]({{< relref "../../../datasources/testdata#testdata-data-source" >}}).
-
-## Create a new correlation
-
-1. Go to Explore.
-1. Select `test data source`.
-1. Click on "+ Add" dropdown and select "Add correlation" button.
-1. Explore is now in Correlations Editor mode indicated by a blue border.
-1. Select scenario: `CSV File`.
-1. Select file: `population_by_state.csv`.
-1. Note that each cell is a link that you can click on to start creating a new correlation.
-
-   {{< figure src="/static/img/docs/correlations/screenshot-correlations-editor-source-10.2.png" max-width="600px" caption="Selecting the source of a correlation" >}}
-
-1. Create new correlation that attaches a data link in the `State` column: click on any cell in the `State` column, e.g. "California".
-1. Explore opens in split view. Select the same data source you selected in the left pane.
-1. The helper above the query editor contains all available variables you can use the target query. Variables contain all data fields (table columns) from the selected row.
-1. Select Scenario: `CSV Metric Values`.
-1. In the Query Editor's `String Input` field provide variables with population values for each year: `${1980},${2000},${2020}`. This will generate a graph using variable values.
-1. In the Query Editor's `Alias` field, write `${State}`
-
-   {{< figure src="/static/img/docs/correlations/screenshot-correlations-editor-target-10.2.png" max-width="600px" caption="Setting up the target of a correlation" >}}
-
-1. Run a query to see that it produces a graph using sample values from the variables.
-1. Save the correlation using "Save" button in the top.
-
-## Test a newly created correlations
-
-1. Once the correlation is saved Explore will exit Correlations Editor automatically and re-rerun the query in the left pane.
-1. Click on a state name. Note how values from the row are inserted into the query on the right and the graph changes using the values for each row. The query is rerun with updates values every time you click on a state name.
-
-   {{< figure src="/static/img/docs/correlations/screenshot-correlations-example-link-10.2.png" max-width="600px" caption="Result of clicking on a data link" >}}
-
-You can apply the same steps to any data source. Correlations allow you to create links in visualizations to run dynamic queries based on selected data. In this example we used data returned by a query to build a new query generating different visualization using the same data source. However, you can create correlations between any data sources to create custom exploration flows.
-
-## Correlations in the logs panel
-
-Correlations links in the logs panel show slightly differently than the table panel. When you enter the Correlation Editor mode when looking at logs, you will need to expand a log line to see the button that serves as the correlation link.
-
-{{< figure src="/static/img/docs/correlations/screenshot-correlations-editor-logs-10.2.png" max-width="600px" caption="Logs panel in the Correlations Editor" >}}
diff --git a/docs/sources/administration/correlations/use-correlations-in-visualizations/index.md b/docs/sources/administration/correlations/use-correlations-in-visualizations/index.md
index 92d160a81a0ef..4c98948ee3a54 100644
--- a/docs/sources/administration/correlations/use-correlations-in-visualizations/index.md
+++ b/docs/sources/administration/correlations/use-correlations-in-visualizations/index.md
@@ -3,7 +3,7 @@ labels:
   products:
     - enterprise
     - oss
-title: Use correlations in visualizations
+title: 'Use correlations in visualizations'
 weight: 70
 ---
 
diff --git a/docs/sources/administration/correlations/use-variables-and-transformations/index.md b/docs/sources/administration/correlations/use-variables-and-transformations/index.md
index 9c757b5f059d4..6bc3668f9d8d8 100644
--- a/docs/sources/administration/correlations/use-variables-and-transformations/index.md
+++ b/docs/sources/administration/correlations/use-variables-and-transformations/index.md
@@ -3,7 +3,7 @@ labels:
   products:
     - enterprise
     - oss
-title: Use variables and transformations in a correlation
+title: 'Use variables and transformations in a correlation'
 weight: 60
 ---
 
diff --git a/docs/sources/administration/data-source-management/_index.md b/docs/sources/administration/data-source-management/_index.md
new file mode 100644
index 0000000000000..b57424f245ede
--- /dev/null
+++ b/docs/sources/administration/data-source-management/_index.md
@@ -0,0 +1,168 @@
+---
+aliases:
+  - ../datasources/add-a-data-source/
+  - ../datasources/datasource_permissions/
+  - ../enterprise/datasource_permissions/
+  - ../enterprise/query-caching/
+  - ../features/datasources/add-a-data-source/
+  - ../permissions/datasource_permissions/
+description: Data source management information for Grafana administrators
+labels:
+  products:
+    - enterprise
+    - cloud
+title: Data source management
+weight: 100
+---
+
+# Data source management
+
+Grafana supports many different storage backends for your time series data (data source).
+Refer to [data sources]({{< relref "../../datasources" >}}) for more information about using data sources in Grafana.
+Only users with the organization admin role can add data sources.
+
+For links to data source-specific documentation, see [Data sources]({{< relref "../../datasources" >}}).
+
+## Data source permissions
+
+You can configure data source permissions to allow or deny certain users the ability to query, edit, or administrate a data source. Each data source’s configuration includes a Permissions tab where you can restrict data source permissions to specific users, service accounts, teams, or roles.
+
+- The `query` permission allows users to query the data source.
+- The `edit` permission allows users to query the data source, edit the data source’s configuration and delete the data source.
+- The `admin` permission allows users to query and edit the data source, change permissions on the data source and enable or disable query caching for the data source.
+
+{{% admonition type="note" %}}
+Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud](/docs/grafana-cloud).
+{{% /admonition %}}
+
+By default, data sources in an organization can be queried by any user in that organization. For example, a user with the `Viewer` role can issue any possible query to a data source, not just queries that exist on dashboards to which they have access. Additionally, by default, data sources can be edited by the user who created the data source, as well as users with the `Admin` role.
+
+<div class="clearfix"></div>
+
+### Assign data source permissions to users, service accounts, teams, or roles
+
+You can assign data source permissions to users, service accounts, teams, and roles which will allow access to query, edit, or administrate the data source.
+
+1. Click **Connections** in the left-side menu.
+1. Under Your connections, click **Data sources**.
+1. Select the data source to which you want to assign permissions.
+1. On the Permissions tab, click **Add a permission**.
+1. Select **User**, **Service Account**, **Team**, or **Role**.
+1. Select the entity for which you want to modify permissions.
+1. Select the **Query**, **Edit**, or **Admin** permission.
+1. Click **Save**.
+
+<div class="clearfix"></div>
+
+### Edit data source permissions for users, service accounts, teams, or roles
+
+1. Click **Connections** in the left-side menu.
+1. Under Your connections, click **Data sources**.
+1. Select the data source for which you want to edit permissions.
+1. On the Permissions tab, find the **User**, **Service Account**, **Team**, or **Role** permission you want to update.
+1. Select a different option in the **Permission** dropdown.
+
+<div class="clearfix"></div>
+
+### Remove data source permissions for users, service accounts, teams, or roles
+
+1. Click **Connections** in the left-side menu.
+1. Under Your connections, click **Data sources**.
+1. Select the data source from which you want to remove permissions.
+1. On the Permissions tab, find the **User**, **Service Account**, **Team**, or **Role** permission you want to remove.
+1. Click the **X** next to the permission.
+
+<div class="clearfix"></div>
+
+## Query and resource caching
+
+When you enable query and resource caching, Grafana temporarily stores the results of data source queries and resource requests. When you or another user submit the same query or resource request again, the results will come back from the cache instead of from the data source.
+
+When using Grafana, a query pertains to a request for data frames to be modified or displayed. A resource relates to any HTTP requests made by a plugin, such as the Amazon Timestream plugin requesting a list of available databases from AWS. For more information on data source queries and resources, please see the developers page on [backend plugins](/developers/plugin-tools/introduction/backend-plugins).
+
+The caching feature works for **all** backend data sources. You can enable the cache globally in Grafana's [configuration]({{< relref "../../setup-grafana/configure-grafana/enterprise-configuration/#caching" >}}), and configure a cache duration (also called Time to Live, or TTL) for each data source individually.
+
+{{% admonition type="note" %}}
+Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud](/docs/grafana-cloud/).
+{{% /admonition %}}
+
+The following cache backend options are available: in-memory, Redis, and Memcached.
+
+{{% admonition type="note" %}}
+Storing cached queries in-memory can increase Grafana's memory footprint. In production environments, a Redis or Memcached backend is highly recommended.
+{{% /admonition %}}
+
+When a panel queries a data source with cached data, it will either fetch fresh data or use cached data depending on the panel's **interval.** The interval is used to round the query time range to a nearby cached time range, increasing the likelihood of cache hits. Therefore, wider panels and dashboards with shorter time ranges fetch new data more often than narrower panels and dashboards with longer time ranges.
+
+A panel's interval is visible in the [query options]({{< relref "../../panels-visualizations/query-transform-data/" >}}). It is calculated as follows: `time range / max data points`. Max data points are calculated based on the width of the panel. For example, a wide panel with `1000 data points` on a dashboard with a time range of `last 7 days` will retrieve fresh data every 10 minutes: `7d / 1000 = 10m`. In this example, cached data for this panel will be served for up to 10 minutes before Grafana needs to query the data source again for new data.
+
+You can configure a panel to retrieve data more often by increasing the **Max data points** setting in the panel's [query options]({{< relref "../../panels-visualizations/query-transform-data/" >}}).
+
+### Caching benefits
+
+By reducing the number of queries and requests sent to data sources, caching can provide the following benefits:
+
+- Faster dashboard load times, especially for popular dashboards.
+- Reduced API costs.
+- Reduced likelihood that APIs will rate-limit or throttle requests.
+
+### Data sources that work with query caching
+
+Query caching works for Grafana's [built-in data sources]({{< relref "../../datasources/#built-in-core-data-sources" >}}), and [backend data source plugins](https://grafana.com/grafana/plugins/?type=datasource) that extend the `DataSourceWithBackend` class in the plugins SDK.
+
+To verify that a data source works with query caching, follow the [instructions below](#enable-and-configure-query-caching) to **Enable and Configure query caching**. If caching is enabled in Grafana but the Caching tab is not visible for the given data source, then query caching is not available for that data source.
+
+{{% admonition type="note" %}}
+Some data sources, such as Elasticsearch, Prometheus, and Loki, cache queries themselves, so Grafana _query_ caching does not significantly improve performance. However, _resource_ caching may help. See the developers page on [plugin resources](/developers/plugin-tools/introduction/backend-plugins) for details.
+{{% /admonition %}}
+
+### Enable and configure query caching
+
+You must be an Org admin or Grafana admin to enable query caching for a data source. For more information on Grafana roles and permissions, refer to [About users and permissions]({{< relref "../roles-and-permissions/" >}}).
+
+By default, data source queries are not cached. To enable query caching for a single data source:
+
+1. Click **Connections** in the left-side menu.
+1. Under Your Connections, click **Data sources**.
+1. In the data source list, click the data source that you want to turn on caching for.
+1. Go to the Cache tab.
+1. Click **Enable**.
+1. (Optional) Choose custom TTLs for the data source's queries and resources caching. If you skip this step, then Grafana uses the default TTL.
+
+You can optionally override a data source's configured TTL for individual dashboard panels. This can be useful when you have queries whose results change more or less often than the configured TTL. In the Edit Panel view, select the caching-enabled data source, expand the Query options, and enter your the TTL in milliseconds.
+
+{{< figure max-width="500px" src="/media/docs/grafana/per-panel-cache-ttl-9-4.png" caption="Set Cache TTL for a single panel" >}}
+
+{{% admonition type="note" %}}
+If query caching is enabled and the Cache tab is not visible in a data source's settings, then query caching is not available for that data source.
+{{% /admonition %}}
+
+To configure global settings for query caching, refer to the `caching` section of [Configure Grafana Enterprise]({{< relref "../../setup-grafana/configure-grafana/enterprise-configuration/#caching" >}}).
+
+### Disable query caching
+
+To disable query caching for a single data source:
+
+1. Click **Connections** in the left-side menu.
+1. Under Your Connections, click **Data sources**.
+1. In the data source list, click the data source that you want to turn off caching for.
+1. On the Cache tab, click **Disable**.
+
+To disable query caching for an entire Grafana instance, set the `enabled` flag to `false` in the `caching` section of [Configure Grafana Enterprise]({{< relref "../../setup-grafana/configure-grafana/enterprise-configuration/#caching" >}}). You will no longer see the Cache tab on any data sources, and no data source queries will be cached.
+
+### Clear cache
+
+If you experience performance issues or repeated queries become slower to execute, consider clearing your cache.
+
+{{% admonition type="note" %}}
+This action impacts all cache-enabled data sources. If you are using Memcached, the system clears all data from the Memcached instance.
+{{% /admonition %}}
+
+1. Click **Connections** in the left-side menu.
+1. Under Your Connections, click **Data sources**.
+1. In the data source list, click the data source that you want to clear the cache for.
+1. In the Cache tab, click **Clear cache**.
+
+### Sending a request without cache
+
+If a data source query request contains an `X-Cache-Skip` header, then Grafana skips the caching middleware, and does not search the cache for a response. This can be particularly useful when debugging data source queries using cURL.
diff --git a/docs/sources/administration/data-source-management/index.md b/docs/sources/administration/data-source-management/index.md
deleted file mode 100644
index f4a9be6f23b45..0000000000000
--- a/docs/sources/administration/data-source-management/index.md
+++ /dev/null
@@ -1,199 +0,0 @@
----
-aliases:
-  - ../datasources/add-a-data-source/
-  - ../datasources/datasource_permissions/
-  - ../enterprise/datasource_permissions/
-  - ../enterprise/query-caching/
-  - ../features/datasources/add-a-data-source/
-  - ../permissions/datasource_permissions/
-description: Data source management information for Grafana administrators
-labels:
-  products:
-    - enterprise
-    - oss
-title: Data source management
-weight: 100
----
-
-# Data source management
-
-Grafana supports many different storage backends for your time series data (data source).
-Refer to [data sources]({{< relref "../../datasources" >}}) for more information about using data sources in Grafana.
-Only users with the organization admin role can add data sources.
-
-## Add a data source
-
-Before you can create your first dashboard, you need to add your data source.
-
-{{% admonition type="note" %}}
-Only users with the organization admin role can add data sources.
-{{% /admonition %}}
-
-**To add a data source:**
-
-1. Click **Connections** in the left-side menu.
-1. Enter the name of a specific data source in the search dialog. You can filter by **Data source** to only see data sources.
-1. Click the data source you want to add.
-1. Configure the data source following instructions specific to that data source.
-
-For links to data source-specific documentation, see [Data sources]({{< relref "../../datasources" >}}).
-
-## Data source permissions
-
-You can configure data source permissions to allow or deny certain users the ability to query, edit, or administrate a data source. Each data source’s configuration includes a Permissions tab where you can restrict data source permissions to specific users, service accounts, teams, or roles.
-Query permission allows users to query the data source. Edit permission allows users to query the data source, edit the data source’s configuration and delete the data source. Admin permission allows users to query and edit the data source, change permissions on the data source and enable or disable query caching for the data source.
-
-{{% admonition type="note" %}}
-Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud](/docs/grafana-cloud).
-{{% /admonition %}}
-
-By default, data sources in an organization can be queried by any user in that organization. For example, a user with the `Viewer` role can issue any possible query to a data source, not just queries that exist on dashboards to which they have access. Additionally, by default, data sources can be edited by the user who created the data source, as well as users with the `Admin` role.
-
-<div class="clearfix"></div>
-
-### Assign data source permissions to users, service accounts, teams, or roles
-
-You can assign data source permissions to users, service accounts, teams, and roles which will allow access to query, edit, or administrate the data source.
-
-1. Click **Connections** in the left-side menu.
-1. Under Your connections, click **Data sources**.
-1. Select the data source to which you want to assign permissions.
-1. On the Permissions tab, click **Add a permission**.
-1. Select **User**, **Service Account**, **Team**, or **Role**.
-1. Select the entity for which you want to modify permissions.
-1. Select the **Query**, **Edit**, or **Admin** permission.
-1. Click **Save**.
-
-<div class="clearfix"></div>
-
-### Edit data source permissions for users, service accounts, teams, or roles
-
-1. Click **Connections** in the left-side menu.
-1. Under Your connections, click **Data sources**.
-1. Select the data source for which you want to edit permissions.
-1. On the Permissions tab, find the user, service account, team, or role permission you want to update.
-1. Select a different option in the **Permission** dropdown.
-
-<div class="clearfix"></div>
-
-### Remove data source permissions for users, service accounts, teams, or roles
-
-1. Click **Connections** in the left-side menu.
-1. Under Your connections, click **Data sources**.
-1. Select the data source from which you want to remove permissions.
-1. On the Permissions tab, find the user, service account, team, or role permission you want to remove.
-1. Click the **X** next to the permission.
-
-<div class="clearfix"></div>
-
-## Query and resource caching
-
-When you enable query and resource caching, Grafana temporarily stores the results of data source queries and resource requests. When you or another user submit the same query or resource request again, the results will come back from the cache instead of from the data source.
-
-When using Grafana, a query pertains to a request for data frames to be modified or displayed. A resource relates to any HTTP requests made by a plugin, such as the Amazon Timestream plugin requesting a list of available databases from AWS. For more information on data source queries and resources, please see the developers page on [backend plugins](/developers/plugin-tools/introduction/backend-plugins).
-
-The caching feature works for **all** backend data sources. You can enable the cache globally in Grafana's [configuration]({{< relref "../../setup-grafana/configure-grafana/enterprise-configuration/#caching" >}}), and configure a cache duration (also called Time to Live, or TTL) for each data source individually.
-
-{{% admonition type="note" %}}
-Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud](/docs/grafana-cloud/).
-{{% /admonition %}}
-
-The following cache backend options are available: in-memory, Redis, and Memcached.
-
-{{% admonition type="note" %}}
-Storing cached queries in-memory can increase Grafana's memory footprint. In production environments, a Redis or Memcached backend is highly recommended.
-{{% /admonition %}}
-
-When a panel queries a data source with cached data, it will either fetch fresh data or use cached data depending on the panel's **interval.** The interval is used to round the query time range to a nearby cached time range, increasing the likelihood of cache hits. Therefore, wider panels and dashboards with shorter time ranges fetch new data more often than narrower panels and dashboards with longer time ranges.
-
-A panel's interval is visible in the [query options]({{< relref "../../panels-visualizations/query-transform-data/" >}}). It is calculated as follows: `time range / max data points`. Max data points are calculated based on the width of the panel. For example, a wide panel with `1000 data points` on a dashboard with a time range of `last 7 days` will retrieve fresh data every 10 minutes: `7d / 1000 = 10m`. In this example, cached data for this panel will be served for up to 10 minutes before Grafana needs to query the data source again for new data.
-
-You can configure a panel to retrieve data more often by increasing the **Max data points** setting in the panel's [query options]({{< relref "../../panels-visualizations/query-transform-data/" >}}).
-
-### Caching benefits
-
-By reducing the number of queries and requests sent to data sources, caching can provide the following benefits:
-
-- Faster dashboard load times, especially for popular dashboards.
-- Reduced API costs.
-- Reduced likelihood that APIs will rate-limit or throttle requests.
-
-### Data sources that work with query caching
-
-Query caching works for Grafana's [built-in data sources]({{< relref "../../datasources/#built-in-core-data-sources" >}}), and [backend data source plugins](https://grafana.com/grafana/plugins/?type=datasource) that extend the `DataSourceWithBackend` class in the plugins SDK.
-
-To verify that a data source works with query caching, follow the [instructions below](#enable-and-configure-query-caching) to **Enable and Configure query caching**. If caching is enabled in Grafana but the Caching tab is not visible for the given data source, then query caching is not available for that data source.
-
-{{% admonition type="note" %}}
-Some data sources, such as Elasticsearch, Prometheus, and Loki, cache queries themselves, so Grafana _query_ caching does not significantly improve performance. However, _resource_ caching may help. See the developers page on [plugin resources](/developers/plugin-tools/introduction/backend-plugins) for details.
-{{% /admonition %}}
-
-### Enable and configure query caching
-
-You must be an Org admin or Grafana admin to enable query caching for a data source. For more information on Grafana roles and permissions, refer to [About users and permissions]({{< relref "../roles-and-permissions/" >}}).
-
-By default, data source queries are not cached. To enable query caching for a single data source:
-
-1. Click **Connections** in the left-side menu.
-1. Under Your Connections, click **Data sources**.
-1. In the data source list, click the data source that you want to turn on caching for.
-1. Go to the Cache tab.
-1. Click **Enable**.
-1. (Optional) Choose custom TTLs for the data source's queries and resources caching. If you skip this step, then Grafana uses the default TTL.
-
-You can optionally override a data source's configured TTL for individual dashboard panels. This can be useful when you have queries whose results change more or less often than the configured TTL. In the Edit Panel view, select the caching-enabled data source, expand the Query options, and enter your the TTL in milliseconds.
-
-{{< figure max-width="500px" src="/media/docs/grafana/per-panel-cache-ttl-9-4.png" caption="Set Cache TTL for a single panel" >}}
-
-{{% admonition type="note" %}}
-If query caching is enabled and the Cache tab is not visible in a data source's settings, then query caching is not available for that data source.
-{{% /admonition %}}
-
-To configure global settings for query caching, refer to the `caching` section of [Configure Grafana Enterprise]({{< relref "../../setup-grafana/configure-grafana/enterprise-configuration/#caching" >}}).
-
-### Disable query caching
-
-To disable query caching for a single data source:
-
-1. Click **Connections** in the left-side menu.
-1. Under Your Connections, click **Data sources**.
-1. In the data source list, click the data source that you want to turn off caching for.
-1. On the Cache tab, click **Disable**.
-
-To disable query caching for an entire Grafana instance, set the `enabled` flag to `false` in the `caching` section of [Configure Grafana Enterprise]({{< relref "../../setup-grafana/configure-grafana/enterprise-configuration/#caching" >}}). You will no longer see the Cache tab on any data sources, and no data source queries will be cached.
-
-### Clear cache
-
-If you experience performance issues or repeated queries become slower to execute, consider clearing your cache.
-
-{{% admonition type="note" %}}
-This action impacts all cache-enabled data sources. If you are using Memcached, the system clears all data from the Memcached instance.
-{{% /admonition %}}
-
-1. Click **Connections** in the left-side menu.
-1. Under Your Connections, click **Data sources**.
-1. In the data source list, click the data source that you want to clear the cache for.
-1. In the Cache tab, click **Clear cache**.
-
-### Sending a request without cache
-
-If a data source query request contains an `X-Cache-Skip` header, then Grafana skips the caching middleware, and does not search the cache for a response. This can be particularly useful when debugging data source queries using cURL.
-
-## Add data source plugins
-
-Grafana ships with several [built-in data sources]({{< relref "../../datasources#built-in-core-data-sources" >}}).
-You can add additional data sources as plugins, which you can install or create yourself.
-
-### Find data source plugins in the plugin catalog
-
-To view available data source plugins, go to the [plugin catalog](/grafana/plugins/?type=datasource) and select the "Data sources" filter.
-For details about the plugin catalog, refer to [Plugin management]({{< relref "../../administration/plugin-management/" >}}).
-
-You can further filter the plugin catalog's results for data sources provided by the Grafana community, Grafana Labs, and partners.
-If you use [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}), you can also filter by Enterprise-supported plugins.
-
-For more documentation on a specific data source plugin's features, including its query language and editor, refer to its plugin catalog page.
-
-### Create a data source plugin
-
-To build your own data source plugin, refer to the ["Build a data source plugin"](/developers/plugin-tools/tutorials/build-a-data-source-plugin) tutorial and our documentation about [building a plugin](/developers/plugin-tools).
diff --git a/docs/sources/administration/data-source-management/teamlbac/_index.md b/docs/sources/administration/data-source-management/teamlbac/_index.md
new file mode 100644
index 0000000000000..1d87bdbb06d3d
--- /dev/null
+++ b/docs/sources/administration/data-source-management/teamlbac/_index.md
@@ -0,0 +1,68 @@
+---
+description: Label based data access for Loki given Teams
+keywords:
+  - grafana
+  - loki
+  - lbac
+labels:
+  products:
+    - enterprise
+    - cloud
+title: Team LBAC
+weight: 100
+---
+
+# Team LBAC
+
+Team Label Based Access Control (LBAC) simplifies and streamlines data source access management based on team memberships.
+
+{{< admonition type="note" >}}
+Creating Team LBAC rules is available for preview for logs with Loki in Grafana Cloud.
+Report any unexpected behavior to the Grafana Support team.
+{{< /admonition >}}
+
+You can configure user access based upon team memberships using LogQL.
+Team LBAC controls access to logs depending on the rules set for each team.
+
+This feature addresses two common challenges faced by Grafana users:
+
+1. Having a high number of Grafana Cloud data sources.
+   Team LBAC lets Grafana administrators reduce the total number of data sources per instance from hundreds, to one.
+1. Using the same dashboard across multiple teams.
+   Team LBAC lets Grafana Teams use the same dashboard with different access control rules.
+
+To set up Team LBAC for a Loki data source, refer to [Configure Team LBAC](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/data-source-management/teamlbac/configure-teamlbac-for-loki/).
+
+## Limitations
+
+- If there are no Team LBAC rules for a user's team, that user can query all logs.
+- If an administrator is part of a team with Team LBAC rules, those rules are applied to the administrator requests.
+- Cloud Access Policies (CAP) LBAC rules override Team LBAC rules.
+  Cloud Access Policies are the access controls from Grafana Cloud.
+  If there are any CAP LBAC rules configured for the same data source, then only the CAP LBAC rules are applied.
+
+  You must remove any label selectors from your Cloud Access Policies to use Team LBAC.
+  For more information about CAP label selectors, refer to [Use label-based access control (LBAC) with access policies](https://grafana.com/docs/grafana-cloud/account-management/authentication-and-permissions/access-policies/label-access-policies/).
+
+## Data source permissions
+
+Data source permissions allow the users access to query the data source.
+Administrators set the permissions at the data source level.
+All the teams and users that are part of the data source inherit those permissions.
+
+## Recommended setup
+
+It's recommended that you create a single Loki data source for using Team LBAC rules so you have a clear separation of data sources using Team LBAC and those that aren't.
+All teams should have with only teams having `query` permission.
+You should create another Loki data source configured without Team LBAC for full access to the logs.
+
+## Team LBAC rules
+
+Grafana adds Team LBAC rules to the HTTP request via the Loki data source.
+
+If you configure multiple rules for a team, each rule is evaluated separately.
+Query results include lines that match any of the rules.
+
+Only users with data source `Admin` permissions can edit Team LBAC rules in the **Data source permissions** tab because changing LBAC rules requires the same access level as editing data source permissions.
+
+To set up Team LBAC for a Loki data source, refer to [Configure Team LBAC](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/data-source-management/teamlbac/configure-teamlbac-for-loki/).
diff --git a/docs/sources/administration/data-source-management/teamlbac/configure-teamlbac-for-loki/index.md b/docs/sources/administration/data-source-management/teamlbac/configure-teamlbac-for-loki/index.md
new file mode 100644
index 0000000000000..7a45e25805ac6
--- /dev/null
+++ b/docs/sources/administration/data-source-management/teamlbac/configure-teamlbac-for-loki/index.md
@@ -0,0 +1,45 @@
+---
+description: Configure Team LBAC for Loki data source on Grafana Cloud
+keywords:
+  - loki
+  - datasource
+  - team
+labels:
+  products:
+    - cloud
+title: Configure Team LBAC for Loki
+weight: 250
+---
+
+# Configure Team LBAC for Loki data source on Grafana Cloud
+
+Team LBAC is available in private preview on Grafana Cloud for Loki created with basic authentication. Loki datasources for Team LBAC can only be created, provisioning is currently not available.
+
+## Before you begin
+
+To be able to use Team LBAC rules, you need to enable the feature toggle `teamHttpHeaders` on your Grafana instance. Contact support to enable the feature toggle for you.
+
+- Be sure that you have the permission setup to create a loki tenant in Grafana Cloud
+- Be sure that you have admin data source permissions for Grafana.
+
+### Permissions
+
+We recommend that you remove all permissions for roles and teams that are not required to access the data source. This will help to ensure that only the required teams have access to the data source. The recommended permissions are `Admin` permission and only add the teams `Query` permissions that you want to add Team LBAC rules for.
+
+## Task 1: Configure Team LBAC for a new Loki data source
+
+1. Access Loki data sources details for your stack through grafana.com
+1. Copy Loki Details and Create a CAP
+   - Copy the details of your Loki setup.
+   - Create a Cloud Access Policy (CAP) for the Loki data source in grafana.com.
+   - Ensure the CAP includes `logs:read` permissions.
+   - Ensure the CAP does not include `labels` rules.
+1. Create a New Loki Data Source
+   - In Grafana, proceed to add a new data source and select Loki as the type.
+1. Navigate back to the Loki data source
+   - Set up the Loki data source using basic authentication. Use the userID as the username. Use the generated CAP token as the password.
+   - Save and connect.
+1. Navigate to Data Source Permissions
+   - Go to the permissions tab of the newly created Loki data source. Here, you'll find the Team LBAC rules section.
+
+For more information on how to setup Team LBAC rules for a Loki data source, [Add Team LBAC rules]({{< relref "./../create-teamlbac-rules/" >}}).
diff --git a/docs/sources/administration/data-source-management/teamlbac/create-teamlbac-rules/index.md b/docs/sources/administration/data-source-management/teamlbac/create-teamlbac-rules/index.md
new file mode 100644
index 0000000000000..f19fa06ec0f5c
--- /dev/null
+++ b/docs/sources/administration/data-source-management/teamlbac/create-teamlbac-rules/index.md
@@ -0,0 +1,125 @@
+---
+description: Learn how to create Team LBAC rules for the Loki data source.
+keywords:
+  - loki
+  - lbac
+  - team
+labels:
+  products:
+    - enterprise
+    - cloud
+title: Create Team LBAC rules for the Loki data source
+weight: 250
+---
+
+# Create Team LBAC rules for the Loki data source
+
+Team LBAC is available on Cloud for data sources created with basic authentication. Any managed Loki data source can **NOT** be configured with Team LBAC rules.
+
+## Before you begin
+
+- Be sure that you have admin data source permissions for Grafana.
+- Be sure that you have a team setup in Grafana.
+
+### Create a Team LBAC Rule for a team
+
+1. Navigate to your Loki datasource
+1. Navigate to the permissions tab
+   - Here, you'll find the Team LBAC rules section.
+1. Add a Team LBAC Rule
+   - Add a new rule for the team in the Team LBAC rules section.
+1. Define Label Selector for the Rule
+   - Add a label selector to the rule. Refer to Loki query documentation for guidance on the types of log selections you can specify.
+
+### LBAC rule
+
+A LBAC rule is a `logql` query that runs as a query to the loki instance for your logs. Each rule is it's own filtering operating independently from the other rules within a team. For example, you can create a label policy that includes all log lines with the label.
+
+One rule `{namespace="dev", cluster="us-west-0"}` created with multiple namespaces will be seen as `namespace="dev"` **AND** `cluster="us-west-0"`.
+Two rules `{namespace="dev"}`, `{cluster="us-west-0"}` created for a team will be seen as `namespace="dev"` **OR** `cluster="us-west-0"`.
+
+#### Best practices
+
+We recommend you only add `query` permissions for teams that should use the data source and only `Admin` have `Admin` permissions.
+
+We recommend for a first setup, setting up as few rules as possible for each team and make them additive for simplicity.
+
+For validating the rules, we recommend testing the rules in the Loki Explore view. This will allow you to see the logs that would be returned for the rule.
+
+#### Tasks
+
+### Task 1: One rule setup for each team
+
+One common use case for creating an LBAC policy is to have specific access to logs that have a specific label. For example, you can create a label policy that includes all log lines with the label.
+
+We have two teams, Team A and Team B with `Query` permissions. Loki access is setup with `Admin` roles to have `Admin` permission only.
+
+- Team A has a rule `namespace="dev"`.
+
+- Team B has a rule `namespace="prod"`.
+
+A user that is part of Team A will have access to logs that match `namespace="dev"`.
+
+A user that is part of Team B will have access to logs that match `namespace="prod"`.
+
+A user that is part of Team A and Team B will have access to logs that match `namespace="dev"` OR `namespace="prod"`.
+
+### Task 2: One rule setup for a team Exclude a label
+
+One common use case for creating an LBAC policy is to exclude logs that have a specific label. For example, you can create a label policy that excludes all log lines with the label secret=true by adding a selector with `secret!="true"` when you create an access policy:
+
+We have one team, Team A `Query` permissions. Loki access is setup with `Admin` roles to have `Admin` permission only.
+
+- Team A has a rule `secret!="true"`.
+
+A user that is part of Team A will **NOT** have access to logs that match `secret!="true"`.
+
+### Task 3: Multiple rules setup for one team
+
+We have two teams, Team A and Team B with `Query` permissions. Loki access is setup with `Admin` roles having `Admin` permission.
+
+- Team A has rule `cluster="us-west-0", namespace=~"dev|prod"` configured.
+
+- Team B has rule `cluster="us-west-0", namespace="staging"` configured.
+
+A user that is only part of Team A will have access to logs that match `cluster="us-west-0" AND (namespace="dev" OR namespace="prod")`.
+
+A user that is only part of Team B will have access to logs that match `cluster="us-west-0" AND namespace="staging"`.
+
+A user in Team A has access to logs in cluster us-west-0 with namespaces `dev` and `prod`. A user in Team B has access to to everything in cluster us-west-0, except namespace prod. So basically, user who is member of both team A and team B has access to everything in cluster us-west-0.
+
+A user that is **not** part of any Team with `Editor/Viewer` role will not have access to query any logs.
+
+**Important**
+
+A `Admin` user that is part of a Team with will only have access to that teams logs
+
+A `Admin` user that is not part of any Team with `Admin` role will have access to all logs
+
+### Task 4: Rules that overlap
+
+We have two teams, Team A and Team B.
+
+- Team A has a rule `namespace="dev"`.
+
+- Team B has a rule `namespace!="dev"`.
+
+A user in Team A will have access to logs that match `namespace="dev"`.
+
+A user in Team B will have access to logs that match `namespace!="dev"`.
+
+> _NOTE:_ A user that is part of Team A and Team B will have access to all logs that match `namespace="dev"` `OR` `namespace!="dev"`.
+
+### Task 5: One rule setup for a Team
+
+We have two teams, Team A and Team B. Loki access is setup with `Editor`, `Viewer` roles to have `Query` permission.
+
+- Team A has a rule `namespace="dev"` configured.
+
+- Team B does not have a rule configured for it.
+
+A user that is part of Team A will have access to logs that match `namespace="dev"`.
+
+A user that is part of Team A and part of Team B will have access to logs that match `namespace="dev"`.
+
+A user that is not part of Team A and part of Team B, that is `Editor` or `Viewer` will have access to all logs (due to the query permission for the user).
diff --git a/docs/sources/administration/enterprise-licensing/_index.md b/docs/sources/administration/enterprise-licensing/_index.md
index 966e0889d7221..5d7930976844f 100644
--- a/docs/sources/administration/enterprise-licensing/_index.md
+++ b/docs/sources/administration/enterprise-licensing/_index.md
@@ -45,6 +45,16 @@ To download your Grafana Enterprise license:
 
 ### Step 2. Add your license to a Grafana instance
 
+You must install a Grafana Enterprise build to use the enterprise features, which you can [download](https://grafana.com/grafana/download?edition=enterprise).
+
+{{% admonition type="note" %}}
+
+If you already use Grafana OSS, you can replace it with the same version of Grafana Enterprise.
+Ensure that you back up the configuration and database before proceeding.
+For more information, refer to [Back up Grafana](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/back-up-grafana/).
+
+{{% /admonition %}}
+
 There is more than one way to add the license to a Grafana instance:
 
 #### Upload the license file via the Grafana server administrator page
@@ -52,7 +62,7 @@ There is more than one way to add the license to a Grafana instance:
 This is the preferred option for single instance installations of Grafana Enterprise.
 
 1. Sign in as a Grafana server administrator.
-1. Click **Administration > Stats and license** in the side navigation menu.
+1. Click **Administration > General > Stats and license** in the side navigation menu.
 1. Click **Upload a new token**.
 1. Select your license file, and upload it.
 
@@ -186,6 +196,13 @@ The active users limit is turned off immediately.
 
 Settings updates at runtime are not affected by an expired license.
 
+#### Email sharing
+
+External users can't access dashboards shared via email anymore.
+These dashboards are now private but you can make them public and accessible to everyone if you want to.
+
+Grafana keeps your sharing configurations and restores them after you update your license.
+
 ## Grafana Enterprise license restrictions
 
 When you become a Grafana Enterprise customer, you receive a license that governs your use of Grafana Enterprise.
@@ -207,6 +224,8 @@ To determine the number of active users:
 
 1. Click **Administration** in the side navigation menu.
 
+1. Click **General**.
+
 1. Click **Stats and license**.
 
 1. Review the utilization count on the **Utilization** panel.
diff --git a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-ecs/index.md b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-ecs/index.md
index 6f6a35e5eea38..fa06cd3aa0287 100644
--- a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-ecs/index.md
+++ b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-ecs/index.md
@@ -112,6 +112,6 @@ In this task you configure Grafana Enterprise to validate the license with AWS i
 ### Task 4: Start or restart Grafana
 
 1. To restart Grafana and activate your license, update the service running Grafana to use the latest revision of the task definition that you created.
-1. After you update the service, navigate to your Grafana instance, sign in with Grafana Admin credentials, and navigate to **Administration > Stats and license** to validate that your license is active.
+1. After you update the service, navigate to your Grafana instance, sign in with Grafana Admin credentials, and navigate to **Administration > General > Stats and license** to validate that your license is active.
 
 For more information about validating that your license is active, refer to [Grafana Enterprise license restrictions]({{< relref "../../#grafana-enterprise-license-restrictions" >}}).
diff --git a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-eks/index.md b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-eks/index.md
index a63c1af461d80..49060c0989db5 100644
--- a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-eks/index.md
+++ b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-eks/index.md
@@ -123,7 +123,7 @@ To restart Grafana on a Kubernetes cluster,
 
 1. Run the command `kubectl rollout restart deployment my-release`.
 
-1. After you update the service, navigate to your Grafana instance, sign in with Grafana Admin credentials, and navigate to **Administration > Stats and license** to validate that your license is active.
+1. After you update the service, navigate to your Grafana instance, sign in with Grafana Admin credentials, and navigate to **Administration > General > Stats and license** to validate that your license is active.
 
 For more information about restarting Grafana, refer to [Restart Grafana]({{< relref "../../../../setup-grafana/start-restart-grafana/" >}}).
 
diff --git a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/manage-license-in-aws-marketplace/index.md b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/manage-license-in-aws-marketplace/index.md
index 74a1152a1a312..56ba176742d14 100644
--- a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/manage-license-in-aws-marketplace/index.md
+++ b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/manage-license-in-aws-marketplace/index.md
@@ -36,7 +36,7 @@ You can use AWS Marketplace to make the following modifications to your Grafana
 
 1. Sign in to Grafana as a Server Administrator.
 
-1. Click **Administration** in the side navigation menu, and then **Stats and license**.
+1. Click **Administration** in the side navigation menu, **General**, and then **Stats and license**.
 
 1. In the **Token** section under **Enterprise License**, click **Renew token**.
 
diff --git a/docs/sources/administration/feature-toggles/index.md b/docs/sources/administration/feature-toggles/index.md
new file mode 100644
index 0000000000000..4257352637eda
--- /dev/null
+++ b/docs/sources/administration/feature-toggles/index.md
@@ -0,0 +1,55 @@
+---
+description: Learn how authorized users can manage feature toggles
+keywords:
+  - feature
+  - toggle
+labels:
+  products:
+    - enterprise
+    - oss
+title: Feature toggles
+weight: 900
+---
+
+# Feature toggles
+
+Grafana incorporates feature toggles which let you introduce new functionality safeguarded by control flags. This allows Grafana administrators the flexibility to determine the appropriate timing for enabling or disabling specific features.
+For detailed information about particular features and how they operate, refer to [Configure Feature Toggles](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/feature-toggles/).
+
+## Manage feature toggles
+
+In the **Administration** page, the **Feature Management** section enables authorized users to view and edit the various features that are active in their Grafana environment.
+Authorized users include administrators, and users with the [fixed roles]({{< relref "../roles-and-permissions/access-control#fixed-roles" >}}) `featuremgmt.read` and `featuremgmt.write`.
+
+There are different options for visibility and customization depending on the development stage of the feature.
+
+| Stage                | Visibility | Editable |
+| -------------------- | ---------- | -------- |
+| Experimental         | Hidden     | No       |
+| Private preview      | Hidden     | No       |
+| Public preview       | Visible\*  | No       |
+| General availability | Visible\*  | Yes\*    |
+| Deprecated           | Visible\*  | Yes\*    |
+
+{{< admonition type="note" >}}
+Options marked with an asterisk (\*) are defaults for the corresponding feature stage.
+Each feature toggle owner can override its default behavior.
+{{< /admonition >}}
+
+## Edit feature toggles
+
+You can only edit feature toggles if Grafana is configured with the proper feature management settings.
+For more information, refer to [Configure feature management](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/feature-toggles/#configure-feature-management).
+
+Altering the state of a toggle may require restarting your Grafana instance, which can take a few minutes.
+
+To edit a feature toggle, follow these steps:
+
+1. Sign in to Grafana as a server administrator or authorized user.
+1. In the primary menu, go to **Administration > General > Feature toggles**.
+1. Navigate to the list of feature toggles and select your feature state overrides.
+1. Click **Save changes** and wait for your Grafana instance to restart with the updated feature toggles.
+
+{{% admonition type="note" %}}
+Editing feature toggles with the feature toggle management page is available now in all tiers of [Grafana Cloud](/docs/grafana-cloud/).
+{{% /admonition %}}
diff --git a/docs/sources/administration/organization-management/index.md b/docs/sources/administration/organization-management/index.md
index 0d93b93e5d6c4..a332c8110dbab 100644
--- a/docs/sources/administration/organization-management/index.md
+++ b/docs/sources/administration/organization-management/index.md
@@ -59,7 +59,7 @@ Complete this task when you want to view a list of existing organizations.
 **To view a list of organizations:**
 
 1. Sign in to Grafana as a server administrator.
-1. Click **Administration** in the left-side menu, and then **Organizations**.
+1. Click **Administration** in the left-side menu, **General**, and then **Organizations**.
 
 ## Create an organization
 
@@ -72,7 +72,7 @@ Create an organization when you want to isolate dashboards and other resources f
 **To create an organization:**
 
 1. Sign in to Grafana as a server administrator.
-1. Click **Administration** in the left-side menu, and then **Organizations**.
+1. Click **Administration** in the left-side menu, **General**, and then **Organizations**.
 1. Click **+ New org**.
 1. Enter the name of the new organization and click **Create**.
 
@@ -100,7 +100,7 @@ Deleting the organization also deletes all teams and dashboards associated the o
 **To delete an organization:**
 
 1. Sign in to Grafana as a server administrator.
-1. Click **Administration** in the left-side menu, and then **Organizations**.
+1. Click **Administration** in the left-side menu, **General**, and then **Organizations**.
 1. Click the red **X** next to the organization that you want to delete.
 1. Click **Delete**.
 
@@ -115,6 +115,6 @@ Edit an organization when you want to change its name.
 **To edit an organization:**
 
 1. Sign in to Grafana as a server administrator.
-1. Click **Administration** in the left-side menu, and then **Organizations**.
+1. Click **Administration** in the left-side menu, **General**, and then **Organizations**.
 1. Click the organization you want to edit.
 1. Update the organization name and click **Update**.
diff --git a/docs/sources/administration/organization-preferences/index.md b/docs/sources/administration/organization-preferences/index.md
index 211deadfa1760..590370bf27f17 100644
--- a/docs/sources/administration/organization-preferences/index.md
+++ b/docs/sources/administration/organization-preferences/index.md
@@ -44,6 +44,7 @@ Grafana server administrators and organization administrators can change organiz
 Follow these instructions if you are a Grafana Server Admin.
 
 1. Click **Administration** in the left-side menu.
+1. Click **General**.
 1. Click **Organizations**.
 1. In the organization list, click the name of the organization that you want to change.
 1. In **Name**, enter the new organization name.
@@ -54,6 +55,7 @@ Follow these instructions if you are a Grafana Server Admin.
 If you are an Organization Admin, follow these steps:
 
 1. Click **Administration** in the left-side menu.
+1. Click **General**.
 1. Click **Default preferences**.
 1. In **Organization name**, enter the new name.
 1. Click **Update organization name**.
@@ -63,7 +65,7 @@ If you are an Organization Admin, follow these steps:
 Organization administrators and team administrators can change team names and email addresses.
 To change the team name or email, follow these steps:
 
-1. Click **Administration** in the left-side menu and select **Team**.
+1. Click **Administration** in the left-side menu, **Users and access**, and select **Team**.
 1. In the team list, click the name of the team that you want to change.
 1. Click the **Settings** tab.
 1. In the Team details section, you can edit the following:
@@ -112,6 +114,7 @@ To see what the current settings are, refer to [View server settings]({{< relref
 Organization administrators can change the UI theme for all users in an organization.
 
 1. Click **Administration** in the left-side menu.
+1. Click **General**.
 1. Click **Default preferences**.
 1. In the Preferences section, select the UI theme.
 1. Click **Save**.
@@ -120,7 +123,7 @@ Organization administrators can change the UI theme for all users in an organiza
 
 Organization and team administrators can change the UI theme for all users on a team.
 
-1. Click **Administration** in the left-side menu and select **Teams**.
+1. Click **Administration** in the left-side menu, **Users and access**, and select **Teams**.
 1. Click the team for which you want to change the UI theme.
 1. Click the **Settings** tab.
 1. In the Preferences section, select the UI theme.
@@ -149,6 +152,7 @@ Grafana server administrators can choose a default timezone for all users on the
 Organization administrators can choose a default timezone for their organization.
 
 1. Click **Administration** in the left-side menu.
+1. Click **General**.
 1. Click **Default preferences**.
 1. Click to select an option in the **Timezone** list. **Default** is either the browser local timezone or the timezone selected at a higher level.
 1. Click **Save**.
@@ -157,7 +161,7 @@ Organization administrators can choose a default timezone for their organization
 
 Organization administrators and team administrators can choose a default timezone for all users on a team.
 
-1. Click **Administration** in the left-side menu and select **Teams**.
+1. Click **Administration** in the left-side menu, **Users and access**, and select **Teams**.
 1. Click the team for which you want to change the timezone.
 1. Click the **Settings** tab.
 1. Click to select an option in the **Timezone** list. **Default** is either the browser local timezone or the timezone selected at a higher level.
@@ -184,7 +188,7 @@ Users with the Grafana Server Admin flag on their account or access to the confi
 #### [Optional] Convert an existing dashboard into a JSON file
 
 1. Navigate to the page of the dashboard you want to use as the home dashboard.
-1. Click the **Share dashboard** icon next to the dashboard title.
+1. Click the **Share** button at the top right of the screen.
 1. In the Export tab, click **Save to file**. Grafana converts the dashboard to a JSON file and saves it locally.
 
 #### Use a JSON file as the home dashboard
@@ -209,6 +213,7 @@ Organization administrators can choose a default home dashboard for their organi
 1. Navigate to the dashboard you want to set as the home dashboard.
 1. Click the star next to the dashboard title to mark the dashboard as a favorite if it is not already.
 1. Click **Administration** in the left-side menu.
+1. Click **General**.
 1. Click **Default preferences**.
 1. In the **Home Dashboard** field, select the dashboard that you want to use for your home dashboard. Options include all starred dashboards.
 1. Click **Save**.
@@ -219,7 +224,7 @@ Organization administrators and Team Admins can set a default home dashboard for
 
 1. Navigate to the dashboard you want to set as the home dashboard.
 1. Click the star next to the dashboard title to mark the dashboard as a favorite if it is not already.
-1. Click **Administration** in the left-side menu and select **Teams**.
+1. Click **Administration** in the left-side menu, **Users and access**, and select **Teams**.
 1. Click the team for which you want to change the home dashboard.
 1. Click the **Settings** tab.
 1. In the **Home Dashboard** field, select the dashboard that you want to use for your home dashboard. Options include all starred dashboards.
@@ -246,6 +251,7 @@ Grafana server administrators can change the default Grafana UI language for all
 Organization administrators can change the language for all users in an organization.
 
 1. Click **Administration** in the left-side menu.
+1. Click **General**.
 1. Click **Default preferences**.
 1. In the Preferences section, select an option in the **Language** dropdown.
 1. Click **Save**.
@@ -254,7 +260,7 @@ Organization administrators can change the language for all users in an organiza
 
 Organization and team administrators can set a default language for all users on a team.
 
-1. Click **Administration** in the left-side menu and select **Teams**.
+1. Click **Administration** in the left-side menu, **Users and access**, and select **Teams**.
 1. Click the team for which you want to change the language.
 1. Click the **Settings** tab.
 1. In the Preferences section, select an option in the **Language** dropdown.
diff --git a/docs/sources/administration/plugin-management/index.md b/docs/sources/administration/plugin-management/index.md
index bf84e299280d1..2fd0da044320b 100644
--- a/docs/sources/administration/plugin-management/index.md
+++ b/docs/sources/administration/plugin-management/index.md
@@ -85,13 +85,13 @@ Before following the steps below, make sure you are logged in as a Grafana admin
 
 <a id="#plugin-catalog-entry"></a>
 
-Administrators can find the Plugin catalog at **Administration > Plugins**.
+Administrators can find the Plugin catalog at **Administration > Plugins and data > Plugins**.
 
 ### Browse plugins
 
 To browse for available plugins:
 
-1. In Grafana, click **Administration > Plugins** in the side navigation menu to view installed plugins.
+1. In Grafana, click **Administration > Plugins and data > Plugins** in the side navigation menu to view installed plugins.
 1. Click the **All** filter to browse all available plugins.
 1. Click the **Data sources**, **Panels**, or **Applications** buttons to filter by plugin type.
 
@@ -99,7 +99,7 @@ To browse for available plugins:
 
 To install a plugin:
 
-1. In Grafana, click **Administration > Plugins** in the side navigation menu to view installed plugins.
+1. In Grafana, click **Administration > Plugins and data > Plugins** in the side navigation menu to view installed plugins.
 1. Click the **All** filter to browse all available plugins.
 1. Browse and find a plugin.
 1. Click on the plugin logo.
@@ -111,7 +111,7 @@ When the update is complete, you see a confirmation message that the installatio
 
 To update a plugin:
 
-1. In Grafana, click **Administration > Plugins** in the side navigation menu to view installed plugins.
+1. In Grafana, click **Administration > Plugins and data > Plugins** in the side navigation menu to view installed plugins.
 1. Click on the plugin logo.
 1. Click **Update**.
 
@@ -121,7 +121,7 @@ When the update is complete, you see a confirmation message that the update was
 
 To uninstall a plugin:
 
-1. In Grafana, click **Administration > Plugins** in the side navigation menu to view installed plugins.
+1. In Grafana, click **Administration > Plugins and data > Plugins** in the side navigation menu to view installed plugins.
 1. Click on the plugin logo.
 1. Click **Uninstall**.
 
diff --git a/docs/sources/administration/provisioning/index.md b/docs/sources/administration/provisioning/index.md
index 1de8c823454ab..0b6d76bc92cdf 100644
--- a/docs/sources/administration/provisioning/index.md
+++ b/docs/sources/administration/provisioning/index.md
@@ -15,7 +15,7 @@ weight: 600
 
 # Provision Grafana
 
-In previous versions of Grafana, you could only use the API for provisioning data sources and dashboards. But that required the service to be running before you started creating dashboards and you also needed to set up credentials for the HTTP API. In v5.0 we decided to improve this experience by adding a new active provisioning system that uses config files. This will make GitOps more natural as data sources and dashboards can be defined via files that can be version controlled. We hope to extend this system to later add support for users, orgs and alerts as well.
+In previous versions of Grafana, you could only use the API for provisioning data sources and dashboards. But that required the service to be running before you started creating dashboards and you also needed to set up credentials for the HTTP API. In v5.0 we decided to improve this experience by adding a new active provisioning system that uses config files. This will make GitOps more natural as data sources and dashboards can be defined via files that can be version controlled. We hope to extend this system to later add support for users and orgs as well.
 
 ## Config File
 
@@ -59,13 +59,14 @@ If you have a literal `$` in your value and want to avoid interpolation, `$$` ca
 
 Currently we do not provide any scripts/manifests for configuring Grafana. Rather than spending time learning and creating scripts/manifests for each tool, we think our time is better spent making Grafana easier to provision. Therefore, we heavily rely on the expertise of the community.
 
-| Tool      | Project                                                                                                        |
-| --------- | -------------------------------------------------------------------------------------------------------------- |
-| Puppet    | [https://forge.puppet.com/puppet/grafana](https://forge.puppet.com/puppet/grafana)                             |
-| Ansible   | [https://github.com/grafana/grafana-ansible-collection](https://github.com/grafana/grafana-ansible-collection) |
-| Chef      | [https://github.com/sous-chefs/chef-grafana](https://github.com/sous-chefs/chef-grafana)                       |
-| Saltstack | [https://github.com/salt-formulas/salt-formula-grafana](https://github.com/salt-formulas/salt-formula-grafana) |
-| Jsonnet   | [https://github.com/grafana/grafonnet-lib/](https://github.com/grafana/grafonnet-lib/)                         |
+| Tool      | Project                                                                                                                         |
+| --------- | ------------------------------------------------------------------------------------------------------------------------------- |
+| Puppet    | [https://forge.puppet.com/puppet/grafana](https://forge.puppet.com/puppet/grafana)                                              |
+| Ansible   | [https://github.com/grafana/grafana-ansible-collection](https://github.com/grafana/grafana-ansible-collection)                  |
+| Chef      | [https://github.com/sous-chefs/chef-grafana](https://github.com/sous-chefs/chef-grafana)                                        |
+| Saltstack | [https://github.com/salt-formulas/salt-formula-grafana](https://github.com/salt-formulas/salt-formula-grafana)                  |
+| Jsonnet   | [https://github.com/grafana/grafonnet-lib/](https://github.com/grafana/grafonnet-lib/)                                          |
+| NixOS     | [services.grafana.provision module](https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/monitoring/grafana.nix) |
 
 ## Data sources
 
@@ -156,6 +157,8 @@ datasources:
       password:
       # <string> Sets the basic authorization password.
       basicAuthPassword:
+    # <int> Sets the version. Used to compare versions when
+    # updating. Ignored when creating a new data source.
     version: 1
     # <bool> Allows users to edit data sources from the
     # Grafana UI.
@@ -416,82 +419,14 @@ providers:
 To provision dashboards to the root level, store them in the root of your `path`.
 {{% /admonition %}}
 
+{{< admonition type="note" >}}
+This feature doesn't currently allow you to create nested folder structures, that is, where you have folders within folders.
+{{< /admonition >}}
+
 ## Alerting
 
 For information on provisioning Grafana Alerting, refer to [Provision Grafana Alerting resources]({{< relref "../../alerting/set-up/provision-alerting-resources/"  >}}).
 
-## Alert Notification Channels
-
-{{% admonition type="note" %}}
-Alert Notification Channels are part of legacy alerting, which is deprecated and will be removed in Grafana 10. Use the Provision contact points section in [Create and manage alerting resources using file provisioning]({{< relref "../../alerting/set-up/provision-alerting-resources/file-provisioning" >}}).
-{{% /admonition %}}
-
-Alert Notification Channels can be provisioned by adding one or more YAML config files in the [`provisioning/notifiers`](/administration/configuration/#provisioning) directory.
-
-Each config file can contain the following top-level fields:
-
-- `notifiers`, a list of alert notifications that will be added or updated during start up. If the notification channel already exists, Grafana will update it to match the configuration file.
-- `delete_notifiers`, a list of alert notifications to be deleted before inserting/updating those in the `notifiers` list.
-
-Provisioning looks up alert notifications by uid, and will update any existing notification with the provided uid.
-
-By default, exporting a dashboard as JSON will use a sequential identifier to refer to alert notifications. The field `uid` can be optionally specified to specify a string identifier for the alert name.
-
-```json
-{
-  ...
-      "alert": {
-        ...,
-        "conditions": [...],
-        "frequency": "24h",
-        "noDataState": "ok",
-        "notifications": [
-           {"uid": "notifier1"},
-           {"uid": "notifier2"},
-        ]
-      }
-  ...
-}
-```
-
-### Example Alert Notification Channels Config File
-
-```yaml
-notifiers:
-  - name: notification-channel-1
-    type: slack
-    uid: notifier1
-    # either
-    org_id: 2
-    # or
-    org_name: Main Org.
-    is_default: true
-    send_reminder: true
-    frequency: 1h
-    disable_resolve_message: false
-    # See `Supported Settings` section for settings supported for each
-    # alert notification type.
-    settings:
-      recipient: 'XXX'
-      uploadImage: true
-      token: 'xoxb' # legacy setting since Grafana v7.2 (stored non-encrypted)
-      url: https://slack.com # legacy setting since Grafana v7.2 (stored non-encrypted)
-    # Secure settings that will be encrypted in the database (supported since Grafana v7.2). See `Supported Settings` section for secure settings supported for each notifier.
-    secure_settings:
-      token: 'xoxb'
-      url: https://slack.com
-
-delete_notifiers:
-  - name: notification-channel-1
-    uid: notifier1
-    # either
-    org_id: 2
-    # or
-    org_name: Main Org.
-  - name: notification-channel-2
-    # default org_id: 1
-```
-
 ### Supported Settings
 
 The following sections detail the supported settings and secure settings for each alert notification type. Secure settings are stored encrypted in the database and you add them to `secure_settings` in the YAML file instead of `settings`.
diff --git a/docs/sources/administration/recorded-queries/index.md b/docs/sources/administration/recorded-queries/index.md
index 6876d4dc90599..d61585f0da584 100644
--- a/docs/sources/administration/recorded-queries/index.md
+++ b/docs/sources/administration/recorded-queries/index.md
@@ -22,7 +22,7 @@ Recorded queries allow you to see trends over time by taking a snapshot of a dat
 For our plugins that do not return time series, it might be useful to plot historical data. For example, you might want to query ServiceNow to see a history of request response times but it can only return current point-in-time metrics.
 
 {{% admonition type="note" %}}
-Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}).
+Available in [Grafana Enterprise](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/introduction/grafana-enterprise/) and [Grafana Cloud](https://grafana.com/docs/grafana-cloud/).
 {{% /admonition %}}
 
 ## How recorded queries work
diff --git a/docs/sources/administration/roles-and-permissions/access-control/_index.md b/docs/sources/administration/roles-and-permissions/access-control/_index.md
index 0bf04902b5786..967f2f440adb7 100644
--- a/docs/sources/administration/roles-and-permissions/access-control/_index.md
+++ b/docs/sources/administration/roles-and-permissions/access-control/_index.md
@@ -28,7 +28,7 @@ RBAC provides a standardized way of granting, changing, and revoking access when
 ## About RBAC
 
 Role-based access control (RBAC) provides a standardized way of granting, changing, and revoking access so that users can view and modify Grafana resources, such as users and reports.
-RBAC extends Grafana basic roles that are included in Grafana OSS, and enables you more granular control of users’ actions.
+RBAC extends Grafana basic roles that are included in Grafana OSS, and enables more granular control of users’ actions.
 
 By using RBAC you can provide users with permissions that extend the permissions available with basic roles. For example, you can use RBAC to:
 
@@ -43,6 +43,8 @@ RBAC roles contain multiple permissions, each of which has an action and a scope
     - **Action:** `datasources:read`
     - **Scope:** `datasources:*`
 
+For information on the RBAC API refer to [RBAC API](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/developers/http_api/access_control/#rbac-api).
+
 ### Basic roles
 
 Basic roles are the standard roles that are available in Grafana OSS. If you have purchased a Grafana Enterprise license, you can still use basic roles.
@@ -78,6 +80,10 @@ For example, if you modify Viewer basic role and grant additional permission, Ed
 For more information about the permissions associated with each basic role, refer to [Basic role definitions]({{< relref "./rbac-fixed-basic-role-definitions/#basic-role-assignments" >}}).
 To interact with the API and view or modify basic roles permissions, refer to [the table]({{< relref "./manage-rbac-roles/#basic-role-uid-mapping" >}}) that maps basic role names to the associated UID.
 
+{{% admonition type="note" %}}
+You cannot use a service account to modify basic roles via the RBAC API. To update basic roles, you must be a Grafana administrator and use basic authentication with the request.
+{{% /admonition %}}
+
 ### Fixed roles
 
 Grafana Enterprise includes the ability for you to assign discrete fixed roles to users, teams, and service accounts. This gives you fine-grained control over user permissions than you would have with basic roles alone. These roles are called "fixed" because you cannot change or delete fixed roles. You can also create _custom_ roles of your own; see more information in the [custom roles section]({{< relref "#custom-roles" >}}) below.
@@ -90,8 +96,10 @@ Assign fixed roles when the basic roles do not meet your permission requirements
 - [Dashboards and folders]({{< relref "../../../dashboards/" >}})
 - [Data sources]({{< relref "../../../datasources/" >}})
 - [Explore]({{< relref "../../../explore/" >}})
+- [Feature Toggles]({{< relref "../../feature-toggles/" >}})
 - [Folders]({{< relref "../../../dashboards/manage-dashboards/#create-a-dashboard-folder" >}})
 - [LDAP]({{< relref "../../../setup-grafana/configure-security/configure-authentication/ldap/" >}})
+- [Library panels]({{< relref "../../../dashboards/build-dashboards/manage-library-panels" >}})
 - [Licenses]({{< relref "../../stats-and-license/" >}})
 - [Organizations]({{< relref "../../organization-management/" >}})
 - [Provisioning]({{< relref "../../provisioning/" >}})
diff --git a/docs/sources/administration/roles-and-permissions/access-control/assign-rbac-roles/index.md b/docs/sources/administration/roles-and-permissions/access-control/assign-rbac-roles/index.md
index a86cc311720be..5f442a00dfa60 100644
--- a/docs/sources/administration/roles-and-permissions/access-control/assign-rbac-roles/index.md
+++ b/docs/sources/administration/roles-and-permissions/access-control/assign-rbac-roles/index.md
@@ -54,14 +54,14 @@ In both cases, the assignment applies only to the user, team or service account
 
    For more information about switching organizations, refer to [Switch organizations]({{< relref "../../../user-management/user-preferences/_index.md#switch-organizations" >}}).
 
-3. In the left-side menu, click **Administration** and then **Users**, **Teams**, or **Service accounts**.
+3. In the left-side menu, click **Administration**, **Users and access**, and then **Users**, **Teams**, or **Service accounts**.
 4. In the **Role** column, select the fixed role that you want to assign to the user, team, or service account.
 5. Click **Update**.
 
 **To assign a fixed role as a server administrator:**
 
 1. Sign in to Grafana as a server administrator.
-1. Click **Administration** in the left-side menu, and then **Users**.
+1. Click **Administration** in the left-side menu, **Users and access**, and then **Users**.
 1. Click a user.
 1. In the Organizations section, click **Change role**.
 1. Select a role within an organization that you want to assign to the user.
diff --git a/docs/sources/administration/roles-and-permissions/access-control/configure-rbac/index.md b/docs/sources/administration/roles-and-permissions/access-control/configure-rbac/index.md
index ab8a5eaf47bf3..c5e22b1f79e5a 100644
--- a/docs/sources/administration/roles-and-permissions/access-control/configure-rbac/index.md
+++ b/docs/sources/administration/roles-and-permissions/access-control/configure-rbac/index.md
@@ -22,7 +22,7 @@ The table below describes all RBAC configuration options. Like any other Grafana
 | Setting                         | Required | Description                                                                                                                                                                                                                                                                                                                     | Default |
 | ------------------------------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
 | `permission_cache`              | No       | Enable to use in memory cache for loading and evaluating users' permissions.                                                                                                                                                                                                                                                    | `true`  |
-| `permission_validation_enabled` | No       | Grafana enforces validation for permissions when a user creates or updates a role. The system checks the internal list of scopes and actions for each permission to determine they are valid. By default, if a scope or action is not recognized, Grafana logs a warning message. When set to `true`, Grafana returns an error. | `false` |
+| `permission_validation_enabled` | No       | Grafana enforces validation for permissions when a user creates or updates a role. The system checks the internal list of scopes and actions for each permission to determine they are valid. By default, if a scope or action is not recognized, Grafana logs a warning message. When set to `true`, Grafana returns an error. | `true`  |
 | `reset_basic_roles`             | No       | Reset Grafana's basic roles' (Viewer, Editor, Admin, Grafana Admin) permissions to their default. Warning, if this configuration option is left to `true` this will be done on every reboot.                                                                                                                                    | `true`  |
 
 ## Example RBAC configuration
diff --git a/docs/sources/administration/roles-and-permissions/access-control/custom-role-actions-scopes/index.md b/docs/sources/administration/roles-and-permissions/access-control/custom-role-actions-scopes/index.md
index 9efe67b5fa5ba..3d2751e4009cd 100644
--- a/docs/sources/administration/roles-and-permissions/access-control/custom-role-actions-scopes/index.md
+++ b/docs/sources/administration/roles-and-permissions/access-control/custom-role-actions-scopes/index.md
@@ -29,136 +29,140 @@ To learn more about the Grafana resources to which you can apply RBAC, refer to
 
 The following list contains role-based access control actions.
 
-| Action                               | Applicable scope                                                                        | Description                                                                                                                                                                                                         |
-| ------------------------------------ | --------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `alert.instances.external:read`      | `datasources:*`<br>`datasources:uid:*`                                                  | Read alerts and silences in data sources that support alerting.                                                                                                                                                     |
-| `alert.instances.external:write`     | `datasources:*`<br>`datasources:uid:*`                                                  | Manage alerts and silences in data sources that support alerting.                                                                                                                                                   |
-| `alert.instances:create`             | n/a                                                                                     | Create silences in the current organization.                                                                                                                                                                        |
-| `alert.instances:read`               | n/a                                                                                     | Read alerts and silences in the current organization.                                                                                                                                                               |
-| `alert.instances:write`              | n/a                                                                                     | Update and expire silences in the current organization.                                                                                                                                                             |
-| `alert.notifications.external:read`  | `datasources:*`<br>`datasources:uid:*`                                                  | Read templates, contact points, notification policies, and mute timings in data sources that support alerting.                                                                                                      |
-| `alert.notifications.external:write` | `datasources:*`<br>`datasources:uid:*`                                                  | Manage templates, contact points, notification policies, and mute timings in data sources that support alerting.                                                                                                    |
-| `alert.notifications:write`          | n/a                                                                                     | Manage templates, contact points, notification policies, and mute timings in the current organization.                                                                                                              |
-| `alert.notifications:read`           | n/a                                                                                     | Read all templates, contact points, notification policies, and mute timings in the current organization.                                                                                                            |
-| `alert.rules.external:read`          | `datasources:*`<br>`datasources:uid:*`                                                  | Read alert rules in data sources that support alerting (Prometheus, Mimir, and Loki)                                                                                                                                |
-| `alert.rules.external:write`         | `datasources:*`<br>`datasources:uid:*`                                                  | Create, update, and delete alert rules in data sources that support alerting (Mimir and Loki).                                                                                                                      |
-| `alert.rules:create`                 | `folders:*`<br>`folders:uid:*`                                                          | Create Grafana alert rules in a folder and its subfolders. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query. |
-| `alert.rules:delete`                 | `folders:*`<br>`folders:uid:*`                                                          | Delete Grafana alert rules in a folder and its subfolders. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query. |
-| `alert.rules:read`                   | `folders:*`<br>`folders:uid:*`                                                          | Read Grafana alert rules in a folder and its subfolders. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query.   |
-| `alert.rules:write`                  | `folders:*`<br>`folders:uid:*`                                                          | Update Grafana alert rules in a folder and its subfolders. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query. |
-| `alert.provisioning:read`            | n/a                                                                                     | Read all Grafana alert rules, notification policies, etc via provisioning API. Permissions to folders and datasource are not required.                                                                              |
-| `alert.provisioning.secrets:read`    | n/a                                                                                     | Same as `alert.provisioning:read` plus ability to export resources with decrypted secrets.                                                                                                                          |
-| `alert.provisioning:write`           | n/a                                                                                     | Update all Grafana alert rules, notification policies, etc via provisioning API. Permissions to folders and datasource are not required.                                                                            |
-| `annotations:create`                 | `annotations:*`<br>`annotations:type:*`                                                 | Create annotations.                                                                                                                                                                                                 |
-| `annotations:delete`                 | `annotations:*`<br>`annotations:type:*`                                                 | Delete annotations.                                                                                                                                                                                                 |
-| `annotations:read`                   | `annotations:*`<br>`annotations:type:*`                                                 | Read annotations and annotation tags.                                                                                                                                                                               |
-| `annotations:write`                  | `annotations:*`<br>`annotations:type:*`                                                 | Update annotations.                                                                                                                                                                                                 |
-| `apikeys:create`                     | n/a                                                                                     | Create API keys.                                                                                                                                                                                                    |
-| `apikeys:read`                       | `apikeys:*`<br>`apikeys:id:*`                                                           | Read API keys.                                                                                                                                                                                                      |
-| `apikeys:delete`                     | `apikeys:*`<br>`apikeys:id:*`                                                           | Delete API keys.                                                                                                                                                                                                    |
-| `dashboards:create`                  | `folders:*`<br>`folders:uid:*`                                                          | Create dashboards in one or more folders and their subfolders.                                                                                                                                                      |
-| `dashboards:delete`                  | `dashboards:*`<br>`dashboards:uid:*`<br>`folders:*`<br>`folders:uid:*`                  | Delete one or more dashboards.                                                                                                                                                                                      |
-| `dashboards.insights:read`           | n/a                                                                                     | Read dashboard insights data and see presence indicators.                                                                                                                                                           |
-| `dashboards.permissions:read`        | `dashboards:*`<br>`dashboards:uid:*`<br>`folders:*`<br>`folders:uid:*`                  | Read permissions for one or more dashboards.                                                                                                                                                                        |
-| `dashboards.permissions:write`       | `dashboards:*`<br>`dashboards:uid:*`<br>`folders:*`<br>`folders:uid:*`                  | Update permissions for one or more dashboards.                                                                                                                                                                      |
-| `dashboards:read`                    | `dashboards:*`<br>`dashboards:uid:*`<br>`folders:*`<br>`folders:uid:*`                  | Read one or more dashboards.                                                                                                                                                                                        |
-| `dashboards:write`                   | `dashboards:*`<br>`dashboards:uid:*`<br>`folders:*`<br>`folders:uid:*`                  | Update one or more dashboards.                                                                                                                                                                                      |
-| `dashboards.public:write`            | `dashboards:*`<br>`dashboards:uid:*`                                                    | Write public dashboard configuration.                                                                                                                                                                               |
-| `datasources.caching:read`           | `datasources:*`<br>`datasources:uid:*`                                                  | Read data source query caching settings.                                                                                                                                                                            |
-| `datasources.caching:write`          | `datasources:*`<br>`datasources:uid:*`                                                  | Update data source query caching settings.                                                                                                                                                                          |
-| `datasources:create`                 | n/a                                                                                     | Create data sources.                                                                                                                                                                                                |
-| `datasources:delete`                 | `datasources:*`<br>`datasources:uid:*`                                                  | Delete data sources.                                                                                                                                                                                                |
-| `datasources:explore`                | n/a                                                                                     | Enable access to the **Explore** tab.                                                                                                                                                                               |
-| `datasources.id:read`                | `datasources:*`<br>`datasources:uid:*`                                                  | Read data source IDs.                                                                                                                                                                                               |
-| `datasources.insights:read`          | n/a                                                                                     | Read data sources insights data.                                                                                                                                                                                    |
-| `datasources.permissions:read`       | `datasources:*`<br>`datasources:uid:*`                                                  | List data source permissions.                                                                                                                                                                                       |
-| `datasources.permissions:write`      | `datasources:*`<br>`datasources:uid:*`                                                  | Update data source permissions.                                                                                                                                                                                     |
-| `datasources:query`                  | `datasources:*`<br>`datasources:uid:*`                                                  | Query data sources.                                                                                                                                                                                                 |
-| `datasources:read`                   | `datasources:*`<br>`datasources:uid:*`                                                  | List data sources.                                                                                                                                                                                                  |
-| `datasources:write`                  | `datasources:*`<br>`datasources:uid:*`                                                  | Update data sources.                                                                                                                                                                                                |
-| `featuremgmt.read`                   | n/a                                                                                     | Read feature toggles.                                                                                                                                                                                               |
-| `featuremgmt.write`                  | n/a                                                                                     | Write feature toggles.                                                                                                                                                                                              |
-| `folders.permissions:read`           | `folders:*`<br>`folders:uid:*`                                                          | Read permissions for one or more folders and their subfolders.                                                                                                                                                      |
-| `folders.permissions:write`          | `folders:*`<br>`folders:uid:*`                                                          | Update permissions for one or more folders and their subfolders.                                                                                                                                                    |
-| `folders:create`                     | n/a                                                                                     | Create folders in the root level. If granted together with `folders:write`, also allows creating subfolders under all folders that the user can update.                                                             |
-| `folders:delete`                     | `folders:*`<br>`folders:uid:*`                                                          | Delete one or more folders and their subfolders.                                                                                                                                                                    |
-| `folders:read`                       | `folders:*`<br>`folders:uid:*`                                                          | Read one or more folders and their subfolders.                                                                                                                                                                      |
-| `folders:write`                      | `folders:*`<br>`folders:uid:*`                                                          | Update one or more folders and their subfolders. If granted together with `folders:create` permission, also allows creating subfolders under these folders.                                                         |
-| `ldap.config:reload`                 | n/a                                                                                     | Reload the LDAP configuration.                                                                                                                                                                                      |
-| `ldap.status:read`                   | n/a                                                                                     | Verify the availability of the LDAP server or servers.                                                                                                                                                              |
-| `ldap.user:read`                     | n/a                                                                                     | Read users via LDAP.                                                                                                                                                                                                |
-| `ldap.user:sync`                     | n/a                                                                                     | Sync users via LDAP.                                                                                                                                                                                                |
-| `licensing.reports:read`             | n/a                                                                                     | Get custom permission reports.                                                                                                                                                                                      |
-| `licensing:delete`                   | n/a                                                                                     | Delete the license token.                                                                                                                                                                                           |
-| `licensing:read`                     | n/a                                                                                     | Read licensing information.                                                                                                                                                                                         |
-| `licensing:write`                    | n/a                                                                                     | Update the license token.                                                                                                                                                                                           |
-| `org.users:write`                    | `users:*` <br> `users:id:*`                                                             | Update the organization role (`Viewer`, `Editor`, or `Admin`) of a user.                                                                                                                                            |
-| `org.users:add`                      | `users:*` <br> `users:id:*`                                                             | Add a user to an organization or invite a new user to an organization.                                                                                                                                              |
-| `org.users:read`                     | `users:*` <br> `users:id:*`                                                             | Get user profiles within an organization.                                                                                                                                                                           |
-| `org.users:remove`                   | `users:*` <br> `users:id:*`                                                             | Remove a user from an organization.                                                                                                                                                                                 |
-| `orgs.preferences:read`              | n/a                                                                                     | Read organization preferences.                                                                                                                                                                                      |
-| `orgs.preferences:write`             | n/a                                                                                     | Update organization preferences.                                                                                                                                                                                    |
-| `orgs.quotas:read`                   | n/a                                                                                     | Read organization quotas.                                                                                                                                                                                           |
-| `orgs.quotas:write`                  | n/a                                                                                     | Update organization quotas.                                                                                                                                                                                         |
-| `orgs:create`                        | n/a                                                                                     | Create an organization.                                                                                                                                                                                             |
-| `orgs:delete`                        | n/a                                                                                     | Delete one or more organizations.                                                                                                                                                                                   |
-| `orgs:read`                          | n/a                                                                                     | Read one or more organizations.                                                                                                                                                                                     |
-| `orgs:write`                         | n/a                                                                                     | Update one or more organizations.                                                                                                                                                                                   |
-| `plugins.app:access`                 | `plugins:*` <br> `plugins:id:*`                                                         | Access one or more application plugins (still enforcing the organization role)                                                                                                                                      |
-| `plugins:install`                    | n/a                                                                                     | Install and uninstall plugins.                                                                                                                                                                                      |
-| `plugins:write`                      | `plugins:*` <br> `plugins:id:*`                                                         | Edit settings for one or more plugins.                                                                                                                                                                              |
-| `provisioning:reload`                | `provisioners:*`                                                                        | Reload provisioning files. To find the exact scope for specific provisioner, see [Scope definitions]({{< relref "#scope-definitions" >}}).                                                                          |
-| `reports:create`                     | n/a                                                                                     | Create reports.                                                                                                                                                                                                     |
-| `reports:write`                      | `reports:*` <br> `reports:id:*`                                                         | Update reports.                                                                                                                                                                                                     |
-| `reports.settings:read`              | n/a                                                                                     | Read report settings.                                                                                                                                                                                               |
-| `reports.settings:write`             | n/a                                                                                     | Update report settings.                                                                                                                                                                                             |
-| `reports:delete`                     | `reports:*` <br> `reports:id:*`                                                         | Delete reports.                                                                                                                                                                                                     |
-| `reports:read`                       | `reports:*` <br> `reports:id:*`                                                         | List all available reports or get a specific report.                                                                                                                                                                |
-| `reports:send`                       | `reports:*` <br> `reports:id:*`                                                         | Send a report email.                                                                                                                                                                                                |
-| `roles:delete`                       | `permissions:type:delegate`                                                             | Delete a custom role.                                                                                                                                                                                               |
-| `roles:read`                         | `roles:*` <br> `roles:uid:*`                                                            | List roles and read a specific with its permissions.                                                                                                                                                                |
-| `roles:write`                        | `permissions:type:delegate`                                                             | Create or update a custom role.                                                                                                                                                                                     |
-| `roles:write`                        | `permissions:type:escalate`                                                             | Reset basic roles to their default permissions.                                                                                                                                                                     |
-| `server.stats:read`                  | n/a                                                                                     | Read Grafana instance statistics.                                                                                                                                                                                   |
-| `server.usagestats.report:read`      | n/a                                                                                     | View usage statistics report.                                                                                                                                                                                       |
-| `serviceaccounts:write`              | `serviceaccounts:*`                                                                     | Create Grafana service accounts.                                                                                                                                                                                    |
-| `serviceaccounts:create`             | n/a                                                                                     | Update Grafana service accounts.                                                                                                                                                                                    |
-| `serviceaccounts:delete`             | `serviceaccounts:*` <br> `serviceaccounts:id:*`                                         | Delete Grafana service accounts.                                                                                                                                                                                    |
-| `serviceaccounts:read`               | `serviceaccounts:*` <br> `serviceaccounts:id:*`                                         | Read Grafana service accounts.                                                                                                                                                                                      |
-| `serviceaccounts.permissions:write`  | `serviceaccounts:*` <br> `serviceaccounts:id:*`                                         | Update Grafana service account permissions to control who can do what with the service account.                                                                                                                     |
-| `serviceaccounts.permissions:read`   | `serviceaccounts:*` <br> `serviceaccounts:id:*`                                         | Read Grafana service account permissions to see who can do what with the service account.                                                                                                                           |
-| `settings:read`                      | `settings:*`<br>`settings:auth.saml:*`<br>`settings:auth.saml:enabled` (property level) | Read the [Grafana configuration settings]({{< relref "../../../../setup-grafana/configure-grafana/" >}})                                                                                                            |
-| `settings:write`                     | `settings:*`<br>`settings:auth.saml:*`<br>`settings:auth.saml:enabled` (property level) | Update any Grafana configuration settings that can be [updated at runtime]({{< relref "../../../../setup-grafana/configure-grafana/settings-updates-at-runtime" >}}).                                               |
-| `support.bundles:create`             | n/a                                                                                     | Create support bundles.                                                                                                                                                                                             |
-| `support.bundles:delete`             | n/a                                                                                     | Delete support bundles.                                                                                                                                                                                             |
-| `support.bundles:read`               | n/a                                                                                     | List and download support bundles.                                                                                                                                                                                  |
-| `status:accesscontrol`               | `services:accesscontrol`                                                                | Get access-control enabled status.                                                                                                                                                                                  |
-| `teams.permissions:read`             | `teams:*`<br>`teams:id:*`                                                               | Read members and Team Sync setup for teams.                                                                                                                                                                         |
-| `teams.permissions:write`            | `teams:*`<br>`teams:id:*`                                                               | Add, remove and update members and manage Team Sync setup for teams.                                                                                                                                                |
-| `teams.roles:add`                    | `permissions:type:delegate`                                                             | Assign a role to a team.                                                                                                                                                                                            |
-| `teams.roles:read`                   | `teams:*`<br>`teams:id:*`                                                               | List roles assigned directly to a team.                                                                                                                                                                             |
-| `teams.roles:remove`                 | `permissions:type:delegate`                                                             | Unassign a role from a team.                                                                                                                                                                                        |
-| `teams:create`                       | n/a                                                                                     | Create teams.                                                                                                                                                                                                       |
-| `teams:delete`                       | `teams:*`<br>`teams:id:*`                                                               | Delete one or more teams.                                                                                                                                                                                           |
-| `teams:read`                         | `teams:*`<br>`teams:id:*`                                                               | Read one or more teams and team preferences.                                                                                                                                                                        |
-| `teams:write`                        | `teams:*`<br>`teams:id:*`                                                               | Update one or more teams and team preferences.                                                                                                                                                                      |
-| `users.authtoken:read`               | `global.users:*` <br> `global.users:id:*`                                               | List authentication tokens that are assigned to a user.                                                                                                                                                             |
-| `users.authtoken:write`              | `global.users:*` <br> `global.users:id:*`                                               | Update authentication tokens that are assigned to a user.                                                                                                                                                           |
-| `users.password:write`               | `global.users:*` <br> `global.users:id:*`                                               | Update a user’s password.                                                                                                                                                                                           |
-| `users.permissions:read`             | `users:*`                                                                               | List permissions of a user.                                                                                                                                                                                         |
-| `users.permissions:write`            | `global.users:*` <br> `global.users:id:*`                                               | Update a user’s organization-level permissions.                                                                                                                                                                     |
-| `users.quotas:read`                  | `global.users:*` <br> `global.users:id:*`                                               | List a user’s quotas.                                                                                                                                                                                               |
-| `users.quotas:write`                 | `global.users:*` <br> `global.users:id:*`                                               | Update a user’s quotas.                                                                                                                                                                                             |
-| `users.roles:add`                    | `permissions:type:delegate`                                                             | Assign a role to a user or a service account.                                                                                                                                                                       |
-| `users.roles:read`                   | `users:*`                                                                               | List roles assigned directly to a user or a service account.                                                                                                                                                        |
-| `users.roles:remove`                 | `permissions:type:delegate`                                                             | Unassign a role from a user or a service account.                                                                                                                                                                   |
-| `users:create`                       | n/a                                                                                     | Create a user.                                                                                                                                                                                                      |
-| `users:delete`                       | `global.users:*` <br> `global.users:id:*`                                               | Delete a user.                                                                                                                                                                                                      |
-| `users:disable`                      | `global.users:*` <br> `global.users:id:*`                                               | Disable a user.                                                                                                                                                                                                     |
-| `users:enable`                       | `global.users:*` <br> `global.users:id:*`                                               | Enable a user.                                                                                                                                                                                                      |
-| `users:logout`                       | `global.users:*` <br> `global.users:id:*`                                               | Sign out a user.                                                                                                                                                                                                    |
-| `users:read`                         | `global.users:*`                                                                        | Read or search user profiles.                                                                                                                                                                                       |
-| `users:write`                        | `global.users:*` <br> `global.users:id:*`                                               | Update a user’s profile.                                                                                                                                                                                            |
+| Action                               | Applicable scope                                                                        | Description                                                                                                                                                                                                               |
+| ------------------------------------ | --------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `alert.instances.external:read`      | `datasources:*`<br>`datasources:uid:*`                                                  | Read alerts and silences in data sources that support alerting.                                                                                                                                                           |
+| `alert.instances.external:write`     | `datasources:*`<br>`datasources:uid:*`                                                  | Manage alerts and silences in data sources that support alerting.                                                                                                                                                         |
+| `alert.instances:create`             | n/a                                                                                     | Create silences in the current organization.                                                                                                                                                                              |
+| `alert.instances:read`               | n/a                                                                                     | Read alerts and silences in the current organization.                                                                                                                                                                     |
+| `alert.instances:write`              | n/a                                                                                     | Update and expire silences in the current organization.                                                                                                                                                                   |
+| `alert.notifications.external:read`  | `datasources:*`<br>`datasources:uid:*`                                                  | Read templates, contact points, notification policies, and mute timings in data sources that support alerting.                                                                                                            |
+| `alert.notifications.external:write` | `datasources:*`<br>`datasources:uid:*`                                                  | Manage templates, contact points, notification policies, and mute timings in data sources that support alerting.                                                                                                          |
+| `alert.notifications:write`          | n/a                                                                                     | Manage templates, contact points, notification policies, and mute timings in the current organization.                                                                                                                    |
+| `alert.notifications:read`           | n/a                                                                                     | Read all templates, contact points, notification policies, and mute timings in the current organization.                                                                                                                  |
+| `alert.rules.external:read`          | `datasources:*`<br>`datasources:uid:*`                                                  | Read alert rules in data sources that support alerting (Prometheus, Mimir, and Loki)                                                                                                                                      |
+| `alert.rules.external:write`         | `datasources:*`<br>`datasources:uid:*`                                                  | Create, update, and delete alert rules in data sources that support alerting (Mimir and Loki).                                                                                                                            |
+| `alert.rules:create`                 | `folders:*`<br>`folders:uid:*`                                                          | Create Grafana alert rules in a folder and its subfolders. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query.       |
+| `alert.rules:delete`                 | `folders:*`<br>`folders:uid:*`                                                          | Delete Grafana alert rules in a folder and its subfolders. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query.       |
+| `alert.rules:read`                   | `folders:*`<br>`folders:uid:*`                                                          | Read Grafana alert rules in a folder and its subfolders. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query.         |
+| `alert.rules:write`                  | `folders:*`<br>`folders:uid:*`                                                          | Update Grafana alert rules in a folder and its subfolders. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query.       |
+| `alert.provisioning:read`            | n/a                                                                                     | Read all Grafana alert rules, notification policies, etc via provisioning API. Permissions to folders and datasource are not required.                                                                                    |
+| `alert.provisioning.secrets:read`    | n/a                                                                                     | Same as `alert.provisioning:read` plus ability to export resources with decrypted secrets.                                                                                                                                |
+| `alert.provisioning:write`           | n/a                                                                                     | Update all Grafana alert rules, notification policies, etc via provisioning API. Permissions to folders and datasource are not required.                                                                                  |
+| `annotations:create`                 | `annotations:*`<br>`annotations:type:*`                                                 | Create annotations.                                                                                                                                                                                                       |
+| `annotations:delete`                 | `annotations:*`<br>`annotations:type:*`                                                 | Delete annotations.                                                                                                                                                                                                       |
+| `annotations:read`                   | `annotations:*`<br>`annotations:type:*`                                                 | Read annotations and annotation tags.                                                                                                                                                                                     |
+| `annotations:write`                  | `annotations:*`<br>`annotations:type:*`                                                 | Update annotations.                                                                                                                                                                                                       |
+| `apikeys:create`                     | n/a                                                                                     | Create API keys.                                                                                                                                                                                                          |
+| `apikeys:read`                       | `apikeys:*`<br>`apikeys:id:*`                                                           | Read API keys.                                                                                                                                                                                                            |
+| `apikeys:delete`                     | `apikeys:*`<br>`apikeys:id:*`                                                           | Delete API keys.                                                                                                                                                                                                          |
+| `dashboards:create`                  | `folders:*`<br>`folders:uid:*`                                                          | Create dashboards in one or more folders and their subfolders.                                                                                                                                                            |
+| `dashboards:delete`                  | `dashboards:*`<br>`dashboards:uid:*`<br>`folders:*`<br>`folders:uid:*`                  | Delete one or more dashboards.                                                                                                                                                                                            |
+| `dashboards.insights:read`           | n/a                                                                                     | Read dashboard insights data and see presence indicators.                                                                                                                                                                 |
+| `dashboards.permissions:read`        | `dashboards:*`<br>`dashboards:uid:*`<br>`folders:*`<br>`folders:uid:*`                  | Read permissions for one or more dashboards.                                                                                                                                                                              |
+| `dashboards.permissions:write`       | `dashboards:*`<br>`dashboards:uid:*`<br>`folders:*`<br>`folders:uid:*`                  | Update permissions for one or more dashboards.                                                                                                                                                                            |
+| `dashboards:read`                    | `dashboards:*`<br>`dashboards:uid:*`<br>`folders:*`<br>`folders:uid:*`                  | Read one or more dashboards.                                                                                                                                                                                              |
+| `dashboards:write`                   | `dashboards:*`<br>`dashboards:uid:*`<br>`folders:*`<br>`folders:uid:*`                  | Update one or more dashboards.                                                                                                                                                                                            |
+| `dashboards.public:write`            | `dashboards:*`<br>`dashboards:uid:*`                                                    | Write public dashboard configuration.                                                                                                                                                                                     |
+| `datasources.caching:read`           | `datasources:*`<br>`datasources:uid:*`                                                  | Read data source query caching settings.                                                                                                                                                                                  |
+| `datasources.caching:write`          | `datasources:*`<br>`datasources:uid:*`                                                  | Update data source query caching settings.                                                                                                                                                                                |
+| `datasources:create`                 | n/a                                                                                     | Create data sources.                                                                                                                                                                                                      |
+| `datasources:delete`                 | `datasources:*`<br>`datasources:uid:*`                                                  | Delete data sources.                                                                                                                                                                                                      |
+| `datasources:explore`                | n/a                                                                                     | Enable access to the **Explore** tab.                                                                                                                                                                                     |
+| `datasources.id:read`                | `datasources:*`<br>`datasources:uid:*`                                                  | Read data source IDs.                                                                                                                                                                                                     |
+| `datasources.insights:read`          | n/a                                                                                     | Read data sources insights data.                                                                                                                                                                                          |
+| `datasources.permissions:read`       | `datasources:*`<br>`datasources:uid:*`                                                  | List data source permissions.                                                                                                                                                                                             |
+| `datasources.permissions:write`      | `datasources:*`<br>`datasources:uid:*`                                                  | Update data source permissions.                                                                                                                                                                                           |
+| `datasources:query`                  | `datasources:*`<br>`datasources:uid:*`                                                  | Query data sources.                                                                                                                                                                                                       |
+| `datasources:read`                   | `datasources:*`<br>`datasources:uid:*`                                                  | List data sources.                                                                                                                                                                                                        |
+| `datasources:write`                  | `datasources:*`<br>`datasources:uid:*`                                                  | Update data sources.                                                                                                                                                                                                      |
+| `featuremgmt.read`                   | n/a                                                                                     | Read feature toggles.                                                                                                                                                                                                     |
+| `featuremgmt.write`                  | n/a                                                                                     | Write feature toggles.                                                                                                                                                                                                    |
+| `folders.permissions:read`           | `folders:*`<br>`folders:uid:*`                                                          | Read permissions for one or more folders and their subfolders.                                                                                                                                                            |
+| `folders.permissions:write`          | `folders:*`<br>`folders:uid:*`                                                          | Update permissions for one or more folders and their subfolders.                                                                                                                                                          |
+| `folders:create`                     | n/a                                                                                     | Create folders in the root level. If granted together with `folders:write`, also allows creating subfolders under all folders that the user can update.                                                                   |
+| `folders:delete`                     | `folders:*`<br>`folders:uid:*`                                                          | Delete one or more folders and their subfolders.                                                                                                                                                                          |
+| `folders:read`                       | `folders:*`<br>`folders:uid:*`                                                          | Read one or more folders and their subfolders.                                                                                                                                                                            |
+| `folders:write`                      | `folders:*`<br>`folders:uid:*`                                                          | Update one or more folders and their subfolders. If granted together with `folders:create` permission, also allows creating subfolders under these folders.                                                               |
+| `ldap.config:reload`                 | n/a                                                                                     | Reload the LDAP configuration.                                                                                                                                                                                            |
+| `ldap.status:read`                   | n/a                                                                                     | Verify the availability of the LDAP server or servers.                                                                                                                                                                    |
+| `ldap.user:read`                     | n/a                                                                                     | Read users via LDAP.                                                                                                                                                                                                      |
+| `ldap.user:sync`                     | n/a                                                                                     | Sync users via LDAP.                                                                                                                                                                                                      |
+| `library.panels:create`              | `folders:*` <br> `folders:uid:*`                                                        | Create a library panel in one or more folders and their subfolders.                                                                                                                                                       |
+| `library.panels:read`                | `folders:*` <br> `folders:uid:*` <br> `library.panels:*` <br> `library.panels:uid:*`    | Read one or more library panels.                                                                                                                                                                                          |
+| `library.panels:write`               | `folders:*` <br> `folders:uid:*` <br> `library.panels:*` <br> `library.panels:uid:*`    | Update one or more library panels.                                                                                                                                                                                        |
+| `library.panels:delete`              | `folders:*` <br> `folders:uid:*` <br> `library.panels:*` <br> `library.panels:uid:*`    | Delete one or more library panels.                                                                                                                                                                                        |
+| `licensing.reports:read`             | n/a                                                                                     | Get custom permission reports.                                                                                                                                                                                            |
+| `licensing:delete`                   | n/a                                                                                     | Delete the license token.                                                                                                                                                                                                 |
+| `licensing:read`                     | n/a                                                                                     | Read licensing information.                                                                                                                                                                                               |
+| `licensing:write`                    | n/a                                                                                     | Update the license token.                                                                                                                                                                                                 |
+| `org.users:write`                    | `users:*` <br> `users:id:*`                                                             | Update the organization role (`Viewer`, `Editor`, or `Admin`) of a user.                                                                                                                                                  |
+| `org.users:add`                      | `users:*` <br> `users:id:*`                                                             | Add a user to an organization or invite a new user to an organization.                                                                                                                                                    |
+| `org.users:read`                     | `users:*` <br> `users:id:*`                                                             | Get user profiles within an organization.                                                                                                                                                                                 |
+| `org.users:remove`                   | `users:*` <br> `users:id:*`                                                             | Remove a user from an organization.                                                                                                                                                                                       |
+| `orgs.preferences:read`              | n/a                                                                                     | Read organization preferences.                                                                                                                                                                                            |
+| `orgs.preferences:write`             | n/a                                                                                     | Update organization preferences.                                                                                                                                                                                          |
+| `orgs.quotas:read`                   | n/a                                                                                     | Read organization quotas.                                                                                                                                                                                                 |
+| `orgs.quotas:write`                  | n/a                                                                                     | Update organization quotas.                                                                                                                                                                                               |
+| `orgs:create`                        | n/a                                                                                     | Create an organization.                                                                                                                                                                                                   |
+| `orgs:delete`                        | n/a                                                                                     | Delete one or more organizations.                                                                                                                                                                                         |
+| `orgs:read`                          | n/a                                                                                     | Read one or more organizations.                                                                                                                                                                                           |
+| `orgs:write`                         | n/a                                                                                     | Update one or more organizations.                                                                                                                                                                                         |
+| `plugins.app:access`                 | `plugins:*` <br> `plugins:id:*`                                                         | Access one or more application plugins (still enforcing the organization role)                                                                                                                                            |
+| `plugins:install`                    | n/a                                                                                     | Install and uninstall plugins.                                                                                                                                                                                            |
+| `plugins:write`                      | `plugins:*` <br> `plugins:id:*`                                                         | Edit settings for one or more plugins.                                                                                                                                                                                    |
+| `provisioning:reload`                | `provisioners:*`                                                                        | Reload provisioning files. To find the exact scope for specific provisioner, see [Scope definitions]({{< relref "#scope-definitions" >}}).                                                                                |
+| `reports:create`                     | n/a                                                                                     | Create reports.                                                                                                                                                                                                           |
+| `reports:write`                      | `reports:*` <br> `reports:id:*`                                                         | Update reports.                                                                                                                                                                                                           |
+| `reports.settings:read`              | n/a                                                                                     | Read report settings.                                                                                                                                                                                                     |
+| `reports.settings:write`             | n/a                                                                                     | Update report settings.                                                                                                                                                                                                   |
+| `reports:delete`                     | `reports:*` <br> `reports:id:*`                                                         | Delete reports.                                                                                                                                                                                                           |
+| `reports:read`                       | `reports:*` <br> `reports:id:*`                                                         | List all available reports or get a specific report.                                                                                                                                                                      |
+| `reports:send`                       | `reports:*` <br> `reports:id:*`                                                         | Send a report email.                                                                                                                                                                                                      |
+| `roles:delete`                       | `permissions:type:delegate`                                                             | Delete a custom role.                                                                                                                                                                                                     |
+| `roles:read`                         | `roles:*` <br> `roles:uid:*`                                                            | List roles and read a specific role with its permissions.                                                                                                                                                                 |
+| `roles:write`                        | `permissions:type:delegate`                                                             | Create or update a custom role.                                                                                                                                                                                           |
+| `roles:write`                        | `permissions:type:escalate`                                                             | Reset basic roles to their default permissions.                                                                                                                                                                           |
+| `server.stats:read`                  | n/a                                                                                     | Read Grafana instance statistics.                                                                                                                                                                                         |
+| `server.usagestats.report:read`      | n/a                                                                                     | View usage statistics report.                                                                                                                                                                                             |
+| `serviceaccounts:write`              | `serviceaccounts:*`                                                                     | Create Grafana service accounts.                                                                                                                                                                                          |
+| `serviceaccounts:create`             | n/a                                                                                     | Update Grafana service accounts.                                                                                                                                                                                          |
+| `serviceaccounts:delete`             | `serviceaccounts:*` <br> `serviceaccounts:id:*`                                         | Delete Grafana service accounts.                                                                                                                                                                                          |
+| `serviceaccounts:read`               | `serviceaccounts:*` <br> `serviceaccounts:id:*`                                         | Read Grafana service accounts.                                                                                                                                                                                            |
+| `serviceaccounts.permissions:write`  | `serviceaccounts:*` <br> `serviceaccounts:id:*`                                         | Update Grafana service account permissions to control who can do what with the service account.                                                                                                                           |
+| `serviceaccounts.permissions:read`   | `serviceaccounts:*` <br> `serviceaccounts:id:*`                                         | Read Grafana service account permissions to see who can do what with the service account.                                                                                                                                 |
+| `settings:read`                      | `settings:*`<br>`settings:auth.saml:*`<br>`settings:auth.saml:enabled` (property level) | Read the [Grafana configuration settings]({{< relref "../../../../setup-grafana/configure-grafana/" >}})                                                                                                                  |
+| `settings:write`                     | `settings:*`<br>`settings:auth.saml:*`<br>`settings:auth.saml:enabled` (property level) | Update any Grafana configuration settings that can be [updated at runtime]({{< relref "../../../../setup-grafana/configure-grafana/settings-updates-at-runtime" >}}).                                                     |
+| `support.bundles:create`             | n/a                                                                                     | Create support bundles.                                                                                                                                                                                                   |
+| `support.bundles:delete`             | n/a                                                                                     | Delete support bundles.                                                                                                                                                                                                   |
+| `support.bundles:read`               | n/a                                                                                     | List and download support bundles.                                                                                                                                                                                        |
+| `status:accesscontrol`               | `services:accesscontrol`                                                                | Get access-control enabled status.                                                                                                                                                                                        |
+| `teams.permissions:read`             | `teams:*`<br>`teams:id:*`                                                               | Read members and Team Sync setup for teams.                                                                                                                                                                               |
+| `teams.permissions:write`            | `teams:*`<br>`teams:id:*`                                                               | Add, remove and update members and manage Team Sync setup for teams.                                                                                                                                                      |
+| `teams.roles:add`                    | `permissions:type:delegate`                                                             | Assign a role to a team.                                                                                                                                                                                                  |
+| `teams.roles:read`                   | `teams:*`<br>`teams:id:*`                                                               | List roles assigned directly to a team.                                                                                                                                                                                   |
+| `teams.roles:remove`                 | `permissions:type:delegate`                                                             | Unassign a role from a team.                                                                                                                                                                                              |
+| `teams:create`                       | n/a                                                                                     | Create teams.                                                                                                                                                                                                             |
+| `teams:delete`                       | `teams:*`<br>`teams:id:*`                                                               | Delete one or more teams.                                                                                                                                                                                                 |
+| `teams:read`                         | `teams:*`<br>`teams:id:*`                                                               | Read one or more teams and team preferences. To list teams through the UI one of the following permissions is required in addition to `teams:read`: `teams:write`, `teams.permissions:read` or `teams.permissions:write`. |
+| `teams:write`                        | `teams:*`<br>`teams:id:*`                                                               | Update one or more teams and team preferences.                                                                                                                                                                            |
+| `users.authtoken:read`               | `global.users:*` <br> `global.users:id:*`                                               | List authentication tokens that are assigned to a user.                                                                                                                                                                   |
+| `users.authtoken:write`              | `global.users:*` <br> `global.users:id:*`                                               | Update authentication tokens that are assigned to a user.                                                                                                                                                                 |
+| `users.password:write`               | `global.users:*` <br> `global.users:id:*`                                               | Update a user’s password.                                                                                                                                                                                                 |
+| `users.permissions:read`             | `users:*`                                                                               | List permissions of a user.                                                                                                                                                                                               |
+| `users.permissions:write`            | `global.users:*` <br> `global.users:id:*`                                               | Update a user’s organization-level permissions.                                                                                                                                                                           |
+| `users.quotas:read`                  | `global.users:*` <br> `global.users:id:*`                                               | List a user’s quotas.                                                                                                                                                                                                     |
+| `users.quotas:write`                 | `global.users:*` <br> `global.users:id:*`                                               | Update a user’s quotas.                                                                                                                                                                                                   |
+| `users.roles:add`                    | `permissions:type:delegate`                                                             | Assign a role to a user or a service account.                                                                                                                                                                             |
+| `users.roles:read`                   | `users:*`                                                                               | List roles assigned directly to a user or a service account.                                                                                                                                                              |
+| `users.roles:remove`                 | `permissions:type:delegate`                                                             | Unassign a role from a user or a service account.                                                                                                                                                                         |
+| `users:create`                       | n/a                                                                                     | Create a user.                                                                                                                                                                                                            |
+| `users:delete`                       | `global.users:*` <br> `global.users:id:*`                                               | Delete a user.                                                                                                                                                                                                            |
+| `users:disable`                      | `global.users:*` <br> `global.users:id:*`                                               | Disable a user.                                                                                                                                                                                                           |
+| `users:enable`                       | `global.users:*` <br> `global.users:id:*`                                               | Enable a user.                                                                                                                                                                                                            |
+| `users:logout`                       | `global.users:*` <br> `global.users:id:*`                                               | Sign out a user.                                                                                                                                                                                                          |
+| `users:read`                         | `global.users:*`                                                                        | Read or search user profiles.                                                                                                                                                                                             |
+| `users:write`                        | `global.users:*` <br> `global.users:id:*`                                               | Update a user’s profile.                                                                                                                                                                                                  |
 
 ### Grafana OnCall action definitions (beta)
 
@@ -209,6 +213,7 @@ The following list contains role-based access control scopes.
 | `datasources:*`<br>`datasources:uid:*`          | Restrict an action to a set of data sources. For example, `datasources:*` matches any data source, and `datasources:uid:1` matches the data source whose UID is `1`.                                                                               |
 | `folders:*`<br>`folders:uid:*`                  | Restrict an action to a set of folders. For example, `folders:*` matches any folder, and `folders:uid:1` matches the folder whose UID is `1`. Note that permissions granted to a folder cascade down to subfolders located under it                |
 | `global.users:*` <br> `global.users:id:*`       | Restrict an action to a set of global users. For example, `global.users:*` matches any user and `global.users:id:1` matches the user whose ID is `1`.                                                                                              |
+| `library.panels:*` <br> `library.panels:uid:*`  | Restrict an action to a set of library panels. For example, `library.panels:*` matches any library panel, and `library.panel:uid:1` matches the library panel whose UID is `1`.                                                                    |
 | `orgs:*` <br> `orgs:id:*`                       | Restrict an action to a set of organizations. For example, `orgs:*` matches any organization and `orgs:id:1` matches the organization whose ID is `1`.                                                                                             |
 | `permissions:type:delegate`                     | The scope is only applicable for roles associated with the Access Control itself and indicates that you can delegate your permissions only, or a subset of it, by creating a new role or making an assignment.                                     |
 | `permissions:type:escalate`                     | The scope is required to trigger the reset of basic roles permissions. It indicates that users might acquire additional permissions they did not previously have.                                                                                  |
diff --git a/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md b/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md
index b6b79715c66b1..05d1235169ea5 100644
--- a/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md
+++ b/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md
@@ -23,13 +23,13 @@ The following tables list permissions associated with basic and fixed roles.
 
 ## Basic role assignments
 
-| Basic role    | Associated fixed roles                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | Description                                                                                                |
-| ------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
-| Grafana Admin | `fixed:roles:reader`<br>`fixed:roles:writer`<br>`fixed:users:reader`<br>`fixed:users:writer`<br>`fixed:org.users:reader`<br>`fixed:org.users:writer`<br>`fixed:ldap:reader`<br>`fixed:ldap:writer`<br>`fixed:stats:reader`<br>`fixed:settings:reader`<br>`fixed:settings:writer`<br>`fixed:provisioning:writer`<br>`fixed:organization:reader`<br>`fixed:organization:maintainer`<br>`fixed:licensing:reader`<br>`fixed:licensing:writer`<br>`fixed:datasources.caching:reader`<br>`fixed:datasources.caching:writer`<br>`fixed:dashboards.insights:reader`<br>`fixed:datasources.insights:reader`<br>`fixed:plugins:maintainer`<br>`fixed:authentication.config:writer`                                                                                                                                                                                                                                                          | Default [Grafana server administrator]({{< relref "../../#grafana-server-administrators" >}}) assignments. |
-| Admin         | `fixed:reports:reader`<br>`fixed:reports:writer`<br>`fixed:datasources:reader`<br>`fixed:datasources:writer`<br>`fixed:organization:writer`<br>`fixed:datasources.permissions:reader`<br>`fixed:datasources.permissions:writer`<br>`fixed:teams:writer`<br>`fixed:dashboards:reader`<br>`fixed:dashboards:writer`<br>`fixed:dashboards.permissions:reader`<br>`fixed:dashboards.permissions:writer`<br>`fixed:dashboards.public:writer`<br>`fixed:folders:reader`<br>`fixed:folders:writer`<br>`fixed:folders.permissions:reader`<br>`fixed:folders.permissions:writer`<br>`fixed:alerting:writer`<br>`fixed:apikeys:reader`<br>`fixed:apikeys:writer`<br>`fixed:alerting.provisioning.secrets:reader`<br>`fixed:alerting.provisioning:writer`<br>`fixed:datasources.caching:reader`<br>`fixed:datasources.caching:writer`<br>`fixed:dashboards.insights:reader`<br>`fixed:datasources.insights:reader`<br>`fixed:plugins:writer` | Default [Grafana organization administrator]({{< relref "../#basic-roles" >}}) assignments.                |
-| Editor        | `fixed:datasources:explorer`<br>`fixed:dashboards:creator`<br>`fixed:folders:creator`<br>`fixed:annotations:writer`<br>`fixed:teams:creator` if the `editors_can_admin` configuration flag is enabled<br>`fixed:alerting:writer`<br>`fixed:dashboards.insights:reader`<br>`fixed:datasources.insights:reader`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | Default [Editor]({{< relref "../#basic-roles" >}}) assignments.                                            |
-| Viewer        | `fixed:datasources:id:reader`<br>`fixed:organization:reader`<br>`fixed:annotations:reader`<br>`fixed:annotations.dashboard:writer`<br>`fixed:alerting:reader`<br>`fixed:plugins.app:reader`<br>`fixed:dashboards.insights:reader`<br>`fixed:datasources.insights:reader`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | Default [Viewer]({{< relref "../#basic-roles" >}}) assignments.                                            |
-| No Basic Role |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | Default [No Basic Role]({{< relref "../#basic-roles"  >}})                                                 |
+| Basic role    | Associated fixed roles                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | Description                                                                                                |
+| ------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
+| Grafana Admin | `fixed:roles:reader`<br>`fixed:roles:writer`<br>`fixed:users:reader`<br>`fixed:users:writer`<br>`fixed:org.users:reader`<br>`fixed:org.users:writer`<br>`fixed:ldap:reader`<br>`fixed:ldap:writer`<br>`fixed:stats:reader`<br>`fixed:settings:reader`<br>`fixed:settings:writer`<br>`fixed:provisioning:writer`<br>`fixed:organization:reader`<br>`fixed:organization:maintainer`<br>`fixed:licensing:reader`<br>`fixed:licensing:writer`<br>`fixed:datasources.caching:reader`<br>`fixed:datasources.caching:writer`<br>`fixed:dashboards.insights:reader`<br>`fixed:datasources.insights:reader`<br>`fixed:plugins:maintainer`<br>`fixed:authentication.config:writer`<br>`fixed:library.panels:creator`<br>`fixed:library.panels:reader`<br>`fixed:library.panels:general.reader`<br>`fixed:library.panels:writer`<br>`fixed:library.panels:general.writer`                                                                                                                                                                                                                                                          | Default [Grafana server administrator]({{< relref "../../#grafana-server-administrators" >}}) assignments. |
+| Admin         | `fixed:reports:reader`<br>`fixed:reports:writer`<br>`fixed:datasources:reader`<br>`fixed:datasources:writer`<br>`fixed:organization:writer`<br>`fixed:datasources.permissions:reader`<br>`fixed:datasources.permissions:writer`<br>`fixed:teams:writer`<br>`fixed:dashboards:reader`<br>`fixed:dashboards:writer`<br>`fixed:dashboards.permissions:reader`<br>`fixed:dashboards.permissions:writer`<br>`fixed:dashboards.public:writer`<br>`fixed:folders:reader`<br>`fixed:folders:writer`<br>`fixed:folders.permissions:reader`<br>`fixed:folders.permissions:writer`<br>`fixed:alerting:writer`<br>`fixed:apikeys:reader`<br>`fixed:apikeys:writer`<br>`fixed:alerting.provisioning.secrets:reader`<br>`fixed:alerting.provisioning:writer`<br>`fixed:datasources.caching:reader`<br>`fixed:datasources.caching:writer`<br>`fixed:dashboards.insights:reader`<br>`fixed:datasources.insights:reader`<br>`fixed:plugins:writer`<br>`fixed:library.panels:creator`<br>`fixed:library.panels:reader`<br>`fixed:library.panels:general.reader`<br>`fixed:library.panels:writer`<br>`fixed:library.panels:general.writer` | Default [Grafana organization administrator]({{< relref "../#basic-roles" >}}) assignments.                |
+| Editor        | `fixed:datasources:explorer`<br>`fixed:dashboards:creator`<br>`fixed:folders:creator`<br>`fixed:annotations:writer`<br>`fixed:teams:creator` if the `editors_can_admin` configuration flag is enabled<br>`fixed:alerting:writer`<br>`fixed:dashboards.insights:reader`<br>`fixed:datasources.insights:reader`<br>`fixed:library.panels:creator`<br>`fixed:library.panels:general.reader`<br>`fixed:library.panels:general.writer`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | Default [Editor]({{< relref "../#basic-roles" >}}) assignments.                                            |
+| Viewer        | `fixed:datasources.id:reader`<br>`fixed:organization:reader`<br>`fixed:annotations:reader`<br>`fixed:annotations.dashboard:writer`<br>`fixed:alerting:reader`<br>`fixed:plugins.app:reader`<br>`fixed:dashboards.insights:reader`<br>`fixed:datasources.insights:reader`<br>`fixed:library.panels:general.reader`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | Default [Viewer]({{< relref "../#basic-roles" >}}) assignments.                                            |
+| No Basic Role |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Default [No Basic Role]({{< relref "../#basic-roles"  >}})                                                 |
 
 ## Fixed role definitions
 
@@ -61,7 +61,7 @@ The following tables list permissions associated with basic and fixed roles.
 | `fixed:datasources.caching:reader`           | `datasources.caching:read`                                                                                                                                                                                                                                           | Read data source query caching settings.                                                                                                                                                                                                                                              |
 | `fixed:datasources.caching:writer`           | `datasources.caching:read`<br>`datasources.caching:write`                                                                                                                                                                                                            | Enable, disable, or update query caching settings.                                                                                                                                                                                                                                    |
 | `fixed:datasources:explorer`                 | `datasources:explore`                                                                                                                                                                                                                                                | Enable the Explore feature. Data source permissions still apply, you can only query data sources for which you have query permissions.                                                                                                                                                |
-| `fixed:datasources:id:reader`                | `datasources.id:read`                                                                                                                                                                                                                                                | Read the ID of a data source based on its name.                                                                                                                                                                                                                                       |
+| `fixed:datasources.id:reader`                | `datasources.id:read`                                                                                                                                                                                                                                                | Read the ID of a data source based on its name.                                                                                                                                                                                                                                       |
 | `fixed:datasources.insights:reader`          | `datasources.insights:read`                                                                                                                                                                                                                                          | Read data source insights data.                                                                                                                                                                                                                                                       |
 | `fixed:datasources.permissions:reader`       | `datasources.permissions:read`                                                                                                                                                                                                                                       | Read data source permissions.                                                                                                                                                                                                                                                         |
 | `fixed:datasources.permissions:writer`       | All permissions from `fixed:datasources.permissions:reader` and <br>`datasources.permissions:write`                                                                                                                                                                  | Create, read, or delete permissions of a data source.                                                                                                                                                                                                                                 |
@@ -75,6 +75,11 @@ The following tables list permissions associated with basic and fixed roles.
 | `fixed:folders:writer`                       | All permissions from `fixed:dashboards:writer` and <br>`folders:read`<br>`folders:write`<br>`folders:create`<br>`folders:delete`<br>`folders.permissions:read`<br>`folders.permissions:write`                                                                        | Read, create, update, and delete all folders and dashboards. If granted together with `fixed:folders:creator`, allows creating subfolders under all folders.                                                                                                                          |
 | `fixed:ldap:reader`                          | `ldap.user:read`<br>`ldap.status:read`                                                                                                                                                                                                                               | Read the LDAP configuration and LDAP status information.                                                                                                                                                                                                                              |
 | `fixed:ldap:writer`                          | All permissions from `fixed:ldap:reader` and <br>`ldap.user:sync`<br>`ldap.config:reload`                                                                                                                                                                            | Read and update the LDAP configuration, and read LDAP status information.                                                                                                                                                                                                             |
+| `fixed:library.panels:creator`               | `library.panels:create`<br>`folders:read`                                                                                                                                                                                                                            | Create library panel at the root level.                                                                                                                                                                                                                                               |
+| `fixed:library.panels:reader`                | `library.panels:read`                                                                                                                                                                                                                                                | Read all library panels.                                                                                                                                                                                                                                                              |
+| `fixed:library.panels:general.reader`        | `library.panels:read`                                                                                                                                                                                                                                                | Read all library panels at the root level.                                                                                                                                                                                                                                            |
+| `fixed:library.panels:writer`                | All permissions from `fixed:library.panels:reader` plus<br>`library.panels:create`<br>`library.panels:delete`<br>`library.panels:write`                                                                                                                              | Create, read, write or delete all library panels and their permissions.                                                                                                                                                                                                               |
+| `fixed:library.panels:general.writer`        | All permissions from `fixed:library.panels:general.reader` plus<br>`library.panels:create`<br>`library.panels:delete`<br>`library.panels:write`                                                                                                                      | Create, read, write or delete all library panels and their permissions at the root level.                                                                                                                                                                                             |
 | `fixed:licensing:reader`                     | `licensing:read`<br>`licensing.reports:read`                                                                                                                                                                                                                         | Read licensing information and licensing reports.                                                                                                                                                                                                                                     |
 | `fixed:licensing:writer`                     | All permissions from `fixed:licensing:viewer` and <br>`licensing:write`<br>`licensing:delete`                                                                                                                                                                        | Read licensing information and licensing reports, update and delete the license token.                                                                                                                                                                                                |
 | `fixed:org.users:reader`                     | `org.users:read`                                                                                                                                                                                                                                                     | Read users within a single organization.                                                                                                                                                                                                                                              |
@@ -83,7 +88,7 @@ The following tables list permissions associated with basic and fixed roles.
 | `fixed:organization:reader`                  | `orgs:read`<br>`orgs.quotas:read`                                                                                                                                                                                                                                    | Read an organization and its quotas.                                                                                                                                                                                                                                                  |
 | `fixed:organization:writer`                  | All permissions from `fixed:organization:reader` and <br> `orgs:write`<br>`orgs.preferences:read`<br>`orgs.preferences:write`                                                                                                                                        | Read an organization, its quotas, or its preferences. Update organization properties, or its preferences.                                                                                                                                                                             |
 | `fixed:plugins.app:reader`                   | `plugins.app:access`                                                                                                                                                                                                                                                 | Access application plugins (still enforcing the organization role).                                                                                                                                                                                                                   |
-| `fixed:plugins:maintainer`                   | `plugins:install`                                                                                                                                                                                                                                                    | Install and uninstall plugins.                                                                                                                                                                                                                                                        |
+| `fixed:plugins:maintainer`                   | `plugins:install`                                                                                                                                                                                                                                                    | Install and uninstall plugins. Needs to be assigned globally.                                                                                                                                                                                                                         |
 | `fixed:plugins:writer`                       | `plugins:write`                                                                                                                                                                                                                                                      | Enable and disable plugins and edit plugins' settings.                                                                                                                                                                                                                                |
 | `fixed:provisioning:writer`                  | `provisioning:reload`                                                                                                                                                                                                                                                | Reload provisioning.                                                                                                                                                                                                                                                                  |
 | `fixed:reports:reader`                       | `reports:read`<br>`reports:send`<br>`reports.settings:read`                                                                                                                                                                                                          | Read all reports and shared report settings.                                                                                                                                                                                                                                          |
@@ -105,7 +110,7 @@ The following tables list permissions associated with basic and fixed roles.
 
 ### Alerting roles
 
-If alerting is [enabled]({{< relref "../../../../alerting/set-up/migrating-alerts" >}}), you can use predefined roles to manage user access to alert rules, alert instances, and alert notification settings and create custom roles to limit user access to alert rules in a folder.
+You can use predefined roles to manage user access to alert rules, alert instances, and alert notification settings and create custom roles to limit user access to alert rules in a folder.
 
 Access to Grafana alert rules is an intersection of many permissions:
 
@@ -128,37 +133,7 @@ You can enable feature toggles through configuration file or environment variabl
 {{% /admonition %}}
 
 If you are using [Grafana OnCall](https://grafana.com/docs/oncall/latest/get-started/), you can try out the integration between Grafana OnCall and RBAC.
-This will allow you to control access to different OnCall features using the following RBAC roles:
-
-| Fixed role                                                | Permissions                                                                                                                                                                                                                                                                                                                                                                                                                                                           | Description                                                                                                                       |
-| --------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
-| `plugins:grafana-oncall-app:reader`                       | `plugins.app:access`<br>`grafana-oncall-app.alert-groups:read`<br>`grafana-oncall-app.integrations:read`<br>`grafana-oncall-app.escalation-chains:read`<br>`grafana-oncall-app.schedules:read`<br>`grafana-oncall-app.chatops:read`<br>`grafana-oncall-app.outgoing-webhooks:read`<br>`grafana-oncall-app.maintenance:read`<br>`grafana-oncall-app.notification-settings:read`<br>`grafana-oncall-app.user-settings:read`<br>`grafana-oncall-app.other-settings:read` | Read everything in OnCall.                                                                                                        |
-| `plugins:grafana-oncall-app:oncaller`                     | All permissions from `plugins:grafana-oncall-app:reader` and `grafana-oncall-app.alert-groups:write`<br>`grafana-oncall-app.schedules:write`                                                                                                                                                                                                                                                                                                                          | Read everything in OnCall and edit alert groups and schedules.                                                                    |
-| `plugins:grafana-oncall-app:editor`                       | All permissions from `plugins:grafana-oncall-app:oncaller` and `grafana-oncall-app.notifications:read`<br>`grafana-oncall-app.integrations:test`<br>`grafana-oncall-app.schedules:export`<br>`grafana-oncall-app.chatops:write`<br>`grafana-oncall-app.maintenance:write`<br>`grafana-oncall-app.notification-settings:write`<br>`grafana-oncall-app.user-settings:write`                                                                                             | Read everything in OnCall and edit alert groups, schedules, ChatOps, maintenance, notification settings, and user's own settings. |
-| `plugins:grafana-oncall-app:admin`                        | All permissions from `plugins:grafana-oncall-app:editor` and `grafana-oncall-app.integrations:write`<br>`grafana-oncall-app.escalation-chains:write`<br>`grafana-oncall-app.chatops:update-settings:write`<br>`grafana-oncall-app.outgoing-webhooks:write`<br>`grafana-oncall-app.api-keys:write`<br>`grafana-oncall-app.user-settings:admin`<br>`grafana-oncall-app.other-settings:write`                                                                            | Read and edit everything in OnCall.                                                                                               |
-| `plugins:grafana-oncall-app:alert-groups-reader`          | `plugins.app:access`<br>`grafana-oncall-app.alert-groups:read`                                                                                                                                                                                                                                                                                                                                                                                                        | Read OnCall alert groups.                                                                                                         |
-| `plugins:grafana-oncall-app:alert-groups-editor`          | `plugins.app:access`<br>`grafana-oncall-app.alert-groups:read`<br>`grafana-oncall-app.alert-groups:write`                                                                                                                                                                                                                                                                                                                                                             | Create, read, update and delete OnCall alert groups.                                                                              |
-| `plugins:grafana-oncall-app:integrations-reader`          | `plugins.app:access`<br>`grafana-oncall-app.integrations:read`                                                                                                                                                                                                                                                                                                                                                                                                        | Read OnCall integrations.                                                                                                         |
-| `plugins:grafana-oncall-app:integrations-editor`          | `plugins.app:access`<br>`grafana-oncall-app.integrations:read`<br>`grafana-oncall-app.integrations:write`<br>`grafana-oncall-app.integrations:test`                                                                                                                                                                                                                                                                                                                   | Create, read, update and delete OnCall integrations.                                                                              |
-| `plugins:grafana-oncall-app:escalation-chains-reader`     | `plugins.app:access`<br>`grafana-oncall-app.escalation-chains:read`                                                                                                                                                                                                                                                                                                                                                                                                   | Read OnCall escalation chains.                                                                                                    |
-| `plugins:grafana-oncall-app:escalation-chains-editor`     | `plugins.app:access`<br>`grafana-oncall-app.escalation-chains:read`<br>`grafana-oncall-app.escalation-chains:write`                                                                                                                                                                                                                                                                                                                                                   | Create, read, update and delete OnCall escalation chains.                                                                         |
-| `plugins:grafana-oncall-app:schedules-reader`             | `plugins.app:access`<br>`grafana-oncall-app.schedules:read`                                                                                                                                                                                                                                                                                                                                                                                                           | Read OnCall schedules.                                                                                                            |
-| `plugins:grafana-oncall-app:schedules-editor`             | `plugins.app:access`<br>`grafana-oncall-app.schedules:read`<br>`grafana-oncall-app.schedules:write`<br>`grafana-oncall-app.schedules:export`                                                                                                                                                                                                                                                                                                                          | Create, read, update and delete OnCall schedules.                                                                                 |
-| `plugins:grafana-oncall-app:chatops-reader`               | `plugins.app:access`<br>`grafana-oncall-app.chatops:read`                                                                                                                                                                                                                                                                                                                                                                                                             | Read OnCall ChatOps.                                                                                                              |
-| `plugins:grafana-oncall-app:chatops-editor`               | `plugins.app:access`<br>`grafana-oncall-app.chatops:read`<br>`grafana-oncall-app.chatops:write`<br>`grafana-oncall-app.chatops:update-settings`                                                                                                                                                                                                                                                                                                                       | Read and update OnCall ChatOps.                                                                                                   |
-| `plugins:grafana-oncall-app:outgoing-webhooks-reader`     | `plugins.app:access`<br>`grafana-oncall-app.outgoing-webhooks:read`                                                                                                                                                                                                                                                                                                                                                                                                   | Read OnCall outgoing webhooks.                                                                                                    |
-| `plugins:grafana-oncall-app:outgoing-webhooks-editor`     | `plugins.app:access`<br>`grafana-oncall-app.outgoing-webhooks:read`<br>`grafana-oncall-app.outgoing-webhooks:write`                                                                                                                                                                                                                                                                                                                                                   | Create, read, update and delete OnCall outgoing webhooks.                                                                         |
-| `plugins:grafana-oncall-app:maintenance-reader`           | `plugins.app:access`<br>`grafana-oncall-app.maintenance:read`                                                                                                                                                                                                                                                                                                                                                                                                         | Read OnCall maintenance.                                                                                                          |
-| `plugins:grafana-oncall-app:maintenance-editor`           | `plugins.app:access`<br>`grafana-oncall-app.maintenance:read`<br>`grafana-oncall-app.maintenance:write`                                                                                                                                                                                                                                                                                                                                                               | Read and update OnCall maintenance.                                                                                               |
-| `plugins:grafana-oncall-app:api-keys-reader`              | `plugins.app:access`<br>`grafana-oncall-app.api-keys:read`                                                                                                                                                                                                                                                                                                                                                                                                            | Read OnCall API keys.                                                                                                             |
-| `plugins:grafana-oncall-app:api-keys-editor`              | `plugins.app:access`<br>`grafana-oncall-app.api-keys:read`<br>`grafana-oncall-app.api-keys:write`                                                                                                                                                                                                                                                                                                                                                                     | Create, read, update and delete OnCall API keys. Also grants access to be able to consume the OnCall API.                         |
-| `plugins:grafana-oncall-app:notification-settings-reader` | `plugins.app:access`<br>`grafana-oncall-app.notification-settings:read`                                                                                                                                                                                                                                                                                                                                                                                               | Read OnCall notification settings.                                                                                                |
-| `plugins:grafana-oncall-app:notification-settings-editor` | `plugins.app:access`<br>`grafana-oncall-app.notification-settings:read`<br>`grafana-oncall-app.notification-settings:write`                                                                                                                                                                                                                                                                                                                                           | Read and update OnCall notification settings.                                                                                     |
-| `plugins:grafana-oncall-app:user-settings-reader`         | `plugins.app:access`<br>`grafana-oncall-app.user-settings:read`                                                                                                                                                                                                                                                                                                                                                                                                       | Read user's own OnCall user settings.                                                                                             |
-| `plugins:grafana-oncall-app:user-settings-editor`         | `plugins.app:access`<br>`grafana-oncall-app.user-settings:read`<br>`grafana-oncall-app.user-settings:write`                                                                                                                                                                                                                                                                                                                                                           | Read and update user's own OnCall user settings.                                                                                  |
-| `plugins:grafana-oncall-app:user-settings-admin`          | `plugins.app:access`<br>`grafana-oncall-app.user-settings:read`<br>`grafana-oncall-app.user-settings:write`<br>`grafana-oncall-app.user-settings:admin`                                                                                                                                                                                                                                                                                                               | Read and update OnCall user settings for all users.                                                                               |
-| `plugins:grafana-oncall-app:settings-reader`              | `plugins.app:access`<br>`grafana-oncall-app.other-settings:read`                                                                                                                                                                                                                                                                                                                                                                                                      | Read OnCall settings.                                                                                                             |
-| `plugins:grafana-oncall-app:settings-editor`              | `plugins.app:access`<br>`grafana-oncall-app.other-settings:read`<br>`grafana-oncall-app.other-settings:write`                                                                                                                                                                                                                                                                                                                                                         | Read and update OnCall settings.                                                                                                  |
+For a detailed list of the available OnCall RBAC roles, refer to the table in [Available Grafana OnCall RBAC roles and granted actions](https://grafana.com/docs/oncall/latest/user-and-team-management/#available-grafana-oncall-rbac-roles--granted-actions).
 
 The following table lists the default RBAC OnCall role assignments to the basic roles:
 
diff --git a/docs/sources/administration/service-accounts/index.md b/docs/sources/administration/service-accounts/index.md
index 67d23b456ff66..4c3e71f63f3cf 100644
--- a/docs/sources/administration/service-accounts/index.md
+++ b/docs/sources/administration/service-accounts/index.md
@@ -22,7 +22,7 @@ weight: 800
 You can use a service account to run automated workloads in Grafana, such as dashboard provisioning, configuration, or report generation. Create service accounts and tokens to authenticate applications, such as Terraform, with the Grafana API.
 
 {{% admonition type="note" %}}
-Service accounts will eventually replace [API keys]({{< relref "../api-keys/" >}}) as the primary way to authenticate applications that interact with Grafana.
+Service accounts replace [API keys]({{< relref "../api-keys/" >}}) as the primary way to authenticate applications that interact with Grafana.
 {{% /admonition %}}
 
 A common use case for creating a service account is to perform operations on automated or triggered tasks. You can use service accounts to:
@@ -79,8 +79,9 @@ Note that the user who created a service account will also be able to read, upda
 ### To create a service account
 
 1. Sign in to Grafana and click **Administration** in the left-side menu.
+1. Click **Users and access**.
 1. Click **Service accounts**.
-1. Click **Add service account** .
+1. Click **Add service account**.
 1. Enter a **Display name**.
 1. The display name must be unique as it determines the ID associated with the service account.
    - We recommend that you use a consistent naming convention when you name service accounts. A consistent naming convention can help you scale and maintain service accounts in the future.
@@ -104,6 +105,7 @@ By default, service account tokens don't have an expiration date, meaning they w
 ### To add a token to a service account
 
 1. Sign in to Grafana and click **Administration** in the left-side menu.
+1. Click **Users and access**.
 1. Click **Service accounts**.
 1. Click the service account to which you want to add a token.
 1. Click **Add service account token**.
@@ -131,6 +133,7 @@ Since Grafana 10.2.0, the `No Basic Role` is available for organization users or
 ### To assign a role to a service account
 
 1. Sign in to Grafana and click **Administration** in the left-side menu.
+1. Click **Users and access**.
 1. Click **Service accounts**.
 1. Click the service account to which you want to assign a role. As an alternative, find the service account in the list view.
 1. Assign a role using the role picker to update.
@@ -154,6 +157,7 @@ You can assign on of the following permissions to a specific user or a team:
 ### To update team permissions for a service account
 
 1. Sign in to Grafana and click **Administration** in the left-side menu.
+1. Click **Users and access**.
 1. Click **Service accounts**.
 1. Click the service account for which you want to update team permissions a role.
 1. In the Permissions section at the bottom, click **Add permission**.
@@ -163,6 +167,7 @@ You can assign on of the following permissions to a specific user or a team:
 ### To update user permissions for a service account
 
 1. Sign in to Grafana and click **Administration** in the left-side menu.
+1. Click **Users and access**.
 1. Click **Service accounts**.
 1. Click the service account for which you want to update team permissions a role.
 1. In the Permissions section at the bottom, click **Add permission**.
diff --git a/docs/sources/administration/stats-and-license/index.md b/docs/sources/administration/stats-and-license/index.md
index 52255d2e0215a..1643fd505cf5e 100644
--- a/docs/sources/administration/stats-and-license/index.md
+++ b/docs/sources/administration/stats-and-license/index.md
@@ -34,7 +34,7 @@ If you are a Grafana server administrator, use the Settings tab to view the sett
 ### View server settings
 
 1. Log in to your Grafana server with an account that has the Grafana Admin flag set.
-1. Click **Administration** in the left-side menu, and then **Settings**.
+1. Click **Administration** in the left-side menu, **General**, and then **Settings**.
 
 ### Available settings
 
@@ -51,7 +51,7 @@ If you are a Grafana server admin, then you can view useful statistics about you
 ### View server stats
 
 1. Log in to your Grafana server with an account that has the Grafana Admin flag set.
-1. Click **Administration** in the left-side menu, and then **Stats and license**.
+1. Click **Administration** in the left-side menu, **General**, and then **Stats and license**.
 
 ### Available stats
 
diff --git a/docs/sources/administration/team-management/index.md b/docs/sources/administration/team-management/index.md
index 9ade42e25554e..747f55e1971bf 100644
--- a/docs/sources/administration/team-management/index.md
+++ b/docs/sources/administration/team-management/index.md
@@ -45,7 +45,7 @@ A user can belong to multiple teams.
 To create a team:
 
 1. Sign in to Grafana as an organization administrator or team administrator.
-1. Click **Administration** in the left-side menu and select **Teams**.
+1. Click **Administration** in the left-side menu, **Users and access**, and select **Teams**.
 1. Click **New Team**.
 1. Complete the fields and click **Create**.
 1. Click **Add member**.
@@ -59,7 +59,7 @@ Add a team member to an existing team whenever you want to provide access to tea
 To add a team member:
 
 1. Sign in to Grafana as an organization administrator.
-1. Click **Administration** in the left-side menu and select **Teams**.
+1. Click **Administration** in the left-side menu, **Users and access**, and select **Teams**.
 1. Click the name of the team to which you want to add members, and click **Add member**.
 1. Locate and select a user.
 1. Choose if you want to add the user as a team Member or an Admin.
@@ -72,7 +72,7 @@ Complete this task when you want to add or modify team member permissions.
 To grant team member permissions:
 
 1. Sign in to Grafana as an organization administrator or a team administrator.
-1. Click **Administration** in the left-side menu and select **Teams**.
+1. Click **Administration** in the left-side menu, **Users and access**, and select **Teams**.
 1. Click the name of the team for which you want to add or modify team member permissions.
 1. In the team member list, find and click the user that you want to change. You can use the search field to filter the list if necessary.
 1. In the Permission column, select the new user permission level.
@@ -84,7 +84,7 @@ You can remove a team member when you no longer want to apply team permissions t
 To remove a team member:
 
 1. Sign in to Grafana as an organization administrator or team administrator.
-1. Click **Administration** in the left-side menu and select **Teams**.
+1. Click **Administration** in the left-side menu, **Users and access**, and select **Teams**.
 1. Click a team from which you want to remove a user.
 1. Click the **X** next to the name of the user.
 
@@ -95,7 +95,7 @@ Delete a team when you no longer need it. This action permanently deletes the te
 To delete a team:
 
 1. Sign in to Grafana as an organization administrator.
-1. Click **Administration** in the left-side menu and select **Teams**.
+1. Click **Administration** in the left-side menu, **Users and access**, and select **Teams**.
 1. Click the **X** next to the name of the team.
 1. Click **Delete**.
 
@@ -106,7 +106,7 @@ See the complete list of teams in your Grafana organization.
 To view a list of teams:
 
 1. Sign in to Grafana as an organization administrator or a team administrator.
-1. Click **Administration** in the left-side menu and select **Teams**.
+1. Click **Administration** in the left-side menu, **Users and access**, and select **Teams**.
 
 The role you use to sign in to Grafana determines how you see team lists.
 
diff --git a/docs/sources/administration/user-management/_index.md b/docs/sources/administration/user-management/_index.md
index 27ca8ec0673af..ad3be03f7cb06 100644
--- a/docs/sources/administration/user-management/_index.md
+++ b/docs/sources/administration/user-management/_index.md
@@ -13,6 +13,10 @@ weight: 200
 
 A _user_ is defined as any individual who can log in to Grafana. Each user is associated with a _role_ that includes _permissions_. Permissions determine the tasks a user can perform in the system. For example, the **Admin** role includes permissions for an administrator to create and delete users.
 
+Watch the following video to learn how to manage users and permissions in Grafana OSS and Grafana Cloud:
+
+{{< youtube id="59uCGJN5hPI" >}}
+
 The following topics describe how to use permissions to control user access to data sources, dashboards, users, and teams.
 
 {{< section >}}
diff --git a/docs/sources/administration/user-management/manage-org-users/index.md b/docs/sources/administration/user-management/manage-org-users/index.md
index c01c8546679a1..85c8a8bb88235 100644
--- a/docs/sources/administration/user-management/manage-org-users/index.md
+++ b/docs/sources/administration/user-management/manage-org-users/index.md
@@ -38,7 +38,7 @@ You can see a list of users with accounts in your Grafana organization. If neces
 **To view a list of organization users**:
 
 1. Sign in to Grafana as an organization administrator.
-1. Navigate to **Administration > Users**.
+1. Navigate to **Administration > Users and access > Users**.
 
 {{% admonition type="note" %}}
 If you have [server administrator]({{< relref "../../roles-and-permissions/#grafana-server-administrators" >}}) permissions, you can also [view a global list of users]({{< relref "../server-user-management#view-a-list-of-users" >}}) in the Server Admin section of Grafana.
@@ -59,7 +59,7 @@ Organization roles sync from the authentication provider on user sign-in. To pre
 **To change the organization role of a user**:
 
 1. Sign in to Grafana as an organization administrator.
-1. Navigate to **Administration > Users**.
+1. Navigate to **Administration > Users and access > Users**.
 1. Find the user account for which you want to change the role.
 
    If necessary, use the search field to filter the list.
@@ -96,7 +96,7 @@ If you have [server administrator]({{< relref "../../roles-and-permissions/#graf
 
    > **Note**: It might be that you are currently in the proper organization and don't need to switch organizations.
 
-1. Navigate to **Administration > Users**.
+1. Navigate to **Administration > Users and access > Users**.
 1. Click **Organization users**.
 1. Click **Invite**.
 1. Enter the following information:
@@ -127,7 +127,7 @@ The **Pending Invites** button is only visible if there are unanswered invitatio
 **To manage a pending invitation**:
 
 1. Sign in to Grafana as an organization administrator.
-1. Navigate to **Administration > Users**.
+1. Navigate to **Administration > Users and access > Users**.
 1. Click **Pending Invites**.
 
    The **Pending Invites** button appears only when there are unaccepted invitations.
@@ -149,7 +149,7 @@ This action does not remove the user account from the Grafana server.
 **To remove a user from an organization**:
 
 1. Sign in to Grafana as an organization administrator.
-1. Navigate to **Administration > Users**.
+1. Navigate to **Administration > Users and access > Users**.
 1. Find the user account that you want to remove from the organization.
 
    Use the search field to filter the list, if necessary.
diff --git a/docs/sources/administration/user-management/server-user-management/_index.md b/docs/sources/administration/user-management/server-user-management/_index.md
index 50a38bed56931..f5d14efcd25d4 100644
--- a/docs/sources/administration/user-management/server-user-management/_index.md
+++ b/docs/sources/administration/user-management/server-user-management/_index.md
@@ -39,7 +39,7 @@ You can see a list of users with accounts on your Grafana server. This action mi
 **To view a list of users**:
 
 1. Sign in to Grafana as a server administrator.
-1. Click **Administration** in the left-side menu, and then **Users**.
+1. Click **Administration** in the left-side menu, **Users and access**, and then **Users**.
 
 {{% admonition type="note" %}}
 If you have [organization administrator]({{< relref "../../roles-and-permissions/#organization-roles" >}}) permissions and _not_ [server administrator]({{< relref "../../roles-and-permissions/#grafana-server-administrators" >}}) permissions, you can still [view of list of users in a given organization]({{< relref "../manage-org-users/#view-a-list-of-organization-users" >}}).
@@ -56,7 +56,7 @@ View user details when you want to see login, and organizations and permissions
 **To view user details**:
 
 1. Sign in to Grafana as a server administrator.
-1. Click **Administration** in the left-side menu, and then **Users**.
+1. Click **Administration** in the left-side menu, **Users and access**, and then **Users**.
 1. Click a user.
 
 A user account contains the following sections.
@@ -88,7 +88,7 @@ Edit a user account when you want to modify user login credentials, or delete, d
 **To edit a user account**:
 
 1. Sign in to Grafana as a server administrator.
-1. Click **Administration** in the left-side menu, and then **Users**.
+1. Click **Administration** in the left-side menu, **Users and access**, and then **Users**.
 1. Click a user.
 1. Complete any of the following actions, as necessary.
 
@@ -115,7 +115,7 @@ When you configure advanced authentication using Oauth, SAML, LDAP, or the Auth
 **To add a user**:
 
 1. Sign in to Grafana as a server administrator.
-1. Click **Administration** in the left-side menu, and then **Users**.
+1. Click **Administration** in the left-side menu, **Users and access**, and then **Users**.
 1. Click **New user**.
 1. Complete the fields and click **Create user**.
 
@@ -136,7 +136,7 @@ The force logout action can apply to one device that is logged in to Grafana, or
 - Ensure you have Grafana server administrator privileges
 
 1. Sign in to Grafana as a server administrator.
-1. Click **Administration** in the left-side menu, and then **Users**.
+1. Click **Administration** in the left-side menu, **Users and access**, and then **Users**.
 1. Click a user.
 1. Scroll down to the Sessions section.
 1. Perform one of the following actions:
diff --git a/docs/sources/administration/user-management/server-user-management/add-remove-user-to-org/index.md b/docs/sources/administration/user-management/server-user-management/add-remove-user-to-org/index.md
index 1d8f5a70ac3d9..04ddd0dc4909e 100644
--- a/docs/sources/administration/user-management/server-user-management/add-remove-user-to-org/index.md
+++ b/docs/sources/administration/user-management/server-user-management/add-remove-user-to-org/index.md
@@ -31,7 +31,7 @@ You are required to specify an Admin role for each organization. The first user
 **To add a user to an organization**:
 
 1. Sign in to Grafana as a server administrator.
-1. Click **Administration** in the left-side menu, and then **Users**.
+1. Click **Administration** in the left-side menu, **Users and access**, and then **Users**.
 1. Click a user.
 1. In the Organizations section, click **Add user to organization**.
 1. Select an organization and a role.
@@ -57,7 +57,7 @@ Remove a user from an organization when they no longer require access to the das
 **To remove a user from an organization**:
 
 1. Sign in to Grafana as a server administrator.
-1. Click **Administration** in the left-side menu, and then **Users**.
+1. Click **Administration** in the left-side menu, **Users and access**, and then **Users**.
 1. Click a user.
 1. In the Organization section, click **Remove from organization** next to the organization from which you want to remove the user.
 1. Click **Confirm removal**.
diff --git a/docs/sources/administration/user-management/server-user-management/assign-remove-server-admin-privileges/index.md b/docs/sources/administration/user-management/server-user-management/assign-remove-server-admin-privileges/index.md
index d02cc9c19a30a..c017f104bdd66 100644
--- a/docs/sources/administration/user-management/server-user-management/assign-remove-server-admin-privileges/index.md
+++ b/docs/sources/administration/user-management/server-user-management/assign-remove-server-admin-privileges/index.md
@@ -27,7 +27,7 @@ Server administrators are "super-admins" with full permissions to create, read,
 **To assign or remove Grafana administrator privileges**:
 
 1. Sign in to Grafana as a server administrator.
-1. Click **Administration** in the left-side menu, and then **Users**.
+1. Click **Administration** in the left-side menu, **Users and access**, and then **Users**.
 1. Click a user.
 1. In the Permissions section, next to Grafana Admin, click **Change**.
 1. Click **Yes** or **No**, depending on whether or not you want this user to have the Grafana server administrator role.
diff --git a/docs/sources/administration/user-management/server-user-management/change-user-org-permissions/index.md b/docs/sources/administration/user-management/server-user-management/change-user-org-permissions/index.md
index 3a72c6b15b161..4569a5ac8f2c9 100644
--- a/docs/sources/administration/user-management/server-user-management/change-user-org-permissions/index.md
+++ b/docs/sources/administration/user-management/server-user-management/change-user-org-permissions/index.md
@@ -21,7 +21,7 @@ Update organization permissions when you want to enhance or restrict a user's ac
 **To change a user's organization permissions**:
 
 1. Sign in to Grafana as a server administrator.
-1. Click **Administration** in the left-side menu, and then **Users**.
+1. Click **Administration** in the left-side menu, **Users and access**, and then **Users**.
 1. Click a user.
 1. In the Organizations section, click **Change role** for the role you want to change
 1. Select another role.
diff --git a/docs/sources/alerting/_index.md b/docs/sources/alerting/_index.md
index af8d6df18d738..65a53f84077ea 100644
--- a/docs/sources/alerting/_index.md
+++ b/docs/sources/alerting/_index.md
@@ -1,100 +1,66 @@
 ---
 aliases:
-  - about-alerting/
-  - ./unified-alerting/alerting/
-  - ./alerting/unified-alerting/
+  - about-alerting/ # /docs/grafana/<GRAFANA_VERSION>/about-alerting
+  - ./unified-alerting/alerting/ # /docs/grafana/<GRAFANA_VERSION>/unified-alerting/alerting/
+  - ./alerting/unified-alerting/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/
 canonical: https://grafana.com/docs/grafana/latest/alerting/
-description: Intro to key benefits and features of Grafana Alerting
+description: Learn about the key benefits and features of Grafana Alerting
 labels:
   products:
     - cloud
     - enterprise
     - oss
-title: Alerting
+menuTitle: Alerting
+title: Grafana Alerting
 weight: 114
+hero:
+  title: Grafana Alerting
+  level: 1
+  image: /media/docs/alerting/alerting-bell-icon.png
+  width: 100
+  height: 100
+  description: Grafana Alerting allows you to learn about problems in your systems moments after they occur.
+cards:
+  title_class: pt-0 lh-1
+  items:
+    - title: Introduction
+      href: ./fundamentals/
+      description: Learn more about the fundamentals and available features that help you create, manage, and respond to alerts; and improve your team’s ability to resolve issues quickly.
+      height: 24
+    - title: Set up
+      href: ./set-up/
+      description: Set up your implementation of Grafana Alerting.
+      height: 24
+    - title: Configure alert rules
+      href: ./alerting-rules/
+      description: Create, manage, view, and adjust alert rules to alert on your metrics data or log entries from multiple data sources — no matter where your data is stored.
+      height: 24
+    - title: Configure notifications
+      href: ./configure-notifications/
+      description: Choose how, when, and where to send your alert notifications.
+      height: 24
+    - title: Detect and respond
+      href: ./manage-notifications/
+      description: Monitor, respond to, and triage issues within your services.
+      height: 24
+    - title: Monitor
+      href: ./monitor/
+      description: Monitor your alerting metrics to ensure you identify potential issues before they become critical.
+      height: 24
 ---
 
-# Alerting
+{{< docs/hero-simple key="hero" >}}
 
-Grafana Alerting allows you to learn about problems in your systems moments after they occur.
+---
+
+## Overview
 
-Monitor your incoming metrics data or log entries and set up your Alerting system to watch for specific events or circumstances and then send notifications when those things are found.
+Monitor your incoming metrics data or log entries and set up your Grafana Alerting system to watch for specific events or circumstances.
 
 In this way, you eliminate the need for manual monitoring and provide a first line of defense against system outages or changes that could turn into major incidents.
 
 Using Grafana Alerting, you create queries and expressions from multiple data sources — no matter where your data is stored — giving you the flexibility to combine your data and alert on your metrics and logs in new and unique ways. You can then create, manage, and take action on your alerts from a single, consolidated view, and improve your team’s ability to identify and resolve issues quickly.
 
-Grafana Alerting is available for Grafana OSS, Grafana Enterprise, or Grafana Cloud. With Mimir and Loki alert rules you can run alert expressions closer to your data and at massive scale, all managed by the Grafana UI you are already familiar with.
-
-Watch this video to learn more about Grafana Alerting: {{< vimeo 720001629 >}}
-
-_Refer to [Manage your alert rules][alerting-rules] for current instructions._
-
-## Key features and benefits
-
-**One page for all alerts**
-
-A single Grafana Alerting page consolidates both Grafana-managed alerts and alerts that reside in your Prometheus-compatible data source in one single place.
-
-**Multi-dimensional alerts**
-
-Alert rules can create multiple individual alert instances per alert rule, known as multi-dimensional alerts, giving you the power and flexibility to gain visibility into your entire system with just a single alert rule. You do this by adding labels to your query to specify which component is being monitored and generate multiple alert instances for a single alert rule. For example, if you want to monitor each server in a cluster, a multi-dimensional alert will alert on each CPU, whereas a standard alert will alert on the overall server.
-
-**Route alerts**
-
-Route each alert instance to a specific contact point based on labels you define. Notification policies are the set of rules for where, when, and how the alerts are routed to contact points.
-
-**Silence alerts**
-
-Silences stop notifications from getting created and last for only a specified window of time.
-Silences allow you to stop receiving persistent notifications from one or more alert rules. You can also partially pause an alert based on certain criteria. Silences have their own dedicated section for better organization and visibility, so that you can scan your paused alert rules without cluttering the main alerting view.
-
-**Mute timings**
-
-A mute timing is a recurring interval of time when no new notifications for a policy are generated or sent. Use them to prevent alerts from firing a specific and reoccurring period, for example, a regular maintenance period.
-
-Similar to silences, mute timings do not prevent alert rules from being evaluated, nor do they stop alert instances from being shown in the user interface. They only prevent notifications from being created.
-
-## Design your Alerting system
-
-Monitoring complex IT systems and understanding whether everything is up and running correctly is a difficult task. Setting up an effective alert management system is therefore essential to inform you when things are going wrong before they start to impact your business outcomes.
-
-Designing and configuring an alert management set up that works takes time.
-
-Here are some tips on how to create an effective alert management set up for your business:
-
-**Which are the key metrics for your business that you want to monitor and alert on?**
-
-- Find events that are important to know about and not so trivial or frequent that recipients ignore them.
-
-- Alerts should only be created for big events that require immediate attention or intervention.
-
-- Consider quality over quantity.
-
-**Which type of Alerting do you want to use?**
-
-- Choose between Grafana-managed Alerting or Grafana Mimir or Loki-managed Alerting; or both.
-
-**How do you want to organize your alerts and notifications?**
-
-- Be selective about who you set to receive alerts. Consider sending them to whoever is on call or a specific Slack channel.
-- Automate as far as possible using the Alerting API or alerts as code (Terraform).
-
-**How can you reduce alert fatigue?**
-
-- Avoid noisy, unnecessary alerts by using silences, mute timings, or pausing alert rule evaluation.
-- Continually tune your alert rules to review effectiveness. Remove alert rules to avoid duplication or ineffective alerts.
-- Think carefully about priority and severity levels.
-- Continually review your thresholds and evaluation rules.
-
-## Useful links
-
-- [Introduction to Alerting][fundamentals]
-
-{{% docs/reference %}}
-[alerting-rules]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/alerting-rules"
-[alerting-rules]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules"
+## Explore
 
-[fundamentals]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals"
-[fundamentals]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals"
-{{% /docs/reference %}}
+{{< card-grid key="cards" type="simple" >}}
diff --git a/docs/sources/alerting/alerting-rules/_index.md b/docs/sources/alerting/alerting-rules/_index.md
index 750b7c7c4149f..d4ab108d9e1e6 100644
--- a/docs/sources/alerting/alerting-rules/_index.md
+++ b/docs/sources/alerting/alerting-rules/_index.md
@@ -1,58 +1,48 @@
 ---
 aliases:
-  - old-alerting/create-alerts/
-  - rules/
-  - unified-alerting/alerting-rules/
-  - ./create-alerts/
+  - rules/ # /docs/grafana/<GRAFANA_VERSION>/alerting/rules/
+  - unified-alerting/alerting-rules/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/alerting-rules/
+  - ./create-alerts/ # /docs/grafana/<GRAFANA_VERSION>/alerting/create-alerts/
 canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/
-description: Configure alerting
+description: Configure alert rules
 labels:
   products:
     - cloud
     - enterprise
     - oss
-menuTitle: Configure
-title: Configure Alerting
+title: Configure alert rules
 weight: 120
 ---
 
-# Configure Alerting
+# Configure alert rules
 
-Configure the features and integrations that you need to create and manage your alerts.
+An alert rule consists of one or more queries and expressions that select the data you want to measure. It also contains a condition, which is the threshold that an alert rule must meet or exceed in order to fire.
 
-**Configure alert rules**
+Create, manage, view, and adjust alert rules to alert on your metrics data or log entries from multiple data sources — no matter where your data is stored.
 
-[Configure Grafana-managed alert rules][create-grafana-managed-rule].
+The main parts of alert rule creation are:
 
-[Configure data source-managed alert rules][create-mimir-loki-managed-rule]
+1. Select your data source
+1. Query your data
+1. Normalize your data
+1. Set your threshold
 
-**Configure recording rules**
+**Query, expressions, and alert condition**
 
-_Recording rules are only available for compatible Prometheus or Loki data sources._
+What are you monitoring? How are you measuring it?
 
-For more information, see [Configure recording rules][create-mimir-loki-managed-recording-rule].
+{{< admonition type="note" >}}
+Expressions can only be used for Grafana-managed alert rules.
+{{< /admonition >}}
 
-**Configure contact points**
+**Evaluation**
 
-For information on how to configure contact points, see [Configure contact points][manage-contact-points].
+How do you want your alert to be evaluated?
 
-**Configure notification policies**
+**Labels and notifications**
 
-For information on how to configure notification policies, see [Configure notification policies][create-notification-policy].
+How do you want to route your alert? What kind of additional labels could you add to annotate your alert rules and ease searching?
 
-{{% docs/reference %}}
-[create-mimir-loki-managed-rule]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/alerting-rules/create-mimir-loki-managed-rule"
-[create-mimir-loki-managed-rule]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/create-mimir-loki-managed-rule"
+**Annotations**
 
-[create-mimir-loki-managed-recording-rule]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/alerting-rules/create-mimir-loki-managed-recording-rule"
-[create-mimir-loki-managed-recording-rule]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/create-mimir-loki-managed-recording-rule"
-
-[create-grafana-managed-rule]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/alerting-rules/create-grafana-managed-rule"
-[create-grafana-managed-rule]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/create-grafana-managed-rule"
-
-[manage-contact-points]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/alerting-rules/manage-contact-points"
-[manage-contact-points]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/manage-contact-points"
-
-[create-notification-policy]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/alerting-rules/create-notification-policy"
-[create-notification-policy]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/create-notification-policy"
-{{% /docs/reference %}}
+Do you want to add more context on the alert in your notification messages, for example, what caused the alert to fire? Which server did it happen on?
diff --git a/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md b/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
index 1452d8774fdd3..134d90616b13a 100644
--- a/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
+++ b/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
@@ -1,8 +1,8 @@
 ---
 aliases:
-  - ../unified-alerting/alerting-rules/create-grafana-managed-rule/
+  - ../unified-alerting/alerting-rules/create-grafana-managed-rule/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/alerting-rules/create-grafana-managed-rule/
 canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/create-grafana-managed-rule/
-description: Configure Grafana-managed alert rules
+description: Configure Grafana-managed alert rules to create alerts that can act on data from any of our supported data sources
 keywords:
   - grafana
   - alerting
@@ -26,11 +26,17 @@ Grafana-managed rules are the most flexible alert rule type. They allow you to c
 
 Multiple alert instances can be created as a result of one alert rule (also known as a multi-dimensional alerting).
 
-**Note:**
+{{% admonition type="note" %}}
+For Grafana Cloud, there are limits on how many Grafana-managed alert rules you can create. These are as follows:
+
+- Free: 100 alert rules
+- Paid: 2000 alert rules
+  {{% /admonition %}}
 
 Grafana managed alert rules can only be edited or deleted by users with Edit permissions for the folder storing the rules.
 
-Watch this video to learn more about creating alert rules: {{< vimeo 720001934 >}}
+If you delete an alerting resource created in the UI, you can no longer retrieve it.
+To make a backup of your configuration and to be able to restore deleted alerting resources, create your alerting resources using file provisioning, Terraform, or the Alerting API.
 
 In the following sections, we’ll guide you through the process of creating your Grafana-managed alert rules.
 
@@ -63,6 +69,7 @@ Define a query to get the data you want to measure and a condition that needs to
    All alert rules are managed by Grafana by default. If you want to switch to a data source-managed alert rule, click **Switch to data source-managed alert rule**.
 
 1. Add one or more [expressions][expression-queries].
+
    a. For each expression, select either **Classic condition** to create a single alert rule, or choose from the **Math**, **Reduce**, and **Resample** options to generate separate alert for each series.
 
    {{% admonition type="note" %}}
@@ -71,6 +78,10 @@ Define a query to get the data you want to measure and a condition that needs to
 
    b. Click **Preview** to verify that the expression is successful.
 
+1. To add a recovery threshold, turn the **Custom recovery threshold** toggle on and fill in a value for when your alert rule should stop firing.
+
+   You can only add one recovery threshold in a query and it must be the alert condition.
+
 1. Click **Set as alert condition** on the query or expression you want to set as your alert condition.
 
 ## Set alert evaluation behavior
@@ -84,7 +95,7 @@ To do this, you need to make sure that your alert rule is in the right evaluatio
 
    If you are creating a new evaluation group, specify the interval for the group.
 
-   All rules within the same group are evaluated sequentially over the same time interval.
+   All rules within the same group are evaluated concurrently over the same time interval.
 
 1. Enter a pending period.
 
@@ -94,56 +105,79 @@ To do this, you need to make sure that your alert rule is in the right evaluatio
 
 1. Turn on pause alert notifications, if required.
 
-   **Note**:
-
-   Pause alert rule evaluation to prevent noisy alerting while tuning your alerts. Pausing stops alert rule evaluation and does not create any alert instances. This is different to mute timings, which stop notifications from being delivered, but still allow for alert rule evaluation and the creation of alert instances.
-
-   You can pause alert rule evaluation to prevent noisy alerting while tuning your alerts. Pausing stops alert rule evaluation and does not create any alert instances. This is different to mute timings, which stop notifications from being delivered, but still allow for alert rule evaluation and the creation of alert instances.
+   {{< admonition type="note" >}}
+   You can pause alert rule evaluation to prevent noisy alerting while tuning your alerts.
+   Pausing stops alert rule evaluation and doesn't create any alert instances.
+   This is different to mute timings, which stop notifications from being delivered, but still allows for alert rule evaluation and the creation of alert instances.
+   {{< /admonition >}}
 
 1. In **Configure no data and error handling**, configure alerting behavior in the absence of data.
 
    Use the guidelines in [No data and error handling](#configure-no-data-and-error-handling).
 
-## Add annotations
+## Configure labels and notifications
 
-Add [annotations][annotation-label]. to provide more context on the alert in your alert notifications.
+In the **Labels** section, you can optionally choose whether to add labels to organize your alert rules, make searching easier, as well as set which notification policy should handle your firing alert instance.
 
-Annotations add metadata to provide more information on the alert in your alert notifications. For example, add a **Summary** annotation to tell you which value caused the alert to fire or which server it happened on.
+In the **Configure notifications** section, you can choose to select a contact point directly from the alert rule form or choose to use notification policy routing as well as set up mute timings and groupings.
 
-1. [Optional] Add a summary.
+Complete the following steps to set up labels and notifications.
 
-   Short summary of what happened and why.
+1. Add labels, if required.
 
-2. [Optional] Add a description.
+   Add custom labels by selecting existing key-value pairs from the drop down, or add new labels by entering the new key or value.
 
-   Description of what the alert rule does.
+2. Configure who receives a notification when an alert rule fires by either choosing **Select contact point** or **Use notification policy**.
 
-3. [Optional] Add a Runbook URL.
+   **Select contact point**
 
-   Webpage where you keep your runbook for the alert
+   1. Choose this option to select an existing contact point.
 
-4. [Optional] Add a custom annotation
-5. [Optional] Add a dashboard and panel link.
+      All notifications for this alert rule are sent to this contact point automatically and notification policies are not used.
 
-   Links alerts to panels in a dashboard.
+   2. You can also optionally select a mute timing as well as groupings and timings to define when not to send notifications.
 
-## Configure notifications
+      {{< admonition type="note" >}}
+      An auto-generated notification policy is generated. Only admins can view these auto-generated policies from the **Notification policies** list view. Any changes have to be made in the alert rules form. {{< /admonition >}}
 
-Add labels to your alert rules to set which notification policy should handle your firing alert instances.
+   **Use notification policy**
 
-All alert rules and instances, irrespective of their labels, match the default notification policy. If there are no nested policies, or no nested policies match the labels in the alert rule or alert instance, then the default notification policy is the matching policy.
+   3. Choose this option to use the notification policy tree to direct your notifications.
 
-1. Add labels if you want to change the way your notifications are routed.
+      {{< admonition type="note" >}}
+      All alert rules and instances, irrespective of their labels, match the default notification policy. If there are no nested policies, or no nested policies match the labels in the alert rule or alert instance, then the default notification policy is the matching policy.
+      {{< /admonition >}}
 
-   Add custom labels by selecting existing key-value pairs from the drop down, or add new labels by entering the new key or value.
+   4. Preview your alert instance routing set up.
+
+      Based on the labels added, alert instances are routed to the following notification policies displayed.
 
-1. Preview your alert instance routing set up.
+   5. Expand each notification policy below to view more details.
 
-   Based on the labels added, alert instances are routed to the following notification policies displayed.
+   6. Click **See details** to view alert routing details and an email preview.
 
-   Expand each notification policy below to view more details.
+## Add annotations
+
+Add [annotations][annotation-label]. to provide more context on the alert in your alert notification message.
+
+Annotations add metadata to provide more information on the alert in your alert notification message. For example, add a **Summary** annotation to tell you which value caused the alert to fire or which server it happened on.
+
+1. [Optional] Add a summary.
+
+   Short summary of what happened and why.
+
+1. [Optional] Add a description.
 
-1. Click **See details** to view alert routing details and an email preview.
+   Description of what the alert rule does.
+
+1. [Optional] Add a Runbook URL.
+
+   Webpage where you keep your runbook for the alert
+
+1. [Optional] Add a custom annotation
+1. [Optional] Add a dashboard and panel link.
+
+   Links alerts to panels in a dashboard.
 
 1. Click **Save rule**.
 
@@ -161,7 +195,7 @@ For more information, see [expressions documentation][expression-queries].
 
 To generate a separate alert for each series, create a multi-dimensional rule. Use `Math`, `Reduce`, or `Resample` expressions to create a multi-dimensional rule. For example:
 
-- Add a `Reduce` expression for each query to aggregate values in the selected time range into a single value. (Not needed for [rules using numeric data][alerting-on-numeric-data].
+- Add a `Reduce` expression for each query to aggregate values in the selected time range into a single value. (Not needed for [rules using numeric data][alerting-on-numeric-data]).
 - Add a `Math` expression with the condition for the rule. Not needed in case a query or a reduce expression already returns 0 if rule should not fire, or a positive number if it should fire. Some examples: `$B > 70` if it should fire in case value of B query/expression is more than 70. `$B < $C * 100` in case it should fire if value of B is less than value of C multiplied by 100. If queries being compared have multiple series in their results, series from different queries are matched if they have the same labels or one is a subset of the other.
 
 ![Query section multi dimensional](/static/img/docs/alerting/unified/rule-edit-multi-8-0.png 'Query section multi dimensional screenshot')
@@ -202,26 +236,26 @@ Create alerts from any panel type. This means you can reuse the queries in the p
 
 1. Navigate to a dashboard in the **Dashboards** section.
 2. In the top right corner of the panel, click on the three dots (ellipses).
-3. From the dropdown menu, select **More...** and then choose **Create alert**.
+3. From the dropdown menu, select **More...** and then choose **New alert rule**.
 
 This will open the alert rule form, allowing you to configure and create your alert based on the current panel's query.
 
 {{% docs/reference %}}
-[add-a-query]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/query-transform-data#add-a-query"
-[add-a-query]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/query-transform-data#add-a-query"
+[add-a-query]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data#add-a-query"
+[add-a-query]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data#add-a-query"
 
-[alerting-on-numeric-data]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/evaluate-grafana-alerts#alerting-on-numeric-data-1"
-[alerting-on-numeric-data]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/evaluate-grafana-alerts#alerting-on-numeric-data-1"
+[alerting-on-numeric-data]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/queries-conditions#alert-on-numeric-data"
+[alerting-on-numeric-data]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/queries-conditions#alert-on-numeric-data"
 
-[annotation-label]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/annotation-label"
-[annotation-label]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/annotation-label"
+[annotation-label]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/annotation-label"
+[annotation-label]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/annotation-label"
 
-[expression-queries]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/query-transform-data/expression-queries"
-[expression-queries]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/query-transform-data/expression-queries"
+[expression-queries]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data/expression-queries"
+[expression-queries]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data/expression-queries"
 
-[fundamentals]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals"
+[fundamentals]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals"
 [fundamentals]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals"
 
-[time-units-and-relative-ranges]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/use-dashboards#time-units-and-relative-ranges"
-[time-units-and-relative-ranges]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/use-dashboards#time-units-and-relative-ranges"
+[time-units-and-relative-ranges]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/dashboards/use-dashboards#time-units-and-relative-ranges"
+[time-units-and-relative-ranges]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/dashboards/use-dashboards#time-units-and-relative-ranges"
 {{% /docs/reference %}}
diff --git a/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md b/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md
index a31758d260451..494f92edda015 100644
--- a/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md
+++ b/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md
@@ -1,9 +1,9 @@
 ---
 aliases:
-  - ../unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/
-  - ../unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/
+  - ../unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/
+  - ../unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/
 canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/create-mimir-loki-managed-recording-rule/
-description: Configure recording rules
+description: Create recording rules for an external Grafana Mimir or Loki instance
 keywords:
   - grafana
   - alerting
@@ -16,13 +16,16 @@ labels:
     - cloud
     - enterprise
     - oss
-title: Configure recording rules
+title: Create recording rules
 weight: 300
 ---
 
-# Configure recording rules
+# Create recording rules
 
-You can create and manage recording rules for an external Grafana Mimir or Loki instance. Recording rules calculate frequently needed expressions or computationally expensive expressions in advance and save the result as a new set of time series. Querying this new time series is faster, especially for dashboards since they query the same expression every time the dashboards refresh.
+You can create and manage recording rules for an external Grafana Mimir or Loki instance.
+Recording rules calculate frequently needed expressions or computationally expensive expressions in advance and save the result as a new set of time series. Querying this new time series is faster, especially for dashboards since they query the same expression every time the dashboards refresh.
+
+For more information on recording rules in Prometheus, refer to [Defining recording rules in Prometheus](https://prometheus.io/docs/prometheus/latest/configuration/recording_rules/).
 
 **Note:**
 
@@ -48,13 +51,14 @@ To create recording rules, follow these steps.
 
 1. Click **Alerts & IRM** -> **Alerting** ->
    **Alert rules**.
-1. Click the **More** dropdown and then **New recording rule**.
+1. Select **Rule type** -> **Recording**.
+1. Click **+New recording rule**.
 
-1. Set rule name.
+1. Enter recording rule name.
 
    The recording rule name must be a Prometheus metric name and contain no whitespace.
 
-1. Define query.
+1. Define recording rule.
    - Select your Loki or Prometheus data source.
    - Enter a query.
 1. Add namespace and group.
@@ -65,9 +69,8 @@ To create recording rules, follow these steps.
 1. Click **Save rule** to save the rule or **Save rule and exit** to save the rule and go back to the Alerting page.
 
 {{% docs/reference %}}
-[annotation-label]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/annotation-label"
-[annotation-label]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/annotation-label"
+[annotation-label]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/annotation-label"
+[annotation-label]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/annotation-label"
 
-[configure-grafana]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-grafana"
-[configure-grafana]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-grafana"
+[configure-grafana]: "/docs/ -> /docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana"
 {{% /docs/reference %}}
diff --git a/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md b/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md
index f92cb66cd5906..0abd6c5550bab 100644
--- a/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md
+++ b/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md
@@ -1,10 +1,10 @@
 ---
 aliases:
-  - ../unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/
-  - ../unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/
-  - ../unified-alerting/alerting-rules/create-mimir-loki-managed-rule/
+  - ../unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/
+  - ../unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/
+  - ../unified-alerting/alerting-rules/create-mimir-loki-managed-rule/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/alerting-rules/create-mimir-loki-managed-rule/
 canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/create-mimir-loki-managed-rule/
-description: Configure data source-managed alert rules
+description: Configure data source-managed alert rules alert for an external Grafana Mimir or Loki instance
 keywords:
   - grafana
   - alerting
@@ -28,6 +28,9 @@ Create alert rules for an external Grafana Mimir or Loki instance that has ruler
 
 Alert rules for an external Grafana Mimir or Loki instance can be edited or deleted by users with Editor or Admin roles.
 
+If you delete an alerting resource created in the UI, you can no longer retrieve it.
+To make a backup of your configuration and to be able to restore deleted alerting resources, create your alerting resources using file provisioning, Terraform, or the Alerting API.
+
 ## Before you begin
 
 - Verify that you have write permission to the Prometheus or Loki data source. Otherwise, you will not be able to create or update Grafana Mimir managed alert rules.
@@ -87,6 +90,16 @@ Use alert rule evaluation to determine how frequently an alert rule should be ev
 
    Once a condition is met, the alert goes into the **Pending** state. If the condition remains active for the duration specified, the alert transitions to the **Firing** state, else it reverts to the **Normal** state.
 
+## Configure notifications
+
+Add labels to your alert rules to set which notification policy should handle your firing alert instances.
+
+All alert rules and instances, irrespective of their labels, match the default notification policy. If there are no nested policies, or no nested policies match the labels in the alert rule or alert instance, then the default notification policy is the matching policy.
+
+1. Add labels if you want to change the way your notifications are routed.
+
+   Add custom labels by selecting existing key-value pairs from the drop down, or add new labels by entering the new key or value.
+
 ## Add annotations
 
 Add [annotations][annotation-label]. to provide more context on the alert in your alert notifications.
@@ -97,35 +110,25 @@ Annotations add metadata to provide more information on the alert in your alert
 
    Short summary of what happened and why.
 
-2. [Optional] Add a description.
+1. [Optional] Add a description.
 
    Description of what the alert rule does.
 
-3. [Optional] Add a Runbook URL.
+1. [Optional] Add a Runbook URL.
 
    Webpage where you keep your runbook for the alert
 
-4. [Optional] Add a custom annotation
-5. [Optional] Add a dashboard and panel link.
+1. [Optional] Add a custom annotation
+1. [Optional] Add a dashboard and panel link.
 
    Links alerts to panels in a dashboard.
 
-## Configure notifications
-
-Add labels to your alert rules to set which notification policy should handle your firing alert instances.
-
-All alert rules and instances, irrespective of their labels, match the default notification policy. If there are no nested policies, or no nested policies match the labels in the alert rule or alert instance, then the default notification policy is the matching policy.
-
-1. Add labels if you want to change the way your notifications are routed.
-
-   Add custom labels by selecting existing key-value pairs from the drop down, or add new labels by entering the new key or value.
-
 1. Click **Save rule**.
 
 {{% docs/reference %}}
-[alerting]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting"
+[alerting]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting"
 [alerting]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting"
 
-[annotation-label]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/annotation-label"
-[annotation-label]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/annotation-label"
+[annotation-label]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/annotation-label"
+[annotation-label]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/annotation-label"
 {{% /docs/reference %}}
diff --git a/docs/sources/alerting/alerting-rules/manage-contact-points/_index.md b/docs/sources/alerting/alerting-rules/manage-contact-points/_index.md
deleted file mode 100644
index c63df9fb4776a..0000000000000
--- a/docs/sources/alerting/alerting-rules/manage-contact-points/_index.md
+++ /dev/null
@@ -1,77 +0,0 @@
----
-aliases:
-  - ../contact-points/ # /docs/grafana/<GRAFANA_VERSION>/alerting/contact-points/
-  - ../contact-points/create-contact-point/ # /docs/grafana/<GRAFANA_VERSION>/alerting/contact-points/create-contact-point/
-  - ../contact-points/delete-contact-point/ # /docs/grafana/<GRAFANA_VERSION>/alerting/contact-points/delete-contact-point/
-  - ../contact-points/edit-contact-point/ # /docs/grafana/<GRAFANA_VERSION>/alerting/contact-points/edit-contact-point/
-  - ../contact-points/test-contact-point/ # /docs/grafana/<GRAFANA_VERSION>/alerting/contact-points/test-contact-point/
-  - ../manage-notifications/manage-contact-points/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/manage-contact-points/
-  - create-contact-point/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/create-contact-point/
-canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/manage-contact-points/
-description: How to manage your contact points
-keywords:
-  - grafana
-  - alerting
-  - guide
-  - contact point
-  - templating
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Configure contact points
-weight: 410
----
-
-# Configure contact points
-
-Use contact points to define how your contacts are notified when an alert rule fires. You can create, edit, delete, and test a contact point.
-
-## Add a contact point
-
-Complete the following steps to add a contact point.
-
-1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
-1. Click **Contact points**.
-1. From the **Choose Alertmanager** dropdown, select an Alertmanager. By default, **Grafana Alertmanager** is selected.
-1. Click **+ Add contact point**.
-1. In **Name**, enter a descriptive name for the contact point.
-1. From **Integration**, select a type and fill out mandatory fields. For example, if you choose email, enter the email addresses. Or if you choose Slack, enter the Slack channel(s) and users who should be contacted.
-1. Some contact point integrations, like email or webhook, have optional settings. In **Optional settings**, specify additional settings for the selected contact point integration.
-1. In Notification settings, optionally select **Disable resolved message** if you do not want to be notified when an alert resolves.
-1. To add another contact point integration, click **Add contact point integration** and repeat steps 6 through 8.
-1. Click **Save contact point** to save your changes.
-
-## Edit a contact point
-
-Complete the following steps to edit a contact point.
-
-1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
-1. Click **Contact points** to view a list of existing contact points.
-1. Find the contact point to edit, and then click **Edit** (pen icon).
-1. Make any changes and click **Save contact point**.
-
-## Delete a contact point
-
-Complete the following steps to delete a contact point.
-
-1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
-1. Click **Contact points** to view a list of existing contact points.
-1. Find the contact point to delete, and then click **Delete** (trash icon).
-1. In the confirmation dialog, click **Yes, delete**.
-
-{{% admonition type="note" %}}
-You cannot delete contact points that are in use by a notification policy. You will have to either delete the notification policy or update it to use another contact point.
-{{% /admonition %}}
-
-## Test a contact point
-
-Complete the following steps to test a contact point.
-
-1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
-1. Click **Contact points** to view a list of existing contact points.
-1. Find the contact point to test, then click **Edit** (pen icon). You can also create a new contact point if needed.
-1. Click **Test** to open the contact point testing modal.
-1. Choose whether to send a predefined test notification or choose custom to add your own custom annotations and labels to include in the notification.
-1. Click **Send test notification** to fire the alert.
diff --git a/docs/sources/alerting/alerting-rules/manage-contact-points/configure-integrations.md b/docs/sources/alerting/alerting-rules/manage-contact-points/configure-integrations.md
deleted file mode 100644
index 03eb242ba2de5..0000000000000
--- a/docs/sources/alerting/alerting-rules/manage-contact-points/configure-integrations.md
+++ /dev/null
@@ -1,75 +0,0 @@
----
-aliases:
-  - alerting/manage-notifications/manage-contact-points/configure-integrations/
-canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/manage-contact-points/configure-integrations/
-description: Configure integrations
-keywords:
-  - Grafana
-  - alerting
-  - guide
-  - notifications
-  - integrations
-  - contact points
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Configure integrations
-weight: 100
----
-
-# Configure integrations
-
-Configure integrations in Grafana to select your preferred communication channel for receiving notifications when your alert rules are firing. Each integration has its own configuration options and setup process. In most cases, this involves providing an API key or a Webhook URL.
-
-Once configured, you can use integrations as part of your contact points to receive notifications whenever your alert changes its state. In this section, we'll cover the basic steps to configure your integrations, so you can start receiving real-time alerts and stay on top of your monitoring data.
-
-## List of supported integrations
-
-| Name                    | Type                      |
-| ----------------------- | ------------------------- |
-| DingDing                | `dingding`                |
-| Discord                 | `discord`                 |
-| Email                   | `email`                   |
-| Google Chat             | `googlechat`              |
-| Hipchat                 | `hipchat`                 |
-| Kafka                   | `kafka`                   |
-| Line                    | `line`                    |
-| Microsoft Teams         | `teams`                   |
-| Opsgenie                | `opsgenie`                |
-| [Pagerduty](#pagerduty) | `pagerduty`               |
-| Prometheus Alertmanager | `prometheus-alertmanager` |
-| Pushover                | `pushover`                |
-| Sensu                   | `sensu`                   |
-| Sensu Go                | `sensugo`                 |
-| Slack                   | `slack`                   |
-| Telegram                | `telegram`                |
-| Threema                 | `threema`                 |
-| VictorOps               | `victorops`               |
-| Webhook                 | `webhook`                 |
-
-### PagerDuty
-
-To set up PagerDuty, provide an integration key.
-
-| Setting         | Description                                            |
-| --------------- | ------------------------------------------------------ |
-| Integration Key | Integration key for PagerDuty                          |
-| Severity        | Level for dynamic notifications, default is `critical` |
-| Custom Details  | Additional details about the event                     |
-
-The `CustomDetails` field is an object containing arbitrary key-value pairs. The user-defined details are merged with the ones we use by default.
-
-Our default values for `CustomDetails` are:
-
-```go
-{
-	"firing":       `{{ template "__text_alert_list" .Alerts.Firing }}`,
-	"resolved":     `{{ template "__text_alert_list" .Alerts.Resolved }}`,
-	"num_firing":   `{{ .Alerts.Firing | len }}`,
-	"num_resolved": `{{ .Alerts.Resolved | len }}`,
-}
-```
-
-In case of duplicate keys, the user-defined details overwrite the default ones.
diff --git a/docs/sources/alerting/alerting-rules/manage-contact-points/configure-oncall.md b/docs/sources/alerting/alerting-rules/manage-contact-points/configure-oncall.md
deleted file mode 100644
index 50f1e0b9fccaa..0000000000000
--- a/docs/sources/alerting/alerting-rules/manage-contact-points/configure-oncall.md
+++ /dev/null
@@ -1,71 +0,0 @@
----
-canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/manage-contact-points/configure-oncall/
-description: Configure the Alerting - Grafana OnCall integration
-keywords:
-  - grafana
-  - alerting
-  - oncall
-  - integration
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Configure Grafana OnCall integration
-weight: 300
----
-
-## Grafana OnCall integration for Alerting
-
-Use the Grafana Alerting - Grafana OnCall integration to effortlessly connect alerts generated by Grafana Alerting with Grafana OnCall, where you can then route them according to defined escalation chains and schedules.
-
-You can set up the integration using the Grafana Alerting application or the Grafana OnCall application. For more information on setting it up from the Grafana OnCall application, see [Grafana OnCall documentation][oncall-integration].
-
-### Before you begin
-
-- Ensure you have Installed and enabled the Grafana OnCall plugin
-- Ensure your version of Grafana is up-to-date and supports the new features
-
-### Procedure
-
-To set up the Grafana OnCall integration using the Grafana Alerting application, complete the following steps.
-
-1. Navigate to **Alerts&IRM** -> **Alerting** -> **Contact points**.
-1. Click **+ Add contact point**.
-1. Enter a contact point name.
-1. From the Integration list, select Grafana OnCall.
-
-   **Note:**
-
-   The Grafana OnCall integration is only available for Grafana Alertmanager.
-
-1. Choose whether to add a new OnCall integration or add an existing one.
-
-   - If you add a new one, enter an Integration name.
-   - If you add an existing one, choose from the list of available integrations
-
-1. Click **Save contact point**.
-
-1. On the Contact points list view page, you can see the contact point with the Grafana OnCall icon.
-
-   If the integration is not yet being used anywhere in the notification policies tree, it will have **Unused** as its status in the **Health** column. It won’t receive any notifications, because there are no notifications using that integration.
-
-1. Connect your contact point to a notification policy.
-
-   For more information on connecting your contact point to a notification policy, see
-   [Create notification policy][create-notification-policy].
-
-1. To view your integration in the Grafana OnCall application and set up routes and escalation chains, click the Link next to the integration on the Contact points list view page in the **Type** column.
-
-   This redirects you to the Grafana OnCall integration page in the Grafana OnCall application. From there, you can add [routes and escalation chains][escalation-chain].
-
-{{% docs/reference %}}
-[create-notification-policy]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/alerting-rules/create-notification-policy"
-[create-notification-policy]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/create-notification-policy"
-
-[oncall-integration]: "/docs/grafana/ -> /docs/oncall/latest/integrations/grafana-alerting"
-[oncall-integration]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/oncall/integrations/grafana-alerting"
-
-[escalation-chain]: "/docs/grafana/ -> /docs/oncall/latest/escalation-chains-and-routes"
-[escalation-chain]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/oncall/escalation-chains-and-routes"
-{{% /docs/reference %}}
diff --git a/docs/sources/alerting/alerting-rules/manage-contact-points/webhook-notifier.md b/docs/sources/alerting/alerting-rules/manage-contact-points/webhook-notifier.md
deleted file mode 100644
index bb1f4b5ed6cee..0000000000000
--- a/docs/sources/alerting/alerting-rules/manage-contact-points/webhook-notifier.md
+++ /dev/null
@@ -1,149 +0,0 @@
----
-aliases:
-  - ../contact-points/notifiers/webhook-notifier/
-  - ../fundamentals/contact-points/webhook-notifier/
-  - alerting/manage-notifications/manage-contact-points/webhook-notifier/
-canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/manage-contact-points/webhook-notifier/
-description: Configure the webhook notifier for notifications
-keywords:
-  - grafana
-  - alerting
-  - guide
-  - contact point
-  - templating
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Configure the webhook notifier
-weight: 200
----
-
-### Configure the webhook notifier
-
-Example JSON body:
-
-```json
-{
-  "receiver": "My Super Webhook",
-  "status": "firing",
-  "orgId": 1,
-  "alerts": [
-    {
-      "status": "firing",
-      "labels": {
-        "alertname": "High memory usage",
-        "team": "blue",
-        "zone": "us-1"
-      },
-      "annotations": {
-        "description": "The system has high memory usage",
-        "runbook_url": "https://myrunbook.com/runbook/1234",
-        "summary": "This alert was triggered for zone us-1"
-      },
-      "startsAt": "2021-10-12T09:51:03.157076+02:00",
-      "endsAt": "0001-01-01T00:00:00Z",
-      "generatorURL": "https://play.grafana.org/alerting/1afz29v7z/edit",
-      "fingerprint": "c6eadffa33fcdf37",
-      "silenceURL": "https://play.grafana.org/alerting/silence/new?alertmanager=grafana&matchers=alertname%3DT2%2Cteam%3Dblue%2Czone%3Dus-1",
-      "dashboardURL": "",
-      "panelURL": "",
-      "values": {
-        "B": 44.23943737541908,
-        "C": 1
-      }
-    },
-    {
-      "status": "firing",
-      "labels": {
-        "alertname": "High CPU usage",
-        "team": "blue",
-        "zone": "eu-1"
-      },
-      "annotations": {
-        "description": "The system has high CPU usage",
-        "runbook_url": "https://myrunbook.com/runbook/1234",
-        "summary": "This alert was triggered for zone eu-1"
-      },
-      "startsAt": "2021-10-12T09:56:03.157076+02:00",
-      "endsAt": "0001-01-01T00:00:00Z",
-      "generatorURL": "https://play.grafana.org/alerting/d1rdpdv7k/edit",
-      "fingerprint": "bc97ff14869b13e3",
-      "silenceURL": "https://play.grafana.org/alerting/silence/new?alertmanager=grafana&matchers=alertname%3DT1%2Cteam%3Dblue%2Czone%3Deu-1",
-      "dashboardURL": "",
-      "panelURL": "",
-      "values": {
-        "B": 44.23943737541908,
-        "C": 1
-      }
-    }
-  ],
-  "groupLabels": {},
-  "commonLabels": {
-    "team": "blue"
-  },
-  "commonAnnotations": {},
-  "externalURL": "https://play.grafana.org/",
-  "version": "1",
-  "groupKey": "{}:{}",
-  "truncatedAlerts": 0,
-  "title": "[FIRING:2]  (blue)",
-  "state": "alerting",
-  "message": "**Firing**\n\nLabels:\n - alertname = T2\n - team = blue\n - zone = us-1\nAnnotations:\n - description = This is the alert rule checking the second system\n - runbook_url = https://myrunbook.com\n - summary = This is my summary\nSource: https://play.grafana.org/alerting/1afz29v7z/edit\nSilence: https://play.grafana.org/alerting/silence/new?alertmanager=grafana&matchers=alertname%3DT2%2Cteam%3Dblue%2Czone%3Dus-1\n\nLabels:\n - alertname = T1\n - team = blue\n - zone = eu-1\nAnnotations:\nSource: https://play.grafana.org/alerting/d1rdpdv7k/edit\nSilence: https://play.grafana.org/alerting/silence/new?alertmanager=grafana&matchers=alertname%3DT1%2Cteam%3Dblue%2Czone%3Deu-1\n"
-}
-```
-
-### Webhook fields
-
-## Body
-
-| Key               | Type                      | Description                                                                     |
-| ----------------- | ------------------------- | ------------------------------------------------------------------------------- |
-| receiver          | string                    | Name of the webhook                                                             |
-| status            | string                    | Current status of the alert, `firing` or `resolved`                             |
-| orgId             | number                    | ID of the organization related to the payload                                   |
-| alerts            | array of [alerts](#alert) | Alerts that are triggering                                                      |
-| groupLabels       | object                    | Labels that are used for grouping, map of string keys to string values          |
-| commonLabels      | object                    | Labels that all alarms have in common, map of string keys to string values      |
-| commonAnnotations | object                    | Annotations that all alarms have in common, map of string keys to string values |
-| externalURL       | string                    | External URL to the Grafana instance sending this webhook                       |
-| version           | string                    | Version of the payload                                                          |
-| groupKey          | string                    | Key that is used for grouping                                                   |
-| truncatedAlerts   | number                    | Number of alerts that were truncated                                            |
-| title             | string                    | **Will be deprecated soon**                                                     |
-| state             | string                    | **Will be deprecated soon**                                                     |
-| message           | string                    | **Will be deprecated soon**                                                     |
-
-### Alert
-
-| Key          | Type   | Description                                                                        |
-| ------------ | ------ | ---------------------------------------------------------------------------------- |
-| status       | string | Current status of the alert, `firing` or `resolved`                                |
-| labels       | object | Labels that are part of this alert, map of string keys to string values            |
-| annotations  | object | Annotations that are part of this alert, map of string keys to string values       |
-| startsAt     | string | Start time of the alert                                                            |
-| endsAt       | string | End time of the alert, default value when not resolved is `0001-01-01T00:00:00Z`   |
-| values       | object | Values that triggered the current status                                           |
-| generatorURL | string | URL of the alert rule in the Grafana UI                                            |
-| fingerprint  | string | The labels fingerprint, alarms with the same labels will have the same fingerprint |
-| silenceURL   | string | URL to silence the alert rule in the Grafana UI                                    |
-| dashboardURL | string | **Will be deprecated soon**                                                        |
-| panelURL     | string | **Will be deprecated soon**                                                        |
-| imageURL     | string | URL of a screenshot of a panel assigned to the rule that created this notification |
-
-### Removed fields related to dashboards
-
-Alerts are not coupled to dashboards anymore therefore the fields related to dashboards `dashboardId` and `panelId` have been removed.
-
-## WeCom
-
-WeCom contact points need a Webhook URL. These are obtained by setting up a WeCom robot on the corresponding group chat. To obtain a Webhook URL using the WeCom desktop Client please follow these steps:
-
-1. Click the "..." in the top right corner of a group chat that you want your alerts to be delivered to
-2. Click "Add Group Robot", select "New Robot" and give your robot a name. Click "Add Robot"
-3. There should be a Webhook URL in the panel.
-
-| Setting | Description        |
-| ------- | ------------------ |
-| Url     | WeCom webhook URL. |
diff --git a/docs/sources/alerting/alerting-rules/templating-labels-annotations.md b/docs/sources/alerting/alerting-rules/templating-labels-annotations.md
new file mode 100644
index 0000000000000..5177d6dad6fc6
--- /dev/null
+++ b/docs/sources/alerting/alerting-rules/templating-labels-annotations.md
@@ -0,0 +1,453 @@
+---
+aliases:
+  - ../fundamentals/annotation-label/variables-label-annotation/ # /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/annotation-label/variables-label-annotation/
+canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/templating-labels-annotations/
+description: Learn about how to template labels and annotations
+keywords:
+  - grafana
+  - alerting
+  - templating
+  - labels
+  - annotations
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Template labels and annotations
+weight: 500
+---
+
+# Template labels and annotations
+
+You can use templates to include data from queries and expressions in labels and annotations. For example, you might want to set the severity label for an alert based on the value of the query, or use the instance label from the query in a summary annotation so you know which server is experiencing high CPU usage.
+
+When using custom labels with templates it is important to make sure that the label value does not change between consecutive evaluations of the alert rule as this will end up creating large numbers of distinct alerts. However, it is OK for the template to produce different label values for different alerts. For example, do not put the value of the query in a custom label as this will end up creating a new set of alerts each time the value changes. Instead use annotations.
+
+All templates should be written in [text/template](https://pkg.go.dev/text/template). Regardless of whether you are templating a label or an annotation, you should write each template inline inside the label or annotation that you are templating. This means you cannot share templates between labels and annotations, and instead you will need to copy templates wherever you want to use them.
+
+Each template is evaluated whenever the alert rule is evaluated, and is evaluated for every alert separately. For example, if your alert rule has a templated summary annotation, and the alert rule has 10 firing alerts, then the template will be executed 10 times, once for each alert. You should try to avoid doing expensive computations in your templates as much as possible.
+
+## Examples
+
+Rather than write a complete tutorial on text/template, the following examples attempt to show the most common use-cases we have seen for templates. You can use these examples verbatim, or adapt them as necessary for your use case. For more information on how to write text/template refer to the [text/template](https://pkg.go.dev/text/template) documentation.
+
+### Print all labels, comma separated
+
+To print all labels, comma separated, print the `$labels` variable:
+
+```
+{{ $labels }}
+```
+
+For example, given an alert with the labels `alertname=High CPU usage`, `grafana_folder=CPU alerts` and `instance=server1`, this would print:
+
+```
+alertname=High CPU usage, grafana_folder=CPU alerts, instance=server1
+```
+
+> If you are using classic conditions then `$labels` will not contain any labels from the query. Refer to [the $labels variable](#the-labels-variable) for more information.
+
+### Print all labels, one per line
+
+To print all labels, one per line, use a `range` to iterate over each key/value pair and print them individually. Here `$k` refers to the name and `$v` refers to the value of the current label:
+
+```
+{{ range $k, $v := $labels -}}
+{{ $k }}={{ $v }}
+{{ end }}
+```
+
+For example, given an alert with the labels `alertname=High CPU usage`, `grafana_folder=CPU alerts` and `instance=server1`, this would print:
+
+```
+alertname=High CPU usage
+grafana_folder=CPU alerts
+instance=server1
+```
+
+> If you are using classic conditions then `$labels` will not contain any labels from the query. Refer to [the $labels variable](#the-labels-variable) for more information.
+
+### Print an individual label
+
+To print an individual label use the `index` function with the `$labels` variable:
+
+```
+The host {{ index $labels "instance" }} has exceeded 80% CPU usage for the last 5 minutes
+```
+
+For example, given an alert with the labels `instance=server1`, this would print:
+
+```
+The host server1 has exceeded 80% CPU usage for the last 5 minutes
+```
+
+> If you are using classic conditions then `$labels` will not contain any labels from the query. Refer to [the $labels variable](#the-labels-variable) for more information.
+
+### Print the value of a query
+
+To print the value of an instant query you can print its Ref ID using the `index` function and the `$values` variable:
+
+```
+{{ index $values "A" }}
+```
+
+For example, given an instant query that returns the value 81.2345, this will print:
+
+```
+81.2345
+```
+
+To print the value of a range query you must first reduce it from a time series to an instant vector with a reduce expression. You can then print the result of the reduce expression by using its Ref ID instead. For example, if the reduce expression takes the average of A and has the Ref ID B you would write:
+
+```
+{{ index $values "B" }}
+```
+
+### Print the humanized value of a query
+
+To print the humanized value of an instant query use the `humanize` function:
+
+```
+{{ humanize (index $values "A").Value }}
+```
+
+For example, given an instant query that returns the value 81.2345, this will print:
+
+```
+81.234
+```
+
+To print the humanized value of a range query you must first reduce it from a time series to an instant vector with a reduce expression. You can then print the result of the reduce expression by using its Ref ID instead. For example, if the reduce expression takes the average of A and has the Ref ID B you would write:
+
+```
+{{ humanize (index $values "B").Value }}
+```
+
+### Print the value of a query as a percentage
+
+To print the value of an instant query as a percentage use the `humanizePercentage` function:
+
+```
+{{ humanizePercentage (index $values "A").Value }}
+```
+
+This function expects the value to be a decimal number between 0 and 1. If the value is instead a decimal number between 0 and 100 you can either divide it by 100 in your query or using a math expression. If the query is a range query you must first reduce it from a time series to an instant vector with a reduce expression.
+
+### Set a severity from the value of a query
+
+To set a severity label from the value of a query use an if statement and the greater than comparison function. Make sure to use decimals (`80.0`, `50.0`, `0.0`, etc) when doing comparisons against `$values` as text/template does not support type coercion. You can find a list of all the supported comparison functions [here](https://pkg.go.dev/text/template#hdr-Functions).
+
+```
+{{ if (gt $values.A.Value 80.0) -}}
+high
+{{ else if (gt $values.A.Value 50.0) -}}
+medium
+{{ else -}}
+low
+{{- end }}
+```
+
+### Print all labels from a classic condition
+
+You cannot use `$labels` to print labels from the query if you are using classic conditions, and must use `$values` instead. The reason for this is classic conditions discard these labels to enforce uni-dimensional behavior (at most one alert per alert rule). If classic conditions didn't discard these labels, then queries that returned many time series would cause alerts to flap between firing and resolved constantly as the labels would change every time the alert rule was evaluated.
+
+Instead, the `$values` variable contains the reduced values of all time series for all conditions that are firing. For example, if you have an alert rule with a query A that returns two time series, and a classic condition B with two conditions, then `$values` would contain `B0`, `B1`, `B2` and `B3`. If the classic condition B had just one condition, then `$values` would contain just `B0` and `B1`.
+
+To print all labels of all firing time series use the following template (make sure to replace `B` in the regular expression with the Ref ID of the classic condition if it's different):
+
+```
+{{ range $k, $v := $values -}}
+{{ if (match "B[0-9]+" $k) -}}
+{{ $k }}: {{ $v.Labels }}{{ end }}
+{{ end }}
+```
+
+For example, a classic condition for two time series exceeding a single condition would print:
+
+```
+B0: instance=server1
+B1: instance=server2
+```
+
+If the classic condition has two or more conditions, and a time series exceeds multiple conditions at the same time, then its labels will be duplicated for each condition that is exceeded:
+
+```
+B0: instance=server1
+B1: instance=server2
+B2: instance=server1
+B3: instance=server2
+```
+
+If you need to print unique labels you should consider changing your alert rules from uni-dimensional to multi-dimensional instead. You can do this by replacing your classic condition with reduce and math expressions.
+
+### Print all values from a classic condition
+
+To print all values from a classic condition take the previous example and replace `$v.Labels` with `$v.Value`:
+
+```
+{{ range $k, $v := $values -}}
+{{ if (match "B[0-9]+" $k) -}}
+{{ $k }}: {{ $v.Value }}{{ end }}
+{{ end }}
+```
+
+For example, a classic condition for two time series exceeding a single condition would print:
+
+```
+B0: 81.2345
+B1: 84.5678
+```
+
+If the classic condition has two or more conditions, and a time series exceeds multiple conditions at the same time, then `$values` will contain the values of all conditions:
+
+```
+B0: 81.2345
+B1: 92.3456
+B2: 84.5678
+B3: 95.6789
+```
+
+## Variables
+
+The following variables are available to you when templating labels and annotations:
+
+### The labels variable
+
+The `$labels` variable contains all labels from the query. For example, suppose you have a query that returns CPU usage for all of your servers, and you have an alert rule that fires when any of your servers have exceeded 80% CPU usage for the last 5 minutes. You want to add a summary annotation to the alert that tells you which server is experiencing high CPU usage. With the `$labels` variable you can write a template that prints a human-readable sentence such as:
+
+```
+CPU usage for {{ index $labels "instance" }} has exceeded 80% for the last 5 minutes
+```
+
+> If you are using a classic condition then `$labels` will not contain any labels from the query. Classic conditions discard these labels in order to enforce uni-dimensional behavior (at most one alert per alert rule). If you want to use labels from the query in your template then use the example [here](#print-all-labels-from-a-classic-condition).
+
+### The value variable
+
+The `$value` variable is a string containing the labels and values of all instant queries; threshold, reduce and math expressions, and classic conditions in the alert rule. It does not contain the results of range queries, as these can return anywhere from 10s to 10,000s of rows or metrics. If it did, for especially large queries a single alert could use 10s of MBs of memory and Grafana would run out of memory very quickly.
+
+To print the `$value` variable in the summary you would write something like this:
+
+```
+CPU usage for {{ index $labels "instance" }} has exceeded 80% for the last 5 minutes: {{ $value }}
+```
+
+And would look something like this:
+
+```
+CPU usage for instance1 has exceeded 80% for the last 5 minutes: [ var='A' labels={instance=instance1} value=81.234 ]
+```
+
+Here `var='A'` refers to the instant query with Ref ID A, `labels={instance=instance1}` refers to the labels, and `value=81.234` refers to the average CPU usage over the last 5 minutes.
+
+If you want to print just some of the string instead of the full string then use the `$values` variable. It contains the same information as `$value`, but in a structured table, and is much easier to use then writing a regular expression to match just the text you want.
+
+### The values variable
+
+The `$values` variable is a table containing the labels and floating point values of all instant queries and expressions, indexed by their Ref IDs.
+
+To print the value of the instant query with Ref ID A:
+
+```
+CPU usage for {{ index $labels "instance" }} has exceeded 80% for the last 5 minutes: {{ index $values "A" }}
+```
+
+For example, given an alert with the labels `instance=server1` and an instant query with the value `81.2345`, this would print:
+
+```
+CPU usage for instance1 has exceeded 80% for the last 5 minutes: 81.2345
+```
+
+If the query in Ref ID A is a range query rather than an instant query then add a reduce expression with Ref ID B and replace `(index $values "A")` with `(index $values "B")`:
+
+```
+CPU usage for {{ index $labels "instance" }} has exceeded 80% for the last 5 minutes: {{ index $values "B" }}
+```
+
+## Functions
+
+The following functions are available to you when templating labels and annotations:
+
+### args
+
+The `args` function translates a list of objects to a map with keys arg0, arg1 etc. This is intended to allow multiple arguments to be passed to templates:
+
+```
+{{define "x"}}{{.arg0}} {{.arg1}}{{end}}{{template "x" (args 1 "2")}}
+```
+
+```
+1 2
+```
+
+### externalURL
+
+The `externalURL` function returns the external URL of the Grafana server as configured in the ini file(s):
+
+```
+{{ externalURL }}
+```
+
+```
+https://example.com/grafana
+```
+
+### graphLink
+
+The `graphLink` function returns the path to the graphical view in [Explore][explore] for the given expression and data source:
+
+```
+{{ graphLink "{\"expr\": \"up\", \"datasource\": \"gdev-prometheus\"}" }}
+```
+
+```
+/explore?left=["now-1h","now","gdev-prometheus",{"datasource":"gdev-prometheus","expr":"up","instant":false,"range":true}]
+```
+
+### humanize
+
+The `humanize` function humanizes decimal numbers:
+
+```
+{{ humanize 1000.0 }}
+```
+
+```
+1k
+```
+
+### humanize1024
+
+The `humanize1024` works similar to `humanize` but but uses 1024 as the base rather than 1000:
+
+```
+{{ humanize1024 1024.0 }}
+```
+
+```
+1ki
+```
+
+### humanizeDuration
+
+The `humanizeDuration` function humanizes a duration in seconds:
+
+```
+{{ humanizeDuration 60.0 }}
+```
+
+```
+1m 0s
+```
+
+### humanizePercentage
+
+The `humanizePercentage` function humanizes a ratio value to a percentage:
+
+```
+{{ humanizePercentage 0.2 }}
+```
+
+```
+20%
+```
+
+### humanizeTimestamp
+
+The `humanizeTimestamp` function humanizes a Unix timestamp:
+
+```
+{{ humanizeTimestamp 1577836800.0 }}
+```
+
+```
+2020-01-01 00:00:00 +0000 UTC
+```
+
+### match
+
+The `match` function matches the text against a regular expression pattern:
+
+```
+{{ match "a.*" "abc" }}
+```
+
+```
+true
+```
+
+### pathPrefix
+
+The `pathPrefix` function returns the path of the Grafana server as configured in the ini file(s):
+
+```
+{{ pathPrefix }}
+```
+
+```
+/grafana
+```
+
+### tableLink
+
+The `tableLink` function returns the path to the tabular view in [Explore][explore] for the given expression and data source:
+
+```
+{{ tableLink "{\"expr\": \"up\", \"datasource\": \"gdev-prometheus\"}" }}
+```
+
+```
+/explore?left=["now-1h","now","gdev-prometheus",{"datasource":"gdev-prometheus","expr":"up","instant":true,"range":false}]
+```
+
+### title
+
+The `title` function capitalizes the first character of each word:
+
+```
+{{ title "hello, world!" }}
+```
+
+```
+Hello, World!
+```
+
+### toLower
+
+The `toLower` function returns all text in lowercase:
+
+```
+{{ toLower "Hello, world!" }}
+```
+
+```
+hello, world!
+```
+
+### toUpper
+
+The `toUpper` function returns all text in uppercase:
+
+```
+{{ toUpper "Hello, world!" }}
+```
+
+```
+HELLO, WORLD!
+```
+
+### reReplaceAll
+
+The `reReplaceAll` function replaces text matching the regular expression:
+
+```
+{{ reReplaceAll "localhost:(.*)" "example.com:$1" "localhost:8080" }}
+```
+
+```
+example.com:8080
+```
+
+{{% docs/reference %}}
+[explore]: "/docs/ -> /docs/grafana/<GRAFANA_VERSION>/explore"
+{{% /docs/reference %}}
diff --git a/docs/sources/alerting/configure-notifications/_index.md b/docs/sources/alerting/configure-notifications/_index.md
new file mode 100644
index 0000000000000..f709efed8fa25
--- /dev/null
+++ b/docs/sources/alerting/configure-notifications/_index.md
@@ -0,0 +1,26 @@
+---
+canonical: https://grafana.com/docs/grafana/latest/alerting/configure-notifications
+description: Configure how, when, and where to send your alert notifications
+keywords:
+  - grafana
+  - alert
+  - notifications
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+menuTitle: Configure notifications
+title: Configure notifications
+weight: 125
+---
+
+# Configure notifications
+
+Choose how, when, and where to send your alert notifications.
+
+As a first step, define your contact points; where to send your alert notifications to. A contact point is a set of one or more integrations that are used to deliver notifications.
+
+Next, create a notification policy which is a set of rules for where, when and how your alerts are routed to contact points. In a notification policy, you define where to send your alert notifications by choosing one of the contact points you created.
+
+Optionally, you can add notification templates to contact points for reuse and consistent messaging in your notifications.
diff --git a/docs/sources/alerting/alerting-rules/create-notification-policy.md b/docs/sources/alerting/configure-notifications/create-notification-policy.md
similarity index 85%
rename from docs/sources/alerting/alerting-rules/create-notification-policy.md
rename to docs/sources/alerting/configure-notifications/create-notification-policy.md
index 38f478600e3b0..bcd9d8a80642e 100644
--- a/docs/sources/alerting/alerting-rules/create-notification-policy.md
+++ b/docs/sources/alerting/configure-notifications/create-notification-policy.md
@@ -1,10 +1,11 @@
 ---
 aliases:
-  - ../notifications/
-  - ../old-alerting/notifications/
-  - ../unified-alerting/notifications/
-canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/create-notification-policy/
-description: Notification policies
+  - ../notifications/ # /docs/grafana/<GRAFANA_VERSION>/alerting/notifications/
+  - ../unified-alerting/notifications/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/notifications/
+  - ../alerting-rules/create-notification-policy/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/create-notification-policy/
+  - ../manage-notifications/create-notification-policy/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/create-notification-policy/
+canonical: https://grafana.com/docs/grafana/latest/alerting/configure-notifications/create-notification-policy/
+description: Configure notification policies to determine how alerts are routed to contact points
 keywords:
   - grafana
   - alerting
@@ -36,14 +37,10 @@ For more information on notification policies, see [fundamentals of Notification
 
 ## Edit default notification policy
 
-{{% admonition type="note" %}}
-Before Grafana v8.2, the configuration of the embedded Alertmanager was shared across organizations. Users of Grafana 8.0 and 8.1 are advised to use the new Grafana 8 Alerts only if they have one organization. Otherwise, silences for the Grafana managed alerts will be visible by all organizations.
-{{% /admonition %}}
-
 1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
 1. Click **Notification policies**.
 1. From the **Choose Alertmanager** dropdown, select an external Alertmanager. By default, the **Grafana Alertmanager** is selected.
-1. In the Root policy section, click **Edit**.
+1. In the Default policy section, click **...** -> **Edit**.
 1. In **Default contact point**, update the contact point to whom notifications should be sent for rules when alert rules do not match any specific policy.
 1. In **Group by**, choose labels to group alerts by. If multiple alerts are matched for this policy, then they are grouped by these labels. A notification is sent per group. If the field is empty (default), then all notifications are sent in a single group. Use a special label `...` to group alerts by all labels (which effectively disables grouping).
 1. In **Timing options**, select from the following options:
@@ -75,13 +72,13 @@ To create a new notification policy, you need to follow its tree structure. New
 1. Click **+ Add nested policy**, then add the details using information in [Add new specific policy](#add-new-nested-policy).
 1. Click **Save policy** to save your changes.
 
-## Edit specific policy
+## Edit notification policies
 
 1. In the left-side menu, click **Alerts & IRM**, and then **Alerting**.
 1. Click **Notification policies**.
-1. Find the policy you want to edit, then click **Edit**.
+1. Find the policy you want to edit, then click **...** -> **Edit**.
 1. Make any changes using instructions in [Add new specific policy](#add-new-nested-policy).
-1. Click **Save policy**.
+1. Save your changes.
 
 ## Searching for policies
 
@@ -111,6 +108,6 @@ An example of an alert configuration.
 - Create specific routes for particular teams that handle their own on-call rotations.
 
 {{% docs/reference %}}
-[notification-policies]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/notification-policies"
-[notification-policies]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/notification-policies"
+[notification-policies]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notifications/notification-policies"
+[notification-policies]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/notifications/notification-policies"
 {{% /docs/reference %}}
diff --git a/docs/sources/alerting/configure-notifications/create-silence.md b/docs/sources/alerting/configure-notifications/create-silence.md
new file mode 100644
index 0000000000000..01d9062ea221a
--- /dev/null
+++ b/docs/sources/alerting/configure-notifications/create-silence.md
@@ -0,0 +1,79 @@
+---
+aliases:
+  - ../silences/create-silence/ # /docs/grafana/<GRAFANA_VERSION>/alerting/silences/create-silence/
+  - ../silences/edit-silence/ # /docs/grafana/<GRAFANA_VERSION>/alerting/silences/edit-silence/
+  - ../silences/linking-to-silence-form/ # /docs/grafana/<GRAFANA_VERSION>/alerting/silences/linking-to-silence-form/
+  - ../silences/remove-silence/ # /docs/grafana/<GRAFANA_VERSION>/alerting/silences/remove-silence/
+  - ../unified-alerting/silences/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/silences/
+  - ../silences/ # /docs/grafana/<GRAFANA_VERSION>/alerting/silences/
+  - ../manage-notifications/create-silence/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/create-silence/
+canonical: https://grafana.com/docs/grafana/latest/alerting/configure-notifications/create-silence/
+description: Create silences to stop notifications from getting created for a specified window of time
+keywords:
+  - grafana
+  - alerting
+  - silence
+  - mute
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Configure silences
+weight: 440
+---
+
+# Configure silences
+
+Silences stop notifications from getting created and last for only a specified window of time.
+
+{{< admonition type="note" >}}
+
+- Inhibition rules are not supported in the Grafana Alertmanager.
+- The preview of silenced alerts only applies to alerts in firing state.
+  {{< /admonition >}}
+
+## Add silences
+
+To add a silence, complete the following steps.
+
+1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
+1. Click **Silences**.
+1. From the **Alertmanager** dropdown, select an external Alertmanager to create and manage silences for the external data source. Otherwise, keep the default option of Grafana.
+1. Click **Create silence** to open the Create silence page.
+1. In **Silence start and end**, select the start and end date to indicate when the silence should go into effect and expire.
+1. Optionally, in **Duration**, specify how long the silence is enforced. This automatically updates the end time in the **Silence start and end** field.
+1. In the **Label** and **Value** fields, enter one or more _Matching Labels_. Matchers determine which rules the silence will apply to. Any matching alerts (in firing state) will show in the **Affected alert instances** field
+1. In **Comment**, add details about the silence.
+1. Click **Submit**.
+
+## Edit silences
+
+To edit a silence, complete the following steps.
+
+1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
+1. Click **Silences** to view the list of existing silences.
+1. Find the silence you want to edit, then click **Edit** (pen icon).
+1. Make the desired changes, then click **Submit** to save your changes.
+
+## Create a URL to link to a silence form
+
+When linking to a silence form, provide the default matching labels and comment via `matcher` and `comment` query parameters. The `matcher` parameter should be in the following format `[label][operator][value]` where the `operator` parameter can be one of the following: `=` (equals, not regex), `!=` (not equals, not regex), `=~` (equals, regex), `!~` (not equals, regex).
+The URL can contain many query parameters with the key `matcher`.
+For example, to link to silence form with matching labels `severity=critical` & `cluster!~europe-.*` and comment `Silence critical EU alerts`, create a URL `https://mygrafana/alerting/silence/new?matcher=severity%3Dcritical&matcher=cluster!~europe-*&comment=Silence%20critical%20EU%20alert`.
+
+To link to a new silence page for an external Alertmanager, add a `alertmanager` query parameter with the Alertmanager data source name.
+
+## Remove silences
+
+To remove a silence, complete the following steps.
+
+1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
+1. Click **Silences** to view the list of existing silences.
+1. Select the silence you want to end, then click **Unsilence**.
+
+> **Note:** You cannot remove a silence manually. Silences that have ended are retained and listed for five days.
+
+## Useful links
+
+[Aggregation operators](https://prometheus.io/docs/prometheus/latest/querying/operators/#aggregation-operators)
diff --git a/docs/sources/alerting/configure-notifications/manage-contact-points/_index.md b/docs/sources/alerting/configure-notifications/manage-contact-points/_index.md
new file mode 100644
index 0000000000000..0bb2064e0a829
--- /dev/null
+++ b/docs/sources/alerting/configure-notifications/manage-contact-points/_index.md
@@ -0,0 +1,144 @@
+---
+aliases:
+  - ../contact-points/create-contact-point/ # /docs/grafana/<GRAFANA_VERSION>/alerting/contact-points/create-contact-point/
+  - ../contact-points/delete-contact-point/ # /docs/grafana/<GRAFANA_VERSION>/alerting/contact-points/delete-contact-point/
+  - ../contact-points/edit-contact-point/ # /docs/grafana/<GRAFANA_VERSION>/alerting/contact-points/edit-contact-point/
+  - ../contact-points/test-contact-point/ # /docs/grafana/<GRAFANA_VERSION>/alerting/contact-points/test-contact-point/
+  - ../manage-notifications/manage-contact-points/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/manage-contact-points/
+  - ../alerting-rules/create-contact-point/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/create-contact-point/
+  - ../alerting-rules/manage-contact-points/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/manage-contact-points/
+  - ../alerting-rules/create-notification-policy/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/create-notification-policy/
+  - ../alerting-rules/manage-contact-points/integrations/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/manage-contact-points/integrations/
+  - ../manage-notifications/manage-contact-points/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/manage-contact-points/
+canonical: https://grafana.com/docs/grafana/latest/alerting/configure-notifications/manage-contact-points/
+description: Configure contact points to define how your contacts are notified when an alert rule fires
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Configure contact points
+weight: 410
+---
+
+# Configure contact points
+
+Use contact points to define how your contacts are notified when an alert rule fires. You can add, edit, delete, and test a contact point.
+
+Configure contact point integrations in Grafana to select your preferred communication channel for receiving notifications when your alert rules are firing.
+
+## Add a contact point
+
+Complete the following steps to add a contact point.
+
+1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
+1. Click **Contact points**.
+1. From the **Choose Alertmanager** dropdown, select an Alertmanager. By default, **Grafana Alertmanager** is selected.
+1. On the **Contact Points** tab, click **+ Add contact point**.
+1. Enter a descriptive name for the contact point.
+1. From **Integration**, select a type and fill out mandatory fields. For example, if you choose email, enter the email addresses. Or if you choose Slack, enter the Slack channel(s) and users who should be contacted.
+1. Some contact point integrations, like email or webhook, have optional settings. In **Optional settings**, specify additional settings for the selected contact point integration.
+1. In Notification settings, optionally select **Disable resolved message** if you do not want to be notified when an alert resolves.
+1. To add another contact point integration, click **Add contact point integration** and repeat steps 6 through 8.
+1. Save your changes.
+
+## Edit a contact point
+
+Complete the following steps to edit a contact point.
+
+1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
+1. Click **Contact points** to view a list of existing contact points.
+1. On the **Contact Points** tab, find the contact point you want to edit, and then click **Edit**.
+1. Update the contact point and save your changes.
+
+## Delete a contact point
+
+Complete the following steps to delete a contact point.
+
+1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
+1. Click **Contact points** to view a list of existing contact points.
+1. On the **Contact Points** tab, find the contact point you want to delete, and then click **More** -> **Delete**.
+1. In the confirmation dialog, click **Yes, delete**.
+
+{{% admonition type="note" %}}
+You cannot delete contact points that are in use by a notification policy. Either delete the notification policy or update it to use another contact point.
+{{% /admonition %}}
+
+## Test a contact point
+
+Complete the following steps to test a contact point.
+
+1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
+1. Click **Contact points** to view a list of existing contact points.
+1. On the **Contact Points** tab, find the contact point you want to test, then click **Edit**. You can also create a new contact point if needed.
+1. Click **Test** to open the contact point testing modal.
+1. Choose whether to send a predefined test notification or choose custom to add your own custom annotations and labels to include in the notification.
+1. Click **Send test notification** to fire the alert.
+
+## Manage contact points
+
+The Contact points list view lists all existing contact points and notification templates.
+
+On the **Contact Points** tab, you can:
+
+- Search for name and type of contact points and integrations
+- View all existing contact points and integrations
+- View how many notification policies each contact point is being used for and navigate directly to the linked notification policies
+- View the status of notification deliveries
+- Export individual contact points or all contact points in JSON, YAML, or Terraform format
+- Delete contact points that are not in use by a notification policy
+
+On the **Notification templates** tab, you can:
+
+- View, edit, copy or delete existing notification templates
+
+## Configure contact point integrations
+
+Each contact point integration has its own configuration options and setup process. In most cases, this involves providing an API key or a Webhook URL.
+
+Once configured, you can use integrations as part of your contact points to receive notifications whenever your alert changes its state. In this section, we'll cover the basic steps to configure your integrations, so you can start receiving real-time alerts and stay on top of your monitoring data.
+
+## List of supported integrations
+
+| Name                     | Type                      |
+| ------------------------ | ------------------------- |
+| DingDing                 | `dingding`                |
+| Discord                  | `discord`                 |
+| Email                    | `email`                   |
+| Google Chat              | `googlechat`              |
+| [Grafana Oncall][oncall] | `oncall`                  |
+| Hipchat                  | `hipchat`                 |
+| Kafka                    | `kafka`                   |
+| Line                     | `line`                    |
+| Microsoft Teams          | `teams`                   |
+| Opsgenie                 | `opsgenie`                |
+| [Pagerduty][pagerduty]   | `pagerduty`               |
+| Prometheus Alertmanager  | `prometheus-alertmanager` |
+| Pushover                 | `pushover`                |
+| Sensu                    | `sensu`                   |
+| Sensu Go                 | `sensugo`                 |
+| [Slack][slack]           | `slack`                   |
+| Telegram                 | `telegram`                |
+| Threema                  | `threema`                 |
+| VictorOps                | `victorops`               |
+| [Webhook][webhook]       | `webhook`                 |
+
+{{% docs/reference %}}
+[pagerduty]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/manage-contact-points/integrations/pager-duty"
+[pagerduty]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/manage-contact-points/integrations/pager-duty"
+
+[oncall]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/manage-contact-points/integrations/configure-oncall"
+[oncall]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/manage-contact-points/integrations/configure-oncall"
+
+[slack]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/manage-contact-points/integrations/configure-slack"
+[slack]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/manage-contact-points/integrations/configure-slack"
+
+[webhook]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/manage-contact-points/integrations/webhook-notifier"
+[webhook]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/manage-contact-points/integrations/webhook-notifier"
+{{% /docs/reference %}}
diff --git a/docs/sources/alerting/configure-notifications/manage-contact-points/integrations/configure-oncall.md b/docs/sources/alerting/configure-notifications/manage-contact-points/integrations/configure-oncall.md
new file mode 100644
index 0000000000000..e55761ad318fc
--- /dev/null
+++ b/docs/sources/alerting/configure-notifications/manage-contact-points/integrations/configure-oncall.md
@@ -0,0 +1,77 @@
+---
+aliases:
+  - ../../../alerting-rules/manage-contact-points/configure-oncall/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/manage-contact-points/configure-oncall/
+  - ../../../alerting-rules/manage-contact-points/integrations/configure-oncall/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/manage-contact-points/integrations/configure-oncall/
+canonical: https://grafana.com/docs/grafana/latest/alerting/configure-notifications/manage-contact-points/integrations/configure-oncall/
+description: Configure the Alerting - Grafana OnCall integration to connect alerts generated by Grafana Alerting with Grafana OnCall
+keywords:
+  - grafana
+  - alerting
+  - oncall
+  - integration
+aliases:
+  - ../configure-oncall/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/manage-contact-points/configure-oncall/
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+menuTitle: Grafana OnCall
+title: Configure Grafana OnCall for Alerting
+weight: 300
+---
+
+## Configure Grafana OnCall for Alerting
+
+Use the Grafana Alerting - Grafana OnCall integration to effortlessly connect alerts generated by Grafana Alerting with Grafana OnCall, where you can then route them according to defined escalation chains and schedules.
+
+You can set up the integration using the Grafana Alerting application or the Grafana OnCall application. For more information on setting it up from the Grafana OnCall application, see [Grafana OnCall documentation][oncall-integration].
+
+### Before you begin
+
+- Ensure you have Installed and enabled the Grafana OnCall plugin
+- Ensure your version of Grafana is up-to-date and supports the new features
+
+### Procedure
+
+To set up the Grafana OnCall integration using the Grafana Alerting application, complete the following steps.
+
+1. Navigate to **Alerts&IRM** -> **Alerting** -> **Contact points**.
+1. Click **+ Add contact point**.
+1. Enter a contact point name.
+1. From the Integration list, select Grafana OnCall.
+
+   **Note:**
+
+   The Grafana OnCall integration is only available for Grafana Alertmanager.
+
+1. Choose whether to add a new OnCall integration or add an existing one.
+
+   - If you add a new one, enter an Integration name.
+   - If you add an existing one, choose from the list of available integrations
+
+1. Click **Save contact point**.
+
+1. On the Contact points list view page, you can see the contact point with the Grafana OnCall icon.
+
+   If the integration is not yet being used anywhere in the notification policies tree, it will have **Unused** as its status in the **Health** column. It won’t receive any notifications, because there are no notifications using that integration.
+
+1. Connect your contact point to a notification policy.
+
+   For more information on connecting your contact point to a notification policy, see
+   [Create notification policy][create-notification-policy].
+
+1. To view your integration in the Grafana OnCall application and set up routes and escalation chains, click the Link next to the integration on the Contact points list view page in the **Type** column.
+
+   This redirects you to the Grafana OnCall integration page in the Grafana OnCall application. From there, you can add [routes and escalation chains][escalation-chain].
+
+{{% docs/reference %}}
+[create-notification-policy]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/create-notification-policy"
+[create-notification-policy]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/create-notification-policy"
+
+[oncall-integration]: "/docs/grafana/ -> /docs/oncall/latest/integrations/grafana-alerting"
+[oncall-integration]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/oncall/integrations/grafana-alerting"
+
+[escalation-chain]: "/docs/grafana/ -> /docs/oncall/latest/configure/escalation-chains-and-routes"
+[escalation-chain]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/oncall/configure/escalation-chains-and-routes"
+{{% /docs/reference %}}
diff --git a/docs/sources/alerting/configure-notifications/manage-contact-points/integrations/configure-slack.md b/docs/sources/alerting/configure-notifications/manage-contact-points/integrations/configure-slack.md
new file mode 100644
index 0000000000000..e80048d0e53ae
--- /dev/null
+++ b/docs/sources/alerting/configure-notifications/manage-contact-points/integrations/configure-slack.md
@@ -0,0 +1,93 @@
+---
+canonical: https://grafana.com/docs/grafana/latest/alerting/configure-notifications/manage-contact-points/integrations/configure-slack/
+description: Configure the Slack integration to connect alerts generated by Grafana Alerting
+keywords:
+  - grafana
+  - alerting
+  - slack
+  - integration
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+menuTitle: Slack
+title: Configure Slack for Alerting
+weight: 300
+---
+
+# Configure Slack for Alerting
+
+Use the Grafana Alerting - Slack integration to send Slack notifications when your alerts are firing.
+
+There are two ways of integrating Slack into Grafana Alerting.
+
+1. Use a [Slack API token](https://api.slack.com/authentication/token-types)
+
+   Enable your app to access the Slack API. If, for example, you are interested in more granular control over permissions, or your project is expected to regularly scale, resulting in new channels being created, this is the best option.
+
+1. Use a [Webhook URL](https://api.slack.com/messaging/webhooks)
+
+   Webhooks is the simpler way to post messages into Slack. Slack automatically creates a bot user with all the necessary permissions to post messages to one particular channel of your choice.
+
+{{< admonition type="note" >}}
+Grafana Alerting only allows one Slack channel per contact point.
+{{< /admonition >}}
+
+## Before you begin
+
+### Slack API Token
+
+If you are using a Slack API Token, complete the following steps.
+
+1. Follow steps 1 and 2 of the [Slack API Quickstart](https://api.slack.com/start/quickstart).
+1. Add the [chat:write.public](https://api.slack.com/scopes/chat:write.public) scope to give your app the ability to post in all public channels without joining.
+1. In OAuth Tokens for Your Workspace, copy the Bot User OAuth Token.
+1. Open your Slack workplace.
+1. Right click the channel you want to receive notifications in.
+1. Click View channel details.
+1. Scroll down and copy the Channel ID.
+   {{< admonition type="note" >}}
+   While going through these steps, Slack may prompt you to Reinstall your app in order for the changes to take effect.
+   {{< /admonition >}}
+
+### Webhook URL
+
+If you are using a Webhook URL, follow steps 1 and 5 in the [Slack API Quickstart](https://api.slack.com/start/quickstart).
+
+{{< admonition type="note" >}}
+Make sure you copy the Slack app Webhook URL. You will need this when setting up your contact point integration in Grafana Alerting.
+{{< /admonition >}}
+
+## Procedure
+
+To create your Slack integration in Grafana Alerting, complete the following steps.
+
+1. Navigate to **Alerts & IRM** -> **Alerting** -> **Contact points**.
+1. Click **+ Add contact point**.
+1. Enter a contact point name.
+1. From the Integration list, select Slack.
+1. If you are using a Slack API token:
+   - In the **Recipient** field, copy in the channel ID.
+   - In the **Token** field, copy in the Bot User OAuth Token that starts with “xoxb-”.
+1. If you are using a Webhook URL, in the **Webhook** field, copy in your Slack app Webhook URL.
+1. Click **Test** to check that your integration works.
+1. Click **Save contact point**.
+
+## Next steps
+
+To add the contact point and integration you created to your default notification policy, complete the following steps.
+
+1. Navigate to **Alerts & IRM** -> **Alerting** -> **Notification policies**.
+1. In the **Default policy**, click the ellipsis icon (…) and then **Edit**,
+1. Change the default policy to the contact point you created.
+1. Click **Update default policy**.
+
+**Note:**
+If you have more than one contact point, add a new notification policy rather than edit the default one, so you can route specific alerts to Slack. For more information, refer to [Notification policies][nested-policy].
+
+{{% docs/reference %}}
+[nested-policy]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/create-notification-policy#add-new-nested-policy"
+
+[nested-policy]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/create-notification-policy#add-new-nested-policy"
+{{% /docs/reference %}}
diff --git a/docs/sources/alerting/configure-notifications/manage-contact-points/integrations/configure-telegram.md b/docs/sources/alerting/configure-notifications/manage-contact-points/integrations/configure-telegram.md
new file mode 100644
index 0000000000000..e0c237211de51
--- /dev/null
+++ b/docs/sources/alerting/configure-notifications/manage-contact-points/integrations/configure-telegram.md
@@ -0,0 +1,95 @@
+---
+canonical: https://grafana.com/docs/grafana/latest/alerting/configure-notifications/manage-contact-points/integrations/configure-telegram/
+description: Configure the Telegram integration to connect alerts generated by Grafana Alerting
+keywords:
+  - grafana
+  - alerting
+  - telegram
+  - integration
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+menuTitle: Telegram
+title: Configure Telegram for Alerting
+weight: 300
+---
+
+# Configure Telegram for Alerting
+
+Use the Grafana Alerting - Telegram integration to send [Telegram](https://telegram.org/) notifications when your alerts are firing.
+
+## Before you begin
+
+### Telegram bot API token and chat ID
+
+To integrate Grafana with Telegram, you need to obtain a Telegram **bot API token** and a **chat ID** (i.e., the ID of the Telegram chat where you want to receive the alert notifications).
+
+### Set up your Telegram bot
+
+Create a [Telegram bot](https://core.telegram.org/bots/api). You can associate this bot to your chats and perform different actions with it, such as receiving alerts from Grafana.
+
+To set up the bot, complete the following steps.
+
+1. **Open the Telegram app** on your device.
+1. Find the Telegram bot named **BotFather**.
+1. Type or press `/newbot`.
+1. Choose a name for the bot. It must end in **bot** or **\_bot**. E.g. "my_bot".
+1. **Copy the API token**.
+
+### Chat ID
+
+Add the bot to a group chat by following the steps below. Once the bot is added to the chat, you will be able to route your alert notifications to that group.
+
+1. In the Telegram app, **open a group or start a new one**.
+1. Search and **add the bot to the group**.
+1. **Interact with the bot** by sending a dummy message that starts with "`/`". E.g. `/hola @bot_name`.
+
+   {{< figure src="/media/blog/telegram-grafana-alerting/telegram-screenshot.png" alt="A screenshot that shows a message to a Telegram bot." >}}
+
+1. To obtain the **chat ID**, send an [HTTP request](https://core.telegram.org/bots/api#getupdates) to the bot. Copy the below URL and replace `{your_bot_api_token}` with your bot API token.
+
+   ```
+   https://api.telegram.org/bot{your_bot_api_token}/getUpdates
+   ```
+
+1. **Paste the URL in your browser**.
+1. If the request is successful, it will return a response in JSON format.
+
+   ```
+   ...
+   "chat": {
+           "id": -4065678900,
+           "title": "Tony and Hello world bot",
+           "type": "group",
+   ...
+   ```
+
+1. Copy the value of the `“id”` that appears under `“chat”`.
+
+## Procedure
+
+To create your Telegram integration in Grafana Alerting, complete the following steps.
+
+1. Navigate to **Alerts & IRM** -> **Alerting** -> **Contact points**.
+1. Click **+ Add contact point**.
+1. Enter a contact point name.
+1. From the Integration list, select Telegram.
+1. In the **BOT API Token** field, copy in the bot API token.
+1. In the **Chat ID** field, copy in the chat ID.
+1. Click **Test** to check that your integration works.
+1. Click **Save contact point**.
+
+## Next steps
+
+To add the contact point and integration you created to your default notification policy, complete the following steps.
+
+1. Navigate to **Alerts & IRM** -> **Alerting** -> **Notification policies**.
+1. In the **Default policy**, click the ellipsis icon (…) and then **Edit**.
+1. Change the default policy to the contact point you created.
+1. Click **Update default policy**.
+
+{{<admonition type="note">}}
+If you have more than one contact point, add a new child notification policy rather than edit the default one, so you can route specific alerts to Telegram.
+{{</admonition>}}
diff --git a/docs/sources/alerting/configure-notifications/manage-contact-points/integrations/pager-duty.md b/docs/sources/alerting/configure-notifications/manage-contact-points/integrations/pager-duty.md
new file mode 100644
index 0000000000000..5ba0bf1789f04
--- /dev/null
+++ b/docs/sources/alerting/configure-notifications/manage-contact-points/integrations/pager-duty.md
@@ -0,0 +1,73 @@
+---
+aliases:
+  - ../../../alerting-rules/manage-contact-points/integrations/pager-duty/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/manage-contact-points/integrations/pager-duty/
+canonical: https://grafana.com/docs/grafana/latest/alerting/configure-notifications/manage-contact-points/integrations/pager-duty/
+description: Configure the PagerDuty integration for Alerting
+keywords:
+  - grafana
+  - alerting
+  - pagerduty
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+menuTitle: PagerDuty
+title: Configure PagerDuty for Alerting
+weight: 400
+---
+
+# Configure PagerDuty for Alerting
+
+Use the Grafana Alerting - PagerDuty integration to receive notifications in PagerDuty when your alerts are firing.
+
+## Before you begin
+
+To set up PagerDuty for integration with Grafana Alerting, you need to create a [PagerDuty](https://www.pagerduty.com/) account. There are several set up steps to perform within PagerDuty before you set up the integration in Grafana Alerting.
+
+### Create a Service
+
+In PagerDuty, a service represents a component, microservice, or infrastructure element that a team oversees, manages, and monitors.
+
+1. Refer to [PagerDuty’s services and integrations guide](https://support.pagerduty.com/docs/services-and-integrations#create-a-service).
+
+1. Follow steps 1 to 5 under **Create a Service**.
+
+{{< admonition type="note" >}}
+In step 5, choose **Create a service without an integration**.
+{{< /admonition >}}
+
+### Obtain a PagerDuty integration key
+
+1. Once the service is created, click **Integrations** within the Service options.
+1. Click **+ Add an integration**.
+1. Select **Events API V2**.
+1. Click **Add**.
+1. Click the drop-down arrow to display the integration details.
+1. Copy the **Integration Key**.
+
+## Procedure
+
+To create your PagerDuty integration in Grafana Alerting, complete the following steps.
+
+1. Navigate to **Alerts & IRM** -> **Alerting** -> **Contact points**.
+1. Click **+ Add contact point**.
+1. Enter a contact point name.
+   F1. rom the Integration list, select **PagerDuty**.
+1. In the **Integration Key** field, copy in your integration key.
+1. Click **Test** to check that your integration works.
+
+   An incident should display in the Service’s Activity tab in PagerDuty.
+
+1. Click **Save contact point**.
+
+## Next steps
+
+To add the contact point and integration you created to your default notification policy, complete the following steps.
+
+1. Navigate to **Alerts & IRM** -> **Alerting** -> **Notification policies**.
+1. In the Default policy, click the ellipsis icon (…) and then **Edit**.
+1. Change the default policy to the contact point you created.
+1. Click **Update default policy**.
+
+{{< admonition type="note" >}} If you have more than one contact point, add a new notification policy rather than edit the default one, so you can route specific alerts to PagerDuty. {{< /admonition >}}
diff --git a/docs/sources/alerting/configure-notifications/manage-contact-points/integrations/webhook-notifier.md b/docs/sources/alerting/configure-notifications/manage-contact-points/integrations/webhook-notifier.md
new file mode 100644
index 0000000000000..13d072a027952
--- /dev/null
+++ b/docs/sources/alerting/configure-notifications/manage-contact-points/integrations/webhook-notifier.md
@@ -0,0 +1,168 @@
+---
+aliases:
+  - ../../../fundamentals/contact-points/notifiers/webhook-notifier/ # /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/contact-points/notifiers/webhook-notifier/
+  - ../../../fundamentals/contact-points/webhook-notifier/ # /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/contact-points/webhook-notifier/
+  - ../../../manage-notifications/manage-contact-points/webhook-notifier/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/manage-contact-points/webhook-notifier/
+  - alerting/manage-notifications/manage-contact-points/webhook-notifier/
+  - ../../../alerting-rules/manage-contact-points/integrations/webhook-notifier/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/manage-contact-points/integrations/webhook-notifier/
+
+canonical: https://grafana.com/docs/grafana/latest/alerting/configure-notifications/manage-contact-points/integrations/webhook-notifier/
+description: Configure the webhook notifier integration for Alerting
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+menuTitle: Webhook notifier
+title: Configure the webhook notifier for Alerting
+weight: 200
+---
+
+# Configure the webhook notifier for Alerting
+
+The webhook notification is a simple way to send information about a state change over HTTP to a custom endpoint. Using this notification you could integrate Grafana into a system of your choosing.
+
+## Webhook JSON payload
+
+```json
+{
+  "receiver": "My Super Webhook",
+  "status": "firing",
+  "orgId": 1,
+  "alerts": [
+    {
+      "status": "firing",
+      "labels": {
+        "alertname": "High memory usage",
+        "team": "blue",
+        "zone": "us-1"
+      },
+      "annotations": {
+        "description": "The system has high memory usage",
+        "runbook_url": "https://myrunbook.com/runbook/1234",
+        "summary": "This alert was triggered for zone us-1"
+      },
+      "startsAt": "2021-10-12T09:51:03.157076+02:00",
+      "endsAt": "0001-01-01T00:00:00Z",
+      "generatorURL": "https://play.grafana.org/alerting/1afz29v7z/edit",
+      "fingerprint": "c6eadffa33fcdf37",
+      "silenceURL": "https://play.grafana.org/alerting/silence/new?alertmanager=grafana&matchers=alertname%3DT2%2Cteam%3Dblue%2Czone%3Dus-1",
+      "dashboardURL": "",
+      "panelURL": "",
+      "values": {
+        "B": 44.23943737541908,
+        "C": 1
+      }
+    },
+    {
+      "status": "firing",
+      "labels": {
+        "alertname": "High CPU usage",
+        "team": "blue",
+        "zone": "eu-1"
+      },
+      "annotations": {
+        "description": "The system has high CPU usage",
+        "runbook_url": "https://myrunbook.com/runbook/1234",
+        "summary": "This alert was triggered for zone eu-1"
+      },
+      "startsAt": "2021-10-12T09:56:03.157076+02:00",
+      "endsAt": "0001-01-01T00:00:00Z",
+      "generatorURL": "https://play.grafana.org/alerting/d1rdpdv7k/edit",
+      "fingerprint": "bc97ff14869b13e3",
+      "silenceURL": "https://play.grafana.org/alerting/silence/new?alertmanager=grafana&matchers=alertname%3DT1%2Cteam%3Dblue%2Czone%3Deu-1",
+      "dashboardURL": "",
+      "panelURL": "",
+      "values": {
+        "B": 44.23943737541908,
+        "C": 1
+      }
+    }
+  ],
+  "groupLabels": {},
+  "commonLabels": {
+    "team": "blue"
+  },
+  "commonAnnotations": {},
+  "externalURL": "https://play.grafana.org/",
+  "version": "1",
+  "groupKey": "{}:{}",
+  "truncatedAlerts": 0,
+  "title": "[FIRING:2]  (blue)",
+  "state": "alerting",
+  "message": "**Firing**\n\nLabels:\n - alertname = T2\n - team = blue\n - zone = us-1\nAnnotations:\n - description = This is the alert rule checking the second system\n - runbook_url = https://myrunbook.com\n - summary = This is my summary\nSource: https://play.grafana.org/alerting/1afz29v7z/edit\nSilence: https://play.grafana.org/alerting/silence/new?alertmanager=grafana&matchers=alertname%3DT2%2Cteam%3Dblue%2Czone%3Dus-1\n\nLabels:\n - alertname = T1\n - team = blue\n - zone = eu-1\nAnnotations:\nSource: https://play.grafana.org/alerting/d1rdpdv7k/edit\nSilence: https://play.grafana.org/alerting/silence/new?alertmanager=grafana&matchers=alertname%3DT1%2Cteam%3Dblue%2Czone%3Deu-1\n"
+}
+```
+
+## Webhook fields
+
+### Body
+
+| Key               | Type                      | Description                                                                     |
+| ----------------- | ------------------------- | ------------------------------------------------------------------------------- |
+| receiver          | string                    | Name of the webhook                                                             |
+| status            | string                    | Current status of the alert, `firing` or `resolved`                             |
+| orgId             | number                    | ID of the organization related to the payload                                   |
+| alerts            | array of [alerts](#alert) | Alerts that are triggering                                                      |
+| groupLabels       | object                    | Labels that are used for grouping, map of string keys to string values          |
+| commonLabels      | object                    | Labels that all alarms have in common, map of string keys to string values      |
+| commonAnnotations | object                    | Annotations that all alarms have in common, map of string keys to string values |
+| externalURL       | string                    | External URL to the Grafana instance sending this webhook                       |
+| version           | string                    | Version of the payload                                                          |
+| groupKey          | string                    | Key that is used for grouping                                                   |
+| truncatedAlerts   | number                    | Number of alerts that were truncated                                            |
+| title             | string                    | **Will be deprecated soon**                                                     |
+| state             | string                    | **Will be deprecated soon**                                                     |
+| message           | string                    | **Will be deprecated soon**                                                     |
+
+### Alert
+
+| Key          | Type   | Description                                                                        |
+| ------------ | ------ | ---------------------------------------------------------------------------------- |
+| status       | string | Current status of the alert, `firing` or `resolved`                                |
+| labels       | object | Labels that are part of this alert, map of string keys to string values            |
+| annotations  | object | Annotations that are part of this alert, map of string keys to string values       |
+| startsAt     | string | Start time of the alert                                                            |
+| endsAt       | string | End time of the alert, default value when not resolved is `0001-01-01T00:00:00Z`   |
+| values       | object | Values that triggered the current status                                           |
+| generatorURL | string | URL of the alert rule in the Grafana UI                                            |
+| fingerprint  | string | The labels fingerprint, alarms with the same labels will have the same fingerprint |
+| silenceURL   | string | URL to silence the alert rule in the Grafana UI                                    |
+| dashboardURL | string | **Will be deprecated soon**                                                        |
+| panelURL     | string | **Will be deprecated soon**                                                        |
+| imageURL     | string | URL of a screenshot of a panel assigned to the rule that created this notification |
+
+{{< admonition type="note" >}}
+Alert rules are not coupled to dashboards anymore therefore the fields related to dashboards `dashboardId` and `panelId` have been removed.
+{{< /admonition >}}
+
+## Procedure
+
+To create your webhook integration in Grafana Alerting, complete the following steps:
+
+1. Navigate to **Alerts & IRM** -> **Alerting** -> **Contact points**.
+1. Click **+ Add contact point**.
+1. Enter a contact point name.
+1. From the Integration list, select **Webhook**.
+1. In the **URL** field, copy in your Webhook URL.
+1. Click **Test** to check that your integration works.
+1. Click **Save contact point**.
+
+## Next steps
+
+To add the contact point and integration you created to your default notification policy, complete the following steps.
+
+1. Navigate to **Alerts & IRM** -> **Alerting** -> **Notification policies**.
+1. In the **Default policy**, click the ellipsis icon (…) and then **Edit**.
+1. Change the default policy to the contact point you created.
+1. Click **Update default policy**.
+
+{{< admonition type="note" >}}
+If you have more than one contact point, add a new notification policy rather than edit the default one, so you can route specific alerts to your webhook.
+{{< /admonition >}}
diff --git a/docs/sources/alerting/configure-notifications/mute-timings.md b/docs/sources/alerting/configure-notifications/mute-timings.md
new file mode 100644
index 0000000000000..9e2efeef2b840
--- /dev/null
+++ b/docs/sources/alerting/configure-notifications/mute-timings.md
@@ -0,0 +1,90 @@
+---
+aliases:
+  - ../notifications/mute-timings/ # /docs/grafana/<GRAFANA_VERSION>/alerting/notifications/mute-timings/
+  - ../unified-alerting/notifications/mute-timings/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/notifications/mute-timings/
+  - ../manage-notifications/mute-timings/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/mute-timings/
+canonical: /docs/grafana/latest/alerting/configure-notifications/mute-timings/
+description: Create mute timings to prevent alerts from firing during a specific and reoccurring period of time
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - mute
+  - mute timings
+  - mute time interval
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Configure mute timings
+weight: 450
+---
+
+# Configure mute timings
+
+A mute timing is a recurring interval of time when no new notifications for a policy are generated or sent. Use them to prevent alerts from firing a specific and reoccurring period, for example, a regular maintenance period.
+
+Similar to silences, mute timings do not prevent alert rules from being evaluated, nor do they stop alert instances from being shown in the user interface. They only prevent notifications from being created.
+
+You can configure Grafana managed mute timings as well as mute timings for an [external Alertmanager data source][datasources/alertmanager]. For more information, refer to [Alertmanager documentation][intro-alertmanager].
+
+## Mute timings vs silences
+
+The following table highlights the key differences between mute timings and silences.
+
+| Mute timing                                        | Silence                                                                      |
+| -------------------------------------------------- | ---------------------------------------------------------------------------- |
+| Uses time interval definitions that can reoccur    | Has a fixed start and end time                                               |
+| Is created and then added to notification policies | Uses labels to match against an alert to determine whether to silence or not |
+
+## Add mute timings
+
+1. In the left-side menu, click **Alerts & IRM**, and then **Alerting**.
+1. Click **Notification policies** and then the **Mute Timings** tab.
+1. From the **Alertmanager** dropdown, select an external Alertmanager. By default, the **Grafana Alertmanager** is selected.
+1. Click **+ Add mute timing**.
+1. Fill out the form to create a [time interval](#time-intervals) to match against for your mute timing.
+1. Save your mute timing.
+
+## Add mute timing to a notification policy
+
+1. In the left-side menu, click **Alerts & IRM**, and then **Alerting**.
+1. Click **Notification policies** and make sure you are on the **Notification Policies** tab.
+1. Find the notification policy you would like to add the mute timing to and click **...** -> **Edit**.
+1. From the **Mute timings** dropdown, choose the mute timings you would like to add to the policy.
+1. Save your changes.
+
+## Time intervals
+
+A time interval is a specific duration during which alerts are suppressed. The duration typically consists of a specific time range and the days of the week, month, or year.
+
+Supported time interval options are:
+
+- Time range: The time inclusive of the start and exclusive of the end time (in UTC if no location has been selected, otherwise local time).
+- Location: Depending on the location you select, the time range is displayed in local time.
+- Days of the week: The day or range of days of the week. Example: `monday:thursday`.
+- Days of the month: The date 1-31 of a month. Negative values can also be used to represent days that begin at the end of the month. For example: `-1` for the last day of the month.
+- Months: The months of the year in either numerical or the full calendar month. For example: `1, may:august`.
+- Years: The year or years for the interval. For example: `2021:2024`.
+
+All fields are lists; to match the field, at least one list element must be satisfied. Fields also support ranges using `:` (e.g., `monday:thursday`).
+
+If a field is left blank, any moment of time will match the field. For an instant of time to match a complete time interval, all fields must match. A mute timing can contain multiple time intervals.
+
+If you want to specify an exact duration, specify all the options. For example, if you wanted to create a time interval for the first Monday of the month, for March, June, September, and December, between the hours of 12:00 and 24:00 UTC your time interval specification would be:
+
+- Time range:
+  - Start time: `12:00`
+  - End time: `24:00`
+- Days of the week: `monday`
+- Months: `3, 6, 9, 12`
+- Days of the month: `1:7`
+
+{{% docs/reference %}}
+[datasources/alertmanager]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/datasources/alertmanager"
+[datasources/alertmanager]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/connect-externally-hosted/data-sources/alertmanager"
+
+[intro-alertmanager]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notifications/alertmanager"
+[intro-alertmanager]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/notifications/alertmanager"
+{{% /docs/reference %}}
diff --git a/docs/sources/alerting/configure-notifications/template-notifications/_index.md b/docs/sources/alerting/configure-notifications/template-notifications/_index.md
new file mode 100644
index 0000000000000..e4bcf9448de40
--- /dev/null
+++ b/docs/sources/alerting/configure-notifications/template-notifications/_index.md
@@ -0,0 +1,62 @@
+---
+aliases:
+  - ../manage-notifications/template-notifications/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/template-notifications/
+canonical: https://grafana.com/docs/grafana/latest/alerting/configure-notifications/template-notifications/
+description: Customize your notifications using notification templates
+keywords:
+  - grafana
+  - alerting
+  - notifications
+  - templates
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Configure notification messages
+weight: 430
+---
+
+# Configure notification messages
+
+Customize the content of your notifications with notifications templates.
+
+You can use notification templates to change the title, message, and format of the message in your notifications.
+
+Notification templates are not tied to specific contact point integrations, such as email or Slack. However, you can choose to create separate notification templates for different contact point integrations.
+
+You can use notification templates to:
+
+- Customize content: Personalize the subject of an email or the title of a message. Modify text within notifications, like selecting or omitting certain labels, annotations, and links. Format text with bold and italic styles, and add or remove line breaks.
+
+However, there are limitations. You cannot:
+
+- Modify Visual Appearance: Add HTML and CSS to email notifications for visual changes. Alter the design of notifications in messaging services like Slack and Microsoft Teams, such as adding custom blocks or adaptive cards.
+- Manage Media and Data: Adjust the number and size of images or their placement in notifications. Customize webhook data structure or format, including JSON fields or sending data in XML. Modify HTTP headers in webhooks beyond those in the contact point configuration.
+
+## Learn more
+
+[Using Go's templating language][using-go-templating-language]
+
+Learn how to write the content of your notification templates in Go’s templating language.
+
+Create reusable notification templates for your contact points.
+
+[Use notification templates][use-notification-templates]
+
+Use notification templates to send notifications to your contact points.
+
+[Reference][reference]
+
+Data that is available when writing templates.
+
+{{% docs/reference %}}
+[reference]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/template-notifications/reference"
+[reference]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/template-notifications/reference"
+
+[use-notification-templates]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/template-notifications/use-notification-templates"
+[use-notification-templates]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/template-notifications/use-notification-templates"
+
+[using-go-templating-language]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/template-notifications/using-go-templating-language"
+[using-go-templating-language]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/template-notifications/using-go-templating-language"
+{{% /docs/reference %}}
diff --git a/docs/sources/alerting/manage-notifications/template-notifications/create-notification-templates.md b/docs/sources/alerting/configure-notifications/template-notifications/create-notification-templates.md
similarity index 88%
rename from docs/sources/alerting/manage-notifications/template-notifications/create-notification-templates.md
rename to docs/sources/alerting/configure-notifications/template-notifications/create-notification-templates.md
index 53a6f82d82282..19f7f3a465990 100644
--- a/docs/sources/alerting/manage-notifications/template-notifications/create-notification-templates.md
+++ b/docs/sources/alerting/configure-notifications/template-notifications/create-notification-templates.md
@@ -1,6 +1,8 @@
 ---
-canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/template-notifications/create-notification-templates/
-description: How to create notification templates
+aliases:
+  - ../../manage-notifications/template-notifications/create-notification-templates/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/template-notifications/create-notification-templates/
+canonical: https://grafana.com/docs/grafana/latest/alerting/configure-notifications/template-notifications/create-notification-templates/
+description: Create notification templates to sent to your contact points
 keywords:
   - grafana
   - alerting
@@ -26,29 +28,28 @@ You can add one or more templates to your notification template.
 
 Your notification template name must be unique. You cannot have two templates with the same name in the same notification template or in different notification templates. Avoid defining templates with the same name as default templates, such as: `__subject`, `__text_values_list`, `__text_alert_list`, `default.title` and `default.message`.
 
-In the Contact points tab, you can see a list of your notification templates.
+To create a notification template, complete the following steps.
 
-To create a template, complete the following steps.
+1. Click **Alerts & IRM** -> **Contact points**.
+1. Click the **Notification Templates** tab and then **+ Add notification template**.
 
-1. Click **Add template**.
+1. Enter a name for the notification template.
 
-2. Choose a name for the notification template.
+1. Write the content of the template in the content field.
 
-3. Write the content of the template in the content field.
-
-4. Click **Save**.
+1. Save your changes.
 
 `{{ define "email.subject" }}` and `{{ end }}` is automatically added to the start and end of the content:
 
 To create a notification template that contains more than one template:
 
-1. Click **Add Template**.
+1. Click **+ Add notification template**.
 
 2. Enter a name for the notification template.
 
 3. Write each template in the Content field, including `{{ define "name-of-template" }}` and `{{ end }}` at the start and end of each template.
 
-4. Click **Save**.
+4. Save your changes.
 
 ## Preview notification templates
 
@@ -58,33 +59,33 @@ Preview how your notification templates will look before using them in your cont
 
 To preview your notification templates:
 
-1. Navigate to **Alerts&IRM** -> **Alerting** -> **Contact points**.
-1. Click **+Add template** or edit an existing template.
+1. Navigate to **Alerts&IRM** -> **Alerting** -> **Contact points** -> **Notification Templates**.
+1. Click **+ Add notification template** or edit an existing template.
 1. Add or update your template content.
 
-   Default data is provided and you can add or edit alert data to it as well as alert instances. You can add alert data directly in the Payload data window itself or click **Choose alert instances** or **Add alert data**.
+   Default data is provided and you can add or edit alert data to it as well as alert instances. You can add alert data directly in the Payload data window itself or click **Select alert instances** or **Add custom alerts**.
 
 1. [Optional] To add alert data from existing alert instances:
 
-   a. Click **Choose alert instances**.
+   a. Click **Select alert instances**.
 
    b. Hover over the alert instances to view more information on each alert instance.
 
    c. Click **Confirm** to add the alert instance(s) to the payload.
 
-1. [Optional] To add alert data using the Alert data editor, click **Add alert data:**
+1. [Optional] To add alert data using the Alert data editor, click **Add custom data:**
 
    a. Add annotations, custom labels and/or set a dashboard or a panel.
 
    b. Toggle Firing/resolved depending on whether you want to add firing or resolved alerts to your notification.
 
-   c. Click **Add alert data to payload**.
+   c. Click **Add alert data**.
 
    d. Click **Refresh preview** to see what your template content will look like and the corresponding payload data.
 
    If there are any errors in your template, they are displayed in the Preview and you can correct them before saving.
 
-1. Click **Save.**
+1. Save your changes.
 
 ## Template the subject of an email
 
diff --git a/docs/sources/alerting/manage-notifications/images-in-notifications.md b/docs/sources/alerting/configure-notifications/template-notifications/images-in-notifications.md
similarity index 90%
rename from docs/sources/alerting/manage-notifications/images-in-notifications.md
rename to docs/sources/alerting/configure-notifications/template-notifications/images-in-notifications.md
index e1a66d0b87c7d..6bd1260213625 100644
--- a/docs/sources/alerting/manage-notifications/images-in-notifications.md
+++ b/docs/sources/alerting/configure-notifications/template-notifications/images-in-notifications.md
@@ -1,6 +1,8 @@
 ---
-canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/images-in-notifications/
-description: How to use images in notifications
+aliases:
+  - ../manage-notifications/images-in-notifications/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/images-in-notifications/
+canonical: https://grafana.com/docs/grafana/latest/alerting/configure-notifications/template-notifications/images-in-notifications/
+description: Use images in notifications to help users better understand why alerts are firing or have been resolved
 keywords:
   - grafana
   - alerting
@@ -12,7 +14,7 @@ labels:
     - enterprise
     - oss
 title: Use images in notifications
-weight: 405
+weight: 500
 ---
 
 # Use images in notifications
@@ -33,19 +35,19 @@ Refer to the table at the end of this page for a list of contact points and thei
 
 ## Requirements
 
-1. To use images in notifications, Grafana must be set up to use [image rendering][image-rendering]. You can either install the image rendering plugin or run it as a remote rendering service.
+1. To use images in notifications, Grafana must be set up to use image rendering. You can either install the image rendering plugin or run it as a remote rendering service.
 
 2. When a screenshot is taken it is saved to the [data][paths] folder, even if Grafana is configured to upload screenshots to a cloud storage service. Grafana must have write-access to this folder otherwise screenshots cannot be saved to disk and an error will be logged for each failed screenshot attempt.
 
 3. You should use a cloud storage service unless sending alerts to Discord, Email, Pushover, Slack or Telegram. These integrations support either embedding screenshots in the email or attaching screenshots to the notification, while other integrations must link screenshots uploaded to a cloud storage bucket. If a cloud storage service has been configured then integrations that support both will link screenshots from the cloud storage bucket instead of embedding or attaching screenshots to the notification.
 
-4. If uploading screenshots to a cloud storage service such as Amazon S3, Azure Blob Storage or Google Cloud Storage; and accessing screenshots in the bucket requires authentication, logging into a VPN or corporate network; then image previews might not work in all instant messaging and communication platforms as some services rewrite URLs to use their CDN. If this happens we recommend using [integrations which support uploading images]({{< relref "#supported-contact-points" >}}) or [disabling images in notifications]({{< relref "#configuration" >}}) altogether.
+4. If uploading screenshots to a cloud storage service such as Amazon S3, Azure Blob Storage or Google Cloud Storage; and accessing screenshots in the bucket requires authentication, logging into a VPN or corporate network; then image previews might not work in all instant messaging and communication platforms as some services rewrite URLs to use their CDN. If this happens we recommend using [integrations which support uploading images](#supported-contact-points) or [disabling images in notifications](#configuration) altogether.
 
 5. When uploading screenshots to a cloud storage service Grafana uses a random 20 character (30 characters for Azure Blob Storage) filename for each image. This makes URLs hard to guess but not impossible.
 
 6. Grafana does not delete screenshots from cloud storage. We recommend configuring a retention policy with your cloud storage service to delete screenshots older than 1 month.
 
-7. If Grafana is configured to upload screenshots to its internal web server, and accessing Grafana requires logging into a VPN or corporate network; image previews might not work in all instant messaging and communication platforms as some services rewrite URLs to use their CDN. If this happens we recommend using [integrations which support uploading images]({{< relref "#supported-contact-points" >}}) or [disabling images in notifications]({{< relref "#configuration" >}}) altogether.
+7. If Grafana is configured to upload screenshots to its internal web server, and accessing Grafana requires logging into a VPN or corporate network; image previews might not work in all instant messaging and communication platforms as some services rewrite URLs to use their CDN. If this happens we recommend using [integrations which support uploading images](#supported-contact-points) or [disabling images in notifications](#configuration) altogether.
 
 8. Grafana does not delete screenshots uploaded to its internal web server. To delete screenshots from `static_root_path/images/attachments` after a certain amount of time we recommend setting up a CRON job.
 
@@ -69,8 +71,6 @@ If screenshots should be uploaded to cloud storage then `upload_external_image_s
     # will be persisted to disk for up to temp_data_lifetime.
     upload_external_image_storage = false
 
-For more information on image rendering, refer to [image rendering][image-rendering].
-
 Restart Grafana for the changes to take effect.
 
 ## Advanced configuration
@@ -137,11 +137,3 @@ For example, if a screenshot could not be taken within the expected time (10 sec
 - `grafana_screenshot_successes_total`
 - `grafana_screenshot_upload_failures_total`
 - `grafana_screenshot_upload_successes_total`
-
-{{% docs/reference %}}
-[image-rendering]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/image-rendering"
-[image-rendering]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/image-rendering"
-
-[paths]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-grafana#paths"
-[paths]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-grafana#paths"
-{{% /docs/reference %}}
diff --git a/docs/sources/alerting/manage-notifications/template-notifications/reference.md b/docs/sources/alerting/configure-notifications/template-notifications/reference.md
similarity index 93%
rename from docs/sources/alerting/manage-notifications/template-notifications/reference.md
rename to docs/sources/alerting/configure-notifications/template-notifications/reference.md
index dbf3d2a5cf3c0..d38e517a4d2c9 100644
--- a/docs/sources/alerting/manage-notifications/template-notifications/reference.md
+++ b/docs/sources/alerting/configure-notifications/template-notifications/reference.md
@@ -1,6 +1,8 @@
 ---
-canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/template-notifications/reference/
-description: Reference for templating notifications
+aliases:
+  - ../../manage-notifications/template-notifications/reference/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/template-notifications/reference/
+canonical: https://grafana.com/docs/grafana/latest/alerting/configure-notifications/template-notifications/reference/
+description: Learn about templating notifications options
 keywords:
   - grafana
   - alerting
@@ -32,7 +34,7 @@ weight: 400
 | GeneratorURL | `string` | A link to Grafana, or the Alertmanager if using an external Alertmanager             | `{{ .GeneratorURL }}` |
 | SilenceURL   | `string` | A link to silence the alert                                                          | `{{ .SilenceURL }}`   |
 | DashboardURL | `string` | A link to the Grafana Dashboard if the alert has a Dashboard UID annotation          | `{{ .DashboardURL }}` |
-| PanelURL     | `string` | A link to the panel if the alert has a Panel ID annotation                           | `{{ .PanelID }}`      |
+| PanelURL     | `string` | A link to the panel if the alert has a Panel ID annotation                           | `{{ .PanelURL }}`     |
 | Fingerprint  | `string` | A unique string that identifies the alert                                            | `{{ .Fingerprint }}`  |
 | ValueString  | `string` | A string that contains the labels and value of each reduced expression in the alert. | `{{ .ValueString }}`  |
 
diff --git a/docs/sources/alerting/configure-notifications/template-notifications/use-notification-templates.md b/docs/sources/alerting/configure-notifications/template-notifications/use-notification-templates.md
new file mode 100644
index 0000000000000..6dcc4ac35ff9e
--- /dev/null
+++ b/docs/sources/alerting/configure-notifications/template-notifications/use-notification-templates.md
@@ -0,0 +1,45 @@
+---
+aliases:
+  - ../../manage-notifications/template-notifications/use-notification-templates/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/template-notifications/use-notification-templates/
+canonical: https://grafana.com/docs/grafana/latest/alerting/configure-notifications/template-notifications/use-notification-templates/
+description: Use notification templates in contact points to customize your notifications
+keywords:
+  - grafana
+  - alerting
+  - notifications
+  - templates
+  - use templates
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Use notification templates
+weight: 300
+---
+
+# Use notification templates
+
+Use templates in contact points to customize your notifications.
+
+In the Contact points tab, you can see a list of your contact points.
+
+1. To create a new contact point, click New.
+
+   **Note:** You can edit an existing contact by clicking the Edit icon.
+
+1. Execute a template from one or more fields such as Message and Subject:
+
+   {{< figure max-width="940px" src="/static/img/docs/alerting/unified/use-notification-template-9-4.png" caption="Use notification template" >}}
+
+   For more information on how to write and execute templates, refer to [Using Go's templating language][using-go-templating-language] and [Create notification templates][create-notification-templates].
+
+1. Click **Save contact point**.
+
+{{% docs/reference %}}
+[create-notification-templates]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/template-notifications/create-notification-templates"
+[create-notification-templates]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/template-notifications/create-notification-templates"
+
+[using-go-templating-language]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/template-notifications/using-go-templating-language"
+[using-go-templating-language]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/template-notifications/using-go-templating-language"
+{{% /docs/reference %}}
diff --git a/docs/sources/alerting/manage-notifications/template-notifications/using-go-templating-language.md b/docs/sources/alerting/configure-notifications/template-notifications/using-go-templating-language.md
similarity index 87%
rename from docs/sources/alerting/manage-notifications/template-notifications/using-go-templating-language.md
rename to docs/sources/alerting/configure-notifications/template-notifications/using-go-templating-language.md
index 590ab12089605..8bb0bad2c3e86 100644
--- a/docs/sources/alerting/manage-notifications/template-notifications/using-go-templating-language.md
+++ b/docs/sources/alerting/configure-notifications/template-notifications/using-go-templating-language.md
@@ -1,6 +1,8 @@
 ---
-canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/template-notifications/using-go-templating-language/
-description: Use Go's templating language in notifications
+aliases:
+  - ../../manage-notifications/template-notifications/using-go-templating-language/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/template-notifications/using-go-templating-language/
+canonical: https://grafana.com/docs/grafana/latest/alerting/configure-notifications/template-notifications/using-go-templating-language/
+description: Use Go's templating language to create your own notification templates
 keywords:
   - grafana
   - alerting
@@ -32,7 +34,7 @@ In text/template, templates start with `{{` and end with `}}` irrespective of wh
 
 ## Print
 
-To print the value of something use `{{` and `}}`. You can print the value of dot, a field of dot, the result of a function, and the value of a [variable]({{< relref "#variables" >}}). For example, to print the `Alerts` field where dot refers to `ExtendedData` you would write the following:
+To print the value of something use `{{` and `}}`. You can print the value of dot, a field of dot, the result of a function, and the value of a [variable](#variables). For example, to print the `Alerts` field where dot refers to `ExtendedData` you would write the following:
 
 ```
 {{ .Alerts }}
@@ -280,12 +282,12 @@ grafana_folder = "Test alerts"
 ```
 
 {{% docs/reference %}}
-[create-notification-templates]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/manage-notifications/template-notifications/create-notification-templates"
-[create-notification-templates]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/manage-notifications/template-notifications/create-notification-templates"
+[create-notification-templates]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/template-notifications/create-notification-templates"
+[create-notification-templates]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/template-notifications/create-notification-templates"
 
-[extendeddata]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/manage-notifications/template-notifications/reference#extendeddata"
-[extendeddata]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/manage-notifications/template-notifications/reference#extendeddata"
+[extendeddata]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/template-notifications/reference#extendeddata"
+[extendeddata]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/template-notifications/reference#extendeddata"
 
-[reference]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/manage-notifications/template-notifications/reference"
-[reference]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/manage-notifications/template-notifications/reference"
+[reference]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/template-notifications/reference"
+[reference]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/template-notifications/reference"
 {{% /docs/reference %}}
diff --git a/docs/sources/alerting/difference-old-new.md b/docs/sources/alerting/difference-old-new.md
deleted file mode 100644
index 1cd8aaf777380..0000000000000
--- a/docs/sources/alerting/difference-old-new.md
+++ /dev/null
@@ -1,54 +0,0 @@
----
-_build:
-  list: false
-aliases:
-  - ./unified-alerting/difference-old-new/ # /docs/grafana/<GRAFANA VERSION>/alerting/unified-alerting/difference-old-new/
-canonical: https://grafana.com/docs/grafana/latest/alerting/difference-old-new/
-description: Compare new unified alerting compared to legacy dashboard alerting
-keywords:
-  - grafana
-  - alerting
-  - guide
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Grafana Alerting vs Legacy dashboard alerting
-weight: 108
----
-
-# Grafana Alerting vs Legacy dashboard alerting
-
-Introduced in Grafana 8.0, and the only system since Grafana 10.0, Grafana Alerting has several enhancements over legacy dashboard alerting.
-
-## Multi-dimensional alerting
-
-You can now create alerts that give you system-wide visibility with a single alerting rule. Generate multiple alert instances from a single alert rule. For example, you can create a rule to monitor the disk usage of multiple mount points on a single host. The evaluation engine returns multiple time series from a single query, with each time series identified by its label set.
-
-## Create alerts outside of Dashboards
-
-Unlike legacy dashboard alerts, Grafana alerts allow you to create queries and expressions that combine data from multiple sources in unique ways. You can still link dashboards and panels to alerting rules using their ID and quickly troubleshoot the system under observation.
-
-Since unified alerts are no longer directly tied to panel queries, they do not include images or query values in the notification email. You can use customized notification templates to view query values.
-
-## Create Loki and Grafana Mimir alerting rules
-
-In Grafana Alerting, you can manage Loki and Grafana Mimir alerting rules using the same UI and API as your Grafana managed alerts.
-
-## View and search for alerts from Prometheus compatible data sources
-
-Alerts for Prometheus compatible data sources are now listed under the Grafana alerts section. You can search for labels across multiple data sources to quickly find relevant alerts.
-
-## Special alerts for alert state NoData and Error
-
-Grafana Alerting introduced a new concept of the alert states. When evaluation of an alerting rule produces state NoData or Error, Grafana Alerting will generate special alerts that will have the following labels:
-
-- `alertname` with value DatasourceNoData or DatasourceError depending on the state.
-- `rulename` name of the alert rule the special alert belongs to.
-- `datasource_uid` will have the UID of the data source that caused the state.
-- all labels and annotations of the original alert rule
-
-You can handle these alerts the same way as regular alerts by adding a silence, route to a contact point, and so on.
-
-> **Note:** If the rule uses many data sources and one or many returns no data, the special alert will be created for each data source that caused the alert state.
diff --git a/docs/sources/alerting/fundamentals/_index.md b/docs/sources/alerting/fundamentals/_index.md
index 5ed760bebd310..ce5946e948daf 100644
--- a/docs/sources/alerting/fundamentals/_index.md
+++ b/docs/sources/alerting/fundamentals/_index.md
@@ -1,9 +1,9 @@
 ---
 aliases:
-  - metrics/
-  - unified-alerting/fundamentals/
+  - ./metrics/ # /docs/grafana/<GRAFANA_VERSION>/alerting/metrics/
+  - ./unified-alerting/fundamentals/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/fundamentals/
 canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/
-description: Intro to the key concepts in Alerting and how it works
+description: Learn about the fundamentals of Grafana Alerting as well as the key features it offers
 labels:
   products:
     - cloud
@@ -18,59 +18,132 @@ weight: 100
 
 Whether you’re just starting out or you're a more experienced user of Grafana Alerting, learn more about the fundamentals and available features that help you create, manage, and respond to alerts; and improve your team’s ability to resolve issues quickly.
 
-## Principles
-
-In Prometheus-based alerting systems, you have an alert generator that creates alerts and an alert receiver that receives alerts. For example, Prometheus is an alert generator and is responsible for evaluating alert rules, while Alertmanager is an alert receiver and is responsible for grouping, inhibiting, silencing, and sending notifications about firing and resolved alerts.
-
-Grafana Alerting is built on the Prometheus model of designing alerting systems. It has an internal alert generator responsible for scheduling and evaluating alert rules, as well as an internal alert receiver responsible for grouping, inhibiting, silencing, and sending notifications. Grafana doesn’t use Prometheus as its alert generator because Grafana Alerting needs to work with many other data sources in addition to Prometheus. However, it does use Alertmanager as its alert receiver.
-
-Alerts are sent to the alert receiver where they are routed, grouped, inhibited, silenced and notified. In Grafana Alerting, the default alert receiver is the Alertmanager embedded inside Grafana, and is referred to as the Grafana Alertmanager. However, you can use other Alertmanagers too, and these are referred to as [External Alertmanagers][external-alertmanagers].
-
 The following diagram gives you an overview of Grafana Alerting and introduces you to some of the fundamental features that are the principles of how Grafana Alerting works.
 
 {{< figure src="/media/docs/alerting/how-alerting-works.png" max-width="750px" caption="How Alerting works" >}}
 
+## How it works at a glance
+
+- Grafana alerting periodically queries data sources and evaluates the condition defined in the alert rule
+- If the condition is breached, an alert instance fires
+- Firing and resolved alert instances are routed to notification policies based on matching labels
+- Notifications are sent out to the contact points specified in the notification policy
+
 ## Fundamentals
 
+The following concepts are key to your understanding of how Grafana Alerting works.
+
 ### Alert rules
 
-An alert rule is a set of criteria that determine when an alert should fire. It consists of one or more queries and expressions, a condition which needs to be met, an interval which determines how often the alert rule is evaluated, and a duration over which the condition must be met for an alert to fire.
+An [alert rule][alert-rules] consists of one or more queries and expressions that select the data you want to measure. It also contains a condition, which is the threshold that an alert rule must meet or exceed in order to fire.
 
-Alert rules are evaluated over their interval, and each alert rule can have zero, one, or any number of alerts firing at a time. The state of the alert rule is determined by its most "severe" alert, which can be one of Normal, Pending, or Firing. For example, if at least one of an alert rule's alerts are firing then the alert rule is also firing. The health of an alert rule is determined by the status of its most recent evaluation. These can be OK, Error, and NoData.
+Add labels to uniquely identify your alert rule and configure alert routing. Labels link alert rules to notification policies, so you can easily manage which policy should handle which alerts and who gets notified.
 
-A very important feature of alert rules is that they support custom annotations and labels. These allow you to instrument alerts with additional metadata such as summaries and descriptions, and add additional labels to route alerts to specific notification policies.
+Once alert rules are created, they go through various states and transitions.
 
-### Alerts
+### Alert instances
 
-Alerts are uniquely identified by sets of key/value pairs called Labels. Each key is a label name and each value is a label value. For example, one alert might have the labels `foo=bar` and another alert might have the labels `foo=baz`. An alert can have many labels such as `foo=bar,bar=baz` but it cannot have the same label twice such as `foo=bar,foo=baz`. Two alerts cannot have the same labels either, and if two alerts have the same labels such as `foo=bar,bar=baz` and `foo=bar,bar=baz` then one of the alerts will be discarded. Alerts are resolved when the condition in the alert rule is no longer met, or the alert rule is deleted.
+Each alert rule can produce multiple alert instances (also known as alerts) - one alert instance for each time series. This is exceptionally powerful as it allows us to observe multiple series in a single expression.
 
-In Grafana Managed Alerts, alerts can be in Normal, Pending, Alerting, No Data or Error states. In Datasource Managed Alerts, such as Mimir and Loki, alerts can be in Normal, Pending and Alerting, but not NoData or Error.
+```promql
+sum by(cpu) (
+  rate(node_cpu_seconds_total{mode!="idle"}[1m])
+)
+```
 
-### Contact points
+A rule using the PromQL expression above creates as many alert instances as the amount of CPUs we are observing after the first evaluation, enabling a single rule to report the status of each CPU.
 
-Contact points determine where notifications are sent. For example, you might have a contact point that sends notifications to an email address, to Slack, to an incident management system (IRM) such as Grafana OnCall or Pagerduty, or to a webhook.
+{{< figure src="/static/img/docs/alerting/unified/multi-dimensional-alert.png" caption="Multiple alert instances from a single alert rule" >}}
 
-The notifications that are sent from contact points can be customized using notification templates. You can use notification templates to change the title, message, and structure of the notification. Notification templates are not specific to individual integrations or contact points.
+[Alert rules are frequently evaluated][alert-rule-evaluation] and the state of their alert instances is updated accordingly. Only alert instances that are in a firing or resolved state are routed to notification policies to be handled.
 
 ### Notification policies
 
-Notification policies group alerts and then route them to contact points. They determine when notifications are sent, and how often notifications should be repeated.
+[Notification policies][notification-policies] group alerts and then route them to contact points. They determine when notifications are sent, and how often notifications should be repeated.
 
-Alerts are matched to notification policies using label matchers. These are human-readable expressions that assert if the alert's labels exactly match, do not exactly match, contain, or do not contain some expected text. For example, the matcher `foo=bar` matches alerts with the label `foo=bar` while the matcher `foo=~[a-zA-Z]+` matches alerts with any label called foo with a value that matches the regular expression `[a-zA-Z]+`.
+Alert instances are matched to notification policies using label matchers. This provides a flexible way to organize and route alerts to different receivers.
 
-By default, an alert can only match one notification policy. However, with the `continue` feature alerts can be made to match any number of notification policies at the same time. For more information on notification policies, see [fundamentals of Notification Policies][notification-policies].
+Each policy consists of a set of label matchers (0 or more) that specify which alert instances (identified by their labels) they handle. Notification policies are defined as a tree structure where the root of the notification policy tree is called the **Default notification policy**. Each policy can have child policies.
+
+{{< figure src="/media/docs/alerting/notification-routing.png" max-width="750px" caption="Notification policy routing" >}}
+
+### Contact points
+
+[Contact points][contact-points] determine where notifications are sent. For example, you might have a contact point that sends notifications to an email address, to Slack, to an incident management system (IRM) such as Grafana OnCall or Pagerduty, or to a webhook.
+
+Notifications sent from contact points are customizable with notification templates, which can be shared between contact points.
 
 ### Silences and mute timings
 
-Silences and mute timings allow you to pause notifications for specific alerts or even entire notification policies. Use a silence to pause notifications on an ad-hoc basis, such as during a maintenance window; and use mute timings to pause notifications at regular intervals, such as evenings and weekends.
+[Silences][silences] and [mute timings][mute-timings] allow you to pause notifications for specific alerts or even entire notification policies. Use a silence to pause notifications on an ad-hoc basis, such as during a maintenance window; and use mute timings to pause notifications at regular intervals, such as evenings and weekends.
+
+### Architecture
+
+Grafana Alerting is built on the Prometheus model of designing alerting systems.
+
+Prometheus-based alerting systems have two main components:
+
+- An alert generator that evaluates alert rules and sends firing and resolved alerts to the alert receiver.
+- An alert receiver (also known as Alertmanager) that receives the alerts and is responsible for handling them and sending their notifications.
+
+Grafana doesn’t use Prometheus as its default alert generator because Grafana Alerting needs to work with many other data sources in addition to Prometheus.
+
+However, Grafana can also use Prometheus as an alert generator as well as external Alertmanagers. For more information about how to use distinct alerting systems, refer to the [Grafana alert rule types][alert-rules].
 
-## Provisioning
+## Design your Alerting system
 
-You can create your alerting resources (alert rules, notification policies, and so on) in the Grafana UI; configmaps, files and configuration management systems using file-based provisioning; and in Terraform using API-based provisioning.
+Monitoring complex IT systems and understanding whether everything is up and running correctly is a difficult task. Setting up an effective alert management system is therefore essential to inform you when things are going wrong before they start to impact your business outcomes.
+
+Designing and configuring an alert management set up that works takes time.
+
+Here are some tips on how to create an effective alert management set up for your business:
+
+**Which are the key metrics for your business that you want to monitor and alert on?**
+
+- Find events that are important to know about and not so trivial or frequent that recipients ignore them.
+
+- Alerts should only be created for big events that require immediate attention or intervention.
+
+- Consider quality over quantity.
+
+**Which type of Alerting do you want to use?**
+
+- Choose between Grafana-managed Alerting or Grafana Mimir or Loki-managed Alerting; or both.
+
+**How do you want to organize your alerts and notifications?**
+
+- Be selective about who you set to receive alerts. Consider sending them to whoever is on call or a specific Slack channel.
+- Automate as far as possible using the Alerting API or alerts as code (Terraform).
+
+**How can you reduce alert fatigue?**
+
+- Avoid noisy, unnecessary alerts by using silences, mute timings, or pausing alert rule evaluation.
+- Continually tune your alert rules to review effectiveness. Remove alert rules to avoid duplication or ineffective alerts.
+- Think carefully about priority and severity levels.
+- Continually review your thresholds and evaluation rules.
 
 {{% docs/reference %}}
-[external-alertmanagers]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/set-up/configure-alertmanager"
+
+[alert-rules]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules"
+[alert-rules]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules"
+
+[contact-points]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notifications/contact-points"
+[contact-points]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/notifications/contact-points"
+
+[silences]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/create-silence"
+[silences]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/create-silence"
+
+[mute-timings]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/mute-timings"
+[mute-timings]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/mute-timings"
+
+[alertmanager]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notifications/alertmanager"
+[alertmanager]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/notifications/alertmanager"
+
+[alert-rule-evaluation]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/rule-evaluation"
+[alert-rule-evaluation]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/rule-evaluation"
+
+[external-alertmanagers]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/configure-alertmanager"
 [external-alertmanagers]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/configure-alertmanager"
-[notification-policies]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/notification-policies"
-[notification-policies]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/notification-policies"
+[notification-policies]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notifications/notification-policies"
+[notification-policies]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/notifications/notification-policies"
 {{% /docs/reference %}}
diff --git a/docs/sources/alerting/fundamentals/alert-rules/_index.md b/docs/sources/alerting/fundamentals/alert-rules/_index.md
index d5b0c84a11c65..d6df62acf4568 100644
--- a/docs/sources/alerting/fundamentals/alert-rules/_index.md
+++ b/docs/sources/alerting/fundamentals/alert-rules/_index.md
@@ -1,6 +1,11 @@
 ---
+aliases:
+  - ../fundamentals/data-source-alerting/ # /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/data-source-alerting/
+  - ../fundamentals/alert-rules/alert-instances/ # /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/alert-instances/
+  - ../fundamentals/alert-rules/recording-rules/ # /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/recording-rules/
+  - ../fundamentals/alert-rules/alert-rule-types/ # /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/alert-rule-types/
 canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/
-description: About Grafana alert rules
+description: Learn about alert rules
 keywords:
   - grafana
   - alerting
@@ -11,32 +16,98 @@ labels:
     - enterprise
     - oss
 title: Alert rules
-weight: 130
+weight: 100
 ---
 
 # Alert rules
 
-An alert rule is a set of evaluation criteria for when an alert rule should fire. An alert rule consists of one or more queries and expressions, a condition, and the duration over which the condition needs to be met to start firing.
+An alert rule is a set of evaluation criteria for when an alert rule should fire. An alert rule consists of:
 
-While queries and expressions select the data set to evaluate, a condition sets the threshold that an alert must meet or exceed to create an alert.
+- Queries and expressions that select the data set to evaluate.
+- A condition (the threshold) that the query must meet or exceed to trigger the alert instance.
+- An interval that specifies the frequency of [alert rule evaluation][alert-rule-evaluation] and a duration indicating how long the condition must be met to trigger the alert instance.
+- Other customizable options, for example, setting what should happen in the absence of data, notification messages, and more.
 
-An interval specifies how frequently an alerting rule is evaluated. Duration, when configured, indicates how long a condition must be met. The alert rules can also define alerting behavior in the absence of data.
+Grafana supports two different alert rule types: Grafana-managed alert rules and data source-managed alert rules.
 
-- [Alert rule types][alert-rule-types]
-- [Alert instances][alert-instances]
-- [Organising alert rules][organising-alerts]
-- [Annotation and labels][annotation-label]
+## Grafana-managed alert rules
+
+Grafana-managed alert rules are the most flexible alert rule type. They allow you to create alerts that can act on data from any of our [supported data sources](#supported-data-sources), and use multiple data sources in a single alert rule.
+
+Additionally, you can also add [expressions to transform your data][expression-queries], set custom alert conditions, and include [images in alert notifications][notification-images].
+
+{{< figure src="/media/docs/alerting/grafana-managed-alerting-architecture.png" max-width="750px" caption="How Grafana-managed alerting works by default" >}}
+
+1. Alert rules are created within Grafana based on one or more data sources.
+
+1. Alert rules are evaluated by the Alert Rule Evaluation Engine from within Grafana.
+
+1. Firing and resolved alert instances are delivered to the internal Grafana [Alertmanager][alert-manager] which handles notifications.
+
+### Supported data sources
+
+Grafana-managed alert rules can query backend data sources if Grafana Alerting enabled by specifying `{"backend": true, "alerting": true}` in the [plugin.json](/developers/plugin-tools/reference-plugin-json).
+
+The following data sources are supported:
+
+- [Enterprise data source plugins](/grafana/plugins/data-source-plugins/?enterprise=1) and others maintained by Grafana such as [AWS Athena](/grafana/plugins/grafana-athena-datasource/), [AWS X-Ray](/grafana/plugins/grafana-x-ray-datasource/), [AWS Redshift](/grafana/plugins/grafana-redshift-datasource/), [AWS Timestream](/grafana/plugins/grafana-timestream-datasource/), [AWS IoT SiteWise](/grafana/plugins/grafana-iot-sitewise-datasource/), [Azure Data Explorer](/grafana/plugins/grafana-azure-data-explorer-datasource/), [Azure Monitor](/grafana/plugins/grafana-azure-monitor-datasource/), [ClickHouse](/grafana/plugins/grafana-clickhouse-datasource/), [Cloudwatch](/grafana/plugins/cloudwatch/), [CSV](/grafana/plugins/marcusolsson-csv-datasource/), [Elasticsearch](/grafana/plugins/elasticsearch/), [Falcon LogScale](/grafana/plugins/grafana-falconlogscale-datasource/), [GitHub](/grafana/plugins/grafana-github-datasource/), [Google BigQuery](/grafana/plugins/grafana-bigquery-datasource/), [Google Cloud Monitoring](/grafana/plugins/stackdriver/), [Graphite](/grafana/plugins/graphite/), [Loki](/grafana/plugins/loki/), [InfluxDB](/grafana/plugins/influxdb/), [Infinity](/grafana/plugins/yesoreyeram-infinity-datasource/), [MSSQL](/grafana/plugins/mssql/), [MySQL](/grafana/plugins/mysql/), [OpenSearch](/grafana/plugins/grafana-opensearch-datasource/), [OpenTSDB](/grafana/plugins/opentsdb/), [Oracle](/grafana/plugins/grafana-oracle-datasource/), [Orbit](/grafana/plugins/grafana-orbit-datasource/), [PostgreSQL](/grafana/plugins/postgres/), [Prometheus](/grafana/plugins/prometheus/), [Sentry](/grafana/plugins/grafana-sentry-datasource/), [SurrealDB](/grafana/plugins/grafana-surrealdb-datasource/), and [TestData](/grafana/plugins/grafana-testdata-datasource/).
+- Backend data sources maintained by the [community](/grafana/plugins/data-source-plugins/?signature=community) and [partners](/grafana/plugins/data-source-plugins/?signature=commercial) that enable alerting.
+
+## Data source-managed alert rules
+
+Data source-managed alert rules can improve query performance via [recording rules](#recording-rules) and ensure high-availability and fault tolerance when implementing a distributed architecture.
+
+They are only supported for Prometheus-based or Loki data sources with the Ruler API enabled. For more information, refer to the [Loki Ruler API](/docs/loki/<GRAFANA_VERSION>/api/#ruler) or [Mimir Ruler API](/docs/mimir/<GRAFANA_VERSION>/references/http-api/#ruler).
+
+{{< figure src="/media/docs/alerting/mimir-managed-alerting-architecture-v2.png" max-width="750px" caption="Mimir-managed alerting architecture" >}}
+
+1. Alert rules are created and stored within the data source itself.
+1. Alert rules can only query Prometheus-based data. It can use either queries or [recording rules](#recording-rules).
+1. Alert rules are evaluated by the Alert Rule Evaluation Engine.
+1. Firing and resolved alert instances are delivered to the configured [Alertmanager][alert-manager] which handles notifications.
+
+### Recording rules
+
+A recording rule allows you to pre-compute frequently needed or computationally expensive expressions and save their result as a new set of time series. This is useful if you want to run alerts on aggregated data or if you have dashboards that query computationally expensive expressions repeatedly.
+
+Querying this new time series is faster, especially for dashboards since they query the same expression every time the dashboards refresh. For more information, refer to [Create recording rules][create-recording-rules].
+
+Alternatively, Grafana Enterprise and Grafana Cloud offer [recorded queries][recorded-queries] that can be executed against any data source.
+
+## Comparison between alert rule types
+
+When choosing which alert rule type to use, consider the following comparison between Grafana-managed and data source-managed alert rules.
+
+| <div style="width:200px">Feature</div>                                         | <div style="width:200px">Grafana-managed alert rule</div>                                                                    | <div style="width:200px">Data source-managed alert rule                                                                                                 |
+| ------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Create alert rules<wbr /> based on data from any of our supported data sources | Yes                                                                                                                          | No. You can only create alert rules that are based on Prometheus-based data.                                                                            |
+| Mix and match data sources                                                     | Yes                                                                                                                          | No                                                                                                                                                      |
+| Includes support for recording rules                                           | No                                                                                                                           | Yes                                                                                                                                                     |
+| Add expressions to transform<wbr /> your data and set alert conditions         | Yes                                                                                                                          | No                                                                                                                                                      |
+| Use images in alert notifications                                              | Yes                                                                                                                          | No                                                                                                                                                      |
+| Scaling                                                                        | More resource intensive, depend on the database, and are likely to suffer from transient errors. They only scale vertically. | Store alert rules within the data source itself and allow for “infinite” scaling. Generate and send alert notifications from the location of your data. |
+| Alert rule evaluation and delivery                                             | Alert rule evaluation and delivery is done from within Grafana, using an external Alertmanager; or both.                     | Alert rule evaluation and alert delivery is distributed, meaning there is no single point of failure.                                                   |
 
 {{% docs/reference %}}
-[alert-instances]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/alert-rules/alert-instances"
-[alert-instances]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/alert-instances"
 
-[alert-rule-types]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/alert-rules/alert-rule-types"
-[alert-rule-types]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/alert-rule-types"
+[alert-manager]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notifications/alertmanager"
+[alert-manager]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/notifications/alertmanager"
+
+[create-recording-rules]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/create-mimir-loki-managed-recording-rule"
+[create-recording-rules]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/create-mimir-loki-managed-recording-rule"
+
+[alert-rule-evaluation]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/rule-evaluation"
+[alert-rule-evaluation]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/rule-evaluation"
+
+[expression-queries]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/queries-conditions#expression-queries"
+[expression-queries]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/queries-conditions#expression-queries"
+
+[queries-and-conditions]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/queries-conditions"
+[queries-and-conditions]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/queries-conditions"
+
+[notification-images]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/template-notifications/images-in-notifications"
+[notification-images]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/template-notifications/images-in-notifications"
 
-[annotation-label]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/annotation-label"
-[annotation-label]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/annotation-label"
+[recorded-queries]: "/docs/ -> /docs/grafana/<GRAFANA_VERSION>/administration/recorded-queries"
 
-[organising-alerts]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/alert-rules/organising-alerts"
-[organising-alerts]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/organising-alerts"
 {{% /docs/reference %}}
diff --git a/docs/sources/alerting/fundamentals/alert-rules/alert-instances.md b/docs/sources/alerting/fundamentals/alert-rules/alert-instances.md
deleted file mode 100644
index 2960d8cfc9a82..0000000000000
--- a/docs/sources/alerting/fundamentals/alert-rules/alert-instances.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/alert-instances/
-description: Learn about Grafana alert instances
-keywords:
-  - grafana
-  - alerting
-  - instances
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Alert instances
-weight: 105
----
-
-# Alert instances
-
-Grafana managed alerts support multi-dimensional alerting. Each alert rule can create multiple alert instances. This is exceptionally powerful if you are observing multiple series in a single expression.
-
-Consider the following PromQL expression:
-
-```promql
-sum by(cpu) (
-  rate(node_cpu_seconds_total{mode!="idle"}[1m])
-)
-```
-
-A rule using this expression will create as many alert instances as the amount of CPUs we are observing after the first evaluation, allowing a single rule to report the status of each CPU.
-
-{{< figure src="/static/img/docs/alerting/unified/multi-dimensional-alert.png" caption="A multi-dimensional Grafana managed alert rule" >}}
diff --git a/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md b/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md
deleted file mode 100644
index d3139f78b2d63..0000000000000
--- a/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md
+++ /dev/null
@@ -1,77 +0,0 @@
----
-canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/alert-rule-types/
-description: Learn about the different alert rule types
-keywords:
-  - grafana
-  - alerting
-  - rule types
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Alert rule types
-weight: 102
----
-
-# Alert rule types
-
-Grafana supports two different alert rule types. Learn more about each of the alert rule types, how they work, and decide which one is best for your use case.
-
-## Grafana-managed alert rules
-
-Grafana-managed alert rules are the most flexible alert rule type. They allow you to create alerts that can act on data from any of our supported data sources.
-
-In addition to supporting multiple data sources, you can also add expressions to transform your data and set alert conditions. Using images in alert notifications is also supported. This is the only type of rule that allows alerting from multiple data sources in a single rule definition.
-
-The following diagram shows how Grafana-managed alerting works.
-
-{{< figure src="/media/docs/alerting/grafana-managed-rule.png" max-width="750px" caption="Grafana-managed alerting" >}}
-
-1. Alert rules are created within Grafana based on one or more data sources.
-
-1. Alert rules are evaluated by the Alert Rule Evaluation Engine from within Grafana.
-
-1. Alerts are delivered using the internal Grafana Alertmanager.
-
-**Note:**
-
-You can also configure alerts to be delivered using an external Alertmanager; or use both internal and external alertmanagers.
-For more information, see Add an external Alertmanager.
-
-## Data source-managed alert rules
-
-To create data source-managed alert rules, you must have a compatible Prometheus or Loki data source.
-
-You can check if your data source supports rule creation via Grafana by testing the data source and observing if the Ruler API is supported.
-
-For more information on the Ruler API, refer to [Ruler API](/docs/loki/latest/api/#ruler).
-
-The following diagram shows how data source-managed alerting works.
-
-{{< figure src="/media/docs/alerting/loki-mimir-rule.png" max-width="750px" caption="Grafana Mimir/Loki-managed alerting" >}}
-
-1. Alert rules are created and stored within the data source itself.
-1. Alert rules can only be created based on Prometheus data.
-1. Alert rule evaluation and delivery is distributed across multiple nodes for high availability and fault tolerance.
-
-## Choose an alert rule type
-
-When choosing which alert rule type to use, consider the following comparison between Grafana-managed alert rules and Grafana Mimir or Loki alert rules.
-
-{{< responsive-table >}}
-| <div style="width:200px">Feature</div> | <div style="width:200px">Grafana-managed alert rule</div> | <div style="width:200px">Loki/Mimir-managed alert rule |
-| ----------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Create alert rules<wbr /> based on data from any of our supported data sources | Yes | No: You can only create alert rules that are based on Prometheus data. The data source must have the Ruler API enabled. |
-| Mix and match data sources | Yes | No |
-| Includes support for recording rules | No | Yes |
-| Add expressions to transform<wbr /> your data and set alert conditions | Yes | No |
-| Use images in alert notifications | Yes | No |
-| Scaling | More resource intensive, depend on the database, and are likely to suffer from transient errors. They only scale vertically. | Store alert rules within the data source itself and allow for “infinite” scaling. Generate and send alert notifications from the location of your data. |
-| Alert rule evaluation and delivery | Alert rule evaluation and delivery is done from within Grafana, using an external Alertmanager; or both. | Alert rule evaluation and alert delivery is distributed, meaning there is no single point of failure. |
-
-{{< /responsive-table >}}
-
-**Note:**
-
-If you are using non-Prometheus data, we recommend choosing Grafana-managed alert rules. Otherwise, choose Grafana Mimir or Grafana Loki alert rules where possible.
diff --git a/docs/sources/alerting/fundamentals/alert-rules/annotation-label.md b/docs/sources/alerting/fundamentals/alert-rules/annotation-label.md
new file mode 100644
index 0000000000000..5317dd7b3b16a
--- /dev/null
+++ b/docs/sources/alerting/fundamentals/alert-rules/annotation-label.md
@@ -0,0 +1,143 @@
+---
+aliases:
+  - ../../fundamentals/annotation-label/ # /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/annotation-label/
+  - ../../fundamentals/annotation-label/labels-and-label-matchers/ # /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/annotation-label/labels-and-label-matchers/
+  - ../../fundamentals/annotation-label/how-to-use-labels/ # /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/annotation-label/how-to-use-labels/
+  - ../../alerting-rules/alert-annotation-label/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/alert-annotation-label/
+  - ../../unified-alerting/alerting-rules/alert-annotation-label/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/alerting-rules/alert-annotation-label/
+canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/annotation-label/
+description: Learn how to use annotations and labels to store key information about alerts
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - rules
+  - create
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Labels and annotations
+weight: 105
+---
+
+# Labels and annotations
+
+Labels and annotations contain information about an alert. Labels are used to differentiate an alert from all other alerts, while annotations are used to add additional information to an existing alert.
+
+## Labels
+
+Labels contain information that identifies an alert. An example of a label might be `server=server1` or `team=backend`. Each alert can have more than one label, and the complete set of labels for an alert is called its label set. It is this label set that identifies the alert.
+
+For example, an alert might have the label set `{alertname="High CPU usage",server="server1"}` while another alert might have the label set `{alertname="High CPU usage",server="server2"}`. These are two separate alerts because although their `alertname` labels are the same, their `server` labels are different.
+
+Labels are a fundamental component of alerting:
+
+- The complete set of labels for an alert is what uniquely identifies an alert within Grafana alerts.
+- The alerting UI shows labels for every alert instance generated during evaluation of that rule.
+- Contact points can access labels to send notification messages that contain specific alert information.
+- The Alertmanager uses labels to match alerts for silences and alert groups in notification policies.
+
+Note that two alert rules cannot have the same labels. If two alert rules have the same labels such as `foo=bar,bar=baz` and `foo=bar,bar=baz` then one of the alerts will be discarded.
+
+### How label matching works
+
+Use labels and label matchers to link alert rules to notification policies and silences. This allows for a flexible way to manage your alert instances, specify which policy should handle them, and which alerts to silence.
+
+A label matchers consists of 3 distinct parts, the **label**, the **value** and the **operator**.
+
+- The **Label** field is the name of the label to match. It must exactly match the label name.
+
+- The **Value** field matches against the corresponding value for the specified **Label** name. How it matches depends on the **Operator** value.
+
+- The **Operator** field is the operator to match against the label value. The available operators are:
+
+  | Operator | Description                                        |
+  | -------- | -------------------------------------------------- |
+  | `=`      | Select labels that are exactly equal to the value. |
+  | `!=`     | Select labels that are not equal to the value.     |
+  | `=~`     | Select labels that regex-match the value.          |
+  | `!~`     | Select labels that do not regex-match the value.   |
+
+If you are using multiple label matchers, they are combined using the AND logical operator. This means that all matchers must match in order to link a rule to a policy.
+
+{{< collapse title="Label matching example" >}}
+
+If you define the following set of labels for your alert:
+
+`{ foo=bar, baz=qux, id=12 }`
+
+then:
+
+- A label matcher defined as `foo=bar` matches this alert rule.
+- A label matcher defined as `foo!=bar` does _not_ match this alert rule.
+- A label matcher defined as `id=~[0-9]+` matches this alert rule.
+- A label matcher defined as `baz!~[0-9]+` matches this alert rule.
+- Two label matchers defined as `foo=bar` and `id=~[0-9]+` match this alert rule.
+
+**Exclude labels**
+
+You can also write label matchers to exclude labels.
+
+Here is an example that shows how to exclude the label `Team`. You can choose between any of the values below to exclude labels.
+
+| Label  | Operator | Value |
+| ------ | -------- | ----- |
+| `team` | `=`      | `""`  |
+| `team` | `!~`     | `.+`  |
+| `team` | `=~`     | `^$`  |
+
+{{< /collapse >}}
+
+## Label types
+
+An alert's label set can contain three types of labels:
+
+- Labels from the datasource,
+- Custom labels specified in the alert rule,
+- A series of reserved labels, such as `alertname` or `grafana_folder`.
+
+### Custom Labels
+
+Custom labels are additional labels configured manually in the alert rule.
+
+Ensure the label set for an alert does not have two or more labels with the same name. If a custom label has the same name as a label from the datasource then it will replace that label. However, should a custom label have the same name as a reserved label then the custom label will be omitted from the alert.
+
+{{< collapse title="Key format" >}}
+
+Grafana's built-in Alertmanager supports both Unicode label keys and values. If you are using an external Prometheus Alertmanager, label keys must be compatible with their [data model](https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels).
+This means that label keys must only contain **ASCII letters**, **numbers**, as well as **underscores** and match the regex `[a-zA-Z_][a-zA-Z0-9_]*`.
+Any invalid characters will be removed or replaced by the Grafana alerting engine before being sent to the external Alertmanager according to the following rules:
+
+- `Whitespace` will be removed.
+- `ASCII characters` will be replaced with `_`.
+- `All other characters` will be replaced with their lower-case hex representation. If this is the first character it will be prefixed with `_`.
+
+Example: A label key/value pair `Alert! 🔔="🔥"` will become `Alert_0x1f514="🔥"`.
+
+If multiple label keys are sanitized to the same value, the duplicates will have a short hash of the original label appended as a suffix.
+
+{{< /collapse >}}
+
+### Reserved labels
+
+Reserved labels can be used in the same way as manually configured custom labels. The current list of available reserved labels are:
+
+| Label          | Description                               |
+| -------------- | ----------------------------------------- |
+| alert_name     | The name of the alert rule.               |
+| grafana_folder | Title of the folder containing the alert. |
+
+Labels prefixed with `grafana_` are reserved by Grafana for special use. To stop Grafana Alerting from adding a reserved label, you can disable it via the `disabled_labels` option in [unified_alerting.reserved_labels](/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana#unified_alertingreserved_labels) configuration.
+
+## Annotations
+
+Both labels and annotations have the same structure: a set of named values; however their intended uses are different. The purpose of annotations is to add additional information to existing alerts.
+
+There are a number of suggested annotations in Grafana such as `description`, `summary`, `runbook_url`, `dashboardUId` and `panelId`. Like custom labels, annotations must have a name, and their value can contain a combination of text and template code that is evaluated when an alert is fired.
+
+{{% docs/reference %}}
+[variables-label-annotation]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/templating-labels-annotations"
+[variables-label-annotation]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/templating-labels-annotations"
+{{% /docs/reference %}}
diff --git a/docs/sources/alerting/fundamentals/alert-rules/organising-alerts.md b/docs/sources/alerting/fundamentals/alert-rules/organising-alerts.md
index 5e5244c593e55..09113a1622e2c 100644
--- a/docs/sources/alerting/fundamentals/alert-rules/organising-alerts.md
+++ b/docs/sources/alerting/fundamentals/alert-rules/organising-alerts.md
@@ -1,9 +1,9 @@
 ---
 aliases:
-  - ../unified-alerting/alerting-rules/edit-cortex-loki-namespace-group/
-    - ../unified-alerting/alerting-rules/edit-mimir-loki-namespace-group/
+  - ../../unified-alerting/alerting-rules/edit-cortex-loki-namespace-group/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/alerting-rules/edit-cortex-loki-namespace-group/
+  - ../../unified-alerting/alerting-rules/edit-mimir-loki-namespace-group/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/alerting-rules/edit-mimir-loki-namespace-group/
 canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/organising-alerts/
-description: Namespaces, folders, and groups
+description: Learn about organizing alerts using namespaces, folders, and groups
 keywords:
   - grafana
   - alerting
@@ -14,7 +14,7 @@ labels:
     - enterprise
     - oss
 title: Namespaces, folders, and groups
-weight: 105
+weight: 107
 ---
 
 ## Namespaces, folders, and groups
@@ -29,6 +29,8 @@ A namespace contains one or more groups. The rules within a group are run sequen
 
 ### Groups
 
-The rules within a group are run sequentially at a regular interval, meaning no rules will be evaluated at the same time and in order of appearance.. The default interval is one (1) minute. You can rename Grafana Mimir or Loki rule namespaces and groups, and edit group evaluation intervals.
+The rules within a group are run sequentially at a regular interval, meaning no rules will be evaluated at the same time and in order of appearance. The default interval is one (1) minute. You can rename Grafana Mimir or Loki rule namespaces and groups, and edit group evaluation intervals.
 
 > **Note** If you want rules to be evaluated concurrently and with different intervals, consider storing them in different groups.
+
+> **Note** Grafana managed alert rules are evaluated concurrently instead of sequentially.
diff --git a/docs/sources/alerting/fundamentals/alert-rules/queries-conditions.md b/docs/sources/alerting/fundamentals/alert-rules/queries-conditions.md
new file mode 100644
index 0000000000000..41e0f2d2101b4
--- /dev/null
+++ b/docs/sources/alerting/fundamentals/alert-rules/queries-conditions.md
@@ -0,0 +1,221 @@
+---
+aliases:
+  - ../../fundamentals/evaluate-grafana-alerts/ # /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/evaluate-grafana-alerts/
+  - ../../unified-alerting/fundamentals/evaluate-grafana-alerts/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/fundamentals/evaluate-grafana-alerts/
+canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/queries-conditions/
+description: Define queries to get the data you want to measure and conditions that need to be met before an alert rule fires
+keywords:
+  - grafana
+  - alerting
+  - queries
+  - conditions
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Queries and conditions
+weight: 104
+---
+
+# Queries and conditions
+
+In Grafana, queries play a vital role in fetching and transforming data from supported data sources, which include databases like MySQL and PostgreSQL, time series databases like Prometheus, InfluxDB and Graphite, and services like Elasticsearch, AWS CloudWatch, Azure Monitor and Google Cloud Monitoring.
+
+For more information on supported data sources, see [Data sources][data-source-alerting].
+
+The process of executing a query involves defining the data source, specifying the desired data to retrieve, and applying relevant filters or transformations. Query languages or syntaxes specific to the chosen data source are utilized for constructing these queries.
+
+In Alerting, you define a query to get the data you want to measure and a condition that needs to be met before an alert rule fires.
+
+An alert rule consists of one or more queries and expressions that select the data you want to measure.
+
+For more information on queries and expressions, see [Query and transform data][query-transform-data].
+
+## Data source queries
+
+Queries in Grafana can be applied in various ways, depending on the data source and query language being used. Each data source’s query editor provides a customized user interface that helps you write queries that take advantage of its unique capabilities.
+
+Because of the differences between query languages, each data source query editor looks and functions differently. Depending on your data source, the query editor might provide auto-completion features, metric names, variable suggestions, or a visual query-building interface.
+
+Some common types of query components include:
+
+**Metrics or data fields**: Specify the specific metrics or data fields you want to retrieve, such as CPU usage, network traffic, or sensor readings.
+
+**Time range**: Define the time range for which you want to fetch data, such as the last hour, a specific day, or a custom time range.
+
+**Filters**: Apply filters to narrow down the data based on specific criteria, such as filtering data by a specific tag, host, or application.
+
+**Aggregations**: Perform aggregations on the data to calculate metrics like averages, sums, or counts over a given time period.
+
+**Grouping**: Group the data by specific dimensions or tags to create aggregated views or breakdowns.
+
+**Note**:
+
+Grafana does not support alert queries with template variables. More information is available [here](https://community.grafana.com/t/template-variables-are-not-supported-in-alert-queries-while-setting-up-alert/2514).
+
+## Expression queries
+
+In Grafana, an expression is used to perform calculations, transformations, or aggregations on the data source queried data. It allows you to create custom metrics or modify existing metrics based on mathematical operations, functions, or logical expressions.
+
+By leveraging expression queries, users can perform tasks such as calculating the percentage change between two values, applying functions like logarithmic or trigonometric functions, aggregating data over specific time ranges or dimensions, and implementing conditional logic to handle different scenarios.
+
+In Alerting, you can only use expressions for Grafana-managed alert rules. For each expression, you can choose from the math, reduce, and resample expressions. These are called multi-dimensional rules, because they generate a separate alert for each series.
+
+You can also use classic condition, which creates an alert rule that triggers a single alert when its condition is met. As a result, Grafana sends only a single alert even when alert conditions are met for multiple series.
+
+**Note:**
+
+Classic conditions exist mainly for compatibility reasons and should be avoided if possible.
+
+**Reduce**
+
+Aggregates time series values in the selected time range into a single value.
+
+**Math**
+
+Performs free-form math functions/operations on time series and number data. Can be used to preprocess time series data or to define an alert condition for number data.
+
+**Resample**
+
+Realigns a time range to a new set of timestamps, this is useful when comparing time series data from different data sources where the timestamps would otherwise not align.
+
+**Threshold**
+
+Checks if any time series data matches the threshold condition.
+
+The threshold expression allows you to compare two single values. It returns `0` when the condition is false and `1` if the condition is true. The following threshold functions are available:
+
+- Is above (x > y)
+- Is below (x < y)
+- Is within range (x > y1 AND x < y2)
+- Is outside range (x < y1 AND x > y2)
+
+**Classic condition**
+
+Checks if any time series data matches the alert condition.
+
+**Note**:
+
+Classic condition expression queries always produce one alert instance only, no matter how many time series meet the condition.
+Classic conditions exist mainly for compatibility reasons and should be avoided if possible.
+
+## Aggregations
+
+Grafana Alerting provides the following aggregation functions to enable you to further refine your query.
+
+These functions are available for **Reduce** and **Classic condition** expressions only.
+
+| Function         | Expression       | What it does                                                                    |
+| ---------------- | ---------------- | ------------------------------------------------------------------------------- |
+| avg              | Reduce / Classic | Displays the average of the values                                              |
+| min              | Reduce / Classic | Displays the lowest value                                                       |
+| max              | Reduce / Classic | Displays the highest value                                                      |
+| sum              | Reduce / Classic | Displays the sum of all values                                                  |
+| count            | Reduce / Classic | Counts the number of values in the result                                       |
+| last             | Reduce / Classic | Displays the last value                                                         |
+| median           | Reduce / Classic | Displays the median value                                                       |
+| diff             | Classic          | Displays the difference between the newest and oldest value                     |
+| diff_abs         | Classic          | Displays the absolute value of diff                                             |
+| percent_diff     | Classic          | Displays the percentage value of the difference between newest and oldest value |
+| percent_diff_abs | Classic          | Displays the absolute value of percent_diff                                     |
+| count_non_null   | Classic          | Displays a count of values in the result set that aren't `null`                 |
+
+## Alert condition
+
+An alert condition is the query or expression that determines whether the alert will fire or not depending on the value it yields. There can be only one condition which will determine the triggering of the alert.
+
+After you have defined your queries and/or expressions, choose one of them as the alert rule condition.
+
+When the queried data satisfies the defined condition, Grafana triggers the associated alert, which can be configured to send notifications through various channels like email, Slack, or PagerDuty. The notifications inform you about the condition being met, allowing you to take appropriate actions or investigate the underlying issue.
+
+By default, the last expression added is used as the alert condition.
+
+## Recovery threshold
+
+{{% admonition type="note" %}}
+The recovery threshold feature is currently only available in OSS.
+{{% /admonition %}}
+
+To reduce the noise of flapping alerts, you can set a recovery threshold different to the alert threshold.
+
+Flapping alerts occur when a metric hovers around the alert threshold condition and may lead to frequent state changes, resulting in too many notifications being generated.
+
+Grafana-managed alert rules are evaluated for a specific interval of time. During each evaluation, the result of the query is checked against the threshold set in the alert rule. If the value of a metric is above the threshold, an alert rule fires and a notification is sent. When the value goes below the threshold and there is an active alert for this metric, the alert is resolved, and another notification is sent.
+
+It can be tricky to create an alert rule for a noisy metric. That is, when the value of a metric continually goes above and below a threshold. This is called flapping and results in a series of firing - resolved - firing notifications and a noisy alert state history.
+
+For example, if you have an alert for latency with a threshold of 1000ms and the number fluctuates around 1000 (say 980 ->1010 -> 990 -> 1020, and so on) then each of those will trigger a notification.
+
+To solve this problem, you can set a (custom) recovery threshold, which basically means having two thresholds instead of one. An alert is triggered when the first threshold is crossed and is resolved only when the second threshold is crossed.
+
+For example, you could set a threshold of 1000ms and a recovery threshold of 900ms. This way, an alert rule will only stop firing when it goes under 900ms and flapping is reduced.
+
+## Alert on numeric data
+
+Among certain data sources numeric data that is not time series can be directly alerted on, or passed into Server Side Expressions (SSE). This allows for more processing and resulting efficiency within the data source, and it can also simplify alert rules.
+When alerting on numeric data instead of time series data, there is no need to reduce each labeled time series into a single number. Instead labeled numbers are returned to Grafana instead.
+
+### Tabular Data
+
+This feature is supported with backend data sources that query tabular data:
+
+- SQL data sources such as MySQL, Postgres, MSSQL, and Oracle.
+- The Azure Kusto based services: Azure Monitor (Logs), Azure Monitor (Azure Resource Graph), and Azure Data Explorer.
+
+A query with Grafana managed alerts or SSE is considered numeric with these data sources, if:
+
+- The "Format AS" option is set to "Table" in the data source query.
+- The table response returned to Grafana from the query includes only one numeric (e.g. int, double, float) column, and optionally additional string columns.
+
+If there are string columns then those columns become labels. The name of column becomes the label name, and the value for each row becomes the value of the corresponding label. If multiple rows are returned, then each row should be uniquely identified their labels.
+
+**Example**
+
+For a MySQL table called "DiskSpace":
+
+| Time        | Host | Disk | PercentFree |
+| ----------- | ---- | ---- | ----------- |
+| 2021-June-7 | web1 | /etc | 3           |
+| 2021-June-7 | web2 | /var | 4           |
+| 2021-June-7 | web3 | /var | 8           |
+| ...         | ...  | ...  | ...         |
+
+You can query the data filtering on time, but without returning the time series to Grafana. For example, an alert that would trigger per Host, Disk when there is less than 5% free space:
+
+```sql
+SELECT Host, Disk, CASE WHEN PercentFree < 5.0 THEN PercentFree ELSE 0 END FROM (
+  SELECT
+      Host,
+      Disk,
+      Avg(PercentFree)
+  FROM DiskSpace
+  Group By
+    Host,
+    Disk
+  Where __timeFilter(Time)
+```
+
+This query returns the following Table response to Grafana:
+
+| Host | Disk | PercentFree |
+| ---- | ---- | ----------- |
+| web1 | /etc | 3           |
+| web2 | /var | 4           |
+| web3 | /var | 0           |
+
+When this query is used as the **condition** in an alert rule, then the non-zero will be alerting. As a result, three alert instances are produced:
+
+| Labels                | Status   |
+| --------------------- | -------- |
+| {Host=web1,disk=/etc} | Alerting |
+| {Host=web2,disk=/var} | Alerting |
+| {Host=web3,disk=/var} | Normal   |
+
+{{% docs/reference %}}
+[data-source-alerting]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules#supported-data-sources"
+[data-source-alerting]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules#supported-data-sources"
+
+[query-transform-data]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data"
+[query-transform-data]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data"
+{{% /docs/reference %}}
diff --git a/docs/sources/alerting/fundamentals/alert-rules/queries-conditions/_index.md b/docs/sources/alerting/fundamentals/alert-rules/queries-conditions/_index.md
deleted file mode 100644
index 43433d7689cb7..0000000000000
--- a/docs/sources/alerting/fundamentals/alert-rules/queries-conditions/_index.md
+++ /dev/null
@@ -1,116 +0,0 @@
----
-canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/queries-conditions/
-description: Introduction to queries and conditions
-keywords:
-  - grafana
-  - alerting
-  - queries
-  - conditions
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Queries and conditions
-weight: 104
----
-
-# Queries and conditions
-
-In Grafana, queries play a vital role in fetching and transforming data from supported data sources, which include databases like MySQL and PostgreSQL, time series databases like Prometheus, InfluxDB and Graphite, and services like Elasticsearch, AWS CloudWatch, Azure Monitor and Google Cloud Monitoring.
-
-For more information on supported data sources, see [Data sources][data-source-alerting].
-
-The process of executing a query involves defining the data source, specifying the desired data to retrieve, and applying relevant filters or transformations. Query languages or syntaxes specific to the chosen data source are utilized for constructing these queries.
-
-In Alerting, you define a query to get the data you want to measure and a condition that needs to be met before an alert rule fires.
-
-An alert rule consists of one or more queries and expressions that select the data you want to measure.
-
-For more information on queries and expressions, see [Query and transform data][query-transform-data].
-
-## Data source queries
-
-Queries in Grafana can be applied in various ways, depending on the data source and query language being used. Each data source’s query editor provides a customized user interface that helps you write queries that take advantage of its unique capabilities.
-
-Because of the differences between query languages, each data source query editor looks and functions differently. Depending on your data source, the query editor might provide auto-completion features, metric names, variable suggestions, or a visual query-building interface.
-
-Some common types of query components include:
-
-**Metrics or data fields**: Specify the specific metrics or data fields you want to retrieve, such as CPU usage, network traffic, or sensor readings.
-
-**Time range**: Define the time range for which you want to fetch data, such as the last hour, a specific day, or a custom time range.
-
-**Filters**: Apply filters to narrow down the data based on specific criteria, such as filtering data by a specific tag, host, or application.
-
-**Aggregations**: Perform aggregations on the data to calculate metrics like averages, sums, or counts over a given time period.
-
-**Grouping**: Group the data by specific dimensions or tags to create aggregated views or breakdowns.
-
-**Note**:
-
-Grafana does not support alert queries with template variables. More information is available [here](https://community.grafana.com/t/template-variables-are-not-supported-in-alert-queries-while-setting-up-alert/2514).
-
-## Expression queries
-
-In Grafana, an expression is used to perform calculations, transformations, or aggregations on the data source queried data. It allows you to create custom metrics or modify existing metrics based on mathematical operations, functions, or logical expressions.
-
-By leveraging expression queries, users can perform tasks such as calculating the percentage change between two values, applying functions like logarithmic or trigonometric functions, aggregating data over specific time ranges or dimensions, and implementing conditional logic to handle different scenarios.
-
-In Alerting, you can only use expressions for Grafana-managed alert rules. For each expression, you can choose from the math, reduce, and resample expressions. These are called multi-dimensional rules, because they generate a separate alert for each series.
-
-You can also use classic condition, which creates an alert rule that triggers a single alert when its condition is met. As a result, Grafana sends only a single alert even when alert conditions are met for multiple series.
-
-**Note:**
-
-Classic conditions exist mainly for compatibility reasons and should be avoided if possible.
-
-**Reduce**
-
-Aggregates time series values in the selected time range into a single value.
-
-**Math**
-
-Performs free-form math functions/operations on time series and number data. Can be used to preprocess time series data or to define an alert condition for number data.
-
-**Resample**
-
-Realigns a time range to a new set of timestamps, this is useful when comparing time series data from different data sources where the timestamps would otherwise not align.
-
-**Threshold**
-
-Checks if any time series data matches the threshold condition.
-
-The threshold expression allows you to compare two single values. It returns `0` when the condition is false and `1` if the condition is true. The following threshold functions are available:
-
-- Is above (x > y)
-- Is below (x < y)
-- Is within range (x > y1 AND x < y2)
-- Is outside range (x < y1 AND x > y2)
-
-**Classic condition**
-
-Checks if any time series data matches the alert condition.
-
-**Note**:
-
-Classic condition expression queries always produce one alert instance only, no matter how many time series meet the condition.
-Classic conditions exist mainly for compatibility reasons and should be avoided if possible.
-
-## Alert condition
-
-An alert condition is the query or expression that determines whether the alert will fire or not depending on the value it yields. There can be only one condition which will determine the triggering of the alert.
-
-After you have defined your queries and/or expressions, choose one of them as the alert rule condition.
-
-When the queried data satisfies the defined condition, Grafana triggers the associated alert, which can be configured to send notifications through various channels like email, Slack, or PagerDuty. The notifications inform you about the condition being met, allowing you to take appropriate actions or investigate the underlying issue.
-
-By default, the last expression added is used as the alert condition.
-
-{{% docs/reference %}}
-[data-source-alerting]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/data-source-alerting"
-[data-source-alerting]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/data-source-alerting"
-
-[query-transform-data]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/query-transform-data"
-[query-transform-data]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/query-transform-data"
-{{% /docs/reference %}}
diff --git a/docs/sources/alerting/fundamentals/alert-rules/recording-rules/_index.md b/docs/sources/alerting/fundamentals/alert-rules/recording-rules/_index.md
deleted file mode 100644
index 0cf5bc7392e75..0000000000000
--- a/docs/sources/alerting/fundamentals/alert-rules/recording-rules/_index.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/recording-rules/
-description: Learn about recording rules
-keywords:
-  - grafana
-  - alerting
-  - recording rules
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Recording rules
-weight: 103
----
-
-# Recording rules
-
-_Recording rules are only available for compatible Prometheus or Loki data sources._
-
-A recording rule allows you to pre-compute frequently needed or computationally expensive expressions and save their result as a new set of time series. This is useful if you want to run alerts on aggregated data or if you have dashboards that query computationally expensive expressions repeatedly.
-
-Querying this new time series is faster, especially for dashboards since they query the same expression every time the dashboards refresh.
-
-Grafana Enterprise offers an alternative to recorded rules in the form of recorded queries that can be executed against any data source.
-
-For more information on recording rules in Prometheus, refer to [recording rules](https://prometheus.io/docs/prometheus/latest/configuration/recording_rules/).
diff --git a/docs/sources/alerting/fundamentals/alert-rules/rule-evaluation.md b/docs/sources/alerting/fundamentals/alert-rules/rule-evaluation.md
new file mode 100644
index 0000000000000..a34a508601c7f
--- /dev/null
+++ b/docs/sources/alerting/fundamentals/alert-rules/rule-evaluation.md
@@ -0,0 +1,72 @@
+---
+canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/rule-evaluation/
+description: Use alert rule evaluation to determine how frequently an alert rule should be evaluated and how quickly it should change its state
+keywords:
+  - grafana
+  - alerting
+  - evaluation
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Alert rule evaluation
+weight: 108
+---
+
+# Alert rule evaluation
+
+Use alert rule evaluation to determine how frequently an alert rule should be evaluated and how quickly it should change its state.
+
+To do this, you need to make sure that your alert rule is in the right evaluation group and set a pending period time that works best for your use case.
+
+## Evaluation group
+
+Every alert rule is part of an evaluation group. Each evaluation group contains an evaluation interval that determines how frequently the alert rule is checked.
+
+**Data-source managed** alert rules within the same group are evaluated one after the other, while alert rules in different groups can be evaluated simultaneously. This feature is especially useful when you want to ensure that recording rules are evaluated before any alert rules.
+
+**Grafana-managed** alert rules are evaluated at the same time, regardless of alert rule group. The default evaluation interval is set at 10 seconds, which means that Grafana-managed alert rules are evaluated every 10 seconds to the closest 10-second window on the clock, for example, 10:00:00, 10:00:10, 10:00:20, and so on. You can also configure your own evaluation interval, if required.
+
+**Note:**
+
+Evaluation groups and alerts grouping in notification policies are two separate things. Grouping in notification policies allows multiple alerts sharing the same labels to be sent in the same time message.
+
+## Pending period
+
+By setting a pending period, you can avoid unnecessary alerts for temporary problems.
+
+In the pending period, you select the period in which an alert rule can be in breach of the condition until it fires.
+
+**Example**
+
+Imagine you have an alert rule evaluation interval set at every 30 seconds and the pending period to 90 seconds.
+
+Evaluation will occur as follows:
+
+[00:30] First evaluation - condition not met.
+
+[01:00] Second evaluation - condition breached.
+Pending counter starts. **Alert starts pending.**
+
+[01:30] Third evaluation - condition breached. Pending counter = 30s. **Pending state.**
+
+[02:00] Fourth evaluation - condition breached. Pending counter = 60s **Pending state.**
+
+[02:30] Fifth evaluation - condition breached. Pending counter = 90s. **Alert starts firing**
+
+If the alert rule has a condition that needs to be in breach for a certain amount of time before it takes action, then its state changes as follows:
+
+- When the condition is first breached, the rule goes into a "pending" state.
+
+- The rule stays in the "pending" state until the condition has been broken for the required amount of time - pending period.
+
+- Once the required time has passed, the rule goes into a "firing" state.
+
+- If the condition is no longer broken during the pending period, the rule goes back to its normal state.
+
+**Note:**
+
+If you want to skip the pending state, you can simply set the pending period to 0. This effectively skips the pending period and your alert rule will start firing as soon as the condition is breached.
+
+When an alert rule fires, alert instances are produced, which are then sent to the Alertmanager.
diff --git a/docs/sources/alerting/fundamentals/alert-rules/rule-evaluation/_index.md b/docs/sources/alerting/fundamentals/alert-rules/rule-evaluation/_index.md
deleted file mode 100644
index 3d70a39a67c90..0000000000000
--- a/docs/sources/alerting/fundamentals/alert-rules/rule-evaluation/_index.md
+++ /dev/null
@@ -1,70 +0,0 @@
----
-canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/rule-evaluation/
-description: Introduction to alert rule evaluation
-keywords:
-  - grafana
-  - alerting
-  - evaluation
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Alert rule evaluation
-weight: 106
----
-
-# Alert rule evaluation
-
-Use alert rule evaluation to determine how frequently an alert rule should be evaluated and how quickly it should change its state.
-
-To do this, you need to make sure that your alert rule is in the right evaluation group and set a pending period time that works best for your use case.
-
-## Evaluation group
-
-Every alert rule is part of an evaluation group. Each evaluation group contains an evaluation interval that determines how frequently the alert rule is checked. Alert rules within the same group are evaluated one after the other, while alert rules in different groups can be evaluated simultaneously.
-
-This feature is especially useful for Prometheus/Mimir rules when you want to ensure that recording rules are evaluated before any alert rules.
-
-**Note:**
-
-Evaluation groups and alerts grouping in notification policies are two separate things. Grouping in notification policies allows multiple alerts sharing the same labels to be sent in the same time message.
-
-## Pending period
-
-By setting a pending period, you can avoid unnecessary alerts for temporary problems.
-
-In the pending period, you select the period in which an alert rule can be in breach of the condition until it fires.
-
-**Example**
-
-Imagine you have an alert rule evaluation interval set at every 30 seconds and the pending period to 90 seconds.
-
-Evaluation will occur as follows:
-
-[00:30] First evaluation - condition not met.
-
-[01:00] Second evaluation - condition breached.
-Pending counter starts. **Alert starts pending.**
-
-[01:30] Third evaluation - condition breached. Pending counter = 30s. **Pending state.**
-
-[02:00] Fourth evaluation - condition breached. Pending counter = 60s **Pending state.**
-
-[02:30] Fifth evaluation - condition breached. Pending counter = 90s. **Alert starts firing**
-
-If the alert rule has a condition that needs to be in breach for a certain amount of time before it takes action, then its state changes as follows:
-
-- When the condition is first breached, the rule goes into a "pending" state.
-
-- The rule stays in the "pending" state until the condition has been broken for the required amount of time - pending period.
-
-- Once the required time has passed, the rule goes into a "firing" state.
-
-- If the condition is no longer broken during the pending period, the rule goes back to its normal state.
-
-**Note:**
-
-If you want to skip the pending state, you can simply set the pending period to 0. This effectively skips the pending period and your alert rule will start firing as soon as the condition is breached.
-
-When an alert rule fires, alert instances are produced, which are then sent to the Alertmanager.
diff --git a/docs/sources/alerting/fundamentals/alert-rules/state-and-health.md b/docs/sources/alerting/fundamentals/alert-rules/state-and-health.md
index 0f66f3a832571..06ab9b8f2f0e2 100644
--- a/docs/sources/alerting/fundamentals/alert-rules/state-and-health.md
+++ b/docs/sources/alerting/fundamentals/alert-rules/state-and-health.md
@@ -1,11 +1,13 @@
 ---
 aliases:
-  - ../unified-alerting/alerting-rules/state-and-health/
+  - ../../fundamentals/state-and-health/ # /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/state-and-health/
+  - ../../unified-alerting/alerting-rules/state-and-health/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/alerting-rules/state-and-health
 canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/state-and-health/
-description: State and Health of alerting rules
+description: Learn about the state and health of alert rules to understand several key status indicators about your alerts
 keywords:
   - grafana
   - alerting
+  - keep last state
   - guide
   - state
 labels:
@@ -13,13 +15,13 @@ labels:
     - cloud
     - enterprise
     - oss
-title: State and health of alerting rules
-weight: 405
+title: State and health of alert rules
+weight: 109
 ---
 
-# State and health of alerting rules
+# State and health of alert rules
 
-The state and health of alerting rules help you understand several key status indicators about your alerts.
+The state and health of alert rules help you understand several key status indicators about your alerts.
 
 There are three key components: [alert rule state](#alert-rule-state), [alert instance state](#alert-instance-state), and [alert rule health](#alert-rule-health). Although related, each component conveys subtly different information.
 
@@ -27,11 +29,13 @@ There are three key components: [alert rule state](#alert-rule-state), [alert in
 
 An alert rule can be in either of the following states:
 
-| State       | Description                                                                                    |
-| ----------- | ---------------------------------------------------------------------------------------------- |
-| **Normal**  | None of the time series returned by the evaluation engine is in a `Pending` or `Firing` state. |
-| **Pending** | At least one time series returned by the evaluation engine is `Pending`.                       |
-| **Firing**  | At least one time series returned by the evaluation engine is `Firing`.                        |
+| State       | Description                                                                                        |
+| ----------- | -------------------------------------------------------------------------------------------------- |
+| **Normal**  | None of the alert instances returned by the evaluation engine is in a `Pending` or `Firing` state. |
+| **Pending** | At least one alert instances returned by the evaluation engine is `Pending`.                       |
+| **Firing**  | At least one alert instances returned by the evaluation engine is `Firing`.                        |
+
+The alert rule state is determined by the “worst case” state of the alert instances produced. For example, if one alert instance is firing, the alert rule state will also be firing.
 
 {{% admonition type="note" %}}
 Alerts will transition first to `pending` and then `firing`, thus it will take at least two evaluation cycles before an alert is fired.
@@ -47,21 +51,26 @@ An alert instance can be in either of the following states:
 | **Pending**  | The state of an alert that has been active for less than the configured threshold duration.   |
 | **Alerting** | The state of an alert that has been active for longer than the configured threshold duration. |
 | **NoData**   | No data has been received for the configured time window.                                     |
-| **Error**    | The error that occurred when attempting to evaluate an alerting rule.                         |
+| **Error**    | The error that occurred when attempting to evaluate an alert rule.                            |
+
+## Keep last state
+
+An alert rule can be configured to keep the last state when a `NoData` and/or `Error` state is encountered. This will both prevent alerts from firing, and from resolving and re-firing. Just like normal evaluation, the alert rule will transition from `Pending` to `Firing` after the pending period has elapsed.
 
 ## Alert rule health
 
 An alert rule can have one the following health statuses:
 
-| State      | Description                                                                        |
-| ---------- | ---------------------------------------------------------------------------------- |
-| **Ok**     | No error when evaluating an alerting rule.                                         |
-| **Error**  | An error occurred when evaluating an alerting rule.                                |
-| **NoData** | The absence of data in at least one time series returned during a rule evaluation. |
+| State                  | Description                                                                                              |
+| ---------------------- | -------------------------------------------------------------------------------------------------------- |
+| **Ok**                 | No error when evaluating an alerting rule.                                                               |
+| **Error**              | An error occurred when evaluating an alerting rule.                                                      |
+| **NoData**             | The absence of data in at least one time series returned during a rule evaluation.                       |
+| **{status}, KeepLast** | The rule would have received another status but was configured to keep the last state of the alert rule. |
 
 ## Special alerts for `NoData` and `Error`
 
-When evaluation of an alerting rule produces state `NoData` or `Error`, Grafana Alerting will generate alert instances that have the following additional labels:
+When evaluation of an alert rule produces state `NoData` or `Error`, Grafana Alerting will generate alert instances that have the following additional labels:
 
 | Label              | Description                                                            |
 | ------------------ | ---------------------------------------------------------------------- |
diff --git a/docs/sources/alerting/fundamentals/alertmanager.md b/docs/sources/alerting/fundamentals/alertmanager.md
deleted file mode 100644
index f3a29067c3699..0000000000000
--- a/docs/sources/alerting/fundamentals/alertmanager.md
+++ /dev/null
@@ -1,59 +0,0 @@
----
-aliases:
-  - ../fundamentals/alertmanager/
-  - ../metrics/
-  - ../unified-alerting/fundamentals/alertmanager/
-  - alerting/manage-notifications/alertmanager/
-canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alertmanager/
-description: Intro to the different Alertmanagers
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Alertmanager
-weight: 140
----
-
-# Alertmanager
-
-Alertmanager enables you to quickly and efficiently manage and respond to alerts. It receives alerts, handles silencing, inhibition, grouping, and routing by sending notifications out via your channel of choice, for example, email or Slack.
-
-In Grafana, you can use the Cloud Alertmanager, Grafana Alertmanager, or an external Alertmanager. You can also run multiple Alertmanagers; your decision depends on your set up and where your alerts are being generated.
-
-**Cloud Alertmanager**
-
-Cloud Alertmanager runs in Grafana Cloud and it can receive alerts from Grafana, Mimir, and Loki.
-
-**Grafana Alertmanager**
-
-Grafana Alertmanager is an internal Alertmanager that is pre-configured and available for selection by default if you run Grafana on-premises or open-source.
-
-The Grafana Alertmanager can receive alerts from Grafana, but it cannot receive alerts from outside Grafana, for example, from Mimir or Loki.
-
-**Note that inhibition rules are not supported in the Grafana Alertmanager.**
-
-**External Alertmanager**
-
-If you want to use a single Alertmanager to receive all your Grafana, Loki, Mimir, and Prometheus alerts, you can set up Grafana to use an external Alertmanager. This external Alertmanager can be configured and administered from within Grafana itself.
-
-Here are two examples of when you may want to configure your own external alertmanager and send your alerts there instead of the Grafana Alertmanager:
-
-1. You may already have Alertmanagers on-premises in your own Cloud infrastructure that you have set up and still want to use, because you have other alert generators, such as Prometheus.
-
-2. You want to use both Prometheus on-premises and hosted Grafana to send alerts to the same Alertmanager that runs in your Cloud infrastructure.
-
-Alertmanagers are visible from the drop-down menu on the Alerting Contact Points, Notification Policies, and Silences pages.
-
-If you are provisioning your data source, set the flag `handleGrafanaManagedAlerts` in the `jsonData` field to `true` to send Grafana-managed alerts to this Alertmanager.
-
-**Useful links**
-
-[Prometheus Alertmanager documentation](https://prometheus.io/docs/alerting/latest/alertmanager/)
-
-[Add an external Alertmanager][configure-alertmanager]
-
-{{% docs/reference %}}
-[configure-alertmanager]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/set-up/configure-alertmanager"
-[configure-alertmanager]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/configure-alertmanager"
-{{% /docs/reference %}}
diff --git a/docs/sources/alerting/fundamentals/annotation-label/_index.md b/docs/sources/alerting/fundamentals/annotation-label/_index.md
deleted file mode 100644
index e689ea10d2f15..0000000000000
--- a/docs/sources/alerting/fundamentals/annotation-label/_index.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-aliases:
-  - ../alerting-rules/alert-annotation-label/
-  - ../unified-alerting/alerting-rules/alert-annotation-label/
-canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/annotation-label/
-description: Annotations and labels for alerting
-keywords:
-  - grafana
-  - alerting
-  - guide
-  - rules
-  - create
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Labels and annotations
-weight: 120
----
-
-# Labels and annotations
-
-Labels and annotations contain information about an alert. Both labels and annotations have the same structure: a set of named values; however their intended uses are different. An example of label, or the equivalent annotation, might be `alertname="test"`.
-
-The main difference between a label and an annotation is that labels are used to differentiate an alert from all other alerts, while annotations are used to add additional information to an existing alert.
-
-For example, consider two high CPU alerts: one for `server1` and another for `server2`. In such an example we might have a label called `server` where the first alert has the label `server="server1"` and the second alert has the label `server="server2"`. However, we might also want to add a description to each alert such as `"The CPU usage for server1 is above 75%."`, where `server1` and `75%` are replaced with the name and CPU usage of the server (please refer to the documentation on [templating labels and annotations][variables-label-annotation] for how to do this). This kind of description would be more suitable as an annotation.
-
-## Labels
-
-Labels contain information that identifies an alert. An example of a label might be `server=server1`. Each alert can have more than one label, and the complete set of labels for an alert is called its label set. It is this label set that identifies the alert.
-
-For example, an alert might have the label set `{alertname="High CPU usage",server="server1"}` while another alert might have the label set `{alertname="High CPU usage",server="server2"}`. These are two separate alerts because although their `alertname` labels are the same, their `server` labels are different.
-
-The label set for an alert is a combination of the labels from the datasource, custom labels from the alert rule, and a number of reserved labels such as `alertname`.
-
-### Custom Labels
-
-Custom labels are additional labels from the alert rule. Like annotations, custom labels must have a name, and their value can contain a combination of text and template code that is evaluated when an alert is fired. Documentation on how to template custom labels can be found [here][variables-label-annotation].
-
-When using custom labels with templates it is important to make sure that the label value does not change between consecutive evaluations of the alert rule as this will end up creating large numbers of distinct alerts. However, it is OK for the template to produce different label values for different alerts. For example, do not put the value of the query in a custom label as this will end up creating a new set of alerts each time the value changes. Instead use annotations.
-
-It is also important to make sure that the label set for an alert does not have two or more labels with the same name. If a custom label has the same name as a label from the datasource then it will replace that label. However, should a custom label have the same name as a reserved label then the custom label will be omitted from the alert.
-
-## Annotations
-
-Annotations are named pairs that add additional information to existing alerts. There are a number of suggested annotations in Grafana such as `description`, `summary`, `runbook_url`, `dashboardUId` and `panelId`. Like custom labels, annotations must have a name, and their value can contain a combination of text and template code that is evaluated when an alert is fired. If an annotation contains template code, the template is evaluated once when the alert is fired. It is not re-evaluated, even when the alert is resolved. Documentation on how to template annotations can be found [here][variables-label-annotation].
-
-{{% docs/reference %}}
-[variables-label-annotation]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/annotation-label/variables-label-annotation"
-[variables-label-annotation]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/annotation-label/variables-label-annotation"
-{{% /docs/reference %}}
diff --git a/docs/sources/alerting/fundamentals/annotation-label/how-to-use-labels.md b/docs/sources/alerting/fundamentals/annotation-label/how-to-use-labels.md
deleted file mode 100644
index 9a2011aff5463..0000000000000
--- a/docs/sources/alerting/fundamentals/annotation-label/how-to-use-labels.md
+++ /dev/null
@@ -1,63 +0,0 @@
----
-canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/annotation-label/how-to-use-labels/
-description: Learn about labels and label matchers in alerting
-keywords:
-  - grafana
-  - alerting
-  - guide
-  - fundamentals
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Labels in Grafana Alerting
-weight: 117
----
-
-# Labels in Grafana Alerting
-
-This topic explains why labels are a fundamental component of alerting.
-
-- The complete set of labels for an alert is what uniquely identifies an alert within Grafana alerts.
-- The Alertmanager uses labels to match alerts for silences and alert groups in notification policies.
-- The alerting UI shows labels for every alert instance generated during evaluation of that rule.
-- Contact points can access labels to dynamically generate notifications that contain information specific to the alert that is resulting in a notification.
-- You can add labels to an [alerting rule][alerting-rules]. Labels are manually configurable, use template functions, and can reference other labels. Labels added to an alerting rule take precedence in the event of a collision between labels (except in the case of [Grafana reserved labels](#grafana-reserved-labels)).
-
-{{< figure src="/static/img/docs/alerting/unified/rule-edit-details-8-0.png" max-width="550px" caption="Alert details" >}}
-
-## External Alertmanager Compatibility
-
-Grafana's built-in Alertmanager supports both Unicode label keys and values. If you are using an external Prometheus Alertmanager, label keys must be compatible with their [data model](https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels).
-This means that label keys must only contain **ASCII letters**, **numbers**, as well as **underscores** and match the regex `[a-zA-Z_][a-zA-Z0-9_]*`.
-Any invalid characters will be removed or replaced by the Grafana alerting engine before being sent to the external Alertmanager according to the following rules:
-
-- `Whitespace` will be removed.
-- `ASCII characters` will be replaced with `_`.
-- `All other characters` will be replaced with their lower-case hex representation. If this is the first character it will be prefixed with `_`.
-
-Example: A label key/value pair `Alert! 🔔="🔥"` will become `Alert_0x1f514="🔥"`.
-
-**Note** If multiple label keys are sanitized to the same value, the duplicates will have a short hash of the original label appended as a suffix.
-
-## Grafana reserved labels
-
-{{% admonition type="note" %}}
-Labels prefixed with `grafana_` are reserved by Grafana for special use. If a manually configured label is added beginning with `grafana_` it may be overwritten in case of collision.
-To stop the Grafana Alerting engine from adding a reserved label, you can disable it via the `disabled_labels` option in [unified_alerting.reserved_labels][unified-alerting-reserved-labels] configuration.
-{{% /admonition %}}
-
-Grafana reserved labels can be used in the same way as manually configured labels. The current list of available reserved labels are:
-
-| Label          | Description                               |
-| -------------- | ----------------------------------------- |
-| grafana_folder | Title of the folder containing the alert. |
-
-{{% docs/reference %}}
-[alerting-rules]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/alerting-rules"
-[alerting-rules]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules"
-
-[unified-alerting-reserved-labels]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-grafana#unified_alertingreserved_labels"
-[unified-alerting-reserved-labels]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-grafana#unified_alertingreserved_labels"
-{{% /docs/reference %}}
diff --git a/docs/sources/alerting/fundamentals/annotation-label/labels-and-label-matchers.md b/docs/sources/alerting/fundamentals/annotation-label/labels-and-label-matchers.md
deleted file mode 100644
index 09c14d366618d..0000000000000
--- a/docs/sources/alerting/fundamentals/annotation-label/labels-and-label-matchers.md
+++ /dev/null
@@ -1,52 +0,0 @@
----
-canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/annotation-label/labels-and-label-matchers/
-description: Learn about labels and label matchers in alerting
-keywords:
-  - grafana
-  - alerting
-  - guide
-  - fundamentals
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-menuTitle: Label matchers
-title: How label matching works
-weight: 117
----
-
-# How label matching works
-
-Use labels and label matchers to link alert rules to notification policies and silences. This allows for a very flexible way to manage your alert instances, specify which policy should handle them, and which alerts to silence.
-
-A label matchers consists of 3 distinct parts, the **label**, the **value** and the **operator**.
-
-- The **Label** field is the name of the label to match. It must exactly match the label name.
-
-- The **Value** field matches against the corresponding value for the specified **Label** name. How it matches depends on the **Operator** value.
-
-- The **Operator** field is the operator to match against the label value. The available operators are:
-
-| Operator | Description                                        |
-| -------- | -------------------------------------------------- |
-| `=`      | Select labels that are exactly equal to the value. |
-| `!=`     | Select labels that are not equal to the value.     |
-| `=~`     | Select labels that regex-match the value.          |
-| `!~`     | Select labels that do not regex-match the value.   |
-
-If you are using multiple label matchers, they are combined using the AND logical operator. This means that all matchers must match in order to link a rule to a policy.
-
-## Example scenario
-
-If you define the following set of labels for your alert:
-
-`{ foo=bar, baz=qux, id=12 }`
-
-then:
-
-- A label matcher defined as `foo=bar` matches this alert rule.
-- A label matcher defined as `foo!=bar` does _not_ match this alert rule.
-- A label matcher defined as `id=~[0-9]+` matches this alert rule.
-- A label matcher defined as `baz!~[0-9]+` matches this alert rule.
-- Two label matchers defined as `foo=bar` and `id=~[0-9]+` match this alert rule.
diff --git a/docs/sources/alerting/fundamentals/annotation-label/variables-label-annotation.md b/docs/sources/alerting/fundamentals/annotation-label/variables-label-annotation.md
deleted file mode 100644
index 67434380fabc6..0000000000000
--- a/docs/sources/alerting/fundamentals/annotation-label/variables-label-annotation.md
+++ /dev/null
@@ -1,450 +0,0 @@
----
-canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/annotation-label/variables-label-annotation/
-description: Learn about templating of labels and annotations
-keywords:
-  - grafana
-  - alerting
-  - templating
-  - labels
-  - annotations
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Templating labels and annotations
-weight: 117
----
-
-# Templating labels and annotations
-
-You can use templates to include data from queries and expressions in labels and annotations. For example, you might want to set the severity label for an alert based on the value of the query, or use the instance label from the query in a summary annotation so you know which server is experiencing high CPU usage.
-
-All templates should be written in [text/template](https://pkg.go.dev/text/template). Regardless of whether you are templating a label or an annotation, you should write each template inline inside the label or annotation that you are templating. This means you cannot share templates between labels and annotations, and instead you will need to copy templates wherever you want to use them.
-
-Each template is evaluated whenever the alert rule is evaluated, and is evaluated for every alert separately. For example, if your alert rule has a templated summary annotation, and the alert rule has 10 firing alerts, then the template will be executed 10 times, once for each alert. You should try to avoid doing expensive computations in your templates as much as possible.
-
-## Examples
-
-Rather than write a complete tutorial on text/template, the following examples attempt to show the most common use-cases we have seen for templates. You can use these examples verbatim, or adapt them as necessary for your use case. For more information on how to write text/template refer to the [text/template](https://pkg.go.dev/text/template) documentation.
-
-### Print all labels, comma separated
-
-To print all labels, comma separated, print the `$labels` variable:
-
-```
-{{ $labels }}
-```
-
-For example, given an alert with the labels `alertname=High CPU usage`, `grafana_folder=CPU alerts` and `instance=server1`, this would print:
-
-```
-alertname=High CPU usage, grafana_folder=CPU alerts, instance=server1
-```
-
-> If you are using classic conditions then `$labels` will not contain any labels from the query. Refer to [the $labels variable](#the-labels-variable) for more information.
-
-### Print all labels, one per line
-
-To print all labels, one per line, use a `range` to iterate over each key/value pair and print them individually. Here `$k` refers to the name and `$v` refers to the value of the current label:
-
-```
-{{ range $k, $v := $labels -}}
-{{ $k }}={{ $v }}
-{{ end }}
-```
-
-For example, given an alert with the labels `alertname=High CPU usage`, `grafana_folder=CPU alerts` and `instance=server1`, this would print:
-
-```
-alertname=High CPU usage
-grafana_folder=CPU alerts
-instance=server1
-```
-
-> If you are using classic conditions then `$labels` will not contain any labels from the query. Refer to [the $labels variable](#the-labels-variable) for more information.
-
-### Print an individual label
-
-To print an individual label use the `index` function with the `$labels` variable:
-
-```
-The host {{ index $labels "instance" }} has exceeded 80% CPU usage for the last 5 minutes
-```
-
-For example, given an alert with the labels `instance=server1`, this would print:
-
-```
-The host server1 has exceeded 80% CPU usage for the last 5 minutes
-```
-
-> If you are using classic conditions then `$labels` will not contain any labels from the query. Refer to [the $labels variable](#the-labels-variable) for more information.
-
-### Print the value of a query
-
-To print the value of an instant query you can print its Ref ID using the `index` function and the `$values` variable:
-
-```
-{{ index $values "A" }}
-```
-
-For example, given an instant query that returns the value 81.2345, this will print:
-
-```
-81.2345
-```
-
-To print the value of a range query you must first reduce it from a time series to an instant vector with a reduce expression. You can then print the result of the reduce expression by using its Ref ID instead. For example, if the reduce expression takes the average of A and has the Ref ID B you would write:
-
-```
-{{ index $values "B" }}
-```
-
-### Print the humanized value of a query
-
-To print the humanized value of an instant query use the `humanize` function:
-
-```
-{{ humanize (index $values "A").Value }}
-```
-
-For example, given an instant query that returns the value 81.2345, this will print:
-
-```
-81.234
-```
-
-To print the humanized value of a range query you must first reduce it from a time series to an instant vector with a reduce expression. You can then print the result of the reduce expression by using its Ref ID instead. For example, if the reduce expression takes the average of A and has the Ref ID B you would write:
-
-```
-{{ humanize (index $values "B").Value }}
-```
-
-### Print the value of a query as a percentage
-
-To print the value of an instant query as a percentage use the `humanizePercentage` function:
-
-```
-{{ humanizePercentage (index $values "A").Value }}
-```
-
-This function expects the value to be a decimal number between 0 and 1. If the value is instead a decimal number between 0 and 100 you can either divide it by 100 in your query or using a math expression. If the query is a range query you must first reduce it from a time series to an instant vector with a reduce expression.
-
-### Set a severity from the value of a query
-
-To set a severity label from the value of a query use an if statement and the greater than comparison function. Make sure to use decimals (`80.0`, `50.0`, `0.0`, etc) when doing comparisons against `$values` as text/template does not support type coercion. You can find a list of all the supported comparison functions [here](https://pkg.go.dev/text/template#hdr-Functions).
-
-```
-{{ if (gt $values.A.Value 80.0) -}}
-high
-{{ else if (gt $values.A.Value 50.0) -}}
-medium
-{{ else -}}
-low
-{{- end }}
-```
-
-### Print all labels from a classic condition
-
-You cannot use `$labels` to print labels from the query if you are using classic conditions, and must use `$values` instead. The reason for this is classic conditions discard these labels to enforce uni-dimensional behavior (at most one alert per alert rule). If classic conditions didn't discard these labels, then queries that returned many time series would cause alerts to flap between firing and resolved constantly as the labels would change every time the alert rule was evaluated.
-
-Instead, the `$values` variable contains the reduced values of all time series for all conditions that are firing. For example, if you have an alert rule with a query A that returns two time series, and a classic condition B with two conditions, then `$values` would contain `B0`, `B1`, `B2` and `B3`. If the classic condition B had just one condition, then `$values` would contain just `B0` and `B1`.
-
-To print all labels of all firing time series use the following template (make sure to replace `B` in the regular expression with the Ref ID of the classic condition if it's different):
-
-```
-{{ range $k, $v := $values -}}
-{{ if (match "B[0-9]+" $k) -}}
-{{ $k }}: {{ $v.Labels }}{{ end }}
-{{ end }}
-```
-
-For example, a classic condition for two time series exceeding a single condition would print:
-
-```
-B0: instance=server1
-B1: instance=server2
-```
-
-If the classic condition has two or more conditions, and a time series exceeds multiple conditions at the same time, then its labels will be duplicated for each condition that is exceeded:
-
-```
-B0: instance=server1
-B1: instance=server2
-B2: instance=server1
-B3: instance=server2
-```
-
-If you need to print unique labels you should consider changing your alert rules from uni-dimensional to multi-dimensional instead. You can do this by replacing your classic condition with reduce and math expressions.
-
-### Print all values from a classic condition
-
-To print all values from a classic condition take the previous example and replace `$v.Labels` with `$v.Value`:
-
-```
-{{ range $k, $v := $values -}}
-{{ if (match "B[0-9]+" $k) -}}
-{{ $k }}: {{ $v.Value }}{{ end }}
-{{ end }}
-```
-
-For example, a classic condition for two time series exceeding a single condition would print:
-
-```
-B0: 81.2345
-B1: 84.5678
-```
-
-If the classic condition has two or more conditions, and a time series exceeds multiple conditions at the same time, then `$values` will contain the values of all conditions:
-
-```
-B0: 81.2345
-B1: 92.3456
-B2: 84.5678
-B3: 95.6789
-```
-
-## Variables
-
-The following variables are available to you when templating labels and annotations:
-
-### The labels variable
-
-The `$labels` variable contains all labels from the query. For example, suppose you have a query that returns CPU usage for all of your servers, and you have an alert rule that fires when any of your servers have exceeded 80% CPU usage for the last 5 minutes. You want to add a summary annotation to the alert that tells you which server is experiencing high CPU usage. With the `$labels` variable you can write a template that prints a human-readable sentence such as:
-
-```
-CPU usage for {{ index $labels "instance" }} has exceeded 80% for the last 5 minutes
-```
-
-> If you are using a classic condition then `$labels` will not contain any labels from the query. Classic conditions discard these labels in order to enforce uni-dimensional behavior (at most one alert per alert rule). If you want to use labels from the query in your template then use the example [here](#print-all-labels-from-a-classic-condition).
-
-### The value variable
-
-The `$value` variable is a string containing the labels and values of all instant queries; threshold, reduce and math expressions, and classic conditions in the alert rule. It does not contain the results of range queries, as these can return anywhere from 10s to 10,000s of rows or metrics. If it did, for especially large queries a single alert could use 10s of MBs of memory and Grafana would run out of memory very quickly.
-
-To print the `$value` variable in the summary you would write something like this:
-
-```
-CPU usage for {{ index $labels "instance" }} has exceeded 80% for the last 5 minutes: {{ $value }})
-```
-
-And would look something like this:
-
-```
-CPU usage for instance1 has exceeded 80% for the last 5 minutes: [ var='A' labels={instance=instance1} value=81.234 ]
-```
-
-Here `var='A'` refers to the instant query with Ref ID A, `labels={instance=instance1}` refers to the labels, and `value=81.234` refers to the average CPU usage over the last 5 minutes.
-
-If you want to print just some of the string instead of the full string then use the `$values` variable. It contains the same information as `$value`, but in a structured table, and is much easier to use then writing a regular expression to match just the text you want.
-
-### The values variable
-
-The `$values` variable is a table containing the labels and floating point values of all instant queries and expressions, indexed by their Ref IDs.
-
-To print the value of the instant query with Ref ID A:
-
-```
-CPU usage for {{ index $labels "instance" }} has exceeded 80% for the last 5 minutes: {{ index $values "A" }})
-```
-
-For example, given an alert with the labels `instance=server1` and an instant query with the value `81.2345`, this would print:
-
-```
-CPU usage for instance1 has exceeded 80% for the last 5 minutes: 81.2345
-```
-
-If the query in Ref ID A is a range query rather than an instant query then add a reduce expression with Ref ID B and replace `(index $values "A")` with `(index $values "B")`:
-
-```
-CPU usage for {{ index $labels "instance" }} has exceeded 80% for the last 5 minutes: {{ index $values "B" }})
-```
-
-## Functions
-
-The following functions are available to you when templating labels and annotations:
-
-### args
-
-The `args` function translates a list of objects to a map with keys arg0, arg1 etc. This is intended to allow multiple arguments to be passed to templates:
-
-```
-{{define "x"}}{{.arg0}} {{.arg1}}{{end}}{{template "x" (args 1 "2")}}
-```
-
-```
-1 2
-```
-
-### externalURL
-
-The `externalURL` function returns the external URL of the Grafana server as configured in the ini file(s):
-
-```
-{{ externalURL }}
-```
-
-```
-https://example.com/grafana
-```
-
-### graphLink
-
-The `graphLink` function returns the path to the graphical view in [Explore][explore] for the given expression and data source:
-
-```
-{{ graphLink "{\"expr\": \"up\", \"datasource\": \"gdev-prometheus\"}" }}
-```
-
-```
-/explore?left=["now-1h","now","gdev-prometheus",{"datasource":"gdev-prometheus","expr":"up","instant":false,"range":true}]
-```
-
-### humanize
-
-The `humanize` function humanizes decimal numbers:
-
-```
-{{ humanize 1000.0 }}
-```
-
-```
-1k
-```
-
-### humanize1024
-
-The `humanize1024` works similar to `humanize` but but uses 1024 as the base rather than 1000:
-
-```
-{{ humanize1024 1024.0 }}
-```
-
-```
-1ki
-```
-
-### humanizeDuration
-
-The `humanizeDuration` function humanizes a duration in seconds:
-
-```
-{{ humanizeDuration 60.0 }}
-```
-
-```
-1m 0s
-```
-
-### humanizePercentage
-
-The `humanizePercentage` function humanizes a ratio value to a percentage:
-
-```
-{{ humanizePercentage 0.2 }}
-```
-
-```
-20%
-```
-
-### humanizeTimestamp
-
-The `humanizeTimestamp` function humanizes a Unix timestamp:
-
-```
-{{ humanizeTimestamp 1577836800.0 }}
-```
-
-```
-2020-01-01 00:00:00 +0000 UTC
-```
-
-### match
-
-The `match` function matches the text against a regular expression pattern:
-
-```
-{{ match "a.*" "abc" }}
-```
-
-```
-true
-```
-
-### pathPrefix
-
-The `pathPrefix` function returns the path of the Grafana server as configured in the ini file(s):
-
-```
-{{ pathPrefix }}
-```
-
-```
-/grafana
-```
-
-### tableLink
-
-The `tableLink` function returns the path to the tabular view in [Explore][explore] for the given expression and data source:
-
-```
-{{ tableLink "{\"expr\": \"up\", \"datasource\": \"gdev-prometheus\"}" }}
-```
-
-```
-/explore?left=["now-1h","now","gdev-prometheus",{"datasource":"gdev-prometheus","expr":"up","instant":true,"range":false}]
-```
-
-### title
-
-The `title` function capitalizes the first character of each word:
-
-```
-{{ title "hello, world!" }}
-```
-
-```
-Hello, World!
-```
-
-### toLower
-
-The `toLower` function returns all text in lowercase:
-
-```
-{{ toLower "Hello, world!" }}
-```
-
-```
-hello, world!
-```
-
-### toUpper
-
-The `toUpper` function returns all text in uppercase:
-
-```
-{{ toUpper "Hello, world!" }}
-```
-
-```
-HELLO, WORLD!
-```
-
-### reReplaceAll
-
-The `reReplaceAll` function replaces text matching the regular expression:
-
-```
-{{ reReplaceAll "localhost:(.*)" "example.com:$1" "localhost:8080" }}
-```
-
-```
-example.com:8080
-```
-
-{{% docs/reference %}}
-[explore]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/explore"
-[explore]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/explore"
-{{% /docs/reference %}}
diff --git a/docs/sources/alerting/fundamentals/contact-points/index.md b/docs/sources/alerting/fundamentals/contact-points/index.md
deleted file mode 100644
index 3d90b43bcec95..0000000000000
--- a/docs/sources/alerting/fundamentals/contact-points/index.md
+++ /dev/null
@@ -1,63 +0,0 @@
----
-aliases:
-  - /docs/grafana/latest/alerting/contact-points/
-  - /docs/grafana/latest/alerting/unified-alerting/contact-points/
-  - /docs/grafana/latest/alerting/fundamentals/contact-points/contact-point-types/
-canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/contact-points/
-description: Create or edit contact point
-keywords:
-  - grafana
-  - alerting
-  - guide
-  - contact point
-  - notification channel
-  - create
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Contact points
-weight: 150
----
-
-# Contact points
-
-Contact points contain the configuration for sending notifications. A contact point is a list of integrations, each of which sends a notification to a particular email address, service or URL. Contact points can have multiple integrations of the same kind, or a combination of integrations of different kinds. For example, a contact point could contain a Pagerduty integration; an email and Slack integration; or a Pagerduty integration, a Slack integration, and two email integrations. You can also configure a contact point with no integrations; in which case no notifications are sent.
-
-A contact point cannot send notifications until it has been added to a notification policy. A notification policy can only send alerts to one contact point, but a contact point can be added to a number of notification policies at the same time. When an alert matches a notification policy, the alert is sent to the contact point in that notification policy, which then sends a notification to each integration in its configuration.
-
-Contact points can be configured for the Grafana Alertmanager as well as external alertmanagers.
-
-You can also use notification templating to customize notification messages for contact point integrations.
-
-**Note:**
-
-If you've created an OnCall contact point in the Grafana OnCall application, you can view it in the Alerting application.
-
-## Supported contact point integrations
-
-The following table lists the contact point integrations supported by Grafana.
-
-| Name                                             | Type                      | Grafana Alertmanager | Other Alertmanagers                                                                                      |
-| ------------------------------------------------ | ------------------------- | -------------------- | -------------------------------------------------------------------------------------------------------- |
-| [DingDing](https://www.dingtalk.com/en)          | `dingding`                | Supported            | N/A                                                                                                      |
-| [Discord](https://discord.com/)                  | `discord`                 | Supported            | N/A                                                                                                      |
-| Email                                            | `email`                   | Supported            | Supported                                                                                                |
-| [Google Chat](https://chat.google.com/)          | `googlechat`              | Supported            | N/A                                                                                                      |
-| [Kafka](https://kafka.apache.org/)               | `kafka`                   | Supported            | N/A                                                                                                      |
-| [Line](https://line.me/en/)                      | `line`                    | Supported            | N/A                                                                                                      |
-| [Microsoft Teams](https://teams.microsoft.com/)  | `teams`                   | Supported            | Supported                                                                                                |
-| [Opsgenie](https://atlassian.com/opsgenie/)      | `opsgenie`                | Supported            | Supported                                                                                                |
-| [Pagerduty](https://www.pagerduty.com/)          | `pagerduty`               | Supported            | Supported                                                                                                |
-| [Prometheus Alertmanager](https://prometheus.io) | `prometheus-alertmanager` | Supported            | N/A                                                                                                      |
-| [Pushover](https://pushover.net/)                | `pushover`                | Supported            | Supported                                                                                                |
-| [Sensu Go](https://docs.sensu.io/sensu-go/)      | `sensugo`                 | Supported            | N/A                                                                                                      |
-| [Slack](https://slack.com/)                      | `slack`                   | Supported            | Supported                                                                                                |
-| [Telegram](https://telegram.org/)                | `telegram`                | Supported            | N/A                                                                                                      |
-| [Threema](https://threema.ch/)                   | `threema`                 | Supported            | N/A                                                                                                      |
-| [VictorOps](https://help.victorops.com/)         | `victorops`               | Supported            | Supported                                                                                                |
-| Webhook                                          | `webhook`                 | Supported            | Supported ([different format](https://prometheus.io/docs/alerting/latest/configuration/#webhook_config)) |
-| Cisco Webex Teams                                | `webex`                   | Supported            | Supported                                                                                                |
-| WeCom                                            | `wecom`                   | Supported            | N/A                                                                                                      |
-| [Zenduty](https://www.zenduty.com/)              | `webhook`                 | Supported            | N/A                                                                                                      |
diff --git a/docs/sources/alerting/fundamentals/data-source-alerting.md b/docs/sources/alerting/fundamentals/data-source-alerting.md
deleted file mode 100644
index 3886845d004b2..0000000000000
--- a/docs/sources/alerting/fundamentals/data-source-alerting.md
+++ /dev/null
@@ -1,95 +0,0 @@
----
-canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/data-source-alerting/
-description: Data sources in Grafana Alerting
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Data sources and Grafana Alerting
-weight: 100
----
-
-# Data sources and Grafana Alerting
-
-There are a number of data sources that are compatible with Grafana Alerting. Each data source is supported by a plugin. You can use one of the built-in data sources listed below, use [external data source plugins](/grafana/plugins/?type=datasource), or create your own data source plugin.
-
-If you are creating your own data source plugin, make sure it is a backend plugin as Grafana Alerting requires this in order to be able to evaluate rules using the data source. Frontend data sources are not supported, because the evaluation engine runs on the backend.
-
-Specifying `{ "alerting": true, “backend”: true }` in the plugin.json file indicates that the data source plugin is compatible with Grafana Alerting and includes the backend data-fetching code. For more information, refer to [Build a data source backend plugin](/tutorials/build-a-data-source-backend-plugin/).
-
-These are the data sources that are compatible with and supported by Grafana Alerting.
-
-- [AWS CloudWatch][]
-- [Azure Monitor][]
-- [Elasticsearch][]
-- [Google Cloud Monitoring][]
-- [Graphite][]
-- [InfluxDB][]
-- [Loki][]
-- [Microsoft SQL Server (MSSQL)][]
-- [MySQL][]
-- [Open TSDB][]
-- [PostgreSQL][]
-- [Prometheus][]
-- [Jaeger][]
-- [Zipkin][]
-- [Tempo][]
-- [Testdata][]
-
-## Useful links
-
-- [Grafana data sources][]
-
-{{% docs/reference %}}
-[Grafana data sources]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources"
-[Grafana data sources]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources"
-
-[AWS CloudWatch]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/aws-cloudwatch"
-[AWS CloudWatch]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/aws-cloudwatch"
-
-[Azure Monitor]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/azure-monitor"
-[Azure Monitor]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/azure-monitor"
-
-[Elasticsearch]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/elasticsearch"
-[Elasticsearch]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/elasticsearch"
-
-[Google Cloud Monitoring]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/google-cloud-monitoring"
-[Google Cloud Monitoring]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/google-cloud-monitoring"
-
-[Graphite]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/graphite"
-[Graphite]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/graphite"
-
-[InfluxDB]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/influxdb"
-[InfluxDB]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/influxdb"
-
-[Loki]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/loki"
-[Loki]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/loki"
-
-[Microsoft SQL Server (MSSQL)]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/mssql"
-[Microsoft SQL Server (MSSQL)]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/mssql"
-
-[MySQL]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/mysql"
-[MySQL]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/mysql"
-
-[Open TSDB]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/opentsdb"
-[Open TSDB]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/opentsdb"
-
-[PostgreSQL]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/postgres"
-[PostgreSQL]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/postgres"
-
-[Prometheus]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/prometheus"
-[Prometheus]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/prometheus"
-
-[Jaeger]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/jaeger"
-[Jaeger]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/jaeger"
-
-[Zipkin]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/zipkin"
-[Zipkin]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/zipkin"
-
-[Tempo]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/tempo"
-[Tempo]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/tempo"
-
-[Testdata]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/testdata"
-[Testdata]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/testdata"
-{{% /docs/reference %}}
diff --git a/docs/sources/alerting/fundamentals/evaluate-grafana-alerts.md b/docs/sources/alerting/fundamentals/evaluate-grafana-alerts.md
deleted file mode 100644
index 84dccd52633ab..0000000000000
--- a/docs/sources/alerting/fundamentals/evaluate-grafana-alerts.md
+++ /dev/null
@@ -1,114 +0,0 @@
----
-aliases:
-  - ../metrics/
-  - ../unified-alerting/fundamentals/evaluate-grafana-alerts/
-canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/evaluate-grafana-alerts/
-description: How to alert on numeric data
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Alerting on numeric data
-weight: 110
----
-
-# Alerting on numeric data
-
-This topic describes how Grafana managed alerts are evaluated by the backend engine as well as how Grafana handles alerting on numeric rather than time series data.
-
-- [Alerting on numeric data](#alerting-on-numeric-data)
-  - [Alert evaluation](#alert-evaluation)
-    - [Metrics from the alerting engine](#metrics-from-the-alerting-engine)
-  - [Alerting on numeric data](#alerting-on-numeric-data-1)
-    - [Tabular Data](#tabular-data)
-    - [Example](#example)
-
-## Alert evaluation
-
-Grafana managed alerts query the following backend data sources that have alerting enabled:
-
-- built-in data sources or those developed and maintained by Grafana: `Graphite`, `Prometheus`, `Loki`, `InfluxDB`, `Elasticsearch`,
-  `Google Cloud Monitoring`, `Cloudwatch`, `Azure Monitor`, `MySQL`, `PostgreSQL`, `MSSQL`, `OpenTSDB`, `Oracle`, and `Azure Monitor`
-- community developed backend data sources with alerting enabled (`backend` and `alerting` properties are set in the [plugin.json](/developers/plugin-tools/reference-plugin-json)
-
-### Metrics from the alerting engine
-
-The alerting engine publishes some internal metrics about itself. You can read more about how Grafana publishes [internal metrics][set-up-grafana-monitoring].
-
-| Metric Name                                       | Type      | Description                                                                              |
-| ------------------------------------------------- | --------- | ---------------------------------------------------------------------------------------- |
-| `grafana_alerting_alerts`                         | gauge     | How many alerts by state                                                                 |
-| `grafana_alerting_request_duration`               | histogram | Histogram of requests to the Alerting API                                                |
-| `grafana_alerting_active_configurations`          | gauge     | The number of active, non default Alertmanager configurations for grafana managed alerts |
-| `grafana_alerting_rule_evaluations_total`         | counter   | The total number of rule evaluations                                                     |
-| `grafana_alerting_rule_evaluation_failures_total` | counter   | The total number of rule evaluation failures                                             |
-| `grafana_alerting_rule_evaluation_duration`       | summary   | The duration for a rule to execute                                                       |
-| `grafana_alerting_rule_group_rules`               | gauge     | The number of rules                                                                      |
-
-## Alerting on numeric data
-
-Among certain data sources numeric data that is not time series can be directly alerted on, or passed into Server Side Expressions (SSE). This allows for more processing and resulting efficiency within the data source, and it can also simplify alert rules.
-When alerting on numeric data instead of time series data, there is no need to reduce each labeled time series into a single number. Instead labeled numbers are returned to Grafana instead.
-
-### Tabular Data
-
-This feature is supported with backend data sources that query tabular data:
-
-- SQL data sources such as MySQL, Postgres, MSSQL, and Oracle.
-- The Azure Kusto based services: Azure Monitor (Logs), Azure Monitor (Azure Resource Graph), and Azure Data Explorer.
-
-A query with Grafana managed alerts or SSE is considered numeric with these data sources, if:
-
-- The "Format AS" option is set to "Table" in the data source query.
-- The table response returned to Grafana from the query includes only one numeric (e.g. int, double, float) column, and optionally additional string columns.
-
-If there are string columns then those columns become labels. The name of column becomes the label name, and the value for each row becomes the value of the corresponding label. If multiple rows are returned, then each row should be uniquely identified their labels.
-
-### Example
-
-For a MySQL table called "DiskSpace":
-
-| Time        | Host | Disk | PercentFree |
-| ----------- | ---- | ---- | ----------- |
-| 2021-June-7 | web1 | /etc | 3           |
-| 2021-June-7 | web2 | /var | 4           |
-| 2021-June-7 | web3 | /var | 8           |
-| ...         | ...  | ...  | ...         |
-
-You can query the data filtering on time, but without returning the time series to Grafana. For example, an alert that would trigger per Host, Disk when there is less than 5% free space:
-
-```sql
-SELECT Host, Disk, CASE WHEN PercentFree < 5.0 THEN PercentFree ELSE 0 END FROM (
-  SELECT
-      Host,
-      Disk,
-      Avg(PercentFree)
-  FROM DiskSpace
-  Group By
-    Host,
-    Disk
-  Where __timeFilter(Time)
-```
-
-This query returns the following Table response to Grafana:
-
-| Host | Disk | PercentFree |
-| ---- | ---- | ----------- |
-| web1 | /etc | 3           |
-| web2 | /var | 4           |
-| web3 | /var | 0           |
-
-When this query is used as the **condition** in an alert rule, then the non-zero will be alerting. As a result, three alert instances are produced:
-
-| Labels                | Status   |
-| --------------------- | -------- |
-| {Host=web1,disk=/etc} | Alerting |
-| {Host=web2,disk=/var} | Alerting |
-| {Host=web3,disk=/var} | Normal   |
-
-{{% docs/reference %}}
-
-[set-up-grafana-monitoring]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/set-up-grafana-monitoring"
-[set-up-grafana-monitoring]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/set-up-grafana-monitoring"
-{{% /docs/reference %}}
diff --git a/docs/sources/alerting/fundamentals/high-availability/_index.md b/docs/sources/alerting/fundamentals/high-availability/_index.md
deleted file mode 100644
index 126842bf18630..0000000000000
--- a/docs/sources/alerting/fundamentals/high-availability/_index.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-aliases:
-  - ../high-availability/
-  - ../unified-alerting/high-availability/
-canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/high-availability/
-description: High availability
-keywords:
-  - grafana
-  - alerting
-  - tutorials
-  - ha
-  - high availability
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Alerting high availability
-weight: 170
----
-
-# Alerting high availability
-
-Grafana Alerting uses the Prometheus model of separating the evaluation of alert rules from the delivering of notifications. In this model the evaluation of alert rules is done in the alert generator and the delivering of notifications is done in the alert receiver. In Grafana Alerting, the alert generator is the Scheduler and the receiver is the Alertmanager.
-
-{{< figure src="/static/img/docs/alerting/unified/high-availability-ua.png" class="docs-image--no-shadow" max-width= "750px" caption="High availability" >}}
-
-When running multiple instances of Grafana, all alert rules are evaluated on all instances. You can think of the evaluation of alert rules as being duplicated. This is how Grafana Alerting makes sure that as long as at least one Grafana instance is working, alert rules will still be evaluated and notifications for alerts will still be sent. You will see this duplication in state history, and is a good way to tell if you are using high availability.
-
-While the alert generator evaluates all alert rules on all instances, the alert receiver makes a best-effort attempt to avoid sending duplicate notifications. Alertmanager chooses availability over consistency, which may result in occasional duplicated or out-of-order notifications. It takes the opinion that duplicate or out-of-order notifications are better than no notifications.
-
-The Alertmanager uses a gossip protocol to share information about notifications between Grafana instances. It also gossips silences, which means a silence created on one Grafana instance is replicated to all other Grafana instances. Both notifications and silences are persisted to the database periodically, and during graceful shut down.
-
-It is important to make sure that gossiping is configured and tested. You can find the documentation on how to do that [here][configure-high-availability].
-
-## Useful links
-
-[Configure alerting high availability][configure-high-availability]
-
-{{% docs/reference %}}
-[configure-high-availability]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/set-up/configure-high-availability"
-[configure-high-availability]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/configure-high-availability"
-{{% /docs/reference %}}
diff --git a/docs/sources/alerting/fundamentals/notification-policies/_index.md b/docs/sources/alerting/fundamentals/notification-policies/_index.md
deleted file mode 100644
index 2a32f951cfb99..0000000000000
--- a/docs/sources/alerting/fundamentals/notification-policies/_index.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/notification-policies/
-description: Introduction to notifications Policies
-keywords:
-  - grafana
-  - alerting
-  - notification policies
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Notifications
-weight: 160
----
-
-# Notifications
-
-Choosing how, when, and where to send your alert notifications is an important part of setting up your alerting system. These decisions will have a direct impact on your ability to resolve issues quickly and not miss anything important.
-
-As a first step, define your contact points; where to send your alert notifications to. A contact point is a set of one or more integrations that are used to deliver notifications. Add notification templates to contact points for reuse and consistent messaging in your notifications.
-
-Next, create a notification policy which is a set of rules for where, when and how your alerts are routed to contact points. In a notification policy, you define where to send your alert notifications by choosing one of the contact points you created.
-
-## Alertmanagers
-
-Grafana uses Alertmanagers to send notifications for firing and resolved alerts. Grafana has its own Alertmanager, referred to as "Grafana" in the user interface, but also supports sending notifications from other Alertmanagers too, such as the [Prometheus Alertmanager](https://prometheus.io/docs/alerting/latest/alertmanager/). The Grafana Alertmanager uses notification policies and contact points to configure how and where a notification is sent; how often a notification should be sent; and whether alerts should all be sent in the same notification, sent in grouped notifications based on a set of labels, or as separate notifications.
-
-## Notification policies
-
-Notification policies control when and where notifications are sent. A notification policy can choose to send all alerts together in the same notification, send alerts in grouped notifications based on a set of labels, or send alerts as separate notifications. You can configure each notification policy to control how often notifications should be sent as well as having one or more mute timings to inhibit notifications at certain times of the day and on certain days of the week.
-
-Notification policies are organized in a tree structure where at the root of the tree there is a notification policy called the default policy. There can be only one default policy and the default policy cannot be deleted.
-
-Specific routing policies are children of the default policy and can be used to match either all alerts or a subset of alerts based on a set of matching labels. A notification policy matches an alert when its matching labels match the labels in the alert.
-
-A nested policy can have its own nested policies, which allow for additional matching of alerts. An example of a nested policy could be sending infrastructure alerts to the Ops team; while a nested policy might send high priority alerts to Pagerduty and low priority alerts as emails.
-
-All alerts, irrespective of their labels, match the default policy. However, when the default policy receives an alert it looks at each nested policy and sends the alert to the first nested policy that matches the alert. If the nested policy has further nested policies, then it can attempt to the match the alert against one of its nested policies. If no nested policies match the alert then the policy itself is the matching policy. If there are no nested policies, or no nested policies match the alert, then the default policy is the matching policy.
-
-<!-- This definitely needs a diagram and some examples (Gilles) -->
-
-## Notification templates
-
-You can customize notifications with templates. For example, templates can be used to change the subject and message of an email, or the title and message of notifications sent to Slack.
-
-Templates are not limited to an individual integration or contact point, but instead can be used in a number of integrations in the same contact point and even integrations across different contact points. For example, a Grafana user can create a template called `custom_subject_or_title` and use it for both templating subjects in emails and titles of Slack messages without having to create two separate templates.
-
-All notifications templates are written in [Go's templating language](https://pkg.go.dev/text/template), and are in the Contact points tab on the Alerting page.
-
-## Silences
-
-You can use silences to mute notifications from one or more firing rules. Silences do not stop alerts from firing or being resolved, or hide firing alerts in the user interface. A silence lasts as long as its duration which can be configured in minutes, hours, days, months or years.
diff --git a/docs/sources/alerting/fundamentals/notification-policies/notifications.md b/docs/sources/alerting/fundamentals/notification-policies/notifications.md
deleted file mode 100644
index 1cd86f7020794..0000000000000
--- a/docs/sources/alerting/fundamentals/notification-policies/notifications.md
+++ /dev/null
@@ -1,137 +0,0 @@
----
-aliases:
-  - ../notifications/
-  - alerting/manage-notifications/create-notification-policy/
-canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/notification-policies/notifications/
-description: Notification policies
-keywords:
-  - grafana
-  - alerting
-  - alertmanager
-  - notification policies
-  - contact points
-  - silences
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Notification policies
-weight: 410
----
-
-# Notification policies
-
-Notification policies provide you with a flexible way of routing alerts to various different receivers. Using label matchers, you can modify alert notification delivery without having to update every individual alert rule.
-
-Learn more about how notification policies work and are structured, so that you can make the most out of setting up your notification policies.
-
-## Policy tree
-
-Notification policies are _not_ a list, but rather are structured according to a [tree structure](https://en.wikipedia.org/wiki/Tree_structure). This means that each policy can have child policies, and so on. The root of the notification policy tree is called the **Default notification policy**.
-
-Each policy consists of a set of label matchers (0 or more) that specify which labels they are or aren't interested in handling.
-
-For more information on label matching, see [how label matching works][labels-and-label-matchers].
-
-{{% admonition type="note" %}}
-If you haven't configured any label matchers for your notification policy, your notification policy will match _all_ alert instances. This may prevent child policies from being evaluated unless you have enabled **Continue matching siblings** on the notification policy.
-{{% /admonition %}}
-
-## Routing
-
-To determine which notification policy will handle which alert instances, you have to start by looking at the existing set of notification policies, starting with the default notification policy.
-
-If no policies other than the default policy are configured, the default policy will handle the alert instance.
-
-If policies other than the default policy are defined, it will inspect those notification policies in descending order.
-
-If a notification policy has label matchers that match the labels of the alert instance, it will descend in to its child policies and, if there are any, will continue to look for any child policies that might have label matchers that further narrow down the set of labels, and so forth until no more child policies have been found.
-
-If no child policies are defined in a notification policy or if none of the child policies have any label matchers that match the alert instance's labels, the default notification policy is used.
-
-As soon as a matching policy is found, the system does not continue to look for other matching policies. If you want to continue to look for other policies that may match, enable **Continue matching siblings** on that particular policy.
-
-Lastly, if none of the notification policies are selected the default notification policy is used.
-
-### Routing example
-
-Here is an example of a relatively simple notification policy tree and some alert instances.
-
-{{< figure src="/media/docs/alerting/notification-routing.png" max-width="750px" caption="Notification policy routing" >}}
-
-Here's a breakdown of how these policies are selected:
-
-**Pod stuck in CrashLoop** does not have a `severity` label, so none of its child policies are matched. It does have a `team=operations` label, so the first policy is matched.
-
-The `team=security` policy is not evaluated since we already found a match and **Continue matching siblings** was not configured for that policy.
-
-**Disk Usage – 80%** has both a `team` and `severity` label, and matches a child policy of the operations team.
-
-**Unauthorized log entry** has a `team` label but does not match the first policy (`team=operations`) since the values are not the same, so it will continue searching and match the `team=security` policy. It does not have any child policies, so the additional `severity=high` label is ignored.
-
-## Inheritance
-
-In addition to child policies being a useful concept for routing alert instances, they also inherit properties from their parent policy. This also applies to any policies that are child policies of the default notification policy.
-
-The following properties are inherited by child policies:
-
-- Contact point
-- Grouping options
-- Timing options
-- Mute timings
-
-Each of these properties can be overwritten by an individual policy should you wish to override the inherited properties.
-
-To inherit a contact point from the parent policy, leave it blank. To override the inherited grouping options, enable **Override grouping**. To override the inherited timing options, enable **Override general timings**.
-
-### Inheritance example
-
-The example below shows how the notification policy tree from our previous example allows the child policies of the `team=operations` to inherit its contact point.
-
-In this way, we can avoid having to specify the same contact point multiple times for each child policy.
-
-{{< figure src="/media/docs/alerting/notification-inheritance.png" max-width="750px" caption="Notification policy inheritance" >}}
-
-## Additional configuration options
-
-### Grouping
-
-Grouping is an important feature of Grafana Alerting as it allows you to batch relevant alerts together into a smaller number of notifications. This is particularly important if notifications are delivered to first-responders, such as engineers on-call, where receiving lots of notifications in a short period of time can be overwhelming and in some cases can negatively impact a first-responders ability to respond to an incident. For example, consider a large outage where many of your systems are down. In this case, grouping can be the difference between receiving 1 phone call and 100 phone calls.
-
-You choose how alerts are grouped together using the Group by option in a notification policy. By default, notification policies in Grafana group alerts together by alert rule using the `alertname` and `grafana_folder` labels (since alert names are not unique across multiple folders). Should you wish to group alerts by something other than the alert rule, change the grouping to any other combination of labels.
-
-#### Disable grouping
-
-Should you wish to receive every alert as a separate notification, you can do so by grouping by a special label called `...`. This is useful when your alerts are being delivered to an automated system instead of a first-responder.
-
-#### A single group for all alerts
-
-Should you wish to receive all alerts together in a single notification, you can do so by leaving Group by empty.
-
-### Timing options
-
-The timing options decide how often notifications are sent for each group of alerts. There are three timers that you need to know about: Group wait, Group interval, and Repeat interval.
-
-#### Group wait
-
-Group wait is the amount of time Grafana waits before sending the first notification for a new group of alerts. The longer Group wait is the more time you have for other alerts to arrive. The shorter Group wait is the earlier the first notification will be sent, but at the risk of sending incomplete notifications. You should always choose a Group wait that makes the most sense for your use case.
-
-**Default** 30 seconds
-
-#### Group interval
-
-Once the first notification has been sent for a new group of alerts, Grafana starts the Group interval timer. This is the amount of time Grafana waits before sending notifications about changes to the group. For example, another firing alert might have just been added to the group while an existing alert might have resolved. If an alert was too late to be included in the first notification due to Group wait, it will be included in subsequent notifications after Group interval. Once Group interval has elapsed, Grafana resets the Group interval timer. This repeats until there are no more alerts in the group after which the group is deleted.
-
-**Default** 5 minutes
-
-#### Repeat interval
-
-Repeat interval decides how often notifications are repeated if the group has not changed since the last notification. You can think of these as reminders that some alerts are still firing. Repeat interval is closely related to Group interval, which means your Repeat interval must not only be greater than or equal to Group interval, but also must be a multiple of Group interval. If Repeat interval is not a multiple of Group interval it will be coerced into one. For example, if your Group interval is 5 minutes, and your Repeat interval is 9 minutes, the Repeat interval will be rounded up to the nearest multiple of 5 which is 10 minutes.
-
-**Default** 4 hours
-
-{{% docs/reference %}}
-[labels-and-label-matchers]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/annotation-label/labels-and-label-matchers"
-[labels-and-label-matchers]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/annotation-label/labels-and-label-matchers"
-{{% /docs/reference %}}
diff --git a/docs/sources/alerting/fundamentals/notifications/_index.md b/docs/sources/alerting/fundamentals/notifications/_index.md
new file mode 100644
index 0000000000000..693c673beda4d
--- /dev/null
+++ b/docs/sources/alerting/fundamentals/notifications/_index.md
@@ -0,0 +1,61 @@
+---
+aliases:
+  - ./notification-policies/ # /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notification-policies/
+canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/notifications/
+description: Learn about how notifications work
+keywords:
+  - grafana
+  - alerting
+  - notification policies
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Notifications
+weight: 110
+---
+
+# Notifications
+
+Choosing how, when, and where to send your alert notifications is an important part of setting up your alerting system. These decisions will have a direct impact on your ability to resolve issues quickly and not miss anything important.
+
+As a first step, define your contact points; where to send your alert notifications to. A contact point is a set of one or more integrations that are used to deliver notifications. Add notification templates to contact points for reuse and consistent messaging in your notifications.
+
+Next, create a notification policy which is a set of rules for where, when and how your alerts are routed to contact points. In a notification policy, you define where to send your alert notifications by choosing one of the contact points you created.
+
+## Alertmanagers
+
+Grafana uses Alertmanagers to send notifications for firing and resolved alerts. Grafana has its own Alertmanager, referred to as "Grafana" in the user interface, but also supports sending notifications from other Alertmanagers too, such as the [Prometheus Alertmanager](https://prometheus.io/docs/alerting/latest/alertmanager/). The Grafana Alertmanager uses notification policies and contact points to configure how and where a notification is sent; how often a notification should be sent; and whether alerts should all be sent in the same notification, sent in grouped notifications based on a set of labels, or as separate notifications.
+
+## Contact points
+
+Contact points contain the configuration for sending alert notifications, specifying destinations like email, Slack, OnCall, webhooks, and their notification messages. They allow the customization of notification messages and the use of notification templates.
+
+A contact point is a list of integrations, each sending a message to a specific destination. You can configure them via notification policies or alert rules.
+
+## Notification policies
+
+Notification policies control when and where notifications are sent. A notification policy can choose to send all alerts together in the same notification, send alerts in grouped notifications based on a set of labels, or send alerts as separate notifications. You can configure each notification policy to control how often notifications should be sent as well as having one or more mute timings to inhibit notifications at certain times of the day and on certain days of the week.
+
+Notification policies are organized in a tree structure where at the root of the tree there is a notification policy called the default policy. There can be only one default policy and the default policy cannot be deleted.
+
+Specific routing policies are children of the default policy and can be used to match either all alerts or a subset of alerts based on a set of matching labels. A notification policy matches an alert when its matching labels match the labels in the alert.
+
+A nested policy can have its own nested policies, which allow for additional matching of alerts. An example of a nested policy could be sending infrastructure alerts to the Ops team; while a nested policy might send high priority alerts to Pagerduty and low priority alerts as emails.
+
+All alerts, irrespective of their labels, match the default policy. However, when the default policy receives an alert it looks at each nested policy and sends the alert to the first nested policy that matches the alert. If the nested policy has further nested policies, then it can attempt to the match the alert against one of its nested policies. If no nested policies match the alert then the policy itself is the matching policy. If there are no nested policies, or no nested policies match the alert, then the default policy is the matching policy.
+
+<!-- This definitely needs a diagram and some examples (Gilles) -->
+
+## Notification templates
+
+You can customize notifications with templates. For example, templates can be used to change the subject and message of an email, or the title and message of notifications sent to Slack.
+
+Templates are not limited to an individual integration or contact point, but instead can be used in a number of integrations in the same contact point and even integrations across different contact points. For example, a Grafana user can create a template called `custom_subject_or_title` and use it for both templating subjects in emails and titles of Slack messages without having to create two separate templates.
+
+All notifications templates are written in [Go's templating language](https://pkg.go.dev/text/template), and are in the Contact points tab on the Alerting page.
+
+## Silences
+
+You can use silences to mute notifications from one or more firing rules. Silences do not stop alerts from firing or being resolved, or hide firing alerts in the user interface. A silence lasts as long as its duration which can be configured in minutes, hours, days, months or years.
diff --git a/docs/sources/alerting/fundamentals/notifications/alertmanager.md b/docs/sources/alerting/fundamentals/notifications/alertmanager.md
new file mode 100644
index 0000000000000..a7a5521994773
--- /dev/null
+++ b/docs/sources/alerting/fundamentals/notifications/alertmanager.md
@@ -0,0 +1,46 @@
+---
+aliases:
+  - ../../fundamentals/alertmanager/ # /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alertmanager/
+  - ../../unified-alerting/fundamentals/alertmanager/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/fundamentals/alertmanager/
+  - ../../manage-notifications/alertmanager/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/alertmanager/
+canonical: https://grafana.com/docs/grafana/latest/alerting/notifications/alertmanager/
+description: Learn about Alertmanagers and the Alertmanager options for Grafana Alerting
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Alertmanager
+weight: 111
+---
+
+# Alertmanager
+
+Grafana sends firing and resolved alerts to Alertmanagers. The Alertmanager receives alerts, handles silencing, inhibition, grouping, and routing by sending notifications out via your channel of choice, for example, email or Slack.
+
+Grafana has its own Alertmanager, referred to as "Grafana" in the user interface, but also supports sending alerts to other Alertmanagers, such as the [Prometheus Alertmanager](https://prometheus.io/docs/alerting/latest/alertmanager/). You can use both internal and external Alertmanagers.
+
+The Grafana Alertmanager uses notification policies and contact points to configure how and where a notification is sent; how often a notification should be sent; and whether alerts should all be sent in the same notification, sent in grouped notifications based on a set of labels, or as separate notifications.
+
+Alertmanagers are visible from the drop-down menu on the Alerting Contact Points, Notification Policies, and Silences pages.
+
+In Grafana, you can use the Cloud Alertmanager, Grafana Alertmanager, or an external Alertmanager. You can also run multiple Alertmanagers; your decision depends on your set up and where your alerts are being generated.
+
+- **Grafana Alertmanager** is an internal Alertmanager that is pre-configured and available for selection by default if you run Grafana on-premises or open-source.
+
+  The Grafana Alertmanager can receive alerts from Grafana, but it cannot receive alerts from outside Grafana, for example, from Mimir or Loki. Note that inhibition rules are not supported.
+
+- **Cloud Alertmanager** runs in Grafana Cloud and it can receive alerts from Grafana, Mimir, and Loki.
+
+- **External Alertmanager** can receive all your Grafana, Loki, Mimir, and Prometheus alerts. External Alertmanagers can be configured and administered from within Grafana itself.
+
+Here are two examples of when you may want to [add your own external alertmanager][configure-alertmanager] and send your alerts there instead of the Grafana Alertmanager:
+
+1. You may already have Alertmanagers on-premises in your own Cloud infrastructure that you have set up and still want to use, because you have other alert generators, such as Prometheus.
+
+2. You want to use both Prometheus on-premises and hosted Grafana to send alerts to the same Alertmanager that runs in your Cloud infrastructure.
+
+{{% docs/reference %}}
+[configure-alertmanager]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/configure-alertmanager"
+[configure-alertmanager]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/configure-alertmanager"
+{{% /docs/reference %}}
diff --git a/docs/sources/alerting/fundamentals/notifications/contact-points.md b/docs/sources/alerting/fundamentals/notifications/contact-points.md
new file mode 100644
index 0000000000000..98aa75a0f8c9a
--- /dev/null
+++ b/docs/sources/alerting/fundamentals/notifications/contact-points.md
@@ -0,0 +1,64 @@
+---
+aliases:
+  - ../../fundamentals/contact-points/ # /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/contact-points/
+  - ../../fundamentals/contact-points/contact-point-types/ # /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/contact-points/contact-point-types/
+  - ../../contact-points/ # /docs/grafana/<GRAFANA_VERSION>/alerting/contact-points/
+  - ../../unified-alerting/contact-points/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/contact-points/
+canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/notifications/contact-points/
+description: Learn about contact points and the supported contact point integrations
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - notification channel
+  - create
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Contact points
+weight: 112
+---
+
+# Contact points
+
+Contact points contain the configuration for sending notifications. A contact point is a list of integrations, each of which sends a notification to a particular email address, service or URL. Contact points can have multiple integrations of the same kind, or a combination of integrations of different kinds. For example, a contact point could contain a Pagerduty integration; an email and Slack integration; or a Pagerduty integration, a Slack integration, and two email integrations. You can also configure a contact point with no integrations; in which case no notifications are sent.
+
+A contact point cannot send notifications until it has been added to a notification policy. A notification policy can only send alerts to one contact point, but a contact point can be added to a number of notification policies at the same time. When an alert matches a notification policy, the alert is sent to the contact point in that notification policy, which then sends a notification to each integration in its configuration.
+
+Contact points can be configured for the Grafana Alertmanager as well as external alertmanagers.
+
+You can also use notification templating to customize notification messages for contact point integrations.
+
+**Note:**
+
+If you've created an OnCall contact point in the Grafana OnCall application, you can view it in the Alerting application.
+
+## Supported contact point integrations
+
+The following table lists the contact point integrations supported by Grafana.
+
+| Name                                             | Type                      | Grafana Alertmanager | Other Alertmanagers                                                                                      |
+| ------------------------------------------------ | ------------------------- | -------------------- | -------------------------------------------------------------------------------------------------------- |
+| [DingDing](https://www.dingtalk.com/en)          | `dingding`                | Supported            | N/A                                                                                                      |
+| [Discord](https://discord.com/)                  | `discord`                 | Supported            | N/A                                                                                                      |
+| Email                                            | `email`                   | Supported            | Supported                                                                                                |
+| [Google Chat](https://chat.google.com/)          | `googlechat`              | Supported            | N/A                                                                                                      |
+| [Kafka](https://kafka.apache.org/)               | `kafka`                   | Supported            | N/A                                                                                                      |
+| [Line](https://line.me/en/)                      | `line`                    | Supported            | N/A                                                                                                      |
+| [Microsoft Teams](https://teams.microsoft.com/)  | `teams`                   | Supported            | Supported                                                                                                |
+| [Opsgenie](https://atlassian.com/opsgenie/)      | `opsgenie`                | Supported            | Supported                                                                                                |
+| [Pagerduty](https://www.pagerduty.com/)          | `pagerduty`               | Supported            | Supported                                                                                                |
+| [Prometheus Alertmanager](https://prometheus.io) | `prometheus-alertmanager` | Supported            | N/A                                                                                                      |
+| [Pushover](https://pushover.net/)                | `pushover`                | Supported            | Supported                                                                                                |
+| [Sensu Go](https://docs.sensu.io/sensu-go/)      | `sensugo`                 | Supported            | N/A                                                                                                      |
+| [Slack](https://slack.com/)                      | `slack`                   | Supported            | Supported                                                                                                |
+| [Telegram](https://telegram.org/)                | `telegram`                | Supported            | N/A                                                                                                      |
+| [Threema](https://threema.ch/)                   | `threema`                 | Supported            | N/A                                                                                                      |
+| [VictorOps](https://help.victorops.com/)         | `victorops`               | Supported            | Supported                                                                                                |
+| Webhook                                          | `webhook`                 | Supported            | Supported ([different format](https://prometheus.io/docs/alerting/latest/configuration/#webhook_config)) |
+| Cisco Webex Teams                                | `webex`                   | Supported            | Supported                                                                                                |
+| WeCom                                            | `wecom`                   | Supported            | N/A                                                                                                      |
+| [Zenduty](https://www.zenduty.com/)              | `webhook`                 | Supported            | N/A                                                                                                      |
diff --git a/docs/sources/alerting/fundamentals/alert-rules/message-templating.md b/docs/sources/alerting/fundamentals/notifications/message-templating.md
similarity index 84%
rename from docs/sources/alerting/fundamentals/alert-rules/message-templating.md
rename to docs/sources/alerting/fundamentals/notifications/message-templating.md
index cad151fcd9cbf..9e6d33eae91b2 100644
--- a/docs/sources/alerting/fundamentals/alert-rules/message-templating.md
+++ b/docs/sources/alerting/fundamentals/notifications/message-templating.md
@@ -1,10 +1,10 @@
 ---
 aliases:
-  - ../../contact-points/message-templating/
-  - ../../message-templating/
-  - ../../unified-alerting/message-templating/
-canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/message-templating/
-description: Notification templating
+  - ../../contact-points/message-templating/ # /docs/grafana/<GRAFANA_VERSION>/alerting/contact-points/message-templating/
+  - ../../alert-rules/message-templating/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alert-rules/message-templating/
+  - ../../unified-alerting/message-templating/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/message-templating/
+canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/notifications/message-templating/
+description: Learn about notification templating
 keywords:
   - grafana
   - alerting
@@ -16,11 +16,11 @@ labels:
     - cloud
     - enterprise
     - oss
-title: Notification templating
-weight: 415
+title: Notification templates
+weight: 114
 ---
 
-# Notification templating
+# Notification templates
 
 Notifications sent via contact points are built using notification templates. Grafana's default templates are based on the [Go templating system](https://golang.org/pkg/text/template) where some fields are evaluated as text, while others are evaluated as HTML (which can affect escaping).
 
diff --git a/docs/sources/alerting/fundamentals/notifications/notification-policies.md b/docs/sources/alerting/fundamentals/notifications/notification-policies.md
new file mode 100644
index 0000000000000..1e4d1d2dcf68f
--- /dev/null
+++ b/docs/sources/alerting/fundamentals/notifications/notification-policies.md
@@ -0,0 +1,136 @@
+---
+aliases:
+  - ../notification-policies/notifications/ # /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notification-policies/notifications/
+canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/notifications/notification-policies/
+description: Learn about how notification policies work and are structured
+keywords:
+  - grafana
+  - alerting
+  - alertmanager
+  - notification policies
+  - contact points
+  - silences
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Notification policies
+weight: 113
+---
+
+# Notification policies
+
+Notification policies provide you with a flexible way of routing alerts to various different receivers. Using label matchers, you can modify alert notification delivery without having to update every individual alert rule.
+
+Learn more about how notification policies work and are structured, so that you can make the most out of setting up your notification policies.
+
+## Policy tree
+
+Notification policies are _not_ a list, but rather are structured according to a [tree structure](https://en.wikipedia.org/wiki/Tree_structure). This means that each policy can have child policies, and so on. The root of the notification policy tree is called the **Default notification policy**.
+
+Each policy consists of a set of label matchers (0 or more) that specify which labels they are or aren't interested in handling.
+
+For more information on label matching, see [how label matching works][labels-and-label-matchers].
+
+{{% admonition type="note" %}}
+If you haven't configured any label matchers for your notification policy, your notification policy will match _all_ alert instances. This may prevent child policies from being evaluated unless you have enabled **Continue matching siblings** on the notification policy.
+{{% /admonition %}}
+
+## Routing
+
+To determine which notification policy will handle which alert instances, you have to start by looking at the existing set of notification policies, starting with the default notification policy.
+
+If no policies other than the default policy are configured, the default policy will handle the alert instance.
+
+If policies other than the default policy are defined, it will evaluate those notification policies in the order they are displayed.
+
+If a notification policy has label matchers that match the labels of the alert instance, it will descend in to its child policies and, if there are any, will continue to look for any child policies that might have label matchers that further narrow down the set of labels, and so forth until no more child policies have been found.
+
+If no child policies are defined in a notification policy or if none of the child policies have any label matchers that match the alert instance's labels, the default notification policy is used.
+
+As soon as a matching policy is found, the system does not continue to look for other matching policies. If you want to continue to look for other policies that may match, enable **Continue matching siblings** on that particular policy.
+
+Lastly, if none of the notification policies are selected the default notification policy is used.
+
+### Routing example
+
+Here is an example of a relatively simple notification policy tree and some alert instances.
+
+{{< figure src="/media/docs/alerting/notification-routing.png" max-width="750px" caption="Notification policy routing" >}}
+
+Here's a breakdown of how these policies are selected:
+
+**Pod stuck in CrashLoop** does not have a `severity` label, so none of its child policies are matched. It does have a `team=operations` label, so the first policy is matched.
+
+The `team=security` policy is not evaluated since we already found a match and **Continue matching siblings** was not configured for that policy.
+
+**Disk Usage – 80%** has both a `team` and `severity` label, and matches a child policy of the operations team.
+
+**Unauthorized log entry** has a `team` label but does not match the first policy (`team=operations`) since the values are not the same, so it will continue searching and match the `team=security` policy. It does not have any child policies, so the additional `severity=high` label is ignored.
+
+## Inheritance
+
+In addition to child policies being a useful concept for routing alert instances, they also inherit properties from their parent policy. This also applies to any policies that are child policies of the default notification policy.
+
+The following properties are inherited by child policies:
+
+- Contact point
+- Grouping options
+- Timing options
+- Mute timings
+
+Each of these properties can be overwritten by an individual policy should you wish to override the inherited properties.
+
+To inherit a contact point from the parent policy, leave it blank. To override the inherited grouping options, enable **Override grouping**. To override the inherited timing options, enable **Override general timings**.
+
+### Inheritance example
+
+The example below shows how the notification policy tree from our previous example allows the child policies of the `team=operations` to inherit its contact point.
+
+In this way, we can avoid having to specify the same contact point multiple times for each child policy.
+
+{{< figure src="/media/docs/alerting/notification-inheritance.png" max-width="750px" caption="Notification policy inheritance" >}}
+
+## Additional configuration options
+
+### Grouping
+
+Grouping is an important feature of Grafana Alerting as it allows you to batch relevant alerts together into a smaller number of notifications. This is particularly important if notifications are delivered to first-responders, such as engineers on-call, where receiving lots of notifications in a short period of time can be overwhelming and in some cases can negatively impact a first-responders ability to respond to an incident. For example, consider a large outage where many of your systems are down. In this case, grouping can be the difference between receiving 1 phone call and 100 phone calls.
+
+You choose how alerts are grouped together using the Group by option in a notification policy. By default, notification policies in Grafana group alerts together by alert rule using the `alertname` and `grafana_folder` labels (since alert names are not unique across multiple folders). Should you wish to group alerts by something other than the alert rule, change the grouping to any other combination of labels.
+
+#### Disable grouping
+
+Should you wish to receive every alert as a separate notification, you can do so by grouping by a special label called `...`. This is useful when your alerts are being delivered to an automated system instead of a first-responder.
+
+#### A single group for all alerts
+
+Should you wish to receive all alerts together in a single notification, you can do so by leaving Group by empty.
+
+### Timing options
+
+The timing options decide how often notifications are sent for each group of alerts. There are three timers that you need to know about: Group wait, Group interval, and Repeat interval.
+
+#### Group wait
+
+Group wait is the amount of time Grafana waits before sending the first notification for a new group of alerts. The longer Group wait is the more time you have for other alerts to arrive. The shorter Group wait is the earlier the first notification will be sent, but at the risk of sending incomplete notifications. You should always choose a Group wait that makes the most sense for your use case.
+
+**Default** 30 seconds
+
+#### Group interval
+
+Once the first notification has been sent for a new group of alerts, Grafana starts the Group interval timer. This is the amount of time Grafana waits before sending notifications about changes to the group. For example, another firing alert might have just been added to the group while an existing alert might have resolved. If an alert was too late to be included in the first notification due to Group wait, it will be included in subsequent notifications after Group interval. Once Group interval has elapsed, Grafana resets the Group interval timer. This repeats until there are no more alerts in the group after which the group is deleted.
+
+**Default** 5 minutes
+
+#### Repeat interval
+
+Repeat interval decides how often notifications are repeated if the group has not changed since the last notification. You can think of these as reminders that some alerts are still firing. Repeat interval is closely related to Group interval, which means your Repeat interval must not only be greater than or equal to Group interval, but also must be a multiple of Group interval. If Repeat interval is not a multiple of Group interval it will be coerced into one. For example, if your Group interval is 5 minutes, and your Repeat interval is 9 minutes, the Repeat interval will be rounded up to the nearest multiple of 5 which is 10 minutes.
+
+**Default** 4 hours
+
+{{% docs/reference %}}
+[labels-and-label-matchers]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/annotation-label#how-label-matching-works"
+[labels-and-label-matchers]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/annotation-label#how-label-matching-works"
+{{% /docs/reference %}}
diff --git a/docs/sources/alerting/manage-notifications/_index.md b/docs/sources/alerting/manage-notifications/_index.md
index 65c38e9d652ac..9adb839afcce8 100644
--- a/docs/sources/alerting/manage-notifications/_index.md
+++ b/docs/sources/alerting/manage-notifications/_index.md
@@ -1,47 +1,22 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/
-description: Manage alert notifications
+description: Detect and respond for day-to-day triage and analysis of what’s going on and action you need to take
 keywords:
   - grafana
-  - alert
-  - notifications
+  - detect
+  - respond
 labels:
   products:
     - cloud
     - enterprise
     - oss
-menuTitle: Manage
-title: Manage your alerts
+menuTitle: Detect and respond
+title: Detect and respond
 weight: 130
 ---
 
-# Manage your alerts
+# Detect and respond
 
-Once you have set up your alert rules, contact points, and notification policies, you can use Grafana Alerting to:
+Use Grafana Alerting to track and generate alerts and send notifications, providing an efficient way for engineers to monitor, respond, and triage issues within their services.
 
-[Create silences][create-silence]
-
-[Create mute timings][mute-timings]
-
-[Declare incidents from firing alerts][declare-incident-from-firing-alert]
-
-[View the state and health of alert rules][view-state-health]
-
-[View and filter alert rules][view-alert-rules]
-
-{{% docs/reference %}}
-[create-silence]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/manage-notifications/create-silence"
-[create-silence]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/manage-notifications/create-silence"
-
-[declare-incident-from-firing-alert]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/manage-notifications/declare-incident-from-alert"
-[declare-incident-from-firing-alert]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/manage-notifications/declare-incident-from-alert"
-
-[mute-timings]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/manage-notifications/mute-timings"
-[mute-timings]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/manage-notifications/mute-timings"
-
-[view-alert-rules]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/manage-notifications/view-alert-rules"
-[view-alert-rules]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/manage-notifications/view-alert-rules"
-
-[view-state-health]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/manage-notifications/view-state-health"
-[view-state-health]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/manage-notifications/view-state-health"
-{{% /docs/reference %}}
+Alerts and alert notifications provide a lot of value as key indicators to issues during the triage process, providing engineers with the information they need to understand what is going on in their system or service.
diff --git a/docs/sources/alerting/manage-notifications/create-silence.md b/docs/sources/alerting/manage-notifications/create-silence.md
deleted file mode 100644
index b824fe081c2be..0000000000000
--- a/docs/sources/alerting/manage-notifications/create-silence.md
+++ /dev/null
@@ -1,74 +0,0 @@
----
-aliases:
-  - ../silences/create-silence/
-  - ../silences/edit-silence/
-  - ../silences/linking-to-silence-form/
-  - ../silences/remove-silence/
-  - ../unified-alerting/silences/
-  - ../silences/
-canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/create-silence/
-description: Add silence alert notification
-keywords:
-  - grafana
-  - alerting
-  - silence
-  - mute
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Manage silences
-weight: 410
----
-
-# Manage silences
-
-Silences stop notifications from getting created and last for only a specified window of time.
-
-**Note that inhibition rules are not supported in the Grafana Alertmanager.**
-
-## Add silences
-
-To add a silence, complete the following steps.
-
-1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
-1. Click **Silences**.
-1. From the **Alertmanager** dropdown, select an external Alertmanager to create and manage silences for the external data source. Otherwise, keep the default option of Grafana.
-1. Click **Create silence** to open the Create silence page.
-1. In **Silence start and end**, select the start and end date to indicate when the silence should go into effect and expire.
-1. Optionally, in **Duration**, specify how long the silence is enforced. This automatically updates the end time in the **Silence start and end** field.
-1. In the **Label** and **Value** fields, enter one or more _Matching Labels_. Matchers determine which rules the silence will apply to.
-1. In **Comment**, add details about the silence.
-1. Click **Submit**.
-
-## Edit silences
-
-To edit a silence, complete the following steps.
-
-1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
-1. Click **Silences** to view the list of existing silences.
-1. Find the silence you want to edit, then click **Edit** (pen icon).
-1. Make the desired changes, then click **Submit** to save your changes.
-
-## Create a URL to link to a silence form
-
-When linking to a silence form, provide the default matching labels and comment via `matcher` and `comment` query parameters. The `matcher` parameter should be in the following format `[label][operator][value]` where the `operator` parameter can be one of the following: `=` (equals, not regex), `!=` (not equals, not regex), `=~` (equals, regex), `!~` (not equals, regex).
-The URL can contain many query parameters with the key `matcher`.
-For example, to link to silence form with matching labels `severity=critical` & `cluster!~europe-.*` and comment `Silence critical EU alerts`, create a URL `https://mygrafana/alerting/silence/new?matcher=severity%3Dcritical&matcher=cluster!~europe-*&comment=Silence%20critical%20EU%20alert`.
-
-To link to a new silence page for an external Alertmanager, add a `alertmanager` query parameter with the Alertmanager data source name.
-
-## Remove silences
-
-To remove a silence, complete the following steps.
-
-1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
-1. Click **Silences** to view the list of existing silences.
-1. Select the silence you want to end, then click **Unsilence**.
-
-> **Note:** You cannot remove a silence manually. Silences that have ended are retained and listed for five days.
-
-## Useful links
-
-[Aggregation operators](https://prometheus.io/docs/prometheus/latest/querying/operators/#aggregation-operators)
diff --git a/docs/sources/alerting/manage-notifications/declare-incident-from-alert.md b/docs/sources/alerting/manage-notifications/declare-incident-from-alert.md
index 10459fa355e68..019efae8699f8 100644
--- a/docs/sources/alerting/manage-notifications/declare-incident-from-alert.md
+++ b/docs/sources/alerting/manage-notifications/declare-incident-from-alert.md
@@ -1,6 +1,6 @@
 ---
 aliases:
-  - alerting/alerting-rules/declare-incident-from-alert/
+  - ../../alerting/alerting-rules/declare-incident-from-alert/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/declare-incident-from-alert/
 canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/declare-incident-from-alert/
 description: Declare an incident from a firing alert
 keywords:
diff --git a/docs/sources/alerting/manage-notifications/mute-timings.md b/docs/sources/alerting/manage-notifications/mute-timings.md
deleted file mode 100644
index 0618393e13fae..0000000000000
--- a/docs/sources/alerting/manage-notifications/mute-timings.md
+++ /dev/null
@@ -1,89 +0,0 @@
----
-aliases:
-  - ../notifications/mute-timings/
-  - ../unified-alerting/notifications/mute-timings/
-canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/mute-timings/
-description: Mute timings
-keywords:
-  - grafana
-  - alerting
-  - guide
-  - mute
-  - mute timings
-  - mute time interval
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Create mute timings
-weight: 420
----
-
-# Create mute timings
-
-A mute timing is a recurring interval of time when no new notifications for a policy are generated or sent. Use them to prevent alerts from firing a specific and reoccurring period, for example, a regular maintenance period.
-
-Similar to silences, mute timings do not prevent alert rules from being evaluated, nor do they stop alert instances from being shown in the user interface. They only prevent notifications from being created.
-
-You can configure Grafana managed mute timings as well as mute timings for an [external Alertmanager data source][datasources/alertmanager]. For more information, refer to [Alertmanager documentation][fundamentals/alertmanager].
-
-## Mute timings vs silences
-
-The following table highlights the key differences between mute timings and silences.
-
-| Mute timing                                        | Silence                                                                      |
-| -------------------------------------------------- | ---------------------------------------------------------------------------- |
-| Uses time interval definitions that can reoccur    | Has a fixed start and end time                                               |
-| Is created and then added to notification policies | Uses labels to match against an alert to determine whether to silence or not |
-
-## Create a mute timing
-
-1. In the left-side menu, click **Alerts & IRM**, and then **Alerting**.
-1. Click **Notification policies**.
-1. From the **Alertmanager** dropdown, select an external Alertmanager. By default, the **Grafana Alertmanager** is selected.
-1. Scroll down to the Mute timings section.
-1. Click **+ Add mute timing**.
-1. Fill out the form to create a [time interval](#time-intervals) to match against for your mute timing.
-1. Click **Submit** to create the mute timing.
-
-## Add mute timing to a notification policy
-
-1. In the left-side menu, click **Alerts & IRM**, and then **Alerting**.
-1. Click **Notification policies**.
-1. Identify the notification policy you would like to add the mute timing to and click the **Edit** button for that policy.
-1. In the Specific routing section, from the **Mute timings** dropdown, select the mute timings you would like to add to the route.
-1. Click **Save policy**.
-
-## Time intervals
-
-A time interval is a definition for a moment in time. If an alert fires during this interval it will be suppressed. All fields are lists, and at least one list element must be satisfied to match the field. Fields also support ranges using `:` (ex: `monday:thursday`). The fields available for a time interval are: mute timing can contain multiple time intervals. A time interval is a specific duration when alerts are suppressed from firing. The duration typically consists of a specific time range along with days of a week, month, or year.
-
-    All properties for the time interval are lists, and at least one list element must be satisfied to match the field. The fields support ranges using `:` (ex: `monday:thursday`). If you leave a field blank, it will match with any moment of time.
-
-Supported time interval options are:
-
-- Time range: The time inclusive of the starting time and exclusive of the end time in UTC.
-- Days of the week: The day or range of days of the week. Example: `monday:thursday`.
-- Days of the month: The date 1-31 of a month. Negative values can also be used to represent days that begin at the end of the month. For example: `-1` for the last day of the month.
-- Months: The months of the year in either numerical or the full calendar month. For example: `1, may:august`.
-- Years: The year or years for the interval. For example: `2021:2024`.
-
-If a field is left blank, any moment of time will match the field. For an instant of time to match a complete time interval, all fields must match. A mute timing can contain multiple time intervals.
-
-If you want to specify an exact duration, specify all the options. For example, if you wanted to create a time interval for the first Monday of the month, for March, June, September, and December, between the hours of 12:00 and 24:00 UTC your time interval specification would be:
-
-- Time range:
-  - Start time: `12:00`
-  - End time: `24:00`
-- Days of the week: `monday`
-- Months: `3, 6, 9, 12`
-- Days of the month: `1:7`
-
-{{% docs/reference %}}
-[datasources/alertmanager]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/alertmanager"
-[datasources/alertmanager]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/alertmanager"
-
-[fundamentals/alertmanager]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/alertmanager"
-[fundamentals/alertmanager]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alertmanager"
-{{% /docs/reference %}}
diff --git a/docs/sources/alerting/manage-notifications/template-notifications/_index.md b/docs/sources/alerting/manage-notifications/template-notifications/_index.md
deleted file mode 100644
index dffd7502fc98f..0000000000000
--- a/docs/sources/alerting/manage-notifications/template-notifications/_index.md
+++ /dev/null
@@ -1,63 +0,0 @@
----
-canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/template-notifications/
-description: How to customize your notifications using templating
-keywords:
-  - grafana
-  - alerting
-  - notifications
-  - templates
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Customize notifications
-weight: 400
----
-
-# Customize notifications
-
-Customize your notifications with notifications templates.
-
-You can use notification templates to change the title, message, and format of the message in your notifications.
-
-Notification templates are not tied to specific contact point integrations, such as email or Slack. However, you can choose to create separate notification templates for different contact point integrations.
-
-You can use notification templates to:
-
-- Customize the subject of an email or the title of a message.
-- Add, change or remove text in notifications. For example, to select or omit certain labels, annotations and links.
-- Format text in bold and italic, and add or remove line breaks.
-
-You cannot use notification templates to:
-
-- Add HTML and CSS to email notifications to change their visual appearance.
-- Change the design of notifications in instant messaging services such as Slack and Microsoft Teams. For example, to add or remove custom blocks with Slack Block Kit or adaptive cards with Microsoft Teams.
-- Choose the number and size of images, or where in the notification images are shown.
-- Customize the data in webhooks, including the fields or structure of the JSON data or send the data in other formats such as XML.
-- Add or remove HTTP headers in webhooks other than those in the contact point configuration.
-
-[Using Go's templating language][using-go-templating-language]
-
-Learn how to write the content of your notification templates in Go’s templating language.
-
-Create reusable notification templates for your contact points.
-
-[Use notification templates][use-notification-templates]
-
-Use notification templates to send notifications to your contact points.
-
-[Reference][reference]
-
-Data that is available when writing templates.
-
-{{% docs/reference %}}
-[reference]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/manage-notifications/template-notifications/reference"
-[reference]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/manage-notifications/template-notifications/reference"
-
-[use-notification-templates]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/manage-notifications/template-notifications/use-notification-templates"
-[use-notification-templates]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/manage-notifications/template-notifications/use-notification-templates"
-
-[using-go-templating-language]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/manage-notifications/template-notifications/using-go-templating-language"
-[using-go-templating-language]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/manage-notifications/template-notifications/using-go-templating-language"
-{{% /docs/reference %}}
diff --git a/docs/sources/alerting/manage-notifications/template-notifications/use-notification-templates.md b/docs/sources/alerting/manage-notifications/template-notifications/use-notification-templates.md
deleted file mode 100644
index 5657e86ac8a5a..0000000000000
--- a/docs/sources/alerting/manage-notifications/template-notifications/use-notification-templates.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/template-notifications/use-notification-templates/
-description: Use notification templates in contact points
-keywords:
-  - grafana
-  - alerting
-  - notifications
-  - templates
-  - use templates
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Use notification templates
-weight: 300
----
-
-# Use notification templates
-
-Use templates in contact points to customize your notifications.
-
-In the Contact points tab, you can see a list of your contact points.
-
-1. To create a new contact point, click New.
-
-   **Note:** You can edit an existing contact by clicking the Edit icon.
-
-2. Execute a template from one or more fields such as Message and Subject:
-
-   {{< figure max-width="940px" src="/static/img/docs/alerting/unified/use-notification-template-9-4.png" caption="Use notification template" >}}
-
-   For more information on how to write and execute templates, refer to [Using Go's templating language][using-go-templating-language] and [Create notification templates][create-notification-templates].
-
-3. Click Save template.
-
-{{% docs/reference %}}
-[create-notification-templates]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/manage-notifications/template-notifications/create-notification-templates"
-[create-notification-templates]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/manage-notifications/template-notifications/create-notification-templates"
-
-[using-go-templating-language]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/manage-notifications/template-notifications/using-go-templating-language"
-[using-go-templating-language]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/manage-notifications/template-notifications/using-go-templating-language"
-{{% /docs/reference %}}
diff --git a/docs/sources/alerting/manage-notifications/view-alert-groups.md b/docs/sources/alerting/manage-notifications/view-alert-groups.md
index 105806767dd03..f050af7373fa0 100644
--- a/docs/sources/alerting/manage-notifications/view-alert-groups.md
+++ b/docs/sources/alerting/manage-notifications/view-alert-groups.md
@@ -1,10 +1,9 @@
 ---
 aliases:
-  - -docs/grafana/latest/alerting/manage-notifications/view-alert-groups/
-  - ../alert-groups/
-  - ../alert-groups/filter-alerts/
-  - ../alert-groups/view-alert-grouping/
-  - ../unified-alerting/alert-groups/
+  - ../../alerting/alert-groups/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alert-groups/
+  - ../../alerting/alert-groups/filter-alerts/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alert-groups/filter-alerts/
+  - ../../alerting/alert-groups/view-alert-grouping/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alert-groups/view-alert-grouping/
+  - ../../alerting/unified-alerting/alert-groups/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/alert-groups/
 canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/view-alert-groups/
 description: Alert groups
 keywords:
diff --git a/docs/sources/alerting/manage-notifications/view-alert-rules.md b/docs/sources/alerting/manage-notifications/view-alert-rules.md
index 7f5136505cf66..8f70591b733f3 100644
--- a/docs/sources/alerting/manage-notifications/view-alert-rules.md
+++ b/docs/sources/alerting/manage-notifications/view-alert-rules.md
@@ -1,10 +1,10 @@
 ---
 aliases:
-  - ../unified-alerting/alerting-rules/rule-list/
-  - ../view-alert-rules/
-  - rule-list/
+  - ../../alerting/unified-alerting/alerting-rules/rule-list/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/alerting-rules/rule-list
+  - ../../alerting/alerting-rules/view-alert-rules/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/view-alert-rules
+  - ../../alerting/alerting-rules/rule-list/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/rule-list
 canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/view-alert-rules/
-description: Manage alerting rules
+description: View alert rules
 keywords:
   - grafana
   - alerting
@@ -16,64 +16,61 @@ labels:
     - cloud
     - enterprise
     - oss
-title: View and filter alert rules
+title: View alert rules
 weight: 410
 ---
 
-# View and filter alert rules
+# View alert rules
 
-The Alerting page lists all existing alert rules. By default, rules are grouped by types of data sources. The Grafana section lists all Grafana managed rules. Alert rules for Prometheus compatible data sources are also listed here. You can view alert rules for Prometheus compatible data sources but you cannot edit them.
-
-The Mimir/Cortex/Loki rules section lists all rules for Mimir, Cortex, or Loki data sources. Cloud alert rules are also listed in this section.
+The Alert rules list view page lists all existing alert rules. By default, alert rules are grouped by alert rule type: Grafana-managed (Grafana) or data source-managed (Mimir/Cortex/Loki). The Grafana section also contains alert rules for Prometheus-compatible data sources. You can view alert rules for Prometheus compatible data sources, but you cannot edit them.
 
 When managing large volumes of alerts, you can use extended alert rule search capabilities to filter on folders, evaluation groups, and rules. Additionally, you can filter alert rules by their properties like labels, state, type, and health.
 
-- [View and filter alert rules](#view-and-filter-alert-rules)
-  - [View alert rules](#view-alert-rules)
-  - [Export alert rules](#export-alert-rules)
-  - [View query definitions for provisioned alerts](#view-query-definitions-for-provisioned-alerts)
-    - [Grouped view](#grouped-view)
-    - [State view](#state-view)
-  - [Filter alert rules](#filter-alert-rules)
+From the Alert rule list page, you can also duplicate alert rules to help you reuse existing alert rules.
 
 ## View alert rules
 
-To view alerting details:
+To view your alert rules, complete the following steps.
 
-1. In the Grafana menu, click the **Alerting** (bell) icon to open the Alerting page. By default, the List view displays.
-1. In **View as**, toggle between Grouped or State views by clicking the relevant option. See [Grouped view](#grouped-view) and [State view](#state-view) for more information.
-1. Expand the rule row to view the rule labels, annotations, data sources the rule queries, and a list of alert instances resulting from this rule.
+1. Click **Alerts & IRM** -> **Alert rules**.
+1. In **View as**, toggle between Grouped, List, or State views.
+1. Expand each alert rule row to view the state, health, evaluation details, as well as a list of alert instances resulting from the alert rule.
+1. Use **Search by data sources** to view alert rules that query the selected data source.
 
-{{< figure src="/static/img/docs/alerting/unified/rule-details-8-0.png" max-width="650px" caption="Alerting rule details" >}}
+### Grouped view
 
-From the Alert list page, you can also make copies of alert rules to help you reuse existing alert rules.
+Grouped view shows Grafana alert rules grouped by folder and Loki or Prometheus alert rules grouped by `namespace` + `group`. This is the default rule list view, intended for managing alert rules. You can expand each group to view a list of rules in this group.
 
-## Export alert rules
+### State view
 
-Click **Export** to create and tune an alert rule in the UI, then export to YAML or JSON, and use in the provisioning API or files. You can also export an entire rule group to review or use.
+State view shows alert rules grouped by state. Use this view to get an overview of which rules are in which state. You can expand each group to view more details.
 
-**Note:** This is supported in both the UI and provisioning API.
+## View alert rule details
 
-## View query definitions for provisioned alerts
+To view alert rule details, complete the following steps.
 
-View read-only query definitions for provisioned alerts. Check quickly if your alert rule queries are correct, without diving into your "as-code" repository for rule definitions.
+1. Click **Alerts & IRM** -> **Alert rules**.
+1. Click to expand an alert rule.
+1. In **Actions**, click **View** (the eye icon).
 
-### Grouped view
+   The namespace and group are shown in the breadcrumb navigation. They are interactive and can be used to filter rules by namespace or group.
 
-Grouped view shows Grafana alert rules grouped by folder and Loki or Prometheus alert rules grouped by `namespace` + `group`. This is the default rule list view, intended for managing rules. You can expand each group to view a list of rules in this group. Expand a rule further to view its details. You can also expand action buttons and alerts resulting from the rule to view their details.
+   The rest of the alert detail content is split up into tabs:
 
-{{< figure src="/static/img/docs/alerting/unified/rule-list-group-view-8-0.png" max-width="800px" caption="Alerting grouped view" >}}
+   **Query and conditions**
 
-### State view
+   View the details of the query that is used for the alert rule, including the expressions and intermediate values for each step of the expression pipeline. A graph view is included for range queries and data sources that return time series-like data frames.
+
+   **Instances**
+
+   Explore each alert instance, its status, labels and various other metadata for multi-dimensional alert rules.
 
-State view shows alert rules grouped by state. Use this view to get an overview of which rules are in what state. Each rule can be expanded to view its details. Action buttons and any alerts generated by this rule, and each alert can be further expanded to view its details.
+   Use **Search by label** to enter search criteria using label selectors. For example, `environment=production,region=~US|EU,severity!=warning`.
 
-{{< figure src="/static/img/docs/alerting/unified/rule-list-state-view-8-0.png" max-width="800px" caption="Alerting state view" >}}
+   **History**
 
-## Filter alert rules
+   Explore the recorded history for an alert rule. You can also filter by alert state.
 
-To filter alert rules:
+   **Details**
 
-- From **Select data sources**, select a data source. You can see alert rules that query the selected data source.
-- In the **Search by label**, enter search criteria using label selectors. For example, `environment=production,region=~US|EU,severity!=warning`.
-- From **Filter alerts by state**, select an alerting state you want to see. You can see alerting rules that match the state. Rules matching other states are hidden.
+   Debug or audit using the alert rule metadata and view the alert rule annotations.
diff --git a/docs/sources/alerting/manage-notifications/view-notification-errors.md b/docs/sources/alerting/manage-notifications/view-notification-errors.md
index 4e9121aa454a7..9caf6d6e18605 100644
--- a/docs/sources/alerting/manage-notifications/view-notification-errors.md
+++ b/docs/sources/alerting/manage-notifications/view-notification-errors.md
@@ -1,6 +1,6 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/view-notification-errors/
-description: View notification errors to find out why they weren't sent or received
+description: View notification errors and understand why they failed to be sent or were not received
 keywords:
   - grafana
   - alerting
diff --git a/docs/sources/alerting/manage-notifications/view-state-health.md b/docs/sources/alerting/manage-notifications/view-state-health.md
index b65a4c9e2b5a7..0a37609929566 100644
--- a/docs/sources/alerting/manage-notifications/view-state-health.md
+++ b/docs/sources/alerting/manage-notifications/view-state-health.md
@@ -1,13 +1,12 @@
 ---
 aliases:
-  - ../fundamentals/state-and-health/
-  - ../unified-alerting/alerting-rules/state-and-health/
-  - ../view-state-health/
+  - ../../alerting/alerting-rules/view-state-health/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/view-state-health
 canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/view-state-health/
-description: State and Health of alerting rules
+description: View the state and health of alert rules
 keywords:
   - grafana
   - alert rules
+  - keep last state
   - guide
   - state
   - health
@@ -58,15 +57,20 @@ An alert instance can be in either of the following states:
 | **NoData**   | No data has been received for the configured time window.                                     |
 | **Error**    | The error that occurred when attempting to evaluate an alerting rule.                         |
 
+## Keep last state
+
+An alert rule can be configured to keep the last state when a `NoData` and/or `Error` state is encountered. This will both prevent alerts from firing, and from resolving and re-firing. Just like normal evaluation, the alert rule will transition from `Pending` to `Firing` after the pending period has elapsed.
+
 ## Alert rule health
 
 An alert rule can have one the following health statuses:
 
-| State      | Description                                                                        |
-| ---------- | ---------------------------------------------------------------------------------- |
-| **Ok**     | No error when evaluating an alerting rule.                                         |
-| **Error**  | An error occurred when evaluating an alerting rule.                                |
-| **NoData** | The absence of data in at least one time series returned during a rule evaluation. |
+| State                  | Description                                                                                              |
+| ---------------------- | -------------------------------------------------------------------------------------------------------- |
+| **Ok**                 | No error when evaluating an alerting rule.                                                               |
+| **Error**              | An error occurred when evaluating an alerting rule.                                                      |
+| **NoData**             | The absence of data in at least one time series returned during a rule evaluation.                       |
+| **{status}, KeepLast** | The rule would have received another status but was configured to keep the last state of the alert rule. |
 
 ## Special alerts for `NoData` and `Error`
 
@@ -77,6 +81,10 @@ When evaluation of an alerting rule produces state `NoData` or `Error`, Grafana
 | **alertname**      | Either `DatasourceNoData` or `DatasourceError` depending on the state. |
 | **datasource_uid** | The UID of the data source that caused the state.                      |
 
+{{% admonition type="note" %}}
+You will need to set the No Data and Error Handling to `No Data` or `Error` in the alert rule as per this doc: <https://grafana.com/docs/grafana/latest/alerting/alerting-rules/create-grafana-managed-rule/#configure-no-data-and-error-handling> in order to generate the additional labels.
+{{% /admonition %}}
+
 You can handle these alerts the same way as regular alerts by adding a silence, route to a contact point, and so on.
 
 ## State history view
diff --git a/docs/sources/alerting/monitor/_index.md b/docs/sources/alerting/monitor/_index.md
index cbd9853387a9c..577910d5690b0 100644
--- a/docs/sources/alerting/monitor/_index.md
+++ b/docs/sources/alerting/monitor/_index.md
@@ -3,7 +3,7 @@ aliases:
   - ./meta-monitoring/ # /docs/grafana/<GRAFANA_VERSION>/alerting/meta-monitoring/
   - ./set-up/meta-monitoring/ # /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/meta-monitoring/
 canonical: https://grafana.com/docs/grafana/latest/alerting/monitor/
-description: Meta monitoring
+description: Monitor your alerting metrics to ensure you identify potential issues before they become critical.
 keywords:
   - grafana
   - alerting
diff --git a/docs/sources/alerting/set-up/_index.md b/docs/sources/alerting/set-up/_index.md
index 7418bba3ca694..e07d33b08be7d 100644
--- a/docs/sources/alerting/set-up/_index.md
+++ b/docs/sources/alerting/set-up/_index.md
@@ -1,8 +1,8 @@
 ---
 aliases:
-  - unified-alerting/set-up/
+  - unified-alerting/set-up/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/set-up/
 canonical: https://grafana.com/docs/grafana/latest/alerting/set-up/
-description: How to configure alerting features and integrations
+description: Set up or upgrade your implementation of Grafana Alerting
 labels:
   products:
     - oss
@@ -60,21 +60,19 @@ The following topics provide you with advanced configuration options for Grafana
 - [Configure high availability][configure-high-availability]
 
 {{% docs/reference %}}
-[configure-alertmanager]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/set-up/configure-alertmanager"
+[configure-alertmanager]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/configure-alertmanager"
 [configure-alertmanager]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/configure-alertmanager"
 
-[configure-high-availability]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/set-up/configure-high-availability"
+[configure-high-availability]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/configure-high-availability"
 [configure-high-availability]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/configure-high-availability"
 
-[data-source-alerting]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/data-source-alerting"
-[data-source-alerting]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/data-source-alerting"
+[data-source-alerting]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules#supported-data-sources"
+[data-source-alerting]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules#supported-data-sources"
 
-[data-source-management]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/administration/data-source-management"
-[data-source-management]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/administration/data-source-management"
+[data-source-management]: "/docs/ -> /docs/grafana/<GRAFANA_VERSION>/administration/data-source-management"
 
-[file-provisioning]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/set-up/provision-alerting-resources/file-provisioning"
-[file-provisioning]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/provision-alerting-resources/file-provisioning"
+[file-provisioning]: "/docs/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/file-provisioning"
 
-[terraform-provisioning]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/set-up/provision-alerting-resources/terraform-provisioning"
+[terraform-provisioning]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/terraform-provisioning"
 [terraform-provisioning]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/provision-alerting-resources/terraform-provisioning"
 {{% /docs/reference %}}
diff --git a/docs/sources/alerting/set-up/configure-alert-state-history/index.md b/docs/sources/alerting/set-up/configure-alert-state-history/index.md
index 5a1145531b33c..a9892dc716b3b 100644
--- a/docs/sources/alerting/set-up/configure-alert-state-history/index.md
+++ b/docs/sources/alerting/set-up/configure-alert-state-history/index.md
@@ -1,6 +1,6 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/set-up/configure-alert-state-history/
-description: Configure Alert State History
+description: Configure alert state history to explore the behavior of your alert rules
 keywords:
   - grafana
   - alerting
@@ -9,12 +9,12 @@ keywords:
   - alert state history
 labels:
   products:
-    - cloud
-title: Configure Alert State History
-weight: 600
+    - oss
+title: Configure alert state history
+weight: 250
 ---
 
-# Configure Alert State History
+# Configure alert state history
 
 Starting with Grafana 10, Alerting can record all alert rule state changes for your Grafana managed alert rules in a Loki instance.
 
diff --git a/docs/sources/alerting/set-up/configure-alertmanager/index.md b/docs/sources/alerting/set-up/configure-alertmanager/index.md
index c4c9e1fdd57d6..d2d9c3148c819 100644
--- a/docs/sources/alerting/set-up/configure-alertmanager/index.md
+++ b/docs/sources/alerting/set-up/configure-alertmanager/index.md
@@ -1,8 +1,8 @@
 ---
 aliases:
-  - ../configure-alertmanager/
+  - ../configure-alertmanager/ # /docs/grafana/<GRAFANA_VERSION>/configure-alertmanager/
 canonical: https://grafana.com/docs/grafana/latest/alerting/set-up/configure-alertmanager/
-description: Configure Alertmanager
+description: Configure an Alertmanager to receive all of your alerts
 keywords:
   - grafana
   - alerting
@@ -27,11 +27,7 @@ Grafana Alerting does not support sending alerts to the AWS Managed Service for
 
 Once you have added the Alertmanager, you can use the Grafana Alerting UI to manage silences, contact points, and notification policies. A drop-down option in these pages allows you to switch between alertmanagers.
 
-{{% admonition type="note" %}}
-Starting with Grafana 9.2, the URL configuration of external alertmanagers from the Admin tab on the Alerting page is deprecated. It will be removed in a future release.
-{{% /admonition %}}
-
-External alertmanagers should now be configured as data sources using Grafana Configuration from the main Grafana navigation menu. This enables you to manage the contact points and notification policies of external alertmanagers from within Grafana and also encrypts HTTP basic authentication credentials that were previously visible when configuring external alertmanagers by URL.
+External alertmanagers should now be configured as data sources using Grafana Configuration from the main Grafana navigation menu. This enables you to manage the contact points and notification policies of external alertmanagers from within Grafana and also encrypts HTTP basic authentication credentials.
 
 To add an external Alertmanager, complete the following steps.
 
diff --git a/docs/sources/alerting/set-up/configure-high-availability/_index.md b/docs/sources/alerting/set-up/configure-high-availability/_index.md
index 22bea808bdee3..4992fbbe9ebc1 100644
--- a/docs/sources/alerting/set-up/configure-high-availability/_index.md
+++ b/docs/sources/alerting/set-up/configure-high-availability/_index.md
@@ -1,9 +1,11 @@
 ---
 aliases:
-  - ../high-availability/enable-alerting-ha/
-  - ../unified-alerting/high-availability/
+  - ../unified-alerting/high-availability/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/high-availability
+  - ../high-availability/enable-alerting-ha/ # /docs/grafana/<GRAFANA_VERSION>/alerting/high-availability/enable-alerting-ha/
+  - ../high-availability/ # /docs/grafana/<GRAFANA_VERSION>/alerting/high-availability
+  - ../fundamentals/high-availability/ # /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/high-availability
 canonical: https://grafana.com/docs/grafana/latest/alerting/set-up/configure-high-availability/
-description: Enable alerting high availability
+description: Configure High Availability
 keywords:
   - grafana
   - alerting
@@ -14,14 +16,23 @@ labels:
   products:
     - enterprise
     - oss
-title: Enable alerting high availability
-weight: 400
+title: Configure high availability
+weight: 600
 ---
 
-# Enable alerting high availability
+# Configure high availability
 
-You can enable alerting high availability support by updating the Grafana configuration file. If you run Grafana in a Kubernetes cluster, additional steps are required. Both options are described below.
-Please note that the deduplication is done for the notification, but the alert will still be evaluated on every Grafana instance. This means that events in alerting state history will be duplicated by the number of Grafana instances running.
+Grafana Alerting uses the Prometheus model of separating the evaluation of alert rules from the delivering of notifications. In this model, the evaluation of alert rules is done in the alert generator and the delivering of notifications is done in the alert receiver. In Grafana Alerting, the alert generator is the Scheduler and the receiver is the Alertmanager.
+
+{{< figure src="/static/img/docs/alerting/unified/high-availability-ua.png" class="docs-image--no-shadow" max-width= "750px" caption="High availability" >}}
+
+When running multiple instances of Grafana, all alert rules are evaluated on all instances. You can think of the evaluation of alert rules as being duplicated by the number of running Grafana instances. This is how Grafana Alerting makes sure that as long as at least one Grafana instance is working, alert rules will still be evaluated and notifications for alerts will still be sent.
+
+You can find this duplication in state history and it is a good way to confirm if you are using high availability.
+
+While the alert generator evaluates all alert rules on all instances, the alert receiver makes a best-effort attempt to avoid sending duplicate notifications. Alertmanager chooses availability over consistency, which may result in occasional duplicated or out-of-order notifications. It takes the opinion that duplicate or out-of-order notifications are better than no notifications.
+
+The Alertmanager uses a gossip protocol to share information about notifications between Grafana instances. It also gossips silences, which means a silence created on one Grafana instance is replicated to all other Grafana instances. Both notifications and silences are persisted to the database periodically, and during graceful shut down.
 
 {{% admonition type="note" %}}
 
@@ -30,31 +41,31 @@ This is because the HA settings (`ha_peers`, etc), only apply to the alert notif
 
 {{% /admonition %}}
 
-## Enable alerting high availability in Grafana using Memberlist
+## Enable alerting high availability using Memberlist
 
-### Before you begin
+**Before you begin**
 
 Since gossiping of notifications and silences uses both TCP and UDP port `9094`, ensure that each Grafana instance is able to accept incoming connections on these ports.
 
 **To enable high availability support:**
 
 1. In your custom configuration file ($WORKING_DIR/conf/custom.ini), go to the `[unified_alerting]` section.
-2. Set `[ha_peers]` to the number of hosts for each Grafana instance in the cluster (using a format of host:port), for example, `ha_peers=10.0.0.5:9094,10.0.0.6:9094,10.0.0.7:9094`.
-   You must have at least one (1) Grafana instance added to the [`[ha_peer]` section.
-3. Set `[ha_listen_address]` to the instance IP address using a format of `host:port` (or the [Pod's](https://kubernetes.io/docs/concepts/workloads/pods/) IP in the case of using Kubernetes).
+1. Set `[ha_peers]` to the number of hosts for each Grafana instance in the cluster (using a format of host:port), for example, `ha_peers=10.0.0.5:9094,10.0.0.6:9094,10.0.0.7:9094`.
+   You must have at least one (1) Grafana instance added to the `ha_peers` section.
+1. Set `[ha_listen_address]` to the instance IP address using a format of `host:port` (or the [Pod's](https://kubernetes.io/docs/concepts/workloads/pods/) IP in the case of using Kubernetes).
    By default, it is set to listen to all interfaces (`0.0.0.0`).
-4. Set `[ha_peer_timeout]` in the `[unified_alerting]` section of the custom.ini to specify the time to wait for an instance to send a notification via the Alertmanager. The default value is 15s, but it may increase if Grafana servers are located in different geographic regions or if the network latency between them is high.
+1. Set `[ha_peer_timeout]` in the `[unified_alerting]` section of the custom.ini to specify the time to wait for an instance to send a notification via the Alertmanager. The default value is 15s, but it may increase if Grafana servers are located in different geographic regions or if the network latency between them is high.
 
-## Enable alerting high availability in Grafana using Redis
+## Enable alerting high availability using Redis
 
 As an alternative to Memberlist, you can use Redis for high availability. This is useful if you want to have a central
 database for HA and cannot support the meshing of all Grafana servers.
 
 1. Make sure you have a redis server that supports pub/sub. If you use a proxy in front of your redis cluster, make sure the proxy supports pub/sub.
-2. In your custom configuration file ($WORKING_DIR/conf/custom.ini), go to the [unified_alerting] section.
-3. Set `ha_redis_address` to the redis server address Grafana should connect to.
-4. [Optional] Set the username and password if authentication is enabled on the redis server using `ha_redis_username` and `ha_redis_password`.
-5. [Optional] Set `ha_redis_prefix` to something unique if you plan to share the redis server with multiple Grafana instances.
+1. In your custom configuration file ($WORKING_DIR/conf/custom.ini), go to the [unified_alerting] section.
+1. Set `ha_redis_address` to the redis server address Grafana should connect to.
+1. [Optional] Set the username and password if authentication is enabled on the redis server using `ha_redis_username` and `ha_redis_password`.
+1. [Optional] Set `ha_redis_prefix` to something unique if you plan to share the redis server with multiple Grafana instances.
 
 The following metrics can be used for meta monitoring, exposed by Grafana's `/metrics` endpoint:
 
@@ -72,67 +83,67 @@ The following metrics can be used for meta monitoring, exposed by Grafana's `/me
 
 ## Enable alerting high availability using Kubernetes
 
-If you are using Kubernetes, you can expose the pod IP [through an environment variable](https://kubernetes.io/docs/tasks/inject-data-application/environment-variable-expose-pod-information/) via the container definition.
+1. You can expose the pod IP [through an environment variable](https://kubernetes.io/docs/tasks/inject-data-application/environment-variable-expose-pod-information/) via the container definition.
 
-```yaml
-env:
-  - name: POD_IP
-    valueFrom:
-      fieldRef:
-        fieldPath: status.podIP
-```
+   ```yaml
+   env:
+     - name: POD_IP
+       valueFrom:
+         fieldRef:
+           fieldPath: status.podIP
+   ```
 
 1. Add the port 9094 to the Grafana deployment:
 
-```yaml
-ports:
-  - containerPort: 3000
-    name: http-grafana
-    protocol: TCP
-  - containerPort: 9094
-    name: grafana-alert
-    protocol: TCP
-```
-
-2. Add the environment variables to the Grafana deployment:
-
-```yaml
-env:
-  - name: POD_IP
-    valueFrom:
-      fieldRef:
-        fieldPath: status.podIP
-```
-
-3. Create a headless service that returns the pod IP instead of the service IP, which is what the `ha_peers` need:
-
-```yaml
-apiVersion: v1
-kind: Service
-metadata:
-  name: grafana-alerting
-  namespace: grafana
-  labels:
-    app.kubernetes.io/name: grafana-alerting
-    app.kubernetes.io/part-of: grafana
-spec:
-  type: ClusterIP
-  clusterIP: 'None'
-  ports:
-    - port: 9094
-  selector:
-    app: grafana
-```
-
-4. Make sure your grafana deployment has the label matching the selector, e.g. `app:grafana`:
-
-5. Add in the grafana.ini:
-
-```bash
-[unified_alerting]
-enabled = true
-ha_listen_address = "${POD_IP}:9094"
-ha_peers = "grafana-alerting.grafana:9094"
-ha_advertise_address = "${POD_IP}:9094"
-ha_peer_timeout = 15s
-```
+   ```yaml
+   ports:
+     - containerPort: 3000
+       name: http-grafana
+       protocol: TCP
+     - containerPort: 9094
+       name: grafana-alert
+       protocol: TCP
+   ```
+
+1. Add the environment variables to the Grafana deployment:
+
+   ```yaml
+   env:
+     - name: POD_IP
+       valueFrom:
+         fieldRef:
+           fieldPath: status.podIP
+   ```
+
+1. Create a headless service that returns the pod IP instead of the service IP, which is what the `ha_peers` need:
+
+   ```yaml
+   apiVersion: v1
+   kind: Service
+   metadata:
+     name: grafana-alerting
+     namespace: grafana
+     labels:
+       app.kubernetes.io/name: grafana-alerting
+       app.kubernetes.io/part-of: grafana
+   spec:
+     type: ClusterIP
+     clusterIP: 'None'
+     ports:
+       - port: 9094
+     selector:
+       app: grafana
+   ```
+
+1. Make sure your grafana deployment has the label matching the selector, e.g. `app:grafana`:
+
+1. Add in the grafana.ini:
+
+   ```bash
+   [unified_alerting]
+   enabled = true
+   ha_listen_address = "${POD_IP}:9094"
+   ha_peers = "grafana-alerting.grafana:9094"
+   ha_advertise_address = "${POD_IP}:9094"
+   ha_peer_timeout = 15s
+   ```
diff --git a/docs/sources/alerting/set-up/migrating-alerts/_index.md b/docs/sources/alerting/set-up/migrating-alerts/_index.md
deleted file mode 100644
index 819e97b9deeb3..0000000000000
--- a/docs/sources/alerting/set-up/migrating-alerts/_index.md
+++ /dev/null
@@ -1,158 +0,0 @@
----
-aliases:
-  - ../migrating-alerts/ # /docs/grafana/<GRAFANA VERSION>/alerting/migrating-alerts/
-canonical: https://grafana.com/docs/grafana/latest/alerting/set-up/migrating-alerts/
-description: Upgrade Grafana alerts
-labels:
-  products:
-    - enterprise
-    - oss
-title: Upgrade Alerting
-weight: 150
----
-
-# Upgrade Alerting
-
-Grafana Alerting is enabled by default for new installations or existing installations whether or not legacy alerting is configured.
-
-{{% admonition type="note" %}}
-When upgrading, your dashboard alerts are migrated to a new format. This migration can be rolled back easily by opting out. If you have any questions regarding this migration, please contact us.
-{{% /admonition %}}
-
-Existing installations that do not use legacy alerting will have Grafana Alerting enabled by default unless alerting is disabled in the configuration.
-
-Likewise, existing installations that use legacy alerting will be automatically upgraded to Grafana Alerting unless you have opted out of Grafana Alerting before migration takes place. During the upgrade, legacy alerts are migrated to the new alerts type and no alerts or alerting data are lost.
-
-Once the upgrade has taken place, you still have the option to roll back to legacy alerting. However, we do not recommend choosing this option. If you do choose to roll back, Grafana will restore your alerts to the alerts you had at the point in time when the upgrade took place. All new alerts and changes made exclusively in Grafana Alerting will be deleted.
-
-{{% admonition type="note" %}}
-Cloud customers, who do not want to upgrade to Grafana Alerting, should contact customer support.
-{{% /admonition %}}
-
-If you have opted out or rolled back, you can always choose to opt in to Grafana Alerting at a later point in time.
-
-The following table provides details on the upgrade for Cloud, Enterprise, and OSS installations and the new Grafana Alerting UI.
-
-| Grafana instance upgraded to 9.0 |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| -------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| Cloud                            | Existing Cloud installations with legacy dashboard alerting will have two alerting icons in the left navigation panel - the old alerting plugin icon and the new Grafana Alerting icon. During upgrade, existing alerts from the Cloud alerting plugin are migrated to Grafana Alerting. Once migration is complete, you can access and manage the older alerts from the new alerting Grafana Alerting icon in the navigation panel. The (older) Cloud alerting plugin is uninstalled from your cloud instance. Contact customer support if you **do not wish** to migrate to Grafana Alerting for your Cloud stack. If you choose to use legacy alerting, use the You will see the new Grafana Alerting icon as well as the old Cloud alerting plugin in the left navigation panel. |
-| Enterprise                       | Existing Enterprise instances using legacy alerting will have both the old (marked as legacy) and the new alerting icons in the navigation panel. During upgrade, existing legacy alerts are migrated to Grafana Alerting. If you wish, you can opt out of Grafana Alerting and roll back to legacy alerting. In that case, you can manage your legacy alerts from the alerting icon marked as legacy.                                                                                                                                                                                                                                                                                                                                                                               |
-| OSS                              | Existing OSS installations with legacy dashboard alerting will have two alerting icons in the left navigation panel - the old alerting icon (marked as legacy) and the new Grafana Alerting icon. During upgrade, existing legacy alerts are migrated to Grafana Alerting. If you wish, you can opt out of Grafana Alerting and roll back to legacy alerting. In that case, you can manage your legacy alerts from the alerting icon marked as legacy.                                                                                                                                                                                                                                                                                                                               |
-
-> **Note:** Starting with v9.0, legacy alerting is deprecated and will be removed in a future release.
-
-## Opt out
-
-You can opt out of Grafana Alerting at any time and switch to using legacy alerting. Alternatively, you can opt out of using alerting in its entirety.
-
-## Stay on legacy alerting
-
-When upgrading to Grafana > 9.0, existing installations that use legacy alerting are automatically upgraded to Grafana Alerting unless you have opted-out of Grafana Alerting before migration takes place. During the upgrade, legacy alerts are migrated to the new alerts type and no alerts or alerting data are lost. To keep using legacy alerting and deactivate Grafana Alerting:
-
-1. Go to your custom configuration file ($WORKING_DIR/conf/custom.ini).
-2. Enter the following in your configuration:
-
-```toml
-[alerting]
-enabled = true
-
-[unified_alerting]
-enabled = false
-```
-
-Installations that have been migrated to Grafana Alerting can roll back to legacy alerting at any time.
-
-{{% admonition type="note" %}}
-This topic is only relevant for OSS and Enterprise customers. Contact customer support to enable or disable Grafana Alerting for your Grafana Cloud stack.
-{{% /admonition %}}
-
-The `ngalert` toggle previously used to enable or disable Grafana Alerting is no longer available.
-
-## Deactivate alerting
-
-You can deactivate both Grafana Alerting and legacy alerting in Grafana.
-
-1. Go to your custom configuration file ($WORKING_DIR/conf/custom.ini).
-1. Enter the following in your configuration:
-
-```toml
-[alerting]
-enabled = false
-
-[unified_alerting]
-enabled = false
-```
-
-3. Restart Grafana for the configuration changes to take effect.
-
-If you want to turn alerting back on, you can remove both flags to enable Grafana Alerting.
-
-## Roll back
-
-Once the upgrade has taken place, you still have the option to roll back to legacy alerting. If you choose to roll back, Grafana will restore your alerts to the alerts you had at the point in time when the upgrade took place.
-
-All new alerts and changes made exclusively in Grafana Alerting will be deleted.
-
-To roll back to legacy alerting, enter the following in your configuration:
-
-```toml
-force_migration = true
-
-[alerting]
-enabled = true
-
-[unified_alerting]
-enabled = false
-```
-
-> **Note**: We do not recommend this option. If you choose to roll back, Grafana will restore your alerts to the alerts you had at the point in time when the upgrade took place. All new alerts and changes made exclusively in Grafana Alerting will be deleted.
-
-## Opt in
-
-If you have previously disabled alerting in Grafana, or opted out of Grafana Alerting and have decided that you would now like to use Grafana Alerting, you can choose to opt in at any time.
-
-If you have been using legacy alerting up until now your existing alerts will be migrated to the new alerts type and no alerts or alerting data are lost. Even if you choose to opt in to Grafana Alerting, you can roll back to legacy alerting at any time.
-
-To opt in to Grafana Alerting, enter the following in your configuration:
-
-```toml
-[alerting]
-enabled = false
-
-[unified_alerting]
-enabled = true
-```
-
-## Differences and limitations
-
-There are some differences between Grafana Alerting and legacy dashboard alerts, and a number of features that are no
-longer supported.
-
-**Differences**
-
-1. When Grafana Alerting is enabled or upgraded to Grafana 9.0 or later, existing legacy dashboard alerts migrate in a format compatible with the Grafana Alerting. In the Alerting page of your Grafana instance, you can view the migrated alerts alongside any new alerts.
-   This topic explains how legacy dashboard alerts are migrated and some limitations of the migration.
-
-1. Read and write access to legacy dashboard alerts and Grafana alerts are governed by the permissions of the folders storing them. During migration, legacy dashboard alert permissions are matched to the new rules permissions as follows:
-
-   - If there are dashboard permissions, a folder named `Migrated {"dashboardUid": "UID", "panelId": 1, "alertId": 1}` is created to match the permissions of the dashboard (including the inherited permissions from the folder).
-   - If there are no dashboard permissions and the dashboard is in a folder, then the rule is linked to this folder and inherits its permissions.
-   - If there are no dashboard permissions and the dashboard is in the General folder, then the rule is linked to the `General Alerting` folder and the rule inherits the default permissions.
-
-1. `NoData` and `Error` settings are migrated as is to the corresponding settings in Grafana Alerting, except in two situations:
-
-   3.1. As there is no `Keep Last State` option for `No Data` in Grafana Alerting, this option becomes `NoData`. The `Keep Last State` option for `Error` is migrated to a new option `Error`. To match the behavior of the `Keep Last State`, in both cases, during the migration Grafana automatically creates a silence for each alert rule with a duration of 1 year.
-
-   3.2. Due to lack of validation, legacy alert rules imported via JSON or provisioned along with dashboards can contain arbitrary values for `NoData` and [`Error`](/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md#configure-no-data-and-error-handling). In this situation, Grafana will use the default setting: `NoData` for No data, and `Error` for Error.
-
-1. Notification channels are migrated to an Alertmanager configuration with the appropriate routes and receivers. Default notification channels are added as contact points to the default route. Notification channels not associated with any Dashboard alert go to the `autogen-unlinked-channel-recv` route.
-
-1. Unlike legacy dashboard alerts where images in notifications are enabled per contact point, images in notifications for Grafana Alerting must be enabled in the Grafana configuration, either in the configuration file or environment variables, and are enabled for either all or no contact points.
-
-1. The JSON format for webhook notifications has changed in Grafana Alerting and uses the format from [Prometheus Alertmanager](https://prometheus.io/docs/alerting/latest/configuration/#webhook_config).
-
-1. Alerting on Prometheus `Both` type queries is not supported in Grafana Alerting. Existing legacy alerts with `Both` type queries are migrated to Grafana Alerting as alerts with `Range` type queries.
-
-**Limitations**
-
-1. Since `Hipchat` and `Sensu` notification channels are no longer supported, legacy alerts associated with these channels are not automatically migrated to Grafana Alerting. Assign the legacy alerts to a supported notification channel so that you continue to receive notifications for those alerts.
diff --git a/docs/sources/alerting/set-up/migrating-alerts/legacy-alerting-deprecation.md b/docs/sources/alerting/set-up/migrating-alerts/legacy-alerting-deprecation.md
deleted file mode 100644
index d598bb059d034..0000000000000
--- a/docs/sources/alerting/set-up/migrating-alerts/legacy-alerting-deprecation.md
+++ /dev/null
@@ -1,60 +0,0 @@
----
-aliases:
-  - alerting/legacy-alerting-deprecation/
-canonical: https://grafana.com/docs/grafana/latest/alerting/set-up/migrating-alerts/legacy-alerting-deprecation/
-description: Legacy alerting deprecation notice
-keywords:
-  - grafana
-  - alerting
-labels:
-  products:
-    - enterprise
-    - oss
-title: Legacy alerting deprecation
-weight: 109
----
-
-# Legacy alerting deprecation
-
-Starting with Grafana v9.0.0, legacy alerting is deprecated, meaning that it is no longer actively maintained or supported by Grafana. As of Grafana v10.0.0, we do not contribute or accept external contributions to the codebase apart from CVE fixes.
-
-Legacy alerting refers to the old alerting system that was used prior to the introduction of Grafana Alerting; the new alerting system in Grafana.
-
-The decision to deprecate legacy alerting was made to encourage users to migrate to the new alerting system, which offers a more powerful and flexible alerting experience based on Prometheus Alertmanager.
-
-Users who are still using legacy alerting are encouraged to migrate their alerts to the new system as soon as possible to ensure that they continue to receive new features, bug fixes, and support.
-
-However, we will still patch CVEs until legacy alerting is completely removed in Grafana 11; honoring our commitment to building and distributing secure software.
-
-We have provided [instructions][migrating-alerts] on how to migrate to the new alerting system, making the process as easy as possible for users.
-
-## Why are we deprecating legacy alerting?
-
-The new Grafana alerting system is more powerful and flexible than the legacy alerting feature.
-
-The new system is based on Prometheus Alertmanager, which offers a more comprehensive set of features for defining and managing alerts. With the new alerting system, users can create alerts based on complex queries, configure alert notifications via various integrations, and set up sophisticated alerting rules with support for conditional expressions, aggregation, and grouping.
-
-Overall, the new alerting system in Grafana is a major improvement over the legacy alerting feature, providing users with a more powerful and flexible alerting experience.
-
-Additionally, legacy alerting still requires Angular to function and we are [planning to remove support for it][angular_deprecation] in Grafana 11.
-
-## When will we remove legacy alerting completely?
-
-Legacy alerting will be removed from the code-base in Grafana 11, following the same timeline as the [Angular deprecation][angular_deprecation].
-
-## How do I migrate to the new Grafana alerting?
-
-Refer to our [upgrade instructions][migrating-alerts].
-
-### Useful links
-
-- [Upgrade Alerting][migrating-alerts]
-- [Angular support deprecation][angular_deprecation]
-
-{{% docs/reference %}}
-[angular_deprecation]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/developers/angular_deprecation"
-[angular_deprecation]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/developers/angular_deprecation"
-
-[migrating-alerts]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/set-up/migrating-alerts"
-[migrating-alerts]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/migrating-alerts"
-{{% /docs/reference %}}
diff --git a/docs/sources/alerting/set-up/migrating-alerts/legacy-alerting/_index.md b/docs/sources/alerting/set-up/migrating-alerts/legacy-alerting/_index.md
deleted file mode 100644
index 29f5d6bc07f7a..0000000000000
--- a/docs/sources/alerting/set-up/migrating-alerts/legacy-alerting/_index.md
+++ /dev/null
@@ -1,101 +0,0 @@
----
-aliases:
-  - /docs/grafana-cloud/alerts/
-  - /docs/grafana-cloud/how-do-i/alerts/
-  - /docs/grafana-cloud/legacy-alerting/
-  - alerting/migrating-alerts/legacy-alerting/
-canonical: https://grafana.com/docs/grafana/latest/alerting/set-up/migrating-alerts/legacy-alerting/
-description: Legacy alerting
-labels:
-  products:
-    - enterprise
-    - oss
-title: Legacy alerting
-weight: 110
----
-
-# Legacy alerting
-
-**Note:**
-
-Starting with Grafana v9.0.0, legacy alerting is deprecated. It is no longer actively maintained or supported by Grafana and will be removed in Grafana v11.0.0.
-
-You have two options to configure alerts within the Grafana Cloud GUI and a third option that enables you to set Grafana Cloud Alerts using the command line.
-
-- **Grafana alerts** are the same as in an on-prem instance of Grafana.
-  These alerts are created from a graph panel within a Grafana dashboard.
-  This is useful when you want to create a simple alert based on one metric from within a panel.
-  It also has a much simpler learning curve when you are getting started.
-- **Grafana Cloud alerts - GUI** are an implementation of Prometheus-style rules that enable you to query your Grafana Cloud Metrics and then set up Prometheus Alertmanager-style alerts based on those rules.
-  This is useful when you want to create precise, PromQL-based rules or create alerts from across many metrics and logs being collected into your Grafana Cloud Metrics.
-  This form of alerting is much more powerful and configurable, but that comes with some complexity.
-- **Grafana Cloud alerts - CLI** use mimirtool to create and upload the same types of Prometheus-style recording and alerting rules definitions to your Grafana Cloud Metrics instance.
-  Once created, you will also be able to view these rules from within the Grafana Cloud Alerting page in the GUI.
-- **Synthetic Monitoring alerts** are built on Prometheus alerts, just like in Grafana Cloud alerting.
-  You can configure synthetic monitoring alerts separately using the UI in synthetic monitoring.
-  Another option to create alerts for synthetic monitoring checks is to simply use Grafana Cloud alerting.
-
-## Using Grafana alerts in Grafana Cloud
-
-Grafana alerts are dashboard panel-driven and can only be created using the Graph panel.
-This style of alerting builds on top of the query defined for the graph visualization, so alerts and notifications are sent based on breaking some threshold in the associated panel.
-
-This also means that there is a one-to-one relationship between a Grafana alert and a graph panel.
-So although Grafana alerts can be viewed centrally, they can only be managed directly from the panel that they’re tied to.
-As a result, Grafana alerting is best suited for smaller setups, where there are only a few individuals or teams responsible for a small set of dashboards and where there are few dependencies between the dashboards.
-
-{{% admonition type="note" %}}
-Most curated dashboards, such as those provided with an integration or with Synthetic Monitoring do not allow you to alert from panels.
-This is to preserve the ability to upgrade these dashboards automatically when the integration or Synthetic Monitoring abilities are updated.
-To create an editable copy that you can edit and alert from, click settings (the gear logo) within any dashboard and then click **Make Editable**.
-The copy will not be upgraded when/if the curated dashboard receives an update.
-This is one reason why Grafana Cloud Alerts may be considered a better option.
-{{% /admonition %}}
-
-### What makes Grafana alerts unique?
-
-With Grafana alerts, alerts are limited to only graph panels within dashboards.
-In addition:
-
-- Alerts can be edited by both Editor and Admin roles
-- Alerts are visual, with an associated alerting threshold line
-- Alerts work with many non-Prometheus data sources, including Graphite
-- Alert notifications can be routed to many external notifier systems, directly from Grafana
-- Alerts are directly associated with a dashboard
-- Alerts can be tested
-
-## Using Grafana Cloud Alerts
-
-Because the metrics you collect and send to Grafana Cloud are centrally stored in one large time-series database, Grafana Cloud Metrics, you can query across these metrics using [PromQL](https://prometheus.io/docs/prometheus/latest/querying/basics/) and build alerts directly around those metrics rather than around a panel.
-You can also query across any logs you have sent using Loki.
-
-Grafana Cloud Alerts are directly tied to metrics and log data.
-They can be configured either through the UI or by uploading files containing Prometheus and Loki alert rules with mimirtool.
-
-Grafana Cloud Alerting's Prometheus-style alerts are built by querying directly from the data source itself.
-Because these alerts are based on the data, they are not tied to a single panel.
-This makes it possible to evaluate and centrally manage alerts across several different Prometheus and Loki data source instances.
-
-### What makes Grafana Cloud Alerts unique?
-
-With Grafana Cloud Alerts, alerts are not limited to coming from a graph panel.
-In addition, you can:
-
-- Prevent alerts from being edited, except by users with accounts that are assigned Admin roles.
-- Centrally manage and create alerts across many systems, teams, and dashboards.
-  Alerts are not bound to just one system, team, or dashboard.
-- Create alerts for both metric _and_ log data, based on Prometheus and Loki, respectively.
-- Silence and mute alerts in bulk, even using a schedule, using the Alertmanager.
-- Route alert notifications to [many external notifier systems](https://prometheus.io/docs/operating/integrations/#alertmanager-webhook-receiver) using Alertmanager configurations
-- Dedupe alert notifications automatically.
-
-### Grafana Cloud Alert configuration methods
-
-In a traditional on-prem environment, Prometheus-style alert configuration is done through the combination of defining a [Prometheus configuration file](https://prometheus.io/docs/prometheus/latest/configuration/configuration/) and an [Alertmanager configuration file](https://prometheus.io/docs/alerting/latest/configuration/), which live close to the Prometheus server.
-With Grafana Cloud, you can still use this setup as well as more flexible architectures.
-
-- You can use `mimirtool` to upload your configuration files to be hosted and evaluated entirely in Grafana Cloud.
-- You can manage both alerting rules and Alertmanager configurations directly through the UI.
-  Configuration files are unnecessary with this setup.
-- You can use both methods concurrently to manage the alerts.
-  For example, updates made using the `mimirtool` are automatically updated and visible within the Grafana Cloud Alerting interface in minutes.
diff --git a/docs/sources/alerting/set-up/migrating-alerts/legacy-alerting/grafana-cloud-alerting/_index.md b/docs/sources/alerting/set-up/migrating-alerts/legacy-alerting/grafana-cloud-alerting/_index.md
deleted file mode 100644
index 0e95ee1f3e4a8..0000000000000
--- a/docs/sources/alerting/set-up/migrating-alerts/legacy-alerting/grafana-cloud-alerting/_index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-aliases:
-  - /docs/grafana-cloud/alerts/grafana-cloud-alerting/
-  - /docs/grafana-cloud/how-do-i/grafana-cloud-alerting/
-  - /docs/grafana-cloud/legacy-alerting/grafana-cloud-alerting/
-canonical: https://grafana.com/docs/grafana/latest/alerting/set-up/migrating-alerts/legacy-alerting/grafana-cloud-alerting/
-description: Grafana Cloud Alerting
-labels:
-  products:
-    - cloud
-title: Grafana Cloud Alerting
-weight: 100
----
-
-# Grafana Cloud Alerting
-
-Grafana Cloud Alerting allows you to create and manage all of your Prometheus-style alerting rules, for both Prometheus metrics and Loki log data. With this feature, you don't need to leave Grafana, upload or edit configuration files, or install additional tools.
-
-![Grafana Cloud Alerting](/static/img/docs/grafana-cloud/grafana-cloud-alerting.png)
-
-## Permissions
-
-All members of an organization that have alerts set up can view alerts in Grafana Cloud Alerting. This includes everyone with a Viewer, Editor, or Admin role.
-
-Users with the organization Admin role can also create, edit, or delete alerts.
-
-## Data sources
-
-Grafana Cloud Alerting supports rule management across multiple data sources, for both metrics and logs, across all of the stacks in your org. If you have more than one Prometheus or Loki data source, there will be a dropdown at the top for you to select the data source to configure rules.
-
-{{% admonition type="note" %}}
-Pay attention to which data source you select. Cloud alerts are tied to a specific data source. For example, if you have a Loki data source selected you will not be able to create an alert based on a Prometheus data source.
-![Cloud Alerting Data Source](/static/img/docs/grafana-cloud/grafana-cloud-alerting-data-source.png)
-{{% /admonition %}}
-
-## Alerts and recording rules
-
-Prometheus supports two types of rules:
-
-- [Recording rules](https://prometheus.io/docs/prometheus/latest/configuration/recording_rules/) - Recording rules allow you to execute expressions or queries, by saving them off as a stored rule instead.
-- [Alerting rules](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) - Alerting rules allow you to define alert conditions and to route those notifications to an external service. An alert fires if metrics meet criteria defined in the alerting rule.
-
-Both of these rules are configurable from the Grafana Cloud Alerting interface and configured in the same way.
-
-## Alert states
-
-Alert states are identical to the standard format found in Prometheus rule configurations. In Grafana Cloud Alerting, each individual alert is highlighted by its state to more clearly distinguish between alerts.
-
-- **Firing -** Alerts that have been active for longer than the configured threshold. Alerts are highlighted in red and tagged with a red `firing` label.
-- **Pending -** Alerts that have been active for less than the configured threshold. Alerts are highlighted in orange.
-- **Inactive -** Alerts that are neither firing nor pending. Alerts are highlighted in green.
-
-## Notifications
-
-The **Notifications** tab is where you can view all current notifications and sort them by various states, receivers, and labels.
-
-![Grafana Cloud Alerting Notifications](/static/img/docs/grafana-cloud/grafana-cloud-alerting-notifications.png)
-
-## Limits
-
-There is a limit on how many rules can be created in a rule group. There is also a limit on how many rule groups can be created.
-
-You can create:
-
-- 20 rules per rule group
-- 35 rule groups
-
-> It is possible to increase these limits. Please contact customer support for further information.
-
-If you exceed the limits, you will encounter an error similar to this:
-
-```bash
-ERROR[0000] requests failed fields.msg="request failed with response body
-per-user rules per rule group limit (limit: 20 actual: 22) exceeded\n"
-status="400 Bad Request"
-ERROR[0000] unable to load rule group  error="failed request to the cortex api"
-group=limit_rules_per_group namespace=test
-```
-
-To increase the number of rules or rule groups you can configure, contact support to upgrade your account.
diff --git a/docs/sources/alerting/set-up/migrating-alerts/legacy-alerting/grafana-cloud-alerting/alertmanager.md b/docs/sources/alerting/set-up/migrating-alerts/legacy-alerting/grafana-cloud-alerting/alertmanager.md
deleted file mode 100644
index 9346eb6dee90a..0000000000000
--- a/docs/sources/alerting/set-up/migrating-alerts/legacy-alerting/grafana-cloud-alerting/alertmanager.md
+++ /dev/null
@@ -1,61 +0,0 @@
----
-aliases:
-  - /docs/grafana-cloud/alerts/grafana-cloud-alerting/alertmanager/
-  - /docs/grafana-cloud/how-do-i/grafana-cloud-alerting/alertmanager/
-  - /docs/grafana-cloud/legacy-alerting/grafana-cloud-alerting/alertmanager/
-canonical: https://grafana.com/docs/grafana/latest/alerting/set-up/migrating-alerts/legacy-alerting/grafana-cloud-alerting/alertmanager/
-description: Alertmanager (legacy)
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Alertmanager (legacy)
-weight: 500
----
-
-# Alertmanager (legacy)
-
-Grafana Cloud Alerting allows you to edit and view configuration for your Alertmanager directly inside of Grafana. See the official [Alertmanager documentation](https://prometheus.io/docs/alerting/latest/configuration/) to learn how to configure.
-
-{{% admonition type="note" %}}
-Only organization Admins can view or update Alertmanger configurations.
-{{% /admonition %}}
-
-## Edit a config for Grafana Cloud Alerting
-
-1. In Grafana, hover your cursor over the **Grafana Cloud Alerting** icon and then click **Alertmanager**.
-1. If you have more than one Alertmanager source, there will be a dropdown at the top for you to select the data source to edit configurations.
-1. Currently active configuration for the Alertmanager will be displayed. Click the **Edit** button to enter edit mode and start making changes. Click "Save and finish editing" once done to persist your changes.
-1. Alternatively, updates to the Alertmanager configurations made using the mimirtool will also sync and appear here.
-
-## Use the Grafana Labs-supplied SMTP option to configure email notifications
-
-Grafana Cloud users who do not have an SMTP server available for sending alert emails may use Grafana-Labs supplied SMTP relay (available at `smtprelay:2525`).
-
-1. In Grafana, hover your cursor over the **Grafana Cloud Alerting** icon and then click **Alertmanager**.
-1. If you have more than one Alertmanager source, there will be a dropdown at the top for you to select the data source to edit configurations.
-1. Find info box with heading **Send alert email notifications from Grafana Cloud** at the top
-1. Enter desired email address into the **email address** field
-1. Click **Update configuration** button. Alertmanager config will be updated with grafana SMTP relay settings and an "email" receiver that will send to the specified email address.
-
-{{% admonition type="note" %}}
-Following these steps will overwrite any custom global SMTP settings that you might have. Default route configuration will send all notifications to the "email" receiver. If you have already customized routes, they will not be updated and you will have to configure "email" receiver on the appropriate route.
-{{% /admonition %}}
-
-Use these settings in your Grafana Cloud Alerting YAML, if you do not find them already set. Most important is the `smtp_require_tls: false` line. If this is not set properly, alert emails will not be received. If you use mimirtool to configure alertmanager, by default this will be set to `true`, which will cause problems.
-
-```yaml
-global:
-  smtp_from: noreply@grafana.net
-  smtp_smarthost: smtprelay:2525
-  smtp_require_tls: false
-```
-
-## Troubleshooting Alertmanager failures
-
-Configuration errors can cause Alertmanager notification failures, e.g. a typo in an email address recipient or an expired token for a webhook. Grafana Cloud provisions a Loki datasource `grafanacloud-<stack_slug>-usage-insights` which can be used to display select notification errors with a query similar to the example below. The `instance_type` label of `alerts` is what selects the Grafana Cloud Alertmanager logs.
-
-```sql
-{instance_type="alerts"} | logfmt | level="warn"
-```
diff --git a/docs/sources/alerting/set-up/migrating-alerts/legacy-alerting/grafana-cloud-alerting/create-edit-rules.md b/docs/sources/alerting/set-up/migrating-alerts/legacy-alerting/grafana-cloud-alerting/create-edit-rules.md
deleted file mode 100644
index ca30aa8652288..0000000000000
--- a/docs/sources/alerting/set-up/migrating-alerts/legacy-alerting/grafana-cloud-alerting/create-edit-rules.md
+++ /dev/null
@@ -1,65 +0,0 @@
----
-aliases:
-  - /docs/grafana-cloud/alerts/grafana-cloud-alerting/create-edit-rules/
-  - /docs/grafana-cloud/how-do-i/grafana-cloud-alerting/create-edit-rules/
-  - /docs/grafana-cloud/legacy-alerting/grafana-cloud-alerting/create-edit-rules/
-canonical: https://grafana.com/docs/grafana/latest/alerting/set-up/migrating-alerts/legacy-alerting/grafana-cloud-alerting/create-edit-rules/
-description: Create and edit alert rules
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Create and edit alert rules
-weight: 200
----
-
-# Create and edit alert rules
-
-Creating alerts in Grafana Cloud differs from creating alerts directly with Prometheus or Loki. While the rule format is the same, everything is done in the Grafana Cloud Alerting interface, rather than with configuration files.
-
-{{% admonition type="note" %}}
-Only organization Admins can create or edit alert rules.
-{{% /admonition %}}
-
-## Create an alert rule
-
-1. In Grafana, hover your cursor over the **Grafana Cloud Alerting** icon and then click **Alerts and rules**.
-1. If you have more than one Prometheus or Loki data source, there will be a dropdown at the top for you to select the data source to create or edit rules.
-1. Click **Edit rules**.
-1. Click **Add rule**.
-
-Grafana creates a new rule with placeholders.
-
-```
-alert: ""
-expr: ""
-```
-
-Enter text according to regular Prometheus rule configuration guidelines:
-
-- [Recording rules](https://prometheus.io/docs/prometheus/latest/configuration/recording_rules/)
-- [Alerting rules](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/)
-
-{{% admonition type="note" %}}
-Grafana Cloud Alerting does not support comments.
-{{% /admonition %}}
-
-When you are finished, click **Save**. You can then repeat the process to create more rules or click **Finish editing** to return to the rules list.
-
-## Edit an alert rule
-
-1. In Grafana, hover your cursor over the **Grafana Cloud Alerting** icon and then click **Alerts and rules**.
-1. If you have more than one Prometheus or Loki data source, there will be a dropdown at the top for you to select the data source to create or edit rules.
-1. Click **Edit rules**.
-1. Scroll down to the rule that you want to edit and then click **Edit**.
-1. Make any necessary changes to the rule text and then click **Save**.
-1. Click **Finish editing** to return to the rules list.
-
-## Delete an alert rule
-
-1. In Grafana, hover your cursor over the **Grafana Cloud Alerting** icon and then click **Alerts and rules**.
-1. If you have more than one Prometheus or Loki data source, there will be a dropdown at the top for you to select the data source to create or edit rules.
-1. Click **Edit rules**.
-1. Scroll down to the rule that you want to edit and then click **Delete**.
-1. Click **Finish editing** to return to the rules list.
diff --git a/docs/sources/alerting/set-up/migrating-alerts/legacy-alerting/grafana-cloud-alerting/namespaces-and-groups.md b/docs/sources/alerting/set-up/migrating-alerts/legacy-alerting/grafana-cloud-alerting/namespaces-and-groups.md
deleted file mode 100644
index 0602b06995f60..0000000000000
--- a/docs/sources/alerting/set-up/migrating-alerts/legacy-alerting/grafana-cloud-alerting/namespaces-and-groups.md
+++ /dev/null
@@ -1,56 +0,0 @@
----
-aliases:
-  - /docs/grafana-cloud/alerts/grafana-cloud-alerting/namespaces-and-groups/
-  - /docs/grafana-cloud/how-do-i/grafana-cloud-alerting/namespaces-and-groups/
-  - /docs/grafana-cloud/legacy-alerting/grafana-cloud-alerting/namespaces-and-groups/
-canonical: https://grafana.com/docs/grafana/latest/alerting/set-up/migrating-alerts/legacy-alerting/grafana-cloud-alerting/namespaces-and-groups/
-description: Namespaces and rule groups
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Namespaces and rule groups
-weight: 400
----
-
-# Namespaces and rule groups
-
-By default, all alerting and recording rules created in Grafana Cloud Alerting will default to a single namespace and a single rule group.
-
-## Managing namespaces
-
-While Grafana Cloud Alerting does support viewing multiple namespaces that have been added through the mimirtool, it is currently not possible to add new namespaces or to rename the existing ones.
-
-## Managing rule groups
-
-Rule groups can be managed directly within the Grafana Cloud Alerting interface or through the mimirtool, similar to managing namespaces.
-
-{{% admonition type="note" %}}
-By default, Grafana Cloud limits the number of rule groups to 20, with a limit of up to 15 rules per group. If you wish to increase the default limits, please [open a support ticket](/profile/org#support) or reach out to your account manager.
-{{% /admonition %}}
-
-### Create a new rule group:
-
-1. In Grafana, hover your cursor over the **Grafana Cloud Alerting** icon and then click **Alerts and rules**.
-2. If you have more than one Prometheus or Loki data source, there will be a dropdown at the top for you to select the data source to create or edit rules.
-3. Click **Create new rule group**.
-4. Enter text to name your new rule group.
-5. Enter text for the new rule in your new rule group, according to regular Prometheus rule configuration guidelines:
-
-- [Recording rules](https://prometheus.io/docs/prometheus/latest/configuration/recording_rules/)
-- [Alerting rules](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/)
-
-6. When you are finished naming your new rule group and adding new rule details, click **Save**.
-
-{{% admonition type="note" %}}
-In order to create a new rule group, you must also create a new rule for it.
-{{% /admonition %}}
-
-### Update a rule group
-
-Existing rule groups can be renamed by selecting the **pencil** icon next to the rule group name.
-
-### Delete a rule group
-
-Rule groups will be automatically deleted once the all rules within a group are deleted.
diff --git a/docs/sources/alerting/set-up/migrating-alerts/legacy-alerting/grafana-cloud-alerting/silences.md b/docs/sources/alerting/set-up/migrating-alerts/legacy-alerting/grafana-cloud-alerting/silences.md
deleted file mode 100644
index 83a98d672c676..0000000000000
--- a/docs/sources/alerting/set-up/migrating-alerts/legacy-alerting/grafana-cloud-alerting/silences.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-aliases:
-  - /docs/grafana-cloud/alerts/grafana-cloud-alerting/silences/
-  - /docs/grafana-cloud/how-do-i/grafana-cloud-alerting/silences/
-  - /docs/grafana-cloud/legacy-alerting/grafana-cloud-alerting/silences/
-canonical: https://grafana.com/docs/grafana/latest/alerting/set-up/migrating-alerts/legacy-alerting/grafana-cloud-alerting/silences/
-description: Silences
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Silences
-weight: 600
----
-
-# Silences
-
-Grafana Cloud Alerting allows you to manage silences for your alertmanager notifications directly inside of Grafana. This applies to alerting rules created for both Prometheus metrics and Loki logs.
-
-## Create a silence
-
-1. In Grafana, hover your cursor over the **Grafana Cloud Alerting** icon and then click **Silences**.
-2. Click **New silence**.
-3. Enter a date in **Start of silence** to indicate when the silence should go into effect.
-4. Enter a date in **End of silence** to indicate when the silence should expire.
-5. Enter one or more matchers by filling out the **Name** and **Value** fields. Matchers determine which rules the silence will apply to.
-6. Enter the name of the owner in **Creator**.
-7. Enter a **Comment**.
-8. To view which rules will be affected by your silence, click **Preview alerts**.
-9. Otherwise, when you are finished, click **Create**
-
-## Update an existing silence
-
-You can always update an existing silence by clicking the **Edit silence** button under the silence.
-
-It is also possible to expire a silence, on-demand, by clicking the **Expire silence** button under the silence. This will override the original scheduled expiration date of the silence.
diff --git a/docs/sources/alerting/set-up/migrating-alerts/legacy-alerting/grafana-cloud-alerting/view-filter-rules.md b/docs/sources/alerting/set-up/migrating-alerts/legacy-alerting/grafana-cloud-alerting/view-filter-rules.md
deleted file mode 100644
index 999cee1f7ef16..0000000000000
--- a/docs/sources/alerting/set-up/migrating-alerts/legacy-alerting/grafana-cloud-alerting/view-filter-rules.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-aliases:
-  - /docs/grafana-cloud/alerts/grafana-cloud-alerting/view-filter-rules/
-  - /docs/grafana-cloud/how-do-i/grafana-cloud-alerting/view-filter-alerts/
-  - /docs/grafana-cloud/legacy-alerting/grafana-cloud-alerting/view-filter-rules/
-canonical: https://grafana.com/docs/grafana/latest/alerting/set-up/migrating-alerts/legacy-alerting/grafana-cloud-alerting/view-filter-rules/
-description: View and filter alert rules
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: View and filter alert rules
-weight: 300
----
-
-# View and filter alert rules
-
-Grafana Cloud Alerting displays a list of all recording and alerting rules assigned to a selected data source in the Alerts and rules tab.
-
-All members of an organization that have access to a particular data source can view the list of rules and filter or reorder their view.
-
-## View alert rules
-
-1. Hover your cursor over the **Grafana Cloud Alerting** icon (alarm bell with Prometheus logo) and then click **Alerts and rules**.
-1. In the list at the top of the tab, select the data source for which you want to view rules.
-
-Grafana displays rules according to rule groups. If your instance has added namespaces and alert groups, then they will be ordered alphabetically. Otherwise, you will have one namespace called `default` and an alert group called `rules`.
-
-If an alert is firing, then click the down carrot arrow to see additional information. The Label and annotations section appears.
-
-## Filter your alert rule view
-
-You can control which alerts you see and in what order they appear several ways. Combine different filters to personalize your view so that you can quickly find the information that you need.
-
-- **Filter by alert state -** Click the toggles to show or hide alerts in different states. Turn off the toggle to hide alerts matching the state.
-- **Filter by rule type -** Click the toggles to show or hide alerting rules or recording rules.
-- **View options -** Click the toggle to show or hide the Prometheus annotations shown in the Labels and annotations section.
-- **Rule sorting -** Click an option to sort alert rules within each rule group.
-  - **None -** No special sort is applied and sorts as if in a file, ordered according to the editing list order.
-  - **A-Z -** Sorts rules alphabetically according to the rule name.
-  - **Alert state -** Sorts rules according to the alert state (Firing, Pending, or Inactive).
-
-## View alert in Explore
-
-Click **View in Explore** or click the `expr` link to open the `expr` in [Explore][explore].
-
-> **Note:** Only users with Admin or Editor roles in an organization can use the Explore feature unless the viewers can edit.
-
-{{% docs/reference %}}
-[explore]: "/docs/grafana -> /docs/grafana/<GRAFANA VERSION>/explore"
-[explore]: "/docs/grafana-cloud/-> /docs/grafana/<GRAFANA VERSION>/explore"
-{{% /docs/reference %}}
diff --git a/docs/sources/alerting/set-up/performance-limitations/index.md b/docs/sources/alerting/set-up/performance-limitations/index.md
index 97e2fd52b5929..5cd9a89446210 100644
--- a/docs/sources/alerting/set-up/performance-limitations/index.md
+++ b/docs/sources/alerting/set-up/performance-limitations/index.md
@@ -1,9 +1,9 @@
 ---
 aliases:
-  - alerting-limitations/
-  - alerting/performance-limitations/
+  - ./alerting-limitations/ # /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/alerting-limitations/
+  - ../../alerting/performance-limitations/ # /docs/grafana/<GRAFANA_VERSION>/alerting/performance-limitations/
 canonical: https://grafana.com/docs/grafana/latest/alerting/set-up/performance-limitations/
-description: Performance considerations and limitations
+description: Learn about performance considerations and limitations
 keywords:
   - grafana
   - alerting
@@ -54,4 +54,16 @@ Grafana cannot be used to receive external alerts. You can only send alerts to t
 
 You have the option to send Grafana managed alerts to an external Alertmanager, you can find this option in the admin tab on the Alerting page.
 
-For more information, refer to [this GitHub discussion](https://github.com/grafana/grafana/discussions/45773).
+For more information, refer to [this GitHub issue](https://github.com/grafana/grafana/issues/73447).
+
+## High load on database caused by a high number of alert instances
+
+If you have a high number of alert instances, it can happen that the load on the database gets very high, as each state
+transition of an alert instance will be saved in the database.
+
+This can be prevented by writing to the database periodically. For this the feature flag `alertingSaveStatePeriodic` needs
+to be enabled. By default it will save the states every 5 minutes to the database and on each shutdown. The periodic interval
+can also be configured using the `state_periodic_save_interval` configuration flag.
+
+The time it takes to write to the database periodically can be monitored using the `state_full_sync_duration_seconds` metric
+that is exposed by Grafana.
diff --git a/docs/sources/alerting/set-up/provision-alerting-resources/_index.md b/docs/sources/alerting/set-up/provision-alerting-resources/_index.md
index 8ca675a7c11d3..518450be1a509 100644
--- a/docs/sources/alerting/set-up/provision-alerting-resources/_index.md
+++ b/docs/sources/alerting/set-up/provision-alerting-resources/_index.md
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - ../provision-alerting-resources/
 canonical: https://grafana.com/docs/grafana/latest/alerting/set-up/provision-alerting-resources/
 description: Provision alerting resources
 keywords:
@@ -14,40 +12,68 @@ labels:
     - cloud
     - enterprise
     - oss
-title: Provision Grafana Alerting resources
+title: Provision Alerting resources
 weight: 300
 ---
 
-# Provision Grafana Alerting resources
+# Provision Alerting resources
 
-Alerting infrastructure is often complex, with many pieces of the pipeline that often live in different places. Scaling this across multiple teams and organizations is an especially challenging task. Grafana Alerting provisioning makes this process easier by enabling you to create, manage, and maintain your alerting data in a way that best suits your organization.
+Alerting infrastructure is often complex, with many pieces of the pipeline that often live in different places. Scaling this across multiple teams and organizations is an especially challenging task. Importing and exporting (or provisioning) your alerting resources in Grafana Alerting makes this process easier by enabling you to create, manage, and maintain your alerting data in a way that best suits your organization.
 
-There are three options to choose from:
+You can import alert rules, contact points, notification policies, mute timings, and templates.
 
-1. Use file provisioning to provision your Grafana Alerting resources, such as alert rules and contact points, through files on disk.
+You cannot edit imported alerting resources in the Grafana UI in the same way as alerting resources that were not imported. You can only edit imported contact points, notification policies, templates, and mute timings in the source where they were created. For example, if you manage your alerting resources using files from disk, you cannot edit the data in Terraform or from within Grafana.
 
-1. Provision your alerting resources using the Alerting Provisioning HTTP API.
+## Import alerting resources
 
-   For more information on the Alerting Provisioning HTTP API, refer to [Alerting provisioning HTTP API][alerting_provisioning].
+Choose from the options below to import (or provision) your Grafana Alerting resources.
 
-1. {{% admonition type="note" %}}
-   If you are using Open Source, you can provision your alerting resources using [Terraform](https://www.terraform.io/).
-   {{% /admonition %}}
+1. [Use configuration files to provision your alerting resources][alerting_file_provisioning], such as alert rules and contact points, through files on disk.
 
-**Note:**
+   {{< admonition type="note" >}}
 
-Currently, provisioning for Grafana Alerting supports alert rules, contact points, notification policies, mute timings, and templates. Provisioned alerting resources using file provisioning or Terraform can only be edited in the source that created them and not from within Grafana or any other source. For example, if you provision your alerting resources using files from disk, you cannot edit the data in Terraform or from within Grafana.
+   - You cannot edit provisioned resources from files in the Grafana UI.
+   - Provisioning with configuration files is not available in Grafana Cloud.
+     {{< /admonition >}}
 
-**Useful Links:**
+1. Use [Terraform to provision alerting resources][alerting_tf_provisioning].
 
-[Grafana provisioning][provisioning]
+1. Use the [Alerting provisioning HTTP API][alerting_http_provisioning] to manage alerting resources.
 
-[Grafana Alerting provisioning API][alerting_provisioning]
+   {{< admonition type="note" >}}
+   The JSON output from the majority of Alerting HTTP endpoints isn't compatible for provisioning via configuration files.
+
+   If you need the alerting resources for file provisioning, use [Export Alerting endpoints](/docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/export-alerting-resources#export-api-endpoints) to return or download them in provisioning format.
+   {{< /admonition >}}
+
+## Export alerting resources
+
+You can export both manually created and provisioned alerting resources. You can also edit and export an alert rule without applying the changes.
+
+For detailed instructions on the various export options, refer to [Export alerting resources][alerting_export].
+
+## View provisioned alerting resources
+
+To view your provisioned resources in Grafana, complete the following steps.
+
+1. Open your Grafana instance.
+1. Navigate to Alerting.
+1. Click an alerting resource folder, for example, Alert rules.
+
+Provisioned resources are labeled **Provisioned**, so that it is clear that they were not created manually.
 
 {{% docs/reference %}}
-[alerting_provisioning]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/developers/http_api/alerting_provisioning"
-[alerting_provisioning]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/developers/http_api/alerting_provisioning"
+[alerting_tf_provisioning]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/terraform-provisioning"
+[alerting_tf_provisioning]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/provision-alerting-resources/terraform-provisioning"
+[alerting_http_provisioning]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/http-api-provisioning"
+[alerting_http_provisioning]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/provision-alerting-resources/http-api-provisioning"
+[alerting_export]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/export-alerting-resources"
+[alerting_export]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/provision-alerting-resources/export-alerting-resources"
+
+[alerting_export_http]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/export-alerting-resources#export-api-endpoints"
+[alerting_export_http]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/provision-alerting-resources/export-alerting-resources#export-api-endpoints"
+
+[alerting_file_provisioning]: "/docs/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/file-provisioning"
 
-[provisioning]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/administration/provisioning"
-[provisioning]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/administration/provisioning"
+[provisioning]: "/docs/ -> /docs/grafana/<GRAFANA_VERSION>/administration/provisioning"
 {{% /docs/reference %}}
diff --git a/docs/sources/alerting/set-up/provision-alerting-resources/export-alerting-resources/index.md b/docs/sources/alerting/set-up/provision-alerting-resources/export-alerting-resources/index.md
new file mode 100644
index 0000000000000..4a73fdede685b
--- /dev/null
+++ b/docs/sources/alerting/set-up/provision-alerting-resources/export-alerting-resources/index.md
@@ -0,0 +1,213 @@
+---
+aliases:
+  - ../../provision-alerting-resources/view-provisioned-resources/ # /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/view-provisioned-resources/
+canonical: https://grafana.com/docs/grafana/latest/alerting/set-up/provision-alerting-resources/export-alerting-resources/
+description: Export alerting resources in Grafana
+keywords:
+  - grafana
+  - alerting
+  - alerting resources
+  - provisioning
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Export alerting resources
+weight: 300
+---
+
+# Export alerting resources
+
+Export your alerting resources, such as alert rules, contact points, and notification policies for provisioning, automatically importing single folders and single groups.
+
+There are distinct methods to export your alerting resources:
+
+- [Grafana UI](#export-from-the-grafana-ui) exports in Terraform format and YAML or JSON formats for file provisioning.
+- [HTTP Alerting API](#http-alerting-api) exports in JSON API format used by the HTTP Alerting API.
+- [HTTP Alerting API - Export endpoints](#export-api-endpoints) exports in YAML or JSON formats for file provisioning.
+
+{{< admonition type="note" >}}
+Alerting resources imported through [file provisioning](/docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/file-provisioning) cannot be edited in the Grafana UI. This prevents changes made in the UI from being overridden by file provisioning during Grafana restarts.
+
+If you need to modify provisioned alerting resources in Grafana, refer to [edit HTTP API alerting resources in the Grafana UI](/docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/http-api-provisioning#edit-resources-in-the-grafana-ui) or to [edit Terraform alerting resources in the Grafana UI](/docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/terraform-provisioning#enable-editing-resources-in-the-grafana-ui).
+{{< /admonition >}}
+
+## Export from the Grafana UI
+
+The export options listed below enable you to download resources in YAML, JSON, or Terraform format, facilitating their provisioning through [configuration files][alerting_file_provisioning] or [Terraform][alerting_tf_provisioning].
+
+### Export alert rules
+
+To export alert rules from the Grafana UI, complete the following steps.
+
+1. Click **Alerts & IRM** -> **Alert rules**.
+1. To export all Grafana-managed rules, click **Export rules**.
+1. To export a folder, change the **View as** to **List**.
+1. Select the folder you want to export and click the **Export rules folder** icon.
+1. To export a group, change the **View as** to **Grouped**.
+1. Find the group you want to export and click the **Export rule group** icon.
+1. Choose the format to export in.
+
+   The exported alert rule data appears in different formats - YAML, JSON, Terraform.
+
+1. Click **Copy Code** or **Download**.
+
+### Modify alert rule and export rule group without saving changes
+
+{{% admonition type="note" %}} This feature is for Grafana-managed alert rules only. It is available to Admin, Viewer, and Editor roles. {{% /admonition %}}
+
+Use the **Modify export** mode to edit and export an alert rule without updating it. The exported data includes all alert rules within the same alert group.
+
+To export a modified alert rule without saving the modifications, complete the following steps from the Grafana UI.
+
+1. Click **Alerts & IRM** -> **Alert rules**.
+1. Locate the alert rule you want to edit and click **More** -> **Modify Export** to open the Alert Rule form.
+1. From the Alert Rule form, edit the fields you want to change. Changes made are not applied to the alert rule.
+1. Click **Export**.
+1. Choose the format to export in.
+
+   The exported alert rule group appears in different formats - YAML, JSON, Terraform.
+
+1. Click **Copy Code** or **Download**.
+
+### Export contact points
+
+To export contact points from the Grafana UI, complete the following steps.
+
+1. Click **Alerts & IRM** -> **Contact points**.
+1. Find the contact point you want to export and click **More** -> **Export**.
+1. Choose the format to export in.
+
+   The exported contact point appears in different formats - YAML, JSON, Terraform.
+
+1. Click **Copy Code** or **Download**.
+
+### Export templates
+
+Grafana currently doesn't offer an Export UI or [Export endpoint](#export-api-endpoints) for notification templates, unlike other Alerting resources presented in this documentation.
+
+However, you can export it by manually copying the content template and title directly from the Grafana UI.
+
+1. Click **Alerts & IRM** -> **Contact points** -> **Notification templates** tab.
+1. Find the template you want to export.
+1. Copy the content and title.
+1. Adjust it for the [file provisioning format][alerting_file_provisioning_template] or [Terraform resource][alerting_tf_provisioning_template].
+
+### Export the notification policy tree
+
+All notification policies are provisioned through a single resource: the root of the notification policy tree.
+
+{{% admonition type="warning" %}}
+
+Since the policy tree is a single resource, provisioning it will overwrite a policy tree created through any other means.
+
+{{< /admonition >}}
+
+To export the notification policy tree from the Grafana UI, complete the following steps.
+
+1. Click **Alerts & IRM** -> **Notification policies**.
+1. In the **Default notification policy** section, click **...** -> **Export**.
+1. Choose the format to export in.
+
+   The exported contact point appears in different formats - YAML, JSON, Terraform.
+
+1. Click **Copy Code** or **Download**.
+
+### Export mute timings
+
+To export mute timings from the Grafana UI, complete the following steps.
+
+1. Click **Alerts & IRM** -> **Notification policies**, and then the **Mute timings** tab.
+1. Find the mute timing you want to export and click **Export**.
+1. Choose the format to export in.
+
+   The exported contact point appears in different formats - YAML, JSON, Terraform.
+
+1. Click **Copy Code** or **Download**.
+
+## HTTP Alerting API
+
+You can use the [Alerting HTTP API][alerting_http_provisioning] to return existing alerting resources in JSON and import them to another Grafana instance using the same endpoint.
+
+| Resource                                                       | URI                                 |
+| -------------------------------------------------------------- | ----------------------------------- |
+| [Alert rules][alerting_http_alertrules]                        | /api/v1/provisioning/alert-rules    |
+| [Contact points][alerting_http_contactpoints]                  | /api/v1/provisioning/contact-points |
+| [Notification policy tree][alerting_http_notificationpolicies] | /api/v1/provisioning/policies       |
+| [Mute timings][alerting_http_mutetimings]                      | /api/v1/provisioning/mute-timings   |
+| [Templates][alerting_http_templates]                           | /api/v1/provisioning/templates      |
+
+However, note the standard endpoints return a JSON format that is not compatible for provisioning through configuration files or Terraform, except the `/export` endpoints listed below.
+
+### Export API endpoints
+
+The **Alerting HTTP API** provides specific endpoints for exporting alerting resources in YAML or JSON, facilitating [provisioning via configuration files][alerting_file_provisioning], or Terraform (HCL).
+
+| Resource                 | Method / URI                                                         | Summary                                                                                  |
+| ------------------------ | -------------------------------------------------------------------- | ---------------------------------------------------------------------------------------- |
+| Alert rules              | GET /api/v1/provisioning/alert-rules/export                          | [Export all alert rules in provisioning file format.][export_rules]                      |
+| Alert rules              | GET /api/v1/provisioning/folder/:folderUid/rule-groups/:group/export | [Export an alert rule group in provisioning file format.][export_rule_group]             |
+| Alert rules              | GET /api/v1/provisioning/alert-rules/:uid/export                     | [Export an alert rule in provisioning file format.][export_rule]                         |
+| Contact points           | GET /api/v1/provisioning/contact-points/export                       | [Export all contact points in provisioning file format.][export_contacts]                |
+| Notification policy tree | GET /api/v1/provisioning/policies/export                             | [Export the notification policy tree in provisioning file format.][export_notifications] |
+| Mute timings             | GET /api/v1/provisioning/mute-timings/export                         | [Export all mute timings in provisioning file format.][export_mute_timings]              |
+| Mute timings             | GET /api/v1/provisioning/mute-timings/:name/export                   | [Export a mute timing in provisioning file format.][export_mute_timing]                  |
+
+These endpoints accept a `download` parameter to download a file containing the exported resources.
+
+<!-- prettier-ignore-start -->
+
+{{% docs/reference %}}
+
+[alerting_http_alertrules]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/http-api-provisioning#alert-rules"
+[alerting_http_alertrules]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/provision-alerting-resources/http-api-provisioning#alert-rules"
+
+[alerting_http_contactpoints]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/http-api-provisioning#contact-points"
+[alerting_http_contactpoints]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/provision-alerting-resources/http-api-provisioning#contact-points"
+
+[alerting_http_notificationpolicies]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/http-api-provisioning#notification-policies"
+[alerting_http_notificationpolicies]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/provision-alerting-resources/http-api-provisioning#notification-policies"
+
+[alerting_http_mutetimings]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/http-api-provisioning#mute-timings"
+[alerting_http_mutetimings]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/provision-alerting-resources/http-api-provisioning#mute-timings"
+
+[alerting_http_templates]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/http-api-provisioning#templates"
+[alerting_http_templates]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/provision-alerting-resources/http-api-provisioning#templates"
+
+[alerting_tf_provisioning]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/terraform-provisioning"
+[alerting_tf_provisioning]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/provision-alerting-resources/terraform-provisioning"
+
+[alerting_tf_provisioning_template]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/terraform-provisioning#import-contact-points-and-templates"
+[alerting_tf_provisioning_template]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/provision-alerting-resources/terraform-provisioning#import-contact-points-and-templates"
+
+[alerting_http_provisioning]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/http-api-provisioning"
+[alerting_http_provisioning]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/provision-alerting-resources/http-api-provisioning"
+
+[alerting_file_provisioning]: "/docs/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/file-provisioning"
+
+[alerting_file_provisioning_template]: "/docs/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/file-provisioning#import-templates"
+
+[export_rule]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/http-api-provisioning#span-idroute-get-alert-rule-exportspan-export-an-alert-rule-in-provisioning-file-format-_routegetalertruleexport_"
+[export_rule]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/http-api-provisioning#span-idroute-get-alert-rule-exportspan-export-an-alert-rule-in-provisioning-file-format-_routegetalertruleexport_"
+
+[export_rule_group]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/http-api-provisioning#span-idroute-get-alert-rule-group-exportspan-export-an-alert-rule-group-in-provisioning-file-format-_routegetalertrulegroupexport_"
+[export_rule_group]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/http-api-provisioning#span-idroute-get-alert-rule-group-exportspan-export-an-alert-rule-group-in-provisioning-file-format-_routegetalertrulegroupexport_"
+
+[export_rules]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/http-api-provisioning#span-idroute-get-alert-rules-exportspan-export-all-alert-rules-in-provisioning-file-format-_routegetalertrulesexport_"
+[export_rules]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/http-api-provisioning#span-idroute-get-alert-rules-exportspan-export-all-alert-rules-in-provisioning-file-format-_routegetalertrulesexport_"
+
+[export_contacts]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/http-api-provisioning#span-idroute-get-contactpoints-exportspan-export-all-contact-points-in-provisioning-file-format-_routegetcontactpointsexport_"
+[export_contacts]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/http-api-provisioning#span-idroute-get-contactpoints-exportspan-export-all-contact-points-in-provisioning-file-format-_routegetcontactpointsexport_"
+
+[export_mute_timing]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/http-api-provisioning#span-idroute-get-mute-timing-exportspan-export-a-mute-timing-in-provisioning-file-format-_routegetmutetimingexport_"
+[export_mute_timing]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/http-api-provisioning#span-idroute-get-mute-timing-exportspan-export-a-mute-timing-in-provisioning-file-format-_routegetmutetimingexport_"
+
+[export_mute_timings]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/http-api-provisioning#span-idroute-get-mute-timings-exportspan-export-all-mute-timings-in-provisioning-file-format-_routegetmutetimingsexport_"
+[export_mute_timings]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/http-api-provisioning#span-idroute-get-mute-timings-exportspan-export-all-mute-timings-in-provisioning-file-format-_routegetmutetimingsexport_"
+
+[export_notifications]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/http-api-provisioning#span-idroute-get-policy-tree-exportspan-export-the-notification-policy-tree-in-provisioning-file-format-_routegetpolicytreeexport_"
+[export_notifications]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/http-api-provisioning#span-idroute-get-policy-tree-exportspan-export-the-notification-policy-tree-in-provisioning-file-format-_routegetpolicytreeexport_"
+{{% /docs/reference %}}
+
+<!-- prettier-ignore-end -->
diff --git a/docs/sources/alerting/set-up/provision-alerting-resources/file-provisioning/index.md b/docs/sources/alerting/set-up/provision-alerting-resources/file-provisioning/index.md
index b9ca09e094654..245376f6efb8a 100644
--- a/docs/sources/alerting/set-up/provision-alerting-resources/file-provisioning/index.md
+++ b/docs/sources/alerting/set-up/provision-alerting-resources/file-provisioning/index.md
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - ../../provision-alerting-resources/file-provisioning/
 canonical: https://grafana.com/docs/grafana/latest/alerting/set-up/provision-alerting-resources/file-provisioning/
 description: Create and manage resources using file provisioning
 keywords:
@@ -11,41 +9,43 @@ keywords:
   - provisioning
 labels:
   products:
-    - cloud
     - enterprise
     - oss
-title: Create and manage alerting resources using file provisioning
+menuTitle: Use configuration files to provision
+title: Use configuration files to provision alerting resources
 weight: 100
 ---
 
-## Create and manage alerting resources using file provisioning
+# Use configuration files to provision alerting resources
 
-Provision your alerting resources using files from disk. When you start Grafana, the data from these files is created in your Grafana system. Grafana adds any new resources you created, updates any that you changed, and deletes old ones.
+Manage your alerting resources using configuration files that can be version controlled. When Grafana starts, it provisions the resources defined in your configuration files. [Provisioning][provisioning] can create, update, or delete existing resources in your Grafana instance.
 
-Arrange your files in a directory in a way that best suits your use case. For example, you can choose a team-based layout where every team has its own file, you can have one big file for all your teams; or you can have one file per resource type.
+This guide outlines the steps and references to provision alerting resources using YAML files. For a practical demo, you can clone and try [this example using Grafana OSS and Docker Compose](https://github.com/grafana/provisioning-alerting-examples/tree/main/config-files).
 
-Details on how to set up the files and which fields are required for each object are listed below depending on which resource you are provisioning.
+{{< admonition type="note" >}}
+
+- [Provisioning Grafana](/docs/grafana/<GRAFANA_VERSION>/administration/provisioning) with configuration files is not available in Grafana Cloud.
 
-**Note:**
+- You cannot edit provisioned resources from files in Grafana. You can only change the resource properties by changing the provisioning file and restarting Grafana or carrying out a hot reload. This prevents changes being made to the resource that would be overwritten if a file is provisioned again or a hot reload is carried out.
 
-Provisioning takes place during the initial set up of your Grafana system, but you can re-run it at any time using the [Grafana Admin API][reload-provisioning-configurations].
+- Provisioning using configuration files takes place during the initial set up of your Grafana system, but you can re-run it at any time using the [Grafana Admin API](/docs/grafana/<GRAFANA_VERSION>/developers/http_api/admin#reload-provisioning-configurations).
 
-### Provision alert rules
+- Importing an existing alerting resource results in a conflict. First, when present, remove the resources you plan to import.
+  {{< /admonition >}}
 
-Create or delete alert rules in your Grafana instance(s).
+Details on how to set up the files and which fields are required for each object are listed below depending on which resource you are provisioning.
 
-1. Create alert rules in Grafana.
-1. Use the [Alerting provisioning API][alerting_provisioning] export endpoints to download a provisioning file for your alert rules.
-1. Copy the contents into a YAML or JSON configuration file in the default provisioning directory or in your configured directory.
+## Import alert rules
 
-   Example configuration files can be found below.
+Create or delete alert rules using provisioning files in your Grafana instance(s).
 
-1. Ensure that your files are in the right directory on the node running the Grafana server, so that they deploy alongside your Grafana instance(s).
-1. Delete the alert rules in Grafana that will be provisioned.
+1. Find the alert rule group in Grafana.
+1. [Export][export_alert_rules] and download a provisioning file for your alert rules.
+1. Copy the contents into a YAML or JSON configuration file and add it to the `provisioning/alerting` directory of the Grafana instance you want to import the alerting resources to.
 
-   **Note:**
+   Example configuration files can be found below.
 
-   If you do not delete the alert rule, it will clash with the provisioned alert rule once uploaded.
+1. Restart your Grafana instance (or reload the provisioned files using the Admin API).
 
 Here is an example of a configuration file for creating alert rules.
 
@@ -108,6 +108,7 @@ groups:
         # <string> the state the alert rule will have when the query execution
         #          failed - possible values: "Error", "Alerting", "OK"
         #          default = Alerting
+        execErrState: Alerting
         # <duration, required> for how long should the alert fire before alerting
         for: 60s
         # <map<string, string>> a map of strings to pass around any data
@@ -133,17 +134,17 @@ deleteRules:
     uid: my_id_1
 ```
 
-### Provision contact points
+## Import contact points
 
-Create or delete contact points in your Grafana instance(s).
+Create or delete contact points using provisioning files in your Grafana instance(s).
 
-1. Create a contact point in Grafana.
-1. Use the [Alerting provisioning API][alerting_provisioning] export endpoints to download a provisioning file for your contact point.
-1. Copy the contents into a YAML or JSON configuration file in the default provisioning directory or in your configured directory.
+1. Find the contact point in Grafana.
+1. [Export][export_contact_points] and download a provisioning file for your contact point.
+1. Copy the contents into a YAML or JSON configuration file and add it to the `provisioning/alerting` directory of the Grafana instance you want to import the alerting resources to.
 
    Example configuration files can be found below.
 
-1. Ensure that your files are in the right directory on the node running the Grafana server, so that they deploy alongside your Grafana instance(s).
+1. Restart your Grafana instance (or reload the provisioned files using the Admin API).
 
 Here is an example of a configuration file for creating contact points.
 
@@ -183,12 +184,14 @@ deleteContactPoints:
     uid: first_uid
 ```
 
-#### Settings
+### Settings
 
 Here are some examples of settings you can use for the different
 contact point integrations.
 
-##### Alertmanager
+{{< collapse title="Alertmanager" >}}
+
+#### Alertmanager
 
 ```yaml
 type: prometheus-alertmanager
@@ -201,7 +204,11 @@ settings:
   basicAuthPassword: abc123
 ```
 
-##### DingDing
+{{< /collapse >}}
+
+{{< collapse title="DingDing" >}}
+
+#### DingDing
 
 ```yaml
 type: dingding
@@ -215,7 +222,11 @@ settings:
     {{ template "default.message" . }}
 ```
 
-##### Discord
+{{< /collapse >}}
+
+{{< collapse title="Discord" >}}
+
+#### Discord
 
 ```yaml
 type: discord
@@ -231,7 +242,11 @@ settings:
     {{ template "default.message" . }}
 ```
 
-##### E-Mail
+{{< /collapse >}}
+
+{{< collapse title="E-Mail" >}}
+
+#### E-Mail
 
 ```yaml
 type: email
@@ -247,7 +262,11 @@ settings:
     {{ template "default.title" . }}
 ```
 
-##### Google Chat
+{{< /collapse >}}
+
+{{< collapse title="Google Chat" >}}
+
+#### Google Chat
 
 ```yaml
 type: googlechat
@@ -259,7 +278,11 @@ settings:
     {{ template "default.message" . }}
 ```
 
-##### Kafka
+{{< /collapse >}}
+
+{{< collapse title="Kafka" >}}
+
+#### Kafka
 
 ```yaml
 type: kafka
@@ -270,7 +293,11 @@ settings:
   kafkaTopic: topic1
 ```
 
-##### LINE
+{{< /collapse >}}
+
+{{< collapse title="LINE" >}}
+
+#### LINE
 
 ```yaml
 type: line
@@ -279,7 +306,11 @@ settings:
   token: xxx
 ```
 
-##### Microsoft Teams
+{{< /collapse >}}
+
+{{< collapse title="Microsoft Teams" >}}
+
+#### Microsoft Teams
 
 ```yaml
 type: teams
@@ -296,7 +327,11 @@ settings:
     {{ template "default.message" . }}
 ```
 
-##### OpsGenie
+{{< /collapse >}}
+
+{{< collapse title="OpsGenie" >}}
+
+#### OpsGenie
 
 ```yaml
 type: opsgenie
@@ -318,7 +353,11 @@ settings:
   sendTagsAs: both
 ```
 
-##### PagerDuty
+{{< /collapse >}}
+
+{{< collapse title="PagerDuty" >}}
+
+#### PagerDuty
 
 ```yaml
 type: pagerduty
@@ -338,7 +377,11 @@ settings:
     {{ template "default.message" . }}
 ```
 
-##### Pushover
+{{< /collapse >}}
+
+{{< collapse title="Pushover" >}}
+
+#### Pushover
 
 ```yaml
 type: pushover
@@ -355,6 +398,8 @@ settings:
   retry: '30'
   # <string>
   expire: '120'
+  # <string> the number of seconds before a message expires and is deleted automatically. Examples: 10s, 5m30s, 8h.
+  ttl:
   # <string>
   sound: siren
   # <string>
@@ -364,7 +409,11 @@ settings:
     {{ template "default.message" . }}
 ```
 
-##### Slack
+{{< /collapse >}}
+
+{{< collapse title="Slack" >}}
+
+#### Slack
 
 ```yaml
 type: slack
@@ -396,7 +445,11 @@ settings:
     {{ template "slack.default.text" . }}
 ```
 
-##### Sensu Go
+{{< /collapse >}}
+
+{{< collapse title="Sensu Go" >}}
+
+#### Sensu Go
 
 ```yaml
 type: sensugo
@@ -418,7 +471,11 @@ settings:
     {{ template "default.message" . }}
 ```
 
-##### Telegram
+{{< /collapse >}}
+
+{{< collapse title="Telegram" >}}
+
+#### Telegram
 
 ```yaml
 type: telegram
@@ -432,7 +489,11 @@ settings:
     {{ template "default.message" . }}
 ```
 
-##### Threema Gateway
+{{< /collapse >}}
+
+{{< collapse title="Threema Gateway" >}}
+
+#### Threema Gateway
 
 ```yaml
 type: threema
@@ -445,7 +506,11 @@ settings:
   recipient_id: A9R4KL4S
 ```
 
-##### VictorOps
+{{< /collapse >}}
+
+{{< collapse title="VictorOps" >}}
+
+#### VictorOps
 
 ```yaml
 type: victorops
@@ -456,7 +521,11 @@ settings:
   messageType: CRITICAL
 ```
 
-##### Webhook
+{{< /collapse >}}
+
+{{< collapse title="Webhook" >}}
+
+#### Webhook
 
 ```yaml
 type: webhook
@@ -477,7 +546,11 @@ settings:
   maxAlerts: '10'
 ```
 
-##### WeCom
+{{< /collapse >}}
+
+{{< collapse title="WeCom" >}}
+
+#### WeCom
 
 ```yaml
 type: wecom
@@ -492,17 +565,72 @@ settings:
     {{ template "default.title" . }}
 ```
 
-### Provision notification policies
+{{< /collapse >}}
+
+## Import templates
+
+Create or delete templates using provisioning files in your Grafana instance(s).
+
+1. Find the notification template in Grafana.
+1. [Export][export_templates] a template by copying the template content and title.
+1. Copy the contents into a YAML or JSON configuration file and add it to the `provisioning/alerting` directory of the Grafana instance you want to import the alerting resources to.
+
+   Example configuration files can be found below.
+
+1. Restart your Grafana instance (or reload the provisioned files using the Admin API).
+
+Here is an example of a configuration file for creating templates.
+
+```yaml
+# config file version
+apiVersion: 1
+
+# List of templates to import or update
+templates:
+  # <int> organization ID, default = 1
+  - orgId: 1
+    # <string, required> name of the template, must be unique
+    name: my_first_template
+    # <string, required> content of the template
+    template: |
+      {{ define "my_first_template" }}
+        Custom notification message
+      {{ end }}
+```
+
+Here is an example of a configuration file for deleting templates.
+
+```yaml
+# config file version
+apiVersion: 1
+
+# List of alert rule UIDs that should be deleted
+deleteTemplates:
+  # <int> organization ID, default = 1
+  - orgId: 1
+    # <string, required> name of the template, must be unique
+    name: my_first_template
+```
+
+## Import notification policies
+
+Create or reset the notification policy tree using provisioning files in your Grafana instance(s).
+
+In Grafana, the entire notification policy tree is considered a single, large resource. Add new specific policies as sub-policies under the root policy. Since specific policies may depend on each other, you cannot provision subsets of the policy tree; the entire tree must be defined in a single place.
+
+{{% admonition type="warning" %}}
 
-Create or reset the notification policy tree in your Grafana instance(s).
+Since the policy tree is a single resource, provisioning it will overwrite a policy tree created through any other means.
 
-1. Create a notification policy in Grafana.
-1. Use the [Alerting provisioning API][alerting_provisioning] export endpoints to download a provisioning file for your notification policy.
-1. Copy the contents into a YAML or JSON configuration file in the default provisioning directory or in your configured directory.
+{{< /admonition >}}
+
+1. Find the notification policy tree in Grafana.
+1. [Export][export_policies] and download a provisioning file for your notification policy tree.
+1. Copy the contents into a YAML or JSON configuration file and add it to the `provisioning/alerting` directory of the Grafana instance you want to import the alerting resources to.
 
    Example configuration files can be found below.
 
-1. Ensure that your files are in the right directory on the node running the Grafana server, so that they deploy alongside your Grafana instance(s).
+1. Restart your Grafana instance (or reload the provisioned files using the Admin API).
 
 Here is an example of a configuration file for creating notification policies.
 
@@ -578,61 +706,17 @@ resetPolicies:
   - 1
 ```
 
-**Note:**
-
-In Grafana, the entire notification policy tree is considered a single, large resource. Add new specific policies as sub-policies under the root policy. Since specific policies may depend on each other, you cannot provision subsets of the policy tree; the entire tree must be defined in a single place.
-
-Since the policy tree is a single resource, applying it will overwrite a policy tree created through any other means.
+## Import mute timings
 
-### Provision templates
+Create or delete mute timings via provisioning files using provisioning files in your Grafana instance(s).
 
-Create or delete templates in your Grafana instance(s).
-
-1. Create a YAML or JSON configuration file.
+1. Find the mute timing in Grafana.
+1. [Export][export_mute_timings] and download a provisioning file for your mute timing.
+1. Copy the contents into a YAML or JSON configuration file and add it to the `provisioning/alerting` directory of the Grafana instance you want to import the alerting resources to.
 
    Example configuration files can be found below.
 
-2. Add the file(s) to your GitOps workflow, so that they deploy alongside your Grafana instance(s).
-
-Here is an example of a configuration file for creating templates.
-
-```yaml
-# config file version
-apiVersion: 1
-
-# List of templates to import or update
-templates:
-  # <int> organization ID, default = 1
-  - orgID: 1
-    # <string, required> name of the template, must be unique
-    name: my_first_template
-    # <string, required> content of the the template
-    template: Alerting with a custom text template
-```
-
-Here is an example of a configuration file for deleting templates.
-
-```yaml
-# config file version
-apiVersion: 1
-
-# List of alert rule UIDs that should be deleted
-deleteTemplates:
-  # <int> organization ID, default = 1
-  - orgId: 1
-    # <string, required> name of the template, must be unique
-    name: my_first_template
-```
-
-### Provision mute timings
-
-Create or delete mute timings in your Grafana instance(s).
-
-1. Create a YAML or JSON configuration file.
-
-   Example configuration files can be found below.
-
-1. Add the file(s) to your GitOps workflow, so that they deploy alongside your Grafana instance(s).
+1. Restart your Grafana instance (or reload the provisioned files using the Admin API).
 
 Here is an example of a configuration file for creating mute timings.
 
@@ -652,7 +736,7 @@ muteTimes:
       - times:
           - start_time: '06:00'
             end_time: '23:59'
-            location: 'UTC'
+        location: 'UTC'
         weekdays: ['monday:wednesday', 'saturday', 'sunday']
         months: ['1:3', 'may:august', 'december']
         years: ['2020:2022', '2030']
@@ -673,65 +757,33 @@ deleteMuteTimes:
     name: mti_1
 ```
 
-### File provisioning using Kubernetes
+## More examples
 
-If you are a Kubernetes user, you can leverage file provisioning using Kubernetes configuration maps.
+For more examples on the concept of this guide:
 
-1. Create one or more configuration maps as follows.
+- Try provisioning alerting resources in Grafana OSS with YAML files through a demo project using [Docker Compose](https://github.com/grafana/provisioning-alerting-examples/tree/main/config-files) or [Kubernetes deployments](https://github.com/grafana/provisioning-alerting-examples/tree/main/kubernetes).
+- Review the distinct options about how Grafana provisions resources in the [Provision Grafana documentation][provisioning].
+- For Helm support, review the examples provisioning alerting resources in the [Grafana Helm Chart documentation](https://github.com/grafana/helm-charts/blob/main/charts/grafana/README.md).
 
-```yaml
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: grafana-alerting
-data:
-  provisioning.yaml: |
-    templates:
-    - name: my_first_template
-      template: the content for my template
-```
+{{% docs/reference %}}
 
-2. Add the file(s) to your GitOps workflow, so that they deploy alongside your Grafana instance(s).
+[export_alert_rules]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/export-alerting-resources#export-alert-rules"
+[export_alert_rules]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/provision-alerting-resources/export-alerting-resources#export-alert-rules"
 
-```yaml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: grafana
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: grafana
-  template:
-    metadata:
-      name: grafana
-      labels:
-        app: grafana
-    spec:
-      containers:
-        - name: grafana
-          image: grafana/grafana:latest
-          ports:
-            - name: grafana
-              containerPort: 3000
-          volumeMounts:
-            - mountPath: /etc/grafana/provisioning/alerting
-              name: grafana-alerting
-              readOnly: false
-      volumes:
-        - name: grafana-alerting
-          configMap:
-            defaultMode: 420
-            name: grafana-alerting
-```
+[export_contact_points]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/export-alerting-resources#export-contact-points"
+[export_contact_points]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/provision-alerting-resources/export-alerting-resources#export-contact-points"
 
-This eliminates the need for a persistent database to use Grafana Alerting in Kubernetes; all your provisioned resources appear after each restart or re-deployment. Grafana still requires a database for normal operation, you do not need to persist the contents of the database between restarts if all objects are provisioned using files.
+[export_templates]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/export-alerting-resources#export-templates"
+[export_templates]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/provision-alerting-resources/export-alerting-resources#export-templates"
 
-{{% docs/reference %}}
-[alerting_provisioning]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/developers/http_api/alerting_provisioning"
-[alerting_provisioning]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/developers/http_api/alerting_provisioning"
+[export_policies]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/export-alerting-resources#export-the-notification-policy-tree"
+[export_policies]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/provision-alerting-resources/export-alerting-resources#export-the-notification-policy-tree"
+
+[export_mute_timings]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/export-alerting-resources#export-mute-timings"
+[export_mute_timings]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/provision-alerting-resources/export-alerting-resources#export-mute-timings"
+
+[provisioning]: "/docs/ -> /docs/grafana/<GRAFANA_VERSION>/administration/provisioning"
+
+[reload-provisioning-configurations]: "/docs/ -> /docs/grafana/<GRAFANA_VERSION>/developers/http_api/admin#reload-provisioning-configurations"
 
-[reload-provisioning-configurations]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/developers/http_api/admin#reload-provisioning-configurations"
-[reload-provisioning-configurations]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/developers/http_api/admin#reload-provisioning-configurations"
 {{% /docs/reference %}}
diff --git a/docs/sources/alerting/set-up/provision-alerting-resources/http-api-provisioning/_index.md b/docs/sources/alerting/set-up/provision-alerting-resources/http-api-provisioning/_index.md
new file mode 100644
index 0000000000000..4c1f460657110
--- /dev/null
+++ b/docs/sources/alerting/set-up/provision-alerting-resources/http-api-provisioning/_index.md
@@ -0,0 +1,20 @@
+---
+canonical: https://grafana.com/docs/grafana/latest/developers/http_api/alerting_provisioning/
+description: Create and manage alerting resources using the HTTP API
+keywords:
+  - grafana
+  - alerting
+  - alerting resources
+  - provisioning
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Use the HTTP API to manage alerting resources
+weight: 400
+---
+
+# Use the HTTP API to manage alerting resources
+
+{{< docs/shared lookup="alerts/alerting_provisioning.md" source="grafana" version="latest" >}}
diff --git a/docs/sources/alerting/set-up/provision-alerting-resources/terraform-provisioning/index.md b/docs/sources/alerting/set-up/provision-alerting-resources/terraform-provisioning/index.md
index 00da792044447..b3bef7ffc7a39 100644
--- a/docs/sources/alerting/set-up/provision-alerting-resources/terraform-provisioning/index.md
+++ b/docs/sources/alerting/set-up/provision-alerting-resources/terraform-provisioning/index.md
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - ../../provision-alerting-resources/terraform-provisioning/
 canonical: https://grafana.com/docs/grafana/latest/alerting/set-up/provision-alerting-resources/terraform-provisioning/
 description: Create and manage alerting resources using Terraform
 keywords:
@@ -11,357 +9,415 @@ keywords:
   - Terraform
 labels:
   products:
+    - cloud
     - enterprise
     - oss
-title: Create and manage alerting resources using Terraform
+menuTitle: Use Terraform to provision
+title: Use Terraform to provision alerting resources
 weight: 200
 ---
 
-# Create and manage alerting resources using Terraform
+# Use Terraform to provision alerting resources
 
 Use Terraform’s Grafana Provider to manage your alerting resources and provision them into your Grafana system. Terraform provider support for Grafana Alerting makes it easy to create, manage, and maintain your entire Grafana Alerting stack as code.
 
-For more information on managing your alerting resources using Terraform, refer to the [Grafana Provider](https://registry.terraform.io/providers/grafana/grafana/latest/docs) documentation.
+This guide outlines the steps and references to provision alerting resources with Terraform. For a practical demo, you can clone and try this [example using Grafana OSS and Docker Compose](https://github.com/grafana/provisioning-alerting-examples/tree/main/terraform).
 
-Complete the following tasks to create and manage your alerting resources using Terraform.
+To create and manage your alerting resources using Terraform, you have to complete the following tasks.
 
-1. Create an API key for provisioning.
-1. Configure the Terraform provider.
-1. Define your alerting resources in Terraform.
+1. Create an API key to configure the Terraform provider.
+1. Create your alerting resources in Terraform format by
+   - [exporting configured alerting resources][alerting_export]
+   - or writing the [Terraform Alerting schemas](https://registry.terraform.io/providers/grafana/grafana/latest/docs).
+     > By default, you cannot edit provisioned resources. Enable [`disable_provenance` in the Terraform resource](#enable-editing-resources-in-the-grafana-ui) to allow changes in the Grafana UI.
 1. Run `terraform apply` to provision your alerting resources.
 
-## Before you begin
+Before you begin, you should have available a Grafana instance and [Terraform installed](https://www.terraform.io/downloads) on your machine.
 
-- Ensure you have the grafana/grafana [Terraform provider](https://registry.terraform.io/providers/grafana/grafana/1.28.0) 1.27.0 or higher.
+## Create an API key and configure the Terraform provider
 
-- Ensure you are using Grafana 9.1 or higher.
+You can create a [service account token][service-accounts] to authenticate Terraform with Grafana. To create an API key for provisioning alerting resources, complete the following steps.
 
-## Create an API key for provisioning
-
-You can [create a normal Grafana API key][api-keys] to authenticate Terraform with Grafana. Most existing tooling using API keys should automatically work with the new Grafana Alerting support.
-
-There are also dedicated RBAC roles for alerting provisioning. This lets you easily authenticate as a [service account][service-accounts] with the minimum permissions needed to provision your Alerting infrastructure.
-
-To create an API key for provisioning, complete the following steps.
-
-1. Create a new service account for your CI pipeline.
-1. Assign the role “Access the alert rules Provisioning API.”
+1. Create a new service account.
+1. Assign the role or permission to access the [Alerting provisioning API][alerting_http_provisioning].
 1. Create a new service account token.
 1. Name and save the token for use in Terraform.
 
-Alternatively, you can use basic authentication. To view all the supported authentication formats, see [here](https://registry.terraform.io/providers/grafana/grafana/latest/docs#authentication).
+You can now move to the working directory for your Terraform configurations, and create a file named `main.tf` like:
 
-## Configure the Terraform provider
-
-Grafana Alerting support is included as part of the [Grafana Terraform provider](https://registry.terraform.io/providers/grafana/grafana/latest/docs).
-
-The following is an example you can use to configure the Terraform provider.
-
-```HCL
+```main.tf
 terraform {
     required_providers {
         grafana = {
             source = "grafana/grafana"
-            version = ">= 1.28.2"
+            version = ">= 2.9.0"
         }
     }
 }
 
 provider "grafana" {
-    url = <YOUR_GRAFANA_URL>
-    auth = <YOUR_GRAFANA_API_KEY>
+    url = <grafana-url>
+    auth = <api-key>
 }
 ```
 
-## Provision contact points and templates
+Replace the following values:
+
+- `<grafana-url>` with the URL of the Grafana instance.
+- `<api-key>` with the API token previously created.
+
+This Terraform configuration installs the [Grafana Terraform provider](https://registry.terraform.io/providers/grafana/grafana/latest/docs) and authenticates against your Grafana instance using an API token. For other authentication alternatives including basic authentication, refer to the [`auth` option documentation](https://registry.terraform.io/providers/grafana/grafana/latest/docs#authentication).
+
+For Grafana Cloud, refer to the [instructions to manage a Grafana Cloud stack with Terraform][provision-cloud-with-terraform]. For role-based access control, refer to [Provisioning RBAC with Terraform][rbac-terraform-provisioning] and the [alerting provisioning roles (`fixed:alerting.provisioning.*`)][rbac-role-definitions].
+
+## Create Terraform configurations for alerting resources
+
+[Grafana Terraform provider](https://registry.terraform.io/providers/grafana/grafana/latest/docs) enables you to manage the following alerting resources.
+
+| Alerting resource                               | Terraform resource                                                                                                               |
+| ----------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- |
+| [Alert rules][alerting-rules]                   | [grafana_rule_group](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/rule_group)                   |
+| [Contact points][contact-points]                | [grafana_contact_point](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/contact_point)             |
+| [Notification templates][notification-template] | [grafana_message_template](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/message_template)       |
+| [Notification policy tree][notification-policy] | [grafana_notification_policy](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/notification_policy) |
+| [Mute timings][mute-timings]                    | [grafana_mute_timing](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/mute_timing)                 |
+
+In this section, we'll create Terraform configurations for each alerting resource and demonstrate how to link them together.
+
+### Add alert rules
+
+[Alert rules][alerting-rules] enable you to receive alerts by querying any backend Grafana data sources.
+
+1. First, create a data source to query and a folder to store your rules in.
+
+   In this example, the [TestData][testdata] data source is used.
+
+   ```terraform
+   resource "grafana_data_source" "<terraform_data_source_name>" {
+       name = "TestData"
+       type = "testdata"
+   }
 
-Contact points connect an alerting stack to the outside world. They tell Grafana how to connect to your external systems and where to deliver notifications. There are over fifteen different [integrations](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/contact_point#optional) to choose from.
+   resource "grafana_folder" "<terraform_folder_name>" {
+       title = "My Rule Folder"
+   }
+   ```
 
-To provision contact points and templates, complete the following steps.
+   Replace the following field values:
 
-1. Copy this code block into a .tf file on your local machine.
+   - `<terraform_data_source_name>` with the terraform name of the data source.
+   - `<terraform_folder_name>` with the terraform name of the folder.
 
-This example creates a contact point that sends alert notifications to Slack.
+1. Create or find an alert rule you want to import in Grafana.
 
-```HCL
-resource "grafana_contact_point" "my_slack_contact_point" {
-    name = "Send to My Slack Channel"
+1. [Export][alerting_export] the alert rule group in Terraform format. This exports the alert rule group as [`grafana_rule_group` Terraform resource](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/rule_group).
 
-    slack {
-        url = <YOUR_SLACK_WEBHOOK_URL>
-        text = <<EOT
-{{ len .Alerts.Firing }} alerts are firing!
+   You can edit the exported resource, or alternatively, consider creating the resource from scratch.
 
-Alert summaries:
-{{ range .Alerts.Firing }}
-{{ template "Alert Instance Template" . }}
-{{ end }}
-EOT
-    }
-}
-```
+   ```terraform
+   resource "grafana_rule_group" "<terraform_rule_group_name>" {
+       name = "My Alert Rules"
+       folder_uid = grafana_folder.<terraform_folder_name>.uid
+       interval_seconds = 60
+       org_id = 1
 
-You can create multiple external integrations in a single contact point. Notifications routed to this contact point will be sent to all integrations. This example shows multiple integrations in the same Terraform resource.
+       rule {
+           name = "My Random Walk Alert"
+           condition = "C"
+           for = "0s"
 
-```
-resource "grafana_contact_point" "my_multi_contact_point" {
-    name = "Send to Many Places"
+           // Query the datasource.
+           data {
+               ref_id = "A"
+               relative_time_range {
+                   from = 600
+                   to = 0
+               }
+               datasource_uid = grafana_data_source.<terraform_data_source_name>.uid
+               // `model` is a JSON blob that sends datasource-specific data.
+               // It's different for every datasource. The alert's query is defined here.
+               model = jsonencode({
+                   intervalMs = 1000
+                   maxDataPoints = 43200
+                   refId = "A"
+               })
+           }
 
-    slack {
-        url = "webhook1"
-        ...
-    }
-    slack {
-        url = "webhook2"
-        ...
-    }
-    teams {
-        ...
-    }
-    email {
-        ...
+           // The query was configured to obtain data from the last 60 seconds. Let's alert on the average value of that series using a Reduce stage.
+           data {
+               datasource_uid = "__expr__"
+               // You can also create a rule in the UI, then GET that rule to obtain the JSON.
+               // This can be helpful when using more complex reduce expressions.
+               model = <<EOT
+   {"conditions":[{"evaluator":{"params":[0,0],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"params":[],"type":"last"},"type":"avg"}],"datasource":{"name":"Expression","type":"__expr__","uid":"__expr__"},"expression":"A","hide":false,"intervalMs":1000,"maxDataPoints":43200,"reducer":"last","refId":"B","type":"reduce"}
+   EOT
+               ref_id = "B"
+               relative_time_range {
+                   from = 0
+                   to = 0
+               }
+           }
+
+           // Now, let's use a math expression as our threshold.
+           // We want to alert when the value of stage "B" above exceeds 70.
+           data {
+               datasource_uid = "__expr__"
+               ref_id = "C"
+               relative_time_range {
+                   from = 0
+                   to = 0
+               }
+               model = jsonencode({
+                   expression = "$B > 70"
+                   type = "math"
+                   refId = "C"
+               })
+           }
+       }
+   }
+   ```
+
+   Replace the following field values:
+
+   - `<terraform_rule_group_name>` with the name of the alert rule group.
+
+   Note that the distinct Grafana resources are connected through `uid` values in their Terraform configurations. The `uid` value will be randomly generated when provisioning.
+
+   To link the alert rule group with its respective data source and folder in this example, replace the following field values:
+
+   - `<terraform_data_source_name>` with the terraform name of the previously defined data source.
+   - `<terraform_folder_name>` with the terraform name of the the previously defined folder.
+
+1. Continue to add more Grafana resources or [use the Terraform CLI for provisioning](#provision-grafana-resources-with-terraform).
+
+### Add contact points
+
+[Contact points][contact-points] are the receivers of alert notifications.
+
+1. Create or find the contact points you want to import in Grafana. Alternatively, consider writing the resource in code as demonstrated in the example below.
+
+1. [Export][alerting_export] the contact point in Terraform format. This exports the contact point as [`grafana_contact_point` Terraform resource](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/contact_point)—edit it if necessary.
+
+1. In this example, notifications are muted on weekends.
+
+   ```terraform
+    resource "grafana_contact_point" "<terraform_contact_point_name>" {
+        name = "My contact point email"
+
+        email {
+            addresses               = ["<email_address>"]
+        }
     }
-}
-```
+   ```
 
-2. Enter text for your notification in the text field.
+   Replace the following field values:
 
-The `text` field supports [Go-style templating](https://pkg.go.dev/text/template). This enables you to manage your Grafana Alerting notification templates directly in Terraform.
+   - `<terraform_contact_point_name>` with the terraform name of the contact point. It will be used to reference the contact point in other Terraform resources.
+   - `<email_address>` with the email to receive alert notifications.
 
-3. Run the command ‘terraform apply’.
+1. Continue to add more Grafana resources or [use the Terraform CLI for provisioning](#provision-grafana-resources-with-terraform).
 
-4. Go to the Grafana UI and check the details of your contact point.
+### Add and enable templates
 
-By default, you cannot edit resources provisioned via Terraform from the UI. This ensures that your alerting stack always stays in sync with your code.
+[Notification templates][notification-template] allow customization of alert notifications across multiple contact points.
 
-5. Click **Test** to verify that the contact point works correctly.
+1. Create or find the notification template you want to import in Grafana. Alternatively, consider writing the resource in code as demonstrated in the example below.
 
-**Note:**
+1. [Export][alerting_export] the template as [`grafana_message_template` Terraform resource](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/message_template).
 
-You can reuse the same templates across many contact points. In the example above, a shared template ie embedded using the statement `{{ template “Alert Instance Template” . }}`
+   This example is a simple demo template defined as `custom_email.message`.
 
-This fragment can then be managed separately in Terraform:
+   ```terraform
+    resource "grafana_message_template" "<terraform_message_template_name>" {
+        name = "custom_email.message"
 
-```HCL
-resource "grafana_message_template" "my_alert_template" {
-    name = "Alert Instance Template"
+        template = <<EOT
+    {{ define "custom_email.message" }}
+    Lorem ipsum - Custom alert!
+    {{ end }}
+    EOT
+    }
+   ```
 
-    template = <<EOT
-{{ define "Alert Instance Template" }}
-Firing: {{ .Labels.alertname }}
-Silence: {{ .SilenceURL }}
-{{ end }}
-EOT
-}
-```
+1. In the previous contact point, enable the template by setting the `email.message` property as follows.
 
-## Provision notification policies and routing
+   ```terraform
+    resource "grafana_contact_point" "<terraform_contact_point_name>" {
+        name = "My contact point email"
 
-Notification policies tell Grafana how to route alert instances to your contact points. They connect firing alerts to your previously defined contact points using a system of labels and matchers.
+        email {
+            addresses               = ["<email_address>"]
+            message                 = "{{ template \"custom_email.message\" .}}"
+        }
+    }
+   ```
 
-To provision notification policies and routing, complete the following steps.
+1. Continue to add more Grafana resources or [use the Terraform CLI for provisioning](#provision-grafana-resources-with-terraform).
 
-1. Copy this code block into a .tf file on your local machine.
+### Add mute timings
 
-In this example, the alerts are grouped by `alertname`, which means that any notifications coming from alerts which share the same name, are grouped into the same Slack message. You can provide any set of label keys here, or you can use the special label `"..."` to route by all label keys, sending each alert in a separate notification.
+[Mute timings][mute-timings] pause alert notifications during predetermined intervals.
 
-If you want to route specific notifications differently, you can add sub-policies. Sub-policies allow you to apply routing to different alerts based on label matching. In this example, we apply a mute timing to all alerts with the label a=b.
+1. Create or find the mute timings you want to import in Grafana. Alternatively, consider writing the resource in code as demonstrated in the example below.
 
-```HCL
-resource "grafana_notification_policy" "my_policy" {
-    group_by = ["alertname"]
-    contact_point = grafana_contact_point.my_slack_contact_point.name
+1. [Export][alerting_export] the mute timing in Terraform format. This exports the mute timing as [`grafana_mute_timing` Terraform resource](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/mute_timing)—edit it if necessary.
 
-    group_wait = "45s"
-    group_interval = "6m"
-    repeat_interval = "3h"
+1. This example turns off notifications on weekends.
 
-    policy {
-        matcher {
-            label = "a"
-            match = "="
-            value = "b"
-        }
-        group_by = ["..."]
-        contact_point = grafana_contact_point.a_different_contact_point.name
-        mute_timings = [grafana_mute_timing.my_mute_timing.name]
-
-        policy {
-            matcher {
-                label = "sublabel"
-                match = "="
-                value = "subvalue"
-            }
-            contact_point = grafana_contact_point.a_third_contact_point.name
-            group_by = ["..."]
+   ```terraform
+    resource "grafana_mute_timing" "<terraform_mute_timing_name>" {
+        name = "No weekends"
+
+        intervals {
+            weekdays = ["saturday", "sunday"]
         }
     }
-}
-```
+   ```
 
-2. In the mute_timings field, link a mute timing to your notification policy.
+   Replace the following field values:
 
-3. Run the command ‘terraform apply’.
+   - `<terraform_mute_timing_name>` with the name of the Terraform resource. It will be used to reference the mute timing in the Terraform notification policy tree.
 
-4. Go to the Grafana UI and check the details of your notification policy.
+1. Continue to add more Grafana resources or [use the Terraform CLI for provisioning](#provision-grafana-resources-with-terraform).
 
-**Note:**
+### Add the notification policy tree
 
-Since the policy tree is a single resource, applying it will overwrite a policy tree created through any other means.
+[Notification policies][notification-policy] defines how to route alert instances to your contact points.
 
-By default, you cannot edit resources provisioned from Terraform from the UI. This ensures that your alerting stack always stays in sync with your code.
+{{% admonition type="warning" %}}
 
-5. Click **Test** to verify that the notification point is working correctly.
+Since the policy tree is a single resource, provisioning the `grafana_notification_policy` resource will overwrite a policy tree created through any other means.
 
-## Provision mute timings
+{{< /admonition >}}
 
-Mute timings provide the ability to mute alert notifications for defined time periods.
+1. Find the default notification policy tree. Alternatively, consider writing the resource in code as demonstrated in the example below.
 
-To provision mute timings, complete the following steps.
+1. [Export][alerting_export] the notification policy tree in Terraform format. This exports it as [`grafana_notification_policy` Terraform resource](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/notification_policy)—edit it if necessary.
 
-1. Copy this code block into a .tf file on your local machine.
+   ```terraform
+   resource "grafana_notification_policy" "my_policy_tree" {
+   contact_point = grafana_contact_point.<terraform_contact_point_name>.name
+   ...
 
-In this example, alert notifications are muted on weekends.
+   policy {
+       contact_point = grafana_contact_point.<terraform_contact_point_name>.name
 
-```HCL
-resource "grafana_mute_timing" "my_mute_timing" {
-    name = "My Mute Timing"
+       matcher {...}
 
-    intervals {
-        times {
-          start = "04:56"
-          end = "14:17"
-        }
-        weekdays = ["saturday", "sunday", "tuesday:thursday"]
-        months = ["january:march", "12"]
-        years = ["2025:2027"]
-    }
+       mute_timings = [grafana_mute_timing.<terraform_mute_timing_name>.name]
+   }
+   }
+   ```
+
+   To configure the mute timing and contact point previously created in the notification policy tree, replace the following field values:
+
+   - `<terraform_data_source_name>` with the terraform name of the previously defined contact point.
+   - `<terraform_folder_name>` with the terraform name of the the previously defined mute timing.
+
+1. Continue to add more Grafana resources or [use the Terraform CLI for provisioning](#provision-grafana-resources-with-terraform).
+
+### Enable editing resources in the Grafana UI
+
+By default, you cannot edit resources provisioned via Terraform in Grafana. This ensures that your alerting stack always stays in sync with your Terraform code.
+
+To make provisioned resources editable in the Grafana UI, enable the `disable_provenance` attribute on alerting resources.
+
+```terraform
+resource "grafana_contact_point" "my_contact_point" {
+  name = "My Contact Point"
+
+  disable_provenance = true
 }
-```
 
-2. Run the command ‘terraform apply’.
-3. Go to the Grafana UI and check the details of your mute timing.
-4. Reference your newly created mute timing in a notification policy using the `mute_timings` field.
-   This will apply your mute timing to some or all of your notifications.
+resource "grafana_message_template" "my_template" {
+  name     = "My Reusable Template"
+  template = "{{define \"My Reusable Template\" }}\n template content\n{{ end }}"
 
-**Note:**
+  disable_provenance = true
+}
+...
+```
 
-By default, you cannot edit resources provisioned from Terraform from the UI. This ensures that your alerting stack always stays in sync with your code.
+Note that `disable_provenance` is not supported for [grafana_mute_timing](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/mute_timing).
 
-5. Click **Test** to verify that the mute timing is working correctly.
+## Provision Grafana resources with Terraform
 
-## Provision alert rules
+To create the previous alerting resources in Grafana with the Terraform CLI, complete the following steps.
 
-[Alert rules][alerting-rules] enable you to alert against any Grafana data source. This can be a data source that you already have configured, or you can [define your data sources in Terraform](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/data_source) alongside your alert rules.
+1. Initialize the working directory containing the Terraform configuration files.
 
-To provision alert rules, complete the following steps.
+   ```shell
+   terraform init
+   ```
 
-1. Create a data source to query and a folder to store your rules in.
+   This command initializes the Terraform directory, installing the Grafana Terraform provider configured in the `main.tf` file.
 
-In this example, the [TestData][testdata] data source is used.
+1. Apply the Terraform configuration files to provision the resources.
 
-Alerts can be defined against any backend datasource in Grafana.
+   ```shell
+   terraform apply
+   ```
 
-```HCL
-resource "grafana_data_source" "testdata_datasource" {
-    name = "TestData"
-    type = "testdata"
-}
+   Before applying any changes to Grafana, Terraform displays the execution plan and requests your approval.
 
-resource "grafana_folder" "rule_folder" {
-    title = "My Rule Folder"
-}
-```
+   ```shell
+    Plan: 4 to add, 0 to change, 0 to destroy.
 
-2. Define an alert rule.
-
-For more information on alert rules, refer to [how to create Grafana-managed alerts](/blog/2022/08/01/grafana-alerting-video-how-to-create-alerts-in-grafana-9/).
-
-3. Create a rule group containing one or more rules.
-
-In this example, the `grafana_rule_group` resource group is used.
-
-```HCL
-resource "grafana_rule_group" "my_rule_group" {
-    name = "My Alert Rules"
-    folder_uid = grafana_folder.rule_folder.uid
-    interval_seconds = 60
-    org_id = 1
-
-    rule {
-        name = "My Random Walk Alert"
-        condition = "C"
-        for = "0s"
-
-        // Query the datasource.
-        data {
-            ref_id = "A"
-            relative_time_range {
-                from = 600
-                to = 0
-            }
-            datasource_uid = grafana_data_source.testdata_datasource.uid
-            // `model` is a JSON blob that sends datasource-specific data.
-            // It's different for every datasource. The alert's query is defined here.
-            model = jsonencode({
-                intervalMs = 1000
-                maxDataPoints = 43200
-                refId = "A"
-            })
-        }
+    Do you want to perform these actions?
+    Terraform will perform the actions described above.
+    Only 'yes' will be accepted to approve.
 
-        // The query was configured to obtain data from the last 60 seconds. Let's alert on the average value of that series using a Reduce stage.
-        data {
-            datasource_uid = "__expr__"
-            // You can also create a rule in the UI, then GET that rule to obtain the JSON.
-            // This can be helpful when using more complex reduce expressions.
-            model = <<EOT
-{"conditions":[{"evaluator":{"params":[0,0],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"params":[],"type":"last"},"type":"avg"}],"datasource":{"name":"Expression","type":"__expr__","uid":"__expr__"},"expression":"A","hide":false,"intervalMs":1000,"maxDataPoints":43200,"reducer":"last","refId":"B","type":"reduce"}
-EOT
-            ref_id = "B"
-            relative_time_range {
-                from = 0
-                to = 0
-            }
-        }
+    Enter a value:
+   ```
 
-        // Now, let's use a math expression as our threshold.
-        // We want to alert when the value of stage "B" above exceeds 70.
-        data {
-            datasource_uid = "__expr__"
-            ref_id = "C"
-            relative_time_range {
-                from = 0
-                to = 0
-            }
-            model = jsonencode({
-                expression = "$B > 70"
-                type = "math"
-                refId = "C"
-            })
-        }
-    }
-}
-```
+   Once you have confirmed to proceed with the changes, Terraform will create the provisioned resources in Grafana!
 
-4. Go to the Grafana UI and check your alert rule.
+   ```shell
+   Apply complete! Resources: 4 added, 0 changed, 0 destroyed.
+   ```
 
-You can see whether or not the alert rule is firing. You can also see a visualization of each of the alert rule’s query stages
+You can now access Grafana to verify the creation of the distinct resources.
 
-When the alert fires, Grafana routes a notification through the policy you defined.
+## More examples
 
-For example, if you chose Slack as a contact point, Grafana’s embedded [Alertmanager](https://github.com/prometheus/alertmanager) automatically posts a message to Slack.
+For more examples on the concept of this guide:
+
+- Try the demo [provisioning alerting resources in Grafana OSS using Terraform and Docker Compose](https://github.com/grafana/provisioning-alerting-examples/tree/main/terraform).
+- Review all the available options and examples of the Terraform Alerting schemas in the [Grafana Terraform Provider documentation](https://registry.terraform.io/providers/grafana/grafana/latest/docs).
+- Review the [tutorial to manage a Grafana Cloud stack using Terraform][provision-cloud-with-terraform].
 
 {{% docs/reference %}}
-[alerting-rules]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/alerting-rules"
+
+[alerting-rules]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules"
 [alerting-rules]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules"
 
-[api-keys]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/administration/api-keys"
-[api-keys]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/administration/api-keys"
+[contact-points]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/manage-contact-points"
+[contact-points]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/manage-contact-points"
+
+[mute-timings]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/mute-timings"
+[mute-timings]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/mute-timings"
+
+[notification-policy]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/create-notification-policy"
+[notification-policy]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/create-notification-policy"
+
+[notification-template]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/template-notifications"
+[notification-template]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/template-notifications"
+
+[alerting_export]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/export-alerting-resources"
+[alerting_export]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/provision-alerting-resources/export-alerting-resources"
+
+[alerting_http_provisioning]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/http-api-provisioning"
+[alerting_http_provisioning]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/provision-alerting-resources/http-api-provisioning"
+
+[service-accounts]: "/docs/ -> /docs/grafana/<GRAFANA_VERSION>/administration/service-accounts"
+
+[testdata]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/datasources/testdata"
+[testdata]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/connect-externally-hosted/data-sources/testdata"
+
+[provision-cloud-with-terraform]: "/docs/ -> /docs/grafana-cloud/developer-resources/infrastructure-as-code/terraform/terraform-cloud-stack"
+
+[rbac-role-definitions]: "/docs/ -> /docs/grafana/<GRAFANA_VERSION>/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions"
 
-[service-accounts]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/administration/service-accounts"
-[service-accounts]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/administration/service-accounts"
+[rbac-terraform-provisioning]: "/docs/ -> /docs/grafana/<GRAFANA_VERSION>/administration/roles-and-permissions/access-control/rbac-terraform-provisioning"
 
-[testdata]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/testdata"
-[testdata]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/testdata"
 {{% /docs/reference %}}
diff --git a/docs/sources/alerting/set-up/provision-alerting-resources/view-provisioned-resources/index.md b/docs/sources/alerting/set-up/provision-alerting-resources/view-provisioned-resources/index.md
deleted file mode 100644
index 2670bf68c1ca3..0000000000000
--- a/docs/sources/alerting/set-up/provision-alerting-resources/view-provisioned-resources/index.md
+++ /dev/null
@@ -1,60 +0,0 @@
----
-aliases:
-  - ../../provision-alerting-resources/view-provisioned-resources/
-canonical: https://grafana.com/docs/grafana/latest/alerting/set-up/provision-alerting-resources/view-provisioned-resources/
-description: View provisioned resources in Grafana
-keywords:
-  - grafana
-  - alerting
-  - alerting resources
-  - provisioning
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-menuTitle: View provisioned resources in Grafana
-title: View provisioned alerting resources in Grafana
-weight: 300
----
-
-# View provisioned alerting resources in Grafana
-
-Verify that your alerting resources were created in Grafana.
-
-To view your provisioned resources in Grafana, complete the following steps.
-
-1. Open your Grafana instance.
-1. Navigate to Alerting.
-1. Click an alerting resource folder, for example, Alert rules.
-
-Provisioned resources are labeled **Provisioned**, so that it is clear that they were not created manually.
-
-## Edit API-provisioned alerting resources
-
-To enable editing of API-provisioned resources in the Grafana UI, add the `X-Disable-Provenance` header to the following requests in the API:
-
-- `POST /api/v1/provisioning/alert-rules`
-- `PUT /api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}` (calling this endpoint will change provenance for all alert rules within the alert group)
-- `POST /api/v1/provisioning/contact-points`
-- `POST /api/v1/provisioning/mute-timings`
-- `PUT /api/v1/provisioning/policies`
-- `PUT /api/v1/provisioning/templates/{name}`
-
-To reset the notification policy tree to the default and unlock it for editing in the Grafana UI, use the `DELETE /api/v1/provisioning/policies` endpoint.
-
-To pass the `X-Disable-Provenance` header from Terraform, add it to the `http_headers` field on the provider object:
-
-```
-provider "grafana" {
-  url  = "http://grafana.example.com/"
-  auth = var.grafana_auth
-  http_headers = {
-    "X-Disable-Provenance" = "true"
-  }
-}
-```
-
-**Note:**
-
-You cannot edit provisioned resources from files in Grafana. You can only change the resource properties by changing the provisioning file and restarting Grafana or carrying out a hot reload. This prevents changes being made to the resource that would be overwritten if a file is provisioned again or a hot reload is carried out.
diff --git a/docs/sources/breaking-changes/_index.md b/docs/sources/breaking-changes/_index.md
index 6eb62be4d38d6..af76c612b89df 100644
--- a/docs/sources/breaking-changes/_index.md
+++ b/docs/sources/breaking-changes/_index.md
@@ -1,6 +1,7 @@
 ---
 aliases:
   - guides/
+description: Learn about breaking changes in Grafana
 labels:
   products:
     - cloud
diff --git a/docs/sources/breaking-changes/breaking-changes-v10-0.md b/docs/sources/breaking-changes/breaking-changes-v10-0.md
index ee3387a9f4bcc..8c0dd3f29e22b 100644
--- a/docs/sources/breaking-changes/breaking-changes-v10-0.md
+++ b/docs/sources/breaking-changes/breaking-changes-v10-0.md
@@ -1,5 +1,5 @@
 ---
-description: Breaking changes for Grafana v10.0
+description: Learn about breaking changes in Grafana v10.0
 keywords:
   - grafana
   - breaking changes
@@ -81,7 +81,7 @@ Grafana legacy alerting (dashboard alerts) has been deprecated since Grafana v9.
 
 #### Migration path
 
-The new Grafana Alerting was introduced in Grafana 8 and is a superset of legacy alerting. Learn how to migrate your alerts in the [Upgrade Alerting documentation]({{< relref "../alerting/set-up/migrating-alerts/" >}}).
+The new Grafana Alerting was introduced in Grafana 8 and is a superset of legacy alerting. Learn how to migrate your alerts in the [Upgrade Alerting documentation]({{< relref "./v10.4/alerting/set-up/migrating-alerts/" >}}).
 
 ### API keys are migrating to service accounts
 
diff --git a/docs/sources/breaking-changes/breaking-changes-v10-3.md b/docs/sources/breaking-changes/breaking-changes-v10-3.md
new file mode 100644
index 0000000000000..cbb0a37a77caa
--- /dev/null
+++ b/docs/sources/breaking-changes/breaking-changes-v10-3.md
@@ -0,0 +1,77 @@
+---
+description: Breaking changes for Grafana v10.3
+keywords:
+  - grafana
+  - breaking changes
+  - documentation
+  - '10.3'
+  - '10.2.3'
+  - release notes
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Breaking changes in Grafana v10.3
+weight: -2
+---
+
+# Breaking changes in Grafana v10.3
+
+Following are breaking changes that you should be aware of when upgrading to Grafana v10.3. Breaking changes that were introduced in release 10.2.3 are also included here and are marked with an asterisk.
+
+For our purposes, a breaking change is any change that requires users or operators to do something. This includes:
+
+- Changes in one part of the system that could cause other components to fail
+- Deprecations or removal of a feature
+- Changes to an API that could break automation
+- Changes that affect some plugins or functions of Grafana
+- Migrations that can’t be rolled back
+
+For each change, the provided information:
+
+- Helps you determine if you’re affected
+- Describes the change or relevant background information
+- Guides you in how to mitigate for the change or migrate
+- Provides more learning resources
+
+For release highlights and deprecations, refer to our [v10.3 What’s new](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/whatsnew/whats-new-in-v10-3/). For the specific steps we recommend when you upgrade to v10.3, check out our [Upgrade guide](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/upgrade-guide/upgrade-v10.3/).
+
+<!--
+## Feature
+
+You must use relative references when linking to docs within the Grafana repo. Please do not use absolute URLs. For more information about relrefs, refer to [Links and references](/docs/writers-toolkit/writing-guide/references/).-->
+
+## General breaking changes
+
+### Transformations\*
+
+In panels using the extract fields transformation, where one of the extracted names collides with one of the already existing fields, the extracted field will be renamed. Issue [#77569](https://github.com/grafana/grafana/issues/77569).
+
+If you use the Table visualization, you might see some inconsistencies in your panels. We have updated the table column naming. This will potentially affect field transformations and/or field overrides. To resolve this, either:
+
+- Update the transformation you are using
+- Update field override. Issue [#76899](https://github.com/grafana/grafana/issues/76899).
+
+Users who have transformations with the Time field might see their transformations are not working. Those panels that have broken transformations will fail to render. This is because we changed the field key. See related PR: [#69865](https://github.com/grafana/grafana/pull/69865). To resolve this, either:
+
+- Remove the affected panel and re-create it
+- Select the Time field again
+- Edit the time field as Time for transformation in panel.json or dashboard.json. Issue [#76641](https://github.com/grafana/grafana/issues/76641).
+
+### Data source permissions\*
+
+The following data source permission endpoints have been removed:
+
+- `GET /datasources/:datasourceId/permissions`
+- `POST /api/datasources/:datasourceId/permissions`
+- `DELETE /datasources/:datasourceId/permissions`
+- `POST /datasources/:datasourceId/enable-permissions`
+- `POST /datasources/:datasourceId/disable-permissions`
+
+Please use the following endpoints instead:
+
+- `GET /api/access-control/datasources/:uid` for listing data source permissions
+- `POST /api/access-control/datasources/:uid/users/:id`, `POST /api/access-control/datasources/:uid/teams/:id`, and `POST /api/access-control/datasources/:uid/buildInRoles/:id` for adding or removing data source permissions
+
+If you are using the Grafana provider for Terraform to manage data source permissions, you will need to upgrade your provider to [version 2.6.0](https://registry.terraform.io/providers/grafana/grafana/2.6.0/docs) or newer to ensure that data source permission provisioning keeps working. Issue [#5880](https://github.com/grafana/grafana-enterprise/pull/5880).
diff --git a/docs/sources/breaking-changes/breaking-changes-v11-0.md b/docs/sources/breaking-changes/breaking-changes-v11-0.md
new file mode 100644
index 0000000000000..8122ac01c32ec
--- /dev/null
+++ b/docs/sources/breaking-changes/breaking-changes-v11-0.md
@@ -0,0 +1,220 @@
+---
+description: Breaking changes for Grafana v11.0-preview
+keywords:
+  - grafana
+  - breaking changes
+  - documentation
+  - '11.0'
+  - '11.0-preview'
+  - release notes
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Breaking changes in Grafana v11.0-preview
+weight: -3
+---
+
+<!-- vale GoogleWe = NO -->
+<!-- vale We = NO -->
+
+# Breaking changes in Grafana v11.0-preview
+
+Following are breaking changes that you should be aware of when upgrading to Grafana v11.0-preview.
+
+For our purposes, a breaking change is any change that requires users or operators to do something. This includes:
+
+- Changes in one part of the system that could cause other components to fail
+- Deprecations or removal of a feature
+- Changes to an API that could break automation
+- Changes that affect some plugins or functions of Grafana
+- Migrations that can’t be rolled back
+
+For each change, the provided information:
+
+- Helps you determine if you’re affected
+- Describes the change or relevant background information
+- Guides you in how to mitigate for the change or migrate
+- Provides more learning resources
+
+For release highlights and deprecations, refer to our [v11.0-preview What’s new](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/whatsnew/whats-new-in-v11-0/). For the specific steps we recommend when you upgrade to v11.0, check out our [Upgrade guide](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/upgrade-guide/upgrade-v11.0/).
+
+<!--
+## Feature
+
+You must use relative references when linking to docs within the Grafana repo. Please do not use absolute URLs. For more information about relrefs, refer to [Links and references](/docs/writers-toolkit/writing-guide/references/).-->
+
+<!-- Last copied from Google Doc March 26th 8:45pm -->
+
+## Users and Operators
+
+### AngularJS support is turned off by default
+
+#### Description
+
+In Grafana v11, support for the deprecated AngularJS framework is turned off by default for all self-managed (on-premise) and Cloud instances of Grafana. This prevents any data source or panel visualization which relies on AngularJS from being loaded, and therefore has the potential to significantly disrupt your dashboards. Support will be fully removed in the next major release of Grafana.
+
+#### Migration/mitigation
+
+To avoid disruption, ensure all plugins are up to date and migrate from any remaining AngularJS plugins to a React-based alternative. If a plugin relies on AngularJS, a warning icon and message will be displayed in the [plugins catalog](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/plugin-management/#plugin-catalog) in Grafana and any dashboard panel where it's used. Additionally, a warning banner will appear in any impacted dashboards. A list of all impacted dashboards can also be generated using the [`detect-angular-dashboards`](https://github.com/grafana/detect-angular-dashboards) tool.
+
+Our [documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/developers/angular_deprecation/angular-plugins/) lists all known public plugins and provides migration advice when possible.
+
+For self-managed users of Grafana and existing Grafana Cloud instances, you can temporarily re-enable support through the [configuration parameter](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/#angular_support_enabled), `angular_support_enabled=false`. However, AngularJS-based plugins will not receive any further updates and we strongly recommend migration as soon as possible. This configuration parameter will also be removed in the next major release after Grafana v11.
+
+New Grafana Cloud users will be unable to request that support be added to their instance.
+
+#### Learn more
+
+Refer to this [blog post](https://grafana.com/blog/2024/03/11/removal-of-angularjs-support-in-grafana-what-you-need-to-know/) for more information.
+
+### Grafana Enterprise: Anonymous devices are billed as users
+
+#### Description
+
+Effective starting in Grafana v11, anonymous users are counted and charged as users in Grafana Enterprise. When you upgrade to v11, anonymous users will be automatically counted as active users against your Grafana Enterprise license.
+
+#### Migration/mitigation
+
+Turn off anonymous access, and consider using public dashboards to allow view-only access to publicly-accessible dashboards.
+
+#### Learn more
+
+[Anonymous access documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-security/configure-authentication/grafana/#anonymous-authentication)
+
+### Legacy alerting is entirely removed
+
+Legacy alerting has reached its end-of-life. In Grafana v11 you can no longer enable legacy alerting, and Grafana will fail to start if the settings are not updated to run the new Grafana Alerting. This also means that starting in Grafana v11, it is no longer possible to migrate from legacy alerting to our new alerting. Grafana v10.4.x is the last version that offers migration, so make sure to migrate to the new Grafana Alerting system _before_ upgrading to Grafana v11. Learn more about Grafana Alerting and the advantages of the new system in the [legacy alerting deprecation documentation](https://grafana.com/docs/grafana/v10.4/alerting/set-up/migrating-alerts/legacy-alerting-deprecation/). Learn more about migration in the [upgrade alerting documentation](https://grafana.com/docs/grafana/v10.4/alerting/set-up/migrating-alerts/).
+
+For more details on the code removal, review the following PRs:
+
+- [https://github.com/grafana/grafana/pull/83651](https://github.com/grafana/grafana/pull/83651)
+- [https://github.com/grafana/grafana/issues/81268](https://github.com/grafana/grafana/issues/81268)
+
+### Deprecated endpoints and fields in Reporting removed
+
+#### Description
+
+In Grafana v11, support for deprecated endpoints and fields in **Reporting** related to the old scheduling format, email, and dashboard is fully removed. This prevents any calls to deprecated endpoints and passing in values to deprecated fields. This feature only affects Cloud and Enterprise customers who use the API to generate reports.
+
+#### Migration/mitigation
+
+Ensure deprecated endpoints are updated to new corresponding endpoints and deprecated fields are removed and replaced with new corresponding fields.
+
+#### Learn more
+
+The [Reporting documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/developers/http_api/reporting/) lists all supported endpoints and fields.
+
+### Change custom branding public dashboard footer behavior
+
+#### Description
+
+In Grafana v11, custom branding public dashboard footer behavior is changed to default to the Grafana logo if no footer logo or footer text is set. There is no option to hide the public dashboard footer anymore. This feature only affects Cloud Advanced and Enterprise customers.
+
+#### Migration/mitigation
+
+Ensure you have a public dashboard footer logo or footer text set if you don't want to display the default Grafana footer.
+
+#### Learn more
+
+[Configure custom branding documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/configure-custom-branding/#custom-branding-for-public-dashboards) for public dashboards
+
+### Subfolders cause very rare issues with folders that have forward slashes in their names
+
+#### Description and migration/mitigation
+
+The upgrade to enable subfolders can cause some issues with alerts in certain cases. If you've previously set up a folder that uses a forward slash in its name, you have an alert rule in that folder, and the notification policy is set to match that folder's name, notifications will be sent to the default receiver instead of the configured receiver.
+
+In these cases, we recommend that you take these steps before the upgrade to enable subfolders:
+
+- Create a copy of the affected routes and rewrite the matchers for the new copy. For example, if the original matcher was `grafana_folder=MyFolder/sub-folder`, then the new route matcher will be `grafana_folder=MyFolder\/sub-folder`.
+- After enabling subfolders, you can delete the old routes.
+
+Please note that if you use file provisioning, you can upgrade and update the routes at the same time.
+
+#### Learn more
+
+[Subfolders announcement](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/whatsnew/whats-new-in-v11-0/#subfolders)
+
+[Provisioning: Provision dashboards into subfolders PR](https://github.com/grafana/grafana/pull/79793)
+
+### The Input data source is removed
+
+The direct input data source plugin has been removed in Grafana v11. It has been in alpha for four years and is superseded by [TestData](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/datasources/testdata/), which ships with Grafana. This is a small deprecation.
+
+Review [this PR](https://github.com/grafana/grafana/pull/83163) for details.
+
+### Data sources: Query filtering changes
+
+The **Disable query** button in the query editor row has caused a lot of confusion among data source developers and end-users. Until now, it has been up to data source developers to filter out any hidden queries before or after they’re executed. Starting from Grafana v11, the tooltip of this button is changed from **Disable query** to **Hide response/Show response**. Responses that are associated with hidden queries will be removed by Grafana before they’re passed to the panel.
+
+Users of data source plugins that didn't previously remove hidden queries (before or after they were executed) will see a change of behavior as, previously, clicking the **Disable query** button had no impact on the query result. Starting from Grafana v11, responses associated with hidden queries are longer returned to the panel.
+
+We’re also moving the call to the `datasource.filterQuery` method to the query runner. This means that frontend-only data sources (or any data source that doesn't extend `DataSourceWithBackend` class) can implement this method. This streamlines data source plugin behavior, ensuring filtering works in the same way for all kinds of data source plugins.
+
+#### Migration/mitigation
+
+If data is missing in panels, make sure the query editor **Hide response** button is not clicked.
+
+#### Learn more
+
+[GitHub PR](https://github.com/grafana/grafana/pull/84656)
+
+### Chore: Query oauth info from a new instance
+
+We've added a validation between the response of the ID token HD parameter and the list of allowed domains as an extra layer of security. In the event that the HD parameter doesn't match the list of allowed domains, we're denying access to Grafana.
+
+If you set Google OAuth configuration using `api_url,` you might be using the legacy implementation of OAuth, which doesn't have the HD parameter describing the organization from which the approved token comes. This could break your login flow.
+
+You can turn off this feature through the configuration toggle `validate_hd `. Anyone using the legacy Google OAuth configuration should turn off this validation if the ID Token response doesn't have the HD parameter.
+
+[GitHub PR](https://github.com/grafana/grafana/pull/83229)
+
+### Changes to how the panel view URL is generated for repeated panels
+
+#### Description
+
+With the introduction of the Scenes library to dashboards, the URL that’s generated when viewing an individual repeated panel has changed. We’ve changed how these panels are referenced and what used to be `&viewPanel=panel-5` is now `&viewPanel=panel-3-clone1`.
+
+This means that the previous URLs won’t work anymore and instead you'll be redirected to the dashboard view and you'll get a _Panel not found_ error. From this point on, the dashboard will continue to work as expected.
+
+#### Migration/mitigation
+
+Reopen the panel in view mode and you'll get the new URL.
+
+## Plugin developers
+
+### React Router is deprecated
+
+#### Description
+
+In Grafana v11 we're marking react-router v5 as deprecated. App plugins should start migrating to use react-router v6.
+
+#### Migration/mitigation
+
+For a complete guide, please follow our [migration docs on the developer portal](https://grafana.com/developers/plugin-tools/migration-guides/update-from-grafana-versions/migrate-9_x-to-10_x#update-to-react-router-v6).
+
+#### Learn more
+
+- Grafana v9.x to v10.x [migration guide](https://grafana.com/developers/plugin-tools/migration-guides/update-from-grafana-versions/migrate-9_x-to-10_x#update-to-react-router-v6)
+- Official react-router v5 to v6 [migration guide](https://reactrouter.com/en/main/upgrading/v5)
+- Grafana community forum [topic](https://community.grafana.com/t/migrating-app-plugins-to-use-react-router-v6/115410)
+
+### Chore: Taint ArrayVector with `never` to further discourage
+
+[GitHub PR](https://github.com/grafana/grafana/pull/83681)
+
+The Vector interface that was deprecated in Grafana v10 is further deprecated. Using it now generates build-time Typescript errors, but it remains working at runtime. If you're still using ArrayVector in your code, you should remove it immediately and replace it with plain arrays. Plugins that are compiled against older versions and depend on calling get/set will continue to work because the Array prototype still has a modified prototype. This will be removed in the future.
+
+### Chore: Remove React 17 peer deps
+
+[GitHub PR](https://github.com/grafana/grafana/pull/83524)
+
+We've removed React 17 as a peer dependency from our packages. Anyone using the new versions of these packages should ensure they've upgraded to React 18 following [the upgrade steps](https://react.dev/blog/2022/03/08/react-18-upgrade-guide).
+
+### Chore: Remove SystemJS from Grafana/Runtime
+
+[GitHub PR](https://github.com/grafana/grafana/pull/84561)
+
+SystemJS is no longer exported from `@grafana/runtime`. Plugin developers should instead rely on importing modules/packages using standard TS import syntax and npm/yarn for package installation.
diff --git a/docs/sources/dashboards/_index.md b/docs/sources/dashboards/_index.md
index 4ab78bd07df83..79ffef5454c21 100644
--- a/docs/sources/dashboards/_index.md
+++ b/docs/sources/dashboards/_index.md
@@ -8,62 +8,64 @@ labels:
     - oss
 title: Dashboards
 weight: 70
+description: Create and manage dashboards
+hero:
+  title: Dashboards
+  level: 1
+  width: 110
+  height: 110
+  description: >-
+    Dashboards allow you to query, transform, visualize, and understand your data no matter where it’s stored.
+cards:
+  title_class: pt-0 lh-1
+  items:
+    - title: Build dashboards
+      href: ./build-dashboards/
+      description: Get step-by-step directions for how to create or import your first dashboard and modify dashboard settings. Learn about reusable library panels, dashboard links, annotatations, and dashboard JSON.
+      height: 24
+    - title: Manage dashboards
+      href: ./manage-dashboards/
+      description: Learn about dashboard and folder management, as well as generative AI features for dashboards.
+      height: 24
+    - title: Variables
+      href: ./variables/
+      description: Add variables to metric queries and panel titles to create interactive and dynamic dashboards.
+      height: 24
+    - title: Public dashboards
+      href: ./dashboard-public/
+      description: Make your Grafana dashboards public and share them with anyone without requiring access to your Grafana organization.
+      height: 24
+    - title: Reporting
+      href: ./create-reports/
+      description: Automatically generate and share PDF reports from your Grafana dashboards.
+      height: 24
+    - title: Sharing
+      href: ./share-dashboards-panels/
+      description: Share Grafana dashboards and panels within your organization using links, snapshots, and JSON exports.
+      height: 24
 ---
 
-# Dashboards
+{{< docs/hero-simple key="hero" >}}
 
-A dashboard is a set of one or more [panels][] organized and arranged into one or more rows. Grafana ships with a variety of panels making it easy to construct the right queries, and customize the visualization so that you can create the perfect dashboard for your need. Each panel can interact with data from any configured Grafana [data source][].
-
-Dashboard snapshots are static. Queries and expressions cannot be re-executed from snapshots. As a result, if you update any variables in your query or expression, it will not change your dashboard data.
-
-Before you begin, ensure that you have configured a data source. See also:
-
-- [Use dashboards][]
-- [Build dashboards][]
-- [Create dashboard folders][]
-- [Manage dashboards][]
-- [Public dashboards][]
-- [Annotations][]
-- [Playlist][]
-- [Reporting][]
-- [Version history][]
-- [Export and import][]
-- [JSON model][]
-
-{{% docs/reference %}}
-[Reporting]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/create-reports"
-[Reporting]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/create-reports"
-
-[Public dashboards]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/dashboard-public"
-[Public dashboards]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/dashboard-public"
-
-[Version history]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/build-dashboards/manage-version-history"
-[Version history]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/build-dashboards/manage-version-history"
+---
 
-[panels]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations"
-[panels]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations"
+## Overview
 
-[Annotations]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/build-dashboards/annotate-visualizations"
-[Annotations]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/build-dashboards/annotate-visualizations"
+A Grafana dashboard is a set of one or more [panels][], organized and arranged into one or more rows, that provide an at-a-glance view of related information. These panels are created using components that query and transform raw data from a data source into charts, graphs, and other visualizations.
 
-[Create dashboard folders]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/manage-dashboards#create-a-dashboard-folder"
-[Create dashboard folders]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/manage-dashboards#create-a-dashboard-folder"
+A data source can be an SQL database, Grafana Loki, Grafana Mimir, or a JSON-based API. It can even be a basic CSV file. Data source plugins take a query you want answered, retrieve the data from the data source, and reconcile the differences between the data model of the data source and the data model of Grafana dashboards.
 
-[JSON model]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/build-dashboards/view-dashboard-json-model"
-[JSON model]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/build-dashboards/view-dashboard-json-model"
+Queries allow you to reduce the entirety of your data to a specific dataset, providing a more manageable visualization. Since data sources have their own distinct query languages, Grafana dashboards provide you with a query editor to accommodate these differences.
 
-[Export and import]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/manage-dashboards#export-and-import-dashboards"
-[Export and import]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/manage-dashboards#export-and-import-dashboards"
+A panel is the container that displays the visualization and provides you with various controls to manipulate it. Panel options let you customize many aspects of a visualization and the options differ based on which visualization you select. When the data format in a visualization doesn’t meet your requirements, you can apply a transformation that manipulates the data returned by a query.
 
-[Manage dashboards]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/manage-dashboards"
-[Manage dashboards]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/manage-dashboards"
+With 150+ data source plugins, you can unify all your data sources into a single dashboard to streamline data monitoring and troubleshooting. With Grafana, you can translate, transform, and visualize data in flexible and versatile dashboards.
 
-[Build dashboards]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/build-dashboards"
-[Build dashboards]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/build-dashboards"
+## Explore
 
-[Use dashboards]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/use-dashboards"
-[Use dashboards]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/use-dashboards"
+{{< card-grid key="cards" type="simple" >}}
 
-[Playlist]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/create-manage-playlists"
-[Playlist]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/create-manage-playlists"
+{{% docs/reference %}}
+[panels]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/panel-overview"
+[panels]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/panel-overview"
 {{% /docs/reference %}}
diff --git a/docs/sources/dashboards/assess-dashboard-usage/index.md b/docs/sources/dashboards/assess-dashboard-usage/index.md
index 005a021c2dc72..4f451a66d4818 100644
--- a/docs/sources/dashboards/assess-dashboard-usage/index.md
+++ b/docs/sources/dashboards/assess-dashboard-usage/index.md
@@ -51,20 +51,16 @@ For every dashboard and data source, you can access usage information.
 
 To see dashboard usage information, click the dashboard insights icon in the header.
 
-{{< figure src="/media/docs/grafana/dashboards/screenshot-dashboard-insights.png" max-width="400px" class="docs-image--no-shadow" >}}
+{{< figure src="/media/docs/grafana/dashboards/screenshot-dashboard-insights.png" max-width="400px" class="docs-image--no-shadow" alt="Dashboard insights icon" >}}
 
 Dashboard insights show the following information:
 
 - **Stats:** The number of daily queries and errors for the past 30 days.
 - **Users & activity:** The daily view count for the last 30 days; last activities on the dashboard and recent users (with a limit of 20).
 
-{{< figure src="/static/img/docs/enterprise/dashboard_insights_stats.png" max-width="400px" class="docs-image--no-shadow" >}}{{< figure src="/static/img/docs/enterprise/dashboard_insights_users.png" max-width="400px" class="docs-image--no-shadow" >}}
+{{< figure src="/static/img/docs/enterprise/dashboard_insights_stats.png" max-width="400px" class="docs-image--no-shadow" alt="Stats tab" >}}{{< figure src="/static/img/docs/enterprise/dashboard_insights_users.png" max-width="400px" class="docs-image--no-shadow" alt="Users and activity tab" >}}
 
-{{% admonition type="note" %}}
-
-If you've enabled the `publicDashboards` feature toggle, you'll also see a Public dashboards tab in your analytics.
-
-{{% /admonition %}}
+If public dashboards are [enabled][], you'll also see a **Public dashboards** tab in your analytics.
 
 ### Data source insights
 
@@ -81,7 +77,7 @@ To find data source insights:
 1. Click a data source.
 1. Click the **Insights** tab.
 
-{{< figure src="/media/docs/grafana/dashboards/screenshot-data-source-insights-9.5.png" max-width="650px" class="docs-image--no-shadow" >}}
+{{< figure src="/media/docs/grafana/dashboards/screenshot-data-source-insights-9.5.png" max-width="650px" class="docs-image--no-shadow" alt="Insights tab for a data source" >}}
 
 ## Presence indicator
 
@@ -89,7 +85,7 @@ When you are signed in and looking at a dashboard, you can know who is looking a
 
 When there are more active users on a dashboard than can fit within the presence indicator, click the **+X** icon. Doing so opens [dashboard insights](#dashboard-and-data-source-insights), which contains more details about recent user activity.
 
-{{< figure src="/static/img/docs/enterprise/presence_indicators.png" max-width="400px" class="docs-image--no-shadow" >}}
+{{< figure src="/static/img/docs/enterprise/presence_indicators.png" max-width="400px" class="docs-image--no-shadow" alt="Presence indicator icons" >}}
 
 To change _recent_ to something other than the past 10 minutes, edit the [configuration][] file:
 
@@ -123,7 +119,7 @@ You can sort the dashboards by:
 - Views total
 - Views 30 days (most and least)
 
-{{< figure src="/media/docs/grafana/dashboards/screenshot-dashboard-sort-9.5.png" max-width="650px" class="docs-image--no-shadow" >}}
+{{< figure src="/media/docs/grafana/dashboards/screenshot-dashboard-sort-9.5.png" max-width="650px" class="docs-image--no-shadow" alt="Open list of dashboard sort options" >}}
 
 ## Visualize usage insights data
 
@@ -146,4 +142,7 @@ You can click the previous links to download the respective dashboard JSON, then
 
 [Grafana Enterprise]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/introduction/grafana-enterprise"
 [Grafana Enterprise]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/introduction/grafana-enterprise"
+
+[enabled]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-grafana#public_dashboards"
+[enabled]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-grafana#public_dashboards"
 {{% /docs/reference %}}
diff --git a/docs/sources/dashboards/build-dashboards/_index.md b/docs/sources/dashboards/build-dashboards/_index.md
index 50e2643c61a59..b035de4d36216 100644
--- a/docs/sources/dashboards/build-dashboards/_index.md
+++ b/docs/sources/dashboards/build-dashboards/_index.md
@@ -13,6 +13,7 @@ labels:
     - oss
 menuTitle: Build dashboards
 title: Build dashboards
+description: Build dashboards including managing settings, links, and version history
 weight: 2
 ---
 
diff --git a/docs/sources/dashboards/build-dashboards/annotate-visualizations/index.md b/docs/sources/dashboards/build-dashboards/annotate-visualizations/index.md
index 6eedd05a43e9e..966a6097874a0 100644
--- a/docs/sources/dashboards/build-dashboards/annotate-visualizations/index.md
+++ b/docs/sources/dashboards/build-dashboards/annotate-visualizations/index.md
@@ -15,13 +15,16 @@ labels:
 menuTitle: Annotate visualizations
 title: Annotate visualizations
 weight: 600
+description: Annotate dashboard visualizations to mark points with rich events
 ---
 
 # Annotate visualizations
 
 Annotations provide a way to mark points on a visualization with rich events. They are visualized as vertical lines and icons on all graph panels. When you hover over an annotation, you can get event description and event tags. The text field can include links to other systems with more detail.
 
-{{< figure src="/static/img/docs/v46/annotations.png" max-width="800px" >}}
+{{< figure src="/static/img/docs/v46/annotations.png" max-width="800px" alt="Annotated visualization with annotation context menu open" >}}
+
+{{< docs/play title="Annotations" url="https://play.grafana.org/d/000000010/" >}}
 
 You can annotate visualizations in three ways:
 
@@ -43,7 +46,14 @@ Annotations are supported for the following visualization types:
 
 Grafana comes with the ability to add annotation events directly from a panel using the [built-in annotation query](#built-in-query) that exists on all dashboards. Annotations that you create this way are stored in Grafana.
 
-To add annotations directly in the panel, the built-in query must be enabled. Learn more in [Built-in query](#built-in-query)
+To add annotations directly in the panel:
+
+- The dashboard must already be saved.
+- The built-in query must be enabled. Learn more in [Built-in query](#built-in-query).
+
+Watch the following video for a quick tutorial on creating annotations:
+
+{{< youtube id="N5iOlyYyK6Q" >}}
 
 ### Add an annotation
 
@@ -82,6 +92,10 @@ Alternatively, to add an annotation, press Ctrl/Cmd and click the panel, and the
 
 In the dashboard settings, under **Annotations**, you can add new queries to fetch annotations using any data source, including the built-in data annotation data source. Annotation queries return events that can be visualized as event markers in graphs across the dashboard.
 
+Check out the video below for a quick tutorial.
+
+{{< youtube id="2istdJpPj2Y" >}}
+
 ### Add new annotation queries
 
 To add a new annotation query to a dashboard, take the following steps:
@@ -119,6 +133,8 @@ To add a new annotation query to a dashboard, take the following steps:
 
 After you add an annotation, they will still be visible. This is due to the built-in annotation query that exists on all dashboards. This annotation query will fetch all annotation events that originate from the current dashboard, which are stored in Grafana, and show them on the panel where they were created. This includes alert state history annotations.
 
+By default, the built-in annotation query uses the `-- Grafana --` special data source, and manual annotations are only supported using this data source. You can use another data source in the built-in annotation query, but you'll only be able to create automated annotations using the query editor for that data source.
+
 To add annotations directly to the dashboard, this query must be enabled.
 
 To confirm if the built-in query is enabled, take the following steps:
@@ -148,21 +164,21 @@ Grafana v8.1 and later versions also support typeahead of existing tags, provide
 
 For example, create an annotation query name `outages` and specify a tag `outage`. This query will show all annotations (from any dashboard or via API) with the `outage` tag. If multiple tags are defined in an annotation query, then Grafana will only show annotations matching all the tags. To modify the behavior, enable `Match any`, and Grafana will show annotations that contain any one of the tags you provided.
 
-{{< figure src="/media/docs/grafana/dashboards/screenshot-annotations-typeahead-support-10.0.png" max-width="600px" >}}
+{{< figure src="/media/docs/grafana/dashboards/screenshot-annotations-typeahead-support-10.0.png" max-width="600px" alt="Annotation query options" >}}
 
 You can also use template variables in the tag query. This means if you have a dashboard showing stats for different services and a template variable that dictates which services to show, you can use the same template variable in your annotation query to only show annotations for those services.
 
-{{< figure src="/media/docs/grafana/dashboards/screenshot-annotation-tag-filter-variable-10.0.png" max-width="600px" >}}
+{{< figure src="/media/docs/grafana/dashboards/screenshot-annotation-tag-filter-variable-10.0.png" max-width="600px" alt="Annotation query options with a template variable query tag" >}}
 
 ### Add time regions
 
 When adding or editing an annotation, you can define a repeating time region by setting **Query type** to **Time regions**. Then, define the **From** and **To** sections with the preferred days of the week and time. You also have the option to change the timezone, which is set to the dashboard's timezone, by default.
 
-{{< figure src="/media/docs/grafana/dashboards/screenshot-annotation-timeregions-10-v2.png" max-width="600px" caption="Time regions business hours" >}}
+{{< figure src="/media/docs/grafana/dashboards/screenshot-annotation-timeregions-10-v2.png" max-width="600px" alt="Time regions options set to business hours" >}}
 
 The above configuration will produce the following result in the Time series panel:
 
-{{< figure src="/media/docs/grafana/screenshot-grafana-10-0-timeseries-time-regions.png" max-width="600px" caption="Time series time regions business hours" >}}
+{{< figure src="/media/docs/grafana/screenshot-grafana-10-0-timeseries-time-regions.png" max-width="600px" alt="Time series visualization with time regions business hours" >}}
 
 {{% docs/reference %}}
 [Annotations API]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/developers/http_api/annotations"
diff --git a/docs/sources/dashboards/build-dashboards/best-practices/index.md b/docs/sources/dashboards/build-dashboards/best-practices/index.md
index f02ec672bf6af..e50b24c62affb 100644
--- a/docs/sources/dashboards/build-dashboards/best-practices/index.md
+++ b/docs/sources/dashboards/build-dashboards/best-practices/index.md
@@ -6,7 +6,7 @@ aliases:
   - ../../best-practices/common-observability-strategies/
   - ../../best-practices/dashboard-management-maturity-levels/
   - ../../getting-started/strategies/
-description: Best practices for working with Grafana
+description: Learn best practices for building and maintaining Grafana dashboards
 labels:
   products:
     - cloud
@@ -14,7 +14,7 @@ labels:
     - oss
 menuTitle: Best practices
 title: Grafana dashboard best practices
-weight: 100
+weight: 800
 ---
 
 # Grafana dashboard best practices
@@ -69,7 +69,7 @@ This method is similar to the RED method, but it includes saturation.
 - **Errors -** Rate of requests that are failing
 - **Saturation -** How "full" your system is
 
-[Here's an example from Grafana Play](https://play.grafana.org/d/000000109/the-four-golden-signals?orgId=1).
+{{< docs/play title="The Four Golden Signals" url="https://play.grafana.org/d/000000109/" >}}
 
 ## Dashboard management maturity model
 
diff --git a/docs/sources/dashboards/build-dashboards/create-dashboard-url-variables/index.md b/docs/sources/dashboards/build-dashboards/create-dashboard-url-variables/index.md
index 44214c5a43d42..4bdb6ac9d3e49 100644
--- a/docs/sources/dashboards/build-dashboards/create-dashboard-url-variables/index.md
+++ b/docs/sources/dashboards/build-dashboards/create-dashboard-url-variables/index.md
@@ -14,6 +14,7 @@ labels:
     - enterprise
     - oss
 title: Dashboard URL variables
+description: Use variables in dashboard URLs to add more context to your links
 weight: 250
 ---
 
diff --git a/docs/sources/dashboards/build-dashboards/create-dashboard/index.md b/docs/sources/dashboards/build-dashboards/create-dashboard/index.md
index 172e5b1b4f50a..6ebaa3e3e46b3 100644
--- a/docs/sources/dashboards/build-dashboards/create-dashboard/index.md
+++ b/docs/sources/dashboards/build-dashboards/create-dashboard/index.md
@@ -12,6 +12,7 @@ labels:
     - oss
 menuTitle: Create a dashboard
 title: Create a dashboard
+description: Create and edit a dashboard
 weight: 1
 ---
 
@@ -34,7 +35,7 @@ Dashboards and panels allow you to show your data in visual form. Each panel nee
 
    ![Empty dashboard state](/media/docs/grafana/dashboards/empty-dashboard-10.2.png)
 
-1. In the modal that opens, do one of the following:
+1. In the dialog box that opens, do one of the following:
 
    - Select one of your existing data sources.
    - Select one of the Grafana's [built-in special data sources][].
@@ -43,7 +44,7 @@ Dashboards and panels allow you to show your data in visual form. Each panel nee
    {{< figure class="float-right"  src="/media/docs/grafana/dashboards/screenshot-data-source-selector-10.0.png" max-width="800px" alt="Select data source modal" >}}
 
    The **Edit panel** view opens with your data source selected.
-   You can change the panel data source later using the dropdown in the **Query** tab of the panel editor if needed.
+   You can change the panel data source later using the drop-down in the **Query** tab of the panel editor if needed.
 
    For more information about data sources, refer to [Data sources][] for specific guidelines.
 
@@ -61,6 +62,7 @@ Dashboards and panels allow you to show your data in visual form. Each panel nee
 
    For more information about individual visualizations, refer to [Visualizations options][].
 
+1. Under **Panel options**, enter a title and description for your panel or have Grafana create them using [generative AI features][].
 1. Refer to the following documentation for ways you can adjust panel settings.
 
    While not required, most visualizations need some adjustment before they properly display the information that you need.
@@ -75,14 +77,29 @@ Dashboards and panels allow you to show your data in visual form. Each panel nee
 
    Alternatively, click **Apply** if you want to see your changes applied to the dashboard first. Then click the save icon in the dashboard header.
 
-1. Enter a name for your dashboard and select a folder, if applicable.
+1. Enter a title and description for your dashboard or have Grafana create them using [generative AI features][].
+1. Select a folder, if applicable.
 1. Click **Save**.
-1. To add more panels to the dashboard, click **Add** in the dashboard header and select **Visualization** in the dropdown.
+1. To add more panels to the dashboard, click **Add** in the dashboard header and select **Visualization** in the drop-down.
 
-   ![Add dropdown](/media/docs/grafana/dashboards/screenshot-add-dropdown-10.0.png)
+   ![Add drop-down](/media/docs/grafana/dashboards/screenshot-add-dropdown-10.0.png)
 
    When you add additional panels to the dashboard, you're taken straight to the **Edit panel** view.
 
+## Copy an existing dashboard
+
+To copy an existing dashboard, follow these steps:
+
+1. Click **Dashboards** in the primary menu.
+1. Open the dashboard to be copied.
+1. Click **Settings** (gear icon) in the top right of the dashboard.
+1. Click **Save as** in the top-right corner of the dashboard.
+1. (Optional) Specify the name, folder, description, and whether or not to copy the original dashboard tags for the copied dashboard.
+
+   By default, the copied dashboard has the same name as the original dashboard with the word "Copy" appended and is located in the same folder.
+
+1. Click **Save**.
+
 ## Configure repeating rows
 
 You can configure Grafana to dynamically add panels or rows to a dashboard based on the value of a variable. Variables dynamically change your queries across all rows in a dashboard. For more information about repeating panels, refer to [Configure repeating panels][].
@@ -97,7 +114,7 @@ To see an example of repeating rows, refer to [Dashboard with repeating rows](ht
 
 1. Click **Dashboards** in the left-side menu.
 1. Navigate to the dashboard you want to work on.
-1. At the top of the dashboard, click **Add** and select **Row** in the dropdown.
+1. At the top of the dashboard, click **Add** and select **Row** in the drop-down.
 
    If the dashboard is empty, you can click the **+ Add row** button in the middle of the dashboard.
 
@@ -170,4 +187,7 @@ You can size a dashboard panel to suits your needs.
 
 [Configure standard options]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-standard-options"
 [Configure standard options]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-standard-options"
+
+[generative AI features]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/manage-dashboards#set-up-generative-ai-features-for-dashboards"
+[generative AI features]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/dashboards/manage-dashboards#set-up-generative-ai-features-for-dashboards"
 {{% /docs/reference %}}
diff --git a/docs/sources/dashboards/build-dashboards/import-dashboards/index.md b/docs/sources/dashboards/build-dashboards/import-dashboards/index.md
new file mode 100644
index 0000000000000..4f4003ad70c0a
--- /dev/null
+++ b/docs/sources/dashboards/build-dashboards/import-dashboards/index.md
@@ -0,0 +1,60 @@
+---
+aliases:
+  - ../../reference/export_import/ # /docs/grafana/<GRAFANA_VERSION>/reference/export_import/
+  - ../export-import/ # /docs/grafana/<GRAFANA_VERSION>/dashboards/export-import/
+canonical: https://grafana.com/docs/grafana/latest/dashboards/build-dashboards/import-dashboards/
+keywords:
+  - grafana
+  - dashboard
+  - import
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+menuTitle: Import dashboards
+title: Import dashboards
+description: Learn how to import dashboards and about Grafana's preconfigured dashboards
+weight: 5
+---
+
+# Import dashboards
+
+You can import preconfigured dashboards into your Grafana instance or Cloud stack using the UI or the [HTTP API][].
+
+## Import a dashboard
+
+To import a dashboard, follow these steps:
+
+1. Click **Dashboards** in the primary menu.
+1. Click **New** and select **Import** in the drop-down menu.
+1. Perform one of the following steps:
+
+   - Upload a dashboard JSON file.
+   - Paste a [Grafana.com dashboard](#discover-dashboards-on-grafanacom) URL or ID into the field provided.
+   - Paste dashboard JSON text directly into the text area.
+
+1. (Optional) Change the dashboard name, folder, or UID, and specify metric prefixes, if the dashboard uses any.
+1. Select a data source, if required.
+1. Click **Import**.
+1. Save the dashboard.
+
+## Discover dashboards on grafana.com
+
+The [Dashboards page](https://grafana.com/grafana/dashboards/) on grafana.com provides you with dashboards for common server applications. Browse our library of official and community-built dashboards and import them to quickly get up and running.
+
+{{< figure src="/media/docs/grafana/dashboards/screenshot-gcom-dashboards.png" alt="Preconfigured dashboards on grafana.com">}}
+
+You can also add to this library by exporting one of your own dashboards. For more information, refer to [Share dashboards and panels][].
+
+## More examples
+
+Your Grafana Cloud stack comes with several default dashboards in the **Grafana Cloud** folder in **Dashboards**. If you're running your own installation of Grafana, you can find more example dashboards in the `public/dashboards/` directory.
+
+{{% docs/reference %}}
+[HTTP API]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/developers/http_api"
+[HTTP API]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/developer-resources/api-reference/http-api"
+
+[Share dashboards and panels]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/share-dashboards-panels"
+[Share dashboards and panels]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/dashboards/share-dashboards-panels"
+{{% /docs/reference %}}
diff --git a/docs/sources/dashboards/build-dashboards/manage-dashboard-links/index.md b/docs/sources/dashboards/build-dashboards/manage-dashboard-links/index.md
index 2ea8dafc0efb0..ba83b0e073c31 100644
--- a/docs/sources/dashboards/build-dashboards/manage-dashboard-links/index.md
+++ b/docs/sources/dashboards/build-dashboards/manage-dashboard-links/index.md
@@ -6,7 +6,7 @@ aliases:
   - ../../linking/linking-overview/
   - ../../panels/working-with-panels/add-link-to-panel/
   - ../manage-dashboard-links/
-description: How to link Grafana dashboards.
+description: Add links to your Grafana dashboards to connect to other dashboards, panels, and websites
 keywords:
   - link
   - dashboard
@@ -94,7 +94,7 @@ Add a link to a URL at the top of your current dashboard. You can link to any av
      - `from` - Defines the lower limit of the time range, specified in ms epoch.
      - `to` - Defines the upper limit of the time range, specified in ms epoch.
      - `time` and `time.window` - Define a time range from `time-time.window/2` to `time+time.window/2`. Both params should be specified in ms. For example `?time=1500000000000&time.window=10000` will result in 10s time range from 1499999995000 to 1500000005000.
-   - **Variable values** – Select this option to include template variables currently used as query parameters in the link. When the user clicks the link, any matching templates in the linked dashboard are set to the values from the link. Here is the variable format: `https://${you-domain}/path/to/your/dashboard?var-${template-varable1}=value1&var-{template-variable2}=value2` **Example:** https://play.grafana.org/d/000000074/alerting?var-app=backend&var-server=backend_01&var-server=backend_03&var-interval=1h
+   - **Variable values** – Select this option to include template variables currently used as query parameters in the link. When the user clicks the link, any matching templates in the linked dashboard are set to the values from the link. Here is the variable format: `https://${you-domain}/path/to/your/dashboard?var-${template-variable1}=value1&var-{template-variable2}=value2` **Example:** https://play.grafana.org/d/000000074/alerting?var-app=backend&var-server=backend_01&var-server=backend_03&var-interval=1h
    - **Open in new tab** – Select this option if you want the dashboard link to open in a new tab or window.
 1. Click **Add**.
 
@@ -119,7 +119,7 @@ Each panel can have its own set of links that are shown in the upper left of the
 
 Click the icon next to the panel title to see available panel links.
 
-{{< figure src="/media/docs/grafana/screenshot-panel-links.png" width="200px" >}}
+{{< figure src="/media/docs/grafana/screenshot-panel-links.png" width="200px" alt="List of panel links displayed" >}}
 
 ### Add a panel link
 
diff --git a/docs/sources/dashboards/build-dashboards/manage-library-panels/index.md b/docs/sources/dashboards/build-dashboards/manage-library-panels/index.md
index c713f27dba908..e948a019c76fb 100644
--- a/docs/sources/dashboards/build-dashboards/manage-library-panels/index.md
+++ b/docs/sources/dashboards/build-dashboards/manage-library-panels/index.md
@@ -15,6 +15,7 @@ labels:
     - oss
 menuTitle: Manage library panels
 title: Manage library panels
+description: Create reusable library panels that you can use in any dashboard
 weight: 300
 ---
 
@@ -24,13 +25,17 @@ A library panel is a reusable panel that you can use in any dashboard. When you
 
 You can save a library panel in a folder alongside saved dashboards.
 
+## Role-based access control
+
+You can control permissions for library panels using [role-based access control (RBAC)][rbac]. RBAC provides a standardized way of granting, changing, and revoking access when it comes to viewing and modifying Grafana resources, such as dashboards, reports, and administrative settings.
+
 ## Create a library panel
 
 When you create a library panel, the panel on the source dashboard is converted to a library panel as well. You need to save the original dashboard once a panel is converted.
 
 1. Open a panel in edit mode.
 1. In the panel display options, click the down arrow option to bring changes to the visualization.
-   {{< figure src="/media/docs/grafana/panels-visualizations/screenshot-create-lib-panel-from-edit-9-5.png" class="docs-image--no-shadow" max-width= "800px" >}}
+   {{< figure src="/media/docs/grafana/panels-visualizations/screenshot-create-lib-panel-from-edit-9-5.png" class="docs-image--no-shadow" max-width= "800px" alt="Library panels tab of the panel editor pane" >}}
 1. Click **Library panels**, and then click **+ Create library panel** to open the create dialog.
 1. In **Library panel name**, enter the name.
 1. In **Save in folder**, select the folder to save the library panel.
@@ -41,7 +46,7 @@ Once created, you can modify the library panel using any dashboard on which it a
 
 You can also create a library panel directly from the edit menu of any panel.
 
-{{< figure src="/media/docs/grafana/panels-visualizations/screenshot-create-from-more-9-5.png" class="docs-image--no-shadow" max-width= "900px" >}}
+{{< figure src="/media/docs/grafana/panels-visualizations/screenshot-create-from-more-9-5.png" class="docs-image--no-shadow" max-width= "900px" alt="Create library panel option in the panel menu" >}}
 
 ## Add a library panel to a dashboard
 
@@ -77,7 +82,7 @@ You can view a list of available library panels and search for a library panel.
 1. Click **Library panels**.
 
    You can see a list of previously defined library panels.
-   {{< figure src="/media/docs/grafana/panels-visualizations/screenshot-library-panel-list-9-5.png" class="docs-image--no-shadow" max-width= "900px" >}}
+   {{< figure src="/media/docs/grafana/panels-visualizations/screenshot-library-panel-list-9-5.png" class="docs-image--no-shadow" max-width= "900px" alt="Library panels page with list of library panels" >}}
 
 1. Search for a specific library panel if you know its name.
 
@@ -90,3 +95,8 @@ Delete a library panel when you no longer need it.
 1. Click **Dashboards** in the left-side menu.
 1. Click **Library panels**.
 1. Click the delete icon next to the library panel name.
+
+{{% docs/reference %}}
+[rbac]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/administration/roles-and-permissions/access-control"
+[rbac]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA_VERSION>/administration/roles-and-permissions/access-control"
+{{% /docs/reference %}}
diff --git a/docs/sources/dashboards/build-dashboards/manage-version-history/index.md b/docs/sources/dashboards/build-dashboards/manage-version-history/index.md
index b261e2a63bc24..ffd4fa349d2ce 100644
--- a/docs/sources/dashboards/build-dashboards/manage-version-history/index.md
+++ b/docs/sources/dashboards/build-dashboards/manage-version-history/index.md
@@ -15,6 +15,7 @@ labels:
     - oss
 menutitle: Manage version history
 title: Manage dashboard version history
+description: View and compare previous versions of your dashboard
 weight: 400
 ---
 
diff --git a/docs/sources/dashboards/build-dashboards/modify-dashboard-settings/index.md b/docs/sources/dashboards/build-dashboards/modify-dashboard-settings/index.md
index d1d93552834df..9c15dc95099f3 100644
--- a/docs/sources/dashboards/build-dashboards/modify-dashboard-settings/index.md
+++ b/docs/sources/dashboards/build-dashboards/modify-dashboard-settings/index.md
@@ -12,6 +12,7 @@ labels:
     - oss
 menuTitle: Modify dashboard settings
 title: Modify dashboard settings
+description: Manage and edit your dashboard settings
 weight: 8
 ---
 
@@ -46,6 +47,24 @@ Adjust dashboard time settings when you want to change the dashboard timezone, t
    - **Now delay:** Override the `now` time by entering a time delay. Use this option to accommodate known delays in data aggregation to avoid null values.
    - **Hide time picker:** Select this option if you do not want Grafana to display the time picker.
 
+## Add tags
+
+You can add metadata to your dashboards using tags. Tags also give you the ability to filter the list of dashboards.
+
+Tags can be up to 50 characters long, including spaces.
+
+To add tags to a dashboard, follow these steps:
+
+1. On the **Dashboard settings** page, scroll down to the **Tags** section.
+1. In the field, enter a new or existing tag.
+
+   If you're entering an existing tag, make sure that you spell it the same way or a new tag is created.
+
+1. Click **Add** or press the Enter key.
+1. Save the dashboard.
+
+When you're on the **Dashboards** page, any tags you've entered show up under the **Tags** column.
+
 ## Add an annotation query
 
 An annotation query is a query that queries for events. These events can be visualized in graphs across the dashboard as vertical lines along with a small
diff --git a/docs/sources/dashboards/build-dashboards/view-dashboard-json-model/index.md b/docs/sources/dashboards/build-dashboards/view-dashboard-json-model/index.md
index 85dd0cf369758..affd4f6d850ec 100644
--- a/docs/sources/dashboards/build-dashboards/view-dashboard-json-model/index.md
+++ b/docs/sources/dashboards/build-dashboards/view-dashboard-json-model/index.md
@@ -14,6 +14,7 @@ labels:
     - enterprise
     - oss
 title: JSON model
+description: View your Grafana dashboard JSON object
 weight: 700
 ---
 
@@ -127,6 +128,19 @@ The grid has a negative gravity that moves panels up if there is empty space abo
     "enable": true,
     "notice": false,
     "now": true,
+    "hidden": false,
+    "nowDelay": "",
+    "time_options": [
+      "5m",
+      "15m",
+      "1h",
+      "6h",
+      "12h",
+      "24h",
+      "2d",
+      "7d",
+      "30d"
+    ],
     "refresh_intervals": [
       "5s",
       "10s",
@@ -146,15 +160,18 @@ The grid has a negative gravity that moves panels up if there is empty space abo
 
 Usage of the fields is explained below:
 
-| Name                  | Usage                                  |
-| --------------------- | -------------------------------------- |
-| **collapse**          | whether timepicker is collapsed or not |
-| **enable**            | whether timepicker is enabled or not   |
-| **notice**            |                                        |
-| **now**               |                                        |
-| **refresh_intervals** |                                        |
-| **status**            |                                        |
-| **type**              |                                        |
+| Name                  | Usage                                                                                                                                 |
+| --------------------- | ------------------------------------------------------------------------------------------------------------------------------------- |
+| **collapse**          | whether timepicker is collapsed or not                                                                                                |
+| **enable**            | whether timepicker is enabled or not                                                                                                  |
+| **notice**            |                                                                                                                                       |
+| **now**               |                                                                                                                                       |
+| **hidden**            | whether timepicker is hidden or not                                                                                                   |
+| **nowDelay**          | override the now time by entering a time delay. Use this option to accommodate known delays in data aggregation to avoid null values. |
+| **time_options**      | options available in the time picker dropdown                                                                                         |
+| **refresh_intervals** | interval options available in the refresh picker dropdown                                                                             |
+| **status**            |                                                                                                                                       |
+| **type**              |                                                                                                                                       |
 
 ### templating
 
@@ -242,8 +259,8 @@ Usage of the above mentioned fields in the templating section is explained below
 | **name**        | name of variable                                                                                        |
 | **options**     | array of variable text/value pairs available for selection on dashboard                                 |
 | **query**       | data source query used to fetch values for a variable                                                   |
-| **refresh**     |                                                                                                         |
-| **regex**       |                                                                                                         |
+| **refresh**     | configures when to refresh a variable                                                                   |
+| **regex**       | extracts part of a series name or metric node segment                                                   |
 | **type**        | type of variable, i.e. `custom`, `query` or `interval`                                                  |
 
 {{% docs/reference %}}
diff --git a/docs/sources/dashboards/create-manage-playlists/index.md b/docs/sources/dashboards/create-manage-playlists/index.md
index b218dcd0e50fe..20acca7382cc9 100644
--- a/docs/sources/dashboards/create-manage-playlists/index.md
+++ b/docs/sources/dashboards/create-manage-playlists/index.md
@@ -14,6 +14,7 @@ labels:
     - oss
 menuTitle: Manage playlists
 title: Manage playlists
+description: Create and manage dashboard playlists
 weight: 9
 ---
 
diff --git a/docs/sources/dashboards/create-reports/index.md b/docs/sources/dashboards/create-reports/index.md
index 41eb93c931d27..aebdae63d01dc 100644
--- a/docs/sources/dashboards/create-reports/index.md
+++ b/docs/sources/dashboards/create-reports/index.md
@@ -16,6 +16,7 @@ labels:
     - enterprise
 menuTitle: Reporting
 title: Create and manage reports
+description: Generate and share PDF reports from your Grafana dashboards
 weight: 85
 ---
 
@@ -26,10 +27,6 @@ Reporting enables you to automatically generate PDFs from any of your dashboards
 > If you have [Role-based access control][] enabled, for some actions you would need to have relevant permissions.
 > Refer to specific guides to understand what permissions are required.
 
-<!--
-{{< figure src="/static/img/docs/enterprise/reports_list_8.1.png" max-width="500px" >}}
--->
-
 Any changes you make to a dashboard used in a report are reflected the next time the report is sent. For example, if you change the time range in the dashboard, then the time range in the report also changes, unless you've configured a custom time range.
 
 For information about recent improvements to the reporting UI, refer to [Grafana reporting: How we improved the UX in Grafana](https://grafana.com/blog/2022/06/29/grafana-reporting-how-we-improved-the-ux-in-grafana/).
@@ -110,23 +107,27 @@ You can include dynamic dashboards with panels or rows, set to repeat by a varia
 
 By default, reports use the saved time range of the dashboard. You can change the time range of the report by:
 
-- Saving a modified time range to the dashboard.
+- Saving a modified time range to the dashboard. Changing the dashboard time range without saving it doesn't change the time zone of the report.
 - Setting a time range via the **Time range** field in the report form. If specified, the custom time range overrides the time range from the report's dashboard.
 
-The page header of the report displays the time range for the dashboard's data queries. Dashboards set to use the browser's time zone use the time zone on the Grafana server.
+The page header of the report displays the time range for the dashboard's data queries.
+
+#### Report time zones
+
+Reports use the time zone of the dashboard from which they’re generated. You can control the time zone for your reports by setting the dashboard to a specific time zone. Note that this affects the display of the dashboard for all users.
+
+If a dashboard has the **Browser Time** setting, the reports generated from that dashboard use the time zone of the Grafana server. As a result, this time zone might not match the time zone of users creating or receiving the report.
 
 If the time zone is set differently between your Grafana server and its remote image renderer, then the time ranges in the report might be different between the page header and the time axes in the panels. To avoid this, set the time zone to UTC for dashboards when using a remote renderer. Each dashboard's time zone setting is visible in the [time range controls][].
 
 ### Layout and orientation
 
-> We're actively developing new report layout options. [Contact us](https://grafana.com/contact?about=grafana-enterprise&topic=design-process&value=reporting) to get involved in the design process.
-
-| Layout | Orientation | Support | Description                                                                                               | Preview                                                                                                                                               |
-| ------ | ----------- | ------- | --------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Simple | Portrait    | v6.4+   | Generates an A4 page in portrait mode with three panels per page.                                         | {{< figure src="/static/img/docs/enterprise/reports_portrait_preview.png" max-width="500px" max-height="500px" class="docs-image--no-shadow" >}}      |
-| Simple | Landscape   | v6.7+   | Generates an A4 page in landscape mode with a single panel per page.                                      | {{< figure src="/static/img/docs/enterprise/reports_landscape_preview.png" max-width="500px" class="docs-image--no-shadow" >}}                        |
-| Grid   | Portrait    | v7.2+   | Generates an A4 page in portrait mode with panels arranged in the same way as at the original dashboard.  | {{< figure src="/static/img/docs/enterprise/reports_grid_portrait_preview.png" max-width="500px" max-height="500px" class="docs-image--no-shadow" >}} |
-| Grid   | Landscape   | v7.2+   | Generates an A4 page in landscape mode with panels arranged in the same way as in the original dashboard. | {{< figure src="/static/img/docs/enterprise/reports_grid_landscape_preview.png" max-width="500px" class="docs-image--no-shadow" >}}                   |
+| Layout | Orientation | Support | Description                                                                                               | Preview                                                                                                                                                                             |
+| ------ | ----------- | ------- | --------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Simple | Portrait    | v6.4+   | Generates an A4 page in portrait mode with three panels per page.                                         | {{< figure src="/static/img/docs/enterprise/reports_portrait_preview.png" max-width="500px" max-height="500px" class="docs-image--no-shadow" alt="Simple layout in portrait" >}}    |
+| Simple | Landscape   | v6.7+   | Generates an A4 page in landscape mode with a single panel per page.                                      | {{< figure src="/static/img/docs/enterprise/reports_landscape_preview.png" max-width="500px" class="docs-image--no-shadow" alt="Simple layout in landscape" >}}                     |
+| Grid   | Portrait    | v7.2+   | Generates an A4 page in portrait mode with panels arranged in the same way as at the original dashboard.  | {{< figure src="/static/img/docs/enterprise/reports_grid_portrait_preview.png" max-width="500px" max-height="500px" class="docs-image--no-shadow" alt="Grid layout in portrait" >}} |
+| Grid   | Landscape   | v7.2+   | Generates an A4 page in landscape mode with panels arranged in the same way as in the original dashboard. | {{< figure src="/static/img/docs/enterprise/reports_grid_landscape_preview.png" max-width="500px" class="docs-image--no-shadow" alt="Grid layout in landscape" >}}                  |
 
 ### CSV export
 
@@ -140,6 +141,19 @@ When the CSV file is generated, it is temporarily written to the `csv` folder in
 
 A background job runs every 10 minutes and removes temporary CSV files. You can configure how long a CSV file should be stored before being removed by configuring the [temp-data-lifetime][] setting. This setting also affects how long a renderer PNG file should be stored.
 
+### Table data in PDF
+
+{{% admonition type="note" %}}
+Available in public preview (`pdfTables` feature toggle) in [Grafana Enterprise][] v10.3+ with the [Grafana image renderer plugin](/grafana/plugins/grafana-image-renderer) v3.0+, and [Grafana Cloud](/docs/grafana-cloud/).
+{{% /admonition %}}
+
+When there's more data in your table visualizations than can be shown in the dashboard PDF, you can select one of these two options to access all table visualization data as PDF in your reports:
+
+- **Include table data as PDF appendix** - Adds an appendix to the main dashboard PDF.
+- **Attach a separate PDF of table data** - Generates a separate PDF file.
+
+This feature relies on the same plugin that supports the [image rendering][] features.
+
 ### Scheduling
 
 > **Note:** Available in [Grafana Enterprise][] version 8.0 and later, and [Grafana Cloud](/docs/grafana-cloud/).
@@ -196,7 +210,7 @@ You can generate and save PDF files of any dashboard.
 
 > **Note:** Available in [Grafana Enterprise][] version 6.7 and later, and [Grafana Cloud](/docs/grafana-cloud/).
 
-1. In the dashboard that you want to export as PDF, click the **Share dashboard** icon.
+1. In the dashboard that you want to export as PDF, click the **Share** button.
 1. On the PDF tab, select a layout option for the exported dashboard: **Portrait** or **Landscape**.
 1. Click **Save as PDF** to render the dashboard as a PDF file.
 
@@ -270,8 +284,8 @@ filters = report:debug
 ```
 
 {{% docs/reference %}}
-[time range controls]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/manage-dashboards"
-[time range controls]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/manage-dashboards"
+[time range controls]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/use-dashboards#set-dashboard-time-range"
+[time range controls]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/dashboards/use-dashboards#set-dashboard-time-range"
 
 [image rendering]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/image-rendering"
 [image rendering]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/image-rendering"
@@ -292,10 +306,10 @@ filters = report:debug
 [SMTP]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-grafana#smtp"
 
 [Repeat panels or rows]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-panel-options#configure-repeating-rows-or-panels"
-[Repeat panels or rows]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-panel-options#configure-repeating-rows-or-panels"
+[Repeat panels or rows]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-panel-options#configure-repeating-rows-or-panels"
 
 [Templates and variables]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/variables"
-[Templates and variables]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/variables"
+[Templates and variables]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/dashboards/variables"
 
 [temp-data-lifetime]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-grafana#temp-data-lifetime"
 [temp-data-lifetime]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-grafana#temp-data-lifetime"
diff --git a/docs/sources/dashboards/dashboard-public/index.md b/docs/sources/dashboards/dashboard-public/index.md
index 5b4d9e6ed0abb..bd5a75a84b7e8 100644
--- a/docs/sources/dashboards/dashboard-public/index.md
+++ b/docs/sources/dashboards/dashboard-public/index.md
@@ -8,6 +8,7 @@ labels:
     - enterprise
     - oss
 title: Public dashboards
+description: Make your Grafana dashboards public and share them with anyone
 weight: 8
 ---
 
@@ -138,6 +139,7 @@ guaranteed because plugin developers can override this functionality. The follow
     <td>
       <ul>
         <li>ClickHouse</li>
+        <li>CloudWatch</li>
         <li>Elasticsearch</li>
         <li>Infinity</li>
         <li>InfluxDB</li>
@@ -165,7 +167,6 @@ guaranteed because plugin developers can override this functionality. The follow
   <tr>
     <td>
       <ul>
-        <li>CloudWatch</li>
         <li>Graphite</li>
       </ul>
     </td>
@@ -236,16 +237,14 @@ guaranteed because plugin developers can override this functionality. The follow
 ## Limitations
 
 - Panels that use frontend data sources will fail to fetch data.
-- Template variables are not currently supported, but support is planned in the future.
+- Template variables are not supported.
 - Exemplars will be omitted from the panel.
 - Only annotations that query the `-- Grafana --` data source are supported.
 - Organization annotations are not supported.
 - Grafana Live and real-time event streams are not supported.
-- Library panels are currently not supported, but support is planned in the future.
+- Library panels are not supported.
 - Data sources using Reverse Proxy functionality are not supported.
 
-We're excited to share this enhancement with you and we’d love your feedback! Please check out the [Github](https://github.com/grafana/grafana/discussions/49253) discussion and join the conversation.
-
 ## Custom branding
 
 If you're a Grafana Enterprise customer, you can use custom branding to change the appearance of a public dashboard footer. For more information, refer to [Custom branding][].
diff --git a/docs/sources/dashboards/manage-dashboards/index.md b/docs/sources/dashboards/manage-dashboards/index.md
index c9ddc5dfaa3f2..0c7ccb06176c7 100644
--- a/docs/sources/dashboards/manage-dashboards/index.md
+++ b/docs/sources/dashboards/manage-dashboards/index.md
@@ -3,23 +3,15 @@ aliases:
   - ../features/dashboard/dashboards/
   - ../panels/working-with-panels/organize-dashboard/
   - ../reference/dashboard_folders/
-  - ../reference/export_import/
-  - ../reference/timerange/
-  - ../troubleshooting/troubleshoot-dashboards/
   - dashboard-folders/
   - dashboard-manage/
-  - export-import/
+canonical: https://grafana.com/docs/grafana/latest/dashboards/manage-dashboards/
 keywords:
   - grafana
   - dashboard
   - dashboard folders
   - folder
   - folders
-  - import
-  - export
-  - troubleshoot
-  - time range
-  - scripting
 labels:
   products:
     - cloud
@@ -27,33 +19,37 @@ labels:
     - oss
 menuTitle: Manage dashboards
 title: Manage dashboards
+description: Learn about dashboard management and generative AI features for dashboards
 weight: 8
 ---
 
 # Manage dashboards
 
-This topic includes techniques you can use to manage your Grafana dashboards, including:
+On the **Dashboards** page, you can perform dashboard management tasks such as:
 
-- [Creating and managing dashboard folders](#create-and-manage-dashboard-folders)
-- [Exporting and importing dashboards](#export-and-import-dashboards)
-- [Organizing dashboards](#organize-a-dashboard)
-- [Troubleshooting dashboards](#troubleshoot-dashboards)
+- [Browsing](#browse-dashboards) and [creating](#create-a-dashboard-folder) dashboard folders
+- [Managing folder permissions](#folder-permissions)
+- [Adding generative AI features to dashboards](#set-up-generative-ai-features-for-dashboards)
 
-For more information about creating dashboards, refer to [Add and organize panels](../add-organize-panels).
+For more information about creating dashboards, refer to [Build dashboards][].
 
 ## Browse dashboards
 
 On the **Dashboards** page, you can browse and manage folders and dashboards. This includes the options to:
 
-- Create folders and dashboards
-- Move dashboards between folders
-- Delete multiple dashboards and folders
-- Navigate to a folder
-- Manage folder permissions. For more information, refer to [Dashboard permissions](https://grafana.com/docs/grafana/<GRAFANA VERSION>/administration/roles-and-permissions/#dashboard-permissions).
+- Create folders and dashboards.
+- Move dashboards between folders.
+- Delete multiple dashboards and folders.
+- Navigate to a folder.
+- Manage folder permissions. For more information, refer to [Dashboard permissions][].
 
-{{% admonition type="note" %}}
-As of Grafana 10.2, there is no longer a special **General** folder. Dashboards without a folder are now shown at the top level alongside folders.
-{{% /admonition %}}
+The page lists all the dashboards to which you have access, grouped into folders. Dashboards without a folder are displayed at the top level alongside folders.
+
+### Shared with me
+
+The **Shared with me** section displays folders and dashboards that are directly shared with you. These folders and dashboards aren't shown in the main list because you don't have access to one or more of their parent folders.
+
+If you have permission to view all folders, you won't see a **Shared with me**.
 
 ## Create a dashboard folder
 
@@ -63,31 +59,37 @@ Folders help you organize and group dashboards, which is useful when you have ma
 
 **To create a dashboard folder:**
 
-1. Click **Dashboards** in the main menu.
-1. On the **Dashboards** page, click **New** and select **New folder** in the drop-down.
+1. Click **Dashboards** in the primary menu.
+1. Do one of the following:
+
+   - On the **Dashboards** page, click **New** and select **New folder** in the drop-down.
+   - Click an existing folder and on the folder’s page, click **New** and select **New folder** in the drop-down.
+
 1. Enter a unique name and click **Create**.
 
-When you save a dashboard, you can either select a folder for the dashboard to be saved in or create a new folder.
+When you nest folders, you can do so up to four levels deep.
+
+When you save a dashboard, you can optionally select a folder to save the dashboard in.
 
 {{% admonition type="note" %}}
-Alerts cannot be placed in folders with slashes (\ /) in the name. If you wish to place alerts in the folder, do not use slashes in the folder name.
+Alerts can't be placed in folders with slashes (\ /) in the name. If you wish to place alerts in the folder, don't use slashes in the folder name.
 {{% /admonition %}}
 
 **To edit the name of a folder:**
 
-1. Click **Dashboards** in the main menu.
+1. Click **Dashboards** in the primary menu.
 1. Navigate to the folder by selecting it in the list, or searching for it.
-1. Click the pencil icon labelled **Edit title** in the header and update the name of the folder.
+1. Click the **Edit title** icon (pencil) in the header and update the name of the folder.
 
 The new folder name is automatically saved.
 
 ### Folder permissions
 
-You can assign permissions to a folder. Any permissions you assign are inherited by the dashboards in the folder. You can assign permissions to organization roles, teams, and users.
+You can assign permissions to a folder. Dashboards in the folder inherit any permissions that you've assigned to the folder. You can assign permissions to organization roles, teams, and users.
 
 **To modify permissions for a folder:**
 
-1. Click **Dashboards** in the main menu.
+1. Click **Dashboards** in the primary menu.
 1. Navigate to the folder by selecting it in the list, or searching for it.
 1. On the folder's page, click **Folder actions** and select **Manage permissions** in the drop-down.
 1. Update the permissions as desired.
@@ -96,99 +98,24 @@ Changes are saved automatically.
 
 For more information about dashboard permissions, refer to [Dashboard permissions][].
 
-## Export and import dashboards
-
-You can use the Grafana UI or the [HTTP API][] to export and import dashboards.
-
-### Export a dashboard
-
-The dashboard export action creates a Grafana JSON file that contains everything you need, including layout, variables, styles, data sources, queries, and so on, so that you can later import the dashboard.
-
-1. Click **Dashboards** in the main menu.
-1. Open the dashboard you want to export.
-1. Click the **Share** icon in the top navigation bar.
-1. Click **Export**.
-
-   If you're exporting the dashboard to use in another instance, with different data source UIDs, enable the **Export for sharing externally** switch.
-
-1. Click **Save to file**.
-
-Grafana downloads a JSON file to your local machine.
-
-#### Make a dashboard portable
-
-If you want to export a dashboard for others to use, you can add template variables for things like a metric prefix (use a constant variable) and server name.
-
-A template variable of the type `Constant` will automatically be hidden in the dashboard, and will also be added as a required input when the dashboard is imported.
-
-### Import a dashboard
-
-1. Click **Dashboards** in the left-side menu.
-1. Click **New** and select **Import** in the dropdown menu.
-1. Perform one of the following steps:
-
-   - Upload a dashboard JSON file
-   - Paste a [Grafana.com](https://grafana.com) dashboard URL
-   - Paste dashboard JSON text directly into the text area
-
-<!--{{< figure src="/static/img/docs/v70/import_step2_grafana.com.png"  max-width="700px" >}}
--->
-
-The import process enables you to change the name of the dashboard, pick the data source you want the dashboard to use, and specify any metric prefixes (if the dashboard uses any).
-
-### Discover dashboards on Grafana.com
-
-Find dashboards for common server applications at [Grafana.com/dashboards](https://grafana.com/dashboards).
-
-{{< figure src="/media/docs/grafana/dashboards/screenshot-gcom-dashboards.png" >}}
-
-## Troubleshoot dashboards
-
-This section provides information to help you solve common dashboard problems.
-
-### Dashboard is slow
-
-- Are you trying to render dozens (or hundreds or thousands) of time-series on a graph? This can cause the browser to lag. Try using functions like `highestMax` (in Graphite) to reduce the returned series.
-- Sometimes the series names can be very large. This causes larger response sizes. Try using `alias` to reduce the size of the returned series names.
-- Are you querying many time-series or for a long range of time? Both of these conditions can cause Grafana or your data source to pull in a lot of data, which may slow it down.
-- It could be high load on your network infrastructure. If the slowness isn't consistent, this may be the problem.
-
-### Dashboard refresh rate issues
-
-By default, Grafana queries your data source every 30 seconds. Setting a low refresh rate on your dashboards puts unnecessary stress on the backend. In many cases, querying this frequently isn't necessary because the data isn't being sent to the system such that changes would be seen.
-
-We recommend the following:
-
-- Do not enable auto-refreshing on dashboards, panels, or variables unless you need it. Users can refresh their browser manually, or you can set the refresh rate for a time period that makes sense (every ten minutes, every hour, and so on).
-- If it is required, then set the refresh rate to once a minute. Users can always refresh the dashboard manually.
-- If your dashboard has a longer time period (such as a week), then you really don't need automated refreshing.
-
-#### Handling or rendering null data is wrong or confusing
-
-Some applications publish data intermittently; for example, they only post a metric when an event occurs. By default, Grafana graphs connect lines between the data points. This can be very deceiving.
-
-In the picture below we have enabled:
-
-- Points and 3-point radius to highlight where data points are actually present.
-- **Connect null values\* is set to **Always\*\*.
-
-{{< figure src="/static/img/docs/troubleshooting/grafana_null_connected.png" max-width="1200px" >}}
+## Set up generative AI features for dashboards
 
-In this graph, we set graph to show bars instead of lines and set the **No value** under **Standard options** to **0**. There is a very big difference in the visuals.
+You can use generative AI to help you with the following tasks:
 
-{{< figure src="/static/img/docs/troubleshooting/grafana_null_zero.png" max-width="1200px" >}}
+- **Generate panel and dashboard titles and descriptions**: Generate a title and description based on the data you’ve added for your panel or dashboard. This is useful when you want to visualize your data quickly and don’t want to spend time coming up with a title or description.
+- **Generate dashboard save changes summary**: Generate a summary of the changes you’ve made to a dashboard when you save it. This is great for easily tracking the history of a dashboard.
 
-### More examples
+To access these features, install and configure Grafana’s Large Language Model (LLM) app plugin. For more information, refer to the [Grafana LLM plugin documentation][].
 
-You can find more examples in `public/dashboards/` directory of your Grafana installation.
+When enabled, the **✨ Auto generate** option displays next to the **Title** and **Description** fields in your panels and dashboards, or when you press the **Save** button.
 
 {{% docs/reference %}}
 [Dashboard permissions]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/administration/roles-and-permissions#dashboard-permissions"
 [Dashboard permissions]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/administration/roles-and-permissions#dashboard-permissions"
 
-[panels]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations"
-[panels]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations"
+[Grafana LLM plugin documentation]: "/docs/grafana/ -> /docs/grafana-cloud/alerting-and-irm/machine-learning/configure/llm-plugin"
+[Grafana LLM plugin documentation]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/machine-learning/configure/llm-plugin"
 
-[HTTP API]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/developers/http_api"
-[HTTP API]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/developers/http_api"
+[Build dashboards]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/build-dashboards"
+[Build dashboards]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/dashboards/build-dashboards"
 {{% /docs/reference %}}
diff --git a/docs/sources/dashboards/share-dashboards-panels/index.md b/docs/sources/dashboards/share-dashboards-panels/index.md
index 78a2b58a7b55d..7fd7a4a4e93b6 100644
--- a/docs/sources/dashboards/share-dashboards-panels/index.md
+++ b/docs/sources/dashboards/share-dashboards-panels/index.md
@@ -31,6 +31,7 @@ labels:
     - oss
 menuTitle: Sharing
 title: Share dashboards and panels
+description: Share Grafana dashboards and panels within your organization and publicly
 weight: 85
 ---
 
@@ -63,7 +64,7 @@ If you change a dashboard, ensure that you save the changes before sharing.
 
 1. Click **Dashboards** in the left-side menu.
 1. Click the dashboard you want to share.
-1. Click the share icon at the top of the screen.
+1. Click the **Share** button at the top right of the screen.
 
    The share dialog opens and shows the Link tab.
 
@@ -84,17 +85,44 @@ A dashboard snapshot shares an interactive dashboard publicly. Grafana strips se
 You can publish snapshots to your local instance or to [snapshots.raintank.io](http://snapshots.raintank.io). The latter is a free service provided by Grafana Labs that enables you to publish dashboard snapshots to an external Grafana instance. Anyone with the link can view it. You can set an expiration time if you want the snapshot removed after a certain time period.
 
 1. Click the **Snapshot** tab.
-1. Click **Publish to snapshots.raintank.io** or **Local Snapshot**.
+1. Click **Publish to snapshots.raintank.io** or **Publish Snapshot**.
 
    Grafana generates a link of the snapshot.
 
 1. Copy the snapshot link, and share it either within your organization or publicly on the web.
 
-If you created a snapshot by mistake, click **Delete snapshot** to remove the snapshot from your Grafana instance.
+If you created a snapshot by mistake, click **Delete snapshot** in the dialog box to remove the snapshot from your Grafana instance.
 
-### Dashboard export
+#### Delete a snapshot
 
-Grafana dashboards can easily be exported and imported. For more information, refer to [Export and import dashboards][].
+To delete existing snapshots, follow these steps:
+
+1. In the primary menu, click **Dashboards**.
+1. Click **Snapshots** to go to the snapshots management page.
+1. Click the red **x** next to the snapshot URL that you want to delete.
+
+The snapshot is immediately deleted. You may need to clear your browser cache or use a private or incognito browser to confirm this.
+
+### Export a dashboard as JSON
+
+The dashboard export action creates a Grafana JSON file that contains everything you need, including layout, variables, styles, data sources, queries, and so on, so that you can later import the dashboard.
+
+1. Click **Dashboards** in the main menu.
+1. Open the dashboard you want to export.
+1. Click the **Share** icon in the top navigation bar.
+1. Click **Export**.
+
+   If you're exporting the dashboard to use in another instance, with different data source UIDs, enable the **Export for sharing externally** switch.
+
+1. Click **Save to file**.
+
+Grafana downloads a JSON file to your local machine.
+
+#### Make a dashboard portable
+
+If you want to export a dashboard for others to use, you can add template variables for things like a metric prefix (use a constant variable) and server name.
+
+A template variable of the type `Constant` is automatically hidden in the dashboard, and is also added as a required input when the dashboard is imported.
 
 ## Export dashboard as PDF
 
@@ -104,7 +132,7 @@ You can generate and save PDF files of any dashboard.
 
 1. Click **Dashboards** in the left-side menu.
 1. Click the dashboard you want to share.
-1. Click the share icon at the top of the screen.
+1. Click the **Share** button at the top right of the screen.
 1. On the PDF tab, select a layout option for the exported dashboard: **Portrait** or **Landscape**.
 1. Click **Save as PDF** to render the dashboard as a PDF file.
 
@@ -150,16 +178,32 @@ https://play.grafana.org/d/000000012/grafana-play-home?orgId=1&from=156871968017
 
 A panel snapshot shares an interactive panel publicly. Grafana strips sensitive data leaving only the visible metric data and series names embedded in the dashboard. Panel snapshots can be accessed by anyone with the link.
 
-You can publish snapshots to your local instance or to [snapshots.raintank.io](http://snapshots.raintank.io). The latter is a free service provided by [Grafana Labs](https://grafana.com), that enables you to publish dashboard snapshots to an external Grafana instance. You can optionally set an expiration time if you want the snapshot to be removed after a certain time period.
+You can publish snapshots to your local instance or to [snapshots.raintank.io](http://snapshots.raintank.io). The latter is a free service provided by [Grafana Labs](https://grafana.com), that enables you to publish dashboard snapshots to an external Grafana instance.
+
+{{< admonition type="note" >}}
+As of Grafana 11, the option to publish to [snapshots.raintank.io](http://snapshots.raintank.io) is no longer available for Grafana Cloud.
+{{< /admonition >}}
+
+You can optionally set an expiration time if you want the snapshot to be removed after a certain time period.
 
 1. In the **Share Panel** dialog, click **Snapshot** to go to the tab.
-1. Click **Publish to snapshots.raintank.io** or **Local Snapshot**.
+1. Click **Publish to snapshots.raintank.io** or **Publish Snapshot**.
 
    Grafana generates the link of the snapshot.
 
 1. Copy the snapshot link, and share it either within your organization or publicly on the web.
 
-If you created a snapshot by mistake, click **Delete snapshot** to remove the snapshot from your Grafana instance.
+If you created a snapshot by mistake, click **Delete snapshot** in the dialog box to remove the snapshot from your Grafana instance.
+
+#### Delete a snapshot
+
+To delete existing snapshots, follow these steps:
+
+1. In the primary menu, click **Dashboards**.
+1. Click **Snapshots** to go to the snapshots management page.
+1. Click the red **x** next to the snapshot URL that you want to delete.
+
+The snapshot is immediately deleted. You may need to clear your browser cache or use a private or incognito browser to confirm this.
 
 ### Embed panel
 
@@ -191,9 +235,6 @@ To create a library panel from the **Share Panel** dialog:
 1. Save the dashboard.
 
 {{% docs/reference %}}
-[Export and import dashboards]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/manage-dashboards#export-and-import-dashboards"
-[Export and import dashboards]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/manage-dashboards#export-and-import-dashboards"
-
 [Grafana Enterprise]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/introduction/grafana-enterprise"
 [Grafana Enterprise]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/introduction/grafana-enterprise"
 
diff --git a/docs/sources/dashboards/troubleshoot-dashboards/index.md b/docs/sources/dashboards/troubleshoot-dashboards/index.md
new file mode 100644
index 0000000000000..817f035fb2d7d
--- /dev/null
+++ b/docs/sources/dashboards/troubleshoot-dashboards/index.md
@@ -0,0 +1,58 @@
+---
+aliases:
+  - ../troubleshooting/troubleshoot-dashboards/
+  - ../reference/timerange/
+canonical: https://grafana.com/docs/grafana/latest/dashboards/troubleshoot-dashboards/
+keywords:
+  - grafana
+  - dashboard
+  - troubleshoot
+  - time range
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+menuTitle: Troubleshoot dashboards
+title: Troubleshoot dashboards
+description: Learn how to troubleshoot common dashboard issues
+weight: 300
+---
+
+# Troubleshoot dashboards
+
+Use the following strategies to help you troubleshoot common dashboard problems.
+
+## Dashboard is slow
+
+- Are you trying to render dozens (or hundreds or thousands) of time series on a graph? This can cause the browser to lag. Try using functions like `highestMax` (in Graphite) to reduce the number of returned series.
+- Sometimes series names can be very large. This causes larger response sizes. Try using `alias` to reduce the size of the returned series names.
+- Are you querying many time series or a long time range? Both of these conditions can cause Grafana or your data source to pull in a lot of data, which may slow the dashboard down. Try reducing one or both of these.
+- There could be high load on your network infrastructure. If the slowness isn't consistent, this may be the problem.
+
+## Dashboard refresh rate issues
+
+By default, Grafana queries your data source every 30 seconds. However, setting a low refresh rate on your dashboards puts unnecessary stress on the backend. In many cases, querying this frequently isn't necessary because the data source isn't sending data often enough for there to be changes every 30 seconds.
+
+We recommend the following:
+
+- Only enable auto-refreshing on dashboards, panels, or variables if necessary. Users can refresh their browser manually.
+- If you require auto-refreshing, then set the refresh rate to a longer time period that makes sense, such as once a minute, every 10 minutes, or every hour.
+- Check the time range of your dashboard. If your dashboard has a longer time range, such as a week, then you really don't need automated refreshing and you should disable it.
+
+## Handling or rendering null data is wrong or confusing
+
+Some applications publish data intermittently; for example, they only post a metric when an event occurs. By default, Grafana graphs connect lines between the data points, but this can be deceptive.
+
+The graph in the following image has:
+
+- Points and 3-point radius enabled to highlight where data points are actually present.
+- **Connect null values** set to **Always**.
+
+{{< figure src="/static/img/docs/troubleshooting/grafana_null_connected.png" max-width="1200px" alt="Graph with null values connected" >}}
+
+The graph in this next image shows bars instead of lines and has the **No value** option under **Standard options** set to **0**.
+
+{{< figure src="/static/img/docs/troubleshooting/grafana_null_zero.png" max-width="1200px" alt="Graph with null values not connected" >}}
+
+As you can see, there's a significant difference in the visualizations.
diff --git a/docs/sources/dashboards/use-dashboards/index.md b/docs/sources/dashboards/use-dashboards/index.md
index f77fc5ff75e27..cb20fd7e62b6e 100644
--- a/docs/sources/dashboards/use-dashboards/index.md
+++ b/docs/sources/dashboards/use-dashboards/index.md
@@ -19,6 +19,7 @@ labels:
     - oss
 menuTitle: Use dashboards
 title: Use dashboards
+description: Learn about the features of a Grafana dashboard
 weight: 1
 ---
 
@@ -32,10 +33,10 @@ The dashboard user interface provides a number of features that you can use to c
 
 The following image and descriptions highlight all dashboard features.
 
-{{< figure src="/media/docs/grafana/dashboards/screenshot-dashboard-annotated-9-5-0.png" width="700px" >}}
+{{< figure src="/media/docs/grafana/dashboards/screenshot-dashboard-annotated-9-5-0.png" width="700px" alt="An annotated image of a dashboard" >}}
 
 - (1) **Grafana home**: Click **Home** in the breadcrumb to be redirected to the home page configured in the Grafana instance.
-- (2) **Dashboard title**: When you click the dashboard title, you can search for dashboards contained in the current folder.
+- (2) **Dashboard title**: When you click the dashboard title, you can search for dashboards contained in the current folder. You can create your own dashboard titles or have Grafana create them for you using [generative AI features][].
 - (3) **Share dashboard or panel**: Use this option to share the current dashboard or panel using a link or snapshot. You can also export the dashboard definition from the share modal.
 - (4) **Add**: Use this option to add a panel, dashboard row, or library panel to the current dashboard.
 - (5) **Save dashboard**: Click to save changes to your dashboard.
@@ -52,6 +53,7 @@ The following image and descriptions highlight all dashboard features.
   - Library panels can be shared among many dashboards.
   - To move a panel, drag the panel header to another location.
   - To resize a panel, click and drag the lower right corner of the panel.
+  - Use [generative AI features][] to create panel titles and descriptions.
 - (14) **Graph legend**: Change series colors, y-axis and series visibility directly from the legend.
 - (15) **Dashboard row**: A dashboard row is a logical divider within a dashboard that groups panels together.
   - Rows can be collapsed or expanded allowing you to hide parts of the dashboard.
@@ -60,7 +62,7 @@ The following image and descriptions highlight all dashboard features.
 
 ## Keyboard shortcuts
 
-Grafana has a number of keyboard shortcuts available. Press `?` or `h` on your keyboard to display all keyboard shortcuts available in your version of Grafana.
+Grafana has a number of keyboard shortcuts available. Press `?` or `Ctrl+h` on your keyboard to display all keyboard shortcuts available in your version of Grafana.
 
 - `Ctrl+S`: Saves the current dashboard.
 - `f`: Opens the dashboard finder / search.
@@ -137,7 +139,7 @@ Hover your cursor over the field to see the exact time stamps in the range and t
 
 Click the current time range to change it. You can change the current time using a _relative time range_, such as the last 15 minutes, or an _absolute time range_, such as `2020-05-14 00:00:00 to 2020-05-15 23:59:59`.
 
-<img class="no-shadow" src="/media/docs/grafana/dashboards/screenshot-change-current-time-range.png" max-width="900px">
+<img class="no-shadow" src="/media/docs/grafana/dashboards/screenshot-change-current-time-range-10.3.png" max-width="900px">
 
 #### Relative time range
 
@@ -189,6 +191,15 @@ This is equivalent to the **Today so far** time range preset, but it starts at 8
 
 Using a semi-relative time range, as time progresses, your dashboard will automatically and progressively zoom out to show more history and fewer details. At the same rate, as high data resolution decreases, historical trends over the entire time period will become more clear.
 
+#### Copy and paste time range
+
+You can copy and paste the time range from a dashboard to **Explore** and vice versa, or from one dashboard to another.
+Click the **Copy time range to clipboard** icon to copy the current time range to the clipboard. Then paste the time range into **Explore** or another dashboard.
+
+<img class="no-shadow" src="/media/docs/grafana/dashboards/screenshot-copy-paste-time-range.png" max-width="900">
+
+You can also copy and paste a time range using the keyboard shortcuts `t+c` and `t+v` respectively.
+
 #### Zoom out (Cmd+Z or Ctrl+Z)
 
 Click the **Zoom out** icon to view a larger time range in the dashboard or panel visualization.
@@ -222,4 +233,7 @@ You can control the time range of a dashboard by providing the following query p
 
 [repeating rows]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/build-dashboards/create-dashboard#configure-repeating-rows"
 [repeating rows]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/build-dashboards/create-dashboard#configure-repeating-rows"
+
+[generative AI features]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/dashboards/manage-dashboards#set-up-generative-ai-features-for-dashboards"
+[generative AI features]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/dashboards/manage-dashboards#set-up-generative-ai-features-for-dashboards"
 {{% /docs/reference %}}
diff --git a/docs/sources/dashboards/variables/_index.md b/docs/sources/dashboards/variables/_index.md
index 2a394e985a26f..ad8eae57c864b 100644
--- a/docs/sources/dashboards/variables/_index.md
+++ b/docs/sources/dashboards/variables/_index.md
@@ -9,11 +9,14 @@ labels:
     - enterprise
     - oss
 title: Variables
+description: Add variables to metric queries and panel titles to create interactive and dynamic dashboards
 weight: 130
 ---
 
 # Variables
 
+{{< youtube id="mMUJ3iwIYwc" >}}
+
 The following topics describe how to add and manage variables in your dashboards:
 
 {{< section >}}
@@ -24,9 +27,12 @@ the value, using the dropdown at the top of the dashboard, your panel's metric q
 Variables allow you to create more interactive and dynamic dashboards. Instead of hard-coding things like server, application,
 and sensor names in your metric queries, you can use variables in their place. Variables are displayed as dropdown lists at the top of
 the dashboard. These dropdowns make it easy to change the data being displayed in your dashboard.
-{{< figure src="/static/img/docs/v50/variables_dashboard.png" >}}
 
-These can be especially useful for administrators who want to allow Grafana viewers to quickly adjust visualizations but do not want to give them full editing permissions. Grafana Viewers can use variables.
+{{< figure src="/static/img/docs/v50/variables_dashboard.png" alt="Variable drop-down open and two values selected" >}}
+
+{{< docs/play title="Templating - Global variables and interpolation" url="https://play.grafana.org/d/HYaGDGIMk/" >}}
+
+Variables are useful for administrators who want to allow Grafana viewers to adjust visualizations without giving them full editing permissions. Grafana viewers can use variables.
 
 Variables and templates also allow you to single-source dashboards. If you have multiple identical data sources or servers, you can make one dashboard and use variables to change what you are viewing. This simplifies maintenance and upkeep enormously.
 
@@ -42,7 +48,7 @@ wmi_system_threads{instance=~"$server"}
 
 Variable values are always synced to the URL using the syntax `var-<varname>=value`.
 
-## Examples
+## Additional Examples
 
 Variables are listed in drop-down lists across the top of the screen. Select different variables to see how the visualizations change.
 
@@ -52,12 +58,9 @@ Variables can be used in titles, descriptions, text panels, and queries. Queries
 
 The following dashboards in Grafana Play provide examples of template variables:
 
-- [Graphite Templated Nested](https://play.grafana.org/d/000000056/templated-dynamic-dashboard?orgId=1&var-app=backend&var-server=backend_01&var-server=backend_02&var-server=backend_03&var-server=backend_04&var-interval=1h) - Uses query variables, chained query variables, an interval variable, and a repeated panel.
-- [Global variables and interpolation](https://play.grafana.org/d/HYaGDGIMk/templating-global-variables-and-interpolation?orgId=1&var-Server=A%27A%22A&var-Server=BB%5CB)
-- [Elasticsearch Dummy Flight Data](https://play.grafana.org/d/z8OZC66nk/elasticsearch-8-2-0-sample-flight-data?orgId=1&var-Filters=Carrier%7C%3D%7CLogstash%20Airways&var-query0=) - Uses ad hoc filters.
-- [Templating, repeated panels](https://play.grafana.org/d/000000025/templating-repeated-panels?orgId=1) - Two sets of repeated panels use query variables.
-- [Template Redux](https://play.grafana.org/d/p-k6QtkGz/template-redux?orgId=1) - Uses query variables, chained query variables, an interval variable, a text box variable, a custom variable, and a data source variable.
-- [Nested Variables Drilldown](https://play.grafana.org/d/testdata-nested-variables-drilldown/templating-nested-variables-drilldown?orgId=1&var-datacenter=A&var-server=AA&var-server=AC&var-pod=All)
+- [Templating, repeated panels](https://play.grafana.org/d/000000025/) - Using query variables to control how many panels appear.
+- [Templated Dynamic Dashboard](https://play.grafana.org/d/000000056/) - Uses query variables, chained query variables, an interval variable, and a repeated panel.
+- [Templating - Nested Variables Drilldown](https://play.grafana.org/d/testdata-nested-variables-drilldown/)
 
 ## Variable best practices
 
diff --git a/docs/sources/dashboards/variables/add-template-variables/index.md b/docs/sources/dashboards/variables/add-template-variables/index.md
index bbfe502d433d9..208d8ca64e44c 100644
--- a/docs/sources/dashboards/variables/add-template-variables/index.md
+++ b/docs/sources/dashboards/variables/add-template-variables/index.md
@@ -42,6 +42,7 @@ labels:
     - oss
 menuTitle: Manage variables
 title: Add and manage variables
+description: Learn about the types of variables you can add to dashboards and how
 weight: 100
 ---
 
diff --git a/docs/sources/dashboards/variables/inspect-variable/index.md b/docs/sources/dashboards/variables/inspect-variable/index.md
index 494093a983d97..44b5958a99107 100644
--- a/docs/sources/dashboards/variables/inspect-variable/index.md
+++ b/docs/sources/dashboards/variables/inspect-variable/index.md
@@ -15,6 +15,7 @@ labels:
     - enterprise
     - oss
 title: Inspect variables
+description: Review and manage your dashboard variables
 weight: 200
 ---
 
diff --git a/docs/sources/dashboards/variables/variable-syntax/index.md b/docs/sources/dashboards/variables/variable-syntax/index.md
index 2559d87f1c2f4..644b67c01d4df 100644
--- a/docs/sources/dashboards/variables/variable-syntax/index.md
+++ b/docs/sources/dashboards/variables/variable-syntax/index.md
@@ -16,6 +16,7 @@ labels:
     - enterprise
     - oss
 title: Variable syntax
+description: Learn about different types of variable syntax
 weight: 300
 ---
 
diff --git a/docs/sources/datasources/_index.md b/docs/sources/datasources/_index.md
index d5332117bea69..8179d4388c212 100644
--- a/docs/sources/datasources/_index.md
+++ b/docs/sources/datasources/_index.md
@@ -18,6 +18,8 @@ Grafana comes with built-in support for many _data sources_.
 If you need other data sources, you can also install one of the many data source plugins.
 If the plugin you need doesn't exist, you can develop a custom plugin.
 
+{{< youtube id="cqHO0oYW6Ic" >}}
+
 Each data source comes with a _query editor_,
 which formulates custom queries according to the source's structure.
 After you add and configure a data source, you can use it as an input for many operations, including:
@@ -30,14 +32,29 @@ This documentation describes how to manage data sources in general,
 and how to configure or query the built-in data sources.
 For other data sources, refer to the list of [datasource plugins](/grafana/plugins/).
 
-To develop a custom plugin, refer to [Build a plugin](/developers/plugin-tools).
+To develop a custom plugin, refer to [Create a data source plugin](#create-a-data-source-plugin).
 
 ## Manage data sources
 
 Only users with the [organization administrator role][organization-roles] can add or remove data sources.
 To access data source management tools in Grafana as an administrator, navigate to **Configuration > Data Sources** in the Grafana sidebar.
 
-For details on data source management, including instructions on how to add data sources and configure user permissions for queries, refer to the [administration documentation][data-source-management].
+For details on data source management, including instructions on how configure user permissions for queries, refer to the [administration documentation][data-source-management].
+
+## Add a data source
+
+Before you can create your first dashboard, you need to add your data source.
+
+{{% admonition type="note" %}}
+Only users with the organization admin role can add data sources.
+{{% /admonition %}}
+
+**To add a data source:**
+
+1. Click **Connections** in the left-side menu.
+1. Enter the name of a specific data source in the search dialog. You can filter by **Data source** to only see data sources.
+1. Click the data source you want to add.
+1. Configure the data source following instructions specific to that data source.
 
 ## Use query editors
 
@@ -53,19 +70,30 @@ For example, this video demonstrates the visual Prometheus query builder:
 
 {{< vimeo 720004179 >}}
 
-For general information about querying in Grafana, and common options and user interface elements across all query editors, refer to [Query and transform data][query-transform-data] .
+For general information about querying in Grafana, and common options and user interface elements across all query editors, refer to [Query and transform data][query-transform-data].
 
 ## Special data sources
 
 Grafana includes three special data sources:
 
-- **Grafana:** A built-in data source that generates random walk data and can poll the [Testdata]({{< relref "./testdata/" >}}) data source. Additionally, it can list files and get other data from a Grafana installation. This can be helpful for testing visualizations and running experiments.
-- **Mixed:** An abstraction that lets you query multiple data sources in the same panel.
-  When you select Mixed, you can then select a different data source for each new query that you add.
-  - The first query uses the data source that was selected before you selected **Mixed**.
-  - You can't change an existing query to use the **Mixed** data source.
-  - Grafana Play example: [Mixed data sources](https://play.grafana.org/d/000000100/mixed-datasources?orgId=1)
-- **Dashboard:** A data source that uses the result set from another panel in the same dashboard. The dashboard data source can use data either directly from the selected panel or from annotations attached to the selected panel.
+### Grafana
+
+A built-in data source that generates random walk data and can poll the [Testdata]({{< relref "./testdata/" >}}) data source. Additionally, it can list files and get other data from a Grafana installation. This can be helpful for testing visualizations and running experiments.
+
+### Mixed
+
+An abstraction that lets you query multiple data sources in the same panel. When you select Mixed, you can then select a different data source for each new query that you add.
+
+- The first query uses the data source that was selected before you selected **Mixed**.
+- You can't change an existing query to use the **Mixed** data source.
+
+{{< docs/play title="Mixed Datasources Example" url="https://play.grafana.org/d/000000100/" >}}
+
+### Dashboard
+
+A data source that uses the result set from another panel in the same dashboard. The dashboard data source can use data either directly from the selected panel or from annotations attached to the selected panel.
+
+{{< docs/play title="Panel as a Data Source" url="https://play.grafana.org/d/ede8zps8ndb0gc/" >}}
 
 ## Built-in core data sources
 
@@ -89,6 +117,24 @@ These built-in core data sources are also included in the Grafana documentation:
 - [Testdata]({{< relref "./testdata" >}})
 - [Zipkin]({{< relref "./zipkin" >}})
 
+## Add additional data source plugins
+
+You can add additional data sources as plugins (that are not available in core Grafana), which you can install or create yourself.
+
+### Find data source plugins in the plugin catalog
+
+To view available data source plugins, go to the [plugin catalog](/grafana/plugins/?type=datasource) and select the "Data sources" filter.
+For details about the plugin catalog, refer to [Plugin management][Plugin-management].
+
+You can further filter the plugin catalog's results for data sources provided by the Grafana community, Grafana Labs, and partners.
+If you use [Grafana Enterprise][Grafana-Enterprise], you can also filter by Enterprise-supported plugins.
+
+For more documentation on a specific data source plugin's features, including its query language and editor, refer to its plugin catalog page.
+
+### Create a data source plugin
+
+To build your own data source plugin, refer to the [Build a data source plugin](/developers/plugin-tools/tutorials/build-a-data-source-plugin) tutorial and [Plugin tools](/developers/plugin-tools).
+
 {{% docs/reference %}}
 [alerts]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting"
 [alerts]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/alerting"
@@ -107,4 +153,10 @@ These built-in core data sources are also included in the Grafana documentation:
 
 [query-transform-data]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/query-transform-data"
 [query-transform-data]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/query-transform-data"
+
+[Plugin-management]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/administration/plugin-management"
+[Plugin-management]: "/docs/grafana-cloud -> /docs/grafana/<GRAFANA VERSION>/administration/plugin-management"
+
+[Grafana-Enterprise]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/introduction/grafana-enterprise"
+
 {{% /docs/reference %}}
diff --git a/docs/sources/datasources/aws-cloudwatch/aws-authentication/index.md b/docs/sources/datasources/aws-cloudwatch/aws-authentication/index.md
index a347e92240e86..97ca8723f7f21 100644
--- a/docs/sources/datasources/aws-cloudwatch/aws-authentication/index.md
+++ b/docs/sources/datasources/aws-cloudwatch/aws-authentication/index.md
@@ -47,8 +47,8 @@ Open source Grafana enables the `AWS SDK Default`, `Credentials file`, and `Acce
   While `AWS SDK Default` will also find the shared credentials file, this option allows you to specify which profile to use without using environment variables.
   This option doesn't have any implicit fallbacks to other credential providers, and it fails if the credentials provided from the file aren't correct.
 - `Access and secret key` corresponds to the [StaticProvider](https://docs.aws.amazon.com/sdk-for-go/api/aws/credentials/#StaticProvider) and uses the given access key ID and secret key to authenticate.
-  This method doesn't have any fallbacks, and will fail if the provided key pair doesn't work.
-- `Grafana Assume Role` - With this auth provider option, Grafana Cloud users create an AWS IAM role that has a trust relationship with Grafana's AWS account. Grafana then uses [STS](https://docs.aws.amazon.com/STS/latest/APIReference/welcome.html) to generate temporary credentials on its behalf. Users with this option enabled no longer need to generate secret and access keys for users.
+  This method doesn't have any fallbacks, and will fail if the provided key pair doesn't work. This is the primary authentication method for Grafana Cloud.
+- `Grafana Assume Role` - With this auth provider option, Grafana Cloud users create an AWS IAM role that has a trust relationship with Grafana's AWS account. Grafana then uses [STS](https://docs.aws.amazon.com/STS/latest/APIReference/welcome.html) to generate temporary credentials on its behalf. Users with this option enabled no longer need to generate secret and access keys for users. Refer to [Use Grafana Assume Role](/docs/grafana/latest/datasources/aws-cloudwatch/aws-authentication/#use-grafana-assume-role) for further detail.
 - `Workspace IAM role` corresponds to the [EC2RoleProvider](https://docs.aws.amazon.com/sdk-for-go/api/aws/credentials/ec2rolecreds/#EC2RoleProvider).
   The EC2RoleProvider pulls credentials for a role attached to the EC2 instance that Grafana runs on.
   You can also achieve this by using the authentication method AWS SDK Default, but this option is different as it doesn't have any fallbacks.
@@ -72,7 +72,7 @@ The Grafana Assume Role also helps facilitate this. Using this role, Grafana's A
 
 If the **Assume Role ARN** field is left empty, Grafana uses the provided credentials from the selected authentication method directly, and permissions to AWS data must be attached directly to those credentials. The **Assume Role ARN** field is optional for all authentication methods except for Grafana Assume Role.
 
-To disable this feature, refer to the [`assume_role_enabled` documentation][configure-grafana-assume-role-enabled].
+To disable this feature in open source Grafana or Grafana Enterprise, refer to the [`assume_role_enabled` documentation][configure-grafana-assume-role-enabled].
 
 ### Use an external ID
 
@@ -156,10 +156,11 @@ The Grafana Assume Role authentication provider lets you authenticate with AWS w
 
 To use the Grafana Assume Role:
 
-1. Put in a request to Customer Support to enable`awsDatasourcesTempCredentials`.
+1. Grafana Cloud customers need to open a support ticket to enable the feature `awsDatasourcesTempCredentials`.
+   This feature is enabled by default in open source Grafana and Grafana Enterprise.
 2. Once the feature is enabled, create a new CloudWatch data source (or update an existing one) and select **Grafana Assume Role** as an authentication provider.
 3. In the AWS Console, create a new IAM role, and under **Trusted entity type**, select **Another AWS account** as the trusted Entity.
-4. Enter Grafana's account id (displayed in the instructions box on the the **Settings** tab of the CloudWatch data source configuration) and check the **Require external ID** box.
+4. Enter Grafana's account id (displayed in the instructions box on the **Settings** tab of the CloudWatch data source configuration) and check the **Require external ID** box.
 5. Enter the external ID specified in the instructions box on the **Settings** tab of the CloudWatch data source configuration in Grafana. This external ID will be unique to your Grafana instance.
 6. Attach any required permissions you would like Grafana to be able to access on your behalf (for example, CloudWatch Logs and CloudWatch Metrics policies).
 7. Give the role a name and description, and click **Create role**.
diff --git a/docs/sources/datasources/azure-monitor/_index.md b/docs/sources/datasources/azure-monitor/_index.md
index 18e9c6d91cb3e..1ca7aebe5149f 100644
--- a/docs/sources/datasources/azure-monitor/_index.md
+++ b/docs/sources/datasources/azure-monitor/_index.md
@@ -35,7 +35,7 @@ Only users with the organization administrator role can add data sources.
 
 Once you've added the Azure Monitor data source, you can [configure it](#configure-the-data-source) so that your Grafana instance's users can create queries in its [query editor]({{< relref "./query-editor" >}}) when they [build dashboards][build-dashboards] and use [Explore][explore].
 
-The Azure Monitor data source supports visualizing data from three Azure services:
+The Azure Monitor data source supports visualizing data from four Azure services:
 
 - **Azure Monitor Metrics:** Collect numeric data from resources in your Azure account.
 - **Azure Monitor Logs:** Collect log and performance data from your Azure account, and query using the Kusto Query Language (KQL).
@@ -133,6 +133,28 @@ datasources:
     version: 1
 ```
 
+**Current User:**
+
+{{< admonition type="note" >}}
+The `oauthPassThru` property is required for current user authentication to function.
+Additionally, `disableGrafanaCache` is necessary to prevent the data source returning cached responses for resources users don't have access to.
+{{< /admonition >}}
+
+```yaml
+apiVersion: 1 # config file version
+
+datasources:
+  - name: Azure Monitor
+    type: grafana-azure-monitor-datasource
+    access: proxy
+    jsonData:
+      azureAuthType: currentuser
+      oauthPassThru: true
+      disableGrafanaCache: true
+      subscriptionId: <subscription-id> # Optional, default subscription
+    version: 1
+```
+
 #### Supported cloud names
 
 | Azure Cloud                          | `cloudName` Value          |
@@ -141,6 +163,11 @@ datasources:
 | **Microsoft Chinese national cloud** | `chinaazuremonitor`        |
 | **US Government cloud**              | `govazuremonitor`          |
 
+{{< admonition type="note" >}}
+Cloud names for current user authentication differ to the `cloudName` values in the preceding table.
+The public cloud name is `AzureCloud`, the Chinese national cloud name is `AzureChinaCloud`, and the US Government cloud name is `AzureUSGovernment`.
+{{< /admonition >}}
+
 ### Configure Managed Identity
 
 You can use managed identity to configure Azure Monitor in Grafana if you host Grafana in Azure (such as an App Service or with Azure Virtual Machines) and have managed identity enabled on your VM.
@@ -201,6 +228,66 @@ For details on workload identity, refer to the [Azure workload identity document
    workload_identity_token_file = TOKEN_FILE_PATH
    ```
 
+### Configure Current User authentication
+
+{{< admonition type="note" >}}
+Current user authentication is an [experimental feature](/docs/release-life-cycle). Engineering and on-call support is not available. Documentation is either limited or not provided outside of code comments. No SLA is provided. Contact Grafana Support to enable this feature in Grafana Cloud. Aspects of Grafana may not work as expected when using this authentication method.
+{{< /admonition >}}
+
+If your Grafana instance is configured with Azure Entra (formerly Active Directory) authentication for login, this authentication method can be used to forward the currently logged in user's credentials to the data source. The users credentials will then be used when requesting data from the data source. For details on how to configure your Grafana instance using Azure Entra refer to the [documentation][configure-grafana-azure-auth].
+
+{{< admonition type="note" >}}
+Additional configuration is required to ensure that the App Registration used to login a user via Azure provides an access token with the permissions required by the data source.
+
+The App Registration must be configured to issue both **Access Tokens** and **ID Tokens**.
+
+1. In the Azure Portal, open the App Registration that requires configuration.
+2. Select **Authentication** in the side menu.
+3. Under **Implicit grant and hybrid flows** check both the **Access tokens** and **ID tokens** boxes.
+4. Save the changes to ensure the App Registration is updated.
+
+The App Registration must also be configured with additional **API Permissions** to provide authenticated users with access to the APIs utilised by the data source.
+
+1. In the Azure Portal, open the App Registration that requires configuration.
+1. Select **API Permissions** in the side menu.
+1. Ensure the `openid`, `profile`, `email`, and `offline_access` permissions are present under the **Microsoft Graph** section. If not, they must be added.
+1. Select **Add a permission** and choose the following permissions. They must be added individually. Refer to the [Azure documentation](https://learn.microsoft.com/en-us/entra/identity-platform/quickstart-configure-app-access-web-apis) for more information.
+   - Select **Azure Service Management** > **Delegated permissions** > `user_impersonation` > **Add permissions**
+   - Select **APIs my organization uses** > Search for **Log Analytics API** and select it > **Delegated permissions** > `Date.Read` > **Add permissions**
+
+Once all permissions have been added, the Azure authentication section in Grafana must be updated. The `scopes` section must be updated to include the `.default` scope to ensure that a token with access to all APIs declared on the App Registration is requested by Grafana. Once updated the scopes value should equal: `.default openid email profile`.
+{{< /admonition >}}
+
+This method of authentication doesn't inherently support all backend functionality as a user's credentials won't be in scope.
+Affected functionality includes alerting, reporting, and recorded queries.
+In order to support backend queries when using a data source configured with current user authentication, you can configure service credentials.
+Also, note that query and resource caching is disabled by default for data sources using current user authentication.
+
+{{< admonition type="note" >}}
+To configure fallback service credentials the [feature toggle][configure-grafana-feature-toggles] `idForwarding` must be set to `true` and `user_identity_fallback_credentials_enabled` must be enabled in the [Azure configuration section][configure-grafana-azure] (enabled by default when `user_identity_enabled` is set to `true`).
+{{< /admonition >}}
+
+Permissions for fallback credentials may need to be broad to appropriately support backend functionality.
+For example, an alerting query created by a user is dependent on their permissions.
+If a user tries to create an alert for a resource that the fallback credentials can't access, the alert will fail.
+
+**To enable current user authentication for Grafana:**
+
+1. Set the `user_identity_enabled` flag in the `[azure]` section of the [Grafana server configuration][configure-grafana-azure].
+   By default this will also enable fallback service credentials.
+   If you want to disable service credentials at the instance level set `user_identity_fallback_credentials_enabled` to false.
+
+   ```ini
+   [azure]
+   user_identity_enabled = true
+   ```
+
+1. In the Azure Monitor data source configuration, set **Authentication** to **Current User**.
+   If fallback service credentials are enabled at the instance level, an additional configuration section is visible that you can use to enable or disable using service credentials for this data source.
+   {{< figure src="/media/docs/grafana/data-sources/screenshot-current-user.png" max-width="800px" class="docs-image--no-shadow" caption="Azure Monitor screenshot showing Current User authentication" >}}
+
+1. If you want backend functionality to work with this data source, enable service credentials and configure the data source using the most applicable credentials for your circumstances.
+
 ## Query the data source
 
 The Azure Monitor data source can query data from Azure Monitor Metrics and Logs, the Azure Resource Graph, and Application Insights Traces. Each source has its own specialized query editor.
@@ -215,7 +302,7 @@ Grafana refers to such variables as template variables.
 
 For details, see the [template variables documentation]({{< relref "./template-variables" >}}).
 
-## Application Insights and Insights Analytics (removed))
+## Application Insights and Insights Analytics (removed)
 
 Until Grafana v8.0, you could query the same Azure Application Insights data using Application Insights and Insights Analytics.
 
@@ -230,6 +317,15 @@ If you're upgrading from a Grafana version prior to v9.0 and relied on Applicati
 [configure-grafana-azure]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-grafana#azure"
 [configure-grafana-azure]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-grafana#azure"
 
+[configure-grafana-azure-auth]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-security/configure-authentication/azuread"
+[configure-grafana-azure-auth]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-security/configure-authentication/azuread"
+
+[configure-grafana-azure-auth-scopes]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-security/configure-authentication/azuread/#enable-azure-ad-oauth-in-grafana"
+[configure-grafana-azure-auth-scopes]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-security/configure-authentication/azuread/#enable-azure-ad-oauth-in-grafana"
+
+[configure-grafana-feature-toggles]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-grafana/#feature_toggles"
+[configure-grafana-feature-toggles]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-grafana/#feature_toggles"
+
 [data-source-management]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/administration/data-source-management"
 [data-source-management]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/administration/data-source-management"
 
diff --git a/docs/sources/datasources/azure-monitor/query-editor/index.md b/docs/sources/datasources/azure-monitor/query-editor/index.md
index b7be89e709c5e..7a27d2a2c6f12 100644
--- a/docs/sources/datasources/azure-monitor/query-editor/index.md
+++ b/docs/sources/datasources/azure-monitor/query-editor/index.md
@@ -86,17 +86,17 @@ For example:
 - `Blob Type: {{ blobtype }}` becomes `Blob Type: PageBlob`, `Blob Type: BlockBlob`
 - `{{ resourcegroup }} - {{ resourcename }}` becomes `production - web_server`
 
-| Alias pattern                 | Description                                                                                            |
-| ----------------------------- | ------------------------------------------------------------------------------------------------------ |
-| `{{ subscriptionid }}`        | Replaced with the subscription ID.                                                                     |
-| `{{ subscription }}`          | Replaced with the subscription name.                                                                   |
-| `{{ resourcegroup }}`         | Replaced with the the resource group.                                                                  |
-| `{{ namespace }}`             | Replaced with the resource type or namespace, such as `Microsoft.Compute/virtualMachines`.             |
-| `{{ resourcename }}`          | Replaced with the resource name.                                                                       |
-| `{{ metric }}`                | Replaced with the metric name, such as "Percentage CPU".                                               |
-| _`{{ arbitaryDimensionID }}`_ | Replaced with the value of the specified dimension. For example, `{{ blobtype }}` becomes `BlockBlob`. |
-| `{{ dimensionname }}`         | _(Legacy for backward compatibility)_ Replaced with the name of the first dimension.                   |
-| `{{ dimensionvalue }}`        | _(Legacy for backward compatibility)_ Replaced with the value of the first dimension.                  |
+| Alias pattern                  | Description                                                                                            |
+| ------------------------------ | ------------------------------------------------------------------------------------------------------ |
+| `{{ subscriptionid }}`         | Replaced with the subscription ID.                                                                     |
+| `{{ subscription }}`           | Replaced with the subscription name.                                                                   |
+| `{{ resourcegroup }}`          | Replaced with the resource group.                                                                      |
+| `{{ namespace }}`              | Replaced with the resource type or namespace, such as `Microsoft.Compute/virtualMachines`.             |
+| `{{ resourcename }}`           | Replaced with the resource name.                                                                       |
+| `{{ metric }}`                 | Replaced with the metric name, such as "Percentage CPU".                                               |
+| _`{{ arbitraryDimensionID }}`_ | Replaced with the value of the specified dimension. For example, `{{ blobtype }}` becomes `BlockBlob`. |
+| `{{ dimensionname }}`          | _(Legacy for backward compatibility)_ Replaced with the name of the first dimension.                   |
+| `{{ dimensionvalue }}`         | _(Legacy for backward compatibility)_ Replaced with the value of the first dimension.                  |
 
 ### Filter using dimensions
 
@@ -106,7 +106,7 @@ Grafana can display and filter metrics based on dimension values.
 
 The data source supports the `equals`, `not equals`, and `starts with` operators as detailed in the [Monitor Metrics API documentation](https://docs.microsoft.com/en-us/rest/api/monitor/metrics/list).
 
-For more information onmulti-dimensional metrics, refer to the [Azure Monitor data platform metrics documentation](https://docs.microsoft.com/en-us/azure/azure-monitor/essentials/data-platform-metrics#multi-dimensional-metrics) and [Azure Monitor filtering documentation](https://docs.microsoft.com/en-us/azure/azure-monitor/essentials/metrics-charts#filters).
+For more information on multi-dimensional metrics, refer to the [Azure Monitor data platform metrics documentation](https://docs.microsoft.com/en-us/azure/azure-monitor/essentials/data-platform-metrics#multi-dimensional-metrics) and [Azure Monitor filtering documentation](https://docs.microsoft.com/en-us/azure/azure-monitor/essentials/metrics-charts#filters).
 
 ## Query Azure Monitor Logs
 
diff --git a/docs/sources/datasources/elasticsearch/_index.md b/docs/sources/datasources/elasticsearch/_index.md
index 9388062f64f02..d70d0e7339241 100644
--- a/docs/sources/datasources/elasticsearch/_index.md
+++ b/docs/sources/datasources/elasticsearch/_index.md
@@ -34,7 +34,7 @@ The following will help you get started working with Elasticsearch and Grafana:
 
 This data source supports these versions of Elasticsearch:
 
-- v7.16+
+- v7.17+
 - v8.x
 
 Our maintenance policy for Elasticsearch data source is aligned with the [Elastic Product End of Life Dates](https://www.elastic.co/support/eol) and we ensure proper functionality for supported versions. If you are using an Elasticsearch with version that is past its end-of-life (EOL), you can still execute queries, but you will receive a notification in the query builder indicating that the version of Elasticsearch you are using is no longer supported. It's important to note that in such cases, we do not guarantee the correctness of the functionality, and we will not be addressing any related issues.
diff --git a/docs/sources/datasources/elasticsearch/query-editor/index.md b/docs/sources/datasources/elasticsearch/query-editor/index.md
index 8d15a47e36deb..bb801bcabacce 100644
--- a/docs/sources/datasources/elasticsearch/query-editor/index.md
+++ b/docs/sources/datasources/elasticsearch/query-editor/index.md
@@ -24,7 +24,11 @@ weight: 300
 # Elasticsearch query editor
 
 Grafana provides a query editor for Elasticsearch. Elasticsearch queries are in Lucene format.
-See [Lucene query syntax](https://www.elastic.co/guide/en/kibana/current/lucene-query.html) and and [Query string syntax](https://www.elastic.co/guide/en/elasticsearch/reference/8.9/query-dsl-query-string-query.html#query-string-syntax) if you are new to working with Lucene queries in Elasticsearch.
+See [Lucene query syntax](https://www.elastic.co/guide/en/kibana/current/lucene-query.html) and [Query string syntax](https://www.elastic.co/guide/en/elasticsearch/reference/8.9/query-dsl-query-string-query.html#query-string-syntax) if you are new to working with Lucene queries in Elasticsearch.
+
+{{% admonition type="note" %}}
+When composing Lucene queries, ensure that you use uppercase boolean operators: `AND`, `OR`, and `NOT`. Lowercase versions of these operators are not supported by the Lucene query syntax.
+{{% /admonition %}}
 
 {{< figure src="/static/img/docs/elasticsearch/elastic-query-editor-10.1.png" max-width="800px" class="docs-image--no-shadow" caption="Elasticsearch query editor" >}}
 
diff --git a/docs/sources/datasources/google-cloud-monitoring/google-authentication/index.md b/docs/sources/datasources/google-cloud-monitoring/google-authentication/index.md
index 9243693543132..5d96965f1b13b 100644
--- a/docs/sources/datasources/google-cloud-monitoring/google-authentication/index.md
+++ b/docs/sources/datasources/google-cloud-monitoring/google-authentication/index.md
@@ -51,7 +51,7 @@ To visualize data from multiple GCP Projects, create one data source per GCP Pro
 You can create a service account and key file that can be used to access multiple projects. Follow steps 1-5 above, then:
 
 1. Note the email address of the service account, it will look a little strange like `foobar-478@main-boardwalk-90210.iam.gserviceaccount.com`.
-1. Navigtate to the other project(s) you want to access.
+1. Navigate to the other project(s) you want to access.
 1. Add the service account email address to the IAM page of each project, and grant it the required roles.
 1. Navigate back to the original project's service account and create a [service account key](https://cloud.google.com/iam/docs/creating-managing-service-account-keys#iam-service-account-keys-create-console). A JSON key file is created and downloaded to your computer
 1. Store the key file in a secure place, because it grants access to your Google data.
diff --git a/docs/sources/datasources/grafana-pyroscope.md b/docs/sources/datasources/grafana-pyroscope.md
deleted file mode 100644
index f0b32c1c0aaad..0000000000000
--- a/docs/sources/datasources/grafana-pyroscope.md
+++ /dev/null
@@ -1,115 +0,0 @@
----
-aliases:
-  - ../features/datasources/phlare/
-  - ../features/datasources/grafana-pyroscope/
-description: Horizontally-scalable, highly-available, multi-tenant continuous profiling
-  aggregation system. OSS profiling solution from Grafana Labs.
-keywords:
-  - grafana
-  - phlare
-  - guide
-  - profiling
-  - pyroscope
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Grafana Pyroscope
-weight: 1150
----
-
-# Grafana Pyroscope data source
-
-Formerly Phlare data source, now Grafana Pyroscope, a horizontally scalable, highly-available, multi-tenant, OSS, continuous profiling aggregation system. Add it as a data source, and you are ready to query your profiles in [Explore][explore].
-
-## Configure the Grafana Pyroscope data source
-
-To configure basic settings for the data source, complete the following steps:
-
-1. Click **Connections** in the left-side menu.
-1. Under Your connections, click **Data sources**.
-1. Enter `Grafana Pyroscope` in the search bar.
-1. Click **Grafana Pyroscope**.
-
-   The **Settings** tab of the data source is displayed.
-
-1. Set the data source's basic configuration options:
-
-   | Name           | Description                                                                                                                                                                                                                                                                                                              |
-   | -------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-   | `Name`         | A name to specify the data source in panels, queries, and Explore.                                                                                                                                                                                                                                                       |
-   | `Default`      | The default data source will be pre-selected for new panels.                                                                                                                                                                                                                                                             |
-   | `URL`          | The URL of the Grafana Pyroscope or Phlare instance, e.g., `http://localhost:4100`                                                                                                                                                                                                                                       |
-   | `Basic Auth`   | Enable basic authentication to the data source.                                                                                                                                                                                                                                                                          |
-   | `User`         | User name for basic authentication.                                                                                                                                                                                                                                                                                      |
-   | `Password`     | Password for basic authentication.                                                                                                                                                                                                                                                                                       |
-   | `Minimal step` | Used for queries returning timeseries data. Phlare backend, similar to Prometheus, scrapes profiles at certain intervals. To prevent querying at smaller interval use Minimal step same or higher than your Phlare scrape interval. For Pyroscope backend this prevents returning too many data points to the front end. |
-
-## Querying
-
-### Query Editor
-
-![Query editor](/static/img/docs/phlare/query-editor.png 'Query editor')
-
-Query editor gives you access to a profile type selector, a label selector, and collapsible options.
-
-![Profile selector](/static/img/docs/phlare/select-profile.png 'Profile selector')
-
-Select a profile type from the drop-down menu. While the label selector can be left empty to query all profiles without filtering by labels, the profile type or app must be selected for the query to be valid. Grafana does not show any data if the profile type or app isn’t selected when a query is run.
-
-![Labels selector](/static/img/docs/phlare/labels-selector.png 'Labels selector')
-
-Use the labels selector input to filter by labels. Pyroscope uses similar syntax to Prometheus to filter labels. Refer to [Pyroscope documentation](https://grafana.com/docs/pyroscope/latest/) for available operators and syntax.
-
-![Options section](/static/img/docs/phlare/options-section.png 'Options section')
-
-Options section contains a switch for Query Type and Group by.
-
-Select a query type to return the profile data which can be shown in the [Flame Graph][flame-graph], metric data visualized in a graph, or both. You can only select both options in a dashboard, because panels allow only one visualization.
-
-Group by allows you to group metric data by a specified label. Without any Group by label, metric data is aggregated over all the labels into single time series. You can use multiple labels to group by. Group by has only an effect on the metric data and does not change the profile data results.
-
-### Profiles query results
-
-Profiles can be visualized in a flame graph. See the [Flame Graph documentation][flame-graph] to learn about the visualization and its features.
-
-![Flame graph](/static/img/docs/phlare/flame-graph.png 'Flame graph')
-
-Pyroscope returns profiles aggregated over a selected time range, and the absolute values in the flame graph grow as the time range gets bigger while keeping the relative values meaningful. You can zoom in on the time range to get a higher granularity profile up to the point of a single scrape interval.
-
-### Metrics query results
-
-Metrics results represent the aggregated sum value over time of the selected profile type.
-
-![Metrics graph](/static/img/docs/phlare/metric-graph.png 'Metrics graph')
-
-This allows you to quickly see any spikes in the value of the scraped profiles and zoom in to a particular time range.
-
-## Provision the Grafana Pyroscope data source
-
-You can modify the Grafana configuration files to provision the Grafana Pyroscope data source. To learn more, and to view the available provisioning settings, see [provisioning documentation][provisioning-data-sources].
-
-Here is an example config:
-
-```yaml
-apiVersion: 1
-
-datasources:
-  - name: Grafana Pyroscope
-    type: grafana-pyroscope-datasource
-    url: http://localhost:4040
-    jsonData:
-      minStep: '15s'
-```
-
-{{% docs/reference %}}
-[explore]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/explore"
-[explore]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/explore"
-
-[flame-graph]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/flame-graph"
-[flame-graph]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/flame-graph"
-
-[provisioning-data-sources]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/administration/provisioning#datasources"
-[provisioning-data-sources]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/administration/provisioning#datasources"
-{{% /docs/reference %}}
diff --git a/docs/sources/datasources/graphite/_index.md b/docs/sources/datasources/graphite/_index.md
index f2d429ac1d37a..6afd4d8200a92 100644
--- a/docs/sources/datasources/graphite/_index.md
+++ b/docs/sources/datasources/graphite/_index.md
@@ -27,6 +27,8 @@ Only users with the organization administrator role can add data sources.
 
 Once you've added the Graphite data source, you can [configure it](#configure-the-data-source) so that your Grafana instance's users can create queries in its [query editor]({{< relref "./query-editor" >}}) when they [build dashboards][build-dashboards] and use [Explore][explore].
 
+{{< docs/play title="Graphite: Sample Website Dashboard" url="https://play.grafana.org/d/000000003/" >}}
+
 ## Configure the data source
 
 To configure basic settings for the data source, complete the following steps:
diff --git a/docs/sources/datasources/graphite/query-editor/index.md b/docs/sources/datasources/graphite/query-editor/index.md
index 74e0dd6bbda62..098a98b2b94cb 100644
--- a/docs/sources/datasources/graphite/query-editor/index.md
+++ b/docs/sources/datasources/graphite/query-editor/index.md
@@ -55,6 +55,10 @@ Some functions like aliasByNode support an optional second argument. To add an a
 
 To learn more, refer to [Graphite's documentation on functions](https://graphite.readthedocs.io/en/latest/functions.html).
 
+{{% admonition type="warning" %}}
+Some functions take a second argument that may be a function that returns a series. If you are adding a second argument that is a function, it is suggested to use a series reference from a second query instead of the function itself. The query editor does not currently support parsing of a second argument that is a function when switching between the query editor and the code editor.
+{{% /admonition %}}
+
 ### Sort labels
 
 If you have the same labels on multiple graphs, they are both sorted differently and use different colors.
diff --git a/docs/sources/datasources/graphite/template-variables/index.md b/docs/sources/datasources/graphite/template-variables/index.md
index 1490b9aaddb63..49aacaee33db2 100644
--- a/docs/sources/datasources/graphite/template-variables/index.md
+++ b/docs/sources/datasources/graphite/template-variables/index.md
@@ -143,7 +143,7 @@ The Graphite data source supports two variable syntaxes for use in the **Query**
 
 ### Templated dashboard example
 
-To view an example templated dashboard, refer to [Graphite Templated Dashboard](https://play.grafana.org/dashboard/db/graphite-templated-nested).
+To view an example templated dashboard, refer to [Graphite Templated Nested dashboard](https://play.grafana.org/d/cvDFGseGz/graphite-templated-nested).
 
 {{% docs/reference %}}
 [add-template-variables]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/variables/add-template-variables"
diff --git a/docs/sources/datasources/influxdb/_index.md b/docs/sources/datasources/influxdb/_index.md
index bf35526d1329e..22b240421d2f1 100644
--- a/docs/sources/datasources/influxdb/_index.md
+++ b/docs/sources/datasources/influxdb/_index.md
@@ -25,26 +25,31 @@ weight: 700
 {{< docs/shared lookup="influxdb/intro.md" source="grafana" version="<GRAFANA VERSION>" >}}
 
 Grafana includes built-in support for InfluxDB.
-This topic explains options, variables, querying, and other features specific to the InfluxDB data source, which include its [feature-rich code editor for queries and visual query builder]({{< relref "./query-editor" >}}).
+This topic explains options, variables, querying, and other features specific to the InfluxDB data source, which include
+its [feature-rich code editor for queries and visual query builder]({{< relref "./query-editor" >}}).
 
-For instructions on how to add a data source to Grafana, refer to the [administration documentation][data-source-management].
+For instructions on how to add a data source to Grafana, refer to
+the [administration documentation][data-source-management].
 Only users with the organization administrator role can add data sources.
-Administrators can also [configure the data source via YAML](#provision-the-data-source) with Grafana's provisioning system.
+Administrators can also [configure the data source via YAML](#provision-the-data-source) with Grafana's provisioning
+system.
 
-Once you've added the InfluxDB data source, you can [configure it](#configure-the-data-source) so that your Grafana instance's users can create queries in its [query editor]({{< relref "./query-editor" >}}) when they [build dashboards][build-dashboards] and use [Explore][explore].
+Once you've added the InfluxDB data source, you can [configure it](#configure-the-data-source) so that your Grafana
+instance's users can create queries in its [query editor]({{< relref "./query-editor" >}}) when
+they [build dashboards][build-dashboards] and use [Explore][explore].
 
 ## Configure the data source
 
 To configure basic settings for the data source, complete the following steps:
 
-1.  Click **Connections** in the left-side menu.
-1.  Under Your connections, click **Data sources**.
-1.  Enter `InfluxDB` in the search bar.
-1.  Select **InfluxDB**.
+1. Click **Connections** in the left-side menu.
+1. Under Your connections, click **Data sources**.
+1. Enter `InfluxDB` in the search bar.
+1. Select **InfluxDB**.
 
-    The **Settings** tab of the data source is displayed.
+   The **Settings** tab of the data source is displayed.
 
-1.  Set the data source's basic configuration options carefully:
+1. Set the data source's basic configuration options carefully:
 
 | Name                  | Description                                                                                                                                                                                                  |
 | --------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
@@ -82,17 +87,25 @@ You can also override this setting in a dashboard panel under its data source op
 
 InfluxDB data source options differ depending on which query language you select:
 
-- [InfluxQL](https://docs.influxdata.com/influxdb/v1.8/query_language/explore-data/), a SQL-like language for querying InfluxDB, with statements such as SELECT, FROM, WHERE, and GROUP BY that are familiar to SQL users.
+- [InfluxQL](https://docs.influxdata.com/influxdb/v1.8/query_language/explore-data/), a SQL-like language for querying
+  InfluxDB, with statements such as SELECT, FROM, WHERE, and GROUP BY that are familiar to SQL users.
   InfluxQL is available in InfluxDB 1.0 onwards.
-- [Flux](https://docs.influxdata.com/influxdb/v2.0/query-data/get-started/), which provides significantly broader functionality than InfluxQL. It supports not only queries but also built-in functions for data shaping, string manipulation, and joining to non-InfluxDB data sources, but also processing time-series data.
+- [SQL](https://www.influxdata.com/products/sql/) native SQL language with
+  support [FlightSQL](https://www.influxdata.com/glossary/apache-arrow-flight-sql/).
+- [Flux](https://docs.influxdata.com/influxdb/v2.0/query-data/get-started/), which provides significantly broader
+  functionality than InfluxQL. It supports not only queries but also built-in functions for data shaping, string
+  manipulation, and joining to non-InfluxDB data sources, but also processing time-series data.
   It's similar to JavaScript with a functional style.
 
-To help choose the best language for your needs, refer to a [comparison of Flux vs InfluxQL](https://docs.influxdata.com/influxdb/v1.8/flux/flux-vs-influxql/) and [why InfluxData created Flux](https://www.influxdata.com/blog/why-were-building-flux-a-new-data-scripting-and-query-language/).
+To help choose the best language for your needs, refer to
+a [comparison of Flux vs InfluxQL](https://docs.influxdata.com/influxdb/v1.8/flux/flux-vs-influxql/)
+and [why InfluxData created Flux](https://www.influxdata.com/blog/why-were-building-flux-a-new-data-scripting-and-query-language/).
 
 {{% admonition type="note" %}}
 Though not required, we recommend that you append your query language choice to the data source's **Name** setting:
 
 - InfluxDB-InfluxQL
+- InfluxDB-SQL
 - InfluxDB-Flux
 
 {{% /admonition %}}
@@ -109,6 +122,16 @@ Configure these options if you select the InfluxQL (classic InfluxDB) query lang
 | **Password**        | Defines the token you use to query the bucket defined in **Database**. Copy this from the [Tokens page](https://docs.influxdata.com/influxdb/v2.0/security/tokens/view-tokens/) of the InfluxDB UI. |
 | **HTTP mode**       | Sets the HTTP method used to query your data source. The POST verb allows for larger queries that would return an error using the GET verb. Defaults to GET.                                        |
 
+### Configure SQL
+
+Configure these options if you select the SQL query language:
+
+| Name                    | Description                                                                                                                                                                                                                   |
+| ----------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **Database**            | Sets the ID of the bucket to query. Copy this from the Buckets page of the InfluxDB UI.                                                                                                                                       |
+| **Token**               | API token used for SQL queries. It can be generated on InfluxDB Cloud dashboard under [Load Data > API Tokens](https://docs.influxdata.com/influxdb/cloud-serverless/get-started/setup/#create-an-all-access-api-token) menu. |
+| **Insecure Connection** | Disable gRPC TLS security.                                                                                                                                                                                                    |
+
 ### Configure Flux
 
 Configure these options if you select the Flux query language:
@@ -116,13 +139,14 @@ Configure these options if you select the Flux query language:
 | Name               | Description                                                                                                                                                                                                                                                                                                                    |
 | ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
 | **Organization**   | The [Influx organization](https://v2.docs.influxdata.com/v2.0/organizations/) that will be used for Flux queries. This is also used to for the `v.organization` query macro.                                                                                                                                                   |
-| **Token**          | The authentication token used for Flux queries. With Influx 2.0, use the [influx authentication token to function](https://v2.docs.influxdata.com/v2.0/security/tokens/create-token/). Token must be set as `Authorization` header with the value `Token <geenrated-token>`. For influx 1.8, the token is `username:password`. |
+| **Token**          | The authentication token used for Flux queries. With Influx 2.0, use the [influx authentication token to function](https://v2.docs.influxdata.com/v2.0/security/tokens/create-token/). Token must be set as `Authorization` header with the value `Token <generated-token>`. For influx 1.8, the token is `username:password`. |
 | **Default bucket** | _(Optional)_ The [Influx bucket](https://v2.docs.influxdata.com/v2.0/organizations/buckets/) that will be used for the `v.defaultBucket` macro in Flux queries.                                                                                                                                                                |
 
 ### Provision the data source
 
 You can define and configure the data source in YAML files as part of Grafana's provisioning system.
-For more information about provisioning, and for available configuration options, refer to [Provisioning Grafana][provisioning-data-sources].
+For more information about provisioning, and for available configuration options, refer
+to [Provisioning Grafana][provisioning-data-sources].
 
 {{% admonition type="note" %}}
 `database` [field is deprecated](https://github.com/grafana/grafana/pull/58647).
@@ -180,24 +204,43 @@ datasources:
     access: proxy
     url: http://localhost:8086
     jsonData:
-      # This database should be mapped to a bucket
       dbName: site
-      httpMode: GET
       httpHeaderName1: 'Authorization'
     secureJsonData:
       httpHeaderValue1: 'Token <token>'
 ```
 
+**InfluxDB 3.x for SQL example:**
+
+```yaml
+apiVersion: 1
+
+datasources:
+  - name: InfluxDB_v3_InfluxQL
+    type: influxdb
+    access: proxy
+    url: http://localhost:8086
+    jsonData:
+      version: SQL
+      dbName: site
+      httpMode: POST
+      insecureGrpc: false
+    secureJsonData:
+      token: '<api-token>'
+```
+
 ## Query the data source
 
-The InfluxDB data source's query editor has two modes, InfluxQL and Flux, depending on your choice of query language in the [data source configuration](#configure-the-data-source):
+The InfluxDB data source's query editor has two modes, InfluxQL and Flux, depending on your choice of query language in
+the [data source configuration](#configure-the-data-source):
 
 For details, refer to the [query editor documentation]({{< relref "./query-editor" >}}).
 
 ## Use template variables
 
 Instead of hard-coding details such as server, application, and sensor names in metric queries, you can use variables.
-Grafana lists these variables in dropdown select boxes at the top of the dashboard to help you change the data displayed in your dashboard.
+Grafana lists these variables in dropdown select boxes at the top of the dashboard to help you change the data displayed
+in your dashboard.
 Grafana refers to such variables as template variables.
 
 For details, see the [template variables documentation]({{< relref "./template-variables" >}}).
@@ -207,11 +250,14 @@ For details, see the [template variables documentation]({{< relref "./template-v
 [build-dashboards]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/build-dashboards"
 
 [data-source-management]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/administration/data-source-management"
-[data-source-management]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/administration/data-source-management"
+[data-source-management]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>
+/administration/data-source-management"
 
 [explore]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/explore"
 [explore]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/explore"
 
-[provisioning-data-sources]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/administration/provisioning#data-sources"
-[provisioning-data-sources]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/administration/provisioning#data-sources"
+[provisioning-data-sources]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>
+/administration/provisioning#data-sources"
+[provisioning-data-sources]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>
+/administration/provisioning#data-sources"
 {{% /docs/reference %}}
diff --git a/docs/sources/datasources/influxdb/query-editor/index.md b/docs/sources/datasources/influxdb/query-editor/index.md
index 3889b2d4ee287..61252dac5d203 100644
--- a/docs/sources/datasources/influxdb/query-editor/index.md
+++ b/docs/sources/datasources/influxdb/query-editor/index.md
@@ -8,7 +8,7 @@ labels:
     - cloud
     - enterprise
     - oss
-title: Flux support in Grafana
+title: Query Editor
 weight: 200
 ---
 
@@ -19,9 +19,11 @@ For general documentation on querying data sources in Grafana, see [Query and tr
 
 ## Choose a query editing mode
 
-The InfluxDB data source's query editor has two modes depending on your choice of query language in the [data source configuration]({{< relref "../#configure-the-data-source" >}}):
+The InfluxDB data source's query editor has two modes depending on your choice of query language in
+the [data source configuration]({{< relref "../#configure-the-data-source" >}}):
 
 - [InfluxQL](#influxql-query-editor)
+- [SQL](#sql-query-editor)
 - [Flux](#flux-query-editor)
 
 You also use the query editor to retrieve [log data](#query-logs) and [annotate](#apply-annotations) visualizations.
@@ -65,7 +67,8 @@ For example:
 This query editor input generates an InfluxDB `SELECT` clause:
 
 ```sql
-SELECT derivative(mean("value"), 10s) /10 AS "REQ/s" FROM ....
+SELECT derivative(mean("value"), 10s) / 10 AS "REQ/s"
+FROM....
 ```
 
 **To select multiple fields:**
@@ -116,15 +119,51 @@ Otherwise, InfluxDB can easily return hundreds of thousands of data points that
 
 You can also use `[[tag_hostname]]` pattern replacement syntax.
 
-For example, entering the value `Host: [[tag_hostname]]` in the ALIAS BY field replaces it with the `hostname` tag value for each legend value.
+For example, entering the value `Host: [[tag_hostname]]` in the ALIAS BY field replaces it with the `hostname` tag value
+for each legend value.
 An example legend value would be `Host: server1`.
 
+## SQL query editor
+
+Grafana support [SQL querying language](https://docs.influxdata.com/influxdb/cloud-serverless/query-data/sql/)
+with [InfluxDB v3.0](https://www.influxdata.com/blog/introducing-influxdb-3-0/) and higher.
+
+### Macros
+
+You can use macros within the query to replace them with the values from Grafana's context.
+
+| Macro example               | Replaced with                                                                                                                                                                       |
+| --------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `$__timeFrom`               | The start of the currently active time selection, such as `2020-06-11T13:31:00Z`.                                                                                                   |
+| `$__timeTo`                 | The end of the currently active time selection, such as `2020-06-11T14:31:00Z`.                                                                                                     |
+| `$__timeFilter`             | The time range that applies the start and the end of currently active time selection.                                                                                               |
+| `$__interval`               | An interval string that corresponds to Grafana's calculated interval based on the time range of the active time selection, such as `5s`.                                            |
+| `$__dateBin(<column>)`      | Applies [date_bin](https://docs.influxdata.com/influxdb/cloud-serverless/reference/sql/functions/time-and-date/#date_bin) function. Column must be timestamp.                       |
+| `$__dateBinAlias(<column>)` | Applies [date_bin](https://docs.influxdata.com/influxdb/cloud-serverless/reference/sql/functions/time-and-date/#date_bin) function with suffix `_binned`. Column must be timestamp. |
+
+Examples:
+
+```
+// with macro
+1. SELECT * FROM cpu WHERE time >= $__timeFrom AND time <= $__timeTo
+2. SELECT * FROM cpu WHERE $__timeFilter(time)
+3. SELECT $__dateBin(time) from cpu
+
+// interpolated
+1. SELECT * FROM iox.cpu WHERE time >= cast('2023-12-15T12:38:30Z' as timestamp) AND time <= cast('2023-12-15T18:38:30Z' as timestamp)
+2. SELECT * FROM cpu WHERE time >= '2023-12-15T12:41:28Z' AND time <= '2023-12-15T18:41:28Z'
+3. SELECT date_bin(interval '15 second', time, timestamp '1970-01-01T00:00:00Z') from cpu
+```
+
 ## Flux query editor
 
 Grafana supports Flux when running InfluxDB v1.8 and higher.
-If your data source is [configured for Flux]({{< relref "./#configure-the-data-source" >}}), you can use the [Flux query and scripting language](https://www.influxdata.com/products/flux/) in the query editor, which serves as a text editor for raw Flux queries with macro support.
+If your data source is [configured for Flux]({{< relref "./#configure-the-data-source" >}}), you can use
+the [Flux query and scripting language](https://www.influxdata.com/products/flux/) in the query editor, which serves as
+a text editor for raw Flux queries with macro support.
 
-For more information and connection details, refer to [1.8 compatibility](https://github.com/influxdata/influxdb-client-go/#influxdb-18-api-compatibility).
+For more information and connection details, refer
+to [1.8 compatibility](https://github.com/influxdata/influxdb-client-go/#influxdb-18-api-compatibility).
 
 ### Use macros
 
@@ -150,7 +189,8 @@ from(bucket: v.defaultBucket)
   |> yield(name: "mean")
 ```
 
-Into this query to send to InfluxDB, with interval and time period values changing according to the active time selection:
+Into this query to send to InfluxDB, with interval and time period values changing according to the active time
+selection:
 
 ```flux
 from(bucket: "grafana")
@@ -171,10 +211,12 @@ Select the InfluxDB data source, then enter a query to display your logs.
 
 ### Create log queries
 
-The Logs Explorer next to the query field, accessed by the **Measurements/Fields** button, lists measurements and fields.
+The Logs Explorer next to the query field, accessed by the **Measurements/Fields** button, lists measurements and
+fields.
 Choose the desired measurement that contains your log data, then choose which field to use to display the log message.
 
-Once InfluxDB returns the result, the log panel lists log rows and displays a bar chart, where the x axis represents the time and the y axis represents the frequency/count.
+Once InfluxDB returns the result, the log panel lists log rows and displays a bar chart, where the x axis represents the
+time and the y axis represents the frequency/count.
 
 ### Filter search
 
@@ -196,12 +238,17 @@ The **Tags** field's value can be a comma-separated string.
 ### Annotation query example
 
 ```sql
-SELECT title, description from events WHERE $timeFilter ORDER BY time ASC
+SELECT title, description
+from events
+WHERE $timeFilter
+ORDER BY time ASC
 ```
 
 {{% docs/reference %}}
-[annotate-visualizations]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/build-dashboards/annotate-visualizations"
-[annotate-visualizations]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/build-dashboards/annotate-visualizations"
+[annotate-visualizations]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>
+/dashboards/build-dashboards/annotate-visualizations"
+[annotate-visualizations]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>
+/dashboards/build-dashboards/annotate-visualizations"
 
 [explore]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/explore"
 [explore]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/explore"
@@ -213,5 +260,6 @@ SELECT title, description from events WHERE $timeFilter ORDER BY time ASC
 [panel-inspector]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/panel-inspector"
 
 [query-transform-data]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/query-transform-data"
-[query-transform-data]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/query-transform-data"
+[query-transform-data]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>
+/panels-visualizations/query-transform-data"
 {{% /docs/reference %}}
diff --git a/docs/sources/datasources/influxdb/template-variables/index.md b/docs/sources/datasources/influxdb/template-variables/index.md
index 4395741f93c41..908a2c0fd4ed2 100644
--- a/docs/sources/datasources/influxdb/template-variables/index.md
+++ b/docs/sources/datasources/influxdb/template-variables/index.md
@@ -87,7 +87,7 @@ When you enable the **Multi-value** or **Include all value** options, Grafana co
 
 ### Templated dashboard example
 
-To view an example templated dashboard, refer to [InfluxDB Templated Dashboard](https://play.grafana.org/dashboard/db/influxdb-templated).
+To view an example templated dashboard, refer to this [InfluxDB templated dashboard](https://play.grafana.org/d/f62a0410-5abb-4dd8-9dfc-caddfc3e2ffd/eccb2445-b0a2-5e83-8e0f-6d5ea53ad575).
 
 {{% docs/reference %}}
 [add-template-variables-chained-variables]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/variables/add-template-variables#chained-variables"
diff --git a/docs/sources/datasources/jaeger/_index.md b/docs/sources/datasources/jaeger/_index.md
index 91143aed8b570..36dc7d0131ee9 100644
--- a/docs/sources/datasources/jaeger/_index.md
+++ b/docs/sources/datasources/jaeger/_index.md
@@ -123,11 +123,6 @@ The following table describes the ways in which you can configure your trace to
 
 ### Trace to metrics
 
-{{% admonition type="note" %}}
-This feature is behind the `traceToMetrics` [feature toggle][configure-grafana-feature-toggles].
-If you use Grafana Cloud, open a [support ticket in the Cloud Portal](/profile/org#support) to access this feature.
-{{% /admonition %}}
-
 The **Trace to metrics** setting configures the [trace to metrics feature](/blog/2022/08/18/new-in-grafana-9.1-trace-to-metrics-allows-users-to-navigate-from-a-trace-span-to-a-selected-data-source/) available when integrating Grafana with Jaeger.
 
 To configure trace to metrics:
@@ -369,3 +364,8 @@ To configure this feature, see the [introduction to exemplars][exemplars] docume
 [variable-syntax]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/variables/variable-syntax"
 [variable-syntax]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/variables/variable-syntax"
 {{% /docs/reference %}}
+
+## Visualizing the dependency graph
+
+If service dependency information is available in Jaeger, it can be visualized in Grafana.
+Use the Jaeger data source with the "Dependency Graph" query type on a Node Graph panel for this.
diff --git a/docs/sources/datasources/loki/_index.md b/docs/sources/datasources/loki/_index.md
index f81b2c9007258..b048a9f4c43e1 100644
--- a/docs/sources/datasources/loki/_index.md
+++ b/docs/sources/datasources/loki/_index.md
@@ -32,6 +32,12 @@ The following guides will help you get started with Loki:
 - [LogQL](/docs/loki/latest/logql/)
 - [Loki query editor]({{< relref "./query-editor" >}})
 
+## Supported Loki versions
+
+This data source supports these versions of Loki:
+
+- v2.8+
+
 ## Adding a data source
 
 For instructions on how to add a data source to Grafana, refer to the [administration documentation][data-source-management]
@@ -60,6 +66,7 @@ datasources:
     access: proxy
     url: http://localhost:3100
     jsonData:
+      timeout: 60
       maxLines: 1000
 ```
 
diff --git a/docs/sources/datasources/loki/configure-loki-data-source.md b/docs/sources/datasources/loki/configure-loki-data-source.md
index 81ec007efbe55..bae45a99498e2 100644
--- a/docs/sources/datasources/loki/configure-loki-data-source.md
+++ b/docs/sources/datasources/loki/configure-loki-data-source.md
@@ -91,9 +91,9 @@ To troubleshoot configuration and other issues, check the log file located at `/
 
 ### Derived fields
 
-Derived Fields are used to extract new fields from a log message and create a link from the value of the field.
+Derived Fields are used to extract new fields from your logs and create a link from the value of the field.
 
-For example, you can link to your tracing backend directly from your logs, or link to a user profile page if the log line contains a corresponding userId.
+For example, you can link to your tracing backend directly from your logs, or link to a user profile page if the log line contains a corresponding `userId`.
 These links appear in the [log details][].
 
 You can add multiple derived fields.
@@ -106,7 +106,11 @@ Each derived field consists of the following:
 
 - **Name** - Sets the field name. Displayed as a label in the log details.
 
-- **Regex** - Defines a regular expression to parse a part of the log message and capture it as the value of the new field. Can contain only one capture group.
+- **Type** - Defines the type of the derived field. It can be either:
+
+  - **Regex**: A regular expression to parse a part of the log message and capture it as the value of the new field. Can contain only one capture group.
+
+  - **Label**: A label from the selected log line. This can be any type of label - indexed, parsed or structured metadata. The label's value will be used as the value of the derived field.
 
 - **URL/query** Sets the full link URL if the link is external, or a query for the target data source if the link is internal. You can interpolate the value from the field with the `${__value.raw}` macro.
 
diff --git a/docs/sources/datasources/mssql/_index.md b/docs/sources/datasources/mssql/_index.md
index 9bf5ccf3a009c..89403bb3f7b13 100644
--- a/docs/sources/datasources/mssql/_index.md
+++ b/docs/sources/datasources/mssql/_index.md
@@ -52,7 +52,7 @@ To configure basic settings for the data source, complete the following steps:
 | **Default**         | Sets the data source that's pre-selected for new panels.                                                                                                                                                                                                                                                                                                           |
 | **Host**            | Sets the IP address/hostname and optional port of your MS SQL instance. Default port is 0, the driver default. You can specify multiple connection properties, such as `ApplicationIntent`, by separating each property with a semicolon (`;`).                                                                                                                    |
 | **Database**        | Sets the name of your MS SQL database.                                                                                                                                                                                                                                                                                                                             |
-| **Authentication**  | Sets the authentication mode, either using SQL Server Authentication or Windows Authentication (single sign-on for Windows users).                                                                                                                                                                                                                                 |
+| **Authentication**  | Sets the authentication mode, either using SQL Server authentication, Windows authentication (single sign-on for Windows users), Azure Active Directory authentication, or various forms of Windows Active Directory authentication.                                                                                                                               |
 | **User**            | Defines the database user's username.                                                                                                                                                                                                                                                                                                                              |
 | **Password**        | Defines the database user's password.                                                                                                                                                                                                                                                                                                                              |
 | **Encrypt**         | Determines whether or to which extent a secure SSL TCP/IP connection will be negotiated with the server. Options include: `disable` - data sent between client and server is not encrypted; `false` - data sent between client and server is not encrypted beyond the login packet; `true` - data sent between client and server is encrypted. Default is `false`. |
@@ -89,6 +89,18 @@ You can also override this setting in a dashboard panel under its data source op
 
 The **Connection timeout** setting defines the maximum number of seconds to wait for a connection to the database before timing out. Default is 0 for no timeout.
 
+### UDP Preference Limit
+
+The **UDP Preference Limit** setting defines the maximum size packet that the Kerberos libraries will attempt to send over a UDP connection before retrying with TCP. Default is 1 which means always use TCP.
+
+### DNS Lookup KDC
+
+The **DNS Lookup KDC** setting controls whether to [lookup KDC in DNS](https://web.mit.edu/kerberos/krb5-latest/doc/admin/realm_config.html#mapping-hostnames-onto-kerberos-realms). Default is true.
+
+### KRB5 config file path
+
+The **KRB5 config file path** stores the location of the `krb5` config file. Default is `/etc/krb5.conf`
+
 ### Database user permissions
 
 Grafana doesn't validate that a query is safe, and could include any SQL statement.
diff --git a/docs/sources/datasources/mssql/query-editor/index.md b/docs/sources/datasources/mssql/query-editor/index.md
index e43ca6d7e0f02..51622c2a0257e 100644
--- a/docs/sources/datasources/mssql/query-editor/index.md
+++ b/docs/sources/datasources/mssql/query-editor/index.md
@@ -120,6 +120,8 @@ To filter on more columns, click the plus (`+`) button to the right of the condi
 
 To remove a filter, click the `x` button next to that filter's dropdown.
 
+After selecting a date type column, you can choose Macros from the operators list and select timeFilter which will add the $\_\_timeFilter macro to the query with the selected date column.
+
 ### Group results
 
 To group results by column, toggle the **Group** switch at the top of the editor.
diff --git a/docs/sources/datasources/mysql/_index.md b/docs/sources/datasources/mysql/_index.md
index 985653e5f9b00..fb9f01110ee01 100644
--- a/docs/sources/datasources/mysql/_index.md
+++ b/docs/sources/datasources/mysql/_index.md
@@ -27,6 +27,8 @@ For instructions on how to add a data source to Grafana, refer to the [administr
 Only users with the organization administrator role can add data sources.
 Administrators can also [configure the data source via YAML](#provision-the-data-source) with Grafana's provisioning system.
 
+{{< docs/play title="MySQL: Cities of the World Sample Data Set" url="https://play.grafana.org/d/8JOvPQr7k/" >}}
+
 ## Configure the data source
 
 **To access the data source configuration page:**
@@ -48,7 +50,7 @@ Administrators can also [configure the data source via YAML](#provision-the-data
 | **Database**                  | Name of your MySQL database.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
 | **User**                      | Database user's login/username                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
 | **Password**                  | Database user's password                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| **Session Timezone**          | Specifies the time zone used in the database session, such as `Europe/Berlin` or `+02:00`. Required if the timezone of the database (or the host of the database) is set to something other than UTC. Set the value used in the session with `SET time_zone='...'`. If you leave this field empty, then the time zone is not updated. For more information, refer to the [MySQL documentation](https://dev.mysql.com/doc/en/time-zone-support.html).                                                                                                                                                                                                      |
+| **Session Timezone**          | Specifies the timezone used in the database session, such as `Europe/Berlin` or `+02:00`. Required if the timezone of the database (or the host of the database) is set to something other than UTC. Set this to `+00:00` so Grafana can handle times properly. Set the value used in the session with `SET time_zone='...'`. If you leave this field empty, the timezone will not be updated. For more information, refer to [MySQL Server Time Zone Support](https://dev.mysql.com/doc/en/time-zone-support.html).                                                                                                                                      |
 | **Max open**                  | The maximum number of open connections to the database, default `100` (Grafana v5.4+).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
 | **Max idle**                  | The maximum number of connections in the idle connection pool, default `100` (Grafana v5.4+).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
 | **Auto (max idle)**           | Toggle to set the maximum number of idle connections to the number of maximum open connections (available in Grafana v9.5.1+). Default is `true`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
@@ -201,10 +203,17 @@ Add further value columns by clicking the plus button and another column dropdow
 
 ### Filter data (WHERE)
 
-To add a filter, flip the switch at the top of the editor.
-Using the first dropdown, select if all the filters need to match (AND) or if only one of the filters needs to match (OR).
+To add a filter, toggle the **Filter** switch at the top of the editor.
+This reveals a **Filter by column value** section with two dropdown selectors.
+
+Use the first dropdown to choose whether all of the filters need to match (`AND`), or if only one of the filters needs to match (`OR`).
+Use the second dropdown to choose a filter.
+
+To filter on more columns, click the plus (`+`) button to the right of the condition dropdown.
+
+To remove a filter, click the `x` button next to that filter's dropdown.
 
-To add more columns to filter on use the plus button.
+After selecting a date type column, you can choose Macros from the operators list and select timeFilter which will add the $\_\_timeFilter macro to the query with the selected date column.
 
 ### Group By
 
diff --git a/docs/sources/datasources/postgres/_index.md b/docs/sources/datasources/postgres/_index.md
index 53bc8b58173ea..a569158902533 100644
--- a/docs/sources/datasources/postgres/_index.md
+++ b/docs/sources/datasources/postgres/_index.md
@@ -114,10 +114,17 @@ Add further value columns by clicking the plus button and another column dropdow
 
 ### Filter data (WHERE)
 
-To add a filter, flip the switch at the top of the editor.
-Using the first dropdown, select if all the filters need to match (AND) or if only one of the filters needs to match (OR).
+To add a filter, toggle the **Filter** switch at the top of the editor.
+This reveals a **Filter by column value** section with two dropdown selectors.
 
-To add more columns to filter on use the plus button.
+Use the first dropdown to choose whether all of the filters need to match (`AND`), or if only one of the filters needs to match (`OR`).
+Use the second dropdown to choose a filter.
+
+To filter on more columns, click the plus (`+`) button to the right of the condition dropdown.
+
+To remove a filter, click the `x` button next to that filter's dropdown.
+
+After selecting a date type column, you can choose Macros from the operators list and select timeFilter which will add the $\_\_timeFilter macro to the query with the selected date column.
 
 ### Group By
 
diff --git a/docs/sources/datasources/prometheus/_index.md b/docs/sources/datasources/prometheus/_index.md
index 5029e2f3cc03d..bd8e9ee45a1b7 100644
--- a/docs/sources/datasources/prometheus/_index.md
+++ b/docs/sources/datasources/prometheus/_index.md
@@ -19,7 +19,7 @@ weight: 1300
 
 # Prometheus data source
 
-Prometheus is an open-source database that uses an telemetry collector agent to scrape and store metrics used for monitoring and alerting. If you are just getting started with Prometheus, see [What is Prometheus?][intro-to-prometheus].
+Prometheus is an open-source database that uses a telemetry collector agent to scrape and store metrics used for monitoring and alerting. If you are just getting started with Prometheus, see [What is Prometheus?][intro-to-prometheus].
 
 Grafana provides native support for Prometheus.
 For instructions on downloading Prometheus see [Get started with Grafana and Prometheus][get-started-prometheus].
@@ -28,7 +28,7 @@ For instructions on how to add a data source to Grafana, refer to the [administr
 Only users with the organization `administrator` role can add data sources and edit existing data sources.
 Administrators can also [configure the data source via YAML](#provision-the-data-source) with Grafana's provisioning system.
 
-Once you've added the Prometheus data source, you can [configure it][configure-prometheus-data-source] so that your Grafana instance's users can create queries in its [query editor]({{< relref "./query-editor" >}}) when they [build dashboards][build-dashboards], use [Explore][explore], and [annotate visualizations]({{< relref "./query-editor#apply-annotations" >}}).
+Once you've added the Prometheus data source, you can [configure it][configure-prometheus-data-source] so that your Grafana instance's users can create queries in its [query editor]({{< relref "./query-editor" >}}) when they [build dashboards][build-dashboards], use [Explore][explore], and [annotate visualizations][annotate visualizations].
 
 The following guides will help you get started with the Prometheus data source:
 
@@ -196,4 +196,8 @@ The Prometheus data source can be configured to disable recording rules under th
 
 [set-up-grafana-monitoring]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/set-up-grafana-monitoring"
 [set-up-grafana-monitoring]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/set-up-grafana-monitoring"
+
+[annotate visualizations]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/annotate-visualizations"
+[annotate visualizations]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/dashboards/build-dashboards/annotate-visualizations"
+
 {{% /docs/reference %}}
diff --git a/docs/sources/datasources/prometheus/query-editor/index.md b/docs/sources/datasources/prometheus/query-editor/index.md
index e07e4d818d6ac..f8d24817a011e 100644
--- a/docs/sources/datasources/prometheus/query-editor/index.md
+++ b/docs/sources/datasources/prometheus/query-editor/index.md
@@ -74,7 +74,7 @@ The **Legend** setting defines the time series's name. You can use a predefined
 
 The **Min step** setting defines the lower bounds on the interval between data points.
 For example, set this to `1h` to hint that measurements are taken hourly.
-This setting supports the `$__interval` and `$__rate_interval` macros.
+This setting supports the `$__interval` and `$__rate_interval` macros. Be aware that the query range dates are aligned to the step and this can change the start and end of the range.
 
 ### Format
 
@@ -96,7 +96,7 @@ For more information, refer to the [Time Series Transform option documentation][
 
 {{% admonition type="note" %}}
 Grafana modifies the request dates for queries to align them with the dynamically calculated step.
-This ensures a consistent display of metrics data, but it can result in a small gap of data at the right edge of a graph.
+This ensures a consistent display of metrics data and Prometheus requires this for caching results. But, aligning the range with the step can result in a small gap of data at the right edge of a graph or change the start date of the range. For example, a 15s step aligns the range to Unix time divisible by 15s and a 1w minstep aligns the range to the start of the week on a Thursday.
 {{% /admonition %}}
 
 ### Exemplars
diff --git a/docs/sources/datasources/pyroscope/_index.md b/docs/sources/datasources/pyroscope/_index.md
new file mode 100644
index 0000000000000..8c7d7bc37c961
--- /dev/null
+++ b/docs/sources/datasources/pyroscope/_index.md
@@ -0,0 +1,85 @@
+---
+aliases:
+  - ../features/datasources/phlare/ # /docs/grafana/<GRAFANA_VERSION>/features/datasources/phlare/
+  - ../features/datasources/grafana-pyroscope/ # /docs/grafana/<GRAFANA_VERSION>/features/datasources/grafana-pyroscope/
+  - ../datasources/grafana-pyroscope/ # /docs/grafana/<GRAFANA_VERSION>/datasources/grafana-pyroscope/
+description: Horizontally-scalable, highly-available, multi-tenant continuous profiling
+  aggregation system. OSS profiling solution from Grafana Labs.
+keywords:
+  - grafana
+  - phlare
+  - guide
+  - profiling
+  - pyroscope
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Grafana Pyroscope
+weight: 1150
+---
+
+# Grafana Pyroscope data source
+
+Grafana Pyroscope is a horizontally scalable, highly available, multi-tenant, OSS, continuous profiling aggregation system. Add it as a data source, and you are ready to query your profiles in [Explore][explore].
+
+Refer to [Introduction to Pyroscope](https://grafana.com/docs/pyroscope/<PYROSCOPE_VERSION>/introduction/) to understand profiling and Pyroscope.
+
+To use profiling data, you should:
+
+- [Configure your application to send profiles](/docs/pyroscope/<PYROSCOPE_VERSION>/configure-client/)
+- [Configure the Grafana Pyroscope data source](./configure-pyroscope-data-source/).
+- [View and query profiling data in Explore](./query-profile-data/)
+
+## Integrate profiles into dashboards
+
+Using the Pyroscope data source, you can integrate profiles into your dashboards.
+In this case, the screenshot shows memory profiles alongside panels for logs and metrics to be able to debug out of memory (OOM) errors alongside the associated logs and metrics.
+
+![dashboard](https://grafana.com/static/img/pyroscope/grafana-pyroscope-dashboard-2023-11-30.png)
+
+## Visualize traces and profiles data using Traces to profiles
+
+You can link profile and tracing data using your Pyroscope data source with the Tempo data source.
+To learn more about how profiles and tracing can work together, refer to [Profiling and tracing synergies](./profiling-and-tracing/).
+
+Combined traces and profiles let you see granular line-level detail when available for a trace span. This allows you pinpoint the exact function that's causing a bottleneck in your application as well as a specific request.
+
+![trace-profiler-view](https://grafana.com/static/img/pyroscope/pyroscope-trace-profiler-view-2023-11-30.png)
+
+For more information, refer to the [Traces to profile section][configure-tempo-data-source] and [Link tracing and profiling with span profiles](https://grafana.com/docs/pyroscope/<PYROSCOPE_VERSION>/configure-client/trace-span-profiles/).
+
+{{< youtube id="AG8VzfFMLxo" >}}
+
+## Provision the Grafana Pyroscope data source
+
+You can modify the Grafana configuration files to provision the Grafana Pyroscope data source.
+To learn more, and to view the available provisioning settings, refer to [provisioning documentation][provisioning-data-sources].
+
+Here is an example configuration:
+
+```yaml
+apiVersion: 1
+
+datasources:
+  - name: Grafana Pyroscope
+    type: grafana-pyroscope-datasource
+    url: http://localhost:4040
+    jsonData:
+      minStep: '15s'
+```
+
+{{% docs/reference %}}
+[explore]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/explore"
+[explore]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/explore"
+
+[flame-graph]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/flame-graph"
+[flame-graph]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/flame-graph"
+
+[provisioning-data-sources]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/administration/provisioning#datasources"
+[provisioning-data-sources]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/administration/provisioning#datasources"
+
+[configure-tempo-data-source]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/tempo/configure-tempo-data-source"
+[configure-tempo-data-source]: "/docs/grafana-cloud/ -> docs/grafana-cloud/connect-externally-hosted/data-sources/tempo/configure-tempo-data-source"
+{{% /docs/reference %}}
diff --git a/docs/sources/datasources/pyroscope/configure-pyroscope-data-source.md b/docs/sources/datasources/pyroscope/configure-pyroscope-data-source.md
new file mode 100644
index 0000000000000..8503f2dfa4580
--- /dev/null
+++ b/docs/sources/datasources/pyroscope/configure-pyroscope-data-source.md
@@ -0,0 +1,50 @@
+---
+description: Configure your Pyroscope data source for Grafana.
+keywords:
+  - configure
+  - profiling
+  - pyroscope
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Configure the Grafana Pyroscope data source
+menuTitle: Configure Pyroscope
+weight: 200
+---
+
+# Configure the Grafana Pyroscope data source
+
+To configure basic settings for the data source, complete the following steps:
+
+1. Click **Connections** in the left-side menu.
+1. Under Your connections, click **Data sources**.
+1. Enter `Grafana Pyroscope` in the search bar.
+1. Click **Grafana Pyroscope** to display the **Settings** tab of the data source.
+
+1. Set the data source's basic configuration options:
+
+   | Name           | Description                                                                                                                                                                                                                                                                                                  |
+   | -------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+   | `Name`         | A name to specify the data source in panels, queries, and Explore.                                                                                                                                                                                                                                           |
+   | `Default`      | The default data source will be pre-selected for new panels.                                                                                                                                                                                                                                                 |
+   | `URL`          | The URL of the Grafana Pyroscope instance, for example, `http://localhost:4100`.                                                                                                                                                                                                                             |
+   | `Basic Auth`   | Enable basic authentication to the data source.                                                                                                                                                                                                                                                              |
+   | `User`         | User name for basic authentication.                                                                                                                                                                                                                                                                          |
+   | `Password`     | Password for basic authentication.                                                                                                                                                                                                                                                                           |
+   | `Minimal step` | Used for queries returning timeseries data. The Pyroscope backend, similar to Prometheus, scrapes profiles at certain intervals. To prevent querying at smaller interval, use Minimal step same or higher than your Pyroscope scrape interval. This prevents returning too many data points to the frontend. |
+
+{{% docs/reference %}}
+[explore]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/explore"
+[explore]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/explore"
+
+[flame-graph]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/flame-graph"
+[flame-graph]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/flame-graph"
+
+[provisioning-data-sources]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/administration/provisioning#datasources"
+[provisioning-data-sources]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/administration/provisioning#datasources"
+
+[configure-tempo-data-source]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/tempo/configure-tempo-data-source"
+[configure-tempo-data-source]: "/docs/grafana-cloud/ -> docs/grafana-cloud/connect-externally-hosted/data-sources/tempo/configure-tempo-data-source"
+{{% /docs/reference %}}
diff --git a/docs/sources/datasources/pyroscope/profiling-and-tracing.md b/docs/sources/datasources/pyroscope/profiling-and-tracing.md
new file mode 100644
index 0000000000000..98315f7c9963c
--- /dev/null
+++ b/docs/sources/datasources/pyroscope/profiling-and-tracing.md
@@ -0,0 +1,16 @@
+---
+title: How profiling and tracing work together
+menuTitle: How profiling and tracing work together
+description: Learn about how profiling and tracing work together.
+weight: 250
+keywords:
+  - pyroscope data source
+  - continuous profiling
+  - tracing
+---
+
+# How profiling and tracing work together
+
+[//]: # 'Shared content for Trace to profiles in the Pyroscope data source'
+
+{{< docs/shared source="grafana" lookup="datasources/pyroscope-profile-tracing-intro.md" version="<GRAFANA_VERSION>" >}}
diff --git a/docs/sources/datasources/pyroscope/query-profile-data.md b/docs/sources/datasources/pyroscope/query-profile-data.md
new file mode 100644
index 0000000000000..8c68fb4275bc9
--- /dev/null
+++ b/docs/sources/datasources/pyroscope/query-profile-data.md
@@ -0,0 +1,82 @@
+---
+description: Use the query editor to explore your Pyroscope data.
+keywords:
+  - query
+  - profiling
+  - pyroscope
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Query profile data
+menuTitle: Query profile data
+weight: 300
+---
+
+# Query profile data
+
+The Pyroscope data source query editor gives you access to a profile type selector, a label selector, and collapsible options.
+
+![Query editor](/media/docs/pyroscope/query-editor/query-editor.png 'Query editor')
+
+To access the query editor:
+
+1. Sign into Grafana or Grafana Cloud.
+1. Select your Pyroscope data source.
+1. From the menu, choose **Explore**.
+
+1. Select a profile type from the drop-down menu.
+
+   {{< figure src="/media/docs/pyroscope/query-editor/select-profile.png" class="docs-image--no-shadow" max-width="450px" caption="Profile selector" >}}
+
+1. Use the labels selector input to filter by labels. Pyroscope uses similar syntax to Prometheus to filter labels.
+   Refer to [Pyroscope documentation](https://grafana.com/docs/pyroscope/latest/) for available operators and syntax.
+
+   While the label selector can be left empty to query all profiles without filtering by labels, the profile type or app must be selected for the query to be valid.
+
+   Grafana doesn't show any data if the profile type or app isn’t selected when a query runs.
+
+   ![Labels selector](/media/docs/pyroscope/query-editor/labels-selector.png 'Labels selector')
+
+1. Expand the **Options** section to view **Query Type** and **Group by**.
+   ![Options section](/media/docs/pyroscope/query-editor/options-section.png 'Options section')
+
+1. Select a query type to return the profile data. Data is shown in the [Flame Graph][flame-graph], metric data visualized in a graph, or both. You can only select both options in Explore. The panels used on dashboards allow only one visualization.
+
+Using **Group by**, you can group metric data by a specified label.
+Without any **Group by** label, metric data aggregates over all the labels into single time series.
+You can use multiple labels to group by. Group by only effects the metric data and doesn't change the profile data results.
+
+## Profiles query results
+
+Profiles can be visualized in a flame graph.
+Refer to the [Flame Graph documentation][flame-graph] to learn about the visualization and its features.
+
+![Flame graph](/media/docs/pyroscope/query-editor/flame-graph.png 'Flame graph')
+
+Pyroscope returns profiles aggregated over a selected time range.
+The absolute values in the flame graph grow as the time range gets bigger while keeping the relative values meaningful.
+You can zoom in on the time range to get a higher granularity profile up to the point of a single scrape interval.
+
+## Metrics query results
+
+Metrics results represent the aggregated sum value over time of the selected profile type.
+
+![Metrics graph](/media/docs/pyroscope/query-editor/metric-graph.png 'Metrics graph')
+
+This allows you to quickly see any spikes in the value of the scraped profiles and zoom in to a particular time range.
+
+{{% docs/reference %}}
+[explore]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/explore"
+[explore]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/explore"
+
+[flame-graph]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/flame-graph"
+[flame-graph]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/flame-graph"
+
+[provisioning-data-sources]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/administration/provisioning#datasources"
+[provisioning-data-sources]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/administration/provisioning#datasources"
+
+[configure-tempo-data-source]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/tempo/configure-tempo-data-source"
+[configure-tempo-data-source]: "/docs/grafana-cloud/ -> docs/grafana-cloud/connect-externally-hosted/data-sources/tempo/configure-tempo-data-source"
+{{% /docs/reference %}}
diff --git a/docs/sources/datasources/tempo/_index.md b/docs/sources/datasources/tempo/_index.md
index 70ba9c4f682b7..445bda32e7236 100644
--- a/docs/sources/datasources/tempo/_index.md
+++ b/docs/sources/datasources/tempo/_index.md
@@ -20,11 +20,15 @@ weight: 1400
 
 # Tempo data source
 
-Grafana ships with built-in support for [Tempo](https://grafana.com/docs/tempo/latest/), a high-volume, minimal-dependency trace storage, open-source tracing solution from Grafana Labs. This topic explains configuration and queries specific to the Tempo data source.
+Grafana ships with built-in support for [Tempo](https://grafana.com/docs/tempo/latest/), a high-volume, minimal-dependency trace storage, open source tracing solution from Grafana Labs. This topic explains configuration and queries specific to the Tempo data source.
 
 For instructions on how to add a data source to Grafana, refer to the [administration documentation][data-source-management].
 Only users with the organization administrator role can add data sources.
-Administrators can also [configure the data source via YAML](#provision-the-data-source) with Grafana's provisioning system.
+Administrators can also [configure the data source via YAML][configure-tempo-data-source] with Grafana's provisioning system.
+
+This video explains how to add data sources, including Loki, Tempo, and Mimir, to Grafana and Grafana Cloud. Tempo data source set up starts at 4:58 in the video.
+
+{{< youtube id="cqHO0oYW6Ic" start="298" >}}
 
 Once you've added the data source, you can [configure it]({{< relref "./configure-tempo-data-source/" >}}) so that your Grafana instance's users can create queries in its [query editor]({{< relref "./query-editor/" >}}) when they [build dashboards][build-dashboards] and use [Explore][explore].
 
@@ -37,6 +41,9 @@ Once you've added the data source, you can [configure it]({{< relref "./configur
 [configure-grafana-feature-toggles]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-grafana#feature_toggles"
 [configure-grafana-feature-toggles]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-grafana#feature_toggles"
 
+[configure-tempo-data-source]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/tempo/configure-tempo-data-source#provision-the-data-source"
+[configure-tempo-data-source]: "/docs/grafana-cloud/ -> docs/grafana-cloud/connect-externally-hosted/data-sources/tempo/configure-tempo-data-source#provision-the-data-source"
+
 [data-source-management]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/administration/data-source-management"
 [data-source-management]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/administration/data-source-management"
 
diff --git a/docs/sources/datasources/tempo/configure-tempo-data-source.md b/docs/sources/datasources/tempo/configure-tempo-data-source.md
index 8cdc4264cb47b..ffde7d5ffe8cb 100644
--- a/docs/sources/datasources/tempo/configure-tempo-data-source.md
+++ b/docs/sources/datasources/tempo/configure-tempo-data-source.md
@@ -35,17 +35,16 @@ To configure basic settings for the Tempo data source, complete the following st
     | **User**       | Sets the user name for basic authentication.                             |
     | **Password**   | Sets the password for basic authentication.                              |
 
-You can also configure settings specific to the Tempo data source. These options are described in the sections below.
+You can also configure settings specific to the Tempo data source.
+
+This video explains how to add data sources, including Loki, Tempo, and Mimir, to Grafana and Grafana Cloud. Tempo data source set up starts at 4:58 in the video.
+
+{{< youtube id="cqHO0oYW6Ic" start="298" >}}
 
 ## Trace to logs
 
 ![Trace to logs settings](/media/docs/tempo/tempo-trace-to-logs-9-4.png)
 
-{{% admonition type="note" %}}
-Available in Grafana v7.4 and higher.
-If you use Grafana Cloud, open a [support ticket in the Cloud Portal](/profile/org#support) to access this feature.
-{{% /admonition %}}
-
 The **Trace to logs** setting configures the [trace to logs feature][explore-trace-integration] that is available when you integrate Grafana with Tempo.
 
 There are two ways to configure the trace to logs feature:
@@ -60,7 +59,7 @@ There are two ways to configure the trace to logs feature:
    You can also click **Open advanced data source picker** to see more options, including adding a data source.
 
 1. Set start and end time shift. As the logs timestamps may not exactly match the timestamps of the spans in trace it may be necessary to search in larger or shifted time range to find the desired logs.
-1. Select which tags to use in the logs query. The tags you configure must be present in the spans attributes or resources for a trace to logs span link to appear. You can optionally configure a new name for the tag. This is useful for example if the tag has dots in the name and the target data source does not allow using dots in labels. In that case you can for example remap `http.status` to `http_status`.
+1. Select which tags to use in the logs query. The tags you configure must be present in the span's attributes or resources for a trace to logs span link to appear. You can optionally configure a new name for the tag. This is useful, for example, if the tag has dots in the name and the target data source does not allow using dots in labels. In that case, you can for example remap `http.status` (the span attribute) to `http_status` (the data source field). "Data source" in this context can refer to Loki, or another log data source.
 1. Optionally switch on the **Filter by trace ID** and/or **Filter by span ID** setting to further filter the logs if your logs consistently contain trace or span IDs.
 
 ### Configure a custom query
@@ -70,32 +69,18 @@ There are two ways to configure the trace to logs feature:
    You can also click **Open advanced data source picker** to see more options, including adding a data source.
 
 1. Set start and end time shift. As the logs timestamps may not exactly match the timestamps of the spans in the trace it may be necessary to widen or shift the time range to find the desired logs.
-1. Optionally select tags to map. These tags can be used in the custom query with `${__tags}` variable. This variable will interpolate the mapped tags as list in an appropriate syntax for the data source and will only include the tags that were present in the span omitting those that weren't present. You can optionally configure a new name for the tag. This is useful in cases where the tag has dots in the name and the target data source does not allow using dots in labels. For example, you can remap `http.status` to `http_status` in such a case. If you don't map any tags here, you can still use any tag in the query like this `method="${__span.tags.method}"`.
+1. Optional: Select tags to map. These tags can be used in the custom query with `${__tags}` variable. This variable interpolates the mapped tags as list in an appropriate syntax for the data source. Only the tags that were present in the span are included; tags that aren't present are omitted You can also configure a new name for the tag. This is useful in cases where the tag has dots in the name and the target data source doesn't allow dots in labels. For example, you can remap `http.status` to `http_status`. If you don't map any tags here, you can still use any tag in the query, for example, `method="${__span.tags.method}"`. You can learn more about custom query variables [here](/docs/grafana/latest/datasources/tempo/configure-tempo-data-source/#custom-query-variables).
 1. Skip **Filter by trace ID** and **Filter by span ID** settings as these cannot be used with a custom query.
 1. Switch on **Use custom query**.
 1. Specify a custom query to be used to query the logs. You can use various variables to make that query relevant for current span. The link will only be shown only if all the variables are interpolated with non-empty values to prevent creating an invalid query.
 
-### Variables that can be used in a custom query
-
-To use a variable you need to wrap it in `${}`. For example `${__span.name}`.
-
-| Variable name          | Description                                                                                                                                                                                                                                                                                                                              |
-| ---------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **\_\_tags**           | This variable uses the tag mapping from the UI to create a label matcher string in the specific data source syntax. The variable only uses tags that are present in the span. The link is still created even if only one of those tags is present in the span. You can use this if all tags are not required for the query to be useful. |
-| **\_\_span.spanId**    | The ID of the span.                                                                                                                                                                                                                                                                                                                      |
-| **\_\_span.traceId**   | The ID of the trace.                                                                                                                                                                                                                                                                                                                     |
-| **\_\_span.duration**  | The duration of the span.                                                                                                                                                                                                                                                                                                                |
-| **\_\_span.name**      | Name of the span.                                                                                                                                                                                                                                                                                                                        |
-| **\_\_span.tags**      | Namespace for the tags in the span. To access a specific tag named `version`, you would use `${__span.tags.version}`. In case the tag contains dot, you have to access it as `${__span.tags["http.status"]}`.                                                                                                                            |
-| **\_\_trace.traceId**  | The ID of the trace.                                                                                                                                                                                                                                                                                                                     |
-| **\_\_trace.duration** | The duration of the trace.                                                                                                                                                                                                                                                                                                               |
-| **\_\_trace.name**     | The name of the trace.                                                                                                                                                                                                                                                                                                                   |
+### Configure trace to logs
 
 The following table describes the ways in which you can configure your trace to logs settings:
 
 | Setting name              | Description                                                                                                                                                                                                                                                                                                  |
 | ------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| **Data source**           | Defines the target data source. You can select only Loki or Splunk \[logs\] data sources.                                                                                                                                                                                                                    |
+| **Data source**           | Defines the target data source. You can select Loki or any compatible log store.                                                                                                                                                                                                                             |
 | **Span start time shift** | Shifts the start time for the logs query, based on the span's start time. You can use time units, such as `5s`, `1m`, `3h`. To extend the time to the past, use a negative value. Default: `0`.                                                                                                              |
 | **Span end time shift**   | Shifts the end time for the logs query, based on the span's end time. You can use time units. Default: `0`.                                                                                                                                                                                                  |
 | **Tags**                  | Defines the tags to use in the logs query. Default: `cluster`, `hostname`, `namespace`, `pod`, `service.name`, `service.namespace`. You can change the tag name for example to remove dots from the name if they are not allowed in the target data source. For example, map `http.status` to `http_status`. |
@@ -106,32 +91,80 @@ The following table describes the ways in which you can configure your trace to
 
 ## Trace to metrics
 
-{{% admonition type="note" %}}
-This feature is behind the `traceToMetrics` [feature toggle][configure-grafana-feature-toggles].
-If you use Grafana Cloud, open a [support ticket in the Cloud Portal](/profile/org#support) to access this feature.
-{{% /admonition %}}
-
 The **Trace to metrics** setting configures the [trace to metrics feature](/blog/2022/08/18/new-in-grafana-9.1-trace-to-metrics-allows-users-to-navigate-from-a-trace-span-to-a-selected-data-source/) available when integrating Grafana with Tempo.
 
-To configure trace to metrics:
+{{< youtube id="TkapvLeMMpc" >}}
 
-1. Select the target data source from the drop-down list.
+There are two ways to configure the trace to metrics feature:
 
-   You can also click **Open advanced data source picker** to see more options, including adding a data source.
+- Use a basic configuration with a default query, or
+- Configure one or more custom queries where you can use a [template language][variable-syntax] to interpolate variables from the trace or span.
+
+### Simple config
+
+To use a simple configuration, follow these steps:
+
+1. Select a metrics data source from the **Data source** drop-down.
+1. Optional: Choose any tags to use in the query. If left blank, the default values of `cluster`, `hostname`, `namespace`, `pod`, `service.name` and `service.namespace` are used.
+
+   The tags you configure must be present in the spans attributes or resources for a trace to metrics span link to appear. You can optionally configure a new name for the tag. This is useful for example if the tag has dots in the name and the target data source doesn't allow using dots in labels. In that case you can for example remap `service.name` to `service_name`.
+
+1. Do not select **Add query**.
+1. Select **Save and Test**.
+
+### Custom queries
+
+To use custom queries with the configuration, follow these steps:
+
+1. Select a metrics data source from the **Data source** drop-down.
+1. Optional: Choose any tags to use in the query. If left blank, the default values of `cluster`, `hostname`, `namespace`, `pod`, `service.name` and `service.namespace` are used.
+
+   These tags can be used in the custom query with `${__tags}` variable. This variable interpolates the mapped tags as list in an appropriate syntax for the data source and will only include the tags that were present in the span omitting those that weren’t present. You can optionally configure a new name for the tag. This is useful in cases where the tag has dots in the name and the target data source doesn't allow using dots in labels. For example, you can remap `service.name` to `service_name` in such a case. If you don’t map any tags here, you can still use any tag in the query like this `method="${__span.tags.method}"`. You can learn more about custom query variables [here](/docs/grafana/latest/datasources/tempo/configure-tempo-data-source/#custom-query-variables).
 
-1. Create any desired linked queries.
+1. Click **Add query** to add a custom query.
+1. Specify a custom query to be used to query metrics data.
 
-| Setting name    | Description                                                                                                                                                                                                                                                     |
-| --------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **Data source** | Defines the target data source.                                                                                                                                                                                                                                 |
-| **Tags**        | Defines the tags used in linked queries. The key sets the span attribute name, and the optional value sets the corresponding metric label name. For example, you can map `k8s.pod` to `pod`. To interpolate these tags into queries, use the `$__tags` keyword. |
+   Each linked query consists of:
 
-Each linked query consists of:
+   - **Link Label:** _(Optional)_ Descriptive label for the linked query.
+   - **Query:** The query ran when navigating from a trace to the metrics data source.
+     Interpolate tags using the `$__tags` keyword.
+     For example, when you configure the query `requests_total{$__tags}`with the tags `k8s.pod=pod` and `cluster`, the result looks like `requests_total{pod="nginx-554b9", cluster="us-east-1"}`.
 
-- **Link Label:** _(Optional)_ Descriptive label for the linked query.
-- **Query:** The query ran when navigating from a trace to the metrics data source.
-  Interpolate tags using the `$__tags` keyword.
-  For example, when you configure the query `requests_total{$__tags}`with the tags `k8s.pod=pod` and `cluster`, the result looks like `requests_total{pod="nginx-554b9", cluster="us-east-1"}`.
+1. Select **Save and Test**.
+
+### Configure trace to metrics
+
+| Setting name              | Description                                                                                                                                                                                                                                                     |
+| ------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **Data source**           | Defines the target data source.                                                                                                                                                                                                                                 |
+| **Span start time shift** | Shifts the start time for the metrics query, based on the span's start time. You can use time units, such as `5s`, `1m`, `3h`. To extend the time to the past, use a negative value. Default: `0`.                                                              |
+| **Span end time shift**   | Shifts the end time for the metrics query, based on the span's end time. You can use time units. Default: `0`.                                                                                                                                                  |
+| **Tags**                  | Defines the tags used in linked queries. The key sets the span attribute name, and the optional value sets the corresponding metric label name. For example, you can map `k8s.pod` to `pod`. To interpolate these tags into queries, use the `$__tags` keyword. |
+| **Link Label**            | _(Optional)_ Descriptive label for the linked query.                                                                                                                                                                                                            |
+| **Query**                 | Input to write a custom query. Use variable interpolation to customize it with variables from span.                                                                                                                                                             |
+
+## Trace to profiles
+
+[//]: # 'Shared content for Trace to profiles in the Tempo data source'
+
+{{< docs/shared source="grafana" lookup="datasources/tempo-traces-to-profiles.md" leveloffset="+1" version="<GRAFANA VERSION>" >}}
+
+## Custom query variables
+
+To use a variable in your trace to logs, metrics or profiles you need to wrap it in `${}`. For example, `${__span.name}`.
+
+| Variable name          | Description                                                                                                                                                                                                                                                                                                                              |
+| ---------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **\_\_tags**           | This variable uses the tag mapping from the UI to create a label matcher string in the specific data source syntax. The variable only uses tags that are present in the span. The link is still created even if only one of those tags is present in the span. You can use this if all tags are not required for the query to be useful. |
+| **\_\_span.spanId**    | The ID of the span.                                                                                                                                                                                                                                                                                                                      |
+| **\_\_span.traceId**   | The ID of the trace.                                                                                                                                                                                                                                                                                                                     |
+| **\_\_span.duration**  | The duration of the span.                                                                                                                                                                                                                                                                                                                |
+| **\_\_span.name**      | Name of the span.                                                                                                                                                                                                                                                                                                                        |
+| **\_\_span.tags**      | Namespace for the tags in the span. To access a specific tag named `version`, you would use `${__span.tags.version}`. In case the tag contains dot, you have to access it as `${__span.tags["http.status"]}`.                                                                                                                            |
+| **\_\_trace.traceId**  | The ID of the trace.                                                                                                                                                                                                                                                                                                                     |
+| **\_\_trace.duration** | The duration of the trace.                                                                                                                                                                                                                                                                                                               |
+| **\_\_trace.name**     | The name of the trace.                                                                                                                                                                                                                                                                                                                   |
 
 ## Service Graph
 
@@ -153,13 +186,6 @@ The **Search** setting configures [Tempo search](/docs/tempo/latest/configuratio
 
 You can configure the **Hide search** setting to hide the search query option in **Explore** if search is not configured in the Tempo instance.
 
-## Loki search
-
-The **Loki search** setting configures the Loki search query type.
-
-Configure the **Data source** setting to define which Loki instance you want to use to search traces.
-You must configure [derived fields]({{< relref "../loki#configure-derived-fields" >}}) in the Loki instance.
-
 ## TraceID query
 
 The **TraceID query** setting modifies how TraceID queries are run. The time range can be used when there are performance issues or timeouts since it will narrow down the search to the defined range. This setting is disabled by default.
@@ -221,14 +247,18 @@ datasources:
         queries:
           - name: 'Sample query'
             query: 'sum(rate(traces_spanmetrics_latency_bucket{$$__tags}[5m]))'
+      tracesToProfiles:
+        datasourceUid: 'grafana-pyroscope-datasource'
+        tags: ['job', 'instance', 'pod', 'namespace']
+        profileTypeId: 'process_cpu:cpu:nanoseconds:cpu:nanoseconds'
+        customQuery: true
+        query: 'method="${__span.tags.method}"'
       serviceMap:
         datasourceUid: 'prometheus'
       nodeGraph:
         enabled: true
       search:
         hide: false
-      lokiSearch:
-        datasourceUid: 'loki'
       traceQuery:
         timeShiftEnabled: true
         spanStartTimeShift: '1h'
@@ -242,9 +272,6 @@ datasources:
 [build-dashboards]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/build-dashboards"
 [build-dashboards]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/build-dashboards"
 
-[configure-grafana-feature-toggles]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-grafana#feature_toggles"
-[configure-grafana-feature-toggles]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-grafana#feature_toggles"
-
 [data-source-management]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/administration/data-source-management"
 [data-source-management]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/administration/data-source-management"
 
diff --git a/docs/sources/datasources/tempo/query-editor/_index.md b/docs/sources/datasources/tempo/query-editor/_index.md
index 14c9f364a80e6..f80a938d22bdd 100644
--- a/docs/sources/datasources/tempo/query-editor/_index.md
+++ b/docs/sources/datasources/tempo/query-editor/_index.md
@@ -12,12 +12,12 @@ labels:
     - cloud
     - enterprise
     - oss
-menuTitle: Query editor
-title: Tempo query editor
+menuTitle: Query tracing data
+title: Query tracing data
 weight: 300
 ---
 
-# Tempo query editor
+# Query tracing data
 
 The Tempo data source's query editor helps you query and display traces from Tempo in [Explore][explore].
 
@@ -99,13 +99,6 @@ To query a particular trace:
 
 {{< figure src="/static/img/docs/tempo/query-editor-traceid.png" class="docs-image--no-shadow" max-width="750px" caption="Screenshot of the Tempo TraceID query type" >}}
 
-## Query Loki for traces
-
-To find traces to visualize, you can use the [Loki query editor]({{< relref "../../loki#loki-query-editor" >}}).
-For results, you must configure [derived fields]({{< relref "../../loki#configure-derived-fields" >}}) in the Loki data source that point to this data source.
-
-{{< figure src="/static/img/docs/tempo/query-editor-search.png" class="docs-image--no-shadow" max-width="750px" caption="Screenshot of the Tempo query editor showing the Loki Search tab" >}}
-
 {{% docs/reference %}}
 [explore]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/explore"
 [explore]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/explore"
diff --git a/docs/sources/datasources/tempo/tracing-best-practices.md b/docs/sources/datasources/tempo/tracing-best-practices.md
new file mode 100644
index 0000000000000..bab5083848344
--- /dev/null
+++ b/docs/sources/datasources/tempo/tracing-best-practices.md
@@ -0,0 +1,25 @@
+---
+description: Use best practices to plan how you implement tracing.
+keywords:
+  - grafana
+  - tempo
+  - best practices
+  - tracing
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+menuTitle: Best practices
+title: Best practices for tracing
+weight: 250
+---
+
+# Best practices for tracing
+
+This page provides some general best practices for tracing.
+
+[//]: # 'Shared content for best practices for traces'
+[//]: # 'This content is located in /tempo/docs/sources/shared/best-practices-traces.md'
+
+{{< docs/shared source="tempo" lookup="best-practices-traces.md" version="<TEMPO_VERSION>" >}}
diff --git a/docs/sources/datasources/testdata/_index.md b/docs/sources/datasources/testdata/_index.md
index fbfa774b291e2..935cbb96cbb85 100644
--- a/docs/sources/datasources/testdata/_index.md
+++ b/docs/sources/datasources/testdata/_index.md
@@ -114,3 +114,28 @@ That makes it much easier for the developers to replicate and solve your issue.
 [panels-visualizations]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations"
 [panels-visualizations]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations"
 {{% /docs/reference %}}
+
+## Use a custom version of TestData
+
+{{% admonition type="note" %}}
+This feature is experimental and requires Grafana version 10.3.0 or later.
+{{% /admonition %}}
+
+If you want to use a version of TestData different from the one shipped with Grafana, follow these steps:
+
+1. Enable the [feature toggle](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/feature-toggles/) `externalCorePlugins`.
+1. Set the configuration field `as_external` for the plugin to `true`. An example configuration would be:
+
+   ```ini
+   [feature_toggles]
+   externalCorePlugins = true
+
+   [plugin.grafana-testdata-datasource]
+   as_external = true
+   ```
+
+1. Restart Grafana.
+
+These settings, if enabled, allow you to to install TestData as an external plugin and manage its lifecycle independently of Grafana.
+
+With the feature toggle disabled (default) TestData can still be installed as an external plugin, but it has no effect as the bundled, Core version of TestData is already installed and takes precedence.
diff --git a/docs/sources/datasources/zipkin/_index.md b/docs/sources/datasources/zipkin/_index.md
index c1d96a862567a..b12037fbe2c03 100644
--- a/docs/sources/datasources/zipkin/_index.md
+++ b/docs/sources/datasources/zipkin/_index.md
@@ -121,11 +121,6 @@ The following table describes the ways in which you can configure your trace to
 
 ### Trace to metrics
 
-{{% admonition type="note" %}}
-This feature is behind the `traceToMetrics` [feature toggle][configure-grafana-feature-toggles].
-If you use Grafana Cloud, open a [support ticket in the Cloud Portal](/profile/org/#support) to access this feature.
-{{% /admonition %}}
-
 The **Trace to metrics** setting configures the [trace to metrics feature](/blog/2022/08/18/new-in-grafana-9.1-trace-to-metrics-allows-users-to-navigate-from-a-trace-span-to-a-selected-data-source/) available when integrating Grafana with Zipkin.
 
 To configure trace to metrics:
diff --git a/docs/sources/developers/angular_deprecation/_index.md b/docs/sources/developers/angular_deprecation/_index.md
index 89b3037c1ae51..060e3931dfea7 100644
--- a/docs/sources/developers/angular_deprecation/_index.md
+++ b/docs/sources/developers/angular_deprecation/_index.md
@@ -14,7 +14,20 @@ weight: 500
 
 # Angular support deprecation
 
-Angular plugin support is deprecated and will be removed in a future release. There are still many community plugins that rely on Grafana's Angular plugin support to work. The same is true for many internal (private) plugins that have been developed by Grafana users over the years. Grafana version 9 has a server configuration option that is global to the entire instance and controls whether Angular plugin support is available or not. By default, Angular support is still enabled, but that will change soon once we complete the migration of all Angular code in the core product.
+Angular plugin support is deprecated and will be removed in a future release.
+There are legacy core Grafana visualizations and external plugins that rely on Grafana's Angular plugin support to work. The same is likely true for [private plugins](https://grafana.com/legal/plugins/) that have been developed by Grafana users for use on their own instances over the years.
+From Grafana v9 and onwards, there is a [server configuration option](https://github.com/grafana/grafana/blob/d61bcdf4ca5e69489e0067c56fbe7f0bfdf84ee4/conf/defaults.ini#L362) that's global to the entire instance and controls whether Angular plugin support is available or not.
+In Grafana 11, we will change the default value for the configuration to remove support.
+
+Warning messages are displayed if a dashboard depends on an a panel visualization or data source which requires AngularJS as shown in the following video:
+
+{{< youtube id="XlEVs6g8dC8" >}}
+
+To avoid disruption:
+
+- Ensure that you are running the latest version of plugins by following this guide on [updating]({{< relref "../../administration/plugin-management/#update-a-plugin" >}}). Many panels and data sources have migrated from AngularJS.
+- If you are using legacy Core Grafana visualizations such as Graph or Table-old, migrate to their replacements using the provided [automatic migrations]({{< relref "./angular-plugins/#automatic-migration-of-plugins" >}}).
+- Review the [list of current Angular plugins]({{< relref "./angular-plugins/" >}}) to discover which Core and external plugins are impacted, and whether an update or alternative is required.
 
 ## Why are we deprecating Angular support?
 
@@ -22,17 +35,24 @@ AngularJS is an old frontend framework whose active development stopped many yea
 
 ## When will Angular plugins stop working?
 
-Our goal is to transfer all the remaining Angular code to the core of Grafana before Grafana 10 is released in Summer 2023. Once this is done, the option "[angular_support_enabled](https://github.com/grafana/grafana/blob/d61bcdf4ca5e69489e0067c56fbe7f0bfdf84ee4/conf/defaults.ini#L362)" will be disabled by default for new Grafana Cloud users, resulting in the inability to use Angular plugins. In case you still rely on AngularJS-based plugins developed internally or by the community, you will need to enable this option to continue using them. Following the release of Grafana 10 we will be migrating Grafana Cloud users where possible and disabling Angular support when appropriate, we will also be introducing new features to help all users identify how they are impacted and to warn of the use of deprecated plugins within the Grafana UI.
+In Grafana 11, which will be released in preview in April 2024 and generally available in May, we will change the default behavior of the [angular_support_enabled](https://github.com/grafana/grafana/blob/d61bcdf4ca5e69489e0067c56fbe7f0bfdf84ee4/conf/defaults.ini#L362) configuration parameter to turn off support for AngularJS based plugins. In case you still rely on [AngularJS-based plugins]({{< relref "./angular-plugins/" >}}) developed internally or by the community, you will need to enable this option to continue using them.
+
+New Grafana Cloud users will be unable to request for support to be added to their instance.
 
 ## When will we remove Angular support completely?
 
-Our plan is to completely remove support for Angular plugins in version 11, which will be released in 2024. This means that all plugins that depend on Angular will stop working and the temporary option introduced in version 10 to enable Angular will be removed.
+Our current plan is to completely remove any remaining support for Angular plugins in version 12. Including the removal of the [angular_support_enabled](https://github.com/grafana/grafana/blob/d61bcdf4ca5e69489e0067c56fbe7f0bfdf84ee4/conf/defaults.ini#L362) configuration parameter.
+
+## A dashboard I use is displaying a warning, what do I need to do?
+
+A dashboard displays warnings when one or more panel visualizations or data sources in the dashboard have a dependency on Angular.
+Contact your system administrator to advise them of the issue or follow the preceding guidance on avoiding disruption.
 
 ## How do I migrate an Angular plugin to React?
 
 Depending on if it’s a data source plugin, panel plugin, or app plugin the process will differ.
 
-For panels, the rendering logic could in some cases be easily preserved but all options need to be redone to use the declarative options framework. For data source plugins the query editor and config options will likely need a total rewrite.
+For panels, the rendering logic could in some cases be easily preserved, but all options need to be redone to use the declarative options framework. For data source plugins the query editor and config options will likely need a total rewrite.
 
 ## How do I encourage a community plugin to migrate?
 
diff --git a/docs/sources/developers/angular_deprecation/angular-plugins.md b/docs/sources/developers/angular_deprecation/angular-plugins.md
index d27400acfd81e..d565cb5a2e197 100644
--- a/docs/sources/developers/angular_deprecation/angular-plugins.md
+++ b/docs/sources/developers/angular_deprecation/angular-plugins.md
@@ -16,850 +16,192 @@ description: An annotated list of Grafana plugins using AngularJS.
 
 # Plugins using AngularJS
 
-The use of AngularJS in Grafana has been [deprecated]({{< relref "../angular_deprecation" >}}) and support for it will be removed in a future release.
+The use of AngularJS in Grafana has been [deprecated]({{< relref "../angular_deprecation" >}}) in favor of React. Support for AngularJS will be turned off by default in Grafana 11.
 
-This page is to help users of Grafana understand how they might be impacted by the removal of Angular support, and whether a migration option exists.
-
-It lists the latest versions of plugins currently available in the [Plugins Catalog](https://grafana.com/plugins) which depend on Angular, and will stop working when Angular support is removed from Grafana. The list will be updated as more plugins migrate to React or offer migration advice.
-
-{{% admonition type="note" %}}
-We advise you to ensure you are running the latest version of plugins, as previous releases of plugins not listed here may still require AngularJS.
-{{% /admonition %}}
-
-We also list the year in which the plugin was last updated in the catalog and where appropriate, highlight warnings for plugins where the source repository has not been updated in a number of years and appears inactive. This may help indicate the likelihood of a migration being undertaken, but is informational rather than definitive.
-
-{{% admonition type="note" %}}
-Plugins were updated to include signatures in 2021, so whilst a plugin may show as having been updated at that point - the last update to its functionality or dependencies may have been longer ago.
-{{% /admonition %}}
-
-## What should I do with the information below?
-
-- Consider the available migration steps.
-- Check your Grafana instances for usage of these plugins - see information here on [browsing installed plugins]({{< relref "../../administration/plugin-management/#browse-plugins" >}}).
-- Review the project repositories to add your support to any migration issues.
-
-## I'm a plugin author
-
-We are greatly appreciative of the developers who have contributed plugins to the Grafana ecosystem, your work has helped support millions of users to gain insights into their data. A plugin being listed below is no reflection on its quality, and is purely to help users understand the impact of the removal of Angular support in Grafana.
-
-Guidance on migrating a plugin to React can be found in our [migration guide](/developers/plugin-tools/migration-guides/migrate-angularjs-to-react). If you would like to add any specific migration guidance for your plugin here or update our assessment, please open a PR by clicking the `Suggest an edit` button at the bottom of this page.
-
-# Current AngularJS based plugins
-
-## Apps
-
-### [BelugaCDN](https://grafana.com/grafana/plugins/belugacdn-app)
-
-Latest Version: 1.2.1 | Signature: Commercial | Last Updated: 2023
-
-> [Migration issue](https://github.com/belugacdn/grafana-belugacdn-app/issues/7) has been raised.
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/belugacdn/grafana-belugacdn-app) in the past 7 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [Bosun](https://grafana.com/grafana/plugins/bosun-app)
-
-Latest Version: 0.0.29 | Signature: Community | Last Updated: 2023
-
-> [Migration issue](https://github.com/bosun-monitor/bosun-grafana-app/issues/63) has been raised.
-
-### [Cloudflare Grafana App](https://grafana.com/grafana/plugins/cloudflare-app/)
-
-Latest Version: 0.2.4 | Signature: Commercial | Last Updated: 2022
-
-{{% admonition type="warning" %}}
-Guidance from the developer: This app is deprecated and will no longer be updated after December 31, 2023. Please consider using the [Cloudflare] Dashboard(https://dash.cloudflare.com/?to=/:account/:zone/analytics/dns) or [DNS Analytics API](https://developers.cloudflare.com/api/operations/dns-analytics-table) instead.
-{{% /admonition %}}
-
-### [GLPI](https://grafana.com/grafana/plugins/ddurieux-glpi-app)
-
-Latest Version: 1.3.1 | Signature: Community | Last Updated: 2021
-
-> [Migration issue](https://github.com/ddurieux/glpi_app_grafana/issues/96) has been raised.
-
-### [DevOpsProdigy KubeGraf](https://grafana.com/grafana/plugins/devopsprodigy-kubegraf-app/)
-
-Latest Version: 1.5.2 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-[Issues](https://github.com/devopsprodigy/kubegraf/issues/71) in the project repository suggest that the project _may_ be unsupported.
-{{% /admonition %}}
-
-> **Migration available - potential alternative:** Grafana Cloud includes a [Kubernetes integration](https://grafana.com/solutions/kubernetes/).
-
-### [AWS IoT TwinMaker App](https://grafana.com/grafana/plugins/grafana-iot-twinmaker-app)
-
-Latest Version: 1.6.2 | Signature: Grafana | Last Updated: 2023
-
-{{% admonition type="note" %}}
-Plugin should continue to work even if Angular is disabled, and a full removal of Angular related code is planned.
-{{% /admonition %}}
-
-### [OpenNMS Helm](https://grafana.com/grafana/plugins/opennms-helm-app)
-
-Latest Version: 8.0.5 | Signature: Community | Last Updated: 2023
-
-> **Migration available - plugin superseded:** The plugin has effectively been replaced with a [new plugin](https://grafana.com/grafana/plugins/opennms-opennms-app/) based on React.
-
-### [Percona](https://grafana.com/grafana/plugins/percona-percona-app/)
-
-Latest Version: 1.0.1 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-[Project repository](https://github.com/percona/grafana-app) was archived on June 12, 2020.
-{{% /admonition %}}
-
-### [Stagemonitor Elasticsearch](https://grafana.com/grafana/plugins/stagemonitor-elasticsearch-app)
-
-Latest Version: 0.83.3 | Signature: Community | Last Updated: 2021
-
-> [Migration issue](https://github.com/stagemonitor/stagemonitor-grafana-elasticsearch/issues/1) has been raised.
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/stagemonitor/stagemonitor-grafana-elasticsearch) in the past 4 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [Voxter VoIP Platform Metrics](https://grafana.com/grafana/plugins/voxter-app)
-
-Latest Version: 0.0.2 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/raintank/voxter-app) in the past 3 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-## Datasources
-
-### [Druid](https://grafana.com/grafana/plugins/abhisant-druid-datasource/)
-
-Latest Version: v0.0.6 | Signature: Community | Last Updated: 2021
-
-> **Migration available - plugin superseded:** The original plugin only claims support for Grafana v4.x.x, it was replaced with a [new plugin](https://grafana.com/grafana/plugins/grafadruid-druid-datasource/) based on React.
-
-### [Akumuli](https://grafana.com/grafana/plugins/akumuli-datasource/)
-
-Latest Version: 1.3.12 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-[Issues](https://github.com/akumuli/Akumuli/issues/379) in the project repository suggest that the project _may_ be unsupported.
-{{% /admonition %}}
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/akumuli/Akumuli/) in the past 3 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [DarkSky](https://grafana.com/grafana/plugins/andig-darksky-datasource/)
-
-Latest Version: 1.0.2 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-[Project repository](https://github.com/andig/grafana-darksky) was archived on September 27, 2022.
-{{% /admonition %}}
-
-{{% admonition type="warning" %}}
-Apple removed support for the DarkSky API on March 31, 2023 - [source](https://support.apple.com/en-us/HT213526).
-{{% /admonition %}}
-
-### [Finance](https://grafana.com/grafana/plugins/ayoungprogrammer-finance-datasource/)
-
-Latest Version: 1.0.1 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-[Issues](https://github.com/ayoungprogrammer/grafana-finance/issues/7) in the project repository suggest that the project _may_ be unsupported.
-{{% /admonition %}}
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/ayoungprogrammer/grafana-finance) in the past 6 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [Prometheus AlertManager](https://grafana.com/grafana/plugins/camptocamp-prometheus-alertmanager-datasource/)
-
-Latest Version: 1.2.1 | Signature: Community | Last Updated: 2022
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/camptocamp/grafana-prometheus-alertmanager-datasource) in the past year suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-> **Migration available - potential alternative:** Grafana includes an AlertManager data source as a Core plugin.
-
-### [Chaos Mesh](https://grafana.com/grafana/plugins/chaosmeshorg-datasource/)
-
-Latest Version: 2.2.3 | Signature: Community | Last Updated: 2022
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/chaos-mesh/datasource) in the past year suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [DeviceHive](https://grafana.com/grafana/plugins/devicehive-devicehive-datasource/)
-
-Latest Version: 2.0.2 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/devicehive/devicehive-grafana-datasource) in the past 5 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [Google BigQuery](https://grafana.com/grafana/plugins/doitintl-bigquery-datasource/)
-
-Latest Version: 2.0.3 | Signature: Community | Last Updated: 2022
-
-> **Migration available - plugin superseded:** Grafana provides its own [Google BigQuery Plugin](https://grafana.com/grafana/plugins/grafana-bigquery-datasource/). The previous [Project repository](https://github.com/doitintl/bigquery-grafana) was archived on December 11, 2022 with a recommendation to migrate to the aforementioned Grafana provided plugin.
-
-### [Open-Falcon](https://grafana.com/grafana/plugins/fastweb-openfalcon-datasource/)
-
-Latest Version: 1.0.1 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-[Project repository](https://github.com/open-falcon/grafana-openfalcon-datasource) suggests support for Grafana v4.2 - Grafana v5.4.
-{{% /admonition %}}
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/open-falcon/grafana-openfalcon-datasource) in the past year suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [GraphQL Data Source](https://grafana.com/grafana/plugins/fifemon-graphql-datasource/)
-
-Latest Version: 1.3.0 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Project support is unclear after a request for new maintainers - [source](https://github.com/fifemon/graphql-datasource/issues/77).
-{{% /admonition %}}
-
-> **Migration available - potential alternative:** The [Infinity](https://grafana.com/grafana/plugins/yesoreyeram-infinity-datasource/) data source supports GraphQL.
-
-### [Cloudera Manager](https://grafana.com/grafana/plugins/foursquare-clouderamanager-datasource/)
-
-Latest Version: 0.9.3 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/foursquare/datasource-plugin-clouderamanager) in the past 7 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [Simple Annotations](https://grafana.com/grafana/plugins/fzakaria-simple-annotations-datasource/)
-
-Latest Version: 1.0.1 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Plugin only claims support for Grafana v4.x.x.
-{{% /admonition %}}
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/fzakaria/simple-annotations-plugin/) in the past 6 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-{{% admonition type="warning" %}}
-Developer no longer maintains the project, but is open to contributions: https://github.com/fzakaria/simple-annotations-plugin/issues/2
-{{% /admonition %}}
-
-### [Gnocchi](https://grafana.com/grafana/plugins/gnocchixyz-gnocchi-datasource/)
-
-Latest Version: 1.7.1 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Plugin only claims support for Grafana v4.x.x
-{{% /admonition %}}
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/gnocchixyz/grafana-gnocchi-datasource) in the past 3 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [MetaQueries](https://grafana.com/grafana/plugins/goshposh-metaqueries-datasource/)
-
-Latest Version: 0.0.9 | Signature: Community | Last Updated: 2022
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/GoshPosh/grafana-meta-queries) in the past year suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [Open Distro for Elasticsearch](https://grafana.com/grafana/plugins/grafana-es-open-distro-datasource/)
-
-Latest Version: 1.0.6 | Signature: Grafana | Last Updated: 2021
-
-> **Migration available - plugin superseded:** Plugin was deprecated in favour of the [OpenSearch Plugin](https://grafana.com/grafana/plugins/grafana-opensearch-datasource/).
-
-### [KairosDB](https://grafana.com/grafana/plugins/grafana-kairosdb-datasource/)
-
-Latest Version: 3.0.2 | Signature: Grafana | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-[Project repository](https://github.com/grafana/kairosdb-datasource) was archived on August 30th, 2021, and is no longer maintained.
-{{% /admonition %}}
-
-### [SimpleJson](https://grafana.com/grafana/plugins/grafana-simple-json-datasource/)
-
-Latest Version: 1.4.2 | Signature: Grafana | Last Updated: 2021
-
-> **Migration available - potential alternative:** [Project repository](https://github.com/grafana/simple-json-datasource) is no longer maintained, but a number of alternatives exist, including - [Infinity](https://grafana.com/grafana/plugins/yesoreyeram-infinity-datasource/), [JSON](https://grafana.com/grafana/plugins/simpod-json-datasource) and [JSON API](https://grafana.com/grafana/plugins/marcusolsson-json-datasource).
-
-{{% admonition type="note" %}}
-If you're looking for an example of a data source plugin to start from, refer to [grafana-starter-datasource-backend](https://github.com/grafana/grafana-starter-datasource-backend).
-{{% /admonition %}}
-
-### [openHistorian](https://grafana.com/grafana/plugins/gridprotectionalliance-openhistorian-datasource/)
-
-Latest Version: 1.0.3 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/GridProtectionAlliance/openHistorian-grafana/) in the past 2 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [Hawkular](https://grafana.com/grafana/plugins/hawkular-datasource/)
-
-Latest Version: 1.1.2 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/hawkular/hawkular-grafana-datasource) in the past 5 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [Humio](https://grafana.com/grafana/plugins/humio-datasource/)
-
-Latest Version: 3.3.1 | Signature: Commercial | Last Updated: 2022
-
-### [IBM APM](https://grafana.com/grafana/plugins/ibm-apm-datasource/)
-
-Latest Version: 0.9.1 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/rafal-szypulka/grafana-ibm-apm) in the past 3 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [PRTG](https://grafana.com/grafana/plugins/jasonlashua-prtg-datasource/)
-
-Latest Version: 4.0.4 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/neuralfraud/grafana-prtg) in the past 4 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-{{% admonition type="warning" %}}
-Unmaintained since 2017 - [source](https://github.com/neuralfraud/grafana-prtg/wiki).
-{{% /admonition %}}
-
-### [LinkSmart HDS Datasource](https://grafana.com/grafana/plugins/linksmart-hds-datasource/)
-
-Latest Version: 1.0.2 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-[Project repository](https://github.com/linksmart/grafana-hds-datasource) was archived on April 4th, 2022, and is no longer maintained.
-{{% /admonition %}}
-
-### [LinkSmart SensorThings](https://grafana.com/grafana/plugins/linksmart-sensorthings-datasource/)
-
-Latest Version: 1.3.1 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-[Project repository](https://github.com/linksmart/grafana-sensorthings-datasource) was archived on April 4th, 2022, and is no longer maintained.
-{{% /admonition %}}
-
-### [Monasca](https://grafana.com/grafana/plugins/monasca-datasource/)
-
-Latest Version: 1.0.1 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/openstack/monasca-grafana-datasource) in the past 2 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-{{% admonition type="warning" %}}
-Last updated to support Grafana v7.
-{{% /admonition %}}
-
-### [Monitoring Art](https://grafana.com/grafana/plugins/monitoringartist-monitoringart-datasource/)
-
-Latest Version: 1.0.1 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/monitoringartist/grafana-monitoring-art) in the past 6 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [GoogleCalendar](https://grafana.com/grafana/plugins/mtanda-google-calendar-datasource/)
-
-Latest Version: 1.0.5 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/mtanda/grafana-google-calendar-datasource) in the past 2 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [USGS Water Services](https://grafana.com/grafana/plugins/natel-usgs-datasource/)
-
-Latest Version: 0.0.3 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/NatelEnergy/natel-usgs-datasource) in the past 3 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [ntopng](https://grafana.com/grafana/plugins/ntop-ntopng-datasource/)
-
-Latest Version: 1.0.1 | Signature: Community | Last Updated: 2021
-
-> **Migration available - plugin superseded:** this plugin was [discontinued in favour of the InfluxDB data source](https://github.com/ntop/ntopng-grafana-datasource) - a Core plugin included in Grafana, additional guidance is available [here](https://www.ntop.org/guides/ntopng/basic_concepts/timeseries.html#influxdb-driver).
-
-### [Warp 10](https://grafana.com/grafana/plugins/ovh-warp10-datasource/)
-
-Latest Version: 2.2.1 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-[Project repository](https://github.com/ovh/ovh-warp10-datasource) was archived on March 22nd, 2023 and is no longer maintained.
-{{% /admonition %}}
-
-### [KapacitorSimpleJson](https://grafana.com/grafana/plugins/paytm-kapacitor-datasource/)
-
-Latest Version: 0.1.3 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/paytm/kapacitor-grafana-datasource-plugin) in the past 4 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [Ambari Metrics](https://grafana.com/grafana/plugins/praj-ams-datasource/)
-
-Latest Version: 1.2.1 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/prajwalrao/ambari-metrics-grafana) in the past 5 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [Solr](https://grafana.com/grafana/plugins/pue-solr-datasource/)
-
-Latest Version: 1.0.3 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Unclear progress on migration to React - [issue](https://github.com/pueteam/datasource-plugin-solr/issues/12).
-{{% /admonition %}}
-
-> **Migration available - potential alternative:** Users could configure the solr-exporter for Prometheus as described [here](https://solr.apache.org/guide/solr/latest/deployment-guide/monitoring-with-prometheus-and-grafana.html).
-
-### [QuasarDB](https://grafana.com/grafana/plugins/quasardb-datasource/)
-
-Latest Version: 3.8.3 | Signature: Community | Last Updated: 2021
-
-### [Blueflood](https://grafana.com/grafana/plugins/rackerlabs-blueflood-datasource/)
-
-Latest Version: 0.0.3 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/rax-maas/blueflood-grafana) in the past 7 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [NetXMS](https://grafana.com/grafana/plugins/radensolutions-netxms-datasource/)
-
-Latest Version: 1.2.3 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/netxms/grafana) in the past 2 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [Shoreline Data Source](https://grafana.com/grafana/plugins/shorelinesoftware-shoreline-datasource/)
-
-Latest Version: 1.1.0 | Signature: Commercial | Last Updated: 6 months ago
-
-### [Sidewinder](https://grafana.com/grafana/plugins/sidewinder-datasource/)
-
-Latest Version: 0.2.1 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/srotya/sidewinder-grafana) in the past 5 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [Skydive](https://grafana.com/grafana/plugins/skydive-datasource/)
-
-Latest Version: 1.2.1 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/skydive-project/skydive-grafana-datasource) in the past 4 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-{{% admonition type="warning" %}}
-Issues suggest the entire project, not just the plugin, may be abandoned - [source](https://github.com/skydive-project/skydive/issues/2417).
-{{% /admonition %}}
-
-### [Heroic](https://grafana.com/grafana/plugins/spotify-heroic-datasource/)
-
-Latest Version: 0.0.2 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-[Plugin](https://github.com/spotify/spotify-heroic-datasource) and [Heroic](https://github.com/spotify/heroic) were both archived on April 17th, 2021 and March 27th, 2021 respectively.
-{{% /admonition %}}
-
-### [Heroic](https://grafana.com/grafana/plugins/udoprog-heroic-datasource/)
-
-Latest Version: 0.1.1 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-[Plugin](https://github.com/udoprog/udoprog-heroic-datasource) and [Heroic](https://github.com/spotify/heroic) were both archived on October 16th, 2022 and March 27th, 2021 respectively.
-{{% /admonition %}}
-
-### [Altinity plugin for ClickHouse](https://grafana.com/grafana/plugins/vertamedia-clickhouse-datasource/)
-
-Latest Version: 2.5.3 | Signature: Community | Last Updated: 2022
+This page explains how Grafana users might be impacted by the removal of Angular support based on plugins dependent on this legacy framework. You will also see if there is a migration option available for a given plugin.
 
 {{% admonition type="note" %}}
-The [migration issue](https://github.com/Altinity/clickhouse-grafana/issues/475) has been assigned to a new major version milestone.
-{{% /admonition %}}
-
-### [Pagerduty](https://grafana.com/grafana/plugins/xginn8-pagerduty-datasource/)
-
-Latest Version: 0.2.2 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/skydive-project/skydive-grafana-datasource) in the past year suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-{{% admonition type="warning" %}}
-Plugin only claims support for Grafana v5.
-{{% /admonition %}}
-
-### [Chaos Mesh](https://grafana.com/grafana/plugins/yeya24-chaosmesh-datasource/)
-
-Latest Version: 0.2.3 | Signature: Community | Last Updated: 2022
-
-{{% admonition type="warning" %}}
-Plugin declares itself deprecated in favour of [chaosmeshorg-datasource](https://grafana.com/grafana/plugins/chaosmeshorg-datasource/) which also appears above in this list with warnings around its future.
-{{% /admonition %}}
-
-## Panels
-
-### [FlowCharting](https://grafana.com/grafana/plugins/agenty-flowcharting-panel/)
-
-Latest Version: 0.9.1 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/algenty/grafana-flowcharting) in the past year suggests project _may_ not be actively maintained.
+We are greatly appreciative of the developers who have contributed plugins to the Grafana ecosystem. Guidance on migrating a plugin to React can be found in our [migration guide](/developers/plugin-tools/migration-guides/migrate-angularjs-to-react).
 {{% /admonition %}}
 
-> **Migration available - potential alternative:** Grafana provides the native [Canvas]({{< relref "../../panels-visualizations/visualizations/canvas/" >}}) panel.
-
-### [HTML](https://grafana.com/grafana/plugins/aidanmountford-html-panel/)
-
-Latest Version: 0.0.2 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/aidanmountford/aidanmountford-html-panel) in the past 4 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
+## What should I do with the list of AngularJS plugins?
 
-> **Migration available - potential alternative:** The [Text]({{< relref "../../panels-visualizations/visualizations/text/#html" >}}) panel included with Grafana supports rendering HTML content. Other plugins also exist which provide similar capabilities - [HTML](https://grafana.com/grafana/plugins/gapit-htmlgraphics-panel/) and [Dynamic Text](https://grafana.com/grafana/plugins/marcusolsson-dynamictext-panel/).
-
-### [Track Map](https://grafana.com/grafana/plugins/alexandra-trackmap-panel/)
-
-Latest Version: 1.2.6 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-[Issue](https://github.com/alexandrainst/alexandra-trackmap-panel/issues/72#issuecomment-1332179974) suggests problems with ongoing maintenance unless new contributors are found.
-{{% /admonition %}}
-
-{{% admonition type="warning" %}}
-[Migration issue](https://github.com/alexandrainst/alexandra-trackmap-panel/issues/105) has been marked as needing help.
-{{% /admonition %}}
+Refer to the [table below](#angularjs-based-plugins) and take the appropriate action for you.
 
-### [PictureIt](https://grafana.com/grafana/plugins/bessler-pictureit-panel/)
-
-Latest Version: 1.0.1 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/vbessler/grafana-pictureit) in the past 6 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-> **Migration available - potential alternative:** another plugin exists which provides similar capabilities - [ePict](https://grafana.com/grafana/plugins/larona-epict-panel/).
-
-### [Singlestat Math](https://grafana.com/grafana/plugins/blackmirror1-singlestat-math-panel/)
-
-Latest Version: 1.1.8 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/black-mirror-1/singlestat-math) in the past 5 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [Status By Group Panel](https://grafana.com/grafana/plugins/blackmirror1-statusbygroup-panel/)
-
-Latest Version: 1.1.2 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/black-mirror-1/Grafana_Status_panel) in the past 5 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [Datatable Panel](https://grafana.com/grafana/plugins/briangann-datatable-panel/)
-
-Latest Version: 1.0.3 | Signature: Community | Last Updated: 2021
+- Consider the advice on whether to update, migrate to a listed alternative, or explore the Grafana plugins [catalog](/grafana/plugins) to find the most suitable option for your use case.
+- Use our [detect-angular-dashboards](https://github.com/grafana/detect-angular-dashboards) open source tooling to list dashboards which have a dependency on Angular plugins.
+- Check your Grafana instances for usage of these plugins. Refer to the documentation on [browsing installed plugins]({{< relref "../../administration/plugin-management/#browse-plugins" >}}).
+- Customers of Grafana Enterprise and users of Grafana Cloud can also leverage [usage insights]({{< relref "../../dashboards/assess-dashboard-usage/" >}}) to prioritize any migration efforts.
+- Review the plugin source repositories to add your support to any migration issues or consider forking the repo.
 
 {{% admonition type="note" %}}
-Migration to React is planned - [issue](https://github.com/briangann/grafana-datatable-panel/issues/174).
-{{% /admonition %}}
-
-### [D3 Gauge](https://grafana.com/grafana/plugins/briangann-gauge-panel/)
-
-Latest Version: 0.0.9 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="note" %}}
-Migration to React is a planned [update](https://github.com/briangann/grafana-gauge-panel/issues/740).
-{{% /admonition %}}
-
-### [GeoLoop](https://grafana.com/grafana/plugins/citilogics-geoloop-panel/)
-
-Latest Version: 1.1.2 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/CitiLogics/citilogics-geoloop-panel) in the past 2 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [Progress List](https://grafana.com/grafana/plugins/corpglory-progresslist-panel/)
-
-Latest Version: 1.0.6 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/CorpGlory/grafana-progress-list) in the past 2 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [Bubble Chart](https://grafana.com/grafana/plugins/digrich-bubblechart-panel/)
-
-Latest Version: 1.2.1 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/digrich/bubblechart-panel) in the past 3 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [Blendstat](https://grafana.com/grafana/plugins/farski-blendstat-panel/)
-
-Latest Version: 1.0.3 | Signature: Community | Last Updated: 2021
-
-> **Migration available - potential alternative:** plugin author recommends use of single stat panel and transformations functionality - [source](https://github.com/farski/blendstat-grafana/issues/11#issuecomment-1112158909).
-
-### [WindRose](https://grafana.com/grafana/plugins/fatcloud-windrose-panel/)
-
-Latest Version: 0.7.1 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/fatcloud/windrose-panel) in the past 4 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-> **Migration available - potential alternative:** another plugin exists which provides similar capabilities - [Operator Windrose](https://grafana.com/grafana/plugins/operato-windrose-panel/)
-
-### [Statusmap](https://grafana.com/grafana/plugins/flant-statusmap-panel/)
-
-Latest Version: 0.5.1 | Signature: Community | Last Updated: 2022
-
-{{% admonition type="warning" %}}
-Unknown whether migration to React will be undertaken - [migration issue](https://github.com/flant/grafana-statusmap/issues/302).
-{{% /admonition %}}
-
-### [Singlestat](https://grafana.com/grafana/plugins/grafana-singlestat-panel/)
-
-Latest Version: 2.0.0 | Signature: Grafana | Last Updated: 2022
-
-> **Migration available - plugin superseded:** Singlestat plugin was replaced by the [Stat]({{< relref "../../panels-visualizations/visualizations/stat/" >}})panel included in Grafana.
-
-### [Worldmap Panel](https://grafana.com/grafana/plugins/grafana-worldmap-panel/)
-
-Latest Version: 1.0.3 | Signature: Grafana | Last Updated: 2023
-
-> **Migration available - plugin superseded:** Worldmap plugin was replaced by [Geomap]({{< relref "../../panels-visualizations/visualizations/geomap/" >}}) panel included in Grafana.
-
-### [Topology Panel](https://grafana.com/grafana/plugins/gretamosa-topology-panel/)
-
-Latest Version: 1.0.1 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/gretamosa/gretamosa-topology-panel) in the past 4 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [SVG](https://grafana.com/grafana/plugins/marcuscalidus-svg-panel/)
-
-Latest Version: 0.3.4 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/MarcusCalidus/marcuscalidus-svg-panel) in the past year suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-> **Migration available - potential alternative:** Grafana provides the native [Canvas]({{< relref "../../panels-visualizations/visualizations/canvas/" >}}) panel.
-
-> **Migration available - potential alternative:** other plugins exist which provide similar capabilities - [HTML](https://grafana.com/grafana/plugins/gapit-htmlgraphics-panel/), [Dynamic Text](https://grafana.com/grafana/plugins/marcusolsson-dynamictext-panel/) and [ACE.SVG](https://grafana.com/grafana/plugins/aceiot-svg-panel/). Note that the ACE.SVG panel has compatibility issues with Grafana versions 10.0.0-10.1.0.
-
-### [Annunciator](https://grafana.com/grafana/plugins/michaeldmoore-annunciator-panel/)
-
-Latest Version: 1.1.0 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Plugin developer has indicated they will retire the plugin once Angular support is discontinued - [source](https://github.com/michaeldmoore/michaeldmoore-annunciator-panel/issues/24#issuecomment-1479372673).
-{{% /admonition %}}
-
-### [Multistat](https://grafana.com/grafana/plugins/michaeldmoore-multistat-panel/)
-
-Latest Version: 1.7.2 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Plugin developer has indicated they will retire the plugin once Angular support is discontinued - [source](https://github.com/michaeldmoore/michaeldmoore-multistat-panel/issues/71#issuecomment-1479372977).
-{{% /admonition %}}
-
-### [HeatmapEpoch](https://grafana.com/grafana/plugins/mtanda-heatmap-epoch-panel/)
-
-Latest Version: 0.1.8 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Plugin advises caution as not stable; [project repository](https://github.com/mtanda/grafana-heatmap-epoch-panel) has not been updated in 7 years.
-{{% /admonition %}}
-
-> **Migration available - potential alternative:** Other Heatmap panels exist including natively in Grafana - [learn more]({{< relref "../../panels-visualizations/visualizations/heatmap/" >}}).
-
-### [Histogram](https://grafana.com/grafana/plugins/mtanda-histogram-panel/)
-
-Latest Version: 0.1.7 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/mtanda/grafana-histogram-panel) in the past 7 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-> **Migration available - potential alternative:** other Histogram panels exist including natively in Grafana - [learn more]({{< relref "../../panels-visualizations/visualizations/histogram/" >}}).
-
-### [Separator](https://grafana.com/grafana/plugins/mxswat-separator-panel/)
-
-Latest Version: 1.0.1 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/mxswat/grafana-separator-panel) in the past 5 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-> **Migration available - potential alternative:** the [Text]({{< relref "../../panels-visualizations/visualizations/text/#html" >}}) panel can be used with no data to provide space within dashboards.
-
-### [Discrete](https://grafana.com/grafana/plugins/natel-discrete-panel/)
-
-Latest Version: 0.1.1 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/NatelEnergy/grafana-discrete-panel) in the past 3 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [Influx Admin](https://grafana.com/grafana/plugins/natel-influx-admin-panel/)
-
-Latest Version: 0.0.6 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/NatelEnergy/grafana-influx-admin) in the past 5 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [Plotly](https://grafana.com/grafana/plugins/natel-plotly-panel/)
-
-Latest Version: 0.0.7 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/NatelEnergy/grafana-plotly-panel) in the past 2 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-> **Migration available - potential alternative:** other plugins exist which provide similar capabilities - [nline-plotlyjs-panel](https://grafana.com/grafana/plugins/nline-plotlyjs-panel/) and [ae3e-plotly-panel](https://grafana.com/grafana/plugins/ae3e-plotly-panel/).
-
-### [Cal-HeatMap](https://grafana.com/grafana/plugins/neocat-cal-heatmap-panel/)
-
-Latest Version: 0.0.4 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Plugin advises caution as not stable; [project repository](https://github.com/NeoCat/grafana-cal-heatmap-panel) has not been updated in 7 years.
-{{% /admonition %}}
-
-> **Migration available - potential alternative:** other Heatmap panels exist including natively in Grafana - [learn more]({{< relref "../../panels-visualizations/visualizations/heatmap/" >}}).
-
-### [Annotation Panel](https://grafana.com/grafana/plugins/novalabs-annotations-panel/)
-
-Latest Version: 0.0.2 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/novalabs/grafana-annotations-panel) in the past 6 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [Carpet plot](https://grafana.com/grafana/plugins/petrslavotinek-carpetplot-panel/)
-
-Latest Version: 0.1.2 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/petrslavotinek/grafana-carpetplot) in the past 6 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [TrackMap](https://grafana.com/grafana/plugins/pr0ps-trackmap-panel/)
-
-Latest Version: 2.1.4 | Signature: Community | Last Updated: 2023
-
-{{% admonition type="warning" %}}
-Unknown whether migration to React will be undertaken - [migration issue](https://github.com/pR0Ps/grafana-trackmap-panel/issues/84).
-{{% /admonition %}}
-
-### [AJAX](https://grafana.com/grafana/plugins/ryantxu-ajax-panel/)
-
-Latest Version: 0.1.0 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/ryantxu/ajax-panel) in the past 2 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [Annotation List](https://grafana.com/grafana/plugins/ryantxu-annolist-panel/)
-
-Latest Version: 0.0.2 | Signature: Community | Last Updated: 2021
-
-> **Migration available - plugin superseded:** [Project repository](https://github.com/ryantxu/annotations-panel) for the plugin was archived on July 13th, 2019 in favour of native [annotations]({{< relref "../../panels-visualizations/visualizations/annotations/" >}}).
-
-### [3D Globe Panel](https://grafana.com/grafana/plugins/satellogic-3d-globe-panel/)
-
-Latest Version: 0.1.1 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/satellogic/grafana-3d-globe-panel) in the past 5 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [Heatmap](https://grafana.com/grafana/plugins/savantly-heatmap-panel/)
-
-Latest Version: 0.2.1 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/savantly-net/grafana-heatmap) in the past 6 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-> **Migration available - potential alternative:** other Heatmap panels exist including natively in Grafana - [learn more]({{< relref "../../panels-visualizations/visualizations/heatmap/" >}}).
-
-### [SCADAvis Synoptic Panel](https://grafana.com/grafana/plugins/scadavis-synoptic-panel/)
-
-Latest Version: 1.0.5 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/riclolsen/scadavis-synoptic-panel) in the past 3 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [TrafficLight](https://grafana.com/grafana/plugins/smartmakers-trafficlight-panel/)
-
-Latest Version: 1.0.1 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/smartmakers/grafana-trafficlight) in the past 5 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [Radar Graph](https://grafana.com/grafana/plugins/snuids-radar-panel/)
-
-Latest Version: 1.5.1 | Signature: Community | Last Updated: 2022
-
-{{% admonition type="warning" %}}
-Unknown whether migration to React will be undertaken - [migration issue](https://github.com/snuids/grafana-radar-panel/issues/29).
-{{% /admonition %}}
-
-### [Traffic Lights](https://grafana.com/grafana/plugins/snuids-trafficlights-panel/)
-
-Latest Version: 1.6.0 | Signature: Community | Last Updated: 2023
-
-{{% admonition type="warning" %}}
-Unknown whether migration to React will be undertaken - [migration issue](https://github.com/snuids/trafficlights-panel/issues/44).
-{{% /admonition %}}
-
-### [Status Panel](https://grafana.com/grafana/plugins/vonage-status-panel/)
-
-Latest Version: 1.0.11 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/Vonage/Grafana_Status_panel) in the past 3 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [Boom Table](https://grafana.com/grafana/plugins/yesoreyeram-boomtable-panel/)
-
-Latest Version: 1.4.1 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Lack of recent activity in the [project repository](https://github.com/yesoreyeram/yesoreyeram-boomtable-panel) in the past 3 years suggests project _may_ not be actively maintained.
-{{% /admonition %}}
-
-### [Parity Report](https://grafana.com/grafana/plugins/zuburqan-parity-report-panel/)
-
-Latest Version: 1.2.2 | Signature: Community | Last Updated: 2021
-
-{{% admonition type="warning" %}}
-Unknown whether migration to React will be undertaken - [migration issue](https://github.com/zuburqan/grafana-parity-report/issues/17).
-{{% /admonition %}}
+If you want to add any specific migration guidance for your plugin here or update our assessment, please open a PR by clicking **Suggest an edit** at the bottom of this page.
+{{% /admonition %}}
+
+## Private plugins
+
+Grafana OSS and Grafana Enterprise support the creation of private plugins for use on local instances. These plugins may have a dependency on AngularJS and require an update.
+
+The `detect-angular-dashboards` tool listed above will include private plugins in its report **if the Grafana version is v10.1.0 or later**.
+
+Additionally, warning icons and messages will be displayed when browsing the catalog via **Administration** > **Plugins and Data** > **Plugins** in your local instance.
+
+## Automatic migration of plugins
+
+Certain legacy Grafana panel plugins automatically update to their React-based replacements when Angular support is disabled. This migration is usually available within the panel options, as shown in the screenshot below for World Map. Automatic migration can be triggered by setting the feature toggle `autoMigrateOldPanels` to `true`.
+
+Automatic migration is supported for the plugins shown in the following table. Each of the target plugins are included in Grafana as Core plugins which don't require installation.
+
+| Plugin      | Migration target |
+| ----------- | ---------------- |
+| Graph (old) | Time Series      |
+| Singlestat  | Stat             |
+| Stat (old)  | Stat             |
+| Table (old) | Table            |
+| Worldmap    | Geomap           |
+
+A dashboard must still be saved with the new plugin ID to persist the change.
+
+# AngularJS-based plugins
+
+This table lists plugins which we have detected as having a dependency on AngularJS. For alternatives, consider included [Visualizations]({{< relref "../../panels-visualizations/visualizations" >}}) and [Data sources]({{< relref "../../datasources" >}}), as well as external plugins from the [catalog](/grafana/plugins).
+
+| Plugin ID                                       | Name                                | Action                                                                                                                                                                                                                                            |
+| ----------------------------------------------- | ----------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| grafana-worldmap-panel                          | Worldmap Panel                      | Migrate - [Geomap]({{< relref "../../panels-visualizations/visualizations/geomap" >}}) (core) replaced Worldmap - Note this should migrate when Angular is disabled.                                                                              |
+| natel-discrete-panel                            | Discrete                            | Migrate - Browse included visualizations and plugins catalog for potential alternatives.                                                                                                                                                          |
+| vonage-status-panel                             | Status Panel                        | Migrate - Consider [Stat]({{< relref "../../panels-visualizations/visualizations/stat" >}}) (core) or [Polystat](https://grafana.com/grafana/plugins/grafana-polystat-panel/) as potential alternatives.                                          |
+| grafana-simple-json-datasource                  | SimpleJson                          | Migrate - Consider [Infinity](https://grafana.com/grafana/plugins/yesoreyeram-infinity-datasource/) as a potential alternative.                                                                                                                   |
+| natel-plotly-panel                              | Plotly                              | Migrate - Consider alternative [nline-plotlyjs-panel](https://grafana.com/grafana/plugins/nline-plotlyjs-panel/) plugin.                                                                                                                          |
+| agenty-flowcharting-panel                       | FlowCharting                        | Migrate - Consider [Canvas]({{< relref "../../panels-visualizations/visualizations/canvas" >}}) (core) or [Diagram](https://grafana.com/grafana/plugins/jdbranham-diagram-panel/) as potential alternatives.                                      |
+| camptocamp-prometheus-alertmanager-datasource   | Prometheus AlertManager             | Update - Note the minimum version for React is 2.0.0.                                                                                                                                                                                             |
+| briangann-gauge-panel                           | D3 Gauge                            | Update - Note the minimum version for React is 2.0.0. We recommend the latest.                                                                                                                                                                    |
+| yesoreyeram-boomtable-panel                     | Boom Table                          | Migrate - Consider [Table]({{< relref "../../panels-visualizations/visualizations/table" >}}) (core) and [transformations]({{< relref "../../panels-visualizations/query-transform-data/transform-data/" >}}) as appropriate.                     |
+| briangann-datatable-panel                       | Datatable Panel                     | Wait - New version with React migration is planned.                                                                                                                                                                                               |
+| flant-statusmap-panel                           | Statusmap                           | Migrate - Browse included visualizations and plugins catalog for potential alternatives.                                                                                                                                                          |
+| michaeldmoore-multistat-panel                   | Multistat                           | Migrate - Browse included visualizations and plugins catalog for potential alternatives.                                                                                                                                                          |
+| pr0ps-trackmap-panel                            | TrackMap                            | Migrate - Browse included visualizations and plugins catalog for potential alternatives.                                                                                                                                                          |
+| snuids-trafficlights-panel                      | Traffic Lights                      | Migrate - Consider [Traffic Light](https://grafana.com/grafana/plugins/heywesty-trafficlight-panel/) as a potential alternative.                                                                                                                  |
+| vertamedia-clickhouse-datasource                | Altinity plugin for ClickHouse      | Update - Note the minimum version for React is 3.0.0.                                                                                                                                                                                             |
+| petrslavotinek-carpetplot-panel                 | Carpet plot                         | Migrate - Browse included visualizations and plugins catalog for potential alternatives.                                                                                                                                                          |
+| ryantxu-ajax-panel                              | AJAX                                | Migrate - Browse included visualizations and plugins catalog for potential alternatives.                                                                                                                                                          |
+| michaeldmoore-annunciator-panel                 | Annunciator                         | Migrate - Consider [Stat]({{< relref "../../panels-visualizations/visualizations/stat" >}}) (core).                                                                                                                                               |
+| marcuscalidus-svg-panel                         | SVG                                 | Migrate - Consider alternatives such as [Canvas]({{< relref "../../panels-visualizations/visualizations/canvas" >}}) (core), [Colored SVG](https://grafana.com/grafana/plugins/snuids-svg-panel/), or others.                                     |
+| neocat-cal-heatmap-panel                        | Cal-HeatMap                         | Migrate - Consider [Heatmap]({{< relref "../../panels-visualizations/visualizations/heatmap" >}}) (core) visualization.                                                                                                                           |
+| blackmirror1-singlestat-math-panel              | Singlestat Math                     | Migrate - Browse included visualizations and plugins catalog for potential alternatives.                                                                                                                                                          |
+| scadavis-synoptic-panel                         | SCADAvis Synoptic Panel             | Update - Note the minimum version for React is 2.0.                                                                                                                                                                                               |
+| farski-blendstat-panel                          | Blendstat                           | Migrate - Consider [Stat]({{< relref "../../panels-visualizations/visualizations/stat" >}}) (core) and [transformations]({{< relref "../../panels-visualizations/query-transform-data/transform-data/" >}}) as appropriate.                       |
+| savantly-heatmap-panel                          | Heatmap                             | Migrate - Consider [Heatmap]({{< relref "../../panels-visualizations/visualizations/heatmap" >}}) (core) visualization.                                                                                                                           |
+| mtanda-histogram-panel                          | Histogram                           | Migrate - Consider included [Histogram]({{< relref "../../panels-visualizations/visualizations/histogram" >}}) visualization.                                                                                                                     |
+| snuids-radar-panel                              | Radar Graph                         | Migrate - Browse included visualizations and plugins catalog for potential alternatives.                                                                                                                                                          |
+| fatcloud-windrose-panel                         | WindRose                            | Migrate - Consider alternative [Operator Windrose](https://grafana.com/grafana/plugins/operato-windrose-panel/) plugin.                                                                                                                           |
+| bessler-pictureit-panel                         | PictureIt                           | Migrate - Consider alternative [ePict](https://grafana.com/grafana/plugins/larona-epict-panel/) plugin.                                                                                                                                           |
+| digrich-bubblechart-panel                       | Bubble Chart                        | Update - Note the minimum version for React is 2.0.1. We recommend the latest.                                                                                                                                                                    |
+| corpglory-progresslist-panel                    | Progress List                       | Migrate - Browse included visualizations and plugins catalog for potential alternatives.                                                                                                                                                          |
+| aidanmountford-html-panel                       | HTML                                | Migrate - Consider alternatives such as [Text]({{< relref "../../panels-visualizations/visualizations/text" >}}) (core), [HTML](https://grafana.com/grafana/plugins/gapit-htmlgraphics-panel), or others.                                         |
+| fifemon-graphql-datasource                      | GraphQL Data Source                 | Wait - Removal of AngularJS is planned. Consider [Infinity](https://grafana.com/grafana/plugins/yesoreyeram-infinity-datasource/) plugin as alternative.                                                                                          |
+| goshposh-metaqueries-datasource                 | MetaQueries                         | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| mxswat-separator-panel                          | Separator                           | Migrate - Consider alternative [Text]({{< relref "../../panels-visualizations/visualizations/text" >}}) panel (core) which can be empty and used as a separator.                                                                                  |
+| natel-influx-admin-panel                        | Influx Admin                        | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| doitintl-bigquery-datasource                    | Google BigQuery                     | Migrate - Consider [Grafana Big Query](https://grafana.com/grafana/plugins/grafana-bigquery-datasource/) plugin.                                                                                                                                  |
+| satellogic-3d-globe-panel                       | 3D Globe Panel                      | Migrate - Browse included visualizations and plugins catalog for potential alternatives.                                                                                                                                                          |
+| foursquare-clouderamanager-datasource           | Cloudera Manager                    | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| grafana-splunk-datasource                       | Splunk                              | Update - Note the minimum version for React is 4.1.0. We recommend the latest.                                                                                                                                                                    |
+| grafana-singlestat-panel                        | Singlestat                          | Migrate - Consider [Stat]({{< relref "../../panels-visualizations/visualizations/stat" >}}) panel (core).                                                                                                                                         |
+| blackmirror1-statusbygroup-panel                | Status By Group Panel               | Migrate - Browse included visualizations and plugins catalog for potential alternatives.                                                                                                                                                          |
+| novalabs-annotations-panel                      | Annotation Panel                    | Migrate - Browse included visualizations and plugins catalog for potential alternatives.                                                                                                                                                          |
+| jasonlashua-prtg-datasource                     | PRTG                                | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| ryantxu-annolist-panel                          | Annotation List                     | Migrate - Consider [annotations list]({{< relref "../../panels-visualizations/visualizations/annotations" >}}) (core).                                                                                                                            |
+| cloudflare-app                                  | Cloudflare Grafana App              | Migrate - Consider using the [Cloudflare Dashboard](https://dash.cloudflare.com/?to=/:account/:zone/analytics/dns) or [DNS Analytics API](https://developers.cloudflare.com/api/operations/dns-analytics-table).                                  |
+| smartmakers-trafficlight-panel                  | TrafficLight                        | Migrate - Consider [Traffic Light](https://grafana.com/grafana/plugins/heywesty-trafficlight-panel/) as a potential alternative.                                                                                                                  |
+| zuburqan-parity-report-panel                    | Parity Report                       | Migrate - Browse included visualizations and plugins catalog for potential alternatives.                                                                                                                                                          |
+| citilogics-geoloop-panel                        | GeoLoop                             | Migrate - Browse included visualizations and plugins catalog for potential alternatives.                                                                                                                                                          |
+| xginn8-pagerduty-datasource                     | Pagerduty                           | Wait - We are developing an Enterprise plugin for Pagerduty targeted for availability in Q1 2024. Note that all roadmap items are subject to change.                                                                                              |
+| gretamosa-topology-panel                        | Topology Panel                      | Migrate - Browse included visualizations and plugins catalog for potential alternatives.                                                                                                                                                          |
+| fzakaria-simple-annotations-datasource          | Simple Annotations                  | Migrate - Check for annotations support within your data sources to remove dependency on this plugin.                                                                                                                                             |
+| oci-metrics-datasource                          | Oracle Cloud Infrastructure Metrics | Update - Note the minimum version for React is 5.0.0.                                                                                                                                                                                             |
+| abhisant-druid-datasource                       | Druid                               | Migrate - Migrate to replacement [Druid](https://grafana.com/grafana/plugins/grafadruid-druid-datasource/) plugin.                                                                                                                                |
+| devopsprodigy-kubegraf-app                      | DevOpsProdigy KubeGraf              | Migrate - Consider [Grafana Kubernetes Monitoring](https://grafana.com/solutions/kubernetes/) (Grafana Cloud only).                                                                                                                               |
+| mtanda-heatmap-epoch-panel                      | HeatmapEpoch                        | Migrate - Consider [Heatmap]({{< relref "../../panels-visualizations/visualizations/heatmap" >}}) (core) visualization.                                                                                                                           |
+| alexandra-trackmap-panel                        | Track Map                           | Migrate - Browse included visualizations and plugins catalog for potential alternatives.                                                                                                                                                          |
+| gnocchixyz-gnocchi-datasource                   | Gnocchi                             | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| tencentcloud-monitor-app                        | Tencent Cloud Monitor               | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| andig-darksky-datasource                        | DarkSky                             | Remove - Note that support for the DarkSky API was ended by Apple in March 2023.                                                                                                                                                                  |
+| mtanda-google-calendar-datasource               | GoogleCalendar                      | Wait - Migration to React is planned.                                                                                                                                                                                                             |
+| ntop-ntopng-datasource                          | ntopng                              | Migrate - Consider [InfluxDB]({{< relref "../../datasources/influxdb/" >}}) (core), with additional guidance available [here](https://www.ntop.org/guides/ntopng/basic_concepts/timeseries.html#influxdb-driver).                                 |
+| ayoungprogrammer-finance-datasource             | Finance                             | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| grafana-kairosdb-datasource                     | KairosDB                            | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| fastweb-openfalcon-datasource                   | Open-Falcon                         | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| praj-ams-datasource                             | Ambari Metrics                      | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| monasca-datasource                              | Monasca                             | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| grafana-strava-datasource                       | Strava                              | Update - Note the minimum version for React is 1.6.0. We recommend the latest.                                                                                                                                                                    |
+| gridprotectionalliance-osisoftpi-datasource     | OSIsoft-PI                          | Update - Note the minimum version for React is 4.0.0. We recommend the latest.                                                                                                                                                                    |
+| monitoringartist-monitoringart-datasource       | Monitoring Art                      | Migrate - Browse included visualizations and plugins catalog for potential alternatives.                                                                                                                                                          |
+| hawkular-datasource                             | Hawkular                            | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| ovh-warp10-datasource                           | Warp 10                             | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| natel-usgs-datasource                           | USGS Water Services                 | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| radensolutions-netxms-datasource                | NetXMS                              | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| ibm-apm-datasource                              | IBM APM                             | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| cognitedata-datasource                          | Cognite Data Fusion                 | Update - Note the minimum version for React is 4.0.0. We recommend the latest.                                                                                                                                                                    |
+| linksmart-sensorthings-datasource               | LinkSmart SensorThings              | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| pue-solr-datasource                             | Solr                                | Migrate - Consider this [guidance](https://solr.apache.org/guide/solr/latest/deployment-guide/monitoring-with-prometheus-and-grafana.html) on using solr-exporter for prometheus.                                                                 |
+| paytm-kapacitor-datasource                      | KapacitorSimpleJson                 | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| oci-logs-datasource                             | Oracle Cloud Infrastructure Logs    | Update - Note the minimum version for React is 4.0.0.                                                                                                                                                                                             |
+| gridprotectionalliance-openhistorian-datasource | openHistorian                       | Wait - Note that new version with React migration is planned.                                                                                                                                                                                     |
+| devicehive-devicehive-datasource                | DeviceHive                          | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| rackerlabs-blueflood-datasource                 | Blueflood                           | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| udoprog-heroic-datasource                       | Heroic                              | Migrate - Note that Heroic DB has been discontinued.                                                                                                                                                                                              |
+| akumuli-datasource                              | Akumuli                             | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| bmchelix-ade-datasource                         | BMC Helix                           | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| sidewinder-datasource                           | Sidewinder                          | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| linksmart-hds-datasource                        | LinkSmart HDS Datasource            | Migrate - browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| skydive-datasource                              | Skydive                             | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| quasardb-datasource                             | QuasarDB                            | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| spotify-heroic-datasource                       | Heroic                              | Migrate - Note that Heroic DB has been discontinued.                                                                                                                                                                                              |
+| grafana-es-open-distro-datasource               | Open Distro for Elasticsearch       | Migrate - Note that [OpenSearch](https://grafana.com/grafana/plugins/grafana-opensearch-datasource/) replaced Open Distro for Elasticseach.                                                                                                       |
+| humio-datasource                                | Humio                               | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| yeya24-chaosmesh-datasource                     | Chaos Mesh                          | Migrate - Note that plugin was replaced by [chaosmeshorg-datasource](https://grafana.com/grafana/plugins/chaosmeshorg-datasource/).                                                                                                               |
+| kentik-connect-app                              | Kentik Connect Pro                  | Update - Note the minimum version for React is 1.7.0.                                                                                                                                                                                             |
+| chaosmeshorg-datasource                         | Chaos Mesh                          | Update - Note the minimum version for React is 3.0.0.                                                                                                                                                                                             |
+| aquaqanalytics-kdbadaptor-datasource            | kdb+                                | Migrate - Note that [kdb+ backend](https://grafana.com/grafana/plugins/aquaqanalytics-kdbbackend-datasource) replaced kdb.+.                                                                                                                      |
+| alexanderzobnin-zabbix-app                      | Zabbix                              | Update - Note the minimum version for React is 4.3.0. We recommend the latest. Recently brought under Grafana signature.                                                                                                                          |
+| bosun-app                                       | Bosun                               | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| belugacdn-app                                   | BelugaCDN                           | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| grafana-azure-data-explorer-datasource          | Azure Data Explorer Datasource      | Update - The minimum supported version is 3.5.1. We recommend the latest.                                                                                                                                                                         |
+| ddurieux-glpi-app                               | glpi                                | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| fetzerch-sunandmoon-datasource                  | Sun and Moon                        | Update - Note the minimum version for React is 0.3.0.                                                                                                                                                                                             |
+| grafana-clock-panel                             | Clock                               | Update - Note the minimum version for React is 1.1.0. We recommend the latest.                                                                                                                                                                    |
+| grafana-github-datasource                       | GitHub                              | Update - Note the minimum version for React is 1.3.3. We recommend the latest.                                                                                                                                                                    |
+| grafana-datadog-datasource                      | Datadog                             | Update - Note the minimum version for React is 3.0.0. We recommend the latest.                                                                                                                                                                    |
+| grafana-gitlab-datasource                       | Gitlab                              | Update - Note the minimum version for React is 1.1.0. We recommend the latest.                                                                                                                                                                    |
+| grafana-iot-twinmaker-app                       | AWS IoT TwinMaker App               | Update - Note the minimum version for React is 1.6.3. We recommend the latest.                                                                                                                                                                    |
+| grafana-newrelic-datasource                     | New Relic                           | Update - Note the minimum version for React is 3.0.0. We recommend the latest.                                                                                                                                                                    |
+| grafana-opensearch-datasource                   | Opensearch                          | Update - Note the minimum version for React is 2.0.0. We recommend the latest.                                                                                                                                                                    |
+| grafana-oracle-datasource                       | Oracle                              | Update - Note the minimum version for React is 2.0.6. We recommend the latest.                                                                                                                                                                    |
+| grafana-piechart-panel                          | Pie Chart                           | Migrate - Note that [Pie Chart]({{< relref "../../panels-visualizations/visualizations/pie-chart" >}}) (core) replaced Pie Chart.                                                                                                                 |
+| grafana-polystat-panel                          | Polystat                            | Update - Note the minimum version for React is 2.0.0. We recommend the latest.                                                                                                                                                                    |
+| grafana-servicenow-datasource                   | ServiceNow                          | Update - Note the minimum version for React is 2.0.2. We recommend the latest.                                                                                                                                                                    |
+| grafana-synthetic-monitoring-app                | Synthetic Monitoring                | Update - Note the minimum version for React is 0.7.3. We recommend the latest.                                                                                                                                                                    |
+| grafana-wavefront-datasource                    | Wavefront                           | Update - Note the minimum version for React is 2.0.0. We recommend the latest.                                                                                                                                                                    |
+| hadesarchitect-cassandra-datasource             | Apache Cassandra                    | Update - Note the minimum version for React is 2.1.1. We recommend the latest.                                                                                                                                                                    |
+| instana-datasource                              | Instana                             | Update - Note the minimum version for React is 3.0.0. We recommend the latest.                                                                                                                                                                    |
+| jdbranham-diagram-panel                         | Diagram                             | Update - Note the minimum version for React is 1.7.1. We recommend the latest.                                                                                                                                                                    |
+| larona-epict-panel                              | ePict                               | Update - Note the minimum version for React is 2.0.0. We recommend the latest.                                                                                                                                                                    |
+| moogsoft-aiops-app                              | Moogsoft AIOps                      | Update - Note the minimum version for React is 9.0.0.                                                                                                                                                                                             |
+| opennms-helm-app                                | OpenNMS Helm                        | Migrate - Note that [OpenNMS Plugin for Grafana](https://grafana.com/grafana/plugins/opennms-opennms-app/) replaced OpenNMS Helm.                                                                                                                 |
+| percona-percona-app                             | Percona                             | Migrate - Consider use of [Percona dashboards](https://github.com/percona/grafana-dashboards/).                                                                                                                                                   |
+| novatec-sdg-panel                               | Service Dependency Graph            | Update - Note the minimum version for React is 4.0.3.                                                                                                                                                                                             |
+| pierosavi-imageit-panel                         | ImageIt                             | Migrate - Consider [ePict](https://grafana.com/grafana/plugins/larona-epict-panel/) or browse plugins catalog for potential alternatives.                                                                                                         |
+| redis-app                                       | Redis Application                   | Update - Note the minimum version for React is 1.2.0. We recommend the latest.                                                                                                                                                                    |
+| sbueringer-consul-datasource                    | Consul                              | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| simpod-json-datasource                          | JSON                                | Update - Note the minimum version for React is 0.3.0. We recommend the latest.                                                                                                                                                                    |
+| singlestat                                      | Singlestat                          | Migrate - Note that [Stat]({{< relref "../../panels-visualizations/visualizations/stat" >}}) (core) replaced Singlestat.                                                                                                                          |
+| sni-pnp-datasource                              | PNP                                 | Update - Note the minimum version for React is 2.0.0. We recommend the latest.                                                                                                                                                                    |
+| sni-thruk-datasource                            | Thruk                               | Update - Note the minimum version for React is 2.0.0. We recommend the latest.                                                                                                                                                                    |
+| stagemonitor-elasticsearch-app                  | stagemonitor Elasticsearch          | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| tdengine-datasource                             | TDengine Datasource                 | Update - Note the minimum version for React is 3.3.0. We recommend the latest.                                                                                                                                                                    |
+| vertica-grafana-datasource                      | Vertica                             | Update - Note the minimum version for React is 2.0.0. We recommend the latest.                                                                                                                                                                    |
+| voxter-app                                      | Voxter VoIP Platform Metrics        | Migrate - Browse included data sources and plugins catalog for potential alternatives.                                                                                                                                                            |
+| graph                                           | Graph (old)                         | Migrate - Note that this is replaced by [Time Series]({{< relref "../../panels-visualizations/visualizations/time-series" >}}) (core) - This plugin should migrate when Angular is disabled. Also consider Bar Chart or Histogram if appropriate. |
+| table-old                                       | Table (old)                         | Migrate - Note that this is replaced by [Table]({{< relref "../../panels-visualizations/visualizations/table" >}}) (core) - This plugin should migrate when AngularJS is disabled.                                                                |
+| shorelinesoftware-shoreline-datasource          | Shoreline Data Source               | Update - Note the minimum version for React is 1.2.1. We recommend the latest.                                                                                                                                                                    |
diff --git a/docs/sources/developers/http_api/_index.md b/docs/sources/developers/http_api/_index.md
index 81d8b851f43c4..806ab1f865051 100644
--- a/docs/sources/developers/http_api/_index.md
+++ b/docs/sources/developers/http_api/_index.md
@@ -27,7 +27,54 @@ Since version 8.4, HTTP API details are [specified](https://editor.swagger.io/?u
 
 Starting from version 9.1, there is also a [OpenAPI v3 specification](https://editor.swagger.io/?url=https://raw.githubusercontent.com/grafana/grafana/main/public/openapi3.json) (generated by the v2 one).
 
-Users can browser and try out both via the Swagger UI editor (served by the grafana server) by navigating to `/swagger-ui` and `/openapi3` respectively.
+Users can browser and try out both via the Swagger UI editor (served by the grafana server) by navigating to `/swagger-ui`.
+
+## Authenticating API requests
+
+You can authenticate requests using basic auth, a service account token or a session cookie (acquired using regular login or OAuth).
+
+### Basic Auth
+
+If basic auth is enabled (it is enabled by default), then you can authenticate your HTTP request via
+standard basic auth. Basic auth will also authenticate LDAP users.
+
+curl example:
+
+```bash
+curl http://admin:admin@localhost:3000/api/org
+{"id":1,"name":"Main Org."}
+```
+
+### Service Account Token
+
+To create a service account token, click on **Administration** in the left-side menu, click **Users and access**, then **Service Accounts**.
+For more information on how to use service account tokens, refer to the [Service Accounts]({{< relref "../../administration/service-accounts/" >}}) documentation.
+
+You use the token in all requests in the `Authorization` header, like this:
+
+**Example**:
+
+```http
+GET http://your.grafana.com/api/dashboards/db/mydash HTTP/1.1
+Accept: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+The `Authorization` header value should be `Bearer <your service account token>`.
+
+## X-Grafana-Org-Id Header
+
+**X-Grafana-Org-Id** is an optional property that specifies the organization to which the action is applied. If it is not set, the created key belongs to the current context org. Use this header in all requests except those regarding admin.
+
+**Example Request**:
+
+```http
+GET /api/org/ HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+X-Grafana-Org-Id: 2
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
 
 ## HTTP APIs
 
@@ -35,7 +82,6 @@ Users can browser and try out both via the Swagger UI editor (served by the graf
 - [Alerting API (unstable)](https://editor.swagger.io/?url=https://raw.githubusercontent.com/grafana/grafana/main/pkg/services/ngalert/api/tooling/post.json)
 - [Alerting Provisioning API]({{< relref "alerting_provisioning/" >}})
 - [Annotations API]({{< relref "annotations/" >}})
-- [Authentication API]({{< relref "auth/" >}})
 - [Correlations API]({{< relref "correlations/" >}})
 - [Dashboard API]({{< relref "dashboard/" >}})
 - [Dashboard Permissions API]({{< relref "dashboard_permissions/" >}})
@@ -59,6 +105,7 @@ Users can browser and try out both via the Swagger UI editor (served by the graf
 
 - [Alerting Notification Channels API]({{< relref "alerting_notification_channels/" >}})
 - [Alerting API]({{< relref "alerting/" >}})
+- [Authentication API]({{< relref "auth/" >}})
 
 ## Grafana Enterprise HTTP APIs
 
diff --git a/docs/sources/developers/http_api/access_control.md b/docs/sources/developers/http_api/access_control.md
index 695f8d129e664..72c5aec8a7674 100644
--- a/docs/sources/developers/http_api/access_control.md
+++ b/docs/sources/developers/http_api/access_control.md
@@ -383,12 +383,12 @@ Content-Type: application/json
 
 #### Status codes
 
-| Code | Description                                                                           |
-| ---- | ------------------------------------------------------------------------------------- |
-| 200  | Role is updated.                                                                      |
-| 400  | Bad request (invalid json, missing content-type, missing or invalid fields, etc.).    |
-| 403  | Access denied (one of the specified permissions is not assigned to the the requester) |
-| 500  | Unexpected error. Refer to body and/or server logs for more details.                  |
+| Code | Description                                                                        |
+| ---- | ---------------------------------------------------------------------------------- |
+| 200  | Role is updated.                                                                   |
+| 400  | Bad request (invalid json, missing content-type, missing or invalid fields, etc.). |
+| 403  | Access denied (one of the specified permissions is not assigned to the requester)  |
+| 500  | Unexpected error. Refer to body and/or server logs for more details.               |
 
 ### Update a role
 
@@ -498,13 +498,13 @@ For more information, refer to [Create role validation errors]({{< ref "#create-
 
 #### Status codes
 
-| Code | Description                                                                           |
-| ---- | ------------------------------------------------------------------------------------- |
-| 200  | Role is updated.                                                                      |
-| 400  | Bad request (invalid json, missing content-type, missing or invalid fields, etc.).    |
-| 403  | Access denied (one of the specified permissions is not assigned to the the requester) |
-| 404  | Role was not found to update.                                                         |
-| 500  | Unexpected error. Refer to body and/or server logs for more details.                  |
+| Code | Description                                                                        |
+| ---- | ---------------------------------------------------------------------------------- |
+| 200  | Role is updated.                                                                   |
+| 400  | Bad request (invalid json, missing content-type, missing or invalid fields, etc.). |
+| 403  | Access denied (one of the specified permissions is not assigned to the requester)  |
+| 404  | Role was not found to update.                                                      |
+| 500  | Unexpected error. Refer to body and/or server logs for more details.               |
 
 ### Delete a custom role
 
@@ -532,7 +532,7 @@ Accept: application/json
 
 | Param  | Type    | Required | Description                                                                                                                                                                                                                                                                             |
 | ------ | ------- | -------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| force  | boolean | No       | When set to `true`, the role will be deleted with all it's assignments.                                                                                                                                                                                                                 |
+| force  | boolean | No       | When set to `true`, the role will be deleted with all its assignments.                                                                                                                                                                                                                  |
 | global | boolean | No       | A flag indicating if the role is global or not. If set to false, the default org ID of the authenticated user will be used from the request. Refer to the [About RBAC]({{< relref "/docs/grafana/latest/administration/roles-and-permissions/access-control" >}}) for more information. |
 
 #### Example response
diff --git a/docs/sources/developers/http_api/admin.md b/docs/sources/developers/http_api/admin.md
index b7a40e1d7418c..b8d88c4e90d91 100644
--- a/docs/sources/developers/http_api/admin.md
+++ b/docs/sources/developers/http_api/admin.md
@@ -152,6 +152,7 @@ Content-Type: application/json
   "server":{
     "cert_file":"",
     "cert_key":"",
+    "certs_watch_interval": "0s",
     "domain":"mygraf.com",
     "enable_gzip":"false",
     "enforce_domain":"false",
@@ -473,45 +474,6 @@ Content-Type: application/json
 {"message": "User deleted"}
 ```
 
-## Pause all alerts
-
-`POST /api/admin/pause-all-alerts`
-
-{{% admonition type="note" %}}
-This API is relevant for the [legacy dashboard alerts](https://grafana.com/docs/grafana/v8.5/alerting/old-alerting/) only. For default alerting, use silences to stop alerts from being delivered.
-{{% /admonition %}}
-
-Only works with Basic Authentication (username and password). See [introduction](http://docs.grafana.org/http_api/admin/#admin-api) for an explanation.
-
-**Example Request**:
-
-```http
-POST /api/admin/pause-all-alerts HTTP/1.1
-Accept: application/json
-Content-Type: application/json
-
-{
-  "paused": true
-}
-```
-
-JSON Body schema:
-
-- **paused** – If true then all alerts are to be paused, false unpauses all alerts.
-
-**Example Response**:
-
-```http
-HTTP/1.1 200
-Content-Type: application/json
-
-{
-  "state":   "Paused",
-  "message": "alert paused",
-  "alertsAffected": 1
-}
-```
-
 ## Auth tokens for User
 
 `GET /api/admin/users/:id/auth-tokens`
@@ -654,8 +616,6 @@ Content-Type: application/json
 
 `POST /api/admin/provisioning/plugins/reload`
 
-`POST /api/admin/provisioning/notifications/reload`
-
 `POST /api/admin/provisioning/access-control/reload`
 
 `POST /api/admin/provisioning/alerting/reload`
@@ -676,7 +636,6 @@ See note in the [introduction]({{< ref "#admin-api" >}}) for an explanation.
 | provisioning:reload | provisioners:dashboards    | dashboards       |
 | provisioning:reload | provisioners:datasources   | datasources      |
 | provisioning:reload | provisioners:plugins       | plugins          |
-| provisioning:reload | provisioners:notifications | notifications    |
 | provisioning:reload | provisioners:alerting      | alerting         |
 
 **Example Request**:
diff --git a/docs/sources/developers/http_api/alerting.md b/docs/sources/developers/http_api/alerting.md
deleted file mode 100644
index ceece602a88b7..0000000000000
--- a/docs/sources/developers/http_api/alerting.md
+++ /dev/null
@@ -1,184 +0,0 @@
----
-aliases:
-  - ../../http_api/alerting/
-canonical: /docs/grafana/latest/developers/http_api/alerting/
-description: Grafana Alerts HTTP API
-keywords:
-  - grafana
-  - http
-  - documentation
-  - api
-  - alerting
-  - alerts
-labels:
-  products:
-    - enterprise
-    - oss
-title: Legacy Alerting API
----
-
-# Legacy Alerting API
-
-{{% admonition type="note" %}}
-Starting with v9.0, the Legacy Alerting HTTP API is deprecated. It will be removed in a future release.
-{{% /admonition %}}
-
-This topic is relevant for the [legacy dashboard alerts](/docs/grafana/v8.5/alerting/old-alerting/) only.
-
-If you are using Grafana Alerting, refer to [Alerting provisioning API]({{< relref "./alerting_provisioning" >}})
-
-You can find Grafana Alerting API specification details [here](https://editor.swagger.io/?url=https://raw.githubusercontent.com/grafana/grafana/main/pkg/services/ngalert/api/tooling/post.json). Also, refer to [Grafana Alerting alerts documentation][] for details on how to create and manage new alerts.
-
-You can use the Alerting API to get information about legacy dashboard alerts and their states but this API cannot be used to modify the alert.
-To create new alerts or modify them you need to update the dashboard JSON that contains the alerts.
-
-## Get alerts
-
-`GET /api/alerts/`
-
-**Example Request**:
-
-```http
-GET /api/alerts HTTP/1.1
-Accept: application/json
-Content-Type: application/json
-Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
-```
-
-Querystring Parameters:
-
-These parameters are used as querystring parameters. For example:
-
-`/api/alerts?dashboardId=1`
-
-- **dashboardId** – Limit response to alerts in specified dashboard(s). You can specify multiple dashboards, e.g. dashboardId=23&dashboardId=35.
-- **panelId** – Limit response to alert for a specified panel on a dashboard.
-- **query** - Limit response to alerts having a name like this value.
-- **state** - Return alerts with one or more of the following alert states: `ALL`,`no_data`, `paused`, `alerting`, `ok`, `pending`. To specify multiple states use the following format: `?state=paused&state=alerting`
-- **limit** - Limit response to _X_ number of alerts.
-- **folderId** – Limit response to alerts of dashboards in specified folder(s). You can specify multiple folders, e.g. folderId=23&folderId=35.
-- **dashboardQuery** - Limit response to alerts having a dashboard name like this value.
-- **dashboardTag** - Limit response to alerts of dashboards with specified tags. To do an "AND" filtering with multiple tags, specify the tags parameter multiple times e.g. dashboardTag=tag1&dashboardTag=tag2.
-
-**Example Response**:
-
-```http
-HTTP/1.1 200
-Content-Type: application/json
-
-[
-  {
-    "id": 1,
-    "dashboardId": 1,
-    "dashboardUId": "ABcdEFghij"
-    "dashboardSlug": "sensors",
-    "panelId": 1,
-    "name": "fire place sensor",
-    "state": "alerting",
-    "newStateDate": "2018-05-14T05:55:20+02:00",
-    "evalDate": "0001-01-01T00:00:00Z",
-    "evalData": null,
-    "executionError": "",
-    "url": "http://grafana.com/dashboard/db/sensors"
-  }
-]
-```
-
-## Get alert by id
-
-`GET /api/alerts/:id`
-
-**Example Request**:
-
-```http
-GET /api/alerts/1 HTTP/1.1
-Accept: application/json
-Content-Type: application/json
-Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
-```
-
-**Example Response**:
-
-```http
-HTTP/1.1 200
-Content-Type: application/json
-
-{
-  "id": 1,
-  "dashboardId": 1,
-  "dashboardUId": "ABcdEFghij"
-  "dashboardSlug": "sensors",
-  "panelId": 1,
-  "name": "fire place sensor",
-  "state": "alerting",
-  "message": "Someone is trying to break in through the fire place",
-  "newStateDate": "2018-05-14T05:55:20+02:00",
-  "evalDate": "0001-01-01T00:00:00Z",
-  "evalData": "evalMatches": [
-    {
-      "metric": "movement",
-      "tags": {
-        "name": "fireplace_chimney"
-      },
-      "value": 98.765
-    }
-  ],
-  "executionError": "",
-  "url": "http://grafana.com/dashboard/db/sensors"
-}
-```
-
-**Important Note**:
-"evalMatches" data is cached in the db when and only when the state of the alert changes
-(e.g. transitioning from "ok" to "alerting" state).
-
-If data from one server triggers the alert first and, before that server is seen leaving alerting state,
-a second server also enters a state that would trigger the alert, the second server will not be visible in "evalMatches" data.
-
-## Pause alert by id
-
-`POST /api/alerts/:id/pause`
-
-**Example Request**:
-
-```http
-POST /api/alerts/1/pause HTTP/1.1
-Accept: application/json
-Content-Type: application/json
-Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
-
-{
-  "paused": true
-}
-```
-
-The :id query parameter is the id of the alert to be paused or unpaused.
-
-JSON Body Schema:
-
-- **paused** – Can be `true` or `false`. True to pause an alert. False to unpause an alert.
-
-**Example Response**:
-
-```http
-HTTP/1.1 200
-Content-Type: application/json
-
-{
-  "alertId": 1,
-  "state":   "Paused",
-  "message": "alert paused"
-}
-```
-
-## Pause all alerts
-
-See [Admin API][].
-
-{{% docs/reference %}}
-[Admin API]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/developers/http_api/admin#pause-all-alerts"
-[Admin API]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/developers/http_api/admin#pause-all-alerts"
-
-[Grafana Alerting alerts documentation]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting"
-[Grafana Alerting alerts documentation]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/alerting"
-{{% /docs/reference %}}
diff --git a/docs/sources/developers/http_api/alerting_notification_channels.md b/docs/sources/developers/http_api/alerting_notification_channels.md
deleted file mode 100644
index 440237b3287e1..0000000000000
--- a/docs/sources/developers/http_api/alerting_notification_channels.md
+++ /dev/null
@@ -1,424 +0,0 @@
----
-aliases:
-  - ../../http_api/alerting_notification_channels/
-canonical: /docs/grafana/latest/developers/http_api/alerting_notification_channels/
-description: Grafana Alerting Notification Channel HTTP API
-keywords:
-  - grafana
-  - http
-  - documentation
-  - api
-  - alerting
-  - alerts
-  - notifications
-labels:
-  products:
-    - enterprise
-    - oss
-title: Legacy Alerting Notification Channels API
----
-
-# Legacy Alerting Notification Channels API
-
-{{% admonition type="note" %}}
-Starting with v9.0, the Legacy Alerting Notification Channels API is deprecated. It will be removed in a future release.
-{{% /admonition %}}
-
-This page documents the Alerting Notification Channels API.
-
-## Identifier (id) vs unique identifier (uid)
-
-The identifier (id) of a notification channel is an auto-incrementing numeric value and is only unique per Grafana install.
-
-The unique identifier (uid) of a notification channel can be used for uniquely identify a notification channel between
-multiple Grafana installs. It's automatically generated if not provided when creating a notification channel. The uid
-allows having consistent URLs for accessing notification channels and when syncing notification channels between multiple
-Grafana installations, refer to [alert notification channel provisioning]({{< relref "/docs/grafana/latest/administration/provisioning#alert-notification-channels" >}}).
-
-The uid can have a maximum length of 40 characters.
-
-## Get all notification channels
-
-Returns all notification channels that the authenticated user has permission to view.
-
-`GET /api/alert-notifications`
-
-**Example request**:
-
-```http
-GET /api/alert-notifications HTTP/1.1
-Accept: application/json
-Content-Type: application/json
-Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
-```
-
-**Example response**:
-
-```http
-HTTP/1.1 200
-Content-Type: application/json
-
-[
-  {
-    "id": 1,
-    "uid": "team-a-email-notifier",
-    "name": "Team A",
-    "type": "email",
-    "isDefault": false,
-    "sendReminder": false,
-    "disableResolveMessage": false,
-    "settings": {
-      "addresses": "dev@grafana.com"
-    },
-    "created": "2018-04-23T14:44:09+02:00",
-    "updated": "2018-08-20T15:47:49+02:00"
-  }
-]
-
-```
-
-## Get all notification channels (lookup)
-
-Returns all notification channels, but with less detailed information. Accessible by any authenticated user and is mainly used by providing alert notification channels in Grafana UI when configuring alert rule.
-
-`GET /api/alert-notifications/lookup`
-
-**Example request**:
-
-```http
-GET /api/alert-notifications/lookup HTTP/1.1
-Accept: application/json
-Content-Type: application/json
-Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
-```
-
-**Example response**:
-
-```http
-HTTP/1.1 200
-Content-Type: application/json
-
-[
-  {
-    "id": 1,
-    "uid": "000000001",
-    "name": "Test",
-    "type": "email",
-    "isDefault": false
-  },
-  {
-    "id": 2,
-    "uid": "000000002",
-    "name": "Slack",
-    "type": "slack",
-    "isDefault": false
-  }
-]
-
-```
-
-## Get notification channel by uid
-
-`GET /api/alert-notifications/uid/:uid`
-
-Returns the notification channel given the notification channel uid.
-
-**Example request**:
-
-```http
-GET /api/alert-notifications/uid/team-a-email-notifier HTTP/1.1
-Accept: application/json
-Content-Type: application/json
-Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
-```
-
-**Example response**:
-
-```http
-HTTP/1.1 200
-Content-Type: application/json
-
-{
-  "id": 1,
-  "uid": "team-a-email-notifier",
-  "name": "Team A",
-  "type": "email",
-  "isDefault": false,
-  "sendReminder": false,
-  "disableResolveMessage": false,
-  "settings": {
-    "addresses": "dev@grafana.com"
-  },
-  "created": "2018-04-23T14:44:09+02:00",
-  "updated": "2018-08-20T15:47:49+02:00"
-}
-```
-
-## Get notification channel by id
-
-`GET /api/alert-notifications/:id`
-
-Returns the notification channel given the notification channel id.
-
-**Example request**:
-
-```http
-GET /api/alert-notifications/1 HTTP/1.1
-Accept: application/json
-Content-Type: application/json
-Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
-```
-
-**Example response**:
-
-```http
-HTTP/1.1 200
-Content-Type: application/json
-
-{
-  "id": 1,
-  "uid": "team-a-email-notifier",
-  "name": "Team A",
-  "type": "email",
-  "isDefault": false,
-  "sendReminder": false,
-  "disableResolveMessage": false,
-  "settings": {
-    "addresses": "dev@grafana.com"
-  },
-  "created": "2018-04-23T14:44:09+02:00",
-  "updated": "2018-08-20T15:47:49+02:00"
-}
-```
-
-## Create notification channel
-
-You can find the full list of [supported notifiers](/docs/grafana/v8.5/alerting/old-alerting/notifications/) on the alert notifiers page.
-
-`POST /api/alert-notifications`
-
-**Example request**:
-
-```http
-POST /api/alert-notifications HTTP/1.1
-Accept: application/json
-Content-Type: application/json
-Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
-
-{
-  "uid": "new-alert-notification", // optional
-  "name": "new alert notification",  //Required
-  "type":  "email", //Required
-  "isDefault": false,
-  "sendReminder": false,
-  "settings": {
-    "addresses": "dev@grafana.com"
-  }
-}
-```
-
-**Example response**:
-
-```http
-HTTP/1.1 200
-Content-Type: application/json
-
-{
-  "id": 1,
-  "uid": "new-alert-notification",
-  "name": "new alert notification",
-  "type": "email",
-  "isDefault": false,
-  "sendReminder": false,
-  "settings": {
-    "addresses": "dev@grafana.com"
-  },
-  "created": "2018-04-23T14:44:09+02:00",
-  "updated": "2018-08-20T15:47:49+02:00"
-}
-```
-
-## Update notification channel by uid
-
-`PUT /api/alert-notifications/uid/:uid`
-
-Updates an existing notification channel identified by uid.
-
-**Example request**:
-
-```http
-PUT /api/alert-notifications/uid/cIBgcSjkk HTTP/1.1
-Accept: application/json
-Content-Type: application/json
-Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
-
-{
-  "uid": "new-alert-notification", // optional
-  "name": "new alert notification",  //Required
-  "type":  "email", //Required
-  "isDefault": false,
-  "sendReminder": true,
-  "frequency": "15m",
-  "settings": {
-    "addresses": "dev@grafana.com"
-  }
-}
-```
-
-**Example response**:
-
-```http
-HTTP/1.1 200
-Content-Type: application/json
-
-{
-  "id": 1,
-  "uid": "new-alert-notification",
-  "name": "new alert notification",
-  "type": "email",
-  "isDefault": false,
-  "sendReminder": true,
-  "frequency": "15m",
-  "settings": {
-    "addresses": "dev@grafana.com"
-  },
-  "created": "2017-01-01 12:34",
-  "updated": "2017-01-01 12:34"
-}
-```
-
-## Update notification channel by id
-
-`PUT /api/alert-notifications/:id`
-
-Updates an existing notification channel identified by id.
-
-**Example request**:
-
-```http
-PUT /api/alert-notifications/1 HTTP/1.1
-Accept: application/json
-Content-Type: application/json
-Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
-
-{
-  "id": 1,
-  "uid": "new-alert-notification", // optional
-  "name": "new alert notification",  //Required
-  "type":  "email", //Required
-  "isDefault": false,
-  "sendReminder": true,
-  "frequency": "15m",
-  "settings": {
-    "addresses": "dev@grafana.com"
-  }
-}
-```
-
-**Example response**:
-
-```http
-HTTP/1.1 200
-Content-Type: application/json
-
-{
-  "id": 1,
-  "uid": "new-alert-notification",
-  "name": "new alert notification",
-  "type": "email",
-  "isDefault": false,
-  "sendReminder": true,
-  "frequency": "15m",
-  "settings": {
-    "addresses": "dev@grafana.com"
-  },
-  "created": "2017-01-01 12:34",
-  "updated": "2017-01-01 12:34"
-}
-```
-
-## Delete alert notification by uid
-
-`DELETE /api/alert-notifications/uid/:uid`
-
-Deletes an existing notification channel identified by uid.
-
-**Example request**:
-
-```http
-DELETE /api/alert-notifications/uid/team-a-email-notifier HTTP/1.1
-Accept: application/json
-Content-Type: application/json
-Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
-```
-
-**Example response**:
-
-```http
-HTTP/1.1 200
-Content-Type: application/json
-
-{
-  "message": "Notification deleted"
-}
-```
-
-## Delete alert notification by id
-
-`DELETE /api/alert-notifications/:id`
-
-Deletes an existing notification channel identified by id.
-
-**Example request**:
-
-```http
-DELETE /api/alert-notifications/1 HTTP/1.1
-Accept: application/json
-Content-Type: application/json
-Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
-```
-
-**Example response**:
-
-```http
-HTTP/1.1 200
-Content-Type: application/json
-
-{
-  "message": "Notification deleted"
-}
-```
-
-## Test notification channel
-
-Sends a test notification message for the given notification channel type and settings.
-You can find the full list of [supported notifiers](/alerting/notifications/#all-supported-notifier) at the alert notifiers page.
-
-`POST /api/alert-notifications/test`
-
-**Example request**:
-
-```http
-POST /api/alert-notifications/test HTTP/1.1
-Accept: application/json
-Content-Type: application/json
-Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
-
-{
-  "type":  "email",
-  "settings": {
-    "addresses": "dev@grafana.com"
-  }
-}
-```
-
-**Example response**:
-
-```http
-HTTP/1.1 200
-Content-Type: application/json
-
-{
-  "message": "Test notification sent"
-}
-```
diff --git a/docs/sources/developers/http_api/alerting_provisioning.md b/docs/sources/developers/http_api/alerting_provisioning.md
index c02a4bb02a440..0f9cfe3225a62 100644
--- a/docs/sources/developers/http_api/alerting_provisioning.md
+++ b/docs/sources/developers/http_api/alerting_provisioning.md
@@ -12,6 +12,7 @@ keywords:
   - alerts
 labels:
   products:
+    - cloud
     - enterprise
     - oss
 title: 'Alerting Provisioning HTTP API '
@@ -19,1525 +20,4 @@ title: 'Alerting Provisioning HTTP API '
 
 # Alerting provisioning HTTP API
 
-## Information
-
-### Version
-
-1.1.0
-
-## Content negotiation
-
-### Consumes
-
-- application/json
-
-### Produces
-
-- application/json
-- text/yaml
-- application/yaml
-
-## All endpoints
-
-### Alert rules
-
-| Method | URI                                                                | Name                                                                    | Summary                                                 |
-| ------ | ------------------------------------------------------------------ | ----------------------------------------------------------------------- | ------------------------------------------------------- |
-| DELETE | /api/v1/provisioning/alert-rules/{UID}                             | [route delete alert rule](#route-delete-alert-rule)                     | Delete a specific alert rule by UID.                    |
-| GET    | /api/v1/provisioning/alert-rules/{UID}                             | [route get alert rule](#route-get-alert-rule)                           | Get a specific alert rule by UID.                       |
-| GET    | /api/v1/provisioning/alert-rules/{UID}/export                      | [route get alert rule export](#route-get-alert-rule-export)             | Export an alert rule in provisioning file format.       |
-| GET    | /api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}        | [route get alert rule group](#route-get-alert-rule-group)               | Get a rule group.                                       |
-| GET    | /api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}/export | [route get alert rule group export](#route-get-alert-rule-group-export) | Export an alert rule group in provisioning file format. |
-| GET    | /api/v1/provisioning/alert-rules                                   | [route get alert rules](#route-get-alert-rules)                         | Get all the alert rules.                                |
-| GET    | /api/v1/provisioning/alert-rules/export                            | [route get alert rules export](#route-get-alert-rules-export)           | Export all alert rules in provisioning file format.     |
-| POST   | /api/v1/provisioning/alert-rules                                   | [route post alert rule](#route-post-alert-rule)                         | Create a new alert rule.                                |
-| PUT    | /api/v1/provisioning/alert-rules/{UID}                             | [route put alert rule](#route-put-alert-rule)                           | Update an existing alert rule.                          |
-| PUT    | /api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}        | [route put alert rule group](#route-put-alert-rule-group)               | Update the interval of a rule group.                    |
-
-### Contact points
-
-**Note:**
-
-Contact point provisioning is for Grafana-managed alerts only.
-
-| Method | URI                                        | Name                                                              | Summary                                                |
-| ------ | ------------------------------------------ | ----------------------------------------------------------------- | ------------------------------------------------------ |
-| DELETE | /api/v1/provisioning/contact-points/{UID}  | [route delete contactpoints](#route-delete-contactpoints)         | Delete a contact point.                                |
-| GET    | /api/v1/provisioning/contact-points        | [route get contactpoints](#route-get-contactpoints)               | Get all the contact points.                            |
-| GET    | /api/v1/provisioning/contact-points/export | [route get contactpoints export](#route-get-contactpoints-export) | Export all contact points in provisioning file format. |
-| POST   | /api/v1/provisioning/contact-points        | [route post contactpoints](#route-post-contactpoints)             | Create a contact point.                                |
-| PUT    | /api/v1/provisioning/contact-points/{UID}  | [route put contactpoint](#route-put-contactpoint)                 | Update an existing contact point.                      |
-
-### Notification policies
-
-| Method | URI                                  | Name                                                          | Summary                                                          |
-| ------ | ------------------------------------ | ------------------------------------------------------------- | ---------------------------------------------------------------- |
-| DELETE | /api/v1/provisioning/policies        | [route reset policy tree](#route-reset-policy-tree)           | Clears the notification policy tree.                             |
-| GET    | /api/v1/provisioning/policies        | [route get policy tree](#route-get-policy-tree)               | Get the notification policy tree.                                |
-| GET    | /api/v1/provisioning/policies/export | [route get policy tree export](#route-get-policy-tree-export) | Export the notification policy tree in provisioning file format. |
-| PUT    | /api/v1/provisioning/policies        | [route put policy tree](#route-put-policy-tree)               | Sets the notification policy tree.                               |
-
-### Mute timings
-
-| Method | URI                                      | Name                                                  | Summary                          |
-| ------ | ---------------------------------------- | ----------------------------------------------------- | -------------------------------- |
-| DELETE | /api/v1/provisioning/mute-timings/{name} | [route delete mute timing](#route-delete-mute-timing) | Delete a mute timing.            |
-| GET    | /api/v1/provisioning/mute-timings/{name} | [route get mute timing](#route-get-mute-timing)       | Get a mute timing.               |
-| GET    | /api/v1/provisioning/mute-timings        | [route get mute timings](#route-get-mute-timings)     | Get all the mute timings.        |
-| POST   | /api/v1/provisioning/mute-timings        | [route post mute timing](#route-post-mute-timing)     | Create a new mute timing.        |
-| PUT    | /api/v1/provisioning/mute-timings/{name} | [route put mute timing](#route-put-mute-timing)       | Replace an existing mute timing. |
-
-### Templates
-
-| Method | URI                                   | Name                                            | Summary                                    |
-| ------ | ------------------------------------- | ----------------------------------------------- | ------------------------------------------ |
-| DELETE | /api/v1/provisioning/templates/{name} | [route delete template](#route-delete-template) | Delete a template.                         |
-| GET    | /api/v1/provisioning/templates/{name} | [route get template](#route-get-template)       | Get a notification template.               |
-| GET    | /api/v1/provisioning/templates        | [route get templates](#route-get-templates)     | Get all notification templates.            |
-| PUT    | /api/v1/provisioning/templates/{name} | [route put template](#route-put-template)       | Updates an existing notification template. |
-
-## Paths
-
-### <span id="route-delete-alert-rule"></span> Delete a specific alert rule by UID. (_RouteDeleteAlertRule_)
-
-```
-DELETE /api/v1/provisioning/alert-rules/{UID}
-```
-
-#### Parameters
-
-{{% responsive-table %}}
-
-| Name                 | Source   | Type   | Go type  | Separator | Required | Default | Description                                               |
-| -------------------- | -------- | ------ | -------- | --------- | :------: | ------- | --------------------------------------------------------- |
-| UID                  | `path`   | string | `string` |           |    ✓     |         | Alert rule UID                                            |
-| X-Disable-Provenance | `header` | string | `string` |           |          |         | Allows editing of provisioned resources in the Grafana UI |
-
-{{% /responsive-table %}}
-
-#### All responses
-
-| Code                                | Status     | Description                              | Has headers | Schema                                        |
-| ----------------------------------- | ---------- | ---------------------------------------- | :---------: | --------------------------------------------- |
-| [204](#route-delete-alert-rule-204) | No Content | The alert rule was deleted successfully. |             | [schema](#route-delete-alert-rule-204-schema) |
-
-#### Responses
-
-##### <span id="route-delete-alert-rule-204"></span> 204 - The alert rule was deleted successfully.
-
-Status: No Content
-
-###### <span id="route-delete-alert-rule-204-schema"></span> Schema
-
-### <span id="route-delete-contactpoints"></span> Delete a contact point. (_RouteDeleteContactpoints_)
-
-```
-DELETE /api/v1/provisioning/contact-points/{UID}
-```
-
-#### Consumes
-
-- application/json
-
-#### Parameters
-
-| Name | Source | Type   | Go type  | Separator | Required | Default | Description                                |
-| ---- | ------ | ------ | -------- | --------- | :------: | ------- | ------------------------------------------ |
-| UID  | `path` | string | `string` |           |    ✓     |         | UID is the contact point unique identifier |
-
-#### All responses
-
-| Code                                   | Status     | Description                                 | Has headers | Schema                                           |
-| -------------------------------------- | ---------- | ------------------------------------------- | :---------: | ------------------------------------------------ |
-| [204](#route-delete-contactpoints-204) | No Content | The contact point was deleted successfully. |             | [schema](#route-delete-contactpoints-204-schema) |
-
-#### Responses
-
-##### <span id="route-delete-contactpoints-204"></span> 204 - The contact point was deleted successfully.
-
-Status: No Content
-
-###### <span id="route-delete-contactpoints-204-schema"></span> Schema
-
-### <span id="route-delete-mute-timing"></span> Delete a mute timing. (_RouteDeleteMuteTiming_)
-
-```
-DELETE /api/v1/provisioning/mute-timings/{name}
-```
-
-#### Parameters
-
-| Name | Source | Type   | Go type  | Separator | Required | Default | Description      |
-| ---- | ------ | ------ | -------- | --------- | :------: | ------- | ---------------- |
-| name | `path` | string | `string` |           |    ✓     |         | Mute timing name |
-
-#### All responses
-
-| Code                                 | Status     | Description                               | Has headers | Schema                                         |
-| ------------------------------------ | ---------- | ----------------------------------------- | :---------: | ---------------------------------------------- |
-| [204](#route-delete-mute-timing-204) | No Content | The mute timing was deleted successfully. |             | [schema](#route-delete-mute-timing-204-schema) |
-
-#### Responses
-
-##### <span id="route-delete-mute-timing-204"></span> 204 - The mute timing was deleted successfully.
-
-Status: No Content
-
-###### <span id="route-delete-mute-timing-204-schema"></span> Schema
-
-### <span id="route-delete-template"></span> Delete a template. (_RouteDeleteTemplate_)
-
-```
-DELETE /api/v1/provisioning/templates/{name}
-```
-
-#### Parameters
-
-| Name | Source | Type   | Go type  | Separator | Required | Default | Description   |
-| ---- | ------ | ------ | -------- | --------- | :------: | ------- | ------------- |
-| name | `path` | string | `string` |           |    ✓     |         | Template Name |
-
-#### All responses
-
-| Code                              | Status     | Description                            | Has headers | Schema                                      |
-| --------------------------------- | ---------- | -------------------------------------- | :---------: | ------------------------------------------- |
-| [204](#route-delete-template-204) | No Content | The template was deleted successfully. |             | [schema](#route-delete-template-204-schema) |
-
-#### Responses
-
-##### <span id="route-delete-template-204"></span> 204 - The template was deleted successfully.
-
-Status: No Content
-
-###### <span id="route-delete-template-204-schema"></span> Schema
-
-### <span id="route-get-alert-rule"></span> Get a specific alert rule by UID. (_RouteGetAlertRule_)
-
-```
-GET /api/v1/provisioning/alert-rules/{UID}
-```
-
-#### Parameters
-
-| Name | Source | Type   | Go type  | Separator | Required | Default | Description    |
-| ---- | ------ | ------ | -------- | --------- | :------: | ------- | -------------- |
-| UID  | `path` | string | `string` |           |    ✓     |         | Alert rule UID |
-
-#### All responses
-
-| Code                             | Status    | Description          | Has headers | Schema                                     |
-| -------------------------------- | --------- | -------------------- | :---------: | ------------------------------------------ |
-| [200](#route-get-alert-rule-200) | OK        | ProvisionedAlertRule |             | [schema](#route-get-alert-rule-200-schema) |
-| [404](#route-get-alert-rule-404) | Not Found | Not found.           |             | [schema](#route-get-alert-rule-404-schema) |
-
-#### Responses
-
-##### <span id="route-get-alert-rule-200"></span> 200 - ProvisionedAlertRule
-
-Status: OK
-
-###### <span id="route-get-alert-rule-200-schema"></span> Schema
-
-[ProvisionedAlertRule](#provisioned-alert-rule)
-
-##### <span id="route-get-alert-rule-404"></span> 404 - Not found.
-
-Status: Not Found
-
-###### <span id="route-get-alert-rule-404-schema"></span> Schema
-
-### <span id="route-get-alert-rule-export"></span> Export an alert rule in provisioning file format. (_RouteGetAlertRuleExport_)
-
-```
-GET /api/v1/provisioning/alert-rules/{UID}/export
-```
-
-#### Produces
-
-- application/json
-- application/yaml
-- text/yaml
-
-#### Parameters
-
-| Name     | Source  | Type    | Go type  | Separator | Required | Default  | Description                                                                                                                       |
-| -------- | ------- | ------- | -------- | --------- | :------: | -------- | --------------------------------------------------------------------------------------------------------------------------------- |
-| UID      | `path`  | string  | `string` |           |    ✓     |          | Alert rule UID                                                                                                                    |
-| download | `query` | boolean | `bool`   |           |          |          | Whether to initiate a download of the file or not.                                                                                |
-| format   | `query` | string  | `string` |           |          | `"yaml"` | Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence. |
-
-#### All responses
-
-| Code                                    | Status    | Description        | Has headers | Schema                                            |
-| --------------------------------------- | --------- | ------------------ | :---------: | ------------------------------------------------- |
-| [200](#route-get-alert-rule-export-200) | OK        | AlertingFileExport |             | [schema](#route-get-alert-rule-export-200-schema) |
-| [404](#route-get-alert-rule-export-404) | Not Found | Not found.         |             | [schema](#route-get-alert-rule-export-404-schema) |
-
-#### Responses
-
-##### <span id="route-get-alert-rule-export-200"></span> 200 - AlertingFileExport
-
-Status: OK
-
-###### <span id="route-get-alert-rule-export-200-schema"></span> Schema
-
-[AlertingFileExport](#alerting-file-export)
-
-##### <span id="route-get-alert-rule-export-404"></span> 404 - Not found.
-
-Status: Not Found
-
-###### <span id="route-get-alert-rule-export-404-schema"></span> Schema
-
-### <span id="route-get-alert-rule-group"></span> Get a rule group. (_RouteGetAlertRuleGroup_)
-
-```
-GET /api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}
-```
-
-#### Parameters
-
-| Name      | Source | Type   | Go type  | Separator | Required | Default | Description |
-| --------- | ------ | ------ | -------- | --------- | :------: | ------- | ----------- |
-| FolderUID | `path` | string | `string` |           |    ✓     |         |             |
-| Group     | `path` | string | `string` |           |    ✓     |         |             |
-
-#### All responses
-
-| Code                                   | Status    | Description    | Has headers | Schema                                           |
-| -------------------------------------- | --------- | -------------- | :---------: | ------------------------------------------------ |
-| [200](#route-get-alert-rule-group-200) | OK        | AlertRuleGroup |             | [schema](#route-get-alert-rule-group-200-schema) |
-| [404](#route-get-alert-rule-group-404) | Not Found | Not found.     |             | [schema](#route-get-alert-rule-group-404-schema) |
-
-#### Responses
-
-##### <span id="route-get-alert-rule-group-200"></span> 200 - AlertRuleGroup
-
-Status: OK
-
-###### <span id="route-get-alert-rule-group-200-schema"></span> Schema
-
-[AlertRuleGroup](#alert-rule-group)
-
-##### <span id="route-get-alert-rule-group-404"></span> 404 - Not found.
-
-Status: Not Found
-
-###### <span id="route-get-alert-rule-group-404-schema"></span> Schema
-
-### <span id="route-get-alert-rule-group-export"></span> Export an alert rule group in provisioning file format. (_RouteGetAlertRuleGroupExport_)
-
-```
-GET /api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}/export
-```
-
-#### Produces
-
-- application/json
-- application/yaml
-- text/yaml
-
-#### Parameters
-
-| Name      | Source  | Type    | Go type  | Separator | Required | Default  | Description                                                                                                                       |
-| --------- | ------- | ------- | -------- | --------- | :------: | -------- | --------------------------------------------------------------------------------------------------------------------------------- |
-| FolderUID | `path`  | string  | `string` |           |    ✓     |          |                                                                                                                                   |
-| Group     | `path`  | string  | `string` |           |    ✓     |          |                                                                                                                                   |
-| download  | `query` | boolean | `bool`   |           |          |          | Whether to initiate a download of the file or not.                                                                                |
-| format    | `query` | string  | `string` |           |          | `"yaml"` | Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence. |
-
-#### All responses
-
-| Code                                          | Status    | Description        | Has headers | Schema                                                  |
-| --------------------------------------------- | --------- | ------------------ | :---------: | ------------------------------------------------------- |
-| [200](#route-get-alert-rule-group-export-200) | OK        | AlertingFileExport |             | [schema](#route-get-alert-rule-group-export-200-schema) |
-| [404](#route-get-alert-rule-group-export-404) | Not Found | Not found.         |             | [schema](#route-get-alert-rule-group-export-404-schema) |
-
-#### Responses
-
-##### <span id="route-get-alert-rule-group-export-200"></span> 200 - AlertingFileExport
-
-Status: OK
-
-###### <span id="route-get-alert-rule-group-export-200-schema"></span> Schema
-
-[AlertingFileExport](#alerting-file-export)
-
-##### <span id="route-get-alert-rule-group-export-404"></span> 404 - Not found.
-
-Status: Not Found
-
-###### <span id="route-get-alert-rule-group-export-404-schema"></span> Schema
-
-### <span id="route-get-alert-rules"></span> Get all the alert rules. (_RouteGetAlertRules_)
-
-```
-GET /api/v1/provisioning/alert-rules
-```
-
-#### All responses
-
-| Code                              | Status | Description           | Has headers | Schema                                      |
-| --------------------------------- | ------ | --------------------- | :---------: | ------------------------------------------- |
-| [200](#route-get-alert-rules-200) | OK     | ProvisionedAlertRules |             | [schema](#route-get-alert-rules-200-schema) |
-
-#### Responses
-
-##### <span id="route-get-alert-rules-200"></span> 200 - ProvisionedAlertRules
-
-Status: OK
-
-###### <span id="route-get-alert-rules-200-schema"></span> Schema
-
-[ProvisionedAlertRules](#provisioned-alert-rules)
-
-### <span id="route-get-alert-rules-export"></span> Export all alert rules in provisioning file format. (_RouteGetAlertRulesExport_)
-
-```
-GET /api/v1/provisioning/alert-rules/export
-```
-
-#### Parameters
-
-| Name     | Source  | Type    | Go type  | Separator | Required | Default  | Description                                                                                                                       |
-| -------- | ------- | ------- | -------- | --------- | :------: | -------- | --------------------------------------------------------------------------------------------------------------------------------- |
-| download | `query` | boolean | `bool`   |           |          |          | Whether to initiate a download of the file or not.                                                                                |
-| format   | `query` | string  | `string` |           |          | `"yaml"` | Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence. |
-
-#### All responses
-
-| Code                                     | Status    | Description        | Has headers | Schema                                             |
-| ---------------------------------------- | --------- | ------------------ | :---------: | -------------------------------------------------- |
-| [200](#route-get-alert-rules-export-200) | OK        | AlertingFileExport |             | [schema](#route-get-alert-rules-export-200-schema) |
-| [404](#route-get-alert-rules-export-404) | Not Found | Not found.         |             | [schema](#route-get-alert-rules-export-404-schema) |
-
-#### Responses
-
-##### <span id="route-get-alert-rules-export-200"></span> 200 - AlertingFileExport
-
-Status: OK
-
-###### <span id="route-get-alert-rules-export-200-schema"></span> Schema
-
-[AlertingFileExport](#alerting-file-export)
-
-##### <span id="route-get-alert-rules-export-404"></span> 404 - Not found.
-
-Status: Not Found
-
-###### <span id="route-get-alert-rules-export-404-schema"></span> Schema
-
-### <span id="route-get-contactpoints"></span> Get all the contact points. (_RouteGetContactpoints_)
-
-```
-GET /api/v1/provisioning/contact-points
-```
-
-#### Parameters
-
-| Name | Source  | Type   | Go type  | Separator | Required | Default | Description    |
-| ---- | ------- | ------ | -------- | --------- | :------: | ------- | -------------- |
-| name | `query` | string | `string` |           |          |         | Filter by name |
-
-#### All responses
-
-| Code                                | Status | Description   | Has headers | Schema                                        |
-| ----------------------------------- | ------ | ------------- | :---------: | --------------------------------------------- |
-| [200](#route-get-contactpoints-200) | OK     | ContactPoints |             | [schema](#route-get-contactpoints-200-schema) |
-
-#### Responses
-
-##### <span id="route-get-contactpoints-200"></span> 200 - ContactPoints
-
-Status: OK
-
-###### <span id="route-get-contactpoints-200-schema"></span> Schema
-
-[ContactPoints](#contact-points)
-
-### <span id="route-get-contactpoints-export"></span> Export all contact points in provisioning file format. (_RouteGetContactpointsExport_)
-
-```
-GET /api/v1/provisioning/contact-points/export
-```
-
-#### Parameters
-
-| Name     | Source  | Type    | Go type  | Separator | Required | Default  | Description                                                                                                                                                                                     |
-| -------- | ------- | ------- | -------- | --------- | :------: | -------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| decrypt  | `query` | boolean | `bool`   |           |          |          | Whether any contained secure settings should be decrypted or left redacted. Redacted settings will contain RedactedValue instead. Currently, only org admin can view decrypted secure settings. |
-| download | `query` | boolean | `bool`   |           |          |          | Whether to initiate a download of the file or not.                                                                                                                                              |
-| format   | `query` | string  | `string` |           |          | `"yaml"` | Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.                                                               |
-| name     | `query` | string  | `string` |           |          |          | Filter by name                                                                                                                                                                                  |
-
-#### All responses
-
-| Code                                       | Status    | Description        | Has headers | Schema                                               |
-| ------------------------------------------ | --------- | ------------------ | :---------: | ---------------------------------------------------- |
-| [200](#route-get-contactpoints-export-200) | OK        | AlertingFileExport |             | [schema](#route-get-contactpoints-export-200-schema) |
-| [403](#route-get-contactpoints-export-403) | Forbidden | PermissionDenied   |             | [schema](#route-get-contactpoints-export-403-schema) |
-
-#### Responses
-
-##### <span id="route-get-contactpoints-export-200"></span> 200 - AlertingFileExport
-
-Status: OK
-
-###### <span id="route-get-contactpoints-export-200-schema"></span> Schema
-
-[AlertingFileExport](#alerting-file-export)
-
-##### <span id="route-get-contactpoints-export-403"></span> 403 - PermissionDenied
-
-Status: Forbidden
-
-###### <span id="route-get-contactpoints-export-403-schema"></span> Schema
-
-[PermissionDenied](#permission-denied)
-
-### <span id="route-get-mute-timing"></span> Get a mute timing. (_RouteGetMuteTiming_)
-
-```
-GET /api/v1/provisioning/mute-timings/{name}
-```
-
-#### Parameters
-
-| Name | Source | Type   | Go type  | Separator | Required | Default | Description      |
-| ---- | ------ | ------ | -------- | --------- | :------: | ------- | ---------------- |
-| name | `path` | string | `string` |           |    ✓     |         | Mute timing name |
-
-#### All responses
-
-| Code                              | Status    | Description      | Has headers | Schema                                      |
-| --------------------------------- | --------- | ---------------- | :---------: | ------------------------------------------- |
-| [200](#route-get-mute-timing-200) | OK        | MuteTimeInterval |             | [schema](#route-get-mute-timing-200-schema) |
-| [404](#route-get-mute-timing-404) | Not Found | Not found.       |             | [schema](#route-get-mute-timing-404-schema) |
-
-#### Responses
-
-##### <span id="route-get-mute-timing-200"></span> 200 - MuteTimeInterval
-
-Status: OK
-
-###### <span id="route-get-mute-timing-200-schema"></span> Schema
-
-[MuteTimeInterval](#mute-time-interval)
-
-##### <span id="route-get-mute-timing-404"></span> 404 - Not found.
-
-Status: Not Found
-
-###### <span id="route-get-mute-timing-404-schema"></span> Schema
-
-### <span id="route-get-mute-timings"></span> Get all the mute timings. (_RouteGetMuteTimings_)
-
-```
-GET /api/v1/provisioning/mute-timings
-```
-
-#### All responses
-
-| Code                               | Status | Description | Has headers | Schema                                       |
-| ---------------------------------- | ------ | ----------- | :---------: | -------------------------------------------- |
-| [200](#route-get-mute-timings-200) | OK     | MuteTimings |             | [schema](#route-get-mute-timings-200-schema) |
-
-#### Responses
-
-##### <span id="route-get-mute-timings-200"></span> 200 - MuteTimings
-
-Status: OK
-
-###### <span id="route-get-mute-timings-200-schema"></span> Schema
-
-[MuteTimings](#mute-timings)
-
-### <span id="route-get-policy-tree"></span> Get the notification policy tree. (_RouteGetPolicyTree_)
-
-```
-GET /api/v1/provisioning/policies
-```
-
-#### All responses
-
-| Code                              | Status | Description | Has headers | Schema                                      |
-| --------------------------------- | ------ | ----------- | :---------: | ------------------------------------------- |
-| [200](#route-get-policy-tree-200) | OK     | Route       |             | [schema](#route-get-policy-tree-200-schema) |
-
-#### Responses
-
-##### <span id="route-get-policy-tree-200"></span> 200 - Route
-
-Status: OK
-
-###### <span id="route-get-policy-tree-200-schema"></span> Schema
-
-[Route](#route)
-
-### <span id="route-get-policy-tree-export"></span> Export the notification policy tree in provisioning file format. (_RouteGetPolicyTreeExport_)
-
-```
-GET /api/v1/provisioning/policies/export
-```
-
-#### All responses
-
-| Code                                     | Status    | Description        | Has headers | Schema                                             |
-| ---------------------------------------- | --------- | ------------------ | :---------: | -------------------------------------------------- |
-| [200](#route-get-policy-tree-export-200) | OK        | AlertingFileExport |             | [schema](#route-get-policy-tree-export-200-schema) |
-| [404](#route-get-policy-tree-export-404) | Not Found | NotFound           |             | [schema](#route-get-policy-tree-export-404-schema) |
-
-#### Responses
-
-##### <span id="route-get-policy-tree-export-200"></span> 200 - AlertingFileExport
-
-Status: OK
-
-###### <span id="route-get-policy-tree-export-200-schema"></span> Schema
-
-[AlertingFileExport](#alerting-file-export)
-
-##### <span id="route-get-policy-tree-export-404"></span> 404 - NotFound
-
-Status: Not Found
-
-###### <span id="route-get-policy-tree-export-404-schema"></span> Schema
-
-[NotFound](#not-found)
-
-### <span id="route-get-template"></span> Get a notification template. (_RouteGetTemplate_)
-
-```
-GET /api/v1/provisioning/templates/{name}
-```
-
-#### Parameters
-
-| Name | Source | Type   | Go type  | Separator | Required | Default | Description   |
-| ---- | ------ | ------ | -------- | --------- | :------: | ------- | ------------- |
-| name | `path` | string | `string` |           |    ✓     |         | Template Name |
-
-#### All responses
-
-| Code                           | Status    | Description          | Has headers | Schema                                   |
-| ------------------------------ | --------- | -------------------- | :---------: | ---------------------------------------- |
-| [200](#route-get-template-200) | OK        | NotificationTemplate |             | [schema](#route-get-template-200-schema) |
-| [404](#route-get-template-404) | Not Found | Not found.           |             | [schema](#route-get-template-404-schema) |
-
-#### Responses
-
-##### <span id="route-get-template-200"></span> 200 - NotificationTemplate
-
-Status: OK
-
-###### <span id="route-get-template-200-schema"></span> Schema
-
-[NotificationTemplate](#notification-template)
-
-##### <span id="route-get-template-404"></span> 404 - Not found.
-
-Status: Not Found
-
-###### <span id="route-get-template-404-schema"></span> Schema
-
-### <span id="route-get-templates"></span> Get all notification templates. (_RouteGetTemplates_)
-
-```
-GET /api/v1/provisioning/templates
-```
-
-#### All responses
-
-| Code                            | Status    | Description           | Has headers | Schema                                    |
-| ------------------------------- | --------- | --------------------- | :---------: | ----------------------------------------- |
-| [200](#route-get-templates-200) | OK        | NotificationTemplates |             | [schema](#route-get-templates-200-schema) |
-| [404](#route-get-templates-404) | Not Found | Not found.            |             | [schema](#route-get-templates-404-schema) |
-
-#### Responses
-
-##### <span id="route-get-templates-200"></span> 200 - NotificationTemplates
-
-Status: OK
-
-###### <span id="route-get-templates-200-schema"></span> Schema
-
-[NotificationTemplates](#notification-templates)
-
-##### <span id="route-get-templates-404"></span> 404 - Not found.
-
-Status: Not Found
-
-###### <span id="route-get-templates-404-schema"></span> Schema
-
-### <span id="route-post-alert-rule"></span> Create a new alert rule. (_RoutePostAlertRule_)
-
-```
-POST /api/v1/provisioning/alert-rules
-```
-
-#### Consumes
-
-- application/json
-
-#### Parameters
-
-{{% responsive-table %}}
-
-| Name                 | Source   | Type                                            | Go type                       | Separator | Required | Default | Description                                               |
-| -------------------- | -------- | ----------------------------------------------- | ----------------------------- | --------- | :------: | ------- | --------------------------------------------------------- |
-| X-Disable-Provenance | `header` | string                                          | `string`                      |           |          |         | Allows editing of provisioned resources in the Grafana UI |
-| Body                 | `body`   | [ProvisionedAlertRule](#provisioned-alert-rule) | `models.ProvisionedAlertRule` |           |          |         |                                                           |
-
-{{% /responsive-table %}}
-
-#### All responses
-
-| Code                              | Status      | Description          | Has headers | Schema                                      |
-| --------------------------------- | ----------- | -------------------- | :---------: | ------------------------------------------- |
-| [201](#route-post-alert-rule-201) | Created     | ProvisionedAlertRule |             | [schema](#route-post-alert-rule-201-schema) |
-| [400](#route-post-alert-rule-400) | Bad Request | ValidationError      |             | [schema](#route-post-alert-rule-400-schema) |
-
-#### Responses
-
-##### <span id="route-post-alert-rule-201"></span> 201 - ProvisionedAlertRule
-
-Status: Created
-
-###### <span id="route-post-alert-rule-201-schema"></span> Schema
-
-[ProvisionedAlertRule](#provisioned-alert-rule)
-
-##### <span id="route-post-alert-rule-400"></span> 400 - ValidationError
-
-Status: Bad Request
-
-###### <span id="route-post-alert-rule-400-schema"></span> Schema
-
-[ValidationError](#validation-error)
-
-### <span id="route-post-contactpoints"></span> Create a contact point. (_RoutePostContactpoints_)
-
-```
-POST /api/v1/provisioning/contact-points
-```
-
-#### Consumes
-
-- application/json
-
-#### Parameters
-
-{{% responsive-table %}}
-
-| Name                 | Source   | Type                                            | Go type                       | Separator | Required | Default | Description                                               |
-| -------------------- | -------- | ----------------------------------------------- | ----------------------------- | --------- | :------: | ------- | --------------------------------------------------------- |
-| X-Disable-Provenance | `header` | string                                          | `string`                      |           |          |         | Allows editing of provisioned resources in the Grafana UI |
-| Body                 | `body`   | [EmbeddedContactPoint](#embedded-contact-point) | `models.EmbeddedContactPoint` |           |          |         |                                                           |
-
-{{% /responsive-table %}}
-
-#### All responses
-
-| Code                                 | Status      | Description          | Has headers | Schema                                         |
-| ------------------------------------ | ----------- | -------------------- | :---------: | ---------------------------------------------- |
-| [202](#route-post-contactpoints-202) | Accepted    | EmbeddedContactPoint |             | [schema](#route-post-contactpoints-202-schema) |
-| [400](#route-post-contactpoints-400) | Bad Request | ValidationError      |             | [schema](#route-post-contactpoints-400-schema) |
-
-#### Responses
-
-##### <span id="route-post-contactpoints-202"></span> 202 - EmbeddedContactPoint
-
-Status: Accepted
-
-###### <span id="route-post-contactpoints-202-schema"></span> Schema
-
-[EmbeddedContactPoint](#embedded-contact-point)
-
-##### <span id="route-post-contactpoints-400"></span> 400 - ValidationError
-
-Status: Bad Request
-
-###### <span id="route-post-contactpoints-400-schema"></span> Schema
-
-[ValidationError](#validation-error)
-
-### <span id="route-post-mute-timing"></span> Create a new mute timing. (_RoutePostMuteTiming_)
-
-```
-POST /api/v1/provisioning/mute-timings
-```
-
-#### Consumes
-
-- application/json
-
-#### Parameters
-
-{{% responsive-table %}}
-
-| Name                 | Source   | Type                                    | Go type                   | Separator | Required | Default | Description                                               |
-| -------------------- | -------- | --------------------------------------- | ------------------------- | --------- | :------: | ------- | --------------------------------------------------------- |
-| X-Disable-Provenance | `header` | string                                  | `string`                  |           |          |         | Allows editing of provisioned resources in the Grafana UI |
-| Body                 | `body`   | [MuteTimeInterval](#mute-time-interval) | `models.MuteTimeInterval` |           |          |         |                                                           |
-
-{{% /responsive-table %}}
-
-#### All responses
-
-| Code                               | Status      | Description      | Has headers | Schema                                       |
-| ---------------------------------- | ----------- | ---------------- | :---------: | -------------------------------------------- |
-| [201](#route-post-mute-timing-201) | Created     | MuteTimeInterval |             | [schema](#route-post-mute-timing-201-schema) |
-| [400](#route-post-mute-timing-400) | Bad Request | ValidationError  |             | [schema](#route-post-mute-timing-400-schema) |
-
-#### Responses
-
-##### <span id="route-post-mute-timing-201"></span> 201 - MuteTimeInterval
-
-Status: Created
-
-###### <span id="route-post-mute-timing-201-schema"></span> Schema
-
-[MuteTimeInterval](#mute-time-interval)
-
-##### <span id="route-post-mute-timing-400"></span> 400 - ValidationError
-
-Status: Bad Request
-
-###### <span id="route-post-mute-timing-400-schema"></span> Schema
-
-[ValidationError](#validation-error)
-
-### <span id="route-put-alert-rule"></span> Update an existing alert rule. (_RoutePutAlertRule_)
-
-```
-PUT /api/v1/provisioning/alert-rules/{UID}
-```
-
-#### Consumes
-
-- application/json
-
-#### Parameters
-
-{{% responsive-table %}}
-
-| Name                 | Source   | Type                                            | Go type                       | Separator | Required | Default | Description                                               |
-| -------------------- | -------- | ----------------------------------------------- | ----------------------------- | --------- | :------: | ------- | --------------------------------------------------------- |
-| UID                  | `path`   | string                                          | `string`                      |           |    ✓     |         | Alert rule UID                                            |
-| X-Disable-Provenance | `header` | string                                          | `string`                      |           |          |         | Allows editing of provisioned resources in the Grafana UI |
-| Body                 | `body`   | [ProvisionedAlertRule](#provisioned-alert-rule) | `models.ProvisionedAlertRule` |           |          |         |                                                           |
-
-{{% /responsive-table %}}
-
-#### All responses
-
-| Code                             | Status      | Description          | Has headers | Schema                                     |
-| -------------------------------- | ----------- | -------------------- | :---------: | ------------------------------------------ |
-| [200](#route-put-alert-rule-200) | OK          | ProvisionedAlertRule |             | [schema](#route-put-alert-rule-200-schema) |
-| [400](#route-put-alert-rule-400) | Bad Request | ValidationError      |             | [schema](#route-put-alert-rule-400-schema) |
-
-#### Responses
-
-##### <span id="route-put-alert-rule-200"></span> 200 - ProvisionedAlertRule
-
-Status: OK
-
-###### <span id="route-put-alert-rule-200-schema"></span> Schema
-
-[ProvisionedAlertRule](#provisioned-alert-rule)
-
-##### <span id="route-put-alert-rule-400"></span> 400 - ValidationError
-
-Status: Bad Request
-
-###### <span id="route-put-alert-rule-400-schema"></span> Schema
-
-[ValidationError](#validation-error)
-
-### <span id="route-put-alert-rule-group"></span> Update the interval of a rule group. (_RoutePutAlertRuleGroup_)
-
-```
-PUT /api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}
-```
-
-#### Consumes
-
-- application/json
-
-#### Parameters
-
-{{% responsive-table %}}
-
-| Name                 | Source   | Type                                | Go type                 | Separator | Required | Default | Description                                               |
-| -------------------- | -------- | ----------------------------------- | ----------------------- | --------- | :------: | ------- | --------------------------------------------------------- |
-| FolderUID            | `path`   | string                              | `string`                |           |    ✓     |         |                                                           |
-| Group                | `path`   | string                              | `string`                |           |    ✓     |         |                                                           |
-| X-Disable-Provenance | `header` | string                              | `string`                |           |          |         | Allows editing of provisioned resources in the Grafana UI |
-| Body                 | `body`   | [AlertRuleGroup](#alert-rule-group) | `models.AlertRuleGroup` |           |          |         |                                                           |
-
-{{% /responsive-table %}}
-
-#### All responses
-
-| Code                                   | Status      | Description     | Has headers | Schema                                           |
-| -------------------------------------- | ----------- | --------------- | :---------: | ------------------------------------------------ |
-| [200](#route-put-alert-rule-group-200) | OK          | AlertRuleGroup  |             | [schema](#route-put-alert-rule-group-200-schema) |
-| [400](#route-put-alert-rule-group-400) | Bad Request | ValidationError |             | [schema](#route-put-alert-rule-group-400-schema) |
-
-#### Responses
-
-##### <span id="route-put-alert-rule-group-200"></span> 200 - AlertRuleGroup
-
-Status: OK
-
-###### <span id="route-put-alert-rule-group-200-schema"></span> Schema
-
-[AlertRuleGroup](#alert-rule-group)
-
-##### <span id="route-put-alert-rule-group-400"></span> 400 - ValidationError
-
-Status: Bad Request
-
-###### <span id="route-put-alert-rule-group-400-schema"></span> Schema
-
-[ValidationError](#validation-error)
-
-### <span id="route-put-contactpoint"></span> Update an existing contact point. (_RoutePutContactpoint_)
-
-```
-PUT /api/v1/provisioning/contact-points/{UID}
-```
-
-#### Consumes
-
-- application/json
-
-#### Parameters
-
-{{% responsive-table %}}
-
-| Name                 | Source   | Type                                            | Go type                       | Separator | Required | Default | Description                                               |
-| -------------------- | -------- | ----------------------------------------------- | ----------------------------- | --------- | :------: | ------- | --------------------------------------------------------- |
-| UID                  | `path`   | string                                          | `string`                      |           |    ✓     |         | UID is the contact point unique identifier                |
-| X-Disable-Provenance | `header` | string                                          | `string`                      |           |          |         | Allows editing of provisioned resources in the Grafana UI |
-| Body                 | `body`   | [EmbeddedContactPoint](#embedded-contact-point) | `models.EmbeddedContactPoint` |           |          |         |                                                           |
-
-{{% /responsive-table %}}
-
-#### All responses
-
-| Code                               | Status      | Description     | Has headers | Schema                                       |
-| ---------------------------------- | ----------- | --------------- | :---------: | -------------------------------------------- |
-| [202](#route-put-contactpoint-202) | Accepted    | Ack             |             | [schema](#route-put-contactpoint-202-schema) |
-| [400](#route-put-contactpoint-400) | Bad Request | ValidationError |             | [schema](#route-put-contactpoint-400-schema) |
-
-#### Responses
-
-##### <span id="route-put-contactpoint-202"></span> 202 - Ack
-
-Status: Accepted
-
-###### <span id="route-put-contactpoint-202-schema"></span> Schema
-
-[Ack](#ack)
-
-##### <span id="route-put-contactpoint-400"></span> 400 - ValidationError
-
-Status: Bad Request
-
-###### <span id="route-put-contactpoint-400-schema"></span> Schema
-
-[ValidationError](#validation-error)
-
-### <span id="route-put-mute-timing"></span> Replace an existing mute timing. (_RoutePutMuteTiming_)
-
-```
-PUT /api/v1/provisioning/mute-timings/{name}
-```
-
-#### Consumes
-
-- application/json
-
-#### Parameters
-
-{{% responsive-table %}}
-
-| Name                 | Source   | Type                                    | Go type                   | Separator | Required | Default | Description                                               |
-| -------------------- | -------- | --------------------------------------- | ------------------------- | --------- | :------: | ------- | --------------------------------------------------------- |
-| name                 | `path`   | string                                  | `string`                  |           |    ✓     |         | Mute timing name                                          |
-| X-Disable-Provenance | `header` | string                                  | `string`                  |           |          |         | Allows editing of provisioned resources in the Grafana UI |
-| Body                 | `body`   | [MuteTimeInterval](#mute-time-interval) | `models.MuteTimeInterval` |           |          |         |                                                           |
-
-{{% /responsive-table %}}
-
-#### All responses
-
-| Code                              | Status      | Description      | Has headers | Schema                                      |
-| --------------------------------- | ----------- | ---------------- | :---------: | ------------------------------------------- |
-| [200](#route-put-mute-timing-200) | OK          | MuteTimeInterval |             | [schema](#route-put-mute-timing-200-schema) |
-| [400](#route-put-mute-timing-400) | Bad Request | ValidationError  |             | [schema](#route-put-mute-timing-400-schema) |
-
-#### Responses
-
-##### <span id="route-put-mute-timing-200"></span> 200 - MuteTimeInterval
-
-Status: OK
-
-###### <span id="route-put-mute-timing-200-schema"></span> Schema
-
-[MuteTimeInterval](#mute-time-interval)
-
-##### <span id="route-put-mute-timing-400"></span> 400 - ValidationError
-
-Status: Bad Request
-
-###### <span id="route-put-mute-timing-400-schema"></span> Schema
-
-[ValidationError](#validation-error)
-
-### <span id="route-put-policy-tree"></span> Sets the notification policy tree. (_RoutePutPolicyTree_)
-
-```
-PUT /api/v1/provisioning/policies
-```
-
-#### Consumes
-
-- application/json
-
-#### Parameters
-
-{{% responsive-table %}}
-
-| Name                 | Source   | Type            | Go type        | Separator | Required | Default | Description                                               |
-| -------------------- | -------- | --------------- | -------------- | --------- | :------: | ------- | --------------------------------------------------------- |
-| X-Disable-Provenance | `header` | string          | `string`       |           |          |         | Allows editing of provisioned resources in the Grafana UI |
-| Body                 | `body`   | [Route](#route) | `models.Route` |           |          |         | The new notification routing tree to use                  |
-
-{{% /responsive-table %}}
-
-#### All responses
-
-| Code                              | Status      | Description     | Has headers | Schema                                      |
-| --------------------------------- | ----------- | --------------- | :---------: | ------------------------------------------- |
-| [202](#route-put-policy-tree-202) | Accepted    | Ack             |             | [schema](#route-put-policy-tree-202-schema) |
-| [400](#route-put-policy-tree-400) | Bad Request | ValidationError |             | [schema](#route-put-policy-tree-400-schema) |
-
-#### Responses
-
-##### <span id="route-put-policy-tree-202"></span> 202 - Ack
-
-Status: Accepted
-
-###### <span id="route-put-policy-tree-202-schema"></span> Schema
-
-[Ack](#ack)
-
-##### <span id="route-put-policy-tree-400"></span> 400 - ValidationError
-
-Status: Bad Request
-
-###### <span id="route-put-policy-tree-400-schema"></span> Schema
-
-[ValidationError](#validation-error)
-
-### <span id="route-put-template"></span> Updates an existing notification template. (_RoutePutTemplate_)
-
-```
-PUT /api/v1/provisioning/templates/{name}
-```
-
-#### Consumes
-
-- application/json
-
-{{% responsive-table %}}
-
-#### Parameters
-
-| Name                 | Source   | Type                                                          | Go type                              | Separator | Required | Default | Description                                               |
-| -------------------- | -------- | ------------------------------------------------------------- | ------------------------------------ | --------- | :------: | ------- | --------------------------------------------------------- |
-| name                 | `path`   | string                                                        | `string`                             |           |    ✓     |         | Template Name                                             |
-| X-Disable-Provenance | `header` | string                                                        | `string`                             |           |          |         | Allows editing of provisioned resources in the Grafana UI |
-| Body                 | `body`   | [NotificationTemplateContent](#notification-template-content) | `models.NotificationTemplateContent` |           |          |         |                                                           |
-
-{{% /responsive-table %}}
-
-#### All responses
-
-| Code                           | Status      | Description          | Has headers | Schema                                   |
-| ------------------------------ | ----------- | -------------------- | :---------: | ---------------------------------------- |
-| [202](#route-put-template-202) | Accepted    | NotificationTemplate |             | [schema](#route-put-template-202-schema) |
-| [400](#route-put-template-400) | Bad Request | ValidationError      |             | [schema](#route-put-template-400-schema) |
-
-#### Responses
-
-##### <span id="route-put-template-202"></span> 202 - NotificationTemplate
-
-Status: Accepted
-
-###### <span id="route-put-template-202-schema"></span> Schema
-
-[NotificationTemplate](#notification-template)
-
-##### <span id="route-put-template-400"></span> 400 - ValidationError
-
-Status: Bad Request
-
-###### <span id="route-put-template-400-schema"></span> Schema
-
-[ValidationError](#validation-error)
-
-### <span id="route-reset-policy-tree"></span> Clears the notification policy tree. (_RouteResetPolicyTree_)
-
-```
-DELETE /api/v1/provisioning/policies
-```
-
-#### Consumes
-
-- application/json
-
-#### All responses
-
-| Code                                | Status   | Description | Has headers | Schema                                        |
-| ----------------------------------- | -------- | ----------- | :---------: | --------------------------------------------- |
-| [202](#route-reset-policy-tree-202) | Accepted | Ack         |             | [schema](#route-reset-policy-tree-202-schema) |
-
-#### Responses
-
-##### <span id="route-reset-policy-tree-202"></span> 202 - Ack
-
-Status: Accepted
-
-###### <span id="route-reset-policy-tree-202-schema"></span> Schema
-
-[Ack](#ack)
-
-## Models
-
-### <span id="ack"></span> Ack
-
-[interface{}](#interface)
-
-### <span id="alert-query"></span> AlertQuery
-
-**Properties**
-
-{{% responsive-table %}}
-
-| Name                                                      | Type                                      | Go type             | Required | Default | Description                                                                                            | Example |
-| --------------------------------------------------------- | ----------------------------------------- | ------------------- | :------: | ------- | ------------------------------------------------------------------------------------------------------ | ------- |
-| datasourceUid                                             | string                                    | `string`            |          |         | Grafana data source unique identifier; it should be '**expr**' for a Server Side Expression operation. |         |
-| model                                                     | [interface{}](#interface)                 | `interface{}`       |          |         | JSON is the raw JSON query and includes the above properties as well as custom properties.             |         |
-| queryType                                                 | string                                    | `string`            |          |         | QueryType is an optional identifier for the type of query.                                             |
-| It can be used to distinguish different types of queries. |                                           |
-| refId                                                     | string                                    | `string`            |          |         | RefID is the unique identifier of the query, set by the frontend call.                                 |         |
-| relativeTimeRange                                         | [RelativeTimeRange](#relative-time-range) | `RelativeTimeRange` |          |         |                                                                                                        |         |
-
-{{% /responsive-table %}}
-
-### <span id="alert-query-export"></span> AlertQueryExport
-
-**Properties**
-
-{{% responsive-table %}}
-
-| Name              | Type                                      | Go type             | Required | Default | Description | Example |
-| ----------------- | ----------------------------------------- | ------------------- | :------: | ------- | ----------- | ------- |
-| datasourceUid     | string                                    | `string`            |          |         |             |         |
-| model             | [interface{}](#interface)                 | `interface{}`       |          |         |             |         |
-| queryType         | string                                    | `string`            |          |         |             |         |
-| refId             | string                                    | `string`            |          |         |             |         |
-| relativeTimeRange | [RelativeTimeRange](#relative-time-range) | `RelativeTimeRange` |          |         |             |         |
-
-{{% /responsive-table %}}
-
-### <span id="alert-rule-export"></span> AlertRuleExport
-
-**Properties**
-
-{{% responsive-table %}}
-
-| Name         | Type                                      | Go type               | Required | Default | Description | Example |
-| ------------ | ----------------------------------------- | --------------------- | :------: | ------- | ----------- | ------- |
-| annotations  | map of string                             | `map[string]string`   |          |         |             |         |
-| condition    | string                                    | `string`              |          |         |             |         |
-| dasboardUid  | string                                    | `string`              |          |         |             |         |
-| data         | [][AlertQueryExport](#alert-query-export) | `[]*AlertQueryExport` |          |         |             |         |
-| execErrState | string                                    | `string`              |          |         |             |         |
-| for          | [Duration](#duration)                     | `Duration`            |          |         |             |         |
-| isPaused     | boolean                                   | `bool`                |          |         |             |         |
-| labels       | map of string                             | `map[string]string`   |          |         |             |         |
-| noDataState  | string                                    | `string`              |          |         |             |         |
-| panelId      | int64 (formatted integer)                 | `int64`               |          |         |             |         |
-| title        | string                                    | `string`              |          |         |             |         |
-| uid          | string                                    | `string`              |          |         |             |         |
-
-{{% /responsive-table %}}
-
-### <span id="alert-rule-group"></span> AlertRuleGroup
-
-**Properties**
-
-{{% responsive-table %}}
-
-| Name      | Type                                              | Go type                   | Required | Default | Description | Example |
-| --------- | ------------------------------------------------- | ------------------------- | :------: | ------- | ----------- | ------- |
-| folderUid | string                                            | `string`                  |          |         |             |         |
-| interval  | int64 (formatted integer)                         | `int64`                   |          |         |             |         |
-| rules     | [][ProvisionedAlertRule](#provisioned-alert-rule) | `[]*ProvisionedAlertRule` |          |         |             |         |
-| title     | string                                            | `string`                  |          |         |             |         |
-
-{{% /responsive-table %}}
-
-### <span id="alert-rule-group-export"></span> AlertRuleGroupExport
-
-**Properties**
-
-{{% responsive-table %}}
-
-| Name     | Type                                    | Go type              | Required | Default | Description | Example |
-| -------- | --------------------------------------- | -------------------- | :------: | ------- | ----------- | ------- |
-| folder   | string                                  | `string`             |          |         |             |         |
-| interval | [Duration](#duration)                   | `Duration`           |          |         |             |         |
-| name     | string                                  | `string`             |          |         |             |         |
-| orgId    | int64 (formatted integer)               | `int64`              |          |         |             |         |
-| rules    | [][AlertRuleExport](#alert-rule-export) | `[]*AlertRuleExport` |          |         |             |         |
-
-{{% /responsive-table %}}
-
-### <span id="alerting-file-export"></span> AlertingFileExport
-
-**Properties**
-
-{{% responsive-table %}}
-
-| Name          | Type                                                      | Go type                       | Required | Default | Description | Example |
-| ------------- | --------------------------------------------------------- | ----------------------------- | :------: | ------- | ----------- | ------- |
-| apiVersion    | int64 (formatted integer)                                 | `int64`                       |          |         |             |         |
-| contactPoints | [][ContactPointExport](#contact-point-export)             | `[]*ContactPointExport`       |          |         |             |         |
-| groups        | [][AlertRuleGroupExport](#alert-rule-group-export)        | `[]*AlertRuleGroupExport`     |          |         |             |         |
-| policies      | [][NotificationPolicyExport](#notification-policy-export) | `[]*NotificationPolicyExport` |          |         |             |         |
-
-{{% /responsive-table %}}
-
-### <span id="contact-point-export"></span> ContactPointExport
-
-**Properties**
-
-| Name      | Type                                 | Go type             | Required | Default | Description | Example |
-| --------- | ------------------------------------ | ------------------- | :------: | ------- | ----------- | ------- |
-| name      | string                               | `string`            |          |         |             |         |
-| orgId     | int64 (formatted integer)            | `int64`             |          |         |             |         |
-| receivers | [][ReceiverExport](#receiver-export) | `[]*ReceiverExport` |          |         |             |         |
-
-### <span id="contact-points"></span> ContactPoints
-
-[][EmbeddedContactPoint](#embedded-contact-point)
-
-### <span id="duration"></span> Duration
-
-| Name     | Type                      | Go type | Default | Description | Example |
-| -------- | ------------------------- | ------- | ------- | ----------- | ------- |
-| Duration | int64 (formatted integer) | int64   |         |             |         |
-
-### <span id="embedded-contact-point"></span> EmbeddedContactPoint
-
-> EmbeddedContactPoint is the contact point type that is used
-> by grafanas embedded alertmanager implementation.
-
-**Properties**
-
-{{% responsive-table %}}
-
-| Name                                 | Type                    | Go type  | Required | Default | Description                                                       | Example   |
-| ------------------------------------ | ----------------------- | -------- | :------: | ------- | ----------------------------------------------------------------- | --------- |
-| disableResolveMessage                | boolean                 | `bool`   |          |         |                                                                   | `false`   |
-| name                                 | string                  | `string` |          |         | Name is used as grouping key in the UI. Contact points with the   |
-| same name will be grouped in the UI. | `webhook_1`             |
-| provenance                           | string                  | `string` |          |         |                                                                   |           |
-| settings                             | [JSON](#json)           | `JSON`   |    ✓     |         |                                                                   |           |
-| type                                 | string                  | `string` |    ✓     |         |                                                                   | `webhook` |
-| uid                                  | string                  | `string` |          |         | UID is the unique identifier of the contact point. The UID can be |
-| set by the user.                     | `my_external_reference` |
-
-{{% /responsive-table %}}
-
-### <span id="json"></span> Json
-
-[interface{}](#interface)
-
-### <span id="match-regexps"></span> MatchRegexps
-
-[MatchRegexps](#match-regexps)
-
-### <span id="match-type"></span> MatchType
-
-| Name      | Type                      | Go type | Default | Description | Example |
-| --------- | ------------------------- | ------- | ------- | ----------- | ------- |
-| MatchType | int64 (formatted integer) | int64   |         |             |         |
-
-### <span id="matcher"></span> Matcher
-
-**Properties**
-
-{{% responsive-table %}}
-
-| Name  | Type                     | Go type     | Required | Default | Description | Example |
-| ----- | ------------------------ | ----------- | :------: | ------- | ----------- | ------- |
-| Name  | string                   | `string`    |          |         |             |         |
-| Type  | [MatchType](#match-type) | `MatchType` |          |         |             |         |
-| Value | string                   | `string`    |          |         |             |         |
-
-{{% /responsive-table %}}
-
-### <span id="matchers"></span> Matchers
-
-> Matchers is a slice of Matchers that is sortable, implements Stringer, and
-> provides a Matches method to match a LabelSet against all Matchers in the
-> slice. Note that some users of Matchers might require it to be sorted.
-
-[][Matcher](#matcher)
-
-### <span id="mute-time-interval"></span> MuteTimeInterval
-
-**Properties**
-
-{{% responsive-table %}}
-
-| Name           | Type                             | Go type           | Required | Default | Description | Example |
-| -------------- | -------------------------------- | ----------------- | :------: | ------- | ----------- | ------- |
-| name           | string                           | `string`          |          |         |             |         |
-| time_intervals | [][TimeInterval](#time-interval) | `[]*TimeInterval` |          |         |             |         |
-
-{{% /responsive-table %}}
-
-### <span id="mute-timings"></span> MuteTimings
-
-[][MuteTimeInterval](#mute-time-interval)
-
-### <span id="not-found"></span> NotFound
-
-[interface{}](#interface)
-
-### <span id="notification-policy-export"></span> NotificationPolicyExport
-
-**Properties**
-
-| Name   | Type                         | Go type       | Required | Default | Description | Example |
-| ------ | ---------------------------- | ------------- | :------: | ------- | ----------- | ------- |
-| Policy | [RouteExport](#route-export) | `RouteExport` |          |         | inline      |         |
-| orgId  | int64 (formatted integer)    | `int64`       |          |         |             |         |
-
-### <span id="notification-template"></span> NotificationTemplate
-
-**Properties**
-
-{{% responsive-table %}}
-
-| Name       | Type                      | Go type      | Required | Default | Description | Example |
-| ---------- | ------------------------- | ------------ | :------: | ------- | ----------- | ------- |
-| name       | string                    | `string`     |          |         |             |         |
-| provenance | [Provenance](#provenance) | `Provenance` |          |         |             |         |
-| template   | string                    | `string`     |          |         |             |         |
-
-{{% /responsive-table %}}
-
-### <span id="notification-template-content"></span> NotificationTemplateContent
-
-**Properties**
-
-{{% responsive-table %}}
-
-| Name     | Type   | Go type  | Required | Default | Description | Example |
-| -------- | ------ | -------- | :------: | ------- | ----------- | ------- |
-| template | string | `string` |          |         |             |         |
-
-{{% /responsive-table %}}
-
-### <span id="notification-templates"></span> NotificationTemplates
-
-[][NotificationTemplate](#notification-template)
-
-### <span id="object-matchers"></span> ObjectMatchers
-
-[Matchers](#matchers)
-
-#### Inlined models
-
-### <span id="permission-denied"></span> PermissionDenied
-
-[interface{}](#interface)
-
-### <span id="provenance"></span> Provenance
-
-| Name       | Type   | Go type | Default | Description | Example |
-| ---------- | ------ | ------- | ------- | ----------- | ------- |
-| Provenance | string | string  |         |             |         |
-
-### <span id="provisioned-alert-rule"></span> ProvisionedAlertRule
-
-**Properties**
-
-{{% responsive-table %}}
-
-| Name         | Type                         | Go type             | Required | Default | Description | Example                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| ------------ | ---------------------------- | ------------------- | :------: | ------- | ----------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| annotations  | map of string                | `map[string]string` |          |         |             | `{"runbook_url":"https://supercoolrunbook.com/page/13"}`                                                                                                                                                                                                                                                                                                                                                                         |
-| condition    | string                       | `string`            |    ✓     |         |             | `A`                                                                                                                                                                                                                                                                                                                                                                                                                              |
-| data         | [][AlertQuery](#alert-query) | `[]*AlertQuery`     |    ✓     |         |             | `[{"datasourceUid":"__expr__","model":{"conditions":[{"evaluator":{"params":[0,0],"type":"gt"},"operator":{"type":"and"},"query":{"params":[]},"reducer":{"params":[],"type":"avg"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1 == 1","hide":false,"intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"},"queryType":"","refId":"A","relativeTimeRange":{"from":0,"to":0}}]` |
-| execErrState | string                       | `string`            |    ✓     |         |             |                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| folderUID    | string                       | `string`            |    ✓     |         |             | `project_x`                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| for          | [Duration](#duration)        | `Duration`          |    ✓     |         |             |                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| id           | int64 (formatted integer)    | `int64`             |          |         |             |                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| isPaused     | boolean                      | `bool`              |          |         |             | `false`                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| labels       | map of string                | `map[string]string` |          |         |             | `{"team":"sre-team-1"}`                                                                                                                                                                                                                                                                                                                                                                                                          |
-| noDataState  | string                       | `string`            |    ✓     |         |             |                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| orgID        | int64 (formatted integer)    | `int64`             |    ✓     |         |             |                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| provenance   | [Provenance](#provenance)    | `Provenance`        |          |         |             |                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| ruleGroup    | string                       | `string`            |    ✓     |         |             | `eval_group_1`                                                                                                                                                                                                                                                                                                                                                                                                                   |
-| title        | string                       | `string`            |    ✓     |         |             | `Always firing`                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| uid          | string                       | `string`            |          |         |             |                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| updated      | date-time (formatted string) | `strfmt.DateTime`   |          |         |             |                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-
-{{% /responsive-table %}}
-
-### <span id="provisioned-alert-rules"></span> ProvisionedAlertRules
-
-[][ProvisionedAlertRule](#provisioned-alert-rule)
-
-### <span id="raw-message"></span> RawMessage
-
-[interface{}](#interface)
-
-### <span id="receiver-export"></span> ReceiverExport
-
-**Properties**
-
-| Name                  | Type                       | Go type      | Required | Default | Description | Example |
-| --------------------- | -------------------------- | ------------ | :------: | ------- | ----------- | ------- |
-| disableResolveMessage | boolean                    | `bool`       |          |         |             |         |
-| settings              | [RawMessage](#raw-message) | `RawMessage` |          |         |             |         |
-| type                  | string                     | `string`     |          |         |             |         |
-| uid                   | string                     | `string`     |          |         |             |         |
-
-### <span id="regexp"></span> Regexp
-
-> A Regexp is safe for concurrent use by multiple goroutines,
-> except for configuration methods, such as Longest.
-
-[interface{}](#interface)
-
-### <span id="relative-time-range"></span> RelativeTimeRange
-
-> RelativeTimeRange is the per query start and end time
-> for requests.
-
-**Properties**
-
-{{% responsive-table %}}
-
-| Name | Type                  | Go type    | Required | Default | Description | Example |
-| ---- | --------------------- | ---------- | :------: | ------- | ----------- | ------- |
-| from | [Duration](#duration) | `Duration` |          |         |             |         |
-| to   | [Duration](#duration) | `Duration` |          |         |             |         |
-
-{{% /responsive-table %}}
-
-### <span id="route"></span> Route
-
-> A Route is a node that contains definitions of how to handle alerts. This is modified
-> from the upstream alertmanager in that it adds the ObjectMatchers property.
-
-**Properties**
-
-{{% responsive-table %}}
-
-| Name                | Type                               | Go type             | Required | Default | Description                             | Example |
-| ------------------- | ---------------------------------- | ------------------- | :------: | ------- | --------------------------------------- | ------- |
-| continue            | boolean                            | `bool`              |          |         |                                         |         |
-| group_by            | []string                           | `[]string`          |          |         |                                         |         |
-| group_interval      | string                             | `string`            |          |         |                                         |         |
-| group_wait          | string                             | `string`            |          |         |                                         |         |
-| match               | map of string                      | `map[string]string` |          |         | Deprecated. Remove before v1.0 release. |         |
-| match_re            | [MatchRegexps](#match-regexps)     | `MatchRegexps`      |          |         |                                         |         |
-| matchers            | [Matchers](#matchers)              | `Matchers`          |          |         |                                         |         |
-| mute_time_intervals | []string                           | `[]string`          |          |         |                                         |         |
-| object_matchers     | [ObjectMatchers](#object-matchers) | `ObjectMatchers`    |          |         |                                         |         |
-| provenance          | [Provenance](#provenance)          | `Provenance`        |          |         |                                         |         |
-| receiver            | string                             | `string`            |          |         |                                         |         |
-| repeat_interval     | string                             | `string`            |          |         |                                         |         |
-| routes              | [][Route](#route)                  | `[]*Route`          |          |         |                                         |         |
-
-{{% /responsive-table %}}
-
-### <span id="route-export"></span> RouteExport
-
-> RouteExport is the provisioned file export of definitions.Route. This is needed to hide fields that aren't usable in
-> provisioning file format. An alternative would be to define a custom MarshalJSON and MarshalYAML that excludes them.
-
-**Properties**
-
-| Name                | Type                               | Go type             | Required | Default | Description                             | Example |
-| ------------------- | ---------------------------------- | ------------------- | :------: | ------- | --------------------------------------- | ------- |
-| continue            | boolean                            | `bool`              |          |         |                                         |         |
-| group_by            | []string                           | `[]string`          |          |         |                                         |         |
-| group_interval      | string                             | `string`            |          |         |                                         |         |
-| group_wait          | string                             | `string`            |          |         |                                         |         |
-| match               | map of string                      | `map[string]string` |          |         | Deprecated. Remove before v1.0 release. |         |
-| match_re            | [MatchRegexps](#match-regexps)     | `MatchRegexps`      |          |         |                                         |         |
-| matchers            | [Matchers](#matchers)              | `Matchers`          |          |         |                                         |         |
-| mute_time_intervals | []string                           | `[]string`          |          |         |                                         |         |
-| object_matchers     | [ObjectMatchers](#object-matchers) | `ObjectMatchers`    |          |         |                                         |         |
-| receiver            | string                             | `string`            |          |         |                                         |         |
-| repeat_interval     | string                             | `string`            |          |         |                                         |         |
-| routes              | [][RouteExport](#route-export)     | `[]*RouteExport`    |          |         |                                         |         |
-
-### <span id="time-interval"></span> TimeInterval
-
-> TimeInterval describes intervals of time. ContainsTime will tell you if a golang time is contained
-> within the interval.
-
-**Properties**
-
-{{% responsive-table %}}
-
-| Name          | Type                       | Go type        | Required | Default | Description | Example |
-| ------------- | -------------------------- | -------------- | :------: | ------- | ----------- | ------- |
-| days_of_month | []string                   | `[]string`     |          |         |             |         |
-| location      | string                     | `string`       |          |         |             |         |
-| months        | []string                   | `[]string`     |          |         |             |         |
-| times         | [][TimeRange](#time-range) | `[]*TimeRange` |          |         |             |         |
-| weekdays      | []string                   | `[]string`     |          |         |             |         |
-| years         | []string                   | `[]string`     |          |         |             |         |
-
-{{% /responsive-table %}}
-
-### <span id="time-range"></span> TimeRange
-
-> For example, 4:00PM to End of the day would Begin at 1020 and End at 1440.
-
-**Properties**
-
-{{% responsive-table %}}
-
-| Name        | Type                      | Go type | Required | Default | Description | Example |
-| ----------- | ------------------------- | ------- | :------: | ------- | ----------- | ------- |
-| EndMinute   | int64 (formatted integer) | `int64` |          |         |             |         |
-| StartMinute | int64 (formatted integer) | `int64` |          |         |             |         |
-
-{{% /responsive-table %}}
-
-### <span id="validation-error"></span> ValidationError
-
-**Properties**
-
-{{% responsive-table %}}
-
-| Name | Type   | Go type  | Required | Default | Description | Example         |
-| ---- | ------ | -------- | :------: | ------- | ----------- | --------------- |
-| msg  | string | `string` |          |         |             | `error message` |
-
-{{% /responsive-table %}}
+{{< docs/shared lookup="alerts/alerting_provisioning.md" source="grafana" version="latest" >}}
diff --git a/docs/sources/developers/http_api/annotations.md b/docs/sources/developers/http_api/annotations.md
index 337bb230886a0..4d58b32a8298d 100644
--- a/docs/sources/developers/http_api/annotations.md
+++ b/docs/sources/developers/http_api/annotations.md
@@ -189,7 +189,7 @@ Content-Type: application/json
   "what": "Event - deploy",
   "tags": ["deploy", "production"],
   "when": 1467844481,
-  "data": "deploy of master branch happened at Wed Jul 6 22:34:41 UTC 2016"
+  "data": "deploy of main branch happened at Wed Jul 6 22:34:41 UTC 2016"
 }
 ```
 
diff --git a/docs/sources/developers/http_api/auth.md b/docs/sources/developers/http_api/auth.md
index e5db624f239d4..dfa53b051d910 100644
--- a/docs/sources/developers/http_api/auth.md
+++ b/docs/sources/developers/http_api/auth.md
@@ -19,72 +19,15 @@ title: 'Authentication HTTP API '
 
 # Authentication API
 
-> If you are running Grafana Enterprise, for some endpoints you would need to have relevant permissions. Refer to [Role-based access control permissions]({{< relref "../../administration/roles-and-permissions/access-control/custom-role-actions-scopes/" >}}) for more information.
-
-## Tokens
-
-Currently, you can authenticate via an `API Token` or via a `Session cookie` (acquired using regular login or OAuth).
-
-## X-Grafana-Org-Id Header
-
-**X-Grafana-Org-Id** is an optional property that specifies the organization to which the action is applied. If it is not set, the created key belongs to the current context org. Use this header in all requests except those regarding admin.
-
-**Example Request**:
-
-```http
-POST /api/auth/keys HTTP/1.1
-Accept: application/json
-Content-Type: application/json
-X-Grafana-Org-Id: 2
-Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
-
-{
-  "name": "mykey",
-  "role": "Admin",
-  "secondsToLive": 86400
-}
-```
+The Authentication HTTP API is used to manage API keys.
 
-## Basic Auth
+{{% admonition type="note" %}}
+If you use Grafana v9.1 or newer, use service accounts instead of API keys. For more information, refer to [Grafana service account API reference]({{< relref "./serviceaccount/" >}}).
+{{% /admonition %}}
 
-If basic auth is enabled (it is enabled by default), then you can authenticate your HTTP request via
-standard basic auth. Basic auth will also authenticate LDAP users.
-
-curl example:
-
-```bash
-curl http://admin:admin@localhost:3000/api/org
-{"id":1,"name":"Main Org."}
-```
-
-## Create API Token
-
-Open the sidemenu and click the organization dropdown and select the `API Keys` option.
-
-You use the token in all requests in the `Authorization` header, like this:
-
-**Example**:
-
-```http
-GET http://your.grafana.com/api/dashboards/db/mydash HTTP/1.1
-Accept: application/json
-Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
-```
-
-The `Authorization` header value should be `Bearer <your api key>`.
-
-The API Token can also be passed as a Basic authorization password with the special username `api_key`:
-
-curl example:
-
-```bash
-curl http://api_key:eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk@localhost:3000/api/org
-{"id":1,"name":"Main Org."}
-```
-
-# Auth HTTP resources / actions
+> If you are running Grafana Enterprise, for some endpoints you would need to have relevant permissions. Refer to [Role-based access control permissions]({{< relref "../../administration/roles-and-permissions/access-control/custom-role-actions-scopes/" >}}) for more information.
 
-## Api Keys
+## List API keys
 
 `GET /api/auth/keys`
 
diff --git a/docs/sources/developers/http_api/create-api-tokens-for-org.md b/docs/sources/developers/http_api/create-api-tokens-for-org.md
index 1e3a1ebeb1885..aa047898da2d8 100644
--- a/docs/sources/developers/http_api/create-api-tokens-for-org.md
+++ b/docs/sources/developers/http_api/create-api-tokens-for-org.md
@@ -14,11 +14,11 @@ labels:
   products:
     - enterprise
     - oss
-title: 'API Tutorial: Create API tokens and dashboards for an organization'
+title: 'API Tutorial: Create Service Account tokens and dashboards for an organization'
 weight: 150
 ---
 
-# Create API tokens and dashboards for an organization
+# Create Service Account tokens and dashboards for an organization
 
 Use the Grafana API to set up new Grafana organizations or to add dynamically generated dashboards to an existing organization.
 
@@ -27,9 +27,9 @@ Use the Grafana API to set up new Grafana organizations or to add dynamically ge
 There are two authentication methods to access the API:
 
 - Basic authentication: A Grafana Admin user can access some parts of the Grafana API through basic authentication.
-- API Tokens: All organization actions are accessed through an API Token. An API Token is associated with an organization. It can be used to create dashboards and other components specific for that organization.
+- Service Account tokens: All organization actions can be accessed through a Service Account token. A Service Account token is associated with an organization. It can be used to create dashboards and other components specific for that organization.
 
-## How to create a new organization and an API Token
+## How to create a new organization and a Service Account Token
 
 The task is to create a new organization and then add a Token that can be used by other users. In the examples below which use basic auth, the user is `admin` and the password is `admin`.
 
@@ -53,13 +53,30 @@ The task is to create a new organization and then add a Token that can be used b
    curl -X POST http://admin:admin@localhost:3000/api/user/using/<id of new org>
    ```
 
-1. [Create the API token](http://docs.grafana.org/http_api/auth/#create-api-key):
+1. [Create a Service Account]({{< relref "./serviceaccount/#create-service-account" >}}):
 
    ```bash
-   curl -X POST -H "Content-Type: application/json" -d '{"name":"apikeycurl", "role": "Admin"}' http://admin:admin@localhost:3000/api/auth/keys
+   curl -X POST -H "Content-Type: application/json" -d '{"name":"test", "role": "Admin"}' http://admin:admin@localhost:3000/api/serviceaccounts
    ```
 
-   This should return a response: `{"name":"apikeycurl","key":"eyJrIjoiR0ZXZmt1UFc0OEpIOGN5RWdUalBJTllUTk83VlhtVGwiLCJuIjoiYXBpa2V5Y3VybCIsImlkIjo2fQ=="}`.
+1. [Create a Service Account token]({{< relref "./serviceaccount/#create-service-account-tokens" >}}) for the service account created in the previous step:
+
+   ```bash
+   curl -X POST -H "Content-Type: application/json" -d '{"name":"test-token"}' http://admin:admin@localhost:3000/api/serviceaccounts/<service account id>/tokens
+   ```
+
+   This should return a response:
+
+   ```http
+   HTTP/1.1 200
+   Content-Type: application/json
+
+   {
+     "id": 7,
+     "name": "test-token",
+     "key": "eyJrIjoiVjFxTHZ6dGdPSjg5Um92MjN1RlhjMkNqYkZUbm9jYkwiLCJuIjoiZ3JhZmFuYSIsImlkIjoxfQ=="
+   }
+   ```
 
    Save the key returned here in your password manager as it is not possible to fetch again it in the future.
 
diff --git a/docs/sources/developers/http_api/dashboard.md b/docs/sources/developers/http_api/dashboard.md
index 05dcb8294c4c2..c818e470929cd 100644
--- a/docs/sources/developers/http_api/dashboard.md
+++ b/docs/sources/developers/http_api/dashboard.md
@@ -37,6 +37,8 @@ The uid can have a maximum length of 40 characters.
 
 Creates a new dashboard or updates an existing dashboard. When updating existing dashboards, if you do not define the `folderId` or the `folderUid` property, then the dashboard(s) are moved to the root level. (You need to define only one property, not both).
 
+> **Note:** This endpoint is not intended for creating folders, use `POST /api/folders` for that.
+
 **Required permissions**
 
 See note in the [introduction]({{< ref "#dashboard-api" >}}) for an explanation.
diff --git a/docs/sources/developers/http_api/dashboard_public.md b/docs/sources/developers/http_api/dashboard_public.md
index 5815672230273..d0f1980c6b04e 100644
--- a/docs/sources/developers/http_api/dashboard_public.md
+++ b/docs/sources/developers/http_api/dashboard_public.md
@@ -111,7 +111,9 @@ Content-Length: 107
 
 ## Update a public dashboard
 
-`PATCH /api/dashboards/uid/:uid/public-dashboards/`
+`PATCH /api/dashboards/uid/:uid/public-dashboards/:publicDashboardUid`
+
+Will update the public dashboard given the specified unique identifier (uid).
 
 **Required permissions**
 
@@ -124,7 +126,7 @@ See note in the [introduction](#public-dashboard-api) for an explanation.
 **Example Request for updating a public dashboard**:
 
 ```http
-PATCH /api/dashboards/uid/xCpsVuc4z/public-dashboards/ HTTP/1.1
+PATCH /api/dashboards/uid/xCpsVuc4z/public-dashboards/cd56d9fd-f3d4-486d-afba-a21760e2acbe HTTP/1.1
 Accept: application/json
 Content-Type: application/json
 Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
@@ -205,7 +207,7 @@ See note in the [introduction](#public-dashboard-api) for an explanation.
 **Example Request**:
 
 ```http
-GET /api/dashboards/uid/xCpsVuc4z HTTP/1.1
+GET /api/dashboards/uid/xCpsVuc4z/public-dashboards/ HTTP/1.1
 Accept: application/json
 Content-Type: application/json
 Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
diff --git a/docs/sources/developers/http_api/folder.md b/docs/sources/developers/http_api/folder.md
index 12087d1acc8c7..aaae48dc48685 100644
--- a/docs/sources/developers/http_api/folder.md
+++ b/docs/sources/developers/http_api/folder.md
@@ -160,7 +160,8 @@ Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
 
 {
   "uid": "nErXDvCkzz",
-  "title": "Department ABC"
+  "title": "Department ABC",
+  "parentUid": "fgnj5e52gel76g"
 }
 ```
 
@@ -168,6 +169,7 @@ JSON Body schema:
 
 - **uid** – Optional [unique identifier]({{< ref "#identifier-id-vs-unique-identifier-uid" >}}).
 - **title** – The title of the folder.
+- **parentUid** - Optional field, the unique identifier of the parent folder under which the folder should be created. Requires nested folders to be enabled.
 
 **Example Response**:
 
diff --git a/docs/sources/developers/http_api/folder_dashboard_search.md b/docs/sources/developers/http_api/folder_dashboard_search.md
index 13becff4d0ef6..fc97317bbaf51 100644
--- a/docs/sources/developers/http_api/folder_dashboard_search.md
+++ b/docs/sources/developers/http_api/folder_dashboard_search.md
@@ -34,7 +34,7 @@ Query parameters:
 - **dashboardIds** – List of dashboard id's to search for
 - **dashboardUID** - List of dashboard uid's to search for, It is deprecated since Grafana v9.1, please use dashboardUIDs instead
 - **dashboardUIDs** – List of dashboard uid's to search for
-- **folderIds** – List of folder id's to search in for dashboards
+- **folderUIDs** – List of folder UIDs to search in
 - **starred** – Flag indicating if only starred Dashboards should be returned
 - **limit** – Limit the number of returned results (max is 5000; default is 1000)
 - **page** – Use this parameter to access hits beyond limit. Numbering starts at 1. limit param acts as page size. Only available in Grafana v6.2+.
@@ -42,7 +42,7 @@ Query parameters:
 **Example request for retrieving folders and dashboards at the root level**:
 
 ```http
-GET /api/search?folderIds=0&query=&starred=false HTTP/1.1
+GET /api/search?query=&starred=false HTTP/1.1
 Accept: application/json
 Content-Type: application/json
 Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
diff --git a/docs/sources/developers/http_api/reporting.md b/docs/sources/developers/http_api/reporting.md
index d1f1d794716dd..871775fe15a05 100644
--- a/docs/sources/developers/http_api/reporting.md
+++ b/docs/sources/developers/http_api/reporting.md
@@ -241,7 +241,7 @@ Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
 				"to": "2022-09-02T17:00:00+02:00"
 			},
 			"reportVariables": {
-				"varibale1": "Value1"
+				"variable1": "Value1"
 			}
 		}
 	],
@@ -354,7 +354,7 @@ Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
 				"to": "2022-09-02T17:00:00+02:00"
 			},
 			"reportVariables": {
-				"varibale1": "Value1"
+				"variable1": "Value1"
 			}
 		}
 	],
@@ -647,7 +647,7 @@ Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
 				"to": "2022-09-02T17:00:00+02:00"
 			},
 			"reportVariables": {
-				"varibale1": "Value1"
+				"variable1": "Value1"
 			}
 		}
 	],
diff --git a/docs/sources/developers/http_api/serviceaccount.md b/docs/sources/developers/http_api/serviceaccount.md
index 8dff8a38d9052..15e424cf151f5 100644
--- a/docs/sources/developers/http_api/serviceaccount.md
+++ b/docs/sources/developers/http_api/serviceaccount.md
@@ -19,6 +19,7 @@ title: Service account HTTP API
 # Service account API
 
 > If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "/docs/grafana/latest/administration/roles-and-permissions/access-control/custom-role-actions-scopes" >}}) for more information.
+> For Grafana Cloud instances, please use a Bearer token to authenticate. The examples within this section reference Basic authentication which is for On-Prem Grafana instances.
 
 ## Search service accounts with Paging
 
diff --git a/docs/sources/developers/http_api/sso-settings.md b/docs/sources/developers/http_api/sso-settings.md
new file mode 100644
index 0000000000000..c7c8a343a3a3d
--- /dev/null
+++ b/docs/sources/developers/http_api/sso-settings.md
@@ -0,0 +1,231 @@
+---
+aliases:
+  - ../../http_api/sso-settings/
+  - ../../http_api/ssosettings/
+canonical: /docs/grafana/latest/developers/http_api/sso-settings/
+description: Grafana SSO Settings API
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+  - sso
+  - sso-settings
+labels:
+  products:
+    - enterprise
+    - oss
+title: SSO Settings API
+---
+
+# SSO Settings API
+
+> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "/docs/grafana/latest/administration/roles-and-permissions/access-control/custom-role-actions-scopes" >}}) for more information.
+
+{{% admonition type="note" %}}
+Available in Public Preview in Grafana 10.4 and on Grafana Cloud behind the `ssoSettingsApi` feature toggle.
+{{% /admonition %}}
+
+The API can be used to create, update, delete, get, and list SSO Settings.
+
+## List SSO Settings
+
+`GET /api/v1/sso-settings`
+
+Lists the SSO Settings for all providers.
+
+**Required permissions**
+
+See note in the [introduction]({{< ref "#sso-settings" >}}) for an explanation.
+
+| Action          | Scope                        |
+| --------------- | ---------------------------- |
+| `settings:read` | `settings:auth.{provider}:*` |
+
+**Example Request**:
+
+```http
+GET /api/v1/sso-settings HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200
+Content-Type: application/json
+[
+  {
+    "id":        "1",
+    "provider":  "github",
+    "settings": {
+      "apiUrl": "https://api.github.com/user",
+      "clientId": "my_github_client",
+      "clientSecret": "*********",
+      "enabled": true,
+      "scopes": "user:email,read:org"
+      // rest of the settings
+    },
+    "source":    "system",
+  },
+  {
+    "id":        "2",
+    "provider":  "azuread",
+    "settings": {
+      "authUrl": "https://login.microsoftonline.com/00000000-0000-0000-0000-000000000000/oauth2/v2.0/authorize",
+      "clientId": "my_azuread_client",
+      "clientSecret": "*********",
+      "enabled": true,
+      "scopes": "openid,email,profile"
+      // rest of the settings
+    },
+    "source":    "system",
+  }
+]
+```
+
+Status Codes:
+
+- **200** – SSO Settings found
+- **400** – Bad Request
+- **401** – Unauthorized
+- **403** – Access Denied
+
+## Get SSO Settings
+
+`GET /api/v1/sso-settings/:provider`
+
+Gets the SSO Settings for a provider.
+
+**Required permissions**
+
+See note in the [introduction]({{< ref "#sso-settings" >}}) for an explanation.
+
+| Action          | Scope                        |
+| --------------- | ---------------------------- |
+| `settings:read` | `settings:auth.{provider}:*` |
+
+**Example Request**:
+
+```http
+GET /api/v1/sso-settings/github HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200
+Content-Type: application/json
+ETag: db87f729761898ee
+{
+  "id":        "1",
+  "provider":  "github",
+  "settings": {
+    "apiUrl": "https://api.github.com/user",
+    "clientId": "my_github_client",
+    "clientSecret": "*********",
+    "enabled": true,
+    "scopes": "user:email,read:org"
+    // rest of the settings
+  },
+  "source":    "system",
+}
+```
+
+Status Codes:
+
+- **200** – SSO Settings found
+- **400** – Bad Request
+- **401** – Unauthorized
+- **403** – Access Denied
+- **404** – SSO Settings not found
+
+## Update SSO Settings
+
+`PUT /api/v1/sso-settings/:provider`
+
+Updates the SSO Settings for a provider.
+
+**Required permissions**
+
+See note in the [introduction]({{< ref "#sso-settings" >}}) for an explanation.
+
+| Action           | Scope                        |
+| ---------------- | ---------------------------- |
+| `settings:write` | `settings:auth.{provider}:*` |
+
+**Example Request**:
+
+```http
+PUT /api/v1/sso-settings/github HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+
+{
+  "settings": {
+    "apiUrl": "https://api.github.com/user",
+    "clientId": "my_github_client",
+    "clientSecret": "my_github_secret",
+    "enabled": true,
+    "scopes": "user:email,read:org"
+  }
+}
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 204
+Content-Type: application/json
+```
+
+Status Codes:
+
+- **204** – SSO Settings updated
+- **400** – Bad Request
+- **401** – Unauthorized
+- **403** – Access Denied
+
+## Delete SSO Settings
+
+`DELETE /api/v1/sso-settings/:provider`
+
+Deletes an existing SSO Settings entry for a provider.
+
+**Required permissions**
+
+See note in the [introduction]({{< ref "#sso-settings" >}}) for an explanation.
+
+| Action           | Scope                        |
+| ---------------- | ---------------------------- |
+| `settings:write` | `settings:auth.{provider}:*` |
+
+**Example Request**:
+
+```http
+DELETE /api/v1/sso-settings/azuread HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 204
+Content-Type: application/json
+```
+
+Status Codes:
+
+- **204** – SSO Settings deleted
+- **400** – Bad Request
+- **401** – Unauthorized
+- **403** – Access Denied
+- **404** – SSO Settings not found
diff --git a/docs/sources/developers/http_api/user.md b/docs/sources/developers/http_api/user.md
index 1443f72b1b44c..37c64bffa24a1 100644
--- a/docs/sources/developers/http_api/user.md
+++ b/docs/sources/developers/http_api/user.md
@@ -66,7 +66,7 @@ Content-Type: application/json
     "isAdmin": true,
     "isDisabled": false,
     "lastSeenAt": "2020-04-10T20:29:27+03:00",
-    "lastSeenAtAge': "2m",
+    "lastSeenAtAge": "2m",
     "authLabels": ["OAuth"]
   },
   {
diff --git a/docs/sources/developers/kinds/_index.md b/docs/sources/developers/kinds/_index.md
deleted file mode 100644
index de9fa0e3fb1cc..0000000000000
--- a/docs/sources/developers/kinds/_index.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-_build:
-  list: false
-labels:
-  products:
-  - enterprise
-  - oss
-title: Grafana schema
-weight: 200
----
-
-# Grafana schema
-
-> Grafana’s schemas, kind system and related code generation are in active development.
-
-Grafana is moving to a schema-centric model of development, where schemas are the single source of truth that specify
-the shape of objects - for example, dashboards, datasources, users - in the frontend, backend, and plugin code.
-Eventually, all of Grafana’s object types will be schematized within the “Kind System.” Kinds, their schemas, the Kind
-system rules, and associated code generators will collectively provide a clear, consistent foundation for Grafana’s
-APIs, documentation, persistent storage, clients, as-code tooling, and so forth.
-
-It’s exciting to imagine the possibilities that a crisp, consistent development workflow will enable - this is why
-companies build [developer platforms](https://internaldeveloperplatform.org/)! At the same time, it’s also
-overwhelming - any schema system that can meet Grafana’s complex requirements will necessarily have a lot of moving
-parts. Additionally, we must account for having Grafana continue to work as we make the transition - a prerequisite
-for every large-scale refactoring.
-
-In the Grafana ecosystem, there are three basic Kind categories and associated schema categories:
-
-- [Core Kinds]({{< relref "core/" >}})
-- Custom Kinds
-- [Composable Kinds]({{< relref "composable/" >}})
-
-The schema authoring workflow for each varies, as does the path to maturity.
-[Grafana Kinds - From Zero to Maturity]({{< relref "maturity/" >}}) contains general reference material applicable to
-all Kind-writing, and links to the guides for each category of Kind.
diff --git a/docs/sources/developers/kinds/composable/_index.md b/docs/sources/developers/kinds/composable/_index.md
deleted file mode 100644
index 14e40cd6a3f01..0000000000000
--- a/docs/sources/developers/kinds/composable/_index.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-labels:
-  products:
-  - enterprise
-  - oss
-title: Composable kinds
-weight: 200
----
-
-# Grafana composable kinds
-
-{{< section >}}
diff --git a/docs/sources/developers/kinds/composable/alertgroups/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/alertgroups/panelcfg/schema-reference.md
deleted file mode 100644
index 8d69846cf2678..0000000000000
--- a/docs/sources/developers/kinds/composable/alertgroups/panelcfg/schema-reference.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: AlertGroupsPanelCfg kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## AlertGroupsPanelCfg
-
-#### Maturity: [merged](../../../maturity/#merged)
-#### Version: 0.0
-
-
-
-| Property  | Type               | Required | Default | Description |
-|-----------|--------------------|----------|---------|-------------|
-| `Options` | [object](#options) | **Yes**  |         |             |
-
-### Options
-
-| Property       | Type    | Required | Default | Description                                                 |
-|----------------|---------|----------|---------|-------------------------------------------------------------|
-| `alertmanager` | string  | **Yes**  |         | Name of the alertmanager used as a source for alerts        |
-| `expandAll`    | boolean | **Yes**  |         | Expand all alert groups by default                          |
-| `labels`       | string  | **Yes**  |         | Comma-separated list of values used to filter alert results |
-
-
diff --git a/docs/sources/developers/kinds/composable/annotationslist/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/annotationslist/panelcfg/schema-reference.md
deleted file mode 100644
index eb739f4509d5b..0000000000000
--- a/docs/sources/developers/kinds/composable/annotationslist/panelcfg/schema-reference.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: AnnotationsListPanelCfg kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## AnnotationsListPanelCfg
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property  | Type               | Required | Default | Description |
-|-----------|--------------------|----------|---------|-------------|
-| `Options` | [object](#options) | **Yes**  |         |             |
-
-### Options
-
-| Property                | Type     | Required | Default | Description |
-|-------------------------|----------|----------|---------|-------------|
-| `limit`                 | uint32   | **Yes**  | `10`    |             |
-| `navigateAfter`         | string   | **Yes**  | `10m`   |             |
-| `navigateBefore`        | string   | **Yes**  | `10m`   |             |
-| `navigateToPanel`       | boolean  | **Yes**  | `true`  |             |
-| `onlyFromThisDashboard` | boolean  | **Yes**  | `false` |             |
-| `onlyInTimeRange`       | boolean  | **Yes**  | `false` |             |
-| `showTags`              | boolean  | **Yes**  | `true`  |             |
-| `showTime`              | boolean  | **Yes**  | `true`  |             |
-| `showUser`              | boolean  | **Yes**  | `true`  |             |
-| `tags`                  | string[] | **Yes**  |         |             |
-
-
diff --git a/docs/sources/developers/kinds/composable/azuremonitor/dataquery/schema-reference.md b/docs/sources/developers/kinds/composable/azuremonitor/dataquery/schema-reference.md
deleted file mode 100644
index 7c8f824177899..0000000000000
--- a/docs/sources/developers/kinds/composable/azuremonitor/dataquery/schema-reference.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: AzureMonitorDataQuery kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## AzureMonitorDataQuery
-
-#### Maturity: [merged](../../../maturity/#merged)
-#### Version: 0.0
-
-
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-
diff --git a/docs/sources/developers/kinds/composable/barchart/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/barchart/panelcfg/schema-reference.md
deleted file mode 100644
index e07747b77e674..0000000000000
--- a/docs/sources/developers/kinds/composable/barchart/panelcfg/schema-reference.md
+++ /dev/null
@@ -1,181 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: BarChartPanelCfg kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## BarChartPanelCfg
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property      | Type                   | Required | Default | Description |
-|---------------|------------------------|----------|---------|-------------|
-| `FieldConfig` | [object](#fieldconfig) | **Yes**  |         |             |
-| `Options`     | [object](#options)     | **Yes**  |         |             |
-
-### FieldConfig
-
-It extends [AxisConfig](#axisconfig) and [HideableFieldConfig](#hideablefieldconfig).
-
-| Property            | Type                                                      | Required | Default | Description                                                                                                                                                                                                      |
-|---------------------|-----------------------------------------------------------|----------|---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `axisBorderShow`    | boolean                                                   | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                     |
-| `axisCenteredZero`  | boolean                                                   | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                     |
-| `axisColorMode`     | string                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*<br/>TODO docs<br/>Possible values are: `text`, `series`.                                                                                                            |
-| `axisGridShow`      | boolean                                                   | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                     |
-| `axisLabel`         | string                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                     |
-| `axisPlacement`     | string                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*<br/>TODO docs<br/>Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`.                                                                          |
-| `axisSoftMax`       | number                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                     |
-| `axisSoftMin`       | number                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                     |
-| `axisWidth`         | number                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                     |
-| `fillOpacity`       | integer                                                   | No       | `80`    | Controls the fill opacity of the bars.<br/>Constraint: `>=0 & <=100`.                                                                                                                                            |
-| `gradientMode`      | string                                                    | No       |         | Set the mode of the gradient fill. Fill gradient is based on the line color. To change the color, use the standard color scheme field option.<br/>Gradient appearance is influenced by the Fill opacity setting. |
-| `hideFrom`          | [HideSeriesConfig](#hideseriesconfig)                     | No       |         | *(Inherited from [HideableFieldConfig](#hideablefieldconfig))*<br/>TODO docs                                                                                                                                     |
-| `lineWidth`         | integer                                                   | No       | `1`     | Controls line width of the bars.<br/>Constraint: `>=0 & <=10`.                                                                                                                                                   |
-| `scaleDistribution` | [ScaleDistributionConfig](#scaledistributionconfig)       | No       |         | *(Inherited from [AxisConfig](#axisconfig))*<br/>TODO docs                                                                                                                                                       |
-| `thresholdsStyle`   | [GraphThresholdsStyleConfig](#graphthresholdsstyleconfig) | No       |         | TODO docs                                                                                                                                                                                                        |
-
-### AxisConfig
-
-TODO docs
-
-| Property            | Type                                                | Required | Default | Description                                                                            |
-|---------------------|-----------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------|
-| `axisBorderShow`    | boolean                                             | No       |         |                                                                                        |
-| `axisCenteredZero`  | boolean                                             | No       |         |                                                                                        |
-| `axisColorMode`     | string                                              | No       |         | TODO docs<br/>Possible values are: `text`, `series`.                                   |
-| `axisGridShow`      | boolean                                             | No       |         |                                                                                        |
-| `axisLabel`         | string                                              | No       |         |                                                                                        |
-| `axisPlacement`     | string                                              | No       |         | TODO docs<br/>Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. |
-| `axisSoftMax`       | number                                              | No       |         |                                                                                        |
-| `axisSoftMin`       | number                                              | No       |         |                                                                                        |
-| `axisWidth`         | number                                              | No       |         |                                                                                        |
-| `scaleDistribution` | [ScaleDistributionConfig](#scaledistributionconfig) | No       |         | TODO docs                                                                              |
-
-### ScaleDistributionConfig
-
-TODO docs
-
-| Property          | Type   | Required | Default | Description                                                              |
-|-------------------|--------|----------|---------|--------------------------------------------------------------------------|
-| `type`            | string | **Yes**  |         | TODO docs<br/>Possible values are: `linear`, `log`, `ordinal`, `symlog`. |
-| `linearThreshold` | number | No       |         |                                                                          |
-| `log`             | number | No       |         |                                                                          |
-
-### GraphThresholdsStyleConfig
-
-TODO docs
-
-| Property | Type   | Required | Default | Description                                                                                               |
-|----------|--------|----------|---------|-----------------------------------------------------------------------------------------------------------|
-| `mode`   | string | **Yes**  |         | TODO docs<br/>Possible values are: `off`, `line`, `dashed`, `area`, `line+area`, `dashed+area`, `series`. |
-
-### HideSeriesConfig
-
-TODO docs
-
-| Property  | Type    | Required | Default | Description |
-|-----------|---------|----------|---------|-------------|
-| `legend`  | boolean | **Yes**  |         |             |
-| `tooltip` | boolean | **Yes**  |         |             |
-| `viz`     | boolean | **Yes**  |         |             |
-
-### HideableFieldConfig
-
-TODO docs
-
-| Property   | Type                                  | Required | Default | Description |
-|------------|---------------------------------------|----------|---------|-------------|
-| `hideFrom` | [HideSeriesConfig](#hideseriesconfig) | No       |         | TODO docs   |
-
-### Options
-
-It extends [OptionsWithLegend](#optionswithlegend) and [OptionsWithTooltip](#optionswithtooltip) and [OptionsWithTextFormatting](#optionswithtextformatting).
-
-| Property              | Type                                            | Required | Default | Description                                                                                                      |
-|-----------------------|-------------------------------------------------|----------|---------|------------------------------------------------------------------------------------------------------------------|
-| `barWidth`            | number                                          | **Yes**  | `0.97`  | Controls the width of bars. 1 = Max width, 0 = Min width.<br/>Constraint: `>=0 & <=1`.                           |
-| `fullHighlight`       | boolean                                         | **Yes**  | `false` | Enables mode which highlights the entire bar area and shows tooltip when cursor<br/>hovers over highlighted area |
-| `groupWidth`          | number                                          | **Yes**  | `0.7`   | Controls the width of groups. 1 = max with, 0 = min width.<br/>Constraint: `>=0 & <=1`.                          |
-| `legend`              | [VizLegendOptions](#vizlegendoptions)           | **Yes**  |         | *(Inherited from [OptionsWithLegend](#optionswithlegend))*<br/>TODO docs                                         |
-| `orientation`         | string                                          | **Yes**  |         | Controls the orientation of the bar chart, either vertical or horizontal.                                        |
-| `showValue`           | string                                          | **Yes**  |         | This controls whether values are shown on top or to the left of bars.                                            |
-| `stacking`            | string                                          | **Yes**  |         | Controls whether bars are stacked or not, either normally or in percent mode.                                    |
-| `tooltip`             | [VizTooltipOptions](#viztooltipoptions)         | **Yes**  |         | *(Inherited from [OptionsWithTooltip](#optionswithtooltip))*<br/>TODO docs                                       |
-| `xTickLabelMaxLength` | integer                                         | **Yes**  |         | Sets the max length that a label can have before it is truncated.<br/>Constraint: `>=0 & <=2147483647`.          |
-| `xTickLabelRotation`  | integer                                         | **Yes**  | `0`     | Controls the rotation of the x axis labels.<br/>Constraint: `>=-90 & <=90`.                                      |
-| `barRadius`           | number                                          | No       | `0`     | Controls the radius of each bar.<br/>Constraint: `>=0 & <=0.5`.                                                  |
-| `colorByField`        | string                                          | No       |         | Use the color value for a sibling field to color each bar value.                                                 |
-| `text`                | [VizTextDisplayOptions](#viztextdisplayoptions) | No       |         | *(Inherited from [OptionsWithTextFormatting](#optionswithtextformatting))*<br/>TODO docs                         |
-| `xField`              | string                                          | No       |         | Manually select which field from the dataset to represent the x field.                                           |
-| `xTickLabelSpacing`   | int32                                           | No       | `0`     | Controls the spacing between x axis labels.<br/>negative values indicate backwards skipping behavior             |
-
-### OptionsWithLegend
-
-TODO docs
-
-| Property | Type                                  | Required | Default | Description |
-|----------|---------------------------------------|----------|---------|-------------|
-| `legend` | [VizLegendOptions](#vizlegendoptions) | **Yes**  |         | TODO docs   |
-
-### VizLegendOptions
-
-TODO docs
-
-| Property      | Type     | Required | Default | Description                                                                                                                             |
-|---------------|----------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| `calcs`       | string[] | **Yes**  |         |                                                                                                                                         |
-| `displayMode` | string   | **Yes**  |         | TODO docs<br/>Note: "hidden" needs to remain as an option for plugins compatibility<br/>Possible values are: `list`, `table`, `hidden`. |
-| `placement`   | string   | **Yes**  |         | TODO docs<br/>Possible values are: `bottom`, `right`.                                                                                   |
-| `showLegend`  | boolean  | **Yes**  |         |                                                                                                                                         |
-| `asTable`     | boolean  | No       |         |                                                                                                                                         |
-| `isVisible`   | boolean  | No       |         |                                                                                                                                         |
-| `sortBy`      | string   | No       |         |                                                                                                                                         |
-| `sortDesc`    | boolean  | No       |         |                                                                                                                                         |
-| `width`       | number   | No       |         |                                                                                                                                         |
-
-### OptionsWithTextFormatting
-
-TODO docs
-
-| Property | Type                                            | Required | Default | Description |
-|----------|-------------------------------------------------|----------|---------|-------------|
-| `text`   | [VizTextDisplayOptions](#viztextdisplayoptions) | No       |         | TODO docs   |
-
-### VizTextDisplayOptions
-
-TODO docs
-
-| Property    | Type   | Required | Default | Description              |
-|-------------|--------|----------|---------|--------------------------|
-| `titleSize` | number | No       |         | Explicit title text size |
-| `valueSize` | number | No       |         | Explicit value text size |
-
-### OptionsWithTooltip
-
-TODO docs
-
-| Property  | Type                                    | Required | Default | Description |
-|-----------|-----------------------------------------|----------|---------|-------------|
-| `tooltip` | [VizTooltipOptions](#viztooltipoptions) | **Yes**  |         | TODO docs   |
-
-### VizTooltipOptions
-
-TODO docs
-
-| Property | Type   | Required | Default | Description                                                   |
-|----------|--------|----------|---------|---------------------------------------------------------------|
-| `mode`   | string | **Yes**  |         | TODO docs<br/>Possible values are: `single`, `multi`, `none`. |
-| `sort`   | string | **Yes**  |         | TODO docs<br/>Possible values are: `asc`, `desc`, `none`.     |
-
-
diff --git a/docs/sources/developers/kinds/composable/bargauge/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/bargauge/panelcfg/schema-reference.md
deleted file mode 100644
index 9109f367bd40a..0000000000000
--- a/docs/sources/developers/kinds/composable/bargauge/panelcfg/schema-reference.md
+++ /dev/null
@@ -1,81 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: BarGaugePanelCfg kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## BarGaugePanelCfg
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property  | Type               | Required | Default | Description |
-|-----------|--------------------|----------|---------|-------------|
-| `Options` | [object](#options) | **Yes**  |         |             |
-
-### Options
-
-It extends [SingleStatBaseOptions](#singlestatbaseoptions).
-
-| Property        | Type                                            | Required | Default | Description                                                                                                                                   |
-|-----------------|-------------------------------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------------|
-| `displayMode`   | string                                          | **Yes**  |         | Enum expressing the possible display modes<br/>for the bar gauge component of Grafana UI<br/>Possible values are: `basic`, `lcd`, `gradient`. |
-| `minVizHeight`  | uint32                                          | **Yes**  | `10`    |                                                                                                                                               |
-| `minVizWidth`   | uint32                                          | **Yes**  | `0`     |                                                                                                                                               |
-| `namePlacement` | string                                          | **Yes**  |         | Allows for the bar gauge name to be placed explicitly<br/>Possible values are: `auto`, `top`, `left`.                                         |
-| `showUnfilled`  | boolean                                         | **Yes**  | `true`  |                                                                                                                                               |
-| `valueMode`     | string                                          | **Yes**  |         | Allows for the table cell gauge display type to set the gauge mode.<br/>Possible values are: `color`, `text`, `hidden`.                       |
-| `orientation`   | string                                          | No       |         | *(Inherited from [SingleStatBaseOptions](#singlestatbaseoptions))*<br/>TODO docs<br/>Possible values are: `auto`, `vertical`, `horizontal`.   |
-| `reduceOptions` | [ReduceDataOptions](#reducedataoptions)         | No       |         | *(Inherited from [SingleStatBaseOptions](#singlestatbaseoptions))*<br/>TODO docs                                                              |
-| `text`          | [VizTextDisplayOptions](#viztextdisplayoptions) | No       |         | *(Inherited from [SingleStatBaseOptions](#singlestatbaseoptions))*<br/>TODO docs                                                              |
-
-### ReduceDataOptions
-
-TODO docs
-
-| Property | Type     | Required | Default | Description                                                   |
-|----------|----------|----------|---------|---------------------------------------------------------------|
-| `calcs`  | string[] | **Yes**  |         | When !values, pick one value for the whole field              |
-| `fields` | string   | No       |         | Which fields to show.  By default this is only numeric fields |
-| `limit`  | number   | No       |         | if showing all values limit                                   |
-| `values` | boolean  | No       |         | If true show each row value                                   |
-
-### SingleStatBaseOptions
-
-TODO docs
-
-It extends [OptionsWithTextFormatting](#optionswithtextformatting).
-
-| Property        | Type                                            | Required | Default | Description                                                                              |
-|-----------------|-------------------------------------------------|----------|---------|------------------------------------------------------------------------------------------|
-| `orientation`   | string                                          | **Yes**  |         | TODO docs<br/>Possible values are: `auto`, `vertical`, `horizontal`.                     |
-| `reduceOptions` | [ReduceDataOptions](#reducedataoptions)         | **Yes**  |         | TODO docs                                                                                |
-| `text`          | [VizTextDisplayOptions](#viztextdisplayoptions) | No       |         | *(Inherited from [OptionsWithTextFormatting](#optionswithtextformatting))*<br/>TODO docs |
-
-### OptionsWithTextFormatting
-
-TODO docs
-
-| Property | Type                                            | Required | Default | Description |
-|----------|-------------------------------------------------|----------|---------|-------------|
-| `text`   | [VizTextDisplayOptions](#viztextdisplayoptions) | No       |         | TODO docs   |
-
-### VizTextDisplayOptions
-
-TODO docs
-
-| Property    | Type   | Required | Default | Description              |
-|-------------|--------|----------|---------|--------------------------|
-| `titleSize` | number | No       |         | Explicit title text size |
-| `valueSize` | number | No       |         | Explicit value text size |
-
-
diff --git a/docs/sources/developers/kinds/composable/candlestick/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/candlestick/panelcfg/schema-reference.md
deleted file mode 100644
index 75fe334da4397..0000000000000
--- a/docs/sources/developers/kinds/composable/candlestick/panelcfg/schema-reference.md
+++ /dev/null
@@ -1,257 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: CandlestickPanelCfg kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## CandlestickPanelCfg
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property              | Type                                  | Required | Default | Description                                                 |
-|-----------------------|---------------------------------------|----------|---------|-------------------------------------------------------------|
-| `CandleStyle`         | string                                | **Yes**  |         | Possible values are: `candles`, `ohlcbars`.                 |
-| `CandlestickColors`   | [object](#candlestickcolors)          | **Yes**  |         |                                                             |
-| `CandlestickFieldMap` | [object](#candlestickfieldmap)        | **Yes**  |         |                                                             |
-| `ColorStrategy`       | string                                | **Yes**  |         | Possible values are: `open-close`, `close-close`.           |
-| `FieldConfig`         | [GraphFieldConfig](#graphfieldconfig) | **Yes**  |         | TODO docs                                                   |
-| `Options`             | [object](#options)                    | **Yes**  |         |                                                             |
-| `VizDisplayMode`      | string                                | **Yes**  |         | Possible values are: `candles+volume`, `candles`, `volume`. |
-
-### CandlestickColors
-
-| Property | Type   | Required | Default | Description |
-|----------|--------|----------|---------|-------------|
-| `down`   | string | **Yes**  | `red`   |             |
-| `flat`   | string | **Yes**  | `gray`  |             |
-| `up`     | string | **Yes**  | `green` |             |
-
-### CandlestickFieldMap
-
-| Property | Type   | Required | Default | Description                                                                  |
-|----------|--------|----------|---------|------------------------------------------------------------------------------|
-| `close`  | string | No       |         | Corresponds to the final (end) value of the given period                     |
-| `high`   | string | No       |         | Corresponds to the highest value of the given period                         |
-| `low`    | string | No       |         | Corresponds to the lowest value of the given period                          |
-| `open`   | string | No       |         | Corresponds to the starting value of the given period                        |
-| `volume` | string | No       |         | Corresponds to the sample count in the given period. (e.g. number of trades) |
-
-### GraphFieldConfig
-
-TODO docs
-
-It extends [LineConfig](#lineconfig) and [FillConfig](#fillconfig) and [PointsConfig](#pointsconfig) and [AxisConfig](#axisconfig) and [BarConfig](#barconfig) and [StackableFieldConfig](#stackablefieldconfig) and [HideableFieldConfig](#hideablefieldconfig).
-
-| Property            | Type                                                      | Required | Default | Description                                                                                                                                                                                                                                                                   |
-|---------------------|-----------------------------------------------------------|----------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `axisBorderShow`    | boolean                                                   | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `axisCenteredZero`  | boolean                                                   | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `axisColorMode`     | string                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*<br/>TODO docs<br/>Possible values are: `text`, `series`.                                                                                                                                                                         |
-| `axisGridShow`      | boolean                                                   | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `axisLabel`         | string                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `axisPlacement`     | string                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*<br/>TODO docs<br/>Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`.                                                                                                                                       |
-| `axisSoftMax`       | number                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `axisSoftMin`       | number                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `axisWidth`         | number                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `barAlignment`      | integer                                                   | No       |         | *(Inherited from [BarConfig](#barconfig))*<br/>TODO docs<br/>Possible values are: `-1`, `0`, `1`.                                                                                                                                                                             |
-| `barMaxWidth`       | number                                                    | No       |         | *(Inherited from [BarConfig](#barconfig))*                                                                                                                                                                                                                                    |
-| `barWidthFactor`    | number                                                    | No       |         | *(Inherited from [BarConfig](#barconfig))*                                                                                                                                                                                                                                    |
-| `drawStyle`         | string                                                    | No       |         | TODO docs<br/>Possible values are: `line`, `bars`, `points`.                                                                                                                                                                                                                  |
-| `fillBelowTo`       | string                                                    | No       |         | *(Inherited from [FillConfig](#fillconfig))*                                                                                                                                                                                                                                  |
-| `fillColor`         | string                                                    | No       |         | *(Inherited from [FillConfig](#fillconfig))*                                                                                                                                                                                                                                  |
-| `fillOpacity`       | number                                                    | No       |         | *(Inherited from [FillConfig](#fillconfig))*                                                                                                                                                                                                                                  |
-| `gradientMode`      | string                                                    | No       |         | TODO docs<br/>Possible values are: `none`, `opacity`, `hue`, `scheme`.                                                                                                                                                                                                        |
-| `hideFrom`          | [HideSeriesConfig](#hideseriesconfig)                     | No       |         | *(Inherited from [HideableFieldConfig](#hideablefieldconfig))*<br/>TODO docs                                                                                                                                                                                                  |
-| `lineColor`         | string                                                    | No       |         | *(Inherited from [LineConfig](#lineconfig))*                                                                                                                                                                                                                                  |
-| `lineInterpolation` | string                                                    | No       |         | *(Inherited from [LineConfig](#lineconfig))*<br/>TODO docs<br/>Possible values are: `linear`, `smooth`, `stepBefore`, `stepAfter`.                                                                                                                                            |
-| `lineStyle`         | [LineStyle](#linestyle)                                   | No       |         | *(Inherited from [LineConfig](#lineconfig))*<br/>TODO docs                                                                                                                                                                                                                    |
-| `lineWidth`         | number                                                    | No       |         | *(Inherited from [LineConfig](#lineconfig))*                                                                                                                                                                                                                                  |
-| `pointColor`        | string                                                    | No       |         | *(Inherited from [PointsConfig](#pointsconfig))*                                                                                                                                                                                                                              |
-| `pointSize`         | number                                                    | No       |         | *(Inherited from [PointsConfig](#pointsconfig))*                                                                                                                                                                                                                              |
-| `pointSymbol`       | string                                                    | No       |         | *(Inherited from [PointsConfig](#pointsconfig))*                                                                                                                                                                                                                              |
-| `scaleDistribution` | [ScaleDistributionConfig](#scaledistributionconfig)       | No       |         | *(Inherited from [AxisConfig](#axisconfig))*<br/>TODO docs                                                                                                                                                                                                                    |
-| `showPoints`        | string                                                    | No       |         | *(Inherited from [PointsConfig](#pointsconfig))*<br/>TODO docs<br/>Possible values are: `auto`, `never`, `always`.                                                                                                                                                            |
-| `spanNulls`         |                                                           | No       |         | *(Inherited from [LineConfig](#lineconfig))*<br/>Indicate if null values should be treated as gaps or connected.<br/>When the value is a number, it represents the maximum delta in the<br/>X axis that should be considered connected.  For timeseries, this is milliseconds |
-| `stacking`          | [StackingConfig](#stackingconfig)                         | No       |         | *(Inherited from [StackableFieldConfig](#stackablefieldconfig))*<br/>TODO docs                                                                                                                                                                                                |
-| `thresholdsStyle`   | [GraphThresholdsStyleConfig](#graphthresholdsstyleconfig) | No       |         | TODO docs                                                                                                                                                                                                                                                                     |
-| `transform`         | string                                                    | No       |         | TODO docs<br/>Possible values are: `constant`, `negative-Y`.                                                                                                                                                                                                                  |
-
-### AxisConfig
-
-TODO docs
-
-| Property            | Type                                                | Required | Default | Description                                                                            |
-|---------------------|-----------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------|
-| `axisBorderShow`    | boolean                                             | No       |         |                                                                                        |
-| `axisCenteredZero`  | boolean                                             | No       |         |                                                                                        |
-| `axisColorMode`     | string                                              | No       |         | TODO docs<br/>Possible values are: `text`, `series`.                                   |
-| `axisGridShow`      | boolean                                             | No       |         |                                                                                        |
-| `axisLabel`         | string                                              | No       |         |                                                                                        |
-| `axisPlacement`     | string                                              | No       |         | TODO docs<br/>Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. |
-| `axisSoftMax`       | number                                              | No       |         |                                                                                        |
-| `axisSoftMin`       | number                                              | No       |         |                                                                                        |
-| `axisWidth`         | number                                              | No       |         |                                                                                        |
-| `scaleDistribution` | [ScaleDistributionConfig](#scaledistributionconfig) | No       |         | TODO docs                                                                              |
-
-### ScaleDistributionConfig
-
-TODO docs
-
-| Property          | Type   | Required | Default | Description                                                              |
-|-------------------|--------|----------|---------|--------------------------------------------------------------------------|
-| `type`            | string | **Yes**  |         | TODO docs<br/>Possible values are: `linear`, `log`, `ordinal`, `symlog`. |
-| `linearThreshold` | number | No       |         |                                                                          |
-| `log`             | number | No       |         |                                                                          |
-
-### BarConfig
-
-TODO docs
-
-| Property         | Type    | Required | Default | Description                                        |
-|------------------|---------|----------|---------|----------------------------------------------------|
-| `barAlignment`   | integer | No       |         | TODO docs<br/>Possible values are: `-1`, `0`, `1`. |
-| `barMaxWidth`    | number  | No       |         |                                                    |
-| `barWidthFactor` | number  | No       |         |                                                    |
-
-### FillConfig
-
-TODO docs
-
-| Property      | Type   | Required | Default | Description |
-|---------------|--------|----------|---------|-------------|
-| `fillBelowTo` | string | No       |         |             |
-| `fillColor`   | string | No       |         |             |
-| `fillOpacity` | number | No       |         |             |
-
-### GraphThresholdsStyleConfig
-
-TODO docs
-
-| Property | Type   | Required | Default | Description                                                                                               |
-|----------|--------|----------|---------|-----------------------------------------------------------------------------------------------------------|
-| `mode`   | string | **Yes**  |         | TODO docs<br/>Possible values are: `off`, `line`, `dashed`, `area`, `line+area`, `dashed+area`, `series`. |
-
-### HideSeriesConfig
-
-TODO docs
-
-| Property  | Type    | Required | Default | Description |
-|-----------|---------|----------|---------|-------------|
-| `legend`  | boolean | **Yes**  |         |             |
-| `tooltip` | boolean | **Yes**  |         |             |
-| `viz`     | boolean | **Yes**  |         |             |
-
-### HideableFieldConfig
-
-TODO docs
-
-| Property   | Type                                  | Required | Default | Description |
-|------------|---------------------------------------|----------|---------|-------------|
-| `hideFrom` | [HideSeriesConfig](#hideseriesconfig) | No       |         | TODO docs   |
-
-### LineConfig
-
-TODO docs
-
-| Property            | Type                    | Required | Default | Description                                                                                                                                                                                                                  |
-|---------------------|-------------------------|----------|---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `lineColor`         | string                  | No       |         |                                                                                                                                                                                                                              |
-| `lineInterpolation` | string                  | No       |         | TODO docs<br/>Possible values are: `linear`, `smooth`, `stepBefore`, `stepAfter`.                                                                                                                                            |
-| `lineStyle`         | [LineStyle](#linestyle) | No       |         | TODO docs                                                                                                                                                                                                                    |
-| `lineWidth`         | number                  | No       |         |                                                                                                                                                                                                                              |
-| `spanNulls`         |                         | No       |         | Indicate if null values should be treated as gaps or connected.<br/>When the value is a number, it represents the maximum delta in the<br/>X axis that should be considered connected.  For timeseries, this is milliseconds |
-
-### LineStyle
-
-TODO docs
-
-| Property | Type     | Required | Default | Description                                            |
-|----------|----------|----------|---------|--------------------------------------------------------|
-| `dash`   | number[] | No       |         |                                                        |
-| `fill`   | string   | No       |         | Possible values are: `solid`, `dash`, `dot`, `square`. |
-
-### PointsConfig
-
-TODO docs
-
-| Property      | Type   | Required | Default | Description                                                   |
-|---------------|--------|----------|---------|---------------------------------------------------------------|
-| `pointColor`  | string | No       |         |                                                               |
-| `pointSize`   | number | No       |         |                                                               |
-| `pointSymbol` | string | No       |         |                                                               |
-| `showPoints`  | string | No       |         | TODO docs<br/>Possible values are: `auto`, `never`, `always`. |
-
-### StackableFieldConfig
-
-TODO docs
-
-| Property   | Type                              | Required | Default | Description |
-|------------|-----------------------------------|----------|---------|-------------|
-| `stacking` | [StackingConfig](#stackingconfig) | No       |         | TODO docs   |
-
-### StackingConfig
-
-TODO docs
-
-| Property | Type   | Required | Default | Description                                                     |
-|----------|--------|----------|---------|-----------------------------------------------------------------|
-| `group`  | string | No       |         |                                                                 |
-| `mode`   | string | No       |         | TODO docs<br/>Possible values are: `none`, `normal`, `percent`. |
-
-### Options
-
-It extends [OptionsWithLegend](#optionswithlegend).
-
-| Property           | Type                                    | Required | Default | Description                                                              |
-|--------------------|-----------------------------------------|----------|---------|--------------------------------------------------------------------------|
-| `candleStyle`      | string                                  | **Yes**  |         | Sets the style of the candlesticks                                       |
-| `colorStrategy`    | string                                  | **Yes**  |         | Sets the color strategy for the candlesticks                             |
-| `colors`           | [CandlestickColors](#candlestickcolors) | **Yes**  |         |                                                                          |
-| `fields`           | [object](#fields)                       | **Yes**  | `map[]` | Map fields to appropriate dimension                                      |
-| `legend`           | [VizLegendOptions](#vizlegendoptions)   | **Yes**  |         | *(Inherited from [OptionsWithLegend](#optionswithlegend))*<br/>TODO docs |
-| `mode`             | string                                  | **Yes**  |         | Sets which dimensions are used for the visualization                     |
-| `includeAllFields` | boolean                                 | No       | `false` | When enabled, all fields will be sent to the graph                       |
-
-### OptionsWithLegend
-
-TODO docs
-
-| Property | Type                                  | Required | Default | Description |
-|----------|---------------------------------------|----------|---------|-------------|
-| `legend` | [VizLegendOptions](#vizlegendoptions) | **Yes**  |         | TODO docs   |
-
-### VizLegendOptions
-
-TODO docs
-
-| Property      | Type     | Required | Default | Description                                                                                                                             |
-|---------------|----------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| `calcs`       | string[] | **Yes**  |         |                                                                                                                                         |
-| `displayMode` | string   | **Yes**  |         | TODO docs<br/>Note: "hidden" needs to remain as an option for plugins compatibility<br/>Possible values are: `list`, `table`, `hidden`. |
-| `placement`   | string   | **Yes**  |         | TODO docs<br/>Possible values are: `bottom`, `right`.                                                                                   |
-| `showLegend`  | boolean  | **Yes**  |         |                                                                                                                                         |
-| `asTable`     | boolean  | No       |         |                                                                                                                                         |
-| `isVisible`   | boolean  | No       |         |                                                                                                                                         |
-| `sortBy`      | string   | No       |         |                                                                                                                                         |
-| `sortDesc`    | boolean  | No       |         |                                                                                                                                         |
-| `width`       | number   | No       |         |                                                                                                                                         |
-
-### Fields
-
-Map fields to appropriate dimension
-
-| Property | Type                              | Required | Default | Description |
-|----------|-----------------------------------|----------|---------|-------------|
-| `object` | Possible types are: [](#), [](#). |          |         |
-
-
diff --git a/docs/sources/developers/kinds/composable/canvas/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/canvas/panelcfg/schema-reference.md
deleted file mode 100644
index 90b7312b1264c..0000000000000
--- a/docs/sources/developers/kinds/composable/canvas/panelcfg/schema-reference.md
+++ /dev/null
@@ -1,159 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: CanvasPanelCfg kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## CanvasPanelCfg
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property                | Type                             | Required | Default | Description                                                           |
-|-------------------------|----------------------------------|----------|---------|-----------------------------------------------------------------------|
-| `BackgroundConfig`      | [object](#backgroundconfig)      | **Yes**  |         |                                                                       |
-| `BackgroundImageSize`   | string                           | **Yes**  |         | Possible values are: `original`, `contain`, `cover`, `fill`, `tile`.  |
-| `CanvasConnection`      | [object](#canvasconnection)      | **Yes**  |         |                                                                       |
-| `CanvasElementOptions`  | [object](#canvaselementoptions)  | **Yes**  |         |                                                                       |
-| `ConnectionCoordinates` | [object](#connectioncoordinates) | **Yes**  |         |                                                                       |
-| `ConnectionPath`        | string                           | **Yes**  |         | Possible values are: `straight`.                                      |
-| `Constraint`            | [object](#constraint)            | **Yes**  |         |                                                                       |
-| `HorizontalConstraint`  | string                           | **Yes**  |         | Possible values are: `left`, `right`, `leftright`, `center`, `scale`. |
-| `HttpRequestMethod`     | string                           | **Yes**  |         | Possible values are: `GET`, `POST`, `PUT`.                            |
-| `LineConfig`            | [object](#lineconfig)            | **Yes**  |         |                                                                       |
-| `Options`               | [object](#options)               | **Yes**  |         |                                                                       |
-| `Placement`             | [object](#placement)             | **Yes**  |         |                                                                       |
-| `VerticalConstraint`    | string                           | **Yes**  |         | Possible values are: `top`, `bottom`, `topbottom`, `center`, `scale`. |
-
-### BackgroundConfig
-
-| Property | Type                                                | Required | Default | Description                                                          |
-|----------|-----------------------------------------------------|----------|---------|----------------------------------------------------------------------|
-| `color`  | [ColorDimensionConfig](#colordimensionconfig)       | No       |         |                                                                      |
-| `image`  | [ResourceDimensionConfig](#resourcedimensionconfig) | No       |         | Links to a resource (image/svg path)                                 |
-| `size`   | string                                              | No       |         | Possible values are: `original`, `contain`, `cover`, `fill`, `tile`. |
-
-### ColorDimensionConfig
-
-It extends [BaseDimensionConfig](#basedimensionconfig).
-
-| Property | Type   | Required | Default | Description                                                                                                  |
-|----------|--------|----------|---------|--------------------------------------------------------------------------------------------------------------|
-| `field`  | string | No       |         | *(Inherited from [BaseDimensionConfig](#basedimensionconfig))*<br/>fixed: T -- will be added by each element |
-| `fixed`  | string | No       |         |                                                                                                              |
-
-### BaseDimensionConfig
-
-| Property | Type   | Required | Default | Description                               |
-|----------|--------|----------|---------|-------------------------------------------|
-| `field`  | string | No       |         | fixed: T -- will be added by each element |
-
-### ResourceDimensionConfig
-
-Links to a resource (image/svg path)
-
-It extends [BaseDimensionConfig](#basedimensionconfig).
-
-| Property | Type   | Required | Default | Description                                                                                                  |
-|----------|--------|----------|---------|--------------------------------------------------------------------------------------------------------------|
-| `mode`   | string | **Yes**  |         | Possible values are: `fixed`, `field`, `mapping`.                                                            |
-| `field`  | string | No       |         | *(Inherited from [BaseDimensionConfig](#basedimensionconfig))*<br/>fixed: T -- will be added by each element |
-| `fixed`  | string | No       |         |                                                                                                              |
-
-### CanvasConnection
-
-| Property     | Type                                            | Required | Default | Description                      |
-|--------------|-------------------------------------------------|----------|---------|----------------------------------|
-| `path`       | string                                          | **Yes**  |         | Possible values are: `straight`. |
-| `source`     | [ConnectionCoordinates](#connectioncoordinates) | **Yes**  |         |                                  |
-| `target`     | [ConnectionCoordinates](#connectioncoordinates) | **Yes**  |         |                                  |
-| `color`      | [ColorDimensionConfig](#colordimensionconfig)   | No       |         |                                  |
-| `size`       | [ScaleDimensionConfig](#scaledimensionconfig)   | No       |         |                                  |
-| `targetName` | string                                          | No       |         |                                  |
-
-### ConnectionCoordinates
-
-| Property | Type   | Required | Default | Description |
-|----------|--------|----------|---------|-------------|
-| `x`      | number | **Yes**  |         |             |
-| `y`      | number | **Yes**  |         |             |
-
-### ScaleDimensionConfig
-
-It extends [BaseDimensionConfig](#basedimensionconfig).
-
-| Property | Type   | Required | Default | Description                                                                                                  |
-|----------|--------|----------|---------|--------------------------------------------------------------------------------------------------------------|
-| `max`    | number | **Yes**  |         |                                                                                                              |
-| `min`    | number | **Yes**  |         |                                                                                                              |
-| `field`  | string | No       |         | *(Inherited from [BaseDimensionConfig](#basedimensionconfig))*<br/>fixed: T -- will be added by each element |
-| `fixed`  | number | No       |         |                                                                                                              |
-| `mode`   | string | No       |         | Possible values are: `linear`, `quad`.                                                                       |
-
-### CanvasElementOptions
-
-| Property      | Type                                    | Required | Default | Description                                             |
-|---------------|-----------------------------------------|----------|---------|---------------------------------------------------------|
-| `name`        | string                                  | **Yes**  |         |                                                         |
-| `type`        | string                                  | **Yes**  |         |                                                         |
-| `background`  | [BackgroundConfig](#backgroundconfig)   | No       |         |                                                         |
-| `border`      | [LineConfig](#lineconfig)               | No       |         |                                                         |
-| `config`      |                                         | No       |         | TODO: figure out how to define this (element config(s)) |
-| `connections` | [CanvasConnection](#canvasconnection)[] | No       |         |                                                         |
-| `constraint`  | [Constraint](#constraint)               | No       |         |                                                         |
-| `placement`   | [Placement](#placement)                 | No       |         |                                                         |
-
-### Constraint
-
-| Property     | Type   | Required | Default | Description                                                           |
-|--------------|--------|----------|---------|-----------------------------------------------------------------------|
-| `horizontal` | string | No       |         | Possible values are: `left`, `right`, `leftright`, `center`, `scale`. |
-| `vertical`   | string | No       |         | Possible values are: `top`, `bottom`, `topbottom`, `center`, `scale`. |
-
-### LineConfig
-
-| Property | Type                                          | Required | Default | Description |
-|----------|-----------------------------------------------|----------|---------|-------------|
-| `color`  | [ColorDimensionConfig](#colordimensionconfig) | No       |         |             |
-| `width`  | number                                        | No       |         |             |
-
-### Placement
-
-| Property | Type   | Required | Default | Description |
-|----------|--------|----------|---------|-------------|
-| `bottom` | number | No       |         |             |
-| `height` | number | No       |         |             |
-| `left`   | number | No       |         |             |
-| `right`  | number | No       |         |             |
-| `top`    | number | No       |         |             |
-| `width`  | number | No       |         |             |
-
-### Options
-
-| Property            | Type            | Required | Default | Description                                                                                                                          |
-|---------------------|-----------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------|
-| `inlineEditing`     | boolean         | **Yes**  | `true`  | Enable inline editing                                                                                                                |
-| `root`              | [object](#root) | **Yes**  |         | The root element of canvas (frame), where all canvas elements are nested<br/>TODO: Figure out how to define a default value for this |
-| `showAdvancedTypes` | boolean         | **Yes**  | `true`  | Show all available element types                                                                                                     |
-
-### Root
-
-The root element of canvas (frame), where all canvas elements are nested
-TODO: Figure out how to define a default value for this
-
-| Property   | Type                                            | Required | Default | Description                                                    |
-|------------|-------------------------------------------------|----------|---------|----------------------------------------------------------------|
-| `elements` | [CanvasElementOptions](#canvaselementoptions)[] | **Yes**  |         | The list of canvas elements attached to the root element       |
-| `name`     | string                                          | **Yes**  |         | Name of the root element                                       |
-| `type`     | string                                          | **Yes**  |         | Type of root element (frame)<br/>Possible values are: `frame`. |
-
-
diff --git a/docs/sources/developers/kinds/composable/cloudwatch/dataquery/schema-reference.md b/docs/sources/developers/kinds/composable/cloudwatch/dataquery/schema-reference.md
deleted file mode 100644
index 78cb0d0f470ab..0000000000000
--- a/docs/sources/developers/kinds/composable/cloudwatch/dataquery/schema-reference.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: CloudWatchDataQuery kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## CloudWatchDataQuery
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-
diff --git a/docs/sources/developers/kinds/composable/dashboardlist/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/dashboardlist/panelcfg/schema-reference.md
deleted file mode 100644
index 732b4ea58377b..0000000000000
--- a/docs/sources/developers/kinds/composable/dashboardlist/panelcfg/schema-reference.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: DashboardListPanelCfg kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## DashboardListPanelCfg
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property  | Type               | Required | Default | Description |
-|-----------|--------------------|----------|---------|-------------|
-| `Options` | [object](#options) | **Yes**  |         |             |
-
-### Options
-
-| Property             | Type     | Required | Default | Description                                                     |
-|----------------------|----------|----------|---------|-----------------------------------------------------------------|
-| `includeVars`        | boolean  | **Yes**  | `false` |                                                                 |
-| `keepTime`           | boolean  | **Yes**  | `false` |                                                                 |
-| `maxItems`           | integer  | **Yes**  | `10`    |                                                                 |
-| `query`              | string   | **Yes**  | ``      |                                                                 |
-| `showHeadings`       | boolean  | **Yes**  | `true`  |                                                                 |
-| `showRecentlyViewed` | boolean  | **Yes**  | `false` |                                                                 |
-| `showSearch`         | boolean  | **Yes**  | `false` |                                                                 |
-| `showStarred`        | boolean  | **Yes**  | `true`  |                                                                 |
-| `tags`               | string[] | **Yes**  |         |                                                                 |
-| `folderId`           | integer  | No       |         | folderId is deprecated, and migrated to folderUid on panel init |
-| `folderUID`          | string   | No       |         |                                                                 |
-
-
diff --git a/docs/sources/developers/kinds/composable/datagrid/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/datagrid/panelcfg/schema-reference.md
deleted file mode 100644
index adc4c54aec41e..0000000000000
--- a/docs/sources/developers/kinds/composable/datagrid/panelcfg/schema-reference.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: DatagridPanelCfg kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## DatagridPanelCfg
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property  | Type               | Required | Default | Description |
-|-----------|--------------------|----------|---------|-------------|
-| `Options` | [object](#options) | **Yes**  |         |             |
-
-### Options
-
-| Property         | Type    | Required | Default | Description                       |
-|------------------|---------|----------|---------|-----------------------------------|
-| `selectedSeries` | integer | **Yes**  | `0`     | Constraint: `>=0 & <=2147483647`. |
-
-
diff --git a/docs/sources/developers/kinds/composable/debug/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/debug/panelcfg/schema-reference.md
deleted file mode 100644
index 90832442886fe..0000000000000
--- a/docs/sources/developers/kinds/composable/debug/panelcfg/schema-reference.md
+++ /dev/null
@@ -1,42 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: DebugPanelCfg kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## DebugPanelCfg
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property       | Type                    | Required | Default | Description                                                               |
-|----------------|-------------------------|----------|---------|---------------------------------------------------------------------------|
-| `DebugMode`    | string                  | **Yes**  |         | Possible values are: `render`, `events`, `cursor`, `State`, `ThrowError`. |
-| `Options`      | [object](#options)      | **Yes**  |         |                                                                           |
-| `UpdateConfig` | [object](#updateconfig) | **Yes**  |         |                                                                           |
-
-### Options
-
-| Property   | Type                          | Required | Default | Description                                                               |
-|------------|-------------------------------|----------|---------|---------------------------------------------------------------------------|
-| `mode`     | string                        | **Yes**  |         | Possible values are: `render`, `events`, `cursor`, `State`, `ThrowError`. |
-| `counters` | [UpdateConfig](#updateconfig) | No       |         |                                                                           |
-
-### UpdateConfig
-
-| Property        | Type    | Required | Default | Description |
-|-----------------|---------|----------|---------|-------------|
-| `dataChanged`   | boolean | **Yes**  |         |             |
-| `render`        | boolean | **Yes**  |         |             |
-| `schemaChanged` | boolean | **Yes**  |         |             |
-
-
diff --git a/docs/sources/developers/kinds/composable/elasticsearch/dataquery/schema-reference.md b/docs/sources/developers/kinds/composable/elasticsearch/dataquery/schema-reference.md
deleted file mode 100644
index 384fe82ee0ab5..0000000000000
--- a/docs/sources/developers/kinds/composable/elasticsearch/dataquery/schema-reference.md
+++ /dev/null
@@ -1,283 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: ElasticsearchDataQuery kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## ElasticsearchDataQuery
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property     | Type                                      | Required | Default | Description                                                                                                                                                                                                                                             |
-|--------------|-------------------------------------------|----------|---------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `refId`      | string                                    | **Yes**  |         | A unique identifier for the query within the list of targets.<br/>In server side expressions, the refId is used as a variable name to identify results.<br/>By default, the UI will assign A->Z; however setting meaningful names may be useful.        |
-| `alias`      | string                                    | No       |         | Alias pattern                                                                                                                                                                                                                                           |
-| `bucketAggs` | [BucketAggregation](#bucketaggregation)[] | No       |         | List of bucket aggregations                                                                                                                                                                                                                             |
-| `datasource` |                                           | No       |         | For mixed data sources the selected datasource is on the query level.<br/>For non mixed scenarios this is undefined.<br/>TODO find a better way to do this ^ that's friendly to schema<br/>TODO this shouldn't be unknown but DataSourceRef &#124; null |
-| `hide`       | boolean                                   | No       |         | true if query is disabled (ie should not be returned to the dashboard)<br/>Note this does not always imply that the query should not be executed since<br/>the results from a hidden query may be used as the input to other queries (SSE etc)          |
-| `metrics`    | [MetricAggregation](#metricaggregation)[] | No       |         | List of metric aggregations                                                                                                                                                                                                                             |
-| `queryType`  | string                                    | No       |         | Specify the query flavor<br/>TODO make this required and give it a default                                                                                                                                                                              |
-| `query`      | string                                    | No       |         | Lucene query                                                                                                                                                                                                                                            |
-| `timeField`  | string                                    | No       |         | Name of time field                                                                                                                                                                                                                                      |
-
-### BucketAggregation
-
-| Property | Type                                                                                                                                                                | Required | Default | Description |
-|----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|---------|-------------|
-| `object` | Possible types are: [DateHistogram](#datehistogram), [Histogram](#histogram), [Terms](#terms), [Filters](#filters), [GeoHashGrid](#geohashgrid), [Nested](#nested). |          |         |
-
-### DateHistogram
-
-It extends [BucketAggregationWithField](#bucketaggregationwithfield).
-
-| Property   | Type   | Required | Default | Description                                                                                                                                                                        |
-|------------|--------|----------|---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `type`     | string | **Yes**  |         | *(Inherited from [BucketAggregationWithField](#bucketaggregationwithfield))*<br/>Possible values are: `terms`, `filters`, `geohash_grid`, `date_histogram`, `histogram`, `nested`. |
-| `field`    | string | No       |         | *(Inherited from [BucketAggregationWithField](#bucketaggregationwithfield))*                                                                                                       |
-| `id`       | string | No       |         | *(Inherited from [BucketAggregationWithField](#bucketaggregationwithfield))*                                                                                                       |
-| `settings` |        | No       |         | *(Inherited from [BucketAggregationWithField](#bucketaggregationwithfield))*                                                                                                       |
-
-### BucketAggregationWithField
-
-It extends [BaseBucketAggregation](#basebucketaggregation).
-
-| Property   | Type   | Required | Default | Description                                                                                                                                                              |
-|------------|--------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `id`       | string | **Yes**  |         | *(Inherited from [BaseBucketAggregation](#basebucketaggregation))*                                                                                                       |
-| `type`     | string | **Yes**  |         | *(Inherited from [BaseBucketAggregation](#basebucketaggregation))*<br/>Possible values are: `terms`, `filters`, `geohash_grid`, `date_histogram`, `histogram`, `nested`. |
-| `field`    | string | No       |         |                                                                                                                                                                          |
-| `settings` |        | No       |         | *(Inherited from [BaseBucketAggregation](#basebucketaggregation))*                                                                                                       |
-
-### BaseBucketAggregation
-
-| Property   | Type   | Required | Default | Description                                                                                       |
-|------------|--------|----------|---------|---------------------------------------------------------------------------------------------------|
-| `id`       | string | **Yes**  |         |                                                                                                   |
-| `type`     | string | **Yes**  |         | Possible values are: `terms`, `filters`, `geohash_grid`, `date_histogram`, `histogram`, `nested`. |
-| `settings` |        | No       |         |                                                                                                   |
-
-### Filters
-
-It extends [BaseBucketAggregation](#basebucketaggregation).
-
-| Property   | Type   | Required | Default | Description                                                                                                                                                              |
-|------------|--------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `id`       | string | **Yes**  |         | *(Inherited from [BaseBucketAggregation](#basebucketaggregation))*                                                                                                       |
-| `type`     | string | **Yes**  |         | *(Inherited from [BaseBucketAggregation](#basebucketaggregation))*<br/>Possible values are: `terms`, `filters`, `geohash_grid`, `date_histogram`, `histogram`, `nested`. |
-| `settings` |        | No       |         | *(Inherited from [BaseBucketAggregation](#basebucketaggregation))*                                                                                                       |
-
-### GeoHashGrid
-
-It extends [BucketAggregationWithField](#bucketaggregationwithfield).
-
-| Property   | Type   | Required | Default | Description                                                                                                                                                                        |
-|------------|--------|----------|---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `type`     | string | **Yes**  |         | *(Inherited from [BucketAggregationWithField](#bucketaggregationwithfield))*<br/>Possible values are: `terms`, `filters`, `geohash_grid`, `date_histogram`, `histogram`, `nested`. |
-| `field`    | string | No       |         | *(Inherited from [BucketAggregationWithField](#bucketaggregationwithfield))*                                                                                                       |
-| `id`       | string | No       |         | *(Inherited from [BucketAggregationWithField](#bucketaggregationwithfield))*                                                                                                       |
-| `settings` |        | No       |         | *(Inherited from [BucketAggregationWithField](#bucketaggregationwithfield))*                                                                                                       |
-
-### Histogram
-
-It extends [BucketAggregationWithField](#bucketaggregationwithfield).
-
-| Property   | Type   | Required | Default | Description                                                                                                                                                                        |
-|------------|--------|----------|---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `type`     | string | **Yes**  |         | *(Inherited from [BucketAggregationWithField](#bucketaggregationwithfield))*<br/>Possible values are: `terms`, `filters`, `geohash_grid`, `date_histogram`, `histogram`, `nested`. |
-| `field`    | string | No       |         | *(Inherited from [BucketAggregationWithField](#bucketaggregationwithfield))*                                                                                                       |
-| `id`       | string | No       |         | *(Inherited from [BucketAggregationWithField](#bucketaggregationwithfield))*                                                                                                       |
-| `settings` |        | No       |         | *(Inherited from [BucketAggregationWithField](#bucketaggregationwithfield))*                                                                                                       |
-
-### Nested
-
-It extends [BucketAggregationWithField](#bucketaggregationwithfield).
-
-| Property   | Type   | Required | Default | Description                                                                                                                                                                        |
-|------------|--------|----------|---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `type`     | string | **Yes**  |         | *(Inherited from [BucketAggregationWithField](#bucketaggregationwithfield))*<br/>Possible values are: `terms`, `filters`, `geohash_grid`, `date_histogram`, `histogram`, `nested`. |
-| `field`    | string | No       |         | *(Inherited from [BucketAggregationWithField](#bucketaggregationwithfield))*                                                                                                       |
-| `id`       | string | No       |         | *(Inherited from [BucketAggregationWithField](#bucketaggregationwithfield))*                                                                                                       |
-| `settings` |        | No       |         | *(Inherited from [BucketAggregationWithField](#bucketaggregationwithfield))*                                                                                                       |
-
-### Terms
-
-It extends [BucketAggregationWithField](#bucketaggregationwithfield).
-
-| Property   | Type   | Required | Default | Description                                                                                                                                                                        |
-|------------|--------|----------|---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `type`     | string | **Yes**  |         | *(Inherited from [BucketAggregationWithField](#bucketaggregationwithfield))*<br/>Possible values are: `terms`, `filters`, `geohash_grid`, `date_histogram`, `histogram`, `nested`. |
-| `field`    | string | No       |         | *(Inherited from [BucketAggregationWithField](#bucketaggregationwithfield))*                                                                                                       |
-| `id`       | string | No       |         | *(Inherited from [BucketAggregationWithField](#bucketaggregationwithfield))*                                                                                                       |
-| `settings` |        | No       |         | *(Inherited from [BucketAggregationWithField](#bucketaggregationwithfield))*                                                                                                       |
-
-### MetricAggregation
-
-| Property | Type                                                                                                 | Required | Default | Description |
-|----------|------------------------------------------------------------------------------------------------------|----------|---------|-------------|
-| `object` | Possible types are: [Count](#count), [PipelineMetricAggregation](#pipelinemetricaggregation), [](#). |          |         |
-
-### Count
-
-It extends [BaseMetricAggregation](#basemetricaggregation).
-
-| Property | Type    | Required | Default | Description                                                                                                                                                                                                                                                                                                                            |
-|----------|---------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `id`     | string  | **Yes**  |         | *(Inherited from [BaseMetricAggregation](#basemetricaggregation))*                                                                                                                                                                                                                                                                     |
-| `type`   | string  | **Yes**  |         | *(Inherited from [BaseMetricAggregation](#basemetricaggregation))*<br/>Possible values are: `count`, `avg`, `sum`, `min`, `max`, `extended_stats`, `percentiles`, `cardinality`, `raw_document`, `raw_data`, `logs`, `rate`, `top_metrics`, `moving_avg`, `moving_fn`, `derivative`, `serial_diff`, `cumulative_sum`, `bucket_script`. |
-| `hide`   | boolean | No       |         | *(Inherited from [BaseMetricAggregation](#basemetricaggregation))*                                                                                                                                                                                                                                                                     |
-
-### BaseMetricAggregation
-
-| Property | Type    | Required | Default | Description                                                                                                                                                                                                                                                     |
-|----------|---------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `id`     | string  | **Yes**  |         |                                                                                                                                                                                                                                                                 |
-| `type`   | string  | **Yes**  |         | Possible values are: `count`, `avg`, `sum`, `min`, `max`, `extended_stats`, `percentiles`, `cardinality`, `raw_document`, `raw_data`, `logs`, `rate`, `top_metrics`, `moving_avg`, `moving_fn`, `derivative`, `serial_diff`, `cumulative_sum`, `bucket_script`. |
-| `hide`   | boolean | No       |         |                                                                                                                                                                                                                                                                 |
-
-### PipelineMetricAggregation
-
-| Property | Type                                                                                                                                            | Required | Default | Description |
-|----------|-------------------------------------------------------------------------------------------------------------------------------------------------|----------|---------|-------------|
-| `object` | Possible types are: [MovingAverage](#movingaverage), [Derivative](#derivative), [CumulativeSum](#cumulativesum), [BucketScript](#bucketscript). |          |         |
-
-### BucketScript
-
-It extends [PipelineMetricAggregationWithMultipleBucketPaths](#pipelinemetricaggregationwithmultiplebucketpaths).
-
-| Property            | Type                                    | Required | Default | Description                                                                                                                                                                                                                                                                                                                                                                                  |
-|---------------------|-----------------------------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `type`              | string                                  | **Yes**  |         | *(Inherited from [PipelineMetricAggregationWithMultipleBucketPaths](#pipelinemetricaggregationwithmultiplebucketpaths))*<br/>Possible values are: `count`, `avg`, `sum`, `min`, `max`, `extended_stats`, `percentiles`, `cardinality`, `raw_document`, `raw_data`, `logs`, `rate`, `top_metrics`, `moving_avg`, `moving_fn`, `derivative`, `serial_diff`, `cumulative_sum`, `bucket_script`. |
-| `hide`              | boolean                                 | No       |         | *(Inherited from [PipelineMetricAggregationWithMultipleBucketPaths](#pipelinemetricaggregationwithmultiplebucketpaths))*                                                                                                                                                                                                                                                                     |
-| `id`                | string                                  | No       |         | *(Inherited from [PipelineMetricAggregationWithMultipleBucketPaths](#pipelinemetricaggregationwithmultiplebucketpaths))*                                                                                                                                                                                                                                                                     |
-| `pipelineVariables` | [PipelineVariable](#pipelinevariable)[] | No       |         | *(Inherited from [PipelineMetricAggregationWithMultipleBucketPaths](#pipelinemetricaggregationwithmultiplebucketpaths))*                                                                                                                                                                                                                                                                     |
-| `settings`          | [object](#settings)                     | No       |         |                                                                                                                                                                                                                                                                                                                                                                                              |
-
-### PipelineMetricAggregationWithMultipleBucketPaths
-
-It extends [BaseMetricAggregation](#basemetricaggregation).
-
-| Property            | Type                                    | Required | Default | Description                                                                                                                                                                                                                                                                                                                            |
-|---------------------|-----------------------------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `id`                | string                                  | **Yes**  |         | *(Inherited from [BaseMetricAggregation](#basemetricaggregation))*                                                                                                                                                                                                                                                                     |
-| `type`              | string                                  | **Yes**  |         | *(Inherited from [BaseMetricAggregation](#basemetricaggregation))*<br/>Possible values are: `count`, `avg`, `sum`, `min`, `max`, `extended_stats`, `percentiles`, `cardinality`, `raw_document`, `raw_data`, `logs`, `rate`, `top_metrics`, `moving_avg`, `moving_fn`, `derivative`, `serial_diff`, `cumulative_sum`, `bucket_script`. |
-| `hide`              | boolean                                 | No       |         | *(Inherited from [BaseMetricAggregation](#basemetricaggregation))*                                                                                                                                                                                                                                                                     |
-| `pipelineVariables` | [PipelineVariable](#pipelinevariable)[] | No       |         |                                                                                                                                                                                                                                                                                                                                        |
-
-### PipelineVariable
-
-| Property      | Type   | Required | Default | Description |
-|---------------|--------|----------|---------|-------------|
-| `name`        | string | **Yes**  |         |             |
-| `pipelineAgg` | string | **Yes**  |         |             |
-
-### Settings
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-| `script` |      | No       |         |             |
-
-### CumulativeSum
-
-It extends [BasePipelineMetricAggregation](#basepipelinemetricaggregation).
-
-| Property      | Type                | Required | Default | Description                                                                                                                                                                                                                                                                                                                                            |
-|---------------|---------------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `type`        | string              | **Yes**  |         | *(Inherited from [BasePipelineMetricAggregation](#basepipelinemetricaggregation))*<br/>Possible values are: `count`, `avg`, `sum`, `min`, `max`, `extended_stats`, `percentiles`, `cardinality`, `raw_document`, `raw_data`, `logs`, `rate`, `top_metrics`, `moving_avg`, `moving_fn`, `derivative`, `serial_diff`, `cumulative_sum`, `bucket_script`. |
-| `field`       | string              | No       |         | *(Inherited from [BasePipelineMetricAggregation](#basepipelinemetricaggregation))*                                                                                                                                                                                                                                                                     |
-| `hide`        | boolean             | No       |         | *(Inherited from [BasePipelineMetricAggregation](#basepipelinemetricaggregation))*                                                                                                                                                                                                                                                                     |
-| `id`          | string              | No       |         | *(Inherited from [BasePipelineMetricAggregation](#basepipelinemetricaggregation))*                                                                                                                                                                                                                                                                     |
-| `pipelineAgg` | string              | No       |         | *(Inherited from [BasePipelineMetricAggregation](#basepipelinemetricaggregation))*                                                                                                                                                                                                                                                                     |
-| `settings`    | [object](#settings) | No       |         |                                                                                                                                                                                                                                                                                                                                                        |
-
-### BasePipelineMetricAggregation
-
-It extends [MetricAggregationWithField](#metricaggregationwithfield).
-
-| Property      | Type    | Required | Default | Description                                                                                                                                                                                                                                                                                                                                      |
-|---------------|---------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `type`        | string  | **Yes**  |         | *(Inherited from [MetricAggregationWithField](#metricaggregationwithfield))*<br/>Possible values are: `count`, `avg`, `sum`, `min`, `max`, `extended_stats`, `percentiles`, `cardinality`, `raw_document`, `raw_data`, `logs`, `rate`, `top_metrics`, `moving_avg`, `moving_fn`, `derivative`, `serial_diff`, `cumulative_sum`, `bucket_script`. |
-| `field`       | string  | No       |         | *(Inherited from [MetricAggregationWithField](#metricaggregationwithfield))*                                                                                                                                                                                                                                                                     |
-| `hide`        | boolean | No       |         | *(Inherited from [MetricAggregationWithField](#metricaggregationwithfield))*                                                                                                                                                                                                                                                                     |
-| `id`          | string  | No       |         | *(Inherited from [MetricAggregationWithField](#metricaggregationwithfield))*                                                                                                                                                                                                                                                                     |
-| `pipelineAgg` | string  | No       |         |                                                                                                                                                                                                                                                                                                                                                  |
-
-### MetricAggregationWithField
-
-It extends [BaseMetricAggregation](#basemetricaggregation).
-
-| Property | Type    | Required | Default | Description                                                                                                                                                                                                                                                                                                                            |
-|----------|---------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `id`     | string  | **Yes**  |         | *(Inherited from [BaseMetricAggregation](#basemetricaggregation))*                                                                                                                                                                                                                                                                     |
-| `type`   | string  | **Yes**  |         | *(Inherited from [BaseMetricAggregation](#basemetricaggregation))*<br/>Possible values are: `count`, `avg`, `sum`, `min`, `max`, `extended_stats`, `percentiles`, `cardinality`, `raw_document`, `raw_data`, `logs`, `rate`, `top_metrics`, `moving_avg`, `moving_fn`, `derivative`, `serial_diff`, `cumulative_sum`, `bucket_script`. |
-| `field`  | string  | No       |         |                                                                                                                                                                                                                                                                                                                                        |
-| `hide`   | boolean | No       |         | *(Inherited from [BaseMetricAggregation](#basemetricaggregation))*                                                                                                                                                                                                                                                                     |
-
-### Settings
-
-| Property | Type   | Required | Default | Description |
-|----------|--------|----------|---------|-------------|
-| `format` | string | No       |         |             |
-
-### Derivative
-
-It extends [BasePipelineMetricAggregation](#basepipelinemetricaggregation).
-
-| Property      | Type                | Required | Default | Description                                                                                                                                                                                                                                                                                                                                            |
-|---------------|---------------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `type`        | string              | **Yes**  |         | *(Inherited from [BasePipelineMetricAggregation](#basepipelinemetricaggregation))*<br/>Possible values are: `count`, `avg`, `sum`, `min`, `max`, `extended_stats`, `percentiles`, `cardinality`, `raw_document`, `raw_data`, `logs`, `rate`, `top_metrics`, `moving_avg`, `moving_fn`, `derivative`, `serial_diff`, `cumulative_sum`, `bucket_script`. |
-| `field`       | string              | No       |         | *(Inherited from [BasePipelineMetricAggregation](#basepipelinemetricaggregation))*                                                                                                                                                                                                                                                                     |
-| `hide`        | boolean             | No       |         | *(Inherited from [BasePipelineMetricAggregation](#basepipelinemetricaggregation))*                                                                                                                                                                                                                                                                     |
-| `id`          | string              | No       |         | *(Inherited from [BasePipelineMetricAggregation](#basepipelinemetricaggregation))*                                                                                                                                                                                                                                                                     |
-| `pipelineAgg` | string              | No       |         | *(Inherited from [BasePipelineMetricAggregation](#basepipelinemetricaggregation))*                                                                                                                                                                                                                                                                     |
-| `settings`    | [object](#settings) | No       |         |                                                                                                                                                                                                                                                                                                                                                        |
-
-### Settings
-
-| Property | Type   | Required | Default | Description |
-|----------|--------|----------|---------|-------------|
-| `unit`   | string | No       |         |             |
-
-### MovingAverage
-
-#MovingAverage's settings are overridden in types.ts
-
-It extends [BasePipelineMetricAggregation](#basepipelinemetricaggregation).
-
-| Property      | Type                | Required | Default | Description                                                                                                                                                                                                                                                                                                                                            |
-|---------------|---------------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `type`        | string              | **Yes**  |         | *(Inherited from [BasePipelineMetricAggregation](#basepipelinemetricaggregation))*<br/>Possible values are: `count`, `avg`, `sum`, `min`, `max`, `extended_stats`, `percentiles`, `cardinality`, `raw_document`, `raw_data`, `logs`, `rate`, `top_metrics`, `moving_avg`, `moving_fn`, `derivative`, `serial_diff`, `cumulative_sum`, `bucket_script`. |
-| `field`       | string              | No       |         | *(Inherited from [BasePipelineMetricAggregation](#basepipelinemetricaggregation))*                                                                                                                                                                                                                                                                     |
-| `hide`        | boolean             | No       |         | *(Inherited from [BasePipelineMetricAggregation](#basepipelinemetricaggregation))*                                                                                                                                                                                                                                                                     |
-| `id`          | string              | No       |         | *(Inherited from [BasePipelineMetricAggregation](#basepipelinemetricaggregation))*                                                                                                                                                                                                                                                                     |
-| `pipelineAgg` | string              | No       |         | *(Inherited from [BasePipelineMetricAggregation](#basepipelinemetricaggregation))*                                                                                                                                                                                                                                                                     |
-| `settings`    | [object](#settings) | No       |         |                                                                                                                                                                                                                                                                                                                                                        |
-
-### Settings
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Meta
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Settings
-
-| Property  | Type     | Required | Default | Description |
-|-----------|----------|----------|---------|-------------|
-| `metrics` | string[] | No       |         |             |
-| `orderBy` | string   | No       |         |             |
-| `order`   | string   | No       |         |             |
-
-
diff --git a/docs/sources/developers/kinds/composable/gauge/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/gauge/panelcfg/schema-reference.md
deleted file mode 100644
index be536fd6df690..0000000000000
--- a/docs/sources/developers/kinds/composable/gauge/panelcfg/schema-reference.md
+++ /dev/null
@@ -1,79 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: GaugePanelCfg kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## GaugePanelCfg
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property  | Type               | Required | Default | Description |
-|-----------|--------------------|----------|---------|-------------|
-| `Options` | [object](#options) | **Yes**  |         |             |
-
-### Options
-
-It extends [SingleStatBaseOptions](#singlestatbaseoptions).
-
-| Property               | Type                                            | Required | Default | Description                                                                                                                                 |
-|------------------------|-------------------------------------------------|----------|---------|---------------------------------------------------------------------------------------------------------------------------------------------|
-| `minVizHeight`         | uint32                                          | **Yes**  | `75`    |                                                                                                                                             |
-| `minVizWidth`          | uint32                                          | **Yes**  | `75`    |                                                                                                                                             |
-| `showThresholdLabels`  | boolean                                         | **Yes**  | `false` |                                                                                                                                             |
-| `showThresholdMarkers` | boolean                                         | **Yes**  | `true`  |                                                                                                                                             |
-| `orientation`          | string                                          | No       |         | *(Inherited from [SingleStatBaseOptions](#singlestatbaseoptions))*<br/>TODO docs<br/>Possible values are: `auto`, `vertical`, `horizontal`. |
-| `reduceOptions`        | [ReduceDataOptions](#reducedataoptions)         | No       |         | *(Inherited from [SingleStatBaseOptions](#singlestatbaseoptions))*<br/>TODO docs                                                            |
-| `text`                 | [VizTextDisplayOptions](#viztextdisplayoptions) | No       |         | *(Inherited from [SingleStatBaseOptions](#singlestatbaseoptions))*<br/>TODO docs                                                            |
-
-### ReduceDataOptions
-
-TODO docs
-
-| Property | Type     | Required | Default | Description                                                   |
-|----------|----------|----------|---------|---------------------------------------------------------------|
-| `calcs`  | string[] | **Yes**  |         | When !values, pick one value for the whole field              |
-| `fields` | string   | No       |         | Which fields to show.  By default this is only numeric fields |
-| `limit`  | number   | No       |         | if showing all values limit                                   |
-| `values` | boolean  | No       |         | If true show each row value                                   |
-
-### SingleStatBaseOptions
-
-TODO docs
-
-It extends [OptionsWithTextFormatting](#optionswithtextformatting).
-
-| Property        | Type                                            | Required | Default | Description                                                                              |
-|-----------------|-------------------------------------------------|----------|---------|------------------------------------------------------------------------------------------|
-| `orientation`   | string                                          | **Yes**  |         | TODO docs<br/>Possible values are: `auto`, `vertical`, `horizontal`.                     |
-| `reduceOptions` | [ReduceDataOptions](#reducedataoptions)         | **Yes**  |         | TODO docs                                                                                |
-| `text`          | [VizTextDisplayOptions](#viztextdisplayoptions) | No       |         | *(Inherited from [OptionsWithTextFormatting](#optionswithtextformatting))*<br/>TODO docs |
-
-### OptionsWithTextFormatting
-
-TODO docs
-
-| Property | Type                                            | Required | Default | Description |
-|----------|-------------------------------------------------|----------|---------|-------------|
-| `text`   | [VizTextDisplayOptions](#viztextdisplayoptions) | No       |         | TODO docs   |
-
-### VizTextDisplayOptions
-
-TODO docs
-
-| Property    | Type   | Required | Default | Description              |
-|-------------|--------|----------|---------|--------------------------|
-| `titleSize` | number | No       |         | Explicit title text size |
-| `valueSize` | number | No       |         | Explicit value text size |
-
-
diff --git a/docs/sources/developers/kinds/composable/geomap/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/geomap/panelcfg/schema-reference.md
deleted file mode 100644
index cfa0b3c913860..0000000000000
--- a/docs/sources/developers/kinds/composable/geomap/panelcfg/schema-reference.md
+++ /dev/null
@@ -1,97 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: GeomapPanelCfg kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## GeomapPanelCfg
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property          | Type                       | Required | Default | Description                                   |
-|-------------------|----------------------------|----------|---------|-----------------------------------------------|
-| `ControlsOptions` | [object](#controlsoptions) | **Yes**  |         |                                               |
-| `MapCenterID`     | string                     | **Yes**  |         | Possible values are: `zero`, `coords`, `fit`. |
-| `MapViewConfig`   | [object](#mapviewconfig)   | **Yes**  |         |                                               |
-| `Options`         | [object](#options)         | **Yes**  |         |                                               |
-| `TooltipMode`     | string                     | **Yes**  |         | Possible values are: `none`, `details`.       |
-| `TooltipOptions`  | [object](#tooltipoptions)  | **Yes**  |         |                                               |
-
-### ControlsOptions
-
-| Property          | Type    | Required | Default | Description              |
-|-------------------|---------|----------|---------|--------------------------|
-| `mouseWheelZoom`  | boolean | No       |         | let the mouse wheel zoom |
-| `showAttribution` | boolean | No       |         | Lower right              |
-| `showDebug`       | boolean | No       |         | Show debug               |
-| `showMeasure`     | boolean | No       |         | Show measure             |
-| `showScale`       | boolean | No       |         | Scale options            |
-| `showZoom`        | boolean | No       |         | Zoom (upper left)        |
-
-### MapViewConfig
-
-| Property    | Type    | Required | Default | Description |
-|-------------|---------|----------|---------|-------------|
-| `id`        | string  | **Yes**  | `zero`  |             |
-| `allLayers` | boolean | No       | `true`  |             |
-| `lastOnly`  | boolean | No       |         |             |
-| `lat`       | int64   | No       | `0`     |             |
-| `layer`     | string  | No       |         |             |
-| `lon`       | int64   | No       | `0`     |             |
-| `maxZoom`   | integer | No       |         |             |
-| `minZoom`   | integer | No       |         |             |
-| `padding`   | integer | No       |         |             |
-| `shared`    | boolean | No       |         |             |
-| `zoom`      | int64   | No       | `1`     |             |
-
-### Options
-
-| Property   | Type                                  | Required | Default | Description |
-|------------|---------------------------------------|----------|---------|-------------|
-| `basemap`  | [MapLayerOptions](#maplayeroptions)   | **Yes**  |         |             |
-| `controls` | [ControlsOptions](#controlsoptions)   | **Yes**  |         |             |
-| `layers`   | [MapLayerOptions](#maplayeroptions)[] | **Yes**  |         |             |
-| `tooltip`  | [TooltipOptions](#tooltipoptions)     | **Yes**  |         |             |
-| `view`     | [MapViewConfig](#mapviewconfig)       | **Yes**  |         |             |
-
-### MapLayerOptions
-
-| Property     | Type                                        | Required | Default | Description                                                                                                                |
-|--------------|---------------------------------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------|
-| `name`       | string                                      | **Yes**  |         | configured unique display name                                                                                             |
-| `type`       | string                                      | **Yes**  |         |                                                                                                                            |
-| `config`     |                                             | No       |         | Custom options depending on the type                                                                                       |
-| `filterData` |                                             | No       |         | Defines a frame MatcherConfig that may filter data for the given layer                                                     |
-| `location`   | [FrameGeometrySource](#framegeometrysource) | No       |         |                                                                                                                            |
-| `opacity`    | integer                                     | No       |         | Common properties:<br/>https://openlayers.org/en/latest/apidoc/module-ol_layer_Base-BaseLayer.html<br/>Layer opacity (0-1) |
-| `tooltip`    | boolean                                     | No       |         | Check tooltip (defaults to true)                                                                                           |
-
-### FrameGeometrySource
-
-| Property    | Type   | Required | Default | Description                                                 |
-|-------------|--------|----------|---------|-------------------------------------------------------------|
-| `mode`      | string | **Yes**  |         | Possible values are: `auto`, `geohash`, `coords`, `lookup`. |
-| `gazetteer` | string | No       |         | Path to Gazetteer                                           |
-| `geohash`   | string | No       |         | Field mappings                                              |
-| `latitude`  | string | No       |         |                                                             |
-| `longitude` | string | No       |         |                                                             |
-| `lookup`    | string | No       |         |                                                             |
-| `wkt`       | string | No       |         |                                                             |
-
-### TooltipOptions
-
-| Property | Type   | Required | Default | Description                             |
-|----------|--------|----------|---------|-----------------------------------------|
-| `mode`   | string | **Yes**  |         | Possible values are: `none`, `details`. |
-
-
diff --git a/docs/sources/developers/kinds/composable/googlecloudmonitoring/dataquery/schema-reference.md b/docs/sources/developers/kinds/composable/googlecloudmonitoring/dataquery/schema-reference.md
deleted file mode 100644
index d8f28ff51d6ee..0000000000000
--- a/docs/sources/developers/kinds/composable/googlecloudmonitoring/dataquery/schema-reference.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: GoogleCloudMonitoringDataQuery kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## GoogleCloudMonitoringDataQuery
-
-#### Maturity: [merged](../../../maturity/#merged)
-#### Version: 0.0
-
-
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-
diff --git a/docs/sources/developers/kinds/composable/grafanapyroscope/dataquery/schema-reference.md b/docs/sources/developers/kinds/composable/grafanapyroscope/dataquery/schema-reference.md
deleted file mode 100644
index f65e65989ffcd..0000000000000
--- a/docs/sources/developers/kinds/composable/grafanapyroscope/dataquery/schema-reference.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: GrafanaPyroscopeDataQuery kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## GrafanaPyroscopeDataQuery
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property        | Type     | Required | Default | Description                                                                                                                                                                                                                                             |
-|-----------------|----------|----------|---------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `groupBy`       | string[] | **Yes**  |         | Allows to group the results.                                                                                                                                                                                                                            |
-| `labelSelector` | string   | **Yes**  | `{}`    | Specifies the query label selectors.                                                                                                                                                                                                                    |
-| `profileTypeId` | string   | **Yes**  |         | Specifies the type of profile to query.                                                                                                                                                                                                                 |
-| `refId`         | string   | **Yes**  |         | A unique identifier for the query within the list of targets.<br/>In server side expressions, the refId is used as a variable name to identify results.<br/>By default, the UI will assign A->Z; however setting meaningful names may be useful.        |
-| `datasource`    |          | No       |         | For mixed data sources the selected datasource is on the query level.<br/>For non mixed scenarios this is undefined.<br/>TODO find a better way to do this ^ that's friendly to schema<br/>TODO this shouldn't be unknown but DataSourceRef &#124; null |
-| `hide`          | boolean  | No       |         | true if query is disabled (ie should not be returned to the dashboard)<br/>Note this does not always imply that the query should not be executed since<br/>the results from a hidden query may be used as the input to other queries (SSE etc)          |
-| `maxNodes`      | integer  | No       |         | Sets the maximum number of nodes in the flamegraph.                                                                                                                                                                                                     |
-| `queryType`     | string   | No       |         | Specify the query flavor<br/>TODO make this required and give it a default                                                                                                                                                                              |
-
-
diff --git a/docs/sources/developers/kinds/composable/heatmap/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/heatmap/panelcfg/schema-reference.md
deleted file mode 100644
index 89412c56f27d2..0000000000000
--- a/docs/sources/developers/kinds/composable/heatmap/panelcfg/schema-reference.md
+++ /dev/null
@@ -1,239 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: HeatmapPanelCfg kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## HeatmapPanelCfg
-
-#### Maturity: [merged](../../../maturity/#merged)
-#### Version: 0.0
-
-
-
-| Property              | Type                           | Required | Default | Description                                                                               |
-|-----------------------|--------------------------------|----------|---------|-------------------------------------------------------------------------------------------|
-| `CellValues`          | [object](#cellvalues)          | **Yes**  |         | Controls cell value options                                                               |
-| `ExemplarConfig`      | [object](#exemplarconfig)      | **Yes**  |         | Controls exemplar options                                                                 |
-| `FieldConfig`         | [object](#fieldconfig)         | **Yes**  |         |                                                                                           |
-| `FilterValueRange`    | [object](#filtervaluerange)    | **Yes**  |         | Controls the value filter range                                                           |
-| `HeatmapColorMode`    | string                         | **Yes**  |         | Controls the color mode of the heatmap<br/>Possible values are: `opacity`, `scheme`.      |
-| `HeatmapColorOptions` | [object](#heatmapcoloroptions) | **Yes**  |         | Controls various color options                                                            |
-| `HeatmapColorScale`   | string                         | **Yes**  |         | Controls the color scale of the heatmap<br/>Possible values are: `linear`, `exponential`. |
-| `HeatmapLegend`       | [object](#heatmaplegend)       | **Yes**  |         | Controls legend options                                                                   |
-| `HeatmapTooltip`      | [object](#heatmaptooltip)      | **Yes**  |         | Controls tooltip options                                                                  |
-| `Options`             | [object](#options)             | **Yes**  |         |                                                                                           |
-| `RowsHeatmapOptions`  | [object](#rowsheatmapoptions)  | **Yes**  |         | Controls frame rows options                                                               |
-| `YAxisConfig`         | [object](#yaxisconfig)         | **Yes**  |         | Configuration options for the yAxis                                                       |
-
-### CellValues
-
-Controls cell value options
-
-| Property   | Type   | Required | Default | Description                                     |
-|------------|--------|----------|---------|-------------------------------------------------|
-| `decimals` | number | No       |         | Controls the number of decimals for cell values |
-| `unit`     | string | No       |         | Controls the cell value unit                    |
-
-### ExemplarConfig
-
-Controls exemplar options
-
-| Property | Type   | Required | Default | Description                            |
-|----------|--------|----------|---------|----------------------------------------|
-| `color`  | string | **Yes**  |         | Sets the color of the exemplar markers |
-
-### FieldConfig
-
-It extends [HideableFieldConfig](#hideablefieldconfig).
-
-| Property            | Type                                                | Required | Default | Description                                                                  |
-|---------------------|-----------------------------------------------------|----------|---------|------------------------------------------------------------------------------|
-| `hideFrom`          | [HideSeriesConfig](#hideseriesconfig)               | No       |         | *(Inherited from [HideableFieldConfig](#hideablefieldconfig))*<br/>TODO docs |
-| `scaleDistribution` | [ScaleDistributionConfig](#scaledistributionconfig) | No       |         | TODO docs                                                                    |
-
-### HideSeriesConfig
-
-TODO docs
-
-| Property  | Type    | Required | Default | Description |
-|-----------|---------|----------|---------|-------------|
-| `legend`  | boolean | **Yes**  |         |             |
-| `tooltip` | boolean | **Yes**  |         |             |
-| `viz`     | boolean | **Yes**  |         |             |
-
-### HideableFieldConfig
-
-TODO docs
-
-| Property   | Type                                  | Required | Default | Description |
-|------------|---------------------------------------|----------|---------|-------------|
-| `hideFrom` | [HideSeriesConfig](#hideseriesconfig) | No       |         | TODO docs   |
-
-### ScaleDistributionConfig
-
-TODO docs
-
-| Property          | Type   | Required | Default | Description                                                              |
-|-------------------|--------|----------|---------|--------------------------------------------------------------------------|
-| `type`            | string | **Yes**  |         | TODO docs<br/>Possible values are: `linear`, `log`, `ordinal`, `symlog`. |
-| `linearThreshold` | number | No       |         |                                                                          |
-| `log`             | number | No       |         |                                                                          |
-
-### FilterValueRange
-
-Controls the value filter range
-
-| Property | Type   | Required | Default | Description                                                              |
-|----------|--------|----------|---------|--------------------------------------------------------------------------|
-| `ge`     | number | No       |         | Sets the filter range to values greater than or equal to the given value |
-| `le`     | number | No       |         | Sets the filter range to values less than or equal to the given value    |
-
-### HeatmapColorOptions
-
-Controls various color options
-
-| Property   | Type    | Required | Default | Description                                                                               |
-|------------|---------|----------|---------|-------------------------------------------------------------------------------------------|
-| `exponent` | number  | **Yes**  |         | Controls the exponent when scale is set to exponential                                    |
-| `fill`     | string  | **Yes**  |         | Controls the color fill when in opacity mode                                              |
-| `reverse`  | boolean | **Yes**  |         | Reverses the color scheme                                                                 |
-| `scheme`   | string  | **Yes**  |         | Controls the color scheme used                                                            |
-| `steps`    | integer | **Yes**  |         | Controls the number of color steps<br/>Constraint: `>=2 & <=128`.                         |
-| `max`      | number  | No       |         | Sets the maximum value for the color scale                                                |
-| `min`      | number  | No       |         | Sets the minimum value for the color scale                                                |
-| `mode`     | string  | No       |         | Controls the color mode of the heatmap<br/>Possible values are: `opacity`, `scheme`.      |
-| `scale`    | string  | No       |         | Controls the color scale of the heatmap<br/>Possible values are: `linear`, `exponential`. |
-
-### HeatmapLegend
-
-Controls legend options
-
-| Property | Type    | Required | Default | Description                     |
-|----------|---------|----------|---------|---------------------------------|
-| `show`   | boolean | **Yes**  |         | Controls if the legend is shown |
-
-### HeatmapTooltip
-
-Controls tooltip options
-
-| Property     | Type    | Required | Default | Description                                                    |
-|--------------|---------|----------|---------|----------------------------------------------------------------|
-| `show`       | boolean | **Yes**  |         | Controls if the tooltip is shown                               |
-| `yHistogram` | boolean | No       |         | Controls if the tooltip shows a histogram of the y-axis values |
-
-### Options
-
-| Property       | Type                                                    | Required | Default                                                                    | Description                                                                                                                                                                                     |
-|----------------|---------------------------------------------------------|----------|----------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `color`        | [object](#color)                                        | **Yes**  | `map[exponent:0.5 fill:dark-orange reverse:false scheme:Oranges steps:64]` | Controls the color options                                                                                                                                                                      |
-| `exemplars`    | [ExemplarConfig](#exemplarconfig)                       | **Yes**  |                                                                            | Controls exemplar options                                                                                                                                                                       |
-| `legend`       | [HeatmapLegend](#heatmaplegend)                         | **Yes**  |                                                                            | Controls legend options                                                                                                                                                                         |
-| `showValue`    | string                                                  | **Yes**  |                                                                            | &#124; *{<br/>	layout: ui.HeatmapCellLayout & "auto" // TODO: fix after remove when https://github.com/grafana/cuetsy/issues/74 is fixed<br/>}<br/>Controls the display of the value in the cell |
-| `tooltip`      | [HeatmapTooltip](#heatmaptooltip)                       | **Yes**  |                                                                            | Controls tooltip options                                                                                                                                                                        |
-| `yAxis`        | [YAxisConfig](#yaxisconfig)                             | **Yes**  |                                                                            | Configuration options for the yAxis                                                                                                                                                             |
-| `calculate`    | boolean                                                 | No       | `false`                                                                    | Controls if the heatmap should be calculated from data                                                                                                                                          |
-| `calculation`  | [HeatmapCalculationOptions](#heatmapcalculationoptions) | No       |                                                                            |                                                                                                                                                                                                 |
-| `cellGap`      | integer                                                 | No       | `1`                                                                        | Controls gap between cells<br/>Constraint: `>=0 & <=25`.                                                                                                                                        |
-| `cellRadius`   | number                                                  | No       |                                                                            | Controls cell radius                                                                                                                                                                            |
-| `cellValues`   | [object](#cellvalues)                                   | No       | `map[]`                                                                    | Controls cell value unit                                                                                                                                                                        |
-| `filterValues` | [object](#filtervalues)                                 | No       | `map[le:1e-09]`                                                            | Filters values between a given range                                                                                                                                                            |
-| `rowsFrame`    | [RowsHeatmapOptions](#rowsheatmapoptions)               | No       |                                                                            | Controls frame rows options                                                                                                                                                                     |
-
-### HeatmapCalculationOptions
-
-| Property   | Type                                                              | Required | Default | Description |
-|------------|-------------------------------------------------------------------|----------|---------|-------------|
-| `xBuckets` | [HeatmapCalculationBucketConfig](#heatmapcalculationbucketconfig) | No       |         |             |
-| `yBuckets` | [HeatmapCalculationBucketConfig](#heatmapcalculationbucketconfig) | No       |         |             |
-
-### HeatmapCalculationBucketConfig
-
-| Property | Type                                                | Required | Default | Description                                              |
-|----------|-----------------------------------------------------|----------|---------|----------------------------------------------------------|
-| `mode`   | string                                              | No       |         | Possible values are: `size`, `count`.                    |
-| `scale`  | [ScaleDistributionConfig](#scaledistributionconfig) | No       |         | TODO docs                                                |
-| `value`  | string                                              | No       |         | The number of buckets to use for the axis in the heatmap |
-
-### RowsHeatmapOptions
-
-Controls frame rows options
-
-| Property | Type   | Required | Default | Description                                              |
-|----------|--------|----------|---------|----------------------------------------------------------|
-| `layout` | string | No       |         | Possible values are: `le`, `ge`, `unknown`, `auto`.      |
-| `value`  | string | No       |         | Sets the name of the cell when not calculating from data |
-
-### YAxisConfig
-
-Configuration options for the yAxis
-
-It extends [AxisConfig](#axisconfig).
-
-| Property            | Type                                                | Required | Default | Description                                                                                                                             |
-|---------------------|-----------------------------------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| `axisBorderShow`    | boolean                                             | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                            |
-| `axisCenteredZero`  | boolean                                             | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                            |
-| `axisColorMode`     | string                                              | No       |         | *(Inherited from [AxisConfig](#axisconfig))*<br/>TODO docs<br/>Possible values are: `text`, `series`.                                   |
-| `axisGridShow`      | boolean                                             | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                            |
-| `axisLabel`         | string                                              | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                            |
-| `axisPlacement`     | string                                              | No       |         | *(Inherited from [AxisConfig](#axisconfig))*<br/>TODO docs<br/>Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. |
-| `axisSoftMax`       | number                                              | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                            |
-| `axisSoftMin`       | number                                              | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                            |
-| `axisWidth`         | number                                              | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                            |
-| `decimals`          | number                                              | No       |         | Controls the number of decimals for yAxis values                                                                                        |
-| `max`               | number                                              | No       |         | Sets the maximum value for the yAxis                                                                                                    |
-| `min`               | number                                              | No       |         | Sets the minimum value for the yAxis                                                                                                    |
-| `reverse`           | boolean                                             | No       |         | Reverses the yAxis                                                                                                                      |
-| `scaleDistribution` | [ScaleDistributionConfig](#scaledistributionconfig) | No       |         | *(Inherited from [AxisConfig](#axisconfig))*<br/>TODO docs                                                                              |
-| `unit`              | string                                              | No       |         | Sets the yAxis unit                                                                                                                     |
-
-### AxisConfig
-
-TODO docs
-
-| Property            | Type                                                | Required | Default | Description                                                                            |
-|---------------------|-----------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------|
-| `axisBorderShow`    | boolean                                             | No       |         |                                                                                        |
-| `axisCenteredZero`  | boolean                                             | No       |         |                                                                                        |
-| `axisColorMode`     | string                                              | No       |         | TODO docs<br/>Possible values are: `text`, `series`.                                   |
-| `axisGridShow`      | boolean                                             | No       |         |                                                                                        |
-| `axisLabel`         | string                                              | No       |         |                                                                                        |
-| `axisPlacement`     | string                                              | No       |         | TODO docs<br/>Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. |
-| `axisSoftMax`       | number                                              | No       |         |                                                                                        |
-| `axisSoftMin`       | number                                              | No       |         |                                                                                        |
-| `axisWidth`         | number                                              | No       |         |                                                                                        |
-| `scaleDistribution` | [ScaleDistributionConfig](#scaledistributionconfig) | No       |         | TODO docs                                                                              |
-
-### CellValues
-
-Controls cell value unit
-
-| Property | Type                              | Required | Default | Description |
-|----------|-----------------------------------|----------|---------|-------------|
-| `object` | Possible types are: [](#), [](#). |          |         |
-
-### Color
-
-Controls the color options
-
-| Property | Type                              | Required | Default | Description |
-|----------|-----------------------------------|----------|---------|-------------|
-| `object` | Possible types are: [](#), [](#). |          |         |
-
-### FilterValues
-
-Filters values between a given range
-
-| Property | Type                              | Required | Default | Description |
-|----------|-----------------------------------|----------|---------|-------------|
-| `object` | Possible types are: [](#), [](#). |          |         |
-
-
diff --git a/docs/sources/developers/kinds/composable/histogram/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/histogram/panelcfg/schema-reference.md
deleted file mode 100644
index f3f0efe92345a..0000000000000
--- a/docs/sources/developers/kinds/composable/histogram/panelcfg/schema-reference.md
+++ /dev/null
@@ -1,145 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: HistogramPanelCfg kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## HistogramPanelCfg
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property      | Type                   | Required | Default | Description |
-|---------------|------------------------|----------|---------|-------------|
-| `FieldConfig` | [object](#fieldconfig) | **Yes**  |         |             |
-| `Options`     | [object](#options)     | **Yes**  |         |             |
-
-### FieldConfig
-
-It extends [AxisConfig](#axisconfig) and [HideableFieldConfig](#hideablefieldconfig).
-
-| Property            | Type                                                | Required | Default | Description                                                                                                                                                                                                      |
-|---------------------|-----------------------------------------------------|----------|---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `axisBorderShow`    | boolean                                             | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                     |
-| `axisCenteredZero`  | boolean                                             | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                     |
-| `axisColorMode`     | string                                              | No       |         | *(Inherited from [AxisConfig](#axisconfig))*<br/>TODO docs<br/>Possible values are: `text`, `series`.                                                                                                            |
-| `axisGridShow`      | boolean                                             | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                     |
-| `axisLabel`         | string                                              | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                     |
-| `axisPlacement`     | string                                              | No       |         | *(Inherited from [AxisConfig](#axisconfig))*<br/>TODO docs<br/>Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`.                                                                          |
-| `axisSoftMax`       | number                                              | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                     |
-| `axisSoftMin`       | number                                              | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                     |
-| `axisWidth`         | number                                              | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                     |
-| `fillOpacity`       | integer                                             | No       | `80`    | Controls the fill opacity of the bars.<br/>Constraint: `>=0 & <=100`.                                                                                                                                            |
-| `gradientMode`      | string                                              | No       |         | Set the mode of the gradient fill. Fill gradient is based on the line color. To change the color, use the standard color scheme field option.<br/>Gradient appearance is influenced by the Fill opacity setting. |
-| `hideFrom`          | [HideSeriesConfig](#hideseriesconfig)               | No       |         | *(Inherited from [HideableFieldConfig](#hideablefieldconfig))*<br/>TODO docs                                                                                                                                     |
-| `lineWidth`         | integer                                             | No       | `1`     | Controls line width of the bars.<br/>Constraint: `>=0 & <=10`.                                                                                                                                                   |
-| `scaleDistribution` | [ScaleDistributionConfig](#scaledistributionconfig) | No       |         | *(Inherited from [AxisConfig](#axisconfig))*<br/>TODO docs                                                                                                                                                       |
-
-### AxisConfig
-
-TODO docs
-
-| Property            | Type                                                | Required | Default | Description                                                                            |
-|---------------------|-----------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------|
-| `axisBorderShow`    | boolean                                             | No       |         |                                                                                        |
-| `axisCenteredZero`  | boolean                                             | No       |         |                                                                                        |
-| `axisColorMode`     | string                                              | No       |         | TODO docs<br/>Possible values are: `text`, `series`.                                   |
-| `axisGridShow`      | boolean                                             | No       |         |                                                                                        |
-| `axisLabel`         | string                                              | No       |         |                                                                                        |
-| `axisPlacement`     | string                                              | No       |         | TODO docs<br/>Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. |
-| `axisSoftMax`       | number                                              | No       |         |                                                                                        |
-| `axisSoftMin`       | number                                              | No       |         |                                                                                        |
-| `axisWidth`         | number                                              | No       |         |                                                                                        |
-| `scaleDistribution` | [ScaleDistributionConfig](#scaledistributionconfig) | No       |         | TODO docs                                                                              |
-
-### ScaleDistributionConfig
-
-TODO docs
-
-| Property          | Type   | Required | Default | Description                                                              |
-|-------------------|--------|----------|---------|--------------------------------------------------------------------------|
-| `type`            | string | **Yes**  |         | TODO docs<br/>Possible values are: `linear`, `log`, `ordinal`, `symlog`. |
-| `linearThreshold` | number | No       |         |                                                                          |
-| `log`             | number | No       |         |                                                                          |
-
-### HideSeriesConfig
-
-TODO docs
-
-| Property  | Type    | Required | Default | Description |
-|-----------|---------|----------|---------|-------------|
-| `legend`  | boolean | **Yes**  |         |             |
-| `tooltip` | boolean | **Yes**  |         |             |
-| `viz`     | boolean | **Yes**  |         |             |
-
-### HideableFieldConfig
-
-TODO docs
-
-| Property   | Type                                  | Required | Default | Description |
-|------------|---------------------------------------|----------|---------|-------------|
-| `hideFrom` | [HideSeriesConfig](#hideseriesconfig) | No       |         | TODO docs   |
-
-### Options
-
-It extends [OptionsWithLegend](#optionswithlegend) and [OptionsWithTooltip](#optionswithtooltip).
-
-| Property       | Type                                    | Required | Default | Description                                                                |
-|----------------|-----------------------------------------|----------|---------|----------------------------------------------------------------------------|
-| `legend`       | [VizLegendOptions](#vizlegendoptions)   | **Yes**  |         | *(Inherited from [OptionsWithLegend](#optionswithlegend))*<br/>TODO docs   |
-| `tooltip`      | [VizTooltipOptions](#viztooltipoptions) | **Yes**  |         | *(Inherited from [OptionsWithTooltip](#optionswithtooltip))*<br/>TODO docs |
-| `bucketOffset` | int32                                   | No       | `0`     | Offset buckets by this amount                                              |
-| `bucketSize`   | integer                                 | No       |         | Size of each bucket                                                        |
-| `combine`      | boolean                                 | No       |         | Combines multiple series into a single histogram                           |
-
-### OptionsWithLegend
-
-TODO docs
-
-| Property | Type                                  | Required | Default | Description |
-|----------|---------------------------------------|----------|---------|-------------|
-| `legend` | [VizLegendOptions](#vizlegendoptions) | **Yes**  |         | TODO docs   |
-
-### VizLegendOptions
-
-TODO docs
-
-| Property      | Type     | Required | Default | Description                                                                                                                             |
-|---------------|----------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| `calcs`       | string[] | **Yes**  |         |                                                                                                                                         |
-| `displayMode` | string   | **Yes**  |         | TODO docs<br/>Note: "hidden" needs to remain as an option for plugins compatibility<br/>Possible values are: `list`, `table`, `hidden`. |
-| `placement`   | string   | **Yes**  |         | TODO docs<br/>Possible values are: `bottom`, `right`.                                                                                   |
-| `showLegend`  | boolean  | **Yes**  |         |                                                                                                                                         |
-| `asTable`     | boolean  | No       |         |                                                                                                                                         |
-| `isVisible`   | boolean  | No       |         |                                                                                                                                         |
-| `sortBy`      | string   | No       |         |                                                                                                                                         |
-| `sortDesc`    | boolean  | No       |         |                                                                                                                                         |
-| `width`       | number   | No       |         |                                                                                                                                         |
-
-### OptionsWithTooltip
-
-TODO docs
-
-| Property  | Type                                    | Required | Default | Description |
-|-----------|-----------------------------------------|----------|---------|-------------|
-| `tooltip` | [VizTooltipOptions](#viztooltipoptions) | **Yes**  |         | TODO docs   |
-
-### VizTooltipOptions
-
-TODO docs
-
-| Property | Type   | Required | Default | Description                                                   |
-|----------|--------|----------|---------|---------------------------------------------------------------|
-| `mode`   | string | **Yes**  |         | TODO docs<br/>Possible values are: `single`, `multi`, `none`. |
-| `sort`   | string | **Yes**  |         | TODO docs<br/>Possible values are: `asc`, `desc`, `none`.     |
-
-
diff --git a/docs/sources/developers/kinds/composable/logs/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/logs/panelcfg/schema-reference.md
deleted file mode 100644
index 3a883dcad8ef2..0000000000000
--- a/docs/sources/developers/kinds/composable/logs/panelcfg/schema-reference.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: LogsPanelCfg kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## LogsPanelCfg
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property  | Type               | Required | Default | Description |
-|-----------|--------------------|----------|---------|-------------|
-| `Options` | [object](#options) | **Yes**  |         |             |
-
-### Options
-
-| Property             | Type    | Required | Default | Description                                                   |
-|----------------------|---------|----------|---------|---------------------------------------------------------------|
-| `dedupStrategy`      | string  | **Yes**  |         | Possible values are: `none`, `exact`, `numbers`, `signature`. |
-| `enableLogDetails`   | boolean | **Yes**  |         |                                                               |
-| `prettifyLogMessage` | boolean | **Yes**  |         |                                                               |
-| `showCommonLabels`   | boolean | **Yes**  |         |                                                               |
-| `showLabels`         | boolean | **Yes**  |         |                                                               |
-| `showTime`           | boolean | **Yes**  |         |                                                               |
-| `sortOrder`          | string  | **Yes**  |         | Possible values are: `Descending`, `Ascending`.               |
-| `wrapLogMessage`     | boolean | **Yes**  |         |                                                               |
-
-
diff --git a/docs/sources/developers/kinds/composable/loki/dataquery/schema-reference.md b/docs/sources/developers/kinds/composable/loki/dataquery/schema-reference.md
deleted file mode 100644
index d7cfba8b09af7..0000000000000
--- a/docs/sources/developers/kinds/composable/loki/dataquery/schema-reference.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: LokiDataQuery kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## LokiDataQuery
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property       | Type    | Required | Default | Description                                                                                                                                                                                                                                             |
-|----------------|---------|----------|---------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `expr`         | string  | **Yes**  |         | The LogQL query.                                                                                                                                                                                                                                        |
-| `refId`        | string  | **Yes**  |         | A unique identifier for the query within the list of targets.<br/>In server side expressions, the refId is used as a variable name to identify results.<br/>By default, the UI will assign A->Z; however setting meaningful names may be useful.        |
-| `datasource`   |         | No       |         | For mixed data sources the selected datasource is on the query level.<br/>For non mixed scenarios this is undefined.<br/>TODO find a better way to do this ^ that's friendly to schema<br/>TODO this shouldn't be unknown but DataSourceRef &#124; null |
-| `editorMode`   | string  | No       |         | Possible values are: `code`, `builder`.                                                                                                                                                                                                                 |
-| `hide`         | boolean | No       |         | true if query is disabled (ie should not be returned to the dashboard)<br/>Note this does not always imply that the query should not be executed since<br/>the results from a hidden query may be used as the input to other queries (SSE etc)          |
-| `instant`      | boolean | No       |         | @deprecated, now use queryType.                                                                                                                                                                                                                         |
-| `legendFormat` | string  | No       |         | Used to override the name of the series.                                                                                                                                                                                                                |
-| `maxLines`     | integer | No       |         | Used to limit the number of log rows returned.                                                                                                                                                                                                          |
-| `queryType`    | string  | No       |         | Specify the query flavor<br/>TODO make this required and give it a default                                                                                                                                                                              |
-| `range`        | boolean | No       |         | @deprecated, now use queryType.                                                                                                                                                                                                                         |
-| `resolution`   | integer | No       |         | @deprecated, now use step.                                                                                                                                                                                                                              |
-| `step`         | string  | No       |         | Used to set step value for range queries.                                                                                                                                                                                                               |
-
-
diff --git a/docs/sources/developers/kinds/composable/news/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/news/panelcfg/schema-reference.md
deleted file mode 100644
index f4290acc9a8e8..0000000000000
--- a/docs/sources/developers/kinds/composable/news/panelcfg/schema-reference.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: NewsPanelCfg kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## NewsPanelCfg
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property  | Type               | Required | Default | Description |
-|-----------|--------------------|----------|---------|-------------|
-| `Options` | [object](#options) | **Yes**  |         |             |
-
-### Options
-
-| Property    | Type    | Required | Default | Description                                |
-|-------------|---------|----------|---------|--------------------------------------------|
-| `feedUrl`   | string  | No       |         | empty/missing will default to grafana blog |
-| `showImage` | boolean | No       | `true`  |                                            |
-
-
diff --git a/docs/sources/developers/kinds/composable/nodegraph/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/nodegraph/panelcfg/schema-reference.md
deleted file mode 100644
index 1ac4a3f7a3461..0000000000000
--- a/docs/sources/developers/kinds/composable/nodegraph/panelcfg/schema-reference.md
+++ /dev/null
@@ -1,57 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: NodeGraphPanelCfg kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## NodeGraphPanelCfg
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property      | Type                   | Required | Default | Description |
-|---------------|------------------------|----------|---------|-------------|
-| `ArcOption`   | [object](#arcoption)   | **Yes**  |         |             |
-| `EdgeOptions` | [object](#edgeoptions) | **Yes**  |         |             |
-| `NodeOptions` | [object](#nodeoptions) | **Yes**  |         |             |
-| `Options`     | [object](#options)     | **Yes**  |         |             |
-
-### ArcOption
-
-| Property | Type   | Required | Default | Description                                                                                         |
-|----------|--------|----------|---------|-----------------------------------------------------------------------------------------------------|
-| `color`  | string | No       |         | The color of the arc.                                                                               |
-| `field`  | string | No       |         | Field from which to get the value. Values should be less than 1, representing fraction of a circle. |
-
-### EdgeOptions
-
-| Property            | Type   | Required | Default | Description                                                                 |
-|---------------------|--------|----------|---------|-----------------------------------------------------------------------------|
-| `mainStatUnit`      | string | No       |         | Unit for the main stat to override what ever is set in the data frame.      |
-| `secondaryStatUnit` | string | No       |         | Unit for the secondary stat to override what ever is set in the data frame. |
-
-### NodeOptions
-
-| Property            | Type                      | Required | Default | Description                                                                             |
-|---------------------|---------------------------|----------|---------|-----------------------------------------------------------------------------------------|
-| `arcs`              | [ArcOption](#arcoption)[] | No       |         | Define which fields are shown as part of the node arc (colored circle around the node). |
-| `mainStatUnit`      | string                    | No       |         | Unit for the main stat to override what ever is set in the data frame.                  |
-| `secondaryStatUnit` | string                    | No       |         | Unit for the secondary stat to override what ever is set in the data frame.             |
-
-### Options
-
-| Property | Type                        | Required | Default | Description |
-|----------|-----------------------------|----------|---------|-------------|
-| `edges`  | [EdgeOptions](#edgeoptions) | No       |         |             |
-| `nodes`  | [NodeOptions](#nodeoptions) | No       |         |             |
-
-
diff --git a/docs/sources/developers/kinds/composable/parca/dataquery/schema-reference.md b/docs/sources/developers/kinds/composable/parca/dataquery/schema-reference.md
deleted file mode 100644
index baf0cc6be0010..0000000000000
--- a/docs/sources/developers/kinds/composable/parca/dataquery/schema-reference.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: ParcaDataQuery kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## ParcaDataQuery
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property        | Type    | Required | Default | Description                                                                                                                                                                                                                                             |
-|-----------------|---------|----------|---------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `labelSelector` | string  | **Yes**  | `{}`    | Specifies the query label selectors.                                                                                                                                                                                                                    |
-| `profileTypeId` | string  | **Yes**  |         | Specifies the type of profile to query.                                                                                                                                                                                                                 |
-| `refId`         | string  | **Yes**  |         | A unique identifier for the query within the list of targets.<br/>In server side expressions, the refId is used as a variable name to identify results.<br/>By default, the UI will assign A->Z; however setting meaningful names may be useful.        |
-| `datasource`    |         | No       |         | For mixed data sources the selected datasource is on the query level.<br/>For non mixed scenarios this is undefined.<br/>TODO find a better way to do this ^ that's friendly to schema<br/>TODO this shouldn't be unknown but DataSourceRef &#124; null |
-| `hide`          | boolean | No       |         | true if query is disabled (ie should not be returned to the dashboard)<br/>Note this does not always imply that the query should not be executed since<br/>the results from a hidden query may be used as the input to other queries (SSE etc)          |
-| `queryType`     | string  | No       |         | Specify the query flavor<br/>TODO make this required and give it a default                                                                                                                                                                              |
-
-
diff --git a/docs/sources/developers/kinds/composable/piechart/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/piechart/panelcfg/schema-reference.md
deleted file mode 100644
index 9c2a8060c23f9..0000000000000
--- a/docs/sources/developers/kinds/composable/piechart/panelcfg/schema-reference.md
+++ /dev/null
@@ -1,152 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: PieChartPanelCfg kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## PieChartPanelCfg
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property                | Type                                        | Required | Default | Description                                                                                                                                                                                                                   |
-|-------------------------|---------------------------------------------|----------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `FieldConfig`           | [HideableFieldConfig](#hideablefieldconfig) | **Yes**  |         | TODO docs                                                                                                                                                                                                                     |
-| `Options`               | [object](#options)                          | **Yes**  |         |                                                                                                                                                                                                                               |
-| `PieChartLabels`        | string                                      | **Yes**  |         | Select labels to display on the pie chart.<br/> - Name - The series or field name.<br/> - Percent - The percentage of the whole.<br/> - Value - The raw numerical value.<br/>Possible values are: `name`, `value`, `percent`. |
-| `PieChartLegendOptions` | [object](#piechartlegendoptions)            | **Yes**  |         |                                                                                                                                                                                                                               |
-| `PieChartLegendValues`  | string                                      | **Yes**  |         | Select values to display in the legend.<br/> - Percent: The percentage of the whole.<br/> - Value: The raw numerical value.<br/>Possible values are: `value`, `percent`.                                                      |
-| `PieChartType`          | string                                      | **Yes**  |         | Select the pie chart display style.<br/>Possible values are: `pie`, `donut`.                                                                                                                                                  |
-
-### HideableFieldConfig
-
-TODO docs
-
-| Property   | Type                                  | Required | Default | Description |
-|------------|---------------------------------------|----------|---------|-------------|
-| `hideFrom` | [HideSeriesConfig](#hideseriesconfig) | No       |         | TODO docs   |
-
-### HideSeriesConfig
-
-TODO docs
-
-| Property  | Type    | Required | Default | Description |
-|-----------|---------|----------|---------|-------------|
-| `legend`  | boolean | **Yes**  |         |             |
-| `tooltip` | boolean | **Yes**  |         |             |
-| `viz`     | boolean | **Yes**  |         |             |
-
-### Options
-
-It extends [OptionsWithTooltip](#optionswithtooltip) and [SingleStatBaseOptions](#singlestatbaseoptions).
-
-| Property        | Type                                            | Required | Default | Description                                                                                                                                 |
-|-----------------|-------------------------------------------------|----------|---------|---------------------------------------------------------------------------------------------------------------------------------------------|
-| `displayLabels` | string[]                                        | **Yes**  |         |                                                                                                                                             |
-| `legend`        | [PieChartLegendOptions](#piechartlegendoptions) | **Yes**  |         |                                                                                                                                             |
-| `pieType`       | string                                          | **Yes**  |         | Select the pie chart display style.<br/>Possible values are: `pie`, `donut`.                                                                |
-| `tooltip`       | [VizTooltipOptions](#viztooltipoptions)         | **Yes**  |         | *(Inherited from [OptionsWithTooltip](#optionswithtooltip))*<br/>TODO docs                                                                  |
-| `orientation`   | string                                          | No       |         | *(Inherited from [SingleStatBaseOptions](#singlestatbaseoptions))*<br/>TODO docs<br/>Possible values are: `auto`, `vertical`, `horizontal`. |
-| `reduceOptions` | [ReduceDataOptions](#reducedataoptions)         | No       |         | *(Inherited from [SingleStatBaseOptions](#singlestatbaseoptions))*<br/>TODO docs                                                            |
-| `text`          | [VizTextDisplayOptions](#viztextdisplayoptions) | No       |         | *(Inherited from [SingleStatBaseOptions](#singlestatbaseoptions))*<br/>TODO docs                                                            |
-
-### OptionsWithTooltip
-
-TODO docs
-
-| Property  | Type                                    | Required | Default | Description |
-|-----------|-----------------------------------------|----------|---------|-------------|
-| `tooltip` | [VizTooltipOptions](#viztooltipoptions) | **Yes**  |         | TODO docs   |
-
-### VizTooltipOptions
-
-TODO docs
-
-| Property | Type   | Required | Default | Description                                                   |
-|----------|--------|----------|---------|---------------------------------------------------------------|
-| `mode`   | string | **Yes**  |         | TODO docs<br/>Possible values are: `single`, `multi`, `none`. |
-| `sort`   | string | **Yes**  |         | TODO docs<br/>Possible values are: `asc`, `desc`, `none`.     |
-
-### PieChartLegendOptions
-
-It extends [VizLegendOptions](#vizlegendoptions).
-
-| Property      | Type     | Required | Default | Description                                                                                                                                                                                          |
-|---------------|----------|----------|---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `calcs`       | string[] | **Yes**  |         | *(Inherited from [VizLegendOptions](#vizlegendoptions))*                                                                                                                                             |
-| `displayMode` | string   | **Yes**  |         | *(Inherited from [VizLegendOptions](#vizlegendoptions))*<br/>TODO docs<br/>Note: "hidden" needs to remain as an option for plugins compatibility<br/>Possible values are: `list`, `table`, `hidden`. |
-| `placement`   | string   | **Yes**  |         | *(Inherited from [VizLegendOptions](#vizlegendoptions))*<br/>TODO docs<br/>Possible values are: `bottom`, `right`.                                                                                   |
-| `showLegend`  | boolean  | **Yes**  |         | *(Inherited from [VizLegendOptions](#vizlegendoptions))*                                                                                                                                             |
-| `values`      | string[] | **Yes**  |         |                                                                                                                                                                                                      |
-| `asTable`     | boolean  | No       |         | *(Inherited from [VizLegendOptions](#vizlegendoptions))*                                                                                                                                             |
-| `isVisible`   | boolean  | No       |         | *(Inherited from [VizLegendOptions](#vizlegendoptions))*                                                                                                                                             |
-| `sortBy`      | string   | No       |         | *(Inherited from [VizLegendOptions](#vizlegendoptions))*                                                                                                                                             |
-| `sortDesc`    | boolean  | No       |         | *(Inherited from [VizLegendOptions](#vizlegendoptions))*                                                                                                                                             |
-| `width`       | number   | No       |         | *(Inherited from [VizLegendOptions](#vizlegendoptions))*                                                                                                                                             |
-
-### VizLegendOptions
-
-TODO docs
-
-| Property      | Type     | Required | Default | Description                                                                                                                             |
-|---------------|----------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| `calcs`       | string[] | **Yes**  |         |                                                                                                                                         |
-| `displayMode` | string   | **Yes**  |         | TODO docs<br/>Note: "hidden" needs to remain as an option for plugins compatibility<br/>Possible values are: `list`, `table`, `hidden`. |
-| `placement`   | string   | **Yes**  |         | TODO docs<br/>Possible values are: `bottom`, `right`.                                                                                   |
-| `showLegend`  | boolean  | **Yes**  |         |                                                                                                                                         |
-| `asTable`     | boolean  | No       |         |                                                                                                                                         |
-| `isVisible`   | boolean  | No       |         |                                                                                                                                         |
-| `sortBy`      | string   | No       |         |                                                                                                                                         |
-| `sortDesc`    | boolean  | No       |         |                                                                                                                                         |
-| `width`       | number   | No       |         |                                                                                                                                         |
-
-### ReduceDataOptions
-
-TODO docs
-
-| Property | Type     | Required | Default | Description                                                   |
-|----------|----------|----------|---------|---------------------------------------------------------------|
-| `calcs`  | string[] | **Yes**  |         | When !values, pick one value for the whole field              |
-| `fields` | string   | No       |         | Which fields to show.  By default this is only numeric fields |
-| `limit`  | number   | No       |         | if showing all values limit                                   |
-| `values` | boolean  | No       |         | If true show each row value                                   |
-
-### SingleStatBaseOptions
-
-TODO docs
-
-It extends [OptionsWithTextFormatting](#optionswithtextformatting).
-
-| Property        | Type                                            | Required | Default | Description                                                                              |
-|-----------------|-------------------------------------------------|----------|---------|------------------------------------------------------------------------------------------|
-| `orientation`   | string                                          | **Yes**  |         | TODO docs<br/>Possible values are: `auto`, `vertical`, `horizontal`.                     |
-| `reduceOptions` | [ReduceDataOptions](#reducedataoptions)         | **Yes**  |         | TODO docs                                                                                |
-| `text`          | [VizTextDisplayOptions](#viztextdisplayoptions) | No       |         | *(Inherited from [OptionsWithTextFormatting](#optionswithtextformatting))*<br/>TODO docs |
-
-### OptionsWithTextFormatting
-
-TODO docs
-
-| Property | Type                                            | Required | Default | Description |
-|----------|-------------------------------------------------|----------|---------|-------------|
-| `text`   | [VizTextDisplayOptions](#viztextdisplayoptions) | No       |         | TODO docs   |
-
-### VizTextDisplayOptions
-
-TODO docs
-
-| Property    | Type   | Required | Default | Description              |
-|-------------|--------|----------|---------|--------------------------|
-| `titleSize` | number | No       |         | Explicit title text size |
-| `valueSize` | number | No       |         | Explicit value text size |
-
-
diff --git a/docs/sources/developers/kinds/composable/prometheus/dataquery/schema-reference.md b/docs/sources/developers/kinds/composable/prometheus/dataquery/schema-reference.md
deleted file mode 100644
index 07bc7b865de8f..0000000000000
--- a/docs/sources/developers/kinds/composable/prometheus/dataquery/schema-reference.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: PrometheusDataQuery kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## PrometheusDataQuery
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property         | Type    | Required | Default | Description                                                                                                                                                                                                                                             |
-|------------------|---------|----------|---------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `expr`           | string  | **Yes**  |         | The actual expression/query that will be evaluated by Prometheus                                                                                                                                                                                        |
-| `refId`          | string  | **Yes**  |         | A unique identifier for the query within the list of targets.<br/>In server side expressions, the refId is used as a variable name to identify results.<br/>By default, the UI will assign A->Z; however setting meaningful names may be useful.        |
-| `datasource`     |         | No       |         | For mixed data sources the selected datasource is on the query level.<br/>For non mixed scenarios this is undefined.<br/>TODO find a better way to do this ^ that's friendly to schema<br/>TODO this shouldn't be unknown but DataSourceRef &#124; null |
-| `editorMode`     | string  | No       |         | Possible values are: `code`, `builder`.                                                                                                                                                                                                                 |
-| `exemplar`       | boolean | No       |         | Execute an additional query to identify interesting raw samples relevant for the given expr                                                                                                                                                             |
-| `format`         | string  | No       |         | Possible values are: `time_series`, `table`, `heatmap`.                                                                                                                                                                                                 |
-| `hide`           | boolean | No       |         | true if query is disabled (ie should not be returned to the dashboard)<br/>Note this does not always imply that the query should not be executed since<br/>the results from a hidden query may be used as the input to other queries (SSE etc)          |
-| `instant`        | boolean | No       |         | Returns only the latest value that Prometheus has scraped for the requested time series                                                                                                                                                                 |
-| `intervalFactor` | number  | No       |         | @deprecated Used to specify how many times to divide max data points by. We use max data points under query options<br/>See https://github.com/grafana/grafana/issues/48081                                                                             |
-| `legendFormat`   | string  | No       |         | Series name override or template. Ex. {{hostname}} will be replaced with label value for hostname                                                                                                                                                       |
-| `queryType`      | string  | No       |         | Specify the query flavor<br/>TODO make this required and give it a default                                                                                                                                                                              |
-| `range`          | boolean | No       |         | Returns a Range vector, comprised of a set of time series containing a range of data points over time for each time series                                                                                                                              |
-
-
diff --git a/docs/sources/developers/kinds/composable/stat/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/stat/panelcfg/schema-reference.md
deleted file mode 100644
index e83f6c0b6084e..0000000000000
--- a/docs/sources/developers/kinds/composable/stat/panelcfg/schema-reference.md
+++ /dev/null
@@ -1,79 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: StatPanelCfg kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## StatPanelCfg
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property  | Type               | Required | Default | Description |
-|-----------|--------------------|----------|---------|-------------|
-| `Options` | [object](#options) | **Yes**  |         |             |
-
-### Options
-
-It extends [SingleStatBaseOptions](#singlestatbaseoptions).
-
-| Property        | Type                                            | Required | Default | Description                                                                                                                                 |
-|-----------------|-------------------------------------------------|----------|---------|---------------------------------------------------------------------------------------------------------------------------------------------|
-| `colorMode`     | string                                          | **Yes**  |         | TODO docs<br/>Possible values are: `value`, `background`, `background_solid`, `none`.                                                       |
-| `graphMode`     | string                                          | **Yes**  |         | TODO docs<br/>Possible values are: `none`, `line`, `area`.                                                                                  |
-| `justifyMode`   | string                                          | **Yes**  |         | TODO docs<br/>Possible values are: `auto`, `center`.                                                                                        |
-| `textMode`      | string                                          | **Yes**  |         | TODO docs<br/>Possible values are: `auto`, `value`, `value_and_name`, `name`, `none`.                                                       |
-| `orientation`   | string                                          | No       |         | *(Inherited from [SingleStatBaseOptions](#singlestatbaseoptions))*<br/>TODO docs<br/>Possible values are: `auto`, `vertical`, `horizontal`. |
-| `reduceOptions` | [ReduceDataOptions](#reducedataoptions)         | No       |         | *(Inherited from [SingleStatBaseOptions](#singlestatbaseoptions))*<br/>TODO docs                                                            |
-| `text`          | [VizTextDisplayOptions](#viztextdisplayoptions) | No       |         | *(Inherited from [SingleStatBaseOptions](#singlestatbaseoptions))*<br/>TODO docs                                                            |
-
-### ReduceDataOptions
-
-TODO docs
-
-| Property | Type     | Required | Default | Description                                                   |
-|----------|----------|----------|---------|---------------------------------------------------------------|
-| `calcs`  | string[] | **Yes**  |         | When !values, pick one value for the whole field              |
-| `fields` | string   | No       |         | Which fields to show.  By default this is only numeric fields |
-| `limit`  | number   | No       |         | if showing all values limit                                   |
-| `values` | boolean  | No       |         | If true show each row value                                   |
-
-### SingleStatBaseOptions
-
-TODO docs
-
-It extends [OptionsWithTextFormatting](#optionswithtextformatting).
-
-| Property        | Type                                            | Required | Default | Description                                                                              |
-|-----------------|-------------------------------------------------|----------|---------|------------------------------------------------------------------------------------------|
-| `orientation`   | string                                          | **Yes**  |         | TODO docs<br/>Possible values are: `auto`, `vertical`, `horizontal`.                     |
-| `reduceOptions` | [ReduceDataOptions](#reducedataoptions)         | **Yes**  |         | TODO docs                                                                                |
-| `text`          | [VizTextDisplayOptions](#viztextdisplayoptions) | No       |         | *(Inherited from [OptionsWithTextFormatting](#optionswithtextformatting))*<br/>TODO docs |
-
-### OptionsWithTextFormatting
-
-TODO docs
-
-| Property | Type                                            | Required | Default | Description |
-|----------|-------------------------------------------------|----------|---------|-------------|
-| `text`   | [VizTextDisplayOptions](#viztextdisplayoptions) | No       |         | TODO docs   |
-
-### VizTextDisplayOptions
-
-TODO docs
-
-| Property    | Type   | Required | Default | Description              |
-|-------------|--------|----------|---------|--------------------------|
-| `titleSize` | number | No       |         | Explicit title text size |
-| `valueSize` | number | No       |         | Explicit value text size |
-
-
diff --git a/docs/sources/developers/kinds/composable/statetimeline/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/statetimeline/panelcfg/schema-reference.md
deleted file mode 100644
index be3e14fdc3598..0000000000000
--- a/docs/sources/developers/kinds/composable/statetimeline/panelcfg/schema-reference.md
+++ /dev/null
@@ -1,117 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: StateTimelinePanelCfg kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## StateTimelinePanelCfg
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property      | Type                   | Required | Default | Description |
-|---------------|------------------------|----------|---------|-------------|
-| `FieldConfig` | [object](#fieldconfig) | **Yes**  |         |             |
-| `Options`     | [object](#options)     | **Yes**  |         |             |
-
-### FieldConfig
-
-It extends [HideableFieldConfig](#hideablefieldconfig).
-
-| Property      | Type                                  | Required | Default | Description                                                                  |
-|---------------|---------------------------------------|----------|---------|------------------------------------------------------------------------------|
-| `fillOpacity` | integer                               | No       | `70`    | Constraint: `>=0 & <=100`.                                                   |
-| `hideFrom`    | [HideSeriesConfig](#hideseriesconfig) | No       |         | *(Inherited from [HideableFieldConfig](#hideablefieldconfig))*<br/>TODO docs |
-| `lineWidth`   | integer                               | No       | `0`     | Constraint: `>=0 & <=10`.                                                    |
-
-### HideSeriesConfig
-
-TODO docs
-
-| Property  | Type    | Required | Default | Description |
-|-----------|---------|----------|---------|-------------|
-| `legend`  | boolean | **Yes**  |         |             |
-| `tooltip` | boolean | **Yes**  |         |             |
-| `viz`     | boolean | **Yes**  |         |             |
-
-### HideableFieldConfig
-
-TODO docs
-
-| Property   | Type                                  | Required | Default | Description |
-|------------|---------------------------------------|----------|---------|-------------|
-| `hideFrom` | [HideSeriesConfig](#hideseriesconfig) | No       |         | TODO docs   |
-
-### Options
-
-It extends [OptionsWithLegend](#optionswithlegend) and [OptionsWithTooltip](#optionswithtooltip) and [OptionsWithTimezones](#optionswithtimezones).
-
-| Property      | Type                                    | Required | Default | Description                                                                |
-|---------------|-----------------------------------------|----------|---------|----------------------------------------------------------------------------|
-| `legend`      | [VizLegendOptions](#vizlegendoptions)   | **Yes**  |         | *(Inherited from [OptionsWithLegend](#optionswithlegend))*<br/>TODO docs   |
-| `rowHeight`   | number                                  | **Yes**  | `0.9`   | Controls the row height                                                    |
-| `showValue`   | string                                  | **Yes**  |         | Show timeline values on chart                                              |
-| `tooltip`     | [VizTooltipOptions](#viztooltipoptions) | **Yes**  |         | *(Inherited from [OptionsWithTooltip](#optionswithtooltip))*<br/>TODO docs |
-| `alignValue`  | string                                  | No       |         | Controls value alignment on the timelines                                  |
-| `mergeValues` | boolean                                 | No       | `true`  | Merge equal consecutive values                                             |
-| `timezone`    | string[]                                | No       |         | *(Inherited from [OptionsWithTimezones](#optionswithtimezones))*           |
-
-### OptionsWithLegend
-
-TODO docs
-
-| Property | Type                                  | Required | Default | Description |
-|----------|---------------------------------------|----------|---------|-------------|
-| `legend` | [VizLegendOptions](#vizlegendoptions) | **Yes**  |         | TODO docs   |
-
-### VizLegendOptions
-
-TODO docs
-
-| Property      | Type     | Required | Default | Description                                                                                                                             |
-|---------------|----------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| `calcs`       | string[] | **Yes**  |         |                                                                                                                                         |
-| `displayMode` | string   | **Yes**  |         | TODO docs<br/>Note: "hidden" needs to remain as an option for plugins compatibility<br/>Possible values are: `list`, `table`, `hidden`. |
-| `placement`   | string   | **Yes**  |         | TODO docs<br/>Possible values are: `bottom`, `right`.                                                                                   |
-| `showLegend`  | boolean  | **Yes**  |         |                                                                                                                                         |
-| `asTable`     | boolean  | No       |         |                                                                                                                                         |
-| `isVisible`   | boolean  | No       |         |                                                                                                                                         |
-| `sortBy`      | string   | No       |         |                                                                                                                                         |
-| `sortDesc`    | boolean  | No       |         |                                                                                                                                         |
-| `width`       | number   | No       |         |                                                                                                                                         |
-
-### OptionsWithTimezones
-
-TODO docs
-
-| Property   | Type     | Required | Default | Description |
-|------------|----------|----------|---------|-------------|
-| `timezone` | string[] | No       |         |             |
-
-### OptionsWithTooltip
-
-TODO docs
-
-| Property  | Type                                    | Required | Default | Description |
-|-----------|-----------------------------------------|----------|---------|-------------|
-| `tooltip` | [VizTooltipOptions](#viztooltipoptions) | **Yes**  |         | TODO docs   |
-
-### VizTooltipOptions
-
-TODO docs
-
-| Property | Type   | Required | Default | Description                                                   |
-|----------|--------|----------|---------|---------------------------------------------------------------|
-| `mode`   | string | **Yes**  |         | TODO docs<br/>Possible values are: `single`, `multi`, `none`. |
-| `sort`   | string | **Yes**  |         | TODO docs<br/>Possible values are: `asc`, `desc`, `none`.     |
-
-
diff --git a/docs/sources/developers/kinds/composable/statushistory/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/statushistory/panelcfg/schema-reference.md
deleted file mode 100644
index 1220c13da15e7..0000000000000
--- a/docs/sources/developers/kinds/composable/statushistory/panelcfg/schema-reference.md
+++ /dev/null
@@ -1,116 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: StatusHistoryPanelCfg kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## StatusHistoryPanelCfg
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property      | Type                   | Required | Default | Description |
-|---------------|------------------------|----------|---------|-------------|
-| `FieldConfig` | [object](#fieldconfig) | **Yes**  |         |             |
-| `Options`     | [object](#options)     | **Yes**  |         |             |
-
-### FieldConfig
-
-It extends [HideableFieldConfig](#hideablefieldconfig).
-
-| Property      | Type                                  | Required | Default | Description                                                                  |
-|---------------|---------------------------------------|----------|---------|------------------------------------------------------------------------------|
-| `fillOpacity` | integer                               | No       | `70`    | Constraint: `>=0 & <=100`.                                                   |
-| `hideFrom`    | [HideSeriesConfig](#hideseriesconfig) | No       |         | *(Inherited from [HideableFieldConfig](#hideablefieldconfig))*<br/>TODO docs |
-| `lineWidth`   | integer                               | No       | `1`     | Constraint: `>=0 & <=10`.                                                    |
-
-### HideSeriesConfig
-
-TODO docs
-
-| Property  | Type    | Required | Default | Description |
-|-----------|---------|----------|---------|-------------|
-| `legend`  | boolean | **Yes**  |         |             |
-| `tooltip` | boolean | **Yes**  |         |             |
-| `viz`     | boolean | **Yes**  |         |             |
-
-### HideableFieldConfig
-
-TODO docs
-
-| Property   | Type                                  | Required | Default | Description |
-|------------|---------------------------------------|----------|---------|-------------|
-| `hideFrom` | [HideSeriesConfig](#hideseriesconfig) | No       |         | TODO docs   |
-
-### Options
-
-It extends [OptionsWithLegend](#optionswithlegend) and [OptionsWithTooltip](#optionswithtooltip) and [OptionsWithTimezones](#optionswithtimezones).
-
-| Property    | Type                                    | Required | Default | Description                                                                |
-|-------------|-----------------------------------------|----------|---------|----------------------------------------------------------------------------|
-| `legend`    | [VizLegendOptions](#vizlegendoptions)   | **Yes**  |         | *(Inherited from [OptionsWithLegend](#optionswithlegend))*<br/>TODO docs   |
-| `rowHeight` | number                                  | **Yes**  | `0.9`   | Set the height of the rows<br/>Constraint: `>=0 & <=1`.                    |
-| `showValue` | string                                  | **Yes**  |         | Show values on the columns                                                 |
-| `tooltip`   | [VizTooltipOptions](#viztooltipoptions) | **Yes**  |         | *(Inherited from [OptionsWithTooltip](#optionswithtooltip))*<br/>TODO docs |
-| `colWidth`  | number                                  | No       | `0.9`   | Controls the column width                                                  |
-| `timezone`  | string[]                                | No       |         | *(Inherited from [OptionsWithTimezones](#optionswithtimezones))*           |
-
-### OptionsWithLegend
-
-TODO docs
-
-| Property | Type                                  | Required | Default | Description |
-|----------|---------------------------------------|----------|---------|-------------|
-| `legend` | [VizLegendOptions](#vizlegendoptions) | **Yes**  |         | TODO docs   |
-
-### VizLegendOptions
-
-TODO docs
-
-| Property      | Type     | Required | Default | Description                                                                                                                             |
-|---------------|----------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| `calcs`       | string[] | **Yes**  |         |                                                                                                                                         |
-| `displayMode` | string   | **Yes**  |         | TODO docs<br/>Note: "hidden" needs to remain as an option for plugins compatibility<br/>Possible values are: `list`, `table`, `hidden`. |
-| `placement`   | string   | **Yes**  |         | TODO docs<br/>Possible values are: `bottom`, `right`.                                                                                   |
-| `showLegend`  | boolean  | **Yes**  |         |                                                                                                                                         |
-| `asTable`     | boolean  | No       |         |                                                                                                                                         |
-| `isVisible`   | boolean  | No       |         |                                                                                                                                         |
-| `sortBy`      | string   | No       |         |                                                                                                                                         |
-| `sortDesc`    | boolean  | No       |         |                                                                                                                                         |
-| `width`       | number   | No       |         |                                                                                                                                         |
-
-### OptionsWithTimezones
-
-TODO docs
-
-| Property   | Type     | Required | Default | Description |
-|------------|----------|----------|---------|-------------|
-| `timezone` | string[] | No       |         |             |
-
-### OptionsWithTooltip
-
-TODO docs
-
-| Property  | Type                                    | Required | Default | Description |
-|-----------|-----------------------------------------|----------|---------|-------------|
-| `tooltip` | [VizTooltipOptions](#viztooltipoptions) | **Yes**  |         | TODO docs   |
-
-### VizTooltipOptions
-
-TODO docs
-
-| Property | Type   | Required | Default | Description                                                   |
-|----------|--------|----------|---------|---------------------------------------------------------------|
-| `mode`   | string | **Yes**  |         | TODO docs<br/>Possible values are: `single`, `multi`, `none`. |
-| `sort`   | string | **Yes**  |         | TODO docs<br/>Possible values are: `asc`, `desc`, `none`.     |
-
-
diff --git a/docs/sources/developers/kinds/composable/table/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/table/panelcfg/schema-reference.md
deleted file mode 100644
index 0fbc39fba0104..0000000000000
--- a/docs/sources/developers/kinds/composable/table/panelcfg/schema-reference.md
+++ /dev/null
@@ -1,332 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: TablePanelCfg kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## TablePanelCfg
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property      | Type                   | Required | Default | Description |
-|---------------|------------------------|----------|---------|-------------|
-| `FieldConfig` | [object](#fieldconfig) | **Yes**  |         |             |
-| `Options`     | [object](#options)     | **Yes**  |         |             |
-
-### FieldConfig
-
-| Property      | Type                                  | Required | Default | Description                                                                                                                                                                                                                                                                                                                                                                                                                              |
-|---------------|---------------------------------------|----------|---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `align`       | string                                | **Yes**  |         | TODO -- should not be table specific!<br/>TODO docs<br/>Possible values are: `auto`, `left`, `right`, `center`.                                                                                                                                                                                                                                                                                                                          |
-| `cellOptions` | [TableCellOptions](#tablecelloptions) | **Yes**  |         | Table cell options. Each cell has a display mode<br/>and other potential options for that display.                                                                                                                                                                                                                                                                                                                                       |
-| `inspect`     | boolean                               | **Yes**  | `false` |                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| `displayMode` | string                                | No       |         | Internally, this is the "type" of cell that's being displayed<br/>in the table such as colored text, JSON, gauge, etc.<br/>The color-background-solid, gradient-gauge, and lcd-gauge<br/>modes are deprecated in favor of new cell subOptions<br/>Possible values are: `auto`, `color-text`, `color-background`, `color-background-solid`, `gradient-gauge`, `lcd-gauge`, `json-view`, `basic`, `image`, `gauge`, `sparkline`, `custom`. |
-| `filterable`  | boolean                               | No       |         |                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| `hidden`      | boolean                               | No       |         |                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| `hideHeader`  | boolean                               | No       |         | Hides any header for a column, useful for columns that show some static content or buttons.                                                                                                                                                                                                                                                                                                                                              |
-| `minWidth`    | number                                | No       |         |                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| `width`       | number                                | No       |         |                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-
-### TableCellOptions
-
-Table cell options. Each cell has a display mode
-and other potential options for that display.
-
-| Property | Type                                                                                                                                                                                                                                                                                                                                                                                                                         | Required | Default | Description |
-|----------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|---------|-------------|
-| `object` | Possible types are: [TableAutoCellOptions](#tableautocelloptions), [TableSparklineCellOptions](#tablesparklinecelloptions), [TableBarGaugeCellOptions](#tablebargaugecelloptions), [TableColoredBackgroundCellOptions](#tablecoloredbackgroundcelloptions), [TableColorTextCellOptions](#tablecolortextcelloptions), [TableImageCellOptions](#tableimagecelloptions), [TableJsonViewCellOptions](#tablejsonviewcelloptions). |          |         |
-
-### GraphThresholdsStyleConfig
-
-TODO docs
-
-| Property | Type   | Required | Default | Description                                                                                               |
-|----------|--------|----------|---------|-----------------------------------------------------------------------------------------------------------|
-| `mode`   | string | **Yes**  |         | TODO docs<br/>Possible values are: `off`, `line`, `dashed`, `area`, `line+area`, `dashed+area`, `series`. |
-
-### HideSeriesConfig
-
-TODO docs
-
-| Property  | Type    | Required | Default | Description |
-|-----------|---------|----------|---------|-------------|
-| `legend`  | boolean | **Yes**  |         |             |
-| `tooltip` | boolean | **Yes**  |         |             |
-| `viz`     | boolean | **Yes**  |         |             |
-
-### LineStyle
-
-TODO docs
-
-| Property | Type     | Required | Default | Description                                            |
-|----------|----------|----------|---------|--------------------------------------------------------|
-| `dash`   | number[] | No       |         |                                                        |
-| `fill`   | string   | No       |         | Possible values are: `solid`, `dash`, `dot`, `square`. |
-
-### ScaleDistributionConfig
-
-TODO docs
-
-| Property          | Type   | Required | Default | Description                                                              |
-|-------------------|--------|----------|---------|--------------------------------------------------------------------------|
-| `type`            | string | **Yes**  |         | TODO docs<br/>Possible values are: `linear`, `log`, `ordinal`, `symlog`. |
-| `linearThreshold` | number | No       |         |                                                                          |
-| `log`             | number | No       |         |                                                                          |
-
-### StackingConfig
-
-TODO docs
-
-| Property | Type   | Required | Default | Description                                                     |
-|----------|--------|----------|---------|-----------------------------------------------------------------|
-| `group`  | string | No       |         |                                                                 |
-| `mode`   | string | No       |         | TODO docs<br/>Possible values are: `none`, `normal`, `percent`. |
-
-### TableAutoCellOptions
-
-Auto mode table cell options
-
-| Property | Type   | Required | Default | Description |
-|----------|--------|----------|---------|-------------|
-| `type`   | string | **Yes**  |         |             |
-
-### TableBarGaugeCellOptions
-
-Gauge cell options
-
-| Property           | Type   | Required | Default | Description                                                                                                                                   |
-|--------------------|--------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------------|
-| `type`             | string | **Yes**  |         |                                                                                                                                               |
-| `mode`             | string | No       |         | Enum expressing the possible display modes<br/>for the bar gauge component of Grafana UI<br/>Possible values are: `basic`, `lcd`, `gradient`. |
-| `valueDisplayMode` | string | No       |         | Allows for the table cell gauge display type to set the gauge mode.<br/>Possible values are: `color`, `text`, `hidden`.                       |
-
-### TableColorTextCellOptions
-
-Colored text cell options
-
-| Property | Type   | Required | Default | Description |
-|----------|--------|----------|---------|-------------|
-| `type`   | string | **Yes**  |         |             |
-
-### TableColoredBackgroundCellOptions
-
-Colored background cell options
-
-| Property | Type   | Required | Default | Description                                                                                                                                                                            |
-|----------|--------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `type`   | string | **Yes**  |         |                                                                                                                                                                                        |
-| `mode`   | string | No       |         | Display mode to the "Colored Background" display<br/>mode for table cells. Either displays a solid color (basic mode)<br/>or a gradient.<br/>Possible values are: `basic`, `gradient`. |
-
-### TableImageCellOptions
-
-Json view cell options
-
-| Property | Type   | Required | Default | Description |
-|----------|--------|----------|---------|-------------|
-| `type`   | string | **Yes**  |         |             |
-
-### TableJsonViewCellOptions
-
-Json view cell options
-
-| Property | Type   | Required | Default | Description |
-|----------|--------|----------|---------|-------------|
-| `type`   | string | **Yes**  |         |             |
-
-### TableSparklineCellOptions
-
-Sparkline cell options
-
-It extends [GraphFieldConfig](#graphfieldconfig).
-
-| Property            | Type                                                      | Required | Default | Description                                                                                                                                                                                                                                                                               |
-|---------------------|-----------------------------------------------------------|----------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `type`              | string                                                    | **Yes**  |         |                                                                                                                                                                                                                                                                                           |
-| `axisBorderShow`    | boolean                                                   | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*                                                                                                                                                                                                                                  |
-| `axisCenteredZero`  | boolean                                                   | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*                                                                                                                                                                                                                                  |
-| `axisColorMode`     | string                                                    | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*<br/>TODO docs<br/>Possible values are: `text`, `series`.                                                                                                                                                                         |
-| `axisGridShow`      | boolean                                                   | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*                                                                                                                                                                                                                                  |
-| `axisLabel`         | string                                                    | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*                                                                                                                                                                                                                                  |
-| `axisPlacement`     | string                                                    | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*<br/>TODO docs<br/>Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`.                                                                                                                                       |
-| `axisSoftMax`       | number                                                    | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*                                                                                                                                                                                                                                  |
-| `axisSoftMin`       | number                                                    | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*                                                                                                                                                                                                                                  |
-| `axisWidth`         | number                                                    | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*                                                                                                                                                                                                                                  |
-| `barAlignment`      | integer                                                   | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*<br/>TODO docs<br/>Possible values are: `-1`, `0`, `1`.                                                                                                                                                                           |
-| `barMaxWidth`       | number                                                    | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*                                                                                                                                                                                                                                  |
-| `barWidthFactor`    | number                                                    | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*                                                                                                                                                                                                                                  |
-| `drawStyle`         | string                                                    | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*<br/>TODO docs<br/>Possible values are: `line`, `bars`, `points`.                                                                                                                                                                 |
-| `fillBelowTo`       | string                                                    | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*                                                                                                                                                                                                                                  |
-| `fillColor`         | string                                                    | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*                                                                                                                                                                                                                                  |
-| `fillOpacity`       | number                                                    | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*                                                                                                                                                                                                                                  |
-| `gradientMode`      | string                                                    | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*<br/>TODO docs<br/>Possible values are: `none`, `opacity`, `hue`, `scheme`.                                                                                                                                                       |
-| `hideFrom`          | [HideSeriesConfig](#hideseriesconfig)                     | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*<br/>TODO docs                                                                                                                                                                                                                    |
-| `hideValue`         | boolean                                                   | No       |         |                                                                                                                                                                                                                                                                                           |
-| `lineColor`         | string                                                    | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*                                                                                                                                                                                                                                  |
-| `lineInterpolation` | string                                                    | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*<br/>TODO docs<br/>Possible values are: `linear`, `smooth`, `stepBefore`, `stepAfter`.                                                                                                                                            |
-| `lineStyle`         | [LineStyle](#linestyle)                                   | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*<br/>TODO docs                                                                                                                                                                                                                    |
-| `lineWidth`         | number                                                    | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*                                                                                                                                                                                                                                  |
-| `pointColor`        | string                                                    | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*                                                                                                                                                                                                                                  |
-| `pointSize`         | number                                                    | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*                                                                                                                                                                                                                                  |
-| `pointSymbol`       | string                                                    | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*                                                                                                                                                                                                                                  |
-| `scaleDistribution` | [ScaleDistributionConfig](#scaledistributionconfig)       | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*<br/>TODO docs                                                                                                                                                                                                                    |
-| `showPoints`        | string                                                    | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*<br/>TODO docs<br/>Possible values are: `auto`, `never`, `always`.                                                                                                                                                                |
-| `spanNulls`         |                                                           | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*<br/>Indicate if null values should be treated as gaps or connected.<br/>When the value is a number, it represents the maximum delta in the<br/>X axis that should be considered connected.  For timeseries, this is milliseconds |
-| `stacking`          | [StackingConfig](#stackingconfig)                         | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*<br/>TODO docs                                                                                                                                                                                                                    |
-| `thresholdsStyle`   | [GraphThresholdsStyleConfig](#graphthresholdsstyleconfig) | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*<br/>TODO docs                                                                                                                                                                                                                    |
-| `transform`         | string                                                    | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*<br/>TODO docs<br/>Possible values are: `constant`, `negative-Y`.                                                                                                                                                                 |
-
-### GraphFieldConfig
-
-TODO docs
-
-It extends [LineConfig](#lineconfig) and [FillConfig](#fillconfig) and [PointsConfig](#pointsconfig) and [AxisConfig](#axisconfig) and [BarConfig](#barconfig) and [StackableFieldConfig](#stackablefieldconfig) and [HideableFieldConfig](#hideablefieldconfig).
-
-| Property            | Type                                                      | Required | Default | Description                                                                                                                                                                                                                                                                   |
-|---------------------|-----------------------------------------------------------|----------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `axisBorderShow`    | boolean                                                   | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `axisCenteredZero`  | boolean                                                   | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `axisColorMode`     | string                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*<br/>TODO docs<br/>Possible values are: `text`, `series`.                                                                                                                                                                         |
-| `axisGridShow`      | boolean                                                   | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `axisLabel`         | string                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `axisPlacement`     | string                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*<br/>TODO docs<br/>Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`.                                                                                                                                       |
-| `axisSoftMax`       | number                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `axisSoftMin`       | number                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `axisWidth`         | number                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `barAlignment`      | integer                                                   | No       |         | *(Inherited from [BarConfig](#barconfig))*<br/>TODO docs<br/>Possible values are: `-1`, `0`, `1`.                                                                                                                                                                             |
-| `barMaxWidth`       | number                                                    | No       |         | *(Inherited from [BarConfig](#barconfig))*                                                                                                                                                                                                                                    |
-| `barWidthFactor`    | number                                                    | No       |         | *(Inherited from [BarConfig](#barconfig))*                                                                                                                                                                                                                                    |
-| `drawStyle`         | string                                                    | No       |         | TODO docs<br/>Possible values are: `line`, `bars`, `points`.                                                                                                                                                                                                                  |
-| `fillBelowTo`       | string                                                    | No       |         | *(Inherited from [FillConfig](#fillconfig))*                                                                                                                                                                                                                                  |
-| `fillColor`         | string                                                    | No       |         | *(Inherited from [FillConfig](#fillconfig))*                                                                                                                                                                                                                                  |
-| `fillOpacity`       | number                                                    | No       |         | *(Inherited from [FillConfig](#fillconfig))*                                                                                                                                                                                                                                  |
-| `gradientMode`      | string                                                    | No       |         | TODO docs<br/>Possible values are: `none`, `opacity`, `hue`, `scheme`.                                                                                                                                                                                                        |
-| `hideFrom`          | [HideSeriesConfig](#hideseriesconfig)                     | No       |         | *(Inherited from [HideableFieldConfig](#hideablefieldconfig))*<br/>TODO docs                                                                                                                                                                                                  |
-| `lineColor`         | string                                                    | No       |         | *(Inherited from [LineConfig](#lineconfig))*                                                                                                                                                                                                                                  |
-| `lineInterpolation` | string                                                    | No       |         | *(Inherited from [LineConfig](#lineconfig))*<br/>TODO docs<br/>Possible values are: `linear`, `smooth`, `stepBefore`, `stepAfter`.                                                                                                                                            |
-| `lineStyle`         | [LineStyle](#linestyle)                                   | No       |         | *(Inherited from [LineConfig](#lineconfig))*<br/>TODO docs                                                                                                                                                                                                                    |
-| `lineWidth`         | number                                                    | No       |         | *(Inherited from [LineConfig](#lineconfig))*                                                                                                                                                                                                                                  |
-| `pointColor`        | string                                                    | No       |         | *(Inherited from [PointsConfig](#pointsconfig))*                                                                                                                                                                                                                              |
-| `pointSize`         | number                                                    | No       |         | *(Inherited from [PointsConfig](#pointsconfig))*                                                                                                                                                                                                                              |
-| `pointSymbol`       | string                                                    | No       |         | *(Inherited from [PointsConfig](#pointsconfig))*                                                                                                                                                                                                                              |
-| `scaleDistribution` | [ScaleDistributionConfig](#scaledistributionconfig)       | No       |         | *(Inherited from [AxisConfig](#axisconfig))*<br/>TODO docs                                                                                                                                                                                                                    |
-| `showPoints`        | string                                                    | No       |         | *(Inherited from [PointsConfig](#pointsconfig))*<br/>TODO docs<br/>Possible values are: `auto`, `never`, `always`.                                                                                                                                                            |
-| `spanNulls`         |                                                           | No       |         | *(Inherited from [LineConfig](#lineconfig))*<br/>Indicate if null values should be treated as gaps or connected.<br/>When the value is a number, it represents the maximum delta in the<br/>X axis that should be considered connected.  For timeseries, this is milliseconds |
-| `stacking`          | [StackingConfig](#stackingconfig)                         | No       |         | *(Inherited from [StackableFieldConfig](#stackablefieldconfig))*<br/>TODO docs                                                                                                                                                                                                |
-| `thresholdsStyle`   | [GraphThresholdsStyleConfig](#graphthresholdsstyleconfig) | No       |         | TODO docs                                                                                                                                                                                                                                                                     |
-| `transform`         | string                                                    | No       |         | TODO docs<br/>Possible values are: `constant`, `negative-Y`.                                                                                                                                                                                                                  |
-
-### AxisConfig
-
-TODO docs
-
-| Property            | Type                                                | Required | Default | Description                                                                            |
-|---------------------|-----------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------|
-| `axisBorderShow`    | boolean                                             | No       |         |                                                                                        |
-| `axisCenteredZero`  | boolean                                             | No       |         |                                                                                        |
-| `axisColorMode`     | string                                              | No       |         | TODO docs<br/>Possible values are: `text`, `series`.                                   |
-| `axisGridShow`      | boolean                                             | No       |         |                                                                                        |
-| `axisLabel`         | string                                              | No       |         |                                                                                        |
-| `axisPlacement`     | string                                              | No       |         | TODO docs<br/>Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. |
-| `axisSoftMax`       | number                                              | No       |         |                                                                                        |
-| `axisSoftMin`       | number                                              | No       |         |                                                                                        |
-| `axisWidth`         | number                                              | No       |         |                                                                                        |
-| `scaleDistribution` | [ScaleDistributionConfig](#scaledistributionconfig) | No       |         | TODO docs                                                                              |
-
-### BarConfig
-
-TODO docs
-
-| Property         | Type    | Required | Default | Description                                        |
-|------------------|---------|----------|---------|----------------------------------------------------|
-| `barAlignment`   | integer | No       |         | TODO docs<br/>Possible values are: `-1`, `0`, `1`. |
-| `barMaxWidth`    | number  | No       |         |                                                    |
-| `barWidthFactor` | number  | No       |         |                                                    |
-
-### FillConfig
-
-TODO docs
-
-| Property      | Type   | Required | Default | Description |
-|---------------|--------|----------|---------|-------------|
-| `fillBelowTo` | string | No       |         |             |
-| `fillColor`   | string | No       |         |             |
-| `fillOpacity` | number | No       |         |             |
-
-### HideableFieldConfig
-
-TODO docs
-
-| Property   | Type                                  | Required | Default | Description |
-|------------|---------------------------------------|----------|---------|-------------|
-| `hideFrom` | [HideSeriesConfig](#hideseriesconfig) | No       |         | TODO docs   |
-
-### LineConfig
-
-TODO docs
-
-| Property            | Type                    | Required | Default | Description                                                                                                                                                                                                                  |
-|---------------------|-------------------------|----------|---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `lineColor`         | string                  | No       |         |                                                                                                                                                                                                                              |
-| `lineInterpolation` | string                  | No       |         | TODO docs<br/>Possible values are: `linear`, `smooth`, `stepBefore`, `stepAfter`.                                                                                                                                            |
-| `lineStyle`         | [LineStyle](#linestyle) | No       |         | TODO docs                                                                                                                                                                                                                    |
-| `lineWidth`         | number                  | No       |         |                                                                                                                                                                                                                              |
-| `spanNulls`         |                         | No       |         | Indicate if null values should be treated as gaps or connected.<br/>When the value is a number, it represents the maximum delta in the<br/>X axis that should be considered connected.  For timeseries, this is milliseconds |
-
-### PointsConfig
-
-TODO docs
-
-| Property      | Type   | Required | Default | Description                                                   |
-|---------------|--------|----------|---------|---------------------------------------------------------------|
-| `pointColor`  | string | No       |         |                                                               |
-| `pointSize`   | number | No       |         |                                                               |
-| `pointSymbol` | string | No       |         |                                                               |
-| `showPoints`  | string | No       |         | TODO docs<br/>Possible values are: `auto`, `never`, `always`. |
-
-### StackableFieldConfig
-
-TODO docs
-
-| Property   | Type                              | Required | Default | Description |
-|------------|-----------------------------------|----------|---------|-------------|
-| `stacking` | [StackingConfig](#stackingconfig) | No       |         | TODO docs   |
-
-### Options
-
-| Property        | Type                                              | Required | Default                                      | Description                                                        |
-|-----------------|---------------------------------------------------|----------|----------------------------------------------|--------------------------------------------------------------------|
-| `frameIndex`    | number                                            | **Yes**  | `0`                                          | Represents the index of the selected frame                         |
-| `showHeader`    | boolean                                           | **Yes**  | `true`                                       | Controls whether the panel should show the header                  |
-| `cellHeight`    | string                                            | No       |                                              | Controls the height of the rows                                    |
-| `footer`        | [object](#footer)                                 | No       | `map[countRows:false reducer:[] show:false]` | Controls footer options                                            |
-| `showTypeIcons` | boolean                                           | No       | `false`                                      | Controls whether the header should show icons for the column types |
-| `sortBy`        | [TableSortByFieldState](#tablesortbyfieldstate)[] | No       |                                              | Used to control row sorting                                        |
-
-### TableSortByFieldState
-
-Sort by field state
-
-| Property      | Type    | Required | Default | Description                                   |
-|---------------|---------|----------|---------|-----------------------------------------------|
-| `displayName` | string  | **Yes**  |         | Sets the display name of the field to sort by |
-| `desc`        | boolean | No       |         | Flag used to indicate descending sort order   |
-
-### Footer
-
-Controls footer options
-
-| Property | Type                              | Required | Default | Description |
-|----------|-----------------------------------|----------|---------|-------------|
-| `object` | Possible types are: [](#), [](#). |          |         |
-
-
diff --git a/docs/sources/developers/kinds/composable/tempo/dataquery/schema-reference.md b/docs/sources/developers/kinds/composable/tempo/dataquery/schema-reference.md
deleted file mode 100644
index 1b44c7cc98fb6..0000000000000
--- a/docs/sources/developers/kinds/composable/tempo/dataquery/schema-reference.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: TempoDataQuery kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## TempoDataQuery
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-
diff --git a/docs/sources/developers/kinds/composable/testdata/dataquery/schema-reference.md b/docs/sources/developers/kinds/composable/testdata/dataquery/schema-reference.md
deleted file mode 100644
index 9cb911bd5c27f..0000000000000
--- a/docs/sources/developers/kinds/composable/testdata/dataquery/schema-reference.md
+++ /dev/null
@@ -1,118 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: TestDataDataQuery kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## TestDataDataQuery
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property          | Type                                | Required | Default | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-|-------------------|-------------------------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `refId`           | string                              | **Yes**  |         | A unique identifier for the query within the list of targets.<br/>In server side expressions, the refId is used as a variable name to identify results.<br/>By default, the UI will assign A->Z; however setting meaningful names may be useful.                                                                                                                                                                                                                                                                                       |
-| `alias`           | string                              | No       |         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| `channel`         | string                              | No       |         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| `csvContent`      | string                              | No       |         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| `csvFileName`     | string                              | No       |         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| `csvWave`         | [CSVWave](#csvwave)[]               | No       |         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| `datasource`      |                                     | No       |         | For mixed data sources the selected datasource is on the query level.<br/>For non mixed scenarios this is undefined.<br/>TODO find a better way to do this ^ that's friendly to schema<br/>TODO this shouldn't be unknown but DataSourceRef &#124; null                                                                                                                                                                                                                                                                                |
-| `dropPercent`     | number                              | No       |         | Drop percentage (the chance we will lose a point 0-100)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-| `errorType`       | string                              | No       |         | Possible values are: `server_panic`, `frontend_exception`, `frontend_observable`.                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| `flamegraphDiff`  | boolean                             | No       |         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| `hide`            | boolean                             | No       |         | true if query is disabled (ie should not be returned to the dashboard)<br/>Note this does not always imply that the query should not be executed since<br/>the results from a hidden query may be used as the input to other queries (SSE etc)                                                                                                                                                                                                                                                                                         |
-| `labels`          | string                              | No       |         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| `levelColumn`     | boolean                             | No       |         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| `lines`           | integer                             | No       |         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| `nodes`           | [NodesQuery](#nodesquery)           | No       |         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| `points`          | array[]                             | No       |         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| `pulseWave`       | [PulseWaveQuery](#pulsewavequery)   | No       |         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| `queryType`       | string                              | No       |         | Specify the query flavor<br/>TODO make this required and give it a default                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
-| `rawFrameContent` | string                              | No       |         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| `scenarioId`      | string                              | No       |         | Possible values are: `random_walk`, `slow_query`, `random_walk_with_error`, `random_walk_table`, `exponential_heatmap_bucket_data`, `linear_heatmap_bucket_data`, `no_data_points`, `datapoints_outside_range`, `csv_metric_values`, `predictable_pulse`, `predictable_csv_wave`, `streaming_client`, `simulation`, `usa`, `live`, `grafana_api`, `arrow`, `annotations`, `table_static`, `server_error_500`, `logs`, `node_graph`, `flame_graph`, `raw_frame`, `csv_file`, `csv_content`, `trace`, `manual_entry`, `variables-query`. |
-| `seriesCount`     | integer                             | No       |         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| `sim`             | [SimulationQuery](#simulationquery) | No       |         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| `spanCount`       | integer                             | No       |         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| `stream`          | [StreamingQuery](#streamingquery)   | No       |         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| `stringInput`     | string                              | No       |         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| `usa`             | [USAQuery](#usaquery)               | No       |         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-
-### CSVWave
-
-| Property    | Type    | Required | Default | Description |
-|-------------|---------|----------|---------|-------------|
-| `labels`    | string  | No       |         |             |
-| `name`      | string  | No       |         |             |
-| `timeStep`  | integer | No       |         |             |
-| `valuesCSV` | string  | No       |         |             |
-
-### NodesQuery
-
-| Property | Type    | Required | Default | Description                                                |
-|----------|---------|----------|---------|------------------------------------------------------------|
-| `count`  | integer | No       |         |                                                            |
-| `type`   | string  | No       |         | Possible values are: `random`, `response`, `random edges`. |
-
-### PulseWaveQuery
-
-| Property   | Type    | Required | Default | Description |
-|------------|---------|----------|---------|-------------|
-| `offCount` | integer | No       |         |             |
-| `offValue` | number  | No       |         |             |
-| `onCount`  | integer | No       |         |             |
-| `onValue`  | number  | No       |         |             |
-| `timeStep` | integer | No       |         |             |
-
-### SimulationQuery
-
-| Property | Type              | Required | Default | Description |
-|----------|-------------------|----------|---------|-------------|
-| `key`    | [object](#key)    | **Yes**  |         |             |
-| `config` | [object](#config) | No       |         |             |
-| `last`   | boolean           | No       |         |             |
-| `stream` | boolean           | No       |         |             |
-
-### Config
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Key
-
-| Property | Type   | Required | Default | Description |
-|----------|--------|----------|---------|-------------|
-| `tick`   | number | **Yes**  |         |             |
-| `type`   | string | **Yes**  |         |             |
-| `uid`    | string | No       |         |             |
-
-### StreamingQuery
-
-| Property | Type    | Required | Default | Description                                     |
-|----------|---------|----------|---------|-------------------------------------------------|
-| `noise`  | integer | **Yes**  |         |                                                 |
-| `speed`  | integer | **Yes**  |         |                                                 |
-| `spread` | integer | **Yes**  |         |                                                 |
-| `type`   | string  | **Yes**  |         | Possible values are: `signal`, `logs`, `fetch`. |
-| `bands`  | integer | No       |         |                                                 |
-| `url`    | string  | No       |         |                                                 |
-
-### USAQuery
-
-| Property | Type     | Required | Default | Description |
-|----------|----------|----------|---------|-------------|
-| `fields` | string[] | No       |         |             |
-| `mode`   | string   | No       |         |             |
-| `period` | string   | No       |         |             |
-| `states` | string[] | No       |         |             |
-
-
diff --git a/docs/sources/developers/kinds/composable/text/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/text/panelcfg/schema-reference.md
deleted file mode 100644
index 8b566c2a2abda..0000000000000
--- a/docs/sources/developers/kinds/composable/text/panelcfg/schema-reference.md
+++ /dev/null
@@ -1,46 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: TextPanelCfg kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## TextPanelCfg
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property       | Type                   | Required | Default     | Description                                                                                             |
-|----------------|------------------------|----------|-------------|---------------------------------------------------------------------------------------------------------|
-| `CodeLanguage` | string                 | **Yes**  | `plaintext` | Possible values are: `plaintext`, `yaml`, `xml`, `typescript`, `sql`, `go`, `markdown`, `html`, `json`. |
-| `CodeOptions`  | [object](#codeoptions) | **Yes**  |             |                                                                                                         |
-| `Options`      | [object](#options)     | **Yes**  |             |                                                                                                         |
-| `TextMode`     | string                 | **Yes**  |             | Possible values are: `html`, `markdown`, `code`.                                                        |
-
-### CodeOptions
-
-| Property          | Type    | Required | Default     | Description                                                                                             |
-|-------------------|---------|----------|-------------|---------------------------------------------------------------------------------------------------------|
-| `language`        | string  | **Yes**  | `plaintext` | Possible values are: `plaintext`, `yaml`, `xml`, `typescript`, `sql`, `go`, `markdown`, `html`, `json`. |
-| `showLineNumbers` | boolean | **Yes**  | `false`     |                                                                                                         |
-| `showMiniMap`     | boolean | **Yes**  | `false`     |                                                                                                         |
-
-### Options
-
-| Property  | Type                        | Required | Default                                                                        | Description                                      |
-|-----------|-----------------------------|----------|--------------------------------------------------------------------------------|--------------------------------------------------|
-| `content` | string                      | **Yes**  | `# Title                                                                       |                                                  |
-|           |                             |          |                                                                                |                                                  |
-|           |                             |          | For markdown syntax help: [commonmark.org/help](https://commonmark.org/help/)` |                                                  |
-| `mode`    | string                      | **Yes**  |                                                                                | Possible values are: `html`, `markdown`, `code`. |
-| `code`    | [CodeOptions](#codeoptions) | No       |                                                                                |                                                  |
-
-
diff --git a/docs/sources/developers/kinds/composable/timeseries/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/timeseries/panelcfg/schema-reference.md
deleted file mode 100644
index 06347e8182666..0000000000000
--- a/docs/sources/developers/kinds/composable/timeseries/panelcfg/schema-reference.md
+++ /dev/null
@@ -1,231 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: TimeSeriesPanelCfg kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## TimeSeriesPanelCfg
-
-#### Maturity: [merged](../../../maturity/#merged)
-#### Version: 0.0
-
-
-
-| Property      | Type                                  | Required | Default | Description |
-|---------------|---------------------------------------|----------|---------|-------------|
-| `FieldConfig` | [GraphFieldConfig](#graphfieldconfig) | **Yes**  |         | TODO docs   |
-| `Options`     | [object](#options)                    | **Yes**  |         |             |
-
-### GraphFieldConfig
-
-TODO docs
-
-It extends [LineConfig](#lineconfig) and [FillConfig](#fillconfig) and [PointsConfig](#pointsconfig) and [AxisConfig](#axisconfig) and [BarConfig](#barconfig) and [StackableFieldConfig](#stackablefieldconfig) and [HideableFieldConfig](#hideablefieldconfig).
-
-| Property            | Type                                                      | Required | Default | Description                                                                                                                                                                                                                                                                   |
-|---------------------|-----------------------------------------------------------|----------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `axisBorderShow`    | boolean                                                   | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `axisCenteredZero`  | boolean                                                   | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `axisColorMode`     | string                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*<br/>TODO docs<br/>Possible values are: `text`, `series`.                                                                                                                                                                         |
-| `axisGridShow`      | boolean                                                   | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `axisLabel`         | string                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `axisPlacement`     | string                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*<br/>TODO docs<br/>Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`.                                                                                                                                       |
-| `axisSoftMax`       | number                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `axisSoftMin`       | number                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `axisWidth`         | number                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `barAlignment`      | integer                                                   | No       |         | *(Inherited from [BarConfig](#barconfig))*<br/>TODO docs<br/>Possible values are: `-1`, `0`, `1`.                                                                                                                                                                             |
-| `barMaxWidth`       | number                                                    | No       |         | *(Inherited from [BarConfig](#barconfig))*                                                                                                                                                                                                                                    |
-| `barWidthFactor`    | number                                                    | No       |         | *(Inherited from [BarConfig](#barconfig))*                                                                                                                                                                                                                                    |
-| `drawStyle`         | string                                                    | No       |         | TODO docs<br/>Possible values are: `line`, `bars`, `points`.                                                                                                                                                                                                                  |
-| `fillBelowTo`       | string                                                    | No       |         | *(Inherited from [FillConfig](#fillconfig))*                                                                                                                                                                                                                                  |
-| `fillColor`         | string                                                    | No       |         | *(Inherited from [FillConfig](#fillconfig))*                                                                                                                                                                                                                                  |
-| `fillOpacity`       | number                                                    | No       |         | *(Inherited from [FillConfig](#fillconfig))*                                                                                                                                                                                                                                  |
-| `gradientMode`      | string                                                    | No       |         | TODO docs<br/>Possible values are: `none`, `opacity`, `hue`, `scheme`.                                                                                                                                                                                                        |
-| `hideFrom`          | [HideSeriesConfig](#hideseriesconfig)                     | No       |         | *(Inherited from [HideableFieldConfig](#hideablefieldconfig))*<br/>TODO docs                                                                                                                                                                                                  |
-| `lineColor`         | string                                                    | No       |         | *(Inherited from [LineConfig](#lineconfig))*                                                                                                                                                                                                                                  |
-| `lineInterpolation` | string                                                    | No       |         | *(Inherited from [LineConfig](#lineconfig))*<br/>TODO docs<br/>Possible values are: `linear`, `smooth`, `stepBefore`, `stepAfter`.                                                                                                                                            |
-| `lineStyle`         | [LineStyle](#linestyle)                                   | No       |         | *(Inherited from [LineConfig](#lineconfig))*<br/>TODO docs                                                                                                                                                                                                                    |
-| `lineWidth`         | number                                                    | No       |         | *(Inherited from [LineConfig](#lineconfig))*                                                                                                                                                                                                                                  |
-| `pointColor`        | string                                                    | No       |         | *(Inherited from [PointsConfig](#pointsconfig))*                                                                                                                                                                                                                              |
-| `pointSize`         | number                                                    | No       |         | *(Inherited from [PointsConfig](#pointsconfig))*                                                                                                                                                                                                                              |
-| `pointSymbol`       | string                                                    | No       |         | *(Inherited from [PointsConfig](#pointsconfig))*                                                                                                                                                                                                                              |
-| `scaleDistribution` | [ScaleDistributionConfig](#scaledistributionconfig)       | No       |         | *(Inherited from [AxisConfig](#axisconfig))*<br/>TODO docs                                                                                                                                                                                                                    |
-| `showPoints`        | string                                                    | No       |         | *(Inherited from [PointsConfig](#pointsconfig))*<br/>TODO docs<br/>Possible values are: `auto`, `never`, `always`.                                                                                                                                                            |
-| `spanNulls`         |                                                           | No       |         | *(Inherited from [LineConfig](#lineconfig))*<br/>Indicate if null values should be treated as gaps or connected.<br/>When the value is a number, it represents the maximum delta in the<br/>X axis that should be considered connected.  For timeseries, this is milliseconds |
-| `stacking`          | [StackingConfig](#stackingconfig)                         | No       |         | *(Inherited from [StackableFieldConfig](#stackablefieldconfig))*<br/>TODO docs                                                                                                                                                                                                |
-| `thresholdsStyle`   | [GraphThresholdsStyleConfig](#graphthresholdsstyleconfig) | No       |         | TODO docs                                                                                                                                                                                                                                                                     |
-| `transform`         | string                                                    | No       |         | TODO docs<br/>Possible values are: `constant`, `negative-Y`.                                                                                                                                                                                                                  |
-
-### AxisConfig
-
-TODO docs
-
-| Property            | Type                                                | Required | Default | Description                                                                            |
-|---------------------|-----------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------|
-| `axisBorderShow`    | boolean                                             | No       |         |                                                                                        |
-| `axisCenteredZero`  | boolean                                             | No       |         |                                                                                        |
-| `axisColorMode`     | string                                              | No       |         | TODO docs<br/>Possible values are: `text`, `series`.                                   |
-| `axisGridShow`      | boolean                                             | No       |         |                                                                                        |
-| `axisLabel`         | string                                              | No       |         |                                                                                        |
-| `axisPlacement`     | string                                              | No       |         | TODO docs<br/>Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. |
-| `axisSoftMax`       | number                                              | No       |         |                                                                                        |
-| `axisSoftMin`       | number                                              | No       |         |                                                                                        |
-| `axisWidth`         | number                                              | No       |         |                                                                                        |
-| `scaleDistribution` | [ScaleDistributionConfig](#scaledistributionconfig) | No       |         | TODO docs                                                                              |
-
-### ScaleDistributionConfig
-
-TODO docs
-
-| Property          | Type   | Required | Default | Description                                                              |
-|-------------------|--------|----------|---------|--------------------------------------------------------------------------|
-| `type`            | string | **Yes**  |         | TODO docs<br/>Possible values are: `linear`, `log`, `ordinal`, `symlog`. |
-| `linearThreshold` | number | No       |         |                                                                          |
-| `log`             | number | No       |         |                                                                          |
-
-### BarConfig
-
-TODO docs
-
-| Property         | Type    | Required | Default | Description                                        |
-|------------------|---------|----------|---------|----------------------------------------------------|
-| `barAlignment`   | integer | No       |         | TODO docs<br/>Possible values are: `-1`, `0`, `1`. |
-| `barMaxWidth`    | number  | No       |         |                                                    |
-| `barWidthFactor` | number  | No       |         |                                                    |
-
-### FillConfig
-
-TODO docs
-
-| Property      | Type   | Required | Default | Description |
-|---------------|--------|----------|---------|-------------|
-| `fillBelowTo` | string | No       |         |             |
-| `fillColor`   | string | No       |         |             |
-| `fillOpacity` | number | No       |         |             |
-
-### GraphThresholdsStyleConfig
-
-TODO docs
-
-| Property | Type   | Required | Default | Description                                                                                               |
-|----------|--------|----------|---------|-----------------------------------------------------------------------------------------------------------|
-| `mode`   | string | **Yes**  |         | TODO docs<br/>Possible values are: `off`, `line`, `dashed`, `area`, `line+area`, `dashed+area`, `series`. |
-
-### HideSeriesConfig
-
-TODO docs
-
-| Property  | Type    | Required | Default | Description |
-|-----------|---------|----------|---------|-------------|
-| `legend`  | boolean | **Yes**  |         |             |
-| `tooltip` | boolean | **Yes**  |         |             |
-| `viz`     | boolean | **Yes**  |         |             |
-
-### HideableFieldConfig
-
-TODO docs
-
-| Property   | Type                                  | Required | Default | Description |
-|------------|---------------------------------------|----------|---------|-------------|
-| `hideFrom` | [HideSeriesConfig](#hideseriesconfig) | No       |         | TODO docs   |
-
-### LineConfig
-
-TODO docs
-
-| Property            | Type                    | Required | Default | Description                                                                                                                                                                                                                  |
-|---------------------|-------------------------|----------|---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `lineColor`         | string                  | No       |         |                                                                                                                                                                                                                              |
-| `lineInterpolation` | string                  | No       |         | TODO docs<br/>Possible values are: `linear`, `smooth`, `stepBefore`, `stepAfter`.                                                                                                                                            |
-| `lineStyle`         | [LineStyle](#linestyle) | No       |         | TODO docs                                                                                                                                                                                                                    |
-| `lineWidth`         | number                  | No       |         |                                                                                                                                                                                                                              |
-| `spanNulls`         |                         | No       |         | Indicate if null values should be treated as gaps or connected.<br/>When the value is a number, it represents the maximum delta in the<br/>X axis that should be considered connected.  For timeseries, this is milliseconds |
-
-### LineStyle
-
-TODO docs
-
-| Property | Type     | Required | Default | Description                                            |
-|----------|----------|----------|---------|--------------------------------------------------------|
-| `dash`   | number[] | No       |         |                                                        |
-| `fill`   | string   | No       |         | Possible values are: `solid`, `dash`, `dot`, `square`. |
-
-### PointsConfig
-
-TODO docs
-
-| Property      | Type   | Required | Default | Description                                                   |
-|---------------|--------|----------|---------|---------------------------------------------------------------|
-| `pointColor`  | string | No       |         |                                                               |
-| `pointSize`   | number | No       |         |                                                               |
-| `pointSymbol` | string | No       |         |                                                               |
-| `showPoints`  | string | No       |         | TODO docs<br/>Possible values are: `auto`, `never`, `always`. |
-
-### StackableFieldConfig
-
-TODO docs
-
-| Property   | Type                              | Required | Default | Description |
-|------------|-----------------------------------|----------|---------|-------------|
-| `stacking` | [StackingConfig](#stackingconfig) | No       |         | TODO docs   |
-
-### StackingConfig
-
-TODO docs
-
-| Property | Type   | Required | Default | Description                                                     |
-|----------|--------|----------|---------|-----------------------------------------------------------------|
-| `group`  | string | No       |         |                                                                 |
-| `mode`   | string | No       |         | TODO docs<br/>Possible values are: `none`, `normal`, `percent`. |
-
-### Options
-
-It extends [OptionsWithTimezones](#optionswithtimezones).
-
-| Property   | Type                                    | Required | Default | Description                                                      |
-|------------|-----------------------------------------|----------|---------|------------------------------------------------------------------|
-| `legend`   | [VizLegendOptions](#vizlegendoptions)   | **Yes**  |         | TODO docs                                                        |
-| `tooltip`  | [VizTooltipOptions](#viztooltipoptions) | **Yes**  |         | TODO docs                                                        |
-| `timezone` | string[]                                | No       |         | *(Inherited from [OptionsWithTimezones](#optionswithtimezones))* |
-
-### OptionsWithTimezones
-
-TODO docs
-
-| Property   | Type     | Required | Default | Description |
-|------------|----------|----------|---------|-------------|
-| `timezone` | string[] | No       |         |             |
-
-### VizLegendOptions
-
-TODO docs
-
-| Property      | Type     | Required | Default | Description                                                                                                                             |
-|---------------|----------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| `calcs`       | string[] | **Yes**  |         |                                                                                                                                         |
-| `displayMode` | string   | **Yes**  |         | TODO docs<br/>Note: "hidden" needs to remain as an option for plugins compatibility<br/>Possible values are: `list`, `table`, `hidden`. |
-| `placement`   | string   | **Yes**  |         | TODO docs<br/>Possible values are: `bottom`, `right`.                                                                                   |
-| `showLegend`  | boolean  | **Yes**  |         |                                                                                                                                         |
-| `asTable`     | boolean  | No       |         |                                                                                                                                         |
-| `isVisible`   | boolean  | No       |         |                                                                                                                                         |
-| `sortBy`      | string   | No       |         |                                                                                                                                         |
-| `sortDesc`    | boolean  | No       |         |                                                                                                                                         |
-| `width`       | number   | No       |         |                                                                                                                                         |
-
-### VizTooltipOptions
-
-TODO docs
-
-| Property | Type   | Required | Default | Description                                                   |
-|----------|--------|----------|---------|---------------------------------------------------------------|
-| `mode`   | string | **Yes**  |         | TODO docs<br/>Possible values are: `single`, `multi`, `none`. |
-| `sort`   | string | **Yes**  |         | TODO docs<br/>Possible values are: `asc`, `desc`, `none`.     |
-
-
diff --git a/docs/sources/developers/kinds/composable/trend/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/trend/panelcfg/schema-reference.md
deleted file mode 100644
index 73ec1cfc49c74..0000000000000
--- a/docs/sources/developers/kinds/composable/trend/panelcfg/schema-reference.md
+++ /dev/null
@@ -1,223 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: TrendPanelCfg kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## TrendPanelCfg
-
-#### Maturity: [merged](../../../maturity/#merged)
-#### Version: 0.0
-
-
-
-| Property      | Type                                  | Required | Default | Description                                                          |
-|---------------|---------------------------------------|----------|---------|----------------------------------------------------------------------|
-| `FieldConfig` | [GraphFieldConfig](#graphfieldconfig) | **Yes**  |         | TODO docs                                                            |
-| `Options`     | [object](#options)                    | **Yes**  |         | Identical to timeseries... except it does not have timezone settings |
-
-### GraphFieldConfig
-
-TODO docs
-
-It extends [LineConfig](#lineconfig) and [FillConfig](#fillconfig) and [PointsConfig](#pointsconfig) and [AxisConfig](#axisconfig) and [BarConfig](#barconfig) and [StackableFieldConfig](#stackablefieldconfig) and [HideableFieldConfig](#hideablefieldconfig).
-
-| Property            | Type                                                      | Required | Default | Description                                                                                                                                                                                                                                                                   |
-|---------------------|-----------------------------------------------------------|----------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `axisBorderShow`    | boolean                                                   | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `axisCenteredZero`  | boolean                                                   | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `axisColorMode`     | string                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*<br/>TODO docs<br/>Possible values are: `text`, `series`.                                                                                                                                                                         |
-| `axisGridShow`      | boolean                                                   | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `axisLabel`         | string                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `axisPlacement`     | string                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*<br/>TODO docs<br/>Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`.                                                                                                                                       |
-| `axisSoftMax`       | number                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `axisSoftMin`       | number                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `axisWidth`         | number                                                    | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                                                                                                                                                                  |
-| `barAlignment`      | integer                                                   | No       |         | *(Inherited from [BarConfig](#barconfig))*<br/>TODO docs<br/>Possible values are: `-1`, `0`, `1`.                                                                                                                                                                             |
-| `barMaxWidth`       | number                                                    | No       |         | *(Inherited from [BarConfig](#barconfig))*                                                                                                                                                                                                                                    |
-| `barWidthFactor`    | number                                                    | No       |         | *(Inherited from [BarConfig](#barconfig))*                                                                                                                                                                                                                                    |
-| `drawStyle`         | string                                                    | No       |         | TODO docs<br/>Possible values are: `line`, `bars`, `points`.                                                                                                                                                                                                                  |
-| `fillBelowTo`       | string                                                    | No       |         | *(Inherited from [FillConfig](#fillconfig))*                                                                                                                                                                                                                                  |
-| `fillColor`         | string                                                    | No       |         | *(Inherited from [FillConfig](#fillconfig))*                                                                                                                                                                                                                                  |
-| `fillOpacity`       | number                                                    | No       |         | *(Inherited from [FillConfig](#fillconfig))*                                                                                                                                                                                                                                  |
-| `gradientMode`      | string                                                    | No       |         | TODO docs<br/>Possible values are: `none`, `opacity`, `hue`, `scheme`.                                                                                                                                                                                                        |
-| `hideFrom`          | [HideSeriesConfig](#hideseriesconfig)                     | No       |         | *(Inherited from [HideableFieldConfig](#hideablefieldconfig))*<br/>TODO docs                                                                                                                                                                                                  |
-| `lineColor`         | string                                                    | No       |         | *(Inherited from [LineConfig](#lineconfig))*                                                                                                                                                                                                                                  |
-| `lineInterpolation` | string                                                    | No       |         | *(Inherited from [LineConfig](#lineconfig))*<br/>TODO docs<br/>Possible values are: `linear`, `smooth`, `stepBefore`, `stepAfter`.                                                                                                                                            |
-| `lineStyle`         | [LineStyle](#linestyle)                                   | No       |         | *(Inherited from [LineConfig](#lineconfig))*<br/>TODO docs                                                                                                                                                                                                                    |
-| `lineWidth`         | number                                                    | No       |         | *(Inherited from [LineConfig](#lineconfig))*                                                                                                                                                                                                                                  |
-| `pointColor`        | string                                                    | No       |         | *(Inherited from [PointsConfig](#pointsconfig))*                                                                                                                                                                                                                              |
-| `pointSize`         | number                                                    | No       |         | *(Inherited from [PointsConfig](#pointsconfig))*                                                                                                                                                                                                                              |
-| `pointSymbol`       | string                                                    | No       |         | *(Inherited from [PointsConfig](#pointsconfig))*                                                                                                                                                                                                                              |
-| `scaleDistribution` | [ScaleDistributionConfig](#scaledistributionconfig)       | No       |         | *(Inherited from [AxisConfig](#axisconfig))*<br/>TODO docs                                                                                                                                                                                                                    |
-| `showPoints`        | string                                                    | No       |         | *(Inherited from [PointsConfig](#pointsconfig))*<br/>TODO docs<br/>Possible values are: `auto`, `never`, `always`.                                                                                                                                                            |
-| `spanNulls`         |                                                           | No       |         | *(Inherited from [LineConfig](#lineconfig))*<br/>Indicate if null values should be treated as gaps or connected.<br/>When the value is a number, it represents the maximum delta in the<br/>X axis that should be considered connected.  For timeseries, this is milliseconds |
-| `stacking`          | [StackingConfig](#stackingconfig)                         | No       |         | *(Inherited from [StackableFieldConfig](#stackablefieldconfig))*<br/>TODO docs                                                                                                                                                                                                |
-| `thresholdsStyle`   | [GraphThresholdsStyleConfig](#graphthresholdsstyleconfig) | No       |         | TODO docs                                                                                                                                                                                                                                                                     |
-| `transform`         | string                                                    | No       |         | TODO docs<br/>Possible values are: `constant`, `negative-Y`.                                                                                                                                                                                                                  |
-
-### AxisConfig
-
-TODO docs
-
-| Property            | Type                                                | Required | Default | Description                                                                            |
-|---------------------|-----------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------|
-| `axisBorderShow`    | boolean                                             | No       |         |                                                                                        |
-| `axisCenteredZero`  | boolean                                             | No       |         |                                                                                        |
-| `axisColorMode`     | string                                              | No       |         | TODO docs<br/>Possible values are: `text`, `series`.                                   |
-| `axisGridShow`      | boolean                                             | No       |         |                                                                                        |
-| `axisLabel`         | string                                              | No       |         |                                                                                        |
-| `axisPlacement`     | string                                              | No       |         | TODO docs<br/>Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. |
-| `axisSoftMax`       | number                                              | No       |         |                                                                                        |
-| `axisSoftMin`       | number                                              | No       |         |                                                                                        |
-| `axisWidth`         | number                                              | No       |         |                                                                                        |
-| `scaleDistribution` | [ScaleDistributionConfig](#scaledistributionconfig) | No       |         | TODO docs                                                                              |
-
-### ScaleDistributionConfig
-
-TODO docs
-
-| Property          | Type   | Required | Default | Description                                                              |
-|-------------------|--------|----------|---------|--------------------------------------------------------------------------|
-| `type`            | string | **Yes**  |         | TODO docs<br/>Possible values are: `linear`, `log`, `ordinal`, `symlog`. |
-| `linearThreshold` | number | No       |         |                                                                          |
-| `log`             | number | No       |         |                                                                          |
-
-### BarConfig
-
-TODO docs
-
-| Property         | Type    | Required | Default | Description                                        |
-|------------------|---------|----------|---------|----------------------------------------------------|
-| `barAlignment`   | integer | No       |         | TODO docs<br/>Possible values are: `-1`, `0`, `1`. |
-| `barMaxWidth`    | number  | No       |         |                                                    |
-| `barWidthFactor` | number  | No       |         |                                                    |
-
-### FillConfig
-
-TODO docs
-
-| Property      | Type   | Required | Default | Description |
-|---------------|--------|----------|---------|-------------|
-| `fillBelowTo` | string | No       |         |             |
-| `fillColor`   | string | No       |         |             |
-| `fillOpacity` | number | No       |         |             |
-
-### GraphThresholdsStyleConfig
-
-TODO docs
-
-| Property | Type   | Required | Default | Description                                                                                               |
-|----------|--------|----------|---------|-----------------------------------------------------------------------------------------------------------|
-| `mode`   | string | **Yes**  |         | TODO docs<br/>Possible values are: `off`, `line`, `dashed`, `area`, `line+area`, `dashed+area`, `series`. |
-
-### HideSeriesConfig
-
-TODO docs
-
-| Property  | Type    | Required | Default | Description |
-|-----------|---------|----------|---------|-------------|
-| `legend`  | boolean | **Yes**  |         |             |
-| `tooltip` | boolean | **Yes**  |         |             |
-| `viz`     | boolean | **Yes**  |         |             |
-
-### HideableFieldConfig
-
-TODO docs
-
-| Property   | Type                                  | Required | Default | Description |
-|------------|---------------------------------------|----------|---------|-------------|
-| `hideFrom` | [HideSeriesConfig](#hideseriesconfig) | No       |         | TODO docs   |
-
-### LineConfig
-
-TODO docs
-
-| Property            | Type                    | Required | Default | Description                                                                                                                                                                                                                  |
-|---------------------|-------------------------|----------|---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `lineColor`         | string                  | No       |         |                                                                                                                                                                                                                              |
-| `lineInterpolation` | string                  | No       |         | TODO docs<br/>Possible values are: `linear`, `smooth`, `stepBefore`, `stepAfter`.                                                                                                                                            |
-| `lineStyle`         | [LineStyle](#linestyle) | No       |         | TODO docs                                                                                                                                                                                                                    |
-| `lineWidth`         | number                  | No       |         |                                                                                                                                                                                                                              |
-| `spanNulls`         |                         | No       |         | Indicate if null values should be treated as gaps or connected.<br/>When the value is a number, it represents the maximum delta in the<br/>X axis that should be considered connected.  For timeseries, this is milliseconds |
-
-### LineStyle
-
-TODO docs
-
-| Property | Type     | Required | Default | Description                                            |
-|----------|----------|----------|---------|--------------------------------------------------------|
-| `dash`   | number[] | No       |         |                                                        |
-| `fill`   | string   | No       |         | Possible values are: `solid`, `dash`, `dot`, `square`. |
-
-### PointsConfig
-
-TODO docs
-
-| Property      | Type   | Required | Default | Description                                                   |
-|---------------|--------|----------|---------|---------------------------------------------------------------|
-| `pointColor`  | string | No       |         |                                                               |
-| `pointSize`   | number | No       |         |                                                               |
-| `pointSymbol` | string | No       |         |                                                               |
-| `showPoints`  | string | No       |         | TODO docs<br/>Possible values are: `auto`, `never`, `always`. |
-
-### StackableFieldConfig
-
-TODO docs
-
-| Property   | Type                              | Required | Default | Description |
-|------------|-----------------------------------|----------|---------|-------------|
-| `stacking` | [StackingConfig](#stackingconfig) | No       |         | TODO docs   |
-
-### StackingConfig
-
-TODO docs
-
-| Property | Type   | Required | Default | Description                                                     |
-|----------|--------|----------|---------|-----------------------------------------------------------------|
-| `group`  | string | No       |         |                                                                 |
-| `mode`   | string | No       |         | TODO docs<br/>Possible values are: `none`, `normal`, `percent`. |
-
-### Options
-
-Identical to timeseries... except it does not have timezone settings
-
-| Property  | Type                                    | Required | Default | Description                                           |
-|-----------|-----------------------------------------|----------|---------|-------------------------------------------------------|
-| `legend`  | [VizLegendOptions](#vizlegendoptions)   | **Yes**  |         | TODO docs                                             |
-| `tooltip` | [VizTooltipOptions](#viztooltipoptions) | **Yes**  |         | TODO docs                                             |
-| `xField`  | string                                  | No       |         | Name of the x field to use (defaults to first number) |
-
-### VizLegendOptions
-
-TODO docs
-
-| Property      | Type     | Required | Default | Description                                                                                                                             |
-|---------------|----------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| `calcs`       | string[] | **Yes**  |         |                                                                                                                                         |
-| `displayMode` | string   | **Yes**  |         | TODO docs<br/>Note: "hidden" needs to remain as an option for plugins compatibility<br/>Possible values are: `list`, `table`, `hidden`. |
-| `placement`   | string   | **Yes**  |         | TODO docs<br/>Possible values are: `bottom`, `right`.                                                                                   |
-| `showLegend`  | boolean  | **Yes**  |         |                                                                                                                                         |
-| `asTable`     | boolean  | No       |         |                                                                                                                                         |
-| `isVisible`   | boolean  | No       |         |                                                                                                                                         |
-| `sortBy`      | string   | No       |         |                                                                                                                                         |
-| `sortDesc`    | boolean  | No       |         |                                                                                                                                         |
-| `width`       | number   | No       |         |                                                                                                                                         |
-
-### VizTooltipOptions
-
-TODO docs
-
-| Property | Type   | Required | Default | Description                                                   |
-|----------|--------|----------|---------|---------------------------------------------------------------|
-| `mode`   | string | **Yes**  |         | TODO docs<br/>Possible values are: `single`, `multi`, `none`. |
-| `sort`   | string | **Yes**  |         | TODO docs<br/>Possible values are: `asc`, `desc`, `none`.     |
-
-
diff --git a/docs/sources/developers/kinds/composable/xychart/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/xychart/panelcfg/schema-reference.md
deleted file mode 100644
index 9134117d461a2..0000000000000
--- a/docs/sources/developers/kinds/composable/xychart/panelcfg/schema-reference.md
+++ /dev/null
@@ -1,237 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: XYChartPanelCfg kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## XYChartPanelCfg
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-
-
-| Property              | Type                           | Required | Default | Description                                             |
-|-----------------------|--------------------------------|----------|---------|---------------------------------------------------------|
-| `FieldConfig`         | [object](#fieldconfig)         | **Yes**  |         |                                                         |
-| `Options`             | [object](#options)             | **Yes**  |         |                                                         |
-| `ScatterSeriesConfig` | [object](#scatterseriesconfig) | **Yes**  |         |                                                         |
-| `ScatterShow`         | string                         | **Yes**  |         | Possible values are: `points`, `lines`, `points+lines`. |
-| `SeriesMapping`       | string                         | **Yes**  |         | Possible values are: `auto`, `manual`.                  |
-| `XYDimensionConfig`   | [object](#xydimensionconfig)   | **Yes**  |         |                                                         |
-
-### FieldConfig
-
-It extends [HideableFieldConfig](#hideablefieldconfig) and [AxisConfig](#axisconfig).
-
-| Property            | Type                                                | Required | Default | Description                                                                                                                             |
-|---------------------|-----------------------------------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| `axisBorderShow`    | boolean                                             | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                            |
-| `axisCenteredZero`  | boolean                                             | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                            |
-| `axisColorMode`     | string                                              | No       |         | *(Inherited from [AxisConfig](#axisconfig))*<br/>TODO docs<br/>Possible values are: `text`, `series`.                                   |
-| `axisGridShow`      | boolean                                             | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                            |
-| `axisLabel`         | string                                              | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                            |
-| `axisPlacement`     | string                                              | No       |         | *(Inherited from [AxisConfig](#axisconfig))*<br/>TODO docs<br/>Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. |
-| `axisSoftMax`       | number                                              | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                            |
-| `axisSoftMin`       | number                                              | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                            |
-| `axisWidth`         | number                                              | No       |         | *(Inherited from [AxisConfig](#axisconfig))*                                                                                            |
-| `hideFrom`          | [HideSeriesConfig](#hideseriesconfig)               | No       |         | *(Inherited from [HideableFieldConfig](#hideablefieldconfig))*<br/>TODO docs                                                            |
-| `labelValue`        | [TextDimensionConfig](#textdimensionconfig)         | No       |         |                                                                                                                                         |
-| `label`             | string                                              | No       |         | TODO docs<br/>Possible values are: `auto`, `never`, `always`.                                                                           |
-| `lineColor`         | [ColorDimensionConfig](#colordimensionconfig)       | No       |         |                                                                                                                                         |
-| `lineStyle`         | [LineStyle](#linestyle)                             | No       |         | TODO docs                                                                                                                               |
-| `lineWidth`         | integer                                             | No       |         | Constraint: `>=0 & <=2147483647`.                                                                                                       |
-| `pointColor`        | [ColorDimensionConfig](#colordimensionconfig)       | No       |         |                                                                                                                                         |
-| `pointSize`         | [ScaleDimensionConfig](#scaledimensionconfig)       | No       |         |                                                                                                                                         |
-| `scaleDistribution` | [ScaleDistributionConfig](#scaledistributionconfig) | No       |         | *(Inherited from [AxisConfig](#axisconfig))*<br/>TODO docs                                                                              |
-| `show`              | string                                              | No       |         | Possible values are: `points`, `lines`, `points+lines`.                                                                                 |
-
-### AxisConfig
-
-TODO docs
-
-| Property            | Type                                                | Required | Default | Description                                                                            |
-|---------------------|-----------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------|
-| `axisBorderShow`    | boolean                                             | No       |         |                                                                                        |
-| `axisCenteredZero`  | boolean                                             | No       |         |                                                                                        |
-| `axisColorMode`     | string                                              | No       |         | TODO docs<br/>Possible values are: `text`, `series`.                                   |
-| `axisGridShow`      | boolean                                             | No       |         |                                                                                        |
-| `axisLabel`         | string                                              | No       |         |                                                                                        |
-| `axisPlacement`     | string                                              | No       |         | TODO docs<br/>Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. |
-| `axisSoftMax`       | number                                              | No       |         |                                                                                        |
-| `axisSoftMin`       | number                                              | No       |         |                                                                                        |
-| `axisWidth`         | number                                              | No       |         |                                                                                        |
-| `scaleDistribution` | [ScaleDistributionConfig](#scaledistributionconfig) | No       |         | TODO docs                                                                              |
-
-### ScaleDistributionConfig
-
-TODO docs
-
-| Property          | Type   | Required | Default | Description                                                              |
-|-------------------|--------|----------|---------|--------------------------------------------------------------------------|
-| `type`            | string | **Yes**  |         | TODO docs<br/>Possible values are: `linear`, `log`, `ordinal`, `symlog`. |
-| `linearThreshold` | number | No       |         |                                                                          |
-| `log`             | number | No       |         |                                                                          |
-
-### ColorDimensionConfig
-
-It extends [BaseDimensionConfig](#basedimensionconfig).
-
-| Property | Type   | Required | Default | Description                                                                                                  |
-|----------|--------|----------|---------|--------------------------------------------------------------------------------------------------------------|
-| `field`  | string | No       |         | *(Inherited from [BaseDimensionConfig](#basedimensionconfig))*<br/>fixed: T -- will be added by each element |
-| `fixed`  | string | No       |         |                                                                                                              |
-
-### BaseDimensionConfig
-
-| Property | Type   | Required | Default | Description                               |
-|----------|--------|----------|---------|-------------------------------------------|
-| `field`  | string | No       |         | fixed: T -- will be added by each element |
-
-### HideSeriesConfig
-
-TODO docs
-
-| Property  | Type    | Required | Default | Description |
-|-----------|---------|----------|---------|-------------|
-| `legend`  | boolean | **Yes**  |         |             |
-| `tooltip` | boolean | **Yes**  |         |             |
-| `viz`     | boolean | **Yes**  |         |             |
-
-### HideableFieldConfig
-
-TODO docs
-
-| Property   | Type                                  | Required | Default | Description |
-|------------|---------------------------------------|----------|---------|-------------|
-| `hideFrom` | [HideSeriesConfig](#hideseriesconfig) | No       |         | TODO docs   |
-
-### LineStyle
-
-TODO docs
-
-| Property | Type     | Required | Default | Description                                            |
-|----------|----------|----------|---------|--------------------------------------------------------|
-| `dash`   | number[] | No       |         |                                                        |
-| `fill`   | string   | No       |         | Possible values are: `solid`, `dash`, `dot`, `square`. |
-
-### ScaleDimensionConfig
-
-It extends [BaseDimensionConfig](#basedimensionconfig).
-
-| Property | Type   | Required | Default | Description                                                                                                  |
-|----------|--------|----------|---------|--------------------------------------------------------------------------------------------------------------|
-| `max`    | number | **Yes**  |         |                                                                                                              |
-| `min`    | number | **Yes**  |         |                                                                                                              |
-| `field`  | string | No       |         | *(Inherited from [BaseDimensionConfig](#basedimensionconfig))*<br/>fixed: T -- will be added by each element |
-| `fixed`  | number | No       |         |                                                                                                              |
-| `mode`   | string | No       |         | Possible values are: `linear`, `quad`.                                                                       |
-
-### TextDimensionConfig
-
-It extends [BaseDimensionConfig](#basedimensionconfig).
-
-| Property | Type   | Required | Default | Description                                                                                                  |
-|----------|--------|----------|---------|--------------------------------------------------------------------------------------------------------------|
-| `mode`   | string | **Yes**  |         | Possible values are: `fixed`, `field`, `template`.                                                           |
-| `field`  | string | No       |         | *(Inherited from [BaseDimensionConfig](#basedimensionconfig))*<br/>fixed: T -- will be added by each element |
-| `fixed`  | string | No       |         |                                                                                                              |
-
-### Options
-
-It extends [OptionsWithLegend](#optionswithlegend) and [OptionsWithTooltip](#optionswithtooltip).
-
-| Property        | Type                                          | Required | Default | Description                                                                |
-|-----------------|-----------------------------------------------|----------|---------|----------------------------------------------------------------------------|
-| `dims`          | [XYDimensionConfig](#xydimensionconfig)       | **Yes**  |         |                                                                            |
-| `legend`        | [VizLegendOptions](#vizlegendoptions)         | **Yes**  |         | *(Inherited from [OptionsWithLegend](#optionswithlegend))*<br/>TODO docs   |
-| `series`        | [ScatterSeriesConfig](#scatterseriesconfig)[] | **Yes**  |         |                                                                            |
-| `tooltip`       | [VizTooltipOptions](#viztooltipoptions)       | **Yes**  |         | *(Inherited from [OptionsWithTooltip](#optionswithtooltip))*<br/>TODO docs |
-| `seriesMapping` | string                                        | No       |         | Possible values are: `auto`, `manual`.                                     |
-
-### OptionsWithLegend
-
-TODO docs
-
-| Property | Type                                  | Required | Default | Description |
-|----------|---------------------------------------|----------|---------|-------------|
-| `legend` | [VizLegendOptions](#vizlegendoptions) | **Yes**  |         | TODO docs   |
-
-### VizLegendOptions
-
-TODO docs
-
-| Property      | Type     | Required | Default | Description                                                                                                                             |
-|---------------|----------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| `calcs`       | string[] | **Yes**  |         |                                                                                                                                         |
-| `displayMode` | string   | **Yes**  |         | TODO docs<br/>Note: "hidden" needs to remain as an option for plugins compatibility<br/>Possible values are: `list`, `table`, `hidden`. |
-| `placement`   | string   | **Yes**  |         | TODO docs<br/>Possible values are: `bottom`, `right`.                                                                                   |
-| `showLegend`  | boolean  | **Yes**  |         |                                                                                                                                         |
-| `asTable`     | boolean  | No       |         |                                                                                                                                         |
-| `isVisible`   | boolean  | No       |         |                                                                                                                                         |
-| `sortBy`      | string   | No       |         |                                                                                                                                         |
-| `sortDesc`    | boolean  | No       |         |                                                                                                                                         |
-| `width`       | number   | No       |         |                                                                                                                                         |
-
-### OptionsWithTooltip
-
-TODO docs
-
-| Property  | Type                                    | Required | Default | Description |
-|-----------|-----------------------------------------|----------|---------|-------------|
-| `tooltip` | [VizTooltipOptions](#viztooltipoptions) | **Yes**  |         | TODO docs   |
-
-### VizTooltipOptions
-
-TODO docs
-
-| Property | Type   | Required | Default | Description                                                   |
-|----------|--------|----------|---------|---------------------------------------------------------------|
-| `mode`   | string | **Yes**  |         | TODO docs<br/>Possible values are: `single`, `multi`, `none`. |
-| `sort`   | string | **Yes**  |         | TODO docs<br/>Possible values are: `asc`, `desc`, `none`.     |
-
-### ScatterSeriesConfig
-
-It extends [FieldConfig](#fieldconfig).
-
-| Property            | Type                                                | Required | Default | Description                                                                                                                               |
-|---------------------|-----------------------------------------------------|----------|---------|-------------------------------------------------------------------------------------------------------------------------------------------|
-| `axisBorderShow`    | boolean                                             | No       |         | *(Inherited from [FieldConfig](#fieldconfig))*                                                                                            |
-| `axisCenteredZero`  | boolean                                             | No       |         | *(Inherited from [FieldConfig](#fieldconfig))*                                                                                            |
-| `axisColorMode`     | string                                              | No       |         | *(Inherited from [FieldConfig](#fieldconfig))*<br/>TODO docs<br/>Possible values are: `text`, `series`.                                   |
-| `axisGridShow`      | boolean                                             | No       |         | *(Inherited from [FieldConfig](#fieldconfig))*                                                                                            |
-| `axisLabel`         | string                                              | No       |         | *(Inherited from [FieldConfig](#fieldconfig))*                                                                                            |
-| `axisPlacement`     | string                                              | No       |         | *(Inherited from [FieldConfig](#fieldconfig))*<br/>TODO docs<br/>Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. |
-| `axisSoftMax`       | number                                              | No       |         | *(Inherited from [FieldConfig](#fieldconfig))*                                                                                            |
-| `axisSoftMin`       | number                                              | No       |         | *(Inherited from [FieldConfig](#fieldconfig))*                                                                                            |
-| `axisWidth`         | number                                              | No       |         | *(Inherited from [FieldConfig](#fieldconfig))*                                                                                            |
-| `hideFrom`          | [HideSeriesConfig](#hideseriesconfig)               | No       |         | *(Inherited from [FieldConfig](#fieldconfig))*<br/>TODO docs                                                                              |
-| `labelValue`        | [TextDimensionConfig](#textdimensionconfig)         | No       |         | *(Inherited from [FieldConfig](#fieldconfig))*                                                                                            |
-| `label`             | string                                              | No       |         | *(Inherited from [FieldConfig](#fieldconfig))*<br/>TODO docs<br/>Possible values are: `auto`, `never`, `always`.                          |
-| `lineColor`         | [ColorDimensionConfig](#colordimensionconfig)       | No       |         | *(Inherited from [FieldConfig](#fieldconfig))*                                                                                            |
-| `lineStyle`         | [LineStyle](#linestyle)                             | No       |         | *(Inherited from [FieldConfig](#fieldconfig))*<br/>TODO docs                                                                              |
-| `lineWidth`         | integer                                             | No       |         | *(Inherited from [FieldConfig](#fieldconfig))*<br/>Constraint: `>=0 & <=2147483647`.                                                      |
-| `name`              | string                                              | No       |         |                                                                                                                                           |
-| `pointColor`        | [ColorDimensionConfig](#colordimensionconfig)       | No       |         | *(Inherited from [FieldConfig](#fieldconfig))*                                                                                            |
-| `pointSize`         | [ScaleDimensionConfig](#scaledimensionconfig)       | No       |         | *(Inherited from [FieldConfig](#fieldconfig))*                                                                                            |
-| `scaleDistribution` | [ScaleDistributionConfig](#scaledistributionconfig) | No       |         | *(Inherited from [FieldConfig](#fieldconfig))*<br/>TODO docs                                                                              |
-| `show`              | string                                              | No       |         | *(Inherited from [FieldConfig](#fieldconfig))*<br/>Possible values are: `points`, `lines`, `points+lines`.                                |
-| `x`                 | string                                              | No       |         |                                                                                                                                           |
-| `y`                 | string                                              | No       |         |                                                                                                                                           |
-
-### XYDimensionConfig
-
-| Property  | Type     | Required | Default | Description                       |
-|-----------|----------|----------|---------|-----------------------------------|
-| `frame`   | integer  | **Yes**  |         | Constraint: `>=0 & <=2147483647`. |
-| `exclude` | string[] | No       |         |                                   |
-| `x`       | string   | No       |         |                                   |
-
-
diff --git a/docs/sources/developers/kinds/core/_index.md b/docs/sources/developers/kinds/core/_index.md
deleted file mode 100644
index f791015d5b4ca..0000000000000
--- a/docs/sources/developers/kinds/core/_index.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-labels:
-  products:
-  - enterprise
-  - oss
-title: Core kinds
-weight: 200
----
-
-# Grafana core kinds
-
-Kinds that define Grafana’s core schematized object types - dashboards, datasources, users, etc.
-
-{{< section >}}
diff --git a/docs/sources/developers/kinds/core/accesspolicy/schema-reference.md b/docs/sources/developers/kinds/core/accesspolicy/schema-reference.md
deleted file mode 100644
index 0df9b57ef00b8..0000000000000
--- a/docs/sources/developers/kinds/core/accesspolicy/schema-reference.md
+++ /dev/null
@@ -1,131 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: AccessPolicy kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## AccessPolicy
-
-#### Maturity: [merged](../../../maturity/#merged)
-#### Version: 0.0
-
-Access rules for a scope+role.  NOTE there is a unique constraint on role+scope
-
-| Property   | Type                | Required | Default | Description                                                                                                                                                                                                                                                                    |
-|------------|---------------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `metadata` | [object](#metadata) | **Yes**  |         | metadata contains embedded CommonMetadata and can be extended with custom string fields<br/>TODO: use CommonMetadata instead of redefining here; currently needs to be defined here<br/>without external reference as using the CommonMetadata reference breaks thema codegen. |
-| `spec`     | [object](#spec)     | **Yes**  |         |                                                                                                                                                                                                                                                                                |
-| `status`   | [object](#status)   | **Yes**  |         |                                                                                                                                                                                                                                                                                |
-
-### Metadata
-
-metadata contains embedded CommonMetadata and can be extended with custom string fields
-TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
-without external reference as using the CommonMetadata reference breaks thema codegen.
-
-It extends [_kubeObjectMetadata](#_kubeobjectmetadata).
-
-| Property            | Type                   | Required | Default | Description                                                                                                                             |
-|---------------------|------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| `createdBy`         | string                 | **Yes**  |         |                                                                                                                                         |
-| `creationTimestamp` | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `extraFields`       | [object](#extrafields) | **Yes**  |         | extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata |
-| `finalizers`        | string[]               | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `labels`            | map[string]string      | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `resourceVersion`   | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `uid`               | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `updateTimestamp`   | string                 | **Yes**  |         |                                                                                                                                         |
-| `updatedBy`         | string                 | **Yes**  |         |                                                                                                                                         |
-| `deletionTimestamp` | string                 | No       |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-
-### _kubeObjectMetadata
-
-_kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
-It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
-As it is also intended to be generic enough to function with any API Server.
-
-| Property            | Type              | Required | Default | Description |
-|---------------------|-------------------|----------|---------|-------------|
-| `creationTimestamp` | string            | **Yes**  |         |             |
-| `finalizers`        | string[]          | **Yes**  |         |             |
-| `labels`            | map[string]string | **Yes**  |         |             |
-| `resourceVersion`   | string            | **Yes**  |         |             |
-| `uid`               | string            | **Yes**  |         |             |
-| `deletionTimestamp` | string            | No       |         |             |
-
-### ExtraFields
-
-extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Spec
-
-| Property | Type                        | Required | Default | Description                                                                                                                    |
-|----------|-----------------------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------|
-| `role`   | [RoleRef](#roleref)         | **Yes**  |         |                                                                                                                                |
-| `rules`  | [AccessRule](#accessrule)[] | **Yes**  |         | The set of rules to apply.  Note that * is required to modify<br/>access policy rules, and that "none" will reject all actions |
-| `scope`  | [ResourceRef](#resourceref) | **Yes**  |         |                                                                                                                                |
-
-### AccessRule
-
-| Property | Type   | Required | Default | Description                                                                                                                             |
-|----------|--------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| `kind`   | string | **Yes**  |         | The kind this rule applies to (dashboards, alert, etc)                                                                                  |
-| `verb`   | string | **Yes**  |         | READ, WRITE, CREATE, DELETE, ...<br/>should move to k8s style verbs like: "get", "list", "watch", "create", "update", "patch", "delete" |
-| `target` | string | No       |         | Specific sub-elements like "alert.rules" or "dashboard.permissions"????                                                                 |
-
-### ResourceRef
-
-| Property | Type   | Required | Default | Description |
-|----------|--------|----------|---------|-------------|
-| `kind`   | string | **Yes**  |         |             |
-| `name`   | string | **Yes**  |         |             |
-
-### RoleRef
-
-| Property | Type   | Required | Default | Description                                                                                                                                                                          |
-|----------|--------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `kind`   | string | **Yes**  |         | Policies can apply to roles, teams, or users<br/>Applying policies to individual users is supported, but discouraged<br/>Possible values are: `Role`, `BuiltinRole`, `Team`, `User`. |
-| `name`   | string | **Yes**  |         |                                                                                                                                                                                      |
-| `xname`  | string | **Yes**  |         |                                                                                                                                                                                      |
-
-### Status
-
-| Property           | Type                                                       | Required | Default | Description                                                                                                                                                                |
-|--------------------|------------------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `additionalFields` | [object](#additionalfields)                                | No       |         | additionalFields is reserved for future use                                                                                                                                |
-| `operatorStates`   | map[string][status.#OperatorState](#status.#operatorstate) | No       |         | operatorStates is a map of operator ID to operator state evaluations.<br/>Any operator which consumes this kind SHOULD add its state evaluation information to this field. |
-
-### AdditionalFields
-
-additionalFields is reserved for future use
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Status.#OperatorState
-
-| Property           | Type               | Required | Default | Description                                                                                                                                                                      |
-|--------------------|--------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `lastEvaluation`   | string             | **Yes**  |         | lastEvaluation is the ResourceVersion last evaluated                                                                                                                             |
-| `state`            | string             | **Yes**  |         | state describes the state of the lastEvaluation.<br/>It is limited to three possible states for machine evaluation.<br/>Possible values are: `success`, `in_progress`, `failed`. |
-| `descriptiveState` | string             | No       |         | descriptiveState is an optional more descriptive state field which has no requirements on format                                                                                 |
-| `details`          | [object](#details) | No       |         | details contains any extra information that is operator-specific                                                                                                                 |
-
-### Details
-
-details contains any extra information that is operator-specific
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-
diff --git a/docs/sources/developers/kinds/core/dashboard/schema-reference.md b/docs/sources/developers/kinds/core/dashboard/schema-reference.md
deleted file mode 100644
index 42b36f9f4865e..0000000000000
--- a/docs/sources/developers/kinds/core/dashboard/schema-reference.md
+++ /dev/null
@@ -1,714 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Dashboard kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## Dashboard
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-A Grafana dashboard.
-
-| Property   | Type                | Required | Default | Description                                                                                                                                                                                                                                                                    |
-|------------|---------------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `metadata` | [object](#metadata) | **Yes**  |         | metadata contains embedded CommonMetadata and can be extended with custom string fields<br/>TODO: use CommonMetadata instead of redefining here; currently needs to be defined here<br/>without external reference as using the CommonMetadata reference breaks thema codegen. |
-| `spec`     | [object](#spec)     | **Yes**  |         |                                                                                                                                                                                                                                                                                |
-| `status`   | [object](#status)   | **Yes**  |         |                                                                                                                                                                                                                                                                                |
-
-### Metadata
-
-metadata contains embedded CommonMetadata and can be extended with custom string fields
-TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
-without external reference as using the CommonMetadata reference breaks thema codegen.
-
-It extends [_kubeObjectMetadata](#_kubeobjectmetadata).
-
-| Property            | Type                   | Required | Default | Description                                                                                                                             |
-|---------------------|------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| `createdBy`         | string                 | **Yes**  |         |                                                                                                                                         |
-| `creationTimestamp` | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `extraFields`       | [object](#extrafields) | **Yes**  |         | extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata |
-| `finalizers`        | string[]               | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `labels`            | map[string]string      | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `resourceVersion`   | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `uid`               | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `updateTimestamp`   | string                 | **Yes**  |         |                                                                                                                                         |
-| `updatedBy`         | string                 | **Yes**  |         |                                                                                                                                         |
-| `deletionTimestamp` | string                 | No       |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-
-### _kubeObjectMetadata
-
-_kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
-It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
-As it is also intended to be generic enough to function with any API Server.
-
-| Property            | Type              | Required | Default | Description |
-|---------------------|-------------------|----------|---------|-------------|
-| `creationTimestamp` | string            | **Yes**  |         |             |
-| `finalizers`        | string[]          | **Yes**  |         |             |
-| `labels`            | map[string]string | **Yes**  |         |             |
-| `resourceVersion`   | string            | **Yes**  |         |             |
-| `uid`               | string            | **Yes**  |         |             |
-| `deletionTimestamp` | string            | No       |         |             |
-
-### ExtraFields
-
-extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Spec
-
-| Property               | Type                                        | Required | Default   | Description                                                                                                                                                                                                                                                                                                                                                                                                    |
-|------------------------|---------------------------------------------|----------|-----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `schemaVersion`        | uint16                                      | **Yes**  | `36`      | Version of the JSON schema, incremented each time a Grafana update brings<br/>changes to said schema.                                                                                                                                                                                                                                                                                                          |
-| `annotations`          | [AnnotationContainer](#annotationcontainer) | No       |           | Contains the list of annotations that are associated with the dashboard.<br/>Annotations are used to overlay event markers and overlay event tags on graphs.<br/>Grafana comes with a native annotation store and the ability to add annotation events directly from the graph panel or via the HTTP API.<br/>See https://grafana.com/docs/grafana/latest/dashboards/build-dashboards/annotate-visualizations/ |
-| `description`          | string                                      | No       |           | Description of dashboard.                                                                                                                                                                                                                                                                                                                                                                                      |
-| `editable`             | boolean                                     | No       | `true`    | Whether a dashboard is editable or not.                                                                                                                                                                                                                                                                                                                                                                        |
-| `fiscalYearStartMonth` | integer                                     | No       | `0`       | The month that the fiscal year starts on.  0 = January, 11 = December<br/>Constraint: `>=0 & <12`.                                                                                                                                                                                                                                                                                                             |
-| `gnetId`               | string                                      | No       |           | ID of a dashboard imported from the https://grafana.com/grafana/dashboards/ portal                                                                                                                                                                                                                                                                                                                             |
-| `graphTooltip`         | integer                                     | No       | `0`       | 0 for no shared crosshair or tooltip (default).<br/>1 for shared crosshair.<br/>2 for shared crosshair AND shared tooltip.<br/>Possible values are: `0`, `1`, `2`.                                                                                                                                                                                                                                             |
-| `id`                   | integer or null                             | No       |           | Unique numeric identifier for the dashboard.<br/>`id` is internal to a specific Grafana instance. `uid` should be used to identify a dashboard across Grafana instances.                                                                                                                                                                                                                                       |
-| `links`                | [DashboardLink](#dashboardlink)[]           | No       |           | Links with references to other dashboards or external websites.                                                                                                                                                                                                                                                                                                                                                |
-| `liveNow`              | boolean                                     | No       |           | When set to true, the dashboard will redraw panels at an interval matching the pixel width.<br/>This will keep data "moving left" regardless of the query refresh rate. This setting helps<br/>avoid dashboards presenting stale live data                                                                                                                                                                     |
-| `panels`               | [object](#panels)[]                         | No       |           | List of dashboard panels                                                                                                                                                                                                                                                                                                                                                                                       |
-| `refresh`              |                                             | No       |           | Refresh rate of dashboard. Represented via interval string, e.g. "5s", "1m", "1h", "1d".                                                                                                                                                                                                                                                                                                                       |
-| `revision`             | integer                                     | No       |           | This property should only be used in dashboards defined by plugins.  It is a quick check<br/>to see if the version has changed since the last time.                                                                                                                                                                                                                                                            |
-| `snapshot`             | [Snapshot](#snapshot)                       | No       |           | A dashboard snapshot shares an interactive dashboard publicly.<br/>It is a read-only version of a dashboard, and is not editable.<br/>It is possible to create a snapshot of a snapshot.<br/>Grafana strips away all sensitive information from the dashboard.<br/>Sensitive information stripped: queries (metric, template,annotation) and panel links.                                                      |
-| `tags`                 | string[]                                    | No       |           | Tags associated with dashboard.                                                                                                                                                                                                                                                                                                                                                                                |
-| `templating`           | [object](#templating)                       | No       |           | Configured template variables                                                                                                                                                                                                                                                                                                                                                                                  |
-| `time`                 | [object](#time)                             | No       |           | Time range for dashboard.<br/>Accepted values are relative time strings like {from: 'now-6h', to: 'now'} or absolute time strings like {from: '2020-07-10T08:00:00.000Z', to: '2020-07-10T14:00:00.000Z'}.                                                                                                                                                                                                     |
-| `timepicker`           | [object](#timepicker)                       | No       |           | Configuration of the time picker shown at the top of a dashboard.                                                                                                                                                                                                                                                                                                                                              |
-| `timezone`             | string                                      | No       | `browser` | Timezone of dashboard. Accepted values are IANA TZDB zone ID or "browser" or "utc".                                                                                                                                                                                                                                                                                                                            |
-| `title`                | string                                      | No       |           | Title of dashboard.                                                                                                                                                                                                                                                                                                                                                                                            |
-| `uid`                  | string                                      | No       |           | Unique dashboard identifier that can be generated by anyone. string (8-40)                                                                                                                                                                                                                                                                                                                                     |
-| `version`              | uint32                                      | No       |           | Version of the dashboard, incremented each time the dashboard is updated.                                                                                                                                                                                                                                                                                                                                      |
-| `weekStart`            | string                                      | No       |           | Day when the week starts. Expressed by the name of the day in lowercase, e.g. "monday".                                                                                                                                                                                                                                                                                                                        |
-
-### AnnotationContainer
-
-Contains the list of annotations that are associated with the dashboard.
-Annotations are used to overlay event markers and overlay event tags on graphs.
-Grafana comes with a native annotation store and the ability to add annotation events directly from the graph panel or via the HTTP API.
-See https://grafana.com/docs/grafana/latest/dashboards/build-dashboards/annotate-visualizations/
-
-| Property | Type                                  | Required | Default | Description         |
-|----------|---------------------------------------|----------|---------|---------------------|
-| `list`   | [AnnotationQuery](#annotationquery)[] | No       |         | List of annotations |
-
-### AnnotationQuery
-
-TODO docs
-FROM: AnnotationQuery in grafana-data/src/types/annotations.ts
-
-| Property     | Type                                            | Required | Default | Description                                                                                                                                                                  |
-|--------------|-------------------------------------------------|----------|---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `datasource` | [DataSourceRef](#datasourceref)                 | **Yes**  |         | Ref to a DataSource instance                                                                                                                                                 |
-| `enable`     | boolean                                         | **Yes**  | `true`  | When enabled the annotation query is issued with every dashboard refresh                                                                                                     |
-| `iconColor`  | string                                          | **Yes**  |         | Color to use for the annotation event markers                                                                                                                                |
-| `name`       | string                                          | **Yes**  |         | Name of annotation.                                                                                                                                                          |
-| `builtIn`    | number                                          | No       | `0`     | Set to 1 for the standard annotation query all dashboards have by default.                                                                                                   |
-| `filter`     | [AnnotationPanelFilter](#annotationpanelfilter) | No       |         |                                                                                                                                                                              |
-| `hide`       | boolean                                         | No       | `false` | Annotation queries can be toggled on or off at the top of the dashboard.<br/>When hide is true, the toggle is not shown in the dashboard.                                    |
-| `target`     | [AnnotationTarget](#annotationtarget)           | No       |         | TODO: this should be a regular DataQuery that depends on the selected dashboard<br/>these match the properties of the "grafana" datasouce that is default in most dashboards |
-| `type`       | string                                          | No       |         | TODO -- this should not exist here, it is based on the --grafana-- datasource                                                                                                |
-
-### AnnotationPanelFilter
-
-| Property  | Type      | Required | Default | Description                                         |
-|-----------|-----------|----------|---------|-----------------------------------------------------|
-| `ids`     | integer[] | **Yes**  |         | Panel IDs that should be included or excluded       |
-| `exclude` | boolean   | No       | `false` | Should the specified panels be included or excluded |
-
-### AnnotationTarget
-
-TODO: this should be a regular DataQuery that depends on the selected dashboard
-these match the properties of the "grafana" datasouce that is default in most dashboards
-
-| Property   | Type     | Required | Default | Description                                                                                                       |
-|------------|----------|----------|---------|-------------------------------------------------------------------------------------------------------------------|
-| `limit`    | integer  | **Yes**  |         | Only required/valid for the grafana datasource...<br/>but code+tests is already depending on it so hard to change |
-| `matchAny` | boolean  | **Yes**  |         | Only required/valid for the grafana datasource...<br/>but code+tests is already depending on it so hard to change |
-| `tags`     | string[] | **Yes**  |         | Only required/valid for the grafana datasource...<br/>but code+tests is already depending on it so hard to change |
-| `type`     | string   | **Yes**  |         | Only required/valid for the grafana datasource...<br/>but code+tests is already depending on it so hard to change |
-
-### DataSourceRef
-
-Ref to a DataSource instance
-
-| Property | Type   | Required | Default | Description                  |
-|----------|--------|----------|---------|------------------------------|
-| `type`   | string | No       |         | The plugin type-id           |
-| `uid`    | string | No       |         | Specific datasource instance |
-
-### DashboardLink
-
-Links with references to other dashboards or external resources
-
-| Property      | Type     | Required | Default | Description                                                                                                                                                                    |
-|---------------|----------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `asDropdown`  | boolean  | **Yes**  | `false` | If true, all dashboards links will be displayed in a dropdown. If false, all dashboards links will be displayed side by side. Only valid if the type is dashboards             |
-| `icon`        | string   | **Yes**  |         | Icon name to be displayed with the link                                                                                                                                        |
-| `includeVars` | boolean  | **Yes**  | `false` | If true, includes current template variables values in the link as query params                                                                                                |
-| `keepTime`    | boolean  | **Yes**  | `false` | If true, includes current time range in the link as query params                                                                                                               |
-| `tags`        | string[] | **Yes**  |         | List of tags to limit the linked dashboards. If empty, all dashboards will be displayed. Only valid if the type is dashboards                                                  |
-| `targetBlank` | boolean  | **Yes**  | `false` | If true, the link will be opened in a new tab                                                                                                                                  |
-| `title`       | string   | **Yes**  |         | Title to display with the link                                                                                                                                                 |
-| `tooltip`     | string   | **Yes**  |         | Tooltip to display when the user hovers their mouse over it                                                                                                                    |
-| `type`        | string   | **Yes**  |         | Dashboard Link type. Accepted values are dashboards (to refer to another dashboard) and link (to refer to an external resource)<br/>Possible values are: `link`, `dashboards`. |
-| `url`         | string   | **Yes**  |         | Link URL. Only required/valid if the type is link                                                                                                                              |
-
-### Snapshot
-
-A dashboard snapshot shares an interactive dashboard publicly.
-It is a read-only version of a dashboard, and is not editable.
-It is possible to create a snapshot of a snapshot.
-Grafana strips away all sensitive information from the dashboard.
-Sensitive information stripped: queries (metric, template,annotation) and panel links.
-
-| Property      | Type    | Required | Default | Description                                                                    |
-|---------------|---------|----------|---------|--------------------------------------------------------------------------------|
-| `created`     | string  | **Yes**  |         | Time when the snapshot was created                                             |
-| `expires`     | string  | **Yes**  |         | Time when the snapshot expires, default is never to expire                     |
-| `externalUrl` | string  | **Yes**  |         | external url, if snapshot was shared in external grafana instance              |
-| `external`    | boolean | **Yes**  |         | Is the snapshot saved in an external grafana instance                          |
-| `id`          | uint32  | **Yes**  |         | Unique identifier of the snapshot                                              |
-| `key`         | string  | **Yes**  |         | Optional, defined the unique key of the snapshot, required if external is true |
-| `name`        | string  | **Yes**  |         | Optional, name of the snapshot                                                 |
-| `orgId`       | uint32  | **Yes**  |         | org id of the snapshot                                                         |
-| `updated`     | string  | **Yes**  |         | last time when the snapshot was updated                                        |
-| `userId`      | uint32  | **Yes**  |         | user id of the snapshot creator                                                |
-| `url`         | string  | No       |         | url of the snapshot, if snapshot was shared internally                         |
-
-### Panels
-
-| Property | Type                                                                                                        | Required | Default | Description |
-|----------|-------------------------------------------------------------------------------------------------------------|----------|---------|-------------|
-| `object` | Possible types are: [](#), [RowPanel](#rowpanel), [GraphPanel](#graphpanel), [HeatmapPanel](#heatmappanel). |          |         |
-
-### DataTransformerConfig
-
-Transformations allow to manipulate data returned by a query before the system applies a visualization.
-Using transformations you can: rename fields, join time series data, perform mathematical operations across queries,
-use the output of one transformation as the input to another transformation, etc.
-
-| Property   | Type                            | Required | Default | Description                                                                                                                                                                                                                                                                         |
-|------------|---------------------------------|----------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `id`       | string                          | **Yes**  |         | Unique identifier of transformer                                                                                                                                                                                                                                                    |
-| `options`  |                                 | **Yes**  |         | Options to be passed to the transformer<br/>Valid options depend on the transformer id                                                                                                                                                                                              |
-| `disabled` | boolean                         | No       |         | Disabled transformations are skipped                                                                                                                                                                                                                                                |
-| `filter`   | [MatcherConfig](#matcherconfig) | No       |         | Matcher is a predicate configuration. Based on the config a set of field(s) or values is filtered in order to apply override / transformation.<br/>It comes with in id ( to resolve implementation from registry) and a configuration that’s specific to a particular matcher type. |
-
-### MatcherConfig
-
-Matcher is a predicate configuration. Based on the config a set of field(s) or values is filtered in order to apply override / transformation.
-It comes with in id ( to resolve implementation from registry) and a configuration that’s specific to a particular matcher type.
-
-| Property  | Type   | Required | Default | Description                                                                    |
-|-----------|--------|----------|---------|--------------------------------------------------------------------------------|
-| `id`      | string | **Yes**  | ``      | The matcher id. This is used to find the matcher implementation from registry. |
-| `options` |        | No       |         | The matcher options. This is specific to the matcher implementation.           |
-
-### FieldConfigSource
-
-The data model used in Grafana, namely the data frame, is a columnar-oriented table structure that unifies both time series and table query results.
-Each column within this structure is called a field. A field can represent a single time series or table column.
-Field options allow you to change how the data is displayed in your visualizations.
-
-| Property    | Type                        | Required | Default | Description                                                                                                                                                                                                                                                                                                                                                       |
-|-------------|-----------------------------|----------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `defaults`  | [FieldConfig](#fieldconfig) | **Yes**  |         | The data model used in Grafana, namely the data frame, is a columnar-oriented table structure that unifies both time series and table query results.<br/>Each column within this structure is called a field. A field can represent a single time series or table column.<br/>Field options allow you to change how the data is displayed in your visualizations. |
-| `overrides` | [object](#overrides)[]      | **Yes**  |         | Overrides are the options applied to specific fields overriding the defaults.                                                                                                                                                                                                                                                                                     |
-
-### FieldConfig
-
-The data model used in Grafana, namely the data frame, is a columnar-oriented table structure that unifies both time series and table query results.
-Each column within this structure is called a field. A field can represent a single time series or table column.
-Field options allow you to change how the data is displayed in your visualizations.
-
-| Property            | Type                                  | Required | Default | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
-|---------------------|---------------------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `color`             | [FieldColor](#fieldcolor)             | No       |         | Map a field to a color.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| `custom`            | [object](#custom)                     | No       |         | custom is specified by the FieldConfig field<br/>in panel plugin schemas.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
-| `decimals`          | number                                | No       |         | Specify the number of decimals Grafana includes in the rendered value.<br/>If you leave this field blank, Grafana automatically truncates the number of decimals based on the value.<br/>For example 1.1234 will display as 1.12 and 100.456 will display as 100.<br/>To display all decimals, set the unit to `String`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-| `description`       | string                                | No       |         | Human readable field metadata                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-| `displayNameFromDS` | string                                | No       |         | This can be used by data sources that return and explicit naming structure for values and labels<br/>When this property is configured, this value is used rather than the default naming strategy.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| `displayName`       | string                                | No       |         | The display value for this field.  This supports template variables blank is auto                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| `filterable`        | boolean                               | No       |         | True if data source field supports ad-hoc filters                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| `links`             |                                       | No       |         | The behavior when clicking on a result                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| `mappings`          | [ValueMapping](#valuemapping)[]       | No       |         | Convert input values into a display string                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| `max`               | number                                | No       |         | The maximum value used in percentage threshold calculations. Leave blank for auto calculation based on all series and fields.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-| `min`               | number                                | No       |         | The minimum value used in percentage threshold calculations. Leave blank for auto calculation based on all series and fields.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-| `noValue`           | string                                | No       |         | Alternative to empty string                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
-| `path`              | string                                | No       |         | An explicit path to the field in the datasource.  When the frame meta includes a path,<br/>This will default to `${frame.meta.path}/${field.name}<br/><br/>When defined, this value can be used as an identifier within the datasource scope, and<br/>may be used to update the results                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| `thresholds`        | [ThresholdsConfig](#thresholdsconfig) | No       |         | Thresholds configuration for the panel                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| `unit`              | string                                | No       |         | Unit a field should use. The unit you select is applied to all fields except time.<br/>You can use the units ID availables in Grafana or a custom unit.<br/>Available units in Grafana: https://github.com/grafana/grafana/blob/main/packages/grafana-data/src/valueFormats/categories.ts<br/>As custom unit, you can use the following formats:<br/>`suffix:<suffix>` for custom unit that should go after value.<br/>`prefix:<prefix>` for custom unit that should go before value.<br/>`time:<format>` For custom date time formats type for example `time:YYYY-MM-DD`.<br/>`si:<base scale><unit characters>` for custom SI units. For example: `si: mF`. This one is a bit more advanced as you can specify both a unit and the source data scale. So if your source data is represented as milli (thousands of) something prefix the unit with that SI scale character.<br/>`count:<unit>` for a custom count unit.<br/>`currency:<unit>` for custom a currency unit. |
-| `writeable`         | boolean                               | No       |         | True if data source can write a value to the path. Auth/authz are supported separately                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-
-### FieldColor
-
-Map a field to a color.
-
-| Property     | Type   | Required | Default | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
-|--------------|--------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `mode`       | string | **Yes**  |         | Color mode for a field. You can specify a single color, or select a continuous (gradient) color schemes, based on a value.<br/>Continuous color interpolates a color using the percentage of a value relative to min and max.<br/>Accepted values are:<br/>`thresholds`: From thresholds. Informs Grafana to take the color from the matching threshold<br/>`palette-classic`: Classic palette. Grafana will assign color by looking up a color in a palette by series index. Useful for Graphs and pie charts and other categorical data visualizations<br/>`palette-classic-by-name`: Classic palette (by name). Grafana will assign color by looking up a color in a palette by series name. Useful for Graphs and pie charts and other categorical data visualizations<br/>`continuous-GrYlRd`: ontinuous Green-Yellow-Red palette mode<br/>`continuous-RdYlGr`: Continuous Red-Yellow-Green palette mode<br/>`continuous-BlYlRd`: Continuous Blue-Yellow-Red palette mode<br/>`continuous-YlRd`: Continuous Yellow-Red palette mode<br/>`continuous-BlPu`: Continuous Blue-Purple palette mode<br/>`continuous-YlBl`: Continuous Yellow-Blue palette mode<br/>`continuous-blues`: Continuous Blue palette mode<br/>`continuous-reds`: Continuous Red palette mode<br/>`continuous-greens`: Continuous Green palette mode<br/>`continuous-purples`: Continuous Purple palette mode<br/>`shades`: Shades of a single color. Specify a single color, useful in an override rule.<br/>`fixed`: Fixed color mode. Specify a single color, useful in an override rule.<br/>Possible values are: `thresholds`, `palette-classic`, `palette-classic-by-name`, `continuous-GrYlRd`, `continuous-RdYlGr`, `continuous-BlYlRd`, `continuous-YlRd`, `continuous-BlPu`, `continuous-YlBl`, `continuous-blues`, `continuous-reds`, `continuous-greens`, `continuous-purples`, `fixed`, `shades`. |
-| `fixedColor` | string | No       |         | The fixed color value for fixed or shades color modes.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| `seriesBy`   | string | No       |         | Defines how to assign a series color from "by value" color schemes. For example for an aggregated data points like a timeseries, the color can be assigned by the min, max or last value.<br/>Possible values are: `min`, `max`, `last`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-
-### ThresholdsConfig
-
-Thresholds configuration for the panel
-
-| Property | Type                      | Required | Default | Description                                                                                                                                                                           |
-|----------|---------------------------|----------|---------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `mode`   | string                    | **Yes**  |         | Thresholds can either be `absolute` (specific number) or `percentage` (relative to min or max, it will be values between 0 and 1).<br/>Possible values are: `absolute`, `percentage`. |
-| `steps`  | [Threshold](#threshold)[] | **Yes**  |         | Must be sorted by 'value', first value is always -Infinity                                                                                                                            |
-
-### Threshold
-
-User-defined value for a metric that triggers visual changes in a panel when this value is met or exceeded
-They are used to conditionally style and color visualizations based on query results , and can be applied to most visualizations.
-
-| Property | Type           | Required | Default | Description                                                                                                                                                                                                    |
-|----------|----------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `color`  | string         | **Yes**  |         | Color represents the color of the visual change that will occur in the dashboard when the threshold value is met or exceeded.                                                                                  |
-| `value`  | number or null | **Yes**  |         | Value represents a specified metric for the threshold, which triggers a visual change in the dashboard when this value is met or exceeded.<br/>Nulls currently appear here when serializing -Infinity to JSON. |
-
-### ValueMapping
-
-Allow to transform the visual representation of specific data values in a visualization, irrespective of their original units
-
-| Property | Type                                                                                                                          | Required | Default | Description |
-|----------|-------------------------------------------------------------------------------------------------------------------------------|----------|---------|-------------|
-| `object` | Possible types are: [ValueMap](#valuemap), [RangeMap](#rangemap), [RegexMap](#regexmap), [SpecialValueMap](#specialvaluemap). |          |         |
-
-### RangeMap
-
-Maps numerical ranges to a display text and color.
-For example, if a value is within a certain range, you can configure a range value mapping to display Low or High rather than the number.
-
-| Property  | Type               | Required | Default | Description                                                                       |
-|-----------|--------------------|----------|---------|-----------------------------------------------------------------------------------|
-| `options` | [object](#options) | **Yes**  |         | Range to match against and the result to apply when the value is within the range |
-| `type`    | string             | **Yes**  |         |                                                                                   |
-
-### Options
-
-Range to match against and the result to apply when the value is within the range
-
-| Property | Type                                      | Required | Default | Description                                                           |
-|----------|-------------------------------------------|----------|---------|-----------------------------------------------------------------------|
-| `from`   | number or null                            | **Yes**  |         | Min value of the range. It can be null which means -Infinity          |
-| `result` | [ValueMappingResult](#valuemappingresult) | **Yes**  |         | Result used as replacement with text and color when the value matches |
-| `to`     | number or null                            | **Yes**  |         | Max value of the range. It can be null which means +Infinity          |
-
-### ValueMappingResult
-
-Result used as replacement with text and color when the value matches
-
-| Property | Type    | Required | Default | Description                                                           |
-|----------|---------|----------|---------|-----------------------------------------------------------------------|
-| `color`  | string  | No       |         | Text to use when the value matches                                    |
-| `icon`   | string  | No       |         | Icon to display when the value matches. Only specific visualizations. |
-| `index`  | integer | No       |         | Position in the mapping array. Only used internally.                  |
-| `text`   | string  | No       |         | Text to display when the value matches                                |
-
-### RegexMap
-
-Maps regular expressions to replacement text and a color.
-For example, if a value is www.example.com, you can configure a regex value mapping so that Grafana displays www and truncates the domain.
-
-| Property  | Type               | Required | Default | Description                                                                                  |
-|-----------|--------------------|----------|---------|----------------------------------------------------------------------------------------------|
-| `options` | [object](#options) | **Yes**  |         | Regular expression to match against and the result to apply when the value matches the regex |
-| `type`    | string             | **Yes**  |         |                                                                                              |
-
-### Options
-
-Regular expression to match against and the result to apply when the value matches the regex
-
-| Property  | Type                                      | Required | Default | Description                                                           |
-|-----------|-------------------------------------------|----------|---------|-----------------------------------------------------------------------|
-| `pattern` | string                                    | **Yes**  |         | Regular expression to match against                                   |
-| `result`  | [ValueMappingResult](#valuemappingresult) | **Yes**  |         | Result used as replacement with text and color when the value matches |
-
-### SpecialValueMap
-
-Maps special values like Null, NaN (not a number), and boolean values like true and false to a display text and color.
-See SpecialValueMatch to see the list of special values.
-For example, you can configure a special value mapping so that null values appear as N/A.
-
-| Property  | Type               | Required | Default | Description |
-|-----------|--------------------|----------|---------|-------------|
-| `options` | [object](#options) | **Yes**  |         |             |
-| `type`    | string             | **Yes**  |         |             |
-
-### Options
-
-| Property | Type                                      | Required | Default | Description                                                                                                                          |
-|----------|-------------------------------------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------|
-| `match`  | string                                    | **Yes**  |         | Special value types supported by the `SpecialValueMap`<br/>Possible values are: `true`, `false`, `null`, `nan`, `null+nan`, `empty`. |
-| `result` | [ValueMappingResult](#valuemappingresult) | **Yes**  |         | Result used as replacement with text and color when the value matches                                                                |
-
-### ValueMap
-
-Maps text values to a color or different display text and color.
-For example, you can configure a value mapping so that all instances of the value 10 appear as Perfection! rather than the number.
-
-| Property  | Type                                                 | Required | Default | Description                                                                                                   |
-|-----------|------------------------------------------------------|----------|---------|---------------------------------------------------------------------------------------------------------------|
-| `options` | map[string][ValueMappingResult](#valuemappingresult) | **Yes**  |         | Map with <value_to_match>: ValueMappingResult. For example: { "10": { text: "Perfection!", color: "green" } } |
-| `type`    | string                                               | **Yes**  |         |                                                                                                               |
-
-### Custom
-
-custom is specified by the FieldConfig field
-in panel plugin schemas.
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Overrides
-
-| Property     | Type                                        | Required | Default | Description                                                                                                                                                                                                                                                                         |
-|--------------|---------------------------------------------|----------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `matcher`    | [MatcherConfig](#matcherconfig)             | **Yes**  |         | Matcher is a predicate configuration. Based on the config a set of field(s) or values is filtered in order to apply override / transformation.<br/>It comes with in id ( to resolve implementation from registry) and a configuration that’s specific to a particular matcher type. |
-| `properties` | [DynamicConfigValue](#dynamicconfigvalue)[] | **Yes**  |         |                                                                                                                                                                                                                                                                                     |
-
-### DynamicConfigValue
-
-| Property | Type   | Required | Default | Description |
-|----------|--------|----------|---------|-------------|
-| `id`     | string | **Yes**  | ``      |             |
-| `value`  |        | No       |         |             |
-
-### GraphPanel
-
-Support for legacy graph panel.
-@deprecated this a deprecated panel type
-
-| Property | Type              | Required | Default | Description                                        |
-|----------|-------------------|----------|---------|----------------------------------------------------|
-| `type`   | string            | **Yes**  |         | Possible values are: `graph`.                      |
-| `legend` | [object](#legend) | No       |         | @deprecated this is part of deprecated graph panel |
-
-### Legend
-
-@deprecated this is part of deprecated graph panel
-
-| Property   | Type    | Required | Default | Description |
-|------------|---------|----------|---------|-------------|
-| `show`     | boolean | **Yes**  | `true`  |             |
-| `sortDesc` | boolean | No       |         |             |
-| `sort`     | string  | No       |         |             |
-
-### GridPos
-
-Position and dimensions of a panel in the grid
-
-| Property | Type    | Required | Default | Description                                                                                                       |
-|----------|---------|----------|---------|-------------------------------------------------------------------------------------------------------------------|
-| `h`      | uint32  | **Yes**  | `9`     | Panel height. The height is the number of rows from the top edge of the panel.                                    |
-| `w`      | integer | **Yes**  | `12`    | Panel width. The width is the number of columns from the left edge of the panel.<br/>Constraint: `>0 & <=24`.     |
-| `x`      | integer | **Yes**  | `0`     | Panel x. The x coordinate is the number of columns from the left edge of the grid<br/>Constraint: `>=0 & <24`.    |
-| `y`      | uint32  | **Yes**  | `0`     | Panel y. The y coordinate is the number of rows from the top edge of the grid                                     |
-| `static` | boolean | No       |         | Whether the panel is fixed within the grid. If true, the panel will not be affected by other panels' interactions |
-
-### HeatmapPanel
-
-Support for legacy heatmap panel.
-@deprecated this a deprecated panel type
-
-| Property | Type   | Required | Default | Description                     |
-|----------|--------|----------|---------|---------------------------------|
-| `type`   | string | **Yes**  |         | Possible values are: `heatmap`. |
-
-### LibraryPanelRef
-
-A library panel is a reusable panel that you can use in any dashboard.
-When you make a change to a library panel, that change propagates to all instances of where the panel is used.
-Library panels streamline reuse of panels across multiple dashboards.
-
-| Property | Type   | Required | Default | Description        |
-|----------|--------|----------|---------|--------------------|
-| `name`   | string | **Yes**  |         | Library panel name |
-| `uid`    | string | **Yes**  |         | Library panel uid  |
-
-### RowPanel
-
-Row panel
-
-| Property     | Type                            | Required | Default | Description                                                                                                                             |
-|--------------|---------------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| `collapsed`  | boolean                         | **Yes**  | `false` | Whether this row should be collapsed or not.                                                                                            |
-| `id`         | uint32                          | **Yes**  |         | Unique identifier of the panel. Generated by Grafana when creating a new panel. It must be unique within a dashboard, but not globally. |
-| `panels`     | [panels](#panels)[]             | **Yes**  |         | List of panels in the row                                                                                                               |
-| `type`       | string                          | **Yes**  |         | The panel type<br/>Possible values are: `row`.                                                                                          |
-| `datasource` | [DataSourceRef](#datasourceref) | No       |         | Ref to a DataSource instance                                                                                                            |
-| `gridPos`    | [GridPos](#gridpos)             | No       |         | Position and dimensions of a panel in the grid                                                                                          |
-| `repeat`     | string                          | No       |         | Name of template variable to repeat for.                                                                                                |
-| `title`      | string                          | No       |         | Row title                                                                                                                               |
-
-### Panels
-
-| Property | Type                                                                                           | Required | Default | Description |
-|----------|------------------------------------------------------------------------------------------------|----------|---------|-------------|
-| `object` | Possible types are: [Panel](#panel), [GraphPanel](#graphpanel), [HeatmapPanel](#heatmappanel). |          |         |
-
-### Panel
-
-Dashboard panels are the basic visualization building blocks.
-
-| Property           | Type                                              | Required | Default | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
-|--------------------|---------------------------------------------------|----------|---------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `type`             | string                                            | **Yes**  |         | The panel plugin type id. This is used to find the plugin to display the panel.<br/>Constraint: `length >=1`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| `datasource`       | [DataSourceRef](#datasourceref)                   | No       |         | Ref to a DataSource instance                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| `description`      | string                                            | No       |         | Panel description.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-| `fieldConfig`      | [FieldConfigSource](#fieldconfigsource)           | No       |         | The data model used in Grafana, namely the data frame, is a columnar-oriented table structure that unifies both time series and table query results.<br/>Each column within this structure is called a field. A field can represent a single time series or table column.<br/>Field options allow you to change how the data is displayed in your visualizations.                                                                                                                                                                                                                                                                                                                                 |
-| `gridPos`          | [GridPos](#gridpos)                               | No       |         | Position and dimensions of a panel in the grid                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-| `hideTimeOverride` | boolean                                           | No       |         | Controls if the timeFrom or timeShift overrides are shown in the panel header                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| `id`               | uint32                                            | No       |         | Unique identifier of the panel. Generated by Grafana when creating a new panel. It must be unique within a dashboard, but not globally.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| `interval`         | string                                            | No       |         | The min time interval setting defines a lower limit for the $__interval and $__interval_ms variables.<br/>This value must be formatted as a number followed by a valid time<br/>identifier like: "40s", "3d", etc.<br/>See: https://grafana.com/docs/grafana/latest/panels-visualizations/query-transform-data/#query-options                                                                                                                                                                                                                                                                                                                                                                     |
-| `libraryPanel`     | [LibraryPanelRef](#librarypanelref)               | No       |         | A library panel is a reusable panel that you can use in any dashboard.<br/>When you make a change to a library panel, that change propagates to all instances of where the panel is used.<br/>Library panels streamline reuse of panels across multiple dashboards.                                                                                                                                                                                                                                                                                                                                                                                                                               |
-| `links`            | [DashboardLink](#dashboardlink)[]                 | No       |         | Panel links.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| `maxDataPoints`    | number                                            | No       |         | The maximum number of data points that the panel queries are retrieving.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| `maxPerRow`        | number                                            | No       |         | Option for repeated panels that controls max items per row<br/>Only relevant for horizontally repeated panels                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| `options`          | [object](#options)                                | No       |         | It depends on the panel plugin. They are specified by the Options field in panel plugin schemas.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| `pluginVersion`    | string                                            | No       |         | The version of the plugin that is used for this panel. This is used to find the plugin to display the panel and to migrate old panel configs.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| `repeatDirection`  | string                                            | No       | `h`     | Direction to repeat in if 'repeat' is set.<br/>`h` for horizontal, `v` for vertical.<br/>Possible values are: `h`, `v`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| `repeat`           | string                                            | No       |         | Name of template variable to repeat for.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| `tags`             | string[]                                          | No       |         | Tags for the panel.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-| `targets`          | [Target](#target)[]                               | No       |         | Depends on the panel plugin. See the plugin documentation for details.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-| `timeFrom`         | string                                            | No       |         | Overrides the relative time range for individual panels,<br/>which causes them to be different than what is selected in<br/>the dashboard time picker in the top-right corner of the dashboard. You can use this to show metrics from different<br/>time periods or days on the same dashboard.<br/>The value is formatted as time operation like: `now-5m` (Last 5 minutes), `now/d` (the day so far),<br/>`now-5d/d`(Last 5 days), `now/w` (This week so far), `now-2y/y` (Last 2 years).<br/>Note: Panel time overrides have no effect when the dashboard’s time range is absolute.<br/>See: https://grafana.com/docs/grafana/latest/panels-visualizations/query-transform-data/#query-options |
-| `timeShift`        | string                                            | No       |         | Overrides the time range for individual panels by shifting its start and end relative to the time picker.<br/>For example, you can shift the time range for the panel to be two hours earlier than the dashboard time picker setting `2h`.<br/>Note: Panel time overrides have no effect when the dashboard’s time range is absolute.<br/>See: https://grafana.com/docs/grafana/latest/panels-visualizations/query-transform-data/#query-options                                                                                                                                                                                                                                                  |
-| `title`            | string                                            | No       |         | Panel title.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| `transformations`  | [DataTransformerConfig](#datatransformerconfig)[] | No       |         | List of transformations that are applied to the panel data before rendering.<br/>When there are multiple transformations, Grafana applies them in the order they are listed.<br/>Each transformation creates a result set that then passes on to the next transformation in the processing pipeline.                                                                                                                                                                                                                                                                                                                                                                                              |
-| `transparent`      | boolean                                           | No       | `false` | Whether to display the panel without a background.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-
-### FieldConfigSource
-
-The data model used in Grafana, namely the data frame, is a columnar-oriented table structure that unifies both time series and table query results.
-Each column within this structure is called a field. A field can represent a single time series or table column.
-Field options allow you to change how the data is displayed in your visualizations.
-
-| Property    | Type                        | Required | Default | Description                                                                                                                                                                                                                                                                                                                                                       |
-|-------------|-----------------------------|----------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `defaults`  | [FieldConfig](#fieldconfig) | **Yes**  |         | The data model used in Grafana, namely the data frame, is a columnar-oriented table structure that unifies both time series and table query results.<br/>Each column within this structure is called a field. A field can represent a single time series or table column.<br/>Field options allow you to change how the data is displayed in your visualizations. |
-| `overrides` | [overrides](#overrides)[]   | **Yes**  |         | Overrides are the options applied to specific fields overriding the defaults.                                                                                                                                                                                                                                                                                     |
-
-### FieldConfig
-
-The data model used in Grafana, namely the data frame, is a columnar-oriented table structure that unifies both time series and table query results.
-Each column within this structure is called a field. A field can represent a single time series or table column.
-Field options allow you to change how the data is displayed in your visualizations.
-
-| Property            | Type                                  | Required | Default | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
-|---------------------|---------------------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `color`             | [FieldColor](#fieldcolor)             | No       |         | Map a field to a color.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| `custom`            | [custom](#custom)                     | No       |         | custom is specified by the FieldConfig field<br/>in panel plugin schemas.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
-| `decimals`          | number                                | No       |         | Specify the number of decimals Grafana includes in the rendered value.<br/>If you leave this field blank, Grafana automatically truncates the number of decimals based on the value.<br/>For example 1.1234 will display as 1.12 and 100.456 will display as 100.<br/>To display all decimals, set the unit to `String`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-| `description`       | string                                | No       |         | Human readable field metadata                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-| `displayNameFromDS` | string                                | No       |         | This can be used by data sources that return and explicit naming structure for values and labels<br/>When this property is configured, this value is used rather than the default naming strategy.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| `displayName`       | string                                | No       |         | The display value for this field.  This supports template variables blank is auto                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| `filterable`        | boolean                               | No       |         | True if data source field supports ad-hoc filters                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| `links`             |                                       | No       |         | The behavior when clicking on a result                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| `mappings`          | [ValueMapping](#valuemapping)[]       | No       |         | Convert input values into a display string                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| `max`               | number                                | No       |         | The maximum value used in percentage threshold calculations. Leave blank for auto calculation based on all series and fields.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-| `min`               | number                                | No       |         | The minimum value used in percentage threshold calculations. Leave blank for auto calculation based on all series and fields.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-| `noValue`           | string                                | No       |         | Alternative to empty string                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
-| `path`              | string                                | No       |         | An explicit path to the field in the datasource.  When the frame meta includes a path,<br/>This will default to `${frame.meta.path}/${field.name}<br/><br/>When defined, this value can be used as an identifier within the datasource scope, and<br/>may be used to update the results                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| `thresholds`        | [ThresholdsConfig](#thresholdsconfig) | No       |         | Thresholds configuration for the panel                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| `unit`              | string                                | No       |         | Unit a field should use. The unit you select is applied to all fields except time.<br/>You can use the units ID availables in Grafana or a custom unit.<br/>Available units in Grafana: https://github.com/grafana/grafana/blob/main/packages/grafana-data/src/valueFormats/categories.ts<br/>As custom unit, you can use the following formats:<br/>`suffix:<suffix>` for custom unit that should go after value.<br/>`prefix:<prefix>` for custom unit that should go before value.<br/>`time:<format>` For custom date time formats type for example `time:YYYY-MM-DD`.<br/>`si:<base scale><unit characters>` for custom SI units. For example: `si: mF`. This one is a bit more advanced as you can specify both a unit and the source data scale. So if your source data is represented as milli (thousands of) something prefix the unit with that SI scale character.<br/>`count:<unit>` for a custom count unit.<br/>`currency:<unit>` for custom a currency unit. |
-| `writeable`         | boolean                               | No       |         | True if data source can write a value to the path. Auth/authz are supported separately                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-
-### RangeMap
-
-Maps numerical ranges to a display text and color.
-For example, if a value is within a certain range, you can configure a range value mapping to display Low or High rather than the number.
-
-| Property  | Type                | Required | Default | Description                                                                       |
-|-----------|---------------------|----------|---------|-----------------------------------------------------------------------------------|
-| `options` | [options](#options) | **Yes**  |         | Range to match against and the result to apply when the value is within the range |
-| `type`    | string              | **Yes**  |         |                                                                                   |
-
-### RegexMap
-
-Maps regular expressions to replacement text and a color.
-For example, if a value is www.example.com, you can configure a regex value mapping so that Grafana displays www and truncates the domain.
-
-| Property  | Type                | Required | Default | Description                                                                                  |
-|-----------|---------------------|----------|---------|----------------------------------------------------------------------------------------------|
-| `options` | [options](#options) | **Yes**  |         | Regular expression to match against and the result to apply when the value matches the regex |
-| `type`    | string              | **Yes**  |         |                                                                                              |
-
-### SpecialValueMap
-
-Maps special values like Null, NaN (not a number), and boolean values like true and false to a display text and color.
-See SpecialValueMatch to see the list of special values.
-For example, you can configure a special value mapping so that null values appear as N/A.
-
-| Property  | Type                | Required | Default | Description |
-|-----------|---------------------|----------|---------|-------------|
-| `options` | [options](#options) | **Yes**  |         |             |
-| `type`    | string              | **Yes**  |         |             |
-
-### Target
-
-Schema for panel targets is specified by datasource
-plugins. We use a placeholder definition, which the Go
-schema loader either left open/as-is with the Base
-variant of the Dashboard and Panel families, or filled
-with types derived from plugins in the Instance variant.
-When working directly from CUE, importers can extend this
-type directly to achieve the same effect.
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Options
-
-It depends on the panel plugin. They are specified by the Options field in panel plugin schemas.
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### GraphPanel
-
-Support for legacy graph panel.
-@deprecated this a deprecated panel type
-
-| Property | Type              | Required | Default | Description                                        |
-|----------|-------------------|----------|---------|----------------------------------------------------|
-| `type`   | string            | **Yes**  |         | Possible values are: `graph`.                      |
-| `legend` | [legend](#legend) | No       |         | @deprecated this is part of deprecated graph panel |
-
-### Panel
-
-Dashboard panels are the basic visualization building blocks.
-
-| Property           | Type                                              | Required | Default | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
-|--------------------|---------------------------------------------------|----------|---------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `type`             | string                                            | **Yes**  |         | The panel plugin type id. This is used to find the plugin to display the panel.<br/>Constraint: `length >=1`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| `datasource`       | [DataSourceRef](#datasourceref)                   | No       |         | Ref to a DataSource instance                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| `description`      | string                                            | No       |         | Panel description.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-| `fieldConfig`      | [FieldConfigSource](#fieldconfigsource)           | No       |         | The data model used in Grafana, namely the data frame, is a columnar-oriented table structure that unifies both time series and table query results.<br/>Each column within this structure is called a field. A field can represent a single time series or table column.<br/>Field options allow you to change how the data is displayed in your visualizations.                                                                                                                                                                                                                                                                                                                                 |
-| `gridPos`          | [GridPos](#gridpos)                               | No       |         | Position and dimensions of a panel in the grid                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-| `hideTimeOverride` | boolean                                           | No       |         | Controls if the timeFrom or timeShift overrides are shown in the panel header                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| `id`               | uint32                                            | No       |         | Unique identifier of the panel. Generated by Grafana when creating a new panel. It must be unique within a dashboard, but not globally.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| `interval`         | string                                            | No       |         | The min time interval setting defines a lower limit for the $__interval and $__interval_ms variables.<br/>This value must be formatted as a number followed by a valid time<br/>identifier like: "40s", "3d", etc.<br/>See: https://grafana.com/docs/grafana/latest/panels-visualizations/query-transform-data/#query-options                                                                                                                                                                                                                                                                                                                                                                     |
-| `libraryPanel`     | [LibraryPanelRef](#librarypanelref)               | No       |         | A library panel is a reusable panel that you can use in any dashboard.<br/>When you make a change to a library panel, that change propagates to all instances of where the panel is used.<br/>Library panels streamline reuse of panels across multiple dashboards.                                                                                                                                                                                                                                                                                                                                                                                                                               |
-| `links`            | [DashboardLink](#dashboardlink)[]                 | No       |         | Panel links.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| `maxDataPoints`    | number                                            | No       |         | The maximum number of data points that the panel queries are retrieving.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| `maxPerRow`        | number                                            | No       |         | Option for repeated panels that controls max items per row<br/>Only relevant for horizontally repeated panels                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| `options`          | [options](#options)                               | No       |         | It depends on the panel plugin. They are specified by the Options field in panel plugin schemas.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| `pluginVersion`    | string                                            | No       |         | The version of the plugin that is used for this panel. This is used to find the plugin to display the panel and to migrate old panel configs.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| `repeatDirection`  | string                                            | No       | `h`     | Direction to repeat in if 'repeat' is set.<br/>`h` for horizontal, `v` for vertical.<br/>Possible values are: `h`, `v`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| `repeat`           | string                                            | No       |         | Name of template variable to repeat for.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| `tags`             | string[]                                          | No       |         | Tags for the panel.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-| `targets`          | [Target](#target)[]                               | No       |         | Depends on the panel plugin. See the plugin documentation for details.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-| `timeFrom`         | string                                            | No       |         | Overrides the relative time range for individual panels,<br/>which causes them to be different than what is selected in<br/>the dashboard time picker in the top-right corner of the dashboard. You can use this to show metrics from different<br/>time periods or days on the same dashboard.<br/>The value is formatted as time operation like: `now-5m` (Last 5 minutes), `now/d` (the day so far),<br/>`now-5d/d`(Last 5 days), `now/w` (This week so far), `now-2y/y` (Last 2 years).<br/>Note: Panel time overrides have no effect when the dashboard’s time range is absolute.<br/>See: https://grafana.com/docs/grafana/latest/panels-visualizations/query-transform-data/#query-options |
-| `timeShift`        | string                                            | No       |         | Overrides the time range for individual panels by shifting its start and end relative to the time picker.<br/>For example, you can shift the time range for the panel to be two hours earlier than the dashboard time picker setting `2h`.<br/>Note: Panel time overrides have no effect when the dashboard’s time range is absolute.<br/>See: https://grafana.com/docs/grafana/latest/panels-visualizations/query-transform-data/#query-options                                                                                                                                                                                                                                                  |
-| `title`            | string                                            | No       |         | Panel title.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| `transformations`  | [DataTransformerConfig](#datatransformerconfig)[] | No       |         | List of transformations that are applied to the panel data before rendering.<br/>When there are multiple transformations, Grafana applies them in the order they are listed.<br/>Each transformation creates a result set that then passes on to the next transformation in the processing pipeline.                                                                                                                                                                                                                                                                                                                                                                                              |
-| `transparent`      | boolean                                           | No       | `false` | Whether to display the panel without a background.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-
-### Templating
-
-Configured template variables
-
-| Property | Type                              | Required | Default | Description                                                                                  |
-|----------|-----------------------------------|----------|---------|----------------------------------------------------------------------------------------------|
-| `list`   | [VariableModel](#variablemodel)[] | No       |         | List of configured template variables with their saved values along with some other metadata |
-
-### VariableModel
-
-A variable is a placeholder for a value. You can use variables in metric queries and in panel titles.
-
-| Property      | Type                                | Required | Default | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-|---------------|-------------------------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `name`        | string                              | **Yes**  |         | Name of variable                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| `type`        | string                              | **Yes**  |         | Dashboard variable type<br/>`query`: Query-generated list of values such as metric names, server names, sensor IDs, data centers, and so on.<br/>`adhoc`: Key/value filters that are automatically added to all metric queries for a data source (Prometheus, Loki, InfluxDB, and Elasticsearch only).<br/>`constant`: 	Define a hidden constant.<br/>`datasource`: Quickly change the data source for an entire dashboard.<br/>`interval`: Interval variables represent time spans.<br/>`textbox`: Display a free text input field with an optional default value.<br/>`custom`: Define the variable options manually using a comma-separated list.<br/>`system`: Variables defined by Grafana. See: https://grafana.com/docs/grafana/latest/dashboards/variables/add-template-variables/#global-variables<br/>Possible values are: `query`, `adhoc`, `constant`, `datasource`, `interval`, `textbox`, `custom`, `system`. |
-| `current`     | [VariableOption](#variableoption)   | No       |         | Option to be selected in a variable.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
-| `datasource`  | [DataSourceRef](#datasourceref)     | No       |         | Ref to a DataSource instance                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-| `description` | string                              | No       |         | Description of variable. It can be defined but `null`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| `hide`        | integer                             | No       |         | Determine if the variable shows on dashboard<br/>Accepted values are 0 (show label and value), 1 (show value only), 2 (show nothing).<br/>Possible values are: `0`, `1`, `2`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
-| `label`       | string                              | No       |         | Optional display name                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| `multi`       | boolean                             | No       | `false` | Whether multiple values can be selected or not from variable value list                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-| `options`     | [VariableOption](#variableoption)[] | No       |         | Options that can be selected for a variable.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-| `query`       |                                     | No       |         | Query used to fetch values for a variable                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| `refresh`     | integer                             | No       |         | Options to config when to refresh a variable<br/>`0`: Never refresh the variable<br/>`1`: Queries the data source every time the dashboard loads.<br/>`2`: Queries the data source when the dashboard time range changes.<br/>Possible values are: `0`, `1`, `2`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| `skipUrlSync` | boolean                             | No       | `false` | Whether the variable value should be managed by URL query params or not                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-| `sort`        | integer                             | No       |         | Sort variable options<br/>Accepted values are:<br/>`0`: No sorting<br/>`1`: Alphabetical ASC<br/>`2`: Alphabetical DESC<br/>`3`: Numerical ASC<br/>`4`: Numerical DESC<br/>`5`: Alphabetical Case Insensitive ASC<br/>`6`: Alphabetical Case Insensitive DESC<br/>Possible values are: `0`, `1`, `2`, `3`, `4`, `5`, `6`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-
-### VariableOption
-
-Option to be selected in a variable.
-
-| Property   | Type    | Required | Default | Description                           |
-|------------|---------|----------|---------|---------------------------------------|
-| `text`     |         | **Yes**  |         | Text to be displayed for the option   |
-| `value`    |         | **Yes**  |         | Value of the option                   |
-| `selected` | boolean | No       |         | Whether the option is selected or not |
-
-### Time
-
-Time range for dashboard.
-Accepted values are relative time strings like {from: 'now-6h', to: 'now'} or absolute time strings like {from: '2020-07-10T08:00:00.000Z', to: '2020-07-10T14:00:00.000Z'}.
-
-| Property | Type   | Required | Default  | Description |
-|----------|--------|----------|----------|-------------|
-| `from`   | string | **Yes**  | `now-6h` |             |
-| `to`     | string | **Yes**  | `now`    |             |
-
-### Timepicker
-
-Configuration of the time picker shown at the top of a dashboard.
-
-| Property            | Type     | Required | Default                               | Description                                                                                       |
-|---------------------|----------|----------|---------------------------------------|---------------------------------------------------------------------------------------------------|
-| `collapse`          | boolean  | **Yes**  | `false`                               | Whether timepicker is collapsed or not. Has no effect on provisioned dashboard.                   |
-| `hidden`            | boolean  | **Yes**  | `false`                               | Whether timepicker is visible or not.                                                             |
-| `refresh_intervals` | string[] | **Yes**  | `[5s 10s 30s 1m 5m 15m 30m 1h 2h 1d]` | Interval options available in the refresh picker dropdown.                                        |
-| `time_options`      | string[] | **Yes**  | `[5m 15m 1h 6h 12h 24h 2d 7d 30d]`    | Selectable options available in the time picker dropdown. Has no effect on provisioned dashboard. |
-
-### Status
-
-| Property           | Type                                                       | Required | Default | Description                                                                                                                                                                |
-|--------------------|------------------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `additionalFields` | [object](#additionalfields)                                | No       |         | additionalFields is reserved for future use                                                                                                                                |
-| `operatorStates`   | map[string][status.#OperatorState](#status.#operatorstate) | No       |         | operatorStates is a map of operator ID to operator state evaluations.<br/>Any operator which consumes this kind SHOULD add its state evaluation information to this field. |
-
-### AdditionalFields
-
-additionalFields is reserved for future use
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Status.#OperatorState
-
-| Property           | Type               | Required | Default | Description                                                                                                                                                                      |
-|--------------------|--------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `lastEvaluation`   | string             | **Yes**  |         | lastEvaluation is the ResourceVersion last evaluated                                                                                                                             |
-| `state`            | string             | **Yes**  |         | state describes the state of the lastEvaluation.<br/>It is limited to three possible states for machine evaluation.<br/>Possible values are: `success`, `in_progress`, `failed`. |
-| `descriptiveState` | string             | No       |         | descriptiveState is an optional more descriptive state field which has no requirements on format                                                                                 |
-| `details`          | [object](#details) | No       |         | details contains any extra information that is operator-specific                                                                                                                 |
-
-### Details
-
-details contains any extra information that is operator-specific
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-
diff --git a/docs/sources/developers/kinds/core/folder/schema-reference.md b/docs/sources/developers/kinds/core/folder/schema-reference.md
deleted file mode 100644
index cbc8f41c417cc..0000000000000
--- a/docs/sources/developers/kinds/core/folder/schema-reference.md
+++ /dev/null
@@ -1,111 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Folder kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## Folder
-
-#### Maturity: [merged](../../../maturity/#merged)
-#### Version: 0.0
-
-A folder is a collection of resources that are grouped together and can share permissions.
-
-| Property   | Type                | Required | Default | Description                                                                                                                                                                                                                                                                    |
-|------------|---------------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `metadata` | [object](#metadata) | **Yes**  |         | metadata contains embedded CommonMetadata and can be extended with custom string fields<br/>TODO: use CommonMetadata instead of redefining here; currently needs to be defined here<br/>without external reference as using the CommonMetadata reference breaks thema codegen. |
-| `spec`     | [object](#spec)     | **Yes**  |         | TODO:<br/>common metadata will soon support setting the parent folder in the metadata                                                                                                                                                                                          |
-| `status`   | [object](#status)   | **Yes**  |         |                                                                                                                                                                                                                                                                                |
-
-### Metadata
-
-metadata contains embedded CommonMetadata and can be extended with custom string fields
-TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
-without external reference as using the CommonMetadata reference breaks thema codegen.
-
-It extends [_kubeObjectMetadata](#_kubeobjectmetadata).
-
-| Property            | Type                   | Required | Default | Description                                                                                                                             |
-|---------------------|------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| `createdBy`         | string                 | **Yes**  |         |                                                                                                                                         |
-| `creationTimestamp` | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `extraFields`       | [object](#extrafields) | **Yes**  |         | extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata |
-| `finalizers`        | string[]               | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `labels`            | map[string]string      | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `resourceVersion`   | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `uid`               | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `updateTimestamp`   | string                 | **Yes**  |         |                                                                                                                                         |
-| `updatedBy`         | string                 | **Yes**  |         |                                                                                                                                         |
-| `deletionTimestamp` | string                 | No       |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-
-### _kubeObjectMetadata
-
-_kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
-It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
-As it is also intended to be generic enough to function with any API Server.
-
-| Property            | Type              | Required | Default | Description |
-|---------------------|-------------------|----------|---------|-------------|
-| `creationTimestamp` | string            | **Yes**  |         |             |
-| `finalizers`        | string[]          | **Yes**  |         |             |
-| `labels`            | map[string]string | **Yes**  |         |             |
-| `resourceVersion`   | string            | **Yes**  |         |             |
-| `uid`               | string            | **Yes**  |         |             |
-| `deletionTimestamp` | string            | No       |         |             |
-
-### ExtraFields
-
-extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Spec
-
-TODO:
-common metadata will soon support setting the parent folder in the metadata
-
-| Property      | Type   | Required | Default | Description                          |
-|---------------|--------|----------|---------|--------------------------------------|
-| `title`       | string | **Yes**  |         | Folder title                         |
-| `uid`         | string | **Yes**  |         | Unique folder id. (will be k8s name) |
-| `description` | string | No       |         | Description of the folder.           |
-
-### Status
-
-| Property           | Type                                                       | Required | Default | Description                                                                                                                                                                |
-|--------------------|------------------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `additionalFields` | [object](#additionalfields)                                | No       |         | additionalFields is reserved for future use                                                                                                                                |
-| `operatorStates`   | map[string][status.#OperatorState](#status.#operatorstate) | No       |         | operatorStates is a map of operator ID to operator state evaluations.<br/>Any operator which consumes this kind SHOULD add its state evaluation information to this field. |
-
-### AdditionalFields
-
-additionalFields is reserved for future use
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Status.#OperatorState
-
-| Property           | Type               | Required | Default | Description                                                                                                                                                                      |
-|--------------------|--------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `lastEvaluation`   | string             | **Yes**  |         | lastEvaluation is the ResourceVersion last evaluated                                                                                                                             |
-| `state`            | string             | **Yes**  |         | state describes the state of the lastEvaluation.<br/>It is limited to three possible states for machine evaluation.<br/>Possible values are: `success`, `in_progress`, `failed`. |
-| `descriptiveState` | string             | No       |         | descriptiveState is an optional more descriptive state field which has no requirements on format                                                                                 |
-| `details`          | [object](#details) | No       |         | details contains any extra information that is operator-specific                                                                                                                 |
-
-### Details
-
-details contains any extra information that is operator-specific
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-
diff --git a/docs/sources/developers/kinds/core/librarypanel/schema-reference.md b/docs/sources/developers/kinds/core/librarypanel/schema-reference.md
deleted file mode 100644
index eaab5f3544832..0000000000000
--- a/docs/sources/developers/kinds/core/librarypanel/schema-reference.md
+++ /dev/null
@@ -1,142 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: LibraryPanel kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## LibraryPanel
-
-#### Maturity: [experimental](../../../maturity/#experimental)
-#### Version: 0.0
-
-A standalone panel
-
-| Property   | Type                | Required | Default | Description                                                                                                                                                                                                                                                                    |
-|------------|---------------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `metadata` | [object](#metadata) | **Yes**  |         | metadata contains embedded CommonMetadata and can be extended with custom string fields<br/>TODO: use CommonMetadata instead of redefining here; currently needs to be defined here<br/>without external reference as using the CommonMetadata reference breaks thema codegen. |
-| `spec`     | [object](#spec)     | **Yes**  |         |                                                                                                                                                                                                                                                                                |
-| `status`   | [object](#status)   | **Yes**  |         |                                                                                                                                                                                                                                                                                |
-
-### Metadata
-
-metadata contains embedded CommonMetadata and can be extended with custom string fields
-TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
-without external reference as using the CommonMetadata reference breaks thema codegen.
-
-It extends [_kubeObjectMetadata](#_kubeobjectmetadata).
-
-| Property            | Type                   | Required | Default | Description                                                                                                                             |
-|---------------------|------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| `createdBy`         | string                 | **Yes**  |         |                                                                                                                                         |
-| `creationTimestamp` | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `extraFields`       | [object](#extrafields) | **Yes**  |         | extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata |
-| `finalizers`        | string[]               | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `labels`            | map[string]string      | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `resourceVersion`   | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `uid`               | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `updateTimestamp`   | string                 | **Yes**  |         |                                                                                                                                         |
-| `updatedBy`         | string                 | **Yes**  |         |                                                                                                                                         |
-| `deletionTimestamp` | string                 | No       |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-
-### _kubeObjectMetadata
-
-_kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
-It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
-As it is also intended to be generic enough to function with any API Server.
-
-| Property            | Type              | Required | Default | Description |
-|---------------------|-------------------|----------|---------|-------------|
-| `creationTimestamp` | string            | **Yes**  |         |             |
-| `finalizers`        | string[]          | **Yes**  |         |             |
-| `labels`            | map[string]string | **Yes**  |         |             |
-| `resourceVersion`   | string            | **Yes**  |         |             |
-| `uid`               | string            | **Yes**  |         |             |
-| `deletionTimestamp` | string            | No       |         |             |
-
-### ExtraFields
-
-extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Spec
-
-| Property        | Type                                            | Required | Default | Description                                                                                                                          |
-|-----------------|-------------------------------------------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------|
-| `model`         | [object](#model)                                | **Yes**  |         | TODO: should be the same panel schema defined in dashboard<br/>Typescript: Omit<Panel, 'gridPos' &#124; 'id' &#124; 'libraryPanel'>; |
-| `name`          | string                                          | **Yes**  |         | Panel name (also saved in the model)<br/>Constraint: `length >=1`.                                                                   |
-| `type`          | string                                          | **Yes**  |         | The panel type (from inside the model)<br/>Constraint: `length >=1`.                                                                 |
-| `uid`           | string                                          | **Yes**  |         | Library element UID                                                                                                                  |
-| `version`       | integer                                         | **Yes**  |         | panel version, incremented each time the dashboard is updated.                                                                       |
-| `description`   | string                                          | No       |         | Panel description                                                                                                                    |
-| `folderUid`     | string                                          | No       |         | Folder UID                                                                                                                           |
-| `meta`          | [LibraryElementDTOMeta](#libraryelementdtometa) | No       |         |                                                                                                                                      |
-| `schemaVersion` | uint16                                          | No       |         | Dashboard version when this was saved (zero if unknown)                                                                              |
-
-### LibraryElementDTOMeta
-
-| Property              | Type                                                    | Required | Default | Description |
-|-----------------------|---------------------------------------------------------|----------|---------|-------------|
-| `connectedDashboards` | integer                                                 | **Yes**  |         |             |
-| `createdBy`           | [LibraryElementDTOMetaUser](#libraryelementdtometauser) | **Yes**  |         |             |
-| `created`             | string                                                  | **Yes**  |         |             |
-| `folderName`          | string                                                  | **Yes**  |         |             |
-| `folderUid`           | string                                                  | **Yes**  |         |             |
-| `updatedBy`           | [LibraryElementDTOMetaUser](#libraryelementdtometauser) | **Yes**  |         |             |
-| `updated`             | string                                                  | **Yes**  |         |             |
-
-### LibraryElementDTOMetaUser
-
-| Property    | Type    | Required | Default | Description |
-|-------------|---------|----------|---------|-------------|
-| `avatarUrl` | string  | **Yes**  |         |             |
-| `id`        | integer | **Yes**  |         |             |
-| `name`      | string  | **Yes**  |         |             |
-
-### Model
-
-TODO: should be the same panel schema defined in dashboard
-Typescript: Omit<Panel, 'gridPos' | 'id' | 'libraryPanel'>;
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Status
-
-| Property           | Type                                                       | Required | Default | Description                                                                                                                                                                |
-|--------------------|------------------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `additionalFields` | [object](#additionalfields)                                | No       |         | additionalFields is reserved for future use                                                                                                                                |
-| `operatorStates`   | map[string][status.#OperatorState](#status.#operatorstate) | No       |         | operatorStates is a map of operator ID to operator state evaluations.<br/>Any operator which consumes this kind SHOULD add its state evaluation information to this field. |
-
-### AdditionalFields
-
-additionalFields is reserved for future use
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Status.#OperatorState
-
-| Property           | Type               | Required | Default | Description                                                                                                                                                                      |
-|--------------------|--------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `lastEvaluation`   | string             | **Yes**  |         | lastEvaluation is the ResourceVersion last evaluated                                                                                                                             |
-| `state`            | string             | **Yes**  |         | state describes the state of the lastEvaluation.<br/>It is limited to three possible states for machine evaluation.<br/>Possible values are: `success`, `in_progress`, `failed`. |
-| `descriptiveState` | string             | No       |         | descriptiveState is an optional more descriptive state field which has no requirements on format                                                                                 |
-| `details`          | [object](#details) | No       |         | details contains any extra information that is operator-specific                                                                                                                 |
-
-### Details
-
-details contains any extra information that is operator-specific
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-
diff --git a/docs/sources/developers/kinds/core/preferences/schema-reference.md b/docs/sources/developers/kinds/core/preferences/schema-reference.md
deleted file mode 100644
index 1605808409408..0000000000000
--- a/docs/sources/developers/kinds/core/preferences/schema-reference.md
+++ /dev/null
@@ -1,141 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Preferences kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## Preferences
-
-#### Maturity: [merged](../../../maturity/#merged)
-#### Version: 0.0
-
-The user or team frontend preferences
-
-| Property   | Type                | Required | Default | Description                                                                                                                                                                                                                                                                    |
-|------------|---------------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `metadata` | [object](#metadata) | **Yes**  |         | metadata contains embedded CommonMetadata and can be extended with custom string fields<br/>TODO: use CommonMetadata instead of redefining here; currently needs to be defined here<br/>without external reference as using the CommonMetadata reference breaks thema codegen. |
-| `spec`     | [object](#spec)     | **Yes**  |         |                                                                                                                                                                                                                                                                                |
-| `status`   | [object](#status)   | **Yes**  |         |                                                                                                                                                                                                                                                                                |
-
-### Metadata
-
-metadata contains embedded CommonMetadata and can be extended with custom string fields
-TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
-without external reference as using the CommonMetadata reference breaks thema codegen.
-
-It extends [_kubeObjectMetadata](#_kubeobjectmetadata).
-
-| Property            | Type                   | Required | Default | Description                                                                                                                             |
-|---------------------|------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| `createdBy`         | string                 | **Yes**  |         |                                                                                                                                         |
-| `creationTimestamp` | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `extraFields`       | [object](#extrafields) | **Yes**  |         | extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata |
-| `finalizers`        | string[]               | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `labels`            | map[string]string      | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `resourceVersion`   | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `uid`               | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `updateTimestamp`   | string                 | **Yes**  |         |                                                                                                                                         |
-| `updatedBy`         | string                 | **Yes**  |         |                                                                                                                                         |
-| `deletionTimestamp` | string                 | No       |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-
-### _kubeObjectMetadata
-
-_kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
-It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
-As it is also intended to be generic enough to function with any API Server.
-
-| Property            | Type              | Required | Default | Description |
-|---------------------|-------------------|----------|---------|-------------|
-| `creationTimestamp` | string            | **Yes**  |         |             |
-| `finalizers`        | string[]          | **Yes**  |         |             |
-| `labels`            | map[string]string | **Yes**  |         |             |
-| `resourceVersion`   | string            | **Yes**  |         |             |
-| `uid`               | string            | **Yes**  |         |             |
-| `deletionTimestamp` | string            | No       |         |             |
-
-### ExtraFields
-
-extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Spec
-
-| Property            | Type                                              | Required | Default | Description                                                                     |
-|---------------------|---------------------------------------------------|----------|---------|---------------------------------------------------------------------------------|
-| `cookiePreferences` | [CookiePreferences](#cookiepreferences)           | No       |         |                                                                                 |
-| `homeDashboardUID`  | string                                            | No       |         | UID for the home dashboard                                                      |
-| `language`          | string                                            | No       |         | Selected language (beta)                                                        |
-| `queryHistory`      | [QueryHistoryPreference](#queryhistorypreference) | No       |         |                                                                                 |
-| `theme`             | string                                            | No       |         | light, dark, empty is default                                                   |
-| `timezone`          | string                                            | No       |         | The timezone selection<br/>TODO: this should use the timezone defined in common |
-| `weekStart`         | string                                            | No       |         | day of the week (sunday, monday, etc)                                           |
-
-### CookiePreferences
-
-| Property      | Type                   | Required | Default | Description |
-|---------------|------------------------|----------|---------|-------------|
-| `analytics`   | [object](#analytics)   | No       |         |             |
-| `functional`  | [object](#functional)  | No       |         |             |
-| `performance` | [object](#performance) | No       |         |             |
-
-### Analytics
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Functional
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Performance
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### QueryHistoryPreference
-
-| Property  | Type   | Required | Default | Description                                 |
-|-----------|--------|----------|---------|---------------------------------------------|
-| `homeTab` | string | No       |         | one of: '' &#124; 'query' &#124; 'starred'; |
-
-### Status
-
-| Property           | Type                                                       | Required | Default | Description                                                                                                                                                                |
-|--------------------|------------------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `additionalFields` | [object](#additionalfields)                                | No       |         | additionalFields is reserved for future use                                                                                                                                |
-| `operatorStates`   | map[string][status.#OperatorState](#status.#operatorstate) | No       |         | operatorStates is a map of operator ID to operator state evaluations.<br/>Any operator which consumes this kind SHOULD add its state evaluation information to this field. |
-
-### AdditionalFields
-
-additionalFields is reserved for future use
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Status.#OperatorState
-
-| Property           | Type               | Required | Default | Description                                                                                                                                                                      |
-|--------------------|--------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `lastEvaluation`   | string             | **Yes**  |         | lastEvaluation is the ResourceVersion last evaluated                                                                                                                             |
-| `state`            | string             | **Yes**  |         | state describes the state of the lastEvaluation.<br/>It is limited to three possible states for machine evaluation.<br/>Possible values are: `success`, `in_progress`, `failed`. |
-| `descriptiveState` | string             | No       |         | descriptiveState is an optional more descriptive state field which has no requirements on format                                                                                 |
-| `details`          | [object](#details) | No       |         | details contains any extra information that is operator-specific                                                                                                                 |
-
-### Details
-
-details contains any extra information that is operator-specific
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-
diff --git a/docs/sources/developers/kinds/core/publicdashboard/schema-reference.md b/docs/sources/developers/kinds/core/publicdashboard/schema-reference.md
deleted file mode 100644
index 3f6f3ab223c89..0000000000000
--- a/docs/sources/developers/kinds/core/publicdashboard/schema-reference.md
+++ /dev/null
@@ -1,111 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: PublicDashboard kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## PublicDashboard
-
-#### Maturity: [merged](../../../maturity/#merged)
-#### Version: 0.0
-
-Public dashboard configuration
-
-| Property   | Type                | Required | Default | Description                                                                                                                                                                                                                                                                    |
-|------------|---------------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `metadata` | [object](#metadata) | **Yes**  |         | metadata contains embedded CommonMetadata and can be extended with custom string fields<br/>TODO: use CommonMetadata instead of redefining here; currently needs to be defined here<br/>without external reference as using the CommonMetadata reference breaks thema codegen. |
-| `spec`     | [object](#spec)     | **Yes**  |         |                                                                                                                                                                                                                                                                                |
-| `status`   | [object](#status)   | **Yes**  |         |                                                                                                                                                                                                                                                                                |
-
-### Metadata
-
-metadata contains embedded CommonMetadata and can be extended with custom string fields
-TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
-without external reference as using the CommonMetadata reference breaks thema codegen.
-
-It extends [_kubeObjectMetadata](#_kubeobjectmetadata).
-
-| Property            | Type                   | Required | Default | Description                                                                                                                             |
-|---------------------|------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| `createdBy`         | string                 | **Yes**  |         |                                                                                                                                         |
-| `creationTimestamp` | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `extraFields`       | [object](#extrafields) | **Yes**  |         | extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata |
-| `finalizers`        | string[]               | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `labels`            | map[string]string      | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `resourceVersion`   | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `uid`               | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `updateTimestamp`   | string                 | **Yes**  |         |                                                                                                                                         |
-| `updatedBy`         | string                 | **Yes**  |         |                                                                                                                                         |
-| `deletionTimestamp` | string                 | No       |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-
-### _kubeObjectMetadata
-
-_kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
-It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
-As it is also intended to be generic enough to function with any API Server.
-
-| Property            | Type              | Required | Default | Description |
-|---------------------|-------------------|----------|---------|-------------|
-| `creationTimestamp` | string            | **Yes**  |         |             |
-| `finalizers`        | string[]          | **Yes**  |         |             |
-| `labels`            | map[string]string | **Yes**  |         |             |
-| `resourceVersion`   | string            | **Yes**  |         |             |
-| `uid`               | string            | **Yes**  |         |             |
-| `deletionTimestamp` | string            | No       |         |             |
-
-### ExtraFields
-
-extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Spec
-
-| Property               | Type    | Required | Default | Description                                                     |
-|------------------------|---------|----------|---------|-----------------------------------------------------------------|
-| `annotationsEnabled`   | boolean | **Yes**  |         | Flag that indicates if annotations are enabled                  |
-| `dashboardUid`         | string  | **Yes**  |         | Dashboard unique identifier referenced by this public dashboard |
-| `isEnabled`            | boolean | **Yes**  |         | Flag that indicates if the public dashboard is enabled          |
-| `timeSelectionEnabled` | boolean | **Yes**  |         | Flag that indicates if the time range picker is enabled         |
-| `uid`                  | string  | **Yes**  |         | Unique public dashboard identifier                              |
-| `accessToken`          | string  | No       |         | Unique public access token                                      |
-
-### Status
-
-| Property           | Type                                                       | Required | Default | Description                                                                                                                                                                |
-|--------------------|------------------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `additionalFields` | [object](#additionalfields)                                | No       |         | additionalFields is reserved for future use                                                                                                                                |
-| `operatorStates`   | map[string][status.#OperatorState](#status.#operatorstate) | No       |         | operatorStates is a map of operator ID to operator state evaluations.<br/>Any operator which consumes this kind SHOULD add its state evaluation information to this field. |
-
-### AdditionalFields
-
-additionalFields is reserved for future use
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Status.#OperatorState
-
-| Property           | Type               | Required | Default | Description                                                                                                                                                                      |
-|--------------------|--------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `lastEvaluation`   | string             | **Yes**  |         | lastEvaluation is the ResourceVersion last evaluated                                                                                                                             |
-| `state`            | string             | **Yes**  |         | state describes the state of the lastEvaluation.<br/>It is limited to three possible states for machine evaluation.<br/>Possible values are: `success`, `in_progress`, `failed`. |
-| `descriptiveState` | string             | No       |         | descriptiveState is an optional more descriptive state field which has no requirements on format                                                                                 |
-| `details`          | [object](#details) | No       |         | details contains any extra information that is operator-specific                                                                                                                 |
-
-### Details
-
-details contains any extra information that is operator-specific
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-
diff --git a/docs/sources/developers/kinds/core/role/schema-reference.md b/docs/sources/developers/kinds/core/role/schema-reference.md
deleted file mode 100644
index b5d96f79479c7..0000000000000
--- a/docs/sources/developers/kinds/core/role/schema-reference.md
+++ /dev/null
@@ -1,110 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Role kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## Role
-
-#### Maturity: [merged](../../../maturity/#merged)
-#### Version: 0.0
-
-Roles represent a set of users+teams that should share similar access
-
-| Property   | Type                | Required | Default | Description                                                                                                                                                                                                                                                                    |
-|------------|---------------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `metadata` | [object](#metadata) | **Yes**  |         | metadata contains embedded CommonMetadata and can be extended with custom string fields<br/>TODO: use CommonMetadata instead of redefining here; currently needs to be defined here<br/>without external reference as using the CommonMetadata reference breaks thema codegen. |
-| `spec`     | [object](#spec)     | **Yes**  |         |                                                                                                                                                                                                                                                                                |
-| `status`   | [object](#status)   | **Yes**  |         |                                                                                                                                                                                                                                                                                |
-
-### Metadata
-
-metadata contains embedded CommonMetadata and can be extended with custom string fields
-TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
-without external reference as using the CommonMetadata reference breaks thema codegen.
-
-It extends [_kubeObjectMetadata](#_kubeobjectmetadata).
-
-| Property            | Type                   | Required | Default | Description                                                                                                                             |
-|---------------------|------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| `createdBy`         | string                 | **Yes**  |         |                                                                                                                                         |
-| `creationTimestamp` | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `extraFields`       | [object](#extrafields) | **Yes**  |         | extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata |
-| `finalizers`        | string[]               | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `labels`            | map[string]string      | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `resourceVersion`   | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `uid`               | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `updateTimestamp`   | string                 | **Yes**  |         |                                                                                                                                         |
-| `updatedBy`         | string                 | **Yes**  |         |                                                                                                                                         |
-| `deletionTimestamp` | string                 | No       |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-
-### _kubeObjectMetadata
-
-_kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
-It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
-As it is also intended to be generic enough to function with any API Server.
-
-| Property            | Type              | Required | Default | Description |
-|---------------------|-------------------|----------|---------|-------------|
-| `creationTimestamp` | string            | **Yes**  |         |             |
-| `finalizers`        | string[]          | **Yes**  |         |             |
-| `labels`            | map[string]string | **Yes**  |         |             |
-| `resourceVersion`   | string            | **Yes**  |         |             |
-| `uid`               | string            | **Yes**  |         |             |
-| `deletionTimestamp` | string            | No       |         |             |
-
-### ExtraFields
-
-extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Spec
-
-| Property      | Type    | Required | Default | Description                                               |
-|---------------|---------|----------|---------|-----------------------------------------------------------|
-| `hidden`      | boolean | **Yes**  |         | Do not show this role                                     |
-| `name`        | string  | **Yes**  |         | The role identifier `managed:builtins:editor:permissions` |
-| `description` | string  | No       |         | Role description                                          |
-| `displayName` | string  | No       |         | Optional display                                          |
-| `groupName`   | string  | No       |         | Name of the team.                                         |
-
-### Status
-
-| Property           | Type                                                       | Required | Default | Description                                                                                                                                                                |
-|--------------------|------------------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `additionalFields` | [object](#additionalfields)                                | No       |         | additionalFields is reserved for future use                                                                                                                                |
-| `operatorStates`   | map[string][status.#OperatorState](#status.#operatorstate) | No       |         | operatorStates is a map of operator ID to operator state evaluations.<br/>Any operator which consumes this kind SHOULD add its state evaluation information to this field. |
-
-### AdditionalFields
-
-additionalFields is reserved for future use
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Status.#OperatorState
-
-| Property           | Type               | Required | Default | Description                                                                                                                                                                      |
-|--------------------|--------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `lastEvaluation`   | string             | **Yes**  |         | lastEvaluation is the ResourceVersion last evaluated                                                                                                                             |
-| `state`            | string             | **Yes**  |         | state describes the state of the lastEvaluation.<br/>It is limited to three possible states for machine evaluation.<br/>Possible values are: `success`, `in_progress`, `failed`. |
-| `descriptiveState` | string             | No       |         | descriptiveState is an optional more descriptive state field which has no requirements on format                                                                                 |
-| `details`          | [object](#details) | No       |         | details contains any extra information that is operator-specific                                                                                                                 |
-
-### Details
-
-details contains any extra information that is operator-specific
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-
diff --git a/docs/sources/developers/kinds/core/rolebinding/schema-reference.md b/docs/sources/developers/kinds/core/rolebinding/schema-reference.md
deleted file mode 100644
index 370a2a82ccfb0..0000000000000
--- a/docs/sources/developers/kinds/core/rolebinding/schema-reference.md
+++ /dev/null
@@ -1,136 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: RoleBinding kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## RoleBinding
-
-#### Maturity: [merged](../../../maturity/#merged)
-#### Version: 0.0
-
-Role bindings links a user|team to a configured role
-
-| Property   | Type                | Required | Default | Description                                                                                                                                                                                                                                                                    |
-|------------|---------------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `metadata` | [object](#metadata) | **Yes**  |         | metadata contains embedded CommonMetadata and can be extended with custom string fields<br/>TODO: use CommonMetadata instead of redefining here; currently needs to be defined here<br/>without external reference as using the CommonMetadata reference breaks thema codegen. |
-| `spec`     | [object](#spec)     | **Yes**  |         |                                                                                                                                                                                                                                                                                |
-| `status`   | [object](#status)   | **Yes**  |         |                                                                                                                                                                                                                                                                                |
-
-### Metadata
-
-metadata contains embedded CommonMetadata and can be extended with custom string fields
-TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
-without external reference as using the CommonMetadata reference breaks thema codegen.
-
-It extends [_kubeObjectMetadata](#_kubeobjectmetadata).
-
-| Property            | Type                   | Required | Default | Description                                                                                                                             |
-|---------------------|------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| `createdBy`         | string                 | **Yes**  |         |                                                                                                                                         |
-| `creationTimestamp` | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `extraFields`       | [object](#extrafields) | **Yes**  |         | extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata |
-| `finalizers`        | string[]               | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `labels`            | map[string]string      | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `resourceVersion`   | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `uid`               | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `updateTimestamp`   | string                 | **Yes**  |         |                                                                                                                                         |
-| `updatedBy`         | string                 | **Yes**  |         |                                                                                                                                         |
-| `deletionTimestamp` | string                 | No       |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-
-### _kubeObjectMetadata
-
-_kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
-It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
-As it is also intended to be generic enough to function with any API Server.
-
-| Property            | Type              | Required | Default | Description |
-|---------------------|-------------------|----------|---------|-------------|
-| `creationTimestamp` | string            | **Yes**  |         |             |
-| `finalizers`        | string[]          | **Yes**  |         |             |
-| `labels`            | map[string]string | **Yes**  |         |             |
-| `resourceVersion`   | string            | **Yes**  |         |             |
-| `uid`               | string            | **Yes**  |         |             |
-| `deletionTimestamp` | string            | No       |         |             |
-
-### ExtraFields
-
-extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Spec
-
-| Property  | Type                                      | Required | Default | Description                |
-|-----------|-------------------------------------------|----------|---------|----------------------------|
-| `role`    | [object](#role)                           | **Yes**  |         | The role we are discussing |
-| `subject` | [RoleBindingSubject](#rolebindingsubject) | **Yes**  |         |                            |
-
-### RoleBindingSubject
-
-| Property | Type   | Required | Default | Description                          |
-|----------|--------|----------|---------|--------------------------------------|
-| `kind`   | string | **Yes**  |         | Possible values are: `Team`, `User`. |
-| `name`   | string | **Yes**  |         | The team/user identifier name        |
-
-### Role
-
-The role we are discussing
-
-| Property | Type                                                                                    | Required | Default | Description |
-|----------|-----------------------------------------------------------------------------------------|----------|---------|-------------|
-| `object` | Possible types are: [BuiltinRoleRef](#builtinroleref), [CustomRoleRef](#customroleref). |          |         |
-
-### BuiltinRoleRef
-
-| Property | Type   | Required | Default | Description                                       |
-|----------|--------|----------|---------|---------------------------------------------------|
-| `kind`   | string | **Yes**  |         | Possible values are: `BuiltinRole`.               |
-| `name`   | string | **Yes**  |         | Possible values are: `viewer`, `editor`, `admin`. |
-
-### CustomRoleRef
-
-| Property | Type   | Required | Default | Description                  |
-|----------|--------|----------|---------|------------------------------|
-| `kind`   | string | **Yes**  |         | Possible values are: `Role`. |
-| `name`   | string | **Yes**  |         |                              |
-
-### Status
-
-| Property           | Type                                                       | Required | Default | Description                                                                                                                                                                |
-|--------------------|------------------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `additionalFields` | [object](#additionalfields)                                | No       |         | additionalFields is reserved for future use                                                                                                                                |
-| `operatorStates`   | map[string][status.#OperatorState](#status.#operatorstate) | No       |         | operatorStates is a map of operator ID to operator state evaluations.<br/>Any operator which consumes this kind SHOULD add its state evaluation information to this field. |
-
-### AdditionalFields
-
-additionalFields is reserved for future use
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Status.#OperatorState
-
-| Property           | Type               | Required | Default | Description                                                                                                                                                                      |
-|--------------------|--------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `lastEvaluation`   | string             | **Yes**  |         | lastEvaluation is the ResourceVersion last evaluated                                                                                                                             |
-| `state`            | string             | **Yes**  |         | state describes the state of the lastEvaluation.<br/>It is limited to three possible states for machine evaluation.<br/>Possible values are: `success`, `in_progress`, `failed`. |
-| `descriptiveState` | string             | No       |         | descriptiveState is an optional more descriptive state field which has no requirements on format                                                                                 |
-| `details`          | [object](#details) | No       |         | details contains any extra information that is operator-specific                                                                                                                 |
-
-### Details
-
-details contains any extra information that is operator-specific
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-
diff --git a/docs/sources/developers/kinds/core/serviceaccount/schema-reference.md b/docs/sources/developers/kinds/core/serviceaccount/schema-reference.md
deleted file mode 100644
index 4c609ec6bba98..0000000000000
--- a/docs/sources/developers/kinds/core/serviceaccount/schema-reference.md
+++ /dev/null
@@ -1,114 +0,0 @@
----
-keywords:
-- grafana
-- schema
-labels:
-  products:
-  - enterprise
-  - oss
-title: ServiceAccount kind
----
-
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## ServiceAccount
-
-#### Maturity: [merged](../../../maturity/#merged)
-
-#### Version: 0.0
-
-system account
-
-| Property   | Type                | Required | Default | Description                                                                                                                                                                                                                                                                    |
-| ---------- | ------------------- | -------- | ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `metadata` | [object](#metadata) | **Yes**  |         | metadata contains embedded CommonMetadata and can be extended with custom string fields<br/>TODO: use CommonMetadata instead of redefining here; currently needs to be defined here<br/>without external reference as using the CommonMetadata reference breaks thema codegen. |
-| `spec`     | [object](#spec)     | **Yes**  |         |                                                                                                                                                                                                                                                                                |
-| `status`   | [object](#status)   | **Yes**  |         |                                                                                                                                                                                                                                                                                |
-
-### Metadata
-
-metadata contains embedded CommonMetadata and can be extended with custom string fields
-TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
-without external reference as using the CommonMetadata reference breaks thema codegen.
-
-It extends [\_kubeObjectMetadata](#_kubeobjectmetadata).
-
-| Property            | Type                   | Required | Default | Description                                                                                                                             |
-| ------------------- | ---------------------- | -------- | ------- | --------------------------------------------------------------------------------------------------------------------------------------- |
-| `createdBy`         | string                 | **Yes**  |         |                                                                                                                                         |
-| `creationTimestamp` | string                 | **Yes**  |         | _(Inherited from [\_kubeObjectMetadata](#_kubeobjectmetadata))_                                                                         |
-| `extraFields`       | [object](#extrafields) | **Yes**  |         | extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata |
-| `finalizers`        | string[]               | **Yes**  |         | _(Inherited from [\_kubeObjectMetadata](#_kubeobjectmetadata))_                                                                         |
-| `labels`            | map[string]string      | **Yes**  |         | _(Inherited from [\_kubeObjectMetadata](#_kubeobjectmetadata))_                                                                         |
-| `resourceVersion`   | string                 | **Yes**  |         | _(Inherited from [\_kubeObjectMetadata](#_kubeobjectmetadata))_                                                                         |
-| `uid`               | string                 | **Yes**  |         | _(Inherited from [\_kubeObjectMetadata](#_kubeobjectmetadata))_                                                                         |
-| `updateTimestamp`   | string                 | **Yes**  |         |                                                                                                                                         |
-| `updatedBy`         | string                 | **Yes**  |         |                                                                                                                                         |
-| `deletionTimestamp` | string                 | No       |         | _(Inherited from [\_kubeObjectMetadata](#_kubeobjectmetadata))_                                                                         |
-
-### \_kubeObjectMetadata
-
-\_kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
-It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
-As it is also intended to be generic enough to function with any API Server.
-
-| Property            | Type              | Required | Default | Description |
-| ------------------- | ----------------- | -------- | ------- | ----------- |
-| `creationTimestamp` | string            | **Yes**  |         |             |
-| `finalizers`        | string[]          | **Yes**  |         |             |
-| `labels`            | map[string]string | **Yes**  |         |             |
-| `resourceVersion`   | string            | **Yes**  |         |             |
-| `uid`               | string            | **Yes**  |         |             |
-| `deletionTimestamp` | string            | No       |         |             |
-
-### ExtraFields
-
-extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
-
-| Property | Type | Required | Default | Description |
-| -------- | ---- | -------- | ------- | ----------- |
-
-### Spec
-
-| Property        | Type               | Required | Default | Description                                                                                                                             |
-| --------------- | ------------------ | -------- | ------- | --------------------------------------------------------------------------------------------------------------------------------------- |
-| `avatarUrl`     | string             | **Yes**  |         | AvatarUrl is the service account's avatar URL. It allows the frontend to display a picture in front<br/>of the service account.         |
-| `id`            | integer            | **Yes**  |         | ID is the unique identifier of the service account in the database.                                                                     |
-| `isDisabled`    | boolean            | **Yes**  |         | IsDisabled indicates if the service account is disabled.                                                                                |
-| `login`         | string             | **Yes**  |         | Login of the service account.                                                                                                           |
-| `name`          | string             | **Yes**  |         | Name of the service account.                                                                                                            |
-| `orgId`         | integer            | **Yes**  |         | OrgId is the ID of an organisation the service account belongs to.                                                                      |
-| `role`          | string             | **Yes**  |         | OrgRole is a Grafana Organization Role which can be 'Viewer', 'Editor', 'Admin'.<br/>Possible values are: `Admin`, `Editor`, `Viewer`.  |
-| `tokens`        | integer            | **Yes**  |         | Tokens is the number of active tokens for the service account.<br/>Tokens are used to authenticate the service account against Grafana. |
-| `accessControl` | map[string]boolean | No       |         | AccessControl metadata associated with a given resource.                                                                                |
-| `teams`         | string[]           | No       |         | Teams is a list of teams the service account belongs to.                                                                                |
-
-### Status
-
-| Property           | Type                                                       | Required | Default | Description                                                                                                                                                                |
-| ------------------ | ---------------------------------------------------------- | -------- | ------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `additionalFields` | [object](#additionalfields)                                | No       |         | additionalFields is reserved for future use                                                                                                                                |
-| `operatorStates`   | map[string][status.#OperatorState](#status.#operatorstate) | No       |         | operatorStates is a map of operator ID to operator state evaluations.<br/>Any operator which consumes this kind SHOULD add its state evaluation information to this field. |
-
-### AdditionalFields
-
-additionalFields is reserved for future use
-
-| Property | Type | Required | Default | Description |
-| -------- | ---- | -------- | ------- | ----------- |
-
-### Status.#OperatorState
-
-| Property           | Type               | Required | Default | Description                                                                                                                                                                      |
-| ------------------ | ------------------ | -------- | ------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `lastEvaluation`   | string             | **Yes**  |         | lastEvaluation is the ResourceVersion last evaluated                                                                                                                             |
-| `state`            | string             | **Yes**  |         | state describes the state of the lastEvaluation.<br/>It is limited to three possible states for machine evaluation.<br/>Possible values are: `success`, `in_progress`, `failed`. |
-| `descriptiveState` | string             | No       |         | descriptiveState is an optional more descriptive state field which has no requirements on format                                                                                 |
-| `details`          | [object](#details) | No       |         | details contains any extra information that is operator-specific                                                                                                                 |
-
-### Details
-
-details contains any extra information that is operator-specific
-
-| Property | Type | Required | Default | Description |
-| -------- | ---- | -------- | ------- | ----------- |
diff --git a/docs/sources/developers/kinds/core/team/schema-reference.md b/docs/sources/developers/kinds/core/team/schema-reference.md
deleted file mode 100644
index 6f759abf319cf..0000000000000
--- a/docs/sources/developers/kinds/core/team/schema-reference.md
+++ /dev/null
@@ -1,107 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Team kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## Team
-
-#### Maturity: [merged](../../../maturity/#merged)
-#### Version: 0.0
-
-A team is a named grouping of Grafana users to which access control rules may be assigned.
-
-| Property   | Type                | Required | Default | Description                                                                                                                                                                                                                                                                    |
-|------------|---------------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `metadata` | [object](#metadata) | **Yes**  |         | metadata contains embedded CommonMetadata and can be extended with custom string fields<br/>TODO: use CommonMetadata instead of redefining here; currently needs to be defined here<br/>without external reference as using the CommonMetadata reference breaks thema codegen. |
-| `spec`     | [object](#spec)     | **Yes**  |         |                                                                                                                                                                                                                                                                                |
-| `status`   | [object](#status)   | **Yes**  |         |                                                                                                                                                                                                                                                                                |
-
-### Metadata
-
-metadata contains embedded CommonMetadata and can be extended with custom string fields
-TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
-without external reference as using the CommonMetadata reference breaks thema codegen.
-
-It extends [_kubeObjectMetadata](#_kubeobjectmetadata).
-
-| Property            | Type                   | Required | Default | Description                                                                                                                             |
-|---------------------|------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| `createdBy`         | string                 | **Yes**  |         |                                                                                                                                         |
-| `creationTimestamp` | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `extraFields`       | [object](#extrafields) | **Yes**  |         | extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata |
-| `finalizers`        | string[]               | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `labels`            | map[string]string      | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `resourceVersion`   | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `uid`               | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `updateTimestamp`   | string                 | **Yes**  |         |                                                                                                                                         |
-| `updatedBy`         | string                 | **Yes**  |         |                                                                                                                                         |
-| `deletionTimestamp` | string                 | No       |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-
-### _kubeObjectMetadata
-
-_kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
-It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
-As it is also intended to be generic enough to function with any API Server.
-
-| Property            | Type              | Required | Default | Description |
-|---------------------|-------------------|----------|---------|-------------|
-| `creationTimestamp` | string            | **Yes**  |         |             |
-| `finalizers`        | string[]          | **Yes**  |         |             |
-| `labels`            | map[string]string | **Yes**  |         |             |
-| `resourceVersion`   | string            | **Yes**  |         |             |
-| `uid`               | string            | **Yes**  |         |             |
-| `deletionTimestamp` | string            | No       |         |             |
-
-### ExtraFields
-
-extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Spec
-
-| Property | Type   | Required | Default | Description        |
-|----------|--------|----------|---------|--------------------|
-| `name`   | string | **Yes**  |         | Name of the team.  |
-| `email`  | string | No       |         | Email of the team. |
-
-### Status
-
-| Property           | Type                                                       | Required | Default | Description                                                                                                                                                                |
-|--------------------|------------------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `additionalFields` | [object](#additionalfields)                                | No       |         | additionalFields is reserved for future use                                                                                                                                |
-| `operatorStates`   | map[string][status.#OperatorState](#status.#operatorstate) | No       |         | operatorStates is a map of operator ID to operator state evaluations.<br/>Any operator which consumes this kind SHOULD add its state evaluation information to this field. |
-
-### AdditionalFields
-
-additionalFields is reserved for future use
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Status.#OperatorState
-
-| Property           | Type               | Required | Default | Description                                                                                                                                                                      |
-|--------------------|--------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `lastEvaluation`   | string             | **Yes**  |         | lastEvaluation is the ResourceVersion last evaluated                                                                                                                             |
-| `state`            | string             | **Yes**  |         | state describes the state of the lastEvaluation.<br/>It is limited to three possible states for machine evaluation.<br/>Possible values are: `success`, `in_progress`, `failed`. |
-| `descriptiveState` | string             | No       |         | descriptiveState is an optional more descriptive state field which has no requirements on format                                                                                 |
-| `details`          | [object](#details) | No       |         | details contains any extra information that is operator-specific                                                                                                                 |
-
-### Details
-
-details contains any extra information that is operator-specific
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-
diff --git a/docs/sources/developers/kinds/maturity.md b/docs/sources/developers/kinds/maturity.md
deleted file mode 100644
index e9a6264f2f0d4..0000000000000
--- a/docs/sources/developers/kinds/maturity.md
+++ /dev/null
@@ -1,298 +0,0 @@
----
-keywords:
-- grafana
-- schema
-- maturity
-labels:
-  products:
-  - enterprise
-  - oss
-title: Grafana Kinds - From Zero to Maturity
-weight: 300
----
-
-# Grafana Kinds - From Zero to Maturity
-
-> Grafana’s schema, Kind, and related codegen systems are under intense development.
-
-Fear of unknown impacts leads to defensive coding, slow PRs, circular arguments, and an overall hesitance to engage.
-That friction alone is sufficient to sink a large-scale project. This guide seeks to counteract this friction by
-defining an end goal for all schemas: “mature.” This is the word we’re using to refer to the commonsense notion of “this
-software reached 1.0.”
-
-In general, 1.0/mature suggests: “we’ve thought about this thing, done the necessary experimenting, know what it is, and
-feel confident about presenting it to the world.” In the context of schemas intended to act as a single source of truth
-driving many use cases, we can intuitively phrase maturity as:
-
-- The schema follows general best practices (e.g. good comments, follows field type rules), and the team owning the
-  schema believes that the fields described in the schema are accurate.
-- Automation propagates the schema as source of truth to every relevant
-  [domain](https://docs.google.com/document/d/13Rv395_T8WTLBgdL-2rbXKu0fx_TW-Q9yz9x6oBjm6g/edit#heading=h.67pop2k2f8fq)
-  (for example: types in frontend, backend, as-code; plugins SDK; docs; APIs and storage; search indexing)
-
-This intuitive definition gets us pointed in the right direction. But we can’t just jump straight there - we have to
-approach it methodically. To that end, this doc outlines four (ok five, but really, four) basic maturity milestones that
-we expect Kinds and their schemas to progress through:
-
-- _(Planned - Put a Kind name on the official TODO list)_
-- **Merged** - Get an initial schema written down. Not final. Not perfect.
-- **Experimental** - Kind schemas are the source of truth for basic working code.
-- **Stable** - Kind schemas are the source of truth for all target domains.
-- **Mature** - The operational transition path for the Kind is battle-tested and reliable.
-
-These milestones have functional definitions, tied to code and enforced in CI. A Kind having reached a particular
-milestone corresponds to properties of the code that are enforced in CI; advancing to the next milestone likely has a
-direct impact on code generation and runtime behavior.
-
-Finally, the above definitions imply that maturity for _individual Kinds/schemas_ depends on _the Kind system_ being
-mature, as well. This is by design: **Grafana Labs does not intend to publicize any single schema as mature until
-[certain schema system milestones are met](https://github.com/orgs/grafana/projects/133/views/8).**
-
-## Schema Maturity Milestones
-
-Maturity milestones are a linear progression. Each milestone implies that the conditions of its predecessors continue to
-be met.
-
-Reaching a particular milestone implies that the properties of all prior milestones are still met.
-
-### (Milestone 0 - Planned) {#planned}
-
-| **Goal**                     | Put a Kind name on the official TODO list: [Kind Schematization Progress Tracker](https://docs.google.com/spreadsheets/d/1DL6nZHyX42X013QraWYbKsMmHozLrtXDj8teLKvwYMY/edit#gid=0) |
-| ---------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **Reached when**             | The planned Kind is listed in the relevant sheet of the progress tracker with a link to track / be able to see when exactly it is planned and who is responsible for doing it     |
-| **Common hurdles**           | Existing definitions may not correspond clearly to an object boundary - e.g. playlists are currently in denormalized SQL tables playlist and playlist_item                        |
-| **Public-facing guarantees** | None                                                                                                                                                                              |
-| **customer-facing stage**    | None                                                                                                                                                                              |
-
-### Milestone 1 - Merged {#merged}
-
-| **Goal**                     | Get an initial schema written down. Not final. Not perfect.                                                                                                                                                                   |
-| ---------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **Reached when**             | A PR introducing the initial version of a schema has been merged.                                                                                                                                                             |
-| **Common hurdles**           | Getting comfortable with Thema and CUE<br/>Figuring out where all the existing definitions of the Kind are<br/>Knowing whether it’s safe to omit possibly-crufty fields from the existing definitions when writing the schema |
-| **Public-facing guarantees** | None                                                                                                                                                                                                                          |
-| **User-facing stage**        | None                                                                                                                                                                                                                          |
-
-### Milestone 2 - Experimental {#experimental}
-
-| **Goal**                     | Schemas are the source of truth for basic working code.                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| ---------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **Reached when**             | Go and TypeScript types generated from schema are used in all relevant production code, having replaced handwritten type definitions (if any).                                                                                                                                                                                                                                                                                                                                              |
-| **Common hurdles**           | Compromises on field definitions that seemed fine to reach “committed” start to feel unacceptable<br/>Ergonomics of generated code may start to bite<br/>Aligning with the look and feel of related schemas                                                                                                                                                                                                                                                                                 |
-| **Public-facing guarantees** | Kinds are available for as-code usage in [grok](https://github.com/grafana/grok), and in tools downstream of grok, following all of grok’s standard patterns.                                                                                                                                                                                                                                                                                                                               |
-| **Stage comms**              | Internal users:- Start using the schema and give feedback internally to help move to the next stage.External users:- Align with the [experimental](https://docs.google.com/document/d/1lqp0hALax2PT7jSObsX52EbQmIDFnLFMqIbBrJ4EYCE/edit#heading=h.ehl5iy7pcjvq) stage in the release definition document.  - Experimental schemas will be discoverable, and from a customer PoV should never be used in production, but they can be explored and we are more than happy to receive feedback |
-
-## Schema-writing guidelines
-
-### Avoid anonymous nested structs
-
-**_Always name your sub-objects._**
-
-In CUE, nesting structs is like nesting objects in JSON, and just as easy:
-
-```json
-one: {
-  two: {
-    three: {
-  }
-}
-```
-
-While these can be accurately represented in other languages, they aren’t especially friendly to work with:
-
-```typescript
-// TypeScript
-export interface One {
-  two: {
-    three: string;
-  };
-}
-```
-
-```go
-// Go
-type One struct {
-  Two struct {
-    Three string `json:"three"`
-  } `json:"two"`
-}
-```
-
-Instead, within your schema, prefer to make root-level definitions with the appropriate attributes:
-
-```cue
-// Cue
-one: {
-  two: #Two
-  #Two: {
-    three: string
-  } @cuetsy(kind="interface")
-}
-```
-
-```Typescript
-// TypeScript
-export interface Two {
-  three: string;
-}
-export interface One {
-  two: Two;
-}
-```
-
-```Go
-// Go
-type One struct {
-  Two Two `json:"two"`
-}
-type Two struct {
-  Three string `json:"three"`
-}
-```
-
-### Use precise numeric types
-
-**_Use precise numeric types like `float64` or `uint32`. Never use `number`._**
-
-Never use `number` for a numeric type in a schema.
-
-Instead, use a specific, sized type like `int64` or `float32`. This makes your intent precisely clear.
-TypeScript will still represent these fields with `number`, but other languages (e.g. Go, Protobuf) can be more precise.
-
-Unlike in Go, int and uint are not your friends. These correspond to `math/big` types. Use a sized type,
-like `uint32` or `int32`, unless the use case specifically requires a huge numeric space.
-
-### No explicit `null`
-
-**_Do not use `null` as a type in any schema._**
-
-This one is tricky to think about, and requires some background.
-
-Historically, Grafana’s dashboard JSON has often contained fields with the explicit value `null`.
-This was problematic, because explicit `null` introduces an ambiguity: is a JSON field being present
-with value null meaningfully different from the field being absent? That is, should a program behave differently
-if it encounters a null vs. an absent field?
-
-In almost all cases, the answer is “no.” Thus, the ambiguity: if both explicit null and absence are _accepted_
-by a system, it pushes responsibility onto anyone writing code in that system to decide, case-by-case,
-whether the two are _intended to be meaningfully different_, and therefore whether behavior should be different.
-
-CUE does have a `null` type, and only accepts data containing `nulls` as valid if the schema explicitly allows a `null`.
-That means, by default, using CUE for schemas removes the possibility of ambiguity in code that receives data validated
-by those schemas, even if the language they’re writing in still allows for ambiguity. (Javascript does, Go doesn’t.)
-
-As a schema author, this means you’re being unambiguous by default - no `nulls`. That’s good! The only question is
-whether it’s worth explicitly allowing a `null` for some particular case:
-
-```Cue
-someField: int32 | null
-```
-
-The _only_ time this _may_ be a good idea is if your field needs to be able to represent a value
-that is not otherwise acceptable within the value space - for example, if `someField` needs to be able to contain
-[Infinity](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/POSITIVE_INFINITY).
-When such values are serialized to null by default, it can be convenient to accept null in the schema - but even then,
-explicit null is unlikely to be the best way to represent such values, because it is so subtle and falsey.
-
-**Above all, DO NOT accept `null` in a schema simply because current behavior sometimes unintentionally produces a `null`.**
-Schematization is an opportunity to get rid of this ambiguity. Fix the accidental null-producing behavior, instead.
-
-### Issues
-
-- If a schema has a "kind" field and its set as enum, it generates a Kind alias that conflicts with the generated
-  Kind struct.
-- Byte fields are existing in Go but not in TS, so the generator fails.
-- **omitempty** is useful when we return things like json.RawMessage (alias of []byte) because Postgres saves this
-  information as `nil`, when MySQL and SQLite save it as `{}`. If we found it in the rest of the cases, it isn't necessary
-  to set `?` in the field in the schema.
-
-## Schema Attributes
-
-Grafana’s schema system relies on [CUE attributes](https://cuelang.org/docs/references/spec/#attributes)declared on
-properties within schemas to control some aspects of code generation behavior.
-In a schema, an attribute is the whole of `@cuetsy(kind=”type”)`:
-
-```Cue
-field: string @cuetsy(kind="type")
-```
-
-CUE attributes are purely informational - they cannot influence CUE evaluation behavior, including the types being
-expressed in a Thema schema.
-
-CUE attributes have three parts. In `@cuetsy(kind=”type”)`, those are:
-
-- name - `@cuetsy`
-- arg - `kind`
-- argval - `“type”`
-
-Any given attribute may consist of `{name}`, `{name,arg}`, or `{name,arg,argval}`. These three levels form a tree
-(meaning of any argval is specific to its arg, which is specific to its name). The following documentation represents
-this tree using a header hierarchy.
-
-### @cuetsy
-
-These attributes control the behavior of the [cuetsy code generator](https://github.com/grafana/cuetsy), which converts
-CUE to TypeScript. We include only the kind arg here for brevity; cuetsy’s README has the canonical documentation on all
-supported args and argvals, and their intended usage.
-
-Notes:
-
-- Only top-level fields in a Thema schema are scanned for `@cuetsy` attributes.
-- Grafana’s code generators hardcode that an interface (`@cuetsy(kind=”interface”)`) is generated to represent the root
-  schema object, unless it is known to be a [grouped lineage](https://docs.google.com/document/d/13Rv395_T8WTLBgdL-2rbXKu0fx_TW-Q9yz9x6oBjm6g/edit#heading=h.vx7stzpxtw4t).
-
-#### kind
-
-Indicates the kind of TypeScript symbol that should be generated for that schema field.
-
-#### interface
-
-Generate the schema field as a TS interface. Field must be struct-kinded.
-
-#### enum
-
-Generate the schema field as a TS enum. Field must be either int-kinded (numeric enums) or string-kinded (string enums).
-
-#### type
-
-Generate the schema field as a TS type alias.
-
-### @grafana
-
-These attributes control code generation behaviors that are specific to Grafana core. Some may also be supported
-in plugin code generators.
-
-#### TSVeneer
-
-Applying a TSVeneer arg to a field in a schema indicates that the schema author wants to enrich the generated type
-(for example by adding generic type parameters), so code generation should expect a handwritten
-[veneer](https://docs.google.com/document/d/13Rv395_T8WTLBgdL-2rbXKu0fx_TW-Q9yz9x6oBjm6g/edit#heading=h.bmtjq0bb1yxp).
-
-TSVeneer requires at least one argval, each of which impacts TypeScript code generation in its own way.
-Multiple argvals may be given, separated by `|`.
-
-A TSVeneer arg has no effect if it is applied to a field that is not exported as a standalone TypeScript type
-(which usually means a CUE field that also has an `@cuetsy(kind=)` attribute).
-
-#### type
-
-A handwritten veneer is needed to refine the raw generated TypeScript type, for example by adding generics.
-See [the dashboard types veneer](https://github.com/grafana/grafana/blob/5f93e67419e9587363d1fc1e6f1f4a8044eb54d0/packages/grafana-schema/src/veneer/dashboard.types.ts)
-for an example, and [some](https://github.com/grafana/grafana/blob/5f93e67419e9587363d1fc1e6f1f4a8044eb54d0/kinds/dashboard/dashboard_kind.cue#L12)
-[corresponding](https://github.com/grafana/grafana/blob/5f93e67419e9587363d1fc1e6f1f4a8044eb54d0/kinds/dashboard/dashboard_kind.cue#L143)
-CUE attributes.
-
-### @grafanamaturity
-
-These attributes are used to support iterative development of a schema towards maturity.
-
-Grafana code generators and CI enforce that schemas marked as mature MUST NOT have any `@grafanamaturity` attributes.
-
-#### NeedsExpertReview
-
-Indicates that a non-expert on that schema wrote the field, and was not fully confident in its type and/or docs.
-
-Primarily useful on very large schemas, like the dashboard schema, for getting _something_ written down for a given
-field that at least makes validation tests pass, but making clear that the field isn’t necessarily properly correct.
-
-No argval is accepted. (Use a `//` comment to say more about the attention that’s needed.)
diff --git a/docs/sources/developers/plugins/plugin.schema.json b/docs/sources/developers/plugins/plugin.schema.json
index f19c1a542c1b2..4947f96e0f242 100644
--- a/docs/sources/developers/plugins/plugin.schema.json
+++ b/docs/sources/developers/plugins/plugin.schema.json
@@ -166,7 +166,7 @@
         "grafanaDependency": {
           "type": "string",
           "description": "Required Grafana version for this plugin. Validated using https://github.com/npm/node-semver.",
-          "pattern": "^(<=|>=|<|>|=|~|\\^)?([0-9]+)(\\.[0-9x\\*]+)(\\.[0-9x\\*]+)?(\\s(<=|>=|<|=>)?([0-9]+)(\\.[0-9x]+)(\\.[0-9x]+))?$"
+          "pattern": "^(<=|>=|<|>|=|~|\\^)?([0-9]+)(\\.[0-9x\\*]+)(\\.[0-9x\\*]+)?(\\s(<=|>=|<|=>)?([0-9]+)(\\.[0-9x]+)(\\.[0-9x]+))?(\\-[0-9]+)?$"
         },
         "plugins": {
           "type": "array",
@@ -272,6 +272,10 @@
             "description": "The minimum role a user must have to see this page in the navigation menu.",
             "enum": ["Admin", "Editor", "Viewer"]
           },
+          "action": {
+            "type": "string",
+            "description": "The RBAC action a user must have to see this page in the navigation menu."
+          },
           "path": {
             "type": "string",
             "description": "Used for app plugins."
@@ -353,6 +357,10 @@
           "reqRole": {
             "type": "string"
           },
+          "reqAction": {
+            "type": "string",
+            "description": "The RBAC action a user must have to use this route."
+          },
           "headers": {
             "type": "array",
             "description": "For data source plugins. Route headers adds HTTP headers to the proxied request."
@@ -478,64 +486,72 @@
       "type": "boolean",
       "description": "For data source plugins, if the plugin supports tracing. Used for example to link logs (e.g. Loki logs) with tracing plugins."
     },
-    "externalServiceRegistration": {
+    "iam": {
       "type": "object",
-      "description": "Oauth App Service Registration.",
+      "description": "Identity and Access Management.",
       "properties": {
-        "impersonation": {
-          "type": "object",
-          "description": "Impersonation describes the permissions that the external service will have on behalf of the user.",
-          "properties": {
-            "enabled": {
-              "type": "boolean",
-              "description": "Enabled allows the service to request access tokens to impersonate users using the jwtbearer grant"
-            },
-            "groups": {
-              "type": "boolean",
-              "description": "Groups allows the service to list the impersonated user's teams."
-            },
-            "permissions": {
-              "type": "array",
-              "description": "Permissions are the permissions that the external service needs when impersonating a user. The intersection of this set with the impersonated user's permission guarantees that the client will not gain more privileges than the impersonated user has.",
-              "items": {
-                "type": "object",
-                "additionalProperties": false,
-                "properties": {
-                  "action": {
-                    "type": "string"
-                  },
-                  "scope": {
-                    "type": "string"
-                  }
-                }
+        "permissions": {
+          "type": "array",
+          "description": "Permissions are the permissions that the plugin needs its associated service account to have",
+          "items": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+              "action": {
+                "type": "string"
+              },
+              "scope": {
+                "type": "string"
               }
             }
           }
-        },
-        "self": {
-          "type": "object",
-          "description": "Self describes the permissions that the external service will have on behalf of itself",
-          "properties": {
-            "enabled": {
-              "type": "boolean",
-              "description": "Enabled allows the service to request access tokens for itself using the client_credentials grant"
-            },
-            "permissions": {
-              "type": "array",
-              "description": "Permissions are the permissions that the external service needs its associated service account to have",
-              "items": {
-                "type": "object",
-                "additionalProperties": false,
-                "properties": {
-                  "action": {
-                    "type": "string"
-                  },
-                  "scope": {
-                    "type": "string"
+        }
+      }
+    },
+    "roles": {
+      "type": "array",
+      "description": "List of RBAC roles and their default assignments.",
+      "items": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "role": {
+            "type": "object",
+            "description": "RBAC role definition to bundle related RBAC permissions on the plugin.",
+            "additionalProperties": false,
+            "properties": {
+              "name": {
+                "type": "string",
+                "description": "Display name of the role."
+              },
+              "description": {
+                "type": "string",
+                "description": "Describe the aim of the role."
+              },
+              "permissions": {
+                "type": "array",
+                "description": "RBAC permission on the plugin.",
+                "items": {
+                  "type": "object",
+                  "additionalProperties": false,
+                  "properties": {
+                    "action": {
+                      "type": "string"
+                    },
+                    "scope": {
+                      "type": "string"
+                    }
                   }
                 }
               }
             }
+          },
+          "grants": {
+            "type": "array",
+            "description": "Default assignments of the role to Grafana basic roles (Viewer, Editor, Admin, Grafana Admin)",
+            "items": {
+              "type": "string"
+            }
           }
         }
       }
diff --git a/docs/sources/explore/_index.md b/docs/sources/explore/_index.md
index a6175ec073b4d..eed69a7ba2868 100644
--- a/docs/sources/explore/_index.md
+++ b/docs/sources/explore/_index.md
@@ -25,14 +25,22 @@ If you just want to explore your data and do not want to create a dashboard, the
 - [Query management in Explore]({{< relref "query-management/" >}})
 - [Logs integration in Explore]({{< relref "logs-integration/" >}})
 - [Trace integration in Explore]({{< relref "trace-integration/" >}})
+- [Explore metrics]({{< relref "explore-metrics/" >}})
+- [Correlations Editor in Explore]({{< relref "correlations-editor-in-explore/" >}})
 - [Inspector in Explore]({{< relref "explore-inspector/" >}})
 
 ## Start exploring
 
+{{< youtube id="1q3YzX2DDM4" >}}
+
 > Refer to [Role-based access Control]({{< relref "../administration/roles-and-permissions/access-control/" >}}) in Grafana Enterprise to understand how you can manage Explore with role-based permissions.
 
 In order to access Explore, you must have an editor or an administrator role, unless the [viewers_can_edit option]({{< relref "../setup-grafana/configure-grafana/#viewers_can_edit" >}}) is enabled. Refer to [About users and permissions]({{< relref "../administration/roles-and-permissions/" >}}) for more information on what each role has access to.
 
+{{% admonition type="note" %}}
+If you are using Grafana Cloud, open a [support ticket in the Cloud Portal](/profile/org#support) to enable the `viewers_can_edit` option
+{{% /admonition %}}
+
 To access Explore:
 
 1. Click on the Explore icon on the menu bar.
@@ -83,6 +91,10 @@ You can then click on any panel icon in the content outline to navigate to that
 
 When using Explore, the URL in the browser address bar updates as you make changes to the queries. You can share or bookmark this URL.
 
+{{% admonition type="note" %}}
+Explore may generate relatively long URLs, some tools, like messaging or videoconferencing apps, may truncate messages to a fixed length. In such cases Explore will display a warning message and load a default state. If you encounter issues when sharing Explore links in such apps, you can generate shortened links. See [Share shortened link](#share-shortened-link) for more information.
+{{% /admonition %}}
+
 ### Generating Explore URLs from external tools
 
 Because Explore URLs have a defined structure, you can build a URL from external tools and open it in Grafana. The URL structure is:
@@ -125,4 +137,14 @@ The `from` and `to` also accept relative ranges defined in [Time units and relat
 Available in Grafana 7.3 and later versions.
 {{% /admonition %}}
 
-The Share shortened link capability allows you to create smaller and simpler URLs of the format /goto/:uid instead of using longer URLs with query parameters. To create a shortened link to the executed query, click the **Share** option in the Explore toolbar. A shortened link that is never used will automatically get deleted after seven (7) days.
+The Share shortened link capability allows you to create smaller and simpler URLs of the format /goto/:uid instead of using longer URLs with query parameters. To create a shortened link to the executed query, click the **Share** option in the Explore toolbar.
+
+A shortened link will automatically get deleted after seven (7) days from its creation if it's never used. If a link is used at least once, it won't ever get deleted.
+
+### Sharing shortened links with absolute time
+
+{{% admonition type="note" %}}
+Available in Grafana 10.3 and later versions.
+{{% /admonition %}}
+
+Short links have two options - keeping relative time (for example, from two hours ago to now) or absolute time (for example, from 8am to 10am). Sharing a shortened link by default will copy the time range selected, relative or absolute. Clicking the dropdown button next to the share shortened link button and selecting one of the options under "Time-Sync URL Links" will allow you to create a short link with the absolute time - meaning anyone receiving the link will see the same data you are seeing, even if they open the link at another time. This will not affect your selected time range.
diff --git a/docs/sources/explore/correlations-editor-in-explore.md b/docs/sources/explore/correlations-editor-in-explore.md
new file mode 100644
index 0000000000000..04ba3c709c831
--- /dev/null
+++ b/docs/sources/explore/correlations-editor-in-explore.md
@@ -0,0 +1,136 @@
+---
+labels:
+  products:
+    - enterprise
+    - oss
+title: Correlations Editor in Explore
+weight: 400
+---
+
+# Correlations Editor in Explore
+
+{{% admonition type="note" %}}
+The Explore editor is available in 10.1 and later versions. In the editor, transformations is available in Grafana 10.3 and later versions.
+{{% /admonition %}}
+
+Correlations allow users to build a link between any two data sources. For more information about correlations in general, please see the [correlations]({{< relref "../administration/correlations" >}}) topic in the administration page.
+
+## Create a correlation
+
+1. In Grafana, navigate to the Explore page.
+1. Select a data source that you would like to be [the source data source]({{< relref "../administration/correlations/correlation-configuration#source-data-source-and-result-field" >}}) for a new correlation.
+1. Run a query producing data in [a supported visualization]({{< relref "../administration/correlations#correlations" >}}).
+1. Click **+ Add** in the top toolbar and select **Add correlation** (you can also select **Correlations Editor** from the [Command Palette]({{< relref "../search#command-palette" >}})).
+1. Explore is now in Correlations Editor mode indicated by a blue border and top bar. You can exit Correlations Editor by clicking **Exit** in the top bar.
+1. You can now create the following new correlations for the visualization with links that are attached to the data that you can use to build a new query:
+   - Logs: links are displayed next to field values inside log details for each log row
+   - Table: every table cell is a link
+1. Click on a link to add a new correlation.
+   Links are associated with a field that is used as a [result field of a correlation]({{< relref "../administration/correlations/correlation-configuration" >}}).
+1. In the split view that opens, use the right pane to set up [the target query source of the correlation]({{< relref "../administration/correlations/correlation-configuration#target-query" >}}).
+1. Build a target query using [variables syntax]({{< relref "../dashboards/variables/variable-syntax" >}}) with variables from the list provided at the top of the pane. The list contains sample values from the selected data row.
+1. Provide a label and description (optional).
+   A label will be used as the name of the link inside the visualization and can contain variables.
+1. Provide transformations (optional; see below for details).
+1. Click **Save** in the top toolbar to save the correlation and exit Correlations Editor mode.
+   The link used to create the correlation is replaced with a data link in each row. When the link is clicked, the query you defined will run in another pane, with the variables replaced dynamically with the values from the selected row.
+
+## Transformations
+
+Transformations allow you to extract values that exist in a field with other data. For example, using a transformation, you can extract one portion of a log line to use in a correlation. For more details on transformations in correlations, see [Correlations]({{< relref "../administration/correlations/correlation-configuration/#correlation-transformations" >}}).
+
+After clicking one of the generated links in the editor mode, you can add transformations by clicking **Add transformation** in the Transformations dropdown menu.
+
+You can use a transformation in your correlation with the following steps:
+
+1. Select a field to apply the transformation to.
+   Select the portion of the field that you want to use for the transformation. For example, a log line.
+   Once selected, the value of this field will be used to assist you in building the transformation.
+1. Select the type of the transformation.
+   See [correlations]({{< relref "../administration/correlations/correlation-configuration/#correlation-transformations" >}}) for the options and relevant settings.
+1. Based on your selection, you might see one or more variables populate, or you might need to provide more specifications in options that are displayed.
+1. Select **Add transformation to correlation** to add the specified variables to the list of available variables.
+
+### Notes for regular expressions
+
+For regular expressions in this dialog box, the `mapValue` referred to in other documentation is called `Variable Name` here. Grafana highlights any text that matches the expression in the field value. Use regular expression capture groups to select what portion of the match should be extracted. When a valid regular expression is provided, the variable and the value of that variable appear below the `Variable Name` field.
+
+## Correlations examples
+
+The following examples show how to create correlations using the Correlations Editor in Explore. If you'd like to follow these examples, make sure to set up a [test data source]({{< relref "../datasources/testdata#testdata-data-source" >}}).
+
+### Create a text to graph correlation
+
+This example shows how to create a correlation using Correlations Editor in Explore.
+
+Correlations allow you to use results of one query to run a new query in any data source. In this example, you will run a query that renders tabular data. The data will be used to run a different query that yields a graph result.
+
+To follow this example, make sure you have set up [a test data source]({{< relref "../datasources/testdata#testdata-data-source" >}}).
+
+1. In Grafana, navigate to **Explore**.
+1. Select the **test data source** from the dropdown menu at the top left of the page.
+1. Click **+ Add** in the dropdown menu to the right and select **Add correlation**.
+1. Explore is now in Correlations Editor mode, indicated by a blue border.
+1. Select the following scenario from the scenario dropdown menu: **CSV File**.
+1. Select the file, **population_by_state.csv**.
+   Each cell is a link that you can click on to begin creating a new correlation.
+
+   {{< figure src="/static/img/docs/correlations/screenshot-correlations-editor-source-10.2.png" max-width="600px" caption="Selecting the source of a correlation" >}}
+
+1. Click on any cell in the `State` column to create a new correlation that attaches a data link to that entry. For example, select "California".
+1. In the split view, select the same data source you selected in the left pane.
+   The helper above the query editor contains all available variables you can use the target query. Variables contain all data fields (table columns) from the selected row.
+1. In the **Scenario** menu, select **CSV Metric Values**.
+   The `String Input` field in the Query editor provides variables with population values for each year: `${1980},${2000},${2020}`. This will generate a graph using variable values.
+1. In the Query Editor **Alias** field, enter "${State}".
+
+   {{< figure src="/static/img/docs/correlations/screenshot-correlations-editor-target-10.2.png" max-width="600px" caption="Setting up the target of a correlation" >}}
+
+   Run a query to see that it produces a graph using sample values from the variables.
+
+1. Click **Save** to save the correlation and exit the Correlations Editor.
+
+   After the correlation is saved, Explore will rerun the query in the left pane. By clicking a state name, the query on the right is rerun with values from the row being inserted into the CSV, thus changing the graph. The query is rerun with updated values every time you click on a state name.
+
+   {{< figure src="/static/img/docs/correlations/screenshot-correlations-example-link-10.2.png" max-width="600px" caption="Result of clicking on a data link" >}}
+
+You can apply the same steps to any data source. Correlations allow you to create links in visualizations to run dynamic queries based on selected data. In this example we used data returned by a query to build a new query generating different visualization using the same data source. However, you can create correlations between any data sources to create custom exploration flows.
+
+### Create a logs to table correlation
+
+In this example, you will create a correlation to demonstrate how to use transformations to extract values from the log line and another field.
+
+To follow this example, make sure you have set up [a test data source]({{< relref "../datasources/testdata#testdata-data-source" >}}).
+
+1. In Grafana, navigate to **Explore**.
+1. Select the **test data source** from the dropdown menu at the top left of the page.
+1. Click **+ Add** in the dropdown menu to the right and select **Add correlation**.
+1. Explore is now in Correlations Editor mode, indicated by a blue border.
+1. In the **Scenario** menu, select **Logs**.
+1. Expand a log line to see the correlation links. Select `Correlate with hostname`.
+1. Explore opens in split view. Select the same data source you selected in the left pane.
+   The helper above the query editor contains all available variables you can use the target query.
+1. Expand the transformations section, and click **Add transformation**.
+1. In the **Field** dropdown menu, select **message**.
+   The log line shows up as example data.
+1. Under **Type**, select **Logfmt**.
+   This populates the list of variables.
+1. Click **Add transformation to correlation**.
+1. Click **Add transformation** again and under **Field**, select **hostname**.
+1. Under **Type**, select **Regular expression**.
+1. Under **Expression**, enter the following:
+   `-([0-9]\*)`
+   This selects any numbers to the right of the dash.
+1. Under **Variable Name**, enter the following:
+   hostNumber
+   This populates the list of variables.
+1. Click **Add transformation to correlation** to add it to the other variables.
+1. In the data source editor, open the **Scenario** dropdown menu and select **CSV Content**.
+1. In the text box below, provide the following and save the correlation:
+
+   ```csv
+   time,msg,hostNumber,status
+   ${time},${msg},${hostNumber},${status}
+   ```
+
+   This closes the split view and reruns the left query. Expand any log line to see the correlation button. Clicking the correlation button opens the split view with the `time` (a field), `msg` (extracted with `logfmt` from the log line), host number (extracted with `regex` from the `hostname`) and the `status` (extracted with `logfmt` from the log line).
diff --git a/docs/sources/explore/explore-metrics.md b/docs/sources/explore/explore-metrics.md
new file mode 100644
index 0000000000000..6ad02a1d82409
--- /dev/null
+++ b/docs/sources/explore/explore-metrics.md
@@ -0,0 +1,72 @@
+---
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Explore Metrics
+aliases:
+description: This topic describes the Explore Metrics feature
+weight: 200
+---
+
+# Grafana Explore Metrics
+
+Grafana Explore Metrics is a query-less experience for browsing **Prometheus-compatible** metrics. Quickly find related metrics with just a few simple clicks, without needing to write PromQL queries to retrieve metrics.
+
+{{% admonition type="caution" %}}
+Explore Metrics is currently in [public preview](/docs/release-life-cycle/). Grafana Labs offers limited support, and breaking changes might occur prior to the feature being made generally available.
+{{% /admonition %}}
+
+With Explore Metrics, you can:
+
+- easily slice and dice metrics based on their labels, so you can immediately see anomalies and identify issues
+- see the right visualization for your metric based on its type (gauge vs. counter, for example) without building it yourself
+- surface other metrics relevant to the current metric
+- “explore in a drawer” - expand a drawer over a dashboard with more content so you don’t lose your place
+- view a history of user steps when navigating through metrics and their filters
+<!-- - easily pivot to other related telemetry, including logs or traces -->
+
+You can access Explore Metrics either as a standalone experience or as part of Grafana dashboards.
+
+## Standalone experience
+
+To access Explore Metrics as a standalone experience:
+
+1. Click the arrow next to **Explore** in the Grafana left-side menu and click **Metrics**. You are taken to an overview page that shows recent metrics, bookmarks, and the option to select a new metric exploration.
+1. To get started with a new exploration, click **+ New metric exploration**.
+1. Select **Prometheus** or any Prometheus-compatible data source available in the drop-down menu under **Data source**.
+1. Click **+ Add label** to select a label-value pair from the drop-down menu. You can add multiple label-value pairs. A label type will appear above the selected label with a drop-down list of options from which to choose. For example, if you select the label `container` a drop-down list of available containers appears.
+1. You can also search for metrics using keywords under **Search metrics** in the search bar.
+1. Use the time picker to select a date and time range from the drop-down menu or use an absolute time range.
+1. Click the down arrow next to the **Refresh** icon to set a refresh rate from the drop-down menu. The default is `Off`.
+1. Click the **Settings** icon and toggle **Always keep selected metric graph in-view** to keep your main graph always in view on the Breakdown drill-down tab.
+
+The **History** button in the upper left corner tracks every step navigating through metric exploration.
+
+![show metrics explore overview](/media/metrics-explore/metrics-explore-overview.png)
+
+### Metrics exploration
+
+To further explore a metric, click **Select** in the upper right corner of the metric visualization.
+
+![show select box](/media/metrics-explore/select-metric.png)
+
+- The **Overview** tab provides a description for each metric, as well as the metric `type` and `unit` associated with the metric. It also provides a list of labels associated with the metric. Click on any label to view drill-down visualizations.
+- The **Breakdown** tab depicts time series visualizations for each of the label-value pairs for the selected metric. You can further drill down on each label and click **Add to filter** to add the label/value pair into your filters. You can also change the **View** from grid to rows.
+- The **Related metrics** tab depicts related metrics with relevant key words. You can repeat the drill down process for any related metric. Toggle **SHow previews** to preview visualizations.
+
+Once you have gathered your metrics exploration data you can:
+
+- Click the **Explore** icon on the right side to open the graph in Explore, where you can modify the query or add the graph to a dashboard or incident.
+- Click the **Share** icon on the right side to copy the metric drill down URL to the clipboard so it can be shared.
+- Click the **Star** icon on the right side to bookmark and save the metrics exploration.
+
+## Dashboard experience
+
+To access Explore Metrics via a dashboard:
+
+1. Navigate to your dashboard.
+1. Select a time series panel.
+1. Click the panel menu in the upper right and select **Explore Metrics**. If there are multiple metrics, click on the one you want to explore.
+1. You will see a slide out drawer with the Metrics Experience, starting with the drill down. You can access the standalone experience by clicking **Open** in the upper right.
diff --git a/docs/sources/explore/logs-integration.md b/docs/sources/explore/logs-integration.md
index e1cde45c8a4ec..92ffc6eabe7aa 100644
--- a/docs/sources/explore/logs-integration.md
+++ b/docs/sources/explore/logs-integration.md
@@ -21,6 +21,7 @@ Explore is a powerful tool for logging and log analysis. It allows you to invest
 - [Cloudwatch]({{< relref "../datasources/aws-cloudwatch" >}})
 - [InfluxDB]({{< relref "../datasources/influxdb" >}})
 - [Azure Monitor]({{< relref "../datasources/azure-monitor" >}})
+- [ClickHouse](https://github.com/grafana/clickhouse-datasource)
 
 With Explore, you can efficiently monitor, troubleshoot, and respond to incidents by analyzing your logs and identifying the root causes. It also helps you to correlate logs with other telemetry signals such as metrics, traces or profiles, by viewing them side-by-side.
 
@@ -130,6 +131,8 @@ You may encounter long lines of text that make it difficult to read and analyze
 
 The **Open in split view** button allows you to execute the context query for a log entry in a split screen in the Explore view. Clicking this button will open a new Explore pane with the context query displayed alongside the log entry, making it easier to analyze and understand the surrounding context.
 
+The log context query can also be opened in a new browser tab by pressing the Cmd/Ctrl button while clicking on the button to open the context modal. When opened in a new tab, the previously selected filters are applied as well.
+
 ### Copy log line
 
 You can easily copy the content of a selected log line to your clipboard by clicking on the `Copy log line` button.
diff --git a/docs/sources/explore/trace-integration.md b/docs/sources/explore/trace-integration.md
index 5b2d19b35fe38..59408b5676502 100644
--- a/docs/sources/explore/trace-integration.md
+++ b/docs/sources/explore/trace-integration.md
@@ -23,6 +23,7 @@ Supported data sources are:
 - [Zipkin]({{< relref "../datasources/zipkin/" >}})
 - [X-Ray](https://grafana.com/grafana/plugins/grafana-x-ray-datasource)
 - [Azure Monitor Application Insights]({{< relref "../datasources/azure-monitor/" >}})
+- [ClickHouse](https://github.com/grafana/clickhouse-datasource)
 
 For information on how to configure queries for the data sources listed above, refer to the documentation for specific data source.
 
@@ -30,7 +31,7 @@ For information on how to configure queries for the data sources listed above, r
 
 You can query and search tracing data using a data source's query editor.
 
-Each data source can have it's own query editor. The query editor for the Tempo data source is slightly different than the query editor for the Jaegar data source.
+Each data source can have it's own query editor. The query editor for the Tempo data source is slightly different than the query editor for the Jaeger data source.
 
 For information on querying each data source, refer to their documentation:
 
@@ -38,8 +39,9 @@ For information on querying each data source, refer to their documentation:
 - [Jaeger query editor]({{< relref "../datasources/jaeger/#query-the-data-source" >}})
 - [Zipkin query editor]({{< relref "../datasources/zipkin/#query-the-data-source" >}})
 - [Azure Monitor Application Insights query editor]({{< relref "../datasources/azure-monitor/query-editor/#query-application-insights-traces" >}})
+- [ClickHouse query editor](https://clickhouse.com/docs/en/integrations/grafana/query-builder#traces)
 
-## Trace View
+## Trace view
 
 This section explains the elements of the Trace View.
 
@@ -59,7 +61,7 @@ This section explains the elements of the Trace View.
 
 Shows condensed view or the trace timeline. Drag your mouse over the minimap to zoom into smaller time range. Zooming will also update the main timeline, so it is easy to see shorter spans. Hovering over the minimap, when zoomed, will show Reset Selection button which resets the zoom.
 
-### Span Filters
+### Span filters
 
 ![Screenshot of span filtering](/media/docs/tempo/screenshot-grafana-tempo-span-filters-v10-1.png)
 
@@ -67,13 +69,15 @@ Using span filters, you can filter your spans in the trace timeline viewer. The
 
 You can add one or more of the following filters:
 
-- Service name
+- Resource service name
 - Span name
 - Duration
 - Tags (which include tags, process tags, and log fields)
 
 To only show the spans you have matched, you can press the `Show matches only` toggle.
 
+{{< youtube id="VP2XV3IIc80" >}}
+
 ### Timeline
 
 {{< figure src="/media/docs/tempo/screenshot-grafana-trace-view-timeline.png" class="docs-image--no-shadow" max-width= "900px"  caption="Screenshot of the trace view timeline" >}}
@@ -99,10 +103,6 @@ Clicking anywhere on the span row shows span details.
 
 ### Trace to logs
 
-{{% admonition type="note" %}}
-Available in Grafana 7.4 and later versions.
-{{% /admonition %}}
-
 You can navigate from a span in a trace view directly to logs relevant for that span. This feature is available for Tempo, Jaeger, and Zipkin data sources. Refer to their [relevant documentation](/docs/grafana/latest/datasources/tempo/#trace-to-logs) for configuration instructions.
 
 {{< figure src="/media/docs/tempo/screenshot-grafana-trace-view-trace-to-logs.png" class="docs-image--no-shadow" max-width= "900px" caption="Screenshot of the trace view in Explore with icon next to the spans" >}}
@@ -112,12 +112,19 @@ Click the document icon to open a split view in Explore with the configured data
 ### Trace to metrics
 
 {{% admonition type="note" %}}
-This feature is currently in beta & behind the `traceToMetrics` feature toggle.
+This feature is currently in beta and behind the `traceToMetrics` feature toggle.
 {{% /admonition %}}
 
-You can navigate from a span in a trace view directly to metrics relevant for that span. This feature is available for Tempo, Jaeger, and Zipkin data sources. Refer to their [relevant documentation](/docs/grafana/latest/datasources/tempo/#trace-to-metrics) for configuration instructions.
+You can navigate from a span in a trace view directly to metrics relevant for that span. This feature is available for Tempo, Jaeger, and Zipkin data sources. Refer to their [relevant documentation](/docs/grafana/latest/datasources/tempo/configure-tempo-data-source/#trace-to-metrics) for configuration instructions.
+
+### Trace to profiles
+
+Using Trace to profiles, you can use Grafana’s ability to correlate different signals by adding the functionality to link between traces and profiles.
+Refer to the [relevant documentation](/docs/grafana/latest/datasources/tempo/configure-tempo-data-source#trace-to-profiles) for configuration instructions.
+
+{{< figure src="/static/img/docs/tempo/profiles/tempo-trace-to-profile.png" max-width="900px" class="docs-image--no-shadow" alt="Selecting a link in the span queries the profile data source" >}}
 
-## Node Graph
+## Node graph
 
 You can optionally expand the node graph for the displayed trace. Depending on the data source, this can show spans of the trace as nodes in the graph, or as some additional context like service graph based on the current trace.
 
diff --git a/docs/sources/fundamentals/intro-histograms/index.md b/docs/sources/fundamentals/intro-histograms/index.md
index 4b78139e3910e..21b1c85e866b7 100644
--- a/docs/sources/fundamentals/intro-histograms/index.md
+++ b/docs/sources/fundamentals/intro-histograms/index.md
@@ -32,7 +32,7 @@ and the bar height represents the frequency (such as count) of values that fell
 This _histogram_ shows the value distribution of a couple of time series. You can easily see that
 most values land between 240-300 with a peak between 260-280.
 
-![](/static/img/docs/v43/heatmap_histogram.png)
+![Histogram example](/static/img/docs/v43/heatmap_histogram.png)
 
 Here is an example showing height distribution of people.
 
@@ -48,7 +48,7 @@ A _heatmap_ is like a histogram, but over time, where each time slice represents
 
 In this example, you can clearly see what values are more common and how they trend over time.
 
-![](/static/img/docs/v43/heatmap_histogram_over_time.png)
+![Heatmap example](/static/img/docs/v43/heatmap_histogram_over_time.png)
 
 For more information about heatmap visualization options, refer to [Heatmap][heatmap].
 
diff --git a/docs/sources/fundamentals/intro-to-prometheus/index.md b/docs/sources/fundamentals/intro-to-prometheus/index.md
index 3217abc965cfd..6fa0023c62f9f 100644
--- a/docs/sources/fundamentals/intro-to-prometheus/index.md
+++ b/docs/sources/fundamentals/intro-to-prometheus/index.md
@@ -1,6 +1,7 @@
 ---
 aliases:
   - ../basics/timeseries/
+  - /docs/grafana-cloud/introduction/prometheus/
 description: Introduction to Prometheus
 keywords:
   - grafana
diff --git a/docs/sources/fundamentals/timeseries-dimensions/index.md b/docs/sources/fundamentals/timeseries-dimensions/index.md
index aeaa2182942b7..3e1e73d502273 100644
--- a/docs/sources/fundamentals/timeseries-dimensions/index.md
+++ b/docs/sources/fundamentals/timeseries-dimensions/index.md
@@ -3,6 +3,7 @@ aliases:
   - ../basics/timeseries-dimensions/
   - ../getting-started/timeseries-dimensions/
   - ../guides/timeseries-dimensions/
+  - /docs/grafana-cloud/introduction/timeseries-dimensions/
 description: time series dimensions
 keywords:
   - grafana
@@ -28,7 +29,7 @@ In [Introduction to time series][time-series-databases], the concept of _labels_
 
 With time series data, the data often contain more than a single series, and is a set of multiple time series. Many Grafana data sources support this type of data.
 
-{{< figure src="/static/img/docs/example_graph_multi_dim.png" class="docs-image--no-shadow" max-width="850px" >}}
+{{< figure src="/static/img/docs/example_graph_multi_dim.png" class="docs-image--no-shadow" max-width="850px" alt="Temperature by location" >}}
 
 The common case is issuing a single query for a measurement with one or more additional properties as dimensions. For example, querying a temperature measurement along with a location property. In this case, multiple series are returned back from that single query and each series has unique location as a dimension.
 
diff --git a/docs/sources/fundamentals/timeseries/index.md b/docs/sources/fundamentals/timeseries/index.md
index f95f6e6aa416a..aaa0df85d3c9a 100644
--- a/docs/sources/fundamentals/timeseries/index.md
+++ b/docs/sources/fundamentals/timeseries/index.md
@@ -1,6 +1,7 @@
 ---
 aliases:
   - ../basics/timeseries/
+  - /docs/grafana-cloud/introduction/timeseries/
 description: Introduction to time series
 keywords:
   - grafana
@@ -31,7 +32,7 @@ Temperature data like this is one example of what we call a _time series_ — a
 
 Tables are useful when you want to identify individual measurements, but they make it difficult to see the big picture. A more common visualization for time series is the _graph_, which instead places each measurement along a time axis. Visual representations like the graph make it easier to discover patterns and features of the data that otherwise would be difficult to see.
 
-{{< figure src="/static/img/docs/example_graph.png" class="docs-image--no-shadow" max-width="850px" >}}
+{{< figure src="/static/img/docs/example_graph.png" class="docs-image--no-shadow" max-width="850px" alt="Temperature data displayed on dashboard" >}}
 
 Temperature data like the one in the example, is far from the only example of a time series. Other examples of time series are:
 
diff --git a/docs/sources/getting-started/build-first-dashboard.md b/docs/sources/getting-started/build-first-dashboard.md
index 47783916f7b1a..6b21909b9a570 100644
--- a/docs/sources/getting-started/build-first-dashboard.md
+++ b/docs/sources/getting-started/build-first-dashboard.md
@@ -35,7 +35,7 @@ To sign in to Grafana for the first time:
 1. On the sign-in page, enter `admin` for both the username and password.
 1. Click **Sign in**.
 
-   If successful, you will see a prompt to change the password.
+   If successful, you'll see a prompt to change the password.
 
 1. Click **OK** on the prompt and change your password.
 
@@ -50,14 +50,14 @@ If you've already set up a data source that you know how to query, refer to [Cre
 To create your first dashboard using the built-in `-- Grafana --` data source:
 
 1. Click **Dashboards** in the left-side menu.
-1. On the Dashboards page, click **New** and select **New Dashboard** from the dropdown menu.
+1. On the Dashboards page, click **New** and select **New Dashboard** from the drop-down menu.
 1. On the dashboard, click **+ Add visualization**.
 
    ![Empty dashboard state](/media/docs/grafana/dashboards/empty-dashboard-10.2.png)
 
-1. In the modal that opens, click `-- Grafana --`:
+1. In the dialog box that opens, click `-- Grafana --`:
 
-   {{< figure class="float-right"  src="/media/docs/grafana/dashboards/screenshot-data-source-selector-10.0.png" max-width="800px" alt="Select data source modal" >}}
+   {{< figure class="float-right"  src="/media/docs/grafana/dashboards/screenshot-data-source-selector-10.0.png" max-width="800px" alt="Select data source dialog box" >}}
 
    This configures your [query]({{< relref "../panels-visualizations/query-transform-data#add-a-query" >}}) and generates the Random Walk dashboard.
 
@@ -69,13 +69,13 @@ To create your first dashboard using the built-in `-- Grafana --` data source:
 
    Alternatively, click **Apply** if you want to see your changes applied to the dashboard first. Then click the save icon in the dashboard header.
 
-1. Add a descriptive name for the dashboard, and then click **Save**.
+1. Add a descriptive title for the dashboard, or have Grafana create one using [generative AI features](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/manage-dashboards#set-up-generative-ai-features-for-dashboards), and then click **Save**.
 
-Congratulations, you have created your first dashboard and it is displaying results.
+Congratulations, you have created your first dashboard and it's displaying results.
 
 #### Next steps
 
-Continue to experiment with what you have built, try the [explore workflow]({{< relref "../explore" >}}) or another visualization feature. Refer to [Data sources]({{< relref "../datasources" >}}) for a list of supported data sources and instructions on how to [add a data source]({{< relref "../administration/data-source-management#add-a-data-source" >}}). The following topics will be of interest to you:
+Continue to experiment with what you have built, try the [explore workflow]({{< relref "../explore" >}}) or another visualization feature. Refer to [Data sources]({{< relref "../datasources" >}}) for a list of supported data sources and instructions on how to [add a data source]({{< relref "../datasources#add-a-data-source" >}}). The following topics will be of interest to you:
 
 - [Panels and visualizations]({{< relref "../panels-visualizations" >}})
 - [Dashboards]({{< relref "../dashboards" >}})
diff --git a/docs/sources/getting-started/get-started-grafana-influxdb.md b/docs/sources/getting-started/get-started-grafana-influxdb.md
index c257014ae35c2..d6a163a1219a4 100644
--- a/docs/sources/getting-started/get-started-grafana-influxdb.md
+++ b/docs/sources/getting-started/get-started-grafana-influxdb.md
@@ -38,7 +38,7 @@ Windows users might need to make additional adjustments. Look for special instru
 
 You can have more than one InfluxDB data source defined in Grafana.
 
-1. Follow the general instructions to [add a data source]({{< relref "../administration/data-source-management#add-a-data-source" >}}).
+1. Follow the general instructions to [add a data source]({{< relref "../datasources#add-a-data-source" >}}).
 1. Decide if you will use InfluxQL or Flux as your query language.
    - [Configure the data source]({{< relref "../datasources/influxdb#configure-the-data-source" >}}) for your chosen query language.
      Each query language has its own unique data source settings.
diff --git a/docs/sources/getting-started/get-started-grafana-ms-sql-server.md b/docs/sources/getting-started/get-started-grafana-ms-sql-server.md
index b9f0a95fa476c..2ca4dcac2b4fe 100644
--- a/docs/sources/getting-started/get-started-grafana-ms-sql-server.md
+++ b/docs/sources/getting-started/get-started-grafana-ms-sql-server.md
@@ -28,18 +28,60 @@ If you are on a Windows host but want to use Grafana and MS SQL data source on a
 
 #### Add the MS SQL data source
 
+There are several ways to authenticate in MSSQL. Start by:
+
 1. Click **Connections** in the left-side menu and filter by `mssql`.
 1. Select the **Microsoft SQL Server** option.
 1. Click **Create a Microsoft SQL Server data source** in the top right corner to open the configuration page.
-1. Enter the information specified in the table below, then click **Save & test**.
+1. Select the desired authentication method and fill in the right information as detailed below.
+1. Click **Save & test**.
+
+##### General configuration
 
 | Name       | Description                                                                                                           |
 | ---------- | --------------------------------------------------------------------------------------------------------------------- |
 | `Name`     | The data source name. This is how you refer to the data source in panels and queries.                                 |
 | `Host`     | The IP address/hostname and optional port of your MS SQL instance. If port is omitted, the default 1433 will be used. |
 | `Database` | Name of your MS SQL database.                                                                                         |
-| `User`     | Database user's login/username.                                                                                       |
-| `Password` | Database user's password.                                                                                             |
+
+##### SQL Server Authentication
+
+| Name       | Description                     |
+| ---------- | ------------------------------- |
+| `User`     | Database user's login/username. |
+| `Password` | Database user's password.       |
+
+##### Windows Active Directory (Kerberos)
+
+Below are the four possible ways to authenticate via Windows Active Directory/Kerberos.
+
+{{< admonition type="note" >}}
+Windows Active Directory (Kerberos) authentication is not supported in Grafana Cloud at the moment.
+{{< /admonition >}}
+
+| Method                    | Description                                                                                                                                                  |
+| ------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| **Username + password**   | Enter the domain user and password                                                                                                                           |
+| **Keytab file**           | Specify the path to a valid keytab file to use that for authentication.                                                                                      |
+| **Credential cache**      | Log in on the host via `kinit` and pass the path to the credential cache. The cache path can be found by running `klist` on the host in question.            |
+| **Credential cache file** | This option allows multiple valid configurations to be present and matching is performed on host, database, and user. See the example JSON below this table. |
+
+```json
+[
+  {
+    "user": "grot@GF.LAB",
+    "database": "dbone",
+    "address": "mysql1.mydomain.com:3306",
+    "credentialCache": "/tmp/krb5cc_1000"
+  },
+  {
+    "user": "grot@GF.LAB",
+    "database": "dbtwo",
+    "address": "mysql2.gf.lab",
+    "credentialCache": "/tmp/krb5cc_1000"
+  }
+]
+```
 
 For installations from the [grafana/grafana](https://github.com/grafana/grafana/tree/main) repository, `gdev-mssql` data source is available. Once you add this data source, you can use the `Datasource tests - MSSQL` dashboard with three panels showing metrics generated from a test database.
 
diff --git a/docs/sources/introduction/_index.md b/docs/sources/introduction/_index.md
index dd2d77bef719d..59a08a700b9fb 100644
--- a/docs/sources/introduction/_index.md
+++ b/docs/sources/introduction/_index.md
@@ -78,4 +78,14 @@ In addition to Grafana, Grafana Labs also provides the following open source pro
 
 **Grafana Mimir:** Grafana Mimir is an open source software project that provides a scalable long-term storage for Prometheus. For more information about Grafana Mimir, refer to [Grafana Mimir documentation](/docs/mimir/latest/).
 
-**Grafana Phlare:** Grafana Phlare is an open-source software project for aggregating continuous profiling data. Continuous profiling is an observability signal that enables you to understand your workload's resource (CPU, memory, etc.) usage to the exact line number. For more information about using Grafana Phlare, refer to [Grafana Phlare documentation](/docs/phlare/latest/).
+**Grafana Pyroscope:** Grafana Pyroscope is an open source software project for aggregating continuous profiling data. Continuous profiling is an observability signal that allows you to understand your workload's resources (CPU, memory, for example) usage down to the line number. For more information about Grafana Pyroscope, refer to [Grafana Pyroscope documentation](/docs/pyroscope/latest/).
+
+**Grafana Faro:** Grafana Faro is an open source JavaScript agent that embeds in web applications to collect real user monitoring (RUM) data: performance metrics, logs, exceptions, events, and traces. For more information about using Grafana Faro, refer to [Grafana Faro documentation](/docs/grafana-cloud/monitor-applications/frontend-observability/faro-web-sdk/).
+
+**Grafana Beyla:** Grafana Beyla is an eBPF-based application auto-instrumentation tool for application observability. eBPF is used to automatically inspect application executables and the OS networking layer as well as capture basic trace spans related to web transactions and Rate-Errors-Duration (RED) metrics for Linux HTTP/S and gRPC services. All data capture occurs without any modifications to application code or configuration. For more information about Grafana Beyla, refer to [Grafana Beyla documentation](/docs/beyla/latest/).
+
+**Grafana Agent:** Grafana Agent is a vendor-neutral, batteries-included telemetry collector with configuration inspired by Terraform. It is designed to be flexible, performant, and compatible with multiple ecosystems such as Prometheus and OpenTelemetry. For more information about Grafana Agent, refer to [Grafana Agent documentation](/docs/agent/latest/).
+
+**Grafana k6:** Grafana k6 is an open-source load testing tool that makes performance testing easy and productive for engineering teams. For more information about Grafana k6, refer to [Grafana k6 documentation](/docs/k6/latest/).
+
+**Grafana OnCall:** Grafana OnCall is an open source incident response management tool built to help teams improve their collaboration and resolve incidents faster. For more information about Grafana OnCall, refer to [Grafana OnCall documentation](/docs/oncall/latest/).
diff --git a/docs/sources/introduction/grafana-enterprise.md b/docs/sources/introduction/grafana-enterprise.md
index 2de825d6c5777..234cca9bcf1b1 100644
--- a/docs/sources/introduction/grafana-enterprise.md
+++ b/docs/sources/introduction/grafana-enterprise.md
@@ -21,6 +21,8 @@ To learn more about Grafana Enterprise, refer to [our product page](/enterprise)
 
 Many Grafana Enterprise features are also available in [Grafana Cloud](/docs/grafana-cloud) Free, Pro, and Advanced accounts. For details, refer to [the Grafana Cloud features table](/pricing/#featuresTable).
 
+To migrate to Grafana Cloud, refer to [Migrate from Grafana Enterprise to Grafana Cloud](/docs/grafana-cloud/account-management/e2c-guide/).
+
 ## Authentication
 
 Grafana Enterprise includes integrations with more ways to authenticate your users and enhanced authentication capabilities.
@@ -85,6 +87,7 @@ With a Grafana Enterprise license, you also get access to premium data sources,
 - [MongoDB](/grafana/plugins/grafana-mongodb-datasource)
 - [New Relic](/grafana/plugins/grafana-newrelic-datasource)
 - [Oracle Database](/grafana/plugins/grafana-oracle-datasource)
+- [PagerDuty](/grafana/plugins/grafana-pagerduty-datasource)
 - [Salesforce](/grafana/plugins/grafana-salesforce-datasource)
 - [SAP HANA®](/grafana/plugins/grafana-saphana-datasource)
 - [ServiceNow](/grafana/plugins/grafana-servicenow-datasource)
diff --git a/docs/sources/old-alerting/_index.md b/docs/sources/old-alerting/_index.md
deleted file mode 100644
index 12dd7a2687f18..0000000000000
--- a/docs/sources/old-alerting/_index.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-draft: true
-labels:
-  products:
-    - enterprise
-    - oss
-title: Legacy Grafana alerts
-weight: 114
----
-
-# Legacy Grafana alerts
-
-Grafana Alerting is enabled by default for new OSS installations. For older installations, it is still an [opt-in]({{< relref "../alerting/migrating-alerts/opt-in" >}}) feature.
-
-{{% admonition type="note" %}}
-Legacy dashboard alerts are deprecated and will be removed in Grafana 9. We encourage you to migrate to [Grafana Alerting]({{< relref "../alerting/migrating-alerts" >}}) for all existing installations.
-{{% /admonition %}}
-
-Legacy dashboard alerts have two main components:
-
-- Alert rule - When the alert is triggered. Alert rules are defined by one or more conditions that are regularly evaluated by Grafana.
-- Notification channel - How the alert is delivered. When the conditions of an alert rule are met, the Grafana notifies the channels configured for that alert.
-
-## Alert tasks
-
-You can perform the following tasks for alerts:
-
-- [Create an alert rule]({{< relref "./create-alerts" >}})
-- [View existing alert rules and their current state]({{< relref "./view-alerts" >}})
-- [Test alert rules and troubleshoot]({{< relref "./troubleshoot-alerts" >}})
-- [Add or edit an alert contact point]({{< relref "./notifications" >}})
-
-{{< docs/shared lookup="alerts/grafana-managed-alerts.md" source="grafana" version="<GRAFANA VERSION>" >}}
diff --git a/docs/sources/old-alerting/add-notification-template.md b/docs/sources/old-alerting/add-notification-template.md
deleted file mode 100644
index f2cea0cac274e..0000000000000
--- a/docs/sources/old-alerting/add-notification-template.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-aliases:
-  - ../alerting/add-notification-template/
-draft: true
-keywords:
-  - grafana
-  - documentation
-  - alerting
-  - alerts
-  - notification
-  - templating
-labels:
-  products:
-    - enterprise
-    - oss
-title: Alert notification templating
-weight: 110
----
-
-# Alert notification templating
-
-You can provide detailed information to alert notification recipients by injecting alert query data into an alert notification. This topic explains how you can use alert query labels in alert notifications.
-
-You can use labels generated during an alerting query evaluation to create alert notification messages. For multiple unique values for the same label, the values are comma-separated.
-
-When an alert fires, the alerting data series indicates the violation. For resolved alerts, all data series are included in the resolved notification.
-
-This topic explains how you can use alert query labels in alert notifications.
-
-## Adding alert label data into your alert notification
-
-1. Navigate to the panel you want to add or edit an alert rule for.
-1. Click on the panel title, and then click **Edit**.
-1. On the Alert tab, click **Create Alert**. If an alert already exists for this panel, then you can edit the alert directly.
-1. Refer to the alert query labels in the alert rule name and/or alert notification message field by using the `${Label}` syntax.
-1. Click **Save** in the upper right corner to save the alert rule and the dashboard.
-
-![Alerting notification template](/static/img/docs/alerting/alert-notification-template-7-4.png)
diff --git a/docs/sources/old-alerting/create-alerts.md b/docs/sources/old-alerting/create-alerts.md
deleted file mode 100644
index f60f8afebf1fe..0000000000000
--- a/docs/sources/old-alerting/create-alerts.md
+++ /dev/null
@@ -1,138 +0,0 @@
----
-aliases:
-  - ../alerting/create-alerts/
-description: Configure alert rules
-draft: true
-keywords:
-  - grafana
-  - alerting
-  - guide
-  - rules
-labels:
-  products:
-    - enterprise
-    - oss
-title: Create alerts
-weight: 200
----
-
-# Create alerts
-
-Grafana Alerting allows you to attach rules to your dashboard panels. When you save the dashboard, Grafana extracts the alert rules into a separate alert rule storage and schedules them for evaluation.
-
-![Alerting overview](/static/img/docs/alerting/drag_handles_gif.gif)
-
-In the Alert tab of the graph panel you can configure how often the alert rule should be evaluated and the conditions that need to be met for the alert to change state and trigger its [notifications]({{< relref "./notifications" >}}).
-
-Currently only the graph panel supports alert rules.
-
-## Add or edit an alert rule
-
-1. Navigate to the panel you want to add or edit an alert rule for, click the title, and then click **Edit**.
-1. On the Alert tab, click **Create Alert**. If an alert already exists for this panel, then you can just edit the fields on the Alert tab.
-1. Fill out the fields. Descriptions are listed below in [Alert rule fields](#alert-rule-fields).
-1. When you have finished writing your rule, click **Save** in the upper right corner to save alert rule and the dashboard.
-1. (Optional but recommended) Click **Test rule** to make sure the rule returns the results you expect.
-
-## Delete an alert
-
-To delete an alert, scroll to the bottom of the alert and then click **Delete**.
-
-## Alert rule fields
-
-This section describes the fields you fill out to create an alert.
-
-### Rule
-
-- **Name -** Enter a descriptive name. The name will be displayed in the Alert Rules list. This field supports [templating]({{< relref "./add-notification-template" >}}).
-- **Evaluate every -** Specify how often the scheduler should evaluate the alert rule. This is referred to as the _evaluation interval_.
-- **For -** Specify how long the query needs to violate the configured thresholds before the alert notification triggers.
-
-You can set a minimum evaluation interval in the `alerting.min_interval_seconds` configuration field, to set a minimum time between evaluations. Refer to [Configuration]({{< relref "../setup-grafana/configure-grafana#min_interval_seconds" >}}) for more information.
-
-{{% admonition type="caution" %}}
-Do not use `For` with the `If no data or all values are null` setting set to `No Data`. The triggering of `No Data` will trigger instantly and not take `For` into consideration. This may also result in that an OK notification not being sent if alert transitions from `No Data -Pending -OK`.
-{{% /admonition %}}
-
-If an alert rule has a configured `For` and the query violates the configured threshold, then it will first go from `OK` to `Pending`. Going from `OK` to `Pending` Grafana will not send any notifications. Once the alert rule has been firing for more than `For` duration, it will change to `Alerting` and send alert notifications.
-
-Typically, it's always a good idea to use this setting since it's often worse to get false positive than wait a few minutes before the alert notification triggers. Looking at the `Alert list` or `Alert list panels` you will be able to see alerts in pending state.
-
-Below you can see an example timeline of an alert using the `For` setting. At ~16:04 the alert state changes to `Pending` and after 4 minutes it changes to `Alerting` which is when alert notifications are sent. Once the series falls back to normal the alert rule goes back to `OK`.
-{{< figure class="float-right"  src="/static/img/docs/v54/alerting-for-dark-theme.png" caption="Alerting For" >}}
-
-{{< figure class="float-right"  max-width="40%" src="/static/img/docs/v4/alerting_conditions.png" caption="Alerting Conditions" >}}
-
-### Conditions
-
-Currently the only condition type that exists is a `Query` condition that allows you to
-specify a query letter, time range and an aggregation function.
-
-#### Query condition example
-
-```sql
-avg() OF query(A, 15m, now) IS BELOW 14
-```
-
-- `avg()` Controls how the values for **each** series should be reduced to a value that can be compared against the threshold. Click on the function to change it to another aggregation function.
-- `query(A, 15m, now)` The letter defines what query to execute from the **Metrics** tab. The second two parameters define the time range, `15m, now` means 15 minutes ago to now. You can also do `10m, now-2m` to define a time range that will be 10 minutes ago to 2 minutes ago. This is useful if you want to ignore the last 2 minutes of data.
-- `IS BELOW 14` Defines the type of threshold and the threshold value. You can click on `IS BELOW` to change the type of threshold.
-
-The query used in an alert rule cannot contain any template variables. Currently we only support `AND` and `OR` operators between conditions and they are executed serially.
-For example, we have 3 conditions in the following order:
-_condition:A(evaluates to: TRUE) OR condition:B(evaluates to: FALSE) AND condition:C(evaluates to: TRUE)_
-so the result will be calculated as ((TRUE OR FALSE) AND TRUE) = TRUE.
-
-We plan to add other condition types in the future, like `Other Alert`, where you can include the state of another alert in your conditions, and `Time Of Day`.
-
-#### Multiple Series
-
-If a query returns multiple series, then the aggregation function and threshold check will be evaluated for each series. What Grafana does not do currently is track alert rule state **per series**. This has implications that are detailed in the scenario below.
-
-- Alert condition with query that returns 2 series: **server1** and **server2**
-- **server1** series causes the alert rule to fire and switch to state `Alerting`
-- Notifications are sent out with message: _load peaking (server1)_
-- In a subsequent evaluation of the same alert rule, the **server2** series also causes the alert rule to fire
-- No new notifications are sent as the alert rule is already in state `Alerting`.
-
-So, as you can see from the above scenario Grafana will not send out notifications when other series cause the alert to fire if the rule already is in state `Alerting`. To improve support for queries that return multiple series we plan to track state **per series** in a future release.
-
-> Starting with Grafana v5.3 you can configure reminders to be sent for triggered alerts. This will send additional notifications
-> when an alert continues to fire. If other series (like server2 in the example above) also cause the alert rule to fire they will be included in the reminder notification. Depending on what notification channel you're using you may be able to take advantage of this feature for identifying new/existing series causing alert to fire.
-
-### No Data & Error Handling
-
-Below are conditions you can configure how the rule evaluation engine should handle queries that return no data or only null values.
-
-| No Data Option  | Description                                                                                |
-| --------------- | ------------------------------------------------------------------------------------------ |
-| No Data         | Set alert rule state to `NoData`                                                           |
-| Alerting        | Set alert rule state to `Alerting`                                                         |
-| Keep Last State | Keep the current alert rule state, whatever it is.                                         |
-| Ok              | Not sure why you would want to send yourself an alert when things are okay, but you could. |
-
-### Execution errors or timeouts
-
-Tell Grafana how to handle execution or timeout errors.
-
-| Error or timeout option | Description                                        |
-| ----------------------- | -------------------------------------------------- |
-| Alerting                | Set alert rule state to `Alerting`                 |
-| Keep Last State         | Keep the current alert rule state, whatever it is. |
-
-If you have an unreliable time series store from which queries sometime timeout or fail randomly you can set this option to `Keep Last State` in order to basically ignore them.
-
-## Notifications
-
-In alert tab you can also specify alert rule notifications along with a detailed message about the alert rule. The message can contain anything, information about how you might solve the issue, link to runbook, and so on.
-
-The actual notifications are configured and shared between multiple alerts. Read
-[Alert notifications]({{< relref "./notifications" >}}) for information on how to configure and set up notifications.
-
-- **Send to -** Select an alert notification channel if you have one set up.
-- **Message -** Enter a text message to be sent on the notification channel. Some alert notifiers support transforming the text to HTML or other rich formats. This field supports [templating]({{< relref "./add-notification-template" >}}).
-- **Tags -** Specify a list of tags (key/value) to be included in the notification. It is only supported by [some notifiers]({{< relref "./notifications#list-of-supported-notifiers" >}}).
-
-## Alert state history and annotations
-
-Alert state changes are recorded in the internal annotation table in Grafana's database. The state changes are visualized as annotations in the alert rule's graph panel. You can also go into the `State history` submenu in the alert tab to view and clear state history.
diff --git a/docs/sources/old-alerting/notifications.md b/docs/sources/old-alerting/notifications.md
deleted file mode 100644
index c450f8cbdb002..0000000000000
--- a/docs/sources/old-alerting/notifications.md
+++ /dev/null
@@ -1,302 +0,0 @@
----
-aliases:
-  - ../alerting/notifications/
-description: Alerting notifications guide
-draft: true
-keywords:
-  - Grafana
-  - alerting
-  - guide
-  - notifications
-labels:
-  products:
-    - enterprise
-    - oss
-title: Alert notifications
-weight: 100
----
-
-# Alert notifications
-
-When an alert changes state, it sends out notifications. Each alert rule can have
-multiple notifications. In order to add a notification to an alert rule you first need
-to add and configure a `notification` channel (can be email, PagerDuty, or other integration).
-
-This is done from the Notification channels page.
-
-{{% admonition type="note" %}}
-Alerting is only available in Grafana v4.0 and above.
-{{% /admonition %}}
-
-## Add a notification channel
-
-1. In the Grafana side bar, hover your cursor over the **Alerting** (bell) icon and then click **Notification channels**.
-1. Click **Add channel**.
-1. Fill out the fields or select options described below.
-
-## New notification channel fields
-
-### Default (send on all alerts)
-
-- **Name -** Enter a name for this channel. It will be displayed when users add notifications to alert rules.
-- **Type -** Select the channel type. Refer to the [List of supported notifiers](#list-of-supported-notifiers) for details.
-- **Default (send on all alerts) -** When selected, this option sends a notification on this channel for all alert rules.
-- **Include Image -** See [Enable images in notifications](#enable-images-in-notifications-external-image-store) for details.
-- **Disable Resolve Message -** When selected, this option disables the resolve message [OK] that is sent when the alerting state returns to false.
-- **Send reminders -** When this option is checked additional notifications (reminders) will be sent for triggered alerts. You can specify how often reminders should be sent using number of seconds (s), minutes (m) or hours (h), for example `30s`, `3m`, `5m` or `1h`.
-
-**Important:** Alert reminders are sent after rules are evaluated. Therefore a reminder can never be sent more frequently than a configured alert rule evaluation interval.
-
-These examples show how often and when reminders are sent for a triggered alert.
-
-| Alert rule evaluation interval | Send reminders every | Reminder sent every (after last alert notification) |
-| ------------------------------ | -------------------- | --------------------------------------------------- |
-| `30s`                          | `15s`                | ~30 seconds                                         |
-| `1m`                           | `5m`                 | ~5 minutes                                          |
-| `5m`                           | `15m`                | ~15 minutes                                         |
-| `6m`                           | `20m`                | ~24 minutes                                         |
-| `1h`                           | `15m`                | ~1 hour                                             |
-| `1h`                           | `2h`                 | ~2 hours                                            |
-
-<div class="clearfix"></div>
-
-## List of supported notifiers
-
-| Name                                          | Type                      | Supports images    | Supports alert rule tags |
-| --------------------------------------------- | ------------------------- | ------------------ | ------------------------ |
-| [DingDing](#dingdingdingtalk)                 | `dingding`                | yes, external only | no                       |
-| [Discord](#discord)                           | `discord`                 | yes                | no                       |
-| [Email](#email)                               | `email`                   | yes                | no                       |
-| [Google Hangouts Chat](#google-hangouts-chat) | `googlechat`              | yes, external only | no                       |
-| Hipchat                                       | `hipchat`                 | yes, external only | no                       |
-| [Kafka](#kafka)                               | `kafka`                   | yes, external only | no                       |
-| Line                                          | `line`                    | yes, external only | no                       |
-| Microsoft Teams                               | `teams`                   | yes, external only | no                       |
-| [Opsgenie](#opsgenie)                         | `opsgenie`                | yes, external only | yes                      |
-| [Pagerduty](#pagerduty)                       | `pagerduty`               | yes, external only | yes                      |
-| Prometheus Alertmanager                       | `prometheus-alertmanager` | yes, external only | yes                      |
-| [Pushover](#pushover)                         | `pushover`                | yes                | no                       |
-| Sensu                                         | `sensu`                   | yes, external only | no                       |
-| [Sensu Go](#sensu-go)                         | `sensugo`                 | yes, external only | no                       |
-| [Slack](#slack)                               | `slack`                   | yes                | no                       |
-| Telegram                                      | `telegram`                | yes                | no                       |
-| Threema                                       | `threema`                 | yes, external only | no                       |
-| VictorOps                                     | `victorops`               | yes, external only | yes                      |
-| [Webhook](#webhook)                           | `webhook`                 | yes, external only | yes                      |
-
-### Email
-
-To enable email notifications you have to set up [SMTP settings]({{< relref "../setup-grafana/configure-grafana#smtp" >}})
-in the Grafana config. Email notifications will upload an image of the alert graph to an
-external image destination if available or fallback to attaching the image to the email.
-Be aware that if you use the `local` image storage email servers and clients might not be
-able to access the image.
-
-{{% admonition type="note" %}}
-Template variables are not supported in email alerts.
-{{% /admonition %}}
-
-| Setting      | Description                                                                                  |
-| ------------ | -------------------------------------------------------------------------------------------- |
-| Single email | Send a single email to all recipients. Disabled per default.                                 |
-| Addresses    | Email addresses to recipients. You can enter multiple email addresses using a ";" separator. |
-
-### Slack
-
-{{< figure class="float-right"  max-width="40%" src="/static/img/docs/v4/slack_notification.png" caption="Alerting Slack Notification" >}}
-
-To set up Slack, you need to configure an incoming Slack webhook URL. You can follow
-[Sending messages using Incoming Webhooks](https://api.slack.com/incoming-webhooks) on how to do that. If you want to include screenshots of the
-firing alerts in the Slack messages you have to configure either the [external image destination](#enable-images-in-notifications-external-image-store)
-in Grafana or a bot integration via Slack Apps. [Follow Slack's guide to set up a bot integration](https://api.slack.com/bot-users) and use the token
-provided, which starts with "xoxb".
-
-| Setting         | Description                                                                                                                                                                                                                                                                                                                   |
-| --------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Url             | Slack incoming webhook URL, or eventually the [chat.postMessage](https://api.slack.com/methods/chat.postMessage) Slack API endpoint.                                                                                                                                                                                          |
-| Username        | Set the username for the bot's message.                                                                                                                                                                                                                                                                                       |
-| Recipient       | Allows you to override the Slack recipient. You must either provide a channel Slack ID, a user Slack ID, a username reference (@&lt;user&gt;, all lowercase, no whitespace), or a channel reference (#&lt;channel&gt;, all lowercase, no whitespace). If you use the `chat.postMessage` Slack API endpoint, this is required. |
-| Icon emoji      | Provide an emoji to use as the icon for the bot's message. Ex :smile:                                                                                                                                                                                                                                                         |
-| Icon URL        | Provide a URL to an image to use as the icon for the bot's message.                                                                                                                                                                                                                                                           |
-| Mention Users   | Optionally mention one or more users in the Slack notification sent by Grafana. You have to refer to users, comma-separated, via their corresponding Slack IDs (which you can find by clicking the overflow button on each user's Slack profile).                                                                             |
-| Mention Groups  | Optionally mention one or more groups in the Slack notification sent by Grafana. You have to refer to groups, comma-separated, via their corresponding Slack IDs (which you can get from each group's Slack profile URL).                                                                                                     |
-| Mention Channel | Optionally mention either all channel members or just active ones.                                                                                                                                                                                                                                                            |
-| Token           | If provided, Grafana will upload the generated image via Slack's file.upload API method, not the external image destination. If you use the `chat.postMessage` Slack API endpoint, this is required.                                                                                                                          |
-
-If you are using the token for a slack bot, then you have to invite the bot to the channel you want to send notifications and add the channel to the recipient field.
-
-### Opsgenie
-
-To setup Opsgenie you will need an API Key and the Alert API Url. These can be obtained by configuring a new [Grafana Integration](https://docs.opsgenie.com/docs/grafana-integration).
-
-| Setting                   | Description                                                                                                                                                                                                                              |
-| ------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Alert API URL             | The API URL for your Opsgenie instance. This will normally be either `https://api.opsgenie.com` or, for EU customers, `https://api.eu.opsgenie.com`.                                                                                     |
-| API Key                   | The API Key as provided by Opsgenie for your configured Grafana integration.                                                                                                                                                             |
-| Override priority         | Configures the alert priority using the `og_priority` tag. The `og_priority` tag must have one of the following values: `P1`, `P2`, `P3`, `P4`, or `P5`. Default is `False`.                                                             |
-| Send notification tags as | Specify how you would like [Notification Tags]({{< relref "./create-alerts#notifications" >}}) delivered to Opsgenie. They can be delivered as `Tags`, `Extra Properties` or both. Default is Tags. See note below for more information. |
-
-{{% admonition type="note" %}}
-When notification tags are sent as `Tags` they are concatenated into a string with a `key:value` format. If you prefer to receive the notifications tags as key/values under Extra Properties in Opsgenie then change the `Send notification tags as` to either `Extra Properties` or `Tags & Extra Properties`.
-{{% /admonition %}}
-
-### PagerDuty
-
-To set up PagerDuty, all you have to do is to provide an integration key.
-
-| Setting                | Description                                                                                     |
-| ---------------------- | ----------------------------------------------------------------------------------------------- |
-| Integration Key        | Integration key for PagerDuty.                                                                  |
-| Severity               | Level for dynamic notifications, default is `critical` (1)                                      |
-| Auto resolve incidents | Resolve incidents in PagerDuty once the alert goes back to ok                                   |
-| Message in details     | Removes the Alert message from the PD summary field and puts it into custom details instead (2) |
-
-> **Note:** The tags `Severity`, `Class`, `Group`, `dedup_key`, and `Component` have special meaning in the [Pagerduty Common Event Format - PD-CEF](https://support.pagerduty.com/docs/pd-cef). If an alert panel defines these tag keys, then they are transposed to the root of the event sent to Pagerduty. This means they will be available within the Pagerduty UI and Filtering tools. A Severity tag set on an alert overrides the global Severity set on the notification channel if it's a valid level.
-
-> Using Message In Details will change the structure of the `custom_details` field in the PagerDuty Event.
-> This might break custom event rules in your PagerDuty rules if you rely on the fields in `payload.custom_details`.
-> Move any existing rules using `custom_details.myMetric` to `custom_details.queries.myMetric`.
-> This behavior will become the default in a future version of Grafana.
-
-> **Note:** The `dedup_key` tag overrides the Grafana-generated `dedup_key` with a custom key.
-
-> **Note:** The `state` tag overrides the current alert state inside the `custom_details` payload.
-
-> **Note:** Grafana uses the `Events API V2` integration. This can be configured for each service.
-
-### VictorOps
-
-To configure VictorOps, provide the URL from the Grafana Integration and substitute `$routing_key` with a valid key.
-
-> **Note:** The tag `Severity` has special meaning in the [VictorOps Incident Fields](https://help.victorops.com/knowledge-base/incident-fields-glossary/). If an alert panel defines this key, then it replaces the `message_type` in the root of the event sent to VictorOps.
-
-### Pushover
-
-To set up Pushover, you must provide a user key and an API token. Refer to [What is Pushover and how do I use it](https://support.pushover.net/i7-what-is-pushover-and-how-do-i-use-it) for instructions on how to generate them.
-
-| Setting        | Description                                                                                                                         |
-| -------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
-| API Token      | Application token                                                                                                                   |
-| User key(s)    | A comma-separated list of user keys                                                                                                 |
-| Device(s)      | A comma-separated list of devices                                                                                                   |
-| Priority       | The priority alerting nottifications are sent                                                                                       |
-| OK priority    | The priority OK notifications are sent; if not set, then OK notifications are sent with the priority set for alerting notifications |
-| Retry          | How often (in seconds) the Pushover servers send the same notification to the user. (minimum 30 seconds)                            |
-| Expire         | How many seconds your notification will continue to be retried for (maximum 86400 seconds)                                          |
-| Alerting sound | The sound for alerting notifications                                                                                                |
-| OK sound       | The sound for OK notifications                                                                                                      |
-
-### Webhook
-
-The webhook notification is a simple way to send information about a state change over HTTP to a custom endpoint.
-Using this notification you could integrate Grafana into a system of your choosing.
-
-Example json body:
-
-```json
-{
-  "dashboardId": 1,
-  "evalMatches": [
-    {
-      "value": 1,
-      "metric": "Count",
-      "tags": {}
-    }
-  ],
-  "imageUrl": "https://grafana.com/static/assets/img/blog/mixed_styles.png",
-  "message": "Notification Message",
-  "orgId": 1,
-  "panelId": 2,
-  "ruleId": 1,
-  "ruleName": "Panel Title alert",
-  "ruleUrl": "http://localhost:3000/d/hZ7BuVbWz/test-dashboard?fullscreen\u0026edit\u0026tab=alert\u0026panelId=2\u0026orgId=1",
-  "state": "alerting",
-  "tags": {
-    "tag name": "tag value"
-  },
-  "title": "[Alerting] Panel Title alert"
-}
-```
-
-- **state** - The possible values for alert state are: `ok`, `paused`, `alerting`, `pending`, `no_data`.
-
-### DingDing/DingTalk
-
-DingTalk supports the following "message type": `text`, `link` and `markdown`. Only the `link` message type is supported. Refer to the [configuration instructions](https://developers.dingtalk.com/document/app/custom-robot-access) in Chinese language.
-
-In DingTalk PC Client:
-
-1. Click "more" icon on upper right of the panel.
-
-2. Click "Robot Manage" item in the pop menu, there will be a new panel call "Robot Manage".
-
-3. In the "Robot Manage" panel, select "customized: customized robot with Webhook".
-
-4. In the next new panel named "robot detail", click "Add" button.
-
-5. In "Add Robot" panel, input a nickname for the robot and select a "message group" which the robot will join in. click "next".
-
-6. There will be a Webhook URL in the panel, looks like this: https://oapi.dingtalk.com/robot/send?access_token=xxxxxxxxx. Copy this URL to the Grafana DingTalk setting page and then click "finish".
-
-### Discord
-
-To set up Discord, you must create a Discord channel webhook. For instructions on how to create the channel, refer to
-[Intro to Webhooks](https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks).
-
-| Setting                        | Description                                                                                           |
-| ------------------------------ | ----------------------------------------------------------------------------------------------------- |
-| Webhook URL                    | Discord webhook URL.                                                                                  |
-| Message Content                | Mention a group using @ or a user using <@ID> when notifying in a channel.                            |
-| Avatar URL                     | Optionally, provide a URL to an image to use as the avatar for the bot's message.                     |
-| Use Discord's Webhook Username | Use the username configured in Discord's webhook settings. Otherwise, the username will be 'Grafana.' |
-
-Alternately, use the [Slack](#slack) notifier by appending `/slack` to a Discord webhook URL.
-
-### Kafka
-
-Notifications can be sent to a Kafka topic from Grafana using the [Kafka REST Proxy](https://docs.confluent.io/1.0/kafka-rest/docs/index.html).
-There are a couple of configuration options which need to be set up in Grafana UI under Kafka Settings:
-
-1. Kafka REST Proxy endpoint.
-
-1. Kafka Topic.
-
-Once these two properties are set, you can send the alerts to Kafka for further processing or throttling.
-
-### Google Hangouts Chat
-
-Notifications can be sent by setting up an incoming webhook in Google Hangouts chat. For more information about configuring a webhook, refer to [webhooks](https://developers.google.com/hangouts/chat/how-tos/webhooks).
-
-### Prometheus Alertmanager
-
-Alertmanager handles alerts sent by client applications such as Prometheus server or Grafana. It takes care of deduplicating, grouping, and routing them to the correct receiver. Grafana notifications can be sent to Alertmanager via a simple incoming webhook. Refer to the official [Prometheus Alertmanager documentation](https://prometheus.io/docs/alerting/alertmanager) for configuration information.
-
-{{% admonition type="caution" %}}
-In case of a high-availability setup, do not load balance traffic between Grafana and Alertmanagers to keep coherence between all your Alertmanager instances. Instead, point Grafana to a list of all Alertmanagers, by listing their URLs comma-separated in the notification channel configuration.
-{{% /admonition %}}
-
-### Sensu Go
-
-Grafana alert notifications can be sent to [Sensu](https://sensu.io) Go as events via the API. This operation requires an API key. For information on creating this key, refer to [Sensu Go documentation](https://docs.sensu.io/sensu-go/latest/operations/control-access/use-apikeys/#api-key-authentication).
-
-## Enable images in notifications {#external-image-store}
-
-Grafana can render the panel associated with the alert rule as a PNG image and include that in the notification. Read more about the requirements and how to configure
-[image rendering]({{< relref "../setup-grafana/image-rendering" >}}).
-
-You must configure an [external image storage provider]({{< relref "../setup-grafana/configure-grafana#external_image_storage" >}}) in order to receive images in alert notifications. If your notification channel requires that the image be publicly accessible (e.g. Slack, PagerDuty), configure a provider which uploads the image to a remote image store like Amazon S3, Webdav, Google Cloud Storage, or Azure Blob Storage. Otherwise, the local provider can be used to serve the image directly from Grafana.
-
-Notification services which need public image access are marked as 'external only'.
-
-## Configure the link back to Grafana from alert notifications
-
-All alert notifications contain a link back to the triggered alert in the Grafana instance.
-This URL is based on the [domain]({{< relref "../setup-grafana/configure-grafana#domain" >}}) setting in Grafana.
-
-## Notification templating
-
-{{% admonition type="note" %}}
-Alert notification templating is only available in Grafana v7.4 and above.
-{{% /admonition %}}
-
-The alert notification template feature allows you to take the [label]({{< relref "../fundamentals/timeseries-dimensions#labels" >}}) value from an alert query and [inject that into alert notifications]({{< relref "./add-notification-template" >}}).
diff --git a/docs/sources/old-alerting/pause-an-alert-rule.md b/docs/sources/old-alerting/pause-an-alert-rule.md
deleted file mode 100644
index 8cc675f7d6689..0000000000000
--- a/docs/sources/old-alerting/pause-an-alert-rule.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-aliases:
-  - ../alerting/pause-an-alert-rule/
-description: Pause an existing alert rule
-draft: true
-keywords:
-  - grafana
-  - alerting
-  - guide
-  - rules
-  - view
-labels:
-  products:
-    - enterprise
-    - oss
-title: Pause an alert rule
-weight: 400
----
-
-# Pause an alert rule
-
-Pausing the evaluation of an alert rule can sometimes be useful. For example, during a maintenance window, pausing alert rules can avoid triggering a flood of alerts.
-
-1. In the Grafana side bar, hover your cursor over the Alerting (bell) icon and then click **Alert Rules**. All configured alert rules are listed, along with their current state.
-1. Find your alert in the list, and click the **Pause** icon on the right. The **Pause** icon turns into a **Play** icon.
-1. Click the **Play** icon to resume evaluation of your alert.
diff --git a/docs/sources/old-alerting/troubleshoot-alerts.md b/docs/sources/old-alerting/troubleshoot-alerts.md
deleted file mode 100644
index 053bc34690ffa..0000000000000
--- a/docs/sources/old-alerting/troubleshoot-alerts.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-aliases:
-  - ../alerting/troubleshoot-alerts/
-description: Troubleshoot alert rules
-draft: true
-keywords:
-  - grafana
-  - alerting
-  - guide
-  - rules
-  - troubleshoot
-labels:
-  products:
-    - enterprise
-    - oss
-title: Troubleshoot alerts
-weight: 500
----
-
-# Troubleshoot alerts
-
-If alerts are not behaving as you expect, here are some steps you can take to troubleshoot and figure out what is going wrong.
-
-![Test Rule](/static/img/docs/v4/alert_test_rule.png)
-
-The first level of troubleshooting you can do is click **Test Rule**. You will get result back that you can expand to the point where you can see the raw data that was returned from your query.
-
-Further troubleshooting can also be done by inspecting the grafana-server log. If it's not an error or for some reason the log does not say anything you can enable debug logging for some relevant components. This is done in Grafana's ini config file.
-
-Example showing loggers that could be relevant when troubleshooting alerting.
-
-```ini
-[log]
-filters = alerting.scheduler:debug \
-          alerting.engine:debug \
-          alerting.resultHandler:debug \
-          alerting.evalHandler:debug \
-          alerting.evalContext:debug \
-          alerting.extractor:debug \
-          alerting.notifier:debug \
-          alerting.notifier.slack:debug \
-          alerting.notifier.pagerduty:debug \
-          alerting.notifier.email:debug \
-          alerting.notifier.webhook:debug \
-          tsdb.graphite:debug \
-          tsdb.prometheus:debug \
-          tsdb.opentsdb:debug \
-          tsdb.influxdb:debug \
-          tsdb.elasticsearch:debug \
-          tsdb.elasticsearch.client:debug \
-```
-
-If you want to log raw query sent to your TSDB and raw response in log you also have to set grafana.ini option `app_mode` to `development`.
diff --git a/docs/sources/old-alerting/view-alerts.md b/docs/sources/old-alerting/view-alerts.md
deleted file mode 100644
index b927715685b83..0000000000000
--- a/docs/sources/old-alerting/view-alerts.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-aliases:
-  - ../alerting/view-alerts/
-description: View existing alert rules
-draft: true
-keywords:
-  - grafana
-  - alerting
-  - guide
-  - rules
-  - view
-labels:
-  products:
-    - enterprise
-    - oss
-menuTitle: View alerts
-title: View existing alert rules
-weight: 400
----
-
-# View existing alert rules
-
-Grafana stores individual alert rules in the panels where they are defined, but you can also view a list of all existing alert rules and their current state.
-
-In the Grafana side bar, hover your cursor over the Alerting (bell) icon and then click **Alert Rules**. All configured alert rules are listed, along with their current state.
-
-You can do several things while viewing alerts.
-
-- **Filter alerts by name -** Type an alert name in the **Search alerts** field.
-- **Filter alerts by state -** In **States**, select which alert states you want to see. All others will be hidden.
-- **Pause or resume an alert -** Click the **Pause** or **Play** icon next to the alert to pause or resume evaluation. See [Pause an alert rule]({{< relref "./pause-an-alert-rule" >}}) for more information.
-- **Access alert rule settings -** Click the alert name or the **Edit alert rule** (gear) icon. Grafana opens the Alert tab of the panel where the alert rule is defined. This is helpful when an alert is firing but you don't know which panel it is defined in.
diff --git a/docs/sources/panels-visualizations/_index.md b/docs/sources/panels-visualizations/_index.md
index 1c613651f2015..e0242f212aeb8 100644
--- a/docs/sources/panels-visualizations/_index.md
+++ b/docs/sources/panels-visualizations/_index.md
@@ -15,31 +15,57 @@ labels:
     - oss
 menuTitle: Panels and visualizations
 title: Panels and visualizations
+description: Learn about and configure panels and visualizations
 weight: 80
+hero:
+  title: Panels and visualizations
+  level: 1
+  width: 110
+  height: 110
+  description: >-
+    Easily collect, correlate, and visualize data so you can make informed decisions in real time.
+cards:
+  title_class: pt-0 lh-1
+  items:
+    - title: Visualizations
+      href: ./visualizations/
+      description: Learn about all the visualizations available in Grafana, including which visualizations are ideal for different datasets and how to configure their options.
+      height: 24
+    - title: Panel overview
+      href: ./panel-overview/
+      description: Learn about the features of the panel.
+      height: 24
+    - title: Panel editor
+      href: ./panel-editor-overview/
+      description: Learn about the features of the panel editor and how to begin editing a panel.
+      height: 24
+    - title: Configure standard options
+      href: ./configure-standard-options/
+      description: Learn about configuring standard options like units, field display names, and and colors.
+      height: 24
+    - title: Query and transform data
+      href: ./query-transform-data/
+      description: Learn about querying and transforming your data to refine your visualizations.
+      height: 24
 ---
 
-# Panels and visualizations
+{{< docs/hero-simple key="hero" >}}
 
-The _panel_ is the basic visualization building block in Grafana.
-Each panel has a query editor specific to the data source selected in the panel.
-The query editor allows you to build a query that returns the data you want to visualize.
+---
 
-There are a wide variety of styling and formatting options for each panel.
-Panels can be dragged, dropped, and resized to rearrange them on the dashboard.
+## Overview
 
-Before you add a panel, ensure that you have configured a data source.
+Panels are the basic building block in Grafana dashboards, composed of a [query][] and a visualization, a graphical representation of query results.
 
-- For more information about adding and managing data sources as an administrator, refer to [Data source management][].
-- For details about using specific data sources, refer to [Data sources][].
+Visualizations provide you several different ways to present your data within a panel, depending on what best suits the data and your needs. Grafana’s growing suite of visualizations, ranging from time series graphs to heatmaps to cutting-edge 3D charts, help you decode complex datasets.
 
-This section includes the following sub topics:
+Panels offer a wide variety of formatting and styling options from applying colors based on field values to custom units. Each visualization also comes with options specific to it that give you further control over how your data is displayed. With Grafana panels and visualizations, you can easily get the information you need from your data and optimize performance.
 
-{{< section >}}
+## Explore
 
-{{% docs/reference %}}
-[Data source management]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/administration/data-source-management"
-[Data source management]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/administration/data-source-management"
+{{< card-grid key="cards" type="simple" >}}
 
-[Data sources]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources"
-[Data sources]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources"
+{{% docs/reference %}}
+[query]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data"
+[query]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data"
 {{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/calculation-types/index.md b/docs/sources/panels-visualizations/calculation-types/index.md
deleted file mode 100644
index 7aaa8d7a648ad..0000000000000
--- a/docs/sources/panels-visualizations/calculation-types/index.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-aliases:
-  - ../panels/calculation-types/
-  - ../panels/calculations-list/
-  - ../panels/reference-calculation-types/
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Calculation types
-weight: 1100
----
-
-# Calculation types
-
-The following table contains a list of calculations you can perform in Grafana. You can find these calculations in the **Transform** tab and in the bar gauge, gauge, and stat visualizations.
-
-| Calculation        | Description                                               |
-| :----------------- | :-------------------------------------------------------- |
-| All nulls          | True when all values are null                             |
-| All values         | Array with all values                                     |
-| All unique values  | Array with all unique values                              |
-| All zeros          | True when all values are 0                                |
-| Change count       | Number of times the field's value changes                 |
-| Count              | Number of values in a field                               |
-| Delta              | Cumulative change in value, only counts increments        |
-| Difference         | Difference between first and last value of a field        |
-| Difference percent | Percentage change between first and last value of a field |
-| Distinct count     | Number of unique values in a field                        |
-| First              | First value in a field                                    |
-| First\* (not null) | First, not null value in a field                          |
-| Last               | Last value in a field                                     |
-| Last\* (not null)  | Last, not null value in a field                           |
-| Max                | Maximum value of a field                                  |
-| Mean               | Mean value of all values in a field                       |
-| Variance           | Variance of all values in a field                         |
-| StdDev             | Standard deviation of all values in a field               |
-| Min                | Minimum value of a field                                  |
-| Min (above zero)   | Minimum, positive value of a field                        |
-| Range              | Difference between maximum and minimum values of a field  |
-| Step               | Minimal interval between values of a field                |
-| Total              | Sum of all values in a field                              |
diff --git a/docs/sources/panels-visualizations/configure-data-links/index.md b/docs/sources/panels-visualizations/configure-data-links/index.md
index da954089d97f5..be04b938c5c58 100644
--- a/docs/sources/panels-visualizations/configure-data-links/index.md
+++ b/docs/sources/panels-visualizations/configure-data-links/index.md
@@ -20,18 +20,42 @@ labels:
     - oss
 menuTitle: Configure data links
 title: Configure data links
-weight: 400
+description: Configure data links to create links between dashboards and link to external resources
+weight: 80
 ---
 
 # Configure data links
 
-You can use data link variables or data links to create links between panels.
+Data links allow you to link to other panels, dashboards, and external resources while maintaining the context of the source panel. You can create links that include the series name or even the value under the cursor. For example, if your visualization shows four servers, you can add a data link to one or two of them.
+
+The link itself is accessible in different ways depending on the visualization. For the time series visualization you need to click a data point or line:
+
+![Time series visualization with a data link displayed](/media/docs/grafana/panels-visualizations/screenshot-time-series-data-link-v10.3.png)
+
+For visualizations like stat, gauge, or bar gauge you can click anywhere on the visualization to open the context menu:
+
+![Stat visualization with a data link displayed](/media/docs/grafana/panels-visualizations/screenshot-stat-data-link-v10.3.png)
+
+If there's only one data link in the visualization, clicking anywhere on the visualization opens the link rather than the context menu.
+
+## Supported visualizations
+
+You can configure data links for the following visualizations:
+
+|                            |                                  |                                  |
+| -------------------------- | -------------------------------- | -------------------------------- |
+| [Bar chart][bar chart]     | [Heatmap][heatmap]               | [Status history][status history] |
+| [Bar gauge][bar gauge]     | [Histogram][histogram]           | [Table][table]                   |
+| [Candlestick][candlestick] | [Pie chart][pie chart]           | [Time series][time series]       |
+| [Canvas][canvas]           | [Stat][stat]                     | [Trend][trend]                   |
+| [Gauge][gauge]             | [State timeline][state timeline] | [XY chart][xy chart]             |
+| [Geomap][geomap]           |                                  |                                  |
 
 ## Data link variables
 
-You can use variables in data links to refer to series fields, labels, and values. For more information about data links, refer to [Data links](#data-links).
+Variables in data links let you send people to a detailed dashboard with preserved data filters. For example, you could use variables to specify a label, time range, series, or variable selection.
 
-To see a list of available variables, type `$` in the data link **URL** field to see a list of variables that you can use.
+To see a list of available variables, enter `$` in the data link **URL** field.
 
 {{% admonition type="note" %}}
 These variables changed in 6.4 so if you have an older version of Grafana, then use the version picker to select docs for an older version of Grafana.
@@ -39,50 +63,65 @@ These variables changed in 6.4 so if you have an older version of Grafana, then
 
 Azure Monitor, [CloudWatch][], and [Google Cloud Monitoring][] have pre-configured data links called _deep links_.
 
-You can also use template variables in your data links URLs, refer to [Templates and variables][] for more information on template variables.
+You can also use template variables in your data links URLs. For more information, refer to [Templates and variables][].
+
+### Time range panel variables
 
-## Time range panel variables
+These variables allow you to include the current time range in the data link URL:
 
-These variables allow you to include the current time range in the data link URL.
+| Variable           | Description                                                         |
+| ------------------ | ------------------------------------------------------------------- |
+| `__url_time_range` | Current dashboard's time range (for example, `?from=now-6h&to=now`) |
+| `__from`           | For more information, refer to [Global variables][].                |
+| `__to`             | For more information, refer to [Global variables][].                |
 
-- `__url_time_range` - current dashboard's time range (i.e. `?from=now-6h&to=now`)
-- `$__from and $__to` - For more information, refer to [Global variables][].
+When you create data links using time range variables like `__url_time_range` in the URL, you have to form the query parameter syntax yourself; that is, you must format the URL by appending query parameters using the question mark (`?`) and ampersand (`&`) syntax. These characters aren't automatically generated.
 
-## Series variables
+### Series variables
 
 Series-specific variables are available under `__series` namespace:
 
-- `__series.name` - series name to the URL
+| Variable        | Description            |
+| --------------- | ---------------------- |
+| `__series.name` | Series name to the URL |
 
-## Field variables
+### Field variables
 
 Field-specific variables are available under `__field` namespace:
 
-- `__field.name` - the name of the field
-- `__field.labels.<LABEL>` - label's value to the URL. If your label contains dots, then use `__field.labels["<LABEL>"]` syntax.
+| Variable                 | Description                                                                                         |
+| ------------------------ | --------------------------------------------------------------------------------------------------- |
+| `__field.name`           | The name of the field                                                                               |
+| `__field.labels.<LABEL>` | Label's value to the URL. If your label contains dots, then use `__field.labels["<LABEL>"]` syntax. |
 
-## Value variables
+### Value variables
 
 Value-specific variables are available under `__value` namespace:
 
-- `__value.time` - value's timestamp (Unix ms epoch) to the URL (i.e. `?time=1560268814105`)
-- `__value.raw` - raw value
-- `__value.numeric` - numeric representation of a value
-- `__value.text` - text representation of a value
-- `__value.calc` - calculation name if the value is result of calculation
+| Variable          | Description                                                                       |
+| ----------------- | --------------------------------------------------------------------------------- |
+| `__value.time`    | Value's timestamp (Unix ms epoch) to the URL (for example, `?time=1560268814105`) |
+| `__value.raw`     | Raw value                                                                         |
+| `__value.numeric` | Numeric representation of a value                                                 |
+| `__value.text`    | Text representation of a value                                                    |
+| `__value.calc`    | Calculation name if the value is result of calculation                            |
 
 Using value-specific variables in data links can show different results depending on the set option of Tooltip mode.
 
-## Data variables
+When you create data links using time range variables like `__value.time` in the URL, you have to form the query parameter syntax yourself; that is, you must add the question mark (`?`) and ampersand (`&`). These characters aren't automatically generated.
+
+### Data variables
 
 To access values and labels from other fields use:
 
-- `${__data.fields[i]}` - value of field `i` (on the same row)
-- `${__data.fields["NameOfField"]}` - value of field using name instead of index
-- `${__data.fields["NameOfField"]}` - value of field using name instead of index
-- `${__data.fields[1].labels.cluster}` - access labels of another field
+| Variable                          | Description                                |
+| --------------------------------- | ------------------------------------------ |
+| `__data.fields[i]`                | Value of field `i` (on the same row)       |
+| `__data.fields["NameOfField"]`    | Value of field using name instead of index |
+| `__data.fields["NameOfField"]`    | Value of field using name instead of index |
+| `__data.fields[1].labels.cluster` | Access labels of another field             |
 
-## Template variables
+### Template variables
 
 When linking to another dashboard that uses template variables, select variable values for whoever clicks the link.
 
@@ -96,54 +135,72 @@ When linking to another dashboard that uses template variables, select variable
 
 If you want to add all of the current dashboard's variables to the URL, then use `${__all_variables}`.
 
-## Data links
+## Add a data link
 
-Data links allow you to provide more granular context to your links. You can create links that include the series name or even the value under the cursor. For example, if your visualization showed four servers, you could add a data link to one or two of them.
+1. Navigate to the panel to which you want to add the data link.
+1. Hover over any part of the panel to display the menu icon in the upper-right corner.
+1. Click the menu icon and select **Edit** to open the panel editor.
+1. In the panel edit pane, scroll down to the **Data links** section and expand it.
+1. Click **Add link**.
+1. In the dialog box that opens, enter a **Title**. This is a human-readable label for the link, which will be displayed in the UI.
+1. Enter the **URL** or variable to which you want to link.
 
-The link itself is accessible in different ways depending on the visualization. For the Graph you need to click on a data point or line, for a panel like
-Stat, Gauge, or Bar Gauge you can click anywhere on the visualization to open the context menu.
+   To add a data link variable, click in the **URL** field and enter `$` or press Ctrl+Space or Cmd+Space to see a list of available variables.
 
-You can use variables in data links to send people to a detailed dashboard with preserved data filters. For example, you could use variables to specify a time range, series, and variable selection. For more information, refer to [Data link variables](#data-link-variables).
+1. If you want the link to open in a new tab, then toggle the **Open in a new tab** switch.
+1. Click **Save** to save changes and close the dialog box.
+1. Click **Apply** to see your changes in the dashboard.
+1. Click the **Save dashboard** icon to save your changes to the dashboard.
 
-### Typeahead suggestions
+{{% docs/reference %}}
+[bar chart]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/bar-chart"
+[bar chart]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/bar-chart"
 
-When creating or updating a data link, press Cmd+Space or Ctrl+Space on your keyboard to open the typeahead suggestions to more easily add variables to your URL.
+[bar gauge]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/bar-gauge"
+[bar gauge]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/bar-gauge"
 
-{{< figure src="/static/img/docs/data_link_typeahead.png"  max-width= "800px" >}}
+[candlestick]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/candlestick"
+[candlestick]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/candlestick"
 
-### Add a data link
+[canvas]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/canvas"
+[canvas]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/canvas"
 
-1. Hover over any part of the panel you want to which you want to add the data link to display the actions menu on the top right corner.
-1. Click the menu and select **Edit**.
+[gauge]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/gauge"
+[gauge]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/gauge"
 
-   To use a keyboard shortcut to open the panel, hover over the panel and press `e`.
+[geomap]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/geomap"
+[geomap]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/geomap"
 
-1. Scroll down to the Data links section and expand it.
-1. Click **Add link**.
-1. Enter a **Title**. **Title** is a human-readable label for the link that will be displayed in the UI.
-1. Enter the **URL** you want to link to.
+[heatmap]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/heatmap"
+[heatmap]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/heatmap"
 
-   You can even add one of the template variables defined in the dashboard. Click in the **URL** field and then type `$` or press Ctrl+Space or Cmd+Space to see a list of available variables. By adding template variables to your panel link, the link sends the user to the right context, with the relevant variables already set. For more information, refer to [Data link variables](#data-link-variables).
+[histogram]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/histogram"
+[histogram]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/histogram"
 
-1. If you want the link to open in a new tab, then select **Open in a new tab**.
-1. Click **Save** to save changes and close the window.
-1. Click **Save** in the upper right to save your changes to the dashboard.
+[pie chart]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/pie-chart"
+[pie chart]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/pie-chart"
 
-### Update a data link
+[stat]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/stat"
+[stat]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/stat"
 
-1. Scroll down to the Data links section, expand it, and find the link that you want to make changes to.
-1. Click the Edit (pencil) icon to open the Edit link window.
-1. Make any necessary changes.
-1. Click **Save** to save changes and close the window.
-1. Click **Save** in the upper right to save your changes to the dashboard.
+[state timeline]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/state-timeline"
+[state timeline]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/state-timeline"
 
-### Delete a data link
+[status history]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/status-history"
+[status history]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/status-history"
 
-1. Scroll down to the Data links section, expand it, and find the link that you want to delete.
-1. Click the **X** icon next to the link you want to delete.
-1. Click **Save** in the upper right to save your changes to the dashboard.
+[table]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/table"
+[table]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/table"
+
+[time series]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/time-series"
+[time series]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/time-series"
+
+[trend]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/trend"
+[trend]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/trend"
+
+[xy chart]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/xy-chart"
+[xy chart]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/xy-chart"
 
-{{% docs/reference %}}
 [Cloudwatch]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/aws-cloudwatch/query-editor#deep-link-grafana-panels-to-the-cloudwatch-console-1"
 [Cloudwatch]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/connect-externally-hosted/data-sources/aws-cloudwatch/query-editor#deep-link-grafana-panels-to-the-cloudwatch-console-1"
 
@@ -151,8 +208,8 @@ When creating or updating a data link, press Cmd+Space or Ctrl+Space on your key
 [Google Cloud Monitoring]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/connect-externally-hosted/data-sources/google-cloud-monitoring/query-editor#deep-link-from-grafana-panels-to-the-google-cloud-console-metrics-explorer"
 
 [Templates and variables]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/variables"
-[Templates and variables]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/variables"
+[Templates and variables]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/dashboards/variables"
 
 [Global variables]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/variables/add-template-variables#**from-and-**to"
-[Global variables]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/variables/add-template-variables#**from-and-**to"
+[Global variables]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/dashboards/variables/add-template-variables#**from-and-**to"
 {{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/configure-legend/index.md b/docs/sources/panels-visualizations/configure-legend/index.md
index 8f4b899bb3d1c..a74d55c958803 100644
--- a/docs/sources/panels-visualizations/configure-legend/index.md
+++ b/docs/sources/panels-visualizations/configure-legend/index.md
@@ -8,97 +8,150 @@ labels:
     - enterprise
     - oss
 title: Configure a legend
-weight: 400
+description: Configure a legend for your panel visualization
+weight: 70
 ---
 
 # Configure a legend
 
-A panel includes a legend that you can use to interpret data displayed in a visualization. Each legend option adds context and clarity to the data illustrated in a visualization.
+A panel includes a legend that you can use to identify and interpret data displayed in a visualization. Each legend option adds context and clarity to the data illustrated in a visualization.
 
-## Isolate series data in a visualization
+## Supported visualizations
 
-Visualizations can often be visually complex, and include many data series. You can simplify the view by removing series data from the visualization, which isolates the data you want to see. Grafana automatically creates a new override in the **Override** tab.
+Legends are supported for the following visualizations:
 
-When you apply your changes, the visualization changes appear to all users of the panel.
+- [Bar chart][bar chart]
+- [Candlestick][candlestick]
+- [Histogram][histogram]
+- [Pie chart][pie chart]
+- [State timeline][state timeline]
+- [Status history][status history]
+- [Time series][time series]
+- [Trend][trend]
+- [XY chart][xy chart]
 
-1. Open the panel.
+[Geomaps][] and [heatmaps][] also have legends, but they only provide the choice to display or not display a legend and don't support other legend options.
 
-1. In the legend, click the label of the series you want to isolate.
+## Legend options
 
-   The system removes from view all other series data.
+You can find the following options under the **Legend** section in the panel edit pane.
 
-1. To incrementally add series data to an isolated series, press the **Ctrl** or **Command** key and click the label of the series you want to add.
+{{% admonition type="note" %}}
+Not all of the options listed apply to all visualizations with legends.
+{{% /admonition %}}
 
-1. To revert back to the default view that includes all data, click any series label twice.
+### Visibility
 
-1. To save your changes so that they appear to all viewers of the panel, click **Apply**.
+Set whether the legend is displayed or not. Use the switch to toggle a legend on or off.
 
-This topic currently applies to the following visualizations:
+### Mode
 
-- [Bar chart][]
-- [Histogram][]
-- [Pie chart][]
-- [State timeline][]
-- [Status history][]
-- [Time series][]
+Set the format in which the legend is displayed. Choose from:
 
-## Add values to a legend
+- **List**
+- **Table**
 
-As way to add more context to a visualization, you can add series data values to a legend. You can add as many values as you'd like; after you apply your changes, you can horizontally scroll the legend to see all values.
+When you format a legend as a table, other information about the legend, such as associated [values](#values) or where it's located in the visualization, might be displayed as well.
 
-1. Edit a panel.
+### Placement
 
-1. In the panel display options pane, locate the **Legend** section.
+Set where on the visualization a legend is displayed. Choose from:
 
-1. In the **Legend values** field, select the values you want to appear in the legend.
+- **Bottom**
+- **Right**
 
-1. Click **Apply** to save your changes are navigate back to the dashboard.
+### Width
 
-![Toggle series visibility](/static/img/docs/legend/legend-series-toggle-7-5.png)
+If you set the legend placement to **Right**, the **Width** option becomes available. Leave the field empty to allow Grafana to automatically set the legend width or enter a value in the field.
 
-## Change a series color
+### Values
 
-By default, Grafana specifies the color of your series data, which you can change.
+You can add more context to a visualization by adding series data values or [calculations][] to a legend. You can add as many values as you'd like. After you apply your changes, you can scroll the legend to see all values.
 
-1. Edit a panel.
+![Legend showing values](/media/docs/grafana/panels-visualizations/screenshot-legend-values-10.3.png)
 
-1. In the legend, click the color bar associated with the series.
+## Change a series color
 
-1. Select a pre-set color or a custom color from the color palette.
+By default, Grafana sets the colors of your series data, but you can change them through the panel legend. To change the series data color, follow these steps:
 
-1. Click **Apply** to save your changes are navigate back to the dashboard.
+1. Navigate to the panel you want to update.
+1. In the legend, click the color bar associated with the series.
+1. Select a pre-set color in the **Colors** tab or set a custom color in the **Custom** tab, using the picker or RGB values.
+1. Save the dashboard.
 
 ![Change legend series color](/static/img/docs/legend/legend-series-color-7-5.png)
 
+## Isolate series data in a visualization
+
+Visualizations can often be visually complex, and include many data series. You can simplify the view by removing series data from the visualization through the legend, which isolates the data you want to see. When you do this, Grafana automatically creates a new override in the **Override** section.
+
+To isolate a series, follow these steps:
+
+1. Navigate to the panel you want to update.
+1. In the legend, click the label of the series you want to isolate.
+
+   The system removes all other series data from view.
+
+1. To incrementally add series data back to an isolated series, press the **Ctrl** or **Command** key and click the label of the series you want to add.
+1. To save your changes so that they appear to all viewers of the panel, save the dashboard.
+
+To revert back to the default view that includes all data, click any series label twice.
+
 ## Sort series
 
-You can change legend mode to **Table** and choose [calculations][] to be displayed in the legend. Click the calculation name header in the legend table to sort the values in the table in ascending or descending order.
+When you format a legend as a table and add values to it, you can sort series in the table by those values. To do so, follow these steps:
+
+1. Navigate to the panel you want to update.
+1. Hover over any part of the panel you want to work on to display the menu on the top right corner.
+1. Click the menu and select **Edit**.
+1. Scroll to the **Legend** section of the panel edit pane.
+1. Under **Mode**, select **Table**.
+1. Under **Values**, select the value or calculation that you want to show.
+
+   The legend table now displays values.
+
+1. Click the calculation name header in the legend table to sort the values in the table in ascending or descending order.
+
+![Legend formatted as a table showing sorted values](/media/docs/grafana/panels-visualizations/screenshot-legend-sorted-10.3-v2.png)
 
 {{% admonition type="note" %}}
-This feature is only supported in these panels: Bar chart, Histogram, Time series.
+This feature is only supported for the following visualizations: bar chart, histogram, time series.
 {{% /admonition %}}
 
-![Sort legend series](/static/img/docs/legend/legend-series-sort-8-3.png).
-
 {{% docs/reference %}}
-[Bar chart]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/bar-chart"
-[Bar chart]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/bar-chart"
+[bar chart]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/bar-chart"
+[bar chart]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/bar-chart"
+
+[state timeline]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/state-timeline"
+[state timeline]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/state-timeline"
+
+[time series]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/time-series"
+[time series]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/time-series"
+
+[calculations]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/query-transform-data/calculation-types"
+[calculations]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data/calculation-types"
+
+[pie chart]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/pie-chart"
+[pie chart]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/pie-chart"
+
+[status history]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/status-history"
+[status history]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/status-history"
 
-[State timeline]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/state-timeline"
-[State timeline]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/state-timeline"
+[histogram]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/histogram"
+[histogram]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/histogram"
 
-[Time series]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/time-series"
-[Time series]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/time-series"
+[candlestick]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/candlestick"
+[candlestick]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/candlestick"
 
-[calculations]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/calculation-types"
-[calculations]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/calculation-types"
+[trend]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/trend"
+[trend]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/trend"
 
-[Pie chart]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/pie-chart"
-[Pie chart]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/pie-chart"
+[geomaps]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/geomap"
+[geomaps]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/geomap"
 
-[Status history]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/status-history"
-[Status history]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/status-history"
+[heatmaps]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/heatmap"
+[heatmaps]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/heatmap"
 
-[Histogram]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/histogram"
-[Histogram]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/histogram"
+[xy chart]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/xy-chart"
+[xy chart]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/xy-chart"
 {{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/configure-overrides/index.md b/docs/sources/panels-visualizations/configure-overrides/index.md
index 05122b0e7fd83..ea02548062d3f 100644
--- a/docs/sources/panels-visualizations/configure-overrides/index.md
+++ b/docs/sources/panels-visualizations/configure-overrides/index.md
@@ -15,18 +15,66 @@ labels:
     - oss
 menuTitle: Configure field overrides
 title: Configure field overrides
-weight: 400
+description: Configure field overrides to customize visualization settings
+weight: 110
 ---
 
 # Configure field overrides
 
-Overrides allow you to customize visualization settings for specific fields or series. This is accomplished by adding an override rule that targets a particular set of fields and that can each define multiple options.
+Overrides allow you to customize visualization settings for specific fields or series. When you add an override rule, it targets a particular set of fields and lets you define multiple options for how that field is displayed.
 
-For example, you set the unit for all fields that include the text 'bytes' by adding an override using the `Fields with name matching regex` matcher and then add the Unit option to the override rule.
+For example, you can override the default unit measurement for all fields that include the text "bytes" by adding an override using the **Fields with name matching regex** matcher and then the **Standard options > Unit** setting to the override rule:
 
-## Example 1: Format temperature
+![Field with unit override](/media/docs/grafana/panels-visualizations/screenshot-unit-override-v10.3.png)
 
-Let’s assume that our result set is a data frame that consists of two fields: time and temperature.
+After you've set them, your overrides appear in both the **All** and **Overrides** tabs of the panel editor pane:
+
+![All and Overrides tabs of panel editor pane](/media/docs/grafana/panels-visualizations/screenshot-all-overrides-tabs-v11.png)
+
+## Supported visualizations
+
+You can configure field overrides for the following visualizations:
+
+|                            |                                  |                                  |
+| -------------------------- | -------------------------------- | -------------------------------- |
+| [Bar chart][bar chart]     | [Heatmap][heatmap]               | [Status history][status history] |
+| [Bar gauge][bar gauge]     | [Histogram][histogram]           | [Table][table]                   |
+| [Candlestick][candlestick] | [Pie chart][pie chart]           | [Time series][time series]       |
+| [Canvas][canvas]           | [Stat][stat]                     | [Trend][trend]                   |
+| [Gauge][gauge]             | [State timeline][state timeline] | [XY chart][xy chart]             |
+| [Geomap][geomap]           |                                  |                                  |
+
+## Override rules
+
+You can choose from five types of override rules, which are described in the following sections.
+
+### Fields with name
+
+Select a field from the list of all available fields. Properties you add to this type of rule are only applied to this single field.
+
+### Fields with name matching regex
+
+Specify fields to override with a regular expression. Properties you add to this type of rule are applied to all fields where the field name matches the regular expression. This override doesn't rename the field; to do this, use the [Rename by regex transformation][].
+
+### Fields with type
+
+Select fields by type, such as string, numeric, or time. Properties you add to this type of rule are applied to all fields that match the selected type.
+
+### Fields returned by query
+
+Select all fields returned by a specific query, such as A, B, or C. Properties you add to this type of rule are applied to all fields returned by the selected query.
+
+### Fields with values
+
+Select all fields returned by your defined reducer condition, such as **Min**, **Max**, **Count**, **Total**. Properties you add to this type of rule are applied to all fields returned by the selected condition.
+
+## Examples
+
+The following examples demonstrate how you can use override rules to alter the display of fields in visualizations.
+
+### Example 1: Format temperature
+
+The following result set is a data frame that consists of two fields: time and temperature.
 
 |        time         | temperature |
 | :-----------------: | :---------: |
@@ -34,7 +82,14 @@ Let’s assume that our result set is a data frame that consists of two fields:
 | 2020-01-02 03:05:00 |    47.0     |
 | 2020-01-02 03:06:00 |    48.0     |
 
-Each field (column) of this structure can have field options applied that alter the way its values are displayed. This means that you can, for example, set the Unit to Temperature > Celsius, resulting in the following table:
+You can apply field options to each field (column) of this structure to alter the way its values are displayed. For example, you can set the following override rule:
+
+- Rule: **Fields with type**
+- Field: temperature
+- Override property: **Standard options > Unit**
+  - Selection: **Temperature > Celsius**
+
+This results in the following table:
 
 |        time         | temperature |
 | :-----------------: | :---------: |
@@ -42,7 +97,7 @@ Each field (column) of this structure can have field options applied that alter
 | 2020-01-02 03:05:00 |   47.0 °C   |
 | 2020-01-02 03:06:00 |   48.0 °C   |
 
-In addition, the decimal place is not required, so we can remove it. You can change the Decimals from `auto` to zero (`0`), resulting in the following table:
+In addition, the decimal place isn't required, so you can remove it by adding another override property that changes the **Standard options > Decimals** setting from **auto** to `0`. That results in the following table:
 
 |        time         | temperature |
 | :-----------------: | :---------: |
@@ -50,9 +105,9 @@ In addition, the decimal place is not required, so we can remove it. You can cha
 | 2020-01-02 03:05:00 |    47 °C    |
 | 2020-01-02 03:06:00 |    48 °C    |
 
-## Example 2: Format temperature and humidity
+### Example 2: Format temperature and humidity
 
-Let’s assume that our result set is a data frame that consists of four fields: time, high temp, low temp, and humidity.
+The following result set is a data frame that consists of four fields: time, high temp, low temp, and humidity.
 
 | time                | high temp | low temp | humidity |
 | ------------------- | --------- | -------- | -------- |
@@ -60,7 +115,16 @@ Let’s assume that our result set is a data frame that consists of four fields:
 | 2020-01-02 03:05:00 | 47.0      | 34.0     | 68       |
 | 2020-01-02 03:06:00 | 48.0      | 31.0     | 68       |
 
-Let's add the Celsius unit and get rid of the decimal place. This results in the following table:
+Use the following override rule and properties to add the **Celsius** unit option and remove the decimal place:
+
+- Rule: **Fields with type**
+- Field: temperature
+- Override property: **Standard options > Unit**
+  - Selection: **Temperature > Celsius**
+- Override property: **Standard options > Decimals**
+  -Change setting from **auto** to `0`
+
+This results in the following table:
 
 | time                | high temp | low temp | humidity |
 | ------------------- | --------- | -------- | -------- |
@@ -68,7 +132,7 @@ Let's add the Celsius unit and get rid of the decimal place. This results in the
 | 2020-01-02 03:05:00 | 47 °C     | 34 °C    | 68 °C    |
 | 2020-01-02 03:06:00 | 48 °C     | 31 °C    | 68 °C    |
 
-The temperature fields look good, but the humidity must now be changed. We can fix this by applying a field option override to the humidity field and change the unit to Misc > percent (0-100).
+The temperature fields are displaying correctly, but the humidity has incorrect units. You can fix this by applying a **Misc > Percent (0-100)** override to the humidity field. This results in the following table:
 
 | time                | high temp | low temp | humidity |
 | ------------------- | --------- | -------- | -------- |
@@ -78,47 +142,89 @@ The temperature fields look good, but the humidity must now be changed. We can f
 
 ## Add a field override
 
-A field override rule can customize the visualization settings for a specific field or series.
-
-1. Edit the panel to which you want to add an override.
-1. In the panel options side pane, click **Add field override** at the bottom of the pane.
-
-1. Select which fields an override rule will be applied to:
-   - **Fields with name:** Select a field from the list of all available fields. Properties you add to a rule with this selector are only applied to this single field.
-   - **Fields with name matching regex:** Specify fields to override with a regular expression. Properties you add to a rule with this selector are applied to all fields where the field name match the regex. This override doesn't rename the field; to do this, use the [Rename by regex transformation]({{< relref "../query-transform-data/transform-data/#rename-by-regex" >}}).
-   - **Fields with type:** Select fields by type, such as string, numeric, and so on. Properties you add to a rule with this selector are applied to all fields that match the selected type.
-   - **Fields returned by query:** Select all fields returned by a specific query, such as A, B, or C. Properties you add to a rule with this selector are applied to all fields returned by the selected query.
+To add a field override, follow these steps:
+
+1. Navigate to the panel to which you want to add the data link.
+1. Hover over any part of the panel to display the menu icon in the upper-right corner.
+1. Click the menu icon and select **Edit** to open the panel editor.
+1. At the bottom of the panel editor pane, click **Add field override**.
+1. Select the fields to which the override will be applied:
+   - **Fields with name**
+   - **Fields with name matching regex**
+   - **Fields with type**
+   - **Fields returned by query**
+   - **Fields with values**
 1. Click **Add override property**.
 1. Select the field option that you want to apply.
-1. Enter options by adding values in the fields. To return options to default values, delete the white text in the fields.
-1. Continue to add overrides to this field by clicking **Add override property**, or you can click **Add override** and select a different field to add overrides to.
-1. When finished, click **Save** to save all panel edits to the dashboard.
+1. Continue to add overrides to this field by clicking **Add override property**.
+1. Add as many overrides as you need.
+1. When you're finished, click **Save** to save all panel edits to the dashboard.
 
-## Delete a field override
+## Edit a field override
 
-Delete a field override when you no longer need it. When you delete an override, the appearance of value defaults to its original format. This change impacts dashboards and dashboard users that rely on an affected panel.
+To edit a field override, follow these steps:
 
-1. Edit the panel that contains the override you want to delete.
-1. In panel options side pane, scroll down until you see the overrides.
-1. Click the override you want to delete and then click the associated trash icon.
+1. Navigate to the panel to which you want to add the data link.
+1. Hover over any part of the panel to display the menu icon in the upper-right corner.
+1. Click the menu icon and select **Edit** to open the panel editor.
+1. In the panel editor pane, click the **Overrides** tab.
+1. Locate the override you want to change.
+1. Perform any of the following tasks:
+   - Edit settings on existing overrides or field selection parameters.
+   - Delete existing override properties by clicking the **X** next to the property.
+   - Delete an override entirely by clicking the trash icon at the top-right corner.
 
-## View field overrides
+The changes you make take effect immediately.
 
-You can view field overrides in the panel display options.
+{{% docs/reference %}}
+[bar chart]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/bar-chart"
+[bar chart]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/bar-chart"
 
-1. Edit the panel that contains the overrides you want to view.
-1. In panel options side pane, scroll down until you see the overrides.
+[bar gauge]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/bar-gauge"
+[bar gauge]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/bar-gauge"
 
-> The override settings that appear on the **All** tab are the same as the settings that appear on the **Overrides** tab.
+[candlestick]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/candlestick"
+[candlestick]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/candlestick"
 
-## Edit a field override
+[canvas]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/canvas"
+[canvas]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/canvas"
 
-Edit a field override when you want to make changes to an override setting. The change you make takes effect immediately.
+[gauge]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/gauge"
+[gauge]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/gauge"
 
-1. Edit the panel that contains the overrides you want to edit.
-1. In panel options side pane, scroll down until you see the overrides.
-1. Locate the override that you want to change.
-1. Perform any of the following:
-   - Edit settings on existing overrides or field selection parameters.
-   - Delete existing override properties by clicking the **X** next to the property.
-   - Add an override properties by clicking **Add override property**.
+[geomap]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/geomap"
+[geomap]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/geomap"
+
+[heatmap]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/heatmap"
+[heatmap]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/heatmap"
+
+[histogram]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/histogram"
+[histogram]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/histogram"
+
+[pie chart]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/pie-chart"
+[pie chart]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/pie-chart"
+
+[stat]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/stat"
+[stat]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/stat"
+
+[state timeline]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/state-timeline"
+[state timeline]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/state-timeline"
+
+[status history]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/status-history"
+[status history]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/status-history"
+
+[table]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/table"
+[table]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/table"
+
+[time series]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/time-series"
+[time series]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/time-series"
+
+[trend]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/trend"
+[trend]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/trend"
+
+[xy chart]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/xy-chart"
+[xy chart]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/xy-chart"
+
+[Rename by regex transformation]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data/transform-data#rename-by-regex"
+[Rename by regex transformation]: "/docs/grafana-cloud -> /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data/transform-data#rename-by-regex"
+{{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/configure-panel-options/index.md b/docs/sources/panels-visualizations/configure-panel-options/index.md
index 447808b1493f4..72483d4e456e8 100644
--- a/docs/sources/panels-visualizations/configure-panel-options/index.md
+++ b/docs/sources/panels-visualizations/configure-panel-options/index.md
@@ -19,108 +19,72 @@ labels:
     - oss
 menuTitle: Configure panel options
 title: Configure panel options
-weight: 2
+description: Add titles, descriptions, repeating rows and panel links
+weight: 50
 ---
 
 # Configure panel options
 
-A Grafana panel is a visual representation of data that you can customize by defining a data source query, transforming and formatting data, and configuring visualization settings.
+There are settings common to all visualizations, which you set in the **Panel options** section of the panel editor pane. The following sections describe these options as well as how to set them.
 
-A panel editor includes a query builder and a series of options that you can use to transform data and add information to your panels.
+## Panel options
 
-This topic describes how to:
+Set the following options to provide basic information about a panel and define basic display elements:
 
-- Open a panel for editing
-- Add a panel title and description
-- View a panel JSON model
-- Configure repeating rows and panels
+| Option                 | Description                                                                                                                                                                                                                                                                                             |
+| ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Title                  | Text entered in this field appears at the top of your panel in the panel editor and in the dashboard. You can use [variables you have defined][] in the **Title** field, but not [global variables][].                                                                                                  |
+| Description            | Text entered in this field appears in a tooltip in the upper-left corner of the panel. Add a description to a panel to share with users any important information about it, such as its purpose. You can use [variables you have defined][] in the **Description** field, but not [global variables][]. |
+| Transparent background | Toggle this switch on and off to control whether or not the panel has the same background color as the dashboard.                                                                                                                                                                                       |
+| Panel links            | Add [links to the panel][] to create shortcuts to other dashboards, panels, and external websites. Access panel links by clicking the icon next to the panel title.                                                                                                                                     |
+| Repeat options         | Set whether to repeat the panel for each value in the selected variable. For more information, refer to [Configure repeating panels](#configure-repeating-panels).                                                                                                                                      |
 
-## Edit a panel
-
-After you add a panel to a dashboard, you can open it at any time to change or update queries, add data transformation, and change visualization settings.
-
-1. Open the dashboard that contains the panel you want to edit.
-
-1. Hover over any part of the panel to display the actions menu on the top right corner.
-
-1. Click the menu and select **Edit**.
-
-   ![Panel with menu displayed](/media/docs/grafana/screenshot-panel-menu.png)
-
-   To use a keyboard shortcut to open the panel, hover over the panel and press `e`.
-
-   The panel opens in edit mode.
-
-## Add a title and description to a panel
-
-Add a title and description to a panel to share with users any important information about the visualization. For example, use the description to document the purpose of the visualization.
-
-1. [Edit a panel](#edit-a-panel).
-
-1. In the panel display options pane, locate the **Panel options** section.
-
-1. Enter a **Title**.
-
-   Text entered in this field appears at the top of your panel in the panel editor and in the dashboard.
-
-1. Write a description of the panel and the data you are displaying.
-
-   Text entered in this field appears in a tooltip in the upper-left corner of the panel.
-
-   You can use [variables you have defined][] in the **Title** and **Description** field, but not [global variables][].
-
-   ![](/static/img/docs/panels/panel-options-8-0.png)
-
-## View a panel JSON model
-
-Explore and export panel, panel data, and data frame JSON models.
-
-1. Open the dashboard that contains the panel.
-
-1. Hover over any part of the panel to display the actions menu on the top right corner.
-1. Click the menu and select **Inspect > Panel JSON**.
-1. In the **Select source** field, select one of the following options:
-
-   - **Panel JSON:** Displays a JSON object representing the panel.
-   - **Panel data:** Displays a JSON object representing the data that was passed to the panel.
-   - **DataFrame structure:** Displays the data structure of the panel, including any transformations, field configurations, and override configurations that have been applied.
-
-1. To explore the JSON, click `>` to expand or collapse portions of the JSON model.
+You can use generative AI to populate the **Title** and **Description** fields with the [Grafana LLM plugin][], which is currently in public preview. To enable this, refer to [Set up generative AI features for dashboards][].
 
 ## Configure repeating panels
 
 You can configure Grafana to dynamically add panels or rows to a dashboard. A dynamic panel is a panel that the system creates based on the value of a variable. Variables dynamically change your queries across all panels in a dashboard. For more information about repeating rows, refer to [Configure repeating rows][].
 
-{{% admonition type="note" %}}
-Repeating panels require variables to have one or more items selected; you cannot repeat a panel zero times to hide it.
-{{% /admonition %}}
-
 To see an example of repeating panels, refer to [this dashboard with repeating panels](https://play.grafana.org/d/testdata-repeating/testdata-repeating-panels?orgId=1).
 
 **Before you begin:**
 
 - Ensure that the query includes a multi-value variable.
 
-**To configure repeating panels:**
-
-1. [Edit the panel](#edit-a-panel) you want to repeat.
+To configure repeating panels, follow these steps:
 
-1. On the display options pane, click **Panel options > Repeat options**.
-
-1. Select a `direction`.
+1. Navigate to the panel you want to update.
+1. Hover over any part of the panel to display the menu on the top right corner.
+1. Click the menu and select **Edit**.
+1. Open the **Panel options** section of the panel editor pane.
+1. Under **Repeat options**, select a variable in the **Repeat by variable** drop-down list.
+1. Under **Repeat direction**, choose one of the following:
 
-   - Choose `horizontal` to arrange panels side-by-side. Grafana adjusts the width of a repeated panel. Currently, you cannot mix other panels on a row with a repeated panel.
-   - Choose `vertical` to arrange panels in a column. The width of repeated panels is the same as the original, repeated panel.
+   - **Horizontal** - Arrange panels side-by-side. Grafana adjusts the width of a repeated panel. You can't mix other panels on a row with a repeated panel.
+   - **Vertical** - Arrange panels in a column. The width of repeated panels is the same as the original, repeated panel.
 
+1. If you selected **Horizontal** in the previous step, select a value in the **Max per row** drop-down list to control the maximum number of panels that can be in a row.
+1. Click **Save**.
 1. To propagate changes to all panels, reload the dashboard.
 
+You can stop a panel from repeating by selecting **Disable repeating** in the **Repeat by variable** drop-down list.
+
 {{% docs/reference %}}
-[variables you have defined]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/variables"
-[variables you have defined]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/variables"
+[variables you have defined]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/dashboards/variables"
+[variables you have defined]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/dashboards/variables"
+
+[global variables]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/dashboards/variables/add-template-variables#global-variables"
+[global variables]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/dashboards/variables/add-template-variables#global-variables"
+
+[Configure repeating rows]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/create-dashboard#configure-repeating-rows"
+[Configure repeating rows]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/dashboards/build-dashboards/create-dashboard#configure-repeating-rows"
+
+[Grafana LLM plugin]: "/docs/grafana/ -> /docs/grafana-cloud/alerting-and-irm/machine-learning/configure/llm-plugin"
+[Grafana LLM plugin]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/machine-learning/configure/llm-plugin"
 
-[global variables]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/variables/add-template-variables#global-variables"
-[global variables]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/variables/add-template-variables#global-variables"
+[Set up generative AI features for dashboards]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/dashboards/manage-dashboards#set-up-generative-ai-features-for-dashboards"
+[Set up generative AI features for dashboards]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/dashboards/manage-dashboards#set-up-generative-ai-features-for-dashboards"
 
-[Configure repeating rows]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/build-dashboards/create-dashboard#configure-repeating-rows"
-[Configure repeating rows]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/build-dashboards/create-dashboard#configure-repeating-rows"
+[links to the panel]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/manage-dashboard-links#panel-links"
+[links to the panel]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/dashboards/build-dashboards/manage-dashboard-links#panel-links"
 {{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/configure-standard-options/index.md b/docs/sources/panels-visualizations/configure-standard-options/index.md
index 860f5238f7faa..8089a16b387c0 100644
--- a/docs/sources/panels-visualizations/configure-standard-options/index.md
+++ b/docs/sources/panels-visualizations/configure-standard-options/index.md
@@ -19,92 +19,104 @@ labels:
     - oss
 menuTitle: Configure standard options
 title: Configure standard options
-weight: 2
+description: Configure standard options like units, min, max, and colors
+weight: 60
 ---
 
 # Configure standard options
 
-The data model used in Grafana, namely the [data frame](https://grafana.com/developers/plugin-tools/introduction/data-frames), is a columnar-oriented table structure that unifies both time series and table query results. Each column within this structure is called a _field_. A field can represent a single time series or table column.
+**Standard options** in the panel editor pane let you change how field data is displayed in your visualizations. Options that you apply don't change the data, they just change how Grafana _displays_ the data.
 
-Field options allow you to change how the data is displayed in your visualizations. Options and overrides that you apply do not change the data, they change how Grafana displays the data. When you change an option, it is applied to all fields, meaning all series or columns. For example, if you change the unit to percentage, then all fields with numeric values are displayed in percentages.
+When you set a standard option, the change is applied to all fields or series. For example, if you set the **Unit** option to **Percentage**, all fields with numeric values are displayed as percentages.
 
-For a complete list of field formatting options, refer to [Standard options definitions](#standard-options-definitions).
+For more granular control over the display of fields, refer to [Configure overrides][].
 
-> You can apply standard options to most built-in Grafana panels. Some older panels and community panels that have not updated to the new panel and data model will be missing either all or some of these field options.
+## Supported visualizations
 
-1. Open a dashboard. Hover over any part of the panel to display the actions menu on the top right corner.
-1. Click the menu and select **Edit**.
-1. In the panel display options pane, locate the **Standard options** section.
-1. Select the standard options you want to apply.
+You can configure standard options for the following visualizations:
 
-   For more information about standard options, refer to [Standard options definitions](#standard-options-definitions).
+|                            |                                  |                                  |
+| -------------------------- | -------------------------------- | -------------------------------- |
+| [Bar chart][bar chart]     | [Geomap][geomap]                 | [Status history][status history] |
+| [Bar gauge][bar gauge]     | [Histogram][histogram]           | [Table][table]                   |
+| [Candlestick][candlestick] | [Pie chart][pie chart]           | [Time series][time series]       |
+| [Canvas][canvas]           | [Stat][stat]                     | [Trend][trend]                   |
+| [Gauge][gauge]             | [State timeline][state timeline] | [XY chart][xy chart]             |
 
-1. To preview your change, click outside of the field option box you are editing or press **Enter**.
-
-## Standard options definitions
+## Standard options
 
 This section explains all available standard options.
 
-You can apply standard options to most built-in Grafana panels. Some older panels and community panels that have not updated to the new panel and data model will be missing either all or some of these field options.
-
-Most field options will not affect the visualization until you click outside of the field option box you are editing or press Enter.
+To set these options, expand the **Standard options** section in the panel editor pane. Most field options won't affect the visualization until you click outside of the field option box you're editing or press Enter.
 
 {{% admonition type="note" %}}
-We are constantly working to add and expand options for all visualization, so all options might not be available for all visualizations.
+Not all of the options listed apply to all visualizations with standard options.
 {{% /admonition %}}
 
 ### Unit
 
-Lets you choose what unit a field should use. Click in the **Unit** field, then drill down until you find the unit you want. The unit you select is applied to all fields except time.
+This option lets you choose which unit a field should use. Click in the **Unit** field, then drill down until you find the unit you want. The unit you select is applied to all fields except time.
 
 #### Custom units
 
-You can use the unit dropdown to also specify custom units, custom prefix or suffix and date time formats.
+You can also use the **Unit** drop-down to specify custom units, custom prefixes or suffixes, and date time formats.
+
+To set a custom unit, enter the unit you want to use and then select it in the drop-down. It'll be the last option listed. For example, if you enter a unit called "Hearts", the drop-down will then include the option **Custom unit: Hearts**.
+
+You can further define a custom unit with specific syntax. For example, to set a custom currency unit called "Gems", enter `currency:Gems` in the field. The drop-down will include the option **Custom unit: currency:Gems**:
+
+![A custom currency unit called Gems in the Unit drop-down](/media/docs/grafana/panels-visualizations/custom_unit_currency_v11.0.png)
+
+The following table lists the special syntax options for custom units:
+
+| Custom unit                        | Description                                                                                                                                                                                                    |
+| ---------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `suffix:<suffix>`                  | Custom unit that should go after value.                                                                                                                                                                        |
+| `prefix:<prefix>`                  | Custom unit that should go before value.                                                                                                                                                                       |
+| `time:<format>`                    | Custom date time formats type, such as `time:YYYY-MM-DD`. Refer to [formats](https://momentjs.com/docs/#/displaying/) for the format syntax and options.                                                       |
+| `si:<base scale><unit characters>` | Custom SI units, such as `si: mF`. You can specify both a unit and the source data scale. For example, if your source data is represented as milli-something, prefix the unit with the `m` SI scale character. |
+| `count:<unit>`                     | Custom count unit.                                                                                                                                                                                             |
+| `currency:<unit>`                  | Custom currency unit.                                                                                                                                                                                          |
 
-To select a custom unit enter the unit and select the last `Custom: xxx` option in the dropdown.
+You can also paste a native emoji in the **Unit** drop-down and select it as a custom unit:
 
-- `suffix:<suffix>` for custom unit that should go after value.
-- `prefix:<prefix>` for custom unit that should go before value.
-- `time:<format>` For custom date time formats type for example `time:YYYY-MM-DD`. See [formats](https://momentjs.com/docs/#/displaying/) for the format syntax and options.
-- `si:<base scale><unit characters>` for custom SI units. For example: `si: mF`. This one is a bit more advanced as you can specify both a unit and the
-  source data scale. So if your source data is represented as milli (thousands of) something prefix the unit with that
-  SI scale character.
-- `count:<unit>` for a custom count unit.
-- `currency:<unit>` for custom a currency unit.
+![A thumbs up emoji as a custom unit](/media/docs/grafana/panels-visualizations/custom_unit_thumbsup_v11.0.png)
 
-You can also paste a native emoji in the unit picker and pick it as a custom unit:
+![A time series visualization using custom thumbs up emoji units](/media/docs/grafana/panels-visualizations/thumbsup_panel_v11.0.png)
 
-{{< figure src="/static/img/docs/v66/custom_unit_burger2.png" max-width="600px" caption="Custom unit emoji" >}}
+#### Control unit scaling
+
+By default, Grafana automatically scales the unit based on the magnitude of the value. For example, if you have values of 0.14kW and 3000kW, Grafana displays them as 140W and 3MW, respectively. You can use custom units to control this behavior by setting a prefix, suffix, or custom SI unit.
 
 #### String units
 
-Grafana can sometimes be too aggressive in parsing strings and displaying them as numbers. To configure Grafana to show the original string value, create a field override and add a unit property with the `String` unit.
+Sometimes Grafana is too aggressive in interpreting strings and displaying them as numbers. To configure Grafana to show the original string value, select **Misc > String** in the **Unit** drop-down.
 
 ### Min
 
-Lets you set the minimum value used in percentage threshold calculations. Leave blank to automatically calculate the minimum.
+Set the minimum value used in percentage threshold calculations. Leave this field empty to automatically calculate the minimum.
 
 ### Max
 
-Lets you set the maximum value used in percentage threshold calculations. Leave blank to automatically calculate the maximum.
+Set the maximum value used in percentage threshold calculations. Leave this field empty to automatically calculate the maximum.
 
 ### Field min/max
 
-By default the calculated min and max will be based on the minimum and maximum, in all series and fields. Turning field min/max on, will calculate the min or max on each field individually, based on the minimum or maximum value of the field.
+By default, the calculated **Min** and **Max** are based on the minimum and maximum of all series and fields. When you enable **Field min/max**, Grafana calculates the min or max of each field individually, based on the minimum or maximum value of the field.
 
 ### Decimals
 
-Specify the number of decimals Grafana includes in the rendered value. If you leave this field blank, Grafana automatically truncates the number of decimals based on the value. For example 1.1234 will display as 1.12 and 100.456 will display as 100.
+Specify the number of decimals Grafana includes in the rendered value. If you leave this field empty, Grafana automatically truncates the number of decimals based on the value. For example 1.1234 displays as 1.12 and 100.456 displays as 100.
 
-To display all decimals, set the unit to `String`.
+To display all decimals, set the unit to **String**.
 
 ### Display name
 
-Lets you set the display title of all fields. You can use [variables][] in the field title.
+Set the display title of all fields. You can use [variables][] in the field title.
 
-When multiple stats, fields, or series are shown, this field controls the title in each stat. You can use expressions like `${__field.name}` to use only the series name or the field name in title.
+When multiple stats, fields, or series are displayed, this field controls the title in each stat. You can use expressions like `${__field.name}` to use only the series name or the field name in the title.
 
-Given a field with a name of Temp, and labels of {"Loc"="PBI", "Sensor"="3"}
+The following table shows examples of the different field names generated using various expressions. In this example, there's a field with a name of "Temp" and labels of {"Loc"="PBI", "Sensor"="3"}:
 
 | Expression syntax            | Example                 | Renders to                     | Explanation                                                                                                                                                                                                        |
 | ---------------------------- | ----------------------- | ------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
@@ -114,45 +126,82 @@ Given a field with a name of Temp, and labels of {"Loc"="PBI", "Sensor"="3"}
 | `${__field.labels.X}`        | `${__field.labels.Loc}` | `PBI`                          | Displays the value of the specified label key.                                                                                                                                                                     |
 | `${__field.labels.__values}` | Same as Syntax          | `PBI, 3`                       | Displays the values of the labels separated by a comma (without label keys).                                                                                                                                       |
 
-If the value is an empty string after rendering the expression for a particular field, then the default display method is used.
+If the value is an empty string after rendering the expression for a particular field, then the default display method is applied.
 
 ### Color scheme
 
-The color options and their effect on the visualization depends on the visualization you are working with. Some visualizations have different color options.
-
-You can specify a single color, or select a continuous (gradient) color schemes, based on a value.
-Continuous color interpolates a color using the percentage of a value relative to min and max.
-
-Select one of the following palettes:
+The **Color scheme** options let you set single or multiple colors for your entire visualization.
 
-<div class="clearfix"></div>
+The color options and their effect on a visualization depend on the visualization you're working with and some visualizations have different color options.
 
-| Color mode                           | Description                                                                                                                                              |
-| ------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **Single color**                     | Specify a single color, useful in an override rule                                                                                                       |
-| **Shades of a color**                | Selects shades of a single color, useful in an override rule                                                                                             |
-| **From thresholds**                  | Informs Grafana to take the color from the matching threshold                                                                                            |
-| **Classic palette**                  | Grafana will assign color by looking up a color in a palette by series index. Useful for Graphs and pie charts and other categorical data visualizations |
-| **Classic palette (by series name)** | Grafana will assign color based on the name of the series. Useful when the series names to be visualized depend on the available data.                   |
-| **Green-Yellow-Red (by value)**      | Continuous color scheme                                                                                                                                  |
-| **Red-Yellow-Green (by value)**      | Continuous color scheme                                                                                                                                  |
-| **Blue-Yellow-Red (by value)**       | Continuous color scheme                                                                                                                                  |
-| **Yellow-Red (by value)**            | Continuous color scheme                                                                                                                                  |
-| **Blue-Purple (by value)**           | Continuous color scheme                                                                                                                                  |
-| **Yellow-Blue (by value)**           | Continuous color scheme                                                                                                                                  |
-| **Blues (by value)**                 | Continuous color scheme (panel background to blue)                                                                                                       |
-| **Reds (by value)**                  | Continuous color scheme (panel background color to red)                                                                                                  |
-| **Greens (by value)**                | Continuous color scheme (panel background color to green)                                                                                                |
-| **Purples (by value)**               | Continuous color scheme (panel background color to purple)                                                                                               |
+Select one of the following schemes:
 
-{{< figure src="/static/img/docs/v73/color_scheme_dropdown.png" max-width="350px" caption="Color scheme" >}}
+| Color scheme                          | Description                                                                                                                                                                                                                                                                                                                                                                                                 |
+| ------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Single color                          | Specifies a single color.                                                                                                                                                                                                                                                                                                                                                                                   |
+| Shades of a color                     | Grafana selects shades of a single color.                                                                                                                                                                                                                                                                                                                                                                   |
+| From thresholds (by value)            | The color is taken from the matching [threshold][]. For some visualizations, you also need to choose if the color is set by the **Last**, **Min**, or **Max** value of the field or series.                                                                                                                                                                                                                 |
+| Classic palette                       | Grafana automatically assigns a color for each field or series based on its order. If the order of a field changes in your query, the color also changes. Useful for graphs, pie charts, and other categorical data visualizations.                                                                                                                                                                         |
+| Classic palette (by series name)      | Grafana automatically assigns colors based on the name of the series. Useful when the series names to be visualized can change based on the available data.                                                                                                                                                                                                                                                 |
+| Multiple continuous colors (by value) | Grafana automatically assigns colors based on the percentage of a value relative to the min and the max of the field or series. For some visualizations, you also need to choose if the color is set by the **Last**, **Min**, or **Max** value of the field or series. Select from: **Green-Yellow-Red**, **Red-Yellow-Green**, **Blue-Yellow-Red**, **Yellow-Red**, **Blue-Purple**, and **Yellow-Blue**. |
+| Single continuous color (by value)    | Grafana automatically assigns shades of one color based on the percentage of a value relative to the min and the max of the field or series. For some visualizations, you also need to choose if the color is set by the **Last**, **Min**, or **Max** value of the field or series. Select from: **Blues**, **Reds**, **Greens**, and **Purples**.                                                         |
 
 ### No value
 
 Enter what Grafana should display if the field value is empty or null. The default value is a hyphen (-).
 
 {{% docs/reference %}}
+[Configure overrides]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-overrides"
+[Configure overrides]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-overrides"
+
+[bar chart]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/bar-chart"
+[bar chart]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/bar-chart"
+
+[bar gauge]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/bar-gauge"
+[bar gauge]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/bar-gauge"
+
+[candlestick]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/candlestick"
+[candlestick]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/candlestick"
+
+[canvas]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/canvas"
+[canvas]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/canvas"
+
+[gauge]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/gauge"
+[gauge]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/gauge"
+
+[geomap]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/geomap"
+[geomap]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/geomap"
+
+[histogram]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/histogram"
+[histogram]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/histogram"
+
+[pie chart]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/pie-chart"
+[pie chart]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/pie-chart"
+
+[stat]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/stat"
+[stat]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/stat"
+
+[state timeline]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/state-timeline"
+[state timeline]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/state-timeline"
+
+[status history]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/status-history"
+[status history]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/status-history"
+
+[table]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/table"
+[table]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/table"
+
+[time series]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/time-series"
+[time series]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/time-series"
+
+[trend]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/trend"
+[trend]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/trend"
+
+[xy chart]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/xy-chart"
+[xy chart]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/xy-chart"
 
 [variables]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/variables"
-[variables]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/variables"
+[variables]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/dashboards/variables"
+
+[threshold]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-thresholds"
+[threshold]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-thresholds"
 {{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/configure-thresholds/index.md b/docs/sources/panels-visualizations/configure-thresholds/index.md
index c519f78992c14..92557208917fb 100644
--- a/docs/sources/panels-visualizations/configure-thresholds/index.md
+++ b/docs/sources/panels-visualizations/configure-thresholds/index.md
@@ -7,7 +7,7 @@ aliases:
   - ../panels/specify-thresholds/add-threshold-to-graph/
   - ../panels/specify-thresholds/delete-a-threshold/
   - ../panels/thresholds/
-description: This section includes information about using thresholds in your visualizations.
+description: Configure thresholds in your visualizations
 labels:
   products:
     - cloud
@@ -15,65 +15,108 @@ labels:
     - oss
 menuTitle: Configure thresholds
 title: Configure thresholds
-weight: 300
+weight: 100
 ---
 
 # Configure thresholds
 
-This section includes information about using thresholds in your visualizations. You'll learn about thresholds, their defaults, how to add or delete a threshold, and adding a threshold to a legacy panel.
+In dashboards, a threshold is a value or limit you set for a metric that's reflected visually when it's met or exceeded. Thresholds are one way you can conditionally style and color your visualizations based on query results.
 
-## About thresholds
+Using thresholds, you can color grid lines and regions in a time series visualization:
+![Time series visualization with green, blue, and purple threshold lines and regions](/media/docs/grafana/panels-visualizations/screenshot-thresholds-lines-regions-v10.4.png)
 
-A threshold is a value that you specify for a metric that is visually reflected in a dashboard when the threshold value is met or exceeded.
+You can color the background or value text in a stat visualization:
+![Stat visualization with three values in green and orange](/media/docs/grafana/panels-visualizations/screenshot-thresholds-value-v10.4.png)
 
-Thresholds provide one method for you to conditionally style and color your visualizations based on query results. You can apply thresholds to most, but not all, visualizations. For more information about visualizations, refer to [Visualization panels][].
+You can define regions and region colors in a state timeline:
+![State timeline with green, blue, and pink region thresholds](/media/docs/grafana/panels-visualizations/screenshot-thresholds-state-timeline-v10.4.png)
 
-You can use thresholds to:
+You can also use thresholds to:
 
-- Color grid lines or grid areas in the [Time-series visualization][]
-- Color lines in the [Time-series visualization][]
-- Color the background or value text in the [Stat visualization][]
-- Color the gauge and threshold markers in the [Gauge visualization][]
-- Color markers in the [Geomap visualization][]
-- Color cell text or background in the [Table visualization][]
-- Define regions and region colors in the [State timeline visualization][]
+- Color lines in a time series visualization
+- Color the gauge and threshold markers in a gauge
+- Color markers in a geomap
+- Color cell text or background in a table
 
-There are two types of thresholds:
+{{< docs/play title="Threshold example" url="https://play.grafana.org/d/000000167/" >}}
 
-- **Absolute** thresholds are defined by a number. For example, 80 on a scale of 1 to 150.
-- **Percentage** thresholds are defined relative to minimum or maximum. For example, 80 percent.
+## Supported visualizations
+
+You can set thresholds in the following visualizations:
 
-### Default thresholds
+|                            |                                  |                                  |
+| -------------------------- | -------------------------------- | -------------------------------- |
+| [Bar chart][bar chart]     | [Geomap][geomap]                 | [Status history][status history] |
+| [Bar gauge][bar gauge]     | [Histogram][histogram]           | [Table][table]                   |
+| [Candlestick][candlestick] | [Stat][stat]                     | [Time series][time series]       |
+| [Canvas][canvas]           | [State timeline][state timeline] | [Trend][trend]                   |
+| [Gauge][gauge]             |
 
-On visualizations that support it, Grafana sets default threshold values of:
+## Default thresholds
+
+On visualizations that support thresholds, Grafana has the following default threshold settings:
 
 - 80 = red
 - Base = green
 - Mode = Absolute
+- Show thresholds = Off (for some visualizations); for more information, see the [Show thresholds](#show-threshold) option.
+
+## Thresholds options
 
-The **Base** value represents minus infinity. It is generally the “good” color.
+You can set the following options to further define how thresholds look.
 
-## Add or delete a threshold
+### Threshold value
 
-You can add as many thresholds to a panel as you want. Grafana automatically sorts thresholds values from highest to lowest.
+This number is the value that triggers the threshold. You can also set the color associated with the threshold in this field.
 
-Delete a threshold when it is no longer needed. When you delete a threshold, the system removes the threshold from all visualizations that include the threshold.
+The **Base** value represents minus infinity. By default, it's set to the color green, which is generally the “good” color.
+
+### Thresholds mode
+
+There are two threshold modes:
+
+- **Absolute** thresholds are defined by a number. For example, 80 on a scale of 1 to 150.
+- **Percentage** thresholds are defined relative to minimum or maximum. For example, 80 percent.
 
-1. To add a threshold:
+### Show thresholds
 
-   a. Edit the panel to which you want to add a threshold.
+{{< admonition type="note" >}}
+This option is supported for the bar chart, candlestick, time series, and trend visualizations.
+{{< /admonition>}}
 
-   b. In the options side pane, locate the **Thresholds** section and click **+ Add threshold**.
+Set if and how thresholds are shown with the following options.
 
-   c. Select a threshold color, number, and mode.
-   Threshold mode applies to all thresholds on this panel.
+| Option                               | Example                                                                                                                                                                                              |
+| ------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Off                                  |                                                                                                                                                                                                      |
+| As lines                             | {{< figure max-width="500px" src="/media/docs/grafana/panels-visualizations/screenshot-thresholds-lines-v10.4.png" alt="Visualization with threshold as a line" >}}                                  |
+| As lines (dashed)                    | {{< figure max-width="500px" src="/media/docs/grafana/panels-visualizations/screenshot-thresholds-dashed-lines-v10.4.png" alt="Visualization with threshold as a dashed line" >}}                    |
+| As filled regions                    | {{< figure max-width="500px" src="/media/docs/grafana/panels-visualizations/screenshot-thresholds-regions-v10.4.png" alt="Visualization with threshold as a region" >}}                              |
+| As filled regions and lines          | {{< figure max-width="500px" src="/media/docs/grafana/panels-visualizations/screenshot-thresholds-lines-regions-v10.4.png" alt="Visualization with threshold as a region and line" >}}               |
+| As filled regions and lines (dashed) | {{< figure max-width="500px" src="/media/docs/grafana/panels-visualizations/screenshot-thresholds-dashed-lines-regions-v10.4.png" alt="Visualization with threshold as a region and dashed line" >}} |
 
-   d. For a time-series panel, select a **Show thresholds** option.
+## Add a threshold
 
-1. To delete a threshold, navigate to the panel that contains the threshold and click the trash icon next to the threshold you want to remove.
+You can add as many thresholds to a visualization as you want. Grafana automatically sorts thresholds values from highest to lowest.
+
+1. Navigate to the panel you want to update.
+1. Hover over any part of the panel you want to work on to display the menu on the top right corner.
+1. Click the menu and select **Edit**.
+1. Scroll to the **Thresholds** section or enter `thresholds` in the search bar at the top of the panel edit pane.
+1. Click **+ Add threshold**.
+1. Enter a new threshold value or use the up and down arrows at the right side of the field to increase or decrease the value incrementally.
+1. Click the colored circle to the left of the threshold value to open the color picker, where you can update the threshold color.
+1. Under **Thresholds mode**, select either **Absolute** or **Percentage**.
+1. Under **Show thresholds**, set how the threshold is displayed or turn it off.
+
+To delete a threshold, navigate to the panel that contains the threshold and click the trash icon next to the threshold you want to remove.
 
 ## Add a threshold to a legacy graph panel
 
+{{< admonition type="caution" >}}
+Starting with Grafana v11, the legacy graph panel will be deprecated along with all other Angular panel plugins. For more information, refer to [Angular support deprecation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/developers/angular_deprecation/).
+{{< /admonition >}}
+
 In the Graph panel visualization, thresholds enable you to add lines or sections to a graph to make it easier to recognize when the graph crosses a threshold.
 
 1. Navigate to the graph panel to which you want to add a threshold.
@@ -94,24 +137,42 @@ In the Graph panel visualization, thresholds enable you to add lines or sections
 1. Click **Save** to save the changes in the dashboard.
 
 {{% docs/reference %}}
-[Table visualization]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/table"
-[Table visualization]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/table"
+[bar chart]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/bar-chart"
+[bar chart]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/bar-chart"
+
+[bar gauge]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/bar-gauge"
+[bar gauge]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/bar-gauge"
+
+[candlestick]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/candlestick"
+[candlestick]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/candlestick"
+
+[canvas]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/canvas"
+[canvas]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/canvas"
+
+[gauge]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/gauge"
+[gauge]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/gauge"
+
+[geomap]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/geomap"
+[geomap]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/geomap"
+
+[histogram]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/histogram"
+[histogram]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/histogram"
 
-[Stat visualization]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/stat"
-[Stat visualization]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/stat"
+[stat]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/stat"
+[stat]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/stat"
 
-[Time-series visualization]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/time-series#from-thresholds"
-[Time-series visualization]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/time-series#from-thresholds"
+[state timeline]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/state-timeline"
+[state timeline]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/state-timeline"
 
-[State timeline visualization]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/state-timeline"
-[State timeline visualization]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/state-timeline"
+[status history]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/status-history"
+[status history]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/status-history"
 
-[Gauge visualization]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/gauge"
-[Gauge visualization]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/gauge"
+[table]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/table"
+[table]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/table"
 
-[Visualization panels]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations"
-[Visualization panels]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations"
+[time series]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/time-series"
+[time series]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/time-series"
 
-[Geomap visualization]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/geomap"
-[Geomap visualization]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/geomap"
+[trend]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/trend"
+[trend]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/trend"
 {{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/configure-tooltips/index.md b/docs/sources/panels-visualizations/configure-tooltips/index.md
new file mode 100644
index 0000000000000..4b2956e7dc947
--- /dev/null
+++ b/docs/sources/panels-visualizations/configure-tooltips/index.md
@@ -0,0 +1,120 @@
+---
+aliases:
+keywords:
+  - grafana
+  - tooltips
+  - documentation
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+menuTitle: Configure tooltips
+title: Configure tooltips
+description: Configure tooltips for your visualizations
+weight: 75
+---
+
+# Configure tooltips
+
+When you hover your cursor over a visualization, Grafana can display tooltips that contain more information about a data point, like the exact time of a result. You can customize tooltips to control how many series they include and the order of those values. You can also copy the content from tooltips to use elsewhere. Learn more about configuring tooltips in [Tooltip options](#tooltip-options).
+
+## Supported visualizations
+
+You can configure tooltips for the following visualizations:
+
+|                                  |                                  |
+| -------------------------------- | -------------------------------- |
+| [Bar chart][bar chart]           | [Status history][status history] |
+| [Candlestick][candlestick]       | [Time series][time series]       |
+| [Heatmap][heatmap]               | [Trend][trend]                   |
+| [Pie chart][pie chart]           | [XY chart][xy chart]             |
+| [State timeline][state timeline] |                                  |
+
+Some visualizations, for example [candlestick][] and [flame graph][], have tooltips, but they aren't configurable. These visualizations don't have a **Tooltip** section in the panel editor pane. [Geomaps][geomaps] provide you the option to have tooltips triggered upon click or hover under the **Map controls** options in the panel editor pane.
+
+<!-- if we add documentation for treemap, some info will need to be added in the paragraph above -->
+
+## Tooltip options
+
+You can find the following options under the **Tooltip** section in the panel edit pane.
+
+{{% admonition type="note" %}}
+Not all of the options listed apply to all visualizations with tooltips.
+{{% /admonition %}}
+
+### Tooltip mode
+
+Choose how tooltips behave with the following options:
+
+- **Single** - The tooltip only the single series that you're hovering over in the visualization.
+- **All** - The tooltip shows all series in the visualization. Grafana highlights the series that you are hovering over in bold in the series list in the tooltip.
+- **Hidden** - Tooltips aren't displayed when you interact with the visualization.
+
+You can use a [field override][] to hide individual series from the tooltip.
+
+### Values sort order
+
+When you set the **Tooltip mode** to **All**, the **Values sort order** option is displayed. This option controls the order in which values are listed in a tooltip. Choose from the following:
+
+- **None** - Grafana automatically sorts the values displayed in a tooltip.
+- **Ascending** - Values in the tooltip are listed from smallest to largest.
+- **Descending** - Values in the tooltip are listed from largest to smallest.
+
+### Hover proximity
+
+Set the hover proximity (in pixels) to control how close the cursor must be to a data point to trigger the tooltip to display.
+
+![Adding a hover proximity limit for tooltips](/media/docs/grafana/gif-grafana-10-4-hover-proximity.gif)
+
+### Max height
+
+Set the maximum height of the tooltip box. The default is 600 pixels.
+
+### Show histogram (Y axis)
+
+For the heatmap visualization only, when you set the **Tooltip mode** to **Single**, the **Show histogram (Y axis)** option is displayed. This option controls whether or not the tooltip includes a histogram representing the y-axis.
+
+### Show color scale
+
+For the heatmap visualization only, when you set the **Tooltip mode** to **Single**, the **Show color scale** option is displayed. This option controls whether or not the tooltip includes the color scale that's also represented in the legend. When the color scale is included in the tooltip, it shows the hovered value on the scale:
+
+![Heatmap with a tooltip displayed showing the hovered value reflected in the color scale](/media/docs/grafana/panels-visualizations/screenshot-heatmap-tooltip-color-scale-v11.0.png)
+
+{{% docs/reference %}}
+[bar chart]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/bar-chart"
+[bar chart]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/bar-chart"
+
+[candlestick]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/candlestick"
+[candlestick]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/candlestick"
+
+[flame graph]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/flame-graph"
+[flame graph]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/flame-graph"
+
+[geomaps]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/geomap#tooltip"
+[geomaps]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/geomap#tooltip"
+
+[heatmap]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/heatmap"
+[heatmap]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/heatmap"
+
+[pie chart]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/pie-chart"
+[pie chart]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/pie-chart"
+
+[state timeline]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/state-timeline"
+[state timeline]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/state-timeline"
+
+[status history]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/status-history"
+[status history]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/status-history"
+
+[time series]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/time-series"
+[time series]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/time-series"
+
+[trend]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/trend"
+[trend]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/trend"
+
+[xy chart]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/xy-chart"
+[xy chart]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/xy-chart"
+
+[field override]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-overrides"
+[field override]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-overrides"
+{{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/configure-value-mappings/index.md b/docs/sources/panels-visualizations/configure-value-mappings/index.md
index e108a255a3bc5..be516356ec54f 100644
--- a/docs/sources/panels-visualizations/configure-value-mappings/index.md
+++ b/docs/sources/panels-visualizations/configure-value-mappings/index.md
@@ -16,33 +16,55 @@ labels:
     - oss
 menuTitle: Configure value mappings
 title: Configure value mappings
-weight: 600
+description: Configure value mappings to change how data appears in your visualizations
+weight: 90
 ---
 
 # Configure value mappings
 
-In addition to field overrides, value mapping is a technique that you can use to change the visual treatment of data that appears in a visualization.
+In addition to field overrides, value mapping is a technique you can use to change how data appears in a visualization.
 
-Values mapped using value mappings bypass the unit formatting. This means that a text value mapped to a numerical value is not formatted using the configured unit.
+For example, the mapping applied in the following image causes the visualization to display the text `Cold`, `Good`, and `Hot` in blue, green, and red for ranges of temperatures rather than actual temperature values. Using value mappings this way can make data faster and easier to understand and interpret.
 
-![Value mappings example](/static/img/docs/value-mappings/value-mappings-example-8-0.png)
+![Value mappings applied to a gauge visualization](/media/docs/grafana/panels-visualizations/screenshot-value-mappings-v10.4.png)
 
-If value mappings are present in a panel, then Grafana displays a summary in the side pane of the panel editor.
+Value mappings bypass unit formatting set in the **Standard options** section of panel editor, like color or number of decimal places displayed. When value mappings are present in a panel, Grafana displays a summary of them in the **Value mappings** section of the editor panel.
+
+## Supported visualizations
+
+You can configure value mappings for the following visualizations:
+
+|                            |                                  |                                  |
+| -------------------------- | -------------------------------- | -------------------------------- |
+| [Bar chart][bar chart]     | [Geomap][geomap]                 | [Status history][status history] |
+| [Bar gauge][bar gauge]     | [Histogram][histogram]           | [Table][table]                   |
+| [Candlestick][candlestick] | [Pie chart][pie chart]           | [Time series][time series]       |
+| [Canvas][canvas]           | [Stat][stat]                     | [Trend][trend]                   |
+| [Gauge][gauge]             | [State timeline][state timeline] |                                  |
 
 ## Types of value mappings
 
-{{% admonition type="note" %}}
-The new value mappings are not compatible with some visualizations, such as Graph (old), Text, and Heatmap.
-{{% /admonition %}}
+Grafana supports the following value mapping types:
+
+### Value
+
+A **Value** mapping maps specific values to text and a color. For example, you can configure a mapping so that all instances of the value `10` appear as **Perfection!** rather than the number. Use **Value** mapping when you want to format a single value.
+![The value 10 mapped to the text Perfection!](/media/docs/grafana/panels-visualizations/screenshot-map-value-v10.4.png)
 
-Grafana supports the following value mappings:
+### Range
 
-- **Value:** Maps text values to a color or different display text. For example, you can configure a value mapping so that all instances of the value `10` appear as **Perfection!** rather than the number.
-- **Range:** Maps numerical ranges to a display text and color. For example, if a value is within a certain range, you can configure a range value mapping to display **Low** or **High** rather than the number.
-- **Regex:** Maps regular expressions to replacement text and a color. For example, if a value is `www.example.com`, you can configure a regex value mapping so that Grafana displays **www** and truncates the domain.
-- **Special** Maps special values like `Null`, `NaN` (not a number), and boolean values like `true` and `false` to a display text and color. For example, you can configure a special value mapping so that `null` values appear as **N/A**.
+A **Range** mapping maps numerical ranges to text and a color. For example, if a value is within a certain range, you can configure a range value mapping to display **Low** or **High** rather than the number. Use **Range** mapping when you want to format multiple, continuous values.
+![Ranges of numbers mapped to the text Low and High with colors yellow and red](/media/docs/grafana/panels-visualizations/screenshot-map-range-v10.4.png)
 
-You can also use the dots on the left to drag and reorder value mappings in the list.
+### Regex
+
+A **Regex** mapping maps regular expressions to text and a color. For example, if a value is `www.example.com`, you can configure a regular expression value mapping so that Grafana displays **www** and truncates the domain. Use the **Regex** mapping when you want to format the text and color of a regular expression value.
+![A regular expression used to truncate full URLs to the text wwww](/media/docs/grafana/panels-visualizations/screenshot-map-regex-v10.4.png)
+
+### Special
+
+A **Special** mapping maps special values like `Null`, `NaN` (not a number), and boolean values like `true` and `false` to text and color. For example, you can configure a special value mapping so that `null` values appear as **N/A**. Use the **Special** mapping when you want to format uncommon, boolean, or empty values.
+![The value null mapped to the text N/A](/media/docs/grafana/panels-visualizations/screenshot-map-special-v10.4.png)
 
 ## Examples
 
@@ -50,19 +72,19 @@ Refer to the following examples to learn more about value mapping.
 
 ### Time series example
 
-The following image shows a time series visualization with value mappings. Value mapping colors are not applied to this visualization, but the display text is shown on the axis.
+The following image shows a time series visualization with value mappings. Value mapping colors aren't applied to this visualization, but the display text is shown on the axis.
 
 ![Value mappings time series example](/static/img/docs/value-mappings/value-mappings-summary-example-8-0.png)
 
 ### Stat example
 
-The following image shows a Stat visualization with value mappings and text colors applied. You can hide the sparkline so it doesn't interfere with the values.
+The following image shows a stat visualization with value mappings and text colors applied. You can hide the sparkline so it doesn't interfere with the values.
 
 ![Value mappings stat example](/static/img/docs/value-mappings/value-mappings-stat-example-8-0.png)
 
 ### Bar gauge example
 
-The following image shows a bar gauge visualization with value mappings. The value mapping colors are applied to the text, but not to the gauges.
+The following image shows a bar gauge visualization with value mappings. Note that the value mapping colors are applied to the text, but not to the gauges.
 
 ![Value mappings bar gauge example](/static/img/docs/value-mappings/value-mappings-bar-gauge-example-8-0.png)
 
@@ -72,64 +94,67 @@ The following image shows a table visualization with value mappings. If you want
 
 ![Value mappings table example](/static/img/docs/value-mappings/value-mappings-table-example-8-0.png)
 
-## Map a value
+## Add a value mapping
+
+1. Navigate to the panel you want to update.
+1. Hover over any part of the panel you want to work on to display the menu on the top right corner.
+1. Click the menu and select **Edit**.
+1. Scroll to the **Value mappings** section and expand it.
+1. Click **Add value mappings**.
+1. Click **Add a new mapping** and then select one of the following:
 
-Map a value when you want to format a single value.
+   - **Value** - Enter a single value to match.
+   - **Range** - Enter the beginning and ending values of a range to match.
+   - **Regex** - Enter a regular expression pattern to match.
+   - **Special** - Select a special value to match.
 
-1. Open a panel for which you want to map a value.
-1. In panel display options, locate the **Value mappings** section and click **Add value mappings**.
-1. Click **Add a new mapping** and then select **Value**.
-1. Enter the value for Grafana to match.
 1. (Optional) Enter display text.
 1. (Optional) Set the color.
+1. (Optional) Set an icon (canvas visualizations only).
 1. Click **Update** to save the value mapping.
 
-![Map a value](/static/img/docs/value-mappings/map-value-8-0.png)
+After you've added a mapping, the **Edit value mappings** button replaces the **Add value mappings** button. Click the edit button to add or update mappings.
 
-## Map a range
+{{% docs/reference %}}
+[bar chart]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/bar-chart"
+[bar chart]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/bar-chart"
 
-Map a range of values when you want to format multiple, continuous values.
+[bar gauge]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/bar-gauge"
+[bar gauge]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/bar-gauge"
 
-1. Edit the panel for which you want to map a range of values.
-1. In panel display options, in the **Value mappings** section, click **Add value mappings**.
-1. Click **Add a new mapping** and then select **Range**.
-1. Enter the beginning and ending values in the range for Grafana to match.
-1. (Optional) Enter display text.
-1. (Optional) Set the color.
-1. Click **Update** to save the value mapping.
+[candlestick]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/candlestick"
+[candlestick]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/candlestick"
 
-![Map a range](/static/img/docs/value-mappings/map-range-8-0.png)
+[canvas]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/canvas"
+[canvas]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/canvas"
 
-## Map a regular expression
+[gauge]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/gauge"
+[gauge]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/gauge"
 
-Map a regular expression when you want to format the text and color of a regular expression value.
+[geomap]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/geomap"
+[geomap]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/geomap"
 
-1. Edit the panel for which you want to map a regular expression.
-1. In the **Value mappings** section of the panel display options, click **Add value mappings**.
-1. Click **Add a new mapping** and then select **Regex**.
-1. Enter the regular expression pattern for Grafana to match.
-1. (Optional) Enter display text.
-1. (Optional) Set the color.
-1. Click **Update** to save the value mapping.
+[histogram]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/histogram"
+[histogram]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/histogram"
 
-## Map a special value
+[pie chart]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/pie-chart"
+[pie chart]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/pie-chart"
 
-Map a special value when you want to format uncommon, boolean, or empty values.
+[stat]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/stat"
+[stat]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/stat"
 
-1. Edit the panel for which you want to map a special value.
-1. In panel display options, locate the **Value mappings** section and click **Add value mappings**.
-1. Click **Add a new mapping** and then select **Special**.
-1. Select the special value for Grafana to match.
-1. (Optional) Enter display text.
-1. (Optional) Set the color.
-1. Click **Update** to save the value mapping.
+[state timeline]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/state-timeline"
+[state timeline]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/state-timeline"
 
-![Map a value](/static/img/docs/value-mappings/map-special-value-8-0.png)
+[status history]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/status-history"
+[status history]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/status-history"
 
-## Edit a value mapping
+[table]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/table"
+[table]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/table"
 
-You can edit a value mapping at any time.
+[time series]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/time-series"
+[time series]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/time-series"
 
-1. Edit the panel that contains the value mapping you want to edit.
-1. In the panel display options, in the **Value mappings** section, click **Edit value mappings**.
-1. Make the changes and click **Update**.
+[trend]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/trend"
+[trend]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/trend"
+{{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/panel-editor-overview/index.md b/docs/sources/panels-visualizations/panel-editor-overview/index.md
index 3da60773c34fc..7c638b18ef8a5 100644
--- a/docs/sources/panels-visualizations/panel-editor-overview/index.md
+++ b/docs/sources/panels-visualizations/panel-editor-overview/index.md
@@ -15,76 +15,54 @@ keywords:
   - panel
   - dashboard
   - dynamic
-  - rows
   - add
 labels:
   products:
     - cloud
     - enterprise
     - oss
-menuTitle: Panel editor overview
-title: Panel editor overview
-weight: 1
+menuTitle: Panel editor
+title: Panel editor
+description: Learn about the features of the panel editor
+weight: 20
 ---
 
-# Panel editor overview
+# Panel editor
 
 In the panel editor, you can update all the elements of a visualization including the data source, queries, time range, and visualization display options.
 
 ![Panel editor](/media/docs/grafana/panels-visualizations/screenshot-panel-editor-view.png)
 
-To add a panel in a new dashboard click **+ Add visualization** in the middle of the dashboard. To add a panel to an existing dashboard, click **Add** in the dashboard header and select **Visualization** in the dropdown:
+This following sections describe the areas of the Grafana panel editor.
 
-![Add dropdown](/media/docs/grafana/dashboards/screenshot-add-dropdown-10.0.png)
+## Panel header
 
-## Panel editor
+The header section lists the dashboard in which the panel appears and the following controls:
 
-This section describes the areas of the Grafana panel editor.
+- **Discard:** Discards changes you have made to the panel since you last saved the dashboard.
+- **Save:** Saves changes you made to the panel.
+- **Apply:** Applies changes you made and closes the panel editor, returning you to the dashboard. You'll have to save the dashboard to persist the applied changes.
 
-1. Panel header: The header section lists the dashboard in which the panel appears and the following controls:
+## Visualization preview
 
-   - **Discard:** Discards changes you have made to the panel since you last saved the dashboard.
-   - **Save:** Saves changes you made to the panel.
-   - **Apply:** Applies changes you made and closes the panel editor, returning you to the dashboard. You will have to save the dashboard to persist the applied changes.
+The visualization preview section contains the following options:
 
-1. Visualization preview: The visualization preview section contains the following options:
+- **Table view:** Convert any visualization to a table so you can see the data. Table views are helpful for troubleshooting. This view only contains the raw data. It doesn't include transformations you might have applied to the data or the formatting options available in the [Table][] visualization.
+- **Fill:** The visualization preview fills the available space. If you change the width of the side pane or height of the bottom pane the visualization changes to fill the available space.
+- **Actual:** The visualization preview has the exact size as the size on the dashboard. If not enough space is available, the visualization scales down preserving the aspect ratio.
+- **Time range controls:** **Default** is either the browser local timezone or the timezone selected at a higher level.
 
-   - **Table view:** Convert any visualization to a table so you can see the data. Table views are helpful for troubleshooting. This view only contains the raw data. It does not include transformations you might have applied to the data or the formatting options available in the [Table][] visualization.
-   - **Fill:** The visualization preview fills the available space. If you change the width of the side pane or height of the bottom pane the visualization changes to fill the available space.
-   - **Actual:** The visualization preview will have the exact size as the size on the dashboard. If not enough space is available, the visualization will scale down preserving the aspect ratio.
-   - **Time range controls:** **Default** is either the browser local timezone or the timezone selected at a higher level.
+## Data section
 
-1. Data section: The data section contains tabs where you enter queries, transform your data, and create alert rules (if applicable).
+The data section contains tabs where you enter queries, transform your data, and create alert rules (if applicable).
 
-   - **Query tab:** Select your data source and enter queries here. For more information, refer to [Add a query][]. When you create a new dashboard, you'll be prompted to select a data source before you get to the panel editor. You set or update the data source in existing dashboards using the dropdown in the **Query** tab.
-   - **Transform tab:** Apply data transformations. For more information, refer to [Transform data][].
-   - **Alert tab:** Write alert rules. For more information, refer to [the overview of Grafana Alerting][].
+- **Query tab:** Select your data source and enter queries here. For more information, refer to [Add a query][]. When you create a new dashboard, you'll be prompted to select a data source before you get to the panel editor. You set or update the data source in existing dashboards using the drop-down in the **Query** tab.
+- **Transform tab:** Apply data transformations. For more information, refer to [Transform data][].
+- **Alert tab:** Write alert rules. For more information, refer to [the overview of Grafana Alerting][].
 
-1. Panel display options: The display options section contains tabs where you configure almost every aspect of your data visualization.
+## Panel display options
 
-## Panel inspect drawer
-
-The inspect drawer helps you understand and troubleshoot your panels. You can view the raw data for any panel, export that data to a comma-separated values (CSV) file, view query requests, and export panel and data JSON.
-
-To access the panel inspect drawer from the edit view, hover over any part of the panel to display the actions menu on the top right corner. Click the menu and select **Inspect**.
-
-{{% admonition type="note" %}}
-Not all panel types include all tabs. For example, dashboard list panels do not have raw data to inspect, so they do not display the Stats, Data, or Query tabs.
-{{% /admonition %}}
-
-The panel inspector consists of the following options:
-
-1. The panel inspect drawer displays opens a drawer on the right side. Click the arrow in the upper right corner to expand or reduce the drawer pane.
-
-1. **Data tab -** Shows the raw data returned by the query with transformations applied. Field options such as overrides and value mappings are not applied by default.
-
-1. **Stats tab -** Shows how long your query takes and how much it returns.
-
-1. **JSON tab -** Allows you to view and copy the panel JSON, panel data JSON, and data frame structure JSON. This is useful if you are provisioning or administering Grafana.
-
-1. **Query tab -** Shows you the requests to the server sent when Grafana queries the data source.
-
-1. **Error tab -** Shows the error. Only visible when query returns error.
+The display options section contains tabs where you configure almost every aspect of your data visualization.
 
 {{% docs/reference %}}
 [Table]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/table"
diff --git a/docs/sources/panels-visualizations/panel-inspector/index.md b/docs/sources/panels-visualizations/panel-inspector/index.md
index 01cbef7570e2c..a8086224d08fc 100644
--- a/docs/sources/panels-visualizations/panel-inspector/index.md
+++ b/docs/sources/panels-visualizations/panel-inspector/index.md
@@ -10,7 +10,8 @@ labels:
     - enterprise
     - oss
 title: The panel inspect view
-weight: 1200
+description: Inspect the raw data of your panels to understand and troubleshoot them
+weight: 30
 ---
 
 # The panel inspect view
diff --git a/docs/sources/panels-visualizations/panel-overview/index.md b/docs/sources/panels-visualizations/panel-overview/index.md
new file mode 100644
index 0000000000000..bcdbd4f2e0237
--- /dev/null
+++ b/docs/sources/panels-visualizations/panel-overview/index.md
@@ -0,0 +1,161 @@
+---
+keywords:
+  - transform
+  - query
+  - panel
+  - dashboard
+  - rows
+  - dynamic
+  - add
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+menuTitle: Panel overview
+title: Panel overview
+description: Learn about the features of the panel
+weight: 15
+---
+
+# Panel overview
+
+A Grafana panel is a visual representation of data composed of a [query][] and a [visualization][]. Within panels, you can apply [transformations][], which process the results of a query before they're passed on for visualization. You can also further customize a panel by formatting data and configuring visualization options.
+
+Each panel has a query editor specific to the data source selected in the panel. The query editor allows you to build a query that returns the data you want to visualize.
+
+Panels offer a wide variety of formatting and styling options, from applying colors based on field values to creating custom units. Each visualization also comes with options specific to it that give you further control over how your data is displayed. Panels can also be dragged, dropped, and resized to rearrange them on the dashboard.
+
+To get started adding panels, ensure that you have configured a data source:
+
+- For details about using data sources, refer to [Data sources][].
+- For more information about managing data sources as an administrator, refer to [Data source management][].
+
+  {{% admonition type="note" %}}
+  [Data source management](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/data-source-management/) is only available in [Grafana Enterprise](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/introduction/grafana-enterprise/) and [Grafana Cloud](https://grafana.com/docs/grafana-cloud/).
+  {{% /admonition %}}
+
+## Panel feature overview
+
+The panel has the following features:
+
+<!-- The following image and descriptions highlight all panel features. -->
+
+<!-- {{< figure src="tbd" width="700px" alt="An annotated image of a panel" >}} -->
+
+- **Panel title** - You can create your own panel titles or have Grafana create them for you using [generative AI features][ai].
+- **Links** - Add [panel links][] to other dashboards, panels, or external sites.
+- **Panel menu** - In the [panel menu](#panel-menu), access actions such as **View**, **Edit**, **Inspect**, and **Remove**.
+- **Tooltips** - View [tooltips][] to get more information about data points.
+- **Legend** - Change series colors, y-axis and series visibility directly from the [legend][].
+
+## Panel menu
+
+To access the panel editor, hover over the top-right corner of any panel. Click the panel menu icon that appears and select **Edit**. The panel menu gives you access to the following actions:
+
+- **View**: View the panel in full screen.
+- **Edit**: Open the panel editor to edit panel and visualization options.
+- **Share**: Share the panel as a link, embed, or library panel.
+- **Explore**: Open the panel in **Explore**, where you can focus on your query.
+- **Inspect**: Open the **Inspect** drawer, where you can review the panel data, stats, metadata, JSON, and query.
+  - **Data**: Open the **Inspect** drawer in the **Data** tab.
+  - **Query**: Open the **Inspect** drawer in the **Query** tab.
+  - **Panel JSON**: Open the **Inspect** drawer in the **JSON** tab.
+- **Extensions**: Access other actions provided by installed applications, such as declaring an incident. Note that this option doesn't appear unless you have app plugins installed which contribute an [extension](https://grafana.com/developers/plugin-tools/ui-extensions/) to the panel menu.
+- **More**: Access other panel actions.
+  - **Duplicate**: Make a copy of the panel. Duplicated panels query data separately from the original panel. You can use the special `Dashboard` data source to [share the same query results across panels][share] instead.
+  - **Copy**: Copy the panel to the clipboard.
+  - **Create library panel**: Create a panel that can be imported into other dashboards.
+  - **Create alert**: Open the alert rule configuration page in **Alerting**, where you can [create a Grafana-managed alert][create] based on the panel queries.
+  - **Hide legend**: Hide the panel legend.
+  - **Get help**: Send a snapshot or panel data to Grafana Labs Technical Support.
+- **Remove**: Remove the panel from the dashboard.
+
+## Keyboard shortcuts
+
+Grafana has a number of keyboard shortcuts available specifically for panels. Press `?` on your keyboard to display all keyboard shortcuts available in your version of Grafana.
+
+By hovering over a panel with the mouse you can use some shortcuts that will target that panel.
+
+- `e`: Toggle panel edit view
+- `v`: Toggle panel fullscreen view
+- `ps`: Open Panel Share Modal
+- `pd`: Duplicate Panel
+- `pr`: Remove Panel
+- `pl`: Toggle panel legend
+
+## Add a panel
+
+To add a panel in a new dashboard click **+ Add visualization** in the middle of the dashboard:
+
+![Empty dashboard state](/media/docs/grafana/dashboards/empty-dashboard-10.2.png)
+
+To add a panel to an existing dashboard, click **Add** in the dashboard header and select **Visualization** in the drop-down:
+
+![Add dropdown](/media/docs/grafana/dashboards/screenshot-add-dropdown-10.0.png)
+
+## Panel configuration
+
+To configure panels, refer to the following subtopics:
+
+- [Configure panel options][]
+- [Configure standard options][]
+- [Configure a legend][legend]
+- [Configure tooltips][tooltips]
+- [Configure data links][]
+- [Configure value mappings][]
+- [Configure thresholds][]
+- [Configure field overrides][]
+
+{{% docs/reference %}}
+[query]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data"
+[query]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data"
+
+[visualization]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations"
+[visualization]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations"
+
+[transformations]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data/transform-data"
+[transformations]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data/transform-data"
+
+[Data source management]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/administration/data-source-management"
+[Data source management]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA_VERSION>/administration/data-source-management"
+
+[Data sources]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources"
+[Data sources]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/connect-externally-hosted/data-sources"
+
+[ai]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/dashboards/manage-dashboards#set-up-generative-ai-features-for-dashboards"
+[ai]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/dashboards/manage-dashboards#set-up-generative-ai-features-for-dashboards"
+
+[panel links]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/manage-dashboard-links#panel-links"
+[panel links]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/dashboards/build-dashboards/manage-dashboard-links#panel-links"
+
+[tooltips]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-tooltips"
+[tooltips]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-tooltips"
+
+[legend]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-legend"
+[legend]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-legend"
+
+[share]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data/share-query"
+[share]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data/share-query"
+
+[create]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/create-grafana-managed-rule#create-alerts-from-panels"
+[create]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/create-grafana-managed-rule#create-alerts-from-panels"
+
+[Configure panel options]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-panel-options"
+[Configure panel options]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-panel-options"
+
+[Configure standard options]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-standard-options"
+[Configure standard options]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-standard-options"
+
+[Configure data links]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-data-links"
+[Configure data links]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-data-links"
+
+[Configure value mappings]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-value-mappings"
+[Configure value mappings]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-value-mappings"
+
+[Configure thresholds]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-thresholds"
+[Configure thresholds]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-thresholds"
+
+[Configure field overrides]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-overrides"
+[Configure field overrides]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-overrides"
+{{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/query-transform-data/_index.md b/docs/sources/panels-visualizations/query-transform-data/_index.md
index ba309c241632f..be31482eaab01 100644
--- a/docs/sources/panels-visualizations/query-transform-data/_index.md
+++ b/docs/sources/panels-visualizations/query-transform-data/_index.md
@@ -19,7 +19,8 @@ labels:
     - enterprise
     - oss
 title: Query and transform data
-weight: 200
+description: Query and transform your data
+weight: 40
 ---
 
 # Query and transform data
@@ -41,7 +42,7 @@ Grafana supports up to 26 queries per panel.
 
 ### Query editors
 
-{{< figure src="/static/img/docs/queries/influxdb-query-editor-7-2.png" class="docs-image--no-shadow" max-width="1000px" caption="The InfluxDB query editor" >}}
+{{< figure src="/static/img/docs/queries/influxdb-query-editor-7-2.png" class="docs-image--no-shadow" max-width="1000px" alt="The InfluxDB query editor" >}}
 
 Each data source's **query editor** provides a customized user interface that helps you write queries that take advantage of its unique capabilities.
 
@@ -94,7 +95,7 @@ A panel's Query tab consists of the following elements:
 - **Expressions:** Uses the expression builder to create alert expressions.
   For more information about expressions, refer to [Use expressions to manipulate data][].
 
-{{< figure src="/static/img/docs/queries/query-editor-7-2.png" class="docs-image--no-shadow" max-width="1000px" >}}
+{{< figure src="/static/img/docs/queries/query-editor-7-2.png" class="docs-image--no-shadow" max-width="1000px" alt="The Query tab of the panel editor" >}}
 
 ## Add a query
 
@@ -123,20 +124,20 @@ Each query row contains a query editor and is identified with a letter (A, B, C,
 
 You can:
 
-|                                                                    Icon                                                                     | Description                                                                                                                                                                                                                                     |
-| :-----------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-|  {{< figure src="/static/img/docs/queries/query-editor-help-7-4.png" class="docs-image--no-shadow" max-width="30px" max-height="30px" >}}   | Toggles query editor help. If supported by the data source, click this icon to display information on how to use the query editor or provide quick access to common queries.                                                                    |
-| {{< figure src="/static/img/docs/queries/duplicate-query-icon-7-0.png" class="docs-image--no-shadow" max-width="30px" max-height="30px" >}} | Copies a query. Duplicating queries is useful when working with multiple complex queries that are similar and you want to either experiment with different variants or do minor alterations.                                                    |
-|   {{< figure src="/static/img/docs/queries/hide-query-icon-7-0.png" class="docs-image--no-shadow" max-width="30px" max-height="30px" >}}    | Hides a query. Grafana does not send hidden queries to the data source.                                                                                                                                                                         |
-|  {{< figure src="/static/img/docs/queries/remove-query-icon-7-0.png" class="docs-image--no-shadow" max-width="30px" max-height="30px" >}}   | Removes a query. Removing a query permanently deletes it, but sometimes you can recover deleted queries by reverting to previously saved versions of the panel.                                                                                 |
-|   {{< figure src="/static/img/docs/queries/query-drag-icon-7-2.png" class="docs-image--no-shadow" max-width="30px" max-height="30px" >}}    | Reorders queries. Change the order of queries by clicking and holding the drag icon, then drag queries where desired. The order of results reflects the order of the queries, so you can often adjust your visual results based on query order. |
+|                                                                               Icon                                                                               | Description                                                                                                                                                                                                                                     |
+| :--------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+|     {{< figure src="/static/img/docs/queries/query-editor-help-7-4.png" class="docs-image--no-shadow" max-width="30px" max-height="30px" alt="Help icon" >}}     | Toggles query editor help. If supported by the data source, click this icon to display information on how to use the query editor or provide quick access to common queries.                                                                    |
+| {{< figure src="/static/img/docs/queries/duplicate-query-icon-7-0.png" class="docs-image--no-shadow" max-width="30px" max-height="30px" alt="Duplicate icon" >}} | Copies a query. Duplicating queries is useful when working with multiple complex queries that are similar and you want to either experiment with different variants or do minor alterations.                                                    |
+|      {{< figure src="/static/img/docs/queries/hide-query-icon-7-0.png" class="docs-image--no-shadow" max-width="30px" max-height="30px" alt="Hide icon" >}}      | Hides a query. Grafana does not send hidden queries to the data source.                                                                                                                                                                         |
+|    {{< figure src="/static/img/docs/queries/remove-query-icon-7-0.png" class="docs-image--no-shadow" max-width="30px" max-height="30px" alt="Remove icon">}}     | Removes a query. Removing a query permanently deletes it, but sometimes you can recover deleted queries by reverting to previously saved versions of the panel.                                                                                 |
+|      {{< figure src="/static/img/docs/queries/query-drag-icon-7-2.png" class="docs-image--no-shadow" max-width="30px" max-height="30px" alt="Drag icon" >}}      | Reorders queries. Change the order of queries by clicking and holding the drag icon, then drag queries where desired. The order of results reflects the order of the queries, so you can often adjust your visual results based on query order. |
 
 ## Query options
 
 Click **Query options** next to the data source selector to see settings for the selected data source.
 Changes you make here affect only queries made in this panel.
 
-{{< figure src="/static/img/docs/queries/data-source-options-7-0.png" class="docs-image--no-shadow" max-width="1000px" >}}
+{{< figure src="/static/img/docs/queries/data-source-options-7-0.png" class="docs-image--no-shadow" max-width="1000px" alt="Data source query options" >}}
 
 Grafana sets defaults that are shown in dark gray text.
 Changes are displayed in white text.
@@ -157,6 +158,11 @@ Panel data source query options include:
 - **Min interval:** Sets a minimum limit for the automatically calculated interval, which is typically the minimum scrape interval.
   If a data point is saved every 15 seconds, you don't benefit from having an interval lower than that.
   You can also set this to a higher minimum than the scrape interval to retrieve queries that are more coarse-grained and well-functioning.
+
+  {{% admonition type="note" %}}
+  The **Min interval** corresponds to the min step in Prometheus. Changing the Prometheus interval can change the start and end of the query range because Prometheus aligns the range to the interval. Refer to [Min step](https://grafana.com/docs/grafana/latest/datasources/prometheus/query-editor/#min-step) for more details.
+  {{% /admonition %}}
+
 - **Interval:** Sets a time span that you can use when aggregating or grouping data points by time.
 
   Grafana automatically calculates an appropriate interval that you can use as a variable in templated queries.
@@ -184,6 +190,8 @@ Panel data source query options include:
   | This week so far | `now/w`             |
   | Last 2 years     | `now-2y/y`          |
 
+{{< docs/play title="Time range override" url="https://play.grafana.org/d/000000041/" >}}
+
 - **Time shift:** Overrides the time range for individual panels by shifting its start and end relative to the time picker.
   For example, you can shift the time range for the panel to be two hours earlier than the dashboard time picker.
 
diff --git a/docs/sources/panels-visualizations/query-transform-data/calculation-types/index.md b/docs/sources/panels-visualizations/query-transform-data/calculation-types/index.md
new file mode 100644
index 0000000000000..db767b152bae4
--- /dev/null
+++ b/docs/sources/panels-visualizations/query-transform-data/calculation-types/index.md
@@ -0,0 +1,45 @@
+---
+aliases:
+  - ../../panels/calculation-types/ # /docs/grafana/<GRAFANA VERSION>/panels/calculation-types/
+  - ../../panels/calculations-list/ # /docs/grafana/<GRAFANA VERSION>/panels/calculations-list/
+  - ../../panels/reference-calculation-types/ # /docs/grafana/<GRAFANA VERSION>/panels/reference-calculation-types/
+  - ../calculation-types/ # /docs/grafana/<GRAFANA VERSION>/panels-visualizations/calculation-types/
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Calculation types
+description: Learn about the calculations you can apply to your data
+weight: 1100
+---
+
+# Calculation types
+
+The following table contains a list of calculations you can perform in Grafana. You can find these calculations in the **Transform** tab and in the bar gauge, gauge, and stat visualizations.
+
+| Calculation        | Description                                               |
+| :----------------- | :-------------------------------------------------------- |
+| All nulls          | True when all values are null                             |
+| All values         | Array with all values                                     |
+| All unique values  | Array with all unique values                              |
+| All zeros          | True when all values are 0                                |
+| Change count       | Number of times the field's value changes                 |
+| Count              | Number of values in a field                               |
+| Delta              | Cumulative change in value, only counts increments        |
+| Difference         | Difference between first and last value of a field        |
+| Difference percent | Percentage change between first and last value of a field |
+| Distinct count     | Number of unique values in a field                        |
+| First              | First value in a field                                    |
+| First\* (not null) | First, not null value in a field (also excludes NaNs)     |
+| Last               | Last value in a field                                     |
+| Last\* (not null)  | Last, not null value in a field (also excludes NaNs)      |
+| Max                | Maximum value of a field                                  |
+| Mean               | Mean value of all values in a field                       |
+| Variance           | Variance of all values in a field                         |
+| StdDev             | Standard deviation of all values in a field               |
+| Min                | Minimum value of a field                                  |
+| Min (above zero)   | Minimum, positive value of a field                        |
+| Range              | Difference between maximum and minimum values of a field  |
+| Step               | Minimal interval between values of a field                |
+| Total              | Sum of all values in a field                              |
diff --git a/docs/sources/panels-visualizations/query-transform-data/expression-queries/index.md b/docs/sources/panels-visualizations/query-transform-data/expression-queries/index.md
index 23c51b3056a7c..18f6ef930c1ce 100644
--- a/docs/sources/panels-visualizations/query-transform-data/expression-queries/index.md
+++ b/docs/sources/panels-visualizations/query-transform-data/expression-queries/index.md
@@ -11,6 +11,7 @@ labels:
     - oss
 menuTitle: Write expression queries
 title: Write expression queries
+description: Write server-side expressions to manipulate data using math and other operations
 weight: 40
 ---
 
@@ -103,7 +104,7 @@ So if you have numbers with labels like `{host=web01}` in `$A` and another numbe
 - An item with no labels will join to anything.
 - If both `$A` and `$B` each contain only one item (one series, or one number), they will join.
 - If labels are exact math they will join.
-- If labels are a subset of the other, for example and item in `$A` is labeled `{host=A,dc=MIA}` and and item in `$B` is labeled `{host=A}` they will join.
+- If labels are a subset of the other, for example and item in `$A` is labeled `{host=A,dc=MIA}` and item in `$B` is labeled `{host=A}` they will join.
 - Currently, if within a variable such as `$A` there are different tag _keys_ for each item, the join behavior is undefined.
 
 The relational and logical operators return 0 for false 1 for true.
diff --git a/docs/sources/panels-visualizations/query-transform-data/share-query/index.md b/docs/sources/panels-visualizations/query-transform-data/share-query/index.md
index a73b484a95324..45a9e833d7080 100644
--- a/docs/sources/panels-visualizations/query-transform-data/share-query/index.md
+++ b/docs/sources/panels-visualizations/query-transform-data/share-query/index.md
@@ -8,6 +8,7 @@ labels:
     - oss
 menuTitle: Share query results
 title: Share query results with another panel
+description: Reduce the number of queries to your data source by sharing query results
 weight: 60
 ---
 
@@ -20,7 +21,8 @@ The Dashboard data source lets you select a panel in your dashboard that contain
 This strategy can drastically reduce the number of queries being made when you for example have several panels visualizing the same data.
 
 1. [Create a dashboard][].
-1. Change the title to "Source panel". You'll use this panel as a source for the other panels.
+1. Create a panel.
+1. Change the panel title to "Source panel". You'll use this panel as a source for the other panels.
 1. Define the [query][] or queries that you want share.
 
    If you don't have a data source available, use the **Grafana** data source, which returns a random time series that you can use for testing.
diff --git a/docs/sources/panels-visualizations/query-transform-data/transform-data/index.md b/docs/sources/panels-visualizations/query-transform-data/transform-data/index.md
index 5bbec1eba119d..7d62852402381 100644
--- a/docs/sources/panels-visualizations/query-transform-data/transform-data/index.md
+++ b/docs/sources/panels-visualizations/query-transform-data/transform-data/index.md
@@ -39,6 +39,7 @@ labels:
     - enterprise
     - oss
 title: Transform data
+description: Use transformations to rename fields, join series data, apply mathematical operations, and more
 weight: 100
 ---
 
@@ -80,7 +81,7 @@ The following steps guide you in adding a transformation to data. This documenta
    For information about available calculations, refer to [Calculation types][].
 1. To apply another transformation, click **Add transformation**.
    This transformation acts on the result set returned by the previous transformation.
-   {{< figure src="/static/img/docs/transformations/transformations-7-0.png" class="docs-image--no-shadow" max-width= "1100px" >}}
+   {{< figure src="/static/img/docs/transformations/transformations-7-0.png" class="docs-image--no-shadow" max-width= "1100px" alt="Transform tab in the panel editor" >}}
 
 ## Debug a transformation
 
@@ -88,19 +89,21 @@ To see the input and the output result sets of the transformation, click the bug
 
 The input and output results sets can help you debug a transformation.
 
-{{< figure src="/static/img/docs/transformations/debug-transformations-7-0.png" class="docs-image--no-shadow" max-width= "1100px" >}}
+{{< figure src="/static/img/docs/transformations/debug-transformations-7-0.png" class="docs-image--no-shadow" max-width= "1100px" alt="The debug transformation screen with the debug icon highlighted" >}}
 
 ## Disable a transformation
 
 You can disable or hide one or more transformations by clicking on the eye icon on the top right side of the transformation row. This disables the applied actions of that specific transformation and can help to identify issues when you change several transformations one after another.
 
-{{< figure src="/static/img/docs/transformations/screenshot-example-disable-transformation.png" class="docs-image--no-shadow" max-width= "1100px" >}}
+{{< figure src="/static/img/docs/transformations/screenshot-example-disable-transformation.png" class="docs-image--no-shadow" max-width= "1100px" alt="A transformation row with the disable transformation icon highlighted" >}}
 
 ## Filter a transformation
 
 If your panel uses more than one query, you can filter these and apply the selected transformation to only one of the queries. To do this, click the filter icon on the top right of the transformation row. This opens a drop-down with a list of queries used on the panel. From here, you can select the query you want to transform.
 
-Note that the filter icon is always displayed if your panel has more than one query, but it may not work if previous transformations for merging the queries' outputs are applied. This is because one transformation takes the output of the previous one.
+You can also filter by annotations (which includes exemplars) to apply transformations to them. When you do so, the list of fields changes to reflect those in the annotation or exemplar tooltip.
+
+The filter icon is always displayed if your panel has more than one query or source of data (that is, panel or annotation data) but it may not work if previous transformations for merging the queries’ outputs are applied. This is because one transformation takes the output of the previous one.
 
 ## Delete a transformation
 
@@ -116,7 +119,7 @@ We recommend that you remove transformations that you don't need. When you delet
 1. Click the **Transform** tab.
 1. Click the trash icon next to the transformation you want to delete.
 
-{{< figure src="/static/img/docs/transformations/screenshot-example-remove-transformation.png" class="docs-image--no-shadow" max-width= "1100px" >}}
+{{< figure src="/static/img/docs/transformations/screenshot-example-remove-transformation.png" class="docs-image--no-shadow" max-width= "1100px" alt="A transformation row with the remove transformation icon highlighted" >}}
 
 ## Transformation functions
 
@@ -126,30 +129,46 @@ You can perform the following transformations on your data.
 
 Use this transformation to add a new field calculated from two other fields. Each transformation allows you to add one new field.
 
-- **Mode -** Select a mode:
-  - **Reduce row -** Apply selected calculation on each row of selected fields independently.
-  - **Binary operation -** Apply basic binary operations (for example, sum or multiply) on values in a single row from two selected fields.
-  - **Unary operation -** Apply basic unary operations on values in a single row from a selected field. The available operations are:
+- **Mode** - Select a mode:
+  - **Reduce row** - Apply selected calculation on each row of selected fields independently.
+  - **Binary operation** - Apply basic binary operations (for example, sum or multiply) on values in a single row from two selected fields.
+  - **Unary operation** - Apply basic unary operations on values in a single row from a selected field. The available operations are:
     - **Absolute value (abs)** - Returns the absolute value of a given expression. It represents its distance from zero as a positive number.
     - **Natural exponential (exp)** - Returns _e_ raised to the power of a given expression.
     - **Natural logarithm (ln)** - Returns the natural logarithm of a given expression.
     - **Floor (floor)** - Returns the largest integer less than or equal to a given expression.
     - **Ceiling (ceil)** - Returns the smallest integer greater than or equal to a given expression.
-  - **Row index -** Insert a field with the row index.
-- **Field name -** Select the names of fields you want to use in the calculation for the new field.
-- **Calculation -** If you select **Reduce row** mode, then the **Calculation** field appears. Click in the field to see a list of calculation choices you can use to create the new field. For information about available calculations, refer to [Calculation types][].
-- **Operation -** If you select **Binary operation** or **Unary operation** mode, then the **Operation** fields appear. These fields allow you to apply basic math operations on values in a single row from selected fields. You can also use numerical values for binary operations.
-- **As percentile -** If you select **Row index** mode, then the **As percentile** switch appears. This switch allows you to transform the row index as a percentage of the total number of rows.
-- **Alias -** (Optional) Enter the name of your new field. If you leave this blank, then the field will be named to match the calculation.
-- **Replace all fields -** (Optional) Select this option if you want to hide all other fields and display only your calculated field in the visualization.
+  - **Cumulative functions** - Apply functions on the current row and all preceding rows.
+    - **Total** - Calculates the cumulative total up to and including the current row.
+    - **Mean** - Calculates the mean up to and including the current row.
+  - **Window functions** - Apply window functions. The window can either be **trailing** or **centered**.
+    With a trailing window the current row will be the last row in the window.
+    With a centered window the window will be centered on the current row.
+    For even window sizes, the window will be centered between the current row, and the previous row.
+    - **Mean** - Calculates the moving mean or running average.
+    - **Stddev** - Calculates the moving standard deviation.
+    - **Variance** - Calculates the moving variance.
+  - **Row index** - Insert a field with the row index.
+- **Field name** - Select the names of fields you want to use in the calculation for the new field.
+- **Calculation** - If you select **Reduce row** mode, then the **Calculation** field appears. Click in the field to see a list of calculation choices you can use to create the new field. For information about available calculations, refer to [Calculation types][].
+- **Operation** - If you select **Binary operation** or **Unary operation** mode, then the **Operation** fields appear. These fields allow you to apply basic math operations on values in a single row from selected fields. You can also use numerical values for binary operations.
+- **As percentile** - If you select **Row index** mode, then the **As percentile** switch appears. This switch allows you to transform the row index as a percentage of the total number of rows.
+- **Alias** - (Optional) Enter the name of your new field. If you leave this blank, then the field will be named to match the calculation.
+- **Replace all fields** - (Optional) Select this option if you want to hide all other fields and display only your calculated field in the visualization.
+
+> **Note:** **Cumulative functions** and **Window functions** modes are currently in public preview. Grafana Labs offers limited support, and breaking changes might occur prior to the feature being made generally available. Enable the `addFieldFromCalculationStatFunctions` feature toggle in Grafana to use this feature. Contact Grafana Support to enable this feature in Grafana Cloud.
 
 In the example below, we added two fields together and named them Sum.
 
-{{< figure src="/static/img/docs/transformations/add-field-from-calc-stat-example-7-0.png" class="docs-image--no-shadow" max-width= "1100px" >}}
+{{< figure src="/static/img/docs/transformations/add-field-from-calc-stat-example-7-0.png" class="docs-image--no-shadow" max-width= "1100px" alt="A stat visualization including one field called Sum" >}}
 
 ### Concatenate fields
 
-Use this transformation to combine all fields from all frames into one result. Consider the following:
+Use this transformation to combine all fields from all frames into one result.
+
+For example, if you have separate queries retrieving temperature and uptime data (Query A) and air quality index and error information (Query B), applying the concatenate transformation yields a consolidated data frame with all relevant information in one view.
+
+Consider the following:
 
 **Query A:**
 
@@ -169,21 +188,21 @@ After you concatenate the fields, the data frame would be:
 | ---- | ------- | --- | ------ |
 | 15.4 | 1230233 | 3.2 | 5      |
 
+This transformation simplifies the process of merging data from different sources, providing a comprehensive view for analysis and visualization.
+
 ### Config from query results
 
-Use this transformation to select one query and from it extract standard options such as
-**Min**, **Max**, **Unit**, and **Thresholds** and apply them to other query results.
-This enables dynamic query driven visualization configuration.
+Use this transformation to select a query and extract standard options, such as **Min**, **Max**, **Unit**, and **Thresholds**, and apply them to other query results. This feature enables dynamic visualization configuration based on the data returned by a specific query.
 
 #### Options
 
-- **Config query**: Select the query that returns the data you want to use as configuration.
-- **Apply to**: Select what fields or series to apply the configuration to.
-- **Apply to options**: Usually a field type or field name regex depending on what option you selected in **Apply to**.
+- **Config query** - Select the query that returns the data you want to use as configuration.
+- **Apply to** - Select the fields or series to which the configuration should be applied.
+- **Apply to options** - Specify a field type or use a field name regex, depending on your selection in **Apply to**.
 
 #### Field mapping table
 
-Below the configuration listed above you will find the field table. Here all fields found in the data returned by the config query will be listed along with a **Use as** and **Select** option. This table gives you control over what field should be mapped to which config property and if there are multiple rows which value to select.
+Below the configuration options, you'll find the field mapping table. This table lists all fields found in the data returned by the config query, along with **Use as** and **Select** options. It provides control over mapping fields to config properties, and for multiple rows, it allows you to choose which value to select.
 
 #### Example
 
@@ -208,14 +227,11 @@ Output (Same as Input[0] but now with config on the Value field)
 | 1626178119127 | 10                      |
 | 1626178119129 | 30                      |
 
-Each row in the source data becomes a separate field. Each field now also has a maximum
-configuration option set. Options such as **min**, **max**, **unit**, and **thresholds** are all part of field configuration, and if they are set like this, they will be used by the visualization instead of any options that are manually configured.
-in the panel editor options pane.
+Each row in the source data becomes a separate field. Each field now has a maximum configuration option set. Options such as **Min**, **Max**, **Unit**, and **Thresholds** are part of the field configuration. If set, they are used by the visualization instead of any options manually configured in the panel editor options pane.
 
 #### Value mappings
 
-You can also transform a query result into value mappings. This is is a bit different because every
-row in the configuration query result is used to define a single value mapping row. See the following example.
+You can also transform a query result into value mappings. With this option, every row in the configuration query result defines a single value mapping row. See the following example.
 
 Config query result:
 
@@ -227,27 +243,32 @@ Config query result:
 
 In the field mapping specify:
 
-| Field | Use as                  | Select     |
-| ----- | ----------------------- | ---------- |
-| Value | Value mappings / Value  | All values |
-| Text  | Value mappings / Text   | All values |
-| Color | Value mappings / Ciolor | All values |
+| Field | Use as                 | Select     |
+| ----- | ---------------------- | ---------- |
+| Value | Value mappings / Value | All values |
+| Text  | Value mappings / Text  | All values |
+| Color | Value mappings / Color | All values |
 
-Grafana will build the value mappings from you query result and apply it the the real data query results. You should see values being mapped and colored according to the config query results.
+Grafana builds value mappings from your query result and applies them to the real data query results. You should see values being mapped and colored according to the config query results.
 
 ### Convert field type
 
-Use this transformation to change the field type of the specified field.
+Use this transformation to modify the field type of a specified field.
 
-- **Field -** Select from available fields
-- **as -** Select the FieldType to convert to
-  - **Numeric -** attempts to make the values numbers
-  - **String -** will make the values strings
-  - **Time -** attempts to parse the values as time
+This transformation has the following options:
+
+- **Field** - Select from available fields
+- **as** - Select the FieldType to convert to
+  - **Numeric** - attempts to make the values numbers
+  - **String** - will make the values strings
+  - **Time** - attempts to parse the values as time
     - Will show an option to specify a DateFormat as input by a string like yyyy-mm-dd or DD MM YYYY hh:mm:ss
-  - **Boolean -** will make the values booleans
+  - **Boolean** - will make the values booleans
+  - **Enum** - will make the values enums
+    - Will show a table to manage the enums
+  - **Other** - attempts to parse the values as JSON
 
-For example, the following query could be modified by selecting the time field, as Time, and Date Format as YYYY.
+For example, consider the following query that could be modified by selecting the time field as Time and specifying Date Format as YYYY.
 
 #### Sample Query
 
@@ -269,21 +290,23 @@ The result:
 | 2019-01-01 00:00:00 | below | 29    |
 | 2020-01-01 00:00:00 | above | 22    |
 
+This transformation allows you to flexibly adapt your data types, ensuring compatibility and consistency in your visualizations.
+
 ### Extract fields
 
-Use this transformation to select one source of data and extract content from it in different formats. Set the following fields:
+Use this transformation to select a source of data and extract content from it in different formats. This transformation has the following fields:
 
 - **Source** - Select the field for the source of data.
-- **Format** - Select one of the following:
-  - **JSON** - To parse JSON content from the source.
-  - **Key+value parse** - To parse content in the format 'a=b' or 'c:d' from the source.
-  - **Auto** - To discover fields automatically.
-- **Replace all fields** - Optional: Select this option if you want to hide all other fields and display only your calculated field in the visualization.
-- **Keep time** - Optional: Only available if **Replace all fields** is true. Keep the time field in the output.
+- **Format** - Choose one of the following:
+  - **JSON** - Parse JSON content from the source.
+  - **Key+value pairs** - Parse content in the format 'a=b' or 'c:d' from the source.
+  - **Auto** - Discover fields automatically.
+- **Replace All Fields** - (Optional) Select this option to hide all other fields and display only your calculated field in the visualization.
+- **Keep Time** - (Optional) Available only if **Replace All Fields** is true. Keeps the time field in the output.
 
-Consider the following data set:
+Consider the following dataset:
 
-#### Data Set Example
+#### Dataset Example
 
 | Timestamp           | json_data     |
 | ------------------- | ------------- |
@@ -310,18 +333,22 @@ This will generate the following output:
 | 1636678680000000000 | 5        |
 | 1636678620000000000 | 12       |
 
+This transformation allows you to extract and format data in various ways. You can customize the extraction format based on your specific data needs.
+
 ### Lookup fields from resource
 
-Use this transformation on a field value to look up additional fields from an external source.
+Use this transformation to enrich a field value by looking up additional fields from an external source.
 
-- **Field** - Select a text field.
-- **Lookup** - Select from **Countries**, **USA States**, and **Airports**.
+This transformation has the following fields:
+
+- **Field** - Select a text field from your dataset.
+- **Lookup** - Choose from **Countries**, **USA States**, and **Airports**.
 
 This transformation currently supports spatial data.
 
 For example, if you have this data:
 
-#### Data Set Example
+#### Dataset Example
 
 | Location  | Values |
 | --------- | ------ |
@@ -348,9 +375,11 @@ You'll get the following output:
 | Arkansas  |     |          |             |           | 1      |
 | Somewhere |     |          |             |           | 5      |
 
+This transformation lets you augment your data by fetching additional information from external sources, providing a more comprehensive dataset for analysis and visualization.
+
 ### Filter data by query refId
 
-Use this transformation in panels that have multiple queries, if you want to hide one or more of the queries.
+Use this transformation to hide one or more queries in panels that have multiple queries.
 
 Grafana displays the query identification letters in dark gray text. Click a query identifier to toggle filtering. If the query letter is white, then the results are displayed. If the query letter is dark, then the results are hidden.
 
@@ -358,33 +387,38 @@ Grafana displays the query identification letters in dark gray text. Click a que
 
 In the example below, the panel has three queries (A, B, C). We removed the B query from the visualization.
 
-{{< figure src="/static/img/docs/transformations/filter-by-query-stat-example-7-0.png" class="docs-image--no-shadow" max-width= "1100px" >}}
+{{< figure src="/static/img/docs/transformations/filter-by-query-stat-example-7-0.png" class="docs-image--no-shadow" max-width= "1100px" alt="A stat visualization with results from two queries, A and C" >}}
 
 ### Filter data by values
 
-Use this transformation to filter your data directly in Grafana and remove some data points from your query result. You have the option to include or exclude data that match one or more conditions you define. The conditions are applied on a selected field.
+Use this transformation to selectively filter data points directly within your visualization. This transformation provides options to include or exclude data based on one or more conditions applied to a selected field.
 
 This transformation is very useful if your data source does not natively filter by values. You might also use this to narrow values to display if you are using a shared query.
 
 The available conditions for all fields are:
 
-- **Regex:** Match a regex expression
-- **Is Null:** Match if the value is null
-- **Is Not Null:** Match if the value is not null
-- **Equal:** Match if the value is equal to the specified value
-- **Different:** Match if the value is different than the specified value
+- **Regex** - Match a regex expression.
+- **Is Null** - Match if the value is null.
+- **Is Not Null** - Match if the value is not null.
+- **Equal** - Match if the value is equal to the specified value.
+- **Different** - Match if the value is different than the specified value.
+
+The available conditions for string fields are:
+
+- **Contains substring** - Match if the value contains the specified substring (case insensitive).
+- **Does not contain substring** - Match if the value doesn't contain the specified substring (case insensitive).
 
 The available conditions for number fields are:
 
-- **Greater:** Match if the value is greater than the specified value
-- **Lower:** Match if the value is lower than the specified value
-- **Greater or equal:** Match if the value is greater or equal
-- **Lower or equal:** Match if the value is lower or equal
-- **Range:** Match a range between a specified minimum and maximum, min and max included
+- **Greater** - Match if the value is greater than the specified value.
+- **Lower** - Match if the value is lower than the specified value.
+- **Greater or equal** - Match if the value is greater or equal.
+- **Lower or equal** - Match if the value is lower or equal.
+- **Range** - Match a range between a specified minimum and maximum, min and max included.
 
-Consider the following data set:
+Consider the following dataset:
 
-#### Data Set Example
+#### Dataset Example
 
 | Time                | Temperature | Altitude |
 | ------------------- | ----------- | -------- |
@@ -419,17 +453,17 @@ You can add more than one condition to the filter. For example, you might want t
 - Condition 1: Rows where 'Temperature' matches 'Lower' than '30'
 - Condition 2: Rows where 'Altitude' matches 'Greater' than '100'
 
-When you have more than one condition, you can choose if you want the action (include / exclude) to be applied on rows that **Match all** conditions or **Match any** of the conditions you added.
+When you have more than one condition, you can choose if you want the action (include/exclude) to be applied on rows that **Match all** conditions or **Match any** of the conditions you added.
 
 In the example above, we chose **Match all** because we wanted to include the rows that have a temperature lower than 30°C _AND_ an altitude higher than 100. If we wanted to include the rows that have a temperature lower than 30°C _OR_ an altitude higher than 100 instead, then we would select **Match any**. This would include the first row in the original data, which has a temperature of 32°C (does not match the first condition) but an altitude of 101 (which matches the second condition), so it is included.
 
 Conditions that are invalid or incompletely configured are ignored.
 
-### Filter fields by name
+This versatile data filtering transformation lets you to selectively include or exclude data points based on specific conditions. Customize the criteria to tailor your data presentation to meet your unique analytical needs.
 
-Use this transformation to remove parts of the query results.
+### Filter fields by name
 
-You can filter field names in three different ways:
+Use this transformation to selectively remove parts of your query results. There are three ways to filter field names:
 
 - [Using a regular expression](#use-a-regular-expression)
 - [Manually selecting included fields](#manually-select-included-fields)
@@ -439,7 +473,7 @@ You can filter field names in three different ways:
 
 When you filter using a regular expression, field names that match the regular expression are included.
 
-From the input data:
+For example, from the input data:
 
 | Time                | dev-eu-west | dev-eu-north | prod-eu-west | prod-eu-north |
 | ------------------- | ----------- | ------------ | ------------ | ------------- |
@@ -453,7 +487,7 @@ The result from using the regular expression 'prod.\*' would be:
 | 2023-03-04 23:56:23 | 22.2         | 20.2          |
 | 2023-03-04 23:56:23 | 22.1         | 20.1          |
 
-The regular expression can include an interpolated dashboard variable by using the ${$variableName} syntax.
+The regular expression can include an interpolated dashboard variable by using the ${variableName} syntax.
 
 #### Manually select included fields
 
@@ -463,36 +497,58 @@ Click and uncheck the field names to remove them from the result. Fields that ar
 
 Enable 'From variable' to let you select a dashboard variable that's used to include fields. By setting up a [dashboard variable][] with multiple choices, the same fields can be displayed across multiple visualizations.
 
-{{< figure src="/static/img/docs/transformations/filter-name-table-before-7-0.png" class="docs-image--no-shadow" max-width= "1100px" >}}
+{{< figure src="/static/img/docs/transformations/filter-name-table-before-7-0.png" class="docs-image--no-shadow" max-width= "1100px" alt="A table visualization with time, value, Min, and Max columns" >}}
 
 Here's the table after we applied the transformation to remove the Min field.
 
-{{< figure src="/static/img/docs/transformations/filter-name-table-after-7-0.png" class="docs-image--no-shadow" max-width= "1100px" >}}
+{{< figure src="/static/img/docs/transformations/filter-name-table-after-7-0.png" class="docs-image--no-shadow" max-width= "1100px" alt="A table visualization with time, value, and Max columns" >}}
 
 Here is the same query using a Stat visualization.
 
-{{< figure src="/static/img/docs/transformations/filter-name-stat-after-7-0.png" class="docs-image--no-shadow" max-width= "1100px" >}}
+{{< figure src="/static/img/docs/transformations/filter-name-stat-after-7-0.png" class="docs-image--no-shadow" max-width= "1100px" alt="A stat visualization with value and Max fields" >}}
+
+This transformation provides flexibility in tailoring your query results to focus on the specific fields you need for effective analysis and visualization.
 
 ### Format string
 
-> **Note:** This transformation is an experimental feature. Engineering and on-call support is not available. Documentation is either limited or not provided outside of code comments. No SLA is provided. Enable the 'formatString' in Grafana to use this feature. Contact Grafana Support to enable this feature in Grafana Cloud.
+Use this transformation to customize the output of a string field. This transformation has the following fields:
 
-Use this transformation to format the output of a string field. You can format output in the following ways:
+- **Upper case** - Formats the entire string in uppercase characters.
+- **Lower case** - Formats the entire string in lowercase characters.
+- **Sentence case** - Formats the first character of the string in uppercase.
+- **Title case** - Formats the first character of each word in the string in uppercase.
+- **Pascal case** - Formats the first character of each word in the string in uppercase and doesn't include spaces between words.
+- **Camel case** - Formats the first character of each word in the string in uppercase, except the first word, and doesn't include spaces between words.
+- **Snake case** - Formats all characters in the string in lowercase and uses underscores instead of spaces between words.
+- **Kebab case** - Formats all characters in the string in lowercase and uses dashes instead of spaces between words.
+- **Trim** - Removes all leading and trailing spaces from the string.
+- **Substring** - Returns a substring of the string, using the specified start and end positions.
 
-- Upper case - Formats the entire string in upper case characters.
-- Lower case - Formats the entire string in lower case characters.
-- Sentence case - Formats the the first character of the string in upper case.
-- Title case - Formats the first character of each word in the string in upper case.
-- Pascal case - Formats the first character of each word in the string in upper case and doesn't include spaces between words.
-- Camel case - Formats the first character of each word in the string in upper case, except the first word, and doesn't include spaces between words.
-- Snake case - Formats all characters in the string in lower case and uses underscores instead of spaces between words.
-- Kebab case - Formats all characters in the string in lower case and uses dashes instead of spaces between words.
-- Trim - Removes all leading and trailing spaces from the string.
-- Substring - Returns a substring of the string, using the specified start and end positions.
+This transformation provides a convenient way to standardize and tailor the presentation of string data for better visualization and analysis.
+
+> **Note:** This transformation is currently in public preview. Grafana Labs offers limited support, and breaking changes might occur prior to the feature being made generally available. Enable the `formatString` feature toggle in Grafana to use this feature. Contact Grafana Support to enable this feature in Grafana Cloud.
 
 ### Format time
 
-Use this transformation to format the output of a time field. Output can be formatted using [Moment.js format strings](https://momentjs.com/docs/#/displaying/). For instance, if you would like to display only the year of a time field the format string 'YYYY' can be used to show the calendar year (e.g. 1999, 2012, etc.).
+Use this transformation to customize the output of a time field. Output can be formatted using [Moment.js format strings](https://momentjs.com/docs/#/displaying/). For example, if you want to display only the year of a time field, the format string 'YYYY' can be used to show the calendar year (for example, 1999 or 2012).
+
+**Before Transformation:**
+
+| Timestamp           | Event        |
+| ------------------- | ------------ |
+| 1636678740000000000 | System Start |
+| 1636678680000000000 | User Login   |
+| 1636678620000000000 | Data Updated |
+
+**After applying 'YYYY-MM-DD HH:mm:ss':**
+
+| Timestamp           | Event        |
+| ------------------- | ------------ |
+| 2021-11-12 14:25:40 | System Start |
+| 2021-11-12 14:24:40 | User Login   |
+| 2021-11-12 14:23:40 | Data Updated |
+
+This transformation lets you tailor the time representation in your visualizations, providing flexibility and precision in displaying temporal data.
 
 > **Note:** This transformation is available in Grafana 10.1+ as an alpha feature.
 
@@ -544,7 +600,7 @@ And we can add more than one calculation. For instance:
 - For field Server Status, we can calculate the _Last_ value to know what is the last state value for each server
 - For field Temperature, we can also calculate the _Last_ value to know what is the latest monitored temperature for each server
 
-We would then get :
+We would then get:
 
 | Server ID | CPU Temperature (mean) | CPU Temperature (last) | Time (last)         | Server Status (last) |
 | --------- | ---------------------- | ---------------------- | ------------------- | -------------------- |
@@ -552,11 +608,11 @@ We would then get :
 | server 2  | 88.6                   | 90                     | 2020-07-07 10:32:20 | Overload             |
 | server 3  | 59.6                   | 62                     | 2020-07-07 11:34:20 | OK                   |
 
-This transformation enables you to extract key information from your time series and display it in a convenient way.
+This transformation allows you to extract essential information from your time series and present it conveniently.
 
 ### Grouping to matrix
 
-Use this transformation to combine three fields-that will be used as input for the **Column**, **Row**, and **Cell value** fields-from the query output, and generate a matrix. This matrix will be calculated as follows:
+Use this transformation to combine three fields—which are used as input for the **Column**, **Row**, and **Cell value** fields from the query output—and generate a matrix. The matrix is calculated as follows:
 
 **Original data**
 
@@ -576,32 +632,90 @@ We can generate a matrix using the values of 'Server Status' as column names, th
 | server 2               | 88.6 |          |
 | server 3               |      | 59.6     |
 
+Use this transformation to construct a matrix by specifying fields from your query results. The matrix output reflects the relationships between the unique values in these fields. This helps you present complex relationships in a clear and structured matrix format.
+
+### Group to nested table
+
+Use this transformation to group the data by a specified field (column) value and process calculations on each group. Records are generated that share the same grouped field value, to be displayed in a nested table.
+
+To calculate a statistic for a field, click the selection box next to it and select the **Calculate** option:
+
+{{< figure src="/static/img/docs/transformations/nested-table-select-calculation.png" class="docs-image--no-shadow" max-width= "1100px" alt="A select box showing the Group and Calculate options for the transformation." >}}
+
+Once **Calculate** has been selected, another selection box will appear next to the respective field which will allow statistics to be selected:
+
+{{< figure src="/static/img/docs/transformations/nested-table-select-stat.png" class="docs-image--no-shadow" max-width= "1100px" alt="A select box showing available statistic calculations once the calculate option for the field has been selected." >}}
+
+For information about available calculations, refer to [Calculation types][].
+
+Here's an example of original data:
+
+| Time                | Server ID | CPU Temperature | Server Status |
+| ------------------- | --------- | --------------- | ------------- |
+| 2020-07-07 11:34:20 | server 1  | 80              | Shutdown      |
+| 2020-07-07 11:34:20 | server 3  | 62              | OK            |
+| 2020-07-07 10:32:20 | server 2  | 90              | Overload      |
+| 2020-07-07 10:31:22 | server 3  | 55              | OK            |
+| 2020-07-07 09:30:57 | server 3  | 62              | Rebooting     |
+| 2020-07-07 09:30:05 | server 2  | 88              | OK            |
+| 2020-07-07 09:28:06 | server 1  | 80              | OK            |
+| 2020-07-07 09:25:05 | server 2  | 88              | OK            |
+| 2020-07-07 09:23:07 | server 1  | 86              | OK            |
+
+This transformation has two steps. First, specify one or more fields by which to group the data. This groups all the same values of those fields together, as if you sorted them. For instance, if you group by the Server ID field, Grafana groups the data this way:
+
+| Server ID |                                                                                                                                                                                                                                                                                                     |
+| --------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| server 1  | <table><th><tr><td>Time</td><td>CPU Temperature</td><td>Server Status</td></tr></th><tbody><tr><td>2020-07-07 11:34:20</td><td>80</td><td>Shutdown</td></tr><tr><td>2020-07-07 09:28:06</td><td>80</td><td>OK</td></tr><tr><td>2020-07-07 09:23:07</td><td>86</td><td>OK</td></tr></tbody></table>  |
+| server 2  | <table><th><tr><td>Time</td><td>CPU Temperature</td><td>Server Status</td></tr></th><tbody><tr><td>2020-07-07 10:32:20</td><td>90</td><td>Overload</td></tr><tr><td>2020-07-07 09:30:05</td><td>88</td><td>OK</td></tr><tr><td>2020-07-07 09:25:05</td><td>88</td><td>OK</td></tr></tbody></table>  |
+| server 3  | <table><th><tr><td>Time</td><td>CPU Temperature</td><td>Server Status</td></tr></th><tbody><tr><td>2020-07-07 11:34:20</td><td>62</td><td>OK</td></tr><tr><td>2020-07-07 10:31:22</td><td>55</td><td>OK</td></tr><tr><td>2020-07-07 09:30:57</td><td>62</td><td>Rebooting</td></tr></tbody></table> |
+
+After choosing the field by which you want to group your data, you can add various calculations on the other fields and apply the calculation to each group of rows. For instance, you might want to calculate the average CPU temperature for each of those servers. To do so, add the **mean calculation** applied on the CPU Temperature field to get the following result:
+
+| Server ID | CPU Temperatute (mean) |                                                                                                                                                                                                                                            |
+| --------- | ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| server 1  | 82                     | <table><th><tr><td>Time</td><td>Server Status</td></tr></th><tbody><tr><td>2020-07-07 11:34:20</td><td>Shutdown</td></tr><tr><td>2020-07-07 09:28:06</td><td>OK</td></tr><tr><td>2020-07-07 09:23:07</td><td>OK</td></tr></tbody></table>  |
+| server 2  | 88.6                   | <table><th><tr><td>Time</td><td>Server Status</td></tr></th><tbody><tr><td>2020-07-07 10:32:20</td><td>Overload</td></tr><tr><td>2020-07-07 09:30:05</td><td>OK</td></tr><tr><td>2020-07-07 09:25:05</td><td>OK</td></tr></tbody></table>  |
+| server 3  | 59.6                   | <table><th><tr><td>Time</td><td>Server Status</td></tr></th><tbody><tr><td>2020-07-07 11:34:20</td><td>OK</td></tr><tr><td>2020-07-07 10:31:22</td><td>OK</td></tr><tr><td>2020-07-07 09:30:57</td><td>Rebooting</td></tr></tbody></table> |
+
 ### Create heatmap
 
-Use this transformation to prepare histogram data to be visualized over time. Similar to the Heatmap panel, this transformation allows you to convert histogram metrics to buckets over time.
+Use this transformation to prepare histogram data for visualizing trends over time. Similar to the heatmap visualization, this transformation converts histogram metrics into temporal buckets.
 
 #### X Bucket
 
 This setting determines how the x-axis is split into buckets.
 
-- **Size** - Specify a time interval in the input field. For example, a time range of '1h' makes the cells one hour wide on the x-axis.
-- **Count** - For non-time related series, use this option to define the number of elements in a bucket.
+- **Size** - Specify a time interval in the input field. For example, a time range of '1h' creates cells one hour wide on the x-axis.
+- **Count** - For non-time-related series, use this option to define the number of elements in a bucket.
 
 #### Y Bucket
 
 This setting determines how the y-axis is split into buckets.
 
 - **Linear**
-- **Logarithmic** - Use a base 2 or base 10.
-- **Symlog** - A symmetrical logarithmic scale. Use a base 2 or base 10; allows negative values.
+- **Logarithmic** - Choose between log base 2 or log base 10.
+- **Symlog** - Uses a symmetrical logarithmic scale. Choose between log base 2 or log base 10, allowing for negative values.
+
+Assume you have the following dataset:
+
+| Timestamp           | Value |
+| ------------------- | ----- |
+| 2023-01-01 12:00:00 | 5     |
+| 2023-01-01 12:15:00 | 10    |
+| 2023-01-01 12:30:00 | 15    |
+| 2023-01-01 12:45:00 | 8     |
+
+- With X Bucket set to 'Size: 15m' and Y Bucket as 'Linear', the histogram organizes values into time intervals of 15 minutes on the x-axis and linearly on the y-axis.
+- For X Bucket as 'Count: 2' and Y Bucket as 'Logarithmic (base 10)', the histogram groups values into buckets of two on the x-axis and use a logarithmic scale on the y-axis.
 
 ### Histogram
 
-Use this transformation to generate a histogram based on the input data.
+Use this transformation to generate a histogram based on input data, allowing you to visualize the distribution of values.
 
-- **Bucket size** - The distance between the lowest item in the bucket (xMin) and the highest item in the bucket (xMax).
-- **Bucket offset** - The offset for non-zero based buckets.
-- **Combine series** - Create a histogram using all the available series.
+- **Bucket size** - The range between the lowest and highest items in a bucket (xMin to xMax).
+- **Bucket offset** - The offset for non-zero-based buckets.
+- **Combine series** - Create a unified histogram using all available series.
 
 **Original data**
 
@@ -639,21 +753,23 @@ Series 2:
 | 8    | 9    | 0   | 0   | 1   | 1   |
 | 9    | 10   | 0   | 0   | 1   | 1   |
 
+Visualize the distribution of values using the generated histogram, providing insights into the data's spread and density.
+
 ### Join by field
 
-Use this transformation to join multiple results into a single table. This is especially useful for converting multiple
-time series results into a single wide table with a shared time field.
+Use this transformation to merge multiple results into a single table, enabling the consolidation of data from different queries.
+
+This is especially useful for converting multiple time series results into a single wide table with a shared time field.
 
 #### Inner join
 
-An inner join merges data from multiple tables where all tables share the same value from the selected field. This type of join excludes
-data where values do not match in every result.
+An inner join merges data from multiple tables where all tables share the same value from the selected field. This type of join excludes data where values do not match in every result.
 
 Use this transformation to combine the results from multiple queries (combining on a passed join field or the first time column) into one result, and drop rows where a successful join cannot occur.
 
 In the following example, two queries return table data. It is visualized as two separate tables before applying the inner join transformation.
 
-Query A:
+**Query A:**
 
 | Time                | Job     | Uptime    |
 | ------------------- | ------- | --------- |
@@ -661,7 +777,7 @@ Query A:
 | 2020-07-07 11:24:20 | postgre | 123001233 |
 | 2020-07-07 11:14:20 | postgre | 345001233 |
 
-Query B:
+**Query B:**
 
 | Time                | Server   | Errors |
 | ------------------- | -------- | ------ |
@@ -682,7 +798,7 @@ An outer join includes all data from an inner join and rows where values do not
 
 In the following example, two queries return table data. It is visualized as two tables before applying the outer join transformation.
 
-Query A:
+**Query A:**
 
 | Time                | Job     | Uptime    |
 | ------------------- | ------- | --------- |
@@ -690,7 +806,7 @@ Query A:
 | 2020-07-07 11:24:20 | postgre | 123001233 |
 | 2020-07-07 11:14:20 | postgre | 345001233 |
 
-Query B:
+**Query B:**
 
 | Time                | Server   | Errors |
 | ------------------- | -------- | ------ |
@@ -709,16 +825,19 @@ The result after applying the outer join transformation looks like the following
 
 In the following example, a template query displays time series data from multiple servers in a table visualization. The results of only one query can be viewed at a time.
 
-{{< figure src="/static/img/docs/transformations/join-fields-before-7-0.png" class="docs-image--no-shadow" max-width= "1100px" >}}
+{{< figure src="/static/img/docs/transformations/join-fields-before-7-0.png" class="docs-image--no-shadow" max-width= "1100px" alt="A table visualization showing results for one server" >}}
 
 I applied a transformation to join the query results using the time field. Now I can run calculations, combine, and organize the results in this new table.
 
-{{< figure src="/static/img/docs/transformations/join-fields-after-7-0.png" class="docs-image--no-shadow" max-width= "1100px" >}}
+{{< figure src="/static/img/docs/transformations/join-fields-after-7-0.png" class="docs-image--no-shadow" max-width= "1100px" alt="A table visualization showing results for multiple servers" >}}
+
+Combine and analyze data from various queries with table joining for a comprehensive view of your information.
 
 ### Join by labels
 
-Use this transformation to join multiple results into a single table. This is especially useful for converting multiple
-time series results into a single wide table with a shared **Label** field.
+Use this transformation to join multiple results into a single table.
+
+This is especially useful for converting multiple time series results into a single wide table with a shared **Label** field.
 
 - **Join** - Select the label to join by between the labels available or common across all time series.
 - **Value** - The name for the output result.
@@ -761,9 +880,11 @@ value: "what"
 | B       | J1  | 10   | 22    |
 | B       | J1  | 200  | 77    |
 
+Combine and organize time series data effectively with this transformation for comprehensive insights.
+
 ### Labels to fields
 
-Use this transformation to change time series results that include labels or tags into a table where each label's keys and values are included in the table result. The labels can be displayed as either columns or row values.
+Use this transformation to convert time series results with labels or tags into a table, including each label's keys and values in the result. Display labels as either columns or row values for enhanced data visualization.
 
 Given a query result of two time series:
 
@@ -823,11 +944,13 @@ After merge:
 | 2020-07-07 11:34:20 | ServerA | 10    |            |
 | 2020-07-07 11:34:20 |         | 20    | EU         |
 
+Convert your time series data into a structured table format for a clearer and more organized representation.
+
 ### Limit
 
-Use this transformation to limit the number of rows displayed.
+Use this transformation to restrict the number of rows displayed, providing a more focused view of your data. This is particularly useful when dealing with large datasets.
 
-In the example below, we have the following response from the data source:
+Below is an example illustrating the impact of the **Limit** transformation on a response from a data source:
 
 | Time                | Metric      | Value |
 | ------------------- | ----------- | ----- |
@@ -846,20 +969,22 @@ Here is the result after adding a Limit transformation with a value of '3':
 | 2020-07-07 11:34:20 | Humidity    | 22    |
 | 2020-07-07 10:32:20 | Humidity    | 29    |
 
-### Merge
+This transformation helps you tailor the visual presentation of your data to focus on the most relevant information.
 
-Use this transformation to combine the result from multiple queries into one single result. This is helpful when using the table panel visualization. Values that can be merged are combined into the same row. Values are mergeable if the shared fields contain the same data. For information, refer to [Table panel][].
+### Merge series/tables
 
-In the example below, we have two queries returning table data. It is visualized as two separate tables before applying the transformation.
+Use this transformation to combine the results from multiple queries into a single result, which is particularly useful when using the table panel visualization. This transformation merges values into the same row if the shared fields contain the same data.
 
-Query A:
+Here's an example illustrating the impact of the **Merge series/tables** transformation on two queries returning table data:
+
+**Query A:**
 
 | Time                | Job     | Uptime    |
 | ------------------- | ------- | --------- |
 | 2020-07-07 11:34:20 | node    | 25260122  |
 | 2020-07-07 11:24:20 | postgre | 123001233 |
 
-Query B:
+**Query B:**
 
 | Time                | Job     | Errors |
 | ------------------- | ------- | ------ |
@@ -873,21 +998,45 @@ Here is the result after applying the Merge transformation.
 | 2020-07-07 11:34:20 | node    | 15     | 25260122  |
 | 2020-07-07 11:24:20 | postgre | 5      | 123001233 |
 
-### Oraganize fields
+This transformation combines values from Query A and Query B into a unified table, enhancing the presentation of data for better insights.
 
-Use this transformation to rename, reorder, or hide fields returned by the query.
+### Organize fields by name
 
-> **Note:** This transformation only works in panels with a single query. If your panel has multiple queries, then you must either apply an Outer join transformation or remove the extra queries.
+Use this transformation to provide the flexibility to rename, reorder, or hide fields returned by a single query in your panel. This transformation is applicable only to panels with a single query. If your panel has multiple queries, consider using an "Outer join" transformation or removing extra queries.
 
-Grafana displays a list of fields returned by the query. You can:
+#### Transforming fields
 
-- Change field order by hovering your cursor over a field. The cursor turns into a hand and then you can drag the field to its new place.
-- Hide or show a field by clicking the eye icon next to the field name.
-- Rename fields by typing a new name in the **Rename <field>** box.
+Grafana displays a list of fields returned by the query, allowing you to perform the following actions:
+
+- **Change field order** - Hover over a field, and when your cursor turns into a hand, drag the field to its new position.
+- **Hide or show a field** - Use the eye icon next to the field name to toggle the visibility of a specific field.
+- **Rename fields** - Type a new name in the "Rename <field>" box to customize field names.
+
+#### Example:
+
+##### Original Query Result
+
+| Time                | Metric      | Value |
+| ------------------- | ----------- | ----- |
+| 2020-07-07 11:34:20 | Temperature | 25    |
+| 2020-07-07 11:34:20 | Humidity    | 22    |
+| 2020-07-07 10:32:20 | Humidity    | 29    |
+
+##### After Applying Field Overrides
+
+| Time                | Sensor      | Reading |
+| ------------------- | ----------- | ------- |
+| 2020-07-07 11:34:20 | Temperature | 25      |
+| 2020-07-07 11:34:20 | Humidity    | 22      |
+| 2020-07-07 10:32:20 | Humidity    | 29      |
+
+This transformation lets you to tailor the display of query results, ensuring a clear and insightful representation of your data in Grafana.
 
 ### Partition by values
 
-Use this transformation to eliminate the need for multiple queries to the same data source with different 'WHERE' clauses when graphing multiple series. Consider a metrics SQL table with the following data:
+Use this transformation to streamline the process of graphing multiple series without the need for multiple queries with different 'WHERE' clauses.
+
+This is particularly useful when dealing with a metrics SQL table, as illustrated below:
 
 | Time                | Region | Value |
 | ------------------- | ------ | ----- |
@@ -896,14 +1045,7 @@ Use this transformation to eliminate the need for multiple queries to the same d
 | 2022-10-20 01:00:00 | US     | 1327  |
 | 2022-10-20 01:00:00 | EU     | 912   |
 
-Prior to v9.3, if you wanted to plot a red trendline for US and a blue one for EU in the same TimeSeries panel, you would likely have to split this into two queries:
-
-'SELECT Time, Value FROM metrics WHERE Time > "2022-10-20" AND Region="US"'<br>
-'SELECT Time, Value FROM metrics WHERE Time > "2022-10-20" AND Region="EU"'
-
-This also requires you to know ahead of time which regions actually exist in the metrics table.
-
-With the _Partition by values_ transformer, you can now issue a single query and split the results by unique values in one or more columns ('fields') of your choosing. The following example uses 'Region'.
+With the **Partition by values** transformation, you can issue a single query and split the results by unique values in one or more columns (fields) of your choosing. The following example uses 'Region':
 
 'SELECT Time, Region, Value FROM metrics WHERE Time > "2022-10-20"'
 
@@ -917,32 +1059,70 @@ With the _Partition by values_ transformer, you can now issue a single query and
 | 2022-10-20 12:00:00 | EU     | 2936  |
 | 2022-10-20 01:00:00 | EU     | 912   |
 
+This transformation simplifies the process and enhances the flexibility of visualizing multiple series within the same time series visualization.
+
 ### Prepare time series
 
-Use this transformation when a data source returns time series data in a format that isn't supported by the panel you want to use. For more information about data frame formats, refer to [Data frames][].
+Use this transformation to address issues when a data source returns time series data in a format that isn't compatible with the desired visualization. This transformation allows you to convert time series data between wide and long formats, providing flexibility in data frame structures.
+
+#### Available options
+
+##### Multi-frame time series
+
+Use this option to transform the time series data frame from the wide format to the long format. This is particularly helpful when your data source delivers time series information in a format that needs to be reshaped for optimal compatibility with your visualization.
 
-This transformation helps you resolve this issue by converting the time series data from either the wide format to the long format or the other way around.
+**Example: Converting from wide to long format**
 
-Select the 'Multi-frame time series' option to transform the time series data frame from the wide to the long format.
+| Timestamp           | Value1 | Value2 |
+| ------------------- | ------ | ------ |
+| 2023-01-01 00:00:00 | 10     | 20     |
+| 2023-01-01 01:00:00 | 15     | 25     |
 
-Select the 'Wide time series' option to transform the time series data frame from the long to the wide format.
+**Transformed to:**
+
+| Timestamp           | Variable | Value |
+| ------------------- | -------- | ----- |
+| 2023-01-01 00:00:00 | Value1   | 10    |
+| 2023-01-01 00:00:00 | Value2   | 20    |
+| 2023-01-01 01:00:00 | Value1   | 15    |
+| 2023-01-01 01:00:00 | Value2   | 25    |
+
+##### Wide time series
+
+Select this option to transform the time series data frame from the long format to the wide format. If your data source returns time series data in a long format and your visualization requires a wide format, this transformation simplifies the process.
+
+**Example: Converting from long to wide format**
+
+| Timestamp           | Variable | Value |
+| ------------------- | -------- | ----- |
+| 2023-01-01 00:00:00 | Value1   | 10    |
+| 2023-01-01 00:00:00 | Value2   | 20    |
+| 2023-01-01 01:00:00 | Value1   | 15    |
+| 2023-01-01 01:00:00 | Value2   | 25    |
+
+**Transformed to:**
+
+| Timestamp           | Value1 | Value2 |
+| ------------------- | ------ | ------ |
+| 2023-01-01 00:00:00 | 10     | 20     |
+| 2023-01-01 01:00:00 | 15     | 25     |
 
 > **Note:** This transformation is available in Grafana 7.5.10+ and Grafana 8.0.6+.
 
 ### Reduce
 
-Use this transformation to apply a calculation to each field in the frame and return a single value. Time fields are removed when applying this transformation.
+Use this transformation to apply a calculation to each field in the data frame and return a single value. This transformation is particularly useful for consolidating multiple time series data into a more compact, summarized format. Time fields are removed when applying this transformation.
 
 Consider the input:
 
-Query A:
+**Query A:**
 
 | Time                | Temp | Uptime  |
 | ------------------- | ---- | ------- |
 | 2020-07-07 11:34:20 | 12.3 | 256122  |
 | 2020-07-07 11:24:20 | 15.4 | 1230233 |
 
-Query B:
+**Query B:**
 
 | Time                | AQI | Errors |
 | ------------------- | --- | ------ |
@@ -951,8 +1131,8 @@ Query B:
 
 The reduce transformer has two modes:
 
-- **Series to rows -** Creates a row for each field and a column for each calculation.
-- **Reduce fields -** Keeps the existing frame structure, but collapses each field into a single value.
+- **Series to rows** - Creates a row for each field and a column for each calculation.
+- **Reduce fields** - Keeps the existing frame structure, but collapses each field into a single value.
 
 For example, if you used the **First** and **Last** calculation with a **Series to rows** transformation, then
 the result would be:
@@ -967,37 +1147,43 @@ the result would be:
 The **Reduce fields** with the **Last** calculation,
 results in two frames, each with one row:
 
-Query A:
+**Query A:**
 
 | Temp | Uptime  |
 | ---- | ------- |
 | 15.4 | 1230233 |
 
-Query B:
+**Query B:**
 
 | AQI | Errors |
 | --- | ------ |
 | 3.2 | 5      |
 
+This flexible transformation simplifies the process of consolidating and summarizing data from multiple time series into a more manageable and organized format.
+
 ### Rename by regex
 
 Use this transformation to rename parts of the query results using a regular expression and replacement pattern.
 
-You can specify a regular expression, which is only applied to matches, along with a replacement pattern that support back references. For example, let's imagine you're visualizing CPU usage per host and you want to remove the domain name. You could set the regex to '([^.]+)..+' and the replacement pattern to '$1', 'web-01.example.com' would become 'web-01'.
+You can specify a regular expression, which is only applied to matches, along with a replacement pattern that support back references. For example, let's imagine you're visualizing CPU usage per host and you want to remove the domain name. You could set the regex to '/^([^.]+).\*/' and the replacement pattern to '$1', 'web-01.example.com' would become 'web-01'.
+
+> **Note:** The Rename by regex transformation was improved in Grafana v9.0.0 to allow global patterns of the form '/<stringToReplace>/g'. Depending on the regex match used, this may cause some transformations to behave slightly differently. You can guarantee the same behavior as before by wrapping the match string in forward slashes '(/)', e.g. '(._)' would become '/(._)/'.
 
-In the following example, we are stripping the prefix from event types. In the before image, you can see everything is prefixed with 'system.'
+In the following example, we are stripping the 'A-' prefix from field names. In the before image, you can see everything is prefixed with 'A-':
 
-{{< figure src="/static/img/docs/transformations/rename-by-regex-before-7-3.png" class="docs-image--no-shadow" max-width= "1100px" >}}
+{{< figure src="/media/docs/grafana/panels-visualizations/screenshot-rename-by-regex-before-v11.0.png" class="docs-image--no-shadow" max-width= "1100px" alt="A time series with full series names" >}}
 
 With the transformation applied, you can see we are left with just the remainder of the string.
 
-{{< figure src="/static/img/docs/transformations/rename-by-regex-after-7-3.png" class="docs-image--no-shadow" max-width= "1100px" >}}
+{{< figure src="/media/docs/grafana/panels-visualizations/screenshot-rename-by-regex-after-v11.0.png" class="docs-image--no-shadow" max-width= "1100px" alt="A time series with shortened series names" >}}
+
+This transformation lets you to tailor your data to meet your visualization needs, making your dashboards more informative and user-friendly.
 
 ### Rows to fields
 
 Use this transformation to convert rows into separate fields. This can be useful because fields can be styled and configured individually. It can also use additional fields as sources for dynamic field configuration or map them to field labels. The additional labels can then be used to define better display names for the resulting fields.
 
-This transformation includes a field table which lists all fields in the data returned by the config query. This table gives you control over what field should be mapped to each config property (the \*Use as\*\* option). You can also choose which value to select if there are multiple rows in the returned data.
+This transformation includes a field table which lists all fields in the data returned by the configuration query. This table gives you control over what field should be mapped to each configuration property (the **Use as** option). You can also choose which value to select if there are multiple rows in the returned data.
 
 This transformation requires:
 
@@ -1019,14 +1205,14 @@ Useful when visualizing data in:
 
 If a field does not map to config property Grafana will automatically use it as source for a label on the output field-
 
-Example:
+**Example:**
 
 | Name    | DataCenter | Value |
 | ------- | ---------- | ----- |
 | ServerA | US         | 100   |
 | ServerB | EU         | 200   |
 
-Output:
+**Output:**
 
 | ServerA (labels: DataCenter: US) | ServerB (labels: DataCenter: EU) |
 | -------------------------------- | -------------------------------- |
@@ -1038,7 +1224,7 @@ If you want to extract config from one query and apply it to another you should
 
 #### Example
 
-Input:
+**Input:**
 
 | Name    | Value | Max |
 | ------- | ----- | --- |
@@ -1046,7 +1232,7 @@ Input:
 | ServerB | 20    | 200 |
 | ServerC | 30    | 300 |
 
-Output:
+**Output:**
 
 | ServerA (config: max=100) | ServerB (config: max=200) | ServerC (config: max=300) |
 | ------------------------- | ------------------------- | ------------------------- |
@@ -1054,6 +1240,8 @@ Output:
 
 As you can see each row in the source data becomes a separate field. Each field now also has a max config option set. Options like **Min**, **Max**, **Unit** and **Thresholds** are all part of field configuration and if set like this will be used by the visualization instead of any options manually configured in the panel editor options pane.
 
+This transformation enables the conversion of rows into individual fields, facilitates dynamic field configuration, and maps additional fields to labels.
+
 ### Series to rows
 
 Use this transformation to combine the result from multiple time series data queries into one single result. This is helpful when using the table panel visualization.
@@ -1062,7 +1250,7 @@ The result from this transformation will contain three columns: Time, Metric, an
 
 In the example below, we have two queries returning time series data. It is visualized as two separate tables before applying the transformation.
 
-Query A:
+**Query A:**
 
 | Time                | Temperature |
 | ------------------- | ----------- |
@@ -1070,7 +1258,7 @@ Query A:
 | 2020-07-07 10:31:22 | 22          |
 | 2020-07-07 09:30:05 | 19          |
 
-Query B:
+**Query B:**
 
 | Time                | Humidity |
 | ------------------- | -------- |
@@ -1089,30 +1277,72 @@ Here is the result after applying the Series to rows transformation.
 | 2020-07-07 09:30:57 | Humidity    | 33    |
 | 2020-07-07 09:30:05 | Temperature | 19    |
 
+This transformation facilitates the consolidation of results from multiple time series queries, providing a streamlined and unified dataset for efficient analysis and visualization in a tabular format.
+
 > **Note:** This transformation is available in Grafana 7.1+.
 
 ### Sort by
 
-Use this transformation to sort each frame by the configured field. When the **Reverse** switch is on, the values will return in the opposite order.
+Use this transformation to sort each frame within a query result based on a specified field, making your data easier to understand and analyze. By configuring the desired field for sorting, you can control the order in which the data is presented in the table or visualization.
+
+Use the **Reverse** switch to inversely order the values within the specified field. This functionality is particularly useful when you want to quickly toggle between ascending and descending order to suit your analytical needs.
+
+For example, in a scenario where time-series data is retrieved from a data source, the **Sort by** transformation can be applied to arrange the data frames based on the timestamp, either in ascending or descending order, depending on the analytical requirements. This capability ensures that you can easily navigate and interpret time-series data, gaining valuable insights from the organized and visually coherent presentation.
 
 ### Spatial
 
-Use this transformation to apply spatial operations to query results
+Use this transformation to apply spatial operations to query results.
+
+- **Action** - Select an action:
+  - **Prepare spatial field** - Set a geometry field based on the results of other fields.
+    - **Location mode** - Select a location mode (these options are shared by the **Calculate value** and **Transform** modes):
+      - **Auto** - Automatically identify location data based on default field names.
+      - **Coords** - Specify latitude and longitude fields.
+      - **Geohash** - Specify a geohash field.
+      - **Lookup** - Specify Gazetteer location fields.
+  - **Calculate value** - Use the geometry to define a new field (heading/distance/area).
+    - **Function** - Choose a mathematical operation to apply to the geometry:
+      - **Heading** - Calculate the heading (direction) between two points.
+      - **Area** - Calculate the area enclosed by a polygon defined by the geometry.
+      - **Distance** - Calculate the distance between two points.
+  - **Transform** - Apply spatial operations to the geometry.
+    - **Operation** - Choose an operation to apply to the geometry:
+      - **As line** - Create a single line feature with a vertex at each row.
+      - **Line builder** - Create a line between two points.
+
+This transformation allows you to manipulate and analyze geospatial data, enabling operations such as creating lines between points, calculating spatial properties, and more.
 
 ### Time series to table transform
 
-Use this transformation to convert time series result into a table, converting time series data frame into a "Trend" field. "Trend" field can then be rendered using [sparkline cell type][], producing an inline sparkline for each table row. If there are multiple time series queries, each will result in a separate table data frame. These can be joined using join or merge transforms to produce a single table with multiple sparklines per row.
+Use this transformation to convert time series results into a table, transforming a time series data frame into a **Trend** field which can then be used with the [sparkline cell type][]. If there are multiple time series queries, each will result in a separate table data frame. These can be joined using join or merge transforms to produce a single table with multiple sparklines per row.
+
+{{< figure src="/static/img/docs/transformations/table-sparklines.png" class="docs-image--no-shadow" max-width= "1100px" alt="A table panel showing multiple values and their corresponding sparklines." >}}
+
+For each generated **Trend** field value, a calculation function can be selected. This value is displayed next to the sparkline and will be used for sorting table rows.
+
+{{< figure src="/static/img/docs/transformations/timeseries-table-select-stat.png" class="docs-image--no-shadow" max-width= "1100px" alt="A select box showing available statistics that can be calculated." >}}
+
+> **Note:** This transformation is available in Grafana 9.5+ as an opt-in beta feature. Modify the Grafana [configuration file][] to use it.
+
+### Regression analysis
+
+Use this transformation to create a new data frame containing values predicted by a statistical model. This is useful for finding a trend in chaotic data. It works by fitting a mathematical function to the data, using either linear or polynomial regression. The data frame can then be used in a visualization to display a trendline.
+
+There are two different models:
 
-For each generated "Trend" field value calculation function can be selected. Default is "last non null value". This value will be displayed next to the sparkline and used for sorting table rows.
+- **Linear regression** - Fits a linear function to the data.
+  {{< figure src="/static/img/docs/transformations/linear-regression.png" class="docs-image--no-shadow" max-width= "1100px" alt="A time series visualization with a straight line representing the linear function" >}}
+- **Polynomial regression** - Fits a polynomial function to the data.
+  {{< figure src="/static/img/docs/transformations/polynomial-regression.png" class="docs-image--no-shadow" max-width= "1100px" alt="A time series visualization with a curved line representing the polynomial function" >}}
 
-> **Note:** This transformation is available in Grafana 9.5+ as an opt-in beta feature. Modify Grafana [configuration file][] to use it.
+> **Note:** This transformation is currently in public preview. Grafana Labs offers limited support, and breaking changes might occur prior to the feature being made generally available. Enable the `regressionTransformation` feature toggle in Grafana to use this feature. Contact Grafana Support to enable this feature in Grafana Cloud.
 
 {{% docs/reference %}}
 [Table panel]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/table"
 [Table panel]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/table"
 
-[Calculation types]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/calculation-types"
-[Calculation types]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/calculation-types"
+[Calculation types]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/query-transform-data/calculation-types"
+[Calculation types]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data/calculation-types"
 
 [sparkline cell type]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/table#sparkline"
 [sparkline cell type]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/table#sparkline"
diff --git a/docs/sources/panels-visualizations/query-transform-data/troubleshoot-queries/index.md b/docs/sources/panels-visualizations/query-transform-data/troubleshoot-queries/index.md
index 33cd92e899708..8b7cc3cffd34c 100644
--- a/docs/sources/panels-visualizations/query-transform-data/troubleshoot-queries/index.md
+++ b/docs/sources/panels-visualizations/query-transform-data/troubleshoot-queries/index.md
@@ -1,7 +1,7 @@
 ---
 aliases:
   - ../../troubleshooting/troubleshoot-queries/
-description: Guide to troubleshooting Grafana queries
+description: Troubleshoot Grafana queries
 keywords:
   - grafana
   - troubleshooting
diff --git a/docs/sources/panels-visualizations/visualizations/_index.md b/docs/sources/panels-visualizations/visualizations/_index.md
index b2ad2318ce4d3..8e71d85993bf3 100644
--- a/docs/sources/panels-visualizations/visualizations/_index.md
+++ b/docs/sources/panels-visualizations/visualizations/_index.md
@@ -12,16 +12,19 @@ labels:
     - enterprise
     - oss
 title: Visualizations
-weight: 75
+description: Apply visualizations to your data
+weight: 10
 ---
 
 # Visualizations
 
 Grafana offers a variety of visualizations to support different use cases. This section of the documentation highlights the built-in visualizations, their options and typical usage.
 
+{{< youtube id="JwF6FgeotaU" >}}
+
 {{% admonition type="note" %}}
 If you are unsure which visualization to pick, Grafana can provide visualization suggestions based on the panel query. When you select a visualization, Grafana will show a preview with that visualization applied.
-{{% /admonition %}}
+{{< /admonition >}}
 
 - Graphs & charts
   - [Time series][] is the default and main Graph visualization.
@@ -32,6 +35,9 @@ If you are unsure which visualization to pick, Grafana can provide visualization
   - [Heatmap][] visualizes data in two dimensions, used typically for the magnitude of a phenomenon.
   - [Pie chart][] is typically used where proportionality is important.
   - [Candlestick][] is typically for financial data where the focus is price/data movement.
+  - [Gauge][] is the traditional rounded visual showing how far a single metric is from a threshold.
+  - [Trend][] for datasets that have a sequential, numeric x that is not time.
+  - [XY chart][] provides a way to visualize arbitrary x and y values in a graph.
 - Stats & numbers
   - [Stat][] for big stats and optional sparkline.
   - [Bar gauge][] is a horizontal or vertical bar gauge.
@@ -41,15 +47,23 @@ If you are unsure which visualization to pick, Grafana can provide visualization
   - [Node graph][] for directed graphs or networks.
   - [Traces][] is the main visualization for traces.
   - [Flame graph][] is the main visualization for profiling.
+  - [Canvas][] allows you to explicitly place elements within static and dynamic layouts.
+  - [Geomap][] helps you visualize geospatial data.
+  - [Datagrid][] allows you to create and manipulate data, and act as data source for other panels.
 - Widgets
   - [Dashboard list][] can list dashboards.
   - [Alert list][] can list alerts.
+  - [Annotations list][] can list available annotations.
   - [Text][] can show markdown and html.
   - [News][] can show RSS feeds.
 
+The following video shows you how to create gauge, time series line graph, stats, logs, and node graph visualizations:
+
+{{< youtube id="yNRnLyVntUw" >}}
+
 ## Get more
 
-You can add more visualization types by installing panel [panel plugins](https://grafana.com/grafana/plugins/?type=panel).
+You can add more visualization types by installing [panel plugins](https://grafana.com/grafana/plugins/?type=panel).
 
 ## Examples
 
@@ -75,11 +89,11 @@ A [stat][] shows one large stat value with an optional graph sparkline. You can
 
 If you want to present a value as it relates to a min and max value you have two options. First a standard radial [gauge][] shown below.
 
-{{< figure src="/static/img/docs/v66/gauge_panel_cover.png" max-width="700px" >}}
+{{< figure src="/static/img/docs/v66/gauge_panel_cover.png" max-width="700px" alt="A gauge visualization" >}}
 
 Secondly Grafana also has a horizontal or vertical [bar gauge][] with three different distinct display modes.
 
-{{< figure src="/static/img/docs/v66/bar_gauge_lcd.png" max-width="700px" >}}
+{{< figure src="/static/img/docs/v66/bar_gauge_lcd.png" max-width="700px" alt="A bar gauge visualization" >}}
 
 ### Table
 
@@ -107,65 +121,83 @@ A state timeline shows discrete state changes over time. When used with time ser
 
 {{% docs/reference %}}
 [News]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/news"
-[News]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/news"
+[News]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/news"
 
 [Histogram]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/histogram"
-[Histogram]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/histogram"
+[Histogram]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/histogram"
 
 [Text]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/text"
-[Text]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/text"
+[Text]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/text"
 
 [Dashboard list]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/dashboard-list"
-[Dashboard list]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/dashboard-list"
+[Dashboard list]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/dashboard-list"
 
 [Flame graph]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/flame-graph"
-[Flame graph]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/flame-graph"
+[Flame graph]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/flame-graph"
+
+[Canvas]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/canvas"
+[Canvas]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/canvas"
+
+[Geomap]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/geomap"
+[Geomap]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/geomap"
 
 [Status history]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/status-history"
-[Status history]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/status-history"
+[Status history]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/status-history"
 
 [Candlestick]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/candlestick"
-[Candlestick]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/candlestick"
+[Candlestick]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/candlestick"
 
 [Gauge]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/gauge"
-[Gauge]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/gauge"
+[Gauge]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/gauge"
 
 [Alert list]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/alert-list"
-[Alert list]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/alert-list"
+[Alert list]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/alert-list"
 
 [Pie chart]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/pie-chart"
-[Pie chart]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/pie-chart"
+[Pie chart]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/pie-chart"
 
 [Bar gauge]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/bar-gauge"
-[Bar gauge]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/bar-gauge"
+[Bar gauge]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/bar-gauge"
 
 [Bar chart]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/bar-chart"
-[Bar chart]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/bar-chart"
+[Bar chart]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/bar-chart"
 
 [Node graph]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/node-graph"
-[Node graph]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/node-graph"
+[Node graph]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/node-graph"
 
 [State timeline]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/state-timeline"
-[State timeline]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/state-timeline"
+[State timeline]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/state-timeline"
 
 [heatmap]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/heatmap"
-[heatmap]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/heatmap"
+[heatmap]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/heatmap"
 
 [Traces]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/traces"
-[Traces]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/traces"
+[Traces]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/traces"
 
 [Logs]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/logs"
-[Logs]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/logs"
+[Logs]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/logs"
 
 [Heatmap]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/heatmap"
-[Heatmap]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/heatmap"
+[Heatmap]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/heatmap"
 
 [Stat]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/stat"
-[Stat]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/stat"
+[Stat]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/stat"
 
 [Table]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/table"
-[Table]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/table"
+[Table]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/table"
 
 [Time series]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/time-series"
-[Time series]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/time-series"
+[Time series]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/time-series"
+
+[Trend]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/trend"
+[Trend]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/trend"
+
+[Annotations list]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/annotations"
+[Annotations list]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/annotations"
+
+[Datagrid]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/datagrid"
+[Datagrid]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/datagrid"
+
+[XY chart]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/xy-chart"
+[XY chart]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/xy-chart"
 {{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/visualizations/alert-list/index.md b/docs/sources/panels-visualizations/visualizations/alert-list/index.md
index 3a94bc34b6e85..d16718efce575 100644
--- a/docs/sources/panels-visualizations/visualizations/alert-list/index.md
+++ b/docs/sources/panels-visualizations/visualizations/alert-list/index.md
@@ -16,6 +16,7 @@ labels:
     - enterprise
     - oss
 title: Alert list
+description: Configure options for Grafana's alert list visualization
 weight: 100
 ---
 
@@ -23,7 +24,7 @@ weight: 100
 
 Use alert lists to display your alerts. You can configure the list to show the current state. You can read more about alerts in [Grafana Alerting overview][].
 
-{{< figure src="/static/img/docs/alert-list-panel/alert-list-panel.png" max-width="850px" >}}
+{{< figure src="/static/img/docs/alert-list-panel/alert-list-panel.png" max-width="850px" alt="An alert list visualization" >}}
 
 Customize your visualization using the following settings.
 
diff --git a/docs/sources/panels-visualizations/visualizations/annotations/index.md b/docs/sources/panels-visualizations/visualizations/annotations/index.md
index 77b10782a0e0d..a1940ebd7e36d 100644
--- a/docs/sources/panels-visualizations/visualizations/annotations/index.md
+++ b/docs/sources/panels-visualizations/visualizations/annotations/index.md
@@ -3,7 +3,7 @@ aliases:
   - ../../features/panels/annotations/
   - ../../panels/visualizations/annotations/
   - ../../visualizations/annotations/
-description: Annotations visualization documentation
+description: Configure options for Grafana's annotations list visualization
 keywords:
   - grafana
   - Annotations
diff --git a/docs/sources/panels-visualizations/visualizations/bar-chart/index.md b/docs/sources/panels-visualizations/visualizations/bar-chart/index.md
index 5478aee90df93..8d75a2685d95c 100644
--- a/docs/sources/panels-visualizations/visualizations/bar-chart/index.md
+++ b/docs/sources/panels-visualizations/visualizations/bar-chart/index.md
@@ -2,7 +2,7 @@
 aliases:
   - ../../panels/visualizations/bar-chart/
   - ../../visualizations/bar-chart/
-description: Bar chart visualization
+description: Configure options for Grafana's bar chart visualization
 keywords:
   - grafana
   - docs
@@ -24,6 +24,8 @@ Bar charts allow you to graph categorical data.
 
 {{< figure src="/static/img/docs/bar-chart-panel/barchart_small_example.png" max-width="1000px" caption="Bar chart" >}}
 
+{{< docs/play title="Grafana Bar Charts and Pie Charts" url="https://play.grafana.org/d/ktMs4D6Mk/" >}}
+
 ## Supported data formats
 
 Only one data frame is supported and it must have at least one string field that will be used as the category for an X or Y axis and one or more numerical fields.
@@ -127,15 +129,13 @@ Transparency of the gradient is calculated based on the values on the y-axis. Op
 
 Gradient color is generated based on the hue of the line color.
 
-{{< docs/shared lookup="visualizations/tooltip-mode.md" source="grafana" version="<GRAFANA VERSION>" >}}
-
-{{< docs/shared lookup="visualizations/legend-mode.md" source="grafana" version="<GRAFANA VERSION>" >}}
+## Tooltip options
 
-### Legend calculations
+{{< docs/shared lookup="visualizations/tooltip-options-1.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-Choose which of the [standard calculations][] to show in the legend. You can have more than one.
+## Legend options
 
-For more information about the legend, refer to [Configure a legend](../configure-legend/).
+{{< docs/shared lookup="visualizations/legend-options-1.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
 ## Text size
 
@@ -189,15 +189,38 @@ Set a **Soft min** or **soft max** option for better control of Y-axis limits. B
 
 You can set standard min/max options to define hard limits of the Y-axis. For more information, refer to [Standard options definitions][].
 
-{{< docs/shared lookup="visualizations/multiple-y-axes.md" source="grafana" version="<GRAFANA VERSION>" leveloffset="+2" >}}
+{{< docs/shared lookup="visualizations/multiple-y-axes.md" source="grafana" version="<GRAFANA_VERSION>" leveloffset="+2" >}}
+
+## Standard options
+
+{{< docs/shared lookup="visualizations/standard-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Data links
+
+{{< docs/shared lookup="visualizations/datalink-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Thresholds
+
+{{< docs/shared lookup="visualizations/thresholds-options-1.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Value mappings
+
+{{< docs/shared lookup="visualizations/value-mappings-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Field overrides
+
+{{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
 {{% docs/reference %}}
-[Add a field override]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-overrides#add-a-field-override"
-[Add a field override]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-overrides#add-a-field-override"
+[Add a field override]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-overrides#add-a-field-override"
+[Add a field override]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-overrides#add-a-field-override"
+
+[standard calculations]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data/calculation-types"
+[standard calculations]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data/calculation-types"
 
-[standard calculations]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/calculation-types"
-[standard calculations]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/calculation-types"
+[Standard options definitions]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-standard-options#max"
+[Standard options definitions]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-standard-options#max"
 
-[Standard options definitions]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-standard-options#max"
-[Standard options definitions]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-standard-options#max"
+[Configure data links]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-data-links"
+[Configure data links]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-data-links"
 {{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/visualizations/bar-gauge/index.md b/docs/sources/panels-visualizations/visualizations/bar-gauge/index.md
index 955229cf0db1f..059f5b3ce1188 100644
--- a/docs/sources/panels-visualizations/visualizations/bar-gauge/index.md
+++ b/docs/sources/panels-visualizations/visualizations/bar-gauge/index.md
@@ -3,7 +3,7 @@ aliases:
   - ../../features/panels/bar_gauge/
   - ../../panels/visualizations/bar-gauge-panel/
   - ../../visualizations/bar-gauge-panel/
-description: Bar gauge panel options
+description: Configure options for Grafana's bar gauge visualization
 keywords:
   - grafana
   - bar
@@ -23,7 +23,9 @@ Bar gauges simplify your data by reducing every field to a single value. You cho
 
 This panel can show one or more bar gauges depending on how many series, rows, or columns your query returns.
 
-{{< figure src="/static/img/docs/v66/bar_gauge_cover.png" max-width="1025px" caption="Stat panel" >}}
+{{< figure src="/static/img/docs/v66/bar_gauge_cover.png" max-width="1025px" alt="Bar gauge panel" >}}
+
+{{< docs/play title="Bar Gauge" url="https://play.grafana.org/d/vmie2cmWz/" >}}
 
 ## Value options
 
@@ -91,19 +93,64 @@ This option only applies when the orientation of the bar gauge is horizontal. Wh
 
 Select this if you want to render the unfilled region of the bars as dark gray. Not applicable to Retro LCD display mode.
 
+### Bar size
+
+Choose a bar size mode.
+
+- **Auto -** Grafana determines the best bar gauge size.
+- **Manual -** Manually configure the bar gauge size.
+
 ### Min width
 
-Limit the minimum width of the bar column in the vertical direction.
+Limit the minimum width of the bar column when the gauge is oriented vertically.
 
-Automatically show x-axis scrollbar when there is a large amount of data.
+Automatically show x-axis scrollbar when there's a large amount of data.
+
+{{% admonition type="note" %}}
+This option only applies when bar size is set to manual.
+{{% /admonition %}}
 
 ### Min height
 
-Limit the minimum height of the bar row in the horizontal direction.
+Limit the minimum height of the bar row when the gauge is oriented horizontally.
+
+Automatically show y-axis scrollbar when there's a large amount of data.
+
+{{% admonition type="note" %}}
+This option only applies when bar size is set to manual.
+{{% /admonition %}}
+
+### Max height
+
+Limit the maximum height of the bar row when the gauge is oriented horizontally.
+
+Automatically show y-axis scrollbar when there's a large amount of data.
+
+{{% admonition type="note" %}}
+This option only applies when bar size is set to manual.
+{{% /admonition %}}
+
+## Standard options
+
+{{< docs/shared lookup="visualizations/standard-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Data links
+
+{{< docs/shared lookup="visualizations/datalink-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Value mappings
+
+{{< docs/shared lookup="visualizations/value-mappings-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Thresholds
+
+{{< docs/shared lookup="visualizations/thresholds-options-2.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Field overrides
 
-Automatically show y-axis scrollbar when there is a large amount of data.
+{{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
 {{% docs/reference %}}
-[Calculation types]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/calculation-types"
-[Calculation types]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/calculation-types"
+[Calculation types]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data/calculation-types"
+[Calculation types]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data/calculation-types"
 {{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/visualizations/candlestick/index.md b/docs/sources/panels-visualizations/visualizations/candlestick/index.md
index 12f0c9809882b..c0a96d09ae600 100644
--- a/docs/sources/panels-visualizations/visualizations/candlestick/index.md
+++ b/docs/sources/panels-visualizations/visualizations/candlestick/index.md
@@ -3,7 +3,7 @@ aliases:
   - ../../features/panels/candlestick/
   - ../../panels/visualizations/candlestick/
   - ../../visualizations/candlestick/
-description: Candlestick visualization documentation
+description: Configure options for Grafana's candlestick visualization
 keywords:
   - grafana
   - Candlestick
@@ -21,12 +21,55 @@ weight: 100
 
 # Candlestick
 
-The candlestick visualization allows you to visualize data that includes a number of consistent dimensions focused on price movement. The candlestick visualization includes an Open-High-Low-Close (OHLC) mode, as well as support for additional dimensions based on time series data.
-
-{{< figure src="/static/img/docs/candlestick-panel/candlestick-panel-8-3.png" max-width="1200px" caption="Candlestick visualization" >}}
+The candlestick visualization allows you to visualize data that includes a number of consistent dimensions focused on price movements, such as stock prices. The candlestick visualization includes an [Open-High-Low-Close (OHLC) mode](#open-high-low-close), as well as support for additional dimensions based on time series data.
 
 Candlestick visualizations build upon the foundation of the [time series visualization][] and include many common configuration settings.
 
+You can use a candlestick if you want to visualize, at a glance, how a price moved over time, whether it went up, down, or stayed the same, and how much it fluctuated:
+
+{{< figure src="/static/img/docs/candlestick-panel/candlestick-panel-8-3.png" max-width="1065px" alt="A candlestick visualization" >}}
+
+Each candlestick is represented as a rectangle, referred to as the _candlestick body_. The candlestick body displays the opening and closing prices during a time period. Green candlesticks represent when the price appreciated while the red candlesticks represent when the price depreciated. The lines sticking out the candlestick body are referred to as _wicks_ or _shadows_, which represent the highest and lowest prices during the time period.
+
+Use a candlestick when you need to:
+
+- Monitor and identify trends in price movements of specific assets such as stocks, currencies, or commodities.
+- Analyze any volatility in the stock market.
+- Provide data analysis to help with trading decisions.
+
+## Configure a candlestick
+
+Once you’ve created a [dashboard](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/create-dashboard/), the following video shows you how to configure a candlestick visualization:
+
+{{< youtube id="IOFKBgbf3aM" >}}
+
+{{< docs/play title="Candlestick" url="https://play.grafana.org/d/candlestick/candlestick" >}}
+
+## Supported data formats
+
+The candlestick visualization works best with price movement data for an asset. The data must include:
+
+- **Timestamps** - The time at which each price movement occurred.
+- **Opening price** - The price of the asset at the beginning of the time period.
+- **Closing price** - The price of the asset at the end of the time period.
+- **Highest price** - The highest price the asset reached during the time period.
+- **Lowest price** - The lowest price the asset reached during the time period.
+
+### Example
+
+| Timestamps          | Open  | High  | Low   | Close |
+| ------------------- | ----- | ----- | ----- | ----- |
+| 2024-03-13 10:05:00 | 0.200 | 0.205 | 0.201 | 0.203 |
+| 2024-03-14 10:10:10 | 0.204 | 0.205 | 0.201 | 0.200 |
+| 2024-03-15 10:15:10 | 0.204 | 0.205 | 0.201 | 0.200 |
+| 2024-03-16 10:20:11 | 0.203 | 0.203 | 0.202 | 0.203 |
+| 2024-03-17 10:25:11 | 0.203 | 0.203 | 0.202 | 0.203 |
+| 2024-03-18 10:30:12 | 0.202 | 0.202 | 0.201 | 0.201 |
+
+The data is converted as follows:
+
+{{< figure src="/static/img/docs/candlestick-panel/candlestick.png" max-width="1065px" alt="A candlestick visualization showing the price movements of specific asset." >}}
+
 ## Mode
 
 The mode options allow you to toggle which dimensions are used for the visualization.
@@ -51,23 +94,55 @@ The **Up color** and **Down color** options select which colors are used when th
 
 ## Open, High, Low, Close
 
-The candlestick visualization will attempt to map fields to the appropriate dimension. The **Open**, **High**, **Low**, and **Close** options allow you to map your data to these dimensions if the panel is unable to do so.
-
-{{% admonition type="note" %}}
-These values are hidden from the legend.
-{{% /admonition %}}
+The candlestick visualization will attempt to map fields from your data to the appropriate dimension:
 
 - **Open** corresponds to the starting value of the given period.
 - **High** corresponds to the highest value of the given period.
 - **Low** corresponds to the lowest value of the given period.
 - **Close** corresponds to the final (end) value of the given period.
-- **Volume** corresponds to the sample count in the given period. (e.g. number of trades)
+- **Volume** corresponds to the sample count in the given period. (for example, number of trades)
+
+{{% admonition type="note" %}}
+The candlestick visualization legend doesn't display these values.
+{{% /admonition %}}
+
+If your data can't be mapped to these dimensions for some reason (for example, because the column names aren't the same), you can map them manually using the **Open**, **High**, **Low**, and **Close** fields under the **Candlestick** options in the panel editor:
+
+![Open, High, Low, and Close fields in the panel editor](/media/docs/grafana/panels-visualizations/screenshot-olhc-options-10.3.png)
+
+### Additional fields
+
+The candlestick visualization is based on the time series visualization. It can visualize additional data dimensions beyond open, high, low, close, and volume The **Include** and **Ignore** options allow it to visualize other included data such as simple moving averages, Bollinger bands and more, using the same styles and configurations available in the [time series][time series visualization] visualization.
+
+## Standard options
+
+{{< docs/shared lookup="visualizations/standard-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Legend options
+
+{{< docs/shared lookup="visualizations/legend-options-1.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Tooltip options
+
+{{< docs/shared lookup="visualizations/tooltip-options-2.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Data links
+
+{{< docs/shared lookup="visualizations/datalink-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Thresholds
+
+{{< docs/shared lookup="visualizations/thresholds-options-1.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Value mappings
+
+{{< docs/shared lookup="visualizations/value-mappings-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Additional fields
+## Field overrides
 
-The candlestick visualization is based on the time series visualization. It can visualize additional data dimensions beyond open, high, low, close, and volume The **Include** and **Ignore** options allow it to visualize other included data such as simple moving averages, Bollinger bands and more, using the same styles and configurations available in the [time series][] visualization.
+{{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
 {{% docs/reference %}}
-[time series visualization]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/time-series"
-[time series visualization]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/time-series"
+[time series visualization]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/time-series"
+[time series visualization]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/time-series"
 {{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/visualizations/canvas/index.md b/docs/sources/panels-visualizations/visualizations/canvas/index.md
index 1e69ccfeaa516..306d88c65bee2 100644
--- a/docs/sources/panels-visualizations/visualizations/canvas/index.md
+++ b/docs/sources/panels-visualizations/visualizations/canvas/index.md
@@ -2,7 +2,7 @@
 aliases:
   - ../../features/panels/canvas/
   - ../../visualizations/canvas/
-description: Canvas visualization documentation
+description: Configure options for Grafana's canvas visualization
 keywords:
   - grafana
   - canvas
@@ -27,6 +27,24 @@ Canvases combine the power of Grafana with the flexibility of custom elements. C
 
 ## Elements
 
+Elements are the basic building blocks of a canvas and they help you visualize data with different shapes and options. You can rotate and move elements around the canvas. When you move elements, snapping and alignment guides help you create more precise layouts.
+
+{{% admonition type="note" %}}
+Element snapping and alignment only works when the canvas is not zoomed in.
+{{% /admonition %}}
+
+When you select an element that you've added to a canvas, you can access editing options for it that are dependent on the element type. The following sections describe the different elements available.
+
+### Basic shapes
+
+A basic shape element can display text (both fixed and field data) and its background color can be changed based on data thresholds. You can add the following basic shapes to a canvas:
+
+- Cloud
+- Ellipse
+- Parallelogram
+- Rectangle
+- Triangle
+
 ### Metric value
 
 The metric value element lets you easily select the data you want to display on a canvas. This element has a unique “edit” mode that can be triggered either through the context menu “Edit” option or by double clicking. When in edit mode you can select which field data that you want to display.
@@ -39,14 +57,6 @@ The text element lets you easily add text to the canvas. The element also suppor
 
 {{< video-embed src="/static/img/docs/canvas-panel/canvas-text-9-2-0.mp4" max-width="750px" caption="Text element demo" >}}
 
-### Ellipse
-
-The ellipse element lets you add a basic ellipse to the canvas. An ellipse element can display text (both fixed and field data) and its background color can be changed based on data thresholds.
-
-### Rectangle
-
-The rectangle element lets you add a basic rectangle to the canvas. A rectangle element can display text (both fixed and field data) and its background color can be changed based on data thresholds.
-
 ### Icon
 
 The icon element lets you add a supported icon to the canvas. Icons can have their color set based on thresholds / value mappings.
@@ -69,11 +79,25 @@ A button click will only trigger an API call when [inline editing](#inline-editi
 
 ## Connections
 
-When building a canvas, you can connect elements together to create more complex visualizations. Connections are created by dragging from the connection anchor of one element to the connection anchor of another element. You can also create connections to the background of the canvas. Connection anchors are displayed when you hover over an element and inline editing is turned on. To remove a connection, simply click on the connection directly and then press the "Delete" or "Backspace" key.
+When building a canvas, you can connect elements together to create more complex visualizations. Connections are created by dragging from the connection anchor of one element to the connection anchor of another element. You can also create connections to the background of the canvas. Connection anchors are displayed when you hover over an element and inline editing is turned on.
+
+To remove a connection, simply click on the connection directly and then press the "Delete" or "Backspace" key.
 
 {{< video-embed src="/media/docs/grafana/canvas-connections-9-4-0.mp4" max-width="750px" caption="Canvas connections demo" >}}
 
-You can set both the size and color of connections based on fixed or field values. To do so, enter into panel edit mode, select the connection, and modify the connection's properties in the panel editor.
+### Adjust connectors
+
+You can adjust connectors, adding angles to them, to fit the canvas you're working in. When you move connected elements, the connector resizes to fit the space. To adjust a connector, click it to display the midpoint controls and move those as needed. To make a connector a straight line again, move the midpoint back until the midpoint controls disappear.
+
+If you move a connector so that it's almost a right angle or a straight line, the connector snaps into that angle or into a straight line.
+
+<!-- TODO: Use updated demo from what's new when uploaded to YouTube -->
+
+{{< video-embed src="/media/docs/grafana/panels-visualizations/gif-canvas-connector-vertex-control-v11.0.mp4" alt="Changing a connector from a straight line to a right angle" >}}
+
+### Style connectors
+
+You can set the size, color, direction, and style of connections based on fixed or field values. To do so, enter into panel edit mode, select the connection, and modify the connection's properties in the panel editor.
 
 {{< figure src="/media/docs/grafana/screenshot-grafana-10-0-canvas-service-graph.png" max-width="750px" caption="Canvas service graph" >}}
 
@@ -85,6 +109,26 @@ You can edit your canvas inline while in the context of dashboard mode.
 
 {{< video-embed src="/static/img/docs/canvas-panel/canvas-inline-editor-9-2-0.mp4" max-width="750px" caption="Inline editor demo" >}}
 
+### Pan and zoom
+
+You can enable panning and zooming in a canvas. This allows you to both create and navigate more complex designs.
+
+{{< docs/public-preview product="Canvas pan and zoom" featureFlag="`canvasPanelPanZoom`" >}}
+
+{{< figure src="/media/docs/grafana/screenshot-grafana-10-3-canvas-pan-zoom-setting.png" max-width="300px" alt="Canvas pan zoom control" >}}
+
+{{< video-embed src="/media/docs/grafana/2024-01-05-Canvas-Pan-&-Zoom-Enablement-Video.mp4" max-width="750px" caption="Canvas pan and zoom enablement video" >}}
+
+#### Infinite panning
+
+You can enable infinite panning in a canvas when pan and zoom is enabled. This allows you to pan and zoom the canvas and uncover larger designs.
+
+{{% admonition type="note" %}}
+Infinite panning is an experimental feature that may not work as expected in all scenarios. For example, elements that are not top-left constrained may experience unexpected movement when panning.
+{{% /admonition %}}
+
+<!-- TODO: Add gif -->
+
 ### Context menu
 
 The context menu lets you perform common tasks quickly and efficiently. Supported functionality includes opening / closing the inline editor, duplicating an element, deleting an element, and more.
@@ -107,7 +151,7 @@ The inline editing toggle lets you lock or unlock the canvas. When turned off th
 
 ### Data links
 
-Canvases support [data links](https://grafana.com/docs/grafana/latest/panels-visualizations/configure-data-links/). You can create a data link for a metric-value element and display it for all elements that use the field name by following these steps:
+Canvases support [data links][] for all elements except drone and button elements. You can add a data link by following these steps:
 
 1. Set an element to be tied to a field value.
 1. Turn off the inline editing toggle.
@@ -118,7 +162,7 @@ Canvases support [data links](https://grafana.com/docs/grafana/latest/panels-vis
 1. Hover over the element to display the data link tooltip.
 1. Click on the element to be able to open the data link.
 
-If multiple elements use the same field name, and you want to control which elements display the data link, you can create a unique field name using the [add field from calculation transform](https://grafana.com/docs/grafana/latest/panels-visualizations/query-transform-data/transform-data/#add-field-from-calculation). The alias you create in the transformation will appear as a field you can use with an element.
+If multiple elements use the same field name, and you want to control which elements display the data link, you can create a unique field name using the [add field from calculation transform][]. The alias you create in the transformation will appear as a field you can use with an element.
 
 1. In the panel editor for the canvas, click the **Transform** tab.
 1. Select **Add field from calculation** from the list of transformations, or click **+ Add transformation** to display the list first.
@@ -128,3 +172,27 @@ If multiple elements use the same field name, and you want to control which elem
 1. Reference the new unique field alias to create the element and field override.
 
 {{< video-embed src="/media/docs/grafana/canvas-data-links-9-4-0.mp4" max-width="750px" caption="Data links demo" >}}
+
+## Standard options
+
+{{< docs/shared lookup="visualizations/standard-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Thresholds
+
+{{< docs/shared lookup="visualizations/thresholds-options-2.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Value mappings
+
+{{< docs/shared lookup="visualizations/value-mappings-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Field overrides
+
+{{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+{{% docs/reference %}}
+[data links]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-data-links"
+[data links]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-data-links"
+
+[add field from calculation transform]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data/transform-data#add-field-from-calculation"
+[add field from calculation transform]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data/transform-data#add-field-from-calculation"
+{{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/visualizations/dashboard-list/index.md b/docs/sources/panels-visualizations/visualizations/dashboard-list/index.md
index 7c67fbd26dbda..79461e4c0cec1 100644
--- a/docs/sources/panels-visualizations/visualizations/dashboard-list/index.md
+++ b/docs/sources/panels-visualizations/visualizations/dashboard-list/index.md
@@ -15,6 +15,7 @@ labels:
     - cloud
     - enterprise
     - oss
+description: Configure options for Grafana's dashboard list visualization
 title: Dashboard list
 weight: 100
 ---
@@ -23,7 +24,7 @@ weight: 100
 
 Dashboard lists allow you to display dynamic links to other dashboards. The list can be configured to use starred dashboards, recently viewed dashboards, a search query, and dashboard tags.
 
-{{< figure src="/static/img/docs/v45/dashboard-list-panels.png" max-width="850px">}}
+{{< figure src="/static/img/docs/v45/dashboard-list-panels.png" max-width="850px" alt="A dashboard list visualization" >}}
 
 On each dashboard load, this panel queries the dashboard list, always providing the most up-to-date results.
 
diff --git a/docs/sources/panels-visualizations/visualizations/datagrid/index.md b/docs/sources/panels-visualizations/visualizations/datagrid/index.md
index af530fcaa3dd8..a74c3eb41eca1 100644
--- a/docs/sources/panels-visualizations/visualizations/datagrid/index.md
+++ b/docs/sources/panels-visualizations/visualizations/datagrid/index.md
@@ -3,7 +3,7 @@ aliases:
   - ../../features/panels/datagrid_panel/
   - ../../reference/datagrid/
   - ../../visualizations/datagrid/
-description: Learn about datagrid panel visualization features.
+description: Configure options for Grafana's datagrid visualization
 keywords:
   - grafana
   - dashboard
diff --git a/docs/sources/panels-visualizations/visualizations/flame-graph/index.md b/docs/sources/panels-visualizations/visualizations/flame-graph/index.md
index 6b2adb29ed2b3..8f966507249f4 100644
--- a/docs/sources/panels-visualizations/visualizations/flame-graph/index.md
+++ b/docs/sources/panels-visualizations/visualizations/flame-graph/index.md
@@ -12,29 +12,76 @@ labels:
     - cloud
     - enterprise
     - oss
+description: Configure options for Grafana's flame graph visualization
 title: Flame graph
 weight: 100
 ---
 
 # Flame graph
 
-Flame graphs let you visualize profiling data. Using this visualization, the profile can be represented as a flame graph, table, or both
+Flame graphs let you visualize [profiling](https://grafana.com/docs/pyroscope/latest/introduction/profiling/) data. Using this visualization, a [profile](https://grafana.com/docs/pyroscope/latest/view-and-analyze-profile-data/profiling-types/) can be represented as a [flame graph](#flame-graph-mode), [top table](#top-table-mode), or both.
 
-![<Flame graph>](/media/docs/grafana/panels-visualizations/flamegraph/screenshot-flamegraph-10.1.png)
+For example, if you want to understand which parts of a program consume the most resources, such as CPU time, memory, or I/O operations, you can use a flame graph to visualize and analyze where potential performance issues are:
 
-## Flame graph mode
+{{< figure src="/static/img/docs/flame-graph-panel/flame-graph-dark-mode.png" max-width="1025px" alt="A flame graph visualization for a system profile with both flame graph and top table mode." >}}
 
-A flame graph takes advantage of the hierarchical nature of profiling data. It condenses data into a format that allows you to easily see which code paths are consuming the most system resources, such as CPU time, allocated objects, or space when measuring memory. Each block in the flame graph represents a function call in a stack and its width represents its value.
+You can use a flame graph visualization if you need to:
+
+- Identify any performance hotspots to find where code optimizations may be needed.
+- Diagnose the root cause of any performance degradation.
+- Analyze the behavior of complex systems, including distributed systems or microservices architectures.
+
+To learn more about how Grafana Pyroscope visualizes flame graphs, refer to [Flame graphs: Visualizing performance data](https://grafana.com/docs/pyroscope/latest/view-and-analyze-profile-data/flamegraphs/).
+
+## Configure a flame graph visualization
+
+Once you’ve created a [dashboard](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/create-dashboard/), the following video shows you how to configure a flame graph visualization:
+
+{{< youtube id="VEvK0JkPlOY" >}}
+
+## Supported data formats
+
+To render a flame graph, you must format the data frame data using a _nested set model_.
+
+A nested set model ensures each item of a flame graph is encoded by its nesting level as an integer value, its metadata, and by its order in the data frame. This means that the order of items is significant and needs to be correct. The ordering is a depth-first traversal of the items in the flame graph which recreates the graph without needing variable-length values in the data frame like in a children's array.
 
-![<Flame graph>](/media/docs/grafana/panels-visualizations/flamegraph/screenshot-flamegraph-10.1-flamegraph.png)
+Required fields:
+
+| Field name | Type   | Description                                                                                                                 |
+| ---------- | ------ | --------------------------------------------------------------------------------------------------------------------------- |
+| level      | number | The nesting level of the item. In other words how many items are between this item and the top item of the flame graph.     |
+| value      | number | The absolute or cumulative value of the item. This translates to the width of the item in the graph.                        |
+| label      | string | Label to be shown for the particular item.                                                                                  |
+| self       | number | Self value, which is usually the cumulative value of the item minus the sum of cumulative values of its immediate children. |
+
+### Example
+
+The following table is an example of the type of data you need for a flame graph visualization and how it should be formatted:
+
+| level | value    | self   | label                                     |
+| ----- | -------- | ------ | ----------------------------------------- |
+| 0     | 16.5 Bil | 16.5 K | total                                     |
+| 1     | 4.10 Bil | 4.10 k | test/pkg/agent.(\*Target).start.func1     |
+| 2     | 4.10 Bil | 4.10 K | test/pkg/agent.(\*Target).start.func1     |
+| 3     | 3.67 Bil | 3.67 K | test/pkg/distributor.(\*Distributor).Push |
+| 4     | 1.13 Bil | 1.13 K | compress/gzip.(\*Writer).Write            |
+| 5     | 1.06 Bil | 1.06 K | compress/flat.(\*compressor).write        |
+
+## Modes
+
+### Flame graph mode
+
+A flame graph takes advantage of the hierarchical nature of profiling data. It condenses data into a format that allows you to easily see which code paths are consuming the most system resources, such as CPU time, allocated objects, or space when measuring memory. Each block in the flame graph represents a function call in a stack and its width represents its value.
 
 Grayed-out sections are a set of functions that represent a relatively small value and they are collapsed together into one section for performance reasons.
 
-{{< figure src="/media/docs/grafana/panels-visualizations/flamegraph/screenshot-flamegraph-10.1-tooltip.png" max-width="500px" caption="Hover tooltip" >}}
+{{< figure src="/static/img/docs/flame-graph-panel/flame-graph-mode-dark.png" max-width="650px" alt="A flame graph visualization for a system profile with flame graph mode." >}}
 
 You can hover over a specific function to view a tooltip that shows you additional data about that function, like the function's value, percentage of total value, and the number of samples with that function.
 
-### Drop-down actions
+{{< figure src="/media/docs/grafana/panels-visualizations/flamegraph/screenshot-flamegraph-10.1-tooltip.png" max-width="650px" alt="A flame graph visualization with a hover tooltip." >}}
+
+#### Drop-down actions
 
 You can click a function to show a drop-down menu with additional actions:
 
@@ -42,29 +89,37 @@ You can click a function to show a drop-down menu with additional actions:
 - Copy function name
 - Sandwich view
 
-{{< figure src="/media/docs/grafana/panels-visualizations/flamegraph/screenshot-flamegraph-10.1-dropdown.png" max-width="500px" caption="Dropdown actions" >}}
+{{< figure src="/media/docs/grafana/panels-visualizations/flamegraph/screenshot-flamegraph-10.1-dropdown.png" max-width="650px" alt="A flame graph visualization with drop-down actions." >}}
 
-#### Focus block
+##### Focus block
 
 When you click **Focus block**, the block, or function, is set to 100% of the flame graph's width and all its child functions are shown with their widths updated relative to the width of the parent function. This makes it easier to drill down into smaller parts of the flame graph.
 
-{{< figure src="/media/docs/grafana/panels-visualizations/flamegraph/screenshot-flamegraph-10.1-focus.png" max-width="500px" caption="Focus block" >}}
+{{< figure src="/media/docs/grafana/panels-visualizations/flamegraph/screenshot-flamegraph-10.1-focus.png" max-width="650px" alt="A flame graph visualization with focus block action selected." >}}
 
-#### Copy function name
+##### Copy function name
 
 When you click **Copy function name**, the full name of the function that the block represents is copied.
 
-#### Sandwich view
+##### Sandwich view
 
 The sandwich view allows you to show the context of the clicked function. It shows all the function's callers on the top and all the callees at the bottom. This shows the aggregated context of the function so if the function exists in multiple places in the flame graph, all the contexts are shown and aggregated in the sandwich view.
 
-{{< figure src="/media/docs/grafana/panels-visualizations/flamegraph/screenshot-flamegraph-10.1-sandwich.png" max-width="500px" caption="Sandwich view">}}
+{{< figure src="/media/docs/grafana/panels-visualizations/flamegraph/screenshot-flamegraph-10.1-sandwich.png" max-width="650px" alt="A flame graph visualization with sandwich view selected.">}}
 
-### Status bar
+#### Status bar
 
 The status bar shows metadata about the flame graph and currently applied modifications, like what part of the graph is in focus or what function is shown in sandwich view. Click the **X** in the status bar pill to remove that modification.
 
-![<Status bar>](/media/docs/grafana/panels-visualizations/flamegraph/screenshot-flamegraph-10.1-status.png)
+{{< figure src="/media/docs/grafana/panels-visualizations/flamegraph/screenshot-flamegraph-10.1-status.png" max-width="1025px" alt="A flame graph visualization's status bar.">}}
+
+### Top table mode
+
+The top table shows the functions from the profile in table format. The table has three columns: symbols, self, and total. The table is sorted by self time by default, but can be reordered by total time or symbol name by clicking the column headers. Each row represents aggregated values for the given function if the function appears in multiple places in the profile.
+
+{{< figure src="/media/docs/grafana/panels-visualizations/flamegraph/screenshot-flamegraph-10.1-table.png" max-width="650px" alt="Table view">}}
+
+There are also action buttons on the left-most side of each row. The first button searches for the function name while second button shows the sandwich view of the function.
 
 ## Toolbar
 
@@ -72,7 +127,7 @@ The status bar shows metadata about the flame graph and currently applied modifi
 
 You can use the search field to find functions with a particular name. All the functions in the flame graph that match the search will remain colored while the rest of the functions are grayed-out.
 
-![<Searching for function name>](/media/docs/grafana/panels-visualizations/flamegraph/screenshot-flamegraph-10.1-search.png)
+{{< figure src="/static/img/docs/flame-graph-panel/flame-graph-search-dark.png" max-width="1025px" alt="Searching for a function name in a flame graph visualization.">}}
 
 ### Color schema picker
 
@@ -87,26 +142,3 @@ Align text either to the left or to the right to show more important parts of th
 ### Visualization picker
 
 You can choose to show only the flame graph, only table, or both at the same time
-
-## Top table mode
-
-The top table shows the functions from the profile in table format. The table has three columns: symbols, self, and total. The table is sorted by self time by default, but can be reordered by total time or symbol name by clicking the column headers. Each row represents aggregated values for the given function if the function appears in multiple places in the profile.
-
-![Table view](/media/docs/grafana/panels-visualizations/flamegraph/screenshot-flamegraph-10.1-table.png)
-
-There are also action buttons on the left for each row. The first button searches for the function name while second button shows the sandwich view of the function.
-
-## Data API
-
-In order to render the flame graph, you must format the data frame data using a [nested set model](https://en.wikipedia.org/wiki/Nested_set_model).
-
-A nested set model ensures each item of the flame graph is encoded just by its nesting level as an integer value, its metadata, and by its order in the data frame. This means that the order of items is significant and needs to be correct. The ordering is a depth-first traversal of the items in the flame graph which recreates the graph without needing variable-length values in the data frame like in a children's array.
-
-Required fields:
-
-| Field name | Type   | Description                                                                                                                |
-| ---------- | ------ | -------------------------------------------------------------------------------------------------------------------------- |
-| level      | number | The nesting level of the item. In other words how many items are between this item and the top item of the flame graph.    |
-| value      | number | The absolute or cumulative value of the item. This translates to the width of the item in the graph.                       |
-| label      | string | Label to be shown for the particular item.                                                                                 |
-| self       | number | Self value which is usually the cumulative value of the item minus the sum of cumulative values of its immediate children. |
diff --git a/docs/sources/panels-visualizations/visualizations/gauge/index.md b/docs/sources/panels-visualizations/visualizations/gauge/index.md
index 3e6975afb603e..92c6ea9e8f7fb 100644
--- a/docs/sources/panels-visualizations/visualizations/gauge/index.md
+++ b/docs/sources/panels-visualizations/visualizations/gauge/index.md
@@ -3,7 +3,7 @@ aliases:
   - ../../features/panels/gauge/
   - ../../panels/visualizations/gauge-panel/
   - ../../visualizations/gauge-panel/
-description: Gauge panel docs
+description: Configure options for Grafana's gauge visualization
 keywords:
   - grafana
   - gauge
@@ -21,7 +21,9 @@ weight: 100
 
 Gauges are single-value visualizations that can repeat a gauge for every series, column or row.
 
-{{< figure src="/static/img/docs/v66/gauge_panel_cover.png" max-width="1025px" >}}
+{{< figure src="/static/img/docs/v66/gauge_panel_cover.png" max-width="1025px" alt="A gauge visualization">}}
+
+{{< docs/play title="Grafana Gauge Visualization" url="https://play.grafana.org/d/KIhkVD6Gk/" >}}
 
 ## Value options
 
@@ -65,18 +67,33 @@ Controls if threshold values are shown.
 
 Controls if a threshold band is shown outside the inner gauge value band.
 
+### Gauge size
+
+Choose a gauge size mode.
+
+- **Auto -** Grafana determines the best gauge size.
+- **Manual -** Manually configure the gauge size.
+
 ### Min width
 
 Set the minimum width of vertically-oriented gauges.
 
 If you set a minimum width, the x-axis scrollbar is automatically displayed when there's a large amount of data.
 
+{{% admonition type="note" %}}
+This option only applies when gauge size is set to manual.
+{{% /admonition %}}
+
 ### Min height
 
 Set the minimum height of horizontally-oriented gauges.
 
 If you set a minimum height, the y-axis scrollbar is automatically displayed when there's a large amount of data.
 
+{{% admonition type="note" %}}
+This option only applies when gauge size is set to manual.
+{{% /admonition %}}
+
 ### Neutral
 
 Set the starting value from which every gauge will be filled.
@@ -88,7 +105,27 @@ Adjust the sizes of the gauge text.
 - **Title -** Enter a numeric value for the gauge title size.
 - **Value -** Enter a numeric value for the gauge value size.
 
+## Standard options
+
+{{< docs/shared lookup="visualizations/standard-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Data links
+
+{{< docs/shared lookup="visualizations/datalink-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Value mappings
+
+{{< docs/shared lookup="visualizations/value-mappings-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Thresholds
+
+{{< docs/shared lookup="visualizations/thresholds-options-2.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Field overrides
+
+{{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
 {{% docs/reference %}}
-[Calculation types]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/calculation-types"
-[Calculation types]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/calculation-types"
+[Calculation types]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data/calculation-types"
+[Calculation types]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data/calculation-types"
 {{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/visualizations/geomap/index.md b/docs/sources/panels-visualizations/visualizations/geomap/index.md
index c53ccb0535e35..98c92f5af7166 100644
--- a/docs/sources/panels-visualizations/visualizations/geomap/index.md
+++ b/docs/sources/panels-visualizations/visualizations/geomap/index.md
@@ -21,7 +21,7 @@ aliases:
   - ../../panels/visualizations/geomap/osm/
   - ../../panels/visualizations/geomap/zyx/
   - ../../visualizations/geomap/
-description: Geomap visualization documentation
+description: Configure options for Grafana's geomap visualization
 keywords:
   - grafana
   - Geomap
@@ -44,6 +44,10 @@ Geomaps allow you to view and customize the world map using geospatial data. You
 
 {{< figure src="/static/img/docs/geomap-panel/geomap-example-8-1-0.png" max-width="1200px" caption="Geomap panel" >}}
 
+The following video provides beginner steps for creating geomap visualizations. You'll learn the data requirements and caveats, special customizations, preconfigured displays and much more:
+
+{{< youtube id="HwM8AFQ7EUs" >}}
+
 ## Map View
 
 The map view controls the initial view of the map when the dashboard loads.
@@ -282,6 +286,26 @@ The GeoJSON layer allows you to select and load a static GeoJSON file from the f
 - **Add style rule** creates additional style rules.
 - **Display tooltip** allows you to toggle tooltips for the layer.
 
+{{% admonition type="note" %}}
+Styles can be set within the "properties" object of the GeoJSON with support for the following geometries:
+
+- Polygon, MultiPolygon
+
+  - **"fill"** - The color of the interior of the polygon(s)
+  - **"fill-opacity"** - The opacity of the interior of the polygon(s)
+  - **"stroke-width"** - The width of the line component of the polygon(s)
+
+- Point, MultiPoint
+
+  - **"marker-color"** - The color of the point(s)
+  - **"marker-size"** - The size of the point(s)
+
+- LineString, MultiLineString
+  - **"stroke"** - The color of the line(s)
+  - **"stroke-width"** - The width of the line(s)
+
+{{% /admonition %}}
+
 ## Night / Day layer
 
 The Night / Day layer displays night and day regions based on the current time range.
@@ -457,7 +481,7 @@ A map from a collaborative free geographic world database.
 
 ### More Information
 
-- [**About Open Street Map**](https://www.openstreetmap.org/about)\
+- [**About Open Street Map**](https://www.openstreetmap.org/about)
 
 ## ArcGIS layer
 
@@ -536,7 +560,7 @@ Displays measure tools in the upper right corner. Measurements appear only when
 - **Double-click** to end measurement
 
 {{% admonition type="note" %}}
-<br /- When you change measurement type or units, the previous measurement is removed from the map. <br /- If the control is closed and then re-opened, the most recent measurement is displayed. <br /- A measurement can be modified by clicking and dragging on it.
+When you change measurement type or units, the previous measurement is removed from the map. If the control is closed and then re-opened, the most recent measurement is displayed. A measurement can be modified by clicking and dragging on it.
 {{% /admonition %}}
 
 #### Length
@@ -577,10 +601,30 @@ Displays debug information in the upper right corner. This can be useful for deb
 - **None** displays tooltips only when a data point is clicked.
 - **Details** displays tooltips when a mouse pointer hovers over a data point.
 
+## Standard options
+
+{{< docs/shared lookup="visualizations/standard-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Data links
+
+{{< docs/shared lookup="visualizations/datalink-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Value mappings
+
+{{< docs/shared lookup="visualizations/value-mappings-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Thresholds
+
+{{< docs/shared lookup="visualizations/thresholds-options-2.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Field overrides
+
+{{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
 {{% docs/reference %}}
-[provisioning docs page]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/administration/provisioning"
-[provisioning docs page]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/administration/provisioning"
+[provisioning docs page]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/administration/provisioning"
+[provisioning docs page]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA_VERSION>/administration/provisioning"
 
-[data format supported by the node graph visualization]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/node-graph#data-api"
-[data format supported by the node graph visualization]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/node-graph#data-api"
+[data format supported by the node graph visualization]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/node-graph#data-api"
+[data format supported by the node graph visualization]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/node-graph#data-api"
 {{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/visualizations/heatmap/index.md b/docs/sources/panels-visualizations/visualizations/heatmap/index.md
index 08eb5f4be3b03..a43c60ce3d265 100644
--- a/docs/sources/panels-visualizations/visualizations/heatmap/index.md
+++ b/docs/sources/panels-visualizations/visualizations/heatmap/index.md
@@ -2,7 +2,7 @@
 aliases:
   - ../../features/panels/heatmap/
   - ../../visualizations/heatmap/
-description: Heatmap visualization documentation
+description: Configure options for Grafana's heatmap visualization
 keywords:
   - grafana
   - heatmap
@@ -19,14 +19,52 @@ weight: 100
 
 # Heatmap
 
-Heatmaps allow you to view histograms over time. For more information about histograms, refer to [Introduction to histograms and heatmaps][].
+Heatmaps allow you to view [histograms](https://grafana.com/docs/grafana/latest/panels-visualizations/visualizations/histogram/) over time. While histograms display the data distribution that falls in a specific value range, heatmaps allow you to identify patterns in the histogram data distribution over time. For more information about heatmaps, refer to [Introduction to histograms and heatmaps](https://grafana.com/docs/grafana/latest/fundamentals/intro-histograms/).
 
-![](/static/img/docs/v43/heatmap_panel_cover.jpg)
+For example, if you want to understand the temperature changes for the past few years, you can use a heatmap visualization to identify trends in your data:
 
-## Calculate from data
+{{< figure src="/static/img/docs/heatmap-panel/temperature_heatmap.png" max-width="1025px" alt="A heatmap visualization showing the random walk distribution over time" >}}
 
-This setting determines if the data is already a calculated heatmap (from the data source/transformer), or one that should be
-calculated in the panel.
+You can use a heatmap visualization if you need to:
+
+- Visualize a large density of your data distribution.
+- Condense large amounts of data through various color schemes that are easier to interpret.
+- Identify any outliers in your data distribution.
+- Provide statistical analysis to see how values or trends change over time.
+
+## Configure a heatmap visualization
+
+Once you’ve created a [dashboard](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/create-dashboard/), the following video shows you how to configure a heatmap visualization:
+
+{{< youtube id="SGWBzQ54koE" >}}
+
+## Supported data formats
+
+Heatmaps support time series data.
+
+### Example
+
+The table below is a simplified output of random walk distribution over time:
+
+| Time                | Walking (km) |
+| ------------------- | ------------ |
+| 2023-06-25 21:13:09 | 10           |
+| 2023-08-25 21:13:10 | 8            |
+| 2023-08-30 21:13:10 | 10           |
+| 2023-10-08 21:13:11 | 12           |
+| 2023-12-25 21:13:11 | 14           |
+| 2024-01-05 21:13:12 | 13           |
+| 2024-02-22 21:13:13 | 10           |
+
+The data is converted as follows:
+
+{{< figure src="/static/img/docs/heatmap-panel/heatmap.png" max-width="1025px" alt="A heatmap visualization showing the random walk distribution over time" >}}
+
+## Heatmap options
+
+### Calculate from data
+
+This setting determines if the data is already a calculated heatmap (from the data source/transformer), or one that should be calculated in the panel.
 
 ### X Bucket
 
@@ -79,7 +117,7 @@ This setting configures the axis value.
 
 When selected, the axis appears in reverse order.
 
-{{< docs/shared lookup="visualizations/multiple-y-axes.md" source="grafana" version="<GRAFANA VERSION>" leveloffset="+2" >}}
+{{< docs/shared lookup="visualizations/multiple-y-axes.md" source="grafana" version="<GRAFANA_VERSION>" leveloffset="+2" >}}
 
 ## Colors
 
@@ -112,18 +150,43 @@ Use these settings to refine your visualization.
 
 ### Tooltip
 
-- **Show tooltip -** Show heatmap tooltip.
-- **Show Histogram -** Show a Y-axis histogram on the tooltip. A histogram represents the distribution of the bucket values for a specific timestamp.
+#### Tooltip mode
+
+When you hover your cursor over the visualization, Grafana can display tooltips. Choose how tooltips behave.
+
+- **Single -** The hover tooltip shows only a single series, the one that you are hovering over on the visualization.
+- **All -** The hover tooltip shows all series in the visualization. Grafana highlights the series that you are hovering over in bold in the series list in the tooltip.
+- **Hidden -** Do not display the tooltip when you interact with the visualization.
+
+Use an override to hide individual series from the tooltip.
+
+#### Show histogram (Y axis)
+
+When you set the **Tooltip mode** to **Single**, this option is displayed. This option controls whether or not the tooltip includes a histogram representing the y-axis.
+
+#### Show color scale
+
+When you set the **Tooltip mode** to **Single**, this option is displayed. This option controls whether or not the tooltip includes the color scale that's also represented in the legend. When the color scale is included in the tooltip, it shows the hovered value on the scale:
+
+![Heatmap with a tooltip displayed showing the hovered value reflected in the color scale](/media/docs/grafana/panels-visualizations/screenshot-heatmap-tooltip-color-scale-v11.0.png)
 
 ### Legend
 
-Choose whether you want to display the heatmap legend on the visualization.
+Choose whether you want to display the heatmap legend on the visualization by toggling the **Show legend** switch.
+
+### Data links
+
+{{< docs/shared lookup="visualizations/datalink-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+### Field overrides
+
+{{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
 ### Exemplars
 
 Set the color used to show exemplar data.
 
 {{% docs/reference %}}
-[Introduction to histograms and heatmaps]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/fundamentals/intro-histograms"
-[Introduction to histograms and heatmaps]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/fundamentals/intro-histograms"
+[Introduction to histograms and heatmaps]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/fundamentals/intro-histograms"
+[Introduction to histograms and heatmaps]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA_VERSION>/fundamentals/intro-histograms"
 {{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/visualizations/histogram/index.md b/docs/sources/panels-visualizations/visualizations/histogram/index.md
index 905549dc104fe..1095200ffa404 100644
--- a/docs/sources/panels-visualizations/visualizations/histogram/index.md
+++ b/docs/sources/panels-visualizations/visualizations/histogram/index.md
@@ -3,7 +3,7 @@ aliases:
   - ../../features/panels/histogram/
   - ../../panels/visualizations/histogram/
   - ../../visualizations/histogram/
-description: Histogram visualization
+description: Configure options for Grafana's histogram visualization
 keywords:
   - grafana
   - docs
@@ -21,17 +21,67 @@ weight: 100
 
 # Histogram
 
-Histograms calculate the distribution of values and present them as a bar chart. The Y-axis and the height of each bar represent the count of values that fall into each bracket while the X-axis represents the value range.
+Histograms calculate the distribution of values and present them as a bar chart. Each bar represents a bucket; the y-axis and the height of each bar represent the count of values that fall into each bucket, and the x-axis represents the value range.
 
-{{< figure src="/static/img/docs/histogram-panel/histogram-example-v8-0.png" max-width="625px" caption="Bar chart example" >}}
+For example, if you want to understand the distribution of people's heights, you can use a histogram visualization to identify patterns or insights in the data distribution:
+
+{{< figure src="/static/img/docs/histogram-panel/histogram-example-v8-0.png" max-width="1025px" alt="A histogram visualization showing the distribution of people's heights" >}}
+
+You can use a histogram visualization if you need to:
+
+- Visualize and analyze data distributions over a specific time range to see how frequently certain values occur.
+- Identify any outliers in your data distribution.
+- Provide statistical analysis to help with decision-making
+
+## Configure a histogram visualization
+
+Once you’ve created a [dashboard](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/create-dashboard/), the following video shows you how to configure a histogram visualization:
+
+{{< youtube id="QfJ480j9-KM" >}}
 
 ## Supported data formats
 
 Histograms support time series and any table results with one or more numerical fields.
 
-## Display options
+### Examples
+
+The following tables are examples of the type of data you need for a histogram visualization and how it should be formatted.
+
+#### Time-series table
+
+| Time                | Walking (km) |
+| ------------------- | ------------ |
+| 2024-03-25 21:13:09 | 37.2         |
+| 2024-03-25 21:13:10 | 37.1         |
+| 2024-03-25 21:13:10 | 37.0         |
+| 2024-03-25 21:13:11 | 37.2         |
+| 2024-03-25 21:13:11 | 36.9         |
+| 2024-03-25 21:13:12 | 36.7         |
+| 2024-03-25 21:13:13 | 36.3         |
+
+The data is converted as follows:
+
+{{< figure src="/static/img/docs/histogram-panel/histogram-example-time-series.png" max-width="1025px" alt="A histogram visualization showing the random walk distribution." >}}
+
+#### Basic numerical table
 
-Use the following options to refine your visualization.
+| Gender | Height (kg) | Weight (lbs) |
+| ------ | ----------- | ------------ |
+| Male   | 73.8        | 242          |
+| Male   | 68.8        | 162          |
+| Male   | 74.1        | 213          |
+| Male   | 71.7        | 220          |
+| Male   | 69.9        | 206          |
+| Male   | 67.3        | 152          |
+| Male   | 68.8        | 184          |
+
+The data is converted as follows:
+
+{{< figure src="/static/img/docs/histogram-panel/histogram-example-height-weight.png" max-width="1025px" alt="A histogram visualization showing the male height and weight distribution" >}}
+
+## Histogram options
+
+Use the following options to refine your histogram visualization.
 
 ### Bucket size
 
@@ -71,18 +121,34 @@ Transparency of the gradient is calculated based on the values on the Y-axis. Th
 
 Gradient color is generated based on the hue of the line color.
 
-{{< docs/shared lookup="visualizations/tooltip-mode.md" source="grafana" version="<GRAFANA VERSION>" >}}
+## Standard options
+
+{{< docs/shared lookup="visualizations/standard-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Legend options
+
+{{< docs/shared lookup="visualizations/legend-options-1.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Value mappings
+
+{{< docs/shared lookup="visualizations/value-mappings-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Thresholds
+
+{{< docs/shared lookup="visualizations/thresholds-options-2.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Data links
 
-{{< docs/shared lookup="visualizations/legend-mode.md" source="grafana" version="<GRAFANA VERSION>" >}}
+{{< docs/shared lookup="visualizations/datalink-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-### Legend calculations
+## Field overrides
 
-Choose a [standard calculations][] to show in the legend. You can select more than one.
+{{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
 {{% docs/reference %}}
-[color scheme]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-standard-options#color-scheme"
-[color scheme]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-standard-options#color-scheme"
+[color scheme]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-standard-options#color-scheme"
+[color scheme]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-standard-options#color-scheme"
 
-[standard calculations]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/calculation-types"
-[standard calculations]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/calculation-types"
+[standard calculations]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data/calculation-types"
+[standard calculations]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data/calculation-types"
 {{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/visualizations/logs/index.md b/docs/sources/panels-visualizations/visualizations/logs/index.md
index 21a3b5ed0b61c..418a9a51b940f 100644
--- a/docs/sources/panels-visualizations/visualizations/logs/index.md
+++ b/docs/sources/panels-visualizations/visualizations/logs/index.md
@@ -15,6 +15,7 @@ labels:
     - cloud
     - enterprise
     - oss
+description: Configure options for Grafana's logs visualization
 title: Logs
 weight: 100
 ---
@@ -23,12 +24,18 @@ weight: 100
 
 The logs visualization shows log lines from data sources that support logs, such as Elastic, Influx, and Loki. Typically you would use this visualization next to a graph visualization to display the log output of a related process.
 
-<img class="screenshot" src="/static/img/docs/v64/logs-panel.png">
+{{< figure src="/static/img/docs/v64/logs-panel.png" max-width="1025px" alt="Logs panel" >}}
+
+{{< docs/play title="Logs Panel" url="https://play.grafana.org/d/6NmftOxZz/" >}}
 
 The logs visualization shows the result of queries that were entered in the Query tab. The results of multiple queries are merged and sorted by time. You can scroll inside the panel if the data source returns more lines than can be displayed at any one time.
 
 To limit the number of lines rendered, you can use the **Max data points** setting in the **Query options**. If it is not set, then the data source will usually enforce a default limit.
 
+The following video provides a walkthrough of creating a logs visualization. You'll also learn how to customize some settings and log visualization caveats:
+
+{{< youtube id="jSSi_x-fD_8" >}}
+
 ## Log level
 
 For logs where a **level** label is specified, we use the value of the label to determine the log level and update color accordingly. If the log doesn't have a level label specified, we try to find out if its content matches any of the supported expressions (see below for more information). The log level is always determined by the first match. In case Grafana is not able to determine a log level, it will be visualized with **unknown** log level. See [supported log levels and mappings of log level abbreviation and expressions][].
@@ -51,6 +58,7 @@ Use these settings to refine your visualization:
 - **Wrap lines -** Toggle line wrapping.
 - **Prettify JSON -** Set this to `true` to pretty print all JSON logs. This setting does not affect logs in any format other than JSON.
 - **Enable log details -** Toggle option to see the log details view for each log row. The default setting is true.
+- **Deduplication -** Hides log messages that are duplicates of others shown according to criteria such as exact match, or those that only differ by numbers such as IPs or latencies.
 - **Order -** Display results in descending or ascending time order. The default is **Descending**, showing the newest logs first. Set to **Ascending** to show the oldest log lines first.
 
 {{% docs/reference %}}
diff --git a/docs/sources/panels-visualizations/visualizations/news/index.md b/docs/sources/panels-visualizations/visualizations/news/index.md
index f7d35116870f7..b38a82d628be3 100644
--- a/docs/sources/panels-visualizations/visualizations/news/index.md
+++ b/docs/sources/panels-visualizations/visualizations/news/index.md
@@ -13,6 +13,7 @@ labels:
     - cloud
     - enterprise
     - oss
+description: Configure options for Grafana's news visualization
 title: News
 weight: 100
 ---
diff --git a/docs/sources/panels-visualizations/visualizations/node-graph/index.md b/docs/sources/panels-visualizations/visualizations/node-graph/index.md
index 7e7a3d2c588bf..eb28da6aeaf10 100644
--- a/docs/sources/panels-visualizations/visualizations/node-graph/index.md
+++ b/docs/sources/panels-visualizations/visualizations/node-graph/index.md
@@ -14,6 +14,7 @@ labels:
     - cloud
     - enterprise
     - oss
+description: Configure options for Grafana's node graph visualization
 title: Node graph
 weight: 100
 ---
@@ -103,13 +104,21 @@ Required fields:
 
 Optional fields:
 
-| Field name    | Type          | Description                                                                                                                                                                                         |
-| ------------- | ------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| mainstat      | string/number | First stat shown in the overlay when hovering over the edge. It can be a string showing the value as is or it can be a number. If it is a number, any unit associated with that field is also shown |
-| secondarystat | string/number | Same as mainStat, but shown right under it.                                                                                                                                                         |
-| detail\_\_\*  | string/number | Any field prefixed with `detail__` will be shown in the header of context menu when clicked on the edge. Use `config.displayName` for more human readable label.                                    |
-| thickness     | number        | The thickness of the edge. Default: `1`                                                                                                                                                             |
-| highlighted   | boolean       | Sets whether the edge should be highlighted. Useful, for example, to represent a specific path in the graph by highlighting several nodes and edges. Default: `false`                               |
+| Field name      | Type          | Description                                                                                                                                                                                                                                                               |
+| --------------- | ------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| mainstat        | string/number | First stat shown in the overlay when hovering over the edge. It can be a string showing the value as is or it can be a number. If it is a number, any unit associated with that field is also shown                                                                       |
+| secondarystat   | string/number | Same as mainStat, but shown right under it.                                                                                                                                                                                                                               |
+| detail\_\_\*    | string/number | Any field prefixed with `detail__` will be shown in the header of context menu when clicked on the edge. Use `config.displayName` for more human readable label.                                                                                                          |
+| thickness       | number        | The thickness of the edge. Default: `1`                                                                                                                                                                                                                                   |
+| highlighted     | boolean       | Sets whether the edge should be highlighted. Useful, for example, to represent a specific path in the graph by highlighting several nodes and edges. Default: `false`                                                                                                     |
+| color           | string        | Sets the default color of the edge. It can be an acceptable HTML color string. Default: `#999`                                                                                                                                                                            |
+| strokeDasharray | string        | Sets the pattern of dashes and gaps used to render the edge. If unset, a solid line is used as edge. For more information and examples, refer to the [`stroke-dasharray` MDN documentation](https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/stroke-dasharray). |
+
+{{< admonition type="caution" >}}
+Starting with 10.5, `highlighted` is deprecated.
+It will be removed in a future release.
+Use `color` to indicate a highlighted edge state instead.
+{{< /admonition >}}
 
 ### Nodes data frame structure
 
diff --git a/docs/sources/panels-visualizations/visualizations/pie-chart/index.md b/docs/sources/panels-visualizations/visualizations/pie-chart/index.md
index e3abe45f7cd82..d37bdacbd44aa 100644
--- a/docs/sources/panels-visualizations/visualizations/pie-chart/index.md
+++ b/docs/sources/panels-visualizations/visualizations/pie-chart/index.md
@@ -10,6 +10,7 @@ labels:
     - cloud
     - enterprise
     - oss
+description: Configure options for Grafana's pie chart visualization
 title: Pie chart
 weight: 100
 ---
@@ -20,6 +21,8 @@ weight: 100
 
 Pie charts display reduced series, or values in a series, from one or more queries, as they relate to each other, in the form of slices of a pie. The arc length, area and central angle of a slice are all proportional to the slices value, as it relates to the sum of all values. This type of chart is best used when you want a quick comparison of a small set of values in an aesthetically pleasing form.
 
+{{< docs/play title="Grafana Bar Charts and Pie Charts" url="https://play.grafana.org/d/ktMs4D6Mk/" >}}
+
 ## Value options
 
 Use the following options to refine the value in your visualization.
@@ -77,38 +80,56 @@ The following example shows a pie chart with **Name** and **Percent** labels dis
 
 ![Pie chart labels](/static/img/docs/pie-chart-panel/pie-chart-labels-7-5.png)
 
-{{< docs/shared lookup="visualizations/tooltip-mode.md" source="grafana" version="<GRAFANA VERSION>" >}}
+## Standard options
+
+{{< docs/shared lookup="visualizations/standard-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Tooltip options
+
+{{< docs/shared lookup="visualizations/tooltip-options-1.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
 ## Legend options
 
 Use these settings to define how the legend appears in your visualization. For more information about the legend, refer to [Configure a legend]({{< relref "../../configure-legend" >}}).
 
-### Legend visibility
+### Visibility
 
-Use the **Visibility** switch to show or hide the legend.
+Toggle the switch to turn the legend on or off.
 
-### Legend mode
+### Mode
 
-Set the display mode of the legend:
+Use these settings to define how the legend appears in your visualization.
 
 - **List -** Displays the legend as a list. This is a default display mode of the legend.
 - **Table -** Displays the legend as a table.
 
-### Legend placement
+### Placement
 
 Choose where to display the legend.
 
 - **Bottom -** Below the graph.
 - **Right -** To the right of the graph.
 
-### Legend values
+#### Width
+
+Control how wide the legend is when placed on the right side of the visualization. This option is only displayed if you set the legend placement to **Right**.
+
+### Values
 
 Select values to display in the legend. You can select more than one.
 
 - **Percent:** The percentage of the whole.
 - **Value:** The raw numerical value.
 
+## Value mappings
+
+{{< docs/shared lookup="visualizations/value-mappings-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Field overrides
+
+{{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
 {{% docs/reference %}}
-[Calculation types]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/calculation-types"
-[Calculation types]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/calculation-types"
+[Calculation types]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data/calculation-types"
+[Calculation types]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data/calculation-types"
 {{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/visualizations/stat/index.md b/docs/sources/panels-visualizations/visualizations/stat/index.md
index a53d31b00c526..b4a04bc7db402 100644
--- a/docs/sources/panels-visualizations/visualizations/stat/index.md
+++ b/docs/sources/panels-visualizations/visualizations/stat/index.md
@@ -5,7 +5,7 @@ aliases:
   - ../../panels/visualizations/stat-panel/
   - ../../reference/singlestat/
   - ../../visualizations/stat-panel/
-description: Stat panel documentation
+description: Configure options for Grafana's stat visualization
 keywords:
   - grafana
   - docs
@@ -21,24 +21,76 @@ weight: 100
 
 # Stat
 
-Stats show one large stat value with an optional graph sparkline. You can control the background or value color using thresholds or overrides.
-
-{{< figure src="/static/img/docs/v66/stat_panel_dark3.png" max-width="1025px" caption="Stat visualization" >}}
-
 {{% admonition type="note" %}}
 This visualization replaces the Singlestat visualization, which was deprecated in Grafana 7.0 and removed in Grafana 8.0.
 {{% /admonition %}}
 
+A stat visualization displays your data in single values of interest&mdash;such as the latest or current value of a series&mdash;with an optional graph sparkline. A graph sparkline, which is only available in stat visualizations, is a small time-series graph shown in the background of each value in the visualization.
+
+For example, if you're monitoring the utilization of various services, you can use a stat visualization to show their latest usage:
+
+{{< figure src="/static/img/docs/v66/stat_panel_dark3.png" max-width="1025px" alt="A stat panel showing latest usage of various services" >}}
+
+Use a stat visualization when you need to:
+
+- Monitor key metrics at a glance, such as the latest health of your application, number of high priority bugs in your application, or total number of sales.
+- Display aggregated data, such as the average response time of your services.
+- Highlight values above your normal thresholds to quickly identify if any metrics are outside your expected range.
+
+{{< docs/play title="Stat Visualizations in Grafana" url="https://play.grafana.org/d/Zb3f4veGk/" >}}
+
+## Configure a stat visualization
+
+Once you've [created a dashboard](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/create-dashboard/), the following video shows you how to configure a stat visualization:
+
+{{< youtube id="yNRnLyVntUw" start="1048" >}}
+
+Alternatively, refer to this blog post on [how to easily retrieve values from a range in Grafana using a stat visualization](https://grafana.com/blog/2023/10/18/how-to-easily-retrieve-values-from-a-range-in-grafana-using-a-stat-panel/).
+
+## Supported data formats
+
+The stat visualization supports a variety of formats for displaying data. Supported formats include:
+
+- **Single values** - The most common format and can be numerical, strings, or boolean values.
+- **Time-series data** - [Calculation types][] can be applied to your time-series data to display single values over a specified time range.
+
+### Examples
+
+The following tables are examples of the type of data you need for a stat visualization and how it should be formatted.
+
+#### Single numerical values
+
+| Number of high priority bugs |
+| ---------------------------- |
+| 80                           |
+| 52                           |
+| 59                           |
+| 40                           |
+
+The data is visualized as follows, with the last value displayed, along with a sparkline and [percentage change](#show-percent-change):
+
+{{< figure src="/static/img/docs/stat-panel/stat_panel_single.png" max-width="1025px" alt="A stat panel showing the latest number of high priority bugs" >}}
+
+#### Time-series data
+
+| Time                | Cellar | Living room | Porch | Bedroom | Guest room | Kitchen |
+| ------------------- | ------ | ----------- | ----- | ------- | ---------- | ------- |
+| 2024-03-20 06:34:40 | 12.3   | 18.3        | 18.8  | 15.9    | 9.29       | 9.61    |
+| 2024-03-20 06:41:40 | 16.8   | 17.1        | 21.5  | 14.1    | 10.5       | 17.5    |
+| 2024-03-20 06:48:40 | 16.7   | 18.0        | 21.0  | 9.51    | 13.6       | 20.1    |
+| 2024-03-20 06:55:40 | 14.3   | 18.7        | 16.5  | 9.11    | 14.8       | 12.5    |
+| 2024-03-20 07:02:40 | 12.8   | 15.2        | 21.1  | 15.6    | 7.98       | 13.0    |
+
+The data is visualized as follows, with the mean value displayed for each room, along with the room name, sparkline, and unit of measurement:
+
+{{< figure src="/static/img/docs/stat-panel/stat_panel_multiple.png" max-width="1025px" alt="A stat panel showing some statistics for each room in square meters" >}}
+
 By default, a stat displays one of the following:
 
 - Just the value for a single series or field.
 - Both the value and name for multiple series or fields.
 
-You can use the **Text mode** to control how the text is displayed.
-
-Example screenshot:
-
-{{< figure src="/static/img/docs/v71/stat-panel-text-modes.png" max-width="1025px" caption="Stat visualization" >}}
+You can use the [**Text mode**](#text-mode) to control how the text is displayed.
 
 ## Automatic layout adjustment
 
@@ -88,6 +140,17 @@ You can use the Text mode option to control what text the visualization renders.
 - **Name -** Show name instead of value. Value is displayed in the hover tooltip.
 - **None -** Show nothing (empty). Name and value are displayed in the hover tooltip.
 
+### Wide layout
+
+Set whether wide layout is enabled or not. Wide layout is enabled by default.
+
+- **On -** Wide layout is enabled.
+- **Off -** Wide layout is disabled.
+
+{{% admonition type="note" %}}
+This option is only applicable when **Text mode** is set to **Value and name**. When wide layout is enabled, the value and name are displayed side-by-side with the value on the right, if the panel is wide enough. When wide layout is disabled, the value is always rendered underneath the name.
+{{% /admonition %}}
+
 ### Color mode
 
 Select a color mode.
@@ -111,6 +174,14 @@ Choose an alignment mode.
 - **Auto -** If only a single value is shown (no repeat), then the value is centered. If multiple series or rows are shown, then the value is left-aligned.
 - **Center -** Stat value is centered.
 
+### Show percent change
+
+Set whether percent change is displayed or not. Disabled by default.
+
+{{% admonition type="note" %}}
+This option is not applicable when the **Show** setting, under **Value options**, is set to **All values**.
+{{% /admonition %}}
+
 ## Text size
 
 Adjust the sizes of the gauge text.
@@ -118,7 +189,27 @@ Adjust the sizes of the gauge text.
 - **Title -** Enter a numeric value for the gauge title size.
 - **Value -** Enter a numeric value for the gauge value size.
 
+## Standard options
+
+{{< docs/shared lookup="visualizations/standard-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Data links
+
+{{< docs/shared lookup="visualizations/datalink-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Value mappings
+
+{{< docs/shared lookup="visualizations/value-mappings-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Thresholds
+
+{{< docs/shared lookup="visualizations/thresholds-options-2.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Field overrides
+
+{{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
 {{% docs/reference %}}
-[Calculation types]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/calculation-types"
-[Calculation types]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/calculation-types"
+[Calculation types]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data/calculation-types"
+[Calculation types]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data/calculation-types"
 {{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/visualizations/state-timeline/index.md b/docs/sources/panels-visualizations/visualizations/state-timeline/index.md
index c989233945f69..5106f1de5fb55 100644
--- a/docs/sources/panels-visualizations/visualizations/state-timeline/index.md
+++ b/docs/sources/panels-visualizations/visualizations/state-timeline/index.md
@@ -2,7 +2,7 @@
 aliases:
   - ../../panels/visualizations/state-timeline/
   - ../../visualizations/state-timeline/
-description: State timeline visualization
+description: Configure options for Grafana's state timeline visualization
 keywords:
   - grafana
   - docs
@@ -19,9 +19,72 @@ weight: 100
 
 # State timeline
 
-State timelines show discrete state changes over time. Each field or series is rendered as its unique horizontal band. State regions can either be rendered with or without values. This visualization works well with string or boolean states but can also be used with time series. When used with time series, the thresholds are used to turn the numerical values into discrete state regions.
+A state timeline visualization displays data in a way that shows state changes over time. In a state timeline, the data is presented as a series of bars or bands called _state regions_. State regions can be rendered with or without values, and the region length indicates the duration or frequency of a state within a given time range.
 
-{{< figure src="/static/img/docs/v8/state_timeline_strings.png" max-width="1025px" caption="state timeline with string states" >}}
+For example, if you're monitoring the CPU usage of a server, you can use a state timeline to visualize the different states, such as “LOW,” “NORMAL,” “HIGH,” or “CRITICAL,” over time. Each state is represented by a different color and the lengths represent the duration of time that the server remained in that state:
+
+{{< figure src="/static/img/docs/state-timeline-panel/state-timeline-panel.png" max-width="1025px" alt="A state timeline visualization showing CPU usage" >}}
+
+The state timeline visualization is useful when you need to monitor and analyze changes in states or statuses of various entities over time. You can use one when you need to:
+
+- Monitor the status of a server, application, or service to know when your infrastructure is experiencing issues over time.
+- Identify operational trends over time.
+- Spot any recurring issues with the health of your applications.
+
+## Configure a state timeline
+
+{{< youtube id="a9wZHM0mdxo" >}}
+
+{{< docs/play title="Grafana State Timeline & Status History" url="https://play.grafana.org/d/qD-rVv6Mz/6-state-timeline-and-status-history?orgId=1s" >}}
+
+## Supported data formats
+
+The state timeline visualization works best if you have data capturing the various states of entities over time, formatted as a table. The data must include:
+
+- **Timestamps** - Indicate when each state change occurred. This could also be the start time for the state change. You can also add an optional timestamp to indicate the end time for the state change.
+- **Entity name/identifier** - Represents the name of the entity you're trying to monitor.
+- **State value** - Represents the state value of the entity you're monitoring. These can be string, numerical, or boolean states.
+
+Each state ends when the next state begins or when there is a `null` value.
+
+### Examples
+
+The following tables are examples of the type of data you need for a state timeline visualization and how it should be formatted.
+
+#### Single time column with null values
+
+| Timestamps          | Server A | Server B |
+| ------------------- | -------- | -------- |
+| 2024-02-29 8:00:00  | Up       | Up       |
+| 2024-02-29 8:15:00  | null     | Up       |
+| 2024-02-29 8:30:00  | Down     | null     |
+| 2024-02-29 8:45:00  |          | Up       |
+| 2024-02-29 9:00:00  | Up       |          |
+| 2024-02-29 9:15:00  | Up       | Down     |
+| 2024-02-29 9:30:00  | Up       | Down     |
+| 2024-02-29 10:00:00 | Down     | Down     |
+| 2024-02-29 10:30:00 | Warning  | Down     |
+
+The data is converted as follows, with the [null and empty values visualized as gaps](https://grafana.com/docs/grafana/latest/panels-visualizations/visualizations/state-timeline/#connect-null-values) in the state timeline:
+
+{{< figure src="/static/img/docs/state-timeline-panel/state-timeline-with-null-values.png" max-width="1025px" alt="A state timeline visualization with null values showing the status of two servers" >}}
+
+#### Two time columns without null values
+
+| Start time          | End time            | Server A | Server B |
+| ------------------- | ------------------- | -------- | -------- |
+| 2024-02-29 8:00:00  | 2024-02-29 8:15:00  | Up       | Up       |
+| 2024-02-29 8:15:00  | 2024-02-29 8:30:00  | Up       | Up       |
+| 2024-02-29 8:45:00  | 2024-02-29 9:00:00  | Down     | Up       |
+| 2024-02-29 9:00:00  | 2024-02-29 9:15:00  | Down     | Up       |
+| 2024-02-29 9:30:00  | 2024-02-29 10:00:00 | Down     | Down     |
+| 2024-02-29 10:00:00 | 2024-02-29 10:30:00 | Warning  | Down     |
+
+The data is converted as follows:
+
+{{< figure src="/static/img/docs/state-timeline-panel/state-timeline-with-two-timestamps.png" max-width="1025px" alt="A state timeline visualization with two time columns showing the status of two servers" >}}
+
+If your query results aren't in a table format like the preceding examples, especially for time-series data, you can apply specific [transformations](https://stackoverflow.com/questions/68887416/grafana-state-timeline-panel-with-values-states-supplied-by-label) to achieve this.
 
 ## State timeline options
 
@@ -51,15 +114,9 @@ Controls line width of state regions.
 
 Controls the opacity of state regions.
 
-{{< docs/shared lookup="visualizations/connect-null-values.md" source="grafana" version="<GRAFANA VERSION>" >}}
-
-{{< docs/shared lookup="visualizations/disconnect-values.md" source="grafana" version="<GRAFANA VERSION>" >}}
-
-## Value mappings
-
-To assign colors to boolean or string values, you can use [Value mappings][].
+{{< docs/shared lookup="visualizations/connect-null-values.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-{{< figure src="/static/img/docs/v8/value_mappings_side_editor.png" max-width="300px" caption="Value mappings side editor" >}}
+{{< docs/shared lookup="visualizations/disconnect-values.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
 ## Time series data with thresholds
 
@@ -67,16 +124,40 @@ The visualization can be used with time series data as well. In this case, the t
 
 {{< figure src="/static/img/docs/v8/state_timeline_time_series.png" max-width="1025px" caption="state timeline with time series" >}}
 
+## Standard options
+
+{{< docs/shared lookup="visualizations/standard-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
 ## Legend options
 
-When the legend option is enabled it can show either the value mappings or the threshold brackets. To show the value mappings in the legend, it's important that the `Color scheme` as referenced in [Color scheme][] is set to `Single color` or `Classic palette`. To see the threshold brackets in the legend set the `Color scheme` to `From thresholds`.
+{{< docs/shared lookup="visualizations/legend-options-2.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Tooltip options
+
+{{< docs/shared lookup="visualizations/tooltip-options-1.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Data links
+
+{{< docs/shared lookup="visualizations/datalink-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Value mappings
+
+{{< docs/shared lookup="visualizations/value-mappings-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+{{< figure src="/static/img/docs/v8/value_mappings_side_editor.png" max-width="300px" caption="Value mappings side editor" >}}
+
+## Thresholds
+
+{{< docs/shared lookup="visualizations/thresholds-options-2.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Field overrides
 
-{{< docs/shared lookup="visualizations/legend-mode.md" source="grafana" version="<GRAFANA VERSION>" >}}
+{{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
 {{% docs/reference %}}
-[Color scheme]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-standard-options#color-scheme"
-[Color scheme]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-standard-options#color-scheme"
+[Color scheme]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-standard-options#color-scheme"
+[Color scheme]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-standard-options#color-scheme"
 
-[Value mappings]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-value-mappings"
-[Value mappings]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-value-mappings"
+[Value mappings]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-value-mappings"
+[Value mappings]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-value-mappings"
 {{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/visualizations/status-history/index.md b/docs/sources/panels-visualizations/visualizations/status-history/index.md
index a5c48800184f8..02d16c7e20f22 100644
--- a/docs/sources/panels-visualizations/visualizations/status-history/index.md
+++ b/docs/sources/panels-visualizations/visualizations/status-history/index.md
@@ -2,7 +2,7 @@
 aliases:
   - ../../panels/visualizations/status-history/
   - ../../visualizations/status-history/
-description: Status history visualization
+description: Configure options for Grafana's status history visualization
 keywords:
   - grafana
   - docs
@@ -19,15 +19,72 @@ weight: 100
 
 # Status history
 
-Status histories show periodic states over time. Each field or series is rendered as a horizontal row. Boxes are rendered and centered around each value.
+A status history visualization displays data in a way that shows periodic states over time. In a status history, each field or series is rendered as a horizontal row, with multiple boxes showing the different statuses. This provides you with a centralized view for the status of a component or service.
 
-{{< figure src="/static/img/docs/status-history-panel/status-history-example-v8-0.png" max-width="1025px" caption="Status history example" >}}
+For example, if you're monitoring the health status of different services, you can use a status history to visualize the different statuses, such as “OK,” “WARN,” or “BAD,” over time. Each status is represented by a different color:
 
-## Supported data
+{{< figure src="/static/img/docs/status-history-panel/status-history-example-v8-0.png" max-width="1025px" alt="A status history panel showing the health status of different services" >}}
 
-A status history works with string, boolean and numerical fields or time series. A time field is required. You can use value mappings to color strings or assign text values to numerical ranges.
+{{% admonition type="note" %}}
+A status history is similar to a [state timeline](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/state-timeline/), but has different [configuration options](#status-history-options). Unlike state timelines, status histories don't merge consecutive values.
+{{% /admonition %}}
 
-## Display options
+Use a status history when you need to:
+
+- Monitor the status of a server, application, or service to know when your infrastructure is experiencing issues over time.
+- Identify operational trends over time.
+- Spot any recurring issues with the health of your applications.
+
+## Configure a status history
+
+Once you've [created a dashboard](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/create-dashboard/), you can use the following state timeline video as a reference for how to configure a status history:
+
+{{< youtube id="a9wZHM0mdxo" >}}
+
+{{< docs/play title="Grafana State Timeline & Status History" url="https://play.grafana.org/d/qD-rVv6Mz/6-state-timeline-and-status-history?orgId=1s" >}}
+
+## Supported data formats
+
+The status history visualization works best if you have data capturing the various status of entities over time, formatted as a table. The data must include:
+
+- **Timestamps** - Indicate when each status change occurred. This could also be the start time for the status change. You can also add an optional timestamp to indicate the end time for the status change.
+- **Entity name/identifier** - Represents the name of the entity you're trying to monitor.
+- **Status value** - Represents the state value of the entity you're monitoring. These can be string, numerical, or boolean states.
+
+### Examples
+
+The following tables are examples of the type of data you need for a status history visualization and how it should be formatted.
+
+#### Single time column with null values
+
+| Timestamps         | Backend_01 | Backend_02 |
+| ------------------ | ---------- | ---------- |
+| 2024-02-29 8:00:00 | OK         | WARN       |
+| 2024-02-29 8:15:00 | WARN       |            |
+| 2024-02-29 8:18:00 |            | WARN       |
+| 2024-02-29 8:30:00 | BAD        |            |
+| 2024-02-29 8:36:00 |            | OK         |
+| 2024-02-29 8:45:00 | OK         |            |
+
+The data is converted as follows, with the null and empty values visualized as gaps in the status history:
+
+{{< figure src="/static/img/docs/status-history-panel/status_history_with_null.png" max-width="1025px" alt="A status history panel with null values showing the status of two servers" >}}
+
+#### Two time columns without null values
+
+| Start time         | End time           | Backend_01 | Backend_02 |
+| ------------------ | ------------------ | ---------- | ---------- |
+| 2024-02-29 8:00:00 | 2024-02-29 8:15:00 | OK         | OK         |
+| 2024-02-29 8:15:00 | 2024-02-29 8:30:00 | OK         | OK         |
+| 2024-02-29 8:30:00 | 2024-02-29 8:45:00 | OK         | OK         |
+| 2024-02-29 8:45:00 | 2024-02-29 9:00:00 | BAD        | WARN       |
+| 2024-02-29 9:00:00 | 2024-02-29 9:15:00 | OK         | WARN       |
+
+The data is converted as follows:
+
+{{< figure src="/static/img/docs/status-history-panel/status_history.png" max-width="1025px" alt="A status history panel with two time columns showing the status of two servers" >}}
+
+## Status history options
 
 Use these options to refine the visualization.
 
@@ -47,29 +104,40 @@ Controls line width of state regions.
 
 Controls the opacity of state regions.
 
-## Value mappings
+## Standard options
 
-To assign colors to boolean or string values, use the [Value mappings][].
+{{< docs/shared lookup="visualizations/standard-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-{{< figure src="/static/img/docs/v8/value_mappings_side_editor.png" max-width="300px" caption="Value mappings side editor" >}}
+## Legend options
 
-## Time series data with thresholds
+{{< docs/shared lookup="visualizations/legend-options-2.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-The visualization can be used with time series data as well. In this case, the thresholds are used to color the boxes. You can also
-use gradient color schemes to color values.
+## Tooltip options
 
-{{< figure src="/static/img/docs/v8/state_timeline_time_series.png" max-width="1025px" caption="state timeline with time series" >}}
+{{< docs/shared lookup="visualizations/tooltip-options-1.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Legend options
+## Data links
+
+{{< docs/shared lookup="visualizations/datalink-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Value mappings
+
+{{< docs/shared lookup="visualizations/value-mappings-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+{{< figure src="/static/img/docs/v8/value_mappings_side_editor.png" max-width="300px" caption="Value mappings side editor" >}}
+
+## Thresholds
+
+{{< docs/shared lookup="visualizations/thresholds-options-2.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-When the legend option is enabled it can show either the value mappings or the threshold brackets. To show the value mappings in the legend, it's important that the `Color scheme` as referenced in [Color scheme][] is set to `Single color` or `Classic palette`. To see the threshold brackets in the legend set the `Color scheme` to `From thresholds`.
+## Field overrides
 
-{{< docs/shared lookup="visualizations/legend-mode.md" source="grafana" version="<GRAFANA VERSION>" >}}
+{{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
 {{% docs/reference %}}
-[Value mappings]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-value-mappings"
-[Value mappings]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-value-mappings"
+[Value mappings]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-value-mappings"
+[Value mappings]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-value-mappings"
 
-[Color scheme]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-standard-options#color-scheme"
-[Color scheme]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-standard-options#color-scheme"
+[Color scheme]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-standard-options#color-scheme"
+[Color scheme]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-standard-options#color-scheme"
 {{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/visualizations/table/index.md b/docs/sources/panels-visualizations/visualizations/table/index.md
index 8459bf2b13f62..d12c0d5825831 100644
--- a/docs/sources/panels-visualizations/visualizations/table/index.md
+++ b/docs/sources/panels-visualizations/visualizations/table/index.md
@@ -6,7 +6,7 @@ aliases:
   - ../../visualizations/table/
   - ../../visualizations/table/filter-table-columns/
   - /docs/grafana/next/panels/visualizations/table/table-field-options/
-description: Learn about table panel visualization features.
+description: Configure options for Grafana's table visualization
 keywords:
   - grafana
   - dashboard
@@ -27,10 +27,16 @@ weight: 100
 
 # Table
 
-Tables are very flexible, supporting multiple modes for time series and for tables, annotation, and raw JSON data. This visualization also provides date formatting, value formatting, and coloring options.
+Tables are very flexible, supporting multiple modes for time series and for tables, annotation, and raw JSON data. This visualization also provides date formatting, value formatting, and coloring options. In addition to formatting and coloring options, Grafana also provides a variety of _Cell types_ which you can use to display gauges, sparklines, and other rich data displays.
 
 {{< figure src="/static/img/docs/tables/table_visualization.png" max-width="1200px" lightbox="true" caption="Table visualization" >}}
 
+The following video provides a visual walkthrough of the options you can set in a table visualization. If you want to see a configuration in action, check out the video:
+
+{{< youtube id="PCY7O8EJeJY" >}}
+
+{{< docs/play title="Table Visualizations in Grafana" url="https://play.grafana.org/d/OhR1ID6Mk/" >}}
+
 ## Annotation and alert support
 
 Annotations and alerts are not currently supported in tables.
@@ -94,6 +100,10 @@ If thresholds are set, then the field background is displayed in the appropriate
 
 {{< figure src="/static/img/docs/tables/color-background.png" max-width="500px" caption="Color background" class="docs-image--no-shadow" >}}
 
+Toggle the **Apply to entire row** switch, to apply the background color that's configured for the cell to the whole row.
+
+{{< figure src="/static/img/docs/tables/colored-rows.png" max-width="500px" alt="Colored row background" class="docs-image--no-shadow" >}}
+
 ### Gauge
 
 Cells can be displayed as a graphical gauge, with several different presentation types.
@@ -132,6 +142,10 @@ Additionally, labels displayed alongside of the gauges can be set to be colored
 
 {{< figure src="/static/img/docs/tables/hidden-mode.png" max-width="500px" caption="Hide Label" class="docs-image--no-shadow" >}}
 
+### Data links
+
+If you've configured data links, when the cell type is **Auto** mode, the cell text becomes clickable. If you change the cell type to **Data links**, the cell text reflects the titles of the configured data links. To control the application of data link text more granularly use a **Cell option > Cell type > Data links** field override.
+
 ### JSON view
 
 Shows value formatted as code. If a value is an object the JSON view allowing browsing the JSON object will appear on hover.
@@ -148,10 +162,12 @@ If you have a field value that is an image URL or a base64 encoded image you can
 
 ### Sparkline
 
-Shows value rendered as a sparkline. Requires [time series to table][] data transform.
+Shows values rendered as a sparkline. You can show sparklines using the [Time series to table transformation][] on data with multiple time series to process it into a format the table can show.
 
 {{< figure src="/static/img/docs/tables/sparkline2.png" max-width="500px" caption="Sparkline" class="docs-image--no-shadow" >}}
 
+You can be customize sparklines with many of the same options as the [Time series panel][] including line width, fill opacity, and more. You can also change the color of the sparkline by updating the [color scheme][] in the _Standard options_ section of the panel configuration.
+
 ## Cell value inspect
 
 Enables value inspection from table cell. The raw value is presented in a modal window.
@@ -191,6 +207,14 @@ To filter column values, click the filter (funnel) icon next to a column title.
 
 Click the check box next to the values that you want to display. Enter text in the search field at the top to show those values in the display so that you can select them rather than scroll to find them.
 
+Choose from several operators to display column values:
+
+- **Contains** - Matches a regex pattern (operator by default).
+- **Expression** - Evaluates a boolean expression. The character `$` represents the column value in the expression (for example, "$ >= 10 && $ <= 12").
+- The typical comparison operators: `=`, `!=`, `<`, `<=`, `>`, `>=`.
+
+Click the check box above the **Ok** and **Cancel** buttons to add or remove all displayed values to/from the filter.
+
 ### Clear column filters
 
 Columns with filters applied have a blue funnel displayed next to the title.
@@ -214,13 +238,39 @@ The system applies the calculation to all numeric fields if you do not select a
 
 If you want to show the number of rows in the dataset instead of the number of values in the selected fields, select the **Count** calculation and enable **Count rows**.
 
+## Standard options
+
+{{< docs/shared lookup="visualizations/standard-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Data links
+
+{{< docs/shared lookup="visualizations/datalink-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Value mappings
+
+{{< docs/shared lookup="visualizations/value-mappings-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Thresholds
+
+{{< docs/shared lookup="visualizations/thresholds-options-2.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Field overrides
+
+{{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
 {{% docs/reference %}}
-[calculations]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/calculation-types"
-[calculations]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/calculation-types"
+[calculations]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data/calculation-types"
+[calculations]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data/calculation-types"
+
+[Time series to table transformation]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data/transform-data#time-series-to-table-transform"
+[Time series to table transformation]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data/transform-data#time-series-to-table-transform"
+
+[Time series panel]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/time-series"
+[Time series panel]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/time-series"
 
-[time series to table]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/query-transform-data/transform-data#time-series-to-table-transform"
-[time series to table]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/query-transform-data/transform-data#time-series-to-table-transform"
+[color scheme]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-standard-options#color-scheme"
+[color scheme]: "/docs/grafana-cloud -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-standard-options#color-scheme"
 
-[configuration file]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-grafana#configuration-file-location"
-[configuration file]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-grafana#configuration-file-location"
+[configuration file]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana#configuration-file-location"
+[configuration file]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana#configuration-file-location"
 {{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/visualizations/text/index.md b/docs/sources/panels-visualizations/visualizations/text/index.md
index 8095a2da643d7..f9ed03275af9f 100644
--- a/docs/sources/panels-visualizations/visualizations/text/index.md
+++ b/docs/sources/panels-visualizations/visualizations/text/index.md
@@ -14,6 +14,7 @@ labels:
     - cloud
     - enterprise
     - oss
+description: Configure options for Grafana's text visualization
 title: Text
 weight: 100
 ---
@@ -22,10 +23,24 @@ weight: 100
 
 Text visualizations enable you to directly include text or HTML in your dashboards. This can be used to add contextual information and descriptions or embed complex HTML.
 
+For example, if you want to display important links to your dashboard, you can use a text visualization to add these links:
+
+{{< figure src="/static/img/docs/text-panel/text-panel.png" max-width="1025px" alt="A text panel showing important links" >}}
+
+Use a text visualization when you need to:
+
+- Add important links or useful annotations.
+- Provide instructions or guidance on how to interpret different panels, configure settings, or take specific actions based on the displayed data.
+- Announce any scheduled maintenance or downtime that might impact your dashboards.
+
 ## Mode
 
 **Mode** determines how embedded content appears.
 
+{{< admonition type="note" >}}
+To allow embedding of iframes and other websites, you need set `allow_embedding = true` in your Grafana `config.ini` or environment variables (depending on your employment).
+{{< /admonition >}}
+
 ### Markdown
 
 This option formats the content as [markdown](https://en.wikipedia.org/wiki/Markdown).
diff --git a/docs/sources/panels-visualizations/visualizations/time-series/index.md b/docs/sources/panels-visualizations/visualizations/time-series/index.md
index 209df93cf86e7..a4a10cfd94a03 100644
--- a/docs/sources/panels-visualizations/visualizations/time-series/index.md
+++ b/docs/sources/panels-visualizations/visualizations/time-series/index.md
@@ -29,6 +29,7 @@ labels:
     - cloud
     - enterprise
     - oss
+description: Configure options for Grafana's time series visualization
 title: Time series
 weight: 10
 ---
@@ -37,23 +38,25 @@ weight: 10
 
 {{< figure src="/static/img/docs/time-series-panel/time_series_small_example.png" max-width="1200px" caption="Time series" >}}
 
-Time series visualizations are the default and primary way to visualize time series data as a graph. They can render series as lines, points, or bars. They're versatile enough to display almost any time-series data. [This public demo dashboard](https://play.grafana.org/d/000000016/1-time-series-graphs?orgId=1) contains many different examples of how a time series visualization can be configured and styled.
+Time series visualizations are the default and primary way to visualize time series data as a graph. They can render series as lines, points, or bars. They're versatile enough to display almost any time-series data.
 
 {{% admonition type="note" %}}
 You can migrate from the old Graph visualization to the new time series visualization. To migrate, open the panel and click the **Migrate** button in the side pane.
 {{% /admonition %}}
 
-## Tooltip options
+The following video guides you through the creation steps and common customizations of time series visualizations and is great for beginners:
 
-Tooltip options control the information overlay that appears when you hover over data points in the graph.
+{{< youtube id="RKtW87cPxsw" >}}
 
-{{< docs/shared lookup="visualizations/tooltip-mode.md" source="grafana" version="<GRAFANA VERSION>" >}}
+{{< docs/play title="Time Series Visualizations in Grafana" url="https://play.grafana.org/d/000000016/" >}}
 
-## Legend options
+## Tooltip options
+
+{{< docs/shared lookup="visualizations/tooltip-options-2.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-Legend options control the series names and statistics that appear under or to the right of the graph.
+## Legend options
 
-{{< docs/shared lookup="visualizations/legend-mode.md" source="grafana" version="<GRAFANA VERSION>" >}}
+{{< docs/shared lookup="visualizations/legend-options-1.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
 ## Graph styles
 
@@ -136,9 +139,9 @@ Set the style of the line. To change the color, use the standard [color scheme][
 
 ![Line styles examples](/static/img/docs/time-series-panel/line-styles-examples-v9.png)
 
-{{< docs/shared lookup="visualizations/connect-null-values.md" source="grafana" version="<GRAFANA VERSION>" >}}
+{{< docs/shared lookup="visualizations/connect-null-values.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-{{< docs/shared lookup="visualizations/disconnect-values.md" source="grafana" version="<GRAFANA VERSION>" >}}
+{{< docs/shared lookup="visualizations/disconnect-values.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
 ### Stack series
 
@@ -255,7 +258,7 @@ Use this option to transform the series values without affecting the values show
 The transform option is only available as an override.
 {{% /admonition %}}
 
-{{< docs/shared lookup="visualizations/multiple-y-axes.md" source="grafana" version="<GRAFANA VERSION>" leveloffset="+2" >}}
+{{< docs/shared lookup="visualizations/multiple-y-axes.md" source="grafana" version="<GRAFANA_VERSION>" leveloffset="+2" >}}
 
 ## Color options
 
@@ -298,19 +301,39 @@ The following image shows a bar chart with the **Green-Yellow-Red (by value)** c
 
 {{< figure src="/static/img/docs/time-series-panel/gradient_mode_scheme_bars.png" max-width="1200px" caption="Color scheme: Green-Yellow-Red" >}}
 
+## Standard options
+
+{{< docs/shared lookup="visualizations/standard-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Data links
+
+{{< docs/shared lookup="visualizations/datalink-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Value mappings
+
+{{< docs/shared lookup="visualizations/value-mappings-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Thresholds
+
+{{< docs/shared lookup="visualizations/thresholds-options-1.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Field overrides
+
+{{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
 {{% docs/reference %}}
-[Color scheme]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-standard-options#color-scheme"
-[Color scheme]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-standard-options#color-scheme"
+[Color scheme]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-standard-options#color-scheme"
+[Color scheme]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-standard-options#color-scheme"
 
-[Add a field override]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-overrides#add-a-field-override"
-[Add a field override]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-overrides#add-a-field-override"
+[Add a field override]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-overrides#add-a-field-override"
+[Add a field override]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-overrides#add-a-field-override"
 
-[Configure standard options]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-standard-options#max"
-[Configure standard options]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-standard-options#max"
+[Configure standard options]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-standard-options#max"
+[Configure standard options]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-standard-options#max"
 
-[color scheme]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-standard-options#color-scheme"
-[color scheme]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-standard-options#color-scheme"
+[color scheme]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-standard-options#color-scheme"
+[color scheme]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-standard-options#color-scheme"
 
-[Configure field overrides]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-overrides"
-[Configure field overrides]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/configure-overrides"
+[Configure field overrides]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-overrides"
+[Configure field overrides]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-overrides"
 {{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/visualizations/traces/index.md b/docs/sources/panels-visualizations/visualizations/traces/index.md
index 8b0e85c4c0d26..dafc23d165767 100644
--- a/docs/sources/panels-visualizations/visualizations/traces/index.md
+++ b/docs/sources/panels-visualizations/visualizations/traces/index.md
@@ -12,6 +12,7 @@ labels:
     - cloud
     - enterprise
     - oss
+description: Configure options for Grafana's traces visualization
 title: Traces
 weight: 100
 ---
@@ -55,7 +56,7 @@ This procedure uses dashboard variables and templates to allow you to enter trac
 1. Select **Add visualization** from a new dashboard or select **Add Panel** on an existing dashboard.
 1. Search for and select the appropriate tracing data source.
 1. In the top-right of the panel editor, select the **Visualizations** tab, search for, and select **Traces**.
-1. Under the **Panel options**, enter a **Title** for your trace panel. For more information on the panel editor, refer to the [Configure panel options documentation][].
+1. Under the **Panel options**, enter a **Title** for your trace panel or have Grafana create one using [generative AI features][]. For more information on the panel editor, refer to the [Configure panel options documentation][].
 1. In the query editor, select the **TraceQL** query type tab.
 1. Enter `${traceId}` in the TraceQL query field to create a dashboard variable. This variable is used as the template query.
 
@@ -79,7 +80,7 @@ It’s more useful to instead be able to use TraceQL queries to search for speci
 1. Select the same trace data source you used in the previous section.
 1. In the top-right of the panel editor, select the **Visualizations** tab, search for, and select **Table**.
 1. In the query editor, select the **TraceQL** tab.
-1. Under the **Panel options**, enter a **Title** for your trace panel.
+1. Under the **Panel options**, enter a **Title** for your trace panel or have Grafana create one using [generative AI features][].
 1. Add an appropriate TraceQL query to search for traces that you would like to visualize in the dashboard. This example uses a simple, static query. You can write the TraceQL query as a template query to take advantage of other dashboard variables, if they exist. This lets you create dynamic queries based on these variables.
 
    {{< figure src="/static/img/docs/panels/traces/screenshot-traces-dynamic-query.png" caption="Create a dynamic query" >}}
@@ -133,4 +134,7 @@ You should now see a list of matching traces in the table visualization. While s
 
 [Tempo data source]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/tempo"
 [Tempo data source]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/connect-externally-hosted/data-sources/tempo"
+
+[generative AI features]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/dashboards/manage-dashboards#set-up-generative-ai-features-for-dashboards"
+[generative AI features]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/dashboards/manage-dashboards#set-up-generative-ai-features-for-dashboards"
 {{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/visualizations/trend/index.md b/docs/sources/panels-visualizations/visualizations/trend/index.md
index be40fe985e849..85268c1f1e49d 100644
--- a/docs/sources/panels-visualizations/visualizations/trend/index.md
+++ b/docs/sources/panels-visualizations/visualizations/trend/index.md
@@ -12,6 +12,7 @@ labels:
     - cloud
     - enterprise
     - oss
+description: Configure options for Grafana's trend visualization
 title: Trend
 weight: 100
 ---
@@ -37,7 +38,35 @@ For example, you could represent engine power and torque versus speed where spee
 
 {{< figure src="/media/docs/grafana/screenshot-grafana-10-0-trend-panel-new-colors.png" max-width="750px" caption="Trend engine power and torque curves" >}}
 
+## Standard options
+
+{{< docs/shared lookup="visualizations/standard-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Legend options
+
+{{< docs/shared lookup="visualizations/legend-options-1.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Tooltip options
+
+{{< docs/shared lookup="visualizations/tooltip-options-2.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Data links
+
+{{< docs/shared lookup="visualizations/datalink-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Thresholds
+
+{{< docs/shared lookup="visualizations/thresholds-options-1.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Value mappings
+
+{{< docs/shared lookup="visualizations/value-mappings-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Field overrides
+
+{{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
 {{% docs/reference %}}
-[Time series visualization]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/time-series"
-[Time series visualization]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/time-series"
+[Time series visualization]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/time-series"
+[Time series visualization]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/time-series"
 {{% /docs/reference %}}
diff --git a/docs/sources/panels-visualizations/visualizations/xy-chart/index.md b/docs/sources/panels-visualizations/visualizations/xy-chart/index.md
new file mode 100644
index 0000000000000..39731ae2a4f96
--- /dev/null
+++ b/docs/sources/panels-visualizations/visualizations/xy-chart/index.md
@@ -0,0 +1,282 @@
+---
+canonical: https://grafana.com/docs/grafana/latest/panels-visualizations/visualizations/xy-chart/
+keywords:
+  - grafana
+  - chart
+  - xy chart
+  - documentation
+  - guide
+  - graph
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+description: Configure options for Grafana's xy chart
+title: XY chart
+weight: 100
+---
+
+# XY chart
+
+XY charts provide a way to visualize arbitrary x and y values in a graph so that you can easily show the relationship between two variables. XY charts are typically used to create scatter plots. You can also use them to create bubble charts where field values determine the size of each bubble:
+
+![An xy chart showing height weight distribution](/media/docs/grafana/panels-visualizations/screenshot-xy-charts-v11.0.png)
+
+## Supported data formats
+
+You can use any type of tabular data with at least two numeric fields in an xy chart. This type of visualization doesn't require time data.
+
+## XY chart options
+
+### Series mapping
+
+Set how series data is mapped in the chart.
+
+- [Auto](#auto-series-mapping-options) - Automatically generates series from all available data frames (or datasets). You can filter to select only one frame.
+- [Manual](#manual-series-mapping-options) - Explicitly define the series by selecting from available data frames.
+
+Depending on your series mapping selection, the **Frame**, **X-field**, and **Y-field** options differ. The [Auto](#auto-series-mapping-options) and [Manual](#manual-series-mapping-options) series mapping sections describe these different options.
+
+#### Auto series mapping options
+
+When you select **Auto** as your series mapping mode, the following options are preconfigured, but you can also define them yourself:
+
+- [Frame](#frame)
+- [X-field](#x-field)
+- [Y-field](#y-field)
+
+##### Frame
+
+By default, an xy chart displays all data frames. You can filter to select only one frame.
+
+##### X-field
+
+Select which field or fields x represents. By default, this is the first number field in each data frame. For example, you enter the following CSV content:
+
+| a   | b   | c   |
+| --- | --- | --- |
+| 0   | 0   | 0   |
+| 1   | 1   | 9   |
+| 2   | 2   | 4   |
+
+In the resulting chart, the x-field is generated from the values in column "a" unless you define it differently.
+
+##### Y-field
+
+After the x-field is set, by default, all the remaining number fields in the data frame are designated as the y-fields. You can use this option to explicitly choose which fields to use for y.
+
+The series of the chart are generated from the y-fields. To make changes to a series in an xy chart, make [overrides][Configure field overrides] to the y-field.
+
+{{< admonition type=note >}}
+Any field you use in the [Size field](#size-field) or [Color field](#color-field) doesn't generate a series.
+{{< /admonition >}}
+
+You can also use [overrides][Configure field overrides] to exclude y-fields individually. To do so, add an override with the following properties for each y-field you want removed:
+
+- Override type: **Fields with name**
+- Override property: **Series > Hide in area**
+- Area: **Viz**
+
+#### Manual series mapping options
+
+When you select **Manual** as your series mode, you can add, edit, and delete series. To manage a series, click the **Series** field; to rename the series, click the series name.
+
+In **Manual** mode, you must set the following options:
+
+- **Frame** - Select your data frame or dataset. You can add as many frames as you want.
+- **X-field** - Select which field x represents.
+- **Y-field** - Select which field y represents.
+
+### Size field
+
+Use this option to set which field's values control the size of the points in the chart. This value is relative to the min and max of all the values in the data frame.
+
+When you select this option, you can then set the [Min point size](#minmax-point-size) and [Max point size](#minmax-point-size) options.
+
+### Color field
+
+Use this option to set which field's values control the color of the points in the chart. To use the color value options under the **Standard options**, you must set this field.
+
+Typically, this option is used when you only have one series displayed in the chart.
+
+### Show
+
+Set how values are represented in the visualization.
+
+- **Points** - Display values as points. When you select this option, the [Point size](#point-size) option is also displayed.
+- **Lines** - Add a line between values. When you select this option, the [Line style](#line-style) and [Line width](#line-width) options are also displayed.
+- **Both** - Display both points and lines.
+
+### Point size
+
+Set the size of all points in the chart, from one to one hundred pixels in diameter. The default size is five pixels. You can set an [override][Configure field overrides] to set the pixel size by series (y-field).
+
+### Min/Max point size
+
+Use these options to control the minimum or maximum point size when you've set the **Size field** option. You can [override][Configure field overrides] these options for specific series.
+
+### Line style
+
+Set the style of the line. To change the color, use the standard [Color scheme][] field option.
+
+![Line style option](/static/img/docs/time-series-panel/line-style-option-v9.png)
+
+- **Solid:** Display a solid line. This is the default setting.
+- **Dash:** Display a dashed line. When you choose this option, a drop-down list is displayed where you can select the length and gap setting for the line dashes. By default, the length and gap are set to `10, 10`.
+- **Dots:** Display dotted lines. When you choose this option, a drop-down list is displayed where you can select dot spacing. By default, the dot spacing is set to `0, 10` (the first number represents dot length, which is always zero).
+
+### Line width
+
+Set the width of the lines in pixels.
+
+## Tooltip options
+
+Tooltip options control the information overlay that appears when you hover over data points in the visualization.
+
+### Tooltip mode
+
+When you hover your cursor over the visualization, Grafana can display tooltips. Choose how tooltips behave.
+
+- **Single -** The hover tooltip shows only a single series, the one that you are hovering over on the visualization.
+- **Hidden -** Do not display the tooltip when you interact with the visualization.
+
+Use an override to hide individual series from the tooltip.
+
+### Max height
+
+Set the maximum height of the tooltip box. The default is 600 pixels.
+
+## Legend options
+
+{{< docs/shared lookup="visualizations/legend-options-1.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Axis options
+
+Options under the axis category change how the x- and y-axes are rendered. Some options don't take effect until you click outside of the field option box you are editing. You can also or press `Enter`.
+
+### Placement (y-axis)
+
+Select the placement of the y-axis.
+
+- **Auto:** Automatically assigns the y-axis to the series. When there are two or more series with different units, Grafana assigns the left axis to the first unit and the right axis to the units that follow.
+- **Left:** Display all y-axes on the left side.
+- **Right:** Display all y-axes on the right side.
+- **Hidden:** Hide all axes.
+
+To selectively hide axes, [Add a field override][] that targets specific fields.
+
+### Label
+
+Set a y-axis text label. If you have more than one y-axis, then you can assign different labels using an override.
+
+### Width
+
+Set a fixed width of the axis. By default, Grafana dynamically calculates the width of an axis.
+
+By setting the width of the axis, data with different axes types can share the same display proportions. This setting makes it easier for you to compare more than one graph’s worth of data because the axes are not shifted or stretched within visual proximity to each other.
+
+### Show grid lines
+
+Set the axis grid line visibility.
+
+- **Auto:** Automatically show grid lines based on the density of the data.
+- **On:** Always show grid lines.
+- **Off:** Never show grid lines.
+
+### Color
+
+Set the color of the axis.
+
+- **Text:** Set the color based on theme text color.
+- **Series:** Set the color based on the series color.
+
+### Show border
+
+Set the axis border visibility.
+
+### Scale
+
+Set the y-axis values scale.
+
+- **Linear:** Divides the scale into equal parts.
+- **Logarithmic:** Use a logarithmic scale. When you select this option, a list appears for you to choose a binary (base 2) or common (base 10) logarithmic scale.
+- **Symlog:** Use a symmetrical logarithmic scale. When you select this option, a list appears for you to choose a binary (base 2) or common (base 10) logarithmic scale. The linear threshold option allows you to set the threshold at which the scale changes from linear to logarithmic.
+
+### Centered zero
+
+Set the y-axis to be centered on zero.
+
+### Soft min and soft max
+
+Set a **Soft min** or **soft max** option for better control of y-axis limits. By default, Grafana sets the range for the y-axis automatically based on the dataset.
+
+**Soft min** and **soft max** settings can prevent small variations in the data from being magnified when it's mostly flat. In contrast, hard min and max values help prevent obscuring useful detail in the data by clipping intermittent spikes past a specific point.
+
+To define hard limits of the y-axis, set standard min/max options. For more information, refer to [Configure standard options][].
+
+![Label example](/static/img/docs/time-series-panel/axis-soft-min-max-7-4.png)
+
+### Transform
+
+Use this option to transform the series values without affecting the values shown in the tooltip, context menu, or legend.
+
+- **Negative Y transform:** Flip the results to negative values on the Y axis.
+- **Constant:** Show the first value as a constant line.
+
+{{% admonition type="note" %}}
+The transform option is only available as an override.
+{{% /admonition %}}
+
+{{< docs/shared lookup="visualizations/multiple-y-axes.md" source="grafana" version="<GRAFANA_VERSION>" leveloffset="+2" >}}
+
+## Standard options
+
+**Standard options** in the panel editor pane let you change how field data is displayed in your visualizations. When you set a standard option, the change is applied to all fields or series. For more granular control over the display of fields, refer to [Configure field overrides][].
+
+You can customize the following standard options:
+
+- **Field min/max** - Enable **Field min/max** to have Grafana calculate the min or max of each field individually, based on the minimum or maximum value of the field.
+- **Color scheme** - Set single or multiple colors for your entire visualization.
+
+To learn more, refer to [Configure standard options][].
+
+## Data links
+
+{{< docs/shared lookup="visualizations/datalink-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Field overrides
+
+{{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+## Other visualization options
+
+### Panel options
+
+Learn about [panel options][] that you can set for a visualization.
+
+{{% docs/reference %}}
+[Color scheme]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-standard-options#color-scheme"
+[Color scheme]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-standard-options#color-scheme"
+
+[Add a field override]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-overrides#add-a-field-override"
+[Add a field override]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-overrides#add-a-field-override"
+
+[Configure standard options]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-standard-options#max"
+[Configure standard options]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-standard-options#max"
+
+[color scheme]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-standard-options#color-scheme"
+[color scheme]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-standard-options#color-scheme"
+
+[Configure field overrides]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-overrides"
+[Configure field overrides]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-overrides"
+
+[panel options]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-panel-options"
+[panel options]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-panel-options"
+
+[standard options]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-standard-options"
+[standard options]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-standard-options"
+
+[data links]: "/docs/grafana/ -> /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-data-links"
+[data links]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/configure-data-links"
+{{% /docs/reference %}}
diff --git a/docs/sources/release-notes/release-notes-7-4-0.md b/docs/sources/release-notes/release-notes-7-4-0.md
index 57e16aca6f57d..7f40ad03dbe67 100644
--- a/docs/sources/release-notes/release-notes-7-4-0.md
+++ b/docs/sources/release-notes/release-notes-7-4-0.md
@@ -163,7 +163,7 @@ Issue [#29407](https://github.com/grafana/grafana/issues/29407)
 
 We have upgraded AngularJS from version 1.6.6 to 1.8.2. Due to this upgrade some old angular plugins might stop working and will require a small update. This is due to the deprecation and removal of pre-assigned bindings. So if your custom angular controllers expect component bindings in the controller constructor you need to move this code to an `$onInit` function. For more details on how to migrate AngularJS code open the [migration guide](https://docs.angularjs.org/guide/migration) and search for **pre-assigning bindings**.
 
-In order not to break all angular panel plugins and data sources we have some custom [angular inject behavior](https://github.com/grafana/grafana/blob/master/public/app/core/injectorMonkeyPatch.ts) that makes sure that bindings for these controllers are still set before constructor is called so many old angular panels and data source plugins will still work. Issue [#28736](https://github.com/grafana/grafana/issues/28736)
+In order not to break all angular panel plugins and data sources we have some custom [angular inject behavior](https://github.com/grafana/grafana/blob/main/public/app/core/injectorMonkeyPatch.ts) that makes sure that bindings for these controllers are still set before constructor is called so many old angular panels and data source plugins will still work. Issue [#28736](https://github.com/grafana/grafana/issues/28736)
 
 ### Deprecations
 
diff --git a/docs/sources/release-notes/release-notes-8-0-0-beta1.md b/docs/sources/release-notes/release-notes-8-0-0-beta1.md
index a1f3d5fd38578..1f4e450c62613 100644
--- a/docs/sources/release-notes/release-notes-8-0-0-beta1.md
+++ b/docs/sources/release-notes/release-notes-8-0-0-beta1.md
@@ -131,7 +131,7 @@ Issue [#33352](https://github.com/grafana/grafana/issues/33352)
 ### Plugin development fixes & changes
 
 - **Button**: Introduce buttonStyle prop. [#33384](https://github.com/grafana/grafana/pull/33384), [@jackw](https://github.com/jackw)
-- **DataQueryRequest**: Remove deprecated props showingGraph and showingTabel and exploreMode. [#31876](https://github.com/grafana/grafana/pull/31876), [@torkelo](https://github.com/torkelo)
+- **DataQueryRequest**: Remove deprecated props showingGraph and showingTable and exploreMode. [#31876](https://github.com/grafana/grafana/pull/31876), [@torkelo](https://github.com/torkelo)
 - **grafana/ui**: Update React Hook Form to v7. [#33328](https://github.com/grafana/grafana/pull/33328), [@Clarity-89](https://github.com/Clarity-89)
 - **IconButton**: Introduce variant for red and blue icon buttons. [#33479](https://github.com/grafana/grafana/pull/33479), [@jackw](https://github.com/jackw)
 - **Plugins**: Expose the `getTimeZone` function to be able to get the current selected timeZone. [#31900](https://github.com/grafana/grafana/pull/31900), [@mckn](https://github.com/mckn)
diff --git a/docs/sources/release-notes/release-notes-8-2-0.md b/docs/sources/release-notes/release-notes-8-2-0.md
index 25d61e450ea6f..e03b005aa18d9 100644
--- a/docs/sources/release-notes/release-notes-8-2-0.md
+++ b/docs/sources/release-notes/release-notes-8-2-0.md
@@ -34,7 +34,7 @@ title: Release notes for Grafana 8.2.0
 
 #### Potential failure to start in Ubuntu 18.04 / Debian 9 / CentOS
 
-- In Grafana v8.2.0, this change can prevent the `grafana-server` service from starting on older versions of systemd, present on Ubuntu 18.04 and slightly older versions of Debian. If running one of those versions, please wait until v8.2.1 is released before upgrading. If you still want to upgrade or have already ugpraded, a simple fix is available here: https://github.com/grafana/grafana/issues/40162#issuecomment-938060240 Issue [#38109](https://github.com/grafana/grafana/issues/38109)
+- In Grafana v8.2.0, this change can prevent the `grafana-server` service from starting on older versions of systemd, present on Ubuntu 18.04 and slightly older versions of Debian. If running one of those versions, please wait until v8.2.1 is released before upgrading. If you still want to upgrade or have already upgraded, a simple fix is available here: https://github.com/grafana/grafana/issues/40162#issuecomment-938060240 Issue [#38109](https://github.com/grafana/grafana/issues/38109)
 
 ### Plugin development fixes & changes
 
diff --git a/docs/sources/release-notes/release-notes-9-0-4.md b/docs/sources/release-notes/release-notes-9-0-4.md
index 8e8f4f68c4e4d..2fa37b35bbe08 100644
--- a/docs/sources/release-notes/release-notes-9-0-4.md
+++ b/docs/sources/release-notes/release-notes-9-0-4.md
@@ -18,7 +18,7 @@ title: Release notes for Grafana 9.0.4
 - **Browse/Search:** Make browser back work properly when visiting Browse or search. [#52271](https://github.com/grafana/grafana/pull/52271), [@torkelo](https://github.com/torkelo)
 - **Logs:** Improve getLogRowContext API. [#52130](https://github.com/grafana/grafana/pull/52130), [@gabor](https://github.com/gabor)
 - **Loki:** Improve handling of empty responses. [#52397](https://github.com/grafana/grafana/pull/52397), [@gabor](https://github.com/gabor)
-- **Plugins:** Always validate root URL if specified in signature manfiest. [#52332](https://github.com/grafana/grafana/pull/52332), [@wbrowne](https://github.com/wbrowne)
+- **Plugins:** Always validate root URL if specified in signature manifest. [#52332](https://github.com/grafana/grafana/pull/52332), [@wbrowne](https://github.com/wbrowne)
 - **Preferences:** Get home dashboard from teams. [#52225](https://github.com/grafana/grafana/pull/52225), [@sakjur](https://github.com/sakjur)
 - **SQLStore:** Support Upserting multiple rows. [#52228](https://github.com/grafana/grafana/pull/52228), [@joeblubaugh](https://github.com/joeblubaugh)
 - **Traces:** Add more template variables in Tempo & Zipkin. [#52306](https://github.com/grafana/grafana/pull/52306), [@joey-grafana](https://github.com/joey-grafana)
diff --git a/docs/sources/setup-grafana/configure-grafana/_index.md b/docs/sources/setup-grafana/configure-grafana/_index.md
index 7f50adfce3da8..d26b77ead9f00 100644
--- a/docs/sources/setup-grafana/configure-grafana/_index.md
+++ b/docs/sources/setup-grafana/configure-grafana/_index.md
@@ -23,7 +23,7 @@ After you add custom options, [uncomment](#remove-comments-in-the-ini-files) the
 
 The default settings for a Grafana instance are stored in the `$WORKING_DIR/conf/defaults.ini` file. _Do not_ change this file.
 
-Depending on your OS, your custom configuration file is either the `$WORKING_DIR/conf/defaults.ini` file or the `/usr/local/etc/grafana/grafana.ini` file. The custom configuration file path can be overridden using the `--config` parameter.
+Depending on your OS, your custom configuration file is either the `$WORKING_DIR/conf/custom.ini` file or the `/usr/local/etc/grafana/grafana.ini` file. The custom configuration file path can be overridden using the `--config` parameter.
 
 ### Linux
 
@@ -148,12 +148,6 @@ Options are `production` and `development`. Default is `production`. _Do not_ ch
 Set the name of the grafana-server instance. Used in logging, internal metrics, and clustering info. Defaults to: `${HOSTNAME}`, which will be replaced with
 environment variable `HOSTNAME`, if that is empty or does not exist Grafana will try to use system calls to get the machine name.
 
-### force_migration
-
-Force migration will run migrations that might cause data loss. Default is `false`.
-
-Set force_migration=true in your grafana.ini and restart Grafana to roll back and delete Unified Alerting configuration data. Any alert rules created while using Unified Alerting will be deleted by rolling back.
-
 <hr />
 
 ## [paths]
@@ -278,6 +272,17 @@ Path to the certificate file (if `protocol` is set to `https` or `h2`).
 
 Path to the certificate key file (if `protocol` is set to `https` or `h2`).
 
+### certs_watch_interval
+
+Controls whether `cert_key` and `cert_file` are periodically watched for changes.
+Disabled, by default. When enabled, `cert_key` and `cert_file`
+are watched for changes. If there is change, the new certificates are loaded automatically.
+
+{{% admonition type="warning" %}}
+After the new certificates are loaded, connections with old certificates
+will not work. You must reload the connections to the old certs for them to work.
+{{% /admonition %}}
+
 ### socket_gid
 
 GID where the socket should be set when `protocol=socket`.
@@ -361,15 +366,19 @@ The maximum number of connections in the idle connection pool.
 
 ### max_open_conn
 
-The maximum number of open connections to the database.
+The maximum number of open connections to the database. For MYSQL, configure this setting on both Grafana and the database. For more information, refer to [`sysvar_max_connections`](https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_max_connections).
 
 ### conn_max_lifetime
 
 Sets the maximum amount of time a connection may be reused. The default is 14400 (which means 14400 seconds or 4 hours). For MySQL, this setting should be shorter than the [`wait_timeout`](https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_wait_timeout) variable.
 
+### migration_locking
+
+Set to `false` to disable database locking during the migrations. Default is true.
+
 ### locking_attempt_timeout_sec
 
-For "mysql", if the `migrationLocking` feature toggle is set, specify the time (in seconds) to wait before failing to lock the database for the migrations. Default is 0.
+For "mysql" and "postgres" only. Specify the time (in seconds) to wait before failing to lock the database for the migrations. Default is 0.
 
 ### log_queries
 
@@ -380,6 +389,10 @@ Set to `true` to log the sql calls and execution times.
 For Postgres, use use any [valid libpq `sslmode`](https://www.postgresql.org/docs/current/libpq-ssl.html#LIBPQ-SSL-SSLMODE-STATEMENTS), e.g.`disable`, `require`, `verify-full`, etc.
 For MySQL, use either `true`, `false`, or `skip-verify`.
 
+### ssl_sni
+
+For Postgres, set to `0` to disable [Server Name Indication](https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-SSLSNI). This is enabled by default on SSL-enabled connections.
+
 ### isolation_level
 
 Only the MySQL driver supports isolation levels in Grafana. In case the value is empty, the driver's default isolation level is applied. Available options are "READ-UNCOMMITTED", "READ-COMMITTED", "REPEATABLE-READ" or "SERIALIZABLE".
@@ -518,8 +531,7 @@ Sets a custom value for the `User-Agent` header for outgoing data proxy requests
 
 ### enabled
 
-This option is also known as _usage analytics_. When `false`, this option disables the writers that read/write from and to the Grafana databases. The default
-value is `true`.
+This option is also known as _usage analytics_. When `false`, this option disables the writers that write to the Grafana database and the associated features, such as dashboard and data source insights, presence indicators, and advanced dashboard search. The default value is `true`.
 
 ### reporting_enabled
 
@@ -700,7 +712,6 @@ The core features that depend on angular are:
 
 - Old graph panel
 - Old table panel
-- Legacy alerting edit rule UI
 
 These features each have supported alternatives, and we recommend using them.
 
@@ -826,7 +837,11 @@ The available options are `Viewer` (default), `Admin`, `Editor`, and `None`. For
 
 ### verify_email_enabled
 
-Require email validation before sign up completes. Default is `false`.
+Require email validation before sign up completes or when updating a user email address. Default is `false`.
+
+### login_default_org_id
+
+Set the default organization for users when they sign in. The default is `-1`.
 
 ### login_hint
 
@@ -871,6 +886,12 @@ The duration in time a user invitation remains valid before expiring.
 This setting should be expressed as a duration. Examples: 6h (hours), 2d (days), 1w (week).
 Default is `24h` (24 hours). The minimum supported duration is `15m` (15 minutes).
 
+### verification_email_max_lifetime_duration
+
+The duration in time a verification email, used to update the email address of a user, remains valid before expiring.
+This setting should be expressed as a duration. Examples: 6h (hours), 2d (days), 1w (week).
+Default is 1h (1 hour).
+
 ### hidden_users
 
 This is a comma-separated list of usernames. Users specified here are hidden in the Grafana UI. They are still visible to Grafana administrators and to themselves.
@@ -932,10 +953,10 @@ Administrators can increase this if they experience OAuth login state mismatch e
 ### oauth_skip_org_role_update_sync
 
 {{% admonition type="note" %}}
-This option is deprecated in favor of OAuth provider specific `skip_org_role_sync` settings. The following sections explain settings for each provider.
+This option is removed from G11 in favor of OAuth provider specific `skip_org_role_sync` settings. The following sections explain settings for each provider.
 {{% /admonition %}}
 
-If you want to change the `oauth_skip_org_role_update_sync` setting to `false`, then for each provider you have set up, use the `skip_org_role_sync` setting to specify whether you want to skip the synchronization.
+If you want to change the `oauth_skip_org_role_update_sync` setting from `true` to `false`, then each provider you have set up, use the `skip_org_role_sync` setting to specify whether you want to skip the synchronization.
 
 {{% admonition type="warning" %}}
 Currently if no organization role mapping is found for a user, Grafana doesn't update the user's organization role.
@@ -1196,6 +1217,12 @@ Specifies whether user identity authentication (on behalf of currently signed-in
 
 Disabled by default, needs to be explicitly enabled.
 
+### user_identity_fallback_credentials_enabled
+
+Specifies whether user identity authentication fallback credentials should be enabled in data sources. Enabling this allows data source creators to provide fallback credentials for backend-initiated requests, such as alerting, recorded queries, and so on.
+
+It is by default and needs to be explicitly disabled. It will not have any effect if user identity authentication is disabled.
+
 ### user_identity_token_url
 
 Override token URL for Azure Active Directory.
@@ -1214,6 +1241,12 @@ Override the AAD application client secret.
 
 By default is the same as used in AAD authentication or can be set to another application (for OBO flow).
 
+### forward_settings_to_plugins
+
+Set plugins that will receive Azure settings via plugin context.
+
+By default, this will include all Grafana Labs owned Azure plugins or those that use Azure settings (Azure Monitor, Azure Data Explorer, Prometheus, MSSQL).
+
 ## [auth.jwt]
 
 Refer to [JWT authentication]({{< relref "../configure-security/configure-authentication/jwt" >}}) for more information.
@@ -1268,6 +1301,17 @@ Name to be used as client identity for EHLO in SMTP dialog, default is `<instanc
 
 Either "OpportunisticStartTLS", "MandatoryStartTLS", "NoStartTLS". Default is `empty`.
 
+### enable_tracing
+
+Enable trace propagation in e-mail headers, using the `traceparent`, `tracestate` and (optionally) `baggage` fields. Default is `false`. To enable, you must first configure tracing in one of the `tracing.oentelemetry.*` sections.
+
+<hr>
+
+## [smtp.static_headers]
+
+Enter key-value pairs on their own lines to be included as headers on outgoing emails. All keys must be in canonical mail header format.
+Examples: `Foo=bar`, `Foo-Header=bar`.
+
 <hr>
 
 ## [emails]
@@ -1490,9 +1534,9 @@ For more information about the Grafana alerts, refer to [About Grafana Alerting]
 
 ### enabled
 
-Enable or disable Grafana Alerting. If disabled, all your legacy alerting data will be available again, but the data you created using Grafana Alerting will be deleted. Set force_migration=true to avoid deletion of data. The default value is `true`.
+Enable or disable Grafana Alerting. The default value is `true`.
 
-Alerting Rules migrated from dashboards and panels will include a link back via the `annotations`.
+Alerting rules migrated from dashboards and panels will include a link back via the `annotations`.
 
 ### disabled_orgs
 
@@ -1510,6 +1554,34 @@ Specify the frequency of polling for Alertmanager config changes. The default va
 
 The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 
+### ha_redis_address
+
+The Redis server address that should be connected to.
+
+### ha_redis_username
+
+The username that should be used to authenticate with the Redis server.
+
+### ha_redis_password
+
+The password that should be used to authenticate with the Redis server.
+
+### ha_redis_db
+
+The Redis database. The default value is `0`.
+
+### ha_redis_prefix
+
+A prefix that is used for every key or channel that is created on the Redis server as part of HA for alerting.
+
+### ha_redis_peer_name
+
+The name of the cluster peer that will be used as an identifier. If none is provided, a random one will be generated.
+
+### ha_redis_max_conns
+
+The maximum number of simultaneous Redis connections.
+
 ### ha_listen_address
 
 Listen IP address and port to receive unified alerting messages for other Grafana instances. The port is used for both TCP and UDP. It is assumed other Grafana instances are also running on the same port. The default value is `0.0.0.0:9094`.
@@ -1530,6 +1602,10 @@ each instance wait before sending the notification to take into account replicat
 
 The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 
+### ha_label
+
+The label is an optional string to include on each packet and stream. It uniquely identifies the cluster and prevents cross-communication issues when sending gossip messages in an environment with multiple clusters.
+
 ### ha_gossip_interval
 
 The interval between sending gossip messages. By lowering this value (more frequent) gossip messages are propagated
@@ -1546,21 +1622,21 @@ The interval string is a possibly signed sequence of decimal numbers, followed b
 
 ### execute_alerts
 
-Enable or disable alerting rule execution. The default value is `true`. The alerting UI remains visible. This option has a [legacy version in the alerting section]({{< relref "#execute_alerts-1" >}}) that takes precedence.
+Enable or disable alerting rule execution. The default value is `true`. The alerting UI remains visible.
 
 ### evaluation_timeout
 
-Sets the alert evaluation timeout when fetching data from the datasource. The default value is `30s`. This option has a [legacy version in the alerting section]({{< relref "#evaluation_timeout_seconds" >}}) that takes precedence.
+Sets the alert evaluation timeout when fetching data from the data source. The default value is `30s`.
 
 The timeout string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 
 ### max_attempts
 
-Sets a maximum number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. The default value is `3`. This option has a [legacy version in the alerting section]({{< relref "#max_attempts-1" >}}) that takes precedence.
+Sets a maximum number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. The default value is `1`.
 
 ### min_interval
 
-Sets the minimum interval to enforce between rule evaluations. The default value is `10s` which equals the scheduler interval. Rules will be adjusted if they are less than this value or if they are not multiple of the scheduler interval (10s). Higher values can help with resource management as we'll schedule fewer evaluations over time. This option has [a legacy version in the alerting section]({{< relref "#min_interval_seconds" >}}) that takes precedence.
+Sets the minimum interval to enforce between rule evaluations. The default value is `10s` which equals the scheduler interval. Rules will be adjusted if they are less than this value or if they are not multiple of the scheduler interval (10s). Higher values can help with resource management as we'll schedule fewer evaluations over time.
 
 The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 
@@ -1570,12 +1646,17 @@ The interval string is a possibly signed sequence of decimal numbers, followed b
 
 ## [unified_alerting.screenshots]
 
-For more information about screenshots, refer to [Images in notifications]({{< relref "../../alerting/manage-notifications/images-in-notifications" >}}).
+For more information about screenshots, refer to [Images in notifications]({{< relref "../../alerting/configure-notifications/template-notifications/images-in-notifications" >}}).
 
 ### capture
 
 Enable screenshots in notifications. This option requires a remote HTTP image rendering service. Please see `[rendering]` for further configuration options.
 
+### capture_timeout
+
+The timeout for capturing screenshots. If a screenshot cannot be captured within the timeout then the notification is sent without a screenshot.
+The maximum duration is 30 seconds. This timeout should be less than the minimum Interval of all Evaluation Groups to avoid back pressure on alert rule evaluation.
+
 ### max_concurrent_screenshots
 
 The maximum number of screenshots that can be taken at the same time. This option is different from `concurrent_render_request_limit` as `max_concurrent_screenshots` sets the number of concurrent screenshots that can be taken at the same time for all firing alerts where as concurrent_render_request_limit sets the total number of concurrent screenshots across all Grafana services.
@@ -1598,55 +1679,15 @@ For example: `disabled_labels=grafana_folder`
 
 <hr>
 
-## [alerting]
-
-For more information about the legacy dashboard alerting feature in Grafana, refer to [the legacy Grafana alerts](/docs/grafana/v8.5/alerting/old-alerting/).
-
-### enabled
-
-Set to `true` to [enable legacy dashboard alerting]({{< relref "#unified_alerting" >}}). The default value is `false`.
-
-### execute_alerts
-
-Turns off alert rule execution, but alerting is still visible in the Grafana UI.
-
-### error_or_timeout
-
-Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state)
-
-### nodata_or_nullvalues
-
-Defines how Grafana handles nodata or null values in alerting. Options are `alerting`, `no_data`, `keep_state`, and `ok`. Default is `no_data`.
-
-### concurrent_render_limit
-
-Alert notifications can include images, but rendering many images at the same time can overload the server.
-This limit protects the server from render overloading and ensures notifications are sent out quickly. Default value is `5`.
-
-### evaluation_timeout_seconds
-
-Sets the alert calculation timeout. Default value is `30`.
-
-### notification_timeout_seconds
-
-Sets the alert notification timeout. Default value is `30`.
-
-### max_attempts
-
-Sets a maximum limit on attempts to sending alert notifications. Default value is `3`.
-
-### min_interval_seconds
+## [unified_alerting.state_history.annotations]
 
-Sets the minimum interval between rule evaluations. Default value is `1`.
+This section controls retention of annotations automatically created while evaluating alert rules when alerting state history backend is configured to be annotations (see setting [unified_alerting.state_history].backend)
 
-> **Note.** This setting has precedence over each individual rule frequency. If a rule frequency is lower than this value, then this value is enforced.
-
-### max_annotation_age =
+### max_age
 
-Configures for how long alert annotations are stored. Default is 0, which keeps them forever.
-This setting should be expressed as a duration. Examples: 6h (hours), 10d (days), 2w (weeks), 1M (month).
+Configures for how long alert annotations are stored. Default is 0, which keeps them forever. This setting should be expressed as an duration. Ex 6h (hours), 10d (days), 2w (weeks), 1M (month).
 
-### max_annotations_to_keep =
+### max_annotations_to_keep
 
 Configures max number of alert annotations that Grafana stores. Default value is 0, which keeps all alert annotations.
 
@@ -2096,6 +2137,18 @@ If the remote HTTP image renderer service runs on a different server than the Gr
 Concurrent render request limit affects when the /render HTTP endpoint is used. Rendering many images at the same time can overload the server,
 which this setting can help protect against by only allowing a certain number of concurrent requests. Default is `30`.
 
+### default_image_width
+
+Configures the width of the rendered image. The default width is `1000`.
+
+### default_image_height
+
+Configures the height of the rendered image. The default height is `500`.
+
+### default_image_scale
+
+Configures the scale of the rendered image. The default scale is `1`.
+
 ## [panels]
 
 ### enable_alpha
@@ -2104,7 +2157,11 @@ Set to `true` if you want to test alpha panels that are not yet ready for genera
 
 ### disable_sanitize_html
 
-If set to true Grafana will allow script tags in text panels. Not recommended as it enables XSS vulnerabilities. Default is false. This setting was introduced in Grafana v6.0.
+{{% admonition type="note" %}}
+This configuration is not available in Grafana Cloud instances.
+{{% /admonition %}}
+
+If set to true Grafana will allow script tags in text panels. Not recommended as it enables XSS vulnerabilities. Default is false.
 
 ## [plugins]
 
@@ -2271,6 +2328,14 @@ Instruct headless browser instance whether to output its debug and error message
 
 It can be useful to set this to `true` when troubleshooting.
 
+### rendering_timing_metrics
+
+> **Note:** Available from grafana-image-renderer v3.9.0+
+
+Instruct a headless browser instance on whether to record metrics for the duration of every rendering step. Default is `false`.
+
+Setting this to `true` when optimizing the rendering mode settings to improve the plugin performance or when troubleshooting can be useful.
+
 ### rendering_args
 
 Additional arguments to pass to the headless browser instance. Defaults are `--no-sandbox,--disable-gpu`. The list of Chromium flags can be found at (https://peter.sh/experiments/chromium-command-line-switches/). Separate multiple arguments with commas.
@@ -2456,9 +2521,17 @@ Refer to [Role-based access control]({{< relref "../../administration/roles-and-
 
 ## [navigation.app_sections]
 
-Move an app plugin (referenced by its id), including all its pages, to a specific navigation section. Format: <pluginId> = <sectionId> <sortWeight>
+Move an app plugin (referenced by its id), including all its pages, to a specific navigation section. Format: `<pluginId> = <sectionId> <sortWeight>`
 
 ## [navigation.app_standalone_pages]
 
 Move an individual app plugin page (referenced by its `path` field) to a specific navigation section.
-Format: <pageUrl> = <sectionId> <sortWeight>
+Format: `<pageUrl> = <sectionId> <sortWeight>`
+
+## [public_dashboards]
+
+This section configures the [public dashboards]({{< relref "../../dashboards/dashboard-public" >}}) feature.
+
+### enabled
+
+Set this to `false` to disable the public dashboards feature. This prevents users from creating new public dashboards and disables existing ones.
diff --git a/docs/sources/setup-grafana/configure-grafana/configure-custom-branding/index.md b/docs/sources/setup-grafana/configure-grafana/configure-custom-branding/index.md
index 4aa2132d3a38b..f67f42b842fda 100644
--- a/docs/sources/setup-grafana/configure-grafana/configure-custom-branding/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/configure-custom-branding/index.md
@@ -6,7 +6,6 @@ description: Change the look of Grafana to match your corporate brand.
 labels:
   products:
     - enterprise
-    - oss
 title: Configure custom branding
 weight: 300
 ---
diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index 7e091a115e273..dcae0bca0e2a6 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -19,69 +19,86 @@ This page contains a list of available feature toggles. To learn how to turn on
 
 Some features are enabled by default. You can disable these feature by setting the feature flag to "false" in the configuration.
 
-| Feature toggle name                              | Description                                                                                                                                                                                                                  | Enabled by default |
-| ------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ |
-| `disableEnvelopeEncryption`                      | Disable envelope encryption (emergency only)                                                                                                                                                                                 |                    |
-| `publicDashboards`                               | Enables public access to dashboards                                                                                                                                                                                          | Yes                |
-| `featureHighlights`                              | Highlight Grafana Enterprise features                                                                                                                                                                                        |                    |
-| `exploreContentOutline`                          | Content outline sidebar                                                                                                                                                                                                      | Yes                |
-| `dataConnectionsConsole`                         | Enables a new top-level page called Connections. This page is an experiment that provides a better experience when you install and configure data sources and other plugins.                                                 | Yes                |
-| `cloudWatchCrossAccountQuerying`                 | Enables cross-account querying in CloudWatch datasources                                                                                                                                                                     | Yes                |
-| `redshiftAsyncQueryDataSupport`                  | Enable async query data support for Redshift                                                                                                                                                                                 | Yes                |
-| `athenaAsyncQueryDataSupport`                    | Enable async query data support for Athena                                                                                                                                                                                   | Yes                |
-| `nestedFolderPicker`                             | Enables the new folder picker to work with nested folders. Requires the nestedFolders feature toggle                                                                                                                         | Yes                |
-| `accessTokenExpirationCheck`                     | Enable OAuth access_token expiration check and token refresh using the refresh_token                                                                                                                                         |                    |
-| `emptyDashboardPage`                             | Enable the redesigned user interface of a dashboard page that includes no panels                                                                                                                                             | Yes                |
-| `disablePrometheusExemplarSampling`              | Disable Prometheus exemplar sampling                                                                                                                                                                                         |                    |
-| `logsContextDatasourceUi`                        | Allow datasource to provide custom UI for context view                                                                                                                                                                       | Yes                |
-| `lokiQuerySplitting`                             | Split large interval queries into subqueries with smaller time intervals                                                                                                                                                     | Yes                |
-| `gcomOnlyExternalOrgRoleSync`                    | Prohibits a user from changing organization roles synced with Grafana Cloud auth provider                                                                                                                                    |                    |
-| `prometheusMetricEncyclopedia`                   | Adds the metrics explorer component to the Prometheus query builder as an option in metric select                                                                                                                            | Yes                |
-| `influxdbBackendMigration`                       | Query InfluxDB InfluxQL without the proxy                                                                                                                                                                                    | Yes                |
-| `prometheusDataplane`                            | Changes responses to from Prometheus to be compliant with the dataplane specification. In particular, when this feature toggle is active, the numeric `Field.Name` is set from 'Value' to the value of the `__name__` label. | Yes                |
-| `lokiMetricDataplane`                            | Changes metric responses from Loki to be compliant with the dataplane specification.                                                                                                                                         | Yes                |
-| `dataplaneFrontendFallback`                      | Support dataplane contract field name change for transformations and field name matchers where the name is different                                                                                                         | Yes                |
-| `alertingNotificationsPoliciesMatchingInstances` | Enables the preview of matching instances for notification policies                                                                                                                                                          | Yes                |
-| `useCachingService`                              | When active, the new query and resource caching implementation using a wire service inject replaces the previous middleware implementation.                                                                                  | Yes                |
-| `enableElasticsearchBackendQuerying`             | Enable the processing of queries and responses in the Elasticsearch data source through backend                                                                                                                              | Yes                |
-| `advancedDataSourcePicker`                       | Enable a new data source picker with contextual information, recently used order and advanced mode                                                                                                                           | Yes                |
-| `cloudWatchLogsMonacoEditor`                     | Enables the Monaco editor for CloudWatch Logs queries                                                                                                                                                                        | Yes                |
-| `recordedQueriesMulti`                           | Enables writing multiple items from a single query within Recorded Queries                                                                                                                                                   | Yes                |
-| `transformationsRedesign`                        | Enables the transformations redesign                                                                                                                                                                                         | Yes                |
-| `toggleLabelsInLogsUI`                           | Enable toggleable filters in log details view                                                                                                                                                                                | Yes                |
-| `azureMonitorDataplane`                          | Adds dataplane compliant frame metadata in the Azure Monitor datasource                                                                                                                                                      | Yes                |
-| `prometheusConfigOverhaulAuth`                   | Update the Prometheus configuration page with the new auth component                                                                                                                                                         | Yes                |
-| `dashgpt`                                        | Enable AI powered features in dashboards                                                                                                                                                                                     | Yes                |
-| `newBrowseDashboards`                            | New browse/manage dashboards UI                                                                                                                                                                                              | Yes                |
-| `alertingInsights`                               | Show the new alerting insights landing page                                                                                                                                                                                  | Yes                |
-| `cloudWatchWildCardDimensionValues`              | Fetches dimension values from CloudWatch to correctly label wildcard dimensions                                                                                                                                              | Yes                |
+| Feature toggle name                      | Description                                                                                                                                                                                                                  | Enabled by default |
+| ---------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ |
+| `disableEnvelopeEncryption`              | Disable envelope encryption (emergency only)                                                                                                                                                                                 |                    |
+| `publicDashboards`                       | [Deprecated] Public dashboards are now enabled by default; to disable them, use the configuration setting. This feature toggle will be removed in the next major version.                                                    | Yes                |
+| `featureHighlights`                      | Highlight Grafana Enterprise features                                                                                                                                                                                        |                    |
+| `correlations`                           | Correlations page                                                                                                                                                                                                            |                    |
+| `exploreContentOutline`                  | Content outline sidebar                                                                                                                                                                                                      | Yes                |
+| `returnToPrevious`                       | Enables the return to previous context functionality                                                                                                                                                                         | Yes                |
+| `cloudWatchCrossAccountQuerying`         | Enables cross-account querying in CloudWatch datasources                                                                                                                                                                     | Yes                |
+| `nestedFolders`                          | Enable folder nesting                                                                                                                                                                                                        | Yes                |
+| `nestedFolderPicker`                     | Enables the new folder picker to work with nested folders. Requires the nestedFolders feature toggle                                                                                                                         | Yes                |
+| `logsContextDatasourceUi`                | Allow datasource to provide custom UI for context view                                                                                                                                                                       | Yes                |
+| `lokiQuerySplitting`                     | Split large interval queries into subqueries with smaller time intervals                                                                                                                                                     | Yes                |
+| `prometheusMetricEncyclopedia`           | Adds the metrics explorer component to the Prometheus query builder as an option in metric select                                                                                                                            | Yes                |
+| `influxdbBackendMigration`               | Query InfluxDB InfluxQL without the proxy                                                                                                                                                                                    | Yes                |
+| `prometheusDataplane`                    | Changes responses to from Prometheus to be compliant with the dataplane specification. In particular, when this feature toggle is active, the numeric `Field.Name` is set from 'Value' to the value of the `__name__` label. | Yes                |
+| `lokiMetricDataplane`                    | Changes metric responses from Loki to be compliant with the dataplane specification.                                                                                                                                         | Yes                |
+| `dataplaneFrontendFallback`              | Support dataplane contract field name change for transformations and field name matchers where the name is different                                                                                                         | Yes                |
+| `enableElasticsearchBackendQuerying`     | Enable the processing of queries and responses in the Elasticsearch data source through backend                                                                                                                              | Yes                |
+| `recordedQueriesMulti`                   | Enables writing multiple items from a single query within Recorded Queries                                                                                                                                                   | Yes                |
+| `pluginsDynamicAngularDetectionPatterns` | Enables fetching Angular detection patterns for plugins from GCOM and fallback to hardcoded ones                                                                                                                             | Yes                |
+| `logsExploreTableVisualisation`          | A table visualisation for logs in Explore                                                                                                                                                                                    | Yes                |
+| `transformationsRedesign`                | Enables the transformations redesign                                                                                                                                                                                         | Yes                |
+| `traceQLStreaming`                       | Enables response streaming of TraceQL queries of the Tempo data source                                                                                                                                                       |                    |
+| `awsAsyncQueryCaching`                   | Enable caching for async queries for Redshift and Athena. Requires that the datasource has caching and async query support enabled                                                                                           | Yes                |
+| `prometheusConfigOverhaulAuth`           | Update the Prometheus configuration page with the new auth component                                                                                                                                                         | Yes                |
+| `influxdbSqlSupport`                     | Enable InfluxDB SQL query language support with new querying UI                                                                                                                                                              | Yes                |
+| `alertingNoDataErrorExecution`           | Changes how Alerting state manager handles execution of NoData/Error                                                                                                                                                         | Yes                |
+| `angularDeprecationUI`                   | Display Angular warnings in dashboards and panels                                                                                                                                                                            | Yes                |
+| `dashgpt`                                | Enable AI powered features in dashboards                                                                                                                                                                                     | Yes                |
+| `alertingInsights`                       | Show the new alerting insights landing page                                                                                                                                                                                  | Yes                |
+| `panelMonitoring`                        | Enables panel monitoring through logs and measurements                                                                                                                                                                       | Yes                |
+| `recoveryThreshold`                      | Enables feature recovery threshold (aka hysteresis) for threshold server-side expression                                                                                                                                     | Yes                |
+| `lokiStructuredMetadata`                 | Enables the loki data source to request structured metadata from the Loki server                                                                                                                                             | Yes                |
+| `managedPluginsInstall`                  | Install managed plugins directly from plugins catalog                                                                                                                                                                        | Yes                |
+| `annotationPermissionUpdate`             | Change the way annotation permissions work by scoping them to folders and dashboards.                                                                                                                                        | Yes                |
+| `exploreMetrics`                         | Enables the new Explore Metrics core app                                                                                                                                                                                     | Yes                |
+| `alertingSimplifiedRouting`              | Enables users to easily configure alert notifications by specifying a contact point directly when editing or creating an alert rule                                                                                          | Yes                |
+| `logRowsPopoverMenu`                     | Enable filtering menu displayed when text of a log line is selected                                                                                                                                                          | Yes                |
+| `lokiQueryHints`                         | Enables query hints for Loki                                                                                                                                                                                                 | Yes                |
+| `enablePluginsTracingByDefault`          | Enable plugin tracing for all external plugins                                                                                                                                                                               | Yes                |
+| `alertingQueryOptimization`              | Optimizes eligible queries in order to reduce load on datasources                                                                                                                                                            |                    |
+| `betterPageScrolling`                    | Removes CustomScrollbar from the UI, relying on native browser scrollbars                                                                                                                                                    | Yes                |
 
 ## Preview feature toggles
 
-| Feature toggle name              | Description                                                                                                                                                                                  |
-| -------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `trimDefaults`                   | Use cue schema to remove values that will be applied automatically                                                                                                                           |
-| `panelTitleSearch`               | Search for dashboards using panel title                                                                                                                                                      |
-| `migrationLocking`               | Lock database during migrations                                                                                                                                                              |
-| `correlations`                   | Correlations page                                                                                                                                                                            |
-| `newDBLibrary`                   | Use jmoiron/sqlx rather than xorm for a few backend services                                                                                                                                 |
-| `autoMigrateOldPanels`           | Migrate old angular panels to supported versions (graph, table-old, worldmap, etc)                                                                                                           |
-| `disableAngular`                 | Dynamic flag to disable angular at runtime. The preferred method is to set `angular_support_enabled` to `false` in the [security] settings, which allows you to change the state at runtime. |
-| `grpcServer`                     | Run the GRPC server                                                                                                                                                                          |
-| `accessControlOnCall`            | Access control primitives for OnCall                                                                                                                                                         |
-| `nestedFolders`                  | Enable folder nesting                                                                                                                                                                        |
-| `alertingNoNormalState`          | Stop maintaining state of alerts that are not firing                                                                                                                                         |
-| `renderAuthJWT`                  | Uses JWT-based auth for rendering instead of relying on remote cache                                                                                                                         |
-| `refactorVariablesTimeRange`     | Refactor time range variables flow to reduce number of API calls made when query variables are chained                                                                                       |
-| `faroDatasourceSelector`         | Enable the data source selector within the Frontend Apps section of the Frontend Observability                                                                                               |
-| `enableDatagridEditing`          | Enables the edit functionality in the datagrid panel                                                                                                                                         |
-| `dataSourcePageHeader`           | Apply new pageHeader UI in data source edit page                                                                                                                                             |
-| `sqlDatasourceDatabaseSelection` | Enables previous SQL data source dataset dropdown behavior                                                                                                                                   |
-| `awsAsyncQueryCaching`           | Enable caching for async queries for Redshift and Athena. Requires that the `useCachingService` feature toggle is enabled and the datasource has caching and async query support enabled     |
-| `splitScopes`                    | Support faster dashboard and folder search by splitting permission scopes into parts                                                                                                         |
-| `reportingRetries`               | Enables rendering retries for the reporting feature                                                                                                                                          |
-| `alertingContactPointsV2`        | Show the new contacpoints list view                                                                                                                                                          |
-| `cloudWatchBatchQueries`         | Runs CloudWatch metrics queries as separate batches                                                                                                                                          |
+| Feature toggle name                    | Description                                                                                                                                                                                  |
+| -------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `panelTitleSearch`                     | Search for dashboards using panel title                                                                                                                                                      |
+| `autoMigrateOldPanels`                 | Migrate old angular panels to supported versions (graph, table-old, worldmap, etc)                                                                                                           |
+| `autoMigrateGraphPanel`                | Migrate old graph panel to supported time series panel - broken out from autoMigrateOldPanels to enable granular tracking                                                                    |
+| `autoMigrateTablePanel`                | Migrate old table panel to supported table panel - broken out from autoMigrateOldPanels to enable granular tracking                                                                          |
+| `autoMigratePiechartPanel`             | Migrate old piechart panel to supported piechart panel - broken out from autoMigrateOldPanels to enable granular tracking                                                                    |
+| `autoMigrateWorldmapPanel`             | Migrate old worldmap panel to supported geomap panel - broken out from autoMigrateOldPanels to enable granular tracking                                                                      |
+| `autoMigrateStatPanel`                 | Migrate old stat panel to supported stat panel - broken out from autoMigrateOldPanels to enable granular tracking                                                                            |
+| `autoMigrateXYChartPanel`              | Migrate old XYChart panel to new XYChart2 model                                                                                                                                              |
+| `disableAngular`                       | Dynamic flag to disable angular at runtime. The preferred method is to set `angular_support_enabled` to `false` in the [security] settings, which allows you to change the state at runtime. |
+| `newVizTooltips`                       | New visualizations tooltips UX                                                                                                                                                               |
+| `grpcServer`                           | Run the GRPC server                                                                                                                                                                          |
+| `accessControlOnCall`                  | Access control primitives for OnCall                                                                                                                                                         |
+| `alertingNoNormalState`                | Stop maintaining state of alerts that are not firing                                                                                                                                         |
+| `renderAuthJWT`                        | Uses JWT-based auth for rendering instead of relying on remote cache                                                                                                                         |
+| `refactorVariablesTimeRange`           | Refactor time range variables flow to reduce number of API calls made when query variables are chained                                                                                       |
+| `faroDatasourceSelector`               | Enable the data source selector within the Frontend Apps section of the Frontend Observability                                                                                               |
+| `enableDatagridEditing`                | Enables the edit functionality in the datagrid panel                                                                                                                                         |
+| `sqlDatasourceDatabaseSelection`       | Enables previous SQL data source dataset dropdown behavior                                                                                                                                   |
+| `reportingRetries`                     | Enables rendering retries for the reporting feature                                                                                                                                          |
+| `externalServiceAccounts`              | Automatic service account and token setup for plugins                                                                                                                                        |
+| `formatString`                         | Enable format string transformer                                                                                                                                                             |
+| `transformationsVariableSupport`       | Allows using variables in transformations                                                                                                                                                    |
+| `cloudWatchBatchQueries`               | Runs CloudWatch metrics queries as separate batches                                                                                                                                          |
+| `teamHttpHeaders`                      | Enables Team LBAC for datasources to apply team headers to the client requests                                                                                                               |
+| `awsDatasourcesNewFormStyling`         | Applies new form styling for configuration and query editors in AWS plugins                                                                                                                  |
+| `addFieldFromCalculationStatFunctions` | Add cumulative and window functions to the add field from calculation transformation                                                                                                         |
+| `pdfTables`                            | Enables generating table data as PDF in reporting                                                                                                                                            |
+| `ssoSettingsApi`                       | Enables the SSO settings API and the OAuth configuration UIs in Grafana                                                                                                                      |
+| `canvasPanelPanZoom`                   | Allow pan and zoom in canvas panel                                                                                                                                                           |
+| `regressionTransformation`             | Enables regression analysis transformation                                                                                                                                                   |
+| `groupToNestedTableTransformation`     | Enables the group to nested table transformation                                                                                                                                             |
+| `newPDFRendering`                      | New implementation for the dashboard-to-PDF rendering                                                                                                                                        |
 
 ## Experimental feature toggles
 
@@ -92,23 +109,21 @@ Experimental features might be changed or removed without prior notice.
 | ------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `live-service-web-worker`                   | This will use a webworker thread to processes events rather than the main thread                                                                                                                                                                                                  |
 | `queryOverLive`                             | Use Grafana Live WebSocket to execute backend queries                                                                                                                                                                                                                             |
+| `publicDashboardsScene`                     | Enables public dashboard rendering using scenes                                                                                                                                                                                                                                   |
 | `lokiExperimentalStreaming`                 | Support new streaming approach for loki (prototype, needs special loki build)                                                                                                                                                                                                     |
 | `storage`                                   | Configurable storage for dashboards, datasources, and resources                                                                                                                                                                                                                   |
 | `datasourceQueryMultiStatus`                | Introduce HTTP 207 Multi Status for api/ds/query                                                                                                                                                                                                                                  |
-| `traceToMetrics`                            | Enable trace to metrics links                                                                                                                                                                                                                                                     |
 | `canvasPanelNesting`                        | Allow elements nesting                                                                                                                                                                                                                                                            |
 | `scenes`                                    | Experimental framework to build interactive dashboards                                                                                                                                                                                                                            |
 | `disableSecretsCompatibility`               | Disable duplicated secret storage in legacy tables                                                                                                                                                                                                                                |
 | `logRequestsInstrumentedAsUnknown`          | Logs the path for requests that are instrumented as unknown                                                                                                                                                                                                                       |
-| `dockedMegaMenu`                            | Enable support for a persistent (docked) navigation menu                                                                                                                                                                                                                          |
-| `cloudwatchNewRegionsHandler`               | Refactor of /regions endpoint, no user-facing changes                                                                                                                                                                                                                             |
 | `showDashboardValidationWarnings`           | Show warnings when dashboards do not validate against the schema                                                                                                                                                                                                                  |
 | `mysqlAnsiQuotes`                           | Use double quotes to escape keyword in a MySQL query                                                                                                                                                                                                                              |
 | `alertingBacktesting`                       | Rule backtesting API for alerting                                                                                                                                                                                                                                                 |
 | `editPanelCSVDragAndDrop`                   | Enables drag and drop for CSV and Excel files                                                                                                                                                                                                                                     |
 | `lokiQuerySplittingConfig`                  | Give users the option to configure split durations for Loki queries                                                                                                                                                                                                               |
 | `individualCookiePreferences`               | Support overriding cookie preferences per user                                                                                                                                                                                                                                    |
-| `clientTokenRotation`                       | Replaces the current in-request token rotation so that the client initiates the rotation                                                                                                                                                                                          |
+| `influxqlStreamingParser`                   | Enable streaming JSON parser for InfluxDB datasource InfluxQL query language                                                                                                                                                                                                      |
 | `lokiLogsDataplane`                         | Changes logs responses from Loki to be compliant with the dataplane specification.                                                                                                                                                                                                |
 | `disableSSEDataplane`                       | Disables dataplane specific processing in server side expressions.                                                                                                                                                                                                                |
 | `alertStateHistoryLokiSecondary`            | Enable Grafana to write alert state history to an external Loki instance in addition to Grafana annotations.                                                                                                                                                                      |
@@ -121,51 +136,54 @@ Experimental features might be changed or removed without prior notice.
 | `dashboardEmbed`                            | Allow embedding dashboard for external use in Code editors                                                                                                                                                                                                                        |
 | `frontendSandboxMonitorOnly`                | Enables monitor only in the plugin frontend sandbox (if enabled)                                                                                                                                                                                                                  |
 | `lokiFormatQuery`                           | Enables the ability to format Loki queries                                                                                                                                                                                                                                        |
-| `exploreScrollableLogsContainer`            | Improves the scrolling behavior of logs in Explore                                                                                                                                                                                                                                |
-| `pluginsDynamicAngularDetectionPatterns`    | Enables fetching Angular detection patterns for plugins from GCOM and fallback to hardcoded ones                                                                                                                                                                                  |
 | `vizAndWidgetSplit`                         | Split panels between visualizations and widgets                                                                                                                                                                                                                                   |
 | `prometheusIncrementalQueryInstrumentation` | Adds RudderStack events to incremental queries                                                                                                                                                                                                                                    |
-| `logsExploreTableVisualisation`             | A table visualisation for logs in Explore                                                                                                                                                                                                                                         |
 | `awsDatasourcesTempCredentials`             | Support temporary security credentials in AWS plugins for Grafana Cloud customers                                                                                                                                                                                                 |
 | `mlExpressions`                             | Enable support for Machine Learning in server-side expressions                                                                                                                                                                                                                    |
-| `traceQLStreaming`                          | Enables response streaming of TraceQL queries of the Tempo data source                                                                                                                                                                                                            |
 | `metricsSummary`                            | Enables metrics summary queries in the Tempo data source                                                                                                                                                                                                                          |
-| `grafanaAPIServer`                          | Enable Kubernetes API Server for Grafana resources                                                                                                                                                                                                                                |
-| `grafanaAPIServerWithExperimentalAPIs`      | Register experimental APIs with the k8s API server                                                                                                                                                                                                                                |
 | `featureToggleAdminPage`                    | Enable admin page for managing feature toggles from the Grafana front-end                                                                                                                                                                                                         |
 | `permissionsFilterRemoveSubquery`           | Alternative permission filter implementation that does not use subqueries for fetching the dashboard folder                                                                                                                                                                       |
-| `influxdbSqlSupport`                        | Enable InfluxDB SQL query language support with new querying UI                                                                                                                                                                                                                   |
-| `angularDeprecationUI`                      | Display new Angular deprecation-related UI features                                                                                                                                                                                                                               |
-| `sseGroupByDatasource`                      | Send query to the same datasource in a single request when using server side expressions                                                                                                                                                                                          |
-| `requestInstrumentationStatusSource`        | Include a status source label for request metrics and logs                                                                                                                                                                                                                        |
+| `aiGeneratedDashboardChanges`               | Enable AI powered features for dashboards to auto-summary changes when saving                                                                                                                                                                                                     |
+| `sseGroupByDatasource`                      | Send query to the same datasource in a single request when using server side expressions. The `cloudWatchBatchQueries` feature toggle should be enabled if this used with CloudWatch.                                                                                             |
 | `libraryPanelRBAC`                          | Enables RBAC support for library panels                                                                                                                                                                                                                                           |
 | `wargamesTesting`                           | Placeholder feature flag for internal testing                                                                                                                                                                                                                                     |
 | `externalCorePlugins`                       | Allow core plugins to be loaded as external                                                                                                                                                                                                                                       |
 | `pluginsAPIMetrics`                         | Sends metrics of public grafana packages usage by plugins                                                                                                                                                                                                                         |
-| `httpSLOLevels`                             | Adds SLO level to http request metrics                                                                                                                                                                                                                                            |
-| `panelMonitoring`                           | Enables panel monitoring through logs and measurements                                                                                                                                                                                                                            |
+| `idForwarding`                              | Generate signed id token for identity that can be forwarded to plugins and external services                                                                                                                                                                                      |
 | `enableNativeHTTPHistogram`                 | Enables native HTTP Histograms                                                                                                                                                                                                                                                    |
-| `formatString`                              | Enable format string transformer                                                                                                                                                                                                                                                  |
-| `transformationsVariableSupport`            | Allows using variables in transformations                                                                                                                                                                                                                                         |
-| `kubernetesPlaylists`                       | Use the kubernetes API in the frontend for playlists                                                                                                                                                                                                                              |
-| `navAdminSubsections`                       | Splits the administration section of the nav tree into subsections                                                                                                                                                                                                                |
-| `recoveryThreshold`                         | Enables feature recovery threshold (aka hysteresis) for threshold server-side expression                                                                                                                                                                                          |
-| `teamHttpHeaders`                           | Enables datasources to apply team headers to the client requests                                                                                                                                                                                                                  |
-| `awsDatasourcesNewFormStyling`              | Applies new form styling for configuration and query editors in AWS plugins                                                                                                                                                                                                       |
+| `kubernetesPlaylists`                       | Use the kubernetes API in the frontend for playlists, and route /api/playlist requests to k8s                                                                                                                                                                                     |
+| `kubernetesSnapshots`                       | Routes snapshot requests from /api to the /apis endpoint                                                                                                                                                                                                                          |
 | `cachingOptimizeSerializationMemoryUsage`   | If enabled, the caching backend gradually serializes query responses for the cache, comparing against the configured `[caching]max_value_mb` value as it goes. This can can help prevent Grafana from running out of memory while attempting to cache very large query responses. |
-| `pluginsInstrumentationStatusSource`        | Include a status source label for plugin request metrics and logs                                                                                                                                                                                                                 |
-| `costManagementUi`                          | Toggles the display of the cost management ui plugin                                                                                                                                                                                                                              |
-| `managedPluginsInstall`                     | Install managed plugins directly from plugins catalog                                                                                                                                                                                                                             |
 | `prometheusPromQAIL`                        | Prometheus and AI/ML to assist users in creating a query                                                                                                                                                                                                                          |
+| `alertmanagerRemoteSecondary`               | Enable Grafana to sync configuration and state with a remote Alertmanager.                                                                                                                                                                                                        |
+| `alertmanagerRemotePrimary`                 | Enable Grafana to have a remote Alertmanager instance as the primary Alertmanager.                                                                                                                                                                                                |
+| `alertmanagerRemoteOnly`                    | Disable the internal Alertmanager and only use the external one defined.                                                                                                                                                                                                          |
+| `extractFieldsNameDeduplication`            | Make sure extracted field names are unique in the dataframe                                                                                                                                                                                                                       |
+| `dashboardSceneForViewers`                  | Enables dashboard rendering using Scenes for viewer roles                                                                                                                                                                                                                         |
+| `dashboardSceneSolo`                        | Enables rendering dashboards using scenes for solo panels                                                                                                                                                                                                                         |
+| `dashboardScene`                            | Enables dashboard rendering using scenes for all roles                                                                                                                                                                                                                            |
+| `logsInfiniteScrolling`                     | Enables infinite scrolling for the Logs panel in Explore and Dashboards                                                                                                                                                                                                           |
+| `flameGraphItemCollapsing`                  | Allow collapsing of flame graph items                                                                                                                                                                                                                                             |
+| `pluginsSkipHostEnvVars`                    | Disables passing host environment variable to plugin processes                                                                                                                                                                                                                    |
+| `tableSharedCrosshair`                      | Enables shared crosshair in table panel                                                                                                                                                                                                                                           |
+| `kubernetesFeatureToggles`                  | Use the kubernetes API for feature toggle management in the frontend                                                                                                                                                                                                              |
+| `newFolderPicker`                           | Enables the nested folder picker without having nested folders enabled                                                                                                                                                                                                            |
+| `onPremToCloudMigrations`                   | In-development feature that will allow users to easily migrate their on-prem Grafana instances to Grafana Cloud.                                                                                                                                                                  |
+| `promQLScope`                               | In-development feature that will allow injection of labels into prometheus queries.                                                                                                                                                                                               |
+| `sqlExpressions`                            | Enables using SQL and DuckDB functions as Expressions.                                                                                                                                                                                                                            |
+| `nodeGraphDotLayout`                        | Changed the layout algorithm for the node graph                                                                                                                                                                                                                                   |
+| `kubernetesAggregator`                      | Enable grafana aggregator                                                                                                                                                                                                                                                         |
+| `expressionParser`                          | Enable new expression parser                                                                                                                                                                                                                                                      |
+| `usePrometheusFrontendPackage`              | Use the @grafana/prometheus frontend package in core Prometheus.                                                                                                                                                                                                                  |
 
 ## Development feature toggles
 
 The following toggles require explicitly setting Grafana's [app mode]({{< relref "../_index.md#app_mode" >}}) to 'development' before you can enable this feature toggle. These features tend to be experimental.
 
-| Feature toggle name       | Description                                                                                  |
-| ------------------------- | -------------------------------------------------------------------------------------------- |
-| `entityStore`             | SQL-based entity store (requires storage flag also)                                          |
-| `externalServiceAuth`     | Starts an OAuth2 authentication provider for external services                               |
-| `idForwarding`            | Generate signed id token for identity that can be forwarded to plugins and external services |
-| `externalServiceAccounts` | Automatic service account and token setup for plugins                                        |
-| `panelTitleSearchInV1`    | Enable searching for dashboards using panel title in search v1                               |
+| Feature toggle name                    | Description                                                    |
+| -------------------------------------- | -------------------------------------------------------------- |
+| `unifiedStorage`                       | SQL-based k8s storage                                          |
+| `grafanaAPIServerWithExperimentalAPIs` | Register experimental APIs with the k8s API server             |
+| `grafanaAPIServerEnsureKubectlAccess`  | Start an additional https handler and write kubectl options    |
+| `kubernetesQueryServiceRewrite`        | Rewrite requests targeting /ds/query to the query service      |
+| `panelTitleSearchInV1`                 | Enable searching for dashboards using panel title in search v1 |
diff --git a/docs/sources/setup-grafana/configure-grafana/proxy/index.md b/docs/sources/setup-grafana/configure-grafana/proxy/index.md
index 2ad831764cc14..51e83cd326b10 100644
--- a/docs/sources/setup-grafana/configure-grafana/proxy/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/proxy/index.md
@@ -32,14 +32,15 @@ To complete this task, you must first deploy a socks proxy server that supports
 
 1. For Grafana to send data source connections to the socks5 server, use the following table to configure the `secure_socks_datasource_proxy` section of the `config.ini`:
 
-   | Key             | Description                                | Example                         |
-   | --------------- | ------------------------------------------ | ------------------------------- |
-   | `enabled`       | Enable this feature in Grafana             | true                            |
-   | `root_ca_cert`  | The file path of the root ca cert          | /etc/ca.crt                     |
-   | `client_key`    | The file path of the client private key    | /etc/client.key                 |
-   | `client_cert`   | The file path of the client public key     | /etc/client.crt                 |
-   | `server_name`   | The domain name of the proxy, used for SNI | proxy.grafana.svc.cluster.local |
-   | `proxy_address` | the address of the proxy                   | localhost:9090                  |
+   | Key              | Description                                | Example                         |
+   | ---------------- | ------------------------------------------ | ------------------------------- |
+   | `enabled`        | Enable this feature in Grafana             | true                            |
+   | `root_ca_cert`   | The file path of the root ca cert          | /etc/ca.crt                     |
+   | `client_key`     | The file path of the client private key    | /etc/client.key                 |
+   | `client_cert`    | The file path of the client public key     | /etc/client.crt                 |
+   | `server_name`    | The domain name of the proxy, used for SNI | proxy.grafana.svc.cluster.local |
+   | `proxy_address`  | The address of the proxy                   | localhost:9090                  |
+   | `allow_insecure` | Disable TLS in the socks proxy             | false                           |
 
 1. Set up a data source and configure it to send data source connections through the proxy.
 
diff --git a/docs/sources/setup-grafana/configure-security/_index.md b/docs/sources/setup-grafana/configure-security/_index.md
index 2212d5f489db1..c638203fc8d46 100644
--- a/docs/sources/setup-grafana/configure-security/_index.md
+++ b/docs/sources/setup-grafana/configure-security/_index.md
@@ -33,11 +33,11 @@ Request security is available in Grafana Enterprise v7.4 and later versions.
 
 Configure a firewall to restrict Grafana from making network requests to sensitive internal web services.
 
-There are many firewall tools available, refer to the documentation for your specific security tool. For example, Linux users can use [iptables](https://en.wikipedia.org/wiki/Iptables).
+There are many firewall tools available. Refer to the documentation for your specific security tool. For example, Linux users can use [iptables](https://en.wikipedia.org/wiki/Iptables).
 
 ## Proxy server
 
-Require all network requests being made by Grafana to go through a proxy server.
+You can require all network requests made by Grafana to go through a proxy server.
 
 Self-hosted reverse proxy options include but are not limited to:
 
@@ -47,9 +47,9 @@ Self-hosted reverse proxy options include but are not limited to:
 
 ## Limit Viewer query permissions
 
-Users with the Viewer role can enter _any possible query_ in _any_ of the data sources available in the **organization**, not just the queries that are defined on the dashboards for which the user has Viewer permissions.
+Users with the `Viewer role` can enter _any possible query_ in _any_ of the data sources available in the **organization**, not just the queries that are defined on the dashboards for which the user has Viewer permissions.
 
-**For example:** In a Grafana instance with one data source, one dashboard, and one panel that has one query defined, you might assume that a Viewer can only see the result of the query defined in that panel. Actually, the Viewer has access to send any query to the data source. With a command-line tool like curl (there are lots of tools for this), the Viewer can make their own query to the data source and potentially access sensitive data.
+For example, in a Grafana instance with one data source, one dashboard, and one panel that has one query defined, you might assume that a Viewer can only see the result of the query defined in that panel. Actually, the Viewer has access to send any query to the data source. With a command-line tool like curl (there are many tools for this), the Viewer can make their own query to the data source and potentially access sensitive data.
 
 To address this vulnerability, you can restrict data source query access in the following ways:
 
@@ -58,8 +58,10 @@ To address this vulnerability, you can restrict data source query access in the
 
 ## Implications of enabling anonymous access to dashboards
 
-When you enable anonymous access to a dashboard, it is publicly available. This section lists the security implications of enabling Anonymous access.
+When you enable anonymous access in Grafana, any visitor or user can use Grafana as a Viewer without signing in. This section lists the security implications of enabling Anonymous access.
 
-- Anyone with the URL can access the dashboard.
-- Anyone can make view calls to the API and list all folders, dashboards, and data sources.
+- Anyone with the URL of a dashboard accessible by the Viewer role can access that dashboard.
+- New dashboards are publicly available unless the dashboard creator hides them from **all Viewers**.
+- Anyone can edit or delete dashboards that have granted Edit or Admin abilities to Viewers.
+- Anyone can make `view` calls to the API and list all folders, dashboards, and data sources.
 - Anyone can make arbitrary queries to any data source that the Grafana instance is configured with.
diff --git a/docs/sources/setup-grafana/configure-security/audit-grafana.md b/docs/sources/setup-grafana/configure-security/audit-grafana.md
index f071fe3e795e1..268279c5025d7 100644
--- a/docs/sources/setup-grafana/configure-security/audit-grafana.md
+++ b/docs/sources/setup-grafana/configure-security/audit-grafana.md
@@ -269,41 +269,6 @@ external group.
 
 \* `resources` may also contain a third item with `"type":` set to `"user"` or `"team"`.
 
-#### Alerts and notification channels management
-
-| Action                                                                | Distinguishing fields                                                                          |
-| --------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------- |
-| Save alert manager configuration                                      | `{"action": "update", "requestUri": "/api/alertmanager/RECIPIENT/config/api/v1/alerts"}`       |
-| Reset alert manager configuration                                     | `{"action": "delete", "requestUri": "/api/alertmanager/RECIPIENT/config/api/v1/alerts"}`       |
-| Create silence                                                        | `{"action": "create", "requestUri": "/api/alertmanager/RECIPIENT/api/v2/silences"}`            |
-| Delete silence                                                        | `{"action": "delete", "requestUri": "/api/alertmanager/RECIPIENT/api/v2/silences/SILENCE-ID"}` |
-| Create alert                                                          | `{"action": "create", "requestUri": "/api/ruler/RECIPIENT/api/v2/alerts"}`                     |
-| Create or update rule group                                           | `{"action": "create-update", "requestUri": "/api/ruler/RECIPIENT/api/v1/rules/NAMESPACE"}`     |
-| Delete rule group                                                     | `{"action": "delete", "requestUri": "/api/ruler/RECIPIENT/api/v1/rules/NAMESPACE/GROUP-NAME"}` |
-| Delete namespace                                                      | `{"action": "delete", "requestUri": "/api/ruler/RECIPIENT/api/v1/rules/NAMESPACE"}`            |
-| Test Grafana managed receivers                                        | `{"action": "test", "requestUri": "/api/alertmanager/RECIPIENT/config/api/v1/receivers/test"}` |
-| Create or update the NGalert configuration of the user's organization | `{"action": "create-update", "requestUri": "/api/v1/ngalert/admin_config"}`                    |
-| Delete the NGalert configuration of the user's organization           | `{"action": "delete", "requestUri": "/api/v1/ngalert/admin_config"}`                           |
-
-Where the following:
-
-- `RECIPIENT` is `grafana` for requests handled by Grafana or the data source UID for requests forwarded to a data source.
-- `NAMESPACE` is the string identifier for the rules namespace.
-- `GROUP-NAME` is the string identifier for the rules group.
-- `SILENCE-ID` is the ID of the affected silence.
-
-The following legacy alerting actions are still supported:
-
-| Action                            | Distinguishing fields                                                 |
-| --------------------------------- | --------------------------------------------------------------------- |
-| Test alert rule                   | `{"action": "test", "resources": [{"type": "panel"}]}`                |
-| Pause alert                       | `{"action": "pause", "resources": [{"type": "alert"}]}`               |
-| Pause all alerts                  | `{"action": "pause-all"}`                                             |
-| Test alert notification channel   | `{"action": "test", "resources": [{"type": "alert-notification"}]}`   |
-| Create alert notification channel | `{"action": "create", "resources": [{"type": "alert-notification"}]}` |
-| Update alert notification channel | `{"action": "update", "resources": [{"type": "alert-notification"}]}` |
-| Delete alert notification channel | `{"action": "delete", "resources": [{"type": "alert-notification"}]}` |
-
 #### Reporting
 
 | Action                    | Distinguishing fields                                                            |
@@ -338,7 +303,6 @@ The following legacy alerting actions are still supported:
 | Reload provisioned dashboards     | `{"action": "provisioning-dashboards"}`    |
 | Reload provisioned datasources    | `{"action": "provisioning-datasources"}`   |
 | Reload provisioned plugins        | `{"action": "provisioning-plugins"}`       |
-| Reload provisioned notifications  | `{"action": "provisioning-notifications"}` |
 | Reload provisioned alerts         | `{"action": "provisioning-alerts"}`        |
 | Reload provisioned access control | `{"action": "provisioning-accesscontrol"}` |
 
diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/_index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/_index.md
index 5ebd7f2d5d9b0..0a495fb49a056 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/_index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/_index.md
@@ -19,19 +19,19 @@ Grafana provides many ways to authenticate users. Some authentication integratio
 
 The following table shows all supported authentication providers and the features available for them. [Team sync]({{< relref "../configure-team-sync" >}}) and [active sync]({{< relref "./enhanced-ldap#active-ldap-synchronization" >}}) are only available in Grafana Enterprise.
 
-| Provider                                            | Multi Org Mapping | Enforce Sync | Role Mapping | Grafana Admin Mapping | Team Sync | Allowed groups | Active Sync | Skip OrgRole mapping | Auto Login | Single Logout |
-| :-------------------------------------------------- | :---------------- | :----------- | :----------- | :-------------------- | :-------- | :------------- | :---------- | :------------------- | :--------- | :------------ |
-| [Auth Proxy]({{< relref "./auth-proxy" >}})         | no                | yes          | yes          | no                    | yes       | no             | N/A         | no                   | N/A        | N/A           |
-| [Azure AD OAuth]({{< relref "./azuread" >}})        | no                | yes          | yes          | yes                   | yes       | yes            | N/A         | yes                  | yes        | yes           |
-| [Generic OAuth]({{< relref "./generic-oauth" >}})   | no                | yes          | yes          | yes                   | yes       | no             | N/A         | yes                  | yes        | yes           |
-| [GitHub OAuth]({{< relref "./github" >}})           | no                | yes          | yes          | yes                   | yes       | yes            | N/A         | yes                  | yes        | yes           |
-| [GitLab OAuth]({{< relref "./gitlab" >}})           | no                | yes          | yes          | yes                   | yes       | yes            | N/A         | yes                  | yes        | yes           |
-| [Google OAuth]({{< relref "./google" >}})           | no                | no           | no           | no                    | yes       | no             | N/A         | no                   | yes        | yes           |
-| [Grafana.com OAuth]({{< relref "./grafana-com" >}}) | no                | no           | yes          | no                    | N/A       | N/A            | N/A         | yes                  | yes        | yes           |
-| [Okta OAuth]({{< relref "./okta" >}})               | no                | yes          | yes          | yes                   | yes       | yes            | N/A         | yes                  | yes        | yes           |
-| [SAML]({{< relref "./saml" >}}) (Enterprise only)   | yes               | yes          | yes          | yes                   | yes       | yes            | N/A         | yes                  | yes        | yes           |
-| [LDAP]({{< relref "./ldap" >}})                     | yes               | yes          | yes          | yes                   | yes       | yes            | yes         | no                   | N/A        | N/A           |
-| [JWT Proxy]({{< relref "./jwt" >}})                 | no                | yes          | yes          | yes                   | no        | no             | N/A         | no                   | N/A        | N/A           |
+| Provider                                              | Multi Org Mapping | Enforce Sync | Role Mapping | Grafana Admin Mapping | Team Sync | Allowed groups | Active Sync | Skip OrgRole mapping | Auto Login | Single Logout |
+| :---------------------------------------------------- | :---------------- | :----------- | :----------- | :-------------------- | :-------- | :------------- | :---------- | :------------------- | :--------- | :------------ |
+| [Auth Proxy]({{< relref "./auth-proxy" >}})           | no                | yes          | yes          | no                    | yes       | no             | N/A         | no                   | N/A        | N/A           |
+| [Azure AD OAuth]({{< relref "./azuread" >}})          | no                | yes          | yes          | yes                   | yes       | yes            | N/A         | yes                  | yes        | yes           |
+| [Generic OAuth]({{< relref "./generic-oauth" >}})     | no                | yes          | yes          | yes                   | yes       | no             | N/A         | yes                  | yes        | yes           |
+| [GitHub OAuth]({{< relref "./github" >}})             | no                | yes          | yes          | yes                   | yes       | yes            | N/A         | yes                  | yes        | yes           |
+| [GitLab OAuth]({{< relref "./gitlab" >}})             | no                | yes          | yes          | yes                   | yes       | yes            | N/A         | yes                  | yes        | yes           |
+| [Google OAuth]({{< relref "./google" >}})             | no                | no           | no           | no                    | yes       | no             | N/A         | no                   | yes        | yes           |
+| [Grafana.com OAuth]({{< relref "./grafana-cloud" >}}) | no                | no           | yes          | no                    | N/A       | N/A            | N/A         | yes                  | yes        | yes           |
+| [Okta OAuth]({{< relref "./okta" >}})                 | no                | yes          | yes          | yes                   | yes       | yes            | N/A         | yes                  | yes        | yes           |
+| [SAML]({{< relref "./saml" >}}) (Enterprise only)     | yes               | yes          | yes          | yes                   | yes       | yes            | N/A         | yes                  | yes        | yes           |
+| [LDAP]({{< relref "./ldap" >}})                       | yes               | yes          | yes          | yes                   | yes       | yes            | yes         | no                   | N/A        | N/A           |
+| [JWT Proxy]({{< relref "./jwt" >}})                   | no                | yes          | yes          | yes                   | no        | no             | N/A         | no                   | N/A        | N/A           |
 
 N/A = Not applicable
 
@@ -76,6 +76,12 @@ In scenarios where you have multiple identity providers of the same type, there
 - Check if the identity provider supports account federation. In such cases, you can configure it once and let your identity provider federate the accounts from different providers.
 - If SAML is supported by the identity provider, you can configure one [Generic OAuth]({{< relref "./generic-oauth" >}}) and one [SAML]({{< relref "./saml" >}}) (Enterprise only).
 
+## Using the same email address to login with different identity providers
+
+If users want to use the same email address with multiple identity providers (for example, Grafana.Com OAuth and Google OAuth), you can configure Grafana to use the email address as the unique identifier for the user. This is done by enabling the `oauth_allow_insecure_email_lookup` option, which is disabled by default. Please note that enabling this option can lower the security of your Grafana instance. If you enable this option, you should also ensure that the `Allowed organization`, `Allowed groups` and `Allowed domains` settings are configured correctly to prevent unauthorized access.
+
+To enable this option, refer to the [Enable email lookup](#enable-email-lookup) section.
+
 ## Grafana Auth
 
 Grafana of course has a built in user authentication system with password authentication enabled by default. You can
@@ -178,6 +184,20 @@ We strongly recommend against enabling email lookups, however it is possible to
 oauth_allow_insecure_email_lookup = true
 ```
 
+You can also enable email lookup using the API:
+
+{{% admonition type="note" %}}
+Available in [Grafana Enterprise]({{< relref "../../../introduction/grafana-enterprise" >}}) and [Grafana Cloud]({{< relref "../../../introduction/grafana-cloud" >}}) since Grafana v10.4.
+{{% /admonition %}}
+
+```
+curl --request PUT \
+  --url http://{slug}.grafana.com/api/admin/settings \
+  --header 'Authorization: Bearer glsa_yourserviceaccounttoken' \
+  --header 'Content-Type: application/json' \
+  --data '{ "updates": { "auth": { "oauth_allow_insecure_email_lookup": "true" }}}'
+```
+
 ### Automatic OAuth login
 
 Set to true to attempt login with specific OAuth provider automatically, skipping the login screen.
@@ -205,10 +225,12 @@ disable_signout_menu = true
 
 ### URL redirect after signing out
 
-URL to redirect the user to after signing out from Grafana. This can for example be used to enable signout from OAuth provider.
+URL to redirect the user to after signing out from Grafana. This can for example be used to enable signout from an OAuth provider.
+
+Example for Generic OAuth:
 
 ```bash
-[auth]
+[auth.generic_oauth]
 signout_redirect_url =
 ```
 
diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/auth-proxy/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/auth-proxy/index.md
index 48825b13b99d5..5ed036bb6ed8b 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/auth-proxy/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/auth-proxy/index.md
@@ -36,7 +36,8 @@ header_property = username
 auto_sign_up = true
 # Define cache time to live in minutes
 # If combined with Grafana LDAP integration it is also the sync interval
-sync_ttl = 60
+# Set to 0 to always fetch and sync the latest user data
+sync_ttl = 15
 # Limit where auth proxy requests come from by configuring a list of IP addresses.
 # This can be used to prevent users spoofing the X-WEBAUTH-USER header.
 # Example `whitelist = 192.168.1.1, 192.168.1.0/24, 2001::23, 2001::0/120`
@@ -231,6 +232,10 @@ ProxyPassReverse / http://grafana:3000/
 
 With our Grafana and Apache containers running, you can now connect to http://localhost/ and log in using the username/password we created in the htpasswd file.
 
+{{% admonition type="note" %}}
+If the user is deleted from Grafana, the user will be not be able to login and resync until after the `sync_ttl` has expired.
+{{% /admonition %}}
+
 ### Team Sync (Enterprise only)
 
 > Only available in Grafana Enterprise v6.3+
@@ -252,7 +257,7 @@ Once that's done. You can verify your mappings by querying the API.
 
 ```bash
 # First, inspect your teams and obtain the corresponding ID of the team we want to inspect the groups for.
-curl -H "X-WEBAUTH-USER: admin" http://localhost:3000/api/teams/search
+curl -H "X-WEBAUTH-USER: admin" -H "X-WEBAUTH-GROUPS: lokiteamOnExternalSystem" http://localhost:3000/api/teams/search
 {
   "totalCount": 2,
   "teams": [
@@ -280,7 +285,7 @@ curl -H "X-WEBAUTH-USER: admin" http://localhost:3000/api/teams/search
 }
 
 # Then, query the groups for that particular team. In our case, the Loki team which has an ID of "2".
-curl -H "X-WEBAUTH-USER: admin" http://localhost:3000/api/teams/2/groups
+curl -H "X-WEBAUTH-USER: admin" -H "X-WEBAUTH-GROUPS: lokiteamOnExternalSystem" http://localhost:3000/api/teams/2/groups
 [
   {
     "orgId": 1,
@@ -304,6 +309,10 @@ curl -H "X-WEBAUTH-USER: leonard" -H "X-WEBAUTH-GROUPS: lokiteamOnExternalSystem
 
 With this, the user `leonard` will be automatically placed into the Loki team as part of Grafana authentication.
 
+{{% admonition type="note" %}}
+An empty `X-WEBAUTH-GROUPS` or the absence of a groups header will remove the user from all teams.
+{{% /admonition %}}
+
 [Learn more about Team Sync]({{< relref "../../configure-team-sync" >}})
 
 ## Login token and session cookie
diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/azuread/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/azuread/index.md
index 7c3d163a79aaf..9dbda4334f99d 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/azuread/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/azuread/index.md
@@ -19,24 +19,11 @@ weight: 800
 
 # Configure Azure AD OAuth2 authentication
 
-The Azure AD authentication allows you to use an Azure Active Directory tenant as an identity provider for Grafana. You can use Azure AD Application Roles to assign users and groups to Grafana roles from the Azure Portal. This topic has the following sections:
-
-- [Configure Azure AD OAuth2 authentication](#configure-azure-ad-oauth2-authentication)
-  - [Create the Azure AD application](#create-the-azure-ad-application)
-    - [Assign server administrator privileges](#assign-server-administrator-privileges)
-  - [Enable Azure AD OAuth in Grafana](#enable-azure-ad-oauth-in-grafana)
-    - [Configure refresh token](#configure-refresh-token)
-    - [Configure allowed tenants](#configure-allowed-tenants)
-    - [Configure allowed groups](#configure-allowed-groups)
-    - [Configure allowed domains](#configure-allowed-domains)
-    - [PKCE](#pkce)
-    - [Configure automatic login](#configure-automatic-login)
-    - [Team Sync (Enterprise only)](#team-sync-enterprise-only)
-  - [Common troubleshooting](#common-troubleshooting)
-    - [Users with over 200 Group assignments](#users-with-over-200-group-assignments)
-    - [Force fetching groups from Microsoft graph API](#force-fetching-groups-from-microsoft-graph-api)
-    - [Map roles](#map-roles)
-  - [Skip organization role sync](#skip-organization-role-sync)
+The Azure AD authentication allows you to use an Azure Active Directory tenant as an identity provider for Grafana. You can use Azure AD application roles to assign users and groups to Grafana roles from the Azure Portal.
+
+{{% admonition type="note" %}}
+If Users use the same email address in Azure AD that they use with other authentication providers (such as Grafana.com), you need to do additional configuration to ensure that the users are matched correctly. Please refer to [Using the same email address to login with different identity providers]({{< relref "../../configure-authentication#using-the-same-email-address-to-login-with-different-identity-providers" >}}) for more information.
+{{% /admonition %}}
 
 ## Create the Azure AD application
 
@@ -62,13 +49,54 @@ To enable the Azure AD OAuth2, register your application with Azure AD.
 1. Click **Certificates & secrets**, then add a new entry under **Client secrets** with the following configuration.
 
    - Description: Grafana OAuth
-   - Expires: Never
+   - Expires: Select an expiration period
 
 1. Click **Add** then copy the key value. This is the OAuth client secret.
 
-1. Click **Manifest**, then define the required Application Role values for Grafana: Viewer, Editor, or Admin. If not defined, all users will have the Viewer role. Every role requires a unique ID which you can generate on Linux with `uuidgen`, and on Windows through Microsoft PowerShell with `New-Guid`.
+1. Define the required application roles for Grafana [using the Azure Portal](#configure-application-roles-for-grafana-in-the-azure-portal) or [using the manifest file](#configure-application-roles-for-grafana-in-the-manifest-file).
+
+1. Go to **Azure Active Directory** and then to **Enterprise Applications**.
+
+1. Search for your application and click it.
+
+1. Click **Users and Groups**.
+1. Click **Add user/group** to add a user or group to the Grafana roles.
+
+### Configure application roles for Grafana in the Azure Portal
+
+This section describes setting up basic application roles for Grafana within the Azure Portal. For more information, see [Add app roles to your application and receive them in the token](https://learn.microsoft.com/en-us/entra/identity-platform/howto-add-app-roles-in-apps).
+
+1. Go to **App Registrations**, search for your application, and click it.
+
+1. Click **App roles** and then **Create app role**.
+
+1. Define a role corresponding to each Grafana role: Viewer, Editor, and Admin.
+
+   1. Choose a **Display name** for the role. For example, "Grafana Editor".
+
+   1. Set the **Allowed member types** to **Users/Groups**.
+
+   1. Ensure that the **Value** field matches the Grafana role name. For example, "Editor".
+
+   1. Choose a **Description** for the role. For example, "Grafana Editor Users".
+
+   1. Click **Apply**.
 
-1. Include the unique ID in the configuration file:
+### Configure application roles for Grafana in the manifest file
+
+If you prefer to configure the application roles for Grafana in the manifest file, complete the following steps:
+
+1. Go to **App Registrations**, search for your application, and click it.
+
+1. Click **Manifest** and then click **Edit**.
+
+1. Add a Universally Unique Identifier to each role.
+
+{{% admonition type="note" %}}
+Every role requires a [Universally Unique Identifier](https://en.wikipedia.org/wiki/Universally_unique_identifier) which you can generate on Linux with `uuidgen`, and on Windows through Microsoft PowerShell with `New-Guid`.
+{{% /admonition %}}
+
+1. Replace each "SOME_UNIQUE_ID" with the generated ID in the manifest file:
 
    ```json
    	"appRoles": [
@@ -111,9 +139,7 @@ To enable the Azure AD OAuth2, register your application with Azure AD.
    		],
    ```
 
-1. Go to **Azure Active Directory** and then to **Enterprise Applications**. Search for your application and click on it.
-
-1. Click on **Users and Groups** and add Users/Groups to the Grafana roles by using **Add User**.
+1. Click **Save**.
 
 ### Assign server administrator privileges
 
@@ -139,9 +165,62 @@ If the setting is set to `false`, the user is assigned the role of `Admin` of th
 }
 ```
 
-## Enable Azure AD OAuth in Grafana
+## Before you begin
+
+Ensure that you have followed the steps in [Create the Azure AD application](#create-the-azure-ad-application) before you begin.
+
+## Configure Azure AD authentication client using the Grafana UI
+
+{{% admonition type="note" %}}
+Available in Public Preview in Grafana 10.4 behind the `ssoSettingsApi` feature toggle.
+{{% /admonition %}}
+
+As a Grafana Admin, you can configure your Azure AD OAuth2 client from within Grafana using the Grafana UI. To do this, navigate to the **Administration > Authentication > Azure AD** page and fill in the form. If you have a current configuration in the Grafana configuration file, the form will be pre-populated with those values. Otherwise the form will contain default values.
+
+After you have filled in the form, click **Save** to save the configuration. If the save was successful, Grafana will apply the new configurations.
+
+If you need to reset changes you made in the UI back to the default values, click **Reset**. After you have reset the changes, Grafana will apply the configuration from the Grafana configuration file (if there is any configuration) or the default values.
+
+{{% admonition type="note" %}}
+If you run Grafana in high availability mode, configuration changes may not get applied to all Grafana instances immediately. You may need to wait a few minutes for the configuration to propagate to all Grafana instances.
+{{% /admonition %}}
+
+## Configure Azure AD authentication client using the Terraform provider
+
+{{% admonition type="note" %}}
+Available in Public Preview in Grafana 10.4 behind the `ssoSettingsApi` feature toggle. Supported in the Terraform provider since v2.12.0.
+{{% /admonition %}}
+
+```terraform
+resource "grafana_sso_settings" "azuread_sso_settings" {
+  provider_name = "azuread"
+  oauth2_settings {
+    name                       = "Azure AD"
+    auth_url                   = "https://login.microsoftonline.com/TENANT_ID/oauth2/v2.0/authorize"
+    token_url                  = "https://login.microsoftonline.com/TENANT_ID/oauth2/v2.0/token"
+    client_id                  = "APPLICATION_ID"
+    client_secret              = "CLIENT_SECRET"
+    allow_sign_up              = true
+    auto_login                 = false
+    scopes                     = "openid email profile"
+    allowed_organizations      = "TENANT_ID"
+    role_attribute_strict      = false
+    allow_assign_grafana_admin = false
+    skip_org_role_sync         = false
+    use_pkce                   = true
+  }
+}
+```
+
+Refer to [Terraform Registry](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/sso_settings) for a complete reference on using the `grafana_sso_settings` resource.
 
-1. Add the following to the [Grafana configuration file]({{< relref "../../../configure-grafana#configuration-file-location" >}}):
+## Configure Azure AD authentication client using the Grafana configuration file
+
+Ensure that you have access to the [Grafana configuration file]({{< relref "../../../configure-grafana#configuration-file-location" >}}).
+
+### Enable Azure AD OAuth in Grafana
+
+Add the following to the [Grafana configuration file]({{< relref "../../../configure-grafana#configuration-file-location" >}}):
 
 ```
 [auth.azuread]
@@ -170,21 +249,21 @@ GF_AUTH_AZUREAD_CLIENT_ID
 GF_AUTH_AZUREAD_CLIENT_SECRET
 ```
 
-**Note:** Verify that the Grafana [root_url]({{< relref "../../../configure-grafana#root_url" >}}) is set in your Azure Application Redirect URLs.
+{{% admonition type="note" %}}
+Verify that the Grafana [root_url]({{< relref "../../../configure-grafana#root_url" >}}) is set in your Azure Application Redirect URLs.
+{{% /admonition %}}
 
 ### Configure refresh token
 
 > Available in Grafana v9.3 and later versions.
 
-> **Note:** This feature is behind the `accessTokenExpirationCheck` feature toggle.
-
 When a user logs in using an OAuth provider, Grafana verifies that the access token has not expired. When an access token expires, Grafana uses the provided refresh token (if any exists) to obtain a new access token.
 
 Grafana uses a refresh token to obtain a new access token without requiring the user to log in again. If a refresh token doesn't exist, Grafana logs the user out of the system after the access token has expired.
 
-Refresh token fetching and access token expiration check is enabled by default for the AzureAD provider since Grafana v10.1.0 if the `accessTokenExpirationCheck` feature toggle is enabled. If you would like to disable access token expiration check then set the `use_refresh_token` configuration value to `false`.
+Refresh token fetching and access token expiration check is enabled by default for the AzureAD provider since Grafana v10.1.0. If you would like to disable access token expiration check then set the `use_refresh_token` configuration value to `false`.
 
-> **Note:** The `accessTokenExpirationCheck` feature toggle will be removed in Grafana v10.2.0 and the `use_refresh_token` configuration value will be used instead for configuring refresh token fetching and access token expiration check.
+> **Note:** The `accessTokenExpirationCheck` feature toggle has been removed in Grafana v10.3.0 and the `use_refresh_token` configuration value will be used instead for configuring refresh token fetching and access token expiration check.
 
 ### Configure allowed tenants
 
@@ -201,16 +280,44 @@ allowed_organizations = 8bab1c86-8fba-33e5-2089-1d1c80ec267d
 
 ### Configure allowed groups
 
-To limit access to authenticated users who are members of one or more groups, set `allowed_groups`
-to a comma- or space-separated list of group object IDs. You can find object IDs for a specific group on the Azure portal:
+Azure AD groups can be used to limit user access to Grafana. For more information about managing groups in Azure AD, refer to [Manage Microsoft Entra groups and group membership](https://learn.microsoft.com/en-us/entra/fundamentals/how-to-manage-groups).
 
-1. Go to **Azure Active Directory -> Groups**. If you want to only give access to members of the group `example` with an ID of `8bab1c86-8fba-33e5-2089-1d1c80ec267d`, then set the following:
+To limit access to authenticated users who are members of one or more AzureAD groups, set `allowed_groups`
+to a **comma-** or **space-separated** list of group object IDs.
+
+1. To find object IDs for a specific group on the Azure portal, go to **Azure Active Directory > Groups**.
+
+   You can find the Object Id of a group by clicking on the group and then clicking on **Properties**. The object ID is listed under **Object ID**. If you want to only give access to members of the group `example` with an Object Id of `8bab1c86-8fba-33e5-2089-1d1c80ec267d`, then set the following:
 
    ```
-   allowed_groups = 8bab1c86-8fba-33e5-2089-1d1c80ec267d
+     allowed_groups = 8bab1c86-8fba-33e5-2089-1d1c80ec267d
    ```
 
-1. Verify that [group attributes](https://docs.microsoft.com/en-us/azure/active-directory/hybrid/how-to-connect-fed-group-claims#configure-the-azure-ad-application-registration-for-group-attributes) is enabled in your Azure AD Application Registration manifest file by navigating to **Azure Portal** > **Azure Active Directory** > **Application Registrations** > **Select Application** -> **Manifest**, and set the following:
+1. You must enable adding the [group attribute](https://learn.microsoft.com/en-us/entra/identity-platform/optional-claims#configure-groups-optional-claims) to the tokens in your Azure AD App registration either [from the Azure Portal](#configure-group-membership-claims-on-the-azure-portal) or [from the manifest file](#configure-group-membership-claim-in-the-manifest-file).
+
+#### Configure group membership claims on the Azure Portal
+
+To ensure that the `groups` claim is included in the token, add the `groups` claim to the token configuration either through the Azure Portal UI or by editing the manifest file.
+
+To configure group membership claims from the Azure Portal UI, complete the following steps:
+
+1. Navigate to the **App Registrations** page and select your application.
+1. Select **Token configuration**.
+1. Click **Add groups claim** and select the relevant option for your use case (for example, **Security groups** and **Groups assigned to the application**).
+
+For more information, see [Configure groups optional claims](https://learn.microsoft.com/en-us/entra/identity-platform/optional-claims#configure-groups-optional-claims).
+
+{{% admonition type="note" %}}
+If the user is a member of more than 200 groups, Azure AD does not emit the groups claim in the token and instead emits a group overage claim. To set up a group overage claim, see [Users with over 200 Group assignments](#users-with-over-200-group-assignments).
+{{% /admonition %}}
+
+#### Configure group membership claim in the manifest file
+
+1. Go to **App Registrations**, search for your application, and click it.
+
+1. Click **Manifest** and then click **Edit**.
+
+1. Add the following to the root of the manifest file:
 
    ```
    "groupMembershipClaims": "ApplicationGroup, SecurityGroup"
@@ -271,10 +378,26 @@ Azure AD does not emit the groups claim in the token and emits a group overage c
 If Grafana receives a token with a group overage claim instead of a groups claim,
 Grafana attempts to retrieve the user's group membership by calling the included endpoint.
 
-> Note: The token must include the `GroupMember.Read.All` permission for group overage claim calls to succeed.
-> Admin consent may be required for this permission.
+{{% admonition type="note" %}}
+The 'App registration' must include the `GroupMember.Read.All` API permission for group overage claim calls to succeed.
+
+Admin consent might be required for this permission.
+{{% /admonition %}}
+
+#### Configure the required Graph API permissions
+
+1. Navigate to **Azure Active Directory > App registrations** and select your application.
+1. Select **API permissions** and then click on **Add a permission**.
+1. Select **Microsoft Graph** from the list of APIs.
+1. Select **Delegated permissions**.
+1. Under the **GroupMember** section, select **GroupMember.Read.All**.
+1. Click **Add permissions**.
+
+{{% admonition type="note" %}}
+Admin consent may be required for this permission.
+{{% /admonition %}}
 
-### Force fetching groups from Microsoft graph API
+### Force fetching groups from Microsoft Graph API
 
 To force fetching groups from Microsoft Graph API instead of the `id_token`. You can use the `force_use_graph_api` config option.
 
diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/enhanced-ldap/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/enhanced-ldap/index.md
index 02aea423bd064..fd02e51fcb850 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/enhanced-ldap/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/enhanced-ldap/index.md
@@ -30,11 +30,11 @@ The enhanced LDAP integration adds additional functionality on top of the [LDAP
 
 ## LDAP group synchronization for teams
 
-{{< figure src="/static/img/docs/enterprise/team_members_ldap.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" >}}
-
 With enhanced LDAP integration, you can set up synchronization between LDAP groups and teams. This enables LDAP users that are members
 of certain LDAP groups to automatically be added or removed as members to certain teams in Grafana.
 
+![LDAP group synchronization](/static/img/docs/enterprise/team_members_ldap.png)
+
 Grafana keeps track of all synchronized users in teams, and you can see which users have been synchronized from LDAP in the team members list, see `LDAP` label in screenshot.
 This mechanism allows Grafana to remove an existing synchronized user from a team when its LDAP group membership changes. This mechanism also allows you to manually add
 a user as member of a team, and it will not be removed when the user signs in. This gives you flexibility to combine LDAP group memberships and Grafana team memberships.
diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/generic-oauth/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/generic-oauth/index.md
index fb37aadfb1a2f..35e881c3a15e2 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/generic-oauth/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/generic-oauth/index.md
@@ -27,23 +27,76 @@ Grafana provides OAuth2 integrations for the following auth providers:
 - [GitHub OAuth]({{< relref "../github" >}})
 - [GitLab OAuth]({{< relref "../gitlab" >}})
 - [Google OAuth]({{< relref "../google" >}})
-- [Grafana Com OAuth]({{< relref "../grafana-com" >}})
+- [Grafana Com OAuth]({{< relref "../grafana-cloud" >}})
 - [Keycloak OAuth]({{< relref "../keycloak" >}})
 - [Okta OAuth]({{< relref "../okta" >}})
 
 If your OAuth2 provider is not listed, you can use generic OAuth2 authentication.
 
-This topic describes how to configure generic OAuth2 authentication and includes [examples of setting up generic OAuth2]({{< relref "#examples-of-setting-up-generic-oauth2" >}}) with specific OAuth2 providers.
+This topic describes how to configure generic OAuth2 authentication using different methods and includes [examples of setting up generic OAuth2]({{< relref "#examples-of-setting-up-generic-oauth2" >}}) with specific OAuth2 providers.
 
 ## Before you begin
 
 To follow this guide:
 
-- Ensure that you have access to the [Grafana configuration file]({{< relref "../../../configure-grafana#configuration-file-location" >}}).
 - Ensure you know how to create an OAuth2 application with your OAuth2 provider. Consult the documentation of your OAuth2 provider for more information.
+- Ensure your identity provider returns OpenID UserInfo compatible information such as the `sub` claim.
 - If you are using refresh tokens, ensure you know how to set them up with your OAuth2 provider. Consult the documentation of your OAuth2 provider for more information.
 
-## Steps
+{{% admonition type="note" %}}
+If Users use the same email address in Azure AD that they use with other authentication providers (such as Grafana.com), you need to do additional configuration to ensure that the users are matched correctly. Please refer to the [Using the same email address to login with different identity providers]({{< relref "../../configure-authentication#using-the-same-email-address-to-login-with-different-identity-providers" >}}) documentation for more information.
+{{% /admonition %}}
+
+## Configure generic OAuth authentication client using the Grafana UI
+
+{{% admonition type="note" %}}
+Available in Public Preview in Grafana 10.4 behind the `ssoSettingsApi` feature toggle.
+{{% /admonition %}}
+
+As a Grafana Admin, you can configure Generic OAuth2 client from within Grafana using the Generic OAuth UI. To do this, navigate to **Administration > Authentication > Generic OAuth** page and fill in the form. If you have a current configuration in the Grafana configuration file then the form will be pre-populated with those values otherwise the form will contain default values.
+
+After you have filled in the form, click **Save** to save the configuration. If the save was successful, Grafana will apply the new configurations.
+
+If you need to reset changes you made in the UI back to the default values, click **Reset**. After you have reset the changes, Grafana will apply the configuration from the Grafana configuration file (if there is any configuration) or the default values.
+
+{{% admonition type="note" %}}
+If you run Grafana in high availability mode, configuration changes may not get applied to all Grafana instances immediately. You may need to wait a few minutes for the configuration to propagate to all Grafana instances.
+{{% /admonition %}}
+
+Refer to [configuration options]({{< relref "#configuration-options" >}}) for more information.
+
+## Configure generic OAuth authentication client using the Terraform provider
+
+{{% admonition type="note" %}}
+Available in Public Preview in Grafana 10.4 behind the `ssoSettingsApi` feature toggle. Supported in the Terraform provider since v2.12.0.
+{{% /admonition %}}
+
+```terraform
+resource "grafana_sso_settings" "generic_sso_settings" {
+  provider_name = "generic_oauth"
+  oauth2_settings {
+    name              = "Auth0"
+    auth_url          = "https://<domain>/authorize"
+    token_url         = "https://<domain>/oauth/token"
+    api_url           = "https://<domain>/userinfo"
+    client_id         = "<client id>"
+    client_secret     = "<client secret>"
+    allow_sign_up     = true
+    auto_login        = false
+    scopes            = "openid profile email offline_access"
+    use_pkce          = true
+    use_refresh_token = true
+  }
+}
+```
+
+Refer to [Terraform Registry](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/sso_settings) for a complete reference on using the `grafana_sso_settings` resource.
+
+## Configure generic OAuth authentication client using the Grafana configuration file
+
+Ensure that you have access to the [Grafana configuration file]({{< relref "../../../configure-grafana#configuration-file-location" >}}).
+
+### Steps
 
 To integrate your OAuth2 provider with Grafana using our generic OAuth2 authentication, follow these steps:
 
@@ -67,13 +120,11 @@ To integrate your OAuth2 provider with Grafana using our generic OAuth2 authenti
 
 1. Optional: [Configure a refresh token]({{< relref "#configure-a-refresh-token" >}}):
 
-   a. Enable `accessTokenExpirationCheck` feature toggle.
-
-   b. Extend the `scopes` field of `[auth.generic_oauth]` section in Grafana configuration file with refresh token scope used by your OAuth2 provider.
+   a. Extend the `scopes` field of `[auth.generic_oauth]` section in Grafana configuration file with refresh token scope used by your OAuth2 provider.
 
-   c. Set `use_refresh_token` to `true` in `[auth.generic_oauth]` section in Grafana configuration file.
+   b. Set `use_refresh_token` to `true` in `[auth.generic_oauth]` section in Grafana configuration file.
 
-   d. Enable the refresh token on the provider if required.
+   c. Enable the refresh token on the provider if required.
 
 1. [Configure role mapping]({{< relref "#configure-role-mapping" >}}).
 1. Optional: [Configure team synchronization]({{< relref "#configure-team-synchronization" >}}).
@@ -81,48 +132,6 @@ To integrate your OAuth2 provider with Grafana using our generic OAuth2 authenti
 
    You should now see a generic OAuth2 login button on the login page and be able to log in or sign up with your OAuth2 provider.
 
-## Configuration options
-
-The following table outlines the various generic OAuth2 configuration options. You can apply these options as environment variables, similar to any other configuration within Grafana.
-
-| Setting                      | Required | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | Default         |
-| ---------------------------- | -------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------- |
-| `enabled`                    | No       | Enables generic OAuth2 authentication.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `false`         |
-| `name`                       | No       | Name that refers to the generic OAuth2 authentication from the Grafana user interface.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `OAuth`         |
-| `icon`                       | No       | Icon used for the generic OAuth2 authentication in the Grafana user interface.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `signin`        |
-| `client_id`                  | Yes      | Client ID provided by your OAuth2 app.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |                 |
-| `client_secret`              | Yes      | Client secret provided by your OAuth2 app.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |                 |
-| `auth_url`                   | Yes      | Authorization endpoint of your OAuth2 provider.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |                 |
-| `token_url`                  | Yes      | Endpoint used to obtain the OAuth2 access token.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |                 |
-| `api_url`                    | Yes      | Endpoint used to obtain user information compatible with [OpenID UserInfo](https://connect2id.com/products/server/docs/api/userinfo).                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |                 |
-| `auth_style`                 | No       | Name of the [OAuth2 AuthStyle](https://pkg.go.dev/golang.org/x/oauth2#AuthStyle) to be used when ID token is requested from OAuth2 provider. It determines how `client_id` and `client_secret` are sent to Oauth2 provider. Available values are `AutoDetect`, `InParams` and `InHeader`.                                                                                                                                                                                                                                                                                                                  | `AutoDetect`    |
-| `scopes`                     | No       | List of comma- or space-separated OAuth2 scopes.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `user:email`    |
-| `empty_scopes`               | No       | Set to `true` to use an empty scope during authentication.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `false`         |
-| `allow_sign_up`              | No       | Controls Grafana user creation through the generic OAuth2 login. Only existing Grafana users can log in with generic OAuth if set to `false`.                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `true`          |
-| `auto_login`                 | No       | Set to `true` to enable users to bypass the login screen and automatically log in. This setting is ignored if you configure multiple auth providers to use auto-login.                                                                                                                                                                                                                                                                                                                                                                                                                                     | `false`         |
-| `id_token_attribute_name`    | No       | The name of the key used to extract the ID token from the returned OAuth2 token.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `id_token`      |
-| `login_attribute_path`       | No       | [JMESPath](http://jmespath.org/examples.html) expression to use for user login lookup from the user ID token. For more information on how user login is retrieved, refer to [Configure login]({{< relref "#configure-login" >}}).                                                                                                                                                                                                                                                                                                                                                                          |                 |
-| `name_attribute_path`        | No       | [JMESPath](http://jmespath.org/examples.html) expression to use for user name lookup from the user ID token. This name will be used as the user's display name. For more information on how user display name is retrieved, refer to [Configure display name]({{< relref "#configure-display-name" >}}).                                                                                                                                                                                                                                                                                                   |                 |
-| `email_attribute_path`       | No       | [JMESPath](http://jmespath.org/examples.html) expression to use for user email lookup from the user information. For more information on how user email is retrieved, refer to [Configure email address]({{< relref "#configure-email-address" >}}).                                                                                                                                                                                                                                                                                                                                                       |                 |
-| `email_attribute_name`       | No       | Name of the key to use for user email lookup within the `attributes` map of OAuth2 ID token. For more information on how user email is retrieved, refer to [Configure email address]({{< relref "#configure-email-address" >}}).                                                                                                                                                                                                                                                                                                                                                                           | `email:primary` |
-| `role_attribute_path`        | No       | [JMESPath](http://jmespath.org/examples.html) expression to use for Grafana role lookup. Grafana will first evaluate the expression using the OAuth2 ID token. If no role is found, the expression will be evaluated using the user information obtained from the UserInfo endpoint. The result of the evaluation should be a valid Grafana role (`Viewer`, `Editor`, `Admin` or `GrafanaAdmin`). For more information on user role mapping, refer to [Configure role mapping]({{< relref "#configure-role-mapping" >}}).                                                                                  |                 |
-| `role_attribute_strict`      | No       | Set to `true` to deny user login if the Grafana role cannot be extracted using `role_attribute_path`. For more information on user role mapping, refer to [Configure role mapping]({{< relref "#configure-role-mapping" >}}).                                                                                                                                                                                                                                                                                                                                                                              | `false`         |
-| `allow_assign_grafana_admin` | No       | Set to `true` to enable automatic sync of the Grafana server administrator role. If this option is set to `true` and the result of evaluating `role_attribute_path` for a user is `GrafanaAdmin`, Grafana grants the user the server administrator privileges and organization administrator role. If this option is set to `false` and the result of evaluating `role_attribute_path` for a user is `GrafanaAdmin`, Grafana grants the user only organization administrator role. For more information on user role mapping, refer to [Configure role mapping]({{< relref "#configure-role-mapping" >}}). | `false`         |
-| `skip_org_role_sync`         | No       | Set to `true` to stop automatically syncing user roles. This will allow you to set organization roles for your users from within Grafana manually.                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `false`         |
-| `groups_attribute_path`      | No       | [JMESPath](http://jmespath.org/examples.html) expression to use for user group lookup. Grafana will first evaluate the expression using the OAuth2 ID token. If no groups are found, the expression will be evaluated using the user information obtained from the UserInfo endpoint. The result of the evaluation should be a string array of groups.                                                                                                                                                                                                                                                     |                 |
-| `allowed_groups`             | No       | List of comma- or space-separated groups. The user should be a member of at least one group to log in. If you configure `allowed_groups`, you must also configure `groups_attribute_path`.                                                                                                                                                                                                                                                                                                                                                                                                                 |                 |
-| `allowed_organizations`      | No       | List of comma- or space-separated organizations. The user should be a member of at least one organization to log in.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |                 |
-| `allowed_domains`            | No       | List comma- or space-separated domains. The user should belong to at least one domain to log in.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |                 |
-| `team_ids`                   | No       | String list of team IDs. If set, the user must be a member of one of the given teams to log in. If you configure `team_ids`, you must also configure `teams_url` and `team_ids_attribute_path`.                                                                                                                                                                                                                                                                                                                                                                                                            |                 |
-| `team_ids_attribute_path`    | No       | The [JMESPath](http://jmespath.org/examples.html) expression to use for Grafana team ID lookup within the results returned by the `teams_url` endpoint.                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                 |
-| `teams_url`                  | No       | The URL used to query for team IDs. If not set, the default value is `/teams`. If you configure `teams_url`, you must also configure `team_ids_attribute_path`.                                                                                                                                                                                                                                                                                                                                                                                                                                            |                 |
-| `tls_skip_verify_insecure`   | No       | If set to `true`, the client accepts any certificate presented by the server and any host name in that certificate. _You should only use this for testing_, because this mode leaves SSL/TLS susceptible to man-in-the-middle attacks.                                                                                                                                                                                                                                                                                                                                                                     | `false`         |
-| `tls_client_cert`            | No       | The path to the certificate.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |                 |
-| `tls_client_key`             | No       | The path to the key.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |                 |
-| `tls_client_ca`              | No       | The path to the trusted certificate authority list.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |                 |
-| `use_pkce`                   | No       | Set to `true` to use [Proof Key for Code Exchange (PKCE)](https://datatracker.ietf.org/doc/html/rfc7636). Grafana uses the SHA256 based `S256` challenge method and a 128 bytes (base64url encoded) code verifier.                                                                                                                                                                                                                                                                                                                                                                                         | `false`         |
-| `use_refresh_token`          | No       | Set to `true` to use refresh token and check access token expiration. The `accessTokenExpirationCheck` feature toggle should also be enabled to use refresh token.                                                                                                                                                                                                                                                                                                                                                                                                                                         | `false`         |
-
 ### Configure login
 
 Grafana can resolve a user's login from the OAuth2 ID token or user information retrieved from the OAuth2 UserInfo endpoint.
@@ -170,7 +179,7 @@ Refer to the following table for information on what to configure based on how t
 | Another field of the user information from the UserInfo endpoint.                                                                                                       | Set `email_attribute_path` configuration option.                                                                   |
 | Email address marked as primary from the `/emails` endpoint of <br /> the OAuth2 provider (obtained by appending `/emails` to the URL <br /> configured with `api_url`) | N/A                                                                                                                |
 
-## Configure a refresh token
+### Configure a refresh token
 
 > **Note:** This feature is behind the `accessTokenExpirationCheck` feature toggle.
 
@@ -183,9 +192,9 @@ To configure generic OAuth2 to use a refresh token, set `use_refresh_token` conf
 1. Extend the `scopes` field of `[auth.generic_oauth]` section in Grafana configuration file with additional scopes.
 1. Enable the refresh token on the provider.
 
-> **Note:** The `accessTokenExpirationCheck` feature toggle will be removed in Grafana v10.2.0 and the `use_refresh_token` configuration value will be used instead for configuring refresh token fetching and access token expiration check.
+> **Note:** The `accessTokenExpirationCheck` feature toggle will be removed in Grafana v10.3.0 and the `use_refresh_token` configuration value will be used instead for configuring refresh token fetching and access token expiration check.
 
-## Configure role mapping
+### Configure role mapping
 
 Unless `skip_org_role_sync` option is enabled, the user's role will be set to the role retrieved from the auth provider upon user login.
 
@@ -199,11 +208,11 @@ This setting denies user access if no role or an invalid role is returned.
 
 To ease configuration of a proper JMESPath expression, go to [JMESPath](http://jmespath.org/) to test and evaluate expressions with custom payloads.
 
-### Role mapping examples
+#### Role mapping examples
 
 This section includes examples of JMESPath expressions used for role mapping.
 
-#### Map user organization role
+##### Map user organization role
 
 In this example, the user has been granted the role of an `Editor`. The role assigned is based on the value of the property `role`, which must be a valid Grafana role such as `Admin`, `Editor`, `Viewer` or `None`.
 
@@ -249,7 +258,7 @@ Config:
 role_attribute_path = contains(info.groups[*], 'admin') && 'Admin' || contains(info.groups[*], 'editor') && 'Editor' || 'Viewer'
 ```
 
-#### Map server administrator role
+##### Map server administrator role
 
 In the following example, the user is granted the Grafana server administrator role.
 
@@ -276,7 +285,18 @@ role_attribute_path = contains(info.roles[*], 'admin') && 'GrafanaAdmin' || cont
 allow_assign_grafana_admin = true
 ```
 
-## Configure team synchronization
+##### Map one role to all users
+
+In this example, all users will be assigned `Viewer` role regardless of the user information received from the identity provider.
+
+Config:
+
+```ini
+role_attribute_path = "'Viewer'"
+skip_org_role_sync = false
+```
+
+### Configure team synchronization
 
 > **Note:** Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise" >}}) and [Grafana Cloud](/docs/grafana-cloud/).
 
@@ -288,7 +308,7 @@ For information on configuring OAuth2 groups with Grafana using the `groups_attr
 
 To learn more about Team Sync, refer to [Configure team sync]({{< relref "../../configure-team-sync" >}}).
 
-### Team synchronization example
+#### Team synchronization example
 
 Configuration:
 
@@ -313,10 +333,86 @@ Payload:
 }
 ```
 
+## Configuration options
+
+The following table outlines the various generic OAuth2 configuration options. You can apply these options as environment variables, similar to any other configuration within Grafana.
+
+| Setting                      | Required | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | Default         |
+| ---------------------------- | -------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------- |
+| `enabled`                    | No       | Enables generic OAuth2 authentication.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `false`         |
+| `name`                       | No       | Name that refers to the generic OAuth2 authentication from the Grafana user interface.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `OAuth`         |
+| `icon`                       | No       | Icon used for the generic OAuth2 authentication in the Grafana user interface.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `signin`        |
+| `client_id`                  | Yes      | Client ID provided by your OAuth2 app.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |                 |
+| `client_secret`              | Yes      | Client secret provided by your OAuth2 app.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |                 |
+| `auth_url`                   | Yes      | Authorization endpoint of your OAuth2 provider.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |                 |
+| `token_url`                  | Yes      | Endpoint used to obtain the OAuth2 access token.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |                 |
+| `api_url`                    | Yes      | Endpoint used to obtain user information compatible with [OpenID UserInfo](https://connect2id.com/products/server/docs/api/userinfo).                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |                 |
+| `auth_style`                 | No       | Name of the [OAuth2 AuthStyle](https://pkg.go.dev/golang.org/x/oauth2#AuthStyle) to be used when ID token is requested from OAuth2 provider. It determines how `client_id` and `client_secret` are sent to Oauth2 provider. Available values are `AutoDetect`, `InParams` and `InHeader`.                                                                                                                                                                                                                                                                                                                  | `AutoDetect`    |
+| `scopes`                     | No       | List of comma- or space-separated OAuth2 scopes.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `user:email`    |
+| `empty_scopes`               | No       | Set to `true` to use an empty scope during authentication.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `false`         |
+| `allow_sign_up`              | No       | Controls Grafana user creation through the generic OAuth2 login. Only existing Grafana users can log in with generic OAuth if set to `false`.                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `true`          |
+| `auto_login`                 | No       | Set to `true` to enable users to bypass the login screen and automatically log in. This setting is ignored if you configure multiple auth providers to use auto-login.                                                                                                                                                                                                                                                                                                                                                                                                                                     | `false`         |
+| `id_token_attribute_name`    | No       | The name of the key used to extract the ID token from the returned OAuth2 token.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `id_token`      |
+| `login_attribute_path`       | No       | [JMESPath](http://jmespath.org/examples.html) expression to use for user login lookup from the user ID token. For more information on how user login is retrieved, refer to [Configure login]({{< relref "#configure-login" >}}).                                                                                                                                                                                                                                                                                                                                                                          |                 |
+| `name_attribute_path`        | No       | [JMESPath](http://jmespath.org/examples.html) expression to use for user name lookup from the user ID token. This name will be used as the user's display name. For more information on how user display name is retrieved, refer to [Configure display name]({{< relref "#configure-display-name" >}}).                                                                                                                                                                                                                                                                                                   |                 |
+| `email_attribute_path`       | No       | [JMESPath](http://jmespath.org/examples.html) expression to use for user email lookup from the user information. For more information on how user email is retrieved, refer to [Configure email address]({{< relref "#configure-email-address" >}}).                                                                                                                                                                                                                                                                                                                                                       |                 |
+| `email_attribute_name`       | No       | Name of the key to use for user email lookup within the `attributes` map of OAuth2 ID token. For more information on how user email is retrieved, refer to [Configure email address]({{< relref "#configure-email-address" >}}).                                                                                                                                                                                                                                                                                                                                                                           | `email:primary` |
+| `role_attribute_path`        | No       | [JMESPath](http://jmespath.org/examples.html) expression to use for Grafana role lookup. Grafana will first evaluate the expression using the OAuth2 ID token. If no role is found, the expression will be evaluated using the user information obtained from the UserInfo endpoint. The result of the evaluation should be a valid Grafana role (`Viewer`, `Editor`, `Admin` or `GrafanaAdmin`). For more information on user role mapping, refer to [Configure role mapping]({{< relref "#configure-role-mapping" >}}).                                                                                  |                 |
+| `role_attribute_strict`      | No       | Set to `true` to deny user login if the Grafana role cannot be extracted using `role_attribute_path`. For more information on user role mapping, refer to [Configure role mapping]({{< relref "#configure-role-mapping" >}}).                                                                                                                                                                                                                                                                                                                                                                              | `false`         |
+| `allow_assign_grafana_admin` | No       | Set to `true` to enable automatic sync of the Grafana server administrator role. If this option is set to `true` and the result of evaluating `role_attribute_path` for a user is `GrafanaAdmin`, Grafana grants the user the server administrator privileges and organization administrator role. If this option is set to `false` and the result of evaluating `role_attribute_path` for a user is `GrafanaAdmin`, Grafana grants the user only organization administrator role. For more information on user role mapping, refer to [Configure role mapping]({{< relref "#configure-role-mapping" >}}). | `false`         |
+| `skip_org_role_sync`         | No       | Set to `true` to stop automatically syncing user roles. This will allow you to set organization roles for your users from within Grafana manually.                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `false`         |
+| `groups_attribute_path`      | No       | [JMESPath](http://jmespath.org/examples.html) expression to use for user group lookup. Grafana will first evaluate the expression using the OAuth2 ID token. If no groups are found, the expression will be evaluated using the user information obtained from the UserInfo endpoint. The result of the evaluation should be a string array of groups.                                                                                                                                                                                                                                                     |                 |
+| `allowed_groups`             | No       | List of comma- or space-separated groups. The user should be a member of at least one group to log in. If you configure `allowed_groups`, you must also configure `groups_attribute_path`.                                                                                                                                                                                                                                                                                                                                                                                                                 |                 |
+| `allowed_organizations`      | No       | List of comma- or space-separated organizations. The user should be a member of at least one organization to log in.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |                 |
+| `allowed_domains`            | No       | List comma- or space-separated domains. The user should belong to at least one domain to log in.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |                 |
+| `team_ids`                   | No       | String list of team IDs. If set, the user must be a member of one of the given teams to log in. If you configure `team_ids`, you must also configure `teams_url` and `team_ids_attribute_path`.                                                                                                                                                                                                                                                                                                                                                                                                            |                 |
+| `team_ids_attribute_path`    | No       | The [JMESPath](http://jmespath.org/examples.html) expression to use for Grafana team ID lookup within the results returned by the `teams_url` endpoint.                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                 |
+| `teams_url`                  | No       | The URL used to query for team IDs. If not set, the default value is `/teams`. If you configure `teams_url`, you must also configure `team_ids_attribute_path`.                                                                                                                                                                                                                                                                                                                                                                                                                                            |                 |
+| `tls_skip_verify_insecure`   | No       | If set to `true`, the client accepts any certificate presented by the server and any host name in that certificate. _You should only use this for testing_, because this mode leaves SSL/TLS susceptible to man-in-the-middle attacks.                                                                                                                                                                                                                                                                                                                                                                     | `false`         |
+| `tls_client_cert`            | No       | The path to the certificate.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |                 |
+| `tls_client_key`             | No       | The path to the key.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |                 |
+| `tls_client_ca`              | No       | The path to the trusted certificate authority list.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |                 |
+| `use_pkce`                   | No       | Set to `true` to use [Proof Key for Code Exchange (PKCE)](https://datatracker.ietf.org/doc/html/rfc7636). Grafana uses the SHA256 based `S256` challenge method and a 128 bytes (base64url encoded) code verifier.                                                                                                                                                                                                                                                                                                                                                                                         | `false`         |
+| `use_refresh_token`          | No       | Set to `true` to use refresh token and check access token expiration.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `false`         |
+
 ## Examples of setting up generic OAuth2
 
 This section includes examples of setting up generic OAuth2 integration.
 
+### Set up OAuth2 with Descope
+
+To set up generic OAuth2 authentication with Descope, follow these steps:
+
+1. Create a Descope Project [here](https://app.descope.com/gettingStarted), and go through the Getting Started Wizard to configure your authentication. You can skip step if you already have Descope project set up.
+
+1. If you wish to use a flow besides `Sign Up or In`, go to the **IdP Applications** menu in the console, and select your IdP application. Then alter the **Flow Hosting URL** query parameter `?flow=sign-up-or-in` to change which flow id you wish to use.
+
+1. Click **Save**.
+
+1. Update the `[auth.generic_oauth]` section of the Grafana configuration file using the values from the **Settings** tab:
+
+   {{% admonition type="note" %}}
+   You can get your Client ID (Descope Project ID) under [Project Settings](https://app.descope.com/settings/project). Your Client Secret (Descope Access Key) can be generated under [Access Keys](https://app.descope.com/accesskeys).
+   {{% /admonition %}}
+
+   ```bash
+   [auth.generic_oauth]
+   enabled = true
+   allow_sign_up = true
+   auto_login = false
+   team_ids =
+   allowed_organizations =
+   name = Descope
+   client_id = <Descope Project ID>
+   client_secret = <Descope Access Key>
+   scopes = openid profile email descope.claims descope.custom_claims
+   auth_url = https://api.descope.com/oauth2/v1/authorize
+   token_url = https://api.descope.com/oauth2/v1/token
+   api_url = https://api.descope.com/oauth2/v1/userinfo
+   use_pkce = true
+   use_refresh_token = true
+   ```
+
 ### Set up OAuth2 with Auth0
 
 To set up generic OAuth2 authentication with Auth0, follow these steps:
@@ -420,3 +516,42 @@ To set up generic OAuth2 authentication with OneLogin, follow these steps:
    team_ids =
    allowed_organizations =
    ```
+
+### Set up OAuth2 with Dex
+
+To set up generic OAuth2 authentication with [Dex IdP](https://dexidp.io/), follow these
+steps:
+
+1. Add Grafana as a client in the Dex config YAML file:
+
+   ```yaml
+   staticClients:
+     - id: <client id>
+       name: Grafana
+       secret: <client secret>
+       redirectURIs:
+         - 'https://<grafana domain>/login/generic_oauth'
+   ```
+
+   {{% admonition type="note" %}}
+   Unlike many other OAuth2 providers, Dex doesn't provide `<client secret>`.
+   Instead, a secret can be generated with for example `openssl rand -hex 20`.
+   {{% /admonition %}}
+
+2. Update the `[auth.generic_oauth]` section of the Grafana configuration:
+
+   ```bash
+   [auth.generic_oauth]
+   name = Dex
+   enabled = true
+   client_id = <client id>
+   client_secret = <client secret>
+   scopes = openid email profile groups offline_access
+   auth_url = https://<dex base uri>/auth
+   token_url = https://<dex base uri>/token
+   api_url = https://<dex base uri>/userinfo
+   ```
+
+   `<dex base uri>` corresponds to the `issuer: ` configuration in Dex (e.g. the Dex
+   domain possibly including a path such as e.g. `/dex`). The `offline_access` scope is
+   needed when using [refresh tokens]({{< relref "#configure-a-refresh-token" >}}).
diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/github/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/github/index.md
index 9d92aaa5e9dfe..4ca721eaf6291 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/github/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/github/index.md
@@ -23,14 +23,63 @@ weight: 900
 
 This topic describes how to configure GitHub OAuth2 authentication.
 
+{{% admonition type="note" %}}
+If Users use the same email address in GitHub that they use with other authentication providers (such as Grafana.com), you need to do additional configuration to ensure that the users are matched correctly. Please refer to the [Using the same email address to login with different identity providers]({{< relref "../../configure-authentication#using-the-same-email-address-to-login-with-different-identity-providers" >}}) documentation for more information.
+{{% /admonition %}}
+
 ## Before you begin
 
-To follow this guide:
+Ensure you know how to create a GitHub OAuth app. Consult GitHub's documentation on [creating an OAuth app](https://docs.github.com/en/apps/oauth-apps/building-oauth-apps/creating-an-oauth-app) for more information.
+
+## Configure GitHub authentication client using the Grafana UI
+
+{{% admonition type="note" %}}
+Available in Public Preview in Grafana 10.4 behind the `ssoSettingsApi` feature toggle.
+{{% /admonition %}}
+
+As a Grafana Admin, you can configure GitHub OAuth2 client from within Grafana using the GitHub UI. To do this, navigate to **Administration > Authentication > GitHub** page and fill in the form. If you have a current configuration in the Grafana configuration file, the form will be pre-populated with those values. Otherwise the form will contain default values.
+
+After you have filled in the form, click **Save** . If the save was successful, Grafana will apply the new configurations.
+
+If you need to reset changes you made in the UI back to the default values, click **Reset**. After you have reset the changes, Grafana will apply the configuration from the Grafana configuration file (if there is any configuration) or the default values.
+
+{{% admonition type="note" %}}
+If you run Grafana in high availability mode, configuration changes may not get applied to all Grafana instances immediately. You may need to wait a few minutes for the configuration to propagate to all Grafana instances.
+{{% /admonition %}}
+
+Refer to [configuration options]({{< relref "#configuration-options" >}}) for more information.
+
+## Configure GitHub authentication client using the Terraform provider
+
+{{% admonition type="note" %}}
+Available in Public Preview in Grafana 10.4 behind the `ssoSettingsApi` feature toggle. Supported in the Terraform provider since v2.12.0.
+{{% /admonition %}}
+
+```terraform
+resource "grafana_sso_settings" "github_sso_settings" {
+  provider_name = "github"
+  oauth2_settings {
+    name                  = "Github"
+    client_id             = "YOUR_GITHUB_APP_CLIENT_ID"
+    client_secret         = "YOUR_GITHUB_APP_CLIENT_SECRET"
+    allow_sign_up         = true
+    auto_login            = false
+    scopes                = "user:email,read:org"
+    team_ids              = "150,300"
+    allowed_organizations = "[\"My Organization\", \"Octocats\"]"
+    allowed_domains       = "mycompany.com mycompany.org"
+    role_attribute_path   = "[login=='octocat'][0] && 'GrafanaAdmin' || 'Viewer'"
+  }
+}
+```
+
+Go to [Terraform Registry](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/sso_settings) for a complete reference on using the `grafana_sso_settings` resource.
 
-- Ensure that you have access to the [Grafana configuration file]({{< relref "../../../configure-grafana#configuration-file-location" >}}).
-- Ensure you know how to create a GitHub OAuth app. Consult GitHub's documentation on [creating an OAuth app](https://docs.github.com/en/apps/oauth-apps/building-oauth-apps/creating-an-oauth-app) for more information.
+## Configure GitHub authentication client using the Grafana configuration file
 
-## Steps
+Ensure that you have access to the [Grafana configuration file]({{< relref "../../../configure-grafana#configuration-file-location" >}}).
+
+### Configure GitHub authentication
 
 To configure GitHub authentication with Grafana, follow these steps:
 
@@ -56,36 +105,7 @@ To configure GitHub authentication with Grafana, follow these steps:
 
    You should now see a GitHub login button on the login page and be able to log in or sign up with your GitHub accounts.
 
-## Configuration options
-
-The table below describes all GitHub OAuth configuration options. Like any other Grafana configuration, you can apply these options as environment variables.
-
-| Setting                      | Required | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | Default                                       |
-| ---------------------------- | -------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------- |
-| `enabled`                    | No       | Whether GitHub OAuth authentication is allowed.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `false`                                       |
-| `name`                       | No       | Name used to refer to the GitHub authentication in the Grafana user interface.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `GitHub`                                      |
-| `icon`                       | No       | Icon used for GitHub authentication in the Grafana user interface.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `github`                                      |
-| `client_id`                  | Yes      | Client ID provided by your GitHub OAuth app.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |                                               |
-| `client_secret`              | Yes      | Client secret provided by your GitHub OAuth app.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |                                               |
-| `auth_url`                   | Yes      | Authorization endpoint of your GitHub OAuth provider.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `https://github.com/login/oauth/authorize`    |
-| `token_url`                  | Yes      | Endpoint used to obtain GitHub OAuth access token.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `https://github.com/login/oauth/access_token` |
-| `api_url`                    | Yes      | Endpoint used to obtain GitHub user information compatible with [OpenID UserInfo](https://connect2id.com/products/server/docs/api/userinfo).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `https://api.github.com/user`                 |
-| `scopes`                     | No       | List of comma- or space-separated GitHub OAuth scopes.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `user:email,read:org`                         |
-| `allow_sign_up`              | No       | Whether to allow new Grafana user creation through GitHub login. If set to `false`, then only existing Grafana users can log in with GitHub OAuth.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `true`                                        |
-| `auto_login`                 | No       | Set to `true` to enable users to bypass the login screen and automatically log in. This setting is ignored if you configure multiple auth providers to use auto-login.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `false`                                       |
-| `role_attribute_path`        | No       | [JMESPath](http://jmespath.org/examples.html) expression to use for Grafana role lookup. Grafana will first evaluate the expression using the user information obtained from the UserInfo endpoint. If no role is found, Grafana creates a JSON data with `groups` key that maps to GitHub teams obtained from GitHub's [`/api/user/teams`](https://docs.github.com/en/rest/teams/teams#list-teams-for-the-authenticated-user) endpoint, and evaluates the expression using this data. The result of the evaluation should be a valid Grafana role (`Viewer`, `Editor`, `Admin` or `GrafanaAdmin`). For more information on user role mapping, refer to [Configure role mapping]({{< relref "#configure-role-mapping" >}}). |                                               |
-| `role_attribute_strict`      | No       | Set to `true` to deny user login if the Grafana role cannot be extracted using `role_attribute_path`. For more information on user role mapping, refer to [Configure role mapping]({{< relref "#configure-role-mapping" >}}).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `false`                                       |
-| `allow_assign_grafana_admin` | No       | Set to `true` to enable automatic sync of the Grafana server administrator role. If this option is set to `true` and the result of evaluating `role_attribute_path` for a user is `GrafanaAdmin`, Grafana grants the user the server administrator privileges and organization administrator role. If this option is set to `false` and the result of evaluating `role_attribute_path` for a user is `GrafanaAdmin`, Grafana grants the user only organization administrator role. For more information on user role mapping, refer to [Configure role mapping]({{< relref "#configure-role-mapping" >}}).                                                                                                                  | `false`                                       |
-| `skip_org_role_sync`         | No       | Set to `true` to stop automatically syncing user roles.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `false`                                       |
-| `allowed_organizations`      | No       | List of comma- or space-separated organizations. User must be a member of at least one organization to log in.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |                                               |
-| `allowed_domains`            | No       | List of comma- or space-separated domains. User must belong to at least one domain to log in.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |                                               |
-| `team_ids`                   | No       | String list of team IDs. If set, user has to be a member of one of the given teams to log in.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |                                               |
-| `tls_skip_verify_insecure`   | No       | If set to `true`, the client accepts any certificate presented by the server and any host name in that certificate. _You should only use this for testing_, because this mode leaves SSL/TLS susceptible to man-in-the-middle attacks.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `false`                                       |
-| `tls_client_cert`            | No       | The path to the certificate.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |                                               |
-| `tls_client_key`             | No       | The path to the key.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |                                               |
-| `tls_client_ca`              | No       | The path to the trusted certificate authority list.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |                                               |
-
-## Configure role mapping
+### Configure role mapping
 
 Unless `skip_org_role_sync` option is enabled, the user's role will be set to the role retrieved from GitHub upon user login.
 
@@ -99,11 +119,11 @@ This setting denies user access if no role or an invalid role is returned.
 
 To ease configuration of a proper JMESPath expression, go to [JMESPath](http://jmespath.org/) to test and evaluate expressions with custom payloads.
 
-### Role mapping examples
+#### Role mapping examples
 
 This section includes examples of JMESPath expressions used for role mapping.
 
-#### Map roles using GitHub user information
+##### Map roles using GitHub user information
 
 In this example, the user with login `octocat` has been granted the `Admin` role.
 All other users are granted the `Viewer` role.
@@ -112,7 +132,7 @@ All other users are granted the `Viewer` role.
 role_attribute_path = [login=='octocat'][0] && 'Admin' || 'Viewer'
 ```
 
-#### Map roles using GitHub teams
+##### Map roles using GitHub teams
 
 In this example, the user from GitHub team `my-github-team` has been granted the `Editor` role.
 All other users are granted the `Viewer` role.
@@ -121,7 +141,7 @@ All other users are granted the `Viewer` role.
 role_attribute_path = contains(groups[*], '@my-github-organization/my-github-team') && 'Editor' || 'Viewer'
 ```
 
-### Map server administrator role
+#### Map server administrator role
 
 In this example, the user with login `octocat` has been granted the `Admin` organization role as well as the Grafana server admin role.
 All other users are granted the `Viewer` role.
@@ -130,23 +150,16 @@ All other users are granted the `Viewer` role.
 role_attribute_path = [login=='octocat'][0] && 'GrafanaAdmin' || 'Viewer'
 ```
 
-## Configure team synchronization
-
-> **Note:** Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise" >}}) and [Grafana Cloud](/docs/grafana-cloud/).
-
-By using Team Sync, you can map teams from your GitHub organization to teams within Grafana. This will automatically assign users to the appropriate teams.
-Teams for each user are synchronized when the user logs in.
+##### Map one role to all users
 
-GitHub teams can be referenced in two ways:
+In this example, all users will be assigned `Viewer` role regardless of the user information received from the identity provider.
 
-- `https://github.com/orgs/<org>/teams/<slug>`
-- `@<org>/<slug>`
-
-For example, `https://github.com/orgs/grafana/teams/developers` or `@grafana/developers`.
-
-To learn more about Team Sync, refer to [Configure team sync]({{< relref "../../configure-team-sync" >}}).
+```ini
+role_attribute_path = "'Viewer'"
+skip_org_role_sync = false
+```
 
-## Example of GitHub configuration in Grafana
+### Example of GitHub configuration in Grafana
 
 This section includes an example of GitHub configuration in the Grafana configuration file.
 
@@ -166,3 +179,50 @@ allowed_organizations = ["My Organization", "Octocats"]
 allowed_domains = mycompany.com mycompany.org
 role_attribute_path = [login=='octocat'][0] && 'GrafanaAdmin' || 'Viewer'
 ```
+
+## Configure team synchronization
+
+{{< admonition type="note" >}}
+Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise" >}}) and Grafana Cloud.
+{{< /admonition >}}
+
+By using Team Sync, you can map teams from your GitHub organization to teams within Grafana. This will automatically assign users to the appropriate teams.
+Teams for each user are synchronized when the user logs in.
+
+GitHub teams can be referenced in two ways:
+
+- `https://github.com/orgs/<org>/teams/<slug>`
+- `@<org>/<slug>`
+
+Examples: `https://github.com/orgs/grafana/teams/developers` or `@grafana/developers`.
+
+To learn more about Team Sync, refer to [Configure team sync]({{< relref "../../configure-team-sync" >}}).
+
+## Configuration options
+
+The table below describes all GitHub OAuth configuration options. Like any other Grafana configuration, you can apply these options as environment variables.
+
+| Setting                      | Required | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | Default                                       |
+| ---------------------------- | -------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------- |
+| `enabled`                    | No       | Whether GitHub OAuth authentication is allowed.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `false`                                       |
+| `name`                       | No       | Name used to refer to the GitHub authentication in the Grafana user interface.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `GitHub`                                      |
+| `icon`                       | No       | Icon used for GitHub authentication in the Grafana user interface.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `github`                                      |
+| `client_id`                  | Yes      | Client ID provided by your GitHub OAuth app.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |                                               |
+| `client_secret`              | Yes      | Client secret provided by your GitHub OAuth app.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |                                               |
+| `auth_url`                   | Yes      | Authorization endpoint of your GitHub OAuth provider.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `https://github.com/login/oauth/authorize`    |
+| `token_url`                  | Yes      | Endpoint used to obtain GitHub OAuth access token.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `https://github.com/login/oauth/access_token` |
+| `api_url`                    | Yes      | Endpoint used to obtain GitHub user information compatible with [OpenID UserInfo](https://connect2id.com/products/server/docs/api/userinfo).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `https://api.github.com/user`                 |
+| `scopes`                     | No       | List of comma- or space-separated GitHub OAuth scopes.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `user:email,read:org`                         |
+| `allow_sign_up`              | No       | Whether to allow new Grafana user creation through GitHub login. If set to `false`, then only existing Grafana users can log in with GitHub OAuth.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `true`                                        |
+| `auto_login`                 | No       | Set to `true` to enable users to bypass the login screen and automatically log in. This setting is ignored if you configure multiple auth providers to use auto-login.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `false`                                       |
+| `role_attribute_path`        | No       | [JMESPath](http://jmespath.org/examples.html) expression to use for Grafana role lookup. Grafana will first evaluate the expression using the user information obtained from the UserInfo endpoint. If no role is found, Grafana creates a JSON data with `groups` key that maps to GitHub teams obtained from GitHub's [`/api/user/teams`](https://docs.github.com/en/rest/teams/teams#list-teams-for-the-authenticated-user) endpoint, and evaluates the expression using this data. The result of the evaluation should be a valid Grafana role (`Viewer`, `Editor`, `Admin` or `GrafanaAdmin`). For more information on user role mapping, refer to [Configure role mapping]({{< relref "#configure-role-mapping" >}}). |                                               |
+| `role_attribute_strict`      | No       | Set to `true` to deny user login if the Grafana role cannot be extracted using `role_attribute_path`. For more information on user role mapping, refer to [Configure role mapping]({{< relref "#configure-role-mapping" >}}).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `false`                                       |
+| `allow_assign_grafana_admin` | No       | Set to `true` to enable automatic sync of the Grafana server administrator role. If this option is set to `true` and the result of evaluating `role_attribute_path` for a user is `GrafanaAdmin`, Grafana grants the user the server administrator privileges and organization administrator role. If this option is set to `false` and the result of evaluating `role_attribute_path` for a user is `GrafanaAdmin`, Grafana grants the user only organization administrator role. For more information on user role mapping, refer to [Configure role mapping]({{< relref "#configure-role-mapping" >}}).                                                                                                                  | `false`                                       |
+| `skip_org_role_sync`         | No       | Set to `true` to stop automatically syncing user roles.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `false`                                       |
+| `allowed_organizations`      | No       | List of comma- or space-separated organizations. User must be a member of at least one organization to log in.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |                                               |
+| `allowed_domains`            | No       | List of comma- or space-separated domains. User must belong to at least one domain to log in.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |                                               |
+| `team_ids`                   | No       | Integer list of team IDs. If set, user has to be a member of one of the given teams to log in.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |                                               |
+| `tls_skip_verify_insecure`   | No       | If set to `true`, the client accepts any certificate presented by the server and any host name in that certificate. _You should only use this for testing_, because this mode leaves SSL/TLS susceptible to man-in-the-middle attacks.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `false`                                       |
+| `tls_client_cert`            | No       | The path to the certificate.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |                                               |
+| `tls_client_key`             | No       | The path to the key.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |                                               |
+| `tls_client_ca`              | No       | The path to the trusted certificate authority list.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |                                               |
diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/gitlab/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/gitlab/index.md
index 3b0a69f3481f6..0541095257e7e 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/gitlab/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/gitlab/index.md
@@ -23,14 +23,65 @@ weight: 1000
 
 This topic describes how to configure GitLab OAuth2 authentication.
 
+{{% admonition type="note" %}}
+If Users use the same email address in GitLab that they use with other authentication providers (such as Grafana.com), you need to do additional configuration to ensure that the users are matched correctly. Please refer to the [Using the same email address to login with different identity providers]({{< relref "../../configure-authentication#using-the-same-email-address-to-login-with-different-identity-providers" >}}) documentation for more information.
+{{% /admonition %}}
+
 ## Before you begin
 
-To follow this guide:
+Ensure you know how to create a GitLab OAuth application. Consult GitLab's documentation on [creating a GitLab OAuth application](https://docs.gitlab.com/ee/integration/oauth_provider.html) for more information.
+
+## Configure GitLab authentication client using the Grafana UI
+
+{{% admonition type="note" %}}
+Available in Public Preview in Grafana 10.4 behind the `ssoSettingsApi` feature toggle.
+{{% /admonition %}}
+
+As a Grafana Admin, you can configure GitLab OAuth2 client from within Grafana using the GitLab UI. To do this, navigate to **Administration > Authentication > GitLab** page and fill in the form. If you have a current configuration in the Grafana configuration file then the form will be pre-populated with those values otherwise the form will contain default values.
+
+After you have filled in the form, click **Save** to save the configuration. If the save was successful, Grafana will apply the new configurations.
+
+If you need to reset changes you made in the UI back to the default values, click **Reset**. After you have reset the changes, Grafana will apply the configuration from the Grafana configuration file (if there is any configuration) or the default values.
+
+{{% admonition type="note" %}}
+If you run Grafana in high availability mode, configuration changes may not get applied to all Grafana instances immediately. You may need to wait a few minutes for the configuration to propagate to all Grafana instances.
+{{% /admonition %}}
+
+Refer to [configuration options]({{< relref "#configuration-options" >}}) for more information.
+
+## Configure GitLab authentication client using the Terraform provider
+
+{{% admonition type="note" %}}
+Available in Public Preview in Grafana 10.4 behind the `ssoSettingsApi` feature toggle. Supported in the Terraform provider since v2.12.0.
+{{% /admonition %}}
+
+```terraform
+resource "grafana_sso_settings" "gitlab_sso_settings" {
+  provider_name = "gitlab"
+  oauth2_settings {
+    name                  = "Gitlab"
+    client_id             = "YOUR_GITLAB_APPLICATION_ID"
+    client_secret         = "YOUR_GITLAB_APPLICATION_SECRET"
+    allow_sign_up         = true
+    auto_login            = false
+    scopes                = "openid email profile"
+    allowed_domains       = "mycompany.com mycompany.org"
+    role_attribute_path   = "contains(groups[*], 'example-group') && 'Editor' || 'Viewer'"
+    role_attribute_strict = false
+    allowed_groups        = "[\"admins\", \"software engineers\", \"developers/frontend\"]"
+    use_pkce              = true
+    use_refresh_token     = true
+  }
+}
+```
+
+Go to [Terraform Registry](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/sso_settings) for a complete reference on using the `grafana_sso_settings` resource.
+
+## Configure GitLab authentication client using the Grafana configuration file
 
-- Ensure that you have access to the [Grafana configuration file]({{< relref "../../../configure-grafana#configuration-file-location" >}}).
-- Ensure you know how to create a GitLab OAuth application. Consult GitLab's documentation on [creating a GitLab OAuth application](https://docs.gitlab.com/ee/integration/oauth_provider.html) for more information.
+Ensure that you have access to the [Grafana configuration file]({{< relref "../../../configure-grafana#configuration-file-location" >}}).
 
-## Steps
+### Steps
 
 To configure GitLab authentication with Grafana, follow these steps:
 
@@ -55,9 +106,7 @@ To configure GitLab authentication with Grafana, follow these steps:
 
 1. Optional: [Configure a refresh token]({{< relref "#configure-a-refresh-token" >}}):
 
-   a. Enable `accessTokenExpirationCheck` feature toggle.
-
-   b. Set `use_refresh_token` to `true` in `[auth.gitlab]` section in Grafana configuration file.
+   a. Set `use_refresh_token` to `true` in `[auth.gitlab]` section in Grafana configuration file.
 
 1. [Configure role mapping]({{< relref "#configure-role-mapping" >}}).
 1. Optional: [Configure team synchronization]({{< relref "#configure-team-synchronization" >}}).
@@ -65,51 +114,21 @@ To configure GitLab authentication with Grafana, follow these steps:
 
    You should now see a GitLab login button on the login page and be able to log in or sign up with your GitLab accounts.
 
-## Configuration options
-
-The table below describes all GitLab OAuth configuration options. Like any other Grafana configuration, you can apply these options as environment variables.
-
-| Setting                      | Required | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | Default                              |
-| ---------------------------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------ |
-| `enabled`                    | Yes      | Whether GitLab OAuth authentication is allowed.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `false`                              |
-| `client_id`                  | Yes      | Client ID provided by your GitLab OAuth app.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |                                      |
-| `client_secret`              | Yes      | Client secret provided by your GitLab OAuth app.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |                                      |
-| `auth_url`                   | Yes      | Authorization endpoint of your GitLab OAuth provider. If you use your own instance of GitLab instead of gitlab.com, adjust `auth_url` by replacing the `gitlab.com` hostname with your own.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `https://gitlab.com/oauth/authorize` |
-| `token_url`                  | Yes      | Endpoint used to obtain GitLab OAuth access token. If you use your own instance of GitLab instead of gitlab.com, adjust `token_url` by replacing the `gitlab.com` hostname with your own.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `https://gitlab.com/oauth/token`     |
-| `api_url`                    | No       | Grafana uses `<api_url>/user` endpoint to obtain GitLab user information compatible with [OpenID UserInfo](https://connect2id.com/products/server/docs/api/userinfo).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `https://gitlab.com/api/v4`          |
-| `name`                       | No       | Name used to refer to the GitLab authentication in the Grafana user interface.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `GitLab`                             |
-| `icon`                       | No       | Icon used for GitLab authentication in the Grafana user interface.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `gitlab`                             |
-| `scopes`                     | No       | List of comma or space-separated GitLab OAuth scopes.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `openid email profile`               |
-| `allow_sign_up`              | No       | Whether to allow new Grafana user creation through GitLab login. If set to `false`, then only existing Grafana users can log in with GitLab OAuth.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `true`                               |
-| `auto_login`                 | No       | Set to `true` to enable users to bypass the login screen and automatically log in. This setting is ignored if you configure multiple auth providers to use auto-login.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `false`                              |
-| `role_attribute_path`        | No       | [JMESPath](http://jmespath.org/examples.html) expression to use for Grafana role lookup. Grafana will first evaluate the expression using the GitLab OAuth token. If no role is found, Grafana creates a JSON data with `groups` key that maps to groups obtained from GitLab's `/oauth/userinfo` endpoint, and evaluates the expression using this data. Finally, if a valid role is still not found, the expression is evaluated against the user information retrieved from `api_url/users` endpoint and groups retrieved from `api_url/groups` endpoint. The result of the evaluation should be a valid Grafana role (`Viewer`, `Editor`, `Admin` or `GrafanaAdmin`). For more information on user role mapping, refer to [Configure role mapping]({{< relref "#configure-role-mapping" >}}). |                                      |
-| `role_attribute_strict`      | No       | Set to `true` to deny user login if the Grafana role cannot be extracted using `role_attribute_path`. For more information on user role mapping, refer to [Configure role mapping]({{< relref "#configure-role-mapping" >}}).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `false`                              |
-| `allow_assign_grafana_admin` | No       | Set to `true` to enable automatic sync of the Grafana server administrator role. If this option is set to `true` and the result of evaluating `role_attribute_path` for a user is `GrafanaAdmin`, Grafana grants the user the server administrator privileges and organization administrator role. If this option is set to `false` and the result of evaluating `role_attribute_path` for a user is `GrafanaAdmin`, Grafana grants the user only organization administrator role. For more information on user role mapping, refer to [Configure role mapping]({{< relref "#configure-role-mapping" >}}).                                                                                                                                                                                        | `false`                              |
-| `skip_org_role_sync`         | No       | Set to `true` to stop automatically syncing user roles.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `false`                              |
-| `allowed_domains`            | No       | List of comma or space-separated domains. User must belong to at least one domain to log in.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |                                      |
-| `allowed_groups`             | No       | List of comma or space-separated groups. The user should be a member of at least one group to log in.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |                                      |
-| `tls_skip_verify_insecure`   | No       | If set to `true`, the client accepts any certificate presented by the server and any host name in that certificate. _You should only use this for testing_, because this mode leaves SSL/TLS susceptible to man-in-the-middle attacks.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `false`                              |
-| `tls_client_cert`            | No       | The path to the certificate.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |                                      |
-| `tls_client_key`             | No       | The path to the key.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |                                      |
-| `tls_client_ca`              | No       | The path to the trusted certificate authority list.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |                                      |
-| `use_pkce`                   | No       | Set to `true` to use [Proof Key for Code Exchange (PKCE)](https://datatracker.ietf.org/doc/html/rfc7636). Grafana uses the SHA256 based `S256` challenge method and a 128 bytes (base64url encoded) code verifier.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `true`                               |
-| `use_refresh_token`          | No       | Set to `true` to use refresh token and check access token expiration. The `accessTokenExpirationCheck` feature toggle should also be enabled to use refresh token.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `true`                               |
-
 ### Configure a refresh token
 
 > Available in Grafana v9.3 and later versions.
 
-> **Note:** This feature is behind the `accessTokenExpirationCheck` feature toggle.
-
 When a user logs in using an OAuth provider, Grafana verifies that the access token has not expired. When an access token expires, Grafana uses the provided refresh token (if any exists) to obtain a new access token.
 
 Grafana uses a refresh token to obtain a new access token without requiring the user to log in again. If a refresh token doesn't exist, Grafana logs the user out of the system after the access token has expired.
 
 By default, GitLab provides a refresh token.
 
-Refresh token fetching and access token expiration check is enabled by default for the GitLab provider since Grafana v10.1.0 if the `accessTokenExpirationCheck` feature toggle is enabled. If you would like to disable access token expiration check then set the `use_refresh_token` configuration value to `false`.
+Refresh token fetching and access token expiration check is enabled by default for the GitLab provider since Grafana v10.1.0. If you would like to disable access token expiration check then set the `use_refresh_token` configuration value to `false`.
 
-> **Note:** The `accessTokenExpirationCheck` feature toggle will be removed in Grafana v10.2.0 and the `use_refresh_token` configuration value will be used instead for configuring refresh token fetching and access token expiration check.
+{{% admonition type="note" %}}
+The `accessTokenExpirationCheck` feature toggle has been removed in Grafana v10.3.0 and the `use_refresh_token` configuration value will be used instead for configuring refresh token fetching and access token expiration check.
+{{% /admonition %}}
 
 ### Configure allowed groups
 
@@ -121,7 +140,7 @@ GitLab's groups are referenced by the group name. For example, `developers`. To
 Note that in GitLab, the group or subgroup name does not always match its display name, especially if the display name contains spaces or special characters.
 Make sure you always use the group or subgroup name as it appears in the URL of the group or subgroup.
 
-## Configure role mapping
+### Configure role mapping
 
 Unless `skip_org_role_sync` option is enabled, the user's role will be set to the role retrieved from GitLab upon user login.
 
@@ -166,20 +185,16 @@ All other users are granted the `Viewer` role.
 role_attribute_path = email=='admin@company.com' && 'GrafanaAdmin' || 'Viewer'
 ```
 
-## Configure team synchronization
-
-> **Note:** Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise" >}}) and [Grafana Cloud](/docs/grafana-cloud/).
-
-By using Team Sync, you can map GitLab groups to teams within Grafana. This will automatically assign users to the appropriate teams.
-Teams for each user are synchronized when the user logs in.
+#### Map one role to all users
 
-GitLab groups are referenced by the group name. For example, `developers`. To reference a subgroup `frontend`, use `developers/frontend`.
-Note that in GitLab, the group or subgroup name does not always match its display name, especially if the display name contains spaces or special characters.
-Make sure you always use the group or subgroup name as it appears in the URL of the group or subgroup.
+In this example, all users will be assigned `Viewer` role regardless of the user information received from the identity provider.
 
-To learn more about Team Sync, refer to [Configure team sync]({{< relref "../../configure-team-sync" >}}).
+```ini
+role_attribute_path = "'Viewer'"
+skip_org_role_sync = false
+```
 
-## Example of GitLab configuration in Grafana
+### Example of GitLab configuration in Grafana
 
 This section includes an example of GitLab configuration in the Grafana configuration file.
 
@@ -203,3 +218,46 @@ tls_skip_verify_insecure = false
 use_pkce = true
 use_refresh_token = true
 ```
+
+## Configure team synchronization
+
+> **Note:** Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise" >}}) and [Grafana Cloud](/docs/grafana-cloud/).
+
+By using Team Sync, you can map GitLab groups to teams within Grafana. This will automatically assign users to the appropriate teams.
+Teams for each user are synchronized when the user logs in.
+
+GitLab groups are referenced by the group name. For example, `developers`. To reference a subgroup `frontend`, use `developers/frontend`.
+Note that in GitLab, the group or subgroup name does not always match its display name, especially if the display name contains spaces or special characters.
+Make sure you always use the group or subgroup name as it appears in the URL of the group or subgroup.
+
+To learn more about Team Sync, refer to [Configure team sync]({{< relref "../../configure-team-sync" >}}).
+
+## Configuration options
+
+The table below describes all GitLab OAuth configuration options. Like any other Grafana configuration, you can apply these options as environment variables.
+
+| Setting                      | Required | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | Default                              |
+| ---------------------------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------ |
+| `enabled`                    | Yes      | Whether GitLab OAuth authentication is allowed.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `false`                              |
+| `client_id`                  | Yes      | Client ID provided by your GitLab OAuth app.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |                                      |
+| `client_secret`              | Yes      | Client secret provided by your GitLab OAuth app.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |                                      |
+| `auth_url`                   | Yes      | Authorization endpoint of your GitLab OAuth provider. If you use your own instance of GitLab instead of gitlab.com, adjust `auth_url` by replacing the `gitlab.com` hostname with your own.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `https://gitlab.com/oauth/authorize` |
+| `token_url`                  | Yes      | Endpoint used to obtain GitLab OAuth access token. If you use your own instance of GitLab instead of gitlab.com, adjust `token_url` by replacing the `gitlab.com` hostname with your own.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `https://gitlab.com/oauth/token`     |
+| `api_url`                    | No       | Grafana uses `<api_url>/user` endpoint to obtain GitLab user information compatible with [OpenID UserInfo](https://connect2id.com/products/server/docs/api/userinfo).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `https://gitlab.com/api/v4`          |
+| `name`                       | No       | Name used to refer to the GitLab authentication in the Grafana user interface.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `GitLab`                             |
+| `icon`                       | No       | Icon used for GitLab authentication in the Grafana user interface.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `gitlab`                             |
+| `scopes`                     | No       | List of comma or space-separated GitLab OAuth scopes.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `openid email profile`               |
+| `allow_sign_up`              | No       | Whether to allow new Grafana user creation through GitLab login. If set to `false`, then only existing Grafana users can log in with GitLab OAuth.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `true`                               |
+| `auto_login`                 | No       | Set to `true` to enable users to bypass the login screen and automatically log in. This setting is ignored if you configure multiple auth providers to use auto-login.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `false`                              |
+| `role_attribute_path`        | No       | [JMESPath](http://jmespath.org/examples.html) expression to use for Grafana role lookup. Grafana will first evaluate the expression using the GitLab OAuth token. If no role is found, Grafana creates a JSON data with `groups` key that maps to groups obtained from GitLab's `/oauth/userinfo` endpoint, and evaluates the expression using this data. Finally, if a valid role is still not found, the expression is evaluated against the user information retrieved from `api_url/users` endpoint and groups retrieved from `api_url/groups` endpoint. The result of the evaluation should be a valid Grafana role (`Viewer`, `Editor`, `Admin` or `GrafanaAdmin`). For more information on user role mapping, refer to [Configure role mapping]({{< relref "#configure-role-mapping" >}}). |                                      |
+| `role_attribute_strict`      | No       | Set to `true` to deny user login if the Grafana role cannot be extracted using `role_attribute_path`. For more information on user role mapping, refer to [Configure role mapping]({{< relref "#configure-role-mapping" >}}).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `false`                              |
+| `allow_assign_grafana_admin` | No       | Set to `true` to enable automatic sync of the Grafana server administrator role. If this option is set to `true` and the result of evaluating `role_attribute_path` for a user is `GrafanaAdmin`, Grafana grants the user the server administrator privileges and organization administrator role. If this option is set to `false` and the result of evaluating `role_attribute_path` for a user is `GrafanaAdmin`, Grafana grants the user only organization administrator role. For more information on user role mapping, refer to [Configure role mapping]({{< relref "#configure-role-mapping" >}}).                                                                                                                                                                                        | `false`                              |
+| `skip_org_role_sync`         | No       | Set to `true` to stop automatically syncing user roles.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `false`                              |
+| `allowed_domains`            | No       | List of comma or space-separated domains. User must belong to at least one domain to log in.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |                                      |
+| `allowed_groups`             | No       | List of comma or space-separated groups. The user should be a member of at least one group to log in.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |                                      |
+| `tls_skip_verify_insecure`   | No       | If set to `true`, the client accepts any certificate presented by the server and any host name in that certificate. _You should only use this for testing_, because this mode leaves SSL/TLS susceptible to man-in-the-middle attacks.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `false`                              |
+| `tls_client_cert`            | No       | The path to the certificate.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |                                      |
+| `tls_client_key`             | No       | The path to the key.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |                                      |
+| `tls_client_ca`              | No       | The path to the trusted certificate authority list.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |                                      |
+| `use_pkce`                   | No       | Set to `true` to use [Proof Key for Code Exchange (PKCE)](https://datatracker.ietf.org/doc/html/rfc7636). Grafana uses the SHA256 based `S256` challenge method and a 128 bytes (base64url encoded) code verifier.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `true`                               |
+| `use_refresh_token`          | No       | Set to `true` to use refresh token and check access token expiration. The `accessTokenExpirationCheck` feature toggle should also be enabled to use refresh token.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `true`                               |
diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/google/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/google/index.md
index 2c0b586c523d1..eca7ab7253acd 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/google/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/google/index.md
@@ -16,6 +16,10 @@ weight: 1100
 
 To enable Google OAuth2 you must register your application with Google. Google will generate a client ID and secret key for you to use.
 
+{{% admonition type="note" %}}
+If Users use the same email address in Google that they use with other authentication providers (such as Grafana.com), you need to do additional configuration to ensure that the users are matched correctly. Please refer to the [Using the same email address to login with different identity providers]({{< relref "../../configure-authentication#using-the-same-email-address-to-login-with-different-identity-providers" >}}) documentation for more information.
+{{% /admonition %}}
+
 ## Create Google OAuth keys
 
 First, you need to create a Google OAuth Client:
@@ -31,7 +35,52 @@ First, you need to create a Google OAuth Client:
 1. Click Create
 1. Copy the Client ID and Client Secret from the 'OAuth Client' modal
 
-## Enable Google OAuth in Grafana
+## Configure Google authentication client using the Grafana UI
+
+{{% admonition type="note" %}}
+Available in Public Preview in Grafana 10.4 behind the `ssoSettingsApi` feature toggle.
+{{% /admonition %}}
+
+As a Grafana Admin, you can configure Google OAuth2 client from within Grafana using the Google UI. To do this, navigate to **Administration > Authentication > Google** page and fill in the form. If you have a current configuration in the Grafana configuration file then the form will be pre-populated with those values otherwise the form will contain default values.
+
+After you have filled in the form, click **Save**. If the save was successful, Grafana will apply the new configurations.
+
+If you need to reset changes made in the UI back to the default values, click **Reset**. After you have reset the changes, Grafana will apply the configuration from the Grafana configuration file (if there is any configuration) or the default values.
+
+{{% admonition type="note" %}}
+If you run Grafana in high availability mode, configuration changes may not get applied to all Grafana instances immediately. You may need to wait a few minutes for the configuration to propagate to all Grafana instances.
+{{% /admonition %}}
+
+## Configure Google authentication client using the Terraform provider
+
+{{% admonition type="note" %}}
+Available in Public Preview in Grafana 10.4 behind the `ssoSettingsApi` feature toggle. Supported in the Terraform provider since v2.12.0.
+{{% /admonition %}}
+
+```terraform
+resource "grafana_sso_settings" "google_sso_settings" {
+  provider_name = "google"
+  oauth2_settings {
+    name            = "Google"
+    client_id       = "CLIENT_ID"
+    client_secret   = "CLIENT_SECRET"
+    allow_sign_up   = true
+    auto_login      = false
+    scopes          = "openid email profile"
+    allowed_domains = "mycompany.com mycompany.org"
+    hosted_domain   = "mycompany.com"
+    use_pkce        = true
+  }
+}
+```
+
+Go to [Terraform Registry](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/sso_settings) for a complete reference on using the `grafana_sso_settings` resource.
+
+## Configure Google authentication client using the Grafana configuration file
+
+Ensure that you have access to the [Grafana configuration file]({{< relref "../../../configure-grafana#configuration-file-location" >}}).
+
+### Enable Google OAuth in Grafana
 
 Specify the Client ID and Secret in the [Grafana configuration file]({{< relref "../../../configure-grafana#configuration-file-location" >}}). For example:
 
@@ -66,7 +115,15 @@ automatically signed up.
 You may specify a domain to be passed as `hd` query parameter accepted by Google's
 OAuth 2.0 authentication API. Refer to Google's OAuth [documentation](https://developers.google.com/identity/openid-connect/openid-connect#hd-param).
 
-### PKCE
+{{% admonition type="note" %}}
+Since Grafana 10.3.0, the `hd` parameter retrieved from Google ID token is also used to determine the user's hosted domain. The Google Oauth `allowed_domains` configuration option is used to restrict access to users from a specific domain. If the `allowed_domains` configuration option is set, the `hd` parameter from the Google ID token must match the `allowed_domains` configuration option. If the `hd` parameter from the Google ID token does not match the `allowed_domains` configuration option, the user is denied access.
+
+When an account does not belong to a google workspace, the hd claim will not be available.
+
+This validation is enabled by default. To disable this validation, set the `validate_hd` configuration option to `false`. The `allowed_domains` configuration option will use the email claim to validate the domain.
+{{% /admonition %}}
+
+#### PKCE
 
 IETF's [RFC 7636](https://datatracker.ietf.org/doc/html/rfc7636)
 introduces "proof key for code exchange" (PKCE) which provides
@@ -75,23 +132,23 @@ interception attacks. PKCE will be required in [OAuth 2.1](https://datatracker.i
 
 > You can disable PKCE in Grafana by setting `use_pkce` to `false` in the`[auth.google]` section.
 
-### Configure refresh token
+#### Configure refresh token
 
 > Available in Grafana v9.3 and later versions.
 
-> **Note:** This feature is behind the `accessTokenExpirationCheck` feature toggle.
-
 When a user logs in using an OAuth provider, Grafana verifies that the access token has not expired. When an access token expires, Grafana uses the provided refresh token (if any exists) to obtain a new access token.
 
 Grafana uses a refresh token to obtain a new access token without requiring the user to log in again. If a refresh token doesn't exist, Grafana logs the user out of the system after the access token has expired.
 
 By default, Grafana includes the `access_type=offline` parameter in the authorization request to request a refresh token.
 
-Refresh token fetching and access token expiration check is enabled by default for the Google provider since Grafana v10.1.0 if the `accessTokenExpirationCheck` feature toggle is enabled. If you would like to disable access token expiration check then set the `use_refresh_token` configuration value to `false`.
+Refresh token fetching and access token expiration check is enabled by default for the Google provider since Grafana v10.1.0. If you would like to disable access token expiration check then set the `use_refresh_token` configuration value to `false`.
 
-> **Note:** The `accessTokenExpirationCheck` feature toggle will be removed in Grafana v10.2.0 and the `use_refresh_token` configuration value will be used instead for configuring refresh token fetching and access token expiration check.
+{{% admonition type="note" %}}
+The `accessTokenExpirationCheck` feature toggle has been removed in Grafana v10.3.0 and the `use_refresh_token` configuration value will be used instead for configuring refresh token fetching and access token expiration check.
+{{% /admonition %}}
 
-### Configure automatic login
+#### Configure automatic login
 
 Set `auto_login` option to true to attempt login automatically, skipping the login screen.
 This setting is ignored if multiple auth providers are configured to use auto login.
@@ -123,7 +180,7 @@ With team sync, you can easily add users to teams by utilizing their Google grou
 
 To learn more about Team Sync, refer to [Configure Team Sync]({{< relref "../../configure-team-sync" >}}).
 
-### Configure allowed groups
+#### Configure allowed groups
 
 > Available in Grafana v10.2.0 and later versions.
 
@@ -134,7 +191,7 @@ Google groups are referenced by the group email key. For example, `developers@go
 
 > Note: Add the `https://www.googleapis.com/auth/cloud-identity.groups.readonly` scope to your Grafana `[auth.google]` scopes configuration to retrieve groups
 
-## Configure role mapping
+#### Configure role mapping
 
 > Available in Grafana v10.2.0 and later versions.
 
@@ -151,11 +208,11 @@ To ease configuration of a proper JMESPath expression, go to [JMESPath](http://j
 
 > By default skip_org_role_sync is enabled. skip_org_role_sync will default to false in Grafana v10.3.0 and later versions.
 
-### Role mapping examples
+##### Role mapping examples
 
 This section includes examples of JMESPath expressions used for role mapping.
 
-#### Map roles using user information from OAuth token
+###### Map roles using user information from OAuth token
 
 In this example, the user with email `admin@company.com` has been granted the `Admin` role.
 All other users are granted the `Viewer` role.
@@ -165,7 +222,7 @@ role_attribute_path = email=='admin@company.com' && 'Admin' || 'Viewer'
 skip_org_role_sync = false
 ```
 
-#### Map roles using groups
+###### Map roles using groups
 
 In this example, the user from Google group 'example-group@google.com' have been granted the `Editor` role.
 All other users are granted the `Viewer` role.
@@ -177,7 +234,7 @@ skip_org_role_sync = false
 
 > Note: Add the `https://www.googleapis.com/auth/cloud-identity.groups.readonly` scope to your Grafana `[auth.google]` scopes configuration to retrieve groups
 
-#### Map server administrator role
+###### Map server administrator role
 
 In this example, the user with email `admin@company.com` has been granted the `Admin` organization role as well as the Grafana server admin role.
 All other users are granted the `Viewer` role.
@@ -187,3 +244,12 @@ allow_assign_grafana_admin = true
 skip_org_role_sync = false
 role_attribute_path = email=='admin@company.com' && 'GrafanaAdmin' || 'Viewer'
 ```
+
+###### Map one role to all users
+
+In this example, all users will be assigned `Viewer` role regardless of the user information received from the identity provider.
+
+```ini
+role_attribute_path = "'Viewer'"
+skip_org_role_sync = false
+```
diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/grafana-cloud/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/grafana-cloud/index.md
new file mode 100644
index 0000000000000..c2b2e25eb0bed
--- /dev/null
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/grafana-cloud/index.md
@@ -0,0 +1,60 @@
+---
+aliases:
+  - ../../../auth/grafana-cloud/
+description: Grafana Cloud Authentication
+labels:
+  products:
+    - cloud
+menuTitle: Grafana Cloud OAuth2
+title: Configure Grafana Cloud authentication
+weight: 1200
+---
+
+# Configure Grafana Cloud authentication
+
+To enable Grafana Cloud as the Identity Provider for a Grafana instance, generate a client ID and client secret and apply the configuration to Grafana.
+
+## Create Grafana Cloud OAuth Client Credentials
+
+To use Grafana Cloud authentication:
+
+1. Log in to [Grafana Cloud](/).
+1. To create an OAuth client, locate your organization and click **OAuth Clients**.
+1. Click **Add OAuth Client Application**.
+1. Add the name and URL of your running Grafana instance.
+1. Click **Add OAuth Client**.
+1. Copy the client ID and client secret or the configuration that has been generated.
+
+The following snippet shows an example configuration:
+
+```ini
+[auth.grafana_com]
+enabled = true
+allow_sign_up = true
+auto_login = false
+client_id = 450bc21c10dc2194879d
+client_secret = eyJ0Ijoib2F1dGgyYyIhlmlkIjoiNzUwYmMzM2MxMGRjMjE6NDh3OWQiLCJ2IjoiZmI1YzVlYmIwYzFmN2ZhYzZmNjIwOGI1NmVkYTRlNWYxMzgwM2NkMiJ9
+scopes = user:email
+allowed_organizations = sampleorganization
+enabled = true
+```
+
+### Configure automatic login
+
+Set `auto_login` option to true to attempt login automatically, skipping the login screen.
+This setting is ignored if multiple auth providers are configured to use auto login.
+
+```
+auto_login = true
+```
+
+## Skip organization role sync
+
+If a user signs in with their Grafana Cloud credentials, their assigned org role overrides the role defined in the Grafana instance. To prevent Grafana Cloud roles from synchronizing, set `skip_org_role_sync` to `true`. This is useful if you want to manage the organization roles for your users from within Grafana.
+
+```ini
+[auth.grafana_com]
+# ..
+# prevents the sync of org roles from Grafana.com
+skip_org_role_sync = true
+```
diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/grafana-com/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/grafana-com/index.md
deleted file mode 100644
index ffed7b045e84b..0000000000000
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/grafana-com/index.md
+++ /dev/null
@@ -1,60 +0,0 @@
----
-aliases:
-  - ../../../auth/grafana-com/
-description: Grafana Com Authentication
-labels:
-  products:
-    - cloud
-menuTitle: Grafana Com OAuth2
-title: Configure Grafana Com authentication
-weight: 1200
----
-
-# Configure Grafana Com authentication
-
-To enable GrafanaCom as your authentication provider, you configure it to generate a client ID and a secret key.
-
-## Create GrafanaCom OAuth keys
-
-To use GrafanaCom authentication:
-
-1. Log in to [GrafanaCom](/).
-1. To create an OAuth client, locate your organization and click **OAuth Clients**.
-1. Click **Add OAuth Client Application**.
-1. Add the name and URL of your running Grafana instance.
-1. Click **Add OAuth Client**.
-1. Copy the client ID and secret key or the configuration that has been generated.
-
-The following snippet shows an example configuration:
-
-```ini
-[auth.grafana_com]
-enabled = true
-allow_sign_up = true
-auto_login = false
-client_id = 450bc21c10dc2194879d
-client_secret = eyJ0Ijoib2F1dGgyYyIhlmlkIjoiNzUwYmMzM2MxMGRjMjE6NDh3OWQiLCJ2IjoiZmI1YzVlYmIwYzFmN2ZhYzZmNjIwOGI1NmVkYTRlNWYxMzgwM2NkMiJ9
-scopes = user:email
-allowed_organizations = sampleorganization
-enabled = true
-```
-
-### Configure automatic login
-
-Set `auto_login` option to true to attempt login automatically, skipping the login screen.
-This setting is ignored if multiple auth providers are configured to use auto login.
-
-```
-auto_login = true
-```
-
-## Skip organization role sync
-
-To prevent the sync of org roles from Grafana.com, set `skip_org_role_sync` to `true`. This is useful if you want to manage the organization roles for your users from within Grafana.
-
-```ini
-[auth.grafana_com]
-# ..
-# prevents the sync of org roles from Grafana.com
-skip_org_role_sync = true
-```
diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/grafana/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/grafana/index.md
index e1d2bc0420e05..2b912ce8f8d85 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/grafana/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/grafana/index.md
@@ -60,6 +60,25 @@ api_key_max_seconds_to_live = -1
 
 You can make Grafana accessible without any login required by enabling anonymous access in the configuration file. For more information, refer to [Anonymous authentication]({{< relref "../../configure-authentication#anonymous-authentication" >}}).
 
+#### Anonymous devices
+
+The anonymous devices feature enhances the management and monitoring of anonymous access within your Grafana instance. This feature is part of ongoing efforts to provide more control and transparency over anonymous usage.
+
+Users can now view anonymous usage statistics, including the count of devices and users over the last 30 days.
+
+- Go to **Administration -> Users** to access the anonymous devices tab.
+- A new stat for the usage stats page -> Usage & Stats page shows the active anonymous devices last 30 days.
+
+The number of anonymous devices is not limited by default. The configuration option `device_limit` allows you to enforce a limit on the number of anonymous devices. This enables you to have greater control over the usage within your Grafana instance and keep the usage within the limits of your environment. Once the limit is reached, any new devices that try to access Grafana will be denied access.
+
+#### Anonymous users
+
+{{< admonition type="note" >}}
+Anonymous users are charged as active users in Grafana Enterprise
+{{< /admonition >}}
+
+#### Configuration
+
 Example:
 
 ```bash
@@ -74,6 +93,9 @@ org_role = Viewer
 
 # Hide the Grafana version text from the footer and help tooltip for unauthenticated users (default: false)
 hide_version = true
+
+# Setting this limits the number of anonymous devices in your instance. Any new anonymous devices added after the limit has been reached will be denied access.
+device_limit =
 ```
 
 If you change your organization name in the Grafana UI this setting needs to be updated to match the new name.
@@ -90,6 +112,27 @@ To disable basic auth:
 enabled = false
 ```
 
+### Strong password policy
+
+By default, the password policy for all basic auth users is set to a minimum of four characters. You can enable a stronger password policy with the `password_policy` configuration option.
+
+With the `password_policy` option enabled, new and updated passwords must meet the following criteria:
+
+- At least 12 characters
+- At least one uppercase letter
+- At least one lowercase letter
+- At least one number
+- At least one special character
+
+```bash
+[auth.basic]
+password_policy = true
+```
+
+{{% admonition type="note" %}}
+Existing passwords that don't comply with the new password policy will not be impacted until the user updates their password.
+{{% /admonition %}}
+
 ### Disable login form
 
 You can hide the Grafana login form using the below configuration settings.
@@ -121,9 +164,12 @@ disable_signout_menu = true
 
 ### URL redirect after signing out
 
-URL to redirect the user to after signing out from Grafana. This can for example be used to enable signout from oauth provider.
+The URL to redirect the user to after signing out from Grafana can be configured under `[auth]` or under a specific OAuth provider section (for example, `[auth.generic_oauth]`). The URL configured under a specific OAuth provider section takes precedence over the URL configured in `[auth]` section. This can, for example, enable signout from the OAuth provider.
 
 ```bash
+[auth.generic_oauth]
+signout_redirect_url =
+
 [auth]
 signout_redirect_url =
 ```
diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/jwt/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/jwt/index.md
index b182ba873e263..ba7e325475c14 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/jwt/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/jwt/index.md
@@ -62,6 +62,32 @@ email_claim = sub
 
 If `auto_sign_up` is enabled, then the `sub` claim is used as the "external Auth ID". The `name` claim is used as the user's full name if it is present.
 
+Additionally, if the login username or the email claims are nested inside the JWT structure, you can specify the path to the attributes using the `username_attribute_path` and `email_attribute_path` configuration options using the JMESPath syntax.
+
+JWT structure example.
+
+```json
+{
+  "user": {
+    "UID": "1234567890",
+    "name": "John Doe",
+    "username": "johndoe",
+    "emails": ["personal@email.com", "professional@email.com"]
+  }
+}
+```
+
+```ini
+# [auth.jwt]
+# ...
+
+# Specify a nested attribute to use as a username to sign in.
+username_attribute_path = user.username # user's login is johndoe
+
+# Specify a nested attribute to use as an email to sign in.
+email_attribute_path = user.emails[1] # user's email is professional@email.com
+```
+
 ## Iframe Embedding
 
 If you want to embed Grafana in an iframe while maintaining user identity and role checks,
diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/keycloak/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/keycloak/index.md
index 322df6c50a37d..6f2dbea11abe5 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/keycloak/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/keycloak/index.md
@@ -24,6 +24,10 @@ Keycloak OAuth2 authentication allows users to log in to Grafana using their Key
 
 Refer to [Generic OAuth authentication]({{< relref "../generic-oauth" >}}) for extra configuration options available for this provider.
 
+{{% admonition type="note" %}}
+If Users use the same email address in Keycloak that they use with other authentication providers (such as Grafana.com), you need to do additional configuration to ensure that the users are matched correctly. Please refer to the [Using the same email address to login with different identity providers]({{< relref "../../configure-authentication#using-the-same-email-address-to-login-with-different-identity-providers" >}}) documentation for more information.
+{{% /admonition %}}
+
 You may have to set the `root_url` option of `[server]` for the callback URL to be
 correct. For example in case you are serving Grafana behind a proxy.
 
@@ -136,15 +140,16 @@ groups_attribute_path = reverse("Global:department")
 To enable Single Logout, you need to add the following option to the configuration of Grafana:
 
 ```ini
-[auth]
-signout_redirect_url = https://<PROVIDER_DOMAIN>/auth/realms/<REALM_NAME>/protocol/openid-connect/logout?post_logout_redirect_uri=https%3A%2F%2<GRAFANA_DOMAIN>%2Flogin
+[auth.generic_oauth]
+signout_redirect_url = https://<PROVIDER_DOMAIN>/auth/realms/<REALM_NAME>/protocol/openid-connect/logout?post_logout_redirect_uri=https%3A%2F%2F<GRAFANA_DOMAIN>%2Flogin
 ```
 
 As an example, `<PROVIDER_DOMAIN>` can be `keycloak-demo.grafana.org`,
 `<REALM_NAME>` can be `grafana` and `<GRAFANA_DOMAIN>` can be `play.grafana.org`.
 
-> **Note**: Grafana does not support `id_token_hints`. From keycloak 18, it is necessary to disable `id_token_hints` enforcement in keycloak for
-> single logout to work. [Documentation reference](https://www.keycloak.org/2022/04/keycloak-1800-released#_openid_connect_logout).
+{{% admonition type="note" %}}
+Grafana supports ID token hints for single logout. Grafana automatically adds the `id_token_hint` parameter to the logout request if it detects OAuth as the authentication method.
+{{% /admonition %}}
 
 ## Allow assigning Grafana Admin
 
@@ -164,10 +169,12 @@ allow_assign_grafana_admin = true
 
 > Available in Grafana v9.3 and later versions.
 
-> **Note:** This feature is behind the `accessTokenExpirationCheck` feature toggle.
-
 When a user logs in using an OAuth provider, Grafana verifies that the access token has not expired. When an access token expires, Grafana uses the provided refresh token (if any exists) to obtain a new access token.
 
 Grafana uses a refresh token to obtain a new access token without requiring the user to log in again. If a refresh token doesn't exist, Grafana logs the user out of the system after the access token has expired.
 
-To enable a refresh token for Keycloak, extend the `scopes` in `[auth.generic_oauth]` with `offline_access`.
+To enable a refresh token for Keycloak, do the following:
+
+1. Extend the `scopes` in `[auth.generic_oauth]` with `offline_access`.
+
+1. Add `use_refresh_token = true` to `[auth.generic_oauth]` configuration.
diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/ldap/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/ldap/index.md
index c15e2f2dbd7fb..eece776c8815c 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/ldap/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/ldap/index.md
@@ -18,9 +18,11 @@ weight: 300
 The LDAP integration in Grafana allows your Grafana users to login with their LDAP credentials. You can also specify mappings between LDAP
 group memberships and Grafana Organization user roles.
 
-> [Enhanced LDAP authentication]({{< relref "../enhanced-ldap" >}}) is available in [Grafana Cloud](/docs/grafana-cloud/) and in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise" >}}).
+{{% admonition type="note" %}}
+[Enhanced LDAP authentication]({{< relref "../enhanced-ldap" >}}) is available in [Grafana Cloud](/docs/grafana-cloud/) and in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise" >}}).
+{{% /admonition %}}
 
-> Refer to [Role-based access control]({{< relref "../../../../administration/roles-and-permissions/access-control" >}}) to understand how you can control access with role-based permissions.
+Refer to [Role-based access control]({{< relref "../../../../administration/roles-and-permissions/access-control" >}}) to understand how you can control access with role-based permissions.
 
 ## Supported LDAP Servers
 
@@ -127,6 +129,10 @@ member_of = "memberOf"
 email =  "email"
 ```
 
+{{% admonition type="note" %}}
+Whenever you modify the ldap.toml file, you must restart Grafana in order for the change(s) to take effect.
+{{% /admonition %}}
+
 ### Using environment variables
 
 You can interpolate variables in the TOML configuration from environment variables. For instance, you could externalize your `bind_password` that way:
@@ -135,31 +141,31 @@ You can interpolate variables in the TOML configuration from environment variabl
 bind_password = "${LDAP_ADMIN_PASSWORD}"
 ```
 
-## LDAP Debug View
+## LDAP debug view
 
-> Only available in Grafana v6.4+
+{{% admonition type="note" %}}
+Available in Grafana v6.4+
+{{% /admonition %}}
 
-Grafana has an LDAP debug view built-in which allows you to test your LDAP configuration directly within Grafana. At the moment of writing, only Grafana admins can use the LDAP debug view.
+Grafana has an LDAP debug view built-in which allows you to test your LDAP configuration directly within Grafana. Only Grafana admins can use the LDAP debug view.
 
 Within this view, you'll be able to see which LDAP servers are currently reachable and test your current configuration.
 
-{{< figure src="/static/img/docs/ldap_debug.png" class="docs-image--no-shadow" max-width="600px" >}}
+{{< figure src="/static/img/docs/ldap_debug.png" class="docs-image--no-shadow" max-width="600px" alt="LDAP testing" >}}
 
-To use the debug view:
+To use the debug view, complete the following steps:
 
 1.  Type the username of a user that exists within any of your LDAP server(s)
 1.  Then, press "Run"
-1.  If the user is found within any of your LDAP instances, the mapping information is displayed
+1.  If the user is found within any of your LDAP instances, the mapping information is displayed.
 
-{{< figure src="/static/img/docs/ldap_debug_mapping_testing.png" class="docs-image--no-shadow" max-width="600px" >}}
+{{< figure src="/static/img/docs/ldap_debug_mapping_testing.png" class="docs-image--no-shadow" max-width="600px" alt="LDAP mapping displayed" >}}
 
 [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise" >}}) users with [enhanced LDAP integration]({{< relref "../enhanced-ldap" >}}) enabled can also see sync status in the debug view. This requires the `ldap.status:read` permission.
 
-{{< figure src="/static/img/docs/ldap_sync_debug.png" class="docs-image--no-shadow" max-width="600px" >}}
-
-### Bind
+{{< figure src="/static/img/docs/ldap_sync_debug.png" class="docs-image--no-shadow" max-width="600px" alt="LDAP sync status" >}}
 
-#### Bind and Bind Password
+### Bind and bind password
 
 By default the configuration expects you to specify a bind DN and bind password. This should be a read only user that can perform LDAP searches.
 When the user DN is found a second bind is performed with the user provided username and password (in the normal Grafana login form).
@@ -169,7 +175,7 @@ bind_dn = "cn=admin,dc=grafana,dc=org"
 bind_password = "grafana"
 ```
 
-#### Single Bind Example
+#### Single bind example
 
 If you can provide a single bind expression that matches all possible users, you can skip the second bind and bind against the user DN directly.
 This allows you to not specify a bind_password in the configuration file.
@@ -183,7 +189,7 @@ The search filter and search bases settings are still needed to perform the LDAP
 
 ### POSIX schema
 
-If your LDAP server does not support the memberOf attribute add these options:
+If your LDAP server does not support the `memberOf` attribute, add the following options:
 
 ```bash
 ## Group search filter, to retrieve the groups of which the user is a member (only set if memberOf attribute is not available)
@@ -194,7 +200,7 @@ group_search_base_dns = ["ou=groups,dc=grafana,dc=org"]
 group_search_filter_user_attribute = "uid"
 ```
 
-### Group Mappings
+### Group mappings
 
 In `[[servers.group_mappings]]` you can map an LDAP group to a Grafana organization and role. These will be synced every time the user logs in, with LDAP being the authoritative source.
 
@@ -231,8 +237,12 @@ org_role = "Viewer"
 | `org_id`        | No       | The Grafana organization database id. Setting this allows for multiple group_dn's to be assigned to the same `org_role` provided the `org_id` differs                    | `1` (default org id) |
 | `grafana_admin` | No       | When `true` makes user of `group_dn` Grafana server admin. A Grafana server admin has admin access over all organizations and users. Available in Grafana v5.3 and above | `false`              |
 
-Note: Commenting out a group mapping requires also commenting out the header of
-said group or it will fail validation as an empty mapping. Example:
+{{% admonition type="note" %}}
+Commenting out a group mapping requires also commenting out the header of
+said group or it will fail validation as an empty mapping.
+{{% /admonition %}}
+
+Example:
 
 ```bash
 [[servers]]
@@ -265,7 +275,7 @@ To configure `group_search_filter`:
 **Active Directory example:**
 
 Active Directory groups store the Distinguished Names (DNs) of members, so your filter will need to know the DN for the user based only on the submitted username.
-Multiple DN templates can be searched by combining filters with the LDAP OR-operator. Two examples:
+Multiple DN templates are searched by combining filters with the LDAP OR-operator. Two examples:
 
 ```bash
 group_search_filter = "(member:1.2.840.113556.1.4.1941:=%s)"
@@ -281,10 +291,12 @@ group_search_filter_user_attribute = "cn"
 
 For more information on AD searches see [Microsoft's Search Filter Syntax](https://docs.microsoft.com/en-us/windows/desktop/adsi/search-filter-syntax) documentation.
 
-For troubleshooting, by changing `member_of` in `[servers.attributes]` to "dn" it will show you more accurate group memberships when [debug is enabled](#troubleshooting).
+For troubleshooting, changing `member_of` in `[servers.attributes]` to "dn" will show you more accurate group memberships when [debug is enabled](#troubleshooting).
 
 ## Configuration examples
 
+The following examples describe different LDAP configuration options.
+
 ### OpenLDAP
 
 [OpenLDAP](http://www.openldap.org/) is an open source directory service.
diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/okta/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/okta/index.md
index 1a163cc928ee5..9cc47511f53bf 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/okta/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/okta/index.md
@@ -1,58 +1,115 @@
 ---
 aliases:
   - ../../../auth/okta/
-description: Grafana Okta OAuth Guide
+description: Grafana Okta OIDC Guide
 labels:
   products:
     - cloud
     - enterprise
     - oss
-menuTitle: Okta OAuth2
-title: Configure Okta OAuth2 authentication
+menuTitle: Okta OIDC
+title: Configure Okta OIDC authentication
 weight: 1400
 ---
 
-# Configure Okta OAuth2 authentication
+# Configure Okta OIDC authentication
 
 {{< docs/shared lookup="auth/intro.md" source="grafana" version="<GRAFANA VERSION>" >}}
 
+{{% admonition type="note" %}}
+If Users use the same email address in Okta that they use with other authentication providers (such as Grafana.com), you need to do additional configuration to ensure that the users are matched correctly. Please refer to the [Using the same email address to login with different identity providers]({{< relref "../../configure-authentication#using-the-same-email-address-to-login-with-different-identity-providers" >}}) documentation for more information.
+{{% /admonition %}}
+
 ## Before you begin
 
-To follow this guide:
+To follow this guide, ensure you have permissions in your Okta workspace to create an OIDC app.
+
+## Configure Okta authentication client using the Grafana UI
+
+{{% admonition type="note" %}}
+Available in Public Preview in Grafana 10.4 behind the `ssoSettingsApi` feature toggle.
+{{% /admonition %}}
+
+As a Grafana Admin, you can configure Okta OAuth2 client from within Grafana using the Okta UI. To do this, navigate to **Administration > Authentication > Okta** page and fill in the form. If you have a current configuration in the Grafana configuration file then the form will be pre-populated with those values otherwise the form will contain default values.
+
+After you have filled in the form, click **Save**. If the save was successful, Grafana will apply the new configurations.
+
+If you need to reset changes you made in the UI back to the default values, click **Reset**. After you have reset the changes, Grafana will apply the configuration from the Grafana configuration file (if there is any configuration) or the default values.
+
+{{% admonition type="note" %}}
+If you run Grafana in high availability mode, configuration changes may not get applied to all Grafana instances immediately. You may need to wait a few minutes for the configuration to propagate to all Grafana instances.
+{{% /admonition %}}
+
+Refer to [configuration options]({{< relref "#configuration-options" >}}) for more information.
+
+## Configure Okta authentication client using the Terraform provider
+
+{{% admonition type="note" %}}
+Available in Public Preview in Grafana 10.4 behind the `ssoSettingsApi` feature toggle. Supported in the Terraform provider since v2.12.0.
+{{% /admonition %}}
+
+```terraform
+resource "grafana_sso_settings" "okta_sso_settings" {
+  provider_name = "okta"
+  oauth2_settings {
+    name                  = "Okta"
+    auth_url              = "https://<okta tenant id>.okta.com/oauth2/v1/authorize"
+    token_url             = "https://<okta tenant id>.okta.com/oauth2/v1/token"
+    api_url               = "https://<okta tenant id>.okta.com/oauth2/v1/userinfo"
+    client_id             = "CLIENT_ID"
+    client_secret         = "CLIENT_SECRET"
+    allow_sign_up         = true
+    auto_login            = false
+    scopes                = "openid profile email offline_access"
+    role_attribute_path   = "contains(groups[*], 'Example::DevOps') && 'Admin' || 'None'"
+    role_attribute_strict = true
+    allowed_groups        = "Example::DevOps,Example::Dev,Example::QA"
+  }
+}
+```
+
+Go to [Terraform Registry](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/sso_settings) for a complete reference on using the `grafana_sso_settings` resource.
 
-- Ensure that you have access to the [Grafana configuration file]({{< relref "../../../configure-grafana#configuration-file-location" >}}).
-- Ensure you know how to create an OAuth2 application with your OAuth2 provider. Consult the [documentation of Okta OAuth2](https://help.okta.com/en-us/Content/Topics/Apps/Apps_App_Integration_Wizard.htm) for more information.
-- If you are using refresh tokens, ensure you know how to set them up with your OAuth2 provider. Consult the documentation of your OAuth2 provider for more information.
+## Configure Okta authentication client using the Grafana configuration file
 
-## Steps
+Ensure that you have access to the [Grafana configuration file]({{< relref "../../../configure-grafana#configuration-file-location" >}}).
 
-To integrate your Okta OAuth2 provider with Grafana using our Okta OAuth2 integration, follow these steps:
+### Steps
 
-1. [Create an SWA app](https://help.okta.com/en-us/Content/Topics/Apps/Apps_App_Integration_Wizard_SWA.htm) or [OIDC app](https://help.okta.com/en-us/Content/Topics/Apps/Apps_App_Integration_Wizard_OIDC.htm) in the Okta applications section.
+To integrate your Okta OIDC provider with Grafana using our Okta OIDC integration, follow these steps:
 
-1. Set the callback URL for your OAuth2 app to `http://<my_grafana_server_name_or_ip>:<grafana_server_port>/login/okta`.
+1. Follow the [OIDC app integration guide](https://help.okta.com/en-us/content/topics/apps/apps_app_integration_wizard_oidc.htm)
+   to reach the OIDC new application configuration wizard.
 
-   Ensure that the callback URL is the complete HTTP address that you use to access Grafana via your browser, but with the appended path of `/login/okta`.
+1. Select `OIDC - OpenID Connect` as the sign-in method and `Single-Page Application`.
 
-   For the callback URL to be correct, it might be necessary to set the root_url option to [server], for example, if you are serving Grafana behind a proxy.
+1. Select `Authorization Code` and `Refresh Token` as the grant types.
+
+1. Set the `Sign-in redirect URI` to `http://<my_grafana_server_name_or_ip>:<grafana_server_port>/login/okta`.
+
+   Ensure that the sign-in redirect URI is the complete HTTP address that you use to access Grafana via your browser, but with the appended path of `/login/okta`.
+
+   For the sign-in redirect URI to be correct, it might be necessary to set the root_url option to [server], for example, if you are serving Grafana behind a proxy.
+
+1. Set the `Sign-out redirect URI` to `http://<my_grafana_server_name_or_ip>:<grafana_server_port>/logout`.
 
 1. Refer to the following table to update field values located in the `[auth.okta]` section of the Grafana configuration file:
 
-   | Field                        | Description                                                                                                   |
-   | ---------------------------- | ------------------------------------------------------------------------------------------------------------- |
-   | `client_id`, `client_secret` | These values must match the client ID and client secret from your Okta OAuth2 app.                            |
-   | `auth_url`                   | The authorization endpoint of your OAuth2 provider. `https://<okta-tenant-id>.okta.com/oauth2/v1/authorize`   |
-   | `token_url`                  | The token endpoint of your Okta OAuth2 provider. `https://<okta-tenant-id>.okta.com/oauth2/v1/token`          |
-   | `api_url`                    | The user information endpoint of your Okta OAuth2 provider. `https://<tenant-id>.okta.com/oauth2/v1/userinfo` |
-   | `enabled`                    | Enables Okta OAuth2 authentication. Set this value to `true`.                                                 |
+   | Field       | Description                                                                                                 |
+   | ----------- | ----------------------------------------------------------------------------------------------------------- |
+   | `client_id` | These values must match the client ID from your Okta OIDC app.                                              |
+   | `auth_url`  | The authorization endpoint of your OIDC provider. `https://<okta-tenant-id>.okta.com/oauth2/v1/authorize`   |
+   | `token_url` | The token endpoint of your Okta OIDC provider. `https://<okta-tenant-id>.okta.com/oauth2/v1/token`          |
+   | `api_url`   | The user information endpoint of your Okta OIDC provider. `https://<tenant-id>.okta.com/oauth2/v1/userinfo` |
+   | `enabled`   | Enables Okta OIDC authentication. Set this value to `true`.                                                 |
 
-1. Review the list of other Okta OAuth2 [configuration options]({{< relref "#configuration-options" >}}) and complete them as necessary.
+1. Review the list of other Okta OIDC [configuration options]({{< relref "#configuration-options" >}}) and complete them as necessary.
 
 1. Optional: [Configure a refresh token]({{< relref "#configure-a-refresh-token" >}}):
 
    a. Enable the `accessTokenExpirationCheck` feature toggle.
 
-   b. Extend the `scopes` field of `[auth.okta]` section in Grafana configuration file with the refresh token scope used by your OAuth2 provider.
+   b. Extend the `scopes` field of `[auth.okta]` section in Grafana configuration file with the refresh token scope used by your OIDC provider.
 
    c. Enable the [refresh token]({{< relref "#configure-a-refresh-token" >}}) at the Okta application settings.
 
@@ -60,39 +117,31 @@ To integrate your Okta OAuth2 provider with Grafana using our Okta OAuth2 integr
 1. Optional: [Configure team synchronization]({{< relref "#configure-team-synchronization-enterprise-only" >}}).
 1. Restart Grafana.
 
-   You should now see a Okta OAuth2 login button on the login page and be able to log in or sign up with your OAuth2 provider.
-
-## Configuration options
-
-The following table outlines the various Okta OAuth2 configuration options. You can apply these options as environment variables, similar to any other configuration within Grafana.
-
-| Setting                 | Required | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | Default                       |
-| ----------------------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ----------------------------- |
-| `enabled`               | No       | Enables Okta OAuth2 authentication.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `false`                       |
-| `name`                  | No       | Name that refers to the Okta OAuth2 authentication from the Grafana user interface.                                                                                                                                                                                                                                                                                                                                                                                                                                            | `Okta`                        |
-| `icon`                  | No       | Icon used for the Okta OAuth2 authentication in the Grafana user interface.                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `okta`                        |
-| `client_id`             | Yes      | Client ID provided by your Okta OAuth2 app.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                               |
-| `client_secret`         | Yes      | Client secret provided by your Okta OAuth2 app.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |                               |
-| `auth_url`              | Yes      | Authorization endpoint of your Okta OAuth2 provider.                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |                               |
-| `token_url`             | Yes      | Endpoint used to obtain the Okta OAuth2 access token.                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |                               |
-| `api_url`               | Yes      | Endpoint used to obtain user information.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |                               |
-| `scopes`                | No       | List of comma- or space-separated Okta OAuth2 scopes.                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `openid profile email groups` |
-| `allow_sign_up`         | No       | Controls Grafana user creation through the Okta OAuth2 login. Only existing Grafana users can log in with Okta OAuth2 if set to `false`.                                                                                                                                                                                                                                                                                                                                                                                       | `true`                        |
-| `auto_login`            | No       | Set to `true` to enable users to bypass the login screen and automatically log in. This setting is ignored if you configure multiple auth providers to use auto-login.                                                                                                                                                                                                                                                                                                                                                         | `false`                       |
-| `role_attribute_path`   | No       | [JMESPath](http://jmespath.org/examples.html) expression to use for Grafana role lookup. Grafana will first evaluate the expression using the Okta OAuth2 ID token. If no role is found, the expression will be evaluated using the user information obtained from the UserInfo endpoint. The result of the evaluation should be a valid Grafana role (`Viewer`, `Editor`, `Admin` or `GrafanaAdmin`). For more information on user role mapping, refer to [Configure role mapping]({{< relref "#configure-role-mapping" >}}). |                               |
-| `role_attribute_strict` | No       | Set to `true` to deny user login if the Grafana role cannot be extracted using `role_attribute_path`. For more information on user role mapping, refer to [Configure role mapping]({{< relref "#configure-role-mapping" >}}).                                                                                                                                                                                                                                                                                                  | `false`                       |
-| `skip_org_role_sync`    | No       | Set to `true` to stop automatically syncing user roles. This will allow you to set organization roles for your users from within Grafana manually.                                                                                                                                                                                                                                                                                                                                                                             | `false`                       |
-| `allowed_groups`        | No       | List of comma- or space-separated groups. The user should be a member of at least one group to log in.                                                                                                                                                                                                                                                                                                                                                                                                                         |                               |
-| `allowed_domains`       | No       | List comma- or space-separated domains. The user should belong to at least one domain to log in.                                                                                                                                                                                                                                                                                                                                                                                                                               |                               |
-| `use_pkce`              | No       | Set to `true` to use [Proof Key for Code Exchange (PKCE)](https://datatracker.ietf.org/doc/html/rfc7636). Grafana uses the SHA256 based `S256` challenge method and a 128 bytes (base64url encoded) code verifier.                                                                                                                                                                                                                                                                                                             | `true`                        |
-| `use_refresh_token`     | No       | Set to `true` to use refresh token and check access token expiration. The `accessTokenExpirationCheck` feature toggle should also be enabled to use refresh token.                                                                                                                                                                                                                                                                                                                                                             | `false`                       |
+   You should now see a Okta OIDC login button on the login page and be able to log in or sign up with your OIDC provider.
+
+The following is an example of a minimally functioning integration when
+configured with the instructions above:
+
+```ini
+[auth.okta]
+name = Okta
+icon = okta
+enabled = true
+allow_sign_up = true
+client_id = 0oads6ziaaiiz4zz45d7
+scopes = openid profile email offline_access
+auth_url = https://<okta tenant id>.okta.com/oauth2/v1/authorize
+token_url = https://<okta tenant id>.okta.com/oauth2/v1/token
+api_url = https://<okta tenant id>.okta.com/oauth2/v1/userinfo
+role_attribute_path = contains(groups[*], 'Example::DevOps') && 'Admin' || 'None'
+role_attribute_strict = true
+allowed_groups = "Example::DevOps" "Example::Dev" "Example::QA"
+```
 
 ### Configure a refresh token
 
 > Available in Grafana v9.3 and later versions.
 
-> **Note:** This feature is behind the `accessTokenExpirationCheck` feature toggle.
-
 When a user logs in using an OAuth provider, Grafana verifies that the access token has not expired. When an access token expires, Grafana uses the provided refresh token (if any exists) to obtain a new access token without requiring the user to log in again.
 
 If a refresh token doesn't exist, Grafana logs the user out of the system after the access token has expired.
@@ -104,7 +153,9 @@ To enable the `Refresh Token` head over the Okta application settings and:
 
 At the configuration file, extend the `scopes` in `[auth.okta]` section with `offline_access`.
 
-> **Note:** The `accessTokenExpirationCheck` feature toggle will be removed in Grafana v10.2.0 and the `use_refresh_token` configuration value will be used instead for configuring refresh token fetching and access token expiration check.
+{{% admonition type="note" %}}
+The `accessTokenExpirationCheck` feature toggle has been removed in Grafana v10.3.0 and the `use_refresh_token` configuration value will be used instead for configuring refresh token fetching and access token expiration check.
+{{% /admonition %}}
 
 ### Configure role mapping
 
@@ -124,7 +175,7 @@ To learn about adding custom claims to the user info in Okta, refer to [add cust
 
 > **Note:** Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise" >}}) and [Grafana Cloud]({{< relref "../../../../introduction/grafana-cloud" >}}).
 
-By using Team Sync, you can link your OAuth2 groups to teams within Grafana. This will automatically assign users to the appropriate teams.
+By using Team Sync, you can link your Okta groups to teams within Grafana. This will automatically assign users to the appropriate teams.
 
 Map your Okta groups to teams in Grafana so that your users will automatically be added to
 the correct teams.
@@ -132,3 +183,28 @@ the correct teams.
 Okta groups can be referenced by group names, like `Admins` or `Editors`.
 
 To learn more about Team Sync, refer to [Configure Team Sync]({{< relref "../../configure-team-sync" >}}).
+
+## Configuration options
+
+The following table outlines the various Okta OIDC configuration options. You can apply these options as environment variables, similar to any other configuration within Grafana.
+
+| Setting                 | Required | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | Default                       |
+| ----------------------- | -------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------- |
+| `enabled`               | No       | Enables Okta OIDC authentication.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `false`                       |
+| `name`                  | No       | Name that refers to the Okta OIDC authentication from the Grafana user interface.                                                                                                                                                                                                                                                                                                                                                                                                                                            | `Okta`                        |
+| `icon`                  | No       | Icon used for the Okta OIDC authentication in the Grafana user interface.                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `okta`                        |
+| `client_id`             | Yes      | Client ID provided by your Okta OIDC app.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                               |
+| `client_secret`         | Yes      | Client secret provided by your Okta OIDC app.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |                               |
+| `auth_url`              | Yes      | Authorization endpoint of your Okta OIDC provider.                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |                               |
+| `token_url`             | Yes      | Endpoint used to obtain the Okta OIDC access token.                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |                               |
+| `api_url`               | Yes      | Endpoint used to obtain user information.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                               |
+| `scopes`                | No       | List of comma- or space-separated Okta OIDC scopes.                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `openid profile email groups` |
+| `allow_sign_up`         | No       | Controls Grafana user creation through the Okta OIDC login. Only existing Grafana users can log in with Okta OIDC if set to `false`.                                                                                                                                                                                                                                                                                                                                                                                         | `true`                        |
+| `auto_login`            | No       | Set to `true` to enable users to bypass the login screen and automatically log in. This setting is ignored if you configure multiple auth providers to use auto-login.                                                                                                                                                                                                                                                                                                                                                       | `false`                       |
+| `role_attribute_path`   | No       | [JMESPath](http://jmespath.org/examples.html) expression to use for Grafana role lookup. Grafana will first evaluate the expression using the Okta OIDC ID token. If no role is found, the expression will be evaluated using the user information obtained from the UserInfo endpoint. The result of the evaluation should be a valid Grafana role (`Viewer`, `Editor`, `Admin` or `GrafanaAdmin`). For more information on user role mapping, refer to [Configure role mapping]({{< relref "#configure-role-mapping" >}}). |                               |
+| `role_attribute_strict` | No       | Set to `true` to deny user login if the Grafana role cannot be extracted using `role_attribute_path`. For more information on user role mapping, refer to [Configure role mapping]({{< relref "#configure-role-mapping" >}}).                                                                                                                                                                                                                                                                                                | `false`                       |
+| `skip_org_role_sync`    | No       | Set to `true` to stop automatically syncing user roles. This will allow you to set organization roles for your users from within Grafana manually.                                                                                                                                                                                                                                                                                                                                                                           | `false`                       |
+| `allowed_groups`        | No       | List of comma- or space-separated groups. The user should be a member of at least one group to log in.                                                                                                                                                                                                                                                                                                                                                                                                                       |                               |
+| `allowed_domains`       | No       | List comma- or space-separated domains. The user should belong to at least one domain to log in.                                                                                                                                                                                                                                                                                                                                                                                                                             |                               |
+| `use_pkce`              | No       | Set to `true` to use [Proof Key for Code Exchange (PKCE)](https://datatracker.ietf.org/doc/html/rfc7636). Grafana uses the SHA256 based `S256` challenge method and a 128 bytes (base64url encoded) code verifier.                                                                                                                                                                                                                                                                                                           | `true`                        |
+| `use_refresh_token`     | No       | Set to `true` to use refresh token and check access token expiration.                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `false`                       |
diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/saml/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/saml/index.md
index 99c6ccd74be2f..f043a4bf71100 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/saml/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/saml/index.md
@@ -22,7 +22,7 @@ weight: 500
 # Configure SAML authentication using the configuration file
 
 {{% admonition type="note" %}}
-Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise" >}}) and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud).
+Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise" >}}) and [Grafana Cloud](/docs/grafana-cloud).
 {{% /admonition %}}
 
 SAML authentication integration allows your Grafana users to log in by using an external SAML 2.0 Identity Provider (IdP). To enable this, Grafana becomes a Service Provider (SP) in the authentication flow, interacting with the IdP to exchange user information.
@@ -69,7 +69,7 @@ By default, SP-initiated requests are enabled. For instructions on how to enable
    - [`assertion_attribute_email`]({{< relref "../../../configure-grafana/enterprise-configuration#assertion_attribute_email" >}})
    - [`assertion_attribute_name`]({{< relref "../../../configure-grafana/enterprise-configuration#assertion_attribute_name" >}})
    - [`assertion_attribute_groups`]({{< relref "../../../configure-grafana/enterprise-configuration#assertion_attribute_groups" >}})
-1. Save the configuration file and and then restart the Grafana server.
+1. Save the configuration file and then restart the Grafana server.
 
 When you are finished, the Grafana configuration might look like this example:
 
diff --git a/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-aws-kms/index.md b/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-aws-kms/index.md
index 32e1c77a2799e..f27851f1bd4ba 100644
--- a/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-aws-kms/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-aws-kms/index.md
@@ -73,8 +73,6 @@ You can use an encryption key from AWS Key Management Service to encrypt secrets
    available_encryption_providers = awskms.example-encryption-key
    ```
 
-   **> Note:** The encryption key that is stored in the `secret_key` field is still used by Grafana’s legacy alerting system to encrypt secrets, for decrypting existing secrets, or it is used as the default provider when external providers are not configured. Do not change or remove that value when adding a new KMS provider.
-
 7. [Restart Grafana](/docs/grafana/latest/installation/restart-grafana/).
 
 8. (Optional) From the command line and the root directory of Grafana, re-encrypt all of the secrets within the Grafana database with the new key using the following command:
@@ -83,6 +81,6 @@ You can use an encryption key from AWS Key Management Service to encrypt secrets
 
    If you do not re-encrypt existing secrets, then they will remain encrypted by the previous encryption key. Users will still be able to access them.
 
-   **> Note:** This process could take a few minutes to complete, depending on the number of secrets (such as data sources or alert notification channels) in your database. Users might experience errors while this process is running, and alert notifications might not be sent.
+   **> Note:** This process could take a few minutes to complete, depending on the number of secrets (such as data sources) in your database. Users might experience errors while this process is running, and alert notifications might not be sent.
 
-   **> Note:** If you are updating this encryption key during the initial setup of Grafana before any data sources, alert notification channels, or dashboards have been created, then this step is not necessary because there are no secrets in Grafana to migrate.
+   **> Note:** If you are updating this encryption key during the initial setup of Grafana before any data sources or dashboards have been created, then this step is not necessary because there are no secrets in Grafana to migrate.
diff --git a/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-azure-key-vault/index.md b/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-azure-key-vault/index.md
index 7a6b8736c02a2..e90f81bc6d0ab 100644
--- a/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-azure-key-vault/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-azure-key-vault/index.md
@@ -71,8 +71,6 @@ You can use an encryption key from Azure Key Vault to encrypt secrets in the Gra
    available_encryption_providers =  azurekv.example-encryption-key
    ```
 
-   **> Note:** The encryption key stored in the `secret_key` field is still used by Grafana’s legacy alerting system to encrypt secrets. Do not change or remove that value.
-
 9. [Restart Grafana](/docs/grafana/latest/installation/restart-grafana/).
 
 10. (Optional) From the command line and the root directory of Grafana Enterprise, re-encrypt all of the secrets within the Grafana database with the new key using the following command:
@@ -81,6 +79,6 @@ You can use an encryption key from Azure Key Vault to encrypt secrets in the Gra
 
     If you do not re-encrypt existing secrets, then they will remain encrypted by the previous encryption key. Users will still be able to access them.
 
-    **> Note:** This process could take a few minutes to complete, depending on the number of secrets (such as data sources or alert notification channels) in your database. Users might experience errors while this process is running, and alert notifications might not be sent.
+    **> Note:** This process could take a few minutes to complete, depending on the number of secrets (such as data sources) in your database. Users might experience errors while this process is running, and alert notifications might not be sent.
 
-    **> Note:** If you are updating this encryption key during the initial setup of Grafana before any data sources, alert notification channels, or dashboards have been created, then this step is not necessary because there are no secrets in Grafana to migrate.
+    **> Note:** If you are updating this encryption key during the initial setup of Grafana before any data sources or dashboards have been created, then this step is not necessary because there are no secrets in Grafana to migrate.
diff --git a/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-google-cloud-kms/index.md b/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-google-cloud-kms/index.md
index 95433c423f572..240836fa303ec 100644
--- a/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-google-cloud-kms/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-google-cloud-kms/index.md
@@ -60,8 +60,6 @@ You can use an encryption key from Google Cloud Key Management Service to encryp
    available_encryption_providers = googlekms.example-encryption-key
    ```
 
-   **> Note:** The encryption key stored in the `secret_key` field is still used by Grafana’s legacy alerting system to encrypt secrets. Do not change or remove that value.
-
 8. [Restart Grafana](/docs/grafana/latest/installation/restart-grafana/).
 
 9. (Optional) From the command line and the root directory of Grafana Enterprise, re-encrypt all of the secrets within the Grafana database with the new key using the following command:
@@ -70,6 +68,6 @@ You can use an encryption key from Google Cloud Key Management Service to encryp
 
    If you do not re-encrypt existing secrets, then they will remain encrypted by the previous encryption key. Users will still be able to access them.
 
-   **> Note:** This process could take a few minutes to complete, depending on the number of secrets (such as data sources or alert notification channels) in your database. Users might experience errors while this process is running, and alert notifications might not be sent.
+   **> Note:** This process could take a few minutes to complete, depending on the number of secrets (such as data sources) in your database. Users might experience errors while this process is running, and alert notifications might not be sent.
 
-   **> Note:** If you are updating this encryption key during the initial setup of Grafana before any data sources, alert notification channels, or dashboards have been created, then this step is not necessary because there are no secrets in Grafana to migrate.
+   **> Note:** If you are updating this encryption key during the initial setup of Grafana before any data sources or dashboards have been created, then this step is not necessary because there are no secrets in Grafana to migrate.
diff --git a/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-hashicorp-key-vault/index.md b/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-hashicorp-key-vault/index.md
index b7626e5d60368..76bfd46686a3e 100644
--- a/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-hashicorp-key-vault/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-hashicorp-key-vault/index.md
@@ -67,8 +67,6 @@ You can use an encryption key from Hashicorp Vault to encrypt secrets in the Gra
    available_encryption_providers = hashicorpvault.example-encryption-key
    ```
 
-   **> Note:** The encryption key stored in the `secret_key` field is still used by Grafana’s legacy alerting system to encrypt secrets. Do not change or remove that value.
-
 7. [Restart Grafana](/docs/grafana/latest/installation/restart-grafana/).
 
 8. (Optional) From the command line and the root directory of Grafana Enterprise, re-encrypt all of the secrets within the Grafana database with the new key using the following command:
@@ -77,6 +75,6 @@ You can use an encryption key from Hashicorp Vault to encrypt secrets in the Gra
 
    If you do not re-encrypt existing secrets, then they will remain encrypted by the previous encryption key. Users will still be able to access them.
 
-   **> Note:** This process could take a few minutes to complete, depending on the number of secrets (such as data sources or alert notification channels) in your database. Users might experience errors while this process is running, and alert notifications might not be sent.
+   **> Note:** This process could take a few minutes to complete, depending on the number of secrets (such as data sources) in your database. Users might experience errors while this process is running, and alert notifications might not be sent.
 
-   **> Note:** If you are updating this encryption key during the initial setup of Grafana before any data sources, alert notification channels, or dashboards have been created, then this step is not necessary because there are no secrets in Grafana to migrate.
+   **> Note:** If you are updating this encryption key during the initial setup of Grafana before any data sources or dashboards have been created, then this step is not necessary because there are no secrets in Grafana to migrate.
diff --git a/docs/sources/setup-grafana/configure-security/configure-database-encryption/integrate-with-hashicorp-vault/index.md b/docs/sources/setup-grafana/configure-security/configure-database-encryption/integrate-with-hashicorp-vault/index.md
index 2817648ee0897..12e8707d459ed 100644
--- a/docs/sources/setup-grafana/configure-security/configure-database-encryption/integrate-with-hashicorp-vault/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-database-encryption/integrate-with-hashicorp-vault/index.md
@@ -16,7 +16,7 @@ weight: 500
 If you manage your secrets with [Hashicorp Vault](https://www.hashicorp.com/products/vault), you can use them for [Configuration]({{< relref "../../../configure-grafana" >}}) and [Provisioning]({{< relref "../../../../administration/provisioning" >}}).
 
 {{% admonition type="note" %}}
-Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise" >}}) and [Grafana Cloud](/docs/grafana-cloud).
+Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise" >}}).
 {{% /admonition %}}
 
 {{% admonition type="note" %}}
diff --git a/docs/sources/setup-grafana/configure-security/configure-request-security.md b/docs/sources/setup-grafana/configure-security/configure-request-security.md
index 9a2fb05cb9a04..437786ed07fb1 100644
--- a/docs/sources/setup-grafana/configure-security/configure-request-security.md
+++ b/docs/sources/setup-grafana/configure-security/configure-request-security.md
@@ -8,7 +8,6 @@ labels:
   products:
     - cloud
     - enterprise
-    - oss
 title: Configure request security
 weight: 1100
 ---
diff --git a/docs/sources/setup-grafana/configure-security/configure-security-hardening/index.md b/docs/sources/setup-grafana/configure-security/configure-security-hardening/index.md
index fd68b7cc40aaa..bc0dae58b4a08 100644
--- a/docs/sources/setup-grafana/configure-security/configure-security-hardening/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-security-hardening/index.md
@@ -101,7 +101,7 @@ To enable trusted types in report mode, where inputs that have not been sanitize
 - Enable `content_security_policy_report_only` in the configuration.
 - Add `require-trusted-types-for 'script'` to the `content_security_policy_report_only_template` in the configuration.
 
-As this is a feature currently in development, things may break. If they do, or if you have any other feedback, feel free to [leave a comment](https://github.com/grafana/grafana/discussions/66823).
+As this is a feature currently in development, things may break. If they do, or if you have any other feedback, feel free to [open an issue](https://github.com/grafana/grafana/issues/new/choose).
 
 ## Additional security hardening
 
diff --git a/docs/sources/setup-grafana/configure-security/configure-team-sync.md b/docs/sources/setup-grafana/configure-security/configure-team-sync.md
index 6bab7df0bd883..07f251ad25cbb 100644
--- a/docs/sources/setup-grafana/configure-security/configure-team-sync.md
+++ b/docs/sources/setup-grafana/configure-security/configure-team-sync.md
@@ -40,11 +40,12 @@ This mechanism allows Grafana to remove an existing synchronized user from a tea
 
 If you have already grouped some users into a team, then you can synchronize that team with an external group.
 
-{{< figure src="/static/img/docs/enterprise/team_add_external_group.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" >}}
-
-1. In Grafana, navigate to **Administration > Teams**.
+1. In Grafana, navigate to **Administration > Users and access > Teams**.
 1. Select a team.
 1. Go to the External group sync tab, and click **Add group**.
+
+   ![External group sync](/static/img/docs/enterprise/team_add_external_group.png)
+
 1. Insert the value of the group you want to sync with. This becomes the Grafana `GroupID`.
    Examples:
 
diff --git a/docs/sources/setup-grafana/image-rendering/_index.md b/docs/sources/setup-grafana/image-rendering/_index.md
index 8639cb7f7d018..d9438fa0142a6 100644
--- a/docs/sources/setup-grafana/image-rendering/_index.md
+++ b/docs/sources/setup-grafana/image-rendering/_index.md
@@ -18,7 +18,7 @@ weight: 1000
 
 # Set up image rendering
 
-Grafana supports automatic rendering of panels as PNG images. This allows Grafana to automatically generate images of your panels to include in alert notifications, [PDF export]({{< relref "../../dashboards/create-reports#export-dashboard-as-pdf" >}}), and [Reporting]({{< relref "../../dashboards/create-reports" >}}). PDF Export and Reporting are available only in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise" >}}).
+Grafana supports automatic rendering of panels as PNG images. This allows Grafana to automatically generate images of your panels to include in alert notifications, [PDF export]({{< relref "../../dashboards/create-reports#export-dashboard-as-pdf" >}}), and [Reporting]({{< relref "../../dashboards/create-reports" >}}). PDF Export and Reporting are available only in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise" >}}) and [Grafana Cloud](/docs/grafana-cloud/).
 
 > **Note:** Image rendering of dashboards is not supported at this time.
 
@@ -30,7 +30,7 @@ You can also render a PNG by hovering over the panel to display the actions menu
 
 ## Alerting and render limits
 
-Alert notifications can include images, but rendering many images at the same time can overload the server where the renderer is running. For instructions of how to configure this, see [concurrent_render_limit]({{< relref "../configure-grafana#concurrent_render_limit" >}}).
+Alert notifications can include images, but rendering many images at the same time can overload the server where the renderer is running. For instructions of how to configure this, see [max_concurrent_screenshots]({{< relref "../configure-grafana#max_concurrent_screenshots" >}}).
 
 ## Install Grafana Image Renderer plugin
 
@@ -229,6 +229,25 @@ ENABLE_METRICS=true
 }
 ```
 
+#### Enable detailed timing metrics
+
+With the [Prometheus metrics enabled](#enable-prometheus-metrics), you can also enable detailed metrics to get the duration of every rendering step.
+
+Default is `false`.
+
+```bash
+# Available from v3.9.0+
+RENDERING_TIMING_METRICS=true
+```
+
+```json
+{
+  "rendering": {
+    "timingMetrics": true
+  }
+}
+```
+
 #### Log level
 
 Change the log level. Default is `info` and will include log messages with level `error`, `warning` and `info`.
@@ -370,6 +389,11 @@ BROWSER_TZ=Europe/Stockholm
 Instruct headless browser instance to use a default language when not provided by Grafana, e.g. when rendering panel image of alert.
 Refer to the HTTP header Accept-Language to understand how to format this value.
 
+```bash
+# Available from v3.9.0+
+RENDERING_LANGUAGE="fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7, *;q=0.5"
+```
+
 ```json
 {
   "rendering": {
@@ -382,6 +406,11 @@ Refer to the HTTP header Accept-Language to understand how to format this value.
 
 Default viewport width when width is not specified in the rendering request. Default is `1000`.
 
+```bash
+# Available from v3.9.0+
+RENDERING_VIEWPORT_WIDTH=1000
+```
+
 ```json
 {
   "rendering": {
@@ -394,6 +423,11 @@ Default viewport width when width is not specified in the rendering request. Def
 
 Default viewport height when height is not specified in the rendering request. Default is `500`.
 
+```bash
+# Available from v3.9.0+
+RENDERING_VIEWPORT_HEIGHT=500
+```
+
 ```json
 {
   "rendering": {
@@ -406,6 +440,11 @@ Default viewport height when height is not specified in the rendering request. D
 
 Limit the maximum viewport width that can be requested. Default is `3000`.
 
+```bash
+# Available from v3.9.0+
+RENDERING_VIEWPORT_MAX_WIDTH=1000
+```
+
 ```json
 {
   "rendering": {
@@ -418,6 +457,11 @@ Limit the maximum viewport width that can be requested. Default is `3000`.
 
 Limit the maximum viewport height that can be requested. Default is `3000`.
 
+```bash
+# Available from v3.9.0+
+RENDERING_VIEWPORT_MAX_HEIGHT=500
+```
+
 ```json
 {
   "rendering": {
@@ -431,6 +475,11 @@ Limit the maximum viewport height that can be requested. Default is `3000`.
 Specify default device scale factor for rendering images. `2` is enough for monitor resolutions, `4` would be better for printed material. Setting a higher value affects performance and memory. Default is `1`.
 This can be overridden in the rendering request.
 
+```bash
+# Available from v3.9.0+
+RENDERING_VIEWPORT_DEVICE_SCALE_FACTOR=2
+```
+
 ```json
 {
   "rendering": {
@@ -443,6 +492,11 @@ This can be overridden in the rendering request.
 
 Limit the maximum device scale factor that can be requested. Default is `4`.
 
+```bash
+# Available from v3.9.0+
+RENDERING_VIEWPORT_MAX_DEVICE_SCALE_FACTOR=4
+```
+
 ```json
 {
   "rendering": {
diff --git a/docs/sources/setup-grafana/installation/docker/index.md b/docs/sources/setup-grafana/installation/docker/index.md
index 31ae58ffe544e..47aa7d0f4a099 100644
--- a/docs/sources/setup-grafana/installation/docker/index.md
+++ b/docs/sources/setup-grafana/installation/docker/index.md
@@ -15,6 +15,8 @@ weight: 400
 
 This topic guides you through installing Grafana via the official Docker images. Specifically, it covers running Grafana via the Docker command line interface (CLI) and docker-compose.
 
+{{< youtube id="FlDfcMbSLXs" start="703">}}
+
 Grafana Docker images come in two editions:
 
 - **Grafana Enterprise**: `grafana/grafana-enterprise`
@@ -115,10 +117,10 @@ docker run -d -p 3000:3000 --name=grafana \
 Grafana supports specifying custom configuration settings using [environment variables]({{< relref "../../../setup-grafana/configure-grafana#override-configuration-with-environment-variables" >}}).
 
 ```bash
-# enabling public dashboard feature
+# enable debug logs
 
 docker run -d -p 3000:3000 --name=grafana \
-  -e "GF_FEATURE_TOGGLES_ENABLE=publicDashboards" \
+  -e "GF_LOG_LEVEL=debug" \
   grafana/grafana-enterprise
 ```
 
diff --git a/docs/sources/setup-grafana/installation/helm/index.md b/docs/sources/setup-grafana/installation/helm/index.md
new file mode 100644
index 0000000000000..2bc62a8c66d4d
--- /dev/null
+++ b/docs/sources/setup-grafana/installation/helm/index.md
@@ -0,0 +1,381 @@
+---
+aliases:
+  - ../../installation/helm/
+description: Guide for deploying Grafana using Helm Charts
+labels:
+  products:
+    - enterprise
+    - oss
+menuTitle: Grafana on Helm Charts
+title: Deploy Grafana using Helm Charts
+weight: 500
+---
+
+# Deploy Grafana using Helm Charts
+
+This topic includes instructions for installing and running Grafana on Kubernetes using Helm Charts.
+
+[Helm](https://helm.sh/) is an open-source command line tool used for managing Kubernetes applications. It is a graduate project in the [CNCF Landscape](https://www.cncf.io/projects/helm/).
+
+{{% admonition type="note" %}}
+The Grafana open-source community offers Helm Charts for running it on Kubernetes. Please be aware that the code is provided without any warranties. If you encounter any problems, you can report them to the [Official GitHub repository](https://github.com/grafana/helm-charts/).
+{{% /admonition %}}
+
+## Before you begin
+
+To install Grafana using Helm, ensure you have completed the following:
+
+- Install a Kubernetes server on your machine. For information about installing Kubernetes, refer to [Install Kubernetes](https://kubernetes.io/docs/setup/).
+- Install the latest stable version of Helm. For information on installing Helm, refer to [Install Helm](https://helm.sh/docs/intro/install/).
+
+## Install Grafana using Helm
+
+When you install Grafana using Helm, you complete the following tasks:
+
+1. Set up the Grafana Helm repository, which provides a space in which you will install Grafana.
+
+1. Deploy Grafana using Helm, which installs Grafana into a namespace.
+
+1. Accessing Grafana, which provides steps to sign into Grafana.
+
+### Set up the Grafana Helm repository
+
+To set up the Grafana Helm repository so that you download the correct Grafana Helm charts on your machine, complete the following steps:
+
+1. To add the Grafana repository, use the following command syntax:
+
+   `helm repo add <DESIRED-NAME> <HELM-REPO-URL>`
+
+   The following example adds the `grafana` Helm repository.
+
+   ```bash
+   helm repo add grafana https://grafana.github.io/helm-charts
+   ```
+
+1. Run the following command to verify the repository was added:
+
+   ```bash
+   helm repo list
+   ```
+
+   After you add the repository, you should see an output similar to the following:
+
+   ```bash
+   NAME    URL
+   grafana https://grafana.github.io/helm-charts
+   ```
+
+1. Run the following command to update the repository to download the latest Grafana Helm charts:
+
+   ```bash
+   helm repo update
+   ```
+
+### Deploy the Grafana Helm charts
+
+After you have set up the Grafana Helm repository, you can start to deploy it on your Kubernetes cluster.
+
+When you deploy Grafana Helm charts, use a separate namespace instead of relying on the default namespace. The default namespace might already have other applications running, which can lead to conflicts and other potential issues.
+
+When you create a new namespace in Kubernetes, you can better organize, allocate, and manage cluster resources. For more information, refer to [Namespaces](https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/).
+
+1. To create a namespace, run the following command:
+
+   ```bash
+   kubectl create namespace monitoring
+   ```
+
+   You will see an output similar to this, which means that the namespace has been successfully created:
+
+   ```bash
+   namespace/monitoring created
+   ```
+
+1. Search for the official `grafana/grafana` repository using the command:
+
+   `helm search repo <repo-name/package-name>`
+
+   For example, the following command provides a list of the Grafana Helm Charts from which you will install the latest version of the Grafana chart.
+
+   ```bash
+   helm search repo grafana/grafana
+   ```
+
+1. Run the following command to deploy the Grafana Helm Chart inside your namespace.
+
+   ```bash
+   helm install my-grafana grafana/grafana --namespace monitoring
+   ```
+
+   Where:
+
+   - `helm install`: Installs the chart by deploying it on the Kubernetes cluster
+   - `my-grafana`: The logical chart name that you provided
+   - `grafana/grafana`: The repository and package name to install
+   - `--namespace`: The Kubernetes namespace (i.e. `monitoring`) where you want to deploy the chart
+
+1. To verify the deployment status, run the following command and verify that `deployed` appears in the **STATUS** column:
+
+   ```bash
+   helm list -n monitoring
+   ```
+
+   You should see an output similar to the following:
+
+   ```bash
+   NAME            NAMESPACE       REVISION        UPDATED                                 STATUS          CHART          APP VERSION
+   my-grafana      monitoring      1               2024-01-13 23:06:42.737989554 +0000 UTC deployed        grafana-6.59.0 10.1.0
+   ```
+
+1. To check the overall status of all the objects in the namespace, run the following command:
+
+   ```bash
+   kubectl get all -n monitoring
+   ```
+
+   If you encounter errors or warnings in the **STATUS** column, check the logs and refer to the Troubleshooting section of this documentation.
+
+### Access Grafana
+
+This section describes the steps you must complete to access Grafana via web browser.
+
+1. Run the following `helm get notes` command:
+
+   ```bash
+   helm get notes my-grafana -n monitoring
+   ```
+
+   This command will print out the chart notes. You will the output `NOTES` that provide the complete instructions about:
+
+   - How to decode the login password for the Grafana admin account
+   - Access Grafana service to the web browser
+
+1. To get the Grafana admin password, run the command as follows:
+
+   ```bash
+   kubectl get secret --namespace monitoring my-grafana -o jsonpath="{.data.admin-password}" | base64 --decode ; echo
+   ```
+
+   It will give you a decoded `base64` string output which is the password for the admin account.
+
+1. Save the decoded password to a file on your machine.
+
+1. To access Grafana service on the web browser, run the following command:
+
+   ```bash
+   export POD_NAME=$(kubectl get pods --namespace monitoring -l "app.kubernetes.io/name=grafana,app.kubernetes.io/instance=my-grafana" -o jsonpath="{.items[0].metadata.name}")
+   ```
+
+   The above command will export a shell variable named `POD_NAME` that will save the complete name of the pod which got deployed.
+
+1. Run the following port forwarding command to direct the Grafana pod to listen to port `3000`:
+
+   ```bash
+   kubectl --namespace monitoring port-forward $POD_NAME 3000
+   ```
+
+   For more information about port-forwarding, refer to [Use Port Forwarding to Access Applications in a Cluster](https://kubernetes.io/docs/tasks/access-application-cluster/port-forward-access-application-cluster/).
+
+1. Navigate to `127.0.0.1:3000` in your browser.
+
+1. The Grafana sign-in page appears.
+
+1. To sign in, enter `admin` for the username.
+
+1. For the password paste it which you have saved to a file after decoding it earlier.
+
+## Customize Grafana default configuration
+
+Helm is a popular package manager for Kubernetes. It bundles Kubernetes resource manifests to be re-used across different environments. These manifests are written in a templating language, allowing you to provide configuration values via `values.yaml` file, or in-line using Helm, to replace the placeholders in the manifest where these configurations should reside.
+
+The `values.yaml` file allows you to customize the chart's configuration by specifying values for various parameters such as image versions, resource limits, service configurations, etc.
+
+By modifying the values in the `values.yaml` file, you can tailor the deployment of a Helm chart to your specific requirements by using the helm install or upgrade commands. For more information about configuring Helm, refer to [Values Files](https://helm.sh/docs/chart_template_guide/values_files/).
+
+### Download the values.yaml file
+
+In order to make any configuration changes, download the `values.yaml` file from the Grafana Helm Charts repository:
+
+https://github.com/grafana/helm-charts/blob/main/charts/grafana/values.yaml
+
+{{% admonition type="note" %}}
+Depending on your use case requirements, you can use a single YAML file that contains your configuration changes or you can create multiple YAML files.
+{{% /admonition %}}
+
+### Enable persistent storage **(recommended)**
+
+By default, persistent storage is disabled, which means that Grafana uses ephemeral storage, and all data will be stored within the container's file system. This data will be lost if the container is stopped, restarted, or if the container crashes.
+
+It is highly recommended that you enable persistent storage in Grafana Helm charts if you want to ensure that your data persists and is not lost in case of container restarts or failures.
+
+Enabling persistent storage in Grafana Helm charts ensures a reliable solution for running Grafana in production environments.
+
+To enable the persistent storage in the Grafana Helm charts, complete the following steps:
+
+1. Open the `values.yaml` file in your favorite editor.
+
+1. Edit the values and under the section of `persistence`, change the `enable` flag from `false` to `true`
+
+   ```yaml
+   .......
+   ............
+   ......
+   persistence:
+   type: pvc
+   enabled: true
+   # storageClassName: default
+   .......
+   ............
+   ......
+   ```
+
+1. Run the following `helm upgrade` command by specifying the `values.yaml` file to make the changes take effect:
+
+   ```bash
+   helm upgrade my-grafana grafana/grafana -f values.yaml -n monitoring
+   ```
+
+The PVC will now store all your data such as dashboards, data sources, and so on.
+
+### Install plugins (e.g. Zabbix app, Clock panel, etc.)
+
+You can install plugins in Grafana from the official and community [plugins page](https://grafana.com/grafana/plugins). These plugins allow you to add new visualization types, data sources, and applications to help you better visualize your data.
+
+Grafana currently supports three types of plugins: panel, data source, and app. For more information on managing plugins, refer to [Plugin Management](https://grafana.com/docs/grafana/latest/administration/plugin-management/).
+
+To install plugins in the Grafana Helm Charts, complete the following steps:
+
+1. Open the `values.yaml` file in your favorite editor.
+
+1. Find the line that says `plugins:` and under that section, define the plugins that you want to install.
+
+   ```yaml
+   .......
+   ............
+   ......
+   plugins:
+   # here we are installing two plugins, make sure to keep the indentation correct as written here.
+
+   - alexanderzobnin-zabbix-app
+   - grafana-clock-panel
+   .......
+   ............
+   ......
+   ```
+
+1. Save the changes and use the `helm upgrade` command to get these plugins installed:
+
+   ```bash
+   helm upgrade my-grafana grafana/grafana -f values.yaml -n monitoring
+   ```
+
+1. Navigate to `127.0.0.1:3000` in your browser.
+
+1. Login with admin credentials when the Grafana sign-in page appears.
+
+1. Navigate to UI -> Administration -> Plugins
+
+1. Search for the above plugins and they should be marked as installed.
+
+## Troubleshooting
+
+This section includes troubleshooting tips you might find helpful when deploying Grafana on Kubernetes via Helm.
+
+### Collect logs
+
+It is important to view the Grafana server logs while troubleshooting any issues.
+
+To check the Grafana logs, run the following command:
+
+```bash
+# dump Pod logs for a Deployment (single-container case)
+
+kubectl logs --namespace=monitoring deploy/my-grafana
+```
+
+If you have multiple containers running in the deployment, run the following command to obtain the logs only for the Grafana deployment:
+
+```bash
+# dump Pod logs for a Deployment (multi-container case)
+
+kubectl logs --namespace=monitoring deploy/grafana -c my-grafana
+```
+
+For more information about accessing Kubernetes application logs, refer to [Pods](https://kubernetes.io/docs/reference/kubectl/cheatsheet/#interacting-with-running-pods) and [Deployments](https://kubernetes.io/docs/reference/kubectl/cheatsheet/#interacting-with-deployments-and-services).
+
+### Increase log levels
+
+By default, the Grafana log level is set to `info`, but you can increase it to `debug` mode to fetch information needed to diagnose and troubleshoot a problem. For more information about Grafana log levels, refer to [Configuring logs](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana#log).
+
+To increase log level to `debug` mode, use the following steps:
+
+1. Open the `values.yaml` file in your favorite editor and search for the string `grafana.ini` and there you will find a section about log mode.
+
+1. Add level: `debug` just below the line `mode: console`
+
+   ```yaml
+   # This is the values.yaml file
+      .....
+   .......
+   ....
+   grafana.ini:
+   paths:
+      data: /var/lib/grafana/
+      .....
+   .......
+   ....
+      mode: console
+      level: debug
+   ```
+
+   Make sure to keep the indentation level the same otherwise it will not work.
+
+1. Now to apply this, run the `helm upgrade` command as follows:
+
+   ```bash
+   helm upgrade my-grafana grafana/grafana -f values.yaml -n monitoring
+   ```
+
+1. To verify it, access the Grafana UI in the browser using the provided `IP:Port`. The Grafana sign-in page appears.
+
+1. To sign in to Grafana, enter `admin` for the username and paste the password which was decoded earlier. Navigate to Server Admin > Settings and then search for log. You should see the level to `debug` mode.
+
+### Reset Grafana admin secrets (login credentials)
+
+By default the login credentials for the super admin account are generated via `secrets`. However, this can be changed easily. To achieve this, use the following steps:
+
+1. Edit the `values.yaml` file and search for the string `adminPassword`. There you can define a new password:
+
+   ```yaml
+   # Administrator credentials when not using an existing secret (see below)
+   adminUser: admin
+   adminPassword: admin
+   ```
+
+1. Then use the `helm upgrade` command as follows:
+
+   ```bash
+   helm upgrade my-grafana grafana/grafana -f values.yaml -n monitoring
+   ```
+
+   This command will now make your super admin login credentials as `admin` for both username and password.
+
+1. To verify it, sign in to Grafana, enter `admin` for both username and password. You should be able to login as super admin.
+
+## Uninstall the Grafana deployment
+
+To uninstall the Grafana deployment, run the command:
+
+`helm uninstall <RELEASE-NAME> <NAMESPACE-NAME>`
+
+```bash
+helm uninstall my-grafana -n monitoring
+```
+
+This deletes all of the objects from the given namespace monitoring.
+
+If you want to delete the namespace `monitoring`, then run the command:
+
+```bash
+kubectl delete namespace monitoring
+```
diff --git a/docs/sources/setup-grafana/installation/kubernetes/index.md b/docs/sources/setup-grafana/installation/kubernetes/index.md
index b9a0231fdb0a4..d6ca75911bb9b 100644
--- a/docs/sources/setup-grafana/installation/kubernetes/index.md
+++ b/docs/sources/setup-grafana/installation/kubernetes/index.md
@@ -15,7 +15,7 @@ weight: 500
 
 On this page, you will find instructions for installing and running Grafana on Kubernetes using Kubernetes manifests for the setup. If Helm is your preferred option, refer to [Grafana Helm community charts](https://github.com/grafana/helm-charts).
 
-Watch this video to learn more about installing Grafana on Kubernetes: {{< vimeo 871940219 >}}
+Watch this video to learn more about installing Grafana on Kubernetes: {{< youtube id="DEv5wtZxNCk" start="1872">}}
 
 ## Before you begin
 
@@ -499,6 +499,98 @@ By default, Kubernetes deployment rollout history remains in the system so that
 
 If you need to go back to any other `REVISION`, just repeat the steps above and use the correct revision number in the `--to-revision` parameter.
 
+## Provision Grafana resources using configuration files
+
+Provisioning can add, update, or delete resources specified in your configuration files when Grafana starts. For detailed information, refer to [Grafana Provisioning](/docs/grafana/<GRAFANA_VERSION>/administration/provisioning).
+
+This section outlines general instructions for provisioning Grafana resources within Kubernetes, using a persistent volume to supply the configuration files to the Grafana pod.
+
+1. Add a new `PersistentVolumeClaim` to the `grafana.yaml` file.
+
+   ```yaml
+   ---
+   apiVersion: v1
+   kind: PersistentVolumeClaim
+   metadata:
+     name: grafana-provisioning-pvc
+   spec:
+     accessModes:
+       - ReadWriteOnce
+     resources:
+       requests:
+         storage: 1Mi
+   ```
+
+1. In the `grafana.yaml` file, mount the persistent volume into `/etc/grafana/provisioning` as follows.
+
+   ```yaml
+   ...
+       volumeMounts:
+         - mountPath: /etc/grafana/provisioning
+           name: grafana-provisioning-pv
+         ...
+   volumes:
+     - name: grafana-provisioning-pv
+       persistentVolumeClaim:
+         claimName: grafana-provisioning-pvc
+   ...
+   ```
+
+1. Find or create the provision resources you want to add. For instance, create a `alerting.yaml` file adding a mute timing (alerting resource).
+
+   ```yaml
+   apiVersion: 1
+   muteTimes:
+     - orgId: 1
+       name: MuteWeekends
+       time_intervals:
+         - weekdays: [saturday, sunday]
+   ```
+
+1. By default, configuration files for alerting resources need to be placed in the `provisioning/alerting` directory.
+
+   Save the `alerting.yaml` file in a directory named `alerting`, as we will next supply this `alerting` directory to the `/etc/grafana/provisioning` folder of the Grafana pod.
+
+1. Verify first the content of the provisioning directory in the running Grafana pod.
+
+   ```bash
+   kubectl exec -n my-grafana <pod_name> -- ls /etc/grafana/provisioning/
+   ```
+
+   ```bash
+   kubectl exec -n my-grafana <pod_name> -- ls /etc/grafana/provisioning/alerting
+   ```
+
+   Because the `alerting` folder is not available yet, the last command should output a `No such file or directory` error.
+
+1. Copy the local `alerting` directory to `/etc/grafana/provisioning/` in the Grafana pod.
+
+   ```bash
+   kubectl cp alerting my-grafana/<pod_name>:/etc/grafana/provisioning/
+   ```
+
+   You can follow the same process to provision additional Grafana resources by supplying the following folders:
+
+   - `provisioning/dashboards`
+   - `provisioning/datasources`
+   - `provisioning/plugins`
+
+1. Verify the `alerting` directory in the running Grafana pod includes the `alerting.yaml` file.
+
+   ```bash
+   kubectl exec -n my-grafana <pod_name> -- ls /etc/grafana/provisioning/alerting
+   ```
+
+1. Restart the Grafana pod to provision the resources.
+
+   ```bash
+   kubectl rollout restart -n my-grafana deployment --selector=app=grafana
+   ```
+
+   Note that `rollout restart` kills the previous pod and scales a new pod. When the old pod terminates, you may have to enable port-forwarding in the new pod. For instructions, refer to the previous sections about port forwarding in this guide.
+
+1. Verify the Grafana resources are properly provisioned within the Grafana instance.
+
 ## Troubleshooting
 
 This section includes troubleshooting tips you might find helpful when deploying Grafana on Kubernetes.
diff --git a/docs/sources/setup-grafana/installation/mac/index.md b/docs/sources/setup-grafana/installation/mac/index.md
index dbb775f2a79a0..b00e49c6f8e93 100644
--- a/docs/sources/setup-grafana/installation/mac/index.md
+++ b/docs/sources/setup-grafana/installation/mac/index.md
@@ -61,6 +61,10 @@ To install Grafana on macOS using the standalone binaries, complete the followin
    ./bin/grafana server
    ```
 
+Alternatively, watch the Grafana for Beginners video below:
+
+{{< youtube id="T51Qa7eE3W8" >}}
+
 ## Next steps
 
 - [Start the Grafana server]({{< relref "../../start-restart-grafana" >}})
diff --git a/docs/sources/setup-grafana/installation/redhat-rhel-fedora/index.md b/docs/sources/setup-grafana/installation/redhat-rhel-fedora/index.md
index ba5d83dc62b49..92c077900aed1 100644
--- a/docs/sources/setup-grafana/installation/redhat-rhel-fedora/index.md
+++ b/docs/sources/setup-grafana/installation/redhat-rhel-fedora/index.md
@@ -21,10 +21,12 @@ If you install via RPM or the `.tar.gz` file, then you must manually update Graf
 
 If you install from the RPM repository, then Grafana is automatically updated every time you update your applications.
 
-| Grafana Version    | Package            | Repository                |
-| ------------------ | ------------------ | ------------------------- |
-| Grafana Enterprise | grafana-enterprise | `https://rpm.grafana.com` |
-| Grafana OSS        | grafana            | `https://rpm.grafana.com` |
+| Grafana Version           | Package            | Repository                     |
+| ------------------------- | ------------------ | ------------------------------ |
+| Grafana Enterprise        | grafana-enterprise | `https://rpm.grafana.com`      |
+| Grafana Enterprise (Beta) | grafana-enterprise | `https://rpm-beta.grafana.com` |
+| Grafana OSS               | grafana            | `https://rpm.grafana.com`      |
+| Grafana OSS (Beta)        | grafana            | `https://rpm-beta.grafana.com` |
 
 {{% admonition type="note" %}}
 Grafana Enterprise is the recommended and default edition. It is available for free and includes all the features of the OSS edition. You can also upgrade to the [full Enterprise feature set](/products/enterprise/?utm_source=grafana-install-page), which has support for [Enterprise plugins](/grafana/plugins/?enterprise=1&utcm_source=grafana-install-page).
@@ -32,6 +34,10 @@ Grafana Enterprise is the recommended and default edition. It is available for f
 
 To install Grafana from the RPM repository, complete the following steps:
 
+{{% admonition type="note" %}}
+If you wish to install beta versions of Grafana, substitute the repository URL for the beta URL listed above.
+{{% /admonition %}}
+
 1. Import the GPG key:
 
    ```bash
@@ -53,12 +59,6 @@ To install Grafana from the RPM repository, complete the following steps:
    sslcacert=/etc/pki/tls/certs/ca-bundle.crt
    ```
 
-1. To prevent beta versions from being installed, add the following exclude line to your `.repo` file.
-
-   ```bash
-   exclude=*beta*
-   ```
-
 1. To install Grafana OSS, run the following command:
 
    ```bash
diff --git a/docs/sources/setup-grafana/set-up-for-high-availability.md b/docs/sources/setup-grafana/set-up-for-high-availability.md
index 9d9b184d3add8..b36b64f1dd840 100644
--- a/docs/sources/setup-grafana/set-up-for-high-availability.md
+++ b/docs/sources/setup-grafana/set-up-for-high-availability.md
@@ -41,11 +41,9 @@ Once you have a Postgres or MySQL database available, you can configure your mul
 
 ## Alerting high availability
 
-Grafana Alerting provides a [high availability mode]({{< relref "../alerting/fundamentals/high-availability" >}}).
+Grafana Alerting provides a high availability mode. It preserves the semantics of legacy dashboard alerting by executing all alerts on every server and by sending notifications only once per alert. Load distribution between servers is not supported at this time.
 
-It preserves the semantics of legacy dashboard alerting by executing all alerts on every server and by sending notifications only once per alert. Load distribution between servers is not supported at this time.
-
-For instructions on setting up alerting high availability, refer to [Enable alerting high availability]({{< relref "../alerting/set-up/configure-high-availability" >}}).
+For further information and instructions on setting up alerting high availability, refer to [Enable alerting high availability]({{< relref "../alerting/set-up/configure-high-availability" >}}).
 
 **Legacy dashboard alerts**
 
diff --git a/docs/sources/setup-grafana/set-up-grafana-live.md b/docs/sources/setup-grafana/set-up-grafana-live.md
index 7540400027176..3c5e8385e76c3 100644
--- a/docs/sources/setup-grafana/set-up-grafana-live.md
+++ b/docs/sources/setup-grafana/set-up-grafana-live.md
@@ -137,7 +137,7 @@ cat /proc/<PROCESS_PID>/limits
 
 The open files limit shows approximately how many user connections your server can currently handle.
 
-To increase this limit, refer to [these instructions](https://docs.riak.com/riak/kv/2.2.3/using/performance/open-files-limit.1.html)for popular operating systems.
+To increase this limit, refer to [these instructions](https://docs.riak.com/riak/kv/2.2.3/using/performance/open-files-limit.1.html) for popular operating systems.
 
 #### Ephemeral port exhaustion
 
diff --git a/docs/sources/shared/alerts/alerting_provisioning.md b/docs/sources/shared/alerts/alerting_provisioning.md
new file mode 100644
index 0000000000000..c377aacbc666f
--- /dev/null
+++ b/docs/sources/shared/alerts/alerting_provisioning.md
@@ -0,0 +1,1760 @@
+---
+labels:
+  products:
+    - enterprise
+    - oss
+title: 'Alerting Provisioning HTTP API '
+---
+
+The Alerting provisioning API can be used to create, modify, and delete resources relevant to [Grafana Managed alerts]({{< relref "/docs/grafana/latest/alerting/alerting-rules/create-grafana-managed-rule" >}}). And is the one used by our [Grafana Terraform provider](https://registry.terraform.io/providers/grafana/grafana/latest/docs).
+
+For managing resources related to [data source-managed alerts]({{< relref "/docs/grafana/latest/alerting/alerting-rules/create-grafana-managed-rule" >}}) including Recording Rules, you can use [Mimir tool](https://grafana.com/docs/mimir/latest/manage/tools/mimirtool/) and [Cortex tool](https://github.com/grafana/cortex-tools#cortextool) respectively.
+
+## Information
+
+### Version
+
+1.1.0
+
+## Content negotiation
+
+### Consumes
+
+- application/json
+
+### Produces
+
+- application/json
+- text/yaml
+- application/yaml
+
+## All endpoints
+
+### Alert rules
+
+| Method | URI                                                              | Name                                                                    | Summary                                                               |
+| ------ | ---------------------------------------------------------------- | ----------------------------------------------------------------------- | --------------------------------------------------------------------- |
+| DELETE | /api/v1/provisioning/alert-rules/:uid                            | [route delete alert rule](#route-delete-alert-rule)                     | Delete a specific alert rule by UID.                                  |
+| GET    | /api/v1/provisioning/alert-rules/:uid                            | [route get alert rule](#route-get-alert-rule)                           | Get a specific alert rule by UID.                                     |
+| POST   | /api/v1/provisioning/alert-rules                                 | [route post alert rule](#route-post-alert-rule)                         | Create a new alert rule.                                              |
+| PUT    | /api/v1/provisioning/alert-rules/:uid                            | [route put alert rule](#route-put-alert-rule)                           | Update an existing alert rule.                                        |
+| GET    | /api/v1/provisioning/alert-rules/:uid/export                     | [route get alert rule export](#route-get-alert-rule-export)             | Export an alert rule in provisioning file format.                     |
+| GET    | /api/v1/provisioning/folder/:folderUid/rule-groups/:group        | [route get alert rule group](#route-get-alert-rule-group)               | Get a rule group.                                                     |
+| PUT    | /api/v1/provisioning/folder/:folderUid/rule-groups/:group        | [route put alert rule group](#route-put-alert-rule-group)               | Update the interval of a rule group or modify the rules of the group. |
+| GET    | /api/v1/provisioning/folder/:folderUid/rule-groups/:group/export | [route get alert rule group export](#route-get-alert-rule-group-export) | Export an alert rule group in provisioning file format.               |
+| GET    | /api/v1/provisioning/alert-rules                                 | [route get alert rules](#route-get-alert-rules)                         | Get all the alert rules.                                              |
+| GET    | /api/v1/provisioning/alert-rules/export                          | [route get alert rules export](#route-get-alert-rules-export)           | Export all alert rules in provisioning file format.                   |
+
+#### Example alert rules template
+
+```json
+{
+  "title": "TEST-API_1",
+  "ruleGroup": "API",
+  "folderUID": "FOLDER",
+  "noDataState": "OK",
+  "execErrState": "OK",
+  "for": "5m",
+  "orgId": 1,
+  "uid": "",
+  "condition": "B",
+  "annotations": {
+    "summary": "test_api_1"
+  },
+  "labels": {
+    "API": "test1"
+  },
+  "data": [
+    {
+      "refId": "A",
+      "queryType": "",
+      "relativeTimeRange": {
+        "from": 600,
+        "to": 0
+      },
+      "datasourceUid": " XXXXXXXXX-XXXXXXXXX-XXXXXXXXXX",
+      "model": {
+        "expr": "up",
+        "hide": false,
+        "intervalMs": 1000,
+        "maxDataPoints": 43200,
+        "refId": "A"
+      }
+    },
+    {
+      "refId": "B",
+      "queryType": "",
+      "relativeTimeRange": {
+        "from": 0,
+        "to": 0
+      },
+      "datasourceUid": "-100",
+      "model": {
+        "conditions": [
+          {
+            "evaluator": {
+              "params": [6],
+              "type": "gt"
+            },
+            "operator": {
+              "type": "and"
+            },
+            "query": {
+              "params": ["A"]
+            },
+            "reducer": {
+              "params": [],
+              "type": "last"
+            },
+            "type": "query"
+          }
+        ],
+        "datasource": {
+          "type": "__expr__",
+          "uid": "-100"
+        },
+        "hide": false,
+        "intervalMs": 1000,
+        "maxDataPoints": 43200,
+        "refId": "B",
+        "type": "classic_conditions"
+      }
+    }
+  ]
+}
+```
+
+### Contact points
+
+| Method | URI                                        | Name                                                              | Summary                                                |
+| ------ | ------------------------------------------ | ----------------------------------------------------------------- | ------------------------------------------------------ |
+| DELETE | /api/v1/provisioning/contact-points/:uid   | [route delete contactpoints](#route-delete-contactpoints)         | Delete a contact point.                                |
+| GET    | /api/v1/provisioning/contact-points        | [route get contactpoints](#route-get-contactpoints)               | Get all the contact points.                            |
+| POST   | /api/v1/provisioning/contact-points        | [route post contactpoints](#route-post-contactpoints)             | Create a contact point.                                |
+| PUT    | /api/v1/provisioning/contact-points/:uid   | [route put contactpoint](#route-put-contactpoint)                 | Update an existing contact point.                      |
+| GET    | /api/v1/provisioning/contact-points/export | [route get contactpoints export](#route-get-contactpoints-export) | Export all contact points in provisioning file format. |
+
+### Notification policies
+
+| Method | URI                                  | Name                                                          | Summary                                                          |
+| ------ | ------------------------------------ | ------------------------------------------------------------- | ---------------------------------------------------------------- |
+| DELETE | /api/v1/provisioning/policies        | [route reset policy tree](#route-reset-policy-tree)           | Clears the notification policy tree.                             |
+| GET    | /api/v1/provisioning/policies        | [route get policy tree](#route-get-policy-tree)               | Get the notification policy tree.                                |
+| PUT    | /api/v1/provisioning/policies        | [route put policy tree](#route-put-policy-tree)               | Sets the notification policy tree.                               |
+| GET    | /api/v1/provisioning/policies/export | [route get policy tree export](#route-get-policy-tree-export) | Export the notification policy tree in provisioning file format. |
+
+### Mute timings
+
+| Method | URI                                            | Name                                                            | Summary                                              |
+| ------ | ---------------------------------------------- | --------------------------------------------------------------- | ---------------------------------------------------- |
+| DELETE | /api/v1/provisioning/mute-timings/:name        | [route delete mute timing](#route-delete-mute-timing)           | Delete a mute timing.                                |
+| GET    | /api/v1/provisioning/mute-timings/:name        | [route get mute timing](#route-get-mute-timing)                 | Get a mute timing.                                   |
+| GET    | /api/v1/provisioning/mute-timings              | [route get mute timings](#route-get-mute-timings)               | Get all the mute timings.                            |
+| POST   | /api/v1/provisioning/mute-timings              | [route post mute timing](#route-post-mute-timing)               | Create a new mute timing.                            |
+| PUT    | /api/v1/provisioning/mute-timings/:name        | [route put mute timing](#route-put-mute-timing)                 | Replace an existing mute timing.                     |
+| GET    | /api/v1/provisioning/mute-timings/export       | [route get mute timings export](#route-get-mute-timings-export) | Export all mute timings in provisioning file format. |
+| GET    | /api/v1/provisioning/mute-timings/:name/export | [route get mute timing export](#route-get-mute-timing-export)   | Export a mute timing in provisioning file format.    |
+
+### Templates
+
+| Method | URI                                  | Name                                            | Summary                                   |
+| ------ | ------------------------------------ | ----------------------------------------------- | ----------------------------------------- |
+| DELETE | /api/v1/provisioning/templates/:name | [route delete template](#route-delete-template) | Delete a template.                        |
+| GET    | /api/v1/provisioning/templates/:name | [route get template](#route-get-template)       | Get a notification template.              |
+| GET    | /api/v1/provisioning/templates       | [route get templates](#route-get-templates)     | Get all notification templates.           |
+| PUT    | /api/v1/provisioning/templates/:name | [route put template](#route-put-template)       | Create or update a notification template. |
+
+## Edit resources in the Grafana UI
+
+By default, you cannot edit API-provisioned alerting resources in Grafana. To enable editing these resources in the Grafana UI, add the `X-Disable-Provenance` header to the following requests in the API:
+
+- `POST /api/v1/provisioning/alert-rules`
+- `PUT /api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}` (calling this endpoint will change provenance for all alert rules within the alert group)
+- `POST /api/v1/provisioning/contact-points`
+- `POST /api/v1/provisioning/mute-timings`
+- `PUT /api/v1/provisioning/policies`
+- `PUT /api/v1/provisioning/templates/{name}`
+
+To reset the notification policy tree to the default and unlock it for editing in the Grafana UI, use the `DELETE /api/v1/provisioning/policies` endpoint.
+
+## Paths
+
+### <span id="route-delete-alert-rule"></span> Delete a specific alert rule by UID. (_RouteDeleteAlertRule_)
+
+```
+DELETE /api/v1/provisioning/alert-rules/:uid
+```
+
+#### Parameters
+
+{{% responsive-table %}}
+
+| Name                       | Source   | Type   | Go type  | Separator | Required | Default | Description                                               |
+| -------------------------- | -------- | ------ | -------- | --------- | :------: | ------- | --------------------------------------------------------- |
+| UID                        | `path`   | string | `string` |           |    ✓     |         | Alert rule UID                                            |
+| X-Disable-Provenance: true | `header` | string | `string` |           |          |         | Allows editing of provisioned resources in the Grafana UI |
+
+{{% /responsive-table %}}
+
+#### All responses
+
+| Code                                | Status     | Description                              | Has headers | Schema                                        |
+| ----------------------------------- | ---------- | ---------------------------------------- | :---------: | --------------------------------------------- |
+| [204](#route-delete-alert-rule-204) | No Content | The alert rule was deleted successfully. |             | [schema](#route-delete-alert-rule-204-schema) |
+
+#### Responses
+
+##### <span id="route-delete-alert-rule-204"></span> 204 - The alert rule was deleted successfully.
+
+Status: No Content
+
+###### <span id="route-delete-alert-rule-204-schema"></span> Schema
+
+### <span id="route-delete-contactpoints"></span> Delete a contact point. (_RouteDeleteContactpoints_)
+
+```
+DELETE /api/v1/provisioning/contact-points/:uid
+```
+
+#### Consumes
+
+- application/json
+
+#### Parameters
+
+| Name | Source | Type   | Go type  | Separator | Required | Default | Description                                |
+| ---- | ------ | ------ | -------- | --------- | :------: | ------- | ------------------------------------------ |
+| UID  | `path` | string | `string` |           |    ✓     |         | UID is the contact point unique identifier |
+
+#### All responses
+
+| Code                                   | Status     | Description                                 | Has headers | Schema                                           |
+| -------------------------------------- | ---------- | ------------------------------------------- | :---------: | ------------------------------------------------ |
+| [204](#route-delete-contactpoints-204) | No Content | The contact point was deleted successfully. |             | [schema](#route-delete-contactpoints-204-schema) |
+
+#### Responses
+
+##### <span id="route-delete-contactpoints-204"></span> 204 - The contact point was deleted successfully.
+
+Status: No Content
+
+###### <span id="route-delete-contactpoints-204-schema"></span> Schema
+
+### <span id="route-delete-mute-timing"></span> Delete a mute timing. (_RouteDeleteMuteTiming_)
+
+```
+DELETE /api/v1/provisioning/mute-timings/:name
+```
+
+#### Parameters
+
+| Name | Source | Type   | Go type  | Separator | Required | Default | Description      |
+| ---- | ------ | ------ | -------- | --------- | :------: | ------- | ---------------- |
+| name | `path` | string | `string` |           |    ✓     |         | Mute timing name |
+
+#### All responses
+
+| Code                                 | Status     | Description                               | Has headers | Schema                                         |
+| ------------------------------------ | ---------- | ----------------------------------------- | :---------: | ---------------------------------------------- |
+| [204](#route-delete-mute-timing-204) | No Content | The mute timing was deleted successfully. |             | [schema](#route-delete-mute-timing-204-schema) |
+
+#### Responses
+
+##### <span id="route-delete-mute-timing-204"></span> 204 - The mute timing was deleted successfully.
+
+Status: No Content
+
+###### <span id="route-delete-mute-timing-204-schema"></span> Schema
+
+### <span id="route-delete-template"></span> Delete a template. (_RouteDeleteTemplate_)
+
+```
+DELETE /api/v1/provisioning/templates/:name
+```
+
+#### Parameters
+
+| Name | Source | Type   | Go type  | Separator | Required | Default | Description   |
+| ---- | ------ | ------ | -------- | --------- | :------: | ------- | ------------- |
+| name | `path` | string | `string` |           |    ✓     |         | Template Name |
+
+#### All responses
+
+| Code                              | Status     | Description                            | Has headers | Schema                                      |
+| --------------------------------- | ---------- | -------------------------------------- | :---------: | ------------------------------------------- |
+| [204](#route-delete-template-204) | No Content | The template was deleted successfully. |             | [schema](#route-delete-template-204-schema) |
+
+#### Responses
+
+##### <span id="route-delete-template-204"></span> 204 - The template was deleted successfully.
+
+Status: No Content
+
+###### <span id="route-delete-template-204-schema"></span> Schema
+
+### <span id="route-get-alert-rule"></span> Get a specific alert rule by UID. (_RouteGetAlertRule_)
+
+```
+GET /api/v1/provisioning/alert-rules/:uid
+```
+
+#### Parameters
+
+| Name | Source | Type   | Go type  | Separator | Required | Default | Description    |
+| ---- | ------ | ------ | -------- | --------- | :------: | ------- | -------------- |
+| UID  | `path` | string | `string` |           |    ✓     |         | Alert rule UID |
+
+#### All responses
+
+| Code                             | Status    | Description          | Has headers | Schema                                     |
+| -------------------------------- | --------- | -------------------- | :---------: | ------------------------------------------ |
+| [200](#route-get-alert-rule-200) | OK        | ProvisionedAlertRule |             | [schema](#route-get-alert-rule-200-schema) |
+| [404](#route-get-alert-rule-404) | Not Found | Not found.           |             | [schema](#route-get-alert-rule-404-schema) |
+
+#### Responses
+
+##### <span id="route-get-alert-rule-200"></span> 200 - ProvisionedAlertRule
+
+Status: OK
+
+###### <span id="route-get-alert-rule-200-schema"></span> Schema
+
+[ProvisionedAlertRule](#provisioned-alert-rule)
+
+##### <span id="route-get-alert-rule-404"></span> 404 - Not found.
+
+Status: Not Found
+
+###### <span id="route-get-alert-rule-404-schema"></span> Schema
+
+### <span id="route-get-alert-rule-export"></span> Export an alert rule in provisioning file format. (_RouteGetAlertRuleExport_)
+
+```
+GET /api/v1/provisioning/alert-rules/:uid/export
+```
+
+#### Produces
+
+- application/json
+- application/yaml
+- application/terraform+hcl
+- text/yaml
+- text/hcl
+
+#### Parameters
+
+| Name     | Source  | Type    | Go type  | Separator | Required | Default  | Description                                                                                                                       |
+| -------- | ------- | ------- | -------- | --------- | :------: | -------- | --------------------------------------------------------------------------------------------------------------------------------- |
+| UID      | `path`  | string  | `string` |           |    ✓     |          | Alert rule UID                                                                                                                    |
+| download | `query` | boolean | `bool`   |           |          |          | Whether to initiate a download of the file or not.                                                                                |
+| format   | `query` | string  | `string` |           |          | `"yaml"` | Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence. |
+
+#### All responses
+
+| Code                                    | Status    | Description        | Has headers | Schema                                            |
+| --------------------------------------- | --------- | ------------------ | :---------: | ------------------------------------------------- |
+| [200](#route-get-alert-rule-export-200) | OK        | AlertingFileExport |             | [schema](#route-get-alert-rule-export-200-schema) |
+| [404](#route-get-alert-rule-export-404) | Not Found | Not found.         |             | [schema](#route-get-alert-rule-export-404-schema) |
+
+#### Responses
+
+##### <span id="route-get-alert-rule-export-200"></span> 200 - AlertingFileExport
+
+Status: OK
+
+###### <span id="route-get-alert-rule-export-200-schema"></span> Schema
+
+[AlertingFileExport](#alerting-file-export)
+
+##### <span id="route-get-alert-rule-export-404"></span> 404 - Not found.
+
+Status: Not Found
+
+###### <span id="route-get-alert-rule-export-404-schema"></span> Schema
+
+### <span id="route-get-alert-rule-group"></span> Get a rule group. (_RouteGetAlertRuleGroup_)
+
+```
+GET /api/v1/provisioning/folder/:folderUid/rule-groups/:group
+```
+
+#### Parameters
+
+| Name      | Source | Type   | Go type  | Separator | Required | Default | Description |
+| --------- | ------ | ------ | -------- | --------- | :------: | ------- | ----------- |
+| FolderUID | `path` | string | `string` |           |    ✓     |         |             |
+| Group     | `path` | string | `string` |           |    ✓     |         |             |
+
+#### All responses
+
+| Code                                   | Status    | Description    | Has headers | Schema                                           |
+| -------------------------------------- | --------- | -------------- | :---------: | ------------------------------------------------ |
+| [200](#route-get-alert-rule-group-200) | OK        | AlertRuleGroup |             | [schema](#route-get-alert-rule-group-200-schema) |
+| [404](#route-get-alert-rule-group-404) | Not Found | Not found.     |             | [schema](#route-get-alert-rule-group-404-schema) |
+
+#### Responses
+
+##### <span id="route-get-alert-rule-group-200"></span> 200 - AlertRuleGroup
+
+Status: OK
+
+###### <span id="route-get-alert-rule-group-200-schema"></span> Schema
+
+[AlertRuleGroup](#alert-rule-group)
+
+##### <span id="route-get-alert-rule-group-404"></span> 404 - Not found.
+
+Status: Not Found
+
+###### <span id="route-get-alert-rule-group-404-schema"></span> Schema
+
+### <span id="route-get-alert-rule-group-export"></span> Export an alert rule group in provisioning file format. (_RouteGetAlertRuleGroupExport_)
+
+```
+GET /api/v1/provisioning/folder/:folderUid/rule-groups/:group/export
+```
+
+#### Produces
+
+- application/json
+- application/yaml
+- application/terraform+hcl
+- text/yaml
+- text/hcl
+
+#### Parameters
+
+| Name      | Source  | Type    | Go type  | Separator | Required | Default  | Description                                                                                                                            |
+| --------- | ------- | ------- | -------- | --------- | :------: | -------- | -------------------------------------------------------------------------------------------------------------------------------------- |
+| FolderUID | `path`  | string  | `string` |           |    ✓     |          |                                                                                                                                        |
+| Group     | `path`  | string  | `string` |           |    ✓     |          |                                                                                                                                        |
+| download  | `query` | boolean | `bool`   |           |          |          | Whether to initiate a download of the file or not.                                                                                     |
+| format    | `query` | string  | `string` |           |          | `"yaml"` | Format of the downloaded file, either yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence. |
+
+#### All responses
+
+| Code                                          | Status    | Description        | Has headers | Schema                                                  |
+| --------------------------------------------- | --------- | ------------------ | :---------: | ------------------------------------------------------- |
+| [200](#route-get-alert-rule-group-export-200) | OK        | AlertingFileExport |             | [schema](#route-get-alert-rule-group-export-200-schema) |
+| [404](#route-get-alert-rule-group-export-404) | Not Found | Not found.         |             | [schema](#route-get-alert-rule-group-export-404-schema) |
+
+#### Responses
+
+##### <span id="route-get-alert-rule-group-export-200"></span> 200 - AlertingFileExport
+
+Status: OK
+
+###### <span id="route-get-alert-rule-group-export-200-schema"></span> Schema
+
+[AlertingFileExport](#alerting-file-export)
+
+##### <span id="route-get-alert-rule-group-export-404"></span> 404 - Not found.
+
+Status: Not Found
+
+###### <span id="route-get-alert-rule-group-export-404-schema"></span> Schema
+
+### <span id="route-get-alert-rules"></span> Get all the alert rules. (_RouteGetAlertRules_)
+
+```
+GET /api/v1/provisioning/alert-rules
+```
+
+#### All responses
+
+| Code                              | Status | Description           | Has headers | Schema                                      |
+| --------------------------------- | ------ | --------------------- | :---------: | ------------------------------------------- |
+| [200](#route-get-alert-rules-200) | OK     | ProvisionedAlertRules |             | [schema](#route-get-alert-rules-200-schema) |
+
+#### Responses
+
+##### <span id="route-get-alert-rules-200"></span> 200 - ProvisionedAlertRules
+
+Status: OK
+
+###### <span id="route-get-alert-rules-200-schema"></span> Schema
+
+[ProvisionedAlertRules](#provisioned-alert-rules)
+
+### <span id="route-get-alert-rules-export"></span> Export all alert rules in provisioning file format. (_RouteGetAlertRulesExport_)
+
+```
+GET /api/v1/provisioning/alert-rules/export
+```
+
+#### Produces
+
+- application/json
+- application/yaml
+- application/terraform+hcl
+- text/yaml
+- text/hcl
+
+#### Parameters
+
+| Name     | Source  | Type    | Go type  | Separator | Required | Default  | Description                                                                                                                            |
+| -------- | ------- | ------- | -------- | --------- | :------: | -------- | -------------------------------------------------------------------------------------------------------------------------------------- |
+| download | `query` | boolean | `bool`   |           |          |          | Whether to initiate a download of the file or not.                                                                                     |
+| format   | `query` | string  | `string` |           |          | `"yaml"` | Format of the downloaded file, either yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence. |
+
+#### All responses
+
+| Code                                     | Status    | Description        | Has headers | Schema                                             |
+| ---------------------------------------- | --------- | ------------------ | :---------: | -------------------------------------------------- |
+| [200](#route-get-alert-rules-export-200) | OK        | AlertingFileExport |             | [schema](#route-get-alert-rules-export-200-schema) |
+| [404](#route-get-alert-rules-export-404) | Not Found | Not found.         |             | [schema](#route-get-alert-rules-export-404-schema) |
+
+#### Responses
+
+##### <span id="route-get-alert-rules-export-200"></span> 200 - AlertingFileExport
+
+Status: OK
+
+###### <span id="route-get-alert-rules-export-200-schema"></span> Schema
+
+[AlertingFileExport](#alerting-file-export)
+
+##### <span id="route-get-alert-rules-export-404"></span> 404 - Not found.
+
+Status: Not Found
+
+###### <span id="route-get-alert-rules-export-404-schema"></span> Schema
+
+### <span id="route-get-contactpoints"></span> Get all the contact points. (_RouteGetContactpoints_)
+
+```
+GET /api/v1/provisioning/contact-points
+```
+
+#### Parameters
+
+| Name | Source  | Type   | Go type  | Separator | Required | Default | Description    |
+| ---- | ------- | ------ | -------- | --------- | :------: | ------- | -------------- |
+| name | `query` | string | `string` |           |          |         | Filter by name |
+
+#### All responses
+
+| Code                                | Status | Description   | Has headers | Schema                                        |
+| ----------------------------------- | ------ | ------------- | :---------: | --------------------------------------------- |
+| [200](#route-get-contactpoints-200) | OK     | ContactPoints |             | [schema](#route-get-contactpoints-200-schema) |
+
+#### Responses
+
+##### <span id="route-get-contactpoints-200"></span> 200 - ContactPoints
+
+Status: OK
+
+###### <span id="route-get-contactpoints-200-schema"></span> Schema
+
+[ContactPoints](#contact-points)
+
+### <span id="route-get-contactpoints-export"></span> Export all contact points in provisioning file format. (_RouteGetContactpointsExport_)
+
+```
+GET /api/v1/provisioning/contact-points/export
+```
+
+#### Produces
+
+- application/json
+- application/yaml
+- application/terraform+hcl
+- text/yaml
+- text/hcl
+
+#### Parameters
+
+| Name     | Source  | Type    | Go type  | Separator | Required | Default  | Description                                                                                                                                                                                     |
+| -------- | ------- | ------- | -------- | --------- | :------: | -------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| decrypt  | `query` | boolean | `bool`   |           |          |          | Whether any contained secure settings should be decrypted or left redacted. Redacted settings will contain RedactedValue instead. Currently, only org admin can view decrypted secure settings. |
+| download | `query` | boolean | `bool`   |           |          |          | Whether to initiate a download of the file or not.                                                                                                                                              |
+| format   | `query` | string  | `string` |           |          | `"yaml"` | Format of the downloaded file, either yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.                                                          |
+| name     | `query` | string  | `string` |           |          |          | Filter by name                                                                                                                                                                                  |
+
+#### All responses
+
+| Code                                       | Status    | Description        | Has headers | Schema                                               |
+| ------------------------------------------ | --------- | ------------------ | :---------: | ---------------------------------------------------- |
+| [200](#route-get-contactpoints-export-200) | OK        | AlertingFileExport |             | [schema](#route-get-contactpoints-export-200-schema) |
+| [403](#route-get-contactpoints-export-403) | Forbidden | PermissionDenied   |             | [schema](#route-get-contactpoints-export-403-schema) |
+
+#### Responses
+
+##### <span id="route-get-contactpoints-export-200"></span> 200 - AlertingFileExport
+
+Status: OK
+
+###### <span id="route-get-contactpoints-export-200-schema"></span> Schema
+
+[AlertingFileExport](#alerting-file-export)
+
+##### <span id="route-get-contactpoints-export-403"></span> 403 - PermissionDenied
+
+Status: Forbidden
+
+###### <span id="route-get-contactpoints-export-403-schema"></span> Schema
+
+[PermissionDenied](#permission-denied)
+
+### <span id="route-get-mute-timing"></span> Get a mute timing. (_RouteGetMuteTiming_)
+
+```
+GET /api/v1/provisioning/mute-timings/:name
+```
+
+#### Parameters
+
+| Name | Source | Type   | Go type  | Separator | Required | Default | Description      |
+| ---- | ------ | ------ | -------- | --------- | :------: | ------- | ---------------- |
+| name | `path` | string | `string` |           |    ✓     |         | Mute timing name |
+
+#### All responses
+
+| Code                              | Status    | Description      | Has headers | Schema                                      |
+| --------------------------------- | --------- | ---------------- | :---------: | ------------------------------------------- |
+| [200](#route-get-mute-timing-200) | OK        | MuteTimeInterval |             | [schema](#route-get-mute-timing-200-schema) |
+| [404](#route-get-mute-timing-404) | Not Found | Not found.       |             | [schema](#route-get-mute-timing-404-schema) |
+
+#### Responses
+
+##### <span id="route-get-mute-timing-200"></span> 200 - MuteTimeInterval
+
+Status: OK
+
+###### <span id="route-get-mute-timing-200-schema"></span> Schema
+
+[MuteTimeInterval](#mute-time-interval)
+
+##### <span id="route-get-mute-timing-404"></span> 404 - Not found.
+
+Status: Not Found
+
+###### <span id="route-get-mute-timing-404-schema"></span> Schema
+
+### <span id="route-get-mute-timings"></span> Get all the mute timings. (_RouteGetMuteTimings_)
+
+```
+GET /api/v1/provisioning/mute-timings
+```
+
+#### All responses
+
+| Code                               | Status | Description | Has headers | Schema                                       |
+| ---------------------------------- | ------ | ----------- | :---------: | -------------------------------------------- |
+| [200](#route-get-mute-timings-200) | OK     | MuteTimings |             | [schema](#route-get-mute-timings-200-schema) |
+
+#### Responses
+
+##### <span id="route-get-mute-timings-200"></span> 200 - MuteTimings
+
+Status: OK
+
+###### <span id="route-get-mute-timings-200-schema"></span> Schema
+
+[MuteTimings](#mute-timings)
+
+### <span id="route-get-mute-timings-export"></span> Export all mute timings in provisioning file format. (_RouteGetMuteTimingsExport_)
+
+```
+GET /api/v1/provisioning/mute-timings/export
+```
+
+#### Produces
+
+- application/json
+- application/yaml
+- application/terraform+hcl
+- text/yaml
+- text/hcl
+
+#### Parameters
+
+| Name     | Source  | Type    | Go type  | Separator | Required | Default  | Description                                                                                                                            |
+| -------- | ------- | ------- | -------- | --------- | :------: | -------- | -------------------------------------------------------------------------------------------------------------------------------------- |
+| download | `query` | boolean | `bool`   |           |          |          | Whether to initiate a download of the file or not.                                                                                     |
+| format   | `query` | string  | `string` |           |          | `"yaml"` | Format of the downloaded file, either yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence. |
+
+#### All responses
+
+| Code                                      | Status    | Description       | Has headers | Schema                                              |
+| ----------------------------------------- | --------- | ----------------- | :---------: | --------------------------------------------------- |
+| [200](#route-get-mute-timings-export-200) | OK        | MuteTimingsExport |             | [schema](#route-get-mute-timings-export-200-schema) |
+| [403](#route-get-mute-timings-export-403) | Forbidden | PermissionDenied  |             | [schema](#route-get-mute-timings-export-403-schema) |
+
+#### Responses
+
+##### <span id="route-get-mute-timings-export-200"></span> 200 - MuteTimingsExport
+
+Status: OK
+
+###### <span id="route-get-mute-timings-export-200-schema"></span> Schema
+
+[AlertingFileExport](#alerting-file-export)
+
+##### <span id="route-get-mute-timings-export-403"></span> 403 - PermissionDenied
+
+Status: Forbidden
+
+###### <span id="route-get-mute-timings-export-403-schema"></span> Schema
+
+[PermissionDenied](#permission-denied)
+
+### <span id="route-get-mute-timing-export"></span> Export a mute timing in provisioning file format. (_RouteGetMuteTimingExport_)
+
+```
+GET /api/v1/provisioning/mute-timings/:name/export
+```
+
+#### Produces
+
+- application/json
+- application/yaml
+- application/terraform+hcl
+- text/yaml
+- text/hcl
+
+#### Parameters
+
+| Name     | Source  | Type    | Go type  | Separator | Required | Default  | Description                                                                                                                            |
+| -------- | ------- | ------- | -------- | --------- | :------: | -------- | -------------------------------------------------------------------------------------------------------------------------------------- |
+| name     | `path`  | string  | `string` |           |    ✓     |          | Mute timing name.                                                                                                                      |
+| download | `query` | boolean | `bool`   |           |          |          | Whether to initiate a download of the file or not.                                                                                     |
+| format   | `query` | string  | `string` |           |          | `"yaml"` | Format of the downloaded file, either yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence. |
+
+#### All responses
+
+| Code                                     | Status    | Description      | Has headers | Schema                                              |
+| ---------------------------------------- | --------- | ---------------- | :---------: | --------------------------------------------------- |
+| [200](#route-get-mute-timing-export-200) | OK        | MuteTimingExport |             | [schema](#route-get-mute-timings-export-200-schema) |
+| [403](#route-get-mute-timing-export-403) | Forbidden | PermissionDenied |             | [schema](#route-get-mute-timings-export-403-schema) |
+
+#### Responses
+
+##### <span id="route-get-mute-timing-export-200"></span> 200 - MuteTimingExport
+
+Status: OK
+
+###### <span id="route-get-mute-timing-export-200-schema"></span> Schema
+
+[AlertingFileExport](#alerting-file-export)
+
+##### <span id="route-get-mute-timing-export-403"></span> 403 - PermissionDenied
+
+Status: Forbidden
+
+###### <span id="route-get-mute-timing-export-403-schema"></span> Schema
+
+[PermissionDenied](#permission-denied)
+
+### <span id="route-get-policy-tree"></span> Get the notification policy tree. (_RouteGetPolicyTree_)
+
+```
+GET /api/v1/provisioning/policies
+```
+
+#### All responses
+
+| Code                              | Status | Description | Has headers | Schema                                      |
+| --------------------------------- | ------ | ----------- | :---------: | ------------------------------------------- |
+| [200](#route-get-policy-tree-200) | OK     | Route       |             | [schema](#route-get-policy-tree-200-schema) |
+
+#### Responses
+
+##### <span id="route-get-policy-tree-200"></span> 200 - Route
+
+Status: OK
+
+###### <span id="route-get-policy-tree-200-schema"></span> Schema
+
+[Route](#route)
+
+### <span id="route-get-policy-tree-export"></span> Export the notification policy tree in provisioning file format. (_RouteGetPolicyTreeExport_)
+
+```
+GET /api/v1/provisioning/policies/export
+```
+
+#### Produces
+
+- application/json
+- application/yaml
+- application/terraform+hcl
+- text/yaml
+- text/hcl
+
+#### Parameters
+
+| Name     | Source  | Type    | Go type  | Separator | Required | Default  | Description                                                                                                                            |
+| -------- | ------- | ------- | -------- | --------- | :------: | -------- | -------------------------------------------------------------------------------------------------------------------------------------- |
+| download | `query` | boolean | `bool`   |           |          |          | Whether to initiate a download of the file or not.                                                                                     |
+| format   | `query` | string  | `string` |           |          | `"yaml"` | Format of the downloaded file, either yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence. |
+
+#### All responses
+
+| Code                                     | Status    | Description        | Has headers | Schema                                             |
+| ---------------------------------------- | --------- | ------------------ | :---------: | -------------------------------------------------- |
+| [200](#route-get-policy-tree-export-200) | OK        | AlertingFileExport |             | [schema](#route-get-policy-tree-export-200-schema) |
+| [404](#route-get-policy-tree-export-404) | Not Found | NotFound           |             | [schema](#route-get-policy-tree-export-404-schema) |
+
+#### Responses
+
+##### <span id="route-get-policy-tree-export-200"></span> 200 - AlertingFileExport
+
+Status: OK
+
+###### <span id="route-get-policy-tree-export-200-schema"></span> Schema
+
+[AlertingFileExport](#alerting-file-export)
+
+##### <span id="route-get-policy-tree-export-404"></span> 404 - NotFound
+
+Status: Not Found
+
+###### <span id="route-get-policy-tree-export-404-schema"></span> Schema
+
+[NotFound](#not-found)
+
+### <span id="route-get-template"></span> Get a notification template. (_RouteGetTemplate_)
+
+```
+GET /api/v1/provisioning/templates/:name
+```
+
+#### Parameters
+
+| Name | Source | Type   | Go type  | Separator | Required | Default | Description   |
+| ---- | ------ | ------ | -------- | --------- | :------: | ------- | ------------- |
+| name | `path` | string | `string` |           |    ✓     |         | Template Name |
+
+#### All responses
+
+| Code                           | Status    | Description          | Has headers | Schema                                   |
+| ------------------------------ | --------- | -------------------- | :---------: | ---------------------------------------- |
+| [200](#route-get-template-200) | OK        | NotificationTemplate |             | [schema](#route-get-template-200-schema) |
+| [404](#route-get-template-404) | Not Found | Not found.           |             | [schema](#route-get-template-404-schema) |
+
+#### Responses
+
+##### <span id="route-get-template-200"></span> 200 - NotificationTemplate
+
+Status: OK
+
+###### <span id="route-get-template-200-schema"></span> Schema
+
+[NotificationTemplate](#notification-template)
+
+##### <span id="route-get-template-404"></span> 404 - Not found.
+
+Status: Not Found
+
+###### <span id="route-get-template-404-schema"></span> Schema
+
+### <span id="route-get-templates"></span> Get all notification templates. (_RouteGetTemplates_)
+
+```
+GET /api/v1/provisioning/templates
+```
+
+#### All responses
+
+| Code                            | Status    | Description           | Has headers | Schema                                    |
+| ------------------------------- | --------- | --------------------- | :---------: | ----------------------------------------- |
+| [200](#route-get-templates-200) | OK        | NotificationTemplates |             | [schema](#route-get-templates-200-schema) |
+| [404](#route-get-templates-404) | Not Found | Not found.            |             | [schema](#route-get-templates-404-schema) |
+
+#### Responses
+
+##### <span id="route-get-templates-200"></span> 200 - NotificationTemplates
+
+Status: OK
+
+###### <span id="route-get-templates-200-schema"></span> Schema
+
+[NotificationTemplates](#notification-templates)
+
+##### <span id="route-get-templates-404"></span> 404 - Not found.
+
+Status: Not Found
+
+###### <span id="route-get-templates-404-schema"></span> Schema
+
+### <span id="route-post-alert-rule"></span> Create a new alert rule. (_RoutePostAlertRule_)
+
+```
+POST /api/v1/provisioning/alert-rules
+```
+
+#### Consumes
+
+- application/json
+
+#### Parameters
+
+{{% responsive-table %}}
+
+| Name                       | Source   | Type                                            | Go type                       | Separator | Required | Default | Description                                               |
+| -------------------------- | -------- | ----------------------------------------------- | ----------------------------- | --------- | :------: | ------- | --------------------------------------------------------- |
+| X-Disable-Provenance: true | `header` | string                                          | `string`                      |           |          |         | Allows editing of provisioned resources in the Grafana UI |
+| Body                       | `body`   | [ProvisionedAlertRule](#provisioned-alert-rule) | `models.ProvisionedAlertRule` |           |          |         |                                                           |
+
+{{% /responsive-table %}}
+
+#### All responses
+
+| Code                              | Status      | Description          | Has headers | Schema                                      |
+| --------------------------------- | ----------- | -------------------- | :---------: | ------------------------------------------- |
+| [201](#route-post-alert-rule-201) | Created     | ProvisionedAlertRule |             | [schema](#route-post-alert-rule-201-schema) |
+| [400](#route-post-alert-rule-400) | Bad Request | ValidationError      |             | [schema](#route-post-alert-rule-400-schema) |
+
+#### Responses
+
+##### <span id="route-post-alert-rule-201"></span> 201 - ProvisionedAlertRule
+
+Status: Created
+
+###### <span id="route-post-alert-rule-201-schema"></span> Schema
+
+[ProvisionedAlertRule](#provisioned-alert-rule)
+
+##### <span id="route-post-alert-rule-400"></span> 400 - ValidationError
+
+Status: Bad Request
+
+###### <span id="route-post-alert-rule-400-schema"></span> Schema
+
+[ValidationError](#validation-error)
+
+### <span id="route-post-contactpoints"></span> Create a contact point. (_RoutePostContactpoints_)
+
+```
+POST /api/v1/provisioning/contact-points
+```
+
+#### Consumes
+
+- application/json
+
+#### Parameters
+
+{{% responsive-table %}}
+
+| Name                       | Source   | Type                                            | Go type                       | Separator | Required | Default | Description                                               |
+| -------------------------- | -------- | ----------------------------------------------- | ----------------------------- | --------- | :------: | ------- | --------------------------------------------------------- |
+| X-Disable-Provenance: true | `header` | string                                          | `string`                      |           |          |         | Allows editing of provisioned resources in the Grafana UI |
+| Body                       | `body`   | [EmbeddedContactPoint](#embedded-contact-point) | `models.EmbeddedContactPoint` |           |          |         |                                                           |
+
+{{% /responsive-table %}}
+
+#### All responses
+
+| Code                                 | Status      | Description          | Has headers | Schema                                         |
+| ------------------------------------ | ----------- | -------------------- | :---------: | ---------------------------------------------- |
+| [202](#route-post-contactpoints-202) | Accepted    | EmbeddedContactPoint |             | [schema](#route-post-contactpoints-202-schema) |
+| [400](#route-post-contactpoints-400) | Bad Request | ValidationError      |             | [schema](#route-post-contactpoints-400-schema) |
+
+#### Responses
+
+##### <span id="route-post-contactpoints-202"></span> 202 - EmbeddedContactPoint
+
+Status: Accepted
+
+###### <span id="route-post-contactpoints-202-schema"></span> Schema
+
+[EmbeddedContactPoint](#embedded-contact-point)
+
+##### <span id="route-post-contactpoints-400"></span> 400 - ValidationError
+
+Status: Bad Request
+
+###### <span id="route-post-contactpoints-400-schema"></span> Schema
+
+[ValidationError](#validation-error)
+
+### <span id="route-post-mute-timing"></span> Create a new mute timing. (_RoutePostMuteTiming_)
+
+```
+POST /api/v1/provisioning/mute-timings
+```
+
+#### Consumes
+
+- application/json
+
+#### Parameters
+
+{{% responsive-table %}}
+
+| Name                       | Source   | Type                                    | Go type                   | Separator | Required | Default | Description                                               |
+| -------------------------- | -------- | --------------------------------------- | ------------------------- | --------- | :------: | ------- | --------------------------------------------------------- |
+| X-Disable-Provenance: true | `header` | string                                  | `string`                  |           |          |         | Allows editing of provisioned resources in the Grafana UI |
+| Body                       | `body`   | [MuteTimeInterval](#mute-time-interval) | `models.MuteTimeInterval` |           |          |         |                                                           |
+
+{{% /responsive-table %}}
+
+#### All responses
+
+| Code                               | Status      | Description      | Has headers | Schema                                       |
+| ---------------------------------- | ----------- | ---------------- | :---------: | -------------------------------------------- |
+| [201](#route-post-mute-timing-201) | Created     | MuteTimeInterval |             | [schema](#route-post-mute-timing-201-schema) |
+| [400](#route-post-mute-timing-400) | Bad Request | ValidationError  |             | [schema](#route-post-mute-timing-400-schema) |
+
+#### Responses
+
+##### <span id="route-post-mute-timing-201"></span> 201 - MuteTimeInterval
+
+Status: Created
+
+###### <span id="route-post-mute-timing-201-schema"></span> Schema
+
+[MuteTimeInterval](#mute-time-interval)
+
+##### <span id="route-post-mute-timing-400"></span> 400 - ValidationError
+
+Status: Bad Request
+
+###### <span id="route-post-mute-timing-400-schema"></span> Schema
+
+[ValidationError](#validation-error)
+
+### <span id="route-put-alert-rule"></span> Update an existing alert rule. (_RoutePutAlertRule_)
+
+```
+PUT /api/v1/provisioning/alert-rules/:uid
+```
+
+#### Consumes
+
+- application/json
+
+#### Parameters
+
+{{% responsive-table %}}
+
+| Name                       | Source   | Type                                            | Go type                       | Separator | Required | Default | Description                                               |
+| -------------------------- | -------- | ----------------------------------------------- | ----------------------------- | --------- | :------: | ------- | --------------------------------------------------------- |
+| UID                        | `path`   | string                                          | `string`                      |           |    ✓     |         | Alert rule UID                                            |
+| X-Disable-Provenance: true | `header` | string                                          | `string`                      |           |          |         | Allows editing of provisioned resources in the Grafana UI |
+| Body                       | `body`   | [ProvisionedAlertRule](#provisioned-alert-rule) | `models.ProvisionedAlertRule` |           |          |         |                                                           |
+
+{{% /responsive-table %}}
+
+#### All responses
+
+| Code                             | Status      | Description          | Has headers | Schema                                     |
+| -------------------------------- | ----------- | -------------------- | :---------: | ------------------------------------------ |
+| [200](#route-put-alert-rule-200) | OK          | ProvisionedAlertRule |             | [schema](#route-put-alert-rule-200-schema) |
+| [400](#route-put-alert-rule-400) | Bad Request | ValidationError      |             | [schema](#route-put-alert-rule-400-schema) |
+
+#### Responses
+
+##### <span id="route-put-alert-rule-200"></span> 200 - ProvisionedAlertRule
+
+Status: OK
+
+###### <span id="route-put-alert-rule-200-schema"></span> Schema
+
+[ProvisionedAlertRule](#provisioned-alert-rule)
+
+##### <span id="route-put-alert-rule-400"></span> 400 - ValidationError
+
+Status: Bad Request
+
+###### <span id="route-put-alert-rule-400-schema"></span> Schema
+
+[ValidationError](#validation-error)
+
+### <span id="route-put-alert-rule-group"></span> Update the interval or alert rules of a rule group. (_RoutePutAlertRuleGroup_)
+
+```
+PUT /api/v1/provisioning/folder/:folderUid/rule-groups/:group
+```
+
+#### Consumes
+
+- application/json
+
+#### Parameters
+
+{{% responsive-table %}}
+
+| Name                       | Source   | Type                                | Go type                 | Separator | Required | Default | Description                                                                                             |
+| -------------------------- | -------- | ----------------------------------- | ----------------------- | --------- | :------: | ------- | ------------------------------------------------------------------------------------------------------- |
+| FolderUID                  | `path`   | string                              | `string`                |           |    ✓     |         |                                                                                                         |
+| Group                      | `path`   | string                              | `string`                |           |    ✓     |         |                                                                                                         |
+| X-Disable-Provenance: true | `header` | string                              | `string`                |           |          |         | Allows editing of provisioned resources in the Grafana UI                                               |
+| Body                       | `body`   | [AlertRuleGroup](#alert-rule-group) | `models.AlertRuleGroup` |           |          |         | This action is idempotent and rules included in this body will overwrite configured rules for the group |
+
+{{% /responsive-table %}}
+
+#### All responses
+
+| Code                                   | Status      | Description     | Has headers | Schema                                           |
+| -------------------------------------- | ----------- | --------------- | :---------: | ------------------------------------------------ |
+| [200](#route-put-alert-rule-group-200) | OK          | AlertRuleGroup  |             | [schema](#route-put-alert-rule-group-200-schema) |
+| [400](#route-put-alert-rule-group-400) | Bad Request | ValidationError |             | [schema](#route-put-alert-rule-group-400-schema) |
+
+#### Responses
+
+##### <span id="route-put-alert-rule-group-200"></span> 200 - AlertRuleGroup
+
+Status: OK
+
+###### <span id="route-put-alert-rule-group-200-schema"></span> Schema
+
+[AlertRuleGroup](#alert-rule-group)
+
+##### <span id="route-put-alert-rule-group-400"></span> 400 - ValidationError
+
+Status: Bad Request
+
+###### <span id="route-put-alert-rule-group-400-schema"></span> Schema
+
+[ValidationError](#validation-error)
+
+### <span id="route-put-contactpoint"></span> Update an existing contact point. (_RoutePutContactpoint_)
+
+```
+PUT /api/v1/provisioning/contact-points/:uid
+```
+
+#### Consumes
+
+- application/json
+
+#### Parameters
+
+{{% responsive-table %}}
+
+| Name                       | Source   | Type                                            | Go type                       | Separator | Required | Default | Description                                               |
+| -------------------------- | -------- | ----------------------------------------------- | ----------------------------- | --------- | :------: | ------- | --------------------------------------------------------- |
+| UID                        | `path`   | string                                          | `string`                      |           |    ✓     |         | UID is the contact point unique identifier                |
+| X-Disable-Provenance: true | `header` | string                                          | `string`                      |           |          |         | Allows editing of provisioned resources in the Grafana UI |
+| Body                       | `body`   | [EmbeddedContactPoint](#embedded-contact-point) | `models.EmbeddedContactPoint` |           |          |         |                                                           |
+
+{{% /responsive-table %}}
+
+#### All responses
+
+| Code                               | Status      | Description     | Has headers | Schema                                       |
+| ---------------------------------- | ----------- | --------------- | :---------: | -------------------------------------------- |
+| [202](#route-put-contactpoint-202) | Accepted    | Ack             |             | [schema](#route-put-contactpoint-202-schema) |
+| [400](#route-put-contactpoint-400) | Bad Request | ValidationError |             | [schema](#route-put-contactpoint-400-schema) |
+
+#### Responses
+
+##### <span id="route-put-contactpoint-202"></span> 202 - Ack
+
+Status: Accepted
+
+###### <span id="route-put-contactpoint-202-schema"></span> Schema
+
+[Ack](#ack)
+
+##### <span id="route-put-contactpoint-400"></span> 400 - ValidationError
+
+Status: Bad Request
+
+###### <span id="route-put-contactpoint-400-schema"></span> Schema
+
+[ValidationError](#validation-error)
+
+### <span id="route-put-mute-timing"></span> Replace an existing mute timing. (_RoutePutMuteTiming_)
+
+```
+PUT /api/v1/provisioning/mute-timings/:name
+```
+
+#### Consumes
+
+- application/json
+
+#### Parameters
+
+{{% responsive-table %}}
+
+| Name                       | Source   | Type                                    | Go type                   | Separator | Required | Default | Description                                               |
+| -------------------------- | -------- | --------------------------------------- | ------------------------- | --------- | :------: | ------- | --------------------------------------------------------- |
+| name                       | `path`   | string                                  | `string`                  |           |    ✓     |         | Mute timing name                                          |
+| X-Disable-Provenance: true | `header` | string                                  | `string`                  |           |          |         | Allows editing of provisioned resources in the Grafana UI |
+| Body                       | `body`   | [MuteTimeInterval](#mute-time-interval) | `models.MuteTimeInterval` |           |          |         |                                                           |
+
+{{% /responsive-table %}}
+
+#### All responses
+
+| Code                              | Status      | Description      | Has headers | Schema                                      |
+| --------------------------------- | ----------- | ---------------- | :---------: | ------------------------------------------- |
+| [200](#route-put-mute-timing-200) | OK          | MuteTimeInterval |             | [schema](#route-put-mute-timing-200-schema) |
+| [400](#route-put-mute-timing-400) | Bad Request | ValidationError  |             | [schema](#route-put-mute-timing-400-schema) |
+
+#### Responses
+
+##### <span id="route-put-mute-timing-200"></span> 200 - MuteTimeInterval
+
+Status: OK
+
+###### <span id="route-put-mute-timing-200-schema"></span> Schema
+
+[MuteTimeInterval](#mute-time-interval)
+
+##### <span id="route-put-mute-timing-400"></span> 400 - ValidationError
+
+Status: Bad Request
+
+###### <span id="route-put-mute-timing-400-schema"></span> Schema
+
+[ValidationError](#validation-error)
+
+### <span id="route-put-policy-tree"></span> Sets the notification policy tree. (_RoutePutPolicyTree_)
+
+```
+PUT /api/v1/provisioning/policies
+```
+
+#### Consumes
+
+- application/json
+
+#### Parameters
+
+{{% responsive-table %}}
+
+| Name                       | Source   | Type            | Go type        | Separator | Required | Default | Description                                               |
+| -------------------------- | -------- | --------------- | -------------- | --------- | :------: | ------- | --------------------------------------------------------- |
+| X-Disable-Provenance: true | `header` | string          | `string`       |           |          |         | Allows editing of provisioned resources in the Grafana UI |
+| Body                       | `body`   | [Route](#route) | `models.Route` |           |          |         | The new notification routing tree to use                  |
+
+{{% /responsive-table %}}
+
+#### All responses
+
+| Code                              | Status      | Description     | Has headers | Schema                                      |
+| --------------------------------- | ----------- | --------------- | :---------: | ------------------------------------------- |
+| [202](#route-put-policy-tree-202) | Accepted    | Ack             |             | [schema](#route-put-policy-tree-202-schema) |
+| [400](#route-put-policy-tree-400) | Bad Request | ValidationError |             | [schema](#route-put-policy-tree-400-schema) |
+
+#### Responses
+
+##### <span id="route-put-policy-tree-202"></span> 202 - Ack
+
+Status: Accepted
+
+###### <span id="route-put-policy-tree-202-schema"></span> Schema
+
+[Ack](#ack)
+
+##### <span id="route-put-policy-tree-400"></span> 400 - ValidationError
+
+Status: Bad Request
+
+###### <span id="route-put-policy-tree-400-schema"></span> Schema
+
+[ValidationError](#validation-error)
+
+### <span id="route-put-template"></span> Create or update a notification template. (_RoutePutTemplate_)
+
+```
+PUT /api/v1/provisioning/templates/:name
+```
+
+#### Consumes
+
+- application/json
+
+{{% responsive-table %}}
+
+#### Parameters
+
+| Name                       | Source   | Type                                                          | Go type                              | Separator | Required | Default | Description                                               |
+| -------------------------- | -------- | ------------------------------------------------------------- | ------------------------------------ | --------- | :------: | ------- | --------------------------------------------------------- |
+| name                       | `path`   | string                                                        | `string`                             |           |    ✓     |         | Template Name                                             |
+| X-Disable-Provenance: true | `header` | string                                                        | `string`                             |           |          |         | Allows editing of provisioned resources in the Grafana UI |
+| Body                       | `body`   | [NotificationTemplateContent](#notification-template-content) | `models.NotificationTemplateContent` |           |          |         |                                                           |
+
+{{% /responsive-table %}}
+
+#### All responses
+
+| Code                           | Status      | Description          | Has headers | Schema                                   |
+| ------------------------------ | ----------- | -------------------- | :---------: | ---------------------------------------- |
+| [202](#route-put-template-202) | Accepted    | NotificationTemplate |             | [schema](#route-put-template-202-schema) |
+| [400](#route-put-template-400) | Bad Request | ValidationError      |             | [schema](#route-put-template-400-schema) |
+
+#### Responses
+
+##### <span id="route-put-template-202"></span> 202 - NotificationTemplate
+
+Status: Accepted
+
+###### <span id="route-put-template-202-schema"></span> Schema
+
+[NotificationTemplate](#notification-template)
+
+##### <span id="route-put-template-400"></span> 400 - ValidationError
+
+Status: Bad Request
+
+###### <span id="route-put-template-400-schema"></span> Schema
+
+[ValidationError](#validation-error)
+
+### <span id="route-reset-policy-tree"></span> Clears the notification policy tree. (_RouteResetPolicyTree_)
+
+```
+DELETE /api/v1/provisioning/policies
+```
+
+#### Consumes
+
+- application/json
+
+#### All responses
+
+| Code                                | Status   | Description | Has headers | Schema                                        |
+| ----------------------------------- | -------- | ----------- | :---------: | --------------------------------------------- |
+| [202](#route-reset-policy-tree-202) | Accepted | Ack         |             | [schema](#route-reset-policy-tree-202-schema) |
+
+#### Responses
+
+##### <span id="route-reset-policy-tree-202"></span> 202 - Ack
+
+Status: Accepted
+
+###### <span id="route-reset-policy-tree-202-schema"></span> Schema
+
+[Ack](#ack)
+
+## Models
+
+### <span id="ack"></span> Ack
+
+[interface{}](#interface)
+
+### <span id="alert-query"></span> AlertQuery
+
+**Properties**
+
+{{% responsive-table %}}
+
+| Name                                                      | Type                                      | Go type             | Required | Default | Description                                                                                            | Example |
+| --------------------------------------------------------- | ----------------------------------------- | ------------------- | :------: | ------- | ------------------------------------------------------------------------------------------------------ | ------- |
+| datasourceUid                                             | string                                    | `string`            |          |         | Grafana data source unique identifier; it should be '**expr**' for a Server Side Expression operation. |         |
+| model                                                     | [interface{}](#interface)                 | `interface{}`       |          |         | JSON is the raw JSON query and includes the above properties as well as custom properties.             |         |
+| queryType                                                 | string                                    | `string`            |          |         | QueryType is an optional identifier for the type of query.                                             |
+| It can be used to distinguish different types of queries. |                                           |
+| refId                                                     | string                                    | `string`            |          |         | RefID is the unique identifier of the query, set by the frontend call.                                 |         |
+| relativeTimeRange                                         | [RelativeTimeRange](#relative-time-range) | `RelativeTimeRange` |          |         |                                                                                                        |         |
+
+{{% /responsive-table %}}
+
+### <span id="alert-query-export"></span> AlertQueryExport
+
+**Properties**
+
+{{% responsive-table %}}
+
+| Name              | Type                                      | Go type             | Required | Default | Description | Example |
+| ----------------- | ----------------------------------------- | ------------------- | :------: | ------- | ----------- | ------- |
+| datasourceUid     | string                                    | `string`            |          |         |             |         |
+| model             | [interface{}](#interface)                 | `interface{}`       |          |         |             |         |
+| queryType         | string                                    | `string`            |          |         |             |         |
+| refId             | string                                    | `string`            |          |         |             |         |
+| relativeTimeRange | [RelativeTimeRange](#relative-time-range) | `RelativeTimeRange` |          |         |             |         |
+
+{{% /responsive-table %}}
+
+### <span id="alert-rule-export"></span> AlertRuleExport
+
+**Properties**
+
+{{% responsive-table %}}
+
+| Name         | Type                                      | Go type               | Required | Default | Description | Example |
+| ------------ | ----------------------------------------- | --------------------- | :------: | ------- | ----------- | ------- |
+| annotations  | map of string                             | `map[string]string`   |          |         |             |         |
+| condition    | string                                    | `string`              |          |         |             |         |
+| dashboardUid | string                                    | `string`              |          |         |             |         |
+| data         | [][AlertQueryExport](#alert-query-export) | `[]*AlertQueryExport` |          |         |             |         |
+| execErrState | string                                    | `string`              |          |         |             |         |
+| for          | [Duration](#duration)                     | `Duration`            |          |         |             |         |
+| isPaused     | boolean                                   | `bool`                |          |         |             |         |
+| labels       | map of string                             | `map[string]string`   |          |         |             |         |
+| noDataState  | string                                    | `string`              |          |         |             |         |
+| panelId      | int64 (formatted integer)                 | `int64`               |          |         |             |         |
+| title        | string                                    | `string`              |          |         |             |         |
+| uid          | string                                    | `string`              |          |         |             |         |
+
+{{% /responsive-table %}}
+
+### <span id="alert-rule-group"></span> AlertRuleGroup
+
+**Properties**
+
+{{% responsive-table %}}
+
+| Name      | Type                                              | Go type                   | Required | Default | Description | Example |
+| --------- | ------------------------------------------------- | ------------------------- | :------: | ------- | ----------- | ------- |
+| folderUid | string                                            | `string`                  |          |         |             |         |
+| interval  | int64 (formatted integer)                         | `int64`                   |          |         |             |         |
+| rules     | [][ProvisionedAlertRule](#provisioned-alert-rule) | `[]*ProvisionedAlertRule` |          |         |             |         |
+| title     | string                                            | `string`                  |          |         |             |         |
+
+{{% /responsive-table %}}
+
+### <span id="alert-rule-group-export"></span> AlertRuleGroupExport
+
+**Properties**
+
+{{% responsive-table %}}
+
+| Name     | Type                                    | Go type              | Required | Default | Description | Example |
+| -------- | --------------------------------------- | -------------------- | :------: | ------- | ----------- | ------- |
+| folder   | string                                  | `string`             |          |         |             |         |
+| interval | [Duration](#duration)                   | `Duration`           |          |         |             |         |
+| name     | string                                  | `string`             |          |         |             |         |
+| orgId    | int64 (formatted integer)               | `int64`              |          |         |             |         |
+| rules    | [][AlertRuleExport](#alert-rule-export) | `[]*AlertRuleExport` |          |         |             |         |
+
+{{% /responsive-table %}}
+
+### <span id="alerting-file-export"></span> AlertingFileExport
+
+**Properties**
+
+{{% responsive-table %}}
+
+| Name          | Type                                                      | Go type                       | Required | Default | Description | Example |
+| ------------- | --------------------------------------------------------- | ----------------------------- | :------: | ------- | ----------- | ------- |
+| apiVersion    | int64 (formatted integer)                                 | `int64`                       |          |         |             |         |
+| contactPoints | [][ContactPointExport](#contact-point-export)             | `[]*ContactPointExport`       |          |         |             |         |
+| groups        | [][AlertRuleGroupExport](#alert-rule-group-export)        | `[]*AlertRuleGroupExport`     |          |         |             |         |
+| policies      | [][NotificationPolicyExport](#notification-policy-export) | `[]*NotificationPolicyExport` |          |         |             |         |
+
+{{% /responsive-table %}}
+
+### <span id="contact-point-export"></span> ContactPointExport
+
+**Properties**
+
+| Name      | Type                                 | Go type             | Required | Default | Description | Example |
+| --------- | ------------------------------------ | ------------------- | :------: | ------- | ----------- | ------- |
+| name      | string                               | `string`            |          |         |             |         |
+| orgId     | int64 (formatted integer)            | `int64`             |          |         |             |         |
+| receivers | [][ReceiverExport](#receiver-export) | `[]*ReceiverExport` |          |         |             |         |
+
+### <span id="contact-points"></span> ContactPoints
+
+[][EmbeddedContactPoint](#embedded-contact-point)
+
+### <span id="duration"></span> Duration
+
+| Name     | Type                      | Go type | Default | Description | Example |
+| -------- | ------------------------- | ------- | ------- | ----------- | ------- |
+| Duration | int64 (formatted integer) | int64   |         |             |         |
+
+### <span id="embedded-contact-point"></span> EmbeddedContactPoint
+
+> EmbeddedContactPoint is the contact point type that is used
+> by grafanas embedded alertmanager implementation.
+
+**Properties**
+
+{{% responsive-table %}}
+
+| Name                                 | Type                    | Go type  | Required | Default | Description                                                       | Example   |
+| ------------------------------------ | ----------------------- | -------- | :------: | ------- | ----------------------------------------------------------------- | --------- |
+| disableResolveMessage                | boolean                 | `bool`   |          |         |                                                                   | `false`   |
+| name                                 | string                  | `string` |          |         | Name is used as grouping key in the UI. Contact points with the   |
+| same name will be grouped in the UI. | `webhook_1`             |
+| provenance                           | string                  | `string` |          |         |                                                                   |           |
+| settings                             | [JSON](#json)           | `JSON`   |    ✓     |         |                                                                   |           |
+| type                                 | string                  | `string` |    ✓     |         |                                                                   | `webhook` |
+| uid                                  | string                  | `string` |          |         | UID is the unique identifier of the contact point. The UID can be |
+| set by the user.                     | `my_external_reference` |
+
+{{% /responsive-table %}}
+
+### <span id="json"></span> Json
+
+[interface{}](#interface)
+
+### <span id="match-regexps"></span> MatchRegexps
+
+[MatchRegexps](#match-regexps)
+
+### <span id="match-type"></span> MatchType
+
+| Name      | Type                      | Go type | Default | Description | Example |
+| --------- | ------------------------- | ------- | ------- | ----------- | ------- |
+| MatchType | int64 (formatted integer) | int64   |         |             |         |
+
+### <span id="matcher"></span> Matcher
+
+**Properties**
+
+{{% responsive-table %}}
+
+| Name  | Type                     | Go type     | Required | Default | Description | Example |
+| ----- | ------------------------ | ----------- | :------: | ------- | ----------- | ------- |
+| Name  | string                   | `string`    |          |         |             |         |
+| Type  | [MatchType](#match-type) | `MatchType` |          |         |             |         |
+| Value | string                   | `string`    |          |         |             |         |
+
+{{% /responsive-table %}}
+
+### <span id="matchers"></span> Matchers
+
+> Matchers is a slice of Matchers that is sortable, implements Stringer, and
+> provides a Matches method to match a LabelSet against all Matchers in the
+> slice. Note that some users of Matchers might require it to be sorted.
+
+[][Matcher](#matcher)
+
+### <span id="mute-time-interval"></span> MuteTimeInterval
+
+**Properties**
+
+{{% responsive-table %}}
+
+| Name           | Type                             | Go type           | Required | Default | Description | Example |
+| -------------- | -------------------------------- | ----------------- | :------: | ------- | ----------- | ------- |
+| name           | string                           | `string`          |          |         |             |         |
+| time_intervals | [][TimeInterval](#time-interval) | `[]*TimeInterval` |          |         |             |         |
+
+{{% /responsive-table %}}
+
+### <span id="mute-timing-export"></span> MuteTimingExport
+
+**Properties**
+
+### <span id="mute-timings-export"></span> MuteTimingsExport
+
+**Properties**
+
+### <span id="mute-timings"></span> MuteTimings
+
+[][MuteTimeInterval](#mute-time-interval)
+
+### <span id="not-found"></span> NotFound
+
+[interface{}](#interface)
+
+### <span id="notification-policy-export"></span> NotificationPolicyExport
+
+**Properties**
+
+| Name   | Type                         | Go type       | Required | Default | Description | Example |
+| ------ | ---------------------------- | ------------- | :------: | ------- | ----------- | ------- |
+| Policy | [RouteExport](#route-export) | `RouteExport` |          |         | inline      |         |
+| orgId  | int64 (formatted integer)    | `int64`       |          |         |             |         |
+
+### <span id="notification-template"></span> NotificationTemplate
+
+**Properties**
+
+{{% responsive-table %}}
+
+| Name       | Type                      | Go type      | Required | Default | Description | Example |
+| ---------- | ------------------------- | ------------ | :------: | ------- | ----------- | ------- |
+| name       | string                    | `string`     |          |         |             |         |
+| provenance | [Provenance](#provenance) | `Provenance` |          |         |             |         |
+| template   | string                    | `string`     |          |         |             |         |
+
+{{% /responsive-table %}}
+
+### <span id="notification-template-content"></span> NotificationTemplateContent
+
+**Properties**
+
+{{% responsive-table %}}
+
+| Name     | Type   | Go type  | Required | Default | Description | Example |
+| -------- | ------ | -------- | :------: | ------- | ----------- | ------- |
+| template | string | `string` |          |         |             |         |
+
+{{% /responsive-table %}}
+
+### <span id="notification-templates"></span> NotificationTemplates
+
+[][NotificationTemplate](#notification-template)
+
+### <span id="object-matchers"></span> ObjectMatchers
+
+[Matchers](#matchers)
+
+#### Inlined models
+
+### <span id="permission-denied"></span> PermissionDenied
+
+[interface{}](#interface)
+
+### <span id="provenance"></span> Provenance
+
+| Name       | Type   | Go type | Default | Description | Example |
+| ---------- | ------ | ------- | ------- | ----------- | ------- |
+| Provenance | string | string  |         |             |         |
+
+### <span id="provisioned-alert-rule"></span> ProvisionedAlertRule
+
+**Properties**
+
+{{% responsive-table %}}
+
+| Name         | Type                         | Go type             | Required | Default | Description | Example                                                                                                                                                                                                                                                                                                                                                                                                                          |
+| ------------ | ---------------------------- | ------------------- | :------: | ------- | ----------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| annotations  | map of string                | `map[string]string` |          |         |             | `{"runbook_url":"https://supercoolrunbook.com/page/13"}`                                                                                                                                                                                                                                                                                                                                                                         |
+| condition    | string                       | `string`            |    ✓     |         |             | `A`                                                                                                                                                                                                                                                                                                                                                                                                                              |
+| data         | [][AlertQuery](#alert-query) | `[]*AlertQuery`     |    ✓     |         |             | `[{"datasourceUid":"__expr__","model":{"conditions":[{"evaluator":{"params":[0,0],"type":"gt"},"operator":{"type":"and"},"query":{"params":[]},"reducer":{"params":[],"type":"avg"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1 == 1","hide":false,"intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"},"queryType":"","refId":"A","relativeTimeRange":{"from":0,"to":0}}]` |
+| execErrState | string                       | `string`            |    ✓     |         |             |                                                                                                                                                                                                                                                                                                                                                                                                                                  |
+| folderUID    | string                       | `string`            |    ✓     |         |             | `project_x`                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| for          | [Duration](#duration)        | `Duration`          |    ✓     |         |             |                                                                                                                                                                                                                                                                                                                                                                                                                                  |
+| id           | int64 (formatted integer)    | `int64`             |          |         |             |                                                                                                                                                                                                                                                                                                                                                                                                                                  |
+| isPaused     | boolean                      | `bool`              |          |         |             | `false`                                                                                                                                                                                                                                                                                                                                                                                                                          |
+| labels       | map of string                | `map[string]string` |          |         |             | `{"team":"sre-team-1"}`                                                                                                                                                                                                                                                                                                                                                                                                          |
+| noDataState  | string                       | `string`            |    ✓     |         |             |                                                                                                                                                                                                                                                                                                                                                                                                                                  |
+| orgID        | int64 (formatted integer)    | `int64`             |    ✓     |         |             |                                                                                                                                                                                                                                                                                                                                                                                                                                  |
+| provenance   | [Provenance](#provenance)    | `Provenance`        |          |         |             |                                                                                                                                                                                                                                                                                                                                                                                                                                  |
+| ruleGroup    | string                       | `string`            |    ✓     |         |             | `eval_group_1`                                                                                                                                                                                                                                                                                                                                                                                                                   |
+| title        | string                       | `string`            |    ✓     |         |             | `Always firing`                                                                                                                                                                                                                                                                                                                                                                                                                  |
+| uid          | string                       | `string`            |          |         |             |                                                                                                                                                                                                                                                                                                                                                                                                                                  |
+| updated      | date-time (formatted string) | `strfmt.DateTime`   |          |         |             |                                                                                                                                                                                                                                                                                                                                                                                                                                  |
+
+{{% /responsive-table %}}
+
+### <span id="provisioned-alert-rules"></span> ProvisionedAlertRules
+
+[][ProvisionedAlertRule](#provisioned-alert-rule)
+
+### <span id="raw-message"></span> RawMessage
+
+[interface{}](#interface)
+
+### <span id="receiver-export"></span> ReceiverExport
+
+**Properties**
+
+| Name                  | Type                       | Go type      | Required | Default | Description | Example |
+| --------------------- | -------------------------- | ------------ | :------: | ------- | ----------- | ------- |
+| disableResolveMessage | boolean                    | `bool`       |          |         |             |         |
+| settings              | [RawMessage](#raw-message) | `RawMessage` |          |         |             |         |
+| type                  | string                     | `string`     |          |         |             |         |
+| uid                   | string                     | `string`     |          |         |             |         |
+
+### <span id="regexp"></span> Regexp
+
+> A Regexp is safe for concurrent use by multiple goroutines,
+> except for configuration methods, such as Longest.
+
+[interface{}](#interface)
+
+### <span id="relative-time-range"></span> RelativeTimeRange
+
+> RelativeTimeRange is the per query start and end time
+> for requests.
+
+**Properties**
+
+{{% responsive-table %}}
+
+| Name | Type                  | Go type    | Required | Default | Description | Example |
+| ---- | --------------------- | ---------- | :------: | ------- | ----------- | ------- |
+| from | [Duration](#duration) | `Duration` |          |         |             |         |
+| to   | [Duration](#duration) | `Duration` |          |         |             |         |
+
+{{% /responsive-table %}}
+
+### <span id="route"></span> Route
+
+> A Route is a node that contains definitions of how to handle alerts. This is modified
+> from the upstream alertmanager in that it adds the ObjectMatchers property.
+
+**Properties**
+
+{{% responsive-table %}}
+
+| Name                | Type                               | Go type             | Required | Default | Description                             | Example |
+| ------------------- | ---------------------------------- | ------------------- | :------: | ------- | --------------------------------------- | ------- |
+| continue            | boolean                            | `bool`              |          |         |                                         |         |
+| group_by            | []string                           | `[]string`          |          |         |                                         |         |
+| group_interval      | string                             | `string`            |          |         |                                         |         |
+| group_wait          | string                             | `string`            |          |         |                                         |         |
+| match               | map of string                      | `map[string]string` |          |         | Deprecated. Remove before v1.0 release. |         |
+| match_re            | [MatchRegexps](#match-regexps)     | `MatchRegexps`      |          |         |                                         |         |
+| matchers            | [Matchers](#matchers)              | `Matchers`          |          |         |                                         |         |
+| mute_time_intervals | []string                           | `[]string`          |          |         |                                         |         |
+| object_matchers     | [ObjectMatchers](#object-matchers) | `ObjectMatchers`    |          |         |                                         |         |
+| provenance          | [Provenance](#provenance)          | `Provenance`        |          |         |                                         |         |
+| receiver            | string                             | `string`            |          |         |                                         |         |
+| repeat_interval     | string                             | `string`            |          |         |                                         |         |
+| routes              | [][Route](#route)                  | `[]*Route`          |          |         |                                         |         |
+
+{{% /responsive-table %}}
+
+### <span id="route-export"></span> RouteExport
+
+> RouteExport is the provisioned file export of definitions.Route. This is needed to hide fields that aren't usable in
+> provisioning file format. An alternative would be to define a custom MarshalJSON and MarshalYAML that excludes them.
+
+**Properties**
+
+| Name                | Type                               | Go type             | Required | Default | Description                             | Example |
+| ------------------- | ---------------------------------- | ------------------- | :------: | ------- | --------------------------------------- | ------- |
+| continue            | boolean                            | `bool`              |          |         |                                         |         |
+| group_by            | []string                           | `[]string`          |          |         |                                         |         |
+| group_interval      | string                             | `string`            |          |         |                                         |         |
+| group_wait          | string                             | `string`            |          |         |                                         |         |
+| match               | map of string                      | `map[string]string` |          |         | Deprecated. Remove before v1.0 release. |         |
+| match_re            | [MatchRegexps](#match-regexps)     | `MatchRegexps`      |          |         |                                         |         |
+| matchers            | [Matchers](#matchers)              | `Matchers`          |          |         |                                         |         |
+| mute_time_intervals | []string                           | `[]string`          |          |         |                                         |         |
+| object_matchers     | [ObjectMatchers](#object-matchers) | `ObjectMatchers`    |          |         |                                         |         |
+| receiver            | string                             | `string`            |          |         |                                         |         |
+| repeat_interval     | string                             | `string`            |          |         |                                         |         |
+| routes              | [][RouteExport](#route-export)     | `[]*RouteExport`    |          |         |                                         |         |
+
+### <span id="time-interval"></span> TimeInterval
+
+> TimeInterval describes intervals of time. ContainsTime will tell you if a golang time is contained
+> within the interval.
+
+**Properties**
+
+{{% responsive-table %}}
+
+| Name          | Type                       | Go type        | Required | Default | Description | Example |
+| ------------- | -------------------------- | -------------- | :------: | ------- | ----------- | ------- |
+| days_of_month | []string                   | `[]string`     |          |         |             |         |
+| location      | string                     | `string`       |          |         |             |         |
+| months        | []string                   | `[]string`     |          |         |             |         |
+| times         | [][TimeRange](#time-range) | `[]*TimeRange` |          |         |             |         |
+| weekdays      | []string                   | `[]string`     |          |         |             |         |
+| years         | []string                   | `[]string`     |          |         |             |         |
+
+{{% /responsive-table %}}
+
+### <span id="time-range"></span> TimeRange
+
+> For example, 4:00PM to End of the day would Begin at 1020 and End at 1440.
+
+**Properties**
+
+{{% responsive-table %}}
+
+| Name        | Type                      | Go type | Required | Default | Description | Example |
+| ----------- | ------------------------- | ------- | :------: | ------- | ----------- | ------- |
+| EndMinute   | int64 (formatted integer) | `int64` |          |         |             |         |
+| StartMinute | int64 (formatted integer) | `int64` |          |         |             |         |
+
+{{% /responsive-table %}}
+
+### <span id="validation-error"></span> ValidationError
+
+**Properties**
+
+{{% responsive-table %}}
+
+| Name | Type   | Go type  | Required | Default | Description | Example         |
+| ---- | ------ | -------- | :------: | ------- | ----------- | --------------- |
+| msg  | string | `string` |          |         |             | `error message` |
+
+{{% /responsive-table %}}
diff --git a/docs/sources/shared/back-up/back-up-grafana.md b/docs/sources/shared/back-up/back-up-grafana.md
index c12ec9c6d4c71..db2f437663f66 100644
--- a/docs/sources/shared/back-up/back-up-grafana.md
+++ b/docs/sources/shared/back-up/back-up-grafana.md
@@ -17,8 +17,10 @@ Copy Grafana configuration files that you might have modified in your Grafana de
 
 The Grafana configuration files are located in the following directories:
 
-- Default configuration: `$WORKING_DIR/conf/defaults.ini`
-- Custom configuration: `$WORKING_DIR/conf/custom.ini`
+- Default configuration: `$WORKING_DIR/defaults.ini` (Don't change this file)
+- Custom configuration: `$WORKING_DIR/custom.ini`
+
+For more information on where to find configuration files, refer to [Configuration file location](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/#configuration-file-location).
 
 {{% admonition type="note" %}}
 If you installed Grafana using the `deb` or `rpm` packages, then your configuration file is located at
diff --git a/docs/sources/shared/datasources/pyroscope-profile-tracing-intro.md b/docs/sources/shared/datasources/pyroscope-profile-tracing-intro.md
new file mode 100644
index 0000000000000..b7c9df002fcf2
--- /dev/null
+++ b/docs/sources/shared/datasources/pyroscope-profile-tracing-intro.md
@@ -0,0 +1,123 @@
+---
+headless: true
+labels:
+  products:
+    - enterprise
+    - oss
+---
+
+[//]: # 'This file documents the introductory material for traces to profiling for the Pyroscope data source.'
+[//]: # 'This shared file is included in these locations:'
+[//]: # '/grafana/docs/sources/datasources/pyroscope/profiling-and-tracing.md'
+[//]: # '/website/docs/grafana-cloud/data-configuration/traces/traces-query-editor.md'
+[//]: # '/docs/sources/view-and-analyze-profile-data/profile-tracing/_index.md'
+[//]: #
+[//]: # 'If you make changes to this file, verify that the meaning and content are not changed in any place where the file is included.'
+[//]: # 'Any links should be fully qualified and not relative: /docs/grafana/ instead of ../grafana/.'
+
+<!-- Profiling and tracing integration -->
+
+Profiles, continuous profiling, and distributed traces are all tools that can be used to improve the performance and reliability of applications.
+However, each tool has its own strengths and weaknesses, and it is important to choose the right tool for the job as well as understand when to use both.
+
+## Profiling
+
+Profiling offers a deep-dive into an application's performance at the code level, highlighting resource usage and performance hotspots.
+
+<table>
+  <tr>
+    <th scope="row">Usage</th>
+    <td>During development, major releases, or upon noticing performance quirks.</td>
+  </tr>
+  <tr>
+    <th scope="row">Benefits</th>
+    <td>
+      <ul>
+        <li>Business: Boosts user experience through enhanced application performance.</li>
+        <li>Technical: Gives clear insights into code performance and areas of refinement.</li>
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <th scope="row">Example</th>
+    <td>A developer uses profiling upon noting slow app performance, identifies a CPU-heavy function, and optimizes it.</td>
+  </tr>
+</table>
+
+## Continuous profiling
+
+Continuous profiling provides ongoing performance insights, capturing long-term trends and intermittent issues.
+
+<table>
+  <tr>
+    <th scope="row">Usage</th>
+    <td>Mainly in production, especially for high-priority applications.</td>
+  </tr>
+  <tr>
+    <th scope="row">Benefits</th>
+    <td>
+      <ul>
+        <li>Business: Preemptively addresses inefficiencies, potentially saving costs.</li>
+        <li>Technical: Highlights performance trends and issues like potential memory leaks over time.</li>
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <th scope="row">Example</th>
+    <td>A month-long data from continuous profiling suggests increasing memory consumption, hinting at a memory leak.</td>
+  </tr>
+</table>
+
+## Distributed tracing
+
+Traces requests as they cross multiple services, revealing interactions and service dependencies.
+
+<table>
+  <tr>
+    <th scope="row">Usage</th>
+    <td>Essential for systems like microservices where requests touch multiple services.</td>
+  </tr>
+  <tr>
+    <th scope="row">Benefits</th>
+    <td>
+      <ul>
+        <li>Business: Faster issue resolution, reduced downtimes, and strengthened customer trust.</li>
+        <li>Technical: A broad view of the system's structure, revealing bottlenecks and inter-service dependencies.</li>
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <th scope="row">Example</th>
+    <td>In e-commerce, a user's checkout request might involve various services. Tracing depicts this route, pinpointing where time is most spent.</td>
+  </tr>
+</table>
+
+## Combined power of tracing and profiling
+
+When used together, tracing and profiling provide a powerful tool for understanding system and application performance.
+
+<table>
+  <tr>
+    <th scope="row">Usage</th>
+    <td>For comprehensive system-to-code insights, especially when diagnosing complex issues spread across services and codebases.</td>
+  </tr>
+  <tr>
+    <th scope="row">Benefits</th>
+    <td>
+      <ul>
+        <li>Business: Reduces downtime, optimizes user experience, and safeguards revenues.</li>
+        <li>Technical:
+          <ul>
+            <li>Holistic view: Tracing pinpoints bottle-necked services, while profiling delves into the responsible code segments.</li>
+            <li>End-to-end insight: Visualizes a request's full journey and the performance of individual code parts.</li>
+            <li>Efficient diagnosis: Tracing identifies service latency; profiling zeroes in on its cause, be it database queries, API calls, or specific code inefficiencies.</li>
+          </ul>
+        </li>
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <th scope="row">Example</th>
+    <td>Tracing reveals latency in a payment service. Combined with profiling, it's found that a particular function, making third-party validation calls, is the culprit. This insight guides optimization, refining system efficiency.</td>
+  </tr>
+</table>
diff --git a/docs/sources/shared/datasources/tempo-editor-traceql.md b/docs/sources/shared/datasources/tempo-editor-traceql.md
index d41fe3f770fba..65e5a992dd465 100644
--- a/docs/sources/shared/datasources/tempo-editor-traceql.md
+++ b/docs/sources/shared/datasources/tempo-editor-traceql.md
@@ -25,7 +25,7 @@ To learn more about how to query by TraceQL, refer to the [TraceQL documentation
 
 The TraceQL query editor, located on the **Explore** > **TraceQL** tab in Grafana, lets you search by trace ID and write TraceQL queries using autocomplete.
 
-![The TraceQL query editor](/static/img/docs/tempo/screenshot-traceql-query-editor-v10.png)
+![The TraceQL query editor](/media/docs/tempo/traceql/screenshot-traceql-query-editor-v10.png)
 
 ## Enable the query editor
 
@@ -46,6 +46,10 @@ To access the query editor, follow these steps:
 1. Optional: Use the Time picker drop-down to change the time and range for the query (refer to the [documentation for instructions](https://grafana.com/docs/grafana/latest/dashboards/use-dashboards/#set-dashboard-time-range)).
 1. Once you have finished your query, select **Run query**.
 
+This video provides and example of creating a TraceQL query using the custom tag grouping.
+
+{{< youtube id="fraepWra00Y" >}}
+
 ## Query by TraceID
 
 To query a particular trace by its trace ID:
@@ -54,30 +58,46 @@ To query a particular trace by its trace ID:
 1. Enter the trace ID into the query field. For example: `41928b92edf1cdbe0ba6594baee5ae9`
 1. Click **Run query** or use the keyboard shortcut Shift + Enter.
 
-![Search for a trace ID using the TraceQL query editor](/static/img/docs/tempo/screenshot-traceql-editor-traceID.png)
+![Search for a trace ID using the TraceQL query editor](/media/docs/tempo/traceql/screenshot-traceql-editor-traceID.png)
 
 ## Use autocomplete to write queries
 
 You can use the query editor’s autocomplete suggestions to write queries.
 The editor detects span sets to provide relevant autocomplete options.
-It uses regular expressions (regex) to detect where it is inside a spanset and provide attribute names, scopes, intrinsic names, logic operators, or attribute values from Tempo's API, depending on what is expected for the current situation.
+It uses regular expressions (regex) to detect where it's inside a spanset and provide attribute names, scopes, intrinsic names, logic operators, or attribute values from Tempo's API, depending on what's expected for the current situation.
 
-![Query editor showing the auto-complete feature](/static/img/docs/tempo/screenshot-traceql-query-editor-auto-complete-v10.png)
+![Query editor showing the auto-complete feature](/media/docs/tempo/traceql/screenshot-traceql-query-editor-auto-complete-v10.png)
 
 To create a query using autocomplete, follow these steps:
 
-1. Use the steps above to access the query editor and begin your query.
+1. From the menu, choose **Explore**, select the desired Tempo data source, and navigate to the **TraceQL** tab.
 
 1. Enter your query. As you type your query, autocomplete suggestions appear as a drop-down. Each letter you enter refines the autocomplete options to match.
 
 1. Use your mouse or arrow keys to select any option you wish. When the desired option is highlighted, press Tab on your keyboard to add the selection to your query.
 
-1. Once your query is complete, select **Run query** to perform the query.
+1. Once your query is complete, select **Run query**.
 
 ## View query results
 
 Query results for both the editor and the builder are returned in a table. Selecting the Trace ID or Span ID provides more detailed information.
 
-![Query editor showing span results](/static/img/docs/tempo/screenshot-traceql-query-editor-results-v10.png)
+Selecting the trace ID from the returned results opens a trace diagram. Selecting a span from the returned results opens a trace diagram and reveals the relevant span in the trace diagram (the highlighted blue line).
+
+In the trace diagram, the bold text on the left side of each span indicates the service name, for example `mythical-requester: requester`, and it is hidden when subsequent spans have the same service name (nested spans).
+Each service has a color assigned to it, which is visible to the left of the name and timeline in the graph.
+Spans with the same color belong to the same service. The grey text to the right of the service name indicates the span name.
+
+![Query editor showing span results](/media/docs/tempo/traceql/screenshot-traceql-query-editor-results-v10.png)
+
+### Streaming results
+
+The Tempo data source supports streaming responses to TraceQL queries so you can see partial query results as they come in without waiting for the whole query to finish.
+
+{{% admonition type="note" %}}
+To use this feature in Grafana OSS v10.1 and later, enable the `traceQLStreaming` feature toggle. This capability is enabled by default in Grafana Cloud.
+{{% /admonition %}}
+
+Streaming is available for both the **Search** and **TraceQL** query types, and you'll get immediate visibility of incoming traces on the results table.
 
-Selecting the trace ID from the returned results will open a trace diagram. Selecting a span from the returned results opens a trace diagram and reveals the relevant span in the trace diagram (above, the highlighted blue line).
+{{< video-embed src="/media/docs/grafana/data-sources/tempo-streaming-v2.mp4" >}}
diff --git a/docs/sources/shared/datasources/tempo-search-traceql.md b/docs/sources/shared/datasources/tempo-search-traceql.md
index 2547e15b42d10..64ff336aa612e 100644
--- a/docs/sources/shared/datasources/tempo-search-traceql.md
+++ b/docs/sources/shared/datasources/tempo-search-traceql.md
@@ -19,7 +19,7 @@ labels:
 
 The TraceQL query builder, located on the **Explore** > **Query type** > **Search** in Grafana, provides drop-downs and text fields to help you write a query.
 
-![The TraceQL query builder](/static/img/docs/tempo/screenshot-traceql-query-type-search-v10.png)
+![The TraceQL query builder](/media/docs/tempo/traceql/screenshot-traceql-query-type-search-v10.png)
 
 The builder lets you run the most common queries in as few clicks as possible. You don't need to know the underlying query language or database architecture to use it.
 
@@ -32,14 +32,14 @@ You can use the query builder to search trace data by resource service name, spa
 
 In addition, you can add query builder blocks, view the query history, and use the **Inspector** to see details.
 
-{{< figure src="/static/img/docs/queries/screenshot-tempods-query-search.png" class="docs-image--no-shadow" max-width="750px" caption="Screenshot of the Tempo Search query type" >}}
+{{< figure src="/media/docs/tempo/traceql/screenshot-tempods-query-search.png" class="docs-image--no-shadow" max-width="750px" caption="Screenshot of the Tempo Search query type" >}}
 
 ## Perform a search
 
 To perform a search, you need to select filters and/or tags and then run the query. The results appear underneath the query builder.
-The screenshot below identifies the areas used to perform a search.
+The screenshot identifies the areas used to perform a search.
 
-{{< figure src="/static/img/docs/queries/screenshot-tempods-query-search-parts.png" class="docs-image--no-shadow" max-width="750px" caption="Parts of Tempo Search query type" >}}
+{{< figure src="/media/docs/tempo/traceql/screenshot-tempods-query-search-parts.png" class="docs-image--no-shadow" max-width="750px" caption="Parts of Tempo Search query type" >}}
 
 | Number | Name               | Action                                                                                                                                                                     | Comment                                                                                                                                          |
 | :----- | :----------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :----------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -59,11 +59,11 @@ To access Search, use the following steps:
 
 1. Sign into Grafana.
 1. Select your Tempo data source.
-1. From the menu, choose Explore and select Query type > Search.
+1. From the menu, choose **Explore** and select **Query type > Search**.
 
 ## Define filters
 
-Using filters, you refine the data returned from the query by selecting Resource Service Name, Span Name, or Duration. The **Duration** represents span time, calculated by subtracting the end time from the start time of the span.
+Using filters, you refine the data returned from the query by selecting **Resource Service Name**, **Span Name**, or **Duration**. The **Duration** represents span time, calculated by subtracting the end time from the start time of the span.
 
 Grafana administrators can change the default filters using the Tempo data source configuration.
 Filters can be limited by the operators. The available operators are determined by the field type.
@@ -109,21 +109,26 @@ To add a tag, follow these steps:
 Using **Aggregate by**, you can calculate RED metrics (total span count, percent erroring spans, and latency information) for spans of `kind=server` that match your filter criteria, grouped by one or more attributes.
 This capability is based on the [metrics summary API](/docs/grafana-cloud/monitor-infrastructure/traces/metrics-summary-api/).
 Metrics summary only calculates summaries based on spans received within the last hour.
+For additional information, refer to [Traces to metrics: Ad-hoc RED metrics in Grafana Tempo with `Aggregate by`](https://grafana.com/blog/2023/12/07/traces-to-metrics-ad-hoc-red-metrics-in-grafana-tempo-with-aggregate-by/).
+
+<!--Impromptu RED metrics with Aggregate by -->
+
+{{< youtube id="xOolCpm2F8c" >}}
 
 When you use **Aggregate by**, the selections you make determine how the information is reported in the Table. Every combination that matches selections in your data is listed in the table.
 Each aggregate value, for example `intrinsic`:`name`, has a corresponding column in the results table.
 
-For example, **names** matching `GET /:endpoint` with a **span.http.user_agent** of `k6/0.46` appeared in 31,466 spans. Instead of being listed by traces and associated spans, the query results are grouped by the the selections in **Aggregate by**.
+For example, **names** matching `GET /:endpoint` with a **span.http.user_agent** of `k6/0.46` appeared in 31,466 spans. Instead of being listed by traces and associated spans, the query results are grouped by the selections in **Aggregate by**.
 
 The RED metrics are calculated for every name and user agent combination found in your data.
 
-![Use Aggregate by to calculate RED metrics for spans and group by attributes](/static/img/docs/tempo/screenshot-traces-aggregate-by.png)
-
 The screenshot shows all of the successful HTTP `status_code` API calls against the `mystical-server` service.
 The results are shown in the same order used in **Aggregate by**.
 For example, **Aggregate by** lists `intrinsic.name` followed by `span.http.user_agent`.
 The first column in the results Table shows **name** and then **span.http.user_agent**.
 
+![Use Aggregate by to calculate RED metrics for spans and group by attributes](/media/docs/tempo/traceql/screenshot-traces-aggregate-by.png)
+
 To use this capability:
 
 1. In the **Aggregate by** row, select a scope from the first drop-down box. For example, `span`.
@@ -132,6 +137,10 @@ To use this capability:
 1. Optional: Select a **Time range** to expand or narrow the data set for an hour's range.
 1. Select **Run query**.
 
+<!-- Explanation of how to use feature -->
+
+{{< youtube id="g97CjKOZqT4" >}}
+
 ### Optional: Add queries
 
 Using **Add query**, you can have successive queries that run in sequential order.
@@ -145,4 +154,16 @@ Select **Run query** to run the TraceQL query (1 in the screenshot).
 
 Queries can take a little while to return results. The results appear in a table underneath the query builder. Selecting a Trace ID (2 in the screenshot) displays more detailed information (3 in the screenshot).
 
-{{< figure src="/static/img/docs/queries/screenshot-tempods-query-results.png" class="docs-image--no-shadow" max-width="750px" caption="Tempo Search query type results" >}}
+{{< figure src="/media/docs/tempo/traceql/screenshot-tempods-query-results.png" class="docs-image--no-shadow" max-width="750px" caption="Tempo Search query type results" >}}
+
+#### Streaming results
+
+The Tempo data source supports streaming responses to TraceQL queries so you can see partial query results as they come in without waiting for the whole query to finish.
+
+{{% admonition type="note" %}}
+To use this experimental feature, enable the `traceQLStreaming` feature toggle. If you’re using Grafana Cloud and would like to enable this feature, please contact customer support.
+{{% /admonition %}}
+
+Streaming is available for both the **Search** and **TraceQL** query types, and you'll get immediate visibility of incoming traces on the results table.
+
+{{< video-embed src="/media/docs/grafana/data-sources/tempo-streaming-v2.mp4" >}}
diff --git a/docs/sources/shared/datasources/tempo-traces-to-profiles.md b/docs/sources/shared/datasources/tempo-traces-to-profiles.md
new file mode 100644
index 0000000000000..b433c4b4d79b7
--- /dev/null
+++ b/docs/sources/shared/datasources/tempo-traces-to-profiles.md
@@ -0,0 +1,102 @@
+---
+headless: true
+labels:
+  products:
+    - enterprise
+    - oss
+---
+
+[//]: # 'This file documents the Traces to profile configure and usage for the Tempo data source.'
+[//]: # 'This shared file is included in these locations:'
+[//]: # '/grafana/docs/sources/datasources/tempo/configure-tempo-data-source.md'
+[//]: # '/website/docs/grafana-cloud/data-configuration/traces/traces-query-editor.md'
+[//]: #
+[//]: # 'If you make changes to this file, verify that the meaning and content are not changed in any place where the file is included.'
+[//]: # 'Any links should be fully qualified and not relative: /docs/grafana/ instead of ../grafana/.'
+
+<!-- # Trace to profiles  -->
+
+Using Trace to profiles, you can use Grafana’s ability to correlate different signals by adding the functionality to link between traces and profiles.
+
+**Trace to profiles** lets you link your Grafana Pyroscope data source to tracing data.
+When configured, this connection lets you run queries from a trace span into the profile data.
+
+{{< youtube id="AG8VzfFMLxo" >}}
+
+There are two ways to configure the trace to profiles feature:
+
+- Use a basic configuration with default query, or
+- Configure a custom query where you can use a template language to interpolate variables from the trace or span.
+
+{{< admonition type="note">}}
+Traces to profile requires a Tempo data source with Traces to profiles configured and a Pyroscope data source.
+
+As with traces, your application needs to be instrumented to emit profiling data. For more information, refer to [Linking tracing and profiling with span profiles](/docs/pyroscope/<PYROSCOPE_VERSION>/configure-client/trace-span-profiles/).
+{{< /admonition >}}
+
+To use trace to profiles, navigate to **Explore** and query a trace.
+Each span links to your queries. Clicking a link runs the query in a split panel.
+If tags are configured, Grafana dynamically inserts the span attribute values into the query.
+The query runs over the time range of the (span start time - 60) to (span end time + 60 seconds).
+
+![Selecting a link in the span queries the profile data source](/media/docs/tempo/profiles/tempo-trace-to-profile.png)
+
+To use trace to profiles, you must have a configured Grafana Pyroscope data source.
+For more information, refer to the [Grafana Pyroscope data source](/docs/grafana/<GRAFANA_VERSION>/datasources/grafana-pyroscope/) documentation.
+
+**Embedded flame graphs** are also inserted into each span details section that has a linked profile.
+This lets you see resource consumption in a flame graph visualization for each span without having to navigate away from the current view.
+Hover over a particular block in the flame graph to see more details about the consumed resources.
+
+## Configuration options
+
+The following table describes options for configuring your Trace to profiles settings:
+
+| Setting name         | Description                                                                                                                                                                                                                                                                                                    |
+| -------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **Data source**      | Defines the target data source. You can select a Pyroscope \[profiling\] data source.                                                                                                                                                                                                                          |
+| **Tags**             | Defines the tags to use in the profile query. Default: `cluster`, `hostname`, `namespace`, `pod`, `service.name`, `service.namespace`. You can change the tag name for example to remove dots from the name if they're not allowed in the target data source. For example, map `http.status` to `http_status`. |
+| **Profile type**     | Defines the profile type that used in the query.                                                                                                                                                                                                                                                               |
+| **Use custom query** | Toggles use of custom query with interpolation.                                                                                                                                                                                                                                                                |
+| **Query**            | Input to write custom query. Use variable interpolation to customize it with variables from span.                                                                                                                                                                                                              |
+
+## Use a basic configuration
+
+To use a basic configuration, follow these steps:
+
+1. In the left menu, select **Connections** > **Data sources**.
+1. Select your configured Tempo data source from the **Data source** list.
+1. Scroll down to the **Traces to profiles** section.
+1. Select a Pyroscope data source in the **Data source** drop-down.
+1. Optional: Add one or more tags to use in the query. If left blank, the default values of `service.name` and `service.namespace` are used.
+
+   The tags you configure must be present in the spans attributes or resources for a trace-to-profiles span link to appear.
+
+   You can optionally configure a new name for the tag. This is useful if the tag has dots in the name and the target data source doesn't allow dots in labels. In that case, you can remap `service.name` to `service_name`.
+
+1. Select one or more profile types to use in the query. Select the drop-down and choose options from the menu.
+
+   The profile type or app must be selected for the query to be valid. Grafana doesn't show any data if the profile type or app isn’t selected when a query runs.
+   ![Traces to profile configuration options in the Tempo data source](/media/docs/tempo/profiles/Tempo-data-source-profiles-Settings.png)
+
+1. Select **Save and Test**.
+
+If you have configured a Pyroscope data source and no profile data is available or the **Profiles for this span**
+button and the embedded flame graph isn't visible, verify that the `pyroscope.profile.id` key-value pair exists in your span tags.
+
+## Configure a custom query
+
+To use a custom query with the configuration, follow these steps:
+
+1.  In the left menu, select **Connections** > **Data sources**.
+1.  Select a configured Tempo data source from the **Data source** list.
+1.  Scroll down to the **Traces to profiles** section.
+1.  Select a Pyroscope data source in the **Data source** drop-down.
+1.  Optional: Choose any tags to use in the query. If left blank, the default values of `service.name` and `service.namespace` are used.
+
+    These tags can be used in the custom query with `${__tags}` variable. This variable interpolates the mapped tags as list in an appropriate syntax for the data source. Only the tags that were present in the span are included; tags that aren't present are omitted. You can also configure a new name for the tag. This is useful in cases where the tag has dots in the name and the target data source doesn't allow using dots in labels. For example, you can remap `service.name` to `service_name`. If you don’t map any tags here, you can still use any tag in the query, for example: `method="${__span.tags.method}"`. You can learn more about custom query variables [here](/docs/grafana/<GRAFANA_VERSION>/datasources/tempo/configure-tempo-data-source/#custom-query-variables).
+
+1.  Select one or more profile types to use in the query. Select the drop-down and choose options from the menu.
+1.  Switch on **Use custom query** to enter a custom query.
+1.  Specify a custom query to be used to query profile data. You can use various variables to make that query relevant for current span. The link is shown only if all the variables are interpolated with non-empty values to prevent creating an invalid query. You can interpolate the configured tags using the `$__tags` keyword.
+1.  Select **Save and Test**.
diff --git a/docs/sources/shared/upgrade/upgrade-common-tasks.md b/docs/sources/shared/upgrade/upgrade-common-tasks.md
index 3c53e3d44f3de..7e84a837d4da8 100644
--- a/docs/sources/shared/upgrade/upgrade-common-tasks.md
+++ b/docs/sources/shared/upgrade/upgrade-common-tasks.md
@@ -8,13 +8,13 @@ title: Upgrade guide common tasks
 
 ## Upgrade Grafana
 
-The following sections provide instructions for how to upgrade Grafana based on your installation method.
+The following sections provide instructions for how to upgrade Grafana based on your installation method. For more information on where to find configuration files, refer to [Configuration file location](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/#configuration-file-location).
 
 ### Debian
 
 To upgrade Grafana installed from a Debian package (`.deb`), complete the following steps:
 
-1. In your current installation of Grafana, save your custom configuration changes to a file named `<grafana_install_dir>/conf/custom.ini`.
+1. In your current installation of Grafana, save your custom configuration changes to a file named `<grafana_install_dir>/grafana.ini`.
 
    This enables you to upgrade Grafana without the risk of losing your configuration changes.
 
@@ -32,7 +32,7 @@ To upgrade Grafana installed from a Debian package (`.deb`), complete the follow
 
 To upgrade Grafana installed from the Grafana Labs APT repository, complete the following steps:
 
-1. In your current installation of Grafana, save your custom configuration changes to a file named `<grafana_install_dir>/conf/custom.ini`.
+1. In your current installation of Grafana, save your custom configuration changes to a file named `<grafana_install_dir>/grafana.ini`.
 
    This enables you to upgrade Grafana without the risk of losing your configuration changes.
 
@@ -49,7 +49,7 @@ Grafana automatically updates when you run `apt-get upgrade`.
 
 To upgrade Grafana installed from the binary `.tar.gz` package, complete the following steps:
 
-1. In your current installation of Grafana, save your custom configuration changes to a file named `<grafana_install_dir>/conf/custom.ini`.
+1. In your current installation of Grafana, save your custom configuration changes to the custom configuration file, `custom.ini` or `grafana.ini`.
 
    This enables you to upgrade Grafana without the risk of losing your configuration changes.
 
@@ -61,7 +61,7 @@ To upgrade Grafana installed from the binary `.tar.gz` package, complete the fol
 
 To upgrade Grafana installed using RPM or YUM complete the following steps:
 
-1. In your current installation of Grafana, save your custom configuration changes to a file named `<grafana_install_dir>/conf/custom.ini`.
+1. In your current installation of Grafana, save your custom configuration changes to a file named `<grafana_install_dir>/grafana.ini`.
 
    This enables you to upgrade Grafana without the risk of losing your configuration changes.
 
@@ -84,7 +84,7 @@ To upgrade Grafana installed using RPM or YUM complete the following steps:
 
 To upgrade Grafana running in a Docker container, complete the following steps:
 
-1. In your current installation of Grafana, save your custom configuration changes to a file named `<grafana_install_dir>/conf/custom.ini`.
+1. Use Grafana [environment variables](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/#override-configuration-with-environment-variables) to save your custom configurations; this is the recommended method. Alternatively, you can view your configuration files manually by accessing the deployed container.
 
    This enables you to upgrade Grafana without the risk of losing your configuration changes.
 
@@ -119,7 +119,7 @@ To upgrade Grafana installed on Windows, complete the following steps:
 
 To upgrade Grafana installed on Mac, complete the following steps:
 
-1. In your current installation of Grafana, save your custom configuration changes to a file named `<grafana_install_dir>/conf/custom.ini`.
+1. In your current installation of Grafana, save your custom configuration changes to the custom configuration file, `custom.ini`.
 
    This enables you to upgrade Grafana without the risk of losing your configuration changes.
 
diff --git a/docs/sources/shared/visualizations/connect-null-values.md b/docs/sources/shared/visualizations/connect-null-values.md
index 4336568cd3994..66fa2d507aca4 100644
--- a/docs/sources/shared/visualizations/connect-null-values.md
+++ b/docs/sources/shared/visualizations/connect-null-values.md
@@ -8,6 +8,6 @@ Choose how null values, which are gaps in the data, appear on the graph. Null va
 
 ![Connect null values option](/static/img/docs/time-series-panel/connect-null-values-option-v9.png)
 
-- **Never:** Time series data points with gaps in the the data are never connected.
-- **Always:** Time series data points with gaps in the the data are always connected.
+- **Never:** Time series data points with gaps in the data are never connected.
+- **Always:** Time series data points with gaps in the data are always connected.
 - **Threshold:** Specify a threshold above which gaps in the data are no longer connected. This can be useful when the connected gaps in the data are of a known size and/or within a known range, and gaps outside this range should no longer be connected.
diff --git a/docs/sources/shared/visualizations/datalink-options.md b/docs/sources/shared/visualizations/datalink-options.md
new file mode 100644
index 0000000000000..e3d77551cf5ee
--- /dev/null
+++ b/docs/sources/shared/visualizations/datalink-options.md
@@ -0,0 +1,15 @@
+---
+title: Data link options
+comments: |
+  This file is used in the following visualizations: bar chart, bar gauge, candlestick, gauge, geomap, heatmap, histogram, stat, state timeline, status history, table, time series, trend, xy chart
+---
+
+Data links allow you to link to other panels, dashboards, and external resources while maintaining the context of the source panel. You can create links that include the series name or even the value under the cursor.
+
+For each data link, set the following options:
+
+- **Title**
+- **URL**
+- **Open in new tab**
+
+To learn more, refer to [Configure data links](../../configure-data-links/).
diff --git a/docs/sources/shared/visualizations/disconnect-values.md b/docs/sources/shared/visualizations/disconnect-values.md
index 6786ba43c3083..1888102d7e856 100644
--- a/docs/sources/shared/visualizations/disconnect-values.md
+++ b/docs/sources/shared/visualizations/disconnect-values.md
@@ -6,7 +6,7 @@ title: Disconnect values
 
 Choose whether to set a threshold above which values in the data should be disconnected.
 
-{{< figure src="/media/docs/grafana/screenshot-grafana-10-1-disconnect-values.png" max-width="750px" >}}
+{{< figure src="/media/docs/grafana/screenshot-grafana-10-1-disconnect-values.png" max-width="750px" alt="Disconnect values options" >}}
 
-- **Never:** Time series data points in the the data are never disconnected.
+- **Never:** Time series data points in the data are never disconnected.
 - **Threshold:** Specify a threshold above which values in the data are disconnected. This can be useful when desired values in the data are of a known size and/or within a known range, and values outside this range should no longer be connected.
diff --git a/docs/sources/shared/visualizations/legend-mode.md b/docs/sources/shared/visualizations/legend-mode.md
deleted file mode 100644
index c8a127d5bee7f..0000000000000
--- a/docs/sources/shared/visualizations/legend-mode.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-title: Legend mode and legend placement
----
-
-### Legend mode
-
-Use these settings to define how the legend appears in your visualization. For more information about the legend, refer to [Configure a legend](../configure-legend/).
-
-- **List -** Displays the legend as a list. This is a default display mode of the legend.
-- **Table -** Displays the legend as a table.
-- **Hidden -** Hides the legend.
-
-### Legend placement
-
-Choose where to display the legend.
-
-- **Bottom -** Below the graph.
-- **Right -** To the right of the graph.
-
-### Legend values
-
-Choose which of the [standard calculations]({{< relref "../../panels-visualizations/calculation-types/" >}}) to show in the legend. You can have more than one.
diff --git a/docs/sources/shared/visualizations/legend-options-1.md b/docs/sources/shared/visualizations/legend-options-1.md
new file mode 100644
index 0000000000000..8c101980d704e
--- /dev/null
+++ b/docs/sources/shared/visualizations/legend-options-1.md
@@ -0,0 +1,35 @@
+---
+title: Legend options
+comments: |
+  There are two legend shared files to cover the most common combinations of options. 
+  Using two shared files ensures that content remains consistent across visualizations that share the same options and users don't have to figure out which options apply to a specific visualization when reading that content. 
+  This file is used in the following visualizations: bar chart, candlestick, histogram, time series, trend, xy chart
+---
+
+Legend options control the series names and statistics that appear under or to the right of the graph. For more information about the legend, refer to [Configure a legend](../configure-legend/).
+
+### Visibility
+
+Toggle the switch to turn the legend on or off.
+
+### Mode
+
+Use these settings to define how the legend appears in your visualization.
+
+- **List -** Displays the legend as a list. This is a default display mode of the legend.
+- **Table -** Displays the legend as a table.
+
+### Placement
+
+Choose where to display the legend.
+
+- **Bottom -** Below the graph.
+- **Right -** To the right of the graph.
+
+#### Width
+
+Control how wide the legend is when placed on the right side of the visualization. This option is only displayed if you set the legend placement to **Right**.
+
+### Values
+
+Choose which of the [standard calculations](../../query-transform-data/calculation-types/) to show in the legend. You can have more than one.
diff --git a/docs/sources/shared/visualizations/legend-options-2.md b/docs/sources/shared/visualizations/legend-options-2.md
new file mode 100644
index 0000000000000..9abfe0adfc769
--- /dev/null
+++ b/docs/sources/shared/visualizations/legend-options-2.md
@@ -0,0 +1,33 @@
+---
+title: Legend mode and legend placement
+comments: |
+  There are two legend shared files to cover the most common combinations of options. 
+  Using two shared files ensures that content remains consistent across visualizations that share the same options and users don't have to figure out which options apply to a specific visualization when reading that content. 
+  This file is used in the following visualizations: state timeline, status history
+---
+
+When the legend option is enabled it can show either the value mappings or the threshold brackets. To show the value mappings in the legend, it's important that the **Color scheme** as referenced in [Color scheme](../../configure-standard-options#color-scheme) is set to **Single color** or **Classic palette**. To see the threshold brackets in the legend set the **Color scheme** to **From thresholds**.
+
+For more information about the legend, refer to [Configure a legend](../configure-legend/).
+
+### Visibility
+
+Toggle the switch to turn the legend on or off.
+
+### Mode
+
+Use these settings to define how the legend appears in your visualization.
+
+- **List -** Displays the legend as a list. This is a default display mode of the legend.
+- **Table -** Displays the legend as a table.
+
+### Placement
+
+Choose where to display the legend.
+
+- **Bottom -** Below the graph.
+- **Right -** To the right of the graph.
+
+#### Width
+
+Control how wide the legend is when placed on the right side of the visualization. This option is only displayed if you set the legend placement to **Right**.
diff --git a/docs/sources/shared/visualizations/overrides-options.md b/docs/sources/shared/visualizations/overrides-options.md
new file mode 100644
index 0000000000000..ef50b1759c103
--- /dev/null
+++ b/docs/sources/shared/visualizations/overrides-options.md
@@ -0,0 +1,17 @@
+---
+title: Field overrides options
+comments: |
+  This file is used in the following visualizations: bar chart, bar gauge, candlestick, canvas, gauge, geomap, heatmap, histogram, pie chart, stat, state timeline, status history, table, time series, trend, xy chart
+---
+
+Overrides allow you to customize visualization settings for specific fields or series. When you add an override rule, it targets a particular set of fields and lets you define multiple options for how that field is displayed.
+
+Choose from one the following override options:
+
+- **Fields with name** - Select a field from the list of all available fields.
+- **Fields with name matching regex** - Specify fields to override with a regular expression.
+- **Fields with type** - Select fields by type, such as string, numeric, or time.
+- **Fields returned by query** - Select all fields returned by a specific query, such as A, B, or C.
+- **Fields with values** - Select all fields returned by your defined reducer condition, such as **Min**, **Max**, **Count**, **Total**.
+
+To learn more, refer to [Configure field overrides](../../configure-overrides/).
diff --git a/docs/sources/shared/visualizations/standard-options.md b/docs/sources/shared/visualizations/standard-options.md
new file mode 100644
index 0000000000000..1601ce8324ee6
--- /dev/null
+++ b/docs/sources/shared/visualizations/standard-options.md
@@ -0,0 +1,19 @@
+---
+title: Standard options
+comments: |
+  This file is used in the following visualizations: bar chart, bar gauge, candlestick, canvas, gauge, geomap, histogram, pie chart, stat, state timeline, status history, table, time series, trend
+---
+
+**Standard options** in the panel editor pane let you change how field data is displayed in your visualizations. When you set a standard option, the change is applied to all fields or series. For more granular control over the display of fields, refer to [Configure overrides](../../configure-overrides/).
+
+You can customize the following standard options:
+
+- **Unit** - Choose which unit a field should use.
+- **Min**/**Max** - Set the minimum and maximum values used in percentage threshold calculations or leave these field empty for them to be calculated automatically.
+- **Field min/max** - Enable **Field min/max** to have Grafana calculate the min or max of each field individually, based on the minimum or maximum value of the field.
+- **Decimals** - Specify the number of decimals Grafana includes in the rendered value.
+- **Display name** - Set the display title of all fields. You can use variables in the field title.
+- **Color scheme** - Set single or multiple colors for your entire visualization.
+- **No value** - Enter what Grafana should display if the field value is empty or null. The default value is a hyphen (-).
+
+To learn more, refer to [Configure standard options](../../configure-standard-options/).
diff --git a/docs/sources/shared/visualizations/thresholds-options-1.md b/docs/sources/shared/visualizations/thresholds-options-1.md
new file mode 100644
index 0000000000000..72327be25a787
--- /dev/null
+++ b/docs/sources/shared/visualizations/thresholds-options-1.md
@@ -0,0 +1,19 @@
+---
+title: Thresholds options
+comments: |
+  There are two thresholds shared files, thresholds-options-1.md and thresholds-options-2.md, to cover the most common combinations of options. 
+  Using two shared files ensures that content remains consistent across visualizations that share the same options and users don't have to figure out which options apply to a specific visualization when reading that content. 
+  This file is used in the following visualizations: bar chart, candlestick, time series, trend
+---
+
+A threshold is a value or limit you set for a metric that’s reflected visually when it’s met or exceeded. Thresholds are one way you can conditionally style and color your visualizations based on query results.
+
+Set the following options:
+
+- **Value** - Set the value for each threshold.
+- **Thresholds mode** - Choose from:
+  - **Absolute**
+  - **Percentage**
+- **Show thresholds** - Choose from a variety of display options including not displaying thresholds at all.
+
+To learn more, refer to [Configure thresholds](../../configure-thresholds/).
diff --git a/docs/sources/shared/visualizations/thresholds-options-2.md b/docs/sources/shared/visualizations/thresholds-options-2.md
new file mode 100644
index 0000000000000..d2ea9c2a44a2c
--- /dev/null
+++ b/docs/sources/shared/visualizations/thresholds-options-2.md
@@ -0,0 +1,18 @@
+---
+title: Thresholds options
+comments: |
+  There are two thresholds shared files, thresholds-options-1.md and thresholds-options-2.md, to cover the most common combinations of options. 
+  Using two shared files ensures that content remains consistent across visualizations that share the same options and users don't have to figure out which options apply to a specific visualization when reading that content. 
+  This file is used in the following visualizations: bar gauge, canvas, gauge, geomap, histogram, stat, state timeline, status history, table
+---
+
+A threshold is a value or limit you set for a metric that’s reflected visually when it’s met or exceeded. Thresholds are one way you can conditionally style and color your visualizations based on query results.
+
+Set the following options:
+
+- **Value** - Set the value for each threshold.
+- **Thresholds mode** - Choose from:
+  - **Absolute**
+  - **Percentage**
+
+To learn more, refer to [Configure thresholds](../../configure-thresholds/).
diff --git a/docs/sources/shared/visualizations/tooltip-mode.md b/docs/sources/shared/visualizations/tooltip-mode.md
deleted file mode 100644
index 75c2c4d2358d5..0000000000000
--- a/docs/sources/shared/visualizations/tooltip-mode.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-title: Tooltip mode
----
-
-### Tooltip mode
-
-When you hover your cursor over the visualization, Grafana can display tooltips. Choose how tooltips behave.
-
-- **Single -** The hover tooltip shows only a single series, the one that you are hovering over on the visualization.
-- **All -** The hover tooltip shows all series in the visualization. Grafana highlights the series that you are hovering over in bold in the series list in the tooltip.
-- **Hidden -** Do not display the tooltip when you interact with the visualization.
-
-Use an override to hide individual series from the tooltip.
diff --git a/docs/sources/shared/visualizations/tooltip-options-1.md b/docs/sources/shared/visualizations/tooltip-options-1.md
new file mode 100644
index 0000000000000..31f35524625c9
--- /dev/null
+++ b/docs/sources/shared/visualizations/tooltip-options-1.md
@@ -0,0 +1,31 @@
+---
+title: Tooltip options
+comments: |
+  There are two tooltip shared files, tooltip-options-1.md and tooltip-options-2.md, to cover the most common combinations of options. 
+  Using two shared files ensures that content remains consistent across visualizations that share the same options and users don't have to figure out which options apply to a specific visualization when reading that content. 
+  This file is used in the following visualizations: bar chart, pie chart, state timeline, status history
+---
+
+Tooltip options control the information overlay that appears when you hover over data points in the visualization.
+
+### Tooltip mode
+
+When you hover your cursor over the visualization, Grafana can display tooltips. Choose how tooltips behave.
+
+- **Single -** The hover tooltip shows only a single series, the one that you are hovering over on the visualization.
+- **All -** The hover tooltip shows all series in the visualization. Grafana highlights the series that you are hovering over in bold in the series list in the tooltip.
+- **Hidden -** Do not display the tooltip when you interact with the visualization.
+
+Use an override to hide individual series from the tooltip.
+
+### Values sort order
+
+When you set the **Tooltip mode** to **All**, the **Values sort order** option is displayed. This option controls the order in which values are listed in a tooltip. Choose from the following:
+
+- **None** - Grafana automatically sorts the values displayed in a tooltip.
+- **Ascending** - Values in the tooltip are listed from smallest to largest.
+- **Descending** - Values in the tooltip are listed from largest to smallest.
+
+### Max height
+
+Set the maximum height of the tooltip box. The default is 600 pixels.
diff --git a/docs/sources/shared/visualizations/tooltip-options-2.md b/docs/sources/shared/visualizations/tooltip-options-2.md
new file mode 100644
index 0000000000000..2a5d35e2bd033
--- /dev/null
+++ b/docs/sources/shared/visualizations/tooltip-options-2.md
@@ -0,0 +1,37 @@
+---
+title: Tooltip options
+comments: |
+  There are two tooltip shared files, tooltip-options-1.md and tooltip-options-2.md, to cover the most common combinations of options. 
+  Using two shared files ensures that content remains consistent across visualizations that share the same options and users don't have to figure out which options apply to a specific visualization when reading that content. 
+  This file is used in the following visualizations: candlestick, time series, trend
+---
+
+Tooltip options control the information overlay that appears when you hover over data points in the visualization.
+
+### Tooltip mode
+
+When you hover your cursor over the visualization, Grafana can display tooltips. Choose how tooltips behave.
+
+- **Single -** The hover tooltip shows only a single series, the one that you are hovering over on the visualization.
+- **All -** The hover tooltip shows all series in the visualization. Grafana highlights the series that you are hovering over in bold in the series list in the tooltip.
+- **Hidden -** Do not display the tooltip when you interact with the visualization.
+
+Use an override to hide individual series from the tooltip.
+
+### Values sort order
+
+When you set the **Tooltip mode** to **All**, the **Values sort order** option is displayed. This option controls the order in which values are listed in a tooltip. Choose from the following:
+
+- **None** - Grafana automatically sorts the values displayed in a tooltip.
+- **Ascending** - Values in the tooltip are listed from smallest to largest.
+- **Descending** - Values in the tooltip are listed from largest to smallest.
+
+### Hover proximity
+
+Set the hover proximity (in pixels) to control how close the cursor must be to a data point to trigger the tooltip to display.
+
+![Adding a hover proximity limit for tooltips](/media/docs/grafana/gif-grafana-10-4-hover-proximity.gif)
+
+### Max height
+
+Set the maximum height of the tooltip box. The default is 600 pixels.
diff --git a/docs/sources/shared/visualizations/value-mappings-options.md b/docs/sources/shared/visualizations/value-mappings-options.md
new file mode 100644
index 0000000000000..937801addec36
--- /dev/null
+++ b/docs/sources/shared/visualizations/value-mappings-options.md
@@ -0,0 +1,20 @@
+---
+title: Value mappings options
+comments: |
+  This file is used in the following visualizations: bar chart, bar gauge, candlestick, canvas, gauge, geomap, histogram, pie chart, stat, state timeline, status history, table, time series, trend
+---
+
+Value mapping is a technique you can use to change how data appears in a visualization.
+
+For each value mapping, set the following options:
+
+- **Condition** - Choose what's mapped to the display text and (optionally) color:
+  - **Value** - Specific values
+  - **Range** - Numerical ranges
+  - **Regex** - Regular expressions
+  - **Special** - Special values like `Null`, `NaN` (not a number), or boolean values like `true` and `false`
+- **Display text**
+- **Color** (Optional)
+- **Icon** (Canvas only)
+
+To learn more, refer to [Configure value mappings](../../configure-value-mappings/).
diff --git a/docs/sources/tutorials/alerting-get-started/index.md b/docs/sources/tutorials/alerting-get-started/index.md
new file mode 100644
index 0000000000000..a3fde21a0ae8c
--- /dev/null
+++ b/docs/sources/tutorials/alerting-get-started/index.md
@@ -0,0 +1,218 @@
+---
+Feedback Link: https://github.com/grafana/tutorials/issues/new
+authors:
+  - Antonio Calero
+categories:
+  - alerting
+description: Get started with Grafana Alerting by creating your first alert in just a few minutes. Learn how to set up an alert, send alert notifications to a public webhook, and generate sample data to observe your alert in action.
+id: alerting-get-started
+labels:
+  products:
+    - enterprise
+    - oss
+    - cloud
+tags:
+  - beginner
+title: Get started with Grafana Alerting
+weight: 50
+---
+
+# Get Started with Grafana Alerting
+
+In this guide, we'll walk you through the process of setting up your first alert in just a few minutes. You'll witness your alert in action with real-time data, as well as sending alert notifications.
+
+In this tutorial you will:
+
+- Set up an Alert
+- Send an alert notification to a public webhook.
+
+## Before you begin
+
+Ensure you have the following applications installed.
+
+- [Docker Compose](https://docs.docker.com/get-docker/) (included in Docker for Desktop for macOS and Windows)
+- [Git](https://git-scm.com/)
+
+## Set up a sample application
+
+The sample application generates real data and exposes metrics, which are stored in Prometheus. In Grafana Alerting, you can then build an alert rule based on the data generated.
+
+Download the files to your local machine.
+
+1. Clone the [tutorial environment repository](https://github.com/grafana/tutorial-environment).
+
+   ```promql
+   git clone https://github.com/grafana/tutorial-environment.git
+   ```
+
+1. Change to the directory where you cloned the repository:
+
+   ```promql
+   cd tutorial-environment
+   ```
+
+1. Make sure Docker is running:
+
+   ```promql
+   docker --version
+   ```
+
+   This command will display the installed Docker version if the installation was successful.
+
+1. Start the sample application:
+
+   ```promql
+   docker compose up -d
+   ```
+
+   The first time you run `docker compose up -d`, Docker downloads all the necessary resources for the tutorial. This might take a few minutes, depending on your internet connection.
+
+   {{< admonition type="note" >}}
+   If you already have Grafana, Loki, or Prometheus running on your system, you might see errors, because the Docker image is trying to use ports that your local installations are already using. . If this is the case, stop the services, then run the command again.
+   {{< /admonition >}}
+
+1. Ensure all services are up-and-running:
+
+   ```promql
+   docker compose ps
+   ```
+
+   In the State column, it should say Up for all services.
+
+The Grafana News app should be live on [localhost:8081](http://localhost:8081/).
+
+### Generate data
+
+To enhance the hands-on aspect of this tutorial, you can actively participate in the Grafana News application to simulate web traffic and interactions. This enables you to observe data within Grafana and set up alerts accordingly.
+
+### Grafana News
+
+Grafana News is an application created to demonstrate the observation of data using the Grafana stack. It achieves this by generating web traffic through activities such as posting links and voting for your preferred ones.
+
+To add a link:
+
+1. Enter a **Title**
+1. Enter a **URL**
+1. Click **Submit** to add the link.
+   The link will appear listed under the Grafana News heading.
+1. To vote for a link, click the triangle icon next to the name of the link.
+
+## Create a contact point for Grafana Managed Alerts
+
+Besides being an open-source observability tool, Grafana has its own built-in alerting service. This means that you can receive notifications whenever there is an event of interest in your data, and even see these events graphed in your visualizations.
+
+In this step, we'll set up a new contact point. This contact point will use the _webhooks_ channel. In order to make this work, we also need an endpoint for our webhook channel to receive the alert. We will use [requestbin.com](https://requestbin.com) to quickly set up that test endpoint. This way we can make sure that our alert is actually sending a notification somewhere.
+
+1. In your browser, navigate to [localhost:3000](http://localhost:3000), where Grafana is running.
+   You should get logged in automatically.
+1. In another window, go to [requestbin.com](https://requestbin.com).
+1. Under the **Create Request Bin** button, click the link to create a **public bin** instead.
+1. From Request Bin, copy the endpoint URL.
+
+Your Request Bin is now waiting for the first request.
+
+Next, let's configure a Contact Point in Grafana's Alerting UI to send notifications to our Request Bin.
+
+1. Return to Grafana. In Grafana's sidebar, hover over the **Alerting** (bell) icon and then click **Contact points**.
+1. Click **+ Add contact point**.
+1. In **Name**, write **RequestBin**.
+1. In **Integration**, choose **Webhook**.
+1. In **URL**, paste the endpoint to your request bin.
+
+1. Click **Test**, and then click **Send test notification** to send a test alert to your request bin.
+1. Navigate back to the Request Bin you created earlier. On the left side, there's now a `POST /` entry. Click it to see what information Grafana sent.
+1. Return to Grafana and click **Save contact point**.
+
+We have now created a dummy webhook endpoint and created a new Alerting Contact Point in Grafana. Now we can create an alert rule and link it to this new channel.
+
+## Create an alert
+
+Next, we'll establish an alert within Grafana Alerting to notify us whenever our sample app experiences a specific volume of requests.
+
+In Grafana, **navigate to Alerting** > **Alert rules**. Click on **New alert rule**.
+
+1. Enter alert rule name
+   Make it short and descriptive as this will appear in your alert notification. For instance, **server-requests-duration**
+
+## Define query and alert condition
+
+In this section, we define queries, expressions (used to manipulate the data), and the condition that must be met for the alert to be triggered.
+
+1. Select the **Prometheus** data source from the drop-down menu.
+
+   {{< admonition type="note" >}}
+   To visualize this data in Grafana, we need time-series metrics that we can collect and store. We can do that with [Prometheus](https://grafana.com/docs/grafana/latest/getting-started/get-started-grafana-prometheus/), which pulls metrics from our sample app.
+   {{< /admonition >}}
+
+1. In the Query editor, switch to **Code** mode by clicking the button at the right.
+1. Enter the following query:
+
+   ```promql
+   sum(rate(tns_request_duration_seconds_count[1m])) by(method)
+   ```
+
+   This [PromQL](https://prometheus.io/docs/prometheus/latest/querying/basics/) query calculates the sum of the per-second average rates of increase of the `tns_request_duration_seconds_count` metric over the last 1 minute, grouped by the HTTP method used in the requests. This can be useful for analyzing the request duration trends for different HTTP methods.
+
+1. Keep expressions “B” and “C” as they are. These expressions (**Reduce** and **Threshold**, respectively) come by default when creating a new rule.
+
+   The Reduce expression “B”, selects the last value of our query “A”, while the Threshold expression “C” will check if the last value from expression “B” is above a specific value. In addition, the Threshold expression is the alert condition by default. Enter `0.2` as threshold value. You can read more about queries and conditions [here](https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/queries-conditions/#expression-queries).
+
+1. Click Preview to run the queries.
+
+   You should see the request duration for different HTTP methods.
+
+   {{<admonition type="note">}}
+   If it returns “No data,” or an error, you are welcome to post questions in our [Grafana Community forum](https://community.grafana.com/).
+   {{</admonition>}}
+
+## Set evaluation behavior
+
+An evaluation group defines an evaluation interval - how often a rule is checked. Alert rules within the same evaluation group are evaluated sequentially
+
+1. In **Folder**, click **+ New folder** and enter a name. For example: _grafana-news_. This folder will contain our alerts.
+1. In the **Evaluation group**, repeat the above step to create a new evaluation group. We will name it _1m-evaluation_.
+1. Choose an **Evaluation interval** (how often the alert will be evaluated).
+   For example, every `1m` (1 minute).
+1. Set the **pending period** (the “for” period).
+   This is the time that a condition has to be met until the alert enters into **Firing** state and a notification is sent. For example, `0s` (zero seconds) so the alert rule fires the moment the condition is met.
+
+## Configure labels and notifications
+
+Add labels to ease searching or route notifications to a policy.
+
+1. Add a label.
+   Add `app` as the label key, and `grafana-news` as the value.
+
+1. Add a notification recipient.
+   Under **Contact point**, select **RequestBin** from the drop-down menu.
+
+1. Add an annotation (optional).
+
+   To provide more context on the alert, you can link a dashboard and panel to our Alert. To do this, click **Link Dashboard and panel** button.
+
+   Linking an alert rule to a panel adds an annotation to the panel when the status of your alert rulechanges. If you don’t have a panel already, and since this is optional, you can skip this step for now and link it after you have finished configuring the alert rule.
+
+1. Click **Save rule and exit** at the top right corner.
+
+## Trigger an alert
+
+We have now configured an alert rule and a contact point. Now let’s see if we can trigger an alert by generating some traffic on our sample application.
+
+1. Browse to [localhost:8081](http://localhost:8081/).
+1. Add a new title and URL.
+1. Repeatedly click the vote button or refresh the page to generate a traffic spike.
+
+Once the query `sum(rate(tns_request_duration_seconds_count[1m])) by(method)` returns a value greater than `0.2`, Grafana will trigger our alert. Browse to the Request Bin we created earlier and find the sent Grafana alert notification with details and metadata.
+
+## Summary
+
+In this tutorial, you have learned how to set up an alert, send alert notifications to a public webhook, and generate some sample data to observe your alert in action. By following these steps, you've gained a foundational understanding of how to leverage Grafana's alerting capabilities to monitor and respond to events of interest in your data. Happy monitoring!
+
+## Learn more
+
+Check out the links below to continue your learning journey with Grafana's LGTM stack.
+
+- [Prometheus](/docs/grafana/latest/features/datasources/prometheus/)
+- [Alerting Overview](/docs/grafana/latest/alerting/)
+- [Alert rules](/docs/grafana/latest/alerting/create-alerts/)
+- [Contact points](/docs/grafana/latest/alerting/fundamentals/contact-points/)
diff --git a/docs/sources/tutorials/create-alerts-with-logs/index.md b/docs/sources/tutorials/create-alerts-with-logs/index.md
index d62cd413fb492..87eaf7bb994e3 100644
--- a/docs/sources/tutorials/create-alerts-with-logs/index.md
+++ b/docs/sources/tutorials/create-alerts-with-logs/index.md
@@ -31,7 +31,6 @@ In this tutorial, you'll:
 
 ## Before you begin
 
-- Ensure you’re on Grafana 8 or later with [Grafana Alerting](https://grafana.com/docs/grafana/latest/alerting/set-up/migrating-alerts/) enabled.
 - Ensure you’ve [configured a Loki datasource](https://grafana.com/docs/grafana/latest/datasources/loki/#configure-the-data-source) in Grafana.
 - If you already have logs to work with, you can skip the optional sections and go straight to [create an alert](#create-an-alert).
 - If you want to use a log-generating sample script to create the logs demonstrated in this tutorial, refer to the optional steps:
@@ -44,7 +43,7 @@ In these steps you'll create an alert and define an expression to evaluate. Thes
 
 ### Create a Grafana-managed alert
 
-1. Navigate in Grafana to **Alerting**, then to **Alert Rules** and click **+ Create alert rule**.
+1. Navigate in Grafana to **Alerting**, then to **Alert Rules** and click **+ New alert rule**.
 1. Choose **Grafana Managed Alert** to create an alert that uses expressions.
 1. Select your Loki datasource from the drop-down.
 1. Enter the alert query in the query editor, switch to **code** mode in the top right corner of the editor to paste the query below:
@@ -199,72 +198,77 @@ This optional step uses a python script to generate the sample logs used in this
 1. Install Python3 on your local machine if needed.
 1. Copy the python script below and paste it into a new file on your local machine.
 
-   ```
-   #!/bin/env python3
-   ​
-   import datetime
-   import math
-   import random
-   import sys
-   import time
-
-
-   ​# Simulation parameters
-   requests_per_second = 2
-   failure_rate = 0.05
-   get_post_ratio = 0.9
-   get_average_duration_ms = 500
-   post_average_duration_ms = 2000
-   ​
-   ​
-   while True:
-   # Exponential distribution random value of average 1/lines_per_second.
-   d = random.expovariate(requests_per_second)
-   time.sleep(d)
-   if random.random() < failure_rate:
-       status = "500"
-   else:
-       status = "200"
-   if random.random() < get_post_ratio:
-       method = "GET"
-       duration_ms = math.floor(random.expovariate(1/get_average_duration_ms))
-   else:
-       method = "POST"
-       duration_ms = math.floor(random.expovariate(1/post_average_duration_ms))
-   timestamp = datetime.datetime.now(tz=datetime.timezone.utc).isoformat()
-   print(f"{timestamp} level=info method={method} url=/ status={status} duration={duration_ms}ms")
-   sys.stdout.flush()
-   ```
+```
+
+#!/bin/env python3
+
+import datetime
+import math
+import random
+import sys
+import time
+
+
+requests_per_second = 2
+failure_rate = 0.05
+get_post_ratio = 0.9
+get_average_duration_ms = 500
+post_average_duration_ms = 2000
+
+
+while True:
+
+    # Exponential distribution random value of average 1/lines_per_second.
+    d = random.expovariate(requests_per_second)
+    time.sleep(d)
+    if random.random() < failure_rate:
+        status = "500"
+    else:
+        status = "200"
+    if random.random() < get_post_ratio:
+        method = "GET"
+        duration_ms = math.floor(random.expovariate(1/get_average_duration_ms))
+    else:
+        method = "POST"
+        duration_ms = math.floor(random.expovariate(1/post_average_duration_ms))
+    timestamp = datetime.datetime.now(tz=datetime.timezone.utc).isoformat()
+    print(f"{timestamp} level=info method={method} url=/ status={status} duration={duration_ms}ms")
+    sys.stdout.flush()
+
+```
 
 1. Give the script executable permissions.
 
-   In a terminal window on linux-based systems run the command:
+In a terminal window on linux-based systems run the command:
 
-   ```
-   chmod 755  ./web-server-logs-simulator.py
-   ```
+```
+
+chmod 755 ./web-server-logs-simulator.py
+
+
+```
 
 1. Run the script.
 
-   - Use `tee` to direct the script output to the console and the specified file path. For example, if promtail is
-     configured to monitor `/var/log` for `.log` files you can direct the script output to `/var/log/web_requests.log` file.
+- Use `tee` to direct the script output to the console and the specified file path. For example, if promtail is
+  configured to monitor `/var/log` for `.log` files you can direct the script output to `/var/log/web_requests.log` file.
 
-   - To avoid running the script with elevated permissions, create the log file manually and change the permissions for the output file only.
+- To avoid running the script with elevated permissions, create the log file manually and change the permissions for the output file only.
 
-     ```
-     sudo touch /var/log/web_requests.log
-     chmod 755 /var/log/web_requests.log
-     python3 ./web-server-logs-simulator.py | tee -a /var/log/web_requests.log
-     ```
+  ```
+  sudo touch /var/log/web_requests.log
+  chmod 755 /var/log/web_requests.log
+  python3 ./web-server-logs-simulator.py | tee -a /var/log/web_requests.log
+  ```
 
 1. Verify that the logs are showing up in Grafana’s Explore view:
 
-   - Navigate to explore in Grafana.
-   - Select the Loki datasource from the drop-down.
-   - Check the toggle for **builder | code** in the top right corner of the query box and switch the query mode to builder if it’s not already selected.
-   - Select the filename label from the drop-down and choose your `web_requests.log` file from the value drop-down.
-   - Click **Run Query**.
-   - You should see logs and a graph of log volume.
+- Navigate to explore in Grafana.
+- Select the Loki datasource from the drop-down.
+- Check the toggle for **builder | code** in the top right corner of the query box and switch the query mode to builder if it’s not already selected.
+- Select the filename label from the drop-down and choose your `web_requests.log` file from the value drop-down.
+- Click **Run Query**.
+- You should see logs and a graph of log volume.
 
 ### Troubleshooting the script
 
@@ -288,115 +292,135 @@ that generates the sample logs used in this tutorial to create alerts.
 1. Start a command line from a directory of your choice.
 1. From that directory, get a `docker-compose.yaml` file to run Grafana, Loki, and Promtail:
 
-   **Bash**
+**Bash**
 
-   ```
-   wget https://raw.githubusercontent.com/grafana/loki/v2.8.0/production/docker-compose.yaml -O docker-compose.yaml
-   ```
+```
 
-   **Windows Powershell**
+wget https://raw.githubusercontent.com/grafana/loki/v2.8.0/production/docker-compose.yaml -O docker-compose.yaml
 
-   ```
-   $client = new-object System.Net.WebClient
-   $client.DownloadFile("https://raw.githubusercontent.com/grafana/loki/v2.8.0/production/docker-compose.yaml",
-   "C:\Users\$Env:UserName\Desktop\docker-compose.yaml")
-   #downloads the file to the Desktop
-   ```
+```
+
+**Windows Powershell**
+
+```
+
+$client = new-object System.Net.WebClient
+$client.DownloadFile("https://raw.githubusercontent.com/grafana/loki/v2.8.0/production/docker-compose.yaml",
+"C:\Users\$Env:UserName\Desktop\docker-compose.yaml")
+#downloads the file to the Desktop
+
+```
 
 1. Run the container
 
-   ```
-   docker compose up -d
-   ```
+```
+
+docker compose up -d
+
+```
 
 1. Create and edit a python file that will generate logs.
 
-   **Bash**
+**Bash**
 
-   ```
-   touch web-server-logs-simulator.py && nano web-server-logs-simulator.py
-   ```
+```
 
-   **Windows Powershell**
+touch web-server-logs-simulator.py && nano web-server-logs-simulator.py
 
-   ```
-   New-Item web-server-logs-simulator.py ; notepad web-server-logs-simulator.py
-   ```
+```
+
+**Windows Powershell**
+
+```
+
+New-Item web-server-logs-simulator.py ; notepad web-server-logs-simulator.py
+
+```
 
 1. Paste the following code into the file
 
-   ```
-   #!/bin/env python3
-
-   import datetime
-   import math
-   import random
-   import sys
-   import time
-
-
-
-   requests_per_second = 2
-   failure_rate = 0.05
-   get_post_ratio = 0.9
-   get_average_duration_ms = 500
-   post_average_duration_ms = 2000
-
-
-   while True:
-   # Exponential distribution random value of average 1/lines_per_second.
-   d = random.expovariate(requests_per_second)
-   time.sleep(d)
-   if random.random() < failure_rate:
-       status = "500"
-   else:
-       status = "200"
-   if random.random() < get_post_ratio:
-       method = "GET"
-       duration_ms = math.floor(random.expovariate(1/get_average_duration_ms))
-   else:
-       method = "POST"
-       duration_ms = math.floor(random.expovariate(1/post_average_duration_ms))
-   timestamp = datetime.datetime.now(tz=datetime.timezone.utc).isoformat()
-   print(f"{timestamp} level=info method={method} url=/ status={status} duration={duration_ms}ms")
-   sys.stdout.flush()
-   ```
+```
+
+#!/bin/env python3
+
+import datetime
+import math
+import random
+import sys
+import time
+
+
+
+requests_per_second = 2
+failure_rate = 0.05
+get_post_ratio = 0.9
+get_average_duration_ms = 500
+post_average_duration_ms = 2000
+
+
+while True:
+
+    # Exponential distribution random value of average 1/lines_per_second.
+    d = random.expovariate(requests_per_second)
+    time.sleep(d)
+    if random.random() < failure_rate:
+        status = "500"
+    else:
+        status = "200"
+    if random.random() < get_post_ratio:
+        method = "GET"
+        duration_ms = math.floor(random.expovariate(1/get_average_duration_ms))
+    else:
+        method = "POST"
+        duration_ms = math.floor(random.expovariate(1/post_average_duration_ms))
+    timestamp = datetime.datetime.now(tz=datetime.timezone.utc).isoformat()
+    print(f"{timestamp} level=info method={method} url=/ status={status} duration={duration_ms}ms")
+    sys.stdout.flush()
+
+```
 
 1. Execute the log-generating python script.
 
-   In a terminal window on linux-based systems run the command:
+In a terminal window on linux-based systems run the command:
 
-   ```
-   chmod 755  ./web-server-logs-simulator.py
-   ```
+```
 
-   - Use `tee` to direct the script output to the console and the specified file path. For example, if promtail is
-     configured to monitor `/var/log` for `.log` files you can direct the script output to `/var/log/web_requests.log` file.
+chmod 755 ./web-server-logs-simulator.py
 
-   - To avoid running the script with elevated permissions, create the log file manually and change the permissions for the output file only.
+```
 
-   ```
-   sudo touch /var/log/web_requests.log
-   chmod 755 /var/log/web_requests.log
-   python3 ./web-server-logs-simulator.py | tee -a /var/log/web_requests.log
-   ```
+- Use `tee` to direct the script output to the console and the specified file path. For example, if promtail is
+  configured to monitor `/var/log` for `.log` files you can direct the script output to `/var/log/web_requests.log` file.
 
-   **Running on Windows**
+- To avoid running the script with elevated permissions, create the log file manually and change the permissions for the output file only.
 
-   Run Powershell as administrator
+```
 
-   ```
-   python ./web-server-logs-simulator.py | Tee-Object "C:\ProgramFiles\GrafanaLabs\grafana\var\log\web_requests.log"
-   ```
+sudo touch /var/log/web_requests.log
+chmod 755 /var/log/web_requests.log
+python3 ./web-server-logs-simulator.py | tee -a /var/log/web_requests.log
+
+
+```
+
+**Running on Windows**
+
+Run Powershell as administrator
+
+```
+
+python ./web-server-logs-simulator.py | Tee-Object "C:\ProgramFiles\GrafanaLabs\grafana\var\log\web_requests.log"
+
+```
 
 1. Verify that the logs are showing up in Grafana’s Explore view:
 
-   - Navigate to explore in Grafana.
-   - Select the Loki datasource from the drop-down.
-   - Check the toggle for **builder | code** in the top right corner of the query box and switch the query mode to builder if it’s not already selected.
-   - Select the filename label from the drop-down and choose your `web_requests.log` file from the value drop-down.
-   - Click **Run Query**.
-   - You should see logs and a graph of log volume.
+- Navigate to explore in Grafana.
+- Select the Loki datasource from the drop-down.
+- Check the toggle for **builder | code** in the top right corner of the query box and switch the query mode to builder if it’s not already selected.
+- Select the filename label from the drop-down and choose your `web_requests.log` file from the value drop-down.
+- Click **Run Query**.
+- You should see logs and a graph of log volume.
 
 ### Troubleshooting the script
 
diff --git a/docs/sources/tutorials/grafana-fundamentals/index.md b/docs/sources/tutorials/grafana-fundamentals/index.md
index abff02d94afca..7db66adb4c704 100644
--- a/docs/sources/tutorials/grafana-fundamentals/index.md
+++ b/docs/sources/tutorials/grafana-fundamentals/index.md
@@ -20,15 +20,20 @@ weight: 10
 
 ## Introduction
 
-In this tutorial, you'll learn how to use Grafana to set up a monitoring solution for your application.
-
-In this tutorial, you'll:
+In this tutorial, you'll learn how to use Grafana to set up a monitoring solution for your application, and:
 
 - Explore metrics and logs
 - Build dashboards
 - Annotate dashboards
 - Set up alerts
 
+Alternatively, you can also watch our Grafana for Beginners series where we discuss fundamental concepts to help you get started with Grafana.
+
+<div style="position:relative;padding-bottom:56.25%;height:0;overflow:hidden">
+   <iframe src="https://www.youtube.com/embed/videoseries?si=ueLa_QEXz20IWnGt&amp;list=PLDGkOdUX1Ujo27m6qiTPPCpFHVfyKq9jT" style="position:absolute;top:0;left:0;width:100%;height:100%;border:0" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen>
+   </iframe>
+</div>
+
 {{% class "prerequisite-section" %}}
 
 ### Prerequisites
@@ -36,13 +41,20 @@ In this tutorial, you'll:
 - [Docker](https://docs.docker.com/install/)
 - [Docker Compose](https://docs.docker.com/compose/) (included in Docker for Desktop for macOS and Windows)
 - [Git](https://git-scm.com/)
-  {{% /class %}}
+
+### KillerCoda sandbox environment (Alternative)
+
+If you would prefer to follow along with this tutorial without needing to set up a local environment, you can use the [KillerCoda sandbox environment](https://killercoda.com/grafana-labs/course/full-stack/tutorial-enviroment).
+
+{{% /class %}}
 
 ## Set up the sample application
 
 This tutorial uses a sample application to demonstrate some of the features in Grafana. To complete the exercises in this tutorial, you need to download the files to your local machine.
 
-In this step, you'll set up the sample application, as well as supporting services, such as [Prometheus](https://prometheus.io/) and [Loki](/oss/loki/).
+In this step, you'll set up the sample application, as well as supporting services, such as [Loki](/oss/loki/).
+
+> **Note:** [Prometheus](https://prometheus.io/), a popular time series database (TSDB), has already been configured as a data source as part of this tutorial.
 
 1. Clone the [github.com/grafana/tutorial-environment](https://github.com/grafana/tutorial-environment) repository.
 
@@ -98,47 +110,13 @@ To add a link:
 
 To vote for a link, click the triangle icon next to the name of the link.
 
-## Log in to Grafana
-
-Grafana is an open-source platform for monitoring and observability that lets you visualize and explore the state of your systems.
-
-1. Open a new tab.
-1. Browse to [localhost:3000](http://localhost:3000).
-1. In **email or username**, enter **admin**.
-1. In **password**, enter **admin**.
-1. Click **Log In**.
-
-   The first time you log in, you're asked to change your password:
-
-1. In **New password**, enter your new password.
-1. In **Confirm new password**, enter the same password.
-1. Click **Save**.
-
-The first thing you see is the Home dashboard, which helps you get started.
-
-In the top left corner, you can see the menu icon. Clicking it will open the _sidebar_, the main menu for navigating Grafana.
-
-## Add a metrics data source
-
-The sample application exposes metrics which are stored in [Prometheus](https://prometheus.io/), a popular time series database (TSDB).
-
-To be able to visualize the metrics from Prometheus, you first need to add it as a data source in Grafana.
-
-1. In the sidebar, click **Connections** and then **Data sources**.
-1. Click **Add data source**.
-1. In the list of data sources, click **Prometheus**.
-1. In the URL box, enter **http\://prometheus:9090**.
-1. Scroll to the bottom of the page and click **Save & test**.
-
-   Prometheus is now available as a data source in Grafana.
-
 ## Explore your metrics
 
 Grafana Explore is a workflow for troubleshooting and data exploration. In this step, you'll be using Explore to create ad-hoc queries to understand the metrics exposed by the sample application.
 
 > Ad-hoc queries are queries that are made interactively, with the purpose of exploring data. An ad-hoc query is commonly followed by another, more specific query.
 
-1. Click the menu icon and, in the sidebar, click **Explore**. The Prometheus data source that you added will already be selected.
+1. Click the menu icon and, in the sidebar, click **Explore**. A dropdown menu for the list of available data sources is on the upper-left side. The Prometheus data source will already be selected. If not, choose Prometheus.
 1. Confirm that you're in code mode by checking the **Builder/Code** toggle at the top right corner of the query panel.
 1. In the query editor, where it says _Enter a PromQL query…_, enter `tns_request_duration_seconds_count` and then press Shift + Enter.
    A graph appears.
@@ -168,7 +146,7 @@ Grafana Explore is a workflow for troubleshooting and data exploration. In this
 
 1. Back in Grafana, in the upper-right corner, click the _time picker_, and select **Last 5 minutes**. By zooming in on the last few minutes, it's easier to see when you receive new data.
 
-Depending on your use case, you might want to group on other labels. Try grouping by other labels, such as `status_code`, by changing the `by(route)` part of the query.
+Depending on your use case, you might want to group on other labels. Try grouping by other labels, such as `status_code`, by changing the `by(route)` part of the query to `by(status_code)`.
 
 ## Add a logging data source
 
@@ -180,7 +158,7 @@ Grafana supports log data sources, like [Loki](/oss/loki/). Just like for metric
 1. In the URL box, enter [http://loki:3100](http://loki:3100).
 1. Scroll to the bottom of the page and click **Save & Test** to save your changes.
 
-Loki is now available as a data source in Grafana.
+You should see the message "Data source successfully connected." Loki is now available as a data source in Grafana.
 
 ## Explore your logs
 
@@ -234,13 +212,15 @@ Every panel consists of a _query_ and a _visualization_. The query defines _what
    sum(rate(tns_request_duration_seconds_count[5m])) by(route)
    ```
 
-1. Click **Options** under the query field to open the panel.
-1. In the **Legend** field, select **Custom** and then enter `route` to rename the series in the legend. The graph legend updates when you click outside the field.
 1. In the panel editor on the right, under **Panel options**, change the panel title to "Traffic".
 1. Click **Apply** in the top-right corner to save the panel and go back to the dashboard view.
 1. Click the **Save dashboard** (disk) icon at the top of the dashboard to save your dashboard.
 1. Enter a name in the **Dashboard name** field and then click **Save**.
 
+   You should now have a panel added to your dashboard.
+
+   {{< figure src="/media/tutorials/grafana-fundamentals-dashboard.png" alt="A panel in a Grafana dashboard" caption="A panel in a Grafana dashboard" >}}
+
 ## Annotate events
 
 When things go bad, it often helps if you understand the context in which the failure occurred. Time of last deploy, system changes, or database migration can offer insight into what might have caused an outage. Annotations allow you to represent such events directly on your graphs.
@@ -248,6 +228,7 @@ When things go bad, it often helps if you understand the context in which the fa
 In the next part of the tutorial, we will simulate some common use cases that someone would add annotations for.
 
 1. To manually add an annotation, click anywhere in your graph, then click **Add annotation**.
+   Note: you might need to save the dashboard first.
 1. In **Description**, enter **Migrated user database**.
 1. Click **Save**.
 
@@ -257,11 +238,13 @@ Grafana also lets you annotate a time interval, with _region annotations_.
 
 Add a region annotation:
 
-1. Press Ctrl (or Cmd on macOS), then click and drag across the graph to select an area.
+1. Press Ctrl (or Cmd on macOS) and hold, then click and drag across the graph to select an area.
 1. In **Description**, enter **Performed load tests**.
 1. In **Tags**, enter **testing**.
 1. Click **Save**.
 
+### Using annotations to correlate logs with metrics
+
 Manually annotating your dashboard is fine for those single events. For regularly occurring events, such as deploying a new release, Grafana supports querying annotations from one of your data sources. Let's create an annotation using the Loki data source we added earlier.
 
 1. At the top of the dashboard, click the **Dashboard settings** (gear) icon.
@@ -274,14 +257,16 @@ Manually annotating your dashboard is fine for those single events. For regularl
    {filename="/var/log/tns-app.log"} |= "error"
    ```
 
-<!--this add button is gone rn. look into this -->
-
-1. Click **Apply**. Grafana displays the **Annotations** page, with your new annotation in the list.
-1. Click the name of the dashboard in the breadcrumb at the top of the screen to return to your dashboard.
-1. At the top of your dashboard, there is now a toggle with the name **Errors** to display the results of the newly created annotation query. The toggle is enabled by default.
+1. Click **Apply**. Grafana displays the Annotations list, with your new annotation.
+1. Click on your dashboard name to return to your dashboard.
+1. At the top of your dashboard, there is now a toggle to display the results of the newly created annotation query. Press it if it's not already enabled.
+1. Click the **Save dashboard** icon to save the changes.
+1. To test the changes, go back to the [sample application](http://localhost:8081), post a new link without a URL to generate an error in your browser that says `empty url`.
 
 The log lines returned by your query are now displayed as annotations in the graph.
 
+{{< figure src="/media/tutorials/annotations-grafana-dashboard.png" alt="A panel in a Grafana dashboard with log queries from Loki displayed as annotations" caption="Displaying log queries from Loki as annotations" >}}
+
 Being able to combine data from multiple data sources in one graph allows you to correlate information from both Prometheus and Loki.
 
 Annotations also work very well alongside alerts. In the next and final section, we will set up an alert for our app `grafana.news` and then we will trigger it. This will provide a quick intro to our new Alerting platform.
@@ -294,7 +279,16 @@ Grafana's new alerting platform debuted with Grafana 8. A year later, with Grafa
 
 The most basic alert consists of two parts:
 
-1. A _Contact point_ - A Contact point defines how Grafana delivers an alert. When the conditions of an _alert rule_ are met, Grafana notifies the contact points, or channels, configured for that alert. Some popular channels include email, webhooks, Slack notifications, and PagerDuty notifications.
+1. A _Contact point_ - A Contact point defines how Grafana delivers an alert. When the conditions of an _alert rule_ are met, Grafana notifies the contact points, or channels, configured for that alert.
+
+   Some popular channels include:
+
+   - Email
+   - [Webhooks](#create-a-contact-point-for-grafana-managed-alerts)
+   - [Telegram](https://grafana.com/blog/2023/12/28/how-to-integrate-grafana-alerting-and-telegram/)
+   - [Slack](https://grafana.com/docs/grafana/latest/alerting/alerting-rules/manage-contact-points/integrations/configure-slack/)
+   - PagerDuty
+
 1. An _Alert rule_ - An Alert rule defines one or more _conditions_ that Grafana regularly evaluates. When these evaluations meet the rule's criteria, the alert is triggered.
 
 To begin, let's set up a webhook contact point. Once we have a usable endpoint, we'll write an alert rule and trigger a notification.
@@ -304,21 +298,21 @@ To begin, let's set up a webhook contact point. Once we have a usable endpoint,
 In this step, we'll set up a new contact point. This contact point will use the _webhooks_ channel. In order to make this work, we also need an endpoint for our webhook channel to receive the alert. We will use [requestbin.com](https://requestbin.com) to quickly set up that test endpoint. This way we can make sure that our alert is actually sending a notification somewhere.
 
 1. Browse to [requestbin.com](https://requestbin.com).
-1. Under the **Create Request Bin** button, click the **public bin** link.
-
-Your request bin is now waiting for the first request.
+1. Under the **Create Request Bin** button, click the link to create a **public bin** instead.
+1. From Request Bin, copy the endpoint URL.
 
-1. Copy the endpoint URL.
+Your Request Bin is now waiting for the first request.
 
 Next, let's configure a Contact Point in Grafana's Alerting UI to send notifications to our Request Bin.
 
-1. Return to Grafana. Click the menu icon and, in the sidebar, click **Alerting** and then **Contact points**.
+1. Return to Grafana. In Grafana's sidebar, hover over the **Alerting** (bell) icon and then click **Contact points**.
 1. Click **+ Add contact point**.
 1. In **Name**, write **RequestBin**.
-1. In the **Integration** dropdown menu, choose **Webhook**.
-1. In **Url**, paste the endpoint to your request bin.
-1. Click **Test** to send a test alert to your request bin.
-1. Navigate back to the request bin you created earlier. On the left side, there's now a `POST /` entry. Click it to see what information Grafana sent.
+1. In **Integration**, choose **Webhook**.
+1. In **URL**, paste the endpoint to your request bin.
+
+1. Click **Test**, and then click **Send test notification** to send a test alert to your request bin.
+1. Navigate back to the Request Bin you created earlier. On the left side, there's now a `POST /` entry. Click it to see what information Grafana sent.
 1. Return to Grafana and click **Save contact point**.
 
 We have now created a dummy webhook endpoint and created a new Alerting Contact Point in Grafana. Now we can create an alert rule and link it to this new channel.
@@ -327,16 +321,30 @@ We have now created a dummy webhook endpoint and created a new Alerting Contact
 
 Now that Grafana knows how to notify us, it's time to set up an alert rule:
 
-1. In the sidebar, click **Alert rules**.
-1. Click **Create alert rule**.
-1. In section **1**, name the rule `fundamentals-test`.
-1. For section **2**, select **Grafana Managed Alert** as the rule type. Next, find query box **A**. Choose your Prometheus datasource and enter the same query that we used in our earlier panel: `sum(rate(tns_request_duration_seconds_count[5m])) by(route)`. Click **Run queries**. You should see some data in the graph.
-1. Now scroll down to query box **B**. Change the operation from **Reduce** to **Classic condition**. [You can read more about classic and multi-dimensional conditions here](/docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-grafana-managed-rule/#single-and-multi-dimensional-rule). For conditions enter the following: `WHEN last() OF A IS ABOVE 0.2`. Delete query **C**.
-1. In section **3**, Select **+ Add New** in **Folder** dropdown menu. Name the new folder `fundamentals` and press enter. This will create the folder needed. In **Evaluation Group**, name the group also `fundamentals` for now. In the **for** field, enter `0m`. This setting makes Grafana wait until an alert has fired for a given time before Grafana sends the notification.
-1. In section **4**, you can add some sample text to your summary message. [Read more about message templating here](/docs/grafana/latest/alerting/unified-alerting/message-templating/).
-1. In the top right corner of the page, click **Save rule and exit**.
-1. In the sidebar, click **Notification policies**.
-1. Under **Default policy**, click the button with the three dots and select **Edit**. Change the **Default contact point** to **RequestBin**. Click **Update default policy**.
+1. In Grafana's sidebar, hover over the **Alerting** (bell) icon and then click **Alert rules**.
+1. Click **+ New alert rule**.
+1. For **Section 1**, name the rule `fundamentals-test`.
+1. For **Section 2**, Find the **query A** box. Choose your Prometheus datasource. Note that the rule type should automatically switch to Grafana-managed alert.
+1. Switch to code mode by checking the Builder/Code toggle.
+1. Enter the same Prometheus query that we used in our earlier panel:
+
+   ```
+   sum(rate(tns_request_duration_seconds_count[5m])) by(route)
+   ```
+
+1. Press **Preview**. You should see some data returned.
+1. Keep expressions “B” and "C" as they are. These expressions (Reduce and Threshold, respectively) come by default when creating a new rule. Expression "B", selects the last value of our query “A”, while the Threshold expression "C" will check if the last value from expression "B" is above a specific value. In addition, the Threshold expression is the alert condition by default. Enter `0.2` as threshold value. [You can read more about queries and conditions here](/docs/grafana/latest/alerting/fundamentals/alert-rules/queries-conditions/#expression-queries).
+1. In **Section 3**, in Folder, create a new folder, by clicking `New folder` and typing a name for the folder. This folder will contain our alerts. For example: `fundamentals`. Then, click `create`.
+1. In the Evaluation group, repeat the above step to create a new one. We will name it `fundamentals` too.
+1. Choose an Evaluation interval (how often the alert will be evaluated). For example, every `10s` (10 seconds).
+1. Set the pending period. This is the time that a condition has to be met until the alert enters in Firing state and a notification is sent. Enter `0s`. For the purposes of this tutorial, the evaluation interval is intentionally short. This makes it easier to test. This setting makes Grafana wait until an alert has fired for a given time before Grafana sends the notification.
+1. In **Section 4**, you can optionally add some sample text to your summary message. [Read more about message templating here](/docs/grafana/latest/alerting/unified-alerting/message-templating/).
+1. Click **Save rule and exit** at the top of the page.
+1. In Grafana's sidebar, navigate to **Notification policies**.
+1. Under **Default policy**, select **...** &rsaquo; **Edit** and change the **Default contact point** from **grafana-default-email** to **RequestBin**.
+1. Expand the **Timing options** dropdown and under **Group wait** and **Group interval** update the value to `30s` for testing purposes. Group wait is the time Grafana waits before sending the first notification for a new group of alerts. In contrast, group interval is the time Grafana waits before sending notifications about changes to the group.
+1. Click **Update default policy**.
+
    As a system grows, admins can use the **Notification policies** setting to organize and match alert rules to
    specific contact points.
 
@@ -345,10 +353,30 @@ Now that Grafana knows how to notify us, it's time to set up an alert rule:
 We have now configured an alert rule and a contact point. Now let's see if we can trigger a Grafana Managed Alert by generating some traffic on our sample application.
 
 1. Browse to [localhost:8081](http://localhost:8081).
-1. Repeatedly click the vote button or refresh the page to generate a traffic spike.
+1. Add a new title and URL, repeatedly click the vote button, or refresh the page to generate a traffic spike.
 
 Once the query `sum(rate(tns_request_duration_seconds_count[5m])) by(route)` returns a value greater than `0.2` Grafana will trigger our alert. Browse to the Request Bin we created earlier and find the sent Grafana alert notification with details and metadata.
 
+### Display Grafana Alerts to your dashboard
+
+In most cases, it's also valuable to display Grafana Alerts as annotations to your dashboard. Check out the video tutorial below to learn how to display alerting to your dashboard.
+
+{{< youtube id="ClLp-iSoaSY" >}}
+
+Let's see how we can configure this.
+
+1. In Grafana's sidebar, hover over the **Alerting** (bell) icon and then click **Alert rules**.
+1. Expand the `fundamentals > fundamentals` folder to view our created alert rule.
+1. Click the **Edit** icon and scroll down to **Section 4**.
+1. Click the **Link dashboard and panel** button and select the dashboard and panel to which you want the alert to be added as an annotation.
+1. Click **Confirm** and **Save rule and exit** to save all the changes.
+1. In Grafana's sidebar, navigate to the dashboard by clicking **Dashboards** and selecting the dashboard you created.
+1. To test the changes, follow the steps listed to [trigger a Grafana Managed Alert](#trigger-a-grafana-managed-alert).
+
+   You should now see a red, broken heart icon beside the panel name, signifying that the alert has been triggered. An annotation for the alert, represented as a vertical red line, is also displayed.
+
+   {{< figure src="/media/tutorials/grafana-alert-on-dashboard.png" alt="A panel in a Grafana dashboard with alerting and annotations configured" caption="Displaying Grafana Alerts on a dashboard" >}}
+
 ## Summary
 
 In this tutorial you learned about fundamental features of Grafana. To do so, we ran several Docker containers on your local machine. When you are ready to clean up this local tutorial environment, run the following command:
@@ -357,13 +385,17 @@ In this tutorial you learned about fundamental features of Grafana. To do so, we
 docker-compose down -v
 ```
 
+### KillerCoda sandbox environment (completed tutorial)
+
+Do you want to see the finished result? Check out our [completed KillerCoda sandbox environment](https://killercoda.com/grafana-labs/course/full-stack/tutorial-enviroment-completed) containing the entire demo with dashboards, checks, and data sources configured.
+
 ### Learn more
 
 Check out the links below to continue your learning journey with Grafana's LGTM stack.
 
 - [Prometheus](/docs/grafana/latest/features/datasources/prometheus/)
 - [Loki](/docs/grafana/latest/features/datasources/loki/)
-- [Explore](/docs/grafana/latest/features/explore/)
+- [Explore](/docs/grafana/latest/explore/)
 - [Alerting Overview](/docs/grafana/latest/alerting/)
 - [Alert rules](/docs/grafana/latest/alerting/create-alerts/)
-- [Contact Points](/docs/grafana/latest/alerting/notifications/)
+- [Contact points](/docs/grafana/latest/alerting/fundamentals/contact-points/)
diff --git a/docs/sources/tutorials/install-grafana-on-raspberry-pi/index.md b/docs/sources/tutorials/install-grafana-on-raspberry-pi/index.md
index 2bc96509a6499..90ee346133142 100644
--- a/docs/sources/tutorials/install-grafana-on-raspberry-pi/index.md
+++ b/docs/sources/tutorials/install-grafana-on-raspberry-pi/index.md
@@ -51,7 +51,7 @@ Follow the directions on the website to download and install the imager.
 
 #### Install Raspberry Pi OS
 
-Now it is time to install Raspberry Pi OS.
+Now it's time to install Raspberry Pi OS.
 
 1. Insert the SD card into your regular computer from which you plan to install Raspberry Pi OS.
 1. Run the Raspberry Pi Imager that you downloaded and installed.
@@ -69,7 +69,7 @@ While you _could_ fire up the Raspberry Pi now, we don't yet have any way of acc
 
 1. **(Optional)** Create a file called `wpa_supplicant.conf` in the boot directory:
 
-   ```
+   ```bash
    ctrl_interface=/var/run/wpa_supplicant
    update_config=1
    country=<Insert 2 letter ISO 3166-1 country code here>
@@ -89,13 +89,16 @@ All the necessary files are now on the SD card. Let's start up the Raspberry Pi.
 #### Connect remotely via SSH
 
 1. Open up your terminal and enter the following command:
-   ```
+
+   ```bash
    ssh pi@<ip address>
    ```
+
 1. SSH warns you that the authenticity of the host can't be established. Type "yes" to continue connecting.
 1. When asked for a password, enter the default password: `raspberry`.
 1. Once you're logged in, change the default password:
-   ```
+
+   ```bash
    passwd
    ```
 
@@ -107,18 +110,20 @@ Now that you've got the Raspberry Pi up and running, the next step is to install
 
 1. Add the APT key used to authenticate packages:
 
-   ```
-   wget -q -O - https://packages.grafana.com/gpg.key | sudo apt-key add -
+   ```bash
+   sudo mkdir -p /etc/apt/keyrings/
+   wget -q -O - https://apt.grafana.com/gpg.key | gpg --dearmor | sudo tee /etc/apt/keyrings/grafana.gpg > /dev/null
    ```
 
 1. Add the Grafana APT repository:
 
-   ```
-   echo "deb https://packages.grafana.com/oss/deb stable main" | sudo tee -a /etc/apt/sources.list.d/grafana.list
+   ```bash
+   echo "deb [signed-by=/etc/apt/keyrings/grafana.gpg] https://apt.grafana.com stable main" | sudo tee /etc/apt/sources.list.d/grafana.list
    ```
 
 1. Install Grafana:
-   ```
+
+   ```bash
    sudo apt-get update
    sudo apt-get install -y grafana
    ```
@@ -127,13 +132,13 @@ Grafana is now installed, but not yet running. To make sure Grafana starts up ev
 
 1. Enable the Grafana server:
 
-   ```
+   ```bash
    sudo /bin/systemctl enable grafana-server
    ```
 
 1. Start the Grafana server:
 
-   ```
+   ```bash
    sudo /bin/systemctl start grafana-server
    ```
 
@@ -143,7 +148,7 @@ Grafana is now installed, but not yet running. To make sure Grafana starts up ev
 1. Log in to Grafana with the default username `admin`, and the default password `admin`.
 1. Change the password for the admin user when asked.
 
-Congratulations! Grafana is now running on your Raspberry Pi. If the Raspberry Pi is ever restarted or turned off, Grafana will start up whenever the machine regains power.
+Congratulations, Grafana is now running on your Raspberry Pi. If the Raspberry Pi is ever restarted or turned off, Grafana will start up whenever the machine regains power.
 
 ## Summary
 
diff --git a/docs/sources/tutorials/integrate-hubot/index.md b/docs/sources/tutorials/integrate-hubot/index.md
index d6b769987f1f1..35299df80b60d 100644
--- a/docs/sources/tutorials/integrate-hubot/index.md
+++ b/docs/sources/tutorials/integrate-hubot/index.md
@@ -25,10 +25,7 @@ Grafana 2.0 shipped with a great feature that enables it to render any graph or
 
 No matter what data source you are using, the PNG image of the Graph will look the same as it does in your browser.
 
-This guide will show you how to install and configure the [Hubot-Grafana](https://github.com/stephenyeargin/hubot-grafana) plugin. This plugin allows you to tell hubot to render any dashboard or graph right from a channel in Slack, Hipchat or Basecamp. The bot will respond with an image of the graph and a link that will take you to the graph.
-
-> _Amazon S3 Required_: The hubot-grafana script will upload the rendered graphs to Amazon S3. This
-> is so Hipchat and Slack can show them reliably (they require the image to be publicly available).
+This guide shows you how to install and configure the [Hubot-Grafana](https://github.com/stephenyeargin/hubot-grafana) plugin. This plugin allows you to tell Hubot to render any dashboard or graph right from a channel in Slack, Basecamp, or any other supported Hubot adapter. The bot will respond with an image of the graph and a link that will take you to the graph.
 
 {{< figure src="/static/img/docs/tutorials/hubot_grafana.png"  max-width="800px" >}}
 
@@ -40,7 +37,7 @@ This guide will show you how to install and configure the [Hubot-Grafana](https:
 
 Hubot is very easy to install and host. If you do not already have a bot up and running please read the official [Getting Started With Hubot](https://hubot.github.com/docs/) guide.
 
-## Install Hubot-Grafana script
+## Install the Hubot-Grafana script
 
 In your Hubot project repo install the Grafana plugin using `npm`:
 
@@ -56,18 +53,15 @@ Edit the file external-scripts.json, and add hubot-grafana to the list of plugin
 
 ## Configure
 
-The `hubot-grafana` plugin requires a number of environment variables to be set in order to work properly.
+The Hubot-Grafana plugin requires two environment variables to be set in order to work properly.
 
 ```bash
 export HUBOT_GRAFANA_HOST=https://play.grafana.org
 export HUBOT_GRAFANA_API_KEY=abcd01234deadbeef01234
-export HUBOT_GRAFANA_S3_BUCKET=mybucket
-export HUBOT_GRAFANA_S3_ACCESS_KEY_ID=ABCDEF123456XYZ
-export HUBOT_GRAFANA_S3_SECRET_ACCESS_KEY=aBcD01234dEaDbEef01234
-export HUBOT_GRAFANA_S3_PREFIX=graphs
-export HUBOT_GRAFANA_S3_REGION=us-standard
 ```
 
+There are [additional environment variables](https://github.com/stephenyeargin/hubot-grafana?tab=readme-ov-file#general-settings) that you can set to control the appearance of the graphs.
+
 ### Grafana server side rendering
 
 The hubot plugin will take advantage of the Grafana server side rendering feature that can render any panel on the server using phantomjs. Grafana ships with a phantomjs binary (Linux only).
@@ -80,9 +74,9 @@ To verify that this feature works try the `Direct link to rendered image` link i
 
 You need to set the environment variable `HUBOT_GRAFANA_API_KEY` to a Grafana API Key. You can add these from the API Keys page which you find in the Organization dropdown.
 
-### Amazon S3
+### Image uploading
 
-The `S3` options are optional but for the images to work properly in services like Slack and Hipchat they need to publicly available. By specifying the `S3` options the hubot-grafana script will publish the rendered panel to `S3` and it will use that URL when it posts to Slack or Hipchat.
+There are several approaches to uploading the rendered graphs. If you are using Slack, Rocket.Chat, or Telegram, the adapter's native uploader will take care of sending it through their respective API. If your Hubot is hosted on a platform that doesn't support uploads (such as IRC), you can use the [built-in S3 uploader](https://github.com/stephenyeargin/hubot-grafana/wiki/Amazon-S3-Image-Hosting). Note if you configure S3, it will not use the adapter's upload features.
 
 ## Hubot commands
 
diff --git a/docs/sources/tutorials/provision-dashboards-and-data-sources/index.md b/docs/sources/tutorials/provision-dashboards-and-data-sources/index.md
index 89de23a0556b0..5e03387a8dda4 100644
--- a/docs/sources/tutorials/provision-dashboards-and-data-sources/index.md
+++ b/docs/sources/tutorials/provision-dashboards-and-data-sources/index.md
@@ -44,7 +44,6 @@ Grafana supports configuration as code through _provisioning_. The resources tha
 
 - [Dashboards](/docs/grafana/latest/administration/provisioning/#dashboards)
 - [Data sources](/docs/grafana/latest/administration/provisioning/#datasources)
-- [Alert notification channels](/docs/grafana/latest/administration/provisioning/#alert-notification-channels)
 
 ## Set the provisioning directory
 
@@ -69,8 +68,6 @@ provisioning/
     <yaml files>
   dashboards/
     <yaml files>
-  notifiers/
-    <yaml files>
 ```
 
 Next, we'll look at how to provision a data source.
diff --git a/docs/sources/tutorials/run-grafana-behind-a-proxy/index.md b/docs/sources/tutorials/run-grafana-behind-a-proxy/index.md
index 1c91e80579a2b..38da801e93a9f 100644
--- a/docs/sources/tutorials/run-grafana-behind-a-proxy/index.md
+++ b/docs/sources/tutorials/run-grafana-behind-a-proxy/index.md
@@ -1,5 +1,4 @@
 ---
-Feedback Link: https://github.com/grafana/tutorials/issues/new
 aliases:
   - /docs/grafana/latest/installation/behind_proxy/
 authors:
@@ -32,32 +31,18 @@ When running Grafana behind a proxy, you need to configure the domain name to le
 domain = example.com
 ```
 
-- Restart Grafana for the new changes to take effect.
+- Restart Grafana for the changes to take effect.
 
-You can also serve Grafana behind a _sub path_, such as `http://example.com/grafana`.
+## Configure reverse proxy
 
-To serve Grafana behind a sub path:
+### Configure nginx
 
-- Include the sub path at the end of the `root_url`.
-- Set `serve_from_sub_path` to `true`.
+[nginx](https://www.nginx.com) is a high performance load balancer, web server, and reverse proxy.
 
-```bash
-[server]
-domain = example.com
-root_url = %(protocol)s://%(domain)s:%(http_port)s/grafana/
-serve_from_sub_path = true
-```
-
-Next, you need to configure your reverse proxy.
-
-## Configure NGINX
-
-[NGINX](https://www.nginx.com) is a high performance load balancer, web server, and reverse proxy.
-
-- In your NGINX configuration file inside `http` section, add the following:
+- In your nginx configuration file inside the `http` section, add the following:
 
 ```nginx
-# this is required to proxy Grafana Live WebSocket connections.
+# This is required to proxy Grafana Live WebSocket connections.
 map $http_upgrade $connection_upgrade {
   default upgrade;
   '' close;
@@ -73,32 +58,35 @@ server {
   index index.html index.htm;
 
   location / {
-    proxy_set_header Host $http_host;
+    proxy_set_header Host $host;
     proxy_pass http://grafana;
   }
 
-# Proxy Grafana Live WebSocket connections.
+  # Proxy Grafana Live WebSocket connections.
   location /api/live/ {
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection $connection_upgrade;
-    proxy_set_header Host $http_host;
+    proxy_set_header Host $host;
     proxy_pass http://grafana;
   }
 }
 ```
 
-- Reload the NGINX configuration.
-- Navigate to port 80 on the machine NGINX is running on. You're greeted by the Grafana login page.
+- Reload the nginx configuration.
+- Navigate to port 80 on the machine nginx is running on.
+  You're greeted by the Grafana login page.
 
-For Grafana Live which uses WebSocket connections you may have to raise Nginx [worker_connections](https://nginx.org/en/docs/ngx_core_module.html#worker_connections) option which is 512 by default – which limits the number of possible concurrent connections with Grafana Live.
+For Grafana Live which uses WebSocket connections you may have to raise the nginx value for [`worker_connections`](https://nginx.org/en/docs/ngx_core_module.html#worker_connections) option which is `512` by default. The default value limits the number of possible concurrent connections with Grafana Live.
 
-Also, be aware that the above configuration will work only when the `proxy_pass` value for `location /` is a literal string. If you are using a variable here, [read this GitHub issue](https://github.com/grafana/grafana/issues/18299). You will need to add [an appropriate NGINX rewrite rule](https://www.nginx.com/blog/creating-nginx-rewrite-rules/).
+Also, be aware that the preceding configuration only works when the `proxy_pass` value for `location /` is a literal string.
+If you want to use a variable here, you must instead use [a rewrite rule](https://www.nginx.com/blog/creating-nginx-rewrite-rules/).
+For more information, refer to [the GitHub issue #18299](https://github.com/grafana/grafana/issues/18299).
 
-To configure NGINX to serve Grafana under a _sub path_, update the `location` block:
+To configure nginx to serve Grafana under a _sub path_, update the `location` block:
 
 ```nginx
-# this is required to proxy Grafana Live WebSocket connections.
+# This is required to proxy Grafana Live WebSocket connections.
 map $http_upgrade $connection_upgrade {
   default upgrade;
   '' close;
@@ -114,7 +102,7 @@ server {
   index index.html index.htm;
 
   location /grafana/ {
-    proxy_set_header Host $http_host;
+    proxy_set_header Host $host;
     proxy_pass http://grafana;
   }
 
@@ -123,23 +111,25 @@ server {
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection $connection_upgrade;
-    proxy_set_header Host $http_host;
+    proxy_set_header Host $host;
     proxy_pass http://grafana;
   }
 }
 ```
 
-If your Grafana configuration does not set `serve_from_sub_path` to true then you need to add a rewrite rule to each location block:
+Add a rewrite rule to each location block:
 
 ```
  rewrite  ^/grafana/(.*)  /$1 break;
 ```
 
-{{% admonition type="note" %}}
-If Grafana is being served from behind a NGINX proxy with TLS termination enabled, then the `root_url` should be set accordingly. For example, if Grafana is being served from `https://example.com/grafana` then the `root_url` should be set to `https://example.com/grafana/` or `https://%(domain)s/grafana/` (and the corresponding `domain` should be set to `example.com`) in the `server` section of the Grafana configuration file. The `protocol` setting should be set to `http`, because the TLS handshake is being handled by NGINX.
-{{% /admonition %}}
+{{< admonition type="note" >}}
+If nginx is performing TLS termination, then you must set the `root_url` and `protocol` configuration accordingly.
+If you're serving Grafana from `https://example.com/grafana/` then the `root_url` is `https://example.com/grafana/` or `https://%(domain)s/grafana/` with the corresponding `domain` configuration value set to `example.com` in the `server` section of the Grafana configuration file.
+Set `protocol` to `http`.
+{{< /admonition >}}
 
-## Configure HAProxy
+### Configure HAProxy
 
 To configure HAProxy to serve Grafana under a _sub path_:
 
@@ -149,20 +139,22 @@ frontend http-in
   use_backend grafana_backend if { path /grafana } or { path_beg /grafana/ }
 
 backend grafana_backend
+  server grafana localhost:3000
   # Requires haproxy >= 1.6
   http-request set-path %[path,regsub(^/grafana/?,/)]
-
   # Works for haproxy < 1.6
   # reqrep ^([^\ ]*\ /)grafana[/]?(.*) \1\2
 
   server grafana localhost:3000
 ```
 
-## Configure IIS
+### Configure IIS
 
-> IIS requires that the URL Rewrite module is installed.
+{{< admonition type="note" >}}
+To use IIS, you must have the URL Rewrite module installed.
+{{< /admonition >}}
 
-To configure IIS to serve Grafana under a _sub path_, create an Inbound Rule for the parent website in IIS Manager with the following settings:
+To configure IIS to serve Grafana under a _sub path_, create an `Inbound Rule` for the parent website in **IIS Manager** with the following settings:
 
 - pattern: `grafana(/)?(.*)`
 - check the `Ignore case` checkbox
@@ -170,7 +162,7 @@ To configure IIS to serve Grafana under a _sub path_, create an Inbound Rule for
 - check the `Append query string` checkbox
 - check the `Stop processing of subsequent rules` checkbox
 
-This is the rewrite rule that is generated in the `web.config`:
+This is the rewrite rule that's generated in the `web.config`:
 
 ```xml
   <rewrite>
@@ -183,13 +175,13 @@ This is the rewrite rule that is generated in the `web.config`:
   </rewrite>
 ```
 
-See the [tutorial on IIS URL Rewrites](/tutorials/iis/) for more in-depth instructions.
+For more detailed instruction, refer to the [tutorial on IIS URL Rewrites](/tutorials/iis/).
 
-## Configure Traefik
+### Configure Traefik
 
-[Traefik](https://traefik.io/traefik/) Cloud Native Reverse Proxy / Load Balancer / Edge Router
+[Traefik](https://traefik.io/traefik/) Cloud Native application proxy.
 
-Using the docker provider the following labels will configure the router and service for a domain or subdomain routing.
+Using the Docker provider and the following labels configures the router and service for a domain or subdomain routing.
 
 ```yaml
 labels:
@@ -197,7 +189,7 @@ labels:
   traefik.http.services.grafana.loadbalancer.server.port: 3000
 ```
 
-To deploy on a _sub path_
+To deploy on a _sub path_:
 
 ```yaml
 labels:
@@ -233,6 +225,20 @@ http:
           - url: http://192.168.30.10:3000
 ```
 
-## Summary
+## Alternative for serving Grafana under a sub path
+
+{{< admonition type="note" >}}
+You only need this if you don't handle the sub path serving via your reverse proxy configuration.
+{{< /admonition >}}
 
-In this tutorial you learned how to run Grafana behind a reverse proxy.
+If you don't want or can't use the reverse proxy to handle serving Grafana from a _sub path_, you can set the configuration variable `server_from_sub_path` to `true`.
+
+1. Include the sub path at the end of the `root_url`.
+1. Set `serve_from_sub_path` to `true`:
+
+```bash
+[server]
+domain = example.com
+root_url = %(protocol)s://%(domain)s:%(http_port)s/grafana/
+serve_from_sub_path = true
+```
diff --git a/docs/sources/upgrade-guide/_index.md b/docs/sources/upgrade-guide/_index.md
index 7bd55a4f9bb1f..390c81e965c76 100644
--- a/docs/sources/upgrade-guide/_index.md
+++ b/docs/sources/upgrade-guide/_index.md
@@ -2,7 +2,7 @@
 aliases:
   - installation/upgrading/
   - setup-grafana/upgrade-grafana
-description: Guide for upgrading Grafana
+description: Upgrade Grafana
 keywords:
   - grafana
   - configuration
diff --git a/docs/sources/upgrade-guide/upgrade-v10.0/index.md b/docs/sources/upgrade-guide/upgrade-v10.0/index.md
index 71d2d8536e732..dd17de6d803d2 100644
--- a/docs/sources/upgrade-guide/upgrade-v10.0/index.md
+++ b/docs/sources/upgrade-guide/upgrade-v10.0/index.md
@@ -1,5 +1,5 @@
 ---
-description: Guide for upgrading to Grafana v10.0
+description: Upgrade to Grafana v10.0
 keywords:
   - grafana
   - configuration
diff --git a/docs/sources/upgrade-guide/upgrade-v10.1/index.md b/docs/sources/upgrade-guide/upgrade-v10.1/index.md
index 2f491ac82dbd3..3b1ecb3d17de8 100644
--- a/docs/sources/upgrade-guide/upgrade-v10.1/index.md
+++ b/docs/sources/upgrade-guide/upgrade-v10.1/index.md
@@ -1,5 +1,5 @@
 ---
-description: Guide for upgrading to Grafana v10.1
+description: Upgrade to Grafana v10.1
 keywords:
   - grafana
   - configuration
diff --git a/docs/sources/upgrade-guide/upgrade-v10.2/index.md b/docs/sources/upgrade-guide/upgrade-v10.2/index.md
index 17e706d64ef25..649c8cc58b542 100644
--- a/docs/sources/upgrade-guide/upgrade-v10.2/index.md
+++ b/docs/sources/upgrade-guide/upgrade-v10.2/index.md
@@ -1,5 +1,5 @@
 ---
-description: Guide for upgrading to Grafana v10.2
+description: Upgrade to Grafana v10.2
 keywords:
   - grafana
   - configuration
@@ -19,3 +19,5 @@ weight: 1500
 {{< docs/shared lookup="upgrade/upgrade-common-tasks.md" source="grafana" version="<GRAFANA VERSION>" >}}
 
 ## Technical notes
+
+- From Grafana v10.2 onwards, `/api/datasources/:id/` is removed and replaced with `/api/access-control/datasources/:uid`. For more information about the new API endpoints for the data source permission API, refer to the [documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/developers/http_api/datasource_permissions/).
diff --git a/docs/sources/upgrade-guide/upgrade-v10.3/index.md b/docs/sources/upgrade-guide/upgrade-v10.3/index.md
new file mode 100644
index 0000000000000..b3db718bb144c
--- /dev/null
+++ b/docs/sources/upgrade-guide/upgrade-v10.3/index.md
@@ -0,0 +1,23 @@
+---
+description: Guide for upgrading to Grafana v10.3
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - upgrade
+  - '10.3'
+  - '10.2.3'
+title: Upgrade to Grafana v10.3
+menuTitle: Upgrade to v10.3
+weight: 1400
+---
+
+# Upgrade to Grafana v10.3
+
+{{< docs/shared lookup="upgrade/intro.md" source="grafana" version="<GRAFANA VERSION>" >}}
+
+{{< docs/shared lookup="back-up/back-up-grafana.md" source="grafana" version="<GRAFANA VERSION>" leveloffset="+1" >}}
+
+{{< docs/shared lookup="upgrade/upgrade-common-tasks.md" source="grafana" version="<GRAFANA VERSION>" >}}
+
+## Technical notes
diff --git a/docs/sources/upgrade-guide/upgrade-v10.4/index.md b/docs/sources/upgrade-guide/upgrade-v10.4/index.md
new file mode 100644
index 0000000000000..678641ec4cc42
--- /dev/null
+++ b/docs/sources/upgrade-guide/upgrade-v10.4/index.md
@@ -0,0 +1,37 @@
+---
+description: Guide for upgrading to Grafana v10.4
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - upgrade
+  - '10.4'
+title: Upgrade to Grafana v10.4
+menuTitle: Upgrade to v10.4
+weight: 1300
+---
+
+# Upgrade to Grafana v10.4
+
+{{< docs/shared lookup="upgrade/intro.md" source="grafana" version="<GRAFANA VERSION>" >}}
+
+{{< docs/shared lookup="back-up/back-up-grafana.md" source="grafana" version="<GRAFANA VERSION>" leveloffset="+1" >}}
+
+{{< docs/shared lookup="upgrade/upgrade-common-tasks.md" source="grafana" version="<GRAFANA VERSION>" >}}
+
+## Technical notes
+
+### Legacy alerting -> Grafana Alerting dry-run on start
+
+If you haven't already upgraded to Grafana Alerting from legacy Alerting, Grafana will initiate a dry-run of the upgrade every time the instance starts. This is in preparation for the removal of legacy Alerting in Grafana v11. The dry-run logs the results of the upgrade attempt and identifies any issues requiring attention before you can successfully execute the upgrade. No changes are made during the dry-run.
+
+You can disable this behavior using the feature flag `alertingUpgradeDryrunOnStart`:
+
+```toml
+[feature_toggles]
+alertingUpgradeDryrunOnStart=false
+```
+
+{{% admonition type="note" %}}
+We strongly encourage you to review the [upgrade guide](https://grafana.com/docs/grafana/v10.4/alerting/set-up/migrating-alerts/) and perform the necessary upgrade steps prior to v11.
+{{% /admonition %}}
diff --git a/docs/sources/upgrade-guide/upgrade-v11.0/index.md b/docs/sources/upgrade-guide/upgrade-v11.0/index.md
new file mode 100644
index 0000000000000..db6373cec1964
--- /dev/null
+++ b/docs/sources/upgrade-guide/upgrade-v11.0/index.md
@@ -0,0 +1,23 @@
+---
+description: Guide for upgrading to Grafana v11.0-preview
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - upgrade
+  - '11.0'
+  - '11.0-preview'
+title: Upgrade to Grafana v11.0-preview
+menuTitle: Upgrade to v11.0-preview
+weight: 1200
+---
+
+# Upgrade to Grafana v11.0-preview
+
+{{< docs/shared lookup="upgrade/intro.md" source="grafana" version="<GRAFANA VERSION>" >}}
+
+{{< docs/shared lookup="back-up/back-up-grafana.md" source="grafana" version="<GRAFANA VERSION>" leveloffset="+1" >}}
+
+{{< docs/shared lookup="upgrade/upgrade-common-tasks.md" source="grafana" version="<GRAFANA VERSION>" >}}
+
+## Technical notes
diff --git a/docs/sources/upgrade-guide/upgrade-v8.0/index.md b/docs/sources/upgrade-guide/upgrade-v8.0/index.md
index 06df8fad6fe7e..7c3c6b5328eee 100644
--- a/docs/sources/upgrade-guide/upgrade-v8.0/index.md
+++ b/docs/sources/upgrade-guide/upgrade-v8.0/index.md
@@ -1,5 +1,5 @@
 ---
-description: Guide for upgrading to Grafana v8.0
+description: Upgrade to Grafana v8.0
 keywords:
   - grafana
   - configuration
diff --git a/docs/sources/upgrade-guide/upgrade-v8.1/index.md b/docs/sources/upgrade-guide/upgrade-v8.1/index.md
index 2224f3afd687e..7ca4bf2b2804f 100644
--- a/docs/sources/upgrade-guide/upgrade-v8.1/index.md
+++ b/docs/sources/upgrade-guide/upgrade-v8.1/index.md
@@ -1,5 +1,5 @@
 ---
-description: Guide for upgrading to Grafana v8.1
+description: Upgrade to Grafana v8.1
 keywords:
   - grafana
   - configuration
diff --git a/docs/sources/upgrade-guide/upgrade-v8.2/index.md b/docs/sources/upgrade-guide/upgrade-v8.2/index.md
index 853dadb80214f..ba753ffb466f6 100644
--- a/docs/sources/upgrade-guide/upgrade-v8.2/index.md
+++ b/docs/sources/upgrade-guide/upgrade-v8.2/index.md
@@ -1,5 +1,5 @@
 ---
-description: Guide for upgrading to Grafana v8.2
+description: Upgrade to Grafana v8.2
 keywords:
   - grafana
   - configuration
diff --git a/docs/sources/upgrade-guide/upgrade-v8.3/index.md b/docs/sources/upgrade-guide/upgrade-v8.3/index.md
index 8c3c750585295..be39a1eb3dc73 100644
--- a/docs/sources/upgrade-guide/upgrade-v8.3/index.md
+++ b/docs/sources/upgrade-guide/upgrade-v8.3/index.md
@@ -1,5 +1,5 @@
 ---
-description: Guide for upgrading to Grafana v8.3
+description: Upgrade to Grafana v8.3
 keywords:
   - grafana
   - configuration
diff --git a/docs/sources/upgrade-guide/upgrade-v8.4/index.md b/docs/sources/upgrade-guide/upgrade-v8.4/index.md
index fc80102f0a021..221876b62384a 100644
--- a/docs/sources/upgrade-guide/upgrade-v8.4/index.md
+++ b/docs/sources/upgrade-guide/upgrade-v8.4/index.md
@@ -1,5 +1,5 @@
 ---
-description: Guide for upgrading to Grafana v8.4
+description: Upgrade to Grafana v8.4
 keywords:
   - grafana
   - configuration
diff --git a/docs/sources/upgrade-guide/upgrade-v8.5/index.md b/docs/sources/upgrade-guide/upgrade-v8.5/index.md
index 03ddd4ba4d6b3..2c0a3d63cb408 100644
--- a/docs/sources/upgrade-guide/upgrade-v8.5/index.md
+++ b/docs/sources/upgrade-guide/upgrade-v8.5/index.md
@@ -1,5 +1,5 @@
 ---
-description: Guide for upgrading to Grafana v8.5
+description: Upgrade to Grafana v8.5
 keywords:
   - grafana
   - configuration
diff --git a/docs/sources/upgrade-guide/upgrade-v9.0/index.md b/docs/sources/upgrade-guide/upgrade-v9.0/index.md
index 19706c2707f27..70f5a0c79748b 100644
--- a/docs/sources/upgrade-guide/upgrade-v9.0/index.md
+++ b/docs/sources/upgrade-guide/upgrade-v9.0/index.md
@@ -1,5 +1,5 @@
 ---
-description: Guide for upgrading to Grafana v9.0
+description: Upgrade to Grafana v9.0
 keywords:
   - grafana
   - configuration
diff --git a/docs/sources/upgrade-guide/upgrade-v9.1/index.md b/docs/sources/upgrade-guide/upgrade-v9.1/index.md
index a7a80023c9c72..f8e14a391efe0 100644
--- a/docs/sources/upgrade-guide/upgrade-v9.1/index.md
+++ b/docs/sources/upgrade-guide/upgrade-v9.1/index.md
@@ -1,5 +1,5 @@
 ---
-description: Guide for upgrading to Grafana v9.1
+description: Upgrade to Grafana v9.1
 keywords:
   - grafana
   - configuration
diff --git a/docs/sources/upgrade-guide/upgrade-v9.2/index.md b/docs/sources/upgrade-guide/upgrade-v9.2/index.md
index 584560f303b73..0215b888fa1ff 100644
--- a/docs/sources/upgrade-guide/upgrade-v9.2/index.md
+++ b/docs/sources/upgrade-guide/upgrade-v9.2/index.md
@@ -1,5 +1,5 @@
 ---
-description: Guide for upgrading to Grafana v9.2
+description: Upgrade to Grafana v9.2
 keywords:
   - grafana
   - configuration
diff --git a/docs/sources/upgrade-guide/upgrade-v9.3/index.md b/docs/sources/upgrade-guide/upgrade-v9.3/index.md
index c14f6f8814d2c..ce39dd7eec088 100644
--- a/docs/sources/upgrade-guide/upgrade-v9.3/index.md
+++ b/docs/sources/upgrade-guide/upgrade-v9.3/index.md
@@ -1,5 +1,5 @@
 ---
-description: Guide for upgrading to Grafana v9.3
+description: Upgrade to Grafana v9.3
 keywords:
   - grafana
   - configuration
diff --git a/docs/sources/upgrade-guide/upgrade-v9.4/index.md b/docs/sources/upgrade-guide/upgrade-v9.4/index.md
index 8ab283d1659f4..61df0bb6528c8 100644
--- a/docs/sources/upgrade-guide/upgrade-v9.4/index.md
+++ b/docs/sources/upgrade-guide/upgrade-v9.4/index.md
@@ -1,5 +1,5 @@
 ---
-description: Guide for upgrading to Grafana v9.4
+description: Upgrade to Grafana v9.4
 keywords:
   - grafana
   - configuration
diff --git a/docs/sources/upgrade-guide/upgrade-v9.5/index.md b/docs/sources/upgrade-guide/upgrade-v9.5/index.md
index 6da451e64c2f0..7203aa87541a1 100644
--- a/docs/sources/upgrade-guide/upgrade-v9.5/index.md
+++ b/docs/sources/upgrade-guide/upgrade-v9.5/index.md
@@ -1,5 +1,5 @@
 ---
-description: Guide for upgrading to Grafana v9.5
+description: Upgrade to Grafana v9.5
 keywords:
   - grafana
   - configuration
diff --git a/docs/sources/whatsnew/_index.md b/docs/sources/whatsnew/_index.md
index a386419bdf829..db2bdc6294c0e 100644
--- a/docs/sources/whatsnew/_index.md
+++ b/docs/sources/whatsnew/_index.md
@@ -53,7 +53,7 @@ aliases:
   - whats-new-in-v6-5/
   - whats-new-in-v6-6/
   - whats-new-in-v6-7/
-description: Learn about new and changed features in Grafana.
+description: Learn about new and updated features in Grafana.
 labels:
   products:
     - cloud
@@ -74,8 +74,14 @@ For Grafana versions prior to v9.2, additional information might also be availab
 
 For a complete list of every change, with links to pull requests and related issues when available, see the [Changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md).
 
+# Grafana 11
+
+- [What's new in 11.0-preview](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/whatsnew/whats-new-in-v11-0/)
+
 ## Grafana 10
 
+- [What's new in 10.4](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/whatsnew/whats-new-in-v10-4/)
+- [What's new in 10.3](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/whatsnew/whats-new-in-v10-3/)
 - [What's new in 10.2](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/whatsnew/whats-new-in-v10-2/)
 - [What's new in 10.1]({{< relref "whats-new-in-v10-1/" >}})
 - [What's new in 10.0]({{< relref "whats-new-in-v10-0/" >}})
diff --git a/docs/sources/whatsnew/whats-new-in-v10-0.md b/docs/sources/whatsnew/whats-new-in-v10-0.md
index 8584a07b34269..df622eac4025e 100644
--- a/docs/sources/whatsnew/whats-new-in-v10-0.md
+++ b/docs/sources/whatsnew/whats-new-in-v10-0.md
@@ -1,5 +1,5 @@
 ---
-description: Feature and improvement highlights for Grafana v10.0
+description: Learn about new and updated features in Grafana v10.0
 keywords:
   - grafana
   - new
@@ -19,7 +19,7 @@ weight: -37
 
 Welcome to Grafana 10.0! Read on to learn about changes to search and navigation, dashboards and visualizations, and security and authentication.
 
-For even more detail about all the changes in this release, refer to the [changelog](https://github.com/grafana/grafana/blob/master/CHANGELOG.md). For the specific steps we recommend when you upgrade to v10.0, check out our [Upgrade Guide]({{< relref "../upgrade-guide/upgrade-v10.0/index.md" >}}).
+For even more detail about all the changes in this release, refer to the [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md). For the specific steps we recommend when you upgrade to v10.0, check out our [Upgrade Guide]({{< relref "../upgrade-guide/upgrade-v10.0/index.md" >}}).
 
 <!-- Template below
 ## Feature
@@ -418,3 +418,9 @@ Some data sources, like MySQL databases, Prometheus instances or Elasticsearch c
 To query these data sources from Grafana Cloud, you've had to open your private network to a range of IP addresses, a non-starter for many IT Security teams. The challenge is, how do you connect to your private data from Grafana Cloud, without exposing your network?
 
 The answer is Private Data Source Connect (PDC), available now in public preview in Grafana Cloud Pro and Advanced. PDC uses SOCKS over SSH to establish a secure connection between a lightweight PDC agent you deploy on your network and your Grafana Cloud stack. PDC keeps the network connection totally under your control. It’s easy to set up and manage, uses industry-standard security protocols, and works across public cloud vendors and a wide variety of secure networks. Learn more in our [Private data source connect documentation](/docs/grafana-cloud/data-configuration/configure-private-datasource-connect).
+
+## Plugins
+
+### App plugins can start using react-router v6
+
+We've added support for using `react-router` v6 in app plugins. However, we still support the use of `react-router` v5 for plugins that need to support a minimum Grafana version earlier than v10. For more information, refer to our [react-router migration guide](https://grafana.com/developers/plugin-tools/migration-guides/update-from-grafana-versions/migrate-9_x-to-10_x#update-to-react-router-v6).
diff --git a/docs/sources/whatsnew/whats-new-in-v10-1.md b/docs/sources/whatsnew/whats-new-in-v10-1.md
index 001f8a402ef0e..5e007c5250641 100644
--- a/docs/sources/whatsnew/whats-new-in-v10-1.md
+++ b/docs/sources/whatsnew/whats-new-in-v10-1.md
@@ -1,5 +1,5 @@
 ---
-description: Feature and improvement highlights for Grafana v10.1
+description: Learn about new and updated features in Grafana v10.1
 keywords:
   - grafana
   - new
@@ -19,7 +19,7 @@ weight: -38
 
 Welcome to Grafana 10.1! Read on to learn about changes to dashboards and visualizations, data sources, security and authentication and more. We're particularly excited about a set of improvements to visualizing logs from [Loki](https://grafana.com/products/cloud/logs/) and other logging data sources in Explore mode, and our Flame graph panel, used to visualize profiling data from [Pyroscope](https://grafana.com/blog/2023/03/15/pyroscope-grafana-phlare-join-for-oss-continuous-profiling/?pg=oss-phlare&plcmt=top-promo-banner) and other continuous profiling data sources.
 
-For even more detail about all the changes in this release, refer to the [changelog](https://github.com/grafana/grafana/blob/master/CHANGELOG.md). For the specific steps we recommend when you upgrade to v10.1, check out our [Upgrade Guide]({{< relref "../upgrade-guide/upgrade-v10.1/index.md" >}}).
+For even more detail about all the changes in this release, refer to the [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md). For the specific steps we recommend when you upgrade to v10.1, check out our [Upgrade Guide]({{< relref "../upgrade-guide/upgrade-v10.1/index.md" >}}).
 
 <!-- Template below
 ## Feature
diff --git a/docs/sources/whatsnew/whats-new-in-v10-2.md b/docs/sources/whatsnew/whats-new-in-v10-2.md
index 1da21a0fa2e3d..02d1ddbbdf7ee 100644
--- a/docs/sources/whatsnew/whats-new-in-v10-2.md
+++ b/docs/sources/whatsnew/whats-new-in-v10-2.md
@@ -1,5 +1,5 @@
 ---
-description: Feature and improvement highlights for Grafana v10.2
+description: Learn about new and updated features in Grafana v10.2
 keywords:
   - grafana
   - new
@@ -19,7 +19,7 @@ weight: -39
 
 Welcome to Grafana 10.2! Read on to learn about changes to dashboards and visualizations, data sources, security and authentication, and more. We’re particularly excited about the addition of generative AI features for dashboards, a new kind of basic role, and improvements to visualization transformations.
 
-For even more detail about all the changes in this release, refer to the [changelog](https://github.com/grafana/grafana/blob/master/CHANGELOG.md). For the specific steps we recommend when you upgrade to v10.2, check out our [Upgrade Guide](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/upgrade-guide/upgrade-v10.2/).
+For even more detail about all the changes in this release, refer to the [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md). For the specific steps we recommend when you upgrade to v10.2, check out our [Upgrade Guide](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/upgrade-guide/upgrade-v10.2/).
 
 <!-- Template below
 
@@ -48,7 +48,7 @@ _Generally available in all editions of Grafana_
 
 Public dashboards allow you to share your visualizations and insights with a broader audience without the requirement of a login. You can effortlessly use our current sharing model and create a public dashboard URL to share with anyone using the generated public URL link. To learn more, refer to the [Public dashboards documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/dashboard-public/), as well as the following video demo:
 
-{{< video-embed src="/media/docs/grafana/dashboards/public-dashboards-demo.mp4" >}}
+{{< youtube id="XHwwRCdxHMg?rel=0" >}}
 
 ## Navigate lengthy, mixed data in Explore with Content Outline
 
@@ -58,7 +58,7 @@ _Generally available in all editions of Grafana_
 
 Introducing Content Outline in Grafana Explore. It's easy to lose track of your place when you're running complex mixed queries or switching between logs and traces. Content outline is our first step towards seamless navigation from log lines to traces and back to queries, ensuring quicker searches while preserving context. Experience efficient, contextual investigations with this update in Grafana Explore. To learn more, refer to the [Content outline documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/explore/#content-outline), as well as the following video demo.
 
-{{< video-embed src="/media/docs/grafana/explore/content-outline-demo.mp4" >}}
+{{< youtube id="cE7J1-S4ZCQ?rel=0" >}}
 
 ## Correlations
 
@@ -100,11 +100,11 @@ You can now use generative AI to assist you in your Grafana dashboards. So far g
 - **Generate panel and dashboard titles and descriptions** - You can now generate a title and description for your panel or dashboard based on the data you've added to it. This is useful when you want to quickly visualize your data and don't want to spend time coming up with a title or description.
 - **Generate dashboard save changes summary** - You can now generate a summary of the changes you've made to a dashboard when you save it. This is great for effortlessly tracking the history of a dashboard.
 
-To enable these features, you must first enable the `dashgpt` [feature toggle](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/feature-toggles/#experimental-feature-toggles). Then install and configure Grafana's LLM app plugin. For more information, refer to the [Grafana LLM app plugin documentation](https://grafana.com/docs/grafana-cloud/alerting-and-irm/machine-learning/llm-plugin/).
+To enable these features, you must first enable the `dashgpt` [feature toggle](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/feature-toggles/#experimental-feature-toggles). Then install and configure Grafana's LLM app plugin. For more information, refer to the [Grafana LLM app plugin documentation](https://grafana.com/docs/grafana-cloud/alerting-and-irm/machine-learning/configure/llm-plugin/).
 
 When enabled, look for the **✨ Auto generate** option next to the **Title** and **Description** fields in your panels and dashboards, or when you press the **Save** button.
 
-{{< figure src="/media/docs/grafana/dashboards/auto-generate-description-10-2.gif" max-width="750px" caption="Auto-generate a panel description using AI" >}}
+{{< youtube id="tgBussaYJww?rel=0" >}}
 
 ### Find your dashboard faster with the new Dashboards browse screen
 
@@ -118,7 +118,7 @@ To make using folders easier and more consistent, there's no longer a special **
 
 To try it out, go to the **Dashboards** section of your Grafana instance.
 
-{{< video-embed src="/media/docs/grafana/2023-09-11-New-Browse-Dashboards-Enablement-Video.mp4" >}}
+{{< youtube id="-S_Jjuwj74k?rel=0" >}}
 
 ### Create interactive buttons in canvas visualizations
 
@@ -129,9 +129,9 @@ _Available in public preview in all editions of Grafana_
 
 You can now add buttons to your canvas visualizations. Buttons can be configured to call an API endpoint. This pushes Grafana's capabilities to new heights, allowing you to create interactive dashboards that can be used to control external systems.
 
-To learn more, refer to our [Canvas button element documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/canvas/#button).
+To learn more, refer to our [Canvas button element documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/canvas/#button), as well as the following video demo.
 
-{{< video-embed src="/media/docs/grafana/2023-20-10-Canvas-Button-Element-Enablement-Video.mp4" max-width="750px" caption="Canvas button element demo" >}}
+{{< youtube id="T6fg1TpfBUg?rel=0" >}}
 
 ### Zoom in on the y-axis of the time series and candlestick visualizations
 
@@ -209,9 +209,9 @@ We've added an **Aggregate By** option to the [TraceQL query editor](https://gra
 
 This feature is disabled by default. To enable it, use the `metricsSummary` [experimental feature toggle](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/feature-toggles/#experimental-feature-toggles).
 
-For more information, refer to the [documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/datasources/tempo/query-editor/traceql-search/#optional-use-aggregate-by).
+For more information, refer to the [documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/datasources/tempo/query-editor/traceql-search/#optional-use-aggregate-by), as well as the following video demo.
 
-{{< figure src="/media/docs/tempo/metrics-summary-10-2.png" caption="Aggregate by" >}}
+{{< youtube id="g97CjKOZqT4?rel=0" >}}
 
 #### Query traces more easily with the Improved TraceQL editor
 
@@ -231,7 +231,7 @@ _Generally available in all editions of Grafana_
 
 The [TraceQL query editor](https://grafana.com/docs/tempo/<TEMPO_VERSION>/traceql/#traceql-query-editor) has been improved to facilitate the grouping of multiple spans per trace in TraceQL queries. For example, when `by(resource.service.name)` is added to your TraceQL query, it will group the spans in each trace by `resource.service.name`.
 
-{{< figure src="/media/docs/tempo/multiple-spansets-per-trace-10-2.png" max-width="750px" caption="Multiple spansets per trace" >}}
+{{< youtube id="fraepWra00Y?rel=0" >}}
 
 #### Create query-type template variables for the Tempo data source
 
@@ -277,6 +277,24 @@ To learn more, refer to [Datadog data source settings](/docs/plugins/grafana-dat
 
 {{< video-embed src="/media/docs/datadog/datadog-rate-limit.mp4" >}}
 
+### Microsoft SQL Server: Support for Azure Authentication (Service principal/MSI)
+
+<!-- Jev Forsberg, Oscar Kilhed -->
+
+_Generally available in all editions of Grafana_
+
+We've added support for Azure Authentication (Service principal/MSI) on our MS SQL plugin to authenticate and allow querying of content stored in SQL Managed Instance databases.
+
+Enable this feature by setting the `managed_identity_enabled` property to `true` under the `Azure` heading in your configuration file (/conf/<your_config_file>.ini). Then take the following steps in your Microsoft SQL Server data source configuration UI:
+
+1. Under **Authentication**, select **Azure AD Authentication** in the drop-down to reveal the **Azure Authentication Settings** section.
+2. In this section, select either **Managed Identity** or **App Registration**.
+3. Enter the credentials accordingly.
+
+{{< figure src="/media/docs/grafana/data-sources/screenshot-managed-identity-mssql-ui-cropped.png" caption="Azure MSI Authentication" max-width="550px" >}}
+
+Learn more in the [Microsoft SQL Server documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/datasources/mssql/).
+
 ## Transformations
 
 As our work on improving the user experience of transforming data continues, we've also been adding new capabilities to transformations.
@@ -287,9 +305,11 @@ As our work on improving the user experience of transforming data continues, we'
 
 _Experimental in all editions of Grafana_
 
-Previously, the only transformation that supported [dashboard variables](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/variables/) was the **Add field from calculation** transformation. We've now extended the support for variables to the **Filter by value**, **Create heatmap**, **Histogram**, **Sort by**, **Limit**, **Filter by name**, and **Join by field** transformations. We've also made it easier to find the correct dashboard variable by displaying available variables in the fields that support them, either in the drop-down or as a suggestion when you type **$** or press Ctrl + Space:
+Previously, the only transformation that supported [dashboard variables](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/variables/) was the **Add field from calculation** transformation. We've now extended the support for variables to the **Filter by value**, **Create heatmap**, **Histogram**, **Sort by**, **Limit**, **Filter by name**, and **Join by field** transformations.
 
-{{< figure src="/media/docs/grafana/transformations/completion.png" caption="Input with dashboard variable suggestions" >}}
+We've also made it easier to find the correct dashboard variable by displaying available variables in the fields that support them, either in the drop-down or as a suggestion when you type **$** or press Ctrl + Space.
+
+{{< youtube id="WE0tt69ApO4?rel=0" >}}
 
 ### New modes for the Add field from calculation transformation
 
@@ -307,7 +327,7 @@ The **Add field from calculation** transformation has been updated.
 - **Floor (floor)** - Returns the largest integer less than or equal to a given expression.
 - **Ceiling (ceil)** - Returns the smallest integer greater than or equal to a given expression.
 
-{{< figure src="/media/docs/grafana/transformations/unary-operation.png" >}}
+{{< figure src="/media/docs/grafana/transformations/unary-operation.png" alt="Unary operation options" >}}
 
 Also, **Row index** can now show the index as a percentage.
 
@@ -359,7 +379,9 @@ _Generally available in all editions of Grafana_
 
 Use the Grafana Alerting - Grafana OnCall integration to effortlessly connect alerts generated by Grafana Alerting with Grafana OnCall. From there, you can route them according to defined escalation chains and schedules.
 
-To learn more, refer to the [Grafana OnCall integration for Alerting documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/manage-contact-points/configure-oncall/).
+To learn more, refer to the [Grafana OnCall integration for Alerting documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/manage-contact-points/integrations/configure-oncall/), as well as the following video demo.
+
+{{< youtube id="abRn5I61hxs?rel=0" >}}
 
 ### Export alerting resources to Terraform
 
diff --git a/docs/sources/whatsnew/whats-new-in-v10-3.md b/docs/sources/whatsnew/whats-new-in-v10-3.md
new file mode 100644
index 0000000000000..329f1e5ffedb4
--- /dev/null
+++ b/docs/sources/whatsnew/whats-new-in-v10-3.md
@@ -0,0 +1,410 @@
+---
+description: Feature and improvement highlights for Grafana v10.3
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '10.3'
+  - '10.2.3'
+  - release notes
+labels:
+products:
+  - cloud
+  - enterprise
+  - oss
+title: What's new in Grafana v10.3
+weight: -40
+---
+
+# What’s new in Grafana v10.3
+
+Welcome to Grafana 10.3! Read on to learn about changes to navigation, visualizations and transformations, alerting, profiling, and logs.
+
+We've also included here features released in Grafana 10.2.3, as well as breaking changes from that release. Features that were included in the 10.2.3 release are marked with an asterisk.
+
+For even more detail about all the changes in this release, refer to the [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md). For the specific steps we recommend when you upgrade to v10.3, check out our [Upgrade Guide](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/upgrade-guide/upgrade-v10.3/).
+
+## Breaking changes
+
+For Grafana v10.3, we've also provided a list of [breaking changes](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/breaking-changes/breaking-changes-v10-3) to help you upgrade with greater confidence. For information about these along with guidance on how to proceed, refer to [Breaking changes in Grafana v10.3](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/breaking-changes/breaking-changes-v10-3/).
+
+<!-- Template below
+
+## Feature
+<!-- Name of contributor -->
+<!--_[Generally available | Available in private/public preview | Experimental] in Grafana [Open Source, Enterprise, all editions of Grafana, some combination of self-managed and Cloud]_
+Description. Include an overview of the feature and problem it solves, and where to learn more (like a link to the docs).
+{{% admonition type="note" %}}
+Use full URLs for links. When linking to versioned docs, replace the version with the version interpolation placeholder (for example, <GRAFANA_VERSION>, <TEMPO_VERSION>, <MIMIR_VERSION>) so the system can determine the correct set of docs to point to. For example, "https://grafana.com/docs/grafana/latest/administration/" becomes "https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/".
+{{% /admonition %}}
+
+<!--Add an image, GIF or video  as below-->
+
+<!--{{< figure src="/media/docs/grafana/dashboards/WidgetVizSplit.png" max-width="750px" caption="DESCRIPTIVE CAPTION" >}}
+
+<!--Learn how to upload images here: https://grafana.com/docs/writers-toolkit/write/image-guidelines/#where-to-store-media-assets-->
+<!---->
+
+## Navigation updates\*
+
+<!--Laura Benz-->
+
+_Available in public preview in Grafana Open Source and Enterprise_
+
+The improved navigation menu gives you a better overview by showing all levels of navigation items in a more compact design. We also implemented a better dock and improved scrolling behavior. Furthermore, we improved the structure of the nav menu and added several new items.
+
+{{< youtube id="IhpghtVykLc" >}}
+
+## Table data in PDF reports
+
+<!--Agnès Toulet-->
+
+_Available in public preview in Grafana Enterprise and Grafana Cloud_
+
+We've improved the reporting experience with options to make all of your table data accessible in PDFs. Previously, if your dashboard included large table visualizations, you couldn't see all of the table data in your PDF report. Unlike in Grafana, you couldn't scroll in the PDF table visualization or click on the page numbers. With this new feature, you now have the option to see all the data directly in your PDF without losing your dashboard layout.
+
+We've added two format options to the report creation form:
+
+- **Include table data as PDF appendix** - Adds an appendix to your dashboard PDF.
+- **Attach a separate PDF of table data** - Generates a separate PDF file for your table panel data.
+
+To try out this feature, enable the `pdfTables` [feature toggle](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/feature-toggles/) or contact Grafana Support to have it enabled in on your Grafana Cloud stack.
+
+{{< youtube id="1fzQQI8O838" >}}
+
+## Dashboards and visualizations
+
+### Moving average and trend lines using transformations
+
+<!--Oscar Kilhed-->
+
+_Available in public preview in all editions of Grafana_
+
+#### Moving average\*
+
+Sometimes your data is too noisy to quickly grasp what's going on. A common way to address this issue is to calculate the moving mean, or moving average, to filter out some of that noise. Luckily, many data sources already support calculating the moving mean, but when the support is lacking or you're not well versed in the query language, until now, you were stuck with the noise.
+
+{{< figure src="/media/docs/grafana/transformations/noisy-sensor-data.png" caption="Noisy data can hide the general trend of your data." alt="Graph displaying noisy sensor data" max-width="300px" >}}
+
+By selecting the **Window functions** mode and using **Mean** as the calculation for the **Add field from calculation** transformation, Grafana adds a field with the moving mean for your selected field.
+
+{{< figure src="/media/docs/grafana/transformations/noisy-sensor-data-moving-average.png" caption="Calculating the moving mean of your data will make it easier to grasp what's going on." alt="Graph displaying the moving mean of noisy data" >}}
+
+The **Window functions** mode also supports moving variance and moving standard deviation calculations if you need to analyze the volatility of your metric.
+
+[Documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data/transform-data/#add-field-from-calculation)
+
+#### Trend lines\*
+
+We're also adding some basic statistical analysis features as a way to help you visualize trends in your data. The **Regression analysis** transformation will fit a mathematical function to your data and display it as predicted data points in a separate data frame.
+
+{{< figure src="/media/docs/grafana/transformations/trendlines.png" caption="Linear and polynomial regression trendlines" alt="Graph with trendlines" >}}
+
+The transformation currently supports linear regression and polynomial regression to the fifth-degree.
+
+### Canvas visualization supports pan and zoom
+
+<!--Nathan Marrs-->
+
+_Available in public preview in all editions of Grafana_
+
+Canvas visualizations now support panning and zooming. This allows you to both create and navigate more complex designs.
+
+To enable this feature, you must first enable the `canvasPanelPanZoom` [feature toggle](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/feature-toggles/).
+
+{{< youtube id="CF-HFkcytRA" >}}
+
+[Documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/canvas/)
+
+### Improved tooltips in visualizations\*
+
+<!--Nathan Marrs-->
+
+_Available in public preview in all editions of Grafana_
+
+We've introduced enhanced tooltips as part of our standardization initiative, unifying the tooltip architecture for a consistent user experience across panels. Packed with features like color indicators, time uniformity, and improved support for long labels, these tooltips go beyond a cosmetic redesign, bringing fundamental changes to elevate your data visualization experience. Stay tuned for more updates!
+
+To try out the new tooltips, enable the `newVizTooltips` [feature toggle](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/feature-toggles/). Enhanced tooltips have been implemented for the following visualizations:
+
+- Time series
+- Trend
+- Heatmap
+- Status history
+- Candlestick
+- State timeline
+- XY Chart
+- and more coming soon!
+
+{{% admonition type="note" %}}
+As this is an ongoing project, the dashboard shared cursor and annotations features are not yet fully supported.
+{{% /admonition %}}
+
+{{< youtube id="0Rp6FYfHu6Q" >}}
+
+### Plot enum values in your time series and state timeline visualizations\*
+
+<!--Nathan Marrs-->
+
+_Generally available in all editions of Grafana_
+
+You can now plot enum values in your time series and state timeline visualizations. This feature is useful when you want to visualize the state of a system, such as the status of a service or the health of a device. For example, you can use this feature to visualize the status of a service as `ON`, `STANDBY`, or `OFF`. To display enum values you can [use the convert field transform](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data/transform-data/#convert-field-type).
+
+{{< youtube id="FG0hBFfgpps" >}}
+
+### View percent change in stat visualizations
+
+<!--Nathan Marrs-->
+
+_Generally available in all editions of Grafana_
+
+You can now view percent change in stat visualizations. This makes it easier to understand your data by showing how metrics are changing over time.
+
+{{< youtube id="mB9FU0myZo8" >}}
+
+[Documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/stat/#show-percent-change)
+
+#### Apply data transformations to annotations
+
+<!--Nathan Marrs-->
+
+_Generally available in all editions of Grafana_
+
+You can now apply data transformations to annotation data. For example, you can now configure how exemplar data is displayed in tooltips.
+
+{{< video-embed src="/media/docs/grafana/screen-recording-10-3-data-transformations-annotation-support.mp4" caption="Configure how exemplar data appears in tooltip" >}}
+
+### New Transformations UI experience and documentation upgrades
+
+<!--Jev Forsberg-->
+
+_Generally available in all editions of Grafana_
+
+We've revamped the Transformations user interface to make it cleaner, more user-friendly, and overall better for visualizing, selecting, and comprehending transformation options for your data.
+
+#### Improved UI\*
+
+In the past, transformations were applied through a dropdown menu, indicated solely by text names like Merge, Sort, JoinByLabels, etc. Now, we've introduced a much more user-friendly interface. A convenient drawer allows seamless access to all transformation options, each accompanied by visual/graphical representations and a brief description. These enhancements are designed to enhance the user's comprehension of their data transformation choices.
+
+{{< figure src="/media/docs/grafana/transformations/transformations_ui_drawer_selector.png" caption="The new Transformation UI drawer" alt="Transformation UI drawer" >}}
+
+#### In-App documentation
+
+We've also streamlined the user experience by integrating documentation directly into the core Grafana application. Gone are the days of navigating to a separate browser page for Transformation documentation. Now, users can conveniently access documentation within the app interface, providing a more seamless and efficient way to understand and utilize various features. This enhancement aims to save time and enhance user convenience, ensuring that valuable information is readily available at their fingertips.
+
+{{< figure src="/media/docs/grafana/transformations/transformations_internal_documentation.png" caption="Transformation documentation is now internally available inside the Grafana app itself." alt="Transformation documentation internally available" >}}
+
+### Copy and paste time range
+
+<!--Haris Rozajac-->
+
+_Generally available in all editions of Grafana_
+
+Copying and pasting time range in the time range picker is now available. For example, you can copy a time range in **Explore** and paste it into **Dashboards** and vice versa. You can also copy and paste a time range using the new keyboard shortcuts `t+c` and `t+v`, respectively.
+
+## Profiles
+
+### Trace to Profiles\*
+
+<!--Joey Tawadrous-->
+
+_Experimental in all editions of Grafana_
+
+Using Trace to profiles, you can use Grafana’s ability to correlate different signals by adding the functionality to link between traces and profiles.
+
+**Trace to profiles** lets you link your Grafana Pyroscope data source to tracing data. When configured, this connection lets you run queries from a trace span into the profile data.
+
+There are two ways to configure the trace to profiles feature:
+
+- Use a simplified configuration with default query, or
+- Configure a custom query where you can use a template language to interpolate variables from the trace or span.
+
+{{< figure src="/static/img/docs/tempo/profiles/tempo-trace-to-profile.png" caption="Trace to profiles screenshot" alt="Trace to profiles screenshot" >}}
+
+To try out **Trace to profiles**, enable the 'traceToProfiles' feature toggle.
+
+If you would also like to try out the **Embedded Flame Graph** feature, please enable the 'tracesEmbeddedFlameGraph' feature toggle.
+
+Note: in order to determine that there is a profile for a given span and render the 'Profiles for this span' button or the embedded flame graph in the span details, the 'pyroscope.profile.id' key-value pair must exist in your span tags.
+
+{{< youtube id="AG8VzfFMLxo" >}}
+
+[Documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/datasources/tempo/configure-tempo-data-source/#trace-to-profiles)
+
+### FlameGraph: Collapsing similar items in the graph\*
+
+<!--Andrej Ocenas-->
+
+_Experimental in all editions of Grafana_
+
+Sometimes profile stacks contain lots of levels with similar repeating items, for example long stacks of framework code that usually isn't of interest but takes up a lot of visual real estate. With this feature, instead of rendering all of the similar items we render only one and allow to expand those collapsed items on demand.
+
+To try it out, enable the ‘traceToProfiles’ feature toggle. To enable it in your Grafana Cloud stack, contact Grafana Support.
+
+{{< youtube id="Y1c32Cf5nSE" >}}
+
+## Alerting
+
+### Alerting insights\*
+
+<!-- George Robinson -->
+
+_Generally available in all editions of Grafana_
+
+Use Alerting insights to monitor your alerting data, discover key trends about your organization’s alert management performance, and find patterns in why things go wrong.
+
+### Export alerting resources to Terraform
+
+<!-- Yuri Tseretyan-->
+
+_Generally available in all editions of Grafana_
+
+Export your alerting resources, such as alert rules, contact points, and notification policies as Terraform resources. A new “Modify export” mode for alert rules enables you to edit provisioned alert rules and export a modified version.
+
+### Contact points list view redesign
+
+<!-- Brenda Muir -->
+
+_Generally available in all editions of Grafana_
+
+The Contact points list view has been redesigned and split into two tabs: Contact Points and Notification Templates, making it easier to view all contact point information at a glance. You can now search for name and type of contact points and integrations, view how many notification policies each contact point is being used for, and navigate directly to the linked notification policies.
+
+{{< youtube id="_eOhSmbYK8Q" >}}
+
+### Create alerts from panels\*
+
+<!-- Brenda Muir -->
+
+_Generally available in all editions of Grafana_
+
+Create alerts from dashboard panels. You can reuse the panel queries and create alerts based on them.
+
+### Support for adding responders to Opsgenie alerting contact point\*
+
+<!--Ryan Kehoe-->
+
+_Generally available in all editions of Grafana_
+
+The Opsgenie contact point has been extended to allow users to optionally fill out responder information for their integration. Responders tell Opsgenie who an alert should notify according to their escalation policies and routing rules.
+
+### Recovery thresholds for alerts
+
+<!--Ryan Kehoe-->
+
+_Generally available in all editions of Grafana_
+
+To reduce the noise of flapping alerts, you can set a recovery threshold different to the alert threshold.
+
+Flapping alerts occur when a metric hovers around the alert threshold condition and may lead to frequent state changes, resulting in too many notifications being generated.
+
+## Logs
+
+### Logs Table UI
+
+<!--Galen Kistler-->
+
+_Available in public preview in all editions of Grafana_
+
+Table view was created to help facilitate ease of use in a point and click UI, as opposed to datasource specific query language formatting options, like loki's line_format.
+
+Tables can be configured and shared with team members via explore URLs or by adding the table to a dashboard panel.
+
+{{< youtube id="OAZeqqNpEjc" >}}
+
+## Data sources
+
+### Data source Admin permission\*
+
+<!--Ieva Vasiljeva-->
+
+_Generally available in Grafana Enterprise and Grafana Cloud_
+
+In addition to `Query` and `Edit` access, you can now grant users, teams, or basic roles `Admin` access to data sources. Users with `Admin` access to a data source can grant and revoke permissions to the data source, as well as to manage query caching settings for the data source. Users are automatically granted `Admin` access to data sources that they create.
+
+### Redshift and Athena: Async query caching
+
+<!--Isabella Siu-->
+
+_Generally available in Grafana Enterprise, Grafana Cloud Advanced and Cloud Pro_
+
+Introducing query caching for async queries in the Athena and Redshift data source plugins. We previously introduced async queries for the Athena and Redshift plugins, and this feature adds support for caching those queries. To use this, you must have query caching enabled for the Athena or Redshift data source you wish to cache. This feature was previously available behind a feature toggle and is now generally available and enabled by default.
+
+{{% admonition type="note" %}}
+
+The `useCachingService` feature toggle must also be enabled to use this feature.
+
+{{% /admonition %}}
+
+### Loki data source improvements: "or" filter syntax, filter by label types, derived fields by labels
+
+<!--Sven Grossmann-->
+<!--enablement videos to come?-->
+
+_Generally available in all editions of Grafana_
+
+Introducing several improvements to the Loki data source.
+
+{{< youtube id="ievPSzmCrAk" >}}
+
+#### Line filter "or" syntax\*
+
+Loki's line filter syntax is great to find specific substrings of your log lines. If users want to find multiple different substrings it was cumbersome to use the regex `=~` operator. With this change it is possible to chain multiple strings with the existing filter operators.
+
+Example:
+
+```
+{app="foo"} |= "foo" or "bar" != "baz" or "qux"
+```
+
+#### Filter based on label type\*
+
+Grafana users can use the action buttons in the log details to filter for specific labels. Those would be always added as a LabelFilter expression regardless of the type of the label. Now, filtered labels will be added either to the stream selector if the label is an indexed label, or as a LabelFilter expression if the label is a parsed label or part of structured metadata.
+
+#### Derived fields based on labels\*
+
+Derived fields or data links are a concept to add correlations based on your log lines. Previously it was only possible to add derived fields based on a regular expression of your log line and doing it based on labels was not possible. With this change derived fields can be added either based on a regex of a log line or based on a label, parsed label or structured metadata.
+
+The following example would add the derived field `traceID regex` based on a regular expression and another `app label` field based on the `app` label.
+
+{{< figure src="/media/docs/grafana/2024-01-05_loki-derived-fields.png" alt="Derived fields added based on a regular expression and an app label">}}
+
+### InfluxDB native SQL support
+
+<!--Ismail Simsek-->
+
+_Generally available in all editions of Grafana_
+
+InfluxDB introduced [a new version, 3.0](https://www.influxdata.com/blog/introducing-influxdb-3-0/), in April. With this new version, InfluxDB has put [Flux in maintenance mode](https://www.influxdata.com/blog/the-plan-for-influxdb-3-0-open-source/#heading4). But with the new version we have a new querying language, [Native SQL](https://www.influxdata.com/products/sql/). With v10.3.0, Grafana has built-in support for SQL query language in InfluxDB.
+
+All you need to do is set up your InfluxDB Cloud Account and create your InfluxDB data source on Grafana with the query language "SQL" selected.
+
+{{< youtube id="jGclGsv5PBA" >}}
+
+## Authentication and authorization
+
+### Grafana Anonymous Access\*
+
+<!--Eric Leijonmarck-->
+
+_Generally available in Grafana Open Source and Enterprise_
+
+We've identified a need for users who enable anonymous authentication to monitor the anonymous devices connected to their Grafana instance. This feature is part of our ongoing efforts to enhance control and transparency regarding anonymous usage.
+
+Anonymous access now allows users, including those in open-source and enterprise self-managed environments, to view and monitor their anonymous access. They can also set a device limit, configuring a specific number of anonymous devices to connect to their instance.
+
+Once this limit is reached, any new devices attempting to connect will be denied access until existing devices disconnect.
+
+The anonymous devices feature improves the management and monitoring of anonymous access within your Grafana instance.
+
+**Anonymous Device:**
+
+When anonymous access has been enabled, any device which accesses Grafana in the last 30 days (without logging in) is considered an active anonymous device. Users can now view anonymous devices on the users page, anonymous usage statistics, including the count of devices and users over this period.
+
+**Grafana UI:**
+
+- Navigate to Administration -> Users to access the anonymous devices tab.
+
+- A new statistic has been added to the Usage & Stats page, displaying active anonymous devices from the last 30 days.
+
+{{< youtube id="B72X3_9e-ds" >}}
+
+[Documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-security/configure-authentication/grafana/)
diff --git a/docs/sources/whatsnew/whats-new-in-v10-4.md b/docs/sources/whatsnew/whats-new-in-v10-4.md
new file mode 100644
index 0000000000000..2b8f9f4a2e682
--- /dev/null
+++ b/docs/sources/whatsnew/whats-new-in-v10-4.md
@@ -0,0 +1,282 @@
+---
+description: Feature and improvement highlights for Grafana v10.4
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '10.4'
+  - release notes
+labels:
+products:
+  - cloud
+  - enterprise
+  - oss
+title: What's new in Grafana v10.4
+weight: -41
+---
+
+# What’s new in Grafana v10.4
+
+Welcome to Grafana 10.4! This minor release contains some notable improvements in its own right, as well as early previews of functionality we intend to turn on by default in Grafana v11. Read on to learn about a quicker way to set up alert notifications, an all-new UI for configuring single sign-on, and improvements to our Canvas, Geomap, and Table panels.
+
+For even more detail about all the changes in this release, refer to the [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md). For the specific steps we recommend when you upgrade to v10.4, check out our [Upgrade Guide](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/upgrade-guide/upgrade-v10.4/).
+
+<!-- Template below
+
+## Feature
+<!-- Name of contributor -->
+<!--_[Generally available | Available in private/public preview | Experimental] in Grafana [Open Source, Enterprise, all editions of Grafana, some combination of self-managed and Cloud]_
+Description. Include an overview of the feature and problem it solves, and where to learn more (like a link to the docs).
+{{% admonition type="note" %}}
+Use full URLs for links. When linking to versioned docs, replace the version with the version interpolation placeholder (for example, <GRAFANA_VERSION>, <TEMPO_VERSION>, <MIMIR_VERSION>) so the system can determine the correct set of docs to point to. For example, "https://grafana.com/docs/grafana/latest/administration/" becomes "https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/".
+{{% /admonition %}}
+
+<!--Add an image, GIF or video  as below-->
+
+<!--{{< figure src="/media/docs/grafana/dashboards/WidgetVizSplit.png" max-width="750px" caption="DESCRIPTIVE CAPTION" >}}
+
+<!--Learn how to upload images here: https://grafana.com/docs/writers-toolkit/write/image-guidelines/#where-to-store-media-assets-->
+<!---->
+
+## Dashboards and visualizations
+
+### AngularJS plugin warnings in dashboards
+
+<!-- #grafana-deprecate-angularjs-->
+
+_Generally available in all editions of Grafana_
+
+AngularJS support in Grafana was deprecated in v9 and will be turned off by default in Grafana v11. When this happens, any plugin which depended on AngularJS will not load, and dashboard panels will be unable to show data.
+
+To help you understand where you may be impacted, Grafana now displays a warning banner in any dashboard with a dependency on an AngularJS plugin. Additionally, warning icons are present in any panel where the panel plugin or underlying data source plugin has an AngularJS dependency.
+
+This complements the existing warnings already present on the **Plugins** page under the administration menu.
+
+In addition, you can use our [detect-angular-dashboards](https://github.com/grafana/detect-angular-dashboards) open source tool, which can be run against any Grafana instance to generate a report listing all dashboards that have a dependency on an AngularJS plugin, as well as which plugins are in use. This tool also supports the detection of [private plugins](https://grafana.com/legal/plugins/) that are dependent on AngularJS, however this particular feature requires Grafana v10.1.0 or higher.
+
+Use the aforementioned tooling and warnings to plan migrations to React based [visualizations](https://grafana.com/docs/grafana/latest/panels-visualizations/) and [data sources](https://grafana.com/docs/grafana/latest/datasources/) included in Grafana or from the [Grafana plugins catalog](https://grafana.com/grafana/plugins/).
+
+To learn more, refer to the [Angular support deprecation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/developers/angular_deprecation/), which includes [recommended alternative plugins](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/developers/angular_deprecation/angular-plugins/).
+
+{{< youtube id="XlEVs6g8dC8" >}}
+
+[Documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/developers/angular_deprecation/)
+
+### Data visualization quality of life improvements
+
+<!-- Nathan Marrs -->
+
+_Generally available in all editions of Grafana_
+
+We’ve made a number of small improvements to the data visualization experience in Grafana.
+
+#### Geomap geojson layer now supports styling
+
+You can now visualize geojson styles such as polygons, point color/size, and line strings. To learn more, [refer to the documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/geomap/#geojson-layer).
+
+![Geomap marker symbol alignment](/media/docs/grafana/screenshot-grafana-10-4-geomap-geojson-styling-support.png)
+
+#### Canvas elements now support snapping and aligning
+
+You can precisely place elements in a canvas with ease as elements now snap into place and align with one another.
+
+{{< video-embed src="/media/docs/grafana/screen-recording-10-4-canvas-element-snapping.mp4" caption="Canvas element snapping and alignment" >}}
+
+#### View data links inline in table visualizations
+
+You can now view your data links inline to help you keep your tables visually streamlined.
+
+![Table inline datalink support](/media/docs/grafana/gif-grafana-10-4-table-inline-datalink.gif)
+
+### Create subtables in table visualizations with Group to nested tables
+
+<!-- Nathan Marrs -->
+
+_Available in public preview in all editions of Grafana_
+
+You can now create subtables out of your data using the new **Group to nested tables** transformation. To use this feature, enable the `groupToNestedTableTransformation` [feature toggle](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/feature-toggles/#preview-feature-toggles).
+
+{{< video-embed src="/media/docs/grafana/screen-recording-10-4-table-group-to-nested-table-transformation.mp4" caption="Group to nested tables transformation" >}}
+
+### Set library panel permissions with RBAC
+
+<!-- #grafana-dashboards -->
+
+_Generally available in Grafana Enterprise and Grafana Cloud_
+
+We've added the option to manage library panel permissions through role-based access control (RBAC). With this feature, you can choose who can create, edit, and read library panels. RBAC provides a standardized way of granting, changing, and revoking access when it comes to viewing and modifying Grafana resources, such as dashboards, reports, and administrative settings.
+
+[Documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/manage-library-panels/)
+
+### Tooltip improvements
+
+<!--Adela Almasan-->
+
+_Available in public preview in all editions of Grafana_
+
+We’ve made a number of small improvements to the way tooltips work in Grafana. To try out the new tooltips, enable the `newVizTooltips` [feature toggle](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/feature-toggles/).
+
+**Copy on click support**
+
+You can now copy the content from within a tooltip by clicking on the text.
+
+![Tooltip](/media/docs/grafana/gif-grafana-10-4-tooltip–copy.gif)
+
+**Scrollable content**
+
+You can now scroll the content of a tooltip, which allows you to view long lists. This is currently supported in the time series, candlestick, and trend visualizations. We'll add more improvements to the scrolling functionality in a future version.
+
+![Tooltip](/media/docs/grafana/gif-grafana-10-4-tooltip-content-scroll.gif)
+
+**Added tooltip options for candlestick visualization**
+
+The default tooltip options are now also visible in candlestick visualizations.
+
+**Hover proximity option in time series**
+
+We've added a tooltip hover proximity limit option (in pixels), which makes it possible to reduce the number of hovered-over data points under the cursor when two datasets are not aligned in time.
+
+![Time Series hover proximity](/media/docs/grafana/gif-grafana-10-4-hover-proximity.gif)
+
+## Return to previous
+
+<!-- #grafana-frontend-platform-->
+
+_Available in public preview in all editions of Grafana_
+
+When you're browsing Grafana - for example, exploring the dashboard and metrics related to an alert - it's easy to end up far from where you started and hard get back to where you came from. The ‘Return to previous’ button is an easy way to go back to the previous context, like the alert rule that kicked off your exploration. This first release works for Alerts, and we plan to expand to other apps and features in Grafana in future releases to make it easier to navigate around.
+
+Return to Previous is rolling out across Grafana Cloud now. To try Return to Previous in self-managed Grafana, turn on the `returnToPrevious` [feature toggle](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/feature-toggles/) in Grafana v10.4 or newer.
+
+{{< youtube id="-Y3qPfD2wrA" >}}
+
+{{< admonition type="note" >}}
+The term **context** refers to applications in Grafana like Incident and OnCall, as well as core features like Explore and Dashboards.
+
+To notice a change in your context, look at Grafana's breadcrumbs. If you go from _Home > **Dashboards**_ to _Home > **Explore**_, you've changed context. If you go from _Home > **Dashboards** > Playlist > Edit playlist_ to _Home > **Dashboards** > Reporting > Settings_, you are in the same context.
+{{< /admonition >}}
+
+## Alerting
+
+### Simplified Alert Notification Routing
+
+<!-- #alerting -->
+
+_Generally available in all editions of Grafana_
+
+This feature simplifies your options for configuring where your notifications are sent when an alert rule fires. Choose an existing contact point directly from within the alert rule creation form without the need to label match notification policies.  You can also set optional muting, grouping, and timing settings directly in the alert rule.
+
+Simplified routing inherits the alert rule RBAC, increasing control over notification routing while preventing accidental notification policy updates, ensuring critical notifications make it to their intended contact point destination.
+
+To try out Simplified Alert Notification Routing enable the `alertingSimplifiedRouting` feature toggle.
+
+{{< youtube id="uBBQ-_pWSNs" >}}
+
+### Grafana Alerting upgrade with rule preview
+
+<!-- #alerting -->
+
+_Generally available in all editions of Grafana_
+
+Users looking to migrate to the new Grafana Alerting product can do so with confidence with the Grafana Alerting migration preview tool. The migration preview tool allows users to view, edit, and delete migrated rules prior cutting over, with the option to roll back to Legacy Alerting.
+
+[Documentation](https://grafana.com/docs/grafana/v10.4/alerting/set-up/migrating-alerts/#upgrade-with-preview-recommended)
+
+### Rule evaluation spread over the entire evaluation interval
+
+<!-- #alerting -->
+
+_Generally available in all editions of Grafana_
+
+Grafana Alerting previously evaluated rules at the start of the evaluation interval. This created a sudden spike of resource utilization, impacting data sources. Rule evaluation is now spread over the entire interval for smoother performance utilization of data sources.
+
+### UTF-8 Support for Prometheus and Mimir Alertmanagers
+
+<!-- #alerting -->
+
+_Generally available in all editions of Grafana_
+
+Grafana can now be used to manage both Prometheus and Mimir Alertmanagers with UTF-8 configurations. For more information, please see the
+[release notes for Alertmanager 0.27.0](https://github.com/prometheus/alertmanager/releases).
+
+## Authentication and authorization
+
+### SSO Settings UI and Terraform resource for configuring OAuth providers
+
+<!-- #proj-grafana-sso-config, #identity-access or Mihaly Gyongyosi (@Misi) -->
+
+_Available in public preview in all editions of Grafana_
+
+Configuring OAuth providers was a bit cumbersome in Grafana: Grafana Cloud users had to reach out to Grafana Support, self-hosted users had to manually edit the configuration file, set up environment variables, and then they had to restart Grafana. On Cloud, the Advanced Auth page is there to configure some of the providers, but configuring Generic OAuth hasn’t been available until now and there was no way to manage the settings through the Grafana UI, nor was there a way to manage the settings through Terraform or the Grafana API.
+
+Our goal is to make setting up SSO for your Grafana instance simple and fast.
+
+To get there, we are introducing easier self-serve configuration options for OAuth in Grafana. All of the currently supported OAuth providers are now available for configuration through the Grafana UI, Terraform and via the API. From the UI, you can also now manage all of the settings for the Generic OAuth provider.
+
+We are working on adding complete support for configuring all other supported OAuth providers as well, such as GitHub, GitLab, Google, Microsoft Azure AD and Okta. You can already manage some of these settings via the new self-serve configuration options, and we’re working on adding more at the moment.
+
+![Screenshot of the Authentication provider list page](/media/docs/grafana-cloud/screenshot-sso-settings-ui-public-prev-v10.4.png)
+
+{{< youtube id="xXW2eRTbjDY" >}}
+
+[Documentation](https://grafana.com/docs/grafana/next/setup-grafana/configure-security/configure-authentication/)
+
+## Data sources
+
+{{< admonition type="note" >}}
+The following data sources are released separately from Grafana itself. They are included here for extra visibility.
+{{< /admonition >}}
+
+### PagerDuty enterprise data source for Grafana
+
+<!-- #enterprise-datasources -->
+
+_Generally available in Grafana Enterprise and Grafana Cloud_
+
+PagerDuty enterprise data source plugin for Grafana allows you to query incidents data or visualize incidents using annotations.
+
+{{< admonition type="note" >}}
+Plugin is currently in a preview phase.
+{{< /admonition >}}
+
+You can find more information and how to configure the plugin in the [documentation](https://grafana.com/docs/plugins/grafana-pagerduty-datasource/latest/).
+
+Screenshots:
+
+{{< figure src="/media/docs/plugins/PagerDuty-incidents-annotation.png" caption="PagerDuty data source annotation editor" alt="PagerDuty data source annotation editor" >}}
+
+{{< figure src="/media/docs/plugins/PagerDuty-incidents-real-life-example.png" caption="Incidents annotations from PagerDuty data source on a dashboard panel" alt="Incidents annotations from PagerDuty data source on a dashboard panel" >}}
+
+{{< youtube id="dCklm2DaVqQ" >}}
+
+### SurrealDB Data Source
+
+<!-- #grafana-partner-datasources, @adamyeats-->
+
+_Experimental in all editions of Grafana_
+
+A SurrealDB data source has been [added to the Plugin Catalog](https://grafana.com/grafana/plugins/grafana-surrealdb-datasource/), enabling the integration of [SurrealDB](https://surrealdb.com/), a real-time, multi-model database, with Grafana's visualization capabilities. This datasource allows users to directly query and visualize data from SurrealDB within Grafana, using SurrealDB's query language.
+
+The SurrealDB data source launches with just the basics today. You can write queries in SurrealQL using the built-in query editor, although many Grafana features like macros are not supported for now.
+
+You can find more information and how to configure the plugin [on Github](https://github.com/grafana/surrealdb-datasource).
+
+{{< figure src="/media/images/dashboards/surrealdb-dashboard-example.png" alt="Grafana dashboard using SurrealDB data source" >}}
+
+[Documentation](https://grafana.com/grafana/plugins/grafana-surrealdb-datasource/)
+
+## Table Visualization for Logs
+
+<!-- #observability-logs -->
+
+_Generally available in all editions of Grafana_
+
+The table visualization for logs, announced in public preview for Grafana 10.3, is generally available in Cloud (all editions) and with Grafana 10.4.
+
+New to the table visualization with 10.4:
+
+- the ability to sort columns
+- data type autodetection of fields
+- autodetection and clean formatting of json fields
+
+Try it out today!
diff --git a/docs/sources/whatsnew/whats-new-in-v11-0.md b/docs/sources/whatsnew/whats-new-in-v11-0.md
new file mode 100644
index 0000000000000..18707bd3784ca
--- /dev/null
+++ b/docs/sources/whatsnew/whats-new-in-v11-0.md
@@ -0,0 +1,399 @@
+---
+description: Feature and improvement highlights for Grafana v11.0-preview
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '11.0'
+  - '11.0-preview'
+  - release notes
+labels:
+products:
+  - cloud
+  - enterprise
+  - oss
+title: What's new in Grafana v11.0-preview
+weight: -42
+---
+
+<!-- vale GoogleWe = NO -->
+<!-- vale We = NO -->
+
+# What’s new in Grafana v11.0-preview
+
+Welcome to Grafana 11.0-preview! This release contains some major improvements: most notably, the ability to explore your Prometheus metrics and Loki logs without writing any PromQL or LogQL, using Explore Metrics and Explore Logs. The dashboard experience is better than ever with edit mode for dashboards, AI-generated dashboard names and descriptions, and general availability for subfolders. You can also take advantage of improvements to the canvas and table visualizations, new transformations, a revamp of the Alert Rule page, and more.
+
+Why "preview?" The Grafana 11.0 stable release is planned for this May. This is an early release to coincide with [Grafanacon 2024](https://grafana.com/about/events/grafanacon/2024/), so that you can try the new functionality early. To understand the differences between preview and GA releases, review the [release life cycle](https://grafana.com/docs/release-life-cycle/).
+
+For even more detail about all the changes in this release, refer to the [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md). For the specific steps we recommend when you upgrade to v11.0-preview, check out our [Upgrade Guide](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/upgrade-guide/upgrade-v11.0/).
+
+## Breaking changes
+
+For Grafana v11.0-preview, we've also provided a list of [breaking changes](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/breaking-changes/breaking-changes-v11-0) to help you upgrade with greater confidence. For information about these along with guidance on how to proceed, refer to [Breaking changes in Grafana v11.0-preview](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/breaking-changes/breaking-changes-v11-0/).
+
+<!-- Template below
+
+## Feature
+<!-- Name of contributor -->
+<!--_[Generally available | Available in private/public preview | Experimental] in Grafana [Open Source, Enterprise, all editions of Grafana, some combination of self-managed and Cloud]_
+Description. Include an overview of the feature and problem it solves, and where to learn more (like a link to the docs).
+{{% admonition type="note" %}}
+Use full URLs for links. When linking to versioned docs, replace the version with the version interpolation placeholder (for example, <GRAFANA_VERSION>, <TEMPO_VERSION>, <MIMIR_VERSION>) so the system can determine the correct set of docs to point to. For example, "https://grafana.com/docs/grafana/latest/administration/" becomes "https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/".
+{{% /admonition %}}
+
+<!--Add an image, GIF or video  as below-->
+
+<!--{{< figure src="/media/docs/grafana/dashboards/WidgetVizSplit.png" max-width="750px" caption="DESCRIPTIVE CAPTION" >}}
+
+<!--Learn how to upload images here: https://grafana.com/docs/writers-toolkit/write/image-guidelines/#where-to-store-media-assets-->
+<!---->
+
+## Explore Metrics and Logs
+
+### Explore Metrics
+
+<!-- #proj-datatrails-dev, PM: Jay Goodson, Engineering: Darren Janeczek, André Pereira, Design: Catherine Gui -->
+
+_Public preview in all editions of Grafana_
+
+Explore Metrics is a query-less experience for browsing Prometheus-compatible metrics. Search or filter to find a metric. Quickly find related metrics - all in just a few clicks. No PromQL to be found anywhere! With Explore Metrics, you can:
+
+- easily slice and dice metrics based on their labels, so you can see anomalies right away
+- See the right visualization for your metric based on its type (e.g. gauge vs. counter) without writing it yourself
+- surface other metrics relevant to the current metric
+- “explore in a drawer” - expand a drawer over a dashboard with more content, so you don’t lose your place
+- view a history of user steps when navigating through metrics and their filters
+- easily pivot to other related telemetry - IE, logs or traces
+
+… all without writing any queries!
+
+To learn more, refer to the Explore Metrics [documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/explore/explore-metrics/) as well as the following video demo:
+
+{{< youtube id="JbaPufQs5LY" >}}
+
+### Explore Logs
+
+<!-- Slack: #proj-lokiapp-dev, PM: Steven Dungan, Engineering: Andrew Stucky, Cyril Tovena, Design: Joan Wortman -->
+
+_Experimental in Grafana Open Source and Enterprise_
+
+Explore Logs is a queryless experience for exploring Loki logs - no LogQL required! The primary interaction modes are point-and-click based on log volume, similar to Explore Metrics.
+
+Highlights:
+
+- View log volume and log line samples when you first land in Explore Logs (no more "blank screen!")
+- Explore additional labels and detected fields in a similar way, focusing on volume and distribution; add them to your "query" to refine your logs search without needing LogQL
+  – See common patterns in your log lines, to easily filter out noise or focus in on anomalies
+- For power users, an easy way to hop into the familiar Explore while preserving context
+
+Explore Logs is Open Source, and experimental - some papercuts are to be expected. Give it a try and let us know what you think!
+
+## Dashboards and visualizations
+
+### Scenes powered Dashboards
+
+<!-- #grafana-dashboards -->
+
+_Available in public preview in all editions of Grafana_
+
+For the past few months we've been working on a major update of our **Dashboards** architecture and migrated it to the Scenes library. This migration provides us with more stable, dynamic, and flexible dashboards as well as setting the foundation for what we envision the future of Grafana dashboards will be. Here are two of the improvements that are being introduced as part of this work.
+
+#### Edit mode
+
+It can be difficult to efficiently navigate through the visually cluttered options during the dashboard editing process. With the introduction of the edit mode, we aim to provide an easier way to discover and interact with the dashboard edit experience.
+
+#### Fixed positioning of template variables and time picker
+
+We moved the time picker into the dashboard canvas and now, together with template variables, it will stick to the top as you scroll through your dashboard. This has historically been a very [requested feature](https://github.com/grafana/grafana/issues/11166) that we're very happy to be able to finally roll out!
+
+#### Known limitations
+
+- The [variable dependency graph](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/variables/inspect-variable/) is not yet available.
+- It's no longer possible to switch a regular panel to a library panel from the edit view.
+
+If you want to learn more, in detail, about all the improvements we've made, don't miss our blog post.
+
+{{< youtube id="kcKwBhvrsHc" >}}
+
+### Scenes for viewers
+
+<!-- #grafana-dashboards, Dominik Prokop, Natalia Bernarte -->
+
+_Generally available in all editions of Grafana_
+
+Dashboards, when accessed by users with the Viewer role, are now using the Scenes library. Those users shouldn't see any difference in the dashboards apart from two small changes to the user interface (UI): the variables UI has slightly changed and the time picker is now part of the dashboard container.
+
+Dashboards aren't affected for users in other roles.
+
+This is the first step towards a more robust and dynamic dashboarding system that we'll be releasing in the upcoming months.
+
+### Subfolders
+
+<!-- #wg-nested-folders -->
+
+_Generally available in all editions of Grafana_
+
+Subfolders are here at last!
+
+Some of you want subfolders in order to keep things tidier. It’s easy for dashboard sprawl to get out of control, and setting up folders in a nested hierarchy helps with that.
+
+Others of you want subfolders in order to create nested layers of permissions, where teams have access at different levels that reflect their organization’s hierarchy.
+
+We are thrilled to bring this long-awaited functionality to our community of users! Subfolders are currently being rolled out to Grafana Cloud instances and will be generally available to all Grafana users for the Grafana 11 release.
+
+**Just a quick note**: the upgrade to enable subfolders can cause some issues with alerts in certain cases. We think these cases are pretty rare, but just in case, you’ll want to check for this:
+
+If you've previously set up a folder that uses a forward slash in its name, and you have an alert rule in that folder, and the notification policy is set to match that folder's name, notifications will be sent to the default receiver instead of the configured receiver.
+
+To correct this, take the following steps:
+
+- Create a copy of the affected routes
+- Rewrite the matchers for the new copy. For example, if the original matcher was `grafanafolder=folder_with/in_title`, then the new route matcher will be `grafana_folder=folder_with/_in_title`
+- After rewriting the matchers, you can delete the old routes.
+
+If you use file provisioning, you can upgrade and update the routes at the same time.
+
+{{< youtube id="R9mehA0EssU" >}}
+
+### Use AI to generate titles and descriptions for panels and dashboards
+
+<!-- Ivan Ortega -->
+
+_Generally available in all editions of Grafana_
+
+You can now use generative AI to assist you in your Grafana dashboards. So far generative AI can help you generate **panel and dashboard titles and descriptions** - You can now generate a title and description for your panel or dashboard based on the data you've added to it. This is useful when you want to quickly visualize your data and don't want to spend time coming up with a title or description.
+
+Make sure to enable and configure Grafana's LLM app plugin. For more information, refer to the [Grafana LLM app plugin documentation](https://grafana.com/docs/grafana-cloud/alerting-and-irm/machine-learning/llm-plugin/).
+
+When enabled, look for the **✨ Auto generate** option next to the **Title** and **Description** fields in your panels and dashboards, or when you press the **Save** button.
+
+![Auto-generate a panel description using AI](/media/docs/grafana/dashboards/auto-generate-description-10-2.gif)
+
+{{< youtube id="s61WHREHuYE" >}}
+
+### Improvements to the canvas visualization
+
+<!-- #dataviz-squad -->
+
+_Generally available in all editions of Grafana_
+
+We've made a number of improvements to the canvas visualization.
+
+#### Enhanced flowcharting functionality
+
+With this release, we've updated the canvas visualization to include much-requested flowcharting features. These improvements are:
+
+- Addition of widely-used elements: cloud, parallelogram, and triangle.
+- Addition of midpoint controls so that the connectors no longer have to be straight lines.
+- Addition of more connector styles including dashed lines as well as corner radius and direction control.
+- Horizontal and vertical snapping for connectors.
+- Addition of rounded corner styling for elements.
+- Ability to rotate elements in the canvas.
+
+#### Universal data link support
+
+We've updated data links so that you can add them to almost all elements or element properties that are tied to data. Previously, you could only add data links to text elements or elements that used the `TextConfig` object. This update removes that limitation.
+
+{{< admonition type="note" >}}
+This update doesn't apply to the drone and button elements.
+{{< /admonition >}}
+
+{{< youtube id="0iO2gqv0XNA" >}}
+
+[Documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/canvas/)
+
+### Infinite panning for the canvas visualization
+
+<!-- Nathan Marrs, #grafana-dataviz -->
+
+_Available in public preview in all editions of Grafana_
+
+With the newly added **Infinite panning** editor option, you can now view and navigate very large canvases. This option is displayed when the **Pan and zoom** switch is enabled.
+
+To try out this feature, you must first enable the `canvasPanelPanZoom` feature toggle.
+
+[Documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/canvas/)
+
+### Colored table rows with conditional formatting
+
+<!-- #grafana-dataviz, Kyle Cunningham -->
+
+_Generally available in all editions of Grafana_
+
+Grafana 11 adds the ability to color full table rows using the **Colored background** cell type of the table visualization. When you configure fields in a table to use this cell type, an option to apply the color of the cell to the entire row becomes available.
+
+{{< figure src="/static/img/docs/tables/colored-rows.png" max-width="500px" alt="Colored row background" class="docs-image--no-shadow" >}}
+
+This feature is useful for a wide variety of use cases including mapping status fields to colors (for example, `info`, `debug`, `warning`) and allowing rows to be colored based on threshold values. This is one of the first steps in making formatting tables more seamless, and allows for quick scanning of data using the table visualization.
+
+To learn more, refer to the [documentation for the Colored background cell type](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/table/#color-background-gradient-or-solid).
+
+{{< youtube id="PLfADTtCnmg" >}}
+
+### Set threshold colors in the Config from query transformation
+
+<!--  #grafana-dataviz" -->
+
+_Generally available in all editions of Grafana_
+
+You now have the ability to customize specific colors for individual thresholds when using the **Config from query results** transformer. Previously, when you added multiple thresholds, they all defaulted to the same color, red. With this addition, you gain the flexibility to assign distinct colors to each threshold.
+
+This feature addresses a common pain point highlighted by users. With customizable threshold colors, you now have greater control over your data representation, fostering more insightful and impactful analyses across diverse datasets.
+
+### Substring matcher added to the Filter by value transformation
+
+<!-- #grafana-dataviz -->
+
+_Generally available in Grafana Cloud and Open Source_
+
+This update to the **Filter data by values** transformation simplifies data filtering by enabling partial string matching on field values thanks to two new matchers: **Contains substring** and **Does not contain substring**. With the substring matcher built into the **Filter data by values** transformation, you can efficiently filter large datasets, displaying relevant information with speed and precision. Whether you're searching for keywords, product names, or user IDs, this feature streamlines the process, saving time and effort while ensuring accurate data output.
+
+In the **Filter data by values** transformation, simply add a condition, choose a field, choose your matcher, and then input the string to match against.
+
+This update will be rolled out to customers over the next few weeks.
+
+{{< video-embed src="/media/docs/grafana/substring-matcher.mp4" >}}
+
+## Reporting
+
+### PDF export improvements
+
+<!-- #grafana-sharing -->
+
+_Available in public preview in Grafana Cloud and Enterprise_
+
+Introducing a major performance improvement for the PDF export feature.
+
+Are you tired of waiting for your PDF to be generated or your report to be sent? We're working on a major update of the dashboard-to-PDF feature to make it faster for large dashboards. The generation time will no longer be proportional to the number of panels in your dashboard. As an example, an SLO dashboard containing around 200 panels has gone from taking more than seven minutes to be generated to only eleven seconds.
+
+This update also fixes all [caveats](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/create-reports/#caveats) related to rendering a report with panels or rows set to repeat by a variable, like rendering repeating panels inside collapsed rows.
+
+To try out this update, enable the `newPDFRendering` [feature toggle](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/feature-toggles/).
+
+{{< youtube id="ypk1usnE7D8" >}}
+
+## Alerting
+
+### Keep Last State for Grafana Managed Alerting
+
+<!-- "#alerting" -->
+
+_Generally available in all editions of Grafana_
+
+(Re-)introducing "Keep Last State" to Grafana managed alert rules.
+
+You can now choose to keep the last evaluated state of an alert rule when that rule produces "No Data" or "Error" results. Simply choose the "Keep Last State" option for no data or error handling when editing a rule. Refer to the Alerting documentation on state and health of alert rules for more information.[](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/state-and-health/#state-and-health-of-alert-rules)
+
+### Alert detail view redesign
+
+<!-- Gilles deMey -->
+
+_Generally available in all editions of Grafana_
+
+The new alert rule detail view has a new look and feel with helpful metadata at the top. The namespace and group are shown in the breadcrumb navigation. This is interactive and can be used to filter rules by namespace or group. The rest of the alert detail content is split up into tabs:
+
+**Query and conditions**
+
+View the details of the query that is used for the alert rule, including the expressions and intermediate values for each step of the expression pipeline. A graph view is included for range queries and data sources that return time series-like data frames.
+
+**Instances**
+
+Explore each alert instance, its status, labels and various other metadata for multi-dimensional alert rules.
+
+**History**
+
+Explore the recorded history for an alert rule.
+
+**Details**
+
+Debug or audit using the alert rule metadata and view the alert rule annotations.
+
+![Image shows details of an alert rule](/media/docs/alerting/alert-detail-view.png)
+
+## Data sources
+
+### Azure Monitor: Current User authentication
+
+<!-- #grafana-partner-datasources, @Andreas -->
+
+_Experimental in all editions of Grafana_
+
+You can now configure the Azure Monitor data source to authenticate as the logged-in Grafana user when making query and resource requests if you also use Azure Entra to sign your users into Grafana.
+
+Current User authentication allows you to enforce Azure RBAC restrictions on your Grafana users by removing the need to provide broad service credentials. Once a data source is configured with Current User authentication a user will **only** have access to resources they can access directly in Azure.
+
+Additionally, data sources configured to use Current User authentication are less likely to be impacted by throttling issues due to the individual level of access.
+
+Current User authentication does not inherently support backend features such as alerting. To account for this, data sources configured with Current User authentication can optionally specify service credentials that will be utilized for backend features when no signed-in user is available.
+
+To get started with Current User authentication, refer to the [Azure Monitor data source documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/datasources/azure-monitor/#configure-current-user-authentication).
+
+{{< figure src="/media/docs/grafana/data-sources/screenshot-current-user.png" alt="Data source configured with Current User authentication" >}}
+
+### Removal of old Tempo Search and Loki Search in Tempo
+
+<!-- Joey Tawadrous -->
+
+_Generally available in all editions of Grafana_
+
+#### Removal of old Tempo Search tab
+
+In Grafana v10.1, we added a Tempo search editor powered by TraceQL (search tab). We also recommended using this new editor over the older non-TraceQL powered editor.
+
+The older non-TraceQL powered editor has been removed. Any existing queries using the older editor will be automatically migrated to the new TraceQL-powered editor.
+
+The new TraceQL-powered editor makes it much easier to build your query by way of static filters, better input/selection validation, copy query to the TraceQL tab, query preview, dedicated status filter, and the ability to run aggregate by (metrics summary) queries.
+
+Refer to [Query tracing data](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/datasources/tempo/query-editor/) to learn more.
+
+#### Removal of Loki Search tab in Tempo
+
+The Loki Search tab has been around since before we could natively query Tempo for traces.
+This search is used by a low number of users in comparison to the TraceQL-powered editor (Search tab) or the TraceQL tab itself.
+
+If you would like to see what logs are linked to a specific trace or service, you can use the [Trace to logs feature](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/datasources/tempo/configure-tempo-data-source/#trace-to-logs), which provides an easy way to create a custom link and set an appropriate time range if necessary.
+
+### MSSQL: Windows Active Directory (Kerberos) authentication
+
+<!--#grafana-partner-datasources, @adam -->
+
+_Generally available in Grafana Open Source and Enterprise_
+
+You can now use Windows Active Directory (or Kerberos) to authenticate to MSSQL servers from Grafana.
+
+There are four primary ways to authenticate from Grafana to a MSSQL instance with Windows Active Directory:
+
+1. Windows Active Directory username and password
+1. Specify the path to a valid [keytab file](https://web.mit.edu/kerberos/krb5-1.12/doc/basic/keytab_def.html).
+1. Specify the path to an up to date [credential cache](https://web.mit.edu/kerberos/krb5-1.12/doc/basic/ccache_def.html).
+1. Specify the path to a JSON document that holds information about several credential caches and the user and database for each one.
+
+To get started, refer to the [Getting Started documentation for MSSQL](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/getting-started/get-started-grafana-ms-sql-server/#windows-active-directory-kerberos).
+
+## Authentication and authorization
+
+### New strong password policy
+
+<!-- #iam-identity-dev -->
+
+_Available in public preview in Grafana Open Source and Enterprise_
+
+If you manage your users using Grafana's built-in basic authorization as an identity provider, consider enabling our new strong password policy feature.
+
+Starting with Grafana v11.0, you can enable an opinionated strong password policy feature. This configuration option validates all password updates to comply with our strong password policy.
+
+To learn more about Grafana's strong password policy, refer to the [documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-security/configure-authentication/grafana/#strong-password-policy).
+
+### Anonymous users are billed in Grafana Enterprise
+
+<!-- Daniel Ken Lee -->
+
+_Generally available in Grafana Enterprise_
+
+We are announcing a license change to the anonymous access feature in Grafana 11. As you may already be aware, anonymous access allows users access to Grafana without login credentials. Anonymous access was an early feature of Grafana to share dashboards; however, we recently introduced [Public Dashboards](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/dashboard-public/) which allows you to share dashboards in a more secure manner. We also noticed that anonymous access inadvertently resulted in user licensing issues. After careful consideration, we have decided to charge for the continued use of anonymous access starting in Grafana 11.
+
+**Affected Grafana versions**
+
+[Anonymous authentication](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-security/configure-authentication/grafana/#anonymous-authentication) is disabled by default in Grafana Cloud. This licensing change only affects Grafana Enterprise (self-managed) edition. Anonymous users will be charged as active users in Grafana Enterprise.
+
+[Documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-security/configure-authentication/grafana/#anonymous-devices)
diff --git a/docs/sources/whatsnew/whats-new-in-v7-0.md b/docs/sources/whatsnew/whats-new-in-v7-0.md
index cd2c08cbbe39c..eaf2dd2c16d20 100644
--- a/docs/sources/whatsnew/whats-new-in-v7-0.md
+++ b/docs/sources/whatsnew/whats-new-in-v7-0.md
@@ -3,7 +3,7 @@ _build:
   list: false
 aliases:
   - ../guides/whats-new-in-v7-0/
-description: Feature and improvement highlights for Grafana v7
+description: Learn about new and updated features in Grafana v7
 keywords:
   - grafana
   - new
@@ -21,7 +21,7 @@ weight: -27
 
 # What's new in Grafana v7.0
 
-This topic includes the release notes for Grafana v7.0. For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md).
+This topic includes the release notes for Grafana v7.0. For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/main/CHANGELOG.md).
 
 This major release of Grafana is the next step in our Observability story. It includes powerful new features for manipulating, transforming, and doing math on data. Grafana Enterprise has the first version of Usage analytics, which will help Grafana Admins better manage large, corporate Grafana ecosystems.
 
@@ -233,4 +233,4 @@ Okta gets its own provider which adds support for Team Sync. Read more about it
 
 ## Changelog
 
-Check out [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) for a complete list of new features, changes, and bug fixes.
+Check out [CHANGELOG.md](https://github.com/grafana/grafana/blob/main/CHANGELOG.md) for a complete list of new features, changes, and bug fixes.
diff --git a/docs/sources/whatsnew/whats-new-in-v7-1.md b/docs/sources/whatsnew/whats-new-in-v7-1.md
index bf270db555551..65e9b5f854428 100644
--- a/docs/sources/whatsnew/whats-new-in-v7-1.md
+++ b/docs/sources/whatsnew/whats-new-in-v7-1.md
@@ -3,7 +3,7 @@ _build:
   list: false
 aliases:
   - ../guides/whats-new-in-v7-1/
-description: Feature and improvement highlights for Grafana v7.1
+description: Learn about new and updated features in Grafana v7.1
 keywords:
   - grafana
   - new
@@ -21,7 +21,7 @@ weight: -28
 
 # What's new in Grafana v7.1
 
-This topic includes the release notes for the Grafana v7.1. For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md).
+This topic includes the release notes for the Grafana v7.1. For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/main/CHANGELOG.md).
 
 The main highlights are:
 
@@ -116,4 +116,4 @@ With Grafana Enterprise 7.1, you can generate reports on a [monthly schedule]({{
 
 ## Changelog
 
-Check out [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) for a complete list of new features, changes, and bug fixes.
+Check out [CHANGELOG.md](https://github.com/grafana/grafana/blob/main/CHANGELOG.md) for a complete list of new features, changes, and bug fixes.
diff --git a/docs/sources/whatsnew/whats-new-in-v7-2.md b/docs/sources/whatsnew/whats-new-in-v7-2.md
index 06182f95b6807..0020f4c71e1a9 100644
--- a/docs/sources/whatsnew/whats-new-in-v7-2.md
+++ b/docs/sources/whatsnew/whats-new-in-v7-2.md
@@ -3,7 +3,7 @@ _build:
   list: false
 aliases:
   - ../guides/whats-new-in-v7-2/
-description: Feature and improvement highlights for Grafana v7.2
+description: Learn about new and updated features in Grafana v7.2
 keywords:
   - grafana
   - new
@@ -21,7 +21,7 @@ weight: -29
 
 # What's new in Grafana v7.2
 
-This topic includes the release notes for the Grafana v7.2. For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md).
+This topic includes the release notes for the Grafana v7.2. For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/main/CHANGELOG.md).
 
 The main highlights are:
 
@@ -132,7 +132,7 @@ A new layout option is available when rendering reports: the grid layout. With t
 
 The grid layout is also available for the [Export dashboard as PDF]({{< relref "../dashboards/share-dashboards-panels#export-dashboard-as-pdf" >}}) feature.
 
-{{< figure src="/static/img/docs/enterprise/reports_grid_landscape_preview.png" max-width="500px" class="docs-image--no-shadow" >}}
+{{< figure src="/static/img/docs/enterprise/reports_grid_landscape_preview.png" max-width="500px" class="docs-image--no-shadow" alt="Report in grid layout" >}}
 
 ### Report time range
 
@@ -150,7 +150,7 @@ For more information, refer to [Report settings]({{< relref "../dashboards/share
 
 ## Changelog
 
-Check out [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) for a complete list of new features, changes, and bug fixes.
+Check out [CHANGELOG.md](https://github.com/grafana/grafana/blob/main/CHANGELOG.md) for a complete list of new features, changes, and bug fixes.
 
 ## What's new in other parts of the Grafana ecosystem
 
diff --git a/docs/sources/whatsnew/whats-new-in-v7-3.md b/docs/sources/whatsnew/whats-new-in-v7-3.md
index 528cd61287959..ca2c0d75c66cb 100644
--- a/docs/sources/whatsnew/whats-new-in-v7-3.md
+++ b/docs/sources/whatsnew/whats-new-in-v7-3.md
@@ -3,7 +3,7 @@ _build:
   list: false
 aliases:
   - ../guides/whats-new-in-v7-3/
-description: Feature and improvement highlights for Grafana v7.3
+description: Learn about new and updated features in Grafana v7.3
 keywords:
   - grafana
   - new
@@ -21,7 +21,7 @@ weight: -30
 
 # What's new in Grafana v7.3
 
-This topic includes the release notes for Grafana v7.3. For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) or the [Patch release notes](#patch-release-notes).
+This topic includes the release notes for Grafana v7.3. For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/main/CHANGELOG.md) or the [Patch release notes](#patch-release-notes).
 
 The main highlights are:
 
@@ -154,7 +154,7 @@ IdP-initiated single sign on (SSO) allows the user to log in directly from the S
 
 ## Changelog
 
-Check out [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) for a complete list of new features, changes, and bug fixes.
+Check out [CHANGELOG.md](https://github.com/grafana/grafana/blob/main/CHANGELOG.md) for a complete list of new features, changes, and bug fixes.
 
 ## Patch release notes
 
diff --git a/docs/sources/whatsnew/whats-new-in-v7-4.md b/docs/sources/whatsnew/whats-new-in-v7-4.md
index b2de53898bfe0..e9009182bd032 100644
--- a/docs/sources/whatsnew/whats-new-in-v7-4.md
+++ b/docs/sources/whatsnew/whats-new-in-v7-4.md
@@ -3,7 +3,7 @@ _build:
   list: false
 aliases:
   - ../guides/whats-new-in-v7-4/
-description: Feature and improvement highlights for Grafana v7.4
+description: Learn about new and updated features in Grafana v7.4
 keywords:
   - grafana
   - new
@@ -21,7 +21,7 @@ weight: -31
 
 # What's new in Grafana v7.4
 
-This topic includes the release notes for Grafana v7.4. For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md).
+This topic includes the release notes for Grafana v7.4. For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/main/CHANGELOG.md).
 
 Check out the [New Features in 7.4](https://play.grafana.org/d/nP8rcffGk/1-new-features-in-v7-4?orgId=1) dashboard on Grafana Play!
 
@@ -169,7 +169,7 @@ Many thanks to [mtanda](https://github.com/mtanda) this contribution!
 
 Google Cloud Monitoring data source ships with pre-configured dashboards for some of the most popular GCP services. These curated dashboards are based on similar dashboards in the GCP dashboard samples repository. In this release, we have expanded the set of pre-configured dashboards.
 
-{{< figure src="/static/img/docs/google-cloud-monitoring/curated-dashboards-7-4.png" max-width= "650px" >}}
+{{< figure src="/static/img/docs/google-cloud-monitoring/curated-dashboards-7-4.png" max-width= "650px" alt="Google Cloud Monitoring pre-configured dashboards" >}}
 
 If you want to customize a dashboard, we recommend that you save it under a different name. Otherwise the dashboard will be overwritten when a new version of the dashboard is released.
 
@@ -245,4 +245,4 @@ In order to minimize the confusion with Constant variable usage, we've removed t
 
 ## Changelog
 
-Check out [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) for a complete list of new features, changes, and bug fixes.
+Check out [CHANGELOG.md](https://github.com/grafana/grafana/blob/main/CHANGELOG.md) for a complete list of new features, changes, and bug fixes.
diff --git a/docs/sources/whatsnew/whats-new-in-v7-5.md b/docs/sources/whatsnew/whats-new-in-v7-5.md
index cd03cde17c256..6f842b4baf668 100644
--- a/docs/sources/whatsnew/whats-new-in-v7-5.md
+++ b/docs/sources/whatsnew/whats-new-in-v7-5.md
@@ -3,7 +3,7 @@ _build:
   list: false
 aliases:
   - ../guides/whats-new-in-v7-5/
-description: Feature and improvement highlights for Grafana v7.5
+description: Learn about new and updated features in Grafana v7.5
 keywords:
   - grafana
   - new
@@ -21,7 +21,7 @@ weight: -32
 
 # What's new in Grafana v7.5
 
-This topic includes the release notes for Grafana v7.5. For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md).
+This topic includes the release notes for Grafana v7.5. For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/main/CHANGELOG.md).
 
 ## Grafana OSS features
 
diff --git a/docs/sources/whatsnew/whats-new-in-v8-0.md b/docs/sources/whatsnew/whats-new-in-v8-0.md
index 4d7c64b9cbf99..c63d3f40f6fd9 100644
--- a/docs/sources/whatsnew/whats-new-in-v8-0.md
+++ b/docs/sources/whatsnew/whats-new-in-v8-0.md
@@ -3,7 +3,7 @@ _build:
   list: false
 aliases:
   - ../guides/whats-new-in-v8-0/
-description: Feature and improvement highlights for Grafana v8.0
+description: Learn about new and updated features in Grafana v8.0
 keywords:
   - grafana
   - new
@@ -21,7 +21,7 @@ weight: -33
 
 # What's new in Grafana v8.0
 
-This topic includes the release notes for Grafana v8.0. For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md).
+This topic includes the release notes for Grafana v8.0. For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/main/CHANGELOG.md).
 
 ## Grafana OSS features
 
diff --git a/docs/sources/whatsnew/whats-new-in-v8-1.md b/docs/sources/whatsnew/whats-new-in-v8-1.md
index cd70c051e8c7f..d42b7b0b36632 100644
--- a/docs/sources/whatsnew/whats-new-in-v8-1.md
+++ b/docs/sources/whatsnew/whats-new-in-v8-1.md
@@ -3,7 +3,7 @@ _build:
   list: false
 aliases:
   - ../guides/whats-new-in-v8-1/
-description: Feature and improvement highlights for Grafana v8.1
+description: Learn about new and updated features in Grafana v8.1
 keywords:
   - grafana
   - new
@@ -25,7 +25,7 @@ weight: -33
 
 Grafana 8.1 builds upon our promise of a composable, open observability platform with new panels and extends functionality launched in Grafana 8.0. We’ve got new Geomap and Annotations panels, and some great updates to the Time Series panel. We’ve also got new transformations and updates to data sources. For our enterprise customers, there are additions to fine grained access control, updates to the reporting schedule and query caching, and more. Read on to learn more.
 
-In addition to what is summarized here, you might also be interested in our announcement blog post. For all the technical details, check out the complete [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md).
+In addition to what is summarized here, you might also be interested in our announcement blog post. For all the technical details, check out the complete [CHANGELOG.md](https://github.com/grafana/grafana/blob/main/CHANGELOG.md).
 
 ## Grafana OSS features
 
diff --git a/docs/sources/whatsnew/whats-new-in-v8-2.md b/docs/sources/whatsnew/whats-new-in-v8-2.md
index 2e354501c9ca2..3afee62b4a3f8 100644
--- a/docs/sources/whatsnew/whats-new-in-v8-2.md
+++ b/docs/sources/whatsnew/whats-new-in-v8-2.md
@@ -3,7 +3,7 @@ _build:
   list: false
 aliases:
   - ../guides/whats-new-in-v8-2/
-description: Feature and improvement highlights for Grafana v8.2
+description: Learn about new and updated features in Grafana v8.2
 keywords:
   - grafana
   - new
@@ -27,7 +27,7 @@ The plugin catalog is now on by default in Grafana 8.2. Using the plugin catalog
 
 Grafana Enterprise includes a revamped Stats and Licensing page, new role-based access control permissions, and improvements that make usage insights and reporting easier to access.
 
-We’ve summarized what’s new in the release here, but you might also be interested in the announcement blog post. If you’d like all the details you can check out the [release notes](/docs/grafana/next/release-notes/release-notes-8-2-0/) and complete [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md).
+We’ve summarized what’s new in the release here, but you might also be interested in the announcement blog post. If you’d like all the details you can check out the [release notes](/docs/grafana/next/release-notes/release-notes-8-2-0/) and complete [CHANGELOG.md](https://github.com/grafana/grafana/blob/main/CHANGELOG.md).
 
 ## OSS
 
diff --git a/docs/sources/whatsnew/whats-new-in-v8-3.md b/docs/sources/whatsnew/whats-new-in-v8-3.md
index 7bab288184d16..c24dd159676a5 100644
--- a/docs/sources/whatsnew/whats-new-in-v8-3.md
+++ b/docs/sources/whatsnew/whats-new-in-v8-3.md
@@ -3,7 +3,7 @@ _build:
   list: false
 aliases:
   - ../guides/whats-new-in-v8-3/
-description: Feature and improvement highlights for Grafana v8.3
+description: Learn about new and updated features in Grafana v8.3
 keywords:
   - grafana
   - new
@@ -25,7 +25,7 @@ Grafana 8.3 is an exciting release for Grafana Labs. This release includes the n
 
 For Open Source users it also marks the first time Grafana Alerting, formerly unified alerting, is enabled by default for new Grafana installations. Grafana Alerting in 8.3 is the flexible, single pane of glass for all your alerts. Included in this release is expanded provisioning support for notifiers, contact points, and alert rules, alongside auditing and role-based access control for our Enterprise customers.
 
-We’ve summarized what’s new in the release here, but you might also be interested in the announcement blog post as well. If you’d like all the details you can check out the complete [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md).
+We’ve summarized what’s new in the release here, but you might also be interested in the announcement blog post as well. If you’d like all the details you can check out the complete [CHANGELOG.md](https://github.com/grafana/grafana/blob/main/CHANGELOG.md).
 
 ## Grafana OSS
 
diff --git a/docs/sources/whatsnew/whats-new-in-v8-4.md b/docs/sources/whatsnew/whats-new-in-v8-4.md
index 74321a5f66003..0827828511f06 100644
--- a/docs/sources/whatsnew/whats-new-in-v8-4.md
+++ b/docs/sources/whatsnew/whats-new-in-v8-4.md
@@ -3,7 +3,7 @@ _build:
   list: false
 aliases:
   - ../guides/whats-new-in-v8-4/
-description: Feature and improvement highlights for Grafana v8.4
+description: Learn about new and updated features in Grafana v8.4
 keywords:
   - grafana
   - new
@@ -23,7 +23,7 @@ weight: -33
 
 We’re excited to announce Grafana v8.4, with a variety of improvements that focus on Grafana’s usability, performance, and security. Read on to learn about Alerting enhancements like a WeCom contact point, improved Alert panel and custom mute timings, as well as visualization improvements and details to help you share playlists more easily. In Grafana Enterprise, we’ve made caching more powerful to save you time and money while loading dashboards, boosted database encryption to keep secrets safe in your Grafana database, and made usability improvements to Recorded Queries, which allow you to track any data point over time.
 
-We’ve summarized what’s new in the release here, but you might also be interested in the announcement blog post. If you’d like all the details you can check out the complete [changelog](https://github.com/grafana/grafana/blob/master/CHANGELOG.md).
+We’ve summarized what’s new in the release here, but you might also be interested in the announcement blog post. If you’d like all the details you can check out the complete [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md).
 
 ## OSS
 
diff --git a/docs/sources/whatsnew/whats-new-in-v8-5.md b/docs/sources/whatsnew/whats-new-in-v8-5.md
index 3005b7d1da44c..15f3fc25db59e 100644
--- a/docs/sources/whatsnew/whats-new-in-v8-5.md
+++ b/docs/sources/whatsnew/whats-new-in-v8-5.md
@@ -3,7 +3,7 @@ _build:
   list: false
 aliases:
   - ../guides/whats-new-in-v8-5/
-description: Feature and improvement highlights for Grafana v8.5
+description: Learn about new and updated features in Grafana v8.5
 keywords:
   - grafana
   - new
diff --git a/docs/sources/whatsnew/whats-new-in-v9-0.md b/docs/sources/whatsnew/whats-new-in-v9-0.md
index 23b75050e3c8e..9d9cc1818da0a 100644
--- a/docs/sources/whatsnew/whats-new-in-v9-0.md
+++ b/docs/sources/whatsnew/whats-new-in-v9-0.md
@@ -3,7 +3,7 @@ _build:
   list: false
 aliases:
   - ../guides/whats-new-in-v9-0/
-description: Feature and improvement highlights for Grafana v9.0
+description: Learn about new and updated features in Grafana v9.0
 keywords:
   - grafana
   - new
@@ -90,7 +90,7 @@ The new heatmap by default assumes that the data is pre-bucketed. So if your que
 
 Grafana Alerting is now on by default if you upgrade from an earlier version of Grafana. If you have been using legacy alerting in an earlier version of Grafana and you upgrade to Grafana 9 your alert rules will be automatically migrated and the legacy alerting interface will be replaced by the Grafana Alerting interface.
 
-Grafana Alerting, called unified alerting in Grafana 8, has been available since June, 2021 now provides feature parity with legacy alerting and many additional benefits. To find out more on the process to revert back to legacy alerts if needed, click [here]({{< relref "../alerting/set-up/migrating-alerts#opt-out" >}}). Note that if you do revert back (by setting the Grafana config flag GF_UNIFIED_ALERTING_ENABLED to false), that we expect to remove legacy alerting in the next major Grafana release, Grafana 10.
+Grafana Alerting, called unified alerting in Grafana 8, has been available since June, 2021 now provides feature parity with legacy alerting and many additional benefits. To find out more on the process to revert back to legacy alerts if needed, click [here](https://grafana.com/docs/grafana/v10.2/alerting/set-up/migrating-alerts/#opt-out). Note that if you do revert back (by setting the Grafana config flag GF_UNIFIED_ALERTING_ENABLED to false), that we expect to remove legacy alerting in the next major Grafana release, Grafana 10.
 
 ### Alert state history for Grafana managed alerts
 
diff --git a/docs/sources/whatsnew/whats-new-in-v9-1.md b/docs/sources/whatsnew/whats-new-in-v9-1.md
index b3d08e910be3f..cab0a2696d425 100644
--- a/docs/sources/whatsnew/whats-new-in-v9-1.md
+++ b/docs/sources/whatsnew/whats-new-in-v9-1.md
@@ -3,7 +3,7 @@ _build:
   list: false
 aliases:
   - ../guides/whats-new-in-v9-1/
-description: Feature and improvement highlights for Grafana v9.1
+description: Learn about new and updated features in Grafana v9.1
 keywords:
   - grafana
   - new
@@ -24,7 +24,7 @@ weight: -33
 We're excited to announce Grafana v9.1, with a variety of improvements that focus on Grafana's usability, performance, and security.
 Read on to learn about new options to share and embed dashboards, search and navigation enhancements, new panel options, and additional authentication features.
 You can also find out more about new single sign-on and role-based access control options in Grafana Enterprise, and more.
-For details, see the complete [changelog](https://github.com/grafana/grafana/blob/master/CHANGELOG.md).
+For details, see the complete [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md).
 
 ## OSS
 
diff --git a/docs/sources/whatsnew/whats-new-in-v9-2.md b/docs/sources/whatsnew/whats-new-in-v9-2.md
index 6b43fde424127..4deeb3a386a27 100644
--- a/docs/sources/whatsnew/whats-new-in-v9-2.md
+++ b/docs/sources/whatsnew/whats-new-in-v9-2.md
@@ -1,7 +1,7 @@
 ---
 aliases:
   - ../guides/whats-new-in-v9-2/
-description: Feature and improvement highlights for Grafana v9.2
+description: Learn about new and updated features in Grafana v9.2
 keywords:
   - grafana
   - new
@@ -21,7 +21,7 @@ weight: -33
 
 Welcome to Grafana v9.2, a hefty minor release with a swath of improvements that help you create and share dashboards and alerts.
 Read on to learn about progress on public dashboards, our new panel help menu, custom branding in Grafana Enterprise, and improvements to access control.
-If you'd prefer to dig into the details, check out the complete [changelog](https://github.com/grafana/grafana/blob/master/CHANGELOG.md).
+If you'd prefer to dig into the details, check out the complete [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md).
 
 ## Panel help menu
 
diff --git a/docs/sources/whatsnew/whats-new-in-v9-3.md b/docs/sources/whatsnew/whats-new-in-v9-3.md
index 6be8d82131bed..f780b4890aff3 100644
--- a/docs/sources/whatsnew/whats-new-in-v9-3.md
+++ b/docs/sources/whatsnew/whats-new-in-v9-3.md
@@ -1,7 +1,7 @@
 ---
 aliases:
   - ../guides/whats-new-in-v9-3/
-description: Feature and improvement highlights for Grafana v9.3
+description: Learn about new and updated features in Grafana v9.3
 keywords:
   - grafana
   - new
@@ -19,7 +19,7 @@ weight: -34
 
 # What's new in Grafana v9.3
 
-Welcome to Grafana 9.3! Read on to learn about our navigation overhaul, support for four new languages, new panels and transformations, several often-requested auth improvements, usability improvements to Alerting, and more. For even more detail about all the changes in this release, refer to the [changelog](https://github.com/grafana/grafana/blob/master/CHANGELOG.md).
+Welcome to Grafana 9.3! Read on to learn about our navigation overhaul, support for four new languages, new panels and transformations, several often-requested auth improvements, usability improvements to Alerting, and more. For even more detail about all the changes in this release, refer to the [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md).
 
 ## New navigation
 
diff --git a/docs/sources/whatsnew/whats-new-in-v9-4.md b/docs/sources/whatsnew/whats-new-in-v9-4.md
index 07a9a176d4e03..4f6e9fb5e59fd 100644
--- a/docs/sources/whatsnew/whats-new-in-v9-4.md
+++ b/docs/sources/whatsnew/whats-new-in-v9-4.md
@@ -1,5 +1,5 @@
 ---
-description: Feature and improvement highlights for Grafana v9.4
+description: Learn about new and updated features in Grafana v9.4
 keywords:
   - grafana
   - new
@@ -17,7 +17,7 @@ weight: -35
 
 # What's new in Grafana v9.4
 
-Welcome to Grafana 9.4! Read on to learn about changes to search and navigation, dashboards and visualizations, and authentication and security. For even more detail about all the changes in this release, refer to the [changelog](https://github.com/grafana/grafana/blob/master/CHANGELOG.md).
+Welcome to Grafana 9.4! Read on to learn about changes to search and navigation, dashboards and visualizations, and authentication and security. For even more detail about all the changes in this release, refer to the [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md).
 
 ## Search and navigation
 
diff --git a/docs/sources/whatsnew/whats-new-in-v9-5.md b/docs/sources/whatsnew/whats-new-in-v9-5.md
index 8a76dae73ec74..36751d91b5ab6 100644
--- a/docs/sources/whatsnew/whats-new-in-v9-5.md
+++ b/docs/sources/whatsnew/whats-new-in-v9-5.md
@@ -1,5 +1,5 @@
 ---
-description: Feature and improvement highlights for Grafana v9.5
+description: Learn about new and updated features in Grafana v9.5
 keywords:
   - grafana
   - new
@@ -19,7 +19,7 @@ weight: -36
 
 Welcome to Grafana 9.5! We're excited to share some major updates to Grafana's navigation, tons of usability improvements to Alerting, and some promising experiments to help you query your Prometheus metrics. Also, read on to learn about our continued migration from API keys to service accounts, as well as deprecation of plugins that use Angular and a field in the InfluxDB data source.
 
-For more detail about all the changes in this release, refer to the [changelog](https://github.com/grafana/grafana/blob/master/CHANGELOG.md). For the specific steps we recommend when you upgrade to v9.5, check out our [Upgrade Guide]({{< relref "../upgrade-guide/upgrade-v9.5/index.md" >}}).
+For more detail about all the changes in this release, refer to the [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md). For the specific steps we recommend when you upgrade to v9.5, check out our [Upgrade Guide]({{< relref "../upgrade-guide/upgrade-v9.5/index.md" >}}).
 
 <!-- Template below
 
diff --git a/docs/sources/whatsnew/whats-new-next/README.md b/docs/sources/whatsnew/whats-new-next/README.md
index f7157457cdc5a..ac1d70cf30eb0 100644
--- a/docs/sources/whatsnew/whats-new-next/README.md
+++ b/docs/sources/whatsnew/whats-new-next/README.md
@@ -1,88 +1,7 @@
-# Contribute to 'What's New in Grafana Cloud'
+---
+draft: true
+---
 
-To have a feature presented in [What's New in Grafana Cloud](https://grafana.com/docs/grafana-cloud/whatsnew/), add an entry to the [`index.md`](./index.md) file in this directory.
+# Contribute to 'What's new in Grafana Cloud'
 
-Use the following template, replace any `<VARIABLE>` with the appropriate text (explained after the template):
-
-```markdown
-## <FEATURE>
-
-<!-- <CONTRIBUTOR> -->
-<!-- <ON-PREMISE OFFERING> -->
-
-<DATE>
-
-_Available in <CLOUD AVAILABILITY> in Grafana <CLOUD OFFERING>_
-
-<DESCRIPTION>
-```
-
-## _`CONTRIBUTOR`_
-
-The name of the contributor of the feature.
-The information is intentionally commented out so that it isn't displayed in the published page.
-
-## _`ON-PREMISE OFFERING`_
-
-One or both of:
-
-- OSS
-- Enterprise
-
-Intended availability of the feature when released outside of Grafana Cloud.
-The information is intentionally commented out so that it isn't displayed in the published page.
-If the feature is not going to be released outside of Grafana Cloud, omit the HTML comment entirely.
-
-## _`DATE`_
-
-The release date of the feature, fully written out. For example: September 12, 2023.
-
-Add your feature in order by date. Dates are in descending order from the top of the page (that is, the top of the page has the most recently released features).
-
-## _`CLOUD AVAILABILITY`_
-
-One of the following [release life cycle stages](https://grafana.com/docs/release-life-cycle/):
-
-- Generally available
-- Available in public preview
-- Available in private preview
-- Experimental
-
-## _`CLOUD OFFERING`_
-
-List the appropriate combination of:
-
-- Cloud Free
-- Cloud Pro
-- Cloud Advanced
-
-Or if all three:
-
-- Cloud
-
-## _`DESCRIPTION`_
-
-Include an overview of the feature and problem it solves, and where to learn more.
-Link to any appropriate documentation and, optionally, embed a video or image to illustrate the feature, following our [image and media guidelines](https://grafana.com/docs/writers-toolkit/write/image-guidelines/#image-diagram-and-screenshot-guidelines).
-You must use relative path references when linking to documentation within the Grafana repository.
-Use the Hugo `relref` shortcode for build time link checking.
-For more information about the `relref` shortcode, refer to [Links and references](https://grafana.com/docs/writers-toolkit/writing-guide/references/).
-
-Grafana Cloud documentation uses the "next" version of Grafana documentation.
-For consistency, links to Grafana OSS documentation should also link to the "next" version.
-For example, using the partial URL `/docs/grafana/next/explore/` to link to the Grafana OSS explore documentation.
-
-## Example
-
-```markdown
-## Updated navigation
-
-<!-- Jack Baldry -->
-<!-- OSS, Enterprise -->
-
-September 12, 2023
-
-_Available in public preview in Grafana Cloud Pro and Advanced_
-
-The navigation in Grafana Cloud has been updated in the following ways...
-```
+To contribute to [What's new in Grafana Cloud](https://grafana.com/docs/grafana-cloud/whatsnew/), refer to [Contribute to What’s new or release notes](https://grafana.com/docs/writers-toolkit/contribute-documentation/contribute-release-notes/).
diff --git a/docs/sources/whatsnew/whats-new-next/index.md b/docs/sources/whatsnew/whats-new-next/index.md
deleted file mode 100644
index 743f5457d0cae..0000000000000
--- a/docs/sources/whatsnew/whats-new-next/index.md
+++ /dev/null
@@ -1,528 +0,0 @@
----
-canonical: https://grafana.com/docs/grafana/latest/whatsnew/whats-new-next/
-description: Feature and improvement highlights for Grafana Cloud
-keywords:
-  - grafana
-  - new
-  - documentation
-  - cloud
-  - release notes
-labels:
-  products:
-    - cloud
-title: What's new in Grafana Cloud
-weight: -37
----
-
-# What’s new in Grafana Cloud
-
-Welcome to Grafana Cloud! Read on to learn about the newest changes to Grafana Cloud.
-
-## Export alerting resources to Terraform
-
-<!-- Yuri Tseretyan -->
-<!-- OSS, Enterprise -->
-
-October 30, 2023
-
-_Generally available in Grafana Cloud_
-
-Export your alerting resources, such as alert rules, contact points, and notification policies as Terraform resources. A new “Modify export” mode for alert rules enables you to edit provisioned alert rules and export a modified version.
-
-## Alerting insights
-
-<!-- George Robinson -->
-
-October 30, 2023
-
-_Generally available in Grafana Cloud_
-
-Use Alerting insights to monitor your alerting data, discover key trends about your organization’s alert management performance, and find patterns in why things go wrong.
-
-## Configure refresh token handling separately for OAuth providers
-
-<!-- Mihaly Gyongyosi -->
-<!-- already in on-prem -->
-
-October 24, 2023
-
-_Generally available in Grafana Cloud_
-
-With Grafana v9.3, we introduced a feature toggle called `accessTokenExpirationCheck`. It improves the security of Grafana by checking the expiration of the access token and automatically refreshing the expired access token when a user is logged in using one of the OAuth providers.
-
-With the current release, we've introduced a new configuration option for each OAuth provider called `use_refresh_token` that allows you to configure whether the particular OAuth integration should use refresh tokens to automatically refresh access tokens when they expire. In addition, to further improve security and provide secure defaults, `use_refresh_token` is enabled by default for providers that support either refreshing tokens automatically or client-controlled fetching of refresh tokens. It's enabled by default for the following OAuth providers: `AzureAD`, `GitLab`, `Google`.
-
-For more information on how to set up refresh token handling, please refer to [the documentation of the particular OAuth provider.](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-security/configure-authentication/).
-
-{{% admonition type="note" %}}
-The `use_refresh_token` configuration must be used in conjunction with the `accessTokenExpirationCheck` feature toggle. If you disable the `accessTokenExpirationCheck` feature toggle, Grafana won't check the expiration of the access token and won't automatically refresh the expired access token, even if the `use_refresh_token` configuration is set to `true`.
-
-The `accessTokenExpirationCheck` feature toggle will be removed in Grafana v10.3.
-{{% /admonition %}}
-
-## Use AI to generate dashboard titles, descriptions, and change summaries
-
-<!-- Nathan Marrs -->
-<!-- OSS, Enterprise -->
-<!-- already in on-prem release notes -->
-
-October 24, 2023
-
-_Available in public preview in Grafana Cloud_
-
-You can now use generative AI to assist you in your Grafana dashboards. So far generative AI can help you with the following tasks:
-
-- **Generate panel and dashboard titles and descriptions** - You can now generate a title and description for your panel or dashboard based on the data you've added to it. This is useful when you want to quickly visualize your data and don't want to spend time coming up with a title or description.
-- **Generate dashboard save changes summary** - You can now generate a summary of the changes you've made to a dashboard when you save it. This is great for effortlessly tracking the history of a dashboard.
-
-To enable these features, you must first enable the `dashgpt` [feature toggle](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/feature-toggles/#experimental-feature-toggles). Then install and configure Grafana's LLM app plugin. For more information, refer to the [Grafana LLM app plugin documentation](https://grafana.com/docs/grafana-cloud/alerting-and-irm/machine-learning/llm-plugin/).
-
-When enabled, look for the **✨ Auto generate** option next to the **Title** and **Description** fields in your panels and dashboards, or when you press the **Save** button.
-
-{{< figure src="/media/docs/grafana/dashboards/auto-generate-description-10-2.gif" max-width="750px" caption="Auto-generate a panel description using AI" >}}
-
-## Create interactive buttons in canvas visualizations
-
-<!-- Nathan Marrs -->
-<!-- OSS, Enterprise -->
-<!-- already in on-prem release notes -->
-
-October 24, 2023
-
-_Available in public preview in Grafana Cloud_
-
-You can now add buttons to your canvas visualizations. Buttons can be configured to call an API endpoint. This pushes Grafana's capabilities to new heights, allowing you to create interactive dashboards that can be used to control external systems.
-
-To learn more, refer to our [Canvas button element documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/canvas/#button).
-
-{{< video-embed src="/media/docs/grafana/2023-20-10-Canvas-Button-Element-Enablement-Video.mp4" max-width="750px" caption="Canvas button element demo" >}}
-
-## Zoom in on the y-axis of the time series and candlestick visualizations
-
-<!-- Nathan Marrs -->
-<!-- OSS, Enterprise -->
-<!-- already in on-prem release notes -->
-
-October 24, 2023
-
-_Generally available in Grafana Cloud_
-
-You can now zoom in on the y-axis of your time series and candlestick visualizations. This is useful when you want to focus on a specific range of values. To zoom in on the y-axis on supported visualizations, hold the Shift key while clicking and dragging; double-click to reset the zoom.
-
-{{< video-embed src="/media/docs/grafana/screen-recording-10-2-y-axis-zoom-demo.mp4" max-width="750px" caption="Y-axis zooming demo" >}}
-
-## Data visualization quality of life improvements
-
-We've made a number of smaller improvements to the data visualization experience in Grafana.
-
-<!-- Nathan Marrs -->
-<!-- OSS, Enterprise -->
-<!-- already in on-prem release notes -->
-
-October 24, 2023
-
-_Generally available in Grafana Cloud_
-
-**Geomap marker symbol alignment options**
-
-You can now offset geomap marker symbols from the underlying data point.
-
-{{< figure src="/media/docs/grafana/gif-grafana-10-2-geomap-marker-symbol-alignment.gif" max-width="750px" caption="Geomap marker symbol alignment" >}}
-
-**Gauge visualization overflow support**
-
-You can now visualize gauges in vertical and horizontal orientations with overflow. This resolves an issue where the design would break when the number of gauges exceeded the available space.
-
-{{< figure src="/media/docs/grafana/gif-grafana-10-2-gauge-overflow.gif" max-width="750px" caption="Gauge overflow" >}}
-
-**Bar chart axes improvements**
-
-You can now center bar chart axes on zero and configure axes border and color settings.
-
-{{< figure src="/media/docs/grafana/screenshot-grafana-10-2-bar-chart-axes-improvements.png" max-width="750px" caption="Bar chart improvements" >}}
-
-## Detect unusable transformations
-
-<!-- Kyle Cunningham -->
-<!-- OSS, Enterprise -->
-<!-- already in on-prem release notes -->
-
-October 24, 2023
-
-_Available in public preview in Grafana Cloud_
-
-We've added initial support to detect situations in which various transformations won't work appropriately based on current data. Previously, selecting the appropriate transformation and configuring it correctly required a process of trial and error or already knowing how a given transformation worked. Now, transformations that we've detected can't be used are shaded in the interface to indicate this, along with a helpful message explaining why.
-
-{{< figure src="/media/docs/grafana/transformations/disabled-transformation.png" caption="Transformation that has been disabled because it doesn't have the necessary data" >}}
-
-## Tempo data source: "Aggregate By" Search option to compute RED metrics over spans aggregated by attribute
-
-<!-- Joey Tawadrous, Jen Villa -->
-<!-- available in on-prem, both open source Grafana and Grafana Enterprise, starting with Grafana 10.2, but also requires Tempo or Grafana Enterprise Traces (GET) v2.2 or greater -->
-
-October 24, 2023
-
-_Experimental in Grafana Cloud_
-
-We've added an **Aggregate By** option to the [TraceQL query editor](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/datasources/tempo/query-editor/traceql-search/#write-traceql-queries-using-search) to leverage Grafana Cloud Traces' [metrics summary API](https://grafana.com/docs/grafana-cloud/monitor-infrastructure/traces/metrics-summary-api/). You can calculate RED metrics (total span count, percent erroring spans, and latency information) for spans of `kind=server` received in the last hour that match your filter criteria, grouped by whatever attributes you specify.
-
-This feature is disabled by default. To enable it, file contact Grafana Support.
-
-For more information, refer to the [documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/datasources/tempo/query-editor/traceql-search/#optional-use-aggregate-by).
-
-{{< figure src="/media/docs/tempo/metrics-summary-10-2.png" caption="Aggregate by" >}}
-
-## Support for dashboard variables in transformations
-
-<!-- Oscar Kilhed, Victor Marin -->
-<!-- already in on-prem -->
-
-October 24, 2023
-
-_Experimental in Grafana Cloud_
-
-Previously, the only transformation that supported [dashboard variables](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/variables/) was the **Add field from calculation** transformation. We've now extended the support for variables to the **Filter by value**, **Create heatmap**, **Histogram**, **Sort by**, **Limit**, **Filter by name**, and **Join by field** transformations.
-
-We've also made it easier to find the correct dashboard variable by displaying available variables in the fields that support them, either in the drop-down or as a suggestion when you type **$** or press Ctrl + Space:
-
-{{< figure src="/media/docs/grafana/transformations/completion.png" caption="Input with dashboard variable suggestions" >}}
-
-## Role mapping support for Google OIDC
-
-<!-- Jo Guerreiro -->
-<!-- already in on-prem -->
-
-October 24, 2023
-
-_Generally available in Grafana Cloud_
-
-You can now map Google groups to Grafana organizational roles when using Google OIDC.
-This is useful if you want to limit the access users have to your Grafana instance.
-
-We've also added support for controlling allowed groups when using Google OIDC.
-
-Refer to the [Google Authentication documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-security/configure-authentication/google/) to learn how to use these new options.
-
-## Multiple spansets per trace
-
-<!-- Joey Tawadrous -->
-<!-- OSS, Enterprise -->
-
-October 24, 2023
-
-_Generally available in Grafana Cloud_
-
-The [TraceQL query editor](https://grafana.com/docs/tempo/<TEMPO_VERSION>/traceql/#traceql-query-editor) has been improved to facilitate the grouping of multiple spans per trace in TraceQL queries. For example, when the following `by(resource.service.name)` is added to your TraceQL query, it will group the spans in each trace by `resource.service.name`.
-
-{{< figure src="/media/docs/tempo/multiple-spansets-per-trace-10-2.png" max-width="750px" caption="Multiple spansets per trace" >}}
-
-## Temporary credentials in CloudWatch data source
-
-<!-- Michael Mandrus, Ida Štambuk, Sarah Zinger  -->
-<!-- Cloud -->
-
-October 24, 2023
-
-_Available in private preview in Grafana Cloud_
-
-The Grafana Assume Role authentication provider lets Grafana Cloud users of the CloudWatch data source authenticate with AWS without having to create and maintain long term AWS Users. Using the new assume role authentication method, you no longer have to rotate access and secret keys in your CloudWatch data source. Instead, Grafana Cloud users can create an identity access and management (IAM) role that has a trust relationship with Grafana's AWS account; Grafana's AWS account will then use AWS Secure Token Service (STS) to create temporary credentials to access the user's AWS data.
-
-To learn more, refer to the [CloudWatch authentication documentation](/docs/grafana/next/datasources/aws-cloudwatch/aws-authentication).
-
-## No basic role
-
-<!-- Eric Leijonmarck -->
-<!-- OSS, Enterprise -->
-
-October 12, 2023
-
-_Generally available in Grafana Cloud_
-
-We're excited to introduce the "No basic role," a new basic role with no permissions. A basic role in Grafana dictates the set of actions a user or entity can perform, known as permissions. This new role is especially beneficial if you're aiming for tailored, customized RBAC permissions for your service accounts or users. You can set this as a basic role through the API or UI.
-
-Previously, permissions were granted based on predefined sets of capabilities. Now, with the "No basic role," you have the flexibility to be even more granular.
-
-For more details on basic roles and permissions, refer to the [documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/roles-and-permissions/).
-
-To assign the "No basic role" in your Grafana Cloud stack, contact Grafana Support and ask them to enable the `skip_org_role_sync` feature toggle. You'll be able to change basic roles that are synced using GCom.
-
-## Content outline
-
-<!-- Thanos Karachalios -->
-<!-- OSS,Enterprise -->
-
-October 12, 2023
-
-_Generally Available in Grafana Cloud_
-
-Introducing Content Outline in Grafana **Explore**. We recognized the challenges of complex mixed queries, as well as, lengthy logs and traces results, leading to time-consuming navigation and the loss of context. Content outline is our first step towards seamless navigation from log lines to traces and back to queries ensuring quicker searches while preserving context. Experience efficient, contextual investigations with this update in Grafana Explore. To learn more, refer to the [Content outline documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/explore/#content-outline), as well as the following video demo.
-
-{{< video-embed src="/media/docs/grafana/explore/content-outline-demo.mp4" >}}
-
-## Public dashboards
-
-<!-- Thanos Karachalios -->
-<!-- Enterprise -->
-
-October 12, 2023
-
-_Generally Available in Grafana Cloud_
-
-Public dashboards allow you to share your visualizations and insights to a broader audience without the requirement of a login. You can effortlessly use our current sharing model and create a public dashboard URL to share with anyone using the generated public URL link. To learn more, refer to the [Public dashboards documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/dashboard-public/), as well as the following video demo:
-
-{{< video-embed src="/media/docs/grafana/dashboards/public-dashboards-demo.mp4" >}}
-
-## Correlations editor in Explore
-
-<!-- Kristina Durivage -->
-<!-- OSS, Enterprise -->
-<!-- already in on-prem -->
-
-October 3, 2023
-
-_Available in public preview in Grafana Cloud_
-
-Creating correlations has just become easier. Try out our new correlations editor in **Explore** by selecting the **+ Add > Add correlation** option from the top bar or from the command palette. The editor shows all possible places where you can place data links and guides you through building and testing target queries. For more information, refer to [the documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/correlations/).
-
-To enable this feature, contact Grafana Support.
-
-## Improved TraceQL query editor
-
-<!-- Fabrizio Casati -->
-<!-- OSS, Enterprise -->
-
-October 3, 2023
-
-_Generally available in Grafana Cloud_
-
-The [TraceQL query editor](https://grafana.com/docs/tempo/latest/traceql/#traceql-query-editor) has been improved to facilitate the creation of TraceQL queries. In particular, it now features improved autocompletion, syntax highlighting, and error reporting.
-
-{{< video-embed src="/media/docs/tempo/screen-recording-grafana-10.2-traceql-query-editor-improvements.mp4" >}}
-
-## Recorded queries: Record multiple metrics from a single query
-
-<!-- Kyle Brandt, Observability Metrics -->
-<!-- Enterprise -->
-
-October 3, 2023
-
-_Generally available in Grafana Cloud_
-
-With recorded queries, a single recorded query can now record multiple metrics.
-
-## Issues snapshot in Kubernetes Monitoring
-
-<!-- Beverly Buchanan -->
-
-September 29, 2023
-
-_Generally available in Grafana Cloud_
-
-To provide quicker identification and troubleshooting, the home page contains a snapshot of issues that reach the following thresholds:
-
-- Pods that have been in a non-running state for more than 15 minutes
-- Nodes with CPU usage above 90% for more than five minutes
-- Nodes using more than 90% of memory for more than five minutes
-- Persistent Volumes with capacity above 90%
-- Node disks with capacity above 90%
-
-(Release 1.3.1)
-{{< figure max-width="80%" src="/media/docs/grafana-cloud/k8s/K8smon-snapshotview.png" caption="Home page snapshot view" >}}
-
-## Tenant database instance name and number for SAP HANA® data source
-
-<!-- Miguel Palau -->
-<!-- OSS, Enterprise -->
-
-September 25, 2023
-
-_Generally available in Grafana Cloud_
-
-The SAP HANA® data source now supports tenant databases connections by using the database name and/or instance number. For more information, refer to [SAP HANA® configuration](/docs/plugins/grafana-saphana-datasource/latest/#configuration).
-
-{{< video-embed src="/media/docs/sap-hana/tenant.mp4" >}}
-
-## Distributed tracing in Grafana Cloud k6
-
-<!-- Heitor Tashiro Sergent -->
-
-September 19, 2023
-
-_Generally available in Grafana Cloud_
-
-You can now use the Grafana Cloud Traces integration with Grafana Cloud k6 to quickly debug failed performance tests and proactively improve application reliability.
-
-Distributed tracing in Grafana Cloud k6 only requires two things:
-
-- An application instrumented for tracing with Grafana Cloud Traces.
-- Adding a few lines of code to your existing k6 scripts.
-
-The integration works by having k6 inject tracing metadata into the requests it sends to your backend services when you run a test. The tracing data is then correlated with k6 test run data, so you can understand how your services and operations behaved during the whole test run. The collected tracing data is aggregated to generate real-time metrics—such as frequency of calls, error rates, and percentile latencies—that can help you narrow your search space and quickly spot anomalies.
-
-To learn more, refer to the [Integration with Grafana Cloud Traces documentation](/docs/grafana-cloud/k6/analyze-results/integration-with-grafana-cloud-traces/) and [Distributed Tracing in Grafana Cloud k6 blog post](https://grafana.com/blog/2023/09/19/troubleshoot-failed-performance-tests-faster-with-distributed-tracing-in-grafana-cloud-k6/).
-
-## New browse dashboards
-
-<!-- Yaelle Chaudy for Frontend Platform -->
-<!-- OSS, Enterprise -->
-
-September 19, 2023
-
-_Generally available in Grafana Cloud_
-
-The new browse dashboards interface features a more compact design, making it easier to navigate, search for, and manage for your folders and dashboards. The new interface also has many performance improvements, especially for instances with a large number of folders and dashboards.
-
-To make using folders easier and more consistent, there is no longer a special **General** folder. Dashboards without a folder, or dashboards previously in **General**, are now shown at the root level.
-
-To learn more, refer to the following video demo.
-
-{{< video-embed src="/media/docs/grafana/2023-09-11-New-Browse-Dashboards-Enablement-Video.mp4" >}}
-
-## Streamlined configuration of Kubernetes Monitoring
-
-<!-- Beverly Buchanan -->
-
-September 15, 2023
-
-_Generally available in Grafana Cloud_
-
-Configure with [Grafana Kubernetes Monitoring Helm chart](https://grafana.com/docs/grafana-cloud/monitor-infrastructure/kubernetes-monitoring/configuration/config-k8s-agent-flow) using a streamlined process. With this method, you can set on/off switches to gather metrics, logs, events, traces, and cost metrics. (Release 1.2.0)
-
-{{< figure max-width="60%" src="/media/docs/grafana-cloud/k8s/k8smon-config-wizard.png" caption="Configuration wizard" >}}
-
-## Tabs navigation in Kubernetes Monitoring
-
-<!-- Beverly Buchanan -->
-
-September 14, 2023
-
-_Generally available in Grafana Cloud_
-
-Quickly switch between the Cluster, namespace, workload, and Node views on the **Cluster Navigation** page using tabs. (Release 1.3.0)
-
-{{< figure max-width="40%" src="/media/docs/grafana-cloud/k8s/k8smon-clusternav-tabs.png" caption="Tabs on **Cluster Navigation** page" >}}
-
-## Data source menu on Cost and Efficiency views in Kubernetes Monitoring
-
-<!-- Beverly Buchanan -->
-
-September 14, 2023
-
-_Generally available in Grafana Cloud_
-
-You can change the data source you are viewing on the **Cost** and **Efficiency** views. (Release 1.2.1)
-
-## Predict namespace memory usage in Kubernetes Monitoring
-
-<!-- Beverly Buchanan -->
-
-September 14, 2023
-
-_Generally available in Grafana Cloud_
-
-Click **Predict Memory usage** to predict namespace memory usage on the namespace detail page. (Release 1.2.1)
-
-{{< figure max-width="50%" src="/media/docs/grafana-cloud/k8s/k8smon-predict-memusage-namespace.png" caption="**Predict Memory usage** button" >}}
-
-## Traces collection with Kubernetes Monitoring
-
-<!-- Beverly Buchanan -->
-
-September 14, 2023
-
-_Generally available in Grafana Cloud_
-
-Collect traces when you configure Kubernetes Monitoring, and then use Tempo to create search queries. Refer to [Navigate to traces](/docs/grafana-cloud/monitor-infrastructure/kubernetes-monitoring/navigate-k8s-monitoring/#navigate-to-traces) for more information. (Release 1.3.0)
-
-## Kafka integration in Kubernetes Monitoring
-
-<!-- Beverly Buchanan -->
-
-September 14, 2023
-
-_Generally available in Grafana Cloud_
-
-The Kafka integration is available for use in Kubernetes Monitoring. (Release 1.3.6)
-
-## Create correlations for provisioned data sources
-
-<!-- Piotr Jamróz -->
-<!-- OSS, Enterprise -->
-<!-- already in on-prem -->
-
-September 13, 2023
-
-_Available in public preview in Grafana Cloud_
-
-You can now create correlations using either the **Administration** page or provisioning, regardless of whether a data source was provisioned or not. In previous versions of Grafana, if a data source was provisioned, the only way to add correlations to it was also with provisioning. Now, that's no longer the case, and you can easily create new correlations mixing both methods—using the **Administration** page or provisioning.
-
-To enable this feature, contact Grafana Support.
-
-## Grafana OnCall integration for Alerting
-
-<!-- Brenda Muir -->
-<!-- OSS, Enterprise -->
-
-September 13, 2023
-
-_Generally available in Grafana Cloud_
-
-Use the Grafana Alerting - Grafana OnCall integration to effortlessly connect alerts generated by Grafana Alerting with Grafana OnCall. From there, you can route them according to defined escalation chains and schedules.
-
-To learn more, refer to the [Grafana OnCall integration for Alerting documentation](/docs/grafana/next/alerting/alerting-rules/manage-contact-points/configure-oncall/).
-
-## API throttling for Datadog data source
-
-<!-- Taewoo Kim -->
-<!-- OSS, Enterprise -->
-
-September 1, 2023
-
-_Generally available in Grafana Cloud_
-
-The Datadog data source supports blocking API requests based on upstream rate limits (for metric queries). With this update, you can set a rate limit percentage at which the plugin stops sending queries.
-
-To learn more, refer to [Datadog data source settings](/docs/plugins/grafana-datadog-datasource/latest#configure-the-data-source), as well as the following video demo.
-
-{{< video-embed src="/media/docs/datadog/datadog-rate-limit.mp4" >}}
-
-## Log aggregation for Datadog data source
-
-<!-- Taewoo Kim -->
-<!-- OSS, Enterprise -->
-
-August 31, 2023
-
-_Generally available in Grafana Cloud_
-
-The Datadog data source now supports log aggregation. This feature helps aggregate logs/events into buckets and compute metrics and time series. For more information, refer to [Datadog log aggregation](/docs/plugins/grafana-datadog-datasource/latest#logs-analytics--aggregation).
-
-{{< video-embed src="/media/docs/datadog/datadog-log-aggregation.mp4" >}}
-
-## Permission validation on custom role creation and update
-
-<!-- Mihaly Gyongyosi -->
-<!-- Cloud -->
-
-<!-- already in on-prem -->
-
-August 25, 2023
-
-_Generally available in Grafana Cloud_
-
-With the current release, we enabled RBAC permission validation (`rbac.permission_validation_enabled` setting) by default. This means that the permissions provided in the request during custom role creation or update are validated against the list of [available permissions and their scopes](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/roles-and-permissions/access-control/custom-role-actions-scopes/#action-definitions). If the request contains a permission that is not available or the scope of the permission is not valid, the request is rejected with an error message.
-
-## Query-type template variables for Tempo data source
-
-<!-- Fabrizio Casati -->
-<!-- OSS, Enterprise -->
-
-August 24, 2023
-
-_Generally available in Grafana Cloud_
-
-The Tempo data source now supports query-type template variables. With this update, you can create variables for which the values are a list of attribute names or attribute values seen on spans received by Tempo.
-
-To learn more, refer to the following video demo, as well as the [Grafana Variables documentation](/docs/grafana/next/dashboards/variables/).
-
-{{< video-embed src="/media/docs/tempo/screen-recording-grafana-10.2-tempo-query-type-template-variables.mp4" >}}
diff --git a/e2e/cloud-plugins-suite/azure-monitor.spec.ts b/e2e/cloud-plugins-suite/azure-monitor.spec.ts
index 4f61c10ce0b87..d58f2f776e79c 100644
--- a/e2e/cloud-plugins-suite/azure-monitor.spec.ts
+++ b/e2e/cloud-plugins-suite/azure-monitor.spec.ts
@@ -89,62 +89,26 @@ const addAzureMonitorVariable = (
     .type(`${type.replace('Azure', '').trim()}{enter}`);
   switch (type) {
     case AzureQueryType.ResourceGroupsQuery:
-      e2eSelectors.variableEditor.subscription
-        .input()
-        .find('input')
-        .type(`${options?.subscription}{enter}`);
+      e2eSelectors.variableEditor.subscription.input().find('input').type(`${options?.subscription}{enter}`);
       break;
     case AzureQueryType.LocationsQuery:
-      e2eSelectors.variableEditor.subscription
-        .input()
-        .find('input')
-        .type(`${options?.subscription}{enter}`);
+      e2eSelectors.variableEditor.subscription.input().find('input').type(`${options?.subscription}{enter}`);
       break;
     case AzureQueryType.NamespacesQuery:
-      e2eSelectors.variableEditor.subscription
-        .input()
-        .find('input')
-        .type(`${options?.subscription}{enter}`);
-      e2eSelectors.variableEditor.resourceGroup
-        .input()
-        .find('input')
-        .type(`${options?.resourceGroup}{enter}`);
+      e2eSelectors.variableEditor.subscription.input().find('input').type(`${options?.subscription}{enter}`);
+      e2eSelectors.variableEditor.resourceGroup.input().find('input').type(`${options?.resourceGroup}{enter}`);
       break;
     case AzureQueryType.ResourceNamesQuery:
-      e2eSelectors.variableEditor.subscription
-        .input()
-        .find('input')
-        .type(`${options?.subscription}{enter}`);
-      e2eSelectors.variableEditor.resourceGroup
-        .input()
-        .find('input')
-        .type(`${options?.resourceGroup}{enter}`);
-      e2eSelectors.variableEditor.namespace
-        .input()
-        .find('input')
-        .type(`${options?.namespace}{enter}`);
-      e2eSelectors.variableEditor.region
-        .input()
-        .find('input')
-        .type(`${options?.region}{enter}`);
+      e2eSelectors.variableEditor.subscription.input().find('input').type(`${options?.subscription}{enter}`);
+      e2eSelectors.variableEditor.resourceGroup.input().find('input').type(`${options?.resourceGroup}{enter}`);
+      e2eSelectors.variableEditor.namespace.input().find('input').type(`${options?.namespace}{enter}`);
+      e2eSelectors.variableEditor.region.input().find('input').type(`${options?.region}{enter}`);
       break;
     case AzureQueryType.MetricNamesQuery:
-      e2eSelectors.variableEditor.subscription
-        .input()
-        .find('input')
-        .type(`${options?.subscription}{enter}`);
-      e2eSelectors.variableEditor.resourceGroup
-        .input()
-        .find('input')
-        .type(`${options?.resourceGroup}{enter}`);
-      e2eSelectors.variableEditor.namespace
-        .input()
-        .find('input')
-        .type(`${options?.namespace}{enter}`);
-      e2eSelectors.variableEditor.resource
-        .input()
-        .find('input')
-        .type(`${options?.resource}{enter}`);
+      e2eSelectors.variableEditor.subscription.input().find('input').type(`${options?.subscription}{enter}`);
+      e2eSelectors.variableEditor.resourceGroup.input().find('input').type(`${options?.resourceGroup}{enter}`);
+      e2eSelectors.variableEditor.namespace.input().find('input').type(`${options?.namespace}{enter}`);
+      e2eSelectors.variableEditor.resource.input().find('input').type(`${options?.resource}{enter}`);
       break;
   }
   e2e.pages.Dashboard.Settings.Variables.Edit.General.submitButton().click();
diff --git a/e2e/cypress/plugins/compareScreenshots.js b/e2e/cypress/plugins/compareScreenshots.js
deleted file mode 100644
index 426d12adac57e..0000000000000
--- a/e2e/cypress/plugins/compareScreenshots.js
+++ /dev/null
@@ -1,49 +0,0 @@
-'use strict';
-const BlinkDiff = require('blink-diff');
-const { resolve } = require('path');
-
-// @todo use npmjs.com/pixelmatch or an available cypress plugin
-const compareScreenshots = async ({ config, screenshotsFolder, specName }) => {
-  const name = config.name || config; // @todo use `??`
-  const threshold = config.threshold || 0.001; // @todo use `??`
-
-  const imageAPath = `${screenshotsFolder}/${specName}/${name}.png`;
-  const imageBPath = resolve(`${screenshotsFolder}/../expected/${specName}/${name}.png`);
-
-  const imageOutputPath = screenshotsFolder.endsWith('actual') ? imageAPath.replace('.png', '.diff.png') : undefined;
-
-  const { code } = await new Promise((resolve, reject) => {
-    new BlinkDiff({
-      imageAPath,
-      imageBPath,
-      imageOutputPath,
-      threshold,
-      thresholdType: BlinkDiff.THRESHOLD_PERCENT,
-    }).run((error, result) => {
-      if (error) {
-        reject(error);
-      } else {
-        resolve(result);
-      }
-    });
-  });
-
-  if (code <= 1) {
-    let msg = `\nThe screenshot [${imageAPath}] differs from [${imageBPath}]`;
-    msg += '\n';
-    msg += '\nCheck the Artifacts tab in the CircleCi build output for the actual screenshots.';
-    msg += '\n';
-    msg += '\n  If the difference between expected and outcome is NOT acceptable then do the following:';
-    msg += '\n    - Check the code for changes that causes this difference, fix that and retry.';
-    msg += '\n';
-    msg += '\n  If the difference between expected and outcome is acceptable then do the following:';
-    msg += '\n    - Replace the expected image with the outcome and retry.';
-    msg += '\n';
-    throw new Error(msg);
-  } else {
-    // Must return a value
-    return true;
-  }
-};
-
-module.exports = compareScreenshots;
diff --git a/e2e/cypress/plugins/index.js b/e2e/cypress/plugins/index.js
index 7ec85fecae132..596d58acca953 100644
--- a/e2e/cypress/plugins/index.js
+++ b/e2e/cypress/plugins/index.js
@@ -2,7 +2,6 @@ const fs = require('fs');
 const path = require('path');
 
 const benchmarkPlugin = require('./benchmark');
-const compareScreenshots = require('./compareScreenshots');
 const extendConfig = require('./extendConfig');
 const readProvisions = require('./readProvisions');
 const typescriptPreprocessor = require('./typescriptPreprocessor');
@@ -13,7 +12,6 @@ module.exports = (on, config) => {
   }
 
   on('file:preprocessor', typescriptPreprocessor);
-  on('task', { compareScreenshots, readProvisions });
   on('task', {
     log({ message, optional }) {
       optional ? console.log(message, optional) : console.log(message);
diff --git a/e2e/cypress/support/commands.js b/e2e/cypress/support/commands.js
index 27f72b2489062..0f2e21f78342b 100644
--- a/e2e/cypress/support/commands.js
+++ b/e2e/cypress/support/commands.js
@@ -1,13 +1,5 @@
 import 'cypress-file-upload';
 
-Cypress.Commands.add('compareScreenshots', (config) => {
-  cy.task('compareScreenshots', {
-    config,
-    screenshotsFolder: Cypress.config('screenshotsFolder'),
-    specName: Cypress.spec.name,
-  });
-});
-
 Cypress.Commands.add('logToConsole', (message, optional) => {
   cy.task('log', { message: '(' + new Date().toISOString() + ') ' + message, optional });
 });
@@ -34,3 +26,9 @@ Cypress.Commands.add('startBenchmarking', (testName) => {
 Cypress.Commands.add('stopBenchmarking', (testName, appStats) => {
   return cy.task('stopBenchmarking', { testName, appStats });
 });
+
+Cypress.Commands.add('setLocalStorage', (key, value) => {
+  cy.window().then((win) => {
+    win.localStorage.setItem(key, value);
+  });
+});
diff --git a/e2e/cypress/support/e2e.js b/e2e/cypress/support/e2e.js
index 695c15704cbb7..39bab3d3c210d 100644
--- a/e2e/cypress/support/e2e.js
+++ b/e2e/cypress/support/e2e.js
@@ -43,3 +43,11 @@ Cypress.on('uncaught:exception', (err) => {
 //   // failing the test
 //   return false;
 // });
+//
+
+beforeEach(() => {
+  if (Cypress.env('SCENES')) {
+    cy.logToConsole('enabling dashboardScene feature toggle in localstorage');
+    cy.setLocalStorage('grafana.featureToggles', 'dashboardScene=true');
+  }
+});
diff --git a/e2e/cypress/support/index.d.ts b/e2e/cypress/support/index.d.ts
index 40dcf83105e73..c7d0acb7bcf54 100644
--- a/e2e/cypress/support/index.d.ts
+++ b/e2e/cypress/support/index.d.ts
@@ -1,18 +1,13 @@
 /// <reference types="cypress" />
 
-interface CompareScreenshotsConfig {
-  name: string;
-  threshold?: number;
-}
-
 declare namespace Cypress {
   interface Chainable {
-    compareScreenshots(config: CompareScreenshotsConfig | string): Chainable;
     logToConsole(message: string, optional?: unknown): void;
     readProvisions(filePaths: string[]): Chainable;
     getJSONFilesFromDir(dirPath: string): Chainable;
     startBenchmarking(testName: string): void;
     stopBenchmarking(testName: string, appStats: Record<string, unknown>): void;
     checkHealthRetryable(fn: Function, retryCount: number): Chainable;
+    setLocalStorage(key: string, value: string);
   }
 }
diff --git a/e2e/dashboards-suite/dashboard-browse.spec.ts b/e2e/dashboards-suite/dashboard-browse.spec.ts
index 867a274a2d1fe..4e9728b7a6559 100644
--- a/e2e/dashboards-suite/dashboard-browse.spec.ts
+++ b/e2e/dashboards-suite/dashboard-browse.spec.ts
@@ -16,11 +16,11 @@ describe('Dashboard browse', () => {
     e2e.pages.BrowseDashboards.table.row('E2E Test - Import Dashboard').should('be.visible');
 
     // gdev dashboards folder is collapsed - its content should not be visible
-    e2e.pages.BrowseDashboards.table.row('Alerting with TestData').should('not.exist');
+    e2e.pages.BrowseDashboards.table.row('Bar Gauge Demo').should('not.exist');
 
     // should click a folder and see it's children
     e2e.pages.BrowseDashboards.table.row('gdev dashboards').find('[aria-label^="Expand folder"]').click();
-    e2e.pages.BrowseDashboards.table.row('Alerting with TestData').should('be.visible');
+    e2e.pages.BrowseDashboards.table.row('Bar Gauge Demo').should('be.visible');
 
     // Open the new folder drawer
     cy.contains('button', 'New').click();
diff --git a/e2e/dashboards-suite/dashboard-live-streaming.spec.ts b/e2e/dashboards-suite/dashboard-live-streaming.spec.ts
new file mode 100644
index 0000000000000..b91ccf5c270e9
--- /dev/null
+++ b/e2e/dashboards-suite/dashboard-live-streaming.spec.ts
@@ -0,0 +1,16 @@
+import testDashboard from '../dashboards/DashboardLiveTest.json';
+import { e2e } from '../utils';
+
+describe('Dashboard Live streaming support', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+    e2e.flows.importDashboard(testDashboard, 1000);
+  });
+
+  it('Should receive streaming data', () => {
+    e2e.flows.openDashboard({ uid: 'live-e2e-test' });
+    cy.wait(1000);
+    e2e.components.Panels.Panel.title('Live').should('exist');
+    e2e.components.Panels.Visualization.Table.body().find('[role="row"]').should('have.length.at.least', 5);
+  });
+});
diff --git a/e2e/dashboards-suite/dashboard-public-create.spec.ts b/e2e/dashboards-suite/dashboard-public-create.spec.ts
index 68cb2c6ae5165..7f95df2c61112 100644
--- a/e2e/dashboards-suite/dashboard-public-create.spec.ts
+++ b/e2e/dashboards-suite/dashboard-public-create.spec.ts
@@ -14,7 +14,7 @@ describe('Public dashboards', () => {
     cy.wait('@query');
 
     // Open sharing modal
-    e2e.pages.ShareDashboardModal.shareButton().click();
+    e2e.pages.Dashboard.DashNav.shareButton().click();
 
     // Select public dashboards tab
     e2e.pages.ShareDashboardModal.PublicDashboard.Tab().click();
@@ -74,7 +74,7 @@ describe('Public dashboards', () => {
     e2e.pages.Dashboard.DashNav.publicDashboardTag().should('exist');
 
     // Open sharing modal
-    e2e.pages.ShareDashboardModal.shareButton().click();
+    e2e.pages.Dashboard.DashNav.shareButton().click();
 
     // Select public dashboards tab
     cy.intercept('GET', '/api/dashboards/uid/ZqZnVvFZz/public-dashboards').as('query-public-dashboard');
@@ -114,7 +114,7 @@ describe('Public dashboards', () => {
     cy.wait('@query');
 
     // Open sharing modal
-    e2e.pages.ShareDashboardModal.shareButton().click();
+    e2e.pages.Dashboard.DashNav.shareButton().click();
 
     // Select public dashboards tab
     cy.intercept('GET', '/api/dashboards/uid/ZqZnVvFZz/public-dashboards').as('query-public-dashboard');
diff --git a/e2e/dashboards-suite/dashboard-public-templating.spec.ts b/e2e/dashboards-suite/dashboard-public-templating.spec.ts
index d02533f27438e..ba819895fc2a9 100644
--- a/e2e/dashboards-suite/dashboard-public-templating.spec.ts
+++ b/e2e/dashboards-suite/dashboard-public-templating.spec.ts
@@ -10,7 +10,7 @@ describe('Create a public dashboard with template variables shows a template var
     e2e.flows.openDashboard({ uid: 'HYaGDGIMk' });
 
     // Open sharing modal
-    e2e.pages.ShareDashboardModal.shareButton().click();
+    e2e.pages.Dashboard.DashNav.shareButton().click();
 
     // Select public dashboards tab
     e2e.pages.ShareDashboardModal.PublicDashboard.Tab().click();
diff --git a/e2e/dashboards-suite/dashboard-templating.spec.ts b/e2e/dashboards-suite/dashboard-templating.spec.ts
index 7fa46d86ea3c7..71b9fcbf7db8a 100644
--- a/e2e/dashboards-suite/dashboard-templating.spec.ts
+++ b/e2e/dashboards-suite/dashboard-templating.spec.ts
@@ -31,7 +31,7 @@ describe('Dashboard templating', () => {
       `Server:percentencode = %7BA%27A%22A%2CBB%5CB%2CCCC%7D`,
       `Server:singlequote = 'A\\'A"A','BB\\B','CCC'`,
       `Server:doublequote = "A'A\\"A","BB\\B","CCC"`,
-      `Server:sqlstring = 'A''A"A','BB\\\B','CCC'`,
+      `Server:sqlstring = 'A''A\\"A','BB\\\B','CCC'`,
       `Server:date = NaN`,
       `Server:text = All`,
       `Server:queryparam = var-Server=All`,
diff --git a/e2e/dashboards-suite/dashboard-time-zone.spec.ts b/e2e/dashboards-suite/dashboard-time-zone.spec.ts
index 4f30f9d9275f6..3c2844188e3c3 100644
--- a/e2e/dashboards-suite/dashboard-time-zone.spec.ts
+++ b/e2e/dashboards-suite/dashboard-time-zone.spec.ts
@@ -16,7 +16,7 @@ describe('Dashboard time zone support', () => {
     e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
   });
 
-  it('Tests dashboard time zone scenarios', () => {
+  it.skip('Tests dashboard time zone scenarios', () => {
     e2e.flows.openDashboard({ uid: '5SdHCasdf' });
 
     const fromTimeZone = 'UTC';
@@ -112,6 +112,41 @@ describe('Dashboard time zone support', () => {
     // Need to wait for 2 calls as there's 2 panels
     cy.wait(['@dataQuery', '@dataQuery']);
 
+    e2e.components.Panels.Panel.title('Panel with relative time override')
+      .should('be.visible')
+      .within(() => {
+        cy.contains('[role="row"]', '00:00:00').should('be.visible');
+      });
+
+    e2e.components.Panels.Panel.title('Panel in timezone')
+      .should('be.visible')
+      .within(() => {
+        cy.contains('[role="row"]', '00:00:00').should('be.visible');
+      });
+
+    // Test UTC timezone
+    e2e.flows.setTimeRange({
+      from: 'now-6h',
+      to: 'now',
+      zone: 'Coordinated Universal Time',
+    });
+    // Need to wait for 2 calls as there's 2 panels
+    cy.wait(['@dataQuery', '@dataQuery']);
+
+    e2e.components.Panels.Panel.title('Panel with relative time override')
+      .should('be.visible')
+      .within(() => {
+        cy.contains('[role="row"]', '00:00:00').should('be.visible');
+      });
+
+    // Today so far, still in UTC timezone
+    e2e.flows.setTimeRange({
+      from: 'now/d',
+      to: 'now',
+    });
+    // Need to wait for 2 calls as there's 2 panels
+    cy.wait(['@dataQuery', '@dataQuery']);
+
     e2e.components.Panels.Panel.title('Panel with relative time override')
       .should('be.visible')
       .within(() => {
diff --git a/e2e/dashboards-suite/embedded-dashboard.spec.ts b/e2e/dashboards-suite/embedded-dashboard.spec.ts
new file mode 100644
index 0000000000000..8c52271994c2f
--- /dev/null
+++ b/e2e/dashboards-suite/embedded-dashboard.spec.ts
@@ -0,0 +1,24 @@
+import { selectors } from '@grafana/e2e-selectors';
+
+import { e2e } from '../utils';
+import { fromBaseUrl } from '../utils/support/url';
+
+describe('Embedded dashboard', function () {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  it('open test page', function () {
+    cy.visit(fromBaseUrl('/dashboards/embedding-test'));
+
+    // Verify pie charts are rendered
+    cy.get(
+      `[data-viz-panel-key="panel-11"] [data-testid^="${selectors.components.Panels.Visualization.PieChart.svgSlice}"]`
+    ).should('have.length', 5);
+
+    // Verify no url sync
+    e2e.components.TimePicker.openButton().click();
+    cy.get('label:contains("Last 1 hour")').click();
+    cy.url().should('eq', fromBaseUrl('/dashboards/embedding-test'));
+  });
+});
diff --git a/e2e/dashboards-suite/general-dashboards.spec.ts b/e2e/dashboards-suite/general-dashboards.spec.ts
new file mode 100644
index 0000000000000..00584030c23f8
--- /dev/null
+++ b/e2e/dashboards-suite/general-dashboards.spec.ts
@@ -0,0 +1,33 @@
+import { e2e } from '../utils';
+
+const PAGE_UNDER_TEST = 'edediimbjhdz4b/a-tall-dashboard';
+
+describe('Dashboards', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  it('should restore scroll position', () => {
+    e2e.flows.openDashboard({ uid: PAGE_UNDER_TEST });
+    e2e.components.Panels.Panel.title('Panel #1').should('be.visible');
+
+    // scroll to the bottom
+    e2e.pages.Dashboard.DashNav.navV2()
+      .parent()
+      .parent() // Note, this will probably fail when we change the custom scrollbars
+      .scrollTo('bottom', {
+        timeout: 5 * 1000,
+      });
+
+    // The last panel should be visible...
+    e2e.components.Panels.Panel.title('Panel #50').should('be.visible');
+
+    // Then we open and close the panel editor
+    e2e.components.Panels.Panel.menu('Panel #50').click({ force: true }); // it only shows on hover
+    e2e.components.Panels.Panel.menuItems('Edit').click();
+    e2e.components.PanelEditor.applyButton().click();
+
+    // And the last panel should still be visible!
+    e2e.components.Panels.Panel.title('Panel #50').should('be.visible');
+  });
+});
diff --git a/e2e/dashboards-suite/new-datasource-variable.spec.ts b/e2e/dashboards-suite/new-datasource-variable.spec.ts
index 5f62f6d42a1e6..40260a76520f0 100644
--- a/e2e/dashboards-suite/new-datasource-variable.spec.ts
+++ b/e2e/dashboards-suite/new-datasource-variable.spec.ts
@@ -3,6 +3,9 @@ import { e2e } from '../utils';
 const PAGE_UNDER_TEST = 'kVi2Gex7z/test-variable-output';
 const DASHBOARD_NAME = 'Test variable output';
 
+const gdev_mysql = 'gdev-mysql';
+const gdev_mysql_ds_tests = 'gdev-mysql-ds-tests';
+
 describe('Variables - Datasource', () => {
   beforeEach(() => {
     e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
@@ -20,28 +23,26 @@ describe('Variables - Datasource', () => {
     e2e.pages.Dashboard.Settings.Variables.Edit.General.generalNameInputV2().clear().type('VariableUnderTest').blur();
     e2e.pages.Dashboard.Settings.Variables.Edit.General.generalLabelInputV2().type('Variable under test').blur();
 
-    // If this is failing, but sure to check there are Prometheus datasources named "gdev-prometheus" and "gdev-slow-prometheus"
+    // If this is failing, but sure to check there are MySQL datasources named "gdev-mysql" and "gdev-mysql-ds-tests"
     // Or, just update is to match some gdev datasources to test with :)
     e2e.pages.Dashboard.Settings.Variables.Edit.DatasourceVariable.datasourceSelect().within(() => {
-      cy.get('input').type('Prometheus{enter}');
+      cy.get('input').type('MySQL{enter}');
     });
-    e2e.pages.Dashboard.Settings.Variables.Edit.General.previewOfValuesOption()
-      .eq(0)
-      .should('have.text', 'gdev-prometheus');
-    e2e.pages.Dashboard.Settings.Variables.Edit.General.previewOfValuesOption()
-      .eq(1)
-      .should('have.text', 'gdev-slow-prometheus');
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.previewOfValuesOption().should('contain.text', gdev_mysql);
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.previewOfValuesOption().should(
+      'contain.text',
+      gdev_mysql_ds_tests
+    );
 
     // Navigate back to the homepage and change the selected variable value
     e2e.pages.Dashboard.Settings.Variables.Edit.General.submitButton().click();
     e2e.pages.Dashboard.Settings.Actions.close().click();
     e2e.components.RefreshPicker.runButtonV2().click();
 
-    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('gdev-prometheus').click();
-    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownOptionTexts('gdev-slow-prometheus').click();
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts(gdev_mysql).click();
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownOptionTexts(gdev_mysql_ds_tests).click();
 
     // Assert it was rendered
-    cy.get('.markdown-html').should('include.text', 'VariableUnderTest: gdev-slow-prometheus-uid');
-    cy.get('.markdown-html').should('include.text', 'VariableUnderTestText: gdev-slow-prometheus');
+    cy.get('.markdown-html').should('include.text', `VariableUnderTestText: ${gdev_mysql_ds_tests}`);
   });
 });
diff --git a/e2e/dashboards-suite/new-query-variable.spec.ts b/e2e/dashboards-suite/new-query-variable.spec.ts
index 3ffdda493108c..5239060c2d759 100644
--- a/e2e/dashboards-suite/new-query-variable.spec.ts
+++ b/e2e/dashboards-suite/new-query-variable.spec.ts
@@ -69,7 +69,7 @@ describe('Variables - Query - Add variable', () => {
     });
 
     e2e.pages.Dashboard.Settings.Variables.Edit.General.previewOfValuesOption().should('not.exist');
-    e2e.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsCustomAllInputV2().should('not.exist');
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsCustomAllInput().should('not.exist');
   });
 
   it('adding a single value query variable', () => {
@@ -152,7 +152,7 @@ describe('Variables - Query - Add variable', () => {
       cy.get('input[type="checkbox"]').click({ force: true }).should('be.checked');
     });
 
-    e2e.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsCustomAllInputV2().within((input) => {
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsCustomAllInput().within((input) => {
       expect(input.attr('placeholder')).equals('blank = auto');
       expect(input.val()).equals('');
     });
diff --git a/e2e/dashboards/DashboardLiveTest.json b/e2e/dashboards/DashboardLiveTest.json
new file mode 100644
index 0000000000000..7d98377df892b
--- /dev/null
+++ b/e2e/dashboards/DashboardLiveTest.json
@@ -0,0 +1,107 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "datasource",
+        "uid": "grafana"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "id": 1,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true
+      },
+      "pluginVersion": "10.3.0-pre",
+      "targets": [
+        {
+          "channel": "plugin/testdata/random-20Hz-stream",
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "measurements",
+          "refId": "A"
+        }
+      ],
+      "title": "Live",
+      "type": "table"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 39,
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "New dashboard",
+  "version": 0,
+  "uid": "live-e2e-test",
+  "weekStart": ""
+}
diff --git a/e2e/panels-suite/dashlist.spec.ts b/e2e/panels-suite/dashlist.spec.ts
new file mode 100644
index 0000000000000..ec053d3e5e45f
--- /dev/null
+++ b/e2e/panels-suite/dashlist.spec.ts
@@ -0,0 +1,37 @@
+import { e2e } from '../utils';
+const PAGE_UNDER_TEST = 'a6801696-cc53-4196-b1f9-2403e3909185/panel-tests-dashlist-variables';
+
+describe('DashList panel', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  // this is to prevent the fix for https://github.com/grafana/grafana/issues/76800 from regressing
+  it('should pass current variable values correctly when `Include current template variable values` is set', () => {
+    e2e.flows.openDashboard({ uid: PAGE_UNDER_TEST });
+
+    // check the initial value of the urls contain the variable value correctly
+    e2e.components.Panels.Panel.title('Include time range and variables enabled')
+      .should('be.visible')
+      .within(() => {
+        cy.get('a').each(($el) => {
+          cy.wrap($el).should('have.attr', 'href').and('contain', 'var-server=A');
+        });
+      });
+
+    // update variable to b
+    e2e.pages.Dashboard.SubMenu.submenuItemLabels('server').click();
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownOptionTexts('B').click();
+    // blur the dropdown
+    cy.get('body').click();
+
+    // check the urls are updated with the new variable value
+    e2e.components.Panels.Panel.title('Include time range and variables enabled')
+      .should('be.visible')
+      .within(() => {
+        cy.get('a').each(($el) => {
+          cy.wrap($el).should('have.attr', 'href').and('contain', 'var-server=B');
+        });
+      });
+  });
+});
diff --git a/e2e/datagrid-suite/datagrid-data-change.spec.ts b/e2e/panels-suite/datagrid-data-change.spec.ts
similarity index 94%
rename from e2e/datagrid-suite/datagrid-data-change.spec.ts
rename to e2e/panels-suite/datagrid-data-change.spec.ts
index 48c14f26ee39d..583f30e267f91 100644
--- a/e2e/datagrid-suite/datagrid-data-change.spec.ts
+++ b/e2e/panels-suite/datagrid-data-change.spec.ts
@@ -3,7 +3,8 @@ import { e2e } from '../utils';
 const DASHBOARD_ID = 'c01bf42b-b783-4447-a304-8554cee1843b';
 const DATAGRID_SELECT_SERIES = 'Datagrid Select series';
 
-describe('Datagrid data changes', () => {
+//TODO enable this test when panel goes live
+describe.skip('Datagrid data changes', () => {
   beforeEach(() => {
     e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
   });
diff --git a/e2e/datagrid-suite/datagrid-editing-features.spec.ts b/e2e/panels-suite/datagrid-editing-features.spec.ts
similarity index 98%
rename from e2e/datagrid-suite/datagrid-editing-features.spec.ts
rename to e2e/panels-suite/datagrid-editing-features.spec.ts
index 60c5f73459ece..e3592f60388ca 100644
--- a/e2e/datagrid-suite/datagrid-editing-features.spec.ts
+++ b/e2e/panels-suite/datagrid-editing-features.spec.ts
@@ -3,7 +3,8 @@ import { e2e } from '../utils';
 const DASHBOARD_ID = 'c01bf42b-b783-4447-a304-8554cee1843b';
 const DATAGRID_CANVAS = 'data-grid-canvas';
 
-describe('Datagrid data changes', () => {
+//TODO enable this test when panel goes live
+describe.skip('Datagrid data changes', () => {
   beforeEach(() => {
     e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
   });
diff --git a/e2e/panels-suite/geomap-spatial-operations-transform.spec.ts b/e2e/panels-suite/geomap-spatial-operations-transform.spec.ts
index 79608bbce6871..52ca7ed0fac5d 100644
--- a/e2e/panels-suite/geomap-spatial-operations-transform.spec.ts
+++ b/e2e/panels-suite/geomap-spatial-operations-transform.spec.ts
@@ -10,6 +10,7 @@ describe('Geomap spatial operations', () => {
   it('Tests location auto option', () => {
     e2e.flows.openDashboard({ uid: DASHBOARD_ID, queryParams: { editPanel: 1 } });
     e2e.components.Tab.title('Transform data').should('be.visible').click();
+    e2e.components.Transforms.addTransformationButton().scrollIntoView().should('be.visible').click();
 
     e2e.components.TransformTab.newTransform('Spatial operations').scrollIntoView().should('be.visible').click();
     e2e.components.Transforms.SpatialOperations.actionLabel().type('Prepare spatial field{enter}');
@@ -27,6 +28,7 @@ describe('Geomap spatial operations', () => {
   it('Tests location coords option', () => {
     e2e.flows.openDashboard({ uid: DASHBOARD_ID, queryParams: { editPanel: 1 } });
     e2e.components.Tab.title('Transform data').should('be.visible').click();
+    e2e.components.Transforms.addTransformationButton().scrollIntoView().should('be.visible').click();
 
     e2e.components.TransformTab.newTransform('Spatial operations').scrollIntoView().should('be.visible').click();
     e2e.components.Transforms.SpatialOperations.actionLabel().type('Prepare spatial field{enter}');
@@ -50,6 +52,7 @@ describe('Geomap spatial operations', () => {
   it('Tests geoshash field column appears in table view', () => {
     e2e.flows.openDashboard({ uid: DASHBOARD_ID, queryParams: { editPanel: 1 } });
     e2e.components.Tab.title('Transform data').should('be.visible').click();
+    e2e.components.Transforms.addTransformationButton().scrollIntoView().should('be.visible').click();
 
     e2e.components.TransformTab.newTransform('Spatial operations').scrollIntoView().should('be.visible').click();
     e2e.components.Transforms.SpatialOperations.actionLabel().type('Prepare spatial field{enter}');
@@ -72,6 +75,7 @@ describe('Geomap spatial operations', () => {
   it('Tests location lookup option', () => {
     e2e.flows.openDashboard({ uid: DASHBOARD_ID, queryParams: { editPanel: 1 } });
     e2e.components.Tab.title('Transform data').should('be.visible').click();
+    e2e.components.Transforms.addTransformationButton().scrollIntoView().should('be.visible').click();
 
     e2e.components.TransformTab.newTransform('Spatial operations').scrollIntoView().should('be.visible').click();
     e2e.components.Transforms.SpatialOperations.actionLabel().type('Prepare spatial field{enter}');
diff --git a/e2e/panels-suite/panelEdit_base.spec.ts b/e2e/panels-suite/panelEdit_base.spec.ts
index f3792dae53222..744c41ed8ce43 100644
--- a/e2e/panels-suite/panelEdit_base.spec.ts
+++ b/e2e/panels-suite/panelEdit_base.spec.ts
@@ -39,7 +39,7 @@ describe('Panel edit tests', () => {
         e2e.components.Tab.active().within((li: JQuery<HTMLLIElement>) => {
           expect(li.text()).equals('Transform data0'); // there's no transform so therefore Transform + 0
         });
-        e2e.components.Transforms.card('Merge').scrollIntoView().should('be.visible');
+        e2e.components.Transforms.addTransformationButton().scrollIntoView().should('be.visible');
         e2e.components.QueryTab.content().should('not.exist');
         e2e.components.AlertTab.content().should('not.exist');
         e2e.components.PanelAlertTabContent.content().should('not.exist');
diff --git a/e2e/panels-suite/panelEdit_queries.spec.ts b/e2e/panels-suite/panelEdit_queries.spec.ts
index 6d9fc03a0b532..1700a00ea9ff0 100644
--- a/e2e/panels-suite/panelEdit_queries.spec.ts
+++ b/e2e/panels-suite/panelEdit_queries.spec.ts
@@ -62,16 +62,16 @@ describe('Panel edit tests - queries', () => {
       expect(resultIds.has('B:')).equals(true);
     });
 
-    // Disable row with refId A
-    e2e.components.QueryEditorRow.actionButton('Disable query').eq(1).should('be.visible').click();
+    // Hide response for row with refId A
+    e2e.components.QueryEditorRow.actionButton('Hide response').eq(1).should('be.visible').click();
 
     expectInspectorResultAndClose((keys) => {
       const length = keys.length;
       expect(keys[length - 1].innerText).equals('B:');
     });
 
-    // Enable row with refId B
-    e2e.components.QueryEditorRow.actionButton('Disable query').eq(1).should('be.visible').click();
+    // Show response for row with refId A
+    e2e.components.QueryEditorRow.actionButton('Hide response').eq(1).should('be.visible').click();
 
     expectInspectorResultAndClose((keys) => {
       const length = keys.length;
diff --git a/e2e/panels-suite/panelEdit_transforms.spec.ts b/e2e/panels-suite/panelEdit_transforms.spec.ts
index 5cc191d000d17..eb3029b8d982e 100644
--- a/e2e/panels-suite/panelEdit_transforms.spec.ts
+++ b/e2e/panels-suite/panelEdit_transforms.spec.ts
@@ -6,10 +6,23 @@ describe('Panel edit tests - transformations', () => {
   });
 
   it('Tests transformations editor', () => {
-    e2e.flows.openDashboard({ uid: '5SdHCadmz', queryParams: { editPanel: 3 } });
+    e2e.flows.openDashboard({ uid: 'TkZXxlNG3', queryParams: { editPanel: 47 } });
 
     e2e.components.Tab.title('Transform data').should('be.visible').click();
+    e2e.components.Transforms.addTransformationButton().scrollIntoView().should('be.visible').click();
     e2e.components.TransformTab.newTransform('Reduce').scrollIntoView().should('be.visible').click();
-    e2e.components.Transforms.Reduce.calculationsLabel().should('be.visible');
+    e2e.components.Transforms.Reduce.calculationsLabel().scrollIntoView().should('be.visible');
+    e2e.components.Transforms.Reduce.modeLabel().should('be.visible');
+  });
+
+  it('Tests case where transformations can be disabled and not clear out panel data', () => {
+    e2e.flows.openDashboard({ uid: 'TkZXxlNG3', queryParams: { editPanel: 47 } });
+
+    e2e.components.Tab.title('Transform data').should('be.visible').click();
+    e2e.components.Transforms.addTransformationButton().scrollIntoView().should('be.visible').click();
+    e2e.components.TransformTab.newTransform('Reduce').scrollIntoView().should('be.visible').click();
+    e2e.components.Transforms.disableTransformationButton().should('be.visible').click();
+
+    e2e.components.Panels.Panel.PanelDataErrorMessage().should('not.exist');
   });
 });
diff --git a/e2e/plugin-e2e/mysql/mocks/mysql.mocks.ts b/e2e/plugin-e2e/mysql/mocks/mysql.mocks.ts
new file mode 100644
index 0000000000000..eb213f0aafc80
--- /dev/null
+++ b/e2e/plugin-e2e/mysql/mocks/mysql.mocks.ts
@@ -0,0 +1,72 @@
+export const normalTableName = 'normalTable';
+export const tableNameWithSpecialCharacter = 'table-name';
+export const tablesResponse = {
+  results: {
+    tables: {
+      status: 200,
+      frames: [
+        {
+          schema: {
+            refId: 'tables',
+            meta: {
+              executedQueryString:
+                "SELECT table_name FROM information_schema.tables WHERE table_schema = 'DataMaker' ORDER BY table_name",
+            },
+            fields: [{ name: 'TABLE_NAME', type: 'string', typeInfo: { frame: 'string', nullable: true } }],
+          },
+          data: { values: [[normalTableName, tableNameWithSpecialCharacter]] },
+        },
+      ],
+    },
+  },
+};
+
+export const fieldsResponse = {
+  results: {
+    fields: {
+      status: 200,
+      frames: [
+        {
+          schema: {
+            refId: 'fields',
+            meta: {
+              executedQueryString:
+                "SELECT column_name, data_type FROM information_schema.columns WHERE table_schema = 'DataMaker' AND table_name = 'RandomIntsWithTimes' ORDER BY column_name",
+            },
+            fields: [
+              { name: 'COLUMN_NAME', type: 'string', typeInfo: { frame: 'string', nullable: true } },
+              { name: 'DATA_TYPE', type: 'string', typeInfo: { frame: 'string', nullable: true } },
+            ],
+          },
+          data: {
+            values: [
+              ['createdAt', 'id', 'time', 'updatedAt', 'bigint'],
+              ['datetime', 'int', 'datetime', 'datetime', 'int'],
+            ],
+          },
+        },
+      ],
+    },
+  },
+};
+
+export const datasetResponse = {
+  results: {
+    datasets: {
+      status: 200,
+      frames: [
+        {
+          schema: {
+            refId: 'datasets',
+            meta: {
+              executedQueryString:
+                "SELECT DISTINCT TABLE_SCHEMA from information_schema.TABLES where TABLE_TYPE != 'SYSTEM VIEW' ORDER BY TABLE_SCHEMA",
+            },
+            fields: [{ name: 'TABLE_SCHEMA', type: 'string', typeInfo: { frame: 'string', nullable: true } }],
+          },
+          data: { values: [['DataMaker', 'mysql', 'performance_schema', 'sys']] },
+        },
+      ],
+    },
+  },
+};
diff --git a/e2e/plugin-e2e/mysql/mysql.spec.ts b/e2e/plugin-e2e/mysql/mysql.spec.ts
new file mode 100644
index 0000000000000..ac6d4c20a6a6f
--- /dev/null
+++ b/e2e/plugin-e2e/mysql/mysql.spec.ts
@@ -0,0 +1,90 @@
+import { selectors } from '@grafana/e2e-selectors';
+import { expect, test } from '@grafana/plugin-e2e';
+
+import {
+  tablesResponse,
+  fieldsResponse,
+  datasetResponse,
+  normalTableName,
+  tableNameWithSpecialCharacter,
+} from './mocks/mysql.mocks';
+
+test.beforeEach(async ({ context, selectors, explorePage }) => {
+  await explorePage.datasource.set('gdev-mysql');
+  await context.route(selectors.apis.DataSource.queryPattern, async (route, request) => {
+    switch (request.postDataJSON().queries[0].refId) {
+      case 'tables':
+        return route.fulfill({ json: tablesResponse, status: 200 });
+      case 'fields':
+        return route.fulfill({ json: fieldsResponse, status: 200 });
+      case 'datasets':
+        return route.fulfill({ json: datasetResponse, status: 200 });
+      default:
+        return route.continue();
+    }
+  });
+});
+
+test('code editor autocomplete should handle table name escaping/quoting', async ({ explorePage, selectors, page }) => {
+  await page.getByLabel('Code').check();
+
+  const editor = explorePage.getByTestIdOrAriaLabel(selectors.components.CodeEditor.container).getByRole('textbox');
+  await editor.fill('S');
+  await page.getByLabel('SELECT <column> FROM <table>').locator('a').click();
+  await expect(page.getByLabel(tableNameWithSpecialCharacter)).toBeVisible();
+  await page.keyboard.press('Enter');
+
+  await expect(editor).toHaveValue(`SELECT  FROM grafana.\`${tableNameWithSpecialCharacter}\``);
+
+  for (let i = 0; i < tableNameWithSpecialCharacter.length + 2; i++) {
+    await page.keyboard.press('Backspace');
+  }
+
+  await page.keyboard.press('Control+I');
+  await expect(page.getByLabel(tableNameWithSpecialCharacter)).toBeVisible();
+});
+
+test('visual query builder should handle time filter macro', async ({ explorePage, page }) => {
+  await explorePage.getByTestIdOrAriaLabel(selectors.components.SQLQueryEditor.headerTableSelector).click();
+  await page.getByText(normalTableName, { exact: true }).click();
+
+  // Open column selector
+  await explorePage.getByTestIdOrAriaLabel(selectors.components.SQLQueryEditor.selectColumn).click();
+  const select = page.getByLabel('Select options menu');
+  await select.locator(page.getByText('createdAt')).click();
+
+  // Toggle where row
+  await page.getByLabel('Filter').click();
+
+  // Click add filter button
+  await page.getByRole('button', { name: 'Add filter' }).click();
+  await page.getByRole('button', { name: 'Add filter' }).click(); // For some reason we need to click twice
+
+  // Open field selector
+  await explorePage.getByTestIdOrAriaLabel(selectors.components.SQLQueryEditor.filterField).click();
+  await select.locator(page.getByText('createdAt')).click();
+
+  // Open operator selector
+  await explorePage.getByTestIdOrAriaLabel(selectors.components.SQLQueryEditor.filterOperator).click();
+  await select.locator(page.getByText('Macros')).click();
+
+  // Open macros value selector
+  await explorePage.getByTestIdOrAriaLabel('Macros value selector').click();
+  await select.locator(page.getByText('timeFilter', { exact: true })).click();
+
+  // Validate that the timeFilter macro was added
+  await expect(
+    explorePage.getByTestIdOrAriaLabel(selectors.components.CodeEditor.container).getByRole('textbox')
+  ).toHaveValue(`SELECT\n  createdAt\nFROM\n  DataMaker.normalTable\nWHERE\n  $__timeFilter(createdAt)\nLIMIT\n  50`);
+
+  // Validate that the timeFilter macro was removed when changed to equals operator
+  await explorePage.getByTestIdOrAriaLabel(selectors.components.SQLQueryEditor.filterOperator).click();
+  await select.locator(page.getByText('==')).click();
+
+  await explorePage.getByTestIdOrAriaLabel(selectors.components.DateTimePicker.input).click();
+  await explorePage.getByTestIdOrAriaLabel(selectors.components.DateTimePicker.input).blur();
+
+  await expect(
+    explorePage.getByTestIdOrAriaLabel(selectors.components.CodeEditor.container).getByRole('textbox')
+  ).not.toHaveValue(`SELECT\n  createdAt\nFROM\n  DataMaker.normalTable\nWHERE\n  createdAt = NULL\nLIMIT\n  50`);
+});
diff --git a/e2e/plugin-e2e/plugin-e2e-api-tests/README.md b/e2e/plugin-e2e/plugin-e2e-api-tests/README.md
new file mode 100644
index 0000000000000..477a6c384dc73
--- /dev/null
+++ b/e2e/plugin-e2e/plugin-e2e-api-tests/README.md
@@ -0,0 +1,8 @@
+# @grafana/plugin-e2e API tests
+
+The purpose of the E2E tests in this directory is not to test the plugins per se - it's to verify that the fixtures, models and expect matchers provided by the [`@grafana/plugin-e2e`](https://github.com/grafana/plugin-tools/tree/main/packages/plugin-e2e) package are compatible with the latest version of Grafana. If you find that any of these tests are failing, it's probably due to one of the following reasons:
+
+- you have changed a value of a selector defined in @grafana/e2e-selector
+- you have made structural changes to the UI
+
+For information on how to address this, follow the instructions in the [contributing guidelines](https://github.com/grafana/plugin-tools/blob/main/packages/plugin-e2e/CONTRIBUTING.md#how-to-fix-broken-test-scenarios-after-changes-in-grafana) for the @grafana/plugin-e2e package in the plugin-tools repository.
diff --git a/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/annotationEditPage.spec.ts b/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/annotationEditPage.spec.ts
new file mode 100644
index 0000000000000..1a11fdd6a562d
--- /dev/null
+++ b/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/annotationEditPage.spec.ts
@@ -0,0 +1,53 @@
+import { expect, test } from '@grafana/plugin-e2e';
+import { AlertVariant } from '@grafana/ui';
+
+import {
+  successfulAnnotationQueryWithData,
+  failedAnnotationQueryWithMultipleErrors,
+  successfulAnnotationQueryWithoutData,
+  failedAnnotationQuery,
+} from '../mocks/queries';
+
+interface Scenario {
+  name: string;
+  mock: object;
+  text: string;
+  severity: AlertVariant;
+  status: number;
+}
+
+const scenarios: Scenario[] = [
+  { name: 'error', severity: 'error', mock: failedAnnotationQuery, text: 'Google API Error 400', status: 400 },
+  {
+    name: 'multiple errors',
+    severity: 'error',
+    mock: failedAnnotationQueryWithMultipleErrors,
+    text: 'Google API Error 400Google API Error 401',
+    status: 400,
+  },
+  {
+    name: 'data',
+    severity: 'success',
+    mock: successfulAnnotationQueryWithData,
+    text: '2 events (from 2 fields)',
+    status: 200,
+  },
+  {
+    name: 'empty result',
+    severity: 'warning',
+    mock: successfulAnnotationQueryWithoutData,
+    text: 'No events found',
+    status: 200,
+  },
+];
+
+for (const scenario of scenarios) {
+  test(`annotation query data with ${scenario.name}`, async ({ annotationEditPage, page }) => {
+    annotationEditPage.mockQueryDataResponse(scenario.mock, scenario.status);
+    await annotationEditPage.datasource.set('gdev-testdata');
+    await page.getByLabel('Scenario').last().fill('CSV Content');
+    await page.keyboard.press('Tab');
+    await annotationEditPage.runQuery();
+    await expect(annotationEditPage).toHaveAlert(scenario.severity, { hasText: scenario.text });
+  });
+}
diff --git a/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/datasourceConfigPage.spec.ts b/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/datasourceConfigPage.spec.ts
new file mode 100644
index 0000000000000..1191f153fb422
--- /dev/null
+++ b/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/datasourceConfigPage.spec.ts
@@ -0,0 +1,44 @@
+import { expect, test } from '@grafana/plugin-e2e';
+
+import { formatExpectError } from '../errors';
+
+test.describe('test createDataSourceConfigPage fixture, saveAndTest and toBeOK matcher', () => {
+  test('invalid credentials should return an error', async ({ createDataSourceConfigPage, page }) => {
+    const configPage = await createDataSourceConfigPage({ type: 'prometheus' });
+    await page.getByPlaceholder('http://localhost:9090').fill('http://localhost:9090');
+    await expect(
+      configPage.saveAndTest(),
+      formatExpectError('Expected save data source config to fail when Prometheus server is not running')
+    ).not.toBeOK();
+  });
+
+  test('valid credentials should return a 200 status code', async ({ createDataSourceConfigPage, page }) => {
+    const configPage = await createDataSourceConfigPage({ type: 'prometheus' });
+    configPage.mockHealthCheckResponse({ status: 200 });
+    await page.getByPlaceholder('http://localhost:9090').fill('http://localhost:9090');
+    await expect(
+      configPage.saveAndTest(),
+      formatExpectError('Expected data source config to be successfully saved')
+    ).toBeOK();
+  });
+});
+
+test.describe('test data source with frontend only health check', () => {
+  test('valid credentials should display a success alert on the page', async ({
+    createDataSourceConfigPage,
+    page,
+    selectors,
+  }) => {
+    const configPage = await createDataSourceConfigPage({ type: 'zipkin' });
+    const healthCheckPath = `${selectors.apis.DataSource.proxy(configPage.datasource.uid)}/api/v2/services`;
+    await page.route(healthCheckPath, async (route) => {
+      await route.fulfill({ status: 200, body: 'OK' });
+    });
+    await page.getByPlaceholder('http://localhost:9411').fill('http://localhost:9411');
+    await expect(configPage.saveAndTest({ path: healthCheckPath })).toBeOK();
+    await expect(
+      configPage,
+      formatExpectError('Expected data source config to display success alert after save')
+    ).toHaveAlert('success', { hasNotText: 'Datasource updated' });
+  });
+});
diff --git a/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/explorePage.spec.ts b/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/explorePage.spec.ts
new file mode 100644
index 0000000000000..d8780318f5a59
--- /dev/null
+++ b/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/explorePage.spec.ts
@@ -0,0 +1,15 @@
+import { expect, test } from '@grafana/plugin-e2e';
+
+import { formatExpectError } from '../errors';
+
+test('query data response should be OK when query is valid', async ({ explorePage }) => {
+  await explorePage.datasource.set('gdev-testdata');
+  await expect(explorePage.runQuery(), formatExpectError('Expected Explore query to execute successfully')).toBeOK();
+});
+
+test('query data response should not be OK when query is invalid', async ({ explorePage }) => {
+  await explorePage.datasource.set('gdev-testdata');
+  const queryEditorRow = await explorePage.getQueryEditorRow('A');
+  await queryEditorRow.getByLabel('Labels').fill('invalid-label-format');
+  await expect(explorePage.runQuery(), formatExpectError('Expected Explore query to fail')).not.toBeOK();
+});
diff --git a/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/featureToggles.spec.ts b/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/featureToggles.spec.ts
new file mode 100644
index 0000000000000..48ded217e40d3
--- /dev/null
+++ b/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/featureToggles.spec.ts
@@ -0,0 +1,17 @@
+import { expect, test } from '@grafana/plugin-e2e';
+
+const TRUTHY_CUSTOM_TOGGLE = 'custom_toggle1';
+const FALSY_CUSTOM_TOGGLE = 'custom_toggle2';
+
+// override the feature toggles defined in playwright.config.ts only for tests in this file
+test.use({
+  featureToggles: {
+    [TRUTHY_CUSTOM_TOGGLE]: true,
+    [FALSY_CUSTOM_TOGGLE]: false,
+  },
+});
+
+test('should set and check feature toggles correctly', async ({ isFeatureToggleEnabled }) => {
+  expect(await isFeatureToggleEnabled(TRUTHY_CUSTOM_TOGGLE)).toBeTruthy();
+  expect(await isFeatureToggleEnabled(FALSY_CUSTOM_TOGGLE)).toBeFalsy();
+});
diff --git a/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/panelDataAssertion.spec.ts b/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/panelDataAssertion.spec.ts
new file mode 100644
index 0000000000000..d6135f30a7e4d
--- /dev/null
+++ b/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/panelDataAssertion.spec.ts
@@ -0,0 +1,101 @@
+import { expect, test, DashboardPage } from '@grafana/plugin-e2e';
+
+import { formatExpectError } from '../errors';
+import { successfulDataQuery } from '../mocks/queries';
+
+const REACT_TABLE_DASHBOARD = { uid: 'U_bZIMRMk' };
+
+test.describe('panel edit page', () => {
+  test('table panel data assertions with provisioned dashboard', async ({ gotoPanelEditPage }) => {
+    const panelEditPage = await gotoPanelEditPage({ dashboard: REACT_TABLE_DASHBOARD, id: '4' });
+    await expect(
+      panelEditPage.panel.locator,
+      formatExpectError('Could not locate panel in panel edit page')
+    ).toBeVisible();
+    await expect(
+      panelEditPage.panel.fieldNames,
+      formatExpectError('Could not locate header elements in table panel')
+    ).toContainText(['Field', 'Max', 'Mean', 'Last']);
+  });
+
+  test('table panel data assertions', async ({ panelEditPage }) => {
+    await panelEditPage.mockQueryDataResponse(successfulDataQuery, 200);
+    await panelEditPage.datasource.set('gdev-testdata');
+    await panelEditPage.setVisualization('Table');
+    await panelEditPage.refreshPanel();
+    await expect(
+      panelEditPage.panel.locator,
+      formatExpectError('Could not locate panel in panel edit page')
+    ).toBeVisible();
+    await expect(
+      panelEditPage.panel.fieldNames,
+      formatExpectError('Could not locate header elements in table panel')
+    ).toContainText(['col1', 'col2']);
+    await expect(panelEditPage.panel.data, formatExpectError('Could not locate headers in table panel')).toContainText([
+      'val1',
+      'val2',
+      'val3',
+      'val4',
+    ]);
+  });
+
+  test('timeseries panel - table view assertions', async ({ panelEditPage }) => {
+    await panelEditPage.mockQueryDataResponse(successfulDataQuery, 200);
+    await panelEditPage.datasource.set('gdev-testdata');
+    await panelEditPage.setVisualization('Time series');
+    await panelEditPage.refreshPanel();
+    await panelEditPage.toggleTableView();
+    await expect(
+      panelEditPage.panel.locator,
+      formatExpectError('Could not locate panel in panel edit page')
+    ).toBeVisible();
+    await expect(
+      panelEditPage.panel.fieldNames,
+      formatExpectError('Could not locate header elements in table panel')
+    ).toContainText(['col1', 'col2']);
+    await expect(
+      panelEditPage.panel.data,
+      formatExpectError('Could not locate data elements in table panel')
+    ).toContainText(['val1', 'val2', 'val3', 'val4']);
+  });
+});
+
+test.describe('dashboard page', () => {
+  test('getting panel by title', async ({ gotoDashboardPage }) => {
+    const dashboardPage = await gotoDashboardPage(REACT_TABLE_DASHBOARD);
+    await dashboardPage.goto();
+    const panel = await dashboardPage.getPanelByTitle('Colored background');
+    await expect(panel.fieldNames).toContainText(['Field', 'Max', 'Mean', 'Last']);
+  });
+
+  test('getting panel by id', async ({ gotoDashboardPage }) => {
+    const dashboardPage = await gotoDashboardPage(REACT_TABLE_DASHBOARD);
+    await dashboardPage.goto();
+    const panel = await dashboardPage.getPanelById('4');
+    await expect(panel.fieldNames, formatExpectError('Could not locate header elements in table panel')).toContainText([
+      'Field',
+      'Max',
+      'Mean',
+      'Last',
+    ]);
+  });
+});
+
+test.describe('explore page', () => {
+  test('table panel', async ({ explorePage }) => {
+    const url =
+      'left=%7B"datasource":"grafana","queries":%5B%7B"queryType":"randomWalk","refId":"A","datasource":%7B"type":"datasource","uid":"grafana"%7D%7D%5D,"range":%7B"from":"1547161200000","to":"1576364400000"%7D%7D&orgId=1';
+    await explorePage.goto({
+      queryParams: new URLSearchParams(url),
+    });
+    await expect(
+      explorePage.timeSeriesPanel.locator,
+      formatExpectError('Could not locate time series panel in explore page')
+    ).toBeVisible();
+    await expect(
+      explorePage.tablePanel.locator,
+      formatExpectError('Could not locate table panel in explore page')
+    ).toBeVisible();
+    await expect(explorePage.tablePanel.fieldNames).toContainText(['time', 'A-series']);
+  });
+});
diff --git a/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/panelEditPage.spec.ts b/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/panelEditPage.spec.ts
new file mode 100644
index 0000000000000..bab1b57ac7e8a
--- /dev/null
+++ b/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/panelEditPage.spec.ts
@@ -0,0 +1,86 @@
+import { DashboardPage, expect, test } from '@grafana/plugin-e2e';
+
+import { formatExpectError } from '../errors';
+import { successfulDataQuery } from '../mocks/queries';
+import { scenarios } from '../mocks/resources';
+
+const PANEL_TITLE = 'Table panel E2E test';
+const TABLE_VIZ_NAME = 'Table';
+const STANDARD_OTIONS_CATEGORY = 'Standard options';
+const DISPLAY_NAME_LABEL = 'Display name';
+
+test.describe('query editor query data', () => {
+  test('query data response should be OK when query is valid', async ({ panelEditPage }) => {
+    await panelEditPage.datasource.set('gdev-testdata');
+    await expect(
+      panelEditPage.refreshPanel(),
+      formatExpectError('Expected panel query to execute successfully')
+    ).toBeOK();
+  });
+
+  test('query data response should not be OK and panel error should be displayed when query is invalid', async ({
+    panelEditPage,
+  }) => {
+    await panelEditPage.datasource.set('gdev-testdata');
+    const queryEditorRow = await panelEditPage.getQueryEditorRow('A');
+    await queryEditorRow.getByLabel('Labels').fill('invalid-label-format');
+    await expect(panelEditPage.refreshPanel(), formatExpectError('Expected panel query to fail')).not.toBeOK();
+    await expect(
+      panelEditPage.panel.getErrorIcon(),
+      formatExpectError('Expected panel error to be displayed after query execution')
+    ).toBeVisible();
+  });
+});
+
+test.describe('query editor with mocked responses', () => {
+  test('and resource `scenarios` is mocked', async ({ selectors, dashboardPage }) => {
+    await dashboardPage.mockResourceResponse('scenarios', scenarios);
+    const panelEditPage = await dashboardPage.addPanel();
+    await panelEditPage.datasource.set('gdev-testdata');
+    const queryEditorRow = await panelEditPage.getQueryEditorRow('A');
+    await queryEditorRow.getByLabel('Scenario').last().click();
+    await expect(
+      panelEditPage.getByTestIdOrAriaLabel(selectors.components.Select.option),
+      formatExpectError('Expected certain select options to be displayed after clicking on the select input')
+    ).toHaveText(scenarios.map((s) => s.name));
+  });
+
+  test('mocked query data response', async ({ panelEditPage, selectors }) => {
+    await panelEditPage.mockQueryDataResponse(successfulDataQuery, 200);
+    await panelEditPage.datasource.set('gdev-testdata');
+    await panelEditPage.setVisualization(TABLE_VIZ_NAME);
+    await panelEditPage.refreshPanel();
+    await expect(
+      panelEditPage.panel.getErrorIcon(),
+      formatExpectError('Did not expect panel error to be displayed after query execution')
+    ).not.toBeVisible();
+    await expect(
+      panelEditPage.getByTestIdOrAriaLabel(selectors.components.Panels.Visualization.Table.body),
+      formatExpectError('Expected certain select options to be displayed after clicking on the select input')
+    ).toHaveText('val1val2val3val4');
+  });
+});
+
+test.describe('edit panel plugin settings', () => {
+  test('change viz to table panel, set panel title and collapse section', async ({
+    panelEditPage,
+    selectors,
+    page,
+  }) => {
+    await panelEditPage.setVisualization(TABLE_VIZ_NAME);
+    await expect(
+      panelEditPage.getByTestIdOrAriaLabel(selectors.components.PanelEditor.toggleVizPicker),
+      formatExpectError('Expected panel visualization to be set to table')
+    ).toHaveText(TABLE_VIZ_NAME);
+    await panelEditPage.setPanelTitle(PANEL_TITLE);
+    await expect(
+      panelEditPage.getByTestIdOrAriaLabel(selectors.components.Panels.Panel.title(PANEL_TITLE)),
+      formatExpectError('Expected panel title to be updated')
+    ).toBeVisible();
+    await panelEditPage.collapseSection(STANDARD_OTIONS_CATEGORY);
+    await expect(
+      page.getByText(DISPLAY_NAME_LABEL),
+      formatExpectError('Expected section to be collapsed')
+    ).toBeVisible();
+  });
+});
diff --git a/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/variableEditPage.spec.ts b/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/variableEditPage.spec.ts
new file mode 100644
index 0000000000000..f76a5bc83a0bb
--- /dev/null
+++ b/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/variableEditPage.spec.ts
@@ -0,0 +1,16 @@
+import { expect, test } from '@grafana/plugin-e2e';
+
+import { formatExpectError } from '../errors';
+import { prometheusLabels } from '../mocks/resources';
+
+test('variable query with mocked response', async ({ variableEditPage, page }) => {
+  variableEditPage.mockResourceResponse('api/v1/labels?*', prometheusLabels);
+  await variableEditPage.datasource.set('gdev-prometheus');
+  await variableEditPage.getByTestIdOrAriaLabel('Query type').fill('Label names');
+  await page.keyboard.press('Tab');
+  await variableEditPage.runQuery();
+  await expect(
+    variableEditPage,
+    formatExpectError('Expected variable edit page to display certain label names after query execution')
+  ).toDisplayPreviews(prometheusLabels.data);
+});
diff --git a/e2e/plugin-e2e/plugin-e2e-api-tests/as-viewer-user/permissions.spec.ts b/e2e/plugin-e2e/plugin-e2e-api-tests/as-viewer-user/permissions.spec.ts
new file mode 100644
index 0000000000000..6346151f2cd74
--- /dev/null
+++ b/e2e/plugin-e2e/plugin-e2e-api-tests/as-viewer-user/permissions.spec.ts
@@ -0,0 +1,15 @@
+import { expect, test } from '@grafana/plugin-e2e';
+
+test('should redirect to start page when permissions to navigate to page is missing', async ({ page }) => {
+  await page.goto('/');
+  const homePageTitle = await page.title();
+  await page.goto('/datasources', { waitUntil: 'networkidle' });
+  expect(await page.title()).toEqual(homePageTitle);
+});
+
+test('current user should have viewer role', async ({ page, request }) => {
+  await page.goto('/');
+  const response = await request.get('/api/user/orgs');
+  await expect(response).toBeOK();
+  await expect(await response.json()).toContainEqual(expect.objectContaining({ role: 'Viewer' }));
+});
diff --git a/e2e/plugin-e2e/plugin-e2e-api-tests/errors.ts b/e2e/plugin-e2e/plugin-e2e-api-tests/errors.ts
new file mode 100644
index 0000000000000..db7f985806ae1
--- /dev/null
+++ b/e2e/plugin-e2e/plugin-e2e-api-tests/errors.ts
@@ -0,0 +1,4 @@
+export const formatExpectError = (message: string) => {
+  return `Error while verifying @grafana/plugin-e2e scenarios: ${message}. 
+    See https://github.com/grafana/grafana/blob/main/plugin-e2e/plugin-e2e-api-tests/README.md for more information.`;
+};
diff --git a/e2e/plugin-e2e/plugin-e2e-api-tests/mocks/queries.ts b/e2e/plugin-e2e/plugin-e2e-api-tests/mocks/queries.ts
new file mode 100644
index 0000000000000..d39c8dc02dc24
--- /dev/null
+++ b/e2e/plugin-e2e/plugin-e2e-api-tests/mocks/queries.ts
@@ -0,0 +1,138 @@
+export const successfulDataQuery = {
+  results: {
+    A: {
+      status: 200,
+      frames: [
+        {
+          schema: {
+            refId: 'A',
+            fields: [
+              {
+                name: 'col1',
+                type: 'string',
+                typeInfo: {
+                  frame: 'string',
+                  nullable: true,
+                },
+              },
+              {
+                name: 'col2',
+                type: 'string',
+                typeInfo: {
+                  frame: 'string',
+                  nullable: true,
+                },
+              },
+            ],
+          },
+          data: {
+            values: [
+              ['val1', 'val3'],
+              ['val2', 'val4'],
+            ],
+          },
+        },
+      ],
+    },
+  },
+};
+
+export const failedAnnotationQuery: object = {
+  results: {
+    Anno: {
+      error: 'Google API Error 400',
+      errorSource: '',
+      status: 500,
+    },
+  },
+};
+
+export const failedAnnotationQueryWithMultipleErrors: object = {
+  results: {
+    Anno1: {
+      error: 'Google API Error 400',
+      errorSource: '',
+      status: 400,
+    },
+    Anno2: {
+      error: 'Google API Error 401',
+      errorSource: '',
+      status: 401,
+    },
+  },
+};
+
+export const successfulAnnotationQueryWithData: object = {
+  results: {
+    Anno: {
+      status: 200,
+      frames: [
+        {
+          schema: {
+            refId: 'Anno',
+            fields: [
+              {
+                name: 'time',
+                type: 'time',
+                typeInfo: {
+                  frame: 'time.Time',
+                  nullable: true,
+                },
+              },
+              {
+                name: 'col2',
+                type: 'string',
+                typeInfo: {
+                  frame: 'string',
+                  nullable: true,
+                },
+              },
+            ],
+          },
+          data: {
+            values: [
+              [1702973084093, 1702973084099],
+              ['val1', 'val2'],
+            ],
+          },
+        },
+      ],
+    },
+  },
+};
+
+export const successfulAnnotationQueryWithoutData: object = {
+  results: {
+    Anno: {
+      status: 200,
+      frames: [
+        {
+          schema: {
+            refId: 'Anno',
+            fields: [
+              {
+                name: 'time',
+                type: 'time',
+                typeInfo: {
+                  frame: 'time.Time',
+                  nullable: true,
+                },
+              },
+              {
+                name: 'col2',
+                type: 'string',
+                typeInfo: {
+                  frame: 'string',
+                  nullable: true,
+                },
+              },
+            ],
+          },
+          data: {
+            values: [],
+          },
+        },
+      ],
+    },
+  },
+};
diff --git a/e2e/plugin-e2e/plugin-e2e-api-tests/mocks/resources.ts b/e2e/plugin-e2e/plugin-e2e-api-tests/mocks/resources.ts
new file mode 100644
index 0000000000000..658a74921ea0e
--- /dev/null
+++ b/e2e/plugin-e2e/plugin-e2e-api-tests/mocks/resources.ts
@@ -0,0 +1,19 @@
+export const scenarios = [
+  {
+    description: '',
+    id: 'annotations',
+    name: 'Annotations',
+    stringInput: '',
+  },
+  {
+    description: '',
+    id: 'arrow',
+    name: 'Load Apache Arrow Data',
+    stringInput: '',
+  },
+];
+
+export const prometheusLabels = {
+  status: 'success',
+  data: ['__name__', 'action', 'active', 'address'],
+};
diff --git a/e2e/run-suite b/e2e/run-suite
index a607baa533b1d..d40abcc5fd445 100755
--- a/e2e/run-suite
+++ b/e2e/run-suite
@@ -27,6 +27,7 @@ declare -A env=(
 
 testFilesForSingleSuite="*.spec.ts"
 rootForEnterpriseSuite="./e2e/extensions-suite"
+rootForScenesSuite="./e2e/scenes"
 
 declare -A cypressConfig=(
   [screenshotsFolder]=./e2e/"${args[0]}"/screenshots
@@ -53,6 +54,7 @@ case "$1" in
         echo "Dev mode"
         CMD="cypress open"
         ;;
+
     "benchmark")
         echo "Benchmark"
         PARAMS="--headed --no-runner-ui"
@@ -85,6 +87,13 @@ case "$1" in
         ;;
     "")
         ;;
+   "scenes")
+      env[SCENES]=true
+      cypressConfig[specPattern]=$rootForScenesSuite/*/$testFilesForSingleSuite
+      cypressConfig[video]=false
+      # CMD="cypress open"
+      ;;
+
     *)
         cypressConfig[specPattern]=./e2e/"${args[0]}"/$testFilesForSingleSuite
         cypressConfig[video]=${args[1]}
diff --git a/e2e/scenes/dashboard-suite/Repeating_a_panel_horizontally.spec.ts b/e2e/scenes/dashboard-suite/Repeating_a_panel_horizontally.spec.ts
new file mode 100644
index 0000000000000..2f2adef207a0b
--- /dev/null
+++ b/e2e/scenes/dashboard-suite/Repeating_a_panel_horizontally.spec.ts
@@ -0,0 +1,99 @@
+import { e2e } from '../utils';
+const PAGE_UNDER_TEST = 'WVpf2jp7z/repeating-a-panel-horizontally';
+
+describe('Repeating a panel horizontally', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  it('should be able to repeat a panel horizontally', () => {
+    e2e.flows.openDashboard({ uid: PAGE_UNDER_TEST });
+    let prevLeft = Number.NEGATIVE_INFINITY;
+    let prevTop: number | null = null;
+    const panelTitles = ['Panel Title 1', 'Panel Title 2', 'Panel Title 3'];
+    panelTitles.forEach((title) => {
+      e2e.components.Panels.Panel.title(title)
+        .should('be.visible')
+        .then(($el) => {
+          const { left, top } = $el[0].getBoundingClientRect();
+          expect(left).to.be.greaterThan(prevLeft);
+          if (prevTop !== null) {
+            expect(top).to.be.equal(prevTop);
+          }
+
+          prevLeft = left;
+          prevTop = top;
+        });
+    });
+  });
+
+  it('responds to changes to the variables', () => {
+    e2e.flows.openDashboard({ uid: PAGE_UNDER_TEST });
+    let prevLeft = Number.NEGATIVE_INFINITY;
+    let prevTop: number | null = null;
+    const panelTitles = ['Panel Title 1', 'Panel Title 2', 'Panel Title 3'];
+    panelTitles.forEach((title) => {
+      e2e.components.Panels.Panel.title(title).should('be.visible');
+    });
+
+    // Change to only show panels 1 + 3
+    e2e.pages.Dashboard.SubMenu.submenuItemLabels('horizontal')
+      .parent()
+      .within(() => {
+        cy.get('input').click();
+      });
+
+    e2e.components.Select.option().contains('1').click();
+    e2e.components.Select.option().contains('3').click();
+
+    // blur the dropdown
+    cy.get('body').click();
+
+    const panelsShown = ['Panel Title 1', 'Panel Title 3'];
+    const panelsNotShown = ['Panel Title 2'];
+    panelsShown.forEach((title) => {
+      e2e.components.Panels.Panel.title(title)
+        .should('be.visible')
+        .then(($el) => {
+          const { left, top } = $el[0].getBoundingClientRect();
+          expect(left).to.be.greaterThan(prevLeft);
+          if (prevTop !== null) {
+            expect(top).to.be.equal(prevTop);
+          }
+
+          prevLeft = left;
+          prevTop = top;
+        });
+    });
+    panelsNotShown.forEach((title) => {
+      e2e.components.Panels.Panel.title(title).should('not.exist');
+    });
+  });
+
+  it('loads a dashboard based on the query params correctly', () => {
+    // Have to manually add the queryParams to the url because they have the same name
+    e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?var-horizontal=1&var-horizontal=3` });
+    let prevLeft = Number.NEGATIVE_INFINITY;
+    let prevTop: number | null = null;
+    const panelsShown = ['Panel Title 1', 'Panel Title 3'];
+    const panelsNotShown = ['Panel Title 2'];
+    // Check correct panels are displayed
+    panelsShown.forEach((title) => {
+      e2e.components.Panels.Panel.title(title)
+        .should('be.visible')
+        .then(($el) => {
+          const { left, top } = $el[0].getBoundingClientRect();
+          expect(left).to.be.greaterThan(prevLeft);
+          if (prevTop !== null) {
+            expect(top).to.be.equal(prevTop);
+          }
+
+          prevLeft = left;
+          prevTop = top;
+        });
+    });
+    panelsNotShown.forEach((title) => {
+      e2e.components.Panels.Panel.title(title).should('not.exist');
+    });
+  });
+});
diff --git a/e2e/scenes/dashboard-suite/Repeating_a_panel_vertically.spec.ts b/e2e/scenes/dashboard-suite/Repeating_a_panel_vertically.spec.ts
new file mode 100644
index 0000000000000..325d648bda9cf
--- /dev/null
+++ b/e2e/scenes/dashboard-suite/Repeating_a_panel_vertically.spec.ts
@@ -0,0 +1,98 @@
+import { e2e } from '../utils';
+const PAGE_UNDER_TEST = 'OY8Ghjt7k/repeating-a-panel-vertically';
+
+describe('Repeating a panel vertically', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  it('should be able to repeat a panel vertically', () => {
+    e2e.flows.openDashboard({ uid: PAGE_UNDER_TEST });
+
+    let prevTop = Number.NEGATIVE_INFINITY;
+    let prevLeft: number | null = null;
+    const panelTitles = ['Panel Title 1', 'Panel Title 2', 'Panel Title 3'];
+    panelTitles.forEach((title) => {
+      e2e.components.Panels.Panel.title(title)
+        .should('be.visible')
+        .then(($el) => {
+          const { left, top } = $el[0].getBoundingClientRect();
+          expect(top).to.be.greaterThan(prevTop);
+          if (prevLeft !== null) {
+            expect(left).to.be.equal(prevLeft);
+          }
+          prevLeft = left;
+          prevTop = top;
+        });
+    });
+  });
+
+  it('responds to changes to the variables', () => {
+    e2e.flows.openDashboard({ uid: PAGE_UNDER_TEST });
+
+    let prevTop = Number.NEGATIVE_INFINITY;
+    let prevLeft: number | null = null;
+    const panelTitles = ['Panel Title 1', 'Panel Title 2', 'Panel Title 3'];
+    panelTitles.forEach((title) => {
+      e2e.components.Panels.Panel.title(title).should('be.visible');
+    });
+
+    // Change to only show panels 1 + 3
+    e2e.pages.Dashboard.SubMenu.submenuItemLabels('vertical')
+      .parent()
+      .within(() => {
+        cy.get('input').click();
+      });
+
+    e2e.components.Select.option().contains('1').click();
+    e2e.components.Select.option().contains('3').click();
+
+    // blur the dropdown
+    cy.get('body').click();
+
+    const panelsShown = ['Panel Title 1', 'Panel Title 3'];
+    const panelsNotShown = ['Panel Title 2'];
+    panelsShown.forEach((title) => {
+      e2e.components.Panels.Panel.title(title)
+        .should('be.visible')
+        .then(($el) => {
+          const { left, top } = $el[0].getBoundingClientRect();
+          expect(top).to.be.greaterThan(prevTop);
+          if (prevLeft !== null) {
+            expect(left).to.be.equal(prevLeft);
+          }
+          prevLeft = left;
+          prevTop = top;
+        });
+    });
+    panelsNotShown.forEach((title) => {
+      e2e.components.Panels.Panel.title(title).should('not.exist');
+    });
+  });
+
+  it('loads a dashboard based on the query params correctly', () => {
+    // Have to manually add the queryParams to the url because they have the same name
+    e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?var-vertical=1&var-vertical=3` });
+
+    let prevTop = Number.NEGATIVE_INFINITY;
+    let prevLeft: number | null = null;
+    const panelsShown = ['Panel Title 1', 'Panel Title 3'];
+    const panelsNotShown = ['Panel Title 2'];
+    panelsShown.forEach((title) => {
+      e2e.components.Panels.Panel.title(title)
+        .should('be.visible')
+        .then(($el) => {
+          const { left, top } = $el[0].getBoundingClientRect();
+          expect(top).to.be.greaterThan(prevTop);
+          if (prevLeft !== null) {
+            expect(left).to.be.equal(prevLeft);
+          }
+          prevLeft = left;
+          prevTop = top;
+        });
+    });
+    panelsNotShown.forEach((title) => {
+      e2e.components.Panels.Panel.title(title).should('not.exist');
+    });
+  });
+});
diff --git a/e2e/scenes/dashboard-suite/Repeating_an_empty_row.spec.ts b/e2e/scenes/dashboard-suite/Repeating_an_empty_row.spec.ts
new file mode 100644
index 0000000000000..9048c5149b0f1
--- /dev/null
+++ b/e2e/scenes/dashboard-suite/Repeating_an_empty_row.spec.ts
@@ -0,0 +1,85 @@
+import { e2e } from '../utils';
+const PAGE_UNDER_TEST = 'dtpl2Ctnk/repeating-an-empty-row';
+
+describe.skip('Repeating empty rows', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  it('should be able to repeat empty rows vertically', () => {
+    e2e.flows.openDashboard({ uid: PAGE_UNDER_TEST });
+
+    let prevTop = Number.NEGATIVE_INFINITY;
+    const rowTitles = ['Row title 1', 'Row title 2', 'Row title 3'];
+    rowTitles.forEach((title) => {
+      e2e.components.DashboardRow.title(title)
+        .should('be.visible')
+        .then(($el) => {
+          const { top } = $el[0].getBoundingClientRect();
+          expect(top).to.be.greaterThan(prevTop);
+          prevTop = top;
+        });
+    });
+  });
+
+  it('responds to changes to the variables', () => {
+    e2e.flows.openDashboard({ uid: PAGE_UNDER_TEST });
+
+    let prevTop = Number.NEGATIVE_INFINITY;
+    const rowTitles = ['Row title 1', 'Row title 2', 'Row title 3'];
+
+    rowTitles.forEach((title) => {
+      e2e.components.DashboardRow.title(title).should('be.visible');
+    });
+
+    e2e.pages.Dashboard.SubMenu.submenuItemLabels('row')
+      .parent()
+      .within(() => {
+        cy.get('input').click();
+      });
+
+    e2e.components.Select.option().contains('1').click();
+    e2e.components.Select.option().contains('3').click();
+
+    // blur the dropdown
+    cy.get('body').click();
+
+    const rowsShown = ['Row title 1', 'Row title 3'];
+    const rowsNotShown = ['Row title 2'];
+    rowsShown.forEach((title) => {
+      e2e.components.DashboardRow.title(title)
+        .should('be.visible')
+        .then(($el) => {
+          const { top } = $el[0].getBoundingClientRect();
+          expect(top).to.be.greaterThan(prevTop);
+          prevTop = top;
+        });
+    });
+
+    rowsNotShown.forEach((title) => {
+      e2e.components.DashboardRow.title(title).should('not.exist');
+    });
+  });
+
+  it('loads a dashboard based on the query params correctly', () => {
+    // Have to manually add the queryParams to the url because they have the same name
+    e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?var-row=1&var-row=3` });
+
+    let prevTop = Number.NEGATIVE_INFINITY;
+    const rowsShown = ['Row title 1', 'Row title 3'];
+    const rowsNotShown = ['Row title 2'];
+    rowsShown.forEach((title) => {
+      e2e.components.DashboardRow.title(title)
+        .should('be.visible')
+        .then(($el) => {
+          const { top } = $el[0].getBoundingClientRect();
+          expect(top).to.be.greaterThan(prevTop);
+          prevTop = top;
+        });
+    });
+
+    rowsNotShown.forEach((title) => {
+      e2e.components.DashboardRow.title(title).should('not.exist');
+    });
+  });
+});
diff --git a/e2e/scenes/dashboard-suite/dashboard-browse-nested.spec.ts b/e2e/scenes/dashboard-suite/dashboard-browse-nested.spec.ts
new file mode 100644
index 0000000000000..a18c4108e4ef3
--- /dev/null
+++ b/e2e/scenes/dashboard-suite/dashboard-browse-nested.spec.ts
@@ -0,0 +1,140 @@
+import { e2e } from '../utils';
+
+import { makeNewDashboardRequestBody } from './utils/makeDashboard';
+
+const NUM_ROOT_FOLDERS = 60;
+const NUM_ROOT_DASHBOARDS = 60;
+const NUM_NESTED_FOLDERS = 60;
+const NUM_NESTED_DASHBOARDS = 60;
+
+// TODO enable this test when nested folders goes live
+describe.skip('Dashboard browse (nested)', () => {
+  const dashboardUIDsToCleanUp: string[] = [];
+  const folderUIDsToCleanUp: string[] = [];
+
+  // Add nested folder structure
+  before(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'), false);
+
+    // Add root folders
+    for (let i = 0; i < NUM_ROOT_FOLDERS; i++) {
+      cy.request({
+        method: 'POST',
+        url: '/api/folders',
+        body: {
+          title: `Root folder ${i.toString().padStart(2, '0')}`,
+        },
+        headers: {
+          'Content-Type': 'application/json',
+        },
+      }).then((response) => {
+        folderUIDsToCleanUp.push(response.body.uid);
+      });
+    }
+
+    // Add root dashboards
+    for (let i = 0; i < NUM_ROOT_DASHBOARDS; i++) {
+      cy.request({
+        method: 'POST',
+        url: '/api/dashboards/db',
+        body: makeNewDashboardRequestBody(`Root dashboard ${i.toString().padStart(2, '0')}`),
+        headers: {
+          'Content-Type': 'application/json',
+        },
+      }).then((response) => {
+        dashboardUIDsToCleanUp.push(response.body.uid);
+      });
+    }
+
+    // Add folder with children
+    cy.request({
+      method: 'POST',
+      url: '/api/folders',
+      body: {
+        title: 'A root folder with children',
+      },
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    }).then((response) => {
+      const folderUid = response.body.uid;
+      folderUIDsToCleanUp.push(folderUid);
+      // Add nested folders
+      for (let i = 0; i < NUM_NESTED_FOLDERS; i++) {
+        cy.request({
+          method: 'POST',
+          url: '/api/folders',
+          body: {
+            title: `Nested folder ${i.toString().padStart(2, '0')}`,
+            parentUid: folderUid,
+          },
+          headers: {
+            'Content-Type': 'application/json',
+          },
+        });
+      }
+      // Add nested dashboards
+      for (let i = 0; i < NUM_NESTED_DASHBOARDS; i++) {
+        cy.request({
+          method: 'POST',
+          url: '/api/dashboards/db',
+          body: makeNewDashboardRequestBody(`Nested dashboard ${i.toString().padStart(2, '0')}`, folderUid),
+          headers: {
+            'Content-Type': 'application/json',
+          },
+        });
+      }
+    });
+  });
+
+  // Remove nested folder structure
+  after(() => {
+    // Clean up root dashboards
+    for (const dashboardUID of dashboardUIDsToCleanUp) {
+      e2e.flows.deleteDashboard({
+        uid: dashboardUID,
+        quick: true,
+        title: '',
+      });
+    }
+    // Clean up root folders (cascading delete will remove any nested folders and dashboards)
+    for (const folderUID of folderUIDsToCleanUp) {
+      cy.request({
+        method: 'DELETE',
+        url: `/api/folders/${folderUID}`,
+        qs: {
+          forceDeleteRules: false,
+        },
+      });
+    }
+  });
+
+  it('pagination works correctly for folders and root', () => {
+    e2e.pages.Dashboards.visit();
+
+    cy.contains('A root folder with children').should('be.visible');
+
+    // Expand A root folder with children
+    cy.get('[aria-label="Expand folder A root folder with children"]').click();
+    cy.contains('Nested folder 00').should('be.visible');
+
+    // Scroll the page and check visibility of next set of items
+    e2e.pages.BrowseDashboards.table.body().find('> div').scrollTo(0, 1700);
+    cy.contains('Nested folder 59').should('be.visible');
+    cy.contains('Nested dashboard 00').should('be.visible');
+
+    // Scroll the page and check visibility of next set of items
+    e2e.pages.BrowseDashboards.table.body().find('> div').scrollTo(0, 3800);
+    cy.contains('Nested dashboard 59').should('be.visible');
+    cy.contains('Root folder 00').should('be.visible');
+
+    // Scroll the page and check visibility of next set of items
+    e2e.pages.BrowseDashboards.table.body().find('> div').scrollTo(0, 5900);
+    cy.contains('Root folder 59').should('be.visible');
+    cy.contains('Root dashboard 00').should('be.visible');
+
+    // Scroll the page and check visibility of next set of items
+    e2e.pages.BrowseDashboards.table.body().find('> div').scrollTo(0, 8000);
+    cy.contains('Root dashboard 59').should('be.visible');
+  });
+});
diff --git a/e2e/scenes/dashboard-suite/dashboard-browse.spec.ts b/e2e/scenes/dashboard-suite/dashboard-browse.spec.ts
new file mode 100644
index 0000000000000..4e9728b7a6559
--- /dev/null
+++ b/e2e/scenes/dashboard-suite/dashboard-browse.spec.ts
@@ -0,0 +1,52 @@
+import testDashboard from '../dashboards/TestDashboard.json';
+import { e2e } from '../utils';
+
+describe('Dashboard browse', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  it('Manage Dashboards tests', () => {
+    e2e.flows.importDashboard(testDashboard, 1000, true);
+
+    e2e.pages.Dashboards.visit();
+
+    // Folders and dashboards should be visible
+    e2e.pages.BrowseDashboards.table.row('gdev dashboards').should('be.visible');
+    e2e.pages.BrowseDashboards.table.row('E2E Test - Import Dashboard').should('be.visible');
+
+    // gdev dashboards folder is collapsed - its content should not be visible
+    e2e.pages.BrowseDashboards.table.row('Bar Gauge Demo').should('not.exist');
+
+    // should click a folder and see it's children
+    e2e.pages.BrowseDashboards.table.row('gdev dashboards').find('[aria-label^="Expand folder"]').click();
+    e2e.pages.BrowseDashboards.table.row('Bar Gauge Demo').should('be.visible');
+
+    // Open the new folder drawer
+    cy.contains('button', 'New').click();
+    cy.contains('button', 'New folder').click();
+
+    // And create a new folder
+    e2e.pages.BrowseDashboards.NewFolderForm.nameInput().type('My new folder');
+    e2e.pages.BrowseDashboards.NewFolderForm.form().contains('button', 'Create').click();
+    e2e.components.Alert.alertV2('success').find('button[aria-label="Close alert"]').click();
+    cy.contains('h1', 'My new folder').should('be.visible');
+
+    // Delete the folder and expect to go back to the root
+    cy.contains('button', 'Folder actions').click();
+    cy.contains('button', 'Delete').click();
+    e2e.flows.confirmDelete();
+    cy.contains('h1', 'Dashboards').should('be.visible');
+
+    // Can collapse the gdev folder and delete the dashboard we imported
+    e2e.pages.BrowseDashboards.table.row('gdev dashboards').find('[aria-label^="Collapse folder"]').click();
+    e2e.pages.BrowseDashboards.table
+      .row('E2E Test - Import Dashboard')
+      .find('[type="checkbox"]')
+      .click({ force: true });
+
+    cy.contains('button', 'Delete').click();
+    e2e.flows.confirmDelete();
+    e2e.pages.BrowseDashboards.table.row('E2E Test - Import Dashboard').should('not.exist');
+  });
+});
diff --git a/e2e/scenes/dashboard-suite/dashboard-live-streaming.spec.ts b/e2e/scenes/dashboard-suite/dashboard-live-streaming.spec.ts
new file mode 100644
index 0000000000000..b91ccf5c270e9
--- /dev/null
+++ b/e2e/scenes/dashboard-suite/dashboard-live-streaming.spec.ts
@@ -0,0 +1,16 @@
+import testDashboard from '../dashboards/DashboardLiveTest.json';
+import { e2e } from '../utils';
+
+describe('Dashboard Live streaming support', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+    e2e.flows.importDashboard(testDashboard, 1000);
+  });
+
+  it('Should receive streaming data', () => {
+    e2e.flows.openDashboard({ uid: 'live-e2e-test' });
+    cy.wait(1000);
+    e2e.components.Panels.Panel.title('Live').should('exist');
+    e2e.components.Panels.Visualization.Table.body().find('[role="row"]').should('have.length.at.least', 5);
+  });
+});
diff --git a/e2e/scenes/dashboard-suite/dashboard-public-create.spec.ts b/e2e/scenes/dashboard-suite/dashboard-public-create.spec.ts
new file mode 100644
index 0000000000000..0f90db253f9a4
--- /dev/null
+++ b/e2e/scenes/dashboard-suite/dashboard-public-create.spec.ts
@@ -0,0 +1,153 @@
+import { e2e } from '../utils';
+
+describe('Public dashboards', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  it('Create a public dashboard', () => {
+    // Opening a dashboard without template variables
+    cy.intercept({
+      pathname: '/api/ds/query',
+    }).as('query');
+    e2e.flows.openDashboard({ uid: 'ZqZnVvFZz' });
+    cy.wait('@query');
+
+    // Open sharing modal
+    e2e.components.NavToolbar.shareDashboard().click();
+
+    // Select public dashboards tab
+    e2e.pages.ShareDashboardModal.PublicDashboardScene.Tab().click();
+
+    // Create button should be disabled
+    e2e.pages.ShareDashboardModal.PublicDashboard.CreateButton().should('be.disabled');
+
+    // Create flow shouldn't show these elements
+    e2e.pages.ShareDashboardModal.PublicDashboard.CopyUrlInput().should('not.exist');
+    e2e.pages.ShareDashboardModal.PublicDashboard.CopyUrlButton().should('not.exist');
+    e2e.pages.ShareDashboardModal.PublicDashboard.EnableAnnotationsSwitch().should('not.exist');
+    e2e.pages.ShareDashboardModal.PublicDashboard.EnableTimeRangeSwitch().should('not.exist');
+    e2e.pages.ShareDashboardModal.PublicDashboard.PauseSwitch().should('not.exist');
+    e2e.pages.ShareDashboardModal.PublicDashboard.DeleteButton().should('not.exist');
+
+    // Acknowledge checkboxes
+    e2e.pages.ShareDashboardModal.PublicDashboard.WillBePublicCheckbox().should('be.enabled').click({ force: true });
+    e2e.pages.ShareDashboardModal.PublicDashboard.LimitedDSCheckbox().should('be.enabled').click({ force: true });
+    e2e.pages.ShareDashboardModal.PublicDashboard.CostIncreaseCheckbox().should('be.enabled').click({ force: true });
+
+    e2e.pages.ShareDashboardModal.PublicDashboard.CreateButton().should('be.enabled');
+
+    // Create public dashboard
+    cy.intercept('POST', '/api/dashboards/uid/ZqZnVvFZz/public-dashboards').as('save');
+    e2e.pages.ShareDashboardModal.PublicDashboard.CreateButton().click();
+    cy.wait('@save');
+
+    // These elements shouldn't be rendered after creating public dashboard
+    e2e.pages.ShareDashboardModal.PublicDashboard.WillBePublicCheckbox().should('not.exist');
+    e2e.pages.ShareDashboardModal.PublicDashboard.LimitedDSCheckbox().should('not.exist');
+    e2e.pages.ShareDashboardModal.PublicDashboard.CostIncreaseCheckbox().should('not.exist');
+    e2e.pages.ShareDashboardModal.PublicDashboard.CreateButton().should('not.exist');
+
+    // These elements should be rendered
+    e2e.pages.ShareDashboardModal.PublicDashboard.CopyUrlInput().should('exist');
+    e2e.pages.ShareDashboardModal.PublicDashboard.CopyUrlButton().should('exist');
+    e2e.pages.ShareDashboardModal.PublicDashboard.PauseSwitch().should('exist');
+    e2e.pages.ShareDashboardModal.PublicDashboard.DeleteButton().should('exist');
+    e2e.pages.ShareDashboardModal.PublicDashboard.SettingsDropdown().should('exist');
+
+    e2e.pages.ShareDashboardModal.PublicDashboard.SettingsDropdown().click();
+    // There elements should be rendered once the Settings dropdown is opened
+    e2e.pages.ShareDashboardModal.PublicDashboard.EnableAnnotationsSwitch().should('exist');
+    e2e.pages.ShareDashboardModal.PublicDashboard.EnableTimeRangeSwitch().should('exist');
+  });
+
+  it('Open a public dashboard', () => {
+    // Opening a dashboard without template variables
+    cy.intercept({
+      method: 'POST',
+      pathname: '/api/ds/query',
+    }).as('query');
+    e2e.flows.openDashboard({ uid: 'ZqZnVvFZz' });
+    cy.wait('@query');
+
+    // Tag indicating a dashboard is public
+    e2e.pages.Dashboard.DashNav.publicDashboardTag().should('exist');
+
+    // Open sharing modal
+    e2e.components.NavToolbar.shareDashboard().click();
+
+    // Select public dashboards tab
+    cy.intercept('GET', '/api/dashboards/uid/ZqZnVvFZz/public-dashboards').as('query-public-dashboard');
+    e2e.pages.ShareDashboardModal.PublicDashboardScene.Tab().click();
+    cy.wait('@query-public-dashboard');
+
+    e2e.pages.ShareDashboardModal.PublicDashboard.CopyUrlInput().should('exist');
+    e2e.pages.ShareDashboardModal.PublicDashboard.CopyUrlButton().should('exist');
+    e2e.pages.ShareDashboardModal.PublicDashboard.PauseSwitch().should('exist');
+    e2e.pages.ShareDashboardModal.PublicDashboard.DeleteButton().should('exist');
+    e2e.pages.ShareDashboardModal.PublicDashboard.SettingsDropdown().should('exist');
+
+    e2e.pages.ShareDashboardModal.PublicDashboard.SettingsDropdown().click();
+    // There elements should be rendered once the Settings dropdown is opened
+    e2e.pages.ShareDashboardModal.PublicDashboard.EnableTimeRangeSwitch().should('exist');
+    e2e.pages.ShareDashboardModal.PublicDashboard.EnableAnnotationsSwitch().should('exist');
+
+    // Make a request to public dashboards api endpoint without authentication
+    e2e.pages.ShareDashboardModal.PublicDashboard.CopyUrlInput()
+      .invoke('val')
+      .then((url) => {
+        cy.clearCookies()
+          .request(getPublicDashboardAPIUrl(String(url)))
+          .then((resp) => {
+            expect(resp.status).to.eq(200);
+          });
+      });
+  });
+
+  it('Disable a public dashboard', () => {
+    // Opening a dashboard without template variables
+    cy.intercept({
+      method: 'POST',
+      pathname: '/api/ds/query',
+    }).as('query');
+    e2e.flows.openDashboard({ uid: 'ZqZnVvFZz' });
+    cy.wait('@query');
+
+    // Open sharing modal
+    e2e.components.NavToolbar.shareDashboard().click();
+
+    // Select public dashboards tab
+    cy.intercept('GET', '/api/dashboards/uid/ZqZnVvFZz/public-dashboards').as('query-public-dashboard');
+    e2e.pages.ShareDashboardModal.PublicDashboardScene.Tab().click();
+    cy.wait('@query-public-dashboard');
+
+    // save url before disabling public dashboard
+    e2e.pages.ShareDashboardModal.PublicDashboard.CopyUrlInput()
+      .invoke('val')
+      .then((text) => cy.wrap(text).as('url'));
+
+    // Save public dashboard
+    cy.intercept('PATCH', '/api/dashboards/uid/ZqZnVvFZz/public-dashboards/*').as('update');
+    // Switch off enabling toggle
+    e2e.pages.ShareDashboardModal.PublicDashboard.PauseSwitch().should('be.enabled').click({ force: true });
+    cy.wait('@update');
+
+    // Url should be hidden
+    e2e.pages.ShareDashboardModal.PublicDashboard.CopyUrlInput().should('be.disabled');
+    e2e.pages.ShareDashboardModal.PublicDashboard.CopyUrlButton().should('be.disabled');
+
+    // Make a request to public dashboards api endpoint without authentication
+    cy.get('@url').then((url) => {
+      cy.clearCookies()
+        .request({ url: getPublicDashboardAPIUrl(String(url)), failOnStatusCode: false })
+        .then((resp) => {
+          expect(resp.status).to.eq(403);
+        });
+    });
+  });
+});
+
+const getPublicDashboardAPIUrl = (url: string): string => {
+  let accessToken = url.split('/').pop();
+  return `/api/public/dashboards/${accessToken}`;
+};
diff --git a/e2e/scenes/dashboard-suite/dashboard-public-templating.spec.ts b/e2e/scenes/dashboard-suite/dashboard-public-templating.spec.ts
new file mode 100644
index 0000000000000..4a1949a7fe739
--- /dev/null
+++ b/e2e/scenes/dashboard-suite/dashboard-public-templating.spec.ts
@@ -0,0 +1,29 @@
+import { e2e } from '../utils';
+
+describe('Create a public dashboard with template variables shows a template variable warning', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  it('Create a public dashboard with template variables shows a template variable warning', () => {
+    // Opening a dashboard with template variables
+    e2e.flows.openDashboard({ uid: 'HYaGDGIMk' });
+
+    // Open sharing modal
+    e2e.components.NavToolbar.shareDashboard().click();
+
+    // Select public dashboards tab
+    e2e.pages.ShareDashboardModal.PublicDashboardScene.Tab().click();
+
+    // Warning Alert dashboard cannot be made public because it has template variables
+    e2e.pages.ShareDashboardModal.PublicDashboard.TemplateVariablesWarningAlert().should('be.visible');
+
+    // Configuration elements for public dashboards should not exist
+    e2e.pages.ShareDashboardModal.PublicDashboard.WillBePublicCheckbox().should('exist');
+    e2e.pages.ShareDashboardModal.PublicDashboard.LimitedDSCheckbox().should('exist');
+    e2e.pages.ShareDashboardModal.PublicDashboard.CostIncreaseCheckbox().should('exist');
+    e2e.pages.ShareDashboardModal.PublicDashboard.CreateButton().should('exist');
+
+    e2e.pages.ShareDashboardModal.PublicDashboard.PauseSwitch().should('not.exist');
+  });
+});
diff --git a/e2e/scenes/dashboard-suite/dashboard-templating.spec.ts b/e2e/scenes/dashboard-suite/dashboard-templating.spec.ts
new file mode 100644
index 0000000000000..4e885df125848
--- /dev/null
+++ b/e2e/scenes/dashboard-suite/dashboard-templating.spec.ts
@@ -0,0 +1,60 @@
+import { e2e } from '../utils';
+
+describe('Dashboard templating', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  it('Verify variable interpolation works', () => {
+    // Open dashboard global variables and interpolation
+    e2e.flows.openDashboard({ uid: 'HYaGDGIMk' });
+
+    const items: string[] = [];
+    const expectedItems: string[] = [
+      '__dashboard = Templating - Global variables and interpolation',
+      '__dashboard.name = Templating - Global variables and interpolation',
+      '__dashboard.uid = HYaGDGIMk',
+      '__org.name = Main Org.',
+      '__org.id = 1',
+      '__user.id = 1',
+      '__user.login = admin',
+      '__user.email = admin@localhost',
+      `Server:raw = A'A"A,BB\\B,CCC`,
+      `Server:regex = (A'A"A|BB\\\\B|CCC)`,
+      `Server:lucene = ("A'A\\"A" OR "BB\\\\B" OR "CCC")`,
+      `Server:glob = {A'A"A,BB\\B,CCC}`,
+      `Server:pipe = A'A"A|BB\\B|CCC`,
+      `Server:distributed = A'A"A,Server=BB\\B,Server=CCC`,
+      `Server:csv = A'A"A,BB\\B,CCC`,
+      `Server:html = A&#39;A&quot;A, BB\\B, CCC`,
+      `Server:json = ["A'A\\"A","BB\\\\B","CCC"]`,
+      `Server:percentencode = %7BA%27A%22A%2CBB%5CB%2CCCC%7D`,
+      `Server:singlequote = 'A\\'A"A','BB\\B','CCC'`,
+      `Server:doublequote = "A'A\\"A","BB\\B","CCC"`,
+      `Server:sqlstring = 'A''A\\"A','BB\\\B','CCC'`,
+      `Server:date = NaN`,
+      `Server:text = All`,
+      `Server:queryparam = var-Server=A%27A%22A&var-Server=BB%5CB&var-Server=CCC`,
+      `1 < 2`,
+      `Example: from=now-6h&to=now`,
+    ];
+
+    cy.get('.markdown-html li')
+      .should('have.length', 26)
+      .each((element) => {
+        items.push(element.text());
+      })
+      .then(() => {
+        expectedItems.forEach((expected, index) => {
+          expect(items[index]).to.equal(expected);
+        });
+      });
+
+    // Check link interpolation is working correctly
+    cy.contains('a', 'Example: from=now-6h&to=now').should(
+      'have.attr',
+      'href',
+      'https://example.com/?from=now-6h&to=now'
+    );
+  });
+});
diff --git a/e2e/scenes/dashboard-suite/dashboard-time-zone.spec.ts b/e2e/scenes/dashboard-suite/dashboard-time-zone.spec.ts
new file mode 100644
index 0000000000000..0361e84a23694
--- /dev/null
+++ b/e2e/scenes/dashboard-suite/dashboard-time-zone.spec.ts
@@ -0,0 +1,263 @@
+import {
+  addDays,
+  addHours,
+  differenceInCalendarDays,
+  differenceInMinutes,
+  format,
+  isBefore,
+  parseISO,
+  toDate,
+} from 'date-fns';
+
+import { e2e } from '../utils';
+
+describe('Dashboard time zone support', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  it.skip('Tests dashboard time zone scenarios', () => {
+    e2e.flows.openDashboard({ uid: '5SdHCasdf' });
+
+    const fromTimeZone = 'UTC';
+    const toTimeZone = 'America/Chicago';
+    const offset = offsetBetweenTimeZones(toTimeZone, fromTimeZone);
+
+    const panelsToCheck = [
+      'Random walk series',
+      'Millisecond res x-axis and tooltip',
+      '2 yaxis and axis labels',
+      'Stacking value ontop of nulls',
+      'Null between points',
+      'Legend Table No Scroll Visible',
+    ];
+
+    const timesInUtc: Record<string, string> = {};
+
+    for (const title of panelsToCheck) {
+      e2e.components.Panels.Panel.title(title)
+        .should('be.visible')
+        .within(() => {
+          e2e.components.Panels.Visualization.Graph.xAxis.labels().should('be.visible');
+          e2e.components.Panels.Visualization.Graph.xAxis
+            .labels()
+            .last()
+            .should((element) => {
+              timesInUtc[title] = element.text();
+            });
+        });
+    }
+
+    e2e.components.PageToolbar.item('Dashboard settings').click();
+
+    e2e.components.TimeZonePicker.containerV2()
+      .should('be.visible')
+      .within(() => {
+        e2e.components.Select.singleValue().should('have.text', 'Coordinated Universal Time');
+        e2e.components.Select.input().should('be.visible').click();
+      });
+
+    e2e.components.Select.option().should('be.visible').contains(toTimeZone).click();
+
+    // click to go back to the dashboard.
+    e2e.pages.Dashboard.Settings.Actions.close().click();
+    e2e.components.RefreshPicker.runButtonV2().should('be.visible').click();
+
+    for (const title of panelsToCheck) {
+      e2e.components.Panels.Panel.title(title)
+        .should('be.visible')
+        .within(() => {
+          e2e.components.Panels.Visualization.Graph.xAxis.labels().should('be.visible');
+          e2e.components.Panels.Visualization.Graph.xAxis
+            .labels()
+            .last()
+            .should((element) => {
+              const inUtc = timesInUtc[title];
+              const inTz = element.text();
+              const isCorrect = isTimeCorrect(inUtc, inTz, offset);
+              expect(isCorrect).to.be.equal(true);
+            });
+        });
+    }
+  });
+
+  // TODO: remove skip once https://github.com/grafana/grafana/issues/86420 is done
+  it.skip('Tests relative timezone support and overrides', () => {
+    // Open dashboard
+    e2e.flows.openDashboard({
+      uid: 'd41dbaa2-a39e-4536-ab2b-caca52f1a9c8',
+    });
+
+    cy.intercept('/api/ds/query*').as('dataQuery');
+
+    // Switch to Browser timezone
+    e2e.flows.setTimeRange({
+      from: 'now-6h',
+      to: 'now',
+      zone: 'Browser',
+    });
+    // Need to wait for 2 calls as there's 2 panels
+    cy.wait(['@dataQuery', '@dataQuery']);
+
+    e2e.components.Panels.Panel.title('Panel with relative time override')
+      .should('be.visible')
+      .within(() => {
+        cy.contains('[role="row"]', '00:00:00').should('be.visible');
+      });
+
+    // Today so far, still in Browser timezone
+    e2e.flows.setTimeRange({
+      from: 'now/d',
+      to: 'now',
+    });
+    // Need to wait for 2 calls as there's 2 panels
+    cy.wait(['@dataQuery', '@dataQuery']);
+
+    e2e.components.Panels.Panel.title('Panel with relative time override')
+      .should('be.visible')
+      .within(() => {
+        cy.contains('[role="row"]', '00:00:00').should('be.visible');
+      });
+
+    e2e.components.Panels.Panel.title('Panel in timezone')
+      .should('be.visible')
+      .within(() => {
+        cy.contains('[role="row"]', '00:00:00').should('be.visible');
+      });
+    // Test UTC timezone
+    e2e.flows.setTimeRange({
+      from: 'now-6h',
+      to: 'now',
+      zone: 'Coordinated Universal Time',
+    });
+    // Need to wait for 2 calls as there's 2 panels
+    cy.wait(['@dataQuery', '@dataQuery']);
+
+    e2e.components.Panels.Panel.title('Panel with relative time override')
+      .should('be.visible')
+      .within(() => {
+        cy.contains('[role="row"]', '00:00:00').should('be.visible');
+      });
+
+    // Today so far, still in UTC timezone
+    e2e.flows.setTimeRange({
+      from: 'now/d',
+      to: 'now',
+    });
+    // Need to wait for 2 calls as there's 2 panels
+    cy.wait(['@dataQuery', '@dataQuery']);
+
+    e2e.components.Panels.Panel.title('Panel with relative time override')
+      .should('be.visible')
+      .within(() => {
+        cy.contains('[role="row"]', '00:00:00').should('be.visible');
+      });
+
+    e2e.components.Panels.Panel.title('Panel in timezone')
+      .should('be.visible')
+      .within(() => {
+        cy.contains('[role="row"]', '00:00:00').should('be.visible');
+      });
+
+    // Test Tokyo timezone
+    e2e.flows.setTimeRange({
+      from: 'now-6h',
+      to: 'now',
+      zone: 'Asia/Tokyo',
+    });
+    // Need to wait for 2 calls as there's 2 panels
+    cy.wait(['@dataQuery', '@dataQuery']);
+
+    e2e.components.Panels.Panel.title('Panel with relative time override')
+      .should('be.visible')
+      .within(() => {
+        cy.contains('[role="row"]', '00:00:00').should('be.visible');
+      });
+
+    // Today so far, still in Tokyo timezone
+    e2e.flows.setTimeRange({
+      from: 'now/d',
+      to: 'now',
+    });
+    // Need to wait for 2 calls as there's 2 panels
+    cy.wait(['@dataQuery', '@dataQuery']);
+
+    e2e.components.Panels.Panel.title('Panel with relative time override')
+      .should('be.visible')
+      .within(() => {
+        cy.contains('[role="row"]', '00:00:00').should('be.visible');
+      });
+
+    e2e.components.Panels.Panel.title('Panel in timezone')
+      .should('be.visible')
+      .within(() => {
+        cy.contains('[role="row"]', '00:00:00').should('be.visible');
+      });
+
+    // Test LA timezone
+    e2e.flows.setTimeRange({
+      from: 'now-6h',
+      to: 'now',
+      zone: 'America/Los_Angeles',
+    });
+    // Need to wait for 2 calls as there's 2 panels
+    cy.wait(['@dataQuery', '@dataQuery']);
+
+    e2e.components.Panels.Panel.title('Panel with relative time override')
+      .should('be.visible')
+      .within(() => {
+        cy.contains('[role="row"]', '00:00:00').should('be.visible');
+      });
+
+    // Today so far, still in LA timezone
+    e2e.flows.setTimeRange({
+      from: 'now/d',
+      to: 'now',
+    });
+    // Need to wait for 2 calls as there's 2 panels
+    cy.wait(['@dataQuery', '@dataQuery']);
+
+    e2e.components.Panels.Panel.title('Panel with relative time override')
+      .should('be.visible')
+      .within(() => {
+        cy.contains('[role="row"]', '00:00:00').should('be.visible');
+      });
+
+    e2e.components.Panels.Panel.title('Panel in timezone')
+      .should('be.visible')
+      .within(() => {
+        cy.contains('[role="row"]', '00:00:00').should('be.visible');
+      });
+  });
+});
+
+const isTimeCorrect = (inUtc: string, inTz: string, offset: number): boolean => {
+  if (inUtc === inTz) {
+    // we need to catch issues when timezone isn't changed for some reason like https://github.com/grafana/grafana/issues/35504
+    return false;
+  }
+
+  const reference = format(new Date(), 'yyyy-LL-dd');
+
+  const utcDate = toDate(parseISO(`${reference} ${inUtc}`));
+  const utcDateWithOffset = addHours(toDate(parseISO(`${reference} ${inUtc}`)), offset);
+  const dayDifference = differenceInCalendarDays(utcDate, utcDateWithOffset); // if the utcDate +/- offset is the day before/after then we need to adjust reference
+  const dayOffset = isBefore(utcDateWithOffset, utcDate) ? dayDifference * -1 : dayDifference;
+  const tzDate = addDays(toDate(parseISO(`${reference} ${inTz}`)), dayOffset); // adjust tzDate with any dayOffset
+  const diff = Math.abs(differenceInMinutes(utcDate, tzDate)); // use Math.abs if tzDate is in future
+
+  return diff <= Math.abs(offset * 60);
+};
+
+const offsetBetweenTimeZones = (timeZone1: string, timeZone2: string, when: Date = new Date()): number => {
+  const t1 = convertDateToAnotherTimeZone(when, timeZone1);
+  const t2 = convertDateToAnotherTimeZone(when, timeZone2);
+  return (t1.getTime() - t2.getTime()) / (1000 * 60 * 60);
+};
+
+const convertDateToAnotherTimeZone = (date: Date, timeZone: string): Date => {
+  const dateString = date.toLocaleString('en-US', {
+    timeZone: timeZone,
+  });
+  return new Date(dateString);
+};
diff --git a/e2e/scenes/dashboard-suite/dashboard-timepicker.spec.ts b/e2e/scenes/dashboard-suite/dashboard-timepicker.spec.ts
new file mode 100644
index 0000000000000..e4ffbec629949
--- /dev/null
+++ b/e2e/scenes/dashboard-suite/dashboard-timepicker.spec.ts
@@ -0,0 +1,46 @@
+import { e2e } from '../utils';
+
+describe('Dashboard timepicker', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  it('Shows the correct calendar days with custom timezone set via preferences', () => {
+    e2e.flows.setUserPreferences({
+      timezone: 'Asia/Tokyo',
+    });
+
+    // Open dashboard with time range from 8th to end of 10th.
+    // Will be Tokyo time because of above preference
+    e2e.flows.openDashboard({
+      uid: '5SdHCasdf',
+      timeRange: {
+        zone: 'Default',
+        from: '2022-06-08 00:00:00',
+        to: '2022-06-10 23:59:59',
+      },
+    });
+
+    // Assert that the calendar shows 08 and 09 and 10 as selected days
+    e2e.components.TimePicker.openButton().click();
+    e2e.components.TimePicker.calendar.openButton().first().click();
+    cy.get('.react-calendar__tile--active, .react-calendar__tile--hasActive').should('have.length', 3);
+  });
+
+  it('Shows the correct calendar days with custom timezone set via time picker', () => {
+    // Open dashboard with time range from 2022-06-08 00:00:00 to 2022-06-10 23:59:59 in Tokyo time
+    e2e.flows.openDashboard({
+      uid: '5SdHCasdf',
+      timeRange: {
+        zone: 'Asia/Tokyo',
+        from: '2022-06-08 00:00:00',
+        to: '2022-06-10 23:59:59',
+      },
+    });
+
+    // Assert that the calendar shows 08 and 09 and 10 as selected days
+    e2e.components.TimePicker.openButton().click();
+    e2e.components.TimePicker.calendar.openButton().first().click();
+    cy.get('.react-calendar__tile--active, .react-calendar__tile--hasActive').should('have.length', 3);
+  });
+});
diff --git a/e2e/scenes/dashboard-suite/embedded-dashboard.spec.ts b/e2e/scenes/dashboard-suite/embedded-dashboard.spec.ts
new file mode 100644
index 0000000000000..8c52271994c2f
--- /dev/null
+++ b/e2e/scenes/dashboard-suite/embedded-dashboard.spec.ts
@@ -0,0 +1,24 @@
+import { selectors } from '@grafana/e2e-selectors';
+
+import { e2e } from '../utils';
+import { fromBaseUrl } from '../utils/support/url';
+
+describe('Embedded dashboard', function () {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  it('open test page', function () {
+    cy.visit(fromBaseUrl('/dashboards/embedding-test'));
+
+    // Verify pie charts are rendered
+    cy.get(
+      `[data-viz-panel-key="panel-11"] [data-testid^="${selectors.components.Panels.Visualization.PieChart.svgSlice}"]`
+    ).should('have.length', 5);
+
+    // Verify no url sync
+    e2e.components.TimePicker.openButton().click();
+    cy.get('label:contains("Last 1 hour")').click();
+    cy.url().should('eq', fromBaseUrl('/dashboards/embedding-test'));
+  });
+});
diff --git a/e2e/scenes/dashboard-suite/general-dashboards.spec.ts b/e2e/scenes/dashboard-suite/general-dashboards.spec.ts
new file mode 100644
index 0000000000000..8270a7b1e5ecf
--- /dev/null
+++ b/e2e/scenes/dashboard-suite/general-dashboards.spec.ts
@@ -0,0 +1,35 @@
+import { e2e } from '../utils';
+
+const PAGE_UNDER_TEST = 'edediimbjhdz4b/a-tall-dashboard';
+
+describe('Dashboards', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  it('should restore scroll position', () => {
+    e2e.flows.openDashboard({ uid: PAGE_UNDER_TEST });
+    e2e.components.Panels.Panel.title('Panel #1').should('be.visible');
+
+    // scroll to the bottom
+    e2e.pages.Dashboard.DashNav.scrollContainer()
+      .children()
+      .first()
+      .scrollTo('bottom', {
+        timeout: 5 * 1000,
+      });
+
+    // The last panel should be visible...
+    e2e.components.Panels.Panel.title('Panel #50').should('be.visible');
+
+    // Then we open and close the panel editor
+    e2e.components.Panels.Panel.menu('Panel #50').click({ force: true }); // it only shows on hover
+    e2e.components.Panels.Panel.menuItems('Edit').click();
+    e2e.components.NavToolbar.editDashboard.backToDashboardButton().click();
+
+    // And the last panel should still be visible!
+    // TODO: investigate scroll to on navigating back
+    // e2e.components.Panels.Panel.title('Panel #50').should('be.visible');
+    e2e.components.Panels.Panel.title('Panel #1').should('be.visible');
+  });
+});
diff --git a/e2e/scenes/dashboard-suite/import-dashboard.spec.ts b/e2e/scenes/dashboard-suite/import-dashboard.spec.ts
new file mode 100644
index 0000000000000..6d4bfed5e6887
--- /dev/null
+++ b/e2e/scenes/dashboard-suite/import-dashboard.spec.ts
@@ -0,0 +1,12 @@
+import testDashboard from '../dashboards/TestDashboard.json';
+import { e2e } from '../utils';
+
+describe('Import Dashboards Test', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  it('Ensure you can import a number of json test dashboards from a specific test directory', () => {
+    e2e.flows.importDashboard(testDashboard, 1000);
+  });
+});
diff --git a/e2e/scenes/dashboard-suite/load-options-from-url.spec.ts b/e2e/scenes/dashboard-suite/load-options-from-url.spec.ts
new file mode 100644
index 0000000000000..3d87b896947e2
--- /dev/null
+++ b/e2e/scenes/dashboard-suite/load-options-from-url.spec.ts
@@ -0,0 +1,203 @@
+import { e2e } from '../utils';
+
+const PAGE_UNDER_TEST = '-Y-tnEDWk/templating-nested-template-variables';
+
+describe('Variables - Load options from Url', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  it('default options should be correct', () => {
+    e2e.flows.openDashboard({ uid: PAGE_UNDER_TEST });
+    cy.intercept({
+      method: 'POST',
+      pathname: '/api/ds/query*',
+    }).as('query');
+
+    cy.wait('@query');
+
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('A')
+      .should('be.visible')
+      .children()
+      .children()
+      .first()
+      .click();
+
+    e2e.components.Select.option().parent().should('have.length', 8);
+
+    e2e.components.Select.option()
+      .first()
+      .should('have.text', 'All')
+      .parent()
+      .next()
+      .should('have.text', 'B')
+      .next()
+      .should('have.text', 'C')
+      .next()
+      .should('have.text', 'D');
+
+    cy.get('body').click(0, 0);
+
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('AA')
+      .should('be.visible')
+      .children()
+      .children()
+      .first()
+      .click();
+
+    e2e.components.Select.option().parent().should('have.length', 8);
+    e2e.components.Select.option()
+      .first()
+      .should('have.text', 'All')
+      .parent()
+      .next()
+      .should('have.text', 'AB')
+      .next()
+      .should('have.text', 'AC')
+      .next()
+      .should('have.text', 'AD');
+
+    cy.get('body').click(0, 0);
+
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('$__all')
+      .should('be.visible')
+      .children()
+      .children()
+      .first()
+      .click();
+
+    e2e.components.Select.option().parent().should('have.length', 8);
+
+    e2e.components.Select.option()
+      .first()
+      .should('have.text', 'AAA')
+      .parent()
+      .next()
+      .should('have.text', 'AAB')
+      .next()
+      .should('have.text', 'AAC')
+      .next()
+      .should('have.text', 'AAD');
+  });
+
+  it('options set in url should load correct options', () => {
+    e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?orgId=1&var-datacenter=B&var-server=BB&var-pod=BBB` });
+    cy.intercept({
+      method: 'POST',
+      pathname: '/api/ds/query',
+    }).as('query');
+
+    cy.wait('@query');
+
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('B')
+      .should('be.visible')
+      .children()
+      .children()
+      .first()
+      .click();
+
+    e2e.components.Select.option().parent().should('have.length', 8);
+
+    e2e.components.Select.option()
+      .first()
+      .should('have.text', 'All')
+      .parent()
+      .next()
+      .should('have.text', 'A')
+      .next()
+      .should('have.text', 'C')
+      .next()
+      .should('have.text', 'D');
+
+    cy.get('body').click(0, 0);
+
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('BB')
+      .should('be.visible')
+      .children()
+      .children()
+      .first()
+      .click();
+
+    e2e.components.Select.option().parent().should('have.length', 8);
+
+    e2e.components.Select.option()
+      .first()
+      .should('have.text', 'All')
+      .parent()
+      .next()
+      .should('have.text', 'BA')
+      .next()
+      .should('have.text', 'BC')
+      .next()
+      .should('have.text', 'BD');
+
+    cy.get('body').click(0, 0);
+
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('BBB')
+      .should('be.visible')
+      .children()
+      .children()
+      .first()
+      .click();
+
+    e2e.components.Select.option().parent().should('have.length', 8);
+
+    e2e.components.Select.option()
+      .first()
+      .should('have.text', 'All')
+      .parent()
+      .next()
+      .should('have.text', 'BBA')
+      .next()
+      .should('have.text', 'BBC')
+      .next()
+      .should('have.text', 'BBD');
+  });
+
+  it('options set in url that do not exist should load correct options', () => {
+    // @ts-ignore some typing issue
+    cy.on('uncaught:exception', (err) => {
+      if (err.stack?.indexOf("Couldn't find any field of type string in the results.") !== -1) {
+        // return false to prevent the error from
+        // failing this test
+        return false;
+      }
+
+      return true;
+    });
+
+    e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?orgId=1&var-datacenter=X` });
+    cy.intercept({
+      method: 'POST',
+      pathname: '/api/ds/query',
+    }).as('query');
+
+    cy.wait('@query');
+
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('X')
+      .should('be.visible')
+      .children()
+      .children()
+      .first()
+      .click();
+
+    e2e.components.Select.option().parent().should('have.length', 9);
+
+    e2e.components.Select.option()
+      .first()
+      .should('have.text', 'All')
+      .parent()
+      .next()
+      .should('have.text', 'A')
+      .next()
+      .should('have.text', 'B')
+      .next()
+      .should('have.text', 'C');
+
+    cy.get('body').click();
+
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('$__all')
+      .should('be.visible')
+      .should('have.length', 2);
+  });
+});
diff --git a/e2e/scenes/dashboard-suite/new-constant-variable.spec.ts b/e2e/scenes/dashboard-suite/new-constant-variable.spec.ts
new file mode 100644
index 0000000000000..42693acb6689d
--- /dev/null
+++ b/e2e/scenes/dashboard-suite/new-constant-variable.spec.ts
@@ -0,0 +1,38 @@
+import { e2e } from '../utils';
+
+const PAGE_UNDER_TEST = 'kVi2Gex7z/test-variable-output';
+const DASHBOARD_NAME = 'Test variable output';
+
+describe('Variables - Constant', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  it('can add a new constant variable', () => {
+    e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?orgId=1&editview=variables` });
+    cy.contains(DASHBOARD_NAME).should('be.visible');
+
+    // Create a new "Constant" variable
+    e2e.components.CallToActionCard.buttonV2('Add variable').click();
+
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.generalTypeSelectV2().within(() => {
+      cy.get('input').type('Constant{enter}');
+    });
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.generalNameInputV2().clear().type('VariableUnderTest').blur();
+    e2e.pages.Dashboard.Settings.Variables.Edit.ConstantVariable.constantOptionsQueryInputV2().type('pesto').blur();
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.generalLabelInputV2().type('Variable under test').blur();
+
+    // e2e.pages.Dashboard.Settings.Variables.Edit.General.previewOfValuesOption().eq(0).should('have.text', 'pesto');
+
+    // Navigate back to the homepage and change the selected variable value
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.applyButton().click();
+    e2e.components.NavToolbar.editDashboard.backToDashboardButton().click();
+    e2e.components.RefreshPicker.runButtonV2().click();
+
+    // Assert it was rendered
+    cy.get('.markdown-html').should('include.text', 'VariableUnderTest: pesto');
+
+    // Assert the variable is not visible in the dashboard nav
+    e2e.pages.Dashboard.SubMenu.submenuItemLabels('Variable under test').should('not.exist');
+  });
+});
diff --git a/e2e/scenes/dashboard-suite/new-custom-variable.spec.ts b/e2e/scenes/dashboard-suite/new-custom-variable.spec.ts
new file mode 100644
index 0000000000000..bda748fbdf211
--- /dev/null
+++ b/e2e/scenes/dashboard-suite/new-custom-variable.spec.ts
@@ -0,0 +1,68 @@
+import { e2e } from '../utils';
+
+const PAGE_UNDER_TEST = 'kVi2Gex7z/test-variable-output';
+const DASHBOARD_NAME = 'Test variable output';
+
+function fillInCustomVariable(name: string, label: string, value: string) {
+  e2e.pages.Dashboard.Settings.Variables.Edit.General.generalTypeSelectV2().within(() => {
+    cy.get('input').type('Custom{enter}');
+  });
+  e2e.pages.Dashboard.Settings.Variables.Edit.General.generalNameInputV2().clear().type(name).blur();
+  e2e.pages.Dashboard.Settings.Variables.Edit.General.generalLabelInputV2().type(label).blur();
+  e2e.pages.Dashboard.Settings.Variables.Edit.CustomVariable.customValueInput().type(value).blur();
+}
+
+function assertPreviewValues(expectedValues: string[]) {
+  for (const expected of expectedValues) {
+    const index = expectedValues.indexOf(expected);
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.previewOfValuesOption().eq(index).should('have.text', expected);
+  }
+}
+
+describe('Variables - Custom', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  it('can add a custom template variable', () => {
+    e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?orgId=1&editview=variables` });
+    cy.contains(DASHBOARD_NAME).should('be.visible');
+
+    // Create a new "Custom" variable
+    e2e.components.CallToActionCard.buttonV2('Add variable').click();
+    fillInCustomVariable('VariableUnderTest', 'Variable under test', 'one,two,three');
+    assertPreviewValues(['one', 'two', 'three']);
+
+    // Navigate back to the homepage and change the selected variable value
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.applyButton().click();
+    e2e.components.NavToolbar.editDashboard.backToDashboardButton().click();
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('one').click();
+    e2e.components.Select.option().contains('two').click();
+    // Assert it was rendered
+    cy.get('.markdown-html').should('include.text', 'VariableUnderTest: two');
+  });
+
+  it('can add a custom template variable with labels', () => {
+    e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?orgId=1&editview=variables` });
+    cy.contains(DASHBOARD_NAME).should('be.visible');
+
+    // Create a new "Custom" variable
+    e2e.components.CallToActionCard.buttonV2('Add variable').click();
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.generalTypeSelectV2().within(() => {
+      cy.get('input').type('Custom{enter}');
+    });
+
+    // Set its name, label, and content
+    fillInCustomVariable('VariableUnderTest', 'Variable under test', 'One : 1,Two : 2, Three : 3');
+    assertPreviewValues(['One', 'Two', 'Three']);
+
+    // Navigate back to the homepage and change the selected variable value
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.applyButton().click();
+    e2e.components.NavToolbar.editDashboard.backToDashboardButton().click();
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('1').click();
+    e2e.components.Select.option().contains('Two').click();
+
+    // Assert it was rendered
+    cy.get('.markdown-html').should('include.text', 'VariableUnderTest: 2');
+  });
+});
diff --git a/e2e/scenes/dashboard-suite/new-datasource-variable.spec.ts b/e2e/scenes/dashboard-suite/new-datasource-variable.spec.ts
new file mode 100644
index 0000000000000..3b325c175818c
--- /dev/null
+++ b/e2e/scenes/dashboard-suite/new-datasource-variable.spec.ts
@@ -0,0 +1,49 @@
+import { e2e } from '../utils';
+
+const PAGE_UNDER_TEST = 'kVi2Gex7z/test-variable-output';
+const DASHBOARD_NAME = 'Test variable output';
+
+describe('Variables - Datasource', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  it('can add a new datasource variable', () => {
+    e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?orgId=1&editview=variables` });
+    cy.contains(DASHBOARD_NAME).should('be.visible');
+
+    // Create a new "Datasource" variable
+    e2e.components.CallToActionCard.buttonV2('Add variable').click();
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.generalTypeSelectV2().within(() => {
+      cy.get('input').type('Data source{enter}');
+    });
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.generalNameInputV2().clear().type('VariableUnderTest').blur();
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.generalLabelInputV2().type('Variable under test').blur();
+
+    // If this is failing, but sure to check there are Prometheus datasources named "gdev-prometheus" and "gdev-slow-prometheus"
+    // Or, just update is to match some gdev datasources to test with :)
+    e2e.pages.Dashboard.Settings.Variables.Edit.DatasourceVariable.datasourceSelect().within(() => {
+      cy.get('input').type('Prometheus{enter}');
+    });
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.previewOfValuesOption().should(
+      'contain.text',
+      'gdev-prometheus'
+    );
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.previewOfValuesOption().should(
+      'contain.text',
+      'gdev-slow-prometheus'
+    );
+
+    // Navigate back to the homepage and change the selected variable value
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.applyButton().click();
+    e2e.components.NavToolbar.editDashboard.backToDashboardButton().click();
+    e2e.components.RefreshPicker.runButtonV2().click();
+
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('gdev-prometheus').click();
+    e2e.components.Select.option().contains('gdev-slow-prometheus').click();
+
+    // Assert it was rendered
+    cy.get('.markdown-html').should('include.text', 'VariableUnderTest: gdev-slow-prometheus-uid');
+    cy.get('.markdown-html').should('include.text', 'VariableUnderTestText: gdev-slow-prometheus');
+  });
+});
diff --git a/e2e/scenes/dashboard-suite/new-interval-variable.spec.ts b/e2e/scenes/dashboard-suite/new-interval-variable.spec.ts
new file mode 100644
index 0000000000000..6ac5fe1f5b4cf
--- /dev/null
+++ b/e2e/scenes/dashboard-suite/new-interval-variable.spec.ts
@@ -0,0 +1,50 @@
+import { e2e } from '../utils';
+
+const PAGE_UNDER_TEST = 'kVi2Gex7z/test-variable-output';
+const DASHBOARD_NAME = 'Test variable output';
+
+function assertPreviewValues(expectedValues: string[]) {
+  for (const expected of expectedValues) {
+    const index = expectedValues.indexOf(expected);
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.previewOfValuesOption().eq(index).should('have.text', expected);
+  }
+}
+
+describe('Variables - Interval', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  // TODO: remove skip once https://github.com/grafana/grafana/issues/84727 is done
+  it.skip('can add a new interval variable', () => {
+    e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?orgId=1&editview=variables` });
+    cy.contains(DASHBOARD_NAME).should('be.visible');
+
+    // Create a new "Interval" variable
+    e2e.components.CallToActionCard.buttonV2('Add variable').click();
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.generalTypeSelectV2().within(() => {
+      cy.get('input').type('Interval{enter}');
+    });
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.generalNameInputV2().clear().type('VariableUnderTest').blur();
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.generalLabelInputV2().type('Variable under test').blur();
+
+    e2e.pages.Dashboard.Settings.Variables.Edit.IntervalVariable.intervalsValueInput()
+      .clear()
+      .type('10s,10m,60m,90m,1h30m')
+      .blur();
+
+    assertPreviewValues(['10s', '10m', '60m', '90m', '1h30m']);
+
+    // Navigate back to the homepage and change the selected variable value
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.applyButton().click();
+    e2e.components.NavToolbar.editDashboard.backToDashboardButton().click();
+
+    e2e.components.RefreshPicker.runButtonV2().click();
+
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('10s').click();
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownOptionTexts('1h30m').click();
+
+    // Assert it was rendered
+    cy.get('.markdown-html').should('include.text', 'VariableUnderTest: 1h30m');
+  });
+});
diff --git a/e2e/scenes/dashboard-suite/new-query-variable.spec.ts b/e2e/scenes/dashboard-suite/new-query-variable.spec.ts
new file mode 100644
index 0000000000000..c57fa011d3aed
--- /dev/null
+++ b/e2e/scenes/dashboard-suite/new-query-variable.spec.ts
@@ -0,0 +1,181 @@
+import { selectors } from '@grafana/e2e-selectors';
+
+import { e2e } from '../utils';
+
+const PAGE_UNDER_TEST = '-Y-tnEDWk/templating-nested-template-variables';
+const DASHBOARD_NAME = 'Templating - Nested Template Variables';
+
+describe('Variables - Query - Add variable', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  it('query variable should be default and default fields should be correct', () => {
+    e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?orgId=1&editview=variables` });
+    cy.contains(DASHBOARD_NAME).should('be.visible');
+
+    cy.get(`[data-testid="${selectors.pages.Dashboard.Settings.Variables.List.newButton}"]`)
+      .should('be.visible')
+      .click();
+
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.generalNameInputV2()
+      .should('be.visible')
+      .within((input) => {
+        expect(input.attr('placeholder')).equals('Variable name');
+        expect(input.val()).equals('query0');
+      });
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.generalTypeSelectV2()
+      .should('be.visible')
+      .within((select) => {
+        e2e.components.Select.singleValue().should('have.text', 'Query');
+      });
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.generalLabelInputV2()
+      .should('be.visible')
+      .within((input) => {
+        expect(input.attr('placeholder')).equals('Label name');
+        expect(input.val()).equals('');
+      });
+    cy.get('[placeholder="Descriptive text"]')
+      .should('be.visible')
+      .within((input) => {
+        expect(input.attr('placeholder')).equals('Descriptive text');
+        expect(input.val()).equals('');
+      });
+    cy.get('label').contains('Show on dashboard').should('be.visible');
+
+    e2e.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsDataSourceSelect()
+      .get('input[placeholder="gdev-testdata"]')
+      .scrollIntoView()
+      .should('be.visible');
+
+    cy.get('label').contains('Refresh').scrollIntoView().should('be.visible');
+    cy.get('label').contains('On dashboard load').scrollIntoView().should('be.visible');
+
+    e2e.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsRegExInputV2()
+      .should('be.visible')
+      .within((input) => {
+        const placeholder = '/.*-(?<text>.*)-(?<value>.*)-.*/';
+        expect(input.attr('placeholder')).equals(placeholder);
+        expect(input.val()).equals('');
+      });
+    e2e.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsSortSelectV2()
+      .should('be.visible')
+      .within((select) => {
+        e2e.components.Select.singleValue().should('have.text', 'Disabled');
+      });
+
+    cy.contains('label', 'Multi-value').within(() => {
+      cy.get('input[type="checkbox"]').should('not.be.checked');
+    });
+
+    cy.contains('label', 'Include All option').within(() => {
+      cy.get('input[type="checkbox"]').should('not.be.checked');
+    });
+
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.previewOfValuesOption().should('not.have.text');
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsCustomAllInput().should('not.exist');
+  });
+
+  it('adding a single value query variable', () => {
+    e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?orgId=1&editview=variables` });
+    cy.contains(DASHBOARD_NAME).should('be.visible');
+
+    cy.get(`[data-testid="${selectors.pages.Dashboard.Settings.Variables.List.newButton}"]`)
+      .should('be.visible')
+      .click();
+
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.generalLabelInputV2()
+      .should('be.visible')
+      .clear()
+      .type('a label');
+
+    cy.get('[placeholder="Descriptive text"]').should('be.visible').clear().type('a description');
+
+    e2e.components.DataSourcePicker.container().should('be.visible').type('gdev-testdata{enter}');
+
+    e2e.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsQueryInput()
+      .should('be.visible')
+      .type('*')
+      .blur();
+
+    e2e.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsRegExInputV2()
+      .should('be.visible')
+      .type('/.*C.*/')
+      .blur();
+
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.previewOfValuesOption().should('exist');
+
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.submitButton().scrollIntoView().should('be.visible').click();
+
+    e2e.components.NavToolbar.editDashboard.backToDashboardButton().click();
+
+    e2e.pages.Dashboard.SubMenu.submenuItemLabels('a label').should('be.visible');
+    e2e.pages.Dashboard.SubMenu.submenuItem()
+      .should('have.length', 4)
+      .eq(3)
+      .within(() => {
+        cy.get('input').click();
+      });
+
+    e2e.components.Select.option().should('have.length', 1);
+    e2e.components.Select.option().contains('C');
+  });
+
+  it('adding a multi value query variable', () => {
+    e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?orgId=1&editview=variables` });
+    cy.contains(DASHBOARD_NAME).should('be.visible');
+
+    cy.get(`[data-testid="${selectors.pages.Dashboard.Settings.Variables.List.newButton}"]`)
+      .should('be.visible')
+      .click();
+
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.generalLabelInputV2()
+      .should('be.visible')
+      .clear()
+      .type('a label');
+
+    cy.get('[placeholder="Descriptive text"]').should('be.visible').clear().type('a description');
+
+    e2e.components.DataSourcePicker.container().type('gdev-testdata{enter}');
+
+    e2e.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsQueryInput()
+      .should('be.visible')
+      .type('*')
+      .blur();
+
+    e2e.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsRegExInputV2()
+      .should('be.visible')
+      .type('/.*C.*/')
+      .blur();
+
+    cy.contains('label', 'Multi-value').within(() => {
+      cy.get('input[type="checkbox"]').click({ force: true }).should('be.checked');
+    });
+
+    cy.contains('label', 'Include All option').within(() => {
+      cy.get('input[type="checkbox"]').click({ force: true }).should('be.checked');
+    });
+
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsCustomAllInput().within((input) => {
+      expect(input.attr('placeholder')).equals('blank = auto');
+      expect(input.val()).equals('');
+    });
+
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.previewOfValuesOption().should('exist');
+
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.submitButton().scrollIntoView().should('be.visible').click();
+
+    e2e.components.NavToolbar.editDashboard.backToDashboardButton().click();
+
+    e2e.pages.Dashboard.SubMenu.submenuItemLabels('a label').should('be.visible');
+    e2e.pages.Dashboard.SubMenu.submenuItem()
+      .should('have.length', 4)
+      .eq(3)
+      .within(() => {
+        cy.get('input').click();
+      });
+
+    e2e.components.Select.option().should('have.length', 1);
+    e2e.components.Select.option().contains('All');
+  });
+});
diff --git a/e2e/scenes/dashboard-suite/new-text-box-variable.spec.ts b/e2e/scenes/dashboard-suite/new-text-box-variable.spec.ts
new file mode 100644
index 0000000000000..7da9afa32bfc4
--- /dev/null
+++ b/e2e/scenes/dashboard-suite/new-text-box-variable.spec.ts
@@ -0,0 +1,34 @@
+import { e2e } from '../utils';
+
+const PAGE_UNDER_TEST = 'kVi2Gex7z/test-variable-output';
+const DASHBOARD_NAME = 'Test variable output';
+
+describe('Variables - Text box', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  it('can add a new text box variable', () => {
+    e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?orgId=1&editview=variables` });
+    cy.contains(DASHBOARD_NAME).should('be.visible');
+
+    // Create a new "text box" variable
+    e2e.components.CallToActionCard.buttonV2('Add variable').click();
+
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.generalTypeSelectV2().within(() => {
+      cy.get('input').type('Textbox{enter}');
+    });
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.generalNameInputV2().clear().type('VariableUnderTest').blur();
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.generalLabelInputV2().type('Variable under test').blur();
+    e2e.pages.Dashboard.Settings.Variables.Edit.TextBoxVariable.textBoxOptionsQueryInputV2().type('cat-dog').blur();
+
+    // Navigate back to the homepage and change the selected variable value
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.applyButton().click();
+    e2e.components.NavToolbar.editDashboard.backToDashboardButton().click();
+    e2e.pages.Dashboard.SubMenu.submenuItem().within(() => {
+      cy.get('input').clear().type('dog-cat').blur();
+    });
+    // Assert it was rendered
+    cy.get('.markdown-html').should('include.text', 'VariableUnderTest: dog-cat');
+  });
+});
diff --git a/e2e/scenes/dashboard-suite/set-options-from-ui.spec.ts b/e2e/scenes/dashboard-suite/set-options-from-ui.spec.ts
new file mode 100644
index 0000000000000..ac0775f966bb2
--- /dev/null
+++ b/e2e/scenes/dashboard-suite/set-options-from-ui.spec.ts
@@ -0,0 +1,190 @@
+import { e2e } from '../utils';
+
+const PAGE_UNDER_TEST = '-Y-tnEDWk/templating-nested-template-variables';
+
+describe('Variables - Set options from ui', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  it('clicking a value that is not part of dependents options should change these to All', () => {
+    e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?orgId=1&var-datacenter=A&var-server=AA&var-pod=AAA` });
+
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('A').should('be.visible').click().click();
+    e2e.components.Select.option().contains('B').click();
+    cy.get('body').click();
+
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('B').scrollIntoView().should('be.visible');
+
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('$__all')
+      .should('have.length', 2)
+      .eq(0)
+      .should('be.visible')
+      .within(() => {
+        cy.get('input').click();
+      });
+
+    e2e.components.Select.option().parent().should('have.length', 8);
+    e2e.components.Select.option()
+      .first()
+      .should('have.text', 'BA')
+      .parent()
+      .next()
+      .should('have.text', 'BB')
+      .next()
+      .should('have.text', 'BC');
+
+    cy.get('body').click();
+
+    e2e.pages.Dashboard.SubMenu.submenuItemLabels('pod')
+      .next()
+      .within(() => {
+        cy.get('input').click();
+      });
+
+    // length is 11 because of virtualized select options
+    e2e.components.Select.option().parent().should('have.length', 11);
+
+    e2e.components.Select.option()
+      .first()
+      .should('have.text', 'BAA')
+      .parent()
+      .next()
+      .should('have.text', 'BAB')
+      .next()
+      .should('have.text', 'BAC')
+      .next()
+      .should('have.text', 'BAD')
+      .next()
+      .should('have.text', 'BAE')
+      .next()
+      .should('have.text', 'BAF');
+  });
+
+  it('adding a value that is not part of dependents options should add the new values dependant options', () => {
+    e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?orgId=1&var-datacenter=A&var-server=AA&var-pod=AAA` });
+    cy.intercept({
+      pathname: '/api/ds/query',
+    }).as('query');
+
+    cy.wait('@query');
+
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('A')
+      .should('be.visible')
+      .within(() => {
+        cy.get('input').click();
+      });
+    e2e.components.Select.option().contains('B').click();
+    cy.get('body').click();
+
+    cy.wait('@query');
+
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('A,B').scrollIntoView().should('be.visible');
+
+    e2e.components.LoadingIndicator.icon().should('have.length', 0);
+
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('AA')
+      .should('be.visible')
+      .within(() => {
+        cy.get('input').click();
+      });
+
+    e2e.components.Select.option().should('have.length', 11);
+
+    e2e.components.Select.option()
+      .first()
+      .should('have.text', 'All')
+      .parent()
+      .next()
+      .should('have.text', 'AB')
+      .next()
+      .should('have.text', 'AC')
+      .next()
+      .should('have.text', 'AD');
+
+    cy.get('body').click();
+
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('AAA')
+      .should('be.visible')
+      .within(() => {
+        cy.get('input').click();
+      });
+
+    e2e.components.Select.option().should('have.length', 8);
+
+    e2e.components.Select.option()
+      .first()
+      .should('have.text', 'All')
+      .parent()
+      .next()
+      .should('have.text', 'AAB')
+      .next()
+      .should('have.text', 'AAC');
+  });
+
+  it('removing a value that is part of dependents options should remove the new values dependant options', () => {
+    e2e.flows.openDashboard({
+      uid: `${PAGE_UNDER_TEST}?orgId=1&var-datacenter=A&var-datacenter=B&var-server=AA&var-server=BB&var-pod=AAA&var-pod=BBB`,
+    });
+    cy.intercept({ pathname: '/api/ds/query' }).as('query');
+
+    cy.wait('@query');
+
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('A,B')
+      .should('be.visible')
+      .children()
+      .first()
+      .click();
+
+    cy.get('body').click();
+
+    cy.wait(300);
+    cy.wait('@query');
+
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('B')
+      .scrollIntoView()
+      .should('be.visible')
+      .within(() => {
+        cy.get('input').click();
+      });
+
+    cy.get('body').click();
+
+    e2e.components.LoadingIndicator.icon().should('have.length', 0);
+
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('BB')
+      .should('be.visible')
+      .within(() => {
+        cy.get('input').click();
+      });
+
+    e2e.components.Select.option().should('have.length', 8);
+
+    e2e.components.Select.option()
+      .first()
+      .should('have.text', 'All')
+      .parent()
+      .next()
+      .should('have.text', 'BA')
+      .next()
+      .should('have.text', 'BC');
+
+    cy.get('body').click(0, 0);
+
+    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('BBB')
+      .should('be.visible')
+      .within(() => {
+        cy.get('input').click();
+      });
+    e2e.components.Select.option().should('have.length', 8);
+
+    e2e.components.Select.option()
+      .first()
+      .should('have.text', 'All')
+      .parent()
+      .next()
+      .should('have.text', 'BBA')
+      .next()
+      .should('have.text', 'BBC');
+  });
+});
diff --git a/e2e/scenes/dashboard-suite/templating-dashboard-links-and-variables.spec.ts b/e2e/scenes/dashboard-suite/templating-dashboard-links-and-variables.spec.ts
new file mode 100644
index 0000000000000..87c832d45da1b
--- /dev/null
+++ b/e2e/scenes/dashboard-suite/templating-dashboard-links-and-variables.spec.ts
@@ -0,0 +1,64 @@
+import { e2e } from '../utils';
+
+describe('Templating', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  it('Tests dashboard links and variables in links', () => {
+    cy.intercept({
+      method: 'GET',
+      url: '/api/search?tag=templating&limit=100',
+    }).as('tagsTemplatingSearch');
+    cy.intercept({
+      method: 'GET',
+      url: '/api/search?tag=demo&limit=100',
+    }).as('tagsDemoSearch');
+
+    e2e.flows.openDashboard({ uid: 'yBCC3aKGk' });
+
+    // waiting for network requests first
+    cy.wait(['@tagsTemplatingSearch', '@tagsDemoSearch']);
+
+    const verifyLinks = (variableValue: string) => {
+      e2e.components.DashboardLinks.link()
+        .should('be.visible')
+        .should((links) => {
+          expect(links).to.have.length.greaterThan(13);
+
+          for (let index = 0; index < links.length; index++) {
+            expect(Cypress.$(links[index]).attr('href')).contains(variableValue);
+          }
+        });
+    };
+
+    e2e.components.DashboardLinks.dropDown().should('be.visible').click().wait('@tagsTemplatingSearch');
+
+    // verify all links, should have All value
+    verifyLinks('var-custom=p1&var-custom=p2&var-custom=p3');
+
+    cy.get('body').click();
+
+    e2e.pages.Dashboard.SubMenu.submenuItemLabels('custom')
+      .next()
+      .should('have.text', 'All')
+      .parent()
+      .within(() => {
+        cy.get('input').click();
+      });
+
+    e2e.components.Select.option().contains('p2').click();
+
+    cy.get('body').click();
+
+    e2e.components.NavToolbar.container().click();
+    e2e.components.DashboardLinks.dropDown()
+      .scrollIntoView()
+      .should('be.visible')
+      .click()
+      .wait('@tagsTemplatingSearch');
+
+    // verify all links, should have p2 value
+    verifyLinks('p2');
+  });
+});
diff --git a/e2e/scenes/dashboard-suite/textbox-variables.spec.ts b/e2e/scenes/dashboard-suite/textbox-variables.spec.ts
new file mode 100644
index 0000000000000..f52a5b2a6164d
--- /dev/null
+++ b/e2e/scenes/dashboard-suite/textbox-variables.spec.ts
@@ -0,0 +1,237 @@
+import { e2e } from '../utils';
+
+const PAGE_UNDER_TEST = 'AejrN1AMz';
+
+describe('TextBox - load options scenarios', function () {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  // TODO: remove skip after https://github.com/grafana/grafana/issues/86435
+  it.skip('default options should be correct', function () {
+    e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}/templating-textbox-e2e-scenarios?orgId=1` });
+
+    validateTextboxAndMarkup('default value');
+  });
+
+  it('loading variable from url should be correct', function () {
+    e2e.flows.openDashboard({
+      uid: `${PAGE_UNDER_TEST}/templating-textbox-e2e-scenarios?orgId=1&var-text=not default value`,
+    });
+
+    validateTextboxAndMarkup('not default value');
+  });
+});
+
+describe.skip('TextBox - change query scenarios', function () {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  it('when changing the query value and not saving current as default should revert query value', function () {
+    copyExistingDashboard();
+
+    changeQueryInput();
+
+    e2e.components.BackButton.backArrow().should('be.visible').click({ force: true });
+
+    validateTextboxAndMarkup('changed value');
+
+    saveDashboard(false);
+
+    cy.get<string>('@dashuid').then((dashuid) => {
+      expect(dashuid).not.to.eq(PAGE_UNDER_TEST);
+
+      e2e.flows.openDashboard({ uid: dashuid });
+
+      cy.wait('@load-dash');
+
+      validateTextboxAndMarkup('default value');
+
+      validateVariable('changed value');
+    });
+  });
+
+  it('when changing the query value and saving current as default should change query value', function () {
+    copyExistingDashboard();
+
+    changeQueryInput();
+
+    e2e.components.BackButton.backArrow().should('be.visible').click({ force: true });
+
+    validateTextboxAndMarkup('changed value');
+
+    saveDashboard(true);
+
+    cy.get<string>('@dashuid').then((dashuid) => {
+      expect(dashuid).not.to.eq(PAGE_UNDER_TEST);
+
+      e2e.flows.openDashboard({ uid: dashuid });
+
+      cy.wait('@load-dash');
+
+      validateTextboxAndMarkup('changed value');
+
+      validateVariable('changed value');
+    });
+  });
+});
+
+describe.skip('TextBox - change picker value scenarios', function () {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  it('when changing the input value and not saving current as default should revert query value', function () {
+    copyExistingDashboard();
+
+    changeTextBoxInput();
+
+    validateTextboxAndMarkup('changed value');
+
+    saveDashboard(false);
+
+    cy.get<string>('@dashuid').then((dashuid) => {
+      expect(dashuid).not.to.eq(PAGE_UNDER_TEST);
+
+      e2e.flows.openDashboard({ uid: dashuid });
+
+      cy.wait('@load-dash');
+
+      validateTextboxAndMarkup('default value');
+      validateVariable('default value');
+    });
+  });
+
+  it('when changing the input value and saving current as default should change query value', function () {
+    copyExistingDashboard();
+
+    changeTextBoxInput();
+
+    validateTextboxAndMarkup('changed value');
+
+    saveDashboard(true);
+
+    cy.get<string>('@dashuid').then((dashuid) => {
+      expect(dashuid).not.to.eq(PAGE_UNDER_TEST);
+
+      e2e.flows.openDashboard({ uid: dashuid });
+
+      cy.wait('@load-dash');
+
+      validateTextboxAndMarkup('changed value');
+      validateVariable('changed value');
+    });
+  });
+});
+
+function copyExistingDashboard() {
+  cy.intercept({
+    method: 'GET',
+    url: '/api/search?query=&type=dash-folder&permission=Edit',
+  }).as('dash-settings');
+  cy.intercept({
+    method: 'POST',
+    url: '/api/dashboards/db/',
+  }).as('save-dash');
+  cy.intercept({
+    method: 'GET',
+    url: /\/api\/dashboards\/uid\/(?!AejrN1AMz)\w+/,
+  }).as('load-dash');
+  e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}/templating-textbox-e2e-scenarios?orgId=1&editview=settings` });
+
+  cy.wait('@dash-settings');
+
+  e2e.pages.Dashboard.Settings.General.saveAsDashBoard().should('be.visible').click();
+
+  e2e.pages.SaveDashboardAsModal.newName().should('be.visible').type(`${Date.now()}`);
+
+  e2e.pages.SaveDashboardAsModal.save().should('be.visible').click();
+
+  cy.wait('@save-dash');
+  cy.wait('@load-dash');
+
+  e2e.pages.Dashboard.SubMenu.submenuItem().should('be.visible');
+
+  cy.location().then((loc) => {
+    const dashuid = /\/d\/(\w+)\//.exec(loc.href)![1];
+    cy.wrap(dashuid).as('dashuid');
+  });
+
+  cy.wait(500);
+}
+
+function saveDashboard(saveVariables: boolean) {
+  e2e.components.PageToolbar.item('Save dashboard').should('be.visible').click();
+
+  if (saveVariables) {
+    e2e.pages.SaveDashboardModal.saveVariables().should('exist').click({ force: true });
+  }
+
+  e2e.pages.SaveDashboardModal.save().should('be.visible').click();
+
+  cy.wait('@save-dash');
+}
+
+function validateTextboxAndMarkup(value: string) {
+  e2e.pages.Dashboard.SubMenu.submenuItem()
+    .should('be.visible')
+    .within(() => {
+      e2e.pages.Dashboard.SubMenu.submenuItemLabels('text').should('be.visible');
+      cy.get('input').should('be.visible').should('have.value', value);
+    });
+
+  e2e.components.Panels.Visualization.Text.container()
+    .should('be.visible')
+    .within(() => {
+      cy.get('h1').should('be.visible').should('have.text', `variable: ${value}`);
+    });
+}
+
+function validateVariable(value: string) {
+  e2e.components.PageToolbar.item('Dashboard settings').should('be.visible').click();
+
+  e2e.pages.Dashboard.Settings.General.sectionItems('Variables').should('be.visible').click();
+
+  e2e.pages.Dashboard.Settings.Variables.List.tableRowNameFields('text').should('be.visible').click();
+
+  e2e.pages.Dashboard.Settings.Variables.Edit.TextBoxVariable.textBoxOptionsQueryInputV2()
+    .should('be.visible')
+    .should('have.value', value);
+}
+
+function changeTextBoxInput() {
+  e2e.pages.Dashboard.SubMenu.submenuItemLabels('text').should('be.visible');
+  e2e.pages.Dashboard.SubMenu.submenuItem()
+    .should('be.visible')
+    .within(() => {
+      cy.get('input')
+        .should('be.visible')
+        .should('have.value', 'default value')
+        .clear()
+        .type('changed value')
+        .type('{enter}');
+    });
+
+  cy.location().should((loc) => {
+    expect(loc.search).to.contain('var-text=changed%20value');
+  });
+}
+
+function changeQueryInput() {
+  e2e.components.PageToolbar.item('Dashboard settings').should('be.visible').click();
+
+  e2e.pages.Dashboard.Settings.General.sectionItems('Variables').should('be.visible').click();
+
+  e2e.pages.Dashboard.Settings.Variables.List.tableRowNameFields('text').should('be.visible').click();
+
+  e2e.pages.Dashboard.Settings.Variables.Edit.TextBoxVariable.textBoxOptionsQueryInputV2()
+    .should('be.visible')
+    .clear()
+    .type('changed value')
+    .blur();
+
+  e2e.pages.Dashboard.Settings.Variables.Edit.General.previewOfValuesOption()
+    .should('have.length', 1)
+    .should('have.text', 'changed value');
+}
diff --git a/e2e/scenes/dashboard-suite/utils/makeDashboard.ts b/e2e/scenes/dashboard-suite/utils/makeDashboard.ts
new file mode 100644
index 0000000000000..4deaaa773ce83
--- /dev/null
+++ b/e2e/scenes/dashboard-suite/utils/makeDashboard.ts
@@ -0,0 +1,58 @@
+export function makeNewDashboardRequestBody(dashboardName: string, folderUid?: string) {
+  return {
+    dashboard: {
+      annotations: {
+        list: [
+          {
+            builtIn: 1,
+            datasource: { type: 'grafana', uid: '-- Grafana --' },
+            enable: true,
+            hide: true,
+            iconColor: 'rgba(0, 211, 255, 1)',
+            name: 'Annotations & Alerts',
+            type: 'dashboard',
+          },
+        ],
+      },
+      editable: true,
+      fiscalYearStartMonth: 0,
+      graphTooltip: 0,
+      links: [],
+      liveNow: false,
+      panels: [
+        {
+          datasource: { type: 'testdata', uid: '89_jzlT4k' },
+          gridPos: { h: 9, w: 12, x: 0, y: 0 },
+          id: 2,
+          options: {
+            code: {
+              language: 'plaintext',
+              showLineNumbers: false,
+              showMiniMap: false,
+            },
+            content: '***A nice little happy empty dashboard***',
+            mode: 'markdown',
+          },
+          pluginVersion: '9.4.0-pre',
+          title: 'Nothing to see here',
+          type: 'text',
+        },
+      ],
+      refresh: '',
+      revision: 1,
+      schemaVersion: 38,
+      tags: [],
+      templating: { list: [] },
+      time: { from: 'now-6h', to: 'now' },
+      timepicker: {},
+      timezone: '',
+      title: dashboardName,
+      version: 0,
+      weekStart: '',
+      uid: '',
+    },
+    message: '',
+    overwrite: false,
+    folderUid,
+  } as const;
+}
diff --git a/e2e/scenes/dashboards/DashboardLiveTest.json b/e2e/scenes/dashboards/DashboardLiveTest.json
new file mode 100644
index 0000000000000..7d98377df892b
--- /dev/null
+++ b/e2e/scenes/dashboards/DashboardLiveTest.json
@@ -0,0 +1,107 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "datasource",
+        "uid": "grafana"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "id": 1,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true
+      },
+      "pluginVersion": "10.3.0-pre",
+      "targets": [
+        {
+          "channel": "plugin/testdata/random-20Hz-stream",
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "queryType": "measurements",
+          "refId": "A"
+        }
+      ],
+      "title": "Live",
+      "type": "table"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 39,
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "New dashboard",
+  "version": 0,
+  "uid": "live-e2e-test",
+  "weekStart": ""
+}
diff --git a/e2e/scenes/dashboards/DashboardSearchTest.json b/e2e/scenes/dashboards/DashboardSearchTest.json
new file mode 100644
index 0000000000000..da9fbcf78ca21
--- /dev/null
+++ b/e2e/scenes/dashboards/DashboardSearchTest.json
@@ -0,0 +1,209 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "id": 321,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "id": 6,
+      "options": {
+        "reduceOptions": {
+          "calcs": ["lastNotNull"],
+          "fields": "",
+          "values": false
+        },
+        "showThresholdLabels": false,
+        "showThresholdMarkers": true,
+        "text": {}
+      },
+      "pluginVersion": "8.3.0-pre",
+      "title": "Gauge Example",
+      "type": "gauge"
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 8
+      },
+      "id": 4,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["lastNotNull"],
+          "fields": "",
+          "values": false
+        },
+        "text": {},
+        "textMode": "auto"
+      },
+      "pluginVersion": "8.3.0-pre",
+      "title": "Stat",
+      "type": "stat"
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 0,
+        "y": 16
+      },
+      "id": 2,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "title": "Time series example",
+      "type": "timeseries"
+    }
+  ],
+  "refresh": false,
+  "schemaVersion": 31,
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "2021-09-01T04:00:00.000Z",
+    "to": "2021-09-15T04:00:00.000Z"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "E2E Test - Dashboard Search",
+  "uid": "kquZN5H7k",
+  "version": 4
+}
diff --git a/e2e/scenes/dashboards/PanelSandboxDashboard.json b/e2e/scenes/dashboards/PanelSandboxDashboard.json
new file mode 100644
index 0000000000000..0ea1ca81d24fe
--- /dev/null
+++ b/e2e/scenes/dashboards/PanelSandboxDashboard.json
@@ -0,0 +1,58 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": 118,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "id": 1,
+      "title": "Sandbox Panel test",
+      "type": "sandbox-test-panel"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 38,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Sandbox Panel Test",
+  "uid": "c46b2460-16b7-42a5-82d1-b07fbf431950",
+  "version": 1,
+  "weekStart": ""
+}
diff --git a/e2e/scenes/dashboards/TestDashboard.json b/e2e/scenes/dashboards/TestDashboard.json
new file mode 100644
index 0000000000000..6d4ad3e07ff3a
--- /dev/null
+++ b/e2e/scenes/dashboards/TestDashboard.json
@@ -0,0 +1,209 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "id": 321,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "id": 6,
+      "options": {
+        "reduceOptions": {
+          "calcs": ["lastNotNull"],
+          "fields": "",
+          "values": false
+        },
+        "showThresholdLabels": false,
+        "showThresholdMarkers": true,
+        "text": {}
+      },
+      "pluginVersion": "8.3.0-pre",
+      "title": "Gauge Example",
+      "type": "gauge"
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 8
+      },
+      "id": 4,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["lastNotNull"],
+          "fields": "",
+          "values": false
+        },
+        "text": {},
+        "textMode": "auto"
+      },
+      "pluginVersion": "8.3.0-pre",
+      "title": "Stat",
+      "type": "stat"
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 0,
+        "y": 16
+      },
+      "id": 2,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "title": "Time series example",
+      "type": "timeseries"
+    }
+  ],
+  "refresh": false,
+  "schemaVersion": 31,
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "2021-09-01T04:00:00.000Z",
+    "to": "2021-09-15T04:00:00.000Z"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "E2E Test - Import Dashboard",
+  "uid": "kquZN5H7k",
+  "version": 4
+}
diff --git a/e2e/scenes/shared/smokeTestScenario.ts b/e2e/scenes/shared/smokeTestScenario.ts
new file mode 100644
index 0000000000000..3e66419680f76
--- /dev/null
+++ b/e2e/scenes/shared/smokeTestScenario.ts
@@ -0,0 +1,40 @@
+import { e2e } from '../utils';
+
+export const smokeTestScenario = () =>
+  describe('Smoke tests', () => {
+    before(() => {
+      e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'), false);
+      cy.logToConsole('enabling dashboardScene feature toggle in localstorage');
+      cy.setLocalStorage('grafana.featureToggles', 'dashboardScene=true');
+      cy.reload();
+      e2e.flows.addDataSource();
+      e2e.flows.addDashboard();
+      e2e.flows.addPanel({
+        dataSourceName: 'gdev-testdata',
+        visitDashboardAtStart: false,
+        timeout: 10000,
+      });
+    });
+
+    after(() => {
+      e2e.flows.revertAllChanges();
+    });
+
+    it('Login scenario, create test data source, dashboard, panel, and export scenario', () => {
+      e2e.components.DataSource.TestData.QueryTab.scenarioSelectContainer()
+        .should('be.visible')
+        .within(() => {
+          cy.get('input[id*="test-data-scenario-select-"]').should('be.visible').click();
+        });
+
+      cy.contains('CSV Metric Values').scrollIntoView().should('be.visible').click();
+
+      // Make sure the graph renders via checking legend
+      e2e.components.VizLegend.seriesName('A-series').should('be.visible');
+
+      e2e.components.NavToolbar.editDashboard.backToDashboardButton().click();
+
+      // Make sure panel is & visualization is added to dashboard
+      e2e.components.VizLegend.seriesName('A-series').should('be.visible');
+    });
+  });
diff --git a/e2e/scenes/smoke-tests-suite/1-smoketests.spec.ts b/e2e/scenes/smoke-tests-suite/1-smoketests.spec.ts
new file mode 100644
index 0000000000000..b66a6eee28f18
--- /dev/null
+++ b/e2e/scenes/smoke-tests-suite/1-smoketests.spec.ts
@@ -0,0 +1,3 @@
+import { smokeTestScenario } from '../shared/smokeTestScenario';
+
+smokeTestScenario();
diff --git a/e2e/scenes/smoke-tests-suite/panels_smokescreen.spec.ts b/e2e/scenes/smoke-tests-suite/panels_smokescreen.spec.ts
new file mode 100644
index 0000000000000..ca63dadba190d
--- /dev/null
+++ b/e2e/scenes/smoke-tests-suite/panels_smokescreen.spec.ts
@@ -0,0 +1,38 @@
+import { GrafanaBootConfig } from '@grafana/runtime';
+
+import { e2e } from '../utils';
+
+describe('Panels smokescreen', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'), false);
+  });
+
+  after(() => {
+    e2e.flows.revertAllChanges();
+  });
+
+  it('Tests each panel type in the panel edit view to ensure no crash', () => {
+    e2e.flows.addDashboard();
+
+    e2e.flows.addPanel({
+      dataSourceName: 'gdev-testdata',
+      timeout: 10000,
+      visitDashboardAtStart: false,
+    });
+
+    cy.window().then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
+      // Loop through every panel type and ensure no crash
+      Object.entries(win.grafanaBootData.settings.panels).forEach(([_, panel]) => {
+        // TODO: Remove Flame Graph check as part of addressing #66803
+        if (!panel.hideFromList && panel.state !== 'deprecated') {
+          e2e.components.PanelEditor.toggleVizPicker().click();
+          e2e.components.PluginVisualization.item(panel.name).scrollIntoView().should('be.visible').click();
+
+          e2e.components.PanelEditor.toggleVizPicker().should((e) => expect(e).to.contain(panel.name));
+          // TODO: Come up with better check / better failure messaging to clearly indicate which panel failed
+          cy.contains('An unexpected error happened').should('not.exist');
+        }
+      });
+    });
+  });
+});
diff --git a/e2e/scenes/utils/flows/addDashboard.ts b/e2e/scenes/utils/flows/addDashboard.ts
new file mode 100644
index 0000000000000..77dd07e9c9b83
--- /dev/null
+++ b/e2e/scenes/utils/flows/addDashboard.ts
@@ -0,0 +1,302 @@
+import { v4 as uuidv4 } from 'uuid';
+
+import { e2e } from '../index';
+import { getDashboardUid } from '../support/url';
+
+import { selectOption } from './selectOption';
+import { setDashboardTimeRange, TimeRangeConfig } from './setDashboardTimeRange';
+
+export interface AddAnnotationConfig {
+  dataSource: string;
+  dataSourceForm?: () => void;
+  name: string;
+}
+
+export interface AddDashboardConfig {
+  annotations: AddAnnotationConfig[];
+  timeRange: TimeRangeConfig;
+  title: string;
+  variables: PartialAddVariableConfig[];
+}
+
+interface AddVariableDefault {
+  hide: string;
+  type: string;
+}
+
+interface AddVariableOptional {
+  constantValue?: string;
+  dataSource?: string;
+  label?: string;
+  query?: string;
+  regex?: string;
+  variableQueryForm?: (config: AddVariableConfig) => void;
+}
+
+interface AddVariableRequired {
+  name: string;
+}
+
+export type PartialAddVariableConfig = Partial<AddVariableDefault> & AddVariableOptional & AddVariableRequired;
+export type AddVariableConfig = AddVariableDefault & AddVariableOptional & AddVariableRequired;
+
+/**
+ * This flow is used to add a dashboard with whatever configuration specified.
+ * @param config Configuration object. Currently supports configuring dashboard time range, annotations, and variables (support dependant on type).
+ * @see{@link AddDashboardConfig}
+ *
+ * @example
+ * ```
+ * // Configuring a simple dashboard
+ * addDashboard({
+ *    timeRange: {
+ *      from: '2022-10-03 00:00:00',
+ *      to: '2022-10-03 23:59:59',
+ *      zone: 'Coordinated Universal Time',
+ *    },
+ *    title: 'Test Dashboard',
+ * })
+ * ```
+ *
+ * @example
+ * ```
+ * // Configuring a dashboard with annotations
+ * addDashboard({
+ *    title: 'Test Dashboard',
+ *    annotations: [
+ *      {
+ *        // This should match the datasource name
+ *        dataSource: 'azure-monitor',
+ *        name: 'Test Annotation',
+ *        dataSourceForm: () => {
+ *          // Insert steps to create annotation using datasource form
+ *        }
+ *      }
+ *    ]
+ * })
+ * ```
+ *
+ * @see{@link AddAnnotationConfig}
+ *
+ * @example
+ * ```
+ * // Configuring a dashboard with variables
+ * addDashboard({
+ *    title: 'Test Dashboard',
+ *    variables: [
+ *      {
+ *        name: 'test-query-variable',
+ *        label: 'Testing Query',
+ *        hide: '',
+ *        type: e2e.flows.VARIABLE_TYPE_QUERY,
+ *        dataSource: 'azure-monitor',
+ *        variableQueryForm: () => {
+ *          // Insert steps to create variable using datasource form
+ *        },
+ *      },
+ *      {
+ *        name: 'test-constant-variable',
+ *        label: 'Testing Constant',
+ *        type: e2e.flows.VARIABLE_TYPE_CONSTANT,
+ *        constantValue: 'constant',
+ *      }
+ *    ]
+ * })
+ * ```
+ *
+ * @see{@link AddVariableConfig}
+ *
+ * @see{@link https://github.com/grafana/grafana/blob/main/e2e/cloud-plugins-suite/azure-monitor.spec.ts Azure Monitor Tests for full examples}
+ */
+export const addDashboard = (config?: Partial<AddDashboardConfig>) => {
+  const fullConfig: AddDashboardConfig = {
+    annotations: [],
+    title: `e2e-${uuidv4()}`,
+    variables: [],
+    ...config,
+    timeRange: {
+      from: '2020-01-01 00:00:00',
+      to: '2020-01-01 06:00:00',
+      zone: 'Coordinated Universal Time',
+      ...config?.timeRange,
+    },
+  };
+
+  const { annotations, timeRange, title, variables } = fullConfig;
+
+  cy.logToConsole('Adding dashboard with title:', title);
+
+  e2e.pages.AddDashboard.visit();
+
+  if (annotations.length > 0 || variables.length > 0) {
+    e2e.components.PageToolbar.item('Dashboard settings').click();
+    addAnnotations(annotations);
+
+    fullConfig.variables = addVariables(variables);
+
+    e2e.components.BackButton.backArrow().should('be.visible').click({ force: true });
+  }
+
+  setDashboardTimeRange(timeRange);
+
+  e2e.components.NavToolbar.editDashboard.saveButton().click();
+  e2e.components.Drawer.DashboardSaveDrawer.saveAsTitleInput().clear().type(title, { force: true });
+  e2e.components.Drawer.DashboardSaveDrawer.saveButton().click();
+  e2e.flows.assertSuccessNotification();
+  e2e.pages.AddDashboard.itemButton('Create new panel button').should('be.visible');
+
+  cy.logToConsole('Added dashboard with title:', title);
+
+  return cy
+    .url()
+    .should('contain', '/d/')
+    .then((url: string) => {
+      const uid = getDashboardUid(url);
+
+      e2e.getScenarioContext().then(({ addedDashboards }) => {
+        e2e.setScenarioContext({
+          addedDashboards: [...addedDashboards, { title, uid }],
+        });
+      });
+
+      // @todo remove `wrap` when possible
+      return cy.wrap(
+        {
+          config: fullConfig,
+          uid,
+        },
+        { log: false }
+      );
+    });
+};
+
+const addAnnotation = (config: AddAnnotationConfig, isFirst: boolean) => {
+  if (isFirst) {
+    if (e2e.pages.Dashboard.Settings.Annotations.List.addAnnotationCTAV2) {
+      e2e.pages.Dashboard.Settings.Annotations.List.addAnnotationCTAV2().click();
+    } else {
+      e2e.pages.Dashboard.Settings.Annotations.List.addAnnotationCTA().click();
+    }
+  } else {
+    cy.contains('New query').click();
+  }
+
+  const { dataSource, dataSourceForm, name } = config;
+
+  selectOption({
+    container: e2e.components.DataSourcePicker.container(),
+    optionText: dataSource,
+  });
+
+  e2e.pages.Dashboard.Settings.Annotations.Settings.name().clear().type(name);
+
+  if (dataSourceForm) {
+    dataSourceForm();
+  }
+};
+
+const addAnnotations = (configs: AddAnnotationConfig[]) => {
+  if (configs.length > 0) {
+    e2e.pages.Dashboard.Settings.General.sectionItems('Annotations').click();
+  }
+
+  return configs.forEach((config, i) => addAnnotation(config, i === 0));
+};
+
+export const VARIABLE_HIDE_LABEL = 'Label';
+export const VARIABLE_HIDE_NOTHING = '';
+export const VARIABLE_HIDE_VARIABLE = 'Variable';
+
+export const VARIABLE_TYPE_AD_HOC_FILTERS = 'Ad hoc filters';
+export const VARIABLE_TYPE_CONSTANT = 'Constant';
+export const VARIABLE_TYPE_DATASOURCE = 'Datasource';
+export const VARIABLE_TYPE_QUERY = 'Query';
+
+const addVariable = (config: PartialAddVariableConfig, isFirst: boolean): AddVariableConfig => {
+  const fullConfig = {
+    hide: VARIABLE_HIDE_NOTHING,
+    type: VARIABLE_TYPE_QUERY,
+    ...config,
+  };
+
+  if (isFirst) {
+    if (e2e.pages.Dashboard.Settings.Variables.List.addVariableCTAV2) {
+      e2e.pages.Dashboard.Settings.Variables.List.addVariableCTAV2().click();
+    } else {
+      e2e.pages.Dashboard.Settings.Variables.List.addVariableCTA().click();
+    }
+  } else {
+    e2e.pages.Dashboard.Settings.Variables.List.newButton().click();
+  }
+
+  const { constantValue, dataSource, label, name, query, regex, type, variableQueryForm } = fullConfig;
+
+  // This field is key to many reactive changes
+  if (type !== VARIABLE_TYPE_QUERY) {
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.generalTypeSelectV2()
+      .should('be.visible')
+      .within(() => {
+        e2e.components.Select.singleValue().should('have.text', 'Query').parent().click();
+      });
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.generalTypeSelectV2().find('input').type(`${type}{enter}`);
+  }
+
+  if (label) {
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.generalLabelInputV2().type(label);
+  }
+
+  e2e.pages.Dashboard.Settings.Variables.Edit.General.generalNameInputV2().clear().type(name);
+
+  if (
+    dataSource &&
+    (type === VARIABLE_TYPE_AD_HOC_FILTERS || type === VARIABLE_TYPE_DATASOURCE || type === VARIABLE_TYPE_QUERY)
+  ) {
+    e2e.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsDataSourceSelect()
+      .should('be.visible')
+      .within(() => {
+        e2e.components.DataSourcePicker.inputV2().type(`${dataSource}{enter}`);
+      });
+  }
+
+  if (constantValue && type === VARIABLE_TYPE_CONSTANT) {
+    e2e.pages.Dashboard.Settings.Variables.Edit.ConstantVariable.constantOptionsQueryInputV2().type(constantValue);
+  }
+
+  if (type === VARIABLE_TYPE_QUERY) {
+    if (query) {
+      e2e.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsQueryInput().type(query);
+    }
+
+    if (regex) {
+      e2e.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsRegExInputV2().type(regex);
+    }
+
+    if (variableQueryForm) {
+      variableQueryForm(fullConfig);
+    }
+  }
+
+  // Avoid flakiness
+  cy.focused().blur();
+
+  e2e.pages.Dashboard.Settings.Variables.Edit.General.previewOfValuesOption()
+    .should('exist')
+    .within((previewOfValues) => {
+      if (type === VARIABLE_TYPE_CONSTANT) {
+        expect(previewOfValues.text()).equals(constantValue);
+      }
+    });
+
+  e2e.pages.Dashboard.Settings.Variables.Edit.General.submitButton().click();
+  e2e.pages.Dashboard.Settings.Variables.Edit.General.applyButton().click();
+
+  return fullConfig;
+};
+
+const addVariables = (configs: PartialAddVariableConfig[]): AddVariableConfig[] => {
+  if (configs.length > 0) {
+    e2e.components.Tab.title('Variables').click();
+  }
+
+  return configs.map((config, i) => addVariable(config, i === 0));
+};
diff --git a/e2e/scenes/utils/flows/addDataSource.ts b/e2e/scenes/utils/flows/addDataSource.ts
new file mode 100644
index 0000000000000..777ed6caf3143
--- /dev/null
+++ b/e2e/scenes/utils/flows/addDataSource.ts
@@ -0,0 +1,109 @@
+import { v4 as uuidv4 } from 'uuid';
+
+import { e2e } from '../index';
+
+export interface AddDataSourceConfig {
+  basicAuth: boolean;
+  basicAuthPassword: string;
+  basicAuthUser: string;
+  expectedAlertMessage: string | RegExp;
+  form: () => void;
+  name: string;
+  skipTlsVerify: boolean;
+  type: string;
+  timeout?: number;
+  awaitHealth?: boolean;
+}
+
+// @todo this actually returns type `Cypress.Chainable<AddDaaSourceConfig>`
+export const addDataSource = (config?: Partial<AddDataSourceConfig>) => {
+  const fullConfig: AddDataSourceConfig = {
+    basicAuth: false,
+    basicAuthPassword: '',
+    basicAuthUser: '',
+    expectedAlertMessage: 'Data source is working',
+    form: () => {},
+    name: `e2e-${uuidv4()}`,
+    skipTlsVerify: false,
+    type: 'TestData',
+    ...config,
+  };
+
+  const {
+    basicAuth,
+    basicAuthPassword,
+    basicAuthUser,
+    expectedAlertMessage,
+    form,
+    name,
+    skipTlsVerify,
+    type,
+    timeout,
+    awaitHealth,
+  } = fullConfig;
+
+  if (awaitHealth) {
+    cy.intercept(/health/).as('health');
+  }
+
+  cy.logToConsole('Adding data source with name:', name);
+  e2e.pages.AddDataSource.visit();
+  e2e.pages.AddDataSource.dataSourcePluginsV2(type)
+    .scrollIntoView()
+    .should('be.visible') // prevents flakiness
+    .click();
+
+  e2e.pages.DataSource.name().clear();
+  e2e.pages.DataSource.name().type(name);
+
+  if (basicAuth) {
+    cy.contains('label', 'Basic auth').scrollIntoView().click();
+    cy.contains('.gf-form-group', 'Basic Auth Details')
+      .should('be.visible')
+      .scrollIntoView()
+      .within(() => {
+        if (basicAuthUser) {
+          cy.get('[placeholder=user]').type(basicAuthUser);
+        }
+        if (basicAuthPassword) {
+          cy.get('[placeholder=Password]').type(basicAuthPassword);
+        }
+      });
+  }
+
+  if (skipTlsVerify) {
+    cy.contains('label', 'Skip TLS Verify').scrollIntoView().click();
+  }
+
+  form();
+
+  e2e.pages.DataSource.saveAndTest().click();
+
+  if (awaitHealth) {
+    cy.wait('@health', { timeout: timeout ?? Cypress.config().defaultCommandTimeout });
+  }
+
+  // use the timeout passed in if it exists, otherwise, continue to use the default
+  e2e.pages.DataSource.alert()
+    .should('exist')
+    .contains(expectedAlertMessage, {
+      timeout: timeout ?? Cypress.config().defaultCommandTimeout,
+    });
+  cy.logToConsole('Added data source with name:', name);
+
+  return cy.url().then(() => {
+    e2e.getScenarioContext().then(({ addedDataSources }) => {
+      e2e.setScenarioContext({
+        addedDataSources: [...addedDataSources, { name, id: '' }],
+      });
+    });
+
+    // @todo remove `wrap` when possible
+    return cy.wrap(
+      {
+        config: fullConfig,
+      },
+      { log: false }
+    );
+  });
+};
diff --git a/e2e/scenes/utils/flows/addPanel.ts b/e2e/scenes/utils/flows/addPanel.ts
new file mode 100644
index 0000000000000..e906415ff543b
--- /dev/null
+++ b/e2e/scenes/utils/flows/addPanel.ts
@@ -0,0 +1,15 @@
+import { v4 as uuidv4 } from 'uuid';
+
+import { getScenarioContext } from '../support/scenarioContext';
+
+import { configurePanel, PartialAddPanelConfig } from './configurePanel';
+
+export const addPanel = (config?: Partial<PartialAddPanelConfig>) =>
+  getScenarioContext().then(({ lastAddedDataSource }) =>
+    configurePanel({
+      dataSourceName: lastAddedDataSource,
+      panelTitle: `e2e-${uuidv4()}`,
+      ...config,
+      isEdit: false,
+    })
+  );
diff --git a/e2e/scenes/utils/flows/assertSuccessNotification.ts b/e2e/scenes/utils/flows/assertSuccessNotification.ts
new file mode 100644
index 0000000000000..25f9228683cc0
--- /dev/null
+++ b/e2e/scenes/utils/flows/assertSuccessNotification.ts
@@ -0,0 +1,9 @@
+import { e2e } from '../index';
+
+export const assertSuccessNotification = () => {
+  if (e2e.components.Alert.alertV2) {
+    e2e.components.Alert.alertV2('success').should('exist');
+  } else {
+    e2e.components.Alert.alert('success').should('exist');
+  }
+};
diff --git a/e2e/scenes/utils/flows/configurePanel.ts b/e2e/scenes/utils/flows/configurePanel.ts
new file mode 100644
index 0000000000000..7a881a47c178e
--- /dev/null
+++ b/e2e/scenes/utils/flows/configurePanel.ts
@@ -0,0 +1,177 @@
+import { e2e } from '..';
+import { getScenarioContext } from '../support/scenarioContext';
+
+import { setDashboardTimeRange } from './setDashboardTimeRange';
+import { TimeRangeConfig } from './setTimeRange';
+
+interface AddPanelOverrides {
+  dataSourceName: string;
+  queriesForm: (config: AddPanelConfig) => void;
+  panelTitle: string;
+}
+
+interface EditPanelOverrides {
+  queriesForm?: (config: EditPanelConfig) => void;
+  panelTitle: string;
+}
+
+interface ConfigurePanelDefault {
+  chartData: {
+    method: string;
+    route: string | RegExp;
+  };
+  dashboardUid: string;
+  saveDashboard: boolean;
+  visitDashboardAtStart: boolean; // @todo remove when possible
+}
+
+interface ConfigurePanelOptional {
+  dataSourceName?: string;
+  queriesForm?: (config: ConfigurePanelConfig) => void;
+  panelTitle?: string;
+  timeRange?: TimeRangeConfig;
+  visualizationName?: string;
+  timeout?: number;
+}
+
+interface ConfigurePanelRequired {
+  isEdit: boolean;
+}
+
+export type PartialConfigurePanelConfig = Partial<ConfigurePanelDefault> &
+  ConfigurePanelOptional &
+  ConfigurePanelRequired;
+
+export type ConfigurePanelConfig = ConfigurePanelDefault & ConfigurePanelOptional & ConfigurePanelRequired;
+
+export type PartialAddPanelConfig = PartialConfigurePanelConfig & AddPanelOverrides;
+export type AddPanelConfig = ConfigurePanelConfig & AddPanelOverrides;
+
+export type PartialEditPanelConfig = PartialConfigurePanelConfig & EditPanelOverrides;
+export type EditPanelConfig = ConfigurePanelConfig & EditPanelOverrides;
+
+export const configurePanel = (config: PartialAddPanelConfig | PartialEditPanelConfig | PartialConfigurePanelConfig) =>
+  getScenarioContext().then(({ lastAddedDashboardUid }) => {
+    const fullConfig: AddPanelConfig | EditPanelConfig | ConfigurePanelConfig = {
+      chartData: {
+        method: 'POST',
+        route: '/api/ds/query',
+      },
+      dashboardUid: lastAddedDashboardUid,
+      saveDashboard: true,
+      visitDashboardAtStart: true,
+      ...config,
+    };
+
+    const {
+      chartData,
+      dashboardUid,
+      dataSourceName,
+      isEdit,
+      panelTitle,
+      queriesForm,
+      timeRange,
+      visitDashboardAtStart,
+      visualizationName,
+      timeout,
+    } = fullConfig;
+
+    if (visitDashboardAtStart) {
+      e2e.flows.openDashboard({ uid: dashboardUid });
+    }
+
+    if (isEdit) {
+      e2e.components.Panels.Panel.title(panelTitle).click();
+      e2e.components.Panels.Panel.headerItems('Edit').click();
+    } else {
+      try {
+        //Enter edit mode
+        e2e.components.NavToolbar.editDashboard.editButton().should('be.visible').click();
+        e2e.components.PageToolbar.itemButton('Add button').should('be.visible').click();
+        e2e.components.NavToolbar.editDashboard.addVisualizationButton().should('be.visible').click();
+      } catch (e) {
+        // Depending on the screen size, the "Add" button might be hidden
+        e2e.components.PageToolbar.item('Show more items').click();
+        e2e.components.PageToolbar.item('Add button').last().click();
+      }
+      // e2e.pages.AddDashboard.itemButton('Add new visualization menu item').should('be.visible');
+      // e2e.pages.AddDashboard.itemButton('Add new visualization menu item').click();
+    }
+
+    if (timeRange) {
+      setDashboardTimeRange(timeRange);
+    }
+
+    // @todo alias '/**/*.js*' as '@pluginModule' when possible: https://github.com/cypress-io/cypress/issues/1296
+
+    cy.intercept(chartData.method, chartData.route).as('chartData');
+
+    if (dataSourceName) {
+      e2e.components.DataSourcePicker.container().click().type(`${dataSourceName}{downArrow}{enter}`);
+    }
+
+    // @todo instead wait for '@pluginModule' if not already loaded
+    cy.wait(2000);
+
+    // `panelTitle` is needed to edit the panel, and unlikely to have its value changed at that point
+    const changeTitle = panelTitle && !isEdit;
+
+    if (changeTitle || visualizationName) {
+      if (changeTitle && panelTitle) {
+        e2e.components.PanelEditor.OptionsPane.fieldLabel('Panel options Title').type(`{selectall}${panelTitle}`);
+      }
+
+      if (visualizationName) {
+        e2e.components.PluginVisualization.item(visualizationName).scrollIntoView().click();
+
+        // @todo wait for '@pluginModule' if not a core visualization and not already loaded
+        cy.wait(2000);
+      }
+    } else {
+      // Consistently closed
+      closeOptions();
+    }
+
+    if (queriesForm) {
+      queriesForm(fullConfig);
+
+      // Wait for a possible complex visualization to render (or something related, as this isn't necessary on the dashboard page)
+      // Can't assert that its HTML changed because a new query could produce the same results
+      cy.wait(1000);
+    }
+
+    // @todo enable when plugins have this implemented
+    //e2e.components.QueryEditorRow.actionButton('Disable/enable query').click();
+    //cy.wait('@chartData');
+    //e2e.components.Panels.Panel.containerByTitle(panelTitle).find('.panel-content').contains('No data');
+    //e2e.components.QueryEditorRow.actionButton('Disable/enable query').click();
+    //cy.wait('@chartData');
+
+    // Avoid annotations flakiness
+    e2e.components.RefreshPicker.runButtonV2().first().click({ force: true });
+
+    // Wait for RxJS
+    cy.wait(timeout ?? Cypress.config().defaultCommandTimeout);
+
+    // @todo remove `wrap` when possible
+    return cy.wrap({ config: fullConfig }, { log: false });
+  });
+
+const closeOptions = () => e2e.components.PanelEditor.toggleVizOptions().click();
+
+export const VISUALIZATION_ALERT_LIST = 'Alert list';
+export const VISUALIZATION_BAR_GAUGE = 'Bar gauge';
+export const VISUALIZATION_CLOCK = 'Clock';
+export const VISUALIZATION_DASHBOARD_LIST = 'Dashboard list';
+export const VISUALIZATION_GAUGE = 'Gauge';
+export const VISUALIZATION_GRAPH = 'Graph';
+export const VISUALIZATION_HEAT_MAP = 'Heatmap';
+export const VISUALIZATION_LOGS = 'Logs';
+export const VISUALIZATION_NEWS = 'News';
+export const VISUALIZATION_PIE_CHART = 'Pie Chart';
+export const VISUALIZATION_PLUGIN_LIST = 'Plugin list';
+export const VISUALIZATION_POLYSTAT = 'Polystat';
+export const VISUALIZATION_STAT = 'Stat';
+export const VISUALIZATION_TABLE = 'Table';
+export const VISUALIZATION_TEXT = 'Text';
+export const VISUALIZATION_WORLD_MAP = 'Worldmap Panel';
diff --git a/e2e/scenes/utils/flows/confirmModal.ts b/e2e/scenes/utils/flows/confirmModal.ts
new file mode 100644
index 0000000000000..1f2c63f457710
--- /dev/null
+++ b/e2e/scenes/utils/flows/confirmModal.ts
@@ -0,0 +1,6 @@
+import { e2e } from '..';
+
+export function confirmDelete() {
+  cy.get(`input[placeholder='Type "Delete" to confirm']`).type('Delete');
+  e2e.pages.ConfirmModal.delete().click();
+}
diff --git a/e2e/scenes/utils/flows/deleteDashboard.ts b/e2e/scenes/utils/flows/deleteDashboard.ts
new file mode 100644
index 0000000000000..de492012c2f7d
--- /dev/null
+++ b/e2e/scenes/utils/flows/deleteDashboard.ts
@@ -0,0 +1,49 @@
+import { e2e } from '../index';
+import { fromBaseUrl } from '../support/url';
+
+export interface DeleteDashboardConfig {
+  quick?: boolean;
+  title: string;
+  uid: string;
+}
+
+export const deleteDashboard = ({ quick = false, title, uid }: DeleteDashboardConfig) => {
+  cy.logToConsole('Deleting dashboard with uid:', uid);
+
+  if (quick) {
+    quickDelete(uid);
+  } else {
+    uiDelete(uid, title);
+  }
+
+  cy.logToConsole('Deleted dashboard with uid:', uid);
+
+  e2e.getScenarioContext().then(({ addedDashboards }) => {
+    e2e.setScenarioContext({
+      addedDashboards: addedDashboards.filter((dashboard: DeleteDashboardConfig) => {
+        return dashboard.title !== title && dashboard.uid !== uid;
+      }),
+    });
+  });
+};
+
+const quickDelete = (uid: string) => {
+  cy.request('DELETE', fromBaseUrl(`/api/dashboards/uid/${uid}`));
+};
+
+const uiDelete = (uid: string, title: string) => {
+  e2e.pages.Dashboard.visit(uid);
+  e2e.components.PageToolbar.item('Dashboard settings').click();
+  e2e.pages.Dashboard.Settings.General.deleteDashBoard().click();
+  e2e.pages.ConfirmModal.delete().click();
+  e2e.flows.assertSuccessNotification();
+
+  e2e.pages.Dashboards.visit();
+
+  // @todo replace `e2e.pages.Dashboards.dashboards` with this when argument is empty
+  if (e2e.components.Search.dashboardItems) {
+    e2e.components.Search.dashboardItems().each((item) => cy.wrap(item).should('not.contain', title));
+  } else {
+    cy.get('[aria-label^="Dashboard search item "]').each((item) => cy.wrap(item).should('not.contain', title));
+  }
+};
diff --git a/e2e/scenes/utils/flows/deleteDataSource.ts b/e2e/scenes/utils/flows/deleteDataSource.ts
new file mode 100644
index 0000000000000..359c899d01d44
--- /dev/null
+++ b/e2e/scenes/utils/flows/deleteDataSource.ts
@@ -0,0 +1,44 @@
+import { e2e } from '../index';
+import { fromBaseUrl } from '../support/url';
+
+export interface DeleteDataSourceConfig {
+  id: string;
+  name: string;
+  quick?: boolean;
+}
+
+export const deleteDataSource = ({ id, name, quick = false }: DeleteDataSourceConfig) => {
+  cy.logToConsole('Deleting data source with name:', name);
+
+  if (quick) {
+    quickDelete(name);
+  } else {
+    uiDelete(name);
+  }
+
+  cy.logToConsole('Deleted data source with name:', name);
+
+  e2e.getScenarioContext().then(({ addedDataSources }) => {
+    e2e.setScenarioContext({
+      addedDataSources: addedDataSources.filter((dataSource: DeleteDataSourceConfig) => {
+        return dataSource.id !== id && dataSource.name !== name;
+      }),
+    });
+  });
+};
+
+const quickDelete = (name: string) => {
+  cy.request('DELETE', fromBaseUrl(`/api/datasources/name/${name}`));
+};
+
+const uiDelete = (name: string) => {
+  e2e.pages.DataSources.visit();
+  e2e.pages.DataSources.dataSources(name).click();
+  e2e.pages.DataSource.delete().click();
+  e2e.pages.ConfirmModal.delete().click();
+
+  e2e.pages.DataSources.visit();
+
+  // @todo replace `e2e.pages.DataSources.dataSources` with this when argument is empty
+  cy.get('[aria-label^="Data source list item "]').each((item) => cy.wrap(item).should('not.contain', name));
+};
diff --git a/e2e/scenes/utils/flows/editPanel.ts b/e2e/scenes/utils/flows/editPanel.ts
new file mode 100644
index 0000000000000..c213465902abf
--- /dev/null
+++ b/e2e/scenes/utils/flows/editPanel.ts
@@ -0,0 +1,7 @@
+import { configurePanel, PartialEditPanelConfig } from './configurePanel';
+
+export const editPanel = (config: Partial<PartialEditPanelConfig>) =>
+  configurePanel({
+    ...config,
+    isEdit: true,
+  });
diff --git a/e2e/scenes/utils/flows/importDashboard.ts b/e2e/scenes/utils/flows/importDashboard.ts
new file mode 100644
index 0000000000000..4e7b8ade4ad72
--- /dev/null
+++ b/e2e/scenes/utils/flows/importDashboard.ts
@@ -0,0 +1,69 @@
+import { e2e } from '../index';
+import { fromBaseUrl, getDashboardUid } from '../support/url';
+
+import { DeleteDashboardConfig } from '.';
+
+type Panel = {
+  title: string;
+  [key: string]: unknown;
+};
+
+export type Dashboard = { title: string; panels: Panel[]; uid: string; [key: string]: unknown };
+
+/**
+ * Smoke test a particular dashboard by quickly importing a json file and validate that all the panels finish loading
+ * @param dashboardToImport a sample dashboard
+ * @param queryTimeout a number of ms to wait for the imported dashboard to finish loading
+ * @param skipPanelValidation skip panel validation
+ */
+export const importDashboard = (dashboardToImport: Dashboard, queryTimeout?: number, skipPanelValidation?: boolean) => {
+  cy.visit(fromBaseUrl('/dashboard/import'));
+
+  // Note: normally we'd use 'click' and then 'type' here, but the json object is so big that using 'val' is much faster
+  e2e.components.DashboardImportPage.textarea().should('be.visible');
+  e2e.components.DashboardImportPage.textarea().click();
+  e2e.components.DashboardImportPage.textarea().invoke('val', JSON.stringify(dashboardToImport));
+  e2e.components.DashboardImportPage.submit().should('be.visible').click();
+  e2e.components.ImportDashboardForm.name().should('be.visible').click().clear().type(dashboardToImport.title);
+  e2e.components.ImportDashboardForm.submit().should('be.visible').click();
+
+  // wait for dashboard to load
+  cy.wait(queryTimeout || 6000);
+
+  // save the newly imported dashboard to context so it'll get properly deleted later
+  cy.url()
+    .should('contain', '/d/')
+    .then((url: string) => {
+      const uid = getDashboardUid(url);
+
+      e2e.getScenarioContext().then(({ addedDashboards }: { addedDashboards: DeleteDashboardConfig[] }) => {
+        e2e.setScenarioContext({
+          addedDashboards: [...addedDashboards, { title: dashboardToImport.title, uid }],
+        });
+      });
+
+      expect(dashboardToImport.uid).to.equal(uid);
+    });
+
+  if (!skipPanelValidation) {
+    dashboardToImport.panels.forEach((panel) => {
+      // Look at the json data
+      e2e.components.Panels.Panel.menu(panel.title).click({ force: true }); // force click because menu is hidden and show on hover
+      e2e.components.Panels.Panel.menuItems('Inspect').should('be.visible').click();
+      e2e.components.Tab.title('JSON').should('be.visible').click();
+      e2e.components.PanelInspector.Json.content().should('be.visible').contains('Panel JSON').click({ force: true });
+      e2e.components.Select.option().should('be.visible').contains('Panel data').click();
+
+      // ensures that panel has loaded without knowingly hitting an error
+      // note: this does not prove that data came back as we expected it,
+      // it could get `state: Done` for no data for example
+      // but it ensures we didn't hit a 401 or 500 or something like that
+      e2e.components.CodeEditor.container()
+        .should('be.visible')
+        .contains(/"state": "(Done|Streaming)"/);
+
+      // need to close panel
+      e2e.components.Drawer.General.close().click();
+    });
+  }
+};
diff --git a/e2e/scenes/utils/flows/importDashboards.ts b/e2e/scenes/utils/flows/importDashboards.ts
new file mode 100644
index 0000000000000..7434aeb11e9a8
--- /dev/null
+++ b/e2e/scenes/utils/flows/importDashboards.ts
@@ -0,0 +1,17 @@
+import { importDashboard, Dashboard } from './importDashboard';
+
+/**
+ * Smoke test several dashboard json files from a test directory
+ * and validate that all the panels in each import finish loading their queries
+ * @param dirPath the relative path to a directory which contains json files representing dashboards,
+ * for example if your dashboards live in `cypress/testDashboards` you can pass `/testDashboards`
+ * @param queryTimeout a number of ms to wait for the imported dashboard to finish loading
+ * @param skipPanelValidation skips panel validation
+ */
+export const importDashboards = async (dirPath: string, queryTimeout?: number, skipPanelValidation?: boolean) => {
+  cy.getJSONFilesFromDir(dirPath).then((jsonFiles: Dashboard[]) => {
+    jsonFiles.forEach((file) => {
+      importDashboard(file, queryTimeout || 6000, skipPanelValidation);
+    });
+  });
+};
diff --git a/e2e/scenes/utils/flows/index.ts b/e2e/scenes/utils/flows/index.ts
new file mode 100644
index 0000000000000..ae07146d13e17
--- /dev/null
+++ b/e2e/scenes/utils/flows/index.ts
@@ -0,0 +1,37 @@
+export * from './addDashboard';
+export * from './addDataSource';
+export * from './addPanel';
+export * from './assertSuccessNotification';
+export * from './deleteDashboard';
+export * from './deleteDataSource';
+export * from './editPanel';
+export * from './login';
+export * from './openDashboard';
+export * from './openPanelMenuItem';
+export * from './revertAllChanges';
+export * from './saveDashboard';
+export * from './selectOption';
+export * from './setTimeRange';
+export * from './importDashboard';
+export * from './importDashboards';
+export * from './userPreferences';
+export * from './confirmModal';
+
+export {
+  VISUALIZATION_ALERT_LIST,
+  VISUALIZATION_BAR_GAUGE,
+  VISUALIZATION_CLOCK,
+  VISUALIZATION_DASHBOARD_LIST,
+  VISUALIZATION_GAUGE,
+  VISUALIZATION_GRAPH,
+  VISUALIZATION_HEAT_MAP,
+  VISUALIZATION_LOGS,
+  VISUALIZATION_NEWS,
+  VISUALIZATION_PIE_CHART,
+  VISUALIZATION_PLUGIN_LIST,
+  VISUALIZATION_POLYSTAT,
+  VISUALIZATION_STAT,
+  VISUALIZATION_TABLE,
+  VISUALIZATION_TEXT,
+  VISUALIZATION_WORLD_MAP,
+} from './configurePanel';
diff --git a/e2e/scenes/utils/flows/login.ts b/e2e/scenes/utils/flows/login.ts
new file mode 100644
index 0000000000000..fc06f7c1fe135
--- /dev/null
+++ b/e2e/scenes/utils/flows/login.ts
@@ -0,0 +1,42 @@
+import { e2e } from '../index';
+import { fromBaseUrl } from '../support/url';
+
+const DEFAULT_USERNAME = 'admin';
+const DEFAULT_PASSWORD = 'admin';
+
+const loginApi = (username: string, password: string) => {
+  cy.request({
+    method: 'POST',
+    url: fromBaseUrl('/login'),
+    body: {
+      user: username,
+      password,
+    },
+  });
+};
+
+const loginUi = (username: string, password: string) => {
+  cy.logToConsole('Logging in with username:', username);
+  e2e.pages.Login.visit();
+  e2e.pages.Login.username()
+    .should('be.visible') // prevents flakiness
+    .type(username);
+  e2e.pages.Login.password().type(password);
+  e2e.pages.Login.submit().click();
+
+  // Local tests will have insecure credentials
+  if (password === DEFAULT_PASSWORD) {
+    e2e.pages.Login.skip().should('be.visible').click();
+  }
+
+  cy.get('.login-page').should('not.exist');
+};
+
+export const login = (username = DEFAULT_USERNAME, password = DEFAULT_PASSWORD, loginViaApi = true) => {
+  if (loginViaApi) {
+    loginApi(username, password);
+  } else {
+    loginUi(username, password);
+  }
+  cy.logToConsole('Logged in with username:', username);
+};
diff --git a/e2e/scenes/utils/flows/openDashboard.ts b/e2e/scenes/utils/flows/openDashboard.ts
new file mode 100644
index 0000000000000..3c666a11fd1d2
--- /dev/null
+++ b/e2e/scenes/utils/flows/openDashboard.ts
@@ -0,0 +1,35 @@
+import { e2e } from '../index';
+import { getScenarioContext } from '../support/scenarioContext';
+
+import { setDashboardTimeRange, TimeRangeConfig } from './setDashboardTimeRange';
+
+interface OpenDashboardDefault {
+  uid: string;
+}
+
+interface OpenDashboardOptional {
+  timeRange?: TimeRangeConfig;
+  queryParams?: object;
+}
+
+export type PartialOpenDashboardConfig = Partial<OpenDashboardDefault> & OpenDashboardOptional;
+export type OpenDashboardConfig = OpenDashboardDefault & OpenDashboardOptional;
+
+export const openDashboard = (config?: PartialOpenDashboardConfig) =>
+  getScenarioContext().then(({ lastAddedDashboardUid }) => {
+    const fullConfig: OpenDashboardConfig = {
+      uid: lastAddedDashboardUid,
+      ...config,
+    };
+
+    const { timeRange, uid, queryParams } = fullConfig;
+
+    e2e.pages.Dashboard.visit(uid, queryParams);
+
+    if (timeRange) {
+      setDashboardTimeRange(timeRange);
+    }
+
+    // @todo remove `wrap` when possible
+    return cy.wrap({ config: fullConfig }, { log: false });
+  });
diff --git a/e2e/scenes/utils/flows/openPanelMenuItem.ts b/e2e/scenes/utils/flows/openPanelMenuItem.ts
new file mode 100644
index 0000000000000..1ccd5206826f4
--- /dev/null
+++ b/e2e/scenes/utils/flows/openPanelMenuItem.ts
@@ -0,0 +1,57 @@
+import { e2e } from '../index';
+
+export enum PanelMenuItems {
+  Edit = 'Edit',
+  Inspect = 'Inspect',
+  More = 'More...',
+  Extensions = 'Extensions',
+}
+
+export const openPanelMenuItem = (menu: PanelMenuItems, panelTitle = 'Panel Title') => {
+  // we changed the way we open the panel menu in react panels with the new panel header
+  detectPanelType(panelTitle, (isAngularPanel) => {
+    if (isAngularPanel) {
+      e2e.components.Panels.Panel.title(panelTitle).should('be.visible').click();
+      e2e.components.Panels.Panel.headerItems(menu).should('be.visible').click();
+    } else {
+      e2e.components.Panels.Panel.menu(panelTitle).click({ force: true }); // force click because menu is hidden and show on hover
+      e2e.components.Panels.Panel.menuItems(menu).should('be.visible').click();
+    }
+  });
+};
+
+export const openPanelMenuExtension = (extensionTitle: string, panelTitle = 'Panel Title') => {
+  const menuItem = PanelMenuItems.Extensions;
+  // we changed the way we open the panel menu in react panels with the new panel header
+  detectPanelType(panelTitle, (isAngularPanel) => {
+    if (isAngularPanel) {
+      e2e.components.Panels.Panel.title(panelTitle).should('be.visible').click();
+      e2e.components.Panels.Panel.headerItems(menuItem)
+        .should('be.visible')
+        .parent()
+        .parent()
+        .invoke('addClass', 'open');
+      e2e.components.Panels.Panel.headerItems(extensionTitle).should('be.visible').click();
+    } else {
+      e2e.components.Panels.Panel.menu(panelTitle).click({ force: true }); // force click because menu is hidden and show on hover
+      e2e.components.Panels.Panel.menuItems(menuItem).trigger('mouseover', { force: true });
+      e2e.components.Panels.Panel.menuItems(extensionTitle).click({ force: true });
+    }
+  });
+};
+
+function detectPanelType(panelTitle: string, detected: (isAngularPanel: boolean) => void) {
+  e2e.components.Panels.Panel.title(panelTitle).then((el) => {
+    const isAngularPanel = el.find('plugin-component.ng-scope').length > 0;
+
+    if (isAngularPanel) {
+      Cypress.log({
+        name: 'detectPanelType',
+        displayName: 'detector',
+        message: 'Angular panel detected, will use legacy selectors.',
+      });
+    }
+
+    detected(isAngularPanel);
+  });
+}
diff --git a/e2e/scenes/utils/flows/revertAllChanges.ts b/e2e/scenes/utils/flows/revertAllChanges.ts
new file mode 100644
index 0000000000000..7551dd1b74a82
--- /dev/null
+++ b/e2e/scenes/utils/flows/revertAllChanges.ts
@@ -0,0 +1,12 @@
+import { e2e } from '../index';
+
+export const revertAllChanges = () => {
+  e2e.getScenarioContext().then(({ addedDashboards, addedDataSources, hasChangedUserPreferences }) => {
+    addedDashboards.forEach((dashboard) => e2e.flows.deleteDashboard({ ...dashboard, quick: true }));
+    addedDataSources.forEach((dataSource) => e2e.flows.deleteDataSource({ ...dataSource, quick: true }));
+
+    if (hasChangedUserPreferences) {
+      e2e.flows.setDefaultUserPreferences();
+    }
+  });
+};
diff --git a/e2e/scenes/utils/flows/saveDashboard.ts b/e2e/scenes/utils/flows/saveDashboard.ts
new file mode 100644
index 0000000000000..37d5238f43133
--- /dev/null
+++ b/e2e/scenes/utils/flows/saveDashboard.ts
@@ -0,0 +1,9 @@
+import { e2e } from '../index';
+
+export const saveDashboard = () => {
+  e2e.components.PageToolbar.item('Save dashboard').click();
+
+  e2e.pages.SaveDashboardModal.save().click();
+
+  e2e.flows.assertSuccessNotification();
+};
diff --git a/e2e/scenes/utils/flows/selectOption.ts b/e2e/scenes/utils/flows/selectOption.ts
new file mode 100644
index 0000000000000..68f3717f1bd7e
--- /dev/null
+++ b/e2e/scenes/utils/flows/selectOption.ts
@@ -0,0 +1,40 @@
+import { e2e } from '../index';
+
+export interface SelectOptionConfig {
+  clickToOpen?: boolean;
+  container: Cypress.Chainable<JQuery<HTMLElement>>;
+  forceClickOption?: boolean;
+  optionText: string | RegExp;
+}
+
+export const selectOption = (config: SelectOptionConfig) => {
+  const fullConfig: SelectOptionConfig = {
+    clickToOpen: true,
+    forceClickOption: false,
+    ...config,
+  };
+
+  const { clickToOpen, container, forceClickOption, optionText } = fullConfig;
+
+  container.within(() => {
+    if (clickToOpen) {
+      cy.get('[class$="-input-suffix"]', { timeout: 1000 }).then((element) => {
+        expect(Cypress.dom.isAttached(element)).to.eq(true);
+        cy.get('[class$="-input-suffix"]', { timeout: 1000 }).click({ force: true });
+      });
+    }
+  });
+
+  return e2e.components.Select.option()
+    .filter((_, { textContent }) => {
+      if (textContent === null) {
+        return false;
+      } else if (typeof optionText === 'string') {
+        return textContent.includes(optionText);
+      } else {
+        return optionText.test(textContent);
+      }
+    })
+    .scrollIntoView()
+    .click({ force: forceClickOption });
+};
diff --git a/e2e/scenes/utils/flows/setDashboardTimeRange.ts b/e2e/scenes/utils/flows/setDashboardTimeRange.ts
new file mode 100644
index 0000000000000..566934c24e7f1
--- /dev/null
+++ b/e2e/scenes/utils/flows/setDashboardTimeRange.ts
@@ -0,0 +1,5 @@
+import { setTimeRange, TimeRangeConfig } from './setTimeRange';
+
+export type { TimeRangeConfig };
+
+export const setDashboardTimeRange = (config: TimeRangeConfig) => setTimeRange(config);
diff --git a/e2e/scenes/utils/flows/setTimeRange.ts b/e2e/scenes/utils/flows/setTimeRange.ts
new file mode 100644
index 0000000000000..ac3b1898b9790
--- /dev/null
+++ b/e2e/scenes/utils/flows/setTimeRange.ts
@@ -0,0 +1,40 @@
+import { e2e } from '../index';
+
+import { selectOption } from './selectOption';
+
+export interface TimeRangeConfig {
+  from: string;
+  to: string;
+  zone?: string;
+}
+
+export const setTimeRange = ({ from, to, zone }: TimeRangeConfig) => {
+  e2e.components.TimePicker.openButton().click();
+
+  if (zone) {
+    cy.contains('button', 'Change time settings').click();
+    cy.log('setting time zone to ' + zone);
+
+    if (e2e.components.TimeZonePicker.containerV2) {
+      selectOption({
+        clickToOpen: true,
+        container: e2e.components.TimeZonePicker.containerV2(),
+        optionText: zone,
+      });
+    } else {
+      selectOption({
+        clickToOpen: true,
+        container: e2e.components.TimeZonePicker.container(),
+        optionText: zone,
+      });
+    }
+  }
+
+  // For smaller screens
+  e2e.components.TimePicker.absoluteTimeRangeTitle().click();
+
+  e2e.components.TimePicker.fromField().clear().type(from);
+  e2e.components.TimePicker.toField().clear().type(to);
+
+  e2e.components.TimePicker.applyTimeRange().click();
+};
diff --git a/e2e/scenes/utils/flows/userPreferences.ts b/e2e/scenes/utils/flows/userPreferences.ts
new file mode 100644
index 0000000000000..621bff04ce64f
--- /dev/null
+++ b/e2e/scenes/utils/flows/userPreferences.ts
@@ -0,0 +1,25 @@
+import { Preferences as UserPreferencesDTO } from '@grafana/schema/src/raw/preferences/x/preferences_types.gen';
+
+import { e2e } from '..';
+import { fromBaseUrl } from '../support/url';
+
+const defaultUserPreferences = {
+  timezone: '', // "Default" option
+} as const; // TODO: when we update typescript >4.9 change to `as const satisfies UserPreferencesDTO`
+
+// Only accept preferences we have defaults for as arguments. To allow a new preference to be set, add a default for it
+type UserPreferences = Pick<UserPreferencesDTO, keyof typeof defaultUserPreferences>;
+
+export function setUserPreferences(prefs: UserPreferences) {
+  e2e.setScenarioContext({ hasChangedUserPreferences: prefs !== defaultUserPreferences });
+
+  return cy.request({
+    method: 'PUT',
+    url: fromBaseUrl('/api/user/preferences'),
+    body: prefs,
+  });
+}
+
+export function setDefaultUserPreferences() {
+  return setUserPreferences(defaultUserPreferences);
+}
diff --git a/e2e/scenes/utils/index.ts b/e2e/scenes/utils/index.ts
new file mode 100644
index 0000000000000..011250f7b8a35
--- /dev/null
+++ b/e2e/scenes/utils/index.ts
@@ -0,0 +1,18 @@
+import { E2ESelectors, Selectors, selectors } from '@grafana/e2e-selectors';
+
+import * as flows from './flows';
+import { e2eFactory } from './support';
+import { benchmark } from './support/benchmark';
+import { getScenarioContext, setScenarioContext } from './support/scenarioContext';
+import * as typings from './typings';
+
+export const e2e = {
+  benchmark,
+  pages: e2eFactory({ selectors: selectors.pages }),
+  typings,
+  components: e2eFactory({ selectors: selectors.components }),
+  flows,
+  getScenarioContext,
+  setScenarioContext,
+  getSelectors: <T extends Selectors>(selectors: E2ESelectors<T>) => e2eFactory({ selectors }),
+};
diff --git a/e2e/scenes/utils/support/benchmark.ts b/e2e/scenes/utils/support/benchmark.ts
new file mode 100644
index 0000000000000..1fd32e33e2209
--- /dev/null
+++ b/e2e/scenes/utils/support/benchmark.ts
@@ -0,0 +1,70 @@
+import { e2e } from '../';
+
+export interface BenchmarkArguments {
+  name: string;
+  dashboard: {
+    folder: string;
+    delayAfterOpening: number;
+    skipPanelValidation: boolean;
+  };
+  repeat: number;
+  duration: number;
+  appStats?: {
+    startCollecting?: (window: Window) => void;
+    collect: (window: Window) => Record<string, unknown>;
+  };
+  skipScenario?: boolean;
+}
+
+export const benchmark = ({
+  name,
+  skipScenario = false,
+  repeat,
+  duration,
+  appStats,
+  dashboard,
+}: BenchmarkArguments) => {
+  if (skipScenario) {
+    describe(name, () => {
+      it.skip(name, () => {});
+    });
+  } else {
+    describe(name, () => {
+      beforeEach(() => {
+        e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+        e2e.flows.importDashboards(dashboard.folder, 1000, dashboard.skipPanelValidation);
+      });
+
+      afterEach(() => e2e.flows.revertAllChanges());
+
+      Array(repeat)
+        .fill(0)
+        .map((_, i) => {
+          const testName = `${name}-${i}`;
+          return it(testName, () => {
+            e2e.flows.openDashboard();
+
+            cy.wait(dashboard.delayAfterOpening);
+
+            if (appStats) {
+              const startCollecting = appStats.startCollecting;
+              if (startCollecting) {
+                cy.window().then((win) => startCollecting(win));
+              }
+
+              cy.startBenchmarking(testName);
+              cy.wait(duration);
+
+              cy.window().then((win) => {
+                cy.stopBenchmarking(testName, appStats.collect(win));
+              });
+            } else {
+              cy.startBenchmarking(testName);
+              cy.wait(duration);
+              cy.stopBenchmarking(testName, {});
+            }
+          });
+        });
+    });
+  }
+};
diff --git a/e2e/scenes/utils/support/index.ts b/e2e/scenes/utils/support/index.ts
new file mode 100644
index 0000000000000..1ebbc3f881e5b
--- /dev/null
+++ b/e2e/scenes/utils/support/index.ts
@@ -0,0 +1,4 @@
+export * from './localStorage';
+export * from './scenarioContext';
+export * from './selector';
+export * from './types';
diff --git a/e2e/scenes/utils/support/localStorage.ts b/e2e/scenes/utils/support/localStorage.ts
new file mode 100644
index 0000000000000..c7f8436a52268
--- /dev/null
+++ b/e2e/scenes/utils/support/localStorage.ts
@@ -0,0 +1,17 @@
+// @todo this actually returns type `Cypress.Chainable`
+const get = (key: string) =>
+  cy.wrap({ getLocalStorage: () => localStorage.getItem(key) }, { log: false }).invoke('getLocalStorage');
+
+export const getLocalStorage = (key: string) =>
+  get(key).then((value) => {
+    if (value === null) {
+      return value;
+    } else {
+      return JSON.parse(value);
+    }
+  });
+
+export const requireLocalStorage = (key: string) =>
+  get(key) // `getLocalStorage()` would turn 'null' into `null`
+    .should('not.equal', null)
+    .then((value) => JSON.parse(value));
diff --git a/e2e/scenes/utils/support/monaco.ts b/e2e/scenes/utils/support/monaco.ts
new file mode 100644
index 0000000000000..54c528877edc4
--- /dev/null
+++ b/e2e/scenes/utils/support/monaco.ts
@@ -0,0 +1,7 @@
+import { e2e } from '../index';
+
+export function waitForMonacoToLoad() {
+  e2e.components.QueryField.container().children('[data-testid="Spinner"]').should('not.exist');
+  cy.window().its('monaco').should('exist');
+  cy.get('.monaco-editor textarea:first').should('exist');
+}
diff --git a/e2e/scenes/utils/support/scenarioContext.ts b/e2e/scenes/utils/support/scenarioContext.ts
new file mode 100644
index 0000000000000..15fcc01ed32fc
--- /dev/null
+++ b/e2e/scenes/utils/support/scenarioContext.ts
@@ -0,0 +1,57 @@
+import { DeleteDashboardConfig } from '../flows/deleteDashboard';
+import { DeleteDataSourceConfig } from '../flows/deleteDataSource';
+
+export interface ScenarioContext {
+  addedDashboards: DeleteDashboardConfig[];
+  addedDataSources: DeleteDataSourceConfig[];
+  lastAddedDashboard: string; // @todo rename to `lastAddedDashboardTitle`
+  lastAddedDashboardUid: string;
+  lastAddedDataSource: string; // @todo rename to `lastAddedDataSourceName`
+  lastAddedDataSourceId: string;
+  hasChangedUserPreferences: boolean;
+}
+
+const scenarioContext: ScenarioContext = {
+  addedDashboards: [],
+  addedDataSources: [],
+  hasChangedUserPreferences: false,
+  get lastAddedDashboard() {
+    return lastProperty(this.addedDashboards, 'title');
+  },
+  get lastAddedDashboardUid() {
+    return lastProperty(this.addedDashboards, 'uid');
+  },
+  get lastAddedDataSource() {
+    return lastProperty(this.addedDataSources, 'name');
+  },
+  get lastAddedDataSourceId() {
+    return lastProperty(this.addedDataSources, 'id');
+  },
+};
+
+const lastProperty = <T extends DeleteDashboardConfig | DeleteDataSourceConfig, K extends keyof T>(
+  items: T[],
+  key: K
+) => items[items.length - 1]?.[key] ?? '';
+
+export const getScenarioContext = (): Cypress.Chainable<ScenarioContext> =>
+  cy
+    .wrap(
+      {
+        getScenarioContext: (): ScenarioContext => ({ ...scenarioContext }),
+      },
+      { log: false }
+    )
+    .invoke({ log: false }, 'getScenarioContext');
+
+export const setScenarioContext = (newContext: Partial<ScenarioContext>): Cypress.Chainable<ScenarioContext> =>
+  cy
+    .wrap(
+      {
+        setScenarioContext: () => {
+          Object.assign(scenarioContext, newContext);
+        },
+      },
+      { log: false }
+    )
+    .invoke({ log: false }, 'setScenarioContext');
diff --git a/e2e/scenes/utils/support/selector.ts b/e2e/scenes/utils/support/selector.ts
new file mode 100644
index 0000000000000..8e49d54afa1eb
--- /dev/null
+++ b/e2e/scenes/utils/support/selector.ts
@@ -0,0 +1,11 @@
+export interface SelectorApi {
+  fromAriaLabel: (selector: string) => string;
+  fromDataTestId: (selector: string) => string;
+  fromSelector: (selector: string) => string;
+}
+
+export const Selector: SelectorApi = {
+  fromAriaLabel: (selector: string) => `[aria-label="${selector}"]`,
+  fromDataTestId: (selector: string) => `[data-testid="${selector}"]`,
+  fromSelector: (selector: string) => selector,
+};
diff --git a/e2e/scenes/utils/support/types.ts b/e2e/scenes/utils/support/types.ts
new file mode 100644
index 0000000000000..e7ccfe91db705
--- /dev/null
+++ b/e2e/scenes/utils/support/types.ts
@@ -0,0 +1,136 @@
+import { CssSelector, FunctionSelector, Selectors, StringSelector, UrlSelector } from '@grafana/e2e-selectors';
+
+import { Selector } from './selector';
+import { fromBaseUrl } from './url';
+
+export type VisitFunction = (args?: string, queryParams?: object) => Cypress.Chainable<Window>;
+export type E2EVisit = { visit: VisitFunction };
+export type E2EFunction = ((text?: string, options?: CypressOptions) => Cypress.Chainable<JQuery<HTMLElement>>) &
+  E2EFunctionWithOnlyOptions;
+export type E2EFunctionWithOnlyOptions = (options?: CypressOptions) => Cypress.Chainable<JQuery<HTMLElement>>;
+
+export type TypeSelectors<S> = S extends StringSelector
+  ? E2EFunctionWithOnlyOptions
+  : S extends FunctionSelector
+    ? E2EFunction
+    : S extends CssSelector
+      ? E2EFunction
+      : S extends UrlSelector
+        ? E2EVisit & Omit<E2EFunctions<S>, 'url'>
+        : S extends Record<string, string | FunctionSelector | CssSelector | UrlSelector | Selectors>
+          ? E2EFunctions<S>
+          : S;
+
+export type E2EFunctions<S extends Selectors> = {
+  [P in keyof S]: TypeSelectors<S[P]>;
+};
+
+export type E2EObjects<S extends Selectors> = E2EFunctions<S>;
+
+export type E2EFactoryArgs<S extends Selectors> = { selectors: S };
+
+export type CypressOptions = Partial<Cypress.Loggable & Cypress.Timeoutable & Cypress.Withinable & Cypress.Shadow>;
+
+const processSelectors = <S extends Selectors>(e2eObjects: E2EFunctions<S>, selectors: S): E2EFunctions<S> => {
+  const logOutput = (data: unknown) => cy.logToConsole('Retrieving Selector:', data);
+  const keys = Object.keys(selectors);
+  for (let index = 0; index < keys.length; index++) {
+    const key = keys[index];
+    const value = selectors[key];
+
+    if (key === 'url') {
+      // @ts-ignore
+      e2eObjects['visit'] = (args?: string, queryParams?: object) => {
+        let parsedUrl = '';
+        if (typeof value === 'string') {
+          parsedUrl = fromBaseUrl(value);
+        }
+
+        if (typeof value === 'function' && args) {
+          parsedUrl = fromBaseUrl(value(args));
+        }
+
+        cy.logToConsole('Visiting', parsedUrl);
+        if (queryParams) {
+          return cy.visit({ url: parsedUrl, qs: queryParams });
+        } else {
+          return cy.visit(parsedUrl);
+        }
+      };
+
+      continue;
+    }
+
+    if (typeof value === 'string') {
+      // @ts-ignore
+      e2eObjects[key] = (options?: CypressOptions) => {
+        logOutput(value);
+        const selector = value.startsWith('data-testid')
+          ? Selector.fromDataTestId(value)
+          : Selector.fromAriaLabel(value);
+
+        return cy.get(selector, options);
+      };
+
+      continue;
+    }
+
+    if (typeof value === 'function') {
+      // @ts-ignore
+      e2eObjects[key] = function (textOrOptions?: string | CypressOptions, options?: CypressOptions) {
+        // the input can only be ()
+        if (arguments.length === 0) {
+          const selector = value('');
+
+          logOutput(selector);
+          return cy.get(selector);
+        }
+
+        // the input can be (text) or (options)
+        if (arguments.length === 1) {
+          if (typeof textOrOptions === 'string') {
+            const selectorText = value(textOrOptions);
+            const selector = selectorText.startsWith('data-testid')
+              ? Selector.fromDataTestId(selectorText)
+              : Selector.fromAriaLabel(selectorText);
+
+            logOutput(selector);
+            return cy.get(selector);
+          }
+          const selector = value('');
+
+          logOutput(selector);
+          return cy.get(selector, textOrOptions);
+        }
+
+        // the input can only be (text, options)
+        if (arguments.length === 2 && typeof textOrOptions === 'string') {
+          const text = textOrOptions;
+          const selectorText = value(text);
+          const selector = text.startsWith('data-testid')
+            ? Selector.fromDataTestId(selectorText)
+            : Selector.fromAriaLabel(selectorText);
+
+          logOutput(selector);
+          return cy.get(selector, options);
+        }
+      };
+
+      continue;
+    }
+
+    if (typeof value === 'object') {
+      // @ts-ignore
+      e2eObjects[key] = processSelectors({}, value);
+    }
+  }
+
+  return e2eObjects;
+};
+
+export const e2eFactory = <S extends Selectors>({ selectors }: E2EFactoryArgs<S>): E2EObjects<S> => {
+  const e2eObjects: E2EFunctions<S> = {} as E2EFunctions<S>;
+  processSelectors(e2eObjects, selectors);
+
+  return { ...e2eObjects };
+};
diff --git a/e2e/scenes/utils/support/url.ts b/e2e/scenes/utils/support/url.ts
new file mode 100644
index 0000000000000..34620974b0679
--- /dev/null
+++ b/e2e/scenes/utils/support/url.ts
@@ -0,0 +1,14 @@
+import { e2e } from '../index';
+
+const getBaseUrl = () => Cypress.env('BASE_URL') || Cypress.config().baseUrl || 'http://localhost:3000';
+
+export const fromBaseUrl = (url = '') => new URL(url, getBaseUrl()).href;
+
+export const getDashboardUid = (url: string): string => {
+  const matches = new URL(url).pathname.match(/\/d\/([^/]+)/);
+  if (!matches) {
+    throw new Error(`Couldn't parse uid from ${url}`);
+  } else {
+    return matches[1];
+  }
+};
diff --git a/e2e/scenes/utils/typings/index.ts b/e2e/scenes/utils/typings/index.ts
new file mode 100644
index 0000000000000..d4a4805a21fa1
--- /dev/null
+++ b/e2e/scenes/utils/typings/index.ts
@@ -0,0 +1 @@
+export { undo } from './undo';
diff --git a/e2e/scenes/utils/typings/undo.ts b/e2e/scenes/utils/typings/undo.ts
new file mode 100644
index 0000000000000..9ee3c1cda4084
--- /dev/null
+++ b/e2e/scenes/utils/typings/undo.ts
@@ -0,0 +1,19 @@
+// https://nodejs.org/api/os.html#os_os_platform
+enum Platform {
+  osx = 'darwin',
+  windows = 'win32',
+  linux = 'linux',
+  aix = 'aix',
+  freebsd = 'freebsd',
+  openbsd = 'openbsd',
+  sunos = 'sunos',
+}
+
+export const undo = () => {
+  switch (Cypress.platform) {
+    case Platform.osx:
+      return '{cmd}z';
+    default:
+      return '{ctrl}z';
+  }
+};
diff --git a/e2e/utils/flows/configurePanel.ts b/e2e/utils/flows/configurePanel.ts
index 20139f1876b4f..4aa6a6cc5ab65 100644
--- a/e2e/utils/flows/configurePanel.ts
+++ b/e2e/utils/flows/configurePanel.ts
@@ -21,9 +21,7 @@ interface ConfigurePanelDefault {
     route: string | RegExp;
   };
   dashboardUid: string;
-  matchScreenshot: boolean;
   saveDashboard: boolean;
-  screenshotName: string;
   visitDashboardAtStart: boolean; // @todo remove when possible
 }
 
@@ -60,9 +58,7 @@ export const configurePanel = (config: PartialAddPanelConfig | PartialEditPanelC
         route: '/api/ds/query',
       },
       dashboardUid: lastAddedDashboardUid,
-      matchScreenshot: false,
       saveDashboard: true,
-      screenshotName: 'panel-visualization',
       visitDashboardAtStart: true,
       ...config,
     };
@@ -72,10 +68,8 @@ export const configurePanel = (config: PartialAddPanelConfig | PartialEditPanelC
       dashboardUid,
       dataSourceName,
       isEdit,
-      matchScreenshot,
       panelTitle,
       queriesForm,
-      screenshotName,
       timeRange,
       visitDashboardAtStart,
       visualizationName,
@@ -157,15 +151,6 @@ export const configurePanel = (config: PartialAddPanelConfig | PartialEditPanelC
     // Wait for RxJS
     cy.wait(timeout ?? Cypress.config().defaultCommandTimeout);
 
-    if (matchScreenshot) {
-      let visualization;
-
-      visualization = e2e.components.Panels.Panel.containerByTitle(panelTitle).find('.panel-content');
-
-      visualization.scrollIntoView().screenshot(screenshotName);
-      cy.compareScreenshots(screenshotName);
-    }
-
     // @todo remove `wrap` when possible
     return cy.wrap({ config: fullConfig }, { log: false });
   });
diff --git a/e2e/utils/support/monaco.ts b/e2e/utils/support/monaco.ts
new file mode 100644
index 0000000000000..54c528877edc4
--- /dev/null
+++ b/e2e/utils/support/monaco.ts
@@ -0,0 +1,7 @@
+import { e2e } from '../index';
+
+export function waitForMonacoToLoad() {
+  e2e.components.QueryField.container().children('[data-testid="Spinner"]').should('not.exist');
+  cy.window().its('monaco').should('exist');
+  cy.get('.monaco-editor textarea:first').should('exist');
+}
diff --git a/e2e/utils/support/types.ts b/e2e/utils/support/types.ts
index 193ad190b246a..e7ccfe91db705 100644
--- a/e2e/utils/support/types.ts
+++ b/e2e/utils/support/types.ts
@@ -12,14 +12,14 @@ export type E2EFunctionWithOnlyOptions = (options?: CypressOptions) => Cypress.C
 export type TypeSelectors<S> = S extends StringSelector
   ? E2EFunctionWithOnlyOptions
   : S extends FunctionSelector
-  ? E2EFunction
-  : S extends CssSelector
-  ? E2EFunction
-  : S extends UrlSelector
-  ? E2EVisit & Omit<E2EFunctions<S>, 'url'>
-  : S extends Record<string, string | FunctionSelector | CssSelector | UrlSelector | Selectors>
-  ? E2EFunctions<S>
-  : S;
+    ? E2EFunction
+    : S extends CssSelector
+      ? E2EFunction
+      : S extends UrlSelector
+        ? E2EVisit & Omit<E2EFunctions<S>, 'url'>
+        : S extends Record<string, string | FunctionSelector | CssSelector | UrlSelector | Selectors>
+          ? E2EFunctions<S>
+          : S;
 
 export type E2EFunctions<S extends Selectors> = {
   [P in keyof S]: TypeSelectors<S[P]>;
diff --git a/e2e/various-suite/exemplars.spec.ts b/e2e/various-suite/exemplars.spec.ts
index 97da7f3aabd22..b3c422c129432 100644
--- a/e2e/various-suite/exemplars.spec.ts
+++ b/e2e/various-suite/exemplars.spec.ts
@@ -1,4 +1,5 @@
 import { e2e } from '../utils';
+import { waitForMonacoToLoad } from '../utils/support/monaco';
 
 const dataSourceName = 'PromExemplar';
 const addDataSource = () => {
@@ -10,7 +11,7 @@ const addDataSource = () => {
       e2e.components.DataSource.Prometheus.configPage.exemplarsAddButton().click();
       e2e.components.DataSource.Prometheus.configPage.internalLinkSwitch().check({ force: true });
       e2e.components.DataSource.Prometheus.configPage.connectionSettings().type('http://prom-url:9090');
-      e2e.components.DataSourcePicker.inputV2().click({ force: true }).should('have.focus');
+      cy.get('[data-testid="data-testid Data source picker select container"]').click();
 
       cy.contains('gdev-tempo').scrollIntoView().should('be.visible').click();
     },
@@ -55,14 +56,10 @@ describe('Exemplars', () => {
     cy.contains(dataSourceName).scrollIntoView().should('be.visible').click();
 
     // Switch to code editor
-    cy.contains('label', 'Code').click();
+    e2e.components.RadioButton.container().filter(':contains("Code")').click();
 
-    // we need to wait for the query-field being lazy-loaded, in two steps:
-    // 1. first we wait for the text 'Loading...' to appear
-    // 1. then we wait for the text 'Loading...' to disappear
-    const monacoLoadingText = 'Loading...';
-    e2e.components.QueryField.container().should('be.visible').should('have.text', monacoLoadingText);
-    e2e.components.QueryField.container().should('be.visible').should('not.have.text', monacoLoadingText);
+    // Wait for lazy loading Monaco
+    waitForMonacoToLoad();
 
     e2e.components.TimePicker.openButton().click();
     e2e.components.TimePicker.fromField().clear().type('2021-07-10 17:10:00');
@@ -72,7 +69,7 @@ describe('Exemplars', () => {
 
     cy.get(`[data-testid="time-series-zoom-to-data"]`).click();
 
-    e2e.components.DataSource.Prometheus.exemplarMarker().first().trigger('mouseover');
+    e2e.components.DataSource.Prometheus.exemplarMarker().first().trigger('mousemove');
     cy.contains('Query with gdev-tempo').click();
     e2e.components.TraceViewer.spanBar().should('have.length', 11);
   });
diff --git a/e2e/various-suite/explore.spec.ts b/e2e/various-suite/explore.spec.ts
index 0207aa5d82a44..69d74c29e988a 100644
--- a/e2e/various-suite/explore.spec.ts
+++ b/e2e/various-suite/explore.spec.ts
@@ -10,14 +10,6 @@ describe('Explore', () => {
     e2e.pages.Explore.General.container().should('have.length', 1);
     e2e.components.RefreshPicker.runButtonV2().should('have.length', 1);
 
-    // delete query history queries that would be unrelated
-    e2e.components.QueryTab.queryHistoryButton().should('be.visible').click();
-    cy.get('button[title="Delete query"]').each((button) => {
-      button.trigger('click');
-    });
-    cy.get('button[title="Delete query"]').should('not.exist');
-    e2e.components.QueryTab.queryHistoryButton().should('be.visible').click();
-
     e2e.components.DataSource.TestData.QueryTab.scenarioSelectContainer()
       .scrollIntoView()
       .should('be.visible')
@@ -26,17 +18,5 @@ describe('Explore', () => {
       });
 
     cy.contains('CSV Metric Values').scrollIntoView().should('be.visible').click();
-
-    const canvases = cy.get('canvas');
-    canvases.should('have.length', 1);
-
-    // Both queries above should have been run and be shown in the query history
-    e2e.components.QueryTab.queryHistoryButton().should('be.visible').click();
-    e2e.components.QueryHistory.queryText().should('have.length', 1).should('contain', 'csv_metric_values');
-
-    // delete all queries
-    cy.get('button[title="Delete query"]').each((button) => {
-      button.trigger('click');
-    });
   });
 });
diff --git a/e2e/various-suite/fixtures/datasets-response.json b/e2e/various-suite/fixtures/datasets-response.json
deleted file mode 100644
index f9ab5f5f94bec..0000000000000
--- a/e2e/various-suite/fixtures/datasets-response.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "results": {
-    "datasets": {
-      "status": 200,
-      "frames": [
-        {
-          "schema": {
-            "refId": "datasets",
-            "meta": {
-              "executedQueryString": "SELECT DISTINCT TABLE_SCHEMA from information_schema.TABLES where TABLE_TYPE != 'SYSTEM VIEW' ORDER BY TABLE_SCHEMA"
-            },
-            "fields": [
-              { "name": "TABLE_SCHEMA", "type": "string", "typeInfo": { "frame": "string", "nullable": true } }
-            ]
-          },
-          "data": { "values": [["DataMaker", "mysql", "performance_schema", "sys"]] }
-        }
-      ]
-    }
-  }
-}
diff --git a/e2e/various-suite/fixtures/fields-response.json b/e2e/various-suite/fixtures/fields-response.json
deleted file mode 100644
index 3ccf5a0a5b8e9..0000000000000
--- a/e2e/various-suite/fixtures/fields-response.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "results": {
-    "fields": {
-      "status": 200,
-      "frames": [
-        {
-          "schema": {
-            "refId": "fields",
-            "meta": {
-              "executedQueryString": "SELECT column_name, data_type FROM information_schema.columns WHERE table_schema = 'DataMaker' AND table_name = 'RandomIntsWithTimes' ORDER BY column_name"
-            },
-            "fields": [
-              { "name": "COLUMN_NAME", "type": "string", "typeInfo": { "frame": "string", "nullable": true } },
-              { "name": "DATA_TYPE", "type": "string", "typeInfo": { "frame": "string", "nullable": true } }
-            ]
-          },
-          "data": {
-            "values": [
-              ["createdAt", "id", "time", "updatedAt", "bigint"],
-              ["datetime", "int", "datetime", "datetime", "int"]
-            ]
-          }
-        }
-      ]
-    }
-  }
-}
diff --git a/e2e/various-suite/fixtures/tables-response.json b/e2e/various-suite/fixtures/tables-response.json
deleted file mode 100644
index 6cdda15184923..0000000000000
--- a/e2e/various-suite/fixtures/tables-response.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "results": {
-    "tables": {
-      "status": 200,
-      "frames": [
-        {
-          "schema": {
-            "refId": "tables",
-            "meta": {
-              "executedQueryString": "SELECT table_name FROM information_schema.tables WHERE table_schema = 'DataMaker' ORDER BY table_name"
-            },
-            "fields": [{ "name": "TABLE_NAME", "type": "string", "typeInfo": { "frame": "string", "nullable": true } }]
-          },
-          "data": { "values": [["normalTable", "table-name"]] }
-        }
-      ]
-    }
-  }
-}
diff --git a/e2e/various-suite/frontend-sandbox-app.spec.ts b/e2e/various-suite/frontend-sandbox-app.spec.ts
index 9bcf4d49832db..b3e17ece6a93a 100644
--- a/e2e/various-suite/frontend-sandbox-app.spec.ts
+++ b/e2e/various-suite/frontend-sandbox-app.spec.ts
@@ -26,21 +26,14 @@ describe('Datasource sandbox', () => {
       });
 
       it('Loads the app page without the sandbox div wrapper', () => {
-        e2e.pages.Home.visit();
-        e2e.components.NavBar.Toggle.button().click();
-        e2e.components.NavToolbar.container().get('[aria-label="Expand section Apps"]').click();
-        e2e.components.NavMenu.item().contains('Sandbox app test plugin').click();
+        cy.visit(`/a/${APP_ID}`);
         cy.wait(200); // wait to prevent false positives because cypress checks too fast
         cy.get('div[data-plugin-sandbox="sandbox-app-test"]').should('not.exist');
         cy.get('div[data-testid="sandbox-app-test-page-one"]').should('exist');
       });
 
       it('Loads the app configuration without the sandbox div wrapper', () => {
-        e2e.pages.Home.visit();
-        e2e.components.NavBar.Toggle.button().click();
-        e2e.components.NavToolbar.container().get('[aria-label="Expand section Apps"]').click();
-        e2e.components.NavMenu.item().contains('Apps').click();
-        cy.get('a[aria-label="Tab Sandbox App Page"]').click();
+        cy.visit(`/plugins/${APP_ID}`);
         cy.wait(200); // wait to prevent false positives because cypress checks too fast
         cy.get('div[data-plugin-sandbox="sandbox-app-test"]').should('not.exist');
         cy.get('div[data-testid="sandbox-app-test-config-page"]').should('exist');
@@ -55,20 +48,13 @@ describe('Datasource sandbox', () => {
       });
 
       it('Loads the app page with the sandbox div wrapper', () => {
-        e2e.pages.Home.visit();
-        e2e.components.NavBar.Toggle.button().click();
-        e2e.components.NavToolbar.container().get('[aria-label="Expand section Apps"]').click();
-        e2e.components.NavMenu.item().contains('Sandbox app test plugin').click();
+        cy.visit(`/a/${APP_ID}`);
         cy.get('div[data-plugin-sandbox="sandbox-app-test"]').should('exist');
         cy.get('div[data-testid="sandbox-app-test-page-one"]').should('exist');
       });
 
       it('Loads the app configuration with the sandbox div wrapper', () => {
-        e2e.pages.Home.visit();
-        e2e.components.NavBar.Toggle.button().click();
-        e2e.components.NavToolbar.container().get('[aria-label="Expand section Apps"]').click();
-        e2e.components.NavMenu.item().contains('Apps').click();
-        cy.get('a[aria-label="Tab Sandbox App Page"]').click();
+        cy.visit(`/plugins/${APP_ID}`);
         cy.get('div[data-plugin-sandbox="sandbox-app-test"]').should('exist');
         cy.get('div[data-testid="sandbox-app-test-config-page"]').should('exist');
       });
diff --git a/e2e/various-suite/graph-auto-migrate.spec.ts b/e2e/various-suite/graph-auto-migrate.spec.ts
index 4360477ce6114..eedb7a043e616 100644
--- a/e2e/various-suite/graph-auto-migrate.spec.ts
+++ b/e2e/various-suite/graph-auto-migrate.spec.ts
@@ -1,19 +1,51 @@
 import { e2e } from '../utils';
+
 const DASHBOARD_ID = 'XMjIZPmik';
 const DASHBOARD_NAME = 'Panel Tests - Graph Time Regions';
+const UPLOT_MAIN_DIV_SELECTOR = '[data-testid="uplot-main-div"]';
 
 describe('Auto-migrate graph panel', () => {
   beforeEach(() => {
     e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
   });
 
-  it('Annotation markers exist for time regions', () => {
+  it('Graph panel is migrated with `autoMigrateOldPanels` feature toggle', () => {
     e2e.flows.openDashboard({ uid: DASHBOARD_ID });
     cy.contains(DASHBOARD_NAME).should('be.visible');
-    cy.contains('uplot-main-div').should('not.exist');
+    cy.get(UPLOT_MAIN_DIV_SELECTOR).should('not.exist');
 
     e2e.flows.openDashboard({ uid: DASHBOARD_ID, queryParams: { '__feature.autoMigrateOldPanels': true } });
 
+    cy.get(UPLOT_MAIN_DIV_SELECTOR).should('exist');
+  });
+
+  it('Graph panel is migrated with config `disableAngular` feature toggle', () => {
+    e2e.flows.openDashboard({ uid: DASHBOARD_ID });
+    cy.contains(DASHBOARD_NAME).should('be.visible');
+    cy.get(UPLOT_MAIN_DIV_SELECTOR).should('not.exist');
+
+    e2e.flows.openDashboard({ uid: DASHBOARD_ID, queryParams: { '__feature.disableAngular': true } });
+
+    cy.get(UPLOT_MAIN_DIV_SELECTOR).should('exist');
+  });
+
+  it('Graph panel is migrated with `autoMigrateGraphPanel` feature toggle', () => {
+    e2e.flows.openDashboard({ uid: DASHBOARD_ID });
+    cy.contains(DASHBOARD_NAME).should('be.visible');
+    cy.get(UPLOT_MAIN_DIV_SELECTOR).should('not.exist');
+
+    e2e.flows.openDashboard({ uid: DASHBOARD_ID, queryParams: { '__feature.autoMigrateGraphPanel': true } });
+
+    cy.get(UPLOT_MAIN_DIV_SELECTOR).should('exist');
+  });
+
+  it('Annotation markers exist for time regions', () => {
+    e2e.flows.openDashboard({ uid: DASHBOARD_ID });
+    cy.contains(DASHBOARD_NAME).should('be.visible');
+    cy.get(UPLOT_MAIN_DIV_SELECTOR).should('not.exist');
+
+    e2e.flows.openDashboard({ uid: DASHBOARD_ID, queryParams: { '__feature.autoMigrateGraphPanel': true } });
+
     e2e.components.Panels.Panel.title('Business Hours')
       .should('exist')
       .within(() => {
@@ -32,7 +64,7 @@ describe('Auto-migrate graph panel', () => {
         e2e.pages.Dashboard.Annotations.marker().should('exist');
       });
 
-    cy.get('body').children().find('.scrollbar-view').first().scrollTo('bottom');
+    cy.get('#pageContent .scrollbar-view').first().scrollTo('bottom');
 
     e2e.components.Panels.Panel.title('05:00')
       .should('exist')
diff --git a/e2e/various-suite/helpers/prometheus-helpers.ts b/e2e/various-suite/helpers/prometheus-helpers.ts
new file mode 100644
index 0000000000000..265095ecd6591
--- /dev/null
+++ b/e2e/various-suite/helpers/prometheus-helpers.ts
@@ -0,0 +1,62 @@
+import { e2e } from '../../utils';
+
+/**
+ * Create a Prom data source
+ */
+export function createPromDS(dataSourceID: string, name: string): void {
+  // login
+  e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'), true);
+
+  // select the prometheus DS
+  e2e.pages.AddDataSource.visit();
+  e2e.pages.AddDataSource.dataSourcePluginsV2(dataSourceID)
+    .scrollIntoView()
+    .should('be.visible') // prevents flakiness
+    .click();
+
+  // add url for DS to save without error
+  e2e.components.DataSource.Prometheus.configPage.connectionSettings().type('http://prom-url:9090');
+
+  // name the DS
+  e2e.pages.DataSource.name().clear();
+  e2e.pages.DataSource.name().type(name);
+  e2e.pages.DataSource.saveAndTest().click();
+}
+
+export function getResources() {
+  cy.intercept(/__name__/g, metricResponse);
+
+  cy.intercept(/metadata/g, metadataResponse);
+
+  cy.intercept(/labels/g, labelsResponse);
+}
+
+const metricResponse = {
+  status: 'success',
+  data: ['metric1', 'metric2'],
+};
+
+const metadataResponse = {
+  status: 'success',
+  data: {
+    metric1: [
+      {
+        type: 'counter',
+        help: 'metric1 help',
+        unit: '',
+      },
+    ],
+    metric2: [
+      {
+        type: 'counter',
+        help: 'metric2 help',
+        unit: '',
+      },
+    ],
+  },
+};
+
+const labelsResponse = {
+  status: 'success',
+  data: ['__name__', 'action', 'active', 'backend'],
+};
diff --git a/e2e/various-suite/loki-editor.spec.ts b/e2e/various-suite/loki-editor.spec.ts
index 8ba7d4647f61b..42bf063c1370b 100644
--- a/e2e/various-suite/loki-editor.spec.ts
+++ b/e2e/various-suite/loki-editor.spec.ts
@@ -1,4 +1,5 @@
 import { e2e } from '../utils';
+import { waitForMonacoToLoad } from '../utils/support/monaco';
 
 const dataSourceName = 'LokiEditor';
 const addDataSource = () => {
@@ -37,13 +38,9 @@ describe('Loki Query Editor', () => {
     e2e.components.DataSourcePicker.container().should('be.visible').click();
     cy.contains(dataSourceName).scrollIntoView().should('be.visible').click();
 
-    cy.contains('Code').click();
+    e2e.components.RadioButton.container().filter(':contains("Code")').click();
 
-    // Wait for lazy loading
-    const monacoLoadingText = 'Loading...';
-
-    e2e.components.QueryField.container().should('be.visible').should('have.text', monacoLoadingText);
-    e2e.components.QueryField.container().should('be.visible').should('not.have.text', monacoLoadingText);
+    waitForMonacoToLoad();
 
     // adds closing braces around empty value
     e2e.components.QueryField.container().type('time(');
diff --git a/e2e/various-suite/loki-query-builder.spec.ts b/e2e/various-suite/loki-query-builder.spec.ts
index 348a4d92ab5fb..1707a32dd859f 100644
--- a/e2e/various-suite/loki-query-builder.spec.ts
+++ b/e2e/various-suite/loki-query-builder.spec.ts
@@ -43,6 +43,10 @@ describe('Loki query builder', () => {
       req.reply({ status: 'success', data: ['instance1', 'instance2'] });
     }).as('valuesRequest');
 
+    cy.intercept(/index\/stats/, (req) => {
+      req.reply({ streams: 2, chunks: 2660, bytes: 2721792, entries: 14408 });
+    });
+
     // Go to Explore and choose Loki data source
     e2e.pages.Explore.visit();
     e2e.components.DataSourcePicker.container().should('be.visible').click();
@@ -68,17 +72,26 @@ describe('Loki query builder', () => {
     // Add labels to remove error
     e2e.components.QueryBuilder.labelSelect().should('be.visible').click();
     // wait until labels are loaded and set on the component before starting to type
+    e2e.components.QueryBuilder.labelSelect().children('div').children('input').type('i');
     cy.wait('@labelsRequest');
-    e2e.components.QueryBuilder.labelSelect().type('instance{enter}');
-    e2e.components.QueryBuilder.matchOperatorSelect().should('be.visible').click().type('=~{enter}');
+    e2e.components.QueryBuilder.labelSelect().children('div').children('input').type('nstance{enter}');
+    e2e.components.QueryBuilder.matchOperatorSelect()
+      .should('be.visible')
+      .click({ force: true })
+      .children('div')
+      .children('input')
+      .type('=~{enter}', { force: true });
     e2e.components.QueryBuilder.valueSelect().should('be.visible').click();
+    e2e.components.QueryBuilder.valueSelect().children('div').children('input').type('instance1{enter}');
     cy.wait('@valuesRequest');
-    e2e.components.QueryBuilder.valueSelect().type('instance1{enter}').type('instance2{enter}');
+    e2e.components.QueryBuilder.valueSelect().children('div').children('input').type('instance2{enter}');
+
     cy.contains(MISSING_LABEL_FILTER_ERROR_MESSAGE).should('not.exist');
     cy.contains(finalQuery).should('be.visible');
 
     // Change to code editor
-    cy.contains('label', 'Code').click();
+    e2e.components.RadioButton.container().filter(':contains("Code")').click();
+
     // We need to test this manually because the final query is split into separate DOM elements using cy.contains(finalQuery).should('be.visible'); does not detect the query.
     cy.contains('rate').should('be.visible');
     cy.contains('instance1|instance2').should('be.visible');
diff --git a/e2e/various-suite/loki-table-explore-to-dash.spec.ts b/e2e/various-suite/loki-table-explore-to-dash.spec.ts
new file mode 100644
index 0000000000000..190a5ea5a14de
--- /dev/null
+++ b/e2e/various-suite/loki-table-explore-to-dash.spec.ts
@@ -0,0 +1,222 @@
+import { e2e } from '../utils';
+
+const dataSourceName = 'LokiEditor';
+const addDataSource = () => {
+  e2e.flows.addDataSource({
+    type: 'Loki',
+    expectedAlertMessage: 'Unable to connect with Loki. Please check the server logs for more details.',
+    name: dataSourceName,
+    form: () => {
+      cy.get('#connection-url').type('http://loki-url:3100');
+    },
+  });
+};
+
+const lokiQueryResult = {
+  status: 'success',
+  results: {
+    A: {
+      status: 200,
+      frames: [
+        {
+          schema: {
+            refId: 'A',
+            meta: {
+              typeVersion: [0, 0],
+              custom: {
+                frameType: 'LabeledTimeValues',
+              },
+              stats: [
+                {
+                  displayName: 'Summary: bytes processed per second',
+                  unit: 'Bps',
+                  value: 223921,
+                },
+                {
+                  displayName: 'Summary: total bytes processed',
+                  unit: 'decbytes',
+                  value: 4156,
+                },
+                {
+                  displayName: 'Summary: exec time',
+                  unit: 's',
+                  value: 0.01856,
+                },
+              ],
+              executedQueryString: 'Expr: {targetLabelName="targetLabelValue"}',
+            },
+            fields: [
+              {
+                name: 'labels',
+                type: 'other',
+                typeInfo: {
+                  frame: 'json.RawMessage',
+                },
+              },
+              {
+                name: 'Time',
+                type: 'time',
+                typeInfo: {
+                  frame: 'time.Time',
+                },
+              },
+              {
+                name: 'Line',
+                type: 'string',
+                typeInfo: {
+                  frame: 'string',
+                },
+              },
+              {
+                name: 'tsNs',
+                type: 'string',
+                typeInfo: {
+                  frame: 'string',
+                },
+              },
+              {
+                name: 'id',
+                type: 'string',
+                typeInfo: {
+                  frame: 'string',
+                },
+              },
+            ],
+          },
+          data: {
+            values: [
+              [
+                {
+                  targetLabelName: 'targetLabelValue',
+                  instance: 'server\\1',
+                  job: '"grafana/data"',
+                  nonIndexed: 'value',
+                  place: 'moon',
+                  re: 'one.two$three^four',
+                  source: 'data',
+                },
+              ],
+              [1700077283237],
+              [
+                '{"_entry":"log text with ANSI \\u001b[31mpart of the text\\u001b[0m [149702545]","counter":"22292","float":"NaN","wave":-0.5877852522916832,"label":"val3","level":"info"}',
+              ],
+              ['1700077283237000000'],
+              ['1700077283237000000_9b025d35'],
+            ],
+          },
+        },
+      ],
+    },
+  },
+};
+
+describe('Loki Query Editor', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+  });
+
+  afterEach(() => {
+    e2e.flows.revertAllChanges();
+  });
+
+  beforeEach(() => {
+    cy.window().then((win) => {
+      win.localStorage.setItem('grafana.featureToggles', 'logsExploreTableVisualisation=1');
+    });
+  });
+  it('Should be able to add explore table to dashboard', () => {
+    addDataSource();
+
+    cy.intercept(/labels?/, (req) => {
+      req.reply({ status: 'success', data: ['instance', 'job', 'source'] });
+    });
+
+    cy.intercept(/series?/, (req) => {
+      req.reply({ status: 'success', data: [{ instance: 'instance1' }] });
+    });
+
+    cy.intercept(/\/api\/ds\/query\?ds_type=loki?/, (req) => {
+      req.reply(lokiQueryResult);
+    });
+
+    // Go to Explore and choose Loki data source
+    e2e.pages.Explore.visit();
+    e2e.components.DataSourcePicker.container().should('be.visible').click();
+    cy.contains(dataSourceName).scrollIntoView().should('be.visible').click();
+
+    cy.contains('Code').click({ force: true });
+
+    // Wait for lazy loading
+    // const monacoLoadingText = 'Loading...';
+
+    // e2e.components.QueryField.container().should('be.visible').should('have.text', monacoLoadingText);
+    e2e.components.QueryField.container()
+      .find('.view-overlays[role="presentation"]')
+      .get('.cdr')
+      .then(($el) => {
+        const win = $el[0].ownerDocument.defaultView;
+        const after = win.getComputedStyle($el[0], '::after');
+        const content = after.getPropertyValue('content');
+        expect(content).to.eq('"Enter a Loki query (run with Shift+Enter)"');
+      });
+
+    // Write a simple query
+    e2e.components.QueryField.container().type('query').type('{instance="instance1"');
+    cy.get('.monaco-editor textarea:first').should(($el) => {
+      expect($el.val()).to.eq('query{instance="instance1"}');
+    });
+
+    // Submit the query
+    e2e.components.QueryField.container().type('{shift+enter}');
+    // Assert the no-data message is not visible
+    cy.get('[data-testid="explore-no-data"]').should('not.exist');
+
+    // Click on the table toggle
+    cy.contains('Table').click({ force: true });
+
+    // One row with two cells
+    cy.get('[role="cell"]').should('have.length', 2);
+
+    cy.contains('label', 'targetLabelName').should('be.visible');
+    cy.contains('label', 'targetLabelName').click();
+    cy.contains('label', 'targetLabelName').within(() => {
+      cy.get('input[type="checkbox"]').check({ force: true });
+    });
+
+    cy.contains('label', 'targetLabelName').within(() => {
+      cy.get('input[type="checkbox"]').should('be.checked');
+    });
+
+    const exploreCells = cy.get('[role="cell"]');
+
+    // Now we should have a row with 3 columns
+    exploreCells.should('have.length', 3);
+    // And a value of "targetLabelValue"
+    exploreCells.should('contain', 'targetLabelValue');
+
+    const addToDashboardButton = cy.get('[aria-label="Add to dashboard"]');
+
+    // Now let's add this to a dashboard
+    addToDashboardButton.should('be.visible');
+    addToDashboardButton.click();
+
+    const addPanelToDashboardButton = cy.contains('Add panel to dashboard');
+    addPanelToDashboardButton.should('be.visible');
+
+    const openDashboardButton = cy.contains('Open dashboard');
+    openDashboardButton.should('be.visible');
+    openDashboardButton.click();
+
+    const panel = cy.get('[data-panelid="1"]');
+    panel.should('be.visible');
+
+    const cells = panel.find('[role="table"] [role="cell"]');
+    // Should have 3 columns
+    cells.should('have.length', 3);
+    // Cells contain strings found in log line
+    cells.contains('"wave":-0.5877852522916832');
+
+    // column has correct value of "targetLabelValue", need to requery the DOM because of the .contains call above
+    cy.get('[data-panelid="1"]').find('[role="table"] [role="cell"]').contains('targetLabelValue');
+  });
+});
diff --git a/e2e/various-suite/mysql.spec.ts b/e2e/various-suite/mysql.spec.ts
deleted file mode 100644
index 6ef2502d87bb4..0000000000000
--- a/e2e/various-suite/mysql.spec.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { e2e } from '../utils';
-
-import datasetResponse from './fixtures/datasets-response.json';
-import fieldsResponse from './fixtures/fields-response.json';
-import tablesResponse from './fixtures/tables-response.json';
-
-const tableNameWithSpecialCharacter = tablesResponse.results.tables.frames[0].data.values[0][1];
-const normalTableName = tablesResponse.results.tables.frames[0].data.values[0][0];
-
-describe('MySQL datasource', () => {
-  beforeEach(() => {
-    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
-  });
-
-  it('code editor autocomplete should handle table name escaping/quoting', () => {
-    cy.intercept('POST', '/api/ds/query', (req) => {
-      if (req.body.queries[0].refId === 'datasets') {
-        req.alias = 'datasets';
-        req.reply({
-          body: datasetResponse,
-        });
-      } else if (req.body.queries[0].refId === 'tables') {
-        req.alias = 'tables';
-        req.reply({
-          body: tablesResponse,
-        });
-      } else if (req.body.queries[0].refId === 'fields') {
-        req.alias = 'fields';
-        req.reply({
-          body: fieldsResponse,
-        });
-      }
-    });
-
-    e2e.pages.Explore.visit();
-
-    e2e.components.DataSourcePicker.container().should('be.visible').type('gdev-mysql{enter}');
-
-    cy.get("label[for^='option-code']").should('be.visible').click();
-    cy.get('textarea').type('S{downArrow}{enter}');
-    cy.wait('@tables');
-    cy.get('.suggest-widget').contains(tableNameWithSpecialCharacter).should('be.visible');
-    cy.get('textarea').type('{enter}');
-    cy.get('textarea').should('have.value', `SELECT  FROM grafana.\`${tableNameWithSpecialCharacter}\``);
-
-    const deleteTimes = new Array(tableNameWithSpecialCharacter.length + 2).fill(
-      '{backspace}',
-      0,
-      tableNameWithSpecialCharacter.length + 2
-    );
-    cy.get('textarea').type(deleteTimes.join(''));
-
-    const commandKey = Cypress.platform === 'darwin' ? '{command}' : '{ctrl}';
-
-    cy.get('textarea').type(`${commandKey}i`);
-    cy.get('.suggest-widget').contains(tableNameWithSpecialCharacter).should('be.visible');
-    cy.get('textarea').type('S{downArrow}{enter}');
-    cy.get('textarea').should('have.value', `SELECT  FROM grafana.${normalTableName}`);
-
-    cy.get('textarea').type('.');
-    cy.get('.suggest-widget').contains('No suggestions.').should('be.visible');
-  });
-});
diff --git a/e2e/various-suite/navigation.spec.ts b/e2e/various-suite/navigation.spec.ts
index 35ee5ee90f4ee..099a0c875f4c5 100644
--- a/e2e/various-suite/navigation.spec.ts
+++ b/e2e/various-suite/navigation.spec.ts
@@ -6,16 +6,12 @@ describe('Docked Navigation', () => {
     cy.viewport(1280, 800);
     e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
 
-    cy.visit(fromBaseUrl('/'), {
-      onBeforeLoad(window) {
-        window.localStorage.setItem('grafana.featureToggles', 'dockedMegaMenu=1');
-      },
-    });
+    cy.visit(fromBaseUrl('/'));
   });
 
   it('should remain docked when reloading the page', () => {
     // Expand, then dock the mega menu
-    cy.get('[aria-label="Toggle menu"]').click();
+    cy.get('[aria-label="Open menu"]').click();
     cy.get('[aria-label="Dock menu"]').click();
 
     e2e.components.NavMenu.Menu().should('be.visible');
@@ -26,7 +22,7 @@ describe('Docked Navigation', () => {
 
   it('should remain docked when navigating to another page', () => {
     // Expand, then dock the mega menu
-    cy.get('[aria-label="Toggle menu"]').click();
+    cy.get('[aria-label="Open menu"]').click();
     cy.get('[aria-label="Dock menu"]').click();
 
     cy.contains('a', 'Administration').click();
diff --git a/e2e/various-suite/pie-chart.spec.ts b/e2e/various-suite/pie-chart.spec.ts
index 3ed6c1f689667..2030aed53fe33 100644
--- a/e2e/various-suite/pie-chart.spec.ts
+++ b/e2e/various-suite/pie-chart.spec.ts
@@ -11,7 +11,7 @@ describe('Pie Chart Panel', () => {
     // open Panel Tests - Pie Chart
     e2e.flows.openDashboard({ uid: 'lVE-2YFMz' });
 
-    cy.get(`[data-panelid=11] [aria-label^="${selectors.components.Panels.Visualization.PieChart.svgSlice}"]`).should(
+    cy.get(`[data-panelid=11] [data-testid^="${selectors.components.Panels.Visualization.PieChart.svgSlice}"]`).should(
       'have.length',
       5
     );
diff --git a/e2e/various-suite/prometheus-annotations.spec.ts b/e2e/various-suite/prometheus-annotations.spec.ts
new file mode 100644
index 0000000000000..b32620dda70c7
--- /dev/null
+++ b/e2e/various-suite/prometheus-annotations.spec.ts
@@ -0,0 +1,75 @@
+import { selectors } from '@grafana/e2e-selectors';
+
+import { e2e } from '../utils';
+import { addDashboard } from '../utils/flows';
+
+import { createPromDS, getResources } from './helpers/prometheus-helpers';
+
+const DATASOURCE_ID = 'Prometheus';
+
+const DATASOURCE_NAME = 'aprometheusAnnotationDS';
+
+/**
+ * Click dashboard settings and then the variables tab
+ *
+ */
+function navigateToAnnotations() {
+  e2e.components.PageToolbar.item('Dashboard settings').click();
+  e2e.components.Tab.title('Annotations').click();
+}
+
+function addPrometheusAnnotation(annotationName: string) {
+  e2e.pages.Dashboard.Settings.Annotations.List.addAnnotationCTAV2().click();
+  getResources();
+  e2e.pages.Dashboard.Settings.Annotations.Settings.name().clear().type(annotationName);
+  e2e.components.DataSourcePicker.container().should('be.visible').click();
+  cy.contains(DATASOURCE_NAME).scrollIntoView().should('be.visible').click();
+}
+
+describe('Prometheus annotations', () => {
+  beforeEach(() => {
+    createPromDS(DATASOURCE_ID, DATASOURCE_NAME);
+  });
+
+  it('should navigate to variable query editor', () => {
+    const annotationName = 'promAnnotation';
+    addDashboard();
+    navigateToAnnotations();
+    addPrometheusAnnotation(annotationName);
+
+    e2e.components.DataSource.Prometheus.queryEditor.code.metricsBrowser
+      .openButton()
+      .contains('Metrics browser')
+      .click();
+
+    e2e.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.selectMetric().should('exist').type('met');
+
+    e2e.components.DataSource.Prometheus.queryEditor.code.metricsBrowser
+      .metricList()
+      .should('exist')
+      .contains('metric1')
+      .click();
+
+    e2e.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.useQuery().should('exist').click();
+
+    e2e.components.DataSource.Prometheus.queryEditor.code.queryField().should('exist').contains('metric1');
+
+    // check for other parts of the annotations
+    // min step
+    cy.get(`#${selectors.components.DataSource.Prometheus.annotations.minStep}`);
+
+    // title
+    e2e.components.DataSource.Prometheus.annotations.title().scrollIntoView().should('exist');
+    // tags
+    e2e.components.DataSource.Prometheus.annotations.tags().scrollIntoView().should('exist');
+    // text
+    e2e.components.DataSource.Prometheus.annotations.text().scrollIntoView().should('exist');
+    // series value as timestamp
+    e2e.components.DataSource.Prometheus.annotations.seriesValueAsTimestamp().scrollIntoView().should('exist');
+
+    e2e.pages.Dashboard.Settings.Annotations.NewAnnotation.previewInDashboard().click();
+
+    // check that annotation exists
+    cy.get('body').contains(annotationName);
+  });
+});
diff --git a/e2e/various-suite/prometheus-config.spec.ts b/e2e/various-suite/prometheus-config.spec.ts
new file mode 100644
index 0000000000000..9903b2393329e
--- /dev/null
+++ b/e2e/various-suite/prometheus-config.spec.ts
@@ -0,0 +1,111 @@
+import { selectors } from '@grafana/e2e-selectors';
+
+import { e2e } from '../utils';
+
+const DATASOURCE_ID = 'Prometheus';
+const DATASOURCE_TYPED_NAME = 'PrometheusDatasourceInstance';
+
+describe('Prometheus config', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'), true);
+
+    e2e.pages.AddDataSource.visit();
+    e2e.pages.AddDataSource.dataSourcePluginsV2(DATASOURCE_ID)
+      .scrollIntoView()
+      .should('be.visible') // prevents flakiness
+      .click({ force: true });
+  });
+
+  it(`should have the following components:
+        connection settings
+        managed alerts
+        scrape interval
+        query timeout
+        default editor
+        disable metric lookup
+        prometheus type
+        cache level
+        incremental querying
+        disable recording rules
+        custom query parameters
+        http method
+      `, () => {
+    // connection settings
+    e2e.components.DataSource.Prometheus.configPage.connectionSettings().should('be.visible');
+    // managed alerts
+    cy.get(`#${selectors.components.DataSource.Prometheus.configPage.manageAlerts}`).scrollIntoView().should('exist');
+    // scrape interval
+    e2e.components.DataSource.Prometheus.configPage.scrapeInterval().scrollIntoView().should('exist');
+    // query timeout
+    e2e.components.DataSource.Prometheus.configPage.queryTimeout().scrollIntoView().should('exist');
+    // default editor
+    e2e.components.DataSource.Prometheus.configPage.defaultEditor().scrollIntoView().should('exist');
+    // disable metric lookup
+    cy.get(`#${selectors.components.DataSource.Prometheus.configPage.disableMetricLookup}`)
+      .scrollIntoView()
+      .should('exist');
+    // prometheus type
+    e2e.components.DataSource.Prometheus.configPage.prometheusType().scrollIntoView().should('exist');
+    // cache level
+    e2e.components.DataSource.Prometheus.configPage.cacheLevel().scrollIntoView().should('exist');
+    // incremental querying
+    cy.get(`#${selectors.components.DataSource.Prometheus.configPage.incrementalQuerying}`)
+      .scrollIntoView()
+      .should('exist');
+    // disable recording rules
+    cy.get(`#${selectors.components.DataSource.Prometheus.configPage.disableRecordingRules}`)
+      .scrollIntoView()
+      .should('exist');
+    // custom query parameters
+    e2e.components.DataSource.Prometheus.configPage.customQueryParameters().scrollIntoView().should('exist');
+    // http method
+    e2e.components.DataSource.Prometheus.configPage.httpMethod().scrollIntoView().should('exist');
+  });
+
+  it('should save the default editor when navigating to explore', () => {
+    e2e.components.DataSource.Prometheus.configPage.defaultEditor().scrollIntoView().should('exist').click();
+
+    selectOption('Builder');
+
+    e2e.components.DataSource.Prometheus.configPage.connectionSettings().type('http://prom-url:9090');
+
+    e2e.pages.DataSource.name().clear();
+    e2e.pages.DataSource.name().type(DATASOURCE_TYPED_NAME);
+    e2e.pages.DataSource.saveAndTest().click();
+
+    e2e.pages.Explore.visit();
+
+    e2e.components.DataSourcePicker.container().should('be.visible').click();
+
+    e2e.components.DataSourcePicker.container().type(`${DATASOURCE_TYPED_NAME}{enter}`);
+
+    e2e.components.DataSource.Prometheus.queryEditor.builder.metricSelect().should('exist');
+  });
+
+  it('should allow a user to add the version when the Prom type is selected', () => {
+    e2e.components.DataSource.Prometheus.configPage.prometheusType().scrollIntoView().should('exist').click();
+
+    selectOption('Prometheus');
+
+    e2e.components.DataSource.Prometheus.configPage.prometheusVersion().scrollIntoView().should('exist');
+  });
+
+  it('should have a cache level component', () => {
+    e2e.components.DataSource.Prometheus.configPage.cacheLevel().scrollIntoView().should('exist');
+  });
+
+  it('should allow a user to select a query overlap window when incremental querying is selected', () => {
+    cy.get(`#${selectors.components.DataSource.Prometheus.configPage.incrementalQuerying}`)
+      .scrollIntoView()
+      .should('exist')
+      .check({ force: true });
+
+    e2e.components.DataSource.Prometheus.configPage.queryOverlapWindow().scrollIntoView().should('exist');
+  });
+
+  // exemplars tested in exemplar.spec
+});
+
+export function selectOption(option: string) {
+  cy.get("[aria-label='Select option']").contains(option).should('be.visible').click();
+}
diff --git a/e2e/various-suite/prometheus-editor.spec.ts b/e2e/various-suite/prometheus-editor.spec.ts
new file mode 100644
index 0000000000000..b5b6b7874b87e
--- /dev/null
+++ b/e2e/various-suite/prometheus-editor.spec.ts
@@ -0,0 +1,182 @@
+import { selectors } from '@grafana/e2e-selectors';
+
+import { e2e } from '../utils';
+
+import { getResources } from './helpers/prometheus-helpers';
+
+const DATASOURCE_ID = 'Prometheus';
+
+type editorType = 'Code' | 'Builder';
+
+/**
+ * Login, create and save a Prometheus data source, navigate to code or builder
+ *
+ * @param editorType 'Code' or 'Builder'
+ */
+function navigateToEditor(editorType: editorType, name: string): void {
+  // login
+  e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'), true);
+
+  // select the prometheus DS
+  e2e.pages.AddDataSource.visit();
+  e2e.pages.AddDataSource.dataSourcePluginsV2(DATASOURCE_ID)
+    .scrollIntoView()
+    .should('be.visible') // prevents flakiness
+    .click();
+
+  // choose default editor
+  e2e.components.DataSource.Prometheus.configPage.defaultEditor().scrollIntoView().should('exist').click();
+  selectOption(editorType);
+
+  // add url for DS to save without error
+  e2e.components.DataSource.Prometheus.configPage.connectionSettings().type('http://prom-url:9090');
+
+  // name the DS
+  e2e.pages.DataSource.name().clear();
+  e2e.pages.DataSource.name().type(name);
+  e2e.pages.DataSource.saveAndTest().click();
+
+  // visit explore
+  e2e.pages.Explore.visit();
+
+  // choose the right DS
+  e2e.components.DataSourcePicker.container().should('be.visible').click();
+  cy.contains(name).scrollIntoView().should('be.visible').click();
+}
+
+describe('Prometheus query editor', () => {
+  it('should have a kickstart component', () => {
+    navigateToEditor('Code', 'prometheus');
+    e2e.components.QueryBuilder.queryPatterns().scrollIntoView().should('exist');
+  });
+
+  it('should have an explain component', () => {
+    navigateToEditor('Code', 'prometheus');
+    e2e.components.DataSource.Prometheus.queryEditor.explain().scrollIntoView().should('exist');
+  });
+
+  it('should have an editor toggle component', () => {
+    navigateToEditor('Code', 'prometheus');
+    e2e.components.DataSource.Prometheus.queryEditor.editorToggle().scrollIntoView().should('exist');
+  });
+
+  it('should have an options component with legend, format, step, type and exemplars', () => {
+    navigateToEditor('Code', 'prometheus');
+    // open options
+    e2e.components.DataSource.Prometheus.queryEditor.options().scrollIntoView().should('exist').click();
+    // check options
+    e2e.components.DataSource.Prometheus.queryEditor.legend().scrollIntoView().should('exist');
+    e2e.components.DataSource.Prometheus.queryEditor.format().scrollIntoView().should('exist');
+    cy.get(`#${selectors.components.DataSource.Prometheus.queryEditor.step}`).scrollIntoView().should('exist');
+    e2e.components.DataSource.Prometheus.queryEditor.type().scrollIntoView().should('exist');
+    cy.get(`#${selectors.components.DataSource.Prometheus.queryEditor.exemplars}`).scrollIntoView().should('exist');
+  });
+
+  describe('Code editor', () => {
+    it('navigates to the code editor with editor type as code', () => {
+      navigateToEditor('Code', 'prometheusCode');
+    });
+
+    it('navigates to the code editor and opens the metrics browser with metric search, labels, label values, and all components', () => {
+      navigateToEditor('Code', 'prometheusCode');
+
+      getResources();
+
+      e2e.components.DataSource.Prometheus.queryEditor.code.queryField().should('exist');
+
+      e2e.components.DataSource.Prometheus.queryEditor.code.metricsBrowser
+        .openButton()
+        .contains('Metrics browser')
+        .click();
+
+      e2e.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.selectMetric().should('exist');
+      e2e.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.labelNamesFilter().should('exist');
+      e2e.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.labelValuesFilter().should('exist');
+      e2e.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.useQuery().should('exist');
+      e2e.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.useAsRateQuery().should('exist');
+      e2e.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.validateSelector().should('exist');
+      e2e.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.clear().should('exist');
+    });
+
+    it('selects a metric in the metrics browser and uses the query', () => {
+      navigateToEditor('Code', 'prometheusCode');
+
+      getResources();
+
+      e2e.components.DataSource.Prometheus.queryEditor.code.metricsBrowser
+        .openButton()
+        .contains('Metrics browser')
+        .click();
+
+      e2e.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.selectMetric().should('exist').type('met');
+
+      e2e.components.DataSource.Prometheus.queryEditor.code.metricsBrowser
+        .metricList()
+        .should('exist')
+        .contains('metric1')
+        .click();
+
+      e2e.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.useQuery().should('exist').click();
+
+      e2e.components.DataSource.Prometheus.queryEditor.code.queryField().should('exist').contains('metric1');
+    });
+  });
+
+  describe('Query builder', () => {
+    it('navigates to the query builder with editor type as code', () => {
+      navigateToEditor('Builder', 'prometheusBuilder');
+    });
+
+    it('the query builder contains metric select, label filters and operations', () => {
+      navigateToEditor('Builder', 'prometheusBuilder');
+
+      getResources();
+
+      e2e.components.DataSource.Prometheus.queryEditor.builder.metricSelect().should('exist');
+      e2e.components.QueryBuilder.labelSelect().should('exist');
+      e2e.components.QueryBuilder.matchOperatorSelect().should('exist');
+      e2e.components.QueryBuilder.valueSelect().should('exist');
+    });
+
+    it('can select a metric and provide a hint', () => {
+      navigateToEditor('Builder', 'prometheusBuilder');
+
+      getResources();
+
+      e2e.components.DataSource.Prometheus.queryEditor.builder.metricSelect().should('exist').click();
+
+      selectOption('metric1');
+
+      e2e.components.DataSource.Prometheus.queryEditor.builder.hints().contains('hint: add rate');
+    });
+
+    it('should have the metrics explorer opened via the metric select', () => {
+      navigateToEditor('Builder', 'prometheusBuilder');
+
+      getResources();
+
+      e2e.components.DataSource.Prometheus.queryEditor.builder.metricSelect().should('exist').click();
+
+      selectOption('Metrics explorer');
+
+      e2e.components.DataSource.Prometheus.queryEditor.builder.metricsExplorer().should('exist');
+    });
+
+    // NEED TO COMPLETE QUEY ADVISOR WORK OR FIGURE OUT HOW TO ENABLE EXPERIMENTAL FEATURE TOGGLES
+    // it('should have a query advisor when enabled with feature toggle', () => {
+    //   cy.window().then((win) => {
+    //     win.localStorage.setItem('grafana.featureToggles', 'prometheusPromQAIL=0');
+
+    //     navigateToEditor('Builder', 'prometheusBuilder');
+
+    //     getResources();
+
+    //     e2e.components.DataSource.Prometheus.queryEditor.builder.queryAdvisor().should('exist');
+    //   });
+    // });
+  });
+});
+
+function selectOption(option: string) {
+  cy.get("[aria-label='Select option']").contains(option).should('be.visible').click();
+}
diff --git a/e2e/various-suite/prometheus-variable-editor.spec.ts b/e2e/various-suite/prometheus-variable-editor.spec.ts
new file mode 100644
index 0000000000000..5133e34587045
--- /dev/null
+++ b/e2e/various-suite/prometheus-variable-editor.spec.ts
@@ -0,0 +1,122 @@
+import { e2e } from '../utils';
+import { addDashboard } from '../utils/flows';
+
+import { createPromDS, getResources } from './helpers/prometheus-helpers';
+
+const DATASOURCE_ID = 'Prometheus';
+
+const DATASOURCE_NAME = 'prometheusVariableDS';
+
+/**
+ * Click dashboard settings and then the variables tab
+ */
+function navigateToVariables() {
+  e2e.components.PageToolbar.item('Dashboard settings').click();
+  e2e.components.Tab.title('Variables').click();
+}
+
+/**
+ * Begin the process of adding a query type variable for a Prometheus data source
+ *
+ * @param variableName the name of the variable as a label of the variable dropdown
+ */
+function addPrometheusQueryVariable(variableName: string) {
+  e2e.pages.Dashboard.Settings.Variables.List.addVariableCTAV2().click();
+
+  e2e.pages.Dashboard.Settings.Variables.Edit.General.generalNameInputV2().clear().type(variableName);
+  e2e.components.DataSourcePicker.container().should('be.visible').click();
+  cy.contains(DATASOURCE_NAME).scrollIntoView().should('be.visible').click();
+
+  getResources();
+}
+
+/**
+ * Create a Prometheus variable and navigate to the query editor to check that it is available to use.
+ *
+ * @param variableName name the variable
+ * @param queryType query type of 'Label names', 'Label values', 'Metrics', 'Query result', 'Series query' or 'Classic query'. These types should be imported from the Prometheus library eventually but not now because we are in the process of decoupling the DS from core grafana.
+ */
+function variableFlowToQueryEditor(variableName: string, queryType: string) {
+  addDashboard();
+  navigateToVariables();
+  addPrometheusQueryVariable(variableName);
+
+  // select query type
+  e2e.components.DataSource.Prometheus.variableQueryEditor.queryType().click();
+  selectOption(queryType);
+
+  // apply the variable
+  e2e.pages.Dashboard.Settings.Variables.Edit.General.applyButton().click();
+
+  // close to return to dashboard
+  e2e.pages.Dashboard.Settings.Actions.close().click();
+
+  // add visualization
+  e2e.pages.AddDashboard.itemButton('Create new panel button').should('be.visible').click();
+
+  // close the data source picker modal
+  cy.get('[aria-label="Close"]').click();
+
+  // select prom data source from the data source list with the useful data-testid
+  e2e.components.DataSourcePicker.inputV2().click({ force: true }).type(`${DATASOURCE_NAME}{enter}`);
+
+  // confirm the variable exists in the correct input
+  // use the variable query type from the library in the future
+  switch (queryType) {
+    case 'Label names':
+      e2e.components.QueryBuilder.labelSelect().should('exist').click({ force: true });
+      selectOption(`${variableName}`);
+    case 'Label values':
+      e2e.components.QueryBuilder.valueSelect().should('exist').click({ force: true });
+      selectOption(`${variableName}`);
+    case 'Metrics':
+      e2e.components.DataSource.Prometheus.queryEditor.builder.metricSelect().should('exist').click({ force: true });
+      selectOption(`${variableName}`);
+    default:
+    // do nothing
+  }
+}
+
+describe('Prometheus variable query editor', () => {
+  beforeEach(() => {
+    createPromDS(DATASOURCE_ID, DATASOURCE_NAME);
+  });
+
+  it('should navigate to variable query editor', () => {
+    addDashboard();
+    navigateToVariables();
+  });
+
+  it('should select a query type for a Prometheus variable query', () => {
+    addDashboard();
+    navigateToVariables();
+    addPrometheusQueryVariable('labelsVariable');
+
+    // select query type
+    e2e.components.DataSource.Prometheus.variableQueryEditor.queryType().click();
+
+    selectOption('Label names');
+  });
+
+  it('should create a label names variable that is selectable in the label select in query builder', () => {
+    addDashboard();
+    navigateToVariables();
+    variableFlowToQueryEditor('labelnames', 'Label names');
+  });
+
+  it('should create a label values variable that is selectable in the label values select in query builder', () => {
+    addDashboard();
+    navigateToVariables();
+    variableFlowToQueryEditor('labelvalues', 'Label values');
+  });
+
+  it('should create a metric names variable that is selectable in the metric select in query builder', () => {
+    addDashboard();
+    navigateToVariables();
+    variableFlowToQueryEditor('metrics', 'Metrics');
+  });
+});
+
+function selectOption(option: string) {
+  cy.get("[aria-label='Select option']").contains(option).should('be.visible').click();
+}
diff --git a/e2e/various-suite/query-editor.spec.ts b/e2e/various-suite/query-editor.spec.ts
index de383f23940ad..3441f2b4c0d99 100644
--- a/e2e/various-suite/query-editor.spec.ts
+++ b/e2e/various-suite/query-editor.spec.ts
@@ -1,4 +1,5 @@
 import { e2e } from '../utils';
+import { waitForMonacoToLoad } from '../utils/support/monaco';
 
 describe('Query editor', () => {
   beforeEach(() => {
@@ -12,15 +13,10 @@ describe('Query editor', () => {
     cy.contains('gdev-prometheus').scrollIntoView().should('be.visible').click();
     const queryText = `rate(http_requests_total{job="grafana"}[5m])`;
 
-    cy.contains('label', 'Code').click();
+    e2e.components.RadioButton.container().filter(':contains("Code")').click();
+
+    waitForMonacoToLoad();
 
-    // we need to wait for the query-field being lazy-loaded, in two steps:
-    // it is a two-step process:
-    // 1. first we wait for the text 'Loading...' to appear
-    // 1. then we wait for the text 'Loading...' to disappear
-    const monacoLoadingText = 'Loading...';
-    e2e.components.QueryField.container().should('be.visible').should('have.text', monacoLoadingText);
-    e2e.components.QueryField.container().should('be.visible').should('not.have.text', monacoLoadingText);
     e2e.components.QueryField.container().type(queryText, { parseSpecialCharSequences: false }).type('{backspace}');
 
     cy.contains(queryText.slice(0, -1)).should('be.visible');
diff --git a/e2e/various-suite/return-to-previous.spec.ts b/e2e/various-suite/return-to-previous.spec.ts
new file mode 100644
index 0000000000000..bc47efc5c5711
--- /dev/null
+++ b/e2e/various-suite/return-to-previous.spec.ts
@@ -0,0 +1,74 @@
+import { e2e } from '../utils';
+
+describe('ReturnToPrevious button', () => {
+  beforeEach(() => {
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
+    cy.window().then((win) => {
+      win.localStorage.setItem('grafana.featureToggles', 'returnToPrevious=1');
+    });
+
+    cy.visit('/alerting/list');
+    e2e.components.AlertRules.groupToggle().first().click();
+    e2e.components.AlertRules.toggle().click();
+    cy.get('a[title="View"]').click();
+    cy.url().as('alertRuleUrl');
+    cy.get('a').contains('View panel').click();
+  });
+
+  it('should appear when changing context and go back to alert rule when clicking "Back"', () => {
+    // check whether all elements of RTP are available
+    e2e.components.ReturnToPrevious.buttonGroup().should('be.visible');
+    e2e.components.ReturnToPrevious.dismissButton().should('be.visible');
+    e2e.components.ReturnToPrevious.backButton()
+      .find('span')
+      .contains('Back to e2e-ReturnToPrevious-test')
+      .should('be.visible')
+      .click();
+
+    // check whether the RTP button leads back to alert rule
+    cy.get('@alertRuleUrl').then((alertRuleUrl) => {
+      cy.url().should('eq', alertRuleUrl);
+    });
+  });
+
+  it('should disappear when clicking "Dismiss"', () => {
+    e2e.components.ReturnToPrevious.dismissButton().should('be.visible').click();
+    e2e.components.ReturnToPrevious.buttonGroup().should('not.exist');
+  });
+
+  it('should not persist when going back to the alert rule details view', () => {
+    e2e.components.ReturnToPrevious.buttonGroup().should('be.visible');
+
+    cy.visit('/alerting/list');
+    e2e.components.AlertRules.groupToggle().first().click();
+    cy.get('a[title="View"]').click();
+    e2e.components.ReturnToPrevious.buttonGroup().should('not.exist');
+  });
+
+  it('should override the button label and change the href when user changes alert rules', () => {
+    e2e.components.ReturnToPrevious.backButton()
+      .find('span')
+      .contains('Back to e2e-ReturnToPrevious-test')
+      .should('be.visible');
+
+    cy.visit('/alerting/list');
+
+    e2e.components.AlertRules.groupToggle().last().click();
+    cy.get('a[title="View"]').click();
+    cy.url().as('alertRule2Url');
+    cy.get('a').contains('View panel').click();
+
+    e2e.components.ReturnToPrevious.backButton()
+      .find('span')
+      .contains('Back to e2e-ReturnToPrevious-test-2')
+      .should('be.visible')
+      .click();
+
+    e2e.components.ReturnToPrevious.buttonGroup().should('not.exist');
+
+    // check whether the RTP button leads back to alert rule
+    cy.get('@alertRule2Url').then((alertRule2Url) => {
+      cy.url().should('eq', alertRule2Url);
+    });
+  });
+});
diff --git a/e2e/various-suite/select-focus.spec.ts b/e2e/various-suite/select-focus.spec.ts
index b747b9d3061f4..5ff66306b3554 100644
--- a/e2e/various-suite/select-focus.spec.ts
+++ b/e2e/various-suite/select-focus.spec.ts
@@ -5,7 +5,7 @@ describe('Select focus/unfocus tests', () => {
     e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
   });
 
-  it('Tests select focus/unfocus scenarios', () => {
+  it.skip('Tests select focus/unfocus scenarios', () => {
     e2e.flows.openDashboard({ uid: '5SdHCadmz' });
     e2e.components.PageToolbar.item('Dashboard settings').click();
 
diff --git a/e2e/various-suite/solo-route.spec.ts b/e2e/various-suite/solo-route.spec.ts
index 1cfba1b70b7af..c508ace3aef1c 100644
--- a/e2e/various-suite/solo-route.spec.ts
+++ b/e2e/various-suite/solo-route.spec.ts
@@ -11,4 +11,34 @@ describe('Solo Route', () => {
 
     cy.get('canvas').should('have.length', 6);
   });
+
+  it('Can view solo panel in scenes', () => {
+    // open Panel Tests - Graph NG
+    e2e.pages.SoloPanel.visit(
+      'TkZXxlNG3/panel-tests-graph-ng?orgId=1&from=1699954597665&to=1699956397665&panelId=54&__feature.dashboardSceneSolo=true'
+    );
+
+    e2e.components.Panels.Panel.title('Interpolation: Step before').should('exist');
+    cy.contains('uplot-main-div').should('not.exist');
+  });
+
+  it('Can view solo repeated panel in scenes', () => {
+    // open Panel Tests - Graph NG
+    e2e.pages.SoloPanel.visit(
+      'templating-repeating-panels/templating-repeating-panels?orgId=1&from=1699934989607&to=1699956589607&panelId=panel-2-clone-1&__feature.dashboardSceneSolo=true'
+    );
+
+    e2e.components.Panels.Panel.title('server=B').should('exist');
+    cy.contains('uplot-main-div').should('not.exist');
+  });
+
+  it('Can view solo in repeaterd row and panel in scenes', () => {
+    // open Panel Tests - Graph NG
+    e2e.pages.SoloPanel.visit(
+      'Repeating-rows-uid/repeating-rows?orgId=1&var-server=A&var-server=B&var-server=D&var-pod=1&var-pod=2&var-pod=3&panelId=panel-2-row-2-clone-2&__feature.dashboardSceneSolo=true'
+    );
+
+    e2e.components.Panels.Panel.title('server = D, pod = Sod').should('exist');
+    cy.contains('uplot-main-div').should('not.exist');
+  });
 });
diff --git a/e2e/various-suite/visualization-suggestions.spec.ts b/e2e/various-suite/visualization-suggestions.spec.ts
index 100953980f5c9..aef309ea45221 100644
--- a/e2e/various-suite/visualization-suggestions.spec.ts
+++ b/e2e/various-suite/visualization-suggestions.spec.ts
@@ -10,7 +10,7 @@ describe('Visualization suggestions', () => {
 
     // Try visualization suggestions
     e2e.components.PanelEditor.toggleVizPicker().click();
-    cy.contains('Suggestions').click();
+    e2e.components.RadioButton.container().filter(':contains("Suggestions")').click();
 
     // Verify we see suggestions
     e2e.components.VisualizationPreview.card('Line chart').should('be.visible');
diff --git a/emails/templates/invited_to_org.mjml b/emails/templates/invited_to_org.mjml
index 8444cae188735..c774c19712f8a 100644
--- a/emails/templates/invited_to_org.mjml
+++ b/emails/templates/invited_to_org.mjml
@@ -4,7 +4,7 @@
   <!-- css styling -->
   <mj-include path="./partials/layout/theme.css" type="css" css-inline="inline" />
   <mj-head>
-    <!-- ⬇ Don't forget to specifify an email subject! Use the HTML comment below ⬇ -->
+    <!-- ⬇ Don't forget to specify an email subject! Use the HTML comment below ⬇ -->
     <mj-title>
       {{ Subject .Subject .TemplateData "{{ .InvitedBy }} has added you to the {{ .OrgName }} organization" }}
     </mj-title>
@@ -18,7 +18,8 @@
       <mj-column>
         <mj-text>
           <h2>You have been added to {{ .OrgName }}</h2>
-          <strong>{{ .InvitedBy }}</strong> has added you to the <strong>{{ .OrgName }}</strong> organization in Grafana.
+          <!-- Psiphon change - change organization information -->
+          <strong>{{ .InvitedBy }}</strong> has added you to the <strong>{{ .OrgName }}</strong> organization.
         </mj-text>
         <mj-text>
           Once logged in, <strong>{{ .OrgName }}</strong> will be available to switch to in the user interface.
@@ -27,7 +28,8 @@
           Log in now by clicking the link below:
         </mj-text>
         <mj-button href="{{ .AppUrl }}">
-          Login to Grafana
+        <!-- Psiphon change - change organization information -->
+          Login
         </mj-button>
         <mj-text>
           You can also copy and paste this link into your browser directly:
diff --git a/emails/templates/invited_to_org.txt b/emails/templates/invited_to_org.txt
index 56bcf80318e51..b9260d5af3ec0 100644
--- a/emails/templates/invited_to_org.txt
+++ b/emails/templates/invited_to_org.txt
@@ -2,7 +2,7 @@
 
 You have been added to [[.OrgName]]
 
-[[.InvitedBy]] has added you to the [[.OrgName]] organization in Grafana.
+[[.InvitedBy]] has added you to the [[.OrgName]] organization.
 Once logged in, [[.OrgName]] will be available in the left side menu, in the dropdown below your username.
 
 Log in now:
diff --git a/emails/templates/new_user_invite.mjml b/emails/templates/new_user_invite.mjml
index 4f94d0f879a94..69f04b95912c8 100644
--- a/emails/templates/new_user_invite.mjml
+++ b/emails/templates/new_user_invite.mjml
@@ -4,9 +4,10 @@
   <!-- css styling -->
   <mj-include path="./partials/layout/theme.css" type="css" css-inline="inline" />
   <mj-head>
-    <!-- ⬇ Don't forget to specifify an email subject below! ⬇ -->
+    <!-- ⬇ Don't forget to specify an email subject below! ⬇ -->
     <mj-title>
-      {{ Subject .Subject .TemplateData "{{ .InvitedBy }} has invited you to join Grafana" }}
+      <!-- Psiphon change - change organization name information in email subject -->
+      {{ Subject .Subject .TemplateData "{{ .InvitedBy }} has invited you to join the Psiphon Data Engine" }}
     </mj-title>
     <mj-include path="./partials/layout/head.mjml" />
   </mj-head>
diff --git a/emails/templates/new_user_invite.txt b/emails/templates/new_user_invite.txt
index 2c73c5e9c44fa..02599453e3425 100644
--- a/emails/templates/new_user_invite.txt
+++ b/emails/templates/new_user_invite.txt
@@ -1,4 +1,4 @@
-[[HiddenSubject .Subject "[[.InvitedBy]] has invited you to join Grafana"]]
+[[HiddenSubject .Subject "[[.InvitedBy]] has invited you to join the Psiphon Data Engine"]]
 
 You're invited to join [[.OrgName]]
 
diff --git a/emails/templates/ng_alert_notification.mjml b/emails/templates/ng_alert_notification.mjml
index 2a75a01053571..adf7cb1fda56e 100644
--- a/emails/templates/ng_alert_notification.mjml
+++ b/emails/templates/ng_alert_notification.mjml
@@ -4,7 +4,7 @@
   <!-- css styling -->
   <mj-include path="./partials/layout/theme.css" type="css" css-inline="inline" />
   <mj-head>
-    <!-- ⬇ Don't forget to specifify an email subject below! ⬇ -->
+    <!-- ⬇ Don't forget to specify an email subject below! ⬇ -->
     <mj-title>
       {{ Subject .Subject .TemplateData "{{ .Title }}" }}
     </mj-title>
diff --git a/emails/templates/ng_alert_notification.txt b/emails/templates/ng_alert_notification.txt
index 28e466d16df40..215338bfa35b0 100644
--- a/emails/templates/ng_alert_notification.txt
+++ b/emails/templates/ng_alert_notification.txt
@@ -12,7 +12,6 @@ You have [[ len .Alerts.Firing ]] firing alert(s), and [[ len .Alerts.Resolved ]
 -------------
 [[ template "__default_alerts_summarize" .Alerts.Resolved ]]
 [[- end ]]
-Go to the Alerts page: [[ .AlertPageUrl ]]
 [[- end -]]
 
 [[- define "__default_alerts_summarize" -]]
diff --git a/emails/templates/partials/layout/default.txt b/emails/templates/partials/layout/default.txt
index a27a0817378fd..755bdd2185809 100644
--- a/emails/templates/partials/layout/default.txt
+++ b/emails/templates/partials/layout/default.txt
@@ -1,3 +1,2 @@
 {{> body }}
-
-Sent by Grafana v[[.BuildVersion]] (c) [[now | date "2006"]] Grafana Labs
+Sent by PDE v[[.BuildVersion]] (c) [[now | date "2006"]] Psiphon Inc.
diff --git a/emails/templates/partials/layout/footer.mjml b/emails/templates/partials/layout/footer.mjml
index fddf35962c840..709f6602ffd23 100644
--- a/emails/templates/partials/layout/footer.mjml
+++ b/emails/templates/partials/layout/footer.mjml
@@ -1,5 +1,6 @@
 <mj-column background-color="transparent">
   <mj-text align="center">
-    &copy; {{ now | date "2006" }} Grafana Labs. Sent by <a href="{{ .AppUrl }}">Grafana v{{ .BuildVersion }}</a>.
+    <!-- Psiphon change - replace footer info with Psiphon footer info -->
+    &copy; {{ now | date "2006" }} Psiphon Inc. Sent by <a href="https://psix.ca">PDE v{{ .BuildVersion }}</a>.
   </mj-text>
 </mj-column>
diff --git a/emails/templates/partials/layout/header.mjml b/emails/templates/partials/layout/header.mjml
index 37e078838ebf9..5bce954b48075 100644
--- a/emails/templates/partials/layout/header.mjml
+++ b/emails/templates/partials/layout/header.mjml
@@ -1,3 +1,4 @@
 <mj-column background-color="transparent">
-  <mj-image padding="0" width="200px" src="https://grafana.com/static/assets/img/logo_new_transparent_light_400x100.png" align="left" />
+  <!-- Psiphon change - replace Grafana logo with Psiphon logo -->
+  <mj-image padding="0" width="300px" src="https://psix.ca/public/img/pde_icon.png" align="left" />
 </mj-column>
diff --git a/emails/templates/reset_password.mjml b/emails/templates/reset_password.mjml
index 8a0161f453365..2ee70b0c125da 100644
--- a/emails/templates/reset_password.mjml
+++ b/emails/templates/reset_password.mjml
@@ -4,9 +4,10 @@
   <!-- css styling -->
   <mj-include path="./partials/layout/theme.css" type="css" css-inline="inline" />
   <mj-head>
-    <!-- ⬇ Don't forget to specifify an email subject below! ⬇ -->
+    <!-- ⬇ Don't forget to specify an email subject below! ⬇ -->
     <mj-title>
-      {{ Subject .Subject .TemplateData "Reset your Grafana password - {{.Name}}" }}
+      <!-- Psiphon change - remove organization name in email subject line -->
+      {{ Subject .Subject .TemplateData "Reset your password - {{.Name}}" }}
     </mj-title>
     <mj-include path="./partials/layout/head.mjml" />
   </mj-head>
diff --git a/emails/templates/reset_password.txt b/emails/templates/reset_password.txt
index a33edbb029569..d58298df496ef 100644
--- a/emails/templates/reset_password.txt
+++ b/emails/templates/reset_password.txt
@@ -1,4 +1,4 @@
-[[HiddenSubject .Subject "Reset your Grafana password - [[.Name]]"]]
+[[HiddenSubject .Subject "Reset your password - [[.Name]]"]]
 
 Hi [[.Name]],
 
diff --git a/emails/templates/signup_started.mjml b/emails/templates/signup_started.mjml
index ff211fbd95cba..e6b7dbfbc1588 100644
--- a/emails/templates/signup_started.mjml
+++ b/emails/templates/signup_started.mjml
@@ -4,9 +4,10 @@
   <!-- css styling -->
   <mj-include path="./partials/layout/theme.css" type="css" css-inline="inline" />
   <mj-head>
-    <!-- ⬇ Don't forget to specifify an email subject below! ⬇ -->
+    <!-- ⬇ Don't forget to specify an email subject below! ⬇ -->
     <mj-title>
-      {{ Subject .Subject .TemplateData "Welcome to Grafana, please complete your sign up!" }}
+      <!-- Psiphon change - change organization name in email subject line -->
+      {{ Subject .Subject .TemplateData "Welcome to the Psiphon Data Engine, please complete your sign up!" }}
     </mj-title>
     <mj-include path="./partials/layout/head.mjml" />
   </mj-head>
diff --git a/emails/templates/signup_started.txt b/emails/templates/signup_started.txt
index 4ab7342da1578..257ffd9213364 100644
--- a/emails/templates/signup_started.txt
+++ b/emails/templates/signup_started.txt
@@ -1,4 +1,4 @@
-[[HiddenSubject .Subject "Welcome to Grafana, please complete your sign up!"]]
+[[HiddenSubject .Subject "Welcome to the Psiphon Data Engine, please complete your sign up!"]]
 
 Complete the signup
 
diff --git a/emails/templates/verify_email.mjml b/emails/templates/verify_email.mjml
new file mode 100644
index 0000000000000..b830496868bb5
--- /dev/null
+++ b/emails/templates/verify_email.mjml
@@ -0,0 +1,40 @@
+<mjml>
+  <!-- global variables -->
+  <mj-include path="./partials/_globals.mjml" />
+  <!-- css styling -->
+  <mj-include path="./partials/layout/theme.css" type="css" css-inline="inline" />
+  <mj-head>
+    <!-- ⬇ Don't forget to specify an email subject below! ⬇ -->
+    <mj-title>
+      {{ Subject .Subject .TemplateData "Verify your email - {{.Name}}" }}
+    </mj-title>
+    <mj-include path="./partials/layout/head.mjml" />
+  </mj-head>
+  <mj-body>
+    <mj-section>
+      <mj-include path="./partials/layout/header.mjml" />
+    </mj-section>
+    <mj-section css-class="background">
+      <mj-column>
+        <mj-text>
+          <h2>Hi {{ .Name }},</h2>
+        </mj-text>
+        <mj-text>
+          Please click the following link to verify your email within <strong>{{ .VerificationEmailLifetimeHours }} hour(s)</strong>.
+        </mj-text>
+        <mj-button href="{{ .AppUrl }}user/email/update?code={{ .Code }}">
+          Verify Email
+        </mj-button>
+        <mj-text>
+          You can also copy and paste this link into your browser directly:
+        </mj-text>
+        <mj-text>
+          <a rel="noopener" href="{{ .AppUrl }}user/email/update?code={{ .Code }}">{{ .AppUrl }}user/email/update?code={{ .Code }}</a>
+        </mj-text>
+      </mj-column>
+    </mj-section>
+    <mj-section>
+      <mj-include path="./partials/layout/footer.mjml" />
+    </mj-section>
+  </mj-body>
+</mjml>
diff --git a/emails/templates/verify_email.txt b/emails/templates/verify_email.txt
new file mode 100644
index 0000000000000..8af1d2c1935c4
--- /dev/null
+++ b/emails/templates/verify_email.txt
@@ -0,0 +1,6 @@
+[[HiddenSubject .Subject "Verify your email - [[.Name]]"]]
+
+Hi [[.Name]],
+
+Copy and paste the following link directly in your browser to verify your email within [[.VerificationEmailLifetimeHours]] hour(s).
+[[.AppUrl]]user/email/update?code=[[.Code]]
diff --git a/emails/templates/welcome_on_signup.mjml b/emails/templates/welcome_on_signup.mjml
index 686842eb8ce12..da9b828601aef 100644
--- a/emails/templates/welcome_on_signup.mjml
+++ b/emails/templates/welcome_on_signup.mjml
@@ -4,9 +4,10 @@
   <!-- css styling -->
   <mj-include path="./partials/layout/theme.css" type="css" css-inline="inline" />
   <mj-head>
-    <!-- ⬇ Don't forget to specifify an email subject below! ⬇ -->
+    <!-- ⬇ Don't forget to specify an email subject below! ⬇ -->
     <mj-title>
-      {{ Subject .Subject .TemplateData "Welcome to Grafana" }}
+      <!-- Psiphon change - change organization name in email subject line -->
+      {{ Subject .Subject .TemplateData "Welcome to the Psiphon Data Engine" }}
     </mj-title>
     <mj-include path="./partials/layout/head.mjml" />
   </mj-head>
@@ -20,20 +21,20 @@
           <h2>Hi {{ .Name }},</h2>
         </mj-text>
         <mj-text>
-          Welcome! Ready to start building some beautiful metric and analytic dashboards?
+          <!-- Psiphon change - change welcome message -->
+          Welcome! Ready to explore real-time open network measurements?
         </mj-text>
         <mj-text>
-          If you are new to Grafana, refer to the <a href="https://grafana.com/docs/grafana/latest/getting-started/getting-started/">Getting started with Grafana</a>
-          guide.
+          <!-- Psiphon change - change help message and link -->
+          If you are new to the Psiphon Data Engine and have questions, please read the <a href="https://psix.ca/d/g6Mhku6Zz/faqs">FAQs</a>
         </mj-text>
-        <mj-button href="https://grafana.com/docs/grafana/latest/getting-started/getting-started/">
-          Check out our getting started guide
-        </mj-button>
+        <!-- Psiphon change - change help message and link -->
         <mj-text>
-          Thank you for joining our community.
+          <!-- Psiphon change - change thank you message -->
+          Thank you for joining.
         </mj-text>
         <mj-text>
-          The Grafana Team
+          Psiphon
         </mj-text>
       </mj-column>
     </mj-section>
diff --git a/emails/templates/welcome_on_signup.txt b/emails/templates/welcome_on_signup.txt
index 78ca607fd2aa0..45f41350e6405 100644
--- a/emails/templates/welcome_on_signup.txt
+++ b/emails/templates/welcome_on_signup.txt
@@ -1,11 +1,11 @@
-[[HiddenSubject .Subject "Welcome to Grafana"]]
+[[HiddenSubject .Subject "Welcome to the Psiphon Data Engine"]]
 
 Hi [[.Name]],
 
-Welcome! Ready to start building some beautiful metric and analytic dashboards?
+Welcome! Ready to explore real-time open network measurements?
 
-If you are new to Grafana, refer to the Getting started with Grafana guide on https://grafana.com/docs/grafana/latest/getting-started/getting-started/.
+If you are new to the Psiphon Data Engine and have questions, please read the FAQs on https://psix.ca/d/g6Mhku6Zz/faqs .
 
-Thank you for joining our community.
+Thank you for joining.
 
-The Grafana team
+Psiphon
diff --git a/embed.go b/embed.go
index 570415e0034d6..b968d1ca455a0 100644
--- a/embed.go
+++ b/embed.go
@@ -6,5 +6,5 @@ import (
 
 // CueSchemaFS embeds all schema-related CUE files in the Grafana project.
 //
-//go:embed cue.mod/module.cue kinds/*.cue kinds/*/*.cue packages/grafana-schema/src/common/*.cue public/app/plugins/*/*/*.cue public/app/plugins/*/*/plugin.json pkg/plugins/*/*.cue
+//go:embed cue.mod/module.cue
 var CueSchemaFS embed.FS
diff --git a/go.mod b/go.mod
index 4e74b99195fd9..9aef536350e36 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/grafana
 
-go 1.20
+go 1.21.10
 
 // Override docker/docker to avoid:
 // go: github.com/drone-runners/drone-runner-docker@v1.8.2 requires
@@ -10,44 +10,30 @@ replace github.com/docker/docker => github.com/moby/moby v23.0.4+incompatible
 // contains openapi encoder fixes. remove ASAP
 replace cuelang.org/go => github.com/grafana/cue v0.0.0-20230926092038-971951014e3f // @grafana/grafana-as-code
 
-// TODO: following otel replaces to pin the libraries so k8s.io/apiserver doesn't downgrade us inadvertantly
-// will need bumps as we upgrade otel in Grafana
-replace (
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // @grafana/backend-platform
-	go.opentelemetry.io/otel => go.opentelemetry.io/otel v1.19.0 // @grafana/backend-platform
-	go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.19.0 // @grafana/backend-platform
-	go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v1.19.0 // @grafana/backend-platform
-)
-
 // Override Prometheus version because Prometheus v2.X is tagged as v0.X for Go modules purposes and Go assumes
 // that v1.Y is higher than v0.X, so when we resolve dependencies if any dependency imports v1.Y we'd
 // import that instead of v0.X even though v0.X is newer.
-replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.43.0
-
-// Includes https://github.com/kubernetes/kube-openapi/pull/420
-// This will not be required in the next k8s release
-replace k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f => github.com/ryantxu/kube-openapi v0.0.0-20230824154605-fe0f3703fd8d // @grafana/grafana-app-platform-squad
+replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.49.0
 
 require (
-	cloud.google.com/go/storage v1.30.1 // @grafana/backend-platform
+	cloud.google.com/go/storage v1.36.0 // @grafana/backend-platform
 	cuelang.org/go v0.6.0-0.dev // @grafana/grafana-as-code
-	github.com/Azure/azure-sdk-for-go v65.0.0+incompatible // @grafana/backend-platform
-	github.com/Azure/go-autorest/autorest v0.11.28 // @grafana/backend-platform
+	github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // @grafana/partner-datasources
+	github.com/Azure/go-autorest/autorest v0.11.29 // @grafana/backend-platform
 	github.com/BurntSushi/toml v1.3.2 // @grafana/grafana-authnz-team
 	github.com/Masterminds/semver v1.5.0 // @grafana/backend-platform
 	github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f // @grafana/backend-platform
-	github.com/aws/aws-sdk-go v1.44.325 // @grafana/aws-datasources
+	github.com/aws/aws-sdk-go v1.50.8 // @grafana/aws-datasources
 	github.com/beevik/etree v1.2.0 // @grafana/backend-platform
 	github.com/benbjohnson/clock v1.3.5 // @grafana/alerting-squad-backend
-	github.com/blang/semver/v4 v4.0.0 // @grafana/grafana-delivery
+	github.com/blang/semver/v4 v4.0.0 // @grafana/grafana-release-guild
 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // @grafana/backend-platform
 	github.com/centrifugal/centrifuge v0.30.2 // @grafana/grafana-app-platform-squad
 	github.com/crewjam/saml v0.4.13 // @grafana/grafana-authnz-team
 	github.com/fatih/color v1.15.0 // @grafana/backend-platform
 	github.com/gchaincl/sqlhooks v1.3.0 // @grafana/backend-platform
-	github.com/go-git/go-git/v5 v5.4.2 // @grafana/grafana-app-platform-squad
 	github.com/go-ldap/ldap/v3 v3.4.4 // @grafana/grafana-authnz-team
-	github.com/go-openapi/strfmt v0.21.7 // @grafana/alerting-squad-backend
+	github.com/go-openapi/strfmt v0.22.0 // @grafana/alerting-squad-backend
 	github.com/go-redis/redis/v8 v8.11.5 // @grafana/backend-platform
 	github.com/go-sourcemap/sourcemap v2.1.3+incompatible // @grafana/backend-platform
 	github.com/go-sql-driver/mysql v1.7.1 // @grafana/backend-platform
@@ -58,17 +44,17 @@ require (
 	github.com/golang/mock v1.6.0 // @grafana/alerting-squad-backend
 	github.com/golang/snappy v0.0.4 // @grafana/alerting-squad-backend
 	github.com/google/go-cmp v0.6.0 // @grafana/backend-platform
-	github.com/google/uuid v1.3.1 // @grafana/backend-platform
+	github.com/google/uuid v1.6.0 // @grafana/backend-platform
 	github.com/google/wire v0.5.0 // @grafana/backend-platform
 	github.com/gorilla/websocket v1.5.0 // @grafana/grafana-app-platform-squad
-	github.com/grafana/alerting v0.0.0-20231017091417-a53b5db2235d // @grafana/alerting-squad-backend
-	github.com/grafana/cuetsy v0.1.10 // @grafana/grafana-as-code
-	github.com/grafana/grafana-aws-sdk v0.19.1 // @grafana/aws-datasources
-	github.com/grafana/grafana-azure-sdk-go v1.9.0 // @grafana/backend-platform
-	github.com/grafana/grafana-plugin-sdk-go v0.187.0 // @grafana/plugins-platform-backend
+	github.com/grafana/alerting v0.0.0-20240322221449-89ae4e299bf8 // @grafana/alerting-squad-backend
+	github.com/grafana/cuetsy v0.1.11 // @grafana/grafana-as-code
+	github.com/grafana/grafana-aws-sdk v0.25.1 // @grafana/aws-datasources
+	github.com/grafana/grafana-azure-sdk-go/v2 v2.0.1 // @grafana/partner-datasources
+	github.com/grafana/grafana-plugin-sdk-go v0.222.0 // @grafana/plugins-platform-backend
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // @grafana/backend-platform
-	github.com/hashicorp/go-hclog v1.5.0 // @grafana/plugins-platform-backend
-	github.com/hashicorp/go-plugin v1.4.9 // @grafana/plugins-platform-backend
+	github.com/hashicorp/go-hclog v1.6.3 // @grafana/plugins-platform-backend
+	github.com/hashicorp/go-plugin v1.6.0 // @grafana/plugins-platform-backend
 	github.com/hashicorp/go-version v1.6.0 // @grafana/backend-platform
 	github.com/hashicorp/hcl/v2 v2.17.0 // @grafana/alerting-squad-backend
 	github.com/influxdata/influxdb-client-go/v2 v2.12.3 // @grafana/observability-metrics
@@ -78,58 +64,67 @@ require (
 	github.com/lib/pq v1.10.9 // @grafana/backend-platform
 	github.com/linkedin/goavro/v2 v2.10.0 // @grafana/backend-platform
 	github.com/m3db/prometheus_remote_client_golang v0.4.4 // @grafana/backend-platform
-	github.com/magefile/mage v1.15.0 // @grafana/grafana-delivery
-	github.com/mattn/go-isatty v0.0.18 // @grafana/backend-platform
-	github.com/mattn/go-sqlite3 v1.14.16 // @grafana/backend-platform
+	github.com/magefile/mage v1.15.0 // @grafana/grafana-release-guild
+	github.com/mattn/go-isatty v0.0.19 // @grafana/backend-platform
+	github.com/mattn/go-sqlite3 v1.14.19 // @grafana/backend-platform
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // @grafana/alerting-squad-backend
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // @grafana/grafana-operator-experience-squad
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // @grafana/alerting-squad-backend
-	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
+	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/alertmanager v0.25.0 // @grafana/alerting-squad-backend
-	github.com/prometheus/client_golang v1.16.0 // @grafana/alerting-squad-backend
-	github.com/prometheus/client_model v0.4.0 // @grafana/backend-platform
-	github.com/prometheus/common v0.44.0 // @grafana/alerting-squad-backend
+	github.com/prometheus/alertmanager v0.26.0 // @grafana/alerting-squad-backend
+	github.com/prometheus/client_golang v1.18.0 // @grafana/alerting-squad-backend
+	github.com/prometheus/client_model v0.5.0 // @grafana/backend-platform
+	github.com/prometheus/common v0.46.0 // @grafana/alerting-squad-backend
 	github.com/prometheus/prometheus v1.8.2-0.20221021121301-51a44e6657c3 // @grafana/alerting-squad-backend
-	github.com/robfig/cron/v3 v3.0.1 // @grafana/backend-platform
-	github.com/russellhaering/goxmldsig v1.4.0 // @grafana/backend-platform
-	github.com/stretchr/testify v1.8.4 // @grafana/backend-platform
+	github.com/redis/go-redis/v9 v9.1.0 // @grafana/alerting-squad-backend
+	github.com/robfig/cron/v3 v3.0.1 // @grafana/grafana-backend-group
+	github.com/russellhaering/goxmldsig v1.4.0 // @grafana/grafana-backend-group
+	github.com/scottlepp/go-duck v0.0.20 // @grafana/grafana-app-platform-squad
+	github.com/spf13/cobra v1.8.0 // @grafana/grafana-app-platform-squad
+	github.com/spf13/pflag v1.0.5 // @grafana-app-platform-squad
+	github.com/spyzhov/ajson v0.9.0 // @grafana/grafana-app-platform-squad
+	github.com/stretchr/testify v1.9.0 // @grafana/backend-platform
 	github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf // @grafana/backend-platform
 	github.com/ua-parser/uap-go v0.0.0-20211112212520-00c877edfe0f // @grafana/backend-platform
 	github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
+	github.com/urfave/cli v1.22.14 // @grafana/grafana-backend-group
 	github.com/urfave/cli/v2 v2.25.0 // @grafana/backend-platform
 	github.com/vectordotdev/go-datemath v0.1.1-0.20220323213446-f3954d0b18ae // @grafana/backend-platform
-	github.com/yalue/merged_fs v1.2.2 // @grafana/grafana-as-code
+	github.com/wk8/go-ordered-map v1.0.0 // @grafana/grafana-backend-group
+	github.com/xlab/treeprint v1.2.0 // @grafana/observability-traces-and-profiling
+	github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2 // @grafana/grafana-app-platform-squad
 	github.com/yudai/gojsondiff v1.0.0 // @grafana/backend-platform
-	go.opentelemetry.io/collector/pdata v1.0.0-rc8 // @grafana/backend-platform
-	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.45.0 // @grafana/grafana-operator-experience-squad
+	go.opentelemetry.io/collector/pdata v1.5.0 // @grafana/backend-platform
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // @grafana/plugins-platform-backend
+	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.49.0 // @grafana/grafana-operator-experience-squad
 	go.opentelemetry.io/otel/exporters/jaeger v1.10.0 // @grafana/backend-platform
-	go.opentelemetry.io/otel/sdk v1.19.0 // @grafana/backend-platform
-	go.opentelemetry.io/otel/trace v1.19.0 // @grafana/backend-platform
-	golang.org/x/crypto v0.14.0 // @grafana/backend-platform
-	golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // @grafana/alerting-squad-backend
-	golang.org/x/net v0.17.0 // @grafana/grafana-bi-squad
-	golang.org/x/oauth2 v0.13.0 // @grafana/grafana-authnz-team
-	golang.org/x/sync v0.4.0 // @grafana/alerting-squad-backend
-	golang.org/x/time v0.3.0 // @grafana/backend-platform
-	golang.org/x/tools v0.12.0 // @grafana/grafana-as-code
+	go.opentelemetry.io/otel/sdk v1.24.0 // @grafana/backend-platform
+	go.opentelemetry.io/otel/trace v1.24.0 // @grafana/backend-platform
+	golang.org/x/crypto v0.21.0 // @grafana/backend-platform
+	golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // @grafana/alerting-squad-backend
+	golang.org/x/net v0.23.0 // @grafana/oss-big-tent @grafana/partner-datasources
+	golang.org/x/oauth2 v0.18.0 // @grafana/grafana-authnz-team
+	golang.org/x/sync v0.6.0 // @grafana/alerting-squad-backend
+	golang.org/x/time v0.5.0 // @grafana/backend-platform
+	golang.org/x/tools v0.17.0 // @grafana/grafana-as-code
 	gonum.org/v1/gonum v0.12.0 // @grafana/observability-metrics
-	google.golang.org/api v0.148.0 // @grafana/backend-platform
-	google.golang.org/grpc v1.58.3 // @grafana/plugins-platform-backend
-	google.golang.org/protobuf v1.31.0 // @grafana/plugins-platform-backend
+	google.golang.org/api v0.155.0 // @grafana/backend-platform
+	google.golang.org/grpc v1.62.1 // @grafana/plugins-platform-backend
+	google.golang.org/protobuf v1.33.0 // @grafana/plugins-platform-backend
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/ini.v1 v1.67.0 // @grafana/alerting-squad-backend
 	gopkg.in/mail.v2 v2.3.1 // @grafana/backend-platform
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // @grafana/alerting-squad-backend
-	xorm.io/builder v0.3.6 // @grafana/backend-platform
+	xorm.io/builder v0.3.6 // indirect; @grafana/backend-platform
 	xorm.io/core v0.7.3 // @grafana/backend-platform
 	xorm.io/xorm v0.8.2 // @grafana/alerting-squad-backend
 )
 
 require (
-	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 // indirect
 	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
 	github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
 	github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
@@ -137,15 +132,15 @@ require (
 	github.com/Azure/go-autorest/logger v0.2.1 // indirect
 	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
 	github.com/FZambia/eagle v0.1.0 // indirect
-	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
-	github.com/andybalholm/brotli v1.0.4 // @grafana/partner-datasources
+	github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect
+	github.com/andybalholm/brotli v1.0.5 // @grafana/partner-datasources
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/cheekybits/genny v1.0.0 // indirect
 	github.com/cockroachdb/apd/v2 v2.0.2 // indirect
-	github.com/deepmap/oapi-codegen v1.12.4 // indirect
+	github.com/deepmap/oapi-codegen v1.13.0 // @grafana/grafana-as-code
 	github.com/dennwc/varint v1.0.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/docker/go-units v0.5.0 // indirect
@@ -153,31 +148,30 @@ require (
 	github.com/emicklei/proto v1.10.0 // indirect
 	github.com/go-kit/log v0.2.1 //  @grafana/backend-platform
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
-	github.com/go-openapi/analysis v0.21.4 // indirect
-	github.com/go-openapi/errors v0.20.4 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
-	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/loads v0.21.2 // @grafana/alerting-squad-backend
-	github.com/go-openapi/runtime v0.26.0 // @grafana/alerting-squad-backend
-	github.com/go-openapi/spec v0.20.9 // indirect
-	github.com/go-openapi/swag v0.22.4 // indirect
-	github.com/go-openapi/validate v0.22.1 // indirect
+	github.com/go-openapi/analysis v0.22.2 // indirect
+	github.com/go-openapi/errors v0.21.0 // indirect
+	github.com/go-openapi/jsonpointer v0.20.2 // indirect
+	github.com/go-openapi/jsonreference v0.20.4 // indirect
+	github.com/go-openapi/loads v0.21.5 // @grafana/alerting-squad-backend
+	github.com/go-openapi/runtime v0.27.1 // @grafana/alerting-squad-backend
+	github.com/go-openapi/spec v0.20.14 // indirect
+	github.com/go-openapi/swag v0.22.9 // indirect
+	github.com/go-openapi/validate v0.23.0 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.0 // @grafana/backend-platform
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
-	github.com/golang/glog v1.1.0 // indirect
+	github.com/golang/glog v1.2.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // @grafana/backend-platform
 	github.com/google/btree v1.1.2 // indirect
-	github.com/google/flatbuffers v23.1.21+incompatible // indirect
+	github.com/google/flatbuffers v23.5.26+incompatible // indirect
 	github.com/googleapis/gax-go/v2 v2.12.0 // @grafana/backend-platform
-	github.com/gorilla/mux v1.8.0 // @grafana/backend-platform
+	github.com/gorilla/mux v1.8.1 // @grafana/backend-platform
 	github.com/grafana/grafana-google-sdk-go v0.1.0 // @grafana/partner-datasources
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-msgpack v0.5.5 // indirect
-	github.com/hashicorp/go-multierror v1.1.1 // @grafana/alerting-squad
-	github.com/hashicorp/go-sockaddr v1.0.2 // indirect
-	github.com/hashicorp/golang-lru v0.6.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect; @grafana/alerting-squad
+	github.com/hashicorp/go-sockaddr v1.0.6 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
 	github.com/igm/sockjs-go/v3 v3.0.2 // indirect
 	github.com/jessevdk/go-flags v1.5.0 // indirect
@@ -187,8 +181,8 @@ require (
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattermost/xml-roundtrip-validator v0.1.0 // indirect
 	github.com/mattetti/filebuffer v1.0.1 // indirect
-	github.com/mattn/go-runewidth v0.0.13 // indirect
-	github.com/miekg/dns v1.1.51 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
+	github.com/miekg/dns v1.1.57 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // @grafana/alerting-squad-backend
@@ -198,100 +192,94 @@ require (
 	github.com/olekukonko/tablewriter v0.0.5 // @grafana/backend-platform
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/common/sigv4 v0.1.0 // indirect
-	github.com/prometheus/exporter-toolkit v0.10.0 // indirect
-	github.com/prometheus/procfs v0.11.0 // indirect
+	github.com/prometheus/exporter-toolkit v0.11.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b // indirect
-	github.com/rs/cors v1.9.0 // indirect
+	github.com/rs/cors v1.10.1 // indirect
 	github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
 	github.com/segmentio/encoding v0.3.6 // indirect
 	github.com/sergi/go-diff v1.3.1 // indirect
-	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
+	github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c // indirect
 	github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 // indirect
-	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
-	go.mongodb.org/mongo-driver v1.11.3 // indirect
+	go.mongodb.org/mongo-driver v1.13.1 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.uber.org/atomic v1.11.0 // @grafana/alerting-squad-backend
-	go.uber.org/goleak v1.2.1 // indirect
-	golang.org/x/sys v0.13.0 // indirect
-	golang.org/x/text v0.13.0 // @grafana/backend-platform
-	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect; @grafana/backend-platform
+	go.uber.org/goleak v1.3.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/text v0.14.0 // @grafana/backend-platform
+	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect; @grafana/backend-platform
 )
 
 require (
-	cloud.google.com/go/kms v1.15.2 // @grafana/backend-platform
-	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 // @grafana/backend-platform
+	cloud.google.com/go/kms v1.15.5 // @grafana/backend-platform
+	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 // @grafana/backend-platform
 	github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.9.0 // @grafana/backend-platform
 	github.com/Azure/azure-storage-blob-go v0.15.0 // @grafana/backend-platform
-	github.com/Azure/go-autorest/autorest/adal v0.9.22 // @grafana/backend-platform
+	github.com/Azure/go-autorest/autorest/adal v0.9.23 // @grafana/backend-platform
 	github.com/armon/go-radix v1.0.0 // @grafana/grafana-app-platform-squad
 	github.com/blugelabs/bluge v0.1.9 // @grafana/backend-platform
 	github.com/blugelabs/bluge_segment_api v0.2.0 // @grafana/backend-platform
 	github.com/bufbuild/connect-go v1.10.0 // @grafana/observability-traces-and-profiling
 	github.com/dlmiddlecote/sqlstats v1.0.2 // @grafana/backend-platform
-	github.com/drone/drone-cli v1.6.1 // @grafana/grafana-delivery
-	github.com/getkin/kin-openapi v0.120.0 // @grafana/grafana-operator-experience-squad
+	github.com/drone/drone-cli v1.6.1 // @grafana/grafana-release-guild
 	github.com/golang-migrate/migrate/v4 v4.7.0 // @grafana/backend-platform
-	github.com/google/go-github/v45 v45.2.0 // @grafana/grafana-delivery
+	github.com/google/go-github v17.0.0+incompatible // @grafana/grafana-release-guild
+	github.com/google/go-github/v45 v45.2.0 // @grafana/grafana-release-guild
 	github.com/grafana/codejen v0.0.3 // @grafana/dataviz-squad
-	github.com/grafana/dskit v0.0.0-20230706162620-5081d8ed53e6 // @grafana/backend-platform
-	github.com/huandu/xstrings v1.3.1 // @grafana/partner-datasources
+	github.com/grafana/dskit v0.0.0-20240104111617-ea101a3b86eb // @grafana/backend-platform
+	github.com/huandu/xstrings v1.3.2 // @grafana/partner-datasources
 	github.com/jmoiron/sqlx v1.3.5 // @grafana/backend-platform
 	github.com/matryer/is v1.4.0 // @grafana/grafana-as-code
-	github.com/urfave/cli v1.22.14 // @grafana/backend-platform
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 // @grafana/plugins-platform-backend
-	go.opentelemetry.io/contrib/propagators/jaeger v1.20.0 // @grafana/backend-platform
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // @grafana/backend-platform
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // @grafana/backend-platform
+	go.opentelemetry.io/contrib/propagators/jaeger v1.22.0 // @grafana/backend-platform
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // @grafana/backend-platform
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 // @grafana/backend-platform
 	gocloud.dev v0.25.0 // @grafana/grafana-app-platform-squad
 )
 
 require (
 	buf.build/gen/go/parca-dev/parca/bufbuild/connect-go v1.4.1-20221222094228-8b1d3d0f62e6.1 // @grafana/observability-traces-and-profiling
 	buf.build/gen/go/parca-dev/parca/protocolbuffers/go v1.28.1-20221222094228-8b1d3d0f62e6.4 // @grafana/observability-traces-and-profiling
-	github.com/Masterminds/semver/v3 v3.1.1 // @grafana/grafana-delivery
+	github.com/Masterminds/semver/v3 v3.1.1 // @grafana/grafana-release-guild
 	github.com/alicebob/miniredis/v2 v2.30.1 // @grafana/alerting-squad-backend
 	github.com/dave/dst v0.27.2 // @grafana/grafana-as-code
-	github.com/go-jose/go-jose/v3 v3.0.0 // @grafana/backend-platform
+	github.com/go-jose/go-jose/v3 v3.0.3 // @grafana/grafana-authnz-team
 	github.com/grafana/dataplane/examples v0.0.1 // @grafana/observability-metrics
-	github.com/grafana/dataplane/sdata v0.0.6 // @grafana/observability-metrics
-	github.com/grafana/kindsys v0.0.0-20230508162304-452481b63482 //  @grafana/grafana-as-code
+	github.com/grafana/dataplane/sdata v0.0.7 // @grafana/observability-metrics
 	github.com/grafana/tempo v1.5.1-0.20230524121406-1dc1bfe7085b // @grafana/observability-traces-and-profiling
-	github.com/grafana/thema v0.0.0-20230712153715-375c1b45f3ed // @grafana/grafana-as-code
-	github.com/microsoft/go-mssqldb v1.5.0 // @grafana/grafana-bi-squad
-	github.com/ory/fosite v0.44.1-0.20230317114349-45a6785cc54f // @grafana/grafana-authnz-team
-	github.com/redis/go-redis/v9 v9.0.2 // @grafana/alerting-squad-backend
-	github.com/weaveworks/common v0.0.0-20230511094633-334485600903 // @grafana/alerting-squad-backend
-	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // @grafana/grafana-as-code
-	go.opentelemetry.io/contrib/samplers/jaegerremote v0.9.0 // @grafana/backend-platform
-	golang.org/x/mod v0.12.0 // @grafana/backend-platform
-	gopkg.in/square/go-jose.v2 v2.6.0 // @grafana/grafana-authnz-team
-	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // @grafana/partner-datasources
+	github.com/microsoft/go-mssqldb v1.6.1-0.20240214161942-b65008136246 // @grafana/grafana-bi-squad
+	go.opentelemetry.io/contrib/samplers/jaegerremote v0.18.0 // @grafana/backend-platform
+	golang.org/x/mod v0.14.0 // @grafana/backend-platform
+	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // @grafana/partner-datasources
 )
 
 require (
-	go.opentelemetry.io/otel v1.19.0 // @grafana/backend-platform
-	k8s.io/apimachinery v0.27.1 // @grafana/grafana-app-platform-squad
-	k8s.io/apiserver v0.27.1 // @grafana/grafana-app-platform-squad
-	k8s.io/client-go v0.27.1 // @grafana/grafana-app-platform-squad
-	k8s.io/component-base v0.27.1 // @grafana/grafana-app-platform-squad
-	k8s.io/klog/v2 v2.90.1 // @grafana/grafana-app-platform-squad
-	k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // @grafana/grafana-app-platform-squad
+	go.opentelemetry.io/otel v1.24.0 // @grafana/backend-platform
+	k8s.io/api v0.29.2 // @grafana/grafana-app-platform-squad
+	k8s.io/apimachinery v0.29.2 // @grafana/grafana-app-platform-squad
+	k8s.io/apiserver v0.29.2 // @grafana/grafana-app-platform-squad
+	k8s.io/client-go v0.29.2 // @grafana/grafana-app-platform-squad
+	k8s.io/component-base v0.29.2 // @grafana/grafana-app-platform-squad
+	k8s.io/klog/v2 v2.120.1 // @grafana/grafana-app-platform-squad
+	k8s.io/kube-aggregator v0.29.0 // @grafana/grafana-app-platform-squad
+	k8s.io/kube-openapi v0.0.0-20240220201932-37d671a357a5 // @grafana/grafana-app-platform-squad
 )
 
 require github.com/grafana/gofpdf v0.0.0-20231002120153-857cc45be447 // @grafana/sharing-squad
 
-require github.com/grafana/pyroscope/api v0.2.0 // @grafana/observability-traces-and-profiling
+require github.com/grafana/pyroscope/api v0.3.0 // @grafana/observability-traces-and-profiling
+
+require github.com/grafana/pyroscope-go/godeltaprof v0.1.6 // @grafana/observability-traces-and-profiling
 
-require github.com/apache/arrow/go/v13 v13.0.0 // @grafana/observability-metrics
+require github.com/apache/arrow/go/v15 v15.0.2 // @grafana/observability-metrics
 
 require (
-	cloud.google.com/go v0.110.8 // indirect
+	cloud.google.com/go v0.112.0 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	github.com/Azure/azure-pipeline-go v0.2.3 // indirect
 	github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e // indirect
@@ -299,147 +287,115 @@ require (
 	github.com/NYTimes/gziphandler v1.1.1 // indirect
 	github.com/agext/levenshtein v1.2.1 // indirect
 	github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
-	github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
 	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
 	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
 	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/bmatcuk/doublestar v1.1.1 // indirect
 	github.com/buildkite/yaml v2.1.0+incompatible // indirect
+	github.com/bwmarrin/snowflake v0.3.0 // @grafan/grafana-app-platform-squad
 	github.com/centrifugal/protocol v0.10.0 // indirect
-	github.com/cloudflare/circl v1.3.3 // indirect
-	github.com/cockroachdb/errors v1.9.1 // indirect
-	github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f // indirect
-	github.com/cockroachdb/redact v1.1.3 // indirect
+	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
-	github.com/cristalhq/jwt/v4 v4.0.2 // indirect
-	github.com/dave/jennifer v1.5.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/dgraph-io/ristretto v0.1.0 // indirect
-	github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
-	github.com/docker/distribution v2.8.1+incompatible // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/docker/distribution v2.8.2+incompatible // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/drone-runners/drone-runner-docker v1.8.2 // indirect
 	github.com/drone/drone-go v1.7.1 // indirect
 	github.com/drone/envsubst v1.0.3 // indirect
 	github.com/drone/runner-go v1.12.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/ecordell/optgen v0.0.6 // indirect
-	github.com/emicklei/go-restful/v3 v3.10.1 // indirect
-	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
-	github.com/felixge/httpsnoop v1.0.3 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/getsentry/sentry-go v0.12.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
-	github.com/goccy/go-json v0.10.0 // indirect
+	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/gogo/googleapis v1.4.1 // indirect
 	github.com/gogo/status v1.1.1 // indirect
 	github.com/golang-sql/sqlexp v0.1.0 // indirect
-	github.com/google/cel-go v0.12.6 // indirect
-	github.com/google/gnostic v0.6.9 // indirect
+	github.com/google/cel-go v0.17.7 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/s2a-go v0.1.7 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.3.1 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
 	github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db // indirect
-	github.com/grafana/sqlds/v2 v2.3.10 // indirect
-	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
-	github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
-	github.com/hashicorp/golang-lru/v2 v2.0.2 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect; @grafana/alerting-squad-backend
 	github.com/hashicorp/memberlist v0.5.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/invopop/yaml v0.2.0 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
-	github.com/kr/pretty v0.3.1 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
 	github.com/kr/text v0.2.0 // indirect
-	github.com/magiconair/properties v1.8.6 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-ieproxy v0.0.3 // indirect
-	github.com/mattn/goveralls v0.0.6 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 //@grafana/grafana-authnz-team
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
+	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // @grafana/alerting-squad-backend
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.3-0.20220512140940-7b36cea86235 // indirect
 	github.com/opentracing-contrib/go-stdlib v1.0.0 // indirect
-	github.com/ory/go-acc v0.2.6 // indirect
-	github.com/ory/go-convenience v0.1.0 // indirect
-	github.com/ory/viper v1.7.5 // indirect
-	github.com/ory/x v0.0.214 // indirect
-	github.com/pborman/uuid v1.2.0 // indirect
-	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/perimeterx/marshmallow v1.1.5 // indirect
 	github.com/redis/rueidis v1.0.16 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/rivo/uniseg v0.3.4 // indirect
-	github.com/rogpeppe/go-internal v1.11.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/segmentio/asm v1.2.0 // indirect
 	github.com/shopspring/decimal v1.2.0 // indirect
-	github.com/spf13/afero v1.9.2 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
-	github.com/spf13/cobra v1.7.0 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stoewer/go-strcase v1.2.0 // indirect
-	github.com/subosito/gotenv v1.4.1 // indirect
+	github.com/stoewer/go-strcase v1.3.0 // indirect
 	github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 // indirect
 	github.com/unknwon/com v1.0.1 // indirect
 	github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3 // indirect
-	github.com/weaveworks/promrus v1.2.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
 	github.com/yuin/gopher-lua v1.1.0 // indirect
 	github.com/zclconf/go-cty v1.13.0 // indirect
 	github.com/zeebo/xxh3 v1.0.2 // indirect
-	go.etcd.io/etcd/api/v3 v3.5.7 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
-	go.etcd.io/etcd/client/v3 v3.5.7 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
-	go.opentelemetry.io/otel/metric v1.19.0 // indirect
-	go.starlark.net v0.0.0-20221020143700-22309ac47eac // indirect
-	go.uber.org/multierr v1.10.0 // indirect
-	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/term v0.13.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a // indirect
+	go.etcd.io/etcd/api/v3 v3.5.10 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
+	go.etcd.io/etcd/client/v3 v3.5.10 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
+	go.opentelemetry.io/otel/metric v1.24.0 // indirect
+	go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.26.0 // indirect
+	golang.org/x/term v0.18.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
 	gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
-	k8s.io/api v0.27.1 // indirect
-	k8s.io/kms v0.27.1 // indirect
-	lukechampine.com/uint128 v1.2.0 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
+	k8s.io/kms v0.29.2 // indirect
+	lukechampine.com/uint128 v1.3.0 // indirect
 	modernc.org/cc/v3 v3.40.0 // indirect
 	modernc.org/ccgo/v3 v3.16.13 // indirect
-	modernc.org/libc v1.22.2 // indirect
+	modernc.org/libc v1.22.4 // indirect
 	modernc.org/mathutil v1.5.0 // indirect
 	modernc.org/memory v1.5.0 // indirect
 	modernc.org/opt v0.1.3 // indirect
-	modernc.org/sqlite v1.20.4 // indirect
+	modernc.org/sqlite v1.21.2 // indirect
 	modernc.org/strutil v1.1.3 // indirect
 	modernc.org/token v1.1.0 // indirect
-	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
+	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // @grafana-app-platform-squad
+	sigs.k8s.io/yaml v1.3.0 // indirect; @grafana-app-platform-squad
 )
 
 require (
-	cloud.google.com/go/compute v1.23.0 // indirect
-	cloud.google.com/go/iam v1.1.2 // indirect
+	cloud.google.com/go/compute v1.23.3 // indirect
+	cloud.google.com/go/iam v1.1.5 // indirect
 	filippo.io/age v1.1.1 // @grafana/grafana-authnz-team
-	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.1 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.10.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.0 // indirect
-	github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect
+	github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 // indirect
 	github.com/Masterminds/sprig/v3 v3.2.2 // @grafana/backend-platform
-	github.com/Microsoft/go-winio v0.6.0 // indirect
+	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // @grafana/plugins-platform-backend
 	github.com/RoaringBitmap/roaring v0.9.4 // indirect
-	github.com/acomagu/bufpipe v1.0.3 // indirect
 	github.com/axiomhq/hyperloglog v0.0.0-20191112132149-a4c4c47bc57f // indirect
 	github.com/bits-and-blooms/bitset v1.2.0 // indirect
 	github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
@@ -449,55 +405,117 @@ require (
 	github.com/blevesearch/vellum v1.0.7 // indirect
 	github.com/blugelabs/ice v1.0.0 // indirect
 	github.com/caio/go-tdigest v3.1.0+incompatible // indirect
-	github.com/chromedp/cdproto v0.0.0-20220208224320-6efb837e6bc2 // indirect
-	github.com/coreos/go-semver v0.3.0 // indirect
+	github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89 // indirect
+	github.com/coreos/go-semver v0.3.1 // indirect
 	github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect
-	github.com/docker/docker v23.0.4+incompatible // @grafana/grafana-delivery
+	github.com/docker/docker v24.0.7+incompatible // @grafana/grafana-release-guild
 	github.com/elazarl/goproxy v0.0.0-20230731152917-f99041a5c027 // indirect
-	github.com/emirpasic/gods v1.12.0 // indirect
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
-	github.com/go-git/gcfg v1.5.0 // indirect
-	github.com/go-git/go-billy/v5 v5.3.1 // indirect
-	github.com/go-logr/logr v1.2.4 // @grafana/grafana-app-platform-squad
+	github.com/go-logr/logr v1.4.1 // @grafana/grafana-app-platform-squad
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/google/go-github v17.0.0+incompatible // @grafana/grafana-app-platform-squad
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect
-	github.com/hmarr/codeowners v1.1.2 // @grafana/grafana-as-code
-	github.com/imdario/mergo v0.3.13 // indirect
-	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
-	github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
-	github.com/klauspost/compress v1.16.5 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
+	github.com/imdario/mergo v0.3.16 // indirect
+	github.com/klauspost/compress v1.17.4 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
-	github.com/labstack/echo/v4 v4.10.2 // indirect
+	github.com/labstack/echo/v4 v4.11.1 // indirect
 	github.com/labstack/gommon v0.4.0 // indirect
-	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/mschoch/smat v0.2.0 // indirect
-	github.com/pierrec/lz4/v4 v4.1.17 // indirect
+	github.com/pierrec/lz4/v4 v4.1.18 // indirect
 	github.com/valyala/fasttemplate v1.2.2 // indirect
-	github.com/wk8/go-ordered-map v1.0.0 // @grafana/backend-platform
-	github.com/xanzy/ssh-agent v0.3.0 // indirect
-	github.com/xlab/treeprint v1.2.0 // @grafana/observability-traces-and-profiling
-	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
-	gopkg.in/warnings.v0 v0.1.2 // indirect
+	go.opentelemetry.io/proto/otlp v1.1.0 // indirect
+)
+
+require (
+	github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
+	github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/grafana/grafana-openapi-client-go v0.0.0-20231213163343-bd475d63fb79 // @grafana/backend-platform
+	github.com/moby/spdystream v0.2.0 // indirect
+	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
+)
+
+require k8s.io/code-generator v0.29.1 // @grafana/grafana-app-platform-squad
+
+require github.com/fullstorydev/grpchan v1.1.1 // @grafana/backend-platform
+
+// This needs to be here for other projects that import grafana/grafana
+// For local development grafana/grafana will always use the local files
+// Check go.work file for details
+require github.com/grafana/grafana/pkg/promlib v0.0.4 // @grafana/observability-metrics
+
+require (
+	github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect
+	github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect
+	github.com/apache/thrift v0.18.1 // indirect
+	github.com/grafana/grafana/pkg/apimachinery v0.0.0-20240226124929-648abdbd0ea4 // @grafana/grafana-app-platform-squad
+	github.com/grafana/grafana/pkg/apiserver v0.0.0-20240226124929-648abdbd0ea4 // @grafana/grafana-app-platform-squad
+)
+
+require (
+	github.com/bufbuild/protocompile v0.4.0 // indirect
+	github.com/grafana/sqlds/v3 v3.2.0 // indirect
+	github.com/jhump/protoreflect v1.15.1 // indirect
+	github.com/klauspost/asmfmt v1.3.2 // indirect
+	github.com/krasun/gosqlparser v1.0.5 // @grafana/grafana-app-platform-squad
+	github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
+	github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mithrandie/csvq v1.17.10 // indirect
+	github.com/mithrandie/csvq-driver v1.6.8 // indirect
+	github.com/mithrandie/go-file/v2 v2.1.0 // indirect
+	github.com/mithrandie/go-text v1.5.4 // indirect
+	github.com/mithrandie/ternary v1.1.1 // indirect
+)
+
+require github.com/getkin/kin-openapi v0.120.0 // @grafana/grafana-as-code
+
+require github.com/grafana/authlib v0.0.0-20240319083410-9d4a6e3861e5 // @grafana/grafana-app-platform-squad
+
+require (
+	github.com/bahlo/generic-list-go v0.2.0 // indirect
+	github.com/buger/jsonparser v1.1.1 // indirect
+	github.com/bytedance/sonic v1.9.1 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
+	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/gin-gonic/gin v1.9.1 // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
+	github.com/go-playground/validator/v10 v10.14.0 // indirect
+	github.com/hashicorp/go-uuid v1.0.3 // indirect
+	github.com/hashicorp/golang-lru v0.6.0 // indirect
+	github.com/invopop/jsonschema v0.12.0 // indirect
+	github.com/jcmturner/aescts/v2 v2.0.0 // indirect
+	github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
+	github.com/jcmturner/gofork v1.7.6 // indirect
+	github.com/jcmturner/goidentity/v6 v6.0.1 // indirect
+	github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
+	github.com/jcmturner/rpc/v2 v2.0.3 // indirect
+	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/ugorji/go/codec v1.2.11 // indirect
+	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
+	github.com/yudai/pp v2.0.1+incompatible // indirect
+	golang.org/x/arch v0.3.0 // indirect
 )
 
 // Use fork of crewjam/saml with fixes for some issues until changes get merged into upstream
 replace github.com/crewjam/saml => github.com/grafana/saml v0.4.15-0.20231025143828-a6c0e9b86a4c
 
+// replace github.com/google/cel-go => github.com/google/cel-go v0.16.1
+
 // Thema's thema CLI requires cobra, which eventually works its way down to go-hclog@v1.0.0.
 // Upgrading affects backend plugins: https://github.com/grafana/grafana/pull/47653#discussion_r850508593
 // No harm to Thema because it's only a dependency in its main package.
 replace github.com/hashicorp/go-hclog => github.com/hashicorp/go-hclog v0.16.1
 
-// This is a patched v0.8.2 intended to fix session.Find (and others) silently ignoring SQLITE_BUSY errors. This could
-// happen, for example, during a read when the sqlite db is under heavy write load.
-// This patch cherry picks compatible fixes from upstream xorm PR#1998 and can be reverted on upgrade to xorm v1.2.0+.
-// This has also been patched to support the azuresql driver that is a thin wrapper for the mssql driver with azure authentication support.
-replace xorm.io/xorm => github.com/grafana/xorm v0.8.3-0.20230627081928-d04aa38aa209
-
 // Use our fork of the upstream alertmanagers.
 // This is required in order to get notification delivery errors from the receivers API.
-replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-alertmanager v0.25.1-0.20230918083811-3513be6760b7
+replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-alertmanager v0.25.1-0.20240208102907-e82436ce63e6
 
 exclude github.com/mattn/go-sqlite3 v2.0.3+incompatible
+
+// Use our fork xorm. go.work currently overrides this and points to the local ./pkg/util/xorm directory.
+replace xorm.io/xorm => github.com/grafana/grafana/pkg/util/xorm v0.0.1
diff --git a/go.sum b/go.sum
index 6e9513c56776a..2e51b7e84c2e1 100644
--- a/go.sum
+++ b/go.sum
@@ -1,4 +1,3 @@
-bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8=
 buf.build/gen/go/grpc-ecosystem/grpc-gateway/protocolbuffers/go v1.28.1-20221127060915-a1ecdc58eccd.4/go.mod h1:92ejKVTiuvnKoAtRlpJpIxKfloI935DDqhs0NCRx+KM=
 buf.build/gen/go/parca-dev/parca/bufbuild/connect-go v1.4.1-20221222094228-8b1d3d0f62e6.1 h1:wQ75SnlaD0X30PnrmA+07A/5fnQWrAHy1mzv+CPB5Oo=
 buf.build/gen/go/parca-dev/parca/bufbuild/connect-go v1.4.1-20221222094228-8b1d3d0f62e6.1/go.mod h1:VYzBTKhjl92cl3sv+xznQcJHCezU7qnI0FhBAUb4n8c=
@@ -8,7 +7,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
-cloud.google.com/go v0.41.0/go.mod h1:OauMR7DV8fzvZIl2qg6rkaIhD/vmgk4iwEw/h6ercmg=
 cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
 cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
 cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
@@ -45,68 +43,167 @@ cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRY
 cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go v0.107.0/go.mod h1:wpc2eNrD7hXUTy8EKS10jkxpZBjASrORK7goS+3YX2I=
 cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY=
-cloud.google.com/go v0.110.8 h1:tyNdfIxjzaWctIiLYOTalaLKZ17SI44SKFW26QbOhME=
+cloud.google.com/go v0.110.2/go.mod h1:k04UEeEtb6ZBRTv3dZz4CeJC3jKGxyhl0sAiVVquxiw=
+cloud.google.com/go v0.110.4/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI=
+cloud.google.com/go v0.110.6/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI=
+cloud.google.com/go v0.110.7/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI=
 cloud.google.com/go v0.110.8/go.mod h1:Iz8AkXJf1qmxC3Oxoep8R1T36w8B92yU29PcBhHO5fk=
+cloud.google.com/go v0.110.9/go.mod h1:rpxevX/0Lqvlbc88b7Sc1SPNdyK1riNBTUU6JXhYNpM=
+cloud.google.com/go v0.110.10/go.mod h1:v1OoFqYxiBkUrruItNM3eT4lLByNjxmJSV/xDKJNnic=
+cloud.google.com/go v0.112.0 h1:tpFCD7hpHFlQ8yPwT3x+QeXqc2T6+n6T+hmABHfDUSM=
+cloud.google.com/go v0.112.0/go.mod h1:3jEEVwZ/MHU4djK5t5RHuKOA/GbLddgTdVubX1qnPD4=
 cloud.google.com/go/accessapproval v1.4.0/go.mod h1:zybIuC3KpDOvotz59lFe5qxRZx6C75OtwbisN56xYB4=
 cloud.google.com/go/accessapproval v1.5.0/go.mod h1:HFy3tuiGvMdcd/u+Cu5b9NkO1pEICJ46IR82PoUdplw=
 cloud.google.com/go/accessapproval v1.6.0/go.mod h1:R0EiYnwV5fsRFiKZkPHr6mwyk2wxUJ30nL4j2pcFY2E=
+cloud.google.com/go/accessapproval v1.7.1/go.mod h1:JYczztsHRMK7NTXb6Xw+dwbs/WnOJxbo/2mTI+Kgg68=
+cloud.google.com/go/accessapproval v1.7.2/go.mod h1:/gShiq9/kK/h8T/eEn1BTzalDvk0mZxJlhfw0p+Xuc0=
+cloud.google.com/go/accessapproval v1.7.3/go.mod h1:4l8+pwIxGTNqSf4T3ds8nLO94NQf0W/KnMNuQ9PbnP8=
+cloud.google.com/go/accessapproval v1.7.4/go.mod h1:/aTEh45LzplQgFYdQdwPMR9YdX0UlhBmvB84uAmQKUc=
 cloud.google.com/go/accesscontextmanager v1.3.0/go.mod h1:TgCBehyr5gNMz7ZaH9xubp+CE8dkrszb4oK9CWyvD4o=
 cloud.google.com/go/accesscontextmanager v1.4.0/go.mod h1:/Kjh7BBu/Gh83sv+K60vN9QE5NJcd80sU33vIe2IFPE=
 cloud.google.com/go/accesscontextmanager v1.6.0/go.mod h1:8XCvZWfYw3K/ji0iVnp+6pu7huxoQTLmxAbVjbloTtM=
+cloud.google.com/go/accesscontextmanager v1.7.0/go.mod h1:CEGLewx8dwa33aDAZQujl7Dx+uYhS0eay198wB/VumQ=
+cloud.google.com/go/accesscontextmanager v1.8.0/go.mod h1:uI+AI/r1oyWK99NN8cQ3UK76AMelMzgZCvJfsi2c+ps=
+cloud.google.com/go/accesscontextmanager v1.8.1/go.mod h1:JFJHfvuaTC+++1iL1coPiG1eu5D24db2wXCDWDjIrxo=
+cloud.google.com/go/accesscontextmanager v1.8.2/go.mod h1:E6/SCRM30elQJ2PKtFMs2YhfJpZSNcJyejhuzoId4Zk=
+cloud.google.com/go/accesscontextmanager v1.8.3/go.mod h1:4i/JkF2JiFbhLnnpnfoTX5vRXfhf9ukhU1ANOTALTOQ=
+cloud.google.com/go/accesscontextmanager v1.8.4/go.mod h1:ParU+WbMpD34s5JFEnGAnPBYAgUHozaTmDJU7aCU9+M=
 cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw=
 cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY=
 cloud.google.com/go/aiplatform v1.27.0/go.mod h1:Bvxqtl40l0WImSb04d0hXFU7gDOiq9jQmorivIiWcKg=
 cloud.google.com/go/aiplatform v1.35.0/go.mod h1:7MFT/vCaOyZT/4IIFfxH4ErVg/4ku6lKv3w0+tFTgXQ=
+cloud.google.com/go/aiplatform v1.36.1/go.mod h1:WTm12vJRPARNvJ+v6P52RDHCNe4AhvjcIZ/9/RRHy/k=
+cloud.google.com/go/aiplatform v1.37.0/go.mod h1:IU2Cv29Lv9oCn/9LkFiiuKfwrRTq+QQMbW+hPCxJGZw=
+cloud.google.com/go/aiplatform v1.45.0/go.mod h1:Iu2Q7sC7QGhXUeOhAj/oCK9a+ULz1O4AotZiqjQ8MYA=
+cloud.google.com/go/aiplatform v1.48.0/go.mod h1:Iu2Q7sC7QGhXUeOhAj/oCK9a+ULz1O4AotZiqjQ8MYA=
+cloud.google.com/go/aiplatform v1.50.0/go.mod h1:IRc2b8XAMTa9ZmfJV1BCCQbieWWvDnP1A8znyz5N7y4=
+cloud.google.com/go/aiplatform v1.51.0/go.mod h1:IRc2b8XAMTa9ZmfJV1BCCQbieWWvDnP1A8znyz5N7y4=
+cloud.google.com/go/aiplatform v1.51.1/go.mod h1:kY3nIMAVQOK2XDqDPHaOuD9e+FdMA6OOpfBjsvaFSOo=
+cloud.google.com/go/aiplatform v1.51.2/go.mod h1:hCqVYB3mY45w99TmetEoe8eCQEwZEp9WHxeZdcv9phw=
+cloud.google.com/go/aiplatform v1.52.0/go.mod h1:pwZMGvqe0JRkI1GWSZCtnAfrR4K1bv65IHILGA//VEU=
+cloud.google.com/go/aiplatform v1.54.0/go.mod h1:pwZMGvqe0JRkI1GWSZCtnAfrR4K1bv65IHILGA//VEU=
 cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI=
 cloud.google.com/go/analytics v0.12.0/go.mod h1:gkfj9h6XRf9+TS4bmuhPEShsh3hH8PAZzm/41OOhQd4=
+cloud.google.com/go/analytics v0.17.0/go.mod h1:WXFa3WSym4IZ+JiKmavYdJwGG/CvpqiqczmL59bTD9M=
 cloud.google.com/go/analytics v0.18.0/go.mod h1:ZkeHGQlcIPkw0R/GW+boWHhCOR43xz9RN/jn7WcqfIE=
+cloud.google.com/go/analytics v0.19.0/go.mod h1:k8liqf5/HCnOUkbawNtrWWc+UAzyDlW89doe8TtoDsE=
+cloud.google.com/go/analytics v0.21.2/go.mod h1:U8dcUtmDmjrmUTnnnRnI4m6zKn/yaA5N9RlEkYFHpQo=
+cloud.google.com/go/analytics v0.21.3/go.mod h1:U8dcUtmDmjrmUTnnnRnI4m6zKn/yaA5N9RlEkYFHpQo=
+cloud.google.com/go/analytics v0.21.4/go.mod h1:zZgNCxLCy8b2rKKVfC1YkC2vTrpfZmeRCySM3aUbskA=
+cloud.google.com/go/analytics v0.21.5/go.mod h1:BQtOBHWTlJ96axpPPnw5CvGJ6i3Ve/qX2fTxR8qWyr8=
+cloud.google.com/go/analytics v0.21.6/go.mod h1:eiROFQKosh4hMaNhF85Oc9WO97Cpa7RggD40e/RBy8w=
 cloud.google.com/go/apigateway v1.3.0/go.mod h1:89Z8Bhpmxu6AmUxuVRg/ECRGReEdiP3vQtk4Z1J9rJk=
 cloud.google.com/go/apigateway v1.4.0/go.mod h1:pHVY9MKGaH9PQ3pJ4YLzoj6U5FUDeDFBllIz7WmzJoc=
 cloud.google.com/go/apigateway v1.5.0/go.mod h1:GpnZR3Q4rR7LVu5951qfXPJCHquZt02jf7xQx7kpqN8=
+cloud.google.com/go/apigateway v1.6.1/go.mod h1:ufAS3wpbRjqfZrzpvLC2oh0MFlpRJm2E/ts25yyqmXA=
+cloud.google.com/go/apigateway v1.6.2/go.mod h1:CwMC90nnZElorCW63P2pAYm25AtQrHfuOkbRSHj0bT8=
+cloud.google.com/go/apigateway v1.6.3/go.mod h1:k68PXWpEs6BVDTtnLQAyG606Q3mz8pshItwPXjgv44Y=
+cloud.google.com/go/apigateway v1.6.4/go.mod h1:0EpJlVGH5HwAN4VF4Iec8TAzGN1aQgbxAWGJsnPCGGY=
 cloud.google.com/go/apigeeconnect v1.3.0/go.mod h1:G/AwXFAKo0gIXkPTVfZDd2qA1TxBXJ3MgMRBQkIi9jc=
 cloud.google.com/go/apigeeconnect v1.4.0/go.mod h1:kV4NwOKqjvt2JYR0AoIWo2QGfoRtn/pkS3QlHp0Ni04=
 cloud.google.com/go/apigeeconnect v1.5.0/go.mod h1:KFaCqvBRU6idyhSNyn3vlHXc8VMDJdRmwDF6JyFRqZ8=
+cloud.google.com/go/apigeeconnect v1.6.1/go.mod h1:C4awq7x0JpLtrlQCr8AzVIzAaYgngRqWf9S5Uhg+wWs=
+cloud.google.com/go/apigeeconnect v1.6.2/go.mod h1:s6O0CgXT9RgAxlq3DLXvG8riw8PYYbU/v25jqP3Dy18=
+cloud.google.com/go/apigeeconnect v1.6.3/go.mod h1:peG0HFQ0si2bN15M6QSjEW/W7Gy3NYkWGz7pFz13cbo=
+cloud.google.com/go/apigeeconnect v1.6.4/go.mod h1:CapQCWZ8TCjnU0d7PobxhpOdVz/OVJ2Hr/Zcuu1xFx0=
 cloud.google.com/go/apigeeregistry v0.4.0/go.mod h1:EUG4PGcsZvxOXAdyEghIdXwAEi/4MEaoqLMLDMIwKXY=
 cloud.google.com/go/apigeeregistry v0.5.0/go.mod h1:YR5+s0BVNZfVOUkMa5pAR2xGd0A473vA5M7j247o1wM=
+cloud.google.com/go/apigeeregistry v0.6.0/go.mod h1:BFNzW7yQVLZ3yj0TKcwzb8n25CFBri51GVGOEUcgQsc=
+cloud.google.com/go/apigeeregistry v0.7.1/go.mod h1:1XgyjZye4Mqtw7T9TsY4NW10U7BojBvG4RMD+vRDrIw=
+cloud.google.com/go/apigeeregistry v0.7.2/go.mod h1:9CA2B2+TGsPKtfi3F7/1ncCCsL62NXBRfM6iPoGSM+8=
+cloud.google.com/go/apigeeregistry v0.8.1/go.mod h1:MW4ig1N4JZQsXmBSwH4rwpgDonocz7FPBSw6XPGHmYw=
+cloud.google.com/go/apigeeregistry v0.8.2/go.mod h1:h4v11TDGdeXJDJvImtgK2AFVvMIgGWjSb0HRnBSjcX8=
 cloud.google.com/go/apikeys v0.4.0/go.mod h1:XATS/yqZbaBK0HOssf+ALHp8jAlNHUgyfprvNcBIszU=
 cloud.google.com/go/apikeys v0.5.0/go.mod h1:5aQfwY4D+ewMMWScd3hm2en3hCj+BROlyrt3ytS7KLI=
+cloud.google.com/go/apikeys v0.6.0/go.mod h1:kbpXu5upyiAlGkKrJgQl8A0rKNNJ7dQ377pdroRSSi8=
 cloud.google.com/go/appengine v1.4.0/go.mod h1:CS2NhuBuDXM9f+qscZ6V86m1MIIqPj3WC/UoEuR1Sno=
 cloud.google.com/go/appengine v1.5.0/go.mod h1:TfasSozdkFI0zeoxW3PTBLiNqRmzraodCWatWI9Dmak=
 cloud.google.com/go/appengine v1.6.0/go.mod h1:hg6i0J/BD2cKmDJbaFSYHFyZkgBEfQrDg/X0V5fJn84=
+cloud.google.com/go/appengine v1.7.0/go.mod h1:eZqpbHFCqRGa2aCdope7eC0SWLV1j0neb/QnMJVWx6A=
+cloud.google.com/go/appengine v1.7.1/go.mod h1:IHLToyb/3fKutRysUlFO0BPt5j7RiQ45nrzEJmKTo6E=
+cloud.google.com/go/appengine v1.8.1/go.mod h1:6NJXGLVhZCN9aQ/AEDvmfzKEfoYBlfB80/BHiKVputY=
+cloud.google.com/go/appengine v1.8.2/go.mod h1:WMeJV9oZ51pvclqFN2PqHoGnys7rK0rz6s3Mp6yMvDo=
+cloud.google.com/go/appengine v1.8.3/go.mod h1:2oUPZ1LVZ5EXi+AF1ihNAF+S8JrzQ3till5m9VQkrsk=
+cloud.google.com/go/appengine v1.8.4/go.mod h1:TZ24v+wXBujtkK77CXCpjZbnuTvsFNT41MUaZ28D6vg=
 cloud.google.com/go/area120 v0.5.0/go.mod h1:DE/n4mp+iqVyvxHN41Vf1CR602GiHQjFPusMFW6bGR4=
 cloud.google.com/go/area120 v0.6.0/go.mod h1:39yFJqWVgm0UZqWTOdqkLhjoC7uFfgXRC8g/ZegeAh0=
+cloud.google.com/go/area120 v0.7.0/go.mod h1:a3+8EUD1SX5RUcCs3MY5YasiO1z6yLiNLRiFrykbynY=
 cloud.google.com/go/area120 v0.7.1/go.mod h1:j84i4E1RboTWjKtZVWXPqvK5VHQFJRF2c1Nm69pWm9k=
+cloud.google.com/go/area120 v0.8.1/go.mod h1:BVfZpGpB7KFVNxPiQBuHkX6Ed0rS51xIgmGyjrAfzsg=
+cloud.google.com/go/area120 v0.8.2/go.mod h1:a5qfo+x77SRLXnCynFWPUZhnZGeSgvQ+Y0v1kSItkh4=
+cloud.google.com/go/area120 v0.8.3/go.mod h1:5zj6pMzVTH+SVHljdSKC35sriR/CVvQZzG/Icdyriw0=
+cloud.google.com/go/area120 v0.8.4/go.mod h1:jfawXjxf29wyBXr48+W+GyX/f8fflxp642D/bb9v68M=
 cloud.google.com/go/artifactregistry v1.6.0/go.mod h1:IYt0oBPSAGYj/kprzsBjZ/4LnG/zOcHyFHjWPCi6SAQ=
 cloud.google.com/go/artifactregistry v1.7.0/go.mod h1:mqTOFOnGZx8EtSqK/ZWcsm/4U8B77rbcLP6ruDU2Ixk=
 cloud.google.com/go/artifactregistry v1.8.0/go.mod h1:w3GQXkJX8hiKN0v+at4b0qotwijQbYUqF2GWkZzAhC0=
 cloud.google.com/go/artifactregistry v1.9.0/go.mod h1:2K2RqvA2CYvAeARHRkLDhMDJ3OXy26h3XW+3/Jh2uYc=
+cloud.google.com/go/artifactregistry v1.11.1/go.mod h1:lLYghw+Itq9SONbCa1YWBoWs1nOucMH0pwXN1rOBZFI=
 cloud.google.com/go/artifactregistry v1.11.2/go.mod h1:nLZns771ZGAwVLzTX/7Al6R9ehma4WUEhZGWV6CeQNQ=
+cloud.google.com/go/artifactregistry v1.12.0/go.mod h1:o6P3MIvtzTOnmvGagO9v/rOjjA0HmhJ+/6KAXrmYDCI=
+cloud.google.com/go/artifactregistry v1.13.0/go.mod h1:uy/LNfoOIivepGhooAUpL1i30Hgee3Cu0l4VTWHUC08=
+cloud.google.com/go/artifactregistry v1.14.1/go.mod h1:nxVdG19jTaSTu7yA7+VbWL346r3rIdkZ142BSQqhn5E=
+cloud.google.com/go/artifactregistry v1.14.2/go.mod h1:Xk+QbsKEb0ElmyeMfdHAey41B+qBq3q5R5f5xD4XT3U=
+cloud.google.com/go/artifactregistry v1.14.3/go.mod h1:A2/E9GXnsyXl7GUvQ/2CjHA+mVRoWAXC0brg2os+kNI=
+cloud.google.com/go/artifactregistry v1.14.4/go.mod h1:SJJcZTMv6ce0LDMUnihCN7WSrI+kBSFV0KIKo8S8aYU=
+cloud.google.com/go/artifactregistry v1.14.6/go.mod h1:np9LSFotNWHcjnOgh8UVK0RFPCTUGbO0ve3384xyHfE=
 cloud.google.com/go/asset v1.5.0/go.mod h1:5mfs8UvcM5wHhqtSv8J1CtxxaQq3AdBxxQi2jGW/K4o=
 cloud.google.com/go/asset v1.7.0/go.mod h1:YbENsRK4+xTiL+Ofoj5Ckf+O17kJtgp3Y3nn4uzZz5s=
 cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjbytpUaW0=
 cloud.google.com/go/asset v1.9.0/go.mod h1:83MOE6jEJBMqFKadM9NLRcs80Gdw76qGuHn8m3h8oHQ=
 cloud.google.com/go/asset v1.10.0/go.mod h1:pLz7uokL80qKhzKr4xXGvBQXnzHn5evJAEAtZiIb0wY=
 cloud.google.com/go/asset v1.11.1/go.mod h1:fSwLhbRvC9p9CXQHJ3BgFeQNM4c9x10lqlrdEUYXlJo=
+cloud.google.com/go/asset v1.12.0/go.mod h1:h9/sFOa4eDIyKmH6QMpm4eUK3pDojWnUhTgJlk762Hg=
+cloud.google.com/go/asset v1.13.0/go.mod h1:WQAMyYek/b7NBpYq/K4KJWcRqzoalEsxz/t/dTk4THw=
+cloud.google.com/go/asset v1.14.1/go.mod h1:4bEJ3dnHCqWCDbWJ/6Vn7GVI9LerSi7Rfdi03hd+WTQ=
+cloud.google.com/go/asset v1.15.0/go.mod h1:tpKafV6mEut3+vN9ScGvCHXHj7FALFVta+okxFECHcg=
+cloud.google.com/go/asset v1.15.1/go.mod h1:yX/amTvFWRpp5rcFq6XbCxzKT8RJUam1UoboE179jU4=
+cloud.google.com/go/asset v1.15.2/go.mod h1:B6H5tclkXvXz7PD22qCA2TDxSVQfasa3iDlM89O2NXs=
+cloud.google.com/go/asset v1.15.3/go.mod h1:yYLfUD4wL4X589A9tYrv4rFrba0QlDeag0CMcM5ggXU=
 cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY=
 cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw=
 cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI=
 cloud.google.com/go/assuredworkloads v1.8.0/go.mod h1:AsX2cqyNCOvEQC8RMPnoc0yEarXQk6WEKkxYfL6kGIo=
 cloud.google.com/go/assuredworkloads v1.9.0/go.mod h1:kFuI1P78bplYtT77Tb1hi0FMxM0vVpRC7VVoJC3ZoT0=
 cloud.google.com/go/assuredworkloads v1.10.0/go.mod h1:kwdUQuXcedVdsIaKgKTp9t0UJkE5+PAVNhdQm4ZVq2E=
+cloud.google.com/go/assuredworkloads v1.11.1/go.mod h1:+F04I52Pgn5nmPG36CWFtxmav6+7Q+c5QyJoL18Lry0=
+cloud.google.com/go/assuredworkloads v1.11.2/go.mod h1:O1dfr+oZJMlE6mw0Bp0P1KZSlj5SghMBvTpZqIcUAW4=
+cloud.google.com/go/assuredworkloads v1.11.3/go.mod h1:vEjfTKYyRUaIeA0bsGJceFV2JKpVRgyG2op3jfa59Zs=
+cloud.google.com/go/assuredworkloads v1.11.4/go.mod h1:4pwwGNwy1RP0m+y12ef3Q/8PaiWrIDQ6nD2E8kvWI9U=
 cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0=
 cloud.google.com/go/automl v1.6.0/go.mod h1:ugf8a6Fx+zP0D59WLhqgTDsQI9w07o64uf/Is3Nh5p8=
 cloud.google.com/go/automl v1.7.0/go.mod h1:RL9MYCCsJEOmt0Wf3z9uzG0a7adTT1fe+aObgSpkCt8=
 cloud.google.com/go/automl v1.8.0/go.mod h1:xWx7G/aPEe/NP+qzYXktoBSDfjO+vnKMGgsApGJJquM=
 cloud.google.com/go/automl v1.12.0/go.mod h1:tWDcHDp86aMIuHmyvjuKeeHEGq76lD7ZqfGLN6B0NuU=
+cloud.google.com/go/automl v1.13.1/go.mod h1:1aowgAHWYZU27MybSCFiukPO7xnyawv7pt3zK4bheQE=
+cloud.google.com/go/automl v1.13.2/go.mod h1:gNY/fUmDEN40sP8amAX3MaXkxcqPIn7F1UIIPZpy4Mg=
+cloud.google.com/go/automl v1.13.3/go.mod h1:Y8KwvyAZFOsMAPqUCfNu1AyclbC6ivCUF/MTwORymyY=
+cloud.google.com/go/automl v1.13.4/go.mod h1:ULqwX/OLZ4hBVfKQaMtxMSTlPx0GqGbWN8uA/1EqCP8=
 cloud.google.com/go/baremetalsolution v0.3.0/go.mod h1:XOrocE+pvK1xFfleEnShBlNAXf+j5blPPxrhjKgnIFc=
 cloud.google.com/go/baremetalsolution v0.4.0/go.mod h1:BymplhAadOO/eBa7KewQ0Ppg4A4Wplbn+PsFKRLo0uI=
 cloud.google.com/go/baremetalsolution v0.5.0/go.mod h1:dXGxEkmR9BMwxhzBhV0AioD0ULBmuLZI8CdwalUxuss=
+cloud.google.com/go/baremetalsolution v1.1.1/go.mod h1:D1AV6xwOksJMV4OSlWHtWuFNZZYujJknMAP4Qa27QIA=
+cloud.google.com/go/baremetalsolution v1.2.0/go.mod h1:68wi9AwPYkEWIUT4SvSGS9UJwKzNpshjHsH4lzk8iOw=
+cloud.google.com/go/baremetalsolution v1.2.1/go.mod h1:3qKpKIw12RPXStwQXcbhfxVj1dqQGEvcmA+SX/mUR88=
+cloud.google.com/go/baremetalsolution v1.2.2/go.mod h1:O5V6Uu1vzVelYahKfwEWRMaS3AbCkeYHy3145s1FkhM=
+cloud.google.com/go/baremetalsolution v1.2.3/go.mod h1:/UAQ5xG3faDdy180rCUv47e0jvpp3BFxT+Cl0PFjw5g=
 cloud.google.com/go/batch v0.3.0/go.mod h1:TR18ZoAekj1GuirsUsR1ZTKN3FC/4UDnScjT8NXImFE=
 cloud.google.com/go/batch v0.4.0/go.mod h1:WZkHnP43R/QCGQsZ+0JyG4i79ranE2u8xvjq/9+STPE=
 cloud.google.com/go/batch v0.7.0/go.mod h1:vLZN95s6teRUqRQ4s3RLDsH8PvboqBK+rn1oevL159g=
+cloud.google.com/go/batch v1.3.1/go.mod h1:VguXeQKXIYaeeIYbuozUmBR13AfL4SJP7IltNPS+A4A=
+cloud.google.com/go/batch v1.4.1/go.mod h1:KdBmDD61K0ovcxoRHGrN6GmOBWeAOyCgKD0Mugx4Fkk=
+cloud.google.com/go/batch v1.5.0/go.mod h1:KdBmDD61K0ovcxoRHGrN6GmOBWeAOyCgKD0Mugx4Fkk=
+cloud.google.com/go/batch v1.5.1/go.mod h1:RpBuIYLkQu8+CWDk3dFD/t/jOCGuUpkpX+Y0n1Xccs8=
+cloud.google.com/go/batch v1.6.1/go.mod h1:urdpD13zPe6YOK+6iZs/8/x2VBRofvblLpx0t57vM98=
+cloud.google.com/go/batch v1.6.3/go.mod h1:J64gD4vsNSA2O5TtDB5AAux3nJ9iV8U3ilg3JDBYejU=
 cloud.google.com/go/beyondcorp v0.2.0/go.mod h1:TB7Bd+EEtcw9PCPQhCJtJGjk/7TC6ckmnSFS+xwTfm4=
 cloud.google.com/go/beyondcorp v0.3.0/go.mod h1:E5U5lcrcXMsCuoDNyGrpyTm/hn7ne941Jz2vmksAxW8=
 cloud.google.com/go/beyondcorp v0.4.0/go.mod h1:3ApA0mbhHx6YImmuubf5pyW8srKnCEPON32/5hj+RmM=
+cloud.google.com/go/beyondcorp v0.5.0/go.mod h1:uFqj9X+dSfrheVp7ssLTaRHd2EHqSL4QZmH4e8WXGGU=
+cloud.google.com/go/beyondcorp v0.6.1/go.mod h1:YhxDWw946SCbmcWo3fAhw3V4XZMSpQ/VYfcKGAEU8/4=
+cloud.google.com/go/beyondcorp v1.0.0/go.mod h1:YhxDWw946SCbmcWo3fAhw3V4XZMSpQ/VYfcKGAEU8/4=
+cloud.google.com/go/beyondcorp v1.0.1/go.mod h1:zl/rWWAFVeV+kx+X2Javly7o1EIQThU4WlkynffL/lk=
+cloud.google.com/go/beyondcorp v1.0.2/go.mod h1:m8cpG7caD+5su+1eZr+TSvF6r21NdLJk4f9u4SP2Ntc=
+cloud.google.com/go/beyondcorp v1.0.3/go.mod h1:HcBvnEd7eYr+HGDd5ZbuVmBYX019C6CEXBonXbCVwJo=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
@@ -116,34 +213,84 @@ cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM7
 cloud.google.com/go/bigquery v1.42.0/go.mod h1:8dRTJxhtG+vwBKzE5OseQn/hiydoQN3EedCaOdYmxRA=
 cloud.google.com/go/bigquery v1.43.0/go.mod h1:ZMQcXHsl+xmU1z36G2jNGZmKp9zNY5BUua5wDgmNCfw=
 cloud.google.com/go/bigquery v1.44.0/go.mod h1:0Y33VqXTEsbamHJvJHdFmtqHvMIY28aK1+dFsvaChGc=
+cloud.google.com/go/bigquery v1.47.0/go.mod h1:sA9XOgy0A8vQK9+MWhEQTY6Tix87M/ZurWFIxmF9I/E=
 cloud.google.com/go/bigquery v1.48.0/go.mod h1:QAwSz+ipNgfL5jxiaK7weyOhzdoAy1zFm0Nf1fysJac=
+cloud.google.com/go/bigquery v1.49.0/go.mod h1:Sv8hMmTFFYBlt/ftw2uN6dFdQPzBlREY9yBh7Oy7/4Q=
+cloud.google.com/go/bigquery v1.50.0/go.mod h1:YrleYEh2pSEbgTBZYMJ5SuSr0ML3ypjRB1zgf7pvQLU=
+cloud.google.com/go/bigquery v1.52.0/go.mod h1:3b/iXjRQGU4nKa87cXeg6/gogLjO8C6PmuM8i5Bi/u4=
+cloud.google.com/go/bigquery v1.53.0/go.mod h1:3b/iXjRQGU4nKa87cXeg6/gogLjO8C6PmuM8i5Bi/u4=
+cloud.google.com/go/bigquery v1.55.0/go.mod h1:9Y5I3PN9kQWuid6183JFhOGOW3GcirA5LpsKCUn+2ec=
+cloud.google.com/go/bigquery v1.56.0/go.mod h1:KDcsploXTEY7XT3fDQzMUZlpQLHzE4itubHrnmhUrZA=
+cloud.google.com/go/bigquery v1.57.1/go.mod h1:iYzC0tGVWt1jqSzBHqCr3lrRn0u13E8e+AqowBsDgug=
 cloud.google.com/go/billing v1.4.0/go.mod h1:g9IdKBEFlItS8bTtlrZdVLWSSdSyFUZKXNS02zKMOZY=
 cloud.google.com/go/billing v1.5.0/go.mod h1:mztb1tBc3QekhjSgmpf/CV4LzWXLzCArwpLmP2Gm88s=
 cloud.google.com/go/billing v1.6.0/go.mod h1:WoXzguj+BeHXPbKfNWkqVtDdzORazmCjraY+vrxcyvI=
 cloud.google.com/go/billing v1.7.0/go.mod h1:q457N3Hbj9lYwwRbnlD7vUpyjq6u5U1RAOArInEiD5Y=
 cloud.google.com/go/billing v1.12.0/go.mod h1:yKrZio/eu+okO/2McZEbch17O5CB5NpZhhXG6Z766ss=
+cloud.google.com/go/billing v1.13.0/go.mod h1:7kB2W9Xf98hP9Sr12KfECgfGclsH3CQR0R08tnRlRbc=
+cloud.google.com/go/billing v1.16.0/go.mod h1:y8vx09JSSJG02k5QxbycNRrN7FGZB6F3CAcgum7jvGA=
+cloud.google.com/go/billing v1.17.0/go.mod h1:Z9+vZXEq+HwH7bhJkyI4OQcR6TSbeMrjlpEjO2vzY64=
+cloud.google.com/go/billing v1.17.1/go.mod h1:Z9+vZXEq+HwH7bhJkyI4OQcR6TSbeMrjlpEjO2vzY64=
+cloud.google.com/go/billing v1.17.2/go.mod h1:u/AdV/3wr3xoRBk5xvUzYMS1IawOAPwQMuHgHMdljDg=
+cloud.google.com/go/billing v1.17.3/go.mod h1:z83AkoZ7mZwBGT3yTnt6rSGI1OOsHSIi6a5M3mJ8NaU=
+cloud.google.com/go/billing v1.17.4/go.mod h1:5DOYQStCxquGprqfuid/7haD7th74kyMBHkjO/OvDtk=
 cloud.google.com/go/binaryauthorization v1.1.0/go.mod h1:xwnoWu3Y84jbuHa0zd526MJYmtnVXn0syOjaJgy4+dM=
 cloud.google.com/go/binaryauthorization v1.2.0/go.mod h1:86WKkJHtRcv5ViNABtYMhhNWRrD1Vpi//uKEy7aYEfI=
 cloud.google.com/go/binaryauthorization v1.3.0/go.mod h1:lRZbKgjDIIQvzYQS1p99A7/U1JqvqeZg0wiI5tp6tg0=
 cloud.google.com/go/binaryauthorization v1.4.0/go.mod h1:tsSPQrBd77VLplV70GUhBf/Zm3FsKmgSqgm4UmiDItk=
 cloud.google.com/go/binaryauthorization v1.5.0/go.mod h1:OSe4OU1nN/VswXKRBmciKpo9LulY41gch5c68htf3/Q=
+cloud.google.com/go/binaryauthorization v1.6.1/go.mod h1:TKt4pa8xhowwffiBmbrbcxijJRZED4zrqnwZ1lKH51U=
+cloud.google.com/go/binaryauthorization v1.7.0/go.mod h1:Zn+S6QqTMn6odcMU1zDZCJxPjU2tZPV1oDl45lWY154=
+cloud.google.com/go/binaryauthorization v1.7.1/go.mod h1:GTAyfRWYgcbsP3NJogpV3yeunbUIjx2T9xVeYovtURE=
+cloud.google.com/go/binaryauthorization v1.7.2/go.mod h1:kFK5fQtxEp97m92ziy+hbu+uKocka1qRRL8MVJIgjv0=
+cloud.google.com/go/binaryauthorization v1.7.3/go.mod h1:VQ/nUGRKhrStlGr+8GMS8f6/vznYLkdK5vaKfdCIpvU=
 cloud.google.com/go/certificatemanager v1.3.0/go.mod h1:n6twGDvcUBFu9uBgt4eYvvf3sQ6My8jADcOVwHmzadg=
 cloud.google.com/go/certificatemanager v1.4.0/go.mod h1:vowpercVFyqs8ABSmrdV+GiFf2H/ch3KyudYQEMM590=
 cloud.google.com/go/certificatemanager v1.6.0/go.mod h1:3Hh64rCKjRAX8dXgRAyOcY5vQ/fE1sh8o+Mdd6KPgY8=
+cloud.google.com/go/certificatemanager v1.7.1/go.mod h1:iW8J3nG6SaRYImIa+wXQ0g8IgoofDFRp5UMzaNk1UqI=
+cloud.google.com/go/certificatemanager v1.7.2/go.mod h1:15SYTDQMd00kdoW0+XY5d9e+JbOPjp24AvF48D8BbcQ=
+cloud.google.com/go/certificatemanager v1.7.3/go.mod h1:T/sZYuC30PTag0TLo28VedIRIj1KPGcOQzjWAptHa00=
+cloud.google.com/go/certificatemanager v1.7.4/go.mod h1:FHAylPe/6IIKuaRmHbjbdLhGhVQ+CWHSD5Jq0k4+cCE=
 cloud.google.com/go/channel v1.8.0/go.mod h1:W5SwCXDJsq/rg3tn3oG0LOxpAo6IMxNa09ngphpSlnk=
 cloud.google.com/go/channel v1.9.0/go.mod h1:jcu05W0my9Vx4mt3/rEHpfxc9eKi9XwsdDL8yBMbKUk=
 cloud.google.com/go/channel v1.11.0/go.mod h1:IdtI0uWGqhEeatSB62VOoJ8FSUhJ9/+iGkJVqp74CGE=
+cloud.google.com/go/channel v1.12.0/go.mod h1:VkxCGKASi4Cq7TbXxlaBezonAYpp1GCnKMY6tnMQnLU=
+cloud.google.com/go/channel v1.16.0/go.mod h1:eN/q1PFSl5gyu0dYdmxNXscY/4Fi7ABmeHCJNf/oHmc=
+cloud.google.com/go/channel v1.17.0/go.mod h1:RpbhJsGi/lXWAUM1eF4IbQGbsfVlg2o8Iiy2/YLfVT0=
+cloud.google.com/go/channel v1.17.1/go.mod h1:xqfzcOZAcP4b/hUDH0GkGg1Sd5to6di1HOJn/pi5uBQ=
+cloud.google.com/go/channel v1.17.2/go.mod h1:aT2LhnftnyfQceFql5I/mP8mIbiiJS4lWqgXA815zMk=
+cloud.google.com/go/channel v1.17.3/go.mod h1:QcEBuZLGGrUMm7kNj9IbU1ZfmJq2apotsV83hbxX7eE=
 cloud.google.com/go/cloudbuild v1.3.0/go.mod h1:WequR4ULxlqvMsjDEEEFnOG5ZSRSgWOywXYDb1vPE6U=
 cloud.google.com/go/cloudbuild v1.4.0/go.mod h1:5Qwa40LHiOXmz3386FrjrYM93rM/hdRr7b53sySrTqA=
+cloud.google.com/go/cloudbuild v1.6.0/go.mod h1:UIbc/w9QCbH12xX+ezUsgblrWv+Cv4Tw83GiSMHOn9M=
 cloud.google.com/go/cloudbuild v1.7.0/go.mod h1:zb5tWh2XI6lR9zQmsm1VRA+7OCuve5d8S+zJUul8KTg=
+cloud.google.com/go/cloudbuild v1.9.0/go.mod h1:qK1d7s4QlO0VwfYn5YuClDGg2hfmLZEb4wQGAbIgL1s=
+cloud.google.com/go/cloudbuild v1.10.1/go.mod h1:lyJg7v97SUIPq4RC2sGsz/9tNczhyv2AjML/ci4ulzU=
+cloud.google.com/go/cloudbuild v1.13.0/go.mod h1:lyJg7v97SUIPq4RC2sGsz/9tNczhyv2AjML/ci4ulzU=
+cloud.google.com/go/cloudbuild v1.14.0/go.mod h1:lyJg7v97SUIPq4RC2sGsz/9tNczhyv2AjML/ci4ulzU=
+cloud.google.com/go/cloudbuild v1.14.1/go.mod h1:K7wGc/3zfvmYWOWwYTgF/d/UVJhS4pu+HAy7PL7mCsU=
+cloud.google.com/go/cloudbuild v1.14.2/go.mod h1:Bn6RO0mBYk8Vlrt+8NLrru7WXlQ9/RDWz2uo5KG1/sg=
+cloud.google.com/go/cloudbuild v1.14.3/go.mod h1:eIXYWmRt3UtggLnFGx4JvXcMj4kShhVzGndL1LwleEM=
+cloud.google.com/go/cloudbuild v1.15.0/go.mod h1:eIXYWmRt3UtggLnFGx4JvXcMj4kShhVzGndL1LwleEM=
 cloud.google.com/go/clouddms v1.3.0/go.mod h1:oK6XsCDdW4Ib3jCCBugx+gVjevp2TMXFtgxvPSee3OM=
 cloud.google.com/go/clouddms v1.4.0/go.mod h1:Eh7sUGCC+aKry14O1NRljhjyrr0NFC0G2cjwX0cByRk=
 cloud.google.com/go/clouddms v1.5.0/go.mod h1:QSxQnhikCLUw13iAbffF2CZxAER3xDGNHjsTAkQJcQA=
+cloud.google.com/go/clouddms v1.6.1/go.mod h1:Ygo1vL52Ov4TBZQquhz5fiw2CQ58gvu+PlS6PVXCpZI=
+cloud.google.com/go/clouddms v1.7.0/go.mod h1:MW1dC6SOtI/tPNCciTsXtsGNEM0i0OccykPvv3hiYeM=
+cloud.google.com/go/clouddms v1.7.1/go.mod h1:o4SR8U95+P7gZ/TX+YbJxehOCsM+fe6/brlrFquiszk=
+cloud.google.com/go/clouddms v1.7.2/go.mod h1:Rk32TmWmHo64XqDvW7jgkFQet1tUKNVzs7oajtJT3jU=
+cloud.google.com/go/clouddms v1.7.3/go.mod h1:fkN2HQQNUYInAU3NQ3vRLkV2iWs8lIdmBKOx4nrL6Hc=
 cloud.google.com/go/cloudtasks v1.5.0/go.mod h1:fD92REy1x5woxkKEkLdvavGnPJGEn8Uic9nWuLzqCpY=
 cloud.google.com/go/cloudtasks v1.6.0/go.mod h1:C6Io+sxuke9/KNRkbQpihnW93SWDU3uXt92nu85HkYI=
 cloud.google.com/go/cloudtasks v1.7.0/go.mod h1:ImsfdYWwlWNJbdgPIIGJWC+gemEGTBK/SunNQQNCAb4=
 cloud.google.com/go/cloudtasks v1.8.0/go.mod h1:gQXUIwCSOI4yPVK7DgTVFiiP0ZW/eQkydWzwVMdHxrI=
 cloud.google.com/go/cloudtasks v1.9.0/go.mod h1:w+EyLsVkLWHcOaqNEyvcKAsWp9p29dL6uL9Nst1cI7Y=
+cloud.google.com/go/cloudtasks v1.10.0/go.mod h1:NDSoTLkZ3+vExFEWu2UJV1arUyzVDAiZtdWcsUyNwBs=
+cloud.google.com/go/cloudtasks v1.11.1/go.mod h1:a9udmnou9KO2iulGscKR0qBYjreuX8oHwpmFsKspEvM=
+cloud.google.com/go/cloudtasks v1.12.1/go.mod h1:a9udmnou9KO2iulGscKR0qBYjreuX8oHwpmFsKspEvM=
+cloud.google.com/go/cloudtasks v1.12.2/go.mod h1:A7nYkjNlW2gUoROg1kvJrQGhJP/38UaWwsnuBDOBVUk=
+cloud.google.com/go/cloudtasks v1.12.3/go.mod h1:GPVXhIOSGEaR+3xT4Fp72ScI+HjHffSS4B8+BaBB5Ys=
+cloud.google.com/go/cloudtasks v1.12.4/go.mod h1:BEPu0Gtt2dU6FxZHNqqNdGqIG86qyWKBPGnsb7udGY0=
 cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow=
 cloud.google.com/go/compute v1.2.0/go.mod h1:xlogom/6gr8RJGBe7nT2eGsQYAFUbbv8dbC29qE3Xmw=
 cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM=
@@ -158,8 +305,16 @@ cloud.google.com/go/compute v1.13.0/go.mod h1:5aPTS0cUNMIc1CE546K+Th6weJUNQErARy
 cloud.google.com/go/compute v1.14.0/go.mod h1:YfLtxrj9sU4Yxv+sXzZkyPjEyPBZfXHUvjxega5vAdo=
 cloud.google.com/go/compute v1.15.1/go.mod h1:bjjoF/NtFUrkD/urWfdHaKuOPDR5nWIs63rR+SXhcpA=
 cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs=
-cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY=
+cloud.google.com/go/compute v1.19.0/go.mod h1:rikpw2y+UMidAe9tISo04EHNOIf42RLYF/q8Bs93scU=
+cloud.google.com/go/compute v1.19.1/go.mod h1:6ylj3a05WF8leseCdIf77NK0g1ey+nj5IKd5/kvShxE=
+cloud.google.com/go/compute v1.19.3/go.mod h1:qxvISKp/gYnXkSAD1ppcSOveRAmzxicEv/JlizULFrI=
+cloud.google.com/go/compute v1.20.1/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM=
+cloud.google.com/go/compute v1.21.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM=
 cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM=
+cloud.google.com/go/compute v1.23.1/go.mod h1:CqB3xpmPKKt3OJpW2ndFIXnA9A4xAy/F3Xp1ixncW78=
+cloud.google.com/go/compute v1.23.2/go.mod h1:JJ0atRC0J/oWYiiVBmsSsrRnh92DhZPG4hFDcR04Rns=
+cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk=
+cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI=
 cloud.google.com/go/compute/metadata v0.1.0/go.mod h1:Z1VN+bulIf6bt4P/C37K4DyZYZEXYonfTBHHFPO/4UU=
 cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
 cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM=
@@ -168,12 +323,34 @@ cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2Aawl
 cloud.google.com/go/contactcenterinsights v1.3.0/go.mod h1:Eu2oemoePuEFc/xKFPjbTuPSj0fYJcPls9TFlPNnHHY=
 cloud.google.com/go/contactcenterinsights v1.4.0/go.mod h1:L2YzkGbPsv+vMQMCADxJoT9YiTTnSEd6fEvCeHTYVck=
 cloud.google.com/go/contactcenterinsights v1.6.0/go.mod h1:IIDlT6CLcDoyv79kDv8iWxMSTZhLxSCofVV5W6YFM/w=
+cloud.google.com/go/contactcenterinsights v1.9.1/go.mod h1:bsg/R7zGLYMVxFFzfh9ooLTruLRCG9fnzhH9KznHhbM=
+cloud.google.com/go/contactcenterinsights v1.10.0/go.mod h1:bsg/R7zGLYMVxFFzfh9ooLTruLRCG9fnzhH9KznHhbM=
+cloud.google.com/go/contactcenterinsights v1.11.0/go.mod h1:hutBdImE4XNZ1NV4vbPJKSFOnQruhC5Lj9bZqWMTKiU=
+cloud.google.com/go/contactcenterinsights v1.11.1/go.mod h1:FeNP3Kg8iteKM80lMwSk3zZZKVxr+PGnAId6soKuXwE=
+cloud.google.com/go/contactcenterinsights v1.11.2/go.mod h1:A9PIR5ov5cRcd28KlDbmmXE8Aay+Gccer2h4wzkYFso=
+cloud.google.com/go/contactcenterinsights v1.11.3/go.mod h1:HHX5wrz5LHVAwfI2smIotQG9x8Qd6gYilaHcLLLmNis=
+cloud.google.com/go/contactcenterinsights v1.12.0/go.mod h1:HHX5wrz5LHVAwfI2smIotQG9x8Qd6gYilaHcLLLmNis=
 cloud.google.com/go/container v1.6.0/go.mod h1:Xazp7GjJSeUYo688S+6J5V+n/t+G5sKBTFkKNudGRxg=
 cloud.google.com/go/container v1.7.0/go.mod h1:Dp5AHtmothHGX3DwwIHPgq45Y8KmNsgN3amoYfxVkLo=
 cloud.google.com/go/container v1.13.1/go.mod h1:6wgbMPeQRw9rSnKBCAJXnds3Pzj03C4JHamr8asWKy4=
+cloud.google.com/go/container v1.14.0/go.mod h1:3AoJMPhHfLDxLvrlVWaK57IXzaPnLaZq63WX59aQBfM=
+cloud.google.com/go/container v1.15.0/go.mod h1:ft+9S0WGjAyjDggg5S06DXj+fHJICWg8L7isCQe9pQA=
+cloud.google.com/go/container v1.22.1/go.mod h1:lTNExE2R7f+DLbAN+rJiKTisauFCaoDq6NURZ83eVH4=
+cloud.google.com/go/container v1.24.0/go.mod h1:lTNExE2R7f+DLbAN+rJiKTisauFCaoDq6NURZ83eVH4=
+cloud.google.com/go/container v1.26.0/go.mod h1:YJCmRet6+6jnYYRS000T6k0D0xUXQgBSaJ7VwI8FBj4=
+cloud.google.com/go/container v1.26.1/go.mod h1:5smONjPRUxeEpDG7bMKWfDL4sauswqEtnBK1/KKpR04=
+cloud.google.com/go/container v1.26.2/go.mod h1:YlO84xCt5xupVbLaMY4s3XNE79MUJ+49VmkInr6HvF4=
+cloud.google.com/go/container v1.27.1/go.mod h1:b1A1gJeTBXVLQ6GGw9/9M4FG94BEGsqJ5+t4d/3N7O4=
+cloud.google.com/go/container v1.28.0/go.mod h1:b1A1gJeTBXVLQ6GGw9/9M4FG94BEGsqJ5+t4d/3N7O4=
 cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I=
 cloud.google.com/go/containeranalysis v0.6.0/go.mod h1:HEJoiEIu+lEXM+k7+qLCci0h33lX3ZqoYFdmPcoO7s4=
 cloud.google.com/go/containeranalysis v0.7.0/go.mod h1:9aUL+/vZ55P2CXfuZjS4UjQ9AgXoSw8Ts6lemfmxBxI=
+cloud.google.com/go/containeranalysis v0.9.0/go.mod h1:orbOANbwk5Ejoom+s+DUCTTJ7IBdBQJDcSylAx/on9s=
+cloud.google.com/go/containeranalysis v0.10.1/go.mod h1:Ya2jiILITMY68ZLPaogjmOMNkwsDrWBSTyBubGXO7j0=
+cloud.google.com/go/containeranalysis v0.11.0/go.mod h1:4n2e99ZwpGxpNcz+YsFT1dfOHPQFGcAC8FN2M2/ne/U=
+cloud.google.com/go/containeranalysis v0.11.1/go.mod h1:rYlUOM7nem1OJMKwE1SadufX0JP3wnXj844EtZAwWLY=
+cloud.google.com/go/containeranalysis v0.11.2/go.mod h1:xibioGBC1MD2j4reTyV1xY1/MvKaz+fyM9ENWhmIeP8=
+cloud.google.com/go/containeranalysis v0.11.3/go.mod h1:kMeST7yWFQMGjiG9K7Eov+fPNQcGhb8mXj/UcTiWw9U=
 cloud.google.com/go/datacatalog v1.3.0/go.mod h1:g9svFY6tuR+j+hrTw3J2dNcmI0dzmSiyOzm8kpLq0a0=
 cloud.google.com/go/datacatalog v1.5.0/go.mod h1:M7GPLNQeLfWqeIm3iuiruhPzkt65+Bx8dAKvScX8jvs=
 cloud.google.com/go/datacatalog v1.6.0/go.mod h1:+aEyF8JKg+uXcIdAmmaMUmZ3q1b/lKLtXCmXdnc0lbc=
@@ -181,39 +358,103 @@ cloud.google.com/go/datacatalog v1.7.0/go.mod h1:9mEl4AuDYWw81UGc41HonIHH7/sn52H
 cloud.google.com/go/datacatalog v1.8.0/go.mod h1:KYuoVOv9BM8EYz/4eMFxrr4DUKhGIOXxZoKYF5wdISM=
 cloud.google.com/go/datacatalog v1.8.1/go.mod h1:RJ58z4rMp3gvETA465Vg+ag8BGgBdnRPEMMSTr5Uv+M=
 cloud.google.com/go/datacatalog v1.12.0/go.mod h1:CWae8rFkfp6LzLumKOnmVh4+Zle4A3NXLzVJ1d1mRm0=
+cloud.google.com/go/datacatalog v1.13.0/go.mod h1:E4Rj9a5ZtAxcQJlEBTLgMTphfP11/lNaAshpoBgemX8=
+cloud.google.com/go/datacatalog v1.14.0/go.mod h1:h0PrGtlihoutNMp/uvwhawLQ9+c63Kz65UFqh49Yo+E=
+cloud.google.com/go/datacatalog v1.14.1/go.mod h1:d2CevwTG4yedZilwe+v3E3ZBDRMobQfSG/a6cCCN5R4=
+cloud.google.com/go/datacatalog v1.16.0/go.mod h1:d2CevwTG4yedZilwe+v3E3ZBDRMobQfSG/a6cCCN5R4=
+cloud.google.com/go/datacatalog v1.17.1/go.mod h1:nCSYFHgtxh2MiEktWIz71s/X+7ds/UT9kp0PC7waCzE=
+cloud.google.com/go/datacatalog v1.18.0/go.mod h1:nCSYFHgtxh2MiEktWIz71s/X+7ds/UT9kp0PC7waCzE=
+cloud.google.com/go/datacatalog v1.18.1/go.mod h1:TzAWaz+ON1tkNr4MOcak8EBHX7wIRX/gZKM+yTVsv+A=
+cloud.google.com/go/datacatalog v1.18.2/go.mod h1:SPVgWW2WEMuWHA+fHodYjmxPiMqcOiWfhc9OD5msigk=
+cloud.google.com/go/datacatalog v1.18.3/go.mod h1:5FR6ZIF8RZrtml0VUao22FxhdjkoG+a0866rEnObryM=
+cloud.google.com/go/datacatalog v1.19.0/go.mod h1:5FR6ZIF8RZrtml0VUao22FxhdjkoG+a0866rEnObryM=
 cloud.google.com/go/dataflow v0.6.0/go.mod h1:9QwV89cGoxjjSR9/r7eFDqqjtvbKxAK2BaYU6PVk9UM=
 cloud.google.com/go/dataflow v0.7.0/go.mod h1:PX526vb4ijFMesO1o202EaUmouZKBpjHsTlCtB4parQ=
 cloud.google.com/go/dataflow v0.8.0/go.mod h1:Rcf5YgTKPtQyYz8bLYhFoIV/vP39eL7fWNcSOyFfLJE=
+cloud.google.com/go/dataflow v0.9.1/go.mod h1:Wp7s32QjYuQDWqJPFFlnBKhkAtiFpMTdg00qGbnIHVw=
+cloud.google.com/go/dataflow v0.9.2/go.mod h1:vBfdBZ/ejlTaYIGB3zB4T08UshH70vbtZeMD+urnUSo=
+cloud.google.com/go/dataflow v0.9.3/go.mod h1:HI4kMVjcHGTs3jTHW/kv3501YW+eloiJSLxkJa/vqFE=
+cloud.google.com/go/dataflow v0.9.4/go.mod h1:4G8vAkHYCSzU8b/kmsoR2lWyHJD85oMJPHMtan40K8w=
 cloud.google.com/go/dataform v0.3.0/go.mod h1:cj8uNliRlHpa6L3yVhDOBrUXH+BPAO1+KFMQQNSThKo=
 cloud.google.com/go/dataform v0.4.0/go.mod h1:fwV6Y4Ty2yIFL89huYlEkwUPtS7YZinZbzzj5S9FzCE=
 cloud.google.com/go/dataform v0.5.0/go.mod h1:GFUYRe8IBa2hcomWplodVmUx/iTL0FrsauObOM3Ipr0=
 cloud.google.com/go/dataform v0.6.0/go.mod h1:QPflImQy33e29VuapFdf19oPbE4aYTJxr31OAPV+ulA=
+cloud.google.com/go/dataform v0.7.0/go.mod h1:7NulqnVozfHvWUBpMDfKMUESr+85aJsC/2O0o3jWPDE=
+cloud.google.com/go/dataform v0.8.1/go.mod h1:3BhPSiw8xmppbgzeBbmDvmSWlwouuJkXsXsb8UBih9M=
+cloud.google.com/go/dataform v0.8.2/go.mod h1:X9RIqDs6NbGPLR80tnYoPNiO1w0wenKTb8PxxlhTMKM=
+cloud.google.com/go/dataform v0.8.3/go.mod h1:8nI/tvv5Fso0drO3pEjtowz58lodx8MVkdV2q0aPlqg=
+cloud.google.com/go/dataform v0.9.1/go.mod h1:pWTg+zGQ7i16pyn0bS1ruqIE91SdL2FDMvEYu/8oQxs=
 cloud.google.com/go/datafusion v1.4.0/go.mod h1:1Zb6VN+W6ALo85cXnM1IKiPw+yQMKMhB9TsTSRDo/38=
 cloud.google.com/go/datafusion v1.5.0/go.mod h1:Kz+l1FGHB0J+4XF2fud96WMmRiq/wj8N9u007vyXZ2w=
 cloud.google.com/go/datafusion v1.6.0/go.mod h1:WBsMF8F1RhSXvVM8rCV3AeyWVxcC2xY6vith3iw3S+8=
+cloud.google.com/go/datafusion v1.7.1/go.mod h1:KpoTBbFmoToDExJUso/fcCiguGDk7MEzOWXUsJo0wsI=
+cloud.google.com/go/datafusion v1.7.2/go.mod h1:62K2NEC6DRlpNmI43WHMWf9Vg/YvN6QVi8EVwifElI0=
+cloud.google.com/go/datafusion v1.7.3/go.mod h1:eoLt1uFXKGBq48jy9LZ+Is8EAVLnmn50lNncLzwYokE=
+cloud.google.com/go/datafusion v1.7.4/go.mod h1:BBs78WTOLYkT4GVZIXQCZT3GFpkpDN4aBY4NDX/jVlM=
 cloud.google.com/go/datalabeling v0.5.0/go.mod h1:TGcJ0G2NzcsXSE/97yWjIZO0bXj0KbVlINXMG9ud42I=
 cloud.google.com/go/datalabeling v0.6.0/go.mod h1:WqdISuk/+WIGeMkpw/1q7bK/tFEZxsrFJOJdY2bXvTQ=
 cloud.google.com/go/datalabeling v0.7.0/go.mod h1:WPQb1y08RJbmpM3ww0CSUAGweL0SxByuW2E+FU+wXcM=
+cloud.google.com/go/datalabeling v0.8.1/go.mod h1:XS62LBSVPbYR54GfYQsPXZjTW8UxCK2fkDciSrpRFdY=
+cloud.google.com/go/datalabeling v0.8.2/go.mod h1:cyDvGHuJWu9U/cLDA7d8sb9a0tWLEletStu2sTmg3BE=
+cloud.google.com/go/datalabeling v0.8.3/go.mod h1:tvPhpGyS/V7lqjmb3V0TaDdGvhzgR1JoW7G2bpi2UTI=
+cloud.google.com/go/datalabeling v0.8.4/go.mod h1:Z1z3E6LHtffBGrNUkKwbwbDxTiXEApLzIgmymj8A3S8=
 cloud.google.com/go/dataplex v1.3.0/go.mod h1:hQuRtDg+fCiFgC8j0zV222HvzFQdRd+SVX8gdmFcZzA=
 cloud.google.com/go/dataplex v1.4.0/go.mod h1:X51GfLXEMVJ6UN47ESVqvlsRplbLhcsAt0kZCCKsU0A=
 cloud.google.com/go/dataplex v1.5.2/go.mod h1:cVMgQHsmfRoI5KFYq4JtIBEUbYwc3c7tXmIDhRmNNVQ=
+cloud.google.com/go/dataplex v1.6.0/go.mod h1:bMsomC/aEJOSpHXdFKFGQ1b0TDPIeL28nJObeO1ppRs=
+cloud.google.com/go/dataplex v1.8.1/go.mod h1:7TyrDT6BCdI8/38Uvp0/ZxBslOslP2X2MPDucliyvSE=
+cloud.google.com/go/dataplex v1.9.0/go.mod h1:7TyrDT6BCdI8/38Uvp0/ZxBslOslP2X2MPDucliyvSE=
+cloud.google.com/go/dataplex v1.9.1/go.mod h1:7TyrDT6BCdI8/38Uvp0/ZxBslOslP2X2MPDucliyvSE=
+cloud.google.com/go/dataplex v1.10.1/go.mod h1:1MzmBv8FvjYfc7vDdxhnLFNskikkB+3vl475/XdCDhs=
+cloud.google.com/go/dataplex v1.10.2/go.mod h1:xdC8URdTrCrZMW6keY779ZT1cTOfV8KEPNsw+LTRT1Y=
+cloud.google.com/go/dataplex v1.11.1/go.mod h1:mHJYQQ2VEJHsyoC0OdNyy988DvEbPhqFs5OOLffLX0c=
+cloud.google.com/go/dataplex v1.11.2/go.mod h1:mHJYQQ2VEJHsyoC0OdNyy988DvEbPhqFs5OOLffLX0c=
 cloud.google.com/go/dataproc v1.7.0/go.mod h1:CKAlMjII9H90RXaMpSxQ8EU6dQx6iAYNPcYPOkSbi8s=
 cloud.google.com/go/dataproc v1.8.0/go.mod h1:5OW+zNAH0pMpw14JVrPONsxMQYMBqJuzORhIBfBn9uI=
 cloud.google.com/go/dataproc v1.12.0/go.mod h1:zrF3aX0uV3ikkMz6z4uBbIKyhRITnxvr4i3IjKsKrw4=
+cloud.google.com/go/dataproc/v2 v2.0.1/go.mod h1:7Ez3KRHdFGcfY7GcevBbvozX+zyWGcwLJvvAMwCaoZ4=
+cloud.google.com/go/dataproc/v2 v2.2.0/go.mod h1:lZR7AQtwZPvmINx5J87DSOOpTfof9LVZju6/Qo4lmcY=
+cloud.google.com/go/dataproc/v2 v2.2.1/go.mod h1:QdAJLaBjh+l4PVlVZcmrmhGccosY/omC1qwfQ61Zv/o=
+cloud.google.com/go/dataproc/v2 v2.2.2/go.mod h1:aocQywVmQVF4i8CL740rNI/ZRpsaaC1Wh2++BJ7HEJ4=
+cloud.google.com/go/dataproc/v2 v2.2.3/go.mod h1:G5R6GBc9r36SXv/RtZIVfB8SipI+xVn0bX5SxUzVYbY=
+cloud.google.com/go/dataproc/v2 v2.3.0/go.mod h1:G5R6GBc9r36SXv/RtZIVfB8SipI+xVn0bX5SxUzVYbY=
 cloud.google.com/go/dataqna v0.5.0/go.mod h1:90Hyk596ft3zUQ8NkFfvICSIfHFh1Bc7C4cK3vbhkeo=
 cloud.google.com/go/dataqna v0.6.0/go.mod h1:1lqNpM7rqNLVgWBJyk5NF6Uen2PHym0jtVJonplVsDA=
 cloud.google.com/go/dataqna v0.7.0/go.mod h1:Lx9OcIIeqCrw1a6KdO3/5KMP1wAmTc0slZWwP12Qq3c=
+cloud.google.com/go/dataqna v0.8.1/go.mod h1:zxZM0Bl6liMePWsHA8RMGAfmTG34vJMapbHAxQ5+WA8=
+cloud.google.com/go/dataqna v0.8.2/go.mod h1:KNEqgx8TTmUipnQsScOoDpq/VlXVptUqVMZnt30WAPs=
+cloud.google.com/go/dataqna v0.8.3/go.mod h1:wXNBW2uvc9e7Gl5k8adyAMnLush1KVV6lZUhB+rqNu4=
+cloud.google.com/go/dataqna v0.8.4/go.mod h1:mySRKjKg5Lz784P6sCov3p1QD+RZQONRMRjzGNcFd0c=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
 cloud.google.com/go/datastore v1.10.0/go.mod h1:PC5UzAmDEkAmkfaknstTYbNpgE49HAgW2J1gcgUfmdM=
+cloud.google.com/go/datastore v1.11.0/go.mod h1:TvGxBIHCS50u8jzG+AW/ppf87v1of8nwzFNgEZU1D3c=
+cloud.google.com/go/datastore v1.12.0/go.mod h1:KjdB88W897MRITkvWWJrg2OUtrR5XVj1EoLgSp6/N70=
+cloud.google.com/go/datastore v1.12.1/go.mod h1:KjdB88W897MRITkvWWJrg2OUtrR5XVj1EoLgSp6/N70=
+cloud.google.com/go/datastore v1.13.0/go.mod h1:KjdB88W897MRITkvWWJrg2OUtrR5XVj1EoLgSp6/N70=
+cloud.google.com/go/datastore v1.14.0/go.mod h1:GAeStMBIt9bPS7jMJA85kgkpsMkvseWWXiaHya9Jes8=
+cloud.google.com/go/datastore v1.15.0/go.mod h1:GAeStMBIt9bPS7jMJA85kgkpsMkvseWWXiaHya9Jes8=
 cloud.google.com/go/datastream v1.2.0/go.mod h1:i/uTP8/fZwgATHS/XFu0TcNUhuA0twZxxQ3EyCUQMwo=
 cloud.google.com/go/datastream v1.3.0/go.mod h1:cqlOX8xlyYF/uxhiKn6Hbv6WjwPPuI9W2M9SAXwaLLQ=
 cloud.google.com/go/datastream v1.4.0/go.mod h1:h9dpzScPhDTs5noEMQVWP8Wx8AFBRyS0s8KWPx/9r0g=
 cloud.google.com/go/datastream v1.5.0/go.mod h1:6TZMMNPwjUqZHBKPQ1wwXpb0d5VDVPl2/XoS5yi88q4=
 cloud.google.com/go/datastream v1.6.0/go.mod h1:6LQSuswqLa7S4rPAOZFVjHIG3wJIjZcZrw8JDEDJuIs=
+cloud.google.com/go/datastream v1.7.0/go.mod h1:uxVRMm2elUSPuh65IbZpzJNMbuzkcvu5CjMqVIUHrww=
+cloud.google.com/go/datastream v1.9.1/go.mod h1:hqnmr8kdUBmrnk65k5wNRoHSCYksvpdZIcZIEl8h43Q=
+cloud.google.com/go/datastream v1.10.0/go.mod h1:hqnmr8kdUBmrnk65k5wNRoHSCYksvpdZIcZIEl8h43Q=
+cloud.google.com/go/datastream v1.10.1/go.mod h1:7ngSYwnw95YFyTd5tOGBxHlOZiL+OtpjheqU7t2/s/c=
+cloud.google.com/go/datastream v1.10.2/go.mod h1:W42TFgKAs/om6x/CdXX5E4oiAsKlH+e8MTGy81zdYt0=
+cloud.google.com/go/datastream v1.10.3/go.mod h1:YR0USzgjhqA/Id0Ycu1VvZe8hEWwrkjuXrGbzeDOSEA=
 cloud.google.com/go/deploy v1.4.0/go.mod h1:5Xghikd4VrmMLNaF6FiRFDlHb59VM59YoDQnOUdsH/c=
 cloud.google.com/go/deploy v1.5.0/go.mod h1:ffgdD0B89tToyW/U/D2eL0jN2+IEV/3EMuXHA0l4r+s=
 cloud.google.com/go/deploy v1.6.0/go.mod h1:f9PTHehG/DjCom3QH0cntOVRm93uGBDt2vKzAPwpXQI=
+cloud.google.com/go/deploy v1.8.0/go.mod h1:z3myEJnA/2wnB4sgjqdMfgxCA0EqC3RBTNcVPs93mtQ=
+cloud.google.com/go/deploy v1.11.0/go.mod h1:tKuSUV5pXbn67KiubiUNUejqLs4f5cxxiCNCeyl0F2g=
+cloud.google.com/go/deploy v1.13.0/go.mod h1:tKuSUV5pXbn67KiubiUNUejqLs4f5cxxiCNCeyl0F2g=
+cloud.google.com/go/deploy v1.13.1/go.mod h1:8jeadyLkH9qu9xgO3hVWw8jVr29N1mnW42gRJT8GY6g=
+cloud.google.com/go/deploy v1.14.1/go.mod h1:N8S0b+aIHSEeSr5ORVoC0+/mOPUysVt8ae4QkZYolAw=
+cloud.google.com/go/deploy v1.14.2/go.mod h1:e5XOUI5D+YGldyLNZ21wbp9S8otJbBE4i88PtO9x/2g=
+cloud.google.com/go/deploy v1.15.0/go.mod h1:e5XOUI5D+YGldyLNZ21wbp9S8otJbBE4i88PtO9x/2g=
 cloud.google.com/go/dialogflow v1.15.0/go.mod h1:HbHDWs33WOGJgn6rfzBW1Kv807BE3O1+xGbn59zZWI4=
 cloud.google.com/go/dialogflow v1.16.1/go.mod h1:po6LlzGfK+smoSmTBnbkIZY2w8ffjz/RcGSS+sh1el0=
 cloud.google.com/go/dialogflow v1.17.0/go.mod h1:YNP09C/kXA1aZdBgC/VtXX74G/TKn7XVCcVumTflA+8=
@@ -221,58 +462,138 @@ cloud.google.com/go/dialogflow v1.18.0/go.mod h1:trO7Zu5YdyEuR+BhSNOqJezyFQ3aUzz
 cloud.google.com/go/dialogflow v1.19.0/go.mod h1:JVmlG1TwykZDtxtTXujec4tQ+D8SBFMoosgy+6Gn0s0=
 cloud.google.com/go/dialogflow v1.29.0/go.mod h1:b+2bzMe+k1s9V+F2jbJwpHPzrnIyHihAdRFMtn2WXuM=
 cloud.google.com/go/dialogflow v1.31.0/go.mod h1:cuoUccuL1Z+HADhyIA7dci3N5zUssgpBJmCzI6fNRB4=
+cloud.google.com/go/dialogflow v1.32.0/go.mod h1:jG9TRJl8CKrDhMEcvfcfFkkpp8ZhgPz3sBGmAUYJ2qE=
+cloud.google.com/go/dialogflow v1.38.0/go.mod h1:L7jnH+JL2mtmdChzAIcXQHXMvQkE3U4hTaNltEuxXn4=
+cloud.google.com/go/dialogflow v1.40.0/go.mod h1:L7jnH+JL2mtmdChzAIcXQHXMvQkE3U4hTaNltEuxXn4=
+cloud.google.com/go/dialogflow v1.43.0/go.mod h1:pDUJdi4elL0MFmt1REMvFkdsUTYSHq+rTCS8wg0S3+M=
+cloud.google.com/go/dialogflow v1.44.0/go.mod h1:pDUJdi4elL0MFmt1REMvFkdsUTYSHq+rTCS8wg0S3+M=
+cloud.google.com/go/dialogflow v1.44.1/go.mod h1:n/h+/N2ouKOO+rbe/ZnI186xImpqvCVj2DdsWS/0EAk=
+cloud.google.com/go/dialogflow v1.44.2/go.mod h1:QzFYndeJhpVPElnFkUXxdlptx0wPnBWLCBT9BvtC3/c=
+cloud.google.com/go/dialogflow v1.44.3/go.mod h1:mHly4vU7cPXVweuB5R0zsYKPMzy240aQdAu06SqBbAQ=
 cloud.google.com/go/dlp v1.6.0/go.mod h1:9eyB2xIhpU0sVwUixfBubDoRwP+GjeUoxxeueZmqvmM=
 cloud.google.com/go/dlp v1.7.0/go.mod h1:68ak9vCiMBjbasxeVD17hVPxDEck+ExiHavX8kiHG+Q=
 cloud.google.com/go/dlp v1.9.0/go.mod h1:qdgmqgTyReTz5/YNSSuueR8pl7hO0o9bQ39ZhtgkWp4=
+cloud.google.com/go/dlp v1.10.1/go.mod h1:IM8BWz1iJd8njcNcG0+Kyd9OPnqnRNkDV8j42VT5KOI=
+cloud.google.com/go/dlp v1.10.2/go.mod h1:ZbdKIhcnyhILgccwVDzkwqybthh7+MplGC3kZVZsIOQ=
+cloud.google.com/go/dlp v1.10.3/go.mod h1:iUaTc/ln8I+QT6Ai5vmuwfw8fqTk2kaz0FvCwhLCom0=
+cloud.google.com/go/dlp v1.11.1/go.mod h1:/PA2EnioBeXTL/0hInwgj0rfsQb3lpE3R8XUJxqUNKI=
 cloud.google.com/go/documentai v1.7.0/go.mod h1:lJvftZB5NRiFSX4moiye1SMxHx0Bc3x1+p9e/RfXYiU=
 cloud.google.com/go/documentai v1.8.0/go.mod h1:xGHNEB7CtsnySCNrCFdCyyMz44RhFEEX2Q7UD0c5IhU=
 cloud.google.com/go/documentai v1.9.0/go.mod h1:FS5485S8R00U10GhgBC0aNGrJxBP8ZVpEeJ7PQDZd6k=
 cloud.google.com/go/documentai v1.10.0/go.mod h1:vod47hKQIPeCfN2QS/jULIvQTugbmdc0ZvxxfQY1bg4=
 cloud.google.com/go/documentai v1.16.0/go.mod h1:o0o0DLTEZ+YnJZ+J4wNfTxmDVyrkzFvttBXXtYRMHkM=
+cloud.google.com/go/documentai v1.18.0/go.mod h1:F6CK6iUH8J81FehpskRmhLq/3VlwQvb7TvwOceQ2tbs=
+cloud.google.com/go/documentai v1.20.0/go.mod h1:yJkInoMcK0qNAEdRnqY/D5asy73tnPe88I1YTZT+a8E=
+cloud.google.com/go/documentai v1.22.0/go.mod h1:yJkInoMcK0qNAEdRnqY/D5asy73tnPe88I1YTZT+a8E=
+cloud.google.com/go/documentai v1.22.1/go.mod h1:LKs22aDHbJv7ufXuPypzRO7rG3ALLJxzdCXDPutw4Qc=
+cloud.google.com/go/documentai v1.23.0/go.mod h1:LKs22aDHbJv7ufXuPypzRO7rG3ALLJxzdCXDPutw4Qc=
+cloud.google.com/go/documentai v1.23.2/go.mod h1:Q/wcRT+qnuXOpjAkvOV4A+IeQl04q2/ReT7SSbytLSo=
+cloud.google.com/go/documentai v1.23.4/go.mod h1:4MYAaEMnADPN1LPN5xboDR5QVB6AgsaxgFdJhitlE2Y=
+cloud.google.com/go/documentai v1.23.5/go.mod h1:ghzBsyVTiVdkfKaUCum/9bGBEyBjDO4GfooEcYKhN+g=
 cloud.google.com/go/domains v0.6.0/go.mod h1:T9Rz3GasrpYk6mEGHh4rymIhjlnIuB4ofT1wTxDeT4Y=
 cloud.google.com/go/domains v0.7.0/go.mod h1:PtZeqS1xjnXuRPKE/88Iru/LdfoRyEHYA9nFQf4UKpg=
 cloud.google.com/go/domains v0.8.0/go.mod h1:M9i3MMDzGFXsydri9/vW+EWz9sWb4I6WyHqdlAk0idE=
+cloud.google.com/go/domains v0.9.1/go.mod h1:aOp1c0MbejQQ2Pjf1iJvnVyT+z6R6s8pX66KaCSDYfE=
+cloud.google.com/go/domains v0.9.2/go.mod h1:3YvXGYzZG1Temjbk7EyGCuGGiXHJwVNmwIf+E/cUp5I=
+cloud.google.com/go/domains v0.9.3/go.mod h1:29k66YNDLDY9LCFKpGFeh6Nj9r62ZKm5EsUJxAl84KU=
+cloud.google.com/go/domains v0.9.4/go.mod h1:27jmJGShuXYdUNjyDG0SodTfT5RwLi7xmH334Gvi3fY=
 cloud.google.com/go/edgecontainer v0.1.0/go.mod h1:WgkZ9tp10bFxqO8BLPqv2LlfmQF1X8lZqwW4r1BTajk=
 cloud.google.com/go/edgecontainer v0.2.0/go.mod h1:RTmLijy+lGpQ7BXuTDa4C4ssxyXT34NIuHIgKuP4s5w=
 cloud.google.com/go/edgecontainer v0.3.0/go.mod h1:FLDpP4nykgwwIfcLt6zInhprzw0lEi2P1fjO6Ie0qbc=
+cloud.google.com/go/edgecontainer v1.0.0/go.mod h1:cttArqZpBB2q58W/upSG++ooo6EsblxDIolxa3jSjbY=
+cloud.google.com/go/edgecontainer v1.1.1/go.mod h1:O5bYcS//7MELQZs3+7mabRqoWQhXCzenBu0R8bz2rwk=
+cloud.google.com/go/edgecontainer v1.1.2/go.mod h1:wQRjIzqxEs9e9wrtle4hQPSR1Y51kqN75dgF7UllZZ4=
+cloud.google.com/go/edgecontainer v1.1.3/go.mod h1:Ll2DtIABzEfaxaVSbwj3QHFaOOovlDFiWVDu349jSsA=
+cloud.google.com/go/edgecontainer v1.1.4/go.mod h1:AvFdVuZuVGdgaE5YvlL1faAoa1ndRR/5XhXZvPBHbsE=
 cloud.google.com/go/errorreporting v0.3.0/go.mod h1:xsP2yaAp+OAW4OIm60An2bbLpqIhKXdWR/tawvl7QzU=
 cloud.google.com/go/essentialcontacts v1.3.0/go.mod h1:r+OnHa5jfj90qIfZDO/VztSFqbQan7HV75p8sA+mdGI=
 cloud.google.com/go/essentialcontacts v1.4.0/go.mod h1:8tRldvHYsmnBCHdFpvU+GL75oWiBKl80BiqlFh9tp+8=
 cloud.google.com/go/essentialcontacts v1.5.0/go.mod h1:ay29Z4zODTuwliK7SnX8E86aUF2CTzdNtvv42niCX0M=
+cloud.google.com/go/essentialcontacts v1.6.2/go.mod h1:T2tB6tX+TRak7i88Fb2N9Ok3PvY3UNbUsMag9/BARh4=
+cloud.google.com/go/essentialcontacts v1.6.3/go.mod h1:yiPCD7f2TkP82oJEFXFTou8Jl8L6LBRPeBEkTaO0Ggo=
+cloud.google.com/go/essentialcontacts v1.6.4/go.mod h1:iju5Vy3d9tJUg0PYMd1nHhjV7xoCXaOAVabrwLaPBEM=
+cloud.google.com/go/essentialcontacts v1.6.5/go.mod h1:jjYbPzw0x+yglXC890l6ECJWdYeZ5dlYACTFL0U/VuM=
 cloud.google.com/go/eventarc v1.7.0/go.mod h1:6ctpF3zTnaQCxUjHUdcfgcA1A2T309+omHZth7gDfmc=
 cloud.google.com/go/eventarc v1.8.0/go.mod h1:imbzxkyAU4ubfsaKYdQg04WS1NvncblHEup4kvF+4gw=
 cloud.google.com/go/eventarc v1.10.0/go.mod h1:u3R35tmZ9HvswGRBnF48IlYgYeBcPUCjkr4BTdem2Kw=
+cloud.google.com/go/eventarc v1.11.0/go.mod h1:PyUjsUKPWoRBCHeOxZd/lbOOjahV41icXyUY5kSTvVY=
+cloud.google.com/go/eventarc v1.12.1/go.mod h1:mAFCW6lukH5+IZjkvrEss+jmt2kOdYlN8aMx3sRJiAI=
+cloud.google.com/go/eventarc v1.13.0/go.mod h1:mAFCW6lukH5+IZjkvrEss+jmt2kOdYlN8aMx3sRJiAI=
+cloud.google.com/go/eventarc v1.13.1/go.mod h1:EqBxmGHFrruIara4FUQ3RHlgfCn7yo1HYsu2Hpt/C3Y=
+cloud.google.com/go/eventarc v1.13.2/go.mod h1:X9A80ShVu19fb4e5sc/OLV7mpFUKZMwfJFeeWhcIObM=
+cloud.google.com/go/eventarc v1.13.3/go.mod h1:RWH10IAZIRcj1s/vClXkBgMHwh59ts7hSWcqD3kaclg=
 cloud.google.com/go/filestore v1.3.0/go.mod h1:+qbvHGvXU1HaKX2nD0WEPo92TP/8AQuCVEBXNY9z0+w=
 cloud.google.com/go/filestore v1.4.0/go.mod h1:PaG5oDfo9r224f8OYXURtAsY+Fbyq/bLYoINEK8XQAI=
 cloud.google.com/go/filestore v1.5.0/go.mod h1:FqBXDWBp4YLHqRnVGveOkHDf8svj9r5+mUDLupOWEDs=
+cloud.google.com/go/filestore v1.6.0/go.mod h1:di5unNuss/qfZTw2U9nhFqo8/ZDSc466dre85Kydllg=
+cloud.google.com/go/filestore v1.7.1/go.mod h1:y10jsorq40JJnjR/lQ8AfFbbcGlw3g+Dp8oN7i7FjV4=
+cloud.google.com/go/filestore v1.7.2/go.mod h1:TYOlyJs25f/omgj+vY7/tIG/E7BX369triSPzE4LdgE=
+cloud.google.com/go/filestore v1.7.3/go.mod h1:Qp8WaEERR3cSkxToxFPHh/b8AACkSut+4qlCjAmKTV0=
+cloud.google.com/go/filestore v1.7.4/go.mod h1:S5JCxIbFjeBhWMTfIYH2Jx24J6BqjwpkkPl+nBA5DlI=
+cloud.google.com/go/filestore v1.8.0/go.mod h1:S5JCxIbFjeBhWMTfIYH2Jx24J6BqjwpkkPl+nBA5DlI=
 cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY=
 cloud.google.com/go/firestore v1.9.0/go.mod h1:HMkjKHNTtRyZNiMzu7YAsLr9K3X2udY2AMwDaMEQiiE=
+cloud.google.com/go/firestore v1.11.0/go.mod h1:b38dKhgzlmNNGTNZZwe7ZRFEuRab1Hay3/DBsIGKKy4=
+cloud.google.com/go/firestore v1.12.0/go.mod h1:b38dKhgzlmNNGTNZZwe7ZRFEuRab1Hay3/DBsIGKKy4=
+cloud.google.com/go/firestore v1.13.0/go.mod h1:QojqqOh8IntInDUSTAh0c8ZsPYAr68Ma8c5DWOy8xb8=
+cloud.google.com/go/firestore v1.14.0/go.mod h1:96MVaHLsEhbvkBEdZgfN+AS/GIkco1LRpH9Xp9YZfzQ=
 cloud.google.com/go/functions v1.6.0/go.mod h1:3H1UA3qiIPRWD7PeZKLvHZ9SaQhR26XIJcC0A5GbvAk=
 cloud.google.com/go/functions v1.7.0/go.mod h1:+d+QBcWM+RsrgZfV9xo6KfA1GlzJfxcfZcRPEhDDfzg=
 cloud.google.com/go/functions v1.8.0/go.mod h1:RTZ4/HsQjIqIYP9a9YPbU+QFoQsAlYgrwOXJWHn1POY=
 cloud.google.com/go/functions v1.9.0/go.mod h1:Y+Dz8yGguzO3PpIjhLTbnqV1CWmgQ5UwtlpzoyquQ08=
 cloud.google.com/go/functions v1.10.0/go.mod h1:0D3hEOe3DbEvCXtYOZHQZmD+SzYsi1YbI7dGvHfldXw=
+cloud.google.com/go/functions v1.12.0/go.mod h1:AXWGrF3e2C/5ehvwYo/GH6O5s09tOPksiKhz+hH8WkA=
+cloud.google.com/go/functions v1.13.0/go.mod h1:EU4O007sQm6Ef/PwRsI8N2umygGqPBS/IZQKBQBcJ3c=
+cloud.google.com/go/functions v1.15.1/go.mod h1:P5yNWUTkyU+LvW/S9O6V+V423VZooALQlqoXdoPz5AE=
+cloud.google.com/go/functions v1.15.2/go.mod h1:CHAjtcR6OU4XF2HuiVeriEdELNcnvRZSk1Q8RMqy4lE=
+cloud.google.com/go/functions v1.15.3/go.mod h1:r/AMHwBheapkkySEhiZYLDBwVJCdlRwsm4ieJu35/Ug=
+cloud.google.com/go/functions v1.15.4/go.mod h1:CAsTc3VlRMVvx+XqXxKqVevguqJpnVip4DdonFsX28I=
 cloud.google.com/go/gaming v1.5.0/go.mod h1:ol7rGcxP/qHTRQE/RO4bxkXq+Fix0j6D4LFPzYTIrDM=
 cloud.google.com/go/gaming v1.6.0/go.mod h1:YMU1GEvA39Qt3zWGyAVA9bpYz/yAhTvaQ1t2sK4KPUA=
 cloud.google.com/go/gaming v1.7.0/go.mod h1:LrB8U7MHdGgFG851iHAfqUdLcKBdQ55hzXy9xBJz0+w=
 cloud.google.com/go/gaming v1.8.0/go.mod h1:xAqjS8b7jAVW0KFYeRUxngo9My3f33kFmua++Pi+ggM=
 cloud.google.com/go/gaming v1.9.0/go.mod h1:Fc7kEmCObylSWLO334NcO+O9QMDyz+TKC4v1D7X+Bc0=
+cloud.google.com/go/gaming v1.10.1/go.mod h1:XQQvtfP8Rb9Rxnxm5wFVpAp9zCQkJi2bLIb7iHGwB3s=
 cloud.google.com/go/gkebackup v0.2.0/go.mod h1:XKvv/4LfG829/B8B7xRkk8zRrOEbKtEam6yNfuQNH60=
 cloud.google.com/go/gkebackup v0.3.0/go.mod h1:n/E671i1aOQvUxT541aTkCwExO/bTer2HDlj4TsBRAo=
 cloud.google.com/go/gkebackup v0.4.0/go.mod h1:byAyBGUwYGEEww7xsbnUTBHIYcOPy/PgUWUtOeRm9Vg=
+cloud.google.com/go/gkebackup v1.3.0/go.mod h1:vUDOu++N0U5qs4IhG1pcOnD1Mac79xWy6GoBFlWCWBU=
+cloud.google.com/go/gkebackup v1.3.1/go.mod h1:vUDOu++N0U5qs4IhG1pcOnD1Mac79xWy6GoBFlWCWBU=
+cloud.google.com/go/gkebackup v1.3.2/go.mod h1:OMZbXzEJloyXMC7gqdSB+EOEQ1AKcpGYvO3s1ec5ixk=
+cloud.google.com/go/gkebackup v1.3.3/go.mod h1:eMk7/wVV5P22KBakhQnJxWSVftL1p4VBFLpv0kIft7I=
+cloud.google.com/go/gkebackup v1.3.4/go.mod h1:gLVlbM8h/nHIs09ns1qx3q3eaXcGSELgNu1DWXYz1HI=
 cloud.google.com/go/gkeconnect v0.5.0/go.mod h1:c5lsNAg5EwAy7fkqX/+goqFsU1Da/jQFqArp+wGNr/o=
 cloud.google.com/go/gkeconnect v0.6.0/go.mod h1:Mln67KyU/sHJEBY8kFZ0xTeyPtzbq9StAVvEULYK16A=
 cloud.google.com/go/gkeconnect v0.7.0/go.mod h1:SNfmVqPkaEi3bF/B3CNZOAYPYdg7sU+obZ+QTky2Myw=
+cloud.google.com/go/gkeconnect v0.8.1/go.mod h1:KWiK1g9sDLZqhxB2xEuPV8V9NYzrqTUmQR9shJHpOZw=
+cloud.google.com/go/gkeconnect v0.8.2/go.mod h1:6nAVhwchBJYgQCXD2pHBFQNiJNyAd/wyxljpaa6ZPrY=
+cloud.google.com/go/gkeconnect v0.8.3/go.mod h1:i9GDTrfzBSUZGCe98qSu1B8YB8qfapT57PenIb820Jo=
+cloud.google.com/go/gkeconnect v0.8.4/go.mod h1:84hZz4UMlDCKl8ifVW8layK4WHlMAFeq8vbzjU0yJkw=
 cloud.google.com/go/gkehub v0.9.0/go.mod h1:WYHN6WG8w9bXU0hqNxt8rm5uxnk8IH+lPY9J2TV7BK0=
 cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y977wO+hBH0=
 cloud.google.com/go/gkehub v0.11.0/go.mod h1:JOWHlmN+GHyIbuWQPl47/C2RFhnFKH38jH9Ascu3n0E=
+cloud.google.com/go/gkehub v0.12.0/go.mod h1:djiIwwzTTBrF5NaXCGv3mf7klpEMcST17VBTVVDcuaw=
+cloud.google.com/go/gkehub v0.14.1/go.mod h1:VEXKIJZ2avzrbd7u+zeMtW00Y8ddk/4V9511C9CQGTY=
+cloud.google.com/go/gkehub v0.14.2/go.mod h1:iyjYH23XzAxSdhrbmfoQdePnlMj2EWcvnR+tHdBQsCY=
+cloud.google.com/go/gkehub v0.14.3/go.mod h1:jAl6WafkHHW18qgq7kqcrXYzN08hXeK/Va3utN8VKg8=
+cloud.google.com/go/gkehub v0.14.4/go.mod h1:Xispfu2MqnnFt8rV/2/3o73SK1snL8s9dYJ9G2oQMfc=
 cloud.google.com/go/gkemulticloud v0.3.0/go.mod h1:7orzy7O0S+5kq95e4Hpn7RysVA7dPs8W/GgfUtsPbrA=
 cloud.google.com/go/gkemulticloud v0.4.0/go.mod h1:E9gxVBnseLWCk24ch+P9+B2CoDFJZTyIgLKSalC7tuI=
 cloud.google.com/go/gkemulticloud v0.5.0/go.mod h1:W0JDkiyi3Tqh0TJr//y19wyb1yf8llHVto2Htf2Ja3Y=
+cloud.google.com/go/gkemulticloud v0.6.1/go.mod h1:kbZ3HKyTsiwqKX7Yw56+wUGwwNZViRnxWK2DVknXWfw=
+cloud.google.com/go/gkemulticloud v1.0.0/go.mod h1:kbZ3HKyTsiwqKX7Yw56+wUGwwNZViRnxWK2DVknXWfw=
+cloud.google.com/go/gkemulticloud v1.0.1/go.mod h1:AcrGoin6VLKT/fwZEYuqvVominLriQBCKmbjtnbMjG8=
+cloud.google.com/go/gkemulticloud v1.0.2/go.mod h1:+ee5VXxKb3H1l4LZAcgWB/rvI16VTNTrInWxDjAGsGo=
+cloud.google.com/go/gkemulticloud v1.0.3/go.mod h1:7NpJBN94U6DY1xHIbsDqB2+TFZUfjLUKLjUX8NGLor0=
 cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc=
+cloud.google.com/go/grafeas v0.3.0/go.mod h1:P7hgN24EyONOTMyeJH6DxG4zD7fwiYa5Q6GUgyFSOU8=
 cloud.google.com/go/gsuiteaddons v1.3.0/go.mod h1:EUNK/J1lZEZO8yPtykKxLXI6JSVN2rg9bN8SXOa0bgM=
 cloud.google.com/go/gsuiteaddons v1.4.0/go.mod h1:rZK5I8hht7u7HxFQcFei0+AtfS9uSushomRlg+3ua1o=
 cloud.google.com/go/gsuiteaddons v1.5.0/go.mod h1:TFCClYLd64Eaa12sFVmUyG62tk4mdIsI7pAnSXRkcFo=
+cloud.google.com/go/gsuiteaddons v1.6.1/go.mod h1:CodrdOqRZcLp5WOwejHWYBjZvfY0kOphkAKpF/3qdZY=
+cloud.google.com/go/gsuiteaddons v1.6.2/go.mod h1:K65m9XSgs8hTF3X9nNTPi8IQueljSdYo9F+Mi+s4MyU=
+cloud.google.com/go/gsuiteaddons v1.6.3/go.mod h1:sCFJkZoMrLZT3JTb8uJqgKPNshH2tfXeCwTFRebTq48=
+cloud.google.com/go/gsuiteaddons v1.6.4/go.mod h1:rxtstw7Fx22uLOXBpsvb9DUbC+fiXs7rF4U29KHM/pE=
 cloud.google.com/go/iam v0.1.0/go.mod h1:vcUNEa0pEm0qRVpmWepWaFMIAI8/hjB9mO8rNCJtF6c=
 cloud.google.com/go/iam v0.1.1/go.mod h1:CKqrcnI/suGpybEHxZ7BMehL0oA4LpdyJdUlTl9jVMw=
 cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY=
@@ -282,104 +603,245 @@ cloud.google.com/go/iam v0.7.0/go.mod h1:H5Br8wRaDGNc8XP3keLc4unfUUZeyH3Sfl9XpQE
 cloud.google.com/go/iam v0.8.0/go.mod h1:lga0/y3iH6CX7sYqypWJ33hf7kkfXJag67naqGESjkE=
 cloud.google.com/go/iam v0.11.0/go.mod h1:9PiLDanza5D+oWFZiH1uG+RnRCfEGKoyl6yo4cgWZGY=
 cloud.google.com/go/iam v0.12.0/go.mod h1:knyHGviacl11zrtZUoDuYpDgLjvr28sLQaG0YB2GYAY=
-cloud.google.com/go/iam v1.1.2 h1:gacbrBdWcoVmGLozRuStX45YKvJtzIjJdAolzUs1sm4=
+cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0=
+cloud.google.com/go/iam v1.0.1/go.mod h1:yR3tmSL8BcZB4bxByRv2jkSIahVmCtfKZwLYGBalRE8=
+cloud.google.com/go/iam v1.1.0/go.mod h1:nxdHjaKfCr7fNYx/HJMM8LgiMugmveWlkatear5gVyk=
+cloud.google.com/go/iam v1.1.1/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU=
 cloud.google.com/go/iam v1.1.2/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU=
+cloud.google.com/go/iam v1.1.3/go.mod h1:3khUlaBXfPKKe7huYgEpDn6FtgRyMEqbkvBxrQyY5SE=
+cloud.google.com/go/iam v1.1.4/go.mod h1:l/rg8l1AaA+VFMho/HYx2Vv6xinPSLMF8qfhRPIZ0L8=
+cloud.google.com/go/iam v1.1.5 h1:1jTsCu4bcsNsE4iiqNT5SHwrDRCfRmIaaaVFhRveTJI=
+cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXEbzv8=
 cloud.google.com/go/iap v1.4.0/go.mod h1:RGFwRJdihTINIe4wZ2iCP0zF/qu18ZwyKxrhMhygBEc=
 cloud.google.com/go/iap v1.5.0/go.mod h1:UH/CGgKd4KyohZL5Pt0jSKE4m3FR51qg6FKQ/z/Ix9A=
 cloud.google.com/go/iap v1.6.0/go.mod h1:NSuvI9C/j7UdjGjIde7t7HBz+QTwBcapPE07+sSRcLk=
+cloud.google.com/go/iap v1.7.0/go.mod h1:beqQx56T9O1G1yNPph+spKpNibDlYIiIixiqsQXxLIo=
+cloud.google.com/go/iap v1.7.1/go.mod h1:WapEwPc7ZxGt2jFGB/C/bm+hP0Y6NXzOYGjpPnmMS74=
+cloud.google.com/go/iap v1.8.1/go.mod h1:sJCbeqg3mvWLqjZNsI6dfAtbbV1DL2Rl7e1mTyXYREQ=
+cloud.google.com/go/iap v1.9.0/go.mod h1:01OFxd1R+NFrg78S+hoPV5PxEzv22HXaNqUUlmNHFuY=
+cloud.google.com/go/iap v1.9.1/go.mod h1:SIAkY7cGMLohLSdBR25BuIxO+I4fXJiL06IBL7cy/5Q=
+cloud.google.com/go/iap v1.9.2/go.mod h1:GwDTOs047PPSnwRD0Us5FKf4WDRcVvHg1q9WVkKBhdI=
+cloud.google.com/go/iap v1.9.3/go.mod h1:DTdutSZBqkkOm2HEOTBzhZxh2mwwxshfD/h3yofAiCw=
 cloud.google.com/go/ids v1.1.0/go.mod h1:WIuwCaYVOzHIj2OhN9HAwvW+DBdmUAdcWlFxRl+KubM=
 cloud.google.com/go/ids v1.2.0/go.mod h1:5WXvp4n25S0rA/mQWAg1YEEBBq6/s+7ml1RDCW1IrcY=
 cloud.google.com/go/ids v1.3.0/go.mod h1:JBdTYwANikFKaDP6LtW5JAi4gubs57SVNQjemdt6xV4=
+cloud.google.com/go/ids v1.4.1/go.mod h1:np41ed8YMU8zOgv53MMMoCntLTn2lF+SUzlM+O3u/jw=
+cloud.google.com/go/ids v1.4.2/go.mod h1:3vw8DX6YddRu9BncxuzMyWn0g8+ooUjI2gslJ7FH3vk=
+cloud.google.com/go/ids v1.4.3/go.mod h1:9CXPqI3GedjmkjbMWCUhMZ2P2N7TUMzAkVXYEH2orYU=
+cloud.google.com/go/ids v1.4.4/go.mod h1:z+WUc2eEl6S/1aZWzwtVNWoSZslgzPxAboS0lZX0HjI=
 cloud.google.com/go/iot v1.3.0/go.mod h1:r7RGh2B61+B8oz0AGE+J72AhA0G7tdXItODWsaA2oLs=
 cloud.google.com/go/iot v1.4.0/go.mod h1:dIDxPOn0UvNDUMD8Ger7FIaTuvMkj+aGk94RPP0iV+g=
 cloud.google.com/go/iot v1.5.0/go.mod h1:mpz5259PDl3XJthEmh9+ap0affn/MqNSP4My77Qql9o=
+cloud.google.com/go/iot v1.6.0/go.mod h1:IqdAsmE2cTYYNO1Fvjfzo9po179rAtJeVGUvkLN3rLE=
+cloud.google.com/go/iot v1.7.1/go.mod h1:46Mgw7ev1k9KqK1ao0ayW9h0lI+3hxeanz+L1zmbbbk=
+cloud.google.com/go/iot v1.7.2/go.mod h1:q+0P5zr1wRFpw7/MOgDXrG/HVA+l+cSwdObffkrpnSg=
+cloud.google.com/go/iot v1.7.3/go.mod h1:t8itFchkol4VgNbHnIq9lXoOOtHNR3uAACQMYbN9N4I=
+cloud.google.com/go/iot v1.7.4/go.mod h1:3TWqDVvsddYBG++nHSZmluoCAVGr1hAcabbWZNKEZLk=
 cloud.google.com/go/kms v1.1.0/go.mod h1:WdbppnCDMDpOvoYBMn1+gNmOeEoZYqAv+HeuKARGCXI=
 cloud.google.com/go/kms v1.4.0/go.mod h1:fajBHndQ+6ubNw6Ss2sSd+SWvjL26RNo/dr7uxsnnOA=
 cloud.google.com/go/kms v1.5.0/go.mod h1:QJS2YY0eJGBg3mnDfuaCyLauWwBJiHRboYxJ++1xJNg=
 cloud.google.com/go/kms v1.6.0/go.mod h1:Jjy850yySiasBUDi6KFUwUv2n1+o7QZFyuUJg6OgjA0=
+cloud.google.com/go/kms v1.8.0/go.mod h1:4xFEhYFqvW+4VMELtZyxomGSYtSQKzM178ylFW4jMAg=
 cloud.google.com/go/kms v1.9.0/go.mod h1:qb1tPTgfF9RQP8e1wq4cLFErVuTJv7UsSC915J8dh3w=
-cloud.google.com/go/kms v1.15.2 h1:lh6qra6oC4AyWe5fUUUBe/S27k12OHAleOOOw6KakdE=
+cloud.google.com/go/kms v1.10.0/go.mod h1:ng3KTUtQQU9bPX3+QGLsflZIHlkbn8amFAMY63m8d24=
+cloud.google.com/go/kms v1.10.1/go.mod h1:rIWk/TryCkR59GMC3YtHtXeLzd634lBbKenvyySAyYI=
+cloud.google.com/go/kms v1.11.0/go.mod h1:hwdiYC0xjnWsKQQCQQmIQnS9asjYVSK6jtXm+zFqXLM=
+cloud.google.com/go/kms v1.12.1/go.mod h1:c9J991h5DTl+kg7gi3MYomh12YEENGrf48ee/N/2CDM=
+cloud.google.com/go/kms v1.15.0/go.mod h1:c9J991h5DTl+kg7gi3MYomh12YEENGrf48ee/N/2CDM=
 cloud.google.com/go/kms v1.15.2/go.mod h1:3hopT4+7ooWRCjc2DxgnpESFxhIraaI2IpAVUEhbT/w=
+cloud.google.com/go/kms v1.15.3/go.mod h1:AJdXqHxS2GlPyduM99s9iGqi2nwbviBbhV/hdmt4iOQ=
+cloud.google.com/go/kms v1.15.4/go.mod h1:L3Sdj6QTHK8dfwK5D1JLsAyELsNMnd3tAIwGS4ltKpc=
+cloud.google.com/go/kms v1.15.5 h1:pj1sRfut2eRbD9pFRjNnPNg/CzJPuQAzUujMIM1vVeM=
+cloud.google.com/go/kms v1.15.5/go.mod h1:cU2H5jnp6G2TDpUGZyqTCoy1n16fbubHZjmVXSMtwDI=
 cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic=
 cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI=
 cloud.google.com/go/language v1.7.0/go.mod h1:DJ6dYN/W+SQOjF8e1hLQXMF21AkH2w9wiPzPCJa2MIE=
 cloud.google.com/go/language v1.8.0/go.mod h1:qYPVHf7SPoNNiCL2Dr0FfEFNil1qi3pQEyygwpgVKB8=
 cloud.google.com/go/language v1.9.0/go.mod h1:Ns15WooPM5Ad/5no/0n81yUetis74g3zrbeJBE+ptUY=
+cloud.google.com/go/language v1.10.1/go.mod h1:CPp94nsdVNiQEt1CNjF5WkTcisLiHPyIbMhvR8H2AW0=
+cloud.google.com/go/language v1.11.0/go.mod h1:uDx+pFDdAKTY8ehpWbiXyQdz8tDSYLJbQcXsCkjYyvQ=
+cloud.google.com/go/language v1.11.1/go.mod h1:Xyid9MG9WOX3utvDbpX7j3tXDmmDooMyMDqgUVpH17U=
+cloud.google.com/go/language v1.12.1/go.mod h1:zQhalE2QlQIxbKIZt54IASBzmZpN/aDASea5zl1l+J4=
+cloud.google.com/go/language v1.12.2/go.mod h1:9idWapzr/JKXBBQ4lWqVX/hcadxB194ry20m/bTrhWc=
 cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8=
 cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08=
 cloud.google.com/go/lifesciences v0.8.0/go.mod h1:lFxiEOMqII6XggGbOnKiyZ7IBwoIqA84ClvoezaA/bo=
+cloud.google.com/go/lifesciences v0.9.1/go.mod h1:hACAOd1fFbCGLr/+weUKRAJas82Y4vrL3O5326N//Wc=
+cloud.google.com/go/lifesciences v0.9.2/go.mod h1:QHEOO4tDzcSAzeJg7s2qwnLM2ji8IRpQl4p6m5Z9yTA=
+cloud.google.com/go/lifesciences v0.9.3/go.mod h1:gNGBOJV80IWZdkd+xz4GQj4mbqaz737SCLHn2aRhQKM=
+cloud.google.com/go/lifesciences v0.9.4/go.mod h1:bhm64duKhMi7s9jR9WYJYvjAFJwRqNj+Nia7hF0Z7JA=
 cloud.google.com/go/logging v1.6.1/go.mod h1:5ZO0mHHbvm8gEmeEUHrmDlTDSu5imF6MUP9OfilNXBw=
 cloud.google.com/go/logging v1.7.0/go.mod h1:3xjP2CjkM3ZkO73aj4ASA5wRPGGCRrPIAeNqVNkzY8M=
+cloud.google.com/go/logging v1.8.1/go.mod h1:TJjR+SimHwuC8MZ9cjByQulAMgni+RkXeI3wwctHJEI=
 cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 cloud.google.com/go/longrunning v0.3.0/go.mod h1:qth9Y41RRSUE69rDcOn6DdK3HfQfsUI0YSmW3iIlLJc=
 cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo=
+cloud.google.com/go/longrunning v0.4.2/go.mod h1:OHrnaYyLUV6oqwh0xiS7e5sLQhP1m0QU9R+WhGDMgIQ=
+cloud.google.com/go/longrunning v0.5.0/go.mod h1:0JNuqRShmscVAhIACGtskSAWtqtOoPkwP0YF1oVEchc=
+cloud.google.com/go/longrunning v0.5.1/go.mod h1:spvimkwdz6SPWKEt/XBij79E9fiTkHSQl/fRUUQJYJc=
+cloud.google.com/go/longrunning v0.5.2/go.mod h1:nqo6DQbNV2pXhGDbDMoN2bWz68MjZUzqv2YttZiveCs=
+cloud.google.com/go/longrunning v0.5.3/go.mod h1:y/0ga59EYu58J6SHmmQOvekvND2qODbu8ywBBW7EK7Y=
+cloud.google.com/go/longrunning v0.5.4/go.mod h1:zqNVncI0BOP8ST6XQD1+VcvuShMmq7+xFSzOL++V0dI=
 cloud.google.com/go/managedidentities v1.3.0/go.mod h1:UzlW3cBOiPrzucO5qWkNkh0w33KFtBJU281hacNvsdE=
 cloud.google.com/go/managedidentities v1.4.0/go.mod h1:NWSBYbEMgqmbZsLIyKvxrYbtqOsxY1ZrGM+9RgDqInM=
 cloud.google.com/go/managedidentities v1.5.0/go.mod h1:+dWcZ0JlUmpuxpIDfyP5pP5y0bLdRwOS4Lp7gMni/LA=
+cloud.google.com/go/managedidentities v1.6.1/go.mod h1:h/irGhTN2SkZ64F43tfGPMbHnypMbu4RB3yl8YcuEak=
+cloud.google.com/go/managedidentities v1.6.2/go.mod h1:5c2VG66eCa0WIq6IylRk3TBW83l161zkFvCj28X7jn8=
+cloud.google.com/go/managedidentities v1.6.3/go.mod h1:tewiat9WLyFN0Fi7q1fDD5+0N4VUoL0SCX0OTCthZq4=
+cloud.google.com/go/managedidentities v1.6.4/go.mod h1:WgyaECfHmF00t/1Uk8Oun3CQ2PGUtjc3e9Alh79wyiM=
 cloud.google.com/go/maps v0.1.0/go.mod h1:BQM97WGyfw9FWEmQMpZ5T6cpovXXSd1cGmFma94eubI=
 cloud.google.com/go/maps v0.6.0/go.mod h1:o6DAMMfb+aINHz/p/jbcY+mYeXBoZoxTfdSQ8VAJaCw=
+cloud.google.com/go/maps v0.7.0/go.mod h1:3GnvVl3cqeSvgMcpRlQidXsPYuDGQ8naBis7MVzpXsY=
+cloud.google.com/go/maps v1.3.0/go.mod h1:6mWTUv+WhnOwAgjVsSW2QPPECmW+s3PcRyOa9vgG/5s=
+cloud.google.com/go/maps v1.4.0/go.mod h1:6mWTUv+WhnOwAgjVsSW2QPPECmW+s3PcRyOa9vgG/5s=
+cloud.google.com/go/maps v1.4.1/go.mod h1:BxSa0BnW1g2U2gNdbq5zikLlHUuHW0GFWh7sgML2kIY=
+cloud.google.com/go/maps v1.5.1/go.mod h1:NPMZw1LJwQZYCfz4y+EIw+SI+24A4bpdFJqdKVr0lt4=
+cloud.google.com/go/maps v1.6.1/go.mod h1:4+buOHhYXFBp58Zj/K+Lc1rCmJssxxF4pJ5CJnhdz18=
 cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4=
 cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w=
 cloud.google.com/go/mediatranslation v0.7.0/go.mod h1:LCnB/gZr90ONOIQLgSXagp8XUW1ODs2UmUMvcgMfI2I=
+cloud.google.com/go/mediatranslation v0.8.1/go.mod h1:L/7hBdEYbYHQJhX2sldtTO5SZZ1C1vkapubj0T2aGig=
+cloud.google.com/go/mediatranslation v0.8.2/go.mod h1:c9pUaDRLkgHRx3irYE5ZC8tfXGrMYwNZdmDqKMSfFp8=
+cloud.google.com/go/mediatranslation v0.8.3/go.mod h1:F9OnXTy336rteOEywtY7FOqCk+J43o2RF638hkOQl4Y=
+cloud.google.com/go/mediatranslation v0.8.4/go.mod h1:9WstgtNVAdN53m6TQa5GjIjLqKQPXe74hwSCxUP6nj4=
 cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE=
 cloud.google.com/go/memcache v1.5.0/go.mod h1:dk3fCK7dVo0cUU2c36jKb4VqKPS22BTkf81Xq617aWM=
 cloud.google.com/go/memcache v1.6.0/go.mod h1:XS5xB0eQZdHtTuTF9Hf8eJkKtR3pVRCcvJwtm68T3rA=
 cloud.google.com/go/memcache v1.7.0/go.mod h1:ywMKfjWhNtkQTxrWxCkCFkoPjLHPW6A7WOTVI8xy3LY=
 cloud.google.com/go/memcache v1.9.0/go.mod h1:8oEyzXCu+zo9RzlEaEjHl4KkgjlNDaXbCQeQWlzNFJM=
+cloud.google.com/go/memcache v1.10.1/go.mod h1:47YRQIarv4I3QS5+hoETgKO40InqzLP6kpNLvyXuyaA=
+cloud.google.com/go/memcache v1.10.2/go.mod h1:f9ZzJHLBrmd4BkguIAa/l/Vle6uTHzHokdnzSWOdQ6A=
+cloud.google.com/go/memcache v1.10.3/go.mod h1:6z89A41MT2DVAW0P4iIRdu5cmRTsbsFn4cyiIx8gbwo=
+cloud.google.com/go/memcache v1.10.4/go.mod h1:v/d8PuC8d1gD6Yn5+I3INzLR01IDn0N4Ym56RgikSI0=
 cloud.google.com/go/metastore v1.5.0/go.mod h1:2ZNrDcQwghfdtCwJ33nM0+GrBGlVuh8rakL3vdPY3XY=
 cloud.google.com/go/metastore v1.6.0/go.mod h1:6cyQTls8CWXzk45G55x57DVQ9gWg7RiH65+YgPsNh9s=
 cloud.google.com/go/metastore v1.7.0/go.mod h1:s45D0B4IlsINu87/AsWiEVYbLaIMeUSoxlKKDqBGFS8=
 cloud.google.com/go/metastore v1.8.0/go.mod h1:zHiMc4ZUpBiM7twCIFQmJ9JMEkDSyZS9U12uf7wHqSI=
 cloud.google.com/go/metastore v1.10.0/go.mod h1:fPEnH3g4JJAk+gMRnrAnoqyv2lpUCqJPWOodSaf45Eo=
+cloud.google.com/go/metastore v1.11.1/go.mod h1:uZuSo80U3Wd4zi6C22ZZliOUJ3XeM/MlYi/z5OAOWRA=
+cloud.google.com/go/metastore v1.12.0/go.mod h1:uZuSo80U3Wd4zi6C22ZZliOUJ3XeM/MlYi/z5OAOWRA=
+cloud.google.com/go/metastore v1.13.0/go.mod h1:URDhpG6XLeh5K+Glq0NOt74OfrPKTwS62gEPZzb5SOk=
+cloud.google.com/go/metastore v1.13.1/go.mod h1:IbF62JLxuZmhItCppcIfzBBfUFq0DIB9HPDoLgWrVOU=
+cloud.google.com/go/metastore v1.13.2/go.mod h1:KS59dD+unBji/kFebVp8XU/quNSyo8b6N6tPGspKszA=
+cloud.google.com/go/metastore v1.13.3/go.mod h1:K+wdjXdtkdk7AQg4+sXS8bRrQa9gcOr+foOMF2tqINE=
 cloud.google.com/go/monitoring v1.1.0/go.mod h1:L81pzz7HKn14QCMaCs6NTQkdBnE87TElyanS95vIcl4=
 cloud.google.com/go/monitoring v1.4.0/go.mod h1:y6xnxfwI3hTFWOdkOaD7nfJVlwuC3/mS/5kvtT131p4=
 cloud.google.com/go/monitoring v1.7.0/go.mod h1:HpYse6kkGo//7p6sT0wsIC6IBDET0RhIsnmlA53dvEk=
 cloud.google.com/go/monitoring v1.8.0/go.mod h1:E7PtoMJ1kQXWxPjB6mv2fhC5/15jInuulFdYYtlcvT4=
 cloud.google.com/go/monitoring v1.12.0/go.mod h1:yx8Jj2fZNEkL/GYZyTLS4ZtZEZN8WtDEiEqG4kLK50w=
+cloud.google.com/go/monitoring v1.13.0/go.mod h1:k2yMBAB1H9JT/QETjNkgdCGD9bPF712XiLTVr+cBrpw=
+cloud.google.com/go/monitoring v1.15.1/go.mod h1:lADlSAlFdbqQuwwpaImhsJXu1QSdd3ojypXrFSMr2rM=
+cloud.google.com/go/monitoring v1.16.0/go.mod h1:Ptp15HgAyM1fNICAojDMoNc/wUmn67mLHQfyqbw+poY=
+cloud.google.com/go/monitoring v1.16.1/go.mod h1:6HsxddR+3y9j+o/cMJH6q/KJ/CBTvM/38L/1m7bTRJ4=
+cloud.google.com/go/monitoring v1.16.2/go.mod h1:B44KGwi4ZCF8Rk/5n+FWeispDXoKSk9oss2QNlXJBgc=
+cloud.google.com/go/monitoring v1.16.3/go.mod h1:KwSsX5+8PnXv5NJnICZzW2R8pWTis8ypC4zmdRD63Tw=
 cloud.google.com/go/networkconnectivity v1.4.0/go.mod h1:nOl7YL8odKyAOtzNX73/M5/mGZgqqMeryi6UPZTk/rA=
 cloud.google.com/go/networkconnectivity v1.5.0/go.mod h1:3GzqJx7uhtlM3kln0+x5wyFvuVH1pIBJjhCpjzSt75o=
 cloud.google.com/go/networkconnectivity v1.6.0/go.mod h1:OJOoEXW+0LAxHh89nXd64uGG+FbQoeH8DtxCHVOMlaM=
 cloud.google.com/go/networkconnectivity v1.7.0/go.mod h1:RMuSbkdbPwNMQjB5HBWD5MpTBnNm39iAVpC3TmsExt8=
 cloud.google.com/go/networkconnectivity v1.10.0/go.mod h1:UP4O4sWXJG13AqrTdQCD9TnLGEbtNRqjuaaA7bNjF5E=
+cloud.google.com/go/networkconnectivity v1.11.0/go.mod h1:iWmDD4QF16VCDLXUqvyspJjIEtBR/4zq5hwnY2X3scM=
+cloud.google.com/go/networkconnectivity v1.12.1/go.mod h1:PelxSWYM7Sh9/guf8CFhi6vIqf19Ir/sbfZRUwXh92E=
+cloud.google.com/go/networkconnectivity v1.13.0/go.mod h1:SAnGPes88pl7QRLUen2HmcBSE9AowVAcdug8c0RSBFk=
+cloud.google.com/go/networkconnectivity v1.14.0/go.mod h1:SAnGPes88pl7QRLUen2HmcBSE9AowVAcdug8c0RSBFk=
+cloud.google.com/go/networkconnectivity v1.14.1/go.mod h1:LyGPXR742uQcDxZ/wv4EI0Vu5N6NKJ77ZYVnDe69Zug=
+cloud.google.com/go/networkconnectivity v1.14.2/go.mod h1:5UFlwIisZylSkGG1AdwK/WZUaoz12PKu6wODwIbFzJo=
+cloud.google.com/go/networkconnectivity v1.14.3/go.mod h1:4aoeFdrJpYEXNvrnfyD5kIzs8YtHg945Og4koAjHQek=
 cloud.google.com/go/networkmanagement v1.4.0/go.mod h1:Q9mdLLRn60AsOrPc8rs8iNV6OHXaGcDdsIQe1ohekq8=
 cloud.google.com/go/networkmanagement v1.5.0/go.mod h1:ZnOeZ/evzUdUsnvRt792H0uYEnHQEMaz+REhhzJRcf4=
 cloud.google.com/go/networkmanagement v1.6.0/go.mod h1:5pKPqyXjB/sgtvB5xqOemumoQNB7y95Q7S+4rjSOPYY=
+cloud.google.com/go/networkmanagement v1.8.0/go.mod h1:Ho/BUGmtyEqrttTgWEe7m+8vDdK74ibQc+Be0q7Fof0=
+cloud.google.com/go/networkmanagement v1.9.0/go.mod h1:UTUaEU9YwbCAhhz3jEOHr+2/K/MrBk2XxOLS89LQzFw=
+cloud.google.com/go/networkmanagement v1.9.1/go.mod h1:CCSYgrQQvW73EJawO2QamemYcOb57LvrDdDU51F0mcI=
+cloud.google.com/go/networkmanagement v1.9.2/go.mod h1:iDGvGzAoYRghhp4j2Cji7sF899GnfGQcQRQwgVOWnDw=
+cloud.google.com/go/networkmanagement v1.9.3/go.mod h1:y7WMO1bRLaP5h3Obm4tey+NquUvB93Co1oh4wpL+XcU=
 cloud.google.com/go/networksecurity v0.5.0/go.mod h1:xS6fOCoqpVC5zx15Z/MqkfDwH4+m/61A3ODiDV1xmiQ=
 cloud.google.com/go/networksecurity v0.6.0/go.mod h1:Q5fjhTr9WMI5mbpRYEbiexTzROf7ZbDzvzCrNl14nyU=
 cloud.google.com/go/networksecurity v0.7.0/go.mod h1:mAnzoxx/8TBSyXEeESMy9OOYwo1v+gZ5eMRnsT5bC8k=
+cloud.google.com/go/networksecurity v0.8.0/go.mod h1:B78DkqsxFG5zRSVuwYFRZ9Xz8IcQ5iECsNrPn74hKHU=
+cloud.google.com/go/networksecurity v0.9.1/go.mod h1:MCMdxOKQ30wsBI1eI659f9kEp4wuuAueoC9AJKSPWZQ=
+cloud.google.com/go/networksecurity v0.9.2/go.mod h1:jG0SeAttWzPMUILEHDUvFYdQTl8L/E/KC8iZDj85lEI=
+cloud.google.com/go/networksecurity v0.9.3/go.mod h1:l+C0ynM6P+KV9YjOnx+kk5IZqMSLccdBqW6GUoF4p/0=
+cloud.google.com/go/networksecurity v0.9.4/go.mod h1:E9CeMZ2zDsNBkr8axKSYm8XyTqNhiCHf1JO/Vb8mD1w=
 cloud.google.com/go/notebooks v1.2.0/go.mod h1:9+wtppMfVPUeJ8fIWPOq1UnATHISkGXGqTkxeieQ6UY=
 cloud.google.com/go/notebooks v1.3.0/go.mod h1:bFR5lj07DtCPC7YAAJ//vHskFBxA5JzYlH68kXVdk34=
 cloud.google.com/go/notebooks v1.4.0/go.mod h1:4QPMngcwmgb6uw7Po99B2xv5ufVoIQ7nOGDyL4P8AgA=
 cloud.google.com/go/notebooks v1.5.0/go.mod h1:q8mwhnP9aR8Hpfnrc5iN5IBhrXUy8S2vuYs+kBJ/gu0=
 cloud.google.com/go/notebooks v1.7.0/go.mod h1:PVlaDGfJgj1fl1S3dUwhFMXFgfYGhYQt2164xOMONmE=
+cloud.google.com/go/notebooks v1.8.0/go.mod h1:Lq6dYKOYOWUCTvw5t2q1gp1lAp0zxAxRycayS0iJcqQ=
+cloud.google.com/go/notebooks v1.9.1/go.mod h1:zqG9/gk05JrzgBt4ghLzEepPHNwE5jgPcHZRKhlC1A8=
+cloud.google.com/go/notebooks v1.10.0/go.mod h1:SOPYMZnttHxqot0SGSFSkRrwE29eqnKPBJFqgWmiK2k=
+cloud.google.com/go/notebooks v1.10.1/go.mod h1:5PdJc2SgAybE76kFQCWrTfJolCOUQXF97e+gteUUA6A=
+cloud.google.com/go/notebooks v1.11.1/go.mod h1:V2Zkv8wX9kDCGRJqYoI+bQAaoVeE5kSiz4yYHd2yJwQ=
+cloud.google.com/go/notebooks v1.11.2/go.mod h1:z0tlHI/lREXC8BS2mIsUeR3agM1AkgLiS+Isov3SS70=
 cloud.google.com/go/optimization v1.1.0/go.mod h1:5po+wfvX5AQlPznyVEZjGJTMr4+CAkJf2XSTQOOl9l4=
 cloud.google.com/go/optimization v1.2.0/go.mod h1:Lr7SOHdRDENsh+WXVmQhQTrzdu9ybg0NecjHidBq6xs=
 cloud.google.com/go/optimization v1.3.1/go.mod h1:IvUSefKiwd1a5p0RgHDbWCIbDFgKuEdB+fPPuP0IDLI=
+cloud.google.com/go/optimization v1.4.1/go.mod h1:j64vZQP7h9bO49m2rVaTVoNM0vEBEN5eKPUPbZyXOrk=
+cloud.google.com/go/optimization v1.5.0/go.mod h1:evo1OvTxeBRBu6ydPlrIRizKY/LJKo/drDMMRKqGEUU=
+cloud.google.com/go/optimization v1.5.1/go.mod h1:NC0gnUD5MWVAF7XLdoYVPmYYVth93Q6BUzqAq3ZwtV8=
+cloud.google.com/go/optimization v1.6.1/go.mod h1:hH2RYPTTM9e9zOiTaYPTiGPcGdNZVnBSBxjIAJzUkqo=
+cloud.google.com/go/optimization v1.6.2/go.mod h1:mWNZ7B9/EyMCcwNl1frUGEuY6CPijSkz88Fz2vwKPOY=
 cloud.google.com/go/orchestration v1.3.0/go.mod h1:Sj5tq/JpWiB//X/q3Ngwdl5K7B7Y0KZ7bfv0wL6fqVA=
 cloud.google.com/go/orchestration v1.4.0/go.mod h1:6W5NLFWs2TlniBphAViZEVhrXRSMgUGDfW7vrWKvsBk=
 cloud.google.com/go/orchestration v1.6.0/go.mod h1:M62Bevp7pkxStDfFfTuCOaXgaaqRAga1yKyoMtEoWPQ=
+cloud.google.com/go/orchestration v1.8.1/go.mod h1:4sluRF3wgbYVRqz7zJ1/EUNc90TTprliq9477fGobD8=
+cloud.google.com/go/orchestration v1.8.2/go.mod h1:T1cP+6WyTmh6LSZzeUhvGf0uZVmJyTx7t8z7Vg87+A0=
+cloud.google.com/go/orchestration v1.8.3/go.mod h1:xhgWAYqlbYjlz2ftbFghdyqENYW+JXuhBx9KsjMoGHs=
+cloud.google.com/go/orchestration v1.8.4/go.mod h1:d0lywZSVYtIoSZXb0iFjv9SaL13PGyVOKDxqGxEf/qI=
 cloud.google.com/go/orgpolicy v1.4.0/go.mod h1:xrSLIV4RePWmP9P3tBl8S93lTmlAxjm06NSm2UTmKvE=
 cloud.google.com/go/orgpolicy v1.5.0/go.mod h1:hZEc5q3wzwXJaKrsx5+Ewg0u1LxJ51nNFlext7Tanwc=
 cloud.google.com/go/orgpolicy v1.10.0/go.mod h1:w1fo8b7rRqlXlIJbVhOMPrwVljyuW5mqssvBtU18ONc=
+cloud.google.com/go/orgpolicy v1.11.0/go.mod h1:2RK748+FtVvnfuynxBzdnyu7sygtoZa1za/0ZfpOs1M=
+cloud.google.com/go/orgpolicy v1.11.1/go.mod h1:8+E3jQcpZJQliP+zaFfayC2Pg5bmhuLK755wKhIIUCE=
+cloud.google.com/go/orgpolicy v1.11.2/go.mod h1:biRDpNwfyytYnmCRWZWxrKF22Nkz9eNVj9zyaBdpm1o=
+cloud.google.com/go/orgpolicy v1.11.3/go.mod h1:oKAtJ/gkMjum5icv2aujkP4CxROxPXsBbYGCDbPO8MM=
+cloud.google.com/go/orgpolicy v1.11.4/go.mod h1:0+aNV/nrfoTQ4Mytv+Aw+stBDBjNf4d8fYRA9herfJI=
 cloud.google.com/go/osconfig v1.7.0/go.mod h1:oVHeCeZELfJP7XLxcBGTMBvRO+1nQ5tFG9VQTmYS2Fs=
 cloud.google.com/go/osconfig v1.8.0/go.mod h1:EQqZLu5w5XA7eKizepumcvWx+m8mJUhEwiPqWiZeEdg=
 cloud.google.com/go/osconfig v1.9.0/go.mod h1:Yx+IeIZJ3bdWmzbQU4fxNl8xsZ4amB+dygAwFPlvnNo=
 cloud.google.com/go/osconfig v1.10.0/go.mod h1:uMhCzqC5I8zfD9zDEAfvgVhDS8oIjySWh+l4WK6GnWw=
 cloud.google.com/go/osconfig v1.11.0/go.mod h1:aDICxrur2ogRd9zY5ytBLV89KEgT2MKB2L/n6x1ooPw=
+cloud.google.com/go/osconfig v1.12.0/go.mod h1:8f/PaYzoS3JMVfdfTubkowZYGmAhUCjjwnjqWI7NVBc=
+cloud.google.com/go/osconfig v1.12.1/go.mod h1:4CjBxND0gswz2gfYRCUoUzCm9zCABp91EeTtWXyz0tE=
+cloud.google.com/go/osconfig v1.12.2/go.mod h1:eh9GPaMZpI6mEJEuhEjUJmaxvQ3gav+fFEJon1Y8Iw0=
+cloud.google.com/go/osconfig v1.12.3/go.mod h1:L/fPS8LL6bEYUi1au832WtMnPeQNT94Zo3FwwV1/xGM=
+cloud.google.com/go/osconfig v1.12.4/go.mod h1:B1qEwJ/jzqSRslvdOCI8Kdnp0gSng0xW4LOnIebQomA=
 cloud.google.com/go/oslogin v1.4.0/go.mod h1:YdgMXWRaElXz/lDk1Na6Fh5orF7gvmJ0FGLIs9LId4E=
 cloud.google.com/go/oslogin v1.5.0/go.mod h1:D260Qj11W2qx/HVF29zBg+0fd6YCSjSqLUkY/qEenQU=
 cloud.google.com/go/oslogin v1.6.0/go.mod h1:zOJ1O3+dTU8WPlGEkFSh7qeHPPSoxrcMbbK1Nm2iX70=
 cloud.google.com/go/oslogin v1.7.0/go.mod h1:e04SN0xO1UNJ1M5GP0vzVBFicIe4O53FOfcixIqTyXo=
 cloud.google.com/go/oslogin v1.9.0/go.mod h1:HNavntnH8nzrn8JCTT5fj18FuJLFJc4NaZJtBnQtKFs=
+cloud.google.com/go/oslogin v1.10.1/go.mod h1:x692z7yAue5nE7CsSnoG0aaMbNoRJRXO4sn73R+ZqAs=
+cloud.google.com/go/oslogin v1.11.0/go.mod h1:8GMTJs4X2nOAUVJiPGqIWVcDaF0eniEto3xlOxaboXE=
+cloud.google.com/go/oslogin v1.11.1/go.mod h1:OhD2icArCVNUxKqtK0mcSmKL7lgr0LVlQz+v9s1ujTg=
+cloud.google.com/go/oslogin v1.12.1/go.mod h1:VfwTeFJGbnakxAY236eN8fsnglLiVXndlbcNomY4iZU=
+cloud.google.com/go/oslogin v1.12.2/go.mod h1:CQ3V8Jvw4Qo4WRhNPF0o+HAM4DiLuE27Ul9CX9g2QdY=
 cloud.google.com/go/phishingprotection v0.5.0/go.mod h1:Y3HZknsK9bc9dMi+oE8Bim0lczMU6hrX0UpADuMefr0=
 cloud.google.com/go/phishingprotection v0.6.0/go.mod h1:9Y3LBLgy0kDTcYET8ZH3bq/7qni15yVUoAxiFxnlSUA=
 cloud.google.com/go/phishingprotection v0.7.0/go.mod h1:8qJI4QKHoda/sb/7/YmMQ2omRLSLYSu9bU0EKCNI+Lk=
+cloud.google.com/go/phishingprotection v0.8.1/go.mod h1:AxonW7GovcA8qdEk13NfHq9hNx5KPtfxXNeUxTDxB6I=
+cloud.google.com/go/phishingprotection v0.8.2/go.mod h1:LhJ91uyVHEYKSKcMGhOa14zMMWfbEdxG032oT6ECbC8=
+cloud.google.com/go/phishingprotection v0.8.3/go.mod h1:3B01yO7T2Ra/TMojifn8EoGd4G9jts/6cIO0DgDY9J8=
+cloud.google.com/go/phishingprotection v0.8.4/go.mod h1:6b3kNPAc2AQ6jZfFHioZKg9MQNybDg4ixFd4RPZZ2nE=
 cloud.google.com/go/policytroubleshooter v1.3.0/go.mod h1:qy0+VwANja+kKrjlQuOzmlvscn4RNsAc0e15GGqfMxg=
 cloud.google.com/go/policytroubleshooter v1.4.0/go.mod h1:DZT4BcRw3QoO8ota9xw/LKtPa8lKeCByYeKTIf/vxdE=
 cloud.google.com/go/policytroubleshooter v1.5.0/go.mod h1:Rz1WfV+1oIpPdN2VvvuboLVRsB1Hclg3CKQ53j9l8vw=
+cloud.google.com/go/policytroubleshooter v1.6.0/go.mod h1:zYqaPTsmfvpjm5ULxAyD/lINQxJ0DDsnWOP/GZ7xzBc=
+cloud.google.com/go/policytroubleshooter v1.7.1/go.mod h1:0NaT5v3Ag1M7U5r0GfDCpUFkWd9YqpubBWsQlhanRv0=
+cloud.google.com/go/policytroubleshooter v1.8.0/go.mod h1:tmn5Ir5EToWe384EuboTcVQT7nTag2+DuH3uHmKd1HU=
+cloud.google.com/go/policytroubleshooter v1.9.0/go.mod h1:+E2Lga7TycpeSTj2FsH4oXxTnrbHJGRlKhVZBLGgU64=
+cloud.google.com/go/policytroubleshooter v1.9.1/go.mod h1:MYI8i0bCrL8cW+VHN1PoiBTyNZTstCg2WUw2eVC4c4U=
+cloud.google.com/go/policytroubleshooter v1.10.1/go.mod h1:5C0rhT3TDZVxAu8813bwmTvd57Phbl8mr9F4ipOsxEs=
+cloud.google.com/go/policytroubleshooter v1.10.2/go.mod h1:m4uF3f6LseVEnMV6nknlN2vYGRb+75ylQwJdnOXfnv0=
 cloud.google.com/go/privatecatalog v0.5.0/go.mod h1:XgosMUvvPyxDjAVNDYxJ7wBW8//hLDDYmnsNcMGq1K0=
 cloud.google.com/go/privatecatalog v0.6.0/go.mod h1:i/fbkZR0hLN29eEWiiwue8Pb+GforiEIBnV9yrRUOKI=
 cloud.google.com/go/privatecatalog v0.7.0/go.mod h1:2s5ssIFO69F5csTXcwBP7NPFTZvps26xGzvQ2PQaBYg=
+cloud.google.com/go/privatecatalog v0.8.0/go.mod h1:nQ6pfaegeDAq/Q5lrfCQzQLhubPiZhSaNhIgfJlnIXs=
+cloud.google.com/go/privatecatalog v0.9.1/go.mod h1:0XlDXW2unJXdf9zFz968Hp35gl/bhF4twwpXZAW50JA=
+cloud.google.com/go/privatecatalog v0.9.2/go.mod h1:RMA4ATa8IXfzvjrhhK8J6H4wwcztab+oZph3c6WmtFc=
+cloud.google.com/go/privatecatalog v0.9.3/go.mod h1:K5pn2GrVmOPjXz3T26mzwXLcKivfIJ9R5N79AFCF9UE=
+cloud.google.com/go/privatecatalog v0.9.4/go.mod h1:SOjm93f+5hp/U3PqMZAHTtBtluqLygrDrVO8X8tYtG0=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
@@ -388,8 +850,13 @@ cloud.google.com/go/pubsub v1.19.0/go.mod h1:/O9kmSe9bb9KRnIAWkzmqhPjHo6LtzGOBYd
 cloud.google.com/go/pubsub v1.26.0/go.mod h1:QgBH3U/jdJy/ftjPhTkyXNj543Tin1pRYcdcPRnFIRI=
 cloud.google.com/go/pubsub v1.27.1/go.mod h1:hQN39ymbV9geqBnfQq6Xf63yNhUAhv9CZhzp5O6qsW0=
 cloud.google.com/go/pubsub v1.28.0/go.mod h1:vuXFpwaVoIPQMGXqRyUQigu/AX1S3IWugR9xznmcXX8=
+cloud.google.com/go/pubsub v1.30.0/go.mod h1:qWi1OPS0B+b5L+Sg6Gmc9zD1Y+HaM0MdUr7LsupY1P4=
+cloud.google.com/go/pubsub v1.32.0/go.mod h1:f+w71I33OMyxf9VpMVcZbnG5KSUkCOUHYpFd5U1GdRc=
+cloud.google.com/go/pubsub v1.33.0/go.mod h1:f+w71I33OMyxf9VpMVcZbnG5KSUkCOUHYpFd5U1GdRc=
 cloud.google.com/go/pubsublite v1.5.0/go.mod h1:xapqNQ1CuLfGi23Yda/9l4bBCKz/wC3KIJ5gKcxveZg=
 cloud.google.com/go/pubsublite v1.6.0/go.mod h1:1eFCS0U11xlOuMFV/0iBqw3zP12kddMeCbj/F3FSj9k=
+cloud.google.com/go/pubsublite v1.7.0/go.mod h1:8hVMwRXfDfvGm3fahVbtDbiLePT3gpoiJYJY+vxWxVM=
+cloud.google.com/go/pubsublite v1.8.1/go.mod h1:fOLdU4f5xldK4RGJrBMm+J7zMWNj/k4PxwEZXy39QS0=
 cloud.google.com/go/recaptchaenterprise v1.3.1/go.mod h1:OdD+q+y4XGeAlxRaMn1Y7/GveP6zmq76byL6tjPE7d4=
 cloud.google.com/go/recaptchaenterprise/v2 v2.1.0/go.mod h1:w9yVqajwroDNTfGuhmOjPDN//rZGySaf6PtFVcSCa7o=
 cloud.google.com/go/recaptchaenterprise/v2 v2.2.0/go.mod h1:/Zu5jisWGeERrd5HnlS3EUGb/D335f9k51B/FVil0jk=
@@ -397,78 +864,165 @@ cloud.google.com/go/recaptchaenterprise/v2 v2.3.0/go.mod h1:O9LwGCjrhGHBQET5CA7d
 cloud.google.com/go/recaptchaenterprise/v2 v2.4.0/go.mod h1:Am3LHfOuBstrLrNCBrlI5sbwx9LBg3te2N6hGvHn2mE=
 cloud.google.com/go/recaptchaenterprise/v2 v2.5.0/go.mod h1:O8LzcHXN3rz0j+LBC91jrwI3R+1ZSZEWrfL7XHgNo9U=
 cloud.google.com/go/recaptchaenterprise/v2 v2.6.0/go.mod h1:RPauz9jeLtB3JVzg6nCbe12qNoaa8pXc4d/YukAmcnA=
+cloud.google.com/go/recaptchaenterprise/v2 v2.7.0/go.mod h1:19wVj/fs5RtYtynAPJdDTb69oW0vNHYDBTbB4NvMD9c=
+cloud.google.com/go/recaptchaenterprise/v2 v2.7.2/go.mod h1:kR0KjsJS7Jt1YSyWFkseQ756D45kaYNTlDPPaRAvDBU=
+cloud.google.com/go/recaptchaenterprise/v2 v2.8.0/go.mod h1:QuE8EdU9dEnesG8/kG3XuJyNsjEqMlMzg3v3scCJ46c=
+cloud.google.com/go/recaptchaenterprise/v2 v2.8.1/go.mod h1:JZYZJOeZjgSSTGP4uz7NlQ4/d1w5hGmksVgM0lbEij0=
+cloud.google.com/go/recaptchaenterprise/v2 v2.8.2/go.mod h1:kpaDBOpkwD4G0GVMzG1W6Doy1tFFC97XAV3xy+Rd/pw=
+cloud.google.com/go/recaptchaenterprise/v2 v2.8.3/go.mod h1:Dak54rw6lC2gBY8FBznpOCAR58wKf+R+ZSJRoeJok4w=
+cloud.google.com/go/recaptchaenterprise/v2 v2.8.4/go.mod h1:Dak54rw6lC2gBY8FBznpOCAR58wKf+R+ZSJRoeJok4w=
 cloud.google.com/go/recommendationengine v0.5.0/go.mod h1:E5756pJcVFeVgaQv3WNpImkFP8a+RptV6dDLGPILjvg=
 cloud.google.com/go/recommendationengine v0.6.0/go.mod h1:08mq2umu9oIqc7tDy8sx+MNJdLG0fUi3vaSVbztHgJ4=
 cloud.google.com/go/recommendationengine v0.7.0/go.mod h1:1reUcE3GIu6MeBz/h5xZJqNLuuVjNg1lmWMPyjatzac=
+cloud.google.com/go/recommendationengine v0.8.1/go.mod h1:MrZihWwtFYWDzE6Hz5nKcNz3gLizXVIDI/o3G1DLcrE=
+cloud.google.com/go/recommendationengine v0.8.2/go.mod h1:QIybYHPK58qir9CV2ix/re/M//Ty10OxjnnhWdaKS1Y=
+cloud.google.com/go/recommendationengine v0.8.3/go.mod h1:m3b0RZV02BnODE9FeSvGv1qibFo8g0OnmB/RMwYy4V8=
+cloud.google.com/go/recommendationengine v0.8.4/go.mod h1:GEteCf1PATl5v5ZsQ60sTClUE0phbWmo3rQ1Js8louU=
 cloud.google.com/go/recommender v1.5.0/go.mod h1:jdoeiBIVrJe9gQjwd759ecLJbxCDED4A6p+mqoqDvTg=
 cloud.google.com/go/recommender v1.6.0/go.mod h1:+yETpm25mcoiECKh9DEScGzIRyDKpZ0cEhWGo+8bo+c=
 cloud.google.com/go/recommender v1.7.0/go.mod h1:XLHs/W+T8olwlGOgfQenXBTbIseGclClff6lhFVe9Bs=
 cloud.google.com/go/recommender v1.8.0/go.mod h1:PkjXrTT05BFKwxaUxQmtIlrtj0kph108r02ZZQ5FE70=
 cloud.google.com/go/recommender v1.9.0/go.mod h1:PnSsnZY7q+VL1uax2JWkt/UegHssxjUVVCrX52CuEmQ=
+cloud.google.com/go/recommender v1.10.1/go.mod h1:XFvrE4Suqn5Cq0Lf+mCP6oBHD/yRMA8XxP5sb7Q7gpA=
+cloud.google.com/go/recommender v1.11.0/go.mod h1:kPiRQhPyTJ9kyXPCG6u/dlPLbYfFlkwHNRwdzPVAoII=
+cloud.google.com/go/recommender v1.11.1/go.mod h1:sGwFFAyI57v2Hc5LbIj+lTwXipGu9NW015rkaEM5B18=
+cloud.google.com/go/recommender v1.11.2/go.mod h1:AeoJuzOvFR/emIcXdVFkspVXVTYpliRCmKNYDnyBv6Y=
+cloud.google.com/go/recommender v1.11.3/go.mod h1:+FJosKKJSId1MBFeJ/TTyoGQZiEelQQIZMKYYD8ruK4=
 cloud.google.com/go/redis v1.7.0/go.mod h1:V3x5Jq1jzUcg+UNsRvdmsfuFnit1cfe3Z/PGyq/lm4Y=
 cloud.google.com/go/redis v1.8.0/go.mod h1:Fm2szCDavWzBk2cDKxrkmWBqoCiL1+Ctwq7EyqBCA/A=
 cloud.google.com/go/redis v1.9.0/go.mod h1:HMYQuajvb2D0LvMgZmLDZW8V5aOC/WxstZHiy4g8OiA=
 cloud.google.com/go/redis v1.10.0/go.mod h1:ThJf3mMBQtW18JzGgh41/Wld6vnDDc/F/F35UolRZPM=
 cloud.google.com/go/redis v1.11.0/go.mod h1:/X6eicana+BWcUda5PpwZC48o37SiFVTFSs0fWAJ7uQ=
+cloud.google.com/go/redis v1.13.1/go.mod h1:VP7DGLpE91M6bcsDdMuyCm2hIpB6Vp2hI090Mfd1tcg=
+cloud.google.com/go/redis v1.13.2/go.mod h1:0Hg7pCMXS9uz02q+LoEVl5dNHUkIQv+C/3L76fandSA=
+cloud.google.com/go/redis v1.13.3/go.mod h1:vbUpCKUAZSYzFcWKmICnYgRAhTFg9r+djWqFxDYXi4U=
+cloud.google.com/go/redis v1.14.1/go.mod h1:MbmBxN8bEnQI4doZPC1BzADU4HGocHBk2de3SbgOkqs=
 cloud.google.com/go/resourcemanager v1.3.0/go.mod h1:bAtrTjZQFJkiWTPDb1WBjzvc6/kifjj4QBYuKCCoqKA=
 cloud.google.com/go/resourcemanager v1.4.0/go.mod h1:MwxuzkumyTX7/a3n37gmsT3py7LIXwrShilPh3P1tR0=
 cloud.google.com/go/resourcemanager v1.5.0/go.mod h1:eQoXNAiAvCf5PXxWxXjhKQoTMaUSNrEfg+6qdf/wots=
+cloud.google.com/go/resourcemanager v1.6.0/go.mod h1:YcpXGRs8fDzcUl1Xw8uOVmI8JEadvhRIkoXXUNVYcVo=
+cloud.google.com/go/resourcemanager v1.7.0/go.mod h1:HlD3m6+bwhzj9XCouqmeiGuni95NTrExfhoSrkC/3EI=
+cloud.google.com/go/resourcemanager v1.9.1/go.mod h1:dVCuosgrh1tINZ/RwBufr8lULmWGOkPS8gL5gqyjdT8=
+cloud.google.com/go/resourcemanager v1.9.2/go.mod h1:OujkBg1UZg5lX2yIyMo5Vz9O5hf7XQOSV7WxqxxMtQE=
+cloud.google.com/go/resourcemanager v1.9.3/go.mod h1:IqrY+g0ZgLsihcfcmqSe+RKp1hzjXwG904B92AwBz6U=
+cloud.google.com/go/resourcemanager v1.9.4/go.mod h1:N1dhP9RFvo3lUfwtfLWVxfUWq8+KUQ+XLlHLH3BoFJ0=
 cloud.google.com/go/resourcesettings v1.3.0/go.mod h1:lzew8VfESA5DQ8gdlHwMrqZs1S9V87v3oCnKCWoOuQU=
 cloud.google.com/go/resourcesettings v1.4.0/go.mod h1:ldiH9IJpcrlC3VSuCGvjR5of/ezRrOxFtpJoJo5SmXg=
 cloud.google.com/go/resourcesettings v1.5.0/go.mod h1:+xJF7QSG6undsQDfsCJyqWXyBwUoJLhetkRMDRnIoXA=
+cloud.google.com/go/resourcesettings v1.6.1/go.mod h1:M7mk9PIZrC5Fgsu1kZJci6mpgN8o0IUzVx3eJU3y4Jw=
+cloud.google.com/go/resourcesettings v1.6.2/go.mod h1:mJIEDd9MobzunWMeniaMp6tzg4I2GvD3TTmPkc8vBXk=
+cloud.google.com/go/resourcesettings v1.6.3/go.mod h1:pno5D+7oDYkMWZ5BpPsb4SO0ewg3IXcmmrUZaMJrFic=
+cloud.google.com/go/resourcesettings v1.6.4/go.mod h1:pYTTkWdv2lmQcjsthbZLNBP4QW140cs7wqA3DuqErVI=
 cloud.google.com/go/retail v1.8.0/go.mod h1:QblKS8waDmNUhghY2TI9O3JLlFk8jybHeV4BF19FrE4=
 cloud.google.com/go/retail v1.9.0/go.mod h1:g6jb6mKuCS1QKnH/dpu7isX253absFl6iE92nHwlBUY=
 cloud.google.com/go/retail v1.10.0/go.mod h1:2gDk9HsL4HMS4oZwz6daui2/jmKvqShXKQuB2RZ+cCc=
 cloud.google.com/go/retail v1.11.0/go.mod h1:MBLk1NaWPmh6iVFSz9MeKG/Psyd7TAgm6y/9L2B4x9Y=
 cloud.google.com/go/retail v1.12.0/go.mod h1:UMkelN/0Z8XvKymXFbD4EhFJlYKRx1FGhQkVPU5kF14=
+cloud.google.com/go/retail v1.14.1/go.mod h1:y3Wv3Vr2k54dLNIrCzenyKG8g8dhvhncT2NcNjb/6gE=
+cloud.google.com/go/retail v1.14.2/go.mod h1:W7rrNRChAEChX336QF7bnMxbsjugcOCPU44i5kbLiL8=
+cloud.google.com/go/retail v1.14.3/go.mod h1:Omz2akDHeSlfCq8ArPKiBxlnRpKEBjUH386JYFLUvXo=
+cloud.google.com/go/retail v1.14.4/go.mod h1:l/N7cMtY78yRnJqp5JW8emy7MB1nz8E4t2yfOmklYfg=
 cloud.google.com/go/run v0.2.0/go.mod h1:CNtKsTA1sDcnqqIFR3Pb5Tq0usWxJJvsWOCPldRU3Do=
 cloud.google.com/go/run v0.3.0/go.mod h1:TuyY1+taHxTjrD0ZFk2iAR+xyOXEA0ztb7U3UNA0zBo=
 cloud.google.com/go/run v0.8.0/go.mod h1:VniEnuBwqjigv0A7ONfQUaEItaiCRVujlMqerPPiktM=
+cloud.google.com/go/run v0.9.0/go.mod h1:Wwu+/vvg8Y+JUApMwEDfVfhetv30hCG4ZwDR/IXl2Qg=
+cloud.google.com/go/run v1.2.0/go.mod h1:36V1IlDzQ0XxbQjUx6IYbw8H3TJnWvhii963WW3B/bo=
+cloud.google.com/go/run v1.3.0/go.mod h1:S/osX/4jIPZGg+ssuqh6GNgg7syixKe3YnprwehzHKU=
+cloud.google.com/go/run v1.3.1/go.mod h1:cymddtZOzdwLIAsmS6s+Asl4JoXIDm/K1cpZTxV4Q5s=
+cloud.google.com/go/run v1.3.2/go.mod h1:SIhmqArbjdU/D9M6JoHaAqnAMKLFtXaVdNeq04NjnVE=
+cloud.google.com/go/run v1.3.3/go.mod h1:WSM5pGyJ7cfYyYbONVQBN4buz42zFqwG67Q3ch07iK4=
 cloud.google.com/go/scheduler v1.4.0/go.mod h1:drcJBmxF3aqZJRhmkHQ9b3uSSpQoltBPGPxGAWROx6s=
 cloud.google.com/go/scheduler v1.5.0/go.mod h1:ri073ym49NW3AfT6DZi21vLZrG07GXr5p3H1KxN5QlI=
 cloud.google.com/go/scheduler v1.6.0/go.mod h1:SgeKVM7MIwPn3BqtcBntpLyrIJftQISRrYB5ZtT+KOk=
 cloud.google.com/go/scheduler v1.7.0/go.mod h1:jyCiBqWW956uBjjPMMuX09n3x37mtyPJegEWKxRsn44=
 cloud.google.com/go/scheduler v1.8.0/go.mod h1:TCET+Y5Gp1YgHT8py4nlg2Sew8nUHMqcpousDgXJVQc=
+cloud.google.com/go/scheduler v1.9.0/go.mod h1:yexg5t+KSmqu+njTIh3b7oYPheFtBWGcbVUYF1GGMIc=
+cloud.google.com/go/scheduler v1.10.1/go.mod h1:R63Ldltd47Bs4gnhQkmNDse5w8gBRrhObZ54PxgR2Oo=
+cloud.google.com/go/scheduler v1.10.2/go.mod h1:O3jX6HRH5eKCA3FutMw375XHZJudNIKVonSCHv7ropY=
+cloud.google.com/go/scheduler v1.10.3/go.mod h1:8ANskEM33+sIbpJ+R4xRfw/jzOG+ZFE8WVLy7/yGvbc=
+cloud.google.com/go/scheduler v1.10.4/go.mod h1:MTuXcrJC9tqOHhixdbHDFSIuh7xZF2IysiINDuiq6NI=
+cloud.google.com/go/scheduler v1.10.5/go.mod h1:MTuXcrJC9tqOHhixdbHDFSIuh7xZF2IysiINDuiq6NI=
 cloud.google.com/go/secretmanager v1.3.0/go.mod h1:+oLTkouyiYiabAQNugCeTS3PAArGiMJuBqvJnJsyH+U=
 cloud.google.com/go/secretmanager v1.6.0/go.mod h1:awVa/OXF6IiyaU1wQ34inzQNc4ISIDIrId8qE5QGgKA=
 cloud.google.com/go/secretmanager v1.8.0/go.mod h1:hnVgi/bN5MYHd3Gt0SPuTPPp5ENina1/LxM+2W9U9J4=
 cloud.google.com/go/secretmanager v1.9.0/go.mod h1:b71qH2l1yHmWQHt9LC80akm86mX8AL6X1MA01dW8ht4=
 cloud.google.com/go/secretmanager v1.10.0/go.mod h1:MfnrdvKMPNra9aZtQFvBcvRU54hbPD8/HayQdlUgJpU=
+cloud.google.com/go/secretmanager v1.11.1/go.mod h1:znq9JlXgTNdBeQk9TBW/FnR/W4uChEKGeqQWAJ8SXFw=
+cloud.google.com/go/secretmanager v1.11.2/go.mod h1:MQm4t3deoSub7+WNwiC4/tRYgDBHJgJPvswqQVB1Vss=
+cloud.google.com/go/secretmanager v1.11.3/go.mod h1:0bA2o6FabmShrEy328i67aV+65XoUFFSmVeLBn/51jI=
+cloud.google.com/go/secretmanager v1.11.4/go.mod h1:wreJlbS9Zdq21lMzWmJ0XhWW2ZxgPeahsqeV/vZoJ3w=
 cloud.google.com/go/security v1.5.0/go.mod h1:lgxGdyOKKjHL4YG3/YwIL2zLqMFCKs0UbQwgyZmfJl4=
 cloud.google.com/go/security v1.7.0/go.mod h1:mZklORHl6Bg7CNnnjLH//0UlAlaXqiG7Lb9PsPXLfD0=
 cloud.google.com/go/security v1.8.0/go.mod h1:hAQOwgmaHhztFhiQ41CjDODdWP0+AE1B3sX4OFlq+GU=
 cloud.google.com/go/security v1.9.0/go.mod h1:6Ta1bO8LXI89nZnmnsZGp9lVoVWXqsVbIq/t9dzI+2Q=
 cloud.google.com/go/security v1.10.0/go.mod h1:QtOMZByJVlibUT2h9afNDWRZ1G96gVywH8T5GUSb9IA=
 cloud.google.com/go/security v1.12.0/go.mod h1:rV6EhrpbNHrrxqlvW0BWAIawFWq3X90SduMJdFwtLB8=
+cloud.google.com/go/security v1.13.0/go.mod h1:Q1Nvxl1PAgmeW0y3HTt54JYIvUdtcpYKVfIB8AOMZ+0=
+cloud.google.com/go/security v1.15.1/go.mod h1:MvTnnbsWnehoizHi09zoiZob0iCHVcL4AUBj76h9fXA=
+cloud.google.com/go/security v1.15.2/go.mod h1:2GVE/v1oixIRHDaClVbHuPcZwAqFM28mXuAKCfMgYIg=
+cloud.google.com/go/security v1.15.3/go.mod h1:gQ/7Q2JYUZZgOzqKtw9McShH+MjNvtDpL40J1cT+vBs=
+cloud.google.com/go/security v1.15.4/go.mod h1:oN7C2uIZKhxCLiAAijKUCuHLZbIt/ghYEo8MqwD/Ty4=
 cloud.google.com/go/securitycenter v1.13.0/go.mod h1:cv5qNAqjY84FCN6Y9z28WlkKXyWsgLO832YiWwkCWcU=
 cloud.google.com/go/securitycenter v1.14.0/go.mod h1:gZLAhtyKv85n52XYWt6RmeBdydyxfPeTrpToDPw4Auc=
 cloud.google.com/go/securitycenter v1.15.0/go.mod h1:PeKJ0t8MoFmmXLXWm41JidyzI3PJjd8sXWaVqg43WWk=
 cloud.google.com/go/securitycenter v1.16.0/go.mod h1:Q9GMaLQFUD+5ZTabrbujNWLtSLZIZF7SAR0wWECrjdk=
 cloud.google.com/go/securitycenter v1.18.1/go.mod h1:0/25gAzCM/9OL9vVx4ChPeM/+DlfGQJDwBy/UC8AKK0=
+cloud.google.com/go/securitycenter v1.19.0/go.mod h1:LVLmSg8ZkkyaNy4u7HCIshAngSQ8EcIRREP3xBnyfag=
+cloud.google.com/go/securitycenter v1.23.0/go.mod h1:8pwQ4n+Y9WCWM278R8W3nF65QtY172h4S8aXyI9/hsQ=
+cloud.google.com/go/securitycenter v1.23.1/go.mod h1:w2HV3Mv/yKhbXKwOCu2i8bCuLtNP1IMHuiYQn4HJq5s=
+cloud.google.com/go/securitycenter v1.24.1/go.mod h1:3h9IdjjHhVMXdQnmqzVnM7b0wMn/1O/U20eWVpMpZjI=
+cloud.google.com/go/securitycenter v1.24.2/go.mod h1:l1XejOngggzqwr4Fa2Cn+iWZGf+aBLTXtB/vXjy5vXM=
 cloud.google.com/go/servicecontrol v1.4.0/go.mod h1:o0hUSJ1TXJAmi/7fLJAedOovnujSEvjKCAFNXPQ1RaU=
 cloud.google.com/go/servicecontrol v1.5.0/go.mod h1:qM0CnXHhyqKVuiZnGKrIurvVImCs8gmqWsDoqe9sU1s=
+cloud.google.com/go/servicecontrol v1.10.0/go.mod h1:pQvyvSRh7YzUF2efw7H87V92mxU8FnFDawMClGCNuAA=
 cloud.google.com/go/servicecontrol v1.11.0/go.mod h1:kFmTzYzTUIuZs0ycVqRHNaNhgR+UMUpw9n02l/pY+mc=
+cloud.google.com/go/servicecontrol v1.11.1/go.mod h1:aSnNNlwEFBY+PWGQ2DoM0JJ/QUXqV5/ZD9DOLB7SnUk=
 cloud.google.com/go/servicedirectory v1.4.0/go.mod h1:gH1MUaZCgtP7qQiI+F+A+OpeKF/HQWgtAddhTbhL2bs=
 cloud.google.com/go/servicedirectory v1.5.0/go.mod h1:QMKFL0NUySbpZJ1UZs3oFAmdvVxhhxB6eJ/Vlp73dfg=
 cloud.google.com/go/servicedirectory v1.6.0/go.mod h1:pUlbnWsLH9c13yGkxCmfumWEPjsRs1RlmJ4pqiNjVL4=
 cloud.google.com/go/servicedirectory v1.7.0/go.mod h1:5p/U5oyvgYGYejufvxhgwjL8UVXjkuw7q5XcG10wx1U=
 cloud.google.com/go/servicedirectory v1.8.0/go.mod h1:srXodfhY1GFIPvltunswqXpVxFPpZjf8nkKQT7XcXaY=
+cloud.google.com/go/servicedirectory v1.9.0/go.mod h1:29je5JjiygNYlmsGz8k6o+OZ8vd4f//bQLtvzkPPT/s=
+cloud.google.com/go/servicedirectory v1.10.1/go.mod h1:Xv0YVH8s4pVOwfM/1eMTl0XJ6bzIOSLDt8f8eLaGOxQ=
+cloud.google.com/go/servicedirectory v1.11.0/go.mod h1:Xv0YVH8s4pVOwfM/1eMTl0XJ6bzIOSLDt8f8eLaGOxQ=
+cloud.google.com/go/servicedirectory v1.11.1/go.mod h1:tJywXimEWzNzw9FvtNjsQxxJ3/41jseeILgwU/QLrGI=
+cloud.google.com/go/servicedirectory v1.11.2/go.mod h1:KD9hCLhncWRV5jJphwIpugKwM5bn1x0GyVVD4NO8mGg=
+cloud.google.com/go/servicedirectory v1.11.3/go.mod h1:LV+cHkomRLr67YoQy3Xq2tUXBGOs5z5bPofdq7qtiAw=
 cloud.google.com/go/servicemanagement v1.4.0/go.mod h1:d8t8MDbezI7Z2R1O/wu8oTggo3BI2GKYbdG4y/SJTco=
 cloud.google.com/go/servicemanagement v1.5.0/go.mod h1:XGaCRe57kfqu4+lRxaFEAuqmjzF0r+gWHjWqKqBvKFo=
 cloud.google.com/go/servicemanagement v1.6.0/go.mod h1:aWns7EeeCOtGEX4OvZUWCCJONRZeFKiptqKf1D0l/Jc=
+cloud.google.com/go/servicemanagement v1.8.0/go.mod h1:MSS2TDlIEQD/fzsSGfCdJItQveu9NXnUniTrq/L8LK4=
 cloud.google.com/go/serviceusage v1.3.0/go.mod h1:Hya1cozXM4SeSKTAgGXgj97GlqUvF5JaoXacR1JTP/E=
 cloud.google.com/go/serviceusage v1.4.0/go.mod h1:SB4yxXSaYVuUBYUml6qklyONXNLt83U0Rb+CXyhjEeU=
 cloud.google.com/go/serviceusage v1.5.0/go.mod h1:w8U1JvqUqwJNPEOTQjrMHkw3IaIFLoLsPLvsE3xueec=
+cloud.google.com/go/serviceusage v1.6.0/go.mod h1:R5wwQcbOWsyuOfbP9tGdAnCAc6B9DRwPG1xtWMDeuPA=
 cloud.google.com/go/shell v1.3.0/go.mod h1:VZ9HmRjZBsjLGXusm7K5Q5lzzByZmJHf1d0IWHEN5X4=
 cloud.google.com/go/shell v1.4.0/go.mod h1:HDxPzZf3GkDdhExzD/gs8Grqk+dmYcEjGShZgYa9URw=
 cloud.google.com/go/shell v1.6.0/go.mod h1:oHO8QACS90luWgxP3N9iZVuEiSF84zNyLytb+qE2f9A=
+cloud.google.com/go/shell v1.7.1/go.mod h1:u1RaM+huXFaTojTbW4g9P5emOrrmLE69KrxqQahKn4g=
+cloud.google.com/go/shell v1.7.2/go.mod h1:KqRPKwBV0UyLickMn0+BY1qIyE98kKyI216sH/TuHmc=
+cloud.google.com/go/shell v1.7.3/go.mod h1:cTTEz/JdaBsQAeTQ3B6HHldZudFoYBOqjteev07FbIc=
+cloud.google.com/go/shell v1.7.4/go.mod h1:yLeXB8eKLxw0dpEmXQ/FjriYrBijNsONpwnWsdPqlKM=
 cloud.google.com/go/spanner v1.41.0/go.mod h1:MLYDBJR/dY4Wt7ZaMIQ7rXOTLjYrmxLE/5ve9vFfWos=
 cloud.google.com/go/spanner v1.44.0/go.mod h1:G8XIgYdOK+Fbcpbs7p2fiprDw4CaZX63whnSMLVBxjk=
+cloud.google.com/go/spanner v1.45.0/go.mod h1:FIws5LowYz8YAE1J8fOS7DJup8ff7xJeetWEo5REA2M=
+cloud.google.com/go/spanner v1.47.0/go.mod h1:IXsJwVW2j4UKs0eYDqodab6HgGuA1bViSqW4uH9lfUI=
+cloud.google.com/go/spanner v1.49.0/go.mod h1:eGj9mQGK8+hkgSVbHNQ06pQ4oS+cyc4tXXd6Dif1KoM=
+cloud.google.com/go/spanner v1.50.0/go.mod h1:eGj9mQGK8+hkgSVbHNQ06pQ4oS+cyc4tXXd6Dif1KoM=
+cloud.google.com/go/spanner v1.51.0/go.mod h1:c5KNo5LQ1X5tJwma9rSQZsXNBDNvj4/n8BVc3LNahq0=
+cloud.google.com/go/spanner v1.53.0/go.mod h1:liG4iCeLqm5L3fFLU5whFITqP0e0orsAW1uUSrd4rws=
 cloud.google.com/go/speech v1.6.0/go.mod h1:79tcr4FHCimOp56lwC01xnt/WPJZc4v3gzyT7FoBkCM=
 cloud.google.com/go/speech v1.7.0/go.mod h1:KptqL+BAQIhMsj1kOP2la5DSEEerPDuOP/2mmkhHhZQ=
 cloud.google.com/go/speech v1.8.0/go.mod h1:9bYIl1/tjsAnMgKGHKmBZzXKEkGgtU+MpdDPTE9f7y0=
 cloud.google.com/go/speech v1.9.0/go.mod h1:xQ0jTcmnRFFM2RfX/U+rk6FQNUF6DQlydUSyoooSpco=
 cloud.google.com/go/speech v1.14.1/go.mod h1:gEosVRPJ9waG7zqqnsHpYTOoAS4KouMRLDFMekpJ0J0=
+cloud.google.com/go/speech v1.15.0/go.mod h1:y6oH7GhqCaZANH7+Oe0BhgIogsNInLlz542tg3VqeYI=
+cloud.google.com/go/speech v1.17.1/go.mod h1:8rVNzU43tQvxDaGvqOhpDqgkJTFowBpDvCJ14kGlJYo=
+cloud.google.com/go/speech v1.19.0/go.mod h1:8rVNzU43tQvxDaGvqOhpDqgkJTFowBpDvCJ14kGlJYo=
+cloud.google.com/go/speech v1.19.1/go.mod h1:WcuaWz/3hOlzPFOVo9DUsblMIHwxP589y6ZMtaG+iAA=
+cloud.google.com/go/speech v1.19.2/go.mod h1:2OYFfj+Ch5LWjsaSINuCZsre/789zlcCI3SY4oAi2oI=
+cloud.google.com/go/speech v1.20.1/go.mod h1:wwolycgONvfz2EDU8rKuHRW3+wc9ILPsAWoikBEWavY=
+cloud.google.com/go/speech v1.21.0/go.mod h1:wwolycgONvfz2EDU8rKuHRW3+wc9ILPsAWoikBEWavY=
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
 cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
@@ -480,65 +1034,143 @@ cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq
 cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc=
 cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s=
 cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
-cloud.google.com/go/storage v1.30.1 h1:uOdMxAs8HExqBlnLtnQyP0YkvbiDpdGShGKtx6U/oNM=
+cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
 cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7BiccwkR7+P7gN8E=
+cloud.google.com/go/storage v1.36.0 h1:P0mOkAcaJxhCTvAkMhxMfrTKiNcub4YmmPBtlhAyTr8=
+cloud.google.com/go/storage v1.36.0/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8=
 cloud.google.com/go/storagetransfer v1.5.0/go.mod h1:dxNzUopWy7RQevYFHewchb29POFv3/AaBgnhqzqiK0w=
 cloud.google.com/go/storagetransfer v1.6.0/go.mod h1:y77xm4CQV/ZhFZH75PLEXY0ROiS7Gh6pSKrM8dJyg6I=
 cloud.google.com/go/storagetransfer v1.7.0/go.mod h1:8Giuj1QNb1kfLAiWM1bN6dHzfdlDAVC9rv9abHot2W4=
+cloud.google.com/go/storagetransfer v1.8.0/go.mod h1:JpegsHHU1eXg7lMHkvf+KE5XDJ7EQu0GwNJbbVGanEw=
+cloud.google.com/go/storagetransfer v1.10.0/go.mod h1:DM4sTlSmGiNczmV6iZyceIh2dbs+7z2Ayg6YAiQlYfA=
+cloud.google.com/go/storagetransfer v1.10.1/go.mod h1:rS7Sy0BtPviWYTTJVWCSV4QrbBitgPeuK4/FKa4IdLs=
+cloud.google.com/go/storagetransfer v1.10.2/go.mod h1:meIhYQup5rg9juQJdyppnA/WLQCOguxtk1pr3/vBWzA=
+cloud.google.com/go/storagetransfer v1.10.3/go.mod h1:Up8LY2p6X68SZ+WToswpQbQHnJpOty/ACcMafuey8gc=
 cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw=
 cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g=
 cloud.google.com/go/talent v1.3.0/go.mod h1:CmcxwJ/PKfRgd1pBjQgU6W3YBwiewmUzQYH5HHmSCmM=
 cloud.google.com/go/talent v1.4.0/go.mod h1:ezFtAgVuRf8jRsvyE6EwmbTK5LKciD4KVnHuDEFmOOA=
 cloud.google.com/go/talent v1.5.0/go.mod h1:G+ODMj9bsasAEJkQSzO2uHQWXHHXUomArjWQQYkqK6c=
+cloud.google.com/go/talent v1.6.2/go.mod h1:CbGvmKCG61mkdjcqTcLOkb2ZN1SrQI8MDyma2l7VD24=
+cloud.google.com/go/talent v1.6.3/go.mod h1:xoDO97Qd4AK43rGjJvyBHMskiEf3KulgYzcH6YWOVoo=
+cloud.google.com/go/talent v1.6.4/go.mod h1:QsWvi5eKeh6gG2DlBkpMaFYZYrYUnIpo34f6/V5QykY=
+cloud.google.com/go/talent v1.6.5/go.mod h1:Mf5cma696HmE+P2BWJ/ZwYqeJXEeU0UqjHFXVLadEDI=
 cloud.google.com/go/texttospeech v1.4.0/go.mod h1:FX8HQHA6sEpJ7rCMSfXuzBcysDAuWusNNNvN9FELDd8=
 cloud.google.com/go/texttospeech v1.5.0/go.mod h1:oKPLhR4n4ZdQqWKURdwxMy0uiTS1xU161C8W57Wkea4=
 cloud.google.com/go/texttospeech v1.6.0/go.mod h1:YmwmFT8pj1aBblQOI3TfKmwibnsfvhIBzPXcW4EBovc=
+cloud.google.com/go/texttospeech v1.7.1/go.mod h1:m7QfG5IXxeneGqTapXNxv2ItxP/FS0hCZBwXYqucgSk=
+cloud.google.com/go/texttospeech v1.7.2/go.mod h1:VYPT6aTOEl3herQjFHYErTlSZJ4vB00Q2ZTmuVgluD4=
+cloud.google.com/go/texttospeech v1.7.3/go.mod h1:Av/zpkcgWfXlDLRYob17lqMstGZ3GqlvJXqKMp2u8so=
+cloud.google.com/go/texttospeech v1.7.4/go.mod h1:vgv0002WvR4liGuSd5BJbWy4nDn5Ozco0uJymY5+U74=
 cloud.google.com/go/tpu v1.3.0/go.mod h1:aJIManG0o20tfDQlRIej44FcwGGl/cD0oiRyMKG19IQ=
 cloud.google.com/go/tpu v1.4.0/go.mod h1:mjZaX8p0VBgllCzF6wcU2ovUXN9TONFLd7iz227X2Xg=
 cloud.google.com/go/tpu v1.5.0/go.mod h1:8zVo1rYDFuW2l4yZVY0R0fb/v44xLh3llq7RuV61fPM=
+cloud.google.com/go/tpu v1.6.1/go.mod h1:sOdcHVIgDEEOKuqUoi6Fq53MKHJAtOwtz0GuKsWSH3E=
+cloud.google.com/go/tpu v1.6.2/go.mod h1:NXh3NDwt71TsPZdtGWgAG5ThDfGd32X1mJ2cMaRlVgU=
+cloud.google.com/go/tpu v1.6.3/go.mod h1:lxiueqfVMlSToZY1151IaZqp89ELPSrk+3HIQ5HRkbY=
+cloud.google.com/go/tpu v1.6.4/go.mod h1:NAm9q3Rq2wIlGnOhpYICNI7+bpBebMJbh0yyp3aNw1Y=
 cloud.google.com/go/trace v1.0.0/go.mod h1:4iErSByzxkyHWzzlAj63/Gmjz0NH1ASqhJguHpGcr6A=
 cloud.google.com/go/trace v1.2.0/go.mod h1:Wc8y/uYyOhPy12KEnXG9XGrvfMz5F5SrYecQlbW1rwM=
 cloud.google.com/go/trace v1.3.0/go.mod h1:FFUE83d9Ca57C+K8rDl/Ih8LwOzWIV1krKgxg6N0G28=
 cloud.google.com/go/trace v1.4.0/go.mod h1:UG0v8UBqzusp+z63o7FK74SdFE+AXpCLdFb1rshXG+Y=
 cloud.google.com/go/trace v1.8.0/go.mod h1:zH7vcsbAhklH8hWFig58HvxcxyQbaIqMarMg9hn5ECA=
+cloud.google.com/go/trace v1.9.0/go.mod h1:lOQqpE5IaWY0Ixg7/r2SjixMuc6lfTFeO4QGM4dQWOk=
+cloud.google.com/go/trace v1.10.1/go.mod h1:gbtL94KE5AJLH3y+WVpfWILmqgc6dXcqgNXdOPAQTYk=
+cloud.google.com/go/trace v1.10.2/go.mod h1:NPXemMi6MToRFcSxRl2uDnu/qAlAQ3oULUphcHGh1vA=
+cloud.google.com/go/trace v1.10.3/go.mod h1:Ke1bgfc73RV3wUFml+uQp7EsDw4dGaETLxB7Iq/r4CY=
+cloud.google.com/go/trace v1.10.4/go.mod h1:Nso99EDIK8Mj5/zmB+iGr9dosS/bzWCJ8wGmE6TXNWY=
 cloud.google.com/go/translate v1.3.0/go.mod h1:gzMUwRjvOqj5i69y/LYLd8RrNQk+hOmIXTi9+nb3Djs=
 cloud.google.com/go/translate v1.4.0/go.mod h1:06Dn/ppvLD6WvA5Rhdp029IX2Mi3Mn7fpMRLPvXT5Wg=
+cloud.google.com/go/translate v1.5.0/go.mod h1:29YDSYveqqpA1CQFD7NQuP49xymq17RXNaUDdc0mNu0=
 cloud.google.com/go/translate v1.6.0/go.mod h1:lMGRudH1pu7I3n3PETiOB2507gf3HnfLV8qlkHZEyos=
+cloud.google.com/go/translate v1.7.0/go.mod h1:lMGRudH1pu7I3n3PETiOB2507gf3HnfLV8qlkHZEyos=
+cloud.google.com/go/translate v1.8.1/go.mod h1:d1ZH5aaOA0CNhWeXeC8ujd4tdCFw8XoNWRljklu5RHs=
+cloud.google.com/go/translate v1.8.2/go.mod h1:d1ZH5aaOA0CNhWeXeC8ujd4tdCFw8XoNWRljklu5RHs=
+cloud.google.com/go/translate v1.9.0/go.mod h1:d1ZH5aaOA0CNhWeXeC8ujd4tdCFw8XoNWRljklu5RHs=
+cloud.google.com/go/translate v1.9.1/go.mod h1:TWIgDZknq2+JD4iRcojgeDtqGEp154HN/uL6hMvylS8=
+cloud.google.com/go/translate v1.9.2/go.mod h1:E3Tc6rUTsQkVrXW6avbUhKJSr7ZE3j7zNmqzXKHqRrY=
+cloud.google.com/go/translate v1.9.3/go.mod h1:Kbq9RggWsbqZ9W5YpM94Q1Xv4dshw/gr/SHfsl5yCZ0=
 cloud.google.com/go/video v1.8.0/go.mod h1:sTzKFc0bUSByE8Yoh8X0mn8bMymItVGPfTuUBUyRgxk=
 cloud.google.com/go/video v1.9.0/go.mod h1:0RhNKFRF5v92f8dQt0yhaHrEuH95m068JYOvLZYnJSw=
+cloud.google.com/go/video v1.12.0/go.mod h1:MLQew95eTuaNDEGriQdcYn0dTwf9oWiA4uYebxM5kdg=
 cloud.google.com/go/video v1.13.0/go.mod h1:ulzkYlYgCp15N2AokzKjy7MQ9ejuynOJdf1tR5lGthk=
+cloud.google.com/go/video v1.14.0/go.mod h1:SkgaXwT+lIIAKqWAJfktHT/RbgjSuY6DobxEp0C5yTQ=
+cloud.google.com/go/video v1.15.0/go.mod h1:SkgaXwT+lIIAKqWAJfktHT/RbgjSuY6DobxEp0C5yTQ=
+cloud.google.com/go/video v1.17.1/go.mod h1:9qmqPqw/Ib2tLqaeHgtakU+l5TcJxCJbhFXM7UJjVzU=
+cloud.google.com/go/video v1.19.0/go.mod h1:9qmqPqw/Ib2tLqaeHgtakU+l5TcJxCJbhFXM7UJjVzU=
+cloud.google.com/go/video v1.20.0/go.mod h1:U3G3FTnsvAGqglq9LxgqzOiBc/Nt8zis8S+850N2DUM=
+cloud.google.com/go/video v1.20.1/go.mod h1:3gJS+iDprnj8SY6pe0SwLeC5BUW80NjhwX7INWEuWGU=
+cloud.google.com/go/video v1.20.2/go.mod h1:lrixr5JeKNThsgfM9gqtwb6Okuqzfo4VrY2xynaViTA=
+cloud.google.com/go/video v1.20.3/go.mod h1:TnH/mNZKVHeNtpamsSPygSR0iHtvrR/cW1/GDjN5+GU=
 cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU=
 cloud.google.com/go/videointelligence v1.7.0/go.mod h1:k8pI/1wAhjznARtVT9U1llUaFNPh7muw8QyOUpavru4=
 cloud.google.com/go/videointelligence v1.8.0/go.mod h1:dIcCn4gVDdS7yte/w+koiXn5dWVplOZkE+xwG9FgK+M=
 cloud.google.com/go/videointelligence v1.9.0/go.mod h1:29lVRMPDYHikk3v8EdPSaL8Ku+eMzDljjuvRs105XoU=
 cloud.google.com/go/videointelligence v1.10.0/go.mod h1:LHZngX1liVtUhZvi2uNS0VQuOzNi2TkY1OakiuoUOjU=
+cloud.google.com/go/videointelligence v1.11.1/go.mod h1:76xn/8InyQHarjTWsBR058SmlPCwQjgcvoW0aZykOvo=
+cloud.google.com/go/videointelligence v1.11.2/go.mod h1:ocfIGYtIVmIcWk1DsSGOoDiXca4vaZQII1C85qtoplc=
+cloud.google.com/go/videointelligence v1.11.3/go.mod h1:tf0NUaGTjU1iS2KEkGWvO5hRHeCkFK3nPo0/cOZhZAo=
+cloud.google.com/go/videointelligence v1.11.4/go.mod h1:kPBMAYsTPFiQxMLmmjpcZUMklJp3nC9+ipJJtprccD8=
 cloud.google.com/go/vision v1.2.0/go.mod h1:SmNwgObm5DpFBme2xpyOyasvBc1aPdjvMk2bBk0tKD0=
 cloud.google.com/go/vision/v2 v2.2.0/go.mod h1:uCdV4PpN1S0jyCyq8sIM42v2Y6zOLkZs+4R9LrGYwFo=
 cloud.google.com/go/vision/v2 v2.3.0/go.mod h1:UO61abBx9QRMFkNBbf1D8B1LXdS2cGiiCRx0vSpZoUo=
 cloud.google.com/go/vision/v2 v2.4.0/go.mod h1:VtI579ll9RpVTrdKdkMzckdnwMyX2JILb+MhPqRbPsY=
 cloud.google.com/go/vision/v2 v2.5.0/go.mod h1:MmaezXOOE+IWa+cS7OhRRLK2cNv1ZL98zhqFFZaaH2E=
 cloud.google.com/go/vision/v2 v2.6.0/go.mod h1:158Hes0MvOS9Z/bDMSFpjwsUrZ5fPrdwuyyvKSGAGMY=
+cloud.google.com/go/vision/v2 v2.7.0/go.mod h1:H89VysHy21avemp6xcf9b9JvZHVehWbET0uT/bcuY/0=
+cloud.google.com/go/vision/v2 v2.7.2/go.mod h1:jKa8oSYBWhYiXarHPvP4USxYANYUEdEsQrloLjrSwJU=
+cloud.google.com/go/vision/v2 v2.7.3/go.mod h1:V0IcLCY7W+hpMKXK1JYE0LV5llEqVmj+UJChjvA1WsM=
+cloud.google.com/go/vision/v2 v2.7.4/go.mod h1:ynDKnsDN/0RtqkKxQZ2iatv3Dm9O+HfRb5djl7l4Vvw=
+cloud.google.com/go/vision/v2 v2.7.5/go.mod h1:GcviprJLFfK9OLf0z8Gm6lQb6ZFUulvpZws+mm6yPLM=
 cloud.google.com/go/vmmigration v1.2.0/go.mod h1:IRf0o7myyWFSmVR1ItrBSFLFD/rJkfDCUTO4vLlJvsE=
 cloud.google.com/go/vmmigration v1.3.0/go.mod h1:oGJ6ZgGPQOFdjHuocGcLqX4lc98YQ7Ygq8YQwHh9A7g=
 cloud.google.com/go/vmmigration v1.5.0/go.mod h1:E4YQ8q7/4W9gobHjQg4JJSgXXSgY21nA5r8swQV+Xxc=
+cloud.google.com/go/vmmigration v1.6.0/go.mod h1:bopQ/g4z+8qXzichC7GW1w2MjbErL54rk3/C843CjfY=
+cloud.google.com/go/vmmigration v1.7.1/go.mod h1:WD+5z7a/IpZ5bKK//YmT9E047AD+rjycCAvyMxGJbro=
+cloud.google.com/go/vmmigration v1.7.2/go.mod h1:iA2hVj22sm2LLYXGPT1pB63mXHhrH1m/ruux9TwWLd8=
+cloud.google.com/go/vmmigration v1.7.3/go.mod h1:ZCQC7cENwmSWlwyTrZcWivchn78YnFniEQYRWQ65tBo=
+cloud.google.com/go/vmmigration v1.7.4/go.mod h1:yBXCmiLaB99hEl/G9ZooNx2GyzgsjKnw5fWcINRgD70=
 cloud.google.com/go/vmwareengine v0.1.0/go.mod h1:RsdNEf/8UDvKllXhMz5J40XxDrNJNN4sagiox+OI208=
 cloud.google.com/go/vmwareengine v0.2.2/go.mod h1:sKdctNJxb3KLZkE/6Oui94iw/xs9PRNC2wnNLXsHvH8=
+cloud.google.com/go/vmwareengine v0.3.0/go.mod h1:wvoyMvNWdIzxMYSpH/R7y2h5h3WFkx6d+1TIsP39WGY=
+cloud.google.com/go/vmwareengine v0.4.1/go.mod h1:Px64x+BvjPZwWuc4HdmVhoygcXqEkGHXoa7uyfTgSI0=
+cloud.google.com/go/vmwareengine v1.0.0/go.mod h1:Px64x+BvjPZwWuc4HdmVhoygcXqEkGHXoa7uyfTgSI0=
+cloud.google.com/go/vmwareengine v1.0.1/go.mod h1:aT3Xsm5sNx0QShk1Jc1B8OddrxAScYLwzVoaiXfdzzk=
+cloud.google.com/go/vmwareengine v1.0.2/go.mod h1:xMSNjIk8/itYrz1JA8nV3Ajg4L4n3N+ugP8JKzk3OaA=
+cloud.google.com/go/vmwareengine v1.0.3/go.mod h1:QSpdZ1stlbfKtyt6Iu19M6XRxjmXO+vb5a/R6Fvy2y4=
 cloud.google.com/go/vpcaccess v1.4.0/go.mod h1:aQHVbTWDYUR1EbTApSVvMq1EnT57ppDmQzZ3imqIk4w=
 cloud.google.com/go/vpcaccess v1.5.0/go.mod h1:drmg4HLk9NkZpGfCmZ3Tz0Bwnm2+DKqViEpeEpOq0m8=
 cloud.google.com/go/vpcaccess v1.6.0/go.mod h1:wX2ILaNhe7TlVa4vC5xce1bCnqE3AeH27RV31lnmZes=
+cloud.google.com/go/vpcaccess v1.7.1/go.mod h1:FogoD46/ZU+JUBX9D606X21EnxiszYi2tArQwLY4SXs=
+cloud.google.com/go/vpcaccess v1.7.2/go.mod h1:mmg/MnRHv+3e8FJUjeSibVFvQF1cCy2MsFaFqxeY1HU=
+cloud.google.com/go/vpcaccess v1.7.3/go.mod h1:YX4skyfW3NC8vI3Fk+EegJnlYFatA+dXK4o236EUCUc=
+cloud.google.com/go/vpcaccess v1.7.4/go.mod h1:lA0KTvhtEOb/VOdnH/gwPuOzGgM+CWsmGu6bb4IoMKk=
 cloud.google.com/go/webrisk v1.4.0/go.mod h1:Hn8X6Zr+ziE2aNd8SliSDWpEnSS1u4R9+xXZmFiHmGE=
 cloud.google.com/go/webrisk v1.5.0/go.mod h1:iPG6fr52Tv7sGk0H6qUFzmL3HHZev1htXuWDEEsqMTg=
 cloud.google.com/go/webrisk v1.6.0/go.mod h1:65sW9V9rOosnc9ZY7A7jsy1zoHS5W9IAXv6dGqhMQMc=
 cloud.google.com/go/webrisk v1.7.0/go.mod h1:mVMHgEYH0r337nmt1JyLthzMr6YxwN1aAIEc2fTcq7A=
 cloud.google.com/go/webrisk v1.8.0/go.mod h1:oJPDuamzHXgUc+b8SiHRcVInZQuybnvEW72PqTc7sSg=
+cloud.google.com/go/webrisk v1.9.1/go.mod h1:4GCmXKcOa2BZcZPn6DCEvE7HypmEJcJkr4mtM+sqYPc=
+cloud.google.com/go/webrisk v1.9.2/go.mod h1:pY9kfDgAqxUpDBOrG4w8deLfhvJmejKB0qd/5uQIPBc=
+cloud.google.com/go/webrisk v1.9.3/go.mod h1:RUYXe9X/wBDXhVilss7EDLW9ZNa06aowPuinUOPCXH8=
+cloud.google.com/go/webrisk v1.9.4/go.mod h1:w7m4Ib4C+OseSr2GL66m0zMBywdrVNTDKsdEsfMl7X0=
 cloud.google.com/go/websecurityscanner v1.3.0/go.mod h1:uImdKm2wyeXQevQJXeh8Uun/Ym1VqworNDlBXQevGMo=
 cloud.google.com/go/websecurityscanner v1.4.0/go.mod h1:ebit/Fp0a+FWu5j4JOmJEV8S8CzdTkAS77oDsiSqYWQ=
 cloud.google.com/go/websecurityscanner v1.5.0/go.mod h1:Y6xdCPy81yi0SQnDY1xdNTNpfY1oAgXUlcfN3B3eSng=
+cloud.google.com/go/websecurityscanner v1.6.1/go.mod h1:Njgaw3rttgRHXzwCB8kgCYqv5/rGpFCsBOvPbYgszpg=
+cloud.google.com/go/websecurityscanner v1.6.2/go.mod h1:7YgjuU5tun7Eg2kpKgGnDuEOXWIrh8x8lWrJT4zfmas=
+cloud.google.com/go/websecurityscanner v1.6.3/go.mod h1:x9XANObUFR+83Cya3g/B9M/yoHVqzxPnFtgF8yYGAXw=
+cloud.google.com/go/websecurityscanner v1.6.4/go.mod h1:mUiyMQ+dGpPPRkHgknIZeCzSHJ45+fY4F52nZFDHm2o=
 cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0=
 cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M=
 cloud.google.com/go/workflows v1.8.0/go.mod h1:ysGhmEajwZxGn1OhGOGKsTXc5PyxOc0vfKf5Af+to4M=
 cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT3ujaO/WwSA=
 cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw=
+cloud.google.com/go/workflows v1.11.1/go.mod h1:Z+t10G1wF7h8LgdY/EmRcQY8ptBD/nvofaL6FqlET6g=
+cloud.google.com/go/workflows v1.12.0/go.mod h1:PYhSk2b6DhZ508tj8HXKaBh+OFe+xdl0dHF/tJdzPQM=
+cloud.google.com/go/workflows v1.12.1/go.mod h1:5A95OhD/edtOhQd/O741NSfIMezNTbCwLM1P1tBRGHM=
+cloud.google.com/go/workflows v1.12.2/go.mod h1:+OmBIgNqYJPVggnMo9nqmizW0qEXHhmnAzK/CnBqsHc=
+cloud.google.com/go/workflows v1.12.3/go.mod h1:fmOUeeqEwPzIU81foMjTRQIdwQHADi/vEr1cx9R1m5g=
 contrib.go.opencensus.io/exporter/aws v0.0.0-20200617204711-c478e41e60e9/go.mod h1:uu1P0UCM/6RbsMrgPa98ll8ZcHM858i/AD06a9aLRCA=
 contrib.go.opencensus.io/exporter/stackdriver v0.13.10/go.mod h1:I5htMbyta491eUxufwwZPQdcKvvgzMB4O9ni41YnIM8=
 contrib.go.opencensus.io/integrations/ocsql v0.1.7/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE=
@@ -549,29 +1181,53 @@ gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zum
 git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc=
 github.com/99designs/basicauth-go v0.0.0-20160802081356-2a93ba0f464d/go.mod h1:3cARGAK9CfW3HoxCy1a0G4TKrdiKke8ftOMEOHyySYs=
 github.com/99designs/httpsignatures-go v0.0.0-20170731043157-88528bf4ca7e/go.mod h1:Xa6lInWHNQnuWoF0YPSsx+INFA9qk7/7pTjwb3PInkY=
-github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/Azure/azure-amqp-common-go/v3 v3.2.1/go.mod h1:O6X1iYHP7s2x7NjUKsXVhkwWrQhxrd+d8/3rRadj4CI=
 github.com/Azure/azure-amqp-common-go/v3 v3.2.2/go.mod h1:O6X1iYHP7s2x7NjUKsXVhkwWrQhxrd+d8/3rRadj4CI=
 github.com/Azure/azure-pipeline-go v0.2.3 h1:7U9HBg1JFK3jHl5qmo4CTZKFTVgMwdFHMVtCdfBE21U=
 github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k=
 github.com/Azure/azure-sdk-for-go v51.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go v59.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-github.com/Azure/azure-sdk-for-go v65.0.0+incompatible h1:HzKLt3kIwMm4KeJYTdx9EbjRYTySD/t8i1Ee/W5EGXw=
-github.com/Azure/azure-sdk-for-go v65.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
+github.com/Azure/azure-sdk-for-go v68.0.0+incompatible h1:fcYLmCpyNYRnvJbPerq7U0hS+6+I79yEDJBqVNcqUzU=
+github.com/Azure/azure-sdk-for-go v68.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0/go.mod h1:h6H6c8enJmmocHUbLiiGY6sx7f9i+X3m1CHdd5c6Rdw=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.1 h1:SEy2xmstIphdPwNBUi7uhvjyjhVKISfwjfOJmuy7kg4=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.1/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.0.0/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.4.0/go.mod h1:ON4tFdPTwRcgWEaVDrN3584Ef+b7GgSJaXxe5fW9t4M=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0/go.mod h1:3Ug6Qzto9anB6mGlEdgYMDF5zHQ+wwhEaYR4s17PHMw=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0/go.mod h1:uReU2sSxZExRPBAg3qKzmAucSi51+SP1OhohieR821Q=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.10.0 h1:n1DH8TPV4qqPTje2RcUBYwtrTWlabVp4n46+74X2pn4=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.10.0/go.mod h1:HDcZnuGbiyppErN6lB+idp4CKhjbc8gwjto6OPpyggM=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJcghJGOYCgdezslRSVzqwLf/q+4Y2r/0=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 h1:vcYCAze6p19qBW7MhZybIsqD8sMV8js0NyQM8JDnVtg=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0/go.mod h1:OQeznEEkTZ9OrhHJoDD8ZDq51FHgXjqtP9z6bEwBq9U=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.0.0/go.mod h1:+6sju8gk8FRmSajX3Oz4G5Gm7P+mbqE9FVaXXFYTkCM=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.0/go.mod h1:NBanQUfSWiWn3QEpWDTCU0IjBECKOYvl2R8xdRtMtiM=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0/go.mod h1:1fXstnBMas5kzG+S3q8UoJcmyU6nUeunJcMDHcRYHhs=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 h1:sO0/P7g68FrryJzljemN+6GTssUXdANk6aJ7T1ZxnsQ=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1/go.mod h1:h8hyGFDsU5HMivxiS2iYFZsgDbU9OnnJ163x5UGVKYo=
 github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0/go.mod h1:yqy467j36fJxcRV2TzfVZ1pCb5vxm4BtZPUdYWe/Xo8=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 h1:sXr+ck84g/ZlZUOZiNELInmMgOsuGwdjjVkEIde0OtY=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.2/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.2.0/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w=
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0/go.mod h1:okt5dMMTOFjX/aovMlrjvvXoPMBVSPzk9185BT0+eZM=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.0/go.mod h1:s4kgfzA0covAXNicZHDMN58jExvcng2mC/DepXiF1EI=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 h1:LqbJ/WzJUwBf8UiaSzgX7aMclParm9/5Vgp+TY51uBQ=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2/go.mod h1:yInRyqWXAuaPrgI7p70+lDDgh3mlBohis29jGMISnmc=
 github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.9.0 h1:TOFrNxfjslms5nLLIMjW7N0+zSALX4KiGsptmpb16AA=
 github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.9.0/go.mod h1:EAyXOW1F6BTJPiK2pDvmnvxOHPxoTYWoqBeIlql+QhI=
 github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.0 h1:Lg6BW0VPmCwcMlvOviL3ruHFO+H9tZNqscK0AeuFjGM=
 github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.0/go.mod h1:9V2j0jn9jDEkCkv8w/bKTNppX/d0FVA1ud77xCIP4KA=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4 v4.2.1 h1:UPeCRD+XY7QlaGQte2EVI2iOcWvUYA2XY8w5T/8v0NQ=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4 v4.2.1/go.mod h1:oGV6NlB0cvi1ZbYRR2UN44QHxWFyGk+iylgD0qaMXjA=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal v1.0.0/go.mod h1:ceIuwmxDWptoW3eCqSXlnPsZFKh4X+R38dWPv7GS9Vs=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal v1.1.2/go.mod h1:FbdwsQ2EzwvXxOPcMFYO8ogEc9uMMIj3YkmCdXdAFmk=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork v1.0.0/go.mod h1:243D9iHbcQXoFUtgHJwL7gl2zx1aDuDMjvBZVGr2uW0=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork v1.1.0 h1:QM6sE5k2ZT/vI5BEe0r7mqjsUSnhVBFbOsVkEuaEfiA=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork v1.1.0/go.mod h1:243D9iHbcQXoFUtgHJwL7gl2zx1aDuDMjvBZVGr2uW0=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v2 v2.2.1 h1:bWh0Z2rOEDfB/ywv/l0iHN1JgyazE6kW/aIA89+CEK0=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v2 v2.2.1/go.mod h1:Bzf34hhAE9NSxailk8xVeLEZbUjOXcC+GnU1mMKdhLw=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.0.0/go.mod h1:s1tW/At+xHqjNFvWU4G0c0Qv33KOhvbGNj0RCTQDV8s=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.0 h1:yfJe15aSwEQ6Oo6J+gdfdulPNoZ3TEhmbhLIoxZcA+U=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.0/go.mod h1:Q28U+75mpCaSCDowNEmhIo/rmgdkqmkmzI7N6TGR4UY=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v0.8.0 h1:T028gtTPiYt/RMUfs8nVsAL7FDQrfLlrm/NnRG/zcC4=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v0.8.0/go.mod h1:cw4zVQgBby0Z5f2v0itn6se2dDP17nTjbZFXW5uPyHA=
 github.com/Azure/azure-service-bus-go v0.11.5/go.mod h1:MI6ge2CuQWBVq+ly456MY7XqNLJip5LO1iSFodbNLbU=
 github.com/Azure/azure-storage-blob-go v0.14.0/go.mod h1:SMqIBi+SuiQH32bvyjngEewEeXoPfKMgWlBDaYf6fck=
 github.com/Azure/azure-storage-blob-go v0.15.0 h1:rXtgp8tN1p29GvpGgfJetavIG0V7OgcSXPpwp3tx6qk=
@@ -586,15 +1242,15 @@ github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSW
 github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA=
 github.com/Azure/go-autorest/autorest v0.11.19/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA=
 github.com/Azure/go-autorest/autorest v0.11.22/go.mod h1:BAWYUWGPEtKPzjVkp0Q6an0MJcJDsoh5Z1BFAEFs4Xs=
-github.com/Azure/go-autorest/autorest v0.11.28 h1:ndAExarwr5Y+GaHE6VCaY1kyS/HwwGGyuimVhWsHOEM=
-github.com/Azure/go-autorest/autorest v0.11.28/go.mod h1:MrkzG3Y3AH668QyF9KRk5neJnGgmhQ6krbhR8Q5eMvA=
+github.com/Azure/go-autorest/autorest v0.11.29 h1:I4+HL/JDvErx2LjyzaVxllw2lRDB5/BT2Bm4g20iqYw=
+github.com/Azure/go-autorest/autorest v0.11.29/go.mod h1:ZtEzC4Jy2JDrZLxvWs8LrBWEBycl1hbT1eknI8MtfAs=
 github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A=
 github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M=
 github.com/Azure/go-autorest/autorest/adal v0.9.14/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M=
 github.com/Azure/go-autorest/autorest/adal v0.9.17/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ=
-github.com/Azure/go-autorest/autorest/adal v0.9.18/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ=
-github.com/Azure/go-autorest/autorest/adal v0.9.22 h1:/GblQdIudfEM3AWWZ0mrYJQSd7JS4S/Mbzh6F0ov0Xc=
 github.com/Azure/go-autorest/autorest/adal v0.9.22/go.mod h1:XuAbAEUv2Tta//+voMI038TrJBqjKam0me7qR+L8Cmk=
+github.com/Azure/go-autorest/autorest/adal v0.9.23 h1:Yepx8CvFxwNKpH6ja7RZ+sKX+DWYNldbLiALMC3BTz8=
+github.com/Azure/go-autorest/autorest/adal v0.9.23/go.mod h1:5pcMqFkdPhviJdlEy3kC/v1ZLnQl0MH6XA5YCcMhy4c=
 github.com/Azure/go-autorest/autorest/azure/auth v0.5.9/go.mod h1:hg3/1yw0Bq87O3KvvnJoAh34/0zbP7SFizX/qN5JvjU=
 github.com/Azure/go-autorest/autorest/azure/cli v0.4.2/go.mod h1:7qkJkT+j6b+hIpzMOwPChJhTqS8VbsqqgULzMNRugoM=
 github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw=
@@ -612,50 +1268,46 @@ github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUM
 github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
 github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e h1:NeAW1fUYUEWhft7pkxDf6WoUvEZJ/uOKsvtpjLnn8MU=
 github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 h1:OBhqkivkhkMqLPymWEppkm7vgPQY2XsHoEkaMQ0AdZY=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0/go.mod h1:kgDmCTgBzIEPFElEF+FK0SdjAor06dRq2Go927dnQ6o=
+github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0/go.mod h1:Vt9sXTKwMyGcOxSmLDMnGPgqsUg7m8pe215qMLrDXw4=
+github.com/AzureAD/microsoft-authentication-library-for-go v0.7.0/go.mod h1:BDJ5qMFKx9DugEg3+uQSDCdbYPr5s9vBTrL9P8TpqOU=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 h1:DzHpqpoJVaCgOUdVHxE8QB52S6NiVdDQvGlny1qvPqA=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno=
-github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo=
-github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
+github.com/Code-Hex/go-generics-cache v1.3.1 h1:i8rLwyhoyhaerr7JpjtYjJZUcCbWOdiYO3fZXLiEC4g=
+github.com/Code-Hex/go-generics-cache v1.3.1/go.mod h1:qxcC9kRVrct9rHeiYpFWSoW1vxyillCVzX13KZG8dl4=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
-github.com/DataDog/datadog-go v4.0.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/FZambia/eagle v0.1.0 h1:9gyX6x+xjoIfglgyPTcYm7dvY7FJ93us1QY5De4CyXA=
 github.com/FZambia/eagle v0.1.0/go.mod h1:YjGSPVkQTNcVLfzEUQJNgW9ScPR0K4u/Ky0yeFa4oDA=
 github.com/GoogleCloudPlatform/cloudsql-proxy v1.29.0/go.mod h1:spvB9eLJH9dutlbPSRmHvSXXHOwGRyeXh1jVdquA2G8=
 github.com/HdrHistogram/hdrhistogram-go v1.1.0/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
 github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM=
 github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
+github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c h1:RGWPOewvKIROun94nF7v2cua9qP+thov/7M50KEoeSU=
 github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk=
-github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
 github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
 github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
-github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
-github.com/Masterminds/semver/v3 v3.0.3/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
+github.com/Masterminds/sprig/v3 v3.2.1/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk=
 github.com/Masterminds/sprig/v3 v3.2.2 h1:17jRggJu518dr3QaafizSXOjKYp94wKfABxUmyxvxX8=
 github.com/Masterminds/sprig/v3 v3.2.2/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk=
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
-github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
-github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
-github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg=
-github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE=
+github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
+github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
 github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
 github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
 github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
 github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 h1:kkhsdkhsCvIsutKu5zLMgWtgh9YxGCNAw8Ad8hjwfYg=
 github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=
-github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk=
@@ -664,54 +1316,58 @@ github.com/RoaringBitmap/real-roaring-datasets v0.0.0-20190726190000-eb7c87156f7
 github.com/RoaringBitmap/roaring v0.9.1/go.mod h1:h1B7iIUOmnAeb5ytYMvnHJwxMc6LUrwBnzXWRuqTQUc=
 github.com/RoaringBitmap/roaring v0.9.4 h1:ckvZSX5gwCRaJYBNe7syNawCU5oruY9gQmjXlp4riwo=
 github.com/RoaringBitmap/roaring v0.9.4/go.mod h1:icnadbWcNyfEHlYdr+tDlOTih1Bf/h+rzPpv4sbomAA=
-github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
 github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f h1:HR5nRmUQgXrwqZOwZ2DAc/aCi3Bu3xENpspW935vxu0=
 github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f/go.mod h1:f3HiCrHjHBdcm6E83vGaXh1KomZMA2P6aeo3hKx/wg0=
-github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk=
-github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4=
 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
 github.com/agext/levenshtein v1.2.1 h1:QmvMAjj2aEICytGiWzmxoE0x2KZvE0fvmqMOfy2tjT8=
 github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
-github.com/ajg/form v0.0.0-20160822230020-523a5da1a92f/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
-github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9/go.mod h1:JynElWSGnm/4RlzPXRlREEwqTHAN3T56Bv2ITsFT3gY=
 github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19/go.mod h1:T13YZdzov6OU0A1+RfKZiZN9ca6VeKdBdyDV+BY97Tk=
 github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
 github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b/go.mod h1:1KcenG0jGWcpt8ov532z81sp/kMMUG485J2InIOyADM=
 github.com/alecthomas/kingpin/v2 v2.3.1/go.mod h1:oYL5vtsvEHZGHxU7DMp32Dvx+qL+ptGn6lWaot2vCNE=
 github.com/alecthomas/kingpin/v2 v2.3.2/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE=
+github.com/alecthomas/kingpin/v2 v2.4.0/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
-github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
+github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 h1:ez/4by2iGztzR4L0zgAOR8lTQK9VlyBVVd7G4omaOQs=
+github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
 github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZpUGpz5+4FfNmIU+FmZg2P3Xaj2v2bfNWmk=
 github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
 github.com/alicebob/miniredis/v2 v2.30.1 h1:HM1rlQjq1bm9yQcsawJqSZBJ9AYgxvjkMsNtddh90+g=
 github.com/alicebob/miniredis/v2 v2.30.1/go.mod h1:b25qWj4fCEsBeAAR2mlb0ufImGC6uH3VlUfb/HS5zKg=
-github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
 github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
-github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
-github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
+github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
+github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 h1:yL7+Jz0jTC6yykIK/Wh74gnTJnrGr5AyrNMXuA0gves=
-github.com/antlr/antlr4/runtime/Go/antlr v1.4.10/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY=
+github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df h1:7RFfzj4SSt6nnvCPbCqijJi1nWCd+TqAT3bYCStRC18=
+github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM=
 github.com/apache/arrow/go/arrow v0.0.0-20210223225224-5bea62493d91/go.mod h1:c9sxoIT3YgLxH4UhLOCKaBlEojuMhVYpk4Ntv3opUTQ=
+github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 h1:q4dksr6ICHXqG5hm0ZW5IHyeEJXoIJSOZeBLmWPNeIQ=
+github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40/go.mod h1:Q7yQnSMnLvcXlZ8RV+jwz/6y1rQTqbX6C82SndT52Zs=
 github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0=
-github.com/apache/arrow/go/v13 v13.0.0 h1:kELrvDQuKZo8csdWYqBQfyi431x6Zs/YJTEgUuSVcWk=
-github.com/apache/arrow/go/v13 v13.0.0/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc=
+github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4xei5aX110hRiI=
+github.com/apache/arrow/go/v12 v12.0.0/go.mod h1:d+tV/eHZZ7Dz7RPrFKtPK02tpr+c9/PEd/zm8mDS9Vg=
+github.com/apache/arrow/go/v15 v15.0.2 h1:60IliRbiyTWCWjERBCkO1W4Qun9svcYoZrSLcyOsMLE=
+github.com/apache/arrow/go/v15 v15.0.2/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA=
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
+github.com/apache/thrift v0.18.1 h1:lNhK/1nqjbwbiOPDBPFJVKxgDEGSepKuTh6OLiXW8kg=
+github.com/apache/thrift v0.18.1/go.mod h1:rdQn/dCcDKEWjjylUeueum4vQEjG2v8v2PqriUnbr+I=
 github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ=
 github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk=
 github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw=
 github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
+github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de h1:FxWPpzIjnTlhPwqqXc4/vE0f7GvRjuAsbW+HOIe8KnA=
+github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de/go.mod h1:DCaWoUhZrYW9p1lxo/cm8EmUOOzAPSEZNGF2DK1dJgw=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
@@ -725,26 +1381,21 @@ github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgI
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A=
-github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
-github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg=
-github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg=
 github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
 github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
 github.com/aws/aws-sdk-go v1.15.27/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
 github.com/aws/aws-sdk-go v1.17.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.23.19/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.37.0/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
 github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
 github.com/aws/aws-sdk-go v1.40.45/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
 github.com/aws/aws-sdk-go v1.43.31/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
-github.com/aws/aws-sdk-go v1.44.217/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
-github.com/aws/aws-sdk-go v1.44.317/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
-github.com/aws/aws-sdk-go v1.44.325 h1:jF/L99fJSq/BfiLmUOflO/aM+LwcqBm0Fe/qTK5xxuI=
-github.com/aws/aws-sdk-go v1.44.325/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/aws/aws-sdk-go v1.48.14/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
+github.com/aws/aws-sdk-go v1.50.8 h1:gY0WoOW+/Wz6XmYSgDH9ge3wnAevYDSQWPxxJvqAkP4=
+github.com/aws/aws-sdk-go v1.50.8/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
 github.com/aws/aws-sdk-go-v2 v1.9.1/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4=
 github.com/aws/aws-sdk-go-v2 v1.16.2 h1:fqlCk6Iy3bnCumtrLz9r3mJ/2gUT0pJ0wLFVIdWh+JA=
@@ -785,13 +1436,13 @@ github.com/aws/aws-sdk-go-v2/service/sso v1.11.3 h1:frW4ikGcxfAEDfmQqWgMLp+F1n4n
 github.com/aws/aws-sdk-go-v2/service/sso v1.11.3/go.mod h1:7UQ/e69kU7LDPtY40OyoHYgRmgfGM4mgsLYtcObdveU=
 github.com/aws/aws-sdk-go-v2/service/sts v1.16.3 h1:cJGRyzCSVwZC7zZZ1xbx9m32UnrKydRYhOvcD1NYP9Q=
 github.com/aws/aws-sdk-go-v2/service/sts v1.16.3/go.mod h1:bfBj0iVmsUyUg4weDB4NxktD9rDGeKSVWnjTnwbx9b8=
-github.com/aws/aws-xray-sdk-go v0.9.4/go.mod h1:XtMKdBQfpVut+tJEwI7+dJFRxxRdxHDyVNp2tHXRq04=
 github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
 github.com/aws/smithy-go v1.11.2 h1:eG/N+CcUMAvsdffgMvjMKwfyDzIkjM6pfxMJ8Mzc6mE=
 github.com/aws/smithy-go v1.11.2/go.mod h1:3xHYmszWVx2c0kIwQeEVf9uSm4fYZt67FBJnwub1bgM=
 github.com/axiomhq/hyperloglog v0.0.0-20191112132149-a4c4c47bc57f h1:y06x6vGnFYfXUoVMbrcP1Uzpj4JG01eB5vRps9G8agM=
 github.com/axiomhq/hyperloglog v0.0.0-20191112132149-a4c4c47bc57f/go.mod h1:2stgcRjl6QmW+gU2h5E7BQXg4HU0gzxKWDuT5HviN9s=
-github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
+github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
+github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg=
 github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=
 github.com/beevik/etree v1.2.0 h1:l7WETslUG/T+xOPs47dtd6jov2Ii/8/OjCldk5fYfQw=
 github.com/beevik/etree v1.2.0/go.mod h1:aiPf89g/1k3AShMVAzriilpcE4R/Vuor90y83zVZWFc=
@@ -830,29 +1481,35 @@ github.com/blugelabs/ice v1.0.0 h1:um7wf9e6jbkTVCrOyQq3tKK43fBMOvLUYxbj3Qtc4eo=
 github.com/blugelabs/ice v1.0.0/go.mod h1:gNfFPk5zM+yxJROhthxhVQYjpBO9amuxWXJQ2Lo+IbQ=
 github.com/bmatcuk/doublestar v1.1.1 h1:YroD6BJCZBYx06yYFEWvUuKVWQn3vLLQAVmDmvTSaiQ=
 github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
-github.com/bmatcuk/doublestar/v2 v2.0.3/go.mod h1:QMmcs3H2AUQICWhfzLXz+IYln8lRQmTZRptLie8RgRw=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
 github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
 github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b h1:L/QXpzIa3pOvUGt1D1lA5KjYhPBAN/3iWdP7xeFS9F0=
 github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
-github.com/bsm/ginkgo/v2 v2.5.0 h1:aOAnND1T40wEdAtkGSkvSICWeQ8L3UASX7YVCqQx+eQ=
-github.com/bsm/gomega v1.20.0 h1:JhAwLmtRzXFTx2AkALSLa8ijZafntmhSoU63Ok18Uq8=
+github.com/bsm/ginkgo/v2 v2.9.5 h1:rtVBYPs3+TC5iLUVOis1B9tjLTup7Cj5IfzosKtvTJ0=
+github.com/bsm/ginkgo/v2 v2.9.5/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
+github.com/bsm/gomega v1.26.0 h1:LhQm+AFcgV2M0WyKroMASzAzCAJVpAxQXv4SaI9a69Y=
+github.com/bsm/gomega v1.26.0/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/bufbuild/connect-go v1.10.0 h1:QAJ3G9A1OYQW2Jbk3DeoJbkCxuKArrvZgDt47mjdTbg=
 github.com/bufbuild/connect-go v1.10.0/go.mod h1:CAIePUgkDR5pAFaylSMtNK45ANQjp9JvpluG20rhpV8=
+github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA=
+github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
+github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
 github.com/buildkite/yaml v2.1.0+incompatible h1:xirI+ql5GzfikVNDmt+yeiXpf/v1Gt03qXTtT5WXdr8=
 github.com/buildkite/yaml v2.1.0+incompatible/go.mod h1:UoU8vbcwu1+vjZq01+KrpSeLBgQQIjL/H7Y6KwikUrI=
 github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
+github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0=
+github.com/bwmarrin/snowflake v0.3.0/go.mod h1:NdZxfVWX+oR6y2K0o6qAYv6gIOP9rjG0/E9WsDpxqwE=
+github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
+github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
+github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
 github.com/caio/go-tdigest v3.1.0+incompatible h1:uoVMJ3Q5lXmVLCCqaMGHLBWnbGoN6Lpu7OAUPR60cds=
 github.com/caio/go-tdigest v3.1.0+incompatible/go.mod h1:sHQM/ubZStBUmF1WbB8FAm8q9GjDajLC5T7ydxE3JHI=
 github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
 github.com/casbin/casbin/v2 v2.37.0/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg=
-github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
-github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
 github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
-github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
 github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
@@ -869,8 +1526,12 @@ github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE=
 github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
-github.com/chromedp/cdproto v0.0.0-20220208224320-6efb837e6bc2 h1:XCdvHbz3LhewBHN7+mQPx0sg/Hxil/1USnBmxkjHcmY=
-github.com/chromedp/cdproto v0.0.0-20220208224320-6efb837e6bc2/go.mod h1:At5TxYYdxkbQL0TSefRjhLE3Q0lgvqKKMSFUglJ7i1U=
+github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
+github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams=
+github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
+github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89 h1:aPflPkRFkVwbW6dmcVqfgwp1i+UWGFH6VgR1Jim5Ygc=
+github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs=
+github.com/chromedp/chromedp v0.9.2/go.mod h1:LkSXJKONWTCHAfQasKFUZI+mxqS4tZqhmtGzzhLsnLs=
 github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ=
@@ -878,14 +1539,14 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P
 github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8=
-github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575/go.mod h1:9d6lWj8KzO/fd/NrVaLscBKmPigpZpn5YawRPw+e3Yo=
 github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
 github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng=
 github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs=
 github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
+github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
+github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
@@ -898,57 +1559,40 @@ github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWH
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20230112175826-46e39c7b9b43/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=
+github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20230428030218-4003588d1b74/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ=
+github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b8034E=
 github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw=
 github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c/go.mod h1:XGLbWH/ujMcbPbhZq52Nv6UrCghb1yGn//133kEsvDk=
-github.com/cockroachdb/cockroach-go v0.0.0-20190925194419-606b3d062051/go.mod h1:XGLbWH/ujMcbPbhZq52Nv6UrCghb1yGn//133kEsvDk=
-github.com/cockroachdb/cockroach-go v0.0.0-20200312223839-f565e4789405/go.mod h1:XGLbWH/ujMcbPbhZq52Nv6UrCghb1yGn//133kEsvDk=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
-github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU=
-github.com/cockroachdb/errors v1.9.1 h1:yFVvsI0VxmRShfawbt/laCIDy/mtTqqnvoNgiy5bEV8=
-github.com/cockroachdb/errors v1.9.1/go.mod h1:2sxOtL2WIc096WSZqZ5h8fa17rdDq9HZOZLBCor4mBk=
-github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f h1:6jduT9Hfc0njg5jJ1DdKCFPdMBrp/mdZfCpa5h+WM74=
-github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
-github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ=
-github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
-github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
-github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0=
 github.com/containerd/containerd v1.2.7/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/containerd v1.3.4/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
-github.com/containerd/containerd v1.4.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
-github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
-github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
-github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41/go.mod h1:Dq467ZllaHgAtVp4p1xUQWBrFXR9s/wyoTpG8zOJGkY=
-github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
+github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
 github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/coreos/go-systemd/v22 v22.4.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM=
+github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/cristalhq/jwt/v4 v4.0.2 h1:g/AD3h0VicDamtlM70GWGElp8kssQEv+5wYd7L9WOhU=
-github.com/cristalhq/jwt/v4 v4.0.2/go.mod h1:HnYraSNKDRag1DZP92rYHyrjyQHnVEHPNqesmzs+miQ=
-github.com/cucumber/godog v0.8.1/go.mod h1:vSh3r/lM+psC1BPXvdkSEuNjmXfpVqrMGYAElF6hxnA=
 github.com/cznic/b v0.0.0-20180115125044-35e9bbe41f07/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8=
 github.com/cznic/fileutil v0.0.0-20180108211300-6a051e75936f/go.mod h1:8S58EK26zhXSxzv7NQFpnliaOQsmDUxvoQO3rt154Vg=
 github.com/cznic/golex v0.0.0-20170803123110-4ab7c5e190e4/go.mod h1:+bmmJDNmKlhWNG+gwWCkaBoTy39Fs+bzRxVBzoTQbIc=
@@ -959,49 +1603,31 @@ github.com/cznic/ql v1.2.0/go.mod h1:FbpzhyZrqr0PVlK6ury+PoW3T0ODUV22OeWIxcaOrSE
 github.com/cznic/sortutil v0.0.0-20150617083342-4c7342852e65/go.mod h1:q2w6Bg5jeox1B+QkJ6Wp/+Vn0G/bo3f1uY7Fn3vivIQ=
 github.com/cznic/strutil v0.0.0-20171016134553-529a34b1c186/go.mod h1:AHHPPPXTw0h6pVabbcbyGRK1DckRn7r/STdZEeIDzZc=
 github.com/cznic/zappy v0.0.0-20160723133515-2533cb5b45cc/go.mod h1:Y1SNZ4dRUOKXshKUbwUapqNncRrho4mkjQebgEHZLj8=
-github.com/dave/astrid v0.0.0-20170323122508-8c2895878b14/go.mod h1:Sth2QfxfATb/nW4EsrSi2KyJmbcniZ8TgTaji17D6ms=
-github.com/dave/brenda v1.1.0/go.mod h1:4wCUr6gSlu5/1Tk7akE5X7UorwiQ8Rij0SKH3/BGMOM=
-github.com/dave/courtney v0.3.0/go.mod h1:BAv3hA06AYfNUjfjQr+5gc6vxeBVOupLqrColj+QSD8=
 github.com/dave/dst v0.27.2 h1:4Y5VFTkhGLC1oddtNwuxxe36pnyLxMFXT51FOzH8Ekc=
 github.com/dave/dst v0.27.2/go.mod h1:jHh6EOibnHgcUW3WjKHisiooEkYwqpHLBSX1iOBhEyc=
-github.com/dave/gopackages v0.0.0-20170318123100-46e7023ec56e/go.mod h1:i00+b/gKdIDIxuLDFob7ustLAVqhsZRk2qVZrArELGQ=
-github.com/dave/jennifer v1.4.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg=
 github.com/dave/jennifer v1.5.0 h1:HmgPN93bVDpkQyYbqhCHj5QlgvUkvEOzMyEvKLgCRrg=
 github.com/dave/jennifer v1.5.0/go.mod h1:4MnyiFIlZS3l5tSDn8VnzE6ffAhYBMB2SZntBsZGUok=
-github.com/dave/kerr v0.0.0-20170318121727-bc25dd6abe8e/go.mod h1:qZqlPyPvfsDJt+3wHJ1EvSXDuVjFTK0j2p/ca+gtsb8=
-github.com/dave/patsy v0.0.0-20210517141501-957256f50cba/go.mod h1:qfR88CgEGLoiqDaE+xxDCi5QA5v4vUoW0UCX2Nd5Tlc=
-github.com/dave/rebecca v0.9.1/go.mod h1:N6XYdMD/OKw3lkF3ywh8Z6wPGuwNFDNtWYEMFWEmXBA=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dchest/uniuri v0.0.0-20160212164326-8902c56451e9/go.mod h1:GgB8SF9nRG+GqaDtLcwJZsQFhcogVCJ79j4EdT0c2V4=
-github.com/deepmap/oapi-codegen v1.12.4 h1:pPmn6qI9MuOtCz82WY2Xaw46EQjgvxednXXrP7g5Q2s=
-github.com/deepmap/oapi-codegen v1.12.4/go.mod h1:3lgHGMu6myQ2vqbbTXH2H1o4eXFTGnFiDaOaKKl5yas=
+github.com/deepmap/oapi-codegen v1.13.0 h1:cnFHelhsRQbYvanCUAbRSn/ZpkUb1HPRlQcu8YqSORQ=
+github.com/deepmap/oapi-codegen v1.13.0/go.mod h1:Amy7tbubKY9qkZOXqymI3Z6xSbndmu+atMJheLdyg44=
 github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM=
-github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM=
-github.com/denisenkom/go-mssqldb v0.12.0 h1:VtrkII767ttSPNRfFekePK3sctr+joXgO58stqQbtUA=
 github.com/denisenkom/go-mssqldb v0.12.0/go.mod h1:iiK0YP1ZeepvmBQk/QpLEhhTNJgfzrpArPY/aFvc9yU=
 github.com/dennwc/varint v1.0.0 h1:kGNFFSSw8ToIy3obO/kKr8U9GZYUAxQEVuix4zfDWzE=
 github.com/dennwc/varint v1.0.0/go.mod h1:hnItb35rvZvJrbTALZtY/iQfDs48JKRG1RPpgziApxA=
 github.com/devigned/tab v0.1.1/go.mod h1:XG9mPq0dFghrYvoBF3xdRrJzSTX1b7IQrvaL9mzjeJY=
-github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
-github.com/dgraph-io/ristretto v0.0.1/go.mod h1:T40EBc7CJke8TkpiYfGGKAeFjSaxuFXhuXRyumBd6RE=
-github.com/dgraph-io/ristretto v0.0.2/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E=
-github.com/dgraph-io/ristretto v0.1.0 h1:Jv3CGQHp9OjuMBSne1485aDpUkTKEcUqF+jm/LuerPI=
-github.com/dgraph-io/ristretto v0.1.0/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu6v9Vcb3Q9ug=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
-github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y=
-github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw=
 github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 h1:y7y0Oa6UawqTFPCDw9JG6pdKt4F9pAhHv0B7FMGaGD0=
 github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
-github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/dhui/dktest v0.3.0/go.mod h1:cyzIUfGsBEbZ6BT7tnXqAShHSXCZhSNmFl70sZ7c1yc=
-github.com/digitalocean/godo v1.97.0 h1:p9w1yCcWMZcxFSLPToNGXA96WfUVLXqoHti6GzVomL4=
-github.com/digitalocean/godo v1.97.0/go.mod h1:NRpFznZFvhHjBoqZAaOD3khVzsJ3EibzKqFL4R60dmA=
+github.com/digitalocean/godo v1.106.0 h1:m5iErwl3xHovGFlawd50n54ntgXHt1BLsvU6BXsVxEU=
+github.com/digitalocean/godo v1.106.0/go.mod h1:R6EmmWI8CT1+fCtjWY9UCB+L5uufuZH13wk3YhxycCs=
 github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8=
 github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=
 github.com/dlmiddlecote/sqlstats v1.0.2 h1:gSU11YN23D/iY50A2zVYwgXgy072khatTsIW6UPjUtI=
@@ -1011,8 +1637,8 @@ github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
 github.com/docker/distribution v2.7.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
-github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
+github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
+github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
@@ -1034,36 +1660,28 @@ github.com/drone/runner-go v1.12.0 h1:zUjDj9ylsJ4n4Mvy4znddq/Z4EBzcUXzTltpzokKtg
 github.com/drone/runner-go v1.12.0/go.mod h1:vu4pPPYDoeN6vdYQAY01GGGsAIW4aLganJNaa8Fx8zE=
 github.com/drone/signal v1.0.0/go.mod h1:S8t92eFT0g4WUgEc/LxG+LCuiskpMNsG0ajAMGnyZpc=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/dustin/go-humanize v0.0.0-20180713052910-9f541cc9db5d/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
-github.com/ecordell/optgen v0.0.6 h1:aSknPe6ZUBrjwHGp2+6XfmfCGYGD6W0ZDfCmmsrS7s4=
-github.com/ecordell/optgen v0.0.6/go.mod h1:bAPkLVWcBlTX5EkXW0UTPRj3+yjq2I6VLgH8OasuQEM=
 github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
 github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
 github.com/edsrzf/mmap-go v1.1.0 h1:6EUwBLQ/Mcr1EYLE4Tn1VdW1A4ckqCQWZBw8Hr0kjpQ=
 github.com/edsrzf/mmap-go v1.1.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q=
-github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
-github.com/elastic/go-sysinfo v1.1.1/go.mod h1:i1ZYdU10oLNfRzq4vq62BEwD2fH8KaWh6eh0ikPT9F0=
-github.com/elastic/go-windows v1.0.0/go.mod h1:TsU0Nrp7/y3+VwE82FoZF8gC/XFg/Elz6CcloAxnPgU=
-github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
-github.com/elazarl/goproxy v0.0.0-20181003060214-f58a169a71a5/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
 github.com/elazarl/goproxy v0.0.0-20230731152917-f99041a5c027 h1:1L0aalTpPz7YlMxETKpmQoWMBkeiuorElZIXoNmgiPE=
 github.com/elazarl/goproxy v0.0.0-20230731152917-f99041a5c027/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
 github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
 github.com/elazarl/goproxy/ext v0.0.0-20220115173737-adb46da277ac h1:9yrT5tmn9Zc0ytWPASlaPwQfQMQYnRf0RSDe1XvHw0Q=
+github.com/elazarl/goproxy/ext v0.0.0-20220115173737-adb46da277ac/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
 github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
-github.com/emicklei/go-restful/v3 v3.10.1 h1:rc42Y5YTp7Am7CS630D7JmhRjq4UlEUuEKfrDac4bSQ=
-github.com/emicklei/go-restful/v3 v3.10.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.10.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
+github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/emicklei/proto v1.10.0 h1:pDGyFRVV5RvV+nkBK9iy3q67FBy9Xa7vwrOTE+g5aGw=
 github.com/emicklei/proto v1.10.0/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A=
-github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
-github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
 github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -1076,15 +1694,22 @@ github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.
 github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
 github.com/envoyproxy/go-control-plane v0.10.3/go.mod h1:fJJn/j26vwOu972OllsvAgJJM//w9BV6Fxbg2LuVd34=
 github.com/envoyproxy/go-control-plane v0.11.0/go.mod h1:VnHyVMpzcLvCFt9yUz1UnCwHLhwx1WguiVDV7pTG/tI=
-github.com/envoyproxy/go-control-plane v0.11.1 h1:wSUXTlLfiAQRWs2F+p+EKOY9rUyis1MyGqJ2DIk5HpM=
+github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f/go.mod h1:sfYdkwUW4BA3PbKjySwjJy+O4Pu0h62rlqCMHNk+K+Q=
+github.com/envoyproxy/go-control-plane v0.11.1/go.mod h1:uhMcXKCQMEJHiAb0w+YGefQLaTEw+YhGluxZkrTmD0g=
+github.com/envoyproxy/go-control-plane v0.12.0 h1:4X+VP1GHd1Mhj6IB5mMeGbLCleqxjletLK6K0rbxyZI=
+github.com/envoyproxy/go-control-plane v0.12.0/go.mod h1:ZBTaoJ23lqITozF0M6G4/IragXCQKCnYbmlmtHvwRG0=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo=
 github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w=
-github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA=
-github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
-github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
+github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
+github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
+github.com/envoyproxy/protoc-gen-validate v1.0.1/go.mod h1:0vj8bNkYbSTNS2PIyH87KZaeN4x9zpL9Qt8fQC7d+vs=
+github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE=
+github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A=
+github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew=
 github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
+github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
+github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
@@ -1093,12 +1718,9 @@ github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYF
 github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
 github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
 github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
-github.com/fatih/structs v1.0.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
-github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
-github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
 github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0=
-github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
+github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
+github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
@@ -1112,54 +1734,39 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
 github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
-github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
-github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
+github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/fsouza/fake-gcs-server v1.7.0/go.mod h1:5XIRs4YvwNbNoz+1JF8j6KLAyDh7RHGAyAK3EP2EsNk=
-github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc=
+github.com/fullstorydev/grpchan v1.1.1 h1:heQqIJlAv5Cnks9a70GRL2EJke6QQoUB25VGR6TZQas=
+github.com/fullstorydev/grpchan v1.1.1/go.mod h1:f4HpiV8V6htfY/K44GWV1ESQzHBTq7DinhzqQ95lpgc=
+github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
+github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
 github.com/gchaincl/sqlhooks v1.3.0 h1:yKPXxW9a5CjXaVf2HkQn6wn7TZARvbAOAelr3H8vK2Y=
 github.com/gchaincl/sqlhooks v1.3.0/go.mod h1:9BypXnereMT0+Ys8WGWHqzgkkOfHIhyeUCqXC24ra34=
 github.com/getkin/kin-openapi v0.120.0 h1:MqJcNJFrMDFNc07iwE8iFC5eT2k/NPUFDIpNeiZv8Jg=
 github.com/getkin/kin-openapi v0.120.0/go.mod h1:PCWw/lfBrJY4HcdqE3jj+QFkaFK8ABoqo7PvqVhXXqw=
-github.com/getsentry/sentry-go v0.12.0 h1:era7g0re5iY13bHSdN/xMkyV+5zZppjRVQhZrXCaEIk=
-github.com/getsentry/sentry-go v0.12.0/go.mod h1:NSap0JBYWzHND8oMbyi0+XZhUalc1TBdRL1M71JZW2c=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 h1:Mn26/9ZMNWSw9C9ERFA1PUxfmGpolnw2v0bKOREu5ew=
 github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I=
-github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
+github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM=
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/gin-gonic/gin v1.7.3/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
-github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0=
-github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
-github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
-github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
+github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
+github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
 github.com/go-asn1-ber/asn1-ber v1.5.4 h1:vXT6d/FNDiELJnLb6hGNa309LMsrCoYFvpwHDF0+Y1A=
 github.com/go-asn1-ber/asn1-ber v1.5.4/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
-github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo=
-github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98=
-github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
-github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g=
 github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks=
 github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
 github.com/go-fonts/liberation v0.2.0/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
 github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmnUIzUY=
-github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4=
-github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E=
-github.com/go-git/go-billy/v5 v5.2.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
-github.com/go-git/go-billy/v5 v5.3.1 h1:CPiOUAzKtMRvolEKw+bG1PLRpT7D3LIs3/3ey4Aiu34=
-github.com/go-git/go-billy/v5 v5.3.1/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
-github.com/go-git/go-git-fixtures/v4 v4.2.1 h1:n9gGL1Ct/yIw+nfsfr8s4+sbhT+Ncu2SubfXjIWgci8=
-github.com/go-git/go-git-fixtures/v4 v4.2.1/go.mod h1:K8zd3kDUAykwTdDCr+I0per6Y6vMiRR/nnVTBtavnB0=
-github.com/go-git/go-git/v5 v5.4.2 h1:BXyZu9t0VkbiHtqrsvdq39UDhGJTl1h55VW6CSC4aY4=
-github.com/go-git/go-git/v5 v5.4.2/go.mod h1:gQ1kArt6d+n+BGd+/B/I74HwRTLhth2+zti4ihgckDc=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
-github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo=
-github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
+github.com/go-jose/go-jose/v3 v3.0.3 h1:fFKWeig/irsp7XD2zBxvnmA/XaRWp5V3CBsZXJF7G7k=
+github.com/go-jose/go-jose/v3 v3.0.3/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o=
@@ -1183,124 +1790,98 @@ github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTg
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
 github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
+github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A=
-github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8=
-github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI=
-github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
-github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
-github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk=
-github.com/go-openapi/analysis v0.19.4/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk=
-github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2rCu0v0ObL0AU=
-github.com/go-openapi/analysis v0.19.10/go.mod h1:qmhS3VNFxBlquFJ0RGoDtylO9y4pgTAUNE9AEEMdlJQ=
+github.com/go-logr/zapr v1.2.3/go.mod h1:eIauM6P8qSvTw5o2ez6UEAfGjQKrxQTl5EoK+Qa2oG4=
 github.com/go-openapi/analysis v0.21.2/go.mod h1:HZwRk4RRisyG8vx2Oe6aqeSQcoxRp47Xkp3+K6q+LdY=
-github.com/go-openapi/analysis v0.21.4 h1:ZDFLvSNxpDaomuCueM0BlSXxpANBlFYiBvr+GXrvIHc=
 github.com/go-openapi/analysis v0.21.4/go.mod h1:4zQ35W4neeZTqh3ol0rv/O8JBbka9QyAgQRPp9y3pfo=
-github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
-github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
-github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
-github.com/go-openapi/errors v0.19.3/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
-github.com/go-openapi/errors v0.19.6/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
+github.com/go-openapi/analysis v0.21.5/go.mod h1:25YcZosX9Lwz2wBsrFrrsL8bmjjXdlyP6zsr2AMy29M=
+github.com/go-openapi/analysis v0.22.0/go.mod h1:acDnkkCI2QxIo8sSIPgmp1wUlRohV7vfGtAIVae73b0=
+github.com/go-openapi/analysis v0.22.2 h1:ZBmNoP2h5omLKr/srIC9bfqrUGzT6g6gNv03HE9Vpj0=
+github.com/go-openapi/analysis v0.22.2/go.mod h1:pDF4UbZsQTo/oNuRfAWWd4dAh4yuYf//LYorPTjrpvo=
 github.com/go-openapi/errors v0.19.8/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
 github.com/go-openapi/errors v0.19.9/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
-github.com/go-openapi/errors v0.20.0/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
 github.com/go-openapi/errors v0.20.2/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
-github.com/go-openapi/errors v0.20.3/go.mod h1:Z3FlZ4I8jEGxjUK+bugx3on2mIAk4txuAOhlsB1FSgk=
-github.com/go-openapi/errors v0.20.4 h1:unTcVm6PispJsMECE3zWgvG4xTiKda1LIR5rCRWLG6M=
 github.com/go-openapi/errors v0.20.4/go.mod h1:Z3FlZ4I8jEGxjUK+bugx3on2mIAk4txuAOhlsB1FSgk=
-github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
-github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
-github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
+github.com/go-openapi/errors v0.21.0 h1:FhChC/duCnfoLj1gZ0BgaBmzhJC2SL/sJr8a2vAobSY=
+github.com/go-openapi/errors v0.21.0/go.mod h1:jxNTMUxRCKj65yb/okJGEtahVd7uvWnuWfj53bse4ho=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
 github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
-github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
-github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
-github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
-github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
+github.com/go-openapi/jsonpointer v0.20.0/go.mod h1:6PGzBjjIIumbLYysB73Klnms1mwnU4G3YHOECG3CedA=
+github.com/go-openapi/jsonpointer v0.20.1/go.mod h1:bHen+N0u1KEO3YlmqOjTT9Adn1RfD91Ar825/PuiRVs=
+github.com/go-openapi/jsonpointer v0.20.2 h1:mQc3nmndL8ZBzStEo3JYF8wzmeWffDH4VbXz58sAx6Q=
+github.com/go-openapi/jsonpointer v0.20.2/go.mod h1:bHen+N0u1KEO3YlmqOjTT9Adn1RfD91Ar825/PuiRVs=
 github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns=
 github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo=
 github.com/go-openapi/jsonreference v0.20.1/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
-github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
 github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
-github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
-github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
-github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
-github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs=
-github.com/go-openapi/loads v0.19.3/go.mod h1:YVfqhUCdahYwR3f3iiwQLhicVRvLlU/WO5WPaZvcvSI=
-github.com/go-openapi/loads v0.19.5/go.mod h1:dswLCAdonkRufe/gSUC3gN8nTSaB9uaS2es0x5/IbjY=
+github.com/go-openapi/jsonreference v0.20.3/go.mod h1:FviDZ46i9ivh810gqzFLl5NttD5q3tSlMLqLr6okedM=
+github.com/go-openapi/jsonreference v0.20.4 h1:bKlDxQxQJgwpUSgOENiMPzCTBVuc7vTdXSSgNeAhojU=
+github.com/go-openapi/jsonreference v0.20.4/go.mod h1:5pZJyJP2MnYCpoeoMAql78cCHauHj0V9Lhc506VOpw4=
 github.com/go-openapi/loads v0.21.1/go.mod h1:/DtAMXXneXFjbQMGEtbamCZb+4x7eGwkvZCvBmwUG+g=
-github.com/go-openapi/loads v0.21.2 h1:r2a/xFIYeZ4Qd2TnGpWDIQNcP80dIaZgf704za8enro=
 github.com/go-openapi/loads v0.21.2/go.mod h1:Jq58Os6SSGz0rzh62ptiu8Z31I+OTHqmULx5e/gJbNw=
-github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA=
-github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64=
-github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4=
-github.com/go-openapi/runtime v0.19.15/go.mod h1:dhGWCTKRXlAfGnQG0ONViOZpjfg0m2gUt9nTQPQZuoo=
-github.com/go-openapi/runtime v0.19.26/go.mod h1:BvrQtn6iVb2QmiVXRsFAm6ZCAZBpbVKFfN6QWCp582M=
-github.com/go-openapi/runtime v0.26.0 h1:HYOFtG00FM1UvqrcxbEJg/SwvDRvYLQKGhw2zaQjTcc=
-github.com/go-openapi/runtime v0.26.0/go.mod h1:QgRGeZwrUcSHdeh4Ka9Glvo0ug1LC5WyE+EV88plZrQ=
-github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
-github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
-github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY=
-github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
-github.com/go-openapi/spec v0.19.6/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk=
-github.com/go-openapi/spec v0.19.8/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk=
+github.com/go-openapi/loads v0.21.3/go.mod h1:Y3aMR24iHbKHppOj91nQ/SHc0cuPbAr4ndY4a02xydc=
+github.com/go-openapi/loads v0.21.5 h1:jDzF4dSoHw6ZFADCGltDb2lE4F6De7aWSpe+IcsRzT0=
+github.com/go-openapi/loads v0.21.5/go.mod h1:PxTsnFBoBe+z89riT+wYt3prmSBP6GDAQh2l9H1Flz8=
+github.com/go-openapi/runtime v0.27.1 h1:ae53yaOoh+fx/X5Eaq8cRmavHgDma65XPZuvBqvJYto=
+github.com/go-openapi/runtime v0.27.1/go.mod h1:fijeJEiEclyS8BRurYE1DE5TLb9/KZl6eAdbzjsrlLU=
 github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I=
 github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
-github.com/go-openapi/spec v0.20.8/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
-github.com/go-openapi/spec v0.20.9 h1:xnlYNQAwKd2VQRRfwTEI0DcK+2cbuvI/0c7jx3gA8/8=
 github.com/go-openapi/spec v0.20.9/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
-github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
-github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
-github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY=
-github.com/go-openapi/strfmt v0.19.2/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU=
-github.com/go-openapi/strfmt v0.19.3/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU=
-github.com/go-openapi/strfmt v0.19.4/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk0dgdHXr2Qk=
-github.com/go-openapi/strfmt v0.19.5/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk0dgdHXr2Qk=
+github.com/go-openapi/spec v0.20.12/go.mod h1:iSCgnBcwbMW9SfzJb8iYynXvcY6C/QFrI7otzF7xGM4=
+github.com/go-openapi/spec v0.20.13/go.mod h1:8EOhTpBoFiask8rrgwbLC3zmJfz4zsCUueRuPM6GNkw=
+github.com/go-openapi/spec v0.20.14 h1:7CBlRnw+mtjFGlPDRZmAMnq35cRzI91xj03HVyUi/Do=
+github.com/go-openapi/spec v0.20.14/go.mod h1:8EOhTpBoFiask8rrgwbLC3zmJfz4zsCUueRuPM6GNkw=
 github.com/go-openapi/strfmt v0.21.0/go.mod h1:ZRQ409bWMj+SOgXofQAGTIo2Ebu72Gs+WaRADcS5iNg=
 github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k=
 github.com/go-openapi/strfmt v0.21.3/go.mod h1:k+RzNO0Da+k3FrrynSNN8F7n/peCmQQqbbXjtDfvmGg=
-github.com/go-openapi/strfmt v0.21.7 h1:rspiXgNWgeUzhjo1YU01do6qsahtJNByjLVbPLNHb8k=
-github.com/go-openapi/strfmt v0.21.7/go.mod h1:adeGTkxE44sPyLk0JV235VQAO/ZXUr8KAzYjclFs3ew=
-github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
-github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
-github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-openapi/strfmt v0.21.9/go.mod h1:0k3v301mglEaZRJdDDGSlN6Npq4VMVU69DE0LUyf7uA=
+github.com/go-openapi/strfmt v0.21.10/go.mod h1:vNDMwbilnl7xKiO/Ve/8H8Bb2JIInBnH+lqiw6QWgis=
+github.com/go-openapi/strfmt v0.22.0 h1:Ew9PnEYc246TwrEspvBdDHS4BVKXy/AOVsfqGDgAcaI=
+github.com/go-openapi/strfmt v0.22.0/go.mod h1:HzJ9kokGIju3/K6ap8jL+OlGAbjpSv27135Yr9OivU4=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.19.7/go.mod h1:ao+8BpOPyKdpQz3AOJfbeEVpLmWAvlT1IfTe5McPyhY=
-github.com/go-openapi/swag v0.19.9/go.mod h1:ao+8BpOPyKdpQz3AOJfbeEVpLmWAvlT1IfTe5McPyhY=
-github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
 github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
 github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
 github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
-github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU=
 github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
-github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
-github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
-github.com/go-openapi/validate v0.19.3/go.mod h1:90Vh6jjkTn+OT1Eefm0ZixWNFjhtOH7vS9k0lo6zwJo=
-github.com/go-openapi/validate v0.19.10/go.mod h1:RKEZTUWDkxKQxN2jDT7ZnZi2bhZlbNMAuKvKB+IaGx8=
-github.com/go-openapi/validate v0.22.1 h1:G+c2ub6q47kfX1sOBLwIQwzBVt8qmOAARyo/9Fqs9NU=
+github.com/go-openapi/swag v0.22.5/go.mod h1:Gl91UqO+btAM0plGGxHqJcQZ1ZTy6jbmridBTsDy8A0=
+github.com/go-openapi/swag v0.22.6/go.mod h1:Gl91UqO+btAM0plGGxHqJcQZ1ZTy6jbmridBTsDy8A0=
+github.com/go-openapi/swag v0.22.9 h1:XX2DssF+mQKM2DHsbgZK74y/zj4mo9I99+89xUmuZCE=
+github.com/go-openapi/swag v0.22.9/go.mod h1:3/OXnFfnMAwBD099SwYRk7GD3xOrr1iL7d/XNLXVVwE=
 github.com/go-openapi/validate v0.22.1/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg=
+github.com/go-openapi/validate v0.22.4/go.mod h1:qm6O8ZIcPVdSY5219468Jv7kBdGvkiZLPOmqnqTUZ2A=
+github.com/go-openapi/validate v0.23.0 h1:2l7PJLzCis4YUGEoW6eoQw3WhyM65WSIcjX6SQnlfDw=
+github.com/go-openapi/validate v0.23.0/go.mod h1:EeiAZ5bmpSIOJV1WLfyYF9qp/B1ZgSaEpHTJHtN5cbE=
 github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M=
 github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
+github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
+github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
+github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
+github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
+github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
 github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
+github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js=
+github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
 github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
 github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
-github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48/go.mod h1:dZGr0i9PLlaaTD4H/hoZIDjQ+r6xq8mgbRzHZf7f2J8=
-github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY=
-github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I=
+github.com/go-resty/resty/v2 v2.9.1/go.mod h1:4/GYJVjh9nhkhGR6AUNW3XhpDYNUr+Uvy9gV/VGZIy4=
+github.com/go-resty/resty/v2 v2.10.0 h1:Qla4W/+TMmv0fOeeRqzEpXPLfTUnR5HZ1+lGs+CkiCo=
+github.com/go-resty/resty/v2 v2.10.0/go.mod h1:iiP/OpA0CkcL3IGt1O0+/SIItFUbkkyw5BGXiVdTu+A=
 github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU=
 github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
-github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
 github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
@@ -1309,277 +1890,55 @@ github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
 github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM=
+github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
 github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk8V3XHWUcJmYTh+ZnlHVyc+A4oZYS3Y=
 github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
 github.com/go-zookeeper/zk v1.0.2/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
 github.com/go-zookeeper/zk v1.0.3 h1:7M2kwOsc//9VeeFiPtf+uSJlVpU66x9Ba5+8XK7/TDg=
 github.com/go-zookeeper/zk v1.0.3/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
 github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
-github.com/gobuffalo/attrs v0.1.0/go.mod h1:fmNpaWyHM0tRm8gCZWKx8yY9fvaNLo2PyzBNSrBZ5Hw=
-github.com/gobuffalo/buffalo v0.12.8-0.20181004233540-fac9bb505aa8/go.mod h1:sLyT7/dceRXJUxSsE813JTQtA3Eb1vjxWfo/N//vXIY=
-github.com/gobuffalo/buffalo v0.13.0/go.mod h1:Mjn1Ba9wpIbpbrD+lIDMy99pQ0H0LiddMIIDGse7qT4=
-github.com/gobuffalo/buffalo-plugins v1.0.2/go.mod h1:pOp/uF7X3IShFHyobahTkTLZaeUXwb0GrUTb9ngJWTs=
-github.com/gobuffalo/buffalo-plugins v1.0.4/go.mod h1:pWS1vjtQ6uD17MVFWf7i3zfThrEKWlI5+PYLw/NaDB4=
-github.com/gobuffalo/buffalo-plugins v1.4.3/go.mod h1:uCzTY0woez4nDMdQjkcOYKanngeUVRO2HZi7ezmAjWY=
-github.com/gobuffalo/buffalo-plugins v1.5.1/go.mod h1:jbmwSZK5+PiAP9cC09VQOrGMZFCa/P0UMlIS3O12r5w=
-github.com/gobuffalo/buffalo-plugins v1.6.4/go.mod h1:/+N1aophkA2jZ1ifB2O3Y9yGwu6gKOVMtUmJnbg+OZI=
-github.com/gobuffalo/buffalo-plugins v1.6.5/go.mod h1:0HVkbgrVs/MnPZ/FOseDMVanCTm2RNcdM0PuXcL1NNI=
-github.com/gobuffalo/buffalo-plugins v1.6.7/go.mod h1:ZGZRkzz2PiKWHs0z7QsPBOTo2EpcGRArMEym6ghKYgk=
-github.com/gobuffalo/buffalo-plugins v1.6.9/go.mod h1:yYlYTrPdMCz+6/+UaXg5Jm4gN3xhsvsQ2ygVatZV5vw=
-github.com/gobuffalo/buffalo-plugins v1.6.11/go.mod h1:eAA6xJIL8OuynJZ8amXjRmHND6YiusVAaJdHDN1Lu8Q=
-github.com/gobuffalo/buffalo-plugins v1.8.2/go.mod h1:9te6/VjEQ7pKp7lXlDIMqzxgGpjlKoAcAANdCgoR960=
-github.com/gobuffalo/buffalo-plugins v1.8.3/go.mod h1:IAWq6vjZJVXebIq2qGTLOdlXzmpyTZ5iJG5b59fza5U=
-github.com/gobuffalo/buffalo-plugins v1.9.4/go.mod h1:grCV6DGsQlVzQwk6XdgcL3ZPgLm9BVxlBmXPMF8oBHI=
-github.com/gobuffalo/buffalo-plugins v1.10.0/go.mod h1:4osg8d9s60txLuGwXnqH+RCjPHj9K466cDFRl3PErHI=
-github.com/gobuffalo/buffalo-plugins v1.11.0/go.mod h1:rtIvAYRjYibgmWhnjKmo7OadtnxuMG5ZQLr25ozAzjg=
-github.com/gobuffalo/buffalo-plugins v1.15.0/go.mod h1:BqSx01nwgKUQr/MArXzFkSD0QvdJidiky1OKgyfgrK8=
-github.com/gobuffalo/buffalo-pop v1.0.5/go.mod h1:Fw/LfFDnSmB/vvQXPvcXEjzP98Tc+AudyNWUBWKCwQ8=
 github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY=
 github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg=
-github.com/gobuffalo/envy v1.6.4/go.mod h1:Abh+Jfw475/NWtYMEt+hnJWRiC8INKWibIMyNt1w2Mc=
-github.com/gobuffalo/envy v1.6.5/go.mod h1:N+GkhhZ/93bGZc6ZKhJLP6+m+tCNPKwgSpH9kaifseQ=
-github.com/gobuffalo/envy v1.6.6/go.mod h1:N+GkhhZ/93bGZc6ZKhJLP6+m+tCNPKwgSpH9kaifseQ=
-github.com/gobuffalo/envy v1.6.7/go.mod h1:N+GkhhZ/93bGZc6ZKhJLP6+m+tCNPKwgSpH9kaifseQ=
-github.com/gobuffalo/envy v1.6.8/go.mod h1:N+GkhhZ/93bGZc6ZKhJLP6+m+tCNPKwgSpH9kaifseQ=
-github.com/gobuffalo/envy v1.6.9/go.mod h1:N+GkhhZ/93bGZc6ZKhJLP6+m+tCNPKwgSpH9kaifseQ=
-github.com/gobuffalo/envy v1.6.10/go.mod h1:X0CFllQjTV5ogsnUrg+Oks2yTI+PU2dGYBJOEI2D1Uo=
-github.com/gobuffalo/envy v1.6.11/go.mod h1:Fiq52W7nrHGDggFPhn2ZCcHw4u/rqXkqo+i7FB6EAcg=
-github.com/gobuffalo/envy v1.6.12/go.mod h1:qJNrJhKkZpEW0glh5xP2syQHH5kgdmgsKss2Kk8PTP0=
 github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
 github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
-github.com/gobuffalo/envy v1.7.1/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w=
-github.com/gobuffalo/envy v1.8.1/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w=
-github.com/gobuffalo/envy v1.9.0/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w=
-github.com/gobuffalo/events v1.0.3/go.mod h1:Txo8WmqScapa7zimEQIwgiJBvMECMe9gJjsKNPN3uZw=
-github.com/gobuffalo/events v1.0.7/go.mod h1:z8txf6H9jWhQ5Scr7YPLWg/cgXBRj8Q4uYI+rsVCCSQ=
-github.com/gobuffalo/events v1.0.8/go.mod h1:A5KyqT1sA+3GJiBE4QKZibse9mtOcI9nw8gGrDdqYGs=
-github.com/gobuffalo/events v1.1.3/go.mod h1:9yPGWYv11GENtzrIRApwQRMYSbUgCsZ1w6R503fCfrk=
-github.com/gobuffalo/events v1.1.4/go.mod h1:09/YRRgZHEOts5Isov+g9X2xajxdvOAcUuAHIX/O//A=
-github.com/gobuffalo/events v1.1.5/go.mod h1:3YUSzgHfYctSjEjLCWbkXP6djH2M+MLaVRzb4ymbAK0=
-github.com/gobuffalo/events v1.1.7/go.mod h1:6fGqxH2ing5XMb3EYRq9LEkVlyPGs4oO/eLzh+S8CxY=
-github.com/gobuffalo/events v1.1.8/go.mod h1:UFy+W6X6VbCWS8k2iT81HYX65dMtiuVycMy04cplt/8=
-github.com/gobuffalo/events v1.1.9/go.mod h1:/0nf8lMtP5TkgNbzYxR6Bl4GzBy5s5TebgNTdRfRbPM=
-github.com/gobuffalo/events v1.3.1/go.mod h1:9JOkQVoyRtailYVE/JJ2ZQ/6i4gTjM5t2HsZK4C1cSA=
-github.com/gobuffalo/events v1.4.1/go.mod h1:SjXgWKpeSuvQDvGhgMz5IXx3Czu+IbL+XPLR41NvVQY=
-github.com/gobuffalo/fizz v1.0.12/go.mod h1:C0sltPxpYK8Ftvf64kbsQa2yiCZY4RZviurNxXdAKwc=
-github.com/gobuffalo/fizz v1.9.8/go.mod h1:w1FEn1yKNVCc49KnADGyYGRPH7jFON3ak4Bj1yUudHo=
-github.com/gobuffalo/fizz v1.10.0/go.mod h1:J2XGPO0AfJ1zKw7+2BA+6FEGAkyEsdCOLvN93WCT2WI=
-github.com/gobuffalo/flect v0.0.0-20180907193754-dc14d8acaf9f/go.mod h1:rCiQgmAE4axgBNl3jZWzS5rETRYTGOsrixTRaCPzNdA=
-github.com/gobuffalo/flect v0.0.0-20181002182613-4571df4b1daf/go.mod h1:rCiQgmAE4axgBNl3jZWzS5rETRYTGOsrixTRaCPzNdA=
-github.com/gobuffalo/flect v0.0.0-20181007231023-ae7ed6bfe683/go.mod h1:rCiQgmAE4axgBNl3jZWzS5rETRYTGOsrixTRaCPzNdA=
-github.com/gobuffalo/flect v0.0.0-20181018182602-fd24a256709f/go.mod h1:rCiQgmAE4axgBNl3jZWzS5rETRYTGOsrixTRaCPzNdA=
-github.com/gobuffalo/flect v0.0.0-20181019110701-3d6f0b585514/go.mod h1:rCiQgmAE4axgBNl3jZWzS5rETRYTGOsrixTRaCPzNdA=
-github.com/gobuffalo/flect v0.0.0-20181024204909-8f6be1a8c6c2/go.mod h1:rCiQgmAE4axgBNl3jZWzS5rETRYTGOsrixTRaCPzNdA=
-github.com/gobuffalo/flect v0.0.0-20181104133451-1f6e9779237a/go.mod h1:rCiQgmAE4axgBNl3jZWzS5rETRYTGOsrixTRaCPzNdA=
-github.com/gobuffalo/flect v0.0.0-20181114183036-47375f6d8328/go.mod h1:0HvNbHdfh+WOvDSIASqJOSxTOWSxCCUF++k/Y53v9rI=
-github.com/gobuffalo/flect v0.0.0-20181210151238-24a2b68e0316/go.mod h1:en58vff74S9b99Eg42Dr+/9yPu437QjlNsO/hBYPuOk=
-github.com/gobuffalo/flect v0.0.0-20190104192022-4af577e09bf2/go.mod h1:en58vff74S9b99Eg42Dr+/9yPu437QjlNsO/hBYPuOk=
-github.com/gobuffalo/flect v0.0.0-20190117212819-a62e61d96794/go.mod h1:397QT6v05LkZkn07oJXXT6y9FCfwC8Pug0WA2/2mE9k=
 github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs=
 github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
 github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
-github.com/gobuffalo/flect v0.1.5/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80=
-github.com/gobuffalo/flect v0.2.0/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80=
-github.com/gobuffalo/flect v0.2.1/go.mod h1:vmkQwuZYhN5Pc4ljYQZzP+1sq+NEkK+lh20jmEmX3jc=
-github.com/gobuffalo/genny v0.0.0-20180924032338-7af3a40f2252/go.mod h1:tUTQOogrr7tAQnhajMSH6rv1BVev34H2sa1xNHMy94g=
-github.com/gobuffalo/genny v0.0.0-20181003150629-3786a0744c5d/go.mod h1:WAd8HmjMVrnkAZbmfgH5dLBUchsZfqzp/WS5sQz+uTM=
-github.com/gobuffalo/genny v0.0.0-20181005145118-318a41a134cc/go.mod h1:WAd8HmjMVrnkAZbmfgH5dLBUchsZfqzp/WS5sQz+uTM=
-github.com/gobuffalo/genny v0.0.0-20181007153042-b8de7d566757/go.mod h1:+oG5Ljrw04czAHbPXREwaFojJbpUvcIy4DiOnbEJFTA=
-github.com/gobuffalo/genny v0.0.0-20181012161047-33e5f43d83a6/go.mod h1:+oG5Ljrw04czAHbPXREwaFojJbpUvcIy4DiOnbEJFTA=
-github.com/gobuffalo/genny v0.0.0-20181017160347-90a774534246/go.mod h1:+oG5Ljrw04czAHbPXREwaFojJbpUvcIy4DiOnbEJFTA=
-github.com/gobuffalo/genny v0.0.0-20181024195656-51392254bf53/go.mod h1:o9GEH5gn5sCKLVB5rHFC4tq40rQ3VRUzmx6WwmaqISE=
-github.com/gobuffalo/genny v0.0.0-20181025145300-af3f81d526b8/go.mod h1:uZ1fFYvdcP8mu0B/Ynarf6dsGvp7QFIpk/QACUuFUVI=
-github.com/gobuffalo/genny v0.0.0-20181027191429-94d6cfb5c7fc/go.mod h1:x7SkrQQBx204Y+O9EwRXeszLJDTaWN0GnEasxgLrQTA=
-github.com/gobuffalo/genny v0.0.0-20181027195209-3887b7171c4f/go.mod h1:JbKx8HSWICu5zyqWOa0dVV1pbbXOHusrSzQUprW6g+w=
-github.com/gobuffalo/genny v0.0.0-20181106193839-7dcb0924caf1/go.mod h1:x61yHxvbDCgQ/7cOAbJCacZQuHgB0KMSzoYcw5debjU=
-github.com/gobuffalo/genny v0.0.0-20181107223128-f18346459dbe/go.mod h1:utQD3aKKEsdb03oR+Vi/6ztQb1j7pO10N3OBoowRcSU=
-github.com/gobuffalo/genny v0.0.0-20181114215459-0a4decd77f5d/go.mod h1:kN2KZ8VgXF9VIIOj/GM0Eo7YK+un4Q3tTreKOf0q1ng=
-github.com/gobuffalo/genny v0.0.0-20181119162812-e8ff4adce8bb/go.mod h1:BA9htSe4bZwBDJLe8CUkoqkypq3hn3+CkoHqVOW718E=
-github.com/gobuffalo/genny v0.0.0-20181127225641-2d959acc795b/go.mod h1:l54xLXNkteX/PdZ+HlgPk1qtcrgeOr3XUBBPDbH+7CQ=
-github.com/gobuffalo/genny v0.0.0-20181128191930-77e34f71ba2a/go.mod h1:FW/D9p7cEEOqxYA71/hnrkOWm62JZ5ZNxcNIVJEaWBU=
-github.com/gobuffalo/genny v0.0.0-20181203165245-fda8bcce96b1/go.mod h1:wpNSANu9UErftfiaAlz1pDZclrYzLtO5lALifODyjuM=
-github.com/gobuffalo/genny v0.0.0-20181203201232-849d2c9534ea/go.mod h1:wpNSANu9UErftfiaAlz1pDZclrYzLtO5lALifODyjuM=
-github.com/gobuffalo/genny v0.0.0-20181206121324-d6fb8a0dbe36/go.mod h1:wpNSANu9UErftfiaAlz1pDZclrYzLtO5lALifODyjuM=
-github.com/gobuffalo/genny v0.0.0-20181207164119-84844398a37d/go.mod h1:y0ysCHGGQf2T3vOhCrGHheYN54Y/REj0ayd0Suf4C/8=
-github.com/gobuffalo/genny v0.0.0-20181211165820-e26c8466f14d/go.mod h1:sHnK+ZSU4e2feXP3PA29ouij6PUEiN+RCwECjCTB3yM=
-github.com/gobuffalo/genny v0.0.0-20190104222617-a71664fc38e7/go.mod h1:QPsQ1FnhEsiU8f+O0qKWXz2RE4TiDqLVChWkBuh1WaY=
-github.com/gobuffalo/genny v0.0.0-20190112155932-f31a84fcacf5/go.mod h1:CIaHCrSIuJ4il6ka3Hub4DR4adDrGoXGEEt2FbBxoIo=
 github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk=
 github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28=
 github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo=
 github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk=
-github.com/gobuffalo/genny v0.2.0/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk=
-github.com/gobuffalo/genny v0.3.0/go.mod h1:ywJ2CoXrTZj7rbS8HTbzv7uybnLKlsNSBhEQ+yFI3E8=
-github.com/gobuffalo/genny v0.6.0/go.mod h1:Vigx9VDiNscYpa/LwrURqGXLSIbzTfapt9+K6gF1kTA=
-github.com/gobuffalo/genny/v2 v2.0.5/go.mod h1:kRkJuAw9mdI37AiEYjV4Dl+TgkBDYf8HZVjLkqe5eBg=
 github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw=
-github.com/gobuffalo/github_flavored_markdown v1.0.4/go.mod h1:uRowCdK+q8d/RF0Kt3/DSalaIXbb0De/dmTqMQdkQ4I=
-github.com/gobuffalo/github_flavored_markdown v1.0.5/go.mod h1:U0643QShPF+OF2tJvYNiYDLDGDuQmJZXsf/bHOJPsMY=
-github.com/gobuffalo/github_flavored_markdown v1.0.7/go.mod h1:w93Pd9Lz6LvyQXEG6DktTPHkOtCbr+arAD5mkwMzXLI=
-github.com/gobuffalo/github_flavored_markdown v1.1.0/go.mod h1:TSpTKWcRTI0+v7W3x8dkSKMLJSUpuVitlptCkpeY8ic=
 github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360=
 github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg=
 github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE=
-github.com/gobuffalo/gogen v0.2.0/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360=
-github.com/gobuffalo/helpers v0.2.2/go.mod h1:xYbzUdCUpVzLwLnqV8HIjT6hmG0Cs7YIBCJkNM597jw=
-github.com/gobuffalo/helpers v0.2.4/go.mod h1:NX7v27yxPDOPTgUFYmJ5ow37EbxdoLraucOGvMNawyk=
-github.com/gobuffalo/helpers v0.5.0/go.mod h1:stpgxJ2C7T99NLyAxGUnYMM2zAtBk5NKQR0SIbd05j4=
-github.com/gobuffalo/helpers v0.6.0/go.mod h1:pncVrer7x/KRvnL5aJABLAuT/RhKRR9klL6dkUOhyv8=
-github.com/gobuffalo/helpers v0.6.1/go.mod h1:wInbDi0vTJKZBviURTLRMFLE4+nF2uRuuL2fnlYo7w4=
-github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM=
-github.com/gobuffalo/httptest v1.0.2/go.mod h1:7T1IbSrg60ankme0aDLVnEY0h056g9M1/ZvpVThtB7E=
-github.com/gobuffalo/licenser v0.0.0-20180924033006-eae28e638a42/go.mod h1:Ubo90Np8gpsSZqNScZZkVXXAo5DGhTb+WYFIjlnog8w=
-github.com/gobuffalo/licenser v0.0.0-20181025145548-437d89de4f75/go.mod h1:x3lEpYxkRG/XtGCUNkio+6RZ/dlOvLzTI9M1auIwFcw=
-github.com/gobuffalo/licenser v0.0.0-20181027200154-58051a75da95/go.mod h1:BzhaaxGd1tq1+OLKObzgdCV9kqVhbTulxOpYbvMQWS0=
-github.com/gobuffalo/licenser v0.0.0-20181109171355-91a2a7aac9a7/go.mod h1:m+Ygox92pi9bdg+gVaycvqE8RVSjZp7mWw75+K5NPHk=
-github.com/gobuffalo/licenser v0.0.0-20181128165715-cc7305f8abed/go.mod h1:oU9F9UCE+AzI/MueCKZamsezGOOHfSirltllOVeRTAE=
-github.com/gobuffalo/licenser v0.0.0-20181203160806-fe900bbede07/go.mod h1:ph6VDNvOzt1CdfaWC+9XwcBnlSTBz2j49PBwum6RFaU=
-github.com/gobuffalo/licenser v0.0.0-20181211173111-f8a311c51159/go.mod h1:ve/Ue99DRuvnTaLq2zKa6F4KtHiYf7W046tDjuGYPfM=
-github.com/gobuffalo/licenser v1.1.0/go.mod h1:ZVWE6uKUE3rGf7sedUHWVjNWrEgxaUQLVFL+pQiWpfY=
-github.com/gobuffalo/logger v0.0.0-20181022175615-46cfb361fc27/go.mod h1:8sQkgyhWipz1mIctHF4jTxmJh1Vxhp7mP8IqbljgJZo=
-github.com/gobuffalo/logger v0.0.0-20181027144941-73d08d2bb969/go.mod h1:7uGg2duHKpWnN4+YmyKBdLXfhopkAdVM6H3nKbyFbz8=
-github.com/gobuffalo/logger v0.0.0-20181027193913-9cf4dd0efe46/go.mod h1:7uGg2duHKpWnN4+YmyKBdLXfhopkAdVM6H3nKbyFbz8=
-github.com/gobuffalo/logger v0.0.0-20181109185836-3feeab578c17/go.mod h1:oNErH0xLe+utO+OW8ptXMSA5DkiSEDW1u3zGIt8F9Ew=
-github.com/gobuffalo/logger v0.0.0-20181117211126-8e9b89b7c264/go.mod h1:5etB91IE0uBlw9k756fVKZJdS+7M7ejVhmpXXiSFj0I=
-github.com/gobuffalo/logger v0.0.0-20181127160119-5b956e21995c/go.mod h1:+HxKANrR9VGw9yN3aOAppJKvhO05ctDi63w4mDnKv2U=
 github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8=
-github.com/gobuffalo/logger v1.0.0/go.mod h1:2zbswyIUa45I+c+FLXuWl9zSWEiVuthsk8ze5s8JvPs=
-github.com/gobuffalo/logger v1.0.1/go.mod h1:2zbswyIUa45I+c+FLXuWl9zSWEiVuthsk8ze5s8JvPs=
-github.com/gobuffalo/logger v1.0.3/go.mod h1:SoeejUwldiS7ZsyCBphOGURmWdwUFXs0J7TCjEhjKxM=
-github.com/gobuffalo/makr v1.1.5/go.mod h1:Y+o0btAH1kYAMDJW/TX3+oAXEu0bmSLLoC9mIFxtzOw=
-github.com/gobuffalo/mapi v1.0.0/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
 github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
 github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
-github.com/gobuffalo/mapi v1.1.0/go.mod h1:pqQ1XAqvpy/JYtRwoieNps2yU8MFiMxBUpAm2FBtQ50=
-github.com/gobuffalo/mapi v1.2.1/go.mod h1:giGJ2AUESRepOFYAzWpq8Gf/s/QDryxoEHisQtFN3cY=
-github.com/gobuffalo/meta v0.0.0-20181018155829-df62557efcd3/go.mod h1:XTTOhwMNryif3x9LkTTBO/Llrveezd71u3quLd0u7CM=
-github.com/gobuffalo/meta v0.0.0-20181018192820-8c6cef77dab3/go.mod h1:E94EPzx9NERGCY69UWlcj6Hipf2uK/vnfrF4QD0plVE=
-github.com/gobuffalo/meta v0.0.0-20181025145500-3a985a084b0a/go.mod h1:YDAKBud2FP7NZdruCSlmTmDOZbVSa6bpK7LJ/A/nlKg=
-github.com/gobuffalo/meta v0.0.0-20181114191255-b130ebedd2f7/go.mod h1:K6cRZ29ozr4Btvsqkjvg5nDFTLOgTqf03KA70Ks0ypE=
-github.com/gobuffalo/meta v0.0.0-20181127070345-0d7e59dd540b/go.mod h1:RLO7tMvE0IAKAM8wny1aN12pvEKn7EtkBLkUZR00Qf8=
-github.com/gobuffalo/meta v0.0.0-20190120163247-50bbb1fa260d/go.mod h1:KKsH44nIK2gA8p0PJmRT9GvWJUdphkDUA8AJEvFWiqM=
-github.com/gobuffalo/meta v0.0.0-20190329152330-e161e8a93e3b/go.mod h1:mCRSy5F47tjK8yaIDcJad4oe9fXxY5gLrx3Xx2spK+0=
-github.com/gobuffalo/meta v0.3.0/go.mod h1:cpr6mrUX5H/B4wEP86Gdq568TK4+dKUD8oRPl698RUw=
-github.com/gobuffalo/mw-basicauth v1.0.3/go.mod h1:dg7+ilMZOKnQFHDefUzUHufNyTswVUviCBgF244C1+0=
-github.com/gobuffalo/mw-contenttype v0.0.0-20180802152300-74f5a47f4d56/go.mod h1:7EvcmzBbeCvFtQm5GqF9ys6QnCxz2UM1x0moiWLq1No=
-github.com/gobuffalo/mw-csrf v0.0.0-20180802151833-446ff26e108b/go.mod h1:sbGtb8DmDZuDUQoxjr8hG1ZbLtZboD9xsn6p77ppcHo=
-github.com/gobuffalo/mw-forcessl v0.0.0-20180802152810-73921ae7a130/go.mod h1:JvNHRj7bYNAMUr/5XMkZaDcw3jZhUZpsmzhd//FFWmQ=
-github.com/gobuffalo/mw-i18n v0.0.0-20180802152014-e3060b7e13d6/go.mod h1:91AQfukc52A6hdfIfkxzyr+kpVYDodgAeT5cjX1UIj4=
-github.com/gobuffalo/mw-paramlogger v0.0.0-20181005191442-d6ee392ec72e/go.mod h1:6OJr6VwSzgJMqWMj7TYmRUqzNe2LXu/W1rRW4MAz/ME=
-github.com/gobuffalo/mw-tokenauth v0.0.0-20181001105134-8545f626c189/go.mod h1:UqBF00IfKvd39ni5+yI5MLMjAf4gX7cDKN/26zDOD6c=
-github.com/gobuffalo/nulls v0.2.0/go.mod h1:w4q8RoSCEt87Q0K0sRIZWYeIxkxog5mh3eN3C/n+dUc=
-github.com/gobuffalo/nulls v0.3.0/go.mod h1:UP49vd/k+bcaz6m0cHMyuk8oQ7XgLnkfxeiVoPAvBSs=
-github.com/gobuffalo/packd v0.0.0-20181027182251-01ad393492c8/go.mod h1:SmdBdhj6uhOsg1Ui4SFAyrhuc7U4VCildosO5IDJ3lc=
-github.com/gobuffalo/packd v0.0.0-20181027190505-aafc0d02c411/go.mod h1:SmdBdhj6uhOsg1Ui4SFAyrhuc7U4VCildosO5IDJ3lc=
-github.com/gobuffalo/packd v0.0.0-20181027194105-7ae579e6d213/go.mod h1:SmdBdhj6uhOsg1Ui4SFAyrhuc7U4VCildosO5IDJ3lc=
-github.com/gobuffalo/packd v0.0.0-20181031195726-c82734870264/go.mod h1:Yf2toFaISlyQrr5TfO3h6DB9pl9mZRmyvBGQb/aQ/pI=
-github.com/gobuffalo/packd v0.0.0-20181104210303-d376b15f8e96/go.mod h1:Yf2toFaISlyQrr5TfO3h6DB9pl9mZRmyvBGQb/aQ/pI=
-github.com/gobuffalo/packd v0.0.0-20181111195323-b2e760a5f0ff/go.mod h1:Yf2toFaISlyQrr5TfO3h6DB9pl9mZRmyvBGQb/aQ/pI=
-github.com/gobuffalo/packd v0.0.0-20181114190715-f25c5d2471d7/go.mod h1:Yf2toFaISlyQrr5TfO3h6DB9pl9mZRmyvBGQb/aQ/pI=
-github.com/gobuffalo/packd v0.0.0-20181124090624-311c6248e5fb/go.mod h1:Foenia9ZvITEvG05ab6XpiD5EfBHPL8A6hush8SJ0o8=
-github.com/gobuffalo/packd v0.0.0-20181207120301-c49825f8f6f4/go.mod h1:LYc0TGKFBBFTRC9dg2pcRcMqGCTMD7T2BIMP7OBuQAA=
-github.com/gobuffalo/packd v0.0.0-20181212173646-eca3b8fd6687/go.mod h1:LYc0TGKFBBFTRC9dg2pcRcMqGCTMD7T2BIMP7OBuQAA=
 github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
 github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
-github.com/gobuffalo/packd v0.2.0/go.mod h1:k2CkHP3bjbqL2GwxwhxUy1DgnlbW644hkLC9iIUvZwY=
-github.com/gobuffalo/packd v0.3.0/go.mod h1:zC7QkmNkYVGKPw4tHpBQ+ml7W/3tIebgeo1b36chA3Q=
-github.com/gobuffalo/packd v1.0.0/go.mod h1:6VTc4htmJRFB7u1m/4LeMTWjFoYrUiBkU9Fdec9hrhI=
-github.com/gobuffalo/packr v1.13.7/go.mod h1:KkinLIn/n6+3tVXMwg6KkNvWwVsrRAz4ph+jgpk3Z24=
-github.com/gobuffalo/packr v1.15.0/go.mod h1:t5gXzEhIviQwVlNx/+3SfS07GS+cZ2hn76WLzPp6MGI=
-github.com/gobuffalo/packr v1.15.1/go.mod h1:IeqicJ7jm8182yrVmNbM6PR4g79SjN9tZLH8KduZZwE=
-github.com/gobuffalo/packr v1.19.0/go.mod h1:MstrNkfCQhd5o+Ct4IJ0skWlxN8emOq8DsoT1G98VIU=
-github.com/gobuffalo/packr v1.20.0/go.mod h1:JDytk1t2gP+my1ig7iI4NcVaXr886+N0ecUga6884zw=
-github.com/gobuffalo/packr v1.21.0/go.mod h1:H00jGfj1qFKxscFJSw8wcL4hpQtPe1PfU2wa6sg/SR0=
-github.com/gobuffalo/packr v1.22.0/go.mod h1:Qr3Wtxr3+HuQEwWqlLnNW4t1oTvK+7Gc/Rnoi/lDFvA=
-github.com/gobuffalo/packr/v2 v2.0.0-rc.8/go.mod h1:y60QCdzwuMwO2R49fdQhsjCPv7tLQFR0ayzxxla9zes=
-github.com/gobuffalo/packr/v2 v2.0.0-rc.9/go.mod h1:fQqADRfZpEsgkc7c/K7aMew3n4aF1Kji7+lIZeR98Fc=
-github.com/gobuffalo/packr/v2 v2.0.0-rc.10/go.mod h1:4CWWn4I5T3v4c1OsJ55HbHlUEKNWMITG5iIkdr4Px4w=
-github.com/gobuffalo/packr/v2 v2.0.0-rc.11/go.mod h1:JoieH/3h3U4UmatmV93QmqyPUdf4wVM9HELaHEu+3fk=
-github.com/gobuffalo/packr/v2 v2.0.0-rc.12/go.mod h1:FV1zZTsVFi1DSCboO36Xgs4pzCZBjB/tDV9Cz/lSaR8=
-github.com/gobuffalo/packr/v2 v2.0.0-rc.13/go.mod h1:2Mp7GhBFMdJlOK8vGfl7SYtfMP3+5roE39ejlfjw0rA=
-github.com/gobuffalo/packr/v2 v2.0.0-rc.14/go.mod h1:06otbrNvDKO1eNQ3b8hst+1010UooI2MFg+B2Ze4MV8=
-github.com/gobuffalo/packr/v2 v2.0.0-rc.15/go.mod h1:IMe7H2nJvcKXSF90y4X1rjYIRlNMJYCxEhssBXNZwWs=
 github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ=
 github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0=
-github.com/gobuffalo/packr/v2 v2.4.0/go.mod h1:ra341gygw9/61nSjAbfwcwh8IrYL4WmR4IsPkPBhQiY=
-github.com/gobuffalo/packr/v2 v2.5.2/go.mod h1:sgEE1xNZ6G0FNN5xn9pevVu4nywaxHvgup67xisti08=
-github.com/gobuffalo/packr/v2 v2.7.1/go.mod h1:qYEvAazPaVxy7Y7KR0W8qYEE+RymX74kETFqjFoFlOc=
-github.com/gobuffalo/packr/v2 v2.8.0/go.mod h1:PDk2k3vGevNE3SwVyVRgQCCXETC9SaONCNSXT1Q8M1g=
-github.com/gobuffalo/plush v3.7.16+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI=
-github.com/gobuffalo/plush v3.7.20+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI=
-github.com/gobuffalo/plush v3.7.21+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI=
-github.com/gobuffalo/plush v3.7.22+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI=
-github.com/gobuffalo/plush v3.7.23+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI=
-github.com/gobuffalo/plush v3.7.30+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI=
-github.com/gobuffalo/plush v3.7.31+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI=
-github.com/gobuffalo/plush v3.7.32+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI=
-github.com/gobuffalo/plush v3.8.2+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI=
-github.com/gobuffalo/plush v3.8.3+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI=
-github.com/gobuffalo/plush/v4 v4.0.0/go.mod h1:ErFS3UxKqEb8fpFJT7lYErfN/Nw6vHGiDMTjxpk5bQ0=
-github.com/gobuffalo/plushgen v0.0.0-20181128164830-d29dcb966cb2/go.mod h1:r9QwptTFnuvSaSRjpSp4S2/4e2D3tJhARYbvEBcKSb4=
-github.com/gobuffalo/plushgen v0.0.0-20181203163832-9fc4964505c2/go.mod h1:opEdT33AA2HdrIwK1aibqnTJDVVKXC02Bar/GT1YRVs=
-github.com/gobuffalo/plushgen v0.0.0-20181207152837-eedb135bd51b/go.mod h1:Lcw7HQbEVm09sAQrCLzIxuhFbB3nAgp4c55E+UlynR0=
-github.com/gobuffalo/plushgen v0.0.0-20190104222512-177cd2b872b3/go.mod h1:tYxCozi8X62bpZyKXYHw1ncx2ZtT2nFvG42kuLwYjoc=
-github.com/gobuffalo/plushgen v0.1.2/go.mod h1:3U71v6HWZpVER1nInTXeAwdoRNsRd4W8aeIa1Lyp+Bk=
-github.com/gobuffalo/pop v4.8.2+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg=
-github.com/gobuffalo/pop v4.8.3+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg=
-github.com/gobuffalo/pop v4.8.4+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg=
-github.com/gobuffalo/pop v4.13.1+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg=
-github.com/gobuffalo/pop/v5 v5.0.11/go.mod h1:mZJHJbA3cy2V18abXYuVop2ldEJ8UZ2DK6qOekC5u5g=
-github.com/gobuffalo/pop/v5 v5.3.1/go.mod h1:vcEDhh6cJ3WVENqJDFt/6z7zNb7lLnlN8vj3n5G9rYA=
-github.com/gobuffalo/release v1.0.35/go.mod h1:VtHFAKs61vO3wboCec5xr9JPTjYyWYcvaM3lclkc4x4=
-github.com/gobuffalo/release v1.0.38/go.mod h1:VtHFAKs61vO3wboCec5xr9JPTjYyWYcvaM3lclkc4x4=
-github.com/gobuffalo/release v1.0.42/go.mod h1:RPs7EtafH4oylgetOJpGP0yCZZUiO4vqHfTHJjSdpug=
-github.com/gobuffalo/release v1.0.52/go.mod h1:RPs7EtafH4oylgetOJpGP0yCZZUiO4vqHfTHJjSdpug=
-github.com/gobuffalo/release v1.0.53/go.mod h1:FdF257nd8rqhNaqtDWFGhxdJ/Ig4J7VcS3KL7n/a+aA=
-github.com/gobuffalo/release v1.0.54/go.mod h1:Pe5/RxRa/BE8whDpGfRqSI7D1a0evGK1T4JDm339tJc=
-github.com/gobuffalo/release v1.0.61/go.mod h1:mfIO38ujUNVDlBziIYqXquYfBF+8FDHUjKZgYC1Hj24=
-github.com/gobuffalo/release v1.0.72/go.mod h1:NP5NXgg/IX3M5XmHmWR99D687/3Dt9qZtTK/Lbwc1hU=
-github.com/gobuffalo/release v1.1.1/go.mod h1:Sluak1Xd6kcp6snkluR1jeXAogdJZpFFRzTYRs/2uwg=
-github.com/gobuffalo/release v1.1.3/go.mod h1:CuXc5/m+4zuq8idoDt1l4va0AXAn/OSs08uHOfMVr8E=
-github.com/gobuffalo/release v1.1.6/go.mod h1:18naWa3kBsqO0cItXZNJuefCKOENpbbUIqRL1g+p6z0=
-github.com/gobuffalo/release v1.7.0/go.mod h1:xH2NjAueVSY89XgC4qx24ojEQ4zQ9XCGVs5eXwJTkEs=
-github.com/gobuffalo/shoulders v1.0.1/go.mod h1:V33CcVmaQ4gRUmHKwq1fiTXuf8Gp/qjQBUL5tHPmvbA=
-github.com/gobuffalo/shoulders v1.0.4/go.mod h1:LqMcHhKRuBPMAYElqOe3POHiZ1x7Ry0BE8ZZ84Bx+k4=
-github.com/gobuffalo/syncx v0.0.0-20181120191700-98333ab04150/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
-github.com/gobuffalo/syncx v0.0.0-20181120194010-558ac7de985f/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
 github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
-github.com/gobuffalo/syncx v0.1.0/go.mod h1:Mg/s+5pv7IgxEp6sA+NFpqS4o2x+R9dQNwbwT0iuOGQ=
-github.com/gobuffalo/tags v2.0.11+incompatible/go.mod h1:9XmhOkyaB7UzvuY4UoZO4s67q8/xRMVJEaakauVQYeY=
-github.com/gobuffalo/tags v2.0.14+incompatible/go.mod h1:9XmhOkyaB7UzvuY4UoZO4s67q8/xRMVJEaakauVQYeY=
-github.com/gobuffalo/tags v2.0.15+incompatible/go.mod h1:9XmhOkyaB7UzvuY4UoZO4s67q8/xRMVJEaakauVQYeY=
-github.com/gobuffalo/tags v2.1.0+incompatible/go.mod h1:9XmhOkyaB7UzvuY4UoZO4s67q8/xRMVJEaakauVQYeY=
-github.com/gobuffalo/tags v2.1.7+incompatible/go.mod h1:9XmhOkyaB7UzvuY4UoZO4s67q8/xRMVJEaakauVQYeY=
-github.com/gobuffalo/tags/v3 v3.0.2/go.mod h1:ZQeN6TCTiwAFnS0dNcbDtSgZDwNKSpqajvVtt6mlYpA=
-github.com/gobuffalo/tags/v3 v3.1.0/go.mod h1:ZQeN6TCTiwAFnS0dNcbDtSgZDwNKSpqajvVtt6mlYpA=
-github.com/gobuffalo/uuid v2.0.3+incompatible/go.mod h1:ErhIzkRhm0FtRuiE/PeORqcw4cVi1RtSpnwYrxuvkfE=
-github.com/gobuffalo/uuid v2.0.4+incompatible/go.mod h1:ErhIzkRhm0FtRuiE/PeORqcw4cVi1RtSpnwYrxuvkfE=
-github.com/gobuffalo/uuid v2.0.5+incompatible/go.mod h1:ErhIzkRhm0FtRuiE/PeORqcw4cVi1RtSpnwYrxuvkfE=
-github.com/gobuffalo/validate v2.0.3+incompatible/go.mod h1:N+EtDe0J8252BgfzQUChBgfd6L93m9weay53EWFVsMM=
-github.com/gobuffalo/validate v2.0.4+incompatible/go.mod h1:N+EtDe0J8252BgfzQUChBgfd6L93m9weay53EWFVsMM=
-github.com/gobuffalo/validate/v3 v3.0.0/go.mod h1:HFpjq+AIiA2RHoQnQVTFKF/ZpUPXwyw82LgyDPxQ9r0=
-github.com/gobuffalo/validate/v3 v3.1.0/go.mod h1:HFpjq+AIiA2RHoQnQVTFKF/ZpUPXwyw82LgyDPxQ9r0=
-github.com/gobuffalo/validate/v3 v3.2.0/go.mod h1:PrhDOdDHxtN8KUgMvF3TDL0r1YZXV4sQnyFX/EmeETY=
-github.com/gobuffalo/x v0.0.0-20181003152136-452098b06085/go.mod h1:WevpGD+5YOreDJznWevcn8NTmQEW5STSBgIkpkjzqXc=
-github.com/gobuffalo/x v0.0.0-20181007152206-913e47c59ca7/go.mod h1:9rDPXaB3kXdKWzMc4odGQQdG2e2DIEmANy5aSJ9yesY=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
+github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
 github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
+github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
+github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
 github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA=
-github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
+github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/goccy/go-yaml v1.9.5/go.mod h1:U/jl18uSupI5rdI2jmuCswEA2htH9eXfferR3KfscvA=
 github.com/gocql/gocql v0.0.0-20190301043612-f6df8288f9b4/go.mod h1:4Fw1eo5iaEhDUs8XyuhSVCVy52Jq3L+/3GJgYkwc+/0=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/gofrs/uuid v3.1.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
-github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
 github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
-github.com/gofrs/uuid/v3 v3.1.2/go.mod h1:xPwMqoocQ1L5G6pXX5BcE7N5jlzn2o19oqAKxwZW/kI=
 github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
 github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
 github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0=
@@ -1588,20 +1947,20 @@ github.com/gogo/protobuf v0.0.0-20170307180453-100ba4e88506/go.mod h1:r8qH/GZQm5
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
-github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/gogo/status v1.0.3/go.mod h1:SavQ51ycCLnc7dGyJxp8YAmudx8xqiVrRf+6IXRsugc=
-github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM=
 github.com/gogo/status v1.1.1 h1:DuHXlSFHNKqTQ+/ACf5Vs6r4X/dH2EgIzR9Vr+H65kg=
 github.com/gogo/status v1.1.1/go.mod h1:jpG3dM5QPcqu19Hg8lkUhBFBa3TcLs1DG7+2Jqci7oU=
-github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
+github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/golang-jwt/jwt/v4 v4.4.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
-github.com/golang-jwt/jwt/v4 v4.4.3/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
 github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
+github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang-migrate/migrate/v4 v4.7.0 h1:gONcHxHApDTKXDyLH/H97gEHmpu1zcnnbAaq2zgrPrs=
 github.com/golang-migrate/migrate/v4 v4.7.0/go.mod h1:Qvut3N4xKWjoH3sokBccML6WyHSnggXm/DvMMnTsQIc=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
@@ -1611,14 +1970,13 @@ github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188/go.mod h1:vXjM/+
 github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
 github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
-github.com/golang/gddo v0.0.0-20180828051604-96d2a289f41e/go.mod h1:xEhNfoBDX1hzLm2Nf80qUvZ2sVwoMZ8d6IE2SrsQfh4=
-github.com/golang/gddo v0.0.0-20190904175337-72a348e765d2/go.mod h1:xEhNfoBDX1hzLm2Nf80qUvZ2sVwoMZ8d6IE2SrsQfh4=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
-github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE=
 github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ=
+github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
+github.com/golang/glog v1.2.0 h1:uCdmnmatrKCgMBlM4rMuJZWOkPDqdbZPnrMXDY4gI68=
+github.com/golang/glog v1.2.0/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -1634,7 +1992,6 @@ github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71
 github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
 github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
 github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
-github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -1661,21 +2018,21 @@ github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219 h1:utua3L2IbQJmauC5IXdEA547bcoU5dozgQAfc8Onsg4=
-github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
+github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
 github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
 github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
-github.com/google/cel-go v0.12.6 h1:kjeKudqV0OygrAqA9fX6J55S8gj+Jre2tckIm5RoG4M=
-github.com/google/cel-go v0.12.6/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw=
+github.com/google/cel-go v0.17.7 h1:6ebJFzu1xO2n7TLtN+UBqShGBhlD85bhvglh5DpcfqQ=
+github.com/google/cel-go v0.17.7/go.mod h1:HXZKzB0LXqer5lHHgfWAnlYwJaQBDKMjxjulNQzhwhY=
 github.com/google/flatbuffers v1.11.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
+github.com/google/flatbuffers v2.0.0+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
-github.com/google/flatbuffers v23.1.21+incompatible h1:bUqzx/MXCDxuS0hRJL2EfjyZL3uQrPbMocUa8zGqsTA=
-github.com/google/flatbuffers v23.1.21+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
-github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ=
-github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0=
-github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E=
+github.com/google/flatbuffers v23.5.26+incompatible h1:M9dgRyhJemaM4Sw8+66GHBu8ioaQmyPLg1b8VwK5WJg=
+github.com/google/flatbuffers v23.5.26+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
+github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
+github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -1697,7 +2054,8 @@ github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4r
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
 github.com/google/go-github/v45 v45.2.0 h1:5oRLszbrkvxDDqBCNj2hjDZMKmvexaZ1xw/FCD+K3FI=
 github.com/google/go-github/v45 v45.2.0/go.mod h1:FObaZJEDSTa/WGCzZ2Z3eoCDXWJKMenWWTrd8jrta28=
-github.com/google/go-jsonnet v0.16.0/go.mod h1:sOcuej3UW1vpPTZOr8L7RQimqai1a57bt5j22LzGZCw=
+github.com/google/go-pkcs11 v0.2.0/go.mod h1:6eQoGcuNJpa7jnd5pMGdkSaQpNDYvPlXWMcjXXThLlY=
+github.com/google/go-pkcs11 v0.2.1-0.20230907215043-c6f79328ddf9/go.mod h1:6eQoGcuNJpa7jnd5pMGdkSaQpNDYvPlXWMcjXXThLlY=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
@@ -1732,20 +2090,25 @@ github.com/google/pprof v0.0.0-20210506205249-923b5ab0fc1a/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20230228050547-1710fef4ab10 h1:CqYfpuYIjnlNxM3msdyPRKabhXZWbKjf3Q8BWROFBso=
-github.com/google/pprof v0.0.0-20230228050547-1710fef4ab10/go.mod h1:79YE0hCXdHag9sBkw2o+N/YnZtTkXi0UT9Nnixa5eYk=
+github.com/google/pprof v0.0.0-20231205033806-a5a03c77bf08 h1:PxlBVtIFHR/mtWk2i0gTEdCz+jBnqiuHNSki0epDbVs=
+github.com/google/pprof v0.0.0-20231205033806-a5a03c77bf08/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/s2a-go v0.1.0/go.mod h1:OJpEgntRZo8ugHpF9hkoLJbS5dSI20XZeXJ9JVywLlM=
+github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
+github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
 github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o=
 github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw=
 github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
 github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/wire v0.5.0 h1:I7ELFeVBr3yfPIcc8+MWvrjk+3VjbcSzoXm3JVa+jD8=
 github.com/google/wire v0.5.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU=
 github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
@@ -1753,8 +2116,10 @@ github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY
 github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
 github.com/googleapis/enterprise-certificate-proxy v0.2.1/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
 github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
-github.com/googleapis/enterprise-certificate-proxy v0.3.1 h1:SBWmZhjUDRorQxrN0nwzf+AHBxnbFjViHQS4P0yVpmQ=
-github.com/googleapis/enterprise-certificate-proxy v0.3.1/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0=
+github.com/googleapis/enterprise-certificate-proxy v0.2.4/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
+github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w=
+github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs=
+github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
@@ -1765,84 +2130,88 @@ github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK
 github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo=
 github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY=
 github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=
+github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=
+github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=
+github.com/googleapis/gax-go/v2 v2.10.0/go.mod h1:4UOEnMCrxsSqQ940WnTiD6qJ63le2ev3xfyagutxiPw=
+github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI=
 github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas=
 github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=
 github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
-github.com/gophercloud/gophercloud v1.2.0 h1:1oXyj4g54KBg/kFtCdMM6jtxSzeIyg8wv4z1HoGPp1E=
-github.com/gophercloud/gophercloud v1.2.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM=
-github.com/gopherjs/gopherjs v0.0.0-20181004151105-1babbf986f6f/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gophercloud/gophercloud v1.8.0 h1:TM3Jawprb2NrdOnvcHhWJalmKmAmOGgfZElM/3oBYCk=
+github.com/gophercloud/gophercloud v1.8.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg=
 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
-github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
-github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
-github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
-github.com/gorilla/pat v0.0.0-20180118222023-199c85a7f6d1/go.mod h1:YeAe0gNeiNT5hoiZRI4yiOky6jVdNvfO2N6Kav/HmxY=
+github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
+github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
+github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
-github.com/gorilla/sessions v1.1.2/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
-github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
+github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI=
 github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/gotestyourself/gotestyourself v1.3.0/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY=
-github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY=
-github.com/grafana/alerting v0.0.0-20231017091417-a53b5db2235d h1:fxHDUyKFc1mfyJAtW+Qxi66dMahYu+o5/lH+f8SoMHg=
-github.com/grafana/alerting v0.0.0-20231017091417-a53b5db2235d/go.mod h1:6BES5CyEqz7fDAG3MYvJLe0hqGwvIoGDN8A1aNrLGus=
+github.com/grafana/alerting v0.0.0-20240322221449-89ae4e299bf8 h1:ndBSFAHmJRWqln2uNys7lV0+9U8tlW6ZuNz8ETW60Us=
+github.com/grafana/alerting v0.0.0-20240322221449-89ae4e299bf8/go.mod h1:0nHKO0w8OTemvZ3eh7+s1EqGGhgbs0kvkTeLU1FrbTw=
+github.com/grafana/authlib v0.0.0-20240319083410-9d4a6e3861e5 h1:A13Z8Hy60BfIduM819kpk0njrRKjbAVbVRhE+R+AF/8=
+github.com/grafana/authlib v0.0.0-20240319083410-9d4a6e3861e5/go.mod h1:86rRD5P6u2JPWtNWTMOlqlU+YMv2fUvVz/DomA6L7w4=
 github.com/grafana/codejen v0.0.3 h1:tAWxoTUuhgmEqxJPOLtJoxlPBbMULFwKFOcRsPRPXDw=
 github.com/grafana/codejen v0.0.3/go.mod h1:zmwwM/DRyQB7pfuBjTWII3CWtxcXh8LTwAYGfDfpR6s=
 github.com/grafana/cue v0.0.0-20230926092038-971951014e3f h1:TmYAMnqg3d5KYEAaT6PtTguL2GjLfvr6wnAX8Azw6tQ=
 github.com/grafana/cue v0.0.0-20230926092038-971951014e3f/go.mod h1:okjJBHFQFer+a41sAe2SaGm1glWS8oEb6CmJvn5Zdws=
-github.com/grafana/cuetsy v0.1.10 h1:+W9/7roI8LorL+D1RJhKGdhsTZ81adrK9dHS0r7qsXs=
-github.com/grafana/cuetsy v0.1.10/go.mod h1:Ix97+CPD8ws9oSSxR3/Lf4ahU1I4Np83kjJmDVnLZvc=
+github.com/grafana/cuetsy v0.1.11 h1:I3IwBhF+UaQxRM79HnImtrAn8REGdb5M3+C4QrYHoWk=
+github.com/grafana/cuetsy v0.1.11/go.mod h1:Ix97+CPD8ws9oSSxR3/Lf4ahU1I4Np83kjJmDVnLZvc=
 github.com/grafana/dataplane/examples v0.0.1 h1:K9M5glueWyLoL4//H+EtTQq16lXuHLmOhb6DjSCahzA=
 github.com/grafana/dataplane/examples v0.0.1/go.mod h1:h5YwY8s407/17XF5/dS8XrUtsTVV2RnuW8+m1Mp46mg=
-github.com/grafana/dataplane/sdata v0.0.6 h1:Ejlj8d1Hvy/uDLeI4sOvL34Y8WLlVDd9iN270F+8aTw=
-github.com/grafana/dataplane/sdata v0.0.6/go.mod h1:Jvs5ddpGmn6vcxT7tCTWAZ1mgi4sbcdFt9utQx5uMAU=
-github.com/grafana/dskit v0.0.0-20230706162620-5081d8ed53e6 h1:/19OPOCKP95g9hKLn1mN2dR/qBE4+oEY2F9XZ7G1xJM=
-github.com/grafana/dskit v0.0.0-20230706162620-5081d8ed53e6/go.mod h1:M03k2fzuQ2n9TVE1xfVKTESibxsXdw0wYfWT3+9Owp4=
+github.com/grafana/dataplane/sdata v0.0.7 h1:CImITypIyS1jxijCR6xqKx71JnYAxcwpH9ChK0gH164=
+github.com/grafana/dataplane/sdata v0.0.7/go.mod h1:Jvs5ddpGmn6vcxT7tCTWAZ1mgi4sbcdFt9utQx5uMAU=
+github.com/grafana/dskit v0.0.0-20240104111617-ea101a3b86eb h1:AWE6+kvtE18HP+lRWNUCyvymyrFSXs6TcS2vXIXGIuw=
+github.com/grafana/dskit v0.0.0-20240104111617-ea101a3b86eb/go.mod h1:kkWM4WUV230bNG3urVRWPBnSJHs64y/0RmWjftnnn0c=
 github.com/grafana/gofpdf v0.0.0-20231002120153-857cc45be447 h1:jxJJ5z0GxqhWFbQUsys3BHG8jnmniJ2Q74tXAG1NaDo=
 github.com/grafana/gofpdf v0.0.0-20231002120153-857cc45be447/go.mod h1:IxsY6mns6Q5sAnWcrptrgUrSglTZJXH/kXr9nbpb/9I=
-github.com/grafana/grafana-aws-sdk v0.19.1 h1:5GBiOv2AgdyjwlgAX+dtgPtXU4FgMTD9rfQUPQseEpQ=
-github.com/grafana/grafana-aws-sdk v0.19.1/go.mod h1:ntq2NDH12Y2Fkbc6fozpF8kYsJM9k6KNr+Xfo5w3/iM=
-github.com/grafana/grafana-azure-sdk-go v1.9.0 h1:4JRwlqgUtPRAQSoiV4DFZDQ3lbNsauHqj9kC6SMR9Ak=
-github.com/grafana/grafana-azure-sdk-go v1.9.0/go.mod h1:1vBa0KOl+/Kcm7V888OyMXDSFncmek14q7XhEkrcSaA=
+github.com/grafana/grafana-aws-sdk v0.25.1 h1:waJERJueqB1GldclAh5+tBcY9Ju9AOO9xYSJEnOAuf4=
+github.com/grafana/grafana-aws-sdk v0.25.1/go.mod h1:3zghFF6edrxn0d6k6X9HpGZXDH+VfA+MwD2Pc/9X0ec=
+github.com/grafana/grafana-azure-sdk-go/v2 v2.0.1 h1:a/zb8uX7EvmS2YAFbYPyGEnZP8jMp7WppAm05Qtunok=
+github.com/grafana/grafana-azure-sdk-go/v2 v2.0.1/go.mod h1:nW7pr7POOGafhyOrq8V0ouXBcXTmpRCer3sDAfeSV+Y=
 github.com/grafana/grafana-google-sdk-go v0.1.0 h1:LKGY8z2DSxKjYfr2flZsWgTRTZ6HGQbTqewE3JvRaNA=
 github.com/grafana/grafana-google-sdk-go v0.1.0/go.mod h1:Vo2TKWfDVmNTELBUM+3lkrZvFtBws0qSZdXhQxRdJrE=
-github.com/grafana/grafana-plugin-sdk-go v0.94.0/go.mod h1:3VXz4nCv6wH5SfgB3mlW39s+c+LetqSCjFj7xxPC5+M=
+github.com/grafana/grafana-openapi-client-go v0.0.0-20231213163343-bd475d63fb79 h1:r+mU5bGMzcXCRVAuOrTn54S80qbfVkvTdUJZfSfTNbs=
+github.com/grafana/grafana-openapi-client-go v0.0.0-20231213163343-bd475d63fb79/go.mod h1:wc6Hbh3K2TgCUSfBC/BOzabItujtHMESZeFk5ZhdxhQ=
 github.com/grafana/grafana-plugin-sdk-go v0.114.0/go.mod h1:D7x3ah+1d4phNXpbnOaxa/osSaZlwh9/ZUnGGzegRbk=
-github.com/grafana/grafana-plugin-sdk-go v0.187.0 h1:lOwoFbbTs27KqR3F32GvOX9Et3Ek8p8qsFw+SUJtAAM=
-github.com/grafana/grafana-plugin-sdk-go v0.187.0/go.mod h1:PHK8eQOz3ES28RmImdTHNOTxBZaH6mb/ytJGxk7VVJc=
-github.com/grafana/kindsys v0.0.0-20230508162304-452481b63482 h1:1YNoeIhii4UIIQpCPU+EXidnqf449d0C3ZntAEt4KSo=
-github.com/grafana/kindsys v0.0.0-20230508162304-452481b63482/go.mod h1:GNcfpy5+SY6RVbNGQW264gC0r336Dm+0zgQ5vt6+M8Y=
-github.com/grafana/prometheus-alertmanager v0.25.1-0.20230918083811-3513be6760b7 h1:7gsywzIb39SYZEp9qOnNaxD4d9OOkAfJGvnRUQUtlTM=
-github.com/grafana/prometheus-alertmanager v0.25.1-0.20230918083811-3513be6760b7/go.mod h1:0SOsbwZb277OdNdUR+376IxcAYV3Pp+igiAOJdr/98M=
-github.com/grafana/pyroscope/api v0.2.0 h1:TzOxL0s6SiaLEy944ZAKgHcx/JDRJXu4O8ObwkqR6p4=
-github.com/grafana/pyroscope/api v0.2.0/go.mod h1:nhH+xai9cYFgs6lMy/+L0pKj0d5yCMwji/QAiQFCP+U=
+github.com/grafana/grafana-plugin-sdk-go v0.222.0 h1:bWK35de9Kl9+lRGyh+41zW2X8MkQ4959aqUsi08/8ig=
+github.com/grafana/grafana-plugin-sdk-go v0.222.0/go.mod h1:0lYONo3rJrjIoJNOQP0h2NXmOaF5rFIuH/rwSVSeIrQ=
+github.com/grafana/grafana/pkg/apimachinery v0.0.0-20240226124929-648abdbd0ea4 h1:hpyusz8c3yRFoJPlA0o34rWnsLbaOOBZleqRhFBi5Lg=
+github.com/grafana/grafana/pkg/apimachinery v0.0.0-20240226124929-648abdbd0ea4/go.mod h1:vrRQJuNprTWqwm6JPxHf3BoTJhvO15QMEjQ7Q/YUOnI=
+github.com/grafana/grafana/pkg/apiserver v0.0.0-20240226124929-648abdbd0ea4 h1:tIbI5zgos92vwJ8lV3zwHwuxkV03GR3FGLkFW9V5LxY=
+github.com/grafana/grafana/pkg/apiserver v0.0.0-20240226124929-648abdbd0ea4/go.mod h1:vpYI6DHvFO595rpQGooUjcyicjt9rOevldDdW79peV0=
+github.com/grafana/grafana/pkg/promlib v0.0.4 h1:9jAW19WABIAp6NlpZsAERQ+s5ayQYDFfryDFjjn1r6g=
+github.com/grafana/grafana/pkg/promlib v0.0.4/go.mod h1:621zjsCaFtP7mqqaiMJRN9h3SXrywAMaIPkeHvq3jsk=
+github.com/grafana/grafana/pkg/util/xorm v0.0.1 h1:72QZjxWIWpSeOF8ob4aMV058kfgZyeetkAB8dmeti2o=
+github.com/grafana/grafana/pkg/util/xorm v0.0.1/go.mod h1:eNfbB9f2jM8o9RfwqwjY8SYm5tvowJ8Ly+iE4P9rXII=
+github.com/grafana/prometheus-alertmanager v0.25.1-0.20240208102907-e82436ce63e6 h1:CBm0rwLCPDyarg9/bHJ50rBLYmyMDoyCWpgRMITZhdA=
+github.com/grafana/prometheus-alertmanager v0.25.1-0.20240208102907-e82436ce63e6/go.mod h1:8Ia/R3urPmbzJ8OsdvmZvIprDwvwmYCmUbwBL+jlPOE=
+github.com/grafana/pyroscope-go/godeltaprof v0.1.6 h1:nEdZ8louGAplSvIJi1HVp7kWvFvdiiYg3COLlTwJiFo=
+github.com/grafana/pyroscope-go/godeltaprof v0.1.6/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE=
+github.com/grafana/pyroscope/api v0.3.0 h1:WcVKNZ8JlriJnD28wTkZray0wGo8dGkizSJXnbG7Gd8=
+github.com/grafana/pyroscope/api v0.3.0/go.mod h1:JggA80ToAAUACYGfwL49XoFk5aN5ecHp4pNIZhlk9Uc=
 github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A=
 github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db h1:7aN5cccjIqCLTzedH7MZzRZt5/lsAHch6Z3L2ZGn5FA=
 github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A=
 github.com/grafana/saml v0.4.15-0.20231025143828-a6c0e9b86a4c h1:1pHLC1ZTz7N5QI3jzCs5sqmVvAKe+JwGnpp9lQ+iUjY=
 github.com/grafana/saml v0.4.15-0.20231025143828-a6c0e9b86a4c/go.mod h1:S4+611dxnKt8z/ulbvaJzcgSHsuhjVc1QHNTcr1R7Fw=
-github.com/grafana/sqlds/v2 v2.3.10 h1:HWKhE0vR6LoEiE+Is8CSZOgaB//D1yqb2ntkass9Fd4=
-github.com/grafana/sqlds/v2 v2.3.10/go.mod h1:c6ibxnxRVGxV/0YkEgvy7QpQH/lyifFyV7K/14xvdIs=
+github.com/grafana/sqlds/v3 v3.2.0 h1:WXuYEaFfiCvgm8kK2ixx44/zAEjFzCylA2+RF3GBqZA=
+github.com/grafana/sqlds/v3 v3.2.0/go.mod h1:kH0WuHUR3j0Q7IEymbm2JiaPckUhRCbqjV9ajaBAnmM=
 github.com/grafana/tempo v1.5.1-0.20230524121406-1dc1bfe7085b h1:mDlkqgTEJuK7vjPG44f3ZMtId5AAYLWHvBVbiGqIOOQ=
 github.com/grafana/tempo v1.5.1-0.20230524121406-1dc1bfe7085b/go.mod h1:UK7kTP5llPeRcGBOe5mm4QTNTd0k/mAqTVSOFdDH6AU=
-github.com/grafana/thema v0.0.0-20230712153715-375c1b45f3ed h1:TMtHc+B0SSNw2in6Ro1dAiBYSPRp4NzKgndFDfupt18=
-github.com/grafana/thema v0.0.0-20230712153715-375c1b45f3ed/go.mod h1:3zLJnssFRPCnebCBRlq53t5LgYv9P1mbj0XMozZMTww=
-github.com/grafana/xorm v0.8.3-0.20230627081928-d04aa38aa209 h1:o0QTKP6oKduDIW8yA0fBSv5SjLZR6lTB116eBIeomg0=
-github.com/grafana/xorm v0.8.3-0.20230627081928-d04aa38aa209/go.mod h1:ZkJLEYLoVyg7amJK/5r779bHyzs2AU8f8VMiP6BM7uY=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
-github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI=
@@ -1850,28 +2219,27 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vb
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340 h1:uGoIog/wiQHI9GAxXO5TJbT0wWKH3O9HhOJW1F9c3fY=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340/go.mod h1:3bDW6wMZJB7tiONtC/1Xpicra6Wp5GgbTbQWCbI5fkc=
-github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2/go.mod h1:7pdNwVWBBHGiCxa9lAszqCJMbfTISJ7oMftp8+UGV08=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 h1:dygLcbEBA+t/P7ck6a8AkXv6juQ4cK0RHBoh32jxhHM=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2/go.mod h1:Ap9RLCIJVtgQg1/BBgVEfypOAySvvlcpcVQkSzJCH4Y=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 h1:Wqo399gCIufwto+VfwCSvsnfGpF/w5E9CNxSwbpD6No=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0/go.mod h1:qmOFXW2epJhM0qSnUUYpldc7gVz2KMQwJ/QYCDIa7XU=
 github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4=
 github.com/hanwen/go-fuse v1.0.0/go.mod h1:unqXarDXqzAk0rt98O2tVndEPIpUgLD9+rwFisZH3Ok=
 github.com/hanwen/go-fuse/v2 v2.1.0/go.mod h1:oRyA5eK+pvJyv5otpO/DgccS8y/RvYMaO00GgRLGryc=
 github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE=
 github.com/hashicorp/consul/api v1.10.1/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M=
 github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0=
-github.com/hashicorp/consul/api v1.20.0 h1:9IHTjNVSZ7MIwjlW3N3a7iGiykCMDpxZu8jsxFJh0yc=
-github.com/hashicorp/consul/api v1.20.0/go.mod h1:nR64eD44KQ59Of/ECwt2vUmIK2DKsDzAwTmwmLl8Wpo=
+github.com/hashicorp/consul/api v1.26.1 h1:5oSXOO5fboPZeW5SN+TdGFP/BILDgBm19OrPZ/pICIM=
+github.com/hashicorp/consul/api v1.26.1/go.mod h1:B4sQTeaSO16NtynqrAdwOlahJ7IUDZM9cj2420xYL8A=
 github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
 github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms=
-github.com/hashicorp/consul/sdk v0.13.1/go.mod h1:SW/mM4LbKfqmMvcFu8v+eiQQ7oitXEFeiBe9StxERb0=
-github.com/hashicorp/cronexpr v1.1.1 h1:NJZDd87hGXjoZBdvyCF9mX4DCq5Wy7+A/w+A7q0wn6c=
-github.com/hashicorp/cronexpr v1.1.1/go.mod h1:P4wA0KBl9C5q2hABiMO7cp6jcIg96CDh1Efb3g1PWA4=
+github.com/hashicorp/consul/sdk v0.15.0/go.mod h1:r/OmRRPbHOe0yxNahLw7G9x5WG17E1BIECMtCjcPSNo=
+github.com/hashicorp/cronexpr v1.1.2 h1:wG/ZYIKT+RT3QkOdgYc+xsKWVRgnxJ1OJtjjy84fJ9A=
+github.com/hashicorp/cronexpr v1.1.2/go.mod h1:P4wA0KBl9C5q2hABiMO7cp6jcIg96CDh1Efb3g1PWA4=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -1892,19 +2260,19 @@ github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/go-plugin v1.2.2/go.mod h1:F9eH4LrE/ZsRdbwhfjs9k9HoDUwAHnYtXdgmf1AVNs0=
-github.com/hashicorp/go-plugin v1.4.9 h1:ESiK220/qE0aGxWdzKIvRH69iLiuN/PjoLTm69RoWtU=
-github.com/hashicorp/go-plugin v1.4.9/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s=
+github.com/hashicorp/go-plugin v1.6.0 h1:wgd4KxHJTVGGqWBq4QPB1i5BZNEx9BR8+OFmHDmTk8A=
+github.com/hashicorp/go-plugin v1.6.0/go.mod h1:lBS5MtSSBZk0SHc66KACcjjlU6WzEVP/8pwz68aMkCI=
 github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
-github.com/hashicorp/go-retryablehttp v0.6.8/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
 github.com/hashicorp/go-retryablehttp v0.7.1/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
-github.com/hashicorp/go-retryablehttp v0.7.2 h1:AcYqCvkpalPnPF2pn0KamgwamS42TqUDDYFRKq/RAd0=
-github.com/hashicorp/go-retryablehttp v0.7.2/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8=
+github.com/hashicorp/go-retryablehttp v0.7.4 h1:ZQgVdpTdAL7WpMIwLzCfbalOcSUdkDZnpUv3/+BxzFA=
+github.com/hashicorp/go-retryablehttp v0.7.4/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8=
 github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
 github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
 github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
-github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc=
 github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
+github.com/hashicorp/go-sockaddr v1.0.6 h1:RSG8rKU28VTUTvEKghe5gIhIQpv8evvNpnDEyqO4u9I=
+github.com/hashicorp/go-sockaddr v1.0.6/go.mod h1:uoUUmtwU7n9Dv3O4SNLeFvg0SxQ3lyjsj6+CCykpaxI=
 github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
@@ -1921,9 +2289,8 @@ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/golang-lru v0.6.0 h1:uL2shRDx7RTrOrTCUZEGP/wJUFiUI8QT6E7z5o8jga4=
 github.com/hashicorp/golang-lru v0.6.0/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-github.com/hashicorp/golang-lru/v2 v2.0.2 h1:Dwmkdr5Nc/oBiXgJS3CDHNhJtIHkuZ3DZF5twqnfBdU=
-github.com/hashicorp/golang-lru/v2 v2.0.2/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
-github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
+github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
+github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hashicorp/hcl/v2 v2.17.0 h1:z1XvSUyXd1HP10U4lrLg5e0JMVz6CPaJvAgxM0KNZVY=
 github.com/hashicorp/hcl/v2 v2.17.0/go.mod h1:gJyW2PTShkJqQBKpAmPO3yxMxIuoXkOF2TpqXzrQyx4=
@@ -1936,8 +2303,8 @@ github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOn
 github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
 github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR/prTM=
 github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0=
-github.com/hashicorp/nomad/api v0.0.0-20230308192510-48e7d70fcd4b h1:EkuSTU8c/63q4LMayj8ilgg/4I5PXDFVcnqKfs9qcwI=
-github.com/hashicorp/nomad/api v0.0.0-20230308192510-48e7d70fcd4b/go.mod h1:bKUb1ytds5KwUioHdvdq9jmrDqCThv95si0Ub7iNeBg=
+github.com/hashicorp/nomad/api v0.0.0-20230721134942-515895c7690c h1:Nc3Mt2BAnq0/VoLEntF/nipX+K1S7pG+RgwiitSv6v0=
+github.com/hashicorp/nomad/api v0.0.0-20230721134942-515895c7690c/go.mod h1:O23qLAZuCx4htdY9zBaO4cJPXgleSFEdq6D/sezGgYE=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk=
 github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
@@ -1948,28 +2315,24 @@ github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKe
 github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
 github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
 github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
-github.com/hetznercloud/hcloud-go v1.41.0 h1:KJGFRRc68QiVu4PrEP5BmCQVveCP2CM26UGQUKGpIUs=
-github.com/hetznercloud/hcloud-go v1.41.0/go.mod h1:NaHg47L6C77mngZhwBG652dTAztYrsZ2/iITJKhQkHA=
-github.com/hmarr/codeowners v1.1.2 h1:CdmLJ0e2s2aaH21+3HW1HXJyJqz+OCEiMBfD9iZb3n8=
-github.com/hmarr/codeowners v1.1.2/go.mod h1:+ez+YARvfVhzL1MzY0f2+D/VusjODs4iRj3tO/IxBMw=
+github.com/hetznercloud/hcloud-go/v2 v2.4.0 h1:MqlAE+w125PLvJRCpAJmEwrIxoVdUdOyuFUhE/Ukbok=
+github.com/hetznercloud/hcloud-go/v2 v2.4.0/go.mod h1:l7fA5xsncFBzQTyw29/dw5Yr88yEGKKdc6BHf24ONS0=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/huandu/xstrings v1.3.1 h1:4jgBlKK6tLKFvO8u5pmYjG91cqytmDCDvGh7ECVFfFs=
 github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
+github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw=
+github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
 github.com/hudl/fargo v1.4.0/go.mod h1:9Ai6uvFy5fQNq6VPKtg+Ceq1+eTY4nKUlR2JElEOcDo=
-github.com/hydrogen18/memlistener v0.0.0-20200120041712-dcc25e7acd91/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE=
 github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/ianlancetaylor/demangle v0.0.0-20220517205856-0058ec4f073c/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
+github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw=
 github.com/igm/sockjs-go/v3 v3.0.2 h1:2m0k53w0DBiGozeQUIEPR6snZFmpFpYvVsGnfLPNXbE=
 github.com/igm/sockjs-go/v3 v3.0.2/go.mod h1:UqchsOjeagIBFHvd+RZpLaVRbCwGilEC08EDHsD1jYE=
 github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
-github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
-github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
-github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
-github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA=
+github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
+github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
@@ -1980,16 +2343,12 @@ github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod
 github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
 github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097 h1:vilfsDSy7TDxedi9gyBkMvAirat/oRcL0lFdJBf6tdM=
 github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo=
-github.com/inhies/go-bytesize v0.0.0-20201103132853-d0aed0d254f8/go.mod h1:KrtyD5PFj++GKkFS/7/RRrfnRhAMGQwy75GLCHWrCNs=
+github.com/invopop/jsonschema v0.12.0 h1:6ovsNSuvn9wEQVOyc72aycBMVQFKz7cPdMJn10CvzRI=
+github.com/invopop/jsonschema v0.12.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0=
 github.com/invopop/yaml v0.2.0 h1:7zky/qH+O0DwAyoobXUqvVBwgBFRxKoQ/3FjcVpjTMY=
 github.com/invopop/yaml v0.2.0/go.mod h1:2XuRLgs/ouIrW3XNzuNj7J3Nvu/Dig5MXvbCEdiBN3Q=
-github.com/ionos-cloud/sdk-go/v6 v6.1.4 h1:BJHhFA8Q1SZC7VOXqKKr2BV2ysQ2/4hlk1e4hZte7GY=
-github.com/ionos-cloud/sdk-go/v6 v6.1.4/go.mod h1:Ox3W0iiEz0GHnfY9e5LmAxwklsxguuNFEUSu0gVRTME=
-github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI=
-github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0=
-github.com/iris-contrib/jade v1.1.3/go.mod h1:H/geBymxJhShH5kecoiOCSssPX7QWYH7UaeZTSWddIk=
-github.com/iris-contrib/pongo2 v0.0.1/go.mod h1:Ssh+00+3GAZqSQb30AvBRNxBx7rf0GqwkjqxNd0u65g=
-github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw=
+github.com/ionos-cloud/sdk-go/v6 v6.1.10 h1:3815Q2Hw/wc4cJ8wD7bwfsmDsdfIEp80B7BQMj0YP2w=
+github.com/ionos-cloud/sdk-go/v6 v6.1.10/go.mod h1:EzEgRIDxBELvfoa/uBN0kOQaqovLjUWEB7iW4/Q+t4k=
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
 github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
 github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
@@ -1997,9 +2356,6 @@ github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80s
 github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA=
 github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE=
 github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s=
-github.com/jackc/pgconn v1.3.2/go.mod h1:LvCquS3HbBKwgl7KbX9KyqEIumJAbm1UMcTvGaIf3bM=
-github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=
-github.com/jackc/pgconn v1.6.0/go.mod h1:yeseQo4xhQbgyJs2c87RAXOH2i624N0Fh1KSPJya7qo=
 github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o=
 github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY=
 github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI=
@@ -2014,60 +2370,55 @@ github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod
 github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=
 github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
 github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
-github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
-github.com/jackc/pgproto3/v2 v2.0.2/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
 github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
 github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
 github.com/jackc/pgproto3/v2 v2.2.0/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
-github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
 github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
 github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg=
 github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc=
 github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw=
-github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0=
-github.com/jackc/pgtype v1.3.0/go.mod h1:b0JqxHvPmljG+HQ5IsvQ0yqeSi4nGcDTVjFoiLDb0Ik=
 github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM=
 github.com/jackc/pgtype v1.10.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4=
 github.com/jackc/pgx v3.2.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
-github.com/jackc/pgx v3.6.2+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
 github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y=
 github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM=
 github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc=
-github.com/jackc/pgx/v4 v4.4.1/go.mod h1:6iSW+JznC0YT+SgBn7rNxoEBsBgSmnC5FwyCekOGUiE=
-github.com/jackc/pgx/v4 v4.6.0/go.mod h1:vPh43ZzxijXUVJ+t/EmXBtFmbFVO72cuneCT9oAlxAg=
 github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs=
 github.com/jackc/pgx/v4 v4.15.0/go.mod h1:D/zyOyXiaM1TmVWnOM18p0xdDtdakRBa0RsVGI3U3bw=
 github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.2.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jandelgado/gcov2lcov v1.0.4-0.20210120124023-b83752c6dc08/go.mod h1:NnSxK6TMlg1oGDBfGelGbjgorT5/L3cchlbtgFYZSss=
-github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
-github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
+github.com/jarcoal/httpmock v1.3.0/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg=
+github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8=
 github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs=
+github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo=
 github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM=
+github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVETg=
 github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo=
+github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o=
 github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg=
+github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh687T8=
 github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs=
+github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY=
 github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=
-github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=
 github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
-github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
+github.com/jhump/gopoet v0.0.0-20190322174617-17282ff210b3/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI=
+github.com/jhump/gopoet v0.1.0/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI=
+github.com/jhump/goprotoc v0.5.0/go.mod h1:VrbvcYrQOrTi3i0Vf+m+oqQWk9l72mjkJCYo7UvLHRQ=
 github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74=
+github.com/jhump/protoreflect v1.11.0/go.mod h1:U7aMIjN0NWq9swDP7xDdoMfRHb35uiuTd3Z9nFXJf5E=
+github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
+github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo=
 github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/jmoiron/sqlx v0.0.0-20180614180643-0dae4fefe7c0/go.mod h1:IiEW3SEiiErVyFdH8NTuWjSifiEQKUoyK3LNqr2kCHU=
-github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
 github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
 github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
-github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod h1:Z86h9688Y0wesXCyonoVr47MasHilkuLMqGhRZ4Hpak=
-github.com/joho/godotenv v1.2.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
@@ -2095,51 +2446,31 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
 github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
-github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
-github.com/karrick/godirwalk v1.7.5/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34=
-github.com/karrick/godirwalk v1.7.7/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34=
-github.com/karrick/godirwalk v1.7.8/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34=
 github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
 github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
-github.com/karrick/godirwalk v1.10.9/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
-github.com/karrick/godirwalk v1.10.12/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
-github.com/karrick/godirwalk v1.15.3/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk=
-github.com/karrick/godirwalk v1.15.5/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk=
-github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk=
-github.com/kataras/golog v0.0.10/go.mod h1:yJ8YKCmyL+nWjERB90Qwn+bdyBZsaQwU3bTVFgkFIp8=
-github.com/kataras/iris/v12 v12.1.8/go.mod h1:LMYy4VlP67TQ3Zgriz8RE2h2kMZV2SgMYbq3UhfoFmE=
-github.com/kataras/neffos v0.0.14/go.mod h1:8lqADm8PnbeFfL7CLXh1WHw53dG27MC3pgi2R1rmoTE=
-github.com/kataras/pio v0.0.2/go.mod h1:hAoW0t9UmXi4R5Oyq5Z4irTbaTsOemSrDGUtaTl7Dro=
-github.com/kataras/sitemap v0.0.5/go.mod h1:KY2eugMKiPwsJgx7+U103YZehfvNGOXURubcGyk0Bz8=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
-github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 h1:DowS9hvgyYSX4TO5NpyC606/Z4SxnNYbT+WX27or6Ck=
-github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
-github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4=
 github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE=
-github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
-github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
-github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
+github.com/klauspost/compress v1.13.1/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
 github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
-github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI=
-github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
-github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
+github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
+github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
+github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
-github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
-github.com/knadh/koanf v0.14.1-0.20201201075439-e0853799f9ec/go.mod h1:H5mEFsTeWizwFXHKtsITL5ipsLTuAMQoGuQpp+1JL9U=
+github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
+github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b h1:udzkj9S/zlT5X367kqJis0QP7YMxobob6zhzq6Yre00=
 github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b/go.mod h1:pcaDhQK0/NJZEvtCO0qQPPropqV0sJOJ6YW7X+9kRwM=
-github.com/konsorten/go-windows-terminal-sequences v0.0.0-20180402223658-b729f2633dfe/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -2152,30 +2483,29 @@ github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NB
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/krasun/gosqlparser v1.0.5 h1:sHaexkxGb9NrAcjZ3mUs6u33iJ9qhR2fH7XrpZekMt8=
+github.com/krasun/gosqlparser v1.0.5/go.mod h1:aXCTW1xnPl4qAaNROeqESauGJ8sqhoB4OFEIOVIDYI4=
 github.com/kshvakov/clickhouse v1.3.5/go.mod h1:DMzX7FxRymoNkVgizH0DWAL8Cur7wHLgx3MUnGwJqpE=
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/labstack/echo/v4 v4.5.0/go.mod h1:czIriw4a0C1dFun+ObrXp7ok03xON0N1awStJ6ArI7Y=
-github.com/labstack/echo/v4 v4.10.2 h1:n1jAhnq/elIFTHr1EYpiYtyKgx4RW9ccVgkqByZaN2M=
-github.com/labstack/echo/v4 v4.10.2/go.mod h1:OEyqf2//K1DFdE57vw2DRgWY0M7s65IVQO2FzvI4J5k=
-github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
+github.com/labstack/echo/v4 v4.11.1 h1:dEpLU2FLg4UVmvCGPuk/APjlH6GDpbEPti61srUUUs4=
+github.com/labstack/echo/v4 v4.11.1/go.mod h1:YuYRTSM3CHs2ybfrL8Px48bO6BAnYIN4l8wSTMP6BDQ=
 github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8=
 github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
+github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs=
 github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353 h1:X/79QL0b4YJVO5+OsPH9rF2u428CIrGL/jLmPsoOQQ4=
 github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353/go.mod h1:N0SVk0uhy+E1PZ3C9ctsPRlvOPAFPkCNlcPBDkt0N3U=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
+github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
@@ -2184,13 +2514,12 @@ github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-b
 github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
 github.com/linkedin/goavro/v2 v2.10.0 h1:eTBIRoInBM88gITGXYtUSqqxLTFXfOsJBiX8ZMW0o4U=
 github.com/linkedin/goavro/v2 v2.10.0/go.mod h1:UgQUb2N/pmueQYH9bfqFioWxzYCZXSfF8Jw03O5sjqA=
-github.com/linode/linodego v1.14.1 h1:uGxQyy0BidoEpLGdvfi4cPgEW+0YUFsEGrLEhcTfjNc=
-github.com/linode/linodego v1.14.1/go.mod h1:NJlzvlNtdMRRkXb0oN6UWzUkj6t+IBsyveHgZ5Ppjyk=
-github.com/luna-duclos/instrumentedsql v0.0.0-20181127104832-b7d587d28109/go.mod h1:PWUIzhtavmOR965zfawVsHXbEuU1G29BPZ/CB3C7jXk=
-github.com/luna-duclos/instrumentedsql v1.1.2/go.mod h1:4LGbEqDnopzNAiyxPPDXhLspyunZxgPTMJBKtC6U0BQ=
-github.com/luna-duclos/instrumentedsql v1.1.3/go.mod h1:9J1njvFds+zN7y85EDhN9XNQLANWwZt2ULeIC8yMNYs=
+github.com/linode/linodego v1.25.0 h1:zYMz0lTasD503jBu3tSRhzEmXHQN1zptCw5o71ibyyU=
+github.com/linode/linodego v1.25.0/go.mod h1:BMZI0pMM/YGjBis7pIXDPbcgYfCZLH0/UvzqtsGtG1c=
 github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
 github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
+github.com/lyft/protoc-gen-star/v2 v2.0.1/go.mod h1:RcCdONR2ScXaYnQC5tUzxzlpA3WVYF7/opLeUgcQs/o=
+github.com/lyft/protoc-gen-star/v2 v2.0.3/go.mod h1:amey7yeodaJhXSbf/TlLvWiqQfLOSpEk//mLlc+axEk=
 github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
 github.com/m3db/prometheus_remote_client_golang v0.4.4 h1:DsAIjVKoCp7Ym35tAOFL1OuMLIdIikAEHeNPHY+yyM8=
 github.com/m3db/prometheus_remote_client_golang v0.4.4/go.mod h1:wHfVbA3eAK6dQvKjCkHhusWYegCk3bDGkA15zymSHdc=
@@ -2198,40 +2527,14 @@ github.com/magefile/mage v1.11.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXq
 github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg=
 github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
-github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
-github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
 github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
-github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.7.1/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
 github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/markbates/deplist v1.0.4/go.mod h1:gRRbPbbuA8TmMiRvaOzUlRfzfjeCCBqX2A6arxN01MM=
-github.com/markbates/deplist v1.0.5/go.mod h1:gRRbPbbuA8TmMiRvaOzUlRfzfjeCCBqX2A6arxN01MM=
-github.com/markbates/deplist v1.1.3/go.mod h1:BF7ioVzAJYEtzQN/os4rt8H8Ti3h0T7EoN+7eyALktE=
-github.com/markbates/errx v1.1.0/go.mod h1:PLa46Oex9KNbVDZhKel8v1OT7hD5JZ2eI7AHhA0wswc=
-github.com/markbates/going v1.0.2/go.mod h1:UWCk3zm0UKefHZ7l8BNqi26UyiEMniznk8naLdTcy6c=
-github.com/markbates/grift v1.0.4/go.mod h1:wbmtW74veyx+cgfwFhlnnMWqhoz55rnHR47oMXzsyVs=
-github.com/markbates/hmax v1.0.0/go.mod h1:cOkR9dktiESxIMu+65oc/r/bdY4bE8zZw3OLhLx0X2c=
-github.com/markbates/inflect v1.0.0/go.mod h1:oTeZL2KHA7CUX6X+fovmK9OvIOFuqu0TwdQrZjLTh88=
-github.com/markbates/inflect v1.0.1/go.mod h1:uv3UVNBe5qBIfCm8O8Q+DW+S1EopeyINj+Ikhc7rnCk=
-github.com/markbates/inflect v1.0.3/go.mod h1:1fR9+pO2KHEO9ZRtto13gDwwZaAKstQzferVeWqbgNs=
-github.com/markbates/inflect v1.0.4/go.mod h1:1fR9+pO2KHEO9ZRtto13gDwwZaAKstQzferVeWqbgNs=
-github.com/markbates/oncer v0.0.0-20180924031910-e862a676800b/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
-github.com/markbates/oncer v0.0.0-20180924034138-723ad0170a46/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
-github.com/markbates/oncer v0.0.0-20181014194634-05fccaae8fc4/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
 github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
-github.com/markbates/oncer v1.0.0/go.mod h1:Z59JA581E9GP6w96jai+TGqafHPW+cPfRxz2aSZ0mcI=
-github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI=
-github.com/markbates/refresh v1.4.10/go.mod h1:NDPHvotuZmTmesXxr95C9bjlw1/0frJwtME2dzcVKhc=
-github.com/markbates/safe v1.0.0/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
 github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
-github.com/markbates/sigtx v1.0.0/go.mod h1:QF1Hv6Ic6Ca6W+T+DL0Y/ypborFKyvUY9HmuCD4VeTc=
-github.com/markbates/willie v1.0.9/go.mod h1:fsrFVWl91+gXpx/6dv715j7i11fYPfZ9ZGfH0DQzY7w=
-github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA=
 github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
 github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
 github.com/mattermost/xml-roundtrip-validator v0.1.0 h1:RXbVD2UAl7A7nOTR4u7E3ILa4IbtvKBHw64LDsmu9hU=
@@ -2240,7 +2543,6 @@ github.com/mattetti/filebuffer v1.0.1 h1:gG7pyfnSIZCxdoKq+cPa8T0hhYtD9NxCdI4D7PT
 github.com/mattetti/filebuffer v1.0.1/go.mod h1:YdMURNDOttIiruleeVr6f56OrMc+MydEnTcXwtkxNVs=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
-github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
@@ -2257,50 +2559,46 @@ github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98=
-github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
+github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
-github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
+github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
-github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
-github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
-github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
-github.com/mattn/goveralls v0.0.6 h1:cr8Y0VMo/MnEZBjxNN/vh6G90SZ7IMb6lms1dzMoO+Y=
-github.com/mattn/goveralls v0.0.6/go.mod h1:h8b4ow6FxSPMQHF6o2ve3qsclnffZjYTNEKmLesRwqw=
+github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
+github.com/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI=
+github.com/mattn/go-sqlite3 v1.14.19/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
-github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=
-github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
-github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
-github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
-github.com/microsoft/go-mssqldb v1.5.0 h1:CgENxkwtOBNj3Jg6T1X209y2blCfTTcwuOlznd2k9fk=
-github.com/microsoft/go-mssqldb v1.5.0/go.mod h1:lmWsjHD8XX/Txr0f8ZqgbEZSC+BZjmEQy/Ms+rLrvho=
+github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k=
+github.com/maxatome/go-testdeep v1.12.0/go.mod h1:lPZc/HAcJMP92l7yI6TRz1aZN5URwUBUAfUNvrclaNM=
+github.com/microsoft/go-mssqldb v1.6.1-0.20240214161942-b65008136246 h1:KT4vTYcHqj5C5hMK5kSpyAk7MnFqfHVWLL4VqMq66S8=
+github.com/microsoft/go-mssqldb v1.6.1-0.20240214161942-b65008136246/go.mod h1:00mDtPbeQCRGC1HwOOR5K/gr30P1NcEG0vx6Kbv2aJU=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
 github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
 github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
-github.com/miekg/dns v1.1.51 h1:0+Xg7vObnhrz/4ZCZcZh7zPXlmU0aveS2HDBd0m0qSo=
-github.com/miekg/dns v1.1.51/go.mod h1:2Z9d3CP1LQWihRZUf29mQ19yDThaI4DAYzte2CaQW5c=
+github.com/miekg/dns v1.1.57 h1:Jzi7ApEIzwEPLHWRcafCN9LZSBbqQpxjt/wpgvg7wcM=
+github.com/miekg/dns v1.1.57/go.mod h1:uqRjCRUuEAA6qsOiJvDd+CFo/vW+y5WR6SNmHE55hZk=
+github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 h1:AMFGa4R4MiIpspGNG7Z948v4n35fFGB3RR3G/ry4FWs=
 github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY=
+github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 h1:+n/aFZefKZp7spd8DFdX7uMikMLXX4oubIzJF4kv/wI=
 github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE=
 github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=
 github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
+github.com/mitchellh/cli v1.1.5/go.mod h1:v8+iFts2sPIKUV1ltktPXMCC8fumSKFItNcD2cLtRR4=
 github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
 github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
@@ -2317,10 +2615,7 @@ github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTS
 github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.0.0/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.2.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
@@ -2328,15 +2623,25 @@ github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
-github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/mithrandie/csvq v1.17.10 h1:ba8W6rWgB6LfIhY1ttmgXzKNcCoVtT4e6zuZTaGuAQg=
+github.com/mithrandie/csvq v1.17.10/go.mod h1:ALXIPvYIbBEJvcoB41WSQhhLqOXT+2P4VommU+2DLLc=
+github.com/mithrandie/csvq-driver v1.6.8 h1:0rF4yZ0ByIECznd9Ld+Ry5tIEYq/zxbb3QYuni/JWFk=
+github.com/mithrandie/csvq-driver v1.6.8/go.mod h1:SrUKsCbaFKaaxKrptvLJ882CFMJD2hJAjv+Ev1HcUM8=
+github.com/mithrandie/go-file/v2 v2.1.0 h1:XA5Tl+73GXMDvgwSE3Sg0uC5FkLr3hnXs8SpUas0hyg=
+github.com/mithrandie/go-file/v2 v2.1.0/go.mod h1:9YtTF3Xo59GqC1Pxw6KyGVcM/qubAMlxVsqI/u9r++c=
+github.com/mithrandie/go-text v1.5.4 h1:2LIASku5RuCqxa6O6eOvQwQ0k5FYWP1ID2hk9egYYGc=
+github.com/mithrandie/go-text v1.5.4/go.mod h1:yaVYauF3TLf7LvjGrrQB/mffIkohXTXJpW9zQ206UL8=
+github.com/mithrandie/ternary v1.1.1 h1:k/joD6UGVYxHixYmSR8EGgDFNONBMqyD373xT4QRdC4=
+github.com/mithrandie/ternary v1.1.1/go.mod h1:0D9Ba3+09K2TdSZO7/bFCC0GjSXetCvYuYq0u8FY/1g=
 github.com/moby/moby v23.0.4+incompatible h1:A/pe8vi9KIKhNbzR0G3wW4ACKDsMgXILBveMqiJNa8M=
 github.com/moby/moby v23.0.4+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
+github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8=
 github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
-github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2/go.mod h1:TjQg8pa4iejrUrjiz0MCtMV38jdMNW4doKSiBrEvCQQ=
 github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw=
 github.com/moby/term v0.0.0-20221205130635-1aeaba878587 h1:HfkjXDfhgVaN5rmueG8cL8KKeFNecRCXFhaJ2qZ5SKA=
+github.com/moby/term v0.0.0-20221205130635-1aeaba878587/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -2347,14 +2652,12 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY
 github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
-github.com/monoculum/formam v0.0.0-20180901015400-4e68be1d79ba/go.mod h1:RKgILGEJq24YyJ2ban8EO0RUVSJlF1pGsEvoLEACr/Q=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
+github.com/montanaflynn/stats v0.6.6/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
 github.com/montanaflynn/stats v0.7.0/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
 github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
-github.com/moul/http2curl v0.0.0-20170919181001-9ac6cf4d929b/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ=
-github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ=
 github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de h1:D5x39vF5KCwKQaw+OC9ZPiLVHXz3UFw2+psEX+gYcto=
 github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de/go.mod h1:kJun4WP5gFuHZgRjZUWWuH1DTxCtxbHDOIJsudS8jzY=
 github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM=
@@ -2365,6 +2668,7 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 github.com/nakagami/firebirdsql v0.0.0-20190310045651-3c02a58cfed8/go.mod h1:86wM1zFnC6/uDBfZGNwB65O+pR2OFi5q/YQaEUid1qA=
 github.com/natessilva/dag v0.0.0-20180124060714-7194b8dcc5c4/go.mod h1:cojhOHk1gbMeklOyDP2oKKLftefXoJreOQGOrXk+Z38=
@@ -2381,7 +2685,6 @@ github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi
 github.com/nats-io/nkeys v0.2.0/go.mod h1:XdZpAbhgyyODYqjTawOnIOI7VlbKSarI9Gfy1tqEu/s=
 github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
-github.com/nicksnyder/go-i18n v1.10.0/go.mod h1:HrK7VCrbOvQoUAQ7Vpy7i87N7JZZZ7R2xBGjv0j365Q=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
@@ -2392,33 +2695,31 @@ github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA=
 github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU=
 github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
-github.com/oleiade/reflections v1.0.0/go.mod h1:RbATFBbKYkVdqmSFtx13Bb/tVhR0lgOBXunWTZKeL4w=
-github.com/oleiade/reflections v1.0.1 h1:D1XO3LVEYroYskEsoSiGItp9RUxG6jWnCVvrqH0HHQM=
 github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.9.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
 github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
 github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU=
 github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk=
 github.com/onsi/ginkgo/v2 v2.3.0/go.mod h1:Eew0uilEqZmIEZr8JrvYlvOM7Rr6xzTmMV8AyFNU9d0=
 github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkAt4OrFo=
-github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU=
-github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
-github.com/onsi/gomega v1.4.2/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/ginkgo/v2 v2.5.0/go.mod h1:Luc4sArBICYCS8THh8v3i3i5CuSZO+RaQRaJoeNwomw=
+github.com/onsi/ginkgo/v2 v2.7.0/go.mod h1:yjiuMwPokqY1XauOgju45q3sJt6VzQ/Fict1LFVcsAo=
+github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc=
+github.com/onsi/ginkgo/v2 v2.9.0/go.mod h1:4xkjoL/tZv4SMWeww56BU5kAt19mVB47gTWxmrTcxyk=
+github.com/onsi/ginkgo/v2 v2.9.1/go.mod h1:FEcmzVcCHl+4o9bQZVab+4dC9+j+91t2FHSzmGAPfuo=
+github.com/onsi/ginkgo/v2 v2.9.2/go.mod h1:WHcJJG2dIlcCqVfBAwUCrJxSPFb6v4azBwgxeMeDuts=
+github.com/onsi/ginkgo/v2 v2.9.4/go.mod h1:gCQYp2Q+kSoIj7ykSVb9nskRSsR6PUj4AiLywzIhbKM=
+github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
+github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.6.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY=
@@ -2427,8 +2728,15 @@ github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9
 github.com/onsi/gomega v1.20.1/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo=
 github.com/onsi/gomega v1.21.1/go.mod h1:iYAIXgPSaDHak0LCMA+AWBpIKBr8WZicMxnE8luStNc=
 github.com/onsi/gomega v1.22.1/go.mod h1:x6n7VNe4hw0vkyYUM4mjIXx3JbLiPaBPNgB7PRQ1tuM=
-github.com/onsi/gomega v1.23.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg=
-github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
+github.com/onsi/gomega v1.24.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg=
+github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM=
+github.com/onsi/gomega v1.26.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM=
+github.com/onsi/gomega v1.27.1/go.mod h1:aHX5xOykVYzWOV4WqQy0sy8BQptgukenXpCXfadcIAw=
+github.com/onsi/gomega v1.27.3/go.mod h1:5vG284IBtfDAmDyrK+eGyZmUgUlmi+Wngqo557cZ6Gw=
+github.com/onsi/gomega v1.27.4/go.mod h1:riYq/GJKh8hhoM01HN6Vmuy93AarCXCBGpvFDK3q3fQ=
+github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg=
+github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg=
+github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
@@ -2437,11 +2745,7 @@ github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zM
 github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/opencontainers/image-spec v1.0.3-0.20220512140940-7b36cea86235 h1:DxS3bbeUSCpMQr3mTez5PIDrS+yBeBsoDsftOhqB1Fg=
 github.com/opencontainers/image-spec v1.0.3-0.20220512140940-7b36cea86235/go.mod h1:K/JAU0m27RFhDRX4PcFdIKntROP6y5Ed6O91aZYDQfs=
-github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
-github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
-github.com/opentracing-contrib/go-grpc v0.0.0-20180928155321-4b5a12d3ff02/go.mod h1:JNdpVEzCpXBgIiv4ds+TzhN1hrtxq6ClLrTlT9OQRSc=
 github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
-github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9/go.mod h1:PLldrQSroqzH70Xl+1DQcGnefIbqsKR7UDaiux3zV+w=
 github.com/opentracing-contrib/go-stdlib v1.0.0 h1:TBS7YuVotp8myLon4Pv7BtCBzOTo1DeZCld0Z63mW2w=
 github.com/opentracing-contrib/go-stdlib v1.0.0/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU=
 github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
@@ -2454,78 +2758,44 @@ github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJ
 github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
 github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
 github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE=
-github.com/ory/analytics-go/v4 v4.0.0/go.mod h1:FMx9cLRD9xN+XevPvZ5FDMfignpmcqPP6FUKnJ9/MmE=
-github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs=
-github.com/ory/dockertest/v3 v3.5.4/go.mod h1:J8ZUbNB2FOhm1cFZW9xBpDsODqsSWcyYgtJYVPcnF70=
-github.com/ory/dockertest/v3 v3.6.3/go.mod h1:EFLcVUOl8qCwp9NyDAcCDtq/QviLtYswW/VbWzUnTNE=
-github.com/ory/fosite v0.29.0/go.mod h1:0atSZmXO7CAcs6NPMI/Qtot8tmZYj04Nddoold4S2h0=
-github.com/ory/fosite v0.44.1-0.20230317114349-45a6785cc54f h1:OFA3y3TJ2qsBXCBMXUNvTzHNBS8/kXdk4cHpJGzBKO4=
-github.com/ory/fosite v0.44.1-0.20230317114349-45a6785cc54f/go.mod h1:N0WZtyPBAuXedTpwzbKl4tSYU8wpjlMQoxnKcL2m8dU=
-github.com/ory/go-acc v0.0.0-20181118080137-ddc355013f90/go.mod h1:sxnvPCxChFuSmTJGj8FdMupeq1BezCiEpDjTUXQ4hf4=
-github.com/ory/go-acc v0.2.6 h1:YfI+L9dxI7QCtWn2RbawqO0vXhiThdXu/RgizJBbaq0=
-github.com/ory/go-acc v0.2.6/go.mod h1:4Kb/UnPcT8qRAk3IAxta+hvVapdxTLWtrr7bFLlEgpw=
-github.com/ory/go-convenience v0.1.0 h1:zouLKfF2GoSGnJwGq+PE/nJAE6dj2Zj5QlTgmMTsTS8=
-github.com/ory/go-convenience v0.1.0/go.mod h1:uEY/a60PL5c12nYz4V5cHY03IBmwIAEm8TWB0yn9KNs=
-github.com/ory/gojsonreference v0.0.0-20190720135523-6b606c2d8ee8/go.mod h1:wsH1C4nIeeQClDtD5AH7kF1uTS6zWyqfjVDTmB0Em7A=
-github.com/ory/gojsonschema v1.1.1-0.20190919112458-f254ca73d5e9/go.mod h1:BNZpdJgB74KOLSsWFvzw6roXg1I6O51WO8roMmW+T7Y=
-github.com/ory/herodot v0.6.2/go.mod h1:3BOneqcyBsVybCPAJoi92KN2BpJHcmDqAMcAAaJiJow=
-github.com/ory/herodot v0.7.0/go.mod h1:YXKOfAXYdQojDP5sD8m0ajowq3+QXNdtxA+QiUXBwn0=
-github.com/ory/herodot v0.8.3/go.mod h1:rvLjxOAlU5omtmgjCfazQX2N82EpMfl3BytBWc1jjsk=
-github.com/ory/herodot v0.9.2/go.mod h1:Da2HXR8mpwPbPrH+Gv9qV8mM5gI3v+PoJ69BA4l2RAk=
-github.com/ory/jsonschema/v3 v3.0.1/go.mod h1:jgLHekkFk0uiGdEWGleC+tOm6JSSP8cbf17PnBuGXlw=
-github.com/ory/viper v1.5.6/go.mod h1:TYmpFpKLxjQwvT4f0QPpkOn4sDXU1kDgAwJpgLYiQ28=
-github.com/ory/viper v1.7.4/go.mod h1:T6sodNZKNGPpashUOk7EtXz2isovz8oCd57GNVkkNmE=
-github.com/ory/viper v1.7.5 h1:+xVdq7SU3e1vNaCsk/ixsfxE4zylk1TJUiJrY647jUE=
-github.com/ory/viper v1.7.5/go.mod h1:ypOuyJmEUb3oENywQZRgeAMwqgOyDqwboO1tj3DjTaM=
-github.com/ory/x v0.0.84/go.mod h1:RXLPBG7B+hAViONVg0sHwK+U/ie1Y/NeXrq1JcARfoE=
-github.com/ory/x v0.0.93/go.mod h1:lfcTaGXpTZs7IEQAW00r9EtTCOxD//SiP5uWtNiz31g=
-github.com/ory/x v0.0.110/go.mod h1:DJfkE3GdakhshNhw4zlKoRaL/ozg/lcTahA9OCih2BE=
-github.com/ory/x v0.0.127/go.mod h1:FwUujfFuCj5d+xgLn4fGMYPnzriR5bdAIulFXMtnK0M=
-github.com/ory/x v0.0.214 h1:nz5ijvm5MVhYxWsQSuUrW1hj9F5QLZvPn/nLo5s06T4=
-github.com/ory/x v0.0.214/go.mod h1:aRl57gzyD4GF0HQCekovXhv0xTZgAgiht3o8eVhsm9Q=
-github.com/ovh/go-ovh v1.3.0 h1:mvZaddk4E4kLcXhzb+cxBsMPYp2pHqiQpWYkInsuZPQ=
-github.com/ovh/go-ovh v1.3.0/go.mod h1:AxitLZ5HBRPyUd+Zl60Ajaag+rNTdVXWIkzfrVuTXWA=
+github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
+github.com/ovh/go-ovh v1.4.3 h1:Gs3V823zwTFpzgGLZNI6ILS4rmxZgJwJCz54Er9LwD0=
+github.com/ovh/go-ovh v1.4.3/go.mod h1:AkPXVtgwB6xlKblMjRKJJmjRp+ogrE7fz2lVgcQY8SY=
 github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
-github.com/parnurzeal/gorequest v0.2.15/go.mod h1:3Kh2QUMJoqw3icWAecsyzkpY7UzRfDhbRdTjtNwNiUE=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
-github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo=
-github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys=
 github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
-github.com/pelletier/go-toml v1.8.0/go.mod h1:D6yutnOGMveHEPV7VQOuvI/gXY61bv+9bAOTRnLElKs=
-github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas=
+github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=
+github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
 github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
 github.com/performancecopilot/speed/v4 v4.0.0/go.mod h1:qxrSyuDGrTOWfV+uKRFhfxw6h/4HXRGUiZiufxo49BM=
 github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s=
 github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
-github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE=
-github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
 github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY=
 github.com/phpdave11/gofpdi v1.0.7/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
 github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
 github.com/phpdave11/gofpdi v1.0.13/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
 github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pierrec/lz4/v4 v4.1.8/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc=
-github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
-github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
+github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ=
+github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
-github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
+github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4/go.mod h1:N6UoU20jOqggOuDwUaBQpluzLNDqif3kq9z2wpdYEfQ=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
+github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
+github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -2541,7 +2811,6 @@ github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
 github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
-github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
 github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
@@ -2550,11 +2819,11 @@ github.com/prometheus/client_golang v1.10.0/go.mod h1:WJM3cc3yu7XKBKa/I8WeZm+V3e
 github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
 github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
 github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
-github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ=
 github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
 github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk=
-github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8=
-github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc=
+github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY=
+github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
+github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -2562,12 +2831,12 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
 github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
-github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY=
 github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU=
-github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU=
+github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
+github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
@@ -2579,48 +2848,42 @@ github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+
 github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
 github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA=
-github.com/prometheus/common v0.41.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc=
 github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc=
-github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY=
 github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
+github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY=
+github.com/prometheus/common v0.46.0 h1:doXzt5ybi1HBKpsZOL0sSkaNHJJqkyfEWZGGqqScV0Y=
+github.com/prometheus/common v0.46.0/go.mod h1:Tp0qkxpb9Jsg54QMe+EAmqXkSV7Evdy1BTn+g2pa/hQ=
 github.com/prometheus/common/assets v0.2.0/go.mod h1:D17UVUE12bHbim7HzwUvtqm6gwBEaDQ0F+hIGbFbccI=
 github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4=
 github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI=
-github.com/prometheus/exporter-toolkit v0.8.2/go.mod h1:00shzmJL7KxcsabLWcONwpyNEuWhREOnFqZW7vadFS0=
-github.com/prometheus/exporter-toolkit v0.9.1/go.mod h1:iFlTmFISCix0vyuyBmm0UqOUCTao9+RsAsKJP3YM9ec=
-github.com/prometheus/exporter-toolkit v0.10.0 h1:yOAzZTi4M22ZzVxD+fhy1URTuNRj/36uQJJ5S8IPza8=
 github.com/prometheus/exporter-toolkit v0.10.0/go.mod h1:+sVFzuvV5JDyw+Ih6p3zFxZNVnKQa3x5qPmDSiPu4ZY=
+github.com/prometheus/exporter-toolkit v0.11.0 h1:yNTsuZ0aNCNFQ3aFTD2uhPOvr4iD7fdBvKPAEGkNf+g=
+github.com/prometheus/exporter-toolkit v0.11.0/go.mod h1:BVnENhnNecpwoTLiABx7mrPB/OLRIgN74qlQbV+FK1Q=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
 github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY=
-github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
-github.com/prometheus/procfs v0.11.0 h1:5EAgkfkMl659uZPbe9AS2N68a7Cc1TJbPEuGzFuRbyk=
-github.com/prometheus/procfs v0.11.0/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
-github.com/prometheus/prometheus v0.43.0 h1:18iCSfrbAHbXvYFvR38U1Pt4uZmU9SmDcCpCrBKUiGg=
-github.com/prometheus/prometheus v0.43.0/go.mod h1:2BA14LgBeqlPuzObSEbh+Y+JwLH2GcqDlJKbF2sA6FM=
-github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
+github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY=
+github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
+github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
+github.com/prometheus/prometheus v0.49.0 h1:i0CEhreJo3ZcZNeK7ulISinCac0MgL0krVOGgNmfFRY=
+github.com/prometheus/prometheus v0.49.0/go.mod h1:aDogiyqmv3aBIWDb5z5Sdcxuuf2BOfiJwOIm9JGpMnI=
 github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b h1:zd/2RNzIRkoGGMjE+YIsZ85CnDIz672JK2F3Zl4vux4=
 github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b/go.mod h1:KjY0wibdYKc4DYkerHSbguaf3JeIPGhNJBp2BNiFH78=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/redis/go-redis/v9 v9.0.2 h1:BA426Zqe/7r56kCcvxYLWe1mkaz71LKF77GwgFzSxfE=
-github.com/redis/go-redis/v9 v9.0.2/go.mod h1:/xDTe9EF1LM61hek62Poq2nzQSGj0xSrEtEHbBQevps=
+github.com/redis/go-redis/v9 v9.1.0 h1:137FnGdk+EQdCbye1FW+qOEcY5S+SpY9T0NiuqvtfMY=
+github.com/redis/go-redis/v9 v9.1.0/go.mod h1:urWj3He21Dj5k4TK1y59xH8Uj6ATueP8AH1cY3lZl4c=
 github.com/redis/rueidis v1.0.16 h1:ieB3AqZe9GcuTWZL8PFu1Mfn+pfqjBZAJEZh7zOcwSI=
 github.com/redis/rueidis v1.0.16/go.mod h1:8B+r5wdnjwK3lTFml5VtxjzGOQAC+5UmujoD12pDrEo=
-github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/rhnvrm/simples3 v0.5.0/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8dPGkC3sA=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.3.4 h1:3Z3Eu6FGHZWSfNKJTOUiPatWwfc7DzJRU04jFUqJODw=
 github.com/rivo/uniseg v0.3.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
@@ -2629,27 +2892,20 @@ github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzG
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
-github.com/rogpeppe/go-internal v1.0.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.3.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.4.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
-github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
-github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
-github.com/rs/cors v1.9.0 h1:l9HGsTsHJcvW14Nk7J9KFz8bzeAWXn3CG6bgt7LsrAE=
-github.com/rs/cors v1.9.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
+github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo=
+github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
 github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
-github.com/rubenv/sql-migrate v0.0.0-20190212093014-1007f53448d7/go.mod h1:WS0rl9eEliYI8DPnr3TOwz4439pay+qNgzJoVya/DmY=
 github.com/russellhaering/goxmldsig v1.4.0 h1:8UcDh/xGyQiyrW+Fq5t8f+l2DLB1+zlhYzkPUJ7Qhys=
 github.com/russellhaering/goxmldsig v1.4.0/go.mod h1:gM4MDENBQf7M+V824SGfyIUVFWydB7n0KkEubVJl+Tw=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
@@ -2659,73 +2915,47 @@ github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w=
 github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk=
-github.com/ryantxu/kube-openapi v0.0.0-20230824154605-fe0f3703fd8d h1:/aSzsDXklM83yExguLXwl/nMrW8/7Lgefg2q632YynY=
-github.com/ryantxu/kube-openapi v0.0.0-20230824154605-fe0f3703fd8d/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+github.com/ryanuber/columnize v2.1.2+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/sagikazarmark/crypt v0.6.0/go.mod h1:U8+INwJo3nBv1m6A/8OBXAq7Jnpspk5AxSgDyEQcea8=
 github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
-github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod h1:TEAUOeZSmIxTTuHatJzrvARHiuO9LYd+cIxzgEHCQI4=
-github.com/santhosh-tekuri/jsonschema/v2 v2.1.0/go.mod h1:yzJzKUGV4RbWqWIBBP4wSOBqavX5saE02yirLS0OTyg=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.14 h1:yFl3jyaSVLNYXlnNYM5z2pagEk1dYQhfr1p20T1NyKY=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.14/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
-github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21 h1:yWfiTPwYxB0l5fGMhl/G+liULugVIHD9AU77iNLrURQ=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
+github.com/scottlepp/go-duck v0.0.20 h1:SrDrLuwouDh50QB2eaEEhfWvRpdAbnejgqn/3aHBspY=
+github.com/scottlepp/go-duck v0.0.20/go.mod h1:GL+hHuKdueJRrFCduwBc7A7TQk+Tetc5BPXPVtduihY=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-github.com/seatgeek/logrus-gelf-formatter v0.0.0-20210219220335-367fa274be2c/go.mod h1:/THDZYi7F/BsVEcYzYPqdcWFQ+1C2InkawTKfLOAnzg=
-github.com/segmentio/analytics-go v3.0.1+incompatible/go.mod h1:C7CYBtQWk4vRk2RyLu0qOcbHJ18E3F1HV2C/8JvKN48=
-github.com/segmentio/analytics-go v3.1.0+incompatible/go.mod h1:C7CYBtQWk4vRk2RyLu0qOcbHJ18E3F1HV2C/8JvKN48=
 github.com/segmentio/asm v1.1.3/go.mod h1:Ld3L4ZXGNcSLRg4JBsZ3//1+f/TjYl0Mzen/DQy1EJg=
 github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys=
 github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=
-github.com/segmentio/backo-go v0.0.0-20160424052352-204274ad699c/go.mod h1:kJ9mm9YmoWSkk+oQ+5Cj8DEoRCX2JT6As4kEtIIOp1M=
-github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3/go.mod h1:9/Rh6yILuLysoQnZ2oNooD2g7aBnvM7r/fNVxRNWfBc=
-github.com/segmentio/conf v1.2.0/go.mod h1:Y3B9O/PqqWqjyxyWWseyj/quPEtMu1zDp/kVbSWWaB0=
 github.com/segmentio/encoding v0.3.6 h1:E6lVLyDPseWEulBmCmAKPanDd3jiyGDo5gMcugCRwZQ=
 github.com/segmentio/encoding v0.3.6/go.mod h1:n0JeuIqEQrQoPDGsjo8UNd1iA0U8d8+oHAA4E3G3OxM=
-github.com/segmentio/go-snakecase v1.1.0/go.mod h1:jk1miR5MS7Na32PZUykG89Arm+1BUSYhuGR6b7+hJto=
-github.com/segmentio/objconv v1.0.1/go.mod h1:auayaH5k3137Cl4SoXTgrzQcuQDmvuVtZgS0fb1Ahys=
-github.com/sercand/kuberesolver/v4 v4.0.0/go.mod h1:F4RGyuRmMAjeXHKL+w4P7AwUnPceEAPAhxUgXZjKgvM=
-github.com/serenize/snaker v0.0.0-20171204205717-a683aaf2d516/go.mod h1:Yow6lPLSAXx2ifx470yD/nUe22Dv5vBvxK/UK9UUTVs=
-github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
 github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
-github.com/shoenig/test v0.6.2/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
+github.com/shoenig/test v0.6.6/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
-github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
-github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ=
-github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod h1:ZpfEhSmds4ytuByIcDnOLkTHGUI6KNqRNPDLHDk+mUU=
-github.com/shurcooL/highlight_go v0.0.0-20170515013102-78fb10f4a5f8/go.mod h1:UDKB5a1T23gOMUJrI+uSuH0VRDStOiUVSjBTRDVBVag=
-github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 h1:bUGsEnyNbVPw06Bs80sCeARAlK8lhwqGyi6UT8ymuGk=
 github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
-github.com/shurcooL/octicon v0.0.0-20180602230221-c42b0e3b24d9/go.mod h1:eWdoE5JD4R5UVWDucdOPg1g2fqQRq78IQa9zlOV1vpQ=
-github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c h1:aqg5Vm5dwtvL+YgDpBcK1ITf3o96N/K7/wsRXQnUTEs=
+github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c/go.mod h1:owqhoLW1qZoYLZzLnBw+QkPP9WZnjlSWihhxAJC1+/M=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 h1:pXY9qYc/MP5zdvqWEUH6SjNiu7VhSjuVFTFiTcphaLU=
 github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
-github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
-github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
-github.com/sirupsen/logrus v1.1.0/go.mod h1:zrgwTnHtNr00buQ1vSptGe8m1f/BbgsPukg8qsT7A+A=
-github.com/sirupsen/logrus v1.1.1/go.mod h1:zrgwTnHtNr00buQ1vSptGe8m1f/BbgsPukg8qsT7A+A=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
-github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 h1:Jpy1PXuP99tXNrhbq2BaPz9B+jNAvH1JPQQpG/9GCXY=
 github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
 github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
 github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
@@ -2733,50 +2963,34 @@ github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4k
 github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js=
 github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0=
 github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
-github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE=
-github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
-github.com/spf13/afero v1.2.0/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
 github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
-github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
 github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
-github.com/spf13/cast v1.2.0/go.mod h1:r2rcYCSwa1IExKTDiTfzaxqT2FNHs8hODu4LnUfgKEg=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cast v1.3.2-0.20200723214538-8d17101741c8/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
 github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
-github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
-github.com/spf13/cobra v0.0.6/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
-github.com/spf13/cobra v0.0.7/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
-github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
-github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
-github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
+github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
+github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
-github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
-github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.2.1/go.mod h1:P4AexN0a+C9tGAnUFNwDMYYZv3pjFuvmeiMyKRaNVlI=
-github.com/spf13/viper v1.3.1/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
-github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/spf13/viper v1.13.0/go.mod h1:Icm2xNL3/8uyh/wFuB1jI7TiTNKp8632Nwegu+zgdYw=
 github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0=
-github.com/sqs/goreturns v0.0.0-20181028201513-538ac6014518/go.mod h1:CKI4AZ4XmGV240rTHfO0hfE83S6/a3/Q1siZJ/vXf7A=
-github.com/square/go-jose/v3 v3.0.0-20200630053402-0a67ce9b0693/go.mod h1:6hSY48PjDm4UObWmGLyJE9DxYVKTgR9kbCspXXJEhcU=
-github.com/stoewer/go-strcase v1.2.0 h1:Z2iHWqGXH00XYgqDmNgQbIBxf3wrNq0F3feEy0ainaU=
-github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
+github.com/spyzhov/ajson v0.9.0 h1:tF46gJGOenYVj+k9K1U1XpCxVWhmiyY5PsVCAs1+OJ0=
+github.com/spyzhov/ajson v0.9.0/go.mod h1:a6oSw0MMb7Z5aD2tPoPO+jq11ETKgXUr2XktHdT8Wt8=
+github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs=
+github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo=
 github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
 github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
 github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
@@ -2786,8 +3000,9 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
@@ -2801,98 +3016,69 @@ github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/subosito/gotenv v1.1.1/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
-github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
-github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
 github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf h1:Z2X3Os7oRzpdJ75iPqWZc0HeJWFYNCvKsfpQwFpRNTA=
 github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf/go.mod h1:M8agBzgqHIhgj7wEn9/0hJUZcrvt9VY+Ln+S1I5Mha0=
-github.com/tidwall/gjson v1.3.2/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
-github.com/tidwall/gjson v1.6.8/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI=
-github.com/tidwall/gjson v1.7.1/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
-github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
-github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v0.0.0-20180105212114-65a9db5fad51/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/tidwall/pretty v1.1.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
-github.com/tidwall/sjson v1.0.4/go.mod h1:bURseu1nuBkFpIES5cz6zBtjmYeOQmEESshn7VpF15Y=
-github.com/tidwall/sjson v1.1.5/go.mod h1:VuJzsZnTowhSxWdOgsAnb886i4AjEyTkk7tNtsL7EYE=
-github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
-github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7otjonDflCTK0BCfls4SPy3NcCVb5dqqmbRknE=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
+github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
+github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ua-parser/uap-go v0.0.0-20211112212520-00c877edfe0f h1:A+MmlgpvrHLeUP8dkBVn4Pnf5Bp5Yk2OALm7SEJLLE8=
 github.com/ua-parser/uap-go v0.0.0-20211112212520-00c877edfe0f/go.mod h1:OBcG9bn7sHtXgarhUEb3OfCnNsgtGnkVf41ilSZ3K3E=
-github.com/uber-go/atomic v1.3.2/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g=
-github.com/uber/jaeger-client-go v2.15.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
-github.com/uber/jaeger-client-go v2.22.1+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
-github.com/uber/jaeger-client-go v2.28.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
 github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o=
 github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
-github.com/uber/jaeger-lib v1.5.0/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
-github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
 github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg=
 github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
-github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
-github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0=
+github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
+github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 h1:aVGB3YnaS/JNfOW3tiHIlmNmTDg618va+eT0mVomgyI=
 github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8/go.mod h1:fVle4kNr08ydeohzYafr20oZzbAkhQT39gKK/pFQ5M4=
 github.com/unknwon/com v1.0.1 h1:3d1LTxD+Lnf3soQiD4Cp/0BRB+Rsa/+RTvz8GMMzIXs=
 github.com/unknwon/com v1.0.1/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnlCXM=
 github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3 h1:4EYQaWAatQokdji3zqZloVIW/Ke1RQjYw2zHULyrHJg=
 github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3/go.mod h1:1xEUf2abjfP92w2GZTV+GgaRxXErwRXcClbUwrNJffU=
-github.com/unrolled/secure v0.0.0-20180918153822-f340ee86eb8b/go.mod h1:mnPT77IAdsi/kV7+Es7y+pXALeV3h7G6dQF6mNYjcLA=
-github.com/unrolled/secure v0.0.0-20181005190816-ff9db2ff917f/go.mod h1:mnPT77IAdsi/kV7+Es7y+pXALeV3h7G6dQF6mNYjcLA=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/urfave/cli v1.22.14 h1:ebbhrRiGK2i4naQJr+1Xj92HXZCrK7MsyTS/ob3HnAk=
 github.com/urfave/cli v1.22.14/go.mod h1:X0eDS6pD6Exaclxm99NJ3FiCDRED7vIHpx2mDOHLvkA=
 github.com/urfave/cli/v2 v2.25.0 h1:ykdZKuQey2zq0yin/l7JOm9Mh+pg72ngYMeB0ABn6q8=
 github.com/urfave/cli/v2 v2.25.0/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
-github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w=
-github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
 github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
-github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
 github.com/vectordotdev/go-datemath v0.1.1-0.20220323213446-f3954d0b18ae h1:oyiy3uBj1F4O3AaFh7hUGBrJjAssJhKyAbwxtkslxqo=
 github.com/vectordotdev/go-datemath v0.1.1-0.20220323213446-f3954d0b18ae/go.mod h1:PnwzbSst7KD3vpBzzlntZU5gjVa455Uqa5QPiKSYJzQ=
 github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs=
 github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI=
-github.com/weaveworks/common v0.0.0-20230511094633-334485600903 h1:ph7R2CS/0o1gBzpzK/CioUKJVsXNVXfDGR8FZ9rMZIw=
-github.com/weaveworks/common v0.0.0-20230511094633-334485600903/go.mod h1:rgbeLfJUtEr+G74cwFPR1k/4N0kDeaeSv/qhUNE4hm8=
-github.com/weaveworks/promrus v1.2.0 h1:jOLf6pe6/vss4qGHjXmGz4oDJQA+AOCqEL3FvvZGz7M=
-github.com/weaveworks/promrus v1.2.0/go.mod h1:SaE82+OJ91yqjrE1rsvBWVzNZKcHYFtMUyS1+Ogs/KA=
 github.com/wk8/go-ordered-map v1.0.0 h1:BV7z+2PaK8LTSd/mWgY12HyMAo5CEgkHqbkVq2thqr8=
 github.com/wk8/go-ordered-map v1.0.0/go.mod h1:9ZIbRunKbuvfPKyBP1SIKLcXNlv74YCOZ3t3VTS6gRk=
+github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
+github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
 github.com/xanzy/go-gitlab v0.15.0/go.mod h1:8zdQa/ri1dfn8eS3Ir1SyfvOKlw7WBJ8DVThkpGiXrs=
-github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI=
-github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
 github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
 github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g=
+github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4=
 github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
 github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=
+github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
-github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
 github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
-github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
-github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
-github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
 github.com/xhit/go-str2duration v1.2.0/go.mod h1:3cPSlfZlUHVlneIVfePFWcJZsuwf+P1v2SRTV4cUmp4=
 github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU=
@@ -2903,10 +3089,8 @@ github.com/xlab/treeprint v1.2.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
-github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c/go.mod h1:UrdRz5enIKZ63MEE3IF9l2/ebyx59GyGgPi+tICQdmM=
-github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI=
-github.com/yalue/merged_fs v1.2.2 h1:vXHTpJBluJryju7BBpytr3PDIkzsPMpiEknxVGPhN/I=
-github.com/yalue/merged_fs v1.2.2/go.mod h1:WqqchfVYQyclV2tnR7wtRhBddzBvLVR83Cjw9BKQw0M=
+github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2 h1:zzrxE1FKn5ryBNl9eKOeqQ58Y/Qpo3Q9QNxKHX5uzzQ=
+github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2/go.mod h1:hzfGeIUDq/j97IG+FhNqkowIyEcD88LrW6fyU3K3WqY=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
 github.com/yudai/gojsondiff v1.0.0 h1:27cbfqXLVEJ1o8I6v3y9lg8Ydm53EKqHXAOMxEGlCOA=
 github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
@@ -2930,53 +3114,46 @@ github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN
 github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
 github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
-github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
-github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
 gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2cqquPa0MKWeNkmOM5RQsRhkrwMWonFMN7fE=
-go.elastic.co/apm v1.8.0/go.mod h1:tCw6CkOJgkWnzEthFN9HUP1uL3Gjc/Ur6m7gRPLaoH0=
-go.elastic.co/apm/module/apmhttp v1.8.0/go.mod h1:9LPFlEON51/lRbnWDfqAWErihIiAFDUMfMV27YjoWQ8=
-go.elastic.co/apm/module/apmot v1.8.0/go.mod h1:Q5Xzabte8G/fkvDjr1jlDuOSUt9hkVWNZEHh6ZNaTjI=
-go.elastic.co/fastjson v1.0.0/go.mod h1:PmeUOMMtLHQr9ZS9J9owrAVg0FkaZDRZJEFTTGHtchs=
-go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
-go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
+go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA=
+go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
 go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738 h1:VcrIfasaLFkyjk6KNlXQSzO+B0fZcnECiDrKJsfxka0=
 go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
 go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
-go.etcd.io/etcd/api/v3 v3.5.7 h1:sbcmosSVesNrWOJ58ZQFitHMdncusIifYcrBfwrlJSY=
-go.etcd.io/etcd/api/v3 v3.5.7/go.mod h1:9qew1gCdDDLu+VwmeG+iFpL+QlpHTo7iubavdVDgCAA=
+go.etcd.io/etcd/api/v3 v3.5.10 h1:szRajuUUbLyppkhs9K6BRtjY37l66XQQmw7oZRANE4k=
+go.etcd.io/etcd/api/v3 v3.5.10/go.mod h1:TidfmT4Uycad3NM/o25fG3J07odo4GBB9hoxaodFCtI=
 go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
 go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
-go.etcd.io/etcd/client/pkg/v3 v3.5.7 h1:y3kf5Gbp4e4q7egZdn5T7W9TSHUvkClN6u+Rq9mEOmg=
-go.etcd.io/etcd/client/pkg/v3 v3.5.7/go.mod h1:o0Abi1MK86iad3YrWhgUsbGx1pmTS+hrORWc2CamuhY=
+go.etcd.io/etcd/client/pkg/v3 v3.5.10 h1:kfYIdQftBnbAq8pUWFXfpuuxFSKzlmM5cSn76JByiT0=
+go.etcd.io/etcd/client/pkg/v3 v3.5.10/go.mod h1:DYivfIviIuQ8+/lCq4vcxuseg2P2XbHygkKwFo9fc8U=
 go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ=
 go.etcd.io/etcd/client/v2 v2.305.4/go.mod h1:Ud+VUwIi9/uQHOMA+4ekToJ12lTxlv0zB/+DHwTGEbU=
-go.etcd.io/etcd/client/v2 v2.305.7 h1:AELPkjNR3/igjbO7CjyF1fPuVPjrblliiKj+Y6xSGOU=
+go.etcd.io/etcd/client/v2 v2.305.10 h1:MrmRktzv/XF8CvtQt+P6wLUlURaNpSDJHFZhe//2QE4=
+go.etcd.io/etcd/client/v2 v2.305.10/go.mod h1:m3CKZi69HzilhVqtPDcjhSGp+kA1OmbNn0qamH80xjA=
 go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0=
 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY=
-go.etcd.io/etcd/client/v3 v3.5.7 h1:u/OhpiuCgYY8awOHlhIhmGIGpxfBU/GZBUP3m/3/Iz4=
-go.etcd.io/etcd/client/v3 v3.5.7/go.mod h1:sOWmj9DZUMyAngS7QQwCyAXXAL6WhgTOPLNS/NabQgw=
-go.etcd.io/etcd/pkg/v3 v3.5.7 h1:obOzeVwerFwZ9trMWapU/VjDcYUJb5OfgC1zqEGWO/0=
-go.etcd.io/etcd/raft/v3 v3.5.7 h1:aN79qxLmV3SvIq84aNTliYGmjwsW6NqJSnqmI1HLJKc=
-go.etcd.io/etcd/server/v3 v3.5.7 h1:BTBD8IJUV7YFgsczZMHhMTS67XuA4KpRquL0MFOJGRk=
-go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
+go.etcd.io/etcd/client/v3 v3.5.10 h1:W9TXNZ+oB3MCd/8UjxHTWK5J9Nquw9fQBLJd5ne5/Ao=
+go.etcd.io/etcd/client/v3 v3.5.10/go.mod h1:RVeBnDz2PUEZqTpgqwAtUd8nAPf5kjyFyND7P1VkOKc=
+go.etcd.io/etcd/pkg/v3 v3.5.10 h1:WPR8K0e9kWl1gAhB5A7gEa5ZBTNkT9NdNWrR8Qpo1CM=
+go.etcd.io/etcd/pkg/v3 v3.5.10/go.mod h1:TKTuCKKcF1zxmfKWDkfz5qqYaE3JncKKZPFf8c1nFUs=
+go.etcd.io/etcd/raft/v3 v3.5.10 h1:cgNAYe7xrsrn/5kXMSaH8kM/Ky8mAdMqGOxyYwpP0LA=
+go.etcd.io/etcd/raft/v3 v3.5.10/go.mod h1:odD6kr8XQXTy9oQnyMPBOr0TVe+gT0neQhElQ6jbGRc=
+go.etcd.io/etcd/server/v3 v3.5.10 h1:4NOGyOwD5sUZ22PiWYKmfxqoeh72z6EhYjNosKGLmZg=
+go.etcd.io/etcd/server/v3 v3.5.10/go.mod h1:gBplPHfs6YI0L+RpGkTQO7buDbHv5HJGG/Bst0/zIPo=
 go.mongodb.org/mongo-driver v1.1.0/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
-go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
-go.mongodb.org/mongo-driver v1.3.0/go.mod h1:MSWZXKOynuguX+JSvwP8i+58jYCXxbia8HS3gZBapIE=
-go.mongodb.org/mongo-driver v1.3.4/go.mod h1:MSWZXKOynuguX+JSvwP8i+58jYCXxbia8HS3gZBapIE=
 go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg=
 go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng=
 go.mongodb.org/mongo-driver v1.10.0/go.mod h1:wsihk0Kdgv8Kqu1Anit4sfK+22vSFbUrAVEYRhCXrA8=
-go.mongodb.org/mongo-driver v1.11.2/go.mod h1:s7p5vEtfbeR1gYi6pnj3c3/urpbLv2T5Sfd6Rp2HBB8=
-go.mongodb.org/mongo-driver v1.11.3 h1:Ql6K6qYHEzB6xvu4+AU0BoRoqf9vFPcc4o7MUIdPW8Y=
-go.mongodb.org/mongo-driver v1.11.3/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g=
+go.mongodb.org/mongo-driver v1.13.0/go.mod h1:/rGBTebI3XYboVmgz+Wv3Bcbl3aD0QF9zl6kDDw18rQ=
+go.mongodb.org/mongo-driver v1.13.1 h1:YIc7HTYsKndGK4RFzJ3covLz1byri52x0IoMB0Pt/vk=
+go.mongodb.org/mongo-driver v1.13.1/go.mod h1:wcDf1JBCXy2mOW0bWHwO/IOYqdca1MPCwDtFu/Z9+eo=
 go.opencensus.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
-go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -2984,71 +3161,77 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
-go.opentelemetry.io/collector/pdata v1.0.0-rc8 h1:vBikWdZFsRiT5dVsLQhnE99w3edM7eem3Q9dSqMlStE=
-go.opentelemetry.io/collector/pdata v1.0.0-rc8/go.mod h1:BVCBhWgclYCh7Oi6BkMiQfRa6MXv1uRTlKXuL5oBby8=
-go.opentelemetry.io/contrib v0.18.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 h1:RsQi0qJ2imFfCvZabqzM9cNXBG8k6gXMv1A0cXRmH6A=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0/go.mod h1:vsh3ySueQCiKPxFLvjWC4Z135gIa34TQ/NSqkDTZYUM=
-go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.18.0/go.mod h1:iK1G0FgHurSJ/aYLg5LpnPI0pqdanM73S3dhyDp0Lk4=
-go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.45.0 h1:2ea0IkZBsWH+HA2GkD+7+hRw2u97jzdFyRtXuO14a1s=
-go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.45.0/go.mod h1:4m3RnBBb+7dB9d21y510oO1pdB1V4J6smNf14WXcBFQ=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 h1:x8Z78aZx8cOF0+Kkazoc7lwUNMGy0LrzEMxTm4BbTxg=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0/go.mod h1:62CPTSry9QZtOaSsE3tOzhx6LzDhHnXJ6xHeMNNiM6Q=
-go.opentelemetry.io/contrib/propagators/jaeger v1.20.0 h1:iVhNKkMIpzyZqxk8jkDU2n4DFTD+FbpGacvooxEvyyc=
-go.opentelemetry.io/contrib/propagators/jaeger v1.20.0/go.mod h1:cpSABr0cm/AH/HhbJjn+AudBVUMgZWdfN3Gb+ZqxSZc=
-go.opentelemetry.io/contrib/samplers/jaegerremote v0.9.0 h1:zRi6a8uX+cJGTPLXRPjFEzN27a26k5R7LiLK87ntXgg=
-go.opentelemetry.io/contrib/samplers/jaegerremote v0.9.0/go.mod h1:pzJOLTppaPbiPjPZEwGRf0VWx6G07hhOqznjKXIMkEk=
-go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs=
-go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY=
+go.opentelemetry.io/collector/featuregate v1.0.0/go.mod h1:xGbRuw+GbutRtVVSEy3YR2yuOlEyiUMhN2M9DJljgqY=
+go.opentelemetry.io/collector/pdata v1.0.0/go.mod h1:TsDFgs4JLNG7t6x9D8kGswXUz4mme+MyNChHx8zSF6k=
+go.opentelemetry.io/collector/pdata v1.5.0 h1:1fKTmUpr0xCOhP/B0VEvtz7bYPQ45luQ8XFyA07j8LE=
+go.opentelemetry.io/collector/pdata v1.5.0/go.mod h1:TYj8aKRWZyT/KuKQXKyqSEvK/GV+slFaDMEI+Ke64Yw=
+go.opentelemetry.io/collector/semconv v0.90.1/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0=
+go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.49.0 h1:RtcvQ4iw3w9NBB5yRwgA4sSa82rfId7n4atVpvKx3bY=
+go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.49.0/go.mod h1:f/PbKbRd4cdUICWell6DmzvVJ7QrmBgFrRHjXmAXbK4=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw=
+go.opentelemetry.io/contrib/propagators/jaeger v1.22.0 h1:bAHX+zN/inu+Rbqk51REmC8oXLl+Dw6pp9ldQf/onaY=
+go.opentelemetry.io/contrib/propagators/jaeger v1.22.0/go.mod h1:bH9GkgkN21mscXcQP6lQJYI8XnEPDxlTN/ZOBuHDjqE=
+go.opentelemetry.io/contrib/samplers/jaegerremote v0.18.0 h1:Q9PrD94WoMolBx44ef5UWWvufpVSME0MiSymXZfedso=
+go.opentelemetry.io/contrib/samplers/jaegerremote v0.18.0/go.mod h1:tjp49JHNvreAAoWjdCHIVD7NXMjuJ3Dp/9iNOuPPlC8=
+go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0=
+go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo=
+go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
+go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo=
 go.opentelemetry.io/otel/exporters/jaeger v1.10.0 h1:7W3aVVjEYayu/GOqOVF4mbTvnCuxF1wWu3eRxFGQXvw=
 go.opentelemetry.io/otel/exporters/jaeger v1.10.0/go.mod h1:n9IGyx0fgyXXZ/i0foLHNxtET9CzXHzZeKCucvRBFgA=
-go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0/go.mod h1:UFG7EBMRdXyFstOwH028U0sVf+AvukSGhF0g8+dmNG8=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0/go.mod h1:HrbCVv40OOLTABmOn1ZWty6CHXkU8DK/Urc43tHug70=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 h1:Mne5On7VWdx7omSrSSZvM4Kw7cS7NQkOOmLcgscI51U=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0/go.mod h1:5w41DY6S9gZrbjuq6Y+753e96WfPha5IcsOSZTtullM=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 h1:3d+S281UTjM+AbF31XSOYn1qXn3BgIdWl8HNEpx08Jk=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0/go.mod h1:0+KuTDyKL4gjKCF75pHOX4wuzYDUZYfAQdSu43o+Z2I=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.14.0/go.mod h1:+N7zNjIJv4K+DeX67XXET0P+eIciESgaFDBqh+ZJFS4=
-go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE=
-go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8=
-go.opentelemetry.io/otel/oteltest v0.18.0/go.mod h1:NyierCU3/G8DLTva7KRzGii2fdxdR89zXKH1bNWY7Bo=
-go.opentelemetry.io/otel/sdk v1.14.0/go.mod h1:bwIC5TjrNG6QDCHNWvW4HLHtUQ4I+VQDsnjhvyZCALM=
-go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o=
-go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A=
-go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg=
-go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0/go.mod h1:zgBdWWAu7oEEMC06MMKc5NLbA/1YDXV1sMpSqEeLQLg=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 h1:t6wl9SPayj+c7lEIFgm4ooDBZVb01IhLB4InpomhRw8=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0/go.mod h1:iSDOcsnSA5INXzZtwaBPrKp/lWu/V14Dd+llD0oI2EA=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0/go.mod h1:nUeKExfxAQVbiVFn32YXpXZZHZ61Cc3s3Rn1pDBGAb0=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 h1:Mw5xcxMwlqoJd97vwPxA8isEaIoxsta9/Q51+TTJLGE=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0/go.mod h1:CQNu9bj7o7mC6U7+CA/schKEYakYXWr79ucDHTMGhCM=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0/go.mod h1:/OpE/y70qVkndM0TrxT4KBoN3RsFZP0QaofcfYrj76I=
+go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o=
+go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM=
+go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI=
+go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco=
+go.opentelemetry.io/otel/sdk v1.17.0/go.mod h1:U87sE0f5vQB7hwUoW98pW5Rz4ZDuCFBZFNUBlSgmDFQ=
+go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E=
+go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw=
+go.opentelemetry.io/otel/sdk v1.24.0/go.mod h1:KVrIYw6tEubO9E96HQpcmpTKDVn9gdv35HoYiQWGDFg=
+go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY=
+go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ=
+go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI=
+go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
 go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
-go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
 go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
-go.starlark.net v0.0.0-20221020143700-22309ac47eac h1:gBO5Qfcw5V9404yzsu2FEIsxK/u2mBNTNogK0uIoVhk=
-go.starlark.net v0.0.0-20221020143700-22309ac47eac/go.mod h1:kIVgS18CjmEC3PqMd5kaJSGEifyV/CeB9x506ZJ1Vbk=
+go.opentelemetry.io/proto/otlp v1.1.0 h1:2Di21piLrCqJ3U3eXGCTPHE9R8Nh+0uglSnOyxikMeI=
+go.opentelemetry.io/proto/otlp v1.1.0/go.mod h1:GpBHCBWiqvVLDqmHZsoMM3C5ySeKTC7ej/RNTae6MdY=
+go.starlark.net v0.0.0-20230525235612-a134d8f9ddca h1:VdD38733bfYv5tUZwEIskMM93VanwNIi5bIKnDrJdEY=
+go.starlark.net v0.0.0-20230525235612-a134d8f9ddca/go.mod h1:jxU+3+j+71eXOW14274+SmmuW82qJzl6iZSeqEtTGds=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
-go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
 go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
-go.uber.org/automaxprocs v1.5.1/go.mod h1:BF4eumQw0P9GtnuxxovUd06vwm1o18oMzFtK66vU6XU=
+go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
-go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
-go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
 go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
-go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
-go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
 go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
@@ -3057,59 +3240,37 @@ go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
 go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
 go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI=
 go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
-go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
-go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
+go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
+go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
 gocloud.dev v0.25.0 h1:Y7vDq8xj7SyM848KXf32Krda2e6jQ4CLh/mTeCSqXtk=
 gocloud.dev v0.25.0/go.mod h1:7HegHVCYZrMiU3IE1qtnzf/vRrDwLYnRNR3EhWX8x9Y=
-golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20180830192347-182538f80094/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
+golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=
+golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20180910181607-0e37d006457b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181001203147-e3636079e1a4/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181015023909-0c41d7ab0a0e/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181024171144-74cb1d3d52f4/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181025113841-85e1b3f9139a/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181127143415-eb0de9b17e85/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190102171810-8d7daa0c54b3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190103213133-ff983b9c42bc/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20191122220453-ac88ee75c92c/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200117160349-530e935923ad/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200320181102-891825fb96df/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
@@ -3117,27 +3278,35 @@ golang.org/x/crypto v0.0.0-20210915214749-c084706c2272/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211115234514-b4de73f9ece8/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20221012134737-56aed061732a/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
 golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
 golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
+golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
+golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
 golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
-golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
 golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
+golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
 golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
 golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3/go.mod h1:NOZ3BPKG0ec/BKJQgnvsSFpcKLM5xXVWnvZS97DWHgE=
@@ -3147,11 +3316,12 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/exp v0.0.0-20220328175248-053ad81199eb/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE=
 golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
 golang.org/x/exp v0.0.0-20230108222341-4b8118a2686a/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
-golang.org/x/exp v0.0.0-20230307190834-24139beb5833/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
-golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
-golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
+golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8=
+golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb h1:c0vyKkb6yr3KR7jEfJaOSv4lG7xPkbN6r52aJz1d8a8=
+golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
@@ -3190,57 +3360,46 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
 golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
+golang.org/x/mod v0.6.0-dev.0.20211013180041-c96bc1413d57/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
 golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
 golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
+golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
+golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180816102801-aaf60122140d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180921000356-2f5d2388922f/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180926154720-4dfa2610cdf3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181017193950-04a2e542c03f/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181207154023-610586996380/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200219183655-46282727080f/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -3250,21 +3409,19 @@ golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
-golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
 golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM=
@@ -3273,15 +3430,11 @@ golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211008194852-3b03d305991f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220107192237-5cfca573fb4d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
@@ -3295,7 +3448,6 @@ golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug
 golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-golang.org/x/net v0.0.0-20220921155015-db77216a4ee9/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
@@ -3308,11 +3460,18 @@ golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ=
+golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
 golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
-golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
+golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
+golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
+golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
+golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20181003184128-c57b0facaced/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -3344,9 +3503,17 @@ golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri
 golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec=
 golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I=
 golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw=
+golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4=
 golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE=
-golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY=
+golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI=
+golang.org/x/oauth2 v0.11.0/go.mod h1:LdF7O/8bLR/qWK9DrpXmbHLTouvRHK0SgJl0GmDBchk=
+golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4=
 golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0=
+golang.org/x/oauth2 v0.14.0/go.mod h1:lAtNWgaWfL4cm7j2OV8TxGi9Qb7ECORx8DktCY74OwM=
+golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM=
+golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o=
+golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI=
+golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -3367,39 +3534,26 @@ golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
-golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
 golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
-golang.org/x/sys v0.0.0-20180816055513-1c9583448a9c/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180831094639-fa5fdf94c789/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180906133057-8cf3aee42992/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180921163948-d47a0f339242/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180927150500-dad3d9fb7b6e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181005133103-4497e2df6f9e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181011152604-fa43e7bc11ba/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181022134430-8a28ead16f52/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181024145615-5cd93ef61a7c/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181025063200-d989b31c8746/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181026064943-731415f00dce/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181106135930-3a76605856fd/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181206074257-70b957f3b65e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190102155601-82a175fd1598/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190116161447-11f53e031339/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -3407,26 +3561,20 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190426135247-a129542de9ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191020152052-9984515f0562/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191025021431-6c3a3bfe00ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191105231009-c1f44814a5cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -3435,7 +3583,6 @@ golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200121082415-34d275377bf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -3448,12 +3595,10 @@ golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -3471,13 +3616,11 @@ golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210503080704-8803ae5d1324/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -3520,13 +3663,11 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -3535,9 +3676,17 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -3550,9 +3699,17 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo=
+golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
 golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
-golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
+golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
+golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww=
+golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
+golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
+golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -3569,58 +3726,35 @@ golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20220224211638-0e9765cccd65/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
 golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
+golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181003024731-2f84ea8ef872/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181006002542-f60d9635b16a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181008205924-a2b3f7f249e9/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181013182035-5e66757b835f/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181017214349-06f26fdaaa28/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181024171208-a2dc47679d30/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181026183834-f60e5f99f081/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181105230042-78dc5bac0cac/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181107215632-34b416bd17b3/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181114190951-94339b83286c/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181119130350-139d099f6620/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181127195227-b4e97c0ed882/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181127232545-e782529d0ddd/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181203210056-e5f3ab76ea4b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181205224935-3576414c54a4/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181206194817-bcd4e47d0288/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181207183836-8bc39b988060/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181212172921-837e80568c09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190102213336-ca9055ed7d04/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190104182027-498d95493402/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190111214448-fc1d57b08d7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190118193359-16909d206f00/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
@@ -3633,20 +3767,14 @@ golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBn
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190613204242-ed0dc450797f/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190624190245-7f2218787638/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190711191110-9a621aea19f8/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
 golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191004055002-72853e10c5a3/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -3657,31 +3785,25 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20191224055732-dd894d0a8a40/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200117220505-0cba7a3a9ee9/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200203215610-ab391d50b528/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200308013534-11ec41452d41/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
@@ -3700,7 +3822,7 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
+golang.org/x/tools v0.1.8-0.20211029000441-d6a9af8af023/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
 golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
 golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
@@ -3709,8 +3831,14 @@ golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
 golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
-golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss=
-golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
+golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
+golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
+golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM=
+golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
+golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
+golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -3720,10 +3848,10 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
 golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
-golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
+golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
+golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
 gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
-gonum.org/v1/gonum v0.6.2/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU=
 gonum.org/v1/gonum v0.7.0/go.mod h1:L02bwd0sqlsvRv41G7wGWFCsVNZFv/k1xzGIxeANHGM=
 gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0=
 gonum.org/v1/gonum v0.9.3/go.mod h1:TZumC3NeyVQskjXqmyWt4S3bINhy7B4eYwW69EbyX+0=
@@ -3731,9 +3859,7 @@ gonum.org/v1/gonum v0.11.0/go.mod h1:fSG4YDCxxUZQJ7rKsQrj0gMOg00Il0Z96/qMA4bVQhA
 gonum.org/v1/gonum v0.12.0 h1:xKuo6hzt+gMav00meVPUlXwSdoEJP46BR+wdxQEFK2o=
 gonum.org/v1/gonum v0.12.0/go.mod h1:73TDxJfAAHeA8Mk9mf8NlIppyhQNo5GLTcYeqgo2lvY=
 gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
-gonum.org/v1/netlib v0.0.0-20191229114700-bbb4dff026f8/go.mod h1:2IgXn/sJaRbePPBA1wRj8OE+QLvVaH0q8SK6TSTKlnk=
 gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc=
-gonum.org/v1/plot v0.0.0-20200111075622-4abb28f724d5/go.mod h1:+HbaZVpsa73UwN7kXGCECULRHovLRJjH+t5cFPgxErs=
 gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY=
 gonum.org/v1/plot v0.10.1/go.mod h1:VZW5OlhkL1mysU9vaqNHnsy86inf6Ot+jB3r+BczCEo=
 google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
@@ -3802,8 +3928,18 @@ google.golang.org/api v0.107.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/
 google.golang.org/api v0.108.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY=
 google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI=
 google.golang.org/api v0.111.0/go.mod h1:qtFHvU9mhgTJegR31csQ+rwxyUTHOKFqCKWp1J0fdw0=
-google.golang.org/api v0.148.0 h1:HBq4TZlN4/1pNcu0geJZ/Q50vIwIXT532UIMYoo0vOs=
-google.golang.org/api v0.148.0/go.mod h1:8/TBgwaKjfqTdacOJrOv2+2Q6fBDU1uHKK06oGSkxzU=
+google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg=
+google.golang.org/api v0.118.0/go.mod h1:76TtD3vkgmZ66zZzp72bUUklpmQmKlhh6sYtIjYK+5E=
+google.golang.org/api v0.122.0/go.mod h1:gcitW0lvnyWjSp9nKxAbdHKIZ6vF4aajGueeslZOyms=
+google.golang.org/api v0.124.0/go.mod h1:xu2HQurE5gi/3t1aFCvhPD781p0a3p11sdunTJ2BlP4=
+google.golang.org/api v0.125.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw=
+google.golang.org/api v0.126.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw=
+google.golang.org/api v0.128.0/go.mod h1:Y611qgqaE92On/7g65MQgxYul3c0rEB894kniWLY750=
+google.golang.org/api v0.139.0/go.mod h1:CVagp6Eekz9CjGZ718Z+sloknzkDJE7Vc1Ckj9+viBk=
+google.golang.org/api v0.149.0/go.mod h1:Mwn1B7JTXrzXtnvmzQE2BD6bYZQ8DShKZDZbeN9I7qI=
+google.golang.org/api v0.153.0/go.mod h1:3qNJX5eOmhiWYc67jRA/3GsDw97UFb5ivv7Y2PrriAY=
+google.golang.org/api v0.155.0 h1:vBmGhCYs0djJttDNynWo44zosHlPvHmA0XiN2zP2DtA=
+google.golang.org/api v0.155.0/go.mod h1:GI5qK5f40kCpHfPn6+YzGAByIKWv8ujFnmoWm7Igduk=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -3813,8 +3949,9 @@ google.golang.org/appengine v1.6.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
+google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
 google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
@@ -3824,8 +3961,6 @@ google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRn
 google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s=
-google.golang.org/genproto v0.0.0-20190626174449-989357319d63/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s=
-google.golang.org/genproto v0.0.0-20190708153700-3bdd9d9f5532/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s=
 google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
@@ -3851,11 +3986,9 @@ google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEY
 google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
 google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200806141610-86f49bd18e98/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200911024640-645f7a48b24f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
@@ -3875,6 +4008,7 @@ google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxH
 google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
 google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
 google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
+google.golang.org/genproto v0.0.0-20210630183607-d20f26d13c79/go.mod h1:yiaVoXHpRzHGyxV3o4DktVWY4mSUErTKaeEOq6C3t3U=
 google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
 google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
 google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
@@ -3896,7 +4030,6 @@ google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ6
 google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20211223182754-3ac035c7e7cb/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20220111164026-67b88f271998/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
@@ -3967,13 +4100,79 @@ google.golang.org/genproto v0.0.0-20230209215440-0dfe4f8abfcc/go.mod h1:RGgjbofJ
 google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44/go.mod h1:8B0gmkoRebU8ukX6HP+4wrVQUY1+6PkQ44BSyIlflHA=
 google.golang.org/genproto v0.0.0-20230222225845-10f96fb3dbec/go.mod h1:3Dl5ZL0q0isWJt+FVcfpQyirqemEuLAK/iFvg1UP1Hw=
 google.golang.org/genproto v0.0.0-20230223222841-637eb2293923/go.mod h1:3Dl5ZL0q0isWJt+FVcfpQyirqemEuLAK/iFvg1UP1Hw=
+google.golang.org/genproto v0.0.0-20230303212802-e74f57abe488/go.mod h1:TvhZT5f700eVlTNwND1xoEZQeWTB2RY/65kplwl/bFA=
 google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s=
-google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 h1:SeZZZx0cP0fqUyA+oRzP9k7cSwJlvDFiROO72uwD6i0=
+google.golang.org/genproto v0.0.0-20230320184635-7606e756e683/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s=
+google.golang.org/genproto v0.0.0-20230323212658-478b75c54725/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak=
+google.golang.org/genproto v0.0.0-20230330154414-c0448cd141ea/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak=
+google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak=
+google.golang.org/genproto v0.0.0-20230403163135-c38d8f061ccd/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak=
+google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
+google.golang.org/genproto v0.0.0-20230525234025-438c736192d0/go.mod h1:9ExIQyXL5hZrHzQceCwuSYwZZ5QZBazOcprJ5rgs3lY=
+google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54/go.mod h1:zqTuNwFlFRsw5zIts5VnzLQxSRqh+CGOTVMlYbY0Eyk=
+google.golang.org/genproto v0.0.0-20230526203410-71b5a4ffd15e/go.mod h1:zqTuNwFlFRsw5zIts5VnzLQxSRqh+CGOTVMlYbY0Eyk=
+google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:xZnkP7mREFX5MORlOPEzLMr+90PPZQ2QWzrVTWfAq64=
+google.golang.org/genproto v0.0.0-20230629202037-9506855d4529/go.mod h1:xZnkP7mREFX5MORlOPEzLMr+90PPZQ2QWzrVTWfAq64=
+google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:O9kGHb51iE/nOGvQaDUuadVYqovW56s5emA88lQnj6Y=
+google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98/go.mod h1:S7mY02OqCJTD0E1OiQy1F72PWFB4bZJ87cAtLPYgDR0=
+google.golang.org/genproto v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:0ggbjUrZYpy1q+ANUS30SEoGZ53cdfwtbuG7Ptgy108=
+google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5/go.mod h1:oH/ZOT02u4kWEp7oYBGYFFkCdKS/uYR9Z7+0/xuuFp8=
+google.golang.org/genproto v0.0.0-20230821184602-ccc8af3d0e93/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4=
+google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4=
+google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4=
+google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:CCviP9RmpZ1mxVr8MUjCnSiY09IbAXZxhLE6EhHIdPU=
 google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97/go.mod h1:t1VqOqqvce95G3hIDCT5FeO3YUc6Q4Oe24L/+rNMxRk=
-google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 h1:W18sezcAYs+3tDZX4F80yctqa12jcP1PUS2gQu1zTPU=
+google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:EMfReVxb80Dq1hhioy0sOsY9jCE46YDgHlJ7fWVUWRE=
+google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:CgAqfJo+Xmu0GwA0411Ht3OU3OntXwsGmrmjI8ioGXI=
+google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405/go.mod h1:3WDQMjmJk36UQhjQ89emUzb1mdaHcPeeAh4SCBKznB4=
+google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:J7XzRzVy1+IPwWHZUzoD0IccYZIrXILAQpc+Qy9CMhY=
+google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f/go.mod h1:nWSwAFPb+qfNJXsoeO3Io7zf4tMSfN8EA8RlDA04GhY=
+google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ=
+google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro=
+google.golang.org/genproto/googleapis/api v0.0.0-20230525234020-1aefcd67740a/go.mod h1:ts19tUU+Z0ZShN1y3aPyq2+O3d5FUNNgT6FtOzmrNn8=
+google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig=
+google.golang.org/genproto/googleapis/api v0.0.0-20230526203410-71b5a4ffd15e/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig=
+google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig=
+google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig=
+google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:mPBs5jNgx2GuQGvFwUvVKqtn6HsUw9nP64BedgvqEsQ=
+google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ=
+google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ=
+google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5/go.mod h1:5DZzOUPCLYL3mNkQ0ms0F3EuUNZ7py1Bqeq6sxzI7/Q=
+google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk=
+google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk=
+google.golang.org/genproto/googleapis/api v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:RdyHbowztCGQySiCvQPgWQWgWhGnouTdCflKoDBt32U=
 google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97/go.mod h1:iargEX0SFPm3xcfMI0d1domjg0ZF4Aa0p2awqyxhvF0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a h1:a2MQQVoTo96JC9PMGtGBymLp7+/RzpFc2yX/9WfFg1c=
+google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:SUBoKXbI1Efip18FClrQVGjWcyd0QZd8KkvdP34t7ww=
+google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:IBQ646DjkDkvUIsVq/cc03FUFQ9wbZu7yE396YcL870=
+google.golang.org/genproto/googleapis/api v0.0.0-20231030173426-d783a09b4405/go.mod h1:oT32Z4o8Zv2xPQTg0pbVaPr0MPOH6f14RgXt7zfIpwg=
+google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4=
+google.golang.org/genproto/googleapis/api v0.0.0-20231127180814-3a041ad873d4/go.mod h1:k2dtGpRrbsSyKcNPKKI5sstZkrNCZwpU/ns96JoHbGg=
+google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 h1:Lj5rbfG876hIAYFjqiJnPHfhXbv+nzTWfm04Fg/XSVU=
+google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA=
+google.golang.org/genproto/googleapis/bytestream v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:ylj+BE99M198VPbBh6A8d9n3w8fChvyLK3wwBOjXBFA=
+google.golang.org/genproto/googleapis/bytestream v0.0.0-20230807174057-1744710a1577/go.mod h1:NjCQG/D8JandXxM57PZbAJL1DCNL6EypA0vPPwfsc7c=
+google.golang.org/genproto/googleapis/bytestream v0.0.0-20231030173426-d783a09b4405/go.mod h1:GRUCuLdzVqZte8+Dl/D4N25yLzcGqqWaYkeVOwulFqw=
+google.golang.org/genproto/googleapis/bytestream v0.0.0-20231120223509-83a465c0220f/go.mod h1:iIgEblxoG4klcXsG0d9cpoxJ4xndv6+1FkDROCHhPRI=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234015-3fc162c6f38a/go.mod h1:xURIpW9ES5+/GZhnV6beoEtxQrnkRGIfP5VQG2tCBLc=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230629202037-9506855d4529/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:8mL13HKkDa+IuJ8yruA3ci0q+0vsUz4m//+ottjwS5o=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5/go.mod h1:zBEcrKX2ZOcEkHWxBPAIvYUWOKKMIhYcmNiUIu2ji3I=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230920183334-c177e329c48b/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:KSqppvjFjtoCI+KGd4PELB0qLNxdJHRGqRI09mB6pQA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97/go.mod h1:v7nGkzlmW8P3n/bKmWBn2WpBjpOEx8Q6gMueudAmKfY=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:4cYg8o5yUbm77w8ZX00LhMVNl/YVBFJRYWDc0uYWMs0=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:swOH3j0KzcDDgGUWr+SNpyTen5YrXjS3eyPzFYKc6lc=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405/go.mod h1:67X1fPuzjcrkymZzZV1vvkFeTn2Rvc6lYF9MYFGCcwE=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s=
 google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
@@ -3983,7 +4182,6 @@ google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLD
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
-google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
@@ -4022,12 +4220,20 @@ google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCD
 google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
 google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww=
 google.golang.org/grpc v1.52.0/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY=
+google.golang.org/grpc v1.52.3/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY=
 google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw=
-google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ=
+google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g=
+google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8=
+google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
+google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
+google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo=
+google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
 google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
+google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
+google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
+google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v0.0.0-20200910201057-6591123024b3/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
-google.golang.org/grpc/examples v0.0.0-20210304020650-930c79186c99/go.mod h1:Ly7ZA/ARzg8fnPU9TyZIxoz33sEUuWX7txiqs8lPTgE=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -4043,12 +4249,12 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.29.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
 google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-gopkg.in/DataDog/dd-trace-go.v1 v1.27.0/go.mod h1:Sp1lku8WJMvNV0kjDI4Ni/T7J/U3BO5ct5kEaoVU8+I=
-gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
+google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
@@ -4064,38 +4270,20 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy
 gopkg.in/fsnotify/fsnotify.v1 v1.4.7 h1:XNNYLJHt73EyYiCZi6+xjupS9CpvmiDgjPTAjrBlQbo=
 gopkg.in/fsnotify/fsnotify.v1 v1.4.7/go.mod h1:Fyux9zXlo4rWoMSIzpn9fDAYjalPqJ/K1qJ27s+7ltE=
 gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
-gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
-gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
-gopkg.in/go-playground/mold.v2 v2.2.0/go.mod h1:XMyyRsGtakkDPbxXbrA5VODo6bUXyvoDjLd5l3T0XoA=
-gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
-gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw=
-gopkg.in/gorp.v1 v1.7.2/go.mod h1:Wo3h+DBQZIxATwftsglhdD/62zRFPhGhTiu5jUJmCaw=
 gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/ini.v1 v1.55.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/mail.v2 v2.0.0-20180731213649-a0242b2233b4/go.mod h1:htwXN1Qh09vZJ1NVKxQqHPBaCBbzKhp5GzuJEA4VJWw=
 gopkg.in/mail.v2 v2.3.1 h1:WYFn/oANrAGP2C0dcV6/pbkPzv8yGzqTjPmTeO7qoXk=
 gopkg.in/mail.v2 v2.3.1/go.mod h1:htwXN1Qh09vZJ1NVKxQqHPBaCBbzKhp5GzuJEA4VJWw=
-gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
-gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
-gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
+gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
+gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
-gopkg.in/square/go-jose.v2 v2.1.9/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
-gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
-gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI=
-gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
-gopkg.in/telebot.v3 v3.1.3/go.mod h1:GJKwwWqp9nSkIVN51eRKU78aB5f5OnQuWdwiIZfPbko=
+gopkg.in/telebot.v3 v3.2.1/go.mod h1:GJKwwWqp9nSkIVN51eRKU78aB5f5OnQuWdwiIZfPbko=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/validator.v2 v2.0.0-20180514200540-135c24b11c19/go.mod h1:o4V0GXN9/CAmCsvJ0oXYZvrZOe7syiDZSN1GWGZTGzc=
-gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -4103,12 +4291,10 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -4130,56 +4316,64 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las=
-howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0=
-k8s.io/api v0.26.2/go.mod h1:1kjMQsFE+QHPfskEcVNgL3+Hp88B80uj0QtSOlj8itU=
-k8s.io/api v0.27.1 h1:Z6zUGQ1Vd10tJ+gHcNNNgkV5emCyW+v2XTmn+CLjSd0=
-k8s.io/api v0.27.1/go.mod h1:z5g/BpAiD+f6AArpqNjkY+cji8ueZDU/WV1jcj5Jk4E=
-k8s.io/apimachinery v0.26.2/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I=
-k8s.io/apimachinery v0.27.1 h1:EGuZiLI95UQQcClhanryclaQE6xjg1Bts6/L3cD7zyc=
-k8s.io/apimachinery v0.27.1/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM=
-k8s.io/apiserver v0.27.1 h1:phY+BtXjjzd+ta3a4kYbomC81azQSLa1K8jo9RBw7Lg=
-k8s.io/apiserver v0.27.1/go.mod h1:UGrOjLY2KsieA9Fw6lLiTObxTb8Z1xEba4uqSuMY0WU=
-k8s.io/client-go v0.26.2/go.mod h1:u5EjOuSyBa09yqqyY7m3abZeovO/7D/WehVVlZ2qcqU=
-k8s.io/client-go v0.27.1 h1:oXsfhW/qncM1wDmWBIuDzRHNS2tLhK3BZv512Nc59W8=
-k8s.io/client-go v0.27.1/go.mod h1:f8LHMUkVb3b9N8bWturc+EDtVVVwZ7ueTVquFAJb2vA=
-k8s.io/component-base v0.27.1 h1:kEB8p8lzi4gCs5f2SPU242vOumHJ6EOsOnDM3tTuDTM=
-k8s.io/component-base v0.27.1/go.mod h1:UGEd8+gxE4YWoigz5/lb3af3Q24w98pDseXcXZjw+E0=
+k8s.io/api v0.28.4/go.mod h1:axWTGrY88s/5YE+JSt4uUi6NMM+gur1en2REMR7IRj0=
+k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A=
+k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0=
+k8s.io/apimachinery v0.28.4/go.mod h1:wI37ncBvfAoswfq626yPTe6Bz1c22L7uaJ8dho83mgg=
+k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8=
+k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU=
+k8s.io/apiserver v0.29.2 h1:+Z9S0dSNr+CjnVXQePG8TcBWHr3Q7BmAr7NraHvsMiQ=
+k8s.io/apiserver v0.29.2/go.mod h1:B0LieKVoyU7ykQvPFm7XSdIHaCHSzCzQWPFa5bqbeMQ=
+k8s.io/client-go v0.28.4/go.mod h1:0VDZFpgoZfelyP5Wqu0/r/TRYcLYuJ2U1KEeoaPa1N4=
+k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg=
+k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA=
+k8s.io/code-generator v0.29.1 h1:8ba8BdtSmAVHgAMpzThb/fuyQeTRtN7NtN7VjMcDLew=
+k8s.io/code-generator v0.29.1/go.mod h1:FwFi3C9jCrmbPjekhaCYcYG1n07CYiW1+PAPCockaos=
+k8s.io/component-base v0.29.2 h1:lpiLyuvPA9yV1aQwGLENYyK7n/8t6l3nn3zAtFTJYe8=
+k8s.io/component-base v0.29.2/go.mod h1:BfB3SLrefbZXiBfbM+2H1dlat21Uewg/5qtKOl8degM=
 k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
-k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/kms v0.27.1 h1:JTSQbJb+mcobScQwF0bOmZhIwP17k8GvBsiLlA6SQqw=
-k8s.io/kms v0.27.1/go.mod h1:VuTsw0uHlSycKLCkypCGxfFCjLfzf/5YMeATECd/zJA=
-k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
-k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
+k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
+k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
+k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
+k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
+k8s.io/kms v0.29.2 h1:MDsbp98gSlEQs7K7dqLKNNTwKFQRYYvO4UOlBOjNy6Y=
+k8s.io/kms v0.29.2/go.mod h1:s/9RC4sYRZ/6Tn6yhNjbfJuZdb8LzlXhdlBnKizeFDo=
+k8s.io/kube-aggregator v0.29.0 h1:N4fmtePxOZ+bwiK1RhVEztOU+gkoVkvterHgpwAuiTw=
+k8s.io/kube-aggregator v0.29.0/go.mod h1:bjatII63ORkFg5yUFP2qm2OC49R0wwxZhRVIyJ4Z4X0=
+k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM=
+k8s.io/kube-openapi v0.0.0-20240220201932-37d671a357a5 h1:QSpdNrZ9uRlV0VkqLvVO0Rqg8ioKi3oSw7O5P7pJV8M=
+k8s.io/kube-openapi v0.0.0-20240220201932-37d671a357a5/go.mod h1:Pa1PvrP7ACSkuX6I7KYomY6cmMA0Tx86waBhDUgoKPw=
 k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
-k8s.io/utils v0.0.0-20221107191617-1a15be271d1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-k8s.io/utils v0.0.0-20230308161112-d77c459e9343/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
 k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/utils v0.0.0-20230711102312-30195339c3c7/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
+k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
-lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI=
 lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
-modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
+lukechampine.com/uint128 v1.3.0 h1:cDdUVfRwDUDovz610ABgFD17nXD4/uDgVHl2sC3+sbo=
+lukechampine.com/uint128 v1.3.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
 modernc.org/cc/v3 v3.36.0/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=
 modernc.org/cc/v3 v3.36.2/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=
 modernc.org/cc/v3 v3.36.3/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=
+modernc.org/cc/v3 v3.37.0/go.mod h1:vtL+3mdHx/wcj3iEGz84rQa8vEqR6XM84v5Lcvfph20=
 modernc.org/cc/v3 v3.40.0 h1:P3g79IUS/93SYhtoeaHW+kRCIrYaxJ27MFPv+7kaTOw=
 modernc.org/cc/v3 v3.40.0/go.mod h1:/bTg4dnWkSXowUO6ssQKnOV0yMVxDYNIsIrzqTFDGH0=
 modernc.org/ccgo/v3 v3.0.0-20220428102840-41399a37e894/go.mod h1:eI31LL8EwEBKPpNpA4bU1/i+sKOwOrQy8D87zWUcRZc=
 modernc.org/ccgo/v3 v3.0.0-20220430103911-bc99d88307be/go.mod h1:bwdAnOoaIt8Ax9YdWGjxWsdkPcZyRPHqrOvJxaKAKGw=
+modernc.org/ccgo/v3 v3.0.0-20220904174949-82d86e1b6d56/go.mod h1:YSXjPL62P2AMSxBphRHPn7IkzhVHqkvOnRKAKh+W6ZI=
 modernc.org/ccgo/v3 v3.16.4/go.mod h1:tGtX0gE9Jn7hdZFeU88slbTh1UtCYKusWOoCJuvkWsQ=
 modernc.org/ccgo/v3 v3.16.6/go.mod h1:tGtX0gE9Jn7hdZFeU88slbTh1UtCYKusWOoCJuvkWsQ=
 modernc.org/ccgo/v3 v3.16.8/go.mod h1:zNjwkizS+fIFDrDjIAgBSCLkWbJuHF+ar3QRn+Z9aws=
 modernc.org/ccgo/v3 v3.16.9/go.mod h1:zNMzC9A9xeNUepy6KuZBbugn3c0Mc9TeiJO4lgvkJDo=
+modernc.org/ccgo/v3 v3.16.13-0.20221017192402-261537637ce8/go.mod h1:fUB3Vn0nVPReA+7IG7yZDfjv1TMWjhQP8gCxrFAtL5g=
 modernc.org/ccgo/v3 v3.16.13 h1:Mkgdzl46i5F/CNR/Kj80Ri59hC8TKAhZrYSaqvkwzUw=
 modernc.org/ccgo/v3 v3.16.13/go.mod h1:2Quk+5YgpImhPjv2Qsob1DnZ/4som1lJTodubIcoUkY=
 modernc.org/ccorpus v1.11.6 h1:J16RXiiqiCgua6+ZvQot4yUuUy8zxgqbqEEUuGPlISk=
 modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
-modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
 modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM=
 modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
 modernc.org/libc v0.0.0-20220428101251-2d5f3daf273b/go.mod h1:p7Mg4+koNjc8jkqwcoFBJx7tXkpj00G77X7A72jXPXA=
@@ -4189,9 +4383,13 @@ modernc.org/libc v1.16.17/go.mod h1:hYIV5VZczAmGZAnG15Vdngn5HSF5cSkbvfz2B7GRuVU=
 modernc.org/libc v1.16.19/go.mod h1:p7Mg4+koNjc8jkqwcoFBJx7tXkpj00G77X7A72jXPXA=
 modernc.org/libc v1.17.0/go.mod h1:XsgLldpP4aWlPlsjqKRdHPqCxCjISdHfM/yeWC5GyW0=
 modernc.org/libc v1.17.1/go.mod h1:FZ23b+8LjxZs7XtFMbSzL/EhPxNbfZbErxEHc7cbD9s=
-modernc.org/libc v1.22.2 h1:4U7v51GyhlWqQmwCHj28Rdq2Yzwk55ovjFrdPjs8Hb0=
+modernc.org/libc v1.17.4/go.mod h1:WNg2ZH56rDEwdropAJeZPQkXmDwh+JCA1s/htl6r2fA=
+modernc.org/libc v1.18.0/go.mod h1:vj6zehR5bfc98ipowQOM2nIDUZnVew/wNC/2tOGS+q0=
+modernc.org/libc v1.20.3/go.mod h1:ZRfIaEkgrYgZDl6pa4W39HgN5G/yDW+NRmNKZBDFrk0=
+modernc.org/libc v1.21.4/go.mod h1:przBsL5RDOZajTVslkugzLBj1evTue36jEomFQOoYuI=
 modernc.org/libc v1.22.2/go.mod h1:uvQavJ1pZ0hIoC/jfqNoMLURIMhKzINIWypNM17puug=
-modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
+modernc.org/libc v1.22.4 h1:wymSbZb0AlrjdAVX3cjreCHTPCpPARbQXNz6BHPzdwQ=
+modernc.org/libc v1.22.4/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY=
 modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=
@@ -4199,38 +4397,44 @@ modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6
 modernc.org/memory v1.1.1/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw=
 modernc.org/memory v1.2.0/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw=
 modernc.org/memory v1.2.1/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
+modernc.org/memory v1.3.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
+modernc.org/memory v1.4.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
 modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds=
 modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
 modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
 modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
 modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
 modernc.org/sqlite v1.18.1/go.mod h1:6ho+Gow7oX5V+OiOQ6Tr4xeqbx13UZ6t+Fw9IRUG4d4=
-modernc.org/sqlite v1.20.4 h1:J8+m2trkN+KKoE7jglyHYYYiaq5xmz2HoHJIiBlRzbE=
-modernc.org/sqlite v1.20.4/go.mod h1:zKcGyrICaxNTMEHSr1HQ2GUraP0j+845GYw37+EyT6A=
-modernc.org/strutil v1.1.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
+modernc.org/sqlite v1.18.2/go.mod h1:kvrTLEWgxUcHa2GfHBQtanR1H9ht3hTJNtKpzH9k1u0=
+modernc.org/sqlite v1.21.2 h1:ixuUG0QS413Vfzyx6FWx6PYTmHaOegTY+hjzhn7L+a0=
+modernc.org/sqlite v1.21.2/go.mod h1:cxbLkB5WS32DnQqeH4h4o1B0eMr8W/y8/RGuxQ3JsC0=
 modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw=
 modernc.org/strutil v1.1.3 h1:fNMm+oJklMGYfU9Ylcywl0CO5O6nTfaowNsh2wpPjzY=
 modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw=
 modernc.org/tcl v1.13.1/go.mod h1:XOLfOwzhkljL4itZkK6T72ckMgvj0BDsnKNdZVUOecw=
-modernc.org/tcl v1.15.0 h1:oY+JeD11qVVSgVvodMJsu7Edf8tr5E/7tuhF5cNYz34=
+modernc.org/tcl v1.13.2/go.mod h1:7CLiGIPo1M8Rv1Mitpv5akc2+8fxUd2y2UzC/MfMzy0=
+modernc.org/tcl v1.15.1 h1:mOQwiEK4p7HruMZcwKTZPw/aqtGM4aY00uzWhlKKYws=
+modernc.org/tcl v1.15.1/go.mod h1:aEjeGJX2gz1oWKOLDVZ2tnEWLUrIn8H+GFu+akoDhqs=
 modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
+modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
 modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
-modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
 modernc.org/z v1.5.1/go.mod h1:eWFB510QWW5Th9YGZT81s+LwvaAs3Q2yr4sP0rmLkv8=
 modernc.org/z v1.7.0 h1:xkDw/KepgEjeizO2sNco+hqYkU12taxQFqPEmgm1GWE=
+modernc.org/z v1.7.0/go.mod h1:hVdgNMh8ggTuRG1rGU8x+xGRFfiQUIAw0ZqlPy8+HyQ=
 nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
-sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 h1:trsWhjU5jZrx6UvFu4WzQDrN7Pga4a7Qg+zcfcj64PA=
-sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2/go.mod h1:+qG7ISXqCDVVcyO8hLn12AKVYYUjM7ftlqsqmrhMZE0=
-sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
+sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2SGwkQasmbeqDo8th5wOBA5h/AjTKA4I=
+sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
+sigs.k8s.io/structured-merge-diff/v4 v4.3.0/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
 sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
@@ -4238,6 +4442,5 @@ sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
 sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
 xorm.io/builder v0.3.6 h1:ha28mQ2M+TFx96Hxo+iq6tQgnkC9IZkM6D8w9sKHHF8=
 xorm.io/builder v0.3.6/go.mod h1:LEFAPISnRzG+zxaxj2vPicRwz67BdhFreKg8yv8/TgU=
-xorm.io/core v0.7.2/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM=
 xorm.io/core v0.7.3 h1:W8ws1PlrnkS1CZU1YWaYLMQcQilwAmQXU0BJDJon+H0=
 xorm.io/core v0.7.3/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM=
diff --git a/go.work b/go.work
new file mode 100644
index 0000000000000..14bdbd225b2bc
--- /dev/null
+++ b/go.work
@@ -0,0 +1,14 @@
+go 1.21.10
+
+use (
+	.
+	./pkg/apimachinery
+	./pkg/apiserver
+	./pkg/build/wire
+	./pkg/promlib
+	./pkg/util/xorm
+)
+
+// when we release xorm we would like to release it like github.com/grafana/grafana/pkg/util/xorm
+// but we don't want to change all the imports. so we use replace to handle this situation
+replace xorm.io/xorm => ./pkg/util/xorm
diff --git a/go.work.sum b/go.work.sum
new file mode 100644
index 0000000000000..b8a0ad94a7734
--- /dev/null
+++ b/go.work.sum
@@ -0,0 +1,856 @@
+buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.31.0-20230802163732-1c33ebd9ecfa.1/go.mod h1:xafc+XIsTxTy76GJQ1TKgvJWsSugFBqMaN27WhUblew=
+buf.build/gen/go/grpc-ecosystem/grpc-gateway/bufbuild/connect-go v1.4.1-20221127060915-a1ecdc58eccd.1 h1:vp9EaPFSb75qe/793x58yE5fY1IJ/gdxb/kcDUzavtI=
+buf.build/gen/go/grpc-ecosystem/grpc-gateway/bufbuild/connect-go v1.4.1-20221127060915-a1ecdc58eccd.1/go.mod h1:YDq2B5X5BChU0lxAG5MxHpDb8mx1fv9OGtF2mwOe7hY=
+buf.build/gen/go/grpc-ecosystem/grpc-gateway/protocolbuffers/go v1.28.1-20221127060915-a1ecdc58eccd.4 h1:z3Xc9n8yZ5k/Xr4ZTuff76TAYP20dWy7ZBV4cGIpbkM=
+cloud.google.com/go/accessapproval v1.7.4 h1:ZvLvJ952zK8pFHINjpMBY5k7LTAp/6pBf50RDMRgBUI=
+cloud.google.com/go/accesscontextmanager v1.8.4 h1:Yo4g2XrBETBCqyWIibN3NHNPQKUfQqti0lI+70rubeE=
+cloud.google.com/go/aiplatform v1.57.0 h1:WcZ6wDf/1qBWatmGM9Z+2BTiNjQQX54k2BekHUj93DQ=
+cloud.google.com/go/aiplatform v1.58.0 h1:xyCAfpI4yUMOQ4VtHN/bdmxPQ8xoEkTwFM1nbVmuQhs=
+cloud.google.com/go/aiplatform v1.58.0/go.mod h1:pwZMGvqe0JRkI1GWSZCtnAfrR4K1bv65IHILGA//VEU=
+cloud.google.com/go/analytics v0.21.6 h1:fnV7B8lqyEYxCU0LKk+vUL7mTlqRAq4uFlIthIdr/iA=
+cloud.google.com/go/analytics v0.22.0 h1:w8KIgW8NRUHFVKjpkwCpLaHsr685tJ+ckPStOaSCZz0=
+cloud.google.com/go/analytics v0.22.0/go.mod h1:eiROFQKosh4hMaNhF85Oc9WO97Cpa7RggD40e/RBy8w=
+cloud.google.com/go/apigateway v1.6.4 h1:VVIxCtVerchHienSlaGzV6XJGtEM9828Erzyr3miUGs=
+cloud.google.com/go/apigeeconnect v1.6.4 h1:jSoGITWKgAj/ssVogNE9SdsTqcXnryPzsulENSRlusI=
+cloud.google.com/go/apigeeregistry v0.8.2 h1:DSaD1iiqvELag+lV4VnnqUUFd8GXELu01tKVdWZrviE=
+cloud.google.com/go/apikeys v0.6.0 h1:B9CdHFZTFjVti89tmyXXrO+7vSNo2jvZuHG8zD5trdQ=
+cloud.google.com/go/appengine v1.8.4 h1:Qub3fqR7iA1daJWdzjp/Q0Jz0fUG0JbMc7Ui4E9IX/E=
+cloud.google.com/go/area120 v0.8.4 h1:YnSO8m02pOIo6AEOgiOoUDVbw4pf+bg2KLHi4rky320=
+cloud.google.com/go/artifactregistry v1.14.6 h1:/hQaadYytMdA5zBh+RciIrXZQBWK4vN7EUsrQHG+/t8=
+cloud.google.com/go/asset v1.15.3 h1:uI8Bdm81s0esVWbWrTHcjFDFKNOa9aB7rI1vud1hO84=
+cloud.google.com/go/asset v1.17.0 h1:dLWfTnbwyrq/Kt8Tr2JiAbre1MEvS2Bl5cAMiYAy5Pg=
+cloud.google.com/go/asset v1.17.0/go.mod h1:yYLfUD4wL4X589A9tYrv4rFrba0QlDeag0CMcM5ggXU=
+cloud.google.com/go/assuredworkloads v1.11.4 h1:FsLSkmYYeNuzDm8L4YPfLWV+lQaUrJmH5OuD37t1k20=
+cloud.google.com/go/automl v1.13.4 h1:i9tOKXX+1gE7+rHpWKjiuPfGBVIYoWvLNIGpWgPtF58=
+cloud.google.com/go/baremetalsolution v1.2.3 h1:oQiFYYCe0vwp7J8ZmF6siVKEumWtiPFJMJcGuyDVRUk=
+cloud.google.com/go/batch v1.7.0 h1:AxuSPoL2fWn/rUyvWeNCNd0V2WCr+iHRCU9QO1PUmpY=
+cloud.google.com/go/batch v1.7.0/go.mod h1:J64gD4vsNSA2O5TtDB5AAux3nJ9iV8U3ilg3JDBYejU=
+cloud.google.com/go/beyondcorp v1.0.3 h1:VXf9SnrnSmj2BF2cHkoTHvOUp8gjsz1KJFOMW7czdsY=
+cloud.google.com/go/bigquery v1.57.1 h1:FiULdbbzUxWD0Y4ZGPSVCDLvqRSyCIO6zKV7E2nf5uA=
+cloud.google.com/go/bigquery v1.58.0 h1:drSd9RcPVLJP2iFMimvOB9SCSIrcl+9HD4II03Oy7A0=
+cloud.google.com/go/bigquery v1.58.0/go.mod h1:0eh4mWNY0KrBTjUzLjoYImapGORq9gEPT7MWjCy9lik=
+cloud.google.com/go/billing v1.18.0 h1:GvKy4xLy1zF1XPbwP5NJb2HjRxhnhxjjXxvyZ1S/IAo=
+cloud.google.com/go/billing v1.18.0/go.mod h1:5DOYQStCxquGprqfuid/7haD7th74kyMBHkjO/OvDtk=
+cloud.google.com/go/binaryauthorization v1.8.0 h1:PHS89lcFayWIEe0/s2jTBiEOtqghCxzc7y7bRNlifBs=
+cloud.google.com/go/binaryauthorization v1.8.0/go.mod h1:VQ/nUGRKhrStlGr+8GMS8f6/vznYLkdK5vaKfdCIpvU=
+cloud.google.com/go/certificatemanager v1.7.4 h1:5YMQ3Q+dqGpwUZ9X5sipsOQ1fLPsxod9HNq0+nrqc6I=
+cloud.google.com/go/channel v1.17.3 h1:Rd4+fBrjiN6tZ4TR8R/38elkyEkz6oogGDr7jDyjmMY=
+cloud.google.com/go/channel v1.17.4 h1:yYHOORIM+wkBy3EdwArg/WL7Lg+SoGzlKH9o3Bw2/jE=
+cloud.google.com/go/channel v1.17.4/go.mod h1:QcEBuZLGGrUMm7kNj9IbU1ZfmJq2apotsV83hbxX7eE=
+cloud.google.com/go/cloudbuild v1.15.0 h1:9IHfEMWdCklJ1cwouoiQrnxmP0q3pH7JUt8Hqx4Qbck=
+cloud.google.com/go/clouddms v1.7.3 h1:xe/wJKz55VO1+L891a1EG9lVUgfHr9Ju/I3xh1nwF84=
+cloud.google.com/go/cloudtasks v1.12.4 h1:5xXuFfAjg0Z5Wb81j2GAbB3e0bwroCeSF+5jBn/L650=
+cloud.google.com/go/contactcenterinsights v1.12.1 h1:EiGBeejtDDtr3JXt9W7xlhXyZ+REB5k2tBgVPVtmNb0=
+cloud.google.com/go/contactcenterinsights v1.12.1/go.mod h1:HHX5wrz5LHVAwfI2smIotQG9x8Qd6gYilaHcLLLmNis=
+cloud.google.com/go/container v1.29.0 h1:jIltU529R2zBFvP8rhiG1mgeTcnT27KhU0H/1d6SQRg=
+cloud.google.com/go/container v1.29.0/go.mod h1:b1A1gJeTBXVLQ6GGw9/9M4FG94BEGsqJ5+t4d/3N7O4=
+cloud.google.com/go/containeranalysis v0.11.3 h1:5rhYLX+3a01drpREqBZVXR9YmWH45RnML++8NsCtuD8=
+cloud.google.com/go/datacatalog v1.19.0 h1:rbYNmHwvAOOwnW2FPXYkaK3Mf1MmGqRzK0mMiIEyLdo=
+cloud.google.com/go/datacatalog v1.19.2 h1:BV5sB7fPc8ccv/obwtHwQtCdLMAgI4KyaQWfkh8/mWg=
+cloud.google.com/go/datacatalog v1.19.2/go.mod h1:2YbODwmhpLM4lOFe3PuEhHK9EyTzQJ5AXgIy7EDKTEE=
+cloud.google.com/go/dataflow v0.9.4 h1:7VmCNWcPJBS/srN2QnStTB6nu4Eb5TMcpkmtaPVhRt4=
+cloud.google.com/go/dataform v0.9.1 h1:jV+EsDamGX6cE127+QAcCR/lergVeeZdEQ6DdrxW3sQ=
+cloud.google.com/go/datafusion v1.7.4 h1:Q90alBEYlMi66zL5gMSGQHfbZLB55mOAg03DhwTTfsk=
+cloud.google.com/go/datalabeling v0.8.4 h1:zrq4uMmunf2KFDl/7dS6iCDBBAxBnKVDyw6+ajz3yu0=
+cloud.google.com/go/dataplex v1.13.0 h1:ACVOuxwe7gP0SqEso9SLyXbcZNk5l8hjcTX+XLntI5s=
+cloud.google.com/go/dataplex v1.14.0 h1:/WhVTR4v/L6ACKjlz/9CqkxkrVh2z7C44CLMUf0f60A=
+cloud.google.com/go/dataplex v1.14.0/go.mod h1:mHJYQQ2VEJHsyoC0OdNyy988DvEbPhqFs5OOLffLX0c=
+cloud.google.com/go/dataproc v1.12.0 h1:W47qHL3W4BPkAIbk4SWmIERwsWBaNnWm0P2sdx3YgGU=
+cloud.google.com/go/dataproc/v2 v2.3.0 h1:tTVP9tTxmc8fixxOd/8s6Q6Pz/+yzn7r7XdZHretQH0=
+cloud.google.com/go/dataqna v0.8.4 h1:NJnu1kAPamZDs/if3bJ3+Wb6tjADHKL83NUWsaIp2zg=
+cloud.google.com/go/datastore v1.15.0 h1:0P9WcsQeTWjuD1H14JIY7XQscIPQ4Laje8ti96IC5vg=
+cloud.google.com/go/datastream v1.10.3 h1:Z2sKPIB7bT2kMW5Uhxy44ZgdJzxzE5uKjavoW+EuHEE=
+cloud.google.com/go/deploy v1.16.0 h1:5OVjzm8MPC5kP+Ywbs0mdE0O7AXvAUXksSyHAyMFyMg=
+cloud.google.com/go/deploy v1.17.0 h1:P3SgJ+4rAktC2XqaI10G0ip/vzWluNBrC5VG0abMbLw=
+cloud.google.com/go/deploy v1.17.0/go.mod h1:XBr42U5jIr64t92gcpOXxNrqL2PStQCXHuKK5GRUuYo=
+cloud.google.com/go/dialogflow v1.47.0 h1:tLCWad8HZhlyUNfDzDP5m+oH6h/1Uvw/ei7B9AnsWMk=
+cloud.google.com/go/dialogflow v1.48.1 h1:1Uq2jDJzjJ3M4xYB608FCCFHfW3JmrTmHIxRSd7JGmY=
+cloud.google.com/go/dialogflow v1.48.1/go.mod h1:C1sjs2/g9cEwjCltkKeYp3FFpz8BOzNondEaAlCpt+A=
+cloud.google.com/go/dlp v1.11.1 h1:OFlXedmPP/5//X1hBEeq3D9kUVm9fb6ywYANlpv/EsQ=
+cloud.google.com/go/documentai v1.23.6 h1:0/S3AhS23+0qaFe3tkgMmS3STxgDgmE1jg4TvaDOZ9g=
+cloud.google.com/go/documentai v1.23.7 h1:hlYieOXUwiJ7HpBR/vEPfr8nfSxveLVzbqbUkSK0c/4=
+cloud.google.com/go/documentai v1.23.7/go.mod h1:ghzBsyVTiVdkfKaUCum/9bGBEyBjDO4GfooEcYKhN+g=
+cloud.google.com/go/domains v0.9.4 h1:ua4GvsDztZ5F3xqjeLKVRDeOvJshf5QFgWGg1CKti3A=
+cloud.google.com/go/edgecontainer v1.1.4 h1:Szy3Q/N6bqgQGyxqjI+6xJZbmvPvnFHp3UZr95DKcQ0=
+cloud.google.com/go/errorreporting v0.3.0 h1:kj1XEWMu8P0qlLhm3FwcaFsUvXChV/OraZwA70trRR0=
+cloud.google.com/go/essentialcontacts v1.6.5 h1:S2if6wkjR4JCEAfDtIiYtD+sTz/oXjh2NUG4cgT1y/Q=
+cloud.google.com/go/eventarc v1.13.3 h1:+pFmO4eu4dOVipSaFBLkmqrRYG94Xl/TQZFOeohkuqU=
+cloud.google.com/go/filestore v1.8.0 h1:/+wUEGwk3x3Kxomi2cP5dsR8+SIXxo7M0THDjreFSYo=
+cloud.google.com/go/firestore v1.14.0 h1:8aLcKnMPoldYU3YHgu4t2exrKhLQkqaXAGqT0ljrFVw=
+cloud.google.com/go/functions v1.15.4 h1:ZjdiV3MyumRM6++1Ixu6N0VV9LAGlCX4AhW6Yjr1t+U=
+cloud.google.com/go/gaming v1.10.1 h1:5qZmZEWzMf8GEFgm9NeC3bjFRpt7x4S6U7oLbxaf7N8=
+cloud.google.com/go/gkebackup v1.3.4 h1:KhnOrr9A1tXYIYeXKqCKbCI8TL2ZNGiD3dm+d7BDUBg=
+cloud.google.com/go/gkeconnect v0.8.4 h1:1JLpZl31YhQDQeJ98tK6QiwTpgHFYRJwpntggpQQWis=
+cloud.google.com/go/gkehub v0.14.4 h1:J5tYUtb3r0cl2mM7+YHvV32eL+uZQ7lONyUZnPikCEo=
+cloud.google.com/go/gkemulticloud v1.0.3 h1:NmJsNX9uQ2CT78957xnjXZb26TDIMvv+d5W2vVUt0Pg=
+cloud.google.com/go/gkemulticloud v1.1.0 h1:C2Suwn3uPz+Yy0bxVjTlsMrUCaDovkgvfdyIa+EnUOU=
+cloud.google.com/go/gkemulticloud v1.1.0/go.mod h1:7NpJBN94U6DY1xHIbsDqB2+TFZUfjLUKLjUX8NGLor0=
+cloud.google.com/go/grafeas v0.3.0 h1:oyTL/KjiUeBs9eYLw/40cpSZglUC+0F7X4iu/8t7NWs=
+cloud.google.com/go/gsuiteaddons v1.6.4 h1:uuw2Xd37yHftViSI8J2hUcCS8S7SH3ZWH09sUDLW30Q=
+cloud.google.com/go/iap v1.9.3 h1:M4vDbQ4TLXdaljXVZSwW7XtxpwXUUarY2lIs66m0aCM=
+cloud.google.com/go/ids v1.4.4 h1:VuFqv2ctf/A7AyKlNxVvlHTzjrEvumWaZflUzBPz/M4=
+cloud.google.com/go/iot v1.7.4 h1:m1WljtkZnvLTIRYW1YTOv5A6H1yKgLHR6nU7O8yf27w=
+cloud.google.com/go/language v1.12.2 h1:zg9uq2yS9PGIOdc0Kz/l+zMtOlxKWonZjjo5w5YPG2A=
+cloud.google.com/go/lifesciences v0.9.4 h1:rZEI/UxcxVKEzyoRS/kdJ1VoolNItRWjNN0Uk9tfexg=
+cloud.google.com/go/logging v1.8.1 h1:26skQWPeYhvIasWKm48+Eq7oUqdcdbwsCVwz5Ys0FvU=
+cloud.google.com/go/logging v1.9.0 h1:iEIOXFO9EmSiTjDmfpbRjOxECO7R8C7b8IXUGOj7xZw=
+cloud.google.com/go/logging v1.9.0/go.mod h1:1Io0vnZv4onoUnsVUQY3HZ3Igb1nBchky0A0y7BBBhE=
+cloud.google.com/go/longrunning v0.5.4 h1:w8xEcbZodnA2BbW6sVirkkoC+1gP8wS57EUUgGS0GVg=
+cloud.google.com/go/managedidentities v1.6.4 h1:SF/u1IJduMqQQdJA4MDyivlIQ4SrV5qAawkr/ZEREkY=
+cloud.google.com/go/maps v1.6.2 h1:WxxLo//b60nNFESefLgaBQevu8QGUmRV3+noOjCfIHs=
+cloud.google.com/go/maps v1.6.3 h1:Qqs6Dza+PRp5CZO5AfgPnLwU1k3pp0IMFRDtLpT+aCA=
+cloud.google.com/go/maps v1.6.3/go.mod h1:VGAn809ADswi1ASofL5lveOHPnE6Rk/SFTTBx1yuOLw=
+cloud.google.com/go/mediatranslation v0.8.4 h1:VRCQfZB4s6jN0CSy7+cO3m4ewNwgVnaePanVCQh/9Z4=
+cloud.google.com/go/memcache v1.10.4 h1:cdex/ayDd294XBj2cGeMe6Y+H1JvhN8y78B9UW7pxuQ=
+cloud.google.com/go/metastore v1.13.3 h1:94l/Yxg9oBZjin2bzI79oK05feYefieDq0o5fjLSkC8=
+cloud.google.com/go/monitoring v1.16.3 h1:mf2SN9qSoBtIgiMA4R/y4VADPWZA7VCNJA079qLaZQ8=
+cloud.google.com/go/monitoring v1.17.0 h1:blrdvF0MkPPivSO041ihul7rFMhXdVp8Uq7F59DKXTU=
+cloud.google.com/go/monitoring v1.17.0/go.mod h1:KwSsX5+8PnXv5NJnICZzW2R8pWTis8ypC4zmdRD63Tw=
+cloud.google.com/go/networkconnectivity v1.14.3 h1:e9lUkCe2BexsqsUc2bjV8+gFBpQa54J+/F3qKVtW+wA=
+cloud.google.com/go/networkmanagement v1.9.3 h1:HsQk4FNKJUX04k3OI6gUsoveiHMGvDRqlaFM2xGyvqU=
+cloud.google.com/go/networksecurity v0.9.4 h1:947tNIPnj1bMGTIEBo3fc4QrrFKS5hh0bFVsHmFm4Vo=
+cloud.google.com/go/notebooks v1.11.2 h1:eTOTfNL1yM6L/PCtquJwjWg7ZZGR0URFaFgbs8kllbM=
+cloud.google.com/go/optimization v1.6.2 h1:iFsoexcp13cGT3k/Hv8PA5aK+FP7FnbhwDO9llnruas=
+cloud.google.com/go/orchestration v1.8.4 h1:kgwZ2f6qMMYIVBtUGGoU8yjYWwMTHDanLwM/CQCFaoQ=
+cloud.google.com/go/orgpolicy v1.11.4 h1:RWuXQDr9GDYhjmrredQJC7aY7cbyqP9ZuLbq5GJGves=
+cloud.google.com/go/orgpolicy v1.12.0 h1:sab7cDiyfdthpAL0JkSpyw1C3mNqkXToVOhalm79PJQ=
+cloud.google.com/go/orgpolicy v1.12.0/go.mod h1:0+aNV/nrfoTQ4Mytv+Aw+stBDBjNf4d8fYRA9herfJI=
+cloud.google.com/go/osconfig v1.12.4 h1:OrRCIYEAbrbXdhm13/JINn9pQchvTTIzgmOCA7uJw8I=
+cloud.google.com/go/oslogin v1.12.2 h1:NP/KgsD9+0r9hmHC5wKye0vJXVwdciv219DtYKYjgqE=
+cloud.google.com/go/oslogin v1.13.0 h1:gbA/G4p+youIR4O/Rk6DU181QlBlpwPS16kvJwqEz8o=
+cloud.google.com/go/oslogin v1.13.0/go.mod h1:xPJqLwpTZ90LSE5IL1/svko+6c5avZLluiyylMb/sRA=
+cloud.google.com/go/phishingprotection v0.8.4 h1:sPLUQkHq6b4AL0czSJZ0jd6vL55GSTHz2B3Md+TCZI0=
+cloud.google.com/go/policytroubleshooter v1.10.2 h1:sq+ScLP83d7GJy9+wpwYJVnY+q6xNTXwOdRIuYjvHT4=
+cloud.google.com/go/privatecatalog v0.9.4 h1:Vo10IpWKbNvc/z/QZPVXgCiwfjpWoZ/wbgful4Uh/4E=
+cloud.google.com/go/pubsub v1.33.0 h1:6SPCPvWav64tj0sVX/+npCBKhUi/UjJehy9op/V3p2g=
+cloud.google.com/go/pubsub v1.34.0 h1:ZtPbfwfi5rLaPeSvDC29fFoE20/tQvGrUS6kVJZJvkU=
+cloud.google.com/go/pubsub v1.34.0/go.mod h1:alj4l4rBg+N3YTFDDC+/YyFTs6JAjam2QfYsddcAW4c=
+cloud.google.com/go/pubsublite v1.8.1 h1:pX+idpWMIH30/K7c0epN6V703xpIcMXWRjKJsz0tYGY=
+cloud.google.com/go/recaptchaenterprise v1.3.1 h1:u6EznTGzIdsyOsvm+Xkw0aSuKFXQlyjGE9a4exk6iNQ=
+cloud.google.com/go/recaptchaenterprise/v2 v2.9.0 h1:Zrd4LvT9PaW91X/Z13H0i5RKEv9suCLuk8zp+bfOpN4=
+cloud.google.com/go/recaptchaenterprise/v2 v2.9.0/go.mod h1:Dak54rw6lC2gBY8FBznpOCAR58wKf+R+ZSJRoeJok4w=
+cloud.google.com/go/recommendationengine v0.8.4 h1:JRiwe4hvu3auuh2hujiTc2qNgPPfVp+Q8KOpsXlEzKQ=
+cloud.google.com/go/recommender v1.11.3 h1:VndmgyS/J3+izR8V8BHa7HV/uun8//ivQ3k5eVKKyyM=
+cloud.google.com/go/recommender v1.12.0 h1:tC+ljmCCbuZ/ybt43odTFlay91n/HLIhflvaOeb0Dh4=
+cloud.google.com/go/recommender v1.12.0/go.mod h1:+FJosKKJSId1MBFeJ/TTyoGQZiEelQQIZMKYYD8ruK4=
+cloud.google.com/go/redis v1.14.1 h1:J9cEHxG9YLmA9o4jTSvWt/RuVEn6MTrPlYSCRHujxDQ=
+cloud.google.com/go/resourcemanager v1.9.4 h1:JwZ7Ggle54XQ/FVYSBrMLOQIKoIT/uer8mmNvNLK51k=
+cloud.google.com/go/resourcesettings v1.6.4 h1:yTIL2CsZswmMfFyx2Ic77oLVzfBFoWBYgpkgiSPnC4Y=
+cloud.google.com/go/retail v1.14.4 h1:geqdX1FNqqL2p0ADXjPpw8lq986iv5GrVcieTYafuJQ=
+cloud.google.com/go/run v1.3.3 h1:qdfZteAm+vgzN1iXzILo3nJFQbzziudkJrvd9wCf3FQ=
+cloud.google.com/go/scheduler v1.10.5 h1:eMEettHlFhG5pXsoHouIM5nRT+k+zU4+GUvRtnxhuVI=
+cloud.google.com/go/secretmanager v1.11.4 h1:krnX9qpG2kR2fJ+u+uNyNo+ACVhplIAS4Pu7u+4gd+k=
+cloud.google.com/go/security v1.15.4 h1:sdnh4Islb1ljaNhpIXlIPgb3eYj70QWgPVDKOUYvzJc=
+cloud.google.com/go/securitycenter v1.24.3 h1:crdn2Z2rFIy8WffmmhdlX3CwZJusqCiShtnrGFRwpeE=
+cloud.google.com/go/securitycenter v1.24.3/go.mod h1:l1XejOngggzqwr4Fa2Cn+iWZGf+aBLTXtB/vXjy5vXM=
+cloud.google.com/go/servicecontrol v1.11.1 h1:d0uV7Qegtfaa7Z2ClDzr9HJmnbJW7jn0WhZ7wOX6hLE=
+cloud.google.com/go/servicedirectory v1.11.3 h1:5niCMfkw+jifmFtbBrtRedbXkJm3fubSR/KHbxSJZVM=
+cloud.google.com/go/servicemanagement v1.8.0 h1:fopAQI/IAzlxnVeiKn/8WiV6zKndjFkvi+gzu+NjywY=
+cloud.google.com/go/serviceusage v1.6.0 h1:rXyq+0+RSIm3HFypctp7WoXxIA563rn206CfMWdqXX4=
+cloud.google.com/go/shell v1.7.4 h1:nurhlJcSVFZneoRZgkBEHumTYf/kFJptCK2eBUq/88M=
+cloud.google.com/go/spanner v1.53.1 h1:xNmE0SXMSxNBuk7lRZ5G/S+A49X91zkSTt7Jn5Ptlvw=
+cloud.google.com/go/spanner v1.55.0 h1:YF/A/k73EMYCjp8wcJTpkE+TcrWutHRlsCtlRSfWS64=
+cloud.google.com/go/spanner v1.55.0/go.mod h1:HXEznMUVhC+PC+HDyo9YFG2Ajj5BQDkcbqB9Z2Ffxi0=
+cloud.google.com/go/speech v1.21.0 h1:qkxNao58oF8ghAHE1Eghen7XepawYEN5zuZXYWaUTA4=
+cloud.google.com/go/storagetransfer v1.10.3 h1:YM1dnj5gLjfL6aDldO2s4GeU8JoAvH1xyIwXre63KmI=
+cloud.google.com/go/talent v1.6.5 h1:LnRJhhYkODDBoTwf6BeYkiJHFw9k+1mAFNyArwZUZAs=
+cloud.google.com/go/texttospeech v1.7.4 h1:ahrzTgr7uAbvebuhkBAAVU6kRwVD0HWsmDsvMhtad5Q=
+cloud.google.com/go/tpu v1.6.4 h1:XIEH5c0WeYGaVy9H+UueiTaf3NI6XNdB4/v6TFQJxtE=
+cloud.google.com/go/trace v1.10.4 h1:2qOAuAzNezwW3QN+t41BtkDJOG42HywL73q8x/f6fnM=
+cloud.google.com/go/translate v1.9.3 h1:t5WXTqlrk8VVJu/i3WrYQACjzYJiff5szARHiyqqPzI=
+cloud.google.com/go/translate v1.10.0 h1:tncNaKmlZnayMMRX/mMM2d5AJftecznnxVBD4w070NI=
+cloud.google.com/go/translate v1.10.0/go.mod h1:Kbq9RggWsbqZ9W5YpM94Q1Xv4dshw/gr/SHfsl5yCZ0=
+cloud.google.com/go/video v1.20.3 h1:Xrpbm2S9UFQ1pZEeJt9Vqm5t2T/z9y/M3rNXhFoo8Is=
+cloud.google.com/go/videointelligence v1.11.4 h1:YS4j7lY0zxYyneTFXjBJUj2r4CFe/UoIi/PJG0Zt/Rg=
+cloud.google.com/go/vision v1.2.0 h1:/CsSTkbmO9HC8iQpxbK8ATms3OQaX3YQUeTMGCxlaK4=
+cloud.google.com/go/vision/v2 v2.7.5 h1:T/ujUghvEaTb+YnFY/jiYwVAkMbIC8EieK0CJo6B4vg=
+cloud.google.com/go/vmmigration v1.7.4 h1:qPNdab4aGgtaRX+51jCOtJxlJp6P26qua4o1xxUDjpc=
+cloud.google.com/go/vmwareengine v1.0.3 h1:WY526PqM6QNmFHSqe2sRfK6gRpzWjmL98UFkql2+JDM=
+cloud.google.com/go/vpcaccess v1.7.4 h1:zbs3V+9ux45KYq8lxxn/wgXole6SlBHHKKyZhNJoS+8=
+cloud.google.com/go/webrisk v1.9.4 h1:iceR3k0BCRZgf2D/NiKviVMFfuNC9LmeNLtxUFRB/wI=
+cloud.google.com/go/websecurityscanner v1.6.4 h1:5Gp7h5j7jywxLUp6NTpjNPkgZb3ngl0tUSw6ICWvtJQ=
+cloud.google.com/go/workflows v1.12.3 h1:qocsqETmLAl34mSa01hKZjcqAvt699gaoFbooGGMvaM=
+contrib.go.opencensus.io/exporter/aws v0.0.0-20200617204711-c478e41e60e9 h1:yxE46rQA0QaqPGqN2UnwXvgCrRqtjR1CsGSWVTRjvv4=
+contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg=
+contrib.go.opencensus.io/exporter/prometheus v0.4.2/go.mod h1:dvEHbiKmgvbr5pjaF9fpw1KeYcjrnC1J8B+JKjsZyRQ=
+contrib.go.opencensus.io/exporter/stackdriver v0.13.10 h1:a9+GZPUe+ONKUwULjlEOucMMG0qfSCCenlji0Nhqbys=
+contrib.go.opencensus.io/integrations/ocsql v0.1.7 h1:G3k7C0/W44zcqkpRSFyjU9f6HZkbwIrL//qqnlqWZ60=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9 h1:VpgP7xuJadIUuKccphEpTJnWhS2jkQyMt6Y7pJCD7fY=
+docker.io/go-docker v1.0.0 h1:VdXS/aNYQxyA9wdLD5z8Q8Ro688/hG8HzKxYVEVbE6s=
+docker.io/go-docker v1.0.0/go.mod h1:7tiAn5a0LFmjbPDbyTPOaTTOuG1ZRNXdPA6RvKY+fpY=
+filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
+filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
+gioui.org v0.0.0-20210308172011-57750fc8a0a6 h1:K72hopUosKG3ntOPNG4OzzbuhxGuVf06fa2la1/H/Ho=
+git.sr.ht/~sbinet/gg v0.3.1 h1:LNhjNn8DerC8f9DHLz6lS0YYul/b602DUxDgGkd/Aik=
+github.com/99designs/basicauth-go v0.0.0-20160802081356-2a93ba0f464d h1:j6oB/WPCigdOkxtuPl1VSIiLpy7Mdsu6phQffbF19Ng=
+github.com/99designs/httpsignatures-go v0.0.0-20170731043157-88528bf4ca7e h1:rl2Aq4ZODqTDkeSqQBy+fzpZPamacO1Srp8zq7jf2Sc=
+github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9 h1:HD8gA2tkByhMAwYaFAX9w2l7vxvBQ5NMoxDrkhqhtn4=
+github.com/Azure/azure-amqp-common-go/v3 v3.2.2 h1:CJpxNAGxP7UBhDusRUoaOn0uOorQyAYhQYLnNgkRhlY=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal v1.1.2 h1:mLY+pNLjCUeKhgnAJWAKhEUQM+RJQo2H1fuGSw1Ky1E=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.0.0 h1:ECsQtyERDVz3NP3kvDOTLvbQhqWp/x9EsGKtb4ogUr8=
+github.com/Azure/azure-service-bus-go v0.11.5 h1:EVMicXGNrSX+rHRCBgm/TRQ4VUZ1m3yAYM/AB2R/SOs=
+github.com/Azure/go-amqp v0.16.4 h1:/1oIXrq5zwXLHaoYDliJyiFjJSpJZMWGgtMX9e0/Z30=
+github.com/Azure/go-autorest/autorest/azure/auth v0.5.11 h1:P6bYXFoao05z5uhOQzbC3Qd8JqF3jUoocoTeIxkp2cA=
+github.com/Azure/go-autorest/autorest/azure/auth v0.5.11/go.mod h1:84w/uV8E37feW2NCJ08uT9VBfjfUHpgLVnG2InYD6cg=
+github.com/Azure/go-autorest/autorest/azure/cli v0.4.5 h1:0W/yGmFdTIT77fvdlGZ0LMISoLHFJ7Tx4U0yeB+uFs4=
+github.com/Azure/go-autorest/autorest/azure/cli v0.4.5/go.mod h1:ADQAXrkgm7acgWVUNamOgh8YNrv4p27l3Wc55oVfpzg=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 h1:1BDTz0u9nC3//pOCMdNH+CiXJVYJh5UQNCOBG7jbELc=
+github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 h1:sR+/8Yb4slttB4vD+b9btVEnWgL3Q00OBTzVT8B9C0c=
+github.com/CloudyKit/jet/v3 v3.0.0 h1:1PwO5w5VCtlUUl+KTOBsTGZlhjWkcybsGaAau52tOy8=
+github.com/DataDog/datadog-go v3.2.0+incompatible h1:qSG2N4FghB1He/r2mFrWKCaL7dXCilEuNEeAn20fdD4=
+github.com/GoogleCloudPlatform/cloudsql-proxy v1.29.0 h1:YNu23BtH0PKF+fg3ykSorCp6jSTjcEtfnYLzbmcjVRA=
+github.com/Joker/hpp v1.0.0 h1:65+iuJYdRXv/XyN62C1uEmmOx3432rNG/rKlX6V7Kkc=
+github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw=
+github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw=
+github.com/OneOfOne/xxhash v1.2.6 h1:U68crOE3y3MPttCMQGywZOLrTeF5HHJ3/vDBCJn9/bA=
+github.com/OneOfOne/xxhash v1.2.6/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
+github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
+github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
+github.com/RaveNoX/go-jsoncommentstrip v1.0.0 h1:t527LHHE3HmiHrq74QMpNPZpGCIJzTx+apLkMKt4HC0=
+github.com/RoaringBitmap/gocroaring v0.4.0 h1:5nufXUgWpBEUNEJXw7926YAA58ZAQRpWPrQV1xCoSjc=
+github.com/RoaringBitmap/real-roaring-datasets v0.0.0-20190726190000-eb7c87156f76 h1:ZYlhPbqQFU+AHfgtCdHGDTtRW1a8geZyiE8c6Q+Sl1s=
+github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398 h1:WDC6ySpJzbxGWFh4aMxFFC28wwGp5pEuoTtvA4q/qQ4=
+github.com/Shopify/sarama v1.38.1 h1:lqqPUPQZ7zPqYlWpTh+LQ9bhYNu2xJL6k1SJN4WVe2A=
+github.com/Shopify/sarama v1.38.1/go.mod h1:iwv9a67Ha8VNa+TifujYoWGxWnu2kNVAQdSdZ4X2o5g=
+github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc=
+github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE=
+github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5 h1:rFw4nCn9iMW+Vajsk51NtYIcwSTkXr+JGrMd36kTDJw=
+github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
+github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9 h1:7kQgkwGRoLzC9K0oyXdJo7nve/bynv/KwUsxbiTlzAM=
+github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19 h1:iXUgAaqDcIUGbRoy2TdeofRG/j1zpGRSEmNK05T+bi8=
+github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b h1:slYM766cy2nI3BwyRiyQj/Ud48djTMtMebDqepE95rw=
+github.com/alecthomas/kingpin/v2 v2.4.0 h1:f48lwail6p8zpO1bC4TxtqACaGqHYA22qkHjHpqDjYY=
+github.com/alecthomas/kong v0.2.11 h1:RKeJXXWfg9N47RYfMm0+igkxBCTF4bzbneAxaqid0c4=
+github.com/alecthomas/kong v0.2.11/go.mod h1:kQOmtJgV+Lb4aj+I2LEn40cbtawdWJ9Y8QLq+lElKxE=
+github.com/alecthomas/participle/v2 v2.1.0 h1:z7dElHRrOEEq45F2TG5cbQihMtNTv8vwldytDj7Wrz4=
+github.com/alecthomas/participle/v2 v2.1.0/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c=
+github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
+github.com/alicebob/miniredis v2.5.0+incompatible h1:yBHoLpsyjupjz3NL3MhKMVkR41j82Yjf3KFv7ApYzUI=
+github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk=
+github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg=
+github.com/apache/arrow/go/v10 v10.0.1 h1:n9dERvixoC/1JjDmBcs9FPaEryoANa2sCgVFo6ez9cI=
+github.com/apache/arrow/go/v11 v11.0.0 h1:hqauxvFQxww+0mEU/2XHG6LT7eZternCZq+A5Yly2uM=
+github.com/apache/arrow/go/v12 v12.0.0 h1:xtZE63VWl7qLdB0JObIXvvhGjoVNrQ9ciIHG2OK5cmc=
+github.com/apache/arrow/go/v12 v12.0.1 h1:JsR2+hzYYjgSUkBSaahpqCetqZMr76djX80fF/DiJbg=
+github.com/apache/arrow/go/v12 v12.0.1/go.mod h1:weuTY7JvTG/HDPtMQxEUp7pU73vkLWMLpY67QwZ/WWw=
+github.com/apache/arrow/go/v13 v13.0.0 h1:kELrvDQuKZo8csdWYqBQfyi431x6Zs/YJTEgUuSVcWk=
+github.com/apache/arrow/go/v13 v13.0.0/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc=
+github.com/apache/thrift v0.17.0/go.mod h1:OLxhMRJxomX+1I/KUw03qoV3mMz16BwaKI+d4fPBx7Q=
+github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3 h1:ZSTrOEhiM5J5RFxEaFvMZVEAM1KvT1YzbEOwB2EAGjA=
+github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM=
+github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e h1:QEF07wC0T1rKkctt1RINW/+RMTVmiwxETico2l3gxJA=
+github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 h1:G1bPvciwNyF7IUmKXNt9Ak3m6u9DE1rF+RmtIkBpVdA=
+github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a h1:pv34s756C4pEXnjgPfGYgdhg/ZdajGhyOvzx8k+23nw=
+github.com/aws/aws-lambda-go v1.13.3 h1:SuCy7H3NLyp+1Mrfp+m80jcbi9KYWAs9/BXwppwRDzY=
+github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.8.1 h1:w/fPGB0t5rWwA43mux4e9ozFSH5zF1moQemlA131PWc=
+github.com/aws/aws-sdk-go-v2/service/kms v1.16.3 h1:nUP29LA4GZZPihNSo5ZcF4Rl73u+bN5IBRnrQA0jFK4=
+github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.15.4 h1:EmIEXOjAdXtxa2OGM1VAajZV/i06Q8qd4kBpJd9/p1k=
+github.com/aws/aws-sdk-go-v2/service/sns v1.17.4 h1:7TdmoJJBwLFyakXjfrGztejwY5Ie1JEto7YFfznCmAw=
+github.com/aws/aws-sdk-go-v2/service/sqs v1.18.3 h1:uHjK81fESbGy2Y9lspub1+C6VN5W2UXTDo2A/Pm4G0U=
+github.com/aws/aws-sdk-go-v2/service/ssm v1.24.1 h1:zc1YLcknvxdW/i1MuJKmEnFB2TNkOfguuQaGRvJXPng=
+github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible h1:Ppm0npCCsmuR9oQaBtRuZcmILVE74aXE+AmrJj8L2ns=
+github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY=
+github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 h1:mXoPYz/Ul5HYEDvkta6I8/rnYM5gSdSV2tJ6XbZuEtY=
+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
+github.com/boombuler/barcode v1.0.1 h1:NDBbPmhS+EqABEs5Kg3n/5ZNjy73Pz7SIV+KCeqyXcs=
+github.com/bufbuild/protovalidate-go v0.2.1/go.mod h1:e7XXDtlxj5vlEyAgsrxpzayp4cEMKCSSb8ZCkin+MVA=
+github.com/bwesterb/go-ristretto v1.2.3 h1:1w53tCkGhCQ5djbat3+MH0BAQ5Kfgbt56UZQ/JMzngw=
+github.com/casbin/casbin/v2 v2.37.0 h1:/poEwPSovi4bTOcP752/CsTQiRz2xycyVKFG7GUhbDw=
+github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
+github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g=
+github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
+github.com/chromedp/cdproto v0.0.0-20220208224320-6efb837e6bc2/go.mod h1:At5TxYYdxkbQL0TSefRjhLE3Q0lgvqKKMSFUglJ7i1U=
+github.com/chromedp/chromedp v0.9.2 h1:dKtNz4kApb06KuSXoTQIyUC2TrA0fhGDwNZf3bcgfKw=
+github.com/chromedp/sysutil v1.0.0 h1:+ZxhTpfpZlmchB58ih/LBHX52ky7w2VhQVKQMucy3Ic=
+github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM=
+github.com/chzyer/readline v1.5.1 h1:upd/6fQk4src78LMRzh5vItIt361/o4uq553V8B5sGI=
+github.com/chzyer/test v1.0.0 h1:p3BQDXSxOhOG0P9z6/hGnII4LGiEPOYBhs8asl/fC04=
+github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible h1:C29Ae4G5GtYyYMm1aztcyj/J5ckgJm2zwdDajFbx1NY=
+github.com/circonus-labs/circonusllhist v0.1.3 h1:TJH+oke8D16535+jHExHj4nQvzlZrj7ug5D7I/orNUA=
+github.com/clbanning/mxj v1.8.4 h1:HuhwZtbyvyOw+3Z1AowPkU87JkJUSv751ELWaiTpj8I=
+github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec h1:EdRZT3IeKQmfCSrgo8SZ8V3MEnskuJP0wCYNpe+aiXo=
+github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=
+github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe h1:QQ3GSy+MqSHxm/d8nCtnAiZdYFd45cYZPs8vOOIYKfk=
+github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
+github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c h1:2zRrJWIt/f9c9HhNHAgrRgq0San5gRRUJTBXLkchal0=
+github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa h1:OaNxuTZr7kxeODyLWsRMC+OD03aFUH+mW6r2d+MWa5Y=
+github.com/cockroachdb/datadriven v1.0.2 h1:H9MtNqVoVhvd9nCBwOyDjUEdZCREqbIdCJD93PBm/jA=
+github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd h1:qMd81Ts1T2OTKmB4acZcyKaMtRnY5Y44NuXGX2GFJ1w=
+github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 h1:sDMmm+q/3+BukdIpxwO365v/Rbspp2Nt5XntgQRXq8Q=
+github.com/containerd/containerd v1.6.8 h1:h4dOFDwzHmqFEP754PgfgTeVXFnLiRc6kiqC7tplDJs=
+github.com/containerd/containerd v1.6.8/go.mod h1:By6p5KqPK0/7/CgO/A6t/Gz+CUYUu2zf1hUaaymVXB0=
+github.com/coreos/etcd v3.3.10+incompatible h1:jFneRYjIvLMLhDLCzuTuU4rSJUjRplcJQ7pD7MnhC04=
+github.com/coreos/go-etcd v2.0.0+incompatible h1:bXhRBIXoTm9BYHS3gE0TtQuyNZyeEMux2sDi4oo5YOo=
+github.com/coreos/go-oidc v2.2.1+incompatible h1:mh48q/BqXqgjVHpy2ZY7WnWAbenxRjsz9N1i1YxjHAk=
+github.com/coreos/go-oidc v2.2.1+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
+github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f h1:JOrtw2xFKzlg+cbHpyrpLDmnN1HqhBfnX7WDiW7eG2c=
+github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf h1:CAKfRE2YtTUIjjh1bkBtyYFaUT/WmOqsJjgtihT0vMI=
+github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk=
+github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw=
+github.com/crewjam/httperr v0.2.0 h1:b2BfXR8U3AlIHwNeFFvZ+BV1LFvKLlzMjzaTnZMybNo=
+github.com/crewjam/httperr v0.2.0/go.mod h1:Jlz+Sg/XqBQhyMjdDiC+GNNRzZTD7x39Gu3pglZ5oH4=
+github.com/cristalhq/hedgedhttp v0.9.1 h1:g68L9cf8uUyQKQJwciD0A1Vgbsz+QgCjuB1I8FAsCDs=
+github.com/cristalhq/hedgedhttp v0.9.1/go.mod h1:XkqWU6qVMutbhW68NnzjWrGtH8NUx1UfYqGYtHVKIsI=
+github.com/cznic/b v0.0.0-20180115125044-35e9bbe41f07 h1:UHFGPvSxX4C4YBApSPvmUfL8tTvWLj2ryqvT9K4Jcuk=
+github.com/cznic/fileutil v0.0.0-20180108211300-6a051e75936f h1:7uSNgsgcarNk4oiN/nNkO0J7KAjlsF5Yv5Gf/tFdHas=
+github.com/cznic/golex v0.0.0-20170803123110-4ab7c5e190e4 h1:CVAqftqbj+exlab+8KJQrE+kNIVlQfJt58j4GxCMF1s=
+github.com/cznic/internal v0.0.0-20180608152220-f44710a21d00 h1:FHpbUtp2K8X53/b4aFNj4my5n+i3x+CQCZWNuHWH/+E=
+github.com/cznic/lldb v1.1.0 h1:AIA+ham6TSJ+XkMe8imQ/g8KPzMUVWAwqUQQdtuMsHs=
+github.com/cznic/mathutil v0.0.0-20180504122225-ca4c9f2c1369 h1:XNT/Zf5l++1Pyg08/HV04ppB0gKxAqtZQBRYiYrUuYk=
+github.com/cznic/ql v1.2.0 h1:lcKp95ZtdF0XkWhGnVIXGF8dVD2X+ClS08tglKtf+ak=
+github.com/cznic/sortutil v0.0.0-20150617083342-4c7342852e65 h1:hxuZop6tSoOi0sxFzoGGYdRqNrPubyaIf9KoBG9tPiE=
+github.com/cznic/strutil v0.0.0-20171016134553-529a34b1c186 h1:0rkFMAbn5KBKNpJyHQ6Prb95vIKanmAe62KxsrN+sqA=
+github.com/cznic/zappy v0.0.0-20160723133515-2533cb5b45cc h1:YKKpTb2BrXN2GYyGaygIdis1vXbE7SSAG9axGWIMClg=
+github.com/dchest/uniuri v1.2.0 h1:koIcOUdrTIivZgSLhHQvKgqdWZq5d7KdMEWF1Ud6+5g=
+github.com/dchest/uniuri v1.2.0/go.mod h1:fSzm4SLHzNZvWLvWJew423PhAzkpNQYq+uNLq4kxhkY=
+github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 h1:YLtO71vCjJRCBcrPMtQ9nqBsqpA1m5sE92cU+pd5Mcc=
+github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs=
+github.com/denisenkom/go-mssqldb v0.12.0 h1:VtrkII767ttSPNRfFekePK3sctr+joXgO58stqQbtUA=
+github.com/devigned/tab v0.1.1 h1:3mD6Kb1mUOYeLpJvTVSDwSg5ZsfSxfvxGRTxRsJsITA=
+github.com/dgraph-io/badger v1.6.0 h1:DshxFxZWXUcO0xX476VJC07Xsr6ZCBVRHKZ93Oh7Evo=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
+github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA=
+github.com/dhui/dktest v0.3.0 h1:kwX5a7EkLcjo7VpsPQSYJcKGbXBXdjI9FGjuUj1jn6I=
+github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U=
+github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 h1:bWDMxwH3px2JBh6AyO7hdCn/PkvCZXii8TGj7sbtEbQ=
+github.com/drone/drone-runtime v1.1.0 h1:IsKbwiLY6+ViNBzX0F8PERJVZZcEJm9rgxEh3uZP5IE=
+github.com/drone/drone-runtime v1.1.0/go.mod h1:+osgwGADc/nyl40J0fdsf8Z09bgcBZXvXXnLOY48zYs=
+github.com/drone/drone-yaml v1.2.3 h1:SWzLmzr8ARhbtw1WsVDENa8WFY2Pi9l0FVMfafVUWz8=
+github.com/drone/drone-yaml v1.2.3/go.mod h1:QsqliFK8nG04AHFN9tTn9XJomRBQHD4wcejWW1uz/10=
+github.com/drone/funcmap v0.0.0-20211123105308-29742f68a7d1 h1:E8hjIYiEyI+1S2XZSLpMkqT9V8+YMljFNBWrFpuVM3A=
+github.com/drone/funcmap v0.0.0-20211123105308-29742f68a7d1/go.mod h1:Hph0/pT6ZxbujnE1Z6/08p5I0XXuOsppqF6NQlGOK0E=
+github.com/drone/signal v1.0.0 h1:NrnM2M/4yAuU/tXs6RP1a1ZfxnaHwYkd0kJurA1p6uI=
+github.com/eapache/go-resiliency v1.3.0 h1:RRL0nge+cWGlxXbUzJ7yMcq6w2XBEr19dCN6HECGaT0=
+github.com/eapache/go-resiliency v1.3.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho=
+github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6 h1:8yY/I9ndfrgrXUbOGObLHKBR4Fl3nZXwM2c7OYTT8hM=
+github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0=
+github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc=
+github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385 h1:clC1lXBpe2kTj2VHdaIu9ajZQe4kcEY9j0NsnDDBZ3o=
+github.com/etcd-io/bbolt v1.3.3 h1:gSJmxrs37LgTqR/oyJBWok6k6SvXEUerFTbltIhXkBM=
+github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb h1:IT4JYU7k4ikYg1SCxNI1/Tieq/NFvh6dzLdgi7eu0tM=
+github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb/go.mod h1:bH6Xx7IW64qjjJq8M2u4dxNaBiDfKK+z/3eGDpXEQhc=
+github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072 h1:DddqAaWDpywytcG8w/qoQ5sAN8X12d3Z3koB0C3Rxsc=
+github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
+github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8=
+github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk=
+github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
+github.com/franela/goblin v0.0.0-20210519012713-85d372ac71e2 h1:cZqz+yOJ/R64LcKjNQOdARott/jP7BnUQ9Ah7KaZCvw=
+github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8 h1:a9ENSRDFBUPkJ5lCgVZh26+ZbGyoVJG7yb5SSzF5H54=
+github.com/fsouza/fake-gcs-server v1.7.0 h1:Un0BXUXrRWYSmYyC1Rqm2e2WJfTPyDy/HGMz31emTi8=
+github.com/gavv/httpexpect v2.0.0+incompatible h1:1X9kcRshkSKEjNJJxX9Y9mQ5BRfbxU5kORdjhlA1yX8=
+github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8=
+github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
+github.com/go-check/check v0.0.0-20180628173108-788fd7840127 h1:0gkP6mzaMqkmpcJYCFOLkIBwI7xFExG03bbkOkCvUPI=
+github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8=
+github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/go-chi/chi/v5 v5.0.8 h1:lD+NLqFcAi1ovnVZpsnObHGW4xb4J8lNmoYVfECH1Y0=
+github.com/go-chi/chi/v5 v5.0.8/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/go-fonts/dejavu v0.1.0 h1:JSajPXURYqpr+Cu8U9bt8K+XcACIHWqWrvWCKyeFmVQ=
+github.com/go-fonts/latin-modern v0.2.0 h1:5/Tv1Ek/QCr20C6ZOz15vw3g7GELYL98KWr8Hgo+3vk=
+github.com/go-fonts/liberation v0.2.0 h1:jAkAWJP4S+OsrPLZM4/eC9iW7CtHy+HBXrEwZXWo5VM=
+github.com/go-fonts/stix v0.1.0 h1:UlZlgrvvmT/58o573ot7NFw0vZasZ5I6bcIft/oMdgg=
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 h1:QbL/5oDUmRBzO9/Z7Seo6zf912W/a6Sr4Eu0G/3Jho0=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 h1:WtGNWLvXpe6ZudgnXrq0barxBImvnnJoMEhXAzcbM0I=
+github.com/go-ini/ini v1.25.4 h1:Mujh4R/dH6YL8bxuISne3xX2+qcQ9p0IxKAP6ExWoUo=
+github.com/go-kit/kit v0.12.0 h1:e4o3o3IsBfAKQh5Qbbiqyfu97Ku7jrO/JbohvztANh4=
+github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81 h1:6zl3BbBhdnMkpSj2YY30qV3gDcVBGtFgVsV3+/i+mKQ=
+github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab h1:xveKWz2iaueeTaUgdetzel+U7exyigDYBryyVfV/rZk=
+github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
+github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
+github.com/go-pdf/fpdf v0.6.0 h1:MlgtGIfsdMEEQJr2le6b/HNr1ZlQwxyWr77r2aj2U/8=
+github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
+github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU=
+github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
+github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho=
+github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
+github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ=
+github.com/go-playground/validator/v10 v10.11.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU=
+github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd h1:hSkbZ9XSyjyBirMeqSqUrK+9HboWrweVlzRNqoBi2d4=
+github.com/gobuffalo/depgen v0.1.0 h1:31atYa/UW9V5q8vMJ+W6wd64OaaTHUrCUXER358zLM4=
+github.com/gobuffalo/envy v1.7.0 h1:GlXgaiBkmrYMHco6t4j7SacKO4XUjvh5pwXh0f4uxXU=
+github.com/gobuffalo/flect v0.1.3 h1:3GQ53z7E3o00C/yy7Ko8VXqQXoJGLkrTQCLTF1EjoXU=
+github.com/gobuffalo/genny v0.1.1 h1:iQ0D6SpNXIxu52WESsD+KoQ7af2e3nCfnSBoSF/hKe0=
+github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211 h1:mSVZ4vj4khv+oThUfS+SQU3UuFIZ5Zo6UNcvK8E8Mz8=
+github.com/gobuffalo/gogen v0.1.1 h1:dLg+zb+uOyd/mKeQUYIbwbNmfRsr9hd/WtYWepmayhI=
+github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2 h1:8thhT+kUJMTMy3HlX4+y9Da+BNJck+p109tqqKp7WDs=
+github.com/gobuffalo/mapi v1.0.2 h1:fq9WcL1BYrm36SzK6+aAnZ8hcp+SrmnDyAxhNx8dvJk=
+github.com/gobuffalo/packd v0.1.0 h1:4sGKOD8yaYJ+dek1FDkwcxCHA40M4kfKgFHx8N2kwbU=
+github.com/gobuffalo/packr/v2 v2.2.0 h1:Ir9W9XIm9j7bhhkKE9cokvtTl1vBm62A/fene/ZCj6A=
+github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754 h1:tpom+2CJmpzAWj5/VEHync2rJGi+epHNIeRSWjzGA+4=
+github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
+github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
+github.com/gobwas/ws v1.2.1 h1:F2aeBZrm2NDsc7vbovKrWSogd4wvfAxg0FQ89/iqOTk=
+github.com/goccy/go-yaml v1.11.0 h1:n7Z+zx8S9f9KgzG6KtQKf+kwqXZlLNR2F6018Dgau54=
+github.com/goccy/go-yaml v1.11.0/go.mod h1:H+mJrWtjPTJAHvRbV09MCK9xYwODM+wRTVFFTWckfng=
+github.com/gocql/gocql v0.0.0-20190301043612-f6df8288f9b4 h1:vF83LI8tAakwEwvWZtrIEx7pOySacl2TOxx6eXk4ePo=
+github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA=
+github.com/gofiber/fiber/v2 v2.46.0 h1:wkkWotblsGVlLjXj2dpgKQAYHtXumsK/HyFugQM68Ns=
+github.com/gofiber/fiber/v2 v2.46.0/go.mod h1:DNl0/c37WLe0g92U6lx1VMQuxGUQY5V7EIaVoEsUffc=
+github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
+github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
+github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
+github.com/gomodule/redigo v1.8.9 h1:Sl3u+2BI/kk+VEatbj0scLdrFhjPmbxOc1myhDP41ws=
+github.com/gomodule/redigo v1.8.9/go.mod h1:7ArFNvsTjH8GMMzB4uy1snslv2BwmginuMs06a1uzZE=
+github.com/google/go-jsonnet v0.18.0 h1:/6pTy6g+Jh1a1I2UMoAODkqELFiVIdOxbNwv0DDzoOg=
+github.com/google/go-jsonnet v0.18.0/go.mod h1:C3fTzyVJDslXdiTqw/bTFk7vSGyCtH3MGRbDfvEwGd0=
+github.com/google/go-pkcs11 v0.2.1-0.20230907215043-c6f79328ddf9 h1:OF1IPgv+F4NmqmJ98KTjdN97Vs1JxDPB3vbmYzV2dpk=
+github.com/google/go-replayers/grpcreplay v1.1.0 h1:S5+I3zYyZ+GQz68OfbURDdt/+cSMqCK1wrvNx7WBzTE=
+github.com/google/go-replayers/httpreplay v1.1.1 h1:H91sIMlt1NZzN7R+/ASswyouLJfW0WLW7fhyUFvDEkY=
+github.com/google/renameio v0.1.0 h1:GOZbcHa3HfsPKPlmyPyN2KEohoMXOhdMbHrvbpl2QaA=
+github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
+github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
+github.com/google/subcommands v1.0.1 h1:/eqq+otEXm5vhfBrbREPCSVQbvofip6kIz+mX5TUH7k=
+github.com/googleapis/go-type-adapters v1.0.0 h1:9XdMn+d/G57qq1s8dNc5IesGCXHf6V2HZ2JwRxfA2tA=
+github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8 h1:tlyzajkF3030q6M8SvmJSemC9DTHL/xaMa18b65+JM4=
+github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
+github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4=
+github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q=
+github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
+github.com/grafana/e2e v0.1.1-0.20221018202458-cffd2bb71c7b h1:Ha+kSIoTutf4ytlVw/SaEclDUloYx0+FXDKJWKhNbE4=
+github.com/grafana/e2e v0.1.1-0.20221018202458-cffd2bb71c7b/go.mod h1:3UsooRp7yW5/NJQBlXcTsAHOoykEhNUYXkQ3r6ehEEY=
+github.com/grafana/gomemcache v0.0.0-20231023152154-6947259a0586 h1:/of8Z8taCPftShATouOrBVy6GaTTjgQd/VfNiZp/VXQ=
+github.com/grafana/gomemcache v0.0.0-20231023152154-6947259a0586/go.mod h1:PGk3RjYHpxMM8HFPhKKo+vve3DdlPUELZLSDEFehPuU=
+github.com/grafana/grafana-aws-sdk v0.25.1 h1:waJERJueqB1GldclAh5+tBcY9Ju9AOO9xYSJEnOAuf4=
+github.com/grafana/grafana-aws-sdk v0.25.1/go.mod h1:3zghFF6edrxn0d6k6X9HpGZXDH+VfA+MwD2Pc/9X0ec=
+github.com/grafana/grafana-plugin-sdk-go v0.212.0/go.mod h1:qsI4ktDf0lig74u8SLPJf9zRdVxWV/W4Wi+Ox6gifgs=
+github.com/grafana/grafana-plugin-sdk-go v0.215.0/go.mod h1:nBsh3jRItKQUXDF2BQkiQCPxqrsSQeb+7hiFyJTO1RE=
+github.com/grafana/grafana-plugin-sdk-go v0.216.0/go.mod h1:FdvSvOliqpVLnytM7e89zCFyYPDE6VOn9SIjVQRvVxM=
+github.com/grafana/grafana/pkg/promlib v0.0.3/go.mod h1:3El4NlsfALz8QQCbEGHGFvJUG+538QLMuALRhZ3pcoo=
+github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1/go.mod h1:YvJ2f6MplWDhfxiUC3KpyTy76kYUZA4W3pTv/wdKQ9Y=
+github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 h1:MJG/KsmcqMwFAkh8mTnAwhyKoB+sTAnY4CACC110tbU=
+github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw=
+github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8=
+github.com/hamba/avro/v2 v2.17.2 h1:6PKpEWzJfNnvBgn7m2/8WYaDOUASxfDU+Jyb4ojDgFY=
+github.com/hamba/avro/v2 v2.17.2/go.mod h1:Q9YK+qxAhtVrNqOhwlZTATLgLA8qxG2vtvkhK8fJ7Jo=
+github.com/hanwen/go-fuse v1.0.0 h1:GxS9Zrn6c35/BnfiVsZVWmsG803xwE7eVRDvcf/BEVc=
+github.com/hanwen/go-fuse/v2 v2.1.0 h1:+32ffteETaLYClUj0a3aHjZ1hOPxxaNEHiZiujuDaek=
+github.com/hashicorp/consul/sdk v0.15.0 h1:2qK9nDrr4tiJKRoxPGhm6B7xJjLVIQqkjiab2M4aKjU=
+github.com/hashicorp/go-syslog v1.0.0 h1:KaodqZuhUoZereWVIYmpUgZysurB1kBLX2j0MwMrUAE=
+github.com/hashicorp/go.net v0.0.1 h1:sNCoNyDEvN1xa+X0baata4RdcpKwcMS6DH+xwfqPgjw=
+github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
+github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y=
+github.com/hashicorp/mdns v1.0.4 h1:sY0CMhFmjIPDMlTB+HfymFHCaYLhgifZ0QhjaYKD/UQ=
+github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
+github.com/hudl/fargo v1.4.0 h1:ZDDILMbB37UlAVLlWcJ2Iz1XuahZZTDZfdCKeclfq2s=
+github.com/hydrogen18/memlistener v0.0.0-20200120041712-dcc25e7acd91 h1:KyZDvZ/GGn+r+Y3DKZ7UOQ/TP4xV6HNkrwiVMB1GnNY=
+github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0=
+github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI=
+github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
+github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab h1:BA4a7pe6ZTd9F8kXETBoijjFJ/ntaa//1wiH9BZu4zU=
+github.com/imkira/go-interpol v1.1.0 h1:KIiKr0VSG2CUW1hl1jpiyuzuJeKUUpC8iM1AIE7N1Vk=
+github.com/influxdata/influxdb v1.7.6 h1:8mQ7A/V+3noMGCt/P9pD09ISaiz9XvgCk303UYA3gcs=
+github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab h1:HqW4xhhynfjrtEiiSGcQUd6vrK23iMam1FO8rI7mwig=
+github.com/iris-contrib/blackfriday v2.0.0+incompatible h1:o5sHQHHm0ToHUlAJSTjW9UWicjJSDDauOOQ2AHuIVp4=
+github.com/iris-contrib/go.uuid v2.0.0+incompatible h1:XZubAYg61/JwnJNbZilGjf3b3pB80+OQg2qf6c8BfWE=
+github.com/iris-contrib/jade v1.1.3 h1:p7J/50I0cjo0wq/VWVCDFd8taPJbuFC+bq23SniRFX0=
+github.com/iris-contrib/pongo2 v0.0.1 h1:zGP7pW51oi5eQZMIlGA3I+FHY9/HOQWDB+572yin0to=
+github.com/iris-contrib/schema v0.0.1 h1:10g/WnoRR+U+XXHWKBHeNy/+tZmM2kcAVGLOsz+yaDA=
+github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
+github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
+github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 h1:vr3AYkKovP8uR8AvSGGUK1IDqRa5lAAvEkZG1LKaCRc=
+github.com/jackc/pgconn v1.11.0 h1:HiHArx4yFbwl91X3qqIHtUFoiIfLNJXCQRsnzkiwwaQ=
+github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=
+github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5Wi/+Zz7xoE5ALHsRQlOctkOiHc=
+github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A=
+github.com/jackc/pgproto3/v2 v2.2.0 h1:r7JypeP2D3onoQTCxWdTpCtJ4D+qpKr0TxvoyMhZ5ns=
+github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg=
+github.com/jackc/pgtype v1.10.0 h1:ILnBWrRMSXGczYvmkYD6PsYyVFUNLTnIUJHHDLmqk38=
+github.com/jackc/pgx v3.2.0+incompatible h1:0Vihzu20St42/UDsvZGdNE6jak7oi/UOeMzwMPHkgFY=
+github.com/jackc/pgx/v4 v4.15.0 h1:B7dTkXsdILD3MF987WGGCcg+tvLW6bZJdEcqVFeU//w=
+github.com/jackc/puddle v1.2.1 h1:gI8os0wpRXFd4FiAY2dWiqRK037tjj3t7rKFeO4X5iw=
+github.com/jackspirou/syscerts v0.0.0-20160531025014-b68f5469dff1 h1:9Xm8CKtMZIXgcopfdWk/qZ1rt0HjMgfMR9nxxSeK6vk=
+github.com/jackspirou/syscerts v0.0.0-20160531025014-b68f5469dff1/go.mod h1:zuHl3Hh+e9P6gmBPvcqR1HjkaWHC/csgyskg6IaFKFo=
+github.com/jaegertracing/jaeger v1.41.0 h1:vVNky8dP46M2RjGaZ7qRENqylW+tBFay3h57N16Ip7M=
+github.com/jaegertracing/jaeger v1.41.0/go.mod h1:SIkAT75iVmA9U+mESGYuMH6UQv6V9Qy4qxo0lwfCQAc=
+github.com/jarcoal/httpmock v1.3.0 h1:2RJ8GP0IIaWwcC9Fp2BmVi8Kog3v2Hn7VXM3fTd+nuc=
+github.com/jedib0t/go-pretty/v6 v6.2.4 h1:wdaj2KHD2W+mz8JgJ/Q6L/T5dB7kyqEFI16eLq7GEmk=
+github.com/jedib0t/go-pretty/v6 v6.2.4/go.mod h1:+nE9fyyHGil+PuISTCrp7avEdo6bqoMwqZnuiK2r2a0=
+github.com/jhump/gopoet v0.1.0 h1:gYjOPnzHd2nzB37xYQZxj4EIQNpBrBskRqQQ3q4ZgSg=
+github.com/jhump/goprotoc v0.5.0 h1:Y1UgUX+txUznfqcGdDef8ZOVlyQvnV0pKWZH08RmZuo=
+github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg=
+github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
+github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o=
+github.com/jsternberg/zap-logfmt v1.2.0 h1:1v+PK4/B48cy8cfQbxL4FmmNZrjnIMr2BsnyEmXqv2o=
+github.com/jsternberg/zap-logfmt v1.2.0/go.mod h1:kz+1CUmCutPWABnNkOu9hOHKdT2q3TDYCcsFy9hpqb0=
+github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d h1:c93kUJDtVAXFEhsCh5jSxyOJmFHuzcihnslQiX8Urwo=
+github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
+github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5 h1:PJr+ZMXIecYc1Ey2zucXdR73SMBtgjPgwa31099IMv0=
+github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQF+M0ao65imhwqKnz3Q2z/d8PWZRMQvDM=
+github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
+github.com/karrick/godirwalk v1.10.3 h1:lOpSw2vJP0y5eLBW906QwKsUK/fe/QDyoqM5rnnuPDY=
+github.com/kataras/golog v0.0.10 h1:vRDRUmwacco/pmBAm8geLn8rHEdc+9Z4NAr5Sh7TG/4=
+github.com/kataras/iris/v12 v12.1.8 h1:O3gJasjm7ZxpxwTH8tApZsvf274scSGQAUpNe47c37U=
+github.com/kataras/neffos v0.0.14 h1:pdJaTvUG3NQfeMbbVCI8JT2T5goPldyyfUB2PJfh1Bs=
+github.com/kataras/pio v0.0.2 h1:6NAi+uPJ/Zuid6mrAKlgpbI11/zK/lV4B2rxWaJN98Y=
+github.com/kataras/sitemap v0.0.5 h1:4HCONX5RLgVy6G4RkYOV3vKNcma9p236LdGOipJsaFE=
+github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8=
+github.com/kisielk/errcheck v1.5.0 h1:e8esj/e4R+SAOwFwN+n3zr0nYeCyeweozKfO23MvHzY=
+github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg=
+github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/klauspost/cpuid v1.2.1 h1:vJi+O/nMdFt0vqm8NZBI6wzALWdA2X+egi0ogNyrC/w=
+github.com/knadh/koanf v1.5.0 h1:q2TSd/3Pyc/5yP9ldIrSdIz26MCcyNQzW0pEAugLPNs=
+github.com/knadh/koanf v1.5.0/go.mod h1:Hgyjp4y8v44hpZtPzs7JZfRAW5AhN7KfZcwv1RYggDs=
+github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
+github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=
+github.com/kr/pty v1.1.8 h1:AkaSdXYQOWeaO3neb8EM634ahkXXe3jYbVh/F9lq+GI=
+github.com/kshvakov/clickhouse v1.3.5 h1:PDTYk9VYgbjPAWry3AoDREeMgOVUFij6bh6IjlloHL0=
+github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80 h1:6Yzfa6GP0rIo/kULo2bwGEkFvCePZ3qHDDTC3/J9Swo=
+github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
+github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
+github.com/lestrrat-go/backoff/v2 v2.0.8 h1:oNb5E5isby2kiro9AgdHLv5N5tint1AnDVVf2E2un5A=
+github.com/lestrrat-go/backoff/v2 v2.0.8/go.mod h1:rHP/q/r9aT27n24JQLa7JhSQZCKBBOiM/uP402WwN8Y=
+github.com/lestrrat-go/blackmagic v1.0.0 h1:XzdxDbuQTz0RZZEmdU7cnQxUtFUzgCSPq8RCz4BxIi4=
+github.com/lestrrat-go/blackmagic v1.0.0/go.mod h1:TNgH//0vYSs8VXDCfkZLgIrVTTXQELZffUV0tz3MtdQ=
+github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE=
+github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E=
+github.com/lestrrat-go/iter v1.0.1 h1:q8faalr2dY6o8bV45uwrxq12bRa1ezKrB6oM9FUgN4A=
+github.com/lestrrat-go/iter v1.0.1/go.mod h1:zIdgO1mRKhn8l9vrZJZz9TUMMFbQbLeTsbqPDrJ/OJc=
+github.com/lestrrat-go/jwx v1.2.25 h1:tAx93jN2SdPvFn08fHNAhqFJazn5mBBOB8Zli0g0otA=
+github.com/lestrrat-go/jwx v1.2.25/go.mod h1:zoNuZymNl5lgdcu6P7K6ie2QRll5HVfF4xwxBBK1NxY=
+github.com/lestrrat-go/option v1.0.0 h1:WqAWL8kh8VcSoD6xjSH34/1m8yxluXQbDeKNfvFeEO4=
+github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
+github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743 h1:143Bb8f8DuGWck/xpNUOckBVYfFbBTnLevfRZ1aVVqo=
+github.com/lightstep/lightstep-tracer-go v0.18.1 h1:vi1F1IQ8N7hNWytK9DpJsUfQhGuNSc19z330K6vl4zk=
+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
+github.com/lyft/protoc-gen-star v0.6.1 h1:erE0rdztuaDq3bpGifD95wfoPrSZc95nGA6tbiNYh6M=
+github.com/lyft/protoc-gen-star/v2 v2.0.3 h1:/3+/2sWyXeMLzKd1bX+ixWKgEMsULrIivpDsuaF441o=
+github.com/lyft/protoc-gen-validate v0.0.13 h1:KNt/RhmQTOLr7Aj8PsJ7mTronaFyx80mRTT9qF261dA=
+github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
+github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2 h1:JgVTCPf0uBVcUSWpyXmGpgOc62nK5HWUBKAGc3Qqa5k=
+github.com/markbates/safe v1.0.1 h1:yjZkbvRM6IzKj9tlu/zMJLS0n/V351OZWRnF3QfaUxI=
+github.com/matryer/moq v0.2.7 h1:RtpiPUM8L7ZSCbSwK+QcZH/E9tgqAkFjKQxsRs25b4w=
+github.com/matryer/moq v0.2.7/go.mod h1:kITsx543GOENm48TUAQyJ9+SAvFSr7iGQXPoth/VUBk=
+github.com/matryer/moq v0.3.1 h1:kLDiBJoGcusWS2BixGyTkF224aSCD8nLY24tj/NcTCs=
+github.com/matryer/moq v0.3.1/go.mod h1:RJ75ZZZD71hejp39j4crZLsEDszGk6iH4v4YsWFKH4s=
+github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/goveralls v0.0.2 h1:7eJB6EqsPhRVxvwEXGnqdO2sJI0PTsrWoTMXEk9/OQc=
+github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
+github.com/maxatome/go-testdeep v1.12.0 h1:Ql7Go8Tg0C1D/uMMX59LAoYK7LffeJQ6X2T04nTH68g=
+github.com/mediocregopher/radix/v3 v3.4.2 h1:galbPBjIwmyREgwGCfQEN4X8lxbJnKBYurgz+VfcStA=
+github.com/microcosm-cc/bluemonday v1.0.2 h1:5lPfLTTAvAbtS0VqT+94yOtFnGfUWYyx0+iToC3Os3s=
+github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g=
+github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
+github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
+github.com/minio/minio-go/v7 v7.0.52 h1:8XhG36F6oKQUDDSuz6dY3rioMzovKjW40W6ANuN0Dps=
+github.com/minio/minio-go/v7 v7.0.52/go.mod h1:IbbodHyjUAguneyucUaahv+VMNs/EOTV9du7A7/Z3HU=
+github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g=
+github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM=
+github.com/mitchellh/cli v1.1.5 h1:OxRIeJXpAMztws/XHlN2vu6imG5Dpq+j61AzAX5fLng=
+github.com/mitchellh/gox v0.4.0 h1:lfGJxY7ToLJQjHHwi0EX6uYBdK78egf954SQl13PQJc=
+github.com/mitchellh/iochan v1.0.0 h1:C+X3KsSTLFVBr/tK1eYN/vs4rJcvsiLU338UhYPJWeY=
+github.com/mithrandie/readline-csvq v1.2.1 h1:4cfeYeVSrqKEWi/1t7CjyhFD2yS6fm+l+oe+WyoSNlI=
+github.com/mithrandie/readline-csvq v1.2.1/go.mod h1:ydD9Eyp3/wn8KPSNbKmMZe4RQQauCuxi26yEo4N40dk=
+github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5 h1:8Q0qkMVC/MmWkpIdlvZgcv2o2jrlF6zqVOh7W5YHdMA=
+github.com/montanaflynn/stats v0.7.0 h1:r3y12KyNxj/Sb/iOE46ws+3mS1+MZca1wlHQFPsY/JU=
+github.com/mostynb/go-grpc-compression v1.1.17 h1:N9t6taOJN3mNTTi0wDf4e3lp/G/ON1TP67Pn0vTUA9I=
+github.com/mostynb/go-grpc-compression v1.1.17/go.mod h1:FUSBr0QjKqQgoDG/e0yiqlR6aqyXC39+g/hFLDfSsEY=
+github.com/moul/http2curl v1.0.0 h1:dRMWoAtb+ePxMlLkrCbAqh4TlPHXvoGUSQ323/9Zahs=
+github.com/nakagami/firebirdsql v0.0.0-20190310045651-3c02a58cfed8 h1:P48LjvUQpTReR3TQRbxSeSBsMXzfK0uol7eRcr7VBYQ=
+github.com/natessilva/dag v0.0.0-20180124060714-7194b8dcc5c4 h1:dnMxwus89s86tI8rcGVp2HwZzlz7c5o92VOy7dSckBQ=
+github.com/nats-io/jwt v1.2.2 h1:w3GMTO969dFg+UOKTmmyuu7IGdusK+7Ytlt//OYH/uU=
+github.com/nats-io/jwt/v2 v2.0.3 h1:i/O6cmIsjpcQyWDYNcq2JyZ3/VTF8SJ4JWluI5OhpvI=
+github.com/nats-io/nats-server/v2 v2.5.0 h1:wsnVaaXH9VRSg+A2MVg5Q727/CqxnmPLGFQ3YZYKTQg=
+github.com/nats-io/nats.go v1.12.1 h1:+0ndxwUPz3CmQ2vjbXdkC1fo3FdiOQDim4gl3Mge8Qo=
+github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8=
+github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
+github.com/oklog/oklog v0.3.2 h1:wVfs8F+in6nTBMkA7CbRw+zZMIB7nNM825cM1wuzoTk=
+github.com/oklog/ulid/v2 v2.1.0 h1:+9lhoxAP56we25tyYETBBY1YLA2SaoLvUFgrP2miPJU=
+github.com/oklog/ulid/v2 v2.1.0/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ=
+github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
+github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88=
+github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.74.0 h1:0dve/IbuHfQOnlIBQQwpCxIeMp7uig9DQVuvisWPDRs=
+github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.74.0/go.mod h1:bIeSj+SaZdP3CE9Xae+zurdQC6DXX0tPP6NAEVmgtt4=
+github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.74.0 h1:MrVOfBTNBe4n/daZjV4yvHZRR0Jg/MOCl/mNwymHwDM=
+github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.74.0/go.mod h1:v4H2ATSrKfOTbQnmjCxpvuOjrO/GUURAgey9RzrPsuQ=
+github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.74.0 h1:8Kk5g5PKQBUV3idjJy1NWVLLReEzjnB8C1lFgQxZ0TI=
+github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.74.0/go.mod h1:UtVfxZGhPU2OvDh7H8o67VKWG9qHAHRNkhmZUWqCvME=
+github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.74.0 h1:vU5ZebauzCuYNXFlQaWaYnOfjoOAnS+Sc8+oNWoHkbM=
+github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.74.0/go.mod h1:TEu3TnUv1TuyHtjllrUDQ/ImpyD+GrkDejZv4hxl3G8=
+github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.74.0 h1:COFBWXiWnhRs9x1oYJbDg5cyiNAozp8sycriD9+1/7E=
+github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.74.0/go.mod h1:cAKlYKU+/8mk6ETOnD+EAi5gpXZjDrGweAB9YTYrv/g=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.74.0 h1:ww1pPXfAM0WHsymQnsN+s4B9DgwQC+GyoBq0t27JV/k=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.74.0/go.mod h1:OpEw7tyCg+iG1ywEgZ03qe5sP/8fhYdtWCMoqA8JCug=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.74.0 h1:0Fh6OjlUB9HlnX90/gGiyyFvnmNBv6inj7bSaVqQ7UQ=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.74.0/go.mod h1:13ekplz1UmvK99Vz2VjSBWPYqoRBEax5LPmA1tFHnhA=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.74.0 h1:A5xoBaMHX1WzLfvlqK6NBXq4XIbuSVJIpec5r6PDE7U=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.74.0/go.mod h1:TJT7HkhFPrJic30Vk4seF/eRk8sa0VQ442Xq/qd+DLY=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.74.0 h1:pWNSPCKD+V4rC+MnZj8uErEbcsYUpEqU3InNYyafAPY=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.74.0/go.mod h1:0lXcDf6LUbtDxZZO3zDbRzMuL7gL1Q0FPOR8/3IBwaQ=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.74.0 h1:NWd9+rQTd6pELLf3copo7CEuNgKp90kgyhPozpwax2U=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.74.0/go.mod h1:anSbwGOousKpnNAVMNP5YieA4KOFuEzHkvya0vvtsaI=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.74.0 h1:Law7+BImq8DIBsdniSX8Iy2/GH5CRHpT1gsRaC9ZT8A=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.74.0/go.mod h1:uiW3V9EX8A5DOoxqDLuSh++ewHr+owtonCSiqMcpy3w=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.74.0 h1:2uysjsaqkf9STFeJN/M6i/sSYEN5pZJ94Qd2/Hg1pKE=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.74.0/go.mod h1:qoGuayD7cAtshnKosIQHd6dobcn6/sqgUn0v/Cg2UB8=
+github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e h1:4cPxUYdgaGzZIT5/j0IfqOrrXmq6bG8AwvwisMXpdrg=
+github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e/go.mod h1:DYR5Eij8rJl8h7gblRrOZ8g0kW1umSpKqYIBTgeDtLo=
+github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 h1:lM6RxxfUMrYL/f8bWEUqdXrANWtrL7Nndbm9iFN0DlU=
+github.com/opentracing/basictracer-go v1.0.0 h1:YyUAhaEfjoWXclZVJ9sGoNct7j4TVk7lZWlQw5UXuoo=
+github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5 h1:ZCnq+JUrvXcDVhX/xRolRBZifmabN1HcS1wrPSvxhrU=
+github.com/openzipkin/zipkin-go v0.4.1 h1:kNd/ST2yLLWhaWrkgchya40TJabe8Hioj9udfPcEO5A=
+github.com/openzipkin/zipkin-go v0.4.1/go.mod h1:qY0VqDSN1pOBN94dBc6w2GJlWLiovAyg7Qt6/I9HecM=
+github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde h1:x0TT0RDC7UhAVbbWWBzr41ElhJx5tXPWkIHA2HWPRuw=
+github.com/pact-foundation/pact-go v1.0.4 h1:OYkFijGHoZAYbOIb1LWXrwKQbMMRUv1oQ89blD2Mh2Q=
+github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=
+github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
+github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg=
+github.com/performancecopilot/speed v3.0.0+incompatible h1:2WnRzIquHa5QxaJKShDkLM+sc0JPuwhXzK8OYOyt3Vg=
+github.com/performancecopilot/speed/v4 v4.0.0 h1:VxEDCmdkfbQYDlcr/GC9YoN9PQ6p8ulk9xVsepYy9ZY=
+github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
+github.com/philhofer/fwd v1.1.2 h1:bnDivRJ1EWPjUIRXV5KfORO897HTbpFAQddBdE8t7Gw=
+github.com/philhofer/fwd v1.1.2/go.mod h1:qkPdfjR2SIEbspLqpe1tO4n5yICnr2DY7mqEx2tUTP0=
+github.com/phpdave11/gofpdf v1.4.2 h1:KPKiIbfwbvC/wOncwhrpRdXVj2CZTCFlw4wnoyjtHfQ=
+github.com/phpdave11/gofpdi v1.0.13 h1:o61duiW8M9sMlkVXWlvP92sZJtGKENvW3VExs6dZukQ=
+github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A=
+github.com/pkg/profile v1.2.1 h1:F++O52m40owAmADcojzM+9gyjmMOY/T4oYJkgFDH8RE=
+github.com/pkg/sftp v1.13.1 h1:I2qBYMChEhIjOgazfJmV3/mZM256btk6wkCDRmW7JYs=
+github.com/posener/complete v1.2.3 h1:NP0eAhjcjImqslEwo/1hq7gpajME0fTLTezBKDqfXqo=
+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
+github.com/pquerna/cachecontrol v0.1.0 h1:yJMy84ti9h/+OEWa752kBTKv4XC30OtVVHYv/8cTqKc=
+github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI=
+github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
+github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc=
+github.com/prometheus/common/assets v0.2.0 h1:0P5OrzoHrYBOSM1OigWL3mY8ZvV2N4zIE/5AahrSrfM=
+github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
+github.com/prometheus/statsd_exporter v0.22.7 h1:7Pji/i2GuhK6Lu7DHrtTkFmNBCudCPT1pX2CziuyQR0=
+github.com/prometheus/statsd_exporter v0.22.7/go.mod h1:N/TevpjkIh9ccs6nuzY3jQn9dFqnUakOjnEuMPJJJnI=
+github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=
+github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
+github.com/rogpeppe/fastuuid v1.2.0 h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s=
+github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4 h1:BN/Nyn2nWMoqGRA7G7paDNDqTXE30mXGqzzybrfo05w=
+github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
+github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/rs/zerolog v1.15.0 h1:uPRuwkWF4J6fGsJ2R0Gn2jB1EQiav9k3S6CSdygQJXY=
+github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=
+github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245 h1:K1Xf3bKttbF+koVGaX5xngRIZ5bVjbmPnaxE/dR08uY=
+github.com/ryanuber/columnize v2.1.2+incompatible h1:C89EOx/XBWwIXl8wm8OPJBd7kPF25UfsK2X7Ph/zCAk=
+github.com/sagikazarmark/crypt v0.6.0 h1:REOEXCs/NFY/1jOCEouMuT4zEniE5YoXbvpC5X/TLF8=
+github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da h1:p3Vo3i64TCLY7gIfzeQaUJ+kppEO5WQG3cL8iE8tGHU=
+github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
+github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94 h1:rmMl4fXJhKMNWl+K+r/fq4FbbKI+Ia2m9hYBLm2h4G4=
+github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94/go.mod h1:90zrgN3D/WJsDd1iXHT96alCoN2KJo6/4x1DZC3wZs8=
+github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee h1:8Iv5m6xEo1NR1AvpV+7XmhI4r39LGNzwUL4YpMuL5vk=
+github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee/go.mod h1:qwtSXrKuJh/zsFQ12yEE89xfCrGKK63Rr7ctU/uCo4g=
+github.com/schollz/closestmatch v2.1.0+incompatible h1:Uel2GXEpJqOWBrlyI+oY9LTiyyjYS17cCYRqP13/SHk=
+github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g=
+github.com/scottlepp/go-duck v0.0.20 h1:SrDrLuwouDh50QB2eaEEhfWvRpdAbnejgqn/3aHBspY=
+github.com/scottlepp/go-duck v0.0.20/go.mod h1:GL+hHuKdueJRrFCduwBc7A7TQk+Tetc5BPXPVtduihY=
+github.com/segmentio/fasthash v0.0.0-20180216231524-a72b379d632e h1:uO75wNGioszjmIzcY/tvdDYKRLVvzggtAmmJkn9j4GQ=
+github.com/segmentio/fasthash v0.0.0-20180216231524-a72b379d632e/go.mod h1:tm/wZFQ8e24NYaBGIlnO2WGCAi67re4HHuOm0sftE/M=
+github.com/segmentio/parquet-go v0.0.0-20230427215636-d483faba23a5 h1:7CWCjaHrXSUCHrRhIARMGDVKdB82tnPAQMmANeflKOw=
+github.com/segmentio/parquet-go v0.0.0-20230427215636-d483faba23a5/go.mod h1:+J0xQnJjm8DuQUHBO7t57EnmPbstT6+b45+p3DC9k1Q=
+github.com/sercand/kuberesolver/v4 v4.0.0 h1:frL7laPDG/lFm5n98ODmWnn+cvPpzlkf3LhzuPhcHP4=
+github.com/sercand/kuberesolver/v4 v4.0.0/go.mod h1:F4RGyuRmMAjeXHKL+w4P7AwUnPceEAPAhxUgXZjKgvM=
+github.com/sercand/kuberesolver/v5 v5.1.1 h1:CYH+d67G0sGBj7q5wLK61yzqJJ8gLLC8aeprPTHb6yY=
+github.com/sercand/kuberesolver/v5 v5.1.1/go.mod h1:Fs1KbKhVRnB2aDWN12NjKCB+RgYMWZJ294T3BtmVCpQ=
+github.com/shirou/gopsutil/v3 v3.23.2 h1:PAWSuiAszn7IhPMBtXsbSCafej7PqUOvY6YywlQUExU=
+github.com/shirou/gopsutil/v3 v3.23.2/go.mod h1:gv0aQw33GLo3pG8SiWKiQrbDzbRY1K80RyZJ7V4Th1M=
+github.com/shoenig/test v0.6.6 h1:Oe8TPH9wAbv++YPNDKJWUnI8Q4PPWCx3UbOfH+FxiMU=
+github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
+github.com/sony/gobreaker v0.4.1 h1:oMnRNZXX5j85zso6xCPRNPtmAycat+WcoKbklScLDgQ=
+github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
+github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
+github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY=
+github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
+github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
+github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
+github.com/spf13/viper v1.14.0 h1:Rg7d3Lo706X9tHsJMUjdiwMpHB7W8WnSVOssIY+JElU=
+github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+egj8As=
+github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad h1:fiWzISvDn0Csy5H0iwgAuJGQTUpVfEMJJd4nRFXogbc=
+github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
+github.com/streadway/amqp v1.0.0 h1:kuuDrUJFZL1QYL9hUNuCxNObNzB0bV/ZG5jV3RWAQgo=
+github.com/streadway/handy v0.0.0-20200128134331-0f66f006fb2e h1:mOtuXaRAbVZsxAHVdPR3IjfmN8T1h2iczJLynhLybf8=
+github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs=
+github.com/substrait-io/substrait-go v0.4.2 h1:buDnjsb3qAqTaNbOR7VKmNgXf4lYQxWEcnSGUWBtmN8=
+github.com/substrait-io/substrait-go v0.4.2/go.mod h1:qhpnLmrcvAnlZsUyPXZRqldiHapPTXC3t7xFgDi3aQg=
+github.com/tdewolff/minify/v2 v2.12.9 h1:dvn5MtmuQ/DFMwqf5j8QhEVpPX6fi3WGImhv8RUB4zA=
+github.com/tdewolff/minify/v2 v2.12.9/go.mod h1:qOqdlDfL+7v0/fyymB+OP497nIxJYSvX4MQWA8OoiXU=
+github.com/tdewolff/parse/v2 v2.6.8 h1:mhNZXYCx//xG7Yq2e/kVLNZw4YfYmeHbhx+Zc0OvFMA=
+github.com/tdewolff/parse/v2 v2.6.8/go.mod h1:XHDhaU6IBgsryfdnpzUXBlT6leW/l25yrFBTEb4eIyM=
+github.com/tidwall/gjson v1.14.2 h1:6BBkirS0rAHjumnjHF6qgy5d2YAJ1TLIaFE2lzfOLqo=
+github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
+github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
+github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
+github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
+github.com/tinylib/msgp v1.1.8 h1:FCXC1xanKO4I8plpHGH2P7koL/RzZs12l/+r7vakfm0=
+github.com/tinylib/msgp v1.1.8/go.mod h1:qkpG+2ldGg4xRFmx+jfTvZPxfGFhi64BcnL9vkCm/Tw=
+github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=
+github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI=
+github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms=
+github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4=
+github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926 h1:G3dpKMzFDjgEh2q1Z7zUUtKa8ViPtH+ocF0bE0g00O8=
+github.com/uber-go/atomic v1.4.0 h1:yOuPqEq4ovnhEjpHmfFwsqBXDYbQeT6Nb0bwD6XnD5o=
+github.com/uber-go/atomic v1.4.0/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g=
+github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
+github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
+github.com/valyala/fasthttp v1.6.0 h1:uWF8lgKmeaIewWVPwi4GRq2P6+R46IgYZdxWtM+GtEY=
+github.com/valyala/fasthttp v1.47.0 h1:y7moDoxYzMooFpT5aHgNgVOQDrS3qlkfiP9mDtGGK9c=
+github.com/valyala/fasthttp v1.47.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA=
+github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a h1:0R4NLDRDZX6JcmhJgXi5E4b8Wg84ihbmUKp/GvSPEzc=
+github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8=
+github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
+github.com/vinzenz/yaml v0.0.0-20170920082545-91409cdd725d h1:3wDi6J5APMqaHBVPuVd7RmHD2gRTfqbdcVSpCNoUWtk=
+github.com/vinzenz/yaml v0.0.0-20170920082545-91409cdd725d/go.mod h1:mb5taDqMnJiZNRQ3+02W2IFG+oEz1+dTuCXkp4jpkfo=
+github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU=
+github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
+github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
+github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
+github.com/weaveworks/common v0.0.0-20230511094633-334485600903 h1:ph7R2CS/0o1gBzpzK/CioUKJVsXNVXfDGR8FZ9rMZIw=
+github.com/weaveworks/common v0.0.0-20230511094633-334485600903/go.mod h1:rgbeLfJUtEr+G74cwFPR1k/4N0kDeaeSv/qhUNE4hm8=
+github.com/weaveworks/promrus v1.2.0 h1:jOLf6pe6/vss4qGHjXmGz4oDJQA+AOCqEL3FvvZGz7M=
+github.com/weaveworks/promrus v1.2.0/go.mod h1:SaE82+OJ91yqjrE1rsvBWVzNZKcHYFtMUyS1+Ogs/KA=
+github.com/willf/bitset v1.1.11 h1:N7Z7E9UvjW+sGsEl7k/SJrvY2reP1A07MrGuCjIOjRE=
+github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI=
+github.com/willf/bloom v2.0.3+incompatible h1:QDacWdqcAUI1MPOwIQZRy9kOR7yxfyEmxX8Wdm2/JPA=
+github.com/willf/bloom v2.0.3+incompatible/go.mod h1:MmAltL9pDMNTrvUkxdg0k0q5I0suxmuwp3KbyrZLOZ8=
+github.com/xanzy/go-gitlab v0.15.0 h1:rWtwKTgEnXyNUGrOArN7yyc3THRkpYcKXIXia9abywQ=
+github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
+github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY=
+github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8=
+github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk=
+github.com/xdg/stringprep v1.0.0 h1:d9X0esnoa3dFsV0FG35rAT0RIhYFlPq7MiP+DW89La0=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
+github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
+github.com/xhit/go-str2duration v1.2.0 h1:BcV5u025cITWxEQKGWr1URRzrcXtu7uk8+luz3Yuhwc=
+github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc=
+github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 h1:ESFSdwYZvkeru3RtdrYueztKhOBCSAAzS4Gf+k0tEow=
+github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0 h1:6fRhSjgLCkTD3JnJxvaJ4Sj+TYblw757bqYgZaOq5ZY=
+github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA=
+github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=
+github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
+github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
+github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b h1:FosyBZYxY34Wul7O/MSKey3txpPYyCqVO5ZyceuQJEI=
+github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8=
+github.com/zenazn/goji v1.0.1 h1:4lbD8Mx2h7IvloP7r2C0D6ltZP6Ufip8Hn0wmSK5LR8=
+github.com/zenazn/goji v1.0.1/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
+gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b h1:7gd+rd8P3bqcn/96gOZa3F5dpJr/vEiDQYlNb/y2uNs=
+go.opentelemetry.io/collector v0.74.0 h1:0s2DKWczGj/pLTsXGb1P+Je7dyuGx9Is4/Dri1+cS7g=
+go.opentelemetry.io/collector v0.74.0/go.mod h1:7NjZAvkhQ6E+NLN4EAH2hw3Nssi+F14t7mV7lMNXCto=
+go.opentelemetry.io/collector/component v0.74.0 h1:W32ILPgbA5LO+m9Se61hbbtiLM6FYusNM36K5/CCOi0=
+go.opentelemetry.io/collector/component v0.74.0/go.mod h1:zHbWqbdmnHeIZAuO3s1Fo/kWPC2oKuolIhlPmL4bzyo=
+go.opentelemetry.io/collector/confmap v0.74.0 h1:tl4fSHC/MXZiEvsZhDhd03TgzvArOe69Qn020sZsTfQ=
+go.opentelemetry.io/collector/confmap v0.74.0/go.mod h1:NvUhMS2v8rniLvDAnvGjYOt0qBohk6TIibb1NuyVB1Q=
+go.opentelemetry.io/collector/consumer v0.74.0 h1:+kjT/ixG+4SVSHg7u9mQe0+LNDc6PuG8Wn2hoL/yGYk=
+go.opentelemetry.io/collector/consumer v0.74.0/go.mod h1:MuGqt8/OKVAOjrh5WHr1TR2qwHizy64ZP2uNSr+XpvI=
+go.opentelemetry.io/collector/exporter v0.74.0 h1:VZxDuVz9kJM/Yten3xA/abJwLJNkxLThiao6E1ULW7c=
+go.opentelemetry.io/collector/exporter v0.74.0/go.mod h1:kw5YoorpKqEpZZ/a5ODSoYFK1mszzcKBNORd32S8Z7c=
+go.opentelemetry.io/collector/exporter/otlpexporter v0.74.0 h1:YKvTeYcBrJwbcXNy65fJ/xytUSMurpYn/KkJD0x+DAY=
+go.opentelemetry.io/collector/exporter/otlpexporter v0.74.0/go.mod h1:cRbvsnpSxzySoTSnXbOGPQZu9KHlEyKkTeE21f9Q1p4=
+go.opentelemetry.io/collector/featuregate v1.0.0 h1:5MGqe2v5zxaoo73BUOvUTunftX5J8RGrbFsC2Ha7N3g=
+go.opentelemetry.io/collector/receiver v0.74.0 h1:jlgBFa0iByvn8VuX27UxtqiPiZE8ejmU5lb1nSptWD8=
+go.opentelemetry.io/collector/receiver v0.74.0/go.mod h1:SQkyATvoZCJefNkI2jnrR63SOdrmDLYCnQqXJ7ACqn0=
+go.opentelemetry.io/collector/receiver/otlpreceiver v0.74.0 h1:e/X/W0z2Jtpy3Yd3CXkmEm9vSpKq/P3pKUrEVMUFBRw=
+go.opentelemetry.io/collector/receiver/otlpreceiver v0.74.0/go.mod h1:9X9/RYFxJIaK0JLlRZ0PpmQSSlYpY+r4KsTOj2jWj14=
+go.opentelemetry.io/collector/semconv v0.90.1 h1:2fkQZbefQBbIcNb9Rk1mRcWlFZgQOk7CpST1e1BK8eg=
+go.opentelemetry.io/contrib v0.18.0 h1:uqBh0brileIvG6luvBjdxzoFL8lxDGuhxJWsvK3BveI=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0/go.mod h1:5z+/ZWJQKXa9YT34fQNx5K8Hd1EoIhvtUygUQPqEOgQ=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ=
+go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.46.1/go.mod h1:GnOaBaFQ2we3b9AGWJpsBa7v1S5RlQzlC3O7dRMxZhM=
+go.opentelemetry.io/contrib/propagators/b3 v1.15.0 h1:bMaonPyFcAvZ4EVzkUNkfnUHP5Zi63CIDlA3dRsEg8Q=
+go.opentelemetry.io/contrib/propagators/b3 v1.15.0/go.mod h1:VjU0g2v6HSQ+NwfifambSLAeBgevjIcqmceaKWEzl0c=
+go.opentelemetry.io/contrib/samplers/jaegerremote v0.16.0/go.mod h1:StxwPndBVNZD2sZez0RQ0SP/129XGCd4aEmVGaw1/QM=
+go.opentelemetry.io/otel/bridge/opencensus v0.37.0 h1:ieH3gw7b1eg90ARsFAlAsX5LKVZgnCYfaDwRrK6xLHU=
+go.opentelemetry.io/otel/bridge/opencensus v0.37.0/go.mod h1:ddiK+1PE68l/Xk04BGTh9Y6WIcxcLrmcVxVlS0w5WZ0=
+go.opentelemetry.io/otel/bridge/opentracing v1.10.0 h1:WzAVGovpC1s7KD5g4taU6BWYZP3QGSDVTlbRu9fIHw8=
+go.opentelemetry.io/otel/bridge/opentracing v1.10.0/go.mod h1:J7GLR/uxxqMAzZptsH0pjte3Ep4GacTCrbGBoDuHBqk=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0/go.mod h1:0+KuTDyKL4gjKCF75pHOX4wuzYDUZYfAQdSu43o+Z2I=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 h1:digkEZCJWobwBqMwC0cwCq8/wkkRy/OowZg5OArWZrM=
+go.opentelemetry.io/otel/exporters/prometheus v0.37.0 h1:NQc0epfL0xItsmGgSXgfbH2C1fq2VLXkZoDFsfRNHpc=
+go.opentelemetry.io/otel/exporters/prometheus v0.37.0/go.mod h1:hB8qWjsStK36t50/R0V2ULFb4u95X/Q6zupXLgvjTh8=
+go.opentelemetry.io/otel/sdk v1.22.0/go.mod h1:iu7luyVGYovrRpe2fmj3CVKouQNdTOkxtLzPvPz1DOc=
+go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI=
+go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI=
+go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
+go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8=
+go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo=
+go.uber.org/mock v0.2.0 h1:TaP3xedm7JaAgScZO7tlvlKrqT0p7I6OsdGB5YNSMDU=
+go.uber.org/mock v0.2.0/go.mod h1:J0y0rp9L3xiff1+ZBfKxlC1fz2+aO16tw0tsDOixfuM=
+go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4=
+go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
+golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
+golang.org/x/image v0.0.0-20220302094943-723b81ca9867 h1:TcHcE0vrmgzNH1v3ppjcMGbhG5+9fMuvOmUYwNEF4q4=
+golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 h1:4+4C/Iv2U4fMZBiMCc98MG1In4gJY5YRhtpDNeDeHWs=
+golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
+golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
+golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
+golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
+gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0 h1:OE9mWmgKkjJyEmDAAtGMPjXu+YNeGvK9VTSHY6+Qihc=
+gonum.org/v1/plot v0.10.1 h1:dnifSs43YJuNMDzB7v8wV64O4ABBHReuAVAoBxqBqS4=
+google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3/go.mod h1:5RBcpGRxr25RbDzY5w+dmaqpSEvl8Gwl1x2CICf60ic=
+google.golang.org/genproto v0.0.0-20231212172506-995d672761c0/go.mod h1:l/k7rMz0vFTBPy+tFSGvXEd3z+BcoG1k7EHbqm+YBsY=
+google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac/go.mod h1:+Rvu7ElI+aLzyDQhpHMFMMltsD6m7nqpuWDd2CwJw3k=
+google.golang.org/genproto/googleapis/api v0.0.0-20231211222908-989df2bf70f3/go.mod h1:k2dtGpRrbsSyKcNPKKI5sstZkrNCZwpU/ns96JoHbGg=
+google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0/go.mod h1:CAny0tYF+0/9rmDB9fahA9YLzX3+AEVl1qXbv5hhj6c=
+google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917/go.mod h1:CmlNWB9lSezaYELKS5Ym1r44VrrbPUa7JTvw+6MbpJ0=
+google.golang.org/genproto/googleapis/api v0.0.0-20240116215550-a9fa1716bcac/go.mod h1:B5xPO//w8qmBDjGReYLpR6UJPnkldGkCSMoH/2vxJeg=
+google.golang.org/genproto/googleapis/bytestream v0.0.0-20231120223509-83a465c0220f h1:hL+1ptbhFoeL1HcROQ8OGXaqH0jYRRibgWQWco0/Ugc=
+google.golang.org/genproto/googleapis/bytestream v0.0.0-20231212172506-995d672761c0 h1:Y6QQt9D/syZt/Qgnz5a1y2O3WunQeeVDfS9+Xr82iFA=
+google.golang.org/genproto/googleapis/bytestream v0.0.0-20231212172506-995d672761c0/go.mod h1:guYXGPwC6jwxgWKW5Y405fKWOFNwlvUlUnzyp9i0uqo=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0/go.mod h1:FUoWkonphQm3RhTS+kOEhF8h0iDpm4tdXolVCeZ9KKA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917/go.mod h1:xtjpI3tXFPP051KaWnhvxkiubL/6dJ18vLVf7q2pTOU=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac/go.mod h1:daQN87bsDqDoe316QbbvX60nMoJQa4r6Ds0ZuoAe5yA=
+google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM=
+google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs=
+google.golang.org/grpc v1.61.1/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs=
+google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 h1:M1YKkFIboKNieVO5DLUEVzQfGwJD30Nv2jfUgzb5UcE=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
+gopkg.in/cheggaaa/pb.v1 v1.0.25 h1:Ev7yu1/f6+d+b3pi5vPdRPc6nNtP1umSfcWiEfRqv6I=
+gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8=
+gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
+gopkg.in/gcfg.v1 v1.2.3 h1:m8OOJ4ccYHnx2f4gQwpno8nAX5OGOh7RLaaz0pj3Ogs=
+gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM=
+gopkg.in/go-playground/validator.v8 v8.18.2 h1:lFB4DoMU6B626w8ny76MV7VX6W2VHct2GVOI3xgiMrQ=
+gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec h1:RlWgLqCMMIYYEVcAR5MDsuHlVkaIPDAF+5Dehzg8L5A=
+gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce h1:xcEWjVhvbDy+nHP67nPDDpbYrY+ILlfndk4bRioVHaU=
+gopkg.in/resty.v1 v1.12.0 h1:CuXP0Pjfw9rOuY6EP+UvtNvt5DSqHpIxILZKT/quCZI=
+gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI=
+gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
+gopkg.in/src-d/go-billy.v4 v4.3.2 h1:0SQA1pRztfTFx2miS8sA97XvooFeNOmvUenF4o0EcVg=
+gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98=
+gopkg.in/telebot.v3 v3.2.1 h1:3I4LohaAyJBiivGmkfB+CiVu7QFOWkuZ4+KHgO/G3rs=
+gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
+honnef.co/go/tools v0.1.3 h1:qTakTkI6ni6LFD5sBwwsdSO+AQqbSIxOauHTTQKZ/7o=
+k8s.io/api v0.29.0/go.mod h1:sdVmXoz2Bo/cb77Pxi71IPTSErEW32xa4aXwKH7gfBA=
+k8s.io/apiextensions-apiserver v0.26.2 h1:/yTG2B9jGY2Q70iGskMf41qTLhL9XeNN2KhI0uDgwko=
+k8s.io/apiextensions-apiserver v0.26.2/go.mod h1:Y7UPgch8nph8mGCuVk0SK83LnS8Esf3n6fUBgew8SH8=
+k8s.io/apimachinery v0.29.0/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis=
+k8s.io/apiserver v0.29.0/go.mod h1:31n78PsRKPmfpee7/l9NYEv67u6hOL6AfcE761HapDM=
+k8s.io/client-go v0.29.0/go.mod h1:yLkXH4HKMAywcrD82KMSmfYg2DlE8mepPR4JGSo5n38=
+k8s.io/component-base v0.0.0-20240417101527-62c04b35eff6 h1:WN8Lymy+dCTDHgn4vhUSNIB6U+0sDiv/c9Zdr0UeAnI=
+k8s.io/component-base v0.0.0-20240417101527-62c04b35eff6/go.mod h1:l0ukbPS0lwFxOzSq5ZqjutzF+5IL2TLp495PswRPSZk=
+k8s.io/component-base v0.29.0/go.mod h1:sADonFTQ9Zc9yFLghpDpmNXEdHyQmFIGbiuZbqAXQ1M=
+k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 h1:pWEwq4Asjm4vjW7vcsmijwBhOr1/shsbSYiWXmNGlks=
+k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
+k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8=
+k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
+k8s.io/kms v0.29.0/go.mod h1:mB0f9HLxRXeXUfHfn1A7rpwOlzXI1gIWu86z6buNoYA=
+k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
+k8s.io/kube-openapi v0.0.0-20231214164306-ab13479f8bf8/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
+nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g=
+rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE=
+rsc.io/pdf v0.1.1 h1:k1MczvYDUvJBe93bYd7wrZLLUEcLZAuF824/I4e5Xr4=
+rsc.io/quote/v3 v3.1.0 h1:9JKUTTIUgS6kzR9mK1YuGKv6Nl+DijDNIc0ghT58FaY=
+rsc.io/sampler v1.3.0 h1:7uVkIFmeBqHfdjD+gZwtXXI+RODJ2Wc4O7MPEh/QiW4=
+sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0 h1:ucqkfpjg9WzSUubAO62csmucvxl4/JeW3F4I4909XkM=
diff --git a/hack/README.md b/hack/README.md
new file mode 100644
index 0000000000000..5a8819a9db09b
--- /dev/null
+++ b/hack/README.md
@@ -0,0 +1,29 @@
+# Kubernetes HACK Alert
+
+This is a hack folder for kubernetes codegen scripts. Oddly, a /hack/ folder seems to be standard kubernetes development practice ¯\_(ツ)\_/¯
+
+The workflow is a WIP, however we are trying to leverage as many off-the-shelf patterns as possible.
+
+For these scripts to work, your local GOROOT/src/grafana/grafana must point to this git checkout. For my setup this is:
+
+```
+❯ pwd
+/Users/ryan/go/src/github.com/grafana
+❯ ls -l
+total 0
+lrwxr-xr-x  1 ryan  staff  37 Oct  5 09:34 grafana -> /Users/ryan/workspace/grafana/grafana
+```
+
+The current workflow is to run the following:
+
+```shell
+# ensure k8s.io/code-generator pkg is up to date
+go mod download
+
+# the happy path
+./hack/update-codegen.sh
+
+
+Note that the script deletes existing openapi go code and regenerates in place so that you will temporarily see
+deleted files in your `git status`. After a successful run, you should see them restored.
+```
diff --git a/hack/boilerplate.go.txt b/hack/boilerplate.go.txt
new file mode 100644
index 0000000000000..dd609cc5c9f07
--- /dev/null
+++ b/hack/boilerplate.go.txt
@@ -0,0 +1,2 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
diff --git a/hack/externalTools.go b/hack/externalTools.go
new file mode 100644
index 0000000000000..d4f5221e890d0
--- /dev/null
+++ b/hack/externalTools.go
@@ -0,0 +1,7 @@
+package hack
+
+import (
+	"k8s.io/code-generator/pkg/util"
+)
+
+var _ = util.CurrentPackage
diff --git a/hack/make-aggregator-pki.sh b/hack/make-aggregator-pki.sh
new file mode 100755
index 0000000000000..0eac9f2ae19ba
--- /dev/null
+++ b/hack/make-aggregator-pki.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+rm -rf data/grafana-aggregator
+
+mkdir -p data/grafana-aggregator
+
+openssl req -nodes -new -x509 -keyout data/grafana-aggregator/ca.key -out data/grafana-aggregator/ca.crt
+openssl req -out data/grafana-aggregator/client.csr -new -newkey rsa:4096 -nodes -keyout data/grafana-aggregator/client.key \
+  -subj "/CN=development/O=system:masters" \
+  -addext "extendedKeyUsage = clientAuth"
+openssl x509 -req -days 365 -in data/grafana-aggregator/client.csr -CA data/grafana-aggregator/ca.crt -CAkey data/grafana-aggregator/ca.key \
+  -set_serial 01 \
+  -sha256 -out data/grafana-aggregator/client.crt \
+  -copy_extensions=copyall
+
+openssl req -out data/grafana-aggregator/server.csr -new -newkey rsa:4096 -nodes -keyout data/grafana-aggregator/server.key \
+  -subj "/CN=localhost/O=aggregated" \
+  -addext "subjectAltName = DNS:v0alpha1.example.grafana.app.default.svc,DNS:localhost" \
+  -addext "extendedKeyUsage = serverAuth, clientAuth"
+openssl x509 -req -days 365 -in data/grafana-aggregator/server.csr -CA data/grafana-aggregator/ca.crt -CAkey data/grafana-aggregator/ca.key \
+  -set_serial 02 \
+  -sha256 -out data/grafana-aggregator/server.crt \
+  -copy_extensions=copyall
diff --git a/hack/openapi-codegen.sh b/hack/openapi-codegen.sh
new file mode 100644
index 0000000000000..070966375dcf1
--- /dev/null
+++ b/hack/openapi-codegen.sh
@@ -0,0 +1,174 @@
+# SPDX-License-Identifier: AGPL-3.0-only
+# Provenance-includes-location: https://github.com/kubernetes/code-generator/blob/master/kube_codegen.sh
+# Provenance-includes-license: Apache-2.0
+# Provenance-includes-copyright: The Kubernetes Authors.
+
+## NOTE: The following is a fork of the original gen_openapi helper in k8s.io/code-generator
+## It allows us to generate separate openapi packages per api group.
+
+# Generate openapi code
+#
+# Args:
+#
+#   --input-pkg-single <string>
+#     The root directory of a single grafana API Group.
+#
+#   --output-base <string>
+#     The root directory under which to emit code.  The concatenation of
+#     <output-base> + <input-pkg-single> must be valid.
+#
+#   --report-filename <string = "/dev/null">
+#     The filename of the API violations report in the input pkg directory.
+#
+#   --update-report
+#     If specified, update the report file in place, rather than diffing it.
+#
+#   --boilerplate <string = path_to_kube_codegen_boilerplate>
+#     An optional override for the header file to insert into generated files.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+KUBE_CODEGEN_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
+
+source "${CODEGEN_PKG}/kube_codegen.sh"
+#
+function grafana::codegen::gen_openapi() {
+    local in_pkg_single=""
+    local out_base=""
+    local report="/dev/null"
+    local update_report=""
+    local include_common_input_dirs=""
+    local boilerplate="${KUBE_CODEGEN_ROOT}/hack/boilerplate.go.txt"
+    local v="${KUBE_VERBOSE:-0}"
+
+    while [ "$#" -gt 0 ]; do
+        case "$1" in
+            "--input-pkg-single")
+                in_pkg_single="$2"
+                shift 2
+                ;;
+            "--include-common-input-dirs")
+                if [ "$2" == "true" ]; then
+                  COMMON_INPUT_DIRS='--input-dirs "k8s.io/apimachinery/pkg/apis/meta/v1" --input-dirs "k8s.io/apimachinery/pkg/runtime" --input-dirs "k8s.io/apimachinery/pkg/version"'
+                else
+                  COMMON_INPUT_DIRS=""
+                fi
+                shift 2
+                ;;
+            "--output-base")
+                out_base="$2"
+                shift 2
+                ;;
+            "--report-filename")
+                report="$2"
+                shift 2
+                ;;
+            "--update-report")
+                update_report="true"
+                shift
+                ;;
+            "--boilerplate")
+                boilerplate="$2"
+                shift 2
+                ;;
+            *)
+                echo "unknown argument: $1" >&2
+                return 1
+                ;;
+        esac
+    done
+
+    if [ -z "${in_pkg_single}" ]; then
+        echo "--input-pkg-single is required" >&2
+        return 1
+    fi
+
+    if [ -z "${report}" ]; then
+        echo "--report-filename is required" >&2
+        return 1
+    fi
+
+    if [ -z "${out_base}" ]; then
+        echo "--output-base is required" >&2
+        return 1
+    fi
+
+    (
+        # To support running this from anywhere, first cd into this directory,
+        # and then install with forced module mode on and fully qualified name.
+        cd "${KUBE_CODEGEN_ROOT}"
+        BINS=(
+            openapi-gen
+        )
+        # shellcheck disable=2046 # printf word-splitting is intentional
+        GO111MODULE=on go install $(printf "k8s.io/code-generator/cmd/%s " "${BINS[@]}")
+    )
+    # Go installs in $GOBIN if defined, and $GOPATH/bin otherwise
+    gobin="${GOBIN:-$(go env GOPATH)/bin}"
+
+    # These tools all assume out-dir == in-dir.
+    root="${out_base}/${in_pkg_single}"
+    mkdir -p "${root}"
+    root="$(cd "${root}" && pwd -P)"
+
+    local input_pkgs=()
+    while read -r dir; do
+        pkg="$(cd "${dir}" && GO111MODULE=on go list -find .)"
+        input_pkgs+=("${pkg}")
+    done < <(
+        ( kube::codegen::internal::git_grep -l --null \
+            -e '+k8s:openapi-gen=' \
+            ":(glob)${root}"/'**/*.go' \
+            || true \
+        ) | while read -r -d $'\0' F; do dirname "${F}"; done \
+          | LC_ALL=C sort -u
+    )
+
+
+   local new_report=""
+    if [ "${#input_pkgs[@]}" != 0 ]; then
+        echo "Generating openapi code for ${#input_pkgs[@]} targets"
+
+        kube::codegen::internal::git_find -z \
+           ":(glob)${root}"/'**/zz_generated.openapi.go' \
+           | xargs -0 rm -f
+
+        local inputs=()
+        for arg in "${input_pkgs[@]}"; do
+            inputs+=("--input-dirs" "$arg")
+        done
+
+        new_report="${root}/${report}.tmp"
+        if [ -n "${update_report}" ]; then
+            new_report="${root}/${report}"
+        fi
+
+        "${gobin}/openapi-gen" \
+            -v "${v}" \
+            -O zz_generated.openapi \
+            --go-header-file "${boilerplate}" \
+            --output-base "${out_base}" \
+            --output-package "${in_pkg_single}" \
+            --report-filename "${new_report}" \
+            ${COMMON_INPUT_DIRS}  \
+            "${inputs[@]}"
+    fi
+
+    touch "${root}/${report}" # in case it doesn't exist yet
+    if [[ -z "${new_report}" ]]; then
+        return 0
+    fi
+    if ! diff -u "${root}/${report}" "${new_report}"; then
+        echo -e "ERROR:"
+        echo -e "\tAPI rule check failed for ${root}/${report}: new reported violations"
+        echo -e "\tPlease read api/api-rules/README.md"
+        return 1
+    fi
+
+    # if all goes well, remove the temporary reports
+    if [ -z "${update_report}" ]; then
+      rm -f "${new_report}"
+    fi
+}
diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
new file mode 100755
index 0000000000000..bb6e20502cbb0
--- /dev/null
+++ b/hack/update-codegen.sh
@@ -0,0 +1,87 @@
+#!/usr/bin/env bash
+
+# SPDX-License-Identifier: AGPL-3.0-only
+# Provenance-includes-location: https://github.com/kubernetes/sample-apiserver/blob/master/hack/update-codegen.sh
+# Provenance-includes-license: Apache-2.0
+# Provenance-includes-copyright: The Kubernetes Authors.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
+CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo $(go env GOPATH)/pkg/mod/k8s.io/code-generator@v0.29.1)}
+
+OUTDIR="${HOME}/go/src"
+OPENAPI_VIOLATION_EXCEPTIONS_FILENAME="zz_generated.openapi_violation_exceptions.list"
+
+source "${CODEGEN_PKG}/kube_codegen.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/openapi-codegen.sh"
+
+selected_pkg="${1-}"
+
+grafana::codegen:run() {
+  local generate_root=$1
+  local skipped="true"
+  for api_pkg in $(grafana:codegen:lsdirs ./${generate_root}/apis); do
+    if [[ "${selected_pkg}" != "" && ${api_pkg} != $selected_pkg ]]; then
+      continue
+    fi
+    echo "Generating code for ${generate_root}/apis/${api_pkg}..."
+    echo "============================================="
+    skipped="false"
+    include_common_input_dirs=$([[ ${api_pkg} == "common" ]] && echo "true" || echo "false")
+
+    kube::codegen::gen_helpers \
+      --input-pkg-root github.com/grafana/grafana/${generate_root}/apis/${api_pkg} \
+      --output-base "${OUTDIR}" \
+      --boilerplate "${SCRIPT_ROOT}/hack/boilerplate.go.txt"
+
+    for pkg_version in $(grafana:codegen:lsdirs ./${generate_root}/apis/${api_pkg}); do
+      grafana::codegen::gen_openapi \
+        --input-pkg-single github.com/grafana/grafana/${generate_root}/apis/${api_pkg}/${pkg_version} \
+        --output-base "${OUTDIR}" \
+        --report-filename "${OPENAPI_VIOLATION_EXCEPTIONS_FILENAME}" \
+        --update-report \
+        --boilerplate "${SCRIPT_ROOT}/hack/boilerplate.go.txt" \
+        --include-common-input-dirs ${include_common_input_dirs}
+
+      violations_file="${OUTDIR}/github.com/grafana/grafana/${generate_root}/apis/${api_pkg}/${pkg_version}/${OPENAPI_VIOLATION_EXCEPTIONS_FILENAME}"
+      # delete violation exceptions file, if empty
+      if ! grep -q . "${violations_file}"; then
+          echo "Deleting ${violations_file} since it is empty"
+          rm ${violations_file}
+      fi
+
+      echo ""
+    done
+  done
+
+  if [[ "${skipped}" == "true" ]]; then
+    echo "no apis matching ${selected_pkg}. skipping..."
+    echo
+    return 0
+  fi
+
+  echo "Generating client code..."
+  echo "-------------------------"
+
+  kube::codegen::gen_client \
+      --with-watch \
+      --with-applyconfig \
+      --input-pkg-root github.com/grafana/grafana/${generate_root}/apis \
+      --output-pkg-root github.com/grafana/grafana/${generate_root}/generated \
+      --output-base "${OUTDIR}" \
+      --boilerplate "${SCRIPT_ROOT}/hack/boilerplate.go.txt"
+
+  echo ""
+}
+
+grafana:codegen:lsdirs() {
+  ls -d $1/*/ | xargs basename -a
+}
+
+grafana::codegen:run pkg
+grafana::codegen:run pkg/apimachinery
+
+echo "done."
diff --git a/jest.config.js b/jest.config.js
index 3370925ec1db8..4ed043f73de93 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -3,7 +3,24 @@
 // 2. Any wrong timezone handling could be hidden if we use UTC/GMT local time (which would happen in CI).
 process.env.TZ = 'Pacific/Easter'; // UTC-06:00 or UTC-05:00 depending on daylight savings
 
-const esModules = ['ol', 'd3', 'd3-color', 'd3-interpolate', 'delaunator', 'internmap', 'robust-predicates'].join('|');
+const esModules = [
+  '@glideapps/glide-data-grid',
+  'ol',
+  'd3',
+  'd3-color',
+  'd3-interpolate',
+  'delaunator',
+  'internmap',
+  'robust-predicates',
+  'leven',
+  'nanoid',
+  'monaco-promql',
+  '@kusto/monaco-kusto',
+  'monaco-editor',
+  'lodash-es',
+  '@msagl',
+  'vscode-languageserver-types',
+].join('|');
 
 module.exports = {
   verbose: false,
@@ -14,8 +31,8 @@ module.exports = {
   transformIgnorePatterns: [
     `/node_modules/(?!${esModules})`, // exclude es modules to prevent TS complaining
   ],
-  moduleDirectories: ['public'],
-  roots: ['<rootDir>/public/app', '<rootDir>/public/test', '<rootDir>/packages'],
+  moduleDirectories: ['public', 'node_modules'],
+  roots: ['<rootDir>/public/app', '<rootDir>/public/test', '<rootDir>/packages', '<rootDir>/scripts/tests'],
   testRegex: '(\\.|/)(test)\\.(jsx?|tsx?)$',
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json'],
   setupFiles: ['jest-canvas-mock', './public/test/jest-setup.ts'],
@@ -29,7 +46,9 @@ module.exports = {
     '\\.svg': '<rootDir>/public/test/mocks/svg.ts',
     '\\.css': '<rootDir>/public/test/mocks/style.ts',
     'react-inlinesvg': '<rootDir>/public/test/mocks/react-inlinesvg.tsx',
-    'monaco-editor/esm/vs/editor/editor.api': '<rootDir>/public/test/mocks/monaco.ts',
+    // resolve directly as monaco and kusto don't have main property in package.json which jest needs
+    '^monaco-editor$': 'monaco-editor/esm/vs/editor/editor.api.js',
+    '@kusto/monaco-kusto': '@kusto/monaco-kusto/release/esm/monaco.contribution.js',
     // near-membrane-dom won't work in a nodejs environment.
     '@locker/near-membrane-dom': '<rootDir>/public/test/mocks/nearMembraneDom.ts',
     '^@grafana/schema/dist/esm/(.*)$': '<rootDir>/packages/grafana-schema/src/$1',
@@ -38,4 +57,5 @@ module.exports = {
   },
   // Log the test results with dynamic Loki tags. Drone CI only
   reporters: ['default', ['<rootDir>/public/test/log-reporter.js', { enable: process.env.DRONE === 'true' }]],
+  watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-typeahead/testname'],
 };
diff --git a/kinds/constraint.cue b/kinds/constraint.cue
deleted file mode 100644
index 2bc9f6c16c901..0000000000000
--- a/kinds/constraint.cue
+++ /dev/null
@@ -1,7 +0,0 @@
-package kind
-
-import "github.com/grafana/kindsys"
-
-// In each child directory, the set of .cue files with 'package kind'
-// must be an instance of kindsys.Core - a declaration of a core kind.
-kindsys.Core
diff --git a/kinds/dashboard/dashboard_kind.cue b/kinds/dashboard/dashboard_kind.cue
index 1fb8337316605..b366e2c96ff14 100644
--- a/kinds/dashboard/dashboard_kind.cue
+++ b/kinds/dashboard/dashboard_kind.cue
@@ -56,16 +56,7 @@ lineage: schemas: [{
 			}
 
 			// Configuration of the time picker shown at the top of a dashboard.
-			timepicker?: {
-				// Whether timepicker is visible or not.
-				hidden: bool | *false
-				// Interval options available in the refresh picker dropdown.
-				refresh_intervals: [...string] | *["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
-				// Whether timepicker is collapsed or not. Has no effect on provisioned dashboard.
-				collapse: bool | *false
-				// Selectable options available in the time picker dropdown. Has no effect on provisioned dashboard.
-				time_options: [...string] | *["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
-			}
+			timepicker?: #TimePickerConfig
 
 			// The month that the fiscal year starts on.  0 = January, 11 = December
 			fiscalYearStartMonth?: uint8 & <12 | *0
@@ -79,7 +70,7 @@ lineage: schemas: [{
 			weekStart?: string
 
 			// Refresh rate of dashboard. Represented via interval string, e.g. "5s", "1m", "1h", "1d".
-			refresh?: string | false
+			refresh?: string
 
 			// Version of the JSON schema, incremented each time a Grafana update brings
 			// changes to said schema.
@@ -89,7 +80,7 @@ lineage: schemas: [{
 			version?: uint32
 
 			// List of dashboard panels
-			panels?: [...(#Panel | #RowPanel | #GraphPanel | #HeatmapPanel)]
+			panels?: [...(#Panel | #RowPanel)]
 
 			// Configured template variables
 			templating?: {
@@ -208,9 +199,17 @@ lineage: schemas: [{
 			multi?: bool | *false
 			// Options that can be selected for a variable.
 			options?: [...#VariableOption]
+			// Options to config when to refresh a variable
 			refresh?: #VariableRefresh
 			// Options sort order
 			sort?: #VariableSort
+			// Whether all value option is available or not
+			includeAll?: bool | *false
+			// Custom all value
+			allValue?: string
+			// Optional field, if you want to extract part of a series name or metric node segment.
+			// Named capture groups can be used to separate the display text and value.
+			regex?: string
 			...
 		} @cuetsy(kind="interface") @grafana(TSVeneer="type") @grafanamaturity(NeedsExpertReview)
 
@@ -243,7 +242,9 @@ lineage: schemas: [{
 		// `4`: Numerical DESC
 		// `5`: Alphabetical Case Insensitive ASC
 		// `6`: Alphabetical Case Insensitive DESC
-		#VariableSort: 0 | 1 | 2 | 3 | 4 | 5 | 6 @cuetsy(kind="enum",memberNames="disabled|alphabeticalAsc|alphabeticalDesc|numericalAsc|numericalDesc|alphabeticalCaseInsensitiveAsc|alphabeticalCaseInsensitiveDesc")
+		// `7`: Natural ASC
+		// `8`: Natural DESC
+		#VariableSort: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 @cuetsy(kind="enum",memberNames="disabled|alphabeticalAsc|alphabeticalDesc|numericalAsc|numericalDesc|alphabeticalCaseInsensitiveAsc|alphabeticalCaseInsensitiveDesc|naturalAsc|naturalDesc")
 
 		// Ref to a DataSource instance
 		#DataSourceRef: {
@@ -265,7 +266,7 @@ lineage: schemas: [{
 			// Tooltip to display when the user hovers their mouse over it
 			tooltip: string
 			// Link URL. Only required/valid if the type is link
-			url: string
+			url?: string
 			// List of tags to limit the linked dashboards. If empty, all dashboards will be displayed. Only valid if the type is dashboards
 			tags: [...string]
 			// If true, all dashboards links will be displayed in a dropdown. If false, all dashboards links will be displayed side by side. Only valid if the type is dashboards
@@ -290,7 +291,7 @@ lineage: schemas: [{
 		// `textbox`: Display a free text input field with an optional default value.
 		// `custom`: Define the variable options manually using a comma-separated list.
 		// `system`: Variables defined by Grafana. See: https://grafana.com/docs/grafana/latest/dashboards/variables/add-template-variables/#global-variables
-		#VariableType: "query" | "adhoc" | "constant" | "datasource" | "interval" | "textbox" | "custom" | "system" @cuetsy(kind="type") @grafanamaturity(NeedsExpertReview)
+		#VariableType: "query" | "adhoc" | "groupby" | "constant" | "datasource" | "interval" | "textbox" | "custom" | "system" @cuetsy(kind="type") @grafanamaturity(NeedsExpertReview)
 
 		// Color mode for a field. You can specify a single color, or select a continuous (gradient) color schemes, based on a value.
 		// Continuous color interpolates a color using the percentage of a value relative to min and max.
@@ -445,11 +446,26 @@ lineage: schemas: [{
 			disabled?: bool
 			// Optional frame matcher. When missing it will be applied to all results
 			filter?: #MatcherConfig
+			// Where to pull DataFrames from as input to transformation
+			topic?: "series" | "annotations" | "alertStates" // replaced with common.DataTopic
 			// Options to be passed to the transformer
 			// Valid options depend on the transformer id
 			options: _
 		} @cuetsy(kind="interface") @grafana(TSVeneer="type")
 
+		// Time picker configuration
+		// It defines the default config for the time picker and the refresh picker for the specific dashboard.
+		#TimePickerConfig: {
+			// Whether timepicker is visible or not.
+			hidden?: bool | *false
+			// Interval options available in the refresh picker dropdown.
+			refresh_intervals?: [...string] | *["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
+			// Selectable options available in the time picker dropdown. Has no effect on provisioned dashboard.
+			time_options?: [...string] | *["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
+			// Override the now time by entering a time delay. Use this option to accommodate known delays in data aggregation to avoid null values.
+			nowDelay?: string
+		} @cuetsy(kind="interface") @grafana(TSVeneer="type")
+
 		// 0 for no shared crosshair or tooltip (default).
 		// 1 for shared crosshair.
 		// 2 for shared crosshair AND shared tooltip.
@@ -478,6 +494,8 @@ lineage: schemas: [{
 			external: bool @grafanamaturity(NeedsExpertReview)
 			// external url, if snapshot was shared in external grafana instance
 			externalUrl: string @grafanamaturity(NeedsExpertReview)
+			// original url, url of the dashboard that was snapshotted
+			originalUrl: string @grafanamaturity(NeedsExpertReview)
 			// Unique identifier of the snapshot
 			id: uint32 @grafanamaturity(NeedsExpertReview)
 			// Optional, defined the unique key of the snapshot, required if external is true
@@ -505,9 +523,6 @@ lineage: schemas: [{
 			// The version of the plugin that is used for this panel. This is used to find the plugin to display the panel and to migrate old panel configs.
 			pluginVersion?: string
 
-			// Tags for the panel.
-			tags?: [...string]
-
 			// Depends on the panel plugin. See the plugin documentation for details.
 			targets?: [...#Target]
 
@@ -576,6 +591,12 @@ lineage: schemas: [{
 			// Dynamically load the panel
 			libraryPanel?: #LibraryPanelRef
 
+			// Sets panel queries cache timeout. 
+			cacheTimeout?: string
+
+			// Overrides the data source configured time-to-live for a query cache item in milliseconds
+			queryCachingTTL?: number
+
 			// It depends on the panel plugin. They are specified by the Options field in panel plugin schemas.
 			options?: {...} @grafanamaturity(NeedsExpertReview)
 
@@ -711,31 +732,11 @@ lineage: schemas: [{
 			id: uint32
 
 			// List of panels in the row
-			panels: [...(#Panel | #GraphPanel | #HeatmapPanel)]
+			panels: [...#Panel]
 
 			// Name of template variable to repeat for.
 			repeat?: string
 		} @cuetsy(kind="interface") @grafana(TSVeneer="type")
-
-		// Support for legacy graph panel.
-		// @deprecated this a deprecated panel type
-		#GraphPanel: {
-			type: "graph"
-			// @deprecated this is part of deprecated graph panel
-			legend?: {
-				show:      bool | *true
-				sort?:     string
-				sortDesc?: bool
-			}
-			...
-		} @cuetsy(kind="interface")
-
-		// Support for legacy heatmap panel.
-		// @deprecated this a deprecated panel type
-		#HeatmapPanel: {
-			type: "heatmap"
-			...
-		} @cuetsy(kind="interface")
 	}
 },
 ]
diff --git a/kinds/folder/folder_kind.cue b/kinds/folder/folder_kind.cue
deleted file mode 100644
index 06e291f930ba7..0000000000000
--- a/kinds/folder/folder_kind.cue
+++ /dev/null
@@ -1,25 +0,0 @@
-package kind
-
-name:        "Folder"
-maturity:    "merged"
-description: "A folder is a collection of resources that are grouped together and can share permissions."
-
-lineage: schemas: [{
-	version: [0, 0]
-	schema: {
-		spec: {
-			// Unique folder id. (will be k8s name)
-			uid: string
-
-			// Folder title
-			title: string
-
-			// Description of the folder.
-			description?: string
-		} @cuetsy(kind="interface")
-		//
-		// TODO:
-		// common metadata will soon support setting the parent folder in the metadata
-		//
-	}
-}]
diff --git a/kinds/gen.go b/kinds/gen.go
index 00225af2b3140..f0a1441cded0b 100644
--- a/kinds/gen.go
+++ b/kinds/gen.go
@@ -15,44 +15,49 @@ import (
 	"sort"
 	"strings"
 
-	"cuelang.org/go/cue/errors"
+	"cuelang.org/go/cue"
+	"cuelang.org/go/cue/cuecontext"
+	"cuelang.org/go/cue/load"
 	"github.com/grafana/codejen"
 	"github.com/grafana/cuetsy"
-	"github.com/grafana/kindsys"
-
 	"github.com/grafana/grafana/pkg/codegen"
-	"github.com/grafana/grafana/pkg/cuectx"
 )
 
+// CoreDefParentPath is the path, relative to the repository root, where
+// each child directory is expected to contain .cue files defining one
+// Core kind.
+var CoreDefParentPath = "kinds"
+
+// TSCoreKindParentPath is the path, relative to the repository root, to the directory that
+// contains one directory per kind, full of generated TS kind output: types and default consts.
+var TSCoreKindParentPath = filepath.Join("packages", "grafana-schema", "src", "raw")
+
 func main() {
 	if len(os.Args) > 1 {
-		fmt.Fprintf(os.Stderr, "plugin thema code generator does not currently accept any arguments\n, got %q", os.Args)
+		fmt.Fprintf(os.Stderr, "code generator does not currently accept any arguments\n, got %q", os.Args)
 		os.Exit(1)
 	}
 
 	// Core kinds composite code generator. Produces all generated code in
 	// grafana/grafana that derives from core kinds.
-	coreKindsGen := codejen.JennyListWithNamer(func(def kindsys.Kind) string {
-		return def.Props().Common().MachineName
+	coreKindsGen := codejen.JennyListWithNamer(func(def codegen.SchemaForGen) string {
+		return def.Name
 	})
 
 	// All the jennies that comprise the core kinds generator pipeline
 	coreKindsGen.Append(
-		&codegen.ResourceGoTypesJenny{},
-		&codegen.SubresourceGoTypesJenny{},
-		codegen.CoreKindJenny(cuectx.GoCoreKindParentPath, nil),
-		codegen.BaseCoreRegistryJenny(filepath.Join("pkg", "registry", "corekind"), cuectx.GoCoreKindParentPath),
-		codegen.LatestMajorsOrXJenny(
-			cuectx.TSCoreKindParentPath,
-			true, // forcing group so that we ignore the top level resource (for now)
-			codegen.TSResourceJenny{}),
+		&codegen.GoSpecJenny{},
+		&codegen.K8ResourcesJenny{},
+		&codegen.CoreRegistryJenny{},
+		codegen.LatestMajorsOrXJenny(TSCoreKindParentPath),
 		codegen.TSVeneerIndexJenny(filepath.Join("packages", "grafana-schema", "src")),
-		codegen.DocsJenny(filepath.Join("docs", "sources", "developers", "kinds", "core")),
 	)
 
 	header := codegen.SlashHeaderMapper("kinds/gen.go")
 	coreKindsGen.AddPostprocessors(header)
 
+	ctx := cuecontext.New()
+
 	cwd, err := os.Getwd()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "could not get working directory: %s", err)
@@ -60,29 +65,15 @@ func main() {
 	}
 	groot := filepath.Dir(cwd)
 
-	rt := cuectx.GrafanaThemaRuntime()
-	var all []kindsys.Kind
-
-	f := os.DirFS(filepath.Join(groot, cuectx.CoreDefParentPath))
+	f := os.DirFS(filepath.Join(groot, CoreDefParentPath))
 	kinddirs := elsedie(fs.ReadDir(f, "."))("error reading core kind fs root directory")
-	for _, kinddir := range kinddirs {
-		if !kinddir.IsDir() {
-			continue
-		}
-		rel := filepath.Join(cuectx.CoreDefParentPath, kinddir.Name())
-		def, err := cuectx.LoadCoreKindDef(rel, rt.Context(), nil)
-		if err != nil {
-			die(fmt.Errorf("%s is not a valid kind: %s", rel, errors.Details(err, nil)))
-		}
-		if def.Properties.MachineName != kinddir.Name() {
-			die(fmt.Errorf("%s: kind's machine name (%s) must equal parent dir name (%s)", rel, def.Properties.Name, kinddir.Name()))
-		}
-
-		all = append(all, elsedie(kindsys.BindCore(rt, def))(rel))
+	all, err := loadCueFiles(ctx, kinddirs)
+	if err != nil {
+		die(err)
 	}
 
 	sort.Slice(all, func(i, j int) bool {
-		return nameFor(all[i].Props()) < nameFor(all[j].Props())
+		return all[i].Name < all[j].Name
 	})
 
 	jfs, err := coreKindsGen.GenerateFS(all...)
@@ -90,7 +81,7 @@ func main() {
 		die(fmt.Errorf("core kinddirs codegen failed: %w", err))
 	}
 
-	commfsys := elsedie(genCommon(filepath.Join(groot, "pkg", "kindsys")))("common schemas failed")
+	commfsys := elsedie(genCommon(ctx, groot))("common schemas failed")
 	commfsys = elsedie(commfsys.Map(header))("failed gen header on common fsys")
 	if err = jfs.Merge(commfsys); err != nil {
 		die(err)
@@ -105,43 +96,28 @@ func main() {
 	}
 }
 
-func nameFor(m kindsys.SomeKindProperties) string {
-	switch x := m.(type) {
-	case kindsys.CoreProperties:
-		return x.Name
-	case kindsys.CustomProperties:
-		return x.Name
-	case kindsys.ComposableProperties:
-		return x.Name
-	default:
-		// unreachable so long as all the possibilities in KindProperties have switch branches
-		panic("unreachable")
-	}
-}
-
 type dummyCommonJenny struct{}
 
-func genCommon(kp string) (*codejen.FS, error) {
+func genCommon(ctx *cue.Context, groot string) (*codejen.FS, error) {
 	fsys := codejen.NewFS()
-
-	// kp := filepath.Join("pkg", "kindsys")
 	path := filepath.Join("packages", "grafana-schema", "src", "common")
-	// Grab all the common_* files from kindsys and load them in
-	dfsys := os.DirFS(kp)
-	matches := elsedie(fs.Glob(dfsys, "common_*.cue"))("could not glob kindsys cue files")
-	for _, fname := range matches {
-		fpath := filepath.Join(path, strings.TrimPrefix(fname, "common_"))
-		fpath = fpath[:len(fpath)-4] + "_gen.cue"
-		data := elsedie(fs.ReadFile(dfsys, fname))("error reading " + fname)
-		_ = fsys.Add(*codejen.NewFile(fpath, data, dummyCommonJenny{}))
-	}
 	fsys = elsedie(fsys.Map(packageMapper))("failed remapping fs")
 
-	v, err := cuectx.BuildGrafanaInstance(nil, path, "", nil)
-	if err != nil {
-		return nil, err
+	commonFiles := make([]string, 0)
+	filepath.WalkDir(filepath.Join(groot, path), func(path string, d fs.DirEntry, err error) error {
+		if d.IsDir() || filepath.Ext(d.Name()) != ".cue" {
+			return nil
+		}
+		commonFiles = append(commonFiles, path)
+		return nil
+	})
+
+	instance := load.Instances(commonFiles, &load.Config{})[0]
+	if instance.Err != nil {
+		return nil, instance.Err
 	}
 
+	v := ctx.BuildInstance(instance)
 	b := elsedie(cuetsy.Generate(v, cuetsy.Config{
 		Export: true,
 	}))("failed to generate common schema TS")
@@ -182,3 +158,55 @@ func die(err error) {
 	fmt.Fprint(os.Stderr, err, "\n")
 	os.Exit(1)
 }
+
+func loadCueFiles(ctx *cue.Context, dirs []os.DirEntry) ([]codegen.SchemaForGen, error) {
+	values := make([]codegen.SchemaForGen, 0)
+	for _, dir := range dirs {
+		if !dir.IsDir() {
+			continue
+		}
+
+		entries, err := os.ReadDir(dir.Name())
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "error opening %s directory: %s", dir, err)
+			os.Exit(1)
+		}
+
+		// It's assuming that we only have one file in each folder
+		entry := filepath.Join(dir.Name(), entries[0].Name())
+		cueFile, err := os.ReadFile(entry)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "unable to open %s/%s file: %s", dir, entries[0].Name(), err)
+			os.Exit(1)
+		}
+
+		v := ctx.CompileBytes(cueFile)
+		name, err := getSchemaName(v)
+		if err != nil {
+			return nil, err
+		}
+
+		sch := codegen.SchemaForGen{
+			Name:       name,
+			FilePath:   "./" + filepath.Join(CoreDefParentPath, entry),
+			CueFile:    v,
+			IsGroup:    false,
+			OutputName: strings.ToLower(name),
+		}
+
+		values = append(values, sch)
+	}
+
+	return values, nil
+}
+
+func getSchemaName(v cue.Value) (string, error) {
+	namePath := v.LookupPath(cue.ParsePath("name"))
+	name, err := namePath.String()
+	if err != nil {
+		return "", fmt.Errorf("file doesn't have name field set: %s", err)
+	}
+
+	name = strings.Replace(name, "-", "_", -1)
+	return name, nil
+}
diff --git a/kinds/preferences/preferences_kind.cue b/kinds/preferences/preferences_kind.cue
index b6f189178c21c..0eddc16cbef49 100644
--- a/kinds/preferences/preferences_kind.cue
+++ b/kinds/preferences/preferences_kind.cue
@@ -8,6 +8,8 @@ description: "The user or team frontend preferences"
 lineage: schemas: [{
 	version: [0, 0]
 	schema: {
+		// Spec defines user, team or org Grafana preferences
+		// swagger:model Preferences
 		spec: {
 			// UID for the home dashboard
 			homeDashboardUID?: string
diff --git a/latest.json b/latest.json
index def63753f6392..8186768eabb82 100644
--- a/latest.json
+++ b/latest.json
@@ -1,4 +1,5 @@
 {
-  "stable": "10.2.0",
-  "testing": "10.2.0"
+  "__message": "This file is now deprecated, and will be removed in a future release. No further updates should be made to this file",
+  "stable": "10.2.3",
+  "testing": "10.2.3"
 }
diff --git a/lefthook.yml b/lefthook.yml
index 1eabdd84da5d0..9c3bed5f53846 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -12,7 +12,8 @@ pre-commit:
   commands:
     frontend-betterer:
       glob: '*.{ts,tsx}'
-      run: yarn betterer precommit {staged_files}
+      run: |
+        yarn betterer precommit {staged_files}
       stage_fixed: true
 
     frontend-lint:
diff --git a/lerna.json b/lerna.json
index 5f419bdcc36bd..44473253da9c3 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,5 @@
 {
+  "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "npmClient": "yarn",
-  "useWorkspaces": true,
-  "packages": ["packages/*"],
-  "version": "10.3.0-pre"
+  "version": "11.0.0"
 }
diff --git a/nx.json b/nx.json
new file mode 100644
index 0000000000000..3ec7fc7711f56
--- /dev/null
+++ b/nx.json
@@ -0,0 +1,16 @@
+{
+  "tasksRunnerOptions": {
+    "default": {
+      "runner": "nx/tasks-runners/default",
+      "options": {
+        "cacheableOperations": ["build"]
+      }
+    }
+  },
+  "targetDefaults": {
+    "build": {
+      "outputs": ["{projectRoot}/dist"]
+    }
+  },
+  "defaultBase": "main"
+}
diff --git a/package.json b/package.json
index 09fddea7e4766..54bdf49ae1cc1 100644
--- a/package.json
+++ b/package.json
@@ -3,20 +3,23 @@
   "license": "AGPL-3.0-only",
   "private": true,
   "name": "grafana",
-  "version": "10.3.0-pre",
+  "version": "11.0.0",
   "repository": "github:grafana/grafana",
   "scripts": {
-    "prebuild": "yarn i18n:compile && yarn plugin:build",
-    "build": "yarn prebuild & NODE_ENV=production webpack --progress --config scripts/webpack/webpack.prod.js",
-    "build:nominify": "yarn run build --env noMinify=1",
-    "dev": "yarn prebuild & NODE_ENV=dev webpack --progress --color --config scripts/webpack/webpack.dev.js",
+    "build": "NODE_ENV=production nx exec --verbose -- webpack --config scripts/webpack/webpack.prod.js",
+    "build:nominify": "yarn run build -- --env noMinify=1",
+    "dev": "NODE_ENV=dev nx exec -- webpack --config scripts/webpack/webpack.dev.js",
     "e2e": "./e2e/start-and-run-suite",
+    "e2e:scenes": "./e2e/start-and-run-suite scenes",
     "e2e:debug": "./e2e/start-and-run-suite debug",
     "e2e:dev": "./e2e/start-and-run-suite dev",
     "e2e:benchmark:live": "./e2e/start-and-run-suite benchmark live",
     "e2e:enterprise": "./e2e/start-and-run-suite enterprise",
     "e2e:enterprise:dev": "./e2e/start-and-run-suite enterprise dev",
     "e2e:enterprise:debug": "./e2e/start-and-run-suite enterprise debug",
+    "e2e:playwright": "yarn playwright test",
+    "e2e:playwright:ui": "yarn playwright test --ui",
+    "e2e:playwright:report": "yarn playwright show-report",
     "test": "jest --notify --watch",
     "test:coverage": "jest --coverage",
     "test:coverage:changes": "jest --coverage --changedSince=origin/main",
@@ -24,23 +27,23 @@
     "lint": "yarn run lint:ts && yarn run lint:sass",
     "lint:ts": "eslint . --ext .js,.tsx,.ts --cache",
     "lint:sass": "yarn stylelint '{public/sass,packages}/**/*.scss' --cache",
-    "test:ci": "yarn i18n:compile && mkdir -p reports/junit && JEST_JUNIT_OUTPUT_DIR=reports/junit jest --ci --reporters=default --reporters=jest-junit -w ${TEST_MAX_WORKERS:-100%}",
+    "test:ci": "mkdir -p reports/junit && JEST_JUNIT_OUTPUT_DIR=reports/junit jest --ci --reporters=default --reporters=jest-junit -w ${TEST_MAX_WORKERS:-100%}",
     "lint:fix": "yarn lint:ts --fix",
-    "packages:build": "lerna run build --ignore '@grafana-plugins/*'",
+    "packages:build": "nx run-many -t build --projects='@grafana/*'",
     "packages:clean": "rimraf ./npm-artifacts && lerna run clean --parallel",
     "packages:prepare": "lerna version --no-push --no-git-tag-version --force-publish --exact",
     "packages:pack": "mkdir -p ./npm-artifacts && lerna exec --no-private -- yarn pack --out \"../../npm-artifacts/%s-%v.tgz\"",
-    "packages:typecheck": "lerna run typecheck",
-    "prettier:check": "prettier --check --list-different=false --log-level=warn \"**/*.{ts,tsx,scss,md,mdx}\"",
-    "prettier:checkDocs": "prettier --check --list-different=false --log-level=warn \"docs/**/*.md\" \"*.md\" \"packages/**/*.{ts,tsx,scss,md,mdx}\"",
-    "prettier:write": "prettier --list-different \"**/*.{js,ts,tsx,scss,md,mdx}\" --write",
-    "start": "yarn themes:generate && yarn dev --watch",
-    "start:noTsCheck": "yarn start --env noTsCheck=1",
-    "start:noLint": "yarn start --env noTsCheck=1 --env noLint=1",
+    "packages:typecheck": "nx run-many -t typecheck --projects='@grafana/*'",
+    "prettier:check": "prettier --check --list-different=false --log-level=warn \"**/*.{ts,tsx,scss,md,mdx,json}\"",
+    "prettier:checkDocs": "prettier --check --list-different=false --log-level=warn \"docs/**/*.md\" \"*.md\" \"packages/**/*.{ts,tsx,scss,md,mdx,json}\"",
+    "prettier:write": "prettier --list-different \"**/*.{js,ts,tsx,scss,md,mdx,json}\" --write",
+    "start": "NODE_ENV=dev nx exec -- webpack --config scripts/webpack/webpack.dev.js --watch",
+    "start:noTsCheck": "yarn start -- --env noTsCheck=1",
+    "start:noLint": "yarn start -- --env noTsCheck=1 --env noLint=1",
     "stats": "webpack --mode production --config scripts/webpack/webpack.prod.js --profile --json > compilation-stats.json",
     "storybook": "yarn workspace @grafana/ui storybook --ci",
     "storybook:build": "yarn workspace @grafana/ui storybook:build",
-    "themes:generate": "esbuild --target=es6 ./scripts/cli/generateSassVariableFiles.ts --bundle --platform=node --tsconfig=./scripts/cli/tsconfig.json | node",
+    "themes-generate": "esbuild --target=es6 ./scripts/cli/generateSassVariableFiles.ts --bundle --platform=node --tsconfig=./scripts/cli/tsconfig.json | node",
     "themes:usage": "eslint . --ext .tsx,.ts --ignore-pattern '*.test.ts*' --ignore-pattern '*.spec.ts*' --cache --rule '{ @grafana/theme-token-usage: \"error\" }'",
     "typecheck": "tsc --noEmit && yarn run packages:typecheck",
     "plugins:build-bundled": "find plugins-bundled -name package.json -not -path '*/node_modules/*' -execdir yarn build \\;",
@@ -48,276 +51,265 @@
     "ci:test-frontend": "yarn run test:ci",
     "i18n:clean": "rimraf public/locales/en-US/grafana.json",
     "i18n:extract": "yarn run i18next -c public/locales/i18next-parser.config.js 'public/**/*.{tsx,ts}' 'packages/grafana-ui/**/*.{tsx,ts}' && yarn i18n:pseudo",
-    "i18n:compile": "echo 'no i18n compile yet, all good'",
     "i18n:pseudo": "node ./public/locales/pseudo.js",
     "i18n:stats": "node ./scripts/cli/reportI18nStats.mjs",
     "betterer": "betterer",
+    "betterer:json": "ts-node --transpile-only --project ./scripts/cli/tsconfig.json ./scripts/cli/bettererResultsToJson.ts",
     "betterer:merge": "betterer merge",
     "betterer:stats": "ts-node --transpile-only --project ./scripts/cli/tsconfig.json ./scripts/cli/reportBettererStats.ts",
     "betterer:issues": "ts-node --transpile-only --project ./scripts/cli/tsconfig.json ./scripts/cli/generateBettererIssues.ts",
     "generate-icons-bundle-cache-file": "node ./scripts/generate-icon-bundle.js",
-    "plugin:build": "lerna run build --ignore=\"@grafana/*\" --ignore=\"@grafana-plugins/input-datasource\"",
-    "plugin:build:commit": "lerna run build:commit --ignore=\"@grafana/*\" --ignore=\"@grafana-plugins/input-datasource\"",
-    "plugin:build:dev": "lerna run dev --ignore=\"@grafana/*\" --ignore=\"@grafana-plugins/input-datasource\""
+    "plugin:build": "nx run-many -t build --projects='@grafana-plugins/*' --exclude \"@grafana-plugins/input-datasource\"",
+    "plugin:build:commit": "nx run-many -t build:commit --projects='@grafana-plugins/*' --exclude \"@grafana-plugins/input-datasource\"",
+    "plugin:build:dev": "nx run-many -t dev --projects='@grafana-plugins/*' --exclude \"@grafana-plugins/input-datasource\"",
+    "generate-icons": "yarn workspace @grafana/saga-icons generate"
   },
   "grafana": {
-    "whatsNewUrl": "https://grafana.com/docs/grafana/next/whatsnew/whats-new-in-v10-1/",
+    "whatsNewUrl": "https://grafana.com/docs/grafana/next/whatsnew/whats-new-in-v11-0/",
     "releaseNotesUrl": "https://grafana.com/docs/grafana/next/release-notes/"
   },
   "devDependencies": {
-    "@babel/core": "7.23.2",
-    "@babel/plugin-proposal-class-properties": "7.18.6",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
-    "@babel/plugin-proposal-object-rest-spread": "7.20.7",
-    "@babel/plugin-proposal-optional-chaining": "7.21.0",
-    "@babel/plugin-syntax-dynamic-import": "7.8.3",
-    "@babel/plugin-transform-react-constant-elements": "7.22.5",
-    "@babel/plugin-transform-runtime": "7.23.2",
-    "@babel/plugin-transform-typescript": "7.22.9",
-    "@babel/preset-env": "7.23.2",
-    "@babel/preset-react": "7.22.5",
-    "@babel/preset-typescript": "7.23.2",
-    "@babel/runtime": "7.23.2",
+    "@babel/runtime": "7.24.1",
     "@betterer/betterer": "5.4.0",
     "@betterer/cli": "5.4.0",
     "@betterer/eslint": "5.4.0",
-    "@betterer/regexp": "5.4.0",
-    "@cypress/webpack-preprocessor": "5.17.1",
+    "@cypress/webpack-preprocessor": "6.0.1",
     "@emotion/eslint-plugin": "11.11.0",
-    "@grafana/eslint-config": "6.0.1",
+    "@grafana/eslint-config": "7.0.0",
     "@grafana/eslint-plugin": "link:./packages/grafana-eslint-rules",
+    "@grafana/plugin-e2e": "^0.25.0",
     "@grafana/tsconfig": "^1.3.0-rc1",
-    "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@react-types/button": "3.9.0",
-    "@react-types/menu": "3.9.2",
-    "@react-types/overlays": "3.8.0",
-    "@react-types/shared": "3.21.0",
+    "@manypkg/get-packages": "^2.2.0",
+    "@playwright/test": "1.42.1",
+    "@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
+    "@react-types/button": "3.9.2",
+    "@react-types/menu": "3.9.7",
+    "@react-types/overlays": "3.8.5",
+    "@react-types/shared": "3.22.1",
     "@rtsao/plugin-proposal-class-properties": "7.0.1-patch.1",
-    "@swc/core": "1.3.38",
-    "@swc/helpers": "0.4.14",
-    "@testing-library/dom": "9.3.3",
-    "@testing-library/jest-dom": "5.16.5",
-    "@testing-library/react": "14.0.0",
-    "@testing-library/user-event": "14.5.1",
-    "@types/angular": "1.8.5",
-    "@types/angular-route": "1.7.3",
+    "@swc/core": "1.4.2",
+    "@swc/helpers": "0.5.8",
+    "@testing-library/dom": "9.3.4",
+    "@testing-library/jest-dom": "6.4.2",
+    "@testing-library/react": "14.2.2",
+    "@testing-library/user-event": "14.5.2",
+    "@types/angular": "1.8.9",
+    "@types/angular-route": "1.7.6",
     "@types/chance": "^1.1.3",
     "@types/common-tags": "^1.8.0",
-    "@types/d3": "7.4.0",
+    "@types/d3": "7.4.3",
     "@types/d3-force": "^3.0.0",
-    "@types/d3-scale-chromatic": "3.0.0",
-    "@types/debounce-promise": "3.1.6",
+    "@types/d3-scale-chromatic": "3.0.3",
+    "@types/debounce-promise": "3.1.9",
     "@types/diff": "^5",
-    "@types/eslint": "8.44.0",
-    "@types/file-saver": "2.0.5",
+    "@types/eslint": "8.56.6",
+    "@types/eslint-scope": "^3.7.7",
+    "@types/file-saver": "2.0.7",
     "@types/glob": "^8.0.0",
-    "@types/google.analytics": "^0.0.42",
-    "@types/gtag.js": "^0.0.12",
+    "@types/google.analytics": "^0.0.46",
+    "@types/gtag.js": "^0.0.19",
     "@types/history": "4.7.11",
-    "@types/hoist-non-react-statics": "3.3.1",
-    "@types/jest": "29.5.4",
-    "@types/jquery": "3.5.16",
+    "@types/hoist-non-react-statics": "3.3.5",
+    "@types/jest": "29.5.12",
+    "@types/jquery": "3.5.29",
     "@types/js-yaml": "^4.0.5",
     "@types/jsurl": "^1.2.28",
-    "@types/lodash": "4.14.195",
+    "@types/lodash": "4.17.0",
     "@types/logfmt": "^1.2.3",
     "@types/lucene": "^2",
-    "@types/marked": "5.0.1",
-    "@types/mousetrap": "1.6.11",
-    "@types/node": "18.18.4",
+    "@types/marked": "5.0.2",
+    "@types/mousetrap": "1.6.15",
+    "@types/node": "20.11.30",
     "@types/node-forge": "^1",
-    "@types/ol-ext": "npm:@siedlerchr/types-ol-ext@3.2.0",
-    "@types/papaparse": "5.3.7",
-    "@types/pluralize": "^0.0.30",
-    "@types/prismjs": "1.26.0",
-    "@types/react": "18.2.15",
-    "@types/react-beautiful-dnd": "13.1.4",
-    "@types/react-dom": "18.2.7",
-    "@types/react-grid-layout": "1.3.2",
-    "@types/react-highlight-words": "0.16.4",
-    "@types/react-redux": "7.1.25",
+    "@types/ol-ext": "npm:@siedlerchr/types-ol-ext@3.2.4",
+    "@types/papaparse": "5.3.14",
+    "@types/pluralize": "^0.0.33",
+    "@types/prismjs": "1.26.3",
+    "@types/react": "18.2.73",
+    "@types/react-beautiful-dnd": "13.1.8",
+    "@types/react-dom": "18.2.22",
+    "@types/react-grid-layout": "1.3.5",
+    "@types/react-highlight-words": "0.16.7",
+    "@types/react-router": "5.1.20",
     "@types/react-router-dom": "5.3.3",
-    "@types/react-table": "7.7.14",
-    "@types/react-test-renderer": "18.0.0",
-    "@types/react-transition-group": "4.4.6",
-    "@types/react-virtualized-auto-sizer": "1.0.1",
-    "@types/react-window": "1.8.5",
+    "@types/react-table": "7.7.20",
+    "@types/react-test-renderer": "18.0.7",
+    "@types/react-transition-group": "4.4.10",
+    "@types/react-virtualized-auto-sizer": "1.0.4",
+    "@types/react-window": "1.8.8",
     "@types/react-window-infinite-loader": "^1",
-    "@types/redux-mock-store": "1.0.3",
-    "@types/semver": "7.5.0",
+    "@types/redux-mock-store": "1.0.6",
+    "@types/semver": "7.5.8",
     "@types/slate": "0.47.11",
-    "@types/slate-plain-serializer": "0.7.2",
+    "@types/slate-plain-serializer": "0.7.5",
     "@types/slate-react": "0.22.9",
-    "@types/systemjs": "6.13.1",
-    "@types/testing-library__jest-dom": "5.14.8",
-    "@types/tinycolor2": "1.4.3",
-    "@types/uuid": "9.0.2",
-    "@types/yargs": "17.0.24",
-    "@typescript-eslint/eslint-plugin": "5.42.0",
-    "@typescript-eslint/parser": "5.42.0",
-    "autoprefixer": "10.4.14",
-    "babel-jest": "29.7.0",
-    "babel-loader": "9.1.3",
-    "babel-plugin-angularjs-annotate": "0.10.0",
-    "babel-plugin-macros": "3.1.0",
-    "blink-diff": "1.0.13",
+    "@types/systemjs": "6.13.5",
+    "@types/testing-library__jest-dom": "5.14.9",
+    "@types/tinycolor2": "1.4.6",
+    "@types/uuid": "9.0.8",
+    "@types/webpack-assets-manifest": "^5",
+    "@types/yargs": "17.0.32",
+    "@typescript-eslint/eslint-plugin": "6.21.0",
+    "@typescript-eslint/parser": "6.21.0",
+    "autoprefixer": "10.4.19",
     "blob-polyfill": "7.0.20220408",
     "browserslist": "^4.21.4",
     "chance": "^1.0.10",
     "chrome-remote-interface": "0.33.0",
     "codeowners": "^5.1.1",
-    "copy-webpack-plugin": "11.0.0",
-    "css-loader": "6.8.1",
-    "css-minimizer-webpack-plugin": "5.0.1",
+    "copy-webpack-plugin": "12.0.2",
+    "core-js": "3.36.1",
+    "css-loader": "6.10.0",
+    "css-minimizer-webpack-plugin": "6.0.0",
     "cypress": "13.1.0",
     "cypress-file-upload": "5.0.8",
-    "esbuild": "0.18.12",
-    "esbuild-loader": "3.0.1",
-    "esbuild-plugin-browserslist": "^0.8.0",
-    "eslint": "8.52.0",
-    "eslint-config-prettier": "8.8.0",
+    "esbuild": "0.20.1",
+    "esbuild-loader": "4.1.0",
+    "esbuild-plugin-browserslist": "^0.11.0",
+    "eslint": "8.57.0",
+    "eslint-config-prettier": "9.1.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jest": "27.4.2",
-    "eslint-plugin-jsdoc": "46.8.2",
-    "eslint-plugin-jsx-a11y": "6.7.1",
+    "eslint-plugin-jest": "27.9.0",
+    "eslint-plugin-jsdoc": "48.2.2",
+    "eslint-plugin-jsx-a11y": "6.8.0",
     "eslint-plugin-lodash": "7.4.0",
-    "eslint-plugin-react": "7.33.2",
+    "eslint-plugin-react": "7.34.1",
     "eslint-plugin-react-hooks": "4.6.0",
-    "eslint-webpack-plugin": "4.0.1",
-    "expose-loader": "4.1.0",
-    "fork-ts-checker-webpack-plugin": "8.0.0",
-    "glob": "10.3.3",
-    "html-loader": "4.2.0",
-    "html-webpack-plugin": "5.5.3",
+    "eslint-scope": "^8.0.0",
+    "eslint-webpack-plugin": "4.1.0",
+    "expose-loader": "5.0.0",
+    "fork-ts-checker-webpack-plugin": "9.0.2",
+    "glob": "10.3.10",
+    "html-loader": "5.0.0",
+    "html-webpack-plugin": "5.6.0",
     "http-server": "14.1.1",
-    "i18next-parser": "6.6.0",
+    "i18next-parser": "8.13.0",
     "jest": "29.7.0",
     "jest-canvas-mock": "2.5.2",
-    "jest-date-mock": "1.0.8",
+    "jest-date-mock": "1.0.9",
     "jest-environment-jsdom": "29.7.0",
-    "jest-fail-on-console": "3.1.1",
+    "jest-fail-on-console": "3.1.2",
     "jest-junit": "16.0.0",
     "jest-matcher-utils": "29.7.0",
-    "lerna": "5.5.4",
-    "mini-css-extract-plugin": "2.7.6",
-    "msw": "1.3.2",
+    "jest-watch-typeahead": "^2.2.2",
+    "lerna": "8.1.2",
+    "mini-css-extract-plugin": "2.8.1",
+    "msw": "2.2.13",
     "mutationobserver-shim": "0.3.7",
     "ngtemplate-loader": "2.1.0",
     "node-notifier": "10.0.1",
-    "postcss": "8.4.31",
-    "postcss-loader": "7.3.3",
-    "postcss-reporter": "7.0.5",
-    "postcss-scss": "4.0.6",
-    "prettier": "3.0.0",
+    "nx": "18.1.3",
+    "postcss": "8.4.38",
+    "postcss-loader": "8.1.1",
+    "postcss-reporter": "7.1.0",
+    "postcss-scss": "4.0.9",
+    "prettier": "3.2.5",
     "react-refresh": "0.14.0",
     "react-select-event": "5.5.1",
     "react-simple-compat": "1.2.3",
     "react-test-renderer": "18.2.0",
     "redux-mock-store": "1.5.4",
-    "rimraf": "5.0.1",
-    "rudder-sdk-js": "2.43.0",
-    "sass": "1.69.4",
-    "sass-loader": "13.3.2",
-    "style-loader": "3.3.3",
-    "stylelint": "15.11.0",
-    "stylelint-config-prettier": "9.0.5",
-    "stylelint-config-sass-guidelines": "10.0.0",
-    "terser-webpack-plugin": "5.3.9",
+    "rimraf": "5.0.5",
+    "rudder-sdk-js": "2.48.6",
+    "sass": "1.72.0",
+    "sass-loader": "14.1.1",
+    "style-loader": "3.3.4",
+    "stylelint": "16.3.1",
+    "stylelint-config-sass-guidelines": "11.1.0",
+    "terser-webpack-plugin": "5.3.10",
     "testing-library-selector": "0.3.1",
     "tracelib": "1.0.1",
-    "ts-jest": "29.1.1",
-    "ts-node": "10.9.1",
-    "typescript": "4.8.4",
-    "wait-on": "7.0.1",
-    "webpack": "5.89.0",
-    "webpack-bundle-analyzer": "4.9.0",
+    "ts-jest": "29.1.2",
+    "ts-node": "10.9.2",
+    "typescript": "5.3.3",
+    "webpack": "5.91.0",
+    "webpack-assets-manifest": "^5.1.0",
+    "webpack-bundle-analyzer": "4.10.1",
     "webpack-cli": "5.1.4",
-    "webpack-dev-server": "4.15.1",
+    "webpack-dev-server": "5.0.4",
     "webpack-manifest-plugin": "5.0.0",
     "webpack-merge": "5.10.0",
+    "webpackbar": "^6.0.0",
     "yaml": "^2.0.0",
     "yargs": "^17.5.1"
   },
   "dependencies": {
     "@daybrush/utils": "1.13.0",
     "@emotion/css": "11.11.2",
-    "@emotion/react": "11.11.1",
+    "@emotion/react": "11.11.4",
     "@fingerprintjs/fingerprintjs": "^3.4.2",
-    "@glideapps/glide-data-grid": "^5.2.1",
-    "@grafana-plugins/grafana-testdata-datasource": "workspace:*",
-    "@grafana/aws-sdk": "0.2.0",
+    "@floating-ui/react": "0.26.10",
+    "@glideapps/glide-data-grid": "^6.0.0",
+    "@grafana/aws-sdk": "0.3.3",
     "@grafana/data": "workspace:*",
     "@grafana/e2e-selectors": "workspace:*",
-    "@grafana/experimental": "1.7.4",
-    "@grafana/faro-core": "1.2.1",
-    "@grafana/faro-web-sdk": "1.2.1",
+    "@grafana/experimental": "1.7.10",
+    "@grafana/faro-core": "^1.3.6",
+    "@grafana/faro-web-sdk": "^1.3.6",
     "@grafana/flamegraph": "workspace:*",
-    "@grafana/google-sdk": "0.1.1",
-    "@grafana/lezer-logql": "0.2.1",
-    "@grafana/lezer-traceql": "0.0.8",
+    "@grafana/google-sdk": "0.1.2",
+    "@grafana/lezer-logql": "0.2.3",
     "@grafana/monaco-logql": "^0.0.7",
+    "@grafana/o11y-ds-frontend": "workspace:*",
+    "@grafana/prometheus": "workspace:*",
     "@grafana/runtime": "workspace:*",
-    "@grafana/scenes": "^1.18.0",
+    "@grafana/saga-icons": "workspace:*",
+    "@grafana/scenes": "^4.14.0",
     "@grafana/schema": "workspace:*",
+    "@grafana/sql": "workspace:*",
     "@grafana/ui": "workspace:*",
-    "@kusto/monaco-kusto": "^7.4.0",
-    "@leeoniya/ufuzzy": "1.0.8",
-    "@lezer/common": "1.0.2",
-    "@lezer/highlight": "1.1.3",
+    "@kusto/monaco-kusto": "^10.0.0",
+    "@leeoniya/ufuzzy": "1.0.14",
+    "@lezer/common": "1.2.1",
+    "@lezer/highlight": "1.2.0",
     "@lezer/lr": "1.3.3",
-    "@locker/near-membrane-dom": "0.13.3",
-    "@locker/near-membrane-shared": "0.13.3",
-    "@locker/near-membrane-shared-dom": "0.13.3",
-    "@opentelemetry/api": "1.6.0",
+    "@locker/near-membrane-dom": "0.13.6",
+    "@locker/near-membrane-shared": "0.13.6",
+    "@locker/near-membrane-shared-dom": "0.13.6",
+    "@msagl/core": "^1.1.16",
+    "@msagl/parser": "^1.1.16",
+    "@opentelemetry/api": "1.7.0",
     "@opentelemetry/exporter-collector": "0.25.0",
-    "@opentelemetry/semantic-conventions": "1.17.1",
+    "@opentelemetry/semantic-conventions": "1.21.0",
     "@popperjs/core": "2.11.8",
     "@prometheus-io/lezer-promql": "^0.37.0-rc.1",
-    "@react-aria/button": "3.8.0",
-    "@react-aria/dialog": "3.5.3",
-    "@react-aria/focus": "3.13.0",
-    "@react-aria/interactions": "3.16.0",
-    "@react-aria/menu": "3.10.0",
-    "@react-aria/overlays": "3.15.0",
-    "@react-aria/utils": "3.18.0",
-    "@react-awesome-query-builder/core": "6.4.1",
-    "@react-awesome-query-builder/ui": "6.4.1",
-    "@react-stately/collections": "3.9.0",
-    "@react-stately/menu": "3.5.3",
-    "@react-stately/tree": "3.7.0",
+    "@react-aria/dialog": "3.5.12",
+    "@react-aria/focus": "3.16.2",
+    "@react-aria/overlays": "3.21.1",
+    "@react-aria/utils": "3.23.2",
+    "@react-awesome-query-builder/core": "6.4.2",
+    "@react-awesome-query-builder/ui": "6.4.2",
     "@reduxjs/toolkit": "1.9.5",
     "@remix-run/router": "^1.5.0",
     "@testing-library/react-hooks": "^8.0.1",
-    "@types/react-resizable": "3.0.4",
-    "@types/trusted-types": "2.0.3",
-    "@types/webpack-env": "1.18.1",
+    "@types/react-resizable": "3.0.7",
+    "@types/trusted-types": "2.0.7",
+    "@types/webpack-env": "1.18.4",
     "@visx/event": "3.3.0",
     "@visx/gradient": "3.3.0",
     "@visx/group": "3.3.0",
-    "@visx/scale": "3.3.0",
-    "@visx/shape": "3.3.0",
+    "@visx/scale": "3.5.0",
+    "@visx/shape": "3.5.0",
     "@visx/tooltip": "3.3.0",
-    "@welldone-software/why-did-you-render": "7.0.1",
+    "@welldone-software/why-did-you-render": "8.0.1",
     "angular": "1.8.3",
     "angular-bindonce": "0.3.1",
     "angular-route": "1.8.3",
     "angular-sanitize": "1.8.3",
     "ansicolor": "1.1.100",
-    "app": "link:./public/app",
     "baron": "3.0.3",
     "brace": "0.11.1",
     "calculate-size": "1.1.1",
-    "centrifuge": "4.0.1",
-    "classnames": "2.3.2",
+    "centrifuge": "5.0.2",
+    "classnames": "2.5.1",
     "combokeys": "^3.0.0",
     "comlink": "4.4.1",
     "common-tags": "1.8.2",
-    "core-js": "3.33.0",
-    "d3": "7.8.5",
+    "d3": "7.9.0",
     "d3-force": "3.0.0",
-    "d3-scale-chromatic": "3.0.0",
-    "dangerously-set-html-content": "1.0.9",
-    "date-fns": "2.30.0",
+    "d3-scale-chromatic": "3.1.0",
+    "dangerously-set-html-content": "1.1.0",
+    "date-fns": "3.6.0",
     "debounce-promise": "3.1.2",
     "diff": "^5.1.0",
     "emotion": "11.0.0",
@@ -328,99 +320,100 @@
     "framework-utils": "^1.1.0",
     "history": "4.10.1",
     "hoist-non-react-statics": "3.3.2",
-    "i18next": "^22.0.0",
+    "i18next": "^23.0.0",
     "i18next-browser-languagedetector": "^7.0.2",
-    "immer": "10.0.2",
-    "immutable": "4.3.1",
-    "jquery": "3.7.0",
+    "immer": "10.0.4",
+    "immutable": "4.3.5",
+    "jquery": "3.7.1",
     "js-yaml": "^4.1.0",
     "json-markup": "^1.1.0",
     "json-source-map": "0.6.1",
     "jsurl": "^0.1.5",
-    "kbar": "0.1.0-beta.40",
+    "kbar": "0.1.0-beta.45",
+    "leven": "^4.0.0",
     "lodash": "4.17.21",
     "logfmt": "^1.3.2",
-    "lru-cache": "10.0.0",
+    "lru-cache": "10.2.0",
     "lru-memoize": "^1.1.0",
     "lucene": "^2.1.1",
-    "marked": "5.1.1",
-    "marked-mangle": "1.1.0",
+    "marked": "12.0.1",
+    "marked-mangle": "1.1.7",
     "memoize-one": "6.0.0",
-    "moment": "2.29.4",
-    "moment-timezone": "0.5.43",
+    "ml-regression-polynomial": "^3.0.0",
+    "ml-regression-simple-linear": "^3.0.0",
+    "moment": "2.30.1",
+    "moment-timezone": "0.5.45",
     "monaco-editor": "0.34.0",
     "monaco-promql": "1.7.4",
     "mousetrap": "1.6.5",
     "mousetrap-global-bind": "1.1.0",
-    "moveable": "0.43.1",
+    "moveable": "0.53.0",
+    "nanoid": "^5.0.4",
     "node-forge": "^1.3.1",
     "ol": "7.4.0",
-    "ol-ext": "4.0.10",
+    "ol-ext": "4.0.17",
     "papaparse": "5.4.1",
     "pluralize": "^8.0.0",
     "prismjs": "1.29.0",
     "prop-types": "15.8.1",
     "pseudoizer": "^0.1.0",
-    "rc-cascader": "3.19.0",
-    "rc-drawer": "6.5.2",
-    "rc-slider": "10.3.1",
+    "rc-cascader": "3.24.0",
+    "rc-drawer": "7.1.0",
+    "rc-slider": "10.5.0",
     "rc-time-picker": "3.7.3",
-    "rc-tree": "5.8.0",
-    "re-resizable": "6.9.9",
+    "rc-tree": "5.8.5",
+    "re-resizable": "6.9.11",
     "react": "18.2.0",
     "react-beautiful-dnd": "13.1.1",
     "react-diff-viewer": "^3.1.1",
     "react-dom": "18.2.0",
-    "react-draggable": "4.4.5",
+    "react-draggable": "4.4.6",
     "react-dropzone": "^14.2.3",
-    "react-enable": "^3.1.0",
-    "react-grid-layout": "1.4.2",
+    "react-grid-layout": "1.4.4",
     "react-highlight-words": "0.20.0",
-    "react-hook-form": "7.5.3",
+    "react-hook-form": "^7.49.2",
     "react-i18next": "^12.0.0",
     "react-inlinesvg": "3.0.2",
-    "react-loading-skeleton": "3.3.1",
-    "react-moveable": "0.46.1",
-    "react-popper": "2.3.0",
-    "react-popper-tooltip": "4.4.2",
-    "react-redux": "7.2.6",
+    "react-loading-skeleton": "3.4.0",
+    "react-moveable": "0.56.0",
+    "react-redux": "8.1.3",
     "react-resizable": "3.0.5",
     "react-responsive-carousel": "^3.2.23",
+    "react-router": "5.3.3",
     "react-router-dom": "5.3.3",
     "react-router-dom-v5-compat": "^6.10.0",
-    "react-select": "5.7.4",
+    "react-select": "5.8.0",
     "react-split-pane": "0.1.92",
     "react-table": "7.8.0",
     "react-transition-group": "4.4.5",
-    "react-use": "17.4.0",
+    "react-use": "17.5.0",
     "react-virtual": "2.10.4",
-    "react-virtualized-auto-sizer": "1.0.7",
-    "react-window": "1.8.9",
+    "react-virtualized-auto-sizer": "1.0.24",
+    "react-window": "1.8.10",
     "react-window-infinite-loader": "1.0.9",
+    "react-zoom-pan-pinch": "^3.3.0",
     "redux": "4.2.1",
     "redux-thunk": "2.4.2",
-    "regenerator-runtime": "0.14.0",
+    "regenerator-runtime": "0.14.1",
     "reselect": "4.1.8",
     "rxjs": "7.8.1",
-    "sass": "link:./public/sass",
-    "selecto": "1.26.0",
-    "semver": "7.5.4",
+    "selecto": "1.26.3",
+    "semver": "7.6.0",
     "slate": "0.47.9",
     "slate-plain-serializer": "0.7.13",
     "slate-react": "0.22.10",
-    "sql-formatter-plus": "^1.3.6",
     "symbol-observable": "4.0.0",
-    "test": "link:./public/test",
+    "systemjs": "6.14.3",
+    "systemjs-cjs-extra": "0.2.1",
     "tether-drop": "https://github.com/torkelo/drop",
     "tinycolor2": "1.6.0",
-    "tslib": "2.6.0",
+    "tslib": "2.6.2",
     "tween-functions": "^1.2.0",
-    "uplot": "1.6.26",
-    "uuid": "9.0.0",
-    "vendor": "link:./public/vendor",
+    "uplot": "1.6.30",
+    "uuid": "9.0.1",
     "visjs-network": "4.25.0",
-    "whatwg-fetch": "3.6.2",
-    "xlsx": "https://cdn.sheetjs.com/xlsx-0.19.1/xlsx-0.19.1.tgz"
+    "whatwg-fetch": "3.6.20",
+    "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz"
   },
   "resolutions": {
     "underscore": "1.13.6",
@@ -428,6 +421,8 @@
     "ngtemplate-loader/loader-utils": "^2.0.0",
     "semver@~7.0.0": "7.5.4",
     "semver@7.3.4": "7.5.4",
+    "debug@npm:^0.7.2": "2.6.9",
+    "debug@npm:^0.7.4": "2.6.9",
     "slate-dev-environment@^0.2.2": "patch:slate-dev-environment@npm:0.2.5#.yarn/patches/slate-dev-environment-npm-0.2.5-9aeb7da7b5.patch",
     "react-split-pane@0.1.92": "patch:react-split-pane@npm:0.1.92#.yarn/patches/react-split-pane-npm-0.1.92-93dbf51dff.patch",
     "@storybook/blocks@7.4.5": "patch:@storybook/blocks@npm%3A7.4.5#./.yarn/patches/@storybook-blocks-npm-7.4.5-5a2374564a.patch",
@@ -437,6 +432,7 @@
   "workspaces": {
     "packages": [
       "packages/*",
+      "packages/!(grafana-icons)/**",
       "plugins-bundled/internal/*",
       "public/app/plugins/*/*"
     ]
@@ -444,9 +440,9 @@
   "engines": {
     "node": ">= 20"
   },
-  "packageManager": "yarn@3.6.4",
+  "packageManager": "yarn@4.1.0",
   "dependenciesMeta": {
-    "prettier@3.0.0": {
+    "prettier@3.2.5": {
       "unplugged": true
     }
   }
diff --git a/packages/README.md b/packages/README.md
index d77c6e0c5dc55..b90745433ec6e 100644
--- a/packages/README.md
+++ b/packages/README.md
@@ -36,7 +36,7 @@ Every commit to main that has changes within the `packages` directory is a subje
 
 > All of the steps below must be performed on a release branch, according to Grafana Release Guide.
 
-> You must be logged in to NPM as part of Grafana NPM org before attempting to publish to the npm registery.
+> You must be logged in to NPM as part of Grafana NPM org before attempting to publish to the npm registry.
 
 1. Run `yarn packages:clean` script from the root directory. This will delete any previous builds of the packages.
 2. Run `yarn packages:prepare` script from the root directory. This performs tests on the packages and prompts for the version of the packages. The version should be the same as the one being released.
diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json
index f946d80b87f84..46027ff22e1e9 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": "10.3.0-pre",
+  "version": "11.0.0",
   "description": "Grafana Data Library",
   "keywords": [
     "typescript"
@@ -35,66 +35,55 @@
     "postpack": "mv package.json.bak package.json"
   },
   "dependencies": {
-    "@braintree/sanitize-url": "6.0.2",
-    "@grafana/schema": "10.3.0-pre",
+    "@braintree/sanitize-url": "7.0.1",
+    "@grafana/schema": "11.0.0",
     "@types/d3-interpolate": "^3.0.0",
-    "@types/string-hash": "1.1.1",
+    "@types/string-hash": "1.1.3",
     "d3-interpolate": "3.0.1",
-    "date-fns": "2.30.0",
-    "dompurify": "^2.4.3",
+    "date-fns": "3.6.0",
+    "dompurify": "^3.0.0",
     "eventemitter3": "5.0.1",
     "fast_array_intersect": "1.1.0",
     "history": "4.10.1",
     "lodash": "4.17.21",
-    "marked": "5.1.1",
-    "marked-mangle": "1.1.0",
-    "moment": "2.29.4",
-    "moment-timezone": "0.5.43",
+    "marked": "12.0.1",
+    "marked-mangle": "1.1.7",
+    "moment": "2.30.1",
+    "moment-timezone": "0.5.45",
     "ol": "7.4.0",
     "papaparse": "5.4.1",
-    "react-use": "17.4.0",
-    "regenerator-runtime": "0.14.0",
+    "react-use": "17.5.0",
     "rxjs": "7.8.1",
     "string-hash": "^1.1.3",
     "tinycolor2": "1.6.0",
-    "tslib": "2.6.0",
-    "uplot": "1.6.26",
+    "tslib": "2.6.2",
+    "uplot": "1.6.30",
     "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@grafana/tsconfig": "^1.2.0-rc1",
-    "@rollup/plugin-commonjs": "25.0.2",
-    "@rollup/plugin-json": "6.0.0",
+    "@grafana/tsconfig": "^1.3.0-rc1",
     "@rollup/plugin-node-resolve": "15.2.3",
-    "@testing-library/dom": "9.3.3",
-    "@testing-library/jest-dom": "5.16.5",
-    "@testing-library/react": "14.0.0",
-    "@testing-library/user-event": "14.5.1",
-    "@types/dompurify": "^2",
+    "@types/dompurify": "^3.0.0",
     "@types/history": "4.7.11",
-    "@types/jest": "29.5.4",
-    "@types/jquery": "3.5.16",
-    "@types/lodash": "4.14.195",
-    "@types/marked": "5.0.1",
-    "@types/node": "18.18.4",
-    "@types/papaparse": "5.3.7",
-    "@types/react": "18.2.15",
-    "@types/react-dom": "18.2.7",
-    "@types/testing-library__jest-dom": "5.14.8",
-    "@types/tinycolor2": "1.4.3",
+    "@types/lodash": "4.17.0",
+    "@types/marked": "5.0.2",
+    "@types/node": "20.11.30",
+    "@types/papaparse": "5.3.14",
+    "@types/react": "18.2.73",
+    "@types/react-dom": "18.2.22",
+    "@types/tinycolor2": "1.4.6",
     "esbuild": "0.18.12",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-test-renderer": "18.2.0",
-    "rimraf": "5.0.1",
+    "rimraf": "5.0.5",
     "rollup": "2.79.1",
     "rollup-plugin-dts": "^5.0.0",
     "rollup-plugin-esbuild": "5.0.0",
     "rollup-plugin-node-externals": "^5.0.0",
-    "typescript": "4.8.4"
+    "typescript": "5.3.3"
   },
   "peerDependencies": {
-    "react": "^17.0.0 || ^18.0.0",
-    "react-dom": "^17.0.0 || ^18.0.0"
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
   }
 }
diff --git a/packages/grafana-data/src/dataframe/ArrayDataFrame.test.ts b/packages/grafana-data/src/dataframe/ArrayDataFrame.test.ts
index 75222ede2d0b0..624829ba778d3 100644
--- a/packages/grafana-data/src/dataframe/ArrayDataFrame.test.ts
+++ b/packages/grafana-data/src/dataframe/ArrayDataFrame.test.ts
@@ -101,4 +101,44 @@ describe('Array DataFrame', () => {
       }
     `);
   });
+
+  test('Handles first null value', () => {
+    const f = arrayToDataFrame([null, { id: 'abc' }]);
+    expect(f).toMatchInlineSnapshot(`
+      {
+        "fields": [
+          {
+            "config": {},
+            "name": "id",
+            "type": "string",
+            "values": [
+              null,
+              "abc",
+            ],
+          },
+        ],
+        "length": 2,
+      }
+    `);
+  });
+
+  test('Handles first undefined value', () => {
+    const f = arrayToDataFrame([undefined, { id: 'abc' }]);
+    expect(f).toMatchInlineSnapshot(`
+      {
+        "fields": [
+          {
+            "config": {},
+            "name": "id",
+            "type": "string",
+            "values": [
+              undefined,
+              "abc",
+            ],
+          },
+        ],
+        "length": 2,
+      }
+    `);
+  });
 });
diff --git a/packages/grafana-data/src/dataframe/ArrayDataFrame.ts b/packages/grafana-data/src/dataframe/ArrayDataFrame.ts
index aa06d36c02a0b..06092b59da939 100644
--- a/packages/grafana-data/src/dataframe/ArrayDataFrame.ts
+++ b/packages/grafana-data/src/dataframe/ArrayDataFrame.ts
@@ -21,11 +21,13 @@ export class ArrayDataFrame<T = any> implements DataFrame {
 }
 
 /**
- * arrayToDataFrame will convert any array into a DataFrame
+ * arrayToDataFrame will convert any array into a DataFrame.
+ * @param source - can be an array of objects or an array of simple values.
+ * @param names - will be used for ordering of fields. Source needs to be array of objects if names are provided.
  *
  * @public
  */
-export function arrayToDataFrame(source: any[], names?: string[]): DataFrame {
+export function arrayToDataFrame(source: Array<Record<string, unknown>> | unknown[], names?: string[]): DataFrame {
   const df: DataFrame = {
     fields: [],
     length: source.length,
@@ -34,30 +36,46 @@ export function arrayToDataFrame(source: any[], names?: string[]): DataFrame {
     return df;
   }
 
+  // If names are provided then we assume the source is an array of objects with the names as keys (field names). This
+  // makes ordering of the fields predictable.
   if (names) {
+    if (!isObjectArray(source)) {
+      throw new Error('source is not an array of objects');
+    }
+
     for (const name of names) {
       df.fields.push(
         makeFieldFromValues(
           name,
-          source.map((v) => v[name])
+          source.map((v) => (v ? v[name] : v))
         )
       );
     }
     return df;
   }
 
-  const first = source.find((v) => v != null); // first not null|undefined
-  if (first != null) {
-    if (typeof first === 'object') {
-      df.fields = Object.keys(first).map((name) => {
-        return makeFieldFromValues(
-          name,
-          source.map((v) => v[name])
-        );
-      });
-    } else {
-      df.fields.push(makeFieldFromValues(TIME_SERIES_VALUE_FIELD_NAME, source));
-    }
+  const firstDefined = source.find((v) => v); // first not null|undefined
+  // This means if the source is lots of null/undefined values we throw that away and return empty dataFrame. This is
+  // different to how we preserve null/undefined values if there is some defined rows. Not sure this inconsistency
+  // is by design or not.
+  if (firstDefined === null) {
+    return df;
+  }
+
+  // If is an array of objects we use the keys as field names.
+  if (isObjectArray(source)) {
+    // We need to do this to please TS. We know source is array of objects and that there is some object in there but
+    // TS still thinks it can all be undefined|nulls.
+    const first = source.find((v) => v);
+    df.fields = Object.keys(first || {}).map((name) => {
+      return makeFieldFromValues(
+        name,
+        source.map((v) => (v ? v[name] : v))
+      );
+    });
+  } else {
+    // Otherwise source should be an array of simple values, so we create single field data frame.
+    df.fields.push(makeFieldFromValues(TIME_SERIES_VALUE_FIELD_NAME, source));
   }
   return df;
 }
@@ -67,3 +85,8 @@ function makeFieldFromValues(name: string, values: unknown[]): Field {
   f.type = guessFieldTypeForField(f) ?? FieldType.other;
   return f;
 }
+
+function isObjectArray(arr: unknown[]): arr is Array<Record<string, unknown> | null | undefined> {
+  const first = arr.find((v) => v); // first not null|undefined
+  return arr.length > 0 && typeof first === 'object';
+}
diff --git a/packages/grafana-data/src/dataframe/DataFrameJSON.ts b/packages/grafana-data/src/dataframe/DataFrameJSON.ts
index c56842b33b60c..4b4e69cd5ae2c 100644
--- a/packages/grafana-data/src/dataframe/DataFrameJSON.ts
+++ b/packages/grafana-data/src/dataframe/DataFrameJSON.ts
@@ -143,7 +143,7 @@ export function decodeFieldValueEntities(lookup: FieldValueEntityLookup, values:
  */
 export function decodeFieldValueEnums(lookup: string[], values: FieldValues) {
   for (let i = 0; i < values.length; i++) {
-    values[i] = lookup[values[i] as number];
+    values[i] = lookup[Number(values[i])];
   }
 }
 
@@ -240,7 +240,9 @@ export function dataFrameToJSON(frame: DataFrame): DataFrameJSON {
     name: frame.name,
     fields: frame.fields.map((f) => {
       const { values, nanos, state, display, ...sfield } = f;
-      delete (sfield as any).entities;
+      if ('entities' in sfield) {
+        delete sfield.entities;
+      }
       data.values.push(values);
 
       if (nanos != null) {
diff --git a/packages/grafana-data/src/dataframe/DataFrameView.test.ts b/packages/grafana-data/src/dataframe/DataFrameView.test.ts
index 8975da7b24fc4..dca646c3ec0ee 100644
--- a/packages/grafana-data/src/dataframe/DataFrameView.test.ts
+++ b/packages/grafana-data/src/dataframe/DataFrameView.test.ts
@@ -46,7 +46,12 @@ describe('dataFrameView', () => {
   it('Should support array indexes', () => {
     expect(vector.length).toEqual(3);
 
-    const first = vector.get(0) as any;
+    const first = vector.get(0) as unknown as [
+      MySpecialObject['time'],
+      MySpecialObject['name'],
+      MySpecialObject['value'],
+      MySpecialObject['more'],
+    ];
     expect(first[0]).toEqual(100);
     expect(first[1]).toEqual('a');
     expect(first[2]).toEqual(1);
@@ -84,7 +89,10 @@ describe('dataFrameView', () => {
   });
 
   it('Can handle fields with number name', () => {
-    const view = new DataFrameView<MySpecialObject>(
+    const view = new DataFrameView<{
+      '1': string;
+      '2': string;
+    }>(
       new MutableDataFrame({
         fields: [
           { name: '1', type: FieldType.string, values: ['a'] },
@@ -93,7 +101,7 @@ describe('dataFrameView', () => {
       })
     );
 
-    const obj = view.get(0) as any;
+    const obj = view.get(0);
     expect(obj['1']).toEqual('a');
     expect(obj['2']).toEqual('b');
   });
diff --git a/packages/grafana-data/src/dataframe/DataFrameView.ts b/packages/grafana-data/src/dataframe/DataFrameView.ts
index 33cac6a514463..6d8b523140d6b 100644
--- a/packages/grafana-data/src/dataframe/DataFrameView.ts
+++ b/packages/grafana-data/src/dataframe/DataFrameView.ts
@@ -13,7 +13,7 @@ import { FunctionalVector } from '../vector/FunctionalVector';
  * @typeParam T - Type of object stored in the DataFrame.
  * @beta
  */
-export class DataFrameView<T = any> extends FunctionalVector<T> {
+export class DataFrameView<T extends object = any> extends FunctionalVector<T> {
   private index = 0;
   private obj: T;
   readonly fields: {
@@ -22,7 +22,7 @@ export class DataFrameView<T = any> extends FunctionalVector<T> {
 
   constructor(private data: DataFrame) {
     super();
-    const obj = {} as unknown as T;
+    const obj = {} as T;
     const fields = {} as any;
 
     for (let i = 0; i < data.fields.length; i++) {
@@ -34,14 +34,14 @@ export class DataFrameView<T = any> extends FunctionalVector<T> {
       fields[field.name] = field;
       const getter = () => field.values.get(this.index); // .get() to support all Vector types
 
-      if (!(obj as any).hasOwnProperty(field.name)) {
+      if (!obj.hasOwnProperty(field.name)) {
         Object.defineProperty(obj, field.name, {
           enumerable: true, // Shows up as enumerable property
           get: getter,
         });
       }
 
-      if (!(obj as any).hasOwnProperty(i.toString())) {
+      if (!obj.hasOwnProperty(i.toString())) {
         Object.defineProperty(obj, i, {
           enumerable: false, // Don't enumerate array index
           get: getter,
diff --git a/packages/grafana-data/src/dataframe/MutableDataFrame.ts b/packages/grafana-data/src/dataframe/MutableDataFrame.ts
index 7d96a8f592c6d..4437aa44b5e5a 100644
--- a/packages/grafana-data/src/dataframe/MutableDataFrame.ts
+++ b/packages/grafana-data/src/dataframe/MutableDataFrame.ts
@@ -11,7 +11,7 @@ import { guessFieldTypeFromValue, guessFieldTypeForField, toDataFrameDTO } from
 export type MutableField<T = any> = Field<T>;
 
 /** @deprecated */
-type MutableVectorCreator = (buffer?: any[]) => any[];
+type MutableVectorCreator = (buffer?: unknown[]) => unknown[];
 
 export const MISSING_VALUE = undefined; // Treated as connected in new graph panel
 
@@ -162,7 +162,7 @@ export class MutableDataFrame<T = any> extends FunctionalVector<T> implements Da
     return parser;
   }
 
-  private parseValue(field: Field, v: any): any {
+  private parseValue(field: Field, v: string) {
     let p = this.parsers?.get(field);
     if (!p) {
       p = this.setParser(field, makeFieldParser(v, field));
@@ -243,7 +243,7 @@ export class MutableDataFrame<T = any> extends FunctionalVector<T> implements Da
       throw new Error('Unable to set value beyond current length');
     }
 
-    const obj = (value as any) || {};
+    const obj = (value as Record<string, unknown>) || {};
     for (const field of this.fields) {
       field.values[index] = obj[field.name];
     }
@@ -253,7 +253,7 @@ export class MutableDataFrame<T = any> extends FunctionalVector<T> implements Da
    * Get an object with a property for each field in the DataFrame
    */
   get(idx: number): T {
-    const v: any = {};
+    const v: Record<string, unknown> = {};
     for (const field of this.fields) {
       v[field.name] = field.values[idx];
     }
diff --git a/packages/grafana-data/src/dataframe/StreamingDataFrame.ts b/packages/grafana-data/src/dataframe/StreamingDataFrame.ts
index d98b6b935788e..36fe7a77e22b4 100644
--- a/packages/grafana-data/src/dataframe/StreamingDataFrame.ts
+++ b/packages/grafana-data/src/dataframe/StreamingDataFrame.ts
@@ -123,7 +123,7 @@ export class StreamingDataFrame implements DataFrame {
 
     dataFrameDTO.fields = dataFrameDTO.fields.map((f) => ({
       ...f,
-      values: (f.values as unknown[]).slice(numberOfItemsToRemove),
+      values: f.values?.slice(numberOfItemsToRemove),
     }));
 
     const length = dataFrameDTO.fields[0]?.values?.length ?? 0;
@@ -488,7 +488,7 @@ export function getStreamingFrameOptions(opts?: Partial<StreamingFrameOptions>):
 
 // converts vertical insertion records with table keys in [0] and column values in [1...N]
 // to join()-able tables with column arrays
-export function transpose(vrecs: any[][]) {
+export function transpose(vrecs: unknown[][]) {
   let tableKeys = new Set(vrecs[0]);
   let tables = new Map();
 
diff --git a/packages/grafana-data/src/dataframe/index.ts b/packages/grafana-data/src/dataframe/index.ts
index b1362fc3e3885..3e14458a1f049 100644
--- a/packages/grafana-data/src/dataframe/index.ts
+++ b/packages/grafana-data/src/dataframe/index.ts
@@ -1,11 +1,18 @@
 export * from './DataFrameView';
 export * from './FieldCache';
-export * from './CircularDataFrame';
 export * from './MutableDataFrame';
 export * from './processDataFrame';
 export * from './dimensions';
 export * from './ArrayDataFrame';
 export * from './DataFrameJSON';
 export * from './frameComparisons';
-export { anySeriesWithTimeField, isTimeSeriesFrame, isTimeSeriesFrames } from './utils';
+export {
+  anySeriesWithTimeField,
+  hasTimeField,
+  isTimeSeriesFrame,
+  isTimeSeriesFrames,
+  isTimeSeriesField,
+  getRowUniqueId,
+  addRow,
+} from './utils';
 export { StreamingDataFrame, StreamingFrameAction, type StreamingFrameOptions, closestIdx } from './StreamingDataFrame';
diff --git a/packages/grafana-data/src/dataframe/processDataFrame.ts b/packages/grafana-data/src/dataframe/processDataFrame.ts
index a0e95a773b6c8..e0b218c3d62c8 100644
--- a/packages/grafana-data/src/dataframe/processDataFrame.ts
+++ b/packages/grafana-data/src/dataframe/processDataFrame.ts
@@ -33,10 +33,11 @@ function convertTableToDataFrame(table: TableData): DataFrame {
   const fields = table.columns.map((c) => {
     // TODO: should be Column but type does not exists there so not sure whats up here.
     const { text, type, ...disp } = c as any;
+    const values: unknown[] = [];
     return {
       name: text?.length ? text : c, // rename 'text' to the 'name' field
       config: (disp || {}) as FieldConfig,
-      values: [] as unknown[],
+      values,
       type: type && Object.values(FieldType).includes(type as FieldType) ? (type as FieldType) : FieldType.other,
     };
   });
diff --git a/packages/grafana-data/src/dataframe/utils.test.ts b/packages/grafana-data/src/dataframe/utils.test.ts
index b291b732fd4ac..fcac25607df11 100644
--- a/packages/grafana-data/src/dataframe/utils.test.ts
+++ b/packages/grafana-data/src/dataframe/utils.test.ts
@@ -1,7 +1,7 @@
 import { FieldType } from '../types';
 
-import { toDataFrame } from './processDataFrame';
-import { anySeriesWithTimeField } from './utils';
+import { createDataFrame, toDataFrame } from './processDataFrame';
+import { anySeriesWithTimeField, addRow } from './utils';
 
 describe('anySeriesWithTimeField', () => {
   describe('single frame', () => {
@@ -77,3 +77,30 @@ describe('anySeriesWithTimeField', () => {
     });
   });
 });
+
+describe('addRow', () => {
+  const frame = createDataFrame({
+    fields: [
+      { name: 'name', type: FieldType.string },
+      { name: 'date', type: FieldType.time },
+      { name: 'number', type: FieldType.number },
+    ],
+  });
+  const date = Date.now();
+
+  it('adds row to data frame as object', () => {
+    addRow(frame, { name: 'A', date, number: 1 });
+    expect(frame.fields[0].values[0]).toBe('A');
+    expect(frame.fields[1].values[0]).toBe(date);
+    expect(frame.fields[2].values[0]).toBe(1);
+    expect(frame.length).toBe(1);
+  });
+
+  it('adds row to data frame as array', () => {
+    addRow(frame, ['B', date, 42]);
+    expect(frame.fields[0].values[1]).toBe('B');
+    expect(frame.fields[1].values[1]).toBe(date);
+    expect(frame.fields[2].values[1]).toBe(42);
+    expect(frame.length).toBe(2);
+  });
+});
diff --git a/packages/grafana-data/src/dataframe/utils.ts b/packages/grafana-data/src/dataframe/utils.ts
index 774c6cd4b6d41..8f45ddd1b92fe 100644
--- a/packages/grafana-data/src/dataframe/utils.ts
+++ b/packages/grafana-data/src/dataframe/utils.ts
@@ -1,18 +1,70 @@
-import { DataFrame, FieldType } from '../types/dataFrame';
+import { DataFrame, Field, FieldType } from '../types/dataFrame';
 
 import { getTimeField } from './processDataFrame';
 
+const MAX_TIME_COMPARISONS = 100;
+
 export function isTimeSeriesFrame(frame: DataFrame) {
-  if (frame.fields.length > 2) {
+  // If we have less than two frames we can't have a timeseries
+  if (frame.fields.length < 2) {
     return false;
   }
-  return Boolean(frame.fields.find((field) => field.type === FieldType.time));
+
+  // Find a number field, as long as we have any number field this should work
+  const numberField = frame.fields.find((field) => field.type === FieldType.number);
+
+  // There are certain query types in which we will
+  // get times but they will be the same or not be
+  // in increasing order. To have a time-series the
+  // times need to be ordered from past to present
+  let timeFieldFound = false;
+  for (const field of frame.fields) {
+    if (isTimeSeriesField(field)) {
+      timeFieldFound = true;
+      break;
+    }
+  }
+
+  return timeFieldFound && numberField !== undefined;
 }
 
 export function isTimeSeriesFrames(data: DataFrame[]) {
   return !data.find((frame) => !isTimeSeriesFrame(frame));
 }
 
+/**
+ * Determines if a field is a time field in ascending
+ * order within the sampling range specified by
+ * MAX_TIME_COMPARISONS
+ *
+ * @param field
+ * @returns boolean
+ */
+export function isTimeSeriesField(field: Field) {
+  if (field.type !== FieldType.time) {
+    return false;
+  }
+
+  let greatestTime: number | null = null;
+  let testWindow = field.values.length > MAX_TIME_COMPARISONS ? MAX_TIME_COMPARISONS : field.values.length;
+
+  // Test up to the test window number of values
+  for (let i = 0; i < testWindow; i++) {
+    const time = field.values[i];
+
+    // Check to see if the current time is greater than
+    // the last time. If we get to the end then we
+    // have a time series otherwise we return false
+    if (greatestTime === null || (time !== null && time > greatestTime)) {
+      greatestTime = time;
+    } else {
+      return false;
+    }
+  }
+
+  return true;
+}
+
 /**
  * Indicates if there is any time field in the array of data frames
  * @param data
@@ -26,3 +78,48 @@ export function anySeriesWithTimeField(data: DataFrame[]) {
   }
   return false;
 }
+
+/**
+ * Indicates if there is any time field in the data frame
+ * @param data
+ */
+export function hasTimeField(data: DataFrame): boolean {
+  return data.fields.some((field) => field.type === FieldType.time);
+}
+
+/**
+ * Get row id based on the meta.uniqueRowIdFields attribute.
+ * @param dataFrame
+ * @param rowIndex
+ */
+export function getRowUniqueId(dataFrame: DataFrame, rowIndex: number) {
+  if (dataFrame.meta?.uniqueRowIdFields === undefined) {
+    return undefined;
+  }
+  return dataFrame.meta.uniqueRowIdFields.map((fieldIndex) => dataFrame.fields[fieldIndex].values[rowIndex]).join('-');
+}
+
+/**
+ * Simple helper to add values to a data frame. Doesn't do any validation so make sure you are adding the right types
+ * of values.
+ * @param dataFrame
+ * @param row Either an array of values or an object with keys that match the field names.
+ */
+export function addRow(dataFrame: DataFrame, row: Record<string, unknown> | unknown[]) {
+  if (row instanceof Array) {
+    for (let i = 0; i < row.length; i++) {
+      dataFrame.fields[i].values.push(row[i]);
+    }
+  } else {
+    for (const field of dataFrame.fields) {
+      field.values.push(row[field.name]);
+    }
+  }
+  try {
+    dataFrame.length++;
+  } catch (e) {
+    // Unfortunate but even though DataFrame as interface defines length some implementation of DataFrame only have
+    // length getter. In that case it will throw and so we just skip and assume they defined a `getter` for length that
+    // does not need any external updating.
+  }
+}
diff --git a/packages/grafana-data/src/datetime/durationutil.ts b/packages/grafana-data/src/datetime/durationutil.ts
index c490554a2bc38..c8049a641bbb5 100644
--- a/packages/grafana-data/src/datetime/durationutil.ts
+++ b/packages/grafana-data/src/datetime/durationutil.ts
@@ -1,6 +1,4 @@
-import { Duration, Interval, isAfter } from 'date-fns';
-import add from 'date-fns/add';
-import intervalToDuration from 'date-fns/intervalToDuration';
+import { add, Duration, intervalToDuration, Interval, isAfter } from 'date-fns';
 
 const durationMap: { [key in Required<keyof Duration>]: string[] } = {
   years: ['y', 'Y', 'years'],
diff --git a/packages/grafana-data/src/datetime/moment_wrapper.ts b/packages/grafana-data/src/datetime/moment_wrapper.ts
index ae0f8d66ec160..6b60bb524bd52 100644
--- a/packages/grafana-data/src/datetime/moment_wrapper.ts
+++ b/packages/grafana-data/src/datetime/moment_wrapper.ts
@@ -53,7 +53,7 @@ export interface DateTimeDuration {
 
 export interface DateTime extends Object {
   add: (amount?: DateTimeInput, unit?: DurationUnit) => DateTime;
-  set: (unit: DurationUnit, amount: DateTimeInput) => void;
+  set: (unit: DurationUnit | 'date', amount: DateTimeInput) => void;
   diff: (amount: DateTimeInput, unit?: DurationUnit, truncate?: boolean) => number;
   endOf: (unitOfTime: DurationUnit) => DateTime;
   format: (formatInput?: FormatInput) => string;
@@ -126,10 +126,6 @@ export const dateTimeForTimeZone = (
   input?: DateTimeInput,
   formatInput?: FormatInput
 ): DateTime => {
-  if (timezone === 'utc') {
-    return toUtc(input, formatInput);
-  }
-
   if (timezone && timezone !== 'browser') {
     let result: moment.Moment;
 
diff --git a/packages/grafana-data/src/datetime/rangeutil.ts b/packages/grafana-data/src/datetime/rangeutil.ts
index c4f514b67356d..7bb575e5f412e 100644
--- a/packages/grafana-data/src/datetime/rangeutil.ts
+++ b/packages/grafana-data/src/datetime/rangeutil.ts
@@ -214,7 +214,7 @@ export const convertRawToRange = (
   return { from, to, raw: { from, to } };
 };
 
-function isRelativeTime(v: DateTime | string) {
+export function isRelativeTime(v: DateTime | string) {
   if (typeof v === 'string') {
     return v.indexOf('now') >= 0;
   }
diff --git a/packages/grafana-data/src/events/common.ts b/packages/grafana-data/src/events/common.ts
index 588b6a6d30d3f..6b480a834f36f 100644
--- a/packages/grafana-data/src/events/common.ts
+++ b/packages/grafana-data/src/events/common.ts
@@ -17,8 +17,8 @@ export interface DataHoverPayload {
   dataId?: string; // identifying string to correlate data between publishers and subscribers
 
   // When dragging, this will capture the point when the mouse was down
-  point: Record<string, any>; // { time: 5678, lengthft: 456 }  // each axis|scale gets a value
-  down?: Record<string, any>;
+  point: Record<string, number | null>; // { time: 5678, lengthft: 456 }  // each axis|scale gets a value
+  down?: Record<string, number | null>;
 }
 
 /** @alpha */
diff --git a/packages/grafana-data/src/events/types.ts b/packages/grafana-data/src/events/types.ts
index 5ef531a46f9ec..f5e111eb2fc9e 100644
--- a/packages/grafana-data/src/events/types.ts
+++ b/packages/grafana-data/src/events/types.ts
@@ -19,10 +19,22 @@ export abstract class BusEventBase implements BusEvent {
   readonly payload?: any;
   readonly origin?: EventBus;
 
+  /** @internal */
+  tags?: Set<string>;
+
   constructor() {
     //@ts-ignore
     this.type = this.__proto__.constructor.type;
   }
+
+  /**
+   * @internal
+   * Tag event for finer-grained filtering in subscribers
+   */
+  setTags(tags: string[]) {
+    this.tags = new Set(tags);
+    return this;
+  }
 }
 
 /**
diff --git a/packages/grafana-data/src/field/displayProcessor.ts b/packages/grafana-data/src/field/displayProcessor.ts
index 1f8e722641478..9cdef2760a69b 100644
--- a/packages/grafana-data/src/field/displayProcessor.ts
+++ b/packages/grafana-data/src/field/displayProcessor.ts
@@ -222,7 +222,7 @@ export function getRawDisplayProcessor(): DisplayProcessor {
 
 const getCircularReplacer = () => {
   const seen = new WeakSet();
-  return (_key: any, value: object | null) => {
+  return (_key: string, value: object | null) => {
     if (typeof value === 'object' && value !== null) {
       if (seen.has(value)) {
         return;
diff --git a/packages/grafana-data/src/field/fieldColor.ts b/packages/grafana-data/src/field/fieldColor.ts
index 289177150defd..29bbc1f801107 100644
--- a/packages/grafana-data/src/field/fieldColor.ts
+++ b/packages/grafana-data/src/field/fieldColor.ts
@@ -10,7 +10,7 @@ import { RegistryItem } from '../utils';
 import { Registry } from '../utils/Registry';
 
 import { getScaleCalculator, ColorScaleValue } from './scale';
-import { fallBackTreshold } from './thresholds';
+import { fallBackThreshold } from './thresholds';
 
 /** @beta */
 export type FieldValueColorCalculator = (value: number, percent: number, Threshold?: Threshold) => string;
@@ -46,7 +46,7 @@ export const fieldColorModeRegistry = new Registry<FieldColorMode>(() => {
       description: 'Derive colors from thresholds',
       getCalculator: (_field, theme) => {
         return (_value, _percent, threshold) => {
-          const thresholdSafe = threshold ?? fallBackTreshold;
+          const thresholdSafe = threshold ?? fallBackThreshold;
           return theme.visualization.getColorByName(thresholdSafe.color);
         };
       },
@@ -251,7 +251,7 @@ export function getFieldSeriesColor(field: Field, theme: GrafanaTheme2): ColorSc
   if (!mode.isByValue) {
     return {
       color: mode.getCalculator(field, theme)(0, 0),
-      threshold: fallBackTreshold,
+      threshold: fallBackThreshold,
       percent: 1,
     };
   }
diff --git a/packages/grafana-data/src/field/fieldComparers.ts b/packages/grafana-data/src/field/fieldComparers.ts
index 972b435cd3540..3f525b0640585 100644
--- a/packages/grafana-data/src/field/fieldComparers.ts
+++ b/packages/grafana-data/src/field/fieldComparers.ts
@@ -5,7 +5,6 @@ import { Field, FieldType } from '../types/dataFrame';
 
 type IndexComparer = (a: number, b: number) => number;
 
-/** @public */
 export const fieldIndexComparer = (field: Field, reverse = false): IndexComparer => {
   const values = field.values;
 
@@ -26,8 +25,7 @@ export const fieldIndexComparer = (field: Field, reverse = false): IndexComparer
   }
 };
 
-/** @public */
-export const timeComparer = (a: unknown, b: unknown): number => {
+const timeComparer = (a: unknown, b: unknown): number => {
   if (!a || !b) {
     return falsyComparer(a, b);
   }
@@ -49,20 +47,18 @@ export const timeComparer = (a: unknown, b: unknown): number => {
   return 0;
 };
 
-/** @public */
-export const numericComparer = (a: number, b: number): number => {
+const numericComparer = (a: number, b: number): number => {
   return a - b;
 };
 
-/** @public */
-export const stringComparer = (a: string, b: string): number => {
+const stringComparer = (a: string, b: string): number => {
   if (!a || !b) {
     return falsyComparer(a, b);
   }
   return a.localeCompare(b);
 };
 
-export const booleanComparer = (a: boolean, b: boolean): number => {
+const booleanComparer = (a: boolean, b: boolean): number => {
   return falsyComparer(a, b);
 };
 
diff --git a/packages/grafana-data/src/field/fieldDisplay.ts b/packages/grafana-data/src/field/fieldDisplay.ts
index 9830cf200481e..ff33188eff373 100644
--- a/packages/grafana-data/src/field/fieldDisplay.ts
+++ b/packages/grafana-data/src/field/fieldDisplay.ts
@@ -72,6 +72,7 @@ export interface GetFieldDisplayValuesOptions {
   fieldConfig: FieldConfigSource;
   replaceVariables: InterpolateFunction;
   sparkline?: boolean; // Calculate the sparkline
+  percentChange?: boolean; // Calculate percent change
   theme: GrafanaTheme2;
   timeZone?: TimeZone;
 }
@@ -186,6 +187,9 @@ export const getFieldDisplayValues = (options: GetFieldDisplayValuesOptions): Fi
           } else {
             displayValue.title = getFieldDisplayName(field, dataFrame, data);
           }
+          displayValue.percentChange = options.percentChange
+            ? reduceField({ field: field, reducers: [ReducerID.diffperc] }).diffperc
+            : undefined;
 
           let sparkline: FieldSparkline | undefined = undefined;
           if (options.sparkline) {
@@ -200,6 +204,25 @@ export const getFieldDisplayValues = (options: GetFieldDisplayValuesOptions): Fi
             }
           }
 
+          // If there is only one row in the data frame, then set the
+          // valueRowIndex to that one row. This allows the data macros in
+          // things like links to access other fields from the data frame.
+          //
+          // If there were more rows, it still may be sane to set the row
+          // index, but it may be confusing; the calculation may have
+          // selected a value from a different row or it may have aggregated
+          // the values from multiple rows, so to make just the first row
+          // available would be arbitrary. For now, the users will have to
+          // ensure that the data frame has just one row if they want data
+          // link referencing other fields to work.
+          //
+          // TODO: A more complete solution here would be to allow the
+          // calculation to report a relevant row and use that value. For
+          // example, a common calculation is 'lastNotNull'. It'd be nifty to
+          // know which row the display value corresponds to in that case if
+          // there were potentially many
+          const valueRowIndex = dataFrame.length === 1 ? 0 : undefined;
+
           values.push({
             name: calc,
             field: config,
@@ -211,6 +234,7 @@ export const getFieldDisplayValues = (options: GetFieldDisplayValuesOptions): Fi
               ? () =>
                   fieldLinksSupplier({
                     calculatedValue: displayValue,
+                    valueRowIndex,
                   })
               : () => [],
             hasLinks: hasLinks(field),
diff --git a/packages/grafana-data/src/field/fieldOverrides.test.ts b/packages/grafana-data/src/field/fieldOverrides.test.ts
index 8d358a80320aa..67426e6f53864 100644
--- a/packages/grafana-data/src/field/fieldOverrides.test.ts
+++ b/packages/grafana-data/src/field/fieldOverrides.test.ts
@@ -124,7 +124,7 @@ describe('Global MinMax', () => {
     });
   });
 
-  describe('when value values are zeo', () => {
+  describe('when values are zero', () => {
     it('then global min max should be correct', () => {
       const frame = toDataFrame({
         fields: [
diff --git a/packages/grafana-data/src/field/fieldOverrides.ts b/packages/grafana-data/src/field/fieldOverrides.ts
index 8316e1a735087..4047a589d9606 100644
--- a/packages/grafana-data/src/field/fieldOverrides.ts
+++ b/packages/grafana-data/src/field/fieldOverrides.ts
@@ -206,6 +206,13 @@ export function applyFieldOverrides(options: ApplyFieldOverrideOptions): DataFra
         for (const nestedFrames of field.values) {
           for (let nfIndex = 0; nfIndex < nestedFrames.length; nfIndex++) {
             for (const valueField of nestedFrames[nfIndex].fields) {
+              // Get display processor for nested fields
+              valueField.display = getDisplayProcessor({
+                field: valueField,
+                theme: options.theme,
+                timeZone: options.timeZone,
+              });
+
               valueField.state = {
                 scopedVars: {
                   __dataContext: {
@@ -238,7 +245,7 @@ export function applyFieldOverrides(options: ApplyFieldOverrideOptions): DataFra
 }
 
 function calculateRange(
-  config: FieldConfig<any>,
+  config: FieldConfig,
   field: Field,
   globalRange: NumericRange | undefined,
   data: DataFrame[]
@@ -269,7 +276,7 @@ function calculateRange(
 // 2. have the ability to selectively get display color or text (but not always both, which are each quite expensive)
 // 3. sufficently optimize text formatting and threshold color determinitation
 function cachingDisplayProcessor(disp: DisplayProcessor, maxCacheSize = 2500): DisplayProcessor {
-  type dispCache = Map<any, DisplayValue>;
+  type dispCache = Map<unknown, DisplayValue>;
   // decimals -> cache mapping, -1 is unspecified decimals
   const caches = new Map<number, dispCache>();
 
diff --git a/packages/grafana-data/src/field/fieldState.test.ts b/packages/grafana-data/src/field/fieldState.test.ts
index a017962f37b6c..33275a58cebc3 100644
--- a/packages/grafana-data/src/field/fieldState.test.ts
+++ b/packages/grafana-data/src/field/fieldState.test.ts
@@ -15,11 +15,6 @@ function checkScenario(scenario: TitleScenario): string {
   return getFieldDisplayName(field, frame, scenario.frames);
 }
 
-jest.mock('lodash', () => ({
-  ...jest.requireActual('lodash'),
-  isEqual: jest.fn().mockImplementation((obj1, obj2) => obj1 === obj2),
-}));
-
 describe('getFieldDisplayName', () => {
   it('Should add suffix for comparison frames', () => {
     const frame = toDataFrame({
diff --git a/packages/grafana-data/src/field/fieldState.ts b/packages/grafana-data/src/field/fieldState.ts
index 6f816ca5cf5be..065960148e04e 100644
--- a/packages/grafana-data/src/field/fieldState.ts
+++ b/packages/grafana-data/src/field/fieldState.ts
@@ -1,6 +1,12 @@
-import { isEqual } from 'lodash';
-
-import { DataFrame, Field, TIME_SERIES_VALUE_FIELD_NAME, FieldType, TIME_SERIES_TIME_FIELD_NAME } from '../types';
+import { getFieldMatcher } from '../transformations';
+import {
+  DataFrame,
+  Field,
+  TIME_SERIES_VALUE_FIELD_NAME,
+  FieldType,
+  TIME_SERIES_TIME_FIELD_NAME,
+  FieldConfigSource,
+} from '../types';
 import { formatLabels } from '../utils/labels';
 
 /**
@@ -31,7 +37,7 @@ export function getFrameDisplayName(frame: DataFrame, index?: number) {
   }
 
   // list all the
-  if (index === undefined) {
+  if (index === undefined && frame.fields.length > 0) {
     return frame.fields
       .filter((f) => f.type !== FieldType.time)
       .map((f) => getFieldDisplayName(f, frame))
@@ -53,6 +59,53 @@ export function cacheFieldDisplayNames(frames: DataFrame[]) {
   });
 }
 
+/**
+ *
+ * moves each field's config.custom.hideFrom to field.state.hideFrom
+ * and mutates orgiginal field.config.custom.hideFrom to one with explicit overrides only, (without the ad-hoc stateful __system override from legend toggle)
+ */
+export function decoupleHideFromState(frames: DataFrame[], fieldConfig: FieldConfigSource<any>) {
+  frames.forEach((frame) => {
+    frame.fields.forEach((field) => {
+      const hideFrom = {
+        legend: false,
+        tooltip: false,
+        viz: false,
+        ...fieldConfig.defaults.custom?.hideFrom,
+      };
+
+      // with ad hoc __system override applied
+      const hideFromState = field.config.custom?.hideFrom;
+
+      fieldConfig.overrides.forEach((o) => {
+        if ('__systemRef' in o) {
+          return;
+        }
+
+        const m = getFieldMatcher(o.matcher);
+
+        if (m(field, frame, frames)) {
+          for (const p of o.properties) {
+            if (p.id === 'custom.hideFrom') {
+              Object.assign(hideFrom, p.value);
+            }
+          }
+        }
+      });
+
+      field.state = {
+        ...field.state,
+        hideFrom: {
+          ...hideFromState,
+        },
+      };
+
+      // original with perm overrides
+      field.config.custom.hideFrom = hideFrom;
+    });
+  });
+}
+
 export function getFieldDisplayName(field: Field, frame?: DataFrame, allFrames?: DataFrame[]): string {
   const existingTitle = field.state?.displayName;
   const multipleFrames = Boolean(allFrames && allFrames.length > 1);
@@ -159,7 +212,7 @@ export function calculateFieldDisplayName(field: Field, frame?: DataFrame, allFr
   return displayName;
 }
 
-function getUniqueFieldName(field: Field, frame?: DataFrame) {
+export function getUniqueFieldName(field: Field, frame?: DataFrame) {
   let dupeCount = 0;
   let foundSelf = false;
 
@@ -167,7 +220,7 @@ function getUniqueFieldName(field: Field, frame?: DataFrame) {
     for (let i = 0; i < frame.fields.length; i++) {
       const otherField = frame.fields[i];
 
-      if (isEqual(field, otherField)) {
+      if (field === otherField) {
         foundSelf = true;
 
         if (dupeCount > 0) {
diff --git a/packages/grafana-data/src/field/index.ts b/packages/grafana-data/src/field/index.ts
index b457d674034dc..e7b483bdd88fc 100644
--- a/packages/grafana-data/src/field/index.ts
+++ b/packages/grafana-data/src/field/index.ts
@@ -14,5 +14,5 @@ export { FieldConfigOptionsRegistry } from './FieldConfigOptionsRegistry';
 export { sortThresholds, getActiveThreshold } from './thresholds';
 export { applyFieldOverrides, validateFieldConfig, applyRawFieldOverrides, useFieldOverrides } from './fieldOverrides';
 export { getFieldDisplayValuesProxy } from './getFieldDisplayValuesProxy';
-export { getFieldDisplayName, getFrameDisplayName, cacheFieldDisplayNames } from './fieldState';
+export { getFieldDisplayName, getFrameDisplayName, cacheFieldDisplayNames, getUniqueFieldName } from './fieldState';
 export { getScaleCalculator, getFieldConfigWithMinMax, getMinMaxAndDelta } from './scale';
diff --git a/packages/grafana-data/src/field/overrides/processors.ts b/packages/grafana-data/src/field/overrides/processors.ts
index d829f7963a9b5..fe552f15b7e98 100644
--- a/packages/grafana-data/src/field/overrides/processors.ts
+++ b/packages/grafana-data/src/field/overrides/processors.ts
@@ -8,7 +8,7 @@ import {
   ValueMapping,
 } from '../../types';
 
-export const identityOverrideProcessor = <T>(value: T, _context: FieldOverrideContext, _settings: any) => {
+export const identityOverrideProcessor = <T>(value: T) => {
   return value;
 };
 
@@ -33,7 +33,7 @@ export const numberOverrideProcessor = (
 };
 
 export const displayNameOverrideProcessor = (
-  value: any,
+  value: unknown,
   context: FieldOverrideContext,
   settings?: StringFieldConfigSettings
 ) => {
@@ -100,14 +100,14 @@ export interface StringFieldConfigSettings {
 }
 
 export const stringOverrideProcessor = (
-  value: any,
+  value: unknown,
   context: FieldOverrideContext,
   settings?: StringFieldConfigSettings
 ) => {
   if (value === null || value === undefined) {
     return value;
   }
-  if (settings && settings.expandTemplateVars && context.replaceVariables) {
+  if (settings && settings.expandTemplateVars && context.replaceVariables && typeof value === 'string') {
     return context.replaceVariables(value, context.field!.state!.scopedVars);
   }
   return `${value}`;
@@ -174,6 +174,12 @@ export interface StatsPickerConfigSettings {
   defaultStat?: string;
 }
 
+export enum FieldNamePickerBaseNameMode {
+  IncludeAll = 'all',
+  ExcludeBaseNames = 'exclude',
+  OnlyBaseNames = 'only',
+}
+
 export interface FieldNamePickerConfigSettings {
   /**
    * Function is a predicate, to test each element of the array.
@@ -186,11 +192,16 @@ export interface FieldNamePickerConfigSettings {
    */
   noFieldsMessage?: string;
 
-  /**addFieldNamePicker
+  /**
    * Sets the width to a pixel value.
    */
   width?: number;
 
+  /**
+   * Exclude names that can match a collection of values
+   */
+  baseNameMode?: FieldNamePickerBaseNameMode;
+
   /**
    * Placeholder text to display when nothing is selected.
    */
diff --git a/packages/grafana-data/src/field/scale.ts b/packages/grafana-data/src/field/scale.ts
index e97b01faf9462..c8624e6086fc6 100644
--- a/packages/grafana-data/src/field/scale.ts
+++ b/packages/grafana-data/src/field/scale.ts
@@ -9,7 +9,7 @@ import { getActiveThresholdForValue } from './thresholds';
 
 export interface ColorScaleValue {
   percent: number; // 0-1
-  threshold: Threshold;
+  threshold: Threshold | undefined;
   color: string;
 }
 
@@ -49,13 +49,13 @@ function getBooleanScaleCalculator(field: Field, theme: GrafanaTheme2): ScaleCal
   const trueValue: ColorScaleValue = {
     color: theme.visualization.getColorByName('green'),
     percent: 1,
-    threshold: undefined as unknown as Threshold,
+    threshold: undefined,
   };
 
   const falseValue: ColorScaleValue = {
     color: theme.visualization.getColorByName('red'),
     percent: 0,
-    threshold: undefined as unknown as Threshold,
+    threshold: undefined,
   };
 
   const mode = getFieldColorModeForField(field);
diff --git a/packages/grafana-data/src/field/standardFieldConfigEditorRegistry.ts b/packages/grafana-data/src/field/standardFieldConfigEditorRegistry.ts
index 75f0a32f94d22..6f8beee78aeae 100644
--- a/packages/grafana-data/src/field/standardFieldConfigEditorRegistry.ts
+++ b/packages/grafana-data/src/field/standardFieldConfigEditorRegistry.ts
@@ -19,10 +19,14 @@ export interface StandardEditorContext<TOptions, TState = any> {
 export interface StandardEditorProps<TValue = any, TSettings = any, TOptions = any, TState = any> {
   value: TValue;
   onChange: (value?: TValue) => void;
-  item: StandardEditorsRegistryItem<TValue, TSettings>;
   context: StandardEditorContext<TOptions, TState>;
   id?: string;
+
+  item: RegistryItem & {
+    settings?: TSettings;
+  };
 }
+
 export interface StandardEditorsRegistryItem<TValue = any, TSettings = any> extends RegistryItem {
   editor: ComponentType<StandardEditorProps<TValue, TSettings>>;
   settings?: TSettings;
diff --git a/packages/grafana-data/src/field/thresholds.ts b/packages/grafana-data/src/field/thresholds.ts
index 8328483aa20ea..a756af1711495 100644
--- a/packages/grafana-data/src/field/thresholds.ts
+++ b/packages/grafana-data/src/field/thresholds.ts
@@ -1,10 +1,10 @@
 import { Threshold, FALLBACK_COLOR, Field, ThresholdsMode } from '../types';
 
-export const fallBackTreshold: Threshold = { value: 0, color: FALLBACK_COLOR };
+export const fallBackThreshold: Threshold = { value: 0, color: FALLBACK_COLOR };
 
 export function getActiveThreshold(value: number, thresholds: Threshold[] | undefined): Threshold {
   if (!thresholds || thresholds.length === 0) {
-    return fallBackTreshold;
+    return fallBackThreshold;
   }
 
   let active = thresholds[0];
diff --git a/packages/grafana-data/src/geo/layer.ts b/packages/grafana-data/src/geo/layer.ts
index c51750c36006f..bb65b01dcb353 100644
--- a/packages/grafana-data/src/geo/layer.ts
+++ b/packages/grafana-data/src/geo/layer.ts
@@ -42,7 +42,7 @@ export interface MapLayerHandler<TConfig = any> {
    */
   registerOptionsUI?: (
     builder: PanelOptionsEditorBuilder<MapLayerOptions<TConfig>>,
-    context: StandardEditorContext<any, any>
+    context: StandardEditorContext<any>
   ) => void;
 }
 
diff --git a/packages/grafana-data/src/index.ts b/packages/grafana-data/src/index.ts
index 0b4e525f30c74..bbe35a8fbe1b1 100644
--- a/packages/grafana-data/src/index.ts
+++ b/packages/grafana-data/src/index.ts
@@ -5,7 +5,6 @@
  */
 export * from './utils';
 export * from './types';
-export * from './vector';
 export * from './dataframe';
 export * from './transformations';
 export * from './datetime';
@@ -16,6 +15,7 @@ export * from './events';
 export * from './themes';
 export * from './monaco';
 export * from './geo/layer';
+export * from './query';
 export {
   type ValueMatcherOptions,
   type BasicValueMatcherOptions,
@@ -43,3 +43,9 @@ export {
 export { usePluginContext } from './context/plugins/usePluginContext';
 export { isDataSourcePluginContext } from './context/plugins/guards';
 export { getLinksSupplier } from './field/fieldOverrides';
+
+// deprecated
+export { CircularVector } from './vector/CircularVector';
+export { vectorator } from './vector/FunctionalVector';
+export { ArrayVector } from './vector/ArrayVector';
+export * from './dataframe/CircularDataFrame';
diff --git a/packages/grafana-data/src/monaco/languageRegistry.ts b/packages/grafana-data/src/monaco/languageRegistry.ts
index fcfc843ab3180..f12cca2932027 100644
--- a/packages/grafana-data/src/monaco/languageRegistry.ts
+++ b/packages/grafana-data/src/monaco/languageRegistry.ts
@@ -4,7 +4,7 @@ import { Registry, RegistryItem } from '../utils/Registry';
  * @alpha
  */
 export interface MonacoLanguageRegistryItem extends RegistryItem {
-  init: () => Promise<void>;
+  init: () => Worker;
 }
 
 /**
diff --git a/packages/grafana-data/src/panel/getPanelOptionsWithDefaults.ts b/packages/grafana-data/src/panel/getPanelOptionsWithDefaults.ts
index 1061054d1d197..3bcdf8883ae25 100644
--- a/packages/grafana-data/src/panel/getPanelOptionsWithDefaults.ts
+++ b/packages/grafana-data/src/panel/getPanelOptionsWithDefaults.ts
@@ -14,15 +14,15 @@ import { ThresholdsConfig, ThresholdsMode } from '../types/thresholds';
 
 import { PanelPlugin } from './PanelPlugin';
 
-export interface Props {
+interface Props {
   plugin: PanelPlugin;
   currentFieldConfig: FieldConfigSource;
-  currentOptions: Record<string, any>;
+  currentOptions: Record<string, unknown>;
   isAfterPluginChange: boolean;
 }
 
 export interface OptionDefaults {
-  options: any;
+  options: Record<string, unknown>;
   fieldConfig: FieldConfigSource;
 }
 
@@ -111,11 +111,10 @@ export function filterFieldConfigOverrides(
     .filter((x) => x.properties.length > 0);
 }
 
-function cleanProperties(obj: any, parentPath: string, fieldConfigRegistry: FieldConfigOptionsRegistry) {
+function cleanProperties(obj: object, parentPath: string, fieldConfigRegistry: FieldConfigOptionsRegistry) {
   let found = false;
 
-  for (const propName of Object.keys(obj)) {
-    const value = obj[propName];
+  for (const [propName, value] of Object.entries(obj)) {
     const fullPath = `${parentPath}${propName}`;
     const existsInRegistry = !!fieldConfigRegistry.getIfExists(fullPath);
 
diff --git a/packages/grafana-data/src/panel/registryFactories.ts b/packages/grafana-data/src/panel/registryFactories.ts
index 1cd6e8524d1ed..a312d0c128eb4 100644
--- a/packages/grafana-data/src/panel/registryFactories.ts
+++ b/packages/grafana-data/src/panel/registryFactories.ts
@@ -43,17 +43,17 @@ export function createFieldConfigRegistry<TFieldConfigOptions>(
   }
 
   for (let fieldConfigProp of standardConfigs) {
+    const id = fieldConfigProp.id as FieldConfigProperty;
     if (config.disableStandardOptions) {
-      const isDisabled = config.disableStandardOptions.indexOf(fieldConfigProp.id as FieldConfigProperty) > -1;
+      const isDisabled = config.disableStandardOptions.indexOf(id) > -1;
       if (isDisabled) {
         continue;
       }
     }
     if (config.standardOptions) {
-      const customHideFromDefaults =
-        config.standardOptions[fieldConfigProp.id as FieldConfigProperty]?.hideFromDefaults;
-      const customDefault = config.standardOptions[fieldConfigProp.id as FieldConfigProperty]?.defaultValue;
-      const customSettings = config.standardOptions[fieldConfigProp.id as FieldConfigProperty]?.settings;
+      const customHideFromDefaults = config.standardOptions[id]?.hideFromDefaults;
+      const customDefault = config.standardOptions[id]?.defaultValue;
+      const customSettings = config.standardOptions[id]?.settings;
 
       if (customHideFromDefaults) {
         fieldConfigProp = {
diff --git a/packages/grafana-data/src/query/index.ts b/packages/grafana-data/src/query/index.ts
new file mode 100644
index 0000000000000..b01ae2451d54f
--- /dev/null
+++ b/packages/grafana-data/src/query/index.ts
@@ -0,0 +1 @@
+export * from './refId';
diff --git a/packages/grafana-data/src/query/refId.test.ts b/packages/grafana-data/src/query/refId.test.ts
new file mode 100644
index 0000000000000..c818f6156cce1
--- /dev/null
+++ b/packages/grafana-data/src/query/refId.test.ts
@@ -0,0 +1,35 @@
+import { DataQuery } from '@grafana/schema';
+
+import { getNextRefId } from '.';
+
+export interface TestQuery extends DataQuery {
+  name?: string;
+}
+
+function dataQueryHelper(ids: string[]): DataQuery[] {
+  return ids.map((letter) => {
+    return { refId: letter };
+  });
+}
+
+const singleDataQuery: DataQuery[] = dataQueryHelper('ABCDE'.split(''));
+const outOfOrderDataQuery: DataQuery[] = dataQueryHelper('ABD'.split(''));
+const singleExtendedDataQuery: DataQuery[] = dataQueryHelper('ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''));
+
+describe('Get next refId char', () => {
+  it('should return next char', () => {
+    expect(getNextRefId(singleDataQuery)).toEqual('F');
+  });
+
+  it('should get first char', () => {
+    expect(getNextRefId([])).toEqual('A');
+  });
+
+  it('should get the first available character if a query has been deleted out of order', () => {
+    expect(getNextRefId(outOfOrderDataQuery)).toEqual('C');
+  });
+
+  it('should append a new char and start from AA when Z is reached', () => {
+    expect(getNextRefId(singleExtendedDataQuery)).toEqual('AA');
+  });
+});
diff --git a/packages/grafana-data/src/query/refId.ts b/packages/grafana-data/src/query/refId.ts
new file mode 100644
index 0000000000000..bdfa87ef68af5
--- /dev/null
+++ b/packages/grafana-data/src/query/refId.ts
@@ -0,0 +1,23 @@
+import { DataQuery } from '@grafana/schema';
+
+/**
+ * Finds the next available refId for a query
+ */
+export const getNextRefId = (queries: DataQuery[]): string => {
+  for (let num = 0; ; num++) {
+    const refId = getRefId(num);
+    if (!queries.some((query) => query.refId === refId)) {
+      return refId;
+    }
+  }
+};
+
+function getRefId(num: number): string {
+  const letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+
+  if (num < letters.length) {
+    return letters[num];
+  } else {
+    return getRefId(Math.floor(num / letters.length) - 1) + letters[num % letters.length];
+  }
+}
diff --git a/packages/grafana-data/src/text/markdown.ts b/packages/grafana-data/src/text/markdown.ts
index 3ddfd83b4df2b..446e95e6f828b 100644
--- a/packages/grafana-data/src/text/markdown.ts
+++ b/packages/grafana-data/src/text/markdown.ts
@@ -1,4 +1,4 @@
-import { marked } from 'marked';
+import { marked, MarkedOptions } from 'marked';
 import { mangle } from 'marked-mangle';
 
 import { sanitizeTextPanelContent } from './sanitize';
@@ -10,13 +10,9 @@ export interface RenderMarkdownOptions {
   breaks?: boolean;
 }
 
-const markdownOptions = {
-  headerIds: false,
+const markdownOptions: MarkedOptions = {
   pedantic: false,
   gfm: true,
-  smartLists: true,
-  smartypants: false,
-  xhtml: false,
   breaks: false,
 };
 
@@ -36,6 +32,12 @@ export function renderMarkdown(str?: string, options?: RenderMarkdownOptions): s
   }
   const html = marked(str || '', opts);
 
+  // `marked()` returns a promise if using any extensions that require async processing.
+  // we don't use any async extensions, but there is no way for typescript to know this, so we need to check the type.
+  if (typeof html !== 'string') {
+    throw new Error('Failed to process markdown synchronously.');
+  }
+
   if (options?.noSanitize) {
     return html;
   }
@@ -51,6 +53,13 @@ export function renderTextPanelMarkdown(str?: string, options?: RenderMarkdownOp
   }
 
   const html = marked(str || '');
+
+  // `marked()` returns a promise if using any extensions that require async processing.
+  // we don't use any async extensions, but there is no way for typescript to know this, so we need to check the type.
+  if (typeof html !== 'string') {
+    throw new Error('Failed to process markdown synchronously.');
+  }
+
   if (options?.noSanitize) {
     return html;
   }
diff --git a/packages/grafana-data/src/themes/colorManipulator.ts b/packages/grafana-data/src/themes/colorManipulator.ts
index 0ab6eb2cca162..dcd0ce481e2a0 100644
--- a/packages/grafana-data/src/themes/colorManipulator.ts
+++ b/packages/grafana-data/src/themes/colorManipulator.ts
@@ -32,9 +32,15 @@ export function hexToRgb(color: string) {
   color = color.slice(1);
 
   const re = new RegExp(`.{1,${color.length >= 6 ? 2 : 1}}`, 'g');
-  let colors = color.match(re);
+  let result = color.match(re);
 
-  if (colors && colors[0].length === 1) {
+  if (!result) {
+    return '';
+  }
+
+  let colors = Array.from(result);
+
+  if (colors[0].length === 1) {
     colors = colors.map((n) => n + n);
   }
 
diff --git a/packages/grafana-data/src/themes/createColors.ts b/packages/grafana-data/src/themes/createColors.ts
index 4e2382347d2fe..8dc73521b7593 100644
--- a/packages/grafana-data/src/themes/createColors.ts
+++ b/packages/grafana-data/src/themes/createColors.ts
@@ -2,6 +2,8 @@ import { merge } from 'lodash';
 
 import { alpha, darken, emphasize, getContrastRatio, lighten } from './colorManipulator';
 import { palette } from './palette';
+// Psiphon change - import Psiphon theme colors
+import { psiphonTheme } from './psiphonTheme';
 import { DeepPartial, ThemeRichColor } from './types';
 
 /** @internal */
@@ -47,6 +49,12 @@ export interface ThemeColorsBase<TColor> {
     brandHorizontal: string;
   };
 
+  // Psiphon change - add Psiphon theme colors to the theme type
+  psiphon: {
+    psiphonOrangeLight: string;
+    psiphonOrangeDark: string;
+  };
+
   action: {
     /** Used for selected menu item / select option */
     selected: string;
@@ -161,6 +169,12 @@ class DarkColors implements ThemeColorsBase<Partial<ThemeRichColor>> {
     brandVertical: 'linear-gradient(0.01deg, #F55F3E 0.01%, #FF8833 99.99%)',
   };
 
+  // Psiphon change - add Psiphon colors to dark theme (not used yet)
+  psiphon = {
+    psiphonOrangeLight: psiphonTheme.psiphonOrangeLight,
+    psiphonOrangeDark: psiphonTheme.psiphonOrangeDark,
+  };
+
   contrastThreshold = 3;
   hoverFactor = 0.03;
   tonalOffset = 0.15;
@@ -172,8 +186,9 @@ class LightColors implements ThemeColorsBase<Partial<ThemeRichColor>> {
   blackBase = '36, 41, 46';
 
   primary = {
-    main: palette.blueLightMain,
-    border: palette.blueLightText,
+    // Psiphon change - use Psiphon orange colors for primary
+    main: psiphonTheme.psiphonOrangeDark,
+    border: psiphonTheme.psiphonOrangeLight,
     text: palette.blueLightText,
   };
 
@@ -243,6 +258,12 @@ class LightColors implements ThemeColorsBase<Partial<ThemeRichColor>> {
     brandVertical: 'linear-gradient(0.01deg, #F53E4C -31.2%, #FF8833 113.07%)',
   };
 
+  // Psiphon change - add Psiphon theme colors to the light theme.
+  psiphon = {
+    psiphonOrangeLight: psiphonTheme.psiphonOrangeLight,
+    psiphonOrangeDark: psiphonTheme.psiphonOrangeDark,
+  };
+
   contrastThreshold = 3;
   hoverFactor = 0.03;
   tonalOffset = 0.2;
diff --git a/packages/grafana-data/src/themes/createTypography.ts b/packages/grafana-data/src/themes/createTypography.ts
index 1473adc2bb8d2..3f11990c0e7fa 100644
--- a/packages/grafana-data/src/themes/createTypography.ts
+++ b/packages/grafana-data/src/themes/createTypography.ts
@@ -114,6 +114,7 @@ export function createTypography(colors: ThemeColors, typographyInput: ThemeTypo
     h6: buildVariant(fontWeightMedium, 14, 22, 0.15),
     body: buildVariant(fontWeightRegular, fontSize, 22, 0.15),
     bodySmall: buildVariant(fontWeightRegular, 12, 18, 0.15),
+    code: { ...buildVariant(fontWeightRegular, 14, 16, 0.15), fontFamily: fontFamilyMonospace },
   };
 
   const size = {
@@ -152,4 +153,5 @@ export interface ThemeTypographyVariantTypes {
   h6: ThemeTypographyVariant;
   body: ThemeTypographyVariant;
   bodySmall: ThemeTypographyVariant;
+  code: ThemeTypographyVariant;
 }
diff --git a/packages/grafana-data/src/themes/createVisualizationColors.ts b/packages/grafana-data/src/themes/createVisualizationColors.ts
index 163e6ba7c2b3a..89ccd9bbd2017 100644
--- a/packages/grafana-data/src/themes/createVisualizationColors.ts
+++ b/packages/grafana-data/src/themes/createVisualizationColors.ts
@@ -52,7 +52,7 @@ export function createVisualizationColors(colors: ThemeColors): ThemeVisualizati
   }
 
   // special colors
-  byNameIndex['transparent'] = 'rgba(0,0,0,0)';
+  byNameIndex['transparent'] = colors.mode === 'light' ? 'rgba(255, 255, 255, 0)' : 'rgba(0,0,0,0)';
   byNameIndex['panel-bg'] = colors.background.primary;
   byNameIndex['text'] = colors.text.primary;
 
diff --git a/packages/grafana-data/src/themes/psiphonTheme.ts b/packages/grafana-data/src/themes/psiphonTheme.ts
new file mode 100644
index 0000000000000..5150af822b925
--- /dev/null
+++ b/packages/grafana-data/src/themes/psiphonTheme.ts
@@ -0,0 +1,5 @@
+// Psiphon addition - custom Psiphon theme colours
+export const psiphonTheme = {
+  psiphonOrangeLight: '#ff7941',
+  psiphonOrangeDark: '#fd6222',
+};
diff --git a/packages/grafana-data/src/transformations/fieldReducer.test.ts b/packages/grafana-data/src/transformations/fieldReducer.test.ts
index c1d89c487a00d..f96321508b388 100644
--- a/packages/grafana-data/src/transformations/fieldReducer.test.ts
+++ b/packages/grafana-data/src/transformations/fieldReducer.test.ts
@@ -3,7 +3,7 @@ import { difference } from 'lodash';
 import { createDataFrame, guessFieldTypeFromValue } from '../dataframe/processDataFrame';
 import { Field, FieldType, NullValueMode } from '../types/index';
 
-import { fieldReducers, ReducerID, reduceField } from './fieldReducer';
+import { fieldReducers, ReducerID, reduceField, defaultCalcs } from './fieldReducer';
 
 /**
  * Run a reducer and get back the value
@@ -54,7 +54,7 @@ describe('Stats Calculators', () => {
   it('should calculate basic stats', () => {
     const stats = reduceField({
       field: basicTable.fields[0],
-      reducers: ['first', 'last', 'mean', 'count'],
+      reducers: [ReducerID.first, ReducerID.last, ReducerID.mean, ReducerID.count],
     });
 
     expect(stats.first).toEqual(10);
@@ -63,11 +63,20 @@ describe('Stats Calculators', () => {
     expect(stats.count).toEqual(2);
   });
 
+  it('should handle undefined field data without crashing', () => {
+    const stats = reduceField({
+      field: { name: 'a', values: undefined as unknown as unknown[], config: {}, type: FieldType.number },
+      reducers: [ReducerID.first, ReducerID.last, ReducerID.mean, ReducerID.count],
+    });
+
+    expect(stats).toEqual(defaultCalcs);
+  });
+
   it('should support a single stat also', () => {
     basicTable.fields[0].state = undefined; // clear the cache
     const stats = reduceField({
       field: basicTable.fields[0],
-      reducers: ['first'],
+      reducers: [ReducerID.first],
     });
 
     // Should do the simple version that just looks up value
@@ -172,6 +181,58 @@ describe('Stats Calculators', () => {
     }
   });
 
+  it('consistent results for first/last value with NaN', () => {
+    const info = [
+      {
+        data: [NaN, 200, NaN], // first/last value is NaN
+        result: 200,
+      },
+      {
+        data: [NaN, NaN, NaN], // All NaN
+        result: null,
+      },
+      {
+        data: [undefined, undefined, undefined], // Empty row
+        result: null,
+      },
+    ];
+
+    const stats = reduceField({
+      field: createField('x', info[0].data),
+      reducers: [ReducerID.first, ReducerID.last, ReducerID.firstNotNull, ReducerID.lastNotNull, ReducerID.diffperc],
+    });
+
+    expect(stats[ReducerID.first]).toEqual(NaN);
+    expect(stats[ReducerID.last]).toEqual(NaN);
+    expect(stats[ReducerID.firstNotNull]).toEqual(200);
+    expect(stats[ReducerID.lastNotNull]).toEqual(200);
+    expect(stats[ReducerID.diffperc]).toEqual(0);
+
+    const reducers = [ReducerID.lastNotNull, ReducerID.firstNotNull];
+    for (const input of info) {
+      for (const reducer of reducers) {
+        const v1 = reduceField({
+          field: createField('x', input.data),
+          reducers: [reducer, ReducerID.mean], // uses standard path
+        })[reducer];
+
+        const v2 = reduceField({
+          field: createField('x', input.data),
+          reducers: [reducer], // uses optimized path
+        })[reducer];
+
+        if (v1 !== v2 || v1 !== input.result) {
+          const msg =
+            `Invalid ${reducer} result for: ` +
+            input.data.join(', ') +
+            ` Expected: ${input.result}` + // configured
+            ` Received: Multiple: ${v1}, Single: ${v2}`;
+          expect(msg).toEqual(null);
+        }
+      }
+    }
+  });
+
   it('count should ignoreNulls by default', () => {
     const someNulls = createField('x', [1, null, null, 1]);
     expect(reduce(someNulls, ReducerID.count)).toEqual(2);
diff --git a/packages/grafana-data/src/transformations/fieldReducer.ts b/packages/grafana-data/src/transformations/fieldReducer.ts
index 8e2eea0f791e9..b303654b89500 100644
--- a/packages/grafana-data/src/transformations/fieldReducer.ts
+++ b/packages/grafana-data/src/transformations/fieldReducer.ts
@@ -39,8 +39,9 @@ type FieldReducer = (field: Field, ignoreNulls: boolean, nullAsZero: boolean) =>
 
 export interface FieldReducerInfo extends RegistryItem {
   // Internal details
-  emptyInputResult?: any; // typically null, but some things like 'count' & 'sum' should be zero
+  emptyInputResult?: unknown; // typically null, but some things like 'count' & 'sum' should be zero
   standard: boolean; // The most common stats can all be calculated in a single pass
+  preservesUnits: boolean; // Whether this reducer preserves units, certain ones don't e.g. count, distinct count, etc,
   reduce?: FieldReducer;
 }
 
@@ -84,7 +85,7 @@ export function reduceField(options: ReduceFieldOptions): FieldCalcs {
   // Return early for empty series
   // This lets the concrete implementations assume at least one row
   const data = field.values;
-  if (data.length < 1) {
+  if (data && data.length < 1) {
     const calcs: FieldCalcs = { ...field.state.calcs };
     for (const reducer of queue) {
       calcs[reducer.id] = reducer.emptyInputResult !== null ? reducer.emptyInputResult : null;
@@ -137,10 +138,11 @@ export const fieldReducers = new Registry<FieldReducerInfo>(() => [
   {
     id: ReducerID.lastNotNull,
     name: 'Last *',
-    description: 'Last non-null value',
+    description: 'Last non-null value (also excludes NaNs)',
     standard: true,
     aliasIds: ['current'],
     reduce: calculateLastNotNull,
+    preservesUnits: true,
   },
   {
     id: ReducerID.last,
@@ -148,24 +150,41 @@ export const fieldReducers = new Registry<FieldReducerInfo>(() => [
     description: 'Last value',
     standard: true,
     reduce: calculateLast,
+    preservesUnits: true,
   },
   {
     id: ReducerID.firstNotNull,
     name: 'First *',
-    description: 'First non-null value',
+    description: 'First non-null value (also excludes NaNs)',
     standard: true,
     reduce: calculateFirstNotNull,
+    preservesUnits: true,
+  },
+  {
+    id: ReducerID.first,
+    name: 'First',
+    description: 'First Value',
+    standard: true,
+    reduce: calculateFirst,
+    preservesUnits: true,
+  },
+  { id: ReducerID.min, name: 'Min', description: 'Minimum Value', standard: true, preservesUnits: true },
+  { id: ReducerID.max, name: 'Max', description: 'Maximum Value', standard: true, preservesUnits: true },
+  {
+    id: ReducerID.mean,
+    name: 'Mean',
+    description: 'Average Value',
+    standard: true,
+    aliasIds: ['avg'],
+    preservesUnits: true,
   },
-  { id: ReducerID.first, name: 'First', description: 'First Value', standard: true, reduce: calculateFirst },
-  { id: ReducerID.min, name: 'Min', description: 'Minimum Value', standard: true },
-  { id: ReducerID.max, name: 'Max', description: 'Maximum Value', standard: true },
-  { id: ReducerID.mean, name: 'Mean', description: 'Average Value', standard: true, aliasIds: ['avg'] },
   {
     id: ReducerID.variance,
     name: 'Variance',
     description: 'Variance of all values in a field',
     standard: false,
     reduce: calculateStdDev,
+    preservesUnits: true,
   },
   {
     id: ReducerID.stdDev,
@@ -173,6 +192,7 @@ export const fieldReducers = new Registry<FieldReducerInfo>(() => [
     description: 'Standard deviation of all values in a field',
     standard: false,
     reduce: calculateStdDev,
+    preservesUnits: true,
   },
   {
     id: ReducerID.sum,
@@ -181,6 +201,7 @@ export const fieldReducers = new Registry<FieldReducerInfo>(() => [
     emptyInputResult: 0,
     standard: true,
     aliasIds: ['total'],
+    preservesUnits: true,
   },
   {
     id: ReducerID.count,
@@ -188,36 +209,42 @@ export const fieldReducers = new Registry<FieldReducerInfo>(() => [
     description: 'Number of values in response',
     emptyInputResult: 0,
     standard: true,
+    preservesUnits: false,
   },
   {
     id: ReducerID.range,
     name: 'Range',
     description: 'Difference between minimum and maximum values',
     standard: true,
+    preservesUnits: true,
   },
   {
     id: ReducerID.delta,
     name: 'Delta',
     description: 'Cumulative change in value',
     standard: true,
+    preservesUnits: true,
   },
   {
     id: ReducerID.step,
     name: 'Step',
     description: 'Minimum interval between values',
     standard: true,
+    preservesUnits: true,
   },
   {
     id: ReducerID.diff,
     name: 'Difference',
     description: 'Difference between first and last values',
     standard: true,
+    preservesUnits: true,
   },
   {
     id: ReducerID.logmin,
     name: 'Min (above zero)',
     description: 'Used for log min scale',
     standard: true,
+    preservesUnits: true,
   },
   {
     id: ReducerID.allIsZero,
@@ -225,6 +252,7 @@ export const fieldReducers = new Registry<FieldReducerInfo>(() => [
     description: 'All values are zero',
     emptyInputResult: false,
     standard: true,
+    preservesUnits: true,
   },
   {
     id: ReducerID.allIsNull,
@@ -232,6 +260,7 @@ export const fieldReducers = new Registry<FieldReducerInfo>(() => [
     description: 'All values are null',
     emptyInputResult: true,
     standard: true,
+    preservesUnits: false,
   },
   {
     id: ReducerID.changeCount,
@@ -239,6 +268,7 @@ export const fieldReducers = new Registry<FieldReducerInfo>(() => [
     description: 'Number of times the value changes',
     standard: false,
     reduce: calculateChangeCount,
+    preservesUnits: false,
   },
   {
     id: ReducerID.distinctCount,
@@ -246,12 +276,14 @@ export const fieldReducers = new Registry<FieldReducerInfo>(() => [
     description: 'Number of distinct values',
     standard: false,
     reduce: calculateDistinctCount,
+    preservesUnits: false,
   },
   {
     id: ReducerID.diffperc,
     name: 'Difference percent',
     description: 'Percentage difference between first and last values',
     standard: true,
+    preservesUnits: false,
   },
   {
     id: ReducerID.allValues,
@@ -259,6 +291,7 @@ export const fieldReducers = new Registry<FieldReducerInfo>(() => [
     description: 'Returns an array with all values',
     standard: false,
     reduce: (field: Field) => ({ allValues: [...field.values] }),
+    preservesUnits: false,
   },
   {
     id: ReducerID.uniqueValues,
@@ -268,36 +301,45 @@ export const fieldReducers = new Registry<FieldReducerInfo>(() => [
     reduce: (field: Field) => ({
       uniqueValues: [...new Set(field.values)],
     }),
+    preservesUnits: false,
   },
 ]);
 
+// Used for test cases
+export const defaultCalcs: FieldCalcs = {
+  sum: 0,
+  max: -Number.MAX_VALUE,
+  min: Number.MAX_VALUE,
+  logmin: Number.MAX_VALUE,
+  mean: null,
+  last: null,
+  first: null,
+  lastNotNull: null,
+  firstNotNull: null,
+  count: 0,
+  nonNullCount: 0,
+  allIsNull: true,
+  allIsZero: true,
+  range: null,
+  diff: null,
+  delta: 0,
+  step: Number.MAX_VALUE,
+  diffperc: 0,
+
+  // Just used for calculations -- not exposed as a stat
+  previousDeltaUp: true,
+};
+
 export function doStandardCalcs(field: Field, ignoreNulls: boolean, nullAsZero: boolean): FieldCalcs {
-  const calcs: FieldCalcs = {
-    sum: 0,
-    max: -Number.MAX_VALUE,
-    min: Number.MAX_VALUE,
-    logmin: Number.MAX_VALUE,
-    mean: null,
-    last: null,
-    first: null,
-    lastNotNull: null,
-    firstNotNull: null,
-    count: 0,
-    nonNullCount: 0,
-    allIsNull: true,
-    allIsZero: true,
-    range: null,
-    diff: null,
-    delta: 0,
-    step: Number.MAX_VALUE,
-    diffperc: 0,
-
-    // Just used for calculations -- not exposed as a stat
-    previousDeltaUp: true,
-  };
+  const calcs: FieldCalcs = { ...defaultCalcs };
 
   const data = field.values;
 
+  // early return for undefined / empty series
+  if (!data) {
+    return calcs;
+  }
+
   const isNumberField = field.type === FieldType.number || field.type === FieldType.time;
 
   for (let i = 0; i < data.length; i++) {
@@ -320,8 +362,8 @@ export function doStandardCalcs(field: Field, ignoreNulls: boolean, nullAsZero:
 
     calcs.count++;
 
-    if (currentValue != null) {
-      // null || undefined
+    if (currentValue != null && !Number.isNaN(currentValue)) {
+      // null || undefined || NaN
       const isFirst = calcs.firstNotNull === null;
       if (isFirst) {
         calcs.firstNotNull = currentValue;
@@ -418,7 +460,7 @@ function calculateFirstNotNull(field: Field, ignoreNulls: boolean, nullAsZero: b
   const data = field.values;
   for (let idx = 0; idx < data.length; idx++) {
     const v = data[idx];
-    if (v != null && v !== undefined) {
+    if (v != null && !Number.isNaN(v)) {
       return { firstNotNull: v };
     }
   }
@@ -435,7 +477,7 @@ function calculateLastNotNull(field: Field, ignoreNulls: boolean, nullAsZero: bo
   let idx = data.length - 1;
   while (idx >= 0) {
     const v = data[idx--];
-    if (v != null && v !== undefined) {
+    if (v != null && !Number.isNaN(v)) {
       return { lastNotNull: v };
     }
   }
diff --git a/packages/grafana-data/src/transformations/index.ts b/packages/grafana-data/src/transformations/index.ts
index 1fd3229f897d0..3d3afdebfbe80 100644
--- a/packages/grafana-data/src/transformations/index.ts
+++ b/packages/grafana-data/src/transformations/index.ts
@@ -20,3 +20,7 @@ export type { RenameByRegexTransformerOptions } from './transformers/renameByReg
 export { joinDataFrames as outerJoinDataFrames, isLikelyAscendingVector } from './transformers/joinDataFrames';
 export * from './transformers/histogram';
 export { ensureTimeField } from './transformers/convertFieldType';
+
+// Required for Sparklines util to work in @grafana/data, but ideally kept internal
+export { applyNullInsertThreshold } from './transformers/nulls/nullInsertThreshold';
+export { nullToValue } from './transformers/nulls/nullToValue';
diff --git a/packages/grafana-data/src/transformations/matchers.ts b/packages/grafana-data/src/transformations/matchers.ts
index 3ad60ca07cc30..21ec33dda24ed 100644
--- a/packages/grafana-data/src/transformations/matchers.ts
+++ b/packages/grafana-data/src/transformations/matchers.ts
@@ -21,6 +21,7 @@ import { getNullValueMatchers } from './matchers/valueMatchers/nullMatchers';
 import { getNumericValueMatchers } from './matchers/valueMatchers/numericMatchers';
 import { getRangeValueMatchers } from './matchers/valueMatchers/rangeMatchers';
 import { getRegexValueMatcher } from './matchers/valueMatchers/regexMatchers';
+import { getSubstringValueMatchers } from './matchers/valueMatchers/substringMatchers';
 
 export { type FieldValueMatcherConfig } from './matchers/fieldValueMatcher';
 
@@ -59,6 +60,7 @@ export const valueMatchers = new Registry<ValueMatcherInfo>(() => {
     ...getNullValueMatchers(),
     ...getNumericValueMatchers(),
     ...getEqualValueMatchers(),
+    ...getSubstringValueMatchers(),
     ...getRangeValueMatchers(),
     ...getRegexValueMatcher(),
   ];
diff --git a/packages/grafana-data/src/transformations/matchers/ids.ts b/packages/grafana-data/src/transformations/matchers/ids.ts
index 5830e62f5fbc9..415e4fe21a89a 100644
--- a/packages/grafana-data/src/transformations/matchers/ids.ts
+++ b/packages/grafana-data/src/transformations/matchers/ids.ts
@@ -52,5 +52,7 @@ export enum ValueMatcherID {
   lowerOrEqual = 'lowerOrEqual',
   equal = 'equal',
   notEqual = 'notEqual',
+  substring = 'substring',
+  notSubstring = 'notSubstring',
   between = 'between',
 }
diff --git a/packages/grafana-data/src/transformations/matchers/nameMatcher.ts b/packages/grafana-data/src/transformations/matchers/nameMatcher.ts
index 7befe20ee8814..52d44a36b19b6 100644
--- a/packages/grafana-data/src/transformations/matchers/nameMatcher.ts
+++ b/packages/grafana-data/src/transformations/matchers/nameMatcher.ts
@@ -41,7 +41,7 @@ const fieldNameMatcher: FieldMatcherInfo<string> = {
   defaultOptions: '',
 
   get: (name: string): FieldMatcher => {
-    const uniqueNames = new Set<string>([name] ?? []);
+    const uniqueNames = new Set<string>([name]);
 
     const fallback = fieldNameFallback(uniqueNames);
 
diff --git a/packages/grafana-data/src/transformations/matchers/predicates.ts b/packages/grafana-data/src/transformations/matchers/predicates.ts
index ef26e05be1e7f..7939f95aec0e9 100644
--- a/packages/grafana-data/src/transformations/matchers/predicates.ts
+++ b/packages/grafana-data/src/transformations/matchers/predicates.ts
@@ -184,11 +184,11 @@ export const alwaysFieldMatcher = (field: Field) => {
   return true;
 };
 
-export const alwaysFrameMatcher = (frame: DataFrame) => {
+const alwaysFrameMatcher = (frame: DataFrame) => {
   return true;
 };
 
-export const neverFieldMatcher = (field: Field) => {
+const neverFieldMatcher = (field: Field) => {
   return false;
 };
 
@@ -196,7 +196,7 @@ export const notTimeFieldMatcher = (field: Field) => {
   return field.type !== FieldType.time;
 };
 
-export const neverFrameMatcher = (frame: DataFrame) => {
+const neverFrameMatcher = (frame: DataFrame) => {
   return false;
 };
 
diff --git a/packages/grafana-data/src/transformations/matchers/valueMatchers/substringMatchers.test.ts b/packages/grafana-data/src/transformations/matchers/valueMatchers/substringMatchers.test.ts
new file mode 100644
index 0000000000000..f9f7789cd66fd
--- /dev/null
+++ b/packages/grafana-data/src/transformations/matchers/valueMatchers/substringMatchers.test.ts
@@ -0,0 +1,130 @@
+import { toDataFrame } from '../../../dataframe';
+import { DataFrame } from '../../../types/dataFrame';
+import { getValueMatcher } from '../../matchers';
+import { ValueMatcherID } from '../ids';
+
+describe('value substring to matcher', () => {
+  const data: DataFrame[] = [
+    toDataFrame({
+      fields: [
+        {
+          name: 'temp',
+          values: ['24', null, '10', 'asd', '42'],
+        },
+      ],
+    }),
+  ];
+
+  const matcher = getValueMatcher({
+    id: ValueMatcherID.substring,
+    options: {
+      value: '2',
+    },
+  });
+
+  it('should match when option value is a substring', () => {
+    const frame = data[0];
+    const field = frame.fields[0];
+    const valueIndex = 0;
+
+    expect(matcher(valueIndex, field, frame, data)).toBeTruthy();
+  });
+
+  // Added for https://github.com/grafana/grafana/pull/83548#pullrequestreview-1904931540 where the matcher was not handling null values
+  it('should be a mismatch if the option is null and should not cause errors', () => {
+    const frame = data[0];
+    const field = frame.fields[0];
+    const valueIndex = 1;
+
+    expect(matcher(valueIndex, field, frame, data)).toBeFalsy();
+  });
+
+  it('should not match when option value is different', () => {
+    const frame = data[0];
+    const field = frame.fields[0];
+    const valueIndex = 2;
+
+    expect(matcher(valueIndex, field, frame, data)).toBeFalsy();
+  });
+
+  it('should match when option value is a substring', () => {
+    const frame = data[0];
+    const field = frame.fields[0];
+    const valueIndex = 4;
+
+    expect(matcher(valueIndex, field, frame, data)).toBeTruthy();
+  });
+});
+
+describe('value not substring matcher', () => {
+  const data: DataFrame[] = [
+    toDataFrame({
+      fields: [
+        {
+          name: 'temp',
+          values: ['24', null, '050', 'asd', '42', '0'],
+        },
+      ],
+    }),
+  ];
+
+  const matcher = getValueMatcher({
+    id: ValueMatcherID.notSubstring,
+    options: {
+      value: '5',
+    },
+  });
+
+  it('should not match if the value is "0" and the option value is "0"', () => {
+    const frame = data[0];
+    const field = frame.fields[0];
+    const valueIndex = 5;
+
+    const zeroMatcher = getValueMatcher({
+      id: ValueMatcherID.notSubstring,
+      options: {
+        value: '0',
+      },
+    });
+
+    expect(zeroMatcher(valueIndex, field, frame, data)).toBeFalsy();
+  });
+
+  it('should match when option value is a substring', () => {
+    const frame = data[0];
+    const field = frame.fields[0];
+    const valueIndex = 0;
+
+    expect(matcher(valueIndex, field, frame, data)).toBeTruthy();
+  });
+
+  it('should not match when option value is different', () => {
+    const frame = data[0];
+    const field = frame.fields[0];
+    const valueIndex = 2;
+
+    expect(matcher(valueIndex, field, frame, data)).toBeFalsy();
+  });
+
+  it('should match when value is null because null its not a substring', () => {
+    const frame = data[0];
+    const field = frame.fields[0];
+    const valueIndex = 4;
+
+    expect(matcher(valueIndex, field, frame, data)).toBeTruthy();
+  });
+
+  it('it should not match if the option value is empty string', () => {
+    const frame = data[0];
+    const field = frame.fields[0];
+    const valueIndex = 0;
+    const emptyMatcher = getValueMatcher({
+      id: ValueMatcherID.notSubstring,
+      options: {
+        value: '',
+      },
+    });
+
+    expect(emptyMatcher(valueIndex, field, frame, data)).toBeFalsy();
+  });
+});
diff --git a/packages/grafana-data/src/transformations/matchers/valueMatchers/substringMatchers.ts b/packages/grafana-data/src/transformations/matchers/valueMatchers/substringMatchers.ts
new file mode 100644
index 0000000000000..07d5d8486abb3
--- /dev/null
+++ b/packages/grafana-data/src/transformations/matchers/valueMatchers/substringMatchers.ts
@@ -0,0 +1,41 @@
+import { Field, FieldType } from '../../../types/dataFrame';
+import { ValueMatcherInfo } from '../../../types/transformations';
+import { ValueMatcherID } from '../ids';
+
+import { BasicValueMatcherOptions } from './types';
+
+const isSubstringMatcher: ValueMatcherInfo<BasicValueMatcherOptions> = {
+  id: ValueMatcherID.substring,
+  name: 'Contains substring',
+  description: 'Match where value for given field is a substring to options value.',
+  get: (options) => {
+    return (valueIndex: number, field: Field) => {
+      const value = field.values[valueIndex];
+      return (value && value.includes(options.value)) || options.value === '';
+    };
+  },
+  getOptionsDisplayText: () => {
+    return `Matches all rows where field is similar to the value.`;
+  },
+  isApplicable: (field) => field.type === FieldType.string,
+  getDefaultOptions: () => ({ value: '' }),
+};
+
+const isNotSubstringValueMatcher: ValueMatcherInfo<BasicValueMatcherOptions> = {
+  id: ValueMatcherID.notSubstring,
+  name: 'Does not contain substring',
+  description: 'Match where value for given field is not a substring to options value.',
+  get: (options) => {
+    return (valueIndex: number, field: Field) => {
+      const value = field.values[valueIndex];
+      return typeof value === 'string' && options.value !== '' && !value.includes(options.value);
+    };
+  },
+  getOptionsDisplayText: () => {
+    return `Matches all rows where field is not similar to the value.`;
+  },
+  isApplicable: (field) => field.type === FieldType.string,
+  getDefaultOptions: () => ({ value: '' }),
+};
+
+export const getSubstringValueMatchers = (): ValueMatcherInfo[] => [isSubstringMatcher, isNotSubstringValueMatcher];
diff --git a/packages/grafana-data/src/transformations/transformDataFrame.ts b/packages/grafana-data/src/transformations/transformDataFrame.ts
index f9baf411d6a49..6717b6565a560 100644
--- a/packages/grafana-data/src/transformations/transformDataFrame.ts
+++ b/packages/grafana-data/src/transformations/transformDataFrame.ts
@@ -55,19 +55,6 @@ const postProcessTransform =
           return after;
         }
 
-        // Add a key to the metadata if the data changed
-        for (const series of after) {
-          if (!series.meta) {
-            series.meta = {};
-          }
-
-          if (!series.meta.transformations) {
-            series.meta.transformations = [info.id];
-          } else {
-            series.meta.transformations = [...series.meta.transformations, info.id];
-          }
-        }
-
         // Add back the filtered out frames
         if (matcher) {
           // keep the frame order the same
diff --git a/packages/grafana-data/src/transformations/transformers.ts b/packages/grafana-data/src/transformations/transformers.ts
index 4086a5613fece..3344a7fb45093 100644
--- a/packages/grafana-data/src/transformations/transformers.ts
+++ b/packages/grafana-data/src/transformations/transformers.ts
@@ -9,6 +9,7 @@ import { filterByValueTransformer } from './transformers/filterByValue';
 import { formatStringTransformer } from './transformers/formatString';
 import { formatTimeTransformer } from './transformers/formatTime';
 import { groupByTransformer } from './transformers/groupBy';
+import { groupToNestedTable } from './transformers/groupToNestedTable';
 import { groupingToMatrixTransformer } from './transformers/groupingToMatrix';
 import { histogramTransformer } from './transformers/histogram';
 import { joinByFieldTransformer } from './transformers/joinByField';
@@ -53,4 +54,5 @@ export const standardTransformers = {
   convertFieldTypeTransformer,
   groupingToMatrixTransformer,
   limitTransformer,
+  groupToNestedTable,
 };
diff --git a/packages/grafana-data/src/transformations/transformers/calculateField.test.ts b/packages/grafana-data/src/transformations/transformers/calculateField.test.ts
index 2ebb18c4aa547..a820514c95e8d 100644
--- a/packages/grafana-data/src/transformations/transformers/calculateField.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/calculateField.test.ts
@@ -7,7 +7,13 @@ import { mockTransformationsRegistry } from '../../utils/tests/mockTransformatio
 import { ReducerID } from '../fieldReducer';
 import { transformDataFrame } from '../transformDataFrame';
 
-import { CalculateFieldMode, calculateFieldTransformer, ReduceOptions } from './calculateField';
+import {
+  CalculateFieldMode,
+  calculateFieldTransformer,
+  ReduceOptions,
+  WindowSizeMode,
+  WindowAlignment,
+} from './calculateField';
 import { DataTransformerID } from './ids';
 
 const seriesA = toDataFrame({
@@ -398,4 +404,548 @@ describe('calculateField transformer w/ timeseries', () => {
       `);
     });
   });
+
+  it('calculates centered moving average on odd window size', async () => {
+    const cfg = {
+      id: DataTransformerID.calculateField,
+      options: {
+        mode: CalculateFieldMode.WindowFunctions,
+        window: {
+          windowAlignment: WindowAlignment.Centered,
+          field: 'x',
+          windowSize: 1,
+          windowSizeMode: WindowSizeMode.Percentage,
+          reducer: ReducerID.mean,
+        },
+      },
+    };
+
+    const series = toDataFrame({
+      fields: [{ name: 'x', type: FieldType.number, values: [1, 2, 3] }],
+    });
+
+    await expect(transformDataFrame([cfg], [series])).toEmitValuesWith((received) => {
+      const data = received[0][0];
+
+      expect(data.fields.length).toEqual(2);
+      expect(data.fields[1].values[0]).toEqual(1.5);
+      expect(data.fields[1].values[1]).toEqual(2);
+      expect(data.fields[1].values[2]).toEqual(2.5);
+    });
+  });
+
+  it('calculates centered moving average on even window size', async () => {
+    const cfg = {
+      id: DataTransformerID.calculateField,
+      options: {
+        mode: CalculateFieldMode.WindowFunctions,
+        window: {
+          windowAlignment: WindowAlignment.Centered,
+          field: 'x',
+          windowSize: 0.5,
+          windowSizeMode: WindowSizeMode.Percentage,
+          reducer: ReducerID.mean,
+        },
+      },
+    };
+
+    const series = toDataFrame({
+      fields: [{ name: 'x', type: FieldType.number, values: [1, 2, 3] }],
+    });
+
+    await expect(transformDataFrame([cfg], [series])).toEmitValuesWith((received) => {
+      const data = received[0][0];
+
+      expect(data.fields.length).toEqual(2);
+      expect(data.fields[1].values[0]).toEqual(1);
+      expect(data.fields[1].values[1]).toEqual(1.5);
+      expect(data.fields[1].values[2]).toEqual(2.5);
+    });
+  });
+
+  it('calculates centered moving average when window size larger than dataset', async () => {
+    const cfg = {
+      id: DataTransformerID.calculateField,
+      options: {
+        mode: CalculateFieldMode.WindowFunctions,
+        window: {
+          windowAlignment: WindowAlignment.Centered,
+          field: 'x',
+          windowSize: 5,
+          windowSizeMode: WindowSizeMode.Percentage,
+          reducer: ReducerID.mean,
+        },
+      },
+    };
+
+    const series = toDataFrame({
+      fields: [{ name: 'x', type: FieldType.number, values: [1, 2, 3] }],
+    });
+
+    await expect(transformDataFrame([cfg], [series])).toEmitValuesWith((received) => {
+      const data = received[0][0];
+
+      expect(data.fields.length).toEqual(2);
+      expect(data.fields[1].values[0]).toEqual(2);
+      expect(data.fields[1].values[1]).toEqual(2);
+      expect(data.fields[1].values[2]).toEqual(2);
+    });
+  });
+
+  it('calculates trailing moving average', async () => {
+    const cfg = {
+      id: DataTransformerID.calculateField,
+      options: {
+        mode: CalculateFieldMode.WindowFunctions,
+        window: {
+          windowAlignment: WindowAlignment.Trailing,
+          field: 'x',
+          windowSize: 1,
+          windowSizeMode: WindowSizeMode.Percentage,
+          reducer: ReducerID.mean,
+        },
+      },
+    };
+
+    const series = toDataFrame({
+      fields: [{ name: 'x', type: FieldType.number, values: [1, 2, 3] }],
+    });
+
+    await expect(transformDataFrame([cfg], [series])).toEmitValuesWith((received) => {
+      const data = received[0][0];
+
+      expect(data.fields.length).toEqual(2);
+      expect(data.fields[1].values[0]).toEqual(1);
+      expect(data.fields[1].values[1]).toEqual(1.5);
+      expect(data.fields[1].values[2]).toEqual(2);
+    });
+  });
+
+  it('throws error when calculating moving average if window size < 1', async () => {
+    const cfg = {
+      id: DataTransformerID.calculateField,
+      options: {
+        mode: CalculateFieldMode.WindowFunctions,
+        window: {
+          windowAlignment: WindowAlignment.Trailing,
+          field: 'x',
+          windowSize: 0,
+          windowSizeMode: WindowSizeMode.Percentage,
+          reducer: ReducerID.mean,
+        },
+      },
+    };
+
+    const series = toDataFrame({
+      fields: [{ name: 'x', type: FieldType.number, values: [1, 2, 3] }],
+    });
+
+    await expect(transformDataFrame([cfg], [series])).toEmitValuesWith((received) => {
+      const err = new Error('Add field from calculation transformation - Window size must be larger than 0');
+      expect(received[0]).toEqual(err);
+    });
+  });
+
+  it('calculates cumulative total', async () => {
+    const cfg = {
+      id: DataTransformerID.calculateField,
+      options: {
+        mode: CalculateFieldMode.CumulativeFunctions,
+        cumulative: {
+          field: 'x',
+          reducer: ReducerID.sum,
+        },
+      },
+    };
+
+    const series = toDataFrame({
+      fields: [{ name: 'x', type: FieldType.number, values: [1, 2, 3] }],
+    });
+
+    await expect(transformDataFrame([cfg], [series])).toEmitValuesWith((received) => {
+      const data = received[0][0];
+
+      expect(data.fields.length).toEqual(2);
+      expect(data.fields[1].values[0]).toEqual(1);
+      expect(data.fields[1].values[1]).toEqual(3);
+      expect(data.fields[1].values[2]).toEqual(6);
+    });
+  });
+
+  it('calculates cumulative mean', async () => {
+    const cfg = {
+      id: DataTransformerID.calculateField,
+      options: {
+        mode: CalculateFieldMode.CumulativeFunctions,
+        cumulative: {
+          field: 'x',
+          reducer: ReducerID.mean,
+        },
+      },
+    };
+
+    const series = toDataFrame({
+      fields: [{ name: 'x', type: FieldType.number, values: [1, 2, 3] }],
+    });
+
+    await expect(transformDataFrame([cfg], [series])).toEmitValuesWith((received) => {
+      const data = received[0][0];
+
+      expect(data.fields.length).toEqual(2);
+      expect(data.fields[1].values[0]).toEqual(1);
+      expect(data.fields[1].values[1]).toEqual(1.5);
+      expect(data.fields[1].values[2]).toEqual(2);
+    });
+  });
+  it('calculates cumulative total with undefined values', async () => {
+    const cfg = {
+      id: DataTransformerID.calculateField,
+      options: {
+        mode: CalculateFieldMode.CumulativeFunctions,
+        cumulative: {
+          field: 'x',
+          reducer: ReducerID.sum,
+        },
+      },
+    };
+
+    const series = toDataFrame({
+      fields: [{ name: 'x', type: FieldType.number, values: [1, undefined, 2, 3] }],
+    });
+
+    await expect(transformDataFrame([cfg], [series])).toEmitValuesWith((received) => {
+      const data = received[0][0];
+
+      expect(data.fields.length).toEqual(2);
+      expect(data.fields[1].values[0]).toEqual(1);
+      expect(data.fields[1].values[1]).toEqual(1);
+      expect(data.fields[1].values[2]).toEqual(3);
+      expect(data.fields[1].values[3]).toEqual(6);
+    });
+  });
+
+  it('calculates cumulative total with nulls', async () => {
+    const cfg = {
+      id: DataTransformerID.calculateField,
+      options: {
+        mode: CalculateFieldMode.CumulativeFunctions,
+        cumulative: {
+          field: 'x',
+          reducer: ReducerID.sum,
+        },
+      },
+    };
+
+    const series = toDataFrame({
+      fields: [{ name: 'x', type: FieldType.number, values: [1, null, 2, 3] }],
+    });
+
+    await expect(transformDataFrame([cfg], [series])).toEmitValuesWith((received) => {
+      const data = received[0][0];
+
+      expect(data.fields.length).toEqual(2);
+      expect(data.fields[1].values[0]).toEqual(1);
+      expect(data.fields[1].values[1]).toEqual(1);
+      expect(data.fields[1].values[2]).toEqual(3);
+      expect(data.fields[1].values[3]).toEqual(6);
+    });
+  });
+
+  it('calculates trailing moving average with nulls', async () => {
+    const cfg = {
+      id: DataTransformerID.calculateField,
+      options: {
+        mode: CalculateFieldMode.WindowFunctions,
+        window: {
+          windowAlignment: WindowAlignment.Trailing,
+          field: 'x',
+          windowSize: 0.75,
+          windowSizeMode: WindowSizeMode.Percentage,
+          reducer: ReducerID.mean,
+        },
+      },
+    };
+
+    const series = toDataFrame({
+      fields: [{ name: 'x', type: FieldType.number, values: [1, null, 2, 7] }],
+    });
+
+    await expect(transformDataFrame([cfg], [series])).toEmitValuesWith((received) => {
+      const data = received[0][0];
+
+      expect(data.fields.length).toEqual(2);
+      expect(data.fields[1].values[0]).toEqual(1);
+      expect(data.fields[1].values[1]).toEqual(1);
+      expect(data.fields[1].values[2]).toEqual(1.5);
+      expect(data.fields[1].values[3]).toEqual(4.5);
+    });
+  });
+
+  it('calculates trailing moving variance', async () => {
+    const cfg = {
+      id: DataTransformerID.calculateField,
+      options: {
+        mode: CalculateFieldMode.WindowFunctions,
+        window: {
+          windowAlignment: WindowAlignment.Trailing,
+          field: 'x',
+          windowSize: 1,
+          windowSizeMode: WindowSizeMode.Percentage,
+          reducer: ReducerID.variance,
+        },
+      },
+    };
+
+    const series = toDataFrame({
+      fields: [{ name: 'x', type: FieldType.number, values: [1, 2, 3] }],
+    });
+
+    await expect(transformDataFrame([cfg], [series])).toEmitValuesWith((received) => {
+      const data = received[0][0];
+
+      expect(data.fields.length).toEqual(2);
+      expect(data.fields[1].values[0]).toEqual(0);
+      expect(data.fields[1].values[1]).toEqual(0.25);
+      expect(data.fields[1].values[2]).toBeCloseTo(0.6666666, 4);
+    });
+  });
+
+  it('calculates centered moving stddev', async () => {
+    const cfg = {
+      id: DataTransformerID.calculateField,
+      options: {
+        mode: CalculateFieldMode.WindowFunctions,
+        window: {
+          windowAlignment: WindowAlignment.Centered,
+          field: 'x',
+          windowSize: 1,
+          windowSizeMode: WindowSizeMode.Percentage,
+          reducer: ReducerID.stdDev,
+        },
+      },
+    };
+
+    const series = toDataFrame({
+      fields: [{ name: 'x', type: FieldType.number, values: [1, 2, 3] }],
+    });
+
+    await expect(transformDataFrame([cfg], [series])).toEmitValuesWith((received) => {
+      const data = received[0][0];
+
+      expect(data.fields.length).toEqual(2);
+      expect(data.fields[1].values[0]).toEqual(0.5);
+      expect(data.fields[1].values[1]).toBeCloseTo(0.8164, 2);
+      expect(data.fields[1].values[2]).toEqual(0.5);
+    });
+  });
+
+  it('calculates centered moving stddev with null', async () => {
+    const cfg = {
+      id: DataTransformerID.calculateField,
+      options: {
+        mode: CalculateFieldMode.WindowFunctions,
+        window: {
+          windowAlignment: WindowAlignment.Centered,
+          field: 'x',
+          windowSize: 0.75,
+          windowSizeMode: WindowSizeMode.Percentage,
+          reducer: ReducerID.stdDev,
+        },
+      },
+    };
+
+    const series = toDataFrame({
+      fields: [{ name: 'x', type: FieldType.number, values: [1, null, 2, 3] }],
+    });
+
+    await expect(transformDataFrame([cfg], [series])).toEmitValuesWith((received) => {
+      const data = received[0][0];
+
+      expect(data.fields.length).toEqual(2);
+      expect(data.fields[1].values[0]).toEqual(0);
+      expect(data.fields[1].values[1]).toEqual(0.5);
+      expect(data.fields[1].values[2]).toEqual(0.5);
+      expect(data.fields[1].values[3]).toEqual(0.5);
+    });
+  });
+
+  it('calculates centered moving average with undefined values', async () => {
+    const cfg = {
+      id: DataTransformerID.calculateField,
+      options: {
+        mode: CalculateFieldMode.WindowFunctions,
+        window: {
+          windowAlignment: WindowAlignment.Centered,
+          field: 'x',
+          windowSize: 0.75,
+          windowSizeMode: WindowSizeMode.Percentage,
+          reducer: ReducerID.mean,
+        },
+      },
+    };
+
+    const series = toDataFrame({
+      fields: [{ name: 'x', type: FieldType.number, values: [1, undefined, 2, 7] }],
+    });
+
+    await expect(transformDataFrame([cfg], [series])).toEmitValuesWith((received) => {
+      const data = received[0][0];
+
+      expect(data.fields.length).toEqual(2);
+      expect(data.fields[1].values[0]).toEqual(1);
+      expect(data.fields[1].values[1]).toEqual(1.5);
+      expect(data.fields[1].values[2]).toEqual(4.5);
+      expect(data.fields[1].values[3]).toEqual(4.5);
+    });
+  });
+
+  it('calculates centered moving average with nulls', async () => {
+    const cfg = {
+      id: DataTransformerID.calculateField,
+      options: {
+        mode: CalculateFieldMode.WindowFunctions,
+        window: {
+          windowAlignment: WindowAlignment.Centered,
+          field: 'x',
+          windowSize: 0.75,
+          windowSizeMode: WindowSizeMode.Percentage,
+          reducer: ReducerID.mean,
+        },
+      },
+    };
+
+    const series = toDataFrame({
+      fields: [{ name: 'x', type: FieldType.number, values: [1, null, 2, 7] }],
+    });
+
+    await expect(transformDataFrame([cfg], [series])).toEmitValuesWith((received) => {
+      const data = received[0][0];
+
+      expect(data.fields.length).toEqual(2);
+      expect(data.fields[1].values[0]).toEqual(1);
+      expect(data.fields[1].values[1]).toEqual(1.5);
+      expect(data.fields[1].values[2]).toEqual(4.5);
+      expect(data.fields[1].values[3]).toEqual(4.5);
+    });
+  });
+
+  it('calculates centered moving average with only nulls', async () => {
+    const cfg = {
+      id: DataTransformerID.calculateField,
+      options: {
+        mode: CalculateFieldMode.WindowFunctions,
+        window: {
+          windowAlignment: WindowAlignment.Centered,
+          field: 'x',
+          windowSize: 0.75,
+          windowSizeMode: WindowSizeMode.Percentage,
+          reducer: ReducerID.mean,
+        },
+      },
+    };
+
+    const series = toDataFrame({
+      fields: [{ name: 'x', type: FieldType.number, values: [null, null, null, null] }],
+    });
+
+    await expect(transformDataFrame([cfg], [series])).toEmitValuesWith((received) => {
+      const data = received[0][0];
+
+      expect(data.fields.length).toEqual(2);
+      expect(data.fields[1].values[0]).toEqual(0);
+      expect(data.fields[1].values[1]).toEqual(0);
+      expect(data.fields[1].values[2]).toEqual(0);
+      expect(data.fields[1].values[3]).toEqual(0);
+    });
+  });
+
+  it('calculates centered moving average with 4 values', async () => {
+    const cfg = {
+      id: DataTransformerID.calculateField,
+      options: {
+        mode: CalculateFieldMode.WindowFunctions,
+        window: {
+          windowAlignment: WindowAlignment.Centered,
+          field: 'x',
+          windowSize: 0.75,
+          windowSizeMode: WindowSizeMode.Percentage,
+          reducer: ReducerID.mean,
+        },
+      },
+    };
+
+    const series = toDataFrame({
+      fields: [{ name: 'x', type: FieldType.number, values: [1, 2, 3, 4] }],
+    });
+
+    await expect(transformDataFrame([cfg], [series])).toEmitValuesWith((received) => {
+      const data = received[0][0];
+
+      expect(data.fields.length).toEqual(2);
+      expect(data.fields[1].values[0]).toEqual(1.5);
+      expect(data.fields[1].values[1]).toEqual(2);
+      expect(data.fields[1].values[2]).toEqual(3);
+      expect(data.fields[1].values[3]).toEqual(3.5);
+    });
+  });
+
+  it('calculates trailing moving variance with null in the middle', async () => {
+    const cfg = {
+      id: DataTransformerID.calculateField,
+      options: {
+        mode: CalculateFieldMode.WindowFunctions,
+        window: {
+          windowAlignment: WindowAlignment.Trailing,
+          field: 'x',
+          windowSize: 0.75,
+          windowSizeMode: WindowSizeMode.Percentage,
+          reducer: ReducerID.variance,
+        },
+      },
+    };
+
+    const series = toDataFrame({
+      fields: [{ name: 'x', type: FieldType.number, values: [1, null, 2, 3] }],
+    });
+
+    await expect(transformDataFrame([cfg], [series])).toEmitValuesWith((received) => {
+      const data = received[0][0];
+
+      expect(data.fields.length).toEqual(2);
+      expect(data.fields[1].values[0]).toEqual(0);
+      expect(data.fields[1].values[1]).toEqual(0);
+      expect(data.fields[1].values[2]).toEqual(0.25);
+      expect(data.fields[1].values[3]).toEqual(0.25);
+    });
+  });
+
+  it('calculates trailing moving variance with null in position 0', async () => {
+    const cfg = {
+      id: DataTransformerID.calculateField,
+      options: {
+        mode: CalculateFieldMode.WindowFunctions,
+        window: {
+          windowAlignment: WindowAlignment.Trailing,
+          field: 'x',
+          windowSize: 0.75,
+          windowSizeMode: WindowSizeMode.Percentage,
+          reducer: ReducerID.variance,
+        },
+      },
+    };
+
+    const series = toDataFrame({
+      fields: [{ name: 'x', type: FieldType.number, values: [null, 1, 2, 3] }],
+    });
+
+    await expect(transformDataFrame([cfg], [series])).toEmitValuesWith((received) => {
+      const data = received[0][0];
+
+      expect(data.fields.length).toEqual(2);
+      expect(data.fields[1].values[0]).toEqual(0);
+      expect(data.fields[1].values[1]).toEqual(0);
+      expect(data.fields[1].values[2]).toEqual(0.25);
+      expect(data.fields[1].values[3]).toBeCloseTo(0.6666666, 4);
+    });
+  });
 });
diff --git a/packages/grafana-data/src/transformations/transformers/calculateField.ts b/packages/grafana-data/src/transformations/transformers/calculateField.ts
index e749dfecf726c..b50f1bcac2d9a 100644
--- a/packages/grafana-data/src/transformations/transformers/calculateField.ts
+++ b/packages/grafana-data/src/transformations/transformers/calculateField.ts
@@ -16,17 +16,40 @@ import { noopTransformer } from './noop';
 
 export enum CalculateFieldMode {
   ReduceRow = 'reduceRow',
+  CumulativeFunctions = 'cumulativeFunctions',
+  WindowFunctions = 'windowFunctions',
   BinaryOperation = 'binary',
   UnaryOperation = 'unary',
   Index = 'index',
 }
 
+export enum WindowSizeMode {
+  Percentage = 'percentage',
+  Fixed = 'fixed',
+}
+
+export enum WindowAlignment {
+  Trailing = 'trailing',
+  Centered = 'centered',
+}
+
 export interface ReduceOptions {
   include?: string[]; // Assume all fields
   reducer: ReducerID;
   nullValueMode?: NullValueMode;
 }
 
+export interface CumulativeOptions {
+  field?: string;
+  reducer: ReducerID;
+}
+
+export interface WindowOptions extends CumulativeOptions {
+  windowSize?: number;
+  windowSizeMode?: WindowSizeMode;
+  windowAlignment?: WindowAlignment;
+}
+
 export interface UnaryOptions {
   operator: UnaryOperationID;
   fieldName: string;
@@ -38,7 +61,7 @@ export interface BinaryOptions {
   right: string;
 }
 
-export interface IndexOptions {
+interface IndexOptions {
   asPercentile: boolean;
 }
 
@@ -46,6 +69,13 @@ const defaultReduceOptions: ReduceOptions = {
   reducer: ReducerID.sum,
 };
 
+export const defaultWindowOptions: WindowOptions = {
+  reducer: ReducerID.mean,
+  windowAlignment: WindowAlignment.Trailing,
+  windowSizeMode: WindowSizeMode.Percentage,
+  windowSize: 0.1,
+};
+
 const defaultBinaryOptions: BinaryOptions = {
   left: '',
   operator: BinaryOperationID.Add,
@@ -64,6 +94,8 @@ export interface CalculateFieldTransformerOptions {
 
   // Only one should be filled
   reduce?: ReduceOptions;
+  window?: WindowOptions;
+  cumulative?: CumulativeOptions;
   binary?: BinaryOptions;
   unary?: UnaryOptions;
   index?: IndexOptions;
@@ -104,39 +136,49 @@ export const calculateFieldTransformer: DataTransformerInfo<CalculateFieldTransf
         const mode = options.mode ?? CalculateFieldMode.ReduceRow;
         let creator: ValuesCreator | undefined = undefined;
 
-        if (mode === CalculateFieldMode.ReduceRow) {
-          creator = getReduceRowCreator(defaults(options.reduce, defaultReduceOptions), data);
-        } else if (mode === CalculateFieldMode.UnaryOperation) {
-          creator = getUnaryCreator(defaults(options.unary, defaultUnaryOptions), data);
-        } else if (mode === CalculateFieldMode.BinaryOperation) {
-          const binaryOptions = {
-            ...options.binary,
-            left: ctx.interpolate(options.binary?.left!),
-            right: ctx.interpolate(options.binary?.right!),
-          };
+        switch (mode) {
+          case CalculateFieldMode.ReduceRow:
+            creator = getReduceRowCreator(defaults(options.reduce, defaultReduceOptions), data);
+            break;
+          case CalculateFieldMode.CumulativeFunctions:
+            creator = getCumulativeCreator(defaults(options.cumulative, defaultReduceOptions), data);
+            break;
+          case CalculateFieldMode.WindowFunctions:
+            creator = getWindowCreator(defaults(options.window, defaultWindowOptions), data);
+            break;
+          case CalculateFieldMode.UnaryOperation:
+            creator = getUnaryCreator(defaults(options.unary, defaultUnaryOptions), data);
+            break;
+          case CalculateFieldMode.BinaryOperation:
+            const binaryOptions = {
+              ...options.binary,
+              left: ctx.interpolate(options.binary?.left!),
+              right: ctx.interpolate(options.binary?.right!),
+            };
 
-          creator = getBinaryCreator(defaults(binaryOptions, defaultBinaryOptions), data);
-        } else if (mode === CalculateFieldMode.Index) {
-          return data.map((frame) => {
-            const indexArr = [...Array(frame.length).keys()];
+            creator = getBinaryCreator(defaults(binaryOptions, defaultBinaryOptions), data);
+            break;
+          case CalculateFieldMode.Index:
+            return data.map((frame) => {
+              const indexArr = [...Array(frame.length).keys()];
 
-            if (options.index?.asPercentile) {
-              for (let i = 0; i < indexArr.length; i++) {
-                indexArr[i] = indexArr[i] / indexArr.length;
+              if (options.index?.asPercentile) {
+                for (let i = 0; i < indexArr.length; i++) {
+                  indexArr[i] = indexArr[i] / indexArr.length;
+                }
               }
-            }
 
-            const f = {
-              name: options.alias ?? 'Row',
-              type: FieldType.number,
-              values: indexArr,
-              config: options.index?.asPercentile ? { unit: 'percentunit' } : {},
-            };
-            return {
-              ...frame,
-              fields: options.replaceFields ? [f] : [...frame.fields, f],
-            };
-          });
+              const f = {
+                name: options.alias ?? 'Row',
+                type: FieldType.number,
+                values: indexArr,
+                config: options.index?.asPercentile ? { unit: 'percentunit' } : {},
+              };
+              return {
+                ...frame,
+                fields: options.replaceFields ? [f] : [...frame.fields, f],
+              };
+            });
         }
 
         // Nothing configured
@@ -180,6 +222,213 @@ export const calculateFieldTransformer: DataTransformerInfo<CalculateFieldTransf
   },
 };
 
+function getWindowCreator(options: WindowOptions, allFrames: DataFrame[]): ValuesCreator {
+  if (options.windowSize! <= 0) {
+    throw new Error('Add field from calculation transformation - Window size must be larger than 0');
+  }
+
+  let matcher = getFieldMatcher({
+    id: FieldMatcherID.numeric,
+  });
+
+  if (options.field) {
+    matcher = getFieldMatcher({
+      id: FieldMatcherID.byNames,
+      options: {
+        names: [options.field],
+      },
+    });
+  }
+
+  return (frame: DataFrame) => {
+    const window = Math.ceil(
+      options.windowSize! * (options.windowSizeMode === WindowSizeMode.Percentage ? frame.length : 1)
+    );
+
+    // Find the columns that should be examined
+    let selectedField: Field | null = null;
+    for (const field of frame.fields) {
+      if (matcher(field, frame, allFrames)) {
+        selectedField = field;
+        break;
+      }
+    }
+
+    if (!selectedField) {
+      return;
+    }
+
+    if (![ReducerID.mean, ReducerID.stdDev, ReducerID.variance].includes(options.reducer)) {
+      throw new Error(`Add field from calculation transformation - Unsupported reducer: ${options.reducer}`);
+    }
+
+    if (options.windowAlignment === WindowAlignment.Centered) {
+      return getCenteredWindowValues(frame, options.reducer, selectedField, window);
+    } else {
+      return getTrailingWindowValues(frame, options.reducer, selectedField, window);
+    }
+  };
+}
+
+function getTrailingWindowValues(frame: DataFrame, reducer: ReducerID, selectedField: Field, window: number) {
+  const vals: number[] = [];
+  let sum = 0;
+  let count = 0;
+  for (let i = 0; i < frame.length; i++) {
+    if (reducer === ReducerID.mean) {
+      const currentValue = selectedField.values[i];
+      if (currentValue !== null && currentValue !== undefined) {
+        count++;
+        sum += currentValue;
+
+        if (i > window - 1) {
+          sum -= selectedField.values[i - window];
+          count--;
+        }
+      }
+      vals.push(count === 0 ? 0 : sum / count);
+    } else if (reducer === ReducerID.variance) {
+      const start = Math.max(0, i - window + 1);
+      const end = i + 1;
+      vals.push(calculateVariance(selectedField.values.slice(start, end)));
+    } else if (reducer === ReducerID.stdDev) {
+      const start = Math.max(0, i - window + 1);
+      const end = i + 1;
+      vals.push(calculateStdDev(selectedField.values.slice(start, end)));
+    }
+  }
+  return vals;
+}
+
+function getCenteredWindowValues(frame: DataFrame, reducer: ReducerID, selectedField: Field, window: number) {
+  const vals: number[] = [];
+  let sum = 0;
+  let count = 0;
+  // Current value (i) is included in the leading part of the window. Which means if the window size is odd,
+  // the leading part of the window will be larger than the trailing part.
+  const leadingPartOfWindow = Math.ceil(window / 2) - 1;
+  const trailingPartOfWindow = Math.floor(window / 2);
+  for (let i = 0; i < frame.length; i++) {
+    const first = i - trailingPartOfWindow;
+    const last = i + leadingPartOfWindow;
+    if (reducer === ReducerID.mean) {
+      if (i === 0) {
+        // We're at the start and need to prime the leading part of the window
+        for (let x = 0; x < leadingPartOfWindow + 1 && x < selectedField.values.length; x++) {
+          if (selectedField.values[x] != null) {
+            sum += selectedField.values[x];
+            count++;
+          }
+        }
+      } else {
+        if (last < selectedField.values.length) {
+          // Last is inside the data and should be added.
+          if (selectedField.values[last] != null) {
+            sum += selectedField.values[last];
+            count++;
+          }
+        }
+        if (first > 0) {
+          // Remove values that have fallen outside of the window, if the start of the window isn't outside of the data.
+          if (selectedField.values[first - 1] != null) {
+            sum -= selectedField.values[first - 1];
+            count--;
+          }
+        }
+      }
+      vals.push(count === 0 ? 0 : sum / count);
+    } else if (reducer === ReducerID.variance) {
+      const windowVals = selectedField.values.slice(
+        Math.max(0, first),
+        Math.min(last + 1, selectedField.values.length)
+      );
+      vals.push(calculateVariance(windowVals));
+    } else if (reducer === ReducerID.stdDev) {
+      const windowVals = selectedField.values.slice(
+        Math.max(0, first),
+        Math.min(last + 1, selectedField.values.length)
+      );
+      vals.push(calculateStdDev(windowVals));
+    }
+  }
+  return vals;
+}
+
+function calculateVariance(vals: number[]): number {
+  if (vals.length < 1) {
+    return 0;
+  }
+  let squareSum = 0;
+  let runningMean = 0;
+  let nonNullCount = 0;
+  for (let i = 0; i < vals.length; i++) {
+    const currentValue = vals[i];
+    if (currentValue != null) {
+      nonNullCount++;
+      let _oldMean = runningMean;
+      runningMean += (currentValue - _oldMean) / nonNullCount;
+      squareSum += (currentValue - _oldMean) * (currentValue - runningMean);
+    }
+  }
+  if (nonNullCount === 0) {
+    return 0;
+  }
+  const variance = squareSum / nonNullCount;
+  return variance;
+}
+
+function calculateStdDev(vals: number[]): number {
+  return Math.sqrt(calculateVariance(vals));
+}
+
+function getCumulativeCreator(options: CumulativeOptions, allFrames: DataFrame[]): ValuesCreator {
+  let matcher = getFieldMatcher({
+    id: FieldMatcherID.numeric,
+  });
+
+  if (options.field) {
+    matcher = getFieldMatcher({
+      id: FieldMatcherID.byNames,
+      options: {
+        names: [options.field],
+      },
+    });
+  }
+
+  if (![ReducerID.mean, ReducerID.sum].includes(options.reducer)) {
+    throw new Error(`Add field from calculation transformation - Unsupported reducer: ${options.reducer}`);
+  }
+
+  return (frame: DataFrame) => {
+    // Find the columns that should be examined
+    let selectedField: Field | null = null;
+    for (const field of frame.fields) {
+      if (matcher(field, frame, allFrames)) {
+        selectedField = field;
+        break;
+      }
+    }
+
+    if (!selectedField) {
+      return;
+    }
+
+    const vals: number[] = [];
+
+    let total = 0;
+    for (let i = 0; i < frame.length; i++) {
+      total += selectedField.values[i] ?? 0;
+      if (options.reducer === ReducerID.sum) {
+        vals.push(total);
+      } else if (options.reducer === ReducerID.mean) {
+        vals.push(total / (i + 1));
+      }
+    }
+
+    return vals;
+  };
+}
+
 function getReduceRowCreator(options: ReduceOptions, allFrames: DataFrame[]): ValuesCreator {
   let matcher = getFieldMatcher({
     id: FieldMatcherID.numeric,
@@ -227,6 +476,7 @@ function getReduceRowCreator(options: ReduceOptions, allFrames: DataFrame[]): Va
       for (let j = 0; j < size; j++) {
         row.values[j] = columns[j][i];
       }
+
       vals.push(reducer(row, ignoreNulls, nullAsZero)[options.reducer]);
     }
 
@@ -309,6 +559,16 @@ export function getNameFromOptions(options: CalculateFieldTransformerOptions) {
   }
 
   switch (options.mode) {
+    case CalculateFieldMode.CumulativeFunctions: {
+      const { cumulative } = options;
+      return `cumulative ${cumulative?.reducer ?? ''}${cumulative?.field ? `(${cumulative.field})` : ''}`;
+    }
+    case CalculateFieldMode.WindowFunctions: {
+      const { window } = options;
+      return `${window?.windowAlignment ?? ''} moving ${window?.reducer ?? ''}${
+        window?.field ? `(${window.field})` : ''
+      }`;
+    }
     case CalculateFieldMode.UnaryOperation: {
       const { unary } = options;
       return `${unary?.operator ?? ''}${unary?.fieldName ? `(${unary.fieldName})` : ''}`;
diff --git a/packages/grafana-data/src/transformations/transformers/convertFieldType.test.ts b/packages/grafana-data/src/transformations/transformers/convertFieldType.test.ts
index 432ae01e9fefa..15dfed729c8f8 100644
--- a/packages/grafana-data/src/transformations/transformers/convertFieldType.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/convertFieldType.test.ts
@@ -359,6 +359,38 @@ describe('field convert types transformer', () => {
     ]);
   });
 
+  it('will support custom join separators', () => {
+    const options = {
+      conversions: [{ targetField: 'vals', destinationType: FieldType.string, joinWith: '|' }],
+    };
+
+    const arrayValues = toDataFrame({
+      fields: [
+        {
+          name: 'vals',
+          type: FieldType.other,
+          values: [
+            ['a', 'b', 2],
+            [3, 'x', 'y'],
+          ],
+        },
+      ],
+    });
+
+    const stringified = convertFieldTypes(options, [arrayValues]);
+    expect(
+      stringified[0].fields.map((f) => ({
+        type: f.type,
+        values: f.values,
+      }))
+    ).toEqual([
+      {
+        type: FieldType.string,
+        values: ['a|b|2', '3|x|y'],
+      },
+    ]);
+  });
+
   it('will convert time fields to strings', () => {
     const options = {
       conversions: [{ targetField: 'time', destinationType: FieldType.string, dateFormat: 'YYYY-MM' }],
diff --git a/packages/grafana-data/src/transformations/transformers/convertFieldType.ts b/packages/grafana-data/src/transformations/transformers/convertFieldType.ts
index f4ef713c709fa..669a9480bd11a 100644
--- a/packages/grafana-data/src/transformations/transformers/convertFieldType.ts
+++ b/packages/grafana-data/src/transformations/transformers/convertFieldType.ts
@@ -27,6 +27,10 @@ export interface ConvertFieldTypeOptions {
    * Date format to parse a string datetime
    */
   dateFormat?: string;
+  /**
+   * When converting an array to a string, the values can be joined with a custom separator
+   */
+  joinWith?: string;
   /**
    * When converting a date to a string an option timezone.
    */
@@ -103,7 +107,7 @@ export function convertFieldType(field: Field, opts: ConvertFieldTypeOptions): F
     case FieldType.number:
       return fieldToNumberField(field);
     case FieldType.string:
-      return fieldToStringField(field, opts.dateFormat, { timeZone: opts.timezone });
+      return fieldToStringField(field, opts.dateFormat, { timeZone: opts.timezone }, opts.joinWith);
     case FieldType.boolean:
       return fieldToBooleanField(field);
     case FieldType.enum:
@@ -192,7 +196,8 @@ function fieldToBooleanField(field: Field): Field {
 export function fieldToStringField(
   field: Field,
   dateFormat?: string,
-  parseOptions?: DateTimeOptionsWhenParsing
+  parseOptions?: DateTimeOptionsWhenParsing,
+  joinWith?: string
 ): Field {
   let values = field.values;
 
@@ -202,7 +207,12 @@ export function fieldToStringField(
       break;
 
     case FieldType.other:
-      values = values.map((v) => JSON.stringify(v));
+      values = values.map((v) => {
+        if (joinWith?.length && Array.isArray(v)) {
+          return v.join(joinWith);
+        }
+        return JSON.stringify(v); // will quote strings and avoid "object"
+      });
       break;
 
     default:
@@ -256,25 +266,24 @@ export function ensureTimeField(field: Field, dateFormat?: string): Field {
   return fieldToTimeField(field, dateFormat);
 }
 
-function fieldToEnumField(field: Field, cfg?: EnumFieldConfig): Field {
-  const enumConfig = { ...cfg };
+function fieldToEnumField(field: Field, config?: EnumFieldConfig): Field {
+  const enumConfig = { ...config };
   const enumValues = field.values.slice();
+
+  // Create lookup map based on existing enum config text values, if none exist return field as is
   const lookup = new Map<unknown, number>();
-  if (enumConfig.text) {
+  if (enumConfig.text && enumConfig.text.length > 0) {
     for (let i = 0; i < enumConfig.text.length; i++) {
       lookup.set(enumConfig.text[i], i);
     }
   } else {
-    enumConfig.text = [];
+    return field;
   }
 
+  // Convert field values to enum indexes
   for (let i = 0; i < enumValues.length; i++) {
-    const v = enumValues[i];
-    if (!lookup.has(v)) {
-      enumConfig.text[lookup.size] = v;
-      lookup.set(v, lookup.size);
-    }
-    enumValues[i] = lookup.get(v);
+    const value = enumValues[i];
+    enumValues[i] = lookup.get(value);
   }
 
   return {
diff --git a/packages/grafana-data/src/transformations/transformers/ensureColumns.test.ts b/packages/grafana-data/src/transformations/transformers/ensureColumns.test.ts
index ae2b231b680ed..0f63477d51bc9 100644
--- a/packages/grafana-data/src/transformations/transformers/ensureColumns.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/ensureColumns.test.ts
@@ -109,11 +109,6 @@ describe('ensureColumns transformer', () => {
             },
           ],
           "length": 2,
-          "meta": {
-            "transformations": [
-              "ensureColumns",
-            ],
-          },
         }
       `);
     });
diff --git a/packages/grafana-data/src/transformations/transformers/filterByValue.test.ts b/packages/grafana-data/src/transformations/transformers/filterByValue.test.ts
index 06db191240e37..5d2ba4b10f933 100644
--- a/packages/grafana-data/src/transformations/transformers/filterByValue.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/filterByValue.test.ts
@@ -12,18 +12,10 @@ import {
   FilterByValueType,
 } from './filterByValue';
 import { DataTransformerID } from './ids';
+import * as utils from './utils';
 
-let transformationSupport = false;
-
-jest.mock('./utils', () => {
-  const actual = jest.requireActual('./utils');
-  return {
-    ...actual,
-    transformationsVariableSupport: () => {
-      return transformationSupport;
-    },
-  };
-});
+const mockTransformationsVariableSupport = jest.spyOn(utils, 'transformationsVariableSupport');
+mockTransformationsVariableSupport.mockReturnValue(false);
 
 const seriesAWithSingleField = toDataFrame({
   name: 'A',
@@ -34,6 +26,25 @@ const seriesAWithSingleField = toDataFrame({
   ],
 });
 
+const multiSeriesWithSingleField = [
+  toDataFrame({
+    name: 'A',
+    length: 3,
+    fields: [
+      { name: 'time', type: FieldType.time, values: [1000, 2000, 3000] },
+      { name: 'value', type: FieldType.number, values: [1, 0, 1] },
+    ],
+  }),
+  toDataFrame({
+    name: 'B',
+    length: 3,
+    fields: [
+      { name: 'time', type: FieldType.time, values: [5000, 6000, 7000] },
+      { name: 'value', type: FieldType.number, values: [0, 1, 1] },
+    ],
+  }),
+];
+
 describe('FilterByValue transformer', () => {
   beforeAll(() => {
     mockTransformationsRegistry([filterByValueTransformer]);
@@ -80,6 +91,68 @@ describe('FilterByValue transformer', () => {
     });
   });
 
+  it('should not cross frame boundaries', async () => {
+    const cfg: DataTransformerConfig<FilterByValueTransformerOptions> = {
+      id: DataTransformerID.filterByValue,
+      options: {
+        type: FilterByValueType.exclude,
+        match: FilterByValueMatch.any,
+        filters: [
+          {
+            fieldName: 'A value',
+            config: {
+              id: ValueMatcherID.equal,
+              options: { value: 0 },
+            },
+          },
+          {
+            fieldName: 'B value',
+            config: {
+              id: ValueMatcherID.equal,
+              options: { value: 0 },
+            },
+          },
+        ],
+      },
+    };
+
+    await expect(transformDataFrame([cfg], multiSeriesWithSingleField)).toEmitValuesWith((received) => {
+      const processed = received[0];
+
+      expect(processed.length).toEqual(2);
+
+      expect(processed[0].fields).toEqual([
+        {
+          name: 'time',
+          type: FieldType.time,
+          values: [1000, 3000],
+          state: {},
+        },
+        {
+          name: 'value',
+          type: FieldType.number,
+          values: [1, 1],
+          state: {},
+        },
+      ]);
+
+      expect(processed[1].fields).toEqual([
+        {
+          name: 'time',
+          type: FieldType.time,
+          values: [6000, 7000],
+          state: {},
+        },
+        {
+          name: 'value',
+          type: FieldType.number,
+          values: [1, 1],
+          state: {},
+        },
+      ]);
+    });
+  });
+
   it('should include values', async () => {
     const lowerOrEqual: MatcherConfig<BasicValueMatcherOptions<number>> = {
       id: ValueMatcherID.lowerOrEqual,
@@ -122,7 +195,7 @@ describe('FilterByValue transformer', () => {
   });
 
   it('should interpolate dashboard variables', async () => {
-    transformationSupport = true;
+    mockTransformationsVariableSupport.mockReturnValue(true);
 
     const lower: MatcherConfig<BasicValueMatcherOptions<string | number>> = {
       id: ValueMatcherID.lower,
@@ -164,10 +237,11 @@ describe('FilterByValue transformer', () => {
         },
       ]);
     });
-    transformationSupport = false;
   });
 
   it('should not interpolate dashboard variables when feature toggle is off', async () => {
+    mockTransformationsVariableSupport.mockReturnValue(false);
+
     const lower: MatcherConfig<BasicValueMatcherOptions<number | string>> = {
       id: ValueMatcherID.lower,
       options: { value: 'notinterpolating' },
diff --git a/packages/grafana-data/src/transformations/transformers/filterByValue.ts b/packages/grafana-data/src/transformations/transformers/filterByValue.ts
index 766c98fcc2d9a..39e80a2d82469 100644
--- a/packages/grafana-data/src/transformations/transformers/filterByValue.ts
+++ b/packages/grafana-data/src/transformations/transformers/filterByValue.ts
@@ -92,14 +92,16 @@ export const filterByValueTransformer: DataTransformerInfo<FilterByValueTransfor
 
     return source.pipe(
       map((data) => {
-        if (!Array.isArray(data) || data.length === 0) {
+        if (data.length === 0) {
           return data;
         }
 
-        const rows = new Set<number>();
+        const processed: DataFrame[] = [];
+
+        const fieldIndexByName = groupFieldIndexByName(data);
 
         for (const frame of data) {
-          const fieldIndexByName = groupFieldIndexByName(frame, data);
+          const rows = new Set<number>();
 
           let matchers;
           if (transformationsVariableSupport()) {
@@ -135,13 +137,9 @@ export const filterByValueTransformer: DataTransformerInfo<FilterByValueTransfor
               rows.add(index);
             }
           }
-        }
-
-        const processed: DataFrame[] = [];
-        const frameLength = include ? rows.size : data[0].length - rows.size;
 
-        for (const frame of data) {
           const fields: Field[] = [];
+          const frameLength = include ? rows.size : data[0].length - rows.size;
 
           for (const field of frame.fields) {
             const buffer = [];
@@ -198,10 +196,15 @@ const createFilterValueMatchers = (
   });
 };
 
-const groupFieldIndexByName = (frame: DataFrame, data: DataFrame[]): Record<string, number> => {
-  return frame.fields.reduce((all: Record<string, number>, field, fieldIndex) => {
-    const fieldName = getFieldDisplayName(field, frame, data);
-    all[fieldName] = fieldIndex;
-    return all;
-  }, {});
+const groupFieldIndexByName = (data: DataFrame[]) => {
+  const lookup: Record<string, number> = {};
+
+  for (const frame of data) {
+    frame.fields.forEach((field, fieldIndex) => {
+      const fieldName = getFieldDisplayName(field, frame, data);
+      lookup[fieldName] = fieldIndex;
+    });
+  }
+
+  return lookup;
 };
diff --git a/packages/grafana-data/src/transformations/transformers/formatTime.test.ts b/packages/grafana-data/src/transformations/transformers/formatTime.test.ts
index bf3700418a39a..fe5096226a370 100644
--- a/packages/grafana-data/src/transformations/transformers/formatTime.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/formatTime.test.ts
@@ -2,7 +2,7 @@ import { toDataFrame } from '../../dataframe/processDataFrame';
 import { FieldType } from '../../types/dataFrame';
 import { mockTransformationsRegistry } from '../../utils/tests/mockTransformationsRegistry';
 
-import { createTimeFormatter, formatTimeTransformer } from './formatTime';
+import { applyFormatTime, formatTimeTransformer } from './formatTime';
 
 describe('Format Time Transformer', () => {
   beforeAll(() => {
@@ -16,7 +16,6 @@ describe('Format Time Transformer', () => {
       timezone: 'utc',
     };
 
-    const formatter = createTimeFormatter(options.timeField, options.outputFormat, options.timezone);
     const frame = toDataFrame({
       fields: [
         {
@@ -27,8 +26,32 @@ describe('Format Time Transformer', () => {
       ],
     });
 
-    const newFrame = formatter(frame.fields);
-    expect(newFrame[0].values).toEqual(['2021-02', '2023-07', '2023-04', '2023-07', '2023-08']);
+    const newFrames = applyFormatTime(options, [frame]);
+    expect(newFrames[0].fields[0].values).toEqual(['2021-02', '2023-07', '2023-04', '2023-07', '2023-08']);
+  });
+
+  it('will match on getFieldDisplayName', () => {
+    const options = {
+      timeField: 'Created',
+      outputFormat: 'YYYY-MM',
+      timezone: 'utc',
+    };
+
+    const frame = toDataFrame({
+      fields: [
+        {
+          name: 'created',
+          type: FieldType.time,
+          values: [1612939600000, 1689192000000, 1682025600000, 1690328089000, 1691011200000],
+          config: {
+            displayName: 'Created',
+          },
+        },
+      ],
+    });
+
+    const newFrames = applyFormatTime(options, [frame]);
+    expect(newFrames[0].fields[0].values).toEqual(['2021-02', '2023-07', '2023-04', '2023-07', '2023-08']);
   });
 
   it('will handle formats with times', () => {
@@ -38,7 +61,6 @@ describe('Format Time Transformer', () => {
       timezone: 'utc',
     };
 
-    const formatter = createTimeFormatter(options.timeField, options.outputFormat, options.timezone);
     const frame = toDataFrame({
       fields: [
         {
@@ -49,8 +71,8 @@ describe('Format Time Transformer', () => {
       ],
     });
 
-    const newFrame = formatter(frame.fields);
-    expect(newFrame[0].values).toEqual([
+    const newFrames = applyFormatTime(options, [frame]);
+    expect(newFrames[0].fields[0].values).toEqual([
       '2021-02 6:46:40 am',
       '2023-07 8:00:00 pm',
       '2023-04 9:20:00 pm',
@@ -66,7 +88,6 @@ describe('Format Time Transformer', () => {
       timezone: 'utc',
     };
 
-    const formatter = createTimeFormatter(options.timeField, options.outputFormat, options.timezone);
     const frame = toDataFrame({
       fields: [
         {
@@ -77,8 +98,8 @@ describe('Format Time Transformer', () => {
       ],
     });
 
-    const newFrame = formatter(frame.fields);
-    expect(newFrame[0].values).toEqual([
+    const newFrames = applyFormatTime(options, [frame]);
+    expect(newFrames[0].fields[0].values).toEqual([
       '2021-02 6:46:40 am',
       '2023-07 8:00:00 pm',
       '2023-04 9:20:00 pm',
diff --git a/packages/grafana-data/src/transformations/transformers/formatTime.ts b/packages/grafana-data/src/transformations/transformers/formatTime.ts
index bd5a496562b32..62314055dc3ac 100644
--- a/packages/grafana-data/src/transformations/transformers/formatTime.ts
+++ b/packages/grafana-data/src/transformations/transformers/formatTime.ts
@@ -2,8 +2,9 @@ import { map } from 'rxjs/operators';
 
 import { TimeZone } from '@grafana/schema';
 
-import { DataFrame, Field, TransformationApplicabilityLevels } from '../../types';
-import { DataTransformerInfo } from '../../types/transformations';
+import { cacheFieldDisplayNames } from '../../field';
+import { DataFrame, TransformationApplicabilityLevels } from '../../types';
+import { DataTransformContext, DataTransformerInfo } from '../../types/transformations';
 
 import { fieldToStringField } from './convertFieldType';
 import { DataTransformerID } from './ids';
@@ -34,21 +35,10 @@ export const formatTimeTransformer: DataTransformerInfo<FormatTimeTransformerOpt
   },
   isApplicableDescription:
     'The Format time transformation requires a time field to work. No time field could be found.',
-  operator: (options) => (source) =>
+  operator: (options, ctx) => (source) =>
     source.pipe(
       map((data) => {
-        // If a field and a format are configured
-        // then format the time output
-        const formatter = createTimeFormatter(options.timeField, options.outputFormat, options.timezone);
-
-        if (!Array.isArray(data) || data.length === 0) {
-          return data;
-        }
-
-        return data.map((frame) => ({
-          ...frame,
-          fields: formatter(frame.fields),
-        }));
+        return applyFormatTime(options, data, ctx);
       })
     ),
 };
@@ -56,21 +46,27 @@ export const formatTimeTransformer: DataTransformerInfo<FormatTimeTransformerOpt
 /**
  * @internal
  */
-export const createTimeFormatter = (timeField: string, outputFormat: string, timezone: string) => (fields: Field[]) => {
-  return fields.map((field) => {
-    // Find the configured field
-    if (field.name === timeField) {
-      // Update values to use the configured format
-      let formattedField = null;
-      if (timezone) {
-        formattedField = fieldToStringField(field, outputFormat, { timeZone: timezone });
-      } else {
-        formattedField = fieldToStringField(field, outputFormat);
-      }
+export const applyFormatTime = (
+  { timeField, outputFormat, timezone }: FormatTimeTransformerOptions,
+  data: DataFrame[],
+  ctx?: DataTransformContext
+) => {
+  if (!Array.isArray(data) || data.length === 0) {
+    return data;
+  }
 
-      return formattedField;
-    }
+  cacheFieldDisplayNames(data);
+
+  outputFormat = ctx?.interpolate(outputFormat) ?? outputFormat;
+
+  return data.map((frame) => ({
+    ...frame,
+    fields: frame.fields.map((field) => {
+      if (field.state?.displayName === timeField) {
+        field = fieldToStringField(field, outputFormat, { timeZone: timezone });
+      }
 
-    return field;
-  });
+      return field;
+    }),
+  }));
 };
diff --git a/packages/grafana-data/src/transformations/transformers/groupBy.ts b/packages/grafana-data/src/transformations/transformers/groupBy.ts
index e57d15ed9b303..fd5e28aa7e6e3 100644
--- a/packages/grafana-data/src/transformations/transformers/groupBy.ts
+++ b/packages/grafana-data/src/transformations/transformers/groupBy.ts
@@ -22,6 +22,10 @@ export interface GroupByTransformerOptions {
   fields: Record<string, GroupByFieldOptions>;
 }
 
+interface FieldMap {
+  [key: string]: Field;
+}
+
 export const groupByTransformer: DataTransformerInfo<GroupByTransformerOptions> = {
   id: DataTransformerID.groupBy,
   name: 'Group by',
@@ -75,64 +79,19 @@ export const groupByTransformer: DataTransformerInfo<GroupByTransformerOptions>
         const processed: DataFrame[] = [];
 
         for (const frame of data) {
-          const groupByFields: Field[] = [];
-
-          for (const field of frame.fields) {
-            if (shouldGroupOnField(field, options)) {
-              groupByFields.push(field);
-            }
-          }
-
+          // Create a list of fields to group on
+          // If there are none we skip the rest
+          const groupByFields: Field[] = frame.fields.filter((field) => shouldGroupOnField(field, options));
           if (groupByFields.length === 0) {
-            continue; // No group by field in this frame, ignore the frame
+            continue;
           }
 
           // Group the values by fields and groups so we can get all values for a
           // group for a given field.
-          const valuesByGroupKey = new Map<string, Record<string, Field>>();
-          for (let rowIndex = 0; rowIndex < frame.length; rowIndex++) {
-            const groupKey = String(groupByFields.map((field) => field.values[rowIndex]));
-            const valuesByField = valuesByGroupKey.get(groupKey) ?? {};
-
-            if (!valuesByGroupKey.has(groupKey)) {
-              valuesByGroupKey.set(groupKey, valuesByField);
-            }
-
-            for (let field of frame.fields) {
-              const fieldName = getFieldDisplayName(field);
+          const valuesByGroupKey = groupValuesByKey(frame, groupByFields);
 
-              if (!valuesByField[fieldName]) {
-                valuesByField[fieldName] = {
-                  name: fieldName,
-                  type: field.type,
-                  config: { ...field.config },
-                  values: [],
-                };
-              }
-
-              valuesByField[fieldName].values.push(field.values[rowIndex]);
-            }
-          }
-
-          const fields: Field[] = [];
-
-          for (const field of groupByFields) {
-            const values: any[] = [];
-            const fieldName = getFieldDisplayName(field);
-
-            valuesByGroupKey.forEach((value) => {
-              values.push(value[fieldName].values[0]);
-            });
-
-            fields.push({
-              name: field.name,
-              type: field.type,
-              config: {
-                ...field.config,
-              },
-              values: values,
-            });
-          }
+          // Add the grouped fields to the resulting fields of the transformation
+          const fields: Field[] = createGroupedFields(groupByFields, valuesByGroupKey);
 
           // Then for each calculations configured, compute and add a new field (column)
           for (const field of frame.fields) {
@@ -142,7 +101,7 @@ export const groupByTransformer: DataTransformerInfo<GroupByTransformerOptions>
 
             const fieldName = getFieldDisplayName(field);
             const aggregations = options.fields[fieldName].aggregations;
-            const valuesByAggregation: Record<string, any[]> = {};
+            const valuesByAggregation: Record<string, unknown[]> = {};
 
             valuesByGroupKey.forEach((value) => {
               const fieldWithValuesForGroup = value[fieldName];
@@ -197,7 +156,7 @@ const shouldCalculateField = (field: Field, options: GroupByTransformerOptions):
   );
 };
 
-const detectFieldType = (aggregation: string, sourceField: Field, targetField: Field): FieldType => {
+function detectFieldType(aggregation: string, sourceField: Field, targetField: Field): FieldType {
   switch (aggregation) {
     case ReducerID.allIsNull:
       return FieldType.boolean;
@@ -209,4 +168,75 @@ const detectFieldType = (aggregation: string, sourceField: Field, targetField: F
     default:
       return guessFieldTypeForField(targetField) ?? FieldType.string;
   }
-};
+}
+
+/**
+ * Groups values together by key. This will create a mapping of strings
+ * to _FieldMaps_ that will then be used to group values on.
+ *
+ * @param frame
+ *  The dataframe containing the data to group.
+ * @param groupByFields
+ *  An array of fields to group on.
+ */
+export function groupValuesByKey(frame: DataFrame, groupByFields: Field[]) {
+  const valuesByGroupKey = new Map<string, FieldMap>();
+
+  for (let rowIndex = 0; rowIndex < frame.length; rowIndex++) {
+    const groupKey = String(groupByFields.map((field) => field.values[rowIndex]));
+    const valuesByField = valuesByGroupKey.get(groupKey) ?? {};
+
+    if (!valuesByGroupKey.has(groupKey)) {
+      valuesByGroupKey.set(groupKey, valuesByField);
+    }
+
+    for (let field of frame.fields) {
+      const fieldName = getFieldDisplayName(field);
+
+      if (!valuesByField[fieldName]) {
+        valuesByField[fieldName] = {
+          name: fieldName,
+          type: field.type,
+          config: { ...field.config },
+          values: [],
+        };
+      }
+
+      valuesByField[fieldName].values.push(field.values[rowIndex]);
+    }
+  }
+
+  return valuesByGroupKey;
+}
+
+/**
+ * Create new fields which will be used to display grouped values.
+ *
+ * @param groupByFields
+ * @param valuesByGroupKey
+ * @returns
+ *  Returns an array of fields that have been grouped.
+ */
+export function createGroupedFields(groupByFields: Field[], valuesByGroupKey: Map<string, FieldMap>): Field[] {
+  const fields: Field[] = [];
+
+  for (const field of groupByFields) {
+    const values: unknown[] = [];
+    const fieldName = getFieldDisplayName(field);
+
+    valuesByGroupKey.forEach((value) => {
+      values.push(value[fieldName].values[0]);
+    });
+
+    fields.push({
+      name: field.name,
+      type: field.type,
+      config: {
+        ...field.config,
+      },
+      values,
+    });
+  }
+
+  return fields;
+}
diff --git a/packages/grafana-data/src/transformations/transformers/groupToNestedTable.test.ts b/packages/grafana-data/src/transformations/transformers/groupToNestedTable.test.ts
new file mode 100644
index 0000000000000..d36a0ce1adf71
--- /dev/null
+++ b/packages/grafana-data/src/transformations/transformers/groupToNestedTable.test.ts
@@ -0,0 +1,243 @@
+import { toDataFrame } from '../../dataframe/processDataFrame';
+import { DataTransformerConfig, Field, FieldType } from '../../types';
+import { mockTransformationsRegistry } from '../../utils/tests/mockTransformationsRegistry';
+import { ReducerID } from '../fieldReducer';
+import { transformDataFrame } from '../transformDataFrame';
+
+import { GroupByOperationID, GroupByTransformerOptions } from './groupBy';
+import { groupToNestedTable, GroupToNestedTableTransformerOptions } from './groupToNestedTable';
+import { DataTransformerID } from './ids';
+
+describe('GroupToSubframe transformer', () => {
+  beforeAll(() => {
+    mockTransformationsRegistry([groupToNestedTable]);
+  });
+
+  it('should group values by message and place values in subframe', async () => {
+    const testSeries = toDataFrame({
+      name: 'A',
+      fields: [
+        { name: 'time', type: FieldType.time, values: [3000, 4000, 5000, 6000, 7000, 8000] },
+        { name: 'message', type: FieldType.string, values: ['one', 'two', 'two', 'three', 'three', 'three'] },
+        { name: 'values', type: FieldType.string, values: [1, 2, 2, 3, 3, 3] },
+      ],
+    });
+
+    const cfg: DataTransformerConfig<GroupToNestedTableTransformerOptions> = {
+      id: DataTransformerID.groupToNestedTable,
+      options: {
+        fields: {
+          message: {
+            operation: GroupByOperationID.groupBy,
+            aggregations: [],
+          },
+        },
+      },
+    };
+
+    await expect(transformDataFrame([cfg], [testSeries])).toEmitValuesWith((received) => {
+      const result = received[0];
+      const expected: Field[] = [
+        {
+          name: 'message',
+          type: FieldType.string,
+          config: {},
+          values: ['one', 'two', 'three'],
+        },
+        {
+          name: 'Nested frames',
+          type: FieldType.nestedFrames,
+          config: {},
+          values: [
+            [
+              {
+                meta: { custom: { noHeader: false } },
+                length: 1,
+                fields: [
+                  { name: 'time', type: 'time', config: {}, values: [3000] },
+                  { name: 'values', type: 'string', config: {}, values: [1] },
+                ],
+              },
+            ],
+            [
+              {
+                meta: { custom: { noHeader: false } },
+                length: 2,
+                fields: [
+                  {
+                    name: 'time',
+                    type: 'time',
+                    config: {},
+                    values: [4000, 5000],
+                  },
+                  {
+                    name: 'values',
+                    type: 'string',
+                    config: {},
+                    values: [2, 2],
+                  },
+                ],
+              },
+            ],
+            [
+              {
+                meta: { custom: { noHeader: false } },
+                length: 3,
+                fields: [
+                  {
+                    name: 'time',
+                    type: 'time',
+                    config: {},
+                    values: [6000, 7000, 8000],
+                  },
+                  {
+                    name: 'values',
+                    type: 'string',
+                    config: {},
+                    values: [3, 3, 3],
+                  },
+                ],
+              },
+            ],
+          ],
+        },
+      ];
+
+      expect(result[0].fields).toEqual(expected);
+    });
+  });
+
+  it('should group by message, compute a few calculations for each group of values, and place other values in a subframe', async () => {
+    const testSeries = toDataFrame({
+      name: 'A',
+      fields: [
+        { name: 'time', type: FieldType.time, values: [3000, 4000, 5000, 6000, 7000, 8000] },
+        { name: 'message', type: FieldType.string, values: ['one', 'two', 'two', 'three', 'three', 'three'] },
+        { name: 'values', type: FieldType.number, values: [1, 2, 2, 3, 3, 3] },
+        { name: 'intVal', type: FieldType.number, values: [1, 2, 3, 4, 5, 6] },
+        { name: 'floatVal', type: FieldType.number, values: [1.1, 2.3, 3.6, 4.8, 5.7, 6.9] },
+      ],
+    });
+
+    const cfg: DataTransformerConfig<GroupByTransformerOptions> = {
+      id: DataTransformerID.groupToNestedTable,
+      options: {
+        fields: {
+          message: {
+            operation: GroupByOperationID.groupBy,
+            aggregations: [],
+          },
+          values: {
+            operation: GroupByOperationID.aggregate,
+            aggregations: [ReducerID.sum],
+          },
+        },
+      },
+    };
+
+    await expect(transformDataFrame([cfg], [testSeries])).toEmitValuesWith((received) => {
+      const result = received[0];
+      const expected: Field[] = [
+        {
+          name: 'message',
+          type: FieldType.string,
+          config: {},
+          values: ['one', 'two', 'three'],
+        },
+        {
+          name: 'values (sum)',
+          values: [1, 4, 9],
+          type: FieldType.number,
+          config: {},
+        },
+        {
+          config: {},
+          name: 'Nested frames',
+          type: FieldType.nestedFrames,
+          values: [
+            [
+              {
+                meta: { custom: { noHeader: false } },
+                length: 1,
+                fields: [
+                  {
+                    name: 'time',
+                    type: 'time',
+                    config: {},
+                    values: [3000],
+                  },
+                  {
+                    name: 'intVal',
+                    type: 'number',
+                    config: {},
+                    values: [1],
+                  },
+                  {
+                    name: 'floatVal',
+                    type: 'number',
+                    config: {},
+                    values: [1.1],
+                  },
+                ],
+              },
+            ],
+            [
+              {
+                meta: { custom: { noHeader: false } },
+                length: 2,
+                fields: [
+                  {
+                    name: 'time',
+                    type: 'time',
+                    config: {},
+                    values: [4000, 5000],
+                  },
+                  {
+                    name: 'intVal',
+                    type: 'number',
+                    config: {},
+                    values: [2, 3],
+                  },
+                  {
+                    name: 'floatVal',
+                    type: 'number',
+                    config: {},
+                    values: [2.3, 3.6],
+                  },
+                ],
+              },
+            ],
+            [
+              {
+                meta: { custom: { noHeader: false } },
+                length: 3,
+                fields: [
+                  {
+                    name: 'time',
+                    type: 'time',
+                    config: {},
+                    values: [6000, 7000, 8000],
+                  },
+                  {
+                    name: 'intVal',
+                    type: 'number',
+                    config: {},
+                    values: [4, 5, 6],
+                  },
+                  {
+                    name: 'floatVal',
+                    type: 'number',
+                    config: {},
+                    values: [4.8, 5.7, 6.9],
+                  },
+                ],
+              },
+            ],
+          ],
+        },
+      ];
+
+      expect(result[0].fields).toEqual(expected);
+    });
+  });
+});
diff --git a/packages/grafana-data/src/transformations/transformers/groupToNestedTable.ts b/packages/grafana-data/src/transformations/transformers/groupToNestedTable.ts
new file mode 100644
index 0000000000000..aa2d1f9c883b3
--- /dev/null
+++ b/packages/grafana-data/src/transformations/transformers/groupToNestedTable.ts
@@ -0,0 +1,235 @@
+import { map } from 'rxjs/operators';
+
+import { guessFieldTypeForField } from '../../dataframe/processDataFrame';
+import { getFieldDisplayName } from '../../field/fieldState';
+import { DataFrame, Field, FieldType } from '../../types/dataFrame';
+import { DataTransformerInfo } from '../../types/transformations';
+import { ReducerID, reduceField } from '../fieldReducer';
+
+import { GroupByFieldOptions, createGroupedFields, groupValuesByKey } from './groupBy';
+import { DataTransformerID } from './ids';
+
+export const SHOW_NESTED_HEADERS_DEFAULT = true;
+
+enum GroupByOperationID {
+  aggregate = 'aggregate',
+  groupBy = 'groupby',
+}
+
+export interface GroupToNestedTableTransformerOptions {
+  showSubframeHeaders?: boolean;
+  fields: Record<string, GroupByFieldOptions>;
+}
+
+interface FieldMap {
+  [key: string]: Field;
+}
+
+export const groupToNestedTable: DataTransformerInfo<GroupToNestedTableTransformerOptions> = {
+  id: DataTransformerID.groupToNestedTable,
+  name: 'Group to nested tables',
+  description: 'Group data by a field value and create nested tables with the grouped data',
+  defaultOptions: {
+    showSubframeHeaders: SHOW_NESTED_HEADERS_DEFAULT,
+    fields: {},
+  },
+
+  /**
+   * Return a modified copy of the series. If the transform is not or should not
+   * be applied, just return the input series
+   */
+  operator: (options) => (source) =>
+    source.pipe(
+      map((data) => {
+        const hasValidConfig = Object.keys(options.fields).find(
+          (name) => options.fields[name].operation === GroupByOperationID.groupBy
+        );
+        if (!hasValidConfig) {
+          return data;
+        }
+
+        const processed: DataFrame[] = [];
+
+        for (const frame of data) {
+          // Create a list of fields to group on
+          // If there are none we skip the rest
+          const groupByFields: Field[] = frame.fields.filter((field) => shouldGroupOnField(field, options));
+          if (groupByFields.length === 0) {
+            continue;
+          }
+
+          // Group the values by fields and groups so we can get all values for a
+          // group for a given field.
+          const valuesByGroupKey = groupValuesByKey(frame, groupByFields);
+
+          // Add the grouped fields to the resulting fields of the transformation
+          const fields: Field[] = createGroupedFields(groupByFields, valuesByGroupKey);
+
+          // Group data into sub frames so they will display as tables
+          const subFrames: DataFrame[][] = groupToSubframes(valuesByGroupKey, options);
+
+          // Then for each calculations configured, compute and add a new field (column)
+          for (let i = 0; i < frame.fields.length; i++) {
+            const field = frame.fields[i];
+
+            if (!shouldCalculateField(field, options)) {
+              continue;
+            }
+
+            const fieldName = getFieldDisplayName(field);
+            const aggregations = options.fields[fieldName].aggregations;
+            const valuesByAggregation: Record<string, unknown[]> = {};
+
+            valuesByGroupKey.forEach((value) => {
+              const fieldWithValuesForGroup = value[fieldName];
+              const results = reduceField({
+                field: fieldWithValuesForGroup,
+                reducers: aggregations,
+              });
+
+              for (const aggregation of aggregations) {
+                if (!Array.isArray(valuesByAggregation[aggregation])) {
+                  valuesByAggregation[aggregation] = [];
+                }
+                valuesByAggregation[aggregation].push(results[aggregation]);
+              }
+            });
+
+            for (const aggregation of aggregations) {
+              const aggregationField: Field = {
+                name: `${fieldName} (${aggregation})`,
+                values: valuesByAggregation[aggregation],
+                type: FieldType.other,
+                config: {},
+              };
+
+              aggregationField.type = detectFieldType(aggregation, field, aggregationField);
+              fields.push(aggregationField);
+            }
+          }
+
+          fields.push({
+            config: {},
+            name: 'Nested frames',
+            type: FieldType.nestedFrames,
+            values: subFrames,
+          });
+
+          processed.push({
+            fields,
+            length: valuesByGroupKey.size,
+          });
+        }
+
+        return processed;
+      })
+    ),
+};
+
+/**
+ * Given the appropriate data, create a sub-frame
+ * which can then be displayed in a sub-table.
+ */
+function createSubframe(fields: Field[], frameLength: number, options: GroupToNestedTableTransformerOptions) {
+  const showHeaders =
+    options.showSubframeHeaders === undefined ? SHOW_NESTED_HEADERS_DEFAULT : options.showSubframeHeaders;
+
+  return {
+    meta: { custom: { noHeader: !showHeaders } },
+    length: frameLength,
+    fields,
+  };
+}
+
+/**
+ * Determines whether a field should be grouped on.
+ *
+ * @returns boolean
+ *  This will return _true_ if a field should be grouped on and _false_ if it should not.
+ */
+const shouldGroupOnField = (field: Field, options: GroupToNestedTableTransformerOptions): boolean => {
+  const fieldName = getFieldDisplayName(field);
+  return options?.fields[fieldName]?.operation === GroupByOperationID.groupBy;
+};
+
+/**
+ * Determines whether field aggregations should be calculated
+ * @returns boolean
+ *  This will return _true_ if a field should be calculated and _false_ if it should not.
+ */
+const shouldCalculateField = (field: Field, options: GroupToNestedTableTransformerOptions): boolean => {
+  const fieldName = getFieldDisplayName(field);
+  return (
+    options?.fields[fieldName]?.operation === GroupByOperationID.aggregate &&
+    Array.isArray(options?.fields[fieldName].aggregations) &&
+    options?.fields[fieldName].aggregations.length > 0
+  );
+};
+
+/**
+ * Detect the type of field given the relevant aggregation.
+ */
+const detectFieldType = (aggregation: string, sourceField: Field, targetField: Field): FieldType => {
+  switch (aggregation) {
+    case ReducerID.allIsNull:
+      return FieldType.boolean;
+    case ReducerID.last:
+    case ReducerID.lastNotNull:
+    case ReducerID.first:
+    case ReducerID.firstNotNull:
+      return sourceField.type;
+    default:
+      return guessFieldTypeForField(targetField) ?? FieldType.string;
+  }
+};
+
+/**
+ * Group values into subframes so that they'll be displayed
+ * inside of a subtable.
+ *
+ * @param valuesByGroupKey
+ *  A mapping of group keys to their respective grouped values.
+ * @param options
+ *   Transformation options, which are used to find ungrouped/unaggregated fields.
+ * @returns
+ */
+function groupToSubframes(
+  valuesByGroupKey: Map<string, FieldMap>,
+  options: GroupToNestedTableTransformerOptions
+): DataFrame[][] {
+  const subFrames: DataFrame[][] = [];
+
+  // Construct a subframe of any fields
+  // that aren't being group on or reduced
+  for (const [, value] of valuesByGroupKey) {
+    const nestedFields: Field[] = [];
+
+    for (const [fieldName, field] of Object.entries(value)) {
+      const fieldOpts = options.fields[fieldName];
+
+      if (fieldOpts === undefined) {
+        nestedFields.push(field);
+      }
+      // Depending on the configuration form state all of the following are possible
+      else if (
+        fieldOpts.aggregations === undefined ||
+        (fieldOpts.operation === GroupByOperationID.aggregate && fieldOpts.aggregations.length === 0) ||
+        fieldOpts.operation === null ||
+        fieldOpts.operation === undefined
+      ) {
+        nestedFields.push(field);
+      }
+    }
+
+    // If there are any values in the subfields
+    // push a new subframe with the fields
+    // otherwise push an empty frame
+    if (nestedFields.length > 0) {
+      subFrames.push([createSubframe(nestedFields, nestedFields[0].values.length, options)]);
+    } else {
+      subFrames.push([createSubframe([], 0, options)]);
+    }
+  }
+
+  return subFrames;
+}
diff --git a/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts b/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts
index f600b5ee7ba10..bb1dcd445d4bf 100644
--- a/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts
+++ b/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts
@@ -89,7 +89,7 @@ export const groupingToMatrixTransformer: DataTransformerInfo<GroupingToMatrixTr
         const columnValues = uniqueValues(keyColumnField.values);
         const rowValues = uniqueValues(keyRowField.values);
 
-        const matrixValues: { [key: string]: { [key: string]: any } } = {};
+        const matrixValues: { [key: string]: { [key: string]: unknown } } = {};
 
         for (let index = 0; index < valueField.values.length; index++) {
           const columnName = keyColumnField.values[index];
diff --git a/packages/grafana-data/src/transformations/transformers/histogram.test.ts b/packages/grafana-data/src/transformations/transformers/histogram.test.ts
index 64a952d2196af..7bbd03397a015 100644
--- a/packages/grafana-data/src/transformations/transformers/histogram.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/histogram.test.ts
@@ -22,6 +22,14 @@ describe('histogram frames frames', () => {
       fields: [{ name: 'C', type: FieldType.number, values: [5, 6, 7, 8, 9] }],
     });
 
+    const series3 = toDataFrame({
+      fields: [{ name: 'D', type: FieldType.number, values: [1, 2, 3, null, null] }],
+    });
+
+    const series4 = toDataFrame({
+      fields: [{ name: 'E', type: FieldType.number, values: [4, 5, null, 6, null], config: { noValue: '0' } }],
+    });
+
     const out = histogramFieldsToFrame(buildHistogram([series1, series2])!);
     expect(
       out.fields.map((f) => ({
@@ -188,5 +196,87 @@ describe('histogram frames frames', () => {
         },
       ]
     `);
+
+    // NULLs filtering test
+    const out3 = histogramFieldsToFrame(buildHistogram([series3])!);
+    expect(
+      out3.fields.map((f) => ({
+        name: f.name,
+        values: f.values,
+      }))
+    ).toMatchInlineSnapshot(`
+      [
+        {
+          "name": "xMin",
+          "values": [
+            1,
+            2,
+            3,
+          ],
+        },
+        {
+          "name": "xMax",
+          "values": [
+            2,
+            3,
+            4,
+          ],
+        },
+        {
+          "name": "D",
+          "values": [
+            1,
+            1,
+            1,
+          ],
+        },
+      ]
+    `);
+
+    // noValue nulls test
+    const out4 = histogramFieldsToFrame(buildHistogram([series4])!);
+    expect(
+      out4.fields.map((f) => ({
+        name: f.name,
+        values: f.values,
+        config: f.config,
+      }))
+    ).toMatchInlineSnapshot(`
+      [
+        {
+          "config": {},
+          "name": "xMin",
+          "values": [
+            0,
+            4,
+            5,
+            6,
+          ],
+        },
+        {
+          "config": {},
+          "name": "xMax",
+          "values": [
+            1,
+            5,
+            6,
+            7,
+          ],
+        },
+        {
+          "config": {
+            "noValue": "0",
+            "unit": undefined,
+          },
+          "name": "E",
+          "values": [
+            2,
+            1,
+            1,
+            1,
+          ],
+        },
+      ]
+    `);
   });
 });
diff --git a/packages/grafana-data/src/transformations/transformers/histogram.ts b/packages/grafana-data/src/transformations/transformers/histogram.ts
index a82217c2467ca..39d54ffeda96a 100644
--- a/packages/grafana-data/src/transformations/transformers/histogram.ts
+++ b/packages/grafana-data/src/transformations/transformers/histogram.ts
@@ -8,6 +8,7 @@ import { roundDecimals } from '../../utils';
 
 import { DataTransformerID } from './ids';
 import { AlignedData, join } from './joinDataFrames';
+import { nullToValueField } from './nulls/nullToValue';
 import { transformationsVariableSupport } from './utils';
 
 /**
@@ -38,10 +39,13 @@ export const histogramBucketSizes = [
 ];
 /* eslint-enable */
 
-const histFilter = [null];
+const DEFAULT_BUCKET_COUNT = 30;
+
+const histFilter: number[] = [];
 const histSort = (a: number, b: number) => a - b;
 
 export interface HistogramTransformerInputs {
+  bucketCount?: number;
   bucketSize?: string | number;
   bucketOffset?: string | number;
   combine?: boolean;
@@ -51,6 +55,7 @@ export interface HistogramTransformerInputs {
  * @alpha
  */
 export interface HistogramTransformerOptions {
+  bucketCount?: number;
   bucketSize?: number; // 0 is auto
   bucketOffset?: number;
   // xMin?: number;
@@ -64,6 +69,10 @@ export interface HistogramTransformerOptions {
  * @internal
  */
 export const histogramFieldInfo = {
+  bucketCount: {
+    name: 'Bucket count',
+    description: 'approx bucket count',
+  },
   bucketSize: {
     name: 'Bucket size',
     description: undefined,
@@ -183,6 +192,95 @@ export interface HistogramFields {
  * @alpha
  */
 export function getHistogramFields(frame: DataFrame): HistogramFields | undefined {
+  // we ignore xMax (time field) and sum all counts together for each found bucket
+  if (frame.meta?.type === DataFrameType.HeatmapCells) {
+    // we assume uniform bucket size for now
+    // we assume xMax, yMin, yMax fields
+    let yMinField = frame.fields.find((f) => f.name === 'yMin')!;
+    let yMaxField = frame.fields.find((f) => f.name === 'yMax')!;
+    let countField = frame.fields.find((f) => f.name === 'count')!;
+
+    let uniqueMaxs = [...new Set(yMaxField.values)].sort((a, b) => a - b);
+    let uniqueMins = [...new Set(yMinField.values)].sort((a, b) => a - b);
+    let countsByMax = new Map<number, number>();
+    uniqueMaxs.forEach((max) => countsByMax.set(max, 0));
+
+    for (let i = 0; i < yMaxField.values.length; i++) {
+      let max = yMaxField.values[i];
+      countsByMax.set(max, countsByMax.get(max) + countField.values[i]);
+    }
+
+    let fields = {
+      xMin: {
+        ...yMinField,
+        name: 'xMin',
+        values: uniqueMins,
+      },
+      xMax: {
+        ...yMaxField,
+        name: 'xMax',
+        values: uniqueMaxs,
+      },
+      counts: [
+        {
+          ...countField,
+          values: [...countsByMax.values()],
+        },
+      ],
+    };
+
+    return fields;
+  } else if (frame.meta?.type === DataFrameType.HeatmapRows) {
+    // assumes le
+
+    // tick label strings (will be ordinal-ized)
+    let minVals: string[] = [];
+    let maxVals: string[] = [];
+
+    // sums of all timstamps per bucket
+    let countVals: number[] = [];
+
+    let minVal = '0';
+    frame.fields.forEach((f) => {
+      if (f.type === FieldType.number) {
+        let countsSum = f.values.reduce((acc, v) => acc + v, 0);
+        countVals.push(countsSum);
+        minVals.push(minVal);
+        maxVals.push((minVal = f.name));
+      }
+    });
+
+    // fake extra value for +Inf (for x scale ranging since bars are right-aligned)
+    countVals.push(0);
+    minVals.push(minVal);
+    maxVals.push(minVal);
+
+    let fields = {
+      xMin: {
+        ...frame.fields[1],
+        name: 'xMin',
+        type: FieldType.string,
+        values: minVals,
+      },
+      xMax: {
+        ...frame.fields[1],
+        name: 'xMax',
+        type: FieldType.string,
+        values: maxVals,
+      },
+      counts: [
+        {
+          ...frame.fields[1],
+          name: 'count',
+          type: FieldType.number,
+          values: countVals,
+        },
+      ],
+    };
+
+    return fields;
+  }
+
   let xMin: Field | undefined = undefined;
   let xMax: Field | undefined = undefined;
   const counts: Field[] = [];
@@ -229,15 +327,34 @@ export function getHistogramFields(frame: DataFrame): HistogramFields | undefine
   return undefined;
 }
 
-const APPROX_BUCKETS = 20;
-
 /**
  * @alpha
  */
 export function buildHistogram(frames: DataFrame[], options?: HistogramTransformerOptions): HistogramFields | null {
   let bucketSize = options?.bucketSize;
+  let bucketCount = options?.bucketCount ?? DEFAULT_BUCKET_COUNT;
   let bucketOffset = options?.bucketOffset ?? 0;
 
+  // replace or filter nulls from numeric fields
+  frames = frames.map((frame) => {
+    return {
+      ...frame,
+      fields: frame.fields.map((field) => {
+        if (field.type === FieldType.number) {
+          const noValue = Number(field.config.noValue);
+
+          if (!Number.isNaN(noValue)) {
+            field = nullToValueField(field, noValue);
+          } else {
+            field = { ...field, values: field.values.filter((v) => v != null) };
+          }
+        }
+
+        return field;
+      }),
+    };
+  });
+
   // if bucket size is auto, try to calc from all numeric fields
   if (!bucketSize || bucketSize < 0) {
     let allValues: number[] = [];
@@ -251,8 +368,6 @@ export function buildHistogram(frames: DataFrame[], options?: HistogramTransform
       }
     }
 
-    allValues = allValues.filter((v) => v != null);
-
     allValues.sort((a, b) => a - b);
 
     let smallestDelta = Infinity;
@@ -275,7 +390,7 @@ export function buildHistogram(frames: DataFrame[], options?: HistogramTransform
 
     let range = max - min;
 
-    const targetSize = range / APPROX_BUCKETS;
+    const targetSize = range / bucketCount;
 
     // choose bucket
     for (let i = 0; i < histogramBucketSizes.length; i++) {
@@ -288,7 +403,7 @@ export function buildHistogram(frames: DataFrame[], options?: HistogramTransform
     }
   }
 
-  const getBucket = (v: number) => incrRoundDn(v - bucketOffset, bucketSize!) + bucketOffset;
+  const getBucket = (v: number) => roundDecimals(incrRoundDn(v - bucketOffset, bucketSize!) + bucketOffset, 9);
 
   // guess number of decimals
   let bucketDecimals = (('' + bucketSize).match(/\.\d+$/) ?? ['.'])[0].length - 1;
@@ -367,7 +482,12 @@ export function buildHistogram(frames: DataFrame[], options?: HistogramTransform
         name: 'count',
         values: vals,
         type: FieldType.number,
-        state: undefined,
+        state: {
+          ...counts[0].state,
+          displayName: 'Count',
+          multipleFrames: false,
+          origin: { frameIndex: 0, fieldIndex: 2 },
+        },
       },
     ];
   } else {
@@ -407,7 +527,7 @@ export function incrRoundDn(num: number, incr: number) {
 function histogram(
   vals: number[],
   getBucket: (v: number) => number,
-  filterOut?: any[] | null,
+  filterOut?: number[],
   sort?: ((a: number, b: number) => number) | null
 ): AlignedData {
   let hist = new Map();
diff --git a/packages/grafana-data/src/transformations/transformers/ids.ts b/packages/grafana-data/src/transformations/transformers/ids.ts
index efcc57804c48e..06ec0cd627726 100644
--- a/packages/grafana-data/src/transformations/transformers/ids.ts
+++ b/packages/grafana-data/src/transformations/transformers/ids.ts
@@ -39,4 +39,6 @@ export enum DataTransformerID {
   timeSeriesTable = 'timeSeriesTable',
   formatTime = 'formatTime',
   formatString = 'formatString',
+  regression = 'regression',
+  groupToNestedTable = 'groupToNestedTable',
 }
diff --git a/packages/grafana-data/src/transformations/transformers/joinDataFrames.ts b/packages/grafana-data/src/transformations/transformers/joinDataFrames.ts
index f19b6b0ccb75f..0b994b794023c 100644
--- a/packages/grafana-data/src/transformations/transformers/joinDataFrames.ts
+++ b/packages/grafana-data/src/transformations/transformers/joinDataFrames.ts
@@ -56,6 +56,16 @@ export interface JoinOptions {
    */
   keepOriginIndices?: boolean;
 
+  /**
+   * @internal -- keep any pre-cached state.displayName
+   */
+  keepDisplayNames?: boolean;
+
+  /**
+   * @internal -- Optionally specify how to treat null values
+   */
+  nullMode?: (field: Field) => JoinNullMode;
+
   /**
    * @internal -- Optionally specify a join mode (outer or inner)
    */
@@ -90,6 +100,13 @@ export function joinDataFrames(options: JoinOptions): DataFrame | undefined {
     return;
   }
 
+  const nullMode =
+    options.nullMode ??
+    ((field: Field) => {
+      let spanNulls = field.config.custom?.spanNulls;
+      return spanNulls === true ? NULL_REMOVE : spanNulls === -1 ? NULL_RETAIN : NULL_EXPAND;
+    });
+
   if (options.frames.length === 1) {
     let frame = options.frames[0];
     let frameCopy = frame;
@@ -181,8 +198,7 @@ export function joinDataFrames(options: JoinOptions): DataFrame | undefined {
         }
 
         // Support the standard graph span nulls field config
-        let spanNulls = field.config.custom?.spanNulls;
-        nullModesFrame.push(spanNulls === true ? NULL_REMOVE : spanNulls === -1 ? NULL_RETAIN : NULL_EXPAND);
+        nullModesFrame.push(nullMode(field));
 
         let labels = field.labels ?? {};
         let name = field.name;
@@ -223,8 +239,10 @@ export function joinDataFrames(options: JoinOptions): DataFrame | undefined {
     for (const field of fields) {
       a.push(field.values);
       originalFields.push(field);
-      // clear field displayName state
-      delete field.state?.displayName;
+      if (!options.keepDisplayNames) {
+        // clear field displayName state
+        delete field.state?.displayName;
+      }
       // store frame field order for tabular data join
       frameFieldsOrder.push(fieldsOrder);
       fieldsOrder++;
@@ -367,9 +385,9 @@ export type AlignedData =
   | [xValues: number[] | TypedArray, ...yValues: Array<Array<number | null | undefined> | TypedArray>];
 
 // nullModes
-const NULL_REMOVE = 0; // nulls are converted to undefined (e.g. for spanGaps: true)
-const NULL_RETAIN = 1; // nulls are retained, with alignment artifacts set to undefined (default)
-const NULL_EXPAND = 2; // nulls are expanded to include any adjacent alignment artifacts
+export const NULL_REMOVE = 0; // nulls are converted to undefined (e.g. for spanGaps: true)
+export const NULL_RETAIN = 1; // nulls are retained, with alignment artifacts set to undefined (default)
+export const NULL_EXPAND = 2; // nulls are expanded to include any adjacent alignment artifacts
 
 type JoinNullMode = number; // NULL_IGNORE | NULL_RETAIN | NULL_EXPAND;
 
diff --git a/packages/grafana-data/src/transformations/transformers/merge.ts b/packages/grafana-data/src/transformations/transformers/merge.ts
index 5abf270b6e5c8..4c783acf42c59 100644
--- a/packages/grafana-data/src/transformations/transformers/merge.ts
+++ b/packages/grafana-data/src/transformations/transformers/merge.ts
@@ -73,7 +73,7 @@ export const mergeTransformer: DataTransformerInfo<MergeTransformerOptions> = {
           return dataFrames;
         }
 
-        const valuesByKey: Record<string, Array<Record<string, any>>> = {};
+        const valuesByKey: Record<string, Array<Record<string, unknown>>> = {};
         const valuesInOrder: ValuePointer[] = [];
         const keyFactory = createKeyFactory(data, fieldIndexByName, fieldNamesForKey);
         const valueMapper = createValueMapper(data, fieldNames, fieldIndexByName);
@@ -157,7 +157,7 @@ const createValueMapper = (
   fieldIndexByName: Record<string, Record<number, number>>
 ) => {
   return (frameIndex: number, valueIndex: number) => {
-    const value: Record<string, any> = {};
+    const value: Record<string, unknown> = {};
     const fieldNames = Array.from(fieldByName);
 
     for (const fieldName of fieldNames) {
@@ -188,7 +188,7 @@ const createValueMapper = (
   };
 };
 
-const isMergable = (existing: Record<string, any>, value: Record<string, any>): boolean => {
+const isMergable = (existing: Record<string, unknown>, value: Record<string, unknown>): boolean => {
   let mergable = true;
 
   for (const prop in value) {
@@ -217,7 +217,7 @@ const fieldExistsInAllFrames = (
   return Object.keys(fieldIndexByName[field.name]).length === data.length;
 };
 
-const createPointer = (key: string, valuesByKey: Record<string, Array<Record<string, any>>>): ValuePointer => {
+const createPointer = (key: string, valuesByKey: Record<string, Array<Record<string, unknown>>>): ValuePointer => {
   return {
     key,
     index: valuesByKey[key].length - 1,
diff --git a/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.test.ts b/packages/grafana-data/src/transformations/transformers/nulls/nullInsertThreshold.test.ts
similarity index 100%
rename from packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.test.ts
rename to packages/grafana-data/src/transformations/transformers/nulls/nullInsertThreshold.test.ts
diff --git a/packages/grafana-data/src/transformations/transformers/nulls/nullInsertThreshold.ts b/packages/grafana-data/src/transformations/transformers/nulls/nullInsertThreshold.ts
new file mode 100644
index 0000000000000..94d8dd2e3c0ce
--- /dev/null
+++ b/packages/grafana-data/src/transformations/transformers/nulls/nullInsertThreshold.ts
@@ -0,0 +1,186 @@
+import { DataFrame, FieldType } from '../../../types';
+
+type InsertMode = (prev: number, next: number, threshold: number) => number;
+
+const INSERT_MODES = {
+  threshold: (prev: number, next: number, threshold: number) => prev + threshold,
+  midpoint: (prev: number, next: number, threshold: number) => (prev + next) / 2,
+  // previous time + 1ms to prevent StateTimeline from forward-interpolating prior state
+  plusone: (prev: number, next: number, threshold: number) => prev + 1,
+};
+
+interface NullInsertOptions {
+  frame: DataFrame;
+  refFieldName?: string | null;
+  refFieldPseudoMax?: number;
+  refFieldPseudoMin?: number;
+  insertMode?: InsertMode;
+}
+
+function getRefField(frame: DataFrame, refFieldName?: string | null) {
+  return frame.fields.find((field) => {
+    // note: getFieldDisplayName() would require full DF[]
+    return refFieldName != null ? field.name === refFieldName : field.type === FieldType.time;
+  });
+}
+
+/** @internal */
+export function applyNullInsertThreshold(opts: NullInsertOptions): DataFrame {
+  if (opts.frame.length === 0) {
+    return opts.frame;
+  }
+
+  let thorough = true;
+  let { frame, refFieldName, refFieldPseudoMax, refFieldPseudoMin, insertMode } = opts;
+
+  if (!insertMode) {
+    insertMode = INSERT_MODES.threshold;
+  }
+
+  const refField = getRefField(frame, refFieldName);
+
+  if (refField == null) {
+    return frame;
+  }
+
+  refField.state = {
+    ...refField.state,
+    nullThresholdApplied: true,
+  };
+
+  const thresholds = frame.fields.map((field) => field.config.custom?.insertNulls || refField.config.interval || null);
+
+  const uniqueThresholds = new Set<number>(thresholds);
+
+  uniqueThresholds.delete(null as any);
+
+  if (uniqueThresholds.size === 0) {
+    return frame;
+  }
+
+  if (uniqueThresholds.size === 1) {
+    const threshold = uniqueThresholds.values().next().value;
+
+    if (threshold <= 0) {
+      return frame;
+    }
+
+    const refValues = refField.values;
+
+    const frameValues = frame.fields.map((field) => field.values);
+
+    const filledFieldValues = nullInsertThreshold(
+      refValues,
+      frameValues,
+      threshold,
+      refFieldPseudoMin,
+      refFieldPseudoMax,
+      insertMode,
+      thorough
+    );
+
+    if (filledFieldValues === frameValues) {
+      return frame;
+    }
+
+    return {
+      ...frame,
+      length: filledFieldValues[0].length,
+      fields: frame.fields.map((field, i) => ({
+        ...field,
+        values: filledFieldValues[i],
+      })),
+    };
+  }
+
+  // TODO: unique threshold-per-field (via overrides) is unimplemented
+  // should be done by processing each (refField + thresholdA-field1 + thresholdA-field2...)
+  // as a separate nullInsertThreshold() dataset, then re-join into single dataset via join()
+  return frame;
+}
+
+function nullInsertThreshold(
+  refValues: number[],
+  frameValues: any[][],
+  threshold: number,
+  refFieldPseudoMin: number | null = null,
+  // will insert a trailing null when refFieldPseudoMax > last datapoint + threshold
+  refFieldPseudoMax: number | null = null,
+  getInsertValue: InsertMode,
+  // will insert the value at every missing interval
+  thorough: boolean
+) {
+  const len = refValues.length;
+  const refValuesNew: number[] = [];
+
+  // Continuously subtract the threshold from the first data point, filling in insert values accordingly
+  if (refFieldPseudoMin != null && refFieldPseudoMin < refValues[0]) {
+    let preFillCount = Math.ceil((refValues[0] - refFieldPseudoMin) / threshold);
+    // this will be 0 or 1 threshold increment left of visible range
+    let prevSlot = refValues[0] - preFillCount * threshold;
+
+    while (prevSlot < refValues[0]) {
+      // (prevSlot - threshold) is used to simulate the previous 'real' data point, as getInsertValue expects
+      refValuesNew.push(getInsertValue(prevSlot - threshold, prevSlot, threshold));
+      prevSlot += threshold;
+    }
+  }
+
+  // Insert initial value
+  refValuesNew.push(refValues[0]);
+
+  let prevValue: number = refValues[0];
+
+  // Fill nulls when a value is greater than the threshold value
+  for (let i = 1; i < len; i++) {
+    const curValue = refValues[i];
+
+    while (curValue - prevValue > threshold) {
+      refValuesNew.push(getInsertValue(prevValue, curValue, threshold));
+
+      prevValue += threshold;
+
+      if (!thorough) {
+        break;
+      }
+    }
+
+    refValuesNew.push(curValue);
+
+    prevValue = curValue;
+  }
+
+  // At the end of the sequence
+  if (refFieldPseudoMax != null && refFieldPseudoMax > prevValue) {
+    while (prevValue + threshold < refFieldPseudoMax) {
+      refValuesNew.push(getInsertValue(prevValue, refFieldPseudoMax, threshold));
+      prevValue += threshold;
+    }
+  }
+
+  const filledLen = refValuesNew.length;
+
+  if (filledLen === len) {
+    return frameValues;
+  }
+
+  const filledFieldValues: any[][] = [];
+
+  for (let fieldValues of frameValues) {
+    let filledValues;
+
+    if (fieldValues !== refValues) {
+      filledValues = Array(filledLen);
+
+      for (let i = 0, j = 0; i < filledLen; i++) {
+        filledValues[i] = refValues[j] === refValuesNew[i] ? fieldValues[j++] : null;
+      }
+    } else {
+      filledValues = refValuesNew;
+    }
+
+    filledFieldValues.push(filledValues);
+  }
+
+  return filledFieldValues;
+}
diff --git a/packages/grafana-data/src/transformations/transformers/nulls/nullToUndefThreshold.ts b/packages/grafana-data/src/transformations/transformers/nulls/nullToUndefThreshold.ts
new file mode 100644
index 0000000000000..7003ede81abc7
--- /dev/null
+++ b/packages/grafana-data/src/transformations/transformers/nulls/nullToUndefThreshold.ts
@@ -0,0 +1,30 @@
+// mutates all nulls -> undefineds in the fieldValues array for value-less refValues ranges below maxThreshold
+// refValues is typically a time array and maxThreshold is the allowable distance between in time
+export function nullToUndefThreshold(refValues: number[], fieldValues: unknown[], maxThreshold: number) {
+  let prevRef;
+  let nullIdx;
+
+  for (let i = 0; i < fieldValues.length; i++) {
+    let fieldVal = fieldValues[i];
+
+    if (fieldVal == null) {
+      if (nullIdx == null && prevRef != null) {
+        nullIdx = i;
+      }
+    } else {
+      if (nullIdx != null && prevRef != null) {
+        if (refValues[i] - prevRef < maxThreshold) {
+          while (nullIdx < i) {
+            fieldValues[nullIdx++] = undefined;
+          }
+        }
+
+        nullIdx = null;
+      }
+
+      prevRef = refValues[i];
+    }
+  }
+
+  return fieldValues;
+}
diff --git a/packages/grafana-ui/src/components/GraphNG/nullToValue.test.ts b/packages/grafana-data/src/transformations/transformers/nulls/nullToValue.test.ts
similarity index 100%
rename from packages/grafana-ui/src/components/GraphNG/nullToValue.test.ts
rename to packages/grafana-data/src/transformations/transformers/nulls/nullToValue.test.ts
diff --git a/packages/grafana-data/src/transformations/transformers/nulls/nullToValue.ts b/packages/grafana-data/src/transformations/transformers/nulls/nullToValue.ts
new file mode 100644
index 0000000000000..a2d2eeb88c7e6
--- /dev/null
+++ b/packages/grafana-data/src/transformations/transformers/nulls/nullToValue.ts
@@ -0,0 +1,31 @@
+import { DataFrame, Field } from '../../../types';
+
+export function nullToValue(frame: DataFrame) {
+  return {
+    ...frame,
+    fields: frame.fields.map((field) => {
+      const noValue = Number(field.config.noValue);
+
+      if (!Number.isNaN(noValue)) {
+        return nullToValueField(field, noValue);
+      } else {
+        return field;
+      }
+    }),
+  };
+}
+
+export function nullToValueField(field: Field, noValue: number) {
+  const transformedVals = field.values.slice();
+
+  for (let i = 0; i < transformedVals.length; i++) {
+    if (transformedVals[i] === null) {
+      transformedVals[i] = noValue;
+    }
+  }
+
+  return {
+    ...field,
+    values: transformedVals,
+  };
+}
diff --git a/packages/grafana-data/src/transformations/transformers/organize.test.ts b/packages/grafana-data/src/transformations/transformers/organize.test.ts
index 712d9c17c1514..34a73672dc6f4 100644
--- a/packages/grafana-data/src/transformations/transformers/organize.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/organize.test.ts
@@ -70,6 +70,33 @@ describe('OrganizeFields Transformer', () => {
         ]);
       });
     });
+
+    it('should order and filter (inclusion) according to config', async () => {
+      const cfg: DataTransformerConfig<OrganizeFieldsTransformerOptions> = {
+        id: DataTransformerID.organize,
+        options: {
+          excludeByName: {},
+          indexByName: {},
+          includeByName: {
+            time: true,
+          },
+          renameByName: {},
+        },
+      };
+
+      await expect(transformDataFrame([cfg], [data])).toEmitValuesWith((received) => {
+        const data = received[0];
+        const organized = data[0];
+        expect(organized.fields).toEqual([
+          {
+            config: {},
+            name: 'time',
+            type: FieldType.time,
+            values: [3000, 4000, 5000, 6000],
+          },
+        ]);
+      });
+    });
   });
 
   describe('when inconsistent data is received', () => {
diff --git a/packages/grafana-data/src/transformations/transformers/organize.ts b/packages/grafana-data/src/transformations/transformers/organize.ts
index 3eb8b04e709c1..dfda3a779b4a7 100644
--- a/packages/grafana-data/src/transformations/transformers/organize.ts
+++ b/packages/grafana-data/src/transformations/transformers/organize.ts
@@ -9,6 +9,7 @@ export interface OrganizeFieldsTransformerOptions
   extends OrderFieldsTransformerOptions,
     RenameFieldsTransformerOptions {
   excludeByName: Record<string, boolean>;
+  includeByName?: Record<string, boolean>;
 }
 
 export const organizeFieldsTransformer: DataTransformerInfo<OrganizeFieldsTransformerOptions> = {
@@ -19,6 +20,7 @@ export const organizeFieldsTransformer: DataTransformerInfo<OrganizeFieldsTransf
     excludeByName: {},
     indexByName: {},
     renameByName: {},
+    includeByName: {},
   },
   isApplicable: (data: DataFrame[]) => {
     return data.length > 1
@@ -33,6 +35,7 @@ export const organizeFieldsTransformer: DataTransformerInfo<OrganizeFieldsTransf
     source.pipe(
       filterFieldsByNameTransformer.operator(
         {
+          include: options.includeByName ? { names: mapToExcludeArray(options.includeByName) } : undefined,
           exclude: { names: mapToExcludeArray(options.excludeByName) },
         },
         ctx
diff --git a/packages/grafana-data/src/transformations/transformers/reduce.test.ts b/packages/grafana-data/src/transformations/transformers/reduce.test.ts
index 95c175f66a0cc..3cb46763a540f 100644
--- a/packages/grafana-data/src/transformations/transformers/reduce.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/reduce.test.ts
@@ -21,7 +21,7 @@ const seriesAWithMultipleFields = toDataFrame({
   name: 'A',
   fields: [
     { name: 'time', type: FieldType.time, values: [3000, 4000, 5000, 6000] },
-    { name: 'temperature', type: FieldType.number, values: [3, 4, 5, 6] },
+    { name: 'temperature', type: FieldType.number, values: [3, 4, 5, 6, 6] },
     { name: 'humidity', type: FieldType.number, values: [10000.3, 10000.4, 10000.5, 10000.6] },
   ],
 });
@@ -52,7 +52,14 @@ describe('Reducer Transformer', () => {
     const cfg = {
       id: DataTransformerID.reduce,
       options: {
-        reducers: [ReducerID.first, ReducerID.min, ReducerID.max, ReducerID.last],
+        reducers: [
+          ReducerID.first,
+          ReducerID.min,
+          ReducerID.max,
+          ReducerID.last,
+          ReducerID.uniqueValues,
+          ReducerID.count,
+        ],
       },
     };
 
@@ -90,6 +97,25 @@ describe('Reducer Transformer', () => {
             values: [6, 10000.6, 7, 11000.7],
             config: {},
           },
+          {
+            // expect type other
+            name: 'All unique values',
+            type: FieldType.other,
+            values: [
+              [3, 4, 5, 6],
+              [10000.3, 10000.4, 10000.5, 10000.6],
+              [1, 3, 5, 7],
+              [11000.1, 11000.3, 11000.5, 11000.7],
+            ],
+            config: {},
+          },
+          {
+            // expect type number
+            name: 'Count',
+            type: FieldType.number,
+            values: [5, 4, 4, 4],
+            config: {},
+          },
         ];
 
         expect(processed.length).toEqual(1);
diff --git a/packages/grafana-data/src/transformations/transformers/reduce.ts b/packages/grafana-data/src/transformations/transformers/reduce.ts
index 89c684e051d2d..d7e8ba8cda583 100644
--- a/packages/grafana-data/src/transformations/transformers/reduce.ts
+++ b/packages/grafana-data/src/transformations/transformers/reduce.ts
@@ -46,8 +46,8 @@ export const reduceTransformer: DataTransformerInfo<ReduceTransformerOptions> =
         const matcher = options.fields
           ? getFieldMatcher(options.fields)
           : options.includeTimeField && options.mode === ReduceTransformerMode.ReduceFields
-          ? alwaysFieldMatcher
-          : notTimeFieldMatcher;
+            ? alwaysFieldMatcher
+            : notTimeFieldMatcher;
 
         // Collapse all matching fields into a single row
         if (options.mode === ReduceTransformerMode.ReduceFields) {
@@ -64,7 +64,7 @@ export const reduceTransformer: DataTransformerInfo<ReduceTransformerOptions> =
 /**
  * @internal only exported for testing
  */
-export function reduceSeriesToRows(
+function reduceSeriesToRows(
   data: DataFrame[],
   matcher: FieldMatcher,
   reducerId: ReducerID[],
@@ -156,7 +156,7 @@ export function reduceSeriesToRows(
   return mergeResults(processed);
 }
 
-export function getDistinctLabelKeys(frames: DataFrame[]): string[] {
+function getDistinctLabelKeys(frames: DataFrame[]): string[] {
   const keys = new Set<string>();
   for (const frame of frames) {
     for (const field of frame.fields) {
@@ -173,7 +173,7 @@ export function getDistinctLabelKeys(frames: DataFrame[]): string[] {
 /**
  * @internal only exported for testing
  */
-export function mergeResults(data: DataFrame[]): DataFrame | undefined {
+function mergeResults(data: DataFrame[]): DataFrame | undefined {
   if (!data?.length) {
     return undefined;
   }
@@ -211,7 +211,6 @@ export function reduceFields(data: DataFrame[], matcher: FieldMatcher, reducerId
   const calculators = fieldReducers.list(reducerId);
   const reducers = calculators.map((c) => c.id);
   const processed: DataFrame[] = [];
-
   for (const series of data) {
     const fields: Field[] = [];
     for (const field of series.fields) {
@@ -224,6 +223,7 @@ export function reduceFields(data: DataFrame[], matcher: FieldMatcher, reducerId
           const value = results[reducer];
           const copy = {
             ...field,
+            type: getFieldType(reducer, field),
             values: [value],
           };
           copy.state = undefined;
@@ -248,3 +248,18 @@ export function reduceFields(data: DataFrame[], matcher: FieldMatcher, reducerId
 
   return processed;
 }
+
+function getFieldType(reducer: string, field: Field) {
+  switch (reducer) {
+    case ReducerID.allValues:
+    case ReducerID.uniqueValues:
+      return FieldType.other;
+    case ReducerID.first:
+    case ReducerID.firstNotNull:
+    case ReducerID.last:
+    case ReducerID.lastNotNull:
+      return field.type;
+    default:
+      return FieldType.number;
+  }
+}
diff --git a/packages/grafana-data/src/transformations/transformers/seriesToRows.test.ts b/packages/grafana-data/src/transformations/transformers/seriesToRows.test.ts
index 49829c3e3777c..23f6de762256a 100644
--- a/packages/grafana-data/src/transformations/transformers/seriesToRows.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/seriesToRows.test.ts
@@ -11,6 +11,33 @@ describe('Series to rows', () => {
     mockTransformationsRegistry([seriesToRowsTransformer]);
   });
 
+  it('should do transform even with only one series', async () => {
+    const cfg: DataTransformerConfig<SeriesToRowsTransformerOptions> = {
+      id: DataTransformerID.seriesToRows,
+      options: {},
+    };
+
+    const seriesA = toDataFrame({
+      name: 'A',
+      fields: [
+        { name: 'Time', type: FieldType.time, values: [1000] },
+        { name: 'Temp', type: FieldType.number, values: [1] },
+      ],
+    });
+
+    await expect(transformDataFrame([cfg], [seriesA])).toEmitValuesWith((received) => {
+      const result = received[0];
+
+      const expected: Field[] = [
+        createField('Time', FieldType.time, [1000]),
+        createField('Metric', FieldType.string, ['A']),
+        createField('Value', FieldType.number, [1]),
+      ];
+
+      expect(unwrap(result[0].fields)).toEqual(expected);
+    });
+  });
+
   it('combine two series into one', async () => {
     const cfg: DataTransformerConfig<SeriesToRowsTransformerOptions> = {
       id: DataTransformerID.seriesToRows,
diff --git a/packages/grafana-data/src/transformations/transformers/seriesToRows.ts b/packages/grafana-data/src/transformations/transformers/seriesToRows.ts
index bbfcfcb4b147c..cf0793ef7d019 100644
--- a/packages/grafana-data/src/transformations/transformers/seriesToRows.ts
+++ b/packages/grafana-data/src/transformations/transformers/seriesToRows.ts
@@ -25,7 +25,7 @@ export const seriesToRowsTransformer: DataTransformerInfo<SeriesToRowsTransforme
   operator: (options) => (source) =>
     source.pipe(
       map((data) => {
-        if (!Array.isArray(data) || data.length <= 1) {
+        if (!Array.isArray(data) || data.length === 0) {
           return data;
         }
 
diff --git a/packages/grafana-data/src/transformations/transformers/sortBy.ts b/packages/grafana-data/src/transformations/transformers/sortBy.ts
index 7cd99acce363d..5831581562120 100644
--- a/packages/grafana-data/src/transformations/transformers/sortBy.ts
+++ b/packages/grafana-data/src/transformations/transformers/sortBy.ts
@@ -43,7 +43,7 @@ export const sortByTransformer: DataTransformerInfo<SortByTransformerOptions> =
     ),
 };
 
-export function sortDataFrames(data: DataFrame[], sort: SortByField[], ctx: DataTransformContext): DataFrame[] {
+function sortDataFrames(data: DataFrame[], sort: SortByField[], ctx: DataTransformContext): DataFrame[] {
   return data.map((frame) => {
     const s = attachFieldIndex(frame, sort, ctx);
     if (s.length && s[0].index != null) {
diff --git a/packages/grafana-data/src/types/OptionsUIRegistryBuilder.ts b/packages/grafana-data/src/types/OptionsUIRegistryBuilder.ts
index 0765f1987a334..b5a0e74f34f07 100644
--- a/packages/grafana-data/src/types/OptionsUIRegistryBuilder.ts
+++ b/packages/grafana-data/src/types/OptionsUIRegistryBuilder.ts
@@ -30,7 +30,7 @@ export interface OptionsEditorItem<TOptions, TSettings, TEditorProps, TValue>
 /**
  * Describes an API for option editors UI builder
  */
-export interface OptionsUIRegistryBuilderAPI<
+interface OptionsUIRegistryBuilderAPI<
   TOptions,
   TEditorProps,
   T extends OptionsEditorItem<TOptions, any, TEditorProps, any>,
diff --git a/packages/grafana-data/src/types/app.ts b/packages/grafana-data/src/types/app.ts
index fcb58a7ccb1c4..626ab368bf24b 100644
--- a/packages/grafana-data/src/types/app.ts
+++ b/packages/grafana-data/src/types/app.ts
@@ -111,9 +111,7 @@ export class AppPlugin<T extends KeyValue = KeyValue> extends GrafanaPlugin<AppP
     return this;
   }
 
-  configureExtensionComponent<Context extends object>(
-    extension: Omit<PluginExtensionComponentConfig<Context>, 'type'>
-  ) {
+  configureExtensionComponent<Props = {}>(extension: Omit<PluginExtensionComponentConfig<Props>, 'type'>) {
     this._extensionConfigs.push({
       ...extension,
       type: PluginExtensionTypes.component,
diff --git a/packages/grafana-data/src/types/config.ts b/packages/grafana-data/src/types/config.ts
index 462eb6c9a6f98..72f89ea92863e 100644
--- a/packages/grafana-data/src/types/config.ts
+++ b/packages/grafana-data/src/types/config.ts
@@ -14,7 +14,10 @@ import { GrafanaTheme, IconName, NavLinkDTO, OrgRole } from '.';
  * @public
  */
 export interface BuildInfo {
+  // This MUST be a semver-ish version string, such as "11.0.0-54321"
   version: string;
+  // Version to show in the UI instead of version
+  versionString: string;
   commit: string;
   env: string;
   edition: GrafanaEdition;
@@ -105,6 +108,7 @@ export interface AnalyticsSettings {
 export interface CurrentUserDTO {
   isSignedIn: boolean;
   id: number;
+  uid: string;
   externalUserId: string;
   login: string;
   email: string;
@@ -122,6 +126,7 @@ export interface CurrentUserDTO {
   language: string;
   permissions?: Record<string, boolean>;
   analytics: AnalyticsSettings;
+  authenticatedBy: string;
 
   /** @deprecated Use theme instead */
   lightTheme: boolean;
@@ -135,7 +140,7 @@ export interface BootData {
   user: CurrentUserDTO;
   settings: GrafanaConfig;
   navTree: NavLinkDTO[];
-  themePaths: {
+  assets: {
     light: string;
     dark: string;
   };
@@ -148,6 +153,7 @@ export interface BootData {
  */
 export interface GrafanaConfig {
   publicDashboardAccessToken?: string;
+  publicDashboardsEnabled: boolean;
   snapshotEnabled: boolean;
   datasources: { [str: string]: DataSourceInstanceSettings };
   panels: { [key: string]: PanelPluginMeta };
@@ -164,10 +170,6 @@ export interface GrafanaConfig {
   allowOrgCreate: boolean;
   disableLoginForm: boolean;
   defaultDatasource: string;
-  alertingEnabled: boolean;
-  alertingErrorOrTimeout: string;
-  alertingNoDataOrNullValues: string;
-  alertingMinInterval: number;
   authProxyEnabled: boolean;
   exploreEnabled: boolean;
   queryHistoryEnabled: boolean;
@@ -197,6 +199,7 @@ export interface GrafanaConfig {
   theme: GrafanaTheme;
   theme2: GrafanaTheme2;
   anonymousEnabled: boolean;
+  anonymousDeviceLimit: number | undefined;
   featureToggles: FeatureToggles;
   licenseInfo: LicenseInfo;
   http2Enabled: boolean;
@@ -221,6 +224,21 @@ export interface GrafanaConfig {
   rudderstackConfigUrl: string | undefined;
   rudderstackIntegrationsUrl: string | undefined;
   sqlConnectionLimits: SqlConnectionLimits;
+  sharedWithMeFolderUID?: string;
+  rootFolderUID?: string;
+  localFileSystemAvailable?: boolean;
+  cloudMigrationIsTarget?: boolean;
+  listDashboardScopesEndpoint?: string;
+  listScopesEndpoint?: string;
+
+  // The namespace to use for kubernetes apiserver requests
+  namespace: string;
+
+  /**
+   * Language used in Grafana's UI. This is after the user's preference (or deteceted locale) is resolved to one of
+   * Grafana's supported language.
+   */
+  language: string | undefined;
 }
 
 export interface SqlConnectionLimits {
@@ -230,16 +248,30 @@ export interface SqlConnectionLimits {
 }
 
 export interface AuthSettings {
+  AuthProxyEnableLoginToken?: boolean;
+  // @deprecated -- this is no longer used and will be removed in Grafana 11
   OAuthSkipOrgRoleUpdateSync?: boolean;
+  // @deprecated -- this is no longer used and will be removed in Grafana 11
   SAMLSkipOrgRoleSync?: boolean;
+  // @deprecated -- this is no longer used and will be removed in Grafana 11
   LDAPSkipOrgRoleSync?: boolean;
+  // @deprecated -- this is no longer used and will be removed in Grafana 11
   JWTAuthSkipOrgRoleSync?: boolean;
+  // @deprecated -- this is no longer used and will be removed in Grafana 11
   GrafanaComSkipOrgRoleSync?: boolean;
+  // @deprecated -- this is no longer used and will be removed in Grafana 11
   GithubSkipOrgRoleSync?: boolean;
+  // @deprecated -- this is no longer used and will be removed in Grafana 11
   GitLabSkipOrgRoleSync?: boolean;
+  // @deprecated -- this is no longer used and will be removed in Grafana 11
   OktaSkipOrgRoleSync?: boolean;
+  // @deprecated -- this is no longer used and will be removed in Grafana 11
   AzureADSkipOrgRoleSync?: boolean;
+  // @deprecated -- this is no longer used and will be removed in Grafana 11
   GoogleSkipOrgRoleSync?: boolean;
+  // @deprecated -- this is no longer used and will be removed in Grafana 11
   GenericOAuthSkipOrgRoleSync?: boolean;
-  AuthProxyEnableLoginToken?: boolean;
+
+  disableLogin?: boolean;
+  basicAuthStrongPasswordPolicy?: boolean;
 }
diff --git a/packages/grafana-data/src/types/data.test.ts b/packages/grafana-data/src/types/data.test.ts
new file mode 100644
index 0000000000000..ba1f66ffaab95
--- /dev/null
+++ b/packages/grafana-data/src/types/data.test.ts
@@ -0,0 +1,61 @@
+import { isObject, isTruthy } from './data';
+
+describe('isObject', () => {
+  it.each([
+    // [value, expected]
+
+    // These are objects
+    [{}, true],
+    [[], true],
+    [{ a: 1 }, true],
+    [new Date(), true],
+    [new Error(), true],
+
+    // These are not!
+    [parseInt('blabla', 10), false], // NaN
+    [null, false],
+    [undefined, false],
+    [-Infinity, false],
+    [-42, false],
+    [0, false],
+    [-0, false],
+    [42, false],
+    [Infinity, false],
+    ['foo', false],
+    [true, false],
+    [Symbol(), false],
+    [() => {}, false],
+  ])('should return %p for %p', (input, expected) => {
+    expect(isObject(input)).toBe(expected);
+  });
+});
+
+describe('isTruthy', () => {
+  it.each([
+    // [value, expected]
+
+    // These are truthy
+    [true, true],
+    [-Infinity, true],
+    [-42, true],
+    [42, true],
+    [Infinity, true],
+    ['foo', true],
+    [{}, true],
+    [[], true],
+    [() => {}, true],
+    [Symbol(), true],
+    [new Date(), true],
+
+    // These are falsy
+    [false, false],
+    [0, false],
+    [-0, false],
+    ['', false],
+    [null, false],
+    [undefined, false],
+    [parseInt('blabla', 10), false], // NaN
+  ])('should return %p for %p', (input, expected) => {
+    expect(isTruthy(input)).toBe(expected);
+  });
+});
diff --git a/packages/grafana-data/src/types/data.ts b/packages/grafana-data/src/types/data.ts
index 2785f6c799f4e..13a0eb789dcea 100644
--- a/packages/grafana-data/src/types/data.ts
+++ b/packages/grafana-data/src/types/data.ts
@@ -33,6 +33,7 @@ export const preferredVisualizationTypes = [
 export type PreferredVisualisationType = (typeof preferredVisualizationTypes)[number];
 
 /**
+ * Should be kept in sync with https://github.com/grafana/grafana-plugin-sdk-go/blob/main/data/frame_meta.go
  * @public
  */
 export interface QueryResultMeta {
@@ -53,9 +54,6 @@ export interface QueryResultMeta {
   /** Meta Notices */
   notices?: QueryResultMetaNotice[];
 
-  /** Used to track transformation ids that where part of the processing */
-  transformations?: string[];
-
   /** Currently used to show results in Explore only in preferred visualisation option */
   preferredVisualisationType?: PreferredVisualisationType;
 
@@ -107,6 +105,14 @@ export interface QueryResultMeta {
   limit?: number; // used by log models and loki
   json?: boolean; // used to keep track of old json doc values
   instant?: boolean;
+
+  /**
+   * Array of field indices which values create a unique id for each row. Ideally this should be globally unique ID
+   * but that isn't guarantied. Should help with keeping track and deduplicating rows in visualizations, especially
+   * with streaming data with frequent updates.
+   * Example: TraceID in Tempo, table name + primary key in SQL
+   */
+  uniqueRowIdFields?: number[];
 }
 
 export interface QueryResultMetaStat extends FieldConfig {
@@ -213,3 +219,27 @@ export interface DataConfigSource {
 
 type Truthy<T> = T extends false | '' | 0 | null | undefined ? never : T;
 export const isTruthy = <T>(value: T): value is Truthy<T> => Boolean(value);
+
+/**
+ * Serves no runtime purpose - only used to make typescript check a value has been correctly
+ * narrowed to an object
+ */
+function identityObject(value: object): object {
+  return value;
+}
+
+/**
+ * Utility type predicate to check if a value is typeof object, but excludes "null".
+ *
+ * We normally discourage the use of type predicates in favor of just inline typescript narrowing,
+ * but this is a special case to handle null annoyingly being typeof object
+ */
+export function isObject(value: unknown): value is object {
+  if (typeof value === 'object' && value !== null) {
+    identityObject(value);
+
+    return true;
+  }
+
+  return false;
+}
diff --git a/packages/grafana-data/src/types/dataFrame.ts b/packages/grafana-data/src/types/dataFrame.ts
index c4712e91ac47d..291f88b23332d 100644
--- a/packages/grafana-data/src/types/dataFrame.ts
+++ b/packages/grafana-data/src/types/dataFrame.ts
@@ -1,3 +1,5 @@
+import { HideSeriesConfig } from '@grafana/schema';
+
 import { ScopedVars } from './ScopedVars';
 import { QueryResultBase, Labels, NullValueMode } from './data';
 import { DataLink, LinkModel } from './dataLink';
@@ -5,7 +7,6 @@ import { DecimalCount, DisplayProcessor, DisplayValue, DisplayValueAlignmentFact
 import { FieldColor } from './fieldColor';
 import { ThresholdsConfig } from './thresholds';
 import { ValueMapping } from './valueMapping';
-import { Vector } from './vector';
 
 /** @public */
 export enum FieldType {
@@ -13,13 +14,17 @@ export enum FieldType {
   number = 'number',
   string = 'string',
   boolean = 'boolean',
+
   // Used to detect that the value is some kind of trace data to help with the visualisation and processing.
   trace = 'trace',
   geo = 'geo',
   enum = 'enum',
   other = 'other', // Object, Array, etc
   frame = 'frame', // DataFrame
-  nestedFrames = 'nestedFrames', // @alpha Nested DataFrames
+
+  // @alpha Nested DataFrames. This is for example used with tables where expanding a row will show a nested table.
+  // The value should be DataFrame[] even if it is a single frame.
+  nestedFrames = 'nestedFrames',
 }
 
 /**
@@ -129,7 +134,7 @@ export interface ValueLinkConfig {
   valueRowIndex?: number;
 }
 
-export interface Field<T = any, V = Vector<T>> {
+export interface Field<T = any> {
   /**
    * Name of the field (column)
    */
@@ -145,10 +150,8 @@ export interface Field<T = any, V = Vector<T>> {
 
   /**
    * The raw field values
-   * In Grafana 10, this accepts both simple arrays and the Vector interface
-   * In Grafana 11, the Vector interface will be removed
    */
-  values: V | T[];
+  values: T[];
 
   /**
    * When type === FieldType.Time, this can optionally store
@@ -230,6 +233,15 @@ export interface FieldState {
    * It's up to each visualization to calculate and set this.
    */
   alignmentFactors?: DisplayValueAlignmentFactors;
+
+  /**
+   * This is the current ad-hoc state of whether this series is hidden in viz, tooltip, and legend.
+   *
+   * Currently this will match field.config.custom.hideFrom because fieldOverrides applies the special __system
+   * override to the actual config during toggle via legend. This should go away once we have a unified system
+   * for layering ad hoc field overrides and options but still being able to get the stateless fieldConfig and panel options
+   */
+  hideFrom?: HideSeriesConfig;
 }
 
 /** @public */
@@ -260,7 +272,7 @@ export interface FieldDTO<T = any> {
   name: string; // The column name
   type?: FieldType;
   config?: FieldConfig;
-  values?: Vector<T> | T[]; // toJSON will always be T[], input could be either
+  values?: T[];
   labels?: Labels;
 }
 
diff --git a/packages/grafana-data/src/types/datasource.ts b/packages/grafana-data/src/types/datasource.ts
index 604a59ee777c9..f555983f67f2e 100644
--- a/packages/grafana-data/src/types/datasource.ts
+++ b/packages/grafana-data/src/types/datasource.ts
@@ -14,7 +14,7 @@ import { DataQuery } from './query';
 import { RawTimeRange, TimeRange } from './time';
 import { CustomVariableSupport, DataSourceVariableSupport, StandardVariableSupport } from './variables';
 
-import { AdHocVariableFilter, DataSourceRef, WithAccessControlMetadata } from '.';
+import { AdHocVariableFilter, DataSourceRef, Scope, WithAccessControlMetadata } from '.';
 
 export interface DataSourcePluginOptionsEditorProps<
   JSONData extends DataSourceJsonData = DataSourceJsonData,
@@ -190,9 +190,6 @@ type VariableSupport<TQuery extends DataQuery, TOptions extends DataSourceJsonDa
 
 /**
  * The main data source abstraction interface, represents an instance of a data source
- *
- * Although this is a class, datasource implementations do not *yet* need to extend it.
- * As such, we can not yet add functions with default implementations.
  */
 abstract class DataSourceApi<
   TQuery extends DataQuery = DataQuery,
@@ -263,11 +260,12 @@ abstract class DataSourceApi<
   abstract testDatasource(): Promise<TestDataSourceResponse>;
 
   /**
-   * This function is not called automatically unless running within the DataSourceWithBackend
-   *
-   * @deprecated
+   * Optionally, you can implement this method to prevent certain queries from being executed.
+   * Return false to prevent the query from being executed.
    */
-  filterQuery?(query: TQuery): boolean;
+  filterQuery?(query: TQuery): boolean {
+    return true;
+  }
 
   /**
    *  Get hints for query improvements
@@ -287,7 +285,7 @@ abstract class DataSourceApi<
   /**
    * Get tag keys for adhoc filters
    */
-  getTagKeys?(options?: DataSourceGetTagKeysOptions): Promise<MetricFindValue[]>;
+  getTagKeys?(options?: DataSourceGetTagKeysOptions<TQuery>): Promise<MetricFindValue[]>;
 
   /**
    * Get tag values for adhoc filters
@@ -367,7 +365,7 @@ abstract class DataSourceApi<
 /**
  * Options argument to DataSourceAPI.getTagKeys
  */
-export interface DataSourceGetTagKeysOptions {
+export interface DataSourceGetTagKeysOptions<TQuery extends DataQuery = DataQuery> {
   /**
    * The other existing filters or base filters. New in v10.3
    */
@@ -376,6 +374,7 @@ export interface DataSourceGetTagKeysOptions {
    * Context time range. New in v10.3
    */
   timeRange?: TimeRange;
+  queries?: TQuery[];
 }
 
 /**
@@ -428,7 +427,6 @@ export interface QueryEditorProps<
    */
   data?: PanelData;
   range?: TimeRange;
-  exploreId?: any;
   history?: Array<HistoryItem<TQuery>>;
   queries?: DataQuery[];
   app?: CoreApp;
@@ -441,15 +439,6 @@ export enum ExploreMode {
   Tracing = 'Tracing',
 }
 
-/**
- * @deprecated use QueryEditorProps instead
- */
-export type ExploreQueryFieldProps<
-  DSType extends DataSourceApi<TQuery, TOptions>,
-  TQuery extends DataQuery = DataQuery,
-  TOptions extends DataSourceJsonData = DataSourceJsonData,
-> = QueryEditorProps<DSType, TQuery, TOptions>;
-
 export interface QueryEditorHelpProps<TQuery extends DataQuery = DataQuery> {
   datasource: DataSourceApi<TQuery>;
   query: TQuery;
@@ -547,13 +536,16 @@ export interface DataQueryRequest<TQuery extends DataQuery = DataQuery> {
 
   cacheTimeout?: string | null;
   queryCachingTTL?: number | null;
+  skipQueryCache?: boolean;
   rangeRaw?: RawTimeRange;
   timeInfo?: string; // The query time description (blue text in the upper right)
   panelId?: number;
+  panelPluginId?: string;
   dashboardUID?: string;
 
   /** Filters to dynamically apply to all queries */
   filters?: AdHocVariableFilter[];
+  groupByKeys?: string[];
 
   // Request Timing
   startTime: number;
@@ -567,6 +559,8 @@ export interface DataQueryRequest<TQuery extends DataQuery = DataQuery> {
 
   // Used to correlate multiple related requests
   queryGroupId?: string;
+
+  scope?: Scope | undefined;
 }
 
 export interface DataQueryTimings {
@@ -579,11 +573,22 @@ export interface QueryFix {
   action?: QueryFixAction;
 }
 
+export type QueryFixType = 'ADD_FILTER' | 'ADD_FILTER_OUT' | 'ADD_STRING_FILTER' | 'ADD_STRING_FILTER_OUT';
 export interface QueryFixAction {
-  type: string;
   query?: string;
   preventSubmit?: boolean;
+  /**
+   * The type of action to perform. Will be passed to the data source to handle.
+   */
+  type: QueryFixType | string;
+  /**
+   * A key value map of options that will be passed. Usually used to pass e.g. the label and value.
+   */
   options?: KeyValue<string>;
+  /**
+   * An optional single row data frame containing the row that triggered the the QueryFixAction.
+   */
+  frame?: DataFrame;
 }
 
 export interface QueryHint {
@@ -604,6 +609,7 @@ export interface DataSourceJsonData {
   profile?: string;
   manageAlerts?: boolean;
   alertmanagerUid?: string;
+  disableGrafanaCache?: boolean;
 }
 
 /**
@@ -674,8 +680,6 @@ export interface DataSourceInstanceSettings<T extends DataSourceJsonData = DataS
 
   /** When the name+uid are based on template variables, maintain access to the real values */
   rawRef?: DataSourceRef;
-
-  angularDetected?: boolean;
 }
 
 /**
@@ -713,7 +717,7 @@ abstract class LanguageProvider {
    * Returns startTask that resolves with a task list when main syntax is loaded.
    * Task list consists of secondary promises that load more detailed language features.
    */
-  abstract start: () => Promise<Array<Promise<any>>>;
+  abstract start: (timeRange?: TimeRange) => Promise<Array<Promise<any>>>;
   startTask?: Promise<any[]>;
 }
 
diff --git a/packages/grafana-data/src/types/displayValue.ts b/packages/grafana-data/src/types/displayValue.ts
index f0b9457e34b68..845b4bce4821b 100644
--- a/packages/grafana-data/src/types/displayValue.ts
+++ b/packages/grafana-data/src/types/displayValue.ts
@@ -11,6 +11,10 @@ export interface DisplayValue extends FormattedValue {
    *  0-1 between min & max
    */
   percent?: number;
+  /**
+   *  0-1 percent change across range
+   */
+  percentChange?: number;
   /**
    *  Color based on mappings or threshold
    */
diff --git a/packages/grafana-data/src/types/explore.ts b/packages/grafana-data/src/types/explore.ts
index 0bd99acbfbd56..90f21ae568b57 100644
--- a/packages/grafana-data/src/types/explore.ts
+++ b/packages/grafana-data/src/types/explore.ts
@@ -33,10 +33,13 @@ export interface ExplorePanelsState extends Partial<Record<PreferredVisualisatio
 
 /**
  * Keep a list of vars the correlations editor / helper in explore will use
+ *
+ * vars can be modified by transformation variables, origVars is so we can rebuild the original list
  */
 /** @internal */
 export interface ExploreCorrelationHelperData {
   resultField: string;
+  origVars: Record<string, string>;
   vars: Record<string, string>;
 }
 
@@ -48,13 +51,14 @@ export interface ExploreLogsPanelState {
   id?: string;
   columns?: Record<number, string>;
   visualisationType?: 'table' | 'logs';
+  labelFieldName?: string;
+  // Used for logs table visualisation, contains the refId of the dataFrame that is currently visualized
+  refId?: string;
 }
 
 export interface SplitOpenOptions<T extends AnyQuery = AnyQuery> {
   datasourceUid: string;
-  /** @deprecated Will be removed in a future version. Use queries instead. */
-  query?: T;
-  queries?: T[];
+  queries: T[];
   range?: TimeRange;
   panelsState?: ExplorePanelsState;
   correlationHelperData?: ExploreCorrelationHelperData;
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 8d905e8bfc1da..1d27dc64036be 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -18,45 +18,42 @@
  * @public
  */
 export interface FeatureToggles {
-  trimDefaults?: boolean;
   disableEnvelopeEncryption?: boolean;
   ['live-service-web-worker']?: boolean;
   queryOverLive?: boolean;
   panelTitleSearch?: boolean;
   publicDashboards?: boolean;
   publicDashboardsEmailSharing?: boolean;
+  publicDashboardsScene?: boolean;
   lokiExperimentalStreaming?: boolean;
   featureHighlights?: boolean;
-  migrationLocking?: boolean;
   storage?: boolean;
   correlations?: boolean;
   exploreContentOutline?: boolean;
   datasourceQueryMultiStatus?: boolean;
-  traceToMetrics?: boolean;
-  newDBLibrary?: boolean;
   autoMigrateOldPanels?: boolean;
+  autoMigrateGraphPanel?: boolean;
+  autoMigrateTablePanel?: boolean;
+  autoMigratePiechartPanel?: boolean;
+  autoMigrateWorldmapPanel?: boolean;
+  autoMigrateStatPanel?: boolean;
+  autoMigrateXYChartPanel?: boolean;
   disableAngular?: boolean;
   canvasPanelNesting?: boolean;
+  newVizTooltips?: boolean;
   scenes?: boolean;
   disableSecretsCompatibility?: boolean;
   logRequestsInstrumentedAsUnknown?: boolean;
-  dataConnectionsConsole?: boolean;
   topnav?: boolean;
-  dockedMegaMenu?: boolean;
+  returnToPrevious?: boolean;
   grpcServer?: boolean;
-  entityStore?: boolean;
+  unifiedStorage?: boolean;
   cloudWatchCrossAccountQuerying?: boolean;
-  redshiftAsyncQueryDataSupport?: boolean;
-  athenaAsyncQueryDataSupport?: boolean;
-  cloudwatchNewRegionsHandler?: boolean;
   showDashboardValidationWarnings?: boolean;
   mysqlAnsiQuotes?: boolean;
   accessControlOnCall?: boolean;
   nestedFolders?: boolean;
   nestedFolderPicker?: boolean;
-  accessTokenExpirationCheck?: boolean;
-  emptyDashboardPage?: boolean;
-  disablePrometheusExemplarSampling?: boolean;
   alertingBacktesting?: boolean;
   editPanelCSVDragAndDrop?: boolean;
   alertingNoNormalState?: boolean;
@@ -64,29 +61,24 @@ export interface FeatureToggles {
   lokiQuerySplitting?: boolean;
   lokiQuerySplittingConfig?: boolean;
   individualCookiePreferences?: boolean;
-  gcomOnlyExternalOrgRoleSync?: boolean;
   prometheusMetricEncyclopedia?: boolean;
   influxdbBackendMigration?: boolean;
-  clientTokenRotation?: boolean;
+  influxqlStreamingParser?: boolean;
+  influxdbRunQueriesInParallel?: boolean;
   prometheusDataplane?: boolean;
   lokiMetricDataplane?: boolean;
   lokiLogsDataplane?: boolean;
   dataplaneFrontendFallback?: boolean;
   disableSSEDataplane?: boolean;
   alertStateHistoryLokiSecondary?: boolean;
-  alertingNotificationsPoliciesMatchingInstances?: boolean;
   alertStateHistoryLokiPrimary?: boolean;
   alertStateHistoryLokiOnly?: boolean;
   unifiedRequestLog?: boolean;
   renderAuthJWT?: boolean;
-  externalServiceAuth?: boolean;
   refactorVariablesTimeRange?: boolean;
-  useCachingService?: boolean;
   enableElasticsearchBackendQuerying?: boolean;
-  advancedDataSourcePicker?: boolean;
   faroDatasourceSelector?: boolean;
   enableDatagridEditing?: boolean;
-  dataSourcePageHeader?: boolean;
   extraThemes?: boolean;
   lokiPredefinedOperations?: boolean;
   pluginsFrontendSandbox?: boolean;
@@ -94,8 +86,6 @@ export interface FeatureToggles {
   frontendSandboxMonitorOnly?: boolean;
   sqlDatasourceDatabaseSelection?: boolean;
   lokiFormatQuery?: boolean;
-  cloudWatchLogsMonacoEditor?: boolean;
-  exploreScrollableLogsContainer?: boolean;
   recordedQueriesMulti?: boolean;
   pluginsDynamicAngularDetectionPatterns?: boolean;
   vizAndWidgetSplit?: boolean;
@@ -103,16 +93,13 @@ export interface FeatureToggles {
   logsExploreTableVisualisation?: boolean;
   awsDatasourcesTempCredentials?: boolean;
   transformationsRedesign?: boolean;
-  toggleLabelsInLogsUI?: boolean;
   mlExpressions?: boolean;
   traceQLStreaming?: boolean;
   metricsSummary?: boolean;
-  grafanaAPIServer?: boolean;
   grafanaAPIServerWithExperimentalAPIs?: boolean;
+  grafanaAPIServerEnsureKubectlAccess?: boolean;
   featureToggleAdminPage?: boolean;
   awsAsyncQueryCaching?: boolean;
-  splitScopes?: boolean;
-  azureMonitorDataplane?: boolean;
   permissionsFilterRemoveSubquery?: boolean;
   prometheusConfigOverhaulAuth?: boolean;
   configurableSchedulerTick?: boolean;
@@ -120,35 +107,74 @@ export interface FeatureToggles {
   alertingNoDataErrorExecution?: boolean;
   angularDeprecationUI?: boolean;
   dashgpt?: boolean;
+  aiGeneratedDashboardChanges?: boolean;
   reportingRetries?: boolean;
-  newBrowseDashboards?: boolean;
   sseGroupByDatasource?: boolean;
-  requestInstrumentationStatusSource?: boolean;
   libraryPanelRBAC?: boolean;
   lokiRunQueriesInParallel?: boolean;
   wargamesTesting?: boolean;
   alertingInsights?: boolean;
-  alertingContactPointsV2?: boolean;
   externalCorePlugins?: boolean;
   pluginsAPIMetrics?: boolean;
-  httpSLOLevels?: boolean;
   idForwarding?: boolean;
-  cloudWatchWildCardDimensionValues?: boolean;
   externalServiceAccounts?: boolean;
   panelMonitoring?: boolean;
   enableNativeHTTPHistogram?: boolean;
   formatString?: boolean;
   transformationsVariableSupport?: boolean;
   kubernetesPlaylists?: boolean;
+  kubernetesSnapshots?: boolean;
+  kubernetesQueryServiceRewrite?: boolean;
   cloudWatchBatchQueries?: boolean;
-  navAdminSubsections?: boolean;
   recoveryThreshold?: boolean;
+  lokiStructuredMetadata?: boolean;
   teamHttpHeaders?: boolean;
   awsDatasourcesNewFormStyling?: boolean;
   cachingOptimizeSerializationMemoryUsage?: boolean;
   panelTitleSearchInV1?: boolean;
-  pluginsInstrumentationStatusSource?: boolean;
-  costManagementUi?: boolean;
   managedPluginsInstall?: boolean;
   prometheusPromQAIL?: boolean;
+  addFieldFromCalculationStatFunctions?: boolean;
+  alertmanagerRemoteSecondary?: boolean;
+  alertmanagerRemotePrimary?: boolean;
+  alertmanagerRemoteOnly?: boolean;
+  annotationPermissionUpdate?: boolean;
+  extractFieldsNameDeduplication?: boolean;
+  dashboardSceneForViewers?: boolean;
+  dashboardSceneSolo?: boolean;
+  dashboardScene?: boolean;
+  panelFilterVariable?: boolean;
+  pdfTables?: boolean;
+  ssoSettingsApi?: boolean;
+  canvasPanelPanZoom?: boolean;
+  logsInfiniteScrolling?: boolean;
+  flameGraphItemCollapsing?: boolean;
+  exploreMetrics?: boolean;
+  alertingSimplifiedRouting?: boolean;
+  logRowsPopoverMenu?: boolean;
+  pluginsSkipHostEnvVars?: boolean;
+  tableSharedCrosshair?: boolean;
+  regressionTransformation?: boolean;
+  lokiQueryHints?: boolean;
+  kubernetesFeatureToggles?: boolean;
+  enablePluginsTracingByDefault?: boolean;
+  cloudRBACRoles?: boolean;
+  alertingQueryOptimization?: boolean;
+  newFolderPicker?: boolean;
+  jitterAlertRulesWithinGroups?: boolean;
+  onPremToCloudMigrations?: boolean;
+  alertingSaveStatePeriodic?: boolean;
+  promQLScope?: boolean;
+  sqlExpressions?: boolean;
+  nodeGraphDotLayout?: boolean;
+  groupToNestedTableTransformation?: boolean;
+  newPDFRendering?: boolean;
+  kubernetesAggregator?: boolean;
+  expressionParser?: boolean;
+  groupByVariable?: boolean;
+  betterPageScrolling?: boolean;
+  scopeFilters?: boolean;
+  ssoSettingsSAML?: boolean;
+  usePrometheusFrontendPackage?: boolean;
+  oauthRequireSubClaim?: boolean;
 }
diff --git a/packages/grafana-data/src/types/fieldOverrides.ts b/packages/grafana-data/src/types/fieldOverrides.ts
index 8a3a9bf15d09e..1ca74a3be0628 100644
--- a/packages/grafana-data/src/types/fieldOverrides.ts
+++ b/packages/grafana-data/src/types/fieldOverrides.ts
@@ -46,8 +46,7 @@ export interface SystemConfigOverrideRule extends ConfigOverrideRule {
  */
 export function isSystemOverrideWithRef<T extends SystemConfigOverrideRule>(ref: string) {
   return (override: ConfigOverrideRule): override is T => {
-    const overrideAs = override as T;
-    return overrideAs.__systemRef === ref;
+    return '__systemRef' in override && override.__systemRef === ref;
   };
 }
 
@@ -58,7 +57,7 @@ export function isSystemOverrideWithRef<T extends SystemConfigOverrideRule>(ref:
  * @internal
  */
 export const isSystemOverride = (override: ConfigOverrideRule): override is SystemConfigOverrideRule => {
-  return typeof (override as SystemConfigOverrideRule)?.__systemRef === 'string';
+  return '__systemRef' in override && typeof override.__systemRef === 'string';
 };
 
 export interface FieldConfigSource<TOptions = any> {
@@ -69,22 +68,16 @@ export interface FieldConfigSource<TOptions = any> {
   overrides: ConfigOverrideRule[];
 }
 
-export interface FieldOverrideContext extends StandardEditorContext<any, any> {
+export interface FieldOverrideContext extends StandardEditorContext<any> {
   field?: Field;
   dataFrameIndex?: number; // The index for the selected field frame
 }
-export interface FieldConfigEditorProps<TValue, TSettings extends {}>
-  extends Omit<StandardEditorProps<TValue, TSettings>, 'item'> {
-  item: FieldConfigPropertyItem<any, TValue, TSettings>; // The property info
-  value: TValue;
-  context: FieldOverrideContext;
-  onChange: (value?: TValue) => void;
-}
 
-export interface FieldOverrideEditorProps<TValue, TSettings> extends Omit<StandardEditorProps<TValue>, 'item'> {
-  item: FieldConfigPropertyItem<TValue, TSettings>;
-  context: FieldOverrideContext;
-}
+/** @deprecated Use StandardEditorProps instead */
+export type FieldConfigEditorProps<TValue, TSettings extends {}> = StandardEditorProps<TValue, TSettings>;
+
+/** @deprecated Use StandardEditorProps instead */
+export type FieldOverrideEditorProps<TValue, TSettings extends {}> = StandardEditorProps<TValue, TSettings>;
 
 export interface FieldConfigEditorConfig<TOptions, TSettings = any, TValue = any>
   extends OptionEditorConfig<TOptions, TSettings, TValue> {
@@ -102,9 +95,9 @@ export interface FieldConfigEditorConfig<TOptions, TSettings = any, TValue = any
 }
 
 export interface FieldConfigPropertyItem<TOptions = any, TValue = any, TSettings extends {} = any>
-  extends OptionsEditorItem<TOptions, TSettings, FieldConfigEditorProps<TValue, TSettings>, TValue> {
+  extends OptionsEditorItem<TOptions, TSettings, StandardEditorProps<TValue, TSettings>, TValue> {
   // An editor that can be filled in with context info (template variables etc)
-  override: ComponentType<FieldOverrideEditorProps<TValue, TSettings>>;
+  override: ComponentType<StandardEditorProps<TValue, TSettings>>;
 
   /** true for plugin field config properties */
   isCustom?: boolean;
diff --git a/packages/grafana-data/src/types/icon.ts b/packages/grafana-data/src/types/icon.ts
index b75521182dba6..4b6761b33b4b6 100644
--- a/packages/grafana-data/src/types/icon.ts
+++ b/packages/grafana-data/src/types/icon.ts
@@ -21,7 +21,9 @@ export const availableIconsIndex = {
   'angle-up': true,
   'align-left': true,
   'align-right': true,
+  'application-observability': true,
   apps: true,
+  'archive-alt': true,
   arrow: true,
   'arrow-down': true,
   'arrow-from-right': true,
@@ -32,6 +34,7 @@ export const availableIconsIndex = {
   'arrow-up': true,
   'arrows-h': true,
   'arrows-v': true,
+  asserts: true,
   'expand-arrows': true,
   at: true,
   ai: true,
@@ -80,11 +83,14 @@ export const availableIconsIndex = {
   dashboard: true,
   database: true,
   'dice-three': true,
+  docker: true,
   'document-info': true,
+  'document-layout-left': true,
   'download-alt': true,
   draggabledots: true,
   edit: true,
   'ellipsis-v': true,
+  enter: true,
   envelope: true,
   'exchange-alt': true,
   'exclamation-triangle': true,
@@ -100,6 +106,7 @@ export const availableIconsIndex = {
   'file-blank': true,
   'file-copy-alt': true,
   'file-download': true,
+  'file-edit-alt': true,
   'file-landscape-alt': true,
   filter: true,
   flip: true,
@@ -110,6 +117,7 @@ export const availableIconsIndex = {
   'folder-plus': true,
   'folder-upload': true,
   forward: true,
+  'frontend-observability': true,
   'gf-bar-alignment-after': true,
   'gf-bar-alignment-before': true,
   'gf-bar-alignment-center': true,
@@ -131,6 +139,7 @@ export const availableIconsIndex = {
   'gf-pin': true,
   'gf-prometheus': true,
   'gf-traces': true,
+  globe: true,
   grafana: true,
   'graph-bar': true,
   heart: true,
@@ -169,6 +178,7 @@ export const availableIconsIndex = {
   monitor: true,
   palette: true,
   'panel-add': true,
+  paragraph: true,
   'pathfinder-unite': true,
   pause: true,
   pen: true,
@@ -210,6 +220,8 @@ export const availableIconsIndex = {
   sync: true,
   'sync-slash': true,
   table: true,
+  'table-collapse-all': true,
+  'table-expand-all': true,
   'tag-alt': true,
   'telegram-alt': true,
   'text-fields': true,
@@ -219,6 +231,7 @@ export const availableIconsIndex = {
   'toggle-on': true,
   'toggle-off': true,
   'trash-alt': true,
+  unarchive: true,
   unlock: true,
   upload: true,
   user: true,
diff --git a/packages/grafana-data/src/types/index.ts b/packages/grafana-data/src/types/index.ts
index 96f3c8f7d3941..e467d5d8ee4c9 100644
--- a/packages/grafana-data/src/types/index.ts
+++ b/packages/grafana-data/src/types/index.ts
@@ -63,5 +63,7 @@ export {
   type PluginExtensionEventHelpers,
   type PluginExtensionPanelContext,
   type PluginExtensionDataSourceConfigContext,
+  type PluginExtensionCommandPaletteContext,
   type PluginExtensionOpenModalOptions,
 } from './pluginExtensions';
+export * from './scopes';
diff --git a/packages/grafana-data/src/types/logs.ts b/packages/grafana-data/src/types/logs.ts
index 947fcc59f440a..d9edfca6bc2e8 100644
--- a/packages/grafana-data/src/types/logs.ts
+++ b/packages/grafana-data/src/types/logs.ts
@@ -4,7 +4,7 @@ import { DataQuery } from '@grafana/schema';
 
 import { KeyValue, Labels } from './data';
 import { DataFrame } from './dataFrame';
-import { DataQueryRequest, DataQueryResponse } from './datasource';
+import { DataQueryRequest, DataQueryResponse, DataSourceApi, QueryFixAction, QueryFixType } from './datasource';
 import { AbsoluteTimeRange } from './time';
 export { LogsDedupStrategy, LogsSortOrder } from '@grafana/schema';
 
@@ -135,14 +135,20 @@ export interface DataSourceWithLogsContextSupport<TQuery extends DataQuery = Dat
   getLogRowContext: (row: LogRowModel, options?: LogRowContextOptions, query?: TQuery) => Promise<DataQueryResponse>;
 
   /**
-   * Retrieve the context query object for a given log row. This is currently used to open LogContext queries in a split view.
+   * Retrieve the context query object for a given log row. This is currently used to open LogContext queries in a split view and in a new browser tab.
+   * The `cacheFilters` parameter can be used to force a refetch of the cached applied filters. Default value `true`.
    */
-  getLogRowContextQuery?: (row: LogRowModel, options?: LogRowContextOptions, query?: TQuery) => Promise<TQuery | null>;
+  getLogRowContextQuery?: (
+    row: LogRowModel,
+    options?: LogRowContextOptions,
+    query?: TQuery,
+    cacheFilters?: boolean
+  ) => Promise<TQuery | null>;
 
   /**
-   * This method can be used to show "context" button based on runtime conditions (for example row model data or plugin settings, etc.)
+   * @deprecated Deprecated since 10.3. To display the context option and support the feature implement DataSourceWithLogsContextSupport interface instead.
    */
-  showContextToggle(row?: LogRowModel): boolean;
+  showContextToggle?(row?: LogRowModel): boolean;
 
   /**
    * This method can be used to display a custom UI in the context view.
@@ -153,11 +159,11 @@ export interface DataSourceWithLogsContextSupport<TQuery extends DataQuery = Dat
 }
 
 export const hasLogsContextSupport = (datasource: unknown): datasource is DataSourceWithLogsContextSupport => {
-  if (!datasource) {
+  if (!datasource || typeof datasource !== 'object') {
     return false;
   }
 
-  return 'getLogRowContext' in datasource && 'showContextToggle' in datasource;
+  return 'getLogRowContext' in datasource;
 };
 
 /**
@@ -179,6 +185,7 @@ export type SupplementaryQueryOptions = LogsVolumeOption | LogsSampleOptions;
  */
 export type LogsVolumeOption = {
   type: SupplementaryQueryType.LogsVolume;
+  field?: string;
 };
 
 /**
@@ -219,41 +226,50 @@ export interface DataSourceWithSupplementaryQueriesSupport<TQuery extends DataQu
   /**
    * Returns an observable that will be used to fetch supplementary data based on the provided
    * supplementary query type and original request.
+   * @deprecated Use getSupplementaryQueryRequest() instead
    */
-  getDataProvider(
+  getDataProvider?(
     type: SupplementaryQueryType,
     request: DataQueryRequest<TQuery>
   ): Observable<DataQueryResponse> | undefined;
+  /**
+   * Receives a SupplementaryQueryType and a DataQueryRequest and returns a new DataQueryRequest to fetch supplementary data.
+   * If provided type or request is not suitable for a supplementary data request, returns undefined.
+   */
+  getSupplementaryRequest?(
+    type: SupplementaryQueryType,
+    request: DataQueryRequest<TQuery>,
+    options?: SupplementaryQueryOptions
+  ): DataQueryRequest<TQuery> | undefined;
   /**
    * Returns supplementary query types that data source supports.
    */
   getSupportedSupplementaryQueryTypes(): SupplementaryQueryType[];
   /**
    * Returns a supplementary query to be used to fetch supplementary data based on the provided type and original query.
-   * If provided query is not suitable for provided supplementary query type, undefined should be returned.
+   * If the provided query is not suitable for the provided supplementary query type, undefined should be returned.
    */
   getSupplementaryQuery(options: SupplementaryQueryOptions, originalQuery: TQuery): TQuery | undefined;
 }
 
 export const hasSupplementaryQuerySupport = <TQuery extends DataQuery>(
-  datasource: unknown,
+  datasource: DataSourceApi | (DataSourceApi & DataSourceWithSupplementaryQueriesSupport<TQuery>),
   type: SupplementaryQueryType
-): datasource is DataSourceWithSupplementaryQueriesSupport<TQuery> => {
+): datasource is DataSourceApi & DataSourceWithSupplementaryQueriesSupport<TQuery> => {
   if (!datasource) {
     return false;
   }
 
-  const withSupplementaryQueriesSupport = datasource as DataSourceWithSupplementaryQueriesSupport<TQuery>;
-
   return (
-    withSupplementaryQueriesSupport.getDataProvider !== undefined &&
-    withSupplementaryQueriesSupport.getSupplementaryQuery !== undefined &&
-    withSupplementaryQueriesSupport.getSupportedSupplementaryQueryTypes().includes(type)
+    ('getDataProvider' in datasource || 'getSupplementaryRequest' in datasource) &&
+    'getSupplementaryQuery' in datasource &&
+    'getSupportedSupplementaryQueryTypes' in datasource &&
+    datasource.getSupportedSupplementaryQueryTypes().includes(type)
   );
 };
 
 export const hasLogsContextUiSupport = (datasource: unknown): datasource is DataSourceWithLogsContextSupport => {
-  if (!datasource) {
+  if (!datasource || typeof datasource !== 'object') {
     return false;
   }
 
@@ -264,6 +280,7 @@ export interface QueryFilterOptions extends KeyValue<string> {}
 export interface ToggleFilterAction {
   type: 'FILTER_FOR' | 'FILTER_OUT';
   options: QueryFilterOptions;
+  frame?: DataFrame;
 }
 /**
  * Data sources that support toggleable filters through `toggleQueryFilter`, and displaying the active
@@ -292,9 +309,46 @@ export const hasToggleableQueryFiltersSupport = <TQuery extends DataQuery>(
   datasource: unknown
 ): datasource is DataSourceWithToggleableQueryFiltersSupport<TQuery> => {
   return (
-    datasource !== null &&
+    datasource != null &&
     typeof datasource === 'object' &&
     'toggleQueryFilter' in datasource &&
     'queryHasFilter' in datasource
   );
 };
+
+/**
+ * Data sources that support query modification actions from Log Details (ADD_FILTER, ADD_FILTER_OUT),
+ * and Popover Menu (ADD_STRING_FILTER, ADD_STRING_FILTER_OUT) in Explore.
+ * @internal
+ * @alpha
+ */
+export interface DataSourceWithQueryModificationSupport<TQuery extends DataQuery> {
+  /**
+   * Given a query, applies a query modification `action`, returning the updated query.
+   * Explore currently supports the following action types:
+   * - ADD_FILTER: adds a <key, value> filter to the query.
+   * - ADD_FILTER_OUT: adds a negative <key, value> filter to the query.
+   * - ADD_STRING_FILTER: adds a string filter to the query.
+   * - ADD_STRING_FILTER_OUT: adds a negative string filter to the query.
+   */
+  modifyQuery(query: TQuery, action: QueryFixAction): TQuery;
+
+  /**
+   * Returns a list of supported action types for `modifyQuery()`.
+   */
+  getSupportedQueryModifications(): Array<QueryFixType | string>;
+}
+
+/**
+ * @internal
+ */
+export const hasQueryModificationSupport = <TQuery extends DataQuery>(
+  datasource: unknown
+): datasource is DataSourceWithQueryModificationSupport<TQuery> => {
+  return (
+    datasource != null &&
+    typeof datasource === 'object' &&
+    'modifyQuery' in datasource &&
+    'getSupportedQueryModifications' in datasource
+  );
+};
diff --git a/packages/grafana-data/src/types/navModel.ts b/packages/grafana-data/src/types/navModel.ts
index c20ea94656ce4..066d879df3d19 100644
--- a/packages/grafana-data/src/types/navModel.ts
+++ b/packages/grafana-data/src/types/navModel.ts
@@ -26,6 +26,8 @@ export interface NavLinkDTO {
   pluginId?: string;
   // Whether the page is used to create a new resource. We may place these in a different position in the UI.
   isCreateAction?: boolean;
+  // Optional keywords to match on when searching (e.g. in the CommandPalette)
+  keywords?: string[];
 }
 
 export interface NavModelItem extends NavLinkDTO {
@@ -34,6 +36,7 @@ export interface NavModelItem extends NavLinkDTO {
   parentItem?: NavModelItem;
   onClick?: () => void;
   tabSuffix?: ComponentType<{ className?: string }>;
+  tabCounter?: number;
   hideFromBreadcrumbs?: boolean;
   emptyMessage?: string;
 }
diff --git a/packages/grafana-data/src/types/panel.ts b/packages/grafana-data/src/types/panel.ts
index 0dd43826f6a64..00baaae768642 100644
--- a/packages/grafana-data/src/types/panel.ts
+++ b/packages/grafana-data/src/types/panel.ts
@@ -72,10 +72,10 @@ export interface PanelData {
 }
 
 export interface PanelProps<T = any> {
-  /** ID of the panel within the current dashboard */
+  /** Unique ID of the panel within the current dashboard */
   id: number;
 
-  /** Result set of panel queries */
+  /** Data available as result of running panel queries, includes dataframes and loading state **/
   data: PanelData;
 
   /** Time range of the current dashboard */
@@ -84,19 +84,19 @@ export interface PanelProps<T = any> {
   /** Time zone of the current dashboard */
   timeZone: TimeZone;
 
-  /** Panel options */
+  /** Panel options set by the user in the panel editor. Includes both default and custom panel options */
   options: T;
 
   /** Indicates whether or not panel should be rendered transparent */
   transparent: boolean;
 
-  /** Current width of the panel */
+  /** Current width of the panel in pixels */
   width: number;
 
-  /** Current height of the panel */
+  /** Current height of the panel in pixels */
   height: number;
 
-  /** Field options configuration */
+  /** Field options configuration. Controls how field values are displayed (e.g., units, min, max, decimals, thresholds) */
   fieldConfig: FieldConfigSource;
 
   /** @internal */
@@ -105,16 +105,16 @@ export interface PanelProps<T = any> {
   /** Panel title */
   title: string;
 
-  /** EventBus  */
+  /** Grafana EventBus  */
   eventBus: EventBus;
 
-  /** Panel options change handler */
+  /** Handler for options change. Invoke it to update the panel custom options. */
   onOptionsChange: (options: T) => void;
 
-  /** Field config change handler */
+  /** Field config change handler. Invoke it to update the panel field config. */
   onFieldConfigChange: (config: FieldConfigSource) => void;
 
-  /** Template variables interpolation function */
+  /** Template variables interpolation function. Given a string containing template variables, it returns the string with interpolated values. */
   replaceVariables: InterpolateFunction;
 
   /** Time range change handler */
diff --git a/packages/grafana-data/src/types/plugin.ts b/packages/grafana-data/src/types/plugin.ts
index a0869666a4583..5c934d3b299e6 100644
--- a/packages/grafana-data/src/types/plugin.ts
+++ b/packages/grafana-data/src/types/plugin.ts
@@ -52,6 +52,11 @@ export interface PluginError {
   pluginType?: PluginType;
 }
 
+export interface AngularMeta {
+  detected: boolean;
+  hideDeprecation: boolean;
+}
+
 export interface PluginMeta<T extends KeyValue = {}> {
   id: string;
   name: string;
@@ -82,7 +87,7 @@ export interface PluginMeta<T extends KeyValue = {}> {
   signatureType?: PluginSignatureType;
   signatureOrg?: string;
   live?: boolean;
-  angularDetected?: boolean;
+  angular?: AngularMeta;
 }
 
 interface PluginDependencyInfo {
@@ -116,6 +121,10 @@ export interface PluginInclude {
   // "Admin", "Editor" or "Viewer". If set then the include will only show up in the navigation if the user has the required roles.
   role?: string;
 
+  // if action is set then the include will only show up in the navigation if the user has the required permission.
+  // The action will take precedence over the role.
+  action?: string;
+
   // Adds the "page" or "dashboard" type includes to the navigation if set to `true`.
   addToNav?: boolean;
 
@@ -198,7 +207,7 @@ export class GrafanaPlugin<T extends PluginMeta = PluginMeta> {
   /**
    * @deprecated -- this is no longer necessary and will be removed
    */
-  setChannelSupport(support: any) {
+  setChannelSupport() {
     console.warn('[deprecation] plugin is using ignored option: setChannelSupport', this.meta);
     return this;
   }
diff --git a/packages/grafana-data/src/types/pluginExtensions.ts b/packages/grafana-data/src/types/pluginExtensions.ts
index f541c56f571cd..e7a26223c34d7 100644
--- a/packages/grafana-data/src/types/pluginExtensions.ts
+++ b/packages/grafana-data/src/types/pluginExtensions.ts
@@ -32,9 +32,9 @@ export type PluginExtensionLink = PluginExtensionBase & {
   category?: string;
 };
 
-export type PluginExtensionComponent = PluginExtensionBase & {
+export type PluginExtensionComponent<Props = {}> = PluginExtensionBase & {
   type: PluginExtensionTypes.component;
-  component: React.ComponentType;
+  component: React.ComponentType<Props>;
 };
 
 export type PluginExtension = PluginExtensionLink | PluginExtensionComponent;
@@ -77,16 +77,14 @@ export type PluginExtensionLinkConfig<Context extends object = object> = {
   category?: string;
 };
 
-export type PluginExtensionComponentConfig<Context extends object = object> = {
+export type PluginExtensionComponentConfig<Props = {}> = {
   type: PluginExtensionTypes.component;
   title: string;
   description: string;
 
   // The React component that will be rendered as the extension
-  // (This component receives the context as a prop when it is rendered. You can just return `null` from the component to hide for certain contexts)
-  component: React.ComponentType<{
-    context?: Context;
-  }>;
+  // (This component receives contextual information as props when it is rendered. You can just return `null` from the component to hide it.)
+  component: React.ComponentType<Props>;
 
   // The unique identifier of the Extension Point
   // (Core Grafana extension point ids are available in the `PluginExtensionPoints` enum)
@@ -117,9 +115,12 @@ export type PluginExtensionEventHelpers<Context extends object = object> = {
 
 // Extension Points available in core Grafana
 export enum PluginExtensionPoints {
+  AlertInstanceAction = 'grafana/alerting/instance/action',
+  CommandPalette = 'grafana/commandpalette/action',
   DashboardPanelMenu = 'grafana/dashboard/panel/menu',
   DataSourceConfig = 'grafana/datasources/config',
   ExploreToolbarAction = 'grafana/explore/toolbar/action',
+  UserProfileTab = 'grafana/user/profile/tab',
 }
 
 export type PluginExtensionPanelContext = {
@@ -152,6 +153,8 @@ export type PluginExtensionDataSourceConfigContext<JsonData extends DataSourceJs
   setJsonData: (jsonData: JsonData) => void;
 };
 
+export type PluginExtensionCommandPaletteContext = {};
+
 type Dashboard = {
   uid: string;
   title: string;
diff --git a/packages/grafana-data/src/types/query.ts b/packages/grafana-data/src/types/query.ts
index f335755a8cda1..870a0b95094ba 100644
--- a/packages/grafana-data/src/types/query.ts
+++ b/packages/grafana-data/src/types/query.ts
@@ -1,4 +1,8 @@
-import { DataQuery as SchemaDataQuery, DataSourceRef as SchemaDataSourceRef } from '@grafana/schema';
+import {
+  DataQuery as SchemaDataQuery,
+  DataSourceRef as SchemaDataSourceRef,
+  DataTopic as SchemaDataTopic,
+} from '@grafana/schema';
 
 /**
  * @deprecated use the type from @grafana/schema
@@ -13,11 +17,9 @@ export interface DataSourceRef extends SchemaDataSourceRef {}
 /**
  * Attached to query results (not persisted)
  *
- * @public
+ * @deprecated use the type from @grafana/schema
  */
-export enum DataTopic {
-  Annotations = 'annotations',
-}
+export { SchemaDataTopic as DataTopic };
 
 /**
  * Abstract representation of any label-based query
@@ -66,9 +68,10 @@ export interface DataSourceWithQueryExportSupport<TQuery extends SchemaDataQuery
 export const hasQueryImportSupport = <TQuery extends SchemaDataQuery>(
   datasource: unknown
 ): datasource is DataSourceWithQueryImportSupport<TQuery> => {
-  if (!datasource) {
+  if (!datasource || typeof datasource !== 'object') {
     return false;
   }
+
   return 'importFromAbstractQueries' in datasource;
 };
 
@@ -78,7 +81,7 @@ export const hasQueryImportSupport = <TQuery extends SchemaDataQuery>(
 export const hasQueryExportSupport = <TQuery extends SchemaDataQuery>(
   datasource: unknown
 ): datasource is DataSourceWithQueryExportSupport<TQuery> => {
-  if (!datasource) {
+  if (!datasource || typeof datasource !== 'object') {
     return false;
   }
   return 'exportToAbstractQueries' in datasource;
diff --git a/packages/grafana-data/src/types/scopes.ts b/packages/grafana-data/src/types/scopes.ts
new file mode 100644
index 0000000000000..09dd972f98c6e
--- /dev/null
+++ b/packages/grafana-data/src/types/scopes.ts
@@ -0,0 +1,20 @@
+export interface ScopeDashboard {
+  uid: string;
+  title: string;
+  url: string;
+}
+
+export interface ScopeFilter {
+  key: string;
+  value: string;
+  operator: string;
+}
+
+export interface Scope {
+  uid: string;
+  title: string;
+  type: string;
+  description: string;
+  category: string;
+  filters: ScopeFilter[];
+}
diff --git a/packages/grafana-data/src/types/templateVars.ts b/packages/grafana-data/src/types/templateVars.ts
index d16daed9ea419..1b01e5b9e537d 100644
--- a/packages/grafana-data/src/types/templateVars.ts
+++ b/packages/grafana-data/src/types/templateVars.ts
@@ -1,4 +1,5 @@
 import { LoadingState } from './data';
+import { MetricFindValue } from './datasource';
 import { DataSourceRef } from './query';
 
 export type VariableType = TypedVariableModel['type'];
@@ -13,6 +14,7 @@ export interface VariableModel {
 export type TypedVariableModel =
   | QueryVariableModel
   | AdHocVariableModel
+  | GroupByVariableModel
   | ConstantVariableModel
   | DataSourceVariableModel
   | IntervalVariableModel
@@ -36,6 +38,8 @@ export enum VariableSort {
   numericalDesc,
   alphabeticalCaseInsensitiveAsc,
   alphabeticalCaseInsensitiveDesc,
+  naturalAsc,
+  naturalDesc,
 }
 
 export enum VariableHide {
@@ -60,6 +64,16 @@ export interface AdHocVariableModel extends BaseVariableModel {
    * Filters that are always applied to the lookup of keys. Not shown in the AdhocFilterBuilder UI.
    */
   baseFilters?: AdHocVariableFilter[];
+  /**
+   * Static keys that override any dynamic keys from the datasource.
+   */
+  defaultKeys?: MetricFindValue[];
+}
+
+export interface GroupByVariableModel extends VariableWithOptions {
+  type: 'groupby';
+  datasource: DataSourceRef | null;
+  multi: true;
 }
 
 export interface VariableOption {
@@ -162,4 +176,5 @@ export interface BaseVariableModel {
   state: LoadingState;
   error: any | null;
   description: string | null;
+  usedInRepeat?: boolean;
 }
diff --git a/packages/grafana-data/src/types/variables.ts b/packages/grafana-data/src/types/variables.ts
index 8fbc7507db1cd..58f9fd5e23240 100644
--- a/packages/grafana-data/src/types/variables.ts
+++ b/packages/grafana-data/src/types/variables.ts
@@ -14,8 +14,6 @@ import { DataQuery } from './query';
 
 /**
  * Enum with the different variable support types
- *
- * @alpha -- experimental
  */
 export enum VariableSupportType {
   Legacy = 'legacy',
@@ -26,8 +24,6 @@ export enum VariableSupportType {
 
 /**
  * Base class for VariableSupport classes
- *
- * @alpha -- experimental
  */
 export abstract class VariableSupportBase<
   DSType extends DataSourceApi<TQuery, TOptions>,
@@ -44,8 +40,6 @@ export abstract class VariableSupportBase<
 
 /**
  * Extend this class in a data source plugin to use the standard query editor for Query variables
- *
- * @alpha -- experimental
  */
 export abstract class StandardVariableSupport<
   DSType extends DataSourceApi<TQuery, TOptions>,
@@ -62,8 +56,6 @@ export abstract class StandardVariableSupport<
 
 /**
  * Extend this class in a data source plugin to use a customized query editor for Query variables
- *
- * @alpha -- experimental
  */
 export abstract class CustomVariableSupport<
   DSType extends DataSourceApi<TQuery, TOptions>,
@@ -89,8 +81,6 @@ export abstract class CustomVariableSupport<
 
 /**
  * Extend this class in a data source plugin to use the query editor in the data source plugin for Query variables
- *
- * @alpha -- experimental
  */
 export abstract class DataSourceVariableSupport<
   DSType extends DataSourceApi<TQuery, TOptions>,
@@ -104,8 +94,6 @@ export abstract class DataSourceVariableSupport<
 
 /**
  * Defines the standard DatQuery used by data source plugins that implement StandardVariableSupport
- *
- * @alpha -- experimental
  */
 export interface StandardVariableQuery extends DataQuery {
   query: string;
diff --git a/packages/grafana-data/src/types/vector.ts b/packages/grafana-data/src/types/vector.ts
index be903d96abf56..06358553e9a2a 100644
--- a/packages/grafana-data/src/types/vector.ts
+++ b/packages/grafana-data/src/types/vector.ts
@@ -53,82 +53,3 @@ export function patchArrayVectorProrotypeMethods() {
 }
 //this function call is intentional
 patchArrayVectorProrotypeMethods();
-
-/** @deprecated use a simple Array<T> */
-export interface Vector<T = any> extends Array<T> {
-  length: number;
-
-  /**
-   * Access the value by index (Like an array)
-   *
-   * @deprecated use a simple Array<T>
-   */
-  get(index: number): T;
-
-  /**
-   * Set a value
-   *
-   * @deprecated use a simple Array<T>
-   */
-  set: (index: number, value: T) => void;
-
-  /**
-   * Adds the value to the vector
-   * Same as Array.push()
-   *
-   * @deprecated use a simple Array<T>
-   */
-  add: (value: T) => void;
-
-  /**
-   * Get the results as an array.
-   *
-   * @deprecated use a simple Array<T>
-   */
-  toArray(): T[];
-}
-
-/**
- * Apache arrow vectors are Read/Write
- *
- * @deprecated -- this is now part of the base Vector interface
- */
-export interface ReadWriteVector<T = any> extends Vector<T> {}
-
-/**
- * Vector with standard manipulation functions
- *
- * @deprecated -- this is now part of the base Vector interface
- */
-export interface MutableVector<T = any> extends ReadWriteVector<T> {}
-
-/**
- * This is an extremely inefficient Vector wrapper that allows vectors to
- * be treated as arrays.  We should avoid using this wrapper, but it is helpful
- * for a clean migration to arrays
- *
- * @deprecated
- */
-export function makeArrayIndexableVector<T extends Vector>(v: T): T {
-  return new Proxy<T>(v, {
-    get(target: Vector, property: string, receiver: Vector) {
-      if (typeof property !== 'symbol') {
-        const idx = +property;
-        if (String(idx) === property) {
-          return target.get(idx);
-        }
-      }
-      return Reflect.get(target, property, receiver);
-    },
-    set(target: Vector, property: string, value: unknown, receiver: Vector) {
-      if (typeof property !== 'symbol') {
-        const idx = +property;
-        if (String(idx) === property) {
-          target.set(idx, value);
-          return true;
-        }
-      }
-      return Reflect.set(target, property, value, receiver);
-    },
-  });
-}
diff --git a/packages/grafana-data/src/utils/OptionsUIBuilders.ts b/packages/grafana-data/src/utils/OptionsUIBuilders.ts
index e86b7683ad5c4..87c70303ac937 100644
--- a/packages/grafana-data/src/utils/OptionsUIBuilders.ts
+++ b/packages/grafana-data/src/utils/OptionsUIBuilders.ts
@@ -1,3 +1,5 @@
+import { set, cloneDeep } from 'lodash';
+
 import {
   numberOverrideProcessor,
   selectOverrideProcessor,
@@ -16,8 +18,9 @@ import {
   StandardEditorContext,
 } from '../field';
 import { PanelOptionsSupplier } from '../panel/PanelPlugin';
+import { isObject } from '../types';
 import { OptionsEditorItem, OptionsUIRegistryBuilder } from '../types/OptionsUIRegistryBuilder';
-import { FieldConfigEditorProps, FieldConfigPropertyItem, FieldConfigEditorConfig } from '../types/fieldOverrides';
+import { FieldConfigPropertyItem, FieldConfigEditorConfig } from '../types/fieldOverrides';
 import { PanelOptionsEditorConfig, PanelOptionsEditorItem } from '../types/panel';
 
 /**
@@ -25,15 +28,15 @@ import { PanelOptionsEditorConfig, PanelOptionsEditorItem } from '../types/panel
  */
 export class FieldConfigEditorBuilder<TOptions> extends OptionsUIRegistryBuilder<
   TOptions,
-  FieldConfigEditorProps<any, any>,
+  StandardEditorProps<any, any>,
   FieldConfigPropertyItem<TOptions>
 > {
   addNumberInput<TSettings>(config: FieldConfigEditorConfig<TOptions, TSettings & NumberFieldConfigSettings, number>) {
     return this.addCustomEditor({
       ...config,
       id: config.path,
-      override: standardEditorsRegistry.get('number').editor as any,
-      editor: standardEditorsRegistry.get('number').editor as any,
+      override: standardEditorsRegistry.get('number').editor,
+      editor: standardEditorsRegistry.get('number').editor,
       process: numberOverrideProcessor,
       shouldApply: config.shouldApply ?? (() => true),
       settings: config.settings || {},
@@ -44,8 +47,8 @@ export class FieldConfigEditorBuilder<TOptions> extends OptionsUIRegistryBuilder
     return this.addCustomEditor({
       ...config,
       id: config.path,
-      override: standardEditorsRegistry.get('slider').editor as any,
-      editor: standardEditorsRegistry.get('slider').editor as any,
+      override: standardEditorsRegistry.get('slider').editor,
+      editor: standardEditorsRegistry.get('slider').editor,
       process: numberOverrideProcessor,
       shouldApply: config.shouldApply ?? (() => true),
       settings: config.settings || {},
@@ -56,8 +59,8 @@ export class FieldConfigEditorBuilder<TOptions> extends OptionsUIRegistryBuilder
     return this.addCustomEditor({
       ...config,
       id: config.path,
-      override: standardEditorsRegistry.get('text').editor as any,
-      editor: standardEditorsRegistry.get('text').editor as any,
+      override: standardEditorsRegistry.get('text').editor,
+      editor: standardEditorsRegistry.get('text').editor,
       process: stringOverrideProcessor,
       shouldApply: config.shouldApply ?? (() => true),
       settings: config.settings || {},
@@ -70,8 +73,8 @@ export class FieldConfigEditorBuilder<TOptions> extends OptionsUIRegistryBuilder
     return this.addCustomEditor({
       ...config,
       id: config.path,
-      override: standardEditorsRegistry.get('select').editor as any,
-      editor: standardEditorsRegistry.get('select').editor as any,
+      override: standardEditorsRegistry.get('select').editor,
+      editor: standardEditorsRegistry.get('select').editor,
       process: selectOverrideProcessor,
       // ???
       shouldApply: config.shouldApply ? config.shouldApply : () => true,
@@ -83,8 +86,8 @@ export class FieldConfigEditorBuilder<TOptions> extends OptionsUIRegistryBuilder
     return this.addCustomEditor({
       ...config,
       id: config.path,
-      override: standardEditorsRegistry.get('radio').editor as any,
-      editor: standardEditorsRegistry.get('radio').editor as any,
+      override: standardEditorsRegistry.get('radio').editor,
+      editor: standardEditorsRegistry.get('radio').editor,
       process: selectOverrideProcessor,
       // ???
       shouldApply: config.shouldApply ? config.shouldApply : () => true,
@@ -96,8 +99,8 @@ export class FieldConfigEditorBuilder<TOptions> extends OptionsUIRegistryBuilder
     return this.addCustomEditor({
       ...config,
       id: config.path,
-      editor: standardEditorsRegistry.get('boolean').editor as any,
-      override: standardEditorsRegistry.get('boolean').editor as any,
+      editor: standardEditorsRegistry.get('boolean').editor,
+      override: standardEditorsRegistry.get('boolean').editor,
       process: booleanOverrideProcessor,
       shouldApply: config.shouldApply ? config.shouldApply : () => true,
       settings: config.settings || {},
@@ -108,8 +111,8 @@ export class FieldConfigEditorBuilder<TOptions> extends OptionsUIRegistryBuilder
     return this.addCustomEditor({
       ...config,
       id: config.path,
-      editor: standardEditorsRegistry.get('color').editor as any,
-      override: standardEditorsRegistry.get('color').editor as any,
+      editor: standardEditorsRegistry.get('color').editor,
+      override: standardEditorsRegistry.get('color').editor,
       process: identityOverrideProcessor,
       shouldApply: config.shouldApply ? config.shouldApply : () => true,
       settings: config.settings || {},
@@ -122,8 +125,8 @@ export class FieldConfigEditorBuilder<TOptions> extends OptionsUIRegistryBuilder
     return this.addCustomEditor({
       ...config,
       id: config.path,
-      editor: standardEditorsRegistry.get('unit').editor as any,
-      override: standardEditorsRegistry.get('unit').editor as any,
+      editor: standardEditorsRegistry.get('unit').editor,
+      override: standardEditorsRegistry.get('unit').editor,
       process: unitOverrideProcessor,
       shouldApply: config.shouldApply ? config.shouldApply : () => true,
       settings: config.settings || {},
@@ -136,8 +139,8 @@ export class FieldConfigEditorBuilder<TOptions> extends OptionsUIRegistryBuilder
     return this.addCustomEditor({
       ...config,
       id: config.path,
-      editor: standardEditorsRegistry.get('field-name').editor as any,
-      override: standardEditorsRegistry.get('field-name').editor as any,
+      editor: standardEditorsRegistry.get('field-name').editor,
+      override: standardEditorsRegistry.get('field-name').editor,
       process: identityOverrideProcessor,
       shouldApply: config.shouldApply ? config.shouldApply : () => true,
       settings: config.settings || {},
@@ -151,8 +154,8 @@ export class FieldConfigEditorBuilder<TOptions> extends OptionsUIRegistryBuilder
     return this.addCustomEditor({
       ...config,
       id: config.path,
-      editor: editor as any,
-      override: editor as any,
+      editor: editor,
+      override: editor,
       process: identityOverrideProcessor,
       shouldApply: config.shouldApply ? config.shouldApply : () => true,
       settings: config.settings || {},
@@ -184,7 +187,24 @@ export class NestedPanelOptionsBuilder<TSub = any> implements OptionsEditorItem<
   constructor(public cfg: NestedPanelOptions<TSub>) {
     this.path = cfg.path;
     this.category = cfg.category;
-    this.defaultValue = cfg.defaultValue;
+    this.defaultValue = this.getDefaultValue(cfg);
+  }
+
+  private getDefaultValue(cfg: NestedPanelOptions<TSub>): TSub {
+    let result = isObject(cfg.defaultValue) ? cloneDeep(cfg.defaultValue) : {};
+
+    const builder = new PanelOptionsEditorBuilder<TSub>();
+    cfg.build(builder, { data: [] });
+
+    for (const item of builder.getItems()) {
+      if (item.defaultValue != null) {
+        set(result, item.path, item.defaultValue);
+      }
+    }
+
+    // TSub is defined as type any and we need to cast it back
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    return result as TSub;
   }
 
   getBuilder = () => {
@@ -204,8 +224,8 @@ export class NestedPanelOptionsBuilder<TSub = any> implements OptionsEditorItem<
   };
 }
 
-export function isNestedPanelOptions(item: any): item is NestedPanelOptionsBuilder {
-  return item.id === 'nested-panel-options';
+export function isNestedPanelOptions(item: unknown): item is NestedPanelOptionsBuilder {
+  return isObject(item) && 'id' in item && item.id === 'nested-panel-options';
 }
 
 /**
@@ -225,7 +245,7 @@ export class PanelOptionsEditorBuilder<TOptions> extends OptionsUIRegistryBuilde
     return this.addCustomEditor({
       ...config,
       id: config.path,
-      editor: standardEditorsRegistry.get('number').editor as any,
+      editor: standardEditorsRegistry.get('number').editor,
     });
   }
 
@@ -233,7 +253,7 @@ export class PanelOptionsEditorBuilder<TOptions> extends OptionsUIRegistryBuilde
     return this.addCustomEditor({
       ...config,
       id: config.path,
-      editor: standardEditorsRegistry.get('slider').editor as any,
+      editor: standardEditorsRegistry.get('slider').editor,
     });
   }
 
@@ -241,7 +261,7 @@ export class PanelOptionsEditorBuilder<TOptions> extends OptionsUIRegistryBuilde
     return this.addCustomEditor({
       ...config,
       id: config.path,
-      editor: standardEditorsRegistry.get('text').editor as any,
+      editor: standardEditorsRegistry.get('text').editor,
     });
   }
 
@@ -251,7 +271,7 @@ export class PanelOptionsEditorBuilder<TOptions> extends OptionsUIRegistryBuilde
     return this.addCustomEditor({
       ...config,
       id: config.path,
-      editor: standardEditorsRegistry.get('strings').editor as any,
+      editor: standardEditorsRegistry.get('strings').editor,
     });
   }
 
@@ -261,7 +281,7 @@ export class PanelOptionsEditorBuilder<TOptions> extends OptionsUIRegistryBuilde
     return this.addCustomEditor({
       ...config,
       id: config.path,
-      editor: standardEditorsRegistry.get('select').editor as any,
+      editor: standardEditorsRegistry.get('select').editor,
     });
   }
 
@@ -271,7 +291,7 @@ export class PanelOptionsEditorBuilder<TOptions> extends OptionsUIRegistryBuilde
     return this.addCustomEditor({
       ...config,
       id: config.path,
-      editor: standardEditorsRegistry.get('multi-select').editor as any,
+      editor: standardEditorsRegistry.get('multi-select').editor,
     });
   }
 
@@ -281,7 +301,7 @@ export class PanelOptionsEditorBuilder<TOptions> extends OptionsUIRegistryBuilde
     return this.addCustomEditor({
       ...config,
       id: config.path,
-      editor: standardEditorsRegistry.get('radio').editor as any,
+      editor: standardEditorsRegistry.get('radio').editor,
     });
   }
 
@@ -289,7 +309,7 @@ export class PanelOptionsEditorBuilder<TOptions> extends OptionsUIRegistryBuilde
     return this.addCustomEditor({
       ...config,
       id: config.path,
-      editor: standardEditorsRegistry.get('boolean').editor as any,
+      editor: standardEditorsRegistry.get('boolean').editor,
     });
   }
 
@@ -297,7 +317,7 @@ export class PanelOptionsEditorBuilder<TOptions> extends OptionsUIRegistryBuilde
     return this.addCustomEditor({
       ...config,
       id: config.path,
-      editor: standardEditorsRegistry.get('color').editor as any,
+      editor: standardEditorsRegistry.get('color').editor,
       settings: config.settings || {},
     });
   }
@@ -306,7 +326,7 @@ export class PanelOptionsEditorBuilder<TOptions> extends OptionsUIRegistryBuilde
     return this.addCustomEditor({
       ...config,
       id: config.path,
-      editor: standardEditorsRegistry.get('timezone').editor as any,
+      editor: standardEditorsRegistry.get('timezone').editor,
       settings: config.settings || {},
     });
   }
@@ -317,7 +337,7 @@ export class PanelOptionsEditorBuilder<TOptions> extends OptionsUIRegistryBuilde
     return this.addCustomEditor({
       ...config,
       id: config.path,
-      editor: standardEditorsRegistry.get('unit').editor as any,
+      editor: standardEditorsRegistry.get('unit').editor,
     });
   }
 
@@ -327,7 +347,7 @@ export class PanelOptionsEditorBuilder<TOptions> extends OptionsUIRegistryBuilde
     return this.addCustomEditor({
       ...config,
       id: config.path,
-      editor: standardEditorsRegistry.get('field-name').editor as any,
+      editor: standardEditorsRegistry.get('field-name').editor,
     });
   }
 
@@ -337,7 +357,7 @@ export class PanelOptionsEditorBuilder<TOptions> extends OptionsUIRegistryBuilde
     return this.addCustomEditor({
       ...config,
       id: config.path,
-      editor: standardEditorsRegistry.get('dashboard-uid').editor as any, // added at runtime
+      editor: standardEditorsRegistry.get('dashboard-uid').editor, // added at runtime
     });
   }
 }
diff --git a/packages/grafana-data/src/utils/arrayUtils.test.ts b/packages/grafana-data/src/utils/arrayUtils.test.ts
index b41c3e728b7d6..132580a6415c1 100644
--- a/packages/grafana-data/src/utils/arrayUtils.test.ts
+++ b/packages/grafana-data/src/utils/arrayUtils.test.ts
@@ -1,6 +1,6 @@
 import { SortOrder } from '@grafana/schema';
 
-import { sortValues } from './arrayUtils';
+import { insertAfterImmutably, insertBeforeImmutably, sortValues } from './arrayUtils';
 
 describe('arrayUtils', () => {
   describe('sortValues', () => {
@@ -30,4 +30,52 @@ describe('arrayUtils', () => {
       expect(sorted).toEqual(expected);
     });
   });
+
+  describe('insertBeforeImmutably', () => {
+    const original = [1, 2, 3];
+
+    it.each`
+      item | index | expected
+      ${4} | ${1}  | ${[1, 4, 2, 3]}
+      ${4} | ${2}  | ${[1, 2, 4, 3]}
+      ${0} | ${0}  | ${[0, 1, 2, 3]}
+    `('add $item before $index', ({ item, index, expected }) => {
+      const output = insertBeforeImmutably(original, item, index);
+      expect(output).toStrictEqual(expected);
+    });
+
+    it('should throw when out of bounds', () => {
+      expect(() => {
+        insertBeforeImmutably([], 1, -1);
+      }).toThrow();
+
+      expect(() => {
+        insertBeforeImmutably([], 1, 3);
+      }).toThrow();
+    });
+  });
+
+  describe('insertAfterImmutably', () => {
+    const original = [1, 2, 3];
+
+    it.each`
+      item | index | expected
+      ${4} | ${1}  | ${[1, 2, 4, 3]}
+      ${4} | ${0}  | ${[1, 4, 2, 3]}
+      ${4} | ${2}  | ${[1, 2, 3, 4]}
+    `('add $item after $index', ({ item, index, expected }) => {
+      const output = insertAfterImmutably(original, item, index);
+      expect(output).toStrictEqual(expected);
+    });
+
+    it('should throw when out of bounds', () => {
+      expect(() => {
+        insertAfterImmutably([], 1, -1);
+      }).toThrow();
+
+      expect(() => {
+        insertAfterImmutably([], 1, 3);
+      }).toThrow();
+    });
+  });
 });
diff --git a/packages/grafana-data/src/utils/arrayUtils.ts b/packages/grafana-data/src/utils/arrayUtils.ts
index fe56786fedc24..843c4d01e9545 100644
--- a/packages/grafana-data/src/utils/arrayUtils.ts
+++ b/packages/grafana-data/src/utils/arrayUtils.ts
@@ -7,6 +7,30 @@ export function moveItemImmutably<T>(arr: T[], from: number, to: number) {
   return clone;
 }
 
+/** @internal */
+export function insertBeforeImmutably<T>(array: T[], item: T, index: number): T[] {
+  if (index < 0 || index > array.length) {
+    throw new Error('Index out of bounds');
+  }
+
+  const clone = [...array];
+  clone.splice(index, 0, item);
+
+  return clone;
+}
+
+/** @internal */
+export function insertAfterImmutably<T>(array: T[], item: T, index: number): T[] {
+  if (index < 0 || index > array.length) {
+    throw new Error('Index out of bounds');
+  }
+
+  const clone = [...array];
+  clone.splice(index + 1, 0, item);
+
+  return clone;
+}
+
 /**
  * Given a sort order and a value, return a function that can be used to sort values
  * Null/undefined/empty string values are always sorted to the end regardless of the sort order provided
diff --git a/packages/grafana-data/src/utils/datasource.ts b/packages/grafana-data/src/utils/datasource.ts
index 42f8811cce9f0..19d7971986a6d 100644
--- a/packages/grafana-data/src/utils/datasource.ts
+++ b/packages/grafana-data/src/utils/datasource.ts
@@ -94,7 +94,7 @@ export const onUpdateDatasourceResetOption =
 export function updateDatasourcePluginOption<J extends DataSourceJsonData, S extends {} = KeyValue>(
   props: DataSourcePluginOptionsEditorProps<J, S>,
   key: keyof DataSourceSettings,
-  val: any
+  val: unknown
 ) {
   const config = props.options;
 
@@ -107,7 +107,7 @@ export function updateDatasourcePluginOption<J extends DataSourceJsonData, S ext
 export const updateDatasourcePluginJsonDataOption = <J extends DataSourceJsonData, S, K extends keyof J>(
   props: DataSourcePluginOptionsEditorProps<J, S>,
   key: K,
-  val: any
+  val: unknown
 ) => {
   const config = props.options;
 
@@ -123,7 +123,7 @@ export const updateDatasourcePluginJsonDataOption = <J extends DataSourceJsonDat
 export const updateDatasourcePluginSecureJsonDataOption = <J extends DataSourceJsonData, S extends {} = KeyValue>(
   props: DataSourcePluginOptionsEditorProps<J, S>,
   key: string,
-  val: any
+  val: unknown
 ) => {
   const config = props.options;
 
diff --git a/packages/grafana-data/src/utils/fieldParser.ts b/packages/grafana-data/src/utils/fieldParser.ts
index fd1b07ec519bf..c6ab0183be186 100644
--- a/packages/grafana-data/src/utils/fieldParser.ts
+++ b/packages/grafana-data/src/utils/fieldParser.ts
@@ -1,7 +1,7 @@
 import { guessFieldTypeFromValue } from '../dataframe/processDataFrame';
 import { Field, FieldType } from '../types/dataFrame';
 
-export function makeFieldParser(value: unknown, field: Field): (value: string) => any {
+export function makeFieldParser(value: unknown, field: Field) {
   if (!field.type) {
     if (field.name === 'time' || field.name === 'Time') {
       field.type = FieldType.time;
diff --git a/packages/grafana-data/src/utils/index.ts b/packages/grafana-data/src/utils/index.ts
index 41909d9b64f6b..e56ef12c01014 100644
--- a/packages/grafana-data/src/utils/index.ts
+++ b/packages/grafana-data/src/utils/index.ts
@@ -26,3 +26,4 @@ export { withLoadingIndicator, type WithLoadingIndicatorOptions } from './withLo
 export { convertOldAngularValueMappings, LegacyMappingType } from './valueMappings';
 export { containsSearchFilter, type SearchFilterOptions, getSearchFilterScopedVar } from './variables';
 export { renderLegendFormat } from './legend';
+export { matchPluginId } from './matchPluginId';
diff --git a/packages/grafana-data/src/utils/location.ts b/packages/grafana-data/src/utils/location.ts
index 7897e860c5209..5c0a2167025e5 100644
--- a/packages/grafana-data/src/utils/location.ts
+++ b/packages/grafana-data/src/utils/location.ts
@@ -69,7 +69,7 @@ const assureBaseUrl = (url: string): string => {
  * @param searchParamsToUpdate
  * @returns
  */
-const getUrlForPartial = (location: Location<any>, searchParamsToUpdate: Record<string, any>) => {
+const getUrlForPartial = (location: Location, searchParamsToUpdate: UrlQueryMap) => {
   const searchParams = urlUtil.parseKeyValue(
     location.search.startsWith('?') ? location.search.substring(1) : location.search
   );
diff --git a/packages/grafana-data/src/utils/matchPluginId.ts b/packages/grafana-data/src/utils/matchPluginId.ts
new file mode 100644
index 0000000000000..d21a0654215c1
--- /dev/null
+++ b/packages/grafana-data/src/utils/matchPluginId.ts
@@ -0,0 +1,13 @@
+import { PluginMeta } from '../types';
+
+export function matchPluginId(idToMatch: string, pluginMeta: PluginMeta) {
+  if (pluginMeta.id === idToMatch) {
+    return true;
+  }
+
+  if (pluginMeta.aliasIDs) {
+    return pluginMeta.aliasIDs.includes(idToMatch);
+  }
+
+  return false;
+}
diff --git a/packages/grafana-data/src/utils/nodeGraph.ts b/packages/grafana-data/src/utils/nodeGraph.ts
index b846348a7a700..4cb05d054c3cf 100644
--- a/packages/grafana-data/src/utils/nodeGraph.ts
+++ b/packages/grafana-data/src/utils/nodeGraph.ts
@@ -15,7 +15,7 @@ export enum NodeGraphDataFrameFieldNames {
   // grafana/ui [nodes]
   icon = 'icon',
   // Defines a single color if string (hex or html named value) or color mode config can be used as threshold or
-  // gradient. arc__ fields must not be defined if used [nodes]
+  // gradient. arc__ fields must not be defined if used [nodes + edges]
   color = 'color',
 
   // Id of the source node [required] [edges]
@@ -32,6 +32,10 @@ export enum NodeGraphDataFrameFieldNames {
   // Thickness of the edge [edges]
   thickness = 'thickness',
 
-  // Whether the node or edge should be highlighted (e.g., shown in red) in the UI
+  // Whether the node or edge should be highlighted (e.g., shown in red) in the UI [nodes + edges]
+  // @deprecated -- for edges use color instead
   highlighted = 'highlighted',
+
+  // Defines the stroke dash array for the edge [edges]. See SVG strokeDasharray definition for syntax.
+  strokeDasharray = 'strokedasharray',
 }
diff --git a/packages/grafana-data/src/utils/tests/mockDataSource.ts b/packages/grafana-data/src/utils/tests/mockDataSource.ts
new file mode 100644
index 0000000000000..cfc0d99d6beb7
--- /dev/null
+++ b/packages/grafana-data/src/utils/tests/mockDataSource.ts
@@ -0,0 +1,69 @@
+import { Observable } from 'rxjs';
+
+import {
+  DataQuery,
+  DataQueryRequest,
+  DataQueryResponse,
+  DataSourceApi,
+  DataSourceInstanceSettings,
+  DataSourceJsonData,
+  DataSourcePluginMeta,
+  PluginMetaInfo,
+  PluginType,
+  TestDataSourceResponse,
+} from '../../types';
+
+export interface TestQuery extends DataQuery {
+  query: string;
+}
+
+export interface TestJsonData extends DataSourceJsonData {
+  url?: string;
+}
+
+const info: PluginMetaInfo = {
+  author: {
+    name: '',
+  },
+  description: '',
+  links: [],
+  logos: {
+    large: '',
+    small: '',
+  },
+  screenshots: [],
+  updated: '',
+  version: '',
+};
+
+export const meta: DataSourcePluginMeta<DataSourceJsonData> = {
+  id: '',
+  name: '',
+  type: PluginType.datasource,
+  info,
+  module: '',
+  baseUrl: '',
+};
+
+export const TestDataSettings: DataSourceInstanceSettings<TestJsonData> = {
+  jsonData: { url: 'http://localhost:3000' },
+  id: 0,
+  uid: '',
+  type: '',
+  name: 'Test Datasource',
+  meta,
+  readOnly: false,
+  access: 'direct',
+};
+
+export class TestDataSource extends DataSourceApi<TestQuery, DataSourceJsonData> {
+  query(request: DataQueryRequest<TestQuery>): Promise<DataQueryResponse> | Observable<DataQueryResponse> {
+    throw new Error('Method not implemented.');
+  }
+  testDatasource(): Promise<TestDataSourceResponse> {
+    throw new Error('Method not implemented.');
+  }
+  constructor(instanceSettings: DataSourceInstanceSettings<TestJsonData> = TestDataSettings) {
+    super(instanceSettings);
+  }
+}
diff --git a/packages/grafana-data/src/utils/url.test.ts b/packages/grafana-data/src/utils/url.test.ts
index b486564587f52..58e2073359312 100644
--- a/packages/grafana-data/src/utils/url.test.ts
+++ b/packages/grafana-data/src/utils/url.test.ts
@@ -33,6 +33,36 @@ describe('toUrlParams', () => {
     });
     expect(url).toBe('datasource=testDs%5B%21%27%28%29%2A%5D');
   });
+  it('should encode object properties as url parameters', () => {
+    const params = urlUtil.serializeParams({
+      server: 'backend-01',
+      hasSpace: 'has space',
+      many: ['1', '2', '3'],
+      true: true,
+      number: 20,
+      isNull: null,
+      isUndefined: undefined,
+      oneMore: false,
+    });
+    expect(params).toBe(
+      'server=backend-01&hasSpace=has%20space&many=1&many=2&many=3&true&number=20&isNull=&isUndefined=&oneMore=false'
+    );
+  });
+
+  it('should not encode special character the same way as angular js', () => {
+    const params = urlUtil.serializeParams({
+      server: ':@',
+    });
+    expect(params).not.toBe('server=:@');
+  });
+
+  it('should keep booleans', () => {
+    const url = urlUtil.serializeParams({
+      bool1: true,
+      bool2: false,
+    });
+    expect(url).toBe('bool1&bool2=false');
+  });
 });
 
 describe('parseKeyValue', () => {
diff --git a/packages/grafana-data/src/utils/url.ts b/packages/grafana-data/src/utils/url.ts
index f3f6449e0d44d..2ee35d9f449bb 100644
--- a/packages/grafana-data/src/utils/url.ts
+++ b/packages/grafana-data/src/utils/url.ts
@@ -27,7 +27,7 @@ function renderUrl(path: string, query: UrlQueryMap | undefined): string {
   return path;
 }
 
-function encodeURIComponentAsAngularJS(val: string, pctEncodeSpaces?: boolean) {
+function encodeURIComponentAsAngularJS(val: EncodeURIComponentParams, pctEncodeSpaces?: boolean) {
   return encodeURIComponent(val)
     .replace(/%40/gi, '@')
     .replace(/%3A/gi, ':')
@@ -40,21 +40,31 @@ function encodeURIComponentAsAngularJS(val: string, pctEncodeSpaces?: boolean) {
     });
 }
 
-function toUrlParams(a: any) {
+type EncodeURIComponentParams = Parameters<typeof encodeURIComponent>[0];
+/**
+ *  Encodes URL parameters in the style of AngularJS.
+ *  Use `serializeParams` to encode parameters using `encodeURIComponent` instead.
+ */
+function toUrlParams(a: any, encodeAsAngularJS = true) {
   const s: any[] = [];
   const rbracket = /\[\]$/;
 
-  const isArray = (obj: any) => {
+  const encodingFunction = encodeAsAngularJS
+    ? (value: EncodeURIComponentParams, pctEncodeSpaces?: boolean) =>
+        encodeURIComponentAsAngularJS(value, pctEncodeSpaces)
+    : (value: EncodeURIComponentParams, _: boolean) => encodeURIComponent(value);
+
+  const isArray = (obj: unknown) => {
     return Object.prototype.toString.call(obj) === '[object Array]';
   };
 
   const add = (k: string, v: any) => {
     v = typeof v === 'function' ? v() : v === null ? '' : v === undefined ? '' : v;
     if (typeof v !== 'boolean') {
-      s[s.length] = encodeURIComponentAsAngularJS(k, true) + '=' + encodeURIComponentAsAngularJS(v, true);
+      s[s.length] = encodingFunction(k, true) + '=' + encodingFunction(v, true);
     } else {
-      const valueQueryPart = v ? '' : '=' + encodeURIComponentAsAngularJS('false', true);
-      s[s.length] = encodeURIComponentAsAngularJS(k, true) + valueQueryPart;
+      const valueQueryPart = v ? '' : '=' + encodingFunction('false', true);
+      s[s.length] = encodingFunction(k, true) + valueQueryPart;
     }
   };
 
@@ -92,6 +102,16 @@ function toUrlParams(a: any) {
   return buildParams('', a).join('&');
 }
 
+/**
+ * Converts params into a URL-encoded query string.
+ *
+ * @param params data to serialize
+ * @returns A URL-encoded string representing the provided data.
+ */
+function serializeParams(params: unknown): string {
+  return toUrlParams(params, false);
+}
+
 function appendQueryToUrl(url: string, stringToAppend: string) {
   if (stringToAppend !== undefined && stringToAppend !== null && stringToAppend !== '') {
     const pos = url.indexOf('?');
@@ -198,6 +218,7 @@ export const urlUtil = {
   appendQueryToUrl,
   getUrlSearchParams,
   parseKeyValue,
+  serializeParams,
 };
 
 /**
diff --git a/packages/grafana-data/src/valueFormats/categories.ts b/packages/grafana-data/src/valueFormats/categories.ts
index e21e60fbf5178..79ef525e249f4 100644
--- a/packages/grafana-data/src/valueFormats/categories.ts
+++ b/packages/grafana-data/src/valueFormats/categories.ts
@@ -45,6 +45,7 @@ export const getCategories = (): ValueFormatCategory[] => [
         id: 'short',
         fn: scaledUnits(1000, ['', ' K', ' Mil', ' Bil', ' Tri', ' Quadr', ' Quint', ' Sext', ' Sept']),
       },
+      { name: 'SI short', id: 'sishort', fn: SIPrefix('') },
       { name: 'Percent (0-100)', id: 'percent', fn: toPercent },
       { name: 'Percent (0.0-1.0)', id: 'percentunit', fn: toPercentUnit },
       { name: 'Humidity (%H)', id: 'humidity', fn: toFixedUnit('%H') },
@@ -144,6 +145,8 @@ export const getCategories = (): ValueFormatCategory[] => [
       { name: 'Turkish Lira (₺)', id: 'currencyTRY', fn: currency('₺', true) },
       { name: 'Malaysian Ringgit (RM)', id: 'currencyMYR', fn: currency('RM') },
       { name: 'CFP franc (XPF)', id: 'currencyXPF', fn: currency('XPF') },
+      { name: 'Bulgarian Lev (BGN)', id: 'currencyBGN', fn: currency('BGN') },
+      { name: 'Guaraní (₲)', id: 'currencyPYG', fn: currency('₲') },
     ],
   },
   {
diff --git a/packages/grafana-data/src/valueFormats/dateTimeFormatters.test.ts b/packages/grafana-data/src/valueFormats/dateTimeFormatters.test.ts
index d61beabce0d21..8537fed6c6be4 100644
--- a/packages/grafana-data/src/valueFormats/dateTimeFormatters.test.ts
+++ b/packages/grafana-data/src/valueFormats/dateTimeFormatters.test.ts
@@ -350,19 +350,25 @@ describe('to nanoseconds', () => {
   it('should correctly display as minutes', () => {
     const eightMinutes = toNanoSeconds(480000000000);
     expect(eightMinutes.text).toBe('8');
+    expect(eightMinutes.suffix).toBe(' mins');
+  });
+
+  it('should correctly display as minute', () => {
+    const eightMinutes = toNanoSeconds(60000000000);
+    expect(eightMinutes.text).toBe('1');
     expect(eightMinutes.suffix).toBe(' min');
   });
 
   it('should correctly display as hours', () => {
     const nineHours = toNanoSeconds(32400000000000);
     expect(nineHours.text).toBe('9');
-    expect(nineHours.suffix).toBe(' hour');
+    expect(nineHours.suffix).toBe(' hours');
   });
 
   it('should correctly display as days', () => {
     const tenDays = toNanoSeconds(864000000000000);
     expect(tenDays.text).toBe('10');
-    expect(tenDays.suffix).toBe(' day');
+    expect(tenDays.suffix).toBe(' days');
   });
 });
 
diff --git a/packages/grafana-data/src/valueFormats/dateTimeFormatters.ts b/packages/grafana-data/src/valueFormats/dateTimeFormatters.ts
index fe230f5023b4a..4eb18bf8c5087 100644
--- a/packages/grafana-data/src/valueFormats/dateTimeFormatters.ts
+++ b/packages/grafana-data/src/valueFormats/dateTimeFormatters.ts
@@ -102,13 +102,6 @@ export function toMilliSeconds(size: number, decimals?: DecimalCount, scaledDeci
   return toFixedScaled(size / 31536000000, decimals, ' year');
 }
 
-export function trySubstract(value1: DecimalCount, value2: DecimalCount): DecimalCount {
-  if (value1 !== null && value1 !== undefined && value2 !== null && value2 !== undefined) {
-    return value1 - value2;
-  }
-  return undefined;
-}
-
 export function toSeconds(size: number, decimals?: DecimalCount): FormattedValue {
   if (size === null) {
     return { text: '' };
diff --git a/packages/grafana-data/src/valueFormats/valueFormats.test.ts b/packages/grafana-data/src/valueFormats/valueFormats.test.ts
index 2b2e8d0ed63ac..b0776ae4b4103 100644
--- a/packages/grafana-data/src/valueFormats/valueFormats.test.ts
+++ b/packages/grafana-data/src/valueFormats/valueFormats.test.ts
@@ -25,7 +25,8 @@ describe('valueFormats', () => {
     ${'ms'}               | ${4}         | ${0.0024}                                   | ${'0.0024 ms'}
     ${'ms'}               | ${0}         | ${100}                                      | ${'100 ms'}
     ${'ms'}               | ${2}         | ${1250}                                     | ${'1.25 s'}
-    ${'ms'}               | ${1}         | ${10000086.123}                             | ${'2.8 hour'}
+    ${'ms'}               | ${1}         | ${10000086.123}                             | ${'2.8 hours'}
+    ${'ms'}               | ${1}         | ${-10000086.123}                            | ${'-2.8 hours'}
     ${'ms'}               | ${undefined} | ${1000}                                     | ${'1 s'}
     ${'ms'}               | ${0}         | ${1200}                                     | ${'1 s'}
     ${'short'}            | ${undefined} | ${1000}                                     | ${'1 K'}
@@ -69,8 +70,9 @@ describe('valueFormats', () => {
     ${'dateTimeAsUS'}     | ${0}         | ${dateTime(new Date(2010, 6, 2)).valueOf()} | ${'07/02/2010 12:00:00 am'}
     ${'dateTimeAsSystem'} | ${0}         | ${dateTime(new Date(2010, 6, 2)).valueOf()} | ${'2010-07-02 00:00:00'}
     ${'dtdurationms'}     | ${undefined} | ${100000}                                   | ${'1 minute'}
+    ${'dtdurationms'}     | ${undefined} | ${150000}                                   | ${'2 minutes'}
   `(
-    'With format=$format decimals=$decimals and value=$value then result shoudl be = $expected',
+    'With format=$format decimals=$decimals and value=$value then result should be = $expected',
     async ({ format, value, decimals, expected }) => {
       const result = getValueFormat(format)(value, decimals, undefined, undefined);
       const full = formattedValueToString(result);
diff --git a/packages/grafana-data/src/valueFormats/valueFormats.ts b/packages/grafana-data/src/valueFormats/valueFormats.ts
index f8753bad0e20f..e4d99adcc91b0 100644
--- a/packages/grafana-data/src/valueFormats/valueFormats.ts
+++ b/packages/grafana-data/src/valueFormats/valueFormats.ts
@@ -102,10 +102,27 @@ function getDecimalsForValue(value: number): number {
 export function toFixedScaled(value: number, decimals: DecimalCount, ext?: string): FormattedValue {
   return {
     text: toFixed(value, decimals),
-    suffix: ext,
+    suffix: appendPluralIf(ext, Math.abs(value) > 1),
   };
 }
 
+function appendPluralIf(ext: string | undefined, condition: boolean): string | undefined {
+  if (!condition) {
+    return ext;
+  }
+
+  switch (ext) {
+    case ' min':
+    case ' hour':
+    case ' day':
+    case ' week':
+    case ' year':
+      return `${ext}s`;
+    default:
+      return ext;
+  }
+}
+
 export function toFixedUnit(unit: string, asPrefix?: boolean): ValueFormatter {
   return (size: number, decimals?: DecimalCount) => {
     if (size === null) {
diff --git a/packages/grafana-data/src/vector/AppendedVectors.test.ts b/packages/grafana-data/src/vector/AppendedVectors.test.ts
deleted file mode 100644
index 29ef1dabe0241..0000000000000
--- a/packages/grafana-data/src/vector/AppendedVectors.test.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { AppendedVectors } from './AppendedVectors';
-import { ArrayVector } from './ArrayVector';
-
-describe('Check Appending Vector', () => {
-  it('should transparently join them', () => {
-    jest.spyOn(console, 'warn').mockImplementation();
-    const appended = new AppendedVectors();
-    appended.append(new ArrayVector([1, 2, 3]));
-    appended.append(new ArrayVector([4, 5, 6]));
-    appended.append(new ArrayVector([7, 8, 9]));
-    expect(appended.length).toEqual(9);
-    expect(appended[0]).toEqual(1);
-    expect(appended[1]).toEqual(2);
-    expect(appended[100]).toEqual(undefined);
-
-    appended.setLength(5);
-    expect(appended.length).toEqual(5);
-    appended.append(new ArrayVector(['a', 'b', 'c']));
-    expect(appended.length).toEqual(8);
-    expect(appended.toArray()).toEqual([1, 2, 3, 4, 5, 'a', 'b', 'c']);
-
-    appended.setLength(2);
-    appended.setLength(6);
-    appended.append(new ArrayVector(['x', 'y', 'z']));
-    expect(appended.toArray()).toEqual([1, 2, undefined, undefined, undefined, undefined, 'x', 'y', 'z']);
-  });
-});
diff --git a/packages/grafana-data/src/vector/AppendedVectors.ts b/packages/grafana-data/src/vector/AppendedVectors.ts
deleted file mode 100644
index af9873a69c26b..0000000000000
--- a/packages/grafana-data/src/vector/AppendedVectors.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { Vector, makeArrayIndexableVector } from '../types/vector';
-
-import { FunctionalVector } from './FunctionalVector';
-import { vectorToArray } from './vectorToArray';
-
-interface AppendedVectorInfo<T> {
-  start: number;
-  end: number;
-  values: Vector<T>;
-}
-
-/**
- * This may be more trouble than it is worth.  This trades some computation time for
- * RAM -- rather than allocate a new array the size of all previous arrays, this just
- * points the correct index to their original array values
- *
- * @deprecated use a simple Arrays.  NOTE this is not used in grafana core
- */
-export class AppendedVectors<T = any> extends FunctionalVector<T> {
-  length = 0;
-  source: Array<AppendedVectorInfo<T>> = [];
-
-  constructor(startAt = 0) {
-    super();
-    this.length = startAt;
-    return makeArrayIndexableVector(this);
-  }
-
-  /**
-   * Make the vector look like it is this long
-   */
-  setLength(length: number) {
-    if (length > this.length) {
-      // make the vector longer (filling with undefined)
-      this.length = length;
-    } else if (length < this.length) {
-      // make the array shorter
-      const sources: Array<AppendedVectorInfo<T>> = [];
-      for (const src of this.source) {
-        sources.push(src);
-        if (src.end > length) {
-          src.end = length;
-          break;
-        }
-      }
-      this.source = sources;
-      this.length = length;
-    }
-  }
-
-  append(v: Vector<T>): AppendedVectorInfo<T> {
-    const info = {
-      start: this.length,
-      end: this.length + v.length,
-      values: v,
-    };
-    this.length = info.end;
-    this.source.push(info);
-    return info;
-  }
-
-  get(index: number): T {
-    for (let i = 0; i < this.source.length; i++) {
-      const src = this.source[i];
-      if (index >= src.start && index < src.end) {
-        return src.values[index - src.start];
-      }
-    }
-    return undefined as unknown as T;
-  }
-
-  toArray(): T[] {
-    return vectorToArray(this);
-  }
-
-  toJSON(): T[] {
-    return vectorToArray(this);
-  }
-}
diff --git a/packages/grafana-data/src/vector/ArrayVector.test.ts b/packages/grafana-data/src/vector/ArrayVector.test.ts
index 3d9ae35fc5f9f..eb0c53dfa0c30 100644
--- a/packages/grafana-data/src/vector/ArrayVector.test.ts
+++ b/packages/grafana-data/src/vector/ArrayVector.test.ts
@@ -2,6 +2,9 @@ import { Field, FieldType } from '../types';
 
 import { ArrayVector } from './ArrayVector';
 
+// There's lots of @ts-expect-error here, because we actually expect it to be a typescript error
+// to further encourge developers not to use ArrayVector
+
 describe('ArrayVector', () => {
   beforeEach(() => {
     jest.spyOn(console, 'warn').mockImplementation();
@@ -9,12 +12,14 @@ describe('ArrayVector', () => {
 
   it('should init 150k with 65k Array.push() chonking', () => {
     const arr = Array.from({ length: 150e3 }, (v, i) => i);
+    /// @ts-expect-error
     const av = new ArrayVector(arr);
 
     expect(av.toArray()).toEqual(arr);
   });
 
   it('should support add and push', () => {
+    /// @ts-expect-error
     const av = new ArrayVector<number>();
     av.add(1);
     av.push(2);
@@ -28,17 +33,26 @@ describe('ArrayVector', () => {
       name: 'test',
       config: {},
       type: FieldType.number,
+      /// @ts-expect-error
       values: new ArrayVector(), // this defaults to `new ArrayVector<any>()`
     };
     expect(field).toBeDefined();
 
     // Before collapsing Vector, ReadWriteVector, and MutableVector these all worked fine
+
+    /// @ts-expect-error
     field.values = new ArrayVector();
+    /// @ts-expect-error
     field.values = new ArrayVector(undefined);
+    /// @ts-expect-error
     field.values = new ArrayVector([1, 2, 3]);
+    /// @ts-expect-error
     field.values = new ArrayVector([]);
+    /// @ts-expect-error
     field.values = new ArrayVector([1, undefined]);
+    /// @ts-expect-error
     field.values = new ArrayVector([null]);
+    /// @ts-expect-error
     field.values = new ArrayVector(['a', 'b', 'c']);
     expect(field.values.length).toBe(3);
   });
diff --git a/packages/grafana-data/src/vector/ArrayVector.ts b/packages/grafana-data/src/vector/ArrayVector.ts
index 01b615162b78c..0673f12f74a81 100644
--- a/packages/grafana-data/src/vector/ArrayVector.ts
+++ b/packages/grafana-data/src/vector/ArrayVector.ts
@@ -6,12 +6,12 @@ let notified = false;
  *
  * @deprecated use a simple Array<T>
  */
-export class ArrayVector<T = any> extends Array<T> {
+export class ArrayVector<T = unknown> extends Array<T> {
   get buffer() {
     return this;
   }
 
-  set buffer(values: any[]) {
+  set buffer(values: T[]) {
     this.length = 0;
 
     const len = values?.length;
@@ -27,10 +27,10 @@ export class ArrayVector<T = any> extends Array<T> {
   }
 
   /**
-   * This any type is here to make the change type changes in v10 non breaking for plugins.
-   * Before you could technically assign field.values any typed ArrayVector no matter what the Field<T> T type was.
+   * ArrayVector is deprecated and should not be used. If you get a Typescript error here, use plain arrays for field.values.
    */
-  constructor(buffer?: any[]) {
+  // `never` is used to force a build-type error from Typescript to encourage developers to move away from using this
+  constructor(buffer: never) {
     super();
     this.buffer = buffer ?? [];
 
diff --git a/packages/grafana-data/src/vector/AsNumberVector.ts b/packages/grafana-data/src/vector/AsNumberVector.ts
deleted file mode 100644
index cc47ad3d7ec8c..0000000000000
--- a/packages/grafana-data/src/vector/AsNumberVector.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Vector } from '../types';
-
-/**
- * This will force all values to be numbers
- *
- * @public
- * @deprecated use a simple Arrays.  NOTE: Not used in grafana core
- */
-export class AsNumberVector extends Array<number> {
-  constructor(field: Vector) {
-    super();
-    return field.map((v) => +v);
-  }
-}
diff --git a/packages/grafana-data/src/vector/BinaryOperationVector.test.ts b/packages/grafana-data/src/vector/BinaryOperationVector.test.ts
deleted file mode 100644
index 10ab760f1bb28..0000000000000
--- a/packages/grafana-data/src/vector/BinaryOperationVector.test.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { binaryOperators, BinaryOperationID } from '../utils/binaryOperators';
-
-import { ArrayVector } from './ArrayVector';
-import { BinaryOperationVector } from './BinaryOperationVector';
-import { ConstantVector } from './ConstantVector';
-
-describe('ScaledVector', () => {
-  it('should support multiply operations', () => {
-    jest.spyOn(console, 'warn').mockImplementation();
-    const source = new ArrayVector([1, 2, 3, 4]);
-    const scale = 2.456;
-    const operation = binaryOperators.get(BinaryOperationID.Multiply).operation;
-    const v = new BinaryOperationVector(source, new ConstantVector(scale, source.length), operation);
-    expect(v.length).toEqual(source.length);
-    // Accessed with getters
-    for (let i = 0; i < 4; i++) {
-      expect(v.get(i)).toEqual(source.get(i) * scale);
-    }
-    // Accessed with array index
-    for (let i = 0; i < 4; i++) {
-      expect(v[i]).toEqual(source[i] * scale);
-    }
-  });
-});
diff --git a/packages/grafana-data/src/vector/BinaryOperationVector.ts b/packages/grafana-data/src/vector/BinaryOperationVector.ts
deleted file mode 100644
index 4848e040e2fa4..0000000000000
--- a/packages/grafana-data/src/vector/BinaryOperationVector.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Vector } from '../types/vector';
-import { BinaryOperation } from '../utils/binaryOperators';
-
-/**
- * @public
- * @deprecated use a simple Arrays.  NOTE: Not used in grafana core
- */
-export class BinaryOperationVector extends Array<number> {
-  constructor(left: Vector<number>, right: Vector<number>, operation: BinaryOperation) {
-    super();
-
-    const arr = new Array(left.length);
-    for (let i = 0; i < arr.length; i++) {
-      arr[i] = operation(left[i], right[i]);
-    }
-    return arr;
-  }
-}
diff --git a/packages/grafana-data/src/vector/CircularVector.ts b/packages/grafana-data/src/vector/CircularVector.ts
index aa70ae27578d0..221f7c488e553 100644
--- a/packages/grafana-data/src/vector/CircularVector.ts
+++ b/packages/grafana-data/src/vector/CircularVector.ts
@@ -1,5 +1,3 @@
-import { makeArrayIndexableVector } from '../types';
-
 import { FunctionalVector } from './FunctionalVector';
 
 interface CircularOptions<T> {
@@ -36,7 +34,27 @@ export class CircularVector<T = any> extends FunctionalVector<T> {
     if (options.capacity) {
       this.setCapacity(options.capacity);
     }
-    return makeArrayIndexableVector(this);
+    return new Proxy(this, {
+      get(target: CircularVector<T>, property: string, receiver: CircularVector<T>) {
+        if (typeof property !== 'symbol') {
+          const idx = +property;
+          if (String(idx) === property) {
+            return target.get(idx);
+          }
+        }
+        return Reflect.get(target, property, receiver);
+      },
+      set(target: CircularVector<T>, property: string, value: T, receiver: CircularVector<T>) {
+        if (typeof property !== 'symbol') {
+          const idx = +property;
+          if (String(idx) === property) {
+            target.set(idx, value);
+            return true;
+          }
+        }
+        return Reflect.set(target, property, value, receiver);
+      },
+    });
   }
 
   /**
@@ -122,7 +140,7 @@ export class CircularVector<T = any> extends FunctionalVector<T> {
     return this.buffer[(index + this.index) % this.buffer.length];
   }
 
-  set(index: number, value: any) {
+  set(index: number, value: T) {
     this.buffer[(index + this.index) % this.buffer.length] = value;
   }
 
diff --git a/packages/grafana-data/src/vector/ConstantVector.test.ts b/packages/grafana-data/src/vector/ConstantVector.test.ts
deleted file mode 100644
index 2d94fc3442871..0000000000000
--- a/packages/grafana-data/src/vector/ConstantVector.test.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { ConstantVector } from './ConstantVector';
-
-describe('ConstantVector', () => {
-  it('should support constant values', () => {
-    const value = 3.5;
-    const v = new ConstantVector(value, 7);
-    expect(v.length).toEqual(7);
-
-    expect(v.get(0)).toEqual(value);
-    expect(v.get(1)).toEqual(value);
-
-    // Now check all of them
-    for (let i = 0; i < 7; i++) {
-      expect(v.get(i)).toEqual(value);
-      expect(v[i]).toEqual(value);
-    }
-  });
-});
diff --git a/packages/grafana-data/src/vector/ConstantVector.ts b/packages/grafana-data/src/vector/ConstantVector.ts
deleted file mode 100644
index 0eb19fc763679..0000000000000
--- a/packages/grafana-data/src/vector/ConstantVector.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * @public
- * @deprecated use a simple Arrays.  NOTE: Not used in grafana core.
- */
-export class ConstantVector<T = any> extends Array<T> {
-  constructor(value: T, len: number) {
-    super();
-    return new Array<T>(len).fill(value);
-  }
-}
diff --git a/packages/grafana-data/src/vector/FormattedVector.ts b/packages/grafana-data/src/vector/FormattedVector.ts
deleted file mode 100644
index 8e4cd9be94926..0000000000000
--- a/packages/grafana-data/src/vector/FormattedVector.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { DisplayProcessor } from '../types';
-import { Vector } from '../types/vector';
-import { formattedValueToString } from '../valueFormats';
-
-/**
- * @public
- * @deprecated use a simple Arrays. NOTE: not used in grafana core.
- */
-export class FormattedVector<T = any> extends Array<string> {
-  constructor(source: Vector<T>, formatter: DisplayProcessor) {
-    super();
-    return source.map((v) => formattedValueToString(formatter(v)));
-  }
-}
diff --git a/packages/grafana-data/src/vector/FunctionalVector.ts b/packages/grafana-data/src/vector/FunctionalVector.ts
index 62782fe718fa0..bcd13d96090bb 100644
--- a/packages/grafana-data/src/vector/FunctionalVector.ts
+++ b/packages/grafana-data/src/vector/FunctionalVector.ts
@@ -1,12 +1,8 @@
-import { Vector } from '../types';
-
-import { vectorToArray } from './vectorToArray';
-
 /**
  * @public
  * @deprecated use a simple Arrays
  */
-export abstract class FunctionalVector<T = any> implements Vector<T> {
+export abstract class FunctionalVector<T = unknown> {
   abstract get length(): number;
 
   abstract get(index: number): T;
@@ -18,7 +14,7 @@ export abstract class FunctionalVector<T = any> implements Vector<T> {
     }
   }
 
-  set(index: number, value: any): void {
+  set(index: number, value: T): void {
     throw 'unsupported operation';
   }
 
@@ -55,7 +51,11 @@ export abstract class FunctionalVector<T = any> implements Vector<T> {
   }
 
   toArray(): T[] {
-    return vectorToArray(this);
+    const arr = new Array<T>(this.length);
+    for (let i = 0; i < this.length; i++) {
+      arr[i] = this.get(i);
+    }
+    return arr;
   }
 
   join(separator?: string | undefined): string {
@@ -101,18 +101,8 @@ export abstract class FunctionalVector<T = any> implements Vector<T> {
   copyWithin(target: number, start: number, end?: number | undefined): this {
     throw new Error('Method not implemented.');
   }
-
-  [Symbol.unscopables](): {
-    copyWithin: boolean;
-    entries: boolean;
-    fill: boolean;
-    find: boolean;
-    findIndex: boolean;
-    keys: boolean;
-    values: boolean;
-  } {
-    throw new Error('Method not implemented.');
-  }
+  // Object not implemented
+  [Symbol.unscopables] = {};
 
   //--------------------------------------------------------------------------------
   // Delegated Array function -- these will not be efficient :grimmice:
@@ -193,7 +183,7 @@ const emptyarray: any[] = [];
  *
  * @deprecated use a simple Arrays
  */
-export function vectorator<T>(vector: Vector<T>) {
+export function vectorator<T>(vector: FunctionalVector<T>) {
   return {
     *[Symbol.iterator]() {
       for (let i = 0; i < vector.length; i++) {
diff --git a/packages/grafana-data/src/vector/IndexVector.ts b/packages/grafana-data/src/vector/IndexVector.ts
deleted file mode 100644
index 1dfeb92ab3630..0000000000000
--- a/packages/grafana-data/src/vector/IndexVector.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { Field, FieldType } from '../types';
-
-/**
- * IndexVector is a simple vector implementation that returns the index value
- * for each element in the vector.  It is functionally equivolant a vector backed
- * by an array with values: `[0,1,2,...,length-1]`
- *
- * @deprecated use a simple Arrays.  NOTE: not used in grafana core
- */
-export class IndexVector extends Array<number> {
-  constructor(len: number) {
-    super();
-    const arr = new Array(len);
-    for (let i = 0; i < len; i++) {
-      arr[i] = i;
-    }
-    return arr;
-  }
-
-  /**
-   * Returns a field representing the range [0 ... length-1]
-   *
-   * @deprecated
-   */
-  static newField(len: number): Field<number> {
-    return {
-      name: '',
-      values: new IndexVector(len),
-      type: FieldType.number,
-      config: {
-        min: 0,
-        max: len - 1,
-      },
-    };
-  }
-}
diff --git a/packages/grafana-data/src/vector/SortedVector.test.ts b/packages/grafana-data/src/vector/SortedVector.test.ts
deleted file mode 100644
index 0d7a6c556a4e3..0000000000000
--- a/packages/grafana-data/src/vector/SortedVector.test.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { ArrayVector } from './ArrayVector';
-import { SortedVector } from './SortedVector';
-
-describe('SortedVector', () => {
-  it('Should support sorting', () => {
-    jest.spyOn(console, 'warn').mockImplementation();
-    const values = new ArrayVector([1, 5, 2, 4]);
-    const sorted = new SortedVector(values, [0, 2, 3, 1]);
-    expect(sorted.toArray()).toEqual([1, 2, 4, 5]);
-
-    // The proxy should still be an instance of SortedVector (used in timeseries)
-    expect(sorted instanceof SortedVector).toBeTruthy();
-  });
-});
diff --git a/packages/grafana-data/src/vector/SortedVector.ts b/packages/grafana-data/src/vector/SortedVector.ts
deleted file mode 100644
index 8ed64671688e9..0000000000000
--- a/packages/grafana-data/src/vector/SortedVector.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { makeArrayIndexableVector, Vector } from '../types/vector';
-
-import { FunctionalVector } from './FunctionalVector';
-import { vectorToArray } from './vectorToArray';
-
-/**
- * Values are returned in the order defined by the input parameter
- *
- * @deprecated use a simple Arrays
- */
-export class SortedVector<T = any> extends FunctionalVector<T> {
-  constructor(
-    private source: Vector<T>,
-    private order: number[]
-  ) {
-    super();
-    return makeArrayIndexableVector(this);
-  }
-
-  get length(): number {
-    return this.source.length;
-  }
-
-  get(index: number): T {
-    return this.source.get(this.order[index]);
-  }
-
-  toArray(): T[] {
-    return vectorToArray(this);
-  }
-
-  toJSON(): T[] {
-    return vectorToArray(this);
-  }
-
-  getOrderArray(): number[] {
-    return this.order;
-  }
-}
diff --git a/packages/grafana-data/src/vector/index.ts b/packages/grafana-data/src/vector/index.ts
deleted file mode 100644
index 5401189d278b0..0000000000000
--- a/packages/grafana-data/src/vector/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export * from './AppendedVectors';
-export * from './ArrayVector';
-export * from './CircularVector';
-export * from './ConstantVector';
-export * from './BinaryOperationVector';
-export * from './SortedVector';
-export * from './FormattedVector';
-export * from './IndexVector';
-export * from './AsNumberVector';
-
-export { vectorator } from './FunctionalVector';
diff --git a/packages/grafana-data/src/vector/vectorToArray.ts b/packages/grafana-data/src/vector/vectorToArray.ts
deleted file mode 100644
index 7ec23d9c2612e..0000000000000
--- a/packages/grafana-data/src/vector/vectorToArray.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Vector } from '../types/vector';
-
-/** @deprecated use a simple Arrays */
-export function vectorToArray<T>(v: Vector<T>): T[] {
-  const arr: T[] = Array(v.length);
-  for (let i = 0; i < v.length; i++) {
-    arr[i] = v.get(i);
-  }
-  return arr;
-}
diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json
index a14c3e70282ed..1627b9e67684e 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": "10.3.0-pre",
+  "version": "11.0.0",
   "description": "Grafana End-to-End Test Selectors Library",
   "keywords": [
     "cli",
@@ -39,19 +39,18 @@
     "postpack": "mv package.json.bak package.json"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "25.0.2",
     "@rollup/plugin-node-resolve": "15.2.3",
-    "@types/node": "18.18.4",
+    "@types/node": "20.11.30",
     "esbuild": "0.18.12",
-    "rimraf": "5.0.1",
+    "rimraf": "5.0.5",
     "rollup": "2.79.1",
     "rollup-plugin-dts": "^5.0.0",
     "rollup-plugin-esbuild": "5.0.0",
     "rollup-plugin-node-externals": "^5.0.0"
   },
   "dependencies": {
-    "@grafana/tsconfig": "^1.2.0-rc1",
-    "tslib": "2.6.0",
-    "typescript": "4.8.4"
+    "@grafana/tsconfig": "^1.3.0-rc1",
+    "tslib": "2.6.2",
+    "typescript": "5.3.3"
   }
 }
diff --git a/packages/grafana-e2e-selectors/src/selectors/components.ts b/packages/grafana-e2e-selectors/src/selectors/components.ts
index d8599280e4e72..84914fa5d7580 100644
--- a/packages/grafana-e2e-selectors/src/selectors/components.ts
+++ b/packages/grafana-e2e-selectors/src/selectors/components.ts
@@ -10,18 +10,24 @@
  * @alpha
  */
 export const Components = {
+  RadioButton: {
+    container: 'data-testid radio-button',
+  },
   Breadcrumbs: {
     breadcrumb: (title: string) => `data-testid ${title} breadcrumb`,
   },
   TimePicker: {
     openButton: 'data-testid TimePicker Open Button',
-    fromField: 'Time Range from field',
-    toField: 'Time Range to field',
+    overlayContent: 'data-testid TimePicker Overlay Content',
+    fromField: 'data-testid Time Range from field',
+    toField: 'data-testid Time Range to field',
     applyTimeRange: 'data-testid TimePicker submit button',
+    copyTimeRange: 'data-testid TimePicker copy button',
+    pasteTimeRange: 'data-testid TimePicker paste button',
     calendar: {
-      label: 'Time Range calendar',
-      openButton: 'Open time range calendar',
-      closeButton: 'Close time range Calendar',
+      label: 'data-testid Time Range calendar',
+      openButton: 'data-testid Open time range calendar',
+      closeButton: 'data-testid Close time range Calendar',
     },
     absoluteTimeRangeTitle: 'data-testid-absolute-time-range-narrow',
   },
@@ -31,6 +37,9 @@ export const Components = {
     rolePicker: 'Built-in role picker',
     permissionLevel: 'Permission Level',
   },
+  DateTimePicker: {
+    input: 'data-testid date-time-input',
+  },
   DataSource: {
     TestData: {
       QueryTab: {
@@ -46,18 +55,90 @@ export const Components = {
       },
     },
     DataSourceHttpSettings: {
-      urlInput: 'Datasource HTTP settings url',
+      urlInput: 'data-testid Datasource HTTP settings url',
     },
     Jaeger: {
       traceIDInput: 'Trace ID',
     },
     Prometheus: {
       configPage: {
-        connectionSettings: 'Data source connection URL',
-        exemplarsAddButton: 'Add exemplar config button',
-        internalLinkSwitch: 'Internal link switch',
+        connectionSettings: 'Data source connection URL', // aria-label in grafana experimental
+        manageAlerts: 'prometheus-alerts-manager', // id for switch component
+        scrapeInterval: 'data-testid scrape interval',
+        queryTimeout: 'data-testid query timeout',
+        defaultEditor: 'data-testid default editor',
+        disableMetricLookup: 'disable-metric-lookup', // id for switch component
+        prometheusType: 'data-testid prometheus type',
+        prometheusVersion: 'data-testid prometheus version',
+        cacheLevel: 'data-testid cache level',
+        incrementalQuerying: 'prometheus-incremental-querying', // id for switch component
+        queryOverlapWindow: 'data-testid query overlap window',
+        disableRecordingRules: 'disable-recording-rules', // id for switch component
+        customQueryParameters: 'data-testid custom query parameters',
+        httpMethod: 'data-testid http method',
+        exemplarsAddButton: 'data-testid Add exemplar config button',
+        internalLinkSwitch: 'data-testid Internal link switch',
+      },
+      queryEditor: {
+        // kickstart: '', see QueryBuilder queryPatterns below
+        explain: 'data-testid prometheus explain switch wrapper',
+        editorToggle: 'data-testid QueryEditorModeToggle', // wrapper for toggle
+        options: 'data-testid prometheus options', // wrapper for options group
+        legend: 'data-testid prometheus legend wrapper', // wrapper for multiple compomnents
+        format: 'data-testid prometheus format',
+        step: 'prometheus-step', // id for autosize component
+        type: 'data-testid prometheus type', //wrapper for radio button group
+        exemplars: 'prometheus-exemplars', // id for editor switch component
+        builder: {
+          // see QueryBuilder below for commented selectors
+          // labelSelect: 'data-testid Select label',
+          // valueSelect: 'data-testid Select value',
+          // matchOperatorSelect: 'data-testid Select match operator',
+          metricSelect: 'data-testid metric select',
+          hints: 'data-testid prometheus hints', // wrapper for hints component
+          metricsExplorer: 'data-testid metrics explorer',
+          queryAdvisor: 'data-testid query advisor',
+        },
+        code: {
+          queryField: 'data-testid prometheus query field',
+          metricsBrowser: {
+            openButton: 'data-testid open metrics browser',
+            selectMetric: 'data-testid select a metric',
+            metricList: 'data-testid metric list',
+            labelNamesFilter: 'data-testid label names filter',
+            labelValuesFilter: 'data-testid label values filter',
+            useQuery: 'data-testid use query',
+            useAsRateQuery: 'data-testid use as rate query',
+            validateSelector: 'data-testid validate selector',
+            clear: 'data-testid clear',
+          },
+        },
+      },
+      exemplarMarker: 'data-testid Exemplar marker',
+      variableQueryEditor: {
+        queryType: 'data-testid query type',
+        labelnames: {
+          metricRegex: 'data-testid label names metric regex',
+        },
+        labelValues: {
+          labelSelect: 'data-testid label values label select',
+          // metric select see queryEditor: builder for more context
+          // label select for metric filtering see queryEditor: builder for more context
+        },
+        metricNames: {
+          metricRegex: 'data-testid metric names metric regex',
+        },
+        varQueryResult: 'data-testid variable query result',
+        seriesQuery: 'data-testid prometheus series query',
+        classicQuery: 'data-testid prometheus classic query',
+      },
+      annotations: {
+        minStep: 'prometheus-annotation-min-step', // id for autosize input
+        title: 'data-testid prometheus annotation title',
+        tags: 'data-testid prometheus annotation tags',
+        text: 'data-testid prometheus annotation text',
+        seriesValueAsTimestamp: 'data-testid prometheus annotation series value as timestamp',
       },
-      exemplarMarker: 'Exemplar marker',
     },
   },
   Menu: {
@@ -65,8 +146,8 @@ export const Components = {
     MenuGroup: (title: string) => `${title} menu group`,
     MenuItem: (title: string) => `${title} menu item`,
     SubMenu: {
-      container: 'SubMenu container',
-      icon: 'SubMenu icon',
+      container: 'data-testid SubMenu container',
+      icon: 'data-testid SubMenu icon',
     },
   },
   Panels: {
@@ -83,6 +164,7 @@ export const Components = {
         container: 'data-testid hover-header-container',
         dragIcon: 'data-testid drag-icon',
       },
+      PanelDataErrorMessage: 'data-testid Panel data error message',
     },
     Visualization: {
       Graph: {
@@ -106,7 +188,7 @@ export const Components = {
         valueV2: 'data-testid Bar gauge value',
       },
       PieChart: {
-        svgSlice: 'Pie Chart Slice',
+        svgSlice: 'data testid Pie Chart Slice',
       },
       Text: {
         container: () => '.markdown-html',
@@ -119,15 +201,21 @@ export const Components = {
     },
   },
   VizLegend: {
-    seriesName: (name: string) => `VizLegend series ${name}`,
+    seriesName: (name: string) => `data-testid VizLegend series ${name}`,
   },
   Drawer: {
     General: {
       title: (title: string) => `Drawer title ${title}`,
       expand: 'Drawer expand',
       contract: 'Drawer contract',
-      close: 'Drawer close',
+      close: 'data-testid Drawer close',
       rcContentWrapper: () => '.rc-drawer-content-wrapper',
+      subtitle: 'data-testid drawer subtitle',
+    },
+    DashboardSaveDrawer: {
+      saveButton: 'data-testid Save dashboard drawer button',
+      saveAsButton: 'data-testid Save as dashboard drawer button',
+      saveAsTitleInput: 'Save dashboard title field',
     },
   },
   PanelEditor: {
@@ -138,6 +226,7 @@ export const Components = {
       content: 'Panel editor option pane content',
       select: 'Panel editor option pane select',
       fieldLabel: (type: string) => `${type} field property editor`,
+      fieldInput: (title: string) => `data-testid Panel editor option pane field input ${title}`,
     },
     // not sure about the naming *DataPane*
     DataPane: {
@@ -194,6 +283,8 @@ export const Components = {
     queryInspectorButton: 'Query inspector button',
     queryHistoryButton: 'data-testid query-history-button',
     addQuery: 'data-testid query-tab-add-query',
+    queryGroupTopSection: 'data-testid query group top section',
+    addExpression: 'data-testid query-tab-add-expression',
   },
   QueryHistory: {
     queryText: 'Query text',
@@ -202,12 +293,17 @@ export const Components = {
     rows: 'Query editor row',
   },
   QueryEditorRow: {
-    actionButton: (title: string) => `${title}`,
+    actionButton: (title: string) => `data-testid ${title}`,
     title: (refId: string) => `Query editor row title ${refId}`,
     container: (refId: string) => `Query editor row ${refId}`,
   },
   AlertTab: {
-    content: 'Alert editor tab content',
+    content: 'data-testid Alert editor tab content',
+  },
+  AlertRules: {
+    groupToggle: 'data-testid group-collapse-toggle',
+    toggle: 'data-testid collapse-toggle',
+    expandedContent: 'data-testid expanded-content',
   },
   Alert: {
     /**
@@ -224,9 +320,10 @@ export const Components = {
   },
   Transforms: {
     card: (name: string) => `data-testid New transform ${name}`,
+    disableTransformationButton: 'data-testid Disable transformation button',
     Reduce: {
-      modeLabel: 'Transform mode label',
-      calculationsLabel: 'Transform calculations label',
+      modeLabel: 'data-testid Transform mode label',
+      calculationsLabel: 'data-testid Transform calculations label',
     },
     SpatialOperations: {
       actionLabel: 'root Action field property editor',
@@ -249,15 +346,17 @@ export const Components = {
         },
       },
     },
-    searchInput: 'search transformations',
+    searchInput: 'data-testid search transformations',
+    noTransformationsMessage: 'data-testid no transformations message',
     addTransformationButton: 'data-testid add transformation button',
+    removeAllTransformationsButton: 'data-testid remove all transformations button',
   },
   NavBar: {
     Configuration: {
       button: 'Configuration',
     },
     Toggle: {
-      button: 'Toggle menu',
+      button: 'data-testid Toggle menu',
     },
     Reporting: {
       button: 'Reporting',
@@ -269,7 +368,25 @@ export const Components = {
   },
   NavToolbar: {
     container: 'data-testid Nav toolbar',
+    shareDashboard: 'data-testid Share dashboard',
+    markAsFavorite: 'data-testid Mark as favorite',
+    editDashboard: {
+      editButton: 'data-testid Edit dashboard button',
+      saveButton: 'data-testid Save dashboard button',
+      exitButton: 'data-testid Exit edit mode button',
+      settingsButton: 'data-testid Dashboard settings',
+      addRowButton: 'data-testid Add row button',
+      addLibraryPanelButton: 'data-testid Add a panel from the panel library button',
+      addVisualizationButton: 'data-testid Add new visualization menu item',
+      pastePanelButton: 'data-testid Paste panel button',
+      discardChangesButton: 'data-testid Discard changes button',
+      discardLibraryPanelButton: 'data-testid Discard library panel button',
+      unlinkLibraryPanelButton: 'data-testid Unlink library panel button',
+      saveLibraryPanelButton: 'data-testid Save library panel button',
+      backToDashboardButton: 'data-testid Back to dashboard button',
+    },
   },
+
   PageToolbar: {
     container: () => '.page-toolbar',
     item: (tooltip: string) => `${tooltip}`,
@@ -279,7 +396,7 @@ export const Components = {
     button: (title: string) => `QueryEditor toolbar item button ${title}`,
   },
   BackButton: {
-    backArrow: 'Go Back',
+    backArrow: 'data-testid Go Back',
   },
   OptionsGroup: {
     group: (title?: string) => (title ? `Options group ${title}` : 'Options group'),
@@ -306,7 +423,7 @@ export const Components = {
      */
     container: 'Folder picker select container',
     containerV2: 'data-testid Folder picker select container',
-    input: 'Select a folder',
+    input: 'data-testid folder-picker-input',
   },
   ReadonlyFolderPicker: {
     container: 'data-testid Readonly folder picker select container',
@@ -318,6 +435,11 @@ export const Components = {
      */
     input: () => 'input[id="data-source-picker"]',
     inputV2: 'data-testid Select a data source',
+    dataSourceList: 'data-testid Data source list dropdown',
+    advancedModal: {
+      dataSourceList: 'data-testid Data source list',
+      builtInDataSourceList: 'data-testid Built in data source list',
+    },
   },
   TimeZonePicker: {
     /**
@@ -325,6 +447,7 @@ export const Components = {
      */
     container: 'Time zone picker select container',
     containerV2: 'data-testid Time zone picker select container',
+    changeTimeSettingsButton: 'data-testid Time zone picker Change time settings button',
   },
   WeekStartPicker: {
     /**
@@ -337,16 +460,16 @@ export const Components = {
   TraceViewer: {
     spanBar: 'data-testid SpanBar--wrapper',
   },
-  QueryField: { container: 'Query field' },
+  QueryField: { container: 'data-testid Query field' },
   QueryBuilder: {
-    queryPatterns: 'Query patterns',
-    labelSelect: 'Select label',
-    valueSelect: 'Select value',
-    matchOperatorSelect: 'Select match operator',
+    queryPatterns: 'data-testid Query patterns',
+    labelSelect: 'data-testid Select label',
+    valueSelect: 'data-testid Select value',
+    matchOperatorSelect: 'data-testid Select match operator',
   },
   ValuePicker: {
-    button: (name: string) => `Value picker button ${name}`,
-    select: (name: string) => `Value picker select ${name}`,
+    button: (name: string) => `data-testid Value picker button ${name}`,
+    select: (name: string) => `data-testid Value picker select ${name}`,
   },
   Search: {
     /**
@@ -374,7 +497,7 @@ export const Components = {
     link: 'data-testid Dashboard link',
   },
   LoadingIndicator: {
-    icon: 'Loading indicator',
+    icon: 'data-testid Loading indicator',
   },
   CallToActionCard: {
     /**
@@ -384,7 +507,7 @@ export const Components = {
     buttonV2: (name: string) => `data-testid Call to action button ${name}`,
   },
   DataLinksContextMenu: {
-    singleLink: 'Data link',
+    singleLink: 'data-testid Data link',
   },
   CodeEditor: {
     container: 'data-testid Code editor container',
@@ -398,7 +521,7 @@ export const Components = {
     submit: 'data-testid-import-dashboard-submit',
   },
   PanelAlertTabContent: {
-    content: 'Unified alert editor tab content',
+    content: 'data-testid Unified alert editor tab content',
   },
   VisualizationPreview: {
     card: (name: string) => `data-testid suggestion-${name}`,
@@ -414,6 +537,8 @@ export const Components = {
     preferencesSaveButton: 'data-testid-shared-prefs-save',
     orgsTable: 'data-testid-user-orgs-table',
     sessionsTable: 'data-testid-user-sessions-table',
+    extensionPointTabs: 'data-testid-extension-point-tabs',
+    extensionPointTab: (tabId: string) => `data-testid-extension-point-tab-${tabId}`,
   },
   FileUpload: {
     inputField: 'data-testid-file-upload-input-field',
@@ -434,8 +559,30 @@ export const Components = {
   Annotations: {
     annotationsTypeInput: 'annotations-type-input',
     annotationsChoosePanelInput: 'choose-panels-input',
+    editor: {
+      testButton: 'data-testid annotations-test-button',
+      resultContainer: 'data-testid annotations-query-result-container',
+    },
   },
   Tooltip: {
     container: 'data-testid tooltip',
   },
+  ReturnToPrevious: {
+    buttonGroup: 'data-testid dismissable button group',
+    backButton: 'data-testid back',
+    dismissButton: 'data-testid dismiss',
+  },
+  SQLQueryEditor: {
+    selectColumn: 'data-testid select-column',
+    selectAggregation: 'data-testid select-aggregation',
+    selectAlias: 'data-testid select-alias',
+    filterConjunction: 'data-testid filter-conjunction',
+    filterField: 'data-testid filter-field',
+    filterOperator: 'data-testid filter-operator',
+    headerTableSelector: 'data-testid header-table-selector',
+    headerFilterSwitch: 'data-testid header-filter-switch',
+    headerGroupSwitch: 'data-testid header-group-switch',
+    headerOrderSwitch: 'data-testid header-order-switch',
+    headerPreviewSwitch: 'data-testid header-preview-switch',
+  },
 };
diff --git a/packages/grafana-e2e-selectors/src/selectors/pages.ts b/packages/grafana-e2e-selectors/src/selectors/pages.ts
index 65d92211882de..c687b2033b4d5 100644
--- a/packages/grafana-e2e-selectors/src/selectors/pages.ts
+++ b/packages/grafana-e2e-selectors/src/selectors/pages.ts
@@ -8,20 +8,20 @@ import { Components } from './components';
 export const Pages = {
   Login: {
     url: '/login',
-    username: 'Username input field',
-    password: 'Password input field',
-    submit: 'Login button',
-    skip: 'Skip change password button',
+    username: 'data-testid Username input field',
+    password: 'data-testid Password input field',
+    submit: 'data-testid Login button',
+    skip: 'data-testid Skip change password button',
   },
   Home: {
     url: '/',
   },
   DataSource: {
-    name: 'Data source settings page name input field',
+    name: 'data-testid Data source settings page name input field',
     delete: 'Data source settings page Delete button',
-    readOnly: 'Data source settings page read only message',
+    readOnly: 'data-testid Data source settings page read only message',
     saveAndTest: 'data-testid Data source settings page Save and Test button',
-    alert: 'Data source settings page Alert',
+    alert: 'data-testid Data source settings page Alert',
   },
   DataSources: {
     url: '/datasources',
@@ -56,6 +56,13 @@ export const Pages = {
       nav: 'Dashboard navigation',
       navV2: 'data-testid Dashboard navigation',
       publicDashboardTag: 'data-testid public dashboard tag',
+      shareButton: 'data-testid share-button',
+      scrollContainer: 'data-testid Dashboard canvas scroll container',
+      playlistControls: {
+        prev: 'data-testid playlist previous dashboard button',
+        stop: 'data-testid playlist stop dashboard button',
+        next: 'data-testid playlist next dashboard button',
+      },
     },
     SubMenu: {
       submenu: 'Dashboard submenu',
@@ -94,6 +101,7 @@ export const Pages = {
            */
           addAnnotationCTA: Components.CallToActionCard.button('Add annotation query'),
           addAnnotationCTAV2: Components.CallToActionCard.buttonV2('Add annotation query'),
+          annotations: 'data-testid list-annotations',
         },
         Settings: {
           name: 'Annotations settings name input',
@@ -102,6 +110,10 @@ export const Pages = {
           panelFilterSelect: 'data-testid annotations-panel-filter',
           showInLabel: 'show-in-label',
           previewInDashboard: 'data-testid annotations-preview',
+          delete: 'data-testid annotations-delete',
+          apply: 'data-testid annotations-apply',
+          enable: 'data-testid annotation-enable',
+          hide: 'data-testid annotation-hide',
         },
       },
       Variables: {
@@ -136,23 +148,22 @@ export const Pages = {
             generalLabelInputV2: 'data-testid Variable editor Form Label field',
             generalHideSelect: 'Variable editor Form Hide select',
             generalHideSelectV2: 'data-testid Variable editor Form Hide select',
-            selectionOptionsMultiSwitch: 'Variable editor Form Multi switch',
-            selectionOptionsIncludeAllSwitch: 'Variable editor Form IncludeAll switch',
-            selectionOptionsCustomAllInput: 'Variable editor Form IncludeAll field',
-            selectionOptionsCustomAllInputV2: 'data-testid Variable editor Form IncludeAll field',
-            previewOfValuesOption: 'Variable editor Preview of Values option',
-            submitButton: 'Variable editor Submit button',
+            selectionOptionsMultiSwitch: 'data-testid Variable editor Form Multi switch',
+            selectionOptionsIncludeAllSwitch: 'data-testid Variable editor Form IncludeAll switch',
+            selectionOptionsCustomAllInput: 'data-testid Variable editor Form IncludeAll field',
+            previewOfValuesOption: 'data-testid Variable editor Preview of Values option',
+            submitButton: 'data-testid Variable editor Run Query button',
             applyButton: 'data-testid Variable editor Apply button',
           },
           QueryVariable: {
-            queryOptionsDataSourceSelect: Components.DataSourcePicker.container,
+            queryOptionsDataSourceSelect: Components.DataSourcePicker.inputV2,
             queryOptionsRefreshSelect: 'Variable editor Form Query Refresh select',
             queryOptionsRefreshSelectV2: 'data-testid Variable editor Form Query Refresh select',
             queryOptionsRegExInput: 'Variable editor Form Query RegEx field',
             queryOptionsRegExInputV2: 'data-testid Variable editor Form Query RegEx field',
             queryOptionsSortSelect: 'Variable editor Form Query Sort select',
             queryOptionsSortSelectV2: 'data-testid Variable editor Form Query Sort select',
-            queryOptionsQueryInput: 'Variable editor Form Default Variable Query Editor textarea',
+            queryOptionsQueryInput: 'data-testid Variable editor Form Default Variable Query Editor textarea',
             valueGroupsTagsEnabledSwitch: 'Variable editor Form Query UseTags switch',
             valueGroupsTagsTagsQueryInput: 'Variable editor Form Query TagsQuery field',
             valueGroupsTagsTagsValuesQueryInput: 'Variable editor Form Query TagsValuesQuery field',
@@ -173,6 +184,19 @@ export const Pages = {
           },
           IntervalVariable: {
             intervalsValueInput: 'data-testid interval variable intervals input',
+            autoEnabledCheckbox: 'data-testid interval variable auto value checkbox',
+            stepCountIntervalSelect: 'data-testid interval variable step count input',
+            minIntervalInput: 'data-testid interval variable mininum interval input',
+          },
+          GroupByVariable: {
+            dataSourceSelect: Components.DataSourcePicker.inputV2,
+            infoText: 'data-testid group by variable info text',
+            modeToggle: 'data-testid group by variable mode toggle',
+          },
+          AdHocFiltersVariable: {
+            datasourceSelect: Components.DataSourcePicker.inputV2,
+            infoText: 'data-testid ad-hoc filters variable info text',
+            modeToggle: 'data-testid ad-hoc filters variable mode toggle',
           },
         },
       },
@@ -203,12 +227,12 @@ export const Pages = {
     save: 'Dashboard settings Save Dashboard Modal Save button',
     saveVariables: 'Dashboard settings Save Dashboard Modal Save variables checkbox',
     saveTimerange: 'Dashboard settings Save Dashboard Modal Save timerange checkbox',
+    saveRefresh: 'Dashboard settings Save Dashboard Modal Save refresh checkbox',
   },
   SharePanelModal: {
     linkToRenderedImage: 'Link to rendered image',
   },
   ShareDashboardModal: {
-    shareButton: 'Share dashboard',
     PublicDashboard: {
       Tab: 'Tab Public dashboard',
       WillBePublicCheckbox: 'data-testid public dashboard will be public checkbox',
@@ -235,6 +259,9 @@ export const Pages = {
         ReshareLink: 'data-testid public dashboard reshare link button',
       },
     },
+    PublicDashboardScene: {
+      Tab: 'Tab Public Dashboard',
+    },
   },
   PublicDashboard: {
     page: 'public-dashboard-page',
@@ -243,6 +270,12 @@ export const Pages = {
       title: 'public-dashboard-title',
       pausedDescription: 'public-dashboard-paused-description',
     },
+    footer: 'public-dashboard-footer',
+  },
+  PublicDashboardScene: {
+    loadingPage: 'public-dashboard-scene-loading-page',
+    page: 'public-dashboard-scene-page',
+    controls: 'public-dashboard-controls',
   },
   RequestViewAccess: {
     form: 'request-view-access-form',
@@ -268,12 +301,12 @@ export const Pages = {
     page: 'Plugins list page',
     list: 'Plugins list',
     listItem: 'Plugins list item',
-    signatureErrorNotice: 'Unsigned plugins notice',
+    signatureErrorNotice: 'data-testid Unsigned plugins notice',
   },
   PluginPage: {
     page: 'Plugin page',
-    signatureInfo: 'Plugin signature info',
-    disabledInfo: 'Plugin disabled info',
+    signatureInfo: 'data-testid Plugin signature info',
+    disabledInfo: 'data-testid Plugin disabled info',
   },
   PlaylistForm: {
     name: 'Playlist name',
@@ -310,6 +343,7 @@ export const Pages = {
     tabs: {
       allUsers: 'data-testid all-users-tab',
       orgUsers: 'data-testid org-users-tab',
+      anonUserDevices: 'data-testid anon-user-devices-tab',
       publicDashboardsUsers: 'data-testid public-dashboards-users-tab',
       users: 'data-testid users-tab',
     },
@@ -328,6 +362,9 @@ export const Pages = {
     UsersListPage: {
       container: 'data-testid users-list-page',
     },
+    UserAnonListPage: {
+      container: 'data-testid user-anon-list-page',
+    },
     UsersListPublicDashboardsPage: {
       container: 'data-testid users-list-public-dashboards-page',
       DashboardsListModal: {
diff --git a/packages/grafana-e2e/README.md b/packages/grafana-e2e/README.md
index 48e8a28595600..a488db87725f7 100644
--- a/packages/grafana-e2e/README.md
+++ b/packages/grafana-e2e/README.md
@@ -1,5 +1,5 @@
 # Grafana End-to-End Test library
 
-> **@grafana/e2e is currently in BETA**.
-
-This package contains an API wrapper built on top of [Cypress](https://www.cypress.io) that simplifies creating end-to-end tests for Grafana. More information can be found [here](https://github.com/grafana/grafana/blob/main/contribute/style-guides/e2e.md).
+> [!CAUTION]
+> This package is deprecated.
+> If you'd like to write end-to-end tests for a Grafana plugin (core or external), use the [`@grafana/plugin-e2e`](https://grafana.com/developers/plugin-tools/e2e-test-a-plugin/introduction) package.
diff --git a/packages/grafana-e2e/cypress/fixtures/exemplars-query-response.json b/packages/grafana-e2e/cypress/fixtures/exemplars-query-response.json
index c90d2c8457e87..6c26a9fbf7d9d 100644
--- a/packages/grafana-e2e/cypress/fixtures/exemplars-query-response.json
+++ b/packages/grafana-e2e/cypress/fixtures/exemplars-query-response.json
@@ -23,50 +23,16 @@
           "data": {
             "values": [
               [
-                1633619595000,
-                1633619610000,
-                1633619625000,
-                1633619640000,
-                1633619655000,
-                1633619670000,
-                1633619685000,
-                1633619700000,
-                1633619715000,
-                1633619730000,
-                1633619745000,
-                1633619760000,
-                1633619775000,
-                1633619790000,
-                1633619805000,
-                1633619820000,
-                1633619835000,
-                1633619850000,
-                1633619865000,
-                1633619880000,
-                1633619895000
+                1633619595000, 1633619610000, 1633619625000, 1633619640000, 1633619655000, 1633619670000, 1633619685000,
+                1633619700000, 1633619715000, 1633619730000, 1633619745000, 1633619760000, 1633619775000, 1633619790000,
+                1633619805000, 1633619820000, 1633619835000, 1633619850000, 1633619865000, 1633619880000, 1633619895000
               ],
               [
-                0.07245212135073513,
-                0.07253198890830721,
-                0.07247862573797707,
-                0.07238248338231042,
-                0.07221687487740913,
-                0.07223291298743946,
-                0.07225427016727755,
-                0.024531677091864545,
-                0.02317081920915543,
-                0.07548902139580993,
-                0.0777721702857508,
-                0.07768649905047344,
-                0.07782257603228229,
-                0.07788810213200052,
-                0.07791835055437593,
-                0.07798387201529966,
-                0.07790826751849372,
-                0.07794858648610933,
-                0.07778729925797964,
-                0.07769657495236215,
-                0.077550401329267
+                0.07245212135073513, 0.07253198890830721, 0.07247862573797707, 0.07238248338231042, 0.07221687487740913,
+                0.07223291298743946, 0.07225427016727755, 0.024531677091864545, 0.02317081920915543,
+                0.07548902139580993, 0.0777721702857508, 0.07768649905047344, 0.07782257603228229, 0.07788810213200052,
+                0.07791835055437593, 0.07798387201529966, 0.07790826751849372, 0.07794858648610933, 0.07778729925797964,
+                0.07769657495236215, 0.077550401329267
               ]
             ]
           }
@@ -113,54 +79,15 @@
           "data": {
             "values": [
               [
-                1633619598000,
-                1633619622000,
-                1633619625000,
-                1633619646000,
-                1633619658000,
-                1633619682000,
-                1633619695000,
-                1633619712000,
-                1633619712000,
-                1633619724000,
-                1633619717000,
-                1633619742000,
-                1633619757000,
-                1633619771000,
-                1633619784000,
-                1633619801000,
-                1633619806000,
-                1633619833000,
-                1633619833000,
-                1633619845000,
-                1633619862000,
-                1633619877000,
-                1633619889000
+                1633619598000, 1633619622000, 1633619625000, 1633619646000, 1633619658000, 1633619682000, 1633619695000,
+                1633619712000, 1633619712000, 1633619724000, 1633619717000, 1633619742000, 1633619757000, 1633619771000,
+                1633619784000, 1633619801000, 1633619806000, 1633619833000, 1633619833000, 1633619845000, 1633619862000,
+                1633619877000, 1633619889000
               ],
               [
-                0.0146153,
-                0.0118506,
-                0.0473847,
-                0.026997,
-                0.0164318,
-                0.0113532,
-                0.0105197,
-                0.162789,
-                0.0556026,
-                0.148856,
-                0.0433809,
-                0.0117758,
-                0.0114496,
-                0.0114099,
-                0.0421927,
-                0.0134148,
-                0.0152827,
-                0.6975967,
-                0.0394788,
-                0.0137441,
-                0.0110939,
-                0.0104496,
-                0.0101284
+                0.0146153, 0.0118506, 0.0473847, 0.026997, 0.0164318, 0.0113532, 0.0105197, 0.162789, 0.0556026,
+                0.148856, 0.0433809, 0.0117758, 0.0114496, 0.0114099, 0.0421927, 0.0134148, 0.0152827, 0.6975967,
+                0.0394788, 0.0137441, 0.0110939, 0.0104496, 0.0101284
               ],
               [
                 "app:80",
diff --git a/packages/grafana-e2e/package.json b/packages/grafana-e2e/package.json
index 95aa26c950e4d..440847c560ff7 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": "10.3.0-pre",
+  "version": "11.0.0",
   "description": "Grafana End-to-End Test Library",
   "keywords": [
     "cli",
@@ -63,9 +63,9 @@
     "@babel/core": "7.23.2",
     "@babel/preset-env": "7.23.2",
     "@cypress/webpack-preprocessor": "5.17.1",
-    "@grafana/e2e-selectors": "10.3.0-pre",
-    "@grafana/schema": "10.3.0-pre",
-    "@grafana/tsconfig": "^1.2.0-rc1",
+    "@grafana/e2e-selectors": "11.0.0",
+    "@grafana/schema": "11.0.0",
+    "@grafana/tsconfig": "^1.3.0-rc1",
     "@mochajs/json-file-reporter": "^1.2.0",
     "babel-loader": "9.1.3",
     "blink-diff": "1.0.13",
@@ -82,7 +82,7 @@
     "tracelib": "1.0.1",
     "ts-loader": "8.4.0",
     "tslib": "2.6.0",
-    "typescript": "4.8.4",
+    "typescript": "5.2.2",
     "uuid": "9.0.0",
     "yaml": "^2.0.0"
   }
diff --git a/packages/grafana-e2e/src/support/types.ts b/packages/grafana-e2e/src/support/types.ts
index e44a978194c4e..60a275882ad72 100644
--- a/packages/grafana-e2e/src/support/types.ts
+++ b/packages/grafana-e2e/src/support/types.ts
@@ -14,14 +14,14 @@ export type E2EFunctionWithOnlyOptions = (options?: CypressOptions) => Cypress.C
 export type TypeSelectors<S> = S extends StringSelector
   ? E2EFunctionWithOnlyOptions
   : S extends FunctionSelector
-  ? E2EFunction
-  : S extends CssSelector
-  ? E2EFunction
-  : S extends UrlSelector
-  ? E2EVisit & Omit<E2EFunctions<S>, 'url'>
-  : S extends Record<any, any>
-  ? E2EFunctions<S>
-  : S;
+    ? E2EFunction
+    : S extends CssSelector
+      ? E2EFunction
+      : S extends UrlSelector
+        ? E2EVisit & Omit<E2EFunctions<S>, 'url'>
+        : S extends Record<any, any>
+          ? E2EFunctions<S>
+          : S;
 
 export type E2EFunctions<S extends Selectors> = {
   [P in keyof S]: TypeSelectors<S[P]>;
diff --git a/packages/grafana-eslint-rules/README.md b/packages/grafana-eslint-rules/README.md
index cf90384e326db..1bd800c979e25 100644
--- a/packages/grafana-eslint-rules/README.md
+++ b/packages/grafana-eslint-rules/README.md
@@ -1,6 +1,6 @@
 # Grafana ESLint Rules
 
-This package contains custom eslint rules for use within the Grafana codebase only. They're extremley specific to our codebase, and are of little use to anyone else. They're not published to NPM, and are consumed through the Yarn workspace.
+This package contains custom eslint rules for use within the Grafana codebase only. They're extremely specific to our codebase, and are of little use to anyone else. They're not published to NPM, and are consumed through the Yarn workspace.
 
 ## Rules
 
diff --git a/packages/grafana-eslint-rules/package.json b/packages/grafana-eslint-rules/package.json
index ecabd01befb5a..1f50e448df028 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": "10.3.0-pre",
+  "version": "11.0.0",
   "main": "./index.cjs",
   "author": "Grafana Labs",
   "license": "Apache-2.0",
@@ -11,12 +11,12 @@
     "directory": "packages/grafana-eslint-rules"
   },
   "dependencies": {
-    "@typescript-eslint/utils": "^5.46.1"
+    "@typescript-eslint/utils": "^6.0.0"
   },
   "devDependencies": {
-    "@typescript-eslint/types": "^5.46.1",
-    "eslint": "8.52.0",
-    "tslib": "2.6.0"
+    "@typescript-eslint/types": "^6.0.0",
+    "eslint": "8.57.0",
+    "tslib": "2.6.2"
   },
   "private": true
 }
diff --git a/packages/grafana-flamegraph/package.json b/packages/grafana-flamegraph/package.json
index 146f201e65573..cb53ea14c803c 100644
--- a/packages/grafana-flamegraph/package.json
+++ b/packages/grafana-flamegraph/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/flamegraph",
-  "version": "10.3.0-pre",
+  "version": "11.0.0",
   "description": "Grafana flamegraph visualization component",
   "keywords": [
     "grafana",
@@ -44,32 +44,32 @@
   ],
   "dependencies": {
     "@emotion/css": "11.11.2",
-    "@grafana/data": "10.3.0-pre",
-    "@grafana/ui": "10.3.0-pre",
-    "@leeoniya/ufuzzy": "1.0.8",
+    "@grafana/data": "11.0.0",
+    "@grafana/ui": "11.0.0",
+    "@leeoniya/ufuzzy": "1.0.14",
     "d3": "^7.8.5",
     "lodash": "4.17.21",
     "react": "18.2.0",
-    "react-use": "17.4.0",
-    "react-virtualized-auto-sizer": "1.0.7",
+    "react-use": "17.5.0",
+    "react-virtualized-auto-sizer": "1.0.24",
     "tinycolor2": "1.6.0",
-    "tslib": "2.6.0"
+    "tslib": "2.6.2"
   },
   "devDependencies": {
-    "@babel/core": "7.23.2",
-    "@babel/preset-env": "7.23.2",
-    "@babel/preset-react": "7.22.5",
-    "@grafana/tsconfig": "^1.2.0-rc1",
+    "@babel/core": "7.24.3",
+    "@babel/preset-env": "7.24.3",
+    "@babel/preset-react": "7.24.1",
+    "@grafana/tsconfig": "^1.3.0-rc1",
     "@rollup/plugin-node-resolve": "15.2.3",
     "@testing-library/jest-dom": "^6.1.2",
-    "@testing-library/react": "14.0.0",
-    "@testing-library/user-event": "14.5.1",
+    "@testing-library/react": "14.2.2",
+    "@testing-library/user-event": "14.5.2",
     "@types/d3": "^7",
     "@types/jest": "^29.5.4",
-    "@types/lodash": "4.14.195",
-    "@types/react": "18.2.15",
-    "@types/react-virtualized-auto-sizer": "1.0.1",
-    "@types/tinycolor2": "1.4.3",
+    "@types/lodash": "4.17.0",
+    "@types/react": "18.2.73",
+    "@types/react-virtualized-auto-sizer": "1.0.4",
+    "@types/tinycolor2": "1.4.6",
     "babel-jest": "29.7.0",
     "jest": "^29.6.4",
     "jest-canvas-mock": "2.5.2",
@@ -77,12 +77,12 @@
     "rollup-plugin-dts": "^5.0.0",
     "rollup-plugin-esbuild": "5.0.0",
     "rollup-plugin-node-externals": "^5.0.0",
-    "ts-jest": "29.1.1",
-    "ts-node": "10.9.1",
-    "typescript": "4.8.4"
+    "ts-jest": "29.1.2",
+    "ts-node": "10.9.2",
+    "typescript": "5.3.3"
   },
   "peerDependencies": {
-    "react": "^17.0.0 || ^18.0.0",
-    "react-dom": "^17.0.0 || ^18.0.0"
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
   }
 }
diff --git a/packages/grafana-flamegraph/src/FlameGraph/FlameGraph.test.tsx b/packages/grafana-flamegraph/src/FlameGraph/FlameGraph.test.tsx
index fc152e96b0087..90fdf831406af 100644
--- a/packages/grafana-flamegraph/src/FlameGraph/FlameGraph.test.tsx
+++ b/packages/grafana-flamegraph/src/FlameGraph/FlameGraph.test.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 
 import { createDataFrame } from '@grafana/data';
 
-import { ColorScheme } from '../types';
+import { ColorScheme, SelectedView } from '../types';
 
 import FlameGraph from './FlameGraph';
 import { FlameGraphDataContainer } from './dataTransform';
@@ -23,9 +23,9 @@ jest.mock('react-use', () => {
 });
 
 describe('FlameGraph', () => {
-  function setup() {
+  function setup(props?: Partial<React.ComponentProps<typeof FlameGraph>>) {
     const flameGraphData = createDataFrame(data);
-    const container = new FlameGraphDataContainer(flameGraphData);
+    const container = new FlameGraphDataContainer(flameGraphData, { collapsing: true });
 
     const setRangeMin = jest.fn();
     const setRangeMax = jest.fn();
@@ -39,7 +39,6 @@ describe('FlameGraph', () => {
         data={container}
         rangeMin={0}
         rangeMax={1}
-        search={''}
         setRangeMin={setRangeMin}
         setRangeMax={setRangeMax}
         onItemFocused={onItemFocused}
@@ -48,6 +47,9 @@ describe('FlameGraph', () => {
         onFocusPillClick={onFocusPillClick}
         onSandwichPillClick={onSandwichPillClick}
         colorScheme={ColorScheme.ValueBased}
+        selectedView={SelectedView.FlameGraph}
+        search={''}
+        {...props}
       />
     );
     return {
@@ -81,18 +83,31 @@ describe('FlameGraph', () => {
     expect(screen.getByText('16.5 Bil | 16.5 Bil samples (Count)')).toBeDefined();
   });
 
-  it('should render context menu', async () => {
+  it('should render context menu + extra items', async () => {
     const event = new MouseEvent('click', { bubbles: true });
     Object.defineProperty(event, 'offsetX', { get: () => 10 });
     Object.defineProperty(event, 'offsetY', { get: () => 10 });
     Object.defineProperty(HTMLCanvasElement.prototype, 'clientWidth', { configurable: true, value: 500 });
 
-    setup();
+    setup({
+      getExtraContextMenuButtons: (clickedItemData, data, state) => {
+        expect(clickedItemData).toMatchObject({ posX: 0, posY: 0, label: 'total' });
+        expect(data.length).toEqual(1101);
+        expect(state).toEqual({
+          selectedView: SelectedView.FlameGraph,
+          isDiff: false,
+          search: '',
+          collapseConfig: undefined,
+        });
+        return [{ label: 'test extra item', icon: 'eye', onClick: () => {} }];
+      },
+    });
     const canvas = screen.getByTestId('flameGraph') as HTMLCanvasElement;
     expect(canvas).toBeInTheDocument();
     expect(screen.queryByTestId('contextMenu')).not.toBeInTheDocument();
 
     fireEvent(canvas, event);
     expect(screen.getByTestId('contextMenu')).toBeInTheDocument();
+    expect(screen.getByText('test extra item')).toBeInTheDocument();
   });
 });
diff --git a/packages/grafana-flamegraph/src/FlameGraph/FlameGraph.tsx b/packages/grafana-flamegraph/src/FlameGraph/FlameGraph.tsx
index 928654c66d7d3..0a207cb94ea72 100644
--- a/packages/grafana-flamegraph/src/FlameGraph/FlameGraph.tsx
+++ b/packages/grafana-flamegraph/src/FlameGraph/FlameGraph.tsx
@@ -17,22 +17,23 @@
 // TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
 // THIS SOFTWARE.
 import { css, cx } from '@emotion/css';
-import React, { useMemo } from 'react';
+import React, { useEffect, useState } from 'react';
 
 import { Icon } from '@grafana/ui';
 
 import { PIXELS_PER_LEVEL } from '../constants';
-import { ClickedItemData, ColorScheme, ColorSchemeDiff, TextAlign } from '../types';
+import { ClickedItemData, ColorScheme, ColorSchemeDiff, SelectedView, TextAlign } from '../types';
 
 import FlameGraphCanvas from './FlameGraphCanvas';
+import { GetExtraContextMenuButtonsFunction } from './FlameGraphContextMenu';
 import FlameGraphMetadata from './FlameGraphMetadata';
-import { FlameGraphDataContainer } from './dataTransform';
+import { CollapsedMap, FlameGraphDataContainer, LevelItem } from './dataTransform';
 
 type Props = {
   data: FlameGraphDataContainer;
   rangeMin: number;
   rangeMax: number;
-  search: string;
+  matchedLabels?: Set<string>;
   setRangeMin: (range: number) => void;
   setRangeMax: (range: number) => void;
   style?: React.CSSProperties;
@@ -44,13 +45,18 @@ type Props = {
   onFocusPillClick: () => void;
   onSandwichPillClick: () => void;
   colorScheme: ColorScheme | ColorSchemeDiff;
+  showFlameGraphOnly?: boolean;
+  getExtraContextMenuButtons?: GetExtraContextMenuButtonsFunction;
+  collapsing?: boolean;
+  selectedView: SelectedView;
+  search: string;
 };
 
 const FlameGraph = ({
   data,
   rangeMin,
   rangeMax,
-  search,
+  matchedLabels,
   setRangeMin,
   setRangeMax,
   onItemFocused,
@@ -61,31 +67,55 @@ const FlameGraph = ({
   onFocusPillClick,
   onSandwichPillClick,
   colorScheme,
+  showFlameGraphOnly,
+  getExtraContextMenuButtons,
+  collapsing,
+  selectedView,
+  search,
 }: Props) => {
   const styles = getStyles();
 
-  const [levels, levelsCallers, totalProfileTicks, totalProfileTicksRight, totalViewTicks] = useMemo(() => {
-    let levels = data.getLevels();
-    let totalProfileTicks = levels.length ? levels[0][0].value : 0;
-    let totalProfileTicksRight = levels.length ? levels[0][0].valueRight : undefined;
-    let totalViewTicks = totalProfileTicks;
-    let levelsCallers = undefined;
-
-    if (sandwichItem) {
-      const [callers, callees] = data.getSandwichLevels(sandwichItem);
-      levels = callees;
-      levelsCallers = callers;
-      // We need this separate as in case of diff profile we want to compute diff colors based on the original ticks.
-      totalViewTicks = callees[0]?.[0]?.value ?? 0;
+  const [collapsedMap, setCollapsedMap] = useState<CollapsedMap>(new Map());
+  const [levels, setLevels] = useState<LevelItem[][]>();
+  const [levelsCallers, setLevelsCallers] = useState<LevelItem[][]>();
+  const [totalProfileTicks, setTotalProfileTicks] = useState<number>(0);
+  const [totalProfileTicksRight, setTotalProfileTicksRight] = useState<number>();
+  const [totalViewTicks, setTotalViewTicks] = useState<number>(0);
+
+  useEffect(() => {
+    if (data) {
+      setCollapsedMap(data.getCollapsedMap());
+
+      let levels = data.getLevels();
+      let totalProfileTicks = levels.length ? levels[0][0].value : 0;
+      let totalProfileTicksRight = levels.length ? levels[0][0].valueRight : undefined;
+      let totalViewTicks = totalProfileTicks;
+      let levelsCallers = undefined;
+
+      if (sandwichItem) {
+        const [callers, callees] = data.getSandwichLevels(sandwichItem);
+        levels = callees;
+        levelsCallers = callers;
+        // We need this separate as in case of diff profile we want to compute diff colors based on the original ticks.
+        totalViewTicks = callees[0]?.[0]?.value ?? 0;
+      }
+      setLevels(levels);
+      setLevelsCallers(levelsCallers);
+      setTotalProfileTicks(totalProfileTicks);
+      setTotalProfileTicksRight(totalProfileTicksRight);
+      setTotalViewTicks(totalViewTicks);
     }
-    return [levels, levelsCallers, totalProfileTicks, totalProfileTicksRight, totalViewTicks];
   }, [data, sandwichItem]);
 
+  if (!levels) {
+    return null;
+  }
+
   const commonCanvasProps = {
     data,
     rangeMin,
     rangeMax,
-    search,
+    matchedLabels,
     setRangeMin,
     setRangeMax,
     onItemFocused,
@@ -96,6 +126,13 @@ const FlameGraph = ({
     totalProfileTicks,
     totalProfileTicksRight,
     totalViewTicks,
+    showFlameGraphOnly,
+    collapsedMap,
+    setCollapsedMap,
+    getExtraContextMenuButtons,
+    collapsing,
+    search,
+    selectedView,
   };
   const canvas = levelsCallers ? (
     <>
@@ -109,6 +146,8 @@ const FlameGraph = ({
           root={levelsCallers[levelsCallers.length - 1][0]}
           depth={levelsCallers.length}
           direction={'parents'}
+          // We do not support collapsing in sandwich view for now.
+          collapsing={false}
         />
       </div>
 
@@ -117,7 +156,13 @@ const FlameGraph = ({
           <Icon className={styles.sandwichMarkerIcon} name={'arrow-up'} />
           Callees
         </div>
-        <FlameGraphCanvas {...commonCanvasProps} root={levels[0][0]} depth={levels.length} direction={'children'} />
+        <FlameGraphCanvas
+          {...commonCanvasProps}
+          root={levels[0][0]}
+          depth={levels.length}
+          direction={'children'}
+          collapsing={false}
+        />
       </div>
     </>
   ) : (
@@ -143,7 +188,6 @@ const getStyles = () => ({
   graph: css`
     label: graph;
     overflow: auto;
-    height: 100%;
     flex-grow: 1;
     flex-basis: 50%;
   `,
diff --git a/packages/grafana-flamegraph/src/FlameGraph/FlameGraphCanvas.test.tsx b/packages/grafana-flamegraph/src/FlameGraph/FlameGraphCanvas.test.tsx
new file mode 100644
index 0000000000000..17de2b8fdd54d
--- /dev/null
+++ b/packages/grafana-flamegraph/src/FlameGraph/FlameGraphCanvas.test.tsx
@@ -0,0 +1,40 @@
+import { convertPixelCoordinatesToBarCoordinates } from './FlameGraphCanvas';
+import { textToDataContainer } from './testHelpers';
+
+describe('convertPixelCoordinatesToBarCoordinates', () => {
+  const container = textToDataContainer(`
+      [0///////////]
+      [1][3//][4///]
+      [2]     [5///]
+              [6]
+    `)!;
+  const root = container.getLevels()[0][0];
+  const testPosFn = (pos: { x: number; y: number }) => {
+    return convertPixelCoordinatesToBarCoordinates(
+      pos,
+      root,
+      'children',
+      container.getLevels().length,
+      1,
+      14,
+      0,
+      container.getCollapsedMap()
+    )!;
+  };
+
+  it('returns correct item', () => {
+    expect(testPosFn({ x: 4, y: 23 })!.itemIndexes[0]).toEqual(3);
+  });
+
+  it('returns no item when pointing to collapsed item', () => {
+    expect(testPosFn({ x: 1, y: 45 })).toBeUndefined();
+  });
+
+  it('returns item when pointing to first collapsed item', () => {
+    expect(testPosFn({ x: 1, y: 23 })!.itemIndexes[0]).toEqual(1);
+  });
+
+  it('returns correct shifted item because of collapsing', () => {
+    expect(testPosFn({ x: 9, y: 45 })!.itemIndexes[0]).toEqual(6);
+  });
+});
diff --git a/packages/grafana-flamegraph/src/FlameGraph/FlameGraphCanvas.tsx b/packages/grafana-flamegraph/src/FlameGraph/FlameGraphCanvas.tsx
index cdea47c4cfe09..3d4f43a644e28 100644
--- a/packages/grafana-flamegraph/src/FlameGraph/FlameGraphCanvas.tsx
+++ b/packages/grafana-flamegraph/src/FlameGraph/FlameGraphCanvas.tsx
@@ -3,18 +3,18 @@ import React, { MouseEvent as ReactMouseEvent, useCallback, useEffect, useRef, u
 import { useMeasure } from 'react-use';
 
 import { PIXELS_PER_LEVEL } from '../constants';
-import { ClickedItemData, ColorScheme, ColorSchemeDiff, TextAlign } from '../types';
+import { ClickedItemData, ColorScheme, ColorSchemeDiff, SelectedView, TextAlign } from '../types';
 
-import FlameGraphContextMenu from './FlameGraphContextMenu';
+import FlameGraphContextMenu, { GetExtraContextMenuButtonsFunction } from './FlameGraphContextMenu';
 import FlameGraphTooltip from './FlameGraphTooltip';
-import { FlameGraphDataContainer, LevelItem } from './dataTransform';
+import { CollapseConfig, CollapsedMap, FlameGraphDataContainer, LevelItem } from './dataTransform';
 import { getBarX, useFlameRender } from './rendering';
 
 type Props = {
   data: FlameGraphDataContainer;
   rangeMin: number;
   rangeMax: number;
-  search: string;
+  matchedLabels: Set<string> | undefined;
   setRangeMin: (range: number) => void;
   setRangeMax: (range: number) => void;
   style?: React.CSSProperties;
@@ -32,13 +32,22 @@ type Props = {
   totalProfileTicks: number;
   totalProfileTicksRight?: number;
   totalViewTicks: number;
+  showFlameGraphOnly?: boolean;
+
+  collapsedMap: CollapsedMap;
+  setCollapsedMap: (collapsedMap: CollapsedMap) => void;
+  collapsing?: boolean;
+  getExtraContextMenuButtons?: GetExtraContextMenuButtonsFunction;
+
+  selectedView: SelectedView;
+  search: string;
 };
 
 const FlameGraphCanvas = ({
   data,
   rangeMin,
   rangeMax,
-  search,
+  matchedLabels,
   setRangeMin,
   setRangeMax,
   onItemFocused,
@@ -52,6 +61,13 @@ const FlameGraphCanvas = ({
   root,
   direction,
   depth,
+  showFlameGraphOnly,
+  collapsedMap,
+  setCollapsedMap,
+  collapsing,
+  getExtraContextMenuButtons,
+  selectedView,
+  search,
 }: Props) => {
   const styles = getStyles();
 
@@ -71,13 +87,14 @@ const FlameGraphCanvas = ({
     depth,
     rangeMax,
     rangeMin,
-    search,
+    matchedLabels,
     textAlign,
     totalViewTicks,
     // We need this so that if we have a diff profile and are in sandwich view we still show the same diff colors.
     totalColorTicks: data.isDiffFlamegraph() ? totalProfileTicks : totalViewTicks,
     totalTicksRight: totalProfileTicksRight,
     wrapperWidth,
+    collapsedMap,
   });
 
   const onGraphClick = useCallback(
@@ -91,7 +108,8 @@ const FlameGraphCanvas = ({
         depth,
         pixelsPerTick,
         totalViewTicks,
-        rangeMin
+        rangeMin,
+        collapsedMap
       );
 
       // if clicking on a block in the canvas
@@ -107,7 +125,7 @@ const FlameGraphCanvas = ({
         setClickedItemData(undefined);
       }
     },
-    [data, rangeMin, rangeMax, totalViewTicks, root, direction, depth]
+    [data, rangeMin, rangeMax, totalViewTicks, root, direction, depth, collapsedMap]
   );
 
   const [mousePosition, setMousePosition] = useState<{ x: number; y: number }>();
@@ -124,7 +142,8 @@ const FlameGraphCanvas = ({
           depth,
           pixelsPerTick,
           totalViewTicks,
-          rangeMin
+          rangeMin,
+          collapsedMap
         );
 
         if (item) {
@@ -133,7 +152,7 @@ const FlameGraphCanvas = ({
         }
       }
     },
-    [rangeMin, rangeMax, totalViewTicks, clickedItemData, setMousePosition, root, direction, depth]
+    [rangeMin, rangeMax, totalViewTicks, clickedItemData, setMousePosition, root, direction, depth, collapsedMap]
   );
 
   const onGraphMouseLeave = useCallback(() => {
@@ -165,10 +184,19 @@ const FlameGraphCanvas = ({
           onMouseLeave={onGraphMouseLeave}
         />
       </div>
-      <FlameGraphTooltip position={mousePosition} item={tooltipItem} data={data} totalTicks={totalViewTicks} />
-      {clickedItemData && (
+      <FlameGraphTooltip
+        position={mousePosition}
+        item={tooltipItem}
+        data={data}
+        totalTicks={totalViewTicks}
+        collapseConfig={tooltipItem ? collapsedMap.get(tooltipItem) : undefined}
+      />
+      {!showFlameGraphOnly && clickedItemData && (
         <FlameGraphContextMenu
+          data={data}
           itemData={clickedItemData}
+          collapsing={collapsing}
+          collapseConfig={collapsedMap.get(clickedItemData.item)}
           onMenuItemClick={() => {
             setClickedItemData(undefined);
           }}
@@ -180,17 +208,54 @@ const FlameGraphCanvas = ({
           onSandwich={() => {
             onSandwich(data.getLabel(clickedItemData.item.itemIndexes[0]));
           }}
+          onExpandGroup={() => {
+            setCollapsedMap(setCollapsedStatus(collapsedMap, clickedItemData.item, false));
+          }}
+          onCollapseGroup={() => {
+            setCollapsedMap(setCollapsedStatus(collapsedMap, clickedItemData.item, true));
+          }}
+          onExpandAllGroups={() => {
+            setCollapsedMap(setAllCollapsedStatus(collapsedMap, false));
+          }}
+          onCollapseAllGroups={() => {
+            setCollapsedMap(setAllCollapsedStatus(collapsedMap, true));
+          }}
+          allGroupsCollapsed={Array.from(collapsedMap.values()).every((i) => i.collapsed)}
+          allGroupsExpanded={Array.from(collapsedMap.values()).every((i) => !i.collapsed)}
+          getExtraContextMenuButtons={getExtraContextMenuButtons}
+          selectedView={selectedView}
+          search={search}
         />
       )}
     </div>
   );
 };
 
+function setCollapsedStatus(collapsedMap: CollapsedMap, item: LevelItem, collapsed: boolean) {
+  const newMap = new Map(collapsedMap);
+  const collapsedConfig = collapsedMap.get(item)!;
+  const newConfig = { ...collapsedConfig, collapsed };
+  for (const item of collapsedConfig.items) {
+    newMap.set(item, newConfig);
+  }
+  return newMap;
+}
+
+function setAllCollapsedStatus(collapsedMap: CollapsedMap, collapsed: boolean) {
+  const newMap = new Map(collapsedMap);
+  for (const item of collapsedMap.keys()) {
+    const collapsedConfig = collapsedMap.get(item)!;
+    const newConfig = { ...collapsedConfig, collapsed };
+    newMap.set(item, newConfig);
+  }
+
+  return newMap;
+}
+
 const getStyles = () => ({
   graph: css({
     label: 'graph',
     overflow: 'auto',
-    height: '100%',
     flexGrow: 1,
     flexBasis: '50%',
   }),
@@ -217,7 +282,7 @@ const getStyles = () => ({
   }),
 });
 
-const convertPixelCoordinatesToBarCoordinates = (
+export const convertPixelCoordinatesToBarCoordinates = (
   // position relative to the start of the graph
   pos: { x: number; y: number },
   root: LevelItem,
@@ -225,7 +290,8 @@ const convertPixelCoordinatesToBarCoordinates = (
   depth: number,
   pixelsPerTick: number,
   totalTicks: number,
-  rangeMin: number
+  rangeMin: number,
+  collapsedMap: Map<LevelItem, CollapseConfig>
 ): LevelItem | undefined => {
   let next: LevelItem | undefined = root;
   let currentLevel = direction === 'children' ? 0 : depth - 1;
@@ -247,7 +313,13 @@ const convertPixelCoordinatesToBarCoordinates = (
       const xEnd = getBarX(child.start + child.value, totalTicks, rangeMin, pixelsPerTick);
       if (xStart <= pos.x && pos.x < xEnd) {
         next = child;
-        currentLevel = currentLevel + (direction === 'children' ? 1 : -1);
+        // Check if item is a collapsed item. if so also check if the item is the first collapsed item in the chain,
+        // which we render, or a child which we don't render. If it's a child in the chain then don't increase the
+        // level end effectively skip it.
+        const collapsedConfig = collapsedMap.get(child);
+        if (!collapsedConfig || !collapsedConfig.collapsed || collapsedConfig.items[0] === child) {
+          currentLevel = currentLevel + (direction === 'children' ? 1 : -1);
+        }
         break;
       }
     }
diff --git a/packages/grafana-flamegraph/src/FlameGraph/FlameGraphContextMenu.tsx b/packages/grafana-flamegraph/src/FlameGraph/FlameGraphContextMenu.tsx
index b30d8fc18b952..c84d4810f420c 100644
--- a/packages/grafana-flamegraph/src/FlameGraph/FlameGraphContextMenu.tsx
+++ b/packages/grafana-flamegraph/src/FlameGraph/FlameGraphContextMenu.tsx
@@ -1,18 +1,69 @@
 import React from 'react';
 
-import { MenuItem, ContextMenu } from '@grafana/ui';
+import { DataFrame } from '@grafana/data';
+import { MenuItem, MenuGroup, ContextMenu, IconName } from '@grafana/ui';
 
-import { ClickedItemData } from '../types';
+import { ClickedItemData, SelectedView } from '../types';
+
+import { CollapseConfig, FlameGraphDataContainer } from './dataTransform';
+
+export type GetExtraContextMenuButtonsFunction = (
+  clickedItemData: ClickedItemData,
+  data: DataFrame,
+  state: { selectedView: SelectedView; isDiff: boolean; search: string; collapseConfig?: CollapseConfig }
+) => ExtraContextMenuButton[];
+
+export type ExtraContextMenuButton = {
+  label: string;
+  icon: IconName;
+  onClick: () => void;
+};
 
 type Props = {
+  data: FlameGraphDataContainer;
   itemData: ClickedItemData;
   onMenuItemClick: () => void;
   onItemFocus: () => void;
   onSandwich: () => void;
+  onExpandGroup: () => void;
+  onCollapseGroup: () => void;
+  onExpandAllGroups: () => void;
+  onCollapseAllGroups: () => void;
+  getExtraContextMenuButtons?: GetExtraContextMenuButtonsFunction;
+  collapseConfig?: CollapseConfig;
+  collapsing?: boolean;
+  allGroupsCollapsed?: boolean;
+  allGroupsExpanded?: boolean;
+  selectedView: SelectedView;
+  search: string;
 };
 
-const FlameGraphContextMenu = ({ itemData, onMenuItemClick, onItemFocus, onSandwich }: Props) => {
+const FlameGraphContextMenu = ({
+  data,
+  itemData,
+  onMenuItemClick,
+  onItemFocus,
+  onSandwich,
+  collapseConfig,
+  onExpandGroup,
+  onCollapseGroup,
+  onExpandAllGroups,
+  onCollapseAllGroups,
+  getExtraContextMenuButtons,
+  collapsing,
+  allGroupsExpanded,
+  allGroupsCollapsed,
+  selectedView,
+  search,
+}: Props) => {
   function renderItems() {
+    const extraButtons =
+      getExtraContextMenuButtons?.(itemData, data.data, {
+        selectedView,
+        isDiff: data.isDiffFlamegraph(),
+        search,
+        collapseConfig,
+      }) || [];
     return (
       <>
         <MenuItem
@@ -40,6 +91,54 @@ const FlameGraphContextMenu = ({ itemData, onMenuItemClick, onItemFocus, onSandw
             onMenuItemClick();
           }}
         />
+        {extraButtons.map(({ label, icon, onClick }) => {
+          return <MenuItem label={label} icon={icon} onClick={() => onClick()} key={label} />;
+        })}
+        {collapsing && (
+          <MenuGroup label={'Grouping'}>
+            {collapseConfig ? (
+              collapseConfig.collapsed ? (
+                <MenuItem
+                  label="Expand group"
+                  icon={'angle-double-down'}
+                  onClick={() => {
+                    onExpandGroup();
+                    onMenuItemClick();
+                  }}
+                />
+              ) : (
+                <MenuItem
+                  label="Collapse group"
+                  icon={'angle-double-up'}
+                  onClick={() => {
+                    onCollapseGroup();
+                    onMenuItemClick();
+                  }}
+                />
+              )
+            ) : null}
+            {!allGroupsExpanded && (
+              <MenuItem
+                label="Expand all groups"
+                icon={'angle-double-down'}
+                onClick={() => {
+                  onExpandAllGroups();
+                  onMenuItemClick();
+                }}
+              />
+            )}
+            {!allGroupsCollapsed && (
+              <MenuItem
+                label="Collapse all groups"
+                icon={'angle-double-up'}
+                onClick={() => {
+                  onCollapseAllGroups();
+                  onMenuItemClick();
+                }}
+              />
+            )}
+          </MenuGroup>
+        )}
       </>
     );
   }
diff --git a/packages/grafana-flamegraph/src/FlameGraph/FlameGraphTooltip.test.tsx b/packages/grafana-flamegraph/src/FlameGraph/FlameGraphTooltip.test.tsx
index 408398e757438..7ad62ca5f78e8 100644
--- a/packages/grafana-flamegraph/src/FlameGraph/FlameGraphTooltip.test.tsx
+++ b/packages/grafana-flamegraph/src/FlameGraph/FlameGraphTooltip.test.tsx
@@ -12,7 +12,7 @@ function setupData(unit?: string) {
       { name: 'label', values: ['total'] },
     ],
   });
-  return new FlameGraphDataContainer(flameGraphData);
+  return new FlameGraphDataContainer(flameGraphData, { collapsing: true });
 }
 
 function setupDiffData() {
@@ -26,7 +26,7 @@ function setupDiffData() {
       { name: 'label', values: ['total', 'func1'] },
     ],
   });
-  return new FlameGraphDataContainer(flameGraphData);
+  return new FlameGraphDataContainer(flameGraphData, { collapsing: true });
 }
 
 describe('FlameGraphTooltip', () => {
diff --git a/packages/grafana-flamegraph/src/FlameGraph/FlameGraphTooltip.tsx b/packages/grafana-flamegraph/src/FlameGraph/FlameGraphTooltip.tsx
index fe9d7dd131664..d2fe2866606dc 100644
--- a/packages/grafana-flamegraph/src/FlameGraph/FlameGraphTooltip.tsx
+++ b/packages/grafana-flamegraph/src/FlameGraph/FlameGraphTooltip.tsx
@@ -4,16 +4,17 @@ import React from 'react';
 import { DisplayValue, getValueFormat, GrafanaTheme2 } from '@grafana/data';
 import { InteractiveTable, Portal, useStyles2, VizTooltipContainer } from '@grafana/ui';
 
-import { FlameGraphDataContainer, LevelItem } from './dataTransform';
+import { CollapseConfig, FlameGraphDataContainer, LevelItem } from './dataTransform';
 
 type Props = {
   data: FlameGraphDataContainer;
   totalTicks: number;
   position?: { x: number; y: number };
   item?: LevelItem;
+  collapseConfig?: CollapseConfig;
 };
 
-const FlameGraphTooltip = ({ data, item, totalTicks, position }: Props) => {
+const FlameGraphTooltip = ({ data, item, totalTicks, position, collapseConfig }: Props) => {
   const styles = useStyles2(getStyles);
 
   if (!(item && position)) {
@@ -56,7 +57,17 @@ const FlameGraphTooltip = ({ data, item, totalTicks, position }: Props) => {
     <Portal>
       <VizTooltipContainer className={styles.tooltipContainer} position={position} offset={{ x: 15, y: 0 }}>
         <div className={styles.tooltipContent}>
-          <p className={styles.tooltipName}>{data.getLabel(item.itemIndexes[0])}</p>
+          <p className={styles.tooltipName}>
+            {data.getLabel(item.itemIndexes[0])}
+            {collapseConfig && collapseConfig.collapsed ? (
+              <span>
+                <br />
+                and {collapseConfig.items.length} similar items
+              </span>
+            ) : (
+              ''
+            )}
+          </p>
           {content}
         </div>
       </VizTooltipContainer>
diff --git a/packages/grafana-flamegraph/src/FlameGraph/__snapshots__/FlameGraph.test.tsx.snap b/packages/grafana-flamegraph/src/FlameGraph/__snapshots__/FlameGraph.test.tsx.snap
index df6151e9b3c33..4eb3098bad9bb 100644
--- a/packages/grafana-flamegraph/src/FlameGraph/__snapshots__/FlameGraph.test.tsx.snap
+++ b/packages/grafana-flamegraph/src/FlameGraph/__snapshots__/FlameGraph.test.tsx.snap
@@ -113,7 +113,7 @@ exports[`FlameGraph should render correctly 1`] = `
       "maxWidth": null,
       "text": "total (16.5 Bil)",
       "x": 4,
-      "y": 11,
+      "y": 13,
     },
     "transform": [
       1,
@@ -217,9 +217,9 @@ exports[`FlameGraph should render correctly 1`] = `
   {
     "props": {
       "maxWidth": null,
-      "text": "test/pkg/agent.(*Target).start.func1 (4.10 Bil)",
-      "x": 4,
-      "y": 33,
+      "text": "(2) test/pkg/agent.(*Target).start.func1 (4.10 Bil)",
+      "x": 10,
+      "y": 35,
     },
     "transform": [
       1,
@@ -233,6 +233,7 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
+      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -249,9 +250,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 397.5419198055893,
-            "x": 0.5,
-            "y": 44,
+            "width": 10,
+            "x": 0,
+            "y": 22,
           },
           "transform": [
             1,
@@ -273,7 +274,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "stroke",
+    "type": "fill",
   },
   {
     "props": {
@@ -293,10 +294,10 @@ exports[`FlameGraph should render correctly 1`] = `
         },
         {
           "props": {
-            "height": 22,
-            "width": 397.5419198055893,
-            "x": 0.5,
-            "y": 44,
+            "height": 11,
+            "width": 3,
+            "x": 4,
+            "y": 27.5,
           },
           "transform": [
             1,
@@ -320,23 +321,6 @@ exports[`FlameGraph should render correctly 1`] = `
     ],
     "type": "fill",
   },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "test/pkg/agent.(*Target).scrape (4.10 Bil)",
-      "x": 4,
-      "y": 55,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
   {
     "props": {
       "path": [
@@ -357,7 +341,7 @@ exports[`FlameGraph should render correctly 1`] = `
             "height": 22,
             "width": 355.74362089914945,
             "x": 0.5,
-            "y": 66,
+            "y": 44,
           },
           "transform": [
             1,
@@ -402,7 +386,7 @@ exports[`FlameGraph should render correctly 1`] = `
             "height": 22,
             "width": 355.74362089914945,
             "x": 0.5,
-            "y": 66,
+            "y": 44,
           },
           "transform": [
             1,
@@ -431,7 +415,7 @@ exports[`FlameGraph should render correctly 1`] = `
       "maxWidth": null,
       "text": "test/pkg/distributor.(*Distributor).Push (3.67 Bil)",
       "x": 4,
-      "y": 77,
+      "y": 57,
     },
     "transform": [
       1,
@@ -463,7 +447,7 @@ exports[`FlameGraph should render correctly 1`] = `
             "height": 22,
             "width": 108.84204131227219,
             "x": 0.5,
-            "y": 88,
+            "y": 66,
           },
           "transform": [
             1,
@@ -508,7 +492,7 @@ exports[`FlameGraph should render correctly 1`] = `
             "height": 22,
             "width": 108.84204131227219,
             "x": 0.5,
-            "y": 88,
+            "y": 66,
           },
           "transform": [
             1,
@@ -537,7 +521,7 @@ exports[`FlameGraph should render correctly 1`] = `
       "maxWidth": null,
       "text": "compress/gzip.(*Writer).Write (1.13 Bil)",
       "x": 4,
-      "y": 99,
+      "y": 79,
     },
     "transform": [
       1,
@@ -569,7 +553,7 @@ exports[`FlameGraph should render correctly 1`] = `
             "height": 22,
             "width": 102.03766707168894,
             "x": 0.5,
-            "y": 110,
+            "y": 88,
           },
           "transform": [
             1,
@@ -614,7 +598,7 @@ exports[`FlameGraph should render correctly 1`] = `
             "height": 22,
             "width": 102.03766707168894,
             "x": 0.5,
-            "y": 110,
+            "y": 88,
           },
           "transform": [
             1,
@@ -643,7 +627,7 @@ exports[`FlameGraph should render correctly 1`] = `
       "maxWidth": null,
       "text": "compress/flate.(*compressor).write (1.06 Bil)",
       "x": 4,
-      "y": 121,
+      "y": 101,
     },
     "transform": [
       1,
@@ -675,7 +659,7 @@ exports[`FlameGraph should render correctly 1`] = `
             "height": 22,
             "width": 98.1494532199271,
             "x": 0.5,
-            "y": 132,
+            "y": 110,
           },
           "transform": [
             1,
@@ -720,7 +704,7 @@ exports[`FlameGraph should render correctly 1`] = `
             "height": 22,
             "width": 98.1494532199271,
             "x": 0.5,
-            "y": 132,
+            "y": 110,
           },
           "transform": [
             1,
@@ -749,7 +733,7 @@ exports[`FlameGraph should render correctly 1`] = `
       "maxWidth": null,
       "text": "compress/flate.(*compressor).deflate (1.02 Bil)",
       "x": 4,
-      "y": 143,
+      "y": 123,
     },
     "transform": [
       1,
@@ -781,7 +765,7 @@ exports[`FlameGraph should render correctly 1`] = `
             "height": 22,
             "width": 13.580801944106927,
             "x": 0.5,
-            "y": 154,
+            "y": 132,
           },
           "transform": [
             1,
@@ -826,7 +810,7 @@ exports[`FlameGraph should render correctly 1`] = `
             "height": 22,
             "width": 13.580801944106927,
             "x": 0.5,
-            "y": 154,
+            "y": 132,
           },
           "transform": [
             1,
@@ -868,9 +852,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 13.580801944106927,
-            "x": 0.5,
-            "y": 176,
+            "width": 50.51883353584447,
+            "x": 15.080801944106927,
+            "y": 132,
           },
           "transform": [
             1,
@@ -913,9 +897,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 13.580801944106927,
-            "x": 0.5,
-            "y": 176,
+            "width": 50.51883353584447,
+            "x": 15.080801944106927,
+            "y": 132,
           },
           "transform": [
             1,
@@ -941,7 +925,23 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
+      "maxWidth": null,
+      "text": "compress/flate.(*compressor).findMatch (530 Mil)",
+      "x": 18.580801944106927,
+      "y": 145,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
+  {
+    "props": {
       "path": [
         {
           "props": {},
@@ -958,9 +958,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 4.860267314702309,
-            "x": 0,
-            "y": 198,
+            "width": 36.91008505467801,
+            "x": 110.34204131227219,
+            "y": 66,
           },
           "transform": [
             1,
@@ -982,7 +982,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -1003,9 +1003,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 2.9161603888213854,
-            "x": 0,
-            "y": 220,
+            "width": 36.91008505467801,
+            "x": 110.34204131227219,
+            "y": 66,
           },
           "transform": [
             1,
@@ -1029,6 +1029,23 @@ exports[`FlameGraph should render correctly 1`] = `
     ],
     "type": "fill",
   },
+  {
+    "props": {
+      "maxWidth": null,
+      "text": "(2) test/pkg/pprof.OpenRaw (390 Mil)",
+      "x": 119.84204131227219,
+      "y": 79,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
   {
     "props": {
       "fillRule": "nonzero",
@@ -1048,9 +1065,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 0,
-            "y": 242,
+            "width": 10,
+            "x": 109.84204131227219,
+            "y": 66,
           },
           "transform": [
             1,
@@ -1092,10 +1109,10 @@ exports[`FlameGraph should render correctly 1`] = `
         },
         {
           "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 0,
-            "y": 264,
+            "height": 11,
+            "width": 3,
+            "x": 113.84204131227219,
+            "y": 71.5,
           },
           "transform": [
             1,
@@ -1121,7 +1138,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -1138,9 +1154,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1.9441069258809236,
-            "y": 242,
+            "width": 16.496962332928312,
+            "x": 110.34204131227219,
+            "y": 88,
           },
           "transform": [
             1,
@@ -1162,7 +1178,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -1183,9 +1199,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1.9441069258809236,
-            "y": 264,
+            "width": 16.496962332928312,
+            "x": 110.34204131227219,
+            "y": 88,
           },
           "transform": [
             1,
@@ -1211,7 +1227,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -1228,9 +1243,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1.9441069258809236,
-            "y": 286,
+            "width": 9.69258809234508,
+            "x": 127.83900364520049,
+            "y": 88,
           },
           "transform": [
             1,
@@ -1252,7 +1267,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -1273,9 +1288,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1.9441069258809236,
-            "y": 308,
+            "width": 9.69258809234508,
+            "x": 127.83900364520049,
+            "y": 88,
           },
           "transform": [
             1,
@@ -1301,7 +1316,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -1318,9 +1332,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1.9441069258809236,
-            "y": 330,
+            "width": 19.413122721749698,
+            "x": 148.2521263669502,
+            "y": 66,
           },
           "transform": [
             1,
@@ -1342,7 +1356,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -1363,9 +1377,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1.9441069258809236,
-            "y": 352,
+            "width": 19.413122721749698,
+            "x": 148.2521263669502,
+            "y": 66,
           },
           "transform": [
             1,
@@ -1389,6 +1403,50 @@ exports[`FlameGraph should render correctly 1`] = `
     ],
     "type": "fill",
   },
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
+            1,
+            0,
+            0,
+            1,
+            0,
+            0,
+          ],
+          "type": "beginPath",
+        },
+        {
+          "props": {
+            "height": 22,
+            "width": 11.636695018226003,
+            "x": 148.2521263669502,
+            "y": 88,
+          },
+          "transform": [
+            1,
+            0,
+            0,
+            1,
+            0,
+            0,
+          ],
+          "type": "rect",
+        },
+      ],
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "stroke",
+  },
   {
     "props": {
       "fillRule": "nonzero",
@@ -1408,9 +1466,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 2.9161603888213854,
-            "y": 220,
+            "width": 11.636695018226003,
+            "x": 148.2521263669502,
+            "y": 88,
           },
           "transform": [
             1,
@@ -1434,6 +1492,50 @@ exports[`FlameGraph should render correctly 1`] = `
     ],
     "type": "fill",
   },
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
+            1,
+            0,
+            0,
+            1,
+            0,
+            0,
+          ],
+          "type": "beginPath",
+        },
+        {
+          "props": {
+            "height": 22,
+            "width": 177.85783718104497,
+            "x": 168.66524908869988,
+            "y": 66,
+          },
+          "transform": [
+            1,
+            0,
+            0,
+            1,
+            0,
+            0,
+          ],
+          "type": "rect",
+        },
+      ],
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "stroke",
+  },
   {
     "props": {
       "fillRule": "nonzero",
@@ -1453,9 +1555,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 2.9161603888213854,
-            "y": 242,
+            "width": 177.85783718104497,
+            "x": 168.66524908869988,
+            "y": 66,
           },
           "transform": [
             1,
@@ -1481,7 +1583,23 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
+      "maxWidth": null,
+      "text": "test/pkg/pprof.(*Profile).Normalize (1.84 Bil)",
+      "x": 172.16524908869988,
+      "y": 79,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
+  {
+    "props": {
       "path": [
         {
           "props": {},
@@ -1498,9 +1616,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 2.9161603888213854,
-            "y": 264,
+            "width": 22.329283110571083,
+            "x": 168.66524908869988,
+            "y": 88,
           },
           "transform": [
             1,
@@ -1522,7 +1640,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -1543,9 +1661,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 2.9161603888213854,
-            "y": 286,
+            "width": 22.329283110571083,
+            "x": 168.66524908869988,
+            "y": 88,
           },
           "transform": [
             1,
@@ -1569,6 +1687,23 @@ exports[`FlameGraph should render correctly 1`] = `
     ],
     "type": "fill",
   },
+  {
+    "props": {
+      "maxWidth": null,
+      "text": "(2) sort.Sort (240 Mil)",
+      "x": 178.16524908869988,
+      "y": 101,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
   {
     "props": {
       "fillRule": "nonzero",
@@ -1588,9 +1723,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 7.776427703523694,
-            "x": 4.860267314702309,
-            "y": 198,
+            "width": 10,
+            "x": 168.16524908869988,
+            "y": 88,
           },
           "transform": [
             1,
@@ -1632,10 +1767,10 @@ exports[`FlameGraph should render correctly 1`] = `
         },
         {
           "props": {
-            "height": 22,
-            "width": 3.888213851761847,
-            "x": 4.860267314702309,
-            "y": 220,
+            "height": 11,
+            "width": 3,
+            "x": 172.16524908869988,
+            "y": 93.5,
           },
           "transform": [
             1,
@@ -1661,7 +1796,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -1678,9 +1812,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 12.636695018226003,
-            "y": 198,
+            "width": 17.469015795868774,
+            "x": 173.5255164034022,
+            "y": 110,
           },
           "transform": [
             1,
@@ -1702,7 +1836,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -1723,9 +1857,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 13.608748481166465,
-            "y": 198,
+            "width": 17.469015795868774,
+            "x": 173.5255164034022,
+            "y": 110,
           },
           "transform": [
             1,
@@ -1767,9 +1901,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 50.51883353584447,
-            "x": 15.080801944106927,
-            "y": 154,
+            "width": 11.636695018226003,
+            "x": 173.5255164034022,
+            "y": 132,
           },
           "transform": [
             1,
@@ -1812,9 +1946,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 50.51883353584447,
-            "x": 15.080801944106927,
-            "y": 154,
+            "width": 11.636695018226003,
+            "x": 173.5255164034022,
+            "y": 132,
           },
           "transform": [
             1,
@@ -1840,10 +1974,37 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "maxWidth": null,
-      "text": "compress/flate.(*compressor).findMatch (530 Mil)",
-      "x": 18.580801944106927,
-      "y": 165,
+      "path": [
+        {
+          "props": {},
+          "transform": [
+            1,
+            0,
+            0,
+            1,
+            0,
+            0,
+          ],
+          "type": "beginPath",
+        },
+        {
+          "props": {
+            "height": 22,
+            "width": 128.2831105710814,
+            "x": 191.99453219927096,
+            "y": 88,
+          },
+          "transform": [
+            1,
+            0,
+            0,
+            1,
+            0,
+            0,
+          ],
+          "type": "rect",
+        },
+      ],
     },
     "transform": [
       1,
@@ -1853,7 +2014,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fillText",
+    "type": "stroke",
   },
   {
     "props": {
@@ -1874,9 +2035,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 7.776427703523694,
-            "x": 66.0996354799514,
-            "y": 154,
+            "width": 128.2831105710814,
+            "x": 191.99453219927096,
+            "y": 88,
           },
           "transform": [
             1,
@@ -1902,7 +2063,23 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
+      "maxWidth": null,
+      "text": "test/pkg/pprof.(*Profile).clearSampleReferences (1.33 Bil)",
+      "x": 195.49453219927096,
+      "y": 101,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
+  {
+    "props": {
       "path": [
         {
           "props": {},
@@ -1919,9 +2096,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 3.888213851761847,
-            "x": 99.1494532199271,
-            "y": 132,
+            "width": 124.39489671931958,
+            "x": 191.99453219927096,
+            "y": 110,
           },
           "transform": [
             1,
@@ -1943,7 +2120,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -1964,8 +2141,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 6.804374240583233,
-            "x": 103.03766707168894,
+            "width": 124.39489671931958,
+            "x": 191.99453219927096,
             "y": 110,
           },
           "transform": [
@@ -1992,7 +2169,23 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
+      "maxWidth": null,
+      "text": "test/pkg/slices.RemoveInPlace[...] (1.29 Bil)",
+      "x": 195.49453219927096,
+      "y": 123,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
+  {
+    "props": {
       "path": [
         {
           "props": {},
@@ -2009,8 +2202,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 4.860267314702309,
-            "x": 103.03766707168894,
+            "width": 30.105710814094778,
+            "x": 191.99453219927096,
             "y": 132,
           },
           "transform": [
@@ -2033,7 +2226,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -2054,9 +2247,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 4.860267314702309,
-            "x": 103.03766707168894,
-            "y": 154,
+            "width": 30.105710814094778,
+            "x": 191.99453219927096,
+            "y": 132,
           },
           "transform": [
             1,
@@ -2082,7 +2275,23 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
+      "maxWidth": null,
+      "text": "test/pkg/pprof.(*Profile).clearSampleReferences.func1 (320 Mil)",
+      "x": 195.49453219927096,
+      "y": 145,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
+  {
+    "props": {
       "path": [
         {
           "props": {},
@@ -2099,9 +2308,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 2.9161603888213854,
-            "x": 103.03766707168894,
-            "y": 176,
+            "width": 11.636695018226003,
+            "x": 321.2776427703524,
+            "y": 88,
           },
           "transform": [
             1,
@@ -2123,7 +2332,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -2144,9 +2353,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 105.95382746051034,
-            "y": 176,
+            "width": 11.636695018226003,
+            "x": 321.2776427703524,
+            "y": 88,
           },
           "transform": [
             1,
@@ -2172,7 +2381,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -2189,9 +2397,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 105.95382746051034,
-            "y": 198,
+            "width": 40.798298906439854,
+            "x": 357.24362089914945,
+            "y": 44,
           },
           "transform": [
             1,
@@ -2213,7 +2421,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -2234,9 +2442,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 105.95382746051034,
-            "y": 220,
+            "width": 40.798298906439854,
+            "x": 357.24362089914945,
+            "y": 44,
           },
           "transform": [
             1,
@@ -2260,6 +2468,23 @@ exports[`FlameGraph should render correctly 1`] = `
     ],
     "type": "fill",
   },
+  {
+    "props": {
+      "maxWidth": null,
+      "text": "(4) io/ioutil.ReadAll (430 Mil)",
+      "x": 366.74362089914945,
+      "y": 57,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
   {
     "props": {
       "fillRule": "nonzero",
@@ -2279,9 +2504,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 105.95382746051034,
-            "y": 242,
+            "width": 10,
+            "x": 356.74362089914945,
+            "y": 44,
           },
           "transform": [
             1,
@@ -2323,10 +2548,10 @@ exports[`FlameGraph should render correctly 1`] = `
         },
         {
           "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 105.95382746051034,
-            "y": 264,
+            "height": 11,
+            "width": 3,
+            "x": 360.74362089914945,
+            "y": 49.5,
           },
           "transform": [
             1,
@@ -2352,7 +2577,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -2369,9 +2593,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 105.95382746051034,
-            "y": 286,
+            "width": 34.96597812879708,
+            "x": 362.1038882138518,
+            "y": 66,
           },
           "transform": [
             1,
@@ -2393,7 +2617,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -2414,9 +2638,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 106.92588092345079,
-            "y": 176,
+            "width": 34.96597812879708,
+            "x": 362.1038882138518,
+            "y": 66,
           },
           "transform": [
             1,
@@ -2442,7 +2666,23 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
+      "maxWidth": null,
+      "text": "compress/flate.(*decompressor).huffmanBlock (370 Mil)",
+      "x": 365.6038882138518,
+      "y": 79,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
+  {
+    "props": {
       "path": [
         {
           "props": {},
@@ -2459,9 +2699,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 106.92588092345079,
-            "y": 198,
+            "width": 16.496962332928312,
+            "x": 364.0479951397327,
+            "y": 88,
           },
           "transform": [
             1,
@@ -2483,7 +2723,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -2504,9 +2744,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 106.92588092345079,
-            "y": 220,
+            "width": 16.496962332928312,
+            "x": 364.0479951397327,
+            "y": 88,
           },
           "transform": [
             1,
@@ -2532,7 +2772,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -2549,9 +2788,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 107.89793438639126,
-            "y": 132,
+            "width": 546.26609963548,
+            "x": 399.0419198055893,
+            "y": 22,
           },
           "transform": [
             1,
@@ -2573,7 +2812,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -2594,9 +2833,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 107.89793438639126,
-            "y": 154,
+            "width": 546.26609963548,
+            "x": 399.0419198055893,
+            "y": 22,
           },
           "transform": [
             1,
@@ -2622,7 +2861,23 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
+      "maxWidth": null,
+      "text": "net/http.(*conn).serve (5.63 Bil)",
+      "x": 402.5419198055893,
+      "y": 35,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
+  {
+    "props": {
       "path": [
         {
           "props": {},
@@ -2639,9 +2894,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 107.89793438639126,
-            "y": 176,
+            "width": 541.4058323207777,
+            "x": 399.0419198055893,
+            "y": 44,
           },
           "transform": [
             1,
@@ -2663,7 +2918,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -2684,9 +2939,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 107.89793438639126,
-            "y": 198,
+            "width": 541.4058323207777,
+            "x": 399.0419198055893,
+            "y": 44,
           },
           "transform": [
             1,
@@ -2710,6 +2965,23 @@ exports[`FlameGraph should render correctly 1`] = `
     ],
     "type": "fill",
   },
+  {
+    "props": {
+      "maxWidth": null,
+      "text": "(8) net/http.serverHandler.ServeHTTP (5.58 Bil)",
+      "x": 408.5419198055893,
+      "y": 57,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
   {
     "props": {
       "fillRule": "nonzero",
@@ -2729,9 +3001,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 107.89793438639126,
-            "y": 220,
+            "width": 10,
+            "x": 398.5419198055893,
+            "y": 44,
           },
           "transform": [
             1,
@@ -2773,10 +3045,10 @@ exports[`FlameGraph should render correctly 1`] = `
         },
         {
           "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 107.89793438639126,
-            "y": 242,
+            "height": 11,
+            "width": 3,
+            "x": 402.5419198055893,
+            "y": 49.5,
           },
           "transform": [
             1,
@@ -2802,7 +3074,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -2819,9 +3090,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 107.89793438639126,
-            "y": 264,
+            "width": 537.5176184690158,
+            "x": 399.0419198055893,
+            "y": 66,
           },
           "transform": [
             1,
@@ -2843,7 +3114,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -2864,9 +3135,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 107.89793438639126,
-            "y": 286,
+            "width": 537.5176184690158,
+            "x": 399.0419198055893,
+            "y": 66,
           },
           "transform": [
             1,
@@ -2890,6 +3161,23 @@ exports[`FlameGraph should render correctly 1`] = `
     ],
     "type": "fill",
   },
+  {
+    "props": {
+      "maxWidth": null,
+      "text": "(2) net/http.HandlerFunc.ServeHTTP (5.54 Bil)",
+      "x": 408.5419198055893,
+      "y": 79,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
   {
     "props": {
       "fillRule": "nonzero",
@@ -2909,9 +3197,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 107.89793438639126,
-            "y": 308,
+            "width": 10,
+            "x": 398.5419198055893,
+            "y": 66,
           },
           "transform": [
             1,
@@ -2953,10 +3241,10 @@ exports[`FlameGraph should render correctly 1`] = `
         },
         {
           "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 107.89793438639126,
-            "y": 330,
+            "height": 11,
+            "width": 3,
+            "x": 402.5419198055893,
+            "y": 71.5,
           },
           "transform": [
             1,
@@ -2998,8 +3286,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 36.91008505467801,
-            "x": 110.34204131227219,
+            "width": 536.5455650060753,
+            "x": 399.0419198055893,
             "y": 88,
           },
           "transform": [
@@ -3043,8 +3331,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 36.91008505467801,
-            "x": 110.34204131227219,
+            "width": 536.5455650060753,
+            "x": 399.0419198055893,
             "y": 88,
           },
           "transform": [
@@ -3072,9 +3360,9 @@ exports[`FlameGraph should render correctly 1`] = `
   {
     "props": {
       "maxWidth": null,
-      "text": "test/pkg/pprof.OpenRaw (390 Mil)",
-      "x": 113.84204131227219,
-      "y": 99,
+      "text": "net/http.HandlerFunc.ServeHTTP (5.53 Bil)",
+      "x": 402.5419198055893,
+      "y": 101,
     },
     "transform": [
       1,
@@ -3104,8 +3392,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 36.91008505467801,
-            "x": 110.34204131227219,
+            "width": 534.6014580801944,
+            "x": 399.0419198055893,
             "y": 110,
           },
           "transform": [
@@ -3149,8 +3437,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 36.91008505467801,
-            "x": 110.34204131227219,
+            "width": 534.6014580801944,
+            "x": 399.0419198055893,
             "y": 110,
           },
           "transform": [
@@ -3178,9 +3466,9 @@ exports[`FlameGraph should render correctly 1`] = `
   {
     "props": {
       "maxWidth": null,
-      "text": "test/pkg/gen/google/v1.(*Profile).UnmarshalVT (390 Mil)",
-      "x": 113.84204131227219,
-      "y": 121,
+      "text": "github.com/weaveworks/common/middleware.Instrument.Wrap.func1 (5.51 Bil)",
+      "x": 402.5419198055893,
+      "y": 123,
     },
     "transform": [
       1,
@@ -3210,8 +3498,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 16.496962332928312,
-            "x": 110.34204131227219,
+            "width": 533.629404617254,
+            "x": 399.0419198055893,
             "y": 132,
           },
           "transform": [
@@ -3255,8 +3543,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 16.496962332928312,
-            "x": 110.34204131227219,
+            "width": 533.629404617254,
+            "x": 399.0419198055893,
             "y": 132,
           },
           "transform": [
@@ -3281,6 +3569,67 @@ exports[`FlameGraph should render correctly 1`] = `
     ],
     "type": "fill",
   },
+  {
+    "props": {
+      "maxWidth": null,
+      "text": "github.com/felixge/httpsnoop.(*Metrics).CaptureMetrics (5.50 Bil)",
+      "x": 402.5419198055893,
+      "y": 145,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
+            1,
+            0,
+            0,
+            1,
+            0,
+            0,
+          ],
+          "type": "beginPath",
+        },
+        {
+          "props": {
+            "height": 22,
+            "width": 532.6573511543135,
+            "x": 399.0419198055893,
+            "y": 154,
+          },
+          "transform": [
+            1,
+            0,
+            0,
+            1,
+            0,
+            0,
+          ],
+          "type": "rect",
+        },
+      ],
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "stroke",
+  },
   {
     "props": {
       "fillRule": "nonzero",
@@ -3300,8 +3649,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 6.804374240583233,
-            "x": 109.84204131227219,
+            "width": 532.6573511543135,
+            "x": 399.0419198055893,
             "y": 154,
           },
           "transform": [
@@ -3326,6 +3675,23 @@ exports[`FlameGraph should render correctly 1`] = `
     ],
     "type": "fill",
   },
+  {
+    "props": {
+      "maxWidth": null,
+      "text": "(2) github.com/weaveworks/common/middleware.Instrument.Wrap.func1.2 (5.49 Bil)",
+      "x": 408.5419198055893,
+      "y": 167,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
   {
     "props": {
       "fillRule": "nonzero",
@@ -3345,9 +3711,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 4.860267314702309,
-            "x": 109.84204131227219,
-            "y": 176,
+            "width": 10,
+            "x": 398.5419198055893,
+            "y": 154,
           },
           "transform": [
             1,
@@ -3389,10 +3755,10 @@ exports[`FlameGraph should render correctly 1`] = `
         },
         {
           "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 109.84204131227219,
-            "y": 198,
+            "height": 11,
+            "width": 3,
+            "x": 402.5419198055893,
+            "y": 159.5,
           },
           "transform": [
             1,
@@ -3418,7 +3784,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -3435,9 +3800,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 110.81409477521264,
-            "y": 198,
+            "width": 155.50060753341435,
+            "x": 399.0419198055893,
+            "y": 176,
           },
           "transform": [
             1,
@@ -3459,7 +3824,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -3480,9 +3845,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 110.81409477521264,
-            "y": 220,
+            "width": 155.50060753341435,
+            "x": 399.0419198055893,
+            "y": 176,
           },
           "transform": [
             1,
@@ -3506,6 +3871,23 @@ exports[`FlameGraph should render correctly 1`] = `
     ],
     "type": "fill",
   },
+  {
+    "props": {
+      "maxWidth": null,
+      "text": "(2) github.com/bufbuild/connect-go.(*Handler).ServeHTTP (1.61 Bil)",
+      "x": 408.5419198055893,
+      "y": 189,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
   {
     "props": {
       "fillRule": "nonzero",
@@ -3525,9 +3907,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 110.81409477521264,
-            "y": 242,
+            "width": 10,
+            "x": 398.5419198055893,
+            "y": 176,
           },
           "transform": [
             1,
@@ -3569,10 +3951,10 @@ exports[`FlameGraph should render correctly 1`] = `
         },
         {
           "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 110.81409477521264,
-            "y": 264,
+            "height": 11,
+            "width": 3,
+            "x": 402.5419198055893,
+            "y": 181.5,
           },
           "transform": [
             1,
@@ -3598,7 +3980,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -3615,9 +3996,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 111.7861482381531,
-            "y": 242,
+            "width": 148.69623329283112,
+            "x": 399.0419198055893,
+            "y": 198,
           },
           "transform": [
             1,
@@ -3639,7 +4020,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -3660,9 +4041,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 111.7861482381531,
-            "y": 264,
+            "width": 148.69623329283112,
+            "x": 399.0419198055893,
+            "y": 198,
           },
           "transform": [
             1,
@@ -3686,6 +4067,23 @@ exports[`FlameGraph should render correctly 1`] = `
     ],
     "type": "fill",
   },
+  {
+    "props": {
+      "maxWidth": null,
+      "text": "(2) github.com/bufbuild/connect-go.NewUnaryHandler[...].func1.1 (1.54 Bil)",
+      "x": 408.5419198055893,
+      "y": 211,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
   {
     "props": {
       "fillRule": "nonzero",
@@ -3705,9 +4103,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 111.7861482381531,
-            "y": 286,
+            "width": 10,
+            "x": 398.5419198055893,
+            "y": 198,
           },
           "transform": [
             1,
@@ -3749,10 +4147,10 @@ exports[`FlameGraph should render correctly 1`] = `
         },
         {
           "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 114.70230862697449,
-            "y": 176,
+            "height": 11,
+            "width": 3,
+            "x": 402.5419198055893,
+            "y": 203.5,
           },
           "transform": [
             1,
@@ -3778,7 +4176,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -3795,9 +4192,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 115.67436208991495,
-            "y": 176,
+            "width": 17.469015795868774,
+            "x": 399.0419198055893,
+            "y": 220,
           },
           "transform": [
             1,
@@ -3819,7 +4216,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -3840,9 +4237,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 116.64641555285542,
-            "y": 154,
+            "width": 17.469015795868774,
+            "x": 399.0419198055893,
+            "y": 220,
           },
           "transform": [
             1,
@@ -3868,7 +4265,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -3885,9 +4281,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 116.64641555285542,
-            "y": 176,
+            "width": 15.52490886998785,
+            "x": 399.0419198055893,
+            "y": 242,
           },
           "transform": [
             1,
@@ -3909,7 +4305,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -3930,9 +4326,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 117.61846901579588,
-            "y": 176,
+            "width": 15.52490886998785,
+            "x": 399.0419198055893,
+            "y": 242,
           },
           "transform": [
             1,
@@ -3956,6 +4352,50 @@ exports[`FlameGraph should render correctly 1`] = `
     ],
     "type": "fill",
   },
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
+            1,
+            0,
+            0,
+            1,
+            0,
+            0,
+          ],
+          "type": "beginPath",
+        },
+        {
+          "props": {
+            "height": 22,
+            "width": 10.664641555285542,
+            "x": 401.95808019441074,
+            "y": 264,
+          },
+          "transform": [
+            1,
+            0,
+            0,
+            1,
+            0,
+            0,
+          ],
+          "type": "rect",
+        },
+      ],
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "stroke",
+  },
   {
     "props": {
       "fillRule": "nonzero",
@@ -3975,9 +4415,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 118.59052247873633,
-            "y": 154,
+            "width": 10.664641555285542,
+            "x": 401.95808019441074,
+            "y": 264,
           },
           "transform": [
             1,
@@ -4019,9 +4459,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 9.69258809234508,
-            "x": 127.83900364520049,
-            "y": 132,
+            "width": 81.62454434993926,
+            "x": 417.51093560145813,
+            "y": 220,
           },
           "transform": [
             1,
@@ -4064,9 +4504,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 9.69258809234508,
-            "x": 127.83900364520049,
-            "y": 132,
+            "width": 81.62454434993926,
+            "x": 417.51093560145813,
+            "y": 220,
           },
           "transform": [
             1,
@@ -4092,7 +4532,23 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
+      "maxWidth": null,
+      "text": "test/pkg/create.(*Head).Ingest (850 Mil)",
+      "x": 421.01093560145813,
+      "y": 233,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
+  {
+    "props": {
       "path": [
         {
           "props": {},
@@ -4109,9 +4565,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 7.776427703523694,
-            "x": 127.33900364520049,
-            "y": 154,
+            "width": 33.02187120291616,
+            "x": 417.51093560145813,
+            "y": 242,
           },
           "transform": [
             1,
@@ -4133,7 +4589,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -4154,9 +4610,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 5.832320777642771,
-            "x": 127.33900364520049,
-            "y": 176,
+            "width": 33.02187120291616,
+            "x": 417.51093560145813,
+            "y": 242,
           },
           "transform": [
             1,
@@ -4182,7 +4638,23 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
+      "maxWidth": null,
+      "text": "test/pkg/create.(*Head).convertSamples (350 Mil)",
+      "x": 421.01093560145813,
+      "y": 255,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
+  {
+    "props": {
       "path": [
         {
           "props": {},
@@ -4199,9 +4671,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 127.33900364520049,
-            "y": 198,
+            "width": 28.161603888213854,
+            "x": 417.51093560145813,
+            "y": 264,
           },
           "transform": [
             1,
@@ -4223,7 +4695,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -4244,9 +4716,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 128.31105710814094,
-            "y": 198,
+            "width": 28.161603888213854,
+            "x": 417.51093560145813,
+            "y": 264,
           },
           "transform": [
             1,
@@ -4272,7 +4744,23 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
+      "maxWidth": null,
+      "text": "test/pkg/create.(*deduplicatingSlice[...]).ingest (300 Mil)",
+      "x": 421.01093560145813,
+      "y": 277,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
+  {
+    "props": {
       "path": [
         {
           "props": {},
@@ -4289,9 +4777,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 128.31105710814094,
-            "y": 220,
+            "width": 10.664641555285542,
+            "x": 417.51093560145813,
+            "y": 286,
           },
           "transform": [
             1,
@@ -4313,97 +4801,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 128.31105710814094,
-            "y": 242,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 128.31105710814094,
-            "y": 264,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -4424,8 +4822,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 128.31105710814094,
+            "width": 10.664641555285542,
+            "x": 417.51093560145813,
             "y": 286,
           },
           "transform": [
@@ -4452,7 +4850,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -4469,8 +4866,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 128.31105710814094,
+            "width": 9.69258809234508,
+            "x": 417.51093560145813,
             "y": 308,
           },
           "transform": [
@@ -4493,7 +4890,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -4514,9 +4911,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 128.31105710814094,
-            "y": 330,
+            "width": 9.69258809234508,
+            "x": 417.51093560145813,
+            "y": 308,
           },
           "transform": [
             1,
@@ -4542,7 +4939,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -4559,9 +4955,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 128.31105710814094,
-            "y": 352,
+            "width": 34.96597812879708,
+            "x": 451.5328068043743,
+            "y": 242,
           },
           "transform": [
             1,
@@ -4583,7 +4979,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -4604,9 +5000,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 128.31105710814094,
-            "y": 374,
+            "width": 34.96597812879708,
+            "x": 451.5328068043743,
+            "y": 242,
           },
           "transform": [
             1,
@@ -4632,38 +5028,10 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 128.31105710814094,
-            "y": 396,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
+      "maxWidth": null,
+      "text": "test/pkg/create.(*deduplicatingSlice[...]).ingest (370 Mil)",
+      "x": 455.0328068043743,
+      "y": 255,
     },
     "transform": [
       1,
@@ -4673,11 +5041,10 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "fillText",
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -4694,9 +5061,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 130.25516403402187,
-            "y": 198,
+            "width": 9.69258809234508,
+            "x": 488.4708383961118,
+            "y": 242,
           },
           "transform": [
             1,
@@ -4718,7 +5085,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -4739,9 +5106,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 133.17132442284327,
-            "y": 176,
+            "width": 9.69258809234508,
+            "x": 488.4708383961118,
+            "y": 242,
           },
           "transform": [
             1,
@@ -4767,7 +5134,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -4784,9 +5150,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 134.14337788578374,
-            "y": 176,
+            "width": 45.658566221142166,
+            "x": 500.1354799513974,
+            "y": 220,
           },
           "transform": [
             1,
@@ -4808,7 +5174,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -4829,9 +5195,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 2.9161603888213854,
-            "x": 135.1154313487242,
-            "y": 154,
+            "width": 45.658566221142166,
+            "x": 500.1354799513974,
+            "y": 220,
           },
           "transform": [
             1,
@@ -4857,38 +5223,10 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 135.1154313487242,
-            "y": 176,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
+      "maxWidth": null,
+      "text": "test/pkg/gen/google/v1.(*Profile).UnmarshalVT (480 Mil)",
+      "x": 503.6354799513974,
+      "y": 233,
     },
     "transform": [
       1,
@@ -4898,11 +5236,10 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "fillText",
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -4919,9 +5256,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 3.888213851761847,
-            "x": 138.03159173754557,
-            "y": 132,
+            "width": 13.580801944106927,
+            "x": 500.1354799513974,
+            "y": 242,
           },
           "transform": [
             1,
@@ -4943,7 +5280,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -4964,9 +5301,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 2.9161603888213854,
-            "x": 138.03159173754557,
-            "y": 154,
+            "width": 13.580801944106927,
+            "x": 500.1354799513974,
+            "y": 242,
           },
           "transform": [
             1,
@@ -4992,7 +5329,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -5009,9 +5345,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 138.03159173754557,
-            "y": 176,
+            "width": 11.636695018226003,
+            "x": 501.1075334143378,
+            "y": 264,
           },
           "transform": [
             1,
@@ -5033,7 +5369,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -5054,9 +5390,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 139.9756986634265,
-            "y": 176,
+            "width": 11.636695018226003,
+            "x": 501.1075334143378,
+            "y": 264,
           },
           "transform": [
             1,
@@ -5082,7 +5418,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -5099,9 +5434,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 140.94775212636696,
-            "y": 154,
+            "width": 12.608748481166465,
+            "x": 514.7162818955043,
+            "y": 242,
           },
           "transform": [
             1,
@@ -5123,7 +5458,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -5144,9 +5479,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 3.888213851761847,
-            "x": 141.91980558930743,
-            "y": 132,
+            "width": 12.608748481166465,
+            "x": 514.7162818955043,
+            "y": 242,
           },
           "transform": [
             1,
@@ -5170,6 +5505,50 @@ exports[`FlameGraph should render correctly 1`] = `
     ],
     "type": "fill",
   },
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
+            1,
+            0,
+            0,
+            1,
+            0,
+            0,
+          ],
+          "type": "beginPath",
+        },
+        {
+          "props": {
+            "height": 22,
+            "width": 10.664641555285542,
+            "x": 528.3250303766707,
+            "y": 242,
+          },
+          "transform": [
+            1,
+            0,
+            0,
+            1,
+            0,
+            0,
+          ],
+          "type": "rect",
+        },
+      ],
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "stroke",
+  },
   {
     "props": {
       "fillRule": "nonzero",
@@ -5189,9 +5568,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 3.888213851761847,
-            "x": 141.91980558930743,
-            "y": 154,
+            "width": 10.664641555285542,
+            "x": 528.3250303766707,
+            "y": 242,
           },
           "transform": [
             1,
@@ -5217,7 +5596,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -5234,8 +5612,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 141.91980558930743,
+            "width": 376.1567436208992,
+            "x": 555.5425273390036,
             "y": 176,
           },
           "transform": [
@@ -5258,7 +5636,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -5279,8 +5657,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 142.8918590522479,
+            "width": 376.1567436208992,
+            "x": 555.5425273390036,
             "y": 176,
           },
           "transform": [
@@ -5305,6 +5683,23 @@ exports[`FlameGraph should render correctly 1`] = `
     ],
     "type": "fill",
   },
+  {
+    "props": {
+      "maxWidth": null,
+      "text": "(5) net/http.(*ServeMux).ServeHTTP (3.88 Bil)",
+      "x": 565.0425273390036,
+      "y": 189,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
   {
     "props": {
       "fillRule": "nonzero",
@@ -5324,8 +5719,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 143.86391251518833,
+            "width": 10,
+            "x": 555.0425273390036,
             "y": 176,
           },
           "transform": [
@@ -5353,6 +5748,50 @@ exports[`FlameGraph should render correctly 1`] = `
   {
     "props": {
       "fillRule": "nonzero",
+      "path": [
+        {
+          "props": {},
+          "transform": [
+            1,
+            0,
+            0,
+            1,
+            0,
+            0,
+          ],
+          "type": "beginPath",
+        },
+        {
+          "props": {
+            "height": 11,
+            "width": 3,
+            "x": 559.0425273390036,
+            "y": 181.5,
+          },
+          "transform": [
+            1,
+            0,
+            0,
+            1,
+            0,
+            0,
+          ],
+          "type": "rect",
+        },
+      ],
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fill",
+  },
+  {
+    "props": {
       "path": [
         {
           "props": {},
@@ -5369,8 +5808,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 143.86391251518833,
+            "width": 312.97326852976914,
+            "x": 555.5425273390036,
             "y": 198,
           },
           "transform": [
@@ -5393,7 +5832,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -5414,9 +5853,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 143.86391251518833,
-            "y": 220,
+            "width": 312.97326852976914,
+            "x": 555.5425273390036,
+            "y": 198,
           },
           "transform": [
             1,
@@ -5440,6 +5879,23 @@ exports[`FlameGraph should render correctly 1`] = `
     ],
     "type": "fill",
   },
+  {
+    "props": {
+      "maxWidth": null,
+      "text": "(2) runtime/pprof.writeAlloc (3.23 Bil)",
+      "x": 565.0425273390036,
+      "y": 211,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
   {
     "props": {
       "fillRule": "nonzero",
@@ -5459,9 +5915,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 143.86391251518833,
-            "y": 242,
+            "width": 10,
+            "x": 555.0425273390036,
+            "y": 198,
           },
           "transform": [
             1,
@@ -5503,10 +5959,10 @@ exports[`FlameGraph should render correctly 1`] = `
         },
         {
           "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 143.86391251518833,
-            "y": 264,
+            "height": 11,
+            "width": 3,
+            "x": 559.0425273390036,
+            "y": 203.5,
           },
           "transform": [
             1,
@@ -5548,9 +6004,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 19.413122721749698,
-            "x": 148.2521263669502,
-            "y": 88,
+            "width": 311.0291616038882,
+            "x": 555.5425273390036,
+            "y": 220,
           },
           "transform": [
             1,
@@ -5593,9 +6049,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 19.413122721749698,
-            "x": 148.2521263669502,
-            "y": 88,
+            "width": 311.0291616038882,
+            "x": 555.5425273390036,
+            "y": 220,
           },
           "transform": [
             1,
@@ -5619,6 +6075,23 @@ exports[`FlameGraph should render correctly 1`] = `
     ],
     "type": "fill",
   },
+  {
+    "props": {
+      "maxWidth": null,
+      "text": "runtime/pprof.writeHeapProto (3.21 Bil)",
+      "x": 559.0425273390036,
+      "y": 233,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
   {
     "props": {
       "path": [
@@ -5637,9 +6110,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 19.413122721749698,
-            "x": 148.2521263669502,
-            "y": 110,
+            "width": 30.105710814094778,
+            "x": 555.5425273390036,
+            "y": 242,
           },
           "transform": [
             1,
@@ -5682,9 +6155,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 19.413122721749698,
-            "x": 148.2521263669502,
-            "y": 110,
+            "width": 30.105710814094778,
+            "x": 555.5425273390036,
+            "y": 242,
           },
           "transform": [
             1,
@@ -5708,6 +6181,23 @@ exports[`FlameGraph should render correctly 1`] = `
     ],
     "type": "fill",
   },
+  {
+    "props": {
+      "maxWidth": null,
+      "text": "runtime/pprof.(*profileBuilder).pbSample (320 Mil)",
+      "x": 559.0425273390036,
+      "y": 255,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
   {
     "props": {
       "path": [
@@ -5726,9 +6216,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 19.413122721749698,
-            "x": 148.2521263669502,
-            "y": 132,
+            "width": 178.82989064398544,
+            "x": 586.6482381530984,
+            "y": 242,
           },
           "transform": [
             1,
@@ -5771,9 +6261,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 19.413122721749698,
-            "x": 148.2521263669502,
-            "y": 132,
+            "width": 178.82989064398544,
+            "x": 586.6482381530984,
+            "y": 242,
           },
           "transform": [
             1,
@@ -5797,6 +6287,23 @@ exports[`FlameGraph should render correctly 1`] = `
     ],
     "type": "fill",
   },
+  {
+    "props": {
+      "maxWidth": null,
+      "text": "runtime/pprof.(*profileBuilder).appendLocsForStack (1.85 Bil)",
+      "x": 590.1482381530984,
+      "y": 255,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
   {
     "props": {
       "path": [
@@ -5815,9 +6322,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 11.636695018226003,
-            "x": 148.2521263669502,
-            "y": 154,
+            "width": 38.85419198055893,
+            "x": 586.6482381530984,
+            "y": 264,
           },
           "transform": [
             1,
@@ -5860,9 +6367,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 11.636695018226003,
-            "x": 148.2521263669502,
-            "y": 154,
+            "width": 38.85419198055893,
+            "x": 586.6482381530984,
+            "y": 264,
           },
           "transform": [
             1,
@@ -5886,6 +6393,23 @@ exports[`FlameGraph should render correctly 1`] = `
     ],
     "type": "fill",
   },
+  {
+    "props": {
+      "maxWidth": null,
+      "text": "runtime/pprof.(*profileBuilder).emitLocation (410 Mil)",
+      "x": 590.1482381530984,
+      "y": 277,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
   {
     "props": {
       "path": [
@@ -5904,9 +6428,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 11.636695018226003,
-            "x": 148.2521263669502,
-            "y": 176,
+            "width": 9.69258809234508,
+            "x": 586.6482381530984,
+            "y": 286,
           },
           "transform": [
             1,
@@ -5949,9 +6473,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 11.636695018226003,
-            "x": 148.2521263669502,
-            "y": 176,
+            "width": 9.69258809234508,
+            "x": 586.6482381530984,
+            "y": 286,
           },
           "transform": [
             1,
@@ -5977,7 +6501,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -5994,9 +6517,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 147.7521263669502,
-            "y": 198,
+            "width": 14.552855407047389,
+            "x": 626.5024301336574,
+            "y": 264,
           },
           "transform": [
             1,
@@ -6018,7 +6541,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -6039,9 +6562,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 4.860267314702309,
-            "x": 148.72417982989066,
-            "y": 198,
+            "width": 14.552855407047389,
+            "x": 626.5024301336574,
+            "y": 264,
           },
           "transform": [
             1,
@@ -6067,7 +6590,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -6084,9 +6606,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 3.888213851761847,
-            "x": 148.72417982989066,
-            "y": 220,
+            "width": 10.664641555285542,
+            "x": 626.5024301336574,
+            "y": 286,
           },
           "transform": [
             1,
@@ -6108,7 +6630,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -6129,9 +6651,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 3.888213851761847,
-            "x": 148.72417982989066,
-            "y": 242,
+            "width": 10.664641555285542,
+            "x": 626.5024301336574,
+            "y": 286,
           },
           "transform": [
             1,
@@ -6157,7 +6679,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -6174,9 +6695,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 6.804374240583233,
-            "x": 153.58444714459296,
-            "y": 198,
+            "width": 61.211421628189555,
+            "x": 642.0552855407047,
+            "y": 264,
           },
           "transform": [
             1,
@@ -6198,7 +6719,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -6219,9 +6740,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 153.58444714459296,
-            "y": 220,
+            "width": 61.211421628189555,
+            "x": 642.0552855407047,
+            "y": 264,
           },
           "transform": [
             1,
@@ -6247,38 +6768,10 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 3.888213851761847,
-            "x": 160.3888213851762,
-            "y": 154,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
+      "maxWidth": null,
+      "text": "runtime/pprof.allFrames (640 Mil)",
+      "x": 645.5552855407047,
+      "y": 277,
     },
     "transform": [
       1,
@@ -6288,7 +6781,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "fillText",
   },
   {
     "props": {
@@ -6308,9 +6801,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 177.85783718104497,
-            "x": 168.66524908869988,
-            "y": 88,
+            "width": 52.462940461725395,
+            "x": 643.0273390036452,
+            "y": 286,
           },
           "transform": [
             1,
@@ -6353,9 +6846,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 177.85783718104497,
-            "x": 168.66524908869988,
-            "y": 88,
+            "width": 52.462940461725395,
+            "x": 643.0273390036452,
+            "y": 286,
           },
           "transform": [
             1,
@@ -6382,9 +6875,9 @@ exports[`FlameGraph should render correctly 1`] = `
   {
     "props": {
       "maxWidth": null,
-      "text": "test/pkg/pprof.(*Profile).Normalize (1.84 Bil)",
-      "x": 172.16524908869988,
-      "y": 99,
+      "text": "runtime.(*Frames).Next (550 Mil)",
+      "x": 646.5273390036452,
+      "y": 299,
     },
     "transform": [
       1,
@@ -6414,9 +6907,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 22.329283110571083,
-            "x": 168.66524908869988,
-            "y": 110,
+            "width": 38.85419198055893,
+            "x": 643.0273390036452,
+            "y": 308,
           },
           "transform": [
             1,
@@ -6459,9 +6952,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 22.329283110571083,
-            "x": 168.66524908869988,
-            "y": 110,
+            "width": 38.85419198055893,
+            "x": 643.0273390036452,
+            "y": 308,
           },
           "transform": [
             1,
@@ -6488,9 +6981,9 @@ exports[`FlameGraph should render correctly 1`] = `
   {
     "props": {
       "maxWidth": null,
-      "text": "sort.Sort (240 Mil)",
-      "x": 172.16524908869988,
-      "y": 121,
+      "text": "runtime.funcline1 (410 Mil)",
+      "x": 646.5273390036452,
+      "y": 321,
     },
     "transform": [
       1,
@@ -6520,9 +7013,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 22.329283110571083,
-            "x": 168.66524908869988,
-            "y": 132,
+            "width": 24.273390036452007,
+            "x": 650.803766707169,
+            "y": 330,
           },
           "transform": [
             1,
@@ -6565,9 +7058,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 22.329283110571083,
-            "x": 168.66524908869988,
-            "y": 132,
+            "width": 24.273390036452007,
+            "x": 650.803766707169,
+            "y": 330,
           },
           "transform": [
             1,
@@ -6594,9 +7087,9 @@ exports[`FlameGraph should render correctly 1`] = `
   {
     "props": {
       "maxWidth": null,
-      "text": "sort.quickSort (240 Mil)",
-      "x": 172.16524908869988,
-      "y": 143,
+      "text": "runtime.pcvalue (260 Mil)",
+      "x": 654.303766707169,
+      "y": 343,
     },
     "transform": [
       1,
@@ -6610,7 +7103,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -6627,9 +7119,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 4.860267314702309,
-            "x": 168.16524908869988,
-            "y": 154,
+            "width": 15.52490886998785,
+            "x": 652.7478736330498,
+            "y": 352,
           },
           "transform": [
             1,
@@ -6651,7 +7143,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -6672,9 +7164,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 168.16524908869988,
-            "y": 176,
+            "width": 15.52490886998785,
+            "x": 652.7478736330498,
+            "y": 352,
           },
           "transform": [
             1,
@@ -6700,7 +7192,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -6717,9 +7208,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 169.13730255164035,
-            "y": 176,
+            "width": 27.189550425273392,
+            "x": 704.2667071688943,
+            "y": 264,
           },
           "transform": [
             1,
@@ -6741,10 +7232,11 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
+      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -6761,9 +7253,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 17.469015795868774,
-            "x": 173.5255164034022,
-            "y": 154,
+            "width": 27.189550425273392,
+            "x": 704.2667071688943,
+            "y": 264,
           },
           "transform": [
             1,
@@ -6785,11 +7277,27 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "stroke",
+    "type": "fill",
+  },
+  {
+    "props": {
+      "maxWidth": null,
+      "text": "runtime.mapaccess2_fast64 (290 Mil)",
+      "x": 707.7667071688943,
+      "y": 277,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -6806,9 +7314,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 17.469015795868774,
-            "x": 173.5255164034022,
-            "y": 154,
+            "width": 19.413122721749698,
+            "x": 735.3724179829891,
+            "y": 264,
           },
           "transform": [
             1,
@@ -6830,10 +7338,11 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
+      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -6850,9 +7359,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 11.636695018226003,
-            "x": 173.5255164034022,
-            "y": 176,
+            "width": 19.413122721749698,
+            "x": 735.3724179829891,
+            "y": 264,
           },
           "transform": [
             1,
@@ -6874,11 +7383,10 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "stroke",
+    "type": "fill",
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -6895,9 +7403,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 11.636695018226003,
-            "x": 173.5255164034022,
-            "y": 176,
+            "width": 10.664641555285542,
+            "x": 737.3165249088701,
+            "y": 286,
           },
           "transform": [
             1,
@@ -6919,7 +7427,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -6940,9 +7448,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 4.860267314702309,
-            "x": 173.0255164034022,
-            "y": 198,
+            "width": 10.664641555285542,
+            "x": 737.3165249088701,
+            "y": 286,
           },
           "transform": [
             1,
@@ -6968,7 +7476,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -6985,9 +7492,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 173.0255164034022,
-            "y": 220,
+            "width": 26.21749696233293,
+            "x": 767.4501822600243,
+            "y": 242,
           },
           "transform": [
             1,
@@ -7009,7 +7516,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -7030,8 +7537,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 173.0255164034022,
+            "width": 26.21749696233293,
+            "x": 767.4501822600243,
             "y": 242,
           },
           "transform": [
@@ -7058,7 +7565,23 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
+      "maxWidth": null,
+      "text": "runtime/pprof.(*profileBuilder).build (280 Mil)",
+      "x": 770.9501822600243,
+      "y": 255,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
+  {
+    "props": {
       "path": [
         {
           "props": {},
@@ -7075,8 +7598,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 173.0255164034022,
+            "width": 13.580801944106927,
+            "x": 767.4501822600243,
             "y": 264,
           },
           "transform": [
@@ -7099,7 +7622,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -7120,9 +7643,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 173.0255164034022,
-            "y": 286,
+            "width": 13.580801944106927,
+            "x": 767.4501822600243,
+            "y": 264,
           },
           "transform": [
             1,
@@ -7148,7 +7671,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -7165,9 +7687,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 174.9696233292831,
-            "y": 220,
+            "width": 11.636695018226003,
+            "x": 782.0309842041313,
+            "y": 264,
           },
           "transform": [
             1,
@@ -7189,7 +7711,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -7210,9 +7732,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 175.94167679222357,
-            "y": 220,
+            "width": 11.636695018226003,
+            "x": 782.0309842041313,
+            "y": 264,
           },
           "transform": [
             1,
@@ -7238,7 +7760,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -7255,8 +7776,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 175.94167679222357,
+            "width": 56.35115431348724,
+            "x": 794.6676792223573,
             "y": 242,
           },
           "transform": [
@@ -7279,7 +7800,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -7300,9 +7821,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 7.776427703523694,
-            "x": 177.8857837181045,
-            "y": 198,
+            "width": 56.35115431348724,
+            "x": 794.6676792223573,
+            "y": 242,
           },
           "transform": [
             1,
@@ -7328,38 +7849,10 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 177.8857837181045,
-            "y": 220,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
+      "maxWidth": null,
+      "text": "runtime.FuncForPC (590 Mil)",
+      "x": 798.1676792223573,
+      "y": 255,
     },
     "transform": [
       1,
@@ -7369,11 +7862,10 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "fillText",
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -7390,9 +7882,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 179.82989064398544,
-            "y": 220,
+            "width": 13.580801944106927,
+            "x": 800.5,
+            "y": 264,
           },
           "transform": [
             1,
@@ -7414,7 +7906,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -7435,9 +7927,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 179.82989064398544,
-            "y": 242,
+            "width": 13.580801944106927,
+            "x": 800.5,
+            "y": 264,
           },
           "transform": [
             1,
@@ -7463,7 +7955,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -7480,9 +7971,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 179.82989064398544,
-            "y": 264,
+            "width": 10.664641555285542,
+            "x": 803.4161603888215,
+            "y": 286,
           },
           "transform": [
             1,
@@ -7504,7 +7995,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -7525,8 +8016,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 179.82989064398544,
+            "width": 10.664641555285542,
+            "x": 803.4161603888215,
             "y": 286,
           },
           "transform": [
@@ -7553,7 +8044,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -7570,9 +8060,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 179.82989064398544,
-            "y": 308,
+            "width": 34.96597812879708,
+            "x": 815.080801944107,
+            "y": 264,
           },
           "transform": [
             1,
@@ -7594,7 +8084,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -7615,9 +8105,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 179.82989064398544,
-            "y": 330,
+            "width": 34.96597812879708,
+            "x": 815.080801944107,
+            "y": 264,
           },
           "transform": [
             1,
@@ -7643,38 +8133,10 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 179.82989064398544,
-            "y": 352,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
+      "maxWidth": null,
+      "text": "runtime.funcline1 (370 Mil)",
+      "x": 818.580801944107,
+      "y": 277,
     },
     "transform": [
       1,
@@ -7684,11 +8146,10 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "fillText",
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -7705,9 +8166,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 179.82989064398544,
-            "y": 374,
+            "width": 24.273390036452007,
+            "x": 815.080801944107,
+            "y": 286,
           },
           "transform": [
             1,
@@ -7729,7 +8190,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -7750,9 +8211,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 5.832320777642771,
-            "x": 185.6622114216282,
-            "y": 176,
+            "width": 24.273390036452007,
+            "x": 815.080801944107,
+            "y": 286,
           },
           "transform": [
             1,
@@ -7778,38 +8239,10 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 185.6622114216282,
-            "y": 198,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
+      "maxWidth": null,
+      "text": "runtime.pcvalue (260 Mil)",
+      "x": 818.580801944107,
+      "y": 299,
     },
     "transform": [
       1,
@@ -7819,7 +8252,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "fillText",
   },
   {
     "props": {
@@ -7839,9 +8272,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 128.2831105710814,
-            "x": 191.99453219927096,
-            "y": 110,
+            "width": 13.580801944106927,
+            "x": 818.9690157958688,
+            "y": 308,
           },
           "transform": [
             1,
@@ -7884,9 +8317,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 128.2831105710814,
-            "x": 191.99453219927096,
-            "y": 110,
+            "width": 13.580801944106927,
+            "x": 818.9690157958688,
+            "y": 308,
           },
           "transform": [
             1,
@@ -7910,23 +8343,6 @@ exports[`FlameGraph should render correctly 1`] = `
     ],
     "type": "fill",
   },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "test/pkg/pprof.(*Profile).clearSampleReferences (1.33 Bil)",
-      "x": 195.49453219927096,
-      "y": 121,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
   {
     "props": {
       "path": [
@@ -7945,9 +8361,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 124.39489671931958,
-            "x": 191.99453219927096,
-            "y": 132,
+            "width": 9.69258809234508,
+            "x": 840.354191980559,
+            "y": 286,
           },
           "transform": [
             1,
@@ -7990,9 +8406,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 124.39489671931958,
-            "x": 191.99453219927096,
-            "y": 132,
+            "width": 9.69258809234508,
+            "x": 840.354191980559,
+            "y": 286,
           },
           "transform": [
             1,
@@ -8016,23 +8432,6 @@ exports[`FlameGraph should render correctly 1`] = `
     ],
     "type": "fill",
   },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "test/pkg/slices.RemoveInPlace[...] (1.29 Bil)",
-      "x": 195.49453219927096,
-      "y": 143,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
   {
     "props": {
       "path": [
@@ -8051,9 +8450,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 30.105710814094778,
-            "x": 191.99453219927096,
-            "y": 154,
+            "width": 61.211421628189555,
+            "x": 869.5157958687728,
+            "y": 198,
           },
           "transform": [
             1,
@@ -8096,9 +8495,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 30.105710814094778,
-            "x": 191.99453219927096,
-            "y": 154,
+            "width": 61.211421628189555,
+            "x": 869.5157958687728,
+            "y": 198,
           },
           "transform": [
             1,
@@ -8125,9 +8524,9 @@ exports[`FlameGraph should render correctly 1`] = `
   {
     "props": {
       "maxWidth": null,
-      "text": "test/pkg/pprof.(*Profile).clearSampleReferences.func1 (320 Mil)",
-      "x": 195.49453219927096,
-      "y": 165,
+      "text": "(2) runtime/pprof.writeGoroutine (640 Mil)",
+      "x": 879.0157958687728,
+      "y": 211,
     },
     "transform": [
       1,
@@ -8158,9 +8557,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 316.88942891859057,
-            "y": 132,
+            "width": 10,
+            "x": 869.0157958687728,
+            "y": 198,
           },
           "transform": [
             1,
@@ -8202,10 +8601,10 @@ exports[`FlameGraph should render correctly 1`] = `
         },
         {
           "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 316.88942891859057,
-            "y": 154,
+            "height": 11,
+            "width": 3,
+            "x": 873.0157958687728,
+            "y": 203.5,
           },
           "transform": [
             1,
@@ -8231,7 +8630,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -8248,9 +8646,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 317.861482381531,
-            "y": 132,
+            "width": 23.301336573511545,
+            "x": 869.5157958687728,
+            "y": 220,
           },
           "transform": [
             1,
@@ -8272,10 +8670,11 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
+      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -8292,9 +8691,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 11.636695018226003,
-            "x": 321.2776427703524,
-            "y": 110,
+            "width": 23.301336573511545,
+            "x": 869.5157958687728,
+            "y": 220,
           },
           "transform": [
             1,
@@ -8316,42 +8715,14 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "stroke",
+    "type": "fill",
   },
   {
     "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 11.636695018226003,
-            "x": 321.2776427703524,
-            "y": 110,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
+      "maxWidth": null,
+      "text": "(2) runtime/pprof.runtime_goroutineProfileWithLabels (250 Mil)",
+      "x": 879.0157958687728,
+      "y": 233,
     },
     "transform": [
       1,
@@ -8361,7 +8732,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "fillText",
   },
   {
     "props": {
@@ -8382,9 +8753,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 320.7776427703524,
-            "y": 132,
+            "width": 10,
+            "x": 869.0157958687728,
+            "y": 220,
           },
           "transform": [
             1,
@@ -8426,10 +8797,10 @@ exports[`FlameGraph should render correctly 1`] = `
         },
         {
           "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 321.74969623329287,
-            "y": 132,
+            "height": 11,
+            "width": 3,
+            "x": 873.0157958687728,
+            "y": 225.5,
           },
           "transform": [
             1,
@@ -8455,7 +8826,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -8472,9 +8842,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 5.832320777642771,
-            "x": 322.7217496962333,
-            "y": 132,
+            "width": 21.35722964763062,
+            "x": 869.5157958687728,
+            "y": 242,
           },
           "transform": [
             1,
@@ -8496,7 +8866,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -8517,9 +8887,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 2.9161603888213854,
-            "x": 328.5540704738761,
-            "y": 132,
+            "width": 21.35722964763062,
+            "x": 869.5157958687728,
+            "y": 242,
           },
           "transform": [
             1,
@@ -8545,38 +8915,10 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 9.720534629404618,
-            "x": 333.4143377885784,
-            "y": 110,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
+      "maxWidth": null,
+      "text": "runtime.forEachGRace (230 Mil)",
+      "x": 873.0157958687728,
+      "y": 255,
     },
     "transform": [
       1,
@@ -8586,11 +8928,10 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "fillText",
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -8607,9 +8948,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 3.888213851761847,
-            "x": 333.4143377885784,
-            "y": 132,
+            "width": 16.496962332928312,
+            "x": 869.5157958687728,
+            "y": 264,
           },
           "transform": [
             1,
@@ -8631,7 +8972,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -8652,9 +8993,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 333.4143377885784,
-            "y": 154,
+            "width": 16.496962332928312,
+            "x": 869.5157958687728,
+            "y": 264,
           },
           "transform": [
             1,
@@ -8680,7 +9021,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -8697,9 +9037,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 337.30255164034025,
-            "y": 132,
+            "width": 15.52490886998785,
+            "x": 869.5157958687728,
+            "y": 286,
           },
           "transform": [
             1,
@@ -8721,7 +9061,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -8742,9 +9082,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 3.888213851761847,
-            "x": 343.134872417983,
-            "y": 110,
+            "width": 15.52490886998785,
+            "x": 869.5157958687728,
+            "y": 286,
           },
           "transform": [
             1,
@@ -8770,7 +9110,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -8787,9 +9126,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 2.9161603888213854,
-            "x": 343.134872417983,
-            "y": 132,
+            "width": 36.91008505467801,
+            "x": 893.8171324422843,
+            "y": 220,
           },
           "transform": [
             1,
@@ -8811,7 +9150,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -8832,9 +9171,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 343.134872417983,
-            "y": 154,
+            "width": 36.91008505467801,
+            "x": 893.8171324422843,
+            "y": 220,
           },
           "transform": [
             1,
@@ -8860,7 +9199,23 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
+      "maxWidth": null,
+      "text": "runtime/pprof.printCountProfile (390 Mil)",
+      "x": 897.3171324422843,
+      "y": 233,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
+  {
+    "props": {
       "path": [
         {
           "props": {},
@@ -8877,9 +9232,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 343.134872417983,
-            "y": 176,
+            "width": 16.496962332928312,
+            "x": 911.3140947752127,
+            "y": 242,
           },
           "transform": [
             1,
@@ -8901,7 +9256,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -8922,9 +9277,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 6.804374240583233,
-            "x": 347.02308626974485,
-            "y": 88,
+            "width": 16.496962332928312,
+            "x": 911.3140947752127,
+            "y": 242,
           },
           "transform": [
             1,
@@ -8950,7 +9305,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -8967,9 +9321,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 347.02308626974485,
-            "y": 110,
+            "width": 15.52490886998785,
+            "x": 911.3140947752127,
+            "y": 264,
           },
           "transform": [
             1,
@@ -8991,7 +9345,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -9012,9 +9366,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 347.02308626974485,
-            "y": 132,
+            "width": 15.52490886998785,
+            "x": 911.3140947752127,
+            "y": 264,
           },
           "transform": [
             1,
@@ -9040,7 +9394,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -9057,9 +9410,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 4.860267314702309,
-            "x": 347.9951397326853,
-            "y": 110,
+            "width": 600.7010935601459,
+            "x": 946.3080194410693,
+            "y": 22,
           },
           "transform": [
             1,
@@ -9081,7 +9434,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -9102,9 +9455,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 3.888213851761847,
-            "x": 347.9951397326853,
-            "y": 132,
+            "width": 600.7010935601459,
+            "x": 946.3080194410693,
+            "y": 22,
           },
           "transform": [
             1,
@@ -9130,7 +9483,23 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
+      "maxWidth": null,
+      "text": "runtime.gcBgMarkWorker (6.19 Bil)",
+      "x": 949.8080194410693,
+      "y": 35,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
+  {
+    "props": {
       "path": [
         {
           "props": {},
@@ -9147,9 +9516,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 352.85540704738764,
-            "y": 110,
+            "width": 598.7569866342649,
+            "x": 946.3080194410693,
+            "y": 44,
           },
           "transform": [
             1,
@@ -9171,7 +9540,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -9192,9 +9561,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 2.9161603888213854,
-            "x": 353.8274605103281,
-            "y": 88,
+            "width": 598.7569866342649,
+            "x": 946.3080194410693,
+            "y": 44,
           },
           "transform": [
             1,
@@ -9218,6 +9587,23 @@ exports[`FlameGraph should render correctly 1`] = `
     ],
     "type": "fill",
   },
+  {
+    "props": {
+      "maxWidth": null,
+      "text": "(2) runtime.systemstack (6.17 Bil)",
+      "x": 955.8080194410693,
+      "y": 57,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
   {
     "props": {
       "fillRule": "nonzero",
@@ -9237,9 +9623,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 353.8274605103281,
-            "y": 110,
+            "width": 10,
+            "x": 945.8080194410693,
+            "y": 44,
           },
           "transform": [
             1,
@@ -9281,10 +9667,10 @@ exports[`FlameGraph should render correctly 1`] = `
         },
         {
           "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 355.771567436209,
-            "y": 110,
+            "height": 11,
+            "width": 3,
+            "x": 949.8080194410693,
+            "y": 49.5,
           },
           "transform": [
             1,
@@ -9326,8 +9712,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 40.798298906439854,
-            "x": 357.24362089914945,
+            "width": 589.0364520048603,
+            "x": 946.3080194410693,
             "y": 66,
           },
           "transform": [
@@ -9371,8 +9757,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 40.798298906439854,
-            "x": 357.24362089914945,
+            "width": 589.0364520048603,
+            "x": 946.3080194410693,
             "y": 66,
           },
           "transform": [
@@ -9400,9 +9786,9 @@ exports[`FlameGraph should render correctly 1`] = `
   {
     "props": {
       "maxWidth": null,
-      "text": "io/ioutil.ReadAll (430 Mil)",
-      "x": 360.74362089914945,
-      "y": 77,
+      "text": "runtime.gcDrain (6.07 Bil)",
+      "x": 949.8080194410693,
+      "y": 79,
     },
     "transform": [
       1,
@@ -9432,8 +9818,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 40.798298906439854,
-            "x": 357.24362089914945,
+            "width": 432.53584447144596,
+            "x": 946.3080194410693,
             "y": 88,
           },
           "transform": [
@@ -9477,8 +9863,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 40.798298906439854,
-            "x": 357.24362089914945,
+            "width": 432.53584447144596,
+            "x": 946.3080194410693,
             "y": 88,
           },
           "transform": [
@@ -9506,9 +9892,9 @@ exports[`FlameGraph should render correctly 1`] = `
   {
     "props": {
       "maxWidth": null,
-      "text": "io.ReadAll (430 Mil)",
-      "x": 360.74362089914945,
-      "y": 99,
+      "text": "runtime.scanobject (4.46 Bil)",
+      "x": 949.8080194410693,
+      "y": 101,
     },
     "transform": [
       1,
@@ -9538,8 +9924,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 40.798298906439854,
-            "x": 357.24362089914945,
+            "width": 41.77035236938032,
+            "x": 952.140340218712,
             "y": 110,
           },
           "transform": [
@@ -9583,8 +9969,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 40.798298906439854,
-            "x": 357.24362089914945,
+            "width": 41.77035236938032,
+            "x": 952.140340218712,
             "y": 110,
           },
           "transform": [
@@ -9612,9 +9998,9 @@ exports[`FlameGraph should render correctly 1`] = `
   {
     "props": {
       "maxWidth": null,
-      "text": "compress/gzip.(*Reader).Read (430 Mil)",
-      "x": 360.74362089914945,
-      "y": 121,
+      "text": "runtime.pageIndexOf (440 Mil)",
+      "x": 955.640340218712,
+      "y": 123,
     },
     "transform": [
       1,
@@ -9644,9 +10030,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 40.798298906439854,
-            "x": 357.24362089914945,
-            "y": 132,
+            "width": 51.49088699878494,
+            "x": 994.9106925880924,
+            "y": 110,
           },
           "transform": [
             1,
@@ -9689,9 +10075,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 40.798298906439854,
-            "x": 357.24362089914945,
-            "y": 132,
+            "width": 51.49088699878494,
+            "x": 994.9106925880924,
+            "y": 110,
           },
           "transform": [
             1,
@@ -9718,9 +10104,9 @@ exports[`FlameGraph should render correctly 1`] = `
   {
     "props": {
       "maxWidth": null,
-      "text": "compress/flate.(*decompressor).Read (430 Mil)",
-      "x": 360.74362089914945,
-      "y": 143,
+      "text": "runtime.greyobject (540 Mil)",
+      "x": 998.4106925880924,
+      "y": 123,
     },
     "transform": [
       1,
@@ -9734,7 +10120,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -9751,9 +10136,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 356.74362089914945,
-            "y": 154,
+            "width": 94.26123936816525,
+            "x": 1047.4015795868772,
+            "y": 110,
           },
           "transform": [
             1,
@@ -9775,7 +10160,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -9796,9 +10181,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 3.888213851761847,
-            "x": 357.71567436208994,
-            "y": 154,
+            "width": 94.26123936816525,
+            "x": 1047.4015795868772,
+            "y": 110,
           },
           "transform": [
             1,
@@ -9822,6 +10207,67 @@ exports[`FlameGraph should render correctly 1`] = `
     ],
     "type": "fill",
   },
+  {
+    "props": {
+      "maxWidth": null,
+      "text": "runtime.findObject (980 Mil)",
+      "x": 1050.9015795868772,
+      "y": 123,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
+  {
+    "props": {
+      "path": [
+        {
+          "props": {},
+          "transform": [
+            1,
+            0,
+            0,
+            1,
+            0,
+            0,
+          ],
+          "type": "beginPath",
+        },
+        {
+          "props": {
+            "height": 22,
+            "width": 45.658566221142166,
+            "x": 1147.523086269745,
+            "y": 110,
+          },
+          "transform": [
+            1,
+            0,
+            0,
+            1,
+            0,
+            0,
+          ],
+          "type": "rect",
+        },
+      ],
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "stroke",
+  },
   {
     "props": {
       "fillRule": "nonzero",
@@ -9841,9 +10287,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 357.71567436208994,
-            "y": 176,
+            "width": 45.658566221142166,
+            "x": 1147.523086269745,
+            "y": 110,
           },
           "transform": [
             1,
@@ -9867,6 +10313,23 @@ exports[`FlameGraph should render correctly 1`] = `
     ],
     "type": "fill",
   },
+  {
+    "props": {
+      "maxWidth": null,
+      "text": "runtime.spanOf (480 Mil)",
+      "x": 1151.023086269745,
+      "y": 123,
+    },
+    "transform": [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0,
+    ],
+    "type": "fillText",
+  },
   {
     "props": {
       "path": [
@@ -9885,9 +10348,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 34.96597812879708,
-            "x": 362.1038882138518,
-            "y": 154,
+            "width": 51.49088699878494,
+            "x": 1194.181652490887,
+            "y": 110,
           },
           "transform": [
             1,
@@ -9930,9 +10393,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 34.96597812879708,
-            "x": 362.1038882138518,
-            "y": 154,
+            "width": 51.49088699878494,
+            "x": 1194.181652490887,
+            "y": 110,
           },
           "transform": [
             1,
@@ -9959,9 +10422,9 @@ exports[`FlameGraph should render correctly 1`] = `
   {
     "props": {
       "maxWidth": null,
-      "text": "compress/flate.(*decompressor).huffmanBlock (370 Mil)",
-      "x": 365.6038882138518,
-      "y": 165,
+      "text": "runtime.markBits.isMarked (540 Mil)",
+      "x": 1197.681652490887,
+      "y": 123,
     },
     "transform": [
       1,
@@ -9975,7 +10438,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -9992,9 +10454,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 361.6038882138518,
-            "y": 176,
+            "width": 19.413122721749698,
+            "x": 1379.8438639125152,
+            "y": 88,
           },
           "transform": [
             1,
@@ -10016,7 +10478,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -10037,9 +10499,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 361.6038882138518,
-            "y": 198,
+            "width": 19.413122721749698,
+            "x": 1379.8438639125152,
+            "y": 88,
           },
           "transform": [
             1,
@@ -10082,8 +10544,8 @@ exports[`FlameGraph should render correctly 1`] = `
           "props": {
             "height": 22,
             "width": 16.496962332928312,
-            "x": 364.0479951397327,
-            "y": 176,
+            "x": 1409.005467800729,
+            "y": 88,
           },
           "transform": [
             1,
@@ -10127,8 +10589,8 @@ exports[`FlameGraph should render correctly 1`] = `
           "props": {
             "height": 22,
             "width": 16.496962332928312,
-            "x": 364.0479951397327,
-            "y": 176,
+            "x": 1409.005467800729,
+            "y": 88,
           },
           "transform": [
             1,
@@ -10154,7 +10616,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -10171,9 +10632,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 363.5479951397327,
-            "y": 198,
+            "width": 19.413122721749698,
+            "x": 1427.4744835965978,
+            "y": 88,
           },
           "transform": [
             1,
@@ -10195,7 +10656,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -10216,9 +10677,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 2.9161603888213854,
-            "x": 381.044957472661,
-            "y": 176,
+            "width": 19.413122721749698,
+            "x": 1427.4744835965978,
+            "y": 88,
           },
           "transform": [
             1,
@@ -10244,7 +10705,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -10261,9 +10721,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 397.5698663426489,
-            "y": 154,
+            "width": 15.52490886998785,
+            "x": 1551.897326852977,
+            "y": 22,
           },
           "transform": [
             1,
@@ -10285,7 +10745,7 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
@@ -10306,9 +10766,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 397.5698663426489,
-            "y": 176,
+            "width": 15.52490886998785,
+            "x": 1551.897326852977,
+            "y": 22,
           },
           "transform": [
             1,
@@ -10334,7 +10794,6 @@ exports[`FlameGraph should render correctly 1`] = `
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -10351,9 +10810,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 397.5698663426489,
-            "y": 198,
+            "width": 14.552855407047389,
+            "x": 1551.897326852977,
+            "y": 44,
           },
           "transform": [
             1,
@@ -10375,10 +10834,11 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
+    "type": "stroke",
   },
   {
     "props": {
+      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -10395,9 +10855,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 546.26609963548,
-            "x": 399.0419198055893,
-            "y": 22,
+            "width": 14.552855407047389,
+            "x": 1551.897326852977,
+            "y": 44,
           },
           "transform": [
             1,
@@ -10419,11 +10879,10 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "stroke",
+    "type": "fill",
   },
   {
     "props": {
-      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -10440,8 +10899,8 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 546.26609963548,
-            "x": 399.0419198055893,
+            "width": 15.52490886998785,
+            "x": 1568.4222357229648,
             "y": 22,
           },
           "transform": [
@@ -10464,27 +10923,11 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "net/http.(*conn).serve (5.63 Bil)",
-      "x": 402.5419198055893,
-      "y": 33,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
+    "type": "stroke",
   },
   {
     "props": {
+      "fillRule": "nonzero",
       "path": [
         {
           "props": {},
@@ -10501,9 +10944,9 @@ exports[`FlameGraph should render correctly 1`] = `
         {
           "props": {
             "height": 22,
-            "width": 541.4058323207777,
-            "x": 399.0419198055893,
-            "y": 44,
+            "width": 15.52490886998785,
+            "x": 1568.4222357229648,
+            "y": 22,
           },
           "transform": [
             1,
@@ -10525,14 +10968,19 @@ exports[`FlameGraph should render correctly 1`] = `
       0,
       0,
     ],
-    "type": "stroke",
+    "type": "fill",
   },
   {
     "props": {
       "fillRule": "nonzero",
       "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 4.860267314702309,
+            "x": 0,
+            "y": 154,
+          },
           "transform": [
             1,
             0,
@@ -10541,14 +10989,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 541.4058323207777,
-            "x": 399.0419198055893,
-            "y": 44,
+            "width": 2.9161603888213854,
+            "x": 0,
+            "y": 176,
           },
           "transform": [
             1,
@@ -10560,40 +11008,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "net/http.serverHandler.ServeHTTP (5.58 Bil)",
-      "x": 402.5419198055893,
-      "y": 55,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 0,
+            "y": 198,
+          },
           "transform": [
             1,
             0,
@@ -10602,14 +11023,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 541.4058323207777,
-            "x": 399.0419198055893,
-            "y": 66,
+            "width": 0.9720534629404618,
+            "x": 0,
+            "y": 220,
           },
           "transform": [
             1,
@@ -10621,24 +11042,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 1.9441069258809236,
+            "y": 198,
+          },
           "transform": [
             1,
             0,
@@ -10647,14 +11057,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 541.4058323207777,
-            "x": 399.0419198055893,
-            "y": 66,
+            "width": 0.9720534629404618,
+            "x": 2.9161603888213854,
+            "y": 176,
           },
           "transform": [
             1,
@@ -10666,40 +11076,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "net/http.HandlerFunc.ServeHTTP (5.58 Bil)",
-      "x": 402.5419198055893,
-      "y": 77,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 7.776427703523694,
+            "x": 4.860267314702309,
+            "y": 154,
+          },
           "transform": [
             1,
             0,
@@ -10708,14 +11091,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 541.4058323207777,
-            "x": 399.0419198055893,
-            "y": 88,
+            "width": 3.888213851761847,
+            "x": 4.860267314702309,
+            "y": 176,
           },
           "transform": [
             1,
@@ -10727,24 +11110,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 12.636695018226003,
+            "y": 154,
+          },
           "transform": [
             1,
             0,
@@ -10753,14 +11125,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 541.4058323207777,
-            "x": 399.0419198055893,
-            "y": 88,
+            "width": 0.9720534629404618,
+            "x": 13.608748481166465,
+            "y": 154,
           },
           "transform": [
             1,
@@ -10772,40 +11144,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "test/pkg/util.glob..func1.1 (5.58 Bil)",
-      "x": 402.5419198055893,
-      "y": 99,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 7.776427703523694,
+            "x": 66.0996354799514,
+            "y": 132,
+          },
           "transform": [
             1,
             0,
@@ -10814,13 +11159,13 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 541.4058323207777,
-            "x": 399.0419198055893,
+            "width": 3.888213851761847,
+            "x": 99.1494532199271,
             "y": 110,
           },
           "transform": [
@@ -10833,24 +11178,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 6.804374240583233,
+            "x": 103.03766707168894,
+            "y": 88,
+          },
           "transform": [
             1,
             0,
@@ -10859,13 +11193,13 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 541.4058323207777,
-            "x": 399.0419198055893,
+            "width": 4.860267314702309,
+            "x": 103.03766707168894,
             "y": 110,
           },
           "transform": [
@@ -10878,40 +11212,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "golang.org/x/net/http2/h2c.h2cHandler.ServeHTTP (5.58 Bil)",
-      "x": 402.5419198055893,
-      "y": 121,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 2.9161603888213854,
+            "x": 103.03766707168894,
+            "y": 132,
+          },
           "transform": [
             1,
             0,
@@ -10920,13 +11227,13 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 541.4058323207777,
-            "x": 399.0419198055893,
+            "width": 0.9720534629404618,
+            "x": 105.95382746051034,
             "y": 132,
           },
           "transform": [
@@ -10939,24 +11246,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 106.92588092345079,
+            "y": 132,
+          },
           "transform": [
             1,
             0,
@@ -10965,14 +11261,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 541.4058323207777,
-            "x": 399.0419198055893,
-            "y": 132,
+            "width": 1.9441069258809236,
+            "x": 107.89793438639126,
+            "y": 110,
           },
           "transform": [
             1,
@@ -10984,40 +11280,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "net/http.HandlerFunc.ServeHTTP (5.58 Bil)",
-      "x": 402.5419198055893,
-      "y": 143,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 107.89793438639126,
+            "y": 132,
+          },
           "transform": [
             1,
             0,
@@ -11026,14 +11295,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 541.4058323207777,
-            "x": 399.0419198055893,
-            "y": 154,
+            "width": 6.804374240583233,
+            "x": 109.84204131227219,
+            "y": 110,
           },
           "transform": [
             1,
@@ -11045,24 +11314,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 4.860267314702309,
+            "x": 109.84204131227219,
+            "y": 132,
+          },
           "transform": [
             1,
             0,
@@ -11071,13 +11329,13 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 541.4058323207777,
-            "x": 399.0419198055893,
+            "width": 0.9720534629404618,
+            "x": 109.84204131227219,
             "y": 154,
           },
           "transform": [
@@ -11090,40 +11348,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "test/pkg/create.(*create).initServer.func2.1 (5.58 Bil)",
-      "x": 402.5419198055893,
-      "y": 165,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 110.81409477521264,
+            "y": 154,
+          },
           "transform": [
             1,
             0,
@@ -11132,13 +11363,13 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 541.4058323207777,
-            "x": 399.0419198055893,
+            "width": 0.9720534629404618,
+            "x": 110.81409477521264,
             "y": 176,
           },
           "transform": [
@@ -11151,36759 +11382,12 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 541.4058323207777,
-            "x": 399.0419198055893,
-            "y": 176,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "net/http.HandlerFunc.ServeHTTP (5.58 Bil)",
-      "x": 402.5419198055893,
-      "y": 187,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 541.4058323207777,
-            "x": 399.0419198055893,
-            "y": 198,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 541.4058323207777,
-            "x": 399.0419198055893,
-            "y": 198,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "github.com/opentracing-contrib/go-stdlib/nethttp.MiddlewareFunc.func5 (5.58 Bil)",
-      "x": 402.5419198055893,
-      "y": 209,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 537.5176184690158,
-            "x": 399.0419198055893,
-            "y": 220,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 537.5176184690158,
-            "x": 399.0419198055893,
-            "y": 220,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "net/http.HandlerFunc.ServeHTTP (5.54 Bil)",
-      "x": 402.5419198055893,
-      "y": 231,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 537.5176184690158,
-            "x": 399.0419198055893,
-            "y": 242,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 537.5176184690158,
-            "x": 399.0419198055893,
-            "y": 242,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "github.com/weaveworks/common/middleware.Log.Wrap.func1 (5.54 Bil)",
-      "x": 402.5419198055893,
-      "y": 253,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 536.5455650060753,
-            "x": 399.0419198055893,
-            "y": 264,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 536.5455650060753,
-            "x": 399.0419198055893,
-            "y": 264,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "net/http.HandlerFunc.ServeHTTP (5.53 Bil)",
-      "x": 402.5419198055893,
-      "y": 275,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 534.6014580801944,
-            "x": 399.0419198055893,
-            "y": 286,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 534.6014580801944,
-            "x": 399.0419198055893,
-            "y": 286,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "github.com/weaveworks/common/middleware.Instrument.Wrap.func1 (5.51 Bil)",
-      "x": 402.5419198055893,
-      "y": 297,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 533.629404617254,
-            "x": 399.0419198055893,
-            "y": 308,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 533.629404617254,
-            "x": 399.0419198055893,
-            "y": 308,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "github.com/felixge/httpsnoop.(*Metrics).CaptureMetrics (5.50 Bil)",
-      "x": 402.5419198055893,
-      "y": 319,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 532.6573511543135,
-            "x": 399.0419198055893,
-            "y": 330,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 532.6573511543135,
-            "x": 399.0419198055893,
-            "y": 330,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "github.com/weaveworks/common/middleware.Instrument.Wrap.func1.2 (5.49 Bil)",
-      "x": 402.5419198055893,
-      "y": 341,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 532.6573511543135,
-            "x": 399.0419198055893,
-            "y": 352,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 532.6573511543135,
-            "x": 399.0419198055893,
-            "y": 352,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "github.com/gorilla/mux.(*Router).ServeHTTP (5.49 Bil)",
-      "x": 402.5419198055893,
-      "y": 363,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 155.50060753341435,
-            "x": 399.0419198055893,
-            "y": 374,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 155.50060753341435,
-            "x": 399.0419198055893,
-            "y": 374,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "github.com/bufbuild/connect-go.(*Handler).ServeHTTP (1.61 Bil)",
-      "x": 402.5419198055893,
-      "y": 385,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 155.50060753341435,
-            "x": 399.0419198055893,
-            "y": 396,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 155.50060753341435,
-            "x": 399.0419198055893,
-            "y": 396,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "github.com/bufbuild/connect-go.NewUnaryHandler[...].func1 (1.61 Bil)",
-      "x": 402.5419198055893,
-      "y": 407,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 148.69623329283112,
-            "x": 399.0419198055893,
-            "y": 418,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 148.69623329283112,
-            "x": 399.0419198055893,
-            "y": 418,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "github.com/bufbuild/connect-go.NewUnaryHandler[...].func1.1 (1.54 Bil)",
-      "x": 402.5419198055893,
-      "y": 429,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 148.69623329283112,
-            "x": 399.0419198055893,
-            "y": 440,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 148.69623329283112,
-            "x": 399.0419198055893,
-            "y": 440,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "test/pkg/ingester.(*Ingester).Push (1.54 Bil)",
-      "x": 402.5419198055893,
-      "y": 451,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 17.469015795868774,
-            "x": 399.0419198055893,
-            "y": 462,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 17.469015795868774,
-            "x": 399.0419198055893,
-            "y": 462,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 15.52490886998785,
-            "x": 399.0419198055893,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 15.52490886998785,
-            "x": 399.0419198055893,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 15.52490886998785,
-            "x": 399.0419198055893,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 15.52490886998785,
-            "x": 399.0419198055893,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 398.5419198055893,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 399.5139732685298,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 10.664641555285542,
-            "x": 401.95808019441074,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 10.664641555285542,
-            "x": 401.95808019441074,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 401.45808019441074,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 401.45808019441074,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 413.12272174969627,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 413.12272174969627,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 415.0668286755772,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 415.0668286755772,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 416.03888213851764,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 416.03888213851764,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 416.03888213851764,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 416.03888213851764,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 416.03888213851764,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 416.03888213851764,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 416.03888213851764,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 416.03888213851764,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 416.03888213851764,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 416.03888213851764,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 81.62454434993926,
-            "x": 417.51093560145813,
-            "y": 462,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 81.62454434993926,
-            "x": 417.51093560145813,
-            "y": 462,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "test/pkg/create.(*Head).Ingest (850 Mil)",
-      "x": 421.01093560145813,
-      "y": 473,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 33.02187120291616,
-            "x": 417.51093560145813,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 33.02187120291616,
-            "x": 417.51093560145813,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "test/pkg/create.(*Head).convertSamples (350 Mil)",
-      "x": 421.01093560145813,
-      "y": 495,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 28.161603888213854,
-            "x": 417.51093560145813,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 28.161603888213854,
-            "x": 417.51093560145813,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "test/pkg/create.(*deduplicatingSlice[...]).ingest (300 Mil)",
-      "x": 421.01093560145813,
-      "y": 517,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 10.664641555285542,
-            "x": 417.51093560145813,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 10.664641555285542,
-            "x": 417.51093560145813,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 9.69258809234508,
-            "x": 417.51093560145813,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 9.69258809234508,
-            "x": 417.51093560145813,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 7.776427703523694,
-            "x": 417.01093560145813,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 417.01093560145813,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 424.7873633049818,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 7.776427703523694,
-            "x": 428.67557715674366,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 3.888213851761847,
-            "x": 428.67557715674366,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 428.67557715674366,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 432.5637910085055,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 436.4520048602673,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 4.860267314702309,
-            "x": 437.4240583232078,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 437.4240583232078,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 437.4240583232078,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 437.4240583232078,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 437.4240583232078,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 437.4240583232078,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 437.4240583232078,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 437.4240583232078,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 437.4240583232078,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 437.4240583232078,
-            "y": 726,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 437.4240583232078,
-            "y": 748,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 437.4240583232078,
-            "y": 770,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 438.39611178614825,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 438.39611178614825,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 438.39611178614825,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 439.36816524908875,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 439.36816524908875,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 442.2843256379101,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 446.172539489672,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 446.172539489672,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 447.1445929526124,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 447.1445929526124,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 448.1166464155529,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 449.08869987849334,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 34.96597812879708,
-            "x": 451.5328068043743,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 34.96597812879708,
-            "x": 451.5328068043743,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "test/pkg/create.(*deduplicatingSlice[...]).ingest (370 Mil)",
-      "x": 455.0328068043743,
-      "y": 495,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 3.888213851761847,
-            "x": 451.0328068043743,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 451.0328068043743,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 452.9769137302552,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 9.720534629404618,
-            "x": 454.92102065613614,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 454.92102065613614,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 454.92102065613614,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 454.92102065613614,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 455.8930741190766,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 455.8930741190766,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 7.776427703523694,
-            "x": 464.64155528554073,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 464.64155528554073,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 466.58566221142166,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 466.58566221142166,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 472.4179829890644,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 3.888213851761847,
-            "x": 473.3900364520049,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 473.3900364520049,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 474.36208991494533,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 477.27825030376675,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 478.2503037667072,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 480.1944106925881,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 481.16646415552856,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 483.1105710814095,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 483.1105710814095,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 483.1105710814095,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 486.99878493317135,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 486.99878493317135,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 486.99878493317135,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 486.99878493317135,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 9.69258809234508,
-            "x": 488.4708383961118,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 9.69258809234508,
-            "x": 488.4708383961118,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 9.69258809234508,
-            "x": 488.4708383961118,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 9.69258809234508,
-            "x": 488.4708383961118,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 5.832320777642771,
-            "x": 487.9708383961118,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 487.9708383961118,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 487.9708383961118,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 487.9708383961118,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 487.9708383961118,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 489.9149453219927,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 489.9149453219927,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 489.9149453219927,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 489.9149453219927,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 489.9149453219927,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 493.8031591737546,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 498.6634264884569,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 498.6634264884569,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 498.6634264884569,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 498.6634264884569,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 498.6634264884569,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 498.6634264884569,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 498.6634264884569,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 498.6634264884569,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 498.6634264884569,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 498.6634264884569,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 498.6634264884569,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 498.6634264884569,
-            "y": 726,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 45.658566221142166,
-            "x": 500.1354799513974,
-            "y": 462,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 45.658566221142166,
-            "x": 500.1354799513974,
-            "y": 462,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "test/pkg/gen/google/v1.(*Profile).UnmarshalVT (480 Mil)",
-      "x": 503.6354799513974,
-      "y": 473,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 13.580801944106927,
-            "x": 500.1354799513974,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 13.580801944106927,
-            "x": 500.1354799513974,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 499.6354799513974,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 11.636695018226003,
-            "x": 501.1075334143378,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 11.636695018226003,
-            "x": 501.1075334143378,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 500.6075334143378,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 501.5795868772783,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 4.860267314702309,
-            "x": 502.55164034021874,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 12.608748481166465,
-            "x": 514.7162818955043,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 12.608748481166465,
-            "x": 514.7162818955043,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 7.776427703523694,
-            "x": 514.2162818955043,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 3.888213851761847,
-            "x": 514.2162818955043,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 514.2162818955043,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 518.1044957472661,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 521.992709599028,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 521.992709599028,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 522.9647630619685,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 523.9368165249089,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 10.664641555285542,
-            "x": 528.3250303766707,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 10.664641555285542,
-            "x": 528.3250303766707,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 5.832320777642771,
-            "x": 527.8250303766707,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 3.888213851761847,
-            "x": 527.8250303766707,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 527.8250303766707,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 528.7970838396112,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 528.7970838396112,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 528.7970838396112,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 531.7132442284326,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 539.4896719319563,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 539.4896719319563,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 539.4896719319563,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 539.4896719319563,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 539.4896719319563,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 539.4896719319563,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 539.4896719319563,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 539.4896719319563,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 539.4896719319563,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 539.4896719319563,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 539.4896719319563,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 541.4337788578372,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 546.2940461725395,
-            "y": 462,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 546.2940461725395,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 546.2940461725395,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 546.2940461725395,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 546.2940461725395,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 546.2940461725395,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 546.2940461725395,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 546.2940461725395,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 547.26609963548,
-            "y": 462,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 547.26609963548,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 5.832320777642771,
-            "x": 548.2381530984204,
-            "y": 418,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 5.832320777642771,
-            "x": 548.2381530984204,
-            "y": 440,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 5.832320777642771,
-            "x": 548.2381530984204,
-            "y": 462,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 5.832320777642771,
-            "x": 548.2381530984204,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 548.2381530984204,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 548.2381530984204,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 548.2381530984204,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 548.2381530984204,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 548.2381530984204,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 548.2381530984204,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 548.2381530984204,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 548.2381530984204,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 548.2381530984204,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 548.2381530984204,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 548.2381530984204,
-            "y": 726,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 548.2381530984204,
-            "y": 748,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 548.2381530984204,
-            "y": 770,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 549.2102065613609,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 549.2102065613609,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 549.2102065613609,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 549.2102065613609,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 549.2102065613609,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 551.1543134872418,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 551.1543134872418,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 551.1543134872418,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 551.1543134872418,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 551.1543134872418,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 551.1543134872418,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 554.0704738760633,
-            "y": 418,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 554.0704738760633,
-            "y": 440,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 554.0704738760633,
-            "y": 462,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 554.0704738760633,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 554.0704738760633,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 554.0704738760633,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 554.0704738760633,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 554.0704738760633,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 554.0704738760633,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 554.0704738760633,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 554.0704738760633,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 554.0704738760633,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 554.0704738760633,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 554.0704738760633,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 554.0704738760633,
-            "y": 726,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 554.0704738760633,
-            "y": 748,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 376.1567436208992,
-            "x": 555.5425273390036,
-            "y": 374,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 376.1567436208992,
-            "x": 555.5425273390036,
-            "y": 374,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "net/http.(*ServeMux).ServeHTTP (3.88 Bil)",
-      "x": 559.0425273390036,
-      "y": 385,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 376.1567436208992,
-            "x": 555.5425273390036,
-            "y": 396,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 376.1567436208992,
-            "x": 555.5425273390036,
-            "y": 396,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "net/http.HandlerFunc.ServeHTTP (3.88 Bil)",
-      "x": 559.0425273390036,
-      "y": 407,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 376.1567436208992,
-            "x": 555.5425273390036,
-            "y": 418,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 376.1567436208992,
-            "x": 555.5425273390036,
-            "y": 418,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "net/http/pprof.Index (3.88 Bil)",
-      "x": 559.0425273390036,
-      "y": 429,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 376.1567436208992,
-            "x": 555.5425273390036,
-            "y": 440,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 376.1567436208992,
-            "x": 555.5425273390036,
-            "y": 440,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "net/http/pprof.handler.ServeHTTP (3.88 Bil)",
-      "x": 559.0425273390036,
-      "y": 451,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 375.1846901579587,
-            "x": 555.5425273390036,
-            "y": 462,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 375.1846901579587,
-            "x": 555.5425273390036,
-            "y": 462,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime/pprof.(*Profile).WriteTo (3.87 Bil)",
-      "x": 559.0425273390036,
-      "y": 473,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 312.97326852976914,
-            "x": 555.5425273390036,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 312.97326852976914,
-            "x": 555.5425273390036,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime/pprof.writeAlloc (3.23 Bil)",
-      "x": 559.0425273390036,
-      "y": 495,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 312.97326852976914,
-            "x": 555.5425273390036,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 312.97326852976914,
-            "x": 555.5425273390036,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime/pprof.writeHeapInternal (3.23 Bil)",
-      "x": 559.0425273390036,
-      "y": 517,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 311.0291616038882,
-            "x": 555.5425273390036,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 311.0291616038882,
-            "x": 555.5425273390036,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime/pprof.writeHeapProto (3.21 Bil)",
-      "x": 559.0425273390036,
-      "y": 539,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 30.105710814094778,
-            "x": 555.5425273390036,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 30.105710814094778,
-            "x": 555.5425273390036,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime/pprof.(*profileBuilder).pbSample (320 Mil)",
-      "x": 559.0425273390036,
-      "y": 561,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 6.804374240583233,
-            "x": 555.0425273390036,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 6.804374240583233,
-            "x": 555.0425273390036,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 3.888213851761847,
-            "x": 555.0425273390036,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 3.888213851761847,
-            "x": 555.0425273390036,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 555.0425273390036,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 555.0425273390036,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 555.0425273390036,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 555.0425273390036,
-            "y": 726,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 555.0425273390036,
-            "y": 748,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 555.0425273390036,
-            "y": 770,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 555.0425273390036,
-            "y": 792,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 555.0425273390036,
-            "y": 814,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 555.0425273390036,
-            "y": 836,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 555.0425273390036,
-            "y": 858,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 555.0425273390036,
-            "y": 880,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 555.0425273390036,
-            "y": 902,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 555.0425273390036,
-            "y": 924,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 555.0425273390036,
-            "y": 946,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 555.0425273390036,
-            "y": 968,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 555.0425273390036,
-            "y": 990,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 555.0425273390036,
-            "y": 1012,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 555.0425273390036,
-            "y": 1034,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 555.0425273390036,
-            "y": 1056,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 555.0425273390036,
-            "y": 1078,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 556.0145808019441,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 556.9866342648846,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 558.9307411907655,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 558.9307411907655,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 558.9307411907655,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 558.9307411907655,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 558.9307411907655,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 558.9307411907655,
-            "y": 726,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 558.9307411907655,
-            "y": 748,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 558.9307411907655,
-            "y": 770,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 558.9307411907655,
-            "y": 792,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 558.9307411907655,
-            "y": 814,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 559.902794653706,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 559.902794653706,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 559.902794653706,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 6.804374240583233,
-            "x": 561.8469015795869,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 5.832320777642771,
-            "x": 561.8469015795869,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 561.8469015795869,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 563.7910085054679,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 566.7071688942892,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 566.7071688942892,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 567.6792223572297,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 9.720534629404618,
-            "x": 568.6512758201701,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 568.6512758201701,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 4.860267314702309,
-            "x": 578.3718104495748,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 178.82989064398544,
-            "x": 586.6482381530984,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 178.82989064398544,
-            "x": 586.6482381530984,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime/pprof.(*profileBuilder).appendLocsForStack (1.85 Bil)",
-      "x": 590.1482381530984,
-      "y": 561,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 38.85419198055893,
-            "x": 586.6482381530984,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 38.85419198055893,
-            "x": 586.6482381530984,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime/pprof.(*profileBuilder).emitLocation (410 Mil)",
-      "x": 590.1482381530984,
-      "y": 583,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 9.69258809234508,
-            "x": 586.6482381530984,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 9.69258809234508,
-            "x": 586.6482381530984,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 9.69258809234508,
-            "x": 586.6482381530984,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 9.69258809234508,
-            "x": 586.6482381530984,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 8.748481166464156,
-            "x": 586.1482381530984,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 5.832320777642771,
-            "x": 586.1482381530984,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 5.832320777642771,
-            "x": 586.1482381530984,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 3.888213851761847,
-            "x": 586.1482381530984,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 590.0364520048603,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 590.0364520048603,
-            "y": 726,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 590.0364520048603,
-            "y": 748,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 591.9805589307413,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 591.9805589307413,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 591.9805589307413,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 591.9805589307413,
-            "y": 726,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 591.9805589307413,
-            "y": 748,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 592.9526123936816,
-            "y": 726,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 592.9526123936816,
-            "y": 748,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 592.9526123936816,
-            "y": 770,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 592.9526123936816,
-            "y": 792,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 592.9526123936816,
-            "y": 814,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 592.9526123936816,
-            "y": 836,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 592.9526123936816,
-            "y": 858,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 594.8967193195626,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 594.8967193195626,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 594.8967193195626,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 594.8967193195626,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 595.868772782503,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 596.8408262454435,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 596.8408262454435,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 598.7849331713245,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 3.888213851761847,
-            "x": 599.7569866342649,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 599.7569866342649,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 599.7569866342649,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 599.7569866342649,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 599.7569866342649,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 599.7569866342649,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 599.7569866342649,
-            "y": 726,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 599.7569866342649,
-            "y": 748,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 599.7569866342649,
-            "y": 770,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 599.7569866342649,
-            "y": 792,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 599.7569866342649,
-            "y": 814,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 599.7569866342649,
-            "y": 836,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 599.7569866342649,
-            "y": 858,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 599.7569866342649,
-            "y": 880,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 3.888213851761847,
-            "x": 603.6452004860267,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 603.6452004860267,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 7.776427703523694,
-            "x": 607.5334143377886,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 607.5334143377886,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 607.5334143377886,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 607.5334143377886,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 607.5334143377886,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 607.5334143377886,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 607.5334143377886,
-            "y": 726,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 607.5334143377886,
-            "y": 748,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 607.5334143377886,
-            "y": 770,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 607.5334143377886,
-            "y": 792,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 610.44957472661,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 5.832320777642771,
-            "x": 615.3098420413123,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 615.3098420413123,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 618.2260024301337,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 618.2260024301337,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 621.1421628189551,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 622.1142162818956,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 622.1142162818956,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 623.086269744836,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 624.0583232077764,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 14.552855407047389,
-            "x": 626.5024301336574,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 14.552855407047389,
-            "x": 626.5024301336574,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 10.664641555285542,
-            "x": 626.5024301336574,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 10.664641555285542,
-            "x": 626.5024301336574,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 626.0024301336574,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 9.720534629404618,
-            "x": 627.9465370595383,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 4.860267314702309,
-            "x": 627.9465370595383,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 632.8068043742406,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 633.7788578371811,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 61.211421628189555,
-            "x": 642.0552855407047,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 61.211421628189555,
-            "x": 642.0552855407047,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime/pprof.allFrames (640 Mil)",
-      "x": 645.5552855407047,
-      "y": 583,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 641.5552855407047,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 52.462940461725395,
-            "x": 643.0273390036452,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 52.462940461725395,
-            "x": 643.0273390036452,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime.(*Frames).Next (550 Mil)",
-      "x": 646.5273390036452,
-      "y": 605,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 38.85419198055893,
-            "x": 643.0273390036452,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 38.85419198055893,
-            "x": 643.0273390036452,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime.funcline1 (410 Mil)",
-      "x": 646.5273390036452,
-      "y": 627,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 7.776427703523694,
-            "x": 642.5273390036452,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 5.832320777642771,
-            "x": 642.5273390036452,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 24.273390036452007,
-            "x": 650.803766707169,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 24.273390036452007,
-            "x": 650.803766707169,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime.pcvalue (260 Mil)",
-      "x": 654.303766707169,
-      "y": 649,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 650.303766707169,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 15.52490886998785,
-            "x": 652.7478736330498,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 15.52490886998785,
-            "x": 652.7478736330498,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 5.832320777642771,
-            "x": 675.5771567436209,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 675.5771567436209,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 675.5771567436209,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 682.3815309842041,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 682.3815309842041,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 682.3815309842041,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 684.3256379100851,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 685.2976913730256,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 686.269744835966,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 4.860267314702309,
-            "x": 688.213851761847,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 3.888213851761847,
-            "x": 688.213851761847,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 688.213851761847,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 692.1020656136088,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 692.1020656136088,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 6.804374240583233,
-            "x": 695.9902794653706,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 695.9902794653706,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 3.888213851761847,
-            "x": 698.9064398541921,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 27.189550425273392,
-            "x": 704.2667071688943,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 27.189550425273392,
-            "x": 704.2667071688943,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime.mapaccess2_fast64 (290 Mil)",
-      "x": 707.7667071688943,
-      "y": 583,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 8.748481166464156,
-            "x": 703.7667071688943,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 731.9562575941677,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 731.9562575941677,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 732.9283110571082,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 732.9283110571082,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 732.9283110571082,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 19.413122721749698,
-            "x": 735.3724179829891,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 19.413122721749698,
-            "x": 735.3724179829891,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 734.8724179829891,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 734.8724179829891,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 734.8724179829891,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 735.8444714459296,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 10.664641555285542,
-            "x": 737.3165249088701,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 10.664641555285542,
-            "x": 737.3165249088701,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 8.748481166464156,
-            "x": 736.8165249088701,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 8.748481166464156,
-            "x": 736.8165249088701,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 5.832320777642771,
-            "x": 736.8165249088701,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 742.6488456865128,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 745.5650060753342,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 745.5650060753342,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 745.5650060753342,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 745.5650060753342,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 745.5650060753342,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 746.5370595382747,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 4.860267314702309,
-            "x": 748.4811664641555,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 748.4811664641555,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 755.2855407047388,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 765.9781287970839,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 26.21749696233293,
-            "x": 767.4501822600243,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 26.21749696233293,
-            "x": 767.4501822600243,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime/pprof.(*profileBuilder).build (280 Mil)",
-      "x": 770.9501822600243,
-      "y": 561,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 13.580801944106927,
-            "x": 767.4501822600243,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 13.580801944106927,
-            "x": 767.4501822600243,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 13.580801944106927,
-            "x": 767.4501822600243,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 13.580801944106927,
-            "x": 767.4501822600243,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 13.580801944106927,
-            "x": 767.4501822600243,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 13.580801944106927,
-            "x": 767.4501822600243,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 5.832320777642771,
-            "x": 766.9501822600243,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 766.9501822600243,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 7.776427703523694,
-            "x": 772.7825030376671,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 4.860267314702309,
-            "x": 772.7825030376671,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 772.7825030376671,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 772.7825030376671,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 772.7825030376671,
-            "y": 726,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 772.7825030376671,
-            "y": 748,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 772.7825030376671,
-            "y": 770,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 772.7825030376671,
-            "y": 792,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 772.7825030376671,
-            "y": 814,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 772.7825030376671,
-            "y": 836,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 772.7825030376671,
-            "y": 858,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 772.7825030376671,
-            "y": 880,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 772.7825030376671,
-            "y": 902,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 772.7825030376671,
-            "y": 924,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 772.7825030376671,
-            "y": 946,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 772.7825030376671,
-            "y": 968,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 772.7825030376671,
-            "y": 990,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 772.7825030376671,
-            "y": 1012,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 772.7825030376671,
-            "y": 1034,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 772.7825030376671,
-            "y": 1056,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 774.7266099635481,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 777.6427703523694,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 777.6427703523694,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 777.6427703523694,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 779.5868772782503,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 779.5868772782503,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 779.5868772782503,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 779.5868772782503,
-            "y": 726,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 779.5868772782503,
-            "y": 748,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 779.5868772782503,
-            "y": 770,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 779.5868772782503,
-            "y": 792,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 779.5868772782503,
-            "y": 814,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 779.5868772782503,
-            "y": 836,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 779.5868772782503,
-            "y": 858,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 779.5868772782503,
-            "y": 880,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 779.5868772782503,
-            "y": 902,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 779.5868772782503,
-            "y": 924,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 779.5868772782503,
-            "y": 946,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 779.5868772782503,
-            "y": 968,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 779.5868772782503,
-            "y": 990,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 779.5868772782503,
-            "y": 1012,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 779.5868772782503,
-            "y": 1034,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 779.5868772782503,
-            "y": 1056,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 780.5589307411908,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 11.636695018226003,
-            "x": 782.0309842041313,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 11.636695018226003,
-            "x": 782.0309842041313,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 11.636695018226003,
-            "x": 782.0309842041313,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 11.636695018226003,
-            "x": 782.0309842041313,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 11.636695018226003,
-            "x": 782.0309842041313,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 11.636695018226003,
-            "x": 782.0309842041313,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 6.804374240583233,
-            "x": 781.5309842041313,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 781.5309842041313,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 784.4471445929527,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 784.4471445929527,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 784.4471445929527,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 784.4471445929527,
-            "y": 726,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 784.4471445929527,
-            "y": 748,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 784.4471445929527,
-            "y": 770,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 784.4471445929527,
-            "y": 792,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 784.4471445929527,
-            "y": 814,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 784.4471445929527,
-            "y": 836,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 784.4471445929527,
-            "y": 858,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 784.4471445929527,
-            "y": 880,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 784.4471445929527,
-            "y": 902,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 784.4471445929527,
-            "y": 924,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 784.4471445929527,
-            "y": 946,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 784.4471445929527,
-            "y": 968,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 784.4471445929527,
-            "y": 990,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 785.4191980558932,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 787.363304981774,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 788.3353584447145,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 3.888213851761847,
-            "x": 789.3074119076549,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 793.1956257594168,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 56.35115431348724,
-            "x": 794.6676792223573,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 56.35115431348724,
-            "x": 794.6676792223573,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime.FuncForPC (590 Mil)",
-      "x": 798.1676792223573,
-      "y": 561,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 794.1676792223573,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 794.1676792223573,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 794.1676792223573,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 3.888213851761847,
-            "x": 796.1117861482383,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 13.580801944106927,
-            "x": 800.5,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 13.580801944106927,
-            "x": 800.5,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 800,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 800,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 10.664641555285542,
-            "x": 803.4161603888215,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 10.664641555285542,
-            "x": 803.4161603888215,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 802.9161603888215,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 7.776427703523694,
-            "x": 803.8882138517619,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 34.96597812879708,
-            "x": 815.080801944107,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 34.96597812879708,
-            "x": 815.080801944107,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime.funcline1 (370 Mil)",
-      "x": 818.580801944107,
-      "y": 583,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 24.273390036452007,
-            "x": 815.080801944107,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 24.273390036452007,
-            "x": 815.080801944107,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime.pcvalue (260 Mil)",
-      "x": 818.580801944107,
-      "y": 605,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 3.888213851761847,
-            "x": 814.580801944107,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 13.580801944106927,
-            "x": 818.9690157958688,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 13.580801944106927,
-            "x": 818.9690157958688,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 9.69258809234508,
-            "x": 840.354191980559,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 9.69258809234508,
-            "x": 840.354191980559,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 8.748481166464156,
-            "x": 839.854191980559,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 851.5188335358445,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 851.5188335358445,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 851.5188335358445,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 851.5188335358445,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 851.5188335358445,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 851.5188335358445,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 851.5188335358445,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 851.5188335358445,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 851.5188335358445,
-            "y": 726,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 851.5188335358445,
-            "y": 748,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 852.490886998785,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 854.434993924666,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 854.434993924666,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 854.434993924666,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 854.434993924666,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 6.804374240583233,
-            "x": 856.3791008505468,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 5.832320777642771,
-            "x": 856.3791008505468,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 867.0716889428919,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 867.0716889428919,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 61.211421628189555,
-            "x": 869.5157958687728,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 61.211421628189555,
-            "x": 869.5157958687728,
-            "y": 484,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime/pprof.writeGoroutine (640 Mil)",
-      "x": 873.0157958687728,
-      "y": 495,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 61.211421628189555,
-            "x": 869.5157958687728,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 61.211421628189555,
-            "x": 869.5157958687728,
-            "y": 506,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime/pprof.writeRuntimeProfile (640 Mil)",
-      "x": 873.0157958687728,
-      "y": 517,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 23.301336573511545,
-            "x": 869.5157958687728,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 23.301336573511545,
-            "x": 869.5157958687728,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime/pprof.runtime_goroutineProfileWithLabels (250 Mil)",
-      "x": 873.0157958687728,
-      "y": 539,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 23.301336573511545,
-            "x": 869.5157958687728,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 23.301336573511545,
-            "x": 869.5157958687728,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime.goroutineProfileWithLabels (250 Mil)",
-      "x": 873.0157958687728,
-      "y": 561,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 21.35722964763062,
-            "x": 869.5157958687728,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 21.35722964763062,
-            "x": 869.5157958687728,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime.forEachGRace (230 Mil)",
-      "x": 873.0157958687728,
-      "y": 583,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 16.496962332928312,
-            "x": 869.5157958687728,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 16.496962332928312,
-            "x": 869.5157958687728,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 15.52490886998785,
-            "x": 869.5157958687728,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 15.52490886998785,
-            "x": 869.5157958687728,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 15.52490886998785,
-            "x": 869.5157958687728,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 15.52490886998785,
-            "x": 869.5157958687728,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 15.52490886998785,
-            "x": 869.5157958687728,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 15.52490886998785,
-            "x": 869.5157958687728,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 15.52490886998785,
-            "x": 869.5157958687728,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 15.52490886998785,
-            "x": 869.5157958687728,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 4.860267314702309,
-            "x": 869.0157958687728,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 869.0157958687728,
-            "y": 726,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 3.888213851761847,
-            "x": 869.9878493317133,
-            "y": 726,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 869.9878493317133,
-            "y": 748,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 870.9599027946538,
-            "y": 748,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 5.832320777642771,
-            "x": 873.8760631834751,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 5.832320777642771,
-            "x": 873.8760631834751,
-            "y": 726,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 873.8760631834751,
-            "y": 748,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 874.8481166464156,
-            "y": 748,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 879.7083839611179,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 885.5407047387607,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 885.5407047387607,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 885.5407047387607,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 885.5407047387607,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 4.860267314702309,
-            "x": 886.5127582017011,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 4.860267314702309,
-            "x": 886.5127582017011,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 886.5127582017011,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 891.3730255164035,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 891.3730255164035,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 891.3730255164035,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 891.3730255164035,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 891.3730255164035,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 891.3730255164035,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 891.3730255164035,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 891.3730255164035,
-            "y": 726,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 891.3730255164035,
-            "y": 748,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 892.345078979344,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 892.345078979344,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 892.345078979344,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 892.345078979344,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 36.91008505467801,
-            "x": 893.8171324422843,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 36.91008505467801,
-            "x": 893.8171324422843,
-            "y": 528,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime/pprof.printCountProfile (390 Mil)",
-      "x": 897.3171324422843,
-      "y": 539,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 5.832320777642771,
-            "x": 893.3171324422843,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 3.888213851761847,
-            "x": 893.3171324422843,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 893.3171324422843,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 893.3171324422843,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 893.3171324422843,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 893.3171324422843,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 896.2332928311058,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 896.2332928311058,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 897.2053462940462,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 897.2053462940462,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 899.1494532199272,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 899.1494532199272,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 899.1494532199272,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 899.1494532199272,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 899.1494532199272,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 900.1215066828676,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 8.748481166464156,
-            "x": 902.0656136087485,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 902.0656136087485,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 902.0656136087485,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 5.832320777642771,
-            "x": 903.037667071689,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 903.037667071689,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 3.888213851761847,
-            "x": 904.0097205346294,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 3.888213851761847,
-            "x": 904.0097205346294,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 3.888213851761847,
-            "x": 904.0097205346294,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 904.0097205346294,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 904.0097205346294,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 904.0097205346294,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 904.0097205346294,
-            "y": 726,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 904.0097205346294,
-            "y": 748,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 904.0097205346294,
-            "y": 770,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 904.0097205346294,
-            "y": 792,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 904.0097205346294,
-            "y": 814,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 904.0097205346294,
-            "y": 836,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 904.9817739975699,
-            "y": 836,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 904.9817739975699,
-            "y": 858,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 906.9258809234508,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 906.9258809234508,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 906.9258809234508,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 908.8699878493318,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 908.8699878493318,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 908.8699878493318,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 909.8420413122723,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 909.8420413122723,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 909.8420413122723,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 16.496962332928312,
-            "x": 911.3140947752127,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 16.496962332928312,
-            "x": 911.3140947752127,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 15.52490886998785,
-            "x": 911.3140947752127,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 15.52490886998785,
-            "x": 911.3140947752127,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 4.860267314702309,
-            "x": 910.8140947752127,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 910.8140947752127,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 910.8140947752127,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 910.8140947752127,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 910.8140947752127,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 910.8140947752127,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 912.7582017010936,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 912.7582017010936,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 913.730255164034,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 913.730255164034,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 914.7023086269745,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 914.7023086269745,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 915.674362089915,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 915.674362089915,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 915.674362089915,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 915.674362089915,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 915.674362089915,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 917.6184690157959,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 917.6184690157959,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 917.6184690157959,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 917.6184690157959,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 917.6184690157959,
-            "y": 726,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 917.6184690157959,
-            "y": 748,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 917.6184690157959,
-            "y": 770,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 8.748481166464156,
-            "x": 918.5905224787364,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 918.5905224787364,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 918.5905224787364,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 918.5905224787364,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 918.5905224787364,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 918.5905224787364,
-            "y": 704,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 918.5905224787364,
-            "y": 726,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 918.5905224787364,
-            "y": 748,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 918.5905224787364,
-            "y": 770,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 918.5905224787364,
-            "y": 792,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 918.5905224787364,
-            "y": 814,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 918.5905224787364,
-            "y": 836,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 919.5625759416769,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 919.5625759416769,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 919.5625759416769,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 919.5625759416769,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 6.804374240583233,
-            "x": 920.5346294046172,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 6.804374240583233,
-            "x": 920.5346294046172,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 6.804374240583233,
-            "x": 920.5346294046172,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 6.804374240583233,
-            "x": 920.5346294046172,
-            "y": 682,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 927.3390036452006,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 928.311057108141,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 928.311057108141,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 928.311057108141,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 928.311057108141,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 928.311057108141,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 929.2831105710815,
-            "y": 594,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 929.2831105710815,
-            "y": 616,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 929.2831105710815,
-            "y": 638,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 929.2831105710815,
-            "y": 660,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 930.255164034022,
-            "y": 550,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 930.255164034022,
-            "y": 572,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 932.1992709599028,
-            "y": 330,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 933.1713244228433,
-            "y": 308,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 933.1713244228433,
-            "y": 330,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 933.1713244228433,
-            "y": 352,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 933.1713244228433,
-            "y": 374,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 934.1433778857838,
-            "y": 286,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 934.1433778857838,
-            "y": 308,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 934.1433778857838,
-            "y": 330,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 934.1433778857838,
-            "y": 352,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 935.1154313487242,
-            "y": 330,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 935.1154313487242,
-            "y": 352,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 935.1154313487242,
-            "y": 374,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 935.1154313487242,
-            "y": 396,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 935.1154313487242,
-            "y": 418,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 935.1154313487242,
-            "y": 440,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 936.0874848116647,
-            "y": 264,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 936.0874848116647,
-            "y": 286,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 936.0874848116647,
-            "y": 308,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 936.0874848116647,
-            "y": 330,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 936.0874848116647,
-            "y": 352,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 936.0874848116647,
-            "y": 374,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 937.0595382746052,
-            "y": 220,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 937.0595382746052,
-            "y": 242,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 937.0595382746052,
-            "y": 264,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 937.0595382746052,
-            "y": 286,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 937.0595382746052,
-            "y": 308,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 938.0315917375456,
-            "y": 264,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 938.0315917375456,
-            "y": 286,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 939.0036452004861,
-            "y": 220,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 939.0036452004861,
-            "y": 242,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 939.0036452004861,
-            "y": 264,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 939.0036452004861,
-            "y": 286,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 1.9441069258809236,
-            "x": 939.0036452004861,
-            "y": 308,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 939.0036452004861,
-            "y": 330,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 3.888213851761847,
-            "x": 940.947752126367,
-            "y": 44,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 3.888213851761847,
-            "x": 940.947752126367,
-            "y": 66,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 940.947752126367,
-            "y": 88,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 940.947752126367,
-            "y": 110,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 940.947752126367,
-            "y": 132,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 940.947752126367,
-            "y": 154,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 940.947752126367,
-            "y": 176,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 941.9198055893074,
-            "y": 88,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 941.9198055893074,
-            "y": 110,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 941.9198055893074,
-            "y": 132,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 941.9198055893074,
-            "y": 154,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 941.9198055893074,
-            "y": 176,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 941.9198055893074,
-            "y": 198,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 944.8359659781288,
-            "y": 44,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 944.8359659781288,
-            "y": 66,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 600.7010935601459,
-            "x": 946.3080194410693,
-            "y": 22,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 600.7010935601459,
-            "x": 946.3080194410693,
-            "y": 22,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime.gcBgMarkWorker (6.19 Bil)",
-      "x": 949.8080194410693,
-      "y": 33,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 598.7569866342649,
-            "x": 946.3080194410693,
-            "y": 44,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 598.7569866342649,
-            "x": 946.3080194410693,
-            "y": 44,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime.systemstack (6.17 Bil)",
-      "x": 949.8080194410693,
-      "y": 55,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 598.7569866342649,
-            "x": 946.3080194410693,
-            "y": 66,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 598.7569866342649,
-            "x": 946.3080194410693,
-            "y": 66,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime.gcBgMarkWorker.func2 (6.17 Bil)",
-      "x": 949.8080194410693,
-      "y": 77,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 589.0364520048603,
-            "x": 946.3080194410693,
-            "y": 88,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 589.0364520048603,
-            "x": 946.3080194410693,
-            "y": 88,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime.gcDrain (6.07 Bil)",
-      "x": 949.8080194410693,
-      "y": 99,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 432.53584447144596,
-            "x": 946.3080194410693,
-            "y": 110,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 432.53584447144596,
-            "x": 946.3080194410693,
-            "y": 110,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime.scanobject (4.46 Bil)",
-      "x": 949.8080194410693,
-      "y": 121,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 0.9720534629404618,
-            "x": 945.8080194410693,
-            "y": 132,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 4.860267314702309,
-            "x": 946.7800729040098,
-            "y": 132,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 41.77035236938032,
-            "x": 952.140340218712,
-            "y": 132,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 41.77035236938032,
-            "x": 952.140340218712,
-            "y": 132,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime.pageIndexOf (440 Mil)",
-      "x": 955.640340218712,
-      "y": 143,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
-        {
-          "props": {
-            "height": 22,
-            "width": 51.49088699878494,
-            "x": 994.9106925880924,
-            "y": 132,
-          },
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
         {
           "props": {
-            "height": 22,
-            "width": 51.49088699878494,
-            "x": 994.9106925880924,
-            "y": 132,
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 111.7861482381531,
+            "y": 176,
           },
           "transform": [
             1,
@@ -47915,57 +11399,12 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime.greyobject (540 Mil)",
-      "x": 998.4106925880924,
-      "y": 143,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 994.4106925880924,
-            "y": 154,
+            "width": 0.9720534629404618,
+            "x": 114.70230862697449,
+            "y": 132,
           },
           "transform": [
             1,
@@ -47977,40 +11416,12 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 994.4106925880924,
-            "y": 176,
+            "x": 115.67436208991495,
+            "y": 132,
           },
           "transform": [
             1,
@@ -48022,24 +11433,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 116.64641555285542,
+            "y": 110,
+          },
           "transform": [
             1,
             0,
@@ -48048,14 +11448,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 995.3827460510329,
-            "y": 176,
+            "x": 116.64641555285542,
+            "y": 132,
           },
           "transform": [
             1,
@@ -48067,24 +11467,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 117.61846901579588,
+            "y": 132,
+          },
           "transform": [
             1,
             0,
@@ -48093,14 +11482,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 995.3827460510329,
-            "y": 198,
+            "x": 118.59052247873633,
+            "y": 110,
           },
           "transform": [
             1,
@@ -48112,23 +11501,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 7.776427703523694,
+            "x": 127.33900364520049,
+            "y": 110,
+          },
           "transform": [
             1,
             0,
@@ -48137,13 +11516,13 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 94.26123936816525,
-            "x": 1047.4015795868772,
+            "width": 5.832320777642771,
+            "x": 127.33900364520049,
             "y": 132,
           },
           "transform": [
@@ -48156,24 +11535,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 127.33900364520049,
+            "y": 154,
+          },
           "transform": [
             1,
             0,
@@ -48182,14 +11550,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 94.26123936816525,
-            "x": 1047.4015795868772,
-            "y": 132,
+            "width": 1.9441069258809236,
+            "x": 128.31105710814094,
+            "y": 154,
           },
           "transform": [
             1,
@@ -48201,41 +11569,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime.findObject (980 Mil)",
-      "x": 1050.9015795868772,
-      "y": 143,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 128.31105710814094,
+            "y": 176,
+          },
           "transform": [
             1,
             0,
@@ -48244,13 +11584,13 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1046.9015795868772,
+            "width": 1.9441069258809236,
+            "x": 130.25516403402187,
             "y": 154,
           },
           "transform": [
@@ -48263,24 +11603,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 133.17132442284327,
+            "y": 132,
+          },
           "transform": [
             1,
             0,
@@ -48289,13 +11618,13 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 4.860267314702309,
-            "x": 1142.1628189550427,
+            "width": 0.9720534629404618,
+            "x": 134.14337788578374,
             "y": 132,
           },
           "transform": [
@@ -48308,23 +11637,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 2.9161603888213854,
+            "x": 135.1154313487242,
+            "y": 110,
+          },
           "transform": [
             1,
             0,
@@ -48333,13 +11652,13 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 45.658566221142166,
-            "x": 1147.523086269745,
+            "width": 1.9441069258809236,
+            "x": 135.1154313487242,
             "y": 132,
           },
           "transform": [
@@ -48352,40 +11671,12 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
         {
           "props": {
             "height": 22,
-            "width": 45.658566221142166,
-            "x": 1147.523086269745,
-            "y": 132,
+            "width": 3.888213851761847,
+            "x": 138.03159173754557,
+            "y": 88,
           },
           "transform": [
             1,
@@ -48397,40 +11688,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime.spanOf (480 Mil)",
-      "x": 1151.023086269745,
-      "y": 143,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 2.9161603888213854,
+            "x": 138.03159173754557,
+            "y": 110,
+          },
           "transform": [
             1,
             0,
@@ -48439,13 +11703,13 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 51.49088699878494,
-            "x": 1194.181652490887,
+            "width": 1.9441069258809236,
+            "x": 138.03159173754557,
             "y": 132,
           },
           "transform": [
@@ -48458,24 +11722,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 139.9756986634265,
+            "y": 132,
+          },
           "transform": [
             1,
             0,
@@ -48484,14 +11737,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 51.49088699878494,
-            "x": 1194.181652490887,
-            "y": 132,
+            "width": 0.9720534629404618,
+            "x": 140.94775212636696,
+            "y": 110,
           },
           "transform": [
             1,
@@ -48503,41 +11756,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "maxWidth": null,
-      "text": "runtime.markBits.isMarked (540 Mil)",
-      "x": 1197.681652490887,
-      "y": 143,
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fillText",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 3.888213851761847,
+            "x": 141.91980558930743,
+            "y": 88,
+          },
           "transform": [
             1,
             0,
@@ -48546,14 +11771,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 4.860267314702309,
-            "x": 1246.172539489672,
-            "y": 132,
+            "width": 0.9720534629404618,
+            "x": 141.91980558930743,
+            "y": 110,
           },
           "transform": [
             1,
@@ -48565,23 +11790,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 142.8918590522479,
+            "y": 110,
+          },
           "transform": [
             1,
             0,
@@ -48590,43 +11805,32 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 19.413122721749698,
-            "x": 1379.8438639125152,
+            "width": 0.9720534629404618,
+            "x": 143.86391251518833,
             "y": 110,
           },
           "transform": [
             1,
             0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
+            0,
+            1,
+            0,
+            0,
+          ],
+          "type": "rect",
+        },
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 147.7521263669502,
+            "y": 110,
+          },
           "transform": [
             1,
             0,
@@ -48635,13 +11839,13 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 19.413122721749698,
-            "x": 1379.8438639125152,
+            "width": 4.860267314702309,
+            "x": 148.72417982989066,
             "y": 110,
           },
           "transform": [
@@ -48654,24 +11858,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 3.888213851761847,
+            "x": 148.72417982989066,
+            "y": 132,
+          },
           "transform": [
             1,
             0,
@@ -48680,13 +11873,13 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 2.9161603888213854,
-            "x": 1399.7569866342649,
+            "width": 6.804374240583233,
+            "x": 153.58444714459296,
             "y": 110,
           },
           "transform": [
@@ -48699,24 +11892,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 153.58444714459296,
+            "y": 132,
+          },
           "transform": [
             1,
             0,
@@ -48725,14 +11907,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 2.9161603888213854,
-            "x": 1399.7569866342649,
-            "y": 132,
+            "width": 3.888213851761847,
+            "x": 160.3888213851762,
+            "y": 88,
           },
           "transform": [
             1,
@@ -48744,24 +11926,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 4.860267314702309,
+            "x": 168.16524908869988,
+            "y": 110,
+          },
           "transform": [
             1,
             0,
@@ -48770,14 +11941,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 5.832320777642771,
-            "x": 1402.6731470230864,
-            "y": 110,
+            "width": 0.9720534629404618,
+            "x": 168.16524908869988,
+            "y": 132,
           },
           "transform": [
             1,
@@ -48789,23 +11960,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 169.13730255164035,
+            "y": 132,
+          },
           "transform": [
             1,
             0,
@@ -48814,14 +11975,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 16.496962332928312,
-            "x": 1409.005467800729,
-            "y": 110,
+            "width": 4.860267314702309,
+            "x": 173.0255164034022,
+            "y": 154,
           },
           "transform": [
             1,
@@ -48833,24 +11994,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 173.0255164034022,
+            "y": 176,
+          },
           "transform": [
             1,
             0,
@@ -48859,14 +12009,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 16.496962332928312,
-            "x": 1409.005467800729,
-            "y": 110,
+            "width": 0.9720534629404618,
+            "x": 173.0255164034022,
+            "y": 198,
           },
           "transform": [
             1,
@@ -48878,24 +12028,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 174.9696233292831,
+            "y": 176,
+          },
           "transform": [
             1,
             0,
@@ -48904,14 +12043,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1426.0024301336575,
-            "y": 110,
+            "x": 175.94167679222357,
+            "y": 176,
           },
           "transform": [
             1,
@@ -48923,23 +12062,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 7.776427703523694,
+            "x": 177.8857837181045,
+            "y": 154,
+          },
           "transform": [
             1,
             0,
@@ -48948,14 +12077,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 19.413122721749698,
-            "x": 1427.4744835965978,
-            "y": 110,
+            "width": 1.9441069258809236,
+            "x": 177.8857837181045,
+            "y": 176,
           },
           "transform": [
             1,
@@ -48967,24 +12096,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 179.82989064398544,
+            "y": 176,
+          },
           "transform": [
             1,
             0,
@@ -48993,14 +12111,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 19.413122721749698,
-            "x": 1427.4744835965978,
-            "y": 110,
+            "width": 5.832320777642771,
+            "x": 185.6622114216282,
+            "y": 132,
           },
           "transform": [
             1,
@@ -49012,24 +12130,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 185.6622114216282,
+            "y": 154,
+          },
           "transform": [
             1,
             0,
@@ -49038,13 +12145,13 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 1447.3876063183475,
+            "width": 0.9720534629404618,
+            "x": 316.88942891859057,
             "y": 110,
           },
           "transform": [
@@ -49057,24 +12164,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 317.861482381531,
+            "y": 110,
+          },
           "transform": [
             1,
             0,
@@ -49083,14 +12179,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 1447.3876063183475,
-            "y": 132,
+            "width": 0.9720534629404618,
+            "x": 320.7776427703524,
+            "y": 110,
           },
           "transform": [
             1,
@@ -49102,24 +12198,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 321.74969623329287,
+            "y": 110,
+          },
           "transform": [
             1,
             0,
@@ -49128,14 +12213,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 1447.3876063183475,
-            "y": 154,
+            "width": 5.832320777642771,
+            "x": 322.7217496962333,
+            "y": 110,
           },
           "transform": [
             1,
@@ -49147,24 +12232,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 2.9161603888213854,
+            "x": 328.5540704738761,
+            "y": 110,
+          },
           "transform": [
             1,
             0,
@@ -49173,13 +12247,13 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 9.720534629404618,
-            "x": 1535.8444714459297,
+            "x": 333.4143377885784,
             "y": 88,
           },
           "transform": [
@@ -49192,24 +12266,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 3.888213851761847,
+            "x": 333.4143377885784,
+            "y": 110,
+          },
           "transform": [
             1,
             0,
@@ -49218,14 +12281,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 1545.5650060753342,
-            "y": 44,
+            "width": 0.9720534629404618,
+            "x": 333.4143377885784,
+            "y": 132,
           },
           "transform": [
             1,
@@ -49237,24 +12300,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 337.30255164034025,
+            "y": 110,
+          },
           "transform": [
             1,
             0,
@@ -49263,14 +12315,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 1545.5650060753342,
-            "y": 66,
+            "width": 3.888213851761847,
+            "x": 343.134872417983,
+            "y": 88,
           },
           "transform": [
             1,
@@ -49282,24 +12334,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 2.9161603888213854,
+            "x": 343.134872417983,
+            "y": 110,
+          },
           "transform": [
             1,
             0,
@@ -49308,14 +12349,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1545.5650060753342,
-            "y": 88,
+            "x": 343.134872417983,
+            "y": 132,
           },
           "transform": [
             1,
@@ -49327,24 +12368,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 6.804374240583233,
+            "x": 347.02308626974485,
+            "y": 66,
+          },
           "transform": [
             1,
             0,
@@ -49353,14 +12383,31 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1545.5650060753342,
-            "y": 110,
+            "x": 347.02308626974485,
+            "y": 88,
+          },
+          "transform": [
+            1,
+            0,
+            0,
+            1,
+            0,
+            0,
+          ],
+          "type": "rect",
+        },
+        {
+          "props": {
+            "height": 22,
+            "width": 4.860267314702309,
+            "x": 347.9951397326853,
+            "y": 88,
           },
           "transform": [
             1,
@@ -49372,24 +12419,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 3.888213851761847,
+            "x": 347.9951397326853,
+            "y": 110,
+          },
           "transform": [
             1,
             0,
@@ -49398,14 +12434,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1545.5650060753342,
-            "y": 132,
+            "x": 352.85540704738764,
+            "y": 88,
           },
           "transform": [
             1,
@@ -49417,24 +12453,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 2.9161603888213854,
+            "x": 353.8274605103281,
+            "y": 66,
+          },
           "transform": [
             1,
             0,
@@ -49443,13 +12468,13 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1546.5370595382747,
+            "width": 1.9441069258809236,
+            "x": 353.8274605103281,
             "y": 88,
           },
           "transform": [
@@ -49462,24 +12487,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 355.771567436209,
+            "y": 88,
+          },
           "transform": [
             1,
             0,
@@ -49488,14 +12502,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1546.5370595382747,
-            "y": 110,
+            "x": 356.74362089914945,
+            "y": 66,
           },
           "transform": [
             1,
@@ -49507,24 +12521,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 3.888213851761847,
+            "x": 357.71567436208994,
+            "y": 66,
+          },
           "transform": [
             1,
             0,
@@ -49533,14 +12536,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1546.5370595382747,
-            "y": 132,
+            "width": 1.9441069258809236,
+            "x": 357.71567436208994,
+            "y": 88,
           },
           "transform": [
             1,
@@ -49552,24 +12555,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 361.6038882138518,
+            "y": 88,
+          },
           "transform": [
             1,
             0,
@@ -49578,14 +12570,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1546.5370595382747,
-            "y": 154,
+            "x": 361.6038882138518,
+            "y": 110,
           },
           "transform": [
             1,
@@ -49597,24 +12589,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 363.5479951397327,
+            "y": 110,
+          },
           "transform": [
             1,
             0,
@@ -49623,14 +12604,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1546.5370595382747,
-            "y": 176,
+            "width": 2.9161603888213854,
+            "x": 381.044957472661,
+            "y": 88,
           },
           "transform": [
             1,
@@ -49642,24 +12623,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 397.5698663426489,
+            "y": 66,
+          },
           "transform": [
             1,
             0,
@@ -49668,14 +12638,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1546.5370595382747,
-            "y": 198,
+            "x": 398.5419198055893,
+            "y": 264,
           },
           "transform": [
             1,
@@ -49687,24 +12657,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 399.5139732685298,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -49713,14 +12672,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 3.888213851761847,
-            "x": 1547.5091130012152,
-            "y": 22,
+            "width": 0.9720534629404618,
+            "x": 401.45808019441074,
+            "y": 286,
           },
           "transform": [
             1,
@@ -49732,24 +12691,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 413.12272174969627,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -49758,14 +12706,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1547.5091130012152,
-            "y": 44,
+            "width": 1.9441069258809236,
+            "x": 415.0668286755772,
+            "y": 242,
           },
           "transform": [
             1,
@@ -49777,24 +12725,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 415.0668286755772,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -49803,14 +12740,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1547.5091130012152,
-            "y": 66,
+            "x": 416.03888213851764,
+            "y": 264,
           },
           "transform": [
             1,
@@ -49822,24 +12759,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 7.776427703523694,
+            "x": 417.01093560145813,
+            "y": 330,
+          },
           "transform": [
             1,
             0,
@@ -49848,14 +12774,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1547.5091130012152,
-            "y": 88,
+            "width": 1.9441069258809236,
+            "x": 417.01093560145813,
+            "y": 352,
           },
           "transform": [
             1,
@@ -49867,24 +12793,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 424.7873633049818,
+            "y": 330,
+          },
           "transform": [
             1,
             0,
@@ -49893,14 +12808,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1547.5091130012152,
-            "y": 110,
+            "width": 7.776427703523694,
+            "x": 428.67557715674366,
+            "y": 286,
           },
           "transform": [
             1,
@@ -49912,24 +12827,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 3.888213851761847,
+            "x": 428.67557715674366,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -49938,14 +12842,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1547.5091130012152,
-            "y": 132,
+            "width": 1.9441069258809236,
+            "x": 428.67557715674366,
+            "y": 330,
           },
           "transform": [
             1,
@@ -49957,24 +12861,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 432.5637910085055,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -49983,14 +12876,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1547.5091130012152,
-            "y": 154,
+            "x": 436.4520048602673,
+            "y": 286,
           },
           "transform": [
             1,
@@ -50002,24 +12895,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 4.860267314702309,
+            "x": 437.4240583232078,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -50028,14 +12910,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1547.5091130012152,
-            "y": 176,
+            "x": 437.4240583232078,
+            "y": 308,
           },
           "transform": [
             1,
@@ -50047,24 +12929,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 438.39611178614825,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -50073,14 +12944,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 1.9441069258809236,
-            "x": 1548.4811664641556,
-            "y": 44,
+            "x": 439.36816524908875,
+            "y": 308,
           },
           "transform": [
             1,
@@ -50092,24 +12963,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 442.2843256379101,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -50118,14 +12978,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 1.9441069258809236,
-            "x": 1548.4811664641556,
-            "y": 66,
+            "x": 446.172539489672,
+            "y": 264,
           },
           "transform": [
             1,
@@ -50137,24 +12997,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 446.172539489672,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -50163,14 +13012,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 1548.4811664641556,
-            "y": 88,
+            "width": 0.9720534629404618,
+            "x": 447.1445929526124,
+            "y": 286,
           },
           "transform": [
             1,
@@ -50182,24 +13031,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 448.1166464155529,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -50208,14 +13046,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 1548.4811664641556,
-            "y": 110,
+            "width": 0.9720534629404618,
+            "x": 449.08869987849334,
+            "y": 264,
           },
           "transform": [
             1,
@@ -50227,24 +13065,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 3.888213851761847,
+            "x": 451.0328068043743,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -50253,14 +13080,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 1.9441069258809236,
-            "x": 1548.4811664641556,
-            "y": 132,
+            "x": 451.0328068043743,
+            "y": 286,
           },
           "transform": [
             1,
@@ -50272,24 +13099,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 452.9769137302552,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -50298,14 +13114,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 1548.4811664641556,
-            "y": 154,
+            "width": 9.720534629404618,
+            "x": 454.92102065613614,
+            "y": 264,
           },
           "transform": [
             1,
@@ -50317,24 +13133,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 454.92102065613614,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -50343,14 +13148,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 1548.4811664641556,
-            "y": 176,
+            "width": 2.9161603888213854,
+            "x": 455.8930741190766,
+            "y": 286,
           },
           "transform": [
             1,
@@ -50362,24 +13167,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 7.776427703523694,
+            "x": 464.64155528554073,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -50388,14 +13182,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 1.9441069258809236,
-            "x": 1548.4811664641556,
-            "y": 198,
+            "x": 464.64155528554073,
+            "y": 286,
           },
           "transform": [
             1,
@@ -50407,24 +13201,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 466.58566221142166,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -50433,14 +13216,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1550.4252733900366,
-            "y": 44,
+            "x": 472.4179829890644,
+            "y": 264,
           },
           "transform": [
             1,
@@ -50452,24 +13235,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 3.888213851761847,
+            "x": 473.3900364520049,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -50478,14 +13250,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1550.4252733900366,
-            "y": 66,
+            "x": 473.3900364520049,
+            "y": 286,
           },
           "transform": [
             1,
@@ -50497,24 +13269,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 474.36208991494533,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -50523,14 +13284,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1550.4252733900366,
-            "y": 88,
+            "x": 477.27825030376675,
+            "y": 264,
           },
           "transform": [
             1,
@@ -50542,24 +13303,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 478.2503037667072,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -50568,14 +13318,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1550.4252733900366,
-            "y": 110,
+            "x": 480.1944106925881,
+            "y": 264,
           },
           "transform": [
             1,
@@ -50587,24 +13337,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 481.16646415552856,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -50613,14 +13352,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1550.4252733900366,
-            "y": 132,
+            "x": 483.1105710814095,
+            "y": 264,
           },
           "transform": [
             1,
@@ -50632,39 +13371,12 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
-        {
-          "props": {},
-          "transform": [
-            1,
-            0,
-            0,
-            1,
-            0,
-            0,
-          ],
-          "type": "beginPath",
-        },
         {
           "props": {
             "height": 22,
-            "width": 15.52490886998785,
-            "x": 1551.897326852977,
-            "y": 22,
+            "width": 0.9720534629404618,
+            "x": 486.99878493317135,
+            "y": 242,
           },
           "transform": [
             1,
@@ -50676,24 +13388,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 5.832320777642771,
+            "x": 487.9708383961118,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -50702,14 +13403,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 15.52490886998785,
-            "x": 1551.897326852977,
-            "y": 22,
+            "width": 1.9441069258809236,
+            "x": 487.9708383961118,
+            "y": 286,
           },
           "transform": [
             1,
@@ -50721,23 +13422,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 487.9708383961118,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -50746,14 +13437,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 14.552855407047389,
-            "x": 1551.897326852977,
-            "y": 44,
+            "width": 0.9720534629404618,
+            "x": 489.9149453219927,
+            "y": 286,
           },
           "transform": [
             1,
@@ -50765,24 +13456,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 493.8031591737546,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -50791,14 +13471,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 14.552855407047389,
-            "x": 1551.897326852977,
-            "y": 44,
+            "width": 0.9720534629404618,
+            "x": 498.6634264884569,
+            "y": 242,
           },
           "transform": [
             1,
@@ -50810,24 +13490,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 499.6354799513974,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -50836,14 +13505,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 6.804374240583233,
-            "x": 1551.397326852977,
-            "y": 66,
+            "width": 0.9720534629404618,
+            "x": 500.6075334143378,
+            "y": 286,
           },
           "transform": [
             1,
@@ -50855,24 +13524,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 501.5795868772783,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -50881,14 +13539,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
-            "height": 22,
-            "width": 2.9161603888213854,
-            "x": 1558.2017010935601,
-            "y": 66,
+            "height": 22,
+            "width": 4.860267314702309,
+            "x": 502.55164034021874,
+            "y": 286,
           },
           "transform": [
             1,
@@ -50900,24 +13558,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 7.776427703523694,
+            "x": 514.2162818955043,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -50926,14 +13573,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1558.2017010935601,
-            "y": 88,
+            "width": 3.888213851761847,
+            "x": 514.2162818955043,
+            "y": 286,
           },
           "transform": [
             1,
@@ -50945,24 +13592,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 514.2162818955043,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -50971,14 +13607,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 3.888213851761847,
-            "x": 1561.1178614823816,
-            "y": 66,
+            "width": 0.9720534629404618,
+            "x": 518.1044957472661,
+            "y": 286,
           },
           "transform": [
             1,
@@ -50990,24 +13626,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 521.992709599028,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -51016,14 +13641,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1566.9501822600243,
-            "y": 44,
+            "x": 521.992709599028,
+            "y": 286,
           },
           "transform": [
             1,
@@ -51035,23 +13660,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 522.9647630619685,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -51060,14 +13675,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 15.52490886998785,
-            "x": 1568.4222357229648,
-            "y": 22,
+            "width": 1.9441069258809236,
+            "x": 523.9368165249089,
+            "y": 264,
           },
           "transform": [
             1,
@@ -51079,24 +13694,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "stroke",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 5.832320777642771,
+            "x": 527.8250303766707,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -51105,14 +13709,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 15.52490886998785,
-            "x": 1568.4222357229648,
-            "y": 22,
+            "width": 3.888213851761847,
+            "x": 527.8250303766707,
+            "y": 286,
           },
           "transform": [
             1,
@@ -51124,24 +13728,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 527.8250303766707,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -51150,14 +13743,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 8.748481166464156,
-            "x": 1567.9222357229648,
-            "y": 44,
+            "width": 0.9720534629404618,
+            "x": 528.7970838396112,
+            "y": 308,
           },
           "transform": [
             1,
@@ -51169,24 +13762,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 531.7132442284326,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -51195,14 +13777,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 8.748481166464156,
-            "x": 1567.9222357229648,
-            "y": 66,
+            "width": 2.9161603888213854,
+            "x": 539.4896719319563,
+            "y": 242,
           },
           "transform": [
             1,
@@ -51214,24 +13796,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 539.4896719319563,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -51240,14 +13811,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 6.804374240583233,
-            "x": 1567.9222357229648,
-            "y": 88,
+            "width": 0.9720534629404618,
+            "x": 541.4337788578372,
+            "y": 264,
           },
           "transform": [
             1,
@@ -51259,24 +13830,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 546.2940461725395,
+            "y": 220,
+          },
           "transform": [
             1,
             0,
@@ -51285,14 +13845,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 1567.9222357229648,
-            "y": 110,
+            "width": 0.9720534629404618,
+            "x": 547.26609963548,
+            "y": 220,
           },
           "transform": [
             1,
@@ -51304,24 +13864,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 5.832320777642771,
+            "x": 548.2381530984204,
+            "y": 198,
+          },
           "transform": [
             1,
             0,
@@ -51330,14 +13879,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1567.9222357229648,
-            "y": 132,
+            "width": 2.9161603888213854,
+            "x": 548.2381530984204,
+            "y": 220,
           },
           "transform": [
             1,
@@ -51349,24 +13898,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 548.2381530984204,
+            "y": 242,
+          },
           "transform": [
             1,
             0,
@@ -51375,14 +13913,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 2.9161603888213854,
-            "x": 1569.8663426488458,
-            "y": 110,
+            "width": 1.9441069258809236,
+            "x": 549.2102065613609,
+            "y": 242,
           },
           "transform": [
             1,
@@ -51394,24 +13932,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 2.9161603888213854,
+            "x": 551.1543134872418,
+            "y": 220,
+          },
           "transform": [
             1,
             0,
@@ -51420,14 +13947,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 2.9161603888213854,
-            "x": 1569.8663426488458,
-            "y": 132,
+            "width": 0.9720534629404618,
+            "x": 554.0704738760633,
+            "y": 198,
           },
           "transform": [
             1,
@@ -51439,24 +13966,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 6.804374240583233,
+            "x": 555.0425273390036,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -51465,14 +13981,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 2.9161603888213854,
-            "x": 1569.8663426488458,
-            "y": 154,
+            "width": 3.888213851761847,
+            "x": 555.0425273390036,
+            "y": 286,
           },
           "transform": [
             1,
@@ -51484,24 +14000,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 555.0425273390036,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -51510,14 +14015,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 2.9161603888213854,
-            "x": 1569.8663426488458,
-            "y": 176,
+            "width": 0.9720534629404618,
+            "x": 555.0425273390036,
+            "y": 330,
           },
           "transform": [
             1,
@@ -51529,24 +14034,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 556.0145808019441,
+            "y": 330,
+          },
           "transform": [
             1,
             0,
@@ -51555,14 +14049,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1572.782503037667,
-            "y": 110,
+            "width": 1.9441069258809236,
+            "x": 556.9866342648846,
+            "y": 308,
           },
           "transform": [
             1,
@@ -51574,24 +14068,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 2.9161603888213854,
+            "x": 558.9307411907655,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -51600,14 +14083,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1573.7545565006076,
-            "y": 110,
+            "x": 558.9307411907655,
+            "y": 308,
           },
           "transform": [
             1,
@@ -51618,25 +14101,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
           ],
           "type": "rect",
-        },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
+        },
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 559.902794653706,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -51645,14 +14117,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1573.7545565006076,
-            "y": 132,
+            "width": 6.804374240583233,
+            "x": 561.8469015795869,
+            "y": 264,
           },
           "transform": [
             1,
@@ -51664,24 +14136,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 5.832320777642771,
+            "x": 561.8469015795869,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -51690,14 +14151,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1573.7545565006076,
-            "y": 154,
+            "width": 1.9441069258809236,
+            "x": 561.8469015795869,
+            "y": 308,
           },
           "transform": [
             1,
@@ -51709,24 +14170,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 2.9161603888213854,
+            "x": 563.7910085054679,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -51735,14 +14185,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1574.726609963548,
-            "y": 88,
+            "x": 566.7071688942892,
+            "y": 308,
           },
           "transform": [
             1,
@@ -51754,24 +14204,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 567.6792223572297,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -51780,14 +14219,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1574.726609963548,
-            "y": 110,
+            "width": 9.720534629404618,
+            "x": 568.6512758201701,
+            "y": 264,
           },
           "transform": [
             1,
@@ -51799,24 +14238,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 568.6512758201701,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -51825,14 +14253,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1574.726609963548,
-            "y": 132,
+            "width": 4.860267314702309,
+            "x": 578.3718104495748,
+            "y": 264,
           },
           "transform": [
             1,
@@ -51844,24 +14272,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 8.748481166464156,
+            "x": 586.1482381530984,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -51870,14 +14287,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1575.6986634264886,
-            "y": 88,
+            "width": 5.832320777642771,
+            "x": 586.1482381530984,
+            "y": 330,
           },
           "transform": [
             1,
@@ -51889,24 +14306,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 3.888213851761847,
+            "x": 586.1482381530984,
+            "y": 352,
+          },
           "transform": [
             1,
             0,
@@ -51915,14 +14321,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 7.776427703523694,
-            "x": 1576.670716889429,
-            "y": 44,
+            "width": 1.9441069258809236,
+            "x": 590.0364520048603,
+            "y": 352,
           },
           "transform": [
             1,
@@ -51934,24 +14340,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 2.9161603888213854,
+            "x": 591.9805589307413,
+            "y": 330,
+          },
           "transform": [
             1,
             0,
@@ -51960,14 +14355,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1576.670716889429,
-            "y": 66,
+            "x": 591.9805589307413,
+            "y": 352,
           },
           "transform": [
             1,
@@ -51979,24 +14374,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 592.9526123936816,
+            "y": 352,
+          },
           "transform": [
             1,
             0,
@@ -52005,14 +14389,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1576.670716889429,
-            "y": 88,
+            "x": 592.9526123936816,
+            "y": 374,
           },
           "transform": [
             1,
@@ -52024,24 +14408,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 594.8967193195626,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -52050,14 +14423,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 6.804374240583233,
-            "x": 1577.6427703523696,
-            "y": 66,
+            "width": 0.9720534629404618,
+            "x": 594.8967193195626,
+            "y": 330,
           },
           "transform": [
             1,
@@ -52069,24 +14442,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 595.868772782503,
+            "y": 330,
+          },
           "transform": [
             1,
             0,
@@ -52095,14 +14457,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 5.832320777642771,
-            "x": 1577.6427703523696,
-            "y": 88,
+            "width": 2.9161603888213854,
+            "x": 596.8408262454435,
+            "y": 286,
           },
           "transform": [
             1,
@@ -52114,24 +14476,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 596.8408262454435,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -52140,14 +14491,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1577.6427703523696,
-            "y": 110,
+            "x": 598.7849331713245,
+            "y": 308,
           },
           "transform": [
             1,
@@ -52159,24 +14510,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 3.888213851761847,
+            "x": 599.7569866342649,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -52185,14 +14525,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1577.6427703523696,
-            "y": 132,
+            "x": 599.7569866342649,
+            "y": 308,
           },
           "transform": [
             1,
@@ -52204,24 +14544,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 3.888213851761847,
+            "x": 603.6452004860267,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -52230,14 +14559,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 1578.6148238153098,
-            "y": 110,
+            "width": 0.9720534629404618,
+            "x": 603.6452004860267,
+            "y": 308,
           },
           "transform": [
             1,
@@ -52249,24 +14578,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 7.776427703523694,
+            "x": 607.5334143377886,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -52275,14 +14593,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 1580.5589307411908,
-            "y": 110,
+            "width": 2.9161603888213854,
+            "x": 607.5334143377886,
+            "y": 308,
           },
           "transform": [
             1,
@@ -52294,24 +14612,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 607.5334143377886,
+            "y": 330,
+          },
           "transform": [
             1,
             0,
@@ -52320,14 +14627,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 1.9441069258809236,
-            "x": 1580.5589307411908,
-            "y": 132,
+            "x": 610.44957472661,
+            "y": 308,
           },
           "transform": [
             1,
@@ -52339,24 +14646,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 5.832320777642771,
+            "x": 615.3098420413123,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -52365,14 +14661,31 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1583.4750911300123,
-            "y": 88,
+            "width": 2.9161603888213854,
+            "x": 615.3098420413123,
+            "y": 308,
+          },
+          "transform": [
+            1,
+            0,
+            0,
+            1,
+            0,
+            0,
+          ],
+          "type": "rect",
+        },
+        {
+          "props": {
+            "height": 22,
+            "width": 2.9161603888213854,
+            "x": 618.2260024301337,
+            "y": 308,
           },
           "transform": [
             1,
@@ -52384,24 +14697,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 618.2260024301337,
+            "y": 330,
+          },
           "transform": [
             1,
             0,
@@ -52410,14 +14712,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 7.776427703523694,
-            "x": 1584.4471445929528,
-            "y": 22,
+            "width": 0.9720534629404618,
+            "x": 621.1421628189551,
+            "y": 286,
           },
           "transform": [
             1,
@@ -52429,24 +14731,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 622.1142162818956,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -52455,14 +14746,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1584.4471445929528,
-            "y": 44,
+            "x": 623.086269744836,
+            "y": 286,
           },
           "transform": [
             1,
@@ -52474,24 +14765,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 624.0583232077764,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -52500,14 +14780,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1584.4471445929528,
-            "y": 66,
+            "width": 1.9441069258809236,
+            "x": 626.0024301336574,
+            "y": 308,
           },
           "transform": [
             1,
@@ -52519,24 +14799,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 9.720534629404618,
+            "x": 627.9465370595383,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -52545,14 +14814,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1584.4471445929528,
-            "y": 88,
+            "width": 4.860267314702309,
+            "x": 627.9465370595383,
+            "y": 330,
           },
           "transform": [
             1,
@@ -52564,24 +14833,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 632.8068043742406,
+            "y": 330,
+          },
           "transform": [
             1,
             0,
@@ -52590,14 +14848,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1584.4471445929528,
-            "y": 110,
+            "x": 633.7788578371811,
+            "y": 330,
           },
           "transform": [
             1,
@@ -52609,24 +14867,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 641.5552855407047,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -52635,14 +14882,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1584.4471445929528,
-            "y": 132,
+            "width": 7.776427703523694,
+            "x": 642.5273390036452,
+            "y": 330,
           },
           "transform": [
             1,
@@ -52654,24 +14901,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 5.832320777642771,
+            "x": 642.5273390036452,
+            "y": 352,
+          },
           "transform": [
             1,
             0,
@@ -52680,14 +14916,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 1.9441069258809236,
-            "x": 1585.419198055893,
-            "y": 44,
+            "x": 650.303766707169,
+            "y": 352,
           },
           "transform": [
             1,
@@ -52699,24 +14935,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 5.832320777642771,
+            "x": 675.5771567436209,
+            "y": 330,
+          },
           "transform": [
             1,
             0,
@@ -52725,14 +14950,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 1585.419198055893,
-            "y": 66,
+            "width": 2.9161603888213854,
+            "x": 675.5771567436209,
+            "y": 352,
           },
           "transform": [
             1,
@@ -52744,24 +14969,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 675.5771567436209,
+            "y": 374,
+          },
           "transform": [
             1,
             0,
@@ -52770,14 +14984,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 1.9441069258809236,
-            "x": 1585.419198055893,
-            "y": 88,
+            "x": 682.3815309842041,
+            "y": 308,
           },
           "transform": [
             1,
@@ -52789,24 +15003,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 682.3815309842041,
+            "y": 330,
+          },
           "transform": [
             1,
             0,
@@ -52815,14 +15018,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 1585.419198055893,
-            "y": 110,
+            "width": 0.9720534629404618,
+            "x": 684.3256379100851,
+            "y": 308,
           },
           "transform": [
             1,
@@ -52834,24 +15037,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 685.2976913730256,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -52860,14 +15052,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 1.9441069258809236,
-            "x": 1585.419198055893,
-            "y": 132,
+            "x": 686.269744835966,
+            "y": 308,
           },
           "transform": [
             1,
@@ -52879,24 +15071,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 4.860267314702309,
+            "x": 688.213851761847,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -52905,14 +15086,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 1585.419198055893,
-            "y": 154,
+            "width": 3.888213851761847,
+            "x": 688.213851761847,
+            "y": 330,
           },
           "transform": [
             1,
@@ -52924,24 +15105,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 688.213851761847,
+            "y": 352,
+          },
           "transform": [
             1,
             0,
@@ -52950,14 +15120,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 1585.419198055893,
-            "y": 176,
+            "width": 0.9720534629404618,
+            "x": 692.1020656136088,
+            "y": 330,
           },
           "transform": [
             1,
@@ -52969,24 +15139,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 6.804374240583233,
+            "x": 695.9902794653706,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -52995,14 +15154,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 1585.419198055893,
-            "y": 198,
+            "width": 2.9161603888213854,
+            "x": 695.9902794653706,
+            "y": 308,
           },
           "transform": [
             1,
@@ -53014,24 +15173,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 3.888213851761847,
+            "x": 698.9064398541921,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -53040,14 +15188,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 1585.419198055893,
-            "y": 220,
+            "width": 8.748481166464156,
+            "x": 703.7667071688943,
+            "y": 286,
           },
           "transform": [
             1,
@@ -53059,24 +15207,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 2.9161603888213854,
+            "x": 731.9562575941677,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -53085,14 +15222,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 1585.419198055893,
-            "y": 242,
+            "width": 0.9720534629404618,
+            "x": 731.9562575941677,
+            "y": 286,
           },
           "transform": [
             1,
@@ -53104,24 +15241,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 732.9283110571082,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -53130,14 +15256,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 1.9441069258809236,
-            "x": 1585.419198055893,
-            "y": 264,
+            "x": 734.8724179829891,
+            "y": 286,
           },
           "transform": [
             1,
@@ -53149,24 +15275,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 734.8724179829891,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -53175,14 +15290,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 1.9441069258809236,
-            "x": 1585.419198055893,
-            "y": 286,
+            "width": 0.9720534629404618,
+            "x": 735.8444714459296,
+            "y": 308,
           },
           "transform": [
             1,
@@ -53194,24 +15309,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 8.748481166464156,
+            "x": 736.8165249088701,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -53220,14 +15324,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 4.860267314702309,
-            "x": 1587.363304981774,
-            "y": 44,
+            "width": 5.832320777642771,
+            "x": 736.8165249088701,
+            "y": 330,
           },
           "transform": [
             1,
@@ -53239,24 +15343,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 742.6488456865128,
+            "y": 330,
+          },
           "transform": [
             1,
             0,
@@ -53265,14 +15358,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 4.860267314702309,
-            "x": 1587.363304981774,
-            "y": 66,
+            "width": 2.9161603888213854,
+            "x": 745.5650060753342,
+            "y": 308,
           },
           "transform": [
             1,
@@ -53284,24 +15377,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 745.5650060753342,
+            "y": 330,
+          },
           "transform": [
             1,
             0,
@@ -53310,14 +15392,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 4.860267314702309,
-            "x": 1587.363304981774,
-            "y": 88,
+            "width": 1.9441069258809236,
+            "x": 746.5370595382747,
+            "y": 330,
           },
           "transform": [
             1,
@@ -53329,24 +15411,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 4.860267314702309,
+            "x": 748.4811664641555,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -53355,14 +15426,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 4.860267314702309,
-            "x": 1587.363304981774,
-            "y": 110,
+            "width": 0.9720534629404618,
+            "x": 748.4811664641555,
+            "y": 308,
           },
           "transform": [
             1,
@@ -53374,24 +15445,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 755.2855407047388,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -53400,14 +15460,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 4.860267314702309,
-            "x": 1587.363304981774,
-            "y": 132,
+            "width": 0.9720534629404618,
+            "x": 765.9781287970839,
+            "y": 242,
           },
           "transform": [
             1,
@@ -53419,24 +15479,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 5.832320777642771,
+            "x": 766.9501822600243,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -53445,14 +15494,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 4.860267314702309,
-            "x": 1587.363304981774,
-            "y": 154,
+            "width": 2.9161603888213854,
+            "x": 766.9501822600243,
+            "y": 308,
           },
           "transform": [
             1,
@@ -53464,24 +15513,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 7.776427703523694,
+            "x": 772.7825030376671,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -53490,14 +15528,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 4.860267314702309,
-            "x": 1587.363304981774,
-            "y": 176,
+            "x": 772.7825030376671,
+            "y": 308,
           },
           "transform": [
             1,
@@ -53509,24 +15547,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 772.7825030376671,
+            "y": 330,
+          },
           "transform": [
             1,
             0,
@@ -53535,14 +15562,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1587.363304981774,
-            "y": 198,
+            "x": 772.7825030376671,
+            "y": 352,
           },
           "transform": [
             1,
@@ -53554,24 +15581,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 774.7266099635481,
+            "y": 330,
+          },
           "transform": [
             1,
             0,
@@ -53580,14 +15596,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1587.363304981774,
-            "y": 220,
+            "width": 1.9441069258809236,
+            "x": 777.6427703523694,
+            "y": 308,
           },
           "transform": [
             1,
@@ -53599,24 +15615,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 779.5868772782503,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -53625,14 +15630,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1587.363304981774,
-            "y": 242,
+            "x": 780.5589307411908,
+            "y": 286,
           },
           "transform": [
             1,
@@ -53644,24 +15649,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 6.804374240583233,
+            "x": 781.5309842041313,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -53670,14 +15664,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 5.832320777642771,
-            "x": 1592.2235722964765,
-            "y": 22,
+            "width": 2.9161603888213854,
+            "x": 781.5309842041313,
+            "y": 308,
           },
           "transform": [
             1,
@@ -53689,24 +15683,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 2.9161603888213854,
+            "x": 784.4471445929527,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -53715,14 +15698,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 5.832320777642771,
-            "x": 1592.2235722964765,
-            "y": 44,
+            "width": 0.9720534629404618,
+            "x": 784.4471445929527,
+            "y": 330,
           },
           "transform": [
             1,
@@ -53734,24 +15717,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 785.4191980558932,
+            "y": 330,
+          },
           "transform": [
             1,
             0,
@@ -53760,14 +15732,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 5.832320777642771,
-            "x": 1592.2235722964765,
-            "y": 66,
+            "width": 0.9720534629404618,
+            "x": 787.363304981774,
+            "y": 308,
           },
           "transform": [
             1,
@@ -53779,24 +15751,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 788.3353584447145,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -53805,14 +15766,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 5.832320777642771,
-            "x": 1592.2235722964765,
-            "y": 88,
+            "width": 3.888213851761847,
+            "x": 789.3074119076549,
+            "y": 286,
           },
           "transform": [
             1,
@@ -53824,24 +15785,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 793.1956257594168,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -53850,14 +15800,31 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 5.832320777642771,
-            "x": 1592.2235722964765,
-            "y": 110,
+            "width": 1.9441069258809236,
+            "x": 794.1676792223573,
+            "y": 264,
+          },
+          "transform": [
+            1,
+            0,
+            0,
+            1,
+            0,
+            0,
+          ],
+          "type": "rect",
+        },
+        {
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 794.1676792223573,
+            "y": 286,
           },
           "transform": [
             1,
@@ -53869,24 +15836,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 3.888213851761847,
+            "x": 796.1117861482383,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -53895,14 +15851,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 5.832320777642771,
-            "x": 1592.2235722964765,
-            "y": 132,
+            "width": 2.9161603888213854,
+            "x": 800,
+            "y": 286,
           },
           "transform": [
             1,
@@ -53914,24 +15870,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 802.9161603888215,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -53940,14 +15885,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 5.832320777642771,
-            "x": 1592.2235722964765,
-            "y": 154,
+            "width": 7.776427703523694,
+            "x": 803.8882138517619,
+            "y": 308,
           },
           "transform": [
             1,
@@ -53959,24 +15904,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 3.888213851761847,
+            "x": 814.580801944107,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -53985,14 +15919,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 3.888213851761847,
-            "x": 1592.2235722964765,
-            "y": 176,
+            "width": 8.748481166464156,
+            "x": 839.854191980559,
+            "y": 308,
           },
           "transform": [
             1,
@@ -54004,24 +15938,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 851.5188335358445,
+            "y": 242,
+          },
           "transform": [
             1,
             0,
@@ -54030,14 +15953,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 3.888213851761847,
-            "x": 1592.2235722964765,
-            "y": 198,
+            "width": 1.9441069258809236,
+            "x": 852.490886998785,
+            "y": 242,
           },
           "transform": [
             1,
@@ -54049,24 +15972,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 854.434993924666,
+            "y": 242,
+          },
           "transform": [
             1,
             0,
@@ -54075,14 +15987,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 2.9161603888213854,
-            "x": 1592.2235722964765,
-            "y": 220,
+            "width": 6.804374240583233,
+            "x": 856.3791008505468,
+            "y": 242,
           },
           "transform": [
             1,
@@ -54094,24 +16006,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 5.832320777642771,
+            "x": 856.3791008505468,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -54120,14 +16021,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 2.9161603888213854,
-            "x": 1592.2235722964765,
-            "y": 242,
+            "width": 1.9441069258809236,
+            "x": 867.0716889428919,
+            "y": 220,
           },
           "transform": [
             1,
@@ -54139,24 +16040,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 4.860267314702309,
+            "x": 869.0157958687728,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -54165,14 +16055,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 2.9161603888213854,
-            "x": 1592.2235722964765,
-            "y": 264,
+            "width": 0.9720534629404618,
+            "x": 869.0157958687728,
+            "y": 330,
           },
           "transform": [
             1,
@@ -54184,24 +16074,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 3.888213851761847,
+            "x": 869.9878493317133,
+            "y": 330,
+          },
           "transform": [
             1,
             0,
@@ -54210,14 +16089,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 2.9161603888213854,
-            "x": 1592.2235722964765,
-            "y": 286,
+            "width": 0.9720534629404618,
+            "x": 869.9878493317133,
+            "y": 352,
           },
           "transform": [
             1,
@@ -54229,24 +16108,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 870.9599027946538,
+            "y": 352,
+          },
           "transform": [
             1,
             0,
@@ -54255,13 +16123,13 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 2.9161603888213854,
-            "x": 1592.2235722964765,
+            "width": 5.832320777642771,
+            "x": 873.8760631834751,
             "y": 308,
           },
           "transform": [
@@ -54274,24 +16142,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 873.8760631834751,
+            "y": 330,
+          },
           "transform": [
             1,
             0,
@@ -54300,13 +16157,13 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 2.9161603888213854,
-            "x": 1592.2235722964765,
+            "x": 874.8481166464156,
             "y": 330,
           },
           "transform": [
@@ -54319,24 +16176,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 879.7083839611179,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -54345,14 +16191,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1592.2235722964765,
-            "y": 352,
+            "x": 885.5407047387607,
+            "y": 286,
           },
           "transform": [
             1,
@@ -54364,24 +16210,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 4.860267314702309,
+            "x": 886.5127582017011,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -54390,14 +16225,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1592.2235722964765,
-            "y": 374,
+            "width": 1.9441069258809236,
+            "x": 886.5127582017011,
+            "y": 286,
           },
           "transform": [
             1,
@@ -54409,24 +16244,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 891.3730255164035,
+            "y": 242,
+          },
           "transform": [
             1,
             0,
@@ -54435,14 +16259,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1592.2235722964765,
-            "y": 396,
+            "x": 892.345078979344,
+            "y": 242,
           },
           "transform": [
             1,
@@ -54454,24 +16278,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 5.832320777642771,
+            "x": 893.3171324422843,
+            "y": 242,
+          },
           "transform": [
             1,
             0,
@@ -54480,14 +16293,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1592.2235722964765,
-            "y": 418,
+            "width": 3.888213851761847,
+            "x": 893.3171324422843,
+            "y": 264,
           },
           "transform": [
             1,
@@ -54499,24 +16312,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 2.9161603888213854,
+            "x": 893.3171324422843,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -54525,14 +16327,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1592.2235722964765,
-            "y": 440,
+            "width": 1.9441069258809236,
+            "x": 893.3171324422843,
+            "y": 308,
           },
           "transform": [
             1,
@@ -54544,24 +16346,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 893.3171324422843,
+            "y": 330,
+          },
           "transform": [
             1,
             0,
@@ -54570,14 +16361,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1592.2235722964765,
-            "y": 462,
+            "x": 896.2332928311058,
+            "y": 286,
           },
           "transform": [
             1,
@@ -54589,24 +16380,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 897.2053462940462,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -54615,14 +16395,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1592.2235722964765,
-            "y": 484,
+            "width": 2.9161603888213854,
+            "x": 899.1494532199272,
+            "y": 242,
           },
           "transform": [
             1,
@@ -54634,24 +16414,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 899.1494532199272,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -54660,14 +16429,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1592.2235722964765,
-            "y": 506,
+            "x": 900.1215066828676,
+            "y": 264,
           },
           "transform": [
             1,
@@ -54679,24 +16448,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 8.748481166464156,
+            "x": 902.0656136087485,
+            "y": 242,
+          },
           "transform": [
             1,
             0,
@@ -54705,14 +16463,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1593.1956257594168,
-            "y": 352,
+            "x": 902.0656136087485,
+            "y": 264,
           },
           "transform": [
             1,
@@ -54724,24 +16482,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 5.832320777642771,
+            "x": 903.037667071689,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -54750,14 +16497,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1593.1956257594168,
-            "y": 374,
+            "x": 903.037667071689,
+            "y": 286,
           },
           "transform": [
             1,
@@ -54769,24 +16516,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 3.888213851761847,
+            "x": 904.0097205346294,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -54795,14 +16531,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1593.1956257594168,
-            "y": 396,
+            "width": 2.9161603888213854,
+            "x": 904.0097205346294,
+            "y": 308,
           },
           "transform": [
             1,
@@ -54814,24 +16550,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 904.0097205346294,
+            "y": 330,
+          },
           "transform": [
             1,
             0,
@@ -54840,14 +16565,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1593.1956257594168,
-            "y": 418,
+            "x": 904.9817739975699,
+            "y": 330,
           },
           "transform": [
             1,
@@ -54859,24 +16584,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 906.9258809234508,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -54885,14 +16599,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1594.1676792223573,
-            "y": 352,
+            "width": 1.9441069258809236,
+            "x": 908.8699878493318,
+            "y": 264,
           },
           "transform": [
             1,
@@ -54904,24 +16618,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 908.8699878493318,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -54930,14 +16633,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1594.1676792223573,
-            "y": 374,
+            "x": 909.8420413122723,
+            "y": 286,
           },
           "transform": [
             1,
@@ -54949,24 +16652,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 4.860267314702309,
+            "x": 910.8140947752127,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -54975,14 +16667,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1594.1676792223573,
-            "y": 396,
+            "width": 1.9441069258809236,
+            "x": 910.8140947752127,
+            "y": 308,
           },
           "transform": [
             1,
@@ -54994,24 +16686,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 910.8140947752127,
+            "y": 330,
+          },
           "transform": [
             1,
             0,
@@ -55020,14 +16701,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1594.1676792223573,
-            "y": 418,
+            "x": 912.7582017010936,
+            "y": 308,
           },
           "transform": [
             1,
@@ -55039,24 +16720,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 913.730255164034,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -55065,14 +16735,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1594.1676792223573,
-            "y": 440,
+            "x": 914.7023086269745,
+            "y": 308,
           },
           "transform": [
             1,
@@ -55084,24 +16754,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 2.9161603888213854,
+            "x": 915.674362089915,
+            "y": 286,
+          },
           "transform": [
             1,
             0,
@@ -55110,14 +16769,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1594.1676792223573,
-            "y": 462,
+            "width": 1.9441069258809236,
+            "x": 915.674362089915,
+            "y": 308,
           },
           "transform": [
             1,
@@ -55129,24 +16788,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 917.6184690157959,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -55155,14 +16803,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1594.1676792223573,
-            "y": 484,
+            "width": 8.748481166464156,
+            "x": 918.5905224787364,
+            "y": 286,
           },
           "transform": [
             1,
@@ -55174,24 +16822,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 918.5905224787364,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -55200,14 +16837,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1594.1676792223573,
-            "y": 506,
+            "x": 919.5625759416769,
+            "y": 308,
           },
           "transform": [
             1,
@@ -55219,24 +16856,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 6.804374240583233,
+            "x": 920.5346294046172,
+            "y": 308,
+          },
           "transform": [
             1,
             0,
@@ -55245,14 +16871,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1596.1117861482383,
-            "y": 176,
+            "x": 927.3390036452006,
+            "y": 264,
           },
           "transform": [
             1,
@@ -55264,24 +16890,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 928.311057108141,
+            "y": 242,
+          },
           "transform": [
             1,
             0,
@@ -55290,14 +16905,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1596.1117861482383,
-            "y": 198,
+            "x": 928.311057108141,
+            "y": 264,
           },
           "transform": [
             1,
@@ -55309,24 +16924,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 929.2831105710815,
+            "y": 264,
+          },
           "transform": [
             1,
             0,
@@ -55335,14 +16939,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1596.1117861482383,
-            "y": 220,
+            "x": 930.255164034022,
+            "y": 242,
           },
           "transform": [
             1,
@@ -55354,24 +16958,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 932.1992709599028,
+            "y": 154,
+          },
           "transform": [
             1,
             0,
@@ -55380,14 +16973,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1596.1117861482383,
-            "y": 242,
+            "x": 933.1713244228433,
+            "y": 132,
           },
           "transform": [
             1,
@@ -55399,24 +16992,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 934.1433778857838,
+            "y": 110,
+          },
           "transform": [
             1,
             0,
@@ -55425,14 +17007,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1596.1117861482383,
-            "y": 264,
+            "x": 934.1433778857838,
+            "y": 132,
           },
           "transform": [
             1,
@@ -55444,24 +17026,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 935.1154313487242,
+            "y": 132,
+          },
           "transform": [
             1,
             0,
@@ -55470,14 +17041,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1596.1117861482383,
-            "y": 286,
+            "x": 936.0874848116647,
+            "y": 88,
           },
           "transform": [
             1,
@@ -55489,24 +17060,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 937.0595382746052,
+            "y": 66,
+          },
           "transform": [
             1,
             0,
@@ -55515,14 +17075,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1596.1117861482383,
-            "y": 308,
+            "x": 937.0595382746052,
+            "y": 88,
           },
           "transform": [
             1,
@@ -55534,24 +17094,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 938.0315917375456,
+            "y": 88,
+          },
           "transform": [
             1,
             0,
@@ -55560,14 +17109,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1596.1117861482383,
-            "y": 330,
+            "width": 1.9441069258809236,
+            "x": 939.0036452004861,
+            "y": 66,
           },
           "transform": [
             1,
@@ -55579,24 +17128,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 939.0036452004861,
+            "y": 88,
+          },
           "transform": [
             1,
             0,
@@ -55605,14 +17143,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1596.1117861482383,
-            "y": 352,
+            "width": 3.888213851761847,
+            "x": 940.947752126367,
+            "y": 44,
           },
           "transform": [
             1,
@@ -55624,24 +17162,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 940.947752126367,
+            "y": 66,
+          },
           "transform": [
             1,
             0,
@@ -55650,14 +17177,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1596.1117861482383,
-            "y": 374,
+            "width": 2.9161603888213854,
+            "x": 941.9198055893074,
+            "y": 66,
           },
           "transform": [
             1,
@@ -55669,24 +17196,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 944.8359659781288,
+            "y": 44,
+          },
           "transform": [
             1,
             0,
@@ -55695,14 +17211,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1596.1117861482383,
-            "y": 396,
+            "x": 945.8080194410693,
+            "y": 110,
           },
           "transform": [
             1,
@@ -55714,24 +17230,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 4.860267314702309,
+            "x": 946.7800729040098,
+            "y": 110,
+          },
           "transform": [
             1,
             0,
@@ -55740,14 +17245,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1596.1117861482383,
-            "y": 418,
+            "width": 1.9441069258809236,
+            "x": 994.4106925880924,
+            "y": 132,
           },
           "transform": [
             1,
@@ -55759,24 +17264,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 994.4106925880924,
+            "y": 154,
+          },
           "transform": [
             1,
             0,
@@ -55785,14 +17279,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1596.1117861482383,
-            "y": 440,
+            "x": 995.3827460510329,
+            "y": 154,
           },
           "transform": [
             1,
@@ -55804,24 +17298,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 1046.9015795868772,
+            "y": 132,
+          },
           "transform": [
             1,
             0,
@@ -55830,14 +17313,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1596.1117861482383,
-            "y": 462,
+            "width": 4.860267314702309,
+            "x": 1142.1628189550427,
+            "y": 110,
           },
           "transform": [
             1,
@@ -55849,24 +17332,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 4.860267314702309,
+            "x": 1246.172539489672,
+            "y": 110,
+          },
           "transform": [
             1,
             0,
@@ -55875,14 +17347,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1596.1117861482383,
-            "y": 484,
+            "width": 2.9161603888213854,
+            "x": 1399.7569866342649,
+            "y": 88,
           },
           "transform": [
             1,
@@ -55894,24 +17366,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 5.832320777642771,
+            "x": 1402.6731470230864,
+            "y": 88,
+          },
           "transform": [
             1,
             0,
@@ -55920,14 +17381,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1596.1117861482383,
-            "y": 506,
+            "x": 1426.0024301336575,
+            "y": 88,
           },
           "transform": [
             1,
@@ -55939,24 +17400,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 1447.3876063183475,
+            "y": 88,
+          },
           "transform": [
             1,
             0,
@@ -55965,14 +17415,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1597.0838396111787,
-            "y": 176,
+            "width": 9.720534629404618,
+            "x": 1535.8444714459297,
+            "y": 66,
           },
           "transform": [
             1,
@@ -55984,24 +17434,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 1545.5650060753342,
+            "y": 44,
+          },
           "transform": [
             1,
             0,
@@ -56010,14 +17449,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1597.0838396111787,
-            "y": 198,
+            "x": 1545.5650060753342,
+            "y": 66,
           },
           "transform": [
             1,
@@ -56029,24 +17468,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 1546.5370595382747,
+            "y": 66,
+          },
           "transform": [
             1,
             0,
@@ -56055,14 +17483,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1597.0838396111787,
-            "y": 220,
+            "width": 3.888213851761847,
+            "x": 1547.5091130012152,
+            "y": 22,
           },
           "transform": [
             1,
@@ -56074,24 +17502,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 1547.5091130012152,
+            "y": 44,
+          },
           "transform": [
             1,
             0,
@@ -56100,14 +17517,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1597.0838396111787,
-            "y": 242,
+            "width": 1.9441069258809236,
+            "x": 1548.4811664641556,
+            "y": 44,
           },
           "transform": [
             1,
@@ -56119,24 +17536,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 1550.4252733900366,
+            "y": 44,
+          },
           "transform": [
             1,
             0,
@@ -56145,14 +17551,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1597.0838396111787,
-            "y": 264,
+            "width": 6.804374240583233,
+            "x": 1551.397326852977,
+            "y": 66,
           },
           "transform": [
             1,
@@ -56164,24 +17570,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 2.9161603888213854,
+            "x": 1558.2017010935601,
+            "y": 66,
+          },
           "transform": [
             1,
             0,
@@ -56190,14 +17585,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1597.0838396111787,
-            "y": 286,
+            "x": 1558.2017010935601,
+            "y": 88,
           },
           "transform": [
             1,
@@ -56209,24 +17604,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 3.888213851761847,
+            "x": 1561.1178614823816,
+            "y": 66,
+          },
           "transform": [
             1,
             0,
@@ -56235,14 +17619,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1597.0838396111787,
-            "y": 308,
+            "x": 1566.9501822600243,
+            "y": 44,
           },
           "transform": [
             1,
@@ -56254,24 +17638,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 8.748481166464156,
+            "x": 1567.9222357229648,
+            "y": 44,
+          },
           "transform": [
             1,
             0,
@@ -56280,14 +17653,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1598.0558930741192,
-            "y": 22,
+            "width": 6.804374240583233,
+            "x": 1567.9222357229648,
+            "y": 66,
           },
           "transform": [
             1,
@@ -56299,24 +17672,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 1567.9222357229648,
+            "y": 88,
+          },
           "transform": [
             1,
             0,
@@ -56325,14 +17687,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1598.0558930741192,
-            "y": 44,
+            "x": 1567.9222357229648,
+            "y": 110,
           },
           "transform": [
             1,
@@ -56344,24 +17706,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 2.9161603888213854,
+            "x": 1569.8663426488458,
+            "y": 88,
+          },
           "transform": [
             1,
             0,
@@ -56370,14 +17721,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1598.0558930741192,
-            "y": 66,
+            "x": 1572.782503037667,
+            "y": 88,
           },
           "transform": [
             1,
@@ -56389,24 +17740,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 1573.7545565006076,
+            "y": 88,
+          },
           "transform": [
             1,
             0,
@@ -56415,14 +17755,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1598.0558930741192,
-            "y": 88,
+            "x": 1574.726609963548,
+            "y": 66,
           },
           "transform": [
             1,
@@ -56434,24 +17774,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 1575.6986634264886,
+            "y": 66,
+          },
           "transform": [
             1,
             0,
@@ -56460,14 +17789,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1598.0558930741192,
-            "y": 110,
+            "width": 7.776427703523694,
+            "x": 1576.670716889429,
+            "y": 44,
           },
           "transform": [
             1,
@@ -56479,24 +17808,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 1576.670716889429,
+            "y": 66,
+          },
           "transform": [
             1,
             0,
@@ -56505,14 +17823,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1598.0558930741192,
-            "y": 132,
+            "width": 6.804374240583233,
+            "x": 1577.6427703523696,
+            "y": 66,
           },
           "transform": [
             1,
@@ -56524,24 +17842,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 5.832320777642771,
+            "x": 1577.6427703523696,
+            "y": 88,
+          },
           "transform": [
             1,
             0,
@@ -56550,14 +17857,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1598.0558930741192,
-            "y": 154,
+            "x": 1577.6427703523696,
+            "y": 110,
           },
           "transform": [
             1,
@@ -56569,24 +17876,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 1.9441069258809236,
+            "x": 1578.6148238153098,
+            "y": 110,
+          },
           "transform": [
             1,
             0,
@@ -56595,14 +17891,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1598.0558930741192,
-            "y": 176,
+            "width": 1.9441069258809236,
+            "x": 1580.5589307411908,
+            "y": 110,
           },
           "transform": [
             1,
@@ -56614,24 +17910,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 1583.4750911300123,
+            "y": 88,
+          },
           "transform": [
             1,
             0,
@@ -56640,14 +17925,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1598.0558930741192,
-            "y": 198,
+            "width": 7.776427703523694,
+            "x": 1584.4471445929528,
+            "y": 22,
           },
           "transform": [
             1,
@@ -56659,24 +17944,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 1584.4471445929528,
+            "y": 44,
+          },
           "transform": [
             1,
             0,
@@ -56685,14 +17959,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1598.0558930741192,
-            "y": 220,
+            "width": 1.9441069258809236,
+            "x": 1585.419198055893,
+            "y": 44,
           },
           "transform": [
             1,
@@ -56704,24 +17978,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 4.860267314702309,
+            "x": 1587.363304981774,
+            "y": 44,
+          },
           "transform": [
             1,
             0,
@@ -56730,14 +17993,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1598.0558930741192,
-            "y": 242,
+            "x": 1587.363304981774,
+            "y": 66,
           },
           "transform": [
             1,
@@ -56749,24 +18012,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 5.832320777642771,
+            "x": 1592.2235722964765,
+            "y": 22,
+          },
           "transform": [
             1,
             0,
@@ -56775,14 +18027,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
-            "width": 0.9720534629404618,
-            "x": 1598.0558930741192,
-            "y": 264,
+            "width": 3.888213851761847,
+            "x": 1592.2235722964765,
+            "y": 44,
           },
           "transform": [
             1,
@@ -56794,24 +18046,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 2.9161603888213854,
+            "x": 1592.2235722964765,
+            "y": 66,
+          },
           "transform": [
             1,
             0,
@@ -56820,14 +18061,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1599.0279465370597,
-            "y": 22,
+            "x": 1592.2235722964765,
+            "y": 88,
           },
           "transform": [
             1,
@@ -56839,24 +18080,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 1593.1956257594168,
+            "y": 88,
+          },
           "transform": [
             1,
             0,
@@ -56865,14 +18095,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1599.0279465370597,
-            "y": 44,
+            "x": 1594.1676792223573,
+            "y": 88,
           },
           "transform": [
             1,
@@ -56884,24 +18114,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 1596.1117861482383,
+            "y": 44,
+          },
           "transform": [
             1,
             0,
@@ -56910,14 +18129,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
-            "x": 1599.0279465370597,
-            "y": 66,
+            "x": 1597.0838396111787,
+            "y": 44,
           },
           "transform": [
             1,
@@ -56929,24 +18148,13 @@ exports[`FlameGraph should render correctly 1`] = `
           ],
           "type": "rect",
         },
-      ],
-    },
-    "transform": [
-      1,
-      0,
-      0,
-      1,
-      0,
-      0,
-    ],
-    "type": "fill",
-  },
-  {
-    "props": {
-      "fillRule": "nonzero",
-      "path": [
         {
-          "props": {},
+          "props": {
+            "height": 22,
+            "width": 0.9720534629404618,
+            "x": 1598.0558930741192,
+            "y": 22,
+          },
           "transform": [
             1,
             0,
@@ -56955,14 +18163,14 @@ exports[`FlameGraph should render correctly 1`] = `
             0,
             0,
           ],
-          "type": "beginPath",
+          "type": "rect",
         },
         {
           "props": {
             "height": 22,
             "width": 0.9720534629404618,
             "x": 1599.0279465370597,
-            "y": 88,
+            "y": 22,
           },
           "transform": [
             1,
diff --git a/packages/grafana-flamegraph/src/FlameGraph/dataTransform.test.ts b/packages/grafana-flamegraph/src/FlameGraph/dataTransform.test.ts
index 89757c1f6e6ce..af0d8f19cc15b 100644
--- a/packages/grafana-flamegraph/src/FlameGraph/dataTransform.test.ts
+++ b/packages/grafana-flamegraph/src/FlameGraph/dataTransform.test.ts
@@ -1,6 +1,7 @@
 import { createDataFrame, FieldType } from '@grafana/data';
 
-import { FlameGraphDataContainer, LevelItem, nestedSetToLevels } from './dataTransform';
+import { CollapsedMapContainer, FlameGraphDataContainer, LevelItem, nestedSetToLevels } from './dataTransform';
+import { textToDataContainer } from './testHelpers';
 
 describe('nestedSetToLevels', () => {
   it('converts nested set data frame to levels', () => {
@@ -17,7 +18,7 @@ describe('nestedSetToLevels', () => {
         { name: 'self', values: [0, 0, 0, 0, 0, 0, 0, 0, 0] },
       ],
     });
-    const [levels] = nestedSetToLevels(new FlameGraphDataContainer(frame));
+    const [levels] = nestedSetToLevels(new FlameGraphDataContainer(frame, { collapsing: true }));
 
     const n9: LevelItem = { itemIndexes: [8], start: 5, children: [], value: 1, level: 4 };
     const n8: LevelItem = { itemIndexes: [7], start: 5, children: [n9], value: 2, level: 3 };
@@ -54,7 +55,7 @@ describe('nestedSetToLevels', () => {
         { name: 'self', values: [10, 5, 3, 1] },
       ],
     });
-    const [levels] = nestedSetToLevels(new FlameGraphDataContainer(frame));
+    const [levels] = nestedSetToLevels(new FlameGraphDataContainer(frame, { collapsing: true }));
 
     const n4: LevelItem = { itemIndexes: [3], start: 8, children: [], value: 1, level: 1 };
     const n3: LevelItem = { itemIndexes: [2], start: 5, children: [], value: 3, level: 1 };
@@ -69,3 +70,126 @@ describe('nestedSetToLevels', () => {
     expect(levels[1]).toEqual([n2, n3, n4]);
   });
 });
+
+describe('FlameGraphDataContainer', () => {
+  it('creates correct collapse map', () => {
+    const container = textToDataContainer(`
+      [0//////////////]
+      [1][3//][6///]
+      [2][4]  [7///]
+         [5]  [8///]
+              [9///]
+    `)!;
+
+    const collapsedMap = container.getCollapsedMap();
+    expect(Array.from(collapsedMap.keys()).map((item) => item.itemIndexes[0])).toEqual([1, 2, 4, 5, 6, 7, 8, 9]);
+
+    expect(Array.from(collapsedMap.values())[0]).toMatchObject({
+      collapsed: true,
+      items: [{ itemIndexes: [1] }, { itemIndexes: [2] }],
+    });
+  });
+
+  it('creates correct collapse map 2', () => {
+    // Should not create any groups because even though the 1 is within threshold it has a sibling
+    const container = textToDataContainer(
+      `
+      [0////////////////////////////////]
+      [1/////////////////////////////][2]
+    `,
+      { collapsing: true, collapsingThreshold: 0.5 }
+    )!;
+
+    const collapsedMap = container.getCollapsedMap();
+    expect(Array.from(collapsedMap.keys()).length).toEqual(0);
+  });
+
+  it('creates empty collapse map if no items are similar', () => {
+    const container = textToDataContainer(`
+      [0//////////////]
+      [1][3//][6///]
+              [9/]
+    `)!;
+
+    const collapsedMap = container.getCollapsedMap();
+    expect(Array.from(collapsedMap.keys()).length).toEqual(0);
+  });
+});
+
+describe('CollapsedMapContainer', () => {
+  const defaultItem: LevelItem = {
+    itemIndexes: [0],
+    value: 100,
+    level: 0,
+    children: [],
+    start: 0,
+  };
+
+  it('groups items if they are within value threshold', () => {
+    const container = new CollapsedMapContainer();
+
+    const child2: LevelItem = {
+      ...defaultItem,
+      itemIndexes: [2],
+      value: 99.1,
+    };
+
+    const child1: LevelItem = {
+      ...defaultItem,
+      itemIndexes: [1],
+      children: [child2],
+    };
+
+    const parent: LevelItem = {
+      ...defaultItem,
+      children: [child1],
+    };
+
+    container.addItem(child1, parent);
+    container.addItem(child2, child1);
+    expect(container.getMap().get(child1)).toMatchObject({ collapsed: true, items: [parent, child1, child2] });
+    expect(container.getMap().get(child2)).toMatchObject({ collapsed: true, items: [parent, child1, child2] });
+    expect(container.getMap().get(parent)).toMatchObject({ collapsed: true, items: [parent, child1, child2] });
+  });
+
+  it("doesn't group items if they are outside value threshold", () => {
+    const container = new CollapsedMapContainer();
+
+    const parent: LevelItem = {
+      ...defaultItem,
+    };
+
+    const child: LevelItem = {
+      ...defaultItem,
+      itemIndexes: [1],
+      value: 98,
+    };
+
+    container.addItem(child, parent);
+    expect(container.getMap().size).toBe(0);
+  });
+
+  it("doesn't group items if parent has multiple children", () => {
+    const container = new CollapsedMapContainer();
+
+    const child1: LevelItem = {
+      ...defaultItem,
+      itemIndexes: [1],
+      value: 99.1,
+    };
+
+    const child2: LevelItem = {
+      ...defaultItem,
+      itemIndexes: [2],
+      value: 0.09,
+    };
+
+    const parent: LevelItem = {
+      ...defaultItem,
+      children: [child1, child2],
+    };
+
+    container.addItem(child1, parent);
+    expect(container.getMap().size).toBe(0);
+  });
+});
diff --git a/packages/grafana-flamegraph/src/FlameGraph/dataTransform.ts b/packages/grafana-flamegraph/src/FlameGraph/dataTransform.ts
index 526b608280fe6..142500c926e57 100644
--- a/packages/grafana-flamegraph/src/FlameGraph/dataTransform.ts
+++ b/packages/grafana-flamegraph/src/FlameGraph/dataTransform.ts
@@ -34,13 +34,14 @@ export type CollapseConfig = {
   collapsed: boolean;
 };
 
-export type CollapsedMap = Map<LevelItem, CollapseConfig>;
-
 /**
  * Convert data frame with nested set format into array of level. This is mainly done for compatibility with current
  * rendering code.
  */
-export function nestedSetToLevels(container: FlameGraphDataContainer): [LevelItem[][], Record<string, LevelItem[]>] {
+export function nestedSetToLevels(
+  container: FlameGraphDataContainer,
+  options?: Options
+): [LevelItem[][], Record<string, LevelItem[]>, CollapsedMap] {
   const levels: LevelItem[][] = [];
   let offset = 0;
 
@@ -85,12 +86,68 @@ export function nestedSetToLevels(container: FlameGraphDataContainer): [LevelIte
     if (parent) {
       parent.children.push(newItem);
     }
-    parent = newItem;
 
+    parent = newItem;
     levels[currentLevel].push(newItem);
   }
 
-  return [levels, uniqueLabels];
+  const collapsedMapContainer = new CollapsedMapContainer(options?.collapsingThreshold);
+  if (options?.collapsing) {
+    // We collapse similar items here, where it seems like parent and child are the same thing and so the distinction
+    // isn't that important. We create a map of items that should be collapsed together. We need to do it with complete
+    // tree as we need to know how many children an item has to know if we can collapse it.
+    collapsedMapContainer.addTree(levels[0][0]);
+  }
+
+  return [levels, uniqueLabels, collapsedMapContainer.getMap()];
+}
+
+export type CollapsedMap = Map<LevelItem, CollapseConfig>;
+export class CollapsedMapContainer {
+  private map = new Map();
+  private threshold = 0.99;
+
+  constructor(threshold?: number) {
+    if (threshold !== undefined) {
+      this.threshold = threshold;
+    }
+  }
+
+  addTree(root: LevelItem) {
+    const stack = [root];
+    while (stack.length) {
+      const current = stack.shift()!;
+
+      if (current.parents?.length) {
+        this.addItem(current, current.parents[0]);
+      }
+
+      if (current.children.length) {
+        stack.unshift(...current.children);
+      }
+    }
+  }
+
+  addItem(item: LevelItem, parent?: LevelItem) {
+    // The heuristics here is pretty simple right now. Just check if it's single child and if we are within threshold.
+    // We assume items with small self just aren't too important while we cannot really collapse items with siblings
+    // as it's not clear what to do with said sibling.
+    if (parent && item.value > parent.value * this.threshold && parent.children.length === 1) {
+      if (this.map.has(parent)) {
+        const config = this.map.get(parent)!;
+        this.map.set(item, config);
+        config.items.push(item);
+      } else {
+        const config = { items: [parent, item], collapsed: true };
+        this.map.set(parent, config);
+        this.map.set(item, config);
+      }
+    }
+  }
+
+  getMap() {
+    return new Map(this.map);
+  }
 }
 
 export function getMessageCheckFieldsResult(wrongFields: CheckFieldsResult) {
@@ -144,8 +201,15 @@ export function checkFields(data: DataFrame): CheckFieldsResult | undefined {
   return undefined;
 }
 
+export type Options = {
+  collapsing: boolean;
+  collapsingThreshold?: number;
+};
+
 export class FlameGraphDataContainer {
   data: DataFrame;
+  options: Options;
+
   labelField: Field;
   levelField: Field;
   valueField: Field;
@@ -161,9 +225,11 @@ export class FlameGraphDataContainer {
 
   private levels: LevelItem[][] | undefined;
   private uniqueLabelsMap: Record<string, LevelItem[]> | undefined;
+  private collapsedMap: Map<LevelItem, CollapseConfig> | undefined;
 
-  constructor(data: DataFrame, theme: GrafanaTheme2 = createTheme()) {
+  constructor(data: DataFrame, options: Options, theme: GrafanaTheme2 = createTheme()) {
     this.data = data;
+    this.options = options;
 
     const wrongFields = checkFields(data);
     if (wrongFields) {
@@ -206,7 +272,7 @@ export class FlameGraphDataContainer {
   }
 
   isDiffFlamegraph() {
-    return this.valueRightField && this.selfRightField;
+    return Boolean(this.valueRightField && this.selfRightField);
   }
 
   getLabel(index: number) {
@@ -275,11 +341,17 @@ export class FlameGraphDataContainer {
     return this.uniqueLabelsMap![label];
   }
 
+  getCollapsedMap() {
+    this.initLevels();
+    return this.collapsedMap!;
+  }
+
   private initLevels() {
     if (!this.levels) {
-      const [levels, uniqueLabelsMap] = nestedSetToLevels(this);
+      const [levels, uniqueLabelsMap, collapsedMap] = nestedSetToLevels(this, this.options);
       this.levels = levels;
       this.uniqueLabelsMap = uniqueLabelsMap;
+      this.collapsedMap = collapsedMap;
     }
   }
 }
diff --git a/packages/grafana-flamegraph/src/FlameGraph/rendering.test.ts b/packages/grafana-flamegraph/src/FlameGraph/rendering.test.ts
index 314eab7486e62..cbdfa0b6e5751 100644
--- a/packages/grafana-flamegraph/src/FlameGraph/rendering.test.ts
+++ b/packages/grafana-flamegraph/src/FlameGraph/rendering.test.ts
@@ -2,6 +2,7 @@ import { createDataFrame, FieldType } from '@grafana/data';
 
 import { FlameGraphDataContainer, LevelItem } from './dataTransform';
 import { walkTree } from './rendering';
+import { textToDataContainer } from './testHelpers';
 
 function makeDataFrame(fields: Record<string, Array<number | string>>) {
   return createDataFrame({
@@ -20,22 +21,36 @@ type RenderData = {
   width: number;
   height: number;
   label: string;
-  collapsed: boolean;
+  muted: boolean;
 };
 
 describe('walkTree', () => {
   it('correctly compute sizes for a single item', () => {
     const root: LevelItem = { start: 0, itemIndexes: [0], children: [], value: 100, level: 0 };
-    const container = new FlameGraphDataContainer(makeDataFrame({ value: [100], level: [1], label: ['1'], self: [0] }));
-    walkTree(root, 'children', container, 100, 0, 1, 100, (item, x, y, width, height, label, collapsed) => {
-      expect(item).toEqual(root);
-      expect(x).toEqual(0);
-      expect(y).toEqual(0);
-      expect(width).toEqual(99); // -1 for border
-      expect(height).toEqual(22);
-      expect(label).toEqual('1');
-      expect(collapsed).toEqual(false);
-    });
+    const container = new FlameGraphDataContainer(
+      makeDataFrame({ value: [100], level: [0], label: ['1'], self: [0] }),
+      { collapsing: true }
+    );
+
+    walkTree(
+      root,
+      'children',
+      container,
+      100,
+      0,
+      1,
+      100,
+      container.getCollapsedMap(),
+      (item, x, y, width, height, label, collapsed) => {
+        expect(item).toEqual(root);
+        expect(x).toEqual(0);
+        expect(y).toEqual(0);
+        expect(width).toEqual(99); // -1 for border
+        expect(height).toEqual(22);
+        expect(label).toEqual('1');
+        expect(collapsed).toEqual(false);
+      }
+    );
   });
 
   it('should render a multiple items', () => {
@@ -50,20 +65,31 @@ describe('walkTree', () => {
       ],
     };
     const container = new FlameGraphDataContainer(
-      makeDataFrame({ value: [100, 50, 50], level: [0, 1, 1], label: ['1', '2', '3'], self: [0, 50, 50] })
+      makeDataFrame({ value: [100, 50, 50], level: [0, 1, 1], label: ['1', '2', '3'], self: [0, 50, 50] }),
+      { collapsing: true }
     );
     const renderData: RenderData[] = [];
-    walkTree(root, 'children', container, 100, 0, 1, 100, (item, x, y, width, height, label, collapsed) => {
-      renderData.push({ item, x, y, width, height, label, collapsed });
-    });
+    walkTree(
+      root,
+      'children',
+      container,
+      100,
+      0,
+      1,
+      100,
+      container.getCollapsedMap(),
+      (item, x, y, width, height, label, muted) => {
+        renderData.push({ item, x, y, width, height, label, muted });
+      }
+    );
     expect(renderData).toEqual([
-      { item: root, width: 99, height: 22, x: 0, y: 0, collapsed: false, label: '1' },
-      { item: root.children[0], width: 49, height: 22, x: 0, y: 22, collapsed: false, label: '2' },
-      { item: root.children[1], width: 49, height: 22, x: 50, y: 22, collapsed: false, label: '3' },
+      { item: root, width: 99, height: 22, x: 0, y: 0, muted: false, label: '1' },
+      { item: root.children[0], width: 49, height: 22, x: 0, y: 22, muted: false, label: '2' },
+      { item: root.children[1], width: 49, height: 22, x: 50, y: 22, muted: false, label: '3' },
     ]);
   });
 
-  it('should render a collapsed items', () => {
+  it('should render a muted items', () => {
     const root: LevelItem = {
       start: 0,
       itemIndexes: [0],
@@ -75,16 +101,27 @@ describe('walkTree', () => {
       ],
     };
     const container = new FlameGraphDataContainer(
-      makeDataFrame({ value: [100, 1, 1], level: [0, 1, 1], label: ['1', '2', '3'], self: [0, 1, 1] })
+      makeDataFrame({ value: [100, 1, 1], level: [0, 1, 1], label: ['1', '2', '3'], self: [0, 1, 1] }),
+      { collapsing: true }
     );
     const renderData: RenderData[] = [];
-    walkTree(root, 'children', container, 100, 0, 1, 100, (item, x, y, width, height, label, collapsed) => {
-      renderData.push({ item, x, y, width, height, label, collapsed });
-    });
+    walkTree(
+      root,
+      'children',
+      container,
+      100,
+      0,
+      1,
+      100,
+      container.getCollapsedMap(),
+      (item, x, y, width, height, label, muted) => {
+        renderData.push({ item, x, y, width, height, label, muted });
+      }
+    );
     expect(renderData).toEqual([
-      { item: root, width: 99, height: 22, x: 0, y: 0, collapsed: false, label: '1' },
-      { item: root.children[0], width: 1, height: 22, x: 0, y: 22, collapsed: true, label: '2' },
-      { item: root.children[1], width: 1, height: 22, x: 1, y: 22, collapsed: true, label: '3' },
+      { item: root, width: 99, height: 22, x: 0, y: 0, muted: false, label: '1' },
+      { item: root.children[0], width: 1, height: 22, x: 0, y: 22, muted: true, label: '2' },
+      { item: root.children[1], width: 1, height: 22, x: 1, y: 22, muted: true, label: '3' },
     ]);
   });
 
@@ -100,12 +137,54 @@ describe('walkTree', () => {
       ],
     };
     const container = new FlameGraphDataContainer(
-      makeDataFrame({ value: [100, 0.1, 0.1], level: [0, 1, 1], label: ['1', '2', '3'], self: [0, 0.1, 0.1] })
+      makeDataFrame({ value: [100, 0.1, 0.1], level: [0, 1, 1], label: ['1', '2', '3'], self: [0, 0.1, 0.1] }),
+      { collapsing: true }
     );
     const renderData: RenderData[] = [];
-    walkTree(root, 'children', container, 100, 0, 1, 100, (item, x, y, width, height, label, collapsed) => {
-      renderData.push({ item, x, y, width, height, label, collapsed });
-    });
-    expect(renderData).toEqual([{ item: root, width: 99, height: 22, x: 0, y: 0, collapsed: false, label: '1' }]);
+    walkTree(
+      root,
+      'children',
+      container,
+      100,
+      0,
+      1,
+      100,
+      container.getCollapsedMap(),
+      (item, x, y, width, height, label, muted) => {
+        renderData.push({ item, x, y, width, height, label, muted });
+      }
+    );
+    expect(renderData).toEqual([{ item: root, width: 99, height: 22, x: 0, y: 0, muted: false, label: '1' }]);
+  });
+
+  it('should correctly skip a collapsed items', () => {
+    const container = textToDataContainer(`
+      [0///////////]
+      [1][3//][4///]
+      [2]     [5///]
+    `)!;
+
+    const root = container.getLevels()[0][0];
+
+    const renderData: RenderData[] = [];
+    walkTree(
+      root,
+      'children',
+      container,
+      14,
+      0,
+      1,
+      14,
+      container.getCollapsedMap(),
+      (item, x, y, width, height, label, muted) => {
+        renderData.push({ item, x, y, width, height, label, muted });
+      }
+    );
+    expect(renderData).toEqual([
+      { item: root, width: 13, height: 22, x: 0, y: 0, muted: false, label: '0' },
+      { item: root.children[0], width: 3, height: 22, x: 0, y: 22, muted: true, label: '1' },
+      { item: root.children[1], width: 5, height: 22, x: 3, y: 22, muted: true, label: '3' },
+      { item: root.children[2], width: 6, height: 22, x: 8, y: 22, muted: true, label: '4' },
+    ]);
   });
 });
diff --git a/packages/grafana-flamegraph/src/FlameGraph/rendering.ts b/packages/grafana-flamegraph/src/FlameGraph/rendering.ts
index c829649cfff79..96b25b93abb0d 100644
--- a/packages/grafana-flamegraph/src/FlameGraph/rendering.ts
+++ b/packages/grafana-flamegraph/src/FlameGraph/rendering.ts
@@ -1,5 +1,4 @@
-import uFuzzy from '@leeoniya/ufuzzy';
-import { RefObject, useEffect, useMemo, useState } from 'react';
+import { RefObject, useCallback, useEffect, useMemo, useState } from 'react';
 import color from 'tinycolor2';
 
 import { GrafanaTheme2 } from '@grafana/data';
@@ -8,17 +7,19 @@ import { useTheme2 } from '@grafana/ui';
 import {
   BAR_BORDER_WIDTH,
   BAR_TEXT_PADDING_LEFT,
-  COLLAPSE_THRESHOLD,
+  MUTE_THRESHOLD,
   HIDE_THRESHOLD,
   LABEL_THRESHOLD,
   PIXELS_PER_LEVEL,
+  GROUP_STRIP_WIDTH,
+  GROUP_STRIP_PADDING,
+  GROUP_STRIP_MARGIN_LEFT,
+  GROUP_TEXT_OFFSET,
 } from '../constants';
 import { ClickedItemData, ColorScheme, ColorSchemeDiff, TextAlign } from '../types';
 
 import { getBarColorByDiff, getBarColorByPackage, getBarColorByValue } from './colors';
-import { FlameGraphDataContainer, LevelItem } from './dataTransform';
-
-const ufuzzy = new uFuzzy();
+import { CollapseConfig, CollapsedMap, FlameGraphDataContainer, LevelItem } from './dataTransform';
 
 type RenderOptions = {
   canvasRef: RefObject<HTMLCanvasElement>;
@@ -34,7 +35,7 @@ type RenderOptions = {
   rangeMin: number;
   rangeMax: number;
 
-  search: string;
+  matchedLabels: Set<string> | undefined;
   textAlign: TextAlign;
 
   // Total ticks that will be used for sizing
@@ -46,6 +47,7 @@ type RenderOptions = {
   totalTicksRight: number | undefined;
   colorScheme: ColorScheme | ColorSchemeDiff;
   focusedItemData?: ClickedItemData;
+  collapsedMap: CollapsedMap;
 };
 
 export function useFlameRender(options: RenderOptions) {
@@ -58,32 +60,39 @@ export function useFlameRender(options: RenderOptions) {
     wrapperWidth,
     rangeMin,
     rangeMax,
-    search,
+    matchedLabels,
     textAlign,
     totalViewTicks,
     totalColorTicks,
     totalTicksRight,
     colorScheme,
     focusedItemData,
+    collapsedMap,
   } = options;
-  const foundLabels = useFoundLabels(search, data);
   const ctx = useSetupCanvas(canvasRef, wrapperWidth, depth);
   const theme = useTheme2();
 
   // There is a bit of dependency injections here that does not add readability, mainly to prevent recomputing some
   // common stuff for all the nodes in the graph when only once is enough. perf/readability tradeoff.
 
+  const mutedColor = useMemo(() => {
+    const barMutedColor = color(theme.colors.background.secondary);
+    return theme.isLight ? barMutedColor.darken(10).toHexString() : barMutedColor.lighten(10).toHexString();
+  }, [theme]);
+
   const getBarColor = useColorFunction(
     totalColorTicks,
     totalTicksRight,
     colorScheme,
     theme,
+    mutedColor,
     rangeMin,
     rangeMax,
-    foundLabels,
+    matchedLabels,
     focusedItemData ? focusedItemData.item.level : 0
   );
-  const renderFunc = useRenderFunc(ctx, data, getBarColor, textAlign);
+
+  const renderFunc = useRenderFunc(ctx, data, getBarColor, textAlign, collapsedMap);
 
   useEffect(() => {
     if (!ctx) {
@@ -91,50 +100,164 @@ export function useFlameRender(options: RenderOptions) {
     }
 
     ctx.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);
-    walkTree(root, direction, data, totalViewTicks, rangeMin, rangeMax, wrapperWidth, renderFunc);
-  }, [ctx, data, root, wrapperWidth, rangeMin, rangeMax, totalViewTicks, direction, renderFunc]);
+
+    const mutedPath2D = new Path2D();
+
+    //
+    // Walk the tree and compute the dimensions for each item in the flamegraph.
+    //
+    walkTree(
+      root,
+      direction,
+      data,
+      totalViewTicks,
+      rangeMin,
+      rangeMax,
+      wrapperWidth,
+      collapsedMap,
+      (item, x, y, width, height, label, muted) => {
+        if (muted) {
+          // We do a bit of optimization for muted regions, and we render them all in single fill later on as they don't
+          // have labels and are the same color.
+          mutedPath2D.rect(x, y, width, height);
+        } else {
+          renderFunc(item, x, y, width, height, label);
+        }
+      }
+    );
+
+    // Only fill the muted rects
+    ctx.fillStyle = mutedColor;
+    ctx.fill(mutedPath2D);
+  }, [
+    ctx,
+    data,
+    root,
+    wrapperWidth,
+    rangeMin,
+    rangeMax,
+    totalViewTicks,
+    direction,
+    renderFunc,
+    collapsedMap,
+    mutedColor,
+  ]);
 }
 
-type RenderFunc = (
+type RenderFunc = (item: LevelItem, x: number, y: number, width: number, height: number, label: string) => void;
+
+type RenderFuncWrap = (
   item: LevelItem,
   x: number,
   y: number,
   width: number,
   height: number,
   label: string,
-  // Collapsed means the width is too small to show the label, and we group collapsed siblings together.
-  collapsed: boolean
+  muted: boolean
 ) => void;
 
+/**
+ * Create a render function with some memoization to prevent excesive repainting of the canvas.
+ * @param ctx
+ * @param data
+ * @param getBarColor
+ * @param textAlign
+ * @param collapsedMap
+ */
 function useRenderFunc(
   ctx: CanvasRenderingContext2D | undefined,
   data: FlameGraphDataContainer,
-  getBarColor: (item: LevelItem, label: string, collapsed: boolean) => string,
-  textAlign: TextAlign
-): RenderFunc {
+  getBarColor: (item: LevelItem, label: string, muted: boolean) => string,
+  textAlign: TextAlign,
+  collapsedMap: CollapsedMap
+) {
   return useMemo(() => {
     if (!ctx) {
       return () => {};
     }
 
-    return (item, x, y, width, height, label, collapsed) => {
+    const renderFunc: RenderFunc = (item, x, y, width, height, label) => {
       ctx.beginPath();
-      ctx.rect(x + (collapsed ? 0 : BAR_BORDER_WIDTH), y, width, height);
-      ctx.fillStyle = getBarColor(item, label, collapsed);
-
-      if (collapsed) {
-        // Only fill the collapsed rects
-        ctx.fill();
-      } else {
-        ctx.stroke();
-        ctx.fill();
+      ctx.rect(x + BAR_BORDER_WIDTH, y, width, height);
+      ctx.fillStyle = getBarColor(item, label, false);
+      ctx.stroke();
+      ctx.fill();
+
+      const collapsedItemConfig = collapsedMap.get(item);
+      let finalLabel = label;
+      if (collapsedItemConfig && collapsedItemConfig.collapsed) {
+        const numberOfCollapsedItems = collapsedItemConfig.items.length;
+        finalLabel = `(${numberOfCollapsedItems}) ` + label;
+      }
 
-        if (width >= LABEL_THRESHOLD) {
-          renderLabel(ctx, data, label, item, width, x, y, textAlign);
+      if (width >= LABEL_THRESHOLD) {
+        if (collapsedItemConfig) {
+          renderLabel(
+            ctx,
+            data,
+            finalLabel,
+            item,
+            width,
+            textAlign === 'left' ? x + GROUP_STRIP_MARGIN_LEFT + GROUP_TEXT_OFFSET : x,
+            y,
+            textAlign
+          );
+
+          renderGroupingStrip(ctx, x, y, height, item, collapsedItemConfig);
+        } else {
+          renderLabel(ctx, data, finalLabel, item, width, x, y, textAlign);
         }
       }
     };
-  }, [ctx, getBarColor, textAlign, data]);
+
+    return renderFunc;
+  }, [ctx, getBarColor, textAlign, data, collapsedMap]);
+}
+
+/**
+ * Render small strip on the left side of the bar to indicate that this item is part of a group that can be collapsed.
+ * @param ctx
+ * @param x
+ * @param y
+ * @param height
+ * @param item
+ * @param collapsedItemConfig
+ */
+function renderGroupingStrip(
+  ctx: CanvasRenderingContext2D,
+  x: number,
+  y: number,
+  height: number,
+  item: LevelItem,
+  collapsedItemConfig: CollapseConfig
+) {
+  const groupStripX = x + GROUP_STRIP_MARGIN_LEFT;
+
+  // This is to mask the label in case we align it right to left.
+  ctx.beginPath();
+  ctx.rect(x, y, groupStripX - x + GROUP_STRIP_WIDTH + GROUP_STRIP_PADDING, height);
+  ctx.fill();
+
+  // For item in a group that can be collapsed, we draw a small strip to mark them. On the items that are at the
+  // start or and end of a group we draw just half the strip so 2 groups next to each other are separated
+  // visually.
+  ctx.beginPath();
+  if (collapsedItemConfig.collapsed) {
+    ctx.rect(groupStripX, y + height / 4, GROUP_STRIP_WIDTH, height / 2);
+  } else {
+    if (collapsedItemConfig.items[0] === item) {
+      // Top item
+      ctx.rect(groupStripX, y + height / 2, GROUP_STRIP_WIDTH, height / 2);
+    } else if (collapsedItemConfig.items[collapsedItemConfig.items.length - 1] === item) {
+      // Bottom item
+      ctx.rect(groupStripX, y, GROUP_STRIP_WIDTH, height / 2);
+    } else {
+      ctx.rect(groupStripX, y, GROUP_STRIP_WIDTH, height);
+    }
+  }
+
+  ctx.fillStyle = '#666';
+  ctx.fill();
 }
 
 /**
@@ -151,19 +274,22 @@ export function walkTree(
   rangeMin: number,
   rangeMax: number,
   wrapperWidth: number,
-  renderFunc: RenderFunc
+  collapsedMap: CollapsedMap,
+  renderFunc: RenderFuncWrap
 ) {
-  const stack: LevelItem[] = [];
-  stack.push(root);
+  // The levelOffset here is to keep track if items that we don't render because they are collapsed into single row.
+  // That means we have to render next items with an offset of some rows up in the stack.
+  const stack: Array<{ item: LevelItem; levelOffset: number }> = [];
+  stack.push({ item: root, levelOffset: 0 });
 
   const pixelsPerTick = (wrapperWidth * window.devicePixelRatio) / totalViewTicks / (rangeMax - rangeMin);
+  let collapsedItemRendered: LevelItem | undefined = undefined;
 
   while (stack.length > 0) {
-    const item = stack.shift()!;
+    const { item, levelOffset } = stack.shift()!;
     let curBarTicks = item.value;
-    // Multiple collapsed items are shown as a single gray bar
-    const collapsed = curBarTicks * pixelsPerTick <= COLLAPSE_THRESHOLD;
-    const width = curBarTicks * pixelsPerTick - (collapsed ? 0 : BAR_BORDER_WIDTH * 2);
+    const muted = curBarTicks * pixelsPerTick <= MUTE_THRESHOLD;
+    const width = curBarTicks * pixelsPerTick - (muted ? 0 : BAR_BORDER_WIDTH * 2);
     const height = PIXELS_PER_LEVEL;
 
     if (width < HIDE_THRESHOLD) {
@@ -171,40 +297,41 @@ export function walkTree(
       continue;
     }
 
-    const barX = getBarX(item.start, totalViewTicks, rangeMin, pixelsPerTick);
-    const barY = item.level * PIXELS_PER_LEVEL;
-
-    let label = data.getLabel(item.itemIndexes[0]);
+    let offsetModifier = 0;
+    let skipRender = false;
+    const collapsedItemConfig = collapsedMap.get(item);
+    const isCollapsedItem = collapsedItemConfig && collapsedItemConfig.collapsed;
 
-    renderFunc(item, barX, barY, width, height, label, collapsed);
-
-    const nextList = direction === 'children' ? item.children : item.parents;
-    if (nextList) {
-      stack.unshift(...nextList);
+    if (isCollapsedItem) {
+      if (collapsedItemRendered === collapsedItemConfig.items[0]) {
+        offsetModifier = direction === 'children' ? -1 : +1;
+        skipRender = true;
+      } else {
+        // This is a case where we have another collapsed group right after different collapsed group, so we need to
+        // reset.
+        collapsedItemRendered = undefined;
+      }
+    } else {
+      collapsedItemRendered = undefined;
     }
-  }
-}
 
-/**
- * Based on the search string it does a fuzzy search over all the unique labels so we can highlight them later.
- */
-function useFoundLabels(search: string | undefined, data: FlameGraphDataContainer): Set<string> | undefined {
-  return useMemo(() => {
-    if (search) {
-      const foundLabels = new Set<string>();
-      let idxs = ufuzzy.filter(data.getUniqueLabels(), search);
+    if (!skipRender) {
+      const barX = getBarX(item.start, totalViewTicks, rangeMin, pixelsPerTick);
+      const barY = (item.level + levelOffset) * PIXELS_PER_LEVEL;
 
-      if (idxs) {
-        for (let idx of idxs) {
-          foundLabels.add(data.getUniqueLabels()[idx]);
-        }
+      let label = data.getLabel(item.itemIndexes[0]);
+      if (isCollapsedItem) {
+        collapsedItemRendered = item;
       }
 
-      return foundLabels;
+      renderFunc(item, barX, barY, width, height, label, muted);
+    }
+
+    const nextList = direction === 'children' ? item.children : item.parents;
+    if (nextList) {
+      stack.unshift(...nextList.map((c) => ({ item: c, levelOffset: levelOffset + offsetModifier })));
     }
-    // In this case undefined means there was no search so no attempt to highlighting anything should be made.
-    return undefined;
-  }, [search, data]);
+  }
 }
 
 function useColorFunction(
@@ -212,24 +339,18 @@ function useColorFunction(
   totalTicksRight: number | undefined,
   colorScheme: ColorScheme | ColorSchemeDiff,
   theme: GrafanaTheme2,
+  mutedColor: string,
   rangeMin: number,
   rangeMax: number,
-  foundNames: Set<string> | undefined,
+  matchedLabels: Set<string> | undefined,
   topLevel: number
 ) {
-  return useMemo(() => {
-    // We use the same color for all muted bars so let's do it just once and reuse the result in the closure of the
-    // returned function.
-    const barMutedColor = color(theme.colors.background.secondary);
-    const barMutedColorHex = theme.isLight
-      ? barMutedColor.darken(10).toHexString()
-      : barMutedColor.lighten(10).toHexString();
-
-    return function getColor(item: LevelItem, label: string, collapsed: boolean) {
+  return useCallback(
+    function getColor(item: LevelItem, label: string, muted: boolean) {
       // If collapsed and no search we can quickly return the muted color
-      if (collapsed && !foundNames) {
+      if (muted && !matchedLabels) {
         // Collapsed are always grayed
-        return barMutedColorHex;
+        return mutedColor;
       }
 
       const barColor =
@@ -237,18 +358,19 @@ function useColorFunction(
         (colorScheme === ColorSchemeDiff.Default || colorScheme === ColorSchemeDiff.DiffColorBlind)
           ? getBarColorByDiff(item.value, item.valueRight!, totalTicks, totalTicksRight!, colorScheme)
           : colorScheme === ColorScheme.ValueBased
-          ? getBarColorByValue(item.value, totalTicks, rangeMin, rangeMax)
-          : getBarColorByPackage(label, theme);
+            ? getBarColorByValue(item.value, totalTicks, rangeMin, rangeMax)
+            : getBarColorByPackage(label, theme);
 
-      if (foundNames) {
+      if (matchedLabels) {
         // Means we are searching, we use color for matches and gray the rest
-        return foundNames.has(label) ? barColor.toHslString() : barMutedColorHex;
+        return matchedLabels.has(label) ? barColor.toHslString() : mutedColor;
       }
 
       // Mute if we are above the focused symbol
       return item.level > topLevel - 1 ? barColor.toHslString() : barColor.lighten(15).toHslString();
-    };
-  }, [totalTicks, totalTicksRight, colorScheme, theme, rangeMin, rangeMax, foundNames, topLevel]);
+    },
+    [totalTicks, totalTicksRight, colorScheme, theme, rangeMin, rangeMax, matchedLabels, topLevel, mutedColor]
+  );
 }
 
 function useSetupCanvas(canvasRef: RefObject<HTMLCanvasElement>, wrapperWidth: number, numberOfLevels: number) {
@@ -312,7 +434,7 @@ function renderLabel(
     }
   }
 
-  ctx.fillText(fullLabel, labelX, y + PIXELS_PER_LEVEL / 2);
+  ctx.fillText(fullLabel, labelX, y + PIXELS_PER_LEVEL / 2 + 2);
   ctx.restore();
 }
 
diff --git a/packages/grafana-flamegraph/src/FlameGraph/testHelpers.ts b/packages/grafana-flamegraph/src/FlameGraph/testHelpers.ts
index 482fb5a230031..69eab859df174 100644
--- a/packages/grafana-flamegraph/src/FlameGraph/testHelpers.ts
+++ b/packages/grafana-flamegraph/src/FlameGraph/testHelpers.ts
@@ -1,6 +1,6 @@
 import { arrayToDataFrame, FieldType } from '@grafana/data';
 
-import { FlameGraphDataContainer, LevelItem } from './dataTransform';
+import { FlameGraphDataContainer, LevelItem, Options } from './dataTransform';
 
 // Convert text to a FlameGraphDataContainer for testing. The format representing the flamegraph for example:
 // [0///////]
@@ -9,7 +9,7 @@ import { FlameGraphDataContainer, LevelItem } from './dataTransform';
 // [3]  [6]
 //      [7]
 // Each node starts with [ ends with ], single digit is used for label and the length of a node is it's value.
-export function textToDataContainer(text: string) {
+export function textToDataContainer(text: string, options?: Options) {
   const levels = text.split('\n');
 
   if (levels.length === 0) {
@@ -80,7 +80,7 @@ export function textToDataContainer(text: string) {
   const df = arrayToDataFrame(dfSorted);
   const labelField = df.fields.find((f) => f.name === 'label')!;
   labelField.type = FieldType.string;
-  return new FlameGraphDataContainer(df);
+  return new FlameGraphDataContainer(df, options || { collapsing: true });
 }
 
 export function trimLevelsString(s: string) {
diff --git a/packages/grafana-flamegraph/src/FlameGraphContainer.test.tsx b/packages/grafana-flamegraph/src/FlameGraphContainer.test.tsx
index 7fc17fcb4b12c..4a3fc56761b29 100644
--- a/packages/grafana-flamegraph/src/FlameGraphContainer.test.tsx
+++ b/packages/grafana-flamegraph/src/FlameGraphContainer.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
@@ -40,9 +40,13 @@ describe('FlameGraphContainer', () => {
     render(<FlameGraphContainerWithProps />);
     await userEvent.click((await screen.findAllByTitle('Highlight symbol'))[0]);
     expect(screen.getByDisplayValue('net/http.HandlerFunc.ServeHTTP')).toBeInTheDocument();
+    // Unclick the selection so that we can click something else and continue test checks
+    await userEvent.click((await screen.findAllByTitle('Highlight symbol'))[0]);
+
     await userEvent.click((await screen.findAllByTitle('Highlight symbol'))[1]);
     expect(screen.getByDisplayValue('total')).toBeInTheDocument();
-    await userEvent.click((await screen.findAllByTitle('Highlight symbol'))[1]);
+    // after it is highlighted it will be the only (first) item in the table so [1] -> [0]
+    await userEvent.click((await screen.findAllByTitle('Highlight symbol'))[0]);
     expect(screen.queryByDisplayValue('total')).not.toBeInTheDocument();
   });
 
@@ -87,4 +91,27 @@ describe('FlameGraphContainer', () => {
 
     expect(screen.queryByTestId(/Both/)).toBeNull();
   });
+
+  it('should filter table items based on search input', async () => {
+    // Render the FlameGraphContainer with necessary props
+    render(<FlameGraphContainerWithProps />);
+
+    // Checking for presence of this function before filter
+    const matchingText = 'net/http.HandlerFunc.ServeHTTP';
+    const nonMatchingText = 'runtime.systemstack';
+
+    expect(screen.queryAllByText(matchingText).length).toBe(1);
+    expect(screen.queryAllByText(nonMatchingText).length).toBe(1);
+
+    // Apply the filter
+    const searchInput = await screen.getByPlaceholderText('Search...');
+    await userEvent.type(searchInput, 'Handler serve');
+
+    // We have to wait for filter to take effect
+    await waitFor(() => {
+      expect(screen.queryAllByText(nonMatchingText).length).toBe(0);
+    });
+    // Check we didn't lose the one that should match
+    expect(screen.queryAllByText(matchingText).length).toBe(1);
+  });
 });
diff --git a/packages/grafana-flamegraph/src/FlameGraphContainer.tsx b/packages/grafana-flamegraph/src/FlameGraphContainer.tsx
index ac4439b244a2a..c4962e5b181ec 100644
--- a/packages/grafana-flamegraph/src/FlameGraphContainer.tsx
+++ b/packages/grafana-flamegraph/src/FlameGraphContainer.tsx
@@ -1,4 +1,5 @@
 import { css } from '@emotion/css';
+import uFuzzy from '@leeoniya/ufuzzy';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useMeasure } from 'react-use';
 
@@ -6,12 +7,15 @@ import { DataFrame, GrafanaTheme2 } from '@grafana/data';
 import { ThemeContext } from '@grafana/ui';
 
 import FlameGraph from './FlameGraph/FlameGraph';
+import { GetExtraContextMenuButtonsFunction } from './FlameGraph/FlameGraphContextMenu';
 import { FlameGraphDataContainer } from './FlameGraph/dataTransform';
 import FlameGraphHeader from './FlameGraphHeader';
 import FlameGraphTopTableContainer from './TopTable/FlameGraphTopTableContainer';
 import { MIN_WIDTH_TO_SHOW_BOTH_TOPTABLE_AND_FLAMEGRAPH } from './constants';
 import { ClickedItemData, ColorScheme, ColorSchemeDiff, SelectedView, TextAlign } from './types';
 
+const ufuzzy = new uFuzzy();
+
 export type Props = {
   /**
    * DataFrame with the profile data. The dataFrame needs to have the following fields:
@@ -49,10 +53,25 @@ export type Props = {
    */
   extraHeaderElements?: React.ReactNode;
 
+  /**
+   * Extra buttons that will be shown in the context menu when user clicks on a Node.
+   */
+  getExtraContextMenuButtons?: GetExtraContextMenuButtonsFunction;
+
   /**
    * If true the flamegraph will be rendered on top of the table.
    */
   vertical?: boolean;
+
+  /**
+   * If true only the flamegraph will be rendered.
+   */
+  showFlameGraphOnly?: boolean;
+
+  /**
+   * Disable behaviour where similar items in the same stack will be collapsed into single item.
+   */
+  disableCollapsing?: boolean;
 };
 
 const FlameGraphContainer = ({
@@ -65,6 +84,9 @@ const FlameGraphContainer = ({
   stickyHeader,
   extraHeaderElements,
   vertical,
+  showFlameGraphOnly,
+  disableCollapsing,
+  getExtraContextMenuButtons,
 }: Props) => {
   const [focusedItemData, setFocusedItemData] = useState<ClickedItemData>();
 
@@ -83,10 +105,11 @@ const FlameGraphContainer = ({
     if (!data) {
       return;
     }
-    return new FlameGraphDataContainer(data, theme);
-  }, [data, theme]);
+    return new FlameGraphDataContainer(data, { collapsing: !disableCollapsing }, theme);
+  }, [data, theme, disableCollapsing]);
   const [colorScheme, setColorScheme] = useColorScheme(dataContainer);
-  const styles = getStyles(theme, vertical);
+  const styles = getStyles(theme);
+  const matchedLabels = useLabelSearch(search, dataContainer);
 
   // If user resizes window with both as the selected view
   useEffect(() => {
@@ -132,75 +155,104 @@ const FlameGraphContainer = ({
     return null;
   }
 
+  const flameGraph = (
+    <FlameGraph
+      data={dataContainer}
+      rangeMin={rangeMin}
+      rangeMax={rangeMax}
+      matchedLabels={matchedLabels}
+      setRangeMin={setRangeMin}
+      setRangeMax={setRangeMax}
+      onItemFocused={(data) => setFocusedItemData(data)}
+      focusedItemData={focusedItemData}
+      textAlign={textAlign}
+      sandwichItem={sandwichItem}
+      onSandwich={(label: string) => {
+        resetFocus();
+        setSandwichItem(label);
+      }}
+      onFocusPillClick={resetFocus}
+      onSandwichPillClick={resetSandwich}
+      colorScheme={colorScheme}
+      showFlameGraphOnly={showFlameGraphOnly}
+      collapsing={!disableCollapsing}
+      getExtraContextMenuButtons={getExtraContextMenuButtons}
+      selectedView={selectedView}
+      search={search}
+    />
+  );
+
+  const table = (
+    <FlameGraphTopTableContainer
+      data={dataContainer}
+      onSymbolClick={onSymbolClick}
+      search={search}
+      matchedLabels={matchedLabels}
+      sandwichItem={sandwichItem}
+      onSandwich={setSandwichItem}
+      onSearch={setSearch}
+      onTableSort={onTableSort}
+    />
+  );
+
+  let body;
+  if (showFlameGraphOnly || selectedView === SelectedView.FlameGraph) {
+    body = flameGraph;
+  } else if (selectedView === SelectedView.TopTable) {
+    body = <div className={styles.tableContainer}>{table}</div>;
+  } else if (selectedView === SelectedView.Both) {
+    if (vertical) {
+      body = (
+        <div>
+          <div className={styles.verticalGraphContainer}>{flameGraph}</div>
+          <div className={styles.verticalTableContainer}>{table}</div>
+        </div>
+      );
+    } else {
+      body = (
+        <div className={styles.horizontalContainer}>
+          <div className={styles.horizontalTableContainer}>{table}</div>
+          <div className={styles.horizontalGraphContainer}>{flameGraph}</div>
+        </div>
+      );
+    }
+  }
+
   return (
     // We add the theme context to bridge the gap if this is rendered in non grafana environment where the context
     // isn't already provided.
     <ThemeContext.Provider value={theme}>
       <div ref={sizeRef} className={styles.container}>
-        <FlameGraphHeader
-          search={search}
-          setSearch={setSearch}
-          selectedView={selectedView}
-          setSelectedView={(view) => {
-            setSelectedView(view);
-            onViewSelected?.(view);
-          }}
-          containerWidth={containerWidth}
-          onReset={() => {
-            resetFocus();
-            resetSandwich();
-          }}
-          textAlign={textAlign}
-          onTextAlignChange={(align) => {
-            setTextAlign(align);
-            onTextAlignSelected?.(align);
-          }}
-          showResetButton={Boolean(focusedItemData || sandwichItem)}
-          colorScheme={colorScheme}
-          onColorSchemeChange={setColorScheme}
-          stickyHeader={Boolean(stickyHeader)}
-          extraHeaderElements={extraHeaderElements}
-          vertical={vertical}
-          isDiffMode={Boolean(dataContainer.isDiffFlamegraph())}
-        />
-
-        <div className={styles.body}>
-          {selectedView !== SelectedView.FlameGraph && (
-            <FlameGraphTopTableContainer
-              data={dataContainer}
-              onSymbolClick={onSymbolClick}
-              height={selectedView === SelectedView.TopTable ? 600 : undefined}
-              search={search}
-              sandwichItem={sandwichItem}
-              onSandwich={setSandwichItem}
-              onSearch={setSearch}
-              onTableSort={onTableSort}
-              vertical={vertical}
-            />
-          )}
-
-          {selectedView !== SelectedView.TopTable && (
-            <FlameGraph
-              data={dataContainer}
-              rangeMin={rangeMin}
-              rangeMax={rangeMax}
-              search={search}
-              setRangeMin={setRangeMin}
-              setRangeMax={setRangeMax}
-              onItemFocused={(data) => setFocusedItemData(data)}
-              focusedItemData={focusedItemData}
-              textAlign={textAlign}
-              sandwichItem={sandwichItem}
-              onSandwich={(label: string) => {
-                resetFocus();
-                setSandwichItem(label);
-              }}
-              onFocusPillClick={resetFocus}
-              onSandwichPillClick={resetSandwich}
-              colorScheme={colorScheme}
-            />
-          )}
-        </div>
+        {!showFlameGraphOnly && (
+          <FlameGraphHeader
+            search={search}
+            setSearch={setSearch}
+            selectedView={selectedView}
+            setSelectedView={(view) => {
+              setSelectedView(view);
+              onViewSelected?.(view);
+            }}
+            containerWidth={containerWidth}
+            onReset={() => {
+              resetFocus();
+              resetSandwich();
+            }}
+            textAlign={textAlign}
+            onTextAlignChange={(align) => {
+              setTextAlign(align);
+              onTextAlignSelected?.(align);
+            }}
+            showResetButton={Boolean(focusedItemData || sandwichItem)}
+            colorScheme={colorScheme}
+            onColorSchemeChange={setColorScheme}
+            stickyHeader={Boolean(stickyHeader)}
+            extraHeaderElements={extraHeaderElements}
+            vertical={vertical}
+            isDiffMode={dataContainer.isDiffFlamegraph()}
+          />
+        )}
+
+        <div className={styles.body}>{body}</div>
       </div>
     </ThemeContext.Provider>
   );
@@ -218,10 +270,36 @@ function useColorScheme(dataContainer: FlameGraphDataContainer | undefined) {
   return [colorScheme, setColorScheme] as const;
 }
 
-function getStyles(theme: GrafanaTheme2, vertical?: boolean) {
+/**
+ * Based on the search string it does a fuzzy search over all the unique labels, so we can highlight them later.
+ */
+function useLabelSearch(
+  search: string | undefined,
+  data: FlameGraphDataContainer | undefined
+): Set<string> | undefined {
+  return useMemo(() => {
+    if (search && data) {
+      const foundLabels = new Set<string>();
+      let idxs = ufuzzy.filter(data.getUniqueLabels(), search);
+
+      if (idxs) {
+        for (let idx of idxs) {
+          foundLabels.add(data.getUniqueLabels()[idx]);
+        }
+      }
+
+      return foundLabels;
+    }
+    // In this case undefined means there was no search so no attempt to highlighting anything should be made.
+    return undefined;
+  }, [search, data]);
+}
+
+function getStyles(theme: GrafanaTheme2) {
   return {
     container: css({
       label: 'container',
+      overflow: 'auto',
       height: '100%',
       display: 'flex',
       flex: '1 1 0',
@@ -231,11 +309,39 @@ function getStyles(theme: GrafanaTheme2, vertical?: boolean) {
     }),
     body: css({
       label: 'body',
-      display: 'flex',
       flexGrow: 1,
+    }),
+
+    tableContainer: css({
+      // This is not ideal for dashboard panel where it creates a double scroll. In a panel it should be 100% but then
+      // in explore we need a specific height.
+      height: 800,
+    }),
+
+    horizontalContainer: css({
+      label: 'horizontalContainer',
+      display: 'flex',
       minHeight: 0,
-      flexDirection: vertical ? 'column-reverse' : 'row',
+      flexDirection: 'row',
       columnGap: theme.spacing(1),
+      width: '100%',
+    }),
+
+    horizontalGraphContainer: css({
+      flexBasis: '50%',
+    }),
+
+    horizontalTableContainer: css({
+      flexBasis: '50%',
+      maxHeight: 800,
+    }),
+
+    verticalGraphContainer: css({
+      marginBottom: theme.spacing(1),
+    }),
+
+    verticalTableContainer: css({
+      height: 800,
     }),
   };
 }
diff --git a/packages/grafana-flamegraph/src/FlameGraphHeader.tsx b/packages/grafana-flamegraph/src/FlameGraphHeader.tsx
index 7c521af4714e0..1e372a936607c 100644
--- a/packages/grafana-flamegraph/src/FlameGraphHeader.tsx
+++ b/packages/grafana-flamegraph/src/FlameGraphHeader.tsx
@@ -73,7 +73,7 @@ const FlameGraphHeader = ({
           onChange={(v) => {
             setLocalSearch(v.currentTarget.value);
           }}
-          placeholder={'Search..'}
+          placeholder={'Search...'}
           suffix={suffix}
         />
       </div>
diff --git a/packages/grafana-flamegraph/src/TopTable/FlameGraphTopTableContainer.test.tsx b/packages/grafana-flamegraph/src/TopTable/FlameGraphTopTableContainer.test.tsx
index be543a09f957c..f693d057f9b14 100644
--- a/packages/grafana-flamegraph/src/TopTable/FlameGraphTopTableContainer.test.tsx
+++ b/packages/grafana-flamegraph/src/TopTable/FlameGraphTopTableContainer.test.tsx
@@ -12,7 +12,7 @@ import FlameGraphTopTableContainer from './FlameGraphTopTableContainer';
 describe('FlameGraphTopTableContainer', () => {
   const setup = () => {
     const flameGraphData = createDataFrame(data);
-    const container = new FlameGraphDataContainer(flameGraphData);
+    const container = new FlameGraphDataContainer(flameGraphData, { collapsing: true });
     const onSearch = jest.fn();
     const onSandwich = jest.fn();
 
diff --git a/packages/grafana-flamegraph/src/TopTable/FlameGraphTopTableContainer.tsx b/packages/grafana-flamegraph/src/TopTable/FlameGraphTopTableContainer.tsx
index cef80bc9806a5..936be01380621 100644
--- a/packages/grafana-flamegraph/src/TopTable/FlameGraphTopTableContainer.tsx
+++ b/packages/grafana-flamegraph/src/TopTable/FlameGraphTopTableContainer.tsx
@@ -29,49 +29,49 @@ import { TableData } from '../types';
 type Props = {
   data: FlameGraphDataContainer;
   onSymbolClick: (symbol: string) => void;
-  height?: number;
+  // This is used for highlighting the search button in case there is exact match.
   search?: string;
+  // We use these to filter out rows in the table if users is doing text search.
+  matchedLabels?: Set<string>;
   sandwichItem?: string;
   onSearch: (str: string) => void;
   onSandwich: (str?: string) => void;
   onTableSort?: (sort: string) => void;
-  vertical?: boolean;
 };
 
 const FlameGraphTopTableContainer = React.memo(
-  ({ data, onSymbolClick, height, search, onSearch, sandwichItem, onSandwich, onTableSort, vertical }: Props) => {
+  ({ data, onSymbolClick, search, matchedLabels, onSearch, sandwichItem, onSandwich, onTableSort }: Props) => {
     const table = useMemo(() => {
       // Group the data by label, we show only one row per label and sum the values
       // TODO: should be by filename + funcName + linenumber?
-      let table: { [key: string]: TableData } = {};
+      let filteredTable: { [key: string]: TableData } = {};
       for (let i = 0; i < data.data.length; i++) {
         const value = data.getValue(i);
         const valueRight = data.getValueRight(i);
         const self = data.getSelf(i);
         const label = data.getLabel(i);
-        table[label] = table[label] || {};
-        table[label].self = table[label].self ? table[label].self + self : self;
-        table[label].total = table[label].total ? table[label].total + value : value;
-        table[label].totalRight = table[label].totalRight ? table[label].totalRight + valueRight : valueRight;
-      }
-      return table;
-    }, [data]);
 
-    const rowHeight = 35;
-    // When we use normal layout we size the table to have the same height as the flamegraph to look good side by side.
-    // In vertical layout we don't need that so this is a bit arbitrary. We want some max limit
-    // so we don't show potentially thousands of rows at once which can hinder performance (the table is virtualized
-    // so with some max height it handles it fine)
-    const tableHeight = vertical ? Math.min(Object.keys(table).length * rowHeight, 800) : 0;
+        // If user is doing text search we filter out labels in the same way we highlight them in flamegraph.
+        if (!matchedLabels || matchedLabels.has(label)) {
+          filteredTable[label] = filteredTable[label] || {};
+          filteredTable[label].self = filteredTable[label].self ? filteredTable[label].self + self : self;
+          filteredTable[label].total = filteredTable[label].total ? filteredTable[label].total + value : value;
+          filteredTable[label].totalRight = filteredTable[label].totalRight
+            ? filteredTable[label].totalRight + valueRight
+            : valueRight;
+        }
+      }
+      return filteredTable;
+    }, [data, matchedLabels]);
 
-    const styles = useStyles2(getStyles, tableHeight);
+    const styles = useStyles2(getStyles);
     const theme = useTheme2();
 
     const [sort, setSort] = useState<TableSortByFieldState[]>([{ displayName: 'Self', desc: true }]);
 
     return (
       <div className={styles.topTableContainer} data-testid="topTable">
-        <AutoSizer style={{ width: '100%', height }}>
+        <AutoSizer style={{ width: '100%' }}>
           {({ width, height }) => {
             if (width < 3 || height < 3) {
               return null;
@@ -319,21 +319,14 @@ function ActionCell(props: ActionCellProps) {
   );
 }
 
-const getStyles = (theme: GrafanaTheme2, height: number) => {
+const getStyles = (theme: GrafanaTheme2) => {
   return {
-    topTableContainer: css`
-      label: topTableContainer;
-      flex-grow: 1;
-      flex-basis: 50%;
-      overflow: hidden;
-      padding: ${theme.spacing(1)};
-      background-color: ${theme.colors.background.secondary};
-      ${height
-        ? css`
-            min-height: ${height}px;
-          `
-        : ''}
-    `,
+    topTableContainer: css({
+      label: 'topTableContainer',
+      padding: theme.spacing(1),
+      backgroundColor: theme.colors.background.secondary,
+      height: '100%',
+    }),
   };
 };
 
diff --git a/packages/grafana-flamegraph/src/constants.ts b/packages/grafana-flamegraph/src/constants.ts
index db3da0a18c086..aa910799fceff 100644
--- a/packages/grafana-flamegraph/src/constants.ts
+++ b/packages/grafana-flamegraph/src/constants.ts
@@ -1,8 +1,12 @@
 export const PIXELS_PER_LEVEL = 22 * window.devicePixelRatio;
-export const COLLAPSE_THRESHOLD = 10 * window.devicePixelRatio;
+export const MUTE_THRESHOLD = 10 * window.devicePixelRatio;
 export const HIDE_THRESHOLD = 0.5 * window.devicePixelRatio;
 export const LABEL_THRESHOLD = 20 * window.devicePixelRatio;
 export const BAR_BORDER_WIDTH = 0.5 * window.devicePixelRatio;
 export const BAR_TEXT_PADDING_LEFT = 4 * window.devicePixelRatio;
+export const GROUP_STRIP_WIDTH = 3 * window.devicePixelRatio;
+export const GROUP_STRIP_PADDING = 3 * window.devicePixelRatio;
+export const GROUP_STRIP_MARGIN_LEFT = 4 * window.devicePixelRatio;
+export const GROUP_TEXT_OFFSET = 2 * window.devicePixelRatio;
 export const MIN_WIDTH_TO_SHOW_BOTH_TOPTABLE_AND_FLAMEGRAPH = 800;
 export const TOP_TABLE_COLUMN_WIDTH = 120;
diff --git a/packages/grafana-flamegraph/src/index.ts b/packages/grafana-flamegraph/src/index.ts
index 1e91bd43c6537..ab6407c5e492b 100644
--- a/packages/grafana-flamegraph/src/index.ts
+++ b/packages/grafana-flamegraph/src/index.ts
@@ -1,2 +1,3 @@
 export { default as FlameGraph, type Props } from './FlameGraphContainer';
 export { checkFields, getMessageCheckFieldsResult } from './FlameGraph/dataTransform';
+export { data } from './FlameGraph/testData/dataNestedSet';
diff --git a/packages/grafana-flamegraph/src/types.ts b/packages/grafana-flamegraph/src/types.ts
index c4616a2684742..aa8a84de8822c 100644
--- a/packages/grafana-flamegraph/src/types.ts
+++ b/packages/grafana-flamegraph/src/types.ts
@@ -1,5 +1,9 @@
 import { LevelItem } from './FlameGraph/dataTransform';
 
+export { type FlameGraphDataContainer } from './FlameGraph/dataTransform';
+
+export { type ExtraContextMenuButton } from './FlameGraph/FlameGraphContextMenu';
+
 export type ClickedItemData = {
   posX: number;
   posY: number;
diff --git a/packages/grafana-icons/.gitignore b/packages/grafana-icons/.gitignore
new file mode 100644
index 0000000000000..61e79a90563b8
--- /dev/null
+++ b/packages/grafana-icons/.gitignore
@@ -0,0 +1,7 @@
+.idea
+dist
+node_modules
+compiled
+/icons-gen/
+/src/icons-gen/
+/src/index.ts
diff --git a/packages/grafana-icons/.svgrrc.cjs b/packages/grafana-icons/.svgrrc.cjs
new file mode 100644
index 0000000000000..2c1c29451bfbb
--- /dev/null
+++ b/packages/grafana-icons/.svgrrc.cjs
@@ -0,0 +1,32 @@
+/**
+ * Reference: https://react-svgr.com/docs/options/
+ */
+module.exports = {
+  icon: '{dir}/[name].gen.js',
+  typescript: true,
+  jsxRuntime: 'automatic',
+  outDir: './src/icons-gen',
+  template: require('./templates/icon.cjs'),
+  indexTemplate: require('./templates/index.cjs'),
+  memo: true,
+  svgoConfig: {
+    plugins: [
+      // Sanitise the SVGs
+      'removeScriptElement',
+    ],
+  },
+  jsx: {
+    babelConfig: {
+      plugins: [
+        // Remove fill and id attributes from SVG child elements
+        [
+          '@svgr/babel-plugin-remove-jsx-attribute',
+          {
+            elements: ['path', 'g', 'clipPath'],
+            attributes: ['id', 'fill'],
+          },
+        ],
+      ],
+    },
+  },
+};
diff --git a/metadata.md b/packages/grafana-icons/CHANGELOG.md
similarity index 100%
rename from metadata.md
rename to packages/grafana-icons/CHANGELOG.md
diff --git a/packages/grafana-icons/LICENSE_APACHE2 b/packages/grafana-icons/LICENSE_APACHE2
new file mode 100644
index 0000000000000..373dde574a0c8
--- /dev/null
+++ b/packages/grafana-icons/LICENSE_APACHE2
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2015 Grafana Labs
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/packages/grafana-icons/README.md b/packages/grafana-icons/README.md
new file mode 100644
index 0000000000000..78cbf4bf9e309
--- /dev/null
+++ b/packages/grafana-icons/README.md
@@ -0,0 +1,14 @@
+# Grafana Saga Icons
+
+This package contains the icon React components used in Grafana and Grafana plugins.
+
+## Uploading a new icon
+
+To add a new icon to the library, open a PR which adds the SVG file for the icon into the `svg` directory. The file should be named with the icon name in kebab-case. For example, if the icon name is `MyIcon`, the file should be named `my-icon.svg`. Once the PR is merged, the icon will be automatically generated and added to the library.
+
+## Development
+
+1. Clone the repository
+2. Run `yarn install`
+3. After the installation, the icon components can be found in the `src/icons-gen` directory.
+4. To regenerate/update the components, run `yarn generate`.
diff --git a/packages/grafana-icons/package.json b/packages/grafana-icons/package.json
new file mode 100644
index 0000000000000..5074eade13b93
--- /dev/null
+++ b/packages/grafana-icons/package.json
@@ -0,0 +1,64 @@
+{
+  "name": "@grafana/saga-icons",
+  "version": "0.0.0",
+  "private": true,
+  "description": "Icons for Grafana",
+  "author": "Grafana Labs",
+  "license": "Apache-2.0",
+  "sideEffects": false,
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/grafana/grafana.git",
+    "directory": "packages/grafana-icons"
+  },
+  "type": "module",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "publishConfig": {
+    "main": "dist/index.js",
+    "types": "dist/index.d.ts",
+    "access": "public"
+  },
+  "files": [
+    "./dist",
+    "./README.md",
+    "./CHANGELOG.md",
+    "./LICENSE_APACHE2"
+  ],
+  "scripts": {
+    "clean": "rimraf ./dist ./compiled ./package.tgz ./src/icons-gen",
+    "generate": "yarn clean && npx @svgr/cli ./svg --silent && mv ./src/icons-gen/index.ts ./src",
+    "typecheck": "tsc --emitDeclarationOnly false --noEmit",
+    "lint": "eslint --ext .ts,.tsx ./src",
+    "prettier:check": "prettier --check --list-different=false --log-level=warn \"**/*.{ts,tsx,scss,md,mdx,json}\"",
+    "build": "yarn generate && rollup -c rollup.config.ts"
+  },
+  "devDependencies": {
+    "@grafana/tsconfig": "^1.3.0-rc1",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-typescript": "^11.1.6",
+    "@svgr/babel-plugin-remove-jsx-attribute": "^8.0.0",
+    "@svgr/cli": "^8.1.0",
+    "@svgr/plugin-jsx": "^8.1.0",
+    "@svgr/plugin-prettier": "^8.1.0",
+    "@svgr/plugin-svgo": "^8.1.0",
+    "@types/node": "20.11.30",
+    "@types/react": "18.2.73",
+    "@types/react-dom": "18.2.22",
+    "esbuild": "0.18.12",
+    "prettier": "3.2.5",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
+    "rimraf": "5.0.5",
+    "rollup": "2.79.1",
+    "rollup-plugin-dts": "^6.1.0",
+    "rollup-plugin-esbuild": "5.0.0",
+    "rollup-plugin-node-externals": "5.0.0",
+    "ts-node": "10.9.2",
+    "typescript": "5.3.3"
+  },
+  "peerDependencies": {
+    "react": "^17.0.0 || ^18.0.0",
+    "react-dom": "^17.0.0 || ^18.0.0"
+  }
+}
diff --git a/packages/grafana-icons/rollup.config.ts b/packages/grafana-icons/rollup.config.ts
new file mode 100644
index 0000000000000..c812043094daf
--- /dev/null
+++ b/packages/grafana-icons/rollup.config.ts
@@ -0,0 +1,30 @@
+import resolve from '@rollup/plugin-node-resolve';
+import path from 'path';
+import dts from 'rollup-plugin-dts';
+import esbuild from 'rollup-plugin-esbuild';
+import externals from 'rollup-plugin-node-externals';
+
+import pkg from './package.json';
+
+export default [
+  {
+    input: 'src/index.ts',
+    plugins: [externals({ deps: true, packagePath: './package.json' }), resolve(), esbuild()],
+    output: [
+      {
+        format: 'esm',
+        sourcemap: true,
+        dir: path.dirname(pkg.publishConfig.module),
+        preserveModules: true,
+      },
+    ],
+  },
+  {
+    input: 'src/index.ts',
+    plugins: [dts()],
+    output: {
+      file: pkg.publishConfig.types,
+      format: 'es',
+    },
+  },
+];
diff --git a/packages/grafana-icons/src/IconBase.tsx b/packages/grafana-icons/src/IconBase.tsx
new file mode 100644
index 0000000000000..cc4149e74133c
--- /dev/null
+++ b/packages/grafana-icons/src/IconBase.tsx
@@ -0,0 +1,52 @@
+import React, { SVGProps } from 'react';
+
+export type IconSize = 'xs' | 'sm' | 'md' | 'lg' | 'xl' | 'xxl' | 'xxxl';
+
+export interface IconProps extends Omit<SVGProps<SVGSVGElement>, 'onLoad' | 'onError' | 'ref'> {
+  /** Size (width and height) of the icon. Defaults to "md" or 16x16px */
+  size?: IconSize;
+  /** Render the title element with the provided text.
+   * More info: https://developer.mozilla.org/en-US/docs/Web/SVG/Element/title
+   */
+  title?: string;
+  /** Color of the icon. Defaults to "currentColor" */
+  color?: string;
+}
+
+function getSvgSize(size: IconSize) {
+  const sizeMap = {
+    xs: 12,
+    sm: 14,
+    md: 16,
+    lg: 18,
+    xl: 24,
+    xxl: 36,
+    xxxl: 48,
+  };
+
+  return sizeMap[size] || 16;
+}
+
+export const IconBase = ({ title, size = 'md', color = 'currentColor', ...props }: IconProps) => {
+  const svgSize = getSvgSize(size);
+
+  return (
+    <svg
+      {...props}
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 24 24"
+      height={svgSize}
+      width={svgSize}
+      style={{
+        display: 'inline-block',
+        fill: color,
+        flexShrink: 0,
+        lineHeight: 0,
+        verticalAlign: 'middle',
+      }}
+    >
+      {title && <title>{title}</title>}
+      {props.children}
+    </svg>
+  );
+};
diff --git a/packages/grafana-icons/svg/ai.svg b/packages/grafana-icons/svg/ai.svg
new file mode 100644
index 0000000000000..7ea7ce6376b7d
--- /dev/null
+++ b/packages/grafana-icons/svg/ai.svg
@@ -0,0 +1,27 @@
+<svg viewBox="0 0 10 10" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 204">
+<path id="Vector" d="M7.5 5C5.56722 5 4.00015 7.0148 4.00015 9.5C4.00015 7.0148 2.43309 5 0.5 5C2.43309 5 4.00015 2.9855 4.00015 0.5C4.00015 2.9855 5.56722 5 7.5 5Z" />
+<path id="Vector_2" d="M9.5 2.5C8.39555 2.5 7.50009 3.39547 7.50009 4.5C7.50009 3.39547 6.60462 2.5 5.5 2.5C6.60462 2.5 7.50009 1.60467 7.50009 0.5C7.50009 1.60467 8.39555 2.5 9.5 2.5Z" />
+<path id="Vector_3" d="M9.5 7C8.67166 7 8.00007 7.6716 8.00007 8.5C8.00007 7.6716 7.32847 7 6.5 7C7.32847 7 8.00007 6.3285 8.00007 5.5C8.00007 6.3285 8.67166 7 9.5 7Z" />
+</g>
+<defs>
+<linearGradient id="paint0_linear_344_481" x1="0.5" y1="0.5" x2="20.6236" y2="0.33439" gradientUnits="userSpaceOnUse">
+<stop stop-color="#6E9FFF" stop-opacity="0"/>
+<stop offset="0.164022" stop-color="#6E9FFF"/>
+<stop offset="0.197917" stop-color="#6E9FFF" stop-opacity="0.8075"/>
+<stop offset="0.426692" stop-color="#6E9FFF" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint1_linear_344_481" x1="5.5" y1="0.5" x2="16.9987" y2="0.378333" gradientUnits="userSpaceOnUse">
+<stop stop-color="#6E9FFF" stop-opacity="0"/>
+<stop offset="0.164022" stop-color="#6E9FFF"/>
+<stop offset="0.197917" stop-color="#6E9FFF" stop-opacity="0.8075"/>
+<stop offset="0.426692" stop-color="#6E9FFF" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint2_linear_344_481" x1="6.5" y1="5.5" x2="15.124" y2="5.40875" gradientUnits="userSpaceOnUse">
+<stop stop-color="#6E9FFF" stop-opacity="0"/>
+<stop offset="0.164022" stop-color="#6E9FFF"/>
+<stop offset="0.197917" stop-color="#6E9FFF" stop-opacity="0.8075"/>
+<stop offset="0.426692" stop-color="#6E9FFF" stop-opacity="0"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/packages/grafana-icons/svg/angle-right.svg b/packages/grafana-icons/svg/angle-right.svg
new file mode 100644
index 0000000000000..b21121fe60735
--- /dev/null
+++ b/packages/grafana-icons/svg/angle-right.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M14.83,11.29,10.59,7.05a1,1,0,0,0-1.42,0,1,1,0,0,0,0,1.41L12.71,12,9.17,15.54a1,1,0,0,0,0,1.41,1,1,0,0,0,.71.29,1,1,0,0,0,.71-.29l4.24-4.24A1,1,0,0,0,14.83,11.29Z"/></svg>
\ No newline at end of file
diff --git a/packages/grafana-icons/svg/apps.svg b/packages/grafana-icons/svg/apps.svg
new file mode 100644
index 0000000000000..f6f6ffe2eaa64
--- /dev/null
+++ b/packages/grafana-icons/svg/apps.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M10,13H3a1,1,0,0,0-1,1v7a1,1,0,0,0,1,1h7a1,1,0,0,0,1-1V14A1,1,0,0,0,10,13ZM9,20H4V15H9ZM21,2H14a1,1,0,0,0-1,1v7a1,1,0,0,0,1,1h7a1,1,0,0,0,1-1V3A1,1,0,0,0,21,2ZM20,9H15V4h5Zm1,4H14a1,1,0,0,0-1,1v7a1,1,0,0,0,1,1h7a1,1,0,0,0,1-1V14A1,1,0,0,0,21,13Zm-1,7H15V15h5ZM10,2H3A1,1,0,0,0,2,3v7a1,1,0,0,0,1,1h7a1,1,0,0,0,1-1V3A1,1,0,0,0,10,2ZM9,9H4V4H9Z"/></svg>
diff --git a/packages/grafana-icons/svg/book.svg b/packages/grafana-icons/svg/book.svg
new file mode 100644
index 0000000000000..8e59539d7a486
--- /dev/null
+++ b/packages/grafana-icons/svg/book.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" data-name="Layer 1" viewBox="0 0 24 24"><path d="M15,6H9A1,1,0,0,0,8,7v4a1,1,0,0,0,1,1h6a1,1,0,0,0,1-1V7A1,1,0,0,0,15,6Zm-1,4H10V8h4Zm3-8H5A1,1,0,0,0,4,3V21a1,1,0,0,0,1,1H17a3,3,0,0,0,3-3V5A3,3,0,0,0,17,2Zm1,17a1,1,0,0,1-1,1H6V4H17a1,1,0,0,1,1,1Z"/></svg>
\ No newline at end of file
diff --git a/packages/grafana-icons/svg/cancel.svg b/packages/grafana-icons/svg/cancel.svg
new file mode 100644
index 0000000000000..138499ab72878
--- /dev/null
+++ b/packages/grafana-icons/svg/cancel.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M21.77,11.36l-5-6A1,1,0,0,0,16,5H5A3,3,0,0,0,2,8v8a3,3,0,0,0,3,3H16a1,1,0,0,0,.77-.36l5-6A1,1,0,0,0,21.77,11.36ZM15.53,17H5a1,1,0,0,1-1-1V8A1,1,0,0,1,5,7H15.53l4.17,5ZM12.71,9.29a1,1,0,0,0-1.42,0L10,10.59,8.71,9.29a1,1,0,1,0-1.42,1.42L8.59,12l-1.3,1.29a1,1,0,0,0,0,1.42,1,1,0,0,0,1.42,0L10,13.41l1.29,1.3a1,1,0,0,0,1.42,0,1,1,0,0,0,0-1.42L11.41,12l1.3-1.29A1,1,0,0,0,12.71,9.29Z"/></svg>
\ No newline at end of file
diff --git a/packages/grafana-icons/svg/traces.svg b/packages/grafana-icons/svg/traces.svg
new file mode 100644
index 0000000000000..a58acc03951b9
--- /dev/null
+++ b/packages/grafana-icons/svg/traces.svg
@@ -0,0 +1,7 @@
+<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.1457 6.34585C26.3707 6.56219 26.4972 6.85562 26.4973 7.16162V27.1151C26.4973 27.7524 25.96 28.2689 25.2973 28.2689H4.89727C4.23453 28.2689 3.69727 27.7524 3.69727 27.1151V2.88432C3.69727 2.24707 4.23453 1.73047 4.89727 1.73047H20.8489C21.167 1.73054 21.4723 1.85214 21.6973 2.06855L26.1457 6.34585Z" stroke="#CCCCDC" stroke-opacity="0.65" stroke-width="2.8125" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.375 20.625H22.5" stroke="#CCCCDC" stroke-opacity="0.65" stroke-width="1.875" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.375 16.875H22.5" stroke="#CCCCDC" stroke-opacity="0.65" stroke-width="1.875" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.375 13.125H22.5" stroke="#CCCCDC" stroke-opacity="0.65" stroke-width="1.875" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.6001 8.40039H15.6001" stroke="#CCCCDC" stroke-opacity="0.65" stroke-width="1.875" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/grafana-icons/templates/icon.cjs b/packages/grafana-icons/templates/icon.cjs
new file mode 100644
index 0000000000000..2514571e00e62
--- /dev/null
+++ b/packages/grafana-icons/templates/icon.cjs
@@ -0,0 +1,45 @@
+/**
+ * Modify the JSX to use the IconBase component as a wrapper
+ */
+const modifyJSX = (jsx) => {
+  jsx.openingElement.name.name = 'IconBase';
+  jsx.openingElement.attributes = [
+    {
+      type: 'JSXSpreadAttribute',
+      argument: {
+        type: 'Identifier',
+        name: 'props',
+      },
+    },
+  ];
+
+  jsx.closingElement.name.name = 'IconBase';
+
+  return jsx;
+};
+
+const comments = `
+// This is an auto-generated file, created by svgr-cli.
+// Do not edit this file manually.
+// To update the component, modify the template in templates/icon.js.
+// Run "yarn generate" to update.
+`;
+const imports = `
+import React, { memo } from 'react';
+
+import { IconBase, IconProps } from '../IconBase';
+`;
+const template = ({ exports, jsx, componentName }, { tpl }) => {
+  return tpl`
+${comments}
+${imports}
+
+const ${componentName} = (props: IconProps) => (
+  ${modifyJSX(jsx)}
+);
+
+${exports};
+`;
+};
+
+module.exports = template;
diff --git a/packages/grafana-icons/templates/index.cjs b/packages/grafana-icons/templates/index.cjs
new file mode 100644
index 0000000000000..9bbd0507a3937
--- /dev/null
+++ b/packages/grafana-icons/templates/index.cjs
@@ -0,0 +1,12 @@
+const path = require('path');
+
+function defaultIndexTemplate(filePaths) {
+  const exportEntries = filePaths.map(({ path: filePath }) => {
+    const basename = path.basename(filePath, path.extname(filePath));
+    const exportName = /^\d/.test(basename) ? `Svg${basename}` : basename;
+    return `export { default as ${exportName} } from './icons-gen/${basename}'`;
+  });
+  return ["export { type IconProps } from './IconBase';", ...exportEntries].join('\n');
+}
+
+module.exports = defaultIndexTemplate;
diff --git a/packages/grafana-icons/tsconfig.build.json b/packages/grafana-icons/tsconfig.build.json
new file mode 100644
index 0000000000000..54309163ebc77
--- /dev/null
+++ b/packages/grafana-icons/tsconfig.build.json
@@ -0,0 +1,4 @@
+{
+  "exclude": ["dist", "node_modules", "test", "**/*.test.ts*"],
+  "extends": "./tsconfig.json"
+}
diff --git a/packages/grafana-icons/tsconfig.json b/packages/grafana-icons/tsconfig.json
new file mode 100644
index 0000000000000..06210e1a2276f
--- /dev/null
+++ b/packages/grafana-icons/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "baseUrl": "./",
+    "declarationDir": "./compiled",
+    "emitDeclarationOnly": true,
+    "isolatedModules": true,
+    "rootDirs": ["."],
+    "resolveJsonModule": true
+  },
+  "exclude": ["dist/**/*"],
+  "extends": "@grafana/tsconfig",
+  "include": ["src/**/*.ts"]
+}
diff --git a/packages/grafana-o11y-ds-frontend/package.json b/packages/grafana-o11y-ds-frontend/package.json
new file mode 100644
index 0000000000000..05efd9983e1c5
--- /dev/null
+++ b/packages/grafana-o11y-ds-frontend/package.json
@@ -0,0 +1,50 @@
+{
+  "author": "Grafana Labs",
+  "license": "AGPL-3.0-only",
+  "name": "@grafana/o11y-ds-frontend",
+  "private": true,
+  "version": "11.0.0",
+  "description": "Library to manage traces in Grafana.",
+  "sideEffects": false,
+  "repository": {
+    "type": "git",
+    "url": "http://github.com/grafana/grafana.git",
+    "directory": "packages/grafana-o11y-ds-frontend"
+  },
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "scripts": {
+    "typecheck": "tsc --emitDeclarationOnly false --noEmit"
+  },
+  "dependencies": {
+    "@emotion/css": "11.11.2",
+    "@grafana/data": "11.0.0",
+    "@grafana/e2e-selectors": "11.0.0",
+    "@grafana/experimental": "1.7.10",
+    "@grafana/runtime": "11.0.0",
+    "@grafana/schema": "11.0.0",
+    "@grafana/ui": "11.0.0",
+    "react-use": "17.5.0",
+    "rxjs": "7.8.1",
+    "tslib": "2.6.2"
+  },
+  "devDependencies": {
+    "@grafana/tsconfig": "^1.3.0-rc1",
+    "@testing-library/jest-dom": "^6.1.2",
+    "@testing-library/react": "14.2.2",
+    "@testing-library/user-event": "14.5.2",
+    "@types/jest": "^29.5.4",
+    "@types/react": "18.2.73",
+    "@types/systemjs": "6.13.5",
+    "@types/testing-library__jest-dom": "5.14.9",
+    "jest": "^29.6.4",
+    "react": "18.2.0",
+    "ts-jest": "29.1.2",
+    "ts-node": "10.9.2",
+    "typescript": "5.3.3"
+  },
+  "peerDependencies": {
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
+  }
+}
diff --git a/public/app/core/components/IntervalInput/IntervalInput.test.tsx b/packages/grafana-o11y-ds-frontend/src/IntervalInput/IntervalInput.test.tsx
similarity index 100%
rename from public/app/core/components/IntervalInput/IntervalInput.test.tsx
rename to packages/grafana-o11y-ds-frontend/src/IntervalInput/IntervalInput.test.tsx
diff --git a/public/app/core/components/IntervalInput/IntervalInput.tsx b/packages/grafana-o11y-ds-frontend/src/IntervalInput/IntervalInput.tsx
similarity index 100%
rename from public/app/core/components/IntervalInput/IntervalInput.tsx
rename to packages/grafana-o11y-ds-frontend/src/IntervalInput/IntervalInput.tsx
diff --git a/public/app/core/components/IntervalInput/validation.test.ts b/packages/grafana-o11y-ds-frontend/src/IntervalInput/validation.test.ts
similarity index 100%
rename from public/app/core/components/IntervalInput/validation.test.ts
rename to packages/grafana-o11y-ds-frontend/src/IntervalInput/validation.test.ts
diff --git a/public/app/core/components/IntervalInput/validation.ts b/packages/grafana-o11y-ds-frontend/src/IntervalInput/validation.ts
similarity index 100%
rename from public/app/core/components/IntervalInput/validation.ts
rename to packages/grafana-o11y-ds-frontend/src/IntervalInput/validation.ts
diff --git a/packages/grafana-o11y-ds-frontend/src/LocalStorageValueProvider/LocalStorageValueProvider.tsx b/packages/grafana-o11y-ds-frontend/src/LocalStorageValueProvider/LocalStorageValueProvider.tsx
new file mode 100644
index 0000000000000..b81935d433740
--- /dev/null
+++ b/packages/grafana-o11y-ds-frontend/src/LocalStorageValueProvider/LocalStorageValueProvider.tsx
@@ -0,0 +1,49 @@
+import React, { useEffect, useState } from 'react';
+
+import { store } from '../store';
+
+export interface Props<T> {
+  storageKey: string;
+  defaultValue: T;
+  children: (value: T, onSaveToStore: (value: T) => void, onDeleteFromStore: () => void) => React.ReactNode;
+}
+
+export const LocalStorageValueProvider = <T,>(props: Props<T>) => {
+  const { children, storageKey, defaultValue } = props;
+
+  const [state, setState] = useState({ value: store.getObject(props.storageKey, props.defaultValue) });
+
+  useEffect(() => {
+    const onStorageUpdate = (v: StorageEvent) => {
+      if (v.key === storageKey) {
+        setState({ value: store.getObject(props.storageKey, props.defaultValue) });
+      }
+    };
+
+    window.addEventListener('storage', onStorageUpdate);
+
+    return () => {
+      window.removeEventListener('storage', onStorageUpdate);
+    };
+  });
+
+  const onSaveToStore = (value: T) => {
+    try {
+      store.setObject(storageKey, value);
+    } catch (error) {
+      console.error(error);
+    }
+    setState({ value });
+  };
+
+  const onDeleteFromStore = () => {
+    try {
+      store.delete(storageKey);
+    } catch (error) {
+      console.log(error);
+    }
+    setState({ value: defaultValue });
+  };
+
+  return <>{children(state.value, onSaveToStore, onDeleteFromStore)}</>;
+};
diff --git a/public/app/core/components/NodeGraphSettings.tsx b/packages/grafana-o11y-ds-frontend/src/NodeGraph/NodeGraphSettings.tsx
similarity index 84%
rename from public/app/core/components/NodeGraphSettings.tsx
rename to packages/grafana-o11y-ds-frontend/src/NodeGraph/NodeGraphSettings.tsx
index 0dfe986323ea6..6544b33386999 100644
--- a/public/app/core/components/NodeGraphSettings.tsx
+++ b/packages/grafana-o11y-ds-frontend/src/NodeGraph/NodeGraphSettings.tsx
@@ -7,11 +7,9 @@ import {
   GrafanaTheme2,
   updateDatasourcePluginJsonDataOption,
 } from '@grafana/data';
-import { ConfigSubSection } from '@grafana/experimental';
+import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/experimental';
 import { InlineField, InlineFieldRow, InlineSwitch, useStyles2 } from '@grafana/ui';
 
-import { ConfigDescriptionLink } from './ConfigDescriptionLink';
-
 export interface NodeGraphOptions {
   enabled?: boolean;
 }
@@ -70,17 +68,17 @@ export const NodeGraphSection = ({ options, onOptionsChange }: DataSourcePluginO
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  infoText: css`
-    label: infoText;
-    padding-bottom: ${theme.spacing(2)};
-    color: ${theme.colors.text.secondary};
-  `,
-  container: css`
-    label: container;
-    width: 100%;
-  `,
-  row: css`
-    label: row;
-    align-items: baseline;
-  `,
+  infoText: css({
+    label: 'infoText',
+    paddingBottom: theme.spacing(2),
+    color: theme.colors.text.secondary,
+  }),
+  container: css({
+    label: 'container',
+    width: '100%',
+  }),
+  row: css({
+    label: 'row',
+    alignItems: 'baseline',
+  }),
 });
diff --git a/packages/grafana-o11y-ds-frontend/src/SpanBar/SpanBarSettings.tsx b/packages/grafana-o11y-ds-frontend/src/SpanBar/SpanBarSettings.tsx
new file mode 100644
index 0000000000000..81780446eddc9
--- /dev/null
+++ b/packages/grafana-o11y-ds-frontend/src/SpanBar/SpanBarSettings.tsx
@@ -0,0 +1,110 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import {
+  DataSourceJsonData,
+  DataSourcePluginOptionsEditorProps,
+  GrafanaTheme2,
+  toOption,
+  updateDatasourcePluginJsonDataOption,
+} from '@grafana/data';
+import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/experimental';
+import { InlineField, InlineFieldRow, Input, Select, useStyles2 } from '@grafana/ui';
+
+export interface SpanBarOptions {
+  type?: string;
+  tag?: string;
+}
+
+export interface SpanBarOptionsData extends DataSourceJsonData {
+  spanBar?: SpanBarOptions;
+}
+
+export const NONE = 'None';
+export const DURATION = 'Duration';
+export const TAG = 'Tag';
+
+interface Props extends DataSourcePluginOptionsEditorProps<SpanBarOptionsData> {}
+
+export default function SpanBarSettings({ options, onOptionsChange }: Props) {
+  const styles = useStyles2(getStyles);
+  const selectOptions = [NONE, DURATION, TAG].map(toOption);
+
+  return (
+    <div className={css({ width: '100%' })}>
+      <InlineFieldRow className={styles.row}>
+        <InlineField label="Label" labelWidth={26} tooltip="Default: duration" grow>
+          <Select
+            inputId="label"
+            options={selectOptions}
+            value={options.jsonData.spanBar?.type || ''}
+            onChange={(v) => {
+              updateDatasourcePluginJsonDataOption({ onOptionsChange, options }, 'spanBar', {
+                ...options.jsonData.spanBar,
+                type: v?.value ?? '',
+              });
+            }}
+            placeholder="Duration"
+            isClearable
+            aria-label={'select-label-name'}
+            width={40}
+          />
+        </InlineField>
+      </InlineFieldRow>
+      {options.jsonData.spanBar?.type === TAG && (
+        <InlineFieldRow className={styles.row}>
+          <InlineField
+            label="Tag key"
+            labelWidth={26}
+            tooltip="Tag key which will be used to get the tag value. A span's attributes and resources will be searched for the tag key"
+          >
+            <Input
+              type="text"
+              placeholder="Enter tag key"
+              onChange={(v) =>
+                updateDatasourcePluginJsonDataOption({ onOptionsChange, options }, 'spanBar', {
+                  ...options.jsonData.spanBar,
+                  tag: v.currentTarget.value,
+                })
+              }
+              value={options.jsonData.spanBar?.tag || ''}
+              width={40}
+            />
+          </InlineField>
+        </InlineFieldRow>
+      )}
+    </div>
+  );
+}
+
+export const SpanBarSection = ({ options, onOptionsChange }: DataSourcePluginOptionsEditorProps) => {
+  let suffix = options.type;
+  suffix += options.type === 'tempo' ? '/configure-tempo-data-source/#span-bar' : '/#span-bar';
+
+  return (
+    <ConfigSubSection
+      title="Span bar"
+      description={
+        <ConfigDescriptionLink
+          description="Add additional info next to the service and operation on a span bar row in the trace view."
+          suffix={suffix}
+          feature="the span bar"
+        />
+      }
+    >
+      <SpanBarSettings options={options} onOptionsChange={onOptionsChange} />
+    </ConfigSubSection>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  infoText: css({
+    label: 'infoText',
+    paddingBottom: theme.spacing(2),
+    color: theme.colors.text.secondary,
+  }),
+  row: css({
+    label: 'row',
+    alignItems: 'baseline',
+  }),
+});
diff --git a/packages/grafana-o11y-ds-frontend/src/TemporaryAlert.test.tsx b/packages/grafana-o11y-ds-frontend/src/TemporaryAlert.test.tsx
new file mode 100644
index 0000000000000..c8ae7b1c1a489
--- /dev/null
+++ b/packages/grafana-o11y-ds-frontend/src/TemporaryAlert.test.tsx
@@ -0,0 +1,28 @@
+import { act, render, screen } from '@testing-library/react';
+import React from 'react';
+
+import { TemporaryAlert } from './TemporaryAlert';
+
+describe('TemporaryAlert', () => {
+  beforeEach(() => {
+    jest.useFakeTimers();
+  });
+
+  afterEach(() => {
+    jest.runOnlyPendingTimers();
+    jest.useRealTimers();
+  });
+
+  it('full component life cycle', async () => {
+    render(<TemporaryAlert severity="error" text="" />);
+    expect(screen.queryByTestId('data-testid Alert error')).not.toBeInTheDocument();
+
+    render(<TemporaryAlert severity="error" text="Error message" />);
+    expect(screen.getByTestId('data-testid Alert error')).toBeInTheDocument();
+    expect(screen.getByText('Error message')).toBeInTheDocument();
+
+    act(() => jest.runAllTimers());
+    expect(screen.queryByTestId('data-testid Alert error')).not.toBeInTheDocument();
+    expect(screen.queryByText('Error message')).not.toBeInTheDocument();
+  });
+});
diff --git a/packages/grafana-o11y-ds-frontend/src/TemporaryAlert.tsx b/packages/grafana-o11y-ds-frontend/src/TemporaryAlert.tsx
new file mode 100644
index 0000000000000..8a7003a576ce7
--- /dev/null
+++ b/packages/grafana-o11y-ds-frontend/src/TemporaryAlert.tsx
@@ -0,0 +1,74 @@
+import { css } from '@emotion/css';
+import React, { useEffect, useState } from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Alert, AlertVariant, useTheme2 } from '@grafana/ui';
+
+enum AlertTimeout {
+  Error = 7000,
+  Info = 3000,
+  Success = 3000,
+  Warning = 5000,
+}
+
+const getStyle = (theme: GrafanaTheme2) => {
+  return css({
+    position: 'absolute',
+    zIndex: theme.zIndex.portal,
+    top: 0,
+    right: 10,
+  });
+};
+
+const timeoutMap = {
+  ['error']: AlertTimeout.Error,
+  ['info']: AlertTimeout.Info,
+  ['success']: AlertTimeout.Success,
+  ['warning']: AlertTimeout.Warning,
+};
+
+type AlertProps = {
+  // Severity of the alert. Controls the style of the alert (e.g., background color)
+  severity: AlertVariant;
+  // Displayed message. If set to empty string, the alert is not displayed
+  text: string;
+};
+
+export const TemporaryAlert = (props: AlertProps) => {
+  const style = getStyle(useTheme2());
+  const [visible, setVisible] = useState(false);
+  const [timer, setTimer] = useState<NodeJS.Timeout>();
+
+  useEffect(() => {
+    return () => {
+      if (timer) {
+        clearTimeout(timer);
+      }
+    };
+  }, [timer]);
+
+  useEffect(() => {
+    if (props.text !== '') {
+      setVisible(true);
+
+      const timer = setTimeout(() => {
+        setVisible(false);
+      }, timeoutMap[props.severity]);
+      setTimer(timer);
+    }
+  }, [props.severity, props.text]);
+
+  return (
+    <>
+      {visible && (
+        <Alert
+          className={style}
+          elevated={true}
+          onRemove={() => setVisible(false)}
+          severity={props.severity}
+          title={props.text}
+        />
+      )}
+    </>
+  );
+};
diff --git a/packages/grafana-o11y-ds-frontend/src/TraceToLogs/TagMappingInput.tsx b/packages/grafana-o11y-ds-frontend/src/TraceToLogs/TagMappingInput.tsx
new file mode 100644
index 0000000000000..d263682a92fac
--- /dev/null
+++ b/packages/grafana-o11y-ds-frontend/src/TraceToLogs/TagMappingInput.tsx
@@ -0,0 +1,106 @@
+import { css, cx } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { InlineLabel, SegmentInput, ToolbarButton, useStyles2 } from '@grafana/ui';
+
+import { TraceToLogsTag } from './TraceToLogsSettings';
+
+interface Props {
+  values: TraceToLogsTag[];
+  onChange: (values: TraceToLogsTag[]) => void;
+  id?: string;
+}
+
+export const TagMappingInput = ({ values, onChange, id }: Props) => {
+  const styles = useStyles2(getStyles);
+
+  return (
+    <div className={styles.wrapper}>
+      {values.length ? (
+        values.map((value, idx) => (
+          <div className={styles.pair} key={idx}>
+            <SegmentInput
+              id={`${id}-key-${idx}`}
+              placeholder={'Tag name'}
+              value={value.key}
+              onChange={(e) => {
+                onChange(
+                  values.map((v, i) => {
+                    if (i === idx) {
+                      return { ...v, key: String(e) };
+                    }
+                    return v;
+                  })
+                );
+              }}
+            />
+            <InlineLabel aria-label="equals" className={styles.operator}>
+              as
+            </InlineLabel>
+            <SegmentInput
+              id={`${id}-value-${idx}`}
+              placeholder={'New name (optional)'}
+              value={value.value || ''}
+              onChange={(e) => {
+                onChange(
+                  values.map((v, i) => {
+                    if (i === idx) {
+                      return { ...v, value: String(e) };
+                    }
+                    return v;
+                  })
+                );
+              }}
+            />
+            <ToolbarButton
+              onClick={() => onChange([...values.slice(0, idx), ...values.slice(idx + 1)])}
+              className={cx(styles.removeTag, 'query-part')}
+              aria-label="Remove tag"
+              type="button"
+              icon="times"
+            />
+
+            {idx === values.length - 1 ? (
+              <ToolbarButton
+                onClick={() => onChange([...values, { key: '', value: '' }])}
+                className="query-part"
+                aria-label="Add tag"
+                type="button"
+                icon="plus"
+              />
+            ) : null}
+          </div>
+        ))
+      ) : (
+        <ToolbarButton
+          icon="plus"
+          onClick={() => onChange([...values, { key: '', value: '' }])}
+          className="query-part"
+          aria-label="Add tag"
+          type="button"
+        />
+      )}
+    </div>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  wrapper: css({
+    display: 'flex',
+    flexDirection: 'column',
+    gap: `${theme.spacing(0.5)} 0`,
+  }),
+  pair: css({
+    display: 'flex',
+    justifyContent: 'start',
+    alignItems: 'center',
+  }),
+  operator: css({
+    color: theme.v1.palette.orange,
+    width: 'auto',
+  }),
+  removeTag: css({
+    marginRight: theme.spacing(0.5),
+  }),
+});
diff --git a/public/app/core/components/TraceToLogs/TraceToLogsSettings.test.tsx b/packages/grafana-o11y-ds-frontend/src/TraceToLogs/TraceToLogsSettings.test.tsx
similarity index 100%
rename from public/app/core/components/TraceToLogs/TraceToLogsSettings.test.tsx
rename to packages/grafana-o11y-ds-frontend/src/TraceToLogs/TraceToLogsSettings.test.tsx
diff --git a/public/app/core/components/TraceToLogs/TraceToLogsSettings.tsx b/packages/grafana-o11y-ds-frontend/src/TraceToLogs/TraceToLogsSettings.tsx
similarity index 96%
rename from public/app/core/components/TraceToLogs/TraceToLogsSettings.tsx
rename to packages/grafana-o11y-ds-frontend/src/TraceToLogs/TraceToLogsSettings.tsx
index 5a4b605faf1f7..bc290883d657c 100644
--- a/public/app/core/components/TraceToLogs/TraceToLogsSettings.tsx
+++ b/packages/grafana-o11y-ds-frontend/src/TraceToLogs/TraceToLogsSettings.tsx
@@ -2,10 +2,9 @@ import { css } from '@emotion/css';
 import React, { useCallback, useMemo } from 'react';
 
 import { DataSourceJsonData, DataSourceInstanceSettings, DataSourcePluginOptionsEditorProps } from '@grafana/data';
-import { ConfigSection } from '@grafana/experimental';
+import { ConfigDescriptionLink, ConfigSection } from '@grafana/experimental';
+import { DataSourcePicker } from '@grafana/runtime';
 import { InlineField, InlineFieldRow, Input, InlineSwitch } from '@grafana/ui';
-import { ConfigDescriptionLink } from 'app/core/components/ConfigDescriptionLink';
-import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker';
 
 import { IntervalInput } from '../IntervalInput/IntervalInput';
 
@@ -230,7 +229,7 @@ function IdFilter(props: IdFilterProps) {
         label={`Filter by ${props.type} ID`}
         labelWidth={26}
         grow
-        tooltip={`Filters logs by ${props.type} ID`}
+        tooltip={`Filters logs by ${props.type} ID, where the ${props.type} ID should be part of the log line`}
       >
         <InlineSwitch
           id={props.id}
diff --git a/public/app/core/components/TraceToMetrics/TraceToMetricsSettings.tsx b/packages/grafana-o11y-ds-frontend/src/TraceToMetrics/TraceToMetricsSettings.tsx
similarity index 86%
rename from public/app/core/components/TraceToMetrics/TraceToMetricsSettings.tsx
rename to packages/grafana-o11y-ds-frontend/src/TraceToMetrics/TraceToMetricsSettings.tsx
index 448b5a978b71b..90249d4dd3faa 100644
--- a/public/app/core/components/TraceToMetrics/TraceToMetricsSettings.tsx
+++ b/packages/grafana-o11y-ds-frontend/src/TraceToMetrics/TraceToMetricsSettings.tsx
@@ -8,11 +8,10 @@ import {
   GrafanaTheme2,
   updateDatasourcePluginJsonDataOption,
 } from '@grafana/data';
-import { ConfigSection } from '@grafana/experimental';
+import { ConfigDescriptionLink, ConfigSection } from '@grafana/experimental';
+import { DataSourcePicker } from '@grafana/runtime';
 import { Button, InlineField, InlineFieldRow, Input, useStyles2 } from '@grafana/ui';
-import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker';
 
-import { ConfigDescriptionLink } from '../ConfigDescriptionLink';
 import { IntervalInput } from '../IntervalInput/IntervalInput';
 import { TagMappingInput } from '../TraceToLogs/TagMappingInput';
 import { getTimeShiftLabel, getTimeShiftTooltip, invalidTimeShiftError } from '../TraceToLogs/TraceToLogsSettings';
@@ -135,8 +134,11 @@ export function TraceToMetricsSettings({ options, onOptionsChange }: Props) {
               value={query.name}
               width={40}
               onChange={(e) => {
-                let newQueries = options.jsonData.tracesToMetrics?.queries.slice() ?? [];
-                newQueries[i].name = e.currentTarget.value;
+                const newQueries = (options.jsonData.tracesToMetrics?.queries ?? []).map(
+                  (traceToMetricQuery, index) => {
+                    return index === i ? { ...traceToMetricQuery, name: e.currentTarget.value } : traceToMetricQuery;
+                  }
+                );
                 updateDatasourcePluginJsonDataOption({ onOptionsChange, options }, 'tracesToMetrics', {
                   ...options.jsonData.tracesToMetrics,
                   queries: newQueries,
@@ -156,11 +158,14 @@ export function TraceToMetricsSettings({ options, onOptionsChange }: Props) {
               allowFullScreen
               value={query.query}
               onChange={(e) => {
-                let newQueries = options.jsonData.tracesToMetrics?.queries.slice() ?? [];
-                newQueries[i].query = e.currentTarget.value;
+                const updatedQueries = (options.jsonData.tracesToMetrics?.queries ?? []).map(
+                  (traceToMetricQuery, index) => {
+                    return index === i ? { ...traceToMetricQuery, query: e.currentTarget.value } : traceToMetricQuery;
+                  }
+                );
                 updateDatasourcePluginJsonDataOption({ onOptionsChange, options }, 'tracesToMetrics', {
                   ...options.jsonData.tracesToMetrics,
-                  queries: newQueries,
+                  queries: updatedQueries,
                 });
               }}
             />
@@ -172,8 +177,7 @@ export function TraceToMetricsSettings({ options, onOptionsChange }: Props) {
             icon="times"
             type="button"
             onClick={() => {
-              let newQueries = options.jsonData.tracesToMetrics?.queries.slice();
-              newQueries?.splice(i, 1);
+              const newQueries = options.jsonData.tracesToMetrics?.queries.filter((_, index) => index !== i);
               updateDatasourcePluginJsonDataOption({ onOptionsChange, options }, 'tracesToMetrics', {
                 ...options.jsonData.tracesToMetrics,
                 queries: newQueries,
@@ -224,17 +228,17 @@ export const TraceToMetricsSection = ({ options, onOptionsChange }: DataSourcePl
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  infoText: css`
-    padding-bottom: ${theme.spacing(2)};
-    color: ${theme.colors.text.secondary};
-  `,
-  row: css`
-    label: row;
-    align-items: baseline;
-  `,
-  queryRow: css`
-    label: queryRow;
-    display: flex;
-    flex-flow: wrap;
-  `,
+  infoText: {
+    paddingBottom: theme.spacing(2),
+    color: theme.colors.text.secondary,
+  },
+  row: css({
+    label: 'row',
+    alignItems: 'baseline',
+  }),
+  queryRow: css({
+    label: 'queryRow',
+    display: 'flex',
+    flexFlow: 'wrap',
+  }),
 });
diff --git a/packages/grafana-o11y-ds-frontend/src/TraceToProfiles/TraceToProfilesSettings.test.tsx b/packages/grafana-o11y-ds-frontend/src/TraceToProfiles/TraceToProfilesSettings.test.tsx
new file mode 100644
index 0000000000000..0cf648def3346
--- /dev/null
+++ b/packages/grafana-o11y-ds-frontend/src/TraceToProfiles/TraceToProfilesSettings.test.tsx
@@ -0,0 +1,53 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import React from 'react';
+
+import { DataSourceInstanceSettings, DataSourceSettings } from '@grafana/data';
+import { DataSourceSrv, setDataSourceSrv } from '@grafana/runtime';
+
+import { TraceToProfilesData, TraceToProfilesSettings } from './TraceToProfilesSettings';
+
+const defaultOption: DataSourceSettings<TraceToProfilesData> = {
+  jsonData: {
+    tracesToProfiles: {
+      datasourceUid: 'profiling1_uid',
+      tags: [{ key: 'someTag', value: 'newName' }],
+      customQuery: true,
+      query: '{${__tags}}',
+    },
+  },
+} as unknown as DataSourceSettings<TraceToProfilesData>;
+
+const pyroSettings = {
+  uid: 'profiling1_uid',
+  name: 'profiling1',
+  type: 'grafana-pyroscope-datasource',
+  meta: { info: { logos: { small: '' } } },
+} as unknown as DataSourceInstanceSettings;
+
+describe('TraceToProfilesSettings', () => {
+  beforeAll(() => {
+    setDataSourceSrv({
+      getList() {
+        return [pyroSettings];
+      },
+      getInstanceSettings() {
+        return pyroSettings;
+      },
+    } as unknown as DataSourceSrv);
+  });
+
+  it('should render without error', () => {
+    waitFor(() => {
+      expect(() =>
+        render(<TraceToProfilesSettings options={defaultOption} onOptionsChange={() => {}} />)
+      ).not.toThrow();
+    });
+  });
+
+  it('should render all options', () => {
+    render(<TraceToProfilesSettings options={defaultOption} onOptionsChange={() => {}} />);
+    expect(screen.getByText('Tags')).toBeInTheDocument();
+    expect(screen.getByText('Profile type')).toBeInTheDocument();
+    expect(screen.getByText('Use custom query')).toBeInTheDocument();
+  });
+});
diff --git a/packages/grafana-o11y-ds-frontend/src/TraceToProfiles/TraceToProfilesSettings.tsx b/packages/grafana-o11y-ds-frontend/src/TraceToProfiles/TraceToProfilesSettings.tsx
new file mode 100644
index 0000000000000..ebabc60dd0109
--- /dev/null
+++ b/packages/grafana-o11y-ds-frontend/src/TraceToProfiles/TraceToProfilesSettings.tsx
@@ -0,0 +1,183 @@
+import { css } from '@emotion/css';
+import React, { useEffect, useMemo, useState } from 'react';
+import { useAsync } from 'react-use';
+
+import {
+  DataSourceJsonData,
+  DataSourceInstanceSettings,
+  DataSourcePluginOptionsEditorProps,
+  updateDatasourcePluginJsonDataOption,
+} from '@grafana/data';
+import { ConfigDescriptionLink, ConfigSection } from '@grafana/experimental';
+import { DataSourcePicker, DataSourceWithBackend, getDataSourceSrv } from '@grafana/runtime';
+import { InlineField, InlineFieldRow, Input, InlineSwitch } from '@grafana/ui';
+
+import { TagMappingInput } from '../TraceToLogs/TagMappingInput';
+import { ProfileTypesCascader } from '../pyroscope/ProfileTypesCascader';
+import { ProfileTypeMessage } from '../pyroscope/types';
+
+export interface TraceToProfilesOptions {
+  datasourceUid?: string;
+  tags?: Array<{ key: string; value?: string }>;
+  query?: string;
+  profileTypeId?: string;
+  customQuery: boolean;
+}
+
+export interface TraceToProfilesData extends DataSourceJsonData {
+  tracesToProfiles?: TraceToProfilesOptions;
+}
+
+interface Props extends DataSourcePluginOptionsEditorProps<TraceToProfilesData> {}
+
+export function TraceToProfilesSettings({ options, onOptionsChange }: Props) {
+  const supportedDataSourceTypes = useMemo(() => ['grafana-pyroscope-datasource'], []);
+
+  const [profileTypes, setProfileTypes] = useState<ProfileTypeMessage[]>([]);
+  const profileTypesPlaceholder = useMemo(() => {
+    let placeholder = profileTypes.length === 0 ? 'No profile types found' : 'Select profile type';
+    if (!options.jsonData.tracesToProfiles?.datasourceUid) {
+      placeholder = 'Please select profiling data source';
+    }
+    return placeholder;
+  }, [options.jsonData.tracesToProfiles?.datasourceUid, profileTypes]);
+
+  const { value: dataSource } = useAsync(async () => {
+    return await getDataSourceSrv().get(options.jsonData.tracesToProfiles?.datasourceUid);
+  }, [options.jsonData.tracesToProfiles?.datasourceUid]);
+
+  const { value: pTypes } = useAsync(async () => {
+    if (
+      dataSource instanceof DataSourceWithBackend &&
+      supportedDataSourceTypes.includes(dataSource.type) &&
+      dataSource.uid === options.jsonData.tracesToProfiles?.datasourceUid
+    ) {
+      return await dataSource?.getResource('profileTypes');
+    }
+  }, [dataSource]);
+
+  useEffect(() => {
+    setProfileTypes(pTypes ?? []);
+  }, [pTypes]);
+
+  return (
+    <div className={css({ width: '100%' })}>
+      <InlineFieldRow>
+        <InlineField
+          tooltip="The profiles data source the trace is going to navigate to"
+          label="Data source"
+          labelWidth={26}
+        >
+          <DataSourcePicker
+            inputId="trace-to-profiles-data-source-picker"
+            filter={(ds) => supportedDataSourceTypes.includes(ds.type)}
+            current={options.jsonData.tracesToProfiles?.datasourceUid}
+            noDefault={true}
+            width={40}
+            onChange={(ds: DataSourceInstanceSettings) => {
+              updateDatasourcePluginJsonDataOption({ onOptionsChange, options }, 'tracesToProfiles', {
+                ...options.jsonData.tracesToProfiles,
+                datasourceUid: ds.uid,
+              });
+            }}
+          />
+        </InlineField>
+      </InlineFieldRow>
+
+      <InlineFieldRow>
+        <InlineField
+          tooltip="Tags that will be used in the query. Default tags: 'service.name', 'service.namespace'"
+          label="Tags"
+          labelWidth={26}
+        >
+          <TagMappingInput
+            values={options.jsonData.tracesToProfiles?.tags ?? []}
+            onChange={(v) => {
+              updateDatasourcePluginJsonDataOption({ onOptionsChange, options }, 'tracesToProfiles', {
+                ...options.jsonData.tracesToProfiles,
+                tags: v,
+              });
+            }}
+          />
+        </InlineField>
+      </InlineFieldRow>
+
+      <InlineFieldRow>
+        <InlineField tooltip="Profile type that will be used in the query" label="Profile type" labelWidth={26}>
+          <ProfileTypesCascader
+            profileTypes={profileTypes}
+            placeholder={profileTypesPlaceholder}
+            initialProfileTypeId={options.jsonData.tracesToProfiles?.profileTypeId}
+            onChange={(val) => {
+              updateDatasourcePluginJsonDataOption({ onOptionsChange, options }, 'tracesToProfiles', {
+                ...options.jsonData.tracesToProfiles,
+                profileTypeId: val,
+              });
+            }}
+            width={40}
+          />
+        </InlineField>
+      </InlineFieldRow>
+
+      <InlineFieldRow>
+        <InlineField
+          tooltip="Use a custom query with the possibility to interpolate variables from the trace or span"
+          label="Use custom query"
+          labelWidth={26}
+        >
+          <InlineSwitch
+            id={'profilesCustomQuerySwitch'}
+            value={options.jsonData.tracesToProfiles?.customQuery}
+            onChange={(event: React.SyntheticEvent<HTMLInputElement>) =>
+              updateDatasourcePluginJsonDataOption({ onOptionsChange, options }, 'tracesToProfiles', {
+                ...options.jsonData.tracesToProfiles,
+                customQuery: event.currentTarget.checked,
+              })
+            }
+          />
+        </InlineField>
+      </InlineFieldRow>
+
+      {options.jsonData.tracesToProfiles?.customQuery && (
+        <InlineField
+          label="Query"
+          labelWidth={26}
+          tooltip="The query that will run when navigating from a trace to profiles data source. Interpolate tags using the `$__tags` keyword"
+          grow
+        >
+          <Input
+            label="Query"
+            type="text"
+            allowFullScreen
+            value={options.jsonData.tracesToProfiles?.query || ''}
+            onChange={(e) =>
+              updateDatasourcePluginJsonDataOption({ onOptionsChange, options }, 'tracesToProfiles', {
+                ...options.jsonData.tracesToProfiles,
+                query: e.currentTarget.value,
+              })
+            }
+          />
+        </InlineField>
+      )}
+    </div>
+  );
+}
+
+export const TraceToProfilesSection = ({ options, onOptionsChange }: DataSourcePluginOptionsEditorProps) => {
+  return (
+    <ConfigSection
+      title="Trace to profiles"
+      description={
+        <ConfigDescriptionLink
+          description="Navigate from a trace span to the selected data source's profiles."
+          suffix={`${options.type}/configure-tempo-data-source/#trace-to-profiles`}
+          feature="trace to profiles"
+        />
+      }
+      isCollapsible={true}
+      isInitiallyOpen={true}
+    >
+      <TraceToProfilesSettings options={options} onOptionsChange={onOptionsChange} />
+    </ConfigSection>
+  );
+};
diff --git a/packages/grafana-o11y-ds-frontend/src/combineResponses.test.ts b/packages/grafana-o11y-ds-frontend/src/combineResponses.test.ts
new file mode 100644
index 0000000000000..aa1b8ca07ad04
--- /dev/null
+++ b/packages/grafana-o11y-ds-frontend/src/combineResponses.test.ts
@@ -0,0 +1,779 @@
+import {
+  DataFrame,
+  DataFrameType,
+  DataQueryResponse,
+  Field,
+  FieldType,
+  LoadingState,
+  PanelData,
+  QueryResultMetaStat,
+  getDefaultTimeRange,
+} from '@grafana/data';
+
+import { cloneQueryResponse, combinePanelData, combineResponses } from './combineResponses';
+
+describe('cloneQueryResponse', () => {
+  const { logFrameA } = getMockFrames();
+  const responseA: DataQueryResponse = {
+    data: [logFrameA],
+  };
+  it('clones query responses', () => {
+    const clonedA = cloneQueryResponse(responseA);
+    expect(clonedA).not.toBe(responseA);
+    expect(clonedA).toEqual(clonedA);
+  });
+});
+
+describe('combineResponses', () => {
+  it('combines logs frames', () => {
+    const { logFrameA, logFrameB } = getMockFrames();
+    const responseA: DataQueryResponse = {
+      data: [logFrameA],
+    };
+    const responseB: DataQueryResponse = {
+      data: [logFrameB],
+    };
+    expect(combineResponses(responseA, responseB)).toEqual({
+      data: [
+        {
+          fields: [
+            {
+              config: {},
+              name: 'Time',
+              type: 'time',
+              values: [1, 2, 3, 4],
+            },
+            {
+              config: {},
+              name: 'Line',
+              type: 'string',
+              values: ['line3', 'line4', 'line1', 'line2'],
+            },
+            {
+              config: {},
+              name: 'labels',
+              type: 'other',
+              values: [
+                {
+                  otherLabel: 'other value',
+                },
+                {
+                  label: 'value',
+                },
+                {
+                  otherLabel: 'other value',
+                },
+              ],
+            },
+            {
+              config: {},
+              name: 'tsNs',
+              type: 'string',
+              values: ['1000000', '2000000', '3000000', '4000000'],
+            },
+            {
+              config: {},
+              name: 'id',
+              type: 'string',
+              values: ['id3', 'id4', 'id1', 'id2'],
+            },
+          ],
+          length: 4,
+          meta: {
+            custom: {
+              frameType: 'LabeledTimeValues',
+            },
+            stats: [
+              {
+                displayName: 'Summary: total bytes processed',
+                unit: 'decbytes',
+                value: 33,
+              },
+            ],
+          },
+          refId: 'A',
+        },
+      ],
+    });
+  });
+
+  it('combines logs frames with transformed fields', () => {
+    const { logFrameA, logFrameB } = getMockFrames();
+    const { logFrameB: originalLogFrameB } = getMockFrames();
+
+    // Pseudo shuffle fields
+    logFrameB.fields.sort((a: Field, b: Field) => (a.name < b.name ? -1 : 1));
+    expect(logFrameB.fields).not.toEqual(originalLogFrameB.fields);
+
+    const responseA: DataQueryResponse = {
+      data: [logFrameA],
+    };
+    const responseB: DataQueryResponse = {
+      data: [logFrameB],
+    };
+    expect(combineResponses(responseA, responseB)).toEqual({
+      data: [
+        {
+          fields: [
+            {
+              config: {},
+              name: 'Time',
+              type: 'time',
+              values: [1, 2, 3, 4],
+            },
+            {
+              config: {},
+              name: 'Line',
+              type: 'string',
+              values: ['line3', 'line4', 'line1', 'line2'],
+            },
+            {
+              config: {},
+              name: 'labels',
+              type: 'other',
+              values: [
+                {
+                  otherLabel: 'other value',
+                },
+                {
+                  label: 'value',
+                },
+                {
+                  otherLabel: 'other value',
+                },
+              ],
+            },
+            {
+              config: {},
+              name: 'tsNs',
+              type: 'string',
+              values: ['1000000', '2000000', '3000000', '4000000'],
+            },
+            {
+              config: {},
+              name: 'id',
+              type: 'string',
+              values: ['id3', 'id4', 'id1', 'id2'],
+            },
+          ],
+          length: 4,
+          meta: {
+            custom: {
+              frameType: 'LabeledTimeValues',
+            },
+            stats: [
+              {
+                displayName: 'Summary: total bytes processed',
+                unit: 'decbytes',
+                value: 33,
+              },
+            ],
+          },
+          refId: 'A',
+        },
+      ],
+    });
+  });
+
+  it('combines metric frames', () => {
+    const { metricFrameA, metricFrameB } = getMockFrames();
+    const responseA: DataQueryResponse = {
+      data: [metricFrameA],
+    };
+    const responseB: DataQueryResponse = {
+      data: [metricFrameB],
+    };
+    expect(combineResponses(responseA, responseB)).toEqual({
+      data: [
+        {
+          fields: [
+            {
+              config: {},
+              name: 'Time',
+              type: 'time',
+              values: [1000000, 2000000, 3000000, 4000000],
+            },
+            {
+              config: {},
+              name: 'Value',
+              type: 'number',
+              values: [6, 7, 5, 4],
+              labels: {
+                level: 'debug',
+              },
+            },
+          ],
+          length: 4,
+          meta: {
+            type: 'timeseries-multi',
+            stats: [
+              {
+                displayName: 'Summary: total bytes processed',
+                unit: 'decbytes',
+                value: 33,
+              },
+            ],
+          },
+          refId: 'A',
+        },
+      ],
+    });
+  });
+
+  it('combines and identifies new frames in the response', () => {
+    const { metricFrameA, metricFrameB, metricFrameC } = getMockFrames();
+    const responseA: DataQueryResponse = {
+      data: [metricFrameA],
+    };
+    const responseB: DataQueryResponse = {
+      data: [metricFrameB, metricFrameC],
+    };
+    expect(combineResponses(responseA, responseB)).toEqual({
+      data: [
+        {
+          fields: [
+            {
+              config: {},
+              name: 'Time',
+              type: 'time',
+              values: [1000000, 2000000, 3000000, 4000000],
+            },
+            {
+              config: {},
+              name: 'Value',
+              type: 'number',
+              values: [6, 7, 5, 4],
+              labels: {
+                level: 'debug',
+              },
+            },
+          ],
+          length: 4,
+          meta: {
+            type: 'timeseries-multi',
+            stats: [
+              {
+                displayName: 'Summary: total bytes processed',
+                unit: 'decbytes',
+                value: 33,
+              },
+            ],
+          },
+          refId: 'A',
+        },
+        metricFrameC,
+      ],
+    });
+  });
+
+  it('combines frames prioritizing refIds over names', () => {
+    const { metricFrameA, metricFrameB } = getMockFrames();
+    const dataFrameA = {
+      ...metricFrameA,
+      refId: 'A',
+      name: 'A',
+    };
+    const dataFrameB = {
+      ...metricFrameB,
+      refId: 'B',
+      name: 'A',
+    };
+    const responseA: DataQueryResponse = {
+      data: [dataFrameA],
+    };
+    const responseB: DataQueryResponse = {
+      data: [dataFrameB],
+    };
+    expect(combineResponses(responseA, responseB)).toEqual({
+      data: [dataFrameA, dataFrameB],
+    });
+  });
+
+  it('combines frames in a new response instance', () => {
+    const { metricFrameA, metricFrameB } = getMockFrames();
+    const responseA: DataQueryResponse = {
+      data: [metricFrameA],
+    };
+    const responseB: DataQueryResponse = {
+      data: [metricFrameB],
+    };
+    expect(combineResponses(null, responseA)).not.toBe(responseA);
+    expect(combineResponses(null, responseB)).not.toBe(responseB);
+  });
+
+  it('combine when first param has errors', () => {
+    const { metricFrameA, metricFrameB } = getMockFrames();
+    const errorA = {
+      message: 'errorA',
+    };
+    const responseA: DataQueryResponse = {
+      data: [metricFrameA],
+      error: errorA,
+      errors: [errorA],
+    };
+    const responseB: DataQueryResponse = {
+      data: [metricFrameB],
+    };
+
+    const combined = combineResponses(responseA, responseB);
+    expect(combined.data[0].length).toBe(4);
+    expect(combined.error?.message).toBe('errorA');
+    expect(combined.errors).toHaveLength(1);
+    expect(combined.errors?.[0]?.message).toBe('errorA');
+  });
+
+  it('combine when second param has errors', () => {
+    const { metricFrameA, metricFrameB } = getMockFrames();
+    const responseA: DataQueryResponse = {
+      data: [metricFrameA],
+    };
+    const errorB = {
+      message: 'errorB',
+    };
+    const responseB: DataQueryResponse = {
+      data: [metricFrameB],
+      error: errorB,
+      errors: [errorB],
+    };
+
+    const combined = combineResponses(responseA, responseB);
+    expect(combined.data[0].length).toBe(4);
+    expect(combined.error?.message).toBe('errorB');
+    expect(combined.errors).toHaveLength(1);
+    expect(combined.errors?.[0]?.message).toBe('errorB');
+  });
+
+  it('combine when both params have errors', () => {
+    const { metricFrameA, metricFrameB } = getMockFrames();
+    const errorA = {
+      message: 'errorA',
+    };
+    const errorB = {
+      message: 'errorB',
+    };
+    const responseA: DataQueryResponse = {
+      data: [metricFrameA],
+      error: errorA,
+      errors: [errorA],
+    };
+    const responseB: DataQueryResponse = {
+      data: [metricFrameB],
+      error: errorB,
+      errors: [errorB],
+    };
+
+    const combined = combineResponses(responseA, responseB);
+    expect(combined.data[0].length).toBe(4);
+    expect(combined.error?.message).toBe('errorA');
+    expect(combined.errors).toHaveLength(2);
+    expect(combined.errors?.[0]?.message).toBe('errorA');
+    expect(combined.errors?.[1]?.message).toBe('errorB');
+  });
+
+  it('combines frames with nanoseconds', () => {
+    const { logFrameA, logFrameB } = getMockFrames();
+    logFrameA.fields[0].nanos = [333333, 444444];
+    logFrameB.fields[0].nanos = [111111, 222222];
+    const responseA: DataQueryResponse = {
+      data: [logFrameA],
+    };
+    const responseB: DataQueryResponse = {
+      data: [logFrameB],
+    };
+    expect(combineResponses(responseA, responseB)).toEqual({
+      data: [
+        {
+          fields: [
+            {
+              config: {},
+              name: 'Time',
+              type: 'time',
+              values: [1, 2, 3, 4],
+              nanos: [111111, 222222, 333333, 444444],
+            },
+            {
+              config: {},
+              name: 'Line',
+              type: 'string',
+              values: ['line3', 'line4', 'line1', 'line2'],
+            },
+            {
+              config: {},
+              name: 'labels',
+              type: 'other',
+              values: [
+                {
+                  otherLabel: 'other value',
+                },
+                {
+                  label: 'value',
+                },
+                {
+                  otherLabel: 'other value',
+                },
+              ],
+            },
+            {
+              config: {},
+              name: 'tsNs',
+              type: 'string',
+              values: ['1000000', '2000000', '3000000', '4000000'],
+            },
+            {
+              config: {},
+              name: 'id',
+              type: 'string',
+              values: ['id3', 'id4', 'id1', 'id2'],
+            },
+          ],
+          length: 4,
+          meta: {
+            custom: {
+              frameType: 'LabeledTimeValues',
+            },
+            stats: [
+              {
+                displayName: 'Summary: total bytes processed',
+                unit: 'decbytes',
+                value: 33,
+              },
+            ],
+          },
+          refId: 'A',
+        },
+      ],
+    });
+  });
+
+  describe('combine stats', () => {
+    const { metricFrameA } = getMockFrames();
+    const makeResponse = (stats?: QueryResultMetaStat[]): DataQueryResponse => ({
+      data: [
+        {
+          ...metricFrameA,
+          meta: {
+            ...metricFrameA.meta,
+            stats,
+          },
+        },
+      ],
+    });
+    it('two values', () => {
+      const responseA = makeResponse([
+        { displayName: 'Ingester: total reached', value: 1 },
+        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 11 },
+      ]);
+      const responseB = makeResponse([
+        { displayName: 'Ingester: total reached', value: 2 },
+        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 22 },
+      ]);
+
+      expect(combineResponses(responseA, responseB).data[0].meta.stats).toStrictEqual([
+        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 33 },
+      ]);
+    });
+
+    it('one value', () => {
+      const responseA = makeResponse([
+        { displayName: 'Ingester: total reached', value: 1 },
+        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 11 },
+      ]);
+      const responseB = makeResponse();
+
+      expect(combineResponses(responseA, responseB).data[0].meta.stats).toStrictEqual([
+        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 11 },
+      ]);
+
+      expect(combineResponses(responseB, responseA).data[0].meta.stats).toStrictEqual([
+        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 11 },
+      ]);
+    });
+
+    it('no value', () => {
+      const responseA = makeResponse();
+      const responseB = makeResponse();
+      expect(combineResponses(responseA, responseB).data[0].meta.stats).toHaveLength(0);
+    });
+  });
+});
+
+describe('combinePanelData', () => {
+  it('combines series within PanelData instances', () => {
+    const { logFrameA, logFrameB } = getMockFrames();
+    const panelDataA: PanelData = {
+      state: LoadingState.Done,
+      series: [logFrameA],
+      timeRange: getDefaultTimeRange(),
+    };
+    const panelDataB: PanelData = {
+      state: LoadingState.Done,
+      series: [logFrameB],
+      timeRange: getDefaultTimeRange(),
+    };
+    expect(combinePanelData(panelDataA, panelDataB)).toEqual({
+      state: panelDataA.state,
+      series: [
+        {
+          fields: [
+            {
+              config: {},
+              name: 'Time',
+              type: 'time',
+              values: [1, 2, 3, 4],
+            },
+            {
+              config: {},
+              name: 'Line',
+              type: 'string',
+              values: ['line3', 'line4', 'line1', 'line2'],
+            },
+            {
+              config: {},
+              name: 'labels',
+              type: 'other',
+              values: [
+                {
+                  otherLabel: 'other value',
+                },
+                {
+                  label: 'value',
+                },
+                {
+                  otherLabel: 'other value',
+                },
+              ],
+            },
+            {
+              config: {},
+              name: 'tsNs',
+              type: 'string',
+              values: ['1000000', '2000000', '3000000', '4000000'],
+            },
+            {
+              config: {},
+              name: 'id',
+              type: 'string',
+              values: ['id3', 'id4', 'id1', 'id2'],
+            },
+          ],
+          length: 4,
+          meta: {
+            custom: {
+              frameType: 'LabeledTimeValues',
+            },
+            stats: [
+              {
+                displayName: 'Summary: total bytes processed',
+                unit: 'decbytes',
+                value: 33,
+              },
+            ],
+          },
+          refId: 'A',
+        },
+      ],
+      timeRange: panelDataA.timeRange,
+    });
+  });
+});
+
+export function getMockFrames() {
+  const logFrameA: DataFrame = {
+    refId: 'A',
+    fields: [
+      {
+        name: 'Time',
+        type: FieldType.time,
+        config: {},
+        values: [3, 4],
+      },
+      {
+        name: 'Line',
+        type: FieldType.string,
+        config: {},
+        values: ['line1', 'line2'],
+      },
+      {
+        name: 'labels',
+        type: FieldType.other,
+        config: {},
+        values: [
+          {
+            label: 'value',
+          },
+          {
+            otherLabel: 'other value',
+          },
+        ],
+      },
+      {
+        name: 'tsNs',
+        type: FieldType.string,
+        config: {},
+        values: ['3000000', '4000000'],
+      },
+      {
+        name: 'id',
+        type: FieldType.string,
+        config: {},
+        values: ['id1', 'id2'],
+      },
+    ],
+    meta: {
+      custom: {
+        frameType: 'LabeledTimeValues',
+      },
+      stats: [
+        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 11 },
+        { displayName: 'Ingester: total reached', value: 1 },
+      ],
+    },
+    length: 2,
+  };
+
+  const logFrameB: DataFrame = {
+    refId: 'A',
+    fields: [
+      {
+        name: 'Time',
+        type: FieldType.time,
+        config: {},
+        values: [1, 2],
+      },
+      {
+        name: 'Line',
+        type: FieldType.string,
+        config: {},
+        values: ['line3', 'line4'],
+      },
+      {
+        name: 'labels',
+        type: FieldType.other,
+        config: {},
+        values: [
+          {
+            otherLabel: 'other value',
+          },
+        ],
+      },
+      {
+        name: 'tsNs',
+        type: FieldType.string,
+        config: {},
+        values: ['1000000', '2000000'],
+      },
+      {
+        name: 'id',
+        type: FieldType.string,
+        config: {},
+        values: ['id3', 'id4'],
+      },
+    ],
+    meta: {
+      custom: {
+        frameType: 'LabeledTimeValues',
+      },
+      stats: [
+        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 22 },
+        { displayName: 'Ingester: total reached', value: 2 },
+      ],
+    },
+    length: 2,
+  };
+
+  const metricFrameA: DataFrame = {
+    refId: 'A',
+    fields: [
+      {
+        name: 'Time',
+        type: FieldType.time,
+        config: {},
+        values: [3000000, 4000000],
+      },
+      {
+        name: 'Value',
+        type: FieldType.number,
+        config: {},
+        values: [5, 4],
+        labels: {
+          level: 'debug',
+        },
+      },
+    ],
+    meta: {
+      type: DataFrameType.TimeSeriesMulti,
+      stats: [
+        { displayName: 'Ingester: total reached', value: 1 },
+        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 11 },
+      ],
+    },
+    length: 2,
+  };
+
+  const metricFrameB: DataFrame = {
+    refId: 'A',
+    fields: [
+      {
+        name: 'Time',
+        type: FieldType.time,
+        config: {},
+        values: [1000000, 2000000],
+      },
+      {
+        name: 'Value',
+        type: FieldType.number,
+        config: {},
+        values: [6, 7],
+        labels: {
+          level: 'debug',
+        },
+      },
+    ],
+    meta: {
+      type: DataFrameType.TimeSeriesMulti,
+      stats: [
+        { displayName: 'Ingester: total reached', value: 2 },
+        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 22 },
+      ],
+    },
+    length: 2,
+  };
+
+  const metricFrameC: DataFrame = {
+    refId: 'A',
+    name: 'some-time-series',
+    fields: [
+      {
+        name: 'Time',
+        type: FieldType.time,
+        config: {},
+        values: [3000000, 4000000],
+      },
+      {
+        name: 'Value',
+        type: FieldType.number,
+        config: {},
+        values: [6, 7],
+        labels: {
+          level: 'error',
+        },
+      },
+    ],
+    meta: {
+      type: DataFrameType.TimeSeriesMulti,
+      stats: [
+        { displayName: 'Ingester: total reached', value: 2 },
+        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 33 },
+      ],
+    },
+    length: 2,
+  };
+
+  return {
+    logFrameA,
+    logFrameB,
+    metricFrameA,
+    metricFrameB,
+    metricFrameC,
+  };
+}
diff --git a/packages/grafana-o11y-ds-frontend/src/combineResponses.ts b/packages/grafana-o11y-ds-frontend/src/combineResponses.ts
new file mode 100644
index 0000000000000..05e290663eda6
--- /dev/null
+++ b/packages/grafana-o11y-ds-frontend/src/combineResponses.ts
@@ -0,0 +1,169 @@
+import {
+  DataFrame,
+  DataFrameType,
+  DataQueryResponse,
+  DataQueryResponseData,
+  Field,
+  FieldType,
+  PanelData,
+  QueryResultMetaStat,
+  shallowCompare,
+} from '@grafana/data';
+
+export function combinePanelData(currentData: PanelData, newData: PanelData): PanelData {
+  const series = combineResponses({ data: currentData.series }, { data: newData.series }).data;
+  return { ...currentData, series };
+}
+
+export function combineResponses(currentResult: DataQueryResponse | null, newResult: DataQueryResponse) {
+  if (!currentResult) {
+    return cloneQueryResponse(newResult);
+  }
+
+  newResult.data.forEach((newFrame) => {
+    const currentFrame = currentResult.data.find((frame) => shouldCombine(frame, newFrame));
+    if (!currentFrame) {
+      currentResult.data.push(cloneDataFrame(newFrame));
+      return;
+    }
+    combineFrames(currentFrame, newFrame);
+  });
+
+  const mergedErrors = [...(currentResult.errors ?? []), ...(newResult.errors ?? [])];
+
+  // we make sure to have `.errors` as undefined, instead of empty-array
+  // when no errors.
+
+  if (mergedErrors.length > 0) {
+    currentResult.errors = mergedErrors;
+  }
+
+  // the `.error` attribute is obsolete now,
+  // but we have to maintain it, otherwise
+  // some grafana parts do not behave well.
+  // we just choose the old error, if it exists,
+  // otherwise the new error, if it exists.
+  const mergedError = currentResult.error ?? newResult.error;
+  if (mergedError != null) {
+    currentResult.error = mergedError;
+  }
+
+  const mergedTraceIds = [...(currentResult.traceIds ?? []), ...(newResult.traceIds ?? [])];
+  if (mergedTraceIds.length > 0) {
+    currentResult.traceIds = mergedTraceIds;
+  }
+
+  return currentResult;
+}
+
+function combineFrames(dest: DataFrame, source: DataFrame) {
+  // `dest` and `source` might have more or less fields, we need to go through all of them
+  const totalFields = Math.max(dest.fields.length, source.fields.length);
+  for (let i = 0; i < totalFields; i++) {
+    // For now, skip undefined fields that exist in the new frame
+    if (!dest.fields[i]) {
+      continue;
+    }
+    // Index is not reliable when frames have disordered fields, or an extra/missing field, so we find them by name.
+    // If the field has no name, we fallback to the old index version.
+    const sourceField = dest.fields[i].name
+      ? source.fields.find((f) => f.name === dest.fields[i].name)
+      : source.fields[i];
+    if (!sourceField) {
+      continue;
+    }
+    dest.fields[i].values = [].concat.apply(sourceField.values, dest.fields[i].values);
+    if (sourceField.nanos) {
+      const nanos: number[] = dest.fields[i].nanos?.slice() || [];
+      dest.fields[i].nanos = source.fields[i].nanos?.concat(nanos);
+    }
+  }
+  dest.length += source.length;
+  dest.meta = {
+    ...dest.meta,
+    stats: getCombinedMetadataStats(dest.meta?.stats ?? [], source.meta?.stats ?? []),
+  };
+}
+
+const TOTAL_BYTES_STAT = 'Summary: total bytes processed';
+// This is specific for Loki
+function getCombinedMetadataStats(
+  destStats: QueryResultMetaStat[],
+  sourceStats: QueryResultMetaStat[]
+): QueryResultMetaStat[] {
+  // in the current approach, we only handle a single stat
+  const destStat = destStats.find((s) => s.displayName === TOTAL_BYTES_STAT);
+  const sourceStat = sourceStats.find((s) => s.displayName === TOTAL_BYTES_STAT);
+
+  if (sourceStat != null && destStat != null) {
+    return [{ value: sourceStat.value + destStat.value, displayName: TOTAL_BYTES_STAT, unit: destStat.unit }];
+  }
+
+  // maybe one of them exist
+  const eitherStat = sourceStat ?? destStat;
+  if (eitherStat != null) {
+    return [eitherStat];
+  }
+
+  return [];
+}
+
+/**
+ * Deep clones a DataQueryResponse
+ */
+export function cloneQueryResponse(response: DataQueryResponse): DataQueryResponse {
+  const newResponse = {
+    ...response,
+    data: response.data.map(cloneDataFrame),
+  };
+  return newResponse;
+}
+
+function cloneDataFrame(frame: DataQueryResponseData): DataQueryResponseData {
+  return {
+    ...frame,
+    fields: frame.fields.map((field: Field) => ({
+      ...field,
+      values: field.values,
+    })),
+  };
+}
+
+function shouldCombine(frame1: DataFrame, frame2: DataFrame): boolean {
+  if (frame1.refId !== frame2.refId) {
+    return false;
+  }
+
+  const frameType1 = frame1.meta?.type;
+  const frameType2 = frame2.meta?.type;
+
+  if (frameType1 !== frameType2) {
+    // we do not join things that have a different type
+    return false;
+  }
+
+  // metric range query data
+  if (frameType1 === DataFrameType.TimeSeriesMulti) {
+    const field1 = frame1.fields.find((f) => f.type === FieldType.number);
+    const field2 = frame2.fields.find((f) => f.type === FieldType.number);
+    if (field1 === undefined || field2 === undefined) {
+      // should never happen
+      return false;
+    }
+
+    return shallowCompare(field1.labels ?? {}, field2.labels ?? {});
+  }
+
+  // logs query data
+  // logs use a special attribute in the dataframe's "custom" section
+  // because we do not have a good "frametype" value for them yet.
+  const customType1 = frame1.meta?.custom?.frameType;
+  const customType2 = frame2.meta?.custom?.frameType;
+
+  if (customType1 === 'LabeledTimeValues' && customType2 === 'LabeledTimeValues') {
+    return true;
+  }
+
+  // should never reach here
+  return false;
+}
diff --git a/packages/grafana-o11y-ds-frontend/src/index.ts b/packages/grafana-o11y-ds-frontend/src/index.ts
new file mode 100644
index 0000000000000..c2f7e931a2743
--- /dev/null
+++ b/packages/grafana-o11y-ds-frontend/src/index.ts
@@ -0,0 +1,18 @@
+/**
+ * A library containing logic to manage traces.
+ *
+ * @packageDocumentation
+ */
+
+export * from './IntervalInput/IntervalInput';
+export * from './NodeGraph/NodeGraphSettings';
+export * from './SpanBar/SpanBarSettings';
+export * from './TemporaryAlert';
+export * from './TraceToLogs/TagMappingInput';
+export * from './TraceToLogs/TraceToLogsSettings';
+export * from './TraceToMetrics/TraceToMetricsSettings';
+export * from './TraceToProfiles/TraceToProfilesSettings';
+export * from './utils';
+export * from './store';
+export * from './LocalStorageValueProvider/LocalStorageValueProvider';
+export * from './combineResponses';
diff --git a/packages/grafana-o11y-ds-frontend/src/pyroscope/ProfileTypesCascader.tsx b/packages/grafana-o11y-ds-frontend/src/pyroscope/ProfileTypesCascader.tsx
new file mode 100644
index 0000000000000..da34d4c191961
--- /dev/null
+++ b/packages/grafana-o11y-ds-frontend/src/pyroscope/ProfileTypesCascader.tsx
@@ -0,0 +1,85 @@
+import React, { useEffect, useMemo, useState } from 'react';
+
+import { Cascader, CascaderOption } from '@grafana/ui';
+
+import { PyroscopeDataSource } from './datasource';
+import { ProfileTypeMessage } from './types';
+
+type Props = {
+  initialProfileTypeId?: string;
+  profileTypes?: ProfileTypeMessage[];
+  onChange: (value: string) => void;
+  placeholder?: string;
+  width?: number;
+};
+
+export function ProfileTypesCascader(props: Props) {
+  const cascaderOptions = useCascaderOptions(props.profileTypes);
+
+  return (
+    <Cascader
+      placeholder={props.placeholder}
+      separator={'-'}
+      displayAllSelectedLevels={true}
+      initialValue={props.initialProfileTypeId}
+      allowCustomValue={true}
+      onSelect={props.onChange}
+      options={cascaderOptions}
+      changeOnSelect={false}
+      width={props.width ?? 26}
+    />
+  );
+}
+
+// Turn profileTypes into cascader options
+function useCascaderOptions(profileTypes?: ProfileTypeMessage[]): CascaderOption[] {
+  return useMemo(() => {
+    if (!profileTypes) {
+      return [];
+    }
+    let mainTypes = new Map<string, CascaderOption>();
+    // Classify profile types by name then sample type.
+    // The profileTypes are something like cpu:sample:nanoseconds:sample:count or app.something.something
+    for (let profileType of profileTypes) {
+      let parts: string[] = [];
+      if (profileType.id.indexOf(':') > -1) {
+        parts = profileType.id.split(':');
+      }
+
+      const [name, type] = parts;
+
+      if (!mainTypes.has(name)) {
+        mainTypes.set(name, {
+          label: name,
+          value: name,
+          items: [],
+        });
+      }
+      mainTypes.get(name)?.items!.push({
+        label: type,
+        value: profileType.id,
+      });
+    }
+    return Array.from(mainTypes.values());
+  }, [profileTypes]);
+}
+
+/**
+ * Loads the profile types.
+ *
+ * This is exported and not used directly in the ProfileTypesCascader component because in some case we need to know
+ * the profileTypes before rendering the cascader.
+ * @param datasource
+ */
+export function useProfileTypes(datasource: PyroscopeDataSource) {
+  const [profileTypes, setProfileTypes] = useState<ProfileTypeMessage[]>();
+
+  useEffect(() => {
+    (async () => {
+      const profileTypes = await datasource.getProfileTypes();
+      setProfileTypes(profileTypes);
+    })();
+  }, [datasource]);
+
+  return profileTypes;
+}
diff --git a/packages/grafana-o11y-ds-frontend/src/pyroscope/dataquery.gen.ts b/packages/grafana-o11y-ds-frontend/src/pyroscope/dataquery.gen.ts
new file mode 100644
index 0000000000000..1b4ed70c46f11
--- /dev/null
+++ b/packages/grafana-o11y-ds-frontend/src/pyroscope/dataquery.gen.ts
@@ -0,0 +1,38 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     public/app/plugins/gen.go
+// Using jennies:
+//     TSTypesJenny
+//     PluginTSTypesJenny
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+import * as common from '@grafana/schema';
+
+export type PyroscopeQueryType = ('metrics' | 'profile' | 'both');
+
+export const defaultPyroscopeQueryType: PyroscopeQueryType = 'both';
+
+export interface GrafanaPyroscope extends common.DataQuery {
+  /**
+   * Allows to group the results.
+   */
+  groupBy: Array<string>;
+  /**
+   * Specifies the query label selectors.
+   */
+  labelSelector: string;
+  /**
+   * Sets the maximum number of nodes in the flamegraph.
+   */
+  maxNodes?: number;
+  /**
+   * Specifies the type of profile to query.
+   */
+  profileTypeId: string;
+  /**
+   * Specifies the query span selectors.
+   */
+  spanSelector?: Array<string>;
+}
diff --git a/packages/grafana-o11y-ds-frontend/src/pyroscope/datasource.ts b/packages/grafana-o11y-ds-frontend/src/pyroscope/datasource.ts
new file mode 100644
index 0000000000000..39bd35fb177e8
--- /dev/null
+++ b/packages/grafana-o11y-ds-frontend/src/pyroscope/datasource.ts
@@ -0,0 +1,13 @@
+import { Observable } from 'rxjs';
+
+import { CoreApp, DataQueryRequest, DataQueryResponse, ScopedVars } from '@grafana/data';
+import { DataSourceWithBackend } from '@grafana/runtime';
+
+import { PyroscopeDataSourceOptions, ProfileTypeMessage, Query } from './types';
+
+export abstract class PyroscopeDataSource extends DataSourceWithBackend<Query, PyroscopeDataSourceOptions> {
+  abstract applyTemplateVariables(query: Query, scopedVars: ScopedVars): Query;
+  abstract getDefaultQuery(app: CoreApp): Partial<Query>;
+  abstract getProfileTypes(): Promise<ProfileTypeMessage[]>;
+  abstract query(request: DataQueryRequest<Query>): Observable<DataQueryResponse>;
+}
diff --git a/packages/grafana-o11y-ds-frontend/src/pyroscope/types.ts b/packages/grafana-o11y-ds-frontend/src/pyroscope/types.ts
new file mode 100644
index 0000000000000..563ad0df686d2
--- /dev/null
+++ b/packages/grafana-o11y-ds-frontend/src/pyroscope/types.ts
@@ -0,0 +1,16 @@
+import { DataSourceJsonData } from '@grafana/data';
+
+import { GrafanaPyroscope, PyroscopeQueryType } from './dataquery.gen';
+
+export interface ProfileTypeMessage {
+  id: string;
+  label: string;
+}
+
+export interface PyroscopeDataSourceOptions extends DataSourceJsonData {
+  minStep?: string;
+}
+
+export interface Query extends GrafanaPyroscope {
+  queryType: PyroscopeQueryType;
+}
diff --git a/packages/grafana-o11y-ds-frontend/src/store.ts b/packages/grafana-o11y-ds-frontend/src/store.ts
new file mode 100644
index 0000000000000..3942f408a739f
--- /dev/null
+++ b/packages/grafana-o11y-ds-frontend/src/store.ts
@@ -0,0 +1,64 @@
+type StoreValue = string | number | boolean | null;
+
+export class Store {
+  get(key: string) {
+    return window.localStorage[key];
+  }
+
+  set(key: string, value: StoreValue) {
+    window.localStorage[key] = value;
+  }
+
+  getBool(key: string, def: boolean): boolean {
+    if (def !== void 0 && !this.exists(key)) {
+      return def;
+    }
+    return window.localStorage[key] === 'true';
+  }
+
+  getObject<T = unknown>(key: string): T | undefined;
+  getObject<T = unknown>(key: string, def: T): T;
+  getObject<T = unknown>(key: string, def?: T) {
+    let ret = def;
+    if (this.exists(key)) {
+      const json = window.localStorage[key];
+      try {
+        ret = JSON.parse(json);
+      } catch (error) {
+        console.error(`Error parsing store object: ${key}. Returning default: ${def}. [${error}]`);
+      }
+    }
+    return ret;
+  }
+
+  /* Returns true when successfully stored, throws error if not successfully stored */
+  setObject(key: string, value: unknown) {
+    let json;
+    try {
+      json = JSON.stringify(value);
+    } catch (error) {
+      throw new Error(`Could not stringify object: ${key}. [${error}]`);
+    }
+    try {
+      this.set(key, json);
+    } catch (error) {
+      // Likely hitting storage quota
+      const errorToThrow = new Error(`Could not save item in localStorage: ${key}. [${error}]`);
+      if (error instanceof Error) {
+        errorToThrow.name = error.name;
+      }
+      throw errorToThrow;
+    }
+    return true;
+  }
+
+  exists(key: string) {
+    return window.localStorage[key] !== void 0;
+  }
+
+  delete(key: string) {
+    window.localStorage.removeItem(key);
+  }
+}
+
+export const store = new Store();
diff --git a/packages/grafana-o11y-ds-frontend/src/utils.ts b/packages/grafana-o11y-ds-frontend/src/utils.ts
new file mode 100644
index 0000000000000..3687db979e864
--- /dev/null
+++ b/packages/grafana-o11y-ds-frontend/src/utils.ts
@@ -0,0 +1,119 @@
+/**
+ * Get non overlapping duration of the ranges as they can overlap or have gaps.
+ */
+import { FieldType, MutableDataFrame, NodeGraphDataFrameFieldNames as Fields } from '@grafana/data';
+
+export function getNonOverlappingDuration(ranges: Array<[number, number]>): number {
+  ranges.sort((a, b) => a[0] - b[0]);
+  const mergedRanges = ranges.reduce<Array<[number, number]>>((acc, range) => {
+    if (!acc.length) {
+      return [range];
+    }
+    const tail = acc.slice(-1)[0];
+    const [prevStart, prevEnd] = tail;
+    const [start, end] = range;
+    if (end < prevEnd) {
+      // In this case the range is completely inside the prev range so we can just ignore it.
+      return acc;
+    }
+
+    if (start > prevEnd) {
+      // There is no overlap so we can just add it to stack
+      return [...acc, range];
+    }
+
+    // We know there is overlap and current range ends later than previous so we can just extend the range
+    return [...acc.slice(0, -1), [prevStart, end]];
+  }, []);
+
+  return mergedRanges.reduce((acc, range) => {
+    return acc + (range[1] - range[0]);
+  }, 0);
+}
+
+/**
+ * Returns a map of the spans with children array for easier processing. It will also contain empty spans in case
+ * span is missing but other spans are its children. This is more generic because it needs to allow iterating over
+ * both arrays and dataframe views.
+ */
+export function makeSpanMap<T>(getSpan: (index: number) => { span: T; id: string; parentIds: string[] } | undefined): {
+  [id: string]: { span: T; children: string[] };
+} {
+  const spanMap: { [id: string]: { span?: T; children: string[] } } = {};
+
+  let span;
+  for (let index = 0; (span = getSpan(index)), !!span; index++) {
+    if (!spanMap[span.id]) {
+      spanMap[span.id] = {
+        span: span.span,
+        children: [],
+      };
+    } else {
+      spanMap[span.id].span = span.span;
+    }
+
+    for (const parentId of span.parentIds) {
+      if (parentId) {
+        if (!spanMap[parentId]) {
+          spanMap[parentId] = {
+            span: undefined,
+            children: [span.id],
+          };
+        } else {
+          spanMap[parentId].children.push(span.id);
+        }
+      }
+    }
+  }
+  // Discussion on this type assertion here: https://github.com/grafana/grafana/pull/80362/files#r1451019375
+  return spanMap as { [id: string]: { span: T; children: string[] } };
+}
+
+export function getStats(duration: number, traceDuration: number, selfDuration: number) {
+  return {
+    main: `${toFixedNoTrailingZeros(duration)}ms (${toFixedNoTrailingZeros((duration / traceDuration) * 100)}%)`,
+    secondary: `${toFixedNoTrailingZeros(selfDuration)}ms (${toFixedNoTrailingZeros(
+      (selfDuration / duration) * 100
+    )}%)`,
+  };
+}
+
+function toFixedNoTrailingZeros(n: number) {
+  return parseFloat(n.toFixed(2));
+}
+
+/**
+ * Create default frames used when returning data for node graph.
+ */
+export function makeFrames() {
+  const nodesFrame = new MutableDataFrame({
+    fields: [
+      { name: Fields.id, type: FieldType.string },
+      { name: Fields.title, type: FieldType.string },
+      { name: Fields.subTitle, type: FieldType.string },
+      { name: Fields.mainStat, type: FieldType.string, config: { displayName: 'Total time (% of trace)' } },
+      { name: Fields.secondaryStat, type: FieldType.string, config: { displayName: 'Self time (% of total)' } },
+      {
+        name: Fields.color,
+        type: FieldType.number,
+        config: { color: { mode: 'continuous-GrYlRd' }, displayName: 'Self time / Trace duration' },
+      },
+    ],
+    meta: {
+      preferredVisualisationType: 'nodeGraph',
+    },
+  });
+
+  const edgesFrame = new MutableDataFrame({
+    fields: [
+      { name: Fields.id, type: FieldType.string },
+      { name: Fields.target, type: FieldType.string },
+      { name: Fields.source, type: FieldType.string },
+    ],
+    meta: {
+      preferredVisualisationType: 'nodeGraph',
+    },
+  });
+
+  return [nodesFrame, edgesFrame];
+}
diff --git a/packages/grafana-o11y-ds-frontend/tsconfig.json b/packages/grafana-o11y-ds-frontend/tsconfig.json
new file mode 100644
index 0000000000000..03aa83f469f7d
--- /dev/null
+++ b/packages/grafana-o11y-ds-frontend/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "baseUrl": "./",
+    "declarationDir": "./compiled",
+    "emitDeclarationOnly": true,
+    "isolatedModules": true,
+    "rootDirs": ["."]
+  },
+  "exclude": ["dist/**/*"],
+  "extends": "@grafana/tsconfig",
+  "include": ["src/**/*.ts*", "../../public/app/types/*.d.ts", "../grafana-ui/src/types/*.d.ts"]
+}
diff --git a/packages/grafana-plugin-configs/package.json b/packages/grafana-plugin-configs/package.json
index db5e3783f72d2..48a7ec27d4e97 100644
--- a/packages/grafana-plugin-configs/package.json
+++ b/packages/grafana-plugin-configs/package.json
@@ -2,19 +2,19 @@
   "name": "@grafana/plugin-configs",
   "description": "Shared dependencies and files for core plugins",
   "private": true,
-  "version": "10.3.0-pre",
+  "version": "11.0.0",
   "dependencies": {
-    "tslib": "2.6.0"
+    "tslib": "2.6.2"
   },
   "devDependencies": {
-    "@grafana/tsconfig": "^1.2.0-rc1",
-    "copy-webpack-plugin": "11.0.0",
-    "eslint-webpack-plugin": "4.0.1",
-    "fork-ts-checker-webpack-plugin": "8.0.0",
-    "glob": "10.3.3",
+    "@grafana/tsconfig": "^1.3.0-rc1",
+    "copy-webpack-plugin": "12.0.2",
+    "eslint-webpack-plugin": "4.1.0",
+    "fork-ts-checker-webpack-plugin": "9.0.2",
+    "glob": "10.3.10",
     "replace-in-file-webpack-plugin": "1.0.6",
-    "swc-loader": "0.2.3",
-    "webpack": "5.89.0"
+    "swc-loader": "0.2.6",
+    "webpack": "5.91.0"
   },
-  "packageManager": "yarn@3.6.0"
+  "packageManager": "yarn@4.1.0"
 }
diff --git a/packages/grafana-plugin-configs/utils.ts b/packages/grafana-plugin-configs/utils.ts
index a02a2d8d16f14..a8b3dbd113cb6 100644
--- a/packages/grafana-plugin-configs/utils.ts
+++ b/packages/grafana-plugin-configs/utils.ts
@@ -12,7 +12,7 @@ export function getPluginJson() {
 }
 
 export async function getEntries(): Promise<Record<string, string>> {
-  const pluginModules = await glob(path.resolve(process.cwd(), `module.{ts,tsx}`));
+  const pluginModules = await glob(path.resolve(process.cwd(), `module.{ts,tsx}`), { absolute: true });
   if (pluginModules.length > 0) {
     return {
       module: pluginModules[0],
diff --git a/packages/grafana-plugin-configs/webpack.config.ts b/packages/grafana-plugin-configs/webpack.config.ts
index ce38d1090f8b2..0f8517073509d 100644
--- a/packages/grafana-plugin-configs/webpack.config.ts
+++ b/packages/grafana-plugin-configs/webpack.config.ts
@@ -2,8 +2,9 @@ import CopyWebpackPlugin from 'copy-webpack-plugin';
 import ESLintPlugin from 'eslint-webpack-plugin';
 import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
 import path from 'path';
+// @ts-expect-error - there are no types for this package
 import ReplaceInFileWebpackPlugin from 'replace-in-file-webpack-plugin';
-import { Configuration, DefinePlugin } from 'webpack';
+import { Configuration } from 'webpack';
 
 import { DIST_DIR } from './constants';
 import { getPackageJson, getPluginJson, getEntries, hasLicense } from './utils';
@@ -17,6 +18,10 @@ function skipFiles(f: string): boolean {
     // avoid copying tsconfig.json
     return false;
   }
+  if (f.includes('/package.json')) {
+    // avoid copying package.json
+    return false;
+  }
   return true;
 }
 
@@ -28,7 +33,7 @@ const config = async (env: Record<string, unknown>): Promise<Configuration> => {
       buildDependencies: {
         config: [__filename],
       },
-      cacheDirectory: path.resolve(__dirname, '../../.yarn/.cache/webpack', path.basename(process.cwd())),
+      cacheDirectory: path.resolve(__dirname, '../../node_modules/.cache/webpack', path.basename(process.cwd())),
     },
 
     context: process.cwd(),
@@ -86,7 +91,7 @@ const config = async (env: Record<string, unknown>): Promise<Configuration> => {
             loader: require.resolve('swc-loader'),
             options: {
               jsc: {
-                baseUrl: '.',
+                baseUrl: path.resolve(__dirname),
                 target: 'es2015',
                 loose: false,
                 parser: {
@@ -140,6 +145,7 @@ const config = async (env: Record<string, unknown>): Promise<Configuration> => {
       },
       path: path.resolve(process.cwd(), DIST_DIR),
       publicPath: `public/plugins/${pluginJson.id}/`,
+      uniqueName: pluginJson.id,
     },
 
     plugins: [
@@ -179,40 +185,28 @@ const config = async (env: Record<string, unknown>): Promise<Configuration> => {
             },
           ],
         },
-        {
-          dir: path.resolve(DIST_DIR),
-          files: ['package.json'],
-          rules: [
-            {
-              search: `"version": "${getPackageJson().version}"`,
-              replace: env.commit
-                ? `"version": "${getPackageJson().version}-${env.commit}"`
-                : `"version": "${getPackageJson().version}"`,
-            },
-          ],
-        },
       ]),
-      env.development
-        ? new ForkTsCheckerWebpackPlugin({
-            async: true,
-            issue: {
-              include: [{ file: '**/*.{ts,tsx}' }],
-            },
-            typescript: { configFile: path.join(process.cwd(), 'tsconfig.json') },
-          })
-        : new DefinePlugin({}),
-      env.development
-        ? new ESLintPlugin({
-            extensions: ['.ts', '.tsx'],
-            lintDirtyModulesOnly: true, // don't lint on start, only lint changed files
-            cacheLocation: path.resolve(
-              __dirname,
-              '../../.yarn/.cache/eslint-webpack-plugin',
-              path.basename(process.cwd()),
-              '.eslintcache'
-            ),
-          })
-        : new DefinePlugin({}),
+      ...(env.development
+        ? [
+            new ForkTsCheckerWebpackPlugin({
+              async: true,
+              issue: {
+                include: [{ file: '**/*.{ts,tsx}' }],
+              },
+              typescript: { configFile: path.join(process.cwd(), 'tsconfig.json') },
+            }),
+            new ESLintPlugin({
+              extensions: ['.ts', '.tsx'],
+              lintDirtyModulesOnly: true, // don't lint on start, only lint changed files
+              cacheLocation: path.resolve(
+                __dirname,
+                '../../node_modules/.cache/eslint-webpack-plugin',
+                path.basename(process.cwd()),
+                '.eslintcache'
+              ),
+            }),
+          ]
+        : []),
     ],
 
     resolve: {
@@ -220,6 +214,8 @@ const config = async (env: Record<string, unknown>): Promise<Configuration> => {
       unsafeCache: true,
     },
 
+    stats: 'minimal',
+
     watchOptions: {
       ignored: ['**/node_modules', '**/dist', '**/.yarn'],
     },
diff --git a/packages/grafana-prometheus/CHANGELOG.md b/packages/grafana-prometheus/CHANGELOG.md
new file mode 100644
index 0000000000000..8d0fac75805ea
--- /dev/null
+++ b/packages/grafana-prometheus/CHANGELOG.md
@@ -0,0 +1,3 @@
+# (2024-02-16)
+
+First public release. This release provides Prometheus exports in Grafana. Please be aware this is in the alpha state and there is likely to be breaking changes.
diff --git a/packages/grafana-prometheus/LICENSE_AGPL b/packages/grafana-prometheus/LICENSE_AGPL
new file mode 100644
index 0000000000000..be3f7b28e564e
--- /dev/null
+++ b/packages/grafana-prometheus/LICENSE_AGPL
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.
diff --git a/packages/grafana-prometheus/README.md b/packages/grafana-prometheus/README.md
new file mode 100644
index 0000000000000..efbdb5791e11a
--- /dev/null
+++ b/packages/grafana-prometheus/README.md
@@ -0,0 +1,13 @@
+# Grafana Prometheus Library
+
+> **@grafana/prometheus is currently in ALPHA**.
+
+@grafana/prometheus is a collection of components used to build a Prometheus data source plugin in [Grafana](https://github.com/grafana/grafana).
+
+See [package source](https://github.com/grafana/grafana/tree/main/packages/grafana-prometheus) for more details.
+
+## Installation
+
+`yarn add @grafana/prometheus`
+
+`npm install @grafana/prometheus`
diff --git a/packages/grafana-prometheus/package.json b/packages/grafana-prometheus/package.json
new file mode 100644
index 0000000000000..49237ce1511f6
--- /dev/null
+++ b/packages/grafana-prometheus/package.json
@@ -0,0 +1,150 @@
+{
+  "author": "Grafana Labs",
+  "license": "AGPL-3.0-only",
+  "name": "@grafana/prometheus",
+  "version": "11.0.0",
+  "description": "Grafana Prometheus Library",
+  "keywords": [
+    "typescript"
+  ],
+  "sideEffects": false,
+  "repository": {
+    "type": "git",
+    "url": "http://github.com/grafana/grafana.git",
+    "directory": "packages/grafana-prometheus"
+  },
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "files": [
+    "./dist",
+    "./README.md",
+    "./CHANGELOG.md",
+    "./LICENSE_AGPL"
+  ],
+  "publishConfig": {
+    "main": "dist/index.js",
+    "module": "dist/esm/index.js",
+    "types": "dist/index.d.ts",
+    "access": "public"
+  },
+  "scripts": {
+    "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.ts",
+    "bundle": "rollup -c rollup.config.ts",
+    "clean": "rimraf ./dist ./compiled ./package.tgz",
+    "typecheck": "tsc --emitDeclarationOnly false --noEmit",
+    "prepack": "cp package.json package.json.bak && node ../../scripts/prepare-packagejson.js",
+    "postpack": "mv package.json.bak package.json"
+  },
+  "dependencies": {
+    "@emotion/css": "11.11.2",
+    "@floating-ui/react": "0.26.10",
+    "@grafana/data": "11.0.0",
+    "@grafana/experimental": "1.7.10",
+    "@grafana/faro-web-sdk": "1.5.0",
+    "@grafana/runtime": "11.0.0",
+    "@grafana/schema": "11.0.0",
+    "@grafana/ui": "11.0.0",
+    "@leeoniya/ufuzzy": "1.0.14",
+    "@lezer/common": "1.2.1",
+    "@lezer/highlight": "1.2.0",
+    "@lezer/lr": "1.3.3",
+    "@prometheus-io/lezer-promql": "^0.37.0-rc.1",
+    "@reduxjs/toolkit": "1.9.5",
+    "d3": "7.9.0",
+    "date-fns": "3.6.0",
+    "debounce-promise": "3.1.2",
+    "eventemitter3": "5.0.1",
+    "lodash": "4.17.21",
+    "lru-cache": "10.2.0",
+    "marked": "12.0.1",
+    "marked-mangle": "1.1.7",
+    "moment": "2.30.1",
+    "moment-timezone": "0.5.45",
+    "monaco-promql": "1.7.4",
+    "pluralize": "8.0.0",
+    "prismjs": "1.29.0",
+    "react-beautiful-dnd": "13.1.1",
+    "react-highlight-words": "0.20.0",
+    "react-select": "5.8.0",
+    "react-use": "17.5.0",
+    "react-window": "1.8.10",
+    "rxjs": "7.8.1",
+    "semver": "7.6.0",
+    "tslib": "2.6.2",
+    "uuid": "9.0.1",
+    "whatwg-fetch": "3.6.20"
+  },
+  "devDependencies": {
+    "@emotion/eslint-plugin": "11.11.0",
+    "@grafana/e2e": "11.0.0",
+    "@grafana/e2e-selectors": "11.0.0",
+    "@grafana/tsconfig": "^1.3.0-rc1",
+    "@rollup/plugin-image": "3.0.3",
+    "@rollup/plugin-node-resolve": "15.2.3",
+    "@swc/core": "1.4.2",
+    "@swc/helpers": "0.5.8",
+    "@testing-library/dom": "9.3.4",
+    "@testing-library/jest-dom": "6.4.2",
+    "@testing-library/react": "14.2.2",
+    "@testing-library/user-event": "14.5.2",
+    "@types/d3": "7.4.3",
+    "@types/debounce-promise": "3.1.9",
+    "@types/eslint": "8.56.6",
+    "@types/jest": "29.5.12",
+    "@types/jquery": "3.5.29",
+    "@types/lodash": "4.17.0",
+    "@types/marked": "5.0.2",
+    "@types/node": "20.11.30",
+    "@types/pluralize": "^0.0.33",
+    "@types/prismjs": "1.26.3",
+    "@types/react": "18.2.73",
+    "@types/react-beautiful-dnd": "13.1.8",
+    "@types/react-dom": "18.2.22",
+    "@types/react-highlight-words": "0.16.7",
+    "@types/react-window": "1.8.8",
+    "@types/semver": "7.5.8",
+    "@types/testing-library__jest-dom": "5.14.9",
+    "@types/uuid": "9.0.8",
+    "@typescript-eslint/eslint-plugin": "6.21.0",
+    "@typescript-eslint/parser": "6.21.0",
+    "copy-webpack-plugin": "12.0.2",
+    "css-loader": "6.10.0",
+    "esbuild": "0.18.12",
+    "eslint": "8.57.0",
+    "eslint-config-prettier": "9.1.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-jest": "27.9.0",
+    "eslint-plugin-jsdoc": "48.2.2",
+    "eslint-plugin-jsx-a11y": "6.8.0",
+    "eslint-plugin-lodash": "7.4.0",
+    "eslint-plugin-react": "7.34.1",
+    "eslint-plugin-react-hooks": "4.6.0",
+    "eslint-webpack-plugin": "4.1.0",
+    "fork-ts-checker-webpack-plugin": "9.0.2",
+    "glob": "10.3.10",
+    "jest": "29.7.0",
+    "jest-environment-jsdom": "29.7.0",
+    "jest-matcher-utils": "29.7.0",
+    "prettier": "3.2.5",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
+    "react-select-event": "5.5.1",
+    "react-test-renderer": "18.2.0",
+    "rollup": "2.79.1",
+    "rollup-plugin-dts": "^5.0.0",
+    "rollup-plugin-esbuild": "5.0.0",
+    "rollup-plugin-node-externals": "^5.0.0",
+    "sass": "1.72.0",
+    "sass-loader": "14.1.1",
+    "style-loader": "3.3.4",
+    "testing-library-selector": "0.3.1",
+    "ts-node": "10.9.2",
+    "typescript": "5.3.3",
+    "webpack": "5.91.0",
+    "webpack-cli": "5.1.4"
+  },
+  "peerDependencies": {
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
+  }
+}
diff --git a/packages/grafana-prometheus/rollup.config.ts b/packages/grafana-prometheus/rollup.config.ts
new file mode 100644
index 0000000000000..080514c27d5d5
--- /dev/null
+++ b/packages/grafana-prometheus/rollup.config.ts
@@ -0,0 +1,38 @@
+import image from '@rollup/plugin-image';
+import resolve from '@rollup/plugin-node-resolve';
+import path from 'path';
+import dts from 'rollup-plugin-dts';
+import esbuild from 'rollup-plugin-esbuild';
+import { externals } from 'rollup-plugin-node-externals';
+
+const pkg = require('./package.json');
+
+export default [
+  {
+    input: 'src/index.ts',
+    plugins: [externals({ deps: true, packagePath: './package.json' }), resolve(), esbuild(), image()],
+    output: [
+      {
+        format: 'cjs',
+        sourcemap: true,
+        dir: path.dirname(pkg.publishConfig.main),
+      },
+      {
+        format: 'esm',
+        sourcemap: true,
+        dir: path.dirname(pkg.publishConfig.module),
+        preserveModules: true,
+        // @ts-expect-error (TS cannot assure that `process.env.PROJECT_CWD` is a string)
+        preserveModulesRoot: path.join(process.env.PROJECT_CWD, `packages/grafana-prometheus/src`),
+      },
+    ],
+  },
+  {
+    input: './compiled/index.d.ts',
+    plugins: [dts()],
+    output: {
+      file: pkg.publishConfig.types,
+      format: 'es',
+    },
+  },
+];
diff --git a/packages/grafana-prometheus/src/add_label_to_query.test.ts b/packages/grafana-prometheus/src/add_label_to_query.test.ts
new file mode 100644
index 0000000000000..08c32e3c39896
--- /dev/null
+++ b/packages/grafana-prometheus/src/add_label_to_query.test.ts
@@ -0,0 +1,114 @@
+import { addLabelToQuery } from './add_label_to_query';
+
+describe('addLabelToQuery()', () => {
+  it('should add label to simple query', () => {
+    expect(() => {
+      addLabelToQuery('foo', '', '');
+    }).toThrow();
+    expect(addLabelToQuery('foo', 'bar', 'baz')).toBe('foo{bar="baz"}');
+    expect(addLabelToQuery('foo{}', 'bar', 'baz')).toBe('foo{bar="baz"}');
+    expect(addLabelToQuery('foo{x="yy"}', 'bar', 'baz')).toBe('foo{x="yy", bar="baz"}');
+    expect(addLabelToQuery('metric > 0.001', 'foo', 'bar')).toBe('metric{foo="bar"} > 0.001');
+  });
+
+  it('should add custom operator', () => {
+    expect(addLabelToQuery('foo{}', 'bar', 'baz', '!=')).toBe('foo{bar!="baz"}');
+    expect(addLabelToQuery('foo{x="yy"}', 'bar', 'baz', '!=')).toBe('foo{x="yy", bar!="baz"}');
+  });
+
+  it('should not modify ranges', () => {
+    expect(addLabelToQuery('rate(metric[1m])', 'foo', 'bar')).toBe('rate(metric{foo="bar"}[1m])');
+  });
+
+  it('should detect in-order function use', () => {
+    expect(addLabelToQuery('sum by (xx) (foo)', 'bar', 'baz')).toBe('sum by (xx) (foo{bar="baz"})');
+  });
+
+  it('should convert number Infinity to +Inf', () => {
+    expect(
+      addLabelToQuery('sum(rate(prometheus_tsdb_compaction_chunk_size_bytes_bucket[5m])) by (le)', 'le', Infinity)
+    ).toBe('sum(rate(prometheus_tsdb_compaction_chunk_size_bytes_bucket{le="+Inf"}[5m])) by (le)');
+  });
+
+  it('should handle selectors with punctuation', () => {
+    expect(addLabelToQuery('foo{instance="my-host.com:9100"}', 'bar', 'baz')).toBe(
+      'foo{instance="my-host.com:9100", bar="baz"}'
+    );
+    expect(addLabelToQuery('foo:metric:rate1m', 'bar', 'baz')).toBe('foo:metric:rate1m{bar="baz"}');
+    expect(addLabelToQuery('avg(foo:metric:rate1m{a="b"})', 'bar', 'baz')).toBe(
+      'avg(foo:metric:rate1m{a="b", bar="baz"})'
+    );
+    expect(addLabelToQuery('foo{list="a,b,c"}', 'bar', 'baz')).toBe('foo{list="a,b,c", bar="baz"}');
+  });
+
+  it('should work on arithmetical expressions', () => {
+    expect(addLabelToQuery('foo + foo', 'bar', 'baz')).toBe('foo{bar="baz"} + foo{bar="baz"}');
+    expect(addLabelToQuery('foo{x="yy"} + metric', 'bar', 'baz')).toBe('foo{x="yy", bar="baz"} + metric{bar="baz"}');
+    expect(addLabelToQuery('avg(foo) + sum(xx_yy)', 'bar', 'baz')).toBe('avg(foo{bar="baz"}) + sum(xx_yy{bar="baz"})');
+    expect(addLabelToQuery('foo{x="yy"} * metric{y="zz",a="bb"} * metric2', 'bar', 'baz')).toBe(
+      'foo{x="yy", bar="baz"} * metric{y="zz", a="bb", bar="baz"} * metric2{bar="baz"}'
+    );
+  });
+
+  it('should not add duplicate labels to a query', () => {
+    expect(addLabelToQuery(addLabelToQuery('foo{x="yy"}', 'bar', 'baz', '!='), 'bar', 'baz', '!=')).toBe(
+      'foo{x="yy", bar!="baz"}'
+    );
+    expect(addLabelToQuery(addLabelToQuery('rate(metric[1m])', 'foo', 'bar'), 'foo', 'bar')).toBe(
+      'rate(metric{foo="bar"}[1m])'
+    );
+    expect(addLabelToQuery(addLabelToQuery('foo{list="a,b,c"}', 'bar', 'baz'), 'bar', 'baz')).toBe(
+      'foo{list="a,b,c", bar="baz"}'
+    );
+    expect(addLabelToQuery(addLabelToQuery('avg(foo) + sum(xx_yy)', 'bar', 'baz'), 'bar', 'baz')).toBe(
+      'avg(foo{bar="baz"}) + sum(xx_yy{bar="baz"})'
+    );
+  });
+
+  it('should not remove filters', () => {
+    expect(addLabelToQuery('{x="y"} |="yy"', 'bar', 'baz')).toBe('{x="y", bar="baz"} |="yy"');
+    expect(addLabelToQuery('{x="y"} |="yy" !~"xx"', 'bar', 'baz')).toBe('{x="y", bar="baz"} |="yy" !~"xx"');
+  });
+
+  it('should add labels to metrics with logical operators', () => {
+    expect(addLabelToQuery('foo_info or bar_info', 'bar', 'baz')).toBe('foo_info{bar="baz"} or bar_info{bar="baz"}');
+    expect(addLabelToQuery('foo_info and bar_info', 'bar', 'baz')).toBe('foo_info{bar="baz"} and bar_info{bar="baz"}');
+  });
+
+  it('should not add ad-hoc filter to template variables', () => {
+    expect(addLabelToQuery('sum(rate({job="foo"}[2m])) by (value $variable)', 'bar', 'baz')).toBe(
+      'sum(rate({job="foo", bar="baz"}[2m])) by (value $variable)'
+    );
+  });
+
+  it('should not add ad-hoc filter to range', () => {
+    expect(addLabelToQuery('avg(rate((my_metric{job="foo"} > 0)[3h:])) by (label)', 'bar', 'baz')).toBe(
+      'avg(rate((my_metric{job="foo", bar="baz"} > 0)[3h:])) by (label)'
+    );
+  });
+  it('should not add ad-hoc filter to labels in label list provided with the group modifier', () => {
+    expect(
+      addLabelToQuery(
+        'max by (id, name, type) (my_metric{type=~"foo|bar|baz-test"}) * on(id) group_right(id, type, name) sum by (id) (my_metric) * 1000',
+        'bar',
+        'baz'
+      )
+    ).toBe(
+      'max by (id, name, type) (my_metric{type=~"foo|bar|baz-test", bar="baz"}) * on(id) group_right(id, type, name) sum by (id) (my_metric{bar="baz"}) * 1000'
+    );
+  });
+  it('should not add ad-hoc filter to labels in label list provided with the group modifier', () => {
+    expect(addLabelToQuery('rate(my_metric[${__range_s}s])', 'bar', 'baz')).toBe(
+      'rate(my_metric{bar="baz"}[${__range_s}s])'
+    );
+  });
+  it('should not add ad-hoc filter to labels to math operations', () => {
+    expect(addLabelToQuery('count(my_metric{job!="foo"} < (5*1024*1024*1024) or vector(0)) - 1', 'bar', 'baz')).toBe(
+      'count(my_metric{job!="foo", bar="baz"} < (5*1024*1024*1024) or vector(0)) - 1'
+    );
+  });
+
+  it('should not add ad-hoc filter bool operator', () => {
+    expect(addLabelToQuery('ALERTS < bool 1', 'bar', 'baz')).toBe('ALERTS{bar="baz"} < bool 1');
+  });
+});
diff --git a/packages/grafana-prometheus/src/add_label_to_query.ts b/packages/grafana-prometheus/src/add_label_to_query.ts
new file mode 100644
index 0000000000000..696e0cbb8dcf5
--- /dev/null
+++ b/packages/grafana-prometheus/src/add_label_to_query.ts
@@ -0,0 +1,100 @@
+import { parser, VectorSelector } from '@prometheus-io/lezer-promql';
+
+import { PromQueryModeller } from './querybuilder/PromQueryModeller';
+import { buildVisualQueryFromString } from './querybuilder/parsing';
+import { QueryBuilderLabelFilter } from './querybuilder/shared/types';
+import { PromVisualQuery } from './querybuilder/types';
+
+/**
+ * Adds label filter to existing query. Useful for query modification for example for ad hoc filters.
+ *
+ * It uses PromQL parser to find instances of metric and labels, alters them and then splices them back into the query.
+ * Ideally we could use the parse -> change -> render is a simple 3 steps but right now building the visual query
+ * object does not support all possible queries.
+ *
+ * So instead this just operates on substrings of the query with labels and operates just on those. This makes this
+ * more robust and can alter even invalid queries, and preserves in general the query structure and whitespace.
+ * @param query
+ * @param key
+ * @param value
+ * @param operator
+ */
+export function addLabelToQuery(query: string, key: string, value: string | number, operator = '='): string {
+  if (!key || !value) {
+    throw new Error('Need label to add to query.');
+  }
+
+  const vectorSelectorPositions = getVectorSelectorPositions(query);
+  if (!vectorSelectorPositions.length) {
+    return query;
+  }
+
+  const filter = toLabelFilter(key, value, operator);
+  return addFilter(query, vectorSelectorPositions, filter);
+}
+
+type VectorSelectorPosition = { from: number; to: number; query: PromVisualQuery };
+
+/**
+ * Parse the string and get all VectorSelector positions in the query together with parsed representation of the vector
+ * selector.
+ * @param query
+ */
+function getVectorSelectorPositions(query: string): VectorSelectorPosition[] {
+  const tree = parser.parse(query);
+  const positions: VectorSelectorPosition[] = [];
+  tree.iterate({
+    enter: ({ to, from, type }): false | void => {
+      if (type.id === VectorSelector) {
+        const visQuery = buildVisualQueryFromString(query.substring(from, to));
+        positions.push({ query: visQuery.query, from, to });
+        return false;
+      }
+    },
+  });
+  return positions;
+}
+
+function toLabelFilter(key: string, value: string | number, operator: string): QueryBuilderLabelFilter {
+  // We need to make sure that we convert the value back to string because it may be a number
+  const transformedValue = value === Infinity ? '+Inf' : value.toString();
+  return { label: key, op: operator, value: transformedValue };
+}
+
+function addFilter(
+  query: string,
+  vectorSelectorPositions: VectorSelectorPosition[],
+  filter: QueryBuilderLabelFilter
+): string {
+  const modeller = new PromQueryModeller();
+  let newQuery = '';
+  let prev = 0;
+
+  for (let i = 0; i < vectorSelectorPositions.length; i++) {
+    // This is basically just doing splice on a string for each matched vector selector.
+
+    const match = vectorSelectorPositions[i];
+    const isLast = i === vectorSelectorPositions.length - 1;
+
+    const start = query.substring(prev, match.from);
+    const end = isLast ? query.substring(match.to) : '';
+
+    if (!labelExists(match.query.labels, filter)) {
+      // We don't want to add duplicate labels.
+      match.query.labels.push(filter);
+    }
+    const newLabels = modeller.renderQuery(match.query);
+    newQuery += start + newLabels + end;
+    prev = match.to;
+  }
+  return newQuery;
+}
+
+/**
+ * Check if label exists in the list of labels but ignore the operator.
+ * @param labels
+ * @param filter
+ */
+function labelExists(labels: QueryBuilderLabelFilter[], filter: QueryBuilderLabelFilter) {
+  return labels.find((label) => label.label === filter.label && label.value === filter.value);
+}
diff --git a/packages/grafana-prometheus/src/components/AnnotationQueryEditor.tsx b/packages/grafana-prometheus/src/components/AnnotationQueryEditor.tsx
new file mode 100644
index 0000000000000..0cbaf5978cdd9
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/AnnotationQueryEditor.tsx
@@ -0,0 +1,139 @@
+import React from 'react';
+
+import { AnnotationQuery } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { EditorField, EditorRow, EditorRows, EditorSwitch } from '@grafana/experimental';
+import { AutoSizeInput, Input, Space } from '@grafana/ui';
+
+import { PromQueryCodeEditor } from '../querybuilder/components/PromQueryCodeEditor';
+import { PromQuery } from '../types';
+
+import { PromQueryEditorProps } from './types';
+
+type Props = PromQueryEditorProps & {
+  annotation?: AnnotationQuery<PromQuery>;
+  onAnnotationChange?: (annotation: AnnotationQuery<PromQuery>) => void;
+};
+
+export function AnnotationQueryEditor(props: Props) {
+  // This is because of problematic typing. See AnnotationQueryEditorProps in grafana-data/annotations.ts.
+  const annotation = props.annotation!;
+  const onAnnotationChange = props.onAnnotationChange!;
+  const query = { expr: annotation.expr, refId: annotation.name, interval: annotation.step };
+
+  return (
+    <>
+      <EditorRows>
+        <PromQueryCodeEditor
+          {...props}
+          query={query}
+          showExplain={false}
+          onChange={(query) => {
+            onAnnotationChange({
+              ...annotation,
+              expr: query.expr,
+            });
+          }}
+        />
+        <EditorRow>
+          <EditorField
+            label="Min step"
+            tooltip={
+              <>
+                An additional lower limit for the step parameter of the Prometheus query and for the{' '}
+                <code>$__interval</code> and <code>$__rate_interval</code> variables.
+              </>
+            }
+          >
+            <AutoSizeInput
+              type="text"
+              aria-label="Set lower limit for the step parameter"
+              placeholder={'auto'}
+              minWidth={10}
+              onCommitChange={(ev) => {
+                onAnnotationChange({
+                  ...annotation,
+                  step: ev.currentTarget.value,
+                });
+              }}
+              defaultValue={query.interval}
+              id={selectors.components.DataSource.Prometheus.annotations.minStep}
+            />
+          </EditorField>
+        </EditorRow>
+      </EditorRows>
+      <Space v={0.5} />
+      <EditorRow>
+        <EditorField
+          label="Title"
+          tooltip={
+            'Use either the name or a pattern. For example, {{instance}} is replaced with label value for the label instance.'
+          }
+        >
+          <Input
+            type="text"
+            placeholder="{{alertname}}"
+            value={annotation.titleFormat}
+            onChange={(event) => {
+              onAnnotationChange({
+                ...annotation,
+                titleFormat: event.currentTarget.value,
+              });
+            }}
+            data-testid={selectors.components.DataSource.Prometheus.annotations.title}
+          />
+        </EditorField>
+        <EditorField label="Tags">
+          <Input
+            type="text"
+            placeholder="label1,label2"
+            value={annotation.tagKeys}
+            onChange={(event) => {
+              onAnnotationChange({
+                ...annotation,
+                tagKeys: event.currentTarget.value,
+              });
+            }}
+            data-testid={selectors.components.DataSource.Prometheus.annotations.tags}
+          />
+        </EditorField>
+        <EditorField
+          label="Text"
+          tooltip={
+            'Use either the name or a pattern. For example, {{instance}} is replaced with label value for the label instance.'
+          }
+        >
+          <Input
+            type="text"
+            placeholder="{{instance}}"
+            value={annotation.textFormat}
+            onChange={(event) => {
+              onAnnotationChange({
+                ...annotation,
+                textFormat: event.currentTarget.value,
+              });
+            }}
+            data-testid={selectors.components.DataSource.Prometheus.annotations.text}
+          />
+        </EditorField>
+        <EditorField
+          label="Series value as timestamp"
+          tooltip={
+            'The unit of timestamp is milliseconds. If the unit of the series value is seconds, multiply its range vector by 1000.'
+          }
+        >
+          <EditorSwitch
+            value={annotation.useValueForTime}
+            onChange={(event) => {
+              onAnnotationChange({
+                ...annotation,
+                useValueForTime: event.currentTarget.value,
+              });
+            }}
+            data-testid={selectors.components.DataSource.Prometheus.annotations.seriesValueAsTimestamp}
+          />
+        </EditorField>
+      </EditorRow>
+    </>
+  );
+}
diff --git a/packages/grafana-prometheus/src/components/PromCheatSheet.tsx b/packages/grafana-prometheus/src/components/PromCheatSheet.tsx
new file mode 100644
index 0000000000000..347d65473011a
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/PromCheatSheet.tsx
@@ -0,0 +1,50 @@
+import React from 'react';
+
+import { QueryEditorHelpProps } from '@grafana/data';
+
+import { PromQuery } from '../types';
+
+const CHEAT_SHEET_ITEMS = [
+  {
+    title: 'Request Rate',
+    expression: 'rate(http_request_total[5m])',
+    label:
+      'Given an HTTP request counter, this query calculates the per-second average request rate over the last 5 minutes.',
+  },
+  {
+    title: '95th Percentile of Request Latencies',
+    expression: 'histogram_quantile(0.95, sum(rate(prometheus_http_request_duration_seconds_bucket[5m])) by (le))',
+    label: 'Calculates the 95th percentile of HTTP request rate over 5 minute windows.',
+  },
+  {
+    title: 'Alerts Firing',
+    expression: 'sort_desc(sum(sum_over_time(ALERTS{alertstate="firing"}[24h])) by (alertname))',
+    label: 'Sums up the alerts that have been firing over the last 24 hours.',
+  },
+  {
+    title: 'Step',
+    label:
+      'Defines the graph resolution using a duration format (15s, 1m, 3h, ...). Small steps create high-resolution graphs but can be slow over larger time ranges. Using a longer step lowers the resolution and smooths the graph by producing fewer datapoints. If no step is given the resolution is calculated automatically.',
+  },
+];
+
+export const PromCheatSheet = (props: QueryEditorHelpProps<PromQuery>) => (
+  <div>
+    <h2>PromQL Cheat Sheet</h2>
+    {CHEAT_SHEET_ITEMS.map((item, index) => (
+      <div className="cheat-sheet-item" key={index}>
+        <div className="cheat-sheet-item__title">{item.title}</div>
+        {item.expression ? (
+          <button
+            type="button"
+            className="cheat-sheet-item__example"
+            onClick={(e) => props.onClickExample({ refId: 'A', expr: item.expression })}
+          >
+            <code>{item.expression}</code>
+          </button>
+        ) : null}
+        <div className="cheat-sheet-item__label">{item.label}</div>
+      </div>
+    ))}
+  </div>
+);
diff --git a/packages/grafana-prometheus/src/components/PromExemplarField.tsx b/packages/grafana-prometheus/src/components/PromExemplarField.tsx
new file mode 100644
index 0000000000000..e09a6260c98b1
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/PromExemplarField.tsx
@@ -0,0 +1,79 @@
+import { css, cx } from '@emotion/css';
+import React, { useEffect, useState } from 'react';
+import { usePrevious } from 'react-use';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { IconButton, InlineLabel, Tooltip, useStyles2 } from '@grafana/ui';
+
+import { PrometheusDatasource } from '../datasource';
+import { PromQuery } from '../types';
+
+interface Props {
+  onChange: (exemplar: boolean) => void;
+  datasource: PrometheusDatasource;
+  query: PromQuery;
+  'data-testid'?: string;
+}
+
+export function PromExemplarField({ datasource, onChange, query, ...rest }: Props) {
+  const [error, setError] = useState<string | null>(null);
+  const styles = useStyles2(getStyles);
+  const prevError = usePrevious(error);
+
+  useEffect(() => {
+    if (!datasource.exemplarsAvailable) {
+      setError('Exemplars for this query are not available');
+      onChange(false);
+    } else if (query.instant && !query.range) {
+      setError('Exemplars are not available for instant queries');
+      onChange(false);
+    } else {
+      setError(null);
+      // If error is cleared, we want to change exemplar to true
+      if (prevError && !error) {
+        onChange(true);
+      }
+    }
+  }, [datasource.exemplarsAvailable, query.instant, query.range, onChange, prevError, error]);
+
+  const iconButtonStyles = cx(
+    {
+      [styles.activeIcon]: !!query.exemplar,
+    },
+    styles.eyeIcon
+  );
+
+  return (
+    <InlineLabel width="auto" data-testid={rest['data-testid']}>
+      <Tooltip content={error ?? ''}>
+        <div className={styles.iconWrapper}>
+          Exemplars
+          <IconButton
+            name="eye"
+            tooltip={!!query.exemplar ? 'Disable query with exemplars' : 'Enable query with exemplars'}
+            disabled={!!error}
+            className={iconButtonStyles}
+            onClick={() => {
+              onChange(!query.exemplar);
+            }}
+          />
+        </div>
+      </Tooltip>
+    </InlineLabel>
+  );
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    eyeIcon: css`
+      margin-left: ${theme.spacing(2)};
+    `,
+    activeIcon: css`
+      color: ${theme.colors.primary.main};
+    `,
+    iconWrapper: css`
+      display: flex;
+      align-items: center;
+    `,
+  };
+}
diff --git a/packages/grafana-prometheus/src/components/PromExploreExtraField.test.tsx b/packages/grafana-prometheus/src/components/PromExploreExtraField.test.tsx
new file mode 100644
index 0000000000000..4c22e2f16f204
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/PromExploreExtraField.test.tsx
@@ -0,0 +1,41 @@
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+
+import { PrometheusDatasource } from '../datasource';
+import { PromQuery } from '../types';
+
+import {
+  PromExploreExtraField,
+  PromExploreExtraFieldProps,
+  promExploreExtraFieldTestIds,
+} from './PromExploreExtraField';
+
+const setup = (propOverrides?: PromExploreExtraFieldProps) => {
+  const query = { exemplar: false } as PromQuery;
+  const datasource = {} as PrometheusDatasource;
+  const onChange = jest.fn();
+  const onRunQuery = jest.fn();
+
+  const props: PromExploreExtraFieldProps = {
+    onChange,
+    onRunQuery,
+    query,
+    datasource,
+  };
+
+  Object.assign(props, propOverrides);
+
+  return render(<PromExploreExtraField {...props} />);
+};
+
+describe('PromExploreExtraField', () => {
+  it('should render step field', () => {
+    setup();
+    expect(screen.getByTestId(promExploreExtraFieldTestIds.stepField)).toBeInTheDocument();
+  });
+
+  it('should render query type field', () => {
+    setup();
+    expect(screen.getByTestId(promExploreExtraFieldTestIds.queryTypeField)).toBeInTheDocument();
+  });
+});
diff --git a/packages/grafana-prometheus/src/components/PromExploreExtraField.tsx b/packages/grafana-prometheus/src/components/PromExploreExtraField.tsx
new file mode 100644
index 0000000000000..c9ad0a79e36b8
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/PromExploreExtraField.tsx
@@ -0,0 +1,145 @@
+import { css, cx } from '@emotion/css';
+import { isEqual } from 'lodash';
+import React, { memo, useCallback } from 'react';
+import { usePrevious } from 'react-use';
+
+import { InlineFormLabel, RadioButtonGroup } from '@grafana/ui';
+
+import { PrometheusDatasource } from '../datasource';
+import { PromQuery } from '../types';
+
+import { PromExemplarField } from './PromExemplarField';
+
+export interface PromExploreExtraFieldProps {
+  query: PromQuery;
+  onChange: (value: PromQuery) => void;
+  onRunQuery: () => void;
+  datasource: PrometheusDatasource;
+}
+
+export const PromExploreExtraField = memo(({ query, datasource, onChange, onRunQuery }: PromExploreExtraFieldProps) => {
+  const rangeOptions = getQueryTypeOptions(true);
+  const prevQuery = usePrevious(query);
+
+  const onExemplarChange = useCallback(
+    (exemplar: boolean) => {
+      if (!isEqual(query, prevQuery) || exemplar !== query.exemplar) {
+        onChange({ ...query, exemplar });
+      }
+    },
+    [prevQuery, query, onChange]
+  );
+
+  function onChangeQueryStep(interval: string) {
+    onChange({ ...query, interval });
+  }
+
+  function onStepChange(e: React.SyntheticEvent<HTMLInputElement>) {
+    if (e.currentTarget.value !== query.interval) {
+      onChangeQueryStep(e.currentTarget.value);
+    }
+  }
+
+  function onReturnKeyDown(e: React.KeyboardEvent<HTMLInputElement>) {
+    if (e.key === 'Enter' && e.shiftKey) {
+      onRunQuery();
+    }
+  }
+
+  const onQueryTypeChange = getQueryTypeChangeHandler(query, onChange);
+
+  return (
+    <div
+      aria-label="Prometheus extra field"
+      className="gf-form-inline"
+      data-testid={promExploreExtraFieldTestIds.extraFieldEditor}
+    >
+      {/*Query type field*/}
+      <div
+        data-testid={promExploreExtraFieldTestIds.queryTypeField}
+        className={cx(
+          'gf-form explore-input-margin',
+          css`
+            flex-wrap: nowrap;
+          `
+        )}
+        aria-label="Query type field"
+      >
+        <InlineFormLabel width="auto">Query type</InlineFormLabel>
+
+        <RadioButtonGroup
+          options={rangeOptions}
+          value={query.range && query.instant ? 'both' : query.instant ? 'instant' : 'range'}
+          onChange={onQueryTypeChange}
+        />
+      </div>
+      {/*Step field*/}
+      <div
+        data-testid={promExploreExtraFieldTestIds.stepField}
+        className={cx(
+          'gf-form',
+          css`
+            flex-wrap: nowrap;
+          `
+        )}
+        aria-label="Step field"
+      >
+        <InlineFormLabel
+          width={6}
+          tooltip={
+            'Time units and built-in variables can be used here, for example: $__interval, $__rate_interval, 5s, 1m, 3h, 1d, 1y (Default if no unit is specified: s)'
+          }
+        >
+          Min step
+        </InlineFormLabel>
+        <input
+          type={'text'}
+          className="gf-form-input width-4"
+          placeholder={'auto'}
+          onChange={onStepChange}
+          onKeyDown={onReturnKeyDown}
+          value={query.interval ?? ''}
+        />
+      </div>
+
+      <PromExemplarField onChange={onExemplarChange} datasource={datasource} query={query} />
+    </div>
+  );
+});
+
+PromExploreExtraField.displayName = 'PromExploreExtraField';
+
+export function getQueryTypeOptions(includeBoth: boolean) {
+  const rangeOptions = [
+    { value: 'range', label: 'Range', description: 'Run query over a range of time' },
+    {
+      value: 'instant',
+      label: 'Instant',
+      description: 'Run query against a single point in time. For this query, the "To" time is used',
+    },
+  ];
+
+  if (includeBoth) {
+    rangeOptions.push({ value: 'both', label: 'Both', description: 'Run an Instant query and a Range query' });
+  }
+
+  return rangeOptions;
+}
+
+export function getQueryTypeChangeHandler(query: PromQuery, onChange: (update: PromQuery) => void) {
+  return (queryType: string) => {
+    if (queryType === 'instant') {
+      onChange({ ...query, instant: true, range: false, exemplar: false });
+    } else if (queryType === 'range') {
+      onChange({ ...query, instant: false, range: true });
+    } else {
+      onChange({ ...query, instant: true, range: true });
+    }
+  };
+}
+
+export const promExploreExtraFieldTestIds = {
+  extraFieldEditor: 'prom-editor-extra-field',
+  stepField: 'prom-editor-extra-field-step',
+  queryTypeField: 'prom-editor-extra-field-query-type',
+};
diff --git a/packages/grafana-prometheus/src/components/PromQueryEditorByApp.test.tsx b/packages/grafana-prometheus/src/components/PromQueryEditorByApp.test.tsx
new file mode 100644
index 0000000000000..832cc37355fb2
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/PromQueryEditorByApp.test.tsx
@@ -0,0 +1,83 @@
+import { render, screen } from '@testing-library/react';
+import { noop } from 'lodash';
+import React from 'react';
+
+import { CoreApp } from '@grafana/data';
+
+import { PrometheusDatasource } from '../datasource';
+
+import { PromQueryEditorByApp } from './PromQueryEditorByApp';
+import { alertingTestIds } from './PromQueryEditorForAlerting';
+import { Props } from './monaco-query-field/MonacoQueryFieldProps';
+
+// the monaco-based editor uses lazy-loading and that does not work
+// well with this test, and we do not need the monaco-related
+// functionality in this test anyway, so we mock it out.
+jest.mock('./monaco-query-field/MonacoQueryFieldLazy', () => {
+  const fakeQueryField = (props: Props) => {
+    return <input onBlur={(e) => props.onBlur(e.currentTarget.value)} data-testid={'dummy-code-input'} type={'text'} />;
+  };
+  return {
+    MonacoQueryFieldLazy: fakeQueryField,
+  };
+});
+
+function setup(app: CoreApp): { onRunQuery: jest.Mock } {
+  const dataSource = {
+    createQuery: jest.fn((q) => q),
+    getInitHints: () => [],
+    getPrometheusTime: jest.fn((date, roundup) => 123),
+    getQueryHints: jest.fn(() => []),
+    getDebounceTimeInMilliseconds: jest.fn(() => 300),
+    languageProvider: {
+      start: () => Promise.resolve([]),
+      syntax: () => {},
+      getLabelKeys: () => [],
+      metrics: [],
+    },
+  } as unknown as PrometheusDatasource;
+  const onRunQuery = jest.fn();
+
+  render(
+    <PromQueryEditorByApp
+      app={app}
+      onChange={noop}
+      onRunQuery={onRunQuery}
+      datasource={dataSource}
+      query={{ refId: 'A', expr: '' }}
+    />
+  );
+
+  return {
+    onRunQuery,
+  };
+}
+
+describe('PromQueryEditorByApp', () => {
+  it('should render simplified query editor for cloud alerting', async () => {
+    setup(CoreApp.CloudAlerting);
+
+    expect(await screen.findByTestId(alertingTestIds.editor)).toBeInTheDocument();
+  });
+
+  it('should render editor selector for unkown apps', () => {
+    setup(CoreApp.Unknown);
+
+    expect(screen.getByTestId('QueryEditorModeToggle')).toBeInTheDocument();
+    expect(screen.queryByTestId(alertingTestIds.editor)).toBeNull();
+  });
+
+  it('should render editor selector for explore', () => {
+    setup(CoreApp.Explore);
+
+    expect(screen.getByTestId('QueryEditorModeToggle')).toBeInTheDocument();
+    expect(screen.queryByTestId(alertingTestIds.editor)).toBeNull();
+  });
+
+  it('should render editor selector for dashboard', () => {
+    setup(CoreApp.Dashboard);
+
+    expect(screen.getByTestId('QueryEditorModeToggle')).toBeInTheDocument();
+    expect(screen.queryByTestId(alertingTestIds.editor)).toBeNull();
+  });
+});
diff --git a/packages/grafana-prometheus/src/components/PromQueryEditorByApp.tsx b/packages/grafana-prometheus/src/components/PromQueryEditorByApp.tsx
new file mode 100644
index 0000000000000..843bb30284ab6
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/PromQueryEditorByApp.tsx
@@ -0,0 +1,21 @@
+import React, { memo } from 'react';
+
+import { CoreApp } from '@grafana/data';
+
+import { PromQueryEditorSelector } from '../querybuilder/components/PromQueryEditorSelector';
+
+import { PromQueryEditorForAlerting } from './PromQueryEditorForAlerting';
+import { PromQueryEditorProps } from './types';
+
+function PromQueryEditorByAppBase(props: PromQueryEditorProps) {
+  const { app } = props;
+
+  switch (app) {
+    case CoreApp.CloudAlerting:
+      return <PromQueryEditorForAlerting {...props} />;
+    default:
+      return <PromQueryEditorSelector {...props} />;
+  }
+}
+
+export const PromQueryEditorByApp = memo(PromQueryEditorByAppBase);
diff --git a/packages/grafana-prometheus/src/components/PromQueryEditorForAlerting.tsx b/packages/grafana-prometheus/src/components/PromQueryEditorForAlerting.tsx
new file mode 100644
index 0000000000000..5adac3afeb518
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/PromQueryEditorForAlerting.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+
+import { PromQueryField } from './PromQueryField';
+import { PromQueryEditorProps } from './types';
+
+export function PromQueryEditorForAlerting(props: PromQueryEditorProps) {
+  const { datasource, query, range, data, onChange, onRunQuery } = props;
+
+  return (
+    <PromQueryField
+      datasource={datasource}
+      query={query}
+      onRunQuery={onRunQuery}
+      onChange={onChange}
+      history={[]}
+      range={range}
+      data={data}
+      data-testid={alertingTestIds.editor}
+    />
+  );
+}
+
+export const alertingTestIds = {
+  editor: 'prom-editor-cloud-alerting',
+};
diff --git a/packages/grafana-prometheus/src/components/PromQueryField.test.tsx b/packages/grafana-prometheus/src/components/PromQueryField.test.tsx
new file mode 100644
index 0000000000000..700f73574d5f7
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/PromQueryField.test.tsx
@@ -0,0 +1,183 @@
+import { getByTestId, render, screen, waitFor } from '@testing-library/react';
+// @ts-ignore
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { CoreApp, DataFrame, LoadingState, PanelData } from '@grafana/data';
+
+import { PrometheusDatasource } from '../datasource';
+import PromQlLanguageProvider from '../language_provider';
+
+import { PromQueryField } from './PromQueryField';
+import { Props } from './monaco-query-field/MonacoQueryFieldProps';
+
+// the monaco-based editor uses lazy-loading and that does not work
+// well with this test, and we do not need the monaco-related
+// functionality in this test anyway, so we mock it out.
+jest.mock('./monaco-query-field/MonacoQueryFieldLazy', () => {
+  const fakeQueryField = (props: Props) => {
+    return <input onBlur={(e) => props.onBlur(e.currentTarget.value)} data-testid={'dummy-code-input'} type={'text'} />;
+  };
+  return {
+    MonacoQueryFieldLazy: fakeQueryField,
+  };
+});
+
+const defaultProps = {
+  datasource: {
+    languageProvider: {
+      start: () => Promise.resolve([]),
+      syntax: () => {},
+      getLabelKeys: () => [],
+      metrics: [],
+    },
+    getInitHints: () => [],
+  } as unknown as PrometheusDatasource,
+  query: {
+    expr: '',
+    refId: '',
+  },
+  onRunQuery: () => {},
+  onChange: () => {},
+  history: [],
+};
+
+describe('PromQueryField', () => {
+  beforeAll(() => {
+    // @ts-ignore
+    window.getSelection = () => {};
+  });
+
+  it('renders metrics chooser regularly if lookups are not disabled in the datasource settings', async () => {
+    const queryField = render(<PromQueryField {...defaultProps} />);
+
+    // wait for component to render
+    await screen.findByRole('button');
+
+    expect(queryField.getAllByRole('button')).toHaveLength(1);
+  });
+
+  it('renders a disabled metrics chooser if lookups are disabled in datasource settings', async () => {
+    const props = defaultProps;
+    props.datasource.lookupsDisabled = true;
+    const queryField = render(<PromQueryField {...props} />);
+
+    // wait for component to render
+    await screen.findByRole('button');
+
+    const bcButton = queryField.getByRole('button');
+    expect(bcButton).toBeDisabled();
+  });
+
+  it('renders an initial hint if no data and initial hint provided', async () => {
+    const props = defaultProps;
+    props.datasource.lookupsDisabled = true;
+    props.datasource.getInitHints = () => [{ label: 'Initial hint', type: 'INFO' }];
+    render(<PromQueryField {...props} />);
+
+    // wait for component to render
+    await screen.findByRole('button');
+
+    expect(screen.getByText('Initial hint')).toBeInTheDocument();
+  });
+
+  it('renders query hint if data, query hint and initial hint provided', async () => {
+    const props = defaultProps;
+    props.datasource.lookupsDisabled = true;
+    props.datasource.getInitHints = () => [{ label: 'Initial hint', type: 'INFO' }];
+    props.datasource.getQueryHints = () => [{ label: 'Query hint', type: 'INFO' }];
+    render(
+      <PromQueryField
+        {...props}
+        data={
+          {
+            series: [{ name: 'test name' }] as DataFrame[],
+            state: LoadingState.Done,
+          } as PanelData
+        }
+      />
+    );
+
+    // wait for component to render
+    await screen.findByRole('button');
+
+    expect(screen.getByText('Query hint')).toBeInTheDocument();
+    expect(screen.queryByText('Initial hint')).not.toBeInTheDocument();
+  });
+
+  it('refreshes metrics when the data source changes', async () => {
+    const defaultProps = {
+      query: { expr: '', refId: '' },
+      onRunQuery: () => {},
+      onChange: () => {},
+      history: [],
+    };
+    const metrics = ['foo', 'bar'];
+    const queryField = render(
+      <PromQueryField
+        datasource={
+          {
+            languageProvider: makeLanguageProvider({ metrics: [metrics] }),
+            getInitHints: () => [],
+          } as unknown as PrometheusDatasource
+        }
+        {...defaultProps}
+      />
+    );
+
+    // wait for component to render
+    await screen.findByRole('button');
+
+    const changedMetrics = ['baz', 'moo'];
+    queryField.rerender(
+      <PromQueryField
+        // @ts-ignore
+        datasource={{
+          languageProvider: makeLanguageProvider({ metrics: [changedMetrics] }),
+        }}
+        {...defaultProps}
+      />
+    );
+
+    // If we check the label browser right away it should be in loading state
+    let labelBrowser = screen.getByRole('button');
+    expect(labelBrowser).toHaveTextContent('Loading');
+
+    // wait for component to rerender
+    labelBrowser = await screen.findByRole('button');
+    await waitFor(() => {
+      expect(labelBrowser).toHaveTextContent('Metrics browser');
+    });
+  });
+
+  it('should not run query onBlur', async () => {
+    const onRunQuery = jest.fn();
+    const { container } = render(<PromQueryField {...defaultProps} app={CoreApp.Explore} onRunQuery={onRunQuery} />);
+
+    // wait for component to rerender
+    await screen.findByRole('button');
+
+    const input = getByTestId(container, 'dummy-code-input');
+    expect(input).toBeInTheDocument();
+    await userEvent.type(input, 'metric');
+
+    // blur element
+    await userEvent.click(document.body);
+    expect(onRunQuery).not.toHaveBeenCalled();
+  });
+});
+
+function makeLanguageProvider(options: { metrics: string[][] }) {
+  const metricsStack = [...options.metrics];
+  return {
+    histogramMetrics: [],
+    metrics: [],
+    metricsMetadata: {},
+    lookupsDisabled: false,
+    getLabelKeys: () => [],
+    start() {
+      this.metrics = metricsStack.shift();
+      return Promise.resolve([]);
+    },
+  } as any as PromQlLanguageProvider;
+}
diff --git a/packages/grafana-prometheus/src/components/PromQueryField.tsx b/packages/grafana-prometheus/src/components/PromQueryField.tsx
new file mode 100644
index 0000000000000..3ceab6316093b
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/PromQueryField.tsx
@@ -0,0 +1,290 @@
+import { cx } from '@emotion/css';
+import React, { ReactNode } from 'react';
+
+import { isDataFrame, QueryEditorProps, QueryHint, TimeRange, toLegacyResponseData } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { reportInteraction } from '@grafana/runtime';
+import { clearButtonStyles, Icon, Themeable2, withTheme2 } from '@grafana/ui';
+
+import { PrometheusDatasource } from '../datasource';
+import { LocalStorageValueProvider } from '../gcopypaste/app/core/components/LocalStorageValueProvider';
+import {
+  CancelablePromise,
+  isCancelablePromiseRejection,
+  makePromiseCancelable,
+} from '../gcopypaste/app/core/utils/CancelablePromise';
+import { roundMsToMin } from '../language_utils';
+import { PromOptions, PromQuery } from '../types';
+
+import { PrometheusMetricsBrowser } from './PrometheusMetricsBrowser';
+import { MonacoQueryFieldWrapper } from './monaco-query-field/MonacoQueryFieldWrapper';
+
+const LAST_USED_LABELS_KEY = 'grafana.datasources.prometheus.browser.labels';
+
+function getChooserText(metricsLookupDisabled: boolean, hasSyntax: boolean, hasMetrics: boolean) {
+  if (metricsLookupDisabled) {
+    return '(Disabled)';
+  }
+
+  if (!hasSyntax) {
+    return 'Loading metrics...';
+  }
+
+  if (!hasMetrics) {
+    return '(No metrics found)';
+  }
+
+  return 'Metrics browser';
+}
+
+interface PromQueryFieldProps extends QueryEditorProps<PrometheusDatasource, PromQuery, PromOptions>, Themeable2 {
+  ExtraFieldElement?: ReactNode;
+  'data-testid'?: string;
+}
+
+interface PromQueryFieldState {
+  labelBrowserVisible: boolean;
+  syntaxLoaded: boolean;
+  hint: QueryHint | null;
+}
+
+class PromQueryFieldClass extends React.PureComponent<PromQueryFieldProps, PromQueryFieldState> {
+  declare languageProviderInitializationPromise: CancelablePromise<any>;
+
+  constructor(props: PromQueryFieldProps) {
+    super(props);
+
+    this.state = {
+      labelBrowserVisible: false,
+      syntaxLoaded: false,
+      hint: null,
+    };
+  }
+
+  componentDidMount() {
+    if (this.props.datasource.languageProvider) {
+      this.refreshMetrics();
+    }
+    this.refreshHint();
+  }
+
+  componentWillUnmount() {
+    if (this.languageProviderInitializationPromise) {
+      this.languageProviderInitializationPromise.cancel();
+    }
+  }
+
+  componentDidUpdate(prevProps: PromQueryFieldProps) {
+    const {
+      data,
+      datasource: { languageProvider },
+      range,
+    } = this.props;
+
+    if (languageProvider !== prevProps.datasource.languageProvider) {
+      // We reset this only on DS change so we do not flesh loading state on every rangeChange which happens on every
+      // query run if using relative range.
+      this.setState({
+        syntaxLoaded: false,
+      });
+    }
+
+    const changedRangeToRefresh = this.rangeChangedToRefresh(range, prevProps.range);
+    // We want to refresh metrics when language provider changes and/or when range changes (we round up intervals to a minute)
+    if (languageProvider !== prevProps.datasource.languageProvider || changedRangeToRefresh) {
+      this.refreshMetrics();
+    }
+
+    if (data && prevProps.data && prevProps.data.series !== data.series) {
+      this.refreshHint();
+    }
+  }
+
+  refreshHint = () => {
+    const { datasource, query, data } = this.props;
+    const initHints = datasource.getInitHints();
+    const initHint = initHints.length > 0 ? initHints[0] : null;
+
+    if (!data || data.series.length === 0) {
+      this.setState({
+        hint: initHint,
+      });
+      return;
+    }
+
+    const result = isDataFrame(data.series[0]) ? data.series.map(toLegacyResponseData) : data.series;
+    const queryHints = datasource.getQueryHints(query, result);
+    let queryHint = queryHints.length > 0 ? queryHints[0] : null;
+
+    this.setState({ hint: queryHint ?? initHint });
+  };
+
+  refreshMetrics = async () => {
+    const {
+      range,
+      datasource: { languageProvider },
+    } = this.props;
+
+    this.languageProviderInitializationPromise = makePromiseCancelable(languageProvider.start(range));
+
+    try {
+      const remainingTasks = await this.languageProviderInitializationPromise.promise;
+      await Promise.all(remainingTasks);
+      this.onUpdateLanguage();
+    } catch (err) {
+      if (isCancelablePromiseRejection(err) && err.isCanceled) {
+        // do nothing, promise was canceled
+      } else {
+        throw err;
+      }
+    }
+  };
+
+  rangeChangedToRefresh(range?: TimeRange, prevRange?: TimeRange): boolean {
+    if (range && prevRange) {
+      const sameMinuteFrom = roundMsToMin(range.from.valueOf()) === roundMsToMin(prevRange.from.valueOf());
+      const sameMinuteTo = roundMsToMin(range.to.valueOf()) === roundMsToMin(prevRange.to.valueOf());
+      // If both are same, don't need to refresh.
+      return !(sameMinuteFrom && sameMinuteTo);
+    }
+    return false;
+  }
+
+  /**
+   * TODO #33976: Remove this, add histogram group (query = `histogram_quantile(0.95, sum(rate(${metric}[5m])) by (le))`;)
+   */
+  onChangeLabelBrowser = (selector: string) => {
+    this.onChangeQuery(selector, true);
+    this.setState({ labelBrowserVisible: false });
+  };
+
+  onChangeQuery = (value: string, override?: boolean) => {
+    // Send text change to parent
+    const { query, onChange, onRunQuery } = this.props;
+    if (onChange) {
+      const nextQuery: PromQuery = { ...query, expr: value };
+      onChange(nextQuery);
+
+      if (override && onRunQuery) {
+        onRunQuery();
+      }
+    }
+  };
+
+  onClickChooserButton = () => {
+    this.setState((state) => ({ labelBrowserVisible: !state.labelBrowserVisible }));
+
+    reportInteraction('user_grafana_prometheus_metrics_browser_clicked', {
+      editorMode: this.state.labelBrowserVisible ? 'metricViewClosed' : 'metricViewOpen',
+      app: this.props?.app ?? '',
+    });
+  };
+
+  onClickHintFix = () => {
+    const { datasource, query, onChange, onRunQuery } = this.props;
+    const { hint } = this.state;
+    if (hint?.fix?.action) {
+      onChange(datasource.modifyQuery(query, hint.fix.action));
+    }
+    onRunQuery();
+  };
+
+  onUpdateLanguage = () => {
+    const {
+      datasource: { languageProvider },
+    } = this.props;
+    const { metrics } = languageProvider;
+
+    if (!metrics) {
+      return;
+    }
+
+    this.setState({ syntaxLoaded: true });
+  };
+
+  render() {
+    const {
+      datasource,
+      datasource: { languageProvider },
+      query,
+      ExtraFieldElement,
+      history = [],
+      theme,
+    } = this.props;
+
+    const { labelBrowserVisible, syntaxLoaded, hint } = this.state;
+    const hasMetrics = languageProvider.metrics.length > 0;
+    const chooserText = getChooserText(datasource.lookupsDisabled, syntaxLoaded, hasMetrics);
+    const buttonDisabled = !(syntaxLoaded && hasMetrics);
+
+    return (
+      <LocalStorageValueProvider<string[]> storageKey={LAST_USED_LABELS_KEY} defaultValue={[]}>
+        {(lastUsedLabels, onLastUsedLabelsSave, onLastUsedLabelsDelete) => {
+          return (
+            <>
+              <div
+                className="gf-form-inline gf-form-inline--xs-view-flex-column flex-grow-1"
+                data-testid={this.props['data-testid']}
+              >
+                <button
+                  className="gf-form-label query-keyword pointer"
+                  onClick={this.onClickChooserButton}
+                  disabled={buttonDisabled}
+                  type="button"
+                  data-testid={selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.openButton}
+                >
+                  {chooserText}
+                  <Icon name={labelBrowserVisible ? 'angle-down' : 'angle-right'} />
+                </button>
+
+                <div className="gf-form gf-form--grow flex-shrink-1 min-width-15">
+                  <MonacoQueryFieldWrapper
+                    languageProvider={languageProvider}
+                    history={history}
+                    onChange={this.onChangeQuery}
+                    onRunQuery={this.props.onRunQuery}
+                    initialValue={query.expr ?? ''}
+                    placeholder="Enter a PromQL query…"
+                    datasource={datasource}
+                  />
+                </div>
+              </div>
+              {labelBrowserVisible && (
+                <div className="gf-form">
+                  <PrometheusMetricsBrowser
+                    languageProvider={languageProvider}
+                    onChange={this.onChangeLabelBrowser}
+                    lastUsedLabels={lastUsedLabels || []}
+                    storeLastUsedLabels={onLastUsedLabelsSave}
+                    deleteLastUsedLabels={onLastUsedLabelsDelete}
+                    timeRange={this.props.range}
+                  />
+                </div>
+              )}
+
+              {ExtraFieldElement}
+              {hint ? (
+                <div className="query-row-break">
+                  <div className="prom-query-field-info text-warning">
+                    {hint.label}{' '}
+                    {hint.fix ? (
+                      <button
+                        type="button"
+                        className={cx(clearButtonStyles(theme), 'text-link', 'muted')}
+                        onClick={this.onClickHintFix}
+                      >
+                        {hint.fix.label}
+                      </button>
+                    ) : null}
+                  </div>
+                </div>
+              ) : null}
+            </>
+          );
+        }}
+      </LocalStorageValueProvider>
+    );
+  }
+}
+
+export const PromQueryField = withTheme2(PromQueryFieldClass);
diff --git a/packages/grafana-prometheus/src/components/PrometheusMetricsBrowser.test.tsx b/packages/grafana-prometheus/src/components/PrometheusMetricsBrowser.test.tsx
new file mode 100644
index 0000000000000..e3ba496356bea
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/PrometheusMetricsBrowser.test.tsx
@@ -0,0 +1,324 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { createTheme } from '@grafana/data';
+
+import PromQlLanguageProvider from '../language_provider';
+
+import {
+  BrowserProps,
+  buildSelector,
+  facetLabels,
+  SelectableLabel,
+  UnthemedPrometheusMetricsBrowser,
+} from './PrometheusMetricsBrowser';
+
+describe('buildSelector()', () => {
+  it('returns an empty selector for no labels', () => {
+    expect(buildSelector([])).toEqual('{}');
+  });
+  it('returns an empty selector for selected labels with no values', () => {
+    const labels: SelectableLabel[] = [{ name: 'foo', selected: true }];
+    expect(buildSelector(labels)).toEqual('{}');
+  });
+  it('returns an empty selector for one selected label with no selected values', () => {
+    const labels: SelectableLabel[] = [{ name: 'foo', selected: true, values: [{ name: 'bar' }] }];
+    expect(buildSelector(labels)).toEqual('{}');
+  });
+  it('returns a simple selector from a selected label with a selected value', () => {
+    const labels: SelectableLabel[] = [{ name: 'foo', selected: true, values: [{ name: 'bar', selected: true }] }];
+    expect(buildSelector(labels)).toEqual('{foo="bar"}');
+  });
+  it('metric selector without labels', () => {
+    const labels: SelectableLabel[] = [{ name: '__name__', selected: true, values: [{ name: 'foo', selected: true }] }];
+    expect(buildSelector(labels)).toEqual('foo{}');
+  });
+  it('selector with multiple metrics', () => {
+    const labels: SelectableLabel[] = [
+      {
+        name: '__name__',
+        selected: true,
+        values: [
+          { name: 'foo', selected: true },
+          { name: 'bar', selected: true },
+        ],
+      },
+    ];
+    expect(buildSelector(labels)).toEqual('{__name__=~"foo|bar"}');
+  });
+  it('metric selector with labels', () => {
+    const labels: SelectableLabel[] = [
+      { name: '__name__', selected: true, values: [{ name: 'foo', selected: true }] },
+      { name: 'bar', selected: true, values: [{ name: 'baz', selected: true }] },
+    ];
+    expect(buildSelector(labels)).toEqual('foo{bar="baz"}');
+  });
+});
+
+describe('facetLabels()', () => {
+  const possibleLabels = {
+    cluster: ['dev'],
+    namespace: ['alertmanager'],
+  };
+  const labels: SelectableLabel[] = [
+    { name: 'foo', selected: true, values: [{ name: 'bar' }] },
+    { name: 'cluster', values: [{ name: 'dev' }, { name: 'ops' }, { name: 'prod' }] },
+    { name: 'namespace', values: [{ name: 'alertmanager' }] },
+  ];
+
+  it('returns no labels given an empty label set', () => {
+    expect(facetLabels([], {})).toEqual([]);
+  });
+
+  it('marks all labels as hidden when no labels are possible', () => {
+    const result = facetLabels(labels, {});
+    expect(result.length).toEqual(labels.length);
+    expect(result[0].hidden).toBeTruthy();
+    expect(result[0].values).toBeUndefined();
+  });
+
+  it('keeps values as facetted when they are possible', () => {
+    const result = facetLabels(labels, possibleLabels);
+    expect(result.length).toEqual(labels.length);
+    expect(result[0].hidden).toBeTruthy();
+    expect(result[0].values).toBeUndefined();
+    expect(result[1].hidden).toBeFalsy();
+    expect(result[1].values!.length).toBe(1);
+    expect(result[1].values![0].name).toBe('dev');
+  });
+
+  it('does not facet out label values that are currently being facetted', () => {
+    const result = facetLabels(labels, possibleLabels, 'cluster');
+    expect(result.length).toEqual(labels.length);
+    expect(result[0].hidden).toBeTruthy();
+    expect(result[1].hidden).toBeFalsy();
+    // 'cluster' is being facetted, should show all 3 options even though only 1 is possible
+    expect(result[1].values!.length).toBe(3);
+    expect(result[2].values!.length).toBe(1);
+  });
+});
+
+describe('PrometheusMetricsBrowser', () => {
+  const setupProps = (): BrowserProps => {
+    const mockLanguageProvider = {
+      start: () => Promise.resolve(),
+      getLabelValues: (name: string) => {
+        switch (name) {
+          case 'label1':
+            return ['value1-1', 'value1-2'];
+          case 'label2':
+            return ['value2-1', 'value2-2'];
+          case 'label3':
+            return ['value3-1', 'value3-2'];
+        }
+        return [];
+      },
+      // This must always call the series endpoint
+      // until we refactor all of the metrics browser
+      // to never use the series endpoint.
+      // The metrics browser expects both label names and label values.
+      // The labels endpoint with match does not supply label values
+      // and so using it breaks the metrics browser.
+      fetchSeriesLabels: (selector: string) => {
+        switch (selector) {
+          case '{label1="value1-1"}':
+            return { label1: ['value1-1'], label2: ['value2-1'], label3: ['value3-1'] };
+          case '{label1=~"value1-1|value1-2"}':
+            return { label1: ['value1-1', 'value1-2'], label2: ['value2-1'], label3: ['value3-1', 'value3-2'] };
+        }
+        // Allow full set by default
+        return {
+          label1: ['value1-1', 'value1-2'],
+          label2: ['value2-1', 'value2-2'],
+        };
+      },
+      getLabelKeys: () => ['label1', 'label2', 'label3'],
+    };
+
+    const defaults: BrowserProps = {
+      theme: createTheme({ colors: { mode: 'dark' } }),
+      onChange: () => {},
+      autoSelect: 0,
+      languageProvider: mockLanguageProvider as unknown as PromQlLanguageProvider,
+      lastUsedLabels: [],
+      storeLastUsedLabels: () => {},
+      deleteLastUsedLabels: () => {},
+    };
+
+    return defaults;
+  };
+
+  // Clear label selection manually because it's saved in localStorage
+  afterEach(async () => {
+    const clearBtn = screen.getByLabelText('Selector clear button');
+    await userEvent.click(clearBtn);
+  });
+
+  it('renders and loader shows when empty, and then first set of labels', async () => {
+    const props = setupProps();
+    render(<UnthemedPrometheusMetricsBrowser {...props} />);
+    // Loading appears and dissappears
+    screen.getByText(/Loading labels/);
+    await waitFor(() => {
+      expect(screen.queryByText(/Loading labels/)).not.toBeInTheDocument();
+    });
+    // Initial set of labels is available and not selected
+    expect(screen.queryByRole('option', { name: 'label1' })).toBeInTheDocument();
+    expect(screen.queryByRole('option', { name: 'label1', selected: true })).not.toBeInTheDocument();
+    expect(screen.queryByRole('option', { name: 'label2' })).toBeInTheDocument();
+    expect(screen.queryByRole('option', { name: 'label2', selected: true })).not.toBeInTheDocument();
+    expect(screen.queryByLabelText('selector')).toHaveTextContent('{}');
+  });
+
+  it('allows label and value selection/deselection', async () => {
+    const props = setupProps();
+    render(<UnthemedPrometheusMetricsBrowser {...props} />);
+    // Selecting label2
+    const label2 = await screen.findByRole('option', { name: 'label2', selected: false });
+    expect(screen.queryByRole('list', { name: /Values/ })).not.toBeInTheDocument();
+    await userEvent.click(label2);
+    expect(screen.queryByRole('option', { name: 'label2', selected: true })).toBeInTheDocument();
+    // List of values for label2 appears
+    expect(screen.queryByLabelText(/Values for/)).toHaveTextContent('label2');
+    expect(screen.queryByRole('option', { name: 'value2-1' })).toBeInTheDocument();
+    expect(screen.queryByRole('option', { name: 'value2-2' })).toBeInTheDocument();
+    expect(screen.queryByLabelText('selector')).toHaveTextContent('{}');
+    // Selecting label1, list for its values appears
+    const label1 = await screen.findByRole('option', { name: 'label1', selected: false });
+    await userEvent.click(label1);
+    expect(screen.queryByRole('option', { name: 'label1', selected: true })).toBeInTheDocument();
+    await screen.findByLabelText('Values for label1');
+    expect(await screen.findAllByRole('list', { name: /Values/ })).toHaveLength(2);
+    // Selecting value2-2 of label2
+    const value = await screen.findByRole('option', { name: 'value2-2', selected: false });
+    await userEvent.click(value);
+    await screen.findByRole('option', { name: 'value2-2', selected: true });
+    expect(screen.queryByLabelText('selector')).toHaveTextContent('{label2="value2-2"}');
+    // Selecting value2-1 of label2, both values now selected
+    const value2 = await screen.findByRole('option', { name: 'value2-1', selected: false });
+    await userEvent.click(value2);
+    // await screen.findByRole('option', {name: 'value2-1', selected: true});
+    await screen.findByText('{label2=~"value2-1|value2-2"}');
+    // Deselecting value2-2, one value should remain
+    const selectedValue = await screen.findByRole('option', { name: 'value2-2', selected: true });
+    await userEvent.click(selectedValue);
+    await screen.findByRole('option', { name: 'value2-1', selected: true });
+    await screen.findByRole('option', { name: 'value2-2', selected: false });
+    expect(screen.queryByLabelText('selector')).toHaveTextContent('{label2="value2-1"}');
+  });
+
+  it('allows label selection from multiple labels', async () => {
+    const props = setupProps();
+    render(<UnthemedPrometheusMetricsBrowser {...props} />);
+
+    // Selecting label2
+    const label2 = await screen.findByRole('option', { name: 'label2', selected: false });
+    await userEvent.click(label2);
+    // List of values for label2 appears
+    expect(screen.queryByLabelText(/Values for/)).toHaveTextContent('label2');
+    expect(screen.queryByRole('option', { name: 'value2-1' })).toBeInTheDocument();
+    expect(screen.queryByRole('option', { name: 'value2-2' })).toBeInTheDocument();
+    expect(screen.queryByLabelText('selector')).toHaveTextContent('{}');
+    // Selecting label1, list for its values appears
+    const label1 = await screen.findByRole('option', { name: 'label1', selected: false });
+    await userEvent.click(label1);
+    await screen.findByLabelText('Values for label1');
+    expect(await screen.findAllByRole('list', { name: /Values/ })).toHaveLength(2);
+    // Selecting value2-1 of label2
+    const value2 = await screen.findByRole('option', { name: 'value2-1', selected: false });
+    await userEvent.click(value2);
+    await screen.findByText('{label2="value2-1"}');
+
+    // Selecting value from label1 for combined selector
+    const value1 = await screen.findByRole('option', { name: 'value1-2', selected: false });
+    await userEvent.click(value1);
+    await screen.findByRole('option', { name: 'value1-2', selected: true });
+    await screen.findByText('{label1="value1-2",label2="value2-1"}');
+    // Deselect label1 should remove label and value
+    const selectedLabel = (await screen.findAllByRole('option', { name: /label1/, selected: true }))[0];
+    await userEvent.click(selectedLabel);
+    await screen.findByRole('option', { name: /label1/, selected: false });
+    expect(await screen.findAllByRole('list', { name: /Values/ })).toHaveLength(1);
+    expect(screen.queryByLabelText('selector')).toHaveTextContent('{label2="value2-1"}');
+  });
+
+  it('allows clearing the label selection', async () => {
+    const props = setupProps();
+    render(<UnthemedPrometheusMetricsBrowser {...props} />);
+
+    // Selecting label2
+    const label2 = await screen.findByRole('option', { name: 'label2', selected: false });
+    await userEvent.click(label2);
+    // List of values for label2 appears
+    expect(screen.queryByLabelText(/Values for/)).toHaveTextContent('label2');
+    expect(screen.queryByRole('option', { name: 'value2-1' })).toBeInTheDocument();
+    expect(screen.queryByRole('option', { name: 'value2-2' })).toBeInTheDocument();
+    expect(screen.queryByLabelText('selector')).toHaveTextContent('{}');
+    // Selecting label1, list for its values appears
+    const label1 = await screen.findByRole('option', { name: 'label1', selected: false });
+    await userEvent.click(label1);
+    await screen.findByLabelText('Values for label1');
+    expect(await screen.findAllByRole('list', { name: /Values/ })).toHaveLength(2);
+    // Selecting value2-1 of label2
+    const value2 = await screen.findByRole('option', { name: 'value2-1', selected: false });
+    await userEvent.click(value2);
+    await screen.findByText('{label2="value2-1"}');
+
+    // Clear selector
+    const clearBtn = screen.getByLabelText('Selector clear button');
+    await userEvent.click(clearBtn);
+    await screen.findByRole('option', { name: 'label2', selected: false });
+    expect(screen.queryByLabelText('selector')).toHaveTextContent('{}');
+  });
+
+  it('filters values by input text', async () => {
+    const props = setupProps();
+    render(<UnthemedPrometheusMetricsBrowser {...props} />);
+    // Selecting label2 and label1
+    const label2 = await screen.findByRole('option', { name: /label2/, selected: false });
+    await userEvent.click(label2);
+    const label1 = await screen.findByRole('option', { name: /label1/, selected: false });
+    await userEvent.click(label1);
+    await screen.findByLabelText('Values for label1');
+    await screen.findByLabelText('Values for label2');
+    expect(await screen.findAllByRole('option', { name: /value/ })).toHaveLength(4);
+    // Typing '1' to filter for values
+    await userEvent.type(screen.getByLabelText('Filter expression for label values'), '1');
+    expect(screen.getByLabelText('Filter expression for label values')).toHaveValue('1');
+    expect(await screen.findAllByRole('option', { name: /value/ })).toHaveLength(3);
+    expect(screen.queryByRole('option', { name: 'value2-2' })).not.toBeInTheDocument();
+  });
+
+  it('facets labels', async () => {
+    const props = setupProps();
+    render(<UnthemedPrometheusMetricsBrowser {...props} />);
+    // Selecting label2 and label1
+    const label2 = await screen.findByRole('option', { name: /label2/, selected: false });
+    await userEvent.click(label2);
+    const label1 = await screen.findByRole('option', { name: /label1/, selected: false });
+    await userEvent.click(label1);
+    await screen.findByLabelText('Values for label1');
+    await screen.findByLabelText('Values for label2');
+    expect(await screen.findAllByRole('option', { name: /value/ })).toHaveLength(4);
+    expect(screen.queryByRole('option', { name: /label3/ })).toHaveTextContent('label3');
+    // Click value1-1 which triggers facetting for value3-x, and still show all value1-x
+    const value1 = await screen.findByRole('option', { name: 'value1-1', selected: false });
+    await userEvent.click(value1);
+    await waitFor(() => expect(screen.queryByRole('option', { name: 'value2-2' })).not.toBeInTheDocument());
+    expect(screen.queryByRole('option', { name: 'value1-2' })).toBeInTheDocument();
+    expect(screen.queryByLabelText('selector')).toHaveTextContent('{label1="value1-1"}');
+    expect(screen.queryByRole('option', { name: /label3/ })).toHaveTextContent('label3 (1)');
+    // Click value1-2 for which facetting will allow more values for value3-x
+    const value12 = await screen.findByRole('option', { name: 'value1-2', selected: false });
+    await userEvent.click(value12);
+    await screen.findByRole('option', { name: 'value1-2', selected: true });
+    await screen.findByRole('option', { name: /label3/, selected: false });
+    await userEvent.click(screen.getByRole('option', { name: /label3/ }));
+    await screen.findByLabelText('Values for label3');
+    expect(screen.queryByRole('option', { name: 'value1-1', selected: true })).toBeInTheDocument();
+    expect(screen.queryByRole('option', { name: 'value1-2', selected: true })).toBeInTheDocument();
+    expect(screen.queryByLabelText('selector')).toHaveTextContent('{label1=~"value1-1|value1-2"}');
+    expect(screen.queryAllByRole('option', { name: /label3/ })[0]).toHaveTextContent('label3 (2)');
+  });
+});
diff --git a/packages/grafana-prometheus/src/components/PrometheusMetricsBrowser.tsx b/packages/grafana-prometheus/src/components/PrometheusMetricsBrowser.tsx
new file mode 100644
index 0000000000000..79ae235574e13
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/PrometheusMetricsBrowser.tsx
@@ -0,0 +1,684 @@
+import { css, cx } from '@emotion/css';
+import React, { ChangeEvent } from 'react';
+import { FixedSizeList } from 'react-window';
+
+import { GrafanaTheme2, TimeRange } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import {
+  BrowserLabel as PromLabel,
+  Button,
+  HorizontalGroup,
+  Input,
+  Label,
+  LoadingPlaceholder,
+  stylesFactory,
+  withTheme2,
+} from '@grafana/ui';
+
+import PromQlLanguageProvider from '../language_provider';
+import { escapeLabelValueInExactSelector, escapeLabelValueInRegexSelector } from '../language_utils';
+
+// Hard limit on labels to render
+const EMPTY_SELECTOR = '{}';
+const METRIC_LABEL = '__name__';
+const LIST_ITEM_SIZE = 25;
+
+export interface BrowserProps {
+  languageProvider: PromQlLanguageProvider;
+  onChange: (selector: string) => void;
+  theme: GrafanaTheme2;
+  autoSelect?: number;
+  hide?: () => void;
+  lastUsedLabels: string[];
+  storeLastUsedLabels: (labels: string[]) => void;
+  deleteLastUsedLabels: () => void;
+  timeRange?: TimeRange;
+}
+
+interface BrowserState {
+  labels: SelectableLabel[];
+  labelSearchTerm: string;
+  metricSearchTerm: string;
+  status: string;
+  error: string;
+  validationStatus: string;
+  valueSearchTerm: string;
+}
+
+interface FacettableValue {
+  name: string;
+  selected?: boolean;
+  details?: string;
+}
+
+export interface SelectableLabel {
+  name: string;
+  selected?: boolean;
+  loading?: boolean;
+  values?: FacettableValue[];
+  hidden?: boolean;
+  facets?: number;
+}
+
+export function buildSelector(labels: SelectableLabel[]): string {
+  let singleMetric = '';
+  const selectedLabels = [];
+  for (const label of labels) {
+    if ((label.name === METRIC_LABEL || label.selected) && label.values && label.values.length > 0) {
+      const selectedValues = label.values.filter((value) => value.selected).map((value) => value.name);
+      if (selectedValues.length > 1) {
+        selectedLabels.push(`${label.name}=~"${selectedValues.map(escapeLabelValueInRegexSelector).join('|')}"`);
+      } else if (selectedValues.length === 1) {
+        if (label.name === METRIC_LABEL) {
+          singleMetric = selectedValues[0];
+        } else {
+          selectedLabels.push(`${label.name}="${escapeLabelValueInExactSelector(selectedValues[0])}"`);
+        }
+      }
+    }
+  }
+  return [singleMetric, '{', selectedLabels.join(','), '}'].join('');
+}
+
+export function facetLabels(
+  labels: SelectableLabel[],
+  possibleLabels: Record<string, string[]>,
+  lastFacetted?: string
+): SelectableLabel[] {
+  return labels.map((label) => {
+    const possibleValues = possibleLabels[label.name];
+    if (possibleValues) {
+      let existingValues: FacettableValue[];
+      if (label.name === lastFacetted && label.values) {
+        // Facetting this label, show all values
+        existingValues = label.values;
+      } else {
+        // Keep selection in other facets
+        const selectedValues: Set<string> = new Set(
+          label.values?.filter((value) => value.selected).map((value) => value.name) || []
+        );
+        // Values for this label have not been requested yet, let's use the facetted ones as the initial values
+        existingValues = possibleValues.map((value) => ({ name: value, selected: selectedValues.has(value) }));
+      }
+      return {
+        ...label,
+        loading: false,
+        values: existingValues,
+        hidden: !possibleValues,
+        facets: existingValues.length,
+      };
+    }
+
+    // Label is facetted out, hide all values
+    return { ...label, loading: false, hidden: !possibleValues, values: undefined, facets: 0 };
+  });
+}
+
+const getStyles = stylesFactory((theme: GrafanaTheme2) => ({
+  wrapper: css`
+    background-color: ${theme.colors.background.secondary};
+    padding: ${theme.spacing(1)};
+    width: 100%;
+  `,
+  list: css`
+    margin-top: ${theme.spacing(1)};
+    display: flex;
+    flex-wrap: wrap;
+    max-height: 200px;
+    overflow: auto;
+    align-content: flex-start;
+  `,
+  section: css`
+    & + & {
+      margin: ${theme.spacing(2)} 0;
+    }
+    position: relative;
+  `,
+  selector: css`
+    font-family: ${theme.typography.fontFamilyMonospace};
+    margin-bottom: ${theme.spacing(1)};
+  `,
+  status: css`
+    padding: ${theme.spacing(0.5)};
+    color: ${theme.colors.text.secondary};
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    /* using absolute positioning because flex interferes with ellipsis */
+    position: absolute;
+    width: 50%;
+    right: 0;
+    text-align: right;
+    transition: opacity 100ms linear;
+    opacity: 0;
+  `,
+  statusShowing: css`
+    opacity: 1;
+  `,
+  error: css`
+    color: ${theme.colors.error.main};
+  `,
+  valueList: css`
+    margin-right: ${theme.spacing(1)};
+    resize: horizontal;
+  `,
+  valueListWrapper: css`
+    border-left: 1px solid ${theme.colors.border.medium};
+    margin: ${theme.spacing(1)} 0;
+    padding: ${theme.spacing(1)} 0 ${theme.spacing(1)} ${theme.spacing(1)};
+  `,
+  valueListArea: css`
+    display: flex;
+    flex-wrap: wrap;
+    margin-top: ${theme.spacing(1)};
+  `,
+  valueTitle: css`
+    margin-left: -${theme.spacing(0.5)};
+    margin-bottom: ${theme.spacing(1)};
+  `,
+  validationStatus: css`
+    padding: ${theme.spacing(0.5)};
+    margin-bottom: ${theme.spacing(1)};
+    color: ${theme.colors.text.maxContrast};
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  `,
+}));
+
+/**
+ * TODO #33976: Remove duplicated code. The component is very similar to LokiLabelBrowser.tsx. Check if it's possible
+ *              to create a single, generic component.
+ */
+export class UnthemedPrometheusMetricsBrowser extends React.Component<BrowserProps, BrowserState> {
+  valueListsRef = React.createRef<HTMLDivElement>();
+  state: BrowserState = {
+    labels: [],
+    labelSearchTerm: '',
+    metricSearchTerm: '',
+    status: 'Ready',
+    error: '',
+    validationStatus: '',
+    valueSearchTerm: '',
+  };
+
+  onChangeLabelSearch = (event: ChangeEvent<HTMLInputElement>) => {
+    this.setState({ labelSearchTerm: event.target.value });
+  };
+
+  onChangeMetricSearch = (event: ChangeEvent<HTMLInputElement>) => {
+    this.setState({ metricSearchTerm: event.target.value });
+  };
+
+  onChangeValueSearch = (event: ChangeEvent<HTMLInputElement>) => {
+    this.setState({ valueSearchTerm: event.target.value });
+  };
+
+  onClickRunQuery = () => {
+    const selector = buildSelector(this.state.labels);
+    this.props.onChange(selector);
+  };
+
+  onClickRunRateQuery = () => {
+    const selector = buildSelector(this.state.labels);
+    const query = `rate(${selector}[$__rate_interval])`;
+    this.props.onChange(query);
+  };
+
+  onClickClear = () => {
+    this.setState((state) => {
+      const labels: SelectableLabel[] = state.labels.map((label) => ({
+        ...label,
+        values: undefined,
+        selected: false,
+        loading: false,
+        hidden: false,
+        facets: undefined,
+      }));
+      return {
+        labels,
+        labelSearchTerm: '',
+        metricSearchTerm: '',
+        status: '',
+        error: '',
+        validationStatus: '',
+        valueSearchTerm: '',
+      };
+    });
+    this.props.deleteLastUsedLabels();
+    // Get metrics
+    this.fetchValues(METRIC_LABEL, EMPTY_SELECTOR);
+  };
+
+  onClickLabel = (name: string, value: string | undefined, event: React.MouseEvent<HTMLElement>) => {
+    const label = this.state.labels.find((l) => l.name === name);
+    if (!label) {
+      return;
+    }
+    // Toggle selected state
+    const selected = !label.selected;
+    let nextValue: Partial<SelectableLabel> = { selected };
+    if (label.values && !selected) {
+      // Deselect all values if label was deselected
+      const values = label.values.map((value) => ({ ...value, selected: false }));
+      nextValue = { ...nextValue, facets: 0, values };
+    }
+    // Resetting search to prevent empty results
+    this.setState({ labelSearchTerm: '' });
+    this.updateLabelState(name, nextValue, '', () => this.doFacettingForLabel(name));
+  };
+
+  onClickValue = (name: string, value: string | undefined, event: React.MouseEvent<HTMLElement>) => {
+    const label = this.state.labels.find((l) => l.name === name);
+    if (!label || !label.values) {
+      return;
+    }
+    // Resetting search to prevent empty results
+    this.setState({ labelSearchTerm: '' });
+    // Toggling value for selected label, leaving other values intact
+    const values = label.values.map((v) => ({ ...v, selected: v.name === value ? !v.selected : v.selected }));
+    this.updateLabelState(name, { values }, '', () => this.doFacetting(name));
+  };
+
+  onClickMetric = (name: string, value: string | undefined, event: React.MouseEvent<HTMLElement>) => {
+    // Finding special metric label
+    const label = this.state.labels.find((l) => l.name === name);
+    if (!label || !label.values) {
+      return;
+    }
+    // Resetting search to prevent empty results
+    this.setState({ metricSearchTerm: '' });
+    // Toggling value for selected label, leaving other values intact
+    const values = label.values.map((v) => ({
+      ...v,
+      selected: v.name === value || v.selected ? !v.selected : v.selected,
+    }));
+    // Toggle selected state of special metrics label
+    const selected = values.some((v) => v.selected);
+    this.updateLabelState(name, { selected, values }, '', () => this.doFacetting(name));
+  };
+
+  onClickValidate = () => {
+    const selector = buildSelector(this.state.labels);
+    this.validateSelector(selector);
+  };
+
+  updateLabelState(name: string, updatedFields: Partial<SelectableLabel>, status = '', cb?: () => void) {
+    this.setState((state) => {
+      const labels: SelectableLabel[] = state.labels.map((label) => {
+        if (label.name === name) {
+          return { ...label, ...updatedFields };
+        }
+        return label;
+      });
+      // New status overrides errors
+      const error = status ? '' : state.error;
+      return { labels, status, error, validationStatus: '' };
+    }, cb);
+  }
+
+  componentDidMount() {
+    const { languageProvider, lastUsedLabels } = this.props;
+    if (languageProvider) {
+      const selectedLabels: string[] = lastUsedLabels;
+      languageProvider.start(this.props.timeRange).then(() => {
+        let rawLabels: string[] = languageProvider.getLabelKeys();
+        // Get metrics
+        this.fetchValues(METRIC_LABEL, EMPTY_SELECTOR);
+        // Auto-select previously selected labels
+        const labels: SelectableLabel[] = rawLabels.map((label, i, arr) => ({
+          name: label,
+          selected: selectedLabels.includes(label),
+          loading: false,
+        }));
+        // Pre-fetch values for selected labels
+        this.setState({ labels }, () => {
+          this.state.labels.forEach((label) => {
+            if (label.selected) {
+              this.fetchValues(label.name, EMPTY_SELECTOR);
+            }
+          });
+        });
+      });
+    }
+  }
+
+  doFacettingForLabel(name: string) {
+    const label = this.state.labels.find((l) => l.name === name);
+    if (!label) {
+      return;
+    }
+    const selectedLabels = this.state.labels.filter((label) => label.selected).map((label) => label.name);
+    this.props.storeLastUsedLabels(selectedLabels);
+    if (label.selected) {
+      // Refetch values for newly selected label...
+      if (!label.values) {
+        this.fetchValues(name, buildSelector(this.state.labels));
+      }
+    } else {
+      // Only need to facet when deselecting labels
+      this.doFacetting();
+    }
+  }
+
+  doFacetting = (lastFacetted?: string) => {
+    const selector = buildSelector(this.state.labels);
+    if (selector === EMPTY_SELECTOR) {
+      // Clear up facetting
+      const labels: SelectableLabel[] = this.state.labels.map((label) => {
+        return { ...label, facets: 0, values: undefined, hidden: false };
+      });
+      this.setState({ labels }, () => {
+        // Get fresh set of values
+        this.state.labels.forEach(
+          (label) => (label.selected || label.name === METRIC_LABEL) && this.fetchValues(label.name, selector)
+        );
+      });
+    } else {
+      // Do facetting
+      this.fetchSeries(selector, lastFacetted);
+    }
+  };
+
+  async fetchValues(name: string, selector: string) {
+    const { languageProvider } = this.props;
+    this.updateLabelState(name, { loading: true }, `Fetching values for ${name}`);
+    try {
+      let rawValues = await languageProvider.getLabelValues(name);
+      // If selector changed, clear loading state and discard result by returning early
+      if (selector !== buildSelector(this.state.labels)) {
+        this.updateLabelState(name, { loading: false });
+        return;
+      }
+      const values: FacettableValue[] = [];
+      const { metricsMetadata } = languageProvider;
+      for (const labelValue of rawValues) {
+        const value: FacettableValue = { name: labelValue };
+        // Adding type/help text to metrics
+        if (name === METRIC_LABEL && metricsMetadata) {
+          const meta = metricsMetadata[labelValue];
+          if (meta) {
+            value.details = `(${meta.type}) ${meta.help}`;
+          }
+        }
+        values.push(value);
+      }
+      this.updateLabelState(name, { values, loading: false });
+    } catch (error) {
+      console.error(error);
+    }
+  }
+
+  async fetchSeries(selector: string, lastFacetted?: string) {
+    const { languageProvider } = this.props;
+    if (lastFacetted) {
+      this.updateLabelState(lastFacetted, { loading: true }, `Facetting labels for ${selector}`);
+    }
+    try {
+      const possibleLabels = await languageProvider.fetchSeriesLabels(selector, true);
+      // If selector changed, clear loading state and discard result by returning early
+      if (selector !== buildSelector(this.state.labels)) {
+        if (lastFacetted) {
+          this.updateLabelState(lastFacetted, { loading: false });
+        }
+        return;
+      }
+      if (Object.keys(possibleLabels).length === 0) {
+        this.setState({ error: `Empty results, no matching label for ${selector}` });
+        return;
+      }
+      const labels: SelectableLabel[] = facetLabels(this.state.labels, possibleLabels, lastFacetted);
+      this.setState({ labels, error: '' });
+      if (lastFacetted) {
+        this.updateLabelState(lastFacetted, { loading: false });
+      }
+    } catch (error) {
+      console.error(error);
+    }
+  }
+
+  async validateSelector(selector: string) {
+    const { languageProvider } = this.props;
+    this.setState({ validationStatus: `Validating selector ${selector}`, error: '' });
+    const streams = await languageProvider.fetchSeries(selector);
+    this.setState({ validationStatus: `Selector is valid (${streams.length} series found)` });
+  }
+
+  render() {
+    const { theme } = this.props;
+    const { labels, labelSearchTerm, metricSearchTerm, status, error, validationStatus, valueSearchTerm } = this.state;
+    const styles = getStyles(theme);
+    if (labels.length === 0) {
+      return (
+        <div className={styles.wrapper}>
+          <LoadingPlaceholder text="Loading labels..." />
+        </div>
+      );
+    }
+
+    // Filter metrics
+    let metrics = labels.find((label) => label.name === METRIC_LABEL);
+    if (metrics && metricSearchTerm) {
+      metrics = {
+        ...metrics,
+        values: metrics.values?.filter((value) => value.selected || value.name.includes(metricSearchTerm)),
+      };
+    }
+
+    // Filter labels
+    let nonMetricLabels = labels.filter((label) => !label.hidden && label.name !== METRIC_LABEL);
+    if (labelSearchTerm) {
+      nonMetricLabels = nonMetricLabels.filter((label) => label.selected || label.name.includes(labelSearchTerm));
+    }
+
+    // Filter non-metric label values
+    let selectedLabels = nonMetricLabels.filter((label) => label.selected && label.values);
+    if (valueSearchTerm) {
+      selectedLabels = selectedLabels.map((label) => ({
+        ...label,
+        values: label.values?.filter((value) => value.selected || value.name.includes(valueSearchTerm)),
+      }));
+    }
+    const selector = buildSelector(this.state.labels);
+    const empty = selector === EMPTY_SELECTOR;
+    const metricCount = metrics?.values?.length || 0;
+
+    return (
+      <div className={styles.wrapper}>
+        <HorizontalGroup align="flex-start" spacing="lg">
+          <div>
+            <div className={styles.section}>
+              <Label description="Once a metric is selected only possible labels are shown.">1. Select a metric</Label>
+              <div>
+                <Input
+                  onChange={this.onChangeMetricSearch}
+                  aria-label="Filter expression for metric"
+                  value={metricSearchTerm}
+                  data-testid={selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.selectMetric}
+                />
+              </div>
+              <div
+                role="list"
+                className={styles.valueListWrapper}
+                data-testid={selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.metricList}
+              >
+                <FixedSizeList
+                  height={Math.min(450, metricCount * LIST_ITEM_SIZE)}
+                  itemCount={metricCount}
+                  itemSize={LIST_ITEM_SIZE}
+                  itemKey={(i) => metrics!.values![i].name}
+                  width={300}
+                  className={styles.valueList}
+                >
+                  {({ index, style }) => {
+                    const value = metrics?.values?.[index];
+                    if (!value) {
+                      return null;
+                    }
+                    return (
+                      <div style={style}>
+                        <PromLabel
+                          name={metrics!.name}
+                          value={value?.name}
+                          title={value.details}
+                          active={value?.selected}
+                          onClick={this.onClickMetric}
+                          searchTerm={metricSearchTerm}
+                        />
+                      </div>
+                    );
+                  }}
+                </FixedSizeList>
+              </div>
+            </div>
+          </div>
+
+          <div>
+            <div className={styles.section}>
+              <Label description="Once label values are selected, only possible label combinations are shown.">
+                2. Select labels to search in
+              </Label>
+              <div>
+                <Input
+                  onChange={this.onChangeLabelSearch}
+                  aria-label="Filter expression for label"
+                  value={labelSearchTerm}
+                  data-testid={
+                    selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.labelNamesFilter
+                  }
+                />
+              </div>
+              {/* Using fixed height here to prevent jumpy layout */}
+              <div className={styles.list} style={{ height: 120 }}>
+                {nonMetricLabels.map((label) => (
+                  <PromLabel
+                    key={label.name}
+                    name={label.name}
+                    loading={label.loading}
+                    active={label.selected}
+                    hidden={label.hidden}
+                    facets={label.facets}
+                    onClick={this.onClickLabel}
+                    searchTerm={labelSearchTerm}
+                  />
+                ))}
+              </div>
+            </div>
+            <div className={styles.section}>
+              <Label description="Use the search field to find values across selected labels.">
+                3. Select (multiple) values for your labels
+              </Label>
+              <div>
+                <Input
+                  onChange={this.onChangeValueSearch}
+                  aria-label="Filter expression for label values"
+                  value={valueSearchTerm}
+                  data-testid={
+                    selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.labelValuesFilter
+                  }
+                />
+              </div>
+              <div className={styles.valueListArea} ref={this.valueListsRef}>
+                {selectedLabels.map((label) => (
+                  <div
+                    role="list"
+                    key={label.name}
+                    aria-label={`Values for ${label.name}`}
+                    className={styles.valueListWrapper}
+                  >
+                    <div className={styles.valueTitle}>
+                      <PromLabel
+                        name={label.name}
+                        loading={label.loading}
+                        active={label.selected}
+                        hidden={label.hidden}
+                        //If no facets, we want to show number of all label values
+                        facets={label.facets || label.values?.length}
+                        onClick={this.onClickLabel}
+                      />
+                    </div>
+                    <FixedSizeList
+                      height={Math.min(200, LIST_ITEM_SIZE * (label.values?.length || 0))}
+                      itemCount={label.values?.length || 0}
+                      itemSize={28}
+                      itemKey={(i) => label.values![i].name}
+                      width={200}
+                      className={styles.valueList}
+                    >
+                      {({ index, style }) => {
+                        const value = label.values?.[index];
+                        if (!value) {
+                          return null;
+                        }
+                        return (
+                          <div style={style}>
+                            <PromLabel
+                              name={label.name}
+                              value={value?.name}
+                              active={value?.selected}
+                              onClick={this.onClickValue}
+                              searchTerm={valueSearchTerm}
+                            />
+                          </div>
+                        );
+                      }}
+                    </FixedSizeList>
+                  </div>
+                ))}
+              </div>
+            </div>
+          </div>
+        </HorizontalGroup>
+
+        <div className={styles.section}>
+          <Label>4. Resulting selector</Label>
+          <div aria-label="selector" className={styles.selector}>
+            {selector}
+          </div>
+          {validationStatus && <div className={styles.validationStatus}>{validationStatus}</div>}
+          <HorizontalGroup>
+            <Button
+              data-testid={selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.useQuery}
+              aria-label="Use selector for query button"
+              disabled={empty}
+              onClick={this.onClickRunQuery}
+            >
+              Use query
+            </Button>
+            <Button
+              data-testid={selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.useAsRateQuery}
+              aria-label="Use selector as metrics button"
+              variant="secondary"
+              disabled={empty}
+              onClick={this.onClickRunRateQuery}
+            >
+              Use as rate query
+            </Button>
+            <Button
+              data-testid={selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.validateSelector}
+              aria-label="Validate submit button"
+              variant="secondary"
+              disabled={empty}
+              onClick={this.onClickValidate}
+            >
+              Validate selector
+            </Button>
+            <Button
+              data-testid={selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.clear}
+              aria-label="Selector clear button"
+              variant="secondary"
+              onClick={this.onClickClear}
+            >
+              Clear
+            </Button>
+            <div className={cx(styles.status, (status || error) && styles.statusShowing)}>
+              <span className={error ? styles.error : ''}>{error || status}</span>
+            </div>
+          </HorizontalGroup>
+        </div>
+      </div>
+    );
+  }
+}
+
+export const PrometheusMetricsBrowser = withTheme2(UnthemedPrometheusMetricsBrowser);
diff --git a/packages/grafana-prometheus/src/components/VariableQueryEditor.test.tsx b/packages/grafana-prometheus/src/components/VariableQueryEditor.test.tsx
new file mode 100644
index 0000000000000..0d3a877069d7b
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/VariableQueryEditor.test.tsx
@@ -0,0 +1,392 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { dateTime, TimeRange } from '@grafana/data';
+
+import { PrometheusDatasource } from '../datasource';
+import { selectOptionInTest } from '../gcopypaste/test/helpers/selectOptionInTest';
+import PrometheusLanguageProvider from '../language_provider';
+import { migrateVariableEditorBackToVariableSupport } from '../migrations/variableMigration';
+import { PromVariableQuery, PromVariableQueryType, StandardPromVariableQuery } from '../types';
+
+import { PromVariableQueryEditor, Props, variableMigration } from './VariableQueryEditor';
+
+const refId = 'PrometheusVariableQueryEditor-VariableQuery';
+
+describe('PromVariableQueryEditor', () => {
+  let props: Props;
+
+  test('Migrates from standard variable support to custom variable query', () => {
+    const query: StandardPromVariableQuery = {
+      query: 'label_names()',
+      refId: 'StandardVariableQuery',
+    };
+
+    const migration: PromVariableQuery = variableMigration(query);
+
+    const expected: PromVariableQuery = {
+      qryType: PromVariableQueryType.LabelNames,
+      refId: 'PrometheusDatasource-VariableQuery',
+    };
+
+    expect(migration).toEqual(expected);
+  });
+
+  test('Allows for use of variables to interpolate label names in the label values query type.', () => {
+    const query: StandardPromVariableQuery = {
+      query: 'label_values($label_name)',
+      refId: 'StandardVariableQuery',
+    };
+
+    const migration: PromVariableQuery = variableMigration(query);
+
+    const expected: PromVariableQuery = {
+      qryType: PromVariableQueryType.LabelValues,
+      label: '$label_name',
+      refId: 'PrometheusDatasource-VariableQuery',
+    };
+
+    expect(migration).toEqual(expected);
+  });
+
+  test('Migrates from jsonnet grafana as code variable to custom variable query', () => {
+    const query = 'label_names()';
+
+    const migration: PromVariableQuery = variableMigration(query);
+
+    const expected: PromVariableQuery = {
+      qryType: PromVariableQueryType.LabelNames,
+      refId: 'PrometheusDatasource-VariableQuery',
+    };
+
+    expect(migration).toEqual(expected);
+  });
+
+  test('Migrates label filters to the query object for label_values()', () => {
+    const query: StandardPromVariableQuery = {
+      query: 'label_values(metric{label="value"},name)',
+      refId: 'StandardVariableQuery',
+    };
+
+    const migration: PromVariableQuery = variableMigration(query);
+
+    const expected: PromVariableQuery = {
+      qryType: PromVariableQueryType.LabelValues,
+      label: 'name',
+      metric: 'metric',
+      labelFilters: [
+        {
+          label: 'label',
+          op: '=',
+          value: 'value',
+        },
+      ],
+      refId: 'PrometheusDatasource-VariableQuery',
+    };
+
+    expect(migration).toEqual(expected);
+  });
+
+  test('Migrates a query object with label filters to an expression correctly', () => {
+    const query: PromVariableQuery = {
+      qryType: PromVariableQueryType.LabelValues,
+      label: 'name',
+      metric: 'metric',
+      labelFilters: [
+        {
+          label: 'label',
+          op: '=',
+          value: 'value',
+        },
+      ],
+      refId: 'PrometheusDatasource-VariableQuery',
+    };
+
+    const migration: string = migrateVariableEditorBackToVariableSupport(query);
+
+    const expected = 'label_values(metric{label="value"},name)';
+
+    expect(migration).toEqual(expected);
+  });
+
+  test('Migrates a query object with no metric and only label filters to an expression correctly', () => {
+    const query: PromVariableQuery = {
+      qryType: PromVariableQueryType.LabelValues,
+      label: 'name',
+      labelFilters: [
+        {
+          label: 'label',
+          op: '=',
+          value: 'value',
+        },
+      ],
+      refId: 'PrometheusDatasource-VariableQuery',
+    };
+
+    const migration: string = migrateVariableEditorBackToVariableSupport(query);
+
+    const expected = 'label_values({label="value"},name)';
+
+    expect(migration).toEqual(expected);
+  });
+
+  beforeEach(() => {
+    props = {
+      datasource: {
+        hasLabelsMatchAPISupport: () => true,
+        languageProvider: {
+          start: () => Promise.resolve([]),
+          syntax: () => {},
+          getLabelKeys: () => [],
+          metrics: [],
+          metricsMetadata: {},
+          getLabelValues: jest.fn().mockImplementation(() => ['that']),
+          fetchLabelsWithMatch: jest.fn().mockImplementation(() => Promise.resolve({ those: 'those' })),
+        } as Partial<PrometheusLanguageProvider> as PrometheusLanguageProvider,
+        getInitHints: () => [],
+        getDebounceTimeInMilliseconds: jest.fn(),
+        getTagKeys: jest.fn().mockImplementation(() => Promise.resolve(['this'])),
+        getVariables: jest.fn().mockImplementation(() => []),
+        metricFindQuery: jest.fn().mockImplementation(() => Promise.resolve(['that'])),
+        getSeriesLabels: jest.fn().mockImplementation(() => Promise.resolve(['that'])),
+      } as Partial<PrometheusDatasource> as PrometheusDatasource,
+      query: {
+        refId: 'test',
+        query: 'label_names()',
+      },
+      onRunQuery: () => {},
+      onChange: () => {},
+      history: [],
+    };
+  });
+
+  test('Displays a group of function options', async () => {
+    render(<PromVariableQueryEditor {...props} />);
+
+    const select = screen.getByLabelText('Query type').parentElement!;
+    await userEvent.click(select);
+
+    await waitFor(() => expect(screen.getAllByText('Label names')).toHaveLength(2));
+    await waitFor(() => expect(screen.getByText('Label values')).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByText('Metrics')).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByText('Query result')).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByText('Series query')).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByText('Classic query')).toBeInTheDocument());
+  });
+
+  test('Calls onChange for label_names(match) query', async () => {
+    const onChange = jest.fn();
+
+    props.query = {
+      refId: 'test',
+      query: '',
+      match: 'that',
+    };
+
+    render(<PromVariableQueryEditor {...props} onChange={onChange} />);
+
+    await selectOptionInTest(screen.getByLabelText('Query type'), 'Label names');
+
+    expect(onChange).toHaveBeenCalledWith({
+      query: 'label_names(that)',
+      refId,
+      qryType: 0,
+    });
+  });
+
+  test('Calls onChange for label_names, label_values, metrics, query result and and classic query.', async () => {
+    const onChange = jest.fn();
+
+    props.query = {
+      refId: 'test',
+      query: '',
+    };
+
+    render(<PromVariableQueryEditor {...props} onChange={onChange} />);
+
+    await selectOptionInTest(screen.getByLabelText('Query type'), 'Label names');
+    await selectOptionInTest(screen.getByLabelText('Query type'), 'Label values');
+    await selectOptionInTest(screen.getByLabelText('Query type'), 'Metrics');
+    await selectOptionInTest(screen.getByLabelText('Query type'), 'Query result');
+    await selectOptionInTest(screen.getByLabelText('Query type'), 'Classic query');
+
+    expect(onChange).toHaveBeenCalledTimes(5);
+  });
+
+  test('Does not call onChange for series query', async () => {
+    const onChange = jest.fn();
+
+    render(<PromVariableQueryEditor {...props} onChange={onChange} />);
+
+    await selectOptionInTest(screen.getByLabelText('Query type'), 'Series query');
+
+    expect(onChange).not.toHaveBeenCalled();
+  });
+
+  test('Calls onChange for metrics() after input', async () => {
+    const onChange = jest.fn();
+
+    props.query = {
+      refId: 'test',
+      query: 'label_names()',
+    };
+
+    render(<PromVariableQueryEditor {...props} onChange={onChange} />);
+
+    await selectOptionInTest(screen.getByLabelText('Query type'), 'Metrics');
+    const metricInput = screen.getByLabelText('Metric selector');
+    await userEvent.type(metricInput, 'a');
+    const queryType = screen.getByLabelText('Query type');
+    // click elsewhere to trigger the onBlur
+    await userEvent.click(queryType);
+
+    await waitFor(() =>
+      expect(onChange).toHaveBeenCalledWith({
+        query: 'metrics(a)',
+        refId,
+        qryType: 2,
+      })
+    );
+  });
+
+  test('Calls onChange for label_values() after selecting label', async () => {
+    const onChange = jest.fn();
+
+    props.query = {
+      refId: 'test',
+      query: 'label_names()',
+      qryType: 0,
+    };
+
+    render(<PromVariableQueryEditor {...props} onChange={onChange} />);
+
+    await selectOptionInTest(screen.getByLabelText('Query type'), 'Label values');
+    const labelSelect = screen.getByLabelText('label-select');
+    await userEvent.type(labelSelect, 'this');
+    await selectOptionInTest(labelSelect, 'this');
+
+    await waitFor(() =>
+      expect(onChange).toHaveBeenCalledWith({
+        query: 'label_values(this)',
+        refId,
+        qryType: 1,
+      })
+    );
+  });
+
+  test('Calls onChange for label_values() after selecting metric', async () => {
+    const onChange = jest.fn();
+
+    props.query = {
+      refId: 'test',
+      query: 'label_names()',
+    };
+
+    render(<PromVariableQueryEditor {...props} onChange={onChange} />);
+
+    await selectOptionInTest(screen.getByLabelText('Query type'), 'Label values');
+    const labelSelect = screen.getByLabelText('label-select');
+    await userEvent.type(labelSelect, 'this');
+    await selectOptionInTest(labelSelect, 'this');
+
+    const metricSelect = screen.getByLabelText('Metric');
+    await userEvent.type(metricSelect, 'that');
+    await selectOptionInTest(metricSelect, 'that');
+
+    await waitFor(() =>
+      expect(onChange).toHaveBeenCalledWith({
+        query: 'label_values(that,this)',
+        refId,
+        qryType: 1,
+      })
+    );
+  });
+
+  test('Calls onChange for query_result() with argument onBlur', async () => {
+    const onChange = jest.fn();
+
+    props.query = {
+      refId: 'test',
+      query: 'query_result(a)',
+    };
+
+    render(<PromVariableQueryEditor {...props} onChange={onChange} />);
+
+    const labelSelect = screen.getByLabelText('Prometheus Query');
+    await userEvent.click(labelSelect);
+    const functionSelect = screen.getByLabelText('Query type').parentElement!;
+    await userEvent.click(functionSelect);
+
+    expect(onChange).toHaveBeenCalledWith({
+      query: 'query_result(a)',
+      refId,
+      qryType: 3,
+    });
+  });
+
+  test('Calls onChange for Match[] series with argument onBlur', async () => {
+    const onChange = jest.fn();
+
+    props.query = {
+      refId: 'test',
+      query: '{a: "example"}',
+    };
+
+    render(<PromVariableQueryEditor {...props} onChange={onChange} />);
+
+    const labelSelect = screen.getByLabelText('Series Query');
+    await userEvent.click(labelSelect);
+    const functionSelect = screen.getByLabelText('Query type').parentElement!;
+    await userEvent.click(functionSelect);
+
+    expect(onChange).toHaveBeenCalledWith({
+      query: '{a: "example"}',
+      refId,
+      qryType: 4,
+    });
+  });
+
+  test('Calls onChange for classic query onBlur', async () => {
+    const onChange = jest.fn();
+
+    props.query = {
+      refId: 'test',
+      qryType: 5,
+      query: 'label_values(instance)',
+    };
+
+    render(<PromVariableQueryEditor {...props} onChange={onChange} />);
+
+    const labelSelect = screen.getByLabelText('Classic Query');
+    await userEvent.click(labelSelect);
+    const functionSelect = screen.getByLabelText('Query type').parentElement!;
+    await userEvent.click(functionSelect);
+
+    expect(onChange).toHaveBeenCalledWith({
+      query: 'label_values(instance)',
+      refId,
+      qryType: 5,
+    });
+  });
+
+  test('Calls language provider with the time range received in props', async () => {
+    const now = dateTime('2023-09-16T21:26:00Z');
+    const range: TimeRange = {
+      from: dateTime(now).subtract(2, 'days'),
+      to: now,
+      raw: {
+        from: 'now-2d',
+        to: 'now',
+      },
+    };
+    props.range = range;
+
+    const languageProviderStartMock = jest.fn();
+    props.datasource.languageProvider.start = languageProviderStartMock;
+
+    render(<PromVariableQueryEditor {...props} />);
+
+    expect(languageProviderStartMock).toHaveBeenCalledWith(range);
+  });
+});
diff --git a/packages/grafana-prometheus/src/components/VariableQueryEditor.tsx b/packages/grafana-prometheus/src/components/VariableQueryEditor.tsx
new file mode 100644
index 0000000000000..fce9bf1e1dfe4
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/VariableQueryEditor.tsx
@@ -0,0 +1,437 @@
+import React, { FormEvent, useCallback, useEffect, useState } from 'react';
+
+import { QueryEditorProps, SelectableValue } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { InlineField, InlineFieldRow, Input, Select, TextArea } from '@grafana/ui';
+
+import { PrometheusDatasource } from '../datasource';
+import {
+  migrateVariableEditorBackToVariableSupport,
+  migrateVariableQueryToEditor,
+} from '../migrations/variableMigration';
+import { promQueryModeller } from '../querybuilder/PromQueryModeller';
+import { MetricsLabelsSection } from '../querybuilder/components/MetricsLabelsSection';
+import { QueryBuilderLabelFilter } from '../querybuilder/shared/types';
+import { PromVisualQuery } from '../querybuilder/types';
+import {
+  PromOptions,
+  PromQuery,
+  PromVariableQuery,
+  PromVariableQueryType as QueryType,
+  StandardPromVariableQuery,
+} from '../types';
+
+export const variableOptions = [
+  { label: 'Label names', value: QueryType.LabelNames },
+  { label: 'Label values', value: QueryType.LabelValues },
+  { label: 'Metrics', value: QueryType.MetricNames },
+  { label: 'Query result', value: QueryType.VarQueryResult },
+  { label: 'Series query', value: QueryType.SeriesQuery },
+  { label: 'Classic query', value: QueryType.ClassicQuery },
+];
+
+export type Props = QueryEditorProps<PrometheusDatasource, PromQuery, PromOptions, PromVariableQuery>;
+
+const refId = 'PrometheusVariableQueryEditor-VariableQuery';
+
+export const PromVariableQueryEditor = ({ onChange, query, datasource, range }: Props) => {
+  // to select the query type, i.e. label_names, label_values, etc.
+  const [qryType, setQryType] = useState<number | undefined>(undefined);
+  // list of variables for each function
+  const [label, setLabel] = useState('');
+
+  const [labelNamesMatch, setLabelNamesMatch] = useState('');
+
+  // metric is used for both label_values() and metric()
+  // label_values() metric requires a whole/complete metric
+  // metric() is expected to be a part of a metric string
+  const [metric, setMetric] = useState('');
+  // varQuery is a whole query, can include math/rates/etc
+  const [varQuery, setVarQuery] = useState('');
+  // seriesQuery is only a whole
+  const [seriesQuery, setSeriesQuery] = useState('');
+
+  // the original variable query implementation, e.g. label_value(metric, label_name)
+  const [classicQuery, setClassicQuery] = useState('');
+
+  // list of label names for label_values(), /api/v1/labels, contains the same results as label_names() function
+  const [labelOptions, setLabelOptions] = useState<Array<SelectableValue<string>>>([]);
+
+  // label filters have been added as a filter for metrics in label values query type
+  const [labelFilters, setLabelFilters] = useState<QueryBuilderLabelFilter[]>([]);
+
+  useEffect(() => {
+    datasource.languageProvider.start(range);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  useEffect(() => {
+    if (!query) {
+      return;
+    }
+
+    if (query.qryType === QueryType.ClassicQuery) {
+      setQryType(query.qryType);
+      setClassicQuery(query.query ?? '');
+    } else {
+      // 1. Changing from standard to custom variable editor changes the string attr from expr to query
+      // 2. jsonnet grafana as code passes a variable as a string
+      const variableQuery = variableMigration(query);
+
+      setLabelNamesMatch(variableQuery.match ?? '');
+      setQryType(variableQuery.qryType);
+      setLabel(variableQuery.label ?? '');
+      setMetric(variableQuery.metric ?? '');
+      setLabelFilters(variableQuery.labelFilters ?? []);
+      setVarQuery(variableQuery.varQuery ?? '');
+      setSeriesQuery(variableQuery.seriesQuery ?? '');
+      setClassicQuery(variableQuery.classicQuery ?? '');
+    }
+  }, [query]);
+
+  // set the label names options for the label values var query
+  useEffect(() => {
+    if (qryType !== QueryType.LabelValues) {
+      return;
+    }
+    const variables = datasource.getVariables().map((variable: string) => ({ label: variable, value: variable }));
+    if (!metric) {
+      // get all the labels
+      datasource.getTagKeys({ filters: [] }).then((labelNames: Array<{ text: string }>) => {
+        const names = labelNames.map(({ text }) => ({ label: text, value: text }));
+        setLabelOptions([...variables, ...names]);
+      });
+    } else {
+      // fetch the labels filtered by the metric
+      const labelToConsider = [{ label: '__name__', op: '=', value: metric }];
+      const expr = promQueryModeller.renderLabels(labelToConsider);
+
+      datasource.languageProvider.fetchLabelsWithMatch(expr).then((labelsIndex: Record<string, string[]>) => {
+        const labelNames = Object.keys(labelsIndex);
+        const names = labelNames.map((value) => ({ label: value, value: value }));
+        setLabelOptions([...variables, ...names]);
+      });
+    }
+  }, [datasource, qryType, metric]);
+
+  const onChangeWithVariableString = (
+    updateVar: { [key: string]: QueryType | string },
+    updLabelFilters?: QueryBuilderLabelFilter[]
+  ) => {
+    const queryVar = {
+      qryType,
+      label,
+      metric,
+      match: labelNamesMatch,
+      varQuery,
+      seriesQuery,
+      classicQuery,
+      refId: 'PrometheusVariableQueryEditor-VariableQuery',
+    };
+
+    let updateLabelFilters = updLabelFilters ? { labelFilters: updLabelFilters } : { labelFilters: labelFilters };
+
+    const updatedVar = { ...queryVar, ...updateVar, ...updateLabelFilters };
+
+    const queryString = migrateVariableEditorBackToVariableSupport(updatedVar);
+
+    // setting query.query property allows for update of variable definition
+    onChange({
+      query: queryString,
+      qryType: updatedVar.qryType,
+      refId,
+    });
+  };
+
+  /** Call onchange for label names query type change */
+  const onQueryTypeChange = (newType: SelectableValue<QueryType>) => {
+    setQryType(newType.value);
+    if (newType.value !== QueryType.SeriesQuery) {
+      onChangeWithVariableString({ qryType: newType.value ?? 0 });
+    }
+  };
+
+  /** Call onchange for label select when query type is label values */
+  const onLabelChange = (newLabel: SelectableValue<string>) => {
+    const newLabelvalue = newLabel && newLabel.value ? newLabel.value : '';
+    setLabel(newLabelvalue);
+    if (qryType === QueryType.LabelValues && newLabelvalue) {
+      onChangeWithVariableString({ label: newLabelvalue });
+    }
+  };
+
+  /**
+   * Call onChange for MetricsLabels component change for label values query type
+   * if there is a label (required) and
+   * if the labels or metric are updated.
+   */
+  const metricsLabelsChange = (update: PromVisualQuery) => {
+    setMetric(update.metric);
+    setLabelFilters(update.labels);
+
+    const updMetric = update.metric;
+    const updLabelFilters = update.labels ?? [];
+
+    if (qryType === QueryType.LabelValues && label && (updMetric || updLabelFilters)) {
+      onChangeWithVariableString({ qryType, metric: updMetric }, updLabelFilters);
+    }
+  };
+
+  const onLabelNamesMatchChange = (regex: string) => {
+    if (qryType === QueryType.LabelNames) {
+      onChangeWithVariableString({ qryType, match: regex });
+    }
+  };
+
+  /**
+   * Call onchange for metric change if metrics names (regex) query type
+   * Debounce this because to not call the API for every keystroke.
+   */
+  const onMetricChange = (value: string) => {
+    if (qryType === QueryType.MetricNames && value) {
+      onChangeWithVariableString({ metric: value });
+    }
+  };
+
+  /**
+   *  Do not call onchange for variable query result when query type is var query result
+   *  because the query may not be finished typing and an error is returned
+   *  for incorrectly formatted series. Call onchange for blur instead.
+   */
+  const onVarQueryChange = (e: FormEvent<HTMLTextAreaElement>) => {
+    setVarQuery(e.currentTarget.value);
+  };
+
+  /**
+   *  Do not call onchange for seriesQuery when query type is series query
+   *  because the series may not be finished typing and an error is returned
+   *  for incorrectly formatted series. Call onchange for blur instead.
+   */
+  const onSeriesQueryChange = (e: FormEvent<HTMLInputElement>) => {
+    setSeriesQuery(e.currentTarget.value);
+  };
+
+  const onClassicQueryChange = (e: FormEvent<HTMLInputElement>) => {
+    setClassicQuery(e.currentTarget.value);
+  };
+
+  const promVisualQuery = useCallback(() => {
+    return { metric: metric, labels: labelFilters, operations: [] };
+  }, [metric, labelFilters]);
+
+  return (
+    <>
+      <InlineFieldRow>
+        <InlineField
+          label="Query type"
+          labelWidth={20}
+          tooltip={
+            <div>The Prometheus data source plugin provides the following query types for template variables.</div>
+          }
+        >
+          <Select
+            placeholder="Select query type"
+            aria-label="Query type"
+            onChange={onQueryTypeChange}
+            value={qryType}
+            options={variableOptions}
+            width={25}
+            data-testid={selectors.components.DataSource.Prometheus.variableQueryEditor.queryType}
+          />
+        </InlineField>
+      </InlineFieldRow>
+
+      {qryType === QueryType.LabelValues && (
+        <>
+          <InlineFieldRow>
+            <InlineField
+              label="Label"
+              labelWidth={20}
+              required
+              aria-labelledby="label-select"
+              tooltip={
+                <div>
+                  Returns a list of label values for the label name in all metrics unless the metric is specified.
+                </div>
+              }
+            >
+              <Select
+                aria-label="label-select"
+                onChange={onLabelChange}
+                value={label}
+                options={labelOptions}
+                width={25}
+                allowCustomValue
+                isClearable={true}
+                data-testid={selectors.components.DataSource.Prometheus.variableQueryEditor.labelValues.labelSelect}
+              />
+            </InlineField>
+          </InlineFieldRow>
+          {/* Used to select an optional metric with optional label filters */}
+          <MetricsLabelsSection
+            query={promVisualQuery()}
+            datasource={datasource}
+            onChange={metricsLabelsChange}
+            variableEditor={true}
+          />
+        </>
+      )}
+
+      {qryType === QueryType.LabelNames && (
+        <InlineFieldRow>
+          <InlineField
+            label="Metric regex"
+            labelWidth={20}
+            aria-labelledby="Metric regex"
+            tooltip={<div>Returns a list of label names, optionally filtering by specified metric regex.</div>}
+          >
+            <Input
+              type="text"
+              aria-label="Metric regex"
+              placeholder="Metric regex"
+              value={labelNamesMatch}
+              onBlur={(event) => {
+                setLabelNamesMatch(event.currentTarget.value);
+                onLabelNamesMatchChange(event.currentTarget.value);
+              }}
+              onChange={(e) => {
+                setLabelNamesMatch(e.currentTarget.value);
+              }}
+              width={25}
+              data-testid={selectors.components.DataSource.Prometheus.variableQueryEditor.labelnames.metricRegex}
+            />
+          </InlineField>
+        </InlineFieldRow>
+      )}
+
+      {qryType === QueryType.MetricNames && (
+        <InlineFieldRow>
+          <InlineField
+            label="Metric regex"
+            labelWidth={20}
+            aria-labelledby="Metric selector"
+            tooltip={<div>Returns a list of metrics matching the specified metric regex.</div>}
+          >
+            <Input
+              type="text"
+              aria-label="Metric selector"
+              placeholder="Metric regex"
+              value={metric}
+              onChange={(e) => {
+                setMetric(e.currentTarget.value);
+              }}
+              onBlur={(e) => {
+                setMetric(e.currentTarget.value);
+                onMetricChange(e.currentTarget.value);
+              }}
+              width={25}
+              data-testid={selectors.components.DataSource.Prometheus.variableQueryEditor.metricNames.metricRegex}
+            />
+          </InlineField>
+        </InlineFieldRow>
+      )}
+
+      {qryType === QueryType.VarQueryResult && (
+        <InlineFieldRow>
+          <InlineField
+            label="Query"
+            labelWidth={20}
+            tooltip={
+              <div>
+                Returns a list of Prometheus query results for the query. This can include Prometheus functions, i.e.
+                sum(go_goroutines).
+              </div>
+            }
+          >
+            <TextArea
+              type="text"
+              aria-label="Prometheus Query"
+              placeholder="Prometheus Query"
+              value={varQuery}
+              onChange={onVarQueryChange}
+              onBlur={() => {
+                if (qryType === QueryType.VarQueryResult && varQuery) {
+                  onChangeWithVariableString({ qryType });
+                }
+              }}
+              cols={100}
+              data-testid={selectors.components.DataSource.Prometheus.variableQueryEditor.varQueryResult}
+            />
+          </InlineField>
+        </InlineFieldRow>
+      )}
+
+      {qryType === QueryType.SeriesQuery && (
+        <InlineFieldRow>
+          <InlineField
+            label="Series Query"
+            labelWidth={20}
+            tooltip={
+              <div>
+                Enter enter a metric with labels, only a metric or only labels, i.e.
+                go_goroutines&#123;instance=&quot;localhost:9090&quot;&#125;, go_goroutines, or
+                &#123;instance=&quot;localhost:9090&quot;&#125;. Returns a list of time series associated with the
+                entered data.
+              </div>
+            }
+          >
+            <Input
+              type="text"
+              aria-label="Series Query"
+              placeholder="Series Query"
+              value={seriesQuery}
+              onChange={onSeriesQueryChange}
+              onBlur={() => {
+                if (qryType === QueryType.SeriesQuery && seriesQuery) {
+                  onChangeWithVariableString({ qryType });
+                }
+              }}
+              width={100}
+              data-testid={selectors.components.DataSource.Prometheus.variableQueryEditor.seriesQuery}
+            />
+          </InlineField>
+        </InlineFieldRow>
+      )}
+
+      {qryType === QueryType.ClassicQuery && (
+        <InlineFieldRow>
+          <InlineField
+            label="Classic Query"
+            labelWidth={20}
+            tooltip={
+              <div>
+                The original implemetation of the Prometheus variable query editor. Enter a string with the correct
+                query type and parameters as described in these docs. For example, label_values(label, metric).
+              </div>
+            }
+          >
+            <Input
+              type="text"
+              aria-label="Classic Query"
+              placeholder="Classic Query"
+              value={classicQuery}
+              onChange={onClassicQueryChange}
+              onBlur={() => {
+                if (qryType === QueryType.ClassicQuery && classicQuery) {
+                  onChangeWithVariableString({ qryType });
+                }
+              }}
+              width={100}
+              data-testid={selectors.components.DataSource.Prometheus.variableQueryEditor.classicQuery}
+            />
+          </InlineField>
+        </InlineFieldRow>
+      )}
+    </>
+  );
+};
+
+export function variableMigration(query: string | PromVariableQuery | StandardPromVariableQuery): PromVariableQuery {
+  if (typeof query === 'string') {
+    return migrateVariableQueryToEditor(query);
+  } else if (query.query) {
+    return migrateVariableQueryToEditor(query.query);
+  } else {
+    return query;
+  }
+}
diff --git a/packages/grafana-prometheus/src/components/monaco-query-field/MonacoQueryField.tsx b/packages/grafana-prometheus/src/components/monaco-query-field/MonacoQueryField.tsx
new file mode 100644
index 0000000000000..2404760aad8a6
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/monaco-query-field/MonacoQueryField.tsx
@@ -0,0 +1,324 @@
+import { css } from '@emotion/css';
+import { parser } from '@prometheus-io/lezer-promql';
+import { debounce } from 'lodash';
+import { promLanguageDefinition } from 'monaco-promql';
+import React, { useEffect, useRef } from 'react';
+import { useLatest } from 'react-use';
+import { v4 as uuidv4 } from 'uuid';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { Monaco, monacoTypes, ReactMonacoEditor, useTheme2 } from '@grafana/ui';
+
+import { Props } from './MonacoQueryFieldProps';
+import { getOverrideServices } from './getOverrideServices';
+import { getCompletionProvider, getSuggestOptions } from './monaco-completion-provider';
+import { placeHolderScopedVars, validateQuery } from './monaco-completion-provider/validation';
+import { language, languageConfiguration } from './promql';
+
+const options: monacoTypes.editor.IStandaloneEditorConstructionOptions = {
+  codeLens: false,
+  contextmenu: false,
+  // we need `fixedOverflowWidgets` because otherwise in grafana-dashboards
+  // the popup is clipped by the panel-visualizations.
+  fixedOverflowWidgets: true,
+  folding: false,
+  fontSize: 14,
+  lineDecorationsWidth: 8, // used as "padding-left"
+  lineNumbers: 'off',
+  minimap: { enabled: false },
+  overviewRulerBorder: false,
+  overviewRulerLanes: 0,
+  padding: {
+    // these numbers were picked so that visually this matches the previous version
+    // of the query-editor the best
+    top: 4,
+    bottom: 5,
+  },
+  renderLineHighlight: 'none',
+  scrollbar: {
+    vertical: 'hidden',
+    verticalScrollbarSize: 8, // used as "padding-right"
+    horizontal: 'hidden',
+    horizontalScrollbarSize: 0,
+    alwaysConsumeMouseWheel: false,
+  },
+  scrollBeyondLastLine: false,
+  suggest: getSuggestOptions(),
+  suggestFontSize: 12,
+  wordWrap: 'on',
+};
+
+// this number was chosen by testing various values. it might be necessary
+// because of the width of the border, not sure.
+//it needs to do 2 things:
+// 1. when the editor is single-line, it should make the editor height be visually correct
+// 2. when the editor is multi-line, the editor should not be "scrollable" (meaning,
+//    you do a scroll-movement in the editor, and it will scroll the content by a couple pixels
+//    up & down. this we want to avoid)
+const EDITOR_HEIGHT_OFFSET = 2;
+
+const PROMQL_LANG_ID = promLanguageDefinition.id;
+
+// we must only run the promql-setup code once
+let PROMQL_SETUP_STARTED = false;
+
+function ensurePromQL(monaco: Monaco) {
+  if (PROMQL_SETUP_STARTED === false) {
+    PROMQL_SETUP_STARTED = true;
+    const { aliases, extensions, mimetypes } = promLanguageDefinition;
+    monaco.languages.register({ id: PROMQL_LANG_ID, aliases, extensions, mimetypes });
+
+    // @ts-ignore
+    monaco.languages.setMonarchTokensProvider(PROMQL_LANG_ID, language);
+    // @ts-ignore
+    monaco.languages.setLanguageConfiguration(PROMQL_LANG_ID, languageConfiguration);
+  }
+}
+
+const getStyles = (theme: GrafanaTheme2, placeholder: string) => {
+  return {
+    container: css`
+      border-radius: ${theme.shape.radius.default};
+      border: 1px solid ${theme.components.input.borderColor};
+    `,
+    placeholder: css`
+      ::after {
+        content: '${placeholder}';
+        font-family: ${theme.typography.fontFamilyMonospace};
+        opacity: 0.6;
+      }
+    `,
+  };
+};
+
+const MonacoQueryField = (props: Props) => {
+  const id = uuidv4();
+
+  // we need only one instance of `overrideServices` during the lifetime of the react component
+  const overrideServicesRef = useRef(getOverrideServices());
+  const containerRef = useRef<HTMLDivElement>(null);
+  const { languageProvider, history, onBlur, onRunQuery, initialValue, placeholder, onChange, datasource } = props;
+
+  const lpRef = useLatest(languageProvider);
+  const historyRef = useLatest(history);
+  const onRunQueryRef = useLatest(onRunQuery);
+  const onBlurRef = useLatest(onBlur);
+  const onChangeRef = useLatest(onChange);
+
+  const autocompleteDisposeFun = useRef<(() => void) | null>(null);
+
+  const theme = useTheme2();
+  const styles = getStyles(theme, placeholder);
+
+  useEffect(() => {
+    // when we unmount, we unregister the autocomplete-function, if it was registered
+    return () => {
+      autocompleteDisposeFun.current?.();
+    };
+  }, []);
+
+  return (
+    <div
+      data-testid={selectors.components.QueryField.container}
+      className={styles.container}
+      // NOTE: we will be setting inline-style-width/height on this element
+      ref={containerRef}
+    >
+      <ReactMonacoEditor
+        overrideServices={overrideServicesRef.current}
+        options={options}
+        language="promql"
+        value={initialValue}
+        beforeMount={(monaco) => {
+          ensurePromQL(monaco);
+        }}
+        onMount={(editor, monaco) => {
+          const isEditorFocused = editor.createContextKey<boolean>('isEditorFocused' + id, false);
+          // we setup on-blur
+          editor.onDidBlurEditorWidget(() => {
+            isEditorFocused.set(false);
+            onBlurRef.current(editor.getValue());
+          });
+          editor.onDidFocusEditorText(() => {
+            isEditorFocused.set(true);
+          });
+
+          // we construct a DataProvider object
+          const getHistory = () =>
+            Promise.resolve(historyRef.current.map((h) => h.query.expr).filter((expr) => expr !== undefined));
+
+          const getAllMetricNames = () => {
+            const { metrics, metricsMetadata } = lpRef.current;
+            const result = metrics.map((m) => {
+              const metaItem = metricsMetadata?.[m];
+              return {
+                name: m,
+                help: metaItem?.help ?? '',
+                type: metaItem?.type ?? '',
+              };
+            });
+
+            return Promise.resolve(result);
+          };
+
+          const getAllLabelNames = () => Promise.resolve(lpRef.current.getLabelKeys());
+
+          const getLabelValues = (labelName: string) => lpRef.current.getLabelValues(labelName);
+
+          const getSeriesValues = lpRef.current.getSeriesValues;
+
+          const getSeriesLabels = lpRef.current.getSeriesLabels;
+
+          const dataProvider = {
+            getHistory,
+            getAllMetricNames,
+            getAllLabelNames,
+            getLabelValues,
+            getSeriesValues,
+            getSeriesLabels,
+          };
+          const completionProvider = getCompletionProvider(monaco, dataProvider);
+
+          // completion-providers in monaco are not registered directly to editor-instances,
+          // they are registered to languages. this makes it hard for us to have
+          // separate completion-providers for every query-field-instance
+          // (but we need that, because they might connect to different datasources).
+          // the trick we do is, we wrap the callback in a "proxy",
+          // and in the proxy, the first thing is, we check if we are called from
+          // "our editor instance", and if not, we just return nothing. if yes,
+          // we call the completion-provider.
+          const filteringCompletionProvider: monacoTypes.languages.CompletionItemProvider = {
+            ...completionProvider,
+            provideCompletionItems: (model, position, context, token) => {
+              // if the model-id does not match, then this call is from a different editor-instance,
+              // not "our instance", so return nothing
+              if (editor.getModel()?.id !== model.id) {
+                return { suggestions: [] };
+              }
+              return completionProvider.provideCompletionItems(model, position, context, token);
+            },
+          };
+
+          const { dispose } = monaco.languages.registerCompletionItemProvider(
+            PROMQL_LANG_ID,
+            filteringCompletionProvider
+          );
+
+          autocompleteDisposeFun.current = dispose;
+          // this code makes the editor resize itself so that the content fits
+          // (it will grow taller when necessary)
+          // FIXME: maybe move this functionality into CodeEditor, like:
+          // <CodeEditor resizingMode="single-line"/>
+          const updateElementHeight = () => {
+            const containerDiv = containerRef.current;
+            if (containerDiv !== null) {
+              const pixelHeight = editor.getContentHeight();
+              containerDiv.style.height = `${pixelHeight + EDITOR_HEIGHT_OFFSET}px`;
+              containerDiv.style.width = '100%';
+              const pixelWidth = containerDiv.clientWidth;
+              editor.layout({ width: pixelWidth, height: pixelHeight });
+            }
+          };
+
+          editor.onDidContentSizeChange(updateElementHeight);
+          updateElementHeight();
+
+          // Whenever the editor changes, lets save the last value so the next query for this editor will be up-to-date.
+          // This change is being introduced to fix a bug where you can submit a query via shift+enter:
+          // If you clicked into another field and haven't un-blurred the active field,
+          // then the query that is run will be stale, as the reference is only updated
+          // with the value of the last blurred input.
+          // This can run quite slowly, so we're debouncing this which should accomplish two things
+          // 1. Should prevent this function from blocking the current call stack by pushing into the web API callback queue
+          // 2. Should prevent a bunch of duplicates of this function being called as the user is typing
+          const updateCurrentEditorValue = debounce(() => {
+            const editorValue = editor.getValue();
+            onChangeRef.current(editorValue);
+          }, lpRef.current.datasource.getDebounceTimeInMilliseconds());
+
+          editor.getModel()?.onDidChangeContent(() => {
+            updateCurrentEditorValue();
+          });
+
+          // handle: shift + enter
+          // FIXME: maybe move this functionality into CodeEditor?
+          editor.addCommand(
+            monaco.KeyMod.Shift | monaco.KeyCode.Enter,
+            () => {
+              onRunQueryRef.current(editor.getValue());
+            },
+            'isEditorFocused' + id
+          );
+
+          /* Something in this configuration of monaco doesn't bubble up [mod]+K, which the
+                    command palette uses. Pass the event out of monaco manually
+                    */
+          editor.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyK, function () {
+            global.dispatchEvent(new KeyboardEvent('keydown', { key: 'k', metaKey: true }));
+          });
+
+          if (placeholder) {
+            const placeholderDecorators = [
+              {
+                range: new monaco.Range(1, 1, 1, 1),
+                options: {
+                  className: styles.placeholder,
+                  isWholeLine: true,
+                },
+              },
+            ];
+
+            let decorators: string[] = [];
+
+            const checkDecorators: () => void = () => {
+              const model = editor.getModel();
+
+              if (!model) {
+                return;
+              }
+
+              const newDecorators = model.getValueLength() === 0 ? placeholderDecorators : [];
+              decorators = model.deltaDecorations(decorators, newDecorators);
+            };
+
+            checkDecorators();
+            editor.onDidChangeModelContent(checkDecorators);
+
+            editor.onDidChangeModelContent((e) => {
+              const model = editor.getModel();
+              if (!model) {
+                return;
+              }
+              const query = model.getValue();
+              const errors =
+                validateQuery(
+                  query,
+                  datasource.interpolateString(query, placeHolderScopedVars),
+                  model.getLinesContent(),
+                  parser
+                ) || [];
+
+              const markers = errors.map(({ error, ...boundary }) => ({
+                message: `${
+                  error ? `Error parsing "${error}"` : 'Parse error'
+                }. The query appears to be incorrect and could fail to be executed.`,
+                severity: monaco.MarkerSeverity.Error,
+                ...boundary,
+              }));
+
+              monaco.editor.setModelMarkers(model, 'owner', markers);
+            });
+          }
+        }}
+      />
+    </div>
+  );
+};
+
+// we will lazy-load this module using React.lazy,
+// and that only supports default-exports,
+// so we have to default-export this, even if
+// it is against the style-guidelines.
+
+export default MonacoQueryField;
diff --git a/packages/grafana-prometheus/src/components/monaco-query-field/MonacoQueryFieldLazy.tsx b/packages/grafana-prometheus/src/components/monaco-query-field/MonacoQueryFieldLazy.tsx
new file mode 100644
index 0000000000000..797d48b6c2b5d
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/monaco-query-field/MonacoQueryFieldLazy.tsx
@@ -0,0 +1,14 @@
+import React, { Suspense } from 'react';
+
+import MonacoQueryField from './MonacoQueryField';
+import { Props } from './MonacoQueryFieldProps';
+
+// const Field = React.lazy(() => import('./MonacoQueryField'));
+
+export const MonacoQueryFieldLazy = (props: Props) => {
+  return (
+    <Suspense fallback={null}>
+      <MonacoQueryField {...props} />
+    </Suspense>
+  );
+};
diff --git a/packages/grafana-prometheus/src/components/monaco-query-field/MonacoQueryFieldProps.ts b/packages/grafana-prometheus/src/components/monaco-query-field/MonacoQueryFieldProps.ts
new file mode 100644
index 0000000000000..1383b565828cf
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/monaco-query-field/MonacoQueryFieldProps.ts
@@ -0,0 +1,21 @@
+import { HistoryItem } from '@grafana/data';
+
+import { PrometheusDatasource } from '../../datasource';
+import type PromQlLanguageProvider from '../../language_provider';
+import { PromQuery } from '../../types';
+
+// we need to store this in a separate file,
+// because we have an async-wrapper around,
+// the react-component, and it needs the same
+// props as the sync-component.
+export type Props = {
+  initialValue: string;
+  languageProvider: PromQlLanguageProvider;
+  history: Array<HistoryItem<PromQuery>>;
+  placeholder: string;
+  onRunQuery: (value: string) => void;
+  onBlur: (value: string) => void;
+  // onChange will never initiate a query, it just denotes that a query value has been changed
+  onChange: (value: string) => void;
+  datasource: PrometheusDatasource;
+};
diff --git a/packages/grafana-prometheus/src/components/monaco-query-field/MonacoQueryFieldWrapper.tsx b/packages/grafana-prometheus/src/components/monaco-query-field/MonacoQueryFieldWrapper.tsx
new file mode 100644
index 0000000000000..7f69ce5475891
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/monaco-query-field/MonacoQueryFieldWrapper.tsx
@@ -0,0 +1,34 @@
+import React, { useRef } from 'react';
+
+import { MonacoQueryFieldLazy } from './MonacoQueryFieldLazy';
+import { Props as MonacoProps } from './MonacoQueryFieldProps';
+
+type Props = Omit<MonacoProps, 'onRunQuery' | 'onBlur'> & {
+  onChange: (query: string) => void;
+  onRunQuery: () => void;
+};
+
+export const MonacoQueryFieldWrapper = (props: Props) => {
+  const lastRunValueRef = useRef<string | null>(null);
+  const { onRunQuery, onChange, ...rest } = props;
+
+  const handleRunQuery = (value: string) => {
+    lastRunValueRef.current = value;
+    onChange(value);
+    onRunQuery();
+  };
+
+  const handleBlur = (value: string) => {
+    onChange(value);
+  };
+
+  /**
+   * Handles changes without running any queries
+   * @param value
+   */
+  const handleChange = (value: string) => {
+    onChange(value);
+  };
+
+  return <MonacoQueryFieldLazy onChange={handleChange} onRunQuery={handleRunQuery} onBlur={handleBlur} {...rest} />;
+};
diff --git a/packages/grafana-prometheus/src/components/monaco-query-field/getOverrideServices.ts b/packages/grafana-prometheus/src/components/monaco-query-field/getOverrideServices.ts
new file mode 100644
index 0000000000000..b3bc45a3f579f
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/monaco-query-field/getOverrideServices.ts
@@ -0,0 +1,116 @@
+import { monacoTypes } from '@grafana/ui';
+
+// this thing here is a workaround in a way.
+// what we want to achieve, is that when the autocomplete-window
+// opens, the "second, extra popup" with the extra help,
+// also opens automatically.
+// but there is no API to achieve it.
+// the way to do it is to implement the `storageService`
+// interface, and provide our custom implementation,
+// which will default to `true` for the correct string-key.
+// unfortunately, while the typescript-interface exists,
+// it is not exported from monaco-editor,
+// so we cannot rely on typescript to make sure
+// we do it right. all we can do is to manually
+// lookup the interface, and make sure we code our code right.
+// our code is a "best effort" approach,
+// i am not 100% how the `scope` and `target` things work,
+// but so far it seems to work ok.
+// i would use an another approach, if there was one available.
+
+function makeStorageService() {
+  // we need to return an object that fulfills this interface:
+  // https://github.com/microsoft/vscode/blob/ff1e16eebb93af79fd6d7af1356c4003a120c563/src/vs/platform/storage/common/storage.ts#L37
+  // unfortunately it is not export from monaco-editor
+
+  const strings = new Map<string, string>();
+
+  // we want this to be true by default
+  strings.set('expandSuggestionDocs', true.toString());
+
+  return {
+    // we do not implement the on* handlers
+    onDidChangeValue: (data: unknown): void => undefined,
+    onDidChangeTarget: (data: unknown): void => undefined,
+    onWillSaveState: (data: unknown): void => undefined,
+
+    get: (key: string, scope: unknown, fallbackValue?: string): string | undefined => {
+      return strings.get(key) ?? fallbackValue;
+    },
+
+    getBoolean: (key: string, scope: unknown, fallbackValue?: boolean): boolean | undefined => {
+      const val = strings.get(key);
+      if (val !== undefined) {
+        // the interface-docs say the value will be converted
+        // to a boolean but do not specify how, so we improvise
+        return val === 'true';
+      } else {
+        return fallbackValue;
+      }
+    },
+
+    getNumber: (key: string, scope: unknown, fallbackValue?: number): number | undefined => {
+      const val = strings.get(key);
+      if (val !== undefined) {
+        return parseInt(val, 10);
+      } else {
+        return fallbackValue;
+      }
+    },
+
+    store: (
+      key: string,
+      value: string | boolean | number | undefined | null,
+      scope: unknown,
+      target: unknown
+    ): void => {
+      // the interface-docs say if the value is nullish, it should act as delete
+      if (value === null || value === undefined) {
+        strings.delete(key);
+      } else {
+        strings.set(key, value.toString());
+      }
+    },
+
+    remove: (key: string, scope: unknown): void => {
+      strings.delete(key);
+    },
+
+    keys: (scope: unknown, target: unknown): string[] => {
+      return Array.from(strings.keys());
+    },
+
+    logStorage: (): void => {
+      console.log('logStorage: not implemented');
+    },
+
+    migrate: (): Promise<void> => {
+      // we do not implement this
+      return Promise.resolve(undefined);
+    },
+
+    isNew: (scope: unknown): boolean => {
+      // we create a new storage for every session, we do not persist it,
+      // so we return `true`.
+      return true;
+    },
+
+    flush: (reason?: unknown): Promise<void> => {
+      // we do not implement this
+      return Promise.resolve(undefined);
+    },
+  };
+}
+
+let overrideServices: monacoTypes.editor.IEditorOverrideServices | null = null;
+
+export function getOverrideServices(): monacoTypes.editor.IEditorOverrideServices {
+  // only have one instance of this for every query editor
+  if (overrideServices === null) {
+    overrideServices = {
+      storageService: makeStorageService(),
+    };
+  }
+
+  return overrideServices;
+}
diff --git a/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/completions.ts b/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/completions.ts
new file mode 100644
index 0000000000000..fd9352bf28a5a
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/completions.ts
@@ -0,0 +1,208 @@
+import { escapeLabelValueInExactSelector } from '../../../language_utils';
+import { FUNCTIONS } from '../../../promql';
+
+import type { Label, Situation } from './situation';
+import { NeverCaseError } from './util';
+// FIXME: we should not load this from the "outside", but we cannot do that while we have the "old" query-field too
+
+export type CompletionType = 'HISTORY' | 'FUNCTION' | 'METRIC_NAME' | 'DURATION' | 'LABEL_NAME' | 'LABEL_VALUE';
+
+type Completion = {
+  type: CompletionType;
+  label: string;
+  insertText: string;
+  detail?: string;
+  documentation?: string;
+  triggerOnInsert?: boolean;
+};
+
+type Metric = {
+  name: string;
+  help: string;
+  type: string;
+};
+
+export type DataProvider = {
+  getHistory: () => Promise<string[]>;
+  getAllMetricNames: () => Promise<Metric[]>;
+  getAllLabelNames: () => Promise<string[]>;
+  getLabelValues: (labelName: string) => Promise<string[]>;
+  getSeriesValues: (name: string, match: string) => Promise<string[]>;
+  getSeriesLabels: (selector: string, otherLabels: Label[]) => Promise<string[]>;
+};
+
+// we order items like: history, functions, metrics
+
+async function getAllMetricNamesCompletions(dataProvider: DataProvider): Promise<Completion[]> {
+  const metrics = await dataProvider.getAllMetricNames();
+  return metrics.map((metric) => ({
+    type: 'METRIC_NAME',
+    label: metric.name,
+    insertText: metric.name,
+    detail: `${metric.name} : ${metric.type}`,
+    documentation: metric.help,
+  }));
+}
+
+const FUNCTION_COMPLETIONS: Completion[] = FUNCTIONS.map((f) => ({
+  type: 'FUNCTION',
+  label: f.label,
+  insertText: f.insertText ?? '', // i don't know what to do when this is nullish. it should not be.
+  detail: f.detail,
+  documentation: f.documentation,
+}));
+
+async function getAllFunctionsAndMetricNamesCompletions(dataProvider: DataProvider): Promise<Completion[]> {
+  const metricNames = await getAllMetricNamesCompletions(dataProvider);
+  return [...FUNCTION_COMPLETIONS, ...metricNames];
+}
+
+const DURATION_COMPLETIONS: Completion[] = [
+  '$__interval',
+  '$__range',
+  '$__rate_interval',
+  '1m',
+  '5m',
+  '10m',
+  '30m',
+  '1h',
+  '1d',
+].map((text) => ({
+  type: 'DURATION',
+  label: text,
+  insertText: text,
+}));
+
+async function getAllHistoryCompletions(dataProvider: DataProvider): Promise<Completion[]> {
+  // function getAllHistoryCompletions(queryHistory: PromHistoryItem[]): Completion[] {
+  // NOTE: the typescript types are wrong. historyItem.query.expr can be undefined
+  const allHistory = await dataProvider.getHistory();
+  // FIXME: find a better history-limit
+  return allHistory.slice(0, 10).map((expr) => ({
+    type: 'HISTORY',
+    label: expr,
+    insertText: expr,
+  }));
+}
+
+function makeSelector(metricName: string | undefined, labels: Label[]): string {
+  const allLabels = [...labels];
+
+  // we transform the metricName to a label, if it exists
+  if (metricName !== undefined) {
+    allLabels.push({ name: '__name__', value: metricName, op: '=' });
+  }
+
+  const allLabelTexts = allLabels.map(
+    (label) => `${label.name}${label.op}"${escapeLabelValueInExactSelector(label.value)}"`
+  );
+
+  return `{${allLabelTexts.join(',')}}`;
+}
+
+async function getLabelNames(
+  metric: string | undefined,
+  otherLabels: Label[],
+  dataProvider: DataProvider
+): Promise<string[]> {
+  if (metric === undefined && otherLabels.length === 0) {
+    // if there is no filtering, we have to use a special endpoint
+    return dataProvider.getAllLabelNames();
+  } else {
+    const selector = makeSelector(metric, otherLabels);
+    return await dataProvider.getSeriesLabels(selector, otherLabels);
+  }
+}
+
+async function getLabelNamesForCompletions(
+  metric: string | undefined,
+  suffix: string,
+  triggerOnInsert: boolean,
+  otherLabels: Label[],
+  dataProvider: DataProvider
+): Promise<Completion[]> {
+  const labelNames = await getLabelNames(metric, otherLabels, dataProvider);
+  return labelNames.map((text) => ({
+    type: 'LABEL_NAME',
+    label: text,
+    insertText: `${text}${suffix}`,
+    triggerOnInsert,
+  }));
+}
+
+async function getLabelNamesForSelectorCompletions(
+  metric: string | undefined,
+  otherLabels: Label[],
+  dataProvider: DataProvider
+): Promise<Completion[]> {
+  return getLabelNamesForCompletions(metric, '=', true, otherLabels, dataProvider);
+}
+
+async function getLabelNamesForByCompletions(
+  metric: string | undefined,
+  otherLabels: Label[],
+  dataProvider: DataProvider
+): Promise<Completion[]> {
+  return getLabelNamesForCompletions(metric, '', false, otherLabels, dataProvider);
+}
+
+async function getLabelValues(
+  metric: string | undefined,
+  labelName: string,
+  otherLabels: Label[],
+  dataProvider: DataProvider
+): Promise<string[]> {
+  if (metric === undefined && otherLabels.length === 0) {
+    // if there is no filtering, we have to use a special endpoint
+    return dataProvider.getLabelValues(labelName);
+  } else {
+    const selector = makeSelector(metric, otherLabels);
+    return await dataProvider.getSeriesValues(labelName, selector);
+  }
+}
+
+async function getLabelValuesForMetricCompletions(
+  metric: string | undefined,
+  labelName: string,
+  betweenQuotes: boolean,
+  otherLabels: Label[],
+  dataProvider: DataProvider
+): Promise<Completion[]> {
+  const values = await getLabelValues(metric, labelName, otherLabels, dataProvider);
+  return values.map((text) => ({
+    type: 'LABEL_VALUE',
+    label: text,
+    insertText: betweenQuotes ? text : `"${text}"`, // FIXME: escaping strange characters?
+  }));
+}
+
+export async function getCompletions(situation: Situation, dataProvider: DataProvider): Promise<Completion[]> {
+  switch (situation.type) {
+    case 'IN_DURATION':
+      return DURATION_COMPLETIONS;
+    case 'IN_FUNCTION':
+      return getAllFunctionsAndMetricNamesCompletions(dataProvider);
+    case 'AT_ROOT': {
+      return getAllFunctionsAndMetricNamesCompletions(dataProvider);
+    }
+    case 'EMPTY': {
+      const metricNames = await getAllMetricNamesCompletions(dataProvider);
+      const historyCompletions = await getAllHistoryCompletions(dataProvider);
+      return [...historyCompletions, ...FUNCTION_COMPLETIONS, ...metricNames];
+    }
+    case 'IN_LABEL_SELECTOR_NO_LABEL_NAME':
+      return getLabelNamesForSelectorCompletions(situation.metricName, situation.otherLabels, dataProvider);
+    case 'IN_GROUPING':
+      return getLabelNamesForByCompletions(situation.metricName, situation.otherLabels, dataProvider);
+    case 'IN_LABEL_SELECTOR_WITH_LABEL_NAME':
+      return getLabelValuesForMetricCompletions(
+        situation.metricName,
+        situation.labelName,
+        situation.betweenQuotes,
+        situation.otherLabels,
+        dataProvider
+      );
+    default:
+      throw new NeverCaseError(situation);
+  }
+}
diff --git a/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/index.ts b/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/index.ts
new file mode 100644
index 0000000000000..f9b6a2e2b47cf
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/index.ts
@@ -0,0 +1,113 @@
+import type { Monaco, monacoTypes } from '@grafana/ui';
+
+import { CompletionType, DataProvider, getCompletions } from './completions';
+import { getSituation } from './situation';
+import { NeverCaseError } from './util';
+
+export function getSuggestOptions(): monacoTypes.editor.ISuggestOptions {
+  return {
+    // monaco-editor sometimes provides suggestions automatically, i am not
+    // sure based on what, seems to be by analyzing the words already
+    // written.
+    // to try it out:
+    // - enter `go_goroutines{job~`
+    // - have the cursor at the end of the string
+    // - press ctrl-enter
+    // - you will get two suggestions
+    // those were not provided by grafana, they are offered automatically.
+    // i want to remove those. the only way i found is:
+    // - every suggestion-item has a `kind` attribute,
+    //   that controls the icon to the left of the suggestion.
+    // - items auto-generated by monaco have `kind` set to `text`.
+    // - we make sure grafana-provided suggestions do not have `kind` set to `text`.
+    // - and then we tell monaco not to show suggestions of kind `text`
+    showWords: false,
+  };
+}
+
+function getMonacoCompletionItemKind(type: CompletionType, monaco: Monaco): monacoTypes.languages.CompletionItemKind {
+  switch (type) {
+    case 'DURATION':
+      return monaco.languages.CompletionItemKind.Unit;
+    case 'FUNCTION':
+      return monaco.languages.CompletionItemKind.Variable;
+    case 'HISTORY':
+      return monaco.languages.CompletionItemKind.Snippet;
+    case 'LABEL_NAME':
+      return monaco.languages.CompletionItemKind.Enum;
+    case 'LABEL_VALUE':
+      return monaco.languages.CompletionItemKind.EnumMember;
+    case 'METRIC_NAME':
+      return monaco.languages.CompletionItemKind.Constructor;
+    default:
+      throw new NeverCaseError(type);
+  }
+}
+
+export function getCompletionProvider(
+  monaco: Monaco,
+  dataProvider: DataProvider
+): monacoTypes.languages.CompletionItemProvider {
+  const provideCompletionItems = (
+    model: monacoTypes.editor.ITextModel,
+    position: monacoTypes.Position
+  ): monacoTypes.languages.ProviderResult<monacoTypes.languages.CompletionList> => {
+    const word = model.getWordAtPosition(position);
+    const range =
+      word != null
+        ? monaco.Range.lift({
+            startLineNumber: position.lineNumber,
+            endLineNumber: position.lineNumber,
+            startColumn: word.startColumn,
+            endColumn: word.endColumn,
+          })
+        : monaco.Range.fromPositions(position);
+    // documentation says `position` will be "adjusted" in `getOffsetAt`
+    // i don't know what that means, to be sure i clone it
+
+    const positionClone = {
+      column: position.column,
+      lineNumber: position.lineNumber,
+    };
+
+    // Check to see if the browser supports window.getSelection()
+    if (window.getSelection) {
+      const selectedText = window.getSelection()?.toString();
+      // If the user has selected text, adjust the cursor position to be at the start of the selection, instead of the end
+      if (selectedText && selectedText.length > 0) {
+        positionClone.column = positionClone.column - selectedText.length;
+      }
+    }
+
+    const offset = model.getOffsetAt(positionClone);
+    const situation = getSituation(model.getValue(), offset);
+    const completionsPromise = situation != null ? getCompletions(situation, dataProvider) : Promise.resolve([]);
+    return completionsPromise.then((items) => {
+      // monaco by-default alphabetically orders the items.
+      // to stop it, we use a number-as-string sortkey,
+      // so that monaco keeps the order we use
+      const maxIndexDigits = items.length.toString().length;
+      const suggestions: monacoTypes.languages.CompletionItem[] = items.map((item, index) => ({
+        kind: getMonacoCompletionItemKind(item.type, monaco),
+        label: item.label,
+        insertText: item.insertText,
+        detail: item.detail,
+        documentation: item.documentation,
+        sortText: index.toString().padStart(maxIndexDigits, '0'), // to force the order we have
+        range,
+        command: item.triggerOnInsert
+          ? {
+              id: 'editor.action.triggerSuggest',
+              title: '',
+            }
+          : undefined,
+      }));
+      return { suggestions };
+    });
+  };
+
+  return {
+    triggerCharacters: ['{', ',', '[', '(', '=', '~', ' ', '"'],
+    provideCompletionItems,
+  };
+}
diff --git a/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/situation.test.ts b/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/situation.test.ts
new file mode 100644
index 0000000000000..8c7be6b592b09
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/situation.test.ts
@@ -0,0 +1,185 @@
+import { getSituation, Situation } from './situation';
+
+// we use the `^` character as the cursor-marker in the string.
+function assertSituation(situation: string, expectedSituation: Situation | null) {
+  // first we find the cursor-position
+  const pos = situation.indexOf('^');
+  if (pos === -1) {
+    throw new Error('cursor missing');
+  }
+
+  // we remove the cursor-marker from the string
+  const text = situation.replace('^', '');
+
+  // sanity check, make sure no more cursor-markers remain
+  if (text.indexOf('^') !== -1) {
+    throw new Error('multiple cursors');
+  }
+
+  const result = getSituation(text, pos);
+
+  if (expectedSituation === null) {
+    expect(result).toStrictEqual(null);
+  } else {
+    expect(result).toMatchObject(expectedSituation);
+  }
+}
+
+describe('situation', () => {
+  it('handles things', () => {
+    assertSituation('^', {
+      type: 'EMPTY',
+    });
+
+    assertSituation('sum(one) / ^', {
+      type: 'AT_ROOT',
+    });
+
+    assertSituation('sum(^)', {
+      type: 'IN_FUNCTION',
+    });
+
+    assertSituation('sum(one) / sum(^)', {
+      type: 'IN_FUNCTION',
+    });
+
+    assertSituation('something{}[^]', {
+      type: 'IN_DURATION',
+    });
+
+    assertSituation('something{label~^}', null);
+  });
+
+  it('handles label names', () => {
+    assertSituation('something{^}', {
+      type: 'IN_LABEL_SELECTOR_NO_LABEL_NAME',
+      metricName: 'something',
+      otherLabels: [],
+    });
+
+    assertSituation('sum(something) by (^)', {
+      type: 'IN_GROUPING',
+      metricName: 'something',
+      otherLabels: [],
+    });
+
+    assertSituation('sum by (^) (something)', {
+      type: 'IN_GROUPING',
+      metricName: 'something',
+      otherLabels: [],
+    });
+
+    assertSituation('something{one="val1",two!="val2",three=~"val3",four!~"val4",^}', {
+      type: 'IN_LABEL_SELECTOR_NO_LABEL_NAME',
+      metricName: 'something',
+      otherLabels: [
+        { name: 'one', value: 'val1', op: '=' },
+        { name: 'two', value: 'val2', op: '!=' },
+        { name: 'three', value: 'val3', op: '=~' },
+        { name: 'four', value: 'val4', op: '!~' },
+      ],
+    });
+
+    assertSituation('{^}', {
+      type: 'IN_LABEL_SELECTOR_NO_LABEL_NAME',
+      otherLabels: [],
+    });
+
+    assertSituation('{one="val1",^}', {
+      type: 'IN_LABEL_SELECTOR_NO_LABEL_NAME',
+      otherLabels: [{ name: 'one', value: 'val1', op: '=' }],
+    });
+
+    // single-quoted label-values with escape
+    assertSituation("{one='val\\'1',^}", {
+      type: 'IN_LABEL_SELECTOR_NO_LABEL_NAME',
+      otherLabels: [{ name: 'one', value: "val'1", op: '=' }],
+    });
+
+    // double-quoted label-values with escape
+    assertSituation('{one="val\\"1",^}', {
+      type: 'IN_LABEL_SELECTOR_NO_LABEL_NAME',
+      otherLabels: [{ name: 'one', value: 'val"1', op: '=' }],
+    });
+
+    // backticked label-values with escape (the escape should not be interpreted)
+    assertSituation('{one=`val\\"1`,^}', {
+      type: 'IN_LABEL_SELECTOR_NO_LABEL_NAME',
+      otherLabels: [{ name: 'one', value: 'val\\"1', op: '=' }],
+    });
+  });
+
+  it('handles label values', () => {
+    assertSituation('something{job=^}', {
+      type: 'IN_LABEL_SELECTOR_WITH_LABEL_NAME',
+      metricName: 'something',
+      labelName: 'job',
+      betweenQuotes: false,
+      otherLabels: [],
+    });
+
+    assertSituation('something{job!=^}', {
+      type: 'IN_LABEL_SELECTOR_WITH_LABEL_NAME',
+      metricName: 'something',
+      labelName: 'job',
+      betweenQuotes: false,
+      otherLabels: [],
+    });
+
+    assertSituation('something{job=~^}', {
+      type: 'IN_LABEL_SELECTOR_WITH_LABEL_NAME',
+      metricName: 'something',
+      labelName: 'job',
+      betweenQuotes: false,
+      otherLabels: [],
+    });
+
+    assertSituation('something{job!~^}', {
+      type: 'IN_LABEL_SELECTOR_WITH_LABEL_NAME',
+      metricName: 'something',
+      labelName: 'job',
+      betweenQuotes: false,
+      otherLabels: [],
+    });
+
+    assertSituation('something{job=^,host="h1"}', {
+      type: 'IN_LABEL_SELECTOR_WITH_LABEL_NAME',
+      metricName: 'something',
+      labelName: 'job',
+      betweenQuotes: false,
+      otherLabels: [{ name: 'host', value: 'h1', op: '=' }],
+    });
+
+    assertSituation('something{job="j1",host="^"}', {
+      type: 'IN_LABEL_SELECTOR_WITH_LABEL_NAME',
+      metricName: 'something',
+      labelName: 'host',
+      betweenQuotes: true,
+      otherLabels: [{ name: 'job', value: 'j1', op: '=' }],
+    });
+
+    assertSituation('something{job="j1"^}', null);
+    assertSituation('something{job="j1" ^ }', null);
+    assertSituation('something{job="j1" ^   ,   }', null);
+
+    assertSituation('{job=^,host="h1"}', {
+      type: 'IN_LABEL_SELECTOR_WITH_LABEL_NAME',
+      labelName: 'job',
+      betweenQuotes: false,
+      otherLabels: [{ name: 'host', value: 'h1', op: '=' }],
+    });
+
+    assertSituation('something{one="val1",two!="val2",three=^,four=~"val4",five!~"val5"}', {
+      type: 'IN_LABEL_SELECTOR_WITH_LABEL_NAME',
+      metricName: 'something',
+      labelName: 'three',
+      betweenQuotes: false,
+      otherLabels: [
+        { name: 'one', value: 'val1', op: '=' },
+        { name: 'two', value: 'val2', op: '!=' },
+        { name: 'four', value: 'val4', op: '=~' },
+        { name: 'five', value: 'val5', op: '!~' },
+      ],
+    });
+  });
+});
diff --git a/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/situation.ts b/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/situation.ts
new file mode 100644
index 0000000000000..e6f569fe80655
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/situation.ts
@@ -0,0 +1,569 @@
+import type { SyntaxNode, Tree } from '@lezer/common';
+import {
+  AggregateExpr,
+  AggregateModifier,
+  EqlRegex,
+  EqlSingle,
+  FunctionCallBody,
+  GroupingLabels,
+  Identifier,
+  LabelMatcher,
+  LabelMatchers,
+  LabelMatchList,
+  LabelName,
+  MatchOp,
+  MatrixSelector,
+  MetricIdentifier,
+  Neq,
+  NeqRegex,
+  parser,
+  PromQL,
+  StringLiteral,
+  VectorSelector,
+} from '@prometheus-io/lezer-promql';
+
+import { NeverCaseError } from './util';
+
+type Direction = 'parent' | 'firstChild' | 'lastChild' | 'nextSibling';
+
+type NodeTypeId =
+  | 0 // this is used as error-id
+  | typeof AggregateExpr
+  | typeof AggregateModifier
+  | typeof FunctionCallBody
+  | typeof GroupingLabels
+  | typeof Identifier
+  | typeof LabelMatcher
+  | typeof LabelMatchers
+  | typeof LabelMatchList
+  | typeof LabelName
+  | typeof MetricIdentifier
+  | typeof PromQL
+  | typeof StringLiteral
+  | typeof VectorSelector
+  | typeof MatrixSelector
+  | typeof MatchOp
+  | typeof EqlSingle
+  | typeof Neq
+  | typeof EqlRegex
+  | typeof NeqRegex;
+
+type Path = Array<[Direction, NodeTypeId]>;
+
+function move(node: SyntaxNode, direction: Direction): SyntaxNode | null {
+  switch (direction) {
+    case 'parent':
+      return node.parent;
+    case 'firstChild':
+      return node.firstChild;
+    case 'lastChild':
+      return node.lastChild;
+    case 'nextSibling':
+      return node.nextSibling;
+    default:
+      throw new NeverCaseError(direction);
+  }
+}
+
+function walk(node: SyntaxNode, path: Path): SyntaxNode | null {
+  let current: SyntaxNode | null = node;
+  for (const [direction, expectedType] of path) {
+    current = move(current, direction);
+    if (current === null) {
+      // we could not move in the direction, we stop
+      return null;
+    }
+    if (current.type.id !== expectedType) {
+      // the reached node has wrong type, we stop
+      return null;
+    }
+  }
+  return current;
+}
+
+function getNodeText(node: SyntaxNode, text: string): string {
+  return text.slice(node.from, node.to);
+}
+
+function parsePromQLStringLiteral(text: string): string {
+  // if it is a string-literal, it is inside quotes of some kind
+  const inside = text.slice(1, text.length - 1);
+
+  // FIXME: support https://prometheus.io/docs/prometheus/latest/querying/basics/#string-literals
+  // FIXME: maybe check other promql code, if all is supported or not
+
+  // for now we do only some very simple un-escaping
+
+  // we start with double-quotes
+  if (text.startsWith('"') && text.endsWith('"')) {
+    // NOTE: this is not 100% perfect, we only unescape the double-quote,
+    // there might be other characters too
+    return inside.replace(/\\"/, '"');
+  }
+
+  // then single-quote
+  if (text.startsWith("'") && text.endsWith("'")) {
+    // NOTE: this is not 100% perfect, we only unescape the single-quote,
+    // there might be other characters too
+    return inside.replace(/\\'/, "'");
+  }
+
+  // then backticks
+  if (text.startsWith('`') && text.endsWith('`')) {
+    return inside;
+  }
+
+  throw new Error('FIXME: invalid string literal');
+}
+
+type LabelOperator = '=' | '!=' | '=~' | '!~';
+
+export type Label = {
+  name: string;
+  value: string;
+  op: LabelOperator;
+};
+
+export type Situation =
+  | {
+      type: 'IN_FUNCTION';
+    }
+  | {
+      type: 'AT_ROOT';
+    }
+  | {
+      type: 'EMPTY';
+    }
+  | {
+      type: 'IN_DURATION';
+    }
+  | {
+      type: 'IN_LABEL_SELECTOR_NO_LABEL_NAME';
+      metricName?: string;
+      otherLabels: Label[];
+    }
+  | {
+      type: 'IN_GROUPING';
+      metricName: string;
+      otherLabels: Label[];
+    }
+  | {
+      type: 'IN_LABEL_SELECTOR_WITH_LABEL_NAME';
+      metricName?: string;
+      labelName: string;
+      betweenQuotes: boolean;
+      otherLabels: Label[];
+    };
+
+type Resolver = {
+  path: NodeTypeId[];
+  fun: (node: SyntaxNode, text: string, pos: number) => Situation | null;
+};
+
+function isPathMatch(resolverPath: NodeTypeId[], cursorPath: number[]): boolean {
+  return resolverPath.every((item, index) => item === cursorPath[index]);
+}
+
+const ERROR_NODE_NAME: NodeTypeId = 0; // this is used as error-id
+
+const RESOLVERS: Resolver[] = [
+  {
+    path: [LabelMatchers, VectorSelector],
+    fun: resolveLabelKeysWithEquals,
+  },
+  {
+    path: [PromQL],
+    fun: resolveTopLevel,
+  },
+  {
+    path: [FunctionCallBody],
+    fun: resolveInFunction,
+  },
+  {
+    path: [StringLiteral, LabelMatcher],
+    fun: resolveLabelMatcher,
+  },
+  {
+    path: [ERROR_NODE_NAME, LabelMatcher],
+    fun: resolveLabelMatcher,
+  },
+  {
+    path: [ERROR_NODE_NAME, MatrixSelector],
+    fun: resolveDurations,
+  },
+  {
+    path: [GroupingLabels],
+    fun: resolveLabelsForGrouping,
+  },
+];
+
+const LABEL_OP_MAP = new Map<number, LabelOperator>([
+  [EqlSingle, '='],
+  [EqlRegex, '=~'],
+  [Neq, '!='],
+  [NeqRegex, '!~'],
+]);
+
+function getLabelOp(opNode: SyntaxNode): LabelOperator | null {
+  const opChild = opNode.firstChild;
+  if (opChild === null) {
+    return null;
+  }
+
+  return LABEL_OP_MAP.get(opChild.type.id) ?? null;
+}
+
+function getLabel(labelMatcherNode: SyntaxNode, text: string): Label | null {
+  if (labelMatcherNode.type.id !== LabelMatcher) {
+    return null;
+  }
+
+  const nameNode = walk(labelMatcherNode, [['firstChild', LabelName]]);
+
+  if (nameNode === null) {
+    return null;
+  }
+
+  const opNode = walk(nameNode, [['nextSibling', MatchOp]]);
+  if (opNode === null) {
+    return null;
+  }
+
+  const op = getLabelOp(opNode);
+  if (op === null) {
+    return null;
+  }
+
+  const valueNode = walk(labelMatcherNode, [['lastChild', StringLiteral]]);
+
+  if (valueNode === null) {
+    return null;
+  }
+
+  const name = getNodeText(nameNode, text);
+  const value = parsePromQLStringLiteral(getNodeText(valueNode, text));
+
+  return { name, value, op };
+}
+
+function getLabels(labelMatchersNode: SyntaxNode, text: string): Label[] {
+  if (labelMatchersNode.type.id !== LabelMatchers) {
+    return [];
+  }
+
+  let listNode: SyntaxNode | null = walk(labelMatchersNode, [['firstChild', LabelMatchList]]);
+
+  const labels: Label[] = [];
+
+  while (listNode !== null) {
+    const matcherNode = walk(listNode, [['lastChild', LabelMatcher]]);
+    if (matcherNode === null) {
+      // unexpected, we stop
+      return [];
+    }
+
+    const label = getLabel(matcherNode, text);
+    if (label !== null) {
+      labels.push(label);
+    }
+
+    // there might be more labels
+    listNode = walk(listNode, [['firstChild', LabelMatchList]]);
+  }
+
+  // our labels-list is last-first, so we reverse it
+  labels.reverse();
+
+  return labels;
+}
+
+function getNodeChildren(node: SyntaxNode): SyntaxNode[] {
+  let child: SyntaxNode | null = node.firstChild;
+  const children: SyntaxNode[] = [];
+  while (child !== null) {
+    children.push(child);
+    child = child.nextSibling;
+  }
+  return children;
+}
+
+function getNodeInSubtree(node: SyntaxNode, typeId: NodeTypeId): SyntaxNode | null {
+  // first we try the current node
+  if (node.type.id === typeId) {
+    return node;
+  }
+
+  // then we try the children
+  const children = getNodeChildren(node);
+  for (const child of children) {
+    const n = getNodeInSubtree(child, typeId);
+    if (n !== null) {
+      return n;
+    }
+  }
+
+  return null;
+}
+
+function resolveLabelsForGrouping(node: SyntaxNode, text: string, pos: number): Situation | null {
+  const aggrExpNode = walk(node, [
+    ['parent', AggregateModifier],
+    ['parent', AggregateExpr],
+  ]);
+  if (aggrExpNode === null) {
+    return null;
+  }
+  const bodyNode = aggrExpNode.getChild(FunctionCallBody);
+  if (bodyNode === null) {
+    return null;
+  }
+
+  const metricIdNode = getNodeInSubtree(bodyNode, MetricIdentifier);
+  if (metricIdNode === null) {
+    return null;
+  }
+
+  const idNode = walk(metricIdNode, [['firstChild', Identifier]]);
+  if (idNode === null) {
+    return null;
+  }
+
+  const metricName = getNodeText(idNode, text);
+  return {
+    type: 'IN_GROUPING',
+    metricName,
+    otherLabels: [],
+  };
+}
+
+function resolveLabelMatcher(node: SyntaxNode, text: string, pos: number): Situation | null {
+  // we can arrive here in two situation. `node` is either:
+  // - a StringNode (like in `{job="^"}`)
+  // - or an error node (like in `{job=^}`)
+  const inStringNode = !node.type.isError;
+
+  const parent = walk(node, [['parent', LabelMatcher]]);
+  if (parent === null) {
+    return null;
+  }
+
+  const labelNameNode = walk(parent, [['firstChild', LabelName]]);
+  if (labelNameNode === null) {
+    return null;
+  }
+
+  const labelName = getNodeText(labelNameNode, text);
+
+  // now we need to go up, to the parent of LabelMatcher,
+  // there can be one or many `LabelMatchList` parents, we have
+  // to go through all of them
+
+  const firstListNode = walk(parent, [['parent', LabelMatchList]]);
+  if (firstListNode === null) {
+    return null;
+  }
+
+  let listNode = firstListNode;
+
+  // we keep going through the parent-nodes
+  // as long as they are LabelMatchList.
+  // as soon as we reawch LabelMatchers, we stop
+  let labelMatchersNode: SyntaxNode | null = null;
+  while (labelMatchersNode === null) {
+    const p = listNode.parent;
+    if (p === null) {
+      return null;
+    }
+
+    const { id } = p.type;
+
+    switch (id) {
+      case LabelMatchList:
+        //we keep looping
+        listNode = p;
+        continue;
+      case LabelMatchers:
+        // we reached the end, we can stop the loop
+        labelMatchersNode = p;
+        continue;
+      default:
+        // we reached some other node, we stop
+        return null;
+    }
+  }
+
+  // now we need to find the other names
+  const allLabels = getLabels(labelMatchersNode, text);
+
+  // we need to remove "our" label from all-labels, if it is in there
+  const otherLabels = allLabels.filter((label) => label.name !== labelName);
+
+  const metricNameNode = walk(labelMatchersNode, [
+    ['parent', VectorSelector],
+    ['firstChild', MetricIdentifier],
+    ['firstChild', Identifier],
+  ]);
+
+  if (metricNameNode === null) {
+    // we are probably in a situation without a metric name
+    return {
+      type: 'IN_LABEL_SELECTOR_WITH_LABEL_NAME',
+      labelName,
+      betweenQuotes: inStringNode,
+      otherLabels,
+    };
+  }
+
+  const metricName = getNodeText(metricNameNode, text);
+
+  return {
+    type: 'IN_LABEL_SELECTOR_WITH_LABEL_NAME',
+    metricName,
+    labelName,
+    betweenQuotes: inStringNode,
+    otherLabels,
+  };
+}
+
+function resolveTopLevel(node: SyntaxNode, text: string, pos: number): Situation {
+  return {
+    type: 'AT_ROOT',
+  };
+}
+
+function resolveInFunction(node: SyntaxNode, text: string, pos: number): Situation {
+  return {
+    type: 'IN_FUNCTION',
+  };
+}
+
+function resolveDurations(node: SyntaxNode, text: string, pos: number): Situation {
+  return {
+    type: 'IN_DURATION',
+  };
+}
+
+function subTreeHasError(node: SyntaxNode): boolean {
+  return getNodeInSubtree(node, ERROR_NODE_NAME) !== null;
+}
+
+function resolveLabelKeysWithEquals(node: SyntaxNode, text: string, pos: number): Situation | null {
+  // for example `something{^}`
+
+  // there are some false positives that can end up in this situation, that we want
+  // to eliminate:
+  // `something{a~^}` (if this subtree contains any error-node, we stop)
+  if (subTreeHasError(node)) {
+    return null;
+  }
+
+  // next false positive:
+  // `something{a="1"^}`
+  const child = walk(node, [['firstChild', LabelMatchList]]);
+  if (child !== null) {
+    // means the label-matching part contains at least one label already.
+    //
+    // in this case, we will need to have a `,` character at the end,
+    // to be able to suggest adding the next label.
+    // the area between the end-of-the-child-node and the cursor-pos
+    // must contain a `,` in this case.
+    const textToCheck = text.slice(child.to, pos);
+
+    if (!textToCheck.includes(',')) {
+      return null;
+    }
+  }
+
+  const metricNameNode = walk(node, [
+    ['parent', VectorSelector],
+    ['firstChild', MetricIdentifier],
+    ['firstChild', Identifier],
+  ]);
+
+  const otherLabels = getLabels(node, text);
+
+  if (metricNameNode === null) {
+    // we are probably in a situation without a metric name.
+    return {
+      type: 'IN_LABEL_SELECTOR_NO_LABEL_NAME',
+      otherLabels,
+    };
+  }
+
+  const metricName = getNodeText(metricNameNode, text);
+
+  return {
+    type: 'IN_LABEL_SELECTOR_NO_LABEL_NAME',
+    metricName,
+    otherLabels,
+  };
+}
+
+// we find the first error-node in the tree that is at the cursor-position.
+// NOTE: this might be too slow, might need to optimize it
+// (ideas: we do not need to go into every subtree, based on from/to)
+// also, only go to places that are in the sub-tree of the node found
+// by default by lezer. problem is, `next()` will go upward too,
+// and we do not want to go higher than our node
+function getErrorNode(tree: Tree, pos: number): SyntaxNode | null {
+  const cur = tree.cursorAt(pos);
+  while (true) {
+    if (cur.from === pos && cur.to === pos) {
+      const { node } = cur;
+      if (node.type.isError) {
+        return node;
+      }
+    }
+
+    if (!cur.next()) {
+      break;
+    }
+  }
+  return null;
+}
+
+export function getSituation(text: string, pos: number): Situation | null {
+  // there is a special-case when we are at the start of writing text,
+  // so we handle that case first
+
+  if (text === '') {
+    return {
+      type: 'EMPTY',
+    };
+  }
+
+  /*
+      PromQL
+    Expr
+    VectorSelector
+    LabelMatchers
+    */
+  const tree = parser.parse(text);
+
+  // if the tree contains error, it is very probable that
+  // our node is one of those error-nodes.
+  // also, if there are errors, the node lezer finds us,
+  // might not be the best node.
+  // so first we check if there is an error-node at the cursor-position
+  // @ts-ignore
+  const maybeErrorNode = getErrorNode(tree, pos);
+
+  const cur = maybeErrorNode != null ? maybeErrorNode.cursor() : tree.cursorAt(pos);
+  const currentNode = cur.node;
+
+  const ids = [cur.type.id];
+  while (cur.parent()) {
+    ids.push(cur.type.id);
+  }
+
+  for (let resolver of RESOLVERS) {
+    // i do not use a foreach because i want to stop as soon
+    // as i find something
+    if (isPathMatch(resolver.path, ids)) {
+      // @ts-ignore
+      return resolver.fun(currentNode, text, pos);
+    }
+  }
+
+  return null;
+}
diff --git a/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/util.ts b/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/util.ts
new file mode 100644
index 0000000000000..35babca0d09c9
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/util.ts
@@ -0,0 +1,25 @@
+// this helper class is used to make typescript warn you when you forget
+// a case-block in a switch statement.
+// example code that triggers the typescript-error:
+//
+// const x:'A'|'B'|'C' = 'A';
+//
+// switch(x) {
+//   case 'A':
+//     // something
+//   case 'B':
+//     // something
+//   default:
+//     throw new NeverCaseError(x);
+// }
+//
+//
+// typescript will show an error in this case,
+// when you add the missing `case 'C'` code,
+// the problem will be fixed.
+
+export class NeverCaseError extends Error {
+  constructor(value: never) {
+    super('should never happen');
+  }
+}
diff --git a/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/validation.test.ts b/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/validation.test.ts
new file mode 100644
index 0000000000000..c51c764e8fa8a
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/validation.test.ts
@@ -0,0 +1,85 @@
+import { parser } from '@prometheus-io/lezer-promql';
+
+import { validateQuery } from './validation';
+
+describe('Monaco Query Validation', () => {
+  test('Identifies empty queries as valid', () => {
+    expect(validateQuery('', '', [], parser)).toBeFalsy();
+  });
+
+  test.each([
+    'access_evaluation_duration_sum{job="grafana"}',
+    'http_requests_total{job="apiserver", handler="/api/comments"}[5m]',
+    'http_requests_total{job=~".*server"}',
+    'rate(http_requests_total[5m])[30m:1m]',
+    'max_over_time(deriv(rate(distance_covered_total[5s])[30s:5s])[10m:])',
+    'rate(http_requests_total[5m])',
+    'topk(3, sum by (app, proc) (rate(instance_cpu_time_ns[5m])))',
+  ])('Identifies valid queries', (query: string) => {
+    expect(validateQuery(query, query, [], parser)).toBeFalsy();
+  });
+
+  test('Identifies invalid queries', () => {
+    // Missing } at the end
+    let query = 'access_evaluation_duration_sum{job="grafana"';
+    expect(validateQuery(query, query, [query], parser)).toEqual([
+      {
+        endColumn: 45,
+        endLineNumber: 1,
+        error: '{job="grafana"',
+        startColumn: 31,
+        startLineNumber: 1,
+      },
+    ]);
+
+    // Missing handler="value"
+    query = 'http_requests_total{job="apiserver", handler}[5m]';
+    expect(validateQuery(query, query, [query], parser)).toEqual([
+      {
+        endColumn: 45,
+        endLineNumber: 1,
+        error: 'handler',
+        startColumn: 38,
+        startLineNumber: 1,
+      },
+    ]);
+
+    // Missing : in [30s:5s]
+    query = 'max_over_time(deriv(rate(distance_covered_total[5s])[30s5s])[10m:])';
+    expect(validateQuery(query, query, [query], parser)).toEqual([
+      {
+        endColumn: 60,
+        endLineNumber: 1,
+        error: 'rate(distance_covered_total[5s])[30s5s]',
+        startColumn: 21,
+        startLineNumber: 1,
+      },
+    ]);
+  });
+
+  test('Identifies valid multi-line queries', () => {
+    const query = `
+sum by (job) (
+    rate(http_requests_total[5m])
+)`;
+    const queryLines = query.split('\n');
+    expect(validateQuery(query, query, queryLines, parser)).toBeFalsy();
+  });
+
+  test('Identifies invalid multi-line queries', () => {
+    const query = `
+sum by (job) (
+    rate(http_requests_total[])
+)`;
+    const queryLines = query.split('\n');
+    expect(validateQuery(query, query, queryLines, parser)).toEqual([
+      {
+        endColumn: 30,
+        endLineNumber: 3,
+        error: '',
+        startColumn: 30,
+        startLineNumber: 3,
+      },
+    ]);
+  });
+});
diff --git a/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/validation.ts b/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/validation.ts
new file mode 100644
index 0000000000000..8b9cb8e6766aa
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/validation.ts
@@ -0,0 +1,126 @@
+import { SyntaxNode } from '@lezer/common';
+import { LRParser } from '@lezer/lr';
+
+// Although 0 isn't explicitly provided in the @grafana/lezer-logql library as the error node ID, it does appear to be the ID of error nodes within lezer.
+export const ErrorId = 0;
+
+interface ParserErrorBoundary {
+  startLineNumber: number;
+  startColumn: number;
+  endLineNumber: number;
+  endColumn: number;
+  error: string;
+}
+
+interface ParseError {
+  text: string;
+  node: SyntaxNode;
+}
+
+/**
+ * Conceived to work in combination with the MonacoQueryField component.
+ * Given an original query, and it's interpolated version, it will return an array of ParserErrorBoundary
+ * objects containing nodes which are actual errors. The interpolated version (even with placeholder variables)
+ * is required because variables look like errors for Lezer.
+ * @internal
+ */
+export function validateQuery(
+  query: string,
+  interpolatedQuery: string,
+  queryLines: string[],
+  parser: LRParser
+): ParserErrorBoundary[] | false {
+  if (!query) {
+    return false;
+  }
+
+  /**
+   * To provide support to variable interpolation in query validation, we run the parser in the interpolated
+   * query. If there are errors there, we trace them back to the original unparsed query, so we can more
+   * accurately highlight the error in the query, since it's likely that the variable name and variable value
+   * have different lengths. With this, we also exclude irrelevant parser errors that are produced by
+   * lezer not understanding $variables and $__variables, which usually generate 2 or 3 error SyntaxNode.
+   */
+  const interpolatedErrors: ParseError[] = parseQuery(interpolatedQuery, parser);
+  if (!interpolatedErrors.length) {
+    return false;
+  }
+
+  let parseErrors: ParseError[] = interpolatedErrors;
+  if (query !== interpolatedQuery) {
+    const queryErrors: ParseError[] = parseQuery(query, parser);
+    parseErrors = interpolatedErrors.flatMap(
+      (interpolatedError) =>
+        queryErrors.filter((queryError) => interpolatedError.text === queryError.text) || interpolatedError
+    );
+  }
+
+  return parseErrors.map((parseError) => findErrorBoundary(query, queryLines, parseError)).filter(isErrorBoundary);
+}
+
+function parseQuery(query: string, parser: LRParser) {
+  const parseErrors: ParseError[] = [];
+  const tree = parser.parse(query);
+  tree.iterate({
+    enter: (nodeRef): false | void => {
+      if (nodeRef.type.id === ErrorId) {
+        const node = nodeRef.node;
+        parseErrors.push({
+          node: node,
+          text: query.substring(node.from, node.to),
+        });
+      }
+    },
+  });
+  return parseErrors;
+}
+
+function findErrorBoundary(query: string, queryLines: string[], parseError: ParseError): ParserErrorBoundary | null {
+  if (queryLines.length === 1) {
+    const isEmptyString = parseError.node.from === parseError.node.to;
+    const errorNode = isEmptyString && parseError.node.parent ? parseError.node.parent : parseError.node;
+    const error = isEmptyString ? query.substring(errorNode.from, errorNode.to) : parseError.text;
+    return {
+      startLineNumber: 1,
+      startColumn: errorNode.from + 1,
+      endLineNumber: 1,
+      endColumn: errorNode.to + 1,
+      error,
+    };
+  }
+
+  let startPos = 0,
+    endPos = 0;
+  for (let line = 0; line < queryLines.length; line++) {
+    endPos = startPos + queryLines[line].length;
+
+    if (parseError.node.from > endPos) {
+      startPos += queryLines[line].length + 1;
+      continue;
+    }
+
+    return {
+      startLineNumber: line + 1,
+      startColumn: parseError.node.from - startPos + 1,
+      endLineNumber: line + 1,
+      endColumn: parseError.node.to - startPos + 1,
+      error: parseError.text,
+    };
+  }
+
+  return null;
+}
+
+function isErrorBoundary(boundary: ParserErrorBoundary | null): boundary is ParserErrorBoundary {
+  return boundary !== null;
+}
+
+export const placeHolderScopedVars = {
+  __interval: { text: '1s', value: '1s' },
+  __rate_interval: { text: '1s', value: '1s' },
+  __auto: { text: '1s', value: '1s' },
+  __interval_ms: { text: '1000', value: 1000 },
+  __range_ms: { text: '1000', value: 1000 },
+  __range_s: { text: '1', value: 1 },
+  __range: { text: '1s', value: '1s' },
+};
diff --git a/packages/grafana-prometheus/src/components/monaco-query-field/promql.ts b/packages/grafana-prometheus/src/components/monaco-query-field/promql.ts
new file mode 100644
index 0000000000000..af7ab116c9503
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/monaco-query-field/promql.ts
@@ -0,0 +1,247 @@
+// The MIT License (MIT)
+//
+// Copyright (c) Celian Garcia and Augustin Husson @ Amadeus IT Group
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+'use strict';
+// import { languages } from "monaco-editor";
+// noinspection JSUnusedGlobalSymbols
+export const languageConfiguration = {
+  // the default separators except `@$`
+  wordPattern: /(-?\d*\.\d\w*)|([^`~!#%^&*()\-=+\[{\]}\\|;:'",.<>\/?\s]+)/g,
+  // Not possible to make comments in PromQL syntax
+  comments: {
+    lineComment: '#',
+  },
+  brackets: [
+    ['{', '}'],
+    ['[', ']'],
+    ['(', ')'],
+  ],
+  autoClosingPairs: [
+    { open: '{', close: '}' },
+    { open: '[', close: ']' },
+    { open: '(', close: ')' },
+    { open: '"', close: '"' },
+    { open: "'", close: "'" },
+  ],
+  surroundingPairs: [
+    { open: '{', close: '}' },
+    { open: '[', close: ']' },
+    { open: '(', close: ')' },
+    { open: '"', close: '"' },
+    { open: "'", close: "'" },
+    { open: '<', close: '>' },
+  ],
+  folding: {},
+};
+// PromQL Aggregation Operators
+// (https://prometheus.io/docs/prometheus/latest/querying/operators/#aggregation-operators)
+const aggregations = [
+  'sum',
+  'min',
+  'max',
+  'avg',
+  'group',
+  'stddev',
+  'stdvar',
+  'count',
+  'count_values',
+  'bottomk',
+  'topk',
+  'quantile',
+];
+// PromQL functions
+// (https://prometheus.io/docs/prometheus/latest/querying/functions/)
+const functions = [
+  'abs',
+  'absent',
+  'ceil',
+  'changes',
+  'clamp_max',
+  'clamp_min',
+  'day_of_month',
+  'day_of_week',
+  'days_in_month',
+  'delta',
+  'deriv',
+  'exp',
+  'floor',
+  'histogram_quantile',
+  'holt_winters',
+  'hour',
+  'idelta',
+  'increase',
+  'irate',
+  'label_join',
+  'label_replace',
+  'ln',
+  'log2',
+  'log10',
+  'minute',
+  'month',
+  'predict_linear',
+  'rate',
+  'resets',
+  'round',
+  'scalar',
+  'sort',
+  'sort_desc',
+  'sqrt',
+  'time',
+  'timestamp',
+  'vector',
+  'year',
+];
+// PromQL specific functions: Aggregations over time
+// (https://prometheus.io/docs/prometheus/latest/querying/functions/#aggregation_over_time)
+const aggregationsOverTime = [];
+for (let _i = 0, aggregations_1 = aggregations; _i < aggregations_1.length; _i++) {
+  let agg = aggregations_1[_i];
+  aggregationsOverTime.push(agg + '_over_time');
+}
+// PromQL vector matching + the by and without clauses
+// (https://prometheus.io/docs/prometheus/latest/querying/operators/#vector-matching)
+const vectorMatching = ['on', 'ignoring', 'group_right', 'group_left', 'by', 'without'];
+// Produce a regex matching elements : (elt1|elt2|...)
+const vectorMatchingRegex =
+  '(' +
+  vectorMatching.reduce(function (prev, curr) {
+    return prev + '|' + curr;
+  }) +
+  ')';
+// PromQL Operators
+// (https://prometheus.io/docs/prometheus/latest/querying/operators/)
+const operators = ['+', '-', '*', '/', '%', '^', '==', '!=', '>', '<', '>=', '<=', 'and', 'or', 'unless'];
+// PromQL offset modifier
+// (https://prometheus.io/docs/prometheus/latest/querying/basics/#offset-modifier)
+const offsetModifier = ['offset'];
+// Merging all the keywords in one list
+const keywords = aggregations
+  .concat(functions)
+  .concat(aggregationsOverTime)
+  .concat(vectorMatching)
+  .concat(offsetModifier);
+// noinspection JSUnusedGlobalSymbols
+export const language = {
+  ignoreCase: false,
+  defaultToken: '',
+  tokenPostfix: '.promql',
+  keywords: keywords,
+  operators: operators,
+  vectorMatching: vectorMatchingRegex,
+  // we include these common regular expressions
+  symbols: /[=><!~?:&|+\-*\/^%]+/,
+  escapes: /\\(?:[abfnrtv\\"']|x[0-9A-Fa-f]{1,4}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})/,
+  digits: /\d+(_+\d+)*/,
+  octaldigits: /[0-7]+(_+[0-7]+)*/,
+  binarydigits: /[0-1]+(_+[0-1]+)*/,
+  hexdigits: /[[0-9a-fA-F]+(_+[0-9a-fA-F]+)*/,
+  integersuffix: /(ll|LL|u|U|l|L)?(ll|LL|u|U|l|L)?/,
+  floatsuffix: /[fFlL]?/,
+  // The main tokenizer for our languages
+  tokenizer: {
+    root: [
+      // 'by', 'without' and vector matching
+      [/@vectorMatching\s*(?=\()/, 'type', '@clauses'],
+      // labels
+      [/[a-z_]\w*(?=\s*(=|!=|=~|!~))/, 'tag'],
+      // comments
+      [/(^#.*$)/, 'comment'],
+      // all keywords have the same color
+      [
+        /[a-zA-Z_]\w*/,
+        {
+          cases: {
+            '@keywords': 'type',
+            '@default': 'identifier',
+          },
+        },
+      ],
+      // strings
+      [/"([^"\\]|\\.)*$/, 'string.invalid'],
+      [/'([^'\\]|\\.)*$/, 'string.invalid'],
+      [/"/, 'string', '@string_double'],
+      [/'/, 'string', '@string_single'],
+      [/`/, 'string', '@string_backtick'],
+      // whitespace
+      { include: '@whitespace' },
+      // delimiters and operators
+      [/[{}()\[\]]/, '@brackets'],
+      [/[<>](?!@symbols)/, '@brackets'],
+      [
+        /@symbols/,
+        {
+          cases: {
+            '@operators': 'delimiter',
+            '@default': '',
+          },
+        },
+      ],
+      // numbers
+      [/\d+[smhdwy]/, 'number'],
+      [/\d*\d+[eE]([\-+]?\d+)?(@floatsuffix)/, 'number.float'],
+      [/\d*\.\d+([eE][\-+]?\d+)?(@floatsuffix)/, 'number.float'],
+      [/0[xX][0-9a-fA-F']*[0-9a-fA-F](@integersuffix)/, 'number.hex'],
+      [/0[0-7']*[0-7](@integersuffix)/, 'number.octal'],
+      [/0[bB][0-1']*[0-1](@integersuffix)/, 'number.binary'],
+      [/\d[\d']*\d(@integersuffix)/, 'number'],
+      [/\d(@integersuffix)/, 'number'],
+    ],
+    string_double: [
+      [/[^\\"]+/, 'string'],
+      [/@escapes/, 'string.escape'],
+      [/\\./, 'string.escape.invalid'],
+      [/"/, 'string', '@pop'],
+    ],
+    string_single: [
+      [/[^\\']+/, 'string'],
+      [/@escapes/, 'string.escape'],
+      [/\\./, 'string.escape.invalid'],
+      [/'/, 'string', '@pop'],
+    ],
+    string_backtick: [
+      [/[^\\`$]+/, 'string'],
+      [/@escapes/, 'string.escape'],
+      [/\\./, 'string.escape.invalid'],
+      [/`/, 'string', '@pop'],
+    ],
+    clauses: [
+      [/[^(,)]/, 'tag'],
+      [/\)/, 'identifier', '@pop'],
+    ],
+    whitespace: [[/[ \t\r\n]+/, 'white']],
+  },
+};
+// noinspection JSUnusedGlobalSymbols
+// export const completionItemProvider = {
+//     provideCompletionItems: function () {
+//         // To simplify, we made the choice to never create automatically the parenthesis behind keywords
+//         // It is because in PromQL, some keywords need parenthesis behind, some don't, some can have but it's optional.
+//         const suggestions = keywords.map(function (value) {
+//             return {
+//                 label: value,
+//                 kind: languages.CompletionItemKind.Keyword,
+//                 insertText: value,
+//                 insertTextRules: languages.CompletionItemInsertTextRule.InsertAsSnippet
+//             };
+//         });
+//         return { suggestions: suggestions };
+//     }
+// };
diff --git a/packages/grafana-prometheus/src/components/types.ts b/packages/grafana-prometheus/src/components/types.ts
new file mode 100644
index 0000000000000..419b86ea5bd3b
--- /dev/null
+++ b/packages/grafana-prometheus/src/components/types.ts
@@ -0,0 +1,6 @@
+import { QueryEditorProps } from '@grafana/data';
+
+import { PrometheusDatasource } from '../datasource';
+import { PromOptions, PromQuery } from '../types';
+
+export type PromQueryEditorProps = QueryEditorProps<PrometheusDatasource, PromQuery, PromOptions>;
diff --git a/packages/grafana-prometheus/src/configuration/AlertingSettingsOverhaul.tsx b/packages/grafana-prometheus/src/configuration/AlertingSettingsOverhaul.tsx
new file mode 100644
index 0000000000000..11bbe3d2361c6
--- /dev/null
+++ b/packages/grafana-prometheus/src/configuration/AlertingSettingsOverhaul.tsx
@@ -0,0 +1,61 @@
+import { cx } from '@emotion/css';
+import React from 'react';
+
+import { DataSourceJsonData, DataSourcePluginOptionsEditorProps } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { ConfigSubSection } from '@grafana/experimental';
+import { InlineField, Switch, useTheme2 } from '@grafana/ui';
+
+import { docsTip, overhaulStyles } from './ConfigEditor';
+
+interface Props<T extends DataSourceJsonData>
+  extends Pick<DataSourcePluginOptionsEditorProps<T>, 'options' | 'onOptionsChange'> {}
+
+interface AlertingConfig extends DataSourceJsonData {
+  manageAlerts?: boolean;
+}
+
+export function AlertingSettingsOverhaul<T extends AlertingConfig>({
+  options,
+  onOptionsChange,
+}: Props<T>): JSX.Element {
+  const theme = useTheme2();
+  // imported GrafanaTheme2 from @grafana/data does not match type of same from @grafana/ui
+  // @ts-ignore
+  const styles = overhaulStyles(theme);
+
+  return (
+    <ConfigSubSection title="Alerting" className={cx(styles.container, styles.alertingTop)}>
+      <div className="gf-form-group">
+        <div className="gf-form-inline">
+          <div className="gf-form">
+            <InlineField
+              labelWidth={30}
+              label="Manage alerts via Alerting UI"
+              disabled={options.readOnly}
+              tooltip={
+                <>
+                  Manage alert rules for this data source. To manage other alerting resources, add an Alertmanager data
+                  source. {docsTip()}
+                </>
+              }
+              interactive={true}
+              className={styles.switchField}
+            >
+              <Switch
+                value={options.jsonData.manageAlerts !== false}
+                onChange={(event) =>
+                  onOptionsChange({
+                    ...options,
+                    jsonData: { ...options.jsonData, manageAlerts: event!.currentTarget.checked },
+                  })
+                }
+                id={selectors.components.DataSource.Prometheus.configPage.manageAlerts}
+              />
+            </InlineField>
+          </div>
+        </div>
+      </div>
+    </ConfigSubSection>
+  );
+}
diff --git a/packages/grafana-prometheus/src/configuration/ConfigEditor.test.tsx b/packages/grafana-prometheus/src/configuration/ConfigEditor.test.tsx
new file mode 100644
index 0000000000000..9ce9e66c563b4
--- /dev/null
+++ b/packages/grafana-prometheus/src/configuration/ConfigEditor.test.tsx
@@ -0,0 +1,93 @@
+import React from 'react';
+
+import { FieldValidationMessage } from '@grafana/ui';
+
+import { validateInput } from './ConfigEditor';
+import { DURATION_REGEX, MULTIPLE_DURATION_REGEX } from './PromSettings';
+
+const VALID_URL_REGEX = /^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/;
+
+const error = <FieldValidationMessage>Value is not valid</FieldValidationMessage>;
+// replaces promSettingsValidationEvents to display a <FieldValidationMessage> onBlur for duration input errors
+describe('promSettings validateInput', () => {
+  it.each`
+    value    | expected
+    ${'1ms'} | ${true}
+    ${'1M'}  | ${true}
+    ${'1w'}  | ${true}
+    ${'1d'}  | ${true}
+    ${'1h'}  | ${true}
+    ${'1m'}  | ${true}
+    ${'1s'}  | ${true}
+    ${'1y'}  | ${true}
+  `(
+    "Single duration regex, when calling the rule with correct formatted value: '$value' then result should be '$expected'",
+    ({ value, expected }) => {
+      expect(validateInput(value, DURATION_REGEX)).toBe(expected);
+    }
+  );
+
+  it.each`
+    value      | expected
+    ${'1M 2s'} | ${true}
+    ${'1w 2d'} | ${true}
+    ${'1d 2m'} | ${true}
+    ${'1h 2m'} | ${true}
+    ${'1m 2s'} | ${true}
+  `(
+    "Multiple duration regex, when calling the rule with correct formatted value: '$value' then result should be '$expected'",
+    ({ value, expected }) => {
+      expect(validateInput(value, MULTIPLE_DURATION_REGEX)).toBe(expected);
+    }
+  );
+
+  it.each`
+    value     | expected
+    ${'1 ms'} | ${error}
+    ${'1x'}   | ${error}
+    ${' '}    | ${error}
+    ${'w'}    | ${error}
+    ${'1.0s'} | ${error}
+  `(
+    "when calling the rule with incorrect formatted value: '$value' then result should be '$expected'",
+    ({ value, expected }) => {
+      expect(validateInput(value, DURATION_REGEX)).toStrictEqual(expected);
+    }
+  );
+
+  it.each`
+    value          | expected
+    ${'frp://'}    | ${error}
+    ${'htp://'}    | ${error}
+    ${'httpss:??'} | ${error}
+    ${'http@//'}   | ${error}
+    ${'http:||'}   | ${error}
+    ${'http://'}   | ${error}
+    ${'https://'}  | ${error}
+    ${'ftp://'}    | ${error}
+  `(
+    "Url incorrect formatting, when calling the rule with correct formatted value: '$value' then result should be '$expected'",
+    ({ value, expected }) => {
+      expect(validateInput(value, VALID_URL_REGEX)).toStrictEqual(expected);
+    }
+  );
+
+  it.each`
+    value                | expected
+    ${'ftp://example'}   | ${true}
+    ${'http://example'}  | ${true}
+    ${'https://example'} | ${true}
+  `(
+    "Url correct formatting, when calling the rule with correct formatted value: '$value' then result should be '$expected'",
+    ({ value, expected }) => {
+      expect(validateInput(value, VALID_URL_REGEX)).toBe(expected);
+    }
+  );
+
+  it('should display a custom validation message', () => {
+    const invalidDuration = 'invalid';
+    const customMessage = 'This is invalid';
+    const errorWithCustomMessage = <FieldValidationMessage>{customMessage}</FieldValidationMessage>;
+    expect(validateInput(invalidDuration, DURATION_REGEX, customMessage)).toStrictEqual(errorWithCustomMessage);
+  });
+});
diff --git a/packages/grafana-prometheus/src/configuration/ConfigEditor.tsx b/packages/grafana-prometheus/src/configuration/ConfigEditor.tsx
new file mode 100644
index 0000000000000..86a6f68725387
--- /dev/null
+++ b/packages/grafana-prometheus/src/configuration/ConfigEditor.tsx
@@ -0,0 +1,139 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { DataSourcePluginOptionsEditorProps, GrafanaTheme2 } from '@grafana/data';
+import { ConfigSection, DataSourceDescription, AdvancedHttpSettings } from '@grafana/experimental';
+import { config } from '@grafana/runtime';
+import { Alert, FieldValidationMessage, useTheme2 } from '@grafana/ui';
+
+import { PromOptions } from '../types';
+
+import { AlertingSettingsOverhaul } from './AlertingSettingsOverhaul';
+import { DataSourceHttpSettingsOverhaul } from './DataSourceHttpSettingsOverhaul';
+import { PromSettings } from './PromSettings';
+
+export const PROM_CONFIG_LABEL_WIDTH = 30;
+
+export type PrometheusConfigProps = DataSourcePluginOptionsEditorProps<PromOptions>;
+
+export const ConfigEditor = (props: PrometheusConfigProps) => {
+  const { options, onOptionsChange } = props;
+  const theme = useTheme2();
+  const styles = overhaulStyles(theme);
+
+  return (
+    <>
+      {options.access === 'direct' && (
+        <Alert title="Error" severity="error">
+          Browser access mode in the Prometheus data source is no longer available. Switch to server access mode.
+        </Alert>
+      )}
+      <DataSourceDescription
+        dataSourceName="Prometheus"
+        docsLink="https://grafana.com/docs/grafana/latest/datasources/prometheus/configure-prometheus-data-source/"
+      />
+      <hr className={`${styles.hrTopSpace} ${styles.hrBottomSpace}`} />
+      <DataSourceHttpSettingsOverhaul
+        options={options}
+        onOptionsChange={onOptionsChange}
+        secureSocksDSProxyEnabled={config.secureSocksDSProxyEnabled}
+      />
+      <hr />
+      <ConfigSection
+        className={styles.advancedSettings}
+        title="Advanced settings"
+        description="Additional settings are optional settings that can be configured for more control over your data source."
+      >
+        <AdvancedHttpSettings
+          className={styles.advancedHTTPSettingsMargin}
+          config={options}
+          onChange={onOptionsChange}
+        />
+        <AlertingSettingsOverhaul<PromOptions> options={options} onOptionsChange={onOptionsChange} />
+        <PromSettings options={options} onOptionsChange={onOptionsChange} />
+      </ConfigSection>
+    </>
+  );
+};
+
+/**
+ * Use this to return a url in a tooltip in a field. Don't forget to make the field interactive to be able to click on the tooltip
+ * @param url
+ * @returns
+ */
+export function docsTip(url?: string) {
+  const docsUrl = 'https://grafana.com/docs/grafana/latest/datasources/prometheus/#configure-the-data-source';
+
+  return (
+    <a href={url ? url : docsUrl} target="_blank" rel="noopener noreferrer">
+      Visit docs for more details here.
+    </a>
+  );
+}
+
+export const validateInput = (
+  input: string,
+  pattern: string | RegExp,
+  errorMessage?: string
+): boolean | JSX.Element => {
+  const defaultErrorMessage = 'Value is not valid';
+  if (input && !input.match(pattern)) {
+    return <FieldValidationMessage>{errorMessage ? errorMessage : defaultErrorMessage}</FieldValidationMessage>;
+  } else {
+    return true;
+  }
+};
+
+export function overhaulStyles(theme: GrafanaTheme2) {
+  return {
+    additionalSettings: css`
+      margin-bottom: 25px;
+    `,
+    secondaryGrey: css`
+      color: ${theme.colors.secondary.text};
+      opacity: 65%;
+    `,
+    inlineError: css`
+      margin: 0px 0px 4px 245px;
+    `,
+    switchField: css`
+      align-items: center;
+    `,
+    sectionHeaderPadding: css`
+      padding-top: 32px;
+    `,
+    sectionBottomPadding: css`
+      padding-bottom: 28px;
+    `,
+    subsectionText: css`
+      font-size: 12px;
+    `,
+    hrBottomSpace: css`
+      margin-bottom: 56px;
+    `,
+    hrTopSpace: css`
+      margin-top: 50px;
+    `,
+    textUnderline: css`
+      text-decoration: underline;
+    `,
+    versionMargin: css`
+      margin-bottom: 12px;
+    `,
+    advancedHTTPSettingsMargin: css`
+      margin: 24px 0 8px 0;
+    `,
+    advancedSettings: css`
+      padding-top: 32px;
+    `,
+    alertingTop: css`
+      margin-top: 40px !important;
+    `,
+    overhaulPageHeading: css`
+      font-weight: 400;
+    `,
+    container: css`
+      maxwidth: 578;
+    `,
+  };
+}
diff --git a/packages/grafana-prometheus/src/configuration/DataSourceHttpSettingsOverhaul.tsx b/packages/grafana-prometheus/src/configuration/DataSourceHttpSettingsOverhaul.tsx
new file mode 100644
index 0000000000000..86af446174066
--- /dev/null
+++ b/packages/grafana-prometheus/src/configuration/DataSourceHttpSettingsOverhaul.tsx
@@ -0,0 +1,97 @@
+import React from 'react';
+
+import { DataSourceSettings } from '@grafana/data';
+import { Auth, AuthMethod, ConnectionSettings, convertLegacyAuthProps } from '@grafana/experimental';
+import { SecureSocksProxySettings, useTheme2 } from '@grafana/ui';
+
+import { PromOptions } from '../types';
+
+import { docsTip, overhaulStyles } from './ConfigEditor';
+
+export type DataSourceHttpSettingsProps = {
+  options: DataSourceSettings<PromOptions, {}>;
+  onOptionsChange: (options: DataSourceSettings<PromOptions, {}>) => void;
+  secureSocksDSProxyEnabled: boolean;
+};
+
+export const DataSourceHttpSettingsOverhaul = (props: DataSourceHttpSettingsProps) => {
+  const { options, onOptionsChange, secureSocksDSProxyEnabled } = props;
+
+  const newAuthProps = convertLegacyAuthProps({
+    config: options,
+    onChange: onOptionsChange,
+  });
+
+  const theme = useTheme2();
+  const styles = overhaulStyles(theme);
+
+  function returnSelectedMethod() {
+    return newAuthProps.selectedMethod;
+  }
+
+  // Do we need this switch anymore? Update the language.
+  let urlTooltip;
+  switch (options.access) {
+    case 'direct':
+      urlTooltip = (
+        <>
+          Your access method is <em>Browser</em>, this means the URL needs to be accessible from the browser.
+          {docsTip()}
+        </>
+      );
+      break;
+    case 'proxy':
+      urlTooltip = (
+        <>
+          Your access method is <em>Server</em>, this means the URL needs to be accessible from the grafana
+          backend/server.
+          {docsTip()}
+        </>
+      );
+      break;
+    default:
+      urlTooltip = <>Specify a complete HTTP URL (for example http://your_server:8080) {docsTip()}</>;
+  }
+
+  return (
+    <>
+      <ConnectionSettings
+        urlPlaceholder="http://localhost:9090"
+        config={options}
+        onChange={onOptionsChange}
+        urlLabel="Prometheus server URL"
+        urlTooltip={urlTooltip}
+      />
+      <hr className={`${styles.hrTopSpace} ${styles.hrBottomSpace}`} />
+      <Auth
+        // Reshaped legacy props
+        {...newAuthProps}
+        // Still need to call `onAuthMethodSelect` function from
+        // `newAuthProps` to store the legacy data correctly.
+        // Also make sure to store the data about your component
+        // being selected/unselected.
+        onAuthMethodSelect={(method) => {
+          onOptionsChange({
+            ...options,
+            basicAuth: method === AuthMethod.BasicAuth,
+            withCredentials: method === AuthMethod.CrossSiteCredentials,
+            jsonData: {
+              ...options.jsonData,
+              oauthPassThru: method === AuthMethod.OAuthForward,
+            },
+          });
+        }}
+        // If your method is selected pass its id to `selectedMethod`,
+        // otherwise pass the id from converted legacy data
+        selectedMethod={returnSelectedMethod()}
+      />
+      <div className={styles.sectionBottomPadding} />
+      {secureSocksDSProxyEnabled && (
+        <>
+          <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
+          <div className={styles.sectionBottomPadding} />
+        </>
+      )}
+    </>
+  );
+};
diff --git a/packages/grafana-prometheus/src/configuration/ExemplarSetting.tsx b/packages/grafana-prometheus/src/configuration/ExemplarSetting.tsx
new file mode 100644
index 0000000000000..75614934cf5ae
--- /dev/null
+++ b/packages/grafana-prometheus/src/configuration/ExemplarSetting.tsx
@@ -0,0 +1,150 @@
+import React, { useState } from 'react';
+
+import { DataSourceInstanceSettings } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { DataSourcePicker } from '@grafana/runtime';
+import { Button, InlineField, Input, Switch, useTheme2 } from '@grafana/ui';
+
+import { ExemplarTraceIdDestination } from '../types';
+
+import { docsTip, overhaulStyles, PROM_CONFIG_LABEL_WIDTH } from './ConfigEditor';
+
+type Props = {
+  value: ExemplarTraceIdDestination;
+  onChange: (value: ExemplarTraceIdDestination) => void;
+  onDelete: () => void;
+  disabled?: boolean;
+};
+
+export function ExemplarSetting({ value, onChange, onDelete, disabled }: Props) {
+  const [isInternalLink, setIsInternalLink] = useState(Boolean(value.datasourceUid));
+
+  const theme = useTheme2();
+  const styles = overhaulStyles(theme);
+
+  return (
+    <div className="gf-form-group">
+      <InlineField
+        label="Internal link"
+        labelWidth={PROM_CONFIG_LABEL_WIDTH}
+        disabled={disabled}
+        tooltip={
+          <>
+            Enable this option if you have an internal link. When enabled, this reveals the data source selector. Select
+            the backend tracing data store for your exemplar data. {docsTip()}
+          </>
+        }
+        interactive={true}
+        className={styles.switchField}
+      >
+        <>
+          <Switch
+            value={isInternalLink}
+            data-testid={selectors.components.DataSource.Prometheus.configPage.internalLinkSwitch}
+            onChange={(ev) => setIsInternalLink(ev.currentTarget.checked)}
+          />
+        </>
+      </InlineField>
+
+      {isInternalLink ? (
+        <InlineField
+          label="Data source"
+          labelWidth={PROM_CONFIG_LABEL_WIDTH}
+          tooltip={<>The data source the exemplar is going to navigate to. {docsTip()}</>}
+          disabled={disabled}
+          interactive={true}
+        >
+          <DataSourcePicker
+            tracing={true}
+            current={value.datasourceUid}
+            noDefault={true}
+            width={40}
+            onChange={(ds: DataSourceInstanceSettings) =>
+              onChange({
+                ...value,
+                datasourceUid: ds.uid,
+                url: undefined,
+              })
+            }
+          />
+        </InlineField>
+      ) : (
+        <InlineField
+          label="URL"
+          labelWidth={PROM_CONFIG_LABEL_WIDTH}
+          tooltip={<>The URL of the trace backend the user would go to see its trace. {docsTip()}</>}
+          disabled={disabled}
+          interactive={true}
+        >
+          <Input
+            placeholder="https://example.com/${__value.raw}"
+            spellCheck={false}
+            width={40}
+            value={value.url}
+            onChange={(event) =>
+              onChange({
+                ...value,
+                datasourceUid: undefined,
+                url: event.currentTarget.value,
+              })
+            }
+          />
+        </InlineField>
+      )}
+
+      <InlineField
+        label="URL Label"
+        labelWidth={PROM_CONFIG_LABEL_WIDTH}
+        tooltip={<>Use to override the button label on the exemplar traceID field. {docsTip()}</>}
+        disabled={disabled}
+        interactive={true}
+      >
+        <Input
+          placeholder="Go to example.com"
+          spellCheck={false}
+          width={40}
+          value={value.urlDisplayLabel}
+          onChange={(event) =>
+            onChange({
+              ...value,
+              urlDisplayLabel: event.currentTarget.value,
+            })
+          }
+        />
+      </InlineField>
+      <InlineField
+        label="Label name"
+        labelWidth={PROM_CONFIG_LABEL_WIDTH}
+        tooltip={<>The name of the field in the labels object that should be used to get the traceID. {docsTip()}</>}
+        disabled={disabled}
+        interactive={true}
+      >
+        <Input
+          placeholder="traceID"
+          spellCheck={false}
+          width={40}
+          value={value.name}
+          onChange={(event) =>
+            onChange({
+              ...value,
+              name: event.currentTarget.value,
+            })
+          }
+        />
+      </InlineField>
+      {!disabled && (
+        <InlineField label="Remove exemplar link" labelWidth={PROM_CONFIG_LABEL_WIDTH} disabled={disabled}>
+          <Button
+            variant="destructive"
+            title="Remove exemplar link"
+            icon="times"
+            onClick={(event) => {
+              event.preventDefault();
+              onDelete();
+            }}
+          />
+        </InlineField>
+      )}
+    </div>
+  );
+}
diff --git a/packages/grafana-prometheus/src/configuration/ExemplarsSettings.tsx b/packages/grafana-prometheus/src/configuration/ExemplarsSettings.tsx
new file mode 100644
index 0000000000000..6ffece606a0c1
--- /dev/null
+++ b/packages/grafana-prometheus/src/configuration/ExemplarsSettings.tsx
@@ -0,0 +1,67 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { selectors } from '@grafana/e2e-selectors';
+import { ConfigSubSection } from '@grafana/experimental';
+import { Button, useTheme2 } from '@grafana/ui';
+
+import { ExemplarTraceIdDestination } from '../types';
+
+import { overhaulStyles } from './ConfigEditor';
+import { ExemplarSetting } from './ExemplarSetting';
+
+type Props = {
+  options?: ExemplarTraceIdDestination[];
+  onChange: (value: ExemplarTraceIdDestination[]) => void;
+  disabled?: boolean;
+};
+
+export function ExemplarsSettings({ options, onChange, disabled }: Props) {
+  const theme = useTheme2();
+  const styles = overhaulStyles(theme);
+  return (
+    <div className={styles.sectionBottomPadding}>
+      <ConfigSubSection title="Exemplars" className={styles.container}>
+        {options &&
+          options.map((option, index) => {
+            return (
+              <ExemplarSetting
+                key={index}
+                value={option}
+                onChange={(newField) => {
+                  const newOptions = [...options];
+                  newOptions.splice(index, 1, newField);
+                  onChange(newOptions);
+                }}
+                onDelete={() => {
+                  const newOptions = [...options];
+                  newOptions.splice(index, 1);
+                  onChange(newOptions);
+                }}
+                disabled={disabled}
+              />
+            );
+          })}
+
+        {!disabled && (
+          <Button
+            variant="secondary"
+            data-testid={selectors.components.DataSource.Prometheus.configPage.exemplarsAddButton}
+            className={css`
+              margin-bottom: 10px;
+            `}
+            icon="plus"
+            onClick={(event) => {
+              event.preventDefault();
+              const newOptions = [...(options || []), { name: 'traceID' }];
+              onChange(newOptions);
+            }}
+          >
+            Add
+          </Button>
+        )}
+        {disabled && !options && <i>No exemplars configurations</i>}
+      </ConfigSubSection>
+    </div>
+  );
+}
diff --git a/packages/grafana-prometheus/src/configuration/PromFlavorVersions.ts b/packages/grafana-prometheus/src/configuration/PromFlavorVersions.ts
new file mode 100644
index 0000000000000..bce2dd88a87b9
--- /dev/null
+++ b/packages/grafana-prometheus/src/configuration/PromFlavorVersions.ts
@@ -0,0 +1,99 @@
+export const PromFlavorVersions: { [index: string]: Array<{ value?: string; label: string }> } = {
+  Prometheus: [
+    { value: undefined, label: 'Please select' },
+    { value: '2.0.0', label: '< 2.14.x' },
+    { value: '2.14.0', label: '2.14.x' },
+    { value: '2.15.0', label: '2.15.x' },
+    { value: '2.16.0', label: '2.16.x' },
+    { value: '2.17.0', label: '2.17.x' },
+    { value: '2.18.0', label: '2.18.x' },
+    { value: '2.19.0', label: '2.19.x' },
+    { value: '2.20.0', label: '2.20.x' },
+    { value: '2.21.0', label: '2.21.x' },
+    { value: '2.22.0', label: '2.22.x' },
+    { value: '2.23.0', label: '2.23.x' },
+    { value: '2.24.0', label: '2.24.x' },
+    { value: '2.25.0', label: '2.25.x' },
+    { value: '2.26.0', label: '2.26.x' },
+    { value: '2.27.0', label: '2.27.x' },
+    { value: '2.28.0', label: '2.28.x' },
+    { value: '2.29.0', label: '2.29.x' },
+    { value: '2.30.0', label: '2.30.x' },
+    { value: '2.31.0', label: '2.31.x' },
+    { value: '2.32.0', label: '2.32.x' },
+    { value: '2.33.0', label: '2.33.x' },
+    { value: '2.34.0', label: '2.34.x' },
+    { value: '2.35.0', label: '2.35.x' },
+    { value: '2.36.0', label: '2.36.x' },
+    { value: '2.37.0', label: '2.37.x' },
+    { value: '2.38.0', label: '2.38.x' },
+    { value: '2.39.0', label: '2.39.x' },
+    { value: '2.40.0', label: '2.40.x' },
+    { value: '2.41.0', label: '2.41.x' },
+    { value: '2.42.0', label: '2.42.x' },
+    { value: '2.43.0', label: '2.43.x' },
+    { value: '2.44.0', label: '2.44.x' },
+    { value: '2.45.0', label: '2.45.x' },
+    { value: '2.46.0', label: '2.46.x' },
+    { value: '2.47.0', label: '2.47.x' },
+    { value: '2.48.0', label: '2.48.x' },
+    { value: '2.49.0', label: '2.49.x' },
+    { value: '2.50.0', label: '2.50.x' },
+
+    // This value will be returned for future versions of prometheus until we add new entries to this object
+    { value: '2.50.1', label: '> 2.50.x' },
+  ],
+  Mimir: [
+    { value: undefined, label: 'Please select' },
+    { value: '2.0.0', label: '2.0.x' },
+    { value: '2.1.0', label: '2.1.x' },
+    { value: '2.2.0', label: '2.2.x' },
+    { value: '2.3.0', label: '2.3.x' },
+    { value: '2.4.0', label: '2.4.x' },
+    { value: '2.5.0', label: '2.5.x' },
+    { value: '2.6.0', label: '2.6.x' },
+    { value: '2.7.0', label: '2.7.x' },
+    { value: '2.8.0', label: '2.8.x' },
+    { value: '2.9.0', label: '2.9.x' },
+    { value: '2.9.1', label: '> 2.9.x' },
+  ],
+  Thanos: [
+    { value: undefined, label: 'Please select' },
+    { value: '0.0.0', label: '< 0.16.x' },
+    { value: '0.16.0', label: '0.16.x' },
+    { value: '0.17.0', label: '0.17.x' },
+    { value: '0.18.0', label: '0.18.x' },
+    { value: '0.19.0', label: '0.19.x' },
+    { value: '0.20.0', label: '0.20.x' },
+    { value: '0.21.0', label: '0.21.x' },
+    { value: '0.22.0', label: '0.22.x' },
+    { value: '0.23.0', label: '0.23.x' },
+    { value: '0.24.0', label: '0.24.x' },
+    { value: '0.25.0', label: '0.25.x' },
+    { value: '0.26.0', label: '0.26.x' },
+    { value: '0.27.0', label: '0.27.x' },
+    { value: '0.28.0', label: '0.28.x' },
+    { value: '0.29.0', label: '0.29.x' },
+    { value: '0.30.0', label: '0.30.x' },
+    { value: '0.31.0', label: '0.31.x' },
+    { value: '0.31.1', label: '> 0.31.x' },
+  ],
+  Cortex: [
+    { value: undefined, label: 'Please select' },
+    { value: '0.0.0', label: '< 1.0.0' },
+    { value: '1.0.0', label: '1.0.0' },
+    { value: '1.1.0', label: '1.1.x' },
+    { value: '1.2.0', label: '1.2.x' },
+    { value: '1.3.0', label: '1.3.x' },
+    { value: '1.4.0', label: '1.4.x' },
+    { value: '1.5.0', label: '1.5.x' },
+    { value: '1.6.0', label: '1.6.x' },
+    { value: '1.7.0', label: '1.7.x' },
+    { value: '1.8.0', label: '1.8.x' },
+    { value: '1.9.0', label: '1.9.x' },
+    { value: '1.10.0', label: '1.10.x' },
+    { value: '1.11.0', label: '1.11.x' },
+    { value: '1.13.0', label: '1.13.x' },
+    { value: '1.14.0', label: '> 1.13.x' },
+  ],
+};
diff --git a/packages/grafana-prometheus/src/configuration/PromSettings.test.tsx b/packages/grafana-prometheus/src/configuration/PromSettings.test.tsx
new file mode 100644
index 0000000000000..a030646ccdb31
--- /dev/null
+++ b/packages/grafana-prometheus/src/configuration/PromSettings.test.tsx
@@ -0,0 +1,65 @@
+import { render, screen } from '@testing-library/react';
+import React, { SyntheticEvent } from 'react';
+
+import { SelectableValue } from '@grafana/data';
+
+import { getValueFromEventItem, PromSettings } from './PromSettings';
+import { createDefaultConfigOptions } from './mocks';
+
+describe('PromSettings', () => {
+  describe('getValueFromEventItem', () => {
+    describe('when called with undefined', () => {
+      it('then it should return empty string', () => {
+        const result = getValueFromEventItem(
+          undefined as unknown as SyntheticEvent<HTMLInputElement> | SelectableValue<string>
+        );
+        expect(result).toEqual('');
+      });
+    });
+
+    describe('when called with an input event', () => {
+      it('then it should return value from currentTarget', () => {
+        const value = 'An input value';
+        const result = getValueFromEventItem({ currentTarget: { value } });
+        expect(result).toEqual(value);
+      });
+    });
+
+    describe('when called with a select event', () => {
+      it('then it should return value', () => {
+        const value = 'A select value';
+        const result = getValueFromEventItem({ value });
+        expect(result).toEqual(value);
+      });
+    });
+  });
+
+  describe('PromSettings component', () => {
+    const defaultProps = createDefaultConfigOptions();
+
+    it('should show POST httpMethod if no httpMethod', () => {
+      const options = defaultProps;
+      options.url = '';
+      options.jsonData.httpMethod = '';
+
+      render(<PromSettings onOptionsChange={() => {}} options={options} />);
+      expect(screen.getByText('POST')).toBeInTheDocument();
+    });
+    it('should show POST httpMethod if POST httpMethod is configured', () => {
+      const options = defaultProps;
+      options.url = 'test_url';
+      options.jsonData.httpMethod = 'POST';
+
+      render(<PromSettings onOptionsChange={() => {}} options={options} />);
+      expect(screen.getByText('POST')).toBeInTheDocument();
+    });
+    it('should show GET httpMethod if GET httpMethod is configured', () => {
+      const options = defaultProps;
+      options.url = 'test_url';
+      options.jsonData.httpMethod = 'GET';
+
+      render(<PromSettings onOptionsChange={() => {}} options={options} />);
+      expect(screen.getByText('GET')).toBeInTheDocument();
+    });
+  });
+});
diff --git a/packages/grafana-prometheus/src/configuration/PromSettings.tsx b/packages/grafana-prometheus/src/configuration/PromSettings.tsx
new file mode 100644
index 0000000000000..d2b01bfc19d71
--- /dev/null
+++ b/packages/grafana-prometheus/src/configuration/PromSettings.tsx
@@ -0,0 +1,478 @@
+import React, { SyntheticEvent, useState } from 'react';
+
+import {
+  DataSourcePluginOptionsEditorProps,
+  onUpdateDatasourceJsonDataOptionChecked,
+  SelectableValue,
+  updateDatasourcePluginJsonDataOption,
+} from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { ConfigSubSection } from '@grafana/experimental';
+import { InlineField, Input, Select, Switch, useTheme2 } from '@grafana/ui';
+
+import { QueryEditorMode } from '../querybuilder/shared/types';
+import { defaultPrometheusQueryOverlapWindow } from '../querycache/QueryCache';
+import { PromApplication, PrometheusCacheLevel, PromOptions } from '../types';
+
+import { docsTip, overhaulStyles, PROM_CONFIG_LABEL_WIDTH, validateInput } from './ConfigEditor';
+import { ExemplarsSettings } from './ExemplarsSettings';
+import { PromFlavorVersions } from './PromFlavorVersions';
+
+const httpOptions = [
+  { value: 'POST', label: 'POST' },
+  { value: 'GET', label: 'GET' },
+];
+
+const editorOptions = [
+  { value: QueryEditorMode.Builder, label: 'Builder' },
+  { value: QueryEditorMode.Code, label: 'Code' },
+];
+
+const cacheValueOptions = [
+  { value: PrometheusCacheLevel.Low, label: 'Low' },
+  { value: PrometheusCacheLevel.Medium, label: 'Medium' },
+  { value: PrometheusCacheLevel.High, label: 'High' },
+  { value: PrometheusCacheLevel.None, label: 'None' },
+];
+
+type PrometheusSelectItemsType = Array<{ value: PromApplication; label: PromApplication }>;
+
+const prometheusFlavorSelectItems: PrometheusSelectItemsType = [
+  { value: PromApplication.Prometheus, label: PromApplication.Prometheus },
+  { value: PromApplication.Cortex, label: PromApplication.Cortex },
+  { value: PromApplication.Mimir, label: PromApplication.Mimir },
+  { value: PromApplication.Thanos, label: PromApplication.Thanos },
+];
+
+type Props = Pick<DataSourcePluginOptionsEditorProps<PromOptions>, 'options' | 'onOptionsChange'>;
+
+// single duration input
+export const DURATION_REGEX = /^$|^\d+(ms|[Mwdhmsy])$/;
+
+// multiple duration input
+export const MULTIPLE_DURATION_REGEX = /(\d+)(.+)/;
+
+const durationError = 'Value is not valid, you can use number with time unit specifier: y, M, w, d, h, m, s';
+
+export const PromSettings = (props: Props) => {
+  const { options, onOptionsChange } = props;
+
+  // We are explicitly adding httpMethod so, it is correctly displayed in dropdown.
+  // This way, it is more predictable for users.
+  if (!options.jsonData.httpMethod) {
+    options.jsonData.httpMethod = 'POST';
+  }
+
+  const theme = useTheme2();
+  const styles = overhaulStyles(theme);
+
+  type ValidDuration = {
+    timeInterval: string;
+    queryTimeout: string;
+    incrementalQueryOverlapWindow: string;
+  };
+
+  const [validDuration, updateValidDuration] = useState<ValidDuration>({
+    timeInterval: '',
+    queryTimeout: '',
+    incrementalQueryOverlapWindow: '',
+  });
+
+  return (
+    <>
+      <ConfigSubSection title="Interval behaviour" className={styles.container}>
+        <div className="gf-form-group">
+          {/* Scrape interval */}
+          <div className="gf-form-inline">
+            <div className="gf-form">
+              <InlineField
+                label="Scrape interval"
+                labelWidth={PROM_CONFIG_LABEL_WIDTH}
+                tooltip={
+                  <>
+                    This interval is how frequently Prometheus scrapes targets. Set this to the typical scrape and
+                    evaluation interval configured in your Prometheus config file. If you set this to a greater value
+                    than your Prometheus config file interval, Grafana will evaluate the data according to this interval
+                    and you will see less data points. Defaults to 15s. {docsTip()}
+                  </>
+                }
+                interactive={true}
+                disabled={options.readOnly}
+              >
+                <>
+                  <Input
+                    className="width-20"
+                    value={options.jsonData.timeInterval}
+                    spellCheck={false}
+                    placeholder="15s"
+                    onChange={onChangeHandler('timeInterval', options, onOptionsChange)}
+                    onBlur={(e) =>
+                      updateValidDuration({
+                        ...validDuration,
+                        timeInterval: e.currentTarget.value,
+                      })
+                    }
+                    data-testid={selectors.components.DataSource.Prometheus.configPage.scrapeInterval}
+                  />
+                  {validateInput(validDuration.timeInterval, DURATION_REGEX, durationError)}
+                </>
+              </InlineField>
+            </div>
+          </div>
+          {/* Query Timeout */}
+          <div className="gf-form-inline">
+            <div className="gf-form">
+              <InlineField
+                label="Query timeout"
+                labelWidth={PROM_CONFIG_LABEL_WIDTH}
+                tooltip={<>Set the Prometheus query timeout. {docsTip()}</>}
+                interactive={true}
+                disabled={options.readOnly}
+              >
+                <>
+                  <Input
+                    className="width-20"
+                    value={options.jsonData.queryTimeout}
+                    onChange={onChangeHandler('queryTimeout', options, onOptionsChange)}
+                    spellCheck={false}
+                    placeholder="60s"
+                    onBlur={(e) =>
+                      updateValidDuration({
+                        ...validDuration,
+                        queryTimeout: e.currentTarget.value,
+                      })
+                    }
+                    data-testid={selectors.components.DataSource.Prometheus.configPage.queryTimeout}
+                  />
+                  {validateInput(validDuration.queryTimeout, DURATION_REGEX, durationError)}
+                </>
+              </InlineField>
+            </div>
+          </div>
+        </div>
+      </ConfigSubSection>
+
+      <ConfigSubSection title="Query editor" className={styles.container}>
+        <div className="gf-form-group">
+          <div className="gf-form">
+            <InlineField
+              label="Default editor"
+              labelWidth={PROM_CONFIG_LABEL_WIDTH}
+              tooltip={<>Set default editor option for all users of this data source. {docsTip()}</>}
+              interactive={true}
+              disabled={options.readOnly}
+            >
+              <Select
+                aria-label={`Default Editor (Code or Builder)`}
+                options={editorOptions}
+                value={
+                  editorOptions.find((o) => o.value === options.jsonData.defaultEditor) ??
+                  editorOptions.find((o) => o.value === QueryEditorMode.Builder)
+                }
+                onChange={onChangeHandler('defaultEditor', options, onOptionsChange)}
+                width={40}
+                data-testid={selectors.components.DataSource.Prometheus.configPage.defaultEditor}
+              />
+            </InlineField>
+          </div>
+          <div className="gf-form">
+            <InlineField
+              labelWidth={PROM_CONFIG_LABEL_WIDTH}
+              label="Disable metrics lookup"
+              tooltip={
+                <>
+                  Checking this option will disable the metrics chooser and metric/label support in the query
+                  field&apos;s autocomplete. This helps if you have performance issues with bigger Prometheus instances.{' '}
+                  {docsTip()}
+                </>
+              }
+              interactive={true}
+              disabled={options.readOnly}
+              className={styles.switchField}
+            >
+              <Switch
+                value={options.jsonData.disableMetricsLookup ?? false}
+                onChange={onUpdateDatasourceJsonDataOptionChecked(props, 'disableMetricsLookup')}
+                id={selectors.components.DataSource.Prometheus.configPage.disableMetricLookup}
+              />
+            </InlineField>
+          </div>
+        </div>
+      </ConfigSubSection>
+
+      <ConfigSubSection title="Performance" className={styles.container}>
+        {!options.jsonData.prometheusType && !options.jsonData.prometheusVersion && options.readOnly && (
+          <div className={styles.versionMargin}>
+            For more information on configuring prometheus type and version in data sources, see the{' '}
+            <a
+              className={styles.textUnderline}
+              href="https://grafana.com/docs/grafana/latest/administration/provisioning/"
+            >
+              provisioning documentation
+            </a>
+            .
+          </div>
+        )}
+        <div className="gf-form-group">
+          <div className="gf-form-inline">
+            <div className="gf-form">
+              <InlineField
+                label="Prometheus type"
+                labelWidth={PROM_CONFIG_LABEL_WIDTH}
+                tooltip={
+                  <>
+                    {/* , and attempt to detect the version */}
+                    Set this to the type of your prometheus database, e.g. Prometheus, Cortex, Mimir or Thanos. Changing
+                    this field will save your current settings. Certain types of Prometheus supports or does not support
+                    various APIs. For example, some types support regex matching for label queries to improve
+                    performance. Some types have an API for metadata. If you set this incorrectly you may experience odd
+                    behavior when querying metrics and labels. Please check your Prometheus documentation to ensure you
+                    enter the correct type. {docsTip()}
+                  </>
+                }
+                interactive={true}
+                disabled={options.readOnly}
+              >
+                <Select
+                  aria-label="Prometheus type"
+                  options={prometheusFlavorSelectItems}
+                  value={prometheusFlavorSelectItems.find((o) => o.value === options.jsonData.prometheusType)}
+                  onChange={onChangeHandler('prometheusType', options, onOptionsChange)}
+                  width={40}
+                  data-testid={selectors.components.DataSource.Prometheus.configPage.prometheusType}
+                />
+              </InlineField>
+            </div>
+          </div>
+          <div className="gf-form-inline">
+            {options.jsonData.prometheusType && (
+              <div className="gf-form">
+                <InlineField
+                  label={`${options.jsonData.prometheusType} version`}
+                  labelWidth={PROM_CONFIG_LABEL_WIDTH}
+                  tooltip={
+                    <>
+                      Use this to set the version of your {options.jsonData.prometheusType} instance if it is not
+                      automatically configured. {docsTip()}
+                    </>
+                  }
+                  interactive={true}
+                  disabled={options.readOnly}
+                >
+                  <Select
+                    aria-label={`${options.jsonData.prometheusType} type`}
+                    options={PromFlavorVersions[options.jsonData.prometheusType]}
+                    value={PromFlavorVersions[options.jsonData.prometheusType]?.find(
+                      (o) => o.value === options.jsonData.prometheusVersion
+                    )}
+                    onChange={onChangeHandler('prometheusVersion', options, onOptionsChange)}
+                    width={40}
+                    data-testid={selectors.components.DataSource.Prometheus.configPage.prometheusVersion}
+                  />
+                </InlineField>
+              </div>
+            )}
+          </div>
+
+          <div className="gf-form-inline">
+            <div className="gf-form max-width-30">
+              <InlineField
+                label="Cache level"
+                labelWidth={PROM_CONFIG_LABEL_WIDTH}
+                tooltip={
+                  <>
+                    Sets the browser caching level for editor queries. Higher cache settings are recommended for high
+                    cardinality data sources.
+                  </>
+                }
+                interactive={true}
+                disabled={options.readOnly}
+              >
+                <Select
+                  width={40}
+                  onChange={onChangeHandler('cacheLevel', options, onOptionsChange)}
+                  options={cacheValueOptions}
+                  value={
+                    cacheValueOptions.find((o) => o.value === options.jsonData.cacheLevel) ?? PrometheusCacheLevel.Low
+                  }
+                  data-testid={selectors.components.DataSource.Prometheus.configPage.cacheLevel}
+                />
+              </InlineField>
+            </div>
+          </div>
+
+          <div className="gf-form-inline">
+            <div className="gf-form max-width-30">
+              <InlineField
+                label="Incremental querying (beta)"
+                labelWidth={PROM_CONFIG_LABEL_WIDTH}
+                tooltip={
+                  <>
+                    This feature will change the default behavior of relative queries to always request fresh data from
+                    the prometheus instance, instead query results will be cached, and only new records are requested.
+                    Turn this on to decrease database and network load.
+                  </>
+                }
+                interactive={true}
+                className={styles.switchField}
+                disabled={options.readOnly}
+              >
+                <Switch
+                  value={options.jsonData.incrementalQuerying ?? false}
+                  onChange={onUpdateDatasourceJsonDataOptionChecked(props, 'incrementalQuerying')}
+                  id={selectors.components.DataSource.Prometheus.configPage.incrementalQuerying}
+                />
+              </InlineField>
+            </div>
+          </div>
+
+          <div className="gf-form-inline">
+            {options.jsonData.incrementalQuerying && (
+              <InlineField
+                label="Query overlap window"
+                labelWidth={PROM_CONFIG_LABEL_WIDTH}
+                tooltip={
+                  <>
+                    Set a duration like 10m or 120s or 0s. Default of 10 minutes. This duration will be added to the
+                    duration of each incremental request.
+                  </>
+                }
+                interactive={true}
+                disabled={options.readOnly}
+              >
+                <>
+                  <Input
+                    onBlur={(e) =>
+                      updateValidDuration({
+                        ...validDuration,
+                        incrementalQueryOverlapWindow: e.currentTarget.value,
+                      })
+                    }
+                    className="width-20"
+                    value={options.jsonData.incrementalQueryOverlapWindow ?? defaultPrometheusQueryOverlapWindow}
+                    onChange={onChangeHandler('incrementalQueryOverlapWindow', options, onOptionsChange)}
+                    spellCheck={false}
+                    data-testid={selectors.components.DataSource.Prometheus.configPage.queryOverlapWindow}
+                  />
+                  {validateInput(validDuration.incrementalQueryOverlapWindow, MULTIPLE_DURATION_REGEX, durationError)}
+                </>
+              </InlineField>
+            )}
+          </div>
+
+          <div className="gf-form-inline">
+            <div className="gf-form max-width-30">
+              <InlineField
+                label="Disable recording rules (beta)"
+                labelWidth={PROM_CONFIG_LABEL_WIDTH}
+                tooltip={<>This feature will disable recording rules Turn this on to improve dashboard performance</>}
+                interactive={true}
+                className={styles.switchField}
+                disabled={options.readOnly}
+              >
+                <Switch
+                  value={options.jsonData.disableRecordingRules ?? false}
+                  onChange={onUpdateDatasourceJsonDataOptionChecked(props, 'disableRecordingRules')}
+                  id={selectors.components.DataSource.Prometheus.configPage.disableRecordingRules}
+                />
+              </InlineField>
+            </div>
+          </div>
+        </div>
+      </ConfigSubSection>
+
+      <ConfigSubSection title="Other" className={styles.container}>
+        <div className="gf-form-group">
+          <div className="gf-form-inline">
+            <div className="gf-form max-width-30">
+              <InlineField
+                label="Custom query parameters"
+                labelWidth={PROM_CONFIG_LABEL_WIDTH}
+                tooltip={
+                  <>
+                    Add custom parameters to the Prometheus query URL. For example timeout, partial_response, dedup, or
+                    max_source_resolution. Multiple parameters should be concatenated together with an ‘&’. {docsTip()}
+                  </>
+                }
+                interactive={true}
+                disabled={options.readOnly}
+              >
+                <Input
+                  className="width-20"
+                  value={options.jsonData.customQueryParameters}
+                  onChange={onChangeHandler('customQueryParameters', options, onOptionsChange)}
+                  spellCheck={false}
+                  placeholder="Example: max_source_resolution=5m&timeout=10"
+                  data-testid={selectors.components.DataSource.Prometheus.configPage.customQueryParameters}
+                />
+              </InlineField>
+            </div>
+          </div>
+          <div className="gf-form-inline">
+            {/* HTTP Method */}
+            <div className="gf-form">
+              <InlineField
+                labelWidth={PROM_CONFIG_LABEL_WIDTH}
+                tooltip={
+                  <>
+                    You can use either POST or GET HTTP method to query your Prometheus data source. POST is the
+                    recommended method as it allows bigger queries. Change this to GET if you have a Prometheus version
+                    older than 2.1 or if POST requests are restricted in your network. {docsTip()}
+                  </>
+                }
+                interactive={true}
+                label="HTTP method"
+                disabled={options.readOnly}
+              >
+                <Select
+                  width={40}
+                  aria-label="Select HTTP method"
+                  options={httpOptions}
+                  value={httpOptions.find((o) => o.value === options.jsonData.httpMethod)}
+                  onChange={onChangeHandler('httpMethod', options, onOptionsChange)}
+                  data-testid={selectors.components.DataSource.Prometheus.configPage.httpMethod}
+                />
+              </InlineField>
+            </div>
+          </div>
+        </div>
+      </ConfigSubSection>
+
+      <ExemplarsSettings
+        options={options.jsonData.exemplarTraceIdDestinations}
+        onChange={(exemplarOptions) =>
+          updateDatasourcePluginJsonDataOption(
+            { onOptionsChange, options },
+            'exemplarTraceIdDestinations',
+            exemplarOptions
+          )
+        }
+        disabled={options.readOnly}
+      />
+    </>
+  );
+};
+
+export const getValueFromEventItem = (eventItem: SyntheticEvent<HTMLInputElement> | SelectableValue<string>) => {
+  if (!eventItem) {
+    return '';
+  }
+
+  if ('currentTarget' in eventItem) {
+    return eventItem.currentTarget.value;
+  }
+
+  return eventItem.value;
+};
+
+const onChangeHandler =
+  (key: keyof PromOptions, options: Props['options'], onOptionsChange: Props['onOptionsChange']) =>
+  (eventItem: SyntheticEvent<HTMLInputElement> | SelectableValue<string>) => {
+    onOptionsChange({
+      ...options,
+      jsonData: {
+        ...options.jsonData,
+        [key]: getValueFromEventItem(eventItem),
+      },
+    });
+  };
diff --git a/packages/grafana-prometheus/src/configuration/mocks.ts b/packages/grafana-prometheus/src/configuration/mocks.ts
new file mode 100644
index 0000000000000..dc52090298b14
--- /dev/null
+++ b/packages/grafana-prometheus/src/configuration/mocks.ts
@@ -0,0 +1,14 @@
+import { DataSourceSettings } from '@grafana/data';
+
+import { getMockDataSource } from '../gcopypaste/app/features/datasources/__mocks__/dataSourcesMocks';
+import { PromOptions } from '../types';
+
+export function createDefaultConfigOptions(): DataSourceSettings<PromOptions> {
+  return getMockDataSource<PromOptions>({
+    jsonData: {
+      timeInterval: '1m',
+      queryTimeout: '1m',
+      httpMethod: 'GET',
+    },
+  });
+}
diff --git a/packages/grafana-prometheus/src/dashboards/grafana_stats.json b/packages/grafana-prometheus/src/dashboards/grafana_stats.json
new file mode 100644
index 0000000000000..a121de7fe5a8e
--- /dev/null
+++ b/packages/grafana-prometheus/src/dashboards/grafana_stats.json
@@ -0,0 +1,1187 @@
+{
+  "__inputs": [
+    {
+      "name": "DS_PROMETHEUS",
+      "label": "Prometheus",
+      "description": "",
+      "type": "datasource",
+      "pluginId": "prometheus",
+      "pluginName": "Prometheus"
+    }
+  ],
+  "__requires": [
+    {
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "8.1.0-pre"
+    },
+    {
+      "type": "datasource",
+      "id": "prometheus",
+      "name": "Prometheus",
+      "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "stat",
+      "name": "Stat",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "table-old",
+      "name": "Table (old)",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "timeseries",
+      "name": "Time series",
+      "version": ""
+    }
+  ],
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "description": "Metrics about Grafana",
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "id": null,
+  "links": [
+    {
+      "icon": "external link",
+      "tags": [],
+      "targetBlank": true,
+      "title": "Available metrics",
+      "type": "link",
+      "url": "/metrics"
+    },
+    {
+      "icon": "external link",
+      "tags": [],
+      "targetBlank": true,
+      "title": "Grafana docs",
+      "type": "link",
+      "url": "https://grafana.com/docs/grafana/latest/"
+    },
+    {
+      "icon": "external link",
+      "tags": [],
+      "targetBlank": true,
+      "title": "Prometheus docs",
+      "type": "link",
+      "url": "http://prometheus.io/docs/introduction/overview/"
+    }
+  ],
+  "panels": [
+    {
+      "cacheTimeout": null,
+      "datasource": "${DS_PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "decimals": 0,
+          "mappings": [
+            {
+              "options": {
+                "0": {
+                  "text": ":("
+                }
+              },
+              "type": "value"
+            }
+          ],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "rgba(222, 3, 3, 0.9)",
+                "value": null
+              },
+              {
+                "color": "rgb(234, 245, 234)",
+                "value": 1
+              },
+              {
+                "color": "rgb(235, 244, 235)",
+                "value": 10000
+              }
+            ]
+          },
+          "unit": "none"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 5,
+        "w": 5,
+        "x": 0,
+        "y": 0
+      },
+      "id": 4,
+      "interval": null,
+      "links": [],
+      "maxDataPoints": 100,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": ["mean"],
+          "fields": "",
+          "values": false
+        },
+        "text": {},
+        "textMode": "auto"
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "up{job=\"grafana\"}",
+          "format": "time_series",
+          "instant": true,
+          "intervalFactor": 2,
+          "refId": "A",
+          "step": 60
+        }
+      ],
+      "title": "Active instances",
+      "type": "stat"
+    },
+    {
+      "cacheTimeout": null,
+      "datasource": "${DS_PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [
+            {
+              "options": {
+                "match": "null",
+                "result": {
+                  "text": "N/A"
+                }
+              },
+              "type": "special"
+            }
+          ],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "none"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 5,
+        "w": 5,
+        "x": 5,
+        "y": 0
+      },
+      "id": 8,
+      "interval": null,
+      "links": [],
+      "maxDataPoints": 100,
+      "options": {
+        "colorMode": "none",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": ["mean"],
+          "fields": "",
+          "values": false
+        },
+        "text": {},
+        "textMode": "auto"
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "grafana_stat_totals_dashboard",
+          "format": "time_series",
+          "instant": true,
+          "intervalFactor": 2,
+          "refId": "A",
+          "step": 60
+        }
+      ],
+      "title": "Dashboard count",
+      "type": "stat"
+    },
+    {
+      "cacheTimeout": null,
+      "datasource": "${DS_PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [
+            {
+              "options": {
+                "match": "null",
+                "result": {
+                  "text": "N/A"
+                }
+              },
+              "type": "special"
+            }
+          ],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "none"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 5,
+        "w": 5,
+        "x": 10,
+        "y": 0
+      },
+      "id": 9,
+      "interval": null,
+      "links": [],
+      "maxDataPoints": 100,
+      "options": {
+        "colorMode": "none",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": ["mean"],
+          "fields": "",
+          "values": false
+        },
+        "text": {},
+        "textMode": "auto"
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "grafana_stat_total_users",
+          "format": "time_series",
+          "instant": true,
+          "intervalFactor": 2,
+          "refId": "A",
+          "step": 60
+        }
+      ],
+      "title": "User count",
+      "type": "stat"
+    },
+    {
+      "cacheTimeout": null,
+      "datasource": "${DS_PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [
+            {
+              "options": {
+                "match": "null",
+                "result": {
+                  "text": "N/A"
+                }
+              },
+              "type": "special"
+            }
+          ],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "none"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 5,
+        "w": 5,
+        "x": 15,
+        "y": 0
+      },
+      "id": 10,
+      "interval": null,
+      "links": [],
+      "maxDataPoints": 100,
+      "options": {
+        "colorMode": "none",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": ["mean"],
+          "fields": "",
+          "values": false
+        },
+        "text": {},
+        "textMode": "auto"
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "grafana_stat_total_playlists",
+          "format": "time_series",
+          "instant": true,
+          "intervalFactor": 2,
+          "refId": "A",
+          "step": 60
+        }
+      ],
+      "title": "Playlist count",
+      "type": "stat"
+    },
+    {
+      "columns": [],
+      "datasource": "${DS_PROMETHEUS}",
+      "fontSize": "100%",
+      "gridPos": {
+        "h": 5,
+        "w": 4,
+        "x": 20,
+        "y": 0
+      },
+      "id": 17,
+      "links": [],
+      "pageSize": null,
+      "scroll": false,
+      "showHeader": true,
+      "sort": {
+        "col": 0,
+        "desc": true
+      },
+      "styles": [
+        {
+          "alias": "Time",
+          "align": "auto",
+          "dateFormat": "YYYY-MM-DD HH:mm:ss",
+          "link": false,
+          "pattern": "Time",
+          "type": "hidden"
+        },
+        {
+          "alias": "",
+          "align": "auto",
+          "colorMode": null,
+          "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
+          "decimals": 0,
+          "pattern": "/.*/",
+          "thresholds": [],
+          "type": "number",
+          "unit": "short"
+        }
+      ],
+      "targets": [
+        {
+          "expr": "topk(1, grafana_info or grafana_build_info)",
+          "format": "time_series",
+          "instant": true,
+          "intervalFactor": 2,
+          "legendFormat": "{{version}}",
+          "refId": "A",
+          "step": 20
+        }
+      ],
+      "title": "Grafana version",
+      "transform": "timeseries_to_rows",
+      "type": "table-old"
+    },
+    {
+      "datasource": "${DS_PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 2,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "400"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#447EBC",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "500"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#BF1B00",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 10,
+        "w": 10,
+        "x": 0,
+        "y": 5
+      },
+      "id": 15,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "sum by (status_code) (irate(grafana_http_request_duration_seconds_count[5m]))",
+          "format": "time_series",
+          "intervalFactor": 3,
+          "legendFormat": "{{status_code}}",
+          "refId": "B",
+          "step": 15,
+          "target": "dev.grafana.cb-office.alerting.active_alerts"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "http status codes",
+      "type": "timeseries"
+    },
+    {
+      "datasource": "${DS_PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 2,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "400"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#447EBC",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "500"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#BF1B00",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 10,
+        "w": 10,
+        "x": 10,
+        "y": 5
+      },
+      "id": 11,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "sum(irate(grafana_api_response_status_total[5m]))",
+          "format": "time_series",
+          "intervalFactor": 4,
+          "legendFormat": "api",
+          "refId": "A",
+          "step": 20
+        },
+        {
+          "expr": "sum(irate(grafana_proxy_response_status_total[5m]))",
+          "format": "time_series",
+          "intervalFactor": 4,
+          "legendFormat": "proxy",
+          "refId": "B",
+          "step": 20
+        },
+        {
+          "expr": "sum(irate(grafana_page_response_status_total[5m]))",
+          "format": "time_series",
+          "intervalFactor": 4,
+          "legendFormat": "web",
+          "refId": "C",
+          "step": 20
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Requests by routing group",
+      "type": "timeseries"
+    },
+    {
+      "columns": [],
+      "datasource": "${DS_PROMETHEUS}",
+      "fontSize": "100%",
+      "gridPos": {
+        "h": 10,
+        "w": 4,
+        "x": 20,
+        "y": 5
+      },
+      "height": "",
+      "id": 12,
+      "links": [],
+      "pageSize": null,
+      "scroll": true,
+      "showHeader": true,
+      "sort": {
+        "col": 0,
+        "desc": true
+      },
+      "styles": [
+        {
+          "alias": "Time",
+          "align": "auto",
+          "dateFormat": "YYYY-MM-DD HH:mm:ss",
+          "link": false,
+          "pattern": "Time",
+          "type": "hidden"
+        },
+        {
+          "alias": "",
+          "align": "auto",
+          "colorMode": null,
+          "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
+          "decimals": 0,
+          "pattern": "/.*/",
+          "thresholds": [],
+          "type": "number",
+          "unit": "short"
+        }
+      ],
+      "targets": [
+        {
+          "expr": "sort(topk(8, sum by (handler) (grafana_http_request_duration_seconds_count)))",
+          "format": "time_series",
+          "instant": true,
+          "intervalFactor": 10,
+          "legendFormat": "{{handler}}",
+          "refId": "A",
+          "step": 100
+        }
+      ],
+      "title": "Most used handlers",
+      "transform": "timeseries_to_rows",
+      "type": "table-old"
+    },
+    {
+      "datasource": "${DS_PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 2,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "normal"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "alerting"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#890F02",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "ok"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#7EB26D",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 5,
+        "w": 12,
+        "x": 0,
+        "y": 15
+      },
+      "id": 6,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "increase(grafana_alerting_active_alerts[1m])",
+          "format": "time_series",
+          "intervalFactor": 3,
+          "legendFormat": "{{state}}",
+          "refId": "A",
+          "step": 15
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Grafana active alerts",
+      "type": "timeseries"
+    },
+    {
+      "datasource": "${DS_PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 2,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "alerting"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#890F02",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "alertname"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#BF1B00",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "firing alerts"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#BF1B00",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "ok"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#7EB26D",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 5,
+        "w": 12,
+        "x": 12,
+        "y": 15
+      },
+      "id": 18,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": " sum (ALERTS)",
+          "format": "time_series",
+          "intervalFactor": 3,
+          "legendFormat": "firing alerts",
+          "refId": "A",
+          "step": 15
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Prometheus alerts",
+      "type": "timeseries"
+    },
+    {
+      "datasource": "${DS_PROMETHEUS}",
+      "description": "Aggregated over all Grafana nodes.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 2,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "avg gc duration"
+            },
+            "properties": [
+              {
+                "id": "unit",
+                "value": "decbytes"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "allocated memory"
+            },
+            "properties": [
+              {
+                "id": "unit",
+                "value": "decbytes"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "used memory"
+            },
+            "properties": [
+              {
+                "id": "unit",
+                "value": "decbytes"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "memory usage"
+            },
+            "properties": [
+              {
+                "id": "unit",
+                "value": "decbytes"
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 24,
+        "x": 0,
+        "y": 20
+      },
+      "id": 7,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "sum(go_goroutines{job=\"grafana\"})",
+          "format": "time_series",
+          "hide": false,
+          "intervalFactor": 4,
+          "legendFormat": "go routines",
+          "refId": "A",
+          "step": 8,
+          "target": "select metric",
+          "type": "timeserie"
+        },
+        {
+          "expr": "sum(process_resident_memory_bytes{job=\"grafana\"})",
+          "format": "time_series",
+          "intervalFactor": 4,
+          "legendFormat": "memory usage",
+          "refId": "B",
+          "step": 8
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Grafana performance",
+      "type": "timeseries"
+    }
+  ],
+  "revision": "1.0",
+  "schemaVersion": 30,
+  "tags": ["grafana", "prometheus"],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
+    "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
+  },
+  "timezone": "",
+  "title": "Grafana metrics",
+  "uid": "isFoa0z7k",
+  "version": 3
+}
diff --git a/packages/grafana-prometheus/src/dashboards/prometheus_2_stats.json b/packages/grafana-prometheus/src/dashboards/prometheus_2_stats.json
new file mode 100644
index 0000000000000..3d4cea64f05ba
--- /dev/null
+++ b/packages/grafana-prometheus/src/dashboards/prometheus_2_stats.json
@@ -0,0 +1,1403 @@
+{
+  "__inputs": [
+    {
+      "name": "DS_GDEV-PROMETHEUS",
+      "label": "gdev-prometheus",
+      "description": "",
+      "type": "datasource",
+      "pluginId": "prometheus",
+      "pluginName": "Prometheus"
+    }
+  ],
+  "__requires": [
+    {
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "8.1.0-pre"
+    },
+    {
+      "type": "datasource",
+      "id": "prometheus",
+      "name": "Prometheus",
+      "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "stat",
+      "name": "Stat",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "timeseries",
+      "name": "Time series",
+      "version": ""
+    }
+  ],
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 1,
+  "id": null,
+  "links": [
+    {
+      "icon": "info",
+      "tags": [],
+      "targetBlank": true,
+      "title": "Grafana Docs",
+      "tooltip": "",
+      "type": "link",
+      "url": "https://grafana.com/docs/grafana/latest/"
+    },
+    {
+      "icon": "info",
+      "tags": [],
+      "targetBlank": true,
+      "title": "Prometheus Docs",
+      "type": "link",
+      "url": "http://prometheus.io/docs/introduction/overview/"
+    }
+  ],
+  "panels": [
+    {
+      "datasource": "${DS_GDEV-PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "prometheus"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#C15C17",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "{instance=\"localhost:9090\",job=\"prometheus\"}"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#CCA300",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 6,
+        "x": 0,
+        "y": 0
+      },
+      "id": 3,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "sum(irate(prometheus_tsdb_head_samples_appended_total{job=\"prometheus\"}[5m]))",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "samples",
+          "metric": "",
+          "refId": "A",
+          "step": 20
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Samples Appended",
+      "type": "timeseries"
+    },
+    {
+      "datasource": "${DS_GDEV-PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "s"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 6,
+        "x": 6,
+        "y": 0
+      },
+      "id": 14,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "topk(5, max(scrape_duration_seconds) by (job))",
+          "format": "time_series",
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "{{job}}",
+          "metric": "",
+          "refId": "A",
+          "step": 20
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Scrape Duration",
+      "type": "timeseries"
+    },
+    {
+      "datasource": "${DS_GDEV-PROMETHEUS}",
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "bytes"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 6,
+        "x": 12,
+        "y": 0
+      },
+      "id": 16,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "sum(process_resident_memory_bytes{job=\"prometheus\"})",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "p8s process resident memory",
+          "refId": "D",
+          "step": 20
+        },
+        {
+          "expr": "process_virtual_memory_bytes{job=\"prometheus\"}",
+          "format": "time_series",
+          "hide": false,
+          "intervalFactor": 2,
+          "legendFormat": "virtual memory",
+          "refId": "C",
+          "step": 20
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Memory Profile",
+      "type": "timeseries"
+    },
+    {
+      "cacheTimeout": null,
+      "datasource": "${DS_GDEV-PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [
+            {
+              "options": {
+                "0": {
+                  "text": "None"
+                }
+              },
+              "type": "value"
+            }
+          ],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "rgba(50, 172, 45, 0.97)",
+                "value": null
+              },
+              {
+                "color": "rgba(237, 129, 40, 0.89)",
+                "value": 0.1
+              },
+              {
+                "color": "rgba(245, 54, 54, 0.9)",
+                "value": 1
+              }
+            ]
+          },
+          "unit": "none"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 6,
+        "x": 18,
+        "y": 0
+      },
+      "id": 37,
+      "interval": null,
+      "links": [],
+      "maxDataPoints": 100,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": ["max"],
+          "fields": "",
+          "values": false
+        },
+        "text": {},
+        "textMode": "auto"
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "prometheus_tsdb_wal_corruptions_total{job=\"prometheus\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "",
+          "refId": "A",
+          "step": 60
+        }
+      ],
+      "title": "WAL Corruptions",
+      "type": "stat"
+    },
+    {
+      "datasource": "${DS_GDEV-PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 6,
+        "x": 0,
+        "y": 6
+      },
+      "id": 29,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "sum(prometheus_tsdb_head_active_appenders{job=\"prometheus\"})",
+          "format": "time_series",
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "active_appenders",
+          "metric": "",
+          "refId": "A",
+          "step": 20
+        },
+        {
+          "expr": "sum(process_open_fds{job=\"prometheus\"})",
+          "format": "time_series",
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "open_fds",
+          "refId": "B",
+          "step": 20
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Active Appenders",
+      "type": "timeseries"
+    },
+    {
+      "datasource": "${DS_GDEV-PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "prometheus"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#F9BA8F",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "{instance=\"localhost:9090\",interval=\"5s\",job=\"prometheus\"}"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#F9BA8F",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 6,
+        "x": 6,
+        "y": 6
+      },
+      "id": 2,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "prometheus_tsdb_blocks_loaded{job=\"prometheus\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "blocks",
+          "refId": "A",
+          "step": 20
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Blocks Loaded",
+      "type": "timeseries"
+    },
+    {
+      "datasource": "${DS_GDEV-PROMETHEUS}",
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 6,
+        "x": 12,
+        "y": 6
+      },
+      "id": 33,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "prometheus_tsdb_head_chunks{job=\"prometheus\"}",
+          "format": "time_series",
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "chunks",
+          "refId": "A",
+          "step": 20
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Head Chunks",
+      "type": "timeseries"
+    },
+    {
+      "datasource": "${DS_GDEV-PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "duration-p99"
+            },
+            "properties": [
+              {
+                "id": "unit",
+                "value": "s"
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 6,
+        "x": 18,
+        "y": 6
+      },
+      "id": 36,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "prometheus_tsdb_head_gc_duration_seconds{job=\"prometheus\",quantile=\"0.99\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "duration-p99",
+          "refId": "A",
+          "step": 20
+        },
+        {
+          "expr": "irate(prometheus_tsdb_head_gc_duration_seconds_count{job=\"prometheus\"}[5m])",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "collections",
+          "refId": "B",
+          "step": 20
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Head Block GC Activity",
+      "type": "timeseries"
+    },
+    {
+      "datasource": "${DS_GDEV-PROMETHEUS}",
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "duration-p99"
+            },
+            "properties": [
+              {
+                "id": "unit",
+                "value": "s"
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 8,
+        "x": 0,
+        "y": 12
+      },
+      "id": 20,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "histogram_quantile(0.99, sum(rate(prometheus_tsdb_compaction_duration_bucket{job=\"prometheus\"}[5m])) by (le))",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "duration-{{p99}}",
+          "refId": "A",
+          "step": 20
+        },
+        {
+          "expr": "irate(prometheus_tsdb_compactions_total{job=\"prometheus\"}[5m])",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "compactions",
+          "refId": "B",
+          "step": 20
+        },
+        {
+          "expr": "irate(prometheus_tsdb_compactions_failed_total{job=\"prometheus\"}[5m])",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "failed",
+          "refId": "C",
+          "step": 20
+        },
+        {
+          "expr": "irate(prometheus_tsdb_compactions_triggered_total{job=\"prometheus\"}[5m])",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "triggered",
+          "refId": "D",
+          "step": 20
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Compaction Activity",
+      "type": "timeseries"
+    },
+    {
+      "datasource": "${DS_GDEV-PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 8,
+        "x": 8,
+        "y": 12
+      },
+      "id": 32,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "rate(prometheus_tsdb_reloads_total{job=\"prometheus\"}[5m])",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "reloads",
+          "refId": "A",
+          "step": 20
+        },
+        {
+          "expr": "rate(prometheus_tsdb_reloads_failures_total{job=\"prometheus\"}[5m])",
+          "format": "time_series",
+          "hide": false,
+          "intervalFactor": 2,
+          "legendFormat": "failures",
+          "refId": "B",
+          "step": 20
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Reload Count",
+      "type": "timeseries"
+    },
+    {
+      "datasource": "${DS_GDEV-PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 8,
+        "x": 16,
+        "y": 12
+      },
+      "id": 38,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "prometheus_engine_query_duration_seconds{job=\"prometheus\", quantile=\"0.99\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "{{slice}}_p99",
+          "refId": "A",
+          "step": 20
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Query Durations",
+      "type": "timeseries"
+    },
+    {
+      "datasource": "${DS_GDEV-PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "s"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 12,
+        "x": 0,
+        "y": 18
+      },
+      "id": 35,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "max(prometheus_rule_group_duration_seconds{job=\"prometheus\"}) by (quantile)",
+          "format": "time_series",
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "{{quantile}}",
+          "refId": "A",
+          "step": 10
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Rule Group Eval Duration",
+      "type": "timeseries"
+    },
+    {
+      "datasource": "${DS_GDEV-PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "normal"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 12,
+        "x": 12,
+        "y": 18
+      },
+      "id": 39,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "rate(prometheus_rule_group_iterations_missed_total{job=\"prometheus\"}[5m])",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "missed",
+          "refId": "B",
+          "step": 10
+        },
+        {
+          "expr": "rate(prometheus_rule_group_iterations_total{job=\"prometheus\"}[5m])",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "iterations",
+          "refId": "A",
+          "step": 10
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Rule Group Eval Activity",
+      "type": "timeseries"
+    }
+  ],
+  "refresh": "1m",
+  "revision": "1.0",
+  "schemaVersion": 30,
+  "tags": ["prometheus"],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-1h",
+    "to": "now"
+  },
+  "timepicker": {
+    "now": true,
+    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
+    "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
+  },
+  "timezone": "browser",
+  "title": "Prometheus 2.0 Stats",
+  "uid": "UDdpyzz7z",
+  "version": 1
+}
diff --git a/packages/grafana-prometheus/src/dashboards/prometheus_stats.json b/packages/grafana-prometheus/src/dashboards/prometheus_stats.json
new file mode 100644
index 0000000000000..9169006b89514
--- /dev/null
+++ b/packages/grafana-prometheus/src/dashboards/prometheus_stats.json
@@ -0,0 +1,834 @@
+{
+  "__inputs": [
+    {
+      "name": "DS_GDEV-PROMETHEUS",
+      "label": "gdev-prometheus",
+      "description": "",
+      "type": "datasource",
+      "pluginId": "prometheus",
+      "pluginName": "Prometheus"
+    }
+  ],
+  "__requires": [
+    {
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "8.1.0-pre"
+    },
+    {
+      "type": "datasource",
+      "id": "prometheus",
+      "name": "Prometheus",
+      "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "stat",
+      "name": "Stat",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "timeseries",
+      "name": "Time series",
+      "version": ""
+    }
+  ],
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "id": null,
+  "iteration": 1624859749459,
+  "links": [
+    {
+      "icon": "info",
+      "tags": [],
+      "targetBlank": true,
+      "title": "Grafana Docs",
+      "tooltip": "",
+      "type": "link",
+      "url": "https://grafana.com/docs/grafana/latest/"
+    },
+    {
+      "icon": "info",
+      "tags": [],
+      "targetBlank": true,
+      "title": "Prometheus Docs",
+      "type": "link",
+      "url": "http://prometheus.io/docs/introduction/overview/"
+    }
+  ],
+  "panels": [
+    {
+      "cacheTimeout": null,
+      "datasource": "${DS_GDEV-PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "decimals": 1,
+          "mappings": [
+            {
+              "options": {
+                "match": "null",
+                "result": {
+                  "text": "N/A"
+                }
+              },
+              "type": "special"
+            }
+          ],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "s"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 5,
+        "w": 6,
+        "x": 0,
+        "y": 0
+      },
+      "id": 5,
+      "interval": null,
+      "links": [],
+      "maxDataPoints": 100,
+      "options": {
+        "colorMode": "none",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": ["lastNotNull"],
+          "fields": "",
+          "values": false
+        },
+        "text": {},
+        "textMode": "auto"
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "(time() - process_start_time_seconds{job=\"prometheus\", instance=~\"$node\"})",
+          "intervalFactor": 2,
+          "refId": "A"
+        }
+      ],
+      "title": "Uptime",
+      "type": "stat"
+    },
+    {
+      "cacheTimeout": null,
+      "datasource": "${DS_GDEV-PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "rgb(31, 120, 193)",
+            "mode": "fixed"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "rgba(50, 172, 45, 0.97)",
+                "value": null
+              },
+              {
+                "color": "rgba(237, 129, 40, 0.89)",
+                "value": 1
+              },
+              {
+                "color": "rgba(245, 54, 54, 0.9)",
+                "value": 5
+              }
+            ]
+          },
+          "unit": "none"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 5,
+        "w": 6,
+        "x": 6,
+        "y": 0
+      },
+      "id": 6,
+      "interval": null,
+      "links": [],
+      "maxDataPoints": 100,
+      "options": {
+        "colorMode": "none",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": ["lastNotNull"],
+          "fields": "",
+          "values": false
+        },
+        "text": {},
+        "textMode": "auto"
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "prometheus_local_storage_memory_series{instance=~\"$node\"}",
+          "intervalFactor": 2,
+          "refId": "A"
+        }
+      ],
+      "title": "Local Storage Memory Series",
+      "type": "stat"
+    },
+    {
+      "cacheTimeout": null,
+      "datasource": "${DS_GDEV-PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [
+            {
+              "options": {
+                "0": {
+                  "text": "Empty"
+                }
+              },
+              "type": "value"
+            }
+          ],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "rgba(50, 172, 45, 0.97)",
+                "value": null
+              },
+              {
+                "color": "rgba(237, 129, 40, 0.89)",
+                "value": 500
+              },
+              {
+                "color": "rgba(245, 54, 54, 0.9)",
+                "value": 4000
+              }
+            ]
+          },
+          "unit": "none"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 5,
+        "w": 6,
+        "x": 12,
+        "y": 0
+      },
+      "id": 7,
+      "interval": null,
+      "links": [],
+      "maxDataPoints": 100,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": ["lastNotNull"],
+          "fields": "",
+          "values": false
+        },
+        "text": {},
+        "textMode": "auto"
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "prometheus_local_storage_indexing_queue_length{instance=~\"$node\"}",
+          "intervalFactor": 2,
+          "refId": "A"
+        }
+      ],
+      "title": "Internal Storage Queue Length",
+      "type": "stat"
+    },
+    {
+      "datasource": null,
+      "editable": true,
+      "error": false,
+      "gridPos": {
+        "h": 5,
+        "w": 6,
+        "x": 18,
+        "y": 0
+      },
+      "id": 9,
+      "links": [],
+      "options": {
+        "content": "<span style=\"font-family: 'Open Sans', 'Helvetica Neue', Helvetica; font-size: 25px;vertical-align: text-top;color: #bbbfc2;margin-left: 10px;\">Prometheus</span>\n\n<p style=\"margin-top: 10px;\">You're using Prometheus, an open-source systems monitoring and alerting toolkit originally built at SoundCloud. For more information, check out the <a href=\"https://grafana.com/\">Grafana</a> and <a href=\"http://prometheus.io/\">Prometheus</a> projects.</p>",
+        "mode": "html"
+      },
+      "pluginVersion": "8.1.0-pre",
+      "style": {},
+      "transparent": true,
+      "type": "text"
+    },
+    {
+      "datasource": "${DS_GDEV-PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 2,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "prometheus"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#C15C17",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "{instance=\"localhost:9090\",job=\"prometheus\"}"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#C15C17",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 18,
+        "x": 0,
+        "y": 5
+      },
+      "id": 3,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "rate(prometheus_local_storage_ingested_samples_total{instance=~\"$node\"}[5m])",
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "{{job}}",
+          "metric": "",
+          "refId": "A"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Samples ingested (rate-5m)",
+      "type": "timeseries"
+    },
+    {
+      "datasource": null,
+      "editable": true,
+      "error": false,
+      "gridPos": {
+        "h": 6,
+        "w": 4,
+        "x": 18,
+        "y": 5
+      },
+      "id": 8,
+      "links": [],
+      "options": {
+        "content": "#### Samples Ingested\nThis graph displays the count of samples ingested by the Prometheus server, as measured over the last 5 minutes, per time series in the range vector. When troubleshooting an issue on IRC or GitHub, this is often the first stat requested by the Prometheus team. ",
+        "mode": "markdown"
+      },
+      "pluginVersion": "8.1.0-pre",
+      "style": {},
+      "transparent": true,
+      "type": "text"
+    },
+    {
+      "datasource": "${DS_GDEV-PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 2,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "prometheus"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#F9BA8F",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "{instance=\"localhost:9090\",interval=\"5s\",job=\"prometheus\"}"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#F9BA8F",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 10,
+        "x": 0,
+        "y": 11
+      },
+      "id": 2,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "rate(prometheus_target_interval_length_seconds_count{instance=~\"$node\"}[5m])",
+          "intervalFactor": 2,
+          "legendFormat": "{{job}}",
+          "refId": "A"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Target Scrapes (last 5m)",
+      "type": "timeseries"
+    },
+    {
+      "datasource": "${DS_GDEV-PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 2,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 10,
+        "y": 11
+      },
+      "id": 14,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "prometheus_target_interval_length_seconds{quantile!=\"0.01\", quantile!=\"0.05\",instance=~\"$node\"}",
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "{{quantile}} ({{interval}})",
+          "metric": "",
+          "refId": "A"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Scrape Duration",
+      "type": "timeseries"
+    },
+    {
+      "datasource": null,
+      "editable": true,
+      "error": false,
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 18,
+        "y": 11
+      },
+      "id": 11,
+      "links": [],
+      "options": {
+        "content": "#### Scrapes\nPrometheus scrapes metrics from instrumented jobs, either directly or via an intermediary push gateway for short-lived jobs. Target scrapes will show how frequently targets are scraped, as measured over the last 5 minutes, per time series in the range vector. Scrape Duration will show how long the scrapes are taking, with percentiles available as series. ",
+        "mode": "markdown"
+      },
+      "pluginVersion": "8.1.0-pre",
+      "style": {},
+      "transparent": true,
+      "type": "text"
+    },
+    {
+      "datasource": "${DS_GDEV-PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 2,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "percentunit"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 18,
+        "x": 0,
+        "y": 18
+      },
+      "id": 12,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "8.1.0-pre",
+      "targets": [
+        {
+          "expr": "prometheus_evaluator_duration_seconds{quantile!=\"0.01\", quantile!=\"0.05\",instance=~\"$node\"}",
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "{{quantile}}",
+          "refId": "A"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Rule Eval Duration",
+      "type": "timeseries"
+    },
+    {
+      "datasource": null,
+      "editable": true,
+      "error": false,
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 18,
+        "y": 18
+      },
+      "id": 15,
+      "links": [],
+      "options": {
+        "content": "#### Rule Evaluation Duration\nThis graph panel plots the duration for all evaluations to execute. The 50th percentile, 90th percentile and 99th percentile are shown as three separate series to help identify outliers that may be skewing the data.",
+        "mode": "markdown"
+      },
+      "pluginVersion": "8.1.0-pre",
+      "style": {},
+      "transparent": true,
+      "type": "text"
+    }
+  ],
+  "refresh": false,
+  "revision": "1.0",
+  "schemaVersion": 30,
+  "tags": ["prometheus"],
+  "templating": {
+    "list": [
+      {
+        "allValue": null,
+        "current": {},
+        "datasource": "${DS_GDEV-PROMETHEUS}",
+        "definition": "",
+        "description": null,
+        "error": null,
+        "hide": 0,
+        "includeAll": false,
+        "label": "HOST:",
+        "multi": false,
+        "name": "node",
+        "options": [],
+        "query": {
+          "query": "label_values(prometheus_build_info, instance)",
+          "refId": "gdev-prometheus-node-Variable-Query"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 1,
+        "tagValuesQuery": "",
+        "tagsQuery": "",
+        "type": "query",
+        "useTags": false
+      }
+    ]
+  },
+  "time": {
+    "from": "now-5m",
+    "to": "now"
+  },
+  "timepicker": {
+    "now": true,
+    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
+    "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
+  },
+  "timezone": "browser",
+  "title": "Prometheus Stats",
+  "uid": "rpfmFFz7z",
+  "version": 2
+}
diff --git a/packages/grafana-prometheus/src/dataquery.ts b/packages/grafana-prometheus/src/dataquery.ts
new file mode 100644
index 0000000000000..545a32345b74a
--- /dev/null
+++ b/packages/grafana-prometheus/src/dataquery.ts
@@ -0,0 +1,46 @@
+import { Scope } from '@grafana/data';
+import * as common from '@grafana/schema';
+
+export enum QueryEditorMode {
+  Builder = 'builder',
+  Code = 'code',
+}
+
+export type PromQueryFormat = 'time_series' | 'table' | 'heatmap';
+
+export interface Prometheus extends common.DataQuery {
+  /**
+   * Specifies which editor is being used to prepare the query. It can be "code" or "builder"
+   */
+  editorMode?: QueryEditorMode;
+  /**
+   * Execute an additional query to identify interesting raw samples relevant for the given expr
+   */
+  exemplar?: boolean;
+  /**
+   * The actual expression/query that will be evaluated by Prometheus
+   */
+  expr: string;
+  /**
+   * Query format to determine how to display data points in panel. It can be "time_series", "table", "heatmap"
+   */
+  format?: PromQueryFormat;
+  /**
+   * Returns only the latest value that Prometheus has scraped for the requested time series
+   */
+  instant?: boolean;
+  /**
+   * @deprecated Used to specify how many times to divide max data points by. We use max data points under query options
+   * See https://github.com/grafana/grafana/issues/48081
+   */
+  intervalFactor?: number;
+  /**
+   * Series name override or template. Ex. {{hostname}} will be replaced with label value for hostname
+   */
+  legendFormat?: string;
+  /**
+   * Returns a Range vector, comprised of a set of time series containing a range of data points over time for each time series
+   */
+  range?: boolean;
+  scope?: Scope;
+}
diff --git a/packages/grafana-prometheus/src/datasource.test.ts b/packages/grafana-prometheus/src/datasource.test.ts
new file mode 100644
index 0000000000000..72f9c4572d8c2
--- /dev/null
+++ b/packages/grafana-prometheus/src/datasource.test.ts
@@ -0,0 +1,1296 @@
+import { cloneDeep } from 'lodash';
+import { lastValueFrom, of } from 'rxjs';
+
+import {
+  AnnotationEvent,
+  AnnotationQueryRequest,
+  CoreApp,
+  CustomVariableModel,
+  DataQueryRequest,
+  DataSourceInstanceSettings,
+  dateTime,
+  LoadingState,
+  rangeUtil,
+  TimeRange,
+  VariableHide,
+} from '@grafana/data';
+import { TemplateSrv } from '@grafana/runtime';
+
+import {
+  alignRange,
+  extractRuleMappingFromGroups,
+  PrometheusDatasource,
+  prometheusRegularEscape,
+  prometheusSpecialRegexEscape,
+} from './datasource';
+import PromQlLanguageProvider from './language_provider';
+import { PromApplication, PrometheusCacheLevel, PromOptions, PromQuery, PromQueryRequest } from './types';
+
+const fetchMock = jest.fn().mockReturnValue(of(createDefaultPromResponse()));
+
+jest.mock('./metric_find_query');
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getBackendSrv: () => ({
+    fetch: fetchMock,
+  }),
+}));
+
+const replaceMock = jest.fn().mockImplementation((a: string, ...rest: unknown[]) => a);
+
+const templateSrvStub = {
+  replace: replaceMock,
+} as unknown as TemplateSrv;
+
+const fromSeconds = 1674500289215;
+const toSeconds = 1674500349215;
+
+const mockTimeRangeOld: TimeRange = {
+  from: dateTime(1531468681),
+  to: dateTime(1531489712),
+  raw: {
+    from: '1531468681',
+    to: '1531489712',
+  },
+};
+
+const mockTimeRange: TimeRange = {
+  from: dateTime(fromSeconds),
+  to: dateTime(toSeconds),
+  raw: {
+    from: fromSeconds.toString(),
+    to: toSeconds.toString(),
+  },
+};
+
+beforeEach(() => {
+  jest.clearAllMocks();
+});
+
+describe('PrometheusDatasource', () => {
+  let ds: PrometheusDatasource;
+  const instanceSettings = {
+    url: 'proxied',
+    id: 1,
+    uid: 'ABCDEF',
+    access: 'proxy',
+    user: 'test',
+    password: 'mupp',
+    jsonData: {
+      customQueryParameters: '',
+      cacheLevel: PrometheusCacheLevel.Low,
+    } as Partial<PromOptions>,
+  } as unknown as DataSourceInstanceSettings<PromOptions>;
+
+  beforeEach(() => {
+    ds = new PrometheusDatasource(instanceSettings, templateSrvStub);
+  });
+
+  // Some functions are required by the parent datasource class to provide functionality such as ad-hoc filters, which requires the definition of the getTagKeys, and getTagValues functions
+  describe('Datasource contract', () => {
+    it('has function called getTagKeys', () => {
+      expect(Object.getOwnPropertyNames(Object.getPrototypeOf(ds))).toContain('getTagKeys');
+    });
+    it('has function called getTagValues', () => {
+      expect(Object.getOwnPropertyNames(Object.getPrototypeOf(ds))).toContain('getTagValues');
+    });
+  });
+
+  describe('Query', () => {
+    it('throws if using direct access', async () => {
+      const instanceSettings = {
+        url: 'proxied',
+        directUrl: 'direct',
+        user: 'test',
+        password: 'mupp',
+        access: 'direct',
+        jsonData: {
+          customQueryParameters: '',
+          prometheusVersion: '2.20.0',
+          prometheusType: PromApplication.Prometheus,
+        },
+      } as unknown as DataSourceInstanceSettings<PromOptions>;
+      const range = { from: time({ seconds: 63 }), to: time({ seconds: 183 }) };
+      const directDs = new PrometheusDatasource(instanceSettings, templateSrvStub);
+
+      await expect(
+        lastValueFrom(
+          directDs.query(
+            createDataRequest(
+              [
+                {
+                  expr: '',
+                  refId: 'A',
+                },
+                { expr: '', refId: 'B' },
+              ],
+              { app: CoreApp.Dashboard }
+            )
+          )
+        )
+      ).rejects.toMatchObject({ message: expect.stringMatching('Browser access') });
+
+      // Cannot test because some other tests need "./metric_find_query" to be mocked and that prevents this to be
+      // tested. Checked manually that this ends up with throwing
+      // await expect(directDs.metricFindQuery('label_names(foo)')).rejects.toBeDefined();
+
+      await expect(
+        directDs.annotationQuery({
+          range: { ...range, raw: range },
+          rangeRaw: range,
+          // Should be DataModel but cannot import that here from the main app. Needs to be moved to package first.
+          dashboard: {},
+          annotation: {
+            expr: 'metric',
+            name: 'test',
+            enable: true,
+            iconColor: '',
+          },
+        })
+      ).rejects.toMatchObject({
+        message: expect.stringMatching('Browser access'),
+      });
+
+      const errorMock = jest.spyOn(console, 'error').mockImplementation(() => {});
+
+      await directDs.getTagKeys({ filters: [] });
+      // Language provider currently catches and just logs the error
+      expect(errorMock).toHaveBeenCalledTimes(1);
+
+      await expect(directDs.getTagValues({ filters: [], key: 'A' })).rejects.toMatchObject({
+        message: expect.stringMatching('Browser access'),
+      });
+    });
+  });
+
+  describe('Datasource metadata requests', () => {
+    it('should perform a GET request with the default config', () => {
+      ds.metadataRequest('/foo', { bar: 'baz baz', foo: 'foo' });
+      expect(fetchMock.mock.calls.length).toBe(1);
+      expect(fetchMock.mock.calls[0][0].method).toBe('GET');
+      expect(fetchMock.mock.calls[0][0].url).toContain('bar=baz%20baz&foo=foo');
+    });
+    it('should still perform a GET request with the DS HTTP method set to POST and not POST-friendly endpoint', () => {
+      const postSettings = cloneDeep(instanceSettings);
+      postSettings.jsonData.httpMethod = 'POST';
+      const promDs = new PrometheusDatasource(postSettings, templateSrvStub);
+      promDs.metadataRequest('/foo');
+      expect(fetchMock.mock.calls.length).toBe(1);
+      expect(fetchMock.mock.calls[0][0].method).toBe('GET');
+    });
+    it('should try to perform a POST request with the DS HTTP method set to POST and POST-friendly endpoint', () => {
+      const postSettings = cloneDeep(instanceSettings);
+      postSettings.jsonData.httpMethod = 'POST';
+      const promDs = new PrometheusDatasource(postSettings, templateSrvStub);
+      promDs.metadataRequest('api/v1/series', { bar: 'baz baz', foo: 'foo' });
+      expect(fetchMock.mock.calls.length).toBe(1);
+      expect(fetchMock.mock.calls[0][0].method).toBe('POST');
+      expect(fetchMock.mock.calls[0][0].url).not.toContain('bar=baz%20baz&foo=foo');
+      expect(fetchMock.mock.calls[0][0].data).toEqual({ bar: 'baz baz', foo: 'foo' });
+    });
+  });
+
+  describe('customQueryParams', () => {
+    describe('with GET http method', () => {
+      const promDs = new PrometheusDatasource(
+        { ...instanceSettings, jsonData: { customQueryParameters: 'customQuery=123', httpMethod: 'GET' } },
+        templateSrvStub
+      );
+
+      it('added to metadata request', () => {
+        promDs.metadataRequest('/foo');
+        expect(fetchMock.mock.calls.length).toBe(1);
+        expect(fetchMock.mock.calls[0][0].url).toBe('/api/datasources/uid/ABCDEF/resources/foo?customQuery=123');
+      });
+    });
+
+    describe('with POST http method', () => {
+      const promDs = new PrometheusDatasource(
+        { ...instanceSettings, jsonData: { customQueryParameters: 'customQuery=123', httpMethod: 'POST' } },
+        templateSrvStub
+      );
+
+      it('added to metadata request with non-POST endpoint', () => {
+        promDs.metadataRequest('/foo');
+        expect(fetchMock.mock.calls.length).toBe(1);
+        expect(fetchMock.mock.calls[0][0].url).toBe('/api/datasources/uid/ABCDEF/resources/foo?customQuery=123');
+      });
+
+      it('added to metadata request with POST endpoint', () => {
+        promDs.metadataRequest('/api/v1/labels');
+        expect(fetchMock.mock.calls.length).toBe(1);
+        expect(fetchMock.mock.calls[0][0].url).toBe('/api/datasources/uid/ABCDEF/resources/api/v1/labels');
+        expect(fetchMock.mock.calls[0][0].data.customQuery).toBe('123');
+      });
+    });
+  });
+
+  describe('When using adhoc filters', () => {
+    const DEFAULT_QUERY_EXPRESSION = 'metric{job="foo"} - metric';
+    const target: PromQuery = { expr: DEFAULT_QUERY_EXPRESSION, refId: 'A' };
+
+    it('should not modify expression with no filters', () => {
+      const result = ds.createQuery(
+        target,
+        { interval: '15s', range: getMockTimeRange() } as DataQueryRequest<PromQuery>,
+        0,
+        0
+      );
+      expect(result).toMatchObject({ expr: DEFAULT_QUERY_EXPRESSION });
+    });
+
+    it('should add filters to expression', () => {
+      const filters = [
+        {
+          key: 'k1',
+          operator: '=',
+          value: 'v1',
+        },
+        {
+          key: 'k2',
+          operator: '!=',
+          value: 'v2',
+        },
+      ];
+      const result = ds.createQuery(
+        target,
+        { interval: '15s', range: getMockTimeRange(), filters } as DataQueryRequest<PromQuery>,
+        0,
+        0
+      );
+      expect(result).toMatchObject({ expr: 'metric{job="foo", k1="v1", k2!="v2"} - metric{k1="v1", k2!="v2"}' });
+    });
+
+    it('should add escaping if needed to regex filter expressions', () => {
+      const filters = [
+        {
+          key: 'k1',
+          operator: '=~',
+          value: 'v.*',
+        },
+        {
+          key: 'k2',
+          operator: '=~',
+          value: `v'.*`,
+        },
+      ];
+
+      const result = ds.createQuery(
+        target,
+        { interval: '15s', range: getMockTimeRange(), filters } as DataQueryRequest<PromQuery>,
+        0,
+        0
+      );
+      expect(result).toMatchObject({
+        expr: `metric{job="foo", k1=~"v.*", k2=~"v\\\\'.*"} - metric{k1=~"v.*", k2=~"v\\\\'.*"}`,
+      });
+    });
+  });
+
+  describe('Test query range snapping', () => {
+    it('test default 1 minute quantization', () => {
+      const dataSource = new PrometheusDatasource(
+        {
+          ...instanceSettings,
+          jsonData: { ...instanceSettings.jsonData, cacheLevel: PrometheusCacheLevel.Low },
+        },
+        templateSrvStub as unknown as TemplateSrv
+      );
+      const quantizedRange = dataSource.getAdjustedInterval(mockTimeRange);
+      // For "1 minute" the window contains all the minutes, so a query from 1:11:09 - 1:12:09 becomes 1:11 - 1:13
+      expect(parseInt(quantizedRange.end, 10) - parseInt(quantizedRange.start, 10)).toBe(120);
+    });
+
+    it('test 10 minute quantization', () => {
+      const dataSource = new PrometheusDatasource(
+        {
+          ...instanceSettings,
+          jsonData: { ...instanceSettings.jsonData, cacheLevel: PrometheusCacheLevel.Medium },
+        },
+        templateSrvStub as unknown as TemplateSrv
+      );
+      const quantizedRange = dataSource.getAdjustedInterval(mockTimeRange);
+      expect(parseInt(quantizedRange.end, 10) - parseInt(quantizedRange.start, 10)).toBe(600);
+    });
+
+    it('test 60 minute quantization', () => {
+      const dataSource = new PrometheusDatasource(
+        {
+          ...instanceSettings,
+          jsonData: { ...instanceSettings.jsonData, cacheLevel: PrometheusCacheLevel.High },
+        },
+        templateSrvStub as unknown as TemplateSrv
+      );
+      const quantizedRange = dataSource.getAdjustedInterval(mockTimeRange);
+      expect(parseInt(quantizedRange.end, 10) - parseInt(quantizedRange.start, 10)).toBe(3600);
+    });
+
+    it('test quantization turned off', () => {
+      const dataSource = new PrometheusDatasource(
+        {
+          ...instanceSettings,
+          jsonData: { ...instanceSettings.jsonData, cacheLevel: PrometheusCacheLevel.None },
+        },
+        templateSrvStub as unknown as TemplateSrv
+      );
+      const quantizedRange = dataSource.getAdjustedInterval(mockTimeRange);
+      expect(parseInt(quantizedRange.end, 10) - parseInt(quantizedRange.start, 10)).toBe(
+        (toSeconds - fromSeconds) / 1000
+      );
+    });
+  });
+
+  describe('alignRange', () => {
+    it('does not modify already aligned intervals with perfect step', () => {
+      const range = alignRange(0, 3, 3, 0);
+      expect(range.start).toEqual(0);
+      expect(range.end).toEqual(3);
+    });
+
+    it('does modify end-aligned intervals to reflect number of steps possible', () => {
+      const range = alignRange(1, 6, 3, 0);
+      expect(range.start).toEqual(0);
+      expect(range.end).toEqual(6);
+    });
+
+    it('does align intervals that are a multiple of steps', () => {
+      const range = alignRange(1, 4, 3, 0);
+      expect(range.start).toEqual(0);
+      expect(range.end).toEqual(3);
+    });
+
+    it('does align intervals that are not a multiple of steps', () => {
+      const range = alignRange(1, 5, 3, 0);
+      expect(range.start).toEqual(0);
+      expect(range.end).toEqual(3);
+    });
+
+    it('does align intervals with local midnight -UTC offset', () => {
+      //week range, location 4+ hours UTC offset, 24h step time
+      const range = alignRange(4 * 60 * 60, (7 * 24 + 4) * 60 * 60, 24 * 60 * 60, -4 * 60 * 60); //04:00 UTC, 7 day range
+      expect(range.start).toEqual(4 * 60 * 60);
+      expect(range.end).toEqual((7 * 24 + 4) * 60 * 60);
+    });
+
+    it('does align intervals with local midnight +UTC offset', () => {
+      //week range, location 4- hours UTC offset, 24h step time
+      const range = alignRange(20 * 60 * 60, (8 * 24 - 4) * 60 * 60, 24 * 60 * 60, 4 * 60 * 60); //20:00 UTC on day1, 7 days later is 20:00 on day8
+      expect(range.start).toEqual(20 * 60 * 60);
+      expect(range.end).toEqual((8 * 24 - 4) * 60 * 60);
+    });
+  });
+
+  describe('extractRuleMappingFromGroups()', () => {
+    it('returns empty mapping for no rule groups', () => {
+      expect(extractRuleMappingFromGroups([])).toEqual({});
+    });
+
+    it('returns a mapping for recording rules only', () => {
+      const groups = [
+        {
+          rules: [
+            {
+              name: 'HighRequestLatency',
+              query: 'job:request_latency_seconds:mean5m{job="myjob"} > 0.5',
+              type: 'alerting',
+            },
+            {
+              name: 'job:http_inprogress_requests:sum',
+              query: 'sum(http_inprogress_requests) by (job)',
+              type: 'recording',
+            },
+          ],
+          file: '/rules.yaml',
+          interval: 60,
+          name: 'example',
+        },
+      ];
+      const mapping = extractRuleMappingFromGroups(groups);
+      expect(mapping).toEqual({ 'job:http_inprogress_requests:sum': 'sum(http_inprogress_requests) by (job)' });
+    });
+  });
+
+  describe('Prometheus regular escaping', () => {
+    it('should not escape non-string', () => {
+      expect(prometheusRegularEscape(12)).toEqual(12);
+    });
+
+    it('should not escape simple string', () => {
+      expect(prometheusRegularEscape('cryptodepression')).toEqual('cryptodepression');
+    });
+
+    it("should escape '", () => {
+      expect(prometheusRegularEscape("looking'glass")).toEqual("looking\\\\'glass");
+    });
+
+    it('should escape \\', () => {
+      expect(prometheusRegularEscape('looking\\glass')).toEqual('looking\\\\glass');
+    });
+
+    it('should escape multiple characters', () => {
+      expect(prometheusRegularEscape("'looking'glass'")).toEqual("\\\\'looking\\\\'glass\\\\'");
+    });
+
+    it('should escape multiple different characters', () => {
+      expect(prometheusRegularEscape("'loo\\king'glass'")).toEqual("\\\\'loo\\\\king\\\\'glass\\\\'");
+    });
+  });
+
+  describe('Prometheus regexes escaping', () => {
+    it('should not escape simple string', () => {
+      expect(prometheusSpecialRegexEscape('cryptodepression')).toEqual('cryptodepression');
+    });
+
+    it('should escape $^*+?.()|\\', () => {
+      expect(prometheusSpecialRegexEscape("looking'glass")).toEqual("looking\\\\'glass");
+      expect(prometheusSpecialRegexEscape('looking{glass')).toEqual('looking\\\\{glass');
+      expect(prometheusSpecialRegexEscape('looking}glass')).toEqual('looking\\\\}glass');
+      expect(prometheusSpecialRegexEscape('looking[glass')).toEqual('looking\\\\[glass');
+      expect(prometheusSpecialRegexEscape('looking]glass')).toEqual('looking\\\\]glass');
+      expect(prometheusSpecialRegexEscape('looking$glass')).toEqual('looking\\\\$glass');
+      expect(prometheusSpecialRegexEscape('looking^glass')).toEqual('looking\\\\^glass');
+      expect(prometheusSpecialRegexEscape('looking*glass')).toEqual('looking\\\\*glass');
+      expect(prometheusSpecialRegexEscape('looking+glass')).toEqual('looking\\\\+glass');
+      expect(prometheusSpecialRegexEscape('looking?glass')).toEqual('looking\\\\?glass');
+      expect(prometheusSpecialRegexEscape('looking.glass')).toEqual('looking\\\\.glass');
+      expect(prometheusSpecialRegexEscape('looking(glass')).toEqual('looking\\\\(glass');
+      expect(prometheusSpecialRegexEscape('looking)glass')).toEqual('looking\\\\)glass');
+      expect(prometheusSpecialRegexEscape('looking\\glass')).toEqual('looking\\\\\\\\glass');
+      expect(prometheusSpecialRegexEscape('looking|glass')).toEqual('looking\\\\|glass');
+    });
+
+    it('should escape multiple special characters', () => {
+      expect(prometheusSpecialRegexEscape('+looking$glass?')).toEqual('\\\\+looking\\\\$glass\\\\?');
+    });
+  });
+
+  describe('When interpolating variables', () => {
+    let customVariable: CustomVariableModel;
+    beforeEach(() => {
+      customVariable = {
+        id: '',
+        global: false,
+        multi: false,
+        includeAll: false,
+        allValue: null,
+        query: '',
+        options: [],
+        current: {},
+        name: '',
+        type: 'custom',
+        error: null,
+        rootStateKey: '',
+        state: LoadingState.Done,
+        description: '',
+        label: undefined,
+        hide: VariableHide.dontHide,
+        skipUrlSync: false,
+        index: -1,
+      };
+    });
+
+    describe('and value is a string', () => {
+      it('should only escape single quotes', () => {
+        expect(ds.interpolateQueryExpr("abc'$^*{}[]+?.()|", customVariable)).toEqual("abc\\\\'$^*{}[]+?.()|");
+      });
+    });
+
+    describe('and value is a number', () => {
+      it('should return a number', () => {
+        expect(ds.interpolateQueryExpr(1000 as unknown as string, customVariable)).toEqual(1000);
+      });
+    });
+
+    describe('and variable allows multi-value', () => {
+      beforeEach(() => {
+        customVariable.multi = true;
+      });
+
+      it('should regex escape values if the value is a string', () => {
+        expect(ds.interpolateQueryExpr('looking*glass', customVariable)).toEqual('looking\\\\*glass');
+      });
+
+      it('should return pipe separated values if the value is an array of strings', () => {
+        expect(ds.interpolateQueryExpr(['a|bc', 'de|f'], customVariable)).toEqual('(a\\\\|bc|de\\\\|f)');
+      });
+
+      it('should return 1 regex escaped value if there is just 1 value in an array of strings', () => {
+        expect(ds.interpolateQueryExpr(['looking*glass'], customVariable)).toEqual('looking\\\\*glass');
+      });
+    });
+
+    describe('and variable allows all', () => {
+      beforeEach(() => {
+        customVariable.includeAll = true;
+      });
+
+      it('should regex escape values if the array is a string', () => {
+        expect(ds.interpolateQueryExpr('looking*glass', customVariable)).toEqual('looking\\\\*glass');
+      });
+
+      it('should return pipe separated values if the value is an array of strings', () => {
+        expect(ds.interpolateQueryExpr(['a|bc', 'de|f'], customVariable)).toEqual('(a\\\\|bc|de\\\\|f)');
+      });
+
+      it('should return 1 regex escaped value if there is just 1 value in an array of strings', () => {
+        expect(ds.interpolateQueryExpr(['looking*glass'], customVariable)).toEqual('looking\\\\*glass');
+      });
+    });
+  });
+
+  describe('interpolateVariablesInQueries', () => {
+    it('should call replace function 2 times', () => {
+      const query: PromQuery = {
+        expr: 'test{job="testjob"}',
+        format: 'time_series',
+        interval: '$Interval',
+        refId: 'A',
+      };
+      const interval = '10m';
+      replaceMock.mockReturnValue(interval);
+
+      const queries = ds.interpolateVariablesInQueries([query], { Interval: { text: interval, value: interval } });
+      expect(templateSrvStub.replace).toBeCalledTimes(2);
+      expect(queries[0].interval).toBe(interval);
+    });
+
+    it('should call enhanceExprWithAdHocFilters', () => {
+      ds.enhanceExprWithAdHocFilters = jest.fn();
+      const queries = [
+        {
+          refId: 'A',
+          expr: 'rate({bar="baz", job="foo"} [5m]',
+        },
+      ];
+      ds.interpolateVariablesInQueries(queries, {});
+      expect(ds.enhanceExprWithAdHocFilters).toHaveBeenCalled();
+    });
+  });
+
+  describe('applyTemplateVariables', () => {
+    afterAll(() => {
+      replaceMock.mockImplementation((a: string, ...rest: unknown[]) => a);
+    });
+
+    it('should call replace function for legendFormat', () => {
+      const query = {
+        expr: 'test{job="bar"}',
+        legendFormat: '$legend',
+        refId: 'A',
+      };
+      const legend = 'baz';
+      replaceMock.mockReturnValue(legend);
+
+      const interpolatedQuery = ds.applyTemplateVariables(query, { legend: { text: legend, value: legend } });
+      expect(interpolatedQuery.legendFormat).toBe(legend);
+    });
+
+    it('should call replace function for interval', () => {
+      const query = {
+        expr: 'test{job="bar"}',
+        interval: '$step',
+        refId: 'A',
+      };
+      const step = '5s';
+      replaceMock.mockReturnValue(step);
+
+      const interpolatedQuery = ds.applyTemplateVariables(query, { step: { text: step, value: step } });
+      expect(interpolatedQuery.interval).toBe(step);
+    });
+
+    it('should call replace function for expr', () => {
+      const query = {
+        expr: 'test{job="$job"}',
+        refId: 'A',
+      };
+      const job = 'bar';
+      replaceMock.mockReturnValue(job);
+
+      const interpolatedQuery = ds.applyTemplateVariables(query, { job: { text: job, value: job } });
+      expect(interpolatedQuery.expr).toBe(job);
+    });
+
+    it('should add ad-hoc filters to expr', () => {
+      replaceMock.mockImplementation((a: string) => a);
+      const filters = [
+        {
+          key: 'k1',
+          operator: '=',
+          value: 'v1',
+        },
+        {
+          key: 'k2',
+          operator: '!=',
+          value: 'v2',
+        },
+      ];
+
+      const query = {
+        expr: 'test{job="bar"}',
+        refId: 'A',
+      };
+
+      const result = ds.applyTemplateVariables(query, {}, filters);
+      expect(result).toMatchObject({ expr: 'test{job="bar", k1="v1", k2!="v2"}' });
+    });
+
+    it('should add ad-hoc filters only to expr', () => {
+      replaceMock.mockImplementation((a: string) => a?.replace('$A', '99') ?? a);
+      const filters = [
+        {
+          key: 'k1',
+          operator: '=',
+          value: 'v1',
+        },
+        {
+          key: 'k2',
+          operator: '!=',
+          value: 'v2',
+        },
+      ];
+
+      const query = {
+        expr: 'test{job="bar"} > $A',
+        refId: 'A',
+      };
+
+      const result = ds.applyTemplateVariables(query, {}, filters);
+      expect(result).toMatchObject({ expr: 'test{job="bar", k1="v1", k2!="v2"} > 99' });
+    });
+
+    it('should add ad-hoc filters only to expr and expression has template variable as label value??', () => {
+      const searchPattern = /\$A/g;
+      replaceMock.mockImplementation((a: string) => a?.replace(searchPattern, '99') ?? a);
+      const filters = [
+        {
+          key: 'k1',
+          operator: '=',
+          value: 'v1',
+        },
+        {
+          key: 'k2',
+          operator: '!=',
+          value: 'v2',
+        },
+      ];
+
+      const query = {
+        expr: 'test{job="$A"} > $A',
+        refId: 'A',
+      };
+
+      const result = ds.applyTemplateVariables(query, {}, filters);
+      expect(result).toMatchObject({ expr: 'test{job="99", k1="v1", k2!="v2"} > 99' });
+    });
+  });
+
+  describe('metricFindQuery', () => {
+    beforeEach(() => {
+      const prometheusDatasource = new PrometheusDatasource(
+        { ...instanceSettings, jsonData: { ...instanceSettings.jsonData, cacheLevel: PrometheusCacheLevel.None } },
+        templateSrvStub
+      );
+      const query = 'query_result(topk(5,rate(http_request_duration_microseconds_count[$__interval])))';
+      prometheusDatasource.metricFindQuery(query, { range: mockTimeRangeOld });
+    });
+
+    it('should call templateSrv.replace with scopedVars', () => {
+      expect(replaceMock.mock.calls[0][1]).toBeDefined();
+    });
+
+    it('should have the correct range and range_ms', () => {
+      const range = replaceMock.mock.calls[0][1].__range;
+      const rangeMs = replaceMock.mock.calls[0][1].__range_ms;
+      const rangeS = replaceMock.mock.calls[0][1].__range_s;
+      expect(range).toEqual({ text: '21s', value: '21s' });
+      expect(rangeMs).toEqual({ text: 21031, value: 21031 });
+      expect(rangeS).toEqual({ text: 21, value: 21 });
+    });
+
+    it('should pass the default interval value', () => {
+      const interval = replaceMock.mock.calls[0][1].__interval;
+      const intervalMs = replaceMock.mock.calls[0][1].__interval_ms;
+      expect(interval).toEqual({ text: '15s', value: '15s' });
+      expect(intervalMs).toEqual({ text: 15000, value: 15000 });
+    });
+  });
+});
+
+const SECOND = 1000;
+const MINUTE = 60 * SECOND;
+const HOUR = 60 * MINUTE;
+
+const time = ({ hours = 0, seconds = 0, minutes = 0 }) => dateTime(hours * HOUR + minutes * MINUTE + seconds * SECOND);
+
+describe('PrometheusDatasource2', () => {
+  const instanceSettings = {
+    url: 'proxied',
+    id: 1,
+    uid: 'ABCDEF',
+    user: 'test',
+    password: 'mupp',
+    jsonData: { httpMethod: 'GET', cacheLevel: PrometheusCacheLevel.None },
+  } as unknown as DataSourceInstanceSettings<PromOptions>;
+
+  let ds: PrometheusDatasource;
+  beforeEach(() => {
+    ds = new PrometheusDatasource(instanceSettings, templateSrvStub);
+  });
+
+  describe('annotationQuery', () => {
+    let results: AnnotationEvent[];
+    const options = {
+      annotation: {
+        expr: 'ALERTS{alertstate="firing"}',
+        tagKeys: 'job',
+        titleFormat: '{{alertname}}',
+        textFormat: '{{instance}}',
+      },
+      range: {
+        from: time({ seconds: 63 }),
+        to: time({ seconds: 123 }),
+      },
+    } as unknown as AnnotationQueryRequest<PromQuery>;
+
+    const response = createAnnotationResponse();
+    const emptyResponse = createEmptyAnnotationResponse();
+
+    describe('handle result with empty fields', () => {
+      it('should return empty results', async () => {
+        fetchMock.mockImplementation(() => of(emptyResponse));
+
+        await ds.annotationQuery(options).then((data) => {
+          results = data;
+        });
+
+        expect(results.length).toBe(0);
+      });
+    });
+
+    describe('when time series query is cancelled', () => {
+      it('should return empty results', async () => {
+        fetchMock.mockImplementation(() => of({ cancelled: true }));
+
+        await ds.annotationQuery(options).then((data) => {
+          results = data;
+        });
+
+        expect(results).toEqual([]);
+      });
+    });
+
+    describe('not use useValueForTime', () => {
+      beforeEach(async () => {
+        options.annotation.useValueForTime = false;
+        fetchMock.mockImplementation(() => of(response));
+
+        await ds.annotationQuery(options).then((data) => {
+          results = data;
+        });
+      });
+
+      it('should return annotation list', () => {
+        expect(results.length).toBe(1);
+        expect(results[0].tags).toContain('testjob');
+        expect(results[0].title).toBe('InstanceDown');
+        expect(results[0].text).toBe('testinstance');
+        expect(results[0].time).toBe(123);
+      });
+    });
+
+    describe('use useValueForTime', () => {
+      beforeEach(async () => {
+        options.annotation.useValueForTime = true;
+        fetchMock.mockImplementation(() => of(response));
+
+        await ds.annotationQuery(options).then((data) => {
+          results = data;
+        });
+      });
+
+      it('should return annotation list', () => {
+        expect(results[0].time).toEqual(456);
+      });
+    });
+
+    describe('step parameter', () => {
+      beforeEach(() => {
+        fetchMock.mockImplementation(() => of(response));
+      });
+
+      it('should use default step for short range if no interval is given', () => {
+        const query = {
+          ...options,
+          range: {
+            from: time({ seconds: 63 }),
+            to: time({ seconds: 123 }),
+          },
+        } as AnnotationQueryRequest<PromQuery>;
+        ds.annotationQuery(query);
+        const req = fetchMock.mock.calls[0][0];
+        expect(req.data.queries[0].interval).toBe('60s');
+      });
+
+      it('should use default step for short range when annotation step is empty string', () => {
+        const query = {
+          ...options,
+          annotation: {
+            ...options.annotation,
+            step: '',
+          },
+          range: {
+            from: time({ seconds: 63 }),
+            to: time({ seconds: 123 }),
+          },
+        } as unknown as AnnotationQueryRequest<PromQuery>;
+        ds.annotationQuery(query);
+        const req = fetchMock.mock.calls[0][0];
+        expect(req.data.queries[0].interval).toBe('60s');
+      });
+
+      it('should use custom step for short range', () => {
+        const annotation = {
+          ...options.annotation,
+          step: '10s',
+        };
+        const query = {
+          ...options,
+          annotation,
+          range: {
+            from: time({ seconds: 63 }),
+            to: time({ seconds: 123 }),
+          },
+        } as unknown as AnnotationQueryRequest<PromQuery>;
+        ds.annotationQuery(query);
+        const req = fetchMock.mock.calls[0][0];
+        expect(req.data.queries[0].interval).toBe('10s');
+      });
+    });
+
+    describe('region annotations for sectors', () => {
+      const options = {
+        annotation: {
+          expr: 'ALERTS{alertstate="firing"}',
+          tagKeys: 'job',
+          titleFormat: '{{alertname}}',
+          textFormat: '{{instance}}',
+        },
+        range: {
+          from: time({ seconds: 63 }),
+          to: time({ seconds: 900 }),
+        },
+      } as unknown as AnnotationQueryRequest;
+
+      async function runAnnotationQuery(data: number[][]) {
+        let response = createAnnotationResponse();
+        response.data.results['X'].frames[0].data.values = data;
+
+        options.annotation.useValueForTime = false;
+        fetchMock.mockImplementation(() => of(response));
+
+        return ds.annotationQuery(options);
+      }
+
+      it('should handle gaps and inactive values', async () => {
+        const results = await runAnnotationQuery([
+          [2 * 60000, 3 * 60000, 5 * 60000, 6 * 60000, 7 * 60000, 8 * 60000, 9 * 60000],
+          [1, 1, 1, 1, 1, 0, 1],
+        ]);
+        expect(results.map((result) => [result.time, result.timeEnd])).toEqual([
+          [120000, 180000],
+          [300000, 420000],
+          [540000, 540000],
+        ]);
+      });
+
+      it('should handle single region', async () => {
+        const results = await runAnnotationQuery([
+          [2 * 60000, 3 * 60000],
+          [1, 1],
+        ]);
+        expect(results.map((result) => [result.time, result.timeEnd])).toEqual([[120000, 180000]]);
+      });
+
+      it('should handle 0 active regions', async () => {
+        const results = await runAnnotationQuery([
+          [2 * 60000, 3 * 60000, 5 * 60000],
+          [0, 0, 0],
+        ]);
+        expect(results.length).toBe(0);
+      });
+
+      it('should handle single active value', async () => {
+        const results = await runAnnotationQuery([[2 * 60000], [1]]);
+        expect(results.map((result) => [result.time, result.timeEnd])).toEqual([[120000, 120000]]);
+      });
+    });
+
+    describe('with template variables', () => {
+      afterAll(() => {
+        replaceMock.mockImplementation((a: string, ...rest: unknown[]) => a);
+      });
+
+      it('should interpolate variables in query expr', () => {
+        const query = {
+          ...options,
+          annotation: {
+            ...options.annotation,
+            expr: '$variable',
+          },
+          range: {
+            from: time({ seconds: 1 }),
+            to: time({ seconds: 2 }),
+          },
+        } as unknown as AnnotationQueryRequest<PromQuery>;
+        const interpolated = 'interpolated_expr';
+        replaceMock.mockReturnValue(interpolated);
+        ds.annotationQuery(query);
+        const req = fetchMock.mock.calls[0][0];
+        expect(req.data.queries[0].expr).toBe(interpolated);
+      });
+    });
+  });
+
+  describe('The __rate_interval variable', () => {
+    const target = { expr: 'rate(process_cpu_seconds_total[$__rate_interval])', refId: 'A' };
+
+    beforeEach(() => {
+      replaceMock.mockClear();
+    });
+
+    it('should be 4 times the scrape interval if interval + scrape interval is lower', () => {
+      ds.createQuery(target, { interval: '15s', range: getMockTimeRange() } as DataQueryRequest<PromQuery>, 0, 300);
+      expect(replaceMock.mock.calls[1][1]['__rate_interval'].value).toBe('60s');
+    });
+    it('should be interval + scrape interval if 4 times the scrape interval is lower', () => {
+      ds.createQuery(
+        target,
+        {
+          interval: '5m',
+          range: getMockTimeRange(),
+        } as DataQueryRequest<PromQuery>,
+        0,
+        10080
+      );
+      expect(replaceMock.mock.calls[1][1]['__rate_interval'].value).toBe('315s');
+    });
+    it('should fall back to a scrape interval of 15s if min step is set to 0, resulting in 4*15s = 60s', () => {
+      ds.createQuery(
+        { ...target, interval: '' },
+        { interval: '15s', range: getMockTimeRange() } as DataQueryRequest<PromQuery>,
+        0,
+        300
+      );
+      expect(replaceMock.mock.calls[1][1]['__rate_interval'].value).toBe('60s');
+    });
+    it('should be 4 times the scrape interval if min step set to 1m and interval is 15s', () => {
+      // For a 5m graph, $__interval is 15s
+      ds.createQuery(
+        { ...target, interval: '1m' },
+        { interval: '15s', range: getMockTimeRange() } as DataQueryRequest<PromQuery>,
+        0,
+        300
+      );
+      expect(replaceMock.mock.calls[2][1]['__rate_interval'].value).toBe('240s');
+    });
+    it('should be interval + scrape interval if min step set to 1m and interval is 5m', () => {
+      // For a 7d graph, $__interval is 5m
+      ds.createQuery(
+        { ...target, interval: '1m' },
+        { interval: '5m', range: getMockTimeRange() } as DataQueryRequest<PromQuery>,
+        0,
+        10080
+      );
+      expect(replaceMock.mock.calls[2][1]['__rate_interval'].value).toBe('360s');
+    });
+    it('should be interval + scrape interval if resolution is set to 1/2 and interval is 10m', () => {
+      // For a 7d graph, $__interval is 10m
+      ds.createQuery(
+        { ...target, intervalFactor: 2 },
+        { interval: '10m', range: getMockTimeRange() } as DataQueryRequest<PromQuery>,
+        0,
+        10080
+      );
+      expect(replaceMock.mock.calls[1][1]['__rate_interval'].value).toBe('1215s');
+    });
+    it('should be 4 times the scrape interval if resolution is set to 1/2 and interval is 15s', () => {
+      // For a 5m graph, $__interval is 15s
+      ds.createQuery(
+        { ...target, intervalFactor: 2 },
+        { interval: '15s', range: getMockTimeRange() } as DataQueryRequest<PromQuery>,
+        0,
+        300
+      );
+      expect(replaceMock.mock.calls[1][1]['__rate_interval'].value).toBe('60s');
+    });
+    it('should interpolate min step if set', () => {
+      replaceMock.mockImplementation((_: string) => '15s');
+      ds.createQuery(
+        { ...target, interval: '$int' },
+        { interval: '15s', range: getMockTimeRange() } as DataQueryRequest<PromQuery>,
+        0,
+        300
+      );
+      expect(replaceMock.mock.calls).toHaveLength(3);
+      replaceMock.mockImplementation((str) => str);
+    });
+  });
+
+  it('should give back 1 exemplar target when multiple queries with exemplar enabled and same metric', () => {
+    const targetA: PromQuery = {
+      refId: 'A',
+      expr: 'histogram_quantile(0.95, sum(rate(tns_request_duration_seconds_bucket[5m])) by (le))',
+      exemplar: true,
+    };
+    const targetB: PromQuery = {
+      refId: 'B',
+      expr: 'histogram_quantile(0.5, sum(rate(tns_request_duration_seconds_bucket[5m])) by (le))',
+      exemplar: true,
+    };
+
+    ds.languageProvider = {
+      histogramMetrics: ['tns_request_duration_seconds_bucket'],
+    } as PromQlLanguageProvider;
+
+    const request = {
+      targets: [targetA, targetB],
+      interval: '1s',
+      panelId: '',
+    } as unknown as DataQueryRequest<PromQuery>;
+
+    const Aexemplars = ds.shouldRunExemplarQuery(targetA, request);
+    const BExpemplars = ds.shouldRunExemplarQuery(targetB, request);
+
+    expect(Aexemplars).toBe(true);
+    expect(BExpemplars).toBe(false);
+  });
+});
+
+describe('When querying prometheus via check headers X-Dashboard-Id X-Panel-Id and X-Dashboard-UID', () => {
+  const options = { panelId: 2, dashboardUID: 'WFlOM-jM1' } as DataQueryRequest<PromQuery>;
+  const httpOptions = {
+    headers: {} as { [key: string]: number | undefined },
+  } as PromQueryRequest;
+  const instanceSettings = {
+    url: 'proxied',
+    directUrl: 'direct',
+    user: 'test',
+    password: 'mupp',
+    access: 'proxy',
+    jsonData: { httpMethod: 'POST' },
+  } as unknown as DataSourceInstanceSettings<PromOptions>;
+
+  let ds: PrometheusDatasource;
+  beforeEach(() => {
+    ds = new PrometheusDatasource(instanceSettings, templateSrvStub as unknown as TemplateSrv);
+  });
+
+  it('with proxy access tracing headers should be added', () => {
+    ds._addTracingHeaders(httpOptions, options);
+    expect(httpOptions.headers['X-Panel-Id']).toBe(options.panelId);
+    expect(httpOptions.headers['X-Dashboard-UID']).toBe(options.dashboardUID);
+  });
+
+  it('with direct access tracing headers should not be added', () => {
+    const instanceSettings = {
+      url: 'proxied',
+      directUrl: 'direct',
+      user: 'test',
+      password: 'mupp',
+      jsonData: { httpMethod: 'POST' },
+    } as unknown as DataSourceInstanceSettings<PromOptions>;
+
+    const mockDs = new PrometheusDatasource({ ...instanceSettings, url: 'http://127.0.0.1:8000' }, templateSrvStub);
+    mockDs._addTracingHeaders(httpOptions, options);
+    expect(httpOptions.headers['X-Dashboard-Id']).toBe(undefined);
+    expect(httpOptions.headers['X-Panel-Id']).toBe(undefined);
+    expect(httpOptions.headers['X-Dashboard-UID']).toBe(undefined);
+  });
+});
+
+describe('modifyQuery', () => {
+  describe('when called with ADD_FILTER', () => {
+    describe('and query has no labels', () => {
+      it('then the correct label should be added', () => {
+        const query: PromQuery = { refId: 'A', expr: 'go_goroutines' };
+        const action = { options: { key: 'cluster', value: 'us-cluster' }, type: 'ADD_FILTER' };
+        const instanceSettings = { jsonData: {} } as unknown as DataSourceInstanceSettings<PromOptions>;
+        const ds = new PrometheusDatasource(instanceSettings, templateSrvStub);
+
+        const result = ds.modifyQuery(query, action);
+
+        expect(result.refId).toEqual('A');
+        expect(result.expr).toEqual('go_goroutines{cluster="us-cluster"}');
+      });
+    });
+
+    describe('and query has labels', () => {
+      it('then the correct label should be added', () => {
+        const query: PromQuery = { refId: 'A', expr: 'go_goroutines{cluster="us-cluster"}' };
+        const action = { options: { key: 'pod', value: 'pod-123' }, type: 'ADD_FILTER' };
+        const instanceSettings = { jsonData: {} } as unknown as DataSourceInstanceSettings<PromOptions>;
+        const ds = new PrometheusDatasource(instanceSettings, templateSrvStub);
+
+        const result = ds.modifyQuery(query, action);
+
+        expect(result.refId).toEqual('A');
+        expect(result.expr).toEqual('go_goroutines{cluster="us-cluster", pod="pod-123"}');
+      });
+    });
+  });
+
+  describe('when called with ADD_FILTER_OUT', () => {
+    describe('and query has no labels', () => {
+      it('then the correct label should be added', () => {
+        const query: PromQuery = { refId: 'A', expr: 'go_goroutines' };
+        const action = { options: { key: 'cluster', value: 'us-cluster' }, type: 'ADD_FILTER_OUT' };
+        const instanceSettings = { jsonData: {} } as unknown as DataSourceInstanceSettings<PromOptions>;
+        const ds = new PrometheusDatasource(instanceSettings, templateSrvStub);
+
+        const result = ds.modifyQuery(query, action);
+
+        expect(result.refId).toEqual('A');
+        expect(result.expr).toEqual('go_goroutines{cluster!="us-cluster"}');
+      });
+    });
+
+    describe('and query has labels', () => {
+      it('then the correct label should be added', () => {
+        const query: PromQuery = { refId: 'A', expr: 'go_goroutines{cluster="us-cluster"}' };
+        const action = { options: { key: 'pod', value: 'pod-123' }, type: 'ADD_FILTER_OUT' };
+        const instanceSettings = { jsonData: {} } as unknown as DataSourceInstanceSettings<PromOptions>;
+        const ds = new PrometheusDatasource(instanceSettings, templateSrvStub);
+
+        const result = ds.modifyQuery(query, action);
+
+        expect(result.refId).toEqual('A');
+        expect(result.expr).toEqual('go_goroutines{cluster="us-cluster", pod!="pod-123"}');
+      });
+    });
+  });
+});
+
+function createDataRequest(targets: PromQuery[], overrides?: Partial<DataQueryRequest>): DataQueryRequest<PromQuery> {
+  const defaults: DataQueryRequest<PromQuery> = {
+    intervalMs: 15000,
+    requestId: 'createDataRequest',
+    startTime: 0,
+    timezone: 'browser',
+    app: CoreApp.Dashboard,
+    targets: targets.map((t, i) => ({
+      instant: false,
+      start: dateTime().subtract(5, 'minutes'),
+      end: dateTime(),
+      ...t,
+    })),
+    range: {
+      from: dateTime(),
+      to: dateTime(),
+      raw: {
+        from: '',
+        to: '',
+      },
+    },
+    interval: '15s',
+    scopedVars: {},
+  };
+
+  return Object.assign(defaults, overrides || {}) as DataQueryRequest<PromQuery>;
+}
+
+function createDefaultPromResponse() {
+  return {
+    data: {
+      data: {
+        result: [
+          {
+            metric: {
+              __name__: 'test_metric',
+            },
+            values: [[1568369640, 1]],
+          },
+        ],
+        resultType: 'matrix',
+      },
+    },
+  };
+}
+
+function createAnnotationResponse() {
+  const response = {
+    data: {
+      results: {
+        X: {
+          frames: [
+            {
+              schema: {
+                name: 'bar',
+                refId: 'X',
+                fields: [
+                  {
+                    name: 'Time',
+                    type: 'time',
+                    typeInfo: {
+                      frame: 'time.Time',
+                    },
+                  },
+                  {
+                    name: 'Value',
+                    type: 'number',
+                    typeInfo: {
+                      frame: 'float64',
+                    },
+                    labels: {
+                      __name__: 'ALERTS',
+                      alertname: 'InstanceDown',
+                      alertstate: 'firing',
+                      instance: 'testinstance',
+                      job: 'testjob',
+                    },
+                  },
+                ],
+              },
+              data: {
+                values: [[123], [456]],
+              },
+            },
+          ],
+        },
+      },
+    },
+  };
+
+  return { ...response };
+}
+
+function createEmptyAnnotationResponse() {
+  const response = {
+    data: {
+      results: {
+        X: {
+          frames: [
+            {
+              schema: {
+                name: 'bar',
+                refId: 'X',
+                fields: [],
+              },
+              data: {
+                values: [],
+              },
+            },
+          ],
+        },
+      },
+    },
+  };
+
+  return { ...response };
+}
+
+function getMockTimeRange(range = '6h'): TimeRange {
+  return rangeUtil.convertRawToRange({
+    from: `now-${range}`,
+    to: 'now',
+  });
+}
diff --git a/packages/grafana-prometheus/src/datasource.ts b/packages/grafana-prometheus/src/datasource.ts
new file mode 100644
index 0000000000000..b5225af0b38db
--- /dev/null
+++ b/packages/grafana-prometheus/src/datasource.ts
@@ -0,0 +1,1020 @@
+import { defaults } from 'lodash';
+import { lastValueFrom, Observable, throwError } from 'rxjs';
+import { map, tap } from 'rxjs/operators';
+import semver from 'semver/preload';
+
+import {
+  AbstractQuery,
+  AdHocVariableFilter,
+  AnnotationEvent,
+  AnnotationQueryRequest,
+  CoreApp,
+  DataFrame,
+  DataQueryRequest,
+  DataQueryResponse,
+  DataSourceGetTagKeysOptions,
+  DataSourceGetTagValuesOptions,
+  DataSourceInstanceSettings,
+  DataSourceWithQueryExportSupport,
+  DataSourceWithQueryImportSupport,
+  dateTime,
+  getDefaultTimeRange,
+  LegacyMetricFindQueryOptions,
+  MetricFindValue,
+  QueryFixAction,
+  rangeUtil,
+  renderLegendFormat,
+  ScopedVars,
+  TimeRange,
+} from '@grafana/data';
+import {
+  BackendDataSourceResponse,
+  BackendSrvRequest,
+  config,
+  DataSourceWithBackend,
+  FetchResponse,
+  getBackendSrv,
+  getTemplateSrv,
+  isFetchError,
+  TemplateSrv,
+  toDataQueryResponse,
+} from '@grafana/runtime';
+
+import { addLabelToQuery } from './add_label_to_query';
+import { AnnotationQueryEditor } from './components/AnnotationQueryEditor';
+import PrometheusLanguageProvider from './language_provider';
+import {
+  expandRecordingRules,
+  getClientCacheDurationInMinutes,
+  getPrometheusTime,
+  getRangeSnapInterval,
+} from './language_utils';
+import { PrometheusMetricFindQuery } from './metric_find_query';
+import { getInitHints, getQueryHints } from './query_hints';
+import { promQueryModeller } from './querybuilder/PromQueryModeller';
+import { QueryBuilderLabelFilter, QueryEditorMode } from './querybuilder/shared/types';
+import { CacheRequestInfo, defaultPrometheusQueryOverlapWindow, QueryCache } from './querycache/QueryCache';
+import { getOriginalMetricName, transformV2 } from './result_transformer';
+import { trackQuery } from './tracking';
+import {
+  ExemplarTraceIdDestination,
+  PromApplication,
+  PrometheusCacheLevel,
+  PromOptions,
+  PromQuery,
+  PromQueryRequest,
+} from './types';
+import { PrometheusVariableSupport } from './variables';
+
+const ANNOTATION_QUERY_STEP_DEFAULT = '60s';
+const GET_AND_POST_METADATA_ENDPOINTS = ['api/v1/query', 'api/v1/query_range', 'api/v1/series', 'api/v1/labels'];
+
+export const InstantQueryRefIdIndex = '-Instant';
+
+export class PrometheusDatasource
+  extends DataSourceWithBackend<PromQuery, PromOptions>
+  implements DataSourceWithQueryImportSupport<PromQuery>, DataSourceWithQueryExportSupport<PromQuery>
+{
+  type: string;
+  ruleMappings: { [index: string]: string };
+  hasIncrementalQuery: boolean;
+  url: string;
+  id: number;
+  access: 'direct' | 'proxy';
+  basicAuth: any;
+  withCredentials: any;
+  interval: string;
+  queryTimeout: string | undefined;
+  httpMethod: string;
+  languageProvider: PrometheusLanguageProvider;
+  exemplarTraceIdDestinations: ExemplarTraceIdDestination[] | undefined;
+  lookupsDisabled: boolean;
+  customQueryParameters: any;
+  datasourceConfigurationPrometheusFlavor?: PromApplication;
+  datasourceConfigurationPrometheusVersion?: string;
+  disableRecordingRules: boolean;
+  defaultEditor?: QueryEditorMode;
+  exemplarsAvailable: boolean;
+  cacheLevel: PrometheusCacheLevel;
+  cache: QueryCache<PromQuery>;
+
+  constructor(
+    instanceSettings: DataSourceInstanceSettings<PromOptions>,
+    private readonly templateSrv: TemplateSrv = getTemplateSrv(),
+    languageProvider?: PrometheusLanguageProvider
+  ) {
+    super(instanceSettings);
+
+    this.type = 'prometheus';
+    this.id = instanceSettings.id;
+    this.url = instanceSettings.url!;
+    this.access = instanceSettings.access;
+    this.basicAuth = instanceSettings.basicAuth;
+    this.withCredentials = instanceSettings.withCredentials;
+    this.interval = instanceSettings.jsonData.timeInterval || '15s';
+    this.queryTimeout = instanceSettings.jsonData.queryTimeout;
+    this.httpMethod = instanceSettings.jsonData.httpMethod || 'GET';
+    this.exemplarTraceIdDestinations = instanceSettings.jsonData.exemplarTraceIdDestinations;
+    this.hasIncrementalQuery = instanceSettings.jsonData.incrementalQuerying ?? false;
+    this.ruleMappings = {};
+    this.languageProvider = languageProvider ?? new PrometheusLanguageProvider(this);
+    this.lookupsDisabled = instanceSettings.jsonData.disableMetricsLookup ?? false;
+    this.customQueryParameters = new URLSearchParams(instanceSettings.jsonData.customQueryParameters);
+    this.datasourceConfigurationPrometheusFlavor = instanceSettings.jsonData.prometheusType;
+    this.datasourceConfigurationPrometheusVersion = instanceSettings.jsonData.prometheusVersion;
+    this.defaultEditor = instanceSettings.jsonData.defaultEditor;
+    this.disableRecordingRules = instanceSettings.jsonData.disableRecordingRules ?? false;
+    this.variables = new PrometheusVariableSupport(this, this.templateSrv);
+    this.exemplarsAvailable = true;
+    this.cacheLevel = instanceSettings.jsonData.cacheLevel ?? PrometheusCacheLevel.Low;
+
+    this.cache = new QueryCache({
+      getTargetSignature: this.getPrometheusTargetSignature.bind(this),
+      overlapString: instanceSettings.jsonData.incrementalQueryOverlapWindow ?? defaultPrometheusQueryOverlapWindow,
+      profileFunction: this.getPrometheusProfileData.bind(this),
+    });
+
+    // This needs to be here and cannot be static because of how annotations typing affects casting of data source
+    // objects to DataSourceApi types.
+    // We don't use the default processing for prometheus.
+    // See standardAnnotationSupport.ts/[shouldUseMappingUI|shouldUseLegacyRunner]
+    this.annotations = {
+      QueryEditor: AnnotationQueryEditor,
+    };
+  }
+
+  init = async () => {
+    if (!this.disableRecordingRules) {
+      this.loadRules();
+    }
+    this.exemplarsAvailable = await this.areExemplarsAvailable();
+  };
+
+  getQueryDisplayText(query: PromQuery) {
+    return query.expr;
+  }
+
+  getPrometheusProfileData(request: DataQueryRequest<PromQuery>, targ: PromQuery) {
+    return {
+      interval: targ.interval ?? request.interval,
+      expr: this.interpolateString(targ.expr),
+      datasource: 'Prometheus',
+    };
+  }
+
+  /**
+   * Get target signature for query caching
+   * @param request
+   * @param query
+   */
+  getPrometheusTargetSignature(request: DataQueryRequest<PromQuery>, query: PromQuery) {
+    const targExpr = this.interpolateString(query.expr);
+    return `${targExpr}|${query.interval ?? request.interval}|${JSON.stringify(request.rangeRaw ?? '')}|${
+      query.exemplar
+    }`;
+  }
+
+  hasLabelsMatchAPISupport(): boolean {
+    return (
+      // https://github.com/prometheus/prometheus/releases/tag/v2.24.0
+      this._isDatasourceVersionGreaterOrEqualTo('2.24.0', PromApplication.Prometheus) ||
+      // All versions of Mimir support matchers for labels API
+      this._isDatasourceVersionGreaterOrEqualTo('2.0.0', PromApplication.Mimir) ||
+      // https://github.com/cortexproject/cortex/discussions/4542
+      this._isDatasourceVersionGreaterOrEqualTo('1.11.0', PromApplication.Cortex) ||
+      // https://github.com/thanos-io/thanos/pull/3566
+      //https://github.com/thanos-io/thanos/releases/tag/v0.18.0
+      this._isDatasourceVersionGreaterOrEqualTo('0.18.0', PromApplication.Thanos)
+    );
+  }
+
+  _isDatasourceVersionGreaterOrEqualTo(targetVersion: string, targetFlavor: PromApplication): boolean {
+    // User hasn't configured flavor/version yet, default behavior is to support labels match api support
+    if (!this.datasourceConfigurationPrometheusVersion || !this.datasourceConfigurationPrometheusFlavor) {
+      return true;
+    }
+
+    if (targetFlavor !== this.datasourceConfigurationPrometheusFlavor) {
+      return false;
+    }
+
+    return semver.gte(this.datasourceConfigurationPrometheusVersion, targetVersion);
+  }
+
+  _addTracingHeaders(httpOptions: PromQueryRequest, options: DataQueryRequest<PromQuery>) {
+    httpOptions.headers = {};
+    if (this.access === 'proxy') {
+      httpOptions.headers['X-Dashboard-UID'] = options.dashboardUID;
+      httpOptions.headers['X-Panel-Id'] = options.panelId;
+    }
+  }
+
+  directAccessError() {
+    return throwError(
+      () =>
+        new Error(
+          'Browser access mode in the Prometheus datasource is no longer available. Switch to server access mode.'
+        )
+    );
+  }
+
+  /**
+   * Any request done from this data source should go through here as it contains some common processing for the
+   * request. Any processing done here needs to be also copied on the backend as this goes through data source proxy
+   * but not through the same code as alerting.
+   */
+  _request<T = unknown>(
+    url: string,
+    data: Record<string, string> | null,
+    overrides: Partial<BackendSrvRequest> = {}
+  ): Observable<FetchResponse<T>> {
+    if (this.access === 'direct') {
+      return this.directAccessError();
+    }
+
+    data = data || {};
+    for (const [key, value] of this.customQueryParameters) {
+      if (data[key] == null) {
+        data[key] = value;
+      }
+    }
+
+    let queryUrl = this.url + url;
+    if (url.startsWith(`/api/datasources/uid/${this.uid}`)) {
+      // This url is meant to be a replacement for the whole URL. Replace the entire URL
+      queryUrl = url;
+    }
+
+    const options: BackendSrvRequest = defaults(overrides, {
+      url: queryUrl,
+      method: this.httpMethod,
+      headers: {},
+    });
+
+    if (options.method === 'GET') {
+      if (data && Object.keys(data).length) {
+        options.url =
+          options.url +
+          (options.url.search(/\?/) >= 0 ? '&' : '?') +
+          Object.entries(data)
+            .map(([k, v]) => `${encodeURIComponent(k)}=${encodeURIComponent(v)}`)
+            .join('&');
+      }
+    } else {
+      options.headers!['Content-Type'] = 'application/x-www-form-urlencoded';
+      options.data = data;
+    }
+
+    if (this.basicAuth || this.withCredentials) {
+      options.withCredentials = true;
+    }
+
+    if (this.basicAuth) {
+      options.headers!.Authorization = this.basicAuth;
+    }
+
+    return getBackendSrv().fetch<T>(options);
+  }
+
+  async importFromAbstractQueries(abstractQueries: AbstractQuery[]): Promise<PromQuery[]> {
+    return abstractQueries.map((abstractQuery) => this.languageProvider.importFromAbstractQuery(abstractQuery));
+  }
+
+  async exportToAbstractQueries(queries: PromQuery[]): Promise<AbstractQuery[]> {
+    return queries.map((query) => this.languageProvider.exportToAbstractQuery(query));
+  }
+
+  // Use this for tab completion features, wont publish response to other components
+  async metadataRequest<T = any>(url: string, params = {}, options?: Partial<BackendSrvRequest>) {
+    // If URL includes endpoint that supports POST and GET method, try to use configured method. This might fail as POST is supported only in v2.10+.
+    if (GET_AND_POST_METADATA_ENDPOINTS.some((endpoint) => url.includes(endpoint))) {
+      try {
+        return await lastValueFrom(
+          this._request<T>(`/api/datasources/uid/${this.uid}/resources${url}`, params, {
+            method: this.httpMethod,
+            hideFromInspector: true,
+            showErrorAlert: false,
+            ...options,
+          })
+        );
+      } catch (err) {
+        // If status code of error is Method Not Allowed (405) and HTTP method is POST, retry with GET
+        if (this.httpMethod === 'POST' && isFetchError(err) && (err.status === 405 || err.status === 400)) {
+          console.warn(`Couldn't use configured POST HTTP method for this request. Trying to use GET method instead.`);
+        } else {
+          throw err;
+        }
+      }
+    }
+
+    return await lastValueFrom(
+      this._request<T>(`/api/datasources/uid/${this.uid}/resources${url}`, params, {
+        method: 'GET',
+        hideFromInspector: true,
+        ...options,
+      })
+    ); // toPromise until we change getTagValues, getLabelNames to Observable
+  }
+
+  interpolateQueryExpr(value: string | string[] = [], variable: any) {
+    // if no multi or include all do not regexEscape
+    if (!variable.multi && !variable.includeAll) {
+      return prometheusRegularEscape(value);
+    }
+
+    if (typeof value === 'string') {
+      return prometheusSpecialRegexEscape(value);
+    }
+
+    const escapedValues = value.map((val) => prometheusSpecialRegexEscape(val));
+
+    if (escapedValues.length === 1) {
+      return escapedValues[0];
+    }
+
+    return '(' + escapedValues.join('|') + ')';
+  }
+
+  targetContainsTemplate(target: PromQuery) {
+    return this.templateSrv.containsTemplate(target.expr);
+  }
+
+  shouldRunExemplarQuery(target: PromQuery, request: DataQueryRequest<PromQuery>): boolean {
+    if (target.exemplar) {
+      // We check all already processed targets and only create exemplar target for not used metric names
+      const metricName = this.languageProvider.histogramMetrics.find((m) => target.expr.includes(m));
+      // Remove targets that weren't processed yet (in targets array they are after current target)
+      const currentTargetIdx = request.targets.findIndex((t) => t.refId === target.refId);
+      const targets = request.targets.slice(0, currentTargetIdx).filter((t) => !t.hide);
+
+      if (!metricName || (metricName && !targets.some((t) => t.expr.includes(metricName)))) {
+        return true;
+      }
+      return false;
+    }
+    return false;
+  }
+
+  processTargetV2(target: PromQuery, request: DataQueryRequest<PromQuery>) {
+    const processedTargets: PromQuery[] = [];
+    const processedTarget = {
+      ...target,
+      exemplar: this.shouldRunExemplarQuery(target, request),
+      requestId: request.panelId + target.refId,
+      // We need to pass utcOffsetSec to backend to calculate aligned range
+      utcOffsetSec: request.range.to.utcOffset() * 60,
+    };
+
+    if (config.featureToggles.promQLScope) {
+      processedTarget.scope = request.scope;
+    }
+
+    if (target.instant && target.range) {
+      // We have query type "Both" selected
+      // We should send separate queries with different refId
+      processedTargets.push(
+        {
+          ...processedTarget,
+          refId: processedTarget.refId,
+          instant: false,
+        },
+        {
+          ...processedTarget,
+          refId: processedTarget.refId + InstantQueryRefIdIndex,
+          range: false,
+        }
+      );
+    } else {
+      processedTargets.push(processedTarget);
+    }
+
+    return processedTargets;
+  }
+
+  query(request: DataQueryRequest<PromQuery>): Observable<DataQueryResponse> {
+    if (this.access === 'direct') {
+      return this.directAccessError();
+    }
+
+    let fullOrPartialRequest: DataQueryRequest<PromQuery>;
+    let requestInfo: CacheRequestInfo<PromQuery> | undefined = undefined;
+    const hasInstantQuery = request.targets.some((target) => target.instant);
+
+    // Don't cache instant queries
+    if (this.hasIncrementalQuery && !hasInstantQuery) {
+      requestInfo = this.cache.requestInfo(request);
+      fullOrPartialRequest = requestInfo.requests[0];
+    } else {
+      fullOrPartialRequest = request;
+    }
+
+    const targets = fullOrPartialRequest.targets.map((target) => this.processTargetV2(target, fullOrPartialRequest));
+    const startTime = new Date();
+    return super.query({ ...fullOrPartialRequest, targets: targets.flat() }).pipe(
+      map((response) => {
+        const amendedResponse = {
+          ...response,
+          data: this.cache.procFrames(request, requestInfo, response.data),
+        };
+        return transformV2(amendedResponse, request, {
+          exemplarTraceIdDestinations: this.exemplarTraceIdDestinations,
+        });
+      }),
+      tap((response: DataQueryResponse) => {
+        trackQuery(response, request, startTime);
+      })
+    );
+  }
+
+  createQuery(target: PromQuery, options: DataQueryRequest<PromQuery>, start: number, end: number) {
+    const query: PromQueryRequest = {
+      hinting: target.hinting,
+      instant: target.instant,
+      exemplar: target.exemplar,
+      step: 0,
+      expr: '',
+      refId: target.refId,
+      start: 0,
+      end: 0,
+    };
+    const range = Math.ceil(end - start);
+
+    // options.interval is the dynamically calculated interval
+    let interval: number = rangeUtil.intervalToSeconds(options.interval);
+    // Minimum interval ("Min step"), if specified for the query, or same as interval otherwise.
+    const minInterval = rangeUtil.intervalToSeconds(
+      this.templateSrv.replace(target.interval || options.interval, options.scopedVars)
+    );
+    // Scrape interval as specified for the query ("Min step") or otherwise taken from the datasource.
+    // Min step field can have template variables in it, make sure to replace it.
+    const scrapeInterval = target.interval
+      ? rangeUtil.intervalToSeconds(this.templateSrv.replace(target.interval, options.scopedVars))
+      : rangeUtil.intervalToSeconds(this.interval);
+
+    const intervalFactor = target.intervalFactor || 1;
+    // Adjust the interval to take into account any specified minimum and interval factor plus Prometheus limits
+    const adjustedInterval = this.adjustInterval(interval, minInterval, range, intervalFactor);
+    let scopedVars = {
+      ...options.scopedVars,
+      ...this.getRangeScopedVars(options.range),
+      ...this.getRateIntervalScopedVariable(adjustedInterval, scrapeInterval),
+    };
+    // If the interval was adjusted, make a shallow copy of scopedVars with updated interval vars
+    if (interval !== adjustedInterval) {
+      interval = adjustedInterval;
+      scopedVars = Object.assign({}, options.scopedVars, {
+        __interval: { text: interval + 's', value: interval + 's' },
+        __interval_ms: { text: interval * 1000, value: interval * 1000 },
+        ...this.getRateIntervalScopedVariable(interval, scrapeInterval),
+        ...this.getRangeScopedVars(options.range),
+      });
+    }
+
+    query.step = interval;
+
+    let expr = target.expr;
+
+    // Apply adhoc filters
+    expr = this.enhanceExprWithAdHocFilters(options.filters, expr);
+
+    // Only replace vars in expression after having (possibly) updated interval vars
+    query.expr = this.templateSrv.replace(expr, scopedVars, this.interpolateQueryExpr);
+
+    // Align query interval with step to allow query caching and to ensure
+    // that about-same-time query results look the same.
+    const adjusted = alignRange(start, end, query.step, options.range.to.utcOffset() * 60);
+    query.start = adjusted.start;
+    query.end = adjusted.end;
+    this._addTracingHeaders(query, options);
+
+    return query;
+  }
+
+  getRateIntervalScopedVariable(interval: number, scrapeInterval: number) {
+    // Fall back to the default scrape interval of 15s if scrapeInterval is 0 for some reason.
+    if (scrapeInterval === 0) {
+      scrapeInterval = 15;
+    }
+    const rateInterval = Math.max(interval + scrapeInterval, 4 * scrapeInterval);
+    return { __rate_interval: { text: rateInterval + 's', value: rateInterval + 's' } };
+  }
+
+  adjustInterval(interval: number, minInterval: number, range: number, intervalFactor: number) {
+    // Prometheus will drop queries that might return more than 11000 data points.
+    // Calculate a safe interval as an additional minimum to take into account.
+    // Fractional safeIntervals are allowed, however serve little purpose if the interval is greater than 1
+    // If this is the case take the ceil of the value.
+    let safeInterval = range / 11000;
+    if (safeInterval > 1) {
+      safeInterval = Math.ceil(safeInterval);
+    }
+    return Math.max(interval * intervalFactor, minInterval, safeInterval);
+  }
+
+  metricFindQuery(query: string, options?: LegacyMetricFindQueryOptions) {
+    if (!query) {
+      return Promise.resolve([]);
+    }
+
+    const scopedVars = {
+      __interval: { text: this.interval, value: this.interval },
+      __interval_ms: { text: rangeUtil.intervalToMs(this.interval), value: rangeUtil.intervalToMs(this.interval) },
+      ...this.getRangeScopedVars(options?.range ?? getDefaultTimeRange()),
+    };
+    const interpolated = this.templateSrv.replace(query, scopedVars, this.interpolateQueryExpr);
+    const metricFindQuery = new PrometheusMetricFindQuery(this, interpolated);
+    return metricFindQuery.process(options?.range ?? getDefaultTimeRange());
+  }
+
+  getRangeScopedVars(range: TimeRange) {
+    const msRange = range.to.diff(range.from);
+    const sRange = Math.round(msRange / 1000);
+    return {
+      __range_ms: { text: msRange, value: msRange },
+      __range_s: { text: sRange, value: sRange },
+      __range: { text: sRange + 's', value: sRange + 's' },
+    };
+  }
+
+  async annotationQuery(options: AnnotationQueryRequest<PromQuery>): Promise<AnnotationEvent[]> {
+    if (this.access === 'direct') {
+      const error = new Error(
+        'Browser access mode in the Prometheus datasource is no longer available. Switch to server access mode.'
+      );
+      return Promise.reject(error);
+    }
+
+    const annotation = options.annotation;
+    const { expr = '' } = annotation;
+
+    if (!expr) {
+      return Promise.resolve([]);
+    }
+
+    const step = options.annotation.step || ANNOTATION_QUERY_STEP_DEFAULT;
+    const queryModel = {
+      expr,
+      range: true,
+      instant: false,
+      exemplar: false,
+      interval: step,
+      refId: 'X',
+      datasource: this.getRef(),
+    };
+
+    return await lastValueFrom(
+      getBackendSrv()
+        .fetch<BackendDataSourceResponse>({
+          url: '/api/ds/query',
+          method: 'POST',
+          headers: this.getRequestHeaders(),
+          data: {
+            from: (getPrometheusTime(options.range.from, false) * 1000).toString(),
+            to: (getPrometheusTime(options.range.to, true) * 1000).toString(),
+            queries: [this.applyTemplateVariables(queryModel, {})],
+          },
+          requestId: `prom-query-${annotation.name}`,
+        })
+        .pipe(
+          map((rsp: FetchResponse<BackendDataSourceResponse>) => {
+            return this.processAnnotationResponse(options, rsp.data);
+          })
+        )
+    );
+  }
+
+  processAnnotationResponse = (options: AnnotationQueryRequest<PromQuery>, data: BackendDataSourceResponse) => {
+    const frames: DataFrame[] = toDataQueryResponse({ data: data }).data;
+    if (!frames || !frames.length) {
+      return [];
+    }
+
+    const annotation = options.annotation;
+    const { tagKeys = '', titleFormat = '', textFormat = '' } = annotation;
+
+    const step = rangeUtil.intervalToSeconds(annotation.step || ANNOTATION_QUERY_STEP_DEFAULT) * 1000;
+    const tagKeysArray = tagKeys.split(',');
+
+    const eventList: AnnotationEvent[] = [];
+
+    for (const frame of frames) {
+      if (frame.fields.length === 0) {
+        continue;
+      }
+      const timeField = frame.fields[0];
+      const valueField = frame.fields[1];
+      const labels = valueField?.labels || {};
+
+      const tags = Object.keys(labels)
+        .filter((label) => tagKeysArray.includes(label))
+        .map((label) => labels[label]);
+
+      const timeValueTuple: Array<[number, number]> = [];
+
+      let idx = 0;
+      valueField.values.forEach((value: string) => {
+        let timeStampValue: number;
+        let valueValue: number;
+        const time = timeField.values[idx];
+
+        // If we want to use value as a time, we use value as timeStampValue and valueValue will be 1
+        if (options.annotation.useValueForTime) {
+          timeStampValue = Math.floor(parseFloat(value));
+          valueValue = 1;
+        } else {
+          timeStampValue = Math.floor(parseFloat(time));
+          valueValue = parseFloat(value);
+        }
+
+        idx++;
+        timeValueTuple.push([timeStampValue, valueValue]);
+      });
+
+      const activeValues = timeValueTuple.filter((value) => value[1] > 0);
+      const activeValuesTimestamps = activeValues.map((value) => value[0]);
+
+      // Instead of creating singular annotation for each active event we group events into region if they are less
+      // or equal to `step` apart.
+      let latestEvent: AnnotationEvent | null = null;
+
+      for (const timestamp of activeValuesTimestamps) {
+        // We already have event `open` and we have new event that is inside the `step` so we just update the end.
+        if (latestEvent && (latestEvent.timeEnd ?? 0) + step >= timestamp) {
+          latestEvent.timeEnd = timestamp;
+          continue;
+        }
+
+        // Event exists but new one is outside of the `step` so we add it to eventList.
+        if (latestEvent) {
+          eventList.push(latestEvent);
+        }
+
+        // We start a new region.
+        latestEvent = {
+          time: timestamp,
+          timeEnd: timestamp,
+          annotation,
+          title: renderLegendFormat(titleFormat, labels),
+          tags,
+          text: renderLegendFormat(textFormat, labels),
+        };
+      }
+
+      if (latestEvent) {
+        // Finish up last point if we have one
+        latestEvent.timeEnd = activeValuesTimestamps[activeValuesTimestamps.length - 1];
+        eventList.push(latestEvent);
+      }
+    }
+
+    return eventList;
+  };
+
+  // By implementing getTagKeys and getTagValues we add ad-hoc filters functionality
+  // this is used to get label keys, a.k.a label names
+  // it is used in metric_find_query.ts
+  // and in Tempo here grafana/public/app/plugins/datasource/tempo/QueryEditor/ServiceGraphSection.tsx
+  async getTagKeys(options: DataSourceGetTagKeysOptions<PromQuery>): Promise<MetricFindValue[]> {
+    if (!options || options.filters.length === 0) {
+      await this.languageProvider.fetchLabels(options.timeRange);
+      return this.languageProvider.getLabelKeys().map((k) => ({ value: k, text: k }));
+    }
+
+    const labelFilters: QueryBuilderLabelFilter[] = options.filters.map((f) => ({
+      label: f.key,
+      value: f.value,
+      op: f.operator,
+    }));
+    const expr = promQueryModeller.renderLabels(labelFilters);
+
+    let labelsIndex: Record<string, string[]> = await this.languageProvider.fetchLabelsWithMatch(expr);
+
+    // filter out already used labels
+    return Object.keys(labelsIndex)
+      .filter((labelName) => !options.filters.find((filter) => filter.key === labelName))
+      .map((k) => ({ value: k, text: k }));
+  }
+
+  // By implementing getTagKeys and getTagValues we add ad-hoc filters functionality
+  async getTagValues(options: DataSourceGetTagValuesOptions) {
+    const labelFilters: QueryBuilderLabelFilter[] = options.filters.map((f) => ({
+      label: f.key,
+      value: f.value,
+      op: f.operator,
+    }));
+
+    const expr = promQueryModeller.renderLabels(labelFilters);
+
+    if (this.hasLabelsMatchAPISupport()) {
+      return (await this.languageProvider.fetchSeriesValuesWithMatch(options.key, expr, options.timeRange)).map(
+        (v) => ({
+          value: v,
+          text: v,
+        })
+      );
+    }
+
+    const params = this.getTimeRangeParams(options.timeRange ?? getDefaultTimeRange());
+    const result = await this.metadataRequest(`/api/v1/label/${options.key}/values`, params);
+    return result?.data?.data?.map((value: any) => ({ text: value })) ?? [];
+  }
+
+  interpolateVariablesInQueries(
+    queries: PromQuery[],
+    scopedVars: ScopedVars,
+    filters?: AdHocVariableFilter[]
+  ): PromQuery[] {
+    let expandedQueries = queries;
+    if (queries && queries.length) {
+      expandedQueries = queries.map((query) => {
+        const interpolatedQuery = this.templateSrv.replace(query.expr, scopedVars, this.interpolateQueryExpr);
+        const withAdhocFilters = this.enhanceExprWithAdHocFilters(filters, interpolatedQuery);
+
+        const expandedQuery = {
+          ...query,
+          datasource: this.getRef(),
+          expr: withAdhocFilters,
+          interval: this.templateSrv.replace(query.interval, scopedVars),
+        };
+        return expandedQuery;
+      });
+    }
+    return expandedQueries;
+  }
+
+  getQueryHints(query: PromQuery, result: any[]) {
+    return getQueryHints(query.expr ?? '', result, this);
+  }
+
+  getInitHints() {
+    return getInitHints(this);
+  }
+
+  async loadRules() {
+    try {
+      const res = await this.metadataRequest('/api/v1/rules', {}, { showErrorAlert: false });
+      const groups = res.data?.data?.groups;
+
+      if (groups) {
+        this.ruleMappings = extractRuleMappingFromGroups(groups);
+      }
+    } catch (e) {
+      console.log('Rules API is experimental. Ignore next error.');
+      console.error(e);
+    }
+  }
+
+  async areExemplarsAvailable() {
+    try {
+      const res = await this.metadataRequest(
+        '/api/v1/query_exemplars',
+        {
+          query: 'test',
+          start: dateTime().subtract(30, 'minutes').valueOf().toString(),
+          end: dateTime().valueOf().toString(),
+        },
+        {
+          // Avoid alerting the user if this test fails
+          showErrorAlert: false,
+        }
+      );
+      if (res.data.status === 'success') {
+        return true;
+      }
+      return false;
+    } catch (err) {
+      return false;
+    }
+  }
+
+  modifyQuery(query: PromQuery, action: QueryFixAction): PromQuery {
+    let expression = query.expr ?? '';
+    switch (action.type) {
+      case 'ADD_FILTER': {
+        const { key, value } = action.options ?? {};
+        if (key && value) {
+          expression = addLabelToQuery(expression, key, value);
+        }
+
+        break;
+      }
+      case 'ADD_FILTER_OUT': {
+        const { key, value } = action.options ?? {};
+        if (key && value) {
+          expression = addLabelToQuery(expression, key, value, '!=');
+        }
+        break;
+      }
+      case 'ADD_HISTOGRAM_QUANTILE': {
+        expression = `histogram_quantile(0.95, sum(rate(${expression}[$__rate_interval])) by (le))`;
+        break;
+      }
+      case 'ADD_RATE': {
+        expression = `rate(${expression}[$__rate_interval])`;
+        break;
+      }
+      case 'ADD_SUM': {
+        expression = `sum(${expression.trim()}) by ($1)`;
+        break;
+      }
+      case 'EXPAND_RULES': {
+        if (action.options) {
+          expression = expandRecordingRules(expression, action.options);
+        }
+        break;
+      }
+      default:
+        break;
+    }
+    return { ...query, expr: expression };
+  }
+
+  /**
+   * Returns the adjusted "snapped" interval parameters
+   */
+  getAdjustedInterval(timeRange: TimeRange): { start: string; end: string } {
+    return getRangeSnapInterval(this.cacheLevel, timeRange);
+  }
+
+  /**
+   * This will return a time range that always includes the users current time range,
+   * and then a little extra padding to round up/down to the nearest nth minute,
+   * defined by the result of the getCacheDurationInMinutes.
+   *
+   * For longer cache durations, and shorter query durations,
+   * the window we're calculating might be much bigger then the user's current window,
+   * resulting in us returning labels/values that might not be applicable for the given window,
+   * this is a necessary trade-off if we want to cache larger durations
+   */
+  getTimeRangeParams(timeRange: TimeRange): { start: string; end: string } {
+    return {
+      start: getPrometheusTime(timeRange.from, false).toString(),
+      end: getPrometheusTime(timeRange.to, true).toString(),
+    };
+  }
+
+  getOriginalMetricName(labelData: { [key: string]: string }) {
+    return getOriginalMetricName(labelData);
+  }
+
+  enhanceExprWithAdHocFilters(filters: AdHocVariableFilter[] | undefined, expr: string) {
+    if (!filters || filters.length === 0) {
+      return expr;
+    }
+
+    const finalQuery = filters.reduce((acc: string, filter: { key?: any; operator?: any; value?: any }) => {
+      const { key, operator } = filter;
+      let { value } = filter;
+      if (operator === '=~' || operator === '!~') {
+        value = prometheusRegularEscape(value);
+      }
+      return addLabelToQuery(acc, key, value, operator);
+    }, expr);
+    return finalQuery;
+  }
+
+  // Used when running queries through backend
+  filterQuery(query: PromQuery): boolean {
+    if (query.hide || !query.expr) {
+      return false;
+    }
+    return true;
+  }
+
+  // Used when running queries through backend
+  applyTemplateVariables(target: PromQuery, scopedVars: ScopedVars, filters?: AdHocVariableFilter[]) {
+    const variables = { ...scopedVars };
+
+    // We want to interpolate these variables on backend.
+    // The pre-calculated values are replaced withe the variable strings.
+    variables.__interval = {
+      value: '$__interval',
+    };
+    variables.__interval_ms = {
+      value: '$__interval_ms',
+    };
+
+    // interpolate expression
+    const expr = this.templateSrv.replace(target.expr, variables, this.interpolateQueryExpr);
+
+    // Add ad hoc filters
+    const exprWithAdHocFilters = this.enhanceExprWithAdHocFilters(filters, expr);
+
+    return {
+      ...target,
+      expr: exprWithAdHocFilters,
+      interval: this.templateSrv.replace(target.interval, variables),
+      legendFormat: this.templateSrv.replace(target.legendFormat, variables),
+    };
+  }
+
+  getVariables(): string[] {
+    return this.templateSrv.getVariables().map((v) => `$${v.name}`);
+  }
+
+  interpolateString(string: string, scopedVars?: ScopedVars) {
+    return this.templateSrv.replace(string, scopedVars, this.interpolateQueryExpr);
+  }
+
+  getDebounceTimeInMilliseconds(): number {
+    switch (this.cacheLevel) {
+      case PrometheusCacheLevel.Medium:
+        return 600;
+      case PrometheusCacheLevel.High:
+        return 1200;
+      default:
+        return 350;
+    }
+  }
+
+  getDaysToCacheMetadata(): number {
+    switch (this.cacheLevel) {
+      case PrometheusCacheLevel.Medium:
+        return 7;
+      case PrometheusCacheLevel.High:
+        return 30;
+      default:
+        return 1;
+    }
+  }
+
+  getCacheDurationInMinutes(): number {
+    return getClientCacheDurationInMinutes(this.cacheLevel);
+  }
+
+  getDefaultQuery(app: CoreApp): PromQuery {
+    const defaults = {
+      refId: 'A',
+      expr: '',
+      range: true,
+      instant: false,
+    };
+
+    if (app === CoreApp.UnifiedAlerting) {
+      return {
+        ...defaults,
+        instant: true,
+        range: false,
+      };
+    }
+
+    if (app === CoreApp.Explore) {
+      return {
+        ...defaults,
+        instant: true,
+        range: true,
+      };
+    }
+
+    return defaults;
+  }
+}
+
+/**
+ * Align query range to step.
+ * Rounds start and end down to a multiple of step.
+ * @param start Timestamp marking the beginning of the range.
+ * @param end Timestamp marking the end of the range.
+ * @param step Interval to align start and end with.
+ * @param utcOffsetSec Number of seconds current timezone is offset from UTC
+ */
+export function alignRange(
+  start: number,
+  end: number,
+  step: number,
+  utcOffsetSec: number
+): { end: number; start: number } {
+  const alignedEnd = Math.floor((end + utcOffsetSec) / step) * step - utcOffsetSec;
+  const alignedStart = Math.floor((start + utcOffsetSec) / step) * step - utcOffsetSec;
+  return {
+    end: alignedEnd,
+    start: alignedStart,
+  };
+}
+
+export function extractRuleMappingFromGroups(groups: any[]) {
+  return groups.reduce(
+    (mapping, group) =>
+      group.rules
+        .filter((rule: any) => rule.type === 'recording')
+        .reduce(
+          (acc: { [key: string]: string }, rule: any) => ({
+            ...acc,
+            [rule.name]: rule.query,
+          }),
+          mapping
+        ),
+    {}
+  );
+}
+
+// NOTE: these two functions are very similar to the escapeLabelValueIn* functions
+// in language_utils.ts, but they are not exactly the same algorithm, and we found
+// no way to reuse one in the another or vice versa.
+export function prometheusRegularEscape(value: unknown) {
+  return typeof value === 'string' ? value.replace(/\\/g, '\\\\').replace(/'/g, "\\\\'") : value;
+}
+
+export function prometheusSpecialRegexEscape(value: unknown) {
+  return typeof value === 'string' ? value.replace(/\\/g, '\\\\\\\\').replace(/[$^*{}\[\]\'+?.()|]/g, '\\\\$&') : value;
+}
diff --git a/packages/grafana-prometheus/src/gcopypaste/app/core/components/LocalStorageValueProvider/LocalStorageValueProvider.tsx b/packages/grafana-prometheus/src/gcopypaste/app/core/components/LocalStorageValueProvider/LocalStorageValueProvider.tsx
new file mode 100644
index 0000000000000..d0558fe43ee8c
--- /dev/null
+++ b/packages/grafana-prometheus/src/gcopypaste/app/core/components/LocalStorageValueProvider/LocalStorageValueProvider.tsx
@@ -0,0 +1,49 @@
+import React, { useEffect, useState } from 'react';
+
+import store from '../../store';
+
+export interface Props<T> {
+  storageKey: string;
+  defaultValue: T;
+  children: (value: T, onSaveToStore: (value: T) => void, onDeleteFromStore: () => void) => React.ReactNode;
+}
+
+export const LocalStorageValueProvider = <T,>(props: Props<T>) => {
+  const { children, storageKey, defaultValue } = props;
+
+  const [state, setState] = useState({ value: store.getObject(props.storageKey, props.defaultValue) });
+
+  useEffect(() => {
+    const onStorageUpdate = (v: StorageEvent) => {
+      if (v.key === storageKey) {
+        setState({ value: store.getObject(props.storageKey, props.defaultValue) });
+      }
+    };
+
+    window.addEventListener('storage', onStorageUpdate);
+
+    return () => {
+      window.removeEventListener('storage', onStorageUpdate);
+    };
+  });
+
+  const onSaveToStore = (value: T) => {
+    try {
+      store.setObject(storageKey, value);
+    } catch (error) {
+      console.error(error);
+    }
+    setState({ value });
+  };
+
+  const onDeleteFromStore = () => {
+    try {
+      store.delete(storageKey);
+    } catch (error) {
+      console.log(error);
+    }
+    setState({ value: defaultValue });
+  };
+
+  return <>{children(state.value, onSaveToStore, onDeleteFromStore)}</>;
+};
diff --git a/packages/grafana-prometheus/src/gcopypaste/app/core/components/LocalStorageValueProvider/index.tsx b/packages/grafana-prometheus/src/gcopypaste/app/core/components/LocalStorageValueProvider/index.tsx
new file mode 100644
index 0000000000000..e4bde7ccaeadb
--- /dev/null
+++ b/packages/grafana-prometheus/src/gcopypaste/app/core/components/LocalStorageValueProvider/index.tsx
@@ -0,0 +1 @@
+export { LocalStorageValueProvider } from './LocalStorageValueProvider';
diff --git a/packages/grafana-prometheus/src/gcopypaste/app/core/store.ts b/packages/grafana-prometheus/src/gcopypaste/app/core/store.ts
new file mode 100644
index 0000000000000..28587a7d428be
--- /dev/null
+++ b/packages/grafana-prometheus/src/gcopypaste/app/core/store.ts
@@ -0,0 +1,65 @@
+type StoreValue = string | number | boolean | null;
+
+export class Store {
+  get(key: string) {
+    return window.localStorage[key];
+  }
+
+  set(key: string, value: StoreValue) {
+    window.localStorage[key] = value;
+  }
+
+  getBool(key: string, def: boolean): boolean {
+    if (def !== void 0 && !this.exists(key)) {
+      return def;
+    }
+    return window.localStorage[key] === 'true';
+  }
+
+  getObject<T = unknown>(key: string): T | undefined;
+  getObject<T = unknown>(key: string, def: T): T;
+  getObject<T = unknown>(key: string, def?: T) {
+    let ret = def;
+    if (this.exists(key)) {
+      const json = window.localStorage[key];
+      try {
+        ret = JSON.parse(json);
+      } catch (error) {
+        console.error(`Error parsing store object: ${key}. Returning default: ${def}. [${error}]`);
+      }
+    }
+    return ret;
+  }
+
+  /* Returns true when successfully stored, throws error if not successfully stored */
+  setObject(key: string, value: unknown) {
+    let json;
+    try {
+      json = JSON.stringify(value);
+    } catch (error) {
+      throw new Error(`Could not stringify object: ${key}. [${error}]`);
+    }
+    try {
+      this.set(key, json);
+    } catch (error) {
+      // Likely hitting storage quota
+      const errorToThrow = new Error(`Could not save item in localStorage: ${key}. [${error}]`);
+      if (error instanceof Error) {
+        errorToThrow.name = error.name;
+      }
+      throw errorToThrow;
+    }
+    return true;
+  }
+
+  exists(key: string) {
+    return window.localStorage[key] !== void 0;
+  }
+
+  delete(key: string) {
+    window.localStorage.removeItem(key);
+  }
+}
+
+const store = new Store();
+export default store;
diff --git a/packages/grafana-prometheus/src/gcopypaste/app/core/utils/CancelablePromise.ts b/packages/grafana-prometheus/src/gcopypaste/app/core/utils/CancelablePromise.ts
new file mode 100644
index 0000000000000..221e5ef2bb656
--- /dev/null
+++ b/packages/grafana-prometheus/src/gcopypaste/app/core/utils/CancelablePromise.ts
@@ -0,0 +1,31 @@
+// https://github.com/facebook/react/issues/5465
+
+export interface CancelablePromise<T> {
+  promise: Promise<T>;
+  cancel: () => void;
+}
+
+export interface CancelablePromiseRejection {
+  isCanceled: boolean;
+}
+
+export function isCancelablePromiseRejection(promise: unknown): promise is CancelablePromiseRejection {
+  return typeof promise === 'object' && promise !== null && 'isCanceled' in promise;
+}
+
+export const makePromiseCancelable = <T>(promise: Promise<T>): CancelablePromise<T> => {
+  let hasCanceled_ = false;
+
+  const wrappedPromise = new Promise<T>((resolve, reject) => {
+    const canceledPromiseRejection: CancelablePromiseRejection = { isCanceled: true };
+    promise.then((val) => (hasCanceled_ ? reject(canceledPromiseRejection) : resolve(val)));
+    promise.catch((error) => (hasCanceled_ ? reject(canceledPromiseRejection) : reject(error)));
+  });
+
+  return {
+    promise: wrappedPromise,
+    cancel() {
+      hasCanceled_ = true;
+    },
+  };
+};
diff --git a/packages/grafana-prometheus/src/gcopypaste/app/core/utils/query.ts b/packages/grafana-prometheus/src/gcopypaste/app/core/utils/query.ts
new file mode 100644
index 0000000000000..4084e418f18f7
--- /dev/null
+++ b/packages/grafana-prometheus/src/gcopypaste/app/core/utils/query.ts
@@ -0,0 +1,20 @@
+import { DataQuery } from '@grafana/data';
+
+export const getNextRefIdChar = (queries: DataQuery[]): string => {
+  for (let num = 0; ; num++) {
+    const refId = getRefId(num);
+    if (!queries.some((query) => query.refId === refId)) {
+      return refId;
+    }
+  }
+};
+
+function getRefId(num: number): string {
+  const letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+
+  if (num < letters.length) {
+    return letters[num];
+  } else {
+    return getRefId(Math.floor(num / letters.length) - 1) + letters[num % letters.length];
+  }
+}
diff --git a/packages/grafana-prometheus/src/gcopypaste/app/features/datasources/__mocks__/dataSourcesMocks.ts b/packages/grafana-prometheus/src/gcopypaste/app/features/datasources/__mocks__/dataSourcesMocks.ts
new file mode 100644
index 0000000000000..db78a03b28919
--- /dev/null
+++ b/packages/grafana-prometheus/src/gcopypaste/app/features/datasources/__mocks__/dataSourcesMocks.ts
@@ -0,0 +1,30 @@
+import { merge } from 'lodash';
+
+import { DataSourceJsonData, DataSourceSettings } from '@grafana/data';
+
+export const getMockDataSource = <T extends DataSourceJsonData>(
+  overrides?: Partial<DataSourceSettings<T>>
+): DataSourceSettings<T> =>
+  merge(
+    {
+      access: '',
+      basicAuth: false,
+      basicAuthUser: '',
+      withCredentials: false,
+      database: '',
+      id: 13,
+      uid: 'x',
+      isDefault: false,
+      jsonData: { authType: 'credentials', defaultRegion: 'eu-west-2' },
+      name: 'gdev-prometheus',
+      typeName: 'Prometheus',
+      orgId: 1,
+      readOnly: false,
+      type: 'prometheus',
+      typeLogoUrl: 'packages/grafana-prometheus/src/img/prometheus_logo.svg',
+      url: '',
+      user: '',
+      secureJsonFields: {},
+    },
+    overrides
+  );
diff --git a/packages/grafana-prometheus/src/gcopypaste/app/features/live/data/amendTimeSeries.ts b/packages/grafana-prometheus/src/gcopypaste/app/features/live/data/amendTimeSeries.ts
new file mode 100644
index 0000000000000..39b01600d46e1
--- /dev/null
+++ b/packages/grafana-prometheus/src/gcopypaste/app/features/live/data/amendTimeSeries.ts
@@ -0,0 +1,93 @@
+import { closestIdx } from '@grafana/data';
+
+export type Table = [times: number[], ...values: any[][]];
+
+// prevTable and nextTable are assumed sorted ASC on reference [0] arrays
+// nextTable is assumed to be contiguous, only edges are checked for overlap
+// ...so prev: [1,2,5] + next: [3,4,6] -> [1,2,3,4,6]
+export function amendTable(prevTable: Table, nextTable: Table): Table {
+    let [prevTimes] = prevTable;
+    let [nextTimes] = nextTable;
+
+    let pLen = prevTimes.length;
+    let pStart = prevTimes[0];
+    let pEnd = prevTimes[pLen - 1];
+
+    let nLen = nextTimes.length;
+    let nStart = nextTimes[0];
+    let nEnd = nextTimes[nLen - 1];
+
+    let outTable: Table;
+
+    if (pLen) {
+        if (nLen) {
+            // append, no overlap
+            if (nStart > pEnd) {
+                outTable = prevTable.map((_, i) => prevTable[i].concat(nextTable[i])) as Table;
+            }
+            // prepend, no overlap
+            else if (nEnd < pStart) {
+                outTable = nextTable.map((_, i) => nextTable[i].concat(prevTable[i])) as Table;
+            }
+            // full replace
+            else if (nStart <= pStart && nEnd >= pEnd) {
+                outTable = nextTable;
+            }
+            // partial replace
+            else if (nStart > pStart && nEnd < pEnd) {
+            }
+            // append, with overlap
+            else if (nStart >= pStart) {
+                let idx = closestIdx(nStart, prevTimes);
+                idx = prevTimes[idx] < nStart ? idx - 1 : idx;
+                outTable = prevTable.map((_, i) => prevTable[i].slice(0, idx).concat(nextTable[i])) as Table;
+            }
+            // prepend, with overlap
+            else if (nEnd >= pStart) {
+                let idx = closestIdx(nEnd, prevTimes);
+                idx = prevTimes[idx] < nEnd ? idx : idx + 1;
+                outTable = nextTable.map((_, i) => nextTable[i].concat(prevTable[i].slice(idx))) as Table;
+            }
+        } else {
+            outTable = prevTable;
+        }
+    } else {
+        if (nLen) {
+            outTable = nextTable;
+        } else {
+            outTable = [[]];
+        }
+    }
+
+    return outTable!;
+}
+
+export function trimTable(table: Table, fromTime: number, toTime: number): Table {
+    let [times, ...vals] = table;
+    let fromIdx: number | undefined;
+    let toIdx: number | undefined;
+
+    // trim to bounds
+    if (times[0] < fromTime) {
+        fromIdx = closestIdx(fromTime, times);
+
+        if (times[fromIdx] < fromTime) {
+            fromIdx++;
+        }
+    }
+
+    if (times[times.length - 1] > toTime) {
+        toIdx = closestIdx(toTime, times);
+
+        if (times[toIdx] > toTime) {
+            toIdx--;
+        }
+    }
+
+    if (fromIdx != null || toIdx != null) {
+        times = times.slice(fromIdx ?? 0, toIdx);
+        vals = vals.map(vals2 => vals2.slice(fromIdx ?? 0, toIdx));
+    }
+
+    return [times, ...vals];
+}
diff --git a/packages/grafana-prometheus/src/gcopypaste/packages/grafana-ui/src/components/Select/SelectBase.tsx b/packages/grafana-prometheus/src/gcopypaste/packages/grafana-ui/src/components/Select/SelectBase.tsx
new file mode 100644
index 0000000000000..9c6e81eec9ff9
--- /dev/null
+++ b/packages/grafana-prometheus/src/gcopypaste/packages/grafana-ui/src/components/Select/SelectBase.tsx
@@ -0,0 +1,126 @@
+import { cx } from '@emotion/css';
+import { max } from 'lodash';
+import React, { RefCallback } from 'react';
+import { MenuListProps } from 'react-select';
+import { FixedSizeList as List } from 'react-window';
+
+import { SelectableValue, toIconName } from '@grafana/data';
+import { CustomScrollbar, Icon, getSelectStyles, useTheme2 } from '@grafana/ui';
+
+interface SelectMenuProps {
+  maxHeight: number;
+  innerRef: RefCallback<HTMLDivElement>;
+  innerProps: {};
+}
+
+export const SelectMenu = ({ children, maxHeight, innerRef, innerProps }: React.PropsWithChildren<SelectMenuProps>) => {
+  const theme = useTheme2();
+  const styles = getSelectStyles(theme);
+
+  return (
+    <div {...innerProps} className={styles.menu} style={{ maxHeight }} aria-label="Select options menu">
+      <CustomScrollbar scrollRefCallback={innerRef} autoHide={false} autoHeightMax="inherit" hideHorizontalTrack>
+        {children}
+      </CustomScrollbar>
+    </div>
+  );
+};
+
+SelectMenu.displayName = 'SelectMenu';
+
+const VIRTUAL_LIST_ITEM_HEIGHT = 37;
+const VIRTUAL_LIST_WIDTH_ESTIMATE_MULTIPLIER = 7;
+
+// A virtualized version of the SelectMenu, descriptions for SelectableValue options not supported since those are of a variable height.
+//
+// To support the virtualized list we have to "guess" the width of the menu container based on the longest available option.
+// the reason for this is because all of the options will be positioned absolute, this takes them out of the document and no space
+// is created for them, thus the container can't grow to accomodate.
+//
+// VIRTUAL_LIST_ITEM_HEIGHT and WIDTH_ESTIMATE_MULTIPLIER are both magic numbers.
+// Some characters (such as emojis and other unicode characters) may consist of multiple code points in which case the width would be inaccurate (but larger than needed).
+export const VirtualizedSelectMenu = ({ children, maxHeight, options, getValue }: MenuListProps<SelectableValue>) => {
+  const theme = useTheme2();
+  const styles = getSelectStyles(theme);
+  const [value] = getValue();
+
+  const valueIndex = value ? options.findIndex((option: SelectableValue<unknown>) => option.value === value.value) : 0;
+  const initialOffset = valueIndex * VIRTUAL_LIST_ITEM_HEIGHT;
+
+  if (!Array.isArray(children)) {
+    return null;
+  }
+
+  const longestOption = max(options.map((option) => option.label?.length)) ?? 0;
+  const widthEstimate = longestOption * VIRTUAL_LIST_WIDTH_ESTIMATE_MULTIPLIER;
+  const heightEstimate = Math.min(options.length * VIRTUAL_LIST_ITEM_HEIGHT, maxHeight);
+
+  return (
+    <List
+      className={styles.menu}
+      height={heightEstimate}
+      width={widthEstimate}
+      aria-label="Select options menu"
+      itemCount={children.length}
+      itemSize={VIRTUAL_LIST_ITEM_HEIGHT}
+      initialScrollOffset={initialOffset}
+    >
+      {({ index, style }) => <div style={{ ...style, overflow: 'hidden' }}>{children[index]}</div>}
+    </List>
+  );
+};
+
+VirtualizedSelectMenu.displayName = 'VirtualizedSelectMenu';
+
+interface SelectMenuOptionProps<T> {
+  isDisabled: boolean;
+  isFocused: boolean;
+  isSelected: boolean;
+  innerProps: JSX.IntrinsicElements['div'];
+  innerRef: RefCallback<HTMLDivElement>;
+  renderOptionLabel?: (value: SelectableValue<T>) => JSX.Element;
+  data: SelectableValue<T>;
+}
+
+export const SelectMenuOptions = ({
+  children,
+  data,
+  innerProps,
+  innerRef,
+  isFocused,
+  isSelected,
+  renderOptionLabel,
+}: React.PropsWithChildren<SelectMenuOptionProps<unknown>>) => {
+  const theme = useTheme2();
+  const styles = getSelectStyles(theme);
+  const icon = data.icon ? toIconName(data.icon) : undefined;
+  // We are removing onMouseMove and onMouseOver from innerProps because they cause the whole
+  // list to re-render everytime the user hovers over an option. This is a performance issue.
+  // See https://github.com/JedWatson/react-select/issues/3128#issuecomment-451936743
+  const { onMouseMove, onMouseOver, ...rest } = innerProps;
+
+  return (
+    <div
+      ref={innerRef}
+      className={cx(
+        styles.option,
+        isFocused && styles.optionFocused,
+        isSelected && styles.optionSelected,
+        data.isDisabled && styles.optionDisabled
+      )}
+      {...rest}
+      aria-label="Select option"
+      title={data.title}
+    >
+      {icon && <Icon name={icon} className={styles.optionIcon} />}
+      {data.imgUrl && <img className={styles.optionImage} src={data.imgUrl} alt={data.label || String(data.value)} />}
+      <div className={styles.optionBody}>
+        <span>{renderOptionLabel ? renderOptionLabel(data) : children}</span>
+        {data.description && <div className={styles.optionDescription}>{data.description}</div>}
+        {data.component && <data.component />}
+      </div>
+    </div>
+  );
+};
+
+SelectMenuOptions.displayName = 'SelectMenuOptions';
diff --git a/packages/grafana-prometheus/src/gcopypaste/public/test/matchers/index.ts b/packages/grafana-prometheus/src/gcopypaste/public/test/matchers/index.ts
new file mode 100644
index 0000000000000..b6f8a091aaa51
--- /dev/null
+++ b/packages/grafana-prometheus/src/gcopypaste/public/test/matchers/index.ts
@@ -0,0 +1,10 @@
+import { Observable } from 'rxjs';
+
+import { toEmitValues } from './toEmitValues';
+import { toEmitValuesWith } from './toEmitValuesWith';
+import { ObservableMatchers } from './types';
+
+export const matchers: ObservableMatchers<void, Observable<any>> = {
+  toEmitValues,
+  toEmitValuesWith,
+};
diff --git a/packages/grafana-prometheus/src/gcopypaste/public/test/matchers/toEmitValues.test.ts b/packages/grafana-prometheus/src/gcopypaste/public/test/matchers/toEmitValues.test.ts
new file mode 100644
index 0000000000000..71edff27e8d3c
--- /dev/null
+++ b/packages/grafana-prometheus/src/gcopypaste/public/test/matchers/toEmitValues.test.ts
@@ -0,0 +1,140 @@
+import { interval, Observable, of, throwError } from 'rxjs';
+import { map, mergeMap, take } from 'rxjs/operators';
+
+import { OBSERVABLE_TEST_TIMEOUT_IN_MS } from './types';
+
+describe('toEmitValues matcher', () => {
+  describe('failing tests', () => {
+    describe('passing null in expect', () => {
+      it('should fail', async () => {
+        const observable = null as unknown as Observable<number>;
+
+        const rejects = expect(() => expect(observable).toEmitValues([1, 2, 3])).rejects;
+        await rejects.toThrow();
+      });
+    });
+
+    describe('passing undefined in expect', () => {
+      it('should fail', async () => {
+        const observable = undefined as unknown as Observable<number>;
+
+        const rejects = expect(() => expect(observable).toEmitValues([1, 2, 3])).rejects;
+        await rejects.toThrow();
+      });
+    });
+
+    describe('passing number instead of Observable in expect', () => {
+      it('should fail', async () => {
+        const observable = 1 as unknown as Observable<number>;
+
+        const rejects = expect(() => expect(observable).toEmitValues([1, 2, 3])).rejects;
+        await rejects.toThrow();
+      });
+    });
+
+    describe('wrong number of emitted values', () => {
+      it('should fail', async () => {
+        const observable = interval(10).pipe(take(3));
+
+        const rejects = expect(() => expect(observable).toEmitValues([0, 1])).rejects;
+        await rejects.toThrow();
+      });
+    });
+
+    describe('wrong emitted values', () => {
+      it('should fail', async () => {
+        const observable = interval(10).pipe(take(3));
+
+        const rejects = expect(() => expect(observable).toEmitValues([1, 2, 3])).rejects;
+        await rejects.toThrow();
+      });
+    });
+
+    describe('wrong emitted value types', () => {
+      it('should fail', async () => {
+        const observable = interval(10).pipe(take(3)) as unknown as Observable<string>;
+
+        const rejects = expect(() => expect(observable).toEmitValues(['0', '1', '2'])).rejects;
+        await rejects.toThrow();
+      });
+    });
+
+    describe(`observable that does not complete within ${OBSERVABLE_TEST_TIMEOUT_IN_MS}ms`, () => {
+      it('should fail', async () => {
+        const observable = interval(600);
+
+        const rejects = expect(() => expect(observable).toEmitValues([0])).rejects;
+        await rejects.toThrow();
+      });
+    });
+  });
+
+  describe('passing tests', () => {
+    describe('correct emitted values', () => {
+      it('should pass with correct message', async () => {
+        const observable = interval(10).pipe(take(3));
+        await expect(observable).toEmitValues([0, 1, 2]);
+      });
+    });
+
+    describe('using nested arrays', () => {
+      it('should pass with correct message', async () => {
+        const observable = interval(10).pipe(
+          map((interval) => [{ text: interval.toString(), value: interval }]),
+          take(3)
+        );
+        await expect(observable).toEmitValues([
+          [{ text: '0', value: 0 }],
+          [{ text: '1', value: 1 }],
+          [{ text: '2', value: 2 }],
+        ]);
+      });
+    });
+
+    describe('using nested objects', () => {
+      it('should pass with correct message', async () => {
+        const observable = interval(10).pipe(
+          map((interval) => ({ inner: { text: interval.toString(), value: interval } })),
+          take(3)
+        );
+        await expect(observable).toEmitValues([
+          { inner: { text: '0', value: 0 } },
+          { inner: { text: '1', value: 1 } },
+          { inner: { text: '2', value: 2 } },
+        ]);
+      });
+    });
+
+    describe('correct emitted values with throw', () => {
+      it('should pass with correct message', async () => {
+        const observable = interval(10).pipe(
+          map((interval) => {
+            if (interval > 1) {
+              throw 'an error';
+            }
+
+            return interval;
+          })
+        ) as unknown as Observable<string | number>;
+
+        await expect(observable).toEmitValues([0, 1, 'an error']);
+      });
+    });
+
+    describe('correct emitted values with throwError', () => {
+      it('should pass with correct message', async () => {
+        const observable = interval(10).pipe(
+          mergeMap((interval) => {
+            if (interval === 1) {
+              return throwError('an error');
+            }
+
+            return of(interval);
+          })
+        ) as unknown as Observable<string | number>;
+
+        await expect(observable).toEmitValues([0, 'an error']);
+      });
+    });
+  });
+});
diff --git a/packages/grafana-prometheus/src/gcopypaste/public/test/matchers/toEmitValues.ts b/packages/grafana-prometheus/src/gcopypaste/public/test/matchers/toEmitValues.ts
new file mode 100644
index 0000000000000..d2987471a38c8
--- /dev/null
+++ b/packages/grafana-prometheus/src/gcopypaste/public/test/matchers/toEmitValues.ts
@@ -0,0 +1,90 @@
+import { matcherHint, printExpected, printReceived } from 'jest-matcher-utils';
+import { isEqual } from 'lodash';
+import { Observable, Subscription } from 'rxjs';
+
+import { expectObservable, forceObservableCompletion } from './utils';
+
+function passMessage(received: unknown[], expected: unknown[]) {
+  return `${matcherHint('.not.toEmitValues')}
+
+  Expected observable to emit values:
+    ${printExpected(expected)}
+  Received:
+    ${printReceived(received)}
+    `;
+}
+
+function failMessage(received: unknown[], expected: unknown[]) {
+  return `${matcherHint('.toEmitValues')}
+
+  Expected observable to emit values:
+    ${printExpected(expected)}
+  Received:
+    ${printReceived(received)}
+    `;
+}
+
+function tryExpectations(received: unknown[], expected: unknown[]): jest.CustomMatcherResult {
+  try {
+    if (received.length !== expected.length) {
+      return {
+        pass: false,
+        message: () => failMessage(received, expected),
+      };
+    }
+
+    for (let index = 0; index < received.length; index++) {
+      const left = received[index];
+      const right = expected[index];
+
+      if (!isEqual(left, right)) {
+        return {
+          pass: false,
+          message: () => failMessage(received, expected),
+        };
+      }
+    }
+
+    return {
+      pass: true,
+      message: () => passMessage(received, expected),
+    };
+  } catch (err) {
+    const message = err instanceof Error ? err.message : 'An unknown error occurred';
+    return {
+      pass: false,
+      message: () => message,
+    };
+  }
+}
+
+export function toEmitValues(received: Observable<unknown>, expected: unknown[]): Promise<jest.CustomMatcherResult> {
+  const failsChecks = expectObservable(received);
+  if (failsChecks) {
+    return Promise.resolve(failsChecks);
+  }
+
+  return new Promise((resolve) => {
+    const receivedValues: unknown[] = [];
+    const subscription = new Subscription();
+
+    subscription.add(
+      received.subscribe({
+        next: (value) => {
+          receivedValues.push(value);
+        },
+        error: (err) => {
+          receivedValues.push(err);
+          subscription.unsubscribe();
+          resolve(tryExpectations(receivedValues, expected));
+        },
+        complete: () => {
+          subscription.unsubscribe();
+          resolve(tryExpectations(receivedValues, expected));
+        },
+      })
+    );
+
+    forceObservableCompletion(subscription, resolve);
+  });
+}
diff --git a/packages/grafana-prometheus/src/gcopypaste/public/test/matchers/toEmitValuesWith.test.ts b/packages/grafana-prometheus/src/gcopypaste/public/test/matchers/toEmitValuesWith.test.ts
new file mode 100644
index 0000000000000..7ca3eed1c57f1
--- /dev/null
+++ b/packages/grafana-prometheus/src/gcopypaste/public/test/matchers/toEmitValuesWith.test.ts
@@ -0,0 +1,153 @@
+import { interval, Observable, of, throwError } from 'rxjs';
+import { map, mergeMap, take } from 'rxjs/operators';
+
+import { OBSERVABLE_TEST_TIMEOUT_IN_MS } from './types';
+
+describe('toEmitValuesWith matcher', () => {
+  describe('failing tests', () => {
+    describe('passing null in expect', () => {
+      it('should fail with correct message', async () => {
+        const observable = null as unknown as Observable<number>;
+
+        const rejects = expect(() =>
+          expect(observable).toEmitValuesWith((received) => {
+            expect(received).toEqual([1, 2, 3]);
+          })
+        ).rejects;
+
+        await rejects.toThrow();
+      });
+    });
+
+    describe('passing undefined in expect', () => {
+      it('should fail with correct message', async () => {
+        const observable = undefined as unknown as Observable<number>;
+
+        const rejects = expect(() =>
+          expect(observable).toEmitValuesWith((received) => {
+            expect(received).toEqual([1, 2, 3]);
+          })
+        ).rejects;
+
+        await rejects.toThrow();
+      });
+    });
+
+    describe('passing number instead of Observable in expect', () => {
+      it('should fail with correct message', async () => {
+        const observable = 1 as unknown as Observable<number>;
+
+        const rejects = expect(() =>
+          expect(observable).toEmitValuesWith((received) => {
+            expect(received).toEqual([1, 2, 3]);
+          })
+        ).rejects;
+
+        await rejects.toThrow();
+      });
+    });
+
+    describe('wrong number of emitted values', () => {
+      it('should fail with correct message', async () => {
+        const observable = interval(10).pipe(take(3));
+
+        const rejects = expect(() =>
+          expect(observable).toEmitValuesWith((received) => {
+            expect(received).toEqual([0, 1]);
+          })
+        ).rejects;
+
+        await rejects.toThrow();
+      });
+    });
+
+    describe('wrong emitted values', () => {
+      it('should fail with correct message', async () => {
+        const observable = interval(10).pipe(take(3));
+
+        const rejects = expect(() =>
+          expect(observable).toEmitValuesWith((received) => {
+            expect(received).toEqual([1, 2, 3]);
+          })
+        ).rejects;
+
+        await rejects.toThrow();
+      });
+    });
+
+    describe('wrong emitted value types', () => {
+      it('should fail with correct message', async () => {
+        const observable = interval(10).pipe(take(3)) as unknown as Observable<string>;
+
+        const rejects = expect(() =>
+          expect(observable).toEmitValuesWith((received) => {
+            expect(received).toEqual(['0', '1', '2']);
+          })
+        ).rejects;
+
+        await rejects.toThrow();
+      });
+    });
+
+    describe(`observable that does not complete within ${OBSERVABLE_TEST_TIMEOUT_IN_MS}ms`, () => {
+      it('should fail with correct message', async () => {
+        const observable = interval(600);
+
+        const rejects = expect(() =>
+          expect(observable).toEmitValuesWith((received) => {
+            expect(received).toEqual([0]);
+          })
+        ).rejects;
+
+        await rejects.toThrow();
+      });
+    });
+  });
+
+  describe('passing tests', () => {
+    describe('correct emitted values', () => {
+      it('should pass with correct message', async () => {
+        const observable = interval(10).pipe(take(3));
+        await expect(observable).toEmitValuesWith((received) => {
+          expect(received).toEqual([0, 1, 2]);
+        });
+      });
+    });
+
+    describe('correct emitted values with throw', () => {
+      it('should pass with correct message', async () => {
+        const observable = interval(10).pipe(
+          map((interval) => {
+            if (interval > 1) {
+              throw 'an error';
+            }
+
+            return interval;
+          })
+        );
+
+        await expect(observable).toEmitValuesWith((received) => {
+          expect(received).toEqual([0, 1, 'an error']);
+        });
+      });
+    });
+
+    describe('correct emitted values with throwError', () => {
+      it('should pass with correct message', async () => {
+        const observable = interval(10).pipe(
+          mergeMap((interval) => {
+            if (interval === 1) {
+              return throwError('an error');
+            }
+
+            return of(interval);
+          })
+        );
+
+        await expect(observable).toEmitValuesWith((received) => {
+          expect(received).toEqual([0, 'an error']);
+        });
+      });
+    });
+  });
+});
diff --git a/packages/grafana-prometheus/src/gcopypaste/public/test/matchers/toEmitValuesWith.ts b/packages/grafana-prometheus/src/gcopypaste/public/test/matchers/toEmitValuesWith.ts
new file mode 100644
index 0000000000000..d9a53e965a08c
--- /dev/null
+++ b/packages/grafana-prometheus/src/gcopypaste/public/test/matchers/toEmitValuesWith.ts
@@ -0,0 +1,62 @@
+import { matcherHint, printReceived } from 'jest-matcher-utils';
+import { Observable, Subscription } from 'rxjs';
+
+import { expectObservable, forceObservableCompletion } from './utils';
+
+function tryExpectations(received: unknown[], expectations: (received: unknown[]) => void): jest.CustomMatcherResult {
+  try {
+    expectations(received);
+    return {
+      pass: true,
+      message: () => `${matcherHint('.not.toEmitValues')}
+
+  Expected observable to complete with
+    ${printReceived(received)}
+    `,
+    };
+  } catch (err) {
+    return {
+      pass: false,
+      message: () => 'failed ' + err,
+    };
+  }
+}
+
+/**
+ * Collect all the values emitted by the observables (also errors) and pass them to the expectations functions after
+ * the observable ended (or emitted error). If Observable does not complete within OBSERVABLE_TEST_TIMEOUT_IN_MS the
+ * test fails.
+ */
+export function toEmitValuesWith(
+  received: Observable<any>,
+  expectations: (actual: any[]) => void
+): Promise<jest.CustomMatcherResult> {
+  const failsChecks = expectObservable(received);
+  if (failsChecks) {
+    return Promise.resolve(failsChecks);
+  }
+
+  return new Promise((resolve) => {
+    const receivedValues: any[] = [];
+    const subscription = new Subscription();
+
+    subscription.add(
+      received.subscribe({
+        next: (value) => {
+          receivedValues.push(value);
+        },
+        error: (err) => {
+          receivedValues.push(err);
+          subscription.unsubscribe();
+          resolve(tryExpectations(receivedValues, expectations));
+        },
+        complete: () => {
+          subscription.unsubscribe();
+          resolve(tryExpectations(receivedValues, expectations));
+        },
+      })
+    );
+
+    forceObservableCompletion(subscription, resolve);
+  });
+}
diff --git a/packages/grafana-prometheus/src/gcopypaste/public/test/matchers/types.ts b/packages/grafana-prometheus/src/gcopypaste/public/test/matchers/types.ts
new file mode 100644
index 0000000000000..c67b32897f52a
--- /dev/null
+++ b/packages/grafana-prometheus/src/gcopypaste/public/test/matchers/types.ts
@@ -0,0 +1,13 @@
+import { Observable } from 'rxjs';
+
+export const OBSERVABLE_TEST_TIMEOUT_IN_MS = 1000;
+
+export type ObservableType<T> = T extends Observable<infer V> ? V : never;
+
+export interface ObservableMatchers<R, T = {}> extends jest.ExpectExtendMap {
+  toEmitValues<E = ObservableType<T>>(received: T, expected: E[]): Promise<jest.CustomMatcherResult>;
+  toEmitValuesWith<E = ObservableType<T>>(
+    received: T,
+    expectations: (received: E[]) => void
+  ): Promise<jest.CustomMatcherResult>;
+}
diff --git a/packages/grafana-prometheus/src/gcopypaste/public/test/matchers/utils.ts b/packages/grafana-prometheus/src/gcopypaste/public/test/matchers/utils.ts
new file mode 100644
index 0000000000000..e7758bb917786
--- /dev/null
+++ b/packages/grafana-prometheus/src/gcopypaste/public/test/matchers/utils.ts
@@ -0,0 +1,63 @@
+import { matcherHint, printExpected, printReceived } from 'jest-matcher-utils';
+import { asapScheduler, Subscription, timer, isObservable } from 'rxjs';
+
+import { OBSERVABLE_TEST_TIMEOUT_IN_MS } from './types';
+
+export function forceObservableCompletion(subscription: Subscription, resolve: (args: any) => void) {
+  const timeoutObservable = timer(OBSERVABLE_TEST_TIMEOUT_IN_MS, asapScheduler);
+
+  subscription.add(
+    timeoutObservable.subscribe(() => {
+      subscription.unsubscribe();
+      resolve({
+        pass: false,
+        message: () =>
+          `${matcherHint('.toEmitValues')}
+
+    Expected ${printReceived('Observable')} to be ${printExpected(
+      `completed within ${OBSERVABLE_TEST_TIMEOUT_IN_MS}ms`
+    )} but it did not.`,
+      });
+    })
+  );
+}
+
+export function expectObservableToBeDefined(received: unknown): jest.CustomMatcherResult | null {
+  if (received) {
+    return null;
+  }
+
+  return {
+    pass: false,
+    message: () => `${matcherHint('.toEmitValues')}
+
+Expected ${printReceived(received)} to be ${printExpected('defined')}.`,
+  };
+}
+
+export function expectObservableToBeObservable(received: unknown): jest.CustomMatcherResult | null {
+  if (isObservable(received)) {
+    return null;
+  }
+
+  return {
+    pass: false,
+    message: () => `${matcherHint('.toEmitValues')}
+
+Expected ${printReceived(received)} to be ${printExpected('an Observable')}.`,
+  };
+}
+
+export function expectObservable(received: unknown): jest.CustomMatcherResult | null {
+  const toBeDefined = expectObservableToBeDefined(received);
+  if (toBeDefined) {
+    return toBeDefined;
+  }
+
+  const toBeObservable = expectObservableToBeObservable(received);
+  if (toBeObservable) {
+    return toBeObservable;
+  }
+
+  return null;
+}
diff --git a/packages/grafana-prometheus/src/gcopypaste/test/helpers/selectOptionInTest.ts b/packages/grafana-prometheus/src/gcopypaste/test/helpers/selectOptionInTest.ts
new file mode 100644
index 0000000000000..c1ff432daccde
--- /dev/null
+++ b/packages/grafana-prometheus/src/gcopypaste/test/helpers/selectOptionInTest.ts
@@ -0,0 +1,23 @@
+import { Matcher, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { select } from 'react-select-event';
+import { byRole } from 'testing-library-selector';
+
+// Used to select an option or options from a Select in unit tests
+export const selectOptionInTest = async (
+  input: HTMLElement,
+  optionOrOptions: string | RegExp | Array<string | RegExp>
+) => await waitFor(() => select(input, optionOrOptions, { container: document.body }));
+
+// Finds the parent of the Select so you can assert if it has a value
+export const getSelectParent = (input: HTMLElement) =>
+  input.parentElement?.parentElement?.parentElement?.parentElement?.parentElement;
+
+export const clickSelectOption = async (selectElement: HTMLElement, optionText: string): Promise<void> => {
+  await userEvent.click(byRole('combobox').get(selectElement));
+  await selectOptionInTest(selectElement, optionText);
+};
+export const clickSelectOptionMatch = async (selectElement: HTMLElement, optionText: Matcher): Promise<void> => {
+  await userEvent.click(byRole('combobox').get(selectElement));
+  await selectOptionInTest(selectElement, optionText as string);
+};
diff --git a/packages/grafana-prometheus/src/img/cortex_logo.svg b/packages/grafana-prometheus/src/img/cortex_logo.svg
new file mode 100644
index 0000000000000..48ec08428e14e
--- /dev/null
+++ b/packages/grafana-prometheus/src/img/cortex_logo.svg
@@ -0,0 +1 @@
+<svg clip-rule="evenodd" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg"><g fill="#3b697e"><path d="m64.001 32c0-17.646-14.356-32.001-32.001-32.001-17.646 0-32.001 14.355-32.001 32.001s14.355 32.001 32.001 32.001 32.001-14.355 32.001-32.001zm-62.592 0c0-16.868 13.723-30.591 30.591-30.591s30.591 13.723 30.591 30.591-13.723 30.591-30.591 30.591-30.591-13.723-30.591-30.591z" fill-rule="nonzero"/><circle cx="49.3" cy="32.725" r="5.296"/><circle cx="31.875" cy="52.94" r="5.296"/><path d="m31.148 33.103 3.295-8.185 2.988 8.538h2.684c.226 2.71 1.641 5.186 3.861 6.757l-8.659 8.659.665.665 8.808-8.808c1.378.774 2.932 1.18 4.512 1.18 5.056 0 9.216-4.16 9.216-9.215 0-5.056-4.16-9.216-9.216-9.216-1.464 0-2.907.349-4.209 1.017l-9.039-8.587c.797-.953 1.234-2.156 1.234-3.399 0-2.906-2.391-5.297-5.297-5.297s-5.297 2.391-5.297 5.297 2.391 5.297 5.297 5.297c1.242 0 2.445-.436 3.397-1.233l8.86 8.417c-2.542 1.666-4.102 4.486-4.162 7.525h-1.987l-3.594-10.267-3.992 9.915h-4.457l-3.788 8.766-3.341-8.353-.01.004v-.09h-3.378c-.124-2.816-2.474-5.064-5.292-5.064-2.907 0-5.298 2.391-5.298 5.298 0 2.906 2.391 5.298 5.298 5.298 2.64 0 4.898-1.975 5.25-4.592h2.759l3.978 9.947 4.44-10.274zm18.152-8.685c4.54 0 8.276 3.736 8.276 8.276s-3.736 8.276-8.276 8.276-8.276-3.736-8.276-8.276c.005-4.538 3.737-8.271 8.276-8.276z" fill-rule="nonzero"/></g></svg>
\ No newline at end of file
diff --git a/packages/grafana-prometheus/src/img/mimir_logo.svg b/packages/grafana-prometheus/src/img/mimir_logo.svg
new file mode 100644
index 0000000000000..bd9605f592b5a
--- /dev/null
+++ b/packages/grafana-prometheus/src/img/mimir_logo.svg
@@ -0,0 +1 @@
+<svg clip-rule="evenodd" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(0 14.3827 -14.3827 0 7.68261 2.43042)" gradientUnits="userSpaceOnUse" x1="0" x2="1" y1="0" y2="0"><stop offset="0" stop-color="#f2c144"/><stop offset=".24" stop-color="#f1a03b"/><stop offset=".57" stop-color="#f17a31"/><stop offset=".84" stop-color="#f0632a"/><stop offset="1" stop-color="#f05a28"/></linearGradient><path d="m1.941 13.102h2.194l1.538-2.953-1.065-2.043zm11.935-5.079-1.2 2.303 1.406 2.742 1.2-2.313zm-.364-.705-2.562-4.971-1.263 2.228 2.623 5.049zm-3.991 3.039 1.429 2.743h2.436l-2.648-5.083zm-5.276-2.952-1.195-2.305-1.525 2.933 1.172 2.269zm-3.077 1.327-1.09 2.152 1.2 2.179 1.063-2.057zm8.113-3.494-1.27 2.243 1.146 2.179 1.219-2.34zm-4.792-2.98-1.096 2.133 4.264 8.154 1.137-2.182-2.155-4.135z" fill="url(#a)" fill-rule="nonzero"/></svg>
\ No newline at end of file
diff --git a/packages/grafana-prometheus/src/img/prometheus_logo.svg b/packages/grafana-prometheus/src/img/prometheus_logo.svg
new file mode 100644
index 0000000000000..4c4448862e602
--- /dev/null
+++ b/packages/grafana-prometheus/src/img/prometheus_logo.svg
@@ -0,0 +1 @@
+<svg width="2490" height="2500" viewBox="0 0 256 257" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M128.001.667C57.311.667 0 57.971 0 128.664c0 70.69 57.311 127.998 128.001 127.998S256 199.354 256 128.664C256 57.97 198.689.667 128.001.667zm0 239.56c-20.112 0-36.419-13.435-36.419-30.004h72.838c0 16.566-16.306 30.004-36.419 30.004zm60.153-39.94H67.842V178.47h120.314v21.816h-.002zm-.432-33.045H68.185c-.398-.458-.804-.91-1.188-1.375-12.315-14.954-15.216-22.76-18.032-30.716-.048-.262 14.933 3.06 25.556 5.45 0 0 5.466 1.265 13.458 2.722-7.673-8.994-12.23-20.428-12.23-32.116 0-25.658 19.68-48.079 12.58-66.201 6.91.562 14.3 14.583 14.8 36.505 7.346-10.152 10.42-28.69 10.42-40.056 0-11.769 7.755-25.44 15.512-25.907-6.915 11.396 1.79 21.165 9.53 45.4 2.902 9.103 2.532 24.423 4.772 34.138.744-20.178 4.213-49.62 17.014-59.784-5.647 12.8.836 28.818 5.27 36.518 7.154 12.424 11.49 21.836 11.49 39.638 0 11.936-4.407 23.173-11.84 31.958 8.452-1.586 14.289-3.016 14.289-3.016l27.45-5.355c.002-.002-3.987 16.401-19.314 32.197z" fill="#DA4E31"/></svg>
\ No newline at end of file
diff --git a/packages/grafana-prometheus/src/img/thanos_logo.svg b/packages/grafana-prometheus/src/img/thanos_logo.svg
new file mode 100644
index 0000000000000..1e7be78577644
--- /dev/null
+++ b/packages/grafana-prometheus/src/img/thanos_logo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" role="img" viewBox="2.41 2.16 355.42 355.17"><path fill="#fff" d="M9.49808 9.14822v341.59786h241.93485a99.66306 99.66306 0 0 0 99.657-99.663V9.14822zm266.263 215.32837h12.75033v12.75018h-12.75035zm-4.00963-54.89h20.71531v20.72131h-20.71533zm-3.186-54.10261h27.09335v27.11729h-27.09343zm-43.739 159.90321h12.7381v12.75018h-12.75017zm-3.98558-55.53932h20.72129V240.587h-20.72129zm-3.186-53.44731h27.12344v27.09337h-27.09339zm3.186-27.00322v-20.71528h20.72129v20.71527zm-97.82954 135.98981h12.75021v12.75018h-12.75021zm-3.98558-54.8901h20.72131v20.69121h-20.72124zm3.98558-34.1748v-12.75019h12.75021v12.75018zm-3.98558-67.64019h20.72131v20.71527h-20.72124zM72.10081 275.38715H84.875v12.75018H72.10081zm0-50.91056H84.875v12.75018H72.10081zm-3.97955-54.89h20.7153v20.72131h-20.7153zm-3.19206-54.10265h27.09939v27.11729H64.9292zM53.01459 52.67679h254.53469v50.91052H205.74622v203.6302h-50.90449v-203.6302H53.01459z"/></svg>
diff --git a/packages/grafana-prometheus/src/index.ts b/packages/grafana-prometheus/src/index.ts
new file mode 100644
index 0000000000000..76302ec9570be
--- /dev/null
+++ b/packages/grafana-prometheus/src/index.ts
@@ -0,0 +1,87 @@
+// The Grafana Prometheus library exports a number of components.
+// There are main components that can be imported directly into your plugin module.ts file.
+// There are also more granular components that can be used to build components, for example, the config section can be built with granular parts to allow for custom auths.
+
+// COMPONENTS/
+// Main export
+export { PromQueryEditorByApp } from './components/PromQueryEditorByApp';
+// The parts
+export { MonacoQueryFieldLazy } from './components/monaco-query-field/MonacoQueryFieldLazy';
+export { AnnotationQueryEditor } from './components/AnnotationQueryEditor';
+export { PromCheatSheet } from './components/PromCheatSheet';
+export { PrometheusMetricsBrowser } from './components/PrometheusMetricsBrowser';
+export { PromExemplarField } from './components/PromExemplarField';
+export { PromExploreExtraField } from './components/PromExploreExtraField';
+export { PromQueryEditorForAlerting } from './components/PromQueryEditorForAlerting';
+export { PromQueryField } from './components/PromQueryField';
+export { PromVariableQueryEditor } from './components/VariableQueryEditor';
+
+// CONFIGURATION/
+// Main export
+export {
+  ConfigEditor,
+  docsTip,
+  overhaulStyles,
+  validateInput,
+  PROM_CONFIG_LABEL_WIDTH,
+} from './configuration/ConfigEditor';
+// The parts
+export { AlertingSettingsOverhaul } from './configuration/AlertingSettingsOverhaul';
+export { DataSourceHttpSettingsOverhaul } from './configuration/DataSourceHttpSettingsOverhaul';
+export { ExemplarSetting } from './configuration/ExemplarSetting';
+export { ExemplarsSettings } from './configuration/ExemplarsSettings';
+export { PromFlavorVersions } from './configuration/PromFlavorVersions';
+export { PromSettings } from './configuration/PromSettings';
+
+// QUERYBUILDER/
+// The parts (The query builder is imported into PromQueryEditorByApp)
+export { QueryPattern } from './querybuilder/QueryPattern';
+export { QueryPatternsModal } from './querybuilder/QueryPatternsModal';
+
+// QUERYBUILDER/COMPONENTS/
+export { LabelFilterItem } from './querybuilder/components/LabelFilterItem';
+export { LabelFilters } from './querybuilder/components/LabelFilters';
+export { LabelParamEditor } from './querybuilder/components/LabelParamEditor';
+export { MetricSelect } from './querybuilder/components/MetricSelect';
+export { MetricsLabelsSection } from './querybuilder/components/MetricsLabelsSection';
+export { NestedQuery } from './querybuilder/components/NestedQuery';
+export { NestedQueryList } from './querybuilder/components/NestedQueryList';
+export { PromQueryBuilder } from './querybuilder/components/PromQueryBuilder';
+export { PromQueryBuilderContainer } from './querybuilder/components/PromQueryBuilderContainer';
+export { PromQueryBuilderExplained } from './querybuilder/components/PromQueryBuilderExplained';
+export { PromQueryBuilderOptions } from './querybuilder/components/PromQueryBuilderOptions';
+export { PromQueryCodeEditor } from './querybuilder/components/PromQueryCodeEditor';
+export { PromQueryEditorSelector } from './querybuilder/components/PromQueryEditorSelector';
+export { PromQueryLegendEditor } from './querybuilder/components/PromQueryLegendEditor';
+export { QueryPreview } from './querybuilder/components/QueryPreview';
+export { MetricsModal } from './querybuilder/components/metrics-modal/MetricsModal';
+export { PromQail } from './querybuilder/components/promQail/PromQail';
+
+// SRC/
+// Main export
+export { PrometheusDatasource } from './datasource';
+// The parts
+export { addLabelToQuery } from './add_label_to_query';
+export { type QueryEditorMode, type PromQueryFormat, type Prometheus } from './dataquery';
+export { PrometheusMetricFindQuery } from './metric_find_query';
+export { promqlGrammar } from './promql';
+export { getQueryHints, getInitHints } from './query_hints';
+export { transformV2, transformDFToTable } from './result_transformer';
+export {
+  type PromQuery,
+  type PrometheusCacheLevel,
+  type PromApplication,
+  type PromOptions,
+  type ExemplarTraceIdDestination,
+  type PromQueryRequest,
+  type PromMetricsMetadataItem,
+  type PromMetricsMetadata,
+  type PromValue,
+  type PromMetric,
+  type PromBuildInfoResponse,
+  type LegendFormatMode,
+  type PromVariableQueryType,
+  type PromVariableQuery,
+  type StandardPromVariableQuery,
+} from './types';
+export { PrometheusVariableSupport } from './variables';
diff --git a/packages/grafana-prometheus/src/language_provider.mock.ts b/packages/grafana-prometheus/src/language_provider.mock.ts
new file mode 100644
index 0000000000000..731a1977ca97b
--- /dev/null
+++ b/packages/grafana-prometheus/src/language_provider.mock.ts
@@ -0,0 +1,18 @@
+export class EmptyLanguageProviderMock {
+  metrics = [];
+  constructor() {}
+  start() {
+    return new Promise((resolve) => {
+      resolve('');
+    });
+  }
+  getLabelKeys = jest.fn().mockReturnValue([]);
+  getLabelValues = jest.fn().mockReturnValue([]);
+  getSeries = jest.fn().mockReturnValue({ __name__: [] });
+  fetchSeries = jest.fn().mockReturnValue([]);
+  fetchSeriesLabels = jest.fn().mockReturnValue([]);
+  fetchSeriesLabelsMatch = jest.fn().mockReturnValue([]);
+  fetchLabelsWithMatch = jest.fn().mockReturnValue([]);
+  fetchLabels = jest.fn();
+  loadMetricsMetadata = jest.fn();
+}
diff --git a/packages/grafana-prometheus/src/language_provider.test.ts b/packages/grafana-prometheus/src/language_provider.test.ts
new file mode 100644
index 0000000000000..574fec92ef02d
--- /dev/null
+++ b/packages/grafana-prometheus/src/language_provider.test.ts
@@ -0,0 +1,393 @@
+import { AbstractLabelOperator, dateTime, TimeRange } from '@grafana/data';
+
+import { Label } from './components/monaco-query-field/monaco-completion-provider/situation';
+import { PrometheusDatasource } from './datasource';
+import LanguageProvider from './language_provider';
+import { getClientCacheDurationInMinutes, getPrometheusTime, getRangeSnapInterval } from './language_utils';
+import { PrometheusCacheLevel } from './types';
+
+const now = new Date(1681300293392).getTime();
+const timeRangeDurationSeconds = 1;
+const toPrometheusTime = getPrometheusTime(dateTime(now), false);
+const fromPrometheusTime = getPrometheusTime(dateTime(now - timeRangeDurationSeconds * 1000), false);
+const toPrometheusTimeString = toPrometheusTime.toString(10);
+const fromPrometheusTimeString = fromPrometheusTime.toString(10);
+
+const getMockTimeRange = (): TimeRange => {
+  return {
+    to: dateTime(now).utc(),
+    from: dateTime(now).subtract(timeRangeDurationSeconds, 'second').utc(),
+    raw: {
+      from: fromPrometheusTimeString,
+      to: toPrometheusTimeString,
+    },
+  };
+};
+
+const getTimeRangeParams = (
+  timRange: TimeRange,
+  override?: Partial<{ start: string; end: string }>
+): { start: string; end: string } => ({
+  start: fromPrometheusTimeString,
+  end: toPrometheusTimeString,
+  ...override,
+});
+
+const getMockQuantizedTimeRangeParams = (override?: Partial<TimeRange>): TimeRange => ({
+  from: dateTime(fromPrometheusTime * 1000),
+  to: dateTime(toPrometheusTime * 1000),
+  raw: {
+    from: `now-${timeRangeDurationSeconds}s`,
+    to: 'now',
+  },
+  ...override,
+});
+
+describe('Language completion provider', () => {
+  const defaultDatasource: PrometheusDatasource = {
+    metadataRequest: () => ({ data: { data: [] } }),
+    getTimeRangeParams: getTimeRangeParams,
+    interpolateString: (string: string) => string,
+    hasLabelsMatchAPISupport: () => false,
+    getQuantizedTimeRangeParams: () =>
+      getRangeSnapInterval(PrometheusCacheLevel.None, getMockQuantizedTimeRangeParams()),
+    getDaysToCacheMetadata: () => 1,
+    getAdjustedInterval: () => getRangeSnapInterval(PrometheusCacheLevel.None, getMockQuantizedTimeRangeParams()),
+    cacheLevel: PrometheusCacheLevel.None,
+  } as unknown as PrometheusDatasource;
+
+  describe('cleanText', () => {
+    const cleanText = new LanguageProvider(defaultDatasource).cleanText;
+    it('does not remove metric or label keys', () => {
+      expect(cleanText('foo')).toBe('foo');
+      expect(cleanText('foo_bar')).toBe('foo_bar');
+    });
+
+    it('keeps trailing space but removes leading', () => {
+      expect(cleanText('foo ')).toBe('foo ');
+      expect(cleanText(' foo')).toBe('foo');
+    });
+
+    it('removes label syntax', () => {
+      expect(cleanText('foo="bar')).toBe('bar');
+      expect(cleanText('foo!="bar')).toBe('bar');
+      expect(cleanText('foo=~"bar')).toBe('bar');
+      expect(cleanText('foo!~"bar')).toBe('bar');
+      expect(cleanText('{bar')).toBe('bar');
+    });
+
+    it('removes previous operators', () => {
+      expect(cleanText('foo + bar')).toBe('bar');
+      expect(cleanText('foo+bar')).toBe('bar');
+      expect(cleanText('foo - bar')).toBe('bar');
+      expect(cleanText('foo * bar')).toBe('bar');
+      expect(cleanText('foo / bar')).toBe('bar');
+      expect(cleanText('foo % bar')).toBe('bar');
+      expect(cleanText('foo ^ bar')).toBe('bar');
+      expect(cleanText('foo and bar')).toBe('bar');
+      expect(cleanText('foo or bar')).toBe('bar');
+      expect(cleanText('foo unless bar')).toBe('bar');
+      expect(cleanText('foo == bar')).toBe('bar');
+      expect(cleanText('foo != bar')).toBe('bar');
+      expect(cleanText('foo > bar')).toBe('bar');
+      expect(cleanText('foo < bar')).toBe('bar');
+      expect(cleanText('foo >= bar')).toBe('bar');
+      expect(cleanText('foo <= bar')).toBe('bar');
+      expect(cleanText('memory')).toBe('memory');
+    });
+
+    it('removes aggregation syntax', () => {
+      expect(cleanText('(bar')).toBe('bar');
+      expect(cleanText('(foo,bar')).toBe('bar');
+      expect(cleanText('(foo, bar')).toBe('bar');
+    });
+
+    it('removes range syntax', () => {
+      expect(cleanText('[1m')).toBe('1m');
+    });
+  });
+
+  describe('getSeriesLabels', () => {
+    it('should call labels endpoint', () => {
+      const languageProvider = new LanguageProvider({
+        ...defaultDatasource,
+        hasLabelsMatchAPISupport: () => true,
+      } as PrometheusDatasource);
+      const getSeriesLabels = languageProvider.getSeriesLabels;
+      const requestSpy = jest.spyOn(languageProvider, 'request');
+
+      const labelName = 'job';
+      const labelValue = 'grafana';
+      getSeriesLabels(`{${labelName}="${labelValue}"}`, [{ name: labelName, value: labelValue, op: '=' }] as Label[]);
+      expect(requestSpy).toHaveBeenCalled();
+      expect(requestSpy).toHaveBeenCalledWith(
+        `/api/v1/labels`,
+        [],
+        {
+          end: toPrometheusTimeString,
+          'match[]': '{job="grafana"}',
+          start: fromPrometheusTimeString,
+        },
+        undefined
+      );
+    });
+
+    it('should call series endpoint', () => {
+      const languageProvider = new LanguageProvider({
+        ...defaultDatasource,
+        getAdjustedInterval: (timeRange: TimeRange) =>
+          getRangeSnapInterval(PrometheusCacheLevel.None, getMockQuantizedTimeRangeParams()),
+      } as PrometheusDatasource);
+      const getSeriesLabels = languageProvider.getSeriesLabels;
+      const requestSpy = jest.spyOn(languageProvider, 'request');
+
+      const labelName = 'job';
+      const labelValue = 'grafana';
+      getSeriesLabels(`{${labelName}="${labelValue}"}`, [{ name: labelName, value: labelValue, op: '=' }] as Label[]);
+      expect(requestSpy).toHaveBeenCalled();
+      expect(requestSpy).toHaveBeenCalledWith(
+        '/api/v1/series',
+        [],
+        {
+          end: toPrometheusTimeString,
+          'match[]': '{job="grafana"}',
+          start: fromPrometheusTimeString,
+        },
+        undefined
+      );
+    });
+
+    it('should call labels endpoint with quantized start', () => {
+      const timeSnapMinutes = getClientCacheDurationInMinutes(PrometheusCacheLevel.Low);
+      const languageProvider = new LanguageProvider({
+        ...defaultDatasource,
+        hasLabelsMatchAPISupport: () => true,
+        cacheLevel: PrometheusCacheLevel.Low,
+        getAdjustedInterval: (timeRange: TimeRange) =>
+          getRangeSnapInterval(PrometheusCacheLevel.Low, getMockQuantizedTimeRangeParams()),
+        getCacheDurationInMinutes: () => timeSnapMinutes,
+      } as PrometheusDatasource);
+      const getSeriesLabels = languageProvider.getSeriesLabels;
+      const requestSpy = jest.spyOn(languageProvider, 'request');
+
+      const labelName = 'job';
+      const labelValue = 'grafana';
+      getSeriesLabels(`{${labelName}="${labelValue}"}`, [{ name: labelName, value: labelValue, op: '=' }] as Label[]);
+      expect(requestSpy).toHaveBeenCalled();
+      expect(requestSpy).toHaveBeenCalledWith(
+        `/api/v1/labels`,
+        [],
+        {
+          end: (
+            dateTime(fromPrometheusTime * 1000)
+              .add(timeSnapMinutes, 'minute')
+              .startOf('minute')
+              .valueOf() / 1000
+          ).toString(),
+          'match[]': '{job="grafana"}',
+          start: (
+            dateTime(toPrometheusTime * 1000)
+              .startOf('minute')
+              .valueOf() / 1000
+          ).toString(),
+        },
+        { headers: { 'X-Grafana-Cache': `private, max-age=${timeSnapMinutes * 60}` } }
+      );
+    });
+  });
+
+  describe('getSeriesValues', () => {
+    it('should call old series endpoint and should use match[] parameter', () => {
+      const languageProvider = new LanguageProvider({
+        ...defaultDatasource,
+      } as PrometheusDatasource);
+      const getSeriesValues = languageProvider.getSeriesValues;
+      const requestSpy = jest.spyOn(languageProvider, 'request');
+      getSeriesValues('job', '{job="grafana"}');
+      expect(requestSpy).toHaveBeenCalled();
+      expect(requestSpy).toHaveBeenCalledWith(
+        '/api/v1/series',
+        [],
+        {
+          end: toPrometheusTimeString,
+          'match[]': '{job="grafana"}',
+          start: fromPrometheusTimeString,
+        },
+        undefined
+      );
+    });
+
+    it('should call new series endpoint and should use match[] parameter', () => {
+      const languageProvider = new LanguageProvider({
+        ...defaultDatasource,
+        hasLabelsMatchAPISupport: () => true,
+      } as PrometheusDatasource);
+      const getSeriesValues = languageProvider.getSeriesValues;
+      const requestSpy = jest.spyOn(languageProvider, 'request');
+      const labelName = 'job';
+      const labelValue = 'grafana';
+      getSeriesValues(labelName, `{${labelName}="${labelValue}"}`);
+      expect(requestSpy).toHaveBeenCalled();
+      expect(requestSpy).toHaveBeenCalledWith(
+        `/api/v1/label/${labelName}/values`,
+        [],
+        {
+          end: toPrometheusTimeString,
+          'match[]': `{${labelName}="${labelValue}"}`,
+          start: fromPrometheusTimeString,
+        },
+        undefined
+      );
+    });
+
+    it('should call old series endpoint and should use match[] parameter and interpolate the template variables', () => {
+      const languageProvider = new LanguageProvider({
+        ...defaultDatasource,
+        interpolateString: (string: string) => string.replace(/\$/, 'interpolated-'),
+      } as PrometheusDatasource);
+      const getSeriesValues = languageProvider.getSeriesValues;
+      const requestSpy = jest.spyOn(languageProvider, 'request');
+      getSeriesValues('job', '{instance="$instance", job="grafana"}');
+      expect(requestSpy).toHaveBeenCalled();
+      expect(requestSpy).toHaveBeenCalledWith(
+        '/api/v1/series',
+        [],
+        {
+          end: toPrometheusTimeString,
+          'match[]': '{instance="interpolated-instance", job="grafana"}',
+          start: fromPrometheusTimeString,
+        },
+        undefined
+      );
+    });
+  });
+
+  describe('fetchSeries', () => {
+    it('should use match[] parameter', async () => {
+      const languageProvider = new LanguageProvider(defaultDatasource);
+      const timeRange = getMockTimeRange();
+      await languageProvider.start(timeRange);
+      const requestSpy = jest.spyOn(languageProvider, 'request');
+      await languageProvider.fetchSeries('{job="grafana"}');
+      expect(requestSpy).toHaveBeenCalled();
+      expect(requestSpy).toHaveBeenCalledWith(
+        '/api/v1/series',
+        {},
+        {
+          end: toPrometheusTimeString,
+          'match[]': '{job="grafana"}',
+          start: fromPrometheusTimeString,
+        },
+        undefined
+      );
+    });
+  });
+
+  describe('fetchSeriesLabels', () => {
+    it('should interpolate variable in series', () => {
+      const languageProvider = new LanguageProvider({
+        ...defaultDatasource,
+        interpolateString: (string: string) => string.replace(/\$/, 'interpolated-'),
+      } as PrometheusDatasource);
+      const fetchSeriesLabels = languageProvider.fetchSeriesLabels;
+      const requestSpy = jest.spyOn(languageProvider, 'request');
+      fetchSeriesLabels('$metric');
+      expect(requestSpy).toHaveBeenCalled();
+      expect(requestSpy).toHaveBeenCalledWith(
+        '/api/v1/series',
+        [],
+        {
+          end: toPrometheusTimeString,
+          'match[]': 'interpolated-metric',
+          start: fromPrometheusTimeString,
+        },
+        undefined
+      );
+    });
+  });
+
+  describe('fetchLabelValues', () => {
+    it('should interpolate variable in series', () => {
+      const languageProvider = new LanguageProvider({
+        ...defaultDatasource,
+        interpolateString: (string: string) => string.replace(/\$/, 'interpolated-'),
+      } as PrometheusDatasource);
+      const fetchLabelValues = languageProvider.fetchLabelValues;
+      const requestSpy = jest.spyOn(languageProvider, 'request');
+      fetchLabelValues('$job');
+      expect(requestSpy).toHaveBeenCalled();
+      expect(requestSpy).toHaveBeenCalledWith(
+        '/api/v1/label/interpolated-job/values',
+        [],
+        {
+          end: toPrometheusTimeString,
+          start: fromPrometheusTimeString,
+        },
+        undefined
+      );
+    });
+  });
+
+  describe('disabled metrics lookup', () => {
+    it('issues metadata requests when lookup is not disabled', async () => {
+      const datasource: PrometheusDatasource = {
+        ...defaultDatasource,
+        metadataRequest: jest.fn(() => ({ data: { data: ['foo', 'bar'] as string[] } })),
+        lookupsDisabled: false,
+      } as unknown as PrometheusDatasource;
+      const mockedMetadataRequest = jest.mocked(datasource.metadataRequest);
+      const instance = new LanguageProvider(datasource);
+
+      expect(mockedMetadataRequest.mock.calls.length).toBe(0);
+      await instance.start();
+      expect(mockedMetadataRequest.mock.calls.length).toBeGreaterThan(0);
+    });
+
+    it('doesnt blow up if metadata or fetchLabels rejects', async () => {
+      jest.spyOn(console, 'error').mockImplementation();
+      const datasource: PrometheusDatasource = {
+        ...defaultDatasource,
+        metadataRequest: jest.fn(() => Promise.reject('rejected')),
+        lookupsDisabled: false,
+      } as unknown as PrometheusDatasource;
+      const mockedMetadataRequest = jest.mocked(datasource.metadataRequest);
+      const instance = new LanguageProvider(datasource);
+
+      expect(mockedMetadataRequest.mock.calls.length).toBe(0);
+      const result = await instance.start();
+      expect(result[0]).toBeUndefined();
+      expect(result[1]).toEqual([]);
+      expect(mockedMetadataRequest.mock.calls.length).toBe(3);
+    });
+  });
+
+  describe('Query imports', () => {
+    it('returns empty queries', async () => {
+      const instance = new LanguageProvider(defaultDatasource);
+      const result = await instance.importFromAbstractQuery({ refId: 'bar', labelMatchers: [] });
+      expect(result).toEqual({ refId: 'bar', expr: '', range: true });
+    });
+
+    describe('exporting to abstract query', () => {
+      it('exports labels with metric name', async () => {
+        const instance = new LanguageProvider(defaultDatasource);
+        const abstractQuery = instance.exportToAbstractQuery({
+          refId: 'bar',
+          expr: 'metric_name{label1="value1", label2!="value2", label3=~"value3", label4!~"value4"}',
+          instant: true,
+          range: false,
+        });
+        expect(abstractQuery).toMatchObject({
+          refId: 'bar',
+          labelMatchers: [
+            { name: 'label1', operator: AbstractLabelOperator.Equal, value: 'value1' },
+            { name: 'label2', operator: AbstractLabelOperator.NotEqual, value: 'value2' },
+            { name: 'label3', operator: AbstractLabelOperator.EqualRegEx, value: 'value3' },
+            { name: 'label4', operator: AbstractLabelOperator.NotEqualRegEx, value: 'value4' },
+            { name: '__name__', operator: AbstractLabelOperator.Equal, value: 'metric_name' },
+          ],
+        });
+      });
+    });
+  });
+});
diff --git a/packages/grafana-prometheus/src/language_provider.ts b/packages/grafana-prometheus/src/language_provider.ts
new file mode 100644
index 0000000000000..1f0a23f0a1d50
--- /dev/null
+++ b/packages/grafana-prometheus/src/language_provider.ts
@@ -0,0 +1,378 @@
+import { once } from 'lodash';
+import Prism from 'prismjs';
+
+import {
+  AbstractLabelMatcher,
+  AbstractLabelOperator,
+  AbstractQuery,
+  getDefaultTimeRange,
+  LanguageProvider,
+  TimeRange,
+} from '@grafana/data';
+import { BackendSrvRequest } from '@grafana/runtime';
+
+import { Label } from './components/monaco-query-field/monaco-completion-provider/situation';
+import { PrometheusDatasource } from './datasource';
+import {
+  extractLabelMatchers,
+  fixSummariesMetadata,
+  processHistogramMetrics,
+  processLabels,
+  toPromLikeQuery,
+} from './language_utils';
+import PromqlSyntax from './promql';
+import { PrometheusCacheLevel, PromMetricsMetadata, PromQuery } from './types';
+
+const DEFAULT_KEYS = ['job', 'instance'];
+const EMPTY_SELECTOR = '{}';
+// Max number of items (metrics, labels, values) that we display as suggestions. Prevents from running out of memory.
+export const SUGGESTIONS_LIMIT = 10000;
+
+const buildCacheHeaders = (durationInSeconds: number) => {
+  return {
+    headers: {
+      'X-Grafana-Cache': `private, max-age=${durationInSeconds}`,
+    },
+  };
+};
+
+export function getMetadataString(metric: string, metadata: PromMetricsMetadata): string | undefined {
+  if (!metadata[metric]) {
+    return undefined;
+  }
+  const { type, help } = metadata[metric];
+  return `${type.toUpperCase()}: ${help}`;
+}
+
+export function getMetadataHelp(metric: string, metadata: PromMetricsMetadata): string | undefined {
+  if (!metadata[metric]) {
+    return undefined;
+  }
+  return metadata[metric].help;
+}
+
+export function getMetadataType(metric: string, metadata: PromMetricsMetadata): string | undefined {
+  if (!metadata[metric]) {
+    return undefined;
+  }
+  return metadata[metric].type;
+}
+
+const PREFIX_DELIMITER_REGEX =
+  /(="|!="|=~"|!~"|\{|\[|\(|\+|-|\/|\*|%|\^|\band\b|\bor\b|\bunless\b|==|>=|!=|<=|>|<|=|~|,)/;
+
+const secondsInDay = 86400;
+export default class PromQlLanguageProvider extends LanguageProvider {
+  histogramMetrics: string[];
+  timeRange: TimeRange;
+  metrics: string[];
+  metricsMetadata?: PromMetricsMetadata;
+  declare startTask: Promise<any>;
+  datasource: PrometheusDatasource;
+  labelKeys: string[] = [];
+  declare labelFetchTs: number;
+
+  constructor(datasource: PrometheusDatasource, initialValues?: Partial<PromQlLanguageProvider>) {
+    super();
+
+    this.datasource = datasource;
+    this.histogramMetrics = [];
+    this.timeRange = getDefaultTimeRange();
+    this.metrics = [];
+
+    Object.assign(this, initialValues);
+  }
+
+  getDefaultCacheHeaders() {
+    if (this.datasource.cacheLevel !== PrometheusCacheLevel.None) {
+      return buildCacheHeaders(this.datasource.getCacheDurationInMinutes() * 60);
+    }
+    return;
+  }
+
+  // Strip syntax chars so that typeahead suggestions can work on clean inputs
+  cleanText(s: string) {
+    const parts = s.split(PREFIX_DELIMITER_REGEX);
+    const last = parts.pop()!;
+    return last.trimLeft().replace(/"$/, '').replace(/^"/, '');
+  }
+
+  get syntax() {
+    return PromqlSyntax;
+  }
+
+  request = async (url: string, defaultValue: any, params = {}, options?: Partial<BackendSrvRequest>): Promise<any> => {
+    try {
+      const res = await this.datasource.metadataRequest(url, params, options);
+      return res.data.data;
+    } catch (error) {
+      console.error(error);
+    }
+
+    return defaultValue;
+  };
+
+  start = async (timeRange?: TimeRange): Promise<any[]> => {
+    this.timeRange = timeRange ?? getDefaultTimeRange();
+
+    if (this.datasource.lookupsDisabled) {
+      return [];
+    }
+
+    this.metrics = (await this.fetchLabelValues('__name__')) || [];
+    this.histogramMetrics = processHistogramMetrics(this.metrics).sort();
+    return Promise.all([this.loadMetricsMetadata(), this.fetchLabels()]);
+  };
+
+  async loadMetricsMetadata() {
+    const headers = buildCacheHeaders(this.datasource.getDaysToCacheMetadata() * secondsInDay);
+    this.metricsMetadata = fixSummariesMetadata(
+      await this.request(
+        '/api/v1/metadata',
+        {},
+        {},
+        {
+          showErrorAlert: false,
+          ...headers,
+        }
+      )
+    );
+  }
+
+  getLabelKeys(): string[] {
+    return this.labelKeys;
+  }
+
+  importFromAbstractQuery(labelBasedQuery: AbstractQuery): PromQuery {
+    return toPromLikeQuery(labelBasedQuery);
+  }
+
+  exportToAbstractQuery(query: PromQuery): AbstractQuery {
+    const promQuery = query.expr;
+    if (!promQuery || promQuery.length === 0) {
+      return { refId: query.refId, labelMatchers: [] };
+    }
+    const tokens = Prism.tokenize(promQuery, PromqlSyntax);
+    const labelMatchers: AbstractLabelMatcher[] = extractLabelMatchers(tokens);
+    const nameLabelValue = getNameLabelValue(promQuery, tokens);
+    if (nameLabelValue && nameLabelValue.length > 0) {
+      labelMatchers.push({
+        name: '__name__',
+        operator: AbstractLabelOperator.Equal,
+        value: nameLabelValue,
+      });
+    }
+
+    return {
+      refId: query.refId,
+      labelMatchers,
+    };
+  }
+
+  async getSeries(selector: string, withName?: boolean): Promise<Record<string, string[]>> {
+    if (this.datasource.lookupsDisabled) {
+      return {};
+    }
+    try {
+      if (selector === EMPTY_SELECTOR) {
+        return await this.fetchDefaultSeries();
+      } else {
+        return await this.fetchSeriesLabels(selector, withName);
+      }
+    } catch (error) {
+      // TODO: better error handling
+      console.error(error);
+      return {};
+    }
+  }
+
+  /**
+   * @param key
+   */
+  fetchLabelValues = async (key: string): Promise<string[]> => {
+    const params = this.datasource.getAdjustedInterval(this.timeRange);
+    const interpolatedName = this.datasource.interpolateString(key);
+    const url = `/api/v1/label/${interpolatedName}/values`;
+    const value = await this.request(url, [], params, this.getDefaultCacheHeaders());
+    return value ?? [];
+  };
+
+  async getLabelValues(key: string): Promise<string[]> {
+    return await this.fetchLabelValues(key);
+  }
+
+  /**
+   * Fetches all label keys
+   */
+  async fetchLabels(timeRange?: TimeRange): Promise<string[]> {
+    if (timeRange) {
+      this.timeRange = timeRange;
+    }
+    const url = '/api/v1/labels';
+    const params = this.datasource.getAdjustedInterval(this.timeRange);
+    this.labelFetchTs = Date.now().valueOf();
+
+    const res = await this.request(url, [], params, this.getDefaultCacheHeaders());
+    if (Array.isArray(res)) {
+      this.labelKeys = res.slice().sort();
+    }
+
+    return [];
+  }
+
+  /**
+   * Gets series values
+   * Function to replace old getSeries calls in a way that will provide faster endpoints for new prometheus instances,
+   * while maintaining backward compatability
+   * @param labelName
+   * @param selector
+   */
+  getSeriesValues = async (labelName: string, selector: string): Promise<string[]> => {
+    if (!this.datasource.hasLabelsMatchAPISupport()) {
+      const data = await this.getSeries(selector);
+      return data[labelName] ?? [];
+    }
+    return await this.fetchSeriesValuesWithMatch(labelName, selector);
+  };
+
+  /**
+   * Fetches all values for a label, with optional match[]
+   * @param name
+   * @param match
+   * @param timeRange
+   */
+  fetchSeriesValuesWithMatch = async (
+    name: string,
+    match?: string,
+    timeRange: TimeRange = this.timeRange
+  ): Promise<string[]> => {
+    const interpolatedName = name ? this.datasource.interpolateString(name) : null;
+    const interpolatedMatch = match ? this.datasource.interpolateString(match) : null;
+    const range = this.datasource.getAdjustedInterval(timeRange);
+    const urlParams = {
+      ...range,
+      ...(interpolatedMatch && { 'match[]': interpolatedMatch }),
+    };
+
+    const value = await this.request(
+      `/api/v1/label/${interpolatedName}/values`,
+      [],
+      urlParams,
+      this.getDefaultCacheHeaders()
+    );
+    return value ?? [];
+  };
+
+  /**
+   * Gets series labels
+   * Function to replace old getSeries calls in a way that will provide faster endpoints for new prometheus instances,
+   * while maintaining backward compatability. The old API call got the labels and the values in a single query,
+   * but with the new query we need two calls, one to get the labels, and another to get the values.
+   *
+   * @param selector
+   * @param otherLabels
+   */
+  getSeriesLabels = async (selector: string, otherLabels: Label[]): Promise<string[]> => {
+    let possibleLabelNames, data: Record<string, string[]>;
+
+    if (!this.datasource.hasLabelsMatchAPISupport()) {
+      data = await this.getSeries(selector);
+      possibleLabelNames = Object.keys(data); // all names from prometheus
+    } else {
+      // Exclude __name__ from output
+      otherLabels.push({ name: '__name__', value: '', op: '!=' });
+      data = await this.fetchSeriesLabelsMatch(selector);
+      possibleLabelNames = Object.keys(data);
+    }
+
+    const usedLabelNames = new Set(otherLabels.map((l) => l.name)); // names used in the query
+    return possibleLabelNames.filter((l) => !usedLabelNames.has(l));
+  };
+
+  /**
+   * Fetch labels using the best endpoint that datasource supports.
+   * This is cached by its args but also by the global timeRange currently selected as they can change over requested time.
+   * @param name
+   * @param withName
+   */
+  fetchLabelsWithMatch = async (name: string, withName?: boolean): Promise<Record<string, string[]>> => {
+    if (this.datasource.hasLabelsMatchAPISupport()) {
+      return this.fetchSeriesLabelsMatch(name, withName);
+    } else {
+      return this.fetchSeriesLabels(name, withName);
+    }
+  };
+
+  /**
+   * Fetch labels for a series using /series endpoint. This is cached by its args but also by the global timeRange currently selected as
+   * they can change over requested time.
+   * @param name
+   * @param withName
+   */
+  fetchSeriesLabels = async (name: string, withName?: boolean): Promise<Record<string, string[]>> => {
+    const interpolatedName = this.datasource.interpolateString(name);
+    const range = this.datasource.getAdjustedInterval(this.timeRange);
+    const urlParams = {
+      ...range,
+      'match[]': interpolatedName,
+    };
+    const url = `/api/v1/series`;
+
+    const data = await this.request(url, [], urlParams, this.getDefaultCacheHeaders());
+    const { values } = processLabels(data, withName);
+    return values;
+  };
+
+  /**
+   * Fetch labels for a series using /labels endpoint.  This is cached by its args but also by the global timeRange currently selected as
+   * they can change over requested time.
+   * @param name
+   * @param withName
+   */
+  fetchSeriesLabelsMatch = async (name: string, withName?: boolean): Promise<Record<string, string[]>> => {
+    const interpolatedName = this.datasource.interpolateString(name);
+    const range = this.datasource.getAdjustedInterval(this.timeRange);
+    const urlParams = {
+      ...range,
+      'match[]': interpolatedName,
+    };
+    const url = `/api/v1/labels`;
+
+    const data: string[] = await this.request(url, [], urlParams, this.getDefaultCacheHeaders());
+    // Convert string array to Record<string , []>
+    return data.reduce((ac, a) => ({ ...ac, [a]: '' }), {});
+  };
+
+  /**
+   * Fetch series for a selector. Use this for raw results. Use fetchSeriesLabels() to get labels.
+   * @param match
+   */
+  fetchSeries = async (match: string): Promise<Array<Record<string, string>>> => {
+    const url = '/api/v1/series';
+    const range = this.datasource.getTimeRangeParams(this.timeRange);
+    const params = { ...range, 'match[]': match };
+    return await this.request(url, {}, params, this.getDefaultCacheHeaders());
+  };
+
+  /**
+   * Fetch this only one as we assume this won't change over time. This is cached differently from fetchSeriesLabels
+   * because we can cache more aggressively here and also we do not want to invalidate this cache the same way as in
+   * fetchSeriesLabels.
+   */
+  fetchDefaultSeries = once(async () => {
+    const values = await Promise.all(DEFAULT_KEYS.map((key) => this.fetchLabelValues(key)));
+    return DEFAULT_KEYS.reduce((acc, key, i) => ({ ...acc, [key]: values[i] }), {});
+  });
+}
+
+function getNameLabelValue(promQuery: string, tokens: any): string {
+  let nameLabelValue = '';
+
+  for (const token of tokens) {
+    if (typeof token === 'string') {
+      nameLabelValue = token;
+      break;
+    }
+  }
+  return nameLabelValue;
+}
diff --git a/packages/grafana-prometheus/src/language_utils.test.ts b/packages/grafana-prometheus/src/language_utils.test.ts
new file mode 100644
index 0000000000000..fe6d1dd02c981
--- /dev/null
+++ b/packages/grafana-prometheus/src/language_utils.test.ts
@@ -0,0 +1,518 @@
+import { Moment } from 'moment';
+
+import { AbstractLabelOperator, AbstractQuery, DateTime, dateTime, TimeRange } from '@grafana/data';
+
+import {
+  escapeLabelValueInExactSelector,
+  escapeLabelValueInRegexSelector,
+  expandRecordingRules,
+  fixSummariesMetadata,
+  getPrometheusTime,
+  getRangeSnapInterval,
+  parseSelector,
+  toPromLikeQuery,
+  truncateResult,
+} from './language_utils';
+import { PrometheusCacheLevel } from './types';
+
+describe('parseSelector()', () => {
+  let parsed;
+
+  it('returns a clean selector from an empty selector', () => {
+    parsed = parseSelector('{}', 1);
+    expect(parsed.selector).toBe('{}');
+    expect(parsed.labelKeys).toEqual([]);
+  });
+
+  it('returns a clean selector from an unclosed selector', () => {
+    const parsed = parseSelector('{foo');
+    expect(parsed.selector).toBe('{}');
+  });
+
+  it('returns the selector sorted by label key', () => {
+    parsed = parseSelector('{foo="bar"}');
+    expect(parsed.selector).toBe('{foo="bar"}');
+    expect(parsed.labelKeys).toEqual(['foo']);
+
+    parsed = parseSelector('{foo="bar",baz="xx"}');
+    expect(parsed.selector).toBe('{baz="xx",foo="bar"}');
+  });
+
+  it('returns a clean selector from an incomplete one', () => {
+    parsed = parseSelector('{foo}');
+    expect(parsed.selector).toBe('{}');
+
+    parsed = parseSelector('{foo="bar",baz}');
+    expect(parsed.selector).toBe('{foo="bar"}');
+
+    parsed = parseSelector('{foo="bar",baz="}');
+    expect(parsed.selector).toBe('{foo="bar"}');
+
+    // Cursor in value area counts as incomplete
+    parsed = parseSelector('{foo="bar",baz=""}', 16);
+    expect(parsed.selector).toBe('{foo="bar"}');
+
+    parsed = parseSelector('{foo="bar",baz="4"}', 17);
+    expect(parsed.selector).toBe('{foo="bar"}');
+  });
+
+  it('throws if not inside a selector', () => {
+    expect(() => parseSelector('foo{}', 0)).toThrow();
+    expect(() => parseSelector('foo{} + bar{}', 5)).toThrow();
+  });
+
+  it('returns the selector nearest to the cursor offset', () => {
+    expect(() => parseSelector('{foo="bar"} + {foo="bar"}', 0)).toThrow();
+
+    parsed = parseSelector('{foo="bar"} + {foo="bar"}', 1);
+    expect(parsed.selector).toBe('{foo="bar"}');
+
+    parsed = parseSelector('{foo="bar"} + {baz="xx"}', 1);
+    expect(parsed.selector).toBe('{foo="bar"}');
+
+    parsed = parseSelector('{baz="xx"} + {foo="bar"}', 16);
+    expect(parsed.selector).toBe('{foo="bar"}');
+  });
+
+  it('returns a selector with metric if metric is given', () => {
+    parsed = parseSelector('bar{foo}', 4);
+    expect(parsed.selector).toBe('{__name__="bar"}');
+
+    parsed = parseSelector('baz{foo="bar"}', 13);
+    expect(parsed.selector).toBe('{__name__="baz",foo="bar"}');
+
+    parsed = parseSelector('bar:metric:1m{}', 14);
+    expect(parsed.selector).toBe('{__name__="bar:metric:1m"}');
+  });
+});
+
+describe('fixSummariesMetadata', () => {
+  const synthetics = {
+    ALERTS: {
+      type: 'counter',
+      help: 'Time series showing pending and firing alerts. The sample value is set to 1 as long as the alert is in the indicated active (pending or firing) state.',
+    },
+  };
+  it('returns only synthetics on empty metadata', () => {
+    expect(fixSummariesMetadata({})).toEqual({ ...synthetics });
+  });
+
+  it('returns unchanged metadata if no summary is present', () => {
+    const metadataRaw = {
+      foo: [{ type: 'not_a_summary', help: 'foo help' }],
+    };
+
+    const metadata = {
+      foo: { type: 'not_a_summary', help: 'foo help' },
+    };
+    expect(fixSummariesMetadata(metadataRaw)).toEqual({ ...metadata, ...synthetics });
+  });
+
+  it('returns metadata with added count and sum for a summary', () => {
+    const metadata = {
+      foo: [{ type: 'not_a_summary', help: 'foo help' }],
+      bar: [{ type: 'summary', help: 'bar help' }],
+    };
+    const expected = {
+      foo: { type: 'not_a_summary', help: 'foo help' },
+      bar: { type: 'summary', help: 'bar help' },
+      bar_count: {
+        type: 'counter',
+        help: 'Count of events that have been observed for the base metric (bar help)',
+      },
+      bar_sum: { type: 'counter', help: 'Total sum of all observed values for the base metric (bar help)' },
+    };
+    expect(fixSummariesMetadata(metadata)).toEqual({ ...expected, ...synthetics });
+  });
+
+  it('returns metadata with added bucket/count/sum for a histogram', () => {
+    const metadata = {
+      foo: [{ type: 'not_a_histogram', help: 'foo help' }],
+      bar: [{ type: 'histogram', help: 'bar help' }],
+    };
+    const expected = {
+      foo: { type: 'not_a_histogram', help: 'foo help' },
+      bar: { type: 'histogram', help: 'bar help' },
+      bar_bucket: { type: 'counter', help: 'Cumulative counters for the observation buckets (bar help)' },
+      bar_count: {
+        type: 'counter',
+        help: 'Count of events that have been observed for the histogram metric (bar help)',
+      },
+      bar_sum: { type: 'counter', help: 'Total sum of all observed values for the histogram metric (bar help)' },
+    };
+    expect(fixSummariesMetadata(metadata)).toEqual({ ...expected, ...synthetics });
+  });
+});
+
+describe('expandRecordingRules()', () => {
+  it('returns query w/o recording rules as is', () => {
+    expect(expandRecordingRules('metric', {})).toBe('metric');
+    expect(expandRecordingRules('metric + metric', {})).toBe('metric + metric');
+    expect(expandRecordingRules('metric{}', {})).toBe('metric{}');
+  });
+
+  it('does not modify recording rules name in label values', () => {
+    expect(expandRecordingRules('{__name__="metric"} + bar', { metric: 'foo', bar: 'super' })).toBe(
+      '{__name__="metric"} + super'
+    );
+  });
+
+  it('returns query with expanded recording rules', () => {
+    expect(expandRecordingRules('metric', { metric: 'foo' })).toBe('foo');
+    expect(expandRecordingRules('metric + metric', { metric: 'foo' })).toBe('foo + foo');
+    expect(expandRecordingRules('metric{}', { metric: 'foo' })).toBe('foo{}');
+    expect(expandRecordingRules('metric[]', { metric: 'foo' })).toBe('foo[]');
+    expect(expandRecordingRules('metric + foo', { metric: 'foo', foo: 'bar' })).toBe('foo + bar');
+  });
+
+  it('returns query with labels with expanded recording rules', () => {
+    expect(
+      expandRecordingRules('metricA{label1="value1"} / metricB{label2="value2"}', { metricA: 'fooA', metricB: 'fooB' })
+    ).toBe('fooA{label1="value1"} / fooB{label2="value2"}');
+    expect(
+      expandRecordingRules('metricA{label1="value1",label2="value,2"}', {
+        metricA: 'rate(fooA[])',
+      })
+    ).toBe('rate(fooA{label1="value1", label2="value,2"}[])');
+    expect(
+      expandRecordingRules('metricA{label1="value1"} / metricB{label2="value2"}', {
+        metricA: 'rate(fooA[])',
+        metricB: 'rate(fooB[])',
+      })
+    ).toBe('rate(fooA{label1="value1"}[]) / rate(fooB{label2="value2"}[])');
+    expect(
+      expandRecordingRules('metricA{label1="value1",label2="value2"} / metricB{label3="value3"}', {
+        metricA: 'rate(fooA[])',
+        metricB: 'rate(fooB[])',
+      })
+    ).toBe('rate(fooA{label1="value1", label2="value2"}[]) / rate(fooB{label3="value3"}[])');
+  });
+
+  it('expands the query even it is wrapped with parentheses', () => {
+    expect(
+      expandRecordingRules('sum (metric{label1="value1"}) by (env)', { metric: 'foo{labelInside="valueInside"}' })
+    ).toBe('sum (foo{labelInside="valueInside", label1="value1"}) by (env)');
+  });
+
+  it('expands the query with regex match', () => {
+    expect(
+      expandRecordingRules('sum (metric{label1=~"/value1/(sa|sb)"}) by (env)', {
+        metric: 'foo{labelInside="valueInside"}',
+      })
+    ).toBe('sum (foo{labelInside="valueInside", label1=~"/value1/(sa|sb)"}) by (env)');
+  });
+
+  it('ins:metric:per{pid="val-42", comp="api"}', () => {
+    const query = `aaa:111{pid="val-42", comp="api"} + bbb:222{pid="val-42"}`;
+    const mapping = {
+      'aaa:111':
+        '(max without (mp) (targetMetric{device=~"/dev/(sda1|sdb)"}) / max without (mp) (targetMetric2{device=~"/dev/(sda1|sdb)"}))',
+      'bbb:222': '(targetMetric2{device=~"/dev/(sda1|sdb)"})',
+    };
+    const expected = `(max without (mp) (targetMetric{device=~"/dev/(sda1|sdb)", pid="val-42", comp="api"}) / max without (mp) (targetMetric2{device=~"/dev/(sda1|sdb)", pid="val-42", comp="api"})) + (targetMetric2{device=~"/dev/(sda1|sdb)", pid="val-42"})`;
+    const result = expandRecordingRules(query, mapping);
+    expect(result).toBe(expected);
+  });
+});
+
+describe('escapeLabelValueInExactSelector()', () => {
+  it('handles newline characters', () => {
+    expect(escapeLabelValueInExactSelector('t\nes\nt')).toBe('t\\nes\\nt');
+  });
+
+  it('handles backslash characters', () => {
+    expect(escapeLabelValueInExactSelector('t\\es\\t')).toBe('t\\\\es\\\\t');
+  });
+
+  it('handles double-quote characters', () => {
+    expect(escapeLabelValueInExactSelector('t"es"t')).toBe('t\\"es\\"t');
+  });
+
+  it('handles all together', () => {
+    expect(escapeLabelValueInExactSelector('t\\e"st\nl\nab"e\\l')).toBe('t\\\\e\\"st\\nl\\nab\\"e\\\\l');
+  });
+});
+
+describe('escapeLabelValueInRegexSelector()', () => {
+  it('handles newline characters', () => {
+    expect(escapeLabelValueInRegexSelector('t\nes\nt')).toBe('t\\nes\\nt');
+  });
+
+  it('handles backslash characters', () => {
+    expect(escapeLabelValueInRegexSelector('t\\es\\t')).toBe('t\\\\\\\\es\\\\\\\\t');
+  });
+
+  it('handles double-quote characters', () => {
+    expect(escapeLabelValueInRegexSelector('t"es"t')).toBe('t\\"es\\"t');
+  });
+
+  it('handles regex-meaningful characters', () => {
+    expect(escapeLabelValueInRegexSelector('t+es$t')).toBe('t\\\\+es\\\\$t');
+  });
+
+  it('handles all together', () => {
+    expect(escapeLabelValueInRegexSelector('t\\e"s+t\nl\n$ab"e\\l')).toBe(
+      't\\\\\\\\e\\"s\\\\+t\\nl\\n\\\\$ab\\"e\\\\\\\\l'
+    );
+  });
+});
+
+describe('getRangeSnapInterval', () => {
+  it('will not change input if set to no cache', () => {
+    const intervalSeconds = 10 * 60; // 10 minutes
+    const now = new Date().valueOf();
+
+    const expectedFrom = dateTime(now - intervalSeconds * 1000);
+    const expectedTo = dateTime(now);
+
+    const range: TimeRange = {
+      from: expectedFrom,
+      to: expectedTo,
+    } as TimeRange;
+
+    expect(getRangeSnapInterval(PrometheusCacheLevel.None, range)).toEqual({
+      start: getPrometheusTime(expectedFrom, false).toString(),
+      end: getPrometheusTime(expectedTo, true).toString(),
+    });
+  });
+
+  it('will snap range to closest minute', () => {
+    const queryDurationMinutes = 10;
+    const intervalSeconds = queryDurationMinutes * 60; // 10 minutes
+    const now = 1680901009826;
+    const nowPlusOneMinute = now + 1000 * 60;
+    const nowPlusTwoMinute = now + 1000 * 60 * 2;
+
+    const nowTime = dateTime(now) as Moment;
+
+    const expectedFrom = nowTime.clone().startOf('minute').subtract(queryDurationMinutes, 'minute');
+    const expectedTo = nowTime.clone().startOf('minute').add(1, 'minute');
+
+    const range: TimeRange = {
+      from: dateTime(now - intervalSeconds * 1000),
+      to: dateTime(now),
+    } as TimeRange;
+
+    const range2: TimeRange = {
+      from: dateTime(nowPlusOneMinute - intervalSeconds * 1000),
+      to: dateTime(nowPlusOneMinute),
+      raw: {
+        from: dateTime(nowPlusOneMinute - intervalSeconds * 1000),
+        to: dateTime(nowPlusOneMinute),
+      },
+    };
+    const range3: TimeRange = {
+      from: dateTime(nowPlusTwoMinute - intervalSeconds * 1000),
+      to: dateTime(nowPlusTwoMinute),
+      raw: {
+        from: dateTime(nowPlusTwoMinute - intervalSeconds * 1000),
+        to: dateTime(nowPlusTwoMinute),
+      },
+    };
+
+    const first = getRangeSnapInterval(PrometheusCacheLevel.Low, range);
+    const second = getRangeSnapInterval(PrometheusCacheLevel.Low, range2);
+    const third = getRangeSnapInterval(PrometheusCacheLevel.Low, range3);
+
+    expect(first).toEqual({
+      start: getPrometheusTime(expectedFrom as DateTime, false).toString(10),
+      end: getPrometheusTime(expectedTo as DateTime, false).toString(10),
+    });
+
+    expect(second).toEqual({
+      start: getPrometheusTime(expectedFrom.clone().add(1, 'minute') as DateTime, false).toString(10),
+      end: getPrometheusTime(expectedTo.clone().add(1, 'minute') as DateTime, false).toString(10),
+    });
+
+    expect(third).toEqual({
+      start: getPrometheusTime(expectedFrom.clone().add(2, 'minute') as DateTime, false).toString(10),
+      end: getPrometheusTime(expectedTo.clone().add(2, 'minute') as DateTime, false).toString(10),
+    });
+  });
+
+  it('will snap range to closest 10 minute', () => {
+    const queryDurationMinutes = 60;
+    const intervalSeconds = queryDurationMinutes * 60; // 10 minutes
+    const now = 1680901009826;
+    const nowPlusOneMinute = now + 1000 * 60;
+    const nowPlusTwoMinute = now + 1000 * 60 * 2;
+
+    const nowTime = dateTime(now) as Moment;
+    const nowTimePlusOne = dateTime(nowPlusOneMinute) as Moment;
+    const nowTimePlusTwo = dateTime(nowPlusTwoMinute) as Moment;
+
+    const calculateClosest10 = (date: Moment): Moment => {
+      const numberOfMinutes = Math.floor(date.minutes() / 10) * 10;
+      const numberOfHours = numberOfMinutes < 60 ? date.hours() : date.hours() + 1;
+      return date
+        .clone()
+        .minutes(numberOfMinutes % 60)
+        .hours(numberOfHours);
+    };
+
+    const expectedFromFirst = calculateClosest10(
+      nowTime.clone().startOf('minute').subtract(queryDurationMinutes, 'minute')
+    );
+    const expectedToFirst = calculateClosest10(nowTime.clone().startOf('minute').add(1, 'minute'));
+
+    const expectedFromSecond = calculateClosest10(
+      nowTimePlusOne.clone().startOf('minute').subtract(queryDurationMinutes, 'minute')
+    );
+    const expectedToSecond = calculateClosest10(nowTimePlusOne.clone().startOf('minute').add(1, 'minute'));
+
+    const expectedFromThird = calculateClosest10(
+      nowTimePlusTwo.clone().startOf('minute').subtract(queryDurationMinutes, 'minute')
+    );
+    const expectedToThird = calculateClosest10(nowTimePlusTwo.clone().startOf('minute').add(1, 'minute'));
+
+    const range: TimeRange = {
+      from: dateTime(now - intervalSeconds * 1000),
+      to: dateTime(now),
+    } as TimeRange;
+
+    const range2: TimeRange = {
+      from: dateTime(nowPlusOneMinute - intervalSeconds * 1000),
+      to: dateTime(nowPlusOneMinute),
+      raw: {
+        from: dateTime(nowPlusOneMinute - intervalSeconds * 1000),
+        to: dateTime(nowPlusOneMinute),
+      },
+    };
+    const range3: TimeRange = {
+      from: dateTime(nowPlusTwoMinute - intervalSeconds * 1000),
+      to: dateTime(nowPlusTwoMinute),
+      raw: {
+        from: dateTime(nowPlusTwoMinute - intervalSeconds * 1000),
+        to: dateTime(nowPlusTwoMinute),
+      },
+    };
+
+    const first = getRangeSnapInterval(PrometheusCacheLevel.Medium, range);
+    const second = getRangeSnapInterval(PrometheusCacheLevel.Medium, range2);
+    const third = getRangeSnapInterval(PrometheusCacheLevel.Medium, range3);
+
+    expect(first).toEqual({
+      start: getPrometheusTime(expectedFromFirst as DateTime, false).toString(10),
+      end: getPrometheusTime(expectedToFirst as DateTime, false).toString(10),
+    });
+
+    expect(second).toEqual({
+      start: getPrometheusTime(expectedFromSecond.clone() as DateTime, false).toString(10),
+      end: getPrometheusTime(expectedToSecond.clone() as DateTime, false).toString(10),
+    });
+
+    expect(third).toEqual({
+      start: getPrometheusTime(expectedFromThird.clone() as DateTime, false).toString(10),
+      end: getPrometheusTime(expectedToThird.clone() as DateTime, false).toString(10),
+    });
+  });
+
+  it('will snap range to closest 60 minute', () => {
+    const queryDurationMinutes = 120;
+    const intervalSeconds = queryDurationMinutes * 60;
+    const now = 1680901009826;
+    const nowPlusOneMinute = now + 1000 * 60;
+    const nowPlusTwoMinute = now + 1000 * 60 * 2;
+
+    const nowTime = dateTime(now) as Moment;
+    const nowTimePlusOne = dateTime(nowPlusOneMinute) as Moment;
+    const nowTimePlusTwo = dateTime(nowPlusTwoMinute) as Moment;
+
+    const calculateClosest60 = (date: Moment): Moment => {
+      const numberOfMinutes = Math.floor(date.minutes() / 60) * 60;
+      const numberOfHours = numberOfMinutes < 60 ? date.hours() : date.hours() + 1;
+      return date
+        .clone()
+        .minutes(numberOfMinutes % 60)
+        .hours(numberOfHours);
+    };
+
+    const expectedFromFirst = calculateClosest60(
+      nowTime.clone().startOf('minute').subtract(queryDurationMinutes, 'minute')
+    );
+    const expectedToFirst = calculateClosest60(nowTime.clone().startOf('minute').add(1, 'minute'));
+
+    const expectedFromSecond = calculateClosest60(
+      nowTimePlusOne.clone().startOf('minute').subtract(queryDurationMinutes, 'minute')
+    );
+    const expectedToSecond = calculateClosest60(nowTimePlusOne.clone().startOf('minute').add(1, 'minute'));
+
+    const expectedFromThird = calculateClosest60(
+      nowTimePlusTwo.clone().startOf('minute').subtract(queryDurationMinutes, 'minute')
+    );
+    const expectedToThird = calculateClosest60(nowTimePlusTwo.clone().startOf('minute').add(1, 'minute'));
+
+    const range: TimeRange = {
+      from: dateTime(now - intervalSeconds * 1000),
+      to: dateTime(now),
+    } as TimeRange;
+
+    const range2: TimeRange = {
+      from: dateTime(nowPlusOneMinute - intervalSeconds * 1000),
+      to: dateTime(nowPlusOneMinute),
+      raw: {
+        from: dateTime(nowPlusOneMinute - intervalSeconds * 1000),
+        to: dateTime(nowPlusOneMinute),
+      },
+    };
+    const range3: TimeRange = {
+      from: dateTime(nowPlusTwoMinute - intervalSeconds * 1000),
+      to: dateTime(nowPlusTwoMinute),
+      raw: {
+        from: dateTime(nowPlusTwoMinute - intervalSeconds * 1000),
+        to: dateTime(nowPlusTwoMinute),
+      },
+    };
+
+    const first = getRangeSnapInterval(PrometheusCacheLevel.High, range);
+    const second = getRangeSnapInterval(PrometheusCacheLevel.High, range2);
+    const third = getRangeSnapInterval(PrometheusCacheLevel.High, range3);
+
+    expect(first).toEqual({
+      start: getPrometheusTime(expectedFromFirst as DateTime, false).toString(10),
+      end: getPrometheusTime(expectedToFirst as DateTime, false).toString(10),
+    });
+
+    expect(second).toEqual({
+      start: getPrometheusTime(expectedFromSecond.clone() as DateTime, false).toString(10),
+      end: getPrometheusTime(expectedToSecond.clone() as DateTime, false).toString(10),
+    });
+
+    expect(third).toEqual({
+      start: getPrometheusTime(expectedFromThird.clone() as DateTime, false).toString(10),
+      end: getPrometheusTime(expectedToThird.clone() as DateTime, false).toString(10),
+    });
+  });
+});
+
+describe('toPromLikeQuery', () => {
+  it('export abstract query to PromQL-like query', () => {
+    const abstractQuery: AbstractQuery = {
+      refId: 'bar',
+      labelMatchers: [
+        { name: 'label1', operator: AbstractLabelOperator.Equal, value: 'value1' },
+        { name: 'label2', operator: AbstractLabelOperator.NotEqual, value: 'value2' },
+        { name: 'label3', operator: AbstractLabelOperator.EqualRegEx, value: 'value3' },
+        { name: 'label4', operator: AbstractLabelOperator.NotEqualRegEx, value: 'value4' },
+      ],
+    };
+
+    expect(toPromLikeQuery(abstractQuery)).toMatchObject({
+      refId: 'bar',
+      expr: '{label1="value1", label2!="value2", label3=~"value3", label4!~"value4"}',
+      range: true,
+    });
+  });
+});
+
+describe('truncateResult', () => {
+  it('truncates array longer then 1k from the start of array', () => {
+    // creates an array of 1k + 1 elements with values from 0 to 1k
+    const array = Array.from(Array(1001).keys());
+    expect(array[1000]).toBe(1000);
+    truncateResult(array);
+    expect(array.length).toBe(1000);
+    expect(array[0]).toBe(0);
+    expect(array[999]).toBe(999);
+  });
+});
diff --git a/packages/grafana-prometheus/src/language_utils.ts b/packages/grafana-prometheus/src/language_utils.ts
new file mode 100644
index 0000000000000..ce5e43e7e58e4
--- /dev/null
+++ b/packages/grafana-prometheus/src/language_utils.ts
@@ -0,0 +1,533 @@
+import { invert } from 'lodash';
+import { Token } from 'prismjs';
+
+import {
+  AbstractLabelMatcher,
+  AbstractLabelOperator,
+  AbstractQuery,
+  DataQuery,
+  dateMath,
+  DateTime,
+  incrRoundDn,
+  TimeRange,
+} from '@grafana/data';
+
+import { addLabelToQuery } from './add_label_to_query';
+import { SUGGESTIONS_LIMIT } from './language_provider';
+import { PROMETHEUS_QUERY_BUILDER_MAX_RESULTS } from './querybuilder/components/MetricSelect';
+import { PrometheusCacheLevel, PromMetricsMetadata, PromMetricsMetadataItem } from './types';
+
+export const processHistogramMetrics = (metrics: string[]) => {
+  const resultSet: Set<string> = new Set();
+  const regexp = new RegExp('_bucket($|:)');
+  for (let index = 0; index < metrics.length; index++) {
+    const metric = metrics[index];
+    const isHistogramValue = regexp.test(metric);
+    if (isHistogramValue) {
+      resultSet.add(metric);
+    }
+  }
+  return [...resultSet];
+};
+
+export function processLabels(labels: Array<{ [key: string]: string }>, withName = false) {
+  // For processing we are going to use sets as they have significantly better performance than arrays
+  // After we process labels, we will convert sets to arrays and return object with label values in arrays
+  const valueSet: { [key: string]: Set<string> } = {};
+  labels.forEach((label) => {
+    const { __name__, ...rest } = label;
+    if (withName) {
+      valueSet['__name__'] = valueSet['__name__'] || new Set();
+      if (!valueSet['__name__'].has(__name__)) {
+        valueSet['__name__'].add(__name__);
+      }
+    }
+
+    Object.keys(rest).forEach((key) => {
+      if (!valueSet[key]) {
+        valueSet[key] = new Set();
+      }
+      if (!valueSet[key].has(rest[key])) {
+        valueSet[key].add(rest[key]);
+      }
+    });
+  });
+
+  // valueArray that we are going to return in the object
+  const valueArray: { [key: string]: string[] } = {};
+  limitSuggestions(Object.keys(valueSet)).forEach((key) => {
+    valueArray[key] = limitSuggestions(Array.from(valueSet[key]));
+  });
+
+  return { values: valueArray, keys: Object.keys(valueArray) };
+}
+
+// const cleanSelectorRegexp = /\{(\w+="[^"\n]*?")(,\w+="[^"\n]*?")*\}/;
+export const selectorRegexp = /\{[^}]*?(\}|$)/;
+
+// This will capture 4 groups. Example label filter => {instance="10.4.11.4:9003"}
+// 1. label:    instance
+// 2. operator: =
+// 3. value:    "10.4.11.4:9003"
+// 4. comma:    if there is a comma it will give ,
+// 5. space:    if there is a space after comma it will give the whole space
+// comma and space is useful for addLabelsToExpression function
+export const labelRegexp = /\b(\w+)(!?=~?)("[^"\n]*?")(,)?(\s*)?/g;
+
+export function parseSelector(query: string, cursorOffset = 1): { labelKeys: any[]; selector: string } {
+  if (!query.match(selectorRegexp)) {
+    // Special matcher for metrics
+    if (query.match(/^[A-Za-z:][\w:]*$/)) {
+      return {
+        selector: `{__name__="${query}"}`,
+        labelKeys: ['__name__'],
+      };
+    }
+    throw new Error('Query must contain a selector: ' + query);
+  }
+
+  // Check if inside a selector
+  const prefix = query.slice(0, cursorOffset);
+  const prefixOpen = prefix.lastIndexOf('{');
+  const prefixClose = prefix.lastIndexOf('}');
+  if (prefixOpen === -1) {
+    throw new Error('Not inside selector, missing open brace: ' + prefix);
+  }
+  if (prefixClose > -1 && prefixClose > prefixOpen) {
+    throw new Error('Not inside selector, previous selector already closed: ' + prefix);
+  }
+  const suffix = query.slice(cursorOffset);
+  const suffixCloseIndex = suffix.indexOf('}');
+  const suffixClose = suffixCloseIndex + cursorOffset;
+  const suffixOpenIndex = suffix.indexOf('{');
+  const suffixOpen = suffixOpenIndex + cursorOffset;
+  if (suffixClose === -1) {
+    throw new Error('Not inside selector, missing closing brace in suffix: ' + suffix);
+  }
+  if (suffixOpenIndex > -1 && suffixOpen < suffixClose) {
+    throw new Error('Not inside selector, next selector opens before this one closed: ' + suffix);
+  }
+
+  // Extract clean labels to form clean selector, incomplete labels are dropped
+  const selector = query.slice(prefixOpen, suffixClose);
+  const labels: { [key: string]: { value: string; operator: string } } = {};
+  selector.replace(labelRegexp, (label, key, operator, value) => {
+    const labelOffset = query.indexOf(label);
+    const valueStart = labelOffset + key.length + operator.length + 1;
+    const valueEnd = labelOffset + key.length + operator.length + value.length - 1;
+    // Skip label if cursor is in value
+    if (cursorOffset < valueStart || cursorOffset > valueEnd) {
+      labels[key] = { value, operator };
+    }
+    return '';
+  });
+
+  // Add metric if there is one before the selector
+  const metricPrefix = query.slice(0, prefixOpen);
+  const metricMatch = metricPrefix.match(/[A-Za-z:][\w:]*$/);
+  if (metricMatch) {
+    labels['__name__'] = { value: `"${metricMatch[0]}"`, operator: '=' };
+  }
+
+  // Build sorted selector
+  const labelKeys = Object.keys(labels).sort();
+  const cleanSelector = labelKeys.map((key) => `${key}${labels[key].operator}${labels[key].value}`).join(',');
+
+  const selectorString = ['{', cleanSelector, '}'].join('');
+
+  return { labelKeys, selector: selectorString };
+}
+
+export function expandRecordingRules(query: string, mapping: { [name: string]: string }): string {
+  const getRuleRegex = (ruleName: string) => new RegExp(`(\\s|\\(|^)(${ruleName})(\\s|$|\\(|\\[|\\{)`, 'ig');
+
+  // For each mapping key we iterate over the query and split them in parts.
+  // recording:rule{label=~"/label/value"} * some:other:rule{other_label="value"}
+  // We want to keep parts in here like this:
+  // recording:rule
+  // {label=~"/label/value"} *
+  // some:other:rule
+  // {other_label="value"}
+  const tmpSplitParts = Object.keys(mapping).reduce<string[]>(
+    (prev, curr) => {
+      let parts: string[] = [];
+      let tmpParts: string[] = [];
+      let removeIdx: number[] = [];
+
+      // we iterate over prev because it might be like this after first loop
+      // recording:rule and {label=~"/label/value"} * some:other:rule{other_label="value"}
+      // so we need to split the second part too
+      prev.filter(Boolean).forEach((p, i) => {
+        const doesMatch = p.match(getRuleRegex(curr));
+        if (doesMatch) {
+          parts = p.split(curr);
+          if (parts.length === 2) {
+            // this is the case when we have such result for this query
+            // max (metric{label="value"})
+            // "max(", "{label="value"}"
+            removeIdx.push(i);
+            tmpParts.push(...[parts[0], curr, parts[1]].filter(Boolean));
+          } else if (parts.length > 2) {
+            // this is the case when we have such query
+            // metric + metric
+            // when we split it we have such data
+            // "", " + ", ""
+            removeIdx.push(i);
+            parts = parts.map((p) => (p === '' ? curr : p));
+            tmpParts.push(...parts);
+          }
+        }
+      });
+
+      // if we have idx to remove that means we split the value in that index.
+      // No need to keep it. Have the new split values instead.
+      removeIdx.forEach((ri) => (prev[ri] = ''));
+      prev = prev.filter(Boolean);
+      prev.push(...tmpParts);
+
+      return prev;
+    },
+    [query]
+  );
+
+  // we have the separate parts. we need to replace the metric and apply the labels if there is any
+  let labelFound = false;
+  const trulyExpandedQuery = tmpSplitParts.map((tsp, i) => {
+    // if we know this loop tsp is a label, not the metric we want to expand
+    if (labelFound) {
+      labelFound = false;
+      return '';
+    }
+
+    // check if the mapping is there
+    if (mapping[tsp]) {
+      const recordingRule = mapping[tsp];
+      // it is a recording rule. if the following is a label then apply it
+      if (i + 1 !== tmpSplitParts.length && tmpSplitParts[i + 1].match(labelRegexp)) {
+        // the next value in the loop is label. Let's apply labels to the metric
+        labelFound = true;
+        const labels = tmpSplitParts[i + 1];
+        const invalidLabelsRegex = /(\)\{|\}\{|\]\{)/;
+        return addLabelsToExpression(recordingRule + labels, invalidLabelsRegex);
+      } else {
+        // it is not a recording rule and might be a binary operation in between two recording rules
+        // So no need to do anything. just return it.
+        return recordingRule;
+      }
+    }
+
+    return tsp;
+  });
+
+  // Remove empty strings and merge them
+  return trulyExpandedQuery.filter(Boolean).join('');
+}
+
+function addLabelsToExpression(expr: string, invalidLabelsRegexp: RegExp) {
+  const match = expr.match(invalidLabelsRegexp);
+  if (!match) {
+    return expr;
+  }
+
+  // Split query into 2 parts - before the invalidLabelsRegex match and after.
+  const indexOfRegexMatch = match.index ?? 0;
+  const exprBeforeRegexMatch = expr.slice(0, indexOfRegexMatch + 1);
+  const exprAfterRegexMatch = expr.slice(indexOfRegexMatch + 1);
+
+  // Create arrayOfLabelObjects with label objects that have key, operator and value.
+  const arrayOfLabelObjects: Array<{
+    key: string;
+    operator: string;
+    value: string;
+    comma?: string;
+    space?: string;
+  }> = [];
+  exprAfterRegexMatch.replace(labelRegexp, (label, key, operator, value, comma, space) => {
+    arrayOfLabelObjects.push({ key, operator, value, comma, space });
+    return '';
+  });
+
+  // Loop through all label objects and add them to query.
+  // As a starting point we have valid query without the labels.
+  let result = exprBeforeRegexMatch;
+  arrayOfLabelObjects.filter(Boolean).forEach((obj) => {
+    // Remove extra set of quotes from obj.value
+    const value = obj.value.slice(1, -1);
+    result = addLabelToQuery(result, obj.key, value, obj.operator);
+  });
+
+  // reconstruct the labels
+  let existingLabel = arrayOfLabelObjects.reduce((prev, curr) => {
+    prev += `${curr.key}${curr.operator}${curr.value}${curr.comma ?? ''}${curr.space ?? ''}`;
+    return prev;
+  }, '');
+
+  // Check if there is anything besides labels
+  // Useful for this kind of metrics sum (recording_rule_metric{label1="value1"}) by (env)
+  // if we don't check this part, ) by (env) part will be lost
+  existingLabel = '{' + existingLabel + '}';
+  const potentialLeftOver = exprAfterRegexMatch.replace(existingLabel, '');
+
+  return result + potentialLeftOver;
+}
+
+/**
+ * Adds metadata for synthetic metrics for which the API does not provide metadata.
+ * See https://github.com/grafana/grafana/issues/22337 for details.
+ *
+ * @param metadata HELP and TYPE metadata from /api/v1/metadata
+ */
+export function fixSummariesMetadata(metadata: { [metric: string]: PromMetricsMetadataItem[] }): PromMetricsMetadata {
+  if (!metadata) {
+    return metadata;
+  }
+  const baseMetadata: PromMetricsMetadata = {};
+  const summaryMetadata: PromMetricsMetadata = {};
+  for (const metric in metadata) {
+    // NOTE: based on prometheus-documentation, we can receive
+    // multiple metadata-entries for the given metric, it seems
+    // it happens when the same metric is on multiple targets
+    // and their help-text differs
+    // (https://prometheus.io/docs/prometheus/latest/querying/api/#querying-metric-metadata)
+    // for now we just use the first entry.
+    const item = metadata[metric][0];
+    baseMetadata[metric] = item;
+
+    if (item.type === 'histogram') {
+      summaryMetadata[`${metric}_bucket`] = {
+        type: 'counter',
+        help: `Cumulative counters for the observation buckets (${item.help})`,
+      };
+      summaryMetadata[`${metric}_count`] = {
+        type: 'counter',
+        help: `Count of events that have been observed for the histogram metric (${item.help})`,
+      };
+      summaryMetadata[`${metric}_sum`] = {
+        type: 'counter',
+        help: `Total sum of all observed values for the histogram metric (${item.help})`,
+      };
+    }
+    if (item.type === 'summary') {
+      summaryMetadata[`${metric}_count`] = {
+        type: 'counter',
+        help: `Count of events that have been observed for the base metric (${item.help})`,
+      };
+      summaryMetadata[`${metric}_sum`] = {
+        type: 'counter',
+        help: `Total sum of all observed values for the base metric (${item.help})`,
+      };
+    }
+  }
+  // Synthetic series
+  const syntheticMetadata: PromMetricsMetadata = {};
+  syntheticMetadata['ALERTS'] = {
+    type: 'counter',
+    help: 'Time series showing pending and firing alerts. The sample value is set to 1 as long as the alert is in the indicated active (pending or firing) state.',
+  };
+
+  return { ...baseMetadata, ...summaryMetadata, ...syntheticMetadata };
+}
+
+export function roundMsToMin(milliseconds: number): number {
+  return roundSecToMin(milliseconds / 1000);
+}
+
+export function roundSecToMin(seconds: number): number {
+  return Math.floor(seconds / 60);
+}
+
+// Returns number of minutes rounded up to the nearest nth minute
+export function roundSecToNextMin(seconds: number, secondsToRound = 1): number {
+  return Math.ceil(seconds / 60) - (Math.ceil(seconds / 60) % secondsToRound);
+}
+
+export function limitSuggestions(items: string[]) {
+  return items.slice(0, SUGGESTIONS_LIMIT);
+}
+
+export function addLimitInfo(items: any[] | undefined): string {
+  return items && items.length >= SUGGESTIONS_LIMIT ? `, limited to the first ${SUGGESTIONS_LIMIT} received items` : '';
+}
+
+// NOTE: the following 2 exported functions are very similar to the prometheus*Escape
+// functions in datasource.ts, but they are not exactly the same algorithm, and we found
+// no way to reuse one in the another or vice versa.
+
+// Prometheus regular-expressions use the RE2 syntax (https://github.com/google/re2/wiki/Syntax),
+// so every character that matches something in that list has to be escaped.
+// the list of metacharacters is: *+?()|\.[]{}^$
+// we make a javascript regular expression that matches those characters:
+const RE2_METACHARACTERS = /[*+?()|\\.\[\]{}^$]/g;
+
+function escapePrometheusRegexp(value: string): string {
+  return value.replace(RE2_METACHARACTERS, '\\$&');
+}
+
+// based on the openmetrics-documentation, the 3 symbols we have to handle are:
+// - \n ... the newline character
+// - \  ... the backslash character
+// - "  ... the double-quote character
+export function escapeLabelValueInExactSelector(labelValue: string): string {
+  return labelValue.replace(/\\/g, '\\\\').replace(/\n/g, '\\n').replace(/"/g, '\\"');
+}
+
+export function escapeLabelValueInRegexSelector(labelValue: string): string {
+  return escapeLabelValueInExactSelector(escapePrometheusRegexp(labelValue));
+}
+
+const FromPromLikeMap: Record<string, AbstractLabelOperator> = {
+  '=': AbstractLabelOperator.Equal,
+  '!=': AbstractLabelOperator.NotEqual,
+  '=~': AbstractLabelOperator.EqualRegEx,
+  '!~': AbstractLabelOperator.NotEqualRegEx,
+};
+
+const ToPromLikeMap: Record<AbstractLabelOperator, string> = invert(FromPromLikeMap) as Record<
+  AbstractLabelOperator,
+  string
+>;
+
+export function toPromLikeExpr(labelBasedQuery: AbstractQuery): string {
+  const expr = labelBasedQuery.labelMatchers
+    .map((selector: AbstractLabelMatcher) => {
+      const operator = ToPromLikeMap[selector.operator];
+      if (operator) {
+        return `${selector.name}${operator}"${selector.value}"`;
+      } else {
+        return '';
+      }
+    })
+    .filter((e: string) => e !== '')
+    .join(', ');
+
+  return expr ? `{${expr}}` : '';
+}
+
+export function toPromLikeQuery(labelBasedQuery: AbstractQuery): PromLikeQuery {
+  return {
+    refId: labelBasedQuery.refId,
+    expr: toPromLikeExpr(labelBasedQuery),
+    range: true,
+  };
+}
+
+export interface PromLikeQuery extends DataQuery {
+  expr: string;
+  range: boolean;
+}
+
+function getMaybeTokenStringContent(token: Token): string {
+  if (typeof token.content === 'string') {
+    return token.content;
+  }
+
+  return '';
+}
+
+export function extractLabelMatchers(tokens: Array<string | Token>): AbstractLabelMatcher[] {
+  const labelMatchers: AbstractLabelMatcher[] = [];
+
+  for (const token of tokens) {
+    if (!(token instanceof Token)) {
+      continue;
+    }
+
+    if (token.type === 'context-labels') {
+      let labelKey = '';
+      let labelValue = '';
+      let labelOperator = '';
+
+      const contentTokens = Array.isArray(token.content) ? token.content : [token.content];
+
+      for (let currentToken of contentTokens) {
+        if (typeof currentToken === 'string') {
+          let currentStr: string;
+          currentStr = currentToken;
+          if (currentStr === '=' || currentStr === '!=' || currentStr === '=~' || currentStr === '!~') {
+            labelOperator = currentStr;
+          }
+        } else if (currentToken instanceof Token) {
+          switch (currentToken.type) {
+            case 'label-key':
+              labelKey = getMaybeTokenStringContent(currentToken);
+              break;
+            case 'label-value':
+              labelValue = getMaybeTokenStringContent(currentToken);
+              labelValue = labelValue.substring(1, labelValue.length - 1);
+              const labelComparator = FromPromLikeMap[labelOperator];
+              if (labelComparator) {
+                labelMatchers.push({ name: labelKey, operator: labelComparator, value: labelValue });
+              }
+              break;
+          }
+        }
+      }
+    }
+  }
+
+  return labelMatchers;
+}
+
+/**
+ * Calculates new interval "snapped" to the closest Nth minute, depending on cache level datasource setting
+ * @param cacheLevel
+ * @param range
+ */
+export function getRangeSnapInterval(
+  cacheLevel: PrometheusCacheLevel,
+  range: TimeRange
+): { start: string; end: string } {
+  // Don't round the range if we're not caching
+  if (cacheLevel === PrometheusCacheLevel.None) {
+    return {
+      start: getPrometheusTime(range.from, false).toString(),
+      end: getPrometheusTime(range.to, true).toString(),
+    };
+  }
+  // Otherwise round down to the nearest nth minute for the start time
+  const startTime = getPrometheusTime(range.from, false);
+  // const startTimeQuantizedSeconds = roundSecToLastMin(startTime, getClientCacheDurationInMinutes(cacheLevel)) * 60;
+  const startTimeQuantizedSeconds = incrRoundDn(startTime, getClientCacheDurationInMinutes(cacheLevel) * 60);
+
+  // And round up to the nearest nth minute for the end time
+  const endTime = getPrometheusTime(range.to, true);
+  const endTimeQuantizedSeconds = roundSecToNextMin(endTime, getClientCacheDurationInMinutes(cacheLevel)) * 60;
+
+  // If the interval was too short, we could have rounded both start and end to the same time, if so let's add one step to the end
+  if (startTimeQuantizedSeconds === endTimeQuantizedSeconds) {
+    const endTimePlusOneStep = endTimeQuantizedSeconds + getClientCacheDurationInMinutes(cacheLevel) * 60;
+    return { start: startTimeQuantizedSeconds.toString(), end: endTimePlusOneStep.toString() };
+  }
+
+  const start = startTimeQuantizedSeconds.toString();
+  const end = endTimeQuantizedSeconds.toString();
+
+  return { start, end };
+}
+
+export function getClientCacheDurationInMinutes(cacheLevel: PrometheusCacheLevel) {
+  switch (cacheLevel) {
+    case PrometheusCacheLevel.Medium:
+      return 10;
+    case PrometheusCacheLevel.High:
+      return 60;
+    default:
+      return 1;
+  }
+}
+
+export function getPrometheusTime(date: string | DateTime, roundUp: boolean) {
+  if (typeof date === 'string') {
+    date = dateMath.parse(date, roundUp)!;
+  }
+
+  return Math.ceil(date.valueOf() / 1000);
+}
+
+export function truncateResult<T>(array: T[], limit?: number): T[] {
+  if (limit === undefined) {
+    limit = PROMETHEUS_QUERY_BUILDER_MAX_RESULTS;
+  }
+  array.length = Math.min(array.length, limit);
+  return array;
+}
diff --git a/packages/grafana-prometheus/src/metric_find_query.test.ts b/packages/grafana-prometheus/src/metric_find_query.test.ts
new file mode 100644
index 0000000000000..a410189fc42db
--- /dev/null
+++ b/packages/grafana-prometheus/src/metric_find_query.test.ts
@@ -0,0 +1,417 @@
+import { Observable, of } from 'rxjs';
+
+import 'whatwg-fetch'; // fetch polyfill needed backendSrv
+import { DataSourceInstanceSettings, TimeRange, toUtc } from '@grafana/data';
+import { BackendDataSourceResponse, BackendSrvRequest, FetchResponse, TemplateSrv } from '@grafana/runtime';
+
+import { PrometheusDatasource } from './datasource';
+import { getPrometheusTime } from './language_utils';
+import { PrometheusMetricFindQuery } from './metric_find_query';
+import { PromApplication, PromOptions } from './types';
+
+const fetchMock = jest.fn((options: BackendSrvRequest): Observable<FetchResponse<BackendDataSourceResponse>> => {
+  return of({} as unknown as FetchResponse);
+});
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getBackendSrv: () => {
+    return {
+      fetch: fetchMock,
+    };
+  },
+}));
+
+const instanceSettings = {
+  url: 'proxied',
+  id: 1,
+  uid: 'ABCDEF',
+  user: 'test',
+  password: 'mupp',
+  jsonData: {
+    httpMethod: 'GET',
+    prometheusVersion: '2.20.0',
+    prometheusType: PromApplication.Prometheus,
+  },
+} as Partial<DataSourceInstanceSettings<PromOptions>> as DataSourceInstanceSettings<PromOptions>;
+const raw: TimeRange = {
+  from: toUtc('2018-04-25 10:00'),
+  to: toUtc('2018-04-25 11:00'),
+  raw: {
+    from: '2018-04-25 10:00',
+    to: '2018-04-25 11:00',
+  },
+};
+
+const templateSrvStub = {
+  getAdhocFilters: jest.fn().mockImplementation(() => []),
+  replace: jest.fn().mockImplementation((a: string) => a),
+} as unknown as TemplateSrv;
+
+beforeEach(() => {
+  jest.clearAllMocks();
+});
+
+describe('PrometheusMetricFindQuery', () => {
+  let legacyPrometheusDatasource: PrometheusDatasource;
+  let prometheusDatasource: PrometheusDatasource;
+  beforeEach(() => {
+    legacyPrometheusDatasource = new PrometheusDatasource(instanceSettings, templateSrvStub);
+    prometheusDatasource = new PrometheusDatasource(
+      {
+        ...instanceSettings,
+        jsonData: { ...instanceSettings.jsonData, prometheusVersion: '2.2.0', prometheusType: PromApplication.Mimir },
+      },
+      templateSrvStub
+    );
+  });
+
+  const setupMetricFindQuery = (
+    data: {
+      query: string;
+      response: {
+        data: unknown;
+      };
+    },
+    datasource?: PrometheusDatasource
+  ) => {
+    fetchMock.mockImplementation(() => of({ status: 'success', data: data.response } as unknown as FetchResponse));
+    return new PrometheusMetricFindQuery(datasource ?? legacyPrometheusDatasource, data.query);
+  };
+
+  describe('When performing metricFindQuery', () => {
+    it('label_names() should generate label name search query', async () => {
+      const query = setupMetricFindQuery({
+        query: 'label_names()',
+        response: {
+          data: ['name1', 'name2', 'name3'],
+        },
+      });
+      const results = await query.process(raw);
+
+      expect(results).toHaveLength(3);
+      expect(fetchMock).toHaveBeenCalledTimes(1);
+      expect(fetchMock).toHaveBeenCalledWith({
+        method: 'GET',
+        url: `/api/datasources/uid/ABCDEF/resources/api/v1/labels?start=${raw.from.unix()}&end=${raw.to.unix()}`,
+        hideFromInspector: true,
+        showErrorAlert: false,
+        headers: {
+          'X-Grafana-Cache': 'private, max-age=60',
+        },
+      });
+    });
+
+    it('label_values(resource) should generate label search query', async () => {
+      const query = setupMetricFindQuery({
+        query: 'label_values(resource)',
+        response: {
+          data: ['value1', 'value2', 'value3'],
+        },
+      });
+      const results = await query.process(raw);
+
+      expect(results).toHaveLength(3);
+      expect(fetchMock).toHaveBeenCalledTimes(1);
+      expect(fetchMock).toHaveBeenCalledWith({
+        method: 'GET',
+        url: `/api/datasources/uid/ABCDEF/resources/api/v1/label/resource/values?start=${raw.from.unix()}&end=${raw.to.unix()}`,
+        hideFromInspector: true,
+        headers: {},
+      });
+    });
+
+    const emptyFilters = ['{}', '{   }', ' {   }  ', '   {}  '];
+
+    emptyFilters.forEach((emptyFilter) => {
+      const queryString = `label_values(${emptyFilter}, resource)`;
+      it(`Empty filter, query, ${queryString} should just generate label search query`, async () => {
+        const query = setupMetricFindQuery({
+          query: queryString,
+          response: {
+            data: ['value1', 'value2', 'value3'],
+          },
+        });
+        const results = await query.process(raw);
+
+        expect(results).toHaveLength(3);
+        expect(fetchMock).toHaveBeenCalledTimes(1);
+        expect(fetchMock).toHaveBeenCalledWith({
+          method: 'GET',
+          url: `/api/datasources/uid/ABCDEF/resources/api/v1/label/resource/values?start=${raw.from.unix()}&end=${raw.to.unix()}`,
+          hideFromInspector: true,
+          headers: {},
+        });
+      });
+    });
+
+    // <LegacyPrometheus>
+    it('label_values(metric, resource) should generate series query with correct time', async () => {
+      const query = setupMetricFindQuery({
+        query: 'label_values(metric, resource)',
+        response: {
+          data: [
+            { __name__: 'metric', resource: 'value1' },
+            { __name__: 'metric', resource: 'value2' },
+            { __name__: 'metric', resource: 'value3' },
+          ],
+        },
+      });
+      const results = await query.process(raw);
+
+      expect(results).toHaveLength(3);
+      expect(fetchMock).toHaveBeenCalledTimes(1);
+      expect(fetchMock).toHaveBeenCalledWith({
+        method: 'GET',
+        url: `/api/datasources/uid/ABCDEF/resources/api/v1/series?match${encodeURIComponent(
+          '[]'
+        )}=metric&start=${raw.from.unix()}&end=${raw.to.unix()}`,
+        hideFromInspector: true,
+        showErrorAlert: false,
+        headers: {},
+      });
+    });
+
+    it('label_values(metric{label1="foo", label2="bar", label3="baz"}, resource) should generate series query with correct time', async () => {
+      const query = setupMetricFindQuery({
+        query: 'label_values(metric{label1="foo", label2="bar", label3="baz"}, resource)',
+        response: {
+          data: [
+            { __name__: 'metric', resource: 'value1' },
+            { __name__: 'metric', resource: 'value2' },
+            { __name__: 'metric', resource: 'value3' },
+          ],
+        },
+      });
+      const results = await query.process(raw);
+
+      expect(results).toHaveLength(3);
+      expect(fetchMock).toHaveBeenCalledTimes(1);
+      expect(fetchMock).toHaveBeenCalledWith({
+        method: 'GET',
+        url: '/api/datasources/uid/ABCDEF/resources/api/v1/series?match%5B%5D=metric%7Blabel1%3D%22foo%22%2C%20label2%3D%22bar%22%2C%20label3%3D%22baz%22%7D&start=1524650400&end=1524654000',
+        hideFromInspector: true,
+        showErrorAlert: false,
+        headers: {},
+      });
+    });
+
+    it('label_values(metric, resource) result should not contain empty string', async () => {
+      const query = setupMetricFindQuery({
+        query: 'label_values(metric, resource)',
+        response: {
+          data: [
+            { __name__: 'metric', resource: 'value1' },
+            { __name__: 'metric', resource: 'value2' },
+            { __name__: 'metric', resource: '' },
+          ],
+        },
+      });
+      const results = await query.process(raw);
+
+      expect(results).toHaveLength(2);
+      expect(results[0].text).toBe('value1');
+      expect(results[1].text).toBe('value2');
+      expect(fetchMock).toHaveBeenCalledTimes(1);
+      expect(fetchMock).toHaveBeenCalledWith({
+        method: 'GET',
+        url: `/api/datasources/uid/ABCDEF/resources/api/v1/series?match${encodeURIComponent(
+          '[]'
+        )}=metric&start=${raw.from.unix()}&end=${raw.to.unix()}`,
+        hideFromInspector: true,
+        showErrorAlert: false,
+        headers: {},
+      });
+    });
+    // </LegacyPrometheus>
+
+    it('metrics(metric.*) should generate metric name query', async () => {
+      const query = setupMetricFindQuery({
+        query: 'metrics(metric.*)',
+        response: {
+          data: ['metric1', 'metric2', 'metric3', 'nomatch'],
+        },
+      });
+      const results = await query.process(raw);
+
+      expect(results).toHaveLength(3);
+      expect(fetchMock).toHaveBeenCalledTimes(1);
+      expect(fetchMock).toHaveBeenCalledWith({
+        method: 'GET',
+        url: `/api/datasources/uid/ABCDEF/resources/api/v1/label/__name__/values?start=${raw.from.unix()}&end=${raw.to.unix()}`,
+        hideFromInspector: true,
+        headers: {},
+      });
+    });
+
+    it('query_result(metric) should generate metric name query', async () => {
+      const query = setupMetricFindQuery({
+        query: 'query_result(metric)',
+        response: {
+          data: {
+            resultType: 'vector',
+            result: [
+              {
+                metric: { __name__: 'metric', job: 'testjob' },
+                value: [1443454528.0, '3846'],
+              },
+            ],
+          },
+        },
+      });
+      const results = await query.process(raw);
+
+      expect(results).toHaveLength(1);
+      expect(results[0].text).toBe('metric{job="testjob"} 3846 1443454528000');
+      expect(fetchMock).toHaveBeenCalledTimes(1);
+      expect(fetchMock).toHaveBeenCalledWith({
+        method: 'GET',
+        url: `/api/datasources/uid/ABCDEF/resources/api/v1/query?query=metric&time=${raw.to.unix()}`,
+        headers: {},
+        hideFromInspector: true,
+        showErrorAlert: false,
+      });
+    });
+
+    it('query_result(metric) should pass time parameter to datasource.metric_find_query', async () => {
+      const query = setupMetricFindQuery({
+        query: 'query_result(metric)',
+        response: {
+          data: {
+            resultType: 'vector',
+            result: [
+              {
+                metric: { __name__: 'metric', job: 'testjob' },
+                value: [1443454528.0, '3846'],
+              },
+            ],
+          },
+        },
+      });
+      const results = await query.process(raw);
+
+      const expectedTime = getPrometheusTime(raw.to, true);
+
+      expect(results).toHaveLength(1);
+      expect(results[0].text).toBe('metric{job="testjob"} 3846 1443454528000');
+      expect(fetchMock).toHaveBeenCalledTimes(1);
+      expect(fetchMock).toHaveBeenCalledWith({
+        method: 'GET',
+        url: `/api/datasources/uid/ABCDEF/resources/api/v1/query?query=metric&time=${expectedTime}`,
+        headers: {},
+        hideFromInspector: true,
+        showErrorAlert: false,
+      });
+    });
+
+    it('query_result(metric) should handle scalar resultTypes separately', async () => {
+      const query = setupMetricFindQuery({
+        query: 'query_result(1+1)',
+        response: {
+          data: {
+            resultType: 'scalar',
+            result: [1443454528.0, '2'],
+          },
+        },
+      });
+      const results = await query.process(raw);
+      expect(results).toHaveLength(1);
+      expect(results[0].text).toBe('2');
+      expect(fetchMock).toHaveBeenCalledTimes(1);
+      expect(fetchMock).toHaveBeenCalledWith({
+        method: 'GET',
+        url: `/api/datasources/uid/ABCDEF/resources/api/v1/query?query=1%2B1&time=${raw.to.unix()}`,
+        headers: {},
+        hideFromInspector: true,
+        showErrorAlert: false,
+      });
+    });
+
+    it('up{job="job1"} should fallback using generate series query', async () => {
+      const query = setupMetricFindQuery({
+        query: 'up{job="job1"}',
+        response: {
+          data: [
+            { __name__: 'up', instance: '127.0.0.1:1234', job: 'job1' },
+            { __name__: 'up', instance: '127.0.0.1:5678', job: 'job1' },
+            { __name__: 'up', instance: '127.0.0.1:9102', job: 'job1' },
+          ],
+        },
+      });
+      const results = await query.process(raw);
+
+      expect(results).toHaveLength(3);
+      expect(results[0].text).toBe('up{instance="127.0.0.1:1234",job="job1"}');
+      expect(results[1].text).toBe('up{instance="127.0.0.1:5678",job="job1"}');
+      expect(results[2].text).toBe('up{instance="127.0.0.1:9102",job="job1"}');
+      expect(fetchMock).toHaveBeenCalledTimes(1);
+      expect(fetchMock).toHaveBeenCalledWith({
+        method: 'GET',
+        url: `/api/datasources/uid/ABCDEF/resources/api/v1/series?match${encodeURIComponent('[]')}=${encodeURIComponent(
+          'up{job="job1"}'
+        )}&start=${raw.from.unix()}&end=${raw.to.unix()}`,
+        hideFromInspector: true,
+        showErrorAlert: false,
+        headers: {},
+      });
+    });
+
+    // <ModernPrometheus>
+    it('label_values(metric, resource) should generate label values query with correct time', async () => {
+      const metricName = 'metricName';
+      const resourceName = 'resourceName';
+      const query = setupMetricFindQuery(
+        {
+          query: `label_values(${metricName}, ${resourceName})`,
+          response: {
+            data: [
+              { __name__: `${metricName}`, resourceName: 'value1' },
+              { __name__: `${metricName}`, resourceName: 'value2' },
+              { __name__: `${metricName}`, resourceName: 'value3' },
+            ],
+          },
+        },
+        prometheusDatasource
+      );
+      const results = await query.process(raw);
+
+      expect(results).toHaveLength(3);
+      expect(fetchMock).toHaveBeenCalledTimes(1);
+      expect(fetchMock).toHaveBeenCalledWith({
+        method: 'GET',
+        url: `/api/datasources/uid/ABCDEF/resources/api/v1/label/${resourceName}/values?match${encodeURIComponent(
+          '[]'
+        )}=${metricName}&start=${raw.from.unix()}&end=${raw.to.unix()}`,
+        hideFromInspector: true,
+        headers: {},
+      });
+    });
+
+    it('label_values(metric{label1="foo", label2="bar", label3="baz"}, resource) should generate label values query with correct time', async () => {
+      const metricName = 'metricName';
+      const resourceName = 'resourceName';
+      const label1Name = 'label1';
+      const label1Value = 'label1Value';
+      const query = setupMetricFindQuery(
+        {
+          query: `label_values(${metricName}{${label1Name}="${label1Value}"}, ${resourceName})`,
+          response: {
+            data: [{ __name__: metricName, resourceName: label1Value }],
+          },
+        },
+        prometheusDatasource
+      );
+      const results = await query.process(raw);
+
+      expect(results).toHaveLength(1);
+      expect(fetchMock).toHaveBeenCalledTimes(1);
+      expect(fetchMock).toHaveBeenCalledWith({
+        method: 'GET',
+        url: `/api/datasources/uid/ABCDEF/resources/api/v1/label/${resourceName}/values?match%5B%5D=${metricName}%7B${label1Name}%3D%22${label1Value}%22%7D&start=1524650400&end=1524654000`,
+        hideFromInspector: true,
+        headers: {},
+      });
+    });
+    // </ ModernPrometheus>
+  });
+});
diff --git a/packages/grafana-prometheus/src/metric_find_query.ts b/packages/grafana-prometheus/src/metric_find_query.ts
new file mode 100644
index 0000000000000..ad3e229c5c071
--- /dev/null
+++ b/packages/grafana-prometheus/src/metric_find_query.ts
@@ -0,0 +1,203 @@
+import { chain, map as _map, uniq } from 'lodash';
+
+import { getDefaultTimeRange, MetricFindValue, TimeRange } from '@grafana/data';
+
+import { PrometheusDatasource } from './datasource';
+import { getPrometheusTime } from './language_utils';
+import {
+  PrometheusLabelNamesRegex,
+  PrometheusLabelNamesRegexWithMatch,
+  PrometheusMetricNamesRegex,
+  PrometheusQueryResultRegex,
+} from './migrations/variableMigration';
+
+export class PrometheusMetricFindQuery {
+  range: TimeRange;
+
+  constructor(
+    private datasource: PrometheusDatasource,
+    private query: string
+  ) {
+    this.datasource = datasource;
+    this.query = query;
+    this.range = getDefaultTimeRange();
+  }
+
+  process(timeRange: TimeRange): Promise<MetricFindValue[]> {
+    this.range = timeRange;
+    const labelNamesRegex = PrometheusLabelNamesRegex;
+    const labelNamesRegexWithMatch = PrometheusLabelNamesRegexWithMatch;
+    const labelValuesRegex = /^label_values\((?:(.+),\s*)?([a-zA-Z_][a-zA-Z0-9_]*)\)\s*$/;
+    const metricNamesRegex = PrometheusMetricNamesRegex;
+    const queryResultRegex = PrometheusQueryResultRegex;
+    const labelNamesQuery = this.query.match(labelNamesRegex);
+    const labelNamesMatchQuery = this.query.match(labelNamesRegexWithMatch);
+
+    if (labelNamesMatchQuery) {
+      const selector = `{__name__=~".*${labelNamesMatchQuery[1]}.*"}`;
+      return this.datasource.languageProvider.getSeriesLabels(selector, []).then((results) =>
+        results.map((result) => ({
+          text: result,
+        }))
+      );
+    }
+
+    if (labelNamesQuery) {
+      return this.datasource.getTagKeys({ filters: [], timeRange });
+    }
+
+    const labelValuesQuery = this.query.match(labelValuesRegex);
+    if (labelValuesQuery) {
+      const filter = labelValuesQuery[1];
+      const label = labelValuesQuery[2];
+      if (isFilterDefined(filter)) {
+        return this.labelValuesQuery(label, filter);
+      } else {
+        // Exclude the filter part of the expression because it is blank or empty
+        return this.labelValuesQuery(label);
+      }
+    }
+
+    const metricNamesQuery = this.query.match(metricNamesRegex);
+    if (metricNamesQuery) {
+      return this.metricNameQuery(metricNamesQuery[1]);
+    }
+
+    const queryResultQuery = this.query.match(queryResultRegex);
+    if (queryResultQuery) {
+      return this.queryResultQuery(queryResultQuery[1]);
+    }
+
+    // if query contains full metric name, return metric name and label list
+    const expressions = ['label_values()', 'metrics()', 'query_result()'];
+    if (!expressions.includes(this.query)) {
+      return this.metricNameAndLabelsQuery(this.query);
+    }
+
+    return Promise.resolve([]);
+  }
+
+  labelValuesQuery(label: string, metric?: string) {
+    const start = getPrometheusTime(this.range.from, false);
+    const end = getPrometheusTime(this.range.to, true);
+    const params = { ...(metric && { 'match[]': metric }), start: start.toString(), end: end.toString() };
+
+    if (!metric || this.datasource.hasLabelsMatchAPISupport()) {
+      const url = `/api/v1/label/${label}/values`;
+
+      return this.datasource.metadataRequest(url, params).then((result: any) => {
+        return _map(result.data.data, (value) => {
+          return { text: value };
+        });
+      });
+    } else {
+      const url = `/api/v1/series`;
+
+      return this.datasource.metadataRequest(url, params).then((result: any) => {
+        const _labels = _map(result.data.data, (metric) => {
+          return metric[label] || '';
+        }).filter((label) => {
+          return label !== '';
+        });
+
+        return uniq(_labels).map((metric) => {
+          return {
+            text: metric,
+            expandable: true,
+          };
+        });
+      });
+    }
+  }
+
+  metricNameQuery(metricFilterPattern: string) {
+    const start = getPrometheusTime(this.range.from, false);
+    const end = getPrometheusTime(this.range.to, true);
+    const params = {
+      start: start.toString(),
+      end: end.toString(),
+    };
+    const url = `/api/v1/label/__name__/values`;
+
+    return this.datasource.metadataRequest(url, params).then((result: any) => {
+      return chain(result.data.data)
+        .filter((metricName) => {
+          const r = new RegExp(metricFilterPattern);
+          return r.test(metricName);
+        })
+        .map((matchedMetricName) => {
+          return {
+            text: matchedMetricName,
+            expandable: true,
+          };
+        })
+        .value();
+    });
+  }
+
+  queryResultQuery(query: string) {
+    const url = '/api/v1/query';
+    const params = {
+      query,
+      time: getPrometheusTime(this.range.to, true).toString(),
+    };
+    return this.datasource.metadataRequest(url, params).then((result: any) => {
+      switch (result.data.data.resultType) {
+        case 'scalar': // [ <unix_time>, "<scalar_value>" ]
+        case 'string': // [ <unix_time>, "<string_value>" ]
+          return [
+            {
+              text: result.data.data.result[1] || '',
+              expandable: false,
+            },
+          ];
+        case 'vector':
+          return _map(result.data.data.result, (metricData) => {
+            let text = metricData.metric.__name__ || '';
+            delete metricData.metric.__name__;
+            text +=
+              '{' +
+              _map(metricData.metric, (v, k) => {
+                return k + '="' + v + '"';
+              }).join(',') +
+              '}';
+            text += ' ' + metricData.value[1] + ' ' + metricData.value[0] * 1000;
+
+            return {
+              text: text,
+              expandable: true,
+            };
+          });
+        default:
+          throw Error(`Unknown/Unhandled result type: [${result.data.data.resultType}]`);
+      }
+    });
+  }
+
+  metricNameAndLabelsQuery(query: string): Promise<MetricFindValue[]> {
+    const start = getPrometheusTime(this.range.from, false);
+    const end = getPrometheusTime(this.range.to, true);
+    const params = {
+      'match[]': query,
+      start: start.toString(),
+      end: end.toString(),
+    };
+
+    const url = `/api/v1/series`;
+    const self = this;
+
+    return this.datasource.metadataRequest(url, params).then((result: any) => {
+      return _map(result.data.data, (metric: { [key: string]: string }) => {
+        return {
+          text: self.datasource.getOriginalMetricName(metric),
+          expandable: true,
+        };
+      });
+    });
+  }
+}
+
+function isFilterDefined(filter: string) {
+  // We consider blank strings or the empty filter {} as an undefined filter
+  return filter && filter.split(' ').join('') !== '{}';
+}
diff --git a/packages/grafana-prometheus/src/migrations/variableMigration.ts b/packages/grafana-prometheus/src/migrations/variableMigration.ts
new file mode 100644
index 0000000000000..302191f98fbe7
--- /dev/null
+++ b/packages/grafana-prometheus/src/migrations/variableMigration.ts
@@ -0,0 +1,137 @@
+import { promQueryModeller } from '../querybuilder/PromQueryModeller';
+import { buildVisualQueryFromString } from '../querybuilder/parsing';
+import { PromVariableQuery, PromVariableQueryType as QueryType } from '../types';
+
+export const PrometheusLabelNamesRegex = /^label_names\(\)\s*$/;
+// Note that this regex is different from the one in metric_find_query.ts because this is used pre-interpolation
+export const PrometheusLabelValuesRegex = /^label_values\((?:(.+),\s*)?([a-zA-Z_$][a-zA-Z0-9_]*)\)\s*$/;
+export const PrometheusMetricNamesRegex = /^metrics\((.+)\)\s*$/;
+export const PrometheusQueryResultRegex = /^query_result\((.+)\)\s*$/;
+export const PrometheusLabelNamesRegexWithMatch = /^label_names\((.+)\)\s*$/;
+
+export function migrateVariableQueryToEditor(rawQuery: string | PromVariableQuery): PromVariableQuery {
+  // If not string, we assume PromVariableQuery
+  if (typeof rawQuery !== 'string') {
+    return rawQuery;
+  }
+
+  const queryBase = {
+    refId: 'PrometheusDatasource-VariableQuery',
+    qryType: QueryType.LabelNames,
+  };
+
+  const labelNamesMatchQuery = rawQuery.match(PrometheusLabelNamesRegexWithMatch);
+
+  if (labelNamesMatchQuery) {
+    return {
+      ...queryBase,
+      qryType: QueryType.LabelNames,
+      match: labelNamesMatchQuery[1],
+    };
+  }
+
+  const labelNames = rawQuery.match(PrometheusLabelNamesRegex);
+  if (labelNames) {
+    return {
+      ...queryBase,
+      qryType: QueryType.LabelNames,
+    };
+  }
+
+  const labelValuesCheck = rawQuery.match(/^label_values\(/);
+  if (labelValuesCheck) {
+    const labelValues = rawQuery.match(PrometheusLabelValuesRegex);
+    const label = labelValues ? labelValues[2] : '';
+    const metric = labelValues ? labelValues[1] : '';
+
+    if (metric) {
+      const visQuery = buildVisualQueryFromString(metric);
+      return {
+        ...queryBase,
+        qryType: QueryType.LabelValues,
+        label,
+        metric: visQuery.query.metric,
+        labelFilters: visQuery.query.labels,
+      };
+    } else {
+      return {
+        ...queryBase,
+        qryType: QueryType.LabelValues,
+        label,
+      };
+    }
+  }
+
+  const metricNamesCheck = rawQuery.match(/^metrics\(/);
+  if (metricNamesCheck) {
+    const metricNames = rawQuery.match(PrometheusMetricNamesRegex);
+    const metric = metricNames ? metricNames[1] : '';
+    return {
+      ...queryBase,
+      qryType: QueryType.MetricNames,
+      metric,
+    };
+  }
+
+  const queryResultCheck = rawQuery.match(/^query_result\(/);
+  if (queryResultCheck) {
+    const queryResult = rawQuery.match(PrometheusQueryResultRegex);
+    const varQuery = queryResult ? queryResult[1] : '';
+    return {
+      ...queryBase,
+      qryType: QueryType.VarQueryResult,
+      varQuery,
+    };
+  }
+
+  // seriesQuery does not have a function and no regex above
+  if (!labelNames && !labelValuesCheck && !metricNamesCheck && !queryResultCheck) {
+    return {
+      ...queryBase,
+      qryType: QueryType.SeriesQuery,
+      seriesQuery: rawQuery,
+    };
+  }
+
+  return queryBase;
+}
+
+// migrate it back to a string with the correct varialbes in place
+export function migrateVariableEditorBackToVariableSupport(QueryVariable: PromVariableQuery): string {
+  switch (QueryVariable.qryType) {
+    case QueryType.LabelNames:
+      if (QueryVariable.match) {
+        return `label_names(${QueryVariable.match})`;
+      }
+      return 'label_names()';
+    case QueryType.LabelValues:
+      if (QueryVariable.metric || (QueryVariable.labelFilters && QueryVariable.labelFilters.length !== 0)) {
+        const visualQueryQuery = {
+          metric: QueryVariable.metric,
+          labels: QueryVariable.labelFilters ?? [],
+          operations: [],
+        };
+
+        const metric = promQueryModeller.renderQuery(visualQueryQuery);
+        return `label_values(${metric},${QueryVariable.label})`;
+      } else {
+        return `label_values(${QueryVariable.label})`;
+      }
+    case QueryType.MetricNames:
+      return `metrics(${QueryVariable.metric})`;
+    case QueryType.VarQueryResult:
+      const varQuery = removeLineBreaks(QueryVariable.varQuery);
+      return `query_result(${varQuery})`;
+    case QueryType.SeriesQuery:
+      return QueryVariable.seriesQuery ?? '';
+    case QueryType.ClassicQuery:
+      return QueryVariable.classicQuery ?? '';
+  }
+
+  return '';
+}
+
+// allow line breaks in query result textarea
+function removeLineBreaks(input?: string) {
+  return input ? input.replace(/[\r\n]+/gm, '') : '';
+}
diff --git a/packages/grafana-prometheus/src/module.test.ts b/packages/grafana-prometheus/src/module.test.ts
new file mode 100644
index 0000000000000..171fd4916374e
--- /dev/null
+++ b/packages/grafana-prometheus/src/module.test.ts
@@ -0,0 +1,7 @@
+import { plugin as PrometheusDatasourcePlugin } from './module';
+
+describe('module', () => {
+  it('should have metrics query field in panels and Explore', () => {
+    expect(PrometheusDatasourcePlugin.components.QueryEditor).toBeDefined();
+  });
+});
diff --git a/packages/grafana-prometheus/src/module.ts b/packages/grafana-prometheus/src/module.ts
new file mode 100644
index 0000000000000..8fdb90c8bd99e
--- /dev/null
+++ b/packages/grafana-prometheus/src/module.ts
@@ -0,0 +1,13 @@
+// DONT NEED THIS BUT MAYBE EXPORT THIS TO CORE PROM
+
+import { DataSourcePlugin } from '@grafana/data';
+
+import { PromCheatSheet } from './components/PromCheatSheet';
+import { PromQueryEditorByApp } from './components/PromQueryEditorByApp';
+import { ConfigEditor } from './configuration/ConfigEditor';
+import { PrometheusDatasource } from './datasource';
+
+export const plugin = new DataSourcePlugin(PrometheusDatasource)
+  .setQueryEditor(PromQueryEditorByApp)
+  .setConfigEditor(ConfigEditor)
+  .setQueryEditorHelp(PromCheatSheet);
diff --git a/packages/grafana-prometheus/src/promql.test.ts b/packages/grafana-prometheus/src/promql.test.ts
new file mode 100644
index 0000000000000..ff78a805ef2f0
--- /dev/null
+++ b/packages/grafana-prometheus/src/promql.test.ts
@@ -0,0 +1,23 @@
+import Prism from 'prismjs';
+
+import promql from './promql';
+
+describe('Loki syntax', () => {
+  it('should highlight Loki query correctly', () => {
+    expect(Prism.highlight('{key="val#ue"}', promql, 'promql')).toBe(
+      '<span class="token context-labels"><span class="token punctuation">{</span><span class="token label-key attr-name">key</span>=<span class="token label-value attr-value">"val#ue"</span></span><span class="token punctuation">}</span>'
+    );
+    expect(Prism.highlight('{key="#value"}', promql, 'promql')).toBe(
+      '<span class="token context-labels"><span class="token punctuation">{</span><span class="token label-key attr-name">key</span>=<span class="token label-value attr-value">"#value"</span></span><span class="token punctuation">}</span>'
+    );
+    expect(Prism.highlight('{key="value#"}', promql, 'promql')).toBe(
+      '<span class="token context-labels"><span class="token punctuation">{</span><span class="token label-key attr-name">key</span>=<span class="token label-value attr-value">"value#"</span></span><span class="token punctuation">}</span>'
+    );
+    expect(Prism.highlight('#test{key="value"}', promql, 'promql')).toBe(
+      '<span class="token comment">#test{key="value"}</span>'
+    );
+    expect(Prism.highlight('{key="value"}#test', promql, 'promql')).toBe(
+      '<span class="token context-labels"><span class="token punctuation">{</span><span class="token label-key attr-name">key</span>=<span class="token label-value attr-value">"value"</span></span><span class="token punctuation">}</span><span class="token comment">#test</span>'
+    );
+  });
+});
diff --git a/packages/grafana-prometheus/src/promql.ts b/packages/grafana-prometheus/src/promql.ts
new file mode 100644
index 0000000000000..c37f52796bafe
--- /dev/null
+++ b/packages/grafana-prometheus/src/promql.ts
@@ -0,0 +1,607 @@
+import { Grammar } from 'prismjs';
+
+import { CompletionItem } from '@grafana/ui';
+
+// When changing RATE_RANGES, check if Loki/LogQL ranges should be changed too
+// @see public/app/plugins/datasource/loki/LanguageProvider.ts
+export const RATE_RANGES: CompletionItem[] = [
+  { label: '$__interval', sortValue: '$__interval' },
+  { label: '$__rate_interval', sortValue: '$__rate_interval' },
+  { label: '$__range', sortValue: '$__range' },
+  { label: '1m', sortValue: '00:01:00' },
+  { label: '5m', sortValue: '00:05:00' },
+  { label: '10m', sortValue: '00:10:00' },
+  { label: '30m', sortValue: '00:30:00' },
+  { label: '1h', sortValue: '01:00:00' },
+  { label: '1d', sortValue: '24:00:00' },
+];
+
+export const OPERATORS = ['by', 'group_left', 'group_right', 'ignoring', 'on', 'offset', 'without'];
+export const LOGICAL_OPERATORS = ['or', 'and', 'unless'];
+
+const TRIGONOMETRIC_FUNCTIONS: CompletionItem[] = [
+  {
+    label: 'acos',
+    insertText: 'acos',
+    detail: 'acos(v instant-vector)',
+    documentation: 'calculates the arccosine of all elements in v',
+  },
+  {
+    label: 'acosh',
+    insertText: 'acosh',
+    detail: 'acosh(v instant-vector)',
+    documentation: 'calculates the inverse hyperbolic cosine of all elements in v',
+  },
+  {
+    label: 'asin',
+    insertText: 'asin',
+    detail: 'asin(v instant-vector)',
+    documentation: 'calculates the arcsine of all elements in v',
+  },
+  {
+    label: 'asinh',
+    insertText: 'asinh',
+    detail: 'asinh(v instant-vector)',
+    documentation: 'calculates the inverse hyperbolic sine of all elements in v',
+  },
+  {
+    label: 'atan',
+    insertText: 'atan',
+    detail: 'atan(v instant-vector)',
+    documentation: 'calculates the arctangent of all elements in v',
+  },
+  {
+    label: 'atanh',
+    insertText: 'atanh',
+    detail: 'atanh(v instant-vector)',
+    documentation: 'calculates the inverse hyperbolic tangent of all elements in v',
+  },
+  {
+    label: 'cos',
+    insertText: 'cos',
+    detail: 'cos(v instant-vector)',
+    documentation: 'calculates the cosine of all elements in v',
+  },
+  {
+    label: 'cosh',
+    insertText: 'cosh',
+    detail: 'cosh(v instant-vector)',
+    documentation: 'calculates the hyperbolic cosine of all elements in v',
+  },
+  {
+    label: 'sin',
+    insertText: 'sin',
+    detail: 'sin(v instant-vector)',
+    documentation: 'calculates the sine of all elements in v',
+  },
+  {
+    label: 'sinh',
+    insertText: 'sinh',
+    detail: 'sinh(v instant-vector)',
+    documentation: 'calculates the hyperbolic sine of all elements in v',
+  },
+  {
+    label: 'tan',
+    insertText: 'tan',
+    detail: 'tan(v instant-vector)',
+    documentation: 'calculates the tangent of all elements in v',
+  },
+  {
+    label: 'tanh',
+    insertText: 'tanh',
+    detail: 'tanh(v instant-vector)',
+    documentation: 'calculates the hyperbolic tangent of all elements in v',
+  },
+];
+
+const AGGREGATION_OPERATORS: CompletionItem[] = [
+  {
+    label: 'sum',
+    insertText: 'sum',
+    documentation: 'Calculate sum over dimensions',
+  },
+  {
+    label: 'min',
+    insertText: 'min',
+    documentation: 'Select minimum over dimensions',
+  },
+  {
+    label: 'max',
+    insertText: 'max',
+    documentation: 'Select maximum over dimensions',
+  },
+  {
+    label: 'avg',
+    insertText: 'avg',
+    documentation: 'Calculate the average over dimensions',
+  },
+  {
+    label: 'group',
+    insertText: 'group',
+    documentation: 'All values in the resulting vector are 1',
+  },
+  {
+    label: 'stddev',
+    insertText: 'stddev',
+    documentation: 'Calculate population standard deviation over dimensions',
+  },
+  {
+    label: 'stdvar',
+    insertText: 'stdvar',
+    documentation: 'Calculate population standard variance over dimensions',
+  },
+  {
+    label: 'count',
+    insertText: 'count',
+    documentation: 'Count number of elements in the vector',
+  },
+  {
+    label: 'count_values',
+    insertText: 'count_values',
+    documentation: 'Count number of elements with the same value',
+  },
+  {
+    label: 'bottomk',
+    insertText: 'bottomk',
+    documentation: 'Smallest k elements by sample value',
+  },
+  {
+    label: 'topk',
+    insertText: 'topk',
+    documentation: 'Largest k elements by sample value',
+  },
+  {
+    label: 'quantile',
+    insertText: 'quantile',
+    documentation: 'Calculate φ-quantile (0 ≤ φ ≤ 1) over dimensions',
+  },
+];
+
+export const FUNCTIONS = [
+  ...AGGREGATION_OPERATORS,
+  ...TRIGONOMETRIC_FUNCTIONS,
+  {
+    insertText: 'abs',
+    label: 'abs',
+    detail: 'abs(v instant-vector)',
+    documentation: 'Returns the input vector with all sample values converted to their absolute value.',
+  },
+  {
+    insertText: 'absent',
+    label: 'absent',
+    detail: 'absent(v instant-vector)',
+    documentation:
+      'Returns an empty vector if the vector passed to it has any elements and a 1-element vector with the value 1 if the vector passed to it has no elements. This is useful for alerting on when no time series exist for a given metric name and label combination.',
+  },
+  {
+    insertText: 'absent_over_time',
+    label: 'absent_over_time',
+    detail: 'absent(v range-vector)',
+    documentation:
+      'Returns an empty vector if the range vector passed to it has any elements and a 1-element vector with the value 1 if the range vector passed to it has no elements.',
+  },
+  {
+    insertText: 'ceil',
+    label: 'ceil',
+    detail: 'ceil(v instant-vector)',
+    documentation: 'Rounds the sample values of all elements in `v` up to the nearest integer.',
+  },
+  {
+    insertText: 'changes',
+    label: 'changes',
+    detail: 'changes(v range-vector)',
+    documentation:
+      'For each input time series, `changes(v range-vector)` returns the number of times its value has changed within the provided time range as an instant vector.',
+  },
+  {
+    insertText: 'clamp',
+    label: 'clamp',
+    detail: 'clamp(v instant-vector, min scalar, max scalar)',
+    documentation:
+      'Clamps the sample values of all elements in `v` to have a lower limit of `min` and an upper limit of `max`.',
+  },
+  {
+    insertText: 'clamp_max',
+    label: 'clamp_max',
+    detail: 'clamp_max(v instant-vector, max scalar)',
+    documentation: 'Clamps the sample values of all elements in `v` to have an upper limit of `max`.',
+  },
+  {
+    insertText: 'clamp_min',
+    label: 'clamp_min',
+    detail: 'clamp_min(v instant-vector, min scalar)',
+    documentation: 'Clamps the sample values of all elements in `v` to have a lower limit of `min`.',
+  },
+  {
+    insertText: 'count_scalar',
+    label: 'count_scalar',
+    detail: 'count_scalar(v instant-vector)',
+    documentation:
+      'Returns the number of elements in a time series vector as a scalar. This is in contrast to the `count()` aggregation operator, which always returns a vector (an empty one if the input vector is empty) and allows grouping by labels via a `by` clause.',
+  },
+  {
+    insertText: 'deg',
+    label: 'deg',
+    detail: 'deg(v instant-vector)',
+    documentation: 'Converts radians to degrees for all elements in v',
+  },
+  {
+    insertText: 'day_of_month',
+    label: 'day_of_month',
+    detail: 'day_of_month(v=vector(time()) instant-vector)',
+    documentation: 'Returns the day of the month for each of the given times in UTC. Returned values are from 1 to 31.',
+  },
+  {
+    insertText: 'day_of_week',
+    label: 'day_of_week',
+    detail: 'day_of_week(v=vector(time()) instant-vector)',
+    documentation:
+      'Returns the day of the week for each of the given times in UTC. Returned values are from 0 to 6, where 0 means Sunday etc.',
+  },
+  {
+    insertText: 'day_of_year',
+    label: 'day_of_year',
+    detail: 'day_of_year(v=vector(time()) instant-vector)',
+    documentation:
+      'Returns the day of the year for each of the given times in UTC. Returned values are from 1 to 365 for non-leap years, and 1 to 366 in leap years.',
+  },
+  {
+    insertText: 'days_in_month',
+    label: 'days_in_month',
+    detail: 'days_in_month(v=vector(time()) instant-vector)',
+    documentation:
+      'Returns number of days in the month for each of the given times in UTC. Returned values are from 28 to 31.',
+  },
+  {
+    insertText: 'delta',
+    label: 'delta',
+    detail: 'delta(v range-vector)',
+    documentation:
+      'Calculates the difference between the first and last value of each time series element in a range vector `v`, returning an instant vector with the given deltas and equivalent labels. The delta is extrapolated to cover the full time range as specified in the range vector selector, so that it is possible to get a non-integer result even if the sample values are all integers.',
+  },
+  {
+    insertText: 'deriv',
+    label: 'deriv',
+    detail: 'deriv(v range-vector)',
+    documentation:
+      'Calculates the per-second derivative of the time series in a range vector `v`, using simple linear regression.',
+  },
+  {
+    insertText: 'drop_common_labels',
+    label: 'drop_common_labels',
+    detail: 'drop_common_labels(instant-vector)',
+    documentation: 'Drops all labels that have the same name and value across all series in the input vector.',
+  },
+  {
+    insertText: 'exp',
+    label: 'exp',
+    detail: 'exp(v instant-vector)',
+    documentation:
+      'Calculates the exponential function for all elements in `v`.\nSpecial cases are:\n* `Exp(+Inf) = +Inf` \n* `Exp(NaN) = NaN`',
+  },
+  {
+    insertText: 'floor',
+    label: 'floor',
+    detail: 'floor(v instant-vector)',
+    documentation: 'Rounds the sample values of all elements in `v` down to the nearest integer.',
+  },
+  {
+    insertText: 'histogram_quantile',
+    label: 'histogram_quantile',
+    detail: 'histogram_quantile(φ float, b instant-vector)',
+    documentation:
+      'Calculates the φ-quantile (0 ≤ φ ≤ 1) from the buckets `b` of a histogram. The samples in `b` are the counts of observations in each bucket. Each sample must have a label `le` where the label value denotes the inclusive upper bound of the bucket. (Samples without such a label are silently ignored.) The histogram metric type automatically provides time series with the `_bucket` suffix and the appropriate labels.',
+  },
+  {
+    insertText: 'holt_winters',
+    label: 'holt_winters',
+    detail: 'holt_winters(v range-vector, sf scalar, tf scalar)',
+    documentation:
+      'Produces a smoothed value for time series based on the range in `v`. The lower the smoothing factor `sf`, the more importance is given to old data. The higher the trend factor `tf`, the more trends in the data is considered. Both `sf` and `tf` must be between 0 and 1.',
+  },
+  {
+    insertText: 'hour',
+    label: 'hour',
+    detail: 'hour(v=vector(time()) instant-vector)',
+    documentation: 'Returns the hour of the day for each of the given times in UTC. Returned values are from 0 to 23.',
+  },
+  {
+    insertText: 'idelta',
+    label: 'idelta',
+    detail: 'idelta(v range-vector)',
+    documentation:
+      'Calculates the difference between the last two samples in the range vector `v`, returning an instant vector with the given deltas and equivalent labels.',
+  },
+  {
+    insertText: 'increase',
+    label: 'increase',
+    detail: 'increase(v range-vector)',
+    documentation:
+      'Calculates the increase in the time series in the range vector. Breaks in monotonicity (such as counter resets due to target restarts) are automatically adjusted for. The increase is extrapolated to cover the full time range as specified in the range vector selector, so that it is possible to get a non-integer result even if a counter increases only by integer increments.',
+  },
+  {
+    insertText: 'irate',
+    label: 'irate',
+    detail: 'irate(v range-vector)',
+    documentation:
+      'Calculates the per-second instant rate of increase of the time series in the range vector. This is based on the last two data points. Breaks in monotonicity (such as counter resets due to target restarts) are automatically adjusted for.',
+  },
+  {
+    insertText: 'label_join',
+    label: 'label_join',
+    detail:
+      'label_join(v instant-vector, dst_label string, separator string, src_label_1 string, src_label_2 string, ...)',
+    documentation:
+      'For each timeseries in `v`, joins all the values of all the `src_labels` using `separator` and returns the timeseries with the label `dst_label` containing the joined value. There can be any number of `src_labels` in this function.',
+  },
+  {
+    insertText: 'label_replace',
+    label: 'label_replace',
+    detail: 'label_replace(v instant-vector, dst_label string, replacement string, src_label string, regex string)',
+    documentation:
+      "For each timeseries in `v`, `label_replace(v instant-vector, dst_label string, replacement string, src_label string, regex string)`  matches the regular expression `regex` against the label `src_label`.  If it matches, then the timeseries is returned with the label `dst_label` replaced by the expansion of `replacement`. `$1` is replaced with the first matching subgroup, `$2` with the second etc. If the regular expression doesn't match then the timeseries is returned unchanged.",
+  },
+  {
+    insertText: 'ln',
+    label: 'ln',
+    detail: 'ln(v instant-vector)',
+    documentation:
+      'Calculates the natural logarithm for all elements in `v`.\nSpecial cases are:\n * `ln(+Inf) = +Inf`\n * `ln(0) = -Inf`\n * `ln(x < 0) = NaN`\n * `ln(NaN) = NaN`',
+  },
+  {
+    insertText: 'log2',
+    label: 'log2',
+    detail: 'log2(v instant-vector)',
+    documentation:
+      'Calculates the binary logarithm for all elements in `v`. The special cases are equivalent to those in `ln`.',
+  },
+  {
+    insertText: 'log10',
+    label: 'log10',
+    detail: 'log10(v instant-vector)',
+    documentation:
+      'Calculates the decimal logarithm for all elements in `v`. The special cases are equivalent to those in `ln`.',
+  },
+  {
+    insertText: 'minute',
+    label: 'minute',
+    detail: 'minute(v=vector(time()) instant-vector)',
+    documentation:
+      'Returns the minute of the hour for each of the given times in UTC. Returned values are from 0 to 59.',
+  },
+  {
+    insertText: 'month',
+    label: 'month',
+    detail: 'month(v=vector(time()) instant-vector)',
+    documentation:
+      'Returns the month of the year for each of the given times in UTC. Returned values are from 1 to 12, where 1 means January etc.',
+  },
+  {
+    insertText: 'pi',
+    label: 'pi',
+    detail: 'pi()',
+    documentation: 'Returns pi',
+  },
+  {
+    insertText: 'predict_linear',
+    label: 'predict_linear',
+    detail: 'predict_linear(v range-vector, t scalar)',
+    documentation:
+      'Predicts the value of time series `t` seconds from now, based on the range vector `v`, using simple linear regression.',
+  },
+  {
+    insertText: 'rad',
+    label: 'rad',
+    detail: 'rad(v instant-vector)',
+    documentation: 'Converts degrees to radians for all elements in v',
+  },
+  {
+    insertText: 'rate',
+    label: 'rate',
+    detail: 'rate(v range-vector)',
+    documentation:
+      "Calculates the per-second average rate of increase of the time series in the range vector. Breaks in monotonicity (such as counter resets due to target restarts) are automatically adjusted for. Also, the calculation extrapolates to the ends of the time range, allowing for missed scrapes or imperfect alignment of scrape cycles with the range's time period.",
+  },
+  {
+    insertText: 'resets',
+    label: 'resets',
+    detail: 'resets(v range-vector)',
+    documentation:
+      'For each input time series, `resets(v range-vector)` returns the number of counter resets within the provided time range as an instant vector. Any decrease in the value between two consecutive samples is interpreted as a counter reset.',
+  },
+  {
+    insertText: 'round',
+    label: 'round',
+    detail: 'round(v instant-vector, to_nearest=1 scalar)',
+    documentation:
+      'Rounds the sample values of all elements in `v` to the nearest integer. Ties are resolved by rounding up. The optional `to_nearest` argument allows specifying the nearest multiple to which the sample values should be rounded. This multiple may also be a fraction.',
+  },
+  {
+    insertText: 'scalar',
+    label: 'scalar',
+    detail: 'scalar(v instant-vector)',
+    documentation:
+      'Given a single-element input vector, `scalar(v instant-vector)` returns the sample value of that single element as a scalar. If the input vector does not have exactly one element, `scalar` will return `NaN`.',
+  },
+  {
+    insertText: 'sgn',
+    label: 'sgn',
+    detail: 'sgn(v instant-vector)',
+    documentation:
+      'Returns a vector with all sample values converted to their sign, defined as this: 1 if v is positive, -1 if v is negative and 0 if v is equal to zero.',
+  },
+  {
+    insertText: 'sort',
+    label: 'sort',
+    detail: 'sort(v instant-vector)',
+    documentation: 'Returns vector elements sorted by their sample values, in ascending order.',
+  },
+  {
+    insertText: 'sort_desc',
+    label: 'sort_desc',
+    detail: 'sort_desc(v instant-vector)',
+    documentation: 'Returns vector elements sorted by their sample values, in descending order.',
+  },
+  {
+    insertText: 'sqrt',
+    label: 'sqrt',
+    detail: 'sqrt(v instant-vector)',
+    documentation: 'Calculates the square root of all elements in `v`.',
+  },
+  {
+    insertText: 'time',
+    label: 'time',
+    detail: 'time()',
+    documentation:
+      'Returns the number of seconds since January 1, 1970 UTC. Note that this does not actually return the current time, but the time at which the expression is to be evaluated.',
+  },
+  {
+    insertText: 'timestamp',
+    label: 'timestamp',
+    detail: 'timestamp(v instant-vector)',
+    documentation:
+      'Returns the timestamp of each of the samples of the given vector as the number of seconds since January 1, 1970 UTC.',
+  },
+  {
+    insertText: 'vector',
+    label: 'vector',
+    detail: 'vector(s scalar)',
+    documentation: 'Returns the scalar `s` as a vector with no labels.',
+  },
+  {
+    insertText: 'year',
+    label: 'year',
+    detail: 'year(v=vector(time()) instant-vector)',
+    documentation: 'Returns the year for each of the given times in UTC.',
+  },
+  {
+    insertText: 'avg_over_time',
+    label: 'avg_over_time',
+    detail: 'avg_over_time(range-vector)',
+    documentation: 'The average value of all points in the specified interval.',
+  },
+  {
+    insertText: 'min_over_time',
+    label: 'min_over_time',
+    detail: 'min_over_time(range-vector)',
+    documentation: 'The minimum value of all points in the specified interval.',
+  },
+  {
+    insertText: 'max_over_time',
+    label: 'max_over_time',
+    detail: 'max_over_time(range-vector)',
+    documentation: 'The maximum value of all points in the specified interval.',
+  },
+  {
+    insertText: 'sum_over_time',
+    label: 'sum_over_time',
+    detail: 'sum_over_time(range-vector)',
+    documentation: 'The sum of all values in the specified interval.',
+  },
+  {
+    insertText: 'count_over_time',
+    label: 'count_over_time',
+    detail: 'count_over_time(range-vector)',
+    documentation: 'The count of all values in the specified interval.',
+  },
+  {
+    insertText: 'quantile_over_time',
+    label: 'quantile_over_time',
+    detail: 'quantile_over_time(scalar, range-vector)',
+    documentation: 'The φ-quantile (0 ≤ φ ≤ 1) of the values in the specified interval.',
+  },
+  {
+    insertText: 'stddev_over_time',
+    label: 'stddev_over_time',
+    detail: 'stddev_over_time(range-vector)',
+    documentation: 'The population standard deviation of the values in the specified interval.',
+  },
+  {
+    insertText: 'stdvar_over_time',
+    label: 'stdvar_over_time',
+    detail: 'stdvar_over_time(range-vector)',
+    documentation: 'The population standard variance of the values in the specified interval.',
+  },
+  {
+    insertText: 'last_over_time',
+    label: 'last_over_time',
+    detail: 'last_over_time(range-vector)',
+    documentation: 'The most recent point value in specified interval.',
+  },
+  {
+    insertText: 'present_over_time',
+    label: 'present_over_time',
+    detail: 'present_over_time(range-vector)',
+    documentation: 'The value 1 for any series in the specified interval.',
+  },
+];
+
+export const PROM_KEYWORDS = FUNCTIONS.map((keyword) => keyword.label);
+
+export const promqlGrammar: Grammar = {
+  comment: {
+    pattern: /#.*/,
+  },
+  'context-aggregation': {
+    pattern: /((by|without)\s*)\([^)]*\)/, // by ()
+    lookbehind: true,
+    inside: {
+      'label-key': {
+        pattern: /[^(),\s][^,)]*[^),\s]*/,
+        alias: 'attr-name',
+      },
+      punctuation: /[()]/,
+    },
+  },
+  'context-labels': {
+    pattern: /\{[^}]*(?=}?)/,
+    greedy: true,
+    inside: {
+      comment: {
+        pattern: /#.*/,
+      },
+      'label-key': {
+        pattern: /[a-z_]\w*(?=\s*(=|!=|=~|!~))/,
+        alias: 'attr-name',
+        greedy: true,
+      },
+      'label-value': {
+        pattern: /"(?:\\.|[^\\"])*"/,
+        greedy: true,
+        alias: 'attr-value',
+      },
+      punctuation: /[{]/,
+    },
+  },
+  function: new RegExp(`\\b(?:${FUNCTIONS.map((f) => f.label).join('|')})(?=\\s*\\()`, 'i'),
+  'context-range': [
+    {
+      pattern: /\[[^\]]*(?=])/, // [1m]
+      inside: {
+        'range-duration': {
+          pattern: /\b\d+[smhdwy]\b/i,
+          alias: 'number',
+        },
+      },
+    },
+    {
+      pattern: /(offset\s+)\w+/, // offset 1m
+      lookbehind: true,
+      inside: {
+        'range-duration': {
+          pattern: /\b\d+[smhdwy]\b/i,
+          alias: 'number',
+        },
+      },
+    },
+  ],
+  idList: {
+    pattern: /\d+(\|\d+)+/,
+    alias: 'number',
+  },
+  number: /\b-?\d+((\.\d*)?([eE][+-]?\d+)?)?\b/,
+  operator: new RegExp(`/[-+*/=%^~]|&&?|\\|?\\||!=?|<(?:=>?|<|>)?|>[>=]?|\\b(?:${OPERATORS.join('|')})\\b`, 'i'),
+  punctuation: /[{};()`,.]/,
+};
+
+export default promqlGrammar;
diff --git a/packages/grafana-prometheus/src/query_hints.test.ts b/packages/grafana-prometheus/src/query_hints.test.ts
new file mode 100644
index 0000000000000..7089ea3e2e146
--- /dev/null
+++ b/packages/grafana-prometheus/src/query_hints.test.ts
@@ -0,0 +1,192 @@
+import { PrometheusDatasource } from './datasource';
+import { getQueryHints, SUM_HINT_THRESHOLD_COUNT } from './query_hints';
+
+describe('getQueryHints()', () => {
+  it('returns no hints for no series', () => {
+    expect(getQueryHints('', [])).toEqual([]);
+  });
+
+  it('returns no hints for empty series', () => {
+    expect(getQueryHints('', [{ datapoints: [] }])).toEqual([]);
+  });
+
+  it('returns a rate hint for a counter metric', () => {
+    const series = [
+      {
+        datapoints: [
+          [23, 1000],
+          [24, 1001],
+        ],
+      },
+    ];
+    const hints = getQueryHints('metric_total', series);
+
+    expect(hints!.length).toBe(1);
+    expect(hints![0]).toMatchObject({
+      label: 'Selected metric looks like a counter.',
+      fix: {
+        action: {
+          type: 'ADD_RATE',
+          query: 'metric_total',
+        },
+      },
+    });
+  });
+
+  it('returns a certain rate hint for a counter metric', () => {
+    const series = [
+      {
+        datapoints: [
+          [23, 1000],
+          [24, 1001],
+        ],
+      },
+    ];
+    const mock: unknown = { languageProvider: { metricsMetadata: { foo: { type: 'counter' } } } };
+    const datasource = mock as PrometheusDatasource;
+
+    let hints = getQueryHints('foo', series, datasource);
+    expect(hints!.length).toBe(1);
+    expect(hints![0]).toMatchObject({
+      label: 'Selected metric is a counter.',
+      fix: {
+        action: {
+          type: 'ADD_RATE',
+          query: 'foo',
+        },
+      },
+    });
+
+    // Test substring match not triggering hint
+    hints = getQueryHints('foo_foo', series, datasource);
+    expect(hints).toEqual([]);
+  });
+
+  it('returns no rate hint for a counter metric that already has a rate', () => {
+    const series = [
+      {
+        datapoints: [
+          [23, 1000],
+          [24, 1001],
+        ],
+      },
+    ];
+    const hints = getQueryHints('rate(metric_total[1m])', series);
+    expect(hints).toEqual([]);
+  });
+
+  it('returns no rate hint for a counter metric that already has an increase', () => {
+    const series = [
+      {
+        datapoints: [
+          [23, 1000],
+          [24, 1001],
+        ],
+      },
+    ];
+    const hints = getQueryHints('increase(metric_total[1m])', series);
+    expect(hints).toEqual([]);
+  });
+
+  it('returns a rate hint with action for a counter metric with labels', () => {
+    const series = [
+      {
+        datapoints: [
+          [23, 1000],
+          [24, 1001],
+        ],
+      },
+    ];
+    const hints = getQueryHints('metric_total{job="grafana"}', series);
+    expect(hints!.length).toBe(1);
+    expect(hints![0].label).toContain('Selected metric looks like a counter');
+    expect(hints![0].fix).toBeDefined();
+  });
+
+  it('returns a rate hint w/o action for a complex counter metric', () => {
+    const series = [
+      {
+        datapoints: [
+          [23, 1000],
+          [24, 1001],
+        ],
+      },
+    ];
+    const hints = getQueryHints('sum(metric_total)', series);
+    expect(hints!.length).toBe(1);
+    expect(hints![0].label).toContain('rate()');
+    expect(hints![0].fix).toBeUndefined();
+  });
+
+  it('returns a histogram hint for a bucket series', () => {
+    const series = [{ datapoints: [[23, 1000]] }];
+    const hints = getQueryHints('metric_bucket', series);
+    expect(hints!.length).toBe(1);
+    expect(hints![0]).toMatchObject({
+      label: 'Selected metric has buckets.',
+      fix: {
+        action: {
+          type: 'ADD_HISTOGRAM_QUANTILE',
+          query: 'metric_bucket',
+        },
+      },
+    });
+  });
+
+  it('returns a histogram hint with action for a bucket with labels', () => {
+    const series = [
+      {
+        datapoints: [
+          [23, 1000],
+          [24, 1001],
+        ],
+      },
+    ];
+    const hints = getQueryHints('metric_bucket{job="grafana"}', series);
+    expect(hints!.length).toBe(1);
+    expect(hints![0].label).toContain('Selected metric has buckets.');
+    expect(hints![0].fix).toBeDefined();
+  });
+
+  it('returns a sum hint when many time series results are returned for a simple metric', () => {
+    const seriesCount = SUM_HINT_THRESHOLD_COUNT;
+    const series = Array.from({ length: seriesCount }, (_) => ({
+      datapoints: [
+        [0, 0],
+        [0, 0],
+      ],
+    }));
+    const hints = getQueryHints('metric', series);
+    expect(hints!.length).toBe(1);
+    expect(hints![0]).toMatchObject({
+      type: 'ADD_SUM',
+      label: 'Many time series results returned.',
+      fix: {
+        label: 'Consider aggregating with sum().',
+        action: {
+          type: 'ADD_SUM',
+          query: 'metric',
+          preventSubmit: true,
+        },
+      },
+    });
+  });
+
+  it('should not return rate hint for a recorded query', () => {
+    const seriesCount = SUM_HINT_THRESHOLD_COUNT;
+    const series = Array.from({ length: seriesCount }, (_) => ({
+      datapoints: [
+        [0, 0],
+        [0, 0],
+      ],
+    }));
+    let hints = getQueryHints('node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate', series);
+    expect(hints!.length).toBe(0);
+
+    hints = getQueryHints('node_namespace_pod_container:container_cpu_usage_seconds_total', series);
+    expect(hints!.length).toBe(0);
+
+    hints = getQueryHints('container_cpu_usage_seconds_total:irate_total', series);
+    expect(hints!.length).toBe(0);
+  });
+});
diff --git a/packages/grafana-prometheus/src/query_hints.ts b/packages/grafana-prometheus/src/query_hints.ts
new file mode 100644
index 0000000000000..8033048bb3e87
--- /dev/null
+++ b/packages/grafana-prometheus/src/query_hints.ts
@@ -0,0 +1,151 @@
+import { size } from 'lodash';
+
+import { QueryFix, QueryHint } from '@grafana/data';
+
+import { PrometheusDatasource } from './datasource';
+
+/**
+ * Number of time series results needed before starting to suggest sum aggregation hints
+ */
+export const SUM_HINT_THRESHOLD_COUNT = 20;
+
+export function getQueryHints(query: string, series?: any[], datasource?: PrometheusDatasource): QueryHint[] {
+  const hints = [];
+
+  // ..._bucket metric needs a histogram_quantile()
+  const histogramMetric = query.trim().match(/^\w+_bucket$|^\w+_bucket{.*}$/);
+  if (histogramMetric) {
+    const label = 'Selected metric has buckets.';
+    hints.push({
+      type: 'HISTOGRAM_QUANTILE',
+      label,
+      fix: {
+        label: 'Consider calculating aggregated quantile by adding histogram_quantile().',
+        action: {
+          type: 'ADD_HISTOGRAM_QUANTILE',
+          query,
+        },
+      },
+    });
+  }
+
+  // Check for need of rate()
+  if (query.indexOf('rate(') === -1 && query.indexOf('increase(') === -1) {
+    // Use metric metadata for exact types
+    const nameMatch = query.match(/\b((?<!:)\w+_(total|sum|count)(?!:))\b/);
+    let counterNameMetric = nameMatch ? nameMatch[1] : '';
+    const metricsMetadata = datasource?.languageProvider?.metricsMetadata;
+    let certain = false;
+
+    if (metricsMetadata) {
+      // Tokenize the query into its identifiers (see https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels)
+      const queryTokens = Array.from(query.matchAll(/\$?[a-zA-Z_:][a-zA-Z0-9_:]*/g))
+        .map(([match]) => match)
+        // Exclude variable identifiers
+        .filter((token) => !token.startsWith('$'))
+        // Split composite keys to match the tokens returned by the language provider
+        .flatMap((token) => token.split(':'));
+      // Determine whether any of the query identifier tokens refers to a counter metric
+      counterNameMetric =
+        queryTokens.find((metricName) => {
+          // Only considering first type information, could be non-deterministic
+          const metadata = metricsMetadata[metricName];
+          if (metadata && metadata.type.toLowerCase() === 'counter') {
+            certain = true;
+            return true;
+          } else {
+            return false;
+          }
+        }) ?? '';
+    }
+
+    if (counterNameMetric) {
+      // FixableQuery consists of metric name and optionally label-value pairs. We are not offering fix for complex queries yet.
+      const fixableQuery = query.trim().match(/^\w+$|^\w+{.*}$/);
+      const verb = certain ? 'is' : 'looks like';
+      let label = `Selected metric ${verb} a counter.`;
+      let fix: QueryFix | undefined;
+
+      if (fixableQuery) {
+        fix = {
+          label: 'Consider calculating rate of counter by adding rate().',
+          action: {
+            type: 'ADD_RATE',
+            query,
+          },
+        };
+      } else {
+        label = `${label} Consider calculating rate of counter by adding rate().`;
+      }
+
+      hints.push({
+        type: 'APPLY_RATE',
+        label,
+        fix,
+      });
+    }
+  }
+
+  // Check for recording rules expansion
+  if (datasource && datasource.ruleMappings) {
+    const mapping = datasource.ruleMappings;
+    const mappingForQuery = Object.keys(mapping).reduce((acc, ruleName) => {
+      if (query.search(ruleName) > -1) {
+        return {
+          ...acc,
+          [ruleName]: mapping[ruleName],
+        };
+      }
+      return acc;
+    }, {});
+    if (size(mappingForQuery) > 0) {
+      const label = 'Query contains recording rules.';
+      hints.push({
+        type: 'EXPAND_RULES',
+        label,
+        fix: {
+          label: 'Expand rules',
+          action: {
+            type: 'EXPAND_RULES',
+            query,
+            options: mappingForQuery,
+          },
+        },
+      });
+    }
+  }
+
+  if (series && series.length >= SUM_HINT_THRESHOLD_COUNT) {
+    const simpleMetric = query.trim().match(/^\w+$/);
+    if (simpleMetric) {
+      hints.push({
+        type: 'ADD_SUM',
+        label: 'Many time series results returned.',
+        fix: {
+          label: 'Consider aggregating with sum().',
+          action: {
+            type: 'ADD_SUM',
+            query: query,
+            preventSubmit: true,
+          },
+        },
+      });
+    }
+  }
+
+  return hints;
+}
+
+export function getInitHints(datasource: PrometheusDatasource): QueryHint[] {
+  const hints = [];
+
+  // Hint for big disabled lookups
+  if (datasource.lookupsDisabled) {
+    hints.push({
+      label: `Labels and metrics lookup was disabled in data source settings.`,
+      type: 'INFO',
+    });
+  }
+
+  return hints;
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/PromQueryModeller.test.ts b/packages/grafana-prometheus/src/querybuilder/PromQueryModeller.test.ts
new file mode 100644
index 0000000000000..f81ab15cbc9d9
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/PromQueryModeller.test.ts
@@ -0,0 +1,335 @@
+import { PromQueryModeller } from './PromQueryModeller';
+import { PromOperationId } from './types';
+
+describe('PromQueryModeller', () => {
+  const modeller = new PromQueryModeller();
+
+  it('Can render query with metric only', () => {
+    expect(
+      modeller.renderQuery({
+        metric: 'my_totals',
+        labels: [],
+        operations: [],
+      })
+    ).toBe('my_totals');
+  });
+
+  it('Can render query with label filters', () => {
+    expect(
+      modeller.renderQuery({
+        metric: 'my_totals',
+        labels: [
+          { label: 'cluster', op: '=', value: 'us-east' },
+          { label: 'job', op: '=~', value: 'abc' },
+        ],
+        operations: [],
+      })
+    ).toBe('my_totals{cluster="us-east", job=~"abc"}');
+  });
+
+  it('Can render query with function', () => {
+    expect(
+      modeller.renderQuery({
+        metric: 'my_totals',
+        labels: [],
+        operations: [{ id: 'sum', params: [] }],
+      })
+    ).toBe('sum(my_totals)');
+  });
+
+  it('Can render query with function with parameter to left of inner expression', () => {
+    expect(
+      modeller.renderQuery({
+        metric: 'metric',
+        labels: [],
+        operations: [{ id: PromOperationId.HistogramQuantile, params: [0.86] }],
+      })
+    ).toBe('histogram_quantile(0.86, metric)');
+  });
+
+  it('Can render query with function with function parameters to the right of inner expression', () => {
+    expect(
+      modeller.renderQuery({
+        metric: 'metric',
+        labels: [],
+        operations: [{ id: PromOperationId.LabelReplace, params: ['server', '$1', 'instance', 'as(.*)d'] }],
+      })
+    ).toBe('label_replace(metric, "server", "$1", "instance", "as(.*)d")');
+  });
+
+  it('Can group by expressions', () => {
+    expect(
+      modeller.renderQuery({
+        metric: 'metric',
+        labels: [],
+        operations: [{ id: '__sum_by', params: ['server', 'job'] }],
+      })
+    ).toBe('sum by(server, job) (metric)');
+  });
+
+  it('Can render avg around a group by', () => {
+    expect(
+      modeller.renderQuery({
+        metric: 'metric',
+        labels: [],
+        operations: [
+          { id: '__sum_by', params: ['server', 'job'] },
+          { id: 'avg', params: [] },
+        ],
+      })
+    ).toBe('avg(sum by(server, job) (metric))');
+  });
+
+  it('Can use aggregation without label', () => {
+    expect(
+      modeller.renderQuery({
+        metric: 'metric',
+        labels: [],
+        operations: [{ id: '__sum_without', params: ['server', 'job'] }],
+      })
+    ).toBe('sum without(server, job) (metric)');
+  });
+
+  it('Can render aggregations with parameters', () => {
+    expect(
+      modeller.renderQuery({
+        metric: 'metric',
+        labels: [],
+        operations: [{ id: 'topk', params: [5] }],
+      })
+    ).toBe('topk(5, metric)');
+  });
+
+  it('Can render rate', () => {
+    expect(
+      modeller.renderQuery({
+        metric: 'metric',
+        labels: [{ label: 'pod', op: '=', value: 'A' }],
+        operations: [{ id: PromOperationId.Rate, params: ['$__rate_interval'] }],
+      })
+    ).toBe('rate(metric{pod="A"}[$__rate_interval])');
+  });
+
+  it('Can render increase', () => {
+    expect(
+      modeller.renderQuery({
+        metric: 'metric',
+        labels: [{ label: 'pod', op: '=', value: 'A' }],
+        operations: [{ id: PromOperationId.Increase, params: ['$__interval'] }],
+      })
+    ).toBe('increase(metric{pod="A"}[$__interval])');
+  });
+
+  it('Can render rate with custom range-vector', () => {
+    expect(
+      modeller.renderQuery({
+        metric: 'metric',
+        labels: [{ label: 'pod', op: '=', value: 'A' }],
+        operations: [{ id: PromOperationId.Rate, params: ['10m'] }],
+      })
+    ).toBe('rate(metric{pod="A"}[10m])');
+  });
+
+  it('Can render multiply operation', () => {
+    expect(
+      modeller.renderQuery({
+        metric: 'metric',
+        labels: [],
+        operations: [{ id: PromOperationId.MultiplyBy, params: [1000] }],
+      })
+    ).toBe('metric * 1000');
+  });
+
+  it('Can render query with simple binary query', () => {
+    expect(
+      modeller.renderQuery({
+        metric: 'metric_a',
+        labels: [],
+        operations: [],
+        binaryQueries: [
+          {
+            operator: '/',
+            query: {
+              metric: 'metric_b',
+              labels: [],
+              operations: [],
+            },
+          },
+        ],
+      })
+    ).toBe('metric_a / metric_b');
+  });
+
+  it('Can render query with multiple binary queries and nesting', () => {
+    expect(
+      modeller.renderQuery({
+        metric: 'metric_a',
+        labels: [],
+        operations: [],
+        binaryQueries: [
+          {
+            operator: '+',
+            query: {
+              metric: 'metric_b',
+              labels: [],
+              operations: [],
+            },
+          },
+          {
+            operator: '+',
+            query: {
+              metric: 'metric_c',
+              labels: [],
+              operations: [],
+            },
+          },
+        ],
+      })
+    ).toBe('metric_a + metric_b + metric_c');
+  });
+
+  it('Can render query with nested query with binary op', () => {
+    expect(
+      modeller.renderQuery({
+        metric: 'metric_a',
+        labels: [],
+        operations: [],
+        binaryQueries: [
+          {
+            operator: '/',
+            query: {
+              metric: 'metric_b',
+              labels: [],
+              operations: [{ id: PromOperationId.MultiplyBy, params: [1000] }],
+            },
+          },
+        ],
+      })
+    ).toBe('metric_a / (metric_b * 1000)');
+  });
+
+  it('Can render query with nested binary query with parentheses', () => {
+    expect(
+      modeller.renderQuery({
+        metric: 'metric_a',
+        labels: [],
+        operations: [],
+        binaryQueries: [
+          {
+            operator: '/',
+            query: {
+              metric: 'metric_b',
+              labels: [],
+              operations: [],
+              binaryQueries: [
+                {
+                  operator: '*',
+                  query: {
+                    metric: 'metric_c',
+                    labels: [],
+                    operations: [],
+                  },
+                },
+              ],
+            },
+          },
+        ],
+      })
+    ).toBe('metric_a / (metric_b * metric_c)');
+  });
+
+  it('Should add parantheis around first query if it has binary op', () => {
+    expect(
+      modeller.renderQuery({
+        metric: 'metric_a',
+        labels: [],
+        operations: [{ id: PromOperationId.MultiplyBy, params: [1000] }],
+        binaryQueries: [
+          {
+            operator: '/',
+            query: {
+              metric: 'metric_b',
+              labels: [],
+              operations: [],
+            },
+          },
+        ],
+      })
+    ).toBe('(metric_a * 1000) / metric_b');
+  });
+
+  it('Can render functions that require a range as a parameter', () => {
+    expect(
+      modeller.renderQuery({
+        metric: 'metric_a',
+        labels: [],
+        operations: [{ id: 'holt_winters', params: ['5m', 0.5, 0.5] }],
+      })
+    ).toBe('holt_winters(metric_a[5m], 0.5, 0.5)');
+  });
+  it('Can render functions that require parameters left of a range', () => {
+    expect(
+      modeller.renderQuery({
+        metric: 'metric_a',
+        labels: [],
+        operations: [{ id: 'quantile_over_time', params: ['5m', 1] }],
+      })
+    ).toBe('quantile_over_time(1, metric_a[5m])');
+  });
+  it('Can render the label_join function', () => {
+    expect(
+      modeller.renderQuery({
+        metric: 'metric_a',
+        labels: [],
+        operations: [{ id: 'label_join', params: ['label_1', ',', 'label_2'] }],
+      })
+    ).toBe('label_join(metric_a, "label_1", ",", "label_2")');
+  });
+
+  it('Can render label_join with extra parameters', () => {
+    expect(
+      modeller.renderQuery({
+        metric: 'metric_a',
+        labels: [],
+        operations: [{ id: 'label_join', params: ['label_1', ', ', 'label_2', 'label_3', 'label_4', 'label_5'] }],
+      })
+    ).toBe('label_join(metric_a, "label_1", ", ", "label_2", "label_3", "label_4", "label_5")');
+  });
+
+  it('can render vector matchers', () => {
+    expect(
+      modeller.renderQuery({
+        metric: 'metric_a',
+        labels: [],
+        operations: [],
+        binaryQueries: [
+          {
+            operator: '/',
+            vectorMatches: 'le, foo',
+            vectorMatchesType: 'on',
+            query: {
+              metric: 'metric_b',
+              labels: [],
+              operations: [],
+            },
+          },
+        ],
+      })
+    ).toBe('metric_a / on(le, foo) metric_b');
+  });
+
+  it('can render bool in binary ops', () => {
+    expect(
+      modeller.renderQuery({
+        metric: 'cluster_namespace_slug_dialer_name',
+        labels: [],
+        operations: [
+          {
+            id: '__less_or_equal',
+            params: [2, true],
+          },
+        ],
+      })
+    ).toBe('cluster_namespace_slug_dialer_name <= bool 2');
+  });
+});
diff --git a/packages/grafana-prometheus/src/querybuilder/PromQueryModeller.ts b/packages/grafana-prometheus/src/querybuilder/PromQueryModeller.ts
new file mode 100644
index 0000000000000..894ba907ed1c0
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/PromQueryModeller.ts
@@ -0,0 +1,93 @@
+import { FUNCTIONS } from '../promql';
+
+import { getAggregationOperations } from './aggregations';
+import { getOperationDefinitions } from './operations';
+import { LokiAndPromQueryModellerBase } from './shared/LokiAndPromQueryModellerBase';
+import { PromQueryPattern, PromQueryPatternType, PromVisualQueryOperationCategory } from './types';
+
+export class PromQueryModeller extends LokiAndPromQueryModellerBase {
+  constructor() {
+    super(() => {
+      const allOperations = [...getOperationDefinitions(), ...getAggregationOperations()];
+      for (const op of allOperations) {
+        const func = FUNCTIONS.find((x) => x.insertText === op.id);
+        if (func) {
+          op.documentation = func.documentation;
+        }
+      }
+      return allOperations;
+    });
+
+    this.setOperationCategories([
+      PromVisualQueryOperationCategory.Aggregations,
+      PromVisualQueryOperationCategory.RangeFunctions,
+      PromVisualQueryOperationCategory.Functions,
+      PromVisualQueryOperationCategory.BinaryOps,
+      PromVisualQueryOperationCategory.Trigonometric,
+      PromVisualQueryOperationCategory.Time,
+    ]);
+  }
+
+  getQueryPatterns(): PromQueryPattern[] {
+    return [
+      {
+        name: 'Rate then sum',
+        type: PromQueryPatternType.Rate,
+        operations: [
+          { id: 'rate', params: ['$__rate_interval'] },
+          { id: 'sum', params: [] },
+        ],
+      },
+      {
+        name: 'Rate then sum by(label) then avg',
+        type: PromQueryPatternType.Rate,
+        operations: [
+          { id: 'rate', params: ['$__rate_interval'] },
+          { id: '__sum_by', params: [''] },
+          { id: 'avg', params: [] },
+        ],
+      },
+      {
+        name: 'Histogram quantile on rate',
+        type: PromQueryPatternType.Histogram,
+        operations: [
+          { id: 'rate', params: ['$__rate_interval'] },
+          { id: '__sum_by', params: ['le'] },
+          { id: 'histogram_quantile', params: [0.95] },
+        ],
+      },
+      {
+        name: 'Histogram quantile on increase',
+        type: PromQueryPatternType.Histogram,
+        operations: [
+          { id: 'increase', params: ['$__rate_interval'] },
+          { id: '__max_by', params: ['le'] },
+          { id: 'histogram_quantile', params: [0.95] },
+        ],
+      },
+      {
+        name: 'Binary Query',
+        type: PromQueryPatternType.Binary,
+        operations: [
+          { id: 'rate', params: ['$__rate_interval'] },
+          { id: 'sum', params: [] },
+        ],
+        binaryQueries: [
+          {
+            operator: '/',
+            query: {
+              metric: '',
+              labels: [],
+              operations: [
+                { id: 'rate', params: ['$__rate_interval'] },
+                { id: 'sum', params: [] },
+              ],
+            },
+          },
+        ],
+      },
+    ];
+  }
+}
+
+export const promQueryModeller = new PromQueryModeller();
diff --git a/packages/grafana-prometheus/src/querybuilder/QueryPattern.tsx b/packages/grafana-prometheus/src/querybuilder/QueryPattern.tsx
new file mode 100644
index 0000000000000..083396cda3999
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/QueryPattern.tsx
@@ -0,0 +1,118 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Button, Card, useStyles2 } from '@grafana/ui';
+
+import promqlGrammar from '../promql';
+
+import { promQueryModeller } from './PromQueryModeller';
+import { RawQuery } from './shared/RawQuery';
+import { PromQueryPattern } from './types';
+
+type Props = {
+  pattern: PromQueryPattern;
+  hasNewQueryOption: boolean;
+  hasPreviousQuery: boolean | string;
+  selectedPatternName: string | null;
+  setSelectedPatternName: (name: string | null) => void;
+  onPatternSelect: (pattern: PromQueryPattern, selectAsNewQuery?: boolean) => void;
+};
+
+export const QueryPattern = (props: Props) => {
+  const { pattern, onPatternSelect, hasNewQueryOption, hasPreviousQuery, selectedPatternName, setSelectedPatternName } =
+    props;
+
+  const styles = useStyles2(getStyles);
+  const lang = { grammar: promqlGrammar, name: 'promql' };
+
+  return (
+    <Card className={styles.card}>
+      <Card.Heading>{pattern.name}</Card.Heading>
+      <div className={styles.rawQueryContainer}>
+        <RawQuery
+          aria-label={`${pattern.name} raw query`}
+          query={promQueryModeller.renderQuery({
+            labels: [],
+            operations: pattern.operations,
+            binaryQueries: pattern.binaryQueries,
+          })}
+          lang={lang}
+          className={styles.rawQuery}
+        />
+      </div>
+      <Card.Actions>
+        {selectedPatternName !== pattern.name ? (
+          <Button
+            size="sm"
+            aria-label="use this query button"
+            onClick={() => {
+              if (hasPreviousQuery) {
+                // If user has previous query, we need to confirm that they want to apply this query pattern
+                setSelectedPatternName(pattern.name);
+              } else {
+                onPatternSelect(pattern);
+              }
+            }}
+          >
+            Use this query
+          </Button>
+        ) : (
+          <>
+            <div className={styles.spacing}>
+              {`If you would like to use this query, ${
+                hasNewQueryOption
+                  ? 'you can either apply this query pattern or create a new query'
+                  : 'this query pattern will be applied to your current query'
+              }.`}
+            </div>
+            <Button size="sm" aria-label="back button" fill="outline" onClick={() => setSelectedPatternName(null)}>
+              Back
+            </Button>
+            <Button
+              size="sm"
+              aria-label="apply query starter button"
+              onClick={() => {
+                onPatternSelect(pattern);
+              }}
+            >
+              Apply query
+            </Button>
+            {hasNewQueryOption && (
+              <Button
+                size="sm"
+                aria-label="create new query button"
+                onClick={() => {
+                  onPatternSelect(pattern, true);
+                }}
+              >
+                Create new query
+              </Button>
+            )}
+          </>
+        )}
+      </Card.Actions>
+    </Card>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    card: css`
+      width: 49.5%;
+      display: flex;
+      flex-direction: column;
+    `,
+    rawQueryContainer: css`
+      flex-grow: 1;
+    `,
+    rawQuery: css`
+      background-color: ${theme.colors.background.primary};
+      padding: ${theme.spacing(1)};
+      margin-top: ${theme.spacing(1)};
+    `,
+    spacing: css`
+      margin-bottom: ${theme.spacing(1)};
+    `,
+  };
+};
diff --git a/packages/grafana-prometheus/src/querybuilder/QueryPatternsModal.test.tsx b/packages/grafana-prometheus/src/querybuilder/QueryPatternsModal.test.tsx
new file mode 100644
index 0000000000000..a8a2b3c9e0262
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/QueryPatternsModal.test.tsx
@@ -0,0 +1,143 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { promQueryModeller } from './PromQueryModeller';
+import { QueryPatternsModal } from './QueryPatternsModal';
+import { PromQueryPatternType } from './types';
+
+// don't care about interaction tracking in our unit tests
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  reportInteraction: jest.fn(),
+}));
+
+const defaultProps = {
+  isOpen: true,
+  onClose: jest.fn(),
+  onChange: jest.fn(),
+  onAddQuery: jest.fn(),
+  query: {
+    refId: 'A',
+    expr: 'sum(rate({job="grafana"}[$__rate_interval]))',
+  },
+  queries: [
+    {
+      refId: 'A',
+      expr: 'go_goroutines{instance="localhost:9090"}',
+    },
+  ],
+};
+
+const queryPatterns = {
+  rateQueryPatterns: promQueryModeller
+    .getQueryPatterns()
+    .filter((pattern) => pattern.type === PromQueryPatternType.Rate),
+  histogramQueryPatterns: promQueryModeller
+    .getQueryPatterns()
+    .filter((pattern) => pattern.type === PromQueryPatternType.Histogram),
+  binaryQueryPatterns: promQueryModeller
+    .getQueryPatterns()
+    .filter((pattern) => pattern.type === PromQueryPatternType.Binary),
+};
+
+describe('QueryPatternsModal', () => {
+  it('renders the modal', () => {
+    render(<QueryPatternsModal {...defaultProps} />);
+    expect(screen.getByText('Kick start your query')).toBeInTheDocument();
+  });
+  it('renders collapsible elements with all query pattern types', () => {
+    render(<QueryPatternsModal {...defaultProps} />);
+    Object.values(PromQueryPatternType).forEach((pattern) => {
+      expect(screen.getByText(new RegExp(`${pattern} query starters`, 'i'))).toBeInTheDocument();
+    });
+  });
+  it('can open and close query patterns section', async () => {
+    render(<QueryPatternsModal {...defaultProps} />);
+    await userEvent.click(screen.getByText('Rate query starters'));
+    expect(screen.getByText(queryPatterns.rateQueryPatterns[0].name)).toBeInTheDocument();
+
+    await userEvent.click(screen.getByText('Rate query starters'));
+    expect(screen.queryByText(queryPatterns.rateQueryPatterns[0].name)).not.toBeInTheDocument();
+  });
+
+  it('can open and close multiple query patterns section', async () => {
+    render(<QueryPatternsModal {...defaultProps} />);
+    await userEvent.click(screen.getByText('Rate query starters'));
+    expect(screen.getByText(queryPatterns.rateQueryPatterns[0].name)).toBeInTheDocument();
+
+    await userEvent.click(screen.getByText('Histogram query starters'));
+    expect(screen.getByText(queryPatterns.histogramQueryPatterns[0].name)).toBeInTheDocument();
+
+    await userEvent.click(screen.getByText('Rate query starters'));
+    expect(screen.queryByText(queryPatterns.rateQueryPatterns[0].name)).not.toBeInTheDocument();
+
+    // Histogram patterns should still be open
+    expect(screen.getByText(queryPatterns.histogramQueryPatterns[0].name)).toBeInTheDocument();
+  });
+
+  it('uses pattern if there is no existing query', async () => {
+    render(<QueryPatternsModal {...defaultProps} query={{ expr: '', refId: 'A' }} />);
+    await userEvent.click(screen.getByText('Rate query starters'));
+    expect(screen.getByText(queryPatterns.rateQueryPatterns[0].name)).toBeInTheDocument();
+    const firstUseQueryButton = screen.getAllByRole('button', { name: 'use this query button' })[0];
+    await userEvent.click(firstUseQueryButton);
+    await waitFor(() => {
+      expect(defaultProps.onChange).toHaveBeenCalledWith({
+        expr: 'sum(rate([$__rate_interval]))',
+        refId: 'A',
+      });
+    });
+  });
+
+  it('gives warning when selecting pattern if there are already existing query', async () => {
+    render(<QueryPatternsModal {...defaultProps} />);
+    await userEvent.click(screen.getByText('Rate query starters'));
+    expect(screen.getByText(queryPatterns.rateQueryPatterns[0].name)).toBeInTheDocument();
+    const firstUseQueryButton = screen.getAllByRole('button', { name: 'use this query button' })[0];
+    await userEvent.click(firstUseQueryButton);
+
+    expect(screen.getByText(/you can either apply this query pattern or create a new query/)).toBeInTheDocument();
+  });
+
+  it('can use create new query when selecting pattern if there is already existing query', async () => {
+    render(<QueryPatternsModal {...defaultProps} />);
+    await userEvent.click(screen.getByText('Rate query starters'));
+    expect(screen.getByText(queryPatterns.rateQueryPatterns[0].name)).toBeInTheDocument();
+    const firstUseQueryButton = screen.getAllByRole('button', { name: 'use this query button' })[0];
+    await userEvent.click(firstUseQueryButton);
+    const createNewQueryButton = screen.getByRole('button', { name: 'create new query button' });
+    expect(createNewQueryButton).toBeInTheDocument();
+    await userEvent.click(createNewQueryButton);
+    await waitFor(() => {
+      expect(defaultProps.onAddQuery).toHaveBeenCalledWith({
+        expr: 'sum(rate([$__rate_interval]))',
+        refId: 'B',
+      });
+    });
+  });
+
+  it('does not show create new query option if onAddQuery function is not provided ', async () => {
+    render(<QueryPatternsModal {...defaultProps} onAddQuery={undefined} />);
+    await userEvent.click(screen.getByText('Rate query starters'));
+    expect(screen.getByText(queryPatterns.rateQueryPatterns[0].name)).toBeInTheDocument();
+    const useQueryButton = screen.getAllByRole('button', { name: 'use this query button' })[0];
+    await userEvent.click(useQueryButton);
+    expect(screen.queryByRole('button', { name: 'Create new query' })).not.toBeInTheDocument();
+    expect(screen.getByText(/this query pattern will be applied to your current query/)).toBeInTheDocument();
+  });
+
+  it('applies binary query patterns to query', async () => {
+    render(<QueryPatternsModal {...defaultProps} query={{ expr: '', refId: 'A' }} />);
+    await userEvent.click(screen.getByText('Binary query starters'));
+    expect(screen.getByText(queryPatterns.binaryQueryPatterns[0].name)).toBeInTheDocument();
+    const firstUseQueryButton = screen.getAllByRole('button', { name: 'use this query button' })[0];
+    await userEvent.click(firstUseQueryButton);
+    await waitFor(() => {
+      expect(defaultProps.onChange).toHaveBeenCalledWith({
+        expr: 'sum(rate([$__rate_interval])) / sum(rate([$__rate_interval]))',
+        refId: 'A',
+      });
+    });
+  });
+});
diff --git a/packages/grafana-prometheus/src/querybuilder/QueryPatternsModal.tsx b/packages/grafana-prometheus/src/querybuilder/QueryPatternsModal.tsx
new file mode 100644
index 0000000000000..f98a778e778c6
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/QueryPatternsModal.tsx
@@ -0,0 +1,132 @@
+import { css } from '@emotion/css';
+import { capitalize } from 'lodash';
+import React, { useMemo, useState } from 'react';
+
+import { CoreApp, DataQuery, GrafanaTheme2 } from '@grafana/data';
+import { reportInteraction } from '@grafana/runtime';
+import { Button, Collapse, Modal, useStyles2 } from '@grafana/ui';
+
+import { getNextRefIdChar } from '../gcopypaste/app/core/utils/query';
+import { PromQuery } from '../types';
+
+import { promQueryModeller } from './PromQueryModeller';
+import { QueryPattern } from './QueryPattern';
+import { buildVisualQueryFromString } from './parsing';
+import { PromQueryPattern, PromQueryPatternType } from './types';
+
+type Props = {
+  isOpen: boolean;
+  query: PromQuery;
+  queries: DataQuery[] | undefined;
+  app?: CoreApp;
+  onClose: () => void;
+  onChange: (query: PromQuery) => void;
+  onAddQuery?: (query: PromQuery) => void;
+};
+
+export const QueryPatternsModal = (props: Props) => {
+  const { isOpen, onClose, onChange, onAddQuery, query, queries, app } = props;
+  const [openTabs, setOpenTabs] = useState<string[]>([]);
+  const [selectedPatternName, setSelectedPatternName] = useState<string | null>(null);
+
+  const styles = useStyles2(getStyles);
+  const hasNewQueryOption = !!onAddQuery;
+  const hasPreviousQuery = useMemo(() => {
+    const visualQuery = buildVisualQueryFromString(query.expr ?? '');
+    // has anything entered in the query, metric, labels, operations, or binary queries
+    const hasOperations = visualQuery.query.operations.length > 0,
+      hasMetric = visualQuery.query.metric,
+      hasLabels = visualQuery.query.labels.length > 0,
+      hasBinaryQueries = visualQuery.query.binaryQueries ? visualQuery.query.binaryQueries.length > 0 : false;
+
+    return hasOperations || hasMetric || hasLabels || hasBinaryQueries;
+  }, [query.expr]);
+
+  const onPatternSelect = (pattern: PromQueryPattern, selectAsNewQuery = false) => {
+    const visualQuery = buildVisualQueryFromString(selectAsNewQuery ? '' : query.expr);
+    reportInteraction('grafana_prom_kickstart_your_query_selected', {
+      app: app ?? '',
+      editorMode: query.editorMode,
+      selectedPattern: pattern.name,
+      preSelectedOperationsCount: visualQuery.query.operations.length,
+      preSelectedLabelsCount: visualQuery.query.labels.length,
+      createNewQuery: hasNewQueryOption && selectAsNewQuery,
+    });
+
+    visualQuery.query.operations = pattern.operations;
+    visualQuery.query.binaryQueries = pattern.binaryQueries;
+    if (hasNewQueryOption && selectAsNewQuery) {
+      onAddQuery({
+        ...query,
+        refId: getNextRefIdChar(queries ?? [query]),
+        expr: promQueryModeller.renderQuery(visualQuery.query),
+      });
+    } else {
+      onChange({
+        ...query,
+        expr: promQueryModeller.renderQuery(visualQuery.query),
+      });
+    }
+    setSelectedPatternName(null);
+    onClose();
+  };
+
+  return (
+    <Modal aria-label="Kick start your query modal" isOpen={isOpen} title="Kick start your query" onDismiss={onClose}>
+      <div className={styles.spacing}>
+        Kick start your query by selecting one of these queries. You can then continue to complete your query.
+      </div>
+      {Object.values(PromQueryPatternType).map((patternType) => {
+        return (
+          <Collapse
+            aria-label={`open and close ${patternType} query starter card`}
+            key={patternType}
+            label={`${capitalize(patternType)} query starters`}
+            isOpen={openTabs.includes(patternType)}
+            collapsible={true}
+            onToggle={() =>
+              setOpenTabs((tabs) =>
+                // close tab if it's already open, otherwise open it
+                tabs.includes(patternType) ? tabs.filter((t) => t !== patternType) : [...tabs, patternType]
+              )
+            }
+          >
+            <div className={styles.cardsContainer}>
+              {promQueryModeller
+                .getQueryPatterns()
+                .filter((pattern) => pattern.type === patternType)
+                .map((pattern) => (
+                  <QueryPattern
+                    key={pattern.name}
+                    pattern={pattern}
+                    hasNewQueryOption={hasNewQueryOption}
+                    hasPreviousQuery={hasPreviousQuery}
+                    onPatternSelect={onPatternSelect}
+                    selectedPatternName={selectedPatternName}
+                    setSelectedPatternName={setSelectedPatternName}
+                  />
+                ))}
+            </div>
+          </Collapse>
+        );
+      })}
+      <Button aria-label="close kick start your query modal" variant="secondary" onClick={onClose}>
+        Close
+      </Button>
+    </Modal>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    cardsContainer: css`
+      display: flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+      justify-content: space-between;
+    `,
+    spacing: css`
+      margin-bottom: ${theme.spacing(1)};
+    `,
+  };
+};
diff --git a/packages/grafana-prometheus/src/querybuilder/aggregations.ts b/packages/grafana-prometheus/src/querybuilder/aggregations.ts
new file mode 100644
index 0000000000000..18a2f72b68778
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/aggregations.ts
@@ -0,0 +1,62 @@
+import {
+  createAggregationOperation,
+  createAggregationOperationWithParam,
+  getPromOperationDisplayName,
+  getRangeVectorParamDef,
+} from './operationUtils';
+import { addOperationWithRangeVector } from './operations';
+import { QueryBuilderOperation, QueryBuilderOperationDef } from './shared/types';
+import { PromOperationId, PromVisualQueryOperationCategory } from './types';
+
+export function getAggregationOperations(): QueryBuilderOperationDef[] {
+  return [
+    ...createAggregationOperation(PromOperationId.Sum),
+    ...createAggregationOperation(PromOperationId.Avg),
+    ...createAggregationOperation(PromOperationId.Min),
+    ...createAggregationOperation(PromOperationId.Max),
+    ...createAggregationOperation(PromOperationId.Count),
+    ...createAggregationOperationWithParam(PromOperationId.TopK, {
+      params: [{ name: 'K-value', type: 'number' }],
+      defaultParams: [5],
+    }),
+    ...createAggregationOperationWithParam(PromOperationId.BottomK, {
+      params: [{ name: 'K-value', type: 'number' }],
+      defaultParams: [5],
+    }),
+    ...createAggregationOperationWithParam(PromOperationId.CountValues, {
+      params: [{ name: 'Identifier', type: 'string' }],
+      defaultParams: ['count'],
+    }),
+    createAggregationOverTime(PromOperationId.SumOverTime),
+    createAggregationOverTime(PromOperationId.AvgOverTime),
+    createAggregationOverTime(PromOperationId.MinOverTime),
+    createAggregationOverTime(PromOperationId.MaxOverTime),
+    createAggregationOverTime(PromOperationId.CountOverTime),
+    createAggregationOverTime(PromOperationId.LastOverTime),
+    createAggregationOverTime(PromOperationId.PresentOverTime),
+    createAggregationOverTime(PromOperationId.AbsentOverTime),
+    createAggregationOverTime(PromOperationId.StddevOverTime),
+  ];
+}
+
+function createAggregationOverTime(name: string): QueryBuilderOperationDef {
+  return {
+    id: name,
+    name: getPromOperationDisplayName(name),
+    params: [getRangeVectorParamDef()],
+    defaultParams: ['$__interval'],
+    alternativesKey: 'overtime function',
+    category: PromVisualQueryOperationCategory.RangeFunctions,
+    renderer: operationWithRangeVectorRenderer,
+    addOperationHandler: addOperationWithRangeVector,
+  };
+}
+
+function operationWithRangeVectorRenderer(
+  model: QueryBuilderOperation,
+  def: QueryBuilderOperationDef,
+  innerExpr: string
+) {
+  let rangeVector = (model.params ?? [])[0] ?? '$__interval';
+  return `${def.id}(${innerExpr}[${rangeVector}])`;
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/binaryScalarOperations.ts b/packages/grafana-prometheus/src/querybuilder/binaryScalarOperations.ts
new file mode 100644
index 0000000000000..e596fd2033d87
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/binaryScalarOperations.ts
@@ -0,0 +1,120 @@
+import { defaultAddOperationHandler } from './operationUtils';
+import { QueryBuilderOperation, QueryBuilderOperationDef, QueryBuilderOperationParamDef } from './shared/types';
+import { PromOperationId, PromVisualQueryOperationCategory } from './types';
+
+export const binaryScalarDefs = [
+  {
+    id: PromOperationId.Addition,
+    name: 'Add scalar',
+    sign: '+',
+  },
+  {
+    id: PromOperationId.Subtraction,
+    name: 'Subtract scalar',
+    sign: '-',
+  },
+  {
+    id: PromOperationId.MultiplyBy,
+    name: 'Multiply by scalar',
+    sign: '*',
+  },
+  {
+    id: PromOperationId.DivideBy,
+    name: 'Divide by scalar',
+    sign: '/',
+  },
+  {
+    id: PromOperationId.Modulo,
+    name: 'Modulo by scalar',
+    sign: '%',
+  },
+  {
+    id: PromOperationId.Exponent,
+    name: 'Exponent',
+    sign: '^',
+  },
+  {
+    id: PromOperationId.EqualTo,
+    name: 'Equal to',
+    sign: '==',
+    comparison: true,
+  },
+  {
+    id: PromOperationId.NotEqualTo,
+    name: 'Not equal to',
+    sign: '!=',
+    comparison: true,
+  },
+  {
+    id: PromOperationId.GreaterThan,
+    name: 'Greater than',
+    sign: '>',
+    comparison: true,
+  },
+  {
+    id: PromOperationId.LessThan,
+    name: 'Less than',
+    sign: '<',
+    comparison: true,
+  },
+  {
+    id: PromOperationId.GreaterOrEqual,
+    name: 'Greater or equal to',
+    sign: '>=',
+    comparison: true,
+  },
+  {
+    id: PromOperationId.LessOrEqual,
+    name: 'Less or equal to',
+    sign: '<=',
+    comparison: true,
+  },
+];
+
+export const binaryScalarOperatorToOperatorName = binaryScalarDefs.reduce<
+  Record<string, { id: string; comparison?: boolean }>
+>((acc, def) => {
+  acc[def.sign] = {
+    id: def.id,
+    comparison: def.comparison,
+  };
+  return acc;
+}, {});
+
+// Not sure about this one. It could also be a more generic 'Simple math operation' where user specifies
+// both the operator and the operand in a single input
+export const binaryScalarOperations: QueryBuilderOperationDef[] = binaryScalarDefs.map((opDef) => {
+  const params: QueryBuilderOperationParamDef[] = [{ name: 'Value', type: 'number' }];
+  const defaultParams: any[] = [2];
+  if (opDef.comparison) {
+    params.push({
+      name: 'Bool',
+      type: 'boolean',
+      description: 'If checked comparison will return 0 or 1 for the value rather than filtering.',
+    });
+    defaultParams.push(false);
+  }
+
+  return {
+    id: opDef.id,
+    name: opDef.name,
+    params,
+    defaultParams,
+    alternativesKey: 'binary scalar operations',
+    category: PromVisualQueryOperationCategory.BinaryOps,
+    renderer: getSimpleBinaryRenderer(opDef.sign),
+    addOperationHandler: defaultAddOperationHandler,
+  };
+});
+
+function getSimpleBinaryRenderer(operator: string) {
+  return function binaryRenderer(model: QueryBuilderOperation, def: QueryBuilderOperationDef, innerExpr: string) {
+    let param = model.params[0];
+    let bool = '';
+    if (model.params.length === 2) {
+      bool = model.params[1] ? ' bool' : '';
+    }
+
+    return `${innerExpr} ${operator}${bool} ${param}`;
+  };
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/components/LabelFilterItem.tsx b/packages/grafana-prometheus/src/querybuilder/components/LabelFilterItem.tsx
new file mode 100644
index 0000000000000..c1a28d8f96ff1
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/LabelFilterItem.tsx
@@ -0,0 +1,194 @@
+import debounce from 'debounce-promise';
+import React, { useState } from 'react';
+
+import { SelectableValue, toOption } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { AccessoryButton, InputGroup } from '@grafana/experimental';
+import { AsyncSelect, Select } from '@grafana/ui';
+
+import { truncateResult } from '../../language_utils';
+import { QueryBuilderLabelFilter } from '../shared/types';
+
+export interface LabelFilterItemProps {
+  defaultOp: string;
+  item: Partial<QueryBuilderLabelFilter>;
+  onChange: (value: QueryBuilderLabelFilter) => void;
+  onGetLabelNames: (forLabel: Partial<QueryBuilderLabelFilter>) => Promise<SelectableValue[]>;
+  onGetLabelValues: (forLabel: Partial<QueryBuilderLabelFilter>) => Promise<SelectableValue[]>;
+  onDelete: () => void;
+  invalidLabel?: boolean;
+  invalidValue?: boolean;
+  getLabelValuesAutofillSuggestions: (query: string, labelName?: string) => Promise<SelectableValue[]>;
+  debounceDuration: number;
+}
+
+export function LabelFilterItem({
+  item,
+  defaultOp,
+  onChange,
+  onDelete,
+  onGetLabelNames,
+  onGetLabelValues,
+  invalidLabel,
+  invalidValue,
+  getLabelValuesAutofillSuggestions,
+  debounceDuration,
+}: LabelFilterItemProps) {
+  const [state, setState] = useState<{
+    labelNames?: SelectableValue[];
+    labelValues?: SelectableValue[];
+    isLoadingLabelNames?: boolean;
+    isLoadingLabelValues?: boolean;
+  }>({});
+  // there's a bug in react-select where the menu doesn't recalculate its position when the options are loaded asynchronously
+  // see https://github.com/grafana/grafana/issues/63558
+  // instead, we explicitly control the menu visibility and prevent showing it until the options have fully loaded
+  const [labelNamesMenuOpen, setLabelNamesMenuOpen] = useState(false);
+  const [labelValuesMenuOpen, setLabelValuesMenuOpen] = useState(false);
+
+  const isMultiSelect = (operator = item.op) => {
+    return operators.find((op) => op.label === operator)?.isMultiValue;
+  };
+
+  const getSelectOptionsFromString = (item?: string): string[] => {
+    if (item) {
+      const regExp = /\(([^)]+)\)/;
+      const matches = item?.match(regExp);
+
+      if (matches && matches[0].indexOf('|') > 0) {
+        return [item];
+      }
+
+      if (item.indexOf('|') > 0) {
+        return item.split('|');
+      }
+      return [item];
+    }
+    return [];
+  };
+
+  const labelValueSearch = debounce(
+    (query: string) => getLabelValuesAutofillSuggestions(query, item.label),
+    debounceDuration
+  );
+
+  const itemValue = item?.value ?? '';
+
+  return (
+    <div key={itemValue} data-testid="prometheus-dimensions-filter-item">
+      <InputGroup>
+        {/* Label name select, loads all values at once */}
+        <Select
+          placeholder="Select label"
+          data-testid={selectors.components.QueryBuilder.labelSelect}
+          inputId="prometheus-dimensions-filter-item-key"
+          width="auto"
+          value={item.label ? toOption(item.label) : null}
+          allowCustomValue
+          onOpenMenu={async () => {
+            setState({ isLoadingLabelNames: true });
+            const labelNames = await onGetLabelNames(item);
+            setLabelNamesMenuOpen(true);
+            setState({ labelNames, isLoadingLabelNames: undefined });
+          }}
+          onCloseMenu={() => {
+            setLabelNamesMenuOpen(false);
+          }}
+          isOpen={labelNamesMenuOpen}
+          isLoading={state.isLoadingLabelNames ?? false}
+          options={state.labelNames}
+          onChange={(change) => {
+            if (change.label) {
+              onChange({
+                ...item,
+                op: item.op ?? defaultOp,
+                label: change.label,
+                // eslint-ignore
+              } as QueryBuilderLabelFilter);
+            }
+          }}
+          invalid={invalidLabel}
+        />
+
+        {/* Operator select i.e.   = =~ != !~   */}
+        <Select
+          data-testid={selectors.components.QueryBuilder.matchOperatorSelect}
+          className="query-segment-operator"
+          value={toOption(item.op ?? defaultOp)}
+          options={operators}
+          width="auto"
+          onChange={(change) => {
+            if (change.value != null) {
+              onChange({
+                ...item,
+                op: change.value,
+                value: isMultiSelect(change.value) ? item.value : getSelectOptionsFromString(item?.value)[0],
+                // eslint-ignore
+              } as QueryBuilderLabelFilter);
+            }
+          }}
+        />
+
+        {/* Label value async select: autocomplete calls prometheus API */}
+        <AsyncSelect
+          placeholder="Select value"
+          data-testid={selectors.components.QueryBuilder.valueSelect}
+          inputId="prometheus-dimensions-filter-item-value"
+          width="auto"
+          value={
+            isMultiSelect()
+              ? getSelectOptionsFromString(itemValue).map(toOption)
+              : getSelectOptionsFromString(itemValue).map(toOption)[0]
+          }
+          allowCustomValue
+          onOpenMenu={async () => {
+            setState({ isLoadingLabelValues: true });
+            const labelValues = await onGetLabelValues(item);
+            truncateResult(labelValues);
+            setLabelValuesMenuOpen(true);
+            setState({
+              ...state,
+              labelValues,
+              isLoadingLabelValues: undefined,
+            });
+          }}
+          onCloseMenu={() => {
+            setLabelValuesMenuOpen(false);
+          }}
+          isOpen={labelValuesMenuOpen}
+          defaultOptions={state.labelValues}
+          isMulti={isMultiSelect()}
+          isLoading={state.isLoadingLabelValues}
+          loadOptions={labelValueSearch}
+          onChange={(change) => {
+            if (change.value) {
+              onChange({
+                ...item,
+                value: change.value,
+                op: item.op ?? defaultOp,
+                // eslint-ignore
+              } as QueryBuilderLabelFilter);
+            } else {
+              const changes = change
+                .map((change: { label?: string }) => {
+                  return change.label;
+                })
+                .join('|');
+              // eslint-ignore
+              onChange({ ...item, value: changes, op: item.op ?? defaultOp } as QueryBuilderLabelFilter);
+            }
+          }}
+          invalid={invalidValue}
+        />
+        <AccessoryButton aria-label={`remove-${item.label}`} icon="times" variant="secondary" onClick={onDelete} />
+      </InputGroup>
+    </div>
+  );
+}
+
+const operators = [
+  { label: '=', value: '=', isMultiValue: false },
+  { label: '!=', value: '!=', isMultiValue: false },
+  { label: '=~', value: '=~', isMultiValue: true },
+  { label: '!~', value: '!~', isMultiValue: true },
+];
diff --git a/packages/grafana-prometheus/src/querybuilder/components/LabelFilters.test.tsx b/packages/grafana-prometheus/src/querybuilder/components/LabelFilters.test.tsx
new file mode 100644
index 0000000000000..fcd1b06b72a20
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/LabelFilters.test.tsx
@@ -0,0 +1,163 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React, { ComponentProps } from 'react';
+
+import { selectOptionInTest } from '../../gcopypaste/test/helpers/selectOptionInTest';
+import { getLabelSelects } from '../testUtils';
+
+import { LabelFilters, MISSING_LABEL_FILTER_ERROR_MESSAGE, LabelFiltersProps } from './LabelFilters';
+
+describe('LabelFilters', () => {
+  it('renders empty input without labels', async () => {
+    setup();
+    expect(screen.getAllByText('Select label')).toHaveLength(1);
+    expect(screen.getAllByText('Select value')).toHaveLength(1);
+    expect(screen.getByText(/=/)).toBeInTheDocument();
+    expect(getAddButton()).toBeInTheDocument();
+  });
+
+  it('renders multiple labels', async () => {
+    setup({
+      labelsFilters: [
+        { label: 'foo', op: '=', value: 'bar' },
+        { label: 'baz', op: '!=', value: 'qux' },
+        { label: 'quux', op: '=~', value: 'quuz' },
+      ],
+    });
+    expect(screen.getByText(/foo/)).toBeInTheDocument();
+    expect(screen.getByText(/bar/)).toBeInTheDocument();
+    expect(screen.getByText(/baz/)).toBeInTheDocument();
+    expect(screen.getByText(/qux/)).toBeInTheDocument();
+    expect(screen.getByText(/quux/)).toBeInTheDocument();
+    expect(screen.getByText(/quuz/)).toBeInTheDocument();
+    expect(getAddButton()).toBeInTheDocument();
+  });
+
+  it('renders multiple values for regex selectors', async () => {
+    setup({
+      labelsFilters: [
+        { label: 'bar', op: '!~', value: 'baz|bat|bau' },
+        { label: 'foo', op: '!~', value: 'fop|for|fos' },
+      ],
+    });
+    expect(screen.getByText(/bar/)).toBeInTheDocument();
+    expect(screen.getByText(/baz/)).toBeInTheDocument();
+    expect(screen.getByText(/bat/)).toBeInTheDocument();
+    expect(screen.getByText(/bau/)).toBeInTheDocument();
+    expect(screen.getByText(/foo/)).toBeInTheDocument();
+    expect(screen.getByText(/for/)).toBeInTheDocument();
+    expect(screen.getByText(/fos/)).toBeInTheDocument();
+    expect(getAddButton()).toBeInTheDocument();
+  });
+
+  it('adds new label', async () => {
+    const { onChange } = setup({ labelsFilters: [{ label: 'foo', op: '=', value: 'bar' }] });
+    await userEvent.click(getAddButton());
+    expect(screen.getAllByText('Select label')).toHaveLength(1);
+    expect(screen.getAllByText('Select value')).toHaveLength(1);
+    const { name, value } = getLabelSelects(1);
+    await selectOptionInTest(name, 'baz');
+    await selectOptionInTest(value, 'qux');
+    expect(onChange).toBeCalledWith([
+      { label: 'foo', op: '=', value: 'bar' },
+      { label: 'baz', op: '=', value: 'qux' },
+    ]);
+  });
+
+  it('removes label', async () => {
+    const { onChange } = setup({ labelsFilters: [{ label: 'foo', op: '=', value: 'bar' }] });
+    await userEvent.click(screen.getByLabelText(/remove-foo/));
+    expect(onChange).toBeCalledWith([]);
+  });
+
+  it('removes label but preserves a label with a value of empty string', async () => {
+    const { onChange } = setup({
+      labelsFilters: [
+        { label: 'lab', op: '=', value: 'bel' },
+        { label: 'foo', op: '=', value: 'bar' },
+        { label: 'le', op: '=', value: '' },
+      ],
+    });
+    await userEvent.click(screen.getByLabelText(/remove-foo/));
+    expect(onChange).toBeCalledWith([
+      { label: 'lab', op: '=', value: 'bel' },
+      { label: 'le', op: '=', value: '' },
+    ]);
+    expect(screen.queryByText('bar')).toBeNull();
+  });
+
+  it('renders empty input when labels are deleted from outside ', async () => {
+    const { rerender } = setup({ labelsFilters: [{ label: 'foo', op: '=', value: 'bar' }] });
+    expect(screen.getByText(/foo/)).toBeInTheDocument();
+    expect(screen.getByText(/bar/)).toBeInTheDocument();
+    rerender(
+      <LabelFilters
+        onChange={jest.fn()}
+        onGetLabelNames={jest.fn()}
+        getLabelValuesAutofillSuggestions={jest.fn()}
+        onGetLabelValues={jest.fn()}
+        labelsFilters={[]}
+        debounceDuration={300}
+      />
+    );
+    expect(screen.getAllByText('Select label')).toHaveLength(1);
+    expect(screen.getAllByText('Select value')).toHaveLength(1);
+    expect(screen.getByText(/=/)).toBeInTheDocument();
+    expect(getAddButton()).toBeInTheDocument();
+  });
+
+  it('does split regex in the middle of a label value when the value contains the char |', () => {
+    setup({ labelsFilters: [{ label: 'foo', op: '=~', value: 'boop|par' }] });
+
+    expect(screen.getByText('boop')).toBeInTheDocument();
+    expect(screen.getByText('par')).toBeInTheDocument();
+  });
+
+  it('does not split regex in between parentheses inside of a label value that contains the char |', () => {
+    setup({ labelsFilters: [{ label: 'foo', op: '=~', value: '(b|p)ar' }] });
+
+    expect(screen.getByText('(b|p)ar')).toBeInTheDocument();
+  });
+
+  it('shows error when filter with empty strings  and label filter is required', async () => {
+    setup({ labelsFilters: [{ label: '', op: '=', value: '' }], labelFilterRequired: true });
+    expect(screen.getByText(MISSING_LABEL_FILTER_ERROR_MESSAGE)).toBeInTheDocument();
+  });
+
+  it('shows error when no filter and label filter is required', async () => {
+    setup({ labelsFilters: [], labelFilterRequired: true });
+    expect(screen.getByText(MISSING_LABEL_FILTER_ERROR_MESSAGE)).toBeInTheDocument();
+  });
+});
+
+function setup(propOverrides?: Partial<ComponentProps<typeof LabelFilters>>) {
+  const defaultProps: LabelFiltersProps = {
+    onChange: jest.fn(),
+    getLabelValuesAutofillSuggestions: async (query: string, labelName?: string) => [
+      { label: 'bar', value: 'bar' },
+      { label: 'qux', value: 'qux' },
+      { label: 'quux', value: 'quux' },
+    ],
+    onGetLabelNames: async () => [
+      { label: 'foo', value: 'foo' },
+      { label: 'bar', value: 'bar' },
+      { label: 'baz', value: 'baz' },
+    ],
+    onGetLabelValues: async () => [
+      { label: 'bar', value: 'bar' },
+      { label: 'qux', value: 'qux' },
+      { label: 'quux', value: 'quux' },
+    ],
+    debounceDuration: 300,
+    labelsFilters: [],
+  };
+
+  const props = { ...defaultProps, ...propOverrides };
+
+  const { rerender } = render(<LabelFilters {...props} />);
+  return { ...props, rerender };
+}
+
+function getAddButton() {
+  return screen.getByLabelText(/Add/);
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/components/LabelFilters.tsx b/packages/grafana-prometheus/src/querybuilder/components/LabelFilters.tsx
new file mode 100644
index 0000000000000..09f5fd1d82259
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/LabelFilters.tsx
@@ -0,0 +1,114 @@
+import { css, cx } from '@emotion/css';
+import { isEqual } from 'lodash';
+import React, { useEffect, useState } from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { EditorField, EditorFieldGroup, EditorList } from '@grafana/experimental';
+import { InlineFieldRow, InlineLabel } from '@grafana/ui';
+
+import { QueryBuilderLabelFilter } from '../shared/types';
+
+import { LabelFilterItem } from './LabelFilterItem';
+
+export const MISSING_LABEL_FILTER_ERROR_MESSAGE = 'Select at least 1 label filter (label and value)';
+
+export interface LabelFiltersProps {
+  labelsFilters: QueryBuilderLabelFilter[];
+  onChange: (labelFilters: Array<Partial<QueryBuilderLabelFilter>>) => void;
+  onGetLabelNames: (forLabel: Partial<QueryBuilderLabelFilter>) => Promise<SelectableValue[]>;
+  onGetLabelValues: (forLabel: Partial<QueryBuilderLabelFilter>) => Promise<SelectableValue[]>;
+  /** If set to true, component will show error message until at least 1 filter is selected */
+  labelFilterRequired?: boolean;
+  getLabelValuesAutofillSuggestions: (query: string, labelName?: string) => Promise<SelectableValue[]>;
+  debounceDuration: number;
+  variableEditor?: boolean;
+}
+
+export function LabelFilters({
+  labelsFilters,
+  onChange,
+  onGetLabelNames,
+  onGetLabelValues,
+  labelFilterRequired,
+  getLabelValuesAutofillSuggestions,
+  debounceDuration,
+  variableEditor,
+}: LabelFiltersProps) {
+  const defaultOp = '=';
+  const [items, setItems] = useState<Array<Partial<QueryBuilderLabelFilter>>>([{ op: defaultOp }]);
+
+  useEffect(() => {
+    if (labelsFilters.length > 0) {
+      setItems(labelsFilters);
+    } else {
+      setItems([{ op: defaultOp }]);
+    }
+  }, [labelsFilters]);
+
+  const onLabelsChange = (newItems: Array<Partial<QueryBuilderLabelFilter>>) => {
+    setItems(newItems);
+
+    // Extract full label filters with both label & value
+    const newLabels = newItems.filter((x) => x.label != null && x.value != null);
+    if (!isEqual(newLabels, labelsFilters)) {
+      onChange(newLabels);
+    }
+  };
+
+  const hasLabelFilter = items.some((item) => item.label && item.value);
+
+  const editorList = () => {
+    return (
+      <EditorList
+        items={items}
+        onChange={onLabelsChange}
+        renderItem={(item: Partial<QueryBuilderLabelFilter>, onChangeItem, onDelete) => (
+          <LabelFilterItem
+            debounceDuration={debounceDuration}
+            item={item}
+            defaultOp={defaultOp}
+            onChange={onChangeItem}
+            onDelete={onDelete}
+            onGetLabelNames={onGetLabelNames}
+            onGetLabelValues={onGetLabelValues}
+            invalidLabel={labelFilterRequired && !item.label}
+            invalidValue={labelFilterRequired && !item.value}
+            getLabelValuesAutofillSuggestions={getLabelValuesAutofillSuggestions}
+          />
+        )}
+      />
+    );
+  };
+
+  return (
+    <>
+      {variableEditor ? (
+        <InlineFieldRow>
+          <div
+            className={cx(css`
+              display: flex;
+            `)}
+          >
+            <InlineLabel
+              width={20}
+              tooltip={<div>Optional: used to filter the metric select for this query type.</div>}
+            >
+              Label filters
+            </InlineLabel>
+            {editorList()}
+          </div>
+        </InlineFieldRow>
+      ) : (
+        <EditorFieldGroup>
+          <EditorField
+            label="Label filters"
+            error={MISSING_LABEL_FILTER_ERROR_MESSAGE}
+            invalid={labelFilterRequired && !hasLabelFilter}
+          >
+            {editorList()}
+          </EditorField>
+        </EditorFieldGroup>
+      )}
+    </>
+  );
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/components/LabelParamEditor.tsx b/packages/grafana-prometheus/src/querybuilder/components/LabelParamEditor.tsx
new file mode 100644
index 0000000000000..6cf4e9a9b74ca
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/LabelParamEditor.tsx
@@ -0,0 +1,60 @@
+import React, { useState } from 'react';
+
+import { DataSourceApi, SelectableValue, toOption } from '@grafana/data';
+import { Select } from '@grafana/ui';
+
+import { promQueryModeller } from '../PromQueryModeller';
+import { getOperationParamId } from '../operationUtils';
+import { QueryBuilderLabelFilter, QueryBuilderOperationParamEditorProps } from '../shared/types';
+import { PromVisualQuery } from '../types';
+
+export function LabelParamEditor({
+  onChange,
+  index,
+  operationId,
+  value,
+  query,
+  datasource,
+}: QueryBuilderOperationParamEditorProps) {
+  const [state, setState] = useState<{
+    options?: SelectableValue[];
+    isLoading?: boolean;
+  }>({});
+
+  return (
+    <Select
+      inputId={getOperationParamId(operationId, index)}
+      autoFocus={value === '' ? true : undefined}
+      openMenuOnFocus
+      onOpenMenu={async () => {
+        setState({ isLoading: true });
+        const options = await loadGroupByLabels(query, datasource);
+        setState({ options, isLoading: undefined });
+      }}
+      isLoading={state.isLoading}
+      allowCustomValue
+      noOptionsMessage="No labels found"
+      loadingMessage="Loading labels"
+      options={state.options}
+      value={toOption(value as string)}
+      onChange={(value) => onChange(index, value.value!)}
+    />
+  );
+}
+
+async function loadGroupByLabels(query: PromVisualQuery, datasource: DataSourceApi): Promise<SelectableValue[]> {
+  let labels: QueryBuilderLabelFilter[] = query.labels;
+
+  // This function is used by both Prometheus and Loki and this the only difference.
+  if (datasource.type === 'prometheus') {
+    labels = [{ label: '__name__', op: '=', value: query.metric }, ...query.labels];
+  }
+
+  const expr = promQueryModeller.renderLabels(labels);
+  const result = await datasource.languageProvider.fetchLabelsWithMatch(expr);
+
+  return Object.keys(result).map((x) => ({
+    label: x,
+    value: x,
+  }));
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/components/MetricSelect.test.tsx b/packages/grafana-prometheus/src/querybuilder/components/MetricSelect.test.tsx
new file mode 100644
index 0000000000000..a05617688379d
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/MetricSelect.test.tsx
@@ -0,0 +1,191 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { DataSourceInstanceSettings, MetricFindValue } from '@grafana/data';
+
+import { PrometheusDatasource } from '../../datasource';
+import { PromOptions } from '../../types';
+
+import {
+  formatPrometheusLabelFilters,
+  formatPrometheusLabelFiltersToString,
+  MetricSelect,
+  MetricSelectProps,
+} from './MetricSelect';
+
+const instanceSettings = {
+  url: 'proxied',
+  id: 1,
+  user: 'test',
+  password: 'mupp',
+  jsonData: { httpMethod: 'GET' },
+} as unknown as DataSourceInstanceSettings<PromOptions>;
+
+const dataSourceMock = new PrometheusDatasource(instanceSettings);
+const mockValues = [{ label: 'random_metric' }, { label: 'unique_metric' }, { label: 'more_unique_metric' }];
+
+// Mock metricFindQuery which will call backend API
+//@ts-ignore
+dataSourceMock.metricFindQuery = jest.fn((query: string) => {
+  // Use the label values regex to get the values inside the label_values function call
+  const labelValuesRegex = /^label_values\((?:(.+),\s*)?([a-zA-Z_][a-zA-Z0-9_]*)\)\s*$/;
+  const queryValueArray = query.match(labelValuesRegex) as RegExpMatchArray;
+  const queryValueRaw = queryValueArray[1] as string;
+
+  // Remove the wrapping regex
+  const queryValue = queryValueRaw.substring(queryValueRaw.indexOf('".*') + 3, queryValueRaw.indexOf('.*"'));
+
+  // Run the regex that we'd pass into prometheus API against the strings in the test
+  return Promise.resolve(
+    mockValues
+      .filter((value) => value.label.match(queryValue))
+      .map((result) => {
+        return {
+          text: result.label,
+        };
+      }) as MetricFindValue[]
+  );
+});
+
+const props: MetricSelectProps = {
+  labelsFilters: [],
+  datasource: dataSourceMock,
+  query: {
+    metric: '',
+    labels: [],
+    operations: [],
+  },
+  onChange: jest.fn(),
+  onGetMetrics: jest.fn().mockResolvedValue(mockValues),
+  metricLookupDisabled: false,
+};
+
+describe('MetricSelect', () => {
+  it('shows all metric options', async () => {
+    render(<MetricSelect {...props} />);
+    await openMetricSelect();
+    await waitFor(() => expect(screen.getByText('random_metric')).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByText('unique_metric')).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByText('more_unique_metric')).toBeInTheDocument());
+    await waitFor(() => expect(screen.getAllByLabelText('Select option')).toHaveLength(3));
+  });
+
+  it('truncates list of metrics to 1000', async () => {
+    const manyMockValues = [...Array(1001).keys()].map((idx: number) => {
+      return { label: 'random_metric' + idx };
+    });
+
+    props.onGetMetrics = jest.fn().mockResolvedValue(manyMockValues);
+
+    render(<MetricSelect {...props} />);
+    await openMetricSelect();
+    await waitFor(() => expect(screen.getAllByLabelText('Select option')).toHaveLength(1000));
+  });
+
+  it('shows option to set custom value when typing', async () => {
+    render(<MetricSelect {...props} />);
+    await openMetricSelect();
+    const input = screen.getByRole('combobox');
+    await userEvent.type(input, 'custom value');
+    await waitFor(() => expect(screen.getByText('custom value')).toBeInTheDocument());
+  });
+
+  it('shows searched options when typing', async () => {
+    render(<MetricSelect {...props} />);
+    await openMetricSelect();
+    const input = screen.getByRole('combobox');
+    await userEvent.type(input, 'unique');
+    await waitFor(() => expect(screen.getAllByLabelText('Select option')).toHaveLength(3));
+  });
+
+  it('searches on split words', async () => {
+    render(<MetricSelect {...props} />);
+    await openMetricSelect();
+    const input = screen.getByRole('combobox');
+    await userEvent.type(input, 'more unique');
+    await waitFor(() => expect(screen.getAllByLabelText('Select option')).toHaveLength(2));
+  });
+
+  it('searches on multiple split words', async () => {
+    render(<MetricSelect {...props} />);
+    await openMetricSelect();
+    const input = screen.getByRole('combobox');
+    await userEvent.type(input, 'more unique metric');
+    await waitFor(() => expect(screen.getAllByLabelText('Select option')).toHaveLength(2));
+  });
+
+  it('highlights matching string', async () => {
+    render(<MetricSelect {...props} />);
+    await openMetricSelect();
+    const input = screen.getByRole('combobox');
+    await userEvent.type(input, 'more');
+    await waitFor(() => expect(document.querySelectorAll('mark')).toHaveLength(1));
+  });
+
+  it('highlights multiple matching strings in 1 input row', async () => {
+    render(<MetricSelect {...props} />);
+    await openMetricSelect();
+    const input = screen.getByRole('combobox');
+    await userEvent.type(input, 'more metric');
+    await waitFor(() => expect(document.querySelectorAll('mark')).toHaveLength(2));
+  });
+
+  it('highlights multiple matching strings in multiple input rows', async () => {
+    render(<MetricSelect {...props} />);
+    await openMetricSelect();
+    const input = screen.getByRole('combobox');
+    await userEvent.type(input, 'unique metric');
+    await waitFor(() => expect(document.querySelectorAll('mark')).toHaveLength(4));
+  });
+
+  it('does not highlight matching string in create option', async () => {
+    render(<MetricSelect {...props} />);
+    await openMetricSelect();
+    const input = screen.getByRole('combobox');
+    await userEvent.type(input, 'new');
+    await waitFor(() => expect(document.querySelector('mark')).not.toBeInTheDocument());
+  });
+
+  it('label filters properly join', () => {
+    const query = formatPrometheusLabelFilters([
+      {
+        value: 'value',
+        label: 'label',
+        op: '=',
+      },
+      {
+        value: 'value2',
+        label: 'label2',
+        op: '=',
+      },
+    ]);
+    query.forEach((label) => {
+      expect(label.includes(',', 0));
+    });
+  });
+  it('label filter creation', () => {
+    const labels = [
+      {
+        value: 'value',
+        label: 'label',
+        op: '=',
+      },
+      {
+        value: 'value2',
+        label: 'label2',
+        op: '=',
+      },
+    ];
+
+    const queryString = formatPrometheusLabelFiltersToString('query', labels);
+    queryString.split(',').forEach((queryChunk) => {
+      expect(queryChunk.length).toBeGreaterThan(1); // must be longer then ','
+    });
+  });
+});
+
+async function openMetricSelect() {
+  const select = screen.getByText('Select metric').parentElement!;
+  await userEvent.click(select);
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/components/MetricSelect.tsx b/packages/grafana-prometheus/src/querybuilder/components/MetricSelect.tsx
new file mode 100644
index 0000000000000..baa54b5bd6489
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/MetricSelect.tsx
@@ -0,0 +1,423 @@
+import { css } from '@emotion/css';
+import debounce from 'debounce-promise';
+import React, { RefCallback, useCallback, useState } from 'react';
+import Highlighter from 'react-highlight-words';
+
+import { GrafanaTheme2, SelectableValue, toOption } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { EditorField, EditorFieldGroup } from '@grafana/experimental';
+import { config } from '@grafana/runtime';
+import {
+  AsyncSelect,
+  Button,
+  CustomScrollbar,
+  FormatOptionLabelMeta,
+  getSelectStyles,
+  Icon,
+  InlineField,
+  InlineFieldRow,
+  useStyles2,
+  useTheme2,
+} from '@grafana/ui';
+
+import { PrometheusDatasource } from '../../datasource';
+import { SelectMenuOptions } from '../../gcopypaste/packages/grafana-ui/src/components/Select/SelectBase';
+import { truncateResult } from '../../language_utils';
+import { regexifyLabelValuesQueryString } from '../parsingUtils';
+import { QueryBuilderLabelFilter } from '../shared/types';
+import { PromVisualQuery } from '../types';
+
+import { MetricsModal } from './metrics-modal/MetricsModal';
+import { tracking } from './metrics-modal/state/helpers';
+
+// We are matching words split with space
+const splitSeparator = ' ';
+
+export interface MetricSelectProps {
+  metricLookupDisabled: boolean;
+  query: PromVisualQuery;
+  onChange: (query: PromVisualQuery) => void;
+  onGetMetrics: () => Promise<SelectableValue[]>;
+  datasource: PrometheusDatasource;
+  labelsFilters: QueryBuilderLabelFilter[];
+  onBlur?: () => void;
+  variableEditor?: boolean;
+}
+
+export const PROMETHEUS_QUERY_BUILDER_MAX_RESULTS = 1000;
+
+export function MetricSelect({
+  datasource,
+  query,
+  onChange,
+  onGetMetrics,
+  labelsFilters,
+  metricLookupDisabled,
+  onBlur,
+  variableEditor,
+}: MetricSelectProps) {
+  const styles = useStyles2(getStyles);
+  const [state, setState] = useState<{
+    metrics?: Array<SelectableValue<any>>;
+    isLoading?: boolean;
+    metricsModalOpen?: boolean;
+    initialMetrics?: string[];
+    resultsTruncated?: boolean;
+  }>({});
+
+  const prometheusMetricEncyclopedia = config.featureToggles.prometheusMetricEncyclopedia;
+
+  const metricsModalOption: SelectableValue[] = [
+    {
+      value: 'BrowseMetrics',
+      label: 'Metrics explorer',
+      description: 'Browse and filter all metrics and metadata with a fuzzy search',
+    },
+  ];
+
+  const customFilterOption = useCallback(
+    (option: SelectableValue<any>, searchQuery: string) => {
+      const label = option.label ?? option.value;
+      if (!label) {
+        return false;
+      }
+
+      // custom value is not a string label but a react node
+      if (!label.toLowerCase) {
+        return true;
+      }
+
+      const searchWords = searchQuery.split(splitSeparator);
+
+      return searchWords.reduce((acc, cur) => {
+        const matcheSearch = label.toLowerCase().includes(cur.toLowerCase());
+
+        let browseOption = false;
+        if (prometheusMetricEncyclopedia) {
+          browseOption = label === 'Metrics explorer';
+        }
+
+        return acc && (matcheSearch || browseOption);
+      }, true);
+    },
+    [prometheusMetricEncyclopedia]
+  );
+
+  const formatOptionLabel = useCallback(
+    (option: SelectableValue<any>, meta: FormatOptionLabelMeta<any>) => {
+      // For newly created custom value we don't want to add highlight
+      if (option['__isNew__']) {
+        return option.label;
+      }
+      // only matches on input, does not match on regex
+      // look into matching for regex input
+      return (
+        <Highlighter
+          searchWords={meta.inputValue.split(splitSeparator)}
+          textToHighlight={option.label ?? ''}
+          highlightClassName={styles.highlight}
+        />
+      );
+    },
+    [styles.highlight]
+  );
+
+  /**
+   * Reformat the query string and label filters to return all valid results for current query editor state
+   */
+  const formatKeyValueStringsForLabelValuesQuery = (
+    query: string,
+    labelsFilters?: QueryBuilderLabelFilter[]
+  ): string => {
+    const queryString = regexifyLabelValuesQueryString(query);
+
+    return formatPrometheusLabelFiltersToString(queryString, labelsFilters);
+  };
+
+  /**
+   * Gets label_values response from prometheus API for current autocomplete query string and any existing labels filters
+   */
+  const getMetricLabels = (query: string) => {
+    // Since some customers can have millions of metrics, whenever the user changes the autocomplete text we want to call the backend and request all metrics that match the current query string
+    const results = datasource.metricFindQuery(formatKeyValueStringsForLabelValuesQuery(query, labelsFilters));
+    return results.then((results) => {
+      const resultsLength = results.length;
+      truncateResult(results);
+
+      if (resultsLength > results.length) {
+        setState({ ...state, resultsTruncated: true });
+      } else {
+        setState({ ...state, resultsTruncated: false });
+      }
+
+      const resultsOptions = results.map((result) => {
+        return {
+          label: result.text,
+          value: result.text,
+        };
+      });
+
+      if (prometheusMetricEncyclopedia) {
+        return [...metricsModalOption, ...resultsOptions];
+      } else {
+        return resultsOptions;
+      }
+    });
+  };
+
+  // When metric and label lookup is disabled we won't request labels
+  const metricLookupDisabledSearch = () => Promise.resolve([]);
+
+  const debouncedSearch = debounce(
+    (query: string) => getMetricLabels(query),
+    datasource.getDebounceTimeInMilliseconds()
+  );
+
+  // No type found for the common select props so typing as any
+  // https://github.com/grafana/grafana/blob/main/packages/grafana-ui/src/components/Select/SelectBase.tsx/#L212-L263
+  // eslint-disable-next-line
+  const CustomOption = (props: any) => {
+    const option = props.data;
+
+    if (option.value === 'BrowseMetrics') {
+      const isFocused = props.isFocused ? styles.focus : '';
+
+      return (
+        // TODO: fix keyboard a11y
+        // eslint-disable-next-line jsx-a11y/no-static-element-interactions
+        <div
+          {...props.innerProps}
+          ref={props.innerRef}
+          className={`${styles.customOptionWidth} metric-encyclopedia-open`}
+          aria-label="Select option"
+          onKeyDown={(e) => {
+            // if there is no metric and the m.e. is enabled, open the modal
+            if (e.code === 'Enter') {
+              setState({ ...state, metricsModalOpen: true });
+            }
+          }}
+        >
+          {
+            <div className={`${styles.customOption} ${isFocused} metric-encyclopedia-open`}>
+              <div>
+                <div className="metric-encyclopedia-open">{option.label}</div>
+                <div className={`${styles.customOptionDesc} metric-encyclopedia-open`}>{option.description}</div>
+              </div>
+              <Button
+                fill="text"
+                size="sm"
+                variant="secondary"
+                onClick={() => setState({ ...state, metricsModalOpen: true })}
+                className="metric-encyclopedia-open"
+              >
+                Open
+                <Icon name="arrow-right" />
+              </Button>
+            </div>
+          }
+        </div>
+      );
+    }
+
+    return SelectMenuOptions(props);
+  };
+
+  interface SelectMenuProps {
+    maxHeight: number;
+    innerRef: RefCallback<HTMLDivElement>;
+    innerProps: {};
+  }
+
+  const CustomMenu = ({ children, maxHeight, innerRef, innerProps }: React.PropsWithChildren<SelectMenuProps>) => {
+    const theme = useTheme2();
+    const stylesMenu = getSelectStyles(theme);
+
+    // Show the results trucated warning only if the options are loaded and the results are truncated
+    // The children are a react node(options loading node) or an array(not a valid element)
+    const optionsLoaded = !React.isValidElement(children) && state.resultsTruncated;
+
+    return (
+      <div
+        {...innerProps}
+        className={`${stylesMenu.menu} ${styles.customMenuContainer}`}
+        style={{ maxHeight }}
+        aria-label="Select options menu"
+      >
+        <CustomScrollbar scrollRefCallback={innerRef} autoHide={false} autoHeightMax="inherit" hideHorizontalTrack>
+          {children}
+        </CustomScrollbar>
+        {optionsLoaded && (
+          <div className={styles.customMenuFooter}>
+            <div>
+              Only the top 1000 metrics are displayed in the metric select. Use the metrics explorer to view all
+              metrics.
+            </div>
+          </div>
+        )}
+      </div>
+    );
+  };
+
+  const asyncSelect = () => {
+    return (
+      <AsyncSelect
+        data-testid={selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect}
+        isClearable={variableEditor ? true : false}
+        inputId="prometheus-metric-select"
+        className={styles.select}
+        value={query.metric ? toOption(query.metric) : undefined}
+        placeholder={'Select metric'}
+        allowCustomValue
+        formatOptionLabel={formatOptionLabel}
+        filterOption={customFilterOption}
+        onOpenMenu={async () => {
+          if (metricLookupDisabled) {
+            return;
+          }
+          setState({ isLoading: true });
+          const metrics = await onGetMetrics();
+          const initialMetrics: string[] = metrics.map((m) => m.value);
+          const resultsLength = metrics.length;
+
+          if (metrics.length > PROMETHEUS_QUERY_BUILDER_MAX_RESULTS) {
+            truncateResult(metrics);
+          }
+
+          if (prometheusMetricEncyclopedia) {
+            setState({
+              // add the modal butoon option to the options
+              metrics: [...metricsModalOption, ...metrics],
+              isLoading: undefined,
+              // pass the initial metrics into the metrics explorer
+              initialMetrics: initialMetrics,
+              resultsTruncated: resultsLength > metrics.length,
+            });
+          } else {
+            setState({
+              metrics,
+              isLoading: undefined,
+              resultsTruncated: resultsLength > metrics.length,
+            });
+          }
+        }}
+        loadOptions={metricLookupDisabled ? metricLookupDisabledSearch : debouncedSearch}
+        isLoading={state.isLoading}
+        defaultOptions={state.metrics}
+        onChange={(input) => {
+          const value = input?.value;
+          if (value) {
+            // if there is no metric and the m.e. is enabled, open the modal
+            if (prometheusMetricEncyclopedia && value === 'BrowseMetrics') {
+              tracking('grafana_prometheus_metric_encyclopedia_open', null, '', query);
+              setState({ ...state, metricsModalOpen: true });
+            } else {
+              onChange({ ...query, metric: value });
+            }
+          } else {
+            onChange({ ...query, metric: '' });
+          }
+        }}
+        components={
+          prometheusMetricEncyclopedia ? { Option: CustomOption, MenuList: CustomMenu } : { MenuList: CustomMenu }
+        }
+        onBlur={onBlur ? onBlur : () => {}}
+      />
+    );
+  };
+
+  return (
+    <>
+      {prometheusMetricEncyclopedia && !datasource.lookupsDisabled && state.metricsModalOpen && (
+        <MetricsModal
+          datasource={datasource}
+          isOpen={state.metricsModalOpen}
+          onClose={() => setState({ ...state, metricsModalOpen: false })}
+          query={query}
+          onChange={onChange}
+          initialMetrics={state.initialMetrics ?? []}
+        />
+      )}
+      {/* format the ui for either the query editor or the variable editor */}
+      {variableEditor ? (
+        <InlineFieldRow>
+          <InlineField
+            label="Metric"
+            labelWidth={20}
+            tooltip={<div>Optional: returns a list of label values for the label name in the specified metric.</div>}
+          >
+            {asyncSelect()}
+          </InlineField>
+        </InlineFieldRow>
+      ) : (
+        <EditorFieldGroup>
+          <EditorField label="Metric">{asyncSelect()}</EditorField>
+        </EditorFieldGroup>
+      )}
+    </>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  select: css`
+    min-width: 125px;
+  `,
+  highlight: css`
+    label: select__match-highlight;
+    background: inherit;
+    padding: inherit;
+    color: ${theme.colors.warning.contrastText};
+    background-color: ${theme.colors.warning.main};
+  `,
+  customOption: css`
+    padding: 8px;
+    display: flex;
+    justify-content: space-between;
+    cursor: pointer;
+    :hover {
+      background-color: ${theme.colors.emphasize(theme.colors.background.primary, 0.1)};
+    }
+  `,
+  customOptionlabel: css`
+    color: ${theme.colors.text.primary};
+  `,
+  customOptionDesc: css`
+    color: ${theme.colors.text.secondary};
+    font-size: ${theme.typography.size.xs};
+    opacity: 50%;
+  `,
+  focus: css`
+    background-color: ${theme.colors.emphasize(theme.colors.background.primary, 0.1)};
+  `,
+  customOptionWidth: css`
+    min-width: 400px;
+  `,
+  customMenuFooter: css`
+    flex: 0;
+    display: flex;
+    justify-content: space-between;
+    padding: ${theme.spacing(1.5)};
+    border-top: 1px solid ${theme.colors.border.weak};
+    color: ${theme.colors.text.secondary};
+  `,
+  customMenuContainer: css`
+    display: flex;
+    flex-direction: column;
+    background: ${theme.colors.background.primary};
+    box-shadow: ${theme.shadows.z3};
+  `,
+});
+
+export const formatPrometheusLabelFiltersToString = (
+  queryString: string,
+  labelsFilters: QueryBuilderLabelFilter[] | undefined
+): string => {
+  const filterArray = labelsFilters ? formatPrometheusLabelFilters(labelsFilters) : [];
+
+  return `label_values({__name__=~".*${queryString}"${filterArray ? filterArray.join('') : ''}},__name__)`;
+};
+
+export const formatPrometheusLabelFilters = (labelsFilters: QueryBuilderLabelFilter[]): string[] => {
+  return labelsFilters.map((label) => {
+    return `,${label.label}="${label.value}"`;
+  });
+};
diff --git a/packages/grafana-prometheus/src/querybuilder/components/MetricsLabelsSection.tsx b/packages/grafana-prometheus/src/querybuilder/components/MetricsLabelsSection.tsx
new file mode 100644
index 0000000000000..b27af15c16830
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/MetricsLabelsSection.tsx
@@ -0,0 +1,252 @@
+import React, { useCallback } from 'react';
+
+import { SelectableValue } from '@grafana/data';
+
+import { PrometheusDatasource } from '../../datasource';
+import { getMetadataString } from '../../language_provider';
+import { truncateResult } from '../../language_utils';
+import { promQueryModeller } from '../PromQueryModeller';
+import { regexifyLabelValuesQueryString } from '../parsingUtils';
+import { QueryBuilderLabelFilter } from '../shared/types';
+import { PromVisualQuery } from '../types';
+
+import { LabelFilters } from './LabelFilters';
+import { MetricSelect } from './MetricSelect';
+
+export interface MetricsLabelsSectionProps {
+  query: PromVisualQuery;
+  datasource: PrometheusDatasource;
+  onChange: (update: PromVisualQuery) => void;
+  variableEditor?: boolean;
+  onBlur?: () => void;
+}
+
+export function MetricsLabelsSection({
+  datasource,
+  query,
+  onChange,
+  onBlur,
+  variableEditor,
+}: MetricsLabelsSectionProps) {
+  // fixing the use of 'as' from refactoring
+  // @ts-ignore
+  const onChangeLabels = (labels) => {
+    onChange({ ...query, labels });
+  };
+  /**
+   * Map metric metadata to SelectableValue for Select component and also adds defined template variables to the list.
+   */
+  const withTemplateVariableOptions = useCallback(
+    async (optionsPromise: Promise<SelectableValue[]>): Promise<SelectableValue[]> => {
+      const variables = datasource.getVariables();
+      const options = await optionsPromise;
+      return [
+        ...variables.map((value: string) => ({ label: value, value })),
+        ...options.map((option: SelectableValue) => ({
+          label: option.value,
+          value: option.value,
+          title: option.description,
+        })),
+      ];
+    },
+    [datasource]
+  );
+
+  /**
+   * Function kicked off when user interacts with label in label filters.
+   * Formats a promQL expression and passes that off to helper functions depending on API support
+   * @param forLabel
+   */
+  const onGetLabelNames = async (forLabel: Partial<QueryBuilderLabelFilter>): Promise<SelectableValue[]> => {
+    // If no metric we need to use a different method
+    if (!query.metric) {
+      await datasource.languageProvider.fetchLabels();
+      return datasource.languageProvider.getLabelKeys().map((k) => ({ value: k }));
+    }
+
+    const labelsToConsider = query.labels.filter((x) => x !== forLabel);
+    labelsToConsider.push({ label: '__name__', op: '=', value: query.metric });
+    const expr = promQueryModeller.renderLabels(labelsToConsider);
+
+    let labelsIndex: Record<string, string[]> = await datasource.languageProvider.fetchLabelsWithMatch(expr);
+
+    // filter out already used labels
+    return Object.keys(labelsIndex)
+      .filter((labelName) => !labelsToConsider.find((filter) => filter.label === labelName))
+      .map((k) => ({ value: k }));
+  };
+
+  const getLabelValuesAutocompleteSuggestions = (
+    queryString?: string,
+    labelName?: string
+  ): Promise<SelectableValue[]> => {
+    const forLabel = {
+      label: labelName ?? '__name__',
+      op: '=~',
+      value: regexifyLabelValuesQueryString(`.*${queryString}`),
+    };
+    const labelsToConsider = query.labels.filter((x) => x.label !== forLabel.label);
+    labelsToConsider.push(forLabel);
+    if (query.metric) {
+      labelsToConsider.push({ label: '__name__', op: '=', value: query.metric });
+    }
+    const interpolatedLabelsToConsider = labelsToConsider.map((labelObject) => ({
+      ...labelObject,
+      label: datasource.interpolateString(labelObject.label),
+      value: datasource.interpolateString(labelObject.value),
+    }));
+    const expr = promQueryModeller.renderLabels(interpolatedLabelsToConsider);
+    let response: Promise<SelectableValue[]>;
+    if (datasource.hasLabelsMatchAPISupport()) {
+      response = getLabelValuesFromLabelValuesAPI(forLabel, expr);
+    } else {
+      response = getLabelValuesFromSeriesAPI(forLabel, expr);
+    }
+
+    return response.then((response: SelectableValue[]) => {
+      truncateResult(response);
+      return response;
+    });
+  };
+
+  /**
+   * Helper function to fetch and format label value results from legacy API
+   * @param forLabel
+   * @param promQLExpression
+   */
+  const getLabelValuesFromSeriesAPI = (
+    forLabel: Partial<QueryBuilderLabelFilter>,
+    promQLExpression: string
+  ): Promise<SelectableValue[]> => {
+    if (!forLabel.label) {
+      return Promise.resolve([]);
+    }
+    const result = datasource.languageProvider.fetchSeries(promQLExpression);
+    const forLabelInterpolated = datasource.interpolateString(forLabel.label);
+    return result.then((result) => {
+      // This query returns duplicate values, scrub them out
+      const set = new Set<string>();
+      result.forEach((labelValue) => {
+        const labelNameString = labelValue[forLabelInterpolated];
+        set.add(labelNameString);
+      });
+
+      return Array.from(set).map((labelValues: string) => ({ label: labelValues, value: labelValues }));
+    });
+  };
+
+  /**
+   * Helper function to fetch label values from a promql string expression and a label
+   * @param forLabel
+   * @param promQLExpression
+   */
+  const getLabelValuesFromLabelValuesAPI = (
+    forLabel: Partial<QueryBuilderLabelFilter>,
+    promQLExpression: string
+  ): Promise<SelectableValue[]> => {
+    if (!forLabel.label) {
+      return Promise.resolve([]);
+    }
+    return datasource.languageProvider.fetchSeriesValuesWithMatch(forLabel.label, promQLExpression).then((response) => {
+      return response.map((v) => ({
+        value: v,
+        label: v,
+      }));
+    });
+  };
+
+  /**
+   * Function kicked off when users interact with the value of the label filters
+   * Formats a promQL expression and passes that into helper functions depending on API support
+   * @param forLabel
+   */
+  const onGetLabelValues = async (forLabel: Partial<QueryBuilderLabelFilter>): Promise<SelectableValue[]> => {
+    if (!forLabel.label) {
+      return [];
+    }
+    // If no metric is selected, we can get the raw list of labels
+    if (!query.metric) {
+      return (await datasource.languageProvider.getLabelValues(forLabel.label)).map((v) => ({ value: v }));
+    }
+
+    const labelsToConsider = query.labels.filter((x) => x !== forLabel);
+    labelsToConsider.push({ label: '__name__', op: '=', value: query.metric });
+
+    const interpolatedLabelsToConsider = labelsToConsider.map((labelObject) => ({
+      ...labelObject,
+      label: datasource.interpolateString(labelObject.label),
+      value: datasource.interpolateString(labelObject.value),
+    }));
+
+    const expr = promQueryModeller.renderLabels(interpolatedLabelsToConsider);
+
+    if (datasource.hasLabelsMatchAPISupport()) {
+      return getLabelValuesFromLabelValuesAPI(forLabel, expr);
+    } else {
+      return getLabelValuesFromSeriesAPI(forLabel, expr);
+    }
+  };
+
+  const onGetMetrics = useCallback(() => {
+    return withTemplateVariableOptions(getMetrics(datasource, query));
+  }, [datasource, query, withTemplateVariableOptions]);
+
+  return (
+    <>
+      <MetricSelect
+        query={query}
+        onChange={onChange}
+        onGetMetrics={onGetMetrics}
+        datasource={datasource}
+        labelsFilters={query.labels}
+        metricLookupDisabled={datasource.lookupsDisabled}
+        onBlur={onBlur ? onBlur : () => {}}
+        variableEditor={variableEditor}
+      />
+      <LabelFilters
+        debounceDuration={datasource.getDebounceTimeInMilliseconds()}
+        getLabelValuesAutofillSuggestions={getLabelValuesAutocompleteSuggestions}
+        labelsFilters={query.labels}
+        onChange={onChangeLabels}
+        onGetLabelNames={(forLabel) => withTemplateVariableOptions(onGetLabelNames(forLabel))}
+        onGetLabelValues={(forLabel) => withTemplateVariableOptions(onGetLabelValues(forLabel))}
+        variableEditor={variableEditor}
+      />
+    </>
+  );
+}
+
+/**
+ * Returns list of metrics, either all or filtered by query param. It also adds description string to each metric if it
+ * exists.
+ * @param datasource
+ * @param query
+ */
+async function getMetrics(
+  datasource: PrometheusDatasource,
+  query: PromVisualQuery
+): Promise<Array<{ value: string; description?: string }>> {
+  // Makes sure we loaded the metadata for metrics. Usually this is done in the start() method of the provider but we
+  // don't use it with the visual builder and there is no need to run all the start() setup anyway.
+  if (!datasource.languageProvider.metricsMetadata) {
+    await datasource.languageProvider.loadMetricsMetadata();
+  }
+
+  // Error handling for when metrics metadata returns as undefined
+  if (!datasource.languageProvider.metricsMetadata) {
+    datasource.languageProvider.metricsMetadata = {};
+  }
+
+  let metrics: string[];
+  if (query.labels.length > 0) {
+    const expr = promQueryModeller.renderLabels(query.labels);
+    metrics = (await datasource.languageProvider.getSeries(expr, true))['__name__'] ?? [];
+  } else {
+    metrics = (await datasource.languageProvider.getLabelValues('__name__')) ?? [];
+  }
+
+  return metrics.map((m) => ({
+    value: m,
+    description: getMetadataString(m, datasource.languageProvider.metricsMetadata!),
+  }));
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/components/NestedQuery.tsx b/packages/grafana-prometheus/src/querybuilder/components/NestedQuery.tsx
new file mode 100644
index 0000000000000..ecba58984548a
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/NestedQuery.tsx
@@ -0,0 +1,129 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2, toOption } from '@grafana/data';
+import { EditorRows, FlexItem } from '@grafana/experimental';
+import { AutoSizeInput, IconButton, Select, useStyles2 } from '@grafana/ui';
+
+import { PrometheusDatasource } from '../../datasource';
+import { binaryScalarDefs } from '../binaryScalarOperations';
+import { PromVisualQueryBinary } from '../types';
+
+import { PromQueryBuilder } from './PromQueryBuilder';
+
+export interface NestedQueryProps {
+  nestedQuery: PromVisualQueryBinary;
+  datasource: PrometheusDatasource;
+  index: number;
+  onChange: (index: number, update: PromVisualQueryBinary) => void;
+  onRemove: (index: number) => void;
+  onRunQuery: () => void;
+  showExplain: boolean;
+}
+
+export const NestedQuery = React.memo<NestedQueryProps>((props) => {
+  const { nestedQuery, index, datasource, onChange, onRemove, onRunQuery, showExplain } = props;
+  const styles = useStyles2(getStyles);
+
+  return (
+    <div className={styles.card}>
+      <div className={styles.header}>
+        <div className={styles.name}>Operator</div>
+        <Select
+          width="auto"
+          options={operators}
+          value={toOption(nestedQuery.operator)}
+          onChange={(value) => {
+            onChange(index, {
+              ...nestedQuery,
+              operator: value.value!,
+            });
+          }}
+        />
+        <div className={styles.name}>Vector matches</div>
+        <div className={styles.vectorMatchWrapper}>
+          <Select<PromVisualQueryBinary['vectorMatchesType']>
+            width="auto"
+            value={nestedQuery.vectorMatchesType || 'on'}
+            allowCustomValue
+            options={[
+              { value: 'on', label: 'on' },
+              { value: 'ignoring', label: 'ignoring' },
+            ]}
+            onChange={(val) => {
+              onChange(index, {
+                ...nestedQuery,
+                vectorMatchesType: val.value,
+              });
+            }}
+          />
+          <AutoSizeInput
+            className={styles.vectorMatchInput}
+            minWidth={20}
+            defaultValue={nestedQuery.vectorMatches}
+            onCommitChange={(evt) => {
+              onChange(index, {
+                ...nestedQuery,
+                vectorMatches: evt.currentTarget.value,
+                vectorMatchesType: nestedQuery.vectorMatchesType || 'on',
+              });
+            }}
+          />
+        </div>
+        <FlexItem grow={1} />
+        <IconButton name="times" size="sm" onClick={() => onRemove(index)} tooltip="Remove match" />
+      </div>
+      <div className={styles.body}>
+        <EditorRows>
+          <PromQueryBuilder
+            showExplain={showExplain}
+            query={nestedQuery.query}
+            datasource={datasource}
+            onRunQuery={onRunQuery}
+            onChange={(update) => {
+              onChange(index, { ...nestedQuery, query: update });
+            }}
+          />
+        </EditorRows>
+      </div>
+    </div>
+  );
+});
+
+const operators = binaryScalarDefs.map((def) => ({ label: def.sign, value: def.sign }));
+
+NestedQuery.displayName = 'NestedQuery';
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    card: css({
+      label: 'card',
+      display: 'flex',
+      flexDirection: 'column',
+      gap: theme.spacing(0.5),
+    }),
+    header: css({
+      label: 'header',
+      padding: theme.spacing(0.5, 0.5, 0.5, 1),
+      gap: theme.spacing(1),
+      display: 'flex',
+      alignItems: 'center',
+    }),
+    name: css({
+      label: 'name',
+      whiteSpace: 'nowrap',
+    }),
+    body: css({
+      label: 'body',
+      paddingLeft: theme.spacing(2),
+    }),
+    vectorMatchInput: css({
+      label: 'vectorMatchInput',
+      marginLeft: -1,
+    }),
+    vectorMatchWrapper: css({
+      label: 'vectorMatchWrapper',
+      display: 'flex',
+    }),
+  };
+};
diff --git a/packages/grafana-prometheus/src/querybuilder/components/NestedQueryList.tsx b/packages/grafana-prometheus/src/querybuilder/components/NestedQueryList.tsx
new file mode 100644
index 0000000000000..fb9e60229fe14
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/NestedQueryList.tsx
@@ -0,0 +1,49 @@
+import React from 'react';
+
+import { Stack } from '@grafana/ui';
+
+import { PrometheusDatasource } from '../../datasource';
+import { PromVisualQuery, PromVisualQueryBinary } from '../types';
+
+import { NestedQuery } from './NestedQuery';
+
+export interface NestedQueryListProps {
+  query: PromVisualQuery;
+  datasource: PrometheusDatasource;
+  onChange: (query: PromVisualQuery) => void;
+  onRunQuery: () => void;
+  showExplain: boolean;
+}
+
+export function NestedQueryList(props: NestedQueryListProps) {
+  const { query, datasource, onChange, onRunQuery, showExplain } = props;
+  const nestedQueries = query.binaryQueries ?? [];
+
+  const onNestedQueryUpdate = (index: number, update: PromVisualQueryBinary) => {
+    const updatedList = [...nestedQueries];
+    updatedList.splice(index, 1, update);
+    onChange({ ...query, binaryQueries: updatedList });
+  };
+
+  const onRemove = (index: number) => {
+    const updatedList = [...nestedQueries.slice(0, index), ...nestedQueries.slice(index + 1)];
+    onChange({ ...query, binaryQueries: updatedList });
+  };
+
+  return (
+    <Stack direction="column" gap={1}>
+      {nestedQueries.map((nestedQuery, index) => (
+        <NestedQuery
+          key={index.toString()}
+          nestedQuery={nestedQuery}
+          index={index}
+          onChange={onNestedQueryUpdate}
+          datasource={datasource}
+          onRemove={onRemove}
+          onRunQuery={onRunQuery}
+          showExplain={showExplain}
+        />
+      ))}
+    </Stack>
+  );
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilder.test.tsx b/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilder.test.tsx
new file mode 100644
index 0000000000000..54f44c46f1369
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilder.test.tsx
@@ -0,0 +1,392 @@
+import { getByText, render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import {
+  DataSourceInstanceSettings,
+  DataSourcePluginMeta,
+  LoadingState,
+  MutableDataFrame,
+  PanelData,
+  QueryHint,
+  TimeRange,
+} from '@grafana/data';
+import { config, TemplateSrv } from '@grafana/runtime';
+
+import { PrometheusDatasource } from '../../datasource';
+import PromQlLanguageProvider from '../../language_provider';
+import { EmptyLanguageProviderMock } from '../../language_provider.mock';
+import { PromApplication, PromOptions } from '../../types';
+import { getLabelSelects } from '../testUtils';
+import { PromVisualQuery } from '../types';
+
+import { PromQueryBuilder } from './PromQueryBuilder';
+import { EXPLAIN_LABEL_FILTER_CONTENT } from './PromQueryBuilderExplained';
+
+const defaultQuery: PromVisualQuery = {
+  metric: 'random_metric',
+  labels: [],
+  operations: [],
+};
+
+const bugQuery: PromVisualQuery = {
+  metric: 'random_metric',
+  labels: [{ label: 'instance', op: '=', value: 'localhost:9090' }],
+  operations: [
+    {
+      id: 'rate',
+      params: ['auto'],
+    },
+    {
+      id: '__sum_by',
+      params: ['instance', 'job'],
+    },
+  ],
+  binaryQueries: [
+    {
+      operator: '/',
+      query: {
+        metric: 'metric2',
+        labels: [{ label: 'foo', op: '=', value: 'bar' }],
+        operations: [
+          {
+            id: '__avg_by',
+            params: ['app'],
+          },
+        ],
+      },
+    },
+  ],
+};
+
+afterEach(() => {
+  jest.restoreAllMocks();
+});
+
+describe('PromQueryBuilder', () => {
+  it('shows empty just with metric selected', async () => {
+    setup();
+    // Add label
+    expect(screen.getByLabelText('Add')).toBeInTheDocument();
+    expect(screen.getByTitle('Add operation')).toBeInTheDocument();
+  });
+
+  it('renders all the query sections', async () => {
+    setup(bugQuery);
+    expect(screen.getByText('random_metric')).toBeInTheDocument();
+    expect(screen.getByText('localhost:9090')).toBeInTheDocument();
+    expect(screen.getByText('Rate')).toBeInTheDocument();
+    const sumBys = screen.getAllByTestId('operations.1.wrapper');
+    expect(getByText(sumBys[0], 'instance')).toBeInTheDocument();
+    expect(getByText(sumBys[0], 'job')).toBeInTheDocument();
+
+    const avgBys = screen.getAllByTestId('operations.0.wrapper');
+    expect(getByText(avgBys[1], 'app')).toBeInTheDocument();
+    expect(screen.getByText('Operator')).toBeInTheDocument();
+    expect(screen.getByText('Vector matches')).toBeInTheDocument();
+  });
+
+  it('tries to load metrics without labels', async () => {
+    const { languageProvider, container } = setup();
+    await openMetricSelect(container);
+    await waitFor(() => expect(languageProvider.getLabelValues).toBeCalledWith('__name__'));
+  });
+
+  it('tries to load metrics with labels', async () => {
+    const { languageProvider, container } = setup({
+      ...defaultQuery,
+      labels: [{ label: 'label_name', op: '=', value: 'label_value' }],
+    });
+    await openMetricSelect(container);
+    await waitFor(() => expect(languageProvider.getSeries).toBeCalledWith('{label_name="label_value"}', true));
+  });
+
+  it('tries to load variables in metric field', async () => {
+    const { datasource, container } = setup();
+    datasource.getVariables = jest.fn().mockReturnValue([]);
+    await openMetricSelect(container);
+    await waitFor(() => expect(datasource.getVariables).toBeCalled());
+  });
+
+  it('checks if the LLM plugin is enabled when the `prometheusPromQAIL` feature is enabled', async () => {
+    jest.replaceProperty(config, 'featureToggles', {
+      prometheusPromQAIL: true,
+    });
+    const mockIsLLMPluginEnabled = jest.fn();
+    mockIsLLMPluginEnabled.mockResolvedValue(true);
+    jest.spyOn(require('./promQail/state/helpers'), 'isLLMPluginEnabled').mockImplementation(mockIsLLMPluginEnabled);
+    setup();
+    await waitFor(() => expect(mockIsLLMPluginEnabled).toHaveBeenCalledTimes(1));
+  });
+
+  it('does not check if the LLM plugin is enabled when the `prometheusPromQAIL` feature is disabled', async () => {
+    jest.replaceProperty(config, 'featureToggles', {
+      prometheusPromQAIL: false,
+    });
+    const mockIsLLMPluginEnabled = jest.fn();
+    mockIsLLMPluginEnabled.mockResolvedValue(true);
+    jest.spyOn(require('./promQail/state/helpers'), 'isLLMPluginEnabled').mockImplementation(mockIsLLMPluginEnabled);
+    setup();
+    await waitFor(() => expect(mockIsLLMPluginEnabled).toHaveBeenCalledTimes(0));
+  });
+
+  // <LegacyPrometheus>
+  it('tries to load labels when metric selected', async () => {
+    const { languageProvider } = setup();
+    await openLabelNameSelect();
+    await waitFor(() => expect(languageProvider.fetchLabelsWithMatch).toBeCalledWith('{__name__="random_metric"}'));
+  });
+
+  it('tries to load variables in label field', async () => {
+    const { datasource } = setup();
+    datasource.getVariables = jest.fn().mockReturnValue([]);
+    await openLabelNameSelect();
+    await waitFor(() => expect(datasource.getVariables).toBeCalled());
+  });
+
+  it('tries to load labels when metric selected and other labels are already present', async () => {
+    const { languageProvider } = setup({
+      ...defaultQuery,
+      labels: [
+        { label: 'label_name', op: '=', value: 'label_value' },
+        { label: 'foo', op: '=', value: 'bar' },
+      ],
+    });
+    await openLabelNameSelect(1);
+    await waitFor(() =>
+      expect(languageProvider.fetchLabelsWithMatch).toBeCalledWith(
+        '{label_name="label_value", __name__="random_metric"}'
+      )
+    );
+  });
+  //</LegacyPrometheus>
+
+  it('tries to load labels when metric is not selected', async () => {
+    const { languageProvider } = setup({
+      ...defaultQuery,
+      metric: '',
+    });
+    await openLabelNameSelect();
+    await waitFor(() => expect(languageProvider.fetchLabels).toBeCalled());
+  });
+
+  it('shows hints for histogram metrics', async () => {
+    const { container } = setup({
+      metric: 'histogram_metric_bucket',
+      labels: [],
+      operations: [],
+    });
+    await openMetricSelect(container);
+    await userEvent.click(screen.getByText('histogram_metric_bucket'));
+    await waitFor(() => expect(screen.getByText('hint: add histogram_quantile')).toBeInTheDocument());
+  });
+
+  it('shows hints for counter metrics', async () => {
+    const { container } = setup({
+      metric: 'histogram_metric_sum',
+      labels: [],
+      operations: [],
+    });
+    await openMetricSelect(container);
+    await userEvent.click(screen.getByText('histogram_metric_sum'));
+    await waitFor(() => expect(screen.getByText('hint: add rate')).toBeInTheDocument());
+  });
+
+  it('shows hints for counter metrics', async () => {
+    const { container } = setup({
+      metric: 'histogram_metric_sum',
+      labels: [],
+      operations: [],
+    });
+    await openMetricSelect(container);
+    await userEvent.click(screen.getByText('histogram_metric_sum'));
+    await waitFor(() => expect(screen.getByText('hint: add rate')).toBeInTheDocument());
+  });
+
+  it('shows multiple hints', async () => {
+    const data: PanelData = {
+      series: [],
+      state: LoadingState.Done,
+      timeRange: {} as TimeRange,
+    };
+    for (let i = 0; i < 25; i++) {
+      data.series.push(new MutableDataFrame());
+    }
+    const { container } = setup(
+      {
+        metric: 'histogram_metric_sum',
+        labels: [],
+        operations: [],
+      },
+      data
+    );
+    await openMetricSelect(container);
+    await userEvent.click(screen.getByText('histogram_metric_sum'));
+    await waitFor(() => expect(screen.getAllByText(/hint:/)).toHaveLength(2));
+  });
+
+  it('shows explain section when showExplain is true', async () => {
+    const { datasource } = createDatasource();
+    const props = createProps(datasource);
+    props.showExplain = true;
+    render(
+      <PromQueryBuilder
+        {...props}
+        query={{
+          metric: 'histogram_metric_sum',
+          labels: [],
+          operations: [],
+        }}
+      />
+    );
+    expect(await screen.findByText(EXPLAIN_LABEL_FILTER_CONTENT)).toBeInTheDocument();
+  });
+
+  it('does not show explain section when showExplain is false', async () => {
+    const { datasource } = createDatasource();
+    const props = createProps(datasource);
+    render(
+      <PromQueryBuilder
+        {...props}
+        query={{
+          metric: 'histogram_metric_sum',
+          labels: [],
+          operations: [],
+        }}
+      />
+    );
+    expect(await screen.queryByText(EXPLAIN_LABEL_FILTER_CONTENT)).not.toBeInTheDocument();
+  });
+
+  it('renders hint if initial hint provided', async () => {
+    const { datasource } = createDatasource();
+    datasource.getInitHints = (): QueryHint[] => [
+      {
+        label: 'Initial hint',
+        type: 'warning',
+      },
+    ];
+    const props = createProps(datasource);
+    render(
+      <PromQueryBuilder
+        {...props}
+        query={{
+          metric: 'histogram_metric_sum',
+          labels: [],
+          operations: [],
+        }}
+      />
+    );
+    expect(await screen.queryByText('Initial hint')).toBeInTheDocument();
+  });
+
+  it('renders no hint if no initial hint provided', async () => {
+    const { datasource } = createDatasource();
+    datasource.getInitHints = (): QueryHint[] => [];
+    const props = createProps(datasource);
+    render(
+      <PromQueryBuilder
+        {...props}
+        query={{
+          metric: 'histogram_metric_sum',
+          labels: [],
+          operations: [],
+        }}
+      />
+    );
+    expect(await screen.queryByText('Initial hint')).not.toBeInTheDocument();
+  });
+
+  // <ModernPrometheus>
+  it('tries to load labels when metric selected modern prom', async () => {
+    const { languageProvider } = setup(undefined, undefined, {
+      jsonData: { prometheusVersion: '2.38.1', prometheusType: PromApplication.Prometheus },
+    });
+    await openLabelNameSelect();
+    await waitFor(() => expect(languageProvider.fetchLabelsWithMatch).toBeCalledWith('{__name__="random_metric"}'));
+  });
+
+  it('tries to load variables in label field modern prom', async () => {
+    const { datasource } = setup(undefined, undefined, {
+      jsonData: { prometheusVersion: '2.38.1', prometheusType: PromApplication.Prometheus },
+    });
+    datasource.getVariables = jest.fn().mockReturnValue([]);
+    await openLabelNameSelect();
+    await waitFor(() => expect(datasource.getVariables).toBeCalled());
+  });
+
+  it('tries to load labels when metric selected and other labels are already present modern prom', async () => {
+    const { languageProvider } = setup(
+      {
+        ...defaultQuery,
+        labels: [
+          { label: 'label_name', op: '=', value: 'label_value' },
+          { label: 'foo', op: '=', value: 'bar' },
+        ],
+      },
+      undefined,
+      { jsonData: { prometheusVersion: '2.38.1', prometheusType: PromApplication.Prometheus } }
+    );
+    await openLabelNameSelect(1);
+    await waitFor(() =>
+      expect(languageProvider.fetchLabelsWithMatch).toBeCalledWith(
+        '{label_name="label_value", __name__="random_metric"}'
+      )
+    );
+  });
+  //</ModernPrometheus>
+});
+
+function createDatasource(options?: Partial<DataSourceInstanceSettings<PromOptions>>) {
+  const languageProvider = new EmptyLanguageProviderMock() as unknown as PromQlLanguageProvider;
+  const datasource = new PrometheusDatasource(
+    {
+      url: '',
+      jsonData: {},
+      meta: {} as DataSourcePluginMeta,
+      ...options,
+    } as DataSourceInstanceSettings<PromOptions>,
+    mockTemplateSrv(),
+    languageProvider
+  );
+  return { datasource, languageProvider };
+}
+
+function createProps(datasource: PrometheusDatasource, data?: PanelData) {
+  return {
+    datasource,
+    onRunQuery: () => {},
+    onChange: () => {},
+    data,
+    showExplain: false,
+  };
+}
+
+function setup(
+  query: PromVisualQuery = defaultQuery,
+  data?: PanelData,
+  datasourceOptionsOverride?: Partial<DataSourceInstanceSettings<PromOptions>>
+) {
+  const { datasource, languageProvider } = createDatasource(datasourceOptionsOverride);
+  const props = createProps(datasource, data);
+  const { container } = render(<PromQueryBuilder {...props} query={query} />);
+  return { languageProvider, datasource, container };
+}
+
+async function openMetricSelect(container: HTMLElement) {
+  const select = container.querySelector('#prometheus-metric-select');
+  if (select) {
+    await userEvent.click(select);
+  }
+}
+
+async function openLabelNameSelect(index = 0) {
+  const { name } = getLabelSelects(index);
+  await userEvent.click(name);
+}
+
+function mockTemplateSrv(): TemplateSrv {
+  return {
+    getVariables: () => [],
+  } as unknown as TemplateSrv;
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilder.tsx b/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilder.tsx
new file mode 100644
index 0000000000000..e05b1c2caa258
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilder.tsx
@@ -0,0 +1,149 @@
+import { css } from '@emotion/css';
+import React, { useEffect, useState } from 'react';
+
+import { DataSourceApi, PanelData } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { EditorRow } from '@grafana/experimental';
+import { config } from '@grafana/runtime';
+import { Drawer } from '@grafana/ui';
+
+import { PrometheusDatasource } from '../../datasource';
+import promqlGrammar from '../../promql';
+import { promQueryModeller } from '../PromQueryModeller';
+import { buildVisualQueryFromString } from '../parsing';
+import { OperationExplainedBox } from '../shared/OperationExplainedBox';
+import { OperationList } from '../shared/OperationList';
+import { OperationListExplained } from '../shared/OperationListExplained';
+import { OperationsEditorRow } from '../shared/OperationsEditorRow';
+import { QueryBuilderHints } from '../shared/QueryBuilderHints';
+import { RawQuery } from '../shared/RawQuery';
+import { QueryBuilderOperation } from '../shared/types';
+import { PromVisualQuery } from '../types';
+
+import { MetricsLabelsSection } from './MetricsLabelsSection';
+import { NestedQueryList } from './NestedQueryList';
+import { EXPLAIN_LABEL_FILTER_CONTENT } from './PromQueryBuilderExplained';
+import { PromQail } from './promQail/PromQail';
+import { QueryAssistantButton } from './promQail/QueryAssistantButton';
+import { isLLMPluginEnabled } from './promQail/state/helpers';
+
+export interface PromQueryBuilderProps {
+  query: PromVisualQuery;
+  datasource: PrometheusDatasource;
+  onChange: (update: PromVisualQuery) => void;
+  onRunQuery: () => void;
+  data?: PanelData;
+  showExplain: boolean;
+}
+
+export const PromQueryBuilder = React.memo<PromQueryBuilderProps>((props) => {
+  const { datasource, query, onChange, onRunQuery, data, showExplain } = props;
+  const [highlightedOp, setHighlightedOp] = useState<QueryBuilderOperation | undefined>();
+  const [showDrawer, setShowDrawer] = useState<boolean>(false);
+  const [llmAppEnabled, updateLlmAppEnabled] = useState<boolean>(false);
+  const { prometheusPromQAIL } = config.featureToggles; // AI/ML + Prometheus
+
+  const lang = { grammar: promqlGrammar, name: 'promql' };
+
+  const initHints = datasource.getInitHints();
+
+  useEffect(() => {
+    async function checkLlms() {
+      const check = await isLLMPluginEnabled();
+      updateLlmAppEnabled(check);
+    }
+
+    if (prometheusPromQAIL) {
+      checkLlms();
+    }
+  }, [prometheusPromQAIL]);
+
+  return (
+    <>
+      {prometheusPromQAIL && showDrawer && (
+        <Drawer closeOnMaskClick={false} onClose={() => setShowDrawer(false)}>
+          <PromQail
+            query={query}
+            closeDrawer={() => setShowDrawer(false)}
+            onChange={onChange}
+            datasource={datasource}
+          />
+        </Drawer>
+      )}
+      <EditorRow>
+        <MetricsLabelsSection query={query} onChange={onChange} datasource={datasource} />
+      </EditorRow>
+      {initHints.length ? (
+        <div className="query-row-break">
+          <div className="prom-query-field-info text-warning">
+            {initHints[0].label}{' '}
+            {initHints[0].fix ? (
+              <button type="button" className={'text-warning'}>
+                {initHints[0].fix.label}
+              </button>
+            ) : null}
+          </div>
+        </div>
+      ) : null}
+      {showExplain && (
+        <OperationExplainedBox
+          stepNumber={1}
+          title={<RawQuery query={`${query.metric} ${promQueryModeller.renderLabels(query.labels)}`} lang={lang} />}
+        >
+          {EXPLAIN_LABEL_FILTER_CONTENT}
+        </OperationExplainedBox>
+      )}
+      <OperationsEditorRow>
+        <OperationList<PromVisualQuery>
+          queryModeller={promQueryModeller}
+          // eslint-ignore
+          datasource={datasource as DataSourceApi}
+          query={query}
+          onChange={onChange}
+          onRunQuery={onRunQuery}
+          highlightedOp={highlightedOp}
+        />
+        {prometheusPromQAIL && (
+          <div
+            className={css({
+              padding: '0 0 0 6px',
+            })}
+          >
+            <QueryAssistantButton llmAppEnabled={llmAppEnabled} metric={query.metric} setShowDrawer={setShowDrawer} />
+          </div>
+        )}
+        <div data-testid={selectors.components.DataSource.Prometheus.queryEditor.builder.hints}>
+          <QueryBuilderHints<PromVisualQuery>
+            datasource={datasource}
+            query={query}
+            onChange={onChange}
+            data={data}
+            queryModeller={promQueryModeller}
+            buildVisualQueryFromString={buildVisualQueryFromString}
+          />
+        </div>
+      </OperationsEditorRow>
+      {showExplain && (
+        <OperationListExplained<PromVisualQuery>
+          lang={lang}
+          query={query}
+          stepNumber={2}
+          queryModeller={promQueryModeller}
+          onMouseEnter={(op) => setHighlightedOp(op)}
+          onMouseLeave={() => setHighlightedOp(undefined)}
+        />
+      )}
+      {query.binaryQueries && query.binaryQueries.length > 0 && (
+        <NestedQueryList
+          query={query}
+          datasource={datasource}
+          onChange={onChange}
+          onRunQuery={onRunQuery}
+          showExplain={showExplain}
+        />
+      )}
+    </>
+  );
+});
+
+PromQueryBuilder.displayName = 'PromQueryBuilder';
diff --git a/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilderContainer.test.tsx b/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilderContainer.test.tsx
new file mode 100644
index 0000000000000..5172172fd32a3
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilderContainer.test.tsx
@@ -0,0 +1,64 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { DataSourceInstanceSettings, DataSourcePluginMeta } from '@grafana/data';
+
+import { PrometheusDatasource } from '../../datasource';
+import PromQlLanguageProvider from '../../language_provider';
+import { EmptyLanguageProviderMock } from '../../language_provider.mock';
+import { PromQuery } from '../../types';
+import { getOperationParamId } from '../operationUtils';
+import { addOperationInQueryBuilder } from '../testUtils';
+
+import { PromQueryBuilderContainer } from './PromQueryBuilderContainer';
+
+describe('PromQueryBuilderContainer', () => {
+  it('translates query between string and model', async () => {
+    const { props } = setup({ expr: 'rate(metric_test{job="testjob"}[$__rate_interval])' });
+
+    expect(screen.getByText('metric_test')).toBeInTheDocument();
+    await addOperationInQueryBuilder('Range functions', 'Rate');
+    expect(props.onChange).toBeCalledWith({
+      expr: 'rate(metric_test{job="testjob"}[$__rate_interval])',
+      refId: 'A',
+    });
+  });
+
+  it('Can add rest param', async () => {
+    const { container } = setup({ expr: 'sum(ALERTS)' });
+    await userEvent.click(screen.getByTestId('operations.0.add-rest-param'));
+
+    waitFor(() => {
+      expect(container.querySelector(`${getOperationParamId('0', 0)}`)).toBeInTheDocument();
+    });
+  });
+});
+
+function setup(queryOverrides: Partial<PromQuery> = {}) {
+  const languageProvider = new EmptyLanguageProviderMock() as unknown as PromQlLanguageProvider;
+  const datasource = new PrometheusDatasource(
+    {
+      url: '',
+      jsonData: {},
+      meta: {} as DataSourcePluginMeta,
+    } as DataSourceInstanceSettings,
+    undefined,
+    languageProvider
+  );
+
+  const props = {
+    datasource,
+    query: {
+      refId: 'A',
+      expr: '',
+      ...queryOverrides,
+    },
+    onRunQuery: jest.fn(),
+    onChange: jest.fn(),
+    showExplain: false,
+  };
+
+  const { container } = render(<PromQueryBuilderContainer {...props} />);
+  return { languageProvider, datasource, container, props };
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilderContainer.tsx b/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilderContainer.tsx
new file mode 100644
index 0000000000000..46d3dc0562585
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilderContainer.tsx
@@ -0,0 +1,121 @@
+import { createSlice, PayloadAction } from '@reduxjs/toolkit';
+import React, { useEffect, useReducer } from 'react';
+
+import { PanelData } from '@grafana/data';
+import { config } from '@grafana/runtime';
+
+import { PrometheusDatasource } from '../../datasource';
+import { PromQuery } from '../../types';
+import { promQueryModeller } from '../PromQueryModeller';
+import { buildVisualQueryFromString } from '../parsing';
+import { PromVisualQuery } from '../types';
+
+import { PromQueryBuilder } from './PromQueryBuilder';
+import { QueryPreview } from './QueryPreview';
+import { getSettings, MetricsModalSettings } from './metrics-modal/state/state';
+
+export interface PromQueryBuilderContainerProps {
+  query: PromQuery;
+  datasource: PrometheusDatasource;
+  onChange: (update: PromQuery) => void;
+  onRunQuery: () => void;
+  data?: PanelData;
+  showExplain: boolean;
+}
+
+export interface State {
+  visQuery?: PromVisualQuery;
+  expr: string;
+}
+
+const prometheusMetricEncyclopedia = config.featureToggles.prometheusMetricEncyclopedia;
+
+/**
+ * This component is here just to contain the translation logic between string query and the visual query builder model.
+ */
+export function PromQueryBuilderContainer(props: PromQueryBuilderContainerProps) {
+  const { query, onChange, onRunQuery, datasource, data, showExplain } = props;
+  const [state, dispatch] = useReducer(stateSlice.reducer, { expr: query.expr });
+  // Only rebuild visual query if expr changes from outside
+  useEffect(() => {
+    dispatch(exprChanged(query.expr));
+
+    if (prometheusMetricEncyclopedia) {
+      dispatch(
+        setMetricsModalSettings({
+          useBackend: query.useBackend ?? false,
+          disableTextWrap: query.disableTextWrap ?? false,
+          fullMetaSearch: query.fullMetaSearch ?? false,
+          includeNullMetadata: query.includeNullMetadata ?? true,
+        })
+      );
+    }
+  }, [query]);
+
+  useEffect(() => {
+    datasource.languageProvider.start(data?.timeRange);
+  }, [data?.timeRange, datasource.languageProvider]);
+
+  const onVisQueryChange = (visQuery: PromVisualQuery) => {
+    const expr = promQueryModeller.renderQuery(visQuery);
+    dispatch(visualQueryChange({ visQuery, expr }));
+
+    if (prometheusMetricEncyclopedia) {
+      const metricsModalSettings = getSettings(visQuery);
+      onChange({ ...props.query, expr: expr, ...metricsModalSettings });
+    } else {
+      onChange({ ...props.query, expr: expr });
+    }
+  };
+
+  if (!state.visQuery) {
+    return null;
+  }
+
+  return (
+    <>
+      <PromQueryBuilder
+        query={state.visQuery}
+        datasource={datasource}
+        onChange={onVisQueryChange}
+        onRunQuery={onRunQuery}
+        data={data}
+        showExplain={showExplain}
+      />
+      {<QueryPreview query={query.expr} />}
+    </>
+  );
+}
+
+const initialState: State = {
+  expr: '',
+};
+
+const stateSlice = createSlice({
+  name: 'prom-builder-container',
+  initialState,
+  reducers: {
+    visualQueryChange: (state, action: PayloadAction<{ visQuery: PromVisualQuery; expr: string }>) => {
+      state.expr = action.payload.expr;
+      state.visQuery = action.payload.visQuery;
+    },
+    exprChanged: (state, action: PayloadAction<string>) => {
+      if (!state.visQuery || state.expr !== action.payload) {
+        state.expr = action.payload;
+        const parseResult = buildVisualQueryFromString(action.payload ?? '');
+
+        state.visQuery = parseResult.query;
+      }
+    },
+    setMetricsModalSettings: (state, action: PayloadAction<MetricsModalSettings>) => {
+      if (state.visQuery && prometheusMetricEncyclopedia) {
+        state.visQuery.useBackend = action.payload.useBackend;
+        state.visQuery.disableTextWrap = action.payload.disableTextWrap;
+        state.visQuery.fullMetaSearch = action.payload.fullMetaSearch;
+        state.visQuery.includeNullMetadata = action.payload.includeNullMetadata;
+      }
+    },
+  },
+});
+
+const { visualQueryChange, exprChanged, setMetricsModalSettings } = stateSlice.actions;
diff --git a/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilderExplained.tsx b/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilderExplained.tsx
new file mode 100644
index 0000000000000..38389fbc6e480
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilderExplained.tsx
@@ -0,0 +1,41 @@
+import React from 'react';
+
+import { Stack } from '@grafana/ui';
+
+import promqlGrammar from '../../promql';
+import { promQueryModeller } from '../PromQueryModeller';
+import { buildVisualQueryFromString } from '../parsing';
+import { OperationExplainedBox } from '../shared/OperationExplainedBox';
+import { OperationListExplained } from '../shared/OperationListExplained';
+import { RawQuery } from '../shared/RawQuery';
+import { PromVisualQuery } from '../types';
+
+export const EXPLAIN_LABEL_FILTER_CONTENT = 'Fetch all series matching metric name and label filters.';
+
+export interface PromQueryBuilderExplainedProps {
+  query: string;
+}
+
+export const PromQueryBuilderExplained = React.memo<PromQueryBuilderExplainedProps>(({ query }) => {
+  const visQuery = buildVisualQueryFromString(query || '').query;
+  const lang = { grammar: promqlGrammar, name: 'promql' };
+
+  return (
+    <Stack gap={0.5} direction="column">
+      <OperationExplainedBox
+        stepNumber={1}
+        title={<RawQuery query={`${visQuery.metric} ${promQueryModeller.renderLabels(visQuery.labels)}`} lang={lang} />}
+      >
+        {EXPLAIN_LABEL_FILTER_CONTENT}
+      </OperationExplainedBox>
+      <OperationListExplained<PromVisualQuery>
+        stepNumber={2}
+        queryModeller={promQueryModeller}
+        query={visQuery}
+        lang={lang}
+      />
+    </Stack>
+  );
+});
+
+PromQueryBuilderExplained.displayName = 'PromQueryBuilderExplained';
diff --git a/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilderOptions.test.tsx b/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilderOptions.test.tsx
new file mode 100644
index 0000000000000..331092c1962d6
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilderOptions.test.tsx
@@ -0,0 +1,134 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { CoreApp } from '@grafana/data';
+
+import { selectOptionInTest } from '../../gcopypaste/test/helpers/selectOptionInTest';
+import { PromQuery } from '../../types';
+import { getQueryWithDefaults } from '../state';
+
+import { PromQueryBuilderOptions } from './PromQueryBuilderOptions';
+
+describe('PromQueryBuilderOptions', () => {
+  it('Can change query type', async () => {
+    const { props } = setup();
+
+    await userEvent.click(screen.getByRole('button', { name: /Options/ }));
+    expect(screen.getByLabelText('Range')).toBeChecked();
+
+    await userEvent.click(screen.getByLabelText('Instant'));
+
+    expect(props.onChange).toHaveBeenCalledWith({
+      ...props.query,
+      instant: true,
+      range: false,
+      exemplar: false,
+    });
+  });
+
+  it('Can set query type to "Both" on render for PanelEditor', async () => {
+    setup({ instant: true, range: true });
+
+    await userEvent.click(screen.getByRole('button', { name: /Options/ }));
+
+    expect(screen.getByLabelText('Both')).toBeChecked();
+  });
+
+  it('Can set query type to "Both" on render for Explorer', async () => {
+    setup({ instant: true, range: true }, CoreApp.Explore);
+
+    await userEvent.click(screen.getByRole('button', { name: /Options/ }));
+
+    expect(screen.getByLabelText('Both')).toBeChecked();
+  });
+
+  it('Legend format default to Auto', () => {
+    setup();
+    expect(screen.getByText('Legend: Auto')).toBeInTheDocument();
+  });
+
+  it('Can change legend format to verbose', async () => {
+    const { props } = setup();
+
+    await userEvent.click(screen.getByRole('button', { name: /Options/ }));
+
+    let legendModeSelect = screen.getByText('Auto').parentElement!;
+    await userEvent.click(legendModeSelect);
+
+    await selectOptionInTest(legendModeSelect, 'Verbose');
+
+    expect(props.onChange).toHaveBeenCalledWith({
+      ...props.query,
+      legendFormat: '',
+    });
+  });
+
+  it('Can change legend format to custom', async () => {
+    const { props } = setup();
+
+    await userEvent.click(screen.getByRole('button', { name: /Options/ }));
+
+    let legendModeSelect = screen.getByText('Auto').parentElement!;
+    await userEvent.click(legendModeSelect);
+
+    await selectOptionInTest(legendModeSelect, 'Custom');
+
+    expect(props.onChange).toHaveBeenCalledWith({
+      ...props.query,
+      legendFormat: '{{label_name}}',
+    });
+  });
+
+  it('Handle defaults with undefined range', () => {
+    setup(getQueryWithDefaults({ refId: 'A', expr: '', range: undefined, instant: true }, CoreApp.Dashboard));
+
+    expect(screen.getByText('Type: Instant')).toBeInTheDocument();
+  });
+
+  it('Should show "Exemplars: false" by default', () => {
+    setup();
+    expect(screen.getByText('Exemplars: false')).toBeInTheDocument();
+  });
+
+  it('Should show "Exemplars: false" when query has "Exemplars: false"', () => {
+    setup({ exemplar: false });
+    expect(screen.getByText('Exemplars: false')).toBeInTheDocument();
+  });
+
+  it('Should show "Exemplars: true" when query has "Exemplars: true"', () => {
+    setup({ exemplar: true });
+    expect(screen.getByText('Exemplars: true')).toBeInTheDocument();
+  });
+});
+
+function setup(queryOverrides: Partial<PromQuery> = {}, app: CoreApp = CoreApp.PanelEditor) {
+  const props = {
+    app,
+    query: {
+      ...getQueryWithDefaults(
+        {
+          refId: 'A',
+          expr: '',
+          range: true,
+          instant: false,
+        } as PromQuery,
+        CoreApp.PanelEditor
+      ),
+      ...queryOverrides,
+    },
+    onRunQuery: jest.fn(),
+    onChange: jest.fn(),
+    uiOptions: {
+      exemplars: true,
+      type: true,
+      format: true,
+      minStep: true,
+      legend: true,
+      resolution: true,
+    },
+  };
+
+  const { container } = render(<PromQueryBuilderOptions {...props} />);
+  return { container, props };
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilderOptions.tsx b/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilderOptions.tsx
new file mode 100644
index 0000000000000..79f93db2fe759
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilderOptions.tsx
@@ -0,0 +1,165 @@
+import React, { SyntheticEvent } from 'react';
+
+import { CoreApp, SelectableValue } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { EditorField, EditorRow, EditorSwitch } from '@grafana/experimental';
+import { AutoSizeInput, RadioButtonGroup, Select } from '@grafana/ui';
+
+import { getQueryTypeChangeHandler, getQueryTypeOptions } from '../../components/PromExploreExtraField';
+import { PromQueryFormat } from '../../dataquery';
+import { PromQuery } from '../../types';
+import { QueryOptionGroup } from '../shared/QueryOptionGroup';
+
+import { FORMAT_OPTIONS, INTERVAL_FACTOR_OPTIONS } from './PromQueryEditorSelector';
+import { getLegendModeLabel, PromQueryLegendEditor } from './PromQueryLegendEditor';
+
+export interface UIOptions {
+  exemplars: boolean;
+  type: boolean;
+  format: boolean;
+  minStep: boolean;
+  legend: boolean;
+  resolution: boolean;
+}
+
+export interface PromQueryBuilderOptionsProps {
+  query: PromQuery;
+  app?: CoreApp;
+  onChange: (update: PromQuery) => void;
+  onRunQuery: () => void;
+}
+
+export const PromQueryBuilderOptions = React.memo<PromQueryBuilderOptionsProps>(
+  ({ query, app, onChange, onRunQuery }) => {
+    const onChangeFormat = (value: SelectableValue<PromQueryFormat>) => {
+      onChange({ ...query, format: value.value });
+      onRunQuery();
+    };
+
+    const onChangeStep = (evt: React.FormEvent<HTMLInputElement>) => {
+      onChange({ ...query, interval: evt.currentTarget.value.trim() });
+      onRunQuery();
+    };
+
+    const queryTypeOptions = getQueryTypeOptions(
+      app === CoreApp.Explore || app === CoreApp.Correlations || app === CoreApp.PanelEditor
+    );
+
+    const onQueryTypeChange = getQueryTypeChangeHandler(query, onChange);
+
+    const onExemplarChange = (event: SyntheticEvent<HTMLInputElement>) => {
+      const isEnabled = event.currentTarget.checked;
+      onChange({ ...query, exemplar: isEnabled });
+      onRunQuery();
+    };
+
+    const onIntervalFactorChange = (value: SelectableValue<number>) => {
+      onChange({ ...query, intervalFactor: value.value });
+      onRunQuery();
+    };
+
+    const formatOption = FORMAT_OPTIONS.find((option) => option.value === query.format) || FORMAT_OPTIONS[0];
+    const queryTypeValue = getQueryTypeValue(query);
+    const queryTypeLabel = queryTypeOptions.find((x) => x.value === queryTypeValue)!.label;
+
+    return (
+      <EditorRow>
+        <div data-testid={selectors.components.DataSource.Prometheus.queryEditor.options}>
+          <QueryOptionGroup
+            title="Options"
+            collapsedInfo={getCollapsedInfo(query, formatOption.label!, queryTypeLabel, app)}
+          >
+            <PromQueryLegendEditor
+              legendFormat={query.legendFormat}
+              onChange={(legendFormat) => onChange({ ...query, legendFormat })}
+              onRunQuery={onRunQuery}
+            />
+            <EditorField
+              label="Min step"
+              tooltip={
+                <>
+                  An additional lower limit for the step parameter of the Prometheus query and for the{' '}
+                  <code>$__interval</code> and <code>$__rate_interval</code> variables.
+                </>
+              }
+            >
+              <AutoSizeInput
+                type="text"
+                aria-label="Set lower limit for the step parameter"
+                placeholder={'auto'}
+                minWidth={10}
+                onCommitChange={onChangeStep}
+                defaultValue={query.interval}
+                id={selectors.components.DataSource.Prometheus.queryEditor.step}
+              />
+            </EditorField>
+            <EditorField label="Format">
+              <Select
+                data-testid={selectors.components.DataSource.Prometheus.queryEditor.format}
+                value={formatOption}
+                allowCustomValue
+                onChange={onChangeFormat}
+                options={FORMAT_OPTIONS}
+              />
+            </EditorField>
+            <EditorField label="Type" data-testid={selectors.components.DataSource.Prometheus.queryEditor.type}>
+              <RadioButtonGroup options={queryTypeOptions} value={queryTypeValue} onChange={onQueryTypeChange} />
+            </EditorField>
+            {shouldShowExemplarSwitch(query, app) && (
+              <EditorField label="Exemplars">
+                <EditorSwitch
+                  value={query.exemplar || false}
+                  onChange={onExemplarChange}
+                  id={selectors.components.DataSource.Prometheus.queryEditor.exemplars}
+                />
+              </EditorField>
+            )}
+            {query.intervalFactor && query.intervalFactor > 1 && (
+              <EditorField label="Resolution">
+                <Select
+                  aria-label="Select resolution"
+                  isSearchable={false}
+                  options={INTERVAL_FACTOR_OPTIONS}
+                  onChange={onIntervalFactorChange}
+                  value={INTERVAL_FACTOR_OPTIONS.find((option) => option.value === query.intervalFactor)}
+                />
+              </EditorField>
+            )}
+          </QueryOptionGroup>
+        </div>
+      </EditorRow>
+    );
+  }
+);
+
+function shouldShowExemplarSwitch(query: PromQuery, app?: CoreApp) {
+  if (app === CoreApp.UnifiedAlerting || !query.range) {
+    return false;
+  }
+
+  return true;
+}
+
+function getQueryTypeValue(query: PromQuery) {
+  return query.range && query.instant ? 'both' : query.instant ? 'instant' : 'range';
+}
+
+function getCollapsedInfo(query: PromQuery, formatOption: string, queryType: string, app?: CoreApp): string[] {
+  const items: string[] = [];
+
+  items.push(`Legend: ${getLegendModeLabel(query.legendFormat)}`);
+  items.push(`Format: ${formatOption}`);
+  items.push(`Step: ${query.interval ?? 'auto'}`);
+  items.push(`Type: ${queryType}`);
+
+  if (shouldShowExemplarSwitch(query, app)) {
+    if (query.exemplar) {
+      items.push(`Exemplars: true`);
+    } else {
+      items.push(`Exemplars: false`);
+    }
+  }
+  return items;
+}
+
+PromQueryBuilderOptions.displayName = 'PromQueryBuilderOptions';
diff --git a/packages/grafana-prometheus/src/querybuilder/components/PromQueryCodeEditor.test.tsx b/packages/grafana-prometheus/src/querybuilder/components/PromQueryCodeEditor.test.tsx
new file mode 100644
index 0000000000000..5554f33997dc5
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/PromQueryCodeEditor.test.tsx
@@ -0,0 +1,64 @@
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+
+import { DataSourceInstanceSettings, DataSourcePluginMeta } from '@grafana/data';
+
+import { PrometheusDatasource } from '../../datasource';
+import PromQlLanguageProvider from '../../language_provider';
+import { EmptyLanguageProviderMock } from '../../language_provider.mock';
+
+import { EXPLAIN_LABEL_FILTER_CONTENT } from './PromQueryBuilderExplained';
+import { PromQueryCodeEditor } from './PromQueryCodeEditor';
+
+jest.mock('../../components/monaco-query-field/MonacoQueryFieldWrapper', () => {
+  const fakeQueryField = () => <div>prometheus query field</div>;
+  return { MonacoQueryFieldWrapper: fakeQueryField };
+});
+
+function createDatasource() {
+  const languageProvider = new EmptyLanguageProviderMock() as unknown as PromQlLanguageProvider;
+  const datasource = new PrometheusDatasource(
+    {
+      url: '',
+      jsonData: {},
+      meta: {} as DataSourcePluginMeta,
+    } as DataSourceInstanceSettings,
+    undefined,
+    languageProvider
+  );
+  return { datasource, languageProvider };
+}
+
+function createProps(datasource: PrometheusDatasource) {
+  return {
+    datasource,
+    onRunQuery: () => {},
+    onChange: () => {},
+    showExplain: false,
+  };
+}
+
+describe('PromQueryCodeEditor', () => {
+  it('shows explain section when showExplain is true', async () => {
+    const { datasource } = createDatasource();
+    const props = createProps(datasource);
+    props.showExplain = true;
+    render(<PromQueryCodeEditor {...props} query={{ expr: '', refId: 'refid', interval: '1s' }} />);
+
+    // wait for component to render
+    await screen.findByRole('button');
+
+    expect(screen.getByText(EXPLAIN_LABEL_FILTER_CONTENT)).toBeInTheDocument();
+  });
+
+  it('does not show explain section when showExplain is false', async () => {
+    const { datasource } = createDatasource();
+    const props = createProps(datasource);
+    render(<PromQueryCodeEditor {...props} query={{ expr: '', refId: 'refid', interval: '1s' }} />);
+
+    // wait for component to render
+    await screen.findByRole('button');
+
+    expect(screen.queryByText(EXPLAIN_LABEL_FILTER_CONTENT)).not.toBeInTheDocument();
+  });
+});
diff --git a/packages/grafana-prometheus/src/querybuilder/components/PromQueryCodeEditor.tsx b/packages/grafana-prometheus/src/querybuilder/components/PromQueryCodeEditor.tsx
new file mode 100644
index 0000000000000..75bc63055e648
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/PromQueryCodeEditor.tsx
@@ -0,0 +1,52 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { useStyles2 } from '@grafana/ui';
+
+import { PromQueryField } from '../../components/PromQueryField';
+import { PromQueryEditorProps } from '../../components/types';
+
+import { PromQueryBuilderExplained } from './PromQueryBuilderExplained';
+
+type PromQueryCodeEditorProps = PromQueryEditorProps & {
+  showExplain: boolean;
+};
+
+export function PromQueryCodeEditor(props: PromQueryCodeEditorProps) {
+  const { query, datasource, range, onRunQuery, onChange, data, app, showExplain } = props;
+  const styles = useStyles2(getStyles);
+
+  return (
+    <div
+      data-testid={selectors.components.DataSource.Prometheus.queryEditor.code.queryField}
+      className={styles.wrapper}
+    >
+      <PromQueryField
+        datasource={datasource}
+        query={query}
+        range={range}
+        onRunQuery={onRunQuery}
+        onChange={onChange}
+        history={[]}
+        data={data}
+        app={app}
+      />
+
+      {showExplain && <PromQueryBuilderExplained query={query.expr} />}
+    </div>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    // This wrapper styling can be removed after the old PromQueryEditor is removed.
+    // This is removing margin bottom on the old legacy inline form styles
+    wrapper: css`
+      .gf-form {
+        margin-bottom: 0;
+      }
+    `,
+  };
+};
diff --git a/packages/grafana-prometheus/src/querybuilder/components/PromQueryEditorSelector.test.tsx b/packages/grafana-prometheus/src/querybuilder/components/PromQueryEditorSelector.test.tsx
new file mode 100644
index 0000000000000..9e9079188f37b
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/PromQueryEditorSelector.test.tsx
@@ -0,0 +1,256 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { cloneDeep, defaultsDeep } from 'lodash';
+import React from 'react';
+
+import { CoreApp, PluginMeta, PluginType } from '@grafana/data';
+
+import { PromQueryEditorProps } from '../../components/types';
+import { PrometheusDatasource } from '../../datasource';
+import PromQlLanguageProvider from '../../language_provider';
+import { EmptyLanguageProviderMock } from '../../language_provider.mock';
+import { PromQuery } from '../../types';
+import { QueryEditorMode } from '../shared/types';
+
+import { EXPLAIN_LABEL_FILTER_CONTENT } from './PromQueryBuilderExplained';
+import { PromQueryEditorSelector } from './PromQueryEditorSelector';
+
+// We need to mock this because it seems jest has problem importing monaco in tests
+jest.mock('../../components/monaco-query-field/MonacoQueryFieldWrapper', () => {
+  return {
+    MonacoQueryFieldWrapper: () => {
+      return 'MonacoQueryFieldWrapper';
+    },
+  };
+});
+
+jest.mock('app/core/store', () => {
+  return {
+    get() {
+      return undefined;
+    },
+    set() {},
+    getObject(key: string, defaultValue: unknown) {
+      return defaultValue;
+    },
+  };
+});
+
+jest.mock('@grafana/runtime', () => {
+  return {
+    ...jest.requireActual('@grafana/runtime'),
+    reportInteraction: jest.fn(),
+  };
+});
+
+const defaultQuery = {
+  refId: 'A',
+  expr: 'metric{label1="foo", label2="bar"}',
+};
+
+const defaultMeta: PluginMeta = {
+  id: '',
+  name: '',
+  type: PluginType.datasource,
+  info: {
+    author: {
+      name: 'tester',
+    },
+    description: 'testing',
+    links: [],
+    logos: {
+      large: '',
+      small: '',
+    },
+    screenshots: [],
+    updated: '',
+    version: '',
+  },
+  module: '',
+  baseUrl: '',
+};
+
+const getDefaultDatasource = (jsonDataOverrides = {}) =>
+  new PrometheusDatasource(
+    {
+      id: 1,
+      uid: '',
+      type: 'prometheus',
+      name: 'prom-test',
+      access: 'proxy',
+      url: '',
+      jsonData: jsonDataOverrides,
+      meta: defaultMeta,
+      readOnly: false,
+    },
+    undefined,
+    new EmptyLanguageProviderMock() as unknown as PromQlLanguageProvider
+  );
+
+const defaultProps = {
+  datasource: getDefaultDatasource(),
+  query: defaultQuery,
+  onRunQuery: () => {},
+  onChange: () => {},
+};
+
+describe('PromQueryEditorSelector', () => {
+  it('shows code editor if expr and nothing else', async () => {
+    // We opt for showing code editor for queries created before this feature was added
+    render(<PromQueryEditorSelector {...defaultProps} />);
+    await expectCodeEditor();
+  });
+
+  it('shows code editor if no expr and nothing else since defaultEditor is code', async () => {
+    renderWithDatasourceDefaultEditorMode(QueryEditorMode.Code);
+    await expectCodeEditor();
+  });
+
+  it('shows builder if no expr and nothing else since defaultEditor is builder', async () => {
+    renderWithDatasourceDefaultEditorMode(QueryEditorMode.Builder);
+    await expectBuilder();
+  });
+
+  it('shows code editor when code mode is set', async () => {
+    renderWithMode(QueryEditorMode.Code);
+    await expectCodeEditor();
+  });
+
+  it('shows builder when builder mode is set', async () => {
+    renderWithMode(QueryEditorMode.Builder);
+    await expectBuilder();
+  });
+
+  it('shows Run Queries button in Dashboards', async () => {
+    renderWithProps({}, { app: CoreApp.Dashboard });
+    await expectRunQueriesButton();
+  });
+
+  it('hides Run Queries button in Explore', async () => {
+    renderWithProps({}, { app: CoreApp.Explore });
+    await expectCodeEditor();
+    expectNoRunQueriesButton();
+  });
+
+  it('hides Run Queries button in Correlations Page', async () => {
+    renderWithProps({}, { app: CoreApp.Correlations });
+    await expectCodeEditor();
+    expectNoRunQueriesButton();
+  });
+
+  it('changes to builder mode', async () => {
+    const { onChange } = renderWithMode(QueryEditorMode.Code);
+    await switchToMode(QueryEditorMode.Builder);
+    expect(onChange).toBeCalledWith({
+      refId: 'A',
+      expr: defaultQuery.expr,
+      range: true,
+      editorMode: QueryEditorMode.Builder,
+    });
+  });
+
+  it('Should show raw query', async () => {
+    renderWithProps({
+      editorMode: QueryEditorMode.Builder,
+      expr: 'my_metric',
+    });
+    expect(screen.getByLabelText('selector').textContent).toBe('my_metric');
+  });
+
+  it('Can enable explain', async () => {
+    renderWithMode(QueryEditorMode.Builder);
+    expect(screen.queryByText(EXPLAIN_LABEL_FILTER_CONTENT)).not.toBeInTheDocument();
+    await userEvent.click(screen.getByLabelText('Explain'));
+    expect(await screen.findByText(EXPLAIN_LABEL_FILTER_CONTENT)).toBeInTheDocument();
+  });
+
+  it('changes to code mode', async () => {
+    const { onChange } = renderWithMode(QueryEditorMode.Builder);
+    await switchToMode(QueryEditorMode.Code);
+    expect(onChange).toBeCalledWith({
+      refId: 'A',
+      expr: defaultQuery.expr,
+      range: true,
+      editorMode: QueryEditorMode.Code,
+    });
+  });
+
+  it('parses query when changing to builder mode', async () => {
+    const { rerender } = renderWithProps({
+      refId: 'A',
+      expr: 'rate(test_metric{instance="host.docker.internal:3000"}[$__interval])',
+      editorMode: QueryEditorMode.Code,
+    });
+    await switchToMode(QueryEditorMode.Builder);
+    rerender(
+      <PromQueryEditorSelector
+        {...defaultProps}
+        query={{
+          refId: 'A',
+          expr: 'rate(test_metric{instance="host.docker.internal:3000"}[$__interval])',
+          editorMode: QueryEditorMode.Builder,
+        }}
+      />
+    );
+
+    await screen.queryAllByText('test_metric');
+    expect(screen.getByText('host.docker.internal:3000')).toBeInTheDocument();
+    expect(screen.getByText('Rate')).toBeInTheDocument();
+    expect(screen.getByText('$__interval')).toBeInTheDocument();
+  });
+});
+
+function renderWithMode(mode: QueryEditorMode) {
+  return renderWithProps({ editorMode: mode });
+}
+
+function renderWithDatasourceDefaultEditorMode(mode: QueryEditorMode) {
+  const props = {
+    ...defaultProps,
+    datasource: getDefaultDatasource({
+      defaultEditor: mode,
+    }),
+    query: {
+      refId: 'B',
+      expr: '',
+    },
+    onRunQuery: () => {},
+    onChange: () => {},
+  };
+  render(<PromQueryEditorSelector {...props} />);
+}
+
+function renderWithProps(overrides?: Partial<PromQuery>, componentProps: Partial<PromQueryEditorProps> = {}) {
+  const query = defaultsDeep(overrides ?? {}, cloneDeep(defaultQuery));
+  const onChange = jest.fn();
+
+  const allProps = { ...defaultProps, ...componentProps };
+  const stuff = render(<PromQueryEditorSelector {...allProps} query={query} onChange={onChange} />);
+  return { onChange, ...stuff };
+}
+
+async function expectCodeEditor() {
+  expect(await screen.findByText('MonacoQueryFieldWrapper')).toBeInTheDocument();
+}
+
+async function expectBuilder() {
+  expect(await screen.findByText('Metric')).toBeInTheDocument();
+}
+
+async function expectRunQueriesButton() {
+  expect(await screen.findByRole('button', { name: /run queries/i })).toBeInTheDocument();
+}
+
+function expectNoRunQueriesButton() {
+  expect(screen.queryByRole('button', { name: /run queries/i })).not.toBeInTheDocument();
+}
+
+async function switchToMode(mode: QueryEditorMode) {
+  const label = {
+    [QueryEditorMode.Code]: /Code/,
+    [QueryEditorMode.Builder]: /Builder/,
+  }[mode];
+
+  const switchEl = screen.getByLabelText(label);
+  await userEvent.click(switchEl);
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/components/PromQueryEditorSelector.tsx b/packages/grafana-prometheus/src/querybuilder/components/PromQueryEditorSelector.tsx
new file mode 100644
index 0000000000000..f85090e0cadec
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/PromQueryEditorSelector.tsx
@@ -0,0 +1,166 @@
+import { isEqual, map } from 'lodash';
+import React, { SyntheticEvent, useCallback, useEffect, useState } from 'react';
+
+import { CoreApp, LoadingState, SelectableValue } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { EditorHeader, EditorRows, FlexItem } from '@grafana/experimental';
+import { reportInteraction } from '@grafana/runtime';
+import { Button, ConfirmModal, Space } from '@grafana/ui';
+
+import { PromQueryEditorProps } from '../../components/types';
+import { PromQueryFormat } from '../../dataquery';
+import { PromQuery } from '../../types';
+import { QueryPatternsModal } from '../QueryPatternsModal';
+import { promQueryEditorExplainKey, useFlag } from '../hooks/useFlag';
+import { buildVisualQueryFromString } from '../parsing';
+import { QueryEditorModeToggle } from '../shared/QueryEditorModeToggle';
+import { QueryHeaderSwitch } from '../shared/QueryHeaderSwitch';
+import { QueryEditorMode } from '../shared/types';
+import { changeEditorMode, getQueryWithDefaults } from '../state';
+
+import { PromQueryBuilderContainer } from './PromQueryBuilderContainer';
+import { PromQueryBuilderOptions } from './PromQueryBuilderOptions';
+import { PromQueryCodeEditor } from './PromQueryCodeEditor';
+
+export const FORMAT_OPTIONS: Array<SelectableValue<PromQueryFormat>> = [
+  { label: 'Time series', value: 'time_series' },
+  { label: 'Table', value: 'table' },
+  { label: 'Heatmap', value: 'heatmap' },
+];
+
+export const INTERVAL_FACTOR_OPTIONS: Array<SelectableValue<number>> = map([1, 2, 3, 4, 5, 10], (value: number) => ({
+  value,
+  label: '1/' + value,
+}));
+
+type Props = PromQueryEditorProps;
+
+export const PromQueryEditorSelector = React.memo<Props>((props) => {
+  const {
+    onChange,
+    onRunQuery,
+    data,
+    app,
+    onAddQuery,
+    datasource: { defaultEditor },
+    queries,
+  } = props;
+
+  const [parseModalOpen, setParseModalOpen] = useState(false);
+  const [queryPatternsModalOpen, setQueryPatternsModalOpen] = useState(false);
+  const [dataIsStale, setDataIsStale] = useState(false);
+  const { flag: explain, setFlag: setExplain } = useFlag(promQueryEditorExplainKey);
+
+  const query = getQueryWithDefaults(props.query, app, defaultEditor);
+  // This should be filled in from the defaults by now.
+  const editorMode = query.editorMode!;
+
+  const onEditorModeChange = useCallback(
+    (newMetricEditorMode: QueryEditorMode) => {
+      reportInteraction('user_grafana_prometheus_editor_mode_clicked', {
+        newEditor: newMetricEditorMode,
+        previousEditor: query.editorMode ?? '',
+        newQuery: !query.expr,
+        app: app ?? '',
+      });
+
+      if (newMetricEditorMode === QueryEditorMode.Builder) {
+        const result = buildVisualQueryFromString(query.expr || '');
+        // If there are errors, give user a chance to decide if they want to go to builder as that can lose some data.
+        if (result.errors.length) {
+          setParseModalOpen(true);
+          return;
+        }
+      }
+      changeEditorMode(query, newMetricEditorMode, onChange);
+    },
+    [onChange, query, app]
+  );
+
+  useEffect(() => {
+    setDataIsStale(false);
+  }, [data]);
+
+  const onChangeInternal = (query: PromQuery) => {
+    if (!isEqual(query, props.query)) {
+      setDataIsStale(true);
+    }
+    onChange(query);
+  };
+
+  const onShowExplainChange = (e: SyntheticEvent<HTMLInputElement>) => {
+    setExplain(e.currentTarget.checked);
+  };
+
+  return (
+    <>
+      <ConfirmModal
+        isOpen={parseModalOpen}
+        title="Parsing error: Switch to the builder mode?"
+        body="There is a syntax error, or the query structure cannot be visualized when switching to the builder mode. Parts of the query may be lost. "
+        confirmText="Continue"
+        onConfirm={() => {
+          changeEditorMode(query, QueryEditorMode.Builder, onChange);
+          setParseModalOpen(false);
+        }}
+        onDismiss={() => setParseModalOpen(false)}
+      />
+      <QueryPatternsModal
+        isOpen={queryPatternsModalOpen}
+        onClose={() => setQueryPatternsModalOpen(false)}
+        query={query}
+        queries={queries}
+        app={app}
+        onChange={onChange}
+        onAddQuery={onAddQuery}
+      />
+      <EditorHeader>
+        <Button
+          data-testid={selectors.components.QueryBuilder.queryPatterns}
+          variant="secondary"
+          size="sm"
+          onClick={() => setQueryPatternsModalOpen((prevValue) => !prevValue)}
+        >
+          Kick start your query
+        </Button>
+        <div data-testid={selectors.components.DataSource.Prometheus.queryEditor.explain}>
+          <QueryHeaderSwitch label="Explain" value={explain} onChange={onShowExplainChange} />
+        </div>
+        <FlexItem grow={1} />
+        {app !== CoreApp.Explore && app !== CoreApp.Correlations && (
+          <Button
+            variant={dataIsStale ? 'primary' : 'secondary'}
+            size="sm"
+            onClick={onRunQuery}
+            icon={data?.state === LoadingState.Loading ? 'spinner' : undefined}
+            disabled={data?.state === LoadingState.Loading}
+          >
+            Run queries
+          </Button>
+        )}
+        <div data-testid={selectors.components.DataSource.Prometheus.queryEditor.editorToggle}>
+          <QueryEditorModeToggle mode={editorMode} onChange={onEditorModeChange} />
+        </div>
+      </EditorHeader>
+      <Space v={0.5} />
+      <EditorRows>
+        {editorMode === QueryEditorMode.Code && (
+          <PromQueryCodeEditor {...props} query={query} showExplain={explain} onChange={onChangeInternal} />
+        )}
+        {editorMode === QueryEditorMode.Builder && (
+          <PromQueryBuilderContainer
+            query={query}
+            datasource={props.datasource}
+            onChange={onChangeInternal}
+            onRunQuery={props.onRunQuery}
+            data={data}
+            showExplain={explain}
+          />
+        )}
+        <PromQueryBuilderOptions query={query} app={props.app} onChange={onChange} onRunQuery={onRunQuery} />
+      </EditorRows>
+    </>
+  );
+});
+
+PromQueryEditorSelector.displayName = 'PromQueryEditorSelector';
diff --git a/packages/grafana-prometheus/src/querybuilder/components/PromQueryLegendEditor.tsx b/packages/grafana-prometheus/src/querybuilder/components/PromQueryLegendEditor.tsx
new file mode 100644
index 0000000000000..440278b4c5027
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/PromQueryLegendEditor.tsx
@@ -0,0 +1,121 @@
+import React, { useRef } from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { EditorField } from '@grafana/experimental';
+import { AutoSizeInput, Select } from '@grafana/ui';
+
+import { LegendFormatMode } from '../../types';
+
+export interface PromQueryLegendEditorProps {
+  legendFormat: string | undefined;
+  onChange: (legendFormat: string) => void;
+  onRunQuery: () => void;
+}
+
+const legendModeOptions = [
+  {
+    label: 'Auto',
+    value: LegendFormatMode.Auto,
+    description: 'Only includes unique labels',
+  },
+  { label: 'Verbose', value: LegendFormatMode.Verbose, description: 'All label names and values' },
+  { label: 'Custom', value: LegendFormatMode.Custom, description: 'Provide a naming template' },
+];
+
+/**
+ * Tests for this component are on the parent level (PromQueryBuilderOptions).
+ */
+export const PromQueryLegendEditor = React.memo<PromQueryLegendEditorProps>(
+  ({ legendFormat, onChange, onRunQuery }) => {
+    const mode = getLegendMode(legendFormat);
+    const inputRef = useRef<HTMLInputElement | null>(null);
+
+    const onLegendFormatChanged = (evt: React.FormEvent<HTMLInputElement>) => {
+      let newFormat = evt.currentTarget.value;
+      if (newFormat.length === 0) {
+        newFormat = LegendFormatMode.Auto;
+      }
+
+      if (newFormat !== legendFormat) {
+        onChange(newFormat);
+        onRunQuery();
+      }
+    };
+
+    const onLegendModeChanged = (value: SelectableValue<LegendFormatMode>) => {
+      switch (value.value!) {
+        case LegendFormatMode.Auto:
+          onChange(LegendFormatMode.Auto);
+          break;
+        case LegendFormatMode.Custom:
+          onChange('{{label_name}}');
+          setTimeout(() => {
+            inputRef.current?.focus();
+            inputRef.current?.setSelectionRange(2, 12, 'forward');
+          }, 10);
+          break;
+        case LegendFormatMode.Verbose:
+          onChange('');
+          break;
+      }
+      onRunQuery();
+    };
+
+    return (
+      <EditorField
+        label="Legend"
+        tooltip="Series name override or template. Ex. {{hostname}} will be replaced with label value for hostname."
+        data-testid={selectors.components.DataSource.Prometheus.queryEditor.legend}
+      >
+        <>
+          {mode === LegendFormatMode.Custom && (
+            <AutoSizeInput
+              id="legendFormat"
+              minWidth={22}
+              placeholder="auto"
+              defaultValue={legendFormat}
+              onCommitChange={onLegendFormatChanged}
+              ref={inputRef}
+            />
+          )}
+          {mode !== LegendFormatMode.Custom && (
+            <Select
+              inputId="legend.mode"
+              isSearchable={false}
+              placeholder="Select legend mode"
+              options={legendModeOptions}
+              width={22}
+              onChange={onLegendModeChanged}
+              value={legendModeOptions.find((x) => x.value === mode)}
+            />
+          )}
+        </>
+      </EditorField>
+    );
+  }
+);
+
+PromQueryLegendEditor.displayName = 'PromQueryLegendEditor';
+
+function getLegendMode(legendFormat: string | undefined) {
+  // This special value means the new smart minimal series naming
+  if (legendFormat === LegendFormatMode.Auto) {
+    return LegendFormatMode.Auto;
+  }
+
+  // Missing or empty legend format is the old verbose behavior
+  if (legendFormat == null || legendFormat === '') {
+    return LegendFormatMode.Verbose;
+  }
+
+  return LegendFormatMode.Custom;
+}
+
+export function getLegendModeLabel(legendFormat: string | undefined) {
+  const mode = getLegendMode(legendFormat);
+  if (mode !== LegendFormatMode.Custom) {
+    return legendModeOptions.find((x) => x.value === mode)?.label;
+  }
+  return legendFormat;
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/components/QueryPreview.tsx b/packages/grafana-prometheus/src/querybuilder/components/QueryPreview.tsx
new file mode 100644
index 0000000000000..0f731ec0b3db8
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/QueryPreview.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+
+import { EditorFieldGroup, EditorRow } from '@grafana/experimental';
+
+import promqlGrammar from '../../promql';
+import { RawQuery } from '../shared/RawQuery';
+
+export interface QueryPreviewProps {
+  query: string;
+}
+
+export function QueryPreview({ query }: QueryPreviewProps) {
+  if (!query) {
+    return null;
+  }
+
+  return (
+    <EditorRow>
+      <EditorFieldGroup>
+        <RawQuery query={query} lang={{ grammar: promqlGrammar, name: 'promql' }} />
+      </EditorFieldGroup>
+    </EditorRow>
+  );
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/AdditionalSettings.tsx b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/AdditionalSettings.tsx
new file mode 100644
index 0000000000000..c5a7d10484939
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/AdditionalSettings.tsx
@@ -0,0 +1,85 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Icon, Switch, Tooltip, useTheme2 } from '@grafana/ui';
+
+import { metricsModaltestIds } from './MetricsModal';
+import { placeholders } from './state/helpers';
+import { MetricsModalState } from './state/state';
+
+type AdditionalSettingsProps = {
+  state: MetricsModalState;
+  onChangeFullMetaSearch: () => void;
+  onChangeIncludeNullMetadata: () => void;
+  onChangeDisableTextWrap: () => void;
+  onChangeUseBackend: () => void;
+};
+
+export function AdditionalSettings(props: AdditionalSettingsProps) {
+  const { state, onChangeFullMetaSearch, onChangeIncludeNullMetadata, onChangeDisableTextWrap, onChangeUseBackend } =
+    props;
+
+  const theme = useTheme2();
+  const styles = getStyles(theme);
+
+  return (
+    <>
+      <div className={styles.selectItem}>
+        <Switch
+          data-testid={metricsModaltestIds.searchWithMetadata}
+          value={state.fullMetaSearch}
+          disabled={state.useBackend || !state.hasMetadata}
+          onChange={() => onChangeFullMetaSearch()}
+        />
+        <div className={styles.selectItemLabel}>{placeholders.metadataSearchSwitch}</div>
+      </div>
+      <div className={styles.selectItem}>
+        <Switch
+          value={state.includeNullMetadata}
+          disabled={!state.hasMetadata}
+          onChange={() => onChangeIncludeNullMetadata()}
+        />
+        <div className={styles.selectItemLabel}>{placeholders.includeNullMetadata}</div>
+      </div>
+      <div className={styles.selectItem}>
+        <Switch value={state.disableTextWrap} onChange={() => onChangeDisableTextWrap()} />
+        <div className={styles.selectItemLabel}>Disable text wrap</div>
+      </div>
+      <div className={styles.selectItem}>
+        <Switch
+          data-testid={metricsModaltestIds.setUseBackend}
+          value={state.useBackend}
+          onChange={() => onChangeUseBackend()}
+        />
+        <div className={styles.selectItemLabel}>{placeholders.setUseBackend}&nbsp;</div>
+        <Tooltip
+          content={'Filter metric names by regex search, using an additional call on the Prometheus API.'}
+          placement="bottom-end"
+        >
+          <Icon name="info-circle" size="xs" className={styles.settingsIcon} />
+        </Tooltip>
+      </div>
+    </>
+  );
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    settingsIcon: css`
+      color: ${theme.colors.text.secondary};
+    `,
+    selectItem: css`
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      padding: 4px 0;
+    `,
+    selectItemLabel: css`
+      margin: 0 0 0 ${theme.spacing(1)};
+      align-self: center;
+      color: ${theme.colors.text.secondary};
+      font-size: 12px;
+    `,
+  };
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/FeedbackLink.tsx b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/FeedbackLink.tsx
new file mode 100644
index 0000000000000..4ba1d881147b5
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/FeedbackLink.tsx
@@ -0,0 +1,40 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Icon, useStyles2, Stack } from '@grafana/ui';
+
+export interface Props {
+  feedbackUrl?: string;
+}
+
+export function FeedbackLink({ feedbackUrl }: Props) {
+  const styles = useStyles2(getStyles);
+
+  return (
+    <Stack>
+      <a
+        href={feedbackUrl}
+        className={styles.link}
+        title="The metrics explorer is new, please let us know how we can improve it"
+        target="_blank"
+        rel="noreferrer noopener"
+      >
+        <Icon name="comment-alt-message" /> Give feedback
+      </a>
+    </Stack>
+  );
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    link: css({
+      color: theme.colors.text.secondary,
+      fontSize: theme.typography.bodySmall.fontSize,
+      ':hover': {
+        color: theme.colors.text.link,
+      },
+      margin: `-25px 0 30px 0`,
+    }),
+  };
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/MetricsModal.test.tsx b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/MetricsModal.test.tsx
new file mode 100644
index 0000000000000..f12d7c6708075
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/MetricsModal.test.tsx
@@ -0,0 +1,261 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { DataSourceInstanceSettings, DataSourcePluginMeta } from '@grafana/data';
+
+import { PrometheusDatasource } from '../../../datasource';
+import PromQlLanguageProvider from '../../../language_provider';
+import { EmptyLanguageProviderMock } from '../../../language_provider.mock';
+import { PromOptions } from '../../../types';
+import { PromVisualQuery } from '../../types';
+
+import { MetricsModal, metricsModaltestIds } from './MetricsModal';
+
+// don't care about interaction tracking in our unit tests
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  reportInteraction: jest.fn(),
+}));
+
+describe('MetricsModal', () => {
+  it('renders the modal', async () => {
+    setup(defaultQuery, listOfMetrics);
+    await waitFor(() => {
+      expect(screen.getByText('Metrics explorer')).toBeInTheDocument();
+    });
+  });
+
+  it('renders a list of metrics', async () => {
+    setup(defaultQuery, listOfMetrics);
+    await waitFor(() => {
+      expect(screen.getByText('all-metrics')).toBeInTheDocument();
+    });
+  });
+
+  it('renders a list of metrics filtered by labels in the PromVisualQuery', async () => {
+    const query: PromVisualQuery = {
+      metric: 'random_metric',
+      labels: [
+        {
+          op: '=',
+          label: 'action',
+          value: 'add_presence',
+        },
+      ],
+      operations: [],
+    };
+
+    setup(query, ['with-labels'], true);
+    await waitFor(() => {
+      expect(screen.getByText('with-labels')).toBeInTheDocument();
+    });
+  });
+
+  it('displays a type for a metric when the metric is clicked', async () => {
+    setup(defaultQuery, listOfMetrics);
+    await waitFor(() => {
+      expect(screen.getByText('all-metrics')).toBeInTheDocument();
+    });
+
+    const interactiveMetric = screen.getByText('all-metrics');
+
+    await userEvent.click(interactiveMetric);
+
+    expect(screen.getByText('all-metrics-type')).toBeInTheDocument();
+  });
+
+  it('displays a description for a metric', async () => {
+    setup(defaultQuery, listOfMetrics);
+    await waitFor(() => {
+      expect(screen.getByText('all-metrics')).toBeInTheDocument();
+    });
+
+    const interactiveMetric = screen.getByText('all-metrics');
+
+    await userEvent.click(interactiveMetric);
+
+    expect(screen.getByText('all-metrics-help')).toBeInTheDocument();
+  });
+
+  // Filtering
+  it('has a filter for selected type', async () => {
+    setup(defaultQuery, listOfMetrics);
+
+    await waitFor(() => {
+      const selectType = screen.getByText('Filter by type');
+      expect(selectType).toBeInTheDocument();
+    });
+  });
+
+  // Pagination
+  it('shows metrics within a range by pagination', async () => {
+    // default resultsPerPage is 100
+    setup(defaultQuery, listOfMetrics);
+    await waitFor(() => {
+      expect(screen.getByText('all-metrics')).toBeInTheDocument();
+      expect(screen.getByText('a_bucket')).toBeInTheDocument();
+      expect(screen.getByText('a')).toBeInTheDocument();
+      expect(screen.getByText('b')).toBeInTheDocument();
+      expect(screen.getByText('c')).toBeInTheDocument();
+      expect(screen.getByText('d')).toBeInTheDocument();
+      expect(screen.getByText('e')).toBeInTheDocument();
+      expect(screen.getByText('f')).toBeInTheDocument();
+      expect(screen.getByText('g')).toBeInTheDocument();
+      expect(screen.getByText('h')).toBeInTheDocument();
+    });
+  });
+
+  it('does not show metrics outside a range by pagination', async () => {
+    // default resultsPerPage is 10
+    setup(defaultQuery, listOfMetrics);
+    await waitFor(() => {
+      const metricOutsideRange = screen.queryByText('j');
+      expect(metricOutsideRange).toBeNull();
+    });
+  });
+
+  it('shows results metrics per page chosen by the user', async () => {
+    setup(defaultQuery, listOfMetrics);
+    const resultsPerPageInput = screen.getByTestId(metricsModaltestIds.resultsPerPage);
+    await userEvent.type(resultsPerPageInput, '12');
+    const metricInsideRange = screen.getByText('j');
+    expect(metricInsideRange).toBeInTheDocument();
+  });
+
+  it('paginates lots of metrics and does not run out of memory', async () => {
+    const lotsOfMetrics: string[] = [...Array(100000).keys()].map((i) => '' + i);
+    setup(defaultQuery, lotsOfMetrics);
+    await waitFor(() => {
+      // doesn't break on loading
+      expect(screen.getByText('0')).toBeInTheDocument();
+    });
+    const resultsPerPageInput = screen.getByTestId(metricsModaltestIds.resultsPerPage);
+    // doesn't break on changing results per page
+    await userEvent.type(resultsPerPageInput, '11');
+    const metricInsideRange = screen.getByText('9');
+    expect(metricInsideRange).toBeInTheDocument();
+  });
+
+  // Fuzzy search
+  it('searches and filter by metric name with a fuzzy search', async () => {
+    // search for a_bucket by name
+    setup(defaultQuery, listOfMetrics);
+    let metricAll: HTMLElement | null;
+    let metricABucket: HTMLElement | null;
+    await waitFor(() => {
+      metricAll = screen.getByText('all-metrics');
+      metricABucket = screen.getByText('a_bucket');
+      expect(metricAll).toBeInTheDocument();
+      expect(metricABucket).toBeInTheDocument();
+    });
+    const searchMetric = screen.getByTestId(metricsModaltestIds.searchMetric);
+    expect(searchMetric).toBeInTheDocument();
+    await userEvent.type(searchMetric, 'a_buck');
+
+    await waitFor(() => {
+      metricAll = screen.queryByText('all-metrics');
+      expect(metricAll).toBeNull();
+    });
+  });
+
+  it('searches by name and description with a fuzzy search when setting is turned on', async () => {
+    // search for a_bucket by metadata type counter but only type countt
+    setup(defaultQuery, listOfMetrics);
+    let metricABucket: HTMLElement | null;
+
+    await waitFor(() => {
+      metricABucket = screen.getByText('a_bucket');
+      expect(metricABucket).toBeInTheDocument();
+    });
+
+    const showSettingsButton = screen.getByTestId(metricsModaltestIds.showAdditionalSettings);
+    expect(showSettingsButton).toBeInTheDocument();
+    await userEvent.click(showSettingsButton);
+
+    const metadataSwitch = screen.getByTestId(metricsModaltestIds.searchWithMetadata);
+    expect(metadataSwitch).toBeInTheDocument();
+    await userEvent.click(metadataSwitch);
+
+    const searchMetric = screen.getByTestId(metricsModaltestIds.searchMetric);
+    expect(searchMetric).toBeInTheDocument();
+    await userEvent.type(searchMetric, 'functions');
+
+    await waitFor(() => {
+      metricABucket = screen.getByText('a_bucket');
+      expect(metricABucket).toBeInTheDocument();
+    });
+  });
+});
+
+const defaultQuery: PromVisualQuery = {
+  metric: 'random_metric',
+  labels: [],
+  operations: [],
+};
+
+const listOfMetrics: string[] = ['all-metrics', 'a_bucket', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j'];
+
+function createDatasource(withLabels?: boolean) {
+  const languageProvider = new EmptyLanguageProviderMock() as unknown as PromQlLanguageProvider;
+
+  // display different results if their are labels selected in the PromVisualQuery
+  if (withLabels) {
+    languageProvider.metricsMetadata = {
+      'with-labels': {
+        type: 'with-labels-type',
+        help: 'with-labels-help',
+      },
+    };
+  } else {
+    // all metrics
+    languageProvider.metricsMetadata = {
+      'all-metrics': {
+        type: 'all-metrics-type',
+        help: 'all-metrics-help',
+      },
+      a: {
+        type: 'counter',
+        help: 'a-metric-help',
+      },
+      a_bucket: {
+        type: 'counter',
+        help: 'for functions',
+      },
+      // missing metadata for other metrics is tested for, see below
+    };
+  }
+
+  const datasource = new PrometheusDatasource(
+    {
+      url: '',
+      jsonData: {},
+      meta: {} as DataSourcePluginMeta,
+    } as DataSourceInstanceSettings<PromOptions>,
+    undefined,
+    languageProvider
+  );
+  return datasource;
+}
+
+function createProps(query: PromVisualQuery, datasource: PrometheusDatasource, metrics: string[]) {
+  return {
+    datasource,
+    isOpen: true,
+    onChange: jest.fn(),
+    onClose: jest.fn(),
+    query: query,
+    initialMetrics: metrics,
+  };
+}
+
+function setup(query: PromVisualQuery, metrics: string[], withlabels?: boolean) {
+  const withLabels: boolean = query.labels.length > 0;
+  const datasource = createDatasource(withLabels);
+  const props = createProps(query, datasource, metrics);
+
+  // render the modal only
+  const { container } = render(<MetricsModal {...props} />);
+
+  return container;
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/MetricsModal.tsx b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/MetricsModal.tsx
new file mode 100644
index 0000000000000..6e02715a8040e
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/MetricsModal.tsx
@@ -0,0 +1,414 @@
+import { cx } from '@emotion/css';
+import { PayloadAction, createSlice } from '@reduxjs/toolkit';
+import debounce from 'debounce-promise';
+import React, { useCallback, useEffect, useMemo, useReducer } from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import {
+  Button,
+  ButtonGroup,
+  Icon,
+  Input,
+  Modal,
+  MultiSelect,
+  Pagination,
+  Spinner,
+  Toggletip,
+  useTheme2,
+} from '@grafana/ui';
+
+import { PrometheusDatasource } from '../../../datasource';
+import { PromVisualQuery } from '../../types';
+
+import { AdditionalSettings } from './AdditionalSettings';
+import { FeedbackLink } from './FeedbackLink';
+import { ResultsTable } from './ResultsTable';
+import {
+  calculatePageList,
+  calculateResultsPerPage,
+  displayedMetrics,
+  getBackendSearchMetrics,
+  placeholders,
+  promTypes,
+  setMetrics,
+  tracking,
+} from './state/helpers';
+import {
+  DEFAULT_RESULTS_PER_PAGE,
+  initialState,
+  MAXIMUM_RESULTS_PER_PAGE,
+  MetricsModalMetadata,
+  // stateSlice,
+} from './state/state';
+import { getStyles } from './styles';
+import { MetricsData, PromFilterOption } from './types';
+import { debouncedFuzzySearch } from './uFuzzy';
+
+export type MetricsModalProps = {
+  datasource: PrometheusDatasource;
+  isOpen: boolean;
+  query: PromVisualQuery;
+  onClose: () => void;
+  onChange: (query: PromVisualQuery) => void;
+  initialMetrics: string[];
+};
+
+export const MetricsModal = (props: MetricsModalProps) => {
+  const { datasource, isOpen, onClose, onChange, query, initialMetrics } = props;
+
+  const [state, dispatch] = useReducer(stateSlice.reducer, initialState(query));
+
+  const theme = useTheme2();
+  const styles = getStyles(theme, state.disableTextWrap);
+
+  /**
+   * loads metrics and metadata on opening modal and switching off useBackend
+   */
+  const updateMetricsMetadata = useCallback(async () => {
+    // *** Loading Gif
+    dispatch(setIsLoading(true));
+
+    const data: MetricsModalMetadata = await setMetrics(datasource, query, initialMetrics);
+    dispatch(
+      buildMetrics({
+        isLoading: false,
+        hasMetadata: data.hasMetadata,
+        metrics: data.metrics,
+        metaHaystackDictionary: data.metaHaystackDictionary,
+        nameHaystackDictionary: data.nameHaystackDictionary,
+        totalMetricCount: data.metrics.length,
+        filteredMetricCount: data.metrics.length,
+      })
+    );
+  }, [query, datasource, initialMetrics]);
+
+  useEffect(() => {
+    updateMetricsMetadata();
+  }, [updateMetricsMetadata]);
+
+  const typeOptions: SelectableValue[] = promTypes.map((t: PromFilterOption) => {
+    return {
+      value: t.value,
+      label: t.value,
+      description: t.description,
+    };
+  });
+
+  /**
+   * The backend debounced search
+   */
+  const debouncedBackendSearch = useMemo(
+    () =>
+      debounce(async (metricText: string) => {
+        dispatch(setIsLoading(true));
+
+        const metrics = await getBackendSearchMetrics(metricText, query.labels, datasource);
+
+        dispatch(
+          filterMetricsBackend({
+            metrics: metrics,
+            filteredMetricCount: metrics.length,
+            isLoading: false,
+          })
+        );
+      }, datasource.getDebounceTimeInMilliseconds()),
+    [datasource, query]
+  );
+
+  function fuzzyNameDispatch(haystackData: string[][]) {
+    dispatch(setNameHaystack(haystackData));
+  }
+
+  function fuzzyMetaDispatch(haystackData: string[][]) {
+    dispatch(setMetaHaystack(haystackData));
+  }
+
+  function searchCallback(query: string, fullMetaSearchVal: boolean) {
+    if (state.useBackend && query === '') {
+      // get all metrics data if a user erases everything in the input
+      updateMetricsMetadata();
+    } else if (state.useBackend) {
+      debouncedBackendSearch(query);
+    } else {
+      // search either the names or all metadata
+      // fuzzy search go!
+      if (fullMetaSearchVal) {
+        debouncedFuzzySearch(Object.keys(state.metaHaystackDictionary), query, fuzzyMetaDispatch);
+      } else {
+        debouncedFuzzySearch(Object.keys(state.nameHaystackDictionary), query, fuzzyNameDispatch);
+      }
+    }
+  }
+
+  /* Settings switches */
+  const additionalSettings = (
+    <AdditionalSettings
+      state={state}
+      onChangeFullMetaSearch={() => {
+        const newVal = !state.fullMetaSearch;
+        dispatch(setFullMetaSearch(newVal));
+        onChange({ ...query, fullMetaSearch: newVal });
+        searchCallback(state.fuzzySearchQuery, newVal);
+      }}
+      onChangeIncludeNullMetadata={() => {
+        dispatch(setIncludeNullMetadata(!state.includeNullMetadata));
+        onChange({ ...query, includeNullMetadata: !state.includeNullMetadata });
+      }}
+      onChangeDisableTextWrap={() => {
+        dispatch(setDisableTextWrap());
+        onChange({ ...query, disableTextWrap: !state.disableTextWrap });
+        tracking('grafana_prom_metric_encycopedia_disable_text_wrap_interaction', state, '');
+      }}
+      onChangeUseBackend={() => {
+        const newVal = !state.useBackend;
+        dispatch(setUseBackend(newVal));
+        onChange({ ...query, useBackend: newVal });
+        if (newVal === false) {
+          // rebuild the metrics metadata if we turn off useBackend
+          updateMetricsMetadata();
+        } else {
+          // check if there is text in the browse search and update
+          if (state.fuzzySearchQuery !== '') {
+            debouncedBackendSearch(state.fuzzySearchQuery);
+          }
+          // otherwise wait for user typing
+        }
+      }}
+    />
+  );
+
+  return (
+    <Modal
+      data-testid={metricsModaltestIds.metricModal}
+      isOpen={isOpen}
+      title="Metrics explorer"
+      onDismiss={onClose}
+      aria-label="Browse metrics"
+      className={styles.modal}
+    >
+      <FeedbackLink feedbackUrl="https://forms.gle/DEMAJHoAMpe3e54CA" />
+      <div
+        className={styles.inputWrapper}
+        data-testid={selectors.components.DataSource.Prometheus.queryEditor.builder.metricsExplorer}
+      >
+        <div className={cx(styles.inputItem, styles.inputItemFirst)}>
+          <Input
+            autoFocus={true}
+            data-testid={metricsModaltestIds.searchMetric}
+            placeholder={placeholders.browse}
+            value={state.fuzzySearchQuery}
+            onInput={(e) => {
+              const value = e.currentTarget.value ?? '';
+              dispatch(setFuzzySearchQuery(value));
+              searchCallback(value, state.fullMetaSearch);
+            }}
+          />
+        </div>
+        {state.hasMetadata && (
+          <div className={styles.inputItem}>
+            <MultiSelect
+              data-testid={metricsModaltestIds.selectType}
+              inputId="my-select"
+              options={typeOptions}
+              value={state.selectedTypes}
+              placeholder={placeholders.type}
+              onChange={(v) => dispatch(setSelectedTypes(v))}
+            />
+          </div>
+        )}
+        <div>
+          <Spinner className={`${styles.loadingSpinner} ${state.isLoading ? styles.visible : ''}`} />
+        </div>
+        <div className={styles.inputItem}>
+          <Toggletip
+            aria-label="Additional settings"
+            content={additionalSettings}
+            placement="bottom-end"
+            closeButton={false}
+          >
+            <ButtonGroup className={styles.settingsBtn}>
+              <Button
+                variant="secondary"
+                size="md"
+                onClick={() => dispatch(showAdditionalSettings())}
+                data-testid={metricsModaltestIds.showAdditionalSettings}
+                className={styles.noBorder}
+              >
+                Additional Settings
+              </Button>
+              <Button
+                className={styles.noBorder}
+                variant="secondary"
+                icon={state.showAdditionalSettings ? 'angle-up' : 'angle-down'}
+              />
+            </ButtonGroup>
+          </Toggletip>
+        </div>
+      </div>
+      <div className={styles.resultsData}>
+        {query.metric && <i className={styles.currentlySelected}>Currently selected: {query.metric}</i>}
+        {query.labels.length > 0 && (
+          <div className={styles.resultsDataFiltered}>
+            <Icon name="info-circle" size="sm" />
+            <div className={styles.resultsDataFilteredText}>
+              &nbsp;These metrics have been pre-filtered by labels chosen in the label filters.
+            </div>
+          </div>
+        )}
+      </div>
+      <div className={styles.results}>
+        {state.metrics && (
+          <ResultsTable
+            metrics={displayedMetrics(state, dispatch)}
+            onChange={onChange}
+            onClose={onClose}
+            query={query}
+            state={state}
+            disableTextWrap={state.disableTextWrap}
+          />
+        )}
+      </div>
+      <div className={styles.resultsFooter}>
+        <div className={styles.resultsAmount}>
+          Showing {state.filteredMetricCount} of {state.totalMetricCount} results
+        </div>
+        <Pagination
+          currentPage={state.pageNum ?? 1}
+          numberOfPages={calculatePageList(state).length}
+          onNavigate={(val: number) => {
+            const page = val ?? 1;
+            dispatch(setPageNum(page));
+          }}
+        />
+        <div className={styles.resultsPerPageWrapper}>
+          <p className={styles.resultsPerPageLabel}># Results per page&nbsp;</p>
+          <Input
+            data-testid={metricsModaltestIds.resultsPerPage}
+            value={calculateResultsPerPage(state.resultsPerPage, DEFAULT_RESULTS_PER_PAGE, MAXIMUM_RESULTS_PER_PAGE)}
+            placeholder="results per page"
+            width={10}
+            title={'The maximum results per page is ' + MAXIMUM_RESULTS_PER_PAGE}
+            type="number"
+            onInput={(e) => {
+              const value = +e.currentTarget.value;
+
+              if (isNaN(value) || value >= MAXIMUM_RESULTS_PER_PAGE) {
+                return;
+              }
+
+              dispatch(setResultsPerPage(value));
+            }}
+          />
+        </div>
+      </div>
+    </Modal>
+  );
+};
+
+export const metricsModaltestIds = {
+  metricModal: 'metric-modal',
+  searchMetric: 'search-metric',
+  searchWithMetadata: 'search-with-metadata',
+  selectType: 'select-type',
+  metricCard: 'metric-card',
+  useMetric: 'use-metric',
+  searchPage: 'search-page',
+  resultsPerPage: 'results-per-page',
+  setUseBackend: 'set-use-backend',
+  showAdditionalSettings: 'show-additional-settings',
+};
+
+const stateSlice = createSlice({
+  name: 'metrics-modal-state',
+  initialState: initialState(),
+  reducers: {
+    filterMetricsBackend: (
+      state,
+      action: PayloadAction<{
+        metrics: MetricsData;
+        filteredMetricCount: number;
+        isLoading: boolean;
+      }>
+    ) => {
+      state.metrics = action.payload.metrics;
+      state.filteredMetricCount = action.payload.filteredMetricCount;
+      state.isLoading = action.payload.isLoading;
+    },
+    buildMetrics: (state, action: PayloadAction<MetricsModalMetadata>) => {
+      state.isLoading = action.payload.isLoading;
+      state.metrics = action.payload.metrics;
+      state.hasMetadata = action.payload.hasMetadata;
+      state.metaHaystackDictionary = action.payload.metaHaystackDictionary;
+      state.nameHaystackDictionary = action.payload.nameHaystackDictionary;
+      state.totalMetricCount = action.payload.totalMetricCount;
+      state.filteredMetricCount = action.payload.filteredMetricCount;
+    },
+    setIsLoading: (state, action: PayloadAction<boolean>) => {
+      state.isLoading = action.payload;
+    },
+    setFilteredMetricCount: (state, action: PayloadAction<number>) => {
+      state.filteredMetricCount = action.payload;
+    },
+    setResultsPerPage: (state, action: PayloadAction<number>) => {
+      state.resultsPerPage = action.payload;
+    },
+    setPageNum: (state, action: PayloadAction<number>) => {
+      state.pageNum = action.payload;
+    },
+    setFuzzySearchQuery: (state, action: PayloadAction<string>) => {
+      state.fuzzySearchQuery = action.payload;
+      state.pageNum = 1;
+    },
+    setNameHaystack: (state, action: PayloadAction<string[][]>) => {
+      state.nameHaystackOrder = action.payload[0];
+      state.nameHaystackMatches = action.payload[1];
+    },
+    setMetaHaystack: (state, action: PayloadAction<string[][]>) => {
+      state.metaHaystackOrder = action.payload[0];
+      state.metaHaystackMatches = action.payload[1];
+    },
+    setFullMetaSearch: (state, action: PayloadAction<boolean>) => {
+      state.fullMetaSearch = action.payload;
+      state.pageNum = 1;
+    },
+    setIncludeNullMetadata: (state, action: PayloadAction<boolean>) => {
+      state.includeNullMetadata = action.payload;
+      state.pageNum = 1;
+    },
+    setSelectedTypes: (state, action: PayloadAction<Array<SelectableValue<string>>>) => {
+      state.selectedTypes = action.payload;
+      state.pageNum = 1;
+    },
+    setUseBackend: (state, action: PayloadAction<boolean>) => {
+      state.useBackend = action.payload;
+      state.fullMetaSearch = false;
+      state.pageNum = 1;
+    },
+    setDisableTextWrap: (state) => {
+      state.disableTextWrap = !state.disableTextWrap;
+    },
+    showAdditionalSettings: (state) => {
+      state.showAdditionalSettings = !state.showAdditionalSettings;
+    },
+  },
+});
+
+// actions to update the state
+export const {
+  setIsLoading,
+  buildMetrics,
+  filterMetricsBackend,
+  setResultsPerPage,
+  setPageNum,
+  setFuzzySearchQuery,
+  setNameHaystack,
+  setMetaHaystack,
+  setFullMetaSearch,
+  setIncludeNullMetadata,
+  setSelectedTypes,
+  setUseBackend,
+  setDisableTextWrap,
+  showAdditionalSettings,
+  setFilteredMetricCount,
+} = stateSlice.actions;
diff --git a/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/ResultsTable.tsx b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/ResultsTable.tsx
new file mode 100644
index 0000000000000..a474098bbc079
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/ResultsTable.tsx
@@ -0,0 +1,252 @@
+import { css } from '@emotion/css';
+import React, { ReactElement } from 'react';
+import Highlighter from 'react-highlight-words';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Button, Icon, Tooltip, useTheme2 } from '@grafana/ui';
+
+import { docsTip } from '../../../configuration/ConfigEditor';
+import { PromVisualQuery } from '../../types';
+
+import { tracking } from './state/helpers';
+import { MetricsModalState } from './state/state';
+import { MetricData, MetricsData } from './types';
+
+type ResultsTableProps = {
+  metrics: MetricsData;
+  onChange: (query: PromVisualQuery) => void;
+  onClose: () => void;
+  query: PromVisualQuery;
+  state: MetricsModalState;
+  disableTextWrap: boolean;
+};
+
+export function ResultsTable(props: ResultsTableProps) {
+  const { metrics, onChange, onClose, query, state, disableTextWrap } = props;
+
+  const theme = useTheme2();
+  const styles = getStyles(theme, disableTextWrap);
+
+  function selectMetric(metric: MetricData) {
+    if (metric.value) {
+      onChange({ ...query, metric: metric.value });
+      tracking('grafana_prom_metric_encycopedia_tracking', state, metric.value);
+      onClose();
+    }
+  }
+
+  function metaRows(metric: MetricData) {
+    if (state.fullMetaSearch && metric) {
+      return (
+        <>
+          <td>{displayType(metric.type ?? '')}</td>
+          <td>
+            <Highlighter
+              textToHighlight={metric.description ?? ''}
+              searchWords={state.metaHaystackMatches}
+              autoEscape
+              highlightClassName={styles.matchHighLight}
+            />
+          </td>
+        </>
+      );
+    } else {
+      return (
+        <>
+          <td>{displayType(metric.type ?? '')}</td>
+          <td>{metric.description ?? ''}</td>
+        </>
+      );
+    }
+  }
+
+  function addHelpIcon(fullType: string, descriptiveType: string, link: string) {
+    return (
+      <>
+        {fullType}
+        <span className={styles.tooltipSpace}>
+          <Tooltip
+            content={
+              <>
+                When creating a {descriptiveType}, Prometheus exposes multiple series with the type counter.{' '}
+                {docsTip(link)}
+              </>
+            }
+            placement="bottom-start"
+            interactive={true}
+          >
+            <Icon name="info-circle" size="xs" />
+          </Tooltip>
+        </span>
+      </>
+    );
+  }
+
+  function displayType(type: string | null) {
+    if (!type) {
+      return '';
+    }
+
+    if (type.includes('(summary)')) {
+      return addHelpIcon(type, 'summary', 'https://prometheus.io/docs/concepts/metric_types/#summary');
+    }
+
+    if (type.includes('(histogram)')) {
+      return addHelpIcon(type, 'histogram', 'https://prometheus.io/docs/concepts/metric_types/#histogram');
+    }
+
+    return type;
+  }
+
+  function noMetricsMessages(): ReactElement {
+    let message;
+
+    if (!state.fuzzySearchQuery) {
+      message = 'There are no metrics found in the data source.';
+    }
+
+    if (query.labels.length > 0) {
+      message = 'There are no metrics found. Try to expand your label filters.';
+    }
+
+    if (state.fuzzySearchQuery || state.selectedTypes.length > 0) {
+      message = 'There are no metrics found. Try to expand your search and filters.';
+    }
+
+    return (
+      <tr className={styles.noResults}>
+        <td colSpan={3}>{message}</td>
+      </tr>
+    );
+  }
+
+  function textHighlight(state: MetricsModalState) {
+    if (state.useBackend) {
+      // highlight the input only for the backend search
+      // this highlight is equivalent to how the metric select highlights
+      // look into matching on regex input
+      return [state.fuzzySearchQuery];
+    } else if (state.fullMetaSearch) {
+      // highlight the matches in the ufuzzy metaHaystack
+      return state.metaHaystackMatches;
+    } else {
+      // highlight the ufuzzy name matches
+      return state.nameHaystackMatches;
+    }
+  }
+
+  return (
+    <table className={styles.table}>
+      <thead className={styles.stickyHeader}>
+        <tr>
+          <th className={`${styles.nameWidth} ${styles.tableHeaderPadding}`}>Name</th>
+          {state.hasMetadata && (
+            <>
+              <th className={`${styles.typeWidth} ${styles.tableHeaderPadding}`}>Type</th>
+              <th className={`${styles.descriptionWidth} ${styles.tableHeaderPadding}`}>Description</th>
+            </>
+          )}
+          <th className={styles.selectButtonWidth}> </th>
+        </tr>
+      </thead>
+      <tbody>
+        <>
+          {metrics.length > 0 &&
+            metrics.map((metric: MetricData, idx: number) => {
+              return (
+                <tr key={metric?.value ?? idx} className={styles.row}>
+                  <td className={styles.nameOverflow}>
+                    <Highlighter
+                      textToHighlight={metric?.value ?? ''}
+                      searchWords={textHighlight(state)}
+                      autoEscape
+                      highlightClassName={styles.matchHighLight}
+                    />
+                  </td>
+                  {state.hasMetadata && metaRows(metric)}
+                  <td>
+                    <Button
+                      size="md"
+                      variant="secondary"
+                      onClick={() => selectMetric(metric)}
+                      className={styles.centerButton}
+                    >
+                      Select
+                    </Button>
+                  </td>
+                </tr>
+              );
+            })}
+          {metrics.length === 0 && !state.isLoading && noMetricsMessages()}
+        </>
+      </tbody>
+    </table>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2, disableTextWrap: boolean) => {
+  return {
+    table: css`
+      ${disableTextWrap ? '' : 'table-layout: fixed;'}
+      border-radius: ${theme.shape.radius.default};
+      width: 100%;
+      white-space: ${disableTextWrap ? 'nowrap' : 'normal'};
+      td {
+        padding: ${theme.spacing(1)};
+      }
+
+      td,
+      th {
+        min-width: ${theme.spacing(3)};
+        border-bottom: 1px solid ${theme.colors.border.weak};
+      }
+    `,
+    row: css`
+      label: row;
+      border-bottom: 1px solid ${theme.colors.border.weak}
+      &:last-child {
+        border-bottom: 0;
+      }
+    `,
+    tableHeaderPadding: css`
+      padding: 8px;
+    `,
+    matchHighLight: css`
+      background: inherit;
+      color: ${theme.components.textHighlight.text};
+      background-color: ${theme.components.textHighlight.background};
+    `,
+    nameWidth: css`
+      ${disableTextWrap ? '' : 'width: 37.5%;'}
+    `,
+    nameOverflow: css`
+      ${disableTextWrap ? '' : 'overflow-wrap: anywhere;'}
+    `,
+    typeWidth: css`
+      ${disableTextWrap ? '' : 'width: 15%;'}
+    `,
+    descriptionWidth: css`
+      ${disableTextWrap ? '' : 'width: 35%;'}
+    `,
+    selectButtonWidth: css`
+      ${disableTextWrap ? '' : 'width: 12.5%;'}
+    `,
+    stickyHeader: css`
+      position: sticky;
+      top: 0;
+      background-color: ${theme.colors.background.primary};
+    `,
+    noResults: css`
+      text-align: center;
+      color: ${theme.colors.text.secondary};
+    `,
+    tooltipSpace: css`
+      margin-left: 4px;
+    `,
+    centerButton: css`
+      display: block;
+      margin: auto;
+      border: none;
+    `,
+  };
+};
diff --git a/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/index.ts b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/index.ts
new file mode 100644
index 0000000000000..3f073bdca3ff8
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/index.ts
@@ -0,0 +1 @@
+export * from './MetricsModal';
diff --git a/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/state/helpers.ts b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/state/helpers.ts
new file mode 100644
index 0000000000000..e8a40d02b0cf5
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/state/helpers.ts
@@ -0,0 +1,260 @@
+import { AnyAction } from '@reduxjs/toolkit';
+
+import { reportInteraction } from '@grafana/runtime';
+
+import { PrometheusDatasource } from '../../../../datasource';
+import { getMetadataHelp, getMetadataType } from '../../../../language_provider';
+import { regexifyLabelValuesQueryString } from '../../../parsingUtils';
+import { QueryBuilderLabelFilter } from '../../../shared/types';
+import { PromVisualQuery } from '../../../types';
+import { setFilteredMetricCount } from '../MetricsModal';
+import { HaystackDictionary, MetricData, MetricsData, PromFilterOption } from '../types';
+
+import { MetricsModalMetadata, MetricsModalState } from './state';
+
+// const { setFilteredMetricCount } = stateSlice.actions;
+
+export async function setMetrics(
+  datasource: PrometheusDatasource,
+  query: PromVisualQuery,
+  initialMetrics?: string[]
+): Promise<MetricsModalMetadata> {
+  // metadata is set in the metric select now
+  // use this to disable metadata search and display
+  let hasMetadata = true;
+  const metadata = datasource.languageProvider.metricsMetadata;
+  if (metadata && Object.keys(metadata).length === 0) {
+    hasMetadata = false;
+  }
+
+  let nameHaystackDictionaryData: HaystackDictionary = {};
+  let metaHaystackDictionaryData: HaystackDictionary = {};
+
+  // pass in metrics from getMetrics in the query builder, reduced in the metric select
+  let metricsData: MetricsData | undefined;
+
+  metricsData = initialMetrics?.map((m: string) => {
+    const metricData = buildMetricData(m, datasource);
+
+    const metaDataString = `${m}¦${metricData.description}`;
+
+    nameHaystackDictionaryData[m] = metricData;
+    metaHaystackDictionaryData[metaDataString] = metricData;
+
+    return metricData;
+  });
+
+  return {
+    isLoading: false,
+    hasMetadata: hasMetadata,
+    metrics: metricsData ?? [],
+    metaHaystackDictionary: metaHaystackDictionaryData,
+    nameHaystackDictionary: nameHaystackDictionaryData,
+    totalMetricCount: metricsData?.length ?? 0,
+    filteredMetricCount: metricsData?.length ?? 0,
+  };
+}
+
+/**
+ * Builds the metric data object with type and description
+ *
+ * @param   metric  The metric name
+ * @param   datasource  The Prometheus datasource for mapping metradata to the metric name
+ * @returns A MetricData object.
+ */
+function buildMetricData(metric: string, datasource: PrometheusDatasource): MetricData {
+  let type = getMetadataType(metric, datasource.languageProvider.metricsMetadata!);
+
+  const description = getMetadataHelp(metric, datasource.languageProvider.metricsMetadata!);
+
+  ['histogram', 'summary'].forEach((t) => {
+    if (description?.toLowerCase().includes(t) && type !== t) {
+      type += ` (${t})`;
+    }
+  });
+
+  const metricData: MetricData = {
+    value: metric,
+    type: type,
+    description: description,
+  };
+
+  return metricData;
+}
+
+/**
+ * The filtered and paginated metrics displayed in the modal
+ * */
+export function displayedMetrics(state: MetricsModalState, dispatch: React.Dispatch<AnyAction>) {
+  const filteredSorted: MetricsData = filterMetrics(state);
+
+  if (!state.isLoading && state.filteredMetricCount !== filteredSorted.length) {
+    dispatch(setFilteredMetricCount(filteredSorted.length));
+  }
+
+  return sliceMetrics(filteredSorted, state.pageNum, state.resultsPerPage);
+}
+
+/**
+ * Filter the metrics with all the options, fuzzy, type, null metadata
+ */
+export function filterMetrics(state: MetricsModalState): MetricsData {
+  let filteredMetrics: MetricsData = state.metrics;
+
+  if (state.fuzzySearchQuery && !state.useBackend) {
+    if (state.fullMetaSearch) {
+      filteredMetrics = state.metaHaystackOrder.map((needle: string) => state.metaHaystackDictionary[needle]);
+    } else {
+      filteredMetrics = state.nameHaystackOrder.map((needle: string) => state.nameHaystackDictionary[needle]);
+    }
+  }
+
+  if (state.selectedTypes.length > 0) {
+    filteredMetrics = filteredMetrics.filter((m: MetricData, idx) => {
+      // Matches type
+      const matchesSelectedType = state.selectedTypes.some((t) => {
+        if (m.type && t.value) {
+          return m.type.includes(t.value);
+        }
+
+        if (!m.type && t.value === 'no type') {
+          return true;
+        }
+
+        return false;
+      });
+
+      // when a user filters for type, only return metrics with defined types
+      return matchesSelectedType;
+    });
+  }
+
+  if (!state.includeNullMetadata) {
+    filteredMetrics = filteredMetrics.filter((m: MetricData) => {
+      return m.type !== undefined && m.description !== undefined;
+    });
+  }
+
+  return filteredMetrics;
+}
+
+export function calculatePageList(state: MetricsModalState) {
+  if (!state.metrics.length) {
+    return [];
+  }
+
+  const calcResultsPerPage: number = state.resultsPerPage === 0 ? 1 : state.resultsPerPage;
+
+  const pages = Math.floor(filterMetrics(state).length / calcResultsPerPage) + 1;
+
+  return [...Array(pages).keys()].map((i) => i + 1);
+}
+
+export function sliceMetrics(metrics: MetricsData, pageNum: number, resultsPerPage: number) {
+  const calcResultsPerPage: number = resultsPerPage === 0 ? 1 : resultsPerPage;
+  const start: number = pageNum === 1 ? 0 : (pageNum - 1) * calcResultsPerPage;
+  const end: number = start + calcResultsPerPage;
+  return metrics.slice(start, end);
+}
+
+export const calculateResultsPerPage = (results: number, defaultResults: number, max: number) => {
+  if (results < 1) {
+    return 1;
+  }
+
+  if (results > max) {
+    return max;
+  }
+
+  return results ?? defaultResults;
+};
+
+/**
+ * The backend query that replaces the uFuzzy search when the option 'useBackend' has been selected
+ * this is a regex search either to the series or labels Prometheus endpoint
+ * depending on which the Prometheus type or version supports
+ * @param metricText
+ * @param labels
+ * @param datasource
+ */
+export async function getBackendSearchMetrics(
+  metricText: string,
+  labels: QueryBuilderLabelFilter[],
+  datasource: PrometheusDatasource
+): Promise<Array<{ value: string }>> {
+  const queryString = regexifyLabelValuesQueryString(metricText);
+
+  const labelsParams = labels.map((label) => {
+    return `,${label.label}="${label.value}"`;
+  });
+
+  const params = `label_values({__name__=~".*${queryString}"${labels ? labelsParams.join() : ''}},__name__)`;
+
+  const results = datasource.metricFindQuery(params);
+
+  return await results.then((results) => {
+    return results.map((result) => buildMetricData(result.text, datasource));
+  });
+}
+
+export function tracking(event: string, state?: MetricsModalState | null, metric?: string, query?: PromVisualQuery) {
+  switch (event) {
+    case 'grafana_prom_metric_encycopedia_tracking':
+      reportInteraction(event, {
+        metric: metric,
+        hasMetadata: state?.hasMetadata,
+        totalMetricCount: state?.totalMetricCount,
+        fuzzySearchQuery: state?.fuzzySearchQuery,
+        fullMetaSearch: state?.fullMetaSearch,
+        selectedTypes: state?.selectedTypes,
+        useRegexSearch: state?.useBackend,
+        includeResultsWithoutMetadata: state?.includeNullMetadata,
+      });
+    case 'grafana_prom_metric_encycopedia_disable_text_wrap_interaction':
+      reportInteraction(event, {
+        disableTextWrap: state?.disableTextWrap,
+      });
+    case 'grafana_prometheus_metric_encyclopedia_open':
+      reportInteraction(event, {
+        query: query,
+      });
+  }
+}
+
+export const promTypes: PromFilterOption[] = [
+  {
+    value: 'counter',
+    description:
+      'A cumulative metric that represents a single monotonically increasing counter whose value can only increase or be reset to zero on restart.',
+  },
+  {
+    value: 'gauge',
+    description: 'A metric that represents a single numerical value that can arbitrarily go up and down.',
+  },
+  {
+    value: 'histogram',
+    description:
+      'A histogram samples observations (usually things like request durations or response sizes) and counts them in configurable buckets.',
+  },
+  {
+    value: 'summary',
+    description:
+      'A summary samples observations (usually things like request durations and response sizes) and can calculate configurable quantiles over a sliding time window.',
+  },
+  {
+    value: 'unknown',
+    description: 'These metrics have been given the type unknown in the metadata.',
+  },
+  {
+    value: 'no type',
+    description: 'These metrics have no defined type in the metadata.',
+  },
+];
+
+export const placeholders = {
+  browse: 'Search metrics by name',
+  metadataSearchSwitch: 'Include description in search',
+  type: 'Filter by type',
+  includeNullMetadata: 'Include results with no metadata',
+  setUseBackend: 'Enable regex search',
+};
diff --git a/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/state/state.ts b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/state/state.ts
new file mode 100644
index 0000000000000..f22bd73ea4b30
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/state/state.ts
@@ -0,0 +1,116 @@
+import { SelectableValue } from '@grafana/data';
+
+import { PromVisualQuery } from '../../../types';
+import { HaystackDictionary, MetricsData } from '../types';
+
+export const DEFAULT_RESULTS_PER_PAGE = 100;
+export const MAXIMUM_RESULTS_PER_PAGE = 1000;
+
+/**
+ * Initial state for the metrics explorer
+ * @returns
+ */
+export function initialState(query?: PromVisualQuery): MetricsModalState {
+  return {
+    isLoading: true,
+    metrics: [],
+    hasMetadata: true,
+    metaHaystackDictionary: {},
+    metaHaystackMatches: [],
+    metaHaystackOrder: [],
+    nameHaystackDictionary: {},
+    nameHaystackOrder: [],
+    nameHaystackMatches: [],
+    totalMetricCount: 0,
+    filteredMetricCount: null,
+    resultsPerPage: DEFAULT_RESULTS_PER_PAGE,
+    pageNum: 1,
+    fuzzySearchQuery: '',
+    fullMetaSearch: query?.fullMetaSearch ?? false,
+    includeNullMetadata: query?.includeNullMetadata ?? true,
+    selectedTypes: [],
+    useBackend: query?.useBackend ?? false,
+    disableTextWrap: query?.disableTextWrap ?? false,
+    showAdditionalSettings: false,
+  };
+}
+
+/**
+ * The metrics explorer state object
+ */
+export interface MetricsModalState {
+  /** Used for the loading spinner */
+  isLoading: boolean;
+  /**
+   * Initial collection of metrics.
+   * The frontend filters do not impact this, but
+   * it is reduced by the backend search.
+   */
+  metrics: MetricsData;
+  /** Field for disabling type select and switches that rely on metadata */
+  hasMetadata: boolean;
+  /** Used to display metrics and help with fuzzy order */
+  nameHaystackDictionary: HaystackDictionary;
+  /** Used to sort name fuzzy search by relevance */
+  nameHaystackOrder: string[];
+  /** Used to highlight text in fuzzy matches */
+  nameHaystackMatches: string[];
+  /** Used to display metrics and help with fuzzy order for search across all metadata */
+  metaHaystackDictionary: HaystackDictionary;
+  /** Used to sort meta fuzzy search by relevance */
+  metaHaystackOrder: string[];
+  /** Used to highlight text in fuzzy matches */
+  metaHaystackMatches: string[];
+  /** Total results computed on initialization */
+  totalMetricCount: number;
+  /** Set after filtering metrics */
+  filteredMetricCount: number | null;
+  /** Pagination field for showing results in table */
+  resultsPerPage: number;
+  /** Pagination field */
+  pageNum: number;
+  /** The text query used to match metrics */
+  fuzzySearchQuery: string;
+  /** Enables the fuzzy meatadata search */
+  fullMetaSearch: boolean;
+  /** Includes results that are missing type and description */
+  includeNullMetadata: boolean;
+  /** Filter by prometheus type */
+  selectedTypes: Array<SelectableValue<string>>;
+  /** Filter by the series match endpoint instead of the fuzzy search */
+  useBackend: boolean;
+  /** Disable text wrap for descriptions in the results table */
+  disableTextWrap: boolean;
+  /** Display toggle switches for settings */
+  showAdditionalSettings: boolean;
+}
+
+/**
+ * Type for the useEffect get metadata function
+ */
+export type MetricsModalMetadata = {
+  isLoading: boolean;
+  metrics: MetricsData;
+  hasMetadata: boolean;
+  metaHaystackDictionary: HaystackDictionary;
+  nameHaystackDictionary: HaystackDictionary;
+  totalMetricCount: number;
+  filteredMetricCount: number | null;
+};
+
+// for updating the settings in the PromQuery model
+export function getSettings(visQuery: PromVisualQuery): MetricsModalSettings {
+  return {
+    useBackend: visQuery?.useBackend ?? false,
+    disableTextWrap: visQuery?.disableTextWrap ?? false,
+    fullMetaSearch: visQuery?.fullMetaSearch ?? false,
+    includeNullMetadata: visQuery.includeNullMetadata ?? false,
+  };
+}
+
+export type MetricsModalSettings = {
+  useBackend?: boolean;
+  disableTextWrap?: boolean;
+  fullMetaSearch?: boolean;
+  includeNullMetadata?: boolean;
+};
diff --git a/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/styles.ts b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/styles.ts
new file mode 100644
index 0000000000000..e8eb2fe86dd76
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/styles.ts
@@ -0,0 +1,101 @@
+import { css } from '@emotion/css';
+
+import { GrafanaTheme2 } from '@grafana/data';
+
+export const getStyles = (theme: GrafanaTheme2, disableTextWrap: boolean) => {
+  return {
+    modal: css`
+      width: 85vw;
+      ${theme.breakpoints.down('md')} {
+        width: 100%;
+      }
+      ${theme.breakpoints.up('xl')} {
+        width: 60%;
+      }
+    `,
+    inputWrapper: css`
+      display: flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+    `,
+    inputItemFirst: css`
+      flex-basis: 40%;
+      padding-right: 16px;
+      ${theme.breakpoints.down('md')} {
+        padding-right: 0px;
+        padding-bottom: 16px;
+      }
+    `,
+    inputItem: css`
+      flex-grow: 1;
+      flex-basis: 20%;
+      ${theme.breakpoints.down('md')} {
+        min-width: 100%;
+      }
+    `,
+    selectWrapper: css`
+      margin-bottom: ${theme.spacing(1)};
+    `,
+    resultsAmount: css`
+      color: ${theme.colors.text.secondary};
+      font-size: 0.85rem;
+      padding: 0 0 4px 0;
+    `,
+    resultsData: css`
+      margin: 4px 0 ${theme.spacing(2)} 0;
+    `,
+    resultsDataCount: css`
+      margin: 0;
+    `,
+    resultsDataFiltered: css`
+      color: ${theme.colors.text.secondary};
+      text-align: center;
+      border: solid 1px rgba(204, 204, 220, 0.25);
+      padding: 7px;
+    `,
+    resultsDataFilteredText: css`
+      display: inline;
+      vertical-align: text-top;
+    `,
+    results: css`
+      height: calc(80vh - 310px);
+      overflow-y: scroll;
+    `,
+    resultsFooter: css`
+      margin-top: 24px;
+      display: flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+      justify-content: space-between;
+      align-items: center;
+      position: sticky;
+    `,
+    currentlySelected: css`
+      color: grey;
+      opacity: 75%;
+      font-size: 0.75rem;
+    `,
+    loadingSpinner: css`
+      visibility: hidden;
+    `,
+    visible: css`
+      visibility: visible;
+    `,
+    settingsBtn: css`
+      float: right;
+    `,
+    noBorder: css`
+      border: none;
+    `,
+    resultsPerPageLabel: css`
+      color: ${theme.colors.text.secondary};
+      opacity: 75%;
+      padding-top: 5px;
+      font-size: 0.85rem;
+      margin-right: 8px;
+    `,
+    resultsPerPageWrapper: css`
+      display: flex;
+    `,
+  };
+};
diff --git a/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/types.ts b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/types.ts
new file mode 100644
index 0000000000000..d4be9a4863869
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/types.ts
@@ -0,0 +1,30 @@
+export type MetricsData = MetricData[];
+
+export type MetricData = {
+  value: string;
+  type?: string | null;
+  description?: string;
+};
+
+export type PromFilterOption = {
+  value: string;
+  description: string;
+};
+
+export interface HaystackDictionary {
+  [needle: string]: MetricData;
+}
+
+export type UFuzzyInfo = {
+  idx: number[];
+  start: number[];
+  chars: number[];
+  terms: number[];
+  interIns: number[];
+  intraIns: number[];
+  interLft2: number[];
+  interRgt2: number[];
+  interLft1: number[];
+  interRgt1: number[];
+  ranges: number[][];
+};
diff --git a/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/uFuzzy.ts b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/uFuzzy.ts
new file mode 100644
index 0000000000000..7c7e5eb44ea2b
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/uFuzzy.ts
@@ -0,0 +1,45 @@
+import uFuzzy from '@leeoniya/ufuzzy';
+import { debounce as debounceLodash } from 'lodash';
+
+const uf = new uFuzzy({
+  intraMode: 1,
+  intraIns: 1,
+  intraSub: 1,
+  intraTrn: 1,
+  intraDel: 1,
+});
+
+export function fuzzySearch(haystack: string[], query: string, dispatcher: (data: string[][]) => void) {
+  const [idxs, info, order] = uf.search(haystack, query, 0, 1e5);
+
+  let haystackOrder: string[] = [];
+  let matchesSet: Set<string> = new Set();
+  if (idxs && order) {
+    /**
+     * get the fuzzy matches for hilighting
+     * @param part
+     * @param matched
+     */
+    const mark = (part: string, matched: boolean) => {
+      if (matched) {
+        matchesSet.add(part);
+      }
+    };
+
+    // Iterate to create the order of needles(queries) and the matches
+    for (let i = 0; i < order.length; i++) {
+      let infoIdx = order[i];
+
+      /** Evaluate the match, get the matches for highlighting */
+      uFuzzy.highlight(haystack[info.idx[infoIdx]], info.ranges[infoIdx], mark);
+      /** Get the order */
+      haystackOrder.push(haystack[info.idx[infoIdx]]);
+    }
+
+    dispatcher([haystackOrder, [...matchesSet]]);
+  } else if (!query) {
+    dispatcher([[], []]);
+  }
+}
+
+export const debouncedFuzzySearch = debounceLodash(fuzzySearch, 300);
diff --git a/packages/grafana-prometheus/src/querybuilder/components/promQail/PromQail.test.tsx b/packages/grafana-prometheus/src/querybuilder/components/promQail/PromQail.test.tsx
new file mode 100644
index 0000000000000..b4056fb8bca2e
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/promQail/PromQail.test.tsx
@@ -0,0 +1,148 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { DataSourceInstanceSettings, DataSourcePluginMeta } from '@grafana/data';
+
+import { PrometheusDatasource } from '../../../datasource';
+import PromQlLanguageProvider from '../../../language_provider';
+import { EmptyLanguageProviderMock } from '../../../language_provider.mock';
+import { PromOptions } from '../../../types';
+import { PromVisualQuery } from '../../types';
+
+import { PromQail, queryAssistanttestIds } from './PromQail';
+
+// don't care about interaction tracking in our unit tests
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  reportInteraction: jest.fn(),
+}));
+
+window.HTMLElement.prototype.scrollIntoView = jest.fn();
+
+describe('PromQail', () => {
+  it('renders the drawer', async () => {
+    setup(defaultQuery);
+    await waitFor(() => {
+      expect(screen.getByText('Query advisor')).toBeInTheDocument();
+    });
+  });
+
+  it('shows an option to not show security warning', async () => {
+    setup(defaultQuery);
+    await waitFor(() => {
+      expect(screen.getByText("Don't show this message again")).toBeInTheDocument();
+    });
+  });
+
+  it('shows selected metric and asks for a prompt', async () => {
+    setup(defaultQuery);
+
+    await clickSecurityButton();
+
+    await waitFor(() => {
+      expect(screen.getByText('random_metric')).toBeInTheDocument();
+      expect(screen.getByText('Do you know what you want to query?')).toBeInTheDocument();
+    });
+  });
+
+  it('displays a prompt when the user knows what they want to query', async () => {
+    setup(defaultQuery);
+
+    await clickSecurityButton();
+
+    await waitFor(() => {
+      expect(screen.getByText('random_metric')).toBeInTheDocument();
+      expect(screen.getByText('Do you know what you want to query?')).toBeInTheDocument();
+    });
+
+    const aiPrompt = screen.getByTestId(queryAssistanttestIds.clickForAi);
+
+    await userEvent.click(aiPrompt);
+
+    await waitFor(() => {
+      expect(screen.getByText('What kind of data do you want to see with your metric?')).toBeInTheDocument();
+    });
+  });
+
+  it('does not display a prompt when choosing historical', async () => {
+    setup(defaultQuery);
+
+    await clickSecurityButton();
+
+    await waitFor(() => {
+      expect(screen.getByText('random_metric')).toBeInTheDocument();
+      expect(screen.getByText('Do you know what you want to query?')).toBeInTheDocument();
+    });
+
+    const historicalPrompt = screen.getByTestId(queryAssistanttestIds.clickForHistorical);
+
+    await userEvent.click(historicalPrompt);
+
+    await waitFor(() => {
+      expect(screen.queryByText('What kind of data do you want to see with your metric?')).toBeNull();
+    });
+  });
+});
+
+const defaultQuery: PromVisualQuery = {
+  metric: 'random_metric',
+  labels: [],
+  operations: [],
+};
+
+function createDatasource(withLabels?: boolean) {
+  const languageProvider = new EmptyLanguageProviderMock() as unknown as PromQlLanguageProvider;
+
+  languageProvider.metricsMetadata = {
+    'all-metrics': {
+      type: 'all-metrics-type',
+      help: 'all-metrics-help',
+    },
+    a: {
+      type: 'counter',
+      help: 'a-metric-help',
+    },
+    a_bucket: {
+      type: 'counter',
+      help: 'for functions',
+    },
+  };
+
+  const datasource = new PrometheusDatasource(
+    {
+      url: '',
+      jsonData: {},
+      meta: {} as DataSourcePluginMeta,
+    } as DataSourceInstanceSettings<PromOptions>,
+    undefined,
+    languageProvider
+  );
+  return datasource;
+}
+
+function createProps(query: PromVisualQuery, datasource: PrometheusDatasource) {
+  return {
+    datasource,
+    onChange: jest.fn(),
+    closeDrawer: jest.fn(),
+    query: query,
+  };
+}
+
+function setup(query: PromVisualQuery) {
+  const withLabels: boolean = query.labels.length > 0;
+  const datasource = createDatasource(withLabels);
+  const props = createProps(query, datasource);
+
+  // render the drawer only
+  const { container } = render(<PromQail {...props} />);
+
+  return container;
+}
+
+async function clickSecurityButton() {
+  const securityInfoButton = screen.getByTestId(queryAssistanttestIds.securityInfoButton);
+
+  await userEvent.click(securityInfoButton);
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/components/promQail/PromQail.tsx b/packages/grafana-prometheus/src/querybuilder/components/promQail/PromQail.tsx
new file mode 100644
index 0000000000000..8777f8c48ab4c
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/promQail/PromQail.tsx
@@ -0,0 +1,616 @@
+import { css, cx } from '@emotion/css';
+import { PayloadAction, createSlice } from '@reduxjs/toolkit';
+import React, { useEffect, useReducer, useRef, useState } from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { reportInteraction } from '@grafana/runtime';
+import { Alert, Button, Checkbox, Input, Spinner, useTheme2 } from '@grafana/ui';
+
+import { PrometheusDatasource } from '../../../datasource';
+import store from '../../../gcopypaste/app/core/store';
+import { PromVisualQuery } from '../../types';
+
+import { QuerySuggestionContainer } from './QuerySuggestionContainer';
+// @ts-ignore until we can get these added for icons
+import AI_Logo_color from './resources/AI_Logo_color.svg';
+import { promQailExplain, promQailSuggest } from './state/helpers';
+import { createInteraction, initialState } from './state/state';
+import { Interaction, SuggestionType } from './types';
+
+export type PromQailProps = {
+  query: PromVisualQuery;
+  closeDrawer: () => void;
+  onChange: (query: PromVisualQuery) => void;
+  datasource: PrometheusDatasource;
+};
+
+const SKIP_STARTING_MESSAGE = 'SKIP_STARTING_MESSAGE';
+
+export const PromQail = (props: PromQailProps) => {
+  const { query, closeDrawer, onChange, datasource } = props;
+  const skipStartingMessage = store.getBool(SKIP_STARTING_MESSAGE, false);
+
+  const [state, dispatch] = useReducer(stateSlice.reducer, initialState(query, !skipStartingMessage));
+
+  const [labelNames, setLabelNames] = useState<string[]>([]);
+
+  const suggestions = state.interactions.reduce((acc, int) => acc + int.suggestions.length, 0);
+
+  const responsesEndRef = useRef(null);
+
+  const scrollToBottom = () => {
+    if (responsesEndRef) {
+      // @ts-ignore for React.MutableRefObject
+      responsesEndRef?.current?.scrollIntoView({ behavior: 'smooth' });
+    }
+  };
+
+  useEffect(() => {
+    // only scroll when an interaction has been added or the suggestions have been updated
+    scrollToBottom();
+  }, [state.interactions.length, suggestions]);
+
+  useEffect(() => {
+    const fetchLabels = async () => {
+      let labelsIndex: Record<string, string[]> = await datasource.languageProvider.fetchLabelsWithMatch(query.metric);
+      setLabelNames(Object.keys(labelsIndex));
+    };
+    fetchLabels();
+  }, [query, datasource]);
+
+  const theme = useTheme2();
+  const styles = getStyles(theme);
+
+  return (
+    <div className={styles.containerPadding}>
+      {/* Query Advisor */}
+      {/* header */}
+      <div className={styles.header}>
+        <h3>Query advisor</h3>
+        <Button icon="times" fill="text" variant="secondary" onClick={closeDrawer} />
+      </div>
+      {/* Starting message */}
+      <div>
+        <div className={styles.iconSection}>
+          <img src={AI_Logo_color} alt="AI logo color" /> Assistant
+        </div>
+        {state.showStartingMessage ? (
+          <>
+            <div className={styles.dataList}>
+              <ol>
+                <li className={styles.textPadding}>
+                  Query Advisor suggests queries based on a metric and requests you type in.
+                </li>
+                <li className={styles.textPadding}>
+                  Query Advisor sends Prometheus metrics, labels and metadata to the LLM provider you&#39;ve configured.
+                  Be sure to align its usage with your company&#39;s internal policies.
+                </li>
+                <li className={styles.textPadding}>
+                  An AI-suggested query may not fully answer your question. Always take a moment to understand a query
+                  before you use it.
+                </li>
+              </ol>
+            </div>
+            <Alert
+              title={''}
+              severity={'info'}
+              key={'promqail-llm-app'}
+              className={cx(styles.textPadding, styles.noMargin)}
+            >
+              Query Advisor is currently in Private Preview. Feedback is appreciated and can be provided on explanations
+              and suggestions.
+            </Alert>
+
+            {/* don't show this message again, store in localstorage */}
+            <div className={styles.textPadding}>
+              <Checkbox
+                checked={state.indicateCheckbox}
+                value={state.indicateCheckbox}
+                onChange={() => {
+                  const val = store.getBool(SKIP_STARTING_MESSAGE, false);
+                  store.set(SKIP_STARTING_MESSAGE, !val);
+                  dispatch(indicateCheckbox(!val));
+                }}
+                label="Don't show this message again"
+              />
+            </div>
+            <div className={styles.rightButtonsWrapper}>
+              <div className={styles.rightButtons}>
+                <Button className={styles.leftButton} fill="outline" variant="secondary" onClick={closeDrawer}>
+                  Cancel
+                </Button>
+                <Button
+                  fill="solid"
+                  variant="primary"
+                  onClick={() => dispatch(showStartingMessage(false))}
+                  data-testid={queryAssistanttestIds.securityInfoButton}
+                >
+                  Continue
+                </Button>
+              </div>
+            </div>
+          </>
+        ) : (
+          <div className={styles.bodySmall}>
+            {/* MAKE THIS TABLE RESPONSIVE */}
+            {/* FIT SUPER LONG METRICS AND LABELS IN HERE */}
+            <div className={styles.textPadding}>Here is the metric you have selected:</div>
+            <div className={styles.infoContainerWrapper}>
+              <div className={styles.infoContainer}>
+                <table className={styles.metricTable}>
+                  <tbody>
+                    <tr>
+                      <td className={styles.metricTableName}>metric</td>
+                      <td className={styles.metricTableValue}>{state.query.metric}</td>
+                      <td>
+                        <Button
+                          fill="outline"
+                          variant="secondary"
+                          onClick={closeDrawer}
+                          className={styles.metricTableButton}
+                          size={'sm'}
+                        >
+                          Choose new metric
+                        </Button>
+                      </td>
+                    </tr>
+                    {state.query.labels.map((label, idx) => {
+                      const text = idx === 0 ? 'labels' : '';
+                      return (
+                        <tr key={`${label.label}-${idx}`}>
+                          <td>{text}</td>
+                          <td className={styles.metricTableValue}>{`${label.label}${label.op}${label.value}`}</td>
+                          <td> </td>
+                        </tr>
+                      );
+                    })}
+                  </tbody>
+                </table>
+              </div>
+            </div>
+
+            {/* Ask if you know what you want to query? */}
+            {!state.askForQueryHelp && state.interactions.length === 0 && (
+              <>
+                <div className={styles.queryQuestion}>Do you know what you want to query?</div>
+                <div className={styles.rightButtonsWrapper}>
+                  <div className={styles.rightButtons}>
+                    <Button
+                      className={styles.leftButton}
+                      fill="solid"
+                      variant="secondary"
+                      data-testid={queryAssistanttestIds.clickForHistorical}
+                      onClick={() => {
+                        const isLoading = true;
+                        const suggestionType = SuggestionType.Historical;
+                        dispatch(addInteraction({ suggestionType, isLoading }));
+                        reportInteraction('grafana_prometheus_promqail_know_what_you_want_to_query', {
+                          promVisualQuery: query,
+                          doYouKnow: 'no',
+                        });
+                        promQailSuggest(dispatch, 0, query, labelNames, datasource);
+                      }}
+                    >
+                      No
+                    </Button>
+                    <Button
+                      fill="solid"
+                      variant="primary"
+                      data-testid={queryAssistanttestIds.clickForAi}
+                      onClick={() => {
+                        reportInteraction('grafana_prometheus_promqail_know_what_you_want_to_query', {
+                          promVisualQuery: query,
+                          doYouKnow: 'yes',
+                        });
+                        const isLoading = false;
+                        const suggestionType = SuggestionType.AI;
+                        dispatch(addInteraction({ suggestionType, isLoading }));
+                      }}
+                    >
+                      Yes
+                    </Button>
+                  </div>
+                </div>
+              </>
+            )}
+
+            {state.interactions.map((interaction: Interaction, idx: number) => {
+              return (
+                <div key={idx}>
+                  {interaction.suggestionType === SuggestionType.AI ? (
+                    <>
+                      <div className={styles.textPadding}>What kind of data do you want to see with your metric?</div>
+                      <div className={cx(styles.secondaryText, styles.bottomMargin)}>
+                        <div>You do not need to enter in a metric or a label again in the prompt.</div>
+                        <div>Example: I want to monitor request latency, not errors.</div>
+                      </div>
+                      <div className={styles.inputPadding}>
+                        <Input
+                          value={interaction.prompt}
+                          spellCheck={false}
+                          placeholder="Enter prompt"
+                          disabled={interaction.suggestions.length > 0}
+                          onChange={(e) => {
+                            const prompt = e.currentTarget.value;
+
+                            const payload = {
+                              idx: idx,
+                              interaction: { ...interaction, prompt },
+                            };
+
+                            dispatch(updateInteraction(payload));
+                          }}
+                        />
+                      </div>
+                      {interaction.suggestions.length === 0 ? (
+                        interaction.isLoading ? (
+                          <>
+                            <div className={styles.loadingMessageContainer}>
+                              Waiting for OpenAI <Spinner className={styles.floatRight} />
+                            </div>
+                          </>
+                        ) : (
+                          <>
+                            <div className={styles.rightButtonsWrapper}>
+                              <div className={styles.rightButtons}>
+                                <Button
+                                  className={styles.leftButton}
+                                  fill="outline"
+                                  variant="secondary"
+                                  onClick={closeDrawer}
+                                >
+                                  Cancel
+                                </Button>
+                                <Button
+                                  className={styles.leftButton}
+                                  fill="outline"
+                                  variant="secondary"
+                                  onClick={() => {
+                                    // JUST SUGGEST QUERIES AND SHOW THE LIST
+                                    const newInteraction: Interaction = {
+                                      ...interaction,
+                                      suggestionType: SuggestionType.Historical,
+                                      isLoading: true,
+                                    };
+
+                                    const payload = {
+                                      idx: idx,
+                                      interaction: newInteraction,
+                                    };
+
+                                    reportInteraction('grafana_prometheus_promqail_suggest_query_instead', {
+                                      promVisualQuery: query,
+                                    });
+
+                                    dispatch(updateInteraction(payload));
+                                    promQailSuggest(dispatch, idx, query, labelNames, datasource, newInteraction);
+                                  }}
+                                >
+                                  Suggest queries instead
+                                </Button>
+                                <Button
+                                  fill="solid"
+                                  variant="primary"
+                                  data-testid={queryAssistanttestIds.submitPrompt + idx}
+                                  onClick={() => {
+                                    const newInteraction: Interaction = {
+                                      ...interaction,
+                                      isLoading: true,
+                                    };
+
+                                    const payload = {
+                                      idx: idx,
+                                      interaction: newInteraction,
+                                    };
+
+                                    reportInteraction('grafana_prometheus_promqail_prompt_submitted', {
+                                      promVisualQuery: query,
+                                      prompt: interaction.prompt,
+                                    });
+
+                                    dispatch(updateInteraction(payload));
+                                    // add the suggestions in the API call
+                                    promQailSuggest(dispatch, idx, query, labelNames, datasource, interaction);
+                                  }}
+                                >
+                                  Submit
+                                </Button>
+                              </div>
+                            </div>
+                          </>
+                        )
+                      ) : (
+                        // LIST OF SUGGESTED QUERIES FROM AI
+                        <QuerySuggestionContainer
+                          suggestionType={SuggestionType.AI}
+                          querySuggestions={interaction.suggestions}
+                          closeDrawer={closeDrawer}
+                          nextInteraction={() => {
+                            const isLoading = false;
+                            const suggestionType = SuggestionType.AI;
+                            dispatch(addInteraction({ suggestionType, isLoading }));
+                          }}
+                          queryExplain={(suggIdx: number) =>
+                            interaction.suggestions[suggIdx].explanation === ''
+                              ? promQailExplain(dispatch, idx, query, interaction, suggIdx, datasource)
+                              : interaction.suggestions[suggIdx].explanation
+                          }
+                          onChange={onChange}
+                          prompt={interaction.prompt ?? ''}
+                        />
+                      )}
+                    </>
+                  ) : // HISTORICAL SUGGESTIONS
+                  interaction.isLoading ? (
+                    <>
+                      <div className={styles.loadingMessageContainer}>
+                        Waiting for OpenAI <Spinner className={styles.floatRight} />
+                      </div>
+                    </>
+                  ) : (
+                    // LIST OF SUGGESTED QUERIES FROM HISTORICAL DATA
+                    <QuerySuggestionContainer
+                      suggestionType={SuggestionType.Historical}
+                      querySuggestions={interaction.suggestions}
+                      closeDrawer={closeDrawer}
+                      nextInteraction={() => {
+                        const isLoading = false;
+                        const suggestionType = SuggestionType.AI;
+                        dispatch(addInteraction({ suggestionType, isLoading }));
+                      }}
+                      queryExplain={(suggIdx: number) =>
+                        interaction.suggestions[suggIdx].explanation === ''
+                          ? promQailExplain(dispatch, idx, query, interaction, suggIdx, datasource)
+                          : interaction.suggestions[suggIdx].explanation
+                      }
+                      onChange={onChange}
+                      prompt={interaction.prompt ?? ''}
+                    />
+                  )}
+                </div>
+              );
+            })}
+          </div>
+        )}
+      </div>
+      <div ref={responsesEndRef} />
+    </div>
+  );
+};
+
+export const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    sectionPadding: css({
+      padding: '20px',
+    }),
+    header: css({
+      display: 'flex',
+
+      button: {
+        marginLeft: 'auto',
+      },
+    }),
+    iconSection: css({
+      padding: '0 0 10px 0',
+      color: `${theme.colors.text.secondary}`,
+
+      img: {
+        paddingRight: '4px',
+      },
+    }),
+    rightButtonsWrapper: css({
+      display: 'flex',
+    }),
+    rightButtons: css({
+      marginLeft: 'auto',
+    }),
+    leftButton: css({
+      marginRight: '10px',
+    }),
+    dataList: css({
+      padding: '0px 28px 0px 28px',
+    }),
+    textPadding: css({
+      paddingBottom: '12px',
+    }),
+    containerPadding: css({
+      padding: '28px',
+    }),
+    infoContainer: css({
+      border: `${theme.colors.border.strong}`,
+      padding: '16px',
+      backgroundColor: `${theme.colors.background.secondary}`,
+      borderRadius: `8px`,
+      borderBottomLeftRadius: 0,
+    }),
+    infoContainerWrapper: css({
+      paddingBottom: '24px',
+    }),
+    metricTable: css({
+      width: '100%',
+    }),
+    metricTableName: css({
+      width: '15%',
+    }),
+    metricTableValue: css({
+      fontFamily: `${theme.typography.fontFamilyMonospace}`,
+      fontSize: `${theme.typography.bodySmall.fontSize}`,
+      overflow: 'scroll',
+      textWrap: 'nowrap',
+      maxWidth: '150px',
+      width: '60%',
+      maskImage: `linear-gradient(to right, rgba(0, 0, 0, 1) 90%, rgba(0, 0, 0, 0))`,
+    }),
+    metricTableButton: css({
+      float: 'right',
+    }),
+    queryQuestion: css({
+      textAlign: 'end',
+      padding: '8px 0',
+    }),
+    secondaryText: css({
+      color: `${theme.colors.text.secondary}`,
+    }),
+    loadingMessageContainer: css({
+      border: `${theme.colors.border.strong}`,
+      padding: `16px`,
+      backgroundColor: `${theme.colors.background.secondary}`,
+      marginBottom: `20px`,
+      borderRadius: `8px`,
+      color: `${theme.colors.text.secondary}`,
+      fontStyle: 'italic',
+    }),
+    floatRight: css({
+      float: 'right',
+    }),
+    codeText: css({
+      fontFamily: `${theme.typography.fontFamilyMonospace}`,
+      fontSize: `${theme.typography.bodySmall.fontSize}`,
+    }),
+    bodySmall: css({
+      fontSize: `${theme.typography.bodySmall.fontSize}`,
+    }),
+    explainPadding: css({
+      paddingLeft: '26px',
+    }),
+    bottomMargin: css({
+      marginBottom: '20px',
+    }),
+    topPadding: css({
+      paddingTop: '22px',
+    }),
+    doc: css({
+      textDecoration: 'underline',
+    }),
+    afterButtons: css({
+      display: 'flex',
+      justifyContent: 'flex-end',
+    }),
+    feedbackStyle: css({
+      margin: 0,
+      textAlign: 'right',
+      paddingTop: '22px',
+      paddingBottom: '22px',
+    }),
+    nextInteractionHeight: css({
+      height: '88px',
+    }),
+    center: css({
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'center',
+    }),
+    inputPadding: css({
+      paddingBottom: '24px',
+    }),
+    querySuggestion: css({
+      display: 'flex',
+      flexWrap: 'nowrap',
+    }),
+    longCode: css({
+      width: '90%',
+      textWrap: 'nowrap',
+      overflow: 'scroll',
+      maskImage: `linear-gradient(to right, rgba(0, 0, 0, 1) 90%, rgba(0, 0, 0, 0))`,
+
+      div: {
+        display: 'inline-block',
+      },
+    }),
+    useButton: css({
+      marginLeft: 'auto',
+    }),
+    suggestionFeedback: css({
+      textAlign: 'left',
+    }),
+    feedbackQuestion: css({
+      display: 'flex',
+      padding: '8px 0px',
+      h6: { marginBottom: 0 },
+      i: {
+        marginTop: '1px',
+      },
+    }),
+    explationTextInput: css({
+      paddingLeft: '24px',
+    }),
+    submitFeedback: css({
+      padding: '16px 0',
+    }),
+    noMargin: css({
+      margin: 0,
+    }),
+    enableButtonTooltip: css({
+      padding: 8,
+    }),
+    enableButtonTooltipText: css({
+      color: `${theme.colors.text.secondary}`,
+      ul: {
+        marginLeft: 16,
+      },
+    }),
+    link: css({
+      color: `${theme.colors.text.link} !important`,
+    }),
+  };
+};
+
+export const queryAssistanttestIds = {
+  promQail: 'prom-qail',
+  securityInfoButton: 'security-info-button',
+  clickForHistorical: 'click-for-historical',
+  clickForAi: 'click-for-ai',
+  submitPrompt: 'submit-prompt',
+  refinePrompt: 'refine-prompt',
+};
+
+const stateSlice = createSlice({
+  name: 'metrics-modal-state',
+  initialState: initialState(),
+  reducers: {
+    showExplainer: (state, action: PayloadAction<boolean>) => {
+      state.showExplainer = action.payload;
+    },
+    showStartingMessage: (state, action: PayloadAction<boolean>) => {
+      state.showStartingMessage = action.payload;
+    },
+    indicateCheckbox: (state, action: PayloadAction<boolean>) => {
+      state.indicateCheckbox = action.payload;
+    },
+    askForQueryHelp: (state, action: PayloadAction<boolean>) => {
+      state.askForQueryHelp = action.payload;
+    },
+    /*
+     * start working on a collection of interactions
+     * {
+     *  askForhelp y n
+     *  prompt question
+     *  queries querySuggestions
+     * }
+     *
+     */
+    addInteraction: (state, action: PayloadAction<{ suggestionType: SuggestionType; isLoading: boolean }>) => {
+      // AI or Historical?
+      const interaction = createInteraction(action.payload.suggestionType, action.payload.isLoading);
+      const interactions = state.interactions;
+      state.interactions = interactions.concat([interaction]);
+    },
+    updateInteraction: (state, action: PayloadAction<{ idx: number; interaction: Interaction }>) => {
+      // update the interaction by index
+      // will most likely be the last interaction but we might update previous by giving them cues of helpful or not
+      const index = action.payload.idx;
+      const updInteraction = action.payload.interaction;
+
+      state.interactions = state.interactions.map((interaction: Interaction, idx: number) => {
+        if (idx === index) {
+          return updInteraction;
+        }
+
+        return interaction;
+      });
+    },
+  },
+});
+
+// actions to update the state
+export const { showStartingMessage, indicateCheckbox, addInteraction, updateInteraction } = stateSlice.actions;
diff --git a/packages/grafana-prometheus/src/querybuilder/components/promQail/QueryAssistantButton.test.tsx b/packages/grafana-prometheus/src/querybuilder/components/promQail/QueryAssistantButton.test.tsx
new file mode 100644
index 0000000000000..2b64277c22ca1
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/promQail/QueryAssistantButton.test.tsx
@@ -0,0 +1,51 @@
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { QueryAssistantButton } from './QueryAssistantButton';
+
+const setShowDrawer = jest.fn(() => {});
+
+describe('QueryAssistantButton', () => {
+  it('renders the button', async () => {
+    const props = createProps(true, 'metric', setShowDrawer);
+    render(<QueryAssistantButton {...props} />);
+    expect(screen.getByText('Get query suggestions')).toBeInTheDocument();
+  });
+
+  it('shows the LLM app disabled message when LLM app is not set up with vector DB', async () => {
+    const props = createProps(false, 'metric', setShowDrawer);
+    render(<QueryAssistantButton {...props} />);
+    const button = screen.getByText('Get query suggestions');
+    await userEvent.hover(button);
+    await waitFor(() => {
+      expect(screen.getByText('Install and enable the LLM plugin')).toBeInTheDocument();
+    });
+  });
+
+  it('shows the message to select a metric when LLM is enabled and no metric is selected', async () => {
+    const props = createProps(true, '', setShowDrawer);
+    render(<QueryAssistantButton {...props} />);
+    const button = screen.getByText('Get query suggestions');
+    await userEvent.hover(button);
+    await waitFor(() => {
+      expect(screen.getByText('First, select a metric.')).toBeInTheDocument();
+    });
+  });
+
+  it('calls setShowDrawer when button is clicked', async () => {
+    const props = createProps(true, 'metric', setShowDrawer);
+    render(<QueryAssistantButton {...props} />);
+    const button = screen.getByText('Get query suggestions');
+    fireEvent.click(button);
+    expect(setShowDrawer).toHaveBeenCalled();
+  });
+});
+
+function createProps(llmAppEnabled: boolean, metric: string, setShowDrawer: () => void) {
+  return {
+    llmAppEnabled,
+    metric,
+    setShowDrawer,
+  };
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/components/promQail/QueryAssistantButton.tsx b/packages/grafana-prometheus/src/querybuilder/components/promQail/QueryAssistantButton.tsx
new file mode 100644
index 0000000000000..5445134b64b96
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/promQail/QueryAssistantButton.tsx
@@ -0,0 +1,87 @@
+import React from 'react';
+
+import { selectors } from '@grafana/e2e-selectors';
+import { reportInteraction } from '@grafana/runtime';
+import { Button, Tooltip, useTheme2 } from '@grafana/ui';
+
+import { getStyles } from './PromQail';
+import AI_Logo_color from './resources/AI_Logo_color.svg';
+
+export type Props = {
+  llmAppEnabled: boolean;
+  metric: string;
+  setShowDrawer: (show: boolean) => void;
+};
+
+export function QueryAssistantButton(props: Props) {
+  const { llmAppEnabled, metric, setShowDrawer } = props;
+
+  const llmAppDisabled = !llmAppEnabled;
+  const noMetricSelected = !metric;
+
+  const theme = useTheme2();
+  const styles = getStyles(theme);
+
+  const button = () => {
+    return (
+      <Button
+        variant={'secondary'}
+        onClick={() => {
+          reportInteraction('grafana_prometheus_promqail_ai_button_clicked', {
+            metric: metric,
+          });
+          setShowDrawer(true);
+        }}
+        disabled={!metric || !llmAppEnabled}
+        data-testid={selectors.components.DataSource.Prometheus.queryEditor.builder.queryAdvisor}
+      >
+        <img height={16} src={AI_Logo_color} alt="AI logo black and white" />
+        {'\u00A0'}Get query suggestions
+      </Button>
+    );
+  };
+
+  const selectMetricMessage = (
+    <Tooltip content={'First, select a metric.'} placement={'bottom-end'}>
+      {button()}
+    </Tooltip>
+  );
+
+  const llmAppMessage = (
+    <Tooltip
+      interactive={true}
+      placement={'auto-end'}
+      content={
+        <div className={styles.enableButtonTooltip}>
+          <h6>Query Advisor is disabled</h6>
+          <div className={styles.enableButtonTooltipText}>To enable Query Advisor you must:</div>
+          <div className={styles.enableButtonTooltipText}>
+            <ul>
+              <li>
+                <a
+                  href={'https://grafana.com/docs/grafana-cloud/alerting-and-irm/machine-learning/llm-plugin/'}
+                  target="_blank"
+                  rel="noreferrer noopener"
+                  className={styles.link}
+                >
+                  Install and enable the LLM plugin
+                </a>
+              </li>
+              <li>Select a metric</li>
+            </ul>
+          </div>
+        </div>
+      }
+    >
+      {button()}
+    </Tooltip>
+  );
+
+  if (llmAppDisabled) {
+    return llmAppMessage;
+  } else if (noMetricSelected) {
+    return selectMetricMessage;
+  } else {
+    return button();
+  }
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/components/promQail/QuerySuggestionContainer.tsx b/packages/grafana-prometheus/src/querybuilder/components/promQail/QuerySuggestionContainer.tsx
new file mode 100644
index 0000000000000..1a52194b9cb41
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/promQail/QuerySuggestionContainer.tsx
@@ -0,0 +1,101 @@
+import { cx } from '@emotion/css';
+import React, { useState } from 'react';
+
+import { Button, useTheme2 } from '@grafana/ui';
+
+import { PromVisualQuery } from '../../types';
+
+import { getStyles, queryAssistanttestIds } from './PromQail';
+import { QuerySuggestionItem } from './QuerySuggestionItem';
+import { QuerySuggestion, SuggestionType } from './types';
+
+export type Props = {
+  querySuggestions: QuerySuggestion[];
+  suggestionType: SuggestionType;
+  closeDrawer: () => void;
+  nextInteraction: () => void;
+  queryExplain: (idx: number) => void;
+  onChange: (query: PromVisualQuery) => void;
+  prompt: string;
+};
+
+export function QuerySuggestionContainer(props: Props) {
+  const { suggestionType, querySuggestions, closeDrawer, nextInteraction, queryExplain, onChange, prompt } = props;
+
+  const [hasNextInteraction, updateHasNextInteraction] = useState<boolean>(false);
+
+  const theme = useTheme2();
+  const styles = getStyles(theme);
+
+  let text, secondaryText, refineText;
+
+  if (suggestionType === SuggestionType.Historical) {
+    text = `Here are ${querySuggestions.length} query suggestions:`;
+    refineText = 'I want to write a prompt';
+  } else if (suggestionType === SuggestionType.AI) {
+    text = text = 'Here is your query suggestion:';
+    secondaryText =
+      'This query is based off of natural language descriptions of the most commonly used PromQL queries.';
+    refineText = 'Refine prompt';
+  }
+
+  return (
+    <>
+      {suggestionType === SuggestionType.Historical ? (
+        <div className={styles.bottomMargin}>{text}</div>
+      ) : (
+        <>
+          <div className={styles.textPadding}>{text}</div>
+          <div className={cx(styles.secondaryText, styles.bottomMargin)}>{secondaryText}</div>
+        </>
+      )}
+
+      <div className={styles.infoContainerWrapper}>
+        <div className={styles.infoContainer}>
+          {querySuggestions.map((qs: QuerySuggestion, idx: number) => {
+            return (
+              <QuerySuggestionItem
+                historical={suggestionType === SuggestionType.Historical}
+                querySuggestion={qs}
+                key={idx}
+                order={idx + 1}
+                queryExplain={queryExplain}
+                onChange={onChange}
+                closeDrawer={closeDrawer}
+                last={idx === querySuggestions.length - 1}
+                // for feedback rudderstack events
+                allSuggestions={querySuggestions.reduce((acc: string, qs: QuerySuggestion) => {
+                  return acc + '$$' + qs.query;
+                }, '')}
+                prompt={prompt ?? ''}
+              />
+            );
+          })}
+        </div>
+      </div>
+      {!hasNextInteraction && (
+        <div className={styles.nextInteractionHeight}>
+          <div className={cx(styles.afterButtons, styles.textPadding)}>
+            <Button
+              onClick={() => {
+                updateHasNextInteraction(true);
+                nextInteraction();
+              }}
+              data-testid={queryAssistanttestIds.refinePrompt}
+              fill="outline"
+              variant="secondary"
+              size="md"
+            >
+              {refineText}
+            </Button>
+          </div>
+          <div className={cx(styles.textPadding, styles.floatRight)}>
+            <Button fill="outline" variant="secondary" size="md" onClick={closeDrawer}>
+              Cancel
+            </Button>
+          </div>
+        </div>
+      )}
+    </>
+  );
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/components/promQail/QuerySuggestionItem.tsx b/packages/grafana-prometheus/src/querybuilder/components/promQail/QuerySuggestionItem.tsx
new file mode 100644
index 0000000000000..9076faae6bc27
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/promQail/QuerySuggestionItem.tsx
@@ -0,0 +1,321 @@
+import { cx } from '@emotion/css';
+import React, { FormEvent, useState } from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { reportInteraction } from '@grafana/runtime';
+import { Button, RadioButtonList, Spinner, TextArea, Toggletip, useTheme2 } from '@grafana/ui';
+
+import { buildVisualQueryFromString } from '../../parsing';
+import { PromVisualQuery } from '../../types';
+
+import { getStyles } from './PromQail';
+import { QuerySuggestion } from './types';
+
+export type Props = {
+  querySuggestion: QuerySuggestion;
+  order: number;
+  queryExplain: (idx: number) => void;
+  historical: boolean;
+  onChange: (query: PromVisualQuery) => void;
+  closeDrawer: () => void;
+  last: boolean;
+  prompt: string;
+  allSuggestions: string | undefined;
+};
+
+const suggestionOptions: SelectableValue[] = [
+  { label: 'Yes', value: 'yes' },
+  { label: 'No', value: 'no' },
+];
+const explationOptions: SelectableValue[] = [
+  { label: 'Too vague', value: 'too vague' },
+  { label: 'Too technical', value: 'too technical' },
+  { label: 'Inaccurate', value: 'inaccurate' },
+  { label: 'Other', value: 'other' },
+];
+
+export function QuerySuggestionItem(props: Props) {
+  const { querySuggestion, order, queryExplain, historical, onChange, closeDrawer, last, allSuggestions, prompt } =
+    props;
+  const [showExp, updShowExp] = useState<boolean>(false);
+
+  const [gaveExplanationFeedback, updateGaveExplanationFeedback] = useState<boolean>(false);
+  const [gaveSuggestionFeedback, updateGaveSuggestionFeedback] = useState<boolean>(false);
+
+  const [suggestionFeedback, setSuggestionFeedback] = useState({
+    radioInput: '',
+    text: '',
+  });
+
+  const [explanationFeedback, setExplanationFeedback] = useState({
+    radioInput: '',
+    text: '',
+  });
+
+  const theme = useTheme2();
+  const styles = getStyles(theme);
+
+  const { query, explanation } = querySuggestion;
+
+  const feedbackToggleTip = (type: string) => {
+    const updateRadioFeedback = (value: string) => {
+      if (type === 'explanation') {
+        setExplanationFeedback({
+          ...explanationFeedback,
+          radioInput: value,
+        });
+      } else {
+        setSuggestionFeedback({
+          ...suggestionFeedback,
+          radioInput: value,
+        });
+      }
+    };
+
+    const updateTextFeedback = (e: FormEvent<HTMLTextAreaElement>) => {
+      if (type === 'explanation') {
+        setExplanationFeedback({
+          ...explanationFeedback,
+          text: e.currentTarget.value,
+        });
+      } else {
+        setSuggestionFeedback({
+          ...suggestionFeedback,
+          text: e.currentTarget.value,
+        });
+      }
+    };
+
+    const disabledButton = () =>
+      type === 'explanation' ? !explanationFeedback.radioInput : !suggestionFeedback.radioInput;
+
+    const questionOne =
+      type === 'explanation' ? 'Why was the explanation not helpful?' : 'Were the query suggestions helpful?';
+
+    return (
+      <div className={styles.suggestionFeedback}>
+        <div>
+          <div className={styles.feedbackQuestion}>
+            <h6>{questionOne}</h6>
+            <i>(Required)</i>
+          </div>
+          <RadioButtonList
+            name="default"
+            options={type === 'explanation' ? explationOptions : suggestionOptions}
+            value={type === 'explanation' ? explanationFeedback.radioInput : suggestionFeedback.radioInput}
+            onChange={updateRadioFeedback}
+          />
+        </div>
+        <div className={cx(type === 'explanation' && styles.explationTextInput)}>
+          {type !== 'explanation' && (
+            <div className={styles.feedbackQuestion}>
+              <h6>How can we improve the query suggestions?</h6>
+            </div>
+          )}
+          <TextArea
+            type="text"
+            aria-label="Promqail suggestion text"
+            placeholder="Enter your feedback"
+            value={type === 'explanation' ? explanationFeedback.text : suggestionFeedback.text}
+            onChange={updateTextFeedback}
+            cols={100}
+          />
+        </div>
+
+        <div className={styles.submitFeedback}>
+          <Button
+            variant="primary"
+            size="sm"
+            disabled={disabledButton()}
+            onClick={() => {
+              // submit the rudderstack event
+              if (type === 'explanation') {
+                explanationFeedbackEvent(
+                  explanationFeedback.radioInput,
+                  explanationFeedback.text,
+                  querySuggestion,
+                  historical,
+                  prompt
+                );
+                updateGaveExplanationFeedback(true);
+              } else {
+                suggestionFeedbackEvent(
+                  suggestionFeedback.radioInput,
+                  suggestionFeedback.text,
+                  allSuggestions ?? '',
+                  historical,
+                  prompt
+                );
+                updateGaveSuggestionFeedback(true);
+              }
+            }}
+          >
+            Submit
+          </Button>
+        </div>
+      </div>
+    );
+  };
+
+  return (
+    <>
+      <div className={styles.querySuggestion}>
+        <div title={query} className={cx(styles.codeText, styles.longCode)}>
+          {`${order}.  ${query}`}
+        </div>
+        <div className={styles.useButton}>
+          <Button
+            variant="primary"
+            size="sm"
+            onClick={() => {
+              reportInteraction('grafana_prometheus_promqail_use_query_button_clicked', {
+                query: querySuggestion.query,
+              });
+              const pvq = buildVisualQueryFromString(querySuggestion.query);
+              // check for errors!
+              onChange(pvq.query);
+              closeDrawer();
+            }}
+          >
+            Use
+          </Button>
+        </div>
+      </div>
+      <div>
+        <Button
+          fill="text"
+          variant="secondary"
+          icon={showExp ? 'angle-up' : 'angle-down'}
+          onClick={() => {
+            updShowExp(!showExp);
+            queryExplain(order - 1);
+          }}
+          className={cx(styles.bodySmall)}
+          size="sm"
+        >
+          Explainer
+        </Button>
+        {!showExp && order !== 5 && <div className={styles.textPadding}></div>}
+
+        {showExp && !querySuggestion.explanation && (
+          <div className={styles.center}>
+            <Spinner />
+          </div>
+        )}
+        {showExp && querySuggestion.explanation && (
+          <>
+            <div className={cx(styles.bodySmall, styles.explainPadding)}>
+              <div className={styles.textPadding}>This query is trying to answer the question:</div>
+              <div className={styles.textPadding}>{explanation}</div>
+              <div className={styles.textPadding}>
+                Learn more with this{' '}
+                <a
+                  className={styles.doc}
+                  href={'https://prometheus.io/docs/prometheus/latest/querying/examples/#query-examples'}
+                  target="_blank"
+                  rel="noopener noreferrer"
+                >
+                  Prometheus doc
+                </a>
+              </div>
+
+              <div className={cx(styles.rightButtons, styles.secondaryText)}>
+                Was this explanation helpful?
+                <div className={styles.floatRight}>
+                  {!gaveExplanationFeedback ? (
+                    <>
+                      <Button
+                        fill="outline"
+                        variant="secondary"
+                        size="sm"
+                        className={styles.leftButton}
+                        onClick={() => {
+                          explanationFeedbackEvent('Yes', '', querySuggestion, historical, prompt);
+                          updateGaveExplanationFeedback(true);
+                        }}
+                      >
+                        Yes
+                      </Button>
+                      <Toggletip
+                        aria-label="Suggestion feedback"
+                        content={feedbackToggleTip('explanation')}
+                        placement="bottom-end"
+                        closeButton={true}
+                      >
+                        <Button variant="success" size="sm">
+                          No
+                        </Button>
+                      </Toggletip>
+                    </>
+                  ) : (
+                    'Thank you for your feedback!'
+                  )}
+                </div>
+              </div>
+            </div>
+
+            {!last && <hr />}
+          </>
+        )}
+        {last && (
+          <div className={cx(styles.feedbackStyle)}>
+            {!gaveSuggestionFeedback ? (
+              <Toggletip
+                aria-label="Suggestion feedback"
+                content={feedbackToggleTip('suggestion')}
+                placement="bottom-end"
+                closeButton={true}
+              >
+                <Button fill="outline" variant="secondary" size="sm">
+                  Give feedback on suggestions
+                </Button>
+              </Toggletip>
+            ) : (
+              // do this weird thing because the toggle tip doesn't allow an extra close function
+              <Button fill="outline" variant="secondary" size="sm" disabled={true}>
+                Thank you for your feedback!
+              </Button>
+            )}
+          </div>
+        )}
+      </div>
+    </>
+  );
+}
+
+function explanationFeedbackEvent(
+  radioInputFeedback: string,
+  textFeedback: string,
+  querySuggestion: QuerySuggestion,
+  historical: boolean,
+  prompt: string
+) {
+  const event = 'grafana_prometheus_promqail_explanation_feedback';
+
+  reportInteraction(event, {
+    helpful: radioInputFeedback,
+    textFeedback: textFeedback,
+    suggestionType: historical ? 'historical' : 'AI',
+    query: querySuggestion.query,
+    explanation: querySuggestion.explanation,
+    prompt: prompt,
+  });
+}
+
+function suggestionFeedbackEvent(
+  radioInputFeedback: string,
+  textFeedback: string,
+  allSuggestions: string,
+  historical: boolean,
+  prompt: string
+) {
+  const event = 'grafana_prometheus_promqail_suggestion_feedback';
+
+  reportInteraction(event, {
+    helpful: radioInputFeedback,
+    textFeedback: textFeedback,
+    suggestionType: historical ? 'historical' : 'AI',
+    allSuggestions: allSuggestions,
+    prompt: prompt,
+  });
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/components/promQail/index.ts b/packages/grafana-prometheus/src/querybuilder/components/promQail/index.ts
new file mode 100644
index 0000000000000..3002f1a70e811
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/promQail/index.ts
@@ -0,0 +1 @@
+export * from './PromQail';
diff --git a/packages/grafana-prometheus/src/querybuilder/components/promQail/prompts.ts b/packages/grafana-prometheus/src/querybuilder/components/promQail/prompts.ts
new file mode 100644
index 0000000000000..b92bd2d2f1431
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/promQail/prompts.ts
@@ -0,0 +1,114 @@
+export const ExplainSystemPrompt = `You are an expert in Prometheus, the event monitoring and alerting application.
+
+You are given relevant PromQL documentation, a type and description for a Prometheus metric, and a PromQL query on that metric. Using the provided information for reference, please explain what the output of a given query is in 1 sentences. Do not walk through what the functions do separately, make your answer concise. 
+
+Input will be in the form:
+
+
+PromQL Documentation:
+<PromQL documentation>
+
+PromQL Metrics Metadata:
+<metric_name>(<metric type of the metric queried>): <description of what the metric means>
+
+PromQL Expression: 
+<PromQL query>
+
+Examples of input and output
+----------
+PromQL Documentation:
+A counter is a cumulative metric that represents a single monotonically increasing counter whose value can only increase or be reset to zero on restart. For example, you can use a counter to represent the number of requests served, tasks completed, or errors.
+topk (largest k elements by sample value)
+sum (calculate sum over dimensions)
+rate(v range-vector) calculates the per-second average rate of increase of the time series in the range vector. Breaks in monotonicity (such as counter resets due to target restarts) are automatically adjusted for. 
+
+PromQL Metrics Metadata:
+traces_exporter_sent_spans(counter): Number of spans successfully sent to destination.
+
+PromQL Expression:
+topk(3, sum by(cluster) (rate(traces_exporter_sent_spans{exporter="otlp"}[5m])))
+
+This query is trying to answer the question:
+What is the top 3 clusters that have successfully sent the most number of spans to the destination?
+`;
+
+export type ExplainUserPromptParams = {
+  documentation: string;
+  metricName: string;
+  metricType: string;
+  metricMetadata: string;
+  query: string;
+};
+
+export function GetExplainUserPrompt({
+  documentation,
+  metricName,
+  metricType,
+  metricMetadata,
+  query,
+}: ExplainUserPromptParams): string {
+  if (documentation === '') {
+    documentation = 'No documentation provided.';
+  }
+  if (metricMetadata === '') {
+    metricMetadata = 'No description provided.';
+  }
+  return `
+        PromQL Documentation: 
+        ${documentation}
+
+        PromQL Metrics Metadata:
+        ${metricName}(${metricType}): ${metricMetadata}
+
+        PromQL Expression: 
+        ${query}
+
+        This query is trying to answer the question:
+    `;
+}
+
+export const SuggestSystemPrompt = `You are a Prometheus Query Language (PromQL) expert assistant inside Grafana.
+When the user asks a question, respond with a valid PromQL query and only the query.
+
+To help you answer the question, you will receive:
+- List of potentially relevant PromQL templates with descriptions, ranked by semantic search score
+- Prometheus metric
+- Metric type
+- Available Prometheus metric labels
+- User question
+
+Policy:
+- Do not invent labels names, you can only use the available labels
+- For rate queries, use the $__rate_interval variable`;
+
+// rewrite with a type
+export type SuggestUserPromptParams = {
+  promql: string;
+  question: string;
+  metricType: string;
+  labels: string;
+  templates: string;
+};
+
+export function GetSuggestUserPrompt({
+  promql,
+  question,
+  metricType,
+  labels,
+  templates,
+}: SuggestUserPromptParams): string {
+  if (templates === '') {
+    templates = 'No templates provided.';
+  } else {
+    templates = templates.replace(/\n/g, '\n  ');
+  }
+  return `Relevant PromQL templates:
+  ${templates}
+  
+  Prometheus metric: ${promql}
+  Metric type: ${metricType}
+  Available Prometheus metric labels: ${labels}
+  User question: ${question}
+  
+  \`\`\`promql`;
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/components/promQail/resources/AI_Logo_bw.svg b/packages/grafana-prometheus/src/querybuilder/components/promQail/resources/AI_Logo_bw.svg
new file mode 100644
index 0000000000000..546516b5f13d3
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/promQail/resources/AI_Logo_bw.svg
@@ -0,0 +1,4 @@
+<svg width="17" height="18" viewBox="0 0 17 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.03027 12.6328C4.88965 12.6328 4.00293 11.9844 4.00293 10.8047C4.00293 9.44141 5.16699 9.14453 6.30371 9.01172C7.38184 8.88672 7.81934 8.89453 7.81934 8.46875V8.44141C7.81934 7.76172 7.43262 7.36719 6.67871 7.36719C5.89355 7.36719 5.45605 7.77734 5.28418 8.20312L4.18652 7.95312C4.57715 6.85937 5.57715 6.42188 6.66309 6.42188C7.61621 6.42188 8.99121 6.76953 8.99121 8.51563V12.5H7.85059V11.6797H7.80371C7.58105 12.1289 7.02246 12.6328 6.03027 12.6328ZM6.28418 11.6953C7.25684 11.6953 7.82324 11.0469 7.82324 10.3359V9.5625C7.65527 9.73047 6.75684 9.83203 6.37793 9.88281C5.70215 9.97266 5.14746 10.1953 5.14746 10.8203C5.14746 11.3984 5.62402 11.6953 6.28418 11.6953ZM10.5469 12.5V6.5H11.7148V12.5H10.5469ZM11.1367 5.57422C10.7305 5.57422 10.3984 5.26172 10.3984 4.87891C10.3984 4.49609 10.7305 4.17969 11.1367 4.17969C11.5391 4.17969 11.875 4.49609 11.875 4.87891C11.875 5.26172 11.5391 5.57422 11.1367 5.57422Z" fill="white"/>
+<path d="M5 0.875H12C14.5543 0.875 16.625 2.94568 16.625 5.5V12.5C16.625 15.0543 14.5543 17.125 12 17.125H0.375V5.5C0.375 2.94568 2.44568 0.875 5 0.875Z" stroke="white" stroke-width="0.75"/>
+</svg>
diff --git a/packages/grafana-prometheus/src/querybuilder/components/promQail/resources/AI_Logo_color.svg b/packages/grafana-prometheus/src/querybuilder/components/promQail/resources/AI_Logo_color.svg
new file mode 100644
index 0000000000000..72160a937404a
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/promQail/resources/AI_Logo_color.svg
@@ -0,0 +1,11 @@
+<svg width="26" height="27" viewBox="0 0 26 27" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 9.5C0 4.52944 4.02944 0.5 9 0.5H17C21.9706 0.5 26 4.52944 26 9.5V15.5C26 20.4706 21.9706 24.5 17 24.5H0V9.5Z" fill="url(#paint0_linear_68_17626)"/>
+<path d="M8.91193 18.7053C7.14915 18.7053 5.77876 17.7031 5.77876 15.88C5.77876 13.7731 7.57777 13.3143 9.33452 13.109C11.0007 12.9158 11.6768 12.9279 11.6768 12.2699V12.2276C11.6768 11.1772 11.0792 10.5675 9.91406 10.5675C8.70064 10.5675 8.0245 11.2013 7.75888 11.8594L6.0625 11.473C6.66619 9.78267 8.21165 9.10653 9.88992 9.10653C11.3629 9.10653 13.4879 9.64382 13.4879 12.3423V18.5H11.7251V17.2322H11.6527C11.3086 17.9265 10.4453 18.7053 8.91193 18.7053ZM9.30433 17.2564C10.8075 17.2564 11.6829 16.2543 11.6829 15.1555V13.9602C11.4233 14.2198 10.0348 14.3768 9.44922 14.4553C8.40483 14.5941 7.54759 14.9382 7.54759 15.9041C7.54759 16.7976 8.28409 17.2564 9.30433 17.2564ZM15.8921 18.5V9.22727H17.6972V18.5H15.8921ZM16.8037 7.79652C16.1759 7.79652 15.6627 7.31357 15.6627 6.72195C15.6627 6.13033 16.1759 5.64133 16.8037 5.64133C17.4255 5.64133 17.9447 6.13033 17.9447 6.72195C17.9447 7.31357 17.4255 7.79652 16.8037 7.79652Z" fill="white"/>
+<path d="M0 24.5H3L0 26.5V24.5Z" fill="#5B5CC2"/>
+<defs>
+<linearGradient id="paint0_linear_68_17626" x1="4.76666" y1="-5.1" x2="24.472" y2="5.4613" gradientUnits="userSpaceOnUse">
+<stop offset="0.0333246" stop-color="#965AFB"/>
+<stop offset="1" stop-color="#096174"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/packages/grafana-prometheus/src/querybuilder/components/promQail/state/helpers.test.ts b/packages/grafana-prometheus/src/querybuilder/components/promQail/state/helpers.test.ts
new file mode 100644
index 0000000000000..323848bebdc93
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/promQail/state/helpers.test.ts
@@ -0,0 +1,74 @@
+import { llms } from '@grafana/experimental';
+
+import { guessMetricType, isLLMPluginEnabled } from './helpers';
+
+// Mock the grafana-experimental llms module
+jest.mock('@grafana/experimental', () => ({
+  llms: {
+    openai: {
+      health: jest.fn(),
+    },
+    vector: {
+      health: jest.fn(),
+    },
+  },
+}));
+
+describe('isLLMPluginEnabled', () => {
+  it('should return true if LLM plugin is enabled', async () => {
+    jest.mocked(llms.openai.health).mockResolvedValue({ ok: true, configured: true });
+    jest.mocked(llms.vector.health).mockResolvedValue({ ok: true, enabled: true });
+
+    const enabled = await isLLMPluginEnabled();
+
+    expect(enabled).toBe(true);
+  });
+
+  it('should return false if LLM plugin is not enabled', async () => {
+    jest.mocked(llms.openai.health).mockResolvedValue({ ok: false, configured: false });
+    jest.mocked(llms.vector.health).mockResolvedValue({ ok: false, enabled: false });
+
+    const enabled = await isLLMPluginEnabled();
+
+    expect(enabled).toBe(false);
+  });
+
+  it('should return false if LLM plugin is enabled but health check fails', async () => {
+    jest.mocked(llms.openai.health).mockResolvedValue({ ok: false, configured: true });
+    jest.mocked(llms.vector.health).mockResolvedValue({ ok: false, enabled: true });
+
+    const enabled = await isLLMPluginEnabled();
+
+    expect(enabled).toBe(false);
+  });
+});
+
+const metricListWithType = [
+  // below is summary metric family
+  ['go_gc_duration_seconds', 'summary'],
+  ['go_gc_duration_seconds_count', 'summary'],
+  ['go_gc_duration_seconds_sum', 'summary'],
+  // below is histogram metric family
+  ['go_gc_heap_allocs_by_size_bytes_total_bucket', 'histogram'],
+  ['go_gc_heap_allocs_by_size_bytes_total_count', 'histogram'],
+  ['go_gc_heap_allocs_by_size_bytes_total_sum', 'histogram'],
+  // below are counters
+  ['go_gc_heap_allocs_bytes_total', 'counter'],
+  ['scrape_samples_post_metric_relabeling', 'counter'],
+  // below are gauges
+  ['go_gc_heap_goal_bytes', 'gauge'],
+  ['nounderscorename', 'gauge'],
+  // below is both a histogram & summary
+  ['alertmanager_http_response_size_bytes', 'histogram,summary'],
+  ['alertmanager_http_response_size_bytes_bucket', 'histogram,summary'],
+  ['alertmanager_http_response_size_bytes_count', 'histogram,summary'],
+  ['alertmanager_http_response_size_bytes_sum', 'histogram,summary'],
+];
+
+const metricList = metricListWithType.map((item) => item[0]);
+
+describe('guessMetricType', () => {
+  it.each(metricListWithType)("where input is '%s'", (metric: string, metricType: string) => {
+    expect(guessMetricType(metric, metricList)).toBe(metricType);
+  });
+});
diff --git a/packages/grafana-prometheus/src/querybuilder/components/promQail/state/helpers.ts b/packages/grafana-prometheus/src/querybuilder/components/promQail/state/helpers.ts
new file mode 100644
index 0000000000000..8bf207da75efe
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/promQail/state/helpers.ts
@@ -0,0 +1,418 @@
+import { AnyAction } from 'redux';
+
+import { llms } from '@grafana/experimental';
+import { reportInteraction } from '@grafana/runtime';
+
+import { PrometheusDatasource } from '../../../../datasource';
+import { getMetadataHelp, getMetadataType } from '../../../../language_provider';
+import { promQueryModeller } from '../../../PromQueryModeller';
+import { buildVisualQueryFromString } from '../../../parsing';
+import { PromVisualQuery } from '../../../types';
+import { updateInteraction } from '../PromQail';
+import {
+  ExplainSystemPrompt,
+  GetExplainUserPrompt,
+  SuggestSystemPrompt,
+  GetSuggestUserPrompt,
+  SuggestUserPromptParams,
+} from '../prompts';
+import { Interaction, QuerySuggestion, SuggestionType } from '../types';
+
+import { createInteraction } from './state';
+import { getTemplateSuggestions } from './templates';
+
+const OPENAI_MODEL_NAME = 'gpt-3.5-turbo-1106';
+const promQLTemplatesCollection = 'grafana.promql.templates';
+
+interface TemplateSearchResult {
+  description: string | null;
+  metric_type: string | null;
+  promql: string | null;
+}
+
+export function getExplainMessage(
+  query: string,
+  metric: string,
+  datasource: PrometheusDatasource
+): llms.openai.Message[] {
+  let metricMetadata = '';
+  let metricType = '';
+
+  const pvq = buildVisualQueryFromString(query);
+
+  if (datasource.languageProvider.metricsMetadata) {
+    metricType = getMetadataType(metric, datasource.languageProvider.metricsMetadata) ?? '';
+    metricMetadata = getMetadataHelp(metric, datasource.languageProvider.metricsMetadata) ?? '';
+  }
+
+  const documentationBody = pvq.query.operations
+    .map((op) => {
+      const def = promQueryModeller.getOperationDef(op.id);
+      if (!def) {
+        return '';
+      }
+      const title = def.renderer(op, def, '<expr>');
+      const body = def.explainHandler ? def.explainHandler(op, def) : def.documentation;
+
+      if (!body) {
+        return '';
+      }
+      return `### ${title}:\n${body}`;
+    })
+    .filter((item) => item !== '')
+    .join('\n');
+
+  return [
+    { role: 'system', content: ExplainSystemPrompt },
+    {
+      role: 'user',
+      content: GetExplainUserPrompt({
+        documentation: documentationBody,
+        metricName: metric,
+        metricType: metricType,
+        metricMetadata: metricMetadata,
+        query: query,
+      }),
+    },
+  ];
+}
+
+function getSuggestMessages({
+  promql,
+  question,
+  metricType,
+  labels,
+  templates,
+}: SuggestUserPromptParams): llms.openai.Message[] {
+  return [
+    { role: 'system', content: SuggestSystemPrompt },
+    { role: 'user', content: GetSuggestUserPrompt({ promql, question, metricType, labels, templates }) },
+  ];
+}
+
+/**
+ * Calls the API and adds suggestions to the interaction
+ *
+ * @param dispatch
+ * @param idx
+ * @param interaction
+ * @returns
+ */
+export async function promQailExplain(
+  dispatch: React.Dispatch<AnyAction>,
+  idx: number,
+  query: PromVisualQuery,
+  interaction: Interaction,
+  suggIdx: number,
+  datasource: PrometheusDatasource
+) {
+  const suggestedQuery = interaction.suggestions[suggIdx].query;
+
+  const promptMessages = getExplainMessage(suggestedQuery, query.metric, datasource);
+  const interactionToUpdate = interaction;
+
+  return llms.openai
+    .streamChatCompletions({
+      model: OPENAI_MODEL_NAME,
+      messages: promptMessages,
+      temperature: 0,
+    })
+    .pipe(llms.openai.accumulateContent())
+    .subscribe((response) => {
+      const updatedSuggestions = interactionToUpdate.suggestions.map((sg: QuerySuggestion, sidx: number) => {
+        if (suggIdx === sidx) {
+          return {
+            query: interactionToUpdate.suggestions[suggIdx].query,
+            explanation: response,
+          };
+        }
+
+        return sg;
+      });
+
+      const payload = {
+        idx,
+        interaction: {
+          ...interactionToUpdate,
+          suggestions: updatedSuggestions,
+          explanationIsLoading: false,
+        },
+      };
+      dispatch(updateInteraction(payload));
+    });
+}
+
+/**
+ * Check if sublist is fully contained in the superlist
+ *
+ * @param sublist
+ * @param superlist
+ * @returns true if fully contained, else false
+ */
+function isContainedIn(sublist: string[], superlist: string[]): boolean {
+  for (const item of sublist) {
+    if (!superlist.includes(item)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+/**
+ * Guess the type of a metric, based on its name and its relation to other metrics available
+ *
+ * @param metric     - name of metric whose type to guess
+ * @param allMetrics - list of all available metrics
+ * @returns          - the guess of the type (string): counter,gauge,summary,histogram,'histogram,summary'
+ */
+export function guessMetricType(metric: string, allMetrics: string[]): string {
+  const synthetic_metrics = new Set<string>([
+    'up',
+    'scrape_duration_seconds',
+    'scrape_samples_post_metric_relabeling',
+    'scrape_series_added',
+    'scrape_samples_scraped',
+    'ALERTS',
+    'ALERTS_FOR_STATE',
+  ]);
+
+  if (synthetic_metrics.has(metric)) {
+    // these are all known to be counters
+    return 'counter';
+  }
+  if (metric.startsWith(':')) {
+    // probably recording rule
+    return 'gauge';
+  }
+  if (metric.endsWith('_info')) {
+    // typically series of 1s only, the labels are the useful part. TODO: add 'info' type
+    return 'counter';
+  }
+
+  if (metric.endsWith('_created') || metric.endsWith('_total')) {
+    // prometheus naming style recommends counters to have these suffixes.
+    return 'counter';
+  }
+
+  const underscoreIndex = metric.lastIndexOf('_');
+  if (underscoreIndex < 0) {
+    // No underscores in the name at all, very little info to go on. Guess
+    return 'gauge';
+  }
+
+  // See if the suffix is histogram-y or summary-y
+  const [root, suffix] = [metric.slice(0, underscoreIndex), metric.slice(underscoreIndex + 1)];
+
+  if (['bucket', 'count', 'sum'].includes(suffix)) {
+    // Might be histogram + summary
+    let familyMetrics = [`${root}_bucket`, `${root}_count`, `${root}_sum`, root];
+    if (isContainedIn(familyMetrics, allMetrics)) {
+      return 'histogram,summary';
+    }
+
+    // Might be a histogram, if so all these metrics should exist too:
+    familyMetrics = [`${root}_bucket`, `${root}_count`, `${root}_sum`];
+    if (isContainedIn(familyMetrics, allMetrics)) {
+      return 'histogram';
+    }
+
+    // Or might be a summary
+    familyMetrics = [`${root}_sum`, `${root}_count`, root];
+    if (isContainedIn(familyMetrics, allMetrics)) {
+      return 'summary';
+    }
+
+    // Otherwise it's probably just a counter!
+    return 'counter';
+  }
+
+  // One case above doesn't catch: summary or histogram,summary where the non-suffixed metric is chosen
+  const familyMetrics = [`${metric}_sum`, `${metric}_count`, metric];
+  if (isContainedIn(familyMetrics, allMetrics)) {
+    if (allMetrics.includes(`${metric}_bucket`)) {
+      return 'histogram,summary';
+    } else {
+      return 'summary';
+    }
+  }
+
+  // All else fails, guess gauge
+  return 'gauge';
+}
+
+/**
+ * Generate a suitable filter structure for the VectorDB call
+ * @param types: list of metric types to include in the result
+ * @returns the structure to pass to the vectorDB call.
+ */
+function generateMetricTypeFilters(types: string[]) {
+  return types.map((type) => ({
+    metric_type: {
+      $eq: type,
+    },
+  }));
+}
+
+/**
+ * Taking in a metric name, try to guess its corresponding metric _family_ name
+ * @param metric name
+ * @returns metric family name
+ */
+function guessMetricFamily(metric: string): string {
+  if (metric.endsWith('_bucket') || metric.endsWith('_count') || metric.endsWith('_sum')) {
+    return metric.slice(0, metric.lastIndexOf('_'));
+  }
+  return metric;
+}
+
+/**
+ * Check if the LLM plugin is enabled.
+ * Used in the PromQueryBuilder to enable/disable the button based on openai and vector db checks
+ * @returns true if the LLM plugin is enabled.
+ */
+export async function isLLMPluginEnabled(): Promise<boolean> {
+  // Check if the LLM plugin is enabled.
+  // If not, we won't be able to make requests, so return early.
+  const openaiEnabled = llms.openai.health().then((response) => response.ok);
+  const vectorEnabled = llms.vector.health().then((response) => response.ok);
+  // combine 2 promises
+  return Promise.all([openaiEnabled, vectorEnabled]).then((results) => {
+    return results.every((result) => result);
+  });
+}
+
+/**
+ * Calls the API and adds suggestions to the interaction
+ *
+ * @param dispatch
+ * @param idx
+ * @param interaction
+ * @returns
+ */
+export async function promQailSuggest(
+  dispatch: React.Dispatch<AnyAction>,
+  idx: number,
+  query: PromVisualQuery,
+  labelNames: string[],
+  datasource: PrometheusDatasource,
+  interaction?: Interaction
+) {
+  const interactionToUpdate = interaction ? interaction : createInteraction(SuggestionType.Historical);
+
+  // Decide metric type
+  let metricType = '';
+  // Makes sure we loaded the metadata for metrics. Usually this is done in the start() method of the
+  // provider but we only need the metadata here.
+  if (!datasource.languageProvider.metricsMetadata) {
+    await datasource.languageProvider.loadMetricsMetadata();
+  }
+  if (datasource.languageProvider.metricsMetadata) {
+    // `datasource.languageProvider.metricsMetadata` is a list of metric family names (with desired type)
+    // from the datasource metadata endoint, but unfortunately the expanded _sum, _count, _bucket raw
+    // metric names are also generated and populating this list (all of type counter). We want the metric
+    // family type, so need to guess the metric family name from the chosen metric name, and test if that
+    // metric family has a type specified.
+    const metricFamilyGuess = guessMetricFamily(query.metric);
+    metricType = getMetadataType(metricFamilyGuess, datasource.languageProvider.metricsMetadata) ?? '';
+  }
+  if (metricType === '') {
+    // fallback to heuristic guess
+    metricType = guessMetricType(query.metric, datasource.languageProvider.metrics);
+  }
+
+  if (interactionToUpdate.suggestionType === SuggestionType.Historical) {
+    return new Promise<void>((resolve) => {
+      return setTimeout(() => {
+        const suggestions = getTemplateSuggestions(
+          query.metric,
+          metricType,
+          promQueryModeller.renderLabels(query.labels)
+        );
+
+        const payload = {
+          idx,
+          interaction: { ...interactionToUpdate, suggestions: suggestions, isLoading: false },
+        };
+        dispatch(updateInteraction(payload));
+        resolve();
+      }, 1000);
+    });
+  } else {
+    type SuggestionBody = {
+      metric: string;
+      labels: string;
+      prompt?: string;
+    };
+
+    // get all available labels
+    const metricLabels = await datasource.languageProvider.fetchLabelsWithMatch(query.metric);
+
+    let feedTheAI: SuggestionBody = {
+      metric: query.metric,
+      // drop __name__ label because it's not useful
+      labels: Object.keys(metricLabels)
+        .filter((label) => label !== '__name__')
+        .join(','),
+    };
+
+    // @ts-ignore llms types issue
+    let results: Array<llms.vector.SearchResult<TemplateSearchResult>> = [];
+    if (interaction?.suggestionType === SuggestionType.AI) {
+      feedTheAI = { ...feedTheAI, prompt: interaction.prompt };
+
+      // @ts-ignore llms types issue
+      results = await llms.vector.search<TemplateSearchResult>({
+        query: interaction.prompt,
+        collection: promQLTemplatesCollection,
+        topK: 5,
+        filter: {
+          $or: generateMetricTypeFilters(metricType.split(',').concat(['*'])),
+        },
+      });
+      reportInteraction('grafana_prometheus_promqail_vector_results', {
+        metric: query.metric,
+        prompt: interaction.prompt,
+        results: results,
+      });
+      // TODO: handle errors from vector search
+    }
+
+    const resultsString = results
+      .map((r) => {
+        return `${r.payload.promql} | ${r.payload.description} (score=${(r.score * 100).toFixed(1)})`;
+      })
+      .join('\n');
+
+    const promptMessages = getSuggestMessages({
+      promql: query.metric,
+      question: interaction ? interaction.prompt : '',
+      metricType: metricType,
+      labels: labelNames.join(', '),
+      templates: resultsString,
+    });
+
+    return llms.openai
+      .streamChatCompletions({
+        model: OPENAI_MODEL_NAME,
+        messages: promptMessages,
+        temperature: 0.5,
+      })
+      .pipe(llms.openai.accumulateContent())
+      .subscribe((response) => {
+        const payload = {
+          idx,
+          interaction: {
+            ...interactionToUpdate,
+            suggestions: [
+              {
+                query: response,
+                explanation: '',
+              },
+            ],
+            isLoading: false,
+          },
+        };
+        dispatch(updateInteraction(payload));
+      });
+  }
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/components/promQail/state/state.ts b/packages/grafana-prometheus/src/querybuilder/components/promQail/state/state.ts
new file mode 100644
index 0000000000000..2c00053f1dc41
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/promQail/state/state.ts
@@ -0,0 +1,43 @@
+import { PromVisualQuery } from '../../../types';
+import { Interaction, SuggestionType } from '../types';
+
+/**
+ * Initial state for PromQAIL
+ * @param query the prometheus query with metric and possible labels
+ */
+export function initialState(query?: PromVisualQuery, showStartingMessage?: boolean): PromQailState {
+  return {
+    query: query ?? {
+      metric: '',
+      labels: [],
+      operations: [],
+    },
+    showExplainer: false,
+    showStartingMessage: showStartingMessage ?? true,
+    indicateCheckbox: false,
+    askForQueryHelp: false,
+    interactions: [],
+  };
+}
+
+/**
+ * The PromQAIL state object
+ */
+export interface PromQailState {
+  query: PromVisualQuery;
+  showExplainer: boolean;
+  showStartingMessage: boolean;
+  indicateCheckbox: boolean;
+  askForQueryHelp: boolean;
+  interactions: Interaction[];
+}
+
+export function createInteraction(suggestionType: SuggestionType, isLoading?: boolean): Interaction {
+  return {
+    suggestionType: suggestionType,
+    prompt: '',
+    suggestions: [],
+    isLoading: isLoading ?? false,
+    explanationIsLoading: false,
+  };
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/components/promQail/state/templates.ts b/packages/grafana-prometheus/src/querybuilder/components/promQail/state/templates.ts
new file mode 100644
index 0000000000000..2a56e9f4fbbef
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/promQail/state/templates.ts
@@ -0,0 +1,337 @@
+import { QuerySuggestion } from '../types';
+
+interface TemplateData {
+  template: string;
+  description: string;
+}
+
+export const generalTemplates: TemplateData[] = [
+  {
+    template: 'metric_a{}',
+    description: 'Get the data for "metric_a"',
+  },
+  {
+    template: 'avg by(c) (metric_a{})',
+    description: 'Average of all series in "metric_a" grouped by the label "c"',
+  },
+  {
+    template: 'count by(d) (metric_a{})',
+    description: 'Number of series in the metric "metric_a" grouped by the label "d"',
+  },
+  {
+    template: 'sum by(g) (sum_over_time(metric_a{}[1h]))',
+    description:
+      'For each series in the metric "metric_a", sum all values over 1 hour, then group those series by label "g" and sum.',
+  },
+  {
+    template: 'count(metric_a{})',
+    description: 'Count of series in the metric "metric_a"',
+  },
+  {
+    template: '(metric_a{})',
+    description: 'Get the data for "metric_a"',
+  },
+  {
+    template: 'count_over_time(metric_a{}[1h])',
+    description: 'Number of series of metric_a in a 1 hour interval',
+  },
+  {
+    template: 'changes(metric_a{}[1m])',
+    description: 'Number of times the values of each series in metric_a have changed in 1 minute periods',
+  },
+  {
+    template: 'count(count by(g) (metric_a{}))',
+    description: 'Total number of series in metric_a',
+  },
+  {
+    template: 'last_over_time(metric_a{}[1h])',
+    description: 'For each series in metric_a, get the last value in the 1 hour period.',
+  },
+  {
+    template: 'sum by(g) (count_over_time(metric_a{}[1h]))',
+    description: 'Grouped sum over the label "g" of the number of series of metric_a in a 1 hour period',
+  },
+  {
+    template: 'count(metric_a{} == 99)',
+    description: 'Number of series of metric_a that have value 99',
+  },
+  {
+    template: 'min(metric_a{})',
+    description: 'At each timestamp, find the minimum of all series of the metric "metric_a"',
+  },
+  {
+    template: 'metric_a{} != 99',
+    description: 'Series of metric_a which do not have the value 99',
+  },
+  {
+    template: 'metric_a{} - 99',
+    description: 'metric_a minus 99',
+  },
+  {
+    template: 'quantile_over_time(0.99,metric_a{}[1h])',
+    description: 'The 99th quantile of values of metric_a in 1 hour',
+  },
+  {
+    template: 'count_values("aaaa",metric_a{})',
+    description: 'Count number of label values for a label named "aaaa"',
+  },
+];
+
+export const counterTemplates: TemplateData[] = [
+  {
+    template: 'sum by(d) (rate(metric_a{}[1h]))',
+    description:
+      'Sum of the rate of increase or decrease of the metric "metric_a" per 1 hour period, grouped by the label "d"',
+  },
+  {
+    template: 'rate(metric_a{}[1m])',
+    description: 'Rate of change of the metric "metric_a" over 1 minute',
+  },
+  {
+    template: 'sum by(a) (increase(metric_a{}[5m]))',
+    description:
+      'Taking the metric "metric_a" find the increase in 5 minute periods of each series and aggregate sum over the label "a"',
+  },
+  {
+    template: 'sum(rate(metric_a{}[1m]))',
+    description: 'Total rate of change of all series of metric "metric_a" in 1 minute intervals',
+  },
+  {
+    template: 'sum(increase(metric_a{}[10m]))',
+    description: 'Total increase for each series of metric "metric_a" in 10 minute intervals',
+  },
+  {
+    template: 'increase(metric_a{}[1h])',
+    description: 'Increase in all series of "metric_a" in 1 hour period',
+  },
+  {
+    template: 'sum by(d) (irate(metric_a{}[1h]))',
+    description: 'Sum of detailed rate of change of the metric "metric_a" over 1 hour grouped by label "d"',
+  },
+  {
+    template: 'irate(metric_a{}[1h])',
+    description: 'Detailed rate of change of the metric "metric_a" over 1 hour',
+  },
+  {
+    template: 'avg by(d) (rate(metric_a{}[1h]))',
+    description:
+      'Taking the rate of change of the metric "metric_a" in a 1 hour period, group by the label "d" and find the average of each group',
+  },
+  {
+    template: 'topk(5,sum by(g) (rate(metric_a{}[1h])))',
+    description: 'Top 5 of the summed groups "g" of the rate of change of metric_a',
+  },
+  {
+    template: 'sum(rate(metric_a{}[1h])) / sum(rate(metric_a{}[1h]))',
+    description: 'Relative sums of metric_a with different labels',
+  },
+  {
+    template: 'histogram_quantile(99,rate(metric_a{}[1h]))',
+    description: '99th percentile of the rate of change of metric_a in 1 hour periods',
+  },
+  {
+    template: 'avg(rate(metric_a{}[1m]))',
+    description: 'Average of the rate of all series of metric_a in 1 minute periods',
+  },
+  {
+    template: 'rate(metric_a{}[5m]) > 99',
+    description: 'Show series of metric_a only if their rate over 5 minutes is greater than 99',
+  },
+  {
+    template: 'count by(g) (rate(metric_a{}[1h]))',
+    description: 'Count of series of metric_a over all labels "g"',
+  },
+];
+
+export const histogramTemplates: TemplateData[] = [
+  {
+    template: 'histogram_quantile(99,sum by(le) (rate(metric_a{}[1h])))',
+    description:
+      'Calculate the rate at which the metric "metric_a" is increasing or decreasing, summed over each bucket label "le", and then calculates the 99th percentile of those rates.',
+  },
+  {
+    template: 'histogram_quantile(99,sum by(g) (metric_a{}))',
+    description: '99th percentile of the sum of metric_a grouped by label "g"',
+  },
+  {
+    template: 'histogram_quantile(99,sum by(g) (irate(metric_a{}[1h])))',
+    description: '99th percentile of the grouped by "g" sum of the rate of each series in metric_a in an hour',
+  },
+  {
+    template: 'histogram_quantile(99,metric_a{})',
+    description: '99th percentile of metric_a',
+  },
+];
+
+export const gaugeTemplates: TemplateData[] = [
+  {
+    template: 'sum by(c) (metric_a{})',
+    description: 'Sum the metric "metric_a" by each value in label "c"',
+  },
+  {
+    template: 'sum(metric_a{})',
+    description: 'Total sum of all the series of the metric named "metric_a"',
+  },
+  {
+    template: 'max by(dd) (metric_a{})',
+    description: 'Grouping the series the metric "metric_a" by the label "dd", get the maximum value of each group',
+  },
+  {
+    template: 'max(metric_a{})',
+    description: 'Maximum value of all series of the metric "metric_a" ',
+  },
+  {
+    template: 'avg(metric_a{})',
+    description: 'Average value of all the series of metric "metric_a"',
+  },
+  {
+    template: 'metric_a{} > 99',
+    description: 'Show only the series of metric "metric_a" which currently have value greater than 99',
+  },
+  {
+    template: 'metric_a{} / 99',
+    description: 'Values for "metric_a" all divided by 99',
+  },
+  {
+    template: 'metric_a{} == 99',
+    description: 'Show series of metric_a that have value 99',
+  },
+  {
+    template: 'sum_over_time(metric_a{}[1h])',
+    description: 'Sum each series of metric_a over 1 hour',
+  },
+  {
+    template: 'avg_over_time(metric_a{}[1h])',
+    description: 'Average of each series of metric_a in a 1 hour period',
+  },
+  {
+    template: 'sum(sum_over_time(metric_a{}[1h]))',
+    description: 'Sum of all values in all series in a 1 hour period',
+  },
+  {
+    template: 'delta(metric_a{}[1m])',
+    description: 'Span or delta (maximum - minimum) of values of the metric "metric_a" in a 1 minute period. ',
+  },
+  {
+    template: 'avg by(g) (avg_over_time(metric_a{}[1h]))',
+    description:
+      'For 1 hour, take each series and find the average, then group by label "g" and find the average of each group',
+  },
+  {
+    template: 'max_over_time(metric_a{}[1h])',
+    description: 'Maximum values of each series in metric "metric_a" in a 1 hour period',
+  },
+  {
+    template: 'metric_a{} * 99',
+    description: 'Values of metric_a multiplied by 99',
+  },
+  {
+    template: 'metric_a{} < 99',
+    description: 'Series of metric_a that have values less than 99',
+  },
+  {
+    template: 'max by() (max_over_time(metric_a{}[1h]))',
+    description: 'Find maximum value of all series in 1 hour periods',
+  },
+  {
+    template: 'topk(99,metric_a{})',
+    description: 'First 5 series of metric_a that have the highest values',
+  },
+  {
+    template: 'min by(g) (metric_a{})',
+    description: 'Minimum values of the series of metric_a grouped by label "g"',
+  },
+  {
+    template: 'topk(10,sum by(g) (metric_a{}))',
+    description: "Top 10 of the series of metric_a grouped and summed by the label 'g'",
+  },
+  {
+    template: 'avg(avg_over_time(metric_a{}[1h]))',
+    description: 'Average of all values inside a 1 hour period',
+  },
+  {
+    template: 'quantile by(h) (0.95,metric_a{})',
+    description: 'Calculate 95th percentile of metric_a when aggregated by the label "h"',
+  },
+  {
+    template: 'avg by(g) (metric_a{} > 99)',
+    description:
+      'Taking all series of metric_a with value greater than 99, group by label "g" and find the average of each group',
+  },
+  {
+    template: 'sum(metric_a{}) / 99',
+    description: 'Sum of all series of metric_a divided by 99',
+  },
+  {
+    template: 'count(sum by(g) (metric_a{}))',
+    description: 'Number of series of metric_a grouped by the label "g"',
+  },
+  {
+    template: 'max(max_over_time(metric_a{}[1h]))',
+    description: 'Find the max value of all series of metric_a in a 1 hour period',
+  },
+];
+
+function processTemplate(templateData: TemplateData, metric: string, labels: string): QuerySuggestion {
+  return {
+    query: templateData.template.replace('metric_a', metric).replace('{}', labels),
+    explanation: templateData.description.replace('metric_a', metric),
+  };
+}
+
+export function getTemplateSuggestions(metricName: string, metricType: string, labels: string): QuerySuggestion[] {
+  let templateSuggestions: QuerySuggestion[] = [];
+  switch (metricType) {
+    case 'counter':
+      templateSuggestions = templateSuggestions.concat(
+        counterTemplates
+          .map((t) => processTemplate(t, metricName, labels))
+          .sort(() => Math.random() - 0.5)
+          .slice(0, 2)
+      );
+      templateSuggestions = templateSuggestions.concat(
+        generalTemplates
+          .map((t) => processTemplate(t, metricName, labels))
+          .sort(() => Math.random() - 0.5)
+          .slice(0, 3)
+      );
+      break;
+    case 'gauge':
+      templateSuggestions = templateSuggestions.concat(
+        gaugeTemplates
+          .map((t) => processTemplate(t, metricName, labels))
+          .sort(() => Math.random() - 0.5)
+          .slice(0, 2)
+      );
+      templateSuggestions = templateSuggestions.concat(
+        generalTemplates
+          .map((t) => processTemplate(t, metricName, labels))
+          .sort(() => Math.random() - 0.5)
+          .slice(0, 3)
+      );
+      break;
+    case 'histogram':
+      templateSuggestions = templateSuggestions.concat(
+        histogramTemplates
+          .map((t) => processTemplate(t, metricName, labels))
+          .sort(() => Math.random() - 0.5)
+          .slice(0, 2)
+      );
+      templateSuggestions = templateSuggestions.concat(
+        generalTemplates
+          .map((t) => processTemplate(t, metricName, labels))
+          .sort(() => Math.random() - 0.5)
+          .slice(0, 3)
+      );
+      break;
+    default:
+      templateSuggestions = templateSuggestions.concat(
+        generalTemplates
+          .map((t) => processTemplate(t, metricName, labels))
+          .sort(() => Math.random() - 0.5)
+          .slice(0, 5)
+      );
+      break;
+  }
+  return templateSuggestions;
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/components/promQail/types.ts b/packages/grafana-prometheus/src/querybuilder/components/promQail/types.ts
new file mode 100644
index 0000000000000..e8c5005cfacae
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/components/promQail/types.ts
@@ -0,0 +1,17 @@
+export type QuerySuggestion = {
+  query: string;
+  explanation: string;
+};
+
+export enum SuggestionType {
+  Historical = 'historical',
+  AI = 'AI',
+}
+
+export type Interaction = {
+  prompt: string;
+  suggestionType: SuggestionType;
+  suggestions: QuerySuggestion[];
+  isLoading: boolean;
+  explanationIsLoading: boolean;
+};
diff --git a/packages/grafana-prometheus/src/querybuilder/hooks/useFlag.test.ts b/packages/grafana-prometheus/src/querybuilder/hooks/useFlag.test.ts
new file mode 100644
index 0000000000000..4c7ca4e6393ba
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/hooks/useFlag.test.ts
@@ -0,0 +1,23 @@
+import { act, renderHook } from '@testing-library/react';
+
+import { promQueryEditorExplainKey, useFlag } from './useFlag';
+
+describe('useFlag Hook', () => {
+  beforeEach(() => {
+    window.localStorage.removeItem(promQueryEditorExplainKey);
+  });
+
+  it('should return the default flag value as false', () => {
+    const { result } = renderHook(() => useFlag(promQueryEditorExplainKey));
+    expect(result.current.flag).toBe(false);
+  });
+
+  it('should update the flag value without error', () => {
+    const { result } = renderHook(() => useFlag(promQueryEditorExplainKey, true));
+    expect(result.current.flag).toBe(true);
+    act(() => {
+      result.current.setFlag(false);
+    });
+    expect(result.current.flag).toBe(false);
+  });
+});
diff --git a/packages/grafana-prometheus/src/querybuilder/hooks/useFlag.ts b/packages/grafana-prometheus/src/querybuilder/hooks/useFlag.ts
new file mode 100644
index 0000000000000..183a956d45a55
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/hooks/useFlag.ts
@@ -0,0 +1,36 @@
+import { useCallback, useState } from 'react';
+
+import store from '../../gcopypaste/app/core/store';
+
+export const promQueryEditorExplainKey = 'PrometheusQueryEditorExplainDefault';
+
+export type QueryEditorFlags = typeof promQueryEditorExplainKey;
+
+function getFlagValue(key: QueryEditorFlags, defaultValue = false): boolean {
+  const val = store.get(key);
+  return val === undefined ? defaultValue : Boolean(parseInt(val, 10));
+}
+
+function setFlagValue(key: QueryEditorFlags, value: boolean) {
+  store.set(key, value ? '1' : '0');
+}
+
+type UseFlagHookReturnType = { flag: boolean; setFlag: (val: boolean) => void };
+
+/**
+ *
+ * Use and store value of explain switch in local storage.
+ * Needs to be a hook with local state to trigger re-renders.
+ */
+export function useFlag(key: QueryEditorFlags, defaultValue = false): UseFlagHookReturnType {
+  const [flag, updateFlag] = useState(getFlagValue(key, defaultValue));
+  const setter = useCallback(
+    (value: boolean) => {
+      setFlagValue(key, value);
+      updateFlag(value);
+    },
+    [key]
+  );
+
+  return { flag, setFlag: setter };
+}
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/operationUtils.test.ts b/packages/grafana-prometheus/src/querybuilder/operationUtils.test.ts
similarity index 100%
rename from public/app/plugins/datasource/prometheus/querybuilder/shared/operationUtils.test.ts
rename to packages/grafana-prometheus/src/querybuilder/operationUtils.test.ts
diff --git a/packages/grafana-prometheus/src/querybuilder/operationUtils.ts b/packages/grafana-prometheus/src/querybuilder/operationUtils.ts
new file mode 100644
index 0000000000000..b7eec3ec160ff
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/operationUtils.ts
@@ -0,0 +1,351 @@
+import { capitalize } from 'lodash';
+import pluralize from 'pluralize';
+
+import { SelectableValue } from '@grafana/data/src';
+
+import { LabelParamEditor } from './components/LabelParamEditor';
+import {
+  QueryBuilderLabelFilter,
+  QueryBuilderOperation,
+  QueryBuilderOperationDef,
+  QueryBuilderOperationParamDef,
+  QueryBuilderOperationParamValue,
+  QueryWithOperations,
+} from './shared/types';
+import { PromVisualQueryOperationCategory } from './types';
+
+export function functionRendererLeft(model: QueryBuilderOperation, def: QueryBuilderOperationDef, innerExpr: string) {
+  const params = renderParams(model, def, innerExpr);
+  const str = model.id + '(';
+
+  if (innerExpr) {
+    params.push(innerExpr);
+  }
+
+  return str + params.join(', ') + ')';
+}
+
+export function functionRendererRight(model: QueryBuilderOperation, def: QueryBuilderOperationDef, innerExpr: string) {
+  const params = renderParams(model, def, innerExpr);
+  const str = model.id + '(';
+
+  if (innerExpr) {
+    params.unshift(innerExpr);
+  }
+
+  return str + params.join(', ') + ')';
+}
+
+function rangeRendererWithParams(
+  model: QueryBuilderOperation,
+  def: QueryBuilderOperationDef,
+  innerExpr: string,
+  renderLeft: boolean
+) {
+  if (def.params.length < 2) {
+    throw `Cannot render a function with params of length [${def.params.length}]`;
+  }
+
+  let rangeVector = (model.params ?? [])[0] ?? '5m';
+
+  // Next frame the remaining parameters, but get rid of the first one because it's used to move the
+  // instant vector into a range vector.
+  const params = renderParams(
+    {
+      ...model,
+      params: model.params.slice(1),
+    },
+    {
+      ...def,
+      params: def.params.slice(1),
+      defaultParams: def.defaultParams.slice(1),
+    },
+    innerExpr
+  );
+
+  const str = model.id + '(';
+
+  // Depending on the renderLeft variable, render parameters to the left or right
+  // renderLeft === true (renderLeft) => (param1, param2, rangeVector[...])
+  // renderLeft === false (renderRight) => (rangeVector[...], param1, param2)
+  if (innerExpr) {
+    renderLeft ? params.push(`${innerExpr}[${rangeVector}]`) : params.unshift(`${innerExpr}[${rangeVector}]`);
+  }
+
+  // stick everything together
+  return str + params.join(', ') + ')';
+}
+
+export function rangeRendererRightWithParams(
+  model: QueryBuilderOperation,
+  def: QueryBuilderOperationDef,
+  innerExpr: string
+) {
+  return rangeRendererWithParams(model, def, innerExpr, false);
+}
+
+export function rangeRendererLeftWithParams(
+  model: QueryBuilderOperation,
+  def: QueryBuilderOperationDef,
+  innerExpr: string
+) {
+  return rangeRendererWithParams(model, def, innerExpr, true);
+}
+
+function renderParams(model: QueryBuilderOperation, def: QueryBuilderOperationDef, innerExpr: string) {
+  return (model.params ?? []).map((value, index) => {
+    const paramDef = def.params[index];
+    if (paramDef.type === 'string') {
+      return '"' + value + '"';
+    }
+
+    return value;
+  });
+}
+
+export function defaultAddOperationHandler<T extends QueryWithOperations>(def: QueryBuilderOperationDef, query: T) {
+  const newOperation: QueryBuilderOperation = {
+    id: def.id,
+    params: def.defaultParams,
+  };
+
+  return {
+    ...query,
+    operations: [...query.operations, newOperation],
+  };
+}
+
+export function getPromOperationDisplayName(funcName: string) {
+  return capitalize(funcName.replace(/_/g, ' '));
+}
+
+export function getOperationParamId(operationId: string, paramIndex: number) {
+  return `operations.${operationId}.param.${paramIndex}`;
+}
+
+export function getRangeVectorParamDef(withRateInterval = false): QueryBuilderOperationParamDef {
+  const param: QueryBuilderOperationParamDef = {
+    name: 'Range',
+    type: 'string',
+    options: [
+      {
+        label: '$__interval',
+        value: '$__interval',
+        // tooltip: 'Dynamic interval based on max data points, scrape and min interval',
+      },
+      { label: '1m', value: '1m' },
+      { label: '5m', value: '5m' },
+      { label: '10m', value: '10m' },
+      { label: '1h', value: '1h' },
+      { label: '24h', value: '24h' },
+    ],
+  };
+
+  if (withRateInterval) {
+    (param.options as Array<SelectableValue<string>>).unshift({
+      label: '$__rate_interval',
+      value: '$__rate_interval',
+      // tooltip: 'Always above 4x scrape interval',
+    });
+  }
+
+  return param;
+}
+
+export function createAggregationOperation(
+  name: string,
+  overrides: Partial<QueryBuilderOperationDef> = {}
+): QueryBuilderOperationDef[] {
+  const operations: QueryBuilderOperationDef[] = [
+    {
+      id: name,
+      name: getPromOperationDisplayName(name),
+      params: [
+        {
+          name: 'By label',
+          type: 'string',
+          restParam: true,
+          optional: true,
+        },
+      ],
+      defaultParams: [],
+      alternativesKey: 'plain aggregations',
+      category: PromVisualQueryOperationCategory.Aggregations,
+      renderer: functionRendererLeft,
+      paramChangedHandler: getOnLabelAddedHandler(`__${name}_by`),
+      explainHandler: getAggregationExplainer(name, ''),
+      addOperationHandler: defaultAddOperationHandler,
+      ...overrides,
+    },
+    {
+      id: `__${name}_by`,
+      name: `${getPromOperationDisplayName(name)} by`,
+      params: [
+        {
+          name: 'Label',
+          type: 'string',
+          restParam: true,
+          optional: true,
+          editor: LabelParamEditor,
+        },
+      ],
+      defaultParams: [''],
+      alternativesKey: 'aggregations by',
+      category: PromVisualQueryOperationCategory.Aggregations,
+      renderer: getAggregationByRenderer(name),
+      paramChangedHandler: getLastLabelRemovedHandler(name),
+      explainHandler: getAggregationExplainer(name, 'by'),
+      addOperationHandler: defaultAddOperationHandler,
+      hideFromList: true,
+      ...overrides,
+    },
+    {
+      id: `__${name}_without`,
+      name: `${getPromOperationDisplayName(name)} without`,
+      params: [
+        {
+          name: 'Label',
+          type: 'string',
+          restParam: true,
+          optional: true,
+          editor: LabelParamEditor,
+        },
+      ],
+      defaultParams: [''],
+      alternativesKey: 'aggregations by',
+      category: PromVisualQueryOperationCategory.Aggregations,
+      renderer: getAggregationWithoutRenderer(name),
+      paramChangedHandler: getLastLabelRemovedHandler(name),
+      explainHandler: getAggregationExplainer(name, 'without'),
+      addOperationHandler: defaultAddOperationHandler,
+      hideFromList: true,
+      ...overrides,
+    },
+  ];
+
+  return operations;
+}
+
+export function createAggregationOperationWithParam(
+  name: string,
+  paramsDef: { params: QueryBuilderOperationParamDef[]; defaultParams: QueryBuilderOperationParamValue[] },
+  overrides: Partial<QueryBuilderOperationDef> = {}
+): QueryBuilderOperationDef[] {
+  const operations = createAggregationOperation(name, overrides);
+  operations[0].params.unshift(...paramsDef.params);
+  operations[1].params.unshift(...paramsDef.params);
+  operations[2].params.unshift(...paramsDef.params);
+  operations[0].defaultParams = paramsDef.defaultParams;
+  operations[1].defaultParams = [...paramsDef.defaultParams, ''];
+  operations[2].defaultParams = [...paramsDef.defaultParams, ''];
+  operations[1].renderer = getAggregationByRendererWithParameter(name);
+  operations[2].renderer = getAggregationByRendererWithParameter(name);
+  return operations;
+}
+
+function getAggregationByRenderer(aggregation: string) {
+  return function aggregationRenderer(model: QueryBuilderOperation, def: QueryBuilderOperationDef, innerExpr: string) {
+    return `${aggregation} by(${model.params.join(', ')}) (${innerExpr})`;
+  };
+}
+
+function getAggregationWithoutRenderer(aggregation: string) {
+  return function aggregationRenderer(model: QueryBuilderOperation, def: QueryBuilderOperationDef, innerExpr: string) {
+    return `${aggregation} without(${model.params.join(', ')}) (${innerExpr})`;
+  };
+}
+
+/**
+ * Very simple poc implementation, needs to be modified to support all aggregation operators
+ */
+export function getAggregationExplainer(aggregationName: string, mode: 'by' | 'without' | '') {
+  return function aggregationExplainer(model: QueryBuilderOperation) {
+    const labels = model.params.map((label) => `\`${label}\``).join(' and ');
+    const labelWord = pluralize('label', model.params.length);
+
+    switch (mode) {
+      case 'by':
+        return `Calculates ${aggregationName} over dimensions while preserving ${labelWord} ${labels}.`;
+      case 'without':
+        return `Calculates ${aggregationName} over the dimensions ${labels}. All other labels are preserved.`;
+      default:
+        return `Calculates ${aggregationName} over the dimensions.`;
+    }
+  };
+}
+
+function getAggregationByRendererWithParameter(aggregation: string) {
+  return function aggregationRenderer(model: QueryBuilderOperation, def: QueryBuilderOperationDef, innerExpr: string) {
+    const restParamIndex = def.params.findIndex((param) => param.restParam);
+    const params = model.params.slice(0, restParamIndex);
+    const restParams = model.params.slice(restParamIndex);
+
+    return `${aggregation} by(${restParams.join(', ')}) (${params
+      .map((param, idx) => (def.params[idx].type === 'string' ? `\"${param}\"` : param))
+      .join(', ')}, ${innerExpr})`;
+  };
+}
+
+/**
+ * This function will transform operations without labels to their plan aggregation operation
+ */
+export function getLastLabelRemovedHandler(changeToOperationId: string) {
+  return function onParamChanged(index: number, op: QueryBuilderOperation, def: QueryBuilderOperationDef) {
+    // If definition has more params then is defined there are no optional rest params anymore.
+    // We then transform this operation into a different one
+    if (op.params.length < def.params.length) {
+      return {
+        ...op,
+        id: changeToOperationId,
+      };
+    }
+
+    return op;
+  };
+}
+
+export function getOnLabelAddedHandler(changeToOperationId: string) {
+  return function onParamChanged(index: number, op: QueryBuilderOperation, def: QueryBuilderOperationDef) {
+    // Check if we actually have the label param. As it's optional the aggregation can have one less, which is the
+    // case of just simple aggregation without label. When user adds the label it now has the same number of params
+    // as its definition, and now we can change it to its `_by` variant.
+    if (op.params.length === def.params.length) {
+      return {
+        ...op,
+        id: changeToOperationId,
+      };
+    }
+    return op;
+  };
+}
+
+export function isConflictingSelector(
+  newLabel: Partial<QueryBuilderLabelFilter>,
+  labels: Array<Partial<QueryBuilderLabelFilter>>
+): boolean {
+  if (!newLabel.label || !newLabel.op || !newLabel.value) {
+    return false;
+  }
+
+  if (labels.length < 2) {
+    return false;
+  }
+
+  const operationIsNegative = newLabel.op.toString().startsWith('!');
+
+  const candidates = labels.filter(
+    (label) => label.label === newLabel.label && label.value === newLabel.value && label.op !== newLabel.op
+  );
+
+  const conflict = candidates.some((candidate) => {
+    if (operationIsNegative && candidate?.op?.toString().startsWith('!') === false) {
+      return true;
+    }
+    if (operationIsNegative === false && candidate?.op?.toString().startsWith('!')) {
+      return true;
+    }
+    return false;
+  });
+
+  return conflict;
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/operations.ts b/packages/grafana-prometheus/src/querybuilder/operations.ts
new file mode 100644
index 0000000000000..3b445efa37e00
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/operations.ts
@@ -0,0 +1,376 @@
+import { binaryScalarOperations } from './binaryScalarOperations';
+import { LabelParamEditor } from './components/LabelParamEditor';
+import {
+  defaultAddOperationHandler,
+  functionRendererLeft,
+  functionRendererRight,
+  getPromOperationDisplayName,
+  getRangeVectorParamDef,
+  rangeRendererLeftWithParams,
+  rangeRendererRightWithParams,
+} from './operationUtils';
+import {
+  QueryBuilderOperation,
+  QueryBuilderOperationDef,
+  QueryWithOperations,
+  VisualQueryModeller,
+} from './shared/types';
+import { PromOperationId, PromVisualQuery, PromVisualQueryOperationCategory } from './types';
+
+export function getOperationDefinitions(): QueryBuilderOperationDef[] {
+  const list: QueryBuilderOperationDef[] = [
+    {
+      id: PromOperationId.HistogramQuantile,
+      name: 'Histogram quantile',
+      params: [{ name: 'Quantile', type: 'number', options: [0.99, 0.95, 0.9, 0.75, 0.5, 0.25] }],
+      defaultParams: [0.9],
+      category: PromVisualQueryOperationCategory.Functions,
+      renderer: functionRendererLeft,
+      addOperationHandler: defaultAddOperationHandler,
+    },
+    {
+      id: PromOperationId.LabelReplace,
+      name: 'Label replace',
+      params: [
+        { name: 'Destination label', type: 'string' },
+        { name: 'Replacement', type: 'string' },
+        { name: 'Source label', type: 'string' },
+        { name: 'Regex', type: 'string' },
+      ],
+      category: PromVisualQueryOperationCategory.Functions,
+      defaultParams: ['', '$1', '', '(.*)'],
+      renderer: functionRendererRight,
+      addOperationHandler: defaultAddOperationHandler,
+    },
+    {
+      id: PromOperationId.Ln,
+      name: 'Ln',
+      params: [],
+      defaultParams: [],
+      category: PromVisualQueryOperationCategory.Functions,
+      renderer: functionRendererLeft,
+      addOperationHandler: defaultAddOperationHandler,
+    },
+    createRangeFunction(PromOperationId.Changes),
+    createRangeFunction(PromOperationId.Rate, true),
+    createRangeFunction(PromOperationId.Irate),
+    createRangeFunction(PromOperationId.Increase, true),
+    createRangeFunction(PromOperationId.Idelta),
+    createRangeFunction(PromOperationId.Delta),
+    createFunction({
+      id: PromOperationId.HoltWinters,
+      params: [
+        getRangeVectorParamDef(),
+        { name: 'Smoothing Factor', type: 'number' },
+        { name: 'Trend Factor', type: 'number' },
+      ],
+      defaultParams: ['$__interval', 0.5, 0.5],
+      alternativesKey: 'range function',
+      category: PromVisualQueryOperationCategory.RangeFunctions,
+      renderer: rangeRendererRightWithParams,
+      addOperationHandler: addOperationWithRangeVector,
+      changeTypeHandler: operationTypeChangedHandlerForRangeFunction,
+    }),
+    createFunction({
+      id: PromOperationId.PredictLinear,
+      params: [getRangeVectorParamDef(), { name: 'Seconds from now', type: 'number' }],
+      defaultParams: ['$__interval', 60],
+      alternativesKey: 'range function',
+      category: PromVisualQueryOperationCategory.RangeFunctions,
+      renderer: rangeRendererRightWithParams,
+      addOperationHandler: addOperationWithRangeVector,
+      changeTypeHandler: operationTypeChangedHandlerForRangeFunction,
+    }),
+    createFunction({
+      id: PromOperationId.QuantileOverTime,
+      params: [getRangeVectorParamDef(), { name: 'Quantile', type: 'number' }],
+      defaultParams: ['$__interval', 0.5],
+      alternativesKey: 'overtime function',
+      category: PromVisualQueryOperationCategory.RangeFunctions,
+      renderer: rangeRendererLeftWithParams,
+      addOperationHandler: addOperationWithRangeVector,
+      changeTypeHandler: operationTypeChangedHandlerForRangeFunction,
+    }),
+    ...binaryScalarOperations,
+    {
+      id: PromOperationId.NestedQuery,
+      name: 'Binary operation with query',
+      params: [],
+      defaultParams: [],
+      category: PromVisualQueryOperationCategory.BinaryOps,
+      renderer: (model, def, innerExpr) => innerExpr,
+      addOperationHandler: addNestedQueryHandler,
+    },
+    createFunction({ id: PromOperationId.Abs }),
+    createFunction({ id: PromOperationId.Absent }),
+    createFunction({
+      id: PromOperationId.Acos,
+      category: PromVisualQueryOperationCategory.Trigonometric,
+    }),
+    createFunction({
+      id: PromOperationId.Acosh,
+      category: PromVisualQueryOperationCategory.Trigonometric,
+    }),
+    createFunction({
+      id: PromOperationId.Asin,
+      category: PromVisualQueryOperationCategory.Trigonometric,
+    }),
+    createFunction({
+      id: PromOperationId.Asinh,
+      category: PromVisualQueryOperationCategory.Trigonometric,
+    }),
+    createFunction({
+      id: PromOperationId.Atan,
+      category: PromVisualQueryOperationCategory.Trigonometric,
+    }),
+    createFunction({
+      id: PromOperationId.Atanh,
+      category: PromVisualQueryOperationCategory.Trigonometric,
+    }),
+    createFunction({ id: PromOperationId.Ceil }),
+    createFunction({
+      id: PromOperationId.Clamp,
+      name: 'Clamp',
+      params: [
+        { name: 'Minimum Scalar', type: 'number' },
+        { name: 'Maximum Scalar', type: 'number' },
+      ],
+      defaultParams: [1, 1],
+    }),
+
+    createFunction({
+      id: PromOperationId.ClampMax,
+      params: [{ name: 'Maximum Scalar', type: 'number' }],
+      defaultParams: [1],
+    }),
+    createFunction({
+      id: PromOperationId.ClampMin,
+      params: [{ name: 'Minimum Scalar', type: 'number' }],
+      defaultParams: [1],
+    }),
+    createFunction({
+      id: PromOperationId.Cos,
+      category: PromVisualQueryOperationCategory.Trigonometric,
+    }),
+    createFunction({
+      id: PromOperationId.Cosh,
+      category: PromVisualQueryOperationCategory.Trigonometric,
+    }),
+    createFunction({
+      id: PromOperationId.DayOfMonth,
+      category: PromVisualQueryOperationCategory.Time,
+    }),
+    createFunction({
+      id: PromOperationId.DayOfWeek,
+      category: PromVisualQueryOperationCategory.Time,
+    }),
+    createFunction({
+      id: PromOperationId.DayOfYear,
+      category: PromVisualQueryOperationCategory.Time,
+    }),
+    createFunction({
+      id: PromOperationId.DaysInMonth,
+      category: PromVisualQueryOperationCategory.Time,
+    }),
+    createFunction({ id: PromOperationId.Deg }),
+    createRangeFunction(PromOperationId.Deriv),
+    //
+    createFunction({ id: PromOperationId.Exp }),
+    createFunction({ id: PromOperationId.Floor }),
+    createFunction({ id: PromOperationId.Group }),
+    createFunction({ id: PromOperationId.Hour }),
+    createFunction({
+      id: PromOperationId.LabelJoin,
+      params: [
+        {
+          name: 'Destination Label',
+          type: 'string',
+          editor: LabelParamEditor,
+        },
+        {
+          name: 'Separator',
+          type: 'string',
+        },
+        {
+          name: 'Source Label',
+          type: 'string',
+          restParam: true,
+          optional: true,
+          editor: LabelParamEditor,
+        },
+      ],
+      defaultParams: ['', ',', ''],
+      renderer: labelJoinRenderer,
+      addOperationHandler: labelJoinAddOperationHandler,
+    }),
+    createFunction({ id: PromOperationId.Log10 }),
+    createFunction({ id: PromOperationId.Log2 }),
+    createFunction({ id: PromOperationId.Minute }),
+    createFunction({ id: PromOperationId.Month }),
+    createFunction({
+      id: PromOperationId.Pi,
+      renderer: (model) => `${model.id}()`,
+    }),
+    createFunction({
+      id: PromOperationId.Quantile,
+      params: [{ name: 'Value', type: 'number' }],
+      defaultParams: [1],
+      renderer: functionRendererLeft,
+    }),
+    createFunction({ id: PromOperationId.Rad }),
+    createRangeFunction(PromOperationId.Resets),
+    createFunction({
+      id: PromOperationId.Round,
+      category: PromVisualQueryOperationCategory.Functions,
+      params: [{ name: 'To Nearest', type: 'number' }],
+      defaultParams: [1],
+    }),
+    createFunction({ id: PromOperationId.Scalar }),
+    createFunction({ id: PromOperationId.Sgn }),
+    createFunction({ id: PromOperationId.Sin, category: PromVisualQueryOperationCategory.Trigonometric }),
+    createFunction({
+      id: PromOperationId.Sinh,
+      category: PromVisualQueryOperationCategory.Trigonometric,
+    }),
+    createFunction({ id: PromOperationId.Sort }),
+    createFunction({ id: PromOperationId.SortDesc }),
+    createFunction({ id: PromOperationId.Sqrt }),
+    createFunction({ id: PromOperationId.Stddev }),
+    createFunction({
+      id: PromOperationId.Tan,
+      category: PromVisualQueryOperationCategory.Trigonometric,
+    }),
+    createFunction({
+      id: PromOperationId.Tanh,
+      category: PromVisualQueryOperationCategory.Trigonometric,
+    }),
+    createFunction({
+      id: PromOperationId.Time,
+      renderer: (model) => `${model.id}()`,
+    }),
+    createFunction({ id: PromOperationId.Timestamp }),
+    createFunction({
+      id: PromOperationId.Vector,
+      params: [{ name: 'Value', type: 'number' }],
+      defaultParams: [1],
+      renderer: (model) => `${model.id}(${model.params[0]})`,
+    }),
+    createFunction({ id: PromOperationId.Year }),
+  ];
+
+  return list;
+}
+
+export function createFunction(definition: Partial<QueryBuilderOperationDef>): QueryBuilderOperationDef {
+  return {
+    ...definition,
+    id: definition.id!,
+    name: definition.name ?? getPromOperationDisplayName(definition.id!),
+    params: definition.params ?? [],
+    defaultParams: definition.defaultParams ?? [],
+    category: definition.category ?? PromVisualQueryOperationCategory.Functions,
+    renderer: definition.renderer ?? (definition.params ? functionRendererRight : functionRendererLeft),
+    addOperationHandler: definition.addOperationHandler ?? defaultAddOperationHandler,
+  };
+}
+
+export function createRangeFunction(name: string, withRateInterval = false): QueryBuilderOperationDef {
+  return {
+    id: name,
+    name: getPromOperationDisplayName(name),
+    params: [getRangeVectorParamDef(withRateInterval)],
+    defaultParams: [withRateInterval ? '$__rate_interval' : '$__interval'],
+    alternativesKey: 'range function',
+    category: PromVisualQueryOperationCategory.RangeFunctions,
+    renderer: operationWithRangeVectorRenderer,
+    addOperationHandler: addOperationWithRangeVector,
+    changeTypeHandler: operationTypeChangedHandlerForRangeFunction,
+  };
+}
+
+function operationTypeChangedHandlerForRangeFunction(
+  operation: QueryBuilderOperation,
+  newDef: QueryBuilderOperationDef
+) {
+  // validate current parameter
+  if (operation.params[0] === '$__rate_interval' && newDef.defaultParams[0] !== '$__rate_interval') {
+    operation.params = newDef.defaultParams;
+  } else if (operation.params[0] === '$__interval' && newDef.defaultParams[0] !== '$__interval') {
+    operation.params = newDef.defaultParams;
+  }
+
+  return operation;
+}
+
+export function operationWithRangeVectorRenderer(
+  model: QueryBuilderOperation,
+  def: QueryBuilderOperationDef,
+  innerExpr: string
+) {
+  let rangeVector = (model.params ?? [])[0] ?? '5m';
+  return `${def.id}(${innerExpr}[${rangeVector}])`;
+}
+
+/**
+ * Since there can only be one operation with range vector this will replace the current one (if one was added )
+ */
+export function addOperationWithRangeVector(
+  def: QueryBuilderOperationDef,
+  query: PromVisualQuery,
+  modeller: VisualQueryModeller
+) {
+  const newOperation: QueryBuilderOperation = {
+    id: def.id,
+    params: def.defaultParams,
+  };
+
+  if (query.operations.length > 0) {
+    // If operation exists it has to be in the registry so no point to check if it was found
+    const firstOp = modeller.getOperationDef(query.operations[0].id)!;
+
+    if (firstOp.addOperationHandler === addOperationWithRangeVector) {
+      return {
+        ...query,
+        operations: [newOperation, ...query.operations.slice(1)],
+      };
+    }
+  }
+
+  return {
+    ...query,
+    operations: [newOperation, ...query.operations],
+  };
+}
+
+function addNestedQueryHandler(def: QueryBuilderOperationDef, query: PromVisualQuery): PromVisualQuery {
+  return {
+    ...query,
+    binaryQueries: [
+      ...(query.binaryQueries ?? []),
+      {
+        operator: '/',
+        query,
+      },
+    ],
+  };
+}
+
+function labelJoinRenderer(model: QueryBuilderOperation, def: QueryBuilderOperationDef, innerExpr: string) {
+  if (typeof model.params[1] !== 'string') {
+    throw 'The separator must be a string';
+  }
+  const separator = `"${model.params[1]}"`;
+  return `${model.id}(${innerExpr}, "${model.params[0]}", ${separator}, "${model.params.slice(2).join(separator)}")`;
+}
+
+function labelJoinAddOperationHandler<T extends QueryWithOperations>(def: QueryBuilderOperationDef, query: T) {
+  const newOperation: QueryBuilderOperation = {
+    id: def.id,
+    params: def.defaultParams,
+  };
+
+  return {
+    ...query,
+    operations: [...query.operations, newOperation],
+  };
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/parsing.test.ts b/packages/grafana-prometheus/src/querybuilder/parsing.test.ts
new file mode 100644
index 0000000000000..08fa72b7b8a1f
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/parsing.test.ts
@@ -0,0 +1,720 @@
+import { buildVisualQueryFromString } from './parsing';
+import { PromOperationId, PromVisualQuery } from './types';
+
+describe('buildVisualQueryFromString', () => {
+  it('creates no errors for empty query', () => {
+    expect(buildVisualQueryFromString('')).toEqual(
+      noErrors({
+        labels: [],
+        operations: [],
+        metric: '',
+      })
+    );
+  });
+  it('parses simple binary comparison', () => {
+    expect(buildVisualQueryFromString('{app="aggregator"} == 11')).toEqual({
+      query: {
+        labels: [
+          {
+            label: 'app',
+            op: '=',
+            value: 'aggregator',
+          },
+        ],
+        metric: '',
+        operations: [
+          {
+            id: PromOperationId.EqualTo,
+            params: [11, false],
+          },
+        ],
+      },
+      errors: [],
+    });
+  });
+
+  // This still fails because loki doesn't properly parse the bool operator
+  it('parses simple query with with boolean operator', () => {
+    expect(buildVisualQueryFromString('{app="aggregator"} == bool 12')).toEqual({
+      query: {
+        labels: [
+          {
+            label: 'app',
+            op: '=',
+            value: 'aggregator',
+          },
+        ],
+        metric: '',
+        operations: [
+          {
+            id: PromOperationId.EqualTo,
+            params: [12, true],
+          },
+        ],
+      },
+      errors: [],
+    });
+  });
+  it('parses simple query', () => {
+    expect(buildVisualQueryFromString('counters_logins{app="frontend"}')).toEqual(
+      noErrors({
+        metric: 'counters_logins',
+        labels: [
+          {
+            op: '=',
+            value: 'frontend',
+            label: 'app',
+          },
+        ],
+        operations: [],
+      })
+    );
+  });
+
+  describe('nested binary operation errors in visual query editor', () => {
+    // Visual query builder does not currently have support for nested binary operations, for now we should throw an error in the UI letting users know that their query will be misinterpreted
+    it('throws error when visual query parse is ambiguous', () => {
+      expect(
+        buildVisualQueryFromString('topk(5, node_arp_entries / node_arp_entries{cluster="dev-eu-west-2"})')
+      ).toMatchObject({
+        errors: [
+          {
+            from: 8,
+            text: 'Query parsing is ambiguous.',
+            to: 68,
+          },
+        ],
+      });
+    });
+    it('throws error when visual query parse with aggregation is ambiguous (scalar)', () => {
+      expect(buildVisualQueryFromString('topk(5, 1 / 2)')).toMatchObject({
+        errors: [
+          {
+            from: 8,
+            text: 'Query parsing is ambiguous.',
+            to: 13,
+          },
+        ],
+      });
+    });
+    it('throws error when visual query parse with functionCall is ambiguous', () => {
+      expect(
+        buildVisualQueryFromString(
+          'clamp_min(sum by(cluster)(rate(X{le="2.5"}[5m]))+sum by (cluster) (rate(X{le="5"}[5m])), 0.001)'
+        )
+      ).toMatchObject({
+        errors: [
+          {
+            from: 10,
+            text: 'Query parsing is ambiguous.',
+            to: 87,
+          },
+        ],
+      });
+    });
+    it('does not throw error when visual query parse is unambiguous', () => {
+      expect(
+        buildVisualQueryFromString('topk(5, node_arp_entries) / node_arp_entries{cluster="dev-eu-west-2"}')
+      ).toMatchObject({
+        errors: [],
+      });
+    });
+    it('does not throw error when visual query parse is unambiguous (scalar)', () => {
+      // Note this topk query with scalars is not valid in prometheus, but it does not currently throw an error during parse
+      expect(buildVisualQueryFromString('topk(5, 1) / 2')).toMatchObject({
+        errors: [],
+      });
+    });
+    it('does not throw error when visual query parse is unambiguous, function call', () => {
+      // Note this topk query with scalars is not valid in prometheus, but it does not currently throw an error during parse
+      expect(
+        buildVisualQueryFromString(
+          'clamp_min(sum by(cluster) (rate(X{le="2.5"}[5m])), 0.001) + sum by(cluster) (rate(X{le="5"}[5m]))'
+        )
+      ).toMatchObject({
+        errors: [],
+      });
+    });
+  });
+
+  it('parses query with rate and interval', () => {
+    expect(buildVisualQueryFromString('rate(counters_logins{app="frontend"}[5m])')).toEqual(
+      noErrors({
+        metric: 'counters_logins',
+        labels: [
+          {
+            op: '=',
+            value: 'frontend',
+            label: 'app',
+          },
+        ],
+        operations: [
+          {
+            id: 'rate',
+            params: ['5m'],
+          },
+        ],
+      })
+    );
+  });
+
+  it('parses query with nested query and interval variable', () => {
+    expect(
+      buildVisualQueryFromString(
+        'avg(rate(access_evaluation_duration_count{instance="host.docker.internal:3000"}[$__rate_interval]))'
+      )
+    ).toEqual({
+      errors: [],
+      query: {
+        metric: 'access_evaluation_duration_count',
+        labels: [
+          {
+            op: '=',
+            value: 'host.docker.internal:3000',
+            label: 'instance',
+          },
+        ],
+        operations: [
+          {
+            id: 'rate',
+            params: ['$__rate_interval'],
+          },
+          {
+            id: 'avg',
+            params: [],
+          },
+        ],
+      },
+    });
+  });
+
+  it('parses query with aggregation by labels', () => {
+    const visQuery = {
+      metric: 'metric_name',
+      labels: [
+        {
+          label: 'instance',
+          op: '=',
+          value: 'internal:3000',
+        },
+      ],
+      operations: [
+        {
+          id: '__sum_by',
+          params: ['app', 'version'],
+        },
+      ],
+    };
+    expect(buildVisualQueryFromString('sum(metric_name{instance="internal:3000"}) by (app, version)')).toEqual(
+      noErrors(visQuery)
+    );
+    expect(buildVisualQueryFromString('sum by (app, version)(metric_name{instance="internal:3000"})')).toEqual(
+      noErrors(visQuery)
+    );
+  });
+
+  it('parses query with aggregation without labels', () => {
+    const visQuery = {
+      metric: 'metric_name',
+      labels: [
+        {
+          label: 'instance',
+          op: '=',
+          value: 'internal:3000',
+        },
+      ],
+      operations: [
+        {
+          id: '__sum_without',
+          params: ['app', 'version'],
+        },
+      ],
+    };
+    expect(buildVisualQueryFromString('sum(metric_name{instance="internal:3000"}) without (app, version)')).toEqual(
+      noErrors(visQuery)
+    );
+    expect(buildVisualQueryFromString('sum without (app, version)(metric_name{instance="internal:3000"})')).toEqual(
+      noErrors(visQuery)
+    );
+  });
+
+  it('parses aggregation with params', () => {
+    expect(buildVisualQueryFromString('topk(5, http_requests_total)')).toEqual(
+      noErrors({
+        metric: 'http_requests_total',
+        labels: [],
+        operations: [
+          {
+            id: 'topk',
+            params: [5],
+          },
+        ],
+      })
+    );
+  });
+
+  it('parses aggregation with params and labels', () => {
+    expect(buildVisualQueryFromString('topk by(instance, job) (5, http_requests_total)')).toEqual(
+      noErrors({
+        metric: 'http_requests_total',
+        labels: [],
+        operations: [
+          {
+            id: '__topk_by',
+            params: [5, 'instance', 'job'],
+          },
+        ],
+      })
+    );
+  });
+
+  it('parses function with argument', () => {
+    expect(
+      buildVisualQueryFromString('histogram_quantile(0.99, rate(counters_logins{app="backend"}[$__rate_interval]))')
+    ).toEqual({
+      errors: [],
+      query: {
+        metric: 'counters_logins',
+        labels: [{ label: 'app', op: '=', value: 'backend' }],
+        operations: [
+          {
+            id: 'rate',
+            params: ['$__rate_interval'],
+          },
+          {
+            id: 'histogram_quantile',
+            params: [0.99],
+          },
+        ],
+      },
+    });
+  });
+
+  it('parses function with multiple arguments', () => {
+    expect(
+      buildVisualQueryFromString(
+        'label_replace(avg_over_time(http_requests_total{instance="foo"}[$__interval]), "instance", "$1", "", "(.*)")'
+      )
+    ).toEqual({
+      errors: [],
+      query: {
+        metric: 'http_requests_total',
+        labels: [{ label: 'instance', op: '=', value: 'foo' }],
+        operations: [
+          {
+            id: 'avg_over_time',
+            params: ['$__interval'],
+          },
+          {
+            id: 'label_replace',
+            params: ['instance', '$1', '', '(.*)'],
+          },
+        ],
+      },
+    });
+  });
+
+  it('parses binary operation with scalar', () => {
+    expect(buildVisualQueryFromString('avg_over_time(http_requests_total{instance="foo"}[$__interval]) / 2')).toEqual({
+      errors: [],
+      query: {
+        metric: 'http_requests_total',
+        labels: [{ label: 'instance', op: '=', value: 'foo' }],
+        operations: [
+          {
+            id: 'avg_over_time',
+            params: ['$__interval'],
+          },
+          {
+            id: '__divide_by',
+            params: [2],
+          },
+        ],
+      },
+    });
+  });
+
+  it('parses binary operation with 2 queries', () => {
+    expect(
+      buildVisualQueryFromString('avg_over_time(http_requests_total{instance="foo"}[$__interval]) / sum(logins_count)')
+    ).toEqual({
+      errors: [],
+      query: {
+        metric: 'http_requests_total',
+        labels: [{ label: 'instance', op: '=', value: 'foo' }],
+        operations: [{ id: 'avg_over_time', params: ['$__interval'] }],
+        binaryQueries: [
+          {
+            operator: '/',
+            query: {
+              metric: 'logins_count',
+              labels: [],
+              operations: [{ id: 'sum', params: [] }],
+            },
+          },
+        ],
+      },
+    });
+  });
+
+  it('parses template variables in strings', () => {
+    expect(buildVisualQueryFromString('http_requests_total{instance="$label_variable"}')).toEqual(
+      noErrors({
+        metric: 'http_requests_total',
+        labels: [{ label: 'instance', op: '=', value: '$label_variable' }],
+        operations: [],
+      })
+    );
+  });
+
+  it('parses template variables for metric', () => {
+    expect(buildVisualQueryFromString('$metric_variable{instance="foo"}')).toEqual(
+      noErrors({
+        metric: '$metric_variable',
+        labels: [{ label: 'instance', op: '=', value: 'foo' }],
+        operations: [],
+      })
+    );
+
+    expect(buildVisualQueryFromString('${metric_variable:fmt}{instance="foo"}')).toEqual(
+      noErrors({
+        metric: '${metric_variable:fmt}',
+        labels: [{ label: 'instance', op: '=', value: 'foo' }],
+        operations: [],
+      })
+    );
+
+    expect(buildVisualQueryFromString('[[metric_variable:fmt]]{instance="foo"}')).toEqual(
+      noErrors({
+        metric: '[[metric_variable:fmt]]',
+        labels: [{ label: 'instance', op: '=', value: 'foo' }],
+        operations: [],
+      })
+    );
+  });
+
+  it('parses template variables in label name', () => {
+    expect(buildVisualQueryFromString('metric{${variable_label}="foo"}')).toEqual(
+      noErrors({
+        metric: 'metric',
+        labels: [{ label: '${variable_label}', op: '=', value: 'foo' }],
+        operations: [],
+      })
+    );
+  });
+
+  it('Throws error when undefined', () => {
+    expect(() => buildVisualQueryFromString(undefined as unknown as string)).toThrow(
+      "Cannot read properties of undefined (reading 'replace')"
+    );
+  });
+
+  it('Works with empty string', () => {
+    expect(buildVisualQueryFromString('')).toEqual(
+      noErrors({
+        metric: '',
+        labels: [],
+        operations: [],
+      })
+    );
+  });
+
+  it('fails to parse variable for function', () => {
+    expect(buildVisualQueryFromString('${func_var}(metric{bar="foo"})')).toEqual({
+      errors: [
+        {
+          text: '(',
+          from: 20,
+          to: 21,
+          parentType: 'VectorSelector',
+        },
+        {
+          text: 'metric',
+          from: 21,
+          to: 27,
+          parentType: 'VectorSelector',
+        },
+      ],
+      query: {
+        metric: '${func_var}',
+        labels: [{ label: 'bar', op: '=', value: 'foo' }],
+        operations: [],
+      },
+    });
+  });
+
+  it('fails to parse malformed query', () => {
+    expect(buildVisualQueryFromString('asdf-metric{bar="})')).toEqual({
+      errors: [
+        {
+          text: '',
+          from: 19,
+          to: 19,
+          parentType: 'LabelMatchers',
+        },
+      ],
+      query: {
+        metric: 'asdf',
+        labels: [],
+        operations: [],
+        binaryQueries: [
+          {
+            operator: '-',
+            query: {
+              metric: 'metric',
+              labels: [{ label: 'bar', op: '=', value: '})' }],
+              operations: [],
+            },
+          },
+        ],
+      },
+    });
+  });
+
+  it('fails to parse malformed query 2', () => {
+    expect(buildVisualQueryFromString('ewafweaf{afea=afe}')).toEqual({
+      errors: [
+        {
+          text: 'afe}',
+          from: 14,
+          to: 18,
+          parentType: 'LabelMatcher',
+        },
+      ],
+      query: {
+        metric: 'ewafweaf',
+        labels: [{ label: 'afea', op: '=', value: '' }],
+        operations: [],
+      },
+    });
+  });
+
+  it('parses query without metric', () => {
+    expect(buildVisualQueryFromString('label_replace(rate([$__rate_interval]), "", "$1", "", "(.*)")')).toEqual({
+      errors: [],
+      query: {
+        metric: '',
+        labels: [],
+        operations: [
+          { id: 'rate', params: ['$__rate_interval'] },
+          {
+            id: 'label_replace',
+            params: ['', '$1', '', '(.*)'],
+          },
+        ],
+      },
+    });
+  });
+
+  it('lone aggregation without params', () => {
+    expect(buildVisualQueryFromString('sum()')).toEqual({
+      errors: [],
+      query: {
+        metric: '',
+        labels: [],
+        operations: [{ id: 'sum', params: [] }],
+      },
+    });
+  });
+
+  it('handles multiple binary scalar operations', () => {
+    expect(buildVisualQueryFromString('cluster_namespace_slug_dialer_name + 1 - 1 / 1 * 1 % 1 ^ 1')).toEqual({
+      errors: [],
+      query: {
+        metric: 'cluster_namespace_slug_dialer_name',
+        labels: [],
+        operations: [
+          {
+            id: '__addition',
+            params: [1],
+          },
+          {
+            id: '__subtraction',
+            params: [1],
+          },
+          {
+            id: '__divide_by',
+            params: [1],
+          },
+          {
+            id: '__multiply_by',
+            params: [1],
+          },
+          {
+            id: '__modulo',
+            params: [1],
+          },
+          {
+            id: '__exponent',
+            params: [1],
+          },
+        ],
+      },
+    });
+  });
+
+  it('handles scalar comparison operators', () => {
+    expect(buildVisualQueryFromString('cluster_namespace_slug_dialer_name <= 2.5')).toEqual({
+      errors: [],
+      query: {
+        metric: 'cluster_namespace_slug_dialer_name',
+        labels: [],
+        operations: [
+          {
+            id: '__less_or_equal',
+            params: [2.5, false],
+          },
+        ],
+      },
+    });
+  });
+
+  it('handles bool with comparison operator', () => {
+    expect(buildVisualQueryFromString('cluster_namespace_slug_dialer_name <= bool 2')).toEqual({
+      errors: [],
+      query: {
+        metric: 'cluster_namespace_slug_dialer_name',
+        labels: [],
+        operations: [
+          {
+            id: '__less_or_equal',
+            params: [2, true],
+          },
+        ],
+      },
+    });
+  });
+
+  it('handles multiple binary operations', () => {
+    expect(buildVisualQueryFromString('foo{x="yy"} * metric{y="zz",a="bb"} * metric2')).toEqual({
+      errors: [],
+      query: {
+        metric: 'foo',
+        labels: [{ label: 'x', op: '=', value: 'yy' }],
+        operations: [],
+        binaryQueries: [
+          {
+            operator: '*',
+            query: {
+              metric: 'metric',
+              labels: [
+                { label: 'y', op: '=', value: 'zz' },
+                { label: 'a', op: '=', value: 'bb' },
+              ],
+              operations: [],
+            },
+          },
+          {
+            operator: '*',
+            query: {
+              metric: 'metric2',
+              labels: [],
+              operations: [],
+            },
+          },
+        ],
+      },
+    });
+  });
+
+  it('handles multiple binary operations and scalar', () => {
+    expect(buildVisualQueryFromString('foo{x="yy"} * metric{y="zz",a="bb"} * 2')).toEqual({
+      errors: [],
+      query: {
+        metric: 'foo',
+        labels: [{ label: 'x', op: '=', value: 'yy' }],
+        operations: [
+          {
+            id: '__multiply_by',
+            params: [2],
+          },
+        ],
+        binaryQueries: [
+          {
+            operator: '*',
+            query: {
+              metric: 'metric',
+              labels: [
+                { label: 'y', op: '=', value: 'zz' },
+                { label: 'a', op: '=', value: 'bb' },
+              ],
+              operations: [],
+            },
+          },
+        ],
+      },
+    });
+  });
+
+  it('handles binary operation with vector matchers', () => {
+    expect(buildVisualQueryFromString('foo * on(foo, bar) metric')).toEqual({
+      errors: [],
+      query: {
+        metric: 'foo',
+        labels: [],
+        operations: [],
+        binaryQueries: [
+          {
+            operator: '*',
+            vectorMatches: 'foo, bar',
+            vectorMatchesType: 'on',
+            query: { metric: 'metric', labels: [], operations: [] },
+          },
+        ],
+      },
+    });
+
+    expect(buildVisualQueryFromString('foo * ignoring(foo) metric')).toEqual({
+      errors: [],
+      query: {
+        metric: 'foo',
+        labels: [],
+        operations: [],
+        binaryQueries: [
+          {
+            operator: '*',
+            vectorMatches: 'foo',
+            vectorMatchesType: 'ignoring',
+            query: { metric: 'metric', labels: [], operations: [] },
+          },
+        ],
+      },
+    });
+  });
+
+  it('reports error on parenthesis', () => {
+    expect(buildVisualQueryFromString('foo / (bar + baz)')).toEqual({
+      errors: [
+        {
+          from: 6,
+          parentType: 'Expr',
+          text: '(bar + baz)',
+          to: 17,
+        },
+      ],
+      query: {
+        metric: 'foo',
+        labels: [],
+        operations: [],
+        binaryQueries: [
+          {
+            operator: '/',
+            query: {
+              binaryQueries: [{ operator: '+', query: { labels: [], metric: 'baz', operations: [] } }],
+              metric: 'bar',
+              labels: [],
+              operations: [],
+            },
+          },
+        ],
+      },
+    });
+  });
+});
+
+function noErrors(query: PromVisualQuery) {
+  return {
+    errors: [],
+    query,
+  };
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/parsing.ts b/packages/grafana-prometheus/src/querybuilder/parsing.ts
new file mode 100644
index 0000000000000..de1486efc2a59
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/parsing.ts
@@ -0,0 +1,468 @@
+import { SyntaxNode } from '@lezer/common';
+import {
+  AggregateExpr,
+  AggregateModifier,
+  AggregateOp,
+  BinaryExpr,
+  BinModifiers,
+  Expr,
+  FunctionCall,
+  FunctionCallArgs,
+  FunctionCallBody,
+  FunctionIdentifier,
+  GroupingLabel,
+  GroupingLabelList,
+  GroupingLabels,
+  LabelMatcher,
+  LabelName,
+  MatchOp,
+  MetricIdentifier,
+  NumberLiteral,
+  On,
+  OnOrIgnoring,
+  ParenExpr,
+  parser,
+  StringLiteral,
+  VectorSelector,
+  Without,
+} from '@prometheus-io/lezer-promql';
+
+import { binaryScalarOperatorToOperatorName } from './binaryScalarOperations';
+import {
+  ErrorId,
+  getAllByType,
+  getLeftMostChild,
+  getString,
+  makeBinOp,
+  makeError,
+  replaceVariables,
+} from './parsingUtils';
+import { QueryBuilderLabelFilter, QueryBuilderOperation } from './shared/types';
+import { PromVisualQuery, PromVisualQueryBinary } from './types';
+
+/**
+ * Parses a PromQL query into a visual query model.
+ *
+ * It traverses the tree and uses sort of state machine to update the query model. The query model is modified
+ * during the traversal and sent to each handler as context.
+ *
+ * @param expr
+ */
+export function buildVisualQueryFromString(expr: string): Context {
+  const replacedExpr = replaceVariables(expr);
+  const tree = parser.parse(replacedExpr);
+  const node = tree.topNode;
+
+  // This will be modified in the handlers.
+  const visQuery: PromVisualQuery = {
+    metric: '',
+    labels: [],
+    operations: [],
+  };
+  const context: Context = {
+    query: visQuery,
+    errors: [],
+  };
+
+  try {
+    handleExpression(replacedExpr, node, context);
+  } catch (err) {
+    // Not ideal to log it here, but otherwise we would lose the stack trace.
+    console.error(err);
+    if (err instanceof Error) {
+      context.errors.push({
+        text: err.message,
+      });
+    }
+  }
+
+  // If we have empty query, we want to reset errors
+  if (isEmptyQuery(context.query)) {
+    context.errors = [];
+  }
+
+  // We don't want parsing errors related to Grafana global variables
+  if (isValidPromQLMinusGrafanaGlobalVariables(expr)) {
+    context.errors = [];
+  }
+
+  return context;
+}
+
+interface ParsingError {
+  text: string;
+  from?: number;
+  to?: number;
+  parentType?: string;
+}
+
+interface Context {
+  query: PromVisualQuery;
+  errors: ParsingError[];
+}
+
+function isValidPromQLMinusGrafanaGlobalVariables(expr: string) {
+  const context: Context = {
+    query: {
+      metric: '',
+      labels: [],
+      operations: [],
+    },
+    errors: [],
+  };
+
+  expr = expr.replace(/\$__interval/g, '1s');
+  expr = expr.replace(/\$__interval_ms/g, '1000');
+  expr = expr.replace(/\$__rate_interval/g, '1s');
+  expr = expr.replace(/\$__range_ms/g, '1000');
+  expr = expr.replace(/\$__range_s/g, '1');
+  expr = expr.replace(/\$__range/g, '1s');
+
+  const tree = parser.parse(expr);
+  const node = tree.topNode;
+
+  try {
+    handleExpression(expr, node, context);
+  } catch (err) {
+    return false;
+  }
+
+  return context.errors.length === 0;
+}
+
+/**
+ * Handler for default state. It will traverse the tree and call the appropriate handler for each node. The node
+ * handled here does not necessarily need to be of type == Expr.
+ * @param expr
+ * @param node
+ * @param context
+ */
+export function handleExpression(expr: string, node: SyntaxNode, context: Context) {
+  const visQuery = context.query;
+
+  switch (node.type.id) {
+    case MetricIdentifier: {
+      // Expectation is that there is only one of those per query.
+      visQuery.metric = getString(expr, node);
+      break;
+    }
+
+    case LabelMatcher: {
+      // Same as MetricIdentifier should be just one per query.
+      visQuery.labels.push(getLabel(expr, node));
+      const err = node.getChild(ErrorId);
+      if (err) {
+        context.errors.push(makeError(expr, err));
+      }
+      break;
+    }
+
+    case FunctionCall: {
+      handleFunction(expr, node, context);
+      break;
+    }
+
+    case AggregateExpr: {
+      handleAggregation(expr, node, context);
+      break;
+    }
+
+    case BinaryExpr: {
+      handleBinary(expr, node, context);
+      break;
+    }
+
+    case ErrorId: {
+      if (isIntervalVariableError(node)) {
+        break;
+      }
+      context.errors.push(makeError(expr, node));
+      break;
+    }
+
+    default: {
+      if (node.type.id === ParenExpr) {
+        // We don't support parenthesis in the query to group expressions. We just report error but go on with the
+        // parsing.
+        context.errors.push(makeError(expr, node));
+      }
+      // Any other nodes we just ignore and go to its children. This should be fine as there are lots of wrapper
+      // nodes that can be skipped.
+      // TODO: there are probably cases where we will just skip nodes we don't support and we should be able to
+      //  detect those and report back.
+      let child = node.firstChild;
+      while (child) {
+        handleExpression(expr, child, context);
+        child = child.nextSibling;
+      }
+    }
+  }
+}
+
+function isIntervalVariableError(node: SyntaxNode) {
+  return node.prevSibling?.type.id === Expr && node.prevSibling?.firstChild?.type.id === VectorSelector;
+}
+
+function getLabel(expr: string, node: SyntaxNode): QueryBuilderLabelFilter {
+  const label = getString(expr, node.getChild(LabelName));
+  const op = getString(expr, node.getChild(MatchOp));
+  const value = getString(expr, node.getChild(StringLiteral)).replace(/"/g, '');
+  return {
+    label,
+    op,
+    value,
+  };
+}
+
+const rangeFunctions = ['changes', 'rate', 'irate', 'increase', 'delta'];
+
+/**
+ * Handle function call which is usually and identifier and its body > arguments.
+ * @param expr
+ * @param node
+ * @param context
+ */
+function handleFunction(expr: string, node: SyntaxNode, context: Context) {
+  const visQuery = context.query;
+  const nameNode = node.getChild(FunctionIdentifier);
+  const funcName = getString(expr, nameNode);
+
+  const body = node.getChild(FunctionCallBody);
+  const callArgs = body!.getChild(FunctionCallArgs);
+  const params = [];
+  let interval = '';
+
+  // This is a bit of a shortcut to get the interval argument. Reasons are
+  // - interval is not part of the function args per promQL grammar but we model it as argument for the function in
+  //   the query model.
+  // - it is easier to handle template variables this way as template variable is an error for the parser
+  if (rangeFunctions.includes(funcName) || funcName.endsWith('_over_time')) {
+    let match = getString(expr, node).match(/\[(.+)\]/);
+    if (match?.[1]) {
+      interval = match[1];
+      params.push(match[1]);
+    }
+  }
+
+  const op = { id: funcName, params };
+  // We unshift operations to keep the more natural order that we want to have in the visual query editor.
+  visQuery.operations.unshift(op);
+
+  if (callArgs) {
+    if (getString(expr, callArgs) === interval + ']') {
+      // This is a special case where we have a function with a single argument and it is the interval.
+      // This happens when you start adding operations in query builder and did not set a metric yet.
+      return;
+    }
+    updateFunctionArgs(expr, callArgs, context, op);
+  }
+}
+
+/**
+ * Handle aggregation as they are distinct type from other functions.
+ * @param expr
+ * @param node
+ * @param context
+ */
+function handleAggregation(expr: string, node: SyntaxNode, context: Context) {
+  const visQuery = context.query;
+  const nameNode = node.getChild(AggregateOp);
+  let funcName = getString(expr, nameNode);
+
+  const modifier = node.getChild(AggregateModifier);
+  const labels = [];
+
+  if (modifier) {
+    const byModifier = modifier.getChild(`By`);
+    if (byModifier && funcName) {
+      funcName = `__${funcName}_by`;
+    }
+
+    const withoutModifier = modifier.getChild(Without);
+    if (withoutModifier) {
+      funcName = `__${funcName}_without`;
+    }
+
+    labels.push(...getAllByType(expr, modifier, GroupingLabel));
+  }
+
+  const body = node.getChild(FunctionCallBody);
+  const callArgs = body!.getChild(FunctionCallArgs);
+  const callArgsExprChild = callArgs?.getChild(Expr);
+  const binaryExpressionWithinAggregationArgs = callArgsExprChild?.getChild(BinaryExpr);
+
+  if (binaryExpressionWithinAggregationArgs) {
+    context.errors.push({
+      text: 'Query parsing is ambiguous.',
+      from: binaryExpressionWithinAggregationArgs.from,
+      to: binaryExpressionWithinAggregationArgs.to,
+    });
+  }
+
+  const op: QueryBuilderOperation = { id: funcName, params: [] };
+  visQuery.operations.unshift(op);
+  updateFunctionArgs(expr, callArgs, context, op);
+  // We add labels after params in the visual query editor.
+  op.params.push(...labels);
+}
+
+/**
+ * Handle (probably) all types of arguments that function or aggregation can have.
+ *
+ *  FunctionCallArgs are nested bit weirdly basically its [firstArg, ...rest] where rest is again FunctionCallArgs so
+ *  we cannot just get all the children and iterate them as arguments we have to again recursively traverse through
+ *  them.
+ *
+ * @param expr
+ * @param node
+ * @param context
+ * @param op - We need the operation to add the params to as an additional context.
+ */
+function updateFunctionArgs(expr: string, node: SyntaxNode | null, context: Context, op: QueryBuilderOperation) {
+  if (!node) {
+    return;
+  }
+  switch (node.type.id) {
+    // In case we have an expression we don't know what kind so we have to look at the child as it can be anything.
+    case Expr:
+    // FunctionCallArgs are nested bit weirdly as mentioned so we have to go one deeper in this case.
+    case FunctionCallArgs: {
+      let child = node.firstChild;
+
+      while (child) {
+        const callArgsExprChild = child.getChild(Expr);
+        const binaryExpressionWithinFunctionArgs = callArgsExprChild?.getChild(BinaryExpr);
+
+        if (binaryExpressionWithinFunctionArgs) {
+          context.errors.push({
+            text: 'Query parsing is ambiguous.',
+            from: binaryExpressionWithinFunctionArgs.from,
+            to: binaryExpressionWithinFunctionArgs.to,
+          });
+        }
+
+        updateFunctionArgs(expr, child, context, op);
+        child = child.nextSibling;
+      }
+
+      break;
+    }
+
+    case NumberLiteral: {
+      op.params.push(parseFloat(getString(expr, node)));
+      break;
+    }
+
+    case StringLiteral: {
+      op.params.push(getString(expr, node).replace(/"/g, ''));
+      break;
+    }
+
+    default: {
+      // Means we get to something that does not seem like simple function arg and is probably nested query so jump
+      // back to main context
+      handleExpression(expr, node, context);
+    }
+  }
+}
+
+/**
+ * Right now binary expressions can be represented in 2 way in visual query. As additional operation in case it is
+ * just operation with scalar or it creates a binaryQuery when it's 2 queries.
+ * @param expr
+ * @param node
+ * @param context
+ */
+function handleBinary(expr: string, node: SyntaxNode, context: Context) {
+  const visQuery = context.query;
+  const left = node.firstChild!;
+  const op = getString(expr, left.nextSibling);
+  const binModifier = getBinaryModifier(expr, node.getChild(BinModifiers));
+
+  const right = node.lastChild!;
+
+  const opDef = binaryScalarOperatorToOperatorName[op];
+
+  const leftNumber = left.getChild(NumberLiteral);
+  const rightNumber = right.getChild(NumberLiteral);
+
+  const rightBinary = right.getChild(BinaryExpr);
+
+  if (leftNumber) {
+    // TODO: this should be already handled in case parent is binary expression as it has to be added to parent
+    //  if query starts with a number that isn't handled now.
+  } else {
+    // If this is binary we don't really know if there is a query or just chained scalars. So
+    // we have to traverse a bit deeper to know
+    handleExpression(expr, left, context);
+  }
+
+  if (rightNumber) {
+    visQuery.operations.push(makeBinOp(opDef, expr, right, !!binModifier?.isBool));
+  } else if (rightBinary) {
+    // Due to the way binary ops are parsed we can get a binary operation on the right that starts with a number which
+    // is a factor for a current binary operation. So we have to add it as an operation now.
+    const leftMostChild = getLeftMostChild(right);
+    if (leftMostChild?.type.id === NumberLiteral) {
+      visQuery.operations.push(makeBinOp(opDef, expr, leftMostChild, !!binModifier?.isBool));
+    }
+
+    // If we added the first number literal as operation here we still can continue and handle the rest as the first
+    // number will be just skipped.
+    handleExpression(expr, right, context);
+  } else {
+    visQuery.binaryQueries = visQuery.binaryQueries || [];
+    const binQuery: PromVisualQueryBinary = {
+      operator: op,
+      query: {
+        metric: '',
+        labels: [],
+        operations: [],
+      },
+    };
+    if (binModifier?.isMatcher) {
+      binQuery.vectorMatchesType = binModifier.matchType;
+      binQuery.vectorMatches = binModifier.matches;
+    }
+    visQuery.binaryQueries.push(binQuery);
+    handleExpression(expr, right, {
+      query: binQuery.query,
+      errors: context.errors,
+    });
+  }
+}
+
+function getBinaryModifier(
+  expr: string,
+  node: SyntaxNode | null
+):
+  | { isBool: true; isMatcher: false }
+  | { isBool: false; isMatcher: true; matches: string; matchType: 'ignoring' | 'on' }
+  | undefined {
+  if (!node) {
+    return undefined;
+  }
+  if (node.getChild('Bool')) {
+    return { isBool: true, isMatcher: false };
+  } else {
+    const matcher = node.getChild(OnOrIgnoring);
+    if (!matcher) {
+      // Not sure what this could be, maybe should be an error.
+      return undefined;
+    }
+    const labels = getString(expr, matcher.getChild(GroupingLabels)?.getChild(GroupingLabelList));
+    return {
+      isMatcher: true,
+      isBool: false,
+      matches: labels,
+      matchType: matcher.getChild(On) ? 'on' : 'ignoring',
+    };
+  }
+}
+
+function isEmptyQuery(query: PromVisualQuery) {
+  if (query.labels.length === 0 && query.operations.length === 0 && !query.metric) {
+    return true;
+  }
+  return false;
+}
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/parsingUtils.test.ts b/packages/grafana-prometheus/src/querybuilder/parsingUtils.test.ts
similarity index 100%
rename from public/app/plugins/datasource/prometheus/querybuilder/shared/parsingUtils.test.ts
rename to packages/grafana-prometheus/src/querybuilder/parsingUtils.test.ts
diff --git a/packages/grafana-prometheus/src/querybuilder/parsingUtils.ts b/packages/grafana-prometheus/src/querybuilder/parsingUtils.ts
new file mode 100644
index 0000000000000..10be8692ebc6b
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/parsingUtils.ts
@@ -0,0 +1,140 @@
+import { SyntaxNode, TreeCursor } from '@lezer/common';
+
+import { QueryBuilderOperation, QueryBuilderOperationParamValue } from './shared/types';
+
+// Although 0 isn't explicitly provided in the lezer-promql library as the error node ID, it does appear to be the ID of error nodes within lezer.
+export const ErrorId = 0;
+
+export function getLeftMostChild(cur: SyntaxNode): SyntaxNode {
+  return cur.firstChild ? getLeftMostChild(cur.firstChild) : cur;
+}
+
+export function makeError(expr: string, node: SyntaxNode) {
+  return {
+    text: getString(expr, node),
+    // TODO: this are positions in the string with the replaced variables. Means it cannot be used to show exact
+    //  placement of the error for the user. We need some translation table to positions before the variable
+    //  replace.
+    from: node.from,
+    to: node.to,
+    parentType: node.parent?.name,
+  };
+}
+
+// Taken from template_srv, but copied so to not mess with the regex.index which is manipulated in the service
+/*
+ * This regex matches 3 types of variable reference with an optional format specifier
+ * \$(\w+)                          $var1
+ * \[\[([\s\S]+?)(?::(\w+))?\]\]    [[var2]] or [[var2:fmt2]]
+ * \${(\w+)(?::(\w+))?}             ${var3} or ${var3:fmt3}
+ */
+const variableRegex = /\$(\w+)|\[\[([\s\S]+?)(?::(\w+))?\]\]|\${(\w+)(?:\.([^:^\}]+))?(?::([^\}]+))?}/g;
+
+/**
+ * As variables with $ are creating parsing errors, we first replace them with magic string that is parsable and at
+ * the same time we can get the variable and its format back from it.
+ * @param expr
+ */
+export function replaceVariables(expr: string) {
+  return expr.replace(variableRegex, (match, var1, var2, fmt2, var3, fieldPath, fmt3) => {
+    const fmt = fmt2 || fmt3;
+    let variable = var1;
+    let varType = '0';
+
+    if (var2) {
+      variable = var2;
+      varType = '1';
+    }
+
+    if (var3) {
+      variable = var3;
+      varType = '2';
+    }
+
+    return `__V_${varType}__` + variable + '__V__' + (fmt ? '__F__' + fmt + '__F__' : '');
+  });
+}
+
+const varTypeFunc = [
+  (v: string, f?: string) => `\$${v}`,
+  (v: string, f?: string) => `[[${v}${f ? `:${f}` : ''}]]`,
+  (v: string, f?: string) => `\$\{${v}${f ? `:${f}` : ''}\}`,
+];
+
+/**
+ * Get back the text with variables in their original format.
+ * @param expr
+ */
+export function returnVariables(expr: string) {
+  return expr.replace(/__V_(\d)__(.+?)__V__(?:__F__(\w+)__F__)?/g, (match, type, v, f) => {
+    return varTypeFunc[parseInt(type, 10)](v, f);
+  });
+}
+
+/**
+ * Get the actual string of the expression. That is not stored in the tree so we have to get the indexes from the node
+ * and then based on that get it from the expression.
+ * @param expr
+ * @param node
+ */
+export function getString(expr: string, node: SyntaxNode | TreeCursor | null | undefined) {
+  if (!node) {
+    return '';
+  }
+  return returnVariables(expr.substring(node.from, node.to));
+}
+
+/**
+ * Create simple scalar binary op object.
+ * @param opDef - definition of the op to be created
+ * @param expr
+ * @param numberNode - the node for the scalar
+ * @param hasBool - whether operation has a bool modifier. Is used only for ops for which it makes sense.
+ */
+export function makeBinOp(
+  opDef: { id: string; comparison?: boolean },
+  expr: string,
+  numberNode: SyntaxNode,
+  hasBool: boolean
+): QueryBuilderOperation {
+  const params: QueryBuilderOperationParamValue[] = [parseFloat(getString(expr, numberNode))];
+  if (opDef.comparison) {
+    params.push(hasBool);
+  }
+  return {
+    id: opDef.id,
+    params,
+  };
+}
+
+/**
+ * Get all nodes with type in the tree. This traverses the tree so it is safe only when you know there shouldn't be
+ * too much nesting but you just want to skip some of the wrappers. For example getting function args this way would
+ * not be safe is it would also find arguments of nested functions.
+ * @param expr
+ * @param cur
+ * @param type - can be string or number, some data-sources (loki) haven't migrated over to using numeric constants defined in the lezer parsing library (e.g. lezer-promql).
+ * @todo Remove string type definition when all data-sources have migrated to numeric constants
+ */
+export function getAllByType(expr: string, cur: SyntaxNode, type: number | string): string[] {
+  if (cur.type.id === type || cur.name === type) {
+    return [getString(expr, cur)];
+  }
+  const values: string[] = [];
+  let pos = 0;
+  let child = cur.childAfter(pos);
+  while (child) {
+    values.push(...getAllByType(expr, child, type));
+    pos = child.to;
+    child = cur.childAfter(pos);
+  }
+  return values;
+}
+
+/**
+ * There aren't any spaces in the metric names, so let's introduce a wildcard into the regex for each space to better facilitate a fuzzy search
+ */
+export const regexifyLabelValuesQueryString = (query: string) => {
+  const queryArray = query.split(' ');
+  return queryArray.map((query) => `${query}.*`).join('');
+};
diff --git a/packages/grafana-prometheus/src/querybuilder/shared/LokiAndPromQueryModellerBase.ts b/packages/grafana-prometheus/src/querybuilder/shared/LokiAndPromQueryModellerBase.ts
new file mode 100644
index 0000000000000..81afc5a276234
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/shared/LokiAndPromQueryModellerBase.ts
@@ -0,0 +1,122 @@
+import { Registry } from '@grafana/data';
+
+import { PromVisualQueryOperationCategory } from '../types';
+
+import { QueryBuilderLabelFilter, QueryBuilderOperation, QueryBuilderOperationDef, VisualQueryModeller } from './types';
+
+export interface VisualQueryBinary<T> {
+  operator: string;
+  vectorMatchesType?: 'on' | 'ignoring';
+  vectorMatches?: string;
+  query: T;
+}
+
+export interface PromLokiVisualQuery {
+  metric?: string;
+  labels: QueryBuilderLabelFilter[];
+  operations: QueryBuilderOperation[];
+  binaryQueries?: Array<VisualQueryBinary<PromLokiVisualQuery>>;
+}
+
+export abstract class LokiAndPromQueryModellerBase implements VisualQueryModeller {
+  protected operationsRegistry: Registry<QueryBuilderOperationDef>;
+  private categories: string[] = [];
+
+  constructor(getOperations: () => QueryBuilderOperationDef[]) {
+    this.operationsRegistry = new Registry<QueryBuilderOperationDef>(getOperations);
+  }
+
+  protected setOperationCategories(categories: string[]) {
+    this.categories = categories;
+  }
+
+  getOperationsForCategory(category: string) {
+    return this.operationsRegistry.list().filter((op) => op.category === category && !op.hideFromList);
+  }
+
+  getAlternativeOperations(key: string) {
+    return this.operationsRegistry.list().filter((op) => op.alternativesKey && op.alternativesKey === key);
+  }
+
+  getCategories() {
+    return this.categories;
+  }
+
+  getOperationDef(id: string): QueryBuilderOperationDef | undefined {
+    return this.operationsRegistry.getIfExists(id);
+  }
+
+  renderOperations(queryString: string, operations: QueryBuilderOperation[]) {
+    for (const operation of operations) {
+      const def = this.operationsRegistry.getIfExists(operation.id);
+      if (!def) {
+        throw new Error(`Could not find operation ${operation.id} in the registry`);
+      }
+      queryString = def.renderer(operation, def, queryString);
+    }
+
+    return queryString;
+  }
+
+  renderBinaryQueries(queryString: string, binaryQueries?: Array<VisualQueryBinary<PromLokiVisualQuery>>) {
+    if (binaryQueries) {
+      for (const binQuery of binaryQueries) {
+        queryString = `${this.renderBinaryQuery(queryString, binQuery)}`;
+      }
+    }
+    return queryString;
+  }
+
+  private renderBinaryQuery(leftOperand: string, binaryQuery: VisualQueryBinary<PromLokiVisualQuery>) {
+    let result = leftOperand + ` ${binaryQuery.operator} `;
+
+    if (binaryQuery.vectorMatches) {
+      result += `${binaryQuery.vectorMatchesType}(${binaryQuery.vectorMatches}) `;
+    }
+
+    return result + this.renderQuery(binaryQuery.query, true);
+  }
+
+  renderLabels(labels: QueryBuilderLabelFilter[]) {
+    if (labels.length === 0) {
+      return '';
+    }
+
+    let expr = '{';
+    for (const filter of labels) {
+      if (expr !== '{') {
+        expr += ', ';
+      }
+
+      expr += `${filter.label}${filter.op}"${filter.value}"`;
+    }
+
+    return expr + `}`;
+  }
+
+  renderQuery(query: PromLokiVisualQuery, nested?: boolean) {
+    let queryString = `${query.metric ?? ''}${this.renderLabels(query.labels)}`;
+    queryString = this.renderOperations(queryString, query.operations);
+
+    if (!nested && this.hasBinaryOp(query) && Boolean(query.binaryQueries?.length)) {
+      queryString = `(${queryString})`;
+    }
+
+    queryString = this.renderBinaryQueries(queryString, query.binaryQueries);
+
+    if (nested && (this.hasBinaryOp(query) || Boolean(query.binaryQueries?.length))) {
+      queryString = `(${queryString})`;
+    }
+
+    return queryString;
+  }
+
+  hasBinaryOp(query: PromLokiVisualQuery): boolean {
+    return (
+      query.operations.find((op) => {
+        const def = this.getOperationDef(op.id);
+        return def?.category === PromVisualQueryOperationCategory.BinaryOps;
+      }) !== undefined
+    );
+  }
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/shared/OperationEditor.tsx b/packages/grafana-prometheus/src/querybuilder/shared/OperationEditor.tsx
new file mode 100644
index 0000000000000..cd4dd77ff7287
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/shared/OperationEditor.tsx
@@ -0,0 +1,308 @@
+import { css, cx } from '@emotion/css';
+import React, { useEffect, useId, useState } from 'react';
+import { Draggable } from 'react-beautiful-dnd';
+
+import { DataSourceApi, GrafanaTheme2, TimeRange } from '@grafana/data';
+import { Button, Icon, Stack, Tooltip, useStyles2 } from '@grafana/ui';
+
+import { getOperationParamId } from '../operationUtils';
+
+import { OperationHeader } from './OperationHeader';
+import { getOperationParamEditor } from './OperationParamEditor';
+import {
+  QueryBuilderOperation,
+  QueryBuilderOperationDef,
+  QueryBuilderOperationParamDef,
+  QueryBuilderOperationParamValue,
+  VisualQueryModeller,
+} from './types';
+
+export interface Props {
+  operation: QueryBuilderOperation;
+  index: number;
+  query: any;
+  datasource: DataSourceApi;
+  queryModeller: VisualQueryModeller;
+  onChange: (index: number, update: QueryBuilderOperation) => void;
+  onRemove: (index: number) => void;
+  onRunQuery: () => void;
+  flash?: boolean;
+  highlight?: boolean;
+  timeRange?: TimeRange;
+}
+
+export function OperationEditor({
+  operation,
+  index,
+  onRemove,
+  onChange,
+  onRunQuery,
+  queryModeller,
+  query,
+  datasource,
+  flash,
+  highlight,
+  timeRange,
+}: Props) {
+  const styles = useStyles2(getStyles);
+  const def = queryModeller.getOperationDef(operation.id);
+  const shouldFlash = useFlash(flash);
+  const id = useId();
+
+  if (!def) {
+    return <span>Operation {operation.id} not found</span>;
+  }
+
+  const onParamValueChanged = (paramIdx: number, value: QueryBuilderOperationParamValue) => {
+    const update: QueryBuilderOperation = { ...operation, params: [...operation.params] };
+    update.params[paramIdx] = value;
+    callParamChangedThenOnChange(def, update, index, paramIdx, onChange);
+  };
+
+  const onAddRestParam = () => {
+    const update: QueryBuilderOperation = { ...operation, params: [...operation.params, ''] };
+    callParamChangedThenOnChange(def, update, index, operation.params.length, onChange);
+  };
+
+  const onRemoveRestParam = (paramIdx: number) => {
+    const update: QueryBuilderOperation = {
+      ...operation,
+      params: [...operation.params.slice(0, paramIdx), ...operation.params.slice(paramIdx + 1)],
+    };
+    callParamChangedThenOnChange(def, update, index, paramIdx, onChange);
+  };
+
+  const operationElements: React.ReactNode[] = [];
+
+  for (let paramIndex = 0; paramIndex < operation.params.length; paramIndex++) {
+    const paramDef = def.params[Math.min(def.params.length - 1, paramIndex)];
+    const Editor = getOperationParamEditor(paramDef);
+
+    operationElements.push(
+      <div className={styles.paramRow} key={`${paramIndex}-1`}>
+        {!paramDef.hideName && (
+          <div className={styles.paramName}>
+            <label htmlFor={getOperationParamId(id, paramIndex)}>{paramDef.name}</label>
+            {paramDef.description && (
+              <Tooltip placement="top" content={paramDef.description} theme="info">
+                <Icon name="info-circle" size="sm" className={styles.infoIcon} />
+              </Tooltip>
+            )}
+          </div>
+        )}
+        <div className={styles.paramValue}>
+          <Stack gap={0.5} direction="row" alignItems="center">
+            <Editor
+              index={paramIndex}
+              paramDef={paramDef}
+              value={operation.params[paramIndex]}
+              operation={operation}
+              operationId={id}
+              onChange={onParamValueChanged}
+              onRunQuery={onRunQuery}
+              query={query}
+              datasource={datasource}
+              timeRange={timeRange}
+            />
+            {paramDef.restParam && (operation.params.length > def.params.length || paramDef.optional) && (
+              <Button
+                data-testid={`operations.${index}.remove-rest-param`}
+                size="sm"
+                fill="text"
+                icon="times"
+                variant="secondary"
+                title={`Remove ${paramDef.name}`}
+                onClick={() => onRemoveRestParam(paramIndex)}
+              />
+            )}
+          </Stack>
+        </div>
+      </div>
+    );
+  }
+
+  // Handle adding button for rest params
+  let restParam: React.ReactNode | undefined;
+  if (def.params.length > 0) {
+    const lastParamDef = def.params[def.params.length - 1];
+    if (lastParamDef.restParam) {
+      restParam = renderAddRestParamButton(lastParamDef, onAddRestParam, index, operation.params.length, styles);
+    }
+  }
+
+  return (
+    <Draggable draggableId={`operation-${index}`} index={index}>
+      {(provided) => (
+        <div
+          className={cx(styles.card, (shouldFlash || highlight) && styles.cardHighlight)}
+          ref={provided.innerRef}
+          {...provided.draggableProps}
+          data-testid={`operations.${index}.wrapper`}
+        >
+          <OperationHeader
+            operation={operation}
+            dragHandleProps={provided.dragHandleProps}
+            def={def}
+            index={index}
+            onChange={onChange}
+            onRemove={onRemove}
+            queryModeller={queryModeller}
+          />
+          <div className={styles.body}>{operationElements}</div>
+          {restParam}
+          {index < query.operations.length - 1 && (
+            <div className={styles.arrow}>
+              <div className={styles.arrowLine} />
+              <div className={styles.arrowArrow} />
+            </div>
+          )}
+        </div>
+      )}
+    </Draggable>
+  );
+}
+
+/**
+ * When flash is switched on makes sure it is switched of right away, so we just flash the highlight and then fade
+ * out.
+ * @param flash
+ */
+function useFlash(flash?: boolean) {
+  const [keepFlash, setKeepFlash] = useState(true);
+  useEffect(() => {
+    let t: ReturnType<typeof setTimeout>;
+    if (flash) {
+      t = setTimeout(() => {
+        setKeepFlash(false);
+      }, 1000);
+    } else {
+      setKeepFlash(true);
+    }
+
+    return () => clearTimeout(t);
+  }, [flash]);
+
+  return keepFlash && flash;
+}
+
+function renderAddRestParamButton(
+  paramDef: QueryBuilderOperationParamDef,
+  onAddRestParam: () => void,
+  operationIndex: number,
+  paramIndex: number,
+  styles: OperationEditorStyles
+) {
+  return (
+    <div className={styles.restParam} key={`${paramIndex}-2`}>
+      <Button
+        size="sm"
+        icon="plus"
+        title={`Add ${paramDef.name}`.trimEnd()}
+        variant="secondary"
+        onClick={onAddRestParam}
+        data-testid={`operations.${operationIndex}.add-rest-param`}
+      >
+        {paramDef.name}
+      </Button>
+    </div>
+  );
+}
+
+function callParamChangedThenOnChange(
+  def: QueryBuilderOperationDef,
+  operation: QueryBuilderOperation,
+  operationIndex: number,
+  paramIndex: number,
+  onChange: (index: number, update: QueryBuilderOperation) => void
+) {
+  if (def.paramChangedHandler) {
+    onChange(operationIndex, def.paramChangedHandler(paramIndex, operation, def));
+  } else {
+    onChange(operationIndex, operation);
+  }
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    cardWrapper: css({
+      alignItems: 'stretch',
+    }),
+    error: css({
+      marginBottom: theme.spacing(1),
+    }),
+    card: css({
+      background: theme.colors.background.primary,
+      border: `1px solid ${theme.colors.border.medium}`,
+      cursor: 'grab',
+      borderRadius: theme.shape.radius.default,
+      marginBottom: theme.spacing(1),
+      position: 'relative',
+      transition: 'all 0.5s ease-in 0s',
+      height: '100%',
+    }),
+    cardError: css({
+      boxShadow: `0px 0px 4px 0px ${theme.colors.warning.main}`,
+      border: `1px solid ${theme.colors.warning.main}`,
+    }),
+    cardHighlight: css({
+      boxShadow: `0px 0px 4px 0px ${theme.colors.primary.border}`,
+      border: `1px solid ${theme.colors.primary.border}`,
+    }),
+    infoIcon: css({
+      marginLeft: theme.spacing(0.5),
+      color: theme.colors.text.secondary,
+      ':hover': {
+        color: theme.colors.text.primary,
+      },
+    }),
+    body: css({
+      margin: theme.spacing(1, 1, 0.5, 1),
+      display: 'table',
+    }),
+    paramRow: css({
+      label: 'paramRow',
+      display: 'table-row',
+      verticalAlign: 'middle',
+    }),
+    paramName: css({
+      display: 'table-cell',
+      padding: theme.spacing(0, 1, 0, 0),
+      fontSize: theme.typography.bodySmall.fontSize,
+      fontWeight: theme.typography.fontWeightMedium,
+      verticalAlign: 'middle',
+      height: '32px',
+    }),
+    paramValue: css({
+      label: 'paramValue',
+      display: 'table-cell',
+      verticalAlign: 'middle',
+    }),
+    restParam: css({
+      padding: theme.spacing(0, 1, 1, 1),
+    }),
+    arrow: css({
+      position: 'absolute',
+      top: '0',
+      right: '-18px',
+      display: 'flex',
+    }),
+    arrowLine: css({
+      height: '2px',
+      width: '8px',
+      backgroundColor: theme.colors.border.strong,
+      position: 'relative',
+      top: '14px',
+    }),
+    arrowArrow: css({
+      width: 0,
+      height: 0,
+      borderTop: `5px solid transparent`,
+      borderBottom: `5px solid transparent`,
+      borderLeft: `7px solid ${theme.colors.border.strong}`,
+      position: 'relative',
+      top: '10px',
+    }),
+  };
+};
+
+type OperationEditorStyles = ReturnType<typeof getStyles>;
diff --git a/packages/grafana-prometheus/src/querybuilder/shared/OperationExplainedBox.tsx b/packages/grafana-prometheus/src/querybuilder/shared/OperationExplainedBox.tsx
new file mode 100644
index 0000000000000..f38597c3c1035
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/shared/OperationExplainedBox.tsx
@@ -0,0 +1,77 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2, renderMarkdown } from '@grafana/data';
+import { useStyles2 } from '@grafana/ui';
+
+export interface Props {
+  title?: React.ReactNode;
+  children?: React.ReactNode;
+  markdown?: string;
+  stepNumber?: number;
+}
+
+export function OperationExplainedBox({ title, stepNumber, markdown, children }: Props) {
+  const styles = useStyles2(getStyles);
+
+  return (
+    <div className={styles.box}>
+      {stepNumber !== undefined && <div className={styles.stepNumber}>{stepNumber}</div>}
+      <div className={styles.boxInner}>
+        {title && (
+          <div className={styles.header}>
+            <span>{title}</span>
+          </div>
+        )}
+        <div className={styles.body}>
+          {markdown && <div dangerouslySetInnerHTML={{ __html: renderMarkdown(markdown) }}></div>}
+          {children}
+        </div>
+      </div>
+    </div>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    box: css({
+      background: theme.colors.background.secondary,
+      padding: theme.spacing(1),
+      borderRadius: theme.shape.radius.default,
+      position: 'relative',
+    }),
+    boxInner: css({
+      marginLeft: theme.spacing(4),
+    }),
+    stepNumber: css({
+      fontWeight: theme.typography.fontWeightMedium,
+      background: theme.colors.secondary.main,
+      width: '20px',
+      height: '20px',
+      borderRadius: theme.shape.radius.circle,
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'center',
+      position: 'absolute',
+      top: '10px',
+      left: '11px',
+      fontSize: theme.typography.bodySmall.fontSize,
+    }),
+    header: css({
+      paddingBottom: theme.spacing(0.5),
+      display: 'flex',
+      alignItems: 'center',
+      fontFamily: theme.typography.fontFamilyMonospace,
+    }),
+    body: css({
+      color: theme.colors.text.secondary,
+      'p:last-child': {
+        margin: 0,
+      },
+      a: {
+        color: theme.colors.text.link,
+        textDecoration: 'underline',
+      },
+    }),
+  };
+};
diff --git a/packages/grafana-prometheus/src/querybuilder/shared/OperationHeader.tsx b/packages/grafana-prometheus/src/querybuilder/shared/OperationHeader.tsx
new file mode 100644
index 0000000000000..a47c747c9d58a
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/shared/OperationHeader.tsx
@@ -0,0 +1,121 @@
+import { css } from '@emotion/css';
+import React, { useState } from 'react';
+import { DraggableProvided } from 'react-beautiful-dnd';
+
+import { GrafanaTheme2, SelectableValue } from '@grafana/data';
+import { FlexItem } from '@grafana/experimental';
+import { Button, Select, useStyles2 } from '@grafana/ui';
+
+import { OperationInfoButton } from './OperationInfoButton';
+import { QueryBuilderOperation, QueryBuilderOperationDef, VisualQueryModeller } from './types';
+
+export interface Props {
+  operation: QueryBuilderOperation;
+  def: QueryBuilderOperationDef;
+  index: number;
+  queryModeller: VisualQueryModeller;
+  dragHandleProps?: DraggableProvided['dragHandleProps'];
+  onChange: (index: number, update: QueryBuilderOperation) => void;
+  onRemove: (index: number) => void;
+}
+
+interface State {
+  isOpen?: boolean;
+  alternatives?: Array<SelectableValue<QueryBuilderOperationDef>>;
+}
+
+export const OperationHeader = React.memo<Props>(
+  ({ operation, def, index, onChange, onRemove, queryModeller, dragHandleProps }) => {
+    const styles = useStyles2(getStyles);
+    const [state, setState] = useState<State>({});
+
+    const onToggleSwitcher = () => {
+      if (state.isOpen) {
+        setState({ ...state, isOpen: false });
+      } else {
+        const alternatives = queryModeller
+          .getAlternativeOperations(def.alternativesKey!)
+          .map((alt) => ({ label: alt.name, value: alt }));
+        setState({ isOpen: true, alternatives });
+      }
+    };
+
+    return (
+      <div className={styles.header}>
+        {!state.isOpen && (
+          <>
+            <div {...dragHandleProps}>{def.name ?? def.id}</div>
+            <FlexItem grow={1} />
+            <div className={`${styles.operationHeaderButtons} operation-header-show-on-hover`}>
+              <Button
+                icon="angle-down"
+                size="sm"
+                onClick={onToggleSwitcher}
+                fill="text"
+                variant="secondary"
+                title="Click to view alternative operations"
+              />
+              <OperationInfoButton def={def} operation={operation} />
+              <Button
+                icon="times"
+                size="sm"
+                onClick={() => onRemove(index)}
+                fill="text"
+                variant="secondary"
+                title="Remove operation"
+              />
+            </div>
+          </>
+        )}
+        {state.isOpen && (
+          <div className={styles.selectWrapper}>
+            <Select
+              autoFocus
+              openMenuOnFocus
+              placeholder="Replace with"
+              options={state.alternatives}
+              isOpen={true}
+              onCloseMenu={onToggleSwitcher}
+              onChange={(value) => {
+                if (value.value) {
+                  // Operation should exist if it is selectable
+                  const newDef = queryModeller.getOperationDef(value.value.id)!;
+
+                  // copy default params, and override with all current params
+                  const newParams = [...newDef.defaultParams];
+                  for (let i = 0; i < Math.min(operation.params.length, newParams.length); i++) {
+                    if (newDef.params[i].type === def.params[i].type) {
+                      newParams[i] = operation.params[i];
+                    }
+                  }
+
+                  const changedOp = { ...operation, params: newParams, id: value.value.id };
+                  onChange(index, def.changeTypeHandler ? def.changeTypeHandler(changedOp, newDef) : changedOp);
+                }
+              }}
+            />
+          </div>
+        )}
+      </div>
+    );
+  }
+);
+
+OperationHeader.displayName = 'OperationHeader';
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    header: css({
+      borderBottom: `1px solid ${theme.colors.border.medium}`,
+      padding: theme.spacing(0.5, 0.5, 0.5, 1),
+      display: 'flex',
+      alignItems: 'center',
+    }),
+    operationHeaderButtons: css({
+      opacity: 1,
+    }),
+    selectWrapper: css({
+      paddingRight: theme.spacing(2),
+    }),
+  };
+};
diff --git a/packages/grafana-prometheus/src/querybuilder/shared/OperationInfoButton.tsx b/packages/grafana-prometheus/src/querybuilder/shared/OperationInfoButton.tsx
new file mode 100644
index 0000000000000..56f125093903f
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/shared/OperationInfoButton.tsx
@@ -0,0 +1,121 @@
+import { css } from '@emotion/css';
+import {
+  autoUpdate,
+  flip,
+  offset,
+  shift,
+  useClick,
+  useDismiss,
+  useFloating,
+  useInteractions,
+} from '@floating-ui/react';
+import React, { useState } from 'react';
+
+import { GrafanaTheme2, renderMarkdown } from '@grafana/data';
+import { FlexItem } from '@grafana/experimental';
+import { Button, Portal, useStyles2 } from '@grafana/ui';
+
+import { QueryBuilderOperation, QueryBuilderOperationDef } from './types';
+
+export interface Props {
+  operation: QueryBuilderOperation;
+  def: QueryBuilderOperationDef;
+}
+
+export const OperationInfoButton = React.memo<Props>(({ def, operation }) => {
+  const styles = useStyles2(getStyles);
+  const [show, setShow] = useState(false);
+
+  // the order of middleware is important!
+  const middleware = [
+    offset(16),
+    flip({
+      fallbackAxisSideDirection: 'end',
+      // see https://floating-ui.com/docs/flip#combining-with-shift
+      crossAxis: false,
+      boundary: document.body,
+    }),
+    shift(),
+  ];
+
+  const { context, refs, floatingStyles } = useFloating({
+    open: show,
+    placement: 'top',
+    onOpenChange: setShow,
+    middleware,
+    whileElementsMounted: autoUpdate,
+  });
+
+  const click = useClick(context);
+  const dismiss = useDismiss(context);
+
+  const { getReferenceProps, getFloatingProps } = useInteractions([dismiss, click]);
+
+  return (
+    <>
+      <Button
+        title="Click to show description"
+        ref={refs.setReference}
+        icon="info-circle"
+        size="sm"
+        variant="secondary"
+        fill="text"
+        {...getReferenceProps()}
+      />
+      {show && (
+        <Portal>
+          <div ref={refs.setFloating} style={floatingStyles} {...getFloatingProps()} className={styles.docBox}>
+            <div className={styles.docBoxHeader}>
+              <span>{def.renderer(operation, def, '<expr>')}</span>
+              <FlexItem grow={1} />
+              <Button
+                icon="times"
+                onClick={() => setShow(false)}
+                fill="text"
+                variant="secondary"
+                title="Remove operation"
+              />
+            </div>
+            <div
+              className={styles.docBoxBody}
+              dangerouslySetInnerHTML={{ __html: getOperationDocs(def, operation) }}
+            ></div>
+          </div>
+        </Portal>
+      )}
+    </>
+  );
+});
+
+OperationInfoButton.displayName = 'OperationDocs';
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    docBox: css({
+      overflow: 'hidden',
+      background: theme.colors.background.primary,
+      border: `1px solid ${theme.colors.border.strong}`,
+      boxShadow: theme.shadows.z3,
+      maxWidth: '600px',
+      padding: theme.spacing(1),
+      borderRadius: theme.shape.radius.default,
+      zIndex: theme.zIndex.tooltip,
+    }),
+    docBoxHeader: css({
+      fontSize: theme.typography.h5.fontSize,
+      fontFamily: theme.typography.fontFamilyMonospace,
+      paddingBottom: theme.spacing(1),
+      display: 'flex',
+      alignItems: 'center',
+    }),
+    docBoxBody: css({
+      // The markdown paragraph has a marginBottom this removes it
+      marginBottom: theme.spacing(-1),
+      color: theme.colors.text.secondary,
+    }),
+  };
+};
+
+function getOperationDocs(def: QueryBuilderOperationDef, op: QueryBuilderOperation): string {
+  return renderMarkdown(def.explainHandler ? def.explainHandler(op, def) : def.documentation ?? 'no docs');
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/shared/OperationList.test.tsx b/packages/grafana-prometheus/src/querybuilder/shared/OperationList.test.tsx
new file mode 100644
index 0000000000000..02d95b87236b3
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/shared/OperationList.test.tsx
@@ -0,0 +1,85 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { DataSourceApi, DataSourceInstanceSettings } from '@grafana/data';
+
+import { PrometheusDatasource } from '../../datasource';
+import PromQlLanguageProvider from '../../language_provider';
+import { EmptyLanguageProviderMock } from '../../language_provider.mock';
+import { PromOptions } from '../../types';
+import { promQueryModeller } from '../PromQueryModeller';
+import { addOperationInQueryBuilder } from '../testUtils';
+import { PromVisualQuery } from '../types';
+
+import { OperationList } from './OperationList';
+
+const defaultQuery: PromVisualQuery = {
+  metric: 'random_metric',
+  labels: [{ label: 'instance', op: '=', value: 'localhost:9090' }],
+  operations: [
+    {
+      id: 'rate',
+      params: ['auto'],
+    },
+    {
+      id: '__sum_by',
+      params: ['instance', 'job'],
+    },
+  ],
+};
+
+describe('OperationList', () => {
+  it('renders operations', async () => {
+    setup();
+    expect(screen.getByText('Rate')).toBeInTheDocument();
+    expect(screen.getByText('Sum by')).toBeInTheDocument();
+  });
+
+  it('removes an operation', async () => {
+    const { onChange } = setup();
+    const removeOperationButtons = screen.getAllByTitle('Remove operation');
+    expect(removeOperationButtons).toHaveLength(2);
+    await userEvent.click(removeOperationButtons[1]);
+    expect(onChange).toBeCalledWith({
+      labels: [{ label: 'instance', op: '=', value: 'localhost:9090' }],
+      metric: 'random_metric',
+      operations: [{ id: 'rate', params: ['auto'] }],
+    });
+  });
+
+  it('adds an operation', async () => {
+    const { onChange } = setup();
+    await addOperationInQueryBuilder('Aggregations', 'Min');
+    expect(onChange).toBeCalledWith({
+      labels: [{ label: 'instance', op: '=', value: 'localhost:9090' }],
+      metric: 'random_metric',
+      operations: [
+        { id: 'rate', params: ['auto'] },
+        { id: '__sum_by', params: ['instance', 'job'] },
+        { id: 'min', params: [] },
+      ],
+    });
+  });
+});
+
+function setup(query: PromVisualQuery = defaultQuery) {
+  const languageProvider = new EmptyLanguageProviderMock() as unknown as PromQlLanguageProvider;
+  const props = {
+    datasource: new PrometheusDatasource(
+      {
+        url: '',
+        jsonData: {},
+        meta: {},
+      } as DataSourceInstanceSettings<PromOptions>,
+      undefined,
+      languageProvider
+    ) as DataSourceApi,
+    onRunQuery: () => {},
+    onChange: jest.fn(),
+    queryModeller: promQueryModeller,
+  };
+
+  render(<OperationList {...props} query={query} />);
+  return props;
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/shared/OperationList.tsx b/packages/grafana-prometheus/src/querybuilder/shared/OperationList.tsx
new file mode 100644
index 0000000000000..6e104e2675fcd
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/shared/OperationList.tsx
@@ -0,0 +1,204 @@
+import { css } from '@emotion/css';
+import React, { useState } from 'react';
+import { DragDropContext, Droppable, DropResult } from 'react-beautiful-dnd';
+import { useMountedState, usePrevious } from 'react-use';
+
+import { DataSourceApi, GrafanaTheme2, TimeRange } from '@grafana/data';
+import { Button, Cascader, CascaderOption, useStyles2, Stack } from '@grafana/ui';
+
+import { OperationEditor } from './OperationEditor';
+import { QueryBuilderOperation, QueryWithOperations, VisualQueryModeller } from './types';
+
+export interface Props<T extends QueryWithOperations> {
+  query: T;
+  datasource: DataSourceApi;
+  onChange: (query: T) => void;
+  onRunQuery: () => void;
+  queryModeller: VisualQueryModeller;
+  explainMode?: boolean;
+  highlightedOp?: QueryBuilderOperation;
+  timeRange?: TimeRange;
+}
+
+export function OperationList<T extends QueryWithOperations>({
+  query,
+  datasource,
+  queryModeller,
+  onChange,
+  onRunQuery,
+  highlightedOp,
+  timeRange,
+}: Props<T>) {
+  const styles = useStyles2(getStyles);
+  const { operations } = query;
+
+  const opsToHighlight = useOperationsHighlight(operations);
+
+  const [cascaderOpen, setCascaderOpen] = useState(false);
+
+  const onOperationChange = (index: number, update: QueryBuilderOperation) => {
+    const updatedList = [...operations];
+    updatedList.splice(index, 1, update);
+    onChange({ ...query, operations: updatedList });
+  };
+
+  const onRemove = (index: number) => {
+    const updatedList = [...operations.slice(0, index), ...operations.slice(index + 1)];
+    onChange({ ...query, operations: updatedList });
+  };
+
+  const addOptions: CascaderOption[] = queryModeller.getCategories().map((category) => {
+    return {
+      value: category,
+      label: category,
+      items: queryModeller.getOperationsForCategory(category).map((operation) => ({
+        value: operation.id,
+        label: operation.name,
+        isLeaf: true,
+      })),
+    };
+  });
+
+  const onAddOperation = (value: string) => {
+    const operationDef = queryModeller.getOperationDef(value);
+    if (!operationDef) {
+      return;
+    }
+    onChange(operationDef.addOperationHandler(operationDef, query, queryModeller));
+    setCascaderOpen(false);
+  };
+
+  const onDragEnd = (result: DropResult) => {
+    if (!result.destination) {
+      return;
+    }
+
+    const updatedList = [...operations];
+    const element = updatedList[result.source.index];
+    updatedList.splice(result.source.index, 1);
+    updatedList.splice(result.destination.index, 0, element);
+    onChange({ ...query, operations: updatedList });
+  };
+
+  const onCascaderBlur = () => {
+    setCascaderOpen(false);
+  };
+
+  return (
+    <Stack gap={1} direction="column">
+      <Stack gap={1}>
+        {operations.length > 0 && (
+          <DragDropContext onDragEnd={onDragEnd}>
+            <Droppable droppableId="sortable-field-mappings" direction="horizontal">
+              {(provided) => (
+                <div className={styles.operationList} ref={provided.innerRef} {...provided.droppableProps}>
+                  {operations.map((op, index) => {
+                    return (
+                      <OperationEditor
+                        key={op.id + JSON.stringify(op.params) + index}
+                        queryModeller={queryModeller}
+                        index={index}
+                        operation={op}
+                        query={query}
+                        datasource={datasource}
+                        onChange={onOperationChange}
+                        onRemove={onRemove}
+                        onRunQuery={onRunQuery}
+                        flash={opsToHighlight[index]}
+                        highlight={highlightedOp === op}
+                        timeRange={timeRange}
+                      />
+                    );
+                  })}
+                  {provided.placeholder}
+                </div>
+              )}
+            </Droppable>
+          </DragDropContext>
+        )}
+        <div className={styles.addButton}>
+          {cascaderOpen ? (
+            <Cascader
+              options={addOptions}
+              onSelect={onAddOperation}
+              onBlur={onCascaderBlur}
+              autoFocus={true}
+              alwaysOpen={true}
+              hideActiveLevelLabel={true}
+              placeholder={'Search'}
+            />
+          ) : (
+            <Button icon={'plus'} variant={'secondary'} onClick={() => setCascaderOpen(true)} title={'Add operation'}>
+              Operations
+            </Button>
+          )}
+        </div>
+      </Stack>
+    </Stack>
+  );
+}
+
+/**
+ * Returns indexes of operations that should be highlighted. We check the diff of operations added but at the same time
+ * we want to highlight operations only after the initial render, so we check for mounted state and calculate the diff
+ * only after.
+ * @param operations
+ */
+function useOperationsHighlight(operations: QueryBuilderOperation[]) {
+  const isMounted = useMountedState();
+  const prevOperations = usePrevious(operations);
+
+  if (!isMounted()) {
+    return operations.map(() => false);
+  }
+
+  if (!prevOperations) {
+    return operations.map(() => true);
+  }
+
+  let newOps: boolean[] = [];
+
+  if (prevOperations.length - 1 === operations.length && operations.every((op) => prevOperations.includes(op))) {
+    // In case we remove one op and does not change any ops then don't highlight anything.
+    return operations.map(() => false);
+  }
+  if (prevOperations.length + 1 === operations.length && prevOperations.every((op) => operations.includes(op))) {
+    // If we add a single op just find it and highlight just that.
+    const newOp = operations.find((op) => !prevOperations.includes(op));
+    newOps = operations.map((op) => {
+      return op === newOp;
+    });
+  } else {
+    // Default diff of all ops.
+    newOps = operations.map((op, index) => {
+      return !isSameOp(op.id, prevOperations[index]?.id);
+    });
+  }
+  return newOps;
+}
+
+function isSameOp(op1?: string, op2?: string) {
+  return op1 === op2 || `__${op1}_by` === op2 || op1 === `__${op2}_by`;
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    heading: css({
+      label: 'heading',
+      fontSize: 12,
+      fontWeight: theme.typography.fontWeightMedium,
+      marginBottom: 0,
+    }),
+    operationList: css({
+      label: 'operationList',
+      display: 'flex',
+      flexWrap: 'wrap',
+      gap: theme.spacing(2),
+    }),
+    addButton: css({
+      label: 'addButton',
+      width: 126,
+      paddingBottom: theme.spacing(1),
+    }),
+  };
+};
diff --git a/packages/grafana-prometheus/src/querybuilder/shared/OperationListExplained.tsx b/packages/grafana-prometheus/src/querybuilder/shared/OperationListExplained.tsx
new file mode 100644
index 0000000000000..bfc7fba380854
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/shared/OperationListExplained.tsx
@@ -0,0 +1,55 @@
+import { Grammar } from 'prismjs';
+import React from 'react';
+
+import { OperationExplainedBox } from './OperationExplainedBox';
+import { RawQuery } from './RawQuery';
+import { QueryBuilderOperation, QueryWithOperations, VisualQueryModeller } from './types';
+
+export interface Props<T extends QueryWithOperations> {
+  query: T;
+  queryModeller: VisualQueryModeller;
+  explainMode?: boolean;
+  stepNumber: number;
+  lang: {
+    grammar: Grammar;
+    name: string;
+  };
+  onMouseEnter?: (op: QueryBuilderOperation, index: number) => void;
+  onMouseLeave?: (op: QueryBuilderOperation, index: number) => void;
+}
+
+export function OperationListExplained<T extends QueryWithOperations>({
+  query,
+  queryModeller,
+  stepNumber,
+  lang,
+  onMouseEnter,
+  onMouseLeave,
+}: Props<T>) {
+  return (
+    <>
+      {query.operations.map((op, index) => {
+        const def = queryModeller.getOperationDef(op.id);
+        if (!def) {
+          return `Operation ${op.id} not found`;
+        }
+        const title = def.renderer(op, def, '<expr>');
+        const body = def.explainHandler ? def.explainHandler(op, def) : def.documentation ?? 'no docs';
+
+        return (
+          <div
+            key={index}
+            onMouseEnter={() => onMouseEnter?.(op, index)}
+            onMouseLeave={() => onMouseLeave?.(op, index)}
+          >
+            <OperationExplainedBox
+              stepNumber={index + stepNumber}
+              title={<RawQuery query={title} lang={lang} />}
+              markdown={body}
+            />
+          </div>
+        );
+      })}
+    </>
+  );
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/shared/OperationParamEditor.tsx b/packages/grafana-prometheus/src/querybuilder/shared/OperationParamEditor.tsx
new file mode 100644
index 0000000000000..e9bbbff644b51
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/shared/OperationParamEditor.tsx
@@ -0,0 +1,130 @@
+import { css } from '@emotion/css';
+import React, { ComponentType } from 'react';
+
+import { GrafanaTheme2, SelectableValue, toOption } from '@grafana/data';
+import { AutoSizeInput, Button, Checkbox, Select, useStyles2, Stack } from '@grafana/ui';
+
+import { getOperationParamId } from '../operationUtils';
+
+import { QueryBuilderOperationParamDef, QueryBuilderOperationParamEditorProps } from './types';
+
+export function getOperationParamEditor(
+  paramDef: QueryBuilderOperationParamDef
+): ComponentType<QueryBuilderOperationParamEditorProps> {
+  if (paramDef.editor) {
+    return paramDef.editor;
+  }
+
+  if (paramDef.options) {
+    return SelectInputParamEditor;
+  }
+
+  switch (paramDef.type) {
+    case 'boolean':
+      return BoolInputParamEditor;
+    case 'number':
+    case 'string':
+    default:
+      return SimpleInputParamEditor;
+  }
+}
+
+function SimpleInputParamEditor(props: QueryBuilderOperationParamEditorProps) {
+  return (
+    <AutoSizeInput
+      id={getOperationParamId(props.operationId, props.index)}
+      defaultValue={props.value?.toString()}
+      minWidth={props.paramDef.minWidth}
+      placeholder={props.paramDef.placeholder}
+      title={props.paramDef.description}
+      maxWidth={(props.paramDef.minWidth || 20) * 3}
+      onCommitChange={(evt) => {
+        props.onChange(props.index, evt.currentTarget.value);
+        if (props.paramDef.runQueryOnEnter && evt.type === 'keydown') {
+          props.onRunQuery();
+        }
+      }}
+    />
+  );
+}
+
+function BoolInputParamEditor(props: QueryBuilderOperationParamEditorProps) {
+  return (
+    <Checkbox
+      id={getOperationParamId(props.operationId, props.index)}
+      value={Boolean(props.value)}
+      onChange={(evt) => props.onChange(props.index, evt.currentTarget.checked)}
+    />
+  );
+}
+
+function SelectInputParamEditor({
+  paramDef,
+  value,
+  index,
+  operationId,
+  onChange,
+}: QueryBuilderOperationParamEditorProps) {
+  const styles = useStyles2(getStyles);
+  let selectOptions = paramDef.options as SelectableValue[];
+
+  if (!selectOptions[0]?.label) {
+    selectOptions = paramDef.options!.map((option) => ({
+      label: option.toString(),
+      value: option,
+    }));
+  }
+
+  let valueOption = selectOptions.find((x) => x.value === value) ?? toOption(value as string);
+
+  // If we have optional options param and don't have value, we want to render button with which we add optional options.
+  // This makes it easier to understand what needs to be selected and what is optional.
+  if (!value && paramDef.optional) {
+    return (
+      <div className={styles.optionalParam}>
+        <Button
+          size="sm"
+          variant="secondary"
+          title={`Add ${paramDef.name}`}
+          icon="plus"
+          onClick={() => onChange(index, selectOptions[0].value)}
+        >
+          {paramDef.name}
+        </Button>
+      </div>
+    );
+  }
+
+  return (
+    <Stack gap={0.5} direction="row" alignItems="center">
+      <Select
+        id={getOperationParamId(operationId, index)}
+        value={valueOption}
+        options={selectOptions}
+        placeholder={paramDef.placeholder}
+        allowCustomValue={true}
+        onChange={(value) => onChange(index, value.value!)}
+        width={paramDef.minWidth || 'auto'}
+      />
+      {paramDef.optional && (
+        <Button
+          data-testid={`operations.${index}.remove-param`}
+          size="sm"
+          fill="text"
+          icon="times"
+          variant="secondary"
+          title={`Remove ${paramDef.name}`}
+          onClick={() => onChange(index, '')}
+        />
+      )}
+    </Stack>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    optionalParam: css({
+      marginTop: theme.spacing(1),
+    }),
+  };
+};
diff --git a/packages/grafana-prometheus/src/querybuilder/shared/OperationsEditorRow.tsx b/packages/grafana-prometheus/src/querybuilder/shared/OperationsEditorRow.tsx
new file mode 100644
index 0000000000000..00ebc654f068e
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/shared/OperationsEditorRow.tsx
@@ -0,0 +1,29 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { useStyles2, Stack } from '@grafana/ui';
+
+interface Props {
+  children: React.ReactNode;
+}
+
+export function OperationsEditorRow({ children }: Props) {
+  const styles = useStyles2(getStyles);
+
+  return (
+    <div className={styles.root}>
+      <Stack gap={1}>{children}</Stack>
+    </div>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    root: css({
+      padding: theme.spacing(1, 1, 0, 1),
+      backgroundColor: theme.colors.background.secondary,
+      borderRadius: theme.shape.radius.default,
+    }),
+  };
+};
diff --git a/packages/grafana-prometheus/src/querybuilder/shared/QueryBuilderHints.tsx b/packages/grafana-prometheus/src/querybuilder/shared/QueryBuilderHints.tsx
new file mode 100644
index 0000000000000..91389eb495bd9
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/shared/QueryBuilderHints.tsx
@@ -0,0 +1,87 @@
+import { css } from '@emotion/css';
+import React, { useEffect, useState } from 'react';
+
+import { GrafanaTheme2, PanelData, QueryHint } from '@grafana/data';
+import { reportInteraction } from '@grafana/runtime';
+import { Button, Tooltip, useStyles2 } from '@grafana/ui';
+
+import { PrometheusDatasource } from '../../datasource';
+
+import { LokiAndPromQueryModellerBase, PromLokiVisualQuery } from './LokiAndPromQueryModellerBase';
+
+export interface Props<T extends PromLokiVisualQuery> {
+  query: T;
+  datasource: PrometheusDatasource;
+  queryModeller: LokiAndPromQueryModellerBase;
+  buildVisualQueryFromString: (expr: string) => { query: T };
+  onChange: (update: T) => void;
+  data?: PanelData;
+}
+
+export const QueryBuilderHints = <T extends PromLokiVisualQuery>({
+  datasource,
+  query: visualQuery,
+  onChange,
+  data,
+  queryModeller,
+  buildVisualQueryFromString,
+}: Props<T>) => {
+  const [hints, setHints] = useState<QueryHint[]>([]);
+  const styles = useStyles2(getStyles);
+
+  useEffect(() => {
+    const query = { expr: queryModeller.renderQuery(visualQuery), refId: '' };
+    // For now show only actionable hints
+    const hints = datasource.getQueryHints(query, data?.series || []).filter((hint) => hint.fix?.action);
+    setHints(hints);
+  }, [datasource, visualQuery, data, queryModeller]);
+
+  return (
+    <>
+      {hints.length > 0 && (
+        <div className={styles.container}>
+          {hints.map((hint) => {
+            return (
+              <Tooltip content={`${hint.label} ${hint.fix?.label}`} key={hint.type}>
+                <Button
+                  onClick={() => {
+                    reportInteraction('grafana_query_builder_hints_clicked', {
+                      hint: hint.type,
+                      datasourceType: datasource.type,
+                    });
+
+                    if (hint?.fix?.action) {
+                      const query = { expr: queryModeller.renderQuery(visualQuery), refId: '' };
+                      const newQuery = datasource.modifyQuery(query, hint.fix.action);
+                      const newVisualQuery = buildVisualQueryFromString(newQuery.expr);
+                      return onChange(newVisualQuery.query);
+                    }
+                  }}
+                  fill="outline"
+                  size="sm"
+                  className={styles.hint}
+                >
+                  hint: {hint.fix?.title || hint.fix?.action?.type.toLowerCase().replace('_', ' ')}
+                </Button>
+              </Tooltip>
+            );
+          })}
+        </div>
+      )}
+    </>
+  );
+};
+
+QueryBuilderHints.displayName = 'QueryBuilderHints';
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    container: css`
+      display: flex;
+      align-items: start;
+    `,
+    hint: css`
+      margin-right: ${theme.spacing(1)};
+    `,
+  };
+};
diff --git a/packages/grafana-prometheus/src/querybuilder/shared/QueryEditorModeToggle.tsx b/packages/grafana-prometheus/src/querybuilder/shared/QueryEditorModeToggle.tsx
new file mode 100644
index 0000000000000..b47d89b6301e6
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/shared/QueryEditorModeToggle.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+
+import { RadioButtonGroup } from '@grafana/ui';
+
+import { QueryEditorMode } from './types';
+
+export interface Props {
+  mode: QueryEditorMode;
+  onChange: (mode: QueryEditorMode) => void;
+}
+
+const editorModes = [
+  { label: 'Builder', value: QueryEditorMode.Builder },
+  { label: 'Code', value: QueryEditorMode.Code },
+];
+
+export function QueryEditorModeToggle({ mode, onChange }: Props) {
+  return (
+    <div data-testid={'QueryEditorModeToggle'}>
+      <RadioButtonGroup options={editorModes} size="sm" value={mode} onChange={onChange} />
+    </div>
+  );
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/shared/QueryHeaderSwitch.tsx b/packages/grafana-prometheus/src/querybuilder/shared/QueryHeaderSwitch.tsx
new file mode 100644
index 0000000000000..b7088bb3f8b7d
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/shared/QueryHeaderSwitch.tsx
@@ -0,0 +1,39 @@
+import { css } from '@emotion/css';
+import { uniqueId } from 'lodash';
+import React, { HTMLProps, useRef } from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Switch, useStyles2, Stack } from '@grafana/ui';
+
+export interface Props extends Omit<HTMLProps<HTMLInputElement>, 'value' | 'ref'> {
+  value?: boolean;
+  label: string;
+}
+
+export function QueryHeaderSwitch({ label, ...inputProps }: Props) {
+  const dashedLabel = label.replace(' ', '-');
+  const switchIdRef = useRef(uniqueId(`switch-${dashedLabel}`));
+  const styles = useStyles2(getStyles);
+
+  return (
+    <Stack gap={1}>
+      <label htmlFor={switchIdRef.current} className={styles.switchLabel}>
+        {label}
+      </label>
+      <Switch {...inputProps} id={switchIdRef.current} />
+    </Stack>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    switchLabel: css({
+      color: theme.colors.text.secondary,
+      cursor: 'pointer',
+      fontSize: theme.typography.bodySmall.fontSize,
+      '&:hover': {
+        color: theme.colors.text.primary,
+      },
+    }),
+  };
+};
diff --git a/packages/grafana-prometheus/src/querybuilder/shared/QueryOptionGroup.tsx b/packages/grafana-prometheus/src/querybuilder/shared/QueryOptionGroup.tsx
new file mode 100644
index 0000000000000..b0c6951b0928f
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/shared/QueryOptionGroup.tsx
@@ -0,0 +1,85 @@
+import { css } from '@emotion/css';
+import React from 'react';
+import { useToggle } from 'react-use';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Collapse, useStyles2, Stack } from '@grafana/ui';
+
+export interface Props {
+  title: string;
+  collapsedInfo: string[];
+  children: React.ReactNode;
+}
+
+export function QueryOptionGroup({ title, children, collapsedInfo }: Props) {
+  const [isOpen, toggleOpen] = useToggle(false);
+  const styles = useStyles2(getStyles);
+
+  return (
+    <div className={styles.wrapper}>
+      <Collapse
+        className={styles.collapse}
+        collapsible
+        isOpen={isOpen}
+        onToggle={toggleOpen}
+        label={
+          <Stack gap={0}>
+            <h6 className={styles.title}>{title}</h6>
+            {!isOpen && (
+              <div className={styles.description}>
+                {collapsedInfo.map((x, i) => (
+                  <span key={i}>{x}</span>
+                ))}
+              </div>
+            )}
+          </Stack>
+        }
+      >
+        <div className={styles.body}>{children}</div>
+      </Collapse>
+    </div>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    collapse: css({
+      backgroundColor: 'unset',
+      border: 'unset',
+      marginBottom: 0,
+
+      ['> button']: {
+        padding: theme.spacing(0, 1),
+      },
+    }),
+    wrapper: css({
+      width: '100%',
+      display: 'flex',
+      justifyContent: 'space-between',
+      alignItems: 'baseline',
+    }),
+    title: css({
+      flexGrow: 1,
+      overflow: 'hidden',
+      fontSize: theme.typography.bodySmall.fontSize,
+      fontWeight: theme.typography.fontWeightMedium,
+      margin: 0,
+    }),
+    description: css({
+      color: theme.colors.text.secondary,
+      fontSize: theme.typography.bodySmall.fontSize,
+      fontWeight: theme.typography.bodySmall.fontWeight,
+      paddingLeft: theme.spacing(2),
+      gap: theme.spacing(2),
+      display: 'flex',
+    }),
+    body: css({
+      display: 'flex',
+      gap: theme.spacing(2),
+      flexWrap: 'wrap',
+    }),
+    tooltip: css({
+      marginRight: theme.spacing(0.25),
+    }),
+  };
+};
diff --git a/packages/grafana-prometheus/src/querybuilder/shared/RawQuery.tsx b/packages/grafana-prometheus/src/querybuilder/shared/RawQuery.tsx
new file mode 100644
index 0000000000000..b2cc3d8a37272
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/shared/RawQuery.tsx
@@ -0,0 +1,38 @@
+import { css, cx } from '@emotion/css';
+import Prism, { Grammar } from 'prismjs';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { useTheme2 } from '@grafana/ui';
+
+export interface Props {
+  query: string;
+  lang: {
+    grammar: Grammar;
+    name: string;
+  };
+  className?: string;
+}
+
+export function RawQuery({ query, lang, className }: Props) {
+  const theme = useTheme2();
+  const styles = getStyles(theme);
+  const highlighted = Prism.highlight(query, lang.grammar, lang.name);
+
+  return (
+    <div
+      className={cx(styles.editorField, 'prism-syntax-highlight', className)}
+      aria-label="selector"
+      dangerouslySetInnerHTML={{ __html: highlighted }}
+    />
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    editorField: css({
+      fontFamily: theme.typography.fontFamilyMonospace,
+      fontSize: theme.typography.bodySmall.fontSize,
+    }),
+  };
+};
diff --git a/packages/grafana-prometheus/src/querybuilder/shared/types.ts b/packages/grafana-prometheus/src/querybuilder/shared/types.ts
new file mode 100644
index 0000000000000..73d46de0a7400
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/shared/types.ts
@@ -0,0 +1,112 @@
+/**
+ * Shared types that can be reused by Loki and other data sources
+ */
+import { ComponentType } from 'react';
+
+import { DataSourceApi, RegistryItem, SelectableValue, TimeRange } from '@grafana/data';
+
+export interface QueryBuilderLabelFilter {
+  label: string;
+  op: string;
+  value: string;
+}
+
+export interface QueryBuilderOperation {
+  id: string;
+  params: QueryBuilderOperationParamValue[];
+}
+
+export interface QueryWithOperations {
+  operations: QueryBuilderOperation[];
+}
+
+export interface QueryBuilderOperationDef<T = any> extends RegistryItem {
+  documentation?: string;
+  params: QueryBuilderOperationParamDef[];
+  defaultParams: QueryBuilderOperationParamValue[];
+  category: string;
+  hideFromList?: boolean;
+  alternativesKey?: string;
+  /** Can be used to control operation placement when adding a new operations, lower are placed first */
+  orderRank?: number;
+  renderer: QueryBuilderOperationRenderer;
+  addOperationHandler: QueryBuilderAddOperationHandler<T>;
+  paramChangedHandler?: QueryBuilderOnParamChangedHandler;
+  explainHandler?: QueryBuilderExplainOperationHandler;
+  changeTypeHandler?: (op: QueryBuilderOperation, newDef: QueryBuilderOperationDef<T>) => QueryBuilderOperation;
+}
+
+export type QueryBuilderAddOperationHandler<T> = (
+  def: QueryBuilderOperationDef,
+  query: T,
+  modeller: VisualQueryModeller
+) => T;
+
+export type QueryBuilderExplainOperationHandler = (op: QueryBuilderOperation, def?: QueryBuilderOperationDef) => string;
+
+export type QueryBuilderOnParamChangedHandler = (
+  index: number,
+  operation: QueryBuilderOperation,
+  operationDef: QueryBuilderOperationDef
+) => QueryBuilderOperation;
+
+export type QueryBuilderOperationRenderer = (
+  model: QueryBuilderOperation,
+  def: QueryBuilderOperationDef,
+  innerExpr: string
+) => string;
+
+export type QueryBuilderOperationParamValue = string | number | boolean;
+
+export interface QueryBuilderOperationParamDef {
+  name: string;
+  type: 'string' | 'number' | 'boolean';
+  options?: string[] | number[] | Array<SelectableValue<string>>;
+  hideName?: boolean;
+  restParam?: boolean;
+  optional?: boolean;
+  placeholder?: string;
+  description?: string;
+  minWidth?: number;
+  editor?: ComponentType<QueryBuilderOperationParamEditorProps>;
+  runQueryOnEnter?: boolean;
+}
+
+export interface QueryBuilderOperationEditorProps {
+  operation: QueryBuilderOperation;
+  index: number;
+  query: any;
+  datasource: DataSourceApi;
+  queryModeller: VisualQueryModeller;
+  onChange: (index: number, update: QueryBuilderOperation) => void;
+  onRemove: (index: number) => void;
+}
+
+export interface QueryBuilderOperationParamEditorProps {
+  value?: QueryBuilderOperationParamValue;
+  paramDef: QueryBuilderOperationParamDef;
+  /** Parameter index */
+  index: number;
+  operation: QueryBuilderOperation;
+  operationId: string;
+  query: any;
+  datasource: DataSourceApi;
+  timeRange?: TimeRange;
+  onChange: (index: number, value: QueryBuilderOperationParamValue) => void;
+  onRunQuery: () => void;
+}
+
+export enum QueryEditorMode {
+  Code = 'code',
+  Builder = 'builder',
+}
+
+export interface VisualQueryModeller {
+  getOperationsForCategory(category: string): QueryBuilderOperationDef[];
+
+  getAlternativeOperations(key: string): QueryBuilderOperationDef[];
+
+  getCategories(): string[];
+
+  getOperationDef(id: string): QueryBuilderOperationDef | undefined;
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/state.test.ts b/packages/grafana-prometheus/src/querybuilder/state.test.ts
new file mode 100644
index 0000000000000..a96f876ada11b
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/state.test.ts
@@ -0,0 +1,64 @@
+import { CoreApp } from '@grafana/data';
+
+import { PromQuery } from '../types';
+
+import { QueryEditorMode } from './shared/types';
+import { changeEditorMode, getQueryWithDefaults } from './state';
+
+describe('getQueryWithDefaults(', () => {
+  it('should set defaults', () => {
+    expect(getQueryWithDefaults({ expr: '', refId: 'A' } as PromQuery, CoreApp.Dashboard)).toEqual({
+      editorMode: 'builder',
+      expr: '',
+      legendFormat: '__auto',
+      range: true,
+      refId: 'A',
+    });
+  });
+
+  it('should set both range and instant to true when in Explore', () => {
+    expect(getQueryWithDefaults({ expr: '', refId: 'A' } as PromQuery, CoreApp.Explore)).toEqual({
+      editorMode: 'builder',
+      expr: '',
+      legendFormat: '__auto',
+      range: true,
+      instant: true,
+      refId: 'A',
+    });
+  });
+
+  it('should not set both instant and range for Prometheus queries in Alert Creation', () => {
+    expect(
+      getQueryWithDefaults({ expr: '', refId: 'A', range: true, instant: true } as PromQuery, CoreApp.UnifiedAlerting)
+    ).toEqual({
+      editorMode: 'builder',
+      expr: '',
+      legendFormat: '__auto',
+      range: true,
+      instant: false,
+      refId: 'A',
+    });
+  });
+
+  it('changing editor mode with blank query should change default', () => {
+    changeEditorMode({ refId: 'A', expr: '' }, QueryEditorMode.Code, (query) => {
+      expect(query.editorMode).toBe(QueryEditorMode.Code);
+    });
+
+    expect(getQueryWithDefaults({ expr: '', refId: 'A' } as PromQuery, CoreApp.Dashboard).editorMode).toEqual(
+      QueryEditorMode.Code
+    );
+  });
+
+  it('should return default editor mode when it is provided', () => {
+    expect(
+      getQueryWithDefaults({ expr: '', refId: 'A' } as PromQuery, CoreApp.Dashboard, QueryEditorMode.Code)
+    ).toEqual({
+      editorMode: 'code',
+      expr: '',
+      legendFormat: '__auto',
+      range: true,
+      refId: 'A',
+    });
+  });
+});
diff --git a/packages/grafana-prometheus/src/querybuilder/state.ts b/packages/grafana-prometheus/src/querybuilder/state.ts
new file mode 100644
index 0000000000000..06ef89c33fc36
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/state.ts
@@ -0,0 +1,72 @@
+import { CoreApp } from '@grafana/data';
+
+import store from '../gcopypaste/app/core/store';
+import { LegendFormatMode, PromQuery } from '../types';
+
+import { QueryEditorMode } from './shared/types';
+
+const queryEditorModeDefaultLocalStorageKey = 'PrometheusQueryEditorModeDefault';
+
+export function changeEditorMode(query: PromQuery, editorMode: QueryEditorMode, onChange: (query: PromQuery) => void) {
+  // If empty query store new mode as default
+  if (query.expr === '') {
+    store.set(queryEditorModeDefaultLocalStorageKey, editorMode);
+  }
+
+  onChange({ ...query, editorMode });
+}
+
+function getDefaultEditorMode(expr: string, defaultEditor: QueryEditorMode = QueryEditorMode.Builder): QueryEditorMode {
+  // If we already have an expression default to code view
+  if (expr != null && expr !== '') {
+    return QueryEditorMode.Code;
+  }
+
+  const value: QueryEditorMode = store.get(queryEditorModeDefaultLocalStorageKey);
+  switch (value) {
+    case QueryEditorMode.Builder:
+    case QueryEditorMode.Code:
+      return value;
+    default:
+      return defaultEditor;
+  }
+}
+
+/**
+ * Returns query with defaults, and boolean true/false depending on change was required
+ */
+export function getQueryWithDefaults(
+  query: PromQuery & { expr?: string },
+  app: CoreApp | undefined,
+  defaultEditor?: QueryEditorMode
+): PromQuery {
+  let result = query;
+
+  if (!query.editorMode) {
+    result = { ...query, editorMode: getDefaultEditorMode(query.expr, defaultEditor) };
+  }
+
+  // default query expr is now empty string, set in getDefaultQuery
+  // While expr is required in the types, it is not always defined at runtime, so we need to check for undefined and default to an empty string to prevent runtime errors
+  if (!query.expr) {
+    result = { ...result, expr: '', legendFormat: LegendFormatMode.Auto };
+  }
+
+  if (query.range == null && query.instant == null) {
+    // Default to range query
+    result = { ...result, range: true };
+
+    // In explore we default to both instant & range
+    if (app === CoreApp.Explore) {
+      result.instant = true;
+    }
+  }
+
+  // Unified Alerting does not support "both" for query type – fall back to "range".
+  const isBothInstantAndRange = query.instant && query.range;
+  if (app === CoreApp.UnifiedAlerting && isBothInstantAndRange) {
+    result = { ...result, instant: false, range: true };
+  }
+
+  return result;
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/testUtils.ts b/packages/grafana-prometheus/src/querybuilder/testUtils.ts
new file mode 100644
index 0000000000000..818d05756b473
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/testUtils.ts
@@ -0,0 +1,27 @@
+import { getAllByRole, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+
+export function getLabelSelects(index = 0) {
+  const labels = screen.getByText(/Label filters/);
+  const selects = getAllByRole(labels.parentElement!.parentElement!.parentElement!, 'combobox');
+  return {
+    name: selects[3 * index],
+    value: selects[3 * index + 2],
+  };
+}
+
+export async function addOperationInQueryBuilder(section: string, op: string) {
+  const addOperationButton = screen.getByTitle('Add operation');
+  expect(addOperationButton).toBeInTheDocument();
+  await userEvent.click(addOperationButton);
+  const sectionItem = await screen.findByTitle(section);
+  expect(sectionItem).toBeInTheDocument();
+  // Weirdly the await userEvent.click doesn't work here, it reports the item has pointer-events: none. Don't see that
+  // anywhere when debugging so not sure what style is it picking up.
+  await userEvent.click(sectionItem.children[0], { pointerEventsCheck: 0 });
+  const opItem = screen.getByTitle(op);
+  expect(opItem).toBeInTheDocument();
+  // Weirdly the await userEvent.click doesn't work here, it reports the item has pointer-events: none. Don't see that
+  // anywhere when debugging so not sure what style is it picking up.
+  await userEvent.click(opItem, { pointerEventsCheck: 0 });
+}
diff --git a/packages/grafana-prometheus/src/querybuilder/types.ts b/packages/grafana-prometheus/src/querybuilder/types.ts
new file mode 100644
index 0000000000000..24750f21a96d6
--- /dev/null
+++ b/packages/grafana-prometheus/src/querybuilder/types.ts
@@ -0,0 +1,139 @@
+import { VisualQueryBinary } from './shared/LokiAndPromQueryModellerBase';
+import { QueryBuilderLabelFilter, QueryBuilderOperation } from './shared/types';
+
+/**
+ * Visual query model
+ */
+export interface PromVisualQuery {
+  metric: string;
+  labels: QueryBuilderLabelFilter[];
+  operations: QueryBuilderOperation[];
+  binaryQueries?: PromVisualQueryBinary[];
+  // metrics explorer additional settings
+  useBackend?: boolean;
+  disableTextWrap?: boolean;
+  includeNullMetadata?: boolean;
+  fullMetaSearch?: boolean;
+}
+
+export type PromVisualQueryBinary = VisualQueryBinary<PromVisualQuery>;
+
+export enum PromVisualQueryOperationCategory {
+  Aggregations = 'Aggregations',
+  RangeFunctions = 'Range functions',
+  Functions = 'Functions',
+  BinaryOps = 'Binary operations',
+  Trigonometric = 'Trigonometric',
+  Time = 'Time Functions',
+}
+
+export enum PromOperationId {
+  Abs = 'abs',
+  Absent = 'absent',
+  AbsentOverTime = 'absent_over_time',
+  Acos = 'acos',
+  Acosh = 'acosh',
+  Asin = 'asin',
+  Asinh = 'asinh',
+  Atan = 'atan',
+  Atanh = 'atanh',
+  Avg = 'avg',
+  AvgOverTime = 'avg_over_time',
+  BottomK = 'bottomk',
+  Ceil = 'ceil',
+  Changes = 'changes',
+  Clamp = 'clamp',
+  ClampMax = 'clamp_max',
+  ClampMin = 'clamp_min',
+  Cos = 'cos',
+  Cosh = 'cosh',
+  Count = 'count',
+  CountOverTime = 'count_over_time',
+  CountScalar = 'count_scalar',
+  CountValues = 'count_values',
+  DayOfMonth = 'day_of_month',
+  DayOfWeek = 'day_of_week',
+  DayOfYear = 'day_of_year',
+  DaysInMonth = 'days_in_month',
+  Deg = 'deg',
+  Delta = 'delta',
+  Deriv = 'deriv',
+  DropCommonLabels = 'drop_common_labels',
+  Exp = 'exp',
+  Floor = 'floor',
+  Group = 'group',
+  HistogramQuantile = 'histogram_quantile',
+  HoltWinters = 'holt_winters',
+  Hour = 'hour',
+  Idelta = 'idelta',
+  Increase = 'increase',
+  Irate = 'irate',
+  LabelJoin = 'label_join',
+  LabelReplace = 'label_replace',
+  Last = 'last',
+  LastOverTime = 'last_over_time',
+  Ln = 'ln',
+  Log10 = 'log10',
+  Log2 = 'log2',
+  Max = 'max',
+  MaxOverTime = 'max_over_time',
+  Min = 'min',
+  MinOverTime = 'min_over_time',
+  Minute = 'minute',
+  Month = 'month',
+  Pi = 'pi',
+  PredictLinear = 'predict_linear',
+  Present = 'present',
+  PresentOverTime = 'present_over_time',
+  Quantile = 'quantile',
+  QuantileOverTime = 'quantile_over_time',
+  Rad = 'rad',
+  Rate = 'rate',
+  Resets = 'resets',
+  Round = 'round',
+  Scalar = 'scalar',
+  Sgn = 'sgn',
+  Sin = 'sin',
+  Sinh = 'sinh',
+  Sort = 'sort',
+  SortDesc = 'sort_desc',
+  Sqrt = 'sqrt',
+  Stddev = 'stddev',
+  StddevOverTime = 'stddev_over_time',
+  Sum = 'sum',
+  SumOverTime = 'sum_over_time',
+  Tan = 'tan',
+  Tanh = 'tanh',
+  Time = 'time',
+  Timestamp = 'timestamp',
+  TopK = 'topk',
+  Vector = 'vector',
+  Year = 'year',
+  // Binary ops
+  Addition = '__addition',
+  Subtraction = '__subtraction',
+  MultiplyBy = '__multiply_by',
+  DivideBy = '__divide_by',
+  Modulo = '__modulo',
+  Exponent = '__exponent',
+  NestedQuery = '__nested_query',
+  EqualTo = '__equal_to',
+  NotEqualTo = '__not_equal_to',
+  GreaterThan = '__greater_than',
+  LessThan = '__less_than',
+  GreaterOrEqual = '__greater_or_equal',
+  LessOrEqual = '__less_or_equal',
+}
+
+export enum PromQueryPatternType {
+  Rate = 'rate',
+  Histogram = 'histogram',
+  Binary = 'binary',
+}
+
+export interface PromQueryPattern {
+  name: string;
+  operations: QueryBuilderOperation[];
+  type: PromQueryPatternType;
+  binaryQueries?: PromVisualQueryBinary[];
+}
diff --git a/packages/grafana-prometheus/src/querycache/QueryCache.test.ts b/packages/grafana-prometheus/src/querycache/QueryCache.test.ts
new file mode 100644
index 0000000000000..d0f385a75165a
--- /dev/null
+++ b/packages/grafana-prometheus/src/querycache/QueryCache.test.ts
@@ -0,0 +1,521 @@
+import moment from 'moment';
+
+import { DataFrame, DataQueryRequest, DateTime, dateTime, TimeRange } from '@grafana/data';
+
+import { QueryEditorMode } from '../querybuilder/shared/types';
+import { PromQuery } from '../types';
+
+import { DatasourceProfileData, QueryCache } from './QueryCache';
+import { IncrementalStorageDataFrameScenarios } from './QueryCacheTestData';
+
+// Will not interpolate vars!
+const interpolateStringTest = (query: PromQuery) => {
+  return query.expr;
+};
+
+const getPrometheusTargetSignature = (request: DataQueryRequest<PromQuery>, targ: PromQuery) => {
+  return `${interpolateStringTest(targ)}|${targ.interval ?? request.interval}|${JSON.stringify(
+    request.rangeRaw ?? ''
+  )}|${targ.exemplar}`;
+};
+
+const mockPromRequest = (request?: Partial<DataQueryRequest<PromQuery>>): DataQueryRequest<PromQuery> => {
+  // Histogram
+  const defaultRequest: DataQueryRequest<PromQuery> = {
+    app: 'undefined',
+    requestId: '',
+    timezone: '',
+    range: {
+      from: moment('2023-01-30T19:33:01.332Z') as DateTime,
+      to: moment('2023-01-30T20:33:01.332Z') as DateTime,
+      raw: { from: 'now-1h', to: 'now' },
+    },
+    interval: '15s',
+    intervalMs: 15000,
+    targets: [
+      {
+        datasource: { type: 'prometheus', uid: 'OPQv8Kc4z' },
+        editorMode: QueryEditorMode.Code,
+        exemplar: false,
+        expr: 'sum by(le) (rate(cortex_request_duration_seconds_bucket{cluster="dev-us-central-0", job="cortex-dev-01/cortex-gw-internal", namespace="cortex-dev-01"}[$__rate_interval]))',
+        format: 'heatmap',
+        legendFormat: '{{le}}',
+        range: true,
+        refId: 'A',
+        utcOffsetSec: -21600,
+      },
+    ],
+    maxDataPoints: 871,
+    scopedVars: {
+      __interval: { text: '15s', value: '15s' },
+      __interval_ms: { text: '15000', value: 15000 },
+    },
+    startTime: 1675110781332,
+    rangeRaw: { from: 'now-1h', to: 'now' },
+  };
+  return {
+    ...defaultRequest,
+    ...request,
+  };
+};
+
+const getPromProfileData = (request: DataQueryRequest, targ: PromQuery): DatasourceProfileData => {
+  return {
+    expr: targ.expr,
+    interval: targ.interval ?? request.interval,
+    datasource: 'prom',
+  };
+};
+
+describe('QueryCache: Generic', function () {
+  it('instantiates', () => {
+    const storage = new QueryCache({
+      getTargetSignature: () => '',
+      overlapString: '10m',
+    });
+    expect(storage).toBeInstanceOf(QueryCache);
+  });
+
+  it('will not modify or crash with empty response', () => {
+    const storage = new QueryCache({
+      getTargetSignature: () => '',
+      overlapString: '10m',
+    });
+    const firstFrames: DataFrame[] = [];
+    const secondFrames: DataFrame[] = [];
+
+    const cache = new Map<string, string>();
+
+    // start time of scenario
+    const firstFrom = dateTime(new Date(1675262550000));
+    // End time of scenario
+    const firstTo = dateTime(new Date(1675262550000)).add(6, 'hours');
+
+    const firstRange: TimeRange = {
+      from: firstFrom,
+      to: firstTo,
+      raw: {
+        from: 'now-6h',
+        to: 'now',
+      },
+    };
+
+    // Same query 2 minutes later
+    const numberOfSamplesLater = 4;
+    const interval = 30000;
+
+    const secondFrom = dateTime(new Date(1675262550000 + interval * numberOfSamplesLater));
+    const secondTo = dateTime(new Date(1675262550000 + interval * numberOfSamplesLater)).add(6, 'hours');
+
+    const secondRange: TimeRange = {
+      from: secondFrom,
+      to: secondTo,
+      raw: {
+        from: 'now-6h',
+        to: 'now',
+      },
+    };
+
+    const targetSignature = `'1=1'|${interval}|${JSON.stringify(secondRange.raw)}`;
+    const dashboardId = `dashid`;
+    const panelId = 2;
+    const targetIdentity = `${dashboardId}|${panelId}|A`;
+
+    cache.set(targetIdentity, targetSignature);
+
+    const firstStoredFrames = storage.procFrames(
+      mockPromRequest({
+        range: firstRange,
+        dashboardUID: dashboardId,
+        panelId: panelId,
+      }),
+      {
+        requests: [], // unused
+        targSigs: cache,
+        shouldCache: true,
+      },
+      firstFrames
+    );
+
+    const cached = storage.cache.get(targetIdentity);
+
+    expect(cached?.frames[0].fields[0].values.length).toEqual(firstFrames[0]?.fields[0]?.values?.length);
+    expect(firstStoredFrames[0]?.fields[0].values.length).toEqual(firstFrames[0]?.fields[0]?.values?.length);
+
+    // Should return the request frames unaltered
+    expect(firstStoredFrames).toEqual(firstFrames);
+
+    const secondRequest = mockPromRequest({
+      range: secondRange,
+      dashboardUID: dashboardId,
+      panelId: panelId,
+    });
+
+    const secondStoredFrames = storage.procFrames(
+      secondRequest,
+      {
+        requests: [], // unused
+        targSigs: cache,
+        shouldCache: true,
+      },
+      secondFrames
+    );
+
+    const storageLengthAfterSubsequentQuery = storage.cache.get(targetIdentity);
+
+    expect(secondStoredFrames).toEqual([]);
+
+    storageLengthAfterSubsequentQuery?.frames.forEach((dataFrame, index) => {
+      const secondFramesLength = secondFrames[index].fields[0].values.length;
+      const firstFramesLength = firstFrames[index].fields[0].values.length;
+
+      const cacheLength = dataFrame.fields[0].values.length;
+
+      // Cache can contain more, but never less
+      expect(cacheLength).toBeGreaterThanOrEqual(secondFramesLength + firstFramesLength - (20 + numberOfSamplesLater));
+
+      // Fewer results are sent in incremental result
+      expect(firstFramesLength).toBeGreaterThan(secondFramesLength);
+    });
+  });
+});
+
+describe('QueryCache: Prometheus', function () {
+  it('Merges incremental queries in storage', () => {
+    const scenarios = [
+      IncrementalStorageDataFrameScenarios.histogram.getSeriesWithGapAtEnd(),
+      IncrementalStorageDataFrameScenarios.histogram.getSeriesWithGapInMiddle(),
+      IncrementalStorageDataFrameScenarios.histogram.getSeriesWithGapAtStart(),
+    ];
+    scenarios.forEach((scenario, index) => {
+      const storage = new QueryCache<PromQuery>({
+        getTargetSignature: getPrometheusTargetSignature,
+        overlapString: '10m',
+        profileFunction: getPromProfileData,
+      });
+      const firstFrames = scenario.first.dataFrames as unknown as DataFrame[];
+      const secondFrames = scenario.second.dataFrames as unknown as DataFrame[];
+
+      const targetSignatures = new Map<string, string>();
+
+      // start time of scenario
+      const firstFrom = dateTime(new Date(1675262550000));
+      // End time of scenario
+      const firstTo = dateTime(new Date(1675262550000)).add(6, 'hours');
+
+      const firstRange: TimeRange = {
+        from: firstFrom,
+        to: firstTo,
+        raw: {
+          from: 'now-6h',
+          to: 'now',
+        },
+      };
+
+      // Same query 2 minutes later
+      const numberOfSamplesLater = 4;
+      const interval = 30000;
+
+      const secondFrom = dateTime(new Date(1675262550000 + interval * numberOfSamplesLater));
+      const secondTo = dateTime(new Date(1675262550000 + interval * numberOfSamplesLater)).add(6, 'hours');
+
+      const secondRange: TimeRange = {
+        from: secondFrom,
+        to: secondTo,
+        raw: {
+          from: 'now-6h',
+          to: 'now',
+        },
+      };
+
+      const dashboardId = `dashid--${index}`;
+      const panelId = 2 + index;
+
+      // This can't change
+      const targetIdentity = `${dashboardId}|${panelId}|A`;
+
+      const request = mockPromRequest({
+        range: firstRange,
+        dashboardUID: dashboardId,
+        panelId: panelId,
+      });
+
+      // But the signature can, and we should clean up any non-matching signatures
+      const targetSignature = getPrometheusTargetSignature(request, request.targets[0]);
+
+      targetSignatures.set(targetIdentity, targetSignature);
+
+      const firstStoredFrames = storage.procFrames(
+        request,
+        {
+          requests: [], // unused
+          targSigs: targetSignatures,
+          shouldCache: true,
+        },
+        firstFrames
+      );
+
+      const cached = storage.cache.get(targetIdentity);
+
+      // I would expect that the number of values received from the API should be the same as the cached values?
+      expect(cached?.frames[0].fields[0].values.length).toEqual(firstFrames[0].fields[0].values.length);
+
+      // Should return the request frames unaltered
+      expect(firstStoredFrames).toEqual(firstFrames);
+
+      const secondRequest = mockPromRequest({
+        range: secondRange,
+        dashboardUID: dashboardId,
+        panelId: panelId,
+      });
+
+      const secondStoredFrames = storage.procFrames(
+        secondRequest,
+        {
+          requests: [], // unused
+          targSigs: targetSignatures,
+          shouldCache: true,
+        },
+        secondFrames
+      );
+
+      const storageLengthAfterSubsequentQuery = storage.cache.get(targetIdentity);
+
+      storageLengthAfterSubsequentQuery?.frames.forEach((dataFrame, index) => {
+        const secondFramesLength = secondFrames[index].fields[0].values.length;
+        const firstFramesLength = firstFrames[index].fields[0].values.length;
+
+        const cacheLength = dataFrame.fields[0].values.length;
+
+        // Cache can contain more, but never less
+        expect(cacheLength).toBeGreaterThanOrEqual(
+          secondFramesLength + firstFramesLength - (20 + numberOfSamplesLater)
+        );
+
+        // Fewer results are sent in incremental result
+        expect(firstFramesLength).toBeGreaterThan(secondFramesLength);
+      });
+
+      // All of the new values should be the ones that were stored, this is overkill
+      secondFrames.forEach((frame, frameIdx) => {
+        frame.fields.forEach((field, fieldIdx) => {
+          secondFrames[frameIdx].fields[fieldIdx].values.forEach((value) => {
+            expect(secondStoredFrames[frameIdx].fields[fieldIdx].values).toContain(value);
+          });
+        });
+      });
+
+      const secondRequestModified = {
+        ...secondRequest,
+        range: {
+          ...secondRequest.range,
+          to: dateTime(secondRequest.range.to.valueOf() + 30000),
+        },
+      };
+      const cacheRequest = storage.requestInfo(secondRequestModified);
+      expect(cacheRequest.requests[0].targets).toEqual(secondRequestModified.targets);
+      expect(cacheRequest.requests[0].range.to).toEqual(secondRequestModified.range.to);
+      expect(cacheRequest.requests[0].range.raw).toEqual(secondRequestModified.range.raw);
+      expect(cacheRequest.requests[0].range.from.valueOf() - 21000000).toEqual(
+        secondRequestModified.range.from.valueOf()
+      );
+      expect(cacheRequest.shouldCache).toBe(true);
+    });
+  });
+
+  it('Will evict old dataframes, and use stored data when user shortens query window', () => {
+    const storage = new QueryCache<PromQuery>({
+      getTargetSignature: getPrometheusTargetSignature,
+      overlapString: '10m',
+      profileFunction: getPromProfileData,
+    });
+
+    // Initial request with all data for time range
+    const firstFrames = IncrementalStorageDataFrameScenarios.histogram.evictionRequests.first
+      .dataFrames as unknown as DataFrame[];
+
+    // Shortened request 30s later
+    const secondFrames = IncrementalStorageDataFrameScenarios.histogram.evictionRequests.second
+      .dataFrames as unknown as DataFrame[];
+
+    // Now the user waits a minute and changes the query duration to just the last 5 minutes, luckily the interval hasn't changed, so we can still use the data in storage except for the latest minute
+    const thirdFrames = IncrementalStorageDataFrameScenarios.histogram.evictionRequests.second
+      .dataFrames as unknown as DataFrame[];
+
+    const cache = new Map<string, string>();
+    const interval = 15000;
+
+    // start time of scenario
+    const firstFrom = dateTime(new Date(1675107180000));
+    const firstTo = dateTime(new Date(1675107180000)).add(1, 'hours');
+    const firstRange: TimeRange = {
+      from: firstFrom,
+      to: firstTo,
+      raw: {
+        from: 'now-1h',
+        to: 'now',
+      },
+    };
+
+    // 30 seconds later
+    const secondNumberOfSamplesLater = 2;
+    const secondFrom = dateTime(new Date(1675107180000 + interval * secondNumberOfSamplesLater));
+    const secondTo = dateTime(new Date(1675107180000 + interval * secondNumberOfSamplesLater)).add(1, 'hours');
+    const secondRange: TimeRange = {
+      from: secondFrom,
+      to: secondTo,
+      raw: {
+        from: 'now-1h',
+        to: 'now',
+      },
+    };
+
+    // 1 minute + 30 seconds later, but 5 minute viewing window
+    const thirdNumberOfSamplesLater = 6;
+    const thirdFrom = dateTime(new Date(1675107180000 + interval * thirdNumberOfSamplesLater));
+    const thirdTo = dateTime(new Date(1675107180000 + interval * thirdNumberOfSamplesLater)).add(5, 'minutes');
+    const thirdRange: TimeRange = {
+      from: thirdFrom,
+      to: thirdTo,
+      raw: {
+        from: 'now-5m',
+        to: 'now',
+      },
+    };
+
+    // Signifier definition
+
+    const dashboardId = `dashid`;
+    const panelId = 200;
+
+    const targetIdentity = `${dashboardId}|${panelId}|A`;
+
+    const request = mockPromRequest({
+      range: firstRange,
+      dashboardUID: dashboardId,
+      panelId: panelId,
+    });
+
+    const requestInfo = {
+      requests: [], // unused
+      targSigs: cache,
+      shouldCache: true,
+    };
+    const targetSignature = `1=1|${interval}|${JSON.stringify(request.rangeRaw ?? '')}`;
+    cache.set(targetIdentity, targetSignature);
+
+    const firstQueryResult = storage.procFrames(request, requestInfo, firstFrames);
+
+    const firstMergedLength = firstQueryResult[0].fields[0].values.length;
+
+    const secondQueryResult = storage.procFrames(
+      mockPromRequest({
+        range: secondRange,
+        dashboardUID: dashboardId,
+        panelId: panelId,
+      }),
+      {
+        requests: [], // unused
+        targSigs: cache,
+        shouldCache: true,
+      },
+      secondFrames
+    );
+
+    const secondMergedLength = secondQueryResult[0].fields[0].values.length;
+
+    // Since the step is 15s, and the request was 30 seconds later, we should have 2 extra frames, but we should evict the first two, so we should get the same length
+    expect(firstMergedLength).toEqual(secondMergedLength);
+    expect(firstQueryResult[0].fields[0].values[2]).toEqual(secondQueryResult[0].fields[0].values[0]);
+    expect(firstQueryResult[0].fields[0].values[0] + 30000).toEqual(secondQueryResult[0].fields[0].values[0]);
+
+    cache.set(targetIdentity, `'1=1'|${interval}|${JSON.stringify(thirdRange.raw)}`);
+
+    storage.procFrames(
+      mockPromRequest({
+        range: thirdRange,
+        dashboardUID: dashboardId,
+        panelId: panelId,
+      }),
+      {
+        requests: [], // unused
+        targSigs: cache,
+        shouldCache: true,
+      },
+      thirdFrames
+    );
+
+    const cachedAfterThird = storage.cache.get(targetIdentity);
+    const storageLengthAfterThirdQuery = cachedAfterThird?.frames[0].fields[0].values.length;
+    expect(storageLengthAfterThirdQuery).toEqual(20);
+  });
+
+  it('Will build signature using target overrides', () => {
+    const targetInterval = '30s';
+    const requestInterval = '15s';
+
+    const target: PromQuery = {
+      datasource: { type: 'prometheus', uid: 'OPQv8Kc4z' },
+      editorMode: QueryEditorMode.Code,
+      exemplar: false,
+      expr: 'sum by(le) (rate(cortex_request_duration_seconds_bucket{cluster="dev-us-central-0", job="cortex-dev-01/cortex-gw-internal", namespace="cortex-dev-01"}[$__rate_interval]))',
+      format: 'heatmap',
+      interval: targetInterval,
+      legendFormat: '{{le}}',
+      range: true,
+      refId: 'A',
+      utcOffsetSec: -21600,
+    };
+
+    const request = mockPromRequest({
+      interval: requestInterval,
+      targets: [target],
+    });
+    const targSig = getPrometheusTargetSignature(request, target);
+    expect(targSig).toContain(targetInterval);
+    expect(targSig.includes(requestInterval)).toBeFalsy();
+  });
+
+  it('will not modify request with absolute duration', () => {
+    const request = mockPromRequest({
+      range: {
+        from: moment('2023-01-30T19:33:01.332Z') as DateTime,
+        to: moment('2023-01-30T20:33:01.332Z') as DateTime,
+        raw: { from: '2023-01-30T19:33:01.332Z', to: '2023-01-30T20:33:01.332Z' },
+      },
+      rangeRaw: { from: '2023-01-30T19:33:01.332Z', to: '2023-01-30T20:33:01.332Z' },
+    });
+    const storage = new QueryCache<PromQuery>({
+      getTargetSignature: getPrometheusTargetSignature,
+      overlapString: '10m',
+      profileFunction: getPromProfileData,
+    });
+    const cacheRequest = storage.requestInfo(request);
+    expect(cacheRequest.requests[0]).toBe(request);
+    expect(cacheRequest.shouldCache).toBe(false);
+  });
+
+  it('mark request as shouldCache', () => {
+    const request = mockPromRequest();
+    const storage = new QueryCache<PromQuery>({
+      getTargetSignature: getPrometheusTargetSignature,
+      overlapString: '10m',
+      profileFunction: getPromProfileData,
+    });
+    const cacheRequest = storage.requestInfo(request);
+    expect(cacheRequest.requests[0]).toBe(request);
+    expect(cacheRequest.shouldCache).toBe(true);
+  });
+
+  it('Should modify request', () => {
+    const request = mockPromRequest();
+    const storage = new QueryCache<PromQuery>({
+      getTargetSignature: getPrometheusTargetSignature,
+      overlapString: '10m',
+      profileFunction: getPromProfileData,
+    });
+    const cacheRequest = storage.requestInfo(request);
+    expect(cacheRequest.requests[0]).toBe(request);
+    expect(cacheRequest.shouldCache).toBe(true);
+  });
+});
diff --git a/packages/grafana-prometheus/src/querycache/QueryCache.ts b/packages/grafana-prometheus/src/querycache/QueryCache.ts
new file mode 100644
index 0000000000000..0cf5f84c2f521
--- /dev/null
+++ b/packages/grafana-prometheus/src/querycache/QueryCache.ts
@@ -0,0 +1,441 @@
+import {
+  DataFrame,
+  DataQueryRequest,
+  dateTime,
+  durationToMilliseconds,
+  Field,
+  incrRoundDn,
+  isValidDuration,
+  parseDuration,
+} from '@grafana/data';
+import { faro } from '@grafana/faro-web-sdk';
+import { config, reportInteraction } from '@grafana/runtime';
+
+import { amendTable, Table, trimTable } from '../gcopypaste/app/features/live/data/amendTimeSeries';
+import { PromQuery } from '../types';
+
+// dashboardUID + panelId + refId
+// (must be stable across query changes, time range changes / interval changes / panel resizes / template variable changes)
+type TargetIdent = string;
+
+type RequestID = string;
+
+// query + template variables + interval + raw time range
+// used for full target cache busting -> full range re-query
+type TargetSig = string;
+
+type TimestampMs = number;
+
+type SupportedQueryTypes = PromQuery;
+
+// string matching requirements defined in durationutil.ts
+export const defaultPrometheusQueryOverlapWindow = '10m';
+
+interface TargetCache {
+  sig: TargetSig;
+  prevTo: TimestampMs;
+  frames: DataFrame[];
+}
+
+export interface CacheRequestInfo<T extends SupportedQueryTypes> {
+  requests: Array<DataQueryRequest<T>>;
+  targSigs: Map<TargetIdent, TargetSig>;
+  shouldCache: boolean;
+}
+
+export interface DatasourceProfileData {
+  interval?: string;
+  expr: string;
+  datasource: string;
+}
+
+interface ProfileData extends DatasourceProfileData {
+  identity: string;
+  bytes: number | null;
+  dashboardUID: string;
+  panelId?: number;
+  from: string;
+  queryRangeSeconds: number;
+  refreshIntervalMs: number;
+}
+
+/**
+ * Get field identity
+ * This is the string used to uniquely identify a field within a "target"
+ * @param field
+ */
+export const getFieldIdent = (field: Field) => `${field.type}|${field.name}|${JSON.stringify(field.labels ?? '')}`;
+
+/**
+ * NOMENCLATURE
+ * Target: The request target (DataQueryRequest), i.e. a specific query reference within a panel
+ * Ident: Identity: the string that is not expected to change
+ * Sig: Signature: the string that is expected to change, upon which we wipe the cache fields
+ */
+export class QueryCache<T extends SupportedQueryTypes> {
+  private overlapWindowMs: number;
+  private getTargetSignature: (request: DataQueryRequest<T>, target: T) => string;
+  private getProfileData?: (request: DataQueryRequest<T>, target: T) => DatasourceProfileData;
+
+  private perfObeserver?: PerformanceObserver;
+  private shouldProfile: boolean;
+
+  // send profile events every 10 minutes
+  sendEventsInterval = 60000 * 10;
+
+  pendingRequestIdsToTargSigs = new Map<RequestID, ProfileData>();
+
+  pendingAccumulatedEvents = new Map<
+    string,
+    {
+      requestCount: number;
+      savedBytesTotal: number;
+      initialRequestSize: number;
+      lastRequestSize: number;
+      panelId: string;
+      dashId: string;
+      expr: string;
+      refreshIntervalMs: number;
+      sent: boolean;
+      datasource: string;
+      from: string;
+      queryRangeSeconds: number;
+    }
+  >();
+
+  cache = new Map<TargetIdent, TargetCache>();
+
+  constructor(options: {
+    getTargetSignature: (request: DataQueryRequest<T>, target: T) => string;
+    overlapString: string;
+    profileFunction?: (request: DataQueryRequest<T>, target: T) => DatasourceProfileData;
+  }) {
+    const unverifiedOverlap = options.overlapString;
+    if (isValidDuration(unverifiedOverlap)) {
+      const duration = parseDuration(unverifiedOverlap);
+      this.overlapWindowMs = durationToMilliseconds(duration);
+    } else {
+      const duration = parseDuration(defaultPrometheusQueryOverlapWindow);
+      this.overlapWindowMs = durationToMilliseconds(duration);
+    }
+
+    if (
+      (config.grafanaJavascriptAgent.enabled || config.featureToggles?.prometheusIncrementalQueryInstrumentation) &&
+      options.profileFunction !== undefined
+    ) {
+      this.profile();
+      this.shouldProfile = true;
+    } else {
+      this.shouldProfile = false;
+    }
+    this.getProfileData = options.profileFunction;
+    this.getTargetSignature = options.getTargetSignature;
+  }
+
+  private profile() {
+    // Check if PerformanceObserver is supported, and if we have Faro enabled for internal profiling
+    if (typeof PerformanceObserver === 'function') {
+      this.perfObeserver = new PerformanceObserver((list: PerformanceObserverEntryList) => {
+        list.getEntries().forEach((entry) => {
+          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+          const entryTypeCast: PerformanceResourceTiming = entry as PerformanceResourceTiming;
+
+          // Safari support for this is coming in 16.4:
+          // https://caniuse.com/mdn-api_performanceresourcetiming_transfersize
+          // Gating that this exists to prevent runtime errors
+          const isSupported = typeof entryTypeCast?.transferSize === 'number';
+
+          if (entryTypeCast?.initiatorType === 'fetch' && isSupported) {
+            let fetchUrl = entryTypeCast.name;
+
+            if (fetchUrl.includes('/api/ds/query')) {
+              let match = fetchUrl.match(/requestId=([a-z\d]+)/i);
+
+              if (match) {
+                let requestId = match[1];
+
+                const requestTransferSize = Math.round(entryTypeCast.transferSize);
+                const currentRequest = this.pendingRequestIdsToTargSigs.get(requestId);
+
+                if (currentRequest) {
+                  const entries = this.pendingRequestIdsToTargSigs.entries();
+
+                  for (let [, value] of entries) {
+                    if (value.identity === currentRequest.identity && value.bytes !== null) {
+                      const previous = this.pendingAccumulatedEvents.get(value.identity);
+
+                      const savedBytes = value.bytes - requestTransferSize;
+
+                      this.pendingAccumulatedEvents.set(value.identity, {
+                        datasource: value.datasource ?? 'N/A',
+                        requestCount: (previous?.requestCount ?? 0) + 1,
+                        savedBytesTotal: (previous?.savedBytesTotal ?? 0) + savedBytes,
+                        initialRequestSize: value.bytes,
+                        lastRequestSize: requestTransferSize,
+                        panelId: currentRequest.panelId?.toString() ?? '',
+                        dashId: currentRequest.dashboardUID ?? '',
+                        expr: currentRequest.expr ?? '',
+                        refreshIntervalMs: currentRequest.refreshIntervalMs ?? 0,
+                        sent: false,
+                        from: currentRequest.from ?? '',
+                        queryRangeSeconds: currentRequest.queryRangeSeconds ?? 0,
+                      });
+
+                      // We don't need to save each subsequent request, only the first one
+                      this.pendingRequestIdsToTargSigs.delete(requestId);
+
+                      return;
+                    }
+                  }
+
+                  // If we didn't return above, this should be the first request, let's save the observed size
+                  this.pendingRequestIdsToTargSigs.set(requestId, { ...currentRequest, bytes: requestTransferSize });
+                }
+              }
+            }
+          }
+        });
+      });
+
+      this.perfObeserver.observe({ type: 'resource', buffered: false });
+
+      setInterval(this.sendPendingTrackingEvents, this.sendEventsInterval);
+
+      // Send any pending profile information when the user navigates away
+      window.addEventListener('beforeunload', this.sendPendingTrackingEvents);
+    }
+  }
+
+  sendPendingTrackingEvents = () => {
+    const entries = this.pendingAccumulatedEvents.entries();
+
+    for (let [key, value] of entries) {
+      if (!value.sent) {
+        const event = {
+          datasource: value.datasource.toString(),
+          requestCount: value.requestCount.toString(),
+          savedBytesTotal: value.savedBytesTotal.toString(),
+          initialRequestSize: value.initialRequestSize.toString(),
+          lastRequestSize: value.lastRequestSize.toString(),
+          panelId: value.panelId.toString(),
+          dashId: value.dashId.toString(),
+          expr: value.expr.toString(),
+          refreshIntervalMs: value.refreshIntervalMs.toString(),
+          from: value.from.toString(),
+          queryRangeSeconds: value.queryRangeSeconds.toString(),
+        };
+
+        if (config.featureToggles.prometheusIncrementalQueryInstrumentation) {
+          reportInteraction('grafana_incremental_queries_profile', event);
+        } else if (faro.api.pushEvent) {
+          faro.api.pushEvent('incremental query response size', event, 'no-interaction', {
+            skipDedupe: true,
+          });
+        }
+
+        this.pendingAccumulatedEvents.set(key, {
+          ...value,
+          sent: true,
+          requestCount: 0,
+          savedBytesTotal: 0,
+          initialRequestSize: 0,
+          lastRequestSize: 0,
+        });
+      }
+    }
+  };
+
+  // can be used to change full range request to partial, split into multiple requests
+  requestInfo(request: DataQueryRequest<T>): CacheRequestInfo<T> {
+    // TODO: align from/to to interval to increase probability of hitting backend cache
+
+    const newFrom = request.range.from.valueOf();
+    const newTo = request.range.to.valueOf();
+
+    // only cache 'now'-relative queries (that can benefit from a backfill cache)
+    const shouldCache = request.rangeRaw?.to?.toString() === 'now';
+
+    // all targets are queried together, so we check for any that causes group cache invalidation & full re-query
+    let doPartialQuery = shouldCache;
+    let prevTo: TimestampMs | undefined = undefined;
+
+    const refreshIntervalMs = request.intervalMs;
+
+    // pre-compute reqTargSigs
+    const reqTargSigs = new Map<TargetIdent, TargetSig>();
+    request.targets.forEach((targ) => {
+      let targIdent = `${request.dashboardUID}|${request.panelId}|${targ.refId}`;
+      let targSig = this.getTargetSignature(request, targ); // ${request.maxDataPoints} ?
+
+      if (this.shouldProfile && this.getProfileData) {
+        this.pendingRequestIdsToTargSigs.set(request.requestId, {
+          ...this.getProfileData(request, targ),
+          identity: targIdent + '|' + targSig,
+          bytes: null,
+          panelId: request.panelId,
+          dashboardUID: request.dashboardUID ?? '',
+          from: request.rangeRaw?.from.toString() ?? '',
+          queryRangeSeconds: request.range.to.diff(request.range.from, 'seconds') ?? '',
+          refreshIntervalMs: refreshIntervalMs ?? 0,
+        });
+      }
+
+      reqTargSigs.set(targIdent, targSig);
+    });
+
+    // figure out if new query range or new target props trigger full cache invalidation & re-query
+    for (const [targIdent, targSig] of reqTargSigs) {
+      let cached = this.cache.get(targIdent);
+      let cachedSig = cached?.sig;
+
+      if (cachedSig !== targSig) {
+        doPartialQuery = false;
+      } else {
+        // only do partial queries when new request range follows prior request range (possibly with overlap)
+        // e.g. now-6h with refresh <= 6h
+        prevTo = cached?.prevTo ?? Infinity;
+
+        doPartialQuery = newTo > prevTo && newFrom <= prevTo;
+      }
+
+      if (!doPartialQuery) {
+        break;
+      }
+    }
+
+    if (doPartialQuery && prevTo) {
+      // clamp to make sure we don't re-query previous 10m when newFrom is ahead of it (e.g. 5min range, 30s refresh)
+      let newFromPartial = Math.max(prevTo - this.overlapWindowMs, newFrom);
+
+      const newToDate = dateTime(newTo);
+      const newFromPartialDate = dateTime(incrRoundDn(newFromPartial, request.intervalMs));
+
+      // modify to partial query
+      request = {
+        ...request,
+        range: {
+          ...request.range,
+          from: newFromPartialDate,
+          to: newToDate,
+        },
+      };
+    } else {
+      reqTargSigs.forEach((targSig, targIdent) => {
+        this.cache.delete(targIdent);
+      });
+    }
+
+    return {
+      requests: [request],
+      targSigs: reqTargSigs,
+      shouldCache,
+    };
+  }
+
+  // should amend existing cache with new frames and return full response
+  procFrames(
+    request: DataQueryRequest<T>,
+    requestInfo: CacheRequestInfo<T> | undefined,
+    respFrames: DataFrame[]
+  ): DataFrame[] {
+    if (requestInfo?.shouldCache) {
+      const newFrom = request.range.from.valueOf();
+      const newTo = request.range.to.valueOf();
+
+      // group frames by targets
+      const respByTarget = new Map<TargetIdent, DataFrame[]>();
+
+      respFrames.forEach((frame: DataFrame) => {
+        let targIdent = `${request.dashboardUID}|${request.panelId}|${frame.refId}`;
+
+        let frames = respByTarget.get(targIdent);
+
+        if (!frames) {
+          frames = [];
+          respByTarget.set(targIdent, frames);
+        }
+
+        frames.push(frame);
+      });
+
+      let outFrames: DataFrame[] = [];
+
+      respByTarget.forEach((respFrames, targIdent) => {
+        let cachedFrames = (targIdent ? this.cache.get(targIdent)?.frames : null) ?? [];
+
+        respFrames.forEach((respFrame: DataFrame) => {
+          // skip empty frames
+          if (respFrame.length === 0 || respFrame.fields.length === 0) {
+            return;
+          }
+
+          // frames are identified by their second (non-time) field's name + labels
+          // TODO: maybe also frame.meta.type?
+          let respFrameIdent = getFieldIdent(respFrame.fields[1]);
+
+          let cachedFrame = cachedFrames.find((cached) => getFieldIdent(cached.fields[1]) === respFrameIdent);
+
+          if (!cachedFrame) {
+            // append new unknown frames
+            cachedFrames.push(respFrame);
+          } else {
+            // we assume that fields cannot appear/disappear and will all exist in same order
+
+            // amend & re-cache
+            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+            let prevTable: Table = cachedFrame.fields.map((field) => field.values) as Table;
+            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+            let nextTable: Table = respFrame.fields.map((field) => field.values) as Table;
+
+            let amendedTable = amendTable(prevTable, nextTable);
+            if (amendedTable) {
+              for (let i = 0; i < amendedTable.length; i++) {
+                cachedFrame.fields[i].values = amendedTable[i];
+              }
+              cachedFrame.length = cachedFrame.fields[0].values.length;
+            }
+          }
+        });
+
+        // trim all frames to in-view range, evict those that end up with 0 length
+        let nonEmptyCachedFrames: DataFrame[] = [];
+
+        cachedFrames.forEach((frame) => {
+          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+          let table: Table = frame.fields.map((field) => field.values) as Table;
+
+          let trimmed = trimTable(table, newFrom, newTo);
+
+          if (trimmed[0].length > 0) {
+            for (let i = 0; i < trimmed.length; i++) {
+              frame.fields[i].values = trimmed[i];
+            }
+            nonEmptyCachedFrames.push(frame);
+          }
+        });
+
+        this.cache.set(targIdent, {
+          sig: requestInfo.targSigs.get(targIdent)!,
+          frames: nonEmptyCachedFrames,
+          prevTo: newTo,
+        });
+
+        outFrames.push(...nonEmptyCachedFrames);
+      });
+
+      // transformV2 mutates field values for heatmap de-accum, and modifies field order, so we gotta clone here, for now :(
+      respFrames = outFrames.map((frame) => ({
+        ...frame,
+        fields: frame.fields.map((field) => ({
+          ...field,
+          config: {
+            ...field.config, // prevents mutatative exemplars links (re)enrichment
+          },
+          values: field.values.slice(),
+        })),
+      }));
+    }
+
+    return respFrames;
+  }
+}
diff --git a/packages/grafana-prometheus/src/querycache/QueryCacheTestData.ts b/packages/grafana-prometheus/src/querycache/QueryCacheTestData.ts
new file mode 100644
index 0000000000000..ec4d5154bf248
--- /dev/null
+++ b/packages/grafana-prometheus/src/querycache/QueryCacheTestData.ts
@@ -0,0 +1,862 @@
+import { clone } from 'lodash';
+
+/**
+ *
+ * @param length - Number of values to add
+ * @param start - First timestamp (ms)
+ * @param step - step duration (ms)
+ */
+export const getMockTimeFrameArray = (length: number, start: number, step: number) => {
+  let timeValues: number[] = [];
+  for (let i = 0; i < length; i++) {
+    timeValues.push(start + i * step);
+  }
+
+  return timeValues;
+};
+
+/**
+ * @param length - number of "Values" to add
+ * @param values
+ * @param high
+ */
+export const getMockValueFrameArray = (length: number, values = 0): number[] => {
+  return Array(length).fill(values);
+};
+
+const timeFrameWithMissingValuesInMiddle = getMockTimeFrameArray(721, 1675262550000, 30000);
+const timeFrameWithMissingValuesAtStart = getMockTimeFrameArray(721, 1675262550000, 30000);
+const timeFrameWithMissingValuesAtEnd = getMockTimeFrameArray(721, 1675262550000, 30000);
+
+// Deleting some out the middle
+timeFrameWithMissingValuesInMiddle.splice(360, 721 - 684);
+timeFrameWithMissingValuesAtStart.splice(0, 721 - 684);
+timeFrameWithMissingValuesAtEnd.splice(721 - 684, 721 - 684);
+
+const mockLabels = {
+  __name__: 'cortex_request_duration_seconds_bucket',
+  cluster: 'dev-us-central-0',
+  container: 'aggregator',
+  instance: 'aggregator-7:aggregator:http-metrics',
+  job: 'mimir-dev-11/aggregator',
+  le: '0.5',
+  method: 'GET',
+  namespace: 'mimir-dev-11',
+  pod: 'aggregator-7',
+  route: 'metrics',
+  status_code: '200',
+  ws: 'false',
+};
+
+const twoRequestsOneCachedMissingData = {
+  first: {
+    request: {
+      app: 'panel-viewer',
+      requestId: 'Q100',
+      panelId: 19,
+      dashboardId: 884,
+      dashboardUID: 'dtngicc4z',
+      range: {
+        from: '2023-02-01T14:42:54.929Z',
+        to: '2023-02-01T20:42:54.929Z',
+        raw: { from: 'now-6h', to: 'now' },
+      },
+      interval: '30s',
+      intervalMs: 30000,
+      targets: [
+        {
+          datasource: { type: 'prometheus', uid: 'OPQv8Kc4z' },
+          editorMode: 'code',
+          expr: '',
+          legendFormat: '',
+          range: true,
+          refId: 'A',
+          exemplar: false,
+          requestId: '19A',
+          utcOffsetSec: -21600,
+        },
+      ],
+      startTime: 1675284174929,
+      rangeRaw: { from: 'now-6h', to: 'now' },
+    },
+    dataFrames: [
+      {
+        name: '+Inf',
+        refId: 'A',
+        fields: [
+          {
+            name: 'Time',
+            type: 'time',
+            typeInfo: { frame: 'time.Time' },
+            config: { interval: 30000 },
+            // Delete values from the middle
+            values: timeFrameWithMissingValuesInMiddle,
+            entities: {},
+          },
+          {
+            name: 'Value',
+            type: 'number',
+            typeInfo: { frame: 'float64' },
+            labels: { ...mockLabels, le: '+Inf' },
+            config: { displayNameFromDS: '+Inf' },
+            values: getMockValueFrameArray(684, 1),
+            entities: {},
+          },
+        ],
+        length: 684,
+      },
+      {
+        name: '0.5',
+        refId: 'A',
+        meta: {
+          type: 'timeseries-multi',
+          custom: { resultType: 'matrix' },
+          executedQueryString:
+            'Expr: {__name__="cortex_request_duration_seconds_bucket", cluster="dev-us-central-0", container="aggregator", instance=~"aggregator-7:aggregator:http-metrics|aggregator-6:aggregator:http-metrics", job="mimir-dev-11/aggregator", le=~"\\\\+Inf|0.5", method="GET", namespace="mimir-dev-11", pod="aggregator-7"}\nStep: 30s',
+          preferredVisualisationType: 'graph',
+        },
+        fields: [
+          {
+            name: 'Time',
+            type: 'time',
+            typeInfo: { frame: 'time.Time' },
+            config: { interval: 30000 },
+            values: timeFrameWithMissingValuesInMiddle,
+            entities: {},
+          },
+          {
+            name: 'Value',
+            type: 'number',
+            typeInfo: { frame: 'float64' },
+            labels: { ...mockLabels, le: '0.5' },
+            config: { displayNameFromDS: '0.5' },
+            values: getMockValueFrameArray(684, 25349),
+            entities: {},
+          },
+        ],
+        length: 684,
+      },
+    ],
+    originalRange: undefined,
+    timeSrv: { from: 'now-6h', to: 'now' },
+  },
+  second: {
+    request: {
+      app: 'panel-viewer',
+      requestId: 'Q101',
+      timezone: 'browser',
+      panelId: 19,
+      dashboardId: 884,
+      dashboardUID: 'dtngicc4z',
+      publicDashboardAccessToken: '',
+      range: {
+        from: '2023-02-01T14:44:01.928Z',
+        to: '2023-02-01T20:44:01.928Z',
+        raw: { from: 'now-6h', to: 'now' },
+      },
+      timeInfo: '',
+      interval: '30s',
+      intervalMs: 30000,
+      targets: [
+        {
+          datasource: { type: 'prometheus', uid: 'OPQv8Kc4z' },
+          editorMode: 'code',
+          expr: '{__name__="cortex_request_duration_seconds_bucket", cluster="dev-us-central-0", container="aggregator", instance=~"aggregator-7:aggregator:http-metrics|aggregator-6:aggregator:http-metrics", job="mimir-dev-11/aggregator", le=~"\\\\+Inf|0.5", method="GET", namespace="mimir-dev-11", pod="aggregator-7"}',
+          legendFormat: '{{le}}',
+          range: true,
+          refId: 'A',
+          exemplar: false,
+          requestId: '19A',
+          utcOffsetSec: -21600,
+        },
+      ],
+      maxDataPoints: 775,
+      scopedVars: { __interval: { text: '30s', value: '30s' }, __interval_ms: { text: '30000', value: 30000 } },
+      startTime: 1675284241929,
+      rangeRaw: { from: 'now-6h', to: 'now' },
+    },
+    dataFrames: [
+      {
+        name: '+Inf',
+        refId: 'A',
+        meta: {
+          type: 'timeseries-multi',
+          custom: { resultType: 'matrix' },
+          executedQueryString:
+            'Expr: {__name__="cortex_request_duration_seconds_bucket", cluster="dev-us-central-0", container="aggregator", instance=~"aggregator-7:aggregator:http-metrics|aggregator-6:aggregator:http-metrics", job="mimir-dev-11/aggregator", le=~"\\\\+Inf|0.5", method="GET", namespace="mimir-dev-11", pod="aggregator-7"}\nStep: 30s',
+          preferredVisualisationType: 'graph',
+        },
+        fields: [
+          {
+            name: 'Time',
+            type: 'time',
+            typeInfo: { frame: 'time.Time' },
+            config: { interval: 30000 },
+            values: getMockTimeFrameArray(24, 1675283550000, 30000),
+            entities: {},
+          },
+          {
+            name: 'Value',
+            type: 'number',
+            typeInfo: { frame: 'float64' },
+            labels: { ...mockLabels, le: '+Inf' },
+            config: { displayNameFromDS: '+Inf' },
+            values: getMockValueFrameArray(24, 1),
+            entities: {},
+          },
+        ],
+        length: 24,
+      },
+      {
+        name: '0.5',
+        refId: 'A',
+        meta: {
+          type: 'timeseries-multi',
+          custom: { resultType: 'matrix' },
+          executedQueryString:
+            'Expr: {__name__="cortex_request_duration_seconds_bucket", cluster="dev-us-central-0", container="aggregator", instance=~"aggregator-7:aggregator:http-metrics|aggregator-6:aggregator:http-metrics", job="mimir-dev-11/aggregator", le=~"\\\\+Inf|0.5", method="GET", namespace="mimir-dev-11", pod="aggregator-7"}\nStep: 30s',
+          preferredVisualisationType: 'graph',
+        },
+        fields: [
+          {
+            name: 'Time',
+            type: 'time',
+            typeInfo: { frame: 'time.Time' },
+            config: { interval: 30000 },
+            values: getMockTimeFrameArray(21, 1675283550000, 30000),
+            entities: {},
+          },
+          {
+            name: 'Value',
+            type: 'number',
+            typeInfo: { frame: 'float64' },
+            labels: {
+              __name__: 'cortex_request_duration_seconds_bucket',
+              cluster: 'dev-us-central-0',
+              container: 'aggregator',
+              instance: 'aggregator-7:aggregator:http-metrics',
+              job: 'mimir-dev-11/aggregator',
+              le: '0.5',
+              method: 'GET',
+              namespace: 'mimir-dev-11',
+              pod: 'aggregator-7',
+              route: 'metrics',
+              status_code: '200',
+              ws: 'false',
+            },
+            config: { displayNameFromDS: '0.5' },
+            values: getMockValueFrameArray(21, 2),
+            entities: {},
+          },
+        ],
+        length: 21,
+      },
+    ],
+    originalRange: { end: 1675284241920, start: 1675262641920 },
+    timeSrv: { from: 'now-6h', to: 'now' },
+  },
+};
+
+export const IncrementalStorageDataFrameScenarios = {
+  histogram: {
+    // 3 requests, one 30 seconds after the first, and then the user waits a minute and shortens to a 5 minute query window from 1 hour to force frames to get evicted
+    evictionRequests: {
+      first: {
+        request: {
+          range: {
+            from: '2023-01-30T19:33:01.332Z',
+            to: '2023-01-30T20:33:01.332Z',
+            raw: { from: 'now-1h', to: 'now' },
+          },
+          interval: '15s',
+          intervalMs: 15000,
+          targets: [
+            {
+              datasource: { type: 'prometheus', uid: 'OPQv8Kc4z' },
+              editorMode: 'code',
+              exemplar: false,
+              expr: 'sum by(le) (rate(cortex_request_duration_seconds_bucket{cluster="dev-us-central-0", job="cortex-dev-01/cortex-gw-internal", namespace="cortex-dev-01"}[$__rate_interval]))',
+              format: 'heatmap',
+              legendFormat: '{{le}}',
+              range: true,
+              refId: 'A',
+              requestId: '2A',
+              utcOffsetSec: -21600,
+            },
+          ],
+          maxDataPoints: 871,
+          scopedVars: {
+            __interval: { text: '15s', value: '15s' },
+            __interval_ms: { text: '15000', value: 15000 },
+          },
+          startTime: 1675110781332,
+          rangeRaw: { from: 'now-1h', to: 'now' },
+        },
+        dataFrames: [
+          {
+            name: '0.005',
+            refId: 'A',
+            meta: {
+              type: 'heatmap-rows',
+              custom: { resultType: 'matrix' },
+              executedQueryString:
+                'Expr: sum by(le) (rate(cortex_request_duration_seconds_bucket{cluster="dev-us-central-0", job="cortex-dev-01/cortex-gw-internal", namespace="cortex-dev-01"}[1m0s]))\nStep: 15s',
+            },
+            fields: [
+              {
+                name: 'Time',
+                type: 'time',
+                typeInfo: { frame: 'time.Time' },
+                config: { interval: 15000 },
+                values: getMockTimeFrameArray(241, 1675107180000, 15000),
+                entities: {},
+              },
+              {
+                name: '0.005',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.005' },
+                config: { displayNameFromDS: '0.005' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '0.01',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.01' },
+                config: { displayNameFromDS: '0.01' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '0.025',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.025' },
+                config: { displayNameFromDS: '0.025' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '0.05',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.05' },
+                config: { displayNameFromDS: '0.05' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '0.1',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.1' },
+                config: { displayNameFromDS: '0.1' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '0.25',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.25' },
+                config: { displayNameFromDS: '0.25' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '0.5',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.5' },
+                config: { displayNameFromDS: '0.5' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '1.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '1.0' },
+                config: { displayNameFromDS: '1.0' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '2.5',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '2.5' },
+                config: { displayNameFromDS: '2.5' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '5.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '5.0' },
+                config: { displayNameFromDS: '5.0' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '10.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '10.0' },
+                config: { displayNameFromDS: '10.0' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '25.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '25.0' },
+                config: { displayNameFromDS: '25.0' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '50.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '50.0' },
+                config: { displayNameFromDS: '50.0' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '100.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '100.0' },
+                config: { displayNameFromDS: '100.0' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+              {
+                name: '+Inf',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '+Inf' },
+                config: { displayNameFromDS: '+Inf' },
+                values: getMockValueFrameArray(241, 2.8),
+                entities: {},
+              },
+            ],
+            length: 241,
+          },
+        ],
+      },
+      second: {
+        request: {
+          range: {
+            from: '2023-01-30T19:33:31.357Z',
+            to: '2023-01-30T20:33:31.357Z',
+            raw: { from: 'now-1h', to: 'now' },
+          },
+          interval: '15s',
+          intervalMs: 15000,
+          targets: [
+            {
+              datasource: { type: 'prometheus' },
+              editorMode: 'code',
+              exemplar: false,
+              expr: 'sum by(le) (rate(cortex_request_duration_seconds_bucket{cluster="dev-us-central-0", job="cortex-dev-01/cortex-gw-internal", namespace="cortex-dev-01"}[$__rate_interval]))',
+              format: 'heatmap',
+              legendFormat: '{{le}}',
+              range: true,
+              refId: 'A',
+              requestId: '2A',
+              utcOffsetSec: -21600,
+            },
+          ],
+          maxDataPoints: 871,
+          scopedVars: {
+            __interval: { text: '15s', value: '15s' },
+            __interval_ms: { text: '15000', value: 15000 },
+          },
+          startTime: 1675110811357,
+          rangeRaw: { from: 'now-1h', to: 'now' },
+        },
+        dataFrames: [
+          {
+            name: '0.005',
+            refId: 'A',
+            meta: {
+              type: 'heatmap-rows',
+              custom: { resultType: 'matrix' },
+              executedQueryString:
+                'Expr: sum by(le) (rate(cortex_request_duration_seconds_bucket{cluster="dev-us-central-0", job="cortex-dev-01/cortex-gw-internal", namespace="cortex-dev-01"}[1m0s]))\nStep: 15s',
+            },
+            fields: [
+              {
+                name: 'Time',
+                type: 'time',
+                typeInfo: { frame: 'time.Time' },
+                config: { interval: 15000 },
+                values: getMockTimeFrameArray(43, 1675110180000, 15000),
+                entities: {},
+              },
+              {
+                name: '0.005',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.005' },
+                config: { displayNameFromDS: '0.005' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '0.01',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.01' },
+                config: { displayNameFromDS: '0.01' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '0.025',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.025' },
+                config: { displayNameFromDS: '0.025' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '0.05',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.05' },
+                config: { displayNameFromDS: '0.05' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '0.1',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.1' },
+                config: { displayNameFromDS: '0.1' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '0.25',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.25' },
+                config: { displayNameFromDS: '0.25' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '0.5',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.5' },
+                config: { displayNameFromDS: '0.5' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '1.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '1.0' },
+                config: { displayNameFromDS: '1.0' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '2.5',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '2.5' },
+                config: { displayNameFromDS: '2.5' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '5.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '5.0' },
+                config: { displayNameFromDS: '5.0' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '10.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '10.0' },
+                config: { displayNameFromDS: '10.0' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '25.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '25.0' },
+                config: { displayNameFromDS: '25.0' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '50.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '50.0' },
+                config: { displayNameFromDS: '50.0' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '100.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '100.0' },
+                config: { displayNameFromDS: '100.0' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+              {
+                name: '+Inf',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '+Inf' },
+                config: { displayNameFromDS: '+Inf' },
+                values: getMockValueFrameArray(43, 2.8),
+                entities: {},
+              },
+            ],
+            length: 43,
+          },
+        ],
+      },
+      third: {
+        request: {
+          range: {
+            from: '2023-01-30T20:33:31.357Z',
+            to: '2023-01-30T20:34:31.357Z',
+            raw: { from: 'now-5m', to: 'now' },
+          },
+          interval: '15s',
+          intervalMs: 15000,
+          targets: [
+            {
+              datasource: { type: 'prometheus' },
+              editorMode: 'code',
+              exemplar: false,
+              expr: 'sum by(le) (rate(cortex_request_duration_seconds_bucket{cluster="dev-us-central-0", job="cortex-dev-01/cortex-gw-internal", namespace="cortex-dev-01"}[$__rate_interval]))',
+              format: 'heatmap',
+              legendFormat: '{{le}}',
+              range: true,
+              refId: 'A',
+              requestId: '2A',
+              utcOffsetSec: -21600,
+            },
+          ],
+          maxDataPoints: 871,
+          scopedVars: {
+            __interval: { text: '15s', value: '15s' },
+            __interval_ms: { text: '15000', value: 15000 },
+          },
+          startTime: 1675110811357,
+          rangeRaw: { from: 'now-1h', to: 'now' },
+        },
+        dataFrames: [
+          {
+            name: '0.005',
+            refId: 'A',
+            meta: {
+              type: 'heatmap-rows',
+              custom: { resultType: 'matrix' },
+              executedQueryString:
+                'Expr: sum by(le) (rate(cortex_request_duration_seconds_bucket{cluster="dev-us-central-0", job="cortex-dev-01/cortex-gw-internal", namespace="cortex-dev-01"}[1m0s]))\nStep: 15s',
+            },
+            fields: [
+              {
+                name: 'Time',
+                type: 'time',
+                typeInfo: { frame: 'time.Time' },
+                config: { interval: 15000 },
+                values: getMockTimeFrameArray(20, 1675110810000, 15000),
+                entities: {},
+              },
+              {
+                name: '0.005',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.005' },
+                config: { displayNameFromDS: '0.005' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+              {
+                name: '0.01',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.01' },
+                config: { displayNameFromDS: '0.01' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+              {
+                name: '0.025',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.025' },
+                config: { displayNameFromDS: '0.025' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+              {
+                name: '0.05',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.05' },
+                config: { displayNameFromDS: '0.05' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+              {
+                name: '0.1',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.1' },
+                config: { displayNameFromDS: '0.1' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+              {
+                name: '0.25',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.25' },
+                config: { displayNameFromDS: '0.25' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+
+              // Sometimes we don't always get new values, the preprocessing will need to back-fill any missing values
+              {
+                name: '0.5',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '0.5' },
+                config: { displayNameFromDS: '0.5' },
+                values: getMockValueFrameArray(10, 4.3),
+                entities: {},
+              },
+              {
+                name: '1.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '1.0' },
+                config: { displayNameFromDS: '1.0' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+              {
+                name: '2.5',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '2.5' },
+                config: { displayNameFromDS: '2.5' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+              {
+                name: '5.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '5.0' },
+                config: { displayNameFromDS: '5.0' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+              {
+                name: '10.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '10.0' },
+                config: { displayNameFromDS: '10.0' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+              {
+                name: '25.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '25.0' },
+                config: { displayNameFromDS: '25.0' },
+                values: getMockValueFrameArray(10, 4.3),
+                entities: {},
+              },
+              {
+                name: '50.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '50.0' },
+                config: { displayNameFromDS: '50.0' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+              {
+                name: '100.0',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '100.0' },
+                config: { displayNameFromDS: '100.0' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+              {
+                name: '+Inf',
+                type: 'number',
+                typeInfo: { frame: 'float64' },
+                labels: { le: '+Inf' },
+                config: { displayNameFromDS: '+Inf' },
+                values: getMockValueFrameArray(20, 4.3),
+                entities: {},
+              },
+            ],
+            length: 43,
+          },
+        ],
+      },
+    },
+
+    getSeriesWithGapAtEnd: (countOfSeries = 2) => {
+      const templateClone = clone(twoRequestsOneCachedMissingData);
+      for (let i = 0; i < countOfSeries - 1; i++) {
+        templateClone.first.dataFrames[i].fields[0].values = timeFrameWithMissingValuesAtEnd;
+      }
+      return templateClone;
+    },
+
+    getSeriesWithGapAtStart: (countOfSeries = 2) => {
+      const templateClone = clone(twoRequestsOneCachedMissingData);
+      for (let i = 0; i < countOfSeries - 1; i++) {
+        templateClone.first.dataFrames[i].fields[0].values = timeFrameWithMissingValuesAtStart;
+      }
+      return templateClone;
+    },
+
+    getSeriesWithGapInMiddle: (countOfSeries = 2) => {
+      const templateClone = clone(twoRequestsOneCachedMissingData);
+      for (let i = 0; i < countOfSeries - 1; i++) {
+        templateClone.first.dataFrames[i].fields[0].values = timeFrameWithMissingValuesInMiddle;
+      }
+      return templateClone;
+    },
+  },
+};
diff --git a/packages/grafana-prometheus/src/result_transformer.test.ts b/packages/grafana-prometheus/src/result_transformer.test.ts
new file mode 100644
index 0000000000000..bc2f251767f2c
--- /dev/null
+++ b/packages/grafana-prometheus/src/result_transformer.test.ts
@@ -0,0 +1,1164 @@
+import {
+  cacheFieldDisplayNames,
+  createDataFrame,
+  FieldType,
+  type DataQueryRequest,
+  type DataQueryResponse,
+  type PreferredVisualisationType,
+} from '@grafana/data';
+
+import {
+  parseSampleValue,
+  sortSeriesByLabel,
+  transformDFToTable,
+  transformToHistogramOverTime,
+  transformV2,
+} from './result_transformer';
+import { PromQuery } from './types';
+
+jest.mock('@grafana/runtime', () => ({
+  getTemplateSrv: () => ({
+    replace: (str: string) => str,
+  }),
+  getDataSourceSrv: () => {
+    return {
+      getInstanceSettings: (uid: string) => {
+        const uids = ['Tempo', 'jaeger'];
+        return uids.find((u) => u === uid) ? { name: uid } : undefined;
+      },
+    };
+  },
+  config: {
+    featureToggles: {
+      prometheusDataplane: true,
+    },
+  },
+}));
+
+describe('Prometheus Result Transformer', () => {
+  describe('parse variants of "+Inf" and "-Inf" strings', () => {
+    it('+Inf', () => {
+      expect(parseSampleValue('+Inf')).toEqual(Number.POSITIVE_INFINITY);
+    });
+    it('Inf', () => {
+      expect(parseSampleValue('Inf')).toEqual(Number.POSITIVE_INFINITY);
+    });
+    it('inf', () => {
+      expect(parseSampleValue('inf')).toEqual(Number.POSITIVE_INFINITY);
+    });
+    it('+Infinity', () => {
+      expect(parseSampleValue('+Infinity')).toEqual(Number.POSITIVE_INFINITY);
+    });
+    it('+infinity', () => {
+      expect(parseSampleValue('+infinity')).toEqual(Number.POSITIVE_INFINITY);
+    });
+    it('infinity', () => {
+      expect(parseSampleValue('infinity')).toEqual(Number.POSITIVE_INFINITY);
+    });
+
+    it('-Inf', () => {
+      expect(parseSampleValue('-Inf')).toEqual(Number.NEGATIVE_INFINITY);
+    });
+
+    it('-inf', () => {
+      expect(parseSampleValue('-inf')).toEqual(Number.NEGATIVE_INFINITY);
+    });
+
+    it('-Infinity', () => {
+      expect(parseSampleValue('-Infinity')).toEqual(Number.NEGATIVE_INFINITY);
+    });
+
+    it('-infinity', () => {
+      expect(parseSampleValue('-infinity')).toEqual(Number.NEGATIVE_INFINITY);
+    });
+  });
+
+  describe('sortSeriesByLabel() should use frame.fields[1].state?.displayName when available', () => {
+    let frames = [
+      createDataFrame({
+        refId: 'A',
+        fields: [
+          { name: 'Time', type: FieldType.time, values: [1, 2, 3] },
+          {
+            type: FieldType.number,
+            values: [4, 5, 6],
+            config: {
+              displayNameFromDS: '2',
+            },
+            labels: {
+              offset_days: '2',
+            },
+          },
+        ],
+      }),
+      createDataFrame({
+        refId: 'A',
+        fields: [
+          { name: 'Time', type: FieldType.time, values: [1, 2, 3] },
+          {
+            type: FieldType.number,
+            values: [7, 8, 9],
+            config: {
+              displayNameFromDS: '1',
+            },
+            labels: {
+              offset_days: '1',
+            },
+          },
+        ],
+      }),
+    ];
+
+    it('sorts by displayNameFromDS', () => {
+      cacheFieldDisplayNames(frames);
+
+      let sorted = frames.slice().sort(sortSeriesByLabel);
+
+      expect(sorted[0]).toEqual(frames[1]);
+      expect(sorted[1]).toEqual(frames[0]);
+    });
+  });
+
+  describe('transformV2', () => {
+    it('results with time_series format should be enriched with preferredVisualisationType', () => {
+      const request = {
+        targets: [
+          {
+            format: 'time_series',
+            refId: 'A',
+          },
+        ],
+      } as unknown as DataQueryRequest<PromQuery>;
+      const response = {
+        state: 'Done',
+        data: [
+          {
+            fields: [],
+            length: 2,
+            name: 'ALERTS',
+            refId: 'A',
+          },
+        ],
+      } as unknown as DataQueryResponse;
+      const series = transformV2(response, request, {});
+      expect(series).toEqual({
+        data: [{ fields: [], length: 2, meta: { preferredVisualisationType: 'graph' }, name: 'ALERTS', refId: 'A' }],
+        state: 'Done',
+      });
+    });
+
+    it('dataplane handling, adds displayNameFromDs from calculateFieldDisplayName() when __name__ is the field name when legendFormat is auto', () => {
+      const request = {
+        targets: [
+          {
+            format: 'time_series',
+            refId: 'A',
+            legendFormat: '__auto',
+          },
+        ],
+      } as unknown as DataQueryRequest<PromQuery>;
+      const response = {
+        state: 'Done',
+        data: [
+          {
+            fields: [
+              {
+                name: 'Time',
+                type: 'time',
+                values: [1],
+                typeInfo: { frame: 'time.Time' },
+              },
+              {
+                name: 'up',
+                labels: { __name__: 'up' },
+                config: {},
+                values: [1],
+              },
+            ],
+            length: 1,
+            refId: 'A',
+            meta: {
+              type: 'timeseries-multi',
+              typeVersion: [0, 1],
+            },
+          },
+        ],
+      } as unknown as DataQueryResponse;
+      const series = transformV2(response, request, {});
+      expect(series).toEqual({
+        data: [
+          {
+            fields: [
+              {
+                name: 'Time',
+                type: 'time',
+                values: [1],
+                typeInfo: { frame: 'time.Time' },
+              },
+              {
+                config: { displayNameFromDS: 'up' },
+                labels: { __name__: 'up' },
+                name: 'up',
+                values: [1],
+              },
+            ],
+            length: 1,
+            meta: {
+              type: 'timeseries-multi',
+              typeVersion: [0, 1],
+              preferredVisualisationType: 'graph',
+            },
+            refId: 'A',
+          },
+        ],
+        state: 'Done',
+      });
+    });
+
+    it('results with table format should be transformed to table dataFrames', () => {
+      const request = {
+        targets: [
+          {
+            format: 'table',
+            refId: 'A',
+          },
+        ],
+      } as unknown as DataQueryRequest<PromQuery>;
+      const response = {
+        state: 'Done',
+        data: [
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'value',
+                type: FieldType.number,
+                values: [6, 5, 4],
+                labels: { label1: 'value1', label2: 'value2' },
+              },
+            ],
+          }),
+        ],
+      } as unknown as DataQueryResponse;
+      const series = transformV2(response, request, {});
+
+      expect(series.data[0].fields[0].name).toEqual('Time');
+      expect(series.data[0].fields[1].name).toEqual('label1');
+      expect(series.data[0].fields[2].name).toEqual('label2');
+      expect(series.data[0].fields[3].name).toEqual('Value');
+      expect(series.data[0].meta?.preferredVisualisationType).toEqual('rawPrometheus');
+    });
+
+    it('results with table format and multiple data frames should be transformed to 1 table dataFrame', () => {
+      const request = {
+        targets: [
+          {
+            format: 'table',
+            refId: 'A',
+          },
+        ],
+      } as unknown as DataQueryRequest<PromQuery>;
+      const response = {
+        state: 'Done',
+        data: [
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'value',
+                type: FieldType.number,
+                values: [6, 5, 4],
+                labels: { label1: 'value1', label2: 'value2' },
+              },
+            ],
+          }),
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'time', type: FieldType.time, values: [2, 3, 7] },
+              {
+                name: 'value',
+                type: FieldType.number,
+                values: [2, 3, 7],
+                labels: { label3: 'value3', label4: 'value4' },
+              },
+            ],
+          }),
+        ],
+      } as unknown as DataQueryResponse;
+      const series = transformV2(response, request, {});
+
+      expect(series.data.length).toEqual(1);
+      expect(series.data[0].fields[0].name).toEqual('Time');
+      expect(series.data[0].fields[1].name).toEqual('label1');
+      expect(series.data[0].fields[2].name).toEqual('label2');
+      expect(series.data[0].fields[3].name).toEqual('label3');
+      expect(series.data[0].fields[4].name).toEqual('label4');
+      expect(series.data[0].fields[5].name).toEqual('Value');
+      expect(series.data[0].meta?.preferredVisualisationType).toEqual('rawPrometheus' as PreferredVisualisationType);
+    });
+
+    it('results with table and time_series format should be correctly transformed', () => {
+      const options = {
+        targets: [
+          {
+            format: 'table',
+            refId: 'A',
+          },
+          {
+            format: 'time_series',
+            refId: 'B',
+          },
+        ],
+      } as unknown as DataQueryRequest<PromQuery>;
+      const response = {
+        state: 'Done',
+        data: [
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'value',
+                type: FieldType.number,
+                values: [6, 5, 4],
+                labels: { label1: 'value1', label2: 'value2' },
+              },
+            ],
+          }),
+          createDataFrame({
+            refId: 'B',
+            fields: [
+              { name: 'time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'value',
+                type: FieldType.number,
+                values: [6, 5, 4],
+                labels: { label1: 'value1', label2: 'value2' },
+              },
+            ],
+          }),
+        ],
+      } as unknown as DataQueryResponse;
+      const series = transformV2(response, options, {});
+      expect(series.data[0].fields.length).toEqual(2);
+      expect(series.data[0].meta?.preferredVisualisationType).toEqual('graph');
+      expect(series.data[1].fields.length).toEqual(4);
+      expect(series.data[1].meta?.preferredVisualisationType).toEqual('rawPrometheus' as PreferredVisualisationType);
+    });
+
+    // Heatmap frames can either have a name of the metric, or if there is no metric, a name of "Value"
+    it('results with heatmap format (no metric name) should be correctly transformed', () => {
+      const options = {
+        targets: [
+          {
+            format: 'heatmap',
+            refId: 'A',
+          },
+        ],
+      } as unknown as DataQueryRequest<PromQuery>;
+      const response = {
+        state: 'Done',
+        data: [
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'Value',
+                type: FieldType.number,
+                values: [10, 10, 0],
+                labels: { le: '1' },
+              },
+            ],
+          }),
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'Value',
+                type: FieldType.number,
+                values: [30, 10, 40],
+                labels: { le: '+Inf' },
+              },
+            ],
+          }),
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'Value',
+                type: FieldType.number,
+                values: [20, 10, 30],
+                labels: { le: '2' },
+              },
+            ],
+          }),
+        ],
+      } as unknown as DataQueryResponse;
+
+      const series = transformV2(response, options, {});
+      expect(series.data[0].fields.length).toEqual(4);
+      expect(series.data[0].fields[1].values).toEqual([10, 10, 0]);
+      expect(series.data[0].fields[2].values).toEqual([10, 0, 30]);
+      expect(series.data[0].fields[3].values).toEqual([10, 0, 10]);
+      expect(series.data[0].fields[1].name).toEqual('1');
+      expect(series.data[0].fields[2].name).toEqual('2');
+      expect(series.data[0].fields[3].name).toEqual('+Inf');
+    });
+
+    it('results with heatmap format (with metric name) should be correctly transformed', () => {
+      const options = {
+        targets: [
+          {
+            format: 'heatmap',
+            refId: 'A',
+          },
+        ],
+      } as unknown as DataQueryRequest<PromQuery>;
+      const response = {
+        state: 'Done',
+        data: [
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'metric_name',
+                type: FieldType.number,
+                values: [10, 10, 0],
+                labels: { le: '1', __name__: 'metric_name' },
+              },
+            ],
+          }),
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'metric_name',
+                type: FieldType.number,
+                values: [30, 10, 40],
+                labels: { le: '+Inf', __name__: 'metric_name' },
+              },
+            ],
+          }),
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'metric_name',
+                type: FieldType.number,
+                values: [20, 10, 30],
+                labels: { le: '2', __name__: 'metric_name' },
+              },
+            ],
+          }),
+        ],
+      } as unknown as DataQueryResponse;
+
+      const series = transformV2(response, options, {});
+      expect(series.data[0].fields.length).toEqual(4);
+      expect(series.data[0].fields[1].values).toEqual([10, 10, 0]);
+      expect(series.data[0].fields[2].values).toEqual([10, 0, 30]);
+      expect(series.data[0].fields[3].values).toEqual([10, 0, 10]);
+      expect(series.data[0].fields[1].name).toEqual('1');
+      expect(series.data[0].fields[2].name).toEqual('2');
+      expect(series.data[0].fields[3].name).toEqual('+Inf');
+    });
+
+    it('results with heatmap format (no metric name) from multiple queries should be correctly transformed', () => {
+      const options = {
+        targets: [
+          {
+            format: 'heatmap',
+            refId: 'A',
+          },
+          {
+            format: 'heatmap',
+            refId: 'B',
+          },
+        ],
+      } as unknown as DataQueryRequest<PromQuery>;
+      const response = {
+        state: 'Done',
+        data: [
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'Value',
+                type: FieldType.number,
+                values: [10, 10, 0],
+                labels: { le: '1' },
+              },
+            ],
+          }),
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'Value',
+                type: FieldType.number,
+                values: [20, 10, 30],
+                labels: { le: '2' },
+              },
+            ],
+          }),
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'Value',
+                type: FieldType.number,
+                values: [30, 10, 40],
+                labels: { le: '+Inf' },
+              },
+            ],
+          }),
+          createDataFrame({
+            refId: 'B',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'Value',
+                type: FieldType.number,
+                values: [10, 10, 0],
+                labels: { le: '1' },
+              },
+            ],
+          }),
+          createDataFrame({
+            refId: 'B',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'Value',
+                type: FieldType.number,
+                values: [20, 10, 30],
+                labels: { le: '2' },
+              },
+            ],
+          }),
+          createDataFrame({
+            refId: 'B',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'Value',
+                type: FieldType.number,
+                values: [30, 10, 40],
+                labels: { le: '+Inf' },
+              },
+            ],
+          }),
+        ],
+      } as unknown as DataQueryResponse;
+
+      const series = transformV2(response, options, {});
+      expect(series.data[0].fields.length).toEqual(4);
+      expect(series.data[0].fields[1].values).toEqual([10, 10, 0]);
+      expect(series.data[0].fields[2].values).toEqual([10, 0, 30]);
+      expect(series.data[0].fields[3].values).toEqual([10, 0, 10]);
+    });
+    it('results with heatmap format (with metric name) from multiple queries should be correctly transformed', () => {
+      const options = {
+        targets: [
+          {
+            format: 'heatmap',
+            refId: 'A',
+          },
+          {
+            format: 'heatmap',
+            refId: 'B',
+          },
+        ],
+      } as unknown as DataQueryRequest<PromQuery>;
+      const response = {
+        state: 'Done',
+        data: [
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'metric_name',
+                type: FieldType.number,
+                values: [10, 10, 0],
+                labels: { le: '1', __name__: 'metric_name' },
+              },
+            ],
+          }),
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'metric_name',
+                type: FieldType.number,
+                values: [20, 10, 30],
+                labels: { le: '2', __name__: 'metric_name' },
+              },
+            ],
+          }),
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'metric_name',
+                type: FieldType.number,
+                values: [30, 10, 40],
+                labels: { le: '+Inf', __name__: 'metric_name' },
+              },
+            ],
+          }),
+          createDataFrame({
+            refId: 'B',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'metric_name',
+                type: FieldType.number,
+                values: [10, 10, 0],
+                labels: { le: '1', __name__: 'metric_name' },
+              },
+            ],
+          }),
+          createDataFrame({
+            refId: 'B',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'metric_name',
+                type: FieldType.number,
+                values: [20, 10, 30],
+                labels: { le: '2', __name__: 'metric_name' },
+              },
+            ],
+          }),
+          createDataFrame({
+            refId: 'B',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'metric_name',
+                type: FieldType.number,
+                values: [30, 10, 40],
+                labels: { le: '+Inf', __name__: 'metric_name' },
+              },
+            ],
+          }),
+        ],
+      } as unknown as DataQueryResponse;
+
+      const series = transformV2(response, options, {});
+      expect(series.data[0].fields.length).toEqual(4);
+      expect(series.data[0].fields[1].values).toEqual([10, 10, 0]);
+      expect(series.data[0].fields[2].values).toEqual([10, 0, 30]);
+      expect(series.data[0].fields[3].values).toEqual([10, 0, 10]);
+    });
+
+    it('results with heatmap format and multiple histograms should be grouped and de-accumulated by non-le labels', () => {
+      const options = {
+        targets: [
+          {
+            format: 'heatmap',
+            refId: 'A',
+          },
+        ],
+      } as unknown as DataQueryRequest<PromQuery>;
+      const response = {
+        state: 'Done',
+        data: [
+          // 10
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'Value',
+                type: FieldType.number,
+                values: [10, 10, 0],
+                labels: { le: '1', additionalProperty: '10' },
+              },
+            ],
+          }),
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'Value',
+                type: FieldType.number,
+                values: [20, 10, 30],
+                labels: { le: '2', additionalProperty: '10' },
+              },
+            ],
+          }),
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'Value',
+                type: FieldType.number,
+                values: [30, 10, 40],
+                labels: { le: '+Inf', additionalProperty: '10' },
+              },
+            ],
+          }),
+          // 20
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'Value',
+                type: FieldType.number,
+                values: [0, 10, 10],
+                labels: { le: '1', additionalProperty: '20' },
+              },
+            ],
+          }),
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'Value',
+                type: FieldType.number,
+                values: [20, 10, 40],
+                labels: { le: '2', additionalProperty: '20' },
+              },
+            ],
+          }),
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'Value',
+                type: FieldType.number,
+                values: [30, 10, 60],
+                labels: { le: '+Inf', additionalProperty: '20' },
+              },
+            ],
+          }),
+          // 30
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'Value',
+                type: FieldType.number,
+                values: [30, 30, 60],
+                labels: { le: '1', additionalProperty: '30' },
+              },
+            ],
+          }),
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'Value',
+                type: FieldType.number,
+                values: [30, 40, 60],
+                labels: { le: '2', additionalProperty: '30' },
+              },
+            ],
+          }),
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'Value',
+                type: FieldType.number,
+                values: [40, 40, 60],
+                labels: { le: '+Inf', additionalProperty: '30' },
+              },
+            ],
+          }),
+        ],
+      } as unknown as DataQueryResponse;
+
+      const series = transformV2(response, options, {});
+      expect(series.data[0].fields.length).toEqual(4);
+      expect(series.data[0].fields[1].values).toEqual([10, 10, 0]);
+      expect(series.data[0].fields[2].values).toEqual([10, 0, 30]);
+      expect(series.data[0].fields[3].values).toEqual([10, 0, 10]);
+
+      expect(series.data[1].fields[1].values).toEqual([0, 10, 10]);
+      expect(series.data[1].fields[2].values).toEqual([20, 0, 30]);
+      expect(series.data[1].fields[3].values).toEqual([10, 0, 20]);
+
+      expect(series.data[2].fields[1].values).toEqual([30, 30, 60]);
+      expect(series.data[2].fields[2].values).toEqual([0, 10, 0]);
+      expect(series.data[2].fields[3].values).toEqual([10, 0, 0]);
+    });
+
+    it('Retains exemplar frames when data returned is a heatmap', () => {
+      const options = {
+        targets: [
+          {
+            format: 'heatmap',
+            refId: 'A',
+          },
+        ],
+      } as unknown as DataQueryRequest<PromQuery>;
+      const response = {
+        state: 'Done',
+        data: [
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'Value',
+                type: FieldType.number,
+                values: [10, 10, 0],
+                labels: { le: '1' },
+              },
+            ],
+          }),
+          createDataFrame({
+            refId: 'A',
+            name: 'exemplar',
+            meta: {
+              custom: {
+                resultType: 'exemplar',
+              },
+            },
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4, 3, 2, 1] },
+              {
+                name: 'Value',
+                type: FieldType.number,
+                values: [30, 10, 40, 90, 14, 21],
+                labels: { le: '6' },
+              },
+              {
+                name: 'Test',
+                type: FieldType.string,
+                values: ['hello', 'doctor', 'name', 'continue', 'yesterday', 'tomorrow'],
+                labels: { le: '6' },
+              },
+            ],
+          }),
+        ],
+      } as unknown as DataQueryResponse;
+
+      const series = transformV2(response, options, {});
+      expect(series.data[0].fields.length).toEqual(2);
+      expect(series.data.length).toEqual(2);
+      expect(series.data[1].fields[2].values).toEqual(['hello', 'doctor', 'name', 'continue', 'yesterday', 'tomorrow']);
+      expect(series.data[1].fields.length).toEqual(3);
+    });
+
+    it('should not add a link with an error when exemplarTraceIdDestinations is not configured properly', () => {
+      const response = {
+        state: 'Done',
+        data: [
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              {
+                name: 'Value',
+                type: FieldType.number,
+                values: [10, 10, 0],
+                labels: { le: '1' },
+              },
+            ],
+          }),
+          createDataFrame({
+            refId: 'A',
+            name: 'exemplar',
+            meta: {
+              custom: {
+                resultType: 'exemplar',
+              },
+            },
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4, 3, 2, 1] },
+              {
+                name: 'Value',
+                type: FieldType.number,
+                values: [30, 10, 40, 90, 14, 21],
+                labels: { le: '6' },
+              },
+              {
+                name: 'traceID',
+                type: FieldType.string,
+                values: ['unknown'],
+                labels: { le: '6' },
+              },
+            ],
+          }),
+        ],
+      } as unknown as DataQueryResponse;
+      const request = {
+        targets: [
+          {
+            format: 'heatmap',
+            refId: 'A',
+          },
+        ],
+      } as unknown as DataQueryRequest<PromQuery>;
+      const testOptions = {
+        exemplarTraceIdDestinations: [
+          {
+            name: 'traceID',
+            datasourceUid: 'unknown',
+          },
+        ],
+      };
+
+      const series = transformV2(response, request, testOptions);
+      expect(series.data[1].fields.length).toEqual(3);
+      expect(series.data[1].name).toEqual('exemplar');
+      const traceField = series.data[1].fields.find((f) => f.name === 'traceID');
+      expect(traceField).toBeDefined();
+      expect(traceField!.config.links?.length).toBe(0);
+    });
+
+    it('should convert values less than 1e-9 to 0', () => {
+      // pulled from real response
+      const bucketValues = [
+        [0.22222222222222218, 0.24444444444444444, 0.19999999999999996], // le=0.005
+        [0.39999999999999997, 0.44444444444444436, 0.42222222222222217],
+        [0.3999999999999999, 0.44444444444444436, 0.42222222222222217],
+        [0.3999999999999999, 0.44444444444444436, 0.42222222222222217],
+        [0.3999999999999999, 0.44444444444444436, 0.42222222222222217],
+        [0.3999999999999999, 0.44444444444444436, 0.42222222222222217],
+        [0.39999999999999997, 0.44444444444444436, 0.42222222222222217],
+        [0.39999999999999997, 0.44444444444444436, 0.42222222222222217],
+        [0.3999999999999999, 0.44444444444444436, 0.42222222222222217],
+        [0.3999999999999999, 0.44444444444444436, 0.42222222222222217],
+        [0.3999999999999999, 0.44444444444444436, 0.42222222222222217],
+        [0.4666666666666666, 0.5111111111111111, 0.4888888888888888],
+        [0.4666666666666666, 0.5111111111111111, 0.4888888888888888],
+        [0.46666666666666656, 0.5111111111111111, 0.4888888888888888],
+        [0.46666666666666656, 0.5111111111111111, 0.4888888888888888], // le=+Inf
+      ];
+
+      const frames = bucketValues.map((vals) =>
+        createDataFrame({
+          refId: 'A',
+          fields: [
+            { type: FieldType.time, values: [1, 2, 3] },
+            {
+              type: FieldType.number,
+              values: vals.slice(),
+            },
+          ],
+        })
+      );
+
+      const fieldValues = transformToHistogramOverTime(frames).map((frame) => frame.fields[1].values);
+
+      expect(fieldValues).toEqual([
+        [0.22222222222222218, 0.24444444444444444, 0.19999999999999996],
+        [0.17777777777777778, 0.19999999999999993, 0.2222222222222222],
+        [0, 0, 0],
+        [0, 0, 0],
+        [0, 0, 0],
+        [0, 0, 0],
+        [0, 0, 0],
+        [0, 0, 0],
+        [0, 0, 0],
+        [0, 0, 0],
+        [0, 0, 0],
+        [0.06666666666666671, 0.06666666666666671, 0.06666666666666665],
+        [0, 0, 0],
+        [0, 0, 0],
+        [0, 0, 0],
+      ]);
+    });
+
+    it('should throw an error if the series does not contain number-type values', () => {
+      const response = {
+        state: 'Done',
+        data: [
+          ['10', '10', '0'],
+          ['20', '10', '30'],
+          ['20', '10', '35'],
+        ].map((values) =>
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              { name: 'Value', type: FieldType.string, values },
+            ],
+          })
+        ),
+      } as unknown as DataQueryResponse;
+      const request = {
+        targets: [
+          {
+            format: 'heatmap',
+            refId: 'A',
+          },
+        ],
+      } as unknown as DataQueryRequest<PromQuery>;
+
+      expect(() => transformV2(response, request, {})).toThrow();
+    });
+  });
+
+  describe('transformDFToTable', () => {
+    it('transforms dataFrame with response length 1 to table dataFrame', () => {
+      const df = createDataFrame({
+        refId: 'A',
+        fields: [
+          { name: 'time', type: FieldType.time, values: [6, 5, 4] },
+          {
+            name: 'value',
+            type: FieldType.number,
+            values: [6, 5, 4],
+            labels: { label1: 'value1', label2: 'value2' },
+          },
+        ],
+      });
+
+      const tableDf = transformDFToTable([df])[0];
+      expect(tableDf.fields.length).toBe(4);
+      expect(tableDf.fields[0].name).toBe('Time');
+      expect(tableDf.fields[1].name).toBe('label1');
+      expect(tableDf.fields[1].values[0]).toBe('value1');
+      expect(tableDf.fields[2].name).toBe('label2');
+      expect(tableDf.fields[2].values[0]).toBe('value2');
+      expect(tableDf.fields[3].name).toBe('Value');
+    });
+
+    it('transforms dataFrame with response length 2 to table dataFrame', () => {
+      const df = createDataFrame({
+        refId: 'A',
+        fields: [
+          { name: 'time', type: FieldType.time, values: [6, 5, 4] },
+          {
+            name: 'value',
+            type: FieldType.number,
+            values: [6, 5, 4],
+            labels: { label1: 'value1', label2: 'value2' },
+          },
+        ],
+      });
+
+      const tableDf = transformDFToTable([df])[0];
+      expect(tableDf.fields.length).toBe(4);
+      expect(tableDf.fields[0].name).toBe('Time');
+      expect(tableDf.fields[1].name).toBe('label1');
+      expect(tableDf.fields[1].values[0]).toBe('value1');
+      expect(tableDf.fields[2].name).toBe('label2');
+      expect(tableDf.fields[2].values[0]).toBe('value2');
+      expect(tableDf.fields[3].name).toBe('Value');
+    });
+
+    // Queries do not always return results
+    it('transforms dataFrame and empty dataFrame mock responses to table dataFrames', () => {
+      const value1 = 'value1';
+      const value2 = 'value2';
+
+      const dataframes = [
+        createDataFrame({
+          refId: 'A',
+          fields: [
+            { name: 'time', type: FieldType.time, values: [6, 5, 4] },
+            {
+              name: 'value',
+              type: FieldType.number,
+              values: [6, 5, 4],
+              labels: { label1: value1, label2: value2 },
+            },
+          ],
+        }),
+        createDataFrame({
+          refId: 'B',
+          fields: [],
+        }),
+      ];
+
+      const transformedTableDataFrames = transformDFToTable(dataframes);
+      // Expect the first query to still return valid results
+      expect(transformedTableDataFrames[0].fields.length).toBe(4);
+      expect(transformedTableDataFrames[0].fields[0].name).toBe('Time');
+      expect(transformedTableDataFrames[0].fields[1].name).toBe('label1');
+      expect(transformedTableDataFrames[0].fields[1].values[0]).toBe(value1);
+      expect(transformedTableDataFrames[0].fields[2].name).toBe('label2');
+      expect(transformedTableDataFrames[0].fields[2].values[0]).toBe(value2);
+      expect(transformedTableDataFrames[0].fields[3].name).toBe('Value #A');
+
+      // Expect the invalid/empty results not to throw an error and to return empty arrays
+      expect(transformedTableDataFrames[1].fields[1].labels).toBe(undefined);
+      expect(transformedTableDataFrames[1].fields[1].name).toBe('Value #B');
+      expect(transformedTableDataFrames[1].fields[1].values).toEqual([]);
+      expect(transformedTableDataFrames[1].fields[0].values).toEqual([]);
+    });
+
+    it('transforms dataframes with metadata resolving from their refIds', () => {
+      const value1 = 'value1';
+      const value2 = 'value2';
+      const executedQueryForRefA = 'Expr: avg_over_time(access_evaluation_duration_bucket[15s])\nStep: 15s';
+      const executedQueryForRefB = 'Expr: avg_over_time(access_evaluation_duration_bucket[5m])\nStep: 15s';
+
+      const dataframes = [
+        createDataFrame({
+          refId: 'A',
+          meta: {
+            typeVersion: [0, 1],
+            custom: {
+              resultType: 'vector',
+            },
+            executedQueryString: executedQueryForRefA,
+          },
+          fields: [
+            { name: 'time', type: FieldType.time, values: [6, 5, 4] },
+            {
+              name: 'value',
+              type: FieldType.number,
+              values: [6, 5, 4],
+              labels: { label1: value1, label2: value2 },
+            },
+          ],
+        }),
+        createDataFrame({
+          refId: 'B',
+          meta: {
+            typeVersion: [0, 1],
+            custom: {
+              resultType: 'vector',
+            },
+            executedQueryString: executedQueryForRefB,
+          },
+          fields: [
+            { name: 'time', type: FieldType.time, values: [6, 5, 4] },
+            {
+              name: 'value',
+              type: FieldType.number,
+              values: [6, 5, 4],
+              labels: { label1: value1, label2: value2 },
+            },
+          ],
+        }),
+      ];
+
+      const transformedTableDataFrames = transformDFToTable(dataframes);
+      expect(transformedTableDataFrames[0].meta).toBeTruthy();
+      expect(transformedTableDataFrames[1].meta).toBeTruthy();
+      expect(transformedTableDataFrames[0].meta?.executedQueryString).toEqual(executedQueryForRefA);
+      expect(transformedTableDataFrames[1].meta?.executedQueryString).toEqual(executedQueryForRefB);
+    });
+  });
+});
diff --git a/packages/grafana-prometheus/src/result_transformer.ts b/packages/grafana-prometheus/src/result_transformer.ts
new file mode 100644
index 0000000000000..ac93f7955a840
--- /dev/null
+++ b/packages/grafana-prometheus/src/result_transformer.ts
@@ -0,0 +1,423 @@
+import { flatten, forOwn, groupBy, partition } from 'lodash';
+
+import {
+  CoreApp,
+  DataFrame,
+  DataFrameType,
+  DataLink,
+  DataQueryRequest,
+  DataQueryResponse,
+  DataTopic,
+  Field,
+  FieldType,
+  getDisplayProcessor,
+  getFieldDisplayName,
+  Labels,
+  TIME_SERIES_TIME_FIELD_NAME,
+  TIME_SERIES_VALUE_FIELD_NAME,
+} from '@grafana/data';
+import { config, getDataSourceSrv } from '@grafana/runtime';
+
+import { ExemplarTraceIdDestination, PromMetric, PromQuery, PromValue } from './types';
+
+// handles case-insensitive Inf, +Inf, -Inf (with optional "inity" suffix)
+const INFINITY_SAMPLE_REGEX = /^[+-]?inf(?:inity)?$/i;
+
+const isTableResult = (dataFrame: DataFrame, options: DataQueryRequest<PromQuery>): boolean => {
+  // We want to process vector and scalar results in Explore as table
+  if (
+    options.app === CoreApp.Explore &&
+    (dataFrame.meta?.custom?.resultType === 'vector' || dataFrame.meta?.custom?.resultType === 'scalar')
+  ) {
+    return true;
+  }
+
+  // We want to process all dataFrames with target.format === 'table' as table
+  const target = options.targets.find((target) => target.refId === dataFrame.refId);
+  return target?.format === 'table';
+};
+
+const isCumulativeHeatmapResult = (dataFrame: DataFrame, options: DataQueryRequest<PromQuery>): boolean => {
+  if (dataFrame.meta?.type === DataFrameType.HeatmapCells) {
+    return false;
+  }
+
+  const target = options.targets.find((target) => target.refId === dataFrame.refId);
+  return target?.format === 'heatmap';
+};
+
+// V2 result transformer used to transform query results from queries that were run through prometheus backend
+export function transformV2(
+  response: DataQueryResponse,
+  request: DataQueryRequest<PromQuery>,
+  options: { exemplarTraceIdDestinations?: ExemplarTraceIdDestination[] }
+) {
+  // migration for dataplane field name issue
+  if (config.featureToggles.prometheusDataplane) {
+    // update displayNameFromDS in the field config
+    response.data.forEach((f: DataFrame) => {
+      const target = request.targets.find((t) => t.refId === f.refId);
+      // check that the legend is selected as auto
+      if (target && target.legendFormat === '__auto') {
+        f.fields.forEach((field) => {
+          if (field.labels?.__name__ && field.labels?.__name__ === field.name) {
+            const fieldCopy = { ...field, name: TIME_SERIES_VALUE_FIELD_NAME };
+            field.config.displayNameFromDS = getFieldDisplayName(fieldCopy, f, response.data);
+          }
+        });
+      }
+    });
+  }
+
+  const [tableFrames, framesWithoutTable] = partition<DataFrame>(response.data, (df) => isTableResult(df, request));
+  const processedTableFrames = transformDFToTable(tableFrames);
+
+  const [exemplarFrames, framesWithoutTableAndExemplars] = partition<DataFrame>(
+    framesWithoutTable,
+    (df) => df.meta?.custom?.resultType === 'exemplar'
+  );
+
+  // EXEMPLAR FRAMES: We enrich exemplar frames with data links and add dataTopic meta info
+  const { exemplarTraceIdDestinations: destinations } = options;
+  const processedExemplarFrames = exemplarFrames.map((dataFrame) => {
+    if (destinations?.length) {
+      for (const exemplarTraceIdDestination of destinations) {
+        const traceIDField = dataFrame.fields.find((field) => field.name === exemplarTraceIdDestination.name);
+        if (traceIDField) {
+          const links = getDataLinks(exemplarTraceIdDestination);
+          traceIDField.config.links = traceIDField.config.links?.length
+            ? [...traceIDField.config.links, ...links]
+            : links;
+        }
+      }
+    }
+
+    return { ...dataFrame, meta: { ...dataFrame.meta, dataTopic: DataTopic.Annotations } };
+  });
+
+  const [heatmapResults, framesWithoutTableHeatmapsAndExemplars] = partition<DataFrame>(
+    framesWithoutTableAndExemplars,
+    (df) => isCumulativeHeatmapResult(df, request)
+  );
+
+  // this works around the fact that we only get back frame.name with le buckets when legendFormat == {{le}}...which is not the default
+  heatmapResults.forEach((df) => {
+    if (df.name == null) {
+      let f = df.fields.find((f) => f.type === FieldType.number);
+
+      if (f) {
+        let le = f.labels?.le;
+
+        if (le) {
+          // this is used for sorting the frames by numeric ascending le labels for de-accum
+          df.name = le;
+          // this is used for renaming the Value fields to le label
+          f.config.displayNameFromDS = le;
+        }
+      }
+    }
+  });
+
+  // Group heatmaps by query
+  const heatmapResultsGroupedByQuery = groupBy<DataFrame>(heatmapResults, (h) => h.refId);
+
+  // Initialize empty array to push grouped histogram frames to
+  let processedHeatmapResultsGroupedByQuery: DataFrame[][] = [];
+
+  // Iterate through every query in this heatmap
+  for (const query in heatmapResultsGroupedByQuery) {
+    // Get reference to dataFrames for heatmap
+    const heatmapResultsGroup = heatmapResultsGroupedByQuery[query];
+
+    // Create a new grouping by iterating through the data frames...
+    const heatmapResultsGroupedByValues = groupBy<DataFrame>(heatmapResultsGroup, (dataFrame) => {
+      // Each data frame has `Time` and `Value` properties, we want to get the values
+      const values = dataFrame.fields.find((field) => field.type === FieldType.number);
+      // Specific functionality for special "le" quantile heatmap value, we know if this value exists, that we do not want to calculate the heatmap density across data frames from the same quartile
+      if (values?.labels && HISTOGRAM_QUANTILE_LABEL_NAME in values.labels) {
+        const { le, ...notLE } = values?.labels;
+        return Object.values(notLE).join();
+      }
+
+      // Return a string made from the concatenation of this frame's values to represent a grouping in the query
+      return Object.values(values?.labels ?? []).join();
+    });
+
+    // Then iterate through the resultant object
+    forOwn(heatmapResultsGroupedByValues, (dataFrames, key) => {
+      // Sort frames within each grouping
+      const sortedHeatmap = dataFrames.sort(sortSeriesByLabel);
+      // And push the sorted grouping with the rest
+      processedHeatmapResultsGroupedByQuery.push(mergeHeatmapFrames(transformToHistogramOverTime(sortedHeatmap)));
+    });
+  }
+
+  // Everything else is processed as time_series result and graph preferredVisualisationType
+  const otherFrames = framesWithoutTableHeatmapsAndExemplars.map((dataFrame) => {
+    const df: DataFrame = {
+      ...dataFrame,
+      meta: {
+        ...dataFrame.meta,
+        preferredVisualisationType: 'graph',
+      },
+    };
+    return df;
+  });
+
+  const flattenedProcessedHeatmapFrames = flatten(processedHeatmapResultsGroupedByQuery);
+
+  return {
+    ...response,
+    data: [...otherFrames, ...processedTableFrames, ...flattenedProcessedHeatmapFrames, ...processedExemplarFrames],
+  };
+}
+
+const HISTOGRAM_QUANTILE_LABEL_NAME = 'le';
+
+export function transformDFToTable(dfs: DataFrame[]): DataFrame[] {
+  // If no dataFrames or if 1 dataFrames with no values, return original dataFrame
+  if (dfs.length === 0 || (dfs.length === 1 && dfs[0].length === 0)) {
+    return dfs;
+  }
+
+  // Group results by refId and process dataFrames with the same refId as 1 dataFrame
+  const dataFramesByRefId = groupBy(dfs, 'refId');
+  const refIds = Object.keys(dataFramesByRefId);
+
+  const frames = refIds.map((refId) => {
+    // Create timeField, valueField and labelFields
+    const valueText = getValueText(refIds.length, refId);
+    const valueField = getValueField({ data: [], valueName: valueText });
+    const timeField = getTimeField([]);
+    const labelFields: Field[] = [];
+
+    // Fill labelsFields with labels from dataFrames
+    dataFramesByRefId[refId].forEach((df) => {
+      const frameValueField = df.fields[1];
+      const promLabels = frameValueField?.labels ?? {};
+
+      Object.keys(promLabels)
+        .sort()
+        .forEach((label) => {
+          // If we don't have label in labelFields, add it
+          if (!labelFields.some((l) => l.name === label)) {
+            const numberField = label === HISTOGRAM_QUANTILE_LABEL_NAME;
+            labelFields.push({
+              name: label,
+              config: { filterable: true },
+              type: numberField ? FieldType.number : FieldType.string,
+              values: [],
+            });
+          }
+        });
+    });
+
+    // Fill valueField, timeField and labelFields with values
+    dataFramesByRefId[refId].forEach((df) => {
+      const timeFields = df.fields[0]?.values ?? [];
+      const dataFields = df.fields[1]?.values ?? [];
+      timeFields.forEach((value) => timeField.values.push(value));
+      dataFields.forEach((value) => {
+        valueField.values.push(parseSampleValue(value));
+        const labelsForField = df.fields[1].labels ?? {};
+        labelFields.forEach((field) => field.values.push(getLabelValue(labelsForField, field.name)));
+      });
+    });
+
+    const fields = [timeField, ...labelFields, valueField];
+    return {
+      refId,
+      fields,
+      // Prometheus specific UI for instant queries
+      meta: {
+        ...dataFramesByRefId[refId][0].meta,
+        preferredVisualisationType: 'rawPrometheus' as const,
+      },
+      length: timeField.values.length,
+    };
+  });
+  return frames;
+}
+
+function getValueText(responseLength: number, refId = '') {
+  return responseLength > 1 ? `Value #${refId}` : 'Value';
+}
+
+function getDataLinks(options: ExemplarTraceIdDestination): DataLink[] {
+  const dataLinks: DataLink[] = [];
+
+  if (options.datasourceUid) {
+    const dataSourceSrv = getDataSourceSrv();
+    const dsSettings = dataSourceSrv.getInstanceSettings(options.datasourceUid);
+
+    // dsSettings is undefined because of the reasons below:
+    // - permissions issues (probably most likely)
+    // - deleted datasource
+    // - misconfiguration
+    if (dsSettings) {
+      dataLinks.push({
+        title: options.urlDisplayLabel || `Query with ${dsSettings?.name}`,
+        url: '',
+        internal: {
+          query: { query: '${__value.raw}', queryType: 'traceql' },
+          datasourceUid: options.datasourceUid,
+          datasourceName: dsSettings?.name ?? 'Data source not found',
+        },
+      });
+    }
+  }
+
+  if (options.url) {
+    dataLinks.push({
+      title: options.urlDisplayLabel || `Go to ${options.url}`,
+      url: options.url,
+      targetBlank: true,
+    });
+  }
+  return dataLinks;
+}
+
+function getLabelValue(metric: PromMetric, label: string): string | number {
+  if (metric.hasOwnProperty(label)) {
+    if (label === HISTOGRAM_QUANTILE_LABEL_NAME) {
+      return parseSampleValue(metric[label]);
+    }
+    return metric[label];
+  }
+  return '';
+}
+
+function getTimeField(data: PromValue[], isMs = false): Field<number> {
+  return {
+    name: TIME_SERIES_TIME_FIELD_NAME,
+    type: FieldType.time,
+    config: {},
+    values: data.map((val) => (isMs ? val[0] : val[0] * 1000)),
+  };
+}
+
+type ValueFieldOptions = {
+  data: PromValue[];
+  valueName?: string;
+  parseValue?: boolean;
+  labels?: Labels;
+  displayNameFromDS?: string;
+};
+
+function getValueField({
+  data,
+  valueName = TIME_SERIES_VALUE_FIELD_NAME,
+  parseValue = true,
+  labels,
+  displayNameFromDS,
+}: ValueFieldOptions): Field {
+  return {
+    name: valueName,
+    type: FieldType.number,
+    display: getDisplayProcessor(),
+    config: {
+      displayNameFromDS,
+    },
+    labels,
+    values: data.map((val) => (parseValue ? parseSampleValue(val[1]) : val[1])),
+  };
+}
+
+export function getOriginalMetricName(labelData: { [key: string]: string }) {
+  const metricName = labelData.__name__ || '';
+  delete labelData.__name__;
+  const labelPart = Object.entries(labelData)
+    .map((label) => `${label[0]}="${label[1]}"`)
+    .join(',');
+  return `${metricName}{${labelPart}}`;
+}
+
+function mergeHeatmapFrames(frames: DataFrame[]): DataFrame[] {
+  if (frames.length === 0 || (frames.length === 1 && frames[0].length === 0)) {
+    return [];
+  }
+
+  const timeField = frames[0].fields.find((field) => field.type === FieldType.time)!;
+  const countFields = frames.map((frame) => {
+    let field = frame.fields.find((field) => field.type === FieldType.number)!;
+
+    return {
+      ...field,
+      name: field.config.displayNameFromDS!,
+    };
+  });
+
+  return [
+    {
+      ...frames[0],
+      meta: {
+        ...frames[0].meta,
+        type: DataFrameType.HeatmapRows,
+      },
+      fields: [timeField!, ...countFields],
+    },
+  ];
+}
+
+/** @internal */
+export function transformToHistogramOverTime(seriesList: DataFrame[]): DataFrame[] {
+  /*      t1 = timestamp1, t2 = timestamp2 etc.
+            t1  t2  t3          t1  t2  t3
+    le10    10  10  0     =>    10  10  0
+    le20    20  10  30    =>    10  0   30
+    le30    30  10  35    =>    10  0   5
+    */
+
+  for (let i = seriesList.length - 1; i > 0; i--) {
+    const topSeries = seriesList[i].fields.find((s) => s.type === FieldType.number);
+    const bottomSeries = seriesList[i - 1].fields.find((s) => s.type === FieldType.number);
+    if (!topSeries || !bottomSeries) {
+      throw new Error('Prometheus heatmap transform error: data should be a time series');
+    }
+
+    for (let j = 0; j < topSeries.values.length; j++) {
+      const bottomPoint = bottomSeries.values[j] || [0];
+      topSeries.values[j] -= bottomPoint;
+
+      if (topSeries.values[j] < 1e-9) {
+        topSeries.values[j] = 0;
+      }
+    }
+  }
+
+  return seriesList;
+}
+
+export function sortSeriesByLabel(s1: DataFrame, s2: DataFrame): number {
+  let le1, le2;
+
+  try {
+    // the state.displayName conditions are here because we also use this sorting util fn
+    // in panels where isHeatmapResult was false but we still want to sort numerically-named
+    // fields after the full unique displayName is cached in field state
+    le1 = parseSampleValue(s1.fields[1].state?.displayName ?? s1.name ?? s1.fields[1].name);
+    le2 = parseSampleValue(s2.fields[1].state?.displayName ?? s2.name ?? s2.fields[1].name);
+  } catch (err) {
+    // fail if not integer. might happen with bad queries
+    console.error(err);
+    return 0;
+  }
+
+  if (le1 > le2) {
+    return 1;
+  }
+
+  if (le1 < le2) {
+    return -1;
+  }
+
+  return 0;
+}
+
+/** @internal */
+export function parseSampleValue(value: string): number {
+  if (INFINITY_SAMPLE_REGEX.test(value)) {
+    return value[0] === '-' ? Number.NEGATIVE_INFINITY : Number.POSITIVE_INFINITY;
+  }
+  return parseFloat(value);
+}
diff --git a/packages/grafana-prometheus/src/tracking.ts b/packages/grafana-prometheus/src/tracking.ts
new file mode 100644
index 0000000000000..76706984df3bf
--- /dev/null
+++ b/packages/grafana-prometheus/src/tracking.ts
@@ -0,0 +1,46 @@
+import { CoreApp, DataQueryRequest, DataQueryResponse } from '@grafana/data';
+import { config, reportInteraction } from '@grafana/runtime';
+
+import { PromQuery } from './types';
+
+export function trackQuery(
+  response: DataQueryResponse,
+  request: DataQueryRequest<PromQuery> & { targets: PromQuery[] },
+  startTime: Date
+): void {
+  const { app, targets: queries } = request;
+  // We do want to track panel-editor and explore
+  // We do not want to track queries from the dashboard or viewing a panel
+  // also included in the tracking is cloud-alerting, unified-alerting, and unknown
+  if (app === CoreApp.Dashboard || app === CoreApp.PanelViewer) {
+    return;
+  }
+
+  for (const query of queries) {
+    reportInteraction('grafana_prometheus_query_executed', {
+      app,
+      grafana_version: config.buildInfo.version,
+      has_data: response.data.some((frame) => frame.length > 0),
+      has_error: response.error !== undefined,
+      expr: query.expr,
+      format: query.format,
+      instant: query.instant,
+      range: query.range,
+      exemplar: query.exemplar,
+      hinting: query.hinting,
+      interval: query.interval,
+      intervalFactor: query.intervalFactor,
+      utcOffsetSec: query.utcOffsetSec,
+      legend: query.legendFormat,
+      valueWithRefId: query.valueWithRefId,
+      requestId: request.requestId,
+      showingGraph: query.showingGraph,
+      showingTable: query.showingTable,
+      editor_mode: query.editorMode,
+      simultaneously_sent_query_count: queries.length,
+      time_range_from: request?.range?.from?.toISOString(),
+      time_range_to: request?.range?.to?.toISOString(),
+      time_taken: Date.now() - startTime.getTime(),
+    });
+  }
+}
diff --git a/packages/grafana-prometheus/src/types.ts b/packages/grafana-prometheus/src/types.ts
new file mode 100644
index 0000000000000..f3c5730b3805d
--- /dev/null
+++ b/packages/grafana-prometheus/src/types.ts
@@ -0,0 +1,141 @@
+import { DataSourceJsonData } from '@grafana/data';
+import { DataQuery } from '@grafana/schema';
+
+import { Prometheus as GenPromQuery } from './dataquery';
+import { QueryBuilderLabelFilter, QueryEditorMode } from './querybuilder/shared/types';
+
+export interface PromQuery extends GenPromQuery, DataQuery {
+  /**
+   * Timezone offset to align start & end time on backend
+   */
+  utcOffsetSec?: number;
+  valueWithRefId?: boolean;
+  showingGraph?: boolean;
+  showingTable?: boolean;
+  hinting?: boolean;
+  interval?: string;
+  // store the metrics explorer additional settings
+  useBackend?: boolean;
+  disableTextWrap?: boolean;
+  fullMetaSearch?: boolean;
+  includeNullMetadata?: boolean;
+}
+
+export enum PrometheusCacheLevel {
+  Low = 'Low',
+  Medium = 'Medium',
+  High = 'High',
+  None = 'None',
+}
+
+export enum PromApplication {
+  Cortex = 'Cortex',
+  Mimir = 'Mimir',
+  Prometheus = 'Prometheus',
+  Thanos = 'Thanos',
+}
+
+export interface PromOptions extends DataSourceJsonData {
+  timeInterval?: string;
+  queryTimeout?: string;
+  httpMethod?: string;
+  customQueryParameters?: string;
+  disableMetricsLookup?: boolean;
+  exemplarTraceIdDestinations?: ExemplarTraceIdDestination[];
+  prometheusType?: PromApplication;
+  prometheusVersion?: string;
+  cacheLevel?: PrometheusCacheLevel;
+  defaultEditor?: QueryEditorMode;
+  incrementalQuerying?: boolean;
+  incrementalQueryOverlapWindow?: string;
+  disableRecordingRules?: boolean;
+  sigV4Auth?: boolean;
+  oauthPassThru?: boolean;
+}
+
+export type ExemplarTraceIdDestination = {
+  name: string;
+  url?: string;
+  urlDisplayLabel?: string;
+  datasourceUid?: string;
+};
+
+export interface PromQueryRequest extends PromQuery {
+  step?: number;
+  requestId?: string;
+  start: number;
+  end: number;
+  headers?: any;
+}
+
+export interface PromMetricsMetadataItem {
+  type: string;
+  help: string;
+  unit?: string;
+}
+
+export interface PromMetricsMetadata {
+  [metric: string]: PromMetricsMetadataItem;
+}
+
+export type PromValue = [number, any];
+
+export interface PromMetric {
+  __name__?: string;
+
+  [index: string]: any;
+}
+
+export interface PromBuildInfoResponse {
+  data: {
+    application?: string;
+    version: string;
+    revision: string;
+    features?: {
+      ruler_config_api?: 'true' | 'false';
+      alertmanager_config_api?: 'true' | 'false';
+      query_sharding?: 'true' | 'false';
+      federated_rules?: 'true' | 'false';
+    };
+    [key: string]: unknown;
+  };
+  status: 'success';
+}
+
+/**
+ * Auto = query.legendFormat == '__auto'
+ * Verbose = query.legendFormat == null/undefined/''
+ * Custom query.legendFormat.length > 0 && query.legendFormat !== '__auto'
+ */
+export enum LegendFormatMode {
+  Auto = '__auto',
+  Verbose = '__verbose',
+  Custom = '__custom',
+}
+
+export enum PromVariableQueryType {
+  LabelNames,
+  LabelValues,
+  MetricNames,
+  VarQueryResult,
+  SeriesQuery,
+  ClassicQuery,
+}
+
+export interface PromVariableQuery extends DataQuery {
+  query?: string;
+  expr?: string;
+  qryType?: PromVariableQueryType;
+  label?: string;
+  metric?: string;
+  varQuery?: string;
+  seriesQuery?: string;
+  labelFilters?: QueryBuilderLabelFilter[];
+  match?: string;
+  classicQuery?: string;
+}
+
+export type StandardPromVariableQuery = {
+  query: string;
+  refId: string;
+};
diff --git a/packages/grafana-prometheus/src/typings/jest.d.ts b/packages/grafana-prometheus/src/typings/jest.d.ts
new file mode 100644
index 0000000000000..b6cdf700ac92a
--- /dev/null
+++ b/packages/grafana-prometheus/src/typings/jest.d.ts
@@ -0,0 +1,17 @@
+import { Observable } from 'rxjs';
+
+type ObservableType<T> = T extends Observable<infer V> ? V : never;
+
+declare global {
+  namespace jest {
+    interface Matchers<R, T = {}> {
+      toEmitValues<E = ObservableType<T>>(expected: E[]): Promise<CustomMatcherResult>;
+      /**
+       * Collect all the values emitted by the observables (also errors) and pass them to the expectations functions after
+       * the observable ended (or emitted error). If Observable does not complete within OBSERVABLE_TEST_TIMEOUT_IN_MS the
+       * test fails.
+       */
+      toEmitValuesWith<E = ObservableType<T>>(expectations: (received: E[]) => void): Promise<CustomMatcherResult>;
+    }
+  }
+}
diff --git a/packages/grafana-prometheus/src/variables.ts b/packages/grafana-prometheus/src/variables.ts
new file mode 100644
index 0000000000000..fcf545e0d1cea
--- /dev/null
+++ b/packages/grafana-prometheus/src/variables.ts
@@ -0,0 +1,58 @@
+import { from, Observable, of } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { CustomVariableSupport, DataQueryRequest, DataQueryResponse, rangeUtil } from '@grafana/data';
+import { getTemplateSrv, TemplateSrv } from '@grafana/runtime';
+
+import { PromVariableQueryEditor } from './components/VariableQueryEditor';
+import { PrometheusDatasource } from './datasource';
+import { PrometheusMetricFindQuery } from './metric_find_query';
+import { PromVariableQuery } from './types';
+
+export class PrometheusVariableSupport extends CustomVariableSupport<PrometheusDatasource> {
+  constructor(
+    private readonly datasource: PrometheusDatasource,
+    private readonly templateSrv: TemplateSrv = getTemplateSrv()
+  ) {
+    super();
+  }
+
+  editor = PromVariableQueryEditor;
+
+  query(request: DataQueryRequest<PromVariableQuery>): Observable<DataQueryResponse> {
+    // Handling grafana as code from jsonnet variable queries which are strings and not objects
+    // Previously, when using StandardVariableSupport
+    // the variable query string was changed to be on the expr attribute
+    // Now, using CustomVariableSupport,
+    // the variable query is changed to the query attribute.
+    // So, without standard variable support changing the query string to the expr attribute,
+    // the variable query string is coming in as it is written in jsonnet,
+    // where it is just a string. Here is where we handle that.
+    let query: string | undefined;
+    if (typeof request.targets[0] === 'string') {
+      query = request.targets[0];
+    } else {
+      query = request.targets[0].query;
+    }
+
+    if (!query) {
+      return of({ data: [] });
+    }
+
+    const scopedVars = {
+      ...request.scopedVars,
+      __interval: { text: this.datasource.interval, value: this.datasource.interval },
+      __interval_ms: {
+        text: rangeUtil.intervalToMs(this.datasource.interval),
+        value: rangeUtil.intervalToMs(this.datasource.interval),
+      },
+      ...this.datasource.getRangeScopedVars(request.range),
+    };
+
+    const interpolated = this.templateSrv.replace(query, scopedVars, this.datasource.interpolateQueryExpr);
+    const metricFindQuery = new PrometheusMetricFindQuery(this.datasource, interpolated);
+    const metricFindStream = from(metricFindQuery.process(request.range));
+
+    return metricFindStream.pipe(map((results) => ({ data: results })));
+  }
+}
diff --git a/packages/grafana-prometheus/tsconfig.build.json b/packages/grafana-prometheus/tsconfig.build.json
new file mode 100644
index 0000000000000..54309163ebc77
--- /dev/null
+++ b/packages/grafana-prometheus/tsconfig.build.json
@@ -0,0 +1,4 @@
+{
+  "exclude": ["dist", "node_modules", "test", "**/*.test.ts*"],
+  "extends": "./tsconfig.json"
+}
diff --git a/packages/grafana-prometheus/tsconfig.json b/packages/grafana-prometheus/tsconfig.json
new file mode 100644
index 0000000000000..16a6f15ea71fb
--- /dev/null
+++ b/packages/grafana-prometheus/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "alwaysStrict": true,
+    "declarationDir": "./compiled",
+    "emitDeclarationOnly": true,
+    "isolatedModules": true,
+    "rootDirs": ["."]
+  },
+  "exclude": ["dist/**/*"],
+  "extends": "@grafana/tsconfig",
+  "include": ["src/**/*.ts*", "../../public/app/types/*.d.ts", "../grafana-ui/src/types/*.d.ts"]
+}
diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json
index a0ca950c78a88..b16cf186d3276 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": "10.3.0-pre",
+  "version": "11.0.0",
   "description": "Grafana Runtime Library",
   "keywords": [
     "grafana",
@@ -37,46 +37,44 @@
     "postpack": "mv package.json.bak package.json"
   },
   "dependencies": {
-    "@grafana/data": "10.3.0-pre",
-    "@grafana/e2e-selectors": "10.3.0-pre",
-    "@grafana/faro-web-sdk": "1.2.1",
-    "@grafana/ui": "10.3.0-pre",
+    "@grafana/data": "11.0.0",
+    "@grafana/e2e-selectors": "11.0.0",
+    "@grafana/faro-web-sdk": "^1.3.6",
+    "@grafana/schema": "11.0.0",
+    "@grafana/ui": "11.0.0",
     "history": "4.10.1",
     "lodash": "4.17.21",
     "rxjs": "7.8.1",
-    "systemjs": "6.14.2",
-    "systemjs-cjs-extra": "0.2.0",
-    "tslib": "2.6.0"
+    "tslib": "2.6.2"
   },
   "devDependencies": {
-    "@grafana/tsconfig": "^1.2.0-rc1",
-    "@rollup/plugin-commonjs": "25.0.2",
+    "@grafana/tsconfig": "^1.3.0-rc1",
     "@rollup/plugin-node-resolve": "15.2.3",
-    "@testing-library/dom": "9.3.3",
-    "@testing-library/react": "14.0.0",
-    "@testing-library/user-event": "14.5.1",
-    "@types/angular": "1.8.5",
+    "@rollup/plugin-terser": "0.4.4",
+    "@testing-library/dom": "9.3.4",
+    "@testing-library/react": "14.2.2",
+    "@testing-library/user-event": "14.5.2",
+    "@types/angular": "1.8.9",
     "@types/history": "4.7.11",
-    "@types/jest": "29.5.4",
-    "@types/lodash": "4.14.195",
-    "@types/react": "18.2.15",
-    "@types/react-dom": "18.2.7",
-    "@types/systemjs": "6.13.1",
+    "@types/jest": "29.5.12",
+    "@types/lodash": "4.17.0",
+    "@types/react": "18.2.73",
+    "@types/react-dom": "18.2.22",
+    "@types/systemjs": "6.13.5",
     "esbuild": "0.18.12",
     "lodash": "4.17.21",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "rimraf": "5.0.1",
+    "rimraf": "5.0.5",
     "rollup": "2.79.1",
     "rollup-plugin-dts": "^5.0.0",
     "rollup-plugin-esbuild": "5.0.0",
     "rollup-plugin-node-externals": "^5.0.0",
     "rollup-plugin-sourcemaps": "0.6.3",
-    "rollup-plugin-terser": "7.0.2",
-    "typescript": "4.8.4"
+    "typescript": "5.3.3"
   },
   "peerDependencies": {
-    "react": "^17.0.0 || ^18.0.0",
-    "react-dom": "^17.0.0 || ^18.0.0"
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
   }
 }
diff --git a/packages/grafana-runtime/src/analytics/types.ts b/packages/grafana-runtime/src/analytics/types.ts
index 742b9aac991b9..b67b5ef3d270f 100644
--- a/packages/grafana-runtime/src/analytics/types.ts
+++ b/packages/grafana-runtime/src/analytics/types.ts
@@ -29,6 +29,7 @@ export interface DataRequestInfo extends Partial<DashboardInfo> {
   datasourceUid: string;
   datasourceType: string;
   panelId?: number;
+  panelPluginId?: string;
   panelName?: string;
   duration: number;
   error?: string;
diff --git a/packages/grafana-runtime/src/components/EmbeddedDashboard.tsx b/packages/grafana-runtime/src/components/EmbeddedDashboard.tsx
new file mode 100644
index 0000000000000..92a78e5d4ea24
--- /dev/null
+++ b/packages/grafana-runtime/src/components/EmbeddedDashboard.tsx
@@ -0,0 +1,32 @@
+import React from 'react';
+
+export interface EmbeddedDashboardProps {
+  uid?: string;
+  /**
+   * Use this property to override initial time and variable state.
+   * Example: ?from=now-5m&to=now&var-varname=value1
+   */
+  initialState?: string;
+  /**
+   * Is called when ever the internal embedded dashboards url state changes.
+   * Can be used to sync the internal url state (Which is not synced to URL) with the external context, or to
+   * preserve some of the state when moving to other embedded dashboards.
+   */
+  onStateChange?: (state: string) => void;
+}
+
+/**
+ * Returns a React component that renders an embedded dashboard.
+ * @alpha
+ */
+export let EmbeddedDashboard: React.ComponentType<EmbeddedDashboardProps> = () => {
+  throw new Error('EmbeddedDashboard requires runtime initialization');
+};
+
+/**
+ *
+ * @internal
+ */
+export function setEmbeddedDashboard(component: React.ComponentType<EmbeddedDashboardProps>) {
+  EmbeddedDashboard = component;
+}
diff --git a/packages/grafana-runtime/src/config.ts b/packages/grafana-runtime/src/config.ts
index ab29635bbe2b6..624174f13d910 100644
--- a/packages/grafana-runtime/src/config.ts
+++ b/packages/grafana-runtime/src/config.ts
@@ -16,13 +16,21 @@ import {
   systemDateFormats,
   SystemDateFormatSettings,
   getThemeById,
+  AngularMeta,
 } from '@grafana/data';
 
 export interface AzureSettings {
   cloud?: string;
+  clouds?: AzureCloudInfo[];
   managedIdentityEnabled: boolean;
   workloadIdentityEnabled: boolean;
   userIdentityEnabled: boolean;
+  userIdentityFallbackCredentialsEnabled: boolean;
+}
+
+export interface AzureCloudInfo {
+  name: string;
+  displayName: string;
 }
 
 export type AppPluginConfig = {
@@ -30,11 +38,12 @@ export type AppPluginConfig = {
   path: string;
   version: string;
   preload: boolean;
-  angularDetected?: boolean;
+  angular: AngularMeta;
 };
 
 export class GrafanaBootConfig implements GrafanaConfig {
   publicDashboardAccessToken?: string;
+  publicDashboardsEnabled = true;
   snapshotEnabled = true;
   datasources: { [str: string]: DataSourceInstanceSettings } = {};
   panels: { [key: string]: PanelPluginMeta } = {};
@@ -43,6 +52,7 @@ export class GrafanaBootConfig implements GrafanaConfig {
   minRefreshInterval = '';
   appUrl = '';
   appSubUrl = '';
+  namespace = 'default';
   windowTitlePrefix = '';
   buildInfo: BuildInfo;
   newPanelTitle = '';
@@ -54,10 +64,6 @@ export class GrafanaBootConfig implements GrafanaConfig {
   feedbackLinksEnabled = true;
   disableLoginForm = false;
   defaultDatasource = ''; // UID
-  alertingEnabled = false;
-  alertingErrorOrTimeout = '';
-  alertingNoDataOrNullValues = '';
-  alertingMinInterval = 1;
   angularSupportEnabled = false;
   authProxyEnabled = false;
   exploreEnabled = false;
@@ -92,9 +98,13 @@ export class GrafanaBootConfig implements GrafanaConfig {
   theme2: GrafanaTheme2;
   featureToggles: FeatureToggles = {};
   anonymousEnabled = false;
+  anonymousDeviceLimit: number | undefined = undefined;
   licenseInfo: LicenseInfo = {} as LicenseInfo;
   rendererAvailable = false;
   rendererVersion = '';
+  rendererDefaultImageWidth = 1000;
+  rendererDefaultImageHeight = 500;
+  rendererDefaultImageScale = 1;
   secretsManagerPluginEnabled = false;
   supportBundlesEnabled = false;
   http2Enabled = false;
@@ -120,6 +130,7 @@ export class GrafanaBootConfig implements GrafanaConfig {
     managedIdentityEnabled: false,
     workloadIdentityEnabled: false,
     userIdentityEnabled: false,
+    userIdentityFallbackCredentialsEnabled: false,
   };
   caching = {
     enabled: false,
@@ -143,6 +154,9 @@ export class GrafanaBootConfig implements GrafanaConfig {
   reporting = {
     enabled: true,
   };
+  analytics = {
+    enabled: true,
+  };
   googleAnalyticsId: undefined;
   googleAnalytics4Id: undefined;
   googleAnalytics4SendManualPageViews = false;
@@ -159,6 +173,16 @@ export class GrafanaBootConfig implements GrafanaConfig {
 
   tokenExpirationDayLimit: undefined;
   disableFrontendSandboxForPlugins: string[] = [];
+  sharedWithMeFolderUID: string | undefined;
+  rootFolderUID: string | undefined;
+  localFileSystemAvailable: boolean | undefined;
+  cloudMigrationIsTarget: boolean | undefined;
+
+  /**
+   * Language used in Grafana's UI. This is after the user's preference (or deteceted locale) is resolved to one of
+   * Grafana's supported language.
+   */
+  language: string | undefined;
 
   constructor(options: GrafanaBootConfig) {
     this.bootData = options.bootData;
@@ -193,7 +217,6 @@ export class GrafanaBootConfig implements GrafanaConfig {
     if (this.buildInfo.env === 'development') {
       overrideFeatureTogglesFromUrl(this);
     }
-
     overrideFeatureTogglesFromLocalStorage(this);
 
     if (this.featureToggles.disableAngular) {
@@ -230,11 +253,27 @@ function overrideFeatureTogglesFromUrl(config: GrafanaBootConfig) {
     return;
   }
 
+  const migrationFeatureFlags = new Set([
+    'autoMigrateOldPanels',
+    'autoMigrateGraphPanel',
+    'autoMigrateTablePanel',
+    'autoMigratePiechartPanel',
+    'autoMigrateWorldmapPanel',
+    'autoMigrateStatPanel',
+    'disableAngular',
+  ]);
+
   const params = new URLSearchParams(window.location.search);
   params.forEach((value, key) => {
     if (key.startsWith('__feature.')) {
       const featureToggles = config.featureToggles as Record<string, boolean>;
       const featureName = key.substring(10);
+
+      // skip the migration feature flags
+      if (migrationFeatureFlags.has(featureName)) {
+        return;
+      }
+
       const toggleState = value === 'true' || value === ''; // browser rewrites true as ''
       if (toggleState !== featureToggles[key]) {
         featureToggles[featureName] = toggleState;
diff --git a/packages/grafana-runtime/src/index.ts b/packages/grafana-runtime/src/index.ts
index d9ff32a39c090..f5fc864e64036 100644
--- a/packages/grafana-runtime/src/index.ts
+++ b/packages/grafana-runtime/src/index.ts
@@ -6,16 +6,10 @@
 export * from './services';
 export * from './config';
 export * from './analytics/types';
-export {
-  loadPluginCss,
-  SystemJS,
-  type PluginCssOptions,
-  setPluginImportUtils,
-  getPluginImportUtils,
-} from './utils/plugin';
+export { loadPluginCss, type PluginCssOptions, setPluginImportUtils, getPluginImportUtils } from './utils/plugin';
 export { reportMetaAnalytics, reportInteraction, reportPageview, reportExperimentView } from './analytics/utils';
 export { featureEnabled } from './utils/licensing';
-export { logInfo, logDebug, logWarning, logError } from './utils/logging';
+export { logInfo, logDebug, logWarning, logError, createMonitoringLogger } from './utils/logging';
 export {
   DataSourceWithBackend,
   HealthCheckError,
@@ -23,6 +17,7 @@ export {
   type HealthCheckResultDetails,
   HealthStatus,
   type StreamOptionsProvider,
+  isExpressionReference,
 } from './utils/DataSourceWithBackend';
 export {
   toDataQueryResponse,
@@ -55,3 +50,5 @@ export {
   createDataSourcePluginEventProperties,
 } from './analytics/plugins/eventProperties';
 export { usePluginInteractionReporter } from './analytics/plugins/usePluginInteractionReporter';
+export { setReturnToPreviousHook, useReturnToPrevious } from './utils/returnToPrevious';
+export { type EmbeddedDashboardProps, EmbeddedDashboard, setEmbeddedDashboard } from './components/EmbeddedDashboard';
diff --git a/packages/grafana-runtime/src/services/pluginExtensions/getPluginExtensions.ts b/packages/grafana-runtime/src/services/pluginExtensions/getPluginExtensions.ts
index 66f2cf2abc3a9..dcd52b200b267 100644
--- a/packages/grafana-runtime/src/services/pluginExtensions/getPluginExtensions.ts
+++ b/packages/grafana-runtime/src/services/pluginExtensions/getPluginExtensions.ts
@@ -41,10 +41,15 @@ export const getPluginLinkExtensions: GetPluginExtensions<PluginExtensionLink> =
   };
 };
 
-export const getPluginComponentExtensions: GetPluginExtensions<PluginExtensionComponent> = (options) => {
+// This getter doesn't support the `context` option (contextual information can be passed in as component props)
+export const getPluginComponentExtensions = <Props = {}>(options: {
+  extensionPointId: string;
+  limitPerPlugin?: number;
+}): { extensions: Array<PluginExtensionComponent<Props>> } => {
   const { extensions } = getPluginExtensions(options);
+  const componentExtensions = extensions.filter(isPluginExtensionComponent) as Array<PluginExtensionComponent<Props>>;
 
   return {
-    extensions: extensions.filter(isPluginExtensionComponent),
+    extensions: componentExtensions,
   };
 };
diff --git a/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts b/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts
index b1815fcc095ed..8d3d9ce7f47f1 100644
--- a/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts
+++ b/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts
@@ -350,6 +350,63 @@ describe('DataSourceWithBackend', () => {
     });
   });
 
+  test('check that queries can skip the query cache', () => {
+    const { mock, ds } = createMockDatasource();
+    ds.query({
+      maxDataPoints: 10,
+      intervalMs: 5000,
+      targets: [{ refId: 'A' }],
+      dashboardUID: 'dashA',
+      panelId: 123,
+      range: getDefaultTimeRange(),
+      skipQueryCache: true,
+      requestId: 'request-123',
+      interval: '5s',
+      scopedVars: {},
+      timezone: '',
+      app: '',
+      startTime: 0,
+    });
+
+    const args = mock.calls[0][0];
+
+    expect(mock.calls.length).toBe(1);
+    expect(args).toMatchInlineSnapshot(`
+      {
+        "data": {
+          "from": "1697133600000",
+          "queries": [
+            {
+              "applyTemplateVariablesCalled": true,
+              "datasource": {
+                "type": "dummy",
+                "uid": "abc",
+              },
+              "datasourceId": 1234,
+              "filters": undefined,
+              "intervalMs": 5000,
+              "maxDataPoints": 10,
+              "queryCachingTTL": undefined,
+              "refId": "A",
+            },
+          ],
+          "to": "1697155200000",
+        },
+        "headers": {
+          "X-Cache-Skip": "true",
+          "X-Dashboard-Uid": "dashA",
+          "X-Datasource-Uid": "abc",
+          "X-Panel-Id": "123",
+          "X-Plugin-Id": "dummy",
+        },
+        "hideFromInspector": false,
+        "method": "POST",
+        "requestId": "request-123",
+        "url": "/api/ds/query?ds_type=dummy&requestId=request-123",
+      }
+    `);
+  });
+
   describe('isExpressionReference', () => {
     test('check all possible expression references', () => {
       expect(isExpressionReference('__expr__')).toBeTruthy(); // New UID
diff --git a/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts b/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts
index da8a914251cb3..f867d1762cf6d 100644
--- a/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts
+++ b/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts
@@ -43,7 +43,7 @@ export const ExpressionDatasourceRef = Object.freeze({
 });
 
 /**
- * @internal
+ * @public
  */
 export function isExpressionReference(ref?: DataSourceRef | string | null): boolean {
   if (!ref) {
@@ -80,8 +80,10 @@ enum PluginRequestHeaders {
   DatasourceUID = 'X-Datasource-Uid', // can be used for routing/ load balancing
   DashboardUID = 'X-Dashboard-Uid', // mainly useful for debugging slow queries
   PanelID = 'X-Panel-Id', // mainly useful for debugging slow queries
+  PanelPluginId = 'X-Panel-Plugin-Id',
   QueryGroupID = 'X-Query-Group-Id', // mainly useful to find related queries with query splitting
   FromExpression = 'X-Grafana-From-Expr', // used by datasources to identify expression queries
+  SkipQueryCache = 'X-Cache-Skip', // used by datasources to skip the query cache
 }
 
 /**
@@ -132,10 +134,6 @@ class DataSourceWithBackend<
     const { intervalMs, maxDataPoints, queryCachingTTL, range, requestId, hideFromInspector = false } = request;
     let targets = request.targets;
 
-    if (this.filterQuery) {
-      targets = targets.filter((q) => this.filterQuery!(q));
-    }
-
     let hasExpr = false;
     const pluginIDs = new Set<string>();
     const dsUIDs = new Set<string>();
@@ -225,9 +223,15 @@ class DataSourceWithBackend<
     if (request.panelId) {
       headers[PluginRequestHeaders.PanelID] = `${request.panelId}`;
     }
+    if (request.panelPluginId) {
+      headers[PluginRequestHeaders.PanelPluginId] = `${request.panelPluginId}`;
+    }
     if (request.queryGroupId) {
       headers[PluginRequestHeaders.QueryGroupID] = `${request.queryGroupId}`;
     }
+    if (request.skipQueryCache) {
+      headers[PluginRequestHeaders.SkipQueryCache] = 'true';
+    }
     return getBackendSrv()
       .fetch<BackendDataSourceResponse>({
         url,
@@ -264,19 +268,9 @@ class DataSourceWithBackend<
    * Apply template variables for explore
    */
   interpolateVariablesInQueries(queries: TQuery[], scopedVars: ScopedVars, filters?: AdHocVariableFilter[]): TQuery[] {
-    return queries.map((q) => this.applyTemplateVariables(q, scopedVars, filters) as TQuery);
+    return queries.map((q) => this.applyTemplateVariables(q, scopedVars, filters));
   }
 
-  /**
-   * Override to skip executing a query.  Note this function may not be called
-   * if the query method is overwritten.
-   *
-   * @returns false if the query should be skipped
-   *
-   * @virtual
-   */
-  filterQuery?(query: TQuery): boolean;
-
   /**
    * Override to apply template variables and adhoc filters.  The result is usually also `TQuery`, but sometimes this can
    * be used to modify the query structure before sending to the backend.
@@ -286,7 +280,7 @@ class DataSourceWithBackend<
    *
    * @virtual
    */
-  applyTemplateVariables(query: TQuery, scopedVars: ScopedVars, filters?: AdHocVariableFilter[]): Record<string, any> {
+  applyTemplateVariables(query: TQuery, scopedVars: ScopedVars, filters?: AdHocVariableFilter[]) {
     return query;
   }
 
@@ -319,7 +313,7 @@ class DataSourceWithBackend<
   /**
    * Send a POST request to the datasource resource path
    */
-  async postResource<T = any>(
+  async postResource<T = unknown>(
     path: string,
     data?: BackendSrvRequest['data'],
     options?: Partial<BackendSrvRequest>
diff --git a/packages/grafana-runtime/src/utils/logging.ts b/packages/grafana-runtime/src/utils/logging.ts
index 2643cabf9b86f..d7c94da53d839 100644
--- a/packages/grafana-runtime/src/utils/logging.ts
+++ b/packages/grafana-runtime/src/utils/logging.ts
@@ -1,4 +1,4 @@
-import { faro, LogLevel, LogContext } from '@grafana/faro-web-sdk';
+import { faro, LogContext, LogLevel } from '@grafana/faro-web-sdk';
 
 import { config } from '../config';
 
@@ -52,6 +52,85 @@ export function logDebug(message: string, contexts?: LogContext) {
  */
 export function logError(err: Error, contexts?: LogContext) {
   if (config.grafanaJavascriptAgent.enabled) {
-    faro.api.pushError(err);
+    faro.api.pushError(err, {
+      context: contexts,
+    });
+  }
+}
+
+/**
+ * Log a measurement
+ *
+ * @public
+ */
+export type MeasurementValues = Record<string, number>;
+export function logMeasurement(type: string, values: MeasurementValues, context?: LogContext) {
+  if (config.grafanaJavascriptAgent.enabled) {
+    faro.api.pushMeasurement({
+      type,
+      values,
+      context,
+    });
   }
 }
+
+/**
+ * Creates a monitoring logger with four levels of logging methods: `logDebug`, `logInfo`, `logWarning`, and `logError`.
+ * These methods use `faro.api.pushX` web SDK methods to report these logs or errors to the Faro collector.
+ *
+ * @param {string} source - Identifier for the source of the log messages.
+ * @param {LogContext} [defaultContext] - Context to be included in every log message.
+ *
+ * @returns {Object} Logger object with four methods:
+ * - `logDebug(message: string, contexts?: LogContext)`: Logs a debug message.
+ * - `logInfo(message: string, contexts?: LogContext)`: Logs an informational message.
+ * - `logWarning(message: string, contexts?: LogContext)`: Logs a warning message.
+ * - `logError(error: Error, contexts?: LogContext)`: Logs an error message.
+ * - `logMeasurement(measurement: Omit<MeasurementEvent, 'timestamp'>, contexts?: LogContext)`: Logs a measurement.
+ * Each method combines the `defaultContext` (if provided), the `source`, and an optional `LogContext` parameter into a full context that is included with the log message.
+ */
+export function createMonitoringLogger(source: string, defaultContext?: LogContext) {
+  const createFullContext = (contexts?: LogContext) => ({
+    source: source,
+    ...defaultContext,
+    ...contexts,
+  });
+
+  return {
+    /**
+     * Logs a debug message with optional additional context.
+     * @param {string} message - The debug message to be logged.
+     * @param {LogContext} [contexts] - Optional additional context to be included.
+     */
+    logDebug: (message: string, contexts?: LogContext) => logDebug(message, createFullContext(contexts)),
+
+    /**
+     * Logs an informational message with optional additional context.
+     * @param {string} message - The informational message to be logged.
+     * @param {LogContext} [contexts] - Optional additional context to be included.
+     */
+    logInfo: (message: string, contexts?: LogContext) => logInfo(message, createFullContext(contexts)),
+
+    /**
+     * Logs a warning message with optional additional context.
+     * @param {string} message - The warning message to be logged.
+     * @param {LogContext} [contexts] - Optional additional context to be included.
+     */
+    logWarning: (message: string, contexts?: LogContext) => logWarning(message, createFullContext(contexts)),
+
+    /**
+     * Logs an error with optional additional context.
+     * @param {Error} error - The error object to be logged.
+     * @param {LogContext} [contexts] - Optional additional context to be included.
+     */
+    logError: (error: Error, contexts?: LogContext) => logError(error, createFullContext(contexts)),
+
+    /**
+     * Logs an measurement with optional additional context.
+     * @param {MeasurementEvent} measurement - The measurement object to be recorded.
+     * @param {LogContext} [contexts] - Optional additional context to be included.
+     */
+    logMeasurement: (type: string, measurement: MeasurementValues, contexts?: LogContext) =>
+      logMeasurement(type, measurement, createFullContext(contexts)),
+  };
+}
diff --git a/packages/grafana-runtime/src/utils/plugin.ts b/packages/grafana-runtime/src/utils/plugin.ts
index ce2ab40b5b3c3..e3ff8ff026a5a 100644
--- a/packages/grafana-runtime/src/utils/plugin.ts
+++ b/packages/grafana-runtime/src/utils/plugin.ts
@@ -1,9 +1,3 @@
-import 'systemjs/dist/system';
-// Add ability to load plugins bundled as AMD format
-import 'systemjs/dist/extras/amd';
-// Add ability to load plugins bundled as CJS format
-import 'systemjs-cjs-extra';
-
 import { PanelPlugin } from '@grafana/data';
 
 import { config } from '../config';
@@ -19,11 +13,6 @@ export interface PluginCssOptions {
   dark: string;
 }
 
-/**
- * @internal
- */
-export const SystemJS = window.System;
-
 /**
  * Use this to load css for a Grafana plugin by specifying a {@link PluginCssOptions}
  * containing styling for the dark and the light theme.
@@ -34,7 +23,7 @@ export const SystemJS = window.System;
 export async function loadPluginCss(options: PluginCssOptions): Promise<System.Module | void> {
   try {
     const cssPath = config.bootData.user.theme === 'light' ? options.light : options.dark;
-    return SystemJS.import(cssPath);
+    return window.System.import(cssPath);
   } catch (err) {
     console.error(err);
   }
@@ -62,11 +51,3 @@ export function getPluginImportUtils(): PluginImportUtils {
 
   return pluginImportUtils;
 }
-
-// Grafana relies on RequireJS for Monaco Editor to load.
-// The SystemJS AMD extra creates a global define which causes RequireJS to silently bail.
-// Here we move and reset global define so Monaco Editor loader script continues to work.
-// @ts-ignore
-window.__grafana_amd_define = window.define;
-// @ts-ignore
-window.define = undefined;
diff --git a/packages/grafana-runtime/src/utils/returnToPrevious.ts b/packages/grafana-runtime/src/utils/returnToPrevious.ts
new file mode 100644
index 0000000000000..7810eb46c0a9b
--- /dev/null
+++ b/packages/grafana-runtime/src/utils/returnToPrevious.ts
@@ -0,0 +1,23 @@
+type ReturnToPreviousHook = () => (title: string, href?: string) => void;
+
+let rtpHook: ReturnToPreviousHook | undefined = undefined;
+
+export const setReturnToPreviousHook = (hook: ReturnToPreviousHook) => {
+  rtpHook = hook;
+};
+
+/**
+ * Guidelines:
+ * - Only use the ‘Return to previous’ functionality when the user is sent to another context, such as from Alerting to a dashboard.
+ * - Specify a button title that identifies the page to return to in the most understandable way. Do not use text such as ‘Back to the previous page’. Be specific.
+ */
+export const useReturnToPrevious: ReturnToPreviousHook = () => {
+  if (!rtpHook) {
+    if (process.env.NODE_ENV !== 'production') {
+      throw new Error('useReturnToPrevious hook not found in @grafana/runtime');
+    }
+    return () => console.error('ReturnToPrevious hook not found');
+  }
+
+  return rtpHook();
+};
diff --git a/packages/grafana-schema/package.json b/packages/grafana-schema/package.json
index 6ec2b9cf88dd6..feb94f64fe9e8 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": "10.3.0-pre",
+  "version": "11.0.0",
   "description": "Grafana Schema Library",
   "keywords": [
     "typescript"
@@ -36,20 +36,18 @@
     "postpack": "mv package.json.bak package.json"
   },
   "devDependencies": {
-    "@grafana/tsconfig": "^1.2.0-rc1",
-    "@rollup/plugin-commonjs": "25.0.2",
-    "@rollup/plugin-json": "6.0.0",
+    "@grafana/tsconfig": "^1.3.0-rc1",
     "@rollup/plugin-node-resolve": "15.2.3",
     "esbuild": "0.18.12",
     "glob": "^10.2.7",
-    "rimraf": "5.0.1",
+    "rimraf": "5.0.5",
     "rollup": "2.79.1",
     "rollup-plugin-dts": "^5.0.0",
     "rollup-plugin-esbuild": "5.0.0",
     "rollup-plugin-node-externals": "^5.0.0",
-    "typescript": "4.8.4"
+    "typescript": "5.3.3"
   },
   "dependencies": {
-    "tslib": "2.6.0"
+    "tslib": "2.6.2"
   }
 }
diff --git a/packages/grafana-schema/src/common/common.gen.ts b/packages/grafana-schema/src/common/common.gen.ts
index 76676b232cc19..a0c69ebbb060a 100644
--- a/packages/grafana-schema/src/common/common.gen.ts
+++ b/packages/grafana-schema/src/common/common.gen.ts
@@ -8,6 +8,16 @@
 // Run 'make gen-cue' from repository root to regenerate.
 
 
+/**
+ * A topic is attached to DataFrame metadata in query results.
+ * This specifies where the data should be used.
+ */
+export enum DataTopic {
+  AlertStates = 'alertStates',
+  Annotations = 'annotations',
+  Series = 'series',
+}
+
 /**
  * TODO docs
  */
@@ -33,9 +43,7 @@ export interface DataQuery {
    */
   datasource?: unknown;
   /**
-   * true if query is disabled (ie should not be returned to the dashboard)
-   * Note this does not always imply that the query should not be executed since
-   * the results from a hidden query may be used as the input to other queries (SSE etc)
+   * If hide is set to true, Grafana will filter out the response(s) associated with this query before returning it to the panel.
    */
   hide?: boolean;
   /**
@@ -399,7 +407,7 @@ export interface HideableFieldConfig {
 /**
  * TODO docs
  */
-export enum GraphTresholdsStyleMode {
+export enum GraphThresholdsStyleMode {
   Area = 'area',
   Dashed = 'dashed',
   DashedAndArea = 'dashed+area',
@@ -413,7 +421,7 @@ export enum GraphTresholdsStyleMode {
  * TODO docs
  */
 export interface GraphThresholdsStyleConfig {
-  mode: GraphTresholdsStyleMode;
+  mode: GraphThresholdsStyleMode;
 }
 
 /**
@@ -644,10 +652,20 @@ export enum BarGaugeNamePlacement {
   Top = 'top',
 }
 
+/**
+ * Allows for the bar gauge size to be set explicitly
+ */
+export enum BarGaugeSizing {
+  Auto = 'auto',
+  Manual = 'manual',
+}
+
 /**
  * TODO docs
  */
 export interface VizTooltipOptions {
+  maxHeight?: number;
+  maxWidth?: number;
   mode: TooltipDisplayMode;
   sort: SortOrder;
 }
@@ -667,6 +685,7 @@ export enum TableCellDisplayMode {
   ColorBackgroundSolid = 'color-background-solid',
   ColorText = 'color-text',
   Custom = 'custom',
+  DataLinks = 'data-links',
   Gauge = 'gauge',
   GradientGauge = 'gradient-gauge',
   Image = 'image',
@@ -743,6 +762,13 @@ export interface TableImageCellOptions {
   type: TableCellDisplayMode.Image;
 }
 
+/**
+ * Show data links in the cell
+ */
+export interface TableDataLinksCellOptions {
+  type: TableCellDisplayMode.DataLinks;
+}
+
 /**
  * Gauge cell options
  */
@@ -764,6 +790,7 @@ export interface TableSparklineCellOptions extends GraphFieldConfig {
  * Colored background cell options
  */
 export interface TableColoredBackgroundCellOptions {
+  applyToRow?: boolean;
   mode?: TableCellBackgroundDisplayMode;
   type: TableCellDisplayMode.ColorBackground;
 }
@@ -781,7 +808,7 @@ export enum TableCellHeight {
  * Table cell options. Each cell has a display mode
  * and other potential options for that display.
  */
-export type TableCellOptions = (TableAutoCellOptions | TableSparklineCellOptions | TableBarGaugeCellOptions | TableColoredBackgroundCellOptions | TableColorTextCellOptions | TableImageCellOptions | TableJsonViewCellOptions);
+export type TableCellOptions = (TableAutoCellOptions | TableSparklineCellOptions | TableBarGaugeCellOptions | TableColoredBackgroundCellOptions | TableColorTextCellOptions | TableImageCellOptions | TableDataLinksCellOptions | TableJsonViewCellOptions);
 
 /**
  * Use UTC/GMT timezone
diff --git a/packages/grafana-schema/src/common/data.cue b/packages/grafana-schema/src/common/data.cue
new file mode 100644
index 0000000000000..33cb5ab2f4e5c
--- /dev/null
+++ b/packages/grafana-schema/src/common/data.cue
@@ -0,0 +1,5 @@
+package common
+
+// A topic is attached to DataFrame metadata in query results.
+// This specifies where the data should be used.
+DataTopic: "series" | "annotations" | "alertStates" @cuetsy(kind="enum",memberNames="Series|Annotations|AlertStates")
\ No newline at end of file
diff --git a/packages/grafana-schema/src/common/dataquery_gen.cue b/packages/grafana-schema/src/common/dataquery_gen.cue
index 3d6c8f721da11..bcf14f3d13428 100644
--- a/packages/grafana-schema/src/common/dataquery_gen.cue
+++ b/packages/grafana-schema/src/common/dataquery_gen.cue
@@ -23,9 +23,7 @@ DataQuery: {
 	// By default, the UI will assign A->Z; however setting meaningful names may be useful.
 	refId: string
 
-	// true if query is disabled (ie should not be returned to the dashboard)
-	// Note this does not always imply that the query should not be executed since
-	// the results from a hidden query may be used as the input to other queries (SSE etc)
+    // If hide is set to true, Grafana will filter out the response(s) associated with this query before returning it to the panel. 
 	hide?: bool
 
 	// Specify the query flavor
diff --git a/packages/grafana-schema/src/common/mudball.cue b/packages/grafana-schema/src/common/mudball.cue
index 9dbc0219ac1b2..d08fbeff1537e 100644
--- a/packages/grafana-schema/src/common/mudball.cue
+++ b/packages/grafana-schema/src/common/mudball.cue
@@ -122,11 +122,11 @@ HideableFieldConfig: {
 } @cuetsy(kind="interface")
 
 // TODO docs
-GraphTresholdsStyleMode: "off" | "line" | "dashed" | "area" | "line+area" | "dashed+area" | "series" @cuetsy(kind="enum",memberNames="Off|Line|Dashed|Area|LineAndArea|DashedAndArea|Series")
+GraphThresholdsStyleMode: "off" | "line" | "dashed" | "area" | "line+area" | "dashed+area" | "series" @cuetsy(kind="enum",memberNames="Off|Line|Dashed|Area|LineAndArea|DashedAndArea|Series")
 
 // TODO docs
 GraphThresholdsStyleConfig: {
-	mode: GraphTresholdsStyleMode
+	mode: GraphThresholdsStyleMode
 } @cuetsy(kind="interface")
 
 // TODO docs
@@ -249,10 +249,15 @@ BarGaugeValueMode: "color" | "text" | "hidden" @cuetsy(kind="enum")
 // Allows for the bar gauge name to be placed explicitly
 BarGaugeNamePlacement: "auto" | "top" | "left" @cuetsy(kind="enum")
 
+// Allows for the bar gauge size to be set explicitly
+BarGaugeSizing: "auto" | "manual" @cuetsy(kind="enum")
+
 // TODO docs
 VizTooltipOptions: {
 	mode: TooltipDisplayMode
 	sort: SortOrder
+	maxWidth?: number
+	maxHeight?: number
 } @cuetsy(kind="interface")
 
 Labels: {
diff --git a/packages/grafana-schema/src/common/table.cue b/packages/grafana-schema/src/common/table.cue
index 27026f6d79b13..5c6dce2a5de30 100644
--- a/packages/grafana-schema/src/common/table.cue
+++ b/packages/grafana-schema/src/common/table.cue
@@ -4,7 +4,7 @@ package common
 // in the table such as colored text, JSON, gauge, etc.
 // The color-background-solid, gradient-gauge, and lcd-gauge
 // modes are deprecated in favor of new cell subOptions
-TableCellDisplayMode: "auto" | "color-text" | "color-background" | "color-background-solid" | "gradient-gauge" | "lcd-gauge" | "json-view" | "basic" | "image" | "gauge" | "sparkline"| "custom" @cuetsy(kind="enum",memberNames="Auto|ColorText|ColorBackground|ColorBackgroundSolid|GradientGauge|LcdGauge|JSONView|BasicGauge|Image|Gauge|Sparkline|Custom")
+TableCellDisplayMode: "auto" | "color-text" | "color-background" | "color-background-solid" | "gradient-gauge" | "lcd-gauge" | "json-view" | "basic" | "image" | "gauge" | "sparkline" | "data-links" | "custom" @cuetsy(kind="enum",memberNames="Auto|ColorText|ColorBackground|ColorBackgroundSolid|GradientGauge|LcdGauge|JSONView|BasicGauge|Image|Gauge|Sparkline|DataLinks|Custom")
 
 // Display mode to the "Colored Background" display
 // mode for table cells. Either displays a solid color (basic mode)
@@ -48,6 +48,11 @@ TableImageCellOptions: {
 	type: TableCellDisplayMode & "image"
 } @cuetsy(kind="interface")
 
+// Show data links in the cell
+TableDataLinksCellOptions: {
+	type: TableCellDisplayMode & "data-links"
+} @cuetsy(kind="interface")
+
 // Gauge cell options
 TableBarGaugeCellOptions: {
 	type: TableCellDisplayMode & "gauge"
@@ -66,6 +71,7 @@ TableSparklineCellOptions: {
 TableColoredBackgroundCellOptions: {
 	type: TableCellDisplayMode & "color-background"
 	mode?: TableCellBackgroundDisplayMode
+	applyToRow?: bool
 } @cuetsy(kind="interface")
 
 // Height of a table cell
@@ -73,7 +79,7 @@ TableCellHeight: "sm" | "md" | "lg" @cuetsy(kind="enum")
 
 // Table cell options. Each cell has a display mode
 // and other potential options for that display.
-TableCellOptions: TableAutoCellOptions | TableSparklineCellOptions | TableBarGaugeCellOptions | TableColoredBackgroundCellOptions | TableColorTextCellOptions | TableImageCellOptions | TableJsonViewCellOptions @cuetsy(kind="type")
+TableCellOptions: TableAutoCellOptions | TableSparklineCellOptions | TableBarGaugeCellOptions | TableColoredBackgroundCellOptions | TableColorTextCellOptions | TableImageCellOptions | TableDataLinksCellOptions | TableJsonViewCellOptions @cuetsy(kind="type")
 
 // Field options for each field within a table (e.g 10, "The String", 64.20, etc.)
 // Generally defines alignment, filtering capabilties, display options, etc.
diff --git a/packages/grafana-schema/src/index.gen.ts b/packages/grafana-schema/src/index.gen.ts
index 6576c1ce63f92..88e4a174071b6 100644
--- a/packages/grafana-schema/src/index.gen.ts
+++ b/packages/grafana-schema/src/index.gen.ts
@@ -37,9 +37,7 @@ export type {
   RegexMap,
   SpecialValueMap,
   ValueMappingResult,
-  LibraryPanelRef,
-  GraphPanel,
-  HeatmapPanel
+  LibraryPanelRef
 } from './raw/dashboard/x/dashboard_types.gen';
 
 // Raw generated enums and default consts from dashboard kind.
@@ -75,6 +73,7 @@ export type {
   VariableModel,
   DataSourceRef,
   DataTransformerConfig,
+  TimePickerConfig,
   Panel,
   FieldConfigSource,
   MatcherConfig,
@@ -97,6 +96,7 @@ export {
   defaultAnnotationQuery,
   defaultVariableModel,
   VariableHide,
+  defaultTimePickerConfig,
   defaultPanel,
   defaultFieldConfigSource,
   defaultMatcherConfig,
@@ -104,9 +104,6 @@ export {
   defaultRowPanel
 } from './veneer/dashboard.types';
 
-// Raw generated types from Folder kind.
-export type { Folder } from './raw/folder/x/folder_types.gen';
-
 // Raw generated types from LibraryPanel kind.
 export type {
   LibraryElementDTOMetaUser,
diff --git a/packages/grafana-schema/src/raw/accesspolicy/x/accesspolicy_types.gen.ts b/packages/grafana-schema/src/raw/accesspolicy/x/accesspolicy_types.gen.ts
index 814c5cf3eaf8a..7e18ea5077715 100644
--- a/packages/grafana-schema/src/raw/accesspolicy/x/accesspolicy_types.gen.ts
+++ b/packages/grafana-schema/src/raw/accesspolicy/x/accesspolicy_types.gen.ts
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     TSResourceJenny
+//     TSTypesJenny
 //     LatestMajorsOrXJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
diff --git a/packages/grafana-schema/src/raw/composable/alertgroups/panelcfg/x/AlertGroupsPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/alertgroups/panelcfg/x/AlertGroupsPanelCfg_types.gen.ts
deleted file mode 100644
index a4186f57bc535..0000000000000
--- a/packages/grafana-schema/src/raw/composable/alertgroups/panelcfg/x/AlertGroupsPanelCfg_types.gen.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     public/app/plugins/gen.go
-// Using jennies:
-//     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-export const pluginVersion = "10.3.0-pre";
-
-export interface Options {
-  /**
-   * Name of the alertmanager used as a source for alerts
-   */
-  alertmanager: string;
-  /**
-   * Expand all alert groups by default
-   */
-  expandAll: boolean;
-  /**
-   * Comma-separated list of values used to filter alert results
-   */
-  labels: string;
-}
diff --git a/packages/grafana-schema/src/raw/composable/annotationslist/panelcfg/x/AnnotationsListPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/annotationslist/panelcfg/x/AnnotationsListPanelCfg_types.gen.ts
index 08803997ade75..429df18af9bb4 100644
--- a/packages/grafana-schema/src/raw/composable/annotationslist/panelcfg/x/AnnotationsListPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/annotationslist/panelcfg/x/AnnotationsListPanelCfg_types.gen.ts
@@ -4,12 +4,11 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 export interface Options {
   limit: number;
diff --git a/packages/grafana-schema/src/raw/composable/azuremonitor/dataquery/x/AzureMonitorDataQuery_types.gen.ts b/packages/grafana-schema/src/raw/composable/azuremonitor/dataquery/x/AzureMonitorDataQuery_types.gen.ts
index 712b35a32f894..d6d068b7e1eae 100644
--- a/packages/grafana-schema/src/raw/composable/azuremonitor/dataquery/x/AzureMonitorDataQuery_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/azuremonitor/dataquery/x/AzureMonitorDataQuery_types.gen.ts
@@ -4,14 +4,13 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "1.0.0";
+export const pluginVersion = "%VERSION%";
 
 export interface AzureMonitorQuery extends common.DataQuery {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/barchart/panelcfg/x/BarChartPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/barchart/panelcfg/x/BarChartPanelCfg_types.gen.ts
index c86a3d75477aa..554beec23f5cd 100644
--- a/packages/grafana-schema/src/raw/composable/barchart/panelcfg/x/BarChartPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/barchart/panelcfg/x/BarChartPanelCfg_types.gen.ts
@@ -4,14 +4,13 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip, common.OptionsWithTextFormatting {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/bargauge/panelcfg/x/BarGaugePanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/bargauge/panelcfg/x/BarGaugePanelCfg_types.gen.ts
index c4513a6f2dc2a..5325f72c91bb4 100644
--- a/packages/grafana-schema/src/raw/composable/bargauge/panelcfg/x/BarGaugePanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/bargauge/panelcfg/x/BarGaugePanelCfg_types.gen.ts
@@ -4,29 +4,32 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 export interface Options extends common.SingleStatBaseOptions {
   displayMode: common.BarGaugeDisplayMode;
+  maxVizHeight: number;
   minVizHeight: number;
   minVizWidth: number;
   namePlacement: common.BarGaugeNamePlacement;
   showUnfilled: boolean;
+  sizing: common.BarGaugeSizing;
   valueMode: common.BarGaugeValueMode;
 }
 
 export const defaultOptions: Partial<Options> = {
   displayMode: common.BarGaugeDisplayMode.Gradient,
-  minVizHeight: 10,
-  minVizWidth: 0,
+  maxVizHeight: 300,
+  minVizHeight: 16,
+  minVizWidth: 8,
   namePlacement: common.BarGaugeNamePlacement.Auto,
   showUnfilled: true,
+  sizing: common.BarGaugeSizing.Auto,
   valueMode: common.BarGaugeValueMode.Color,
 };
diff --git a/packages/grafana-schema/src/raw/composable/candlestick/panelcfg/x/CandlestickPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/candlestick/panelcfg/x/CandlestickPanelCfg_types.gen.ts
index d1550e115a4ac..bfbd73b7bcf32 100644
--- a/packages/grafana-schema/src/raw/composable/candlestick/panelcfg/x/CandlestickPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/candlestick/panelcfg/x/CandlestickPanelCfg_types.gen.ts
@@ -4,14 +4,13 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 export enum VizDisplayMode {
   Candles = 'candles',
@@ -64,7 +63,7 @@ export const defaultCandlestickColors: Partial<CandlestickColors> = {
   up: 'green',
 };
 
-export interface Options extends common.OptionsWithLegend {
+export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip {
   /**
    * Sets the style of the candlesticks
    */
diff --git a/packages/grafana-schema/src/raw/composable/canvas/panelcfg/x/CanvasPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/canvas/panelcfg/x/CanvasPanelCfg_types.gen.ts
index 8a3eaf86e1b9d..768f5c0ae4fa3 100644
--- a/packages/grafana-schema/src/raw/composable/canvas/panelcfg/x/CanvasPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/canvas/panelcfg/x/CanvasPanelCfg_types.gen.ts
@@ -4,14 +4,13 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 export enum HorizontalConstraint {
   Center = 'center',
@@ -39,6 +38,7 @@ export interface Placement {
   height?: number;
   left?: number;
   right?: number;
+  rotation?: number;
   top?: number;
   width?: number;
 }
@@ -59,6 +59,7 @@ export interface BackgroundConfig {
 
 export interface LineConfig {
   color?: ui.ColorDimensionConfig;
+  radius?: number;
   width?: number;
 }
 
@@ -82,10 +83,17 @@ export interface CanvasConnection {
   path: ConnectionPath;
   size?: ui.ScaleDimensionConfig;
   source: ConnectionCoordinates;
+  sourceOriginal?: ConnectionCoordinates;
   target: ConnectionCoordinates;
   targetName?: string;
+  targetOriginal?: ConnectionCoordinates;
+  vertices?: Array<ConnectionCoordinates>;
 }
 
+export const defaultCanvasConnection: Partial<CanvasConnection> = {
+  vertices: [],
+};
+
 export interface CanvasElementOptions {
   background?: BackgroundConfig;
   border?: LineConfig;
@@ -105,10 +113,18 @@ export const defaultCanvasElementOptions: Partial<CanvasElementOptions> = {
 };
 
 export interface Options {
+  /**
+   * Enable infinite pan
+   */
+  infinitePan: boolean;
   /**
    * Enable inline editing
    */
   inlineEditing: boolean;
+  /**
+   * Enable pan and zoom
+   */
+  panZoom: boolean;
   /**
    * The root element of canvas (frame), where all canvas elements are nested
    * TODO: Figure out how to define a default value for this
@@ -134,6 +150,8 @@ export interface Options {
 }
 
 export const defaultOptions: Partial<Options> = {
+  infinitePan: true,
   inlineEditing: true,
+  panZoom: true,
   showAdvancedTypes: true,
 };
diff --git a/packages/grafana-schema/src/raw/composable/cloudwatch/dataquery/x/CloudWatchDataQuery_types.gen.ts b/packages/grafana-schema/src/raw/composable/cloudwatch/dataquery/x/CloudWatchDataQuery_types.gen.ts
index 70dc8cebf2df1..c3404ba34e040 100644
--- a/packages/grafana-schema/src/raw/composable/cloudwatch/dataquery/x/CloudWatchDataQuery_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/cloudwatch/dataquery/x/CloudWatchDataQuery_types.gen.ts
@@ -4,14 +4,13 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 export interface MetricStat {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/dashboardlist/panelcfg/x/DashboardListPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/dashboardlist/panelcfg/x/DashboardListPanelCfg_types.gen.ts
index 1fe577db3c610..3c51431596ddb 100644
--- a/packages/grafana-schema/src/raw/composable/dashboardlist/panelcfg/x/DashboardListPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/dashboardlist/panelcfg/x/DashboardListPanelCfg_types.gen.ts
@@ -4,12 +4,11 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 export interface Options {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/datagrid/panelcfg/x/DatagridPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/datagrid/panelcfg/x/DatagridPanelCfg_types.gen.ts
index 3f353f364a835..a80268c69cc3d 100644
--- a/packages/grafana-schema/src/raw/composable/datagrid/panelcfg/x/DatagridPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/datagrid/panelcfg/x/DatagridPanelCfg_types.gen.ts
@@ -4,12 +4,11 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 export interface Options {
   selectedSeries: number;
diff --git a/packages/grafana-schema/src/raw/composable/debug/panelcfg/x/DebugPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/debug/panelcfg/x/DebugPanelCfg_types.gen.ts
index ff1ca55673819..492887103c684 100644
--- a/packages/grafana-schema/src/raw/composable/debug/panelcfg/x/DebugPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/debug/panelcfg/x/DebugPanelCfg_types.gen.ts
@@ -4,12 +4,11 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 export type UpdateConfig = {
   render: boolean,
diff --git a/packages/grafana-schema/src/raw/composable/elasticsearch/dataquery/x/ElasticsearchDataQuery_types.gen.ts b/packages/grafana-schema/src/raw/composable/elasticsearch/dataquery/x/ElasticsearchDataQuery_types.gen.ts
index bd1acb20ba2f6..ed63955fbc656 100644
--- a/packages/grafana-schema/src/raw/composable/elasticsearch/dataquery/x/ElasticsearchDataQuery_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/elasticsearch/dataquery/x/ElasticsearchDataQuery_types.gen.ts
@@ -4,14 +4,13 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 export type BucketAggregation = (DateHistogram | Histogram | Terms | Filters | GeoHashGrid | Nested);
 
diff --git a/packages/grafana-schema/src/raw/composable/gauge/panelcfg/x/GaugePanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/gauge/panelcfg/x/GaugePanelCfg_types.gen.ts
index b00ca10dee6b5..b8be225c4b718 100644
--- a/packages/grafana-schema/src/raw/composable/gauge/panelcfg/x/GaugePanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/gauge/panelcfg/x/GaugePanelCfg_types.gen.ts
@@ -4,20 +4,20 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 export interface Options extends common.SingleStatBaseOptions {
   minVizHeight: number;
   minVizWidth: number;
   showThresholdLabels: boolean;
   showThresholdMarkers: boolean;
+  sizing: common.BarGaugeSizing;
 }
 
 export const defaultOptions: Partial<Options> = {
@@ -25,4 +25,5 @@ export const defaultOptions: Partial<Options> = {
   minVizWidth: 75,
   showThresholdLabels: false,
   showThresholdMarkers: true,
+  sizing: common.BarGaugeSizing.Auto,
 };
diff --git a/packages/grafana-schema/src/raw/composable/geomap/panelcfg/x/GeomapPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/geomap/panelcfg/x/GeomapPanelCfg_types.gen.ts
index 871d8ca1e6a80..e4b5e7c2ce94c 100644
--- a/packages/grafana-schema/src/raw/composable/geomap/panelcfg/x/GeomapPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/geomap/panelcfg/x/GeomapPanelCfg_types.gen.ts
@@ -4,14 +4,13 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 export interface Options {
   basemap: ui.MapLayerOptions;
diff --git a/packages/grafana-schema/src/raw/composable/googlecloudmonitoring/dataquery/x/GoogleCloudMonitoringDataQuery_types.gen.ts b/packages/grafana-schema/src/raw/composable/googlecloudmonitoring/dataquery/x/GoogleCloudMonitoringDataQuery_types.gen.ts
index 3dcb1a8595be9..0185e3000b146 100644
--- a/packages/grafana-schema/src/raw/composable/googlecloudmonitoring/dataquery/x/GoogleCloudMonitoringDataQuery_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/googlecloudmonitoring/dataquery/x/GoogleCloudMonitoringDataQuery_types.gen.ts
@@ -4,14 +4,13 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "1.0.0";
+export const pluginVersion = "%VERSION%";
 
 export interface CloudMonitoringQuery extends common.DataQuery {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/grafanapyroscope/dataquery/x/GrafanaPyroscopeDataQuery_types.gen.ts b/packages/grafana-schema/src/raw/composable/grafanapyroscope/dataquery/x/GrafanaPyroscopeDataQuery_types.gen.ts
index 08d7d682b9398..1c5e39ee7168a 100644
--- a/packages/grafana-schema/src/raw/composable/grafanapyroscope/dataquery/x/GrafanaPyroscopeDataQuery_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/grafanapyroscope/dataquery/x/GrafanaPyroscopeDataQuery_types.gen.ts
@@ -4,14 +4,13 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "%VERSION%";
 
 export type PyroscopeQueryType = ('metrics' | 'profile' | 'both');
 
@@ -34,9 +33,14 @@ export interface GrafanaPyroscopeDataQuery extends common.DataQuery {
    * Specifies the type of profile to query.
    */
   profileTypeId: string;
+  /**
+   * Specifies the query span selectors.
+   */
+  spanSelector?: Array<string>;
 }
 
 export const defaultGrafanaPyroscopeDataQuery: Partial<GrafanaPyroscopeDataQuery> = {
   groupBy: [],
   labelSelector: '{}',
+  spanSelector: [],
 };
diff --git a/packages/grafana-schema/src/raw/composable/heatmap/panelcfg/x/HeatmapPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/heatmap/panelcfg/x/HeatmapPanelCfg_types.gen.ts
index f1909d68ff05a..75b1234b457c6 100644
--- a/packages/grafana-schema/src/raw/composable/heatmap/panelcfg/x/HeatmapPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/heatmap/panelcfg/x/HeatmapPanelCfg_types.gen.ts
@@ -4,14 +4,13 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 /**
  * Controls the color mode of the heatmap
@@ -129,10 +128,16 @@ export interface FilterValueRange {
  * Controls tooltip options
  */
 export interface HeatmapTooltip {
+  maxHeight?: number;
+  maxWidth?: number;
   /**
-   * Controls if the tooltip is shown
+   * Controls how the tooltip is shown
    */
-  show: boolean;
+  mode: ui.TooltipDisplayMode;
+  /**
+   * Controls if the tooltip shows a color scale in header
+   */
+  showColorScale?: boolean;
   /**
    * Controls if the tooltip shows a histogram of the y-axis values
    */
@@ -262,8 +267,9 @@ export const defaultOptions: Partial<Options> = {
   },
   showValue: ui.VisibilityMode.Auto,
   tooltip: {
-    show: true,
+    mode: ui.TooltipDisplayMode.Single,
     yHistogram: false,
+    showColorScale: false,
   },
 };
 
diff --git a/packages/grafana-schema/src/raw/composable/histogram/panelcfg/x/HistogramPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/histogram/panelcfg/x/HistogramPanelCfg_types.gen.ts
index 9f8052b21bf76..086f216a9906b 100644
--- a/packages/grafana-schema/src/raw/composable/histogram/panelcfg/x/HistogramPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/histogram/panelcfg/x/HistogramPanelCfg_types.gen.ts
@@ -4,16 +4,19 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip {
+  /**
+   * Bucket count (approx)
+   */
+  bucketCount?: number;
   /**
    * Offset buckets by this amount
    */
@@ -29,10 +32,11 @@ export interface Options extends common.OptionsWithLegend, common.OptionsWithToo
 }
 
 export const defaultOptions: Partial<Options> = {
+  bucketCount: 30,
   bucketOffset: 0,
 };
 
-export interface FieldConfig extends common.AxisConfig, common.HideableFieldConfig {
+export interface FieldConfig extends common.AxisConfig, common.HideableFieldConfig, common.StackableFieldConfig {
   /**
    * Controls the fill opacity of the bars.
    */
diff --git a/packages/grafana-schema/src/raw/composable/logs/panelcfg/x/LogsPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/logs/panelcfg/x/LogsPanelCfg_types.gen.ts
index 8ff4bf643a74b..34d1a60154153 100644
--- a/packages/grafana-schema/src/raw/composable/logs/panelcfg/x/LogsPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/logs/panelcfg/x/LogsPanelCfg_types.gen.ts
@@ -4,14 +4,13 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 export interface Options {
   dedupStrategy: common.LogsDedupStrategy;
@@ -19,6 +18,7 @@ export interface Options {
   prettifyLogMessage: boolean;
   showCommonLabels: boolean;
   showLabels: boolean;
+  showLogContextToggle: boolean;
   showTime: boolean;
   sortOrder: common.LogsSortOrder;
   wrapLogMessage: boolean;
diff --git a/packages/grafana-schema/src/raw/composable/loki/dataquery/x/LokiDataQuery_types.gen.ts b/packages/grafana-schema/src/raw/composable/loki/dataquery/x/LokiDataQuery_types.gen.ts
index c1ed7748d119b..6b17809ec1cfe 100644
--- a/packages/grafana-schema/src/raw/composable/loki/dataquery/x/LokiDataQuery_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/loki/dataquery/x/LokiDataQuery_types.gen.ts
@@ -4,14 +4,13 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 export enum QueryEditorMode {
   Builder = 'builder',
@@ -26,6 +25,7 @@ export enum LokiQueryType {
 
 export enum SupportingQueryType {
   DataSample = 'dataSample',
+  InfiniteScroll = 'infiniteScroll',
   LogsSample = 'logsSample',
   LogsVolume = 'logsVolume',
 }
diff --git a/packages/grafana-schema/src/raw/composable/news/panelcfg/x/NewsPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/news/panelcfg/x/NewsPanelCfg_types.gen.ts
index b0c436d796604..6eb818b4f75b9 100644
--- a/packages/grafana-schema/src/raw/composable/news/panelcfg/x/NewsPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/news/panelcfg/x/NewsPanelCfg_types.gen.ts
@@ -4,12 +4,11 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 export interface Options {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/nodegraph/panelcfg/x/NodeGraphPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/nodegraph/panelcfg/x/NodeGraphPanelCfg_types.gen.ts
index bbc7bf9a6ad19..0a6984797d47b 100644
--- a/packages/grafana-schema/src/raw/composable/nodegraph/panelcfg/x/NodeGraphPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/nodegraph/panelcfg/x/NodeGraphPanelCfg_types.gen.ts
@@ -4,12 +4,11 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 export interface ArcOption {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/parca/dataquery/x/ParcaDataQuery_types.gen.ts b/packages/grafana-schema/src/raw/composable/parca/dataquery/x/ParcaDataQuery_types.gen.ts
index 725eae429b40c..61aeb06a3d1b7 100644
--- a/packages/grafana-schema/src/raw/composable/parca/dataquery/x/ParcaDataQuery_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/parca/dataquery/x/ParcaDataQuery_types.gen.ts
@@ -4,14 +4,13 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "%VERSION%";
 
 export type ParcaQueryType = ('metrics' | 'profile' | 'both');
 
diff --git a/packages/grafana-schema/src/raw/composable/piechart/panelcfg/x/PieChartPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/piechart/panelcfg/x/PieChartPanelCfg_types.gen.ts
index ec27259305fb7..905545644b302 100644
--- a/packages/grafana-schema/src/raw/composable/piechart/panelcfg/x/PieChartPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/piechart/panelcfg/x/PieChartPanelCfg_types.gen.ts
@@ -4,14 +4,13 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 /**
  * Select the pie chart display style.
diff --git a/packages/grafana-schema/src/raw/composable/prometheus/dataquery/x/PrometheusDataQuery_types.gen.ts b/packages/grafana-schema/src/raw/composable/prometheus/dataquery/x/PrometheusDataQuery_types.gen.ts
deleted file mode 100644
index 4b0ccc7fa7c61..0000000000000
--- a/packages/grafana-schema/src/raw/composable/prometheus/dataquery/x/PrometheusDataQuery_types.gen.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     public/app/plugins/gen.go
-// Using jennies:
-//     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-import * as common from '@grafana/schema';
-
-export const pluginVersion = "10.3.0-pre";
-
-export enum QueryEditorMode {
-  Builder = 'builder',
-  Code = 'code',
-}
-
-export type PromQueryFormat = ('time_series' | 'table' | 'heatmap');
-
-export interface PrometheusDataQuery extends common.DataQuery {
-  /**
-   * Specifies which editor is being used to prepare the query. It can be "code" or "builder"
-   */
-  editorMode?: QueryEditorMode;
-  /**
-   * Execute an additional query to identify interesting raw samples relevant for the given expr
-   */
-  exemplar?: boolean;
-  /**
-   * The actual expression/query that will be evaluated by Prometheus
-   */
-  expr: string;
-  /**
-   * Query format to determine how to display data points in panel. It can be "time_series", "table", "heatmap"
-   */
-  format?: PromQueryFormat;
-  /**
-   * Returns only the latest value that Prometheus has scraped for the requested time series
-   */
-  instant?: boolean;
-  /**
-   * @deprecated Used to specify how many times to divide max data points by. We use max data points under query options
-   * See https://github.com/grafana/grafana/issues/48081
-   */
-  intervalFactor?: number;
-  /**
-   * Series name override or template. Ex. {{hostname}} will be replaced with label value for hostname
-   */
-  legendFormat?: string;
-  /**
-   * Returns a Range vector, comprised of a set of time series containing a range of data points over time for each time series
-   */
-  range?: boolean;
-}
diff --git a/packages/grafana-schema/src/raw/composable/stat/panelcfg/x/StatPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/stat/panelcfg/x/StatPanelCfg_types.gen.ts
index 842651d79f4e9..d06e86987a151 100644
--- a/packages/grafana-schema/src/raw/composable/stat/panelcfg/x/StatPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/stat/panelcfg/x/StatPanelCfg_types.gen.ts
@@ -4,25 +4,28 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 export interface Options extends common.SingleStatBaseOptions {
   colorMode: common.BigValueColorMode;
   graphMode: common.BigValueGraphMode;
   justifyMode: common.BigValueJustifyMode;
+  showPercentChange: boolean;
   textMode: common.BigValueTextMode;
+  wideLayout: boolean;
 }
 
 export const defaultOptions: Partial<Options> = {
   colorMode: common.BigValueColorMode.Value,
   graphMode: common.BigValueGraphMode.Area,
   justifyMode: common.BigValueJustifyMode.Auto,
+  showPercentChange: false,
   textMode: common.BigValueTextMode.Auto,
+  wideLayout: true,
 };
diff --git a/packages/grafana-schema/src/raw/composable/statetimeline/panelcfg/x/StateTimelinePanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/statetimeline/panelcfg/x/StateTimelinePanelCfg_types.gen.ts
index e4493d028493a..7bf0c92bee86b 100644
--- a/packages/grafana-schema/src/raw/composable/statetimeline/panelcfg/x/StateTimelinePanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/statetimeline/panelcfg/x/StateTimelinePanelCfg_types.gen.ts
@@ -4,14 +4,13 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 export interface Options extends ui.OptionsWithLegend, ui.OptionsWithTooltip, ui.OptionsWithTimezones {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/statushistory/panelcfg/x/StatusHistoryPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/statushistory/panelcfg/x/StatusHistoryPanelCfg_types.gen.ts
index 0dc31c87435c8..b796c21a586f0 100644
--- a/packages/grafana-schema/src/raw/composable/statushistory/panelcfg/x/StatusHistoryPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/statushistory/panelcfg/x/StatusHistoryPanelCfg_types.gen.ts
@@ -4,14 +4,13 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 export interface Options extends ui.OptionsWithLegend, ui.OptionsWithTooltip, ui.OptionsWithTimezones {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/table/panelcfg/x/TablePanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/table/panelcfg/x/TablePanelCfg_types.gen.ts
index c891a59b1a485..d358ee664a56c 100644
--- a/packages/grafana-schema/src/raw/composable/table/panelcfg/x/TablePanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/table/panelcfg/x/TablePanelCfg_types.gen.ts
@@ -4,14 +4,13 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 export interface Options {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/tempo/dataquery/x/TempoDataQuery_types.gen.ts b/packages/grafana-schema/src/raw/composable/tempo/dataquery/x/TempoDataQuery_types.gen.ts
index 539dc05c02259..fbb226a11f3fd 100644
--- a/packages/grafana-schema/src/raw/composable/tempo/dataquery/x/TempoDataQuery_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/tempo/dataquery/x/TempoDataQuery_types.gen.ts
@@ -4,14 +4,13 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "%VERSION%";
 
 export interface TempoQuery extends common.DataQuery {
   filters: Array<TraceqlFilter>;
@@ -44,9 +43,9 @@ export interface TempoQuery extends common.DataQuery {
    */
   serviceMapIncludeNamespace?: boolean;
   /**
-   * Filters to be included in a PromQL query to select data for the service graph. Example: {client="app",service="app"}
+   * Filters to be included in a PromQL query to select data for the service graph. Example: {client="app",service="app"}. Providing multiple values will produce union of results for each filter, using PromQL OR operator internally.
    */
-  serviceMapQuery?: string;
+  serviceMapQuery?: (string | Array<string>);
   /**
    * @deprecated Query traces by service name
    */
@@ -70,10 +69,7 @@ export const defaultTempoQuery: Partial<TempoQuery> = {
   groupBy: [],
 };
 
-/**
- * search = Loki search, nativeSearch = Tempo search for backwards compatibility
- */
-export type TempoQueryType = ('traceql' | 'traceqlSearch' | 'search' | 'serviceMap' | 'upload' | 'nativeSearch' | 'traceId' | 'clear');
+export type TempoQueryType = ('traceql' | 'traceqlSearch' | 'serviceMap' | 'upload' | 'nativeSearch' | 'traceId' | 'clear');
 
 /**
  * The state of the TraceQL streaming search query
diff --git a/packages/grafana-schema/src/raw/composable/testdata/dataquery/x/TestDataDataQuery_types.gen.ts b/packages/grafana-schema/src/raw/composable/testdata/dataquery/x/TestDataDataQuery_types.gen.ts
deleted file mode 100644
index de0ca9740f027..0000000000000
--- a/packages/grafana-schema/src/raw/composable/testdata/dataquery/x/TestDataDataQuery_types.gen.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     public/app/plugins/gen.go
-// Using jennies:
-//     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-import * as common from '@grafana/schema';
-
-export const pluginVersion = "%VERSION%";
-
-export enum TestDataQueryType {
-  Annotations = 'annotations',
-  Arrow = 'arrow',
-  CSVContent = 'csv_content',
-  CSVFile = 'csv_file',
-  CSVMetricValues = 'csv_metric_values',
-  DataPointsOutsideRange = 'datapoints_outside_range',
-  ExponentialHeatmapBucketData = 'exponential_heatmap_bucket_data',
-  FlameGraph = 'flame_graph',
-  GrafanaAPI = 'grafana_api',
-  LinearHeatmapBucketData = 'linear_heatmap_bucket_data',
-  Live = 'live',
-  Logs = 'logs',
-  ManualEntry = 'manual_entry',
-  NoDataPoints = 'no_data_points',
-  NodeGraph = 'node_graph',
-  PredictableCSVWave = 'predictable_csv_wave',
-  PredictablePulse = 'predictable_pulse',
-  RandomWalk = 'random_walk',
-  RandomWalkTable = 'random_walk_table',
-  RandomWalkWithError = 'random_walk_with_error',
-  RawFrame = 'raw_frame',
-  ServerError500 = 'server_error_500',
-  Simulation = 'simulation',
-  SlowQuery = 'slow_query',
-  StreamingClient = 'streaming_client',
-  TableStatic = 'table_static',
-  Trace = 'trace',
-  USA = 'usa',
-  VariablesQuery = 'variables-query',
-}
-
-export interface StreamingQuery {
-  bands?: number;
-  noise: number;
-  speed: number;
-  spread: number;
-  type: ('signal' | 'logs' | 'fetch');
-  url?: string;
-}
-
-export interface PulseWaveQuery {
-  offCount?: number;
-  offValue?: number;
-  onCount?: number;
-  onValue?: number;
-  timeStep?: number;
-}
-
-export interface SimulationQuery {
-  config?: Record<string, unknown>;
-  key: {
-    type: string;
-    tick: number;
-    uid?: string;
-  };
-  last?: boolean;
-  stream?: boolean;
-}
-
-export interface NodesQuery {
-  count?: number;
-  type?: ('random' | 'response' | 'random edges');
-}
-
-export interface USAQuery {
-  fields?: Array<string>;
-  mode?: string;
-  period?: string;
-  states?: Array<string>;
-}
-
-export const defaultUSAQuery: Partial<USAQuery> = {
-  fields: [],
-  states: [],
-};
-
-export interface CSVWave {
-  labels?: string;
-  name?: string;
-  timeStep?: number;
-  valuesCSV?: string;
-}
-
-/**
- * TODO: Should this live here given it's not used in the dataquery?
- */
-export interface Scenario {
-  description?: string;
-  hideAliasField?: boolean;
-  id: string;
-  name: string;
-  stringInput: string;
-}
-
-export interface TestDataDataQuery extends common.DataQuery {
-  alias?: string;
-  channel?: string;
-  csvContent?: string;
-  csvFileName?: string;
-  csvWave?: Array<CSVWave>; // TODO can we prevent partial from being generated
-  /**
-   * Drop percentage (the chance we will lose a point 0-100)
-   */
-  dropPercent?: number;
-  errorType?: ('server_panic' | 'frontend_exception' | 'frontend_observable');
-  flamegraphDiff?: boolean;
-  labels?: string;
-  levelColumn?: boolean;
-  lines?: number;
-  nodes?: NodesQuery;
-  points?: Array<Array<(string | number)>>;
-  pulseWave?: PulseWaveQuery;
-  rawFrameContent?: string;
-  scenarioId?: TestDataQueryType;
-  seriesCount?: number;
-  sim?: SimulationQuery;
-  spanCount?: number;
-  stream?: StreamingQuery;
-  stringInput?: string;
-  usa?: USAQuery;
-}
-
-export const defaultTestDataDataQuery: Partial<TestDataDataQuery> = {
-  csvWave: [],
-  points: [],
-  scenarioId: TestDataQueryType.RandomWalk,
-};
diff --git a/packages/grafana-schema/src/raw/composable/text/panelcfg/x/TextPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/text/panelcfg/x/TextPanelCfg_types.gen.ts
index 10a6554136953..3c64e8ffa4cc8 100644
--- a/packages/grafana-schema/src/raw/composable/text/panelcfg/x/TextPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/text/panelcfg/x/TextPanelCfg_types.gen.ts
@@ -4,12 +4,11 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 export enum TextMode {
   Code = 'code',
diff --git a/packages/grafana-schema/src/raw/composable/timeseries/panelcfg/x/TimeSeriesPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/timeseries/panelcfg/x/TimeSeriesPanelCfg_types.gen.ts
index 98cc40cd5eeea..6f5bc7b6cbe99 100644
--- a/packages/grafana-schema/src/raw/composable/timeseries/panelcfg/x/TimeSeriesPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/timeseries/panelcfg/x/TimeSeriesPanelCfg_types.gen.ts
@@ -4,17 +4,17 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 export interface Options extends common.OptionsWithTimezones {
   legend: common.VizLegendOptions;
+  orientation?: common.VizOrientation;
   tooltip: common.VizTooltipOptions;
 }
 
diff --git a/packages/grafana-schema/src/raw/composable/trend/panelcfg/x/TrendPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/trend/panelcfg/x/TrendPanelCfg_types.gen.ts
index 7d981861db206..a1b0a7a04d6e5 100644
--- a/packages/grafana-schema/src/raw/composable/trend/panelcfg/x/TrendPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/trend/panelcfg/x/TrendPanelCfg_types.gen.ts
@@ -4,14 +4,13 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
 /**
  * Identical to timeseries... except it does not have timezone settings
diff --git a/packages/grafana-schema/src/raw/composable/xychart/panelcfg/x/XYChartPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/xychart/panelcfg/x/XYChartPanelCfg_types.gen.ts
index 32dda0292b416..4ea19439ea558 100644
--- a/packages/grafana-schema/src/raw/composable/xychart/panelcfg/x/XYChartPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/xychart/panelcfg/x/XYChartPanelCfg_types.gen.ts
@@ -4,15 +4,17 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     LatestMajorsOrXJenny
-//     PluginEachMajorJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.3.0-pre";
+export const pluginVersion = "11.0.0";
 
+/**
+ * Auto is "table" in the UI
+ */
 export enum SeriesMapping {
   Auto = 'auto',
   Manual = 'manual',
@@ -24,6 +26,9 @@ export enum ScatterShow {
   PointsAndLines = 'points+lines',
 }
 
+/**
+ * Configuration for the Table/Auto mode
+ */
 export interface XYDimensionConfig {
   exclude?: Array<string>;
   frame: number;
@@ -51,13 +56,20 @@ export const defaultFieldConfig: Partial<FieldConfig> = {
 };
 
 export interface ScatterSeriesConfig extends FieldConfig {
+  frame?: number;
   name?: string;
   x?: string;
   y?: string;
 }
 
 export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip {
+  /**
+   * Table Mode (auto)
+   */
   dims: XYDimensionConfig;
+  /**
+   * Manual Mode
+   */
   series: Array<ScatterSeriesConfig>;
   seriesMapping?: SeriesMapping;
 }
diff --git a/packages/grafana-schema/src/raw/composable/xychart2/panelcfg/x/XYChartPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/xychart2/panelcfg/x/XYChartPanelCfg_types.gen.ts
new file mode 100644
index 0000000000000..286f9026b4c29
--- /dev/null
+++ b/packages/grafana-schema/src/raw/composable/xychart2/panelcfg/x/XYChartPanelCfg_types.gen.ts
@@ -0,0 +1,95 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     public/app/plugins/gen.go
+// Using jennies:
+//     TSTypesJenny
+//     PluginTsTypesJenny
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+import * as common from '@grafana/schema';
+
+export const pluginVersion = "11.0.0-pre";
+
+/**
+ * Auto is "table" in the UI
+ */
+export enum SeriesMapping {
+  Auto = 'auto',
+  Manual = 'manual',
+}
+
+export enum XYShowMode {
+  Lines = 'lines',
+  Points = 'points',
+  PointsAndLines = 'points+lines',
+}
+
+/**
+ * NOTE: (copied from dashboard_kind.cue, since not exported)
+ * Matcher is a predicate configuration. Based on the config a set of field(s) or values is filtered in order to apply override / transformation.
+ * It comes with in id ( to resolve implementation from registry) and a configuration that’s specific to a particular matcher type.
+ */
+export interface MatcherConfig {
+  /**
+   * The matcher id. This is used to find the matcher implementation from registry.
+   */
+  id: string;
+  /**
+   * The matcher options. This is specific to the matcher implementation.
+   */
+  options?: unknown;
+}
+
+export const defaultMatcherConfig: Partial<MatcherConfig> = {
+  id: '',
+};
+
+export interface FieldConfig extends common.HideableFieldConfig, common.AxisConfig {
+  lineStyle?: common.LineStyle;
+  /**
+   * lineColor?: common.ColorDimensionConfig
+   */
+  lineWidth?: number;
+  pointSize?: {
+    fixed?: number;
+    min?: number;
+    max?: number;
+  };
+  show?: XYShowMode;
+}
+
+export const defaultFieldConfig: Partial<FieldConfig> = {
+  show: XYShowMode.Points,
+};
+
+export interface XYSeriesConfig {
+  color?: {
+    matcher: MatcherConfig;
+  };
+  frame?: {
+    matcher: MatcherConfig;
+  };
+  name?: {
+    fixed?: string;
+  };
+  size?: {
+    matcher: MatcherConfig;
+  };
+  x?: {
+    matcher: MatcherConfig;
+  };
+  y?: {
+    matcher: MatcherConfig;
+  };
+}
+
+export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip {
+  mapping: SeriesMapping;
+  series: Array<XYSeriesConfig>;
+}
+
+export const defaultOptions: Partial<Options> = {
+  series: [],
+};
diff --git a/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts b/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts
index d16491351f700..9b3d3b545044f 100644
--- a/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts
+++ b/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     TSResourceJenny
+//     TSTypesJenny
 //     LatestMajorsOrXJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
@@ -126,6 +126,10 @@ export const defaultAnnotationQuery: Partial<AnnotationQuery> = {
  * A variable is a placeholder for a value. You can use variables in metric queries and in panel titles.
  */
 export interface VariableModel {
+  /**
+   * Custom all value
+   */
+  allValue?: string;
   /**
    * Shows current selected variable text/value on the dashboard
    */
@@ -142,6 +146,10 @@ export interface VariableModel {
    * Visibility configuration for the variable
    */
   hide?: VariableHide;
+  /**
+   * Whether all value option is available or not
+   */
+  includeAll?: boolean;
   /**
    * Optional display name
    */
@@ -162,7 +170,15 @@ export interface VariableModel {
    * Query used to fetch values for a variable
    */
   query?: (string | Record<string, unknown>);
+  /**
+   * Options to config when to refresh a variable
+   */
   refresh?: VariableRefresh;
+  /**
+   * Optional field, if you want to extract part of a series name or metric node segment.
+   * Named capture groups can be used to separate the display text and value.
+   */
+  regex?: string;
   /**
    * Whether the variable value should be managed by URL query params or not
    */
@@ -178,6 +194,7 @@ export interface VariableModel {
 }
 
 export const defaultVariableModel: Partial<VariableModel> = {
+  includeAll: false,
   multi: false,
   options: [],
   skipUrlSync: false,
@@ -233,6 +250,8 @@ export enum VariableHide {
  * `4`: Numerical DESC
  * `5`: Alphabetical Case Insensitive ASC
  * `6`: Alphabetical Case Insensitive DESC
+ * `7`: Natural ASC
+ * `8`: Natural DESC
  */
 export enum VariableSort {
   alphabeticalAsc = 1,
@@ -240,6 +259,8 @@ export enum VariableSort {
   alphabeticalCaseInsensitiveDesc = 6,
   alphabeticalDesc = 2,
   disabled = 0,
+  naturalAsc = 7,
+  naturalDesc = 8,
   numericalAsc = 3,
   numericalDesc = 4,
 }
@@ -301,7 +322,7 @@ export interface DashboardLink {
   /**
    * Link URL. Only required/valid if the type is link
    */
-  url: string;
+  url?: string;
 }
 
 export const defaultDashboardLink: Partial<DashboardLink> = {
@@ -328,7 +349,7 @@ export type DashboardLinkType = ('link' | 'dashboards');
  * `custom`: Define the variable options manually using a comma-separated list.
  * `system`: Variables defined by Grafana. See: https://grafana.com/docs/grafana/latest/dashboards/variables/add-template-variables/#global-variables
  */
-export type VariableType = ('query' | 'adhoc' | 'constant' | 'datasource' | 'interval' | 'textbox' | 'custom' | 'system');
+export type VariableType = ('query' | 'adhoc' | 'groupby' | 'constant' | 'datasource' | 'interval' | 'textbox' | 'custom' | 'system');
 
 /**
  * Color mode for a field. You can specify a single color, or select a continuous (gradient) color schemes, based on a value.
@@ -619,8 +640,41 @@ export interface DataTransformerConfig {
    * Valid options depend on the transformer id
    */
   options: unknown;
+  /**
+   * Where to pull DataFrames from as input to transformation
+   */
+  topic?: ('series' | 'annotations' | 'alertStates'); // replaced with common.DataTopic
 }
 
+/**
+ * Time picker configuration
+ * It defines the default config for the time picker and the refresh picker for the specific dashboard.
+ */
+export interface TimePickerConfig {
+  /**
+   * Whether timepicker is visible or not.
+   */
+  hidden?: boolean;
+  /**
+   * Override the now time by entering a time delay. Use this option to accommodate known delays in data aggregation to avoid null values.
+   */
+  nowDelay?: string;
+  /**
+   * Interval options available in the refresh picker dropdown.
+   */
+  refresh_intervals?: Array<string>;
+  /**
+   * Selectable options available in the time picker dropdown. Has no effect on provisioned dashboard.
+   */
+  time_options?: Array<string>;
+}
+
+export const defaultTimePickerConfig: Partial<TimePickerConfig> = {
+  hidden: false,
+  refresh_intervals: ['5s', '10s', '30s', '1m', '5m', '15m', '30m', '1h', '2h', '1d'],
+  time_options: ['5m', '15m', '1h', '6h', '12h', '24h', '2d', '7d', '30d'],
+};
+
 /**
  * 0 for no shared crosshair or tooltip (default).
  * 1 for shared crosshair.
@@ -638,6 +692,10 @@ export const defaultDashboardCursorSync: DashboardCursorSync = DashboardCursorSy
  * Dashboard panels are the basic visualization building blocks.
  */
 export interface Panel {
+  /**
+   * Sets panel queries cache timeout.
+   */
+  cacheTimeout?: string;
   /**
    * The datasource used in all targets.
    */
@@ -694,6 +752,10 @@ export interface Panel {
    * The version of the plugin that is used for this panel. This is used to find the plugin to display the panel and to migrate old panel configs.
    */
   pluginVersion?: string;
+  /**
+   * Overrides the data source configured time-to-live for a query cache item in milliseconds
+   */
+  queryCachingTTL?: number;
   /**
    * Name of template variable to repeat for.
    */
@@ -703,10 +765,6 @@ export interface Panel {
    * `h` for horizontal, `v` for vertical.
    */
   repeatDirection?: ('h' | 'v');
-  /**
-   * Tags for the panel.
-   */
-  tags?: Array<string>;
   /**
    * Depends on the panel plugin. See the plugin documentation for details.
    */
@@ -752,7 +810,6 @@ export interface Panel {
 export const defaultPanel: Partial<Panel> = {
   links: [],
   repeatDirection: 'h',
-  tags: [],
   targets: [],
   transformations: [],
   transparent: false,
@@ -937,7 +994,7 @@ export interface RowPanel {
   /**
    * List of panels in the row
    */
-  panels: Array<(Panel | GraphPanel | HeatmapPanel)>;
+  panels: Array<Panel>;
   /**
    * Name of template variable to repeat for.
    */
@@ -957,30 +1014,6 @@ export const defaultRowPanel: Partial<RowPanel> = {
   panels: [],
 };
 
-/**
- * Support for legacy graph panel.
- * @deprecated this a deprecated panel type
- */
-export interface GraphPanel {
-  /**
-   * @deprecated this is part of deprecated graph panel
-   */
-  legend?: {
-    show: boolean;
-    sort?: string;
-    sortDesc?: boolean;
-  };
-  type: 'graph';
-}
-
-/**
- * Support for legacy heatmap panel.
- * @deprecated this a deprecated panel type
- */
-export interface HeatmapPanel {
-  type: 'heatmap';
-}
-
 export interface Dashboard {
   /**
    * Contains the list of annotations that are associated with the dashboard.
@@ -1028,11 +1061,11 @@ export interface Dashboard {
   /**
    * List of dashboard panels
    */
-  panels?: Array<(Panel | RowPanel | GraphPanel | HeatmapPanel)>;
+  panels?: Array<(Panel | RowPanel)>;
   /**
    * Refresh rate of dashboard. Represented via interval string, e.g. "5s", "1m", "1h", "1d".
    */
-  refresh?: (string | false);
+  refresh?: string;
   /**
    * This property should only be used in dashboards defined by plugins.  It is a quick check
    * to see if the version has changed since the last time.
@@ -1063,6 +1096,10 @@ export interface Dashboard {
      * external url, if snapshot was shared in external grafana instance
      */
     externalUrl: string;
+    /**
+     * original url, url of the dashboard that was snapshotted
+     */
+    originalUrl: string;
     /**
      * Unique identifier of the snapshot
      */
@@ -1116,24 +1153,7 @@ export interface Dashboard {
   /**
    * Configuration of the time picker shown at the top of a dashboard.
    */
-  timepicker?: {
-    /**
-     * Whether timepicker is visible or not.
-     */
-    hidden: boolean;
-    /**
-     * Interval options available in the refresh picker dropdown.
-     */
-    refresh_intervals: Array<string>;
-    /**
-     * Whether timepicker is collapsed or not. Has no effect on provisioned dashboard.
-     */
-    collapse: boolean;
-    /**
-     * Selectable options available in the time picker dropdown. Has no effect on provisioned dashboard.
-     */
-    time_options: Array<string>;
-  };
+  timepicker?: TimePickerConfig;
   /**
    * Timezone of dashboard. Accepted values are IANA TZDB zone ID or "browser" or "utc".
    */
diff --git a/packages/grafana-schema/src/raw/folder/x/folder_types.gen.ts b/packages/grafana-schema/src/raw/folder/x/folder_types.gen.ts
deleted file mode 100644
index 77a49f1b3df32..0000000000000
--- a/packages/grafana-schema/src/raw/folder/x/folder_types.gen.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     TSResourceJenny
-//     LatestMajorsOrXJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-/**
- * TODO:
- * common metadata will soon support setting the parent folder in the metadata
- */
-export interface Folder {
-  /**
-   * Description of the folder.
-   */
-  description?: string;
-  /**
-   * Folder title
-   */
-  title: string;
-  /**
-   * Unique folder id. (will be k8s name)
-   */
-  uid: string;
-}
diff --git a/packages/grafana-schema/src/raw/librarypanel/x/librarypanel_types.gen.ts b/packages/grafana-schema/src/raw/librarypanel/x/librarypanel_types.gen.ts
index d3b967e7a76a5..97cba2a5c5ee5 100644
--- a/packages/grafana-schema/src/raw/librarypanel/x/librarypanel_types.gen.ts
+++ b/packages/grafana-schema/src/raw/librarypanel/x/librarypanel_types.gen.ts
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     TSResourceJenny
+//     TSTypesJenny
 //     LatestMajorsOrXJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
diff --git a/packages/grafana-schema/src/raw/preferences/x/preferences_types.gen.ts b/packages/grafana-schema/src/raw/preferences/x/preferences_types.gen.ts
index d240e05754544..b685f299f2ef7 100644
--- a/packages/grafana-schema/src/raw/preferences/x/preferences_types.gen.ts
+++ b/packages/grafana-schema/src/raw/preferences/x/preferences_types.gen.ts
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     TSResourceJenny
+//     TSTypesJenny
 //     LatestMajorsOrXJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
@@ -21,6 +21,10 @@ export interface CookiePreferences {
   performance?: Record<string, unknown>;
 }
 
+/**
+ * Spec defines user, team or org Grafana preferences
+ * swagger:model Preferences
+ */
 export interface Preferences {
   /**
    * Cookie preferences
diff --git a/packages/grafana-schema/src/raw/publicdashboard/x/publicdashboard_types.gen.ts b/packages/grafana-schema/src/raw/publicdashboard/x/publicdashboard_types.gen.ts
index 9a1ae8596fd71..b94e4baefe385 100644
--- a/packages/grafana-schema/src/raw/publicdashboard/x/publicdashboard_types.gen.ts
+++ b/packages/grafana-schema/src/raw/publicdashboard/x/publicdashboard_types.gen.ts
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     TSResourceJenny
+//     TSTypesJenny
 //     LatestMajorsOrXJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
diff --git a/packages/grafana-schema/src/raw/role/x/role_types.gen.ts b/packages/grafana-schema/src/raw/role/x/role_types.gen.ts
index 781665e925063..88cadf639fef5 100644
--- a/packages/grafana-schema/src/raw/role/x/role_types.gen.ts
+++ b/packages/grafana-schema/src/raw/role/x/role_types.gen.ts
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     TSResourceJenny
+//     TSTypesJenny
 //     LatestMajorsOrXJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
diff --git a/packages/grafana-schema/src/raw/rolebinding/x/rolebinding_types.gen.ts b/packages/grafana-schema/src/raw/rolebinding/x/rolebinding_types.gen.ts
index a41535cc5df31..ea6d65fbf4e07 100644
--- a/packages/grafana-schema/src/raw/rolebinding/x/rolebinding_types.gen.ts
+++ b/packages/grafana-schema/src/raw/rolebinding/x/rolebinding_types.gen.ts
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     TSResourceJenny
+//     TSTypesJenny
 //     LatestMajorsOrXJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
diff --git a/packages/grafana-schema/src/raw/team/x/team_types.gen.ts b/packages/grafana-schema/src/raw/team/x/team_types.gen.ts
index fef0a47a87467..4f136372c3764 100644
--- a/packages/grafana-schema/src/raw/team/x/team_types.gen.ts
+++ b/packages/grafana-schema/src/raw/team/x/team_types.gen.ts
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     TSResourceJenny
+//     TSTypesJenny
 //     LatestMajorsOrXJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
diff --git a/packages/grafana-schema/src/veneer/dashboard.types.ts b/packages/grafana-schema/src/veneer/dashboard.types.ts
index 3f85370614eca..9976f4dec9008 100644
--- a/packages/grafana-schema/src/veneer/dashboard.types.ts
+++ b/packages/grafana-schema/src/veneer/dashboard.types.ts
@@ -1,4 +1,4 @@
-import { DataSourceRef as CommonDataSourceRef, DataSourceRef } from '../common/common.gen';
+import { DataSourceRef as CommonDataSourceRef, DataSourceRef, DataTopic } from '../common/common.gen';
 import * as raw from '../raw/dashboard/x/dashboard_types.gen';
 
 import { DataQuery } from './common.types';
@@ -11,7 +11,7 @@ export interface Panel<TOptions = Record<string, unknown>, TCustomFieldConfig =
 }
 
 export interface RowPanel extends Omit<raw.RowPanel, 'panels'> {
-  panels: Array<Panel | raw.GraphPanel | raw.HeatmapPanel>;
+  panels: Panel[];
 }
 
 export enum VariableHide {
@@ -25,7 +25,7 @@ export interface VariableModel extends Omit<raw.VariableModel, 'datasource'> {
 }
 
 export interface Dashboard extends Omit<raw.Dashboard, 'templating' | 'annotations' | 'panels'> {
-  panels?: Array<Panel | RowPanel | raw.GraphPanel | raw.HeatmapPanel>;
+  panels?: Array<Panel | RowPanel>;
   annotations?: AnnotationContainer;
   templating?: {
     list?: VariableModel[];
@@ -59,12 +59,16 @@ export interface MatcherConfig<TConfig = any> extends raw.MatcherConfig {
 
 export interface DataTransformerConfig<TOptions = any> extends raw.DataTransformerConfig {
   options: TOptions;
+  topic?: DataTopic;
 }
 
+export interface TimePickerConfig extends raw.TimePickerConfig {}
+
 export const defaultDashboard = raw.defaultDashboard as Dashboard;
 export const defaultVariableModel = {
   ...raw.defaultVariableModel,
 } as VariableModel;
+export const defaultTimePickerConfig = raw.defaultTimePickerConfig as TimePickerConfig;
 export const defaultPanel: Partial<Panel> = raw.defaultPanel;
 export const defaultRowPanel: Partial<Panel> = raw.defaultRowPanel;
 export const defaultFieldConfig: Partial<FieldConfig> = raw.defaultFieldConfig;
diff --git a/packages/grafana-sql/package.json b/packages/grafana-sql/package.json
new file mode 100644
index 0000000000000..8ea148fdaa119
--- /dev/null
+++ b/packages/grafana-sql/package.json
@@ -0,0 +1,54 @@
+{
+  "author": "Grafana Labs",
+  "license": "AGPL-3.0-only",
+  "private": true,
+  "name": "@grafana/sql",
+  "version": "11.0.0",
+  "repository": {
+    "type": "git",
+    "url": "http://github.com/grafana/grafana.git",
+    "directory": "packages/grafana-sql"
+  },
+  "main": "src/index.ts",
+  "scripts": {
+    "typecheck": "tsc --emitDeclarationOnly false --noEmit"
+  },
+  "dependencies": {
+    "@emotion/css": "11.11.2",
+    "@grafana/data": "11.0.0",
+    "@grafana/experimental": "1.7.10",
+    "@grafana/runtime": "11.0.0",
+    "@grafana/ui": "11.0.0",
+    "@react-awesome-query-builder/ui": "6.4.2",
+    "@types/lodash": "4.17.0",
+    "@types/react-virtualized-auto-sizer": "1.0.4",
+    "@types/uuid": "9.0.8",
+    "immutable": "4.3.5",
+    "lodash": "4.17.21",
+    "react-use": "17.5.0",
+    "react-virtualized-auto-sizer": "1.0.24",
+    "rxjs": "7.8.1",
+    "sql-formatter-plus": "^1.3.6",
+    "tslib": "2.6.2",
+    "uuid": "9.0.1"
+  },
+  "devDependencies": {
+    "@grafana/tsconfig": "^1.3.0-rc1",
+    "@testing-library/jest-dom": "^6.1.2",
+    "@testing-library/react": "14.2.2",
+    "@testing-library/react-hooks": "^8.0.1",
+    "@testing-library/user-event": "14.5.2",
+    "@types/jest": "^29.5.4",
+    "@types/react": "18.2.73",
+    "@types/systemjs": "6.13.5",
+    "@types/testing-library__jest-dom": "5.14.9",
+    "jest": "^29.6.4",
+    "react": "18.2.0",
+    "ts-jest": "29.1.2",
+    "ts-node": "10.9.2",
+    "typescript": "5.3.3"
+  },
+  "peerDependencies": {
+    "@grafana/runtime": "10.4.0-pre"
+  }
+}
diff --git a/public/app/features/plugins/sql/ResponseParser.test.ts b/packages/grafana-sql/src/ResponseParser.test.ts
similarity index 100%
rename from public/app/features/plugins/sql/ResponseParser.test.ts
rename to packages/grafana-sql/src/ResponseParser.test.ts
diff --git a/public/app/features/plugins/sql/ResponseParser.ts b/packages/grafana-sql/src/ResponseParser.ts
similarity index 100%
rename from public/app/features/plugins/sql/ResponseParser.ts
rename to packages/grafana-sql/src/ResponseParser.ts
diff --git a/public/app/features/plugins/sql/components/ConfirmModal.tsx b/packages/grafana-sql/src/components/ConfirmModal.tsx
similarity index 100%
rename from public/app/features/plugins/sql/components/ConfirmModal.tsx
rename to packages/grafana-sql/src/components/ConfirmModal.tsx
diff --git a/public/app/features/plugins/sql/components/DatasetSelector.tsx b/packages/grafana-sql/src/components/DatasetSelector.tsx
similarity index 89%
rename from public/app/features/plugins/sql/components/DatasetSelector.tsx
rename to packages/grafana-sql/src/components/DatasetSelector.tsx
index 2df95568ccf53..11fcac922fb97 100644
--- a/public/app/features/plugins/sql/components/DatasetSelector.tsx
+++ b/packages/grafana-sql/src/components/DatasetSelector.tsx
@@ -4,7 +4,7 @@ import { useAsync } from 'react-use';
 import { SelectableValue } from '@grafana/data';
 import { Select } from '@grafana/ui';
 
-import { DB, ResourceSelectorProps, toOption } from '../types';
+import { DB, ResourceSelectorProps, SQLDialect, toOption } from '../types';
 
 import { isSqlDatasourceDatabaseSelectionFeatureFlagEnabled } from './QueryEditorFeatureFlag.utils';
 
@@ -12,17 +12,11 @@ export interface DatasetSelectorProps extends ResourceSelectorProps {
   db: DB;
   dataset: string | undefined;
   preconfiguredDataset: string;
-  isPostgresInstance: boolean | undefined;
+  dialect: SQLDialect;
   onChange: (v: SelectableValue) => void;
 }
 
-export const DatasetSelector = ({
-  dataset,
-  db,
-  isPostgresInstance,
-  onChange,
-  preconfiguredDataset,
-}: DatasetSelectorProps) => {
+export const DatasetSelector = ({ dataset, db, dialect, onChange, preconfiguredDataset }: DatasetSelectorProps) => {
   /* 
     The behavior of this component - for MSSQL and MySQL datasources - is based on whether the user chose to create a datasource
     with or without a default database (preconfiguredDataset). If the user configured a default database, this selector
@@ -31,7 +25,7 @@ export const DatasetSelector = ({
   */
   // `hasPreconfigCondition` is true if either 1) the sql datasource has a preconfigured default database,
   // OR if 2) the datasource is Postgres. In either case the only option available to the user is the preconfigured database.
-  const hasPreconfigCondition = !!preconfiguredDataset || isPostgresInstance;
+  const hasPreconfigCondition = !!preconfiguredDataset || dialect === 'postgres';
 
   const state = useAsync(async () => {
     if (isSqlDatasourceDatabaseSelectionFeatureFlagEnabled()) {
diff --git a/public/app/features/plugins/sql/components/ErrorBoundary.tsx b/packages/grafana-sql/src/components/ErrorBoundary.tsx
similarity index 100%
rename from public/app/features/plugins/sql/components/ErrorBoundary.tsx
rename to packages/grafana-sql/src/components/ErrorBoundary.tsx
diff --git a/packages/grafana-sql/src/components/QueryEditor.tsx b/packages/grafana-sql/src/components/QueryEditor.tsx
new file mode 100644
index 0000000000000..cfefaf3793572
--- /dev/null
+++ b/packages/grafana-sql/src/components/QueryEditor.tsx
@@ -0,0 +1,134 @@
+import React, { useCallback, useEffect, useState } from 'react';
+import { useAsync } from 'react-use';
+
+import { QueryEditorProps } from '@grafana/data';
+import { EditorMode } from '@grafana/experimental';
+import { Space } from '@grafana/ui';
+
+import { SqlDatasource } from '../datasource/SqlDatasource';
+import { applyQueryDefaults } from '../defaults';
+import { SQLQuery, QueryRowFilter, SQLOptions } from '../types';
+import { haveColumns } from '../utils/sql.utils';
+
+import { QueryHeader, QueryHeaderProps } from './QueryHeader';
+import { RawEditor } from './query-editor-raw/RawEditor';
+import { VisualEditor } from './visual-query-builder/VisualEditor';
+
+interface SqlQueryEditorProps extends QueryEditorProps<SqlDatasource, SQLQuery, SQLOptions> {
+  queryHeaderProps?: Pick<QueryHeaderProps, 'dialect'>;
+}
+
+export function SqlQueryEditor({
+  datasource,
+  query,
+  onChange,
+  onRunQuery,
+  range,
+  queryHeaderProps,
+}: SqlQueryEditorProps) {
+  const [isQueryRunnable, setIsQueryRunnable] = useState(true);
+  const db = datasource.getDB();
+
+  const { preconfiguredDatabase } = datasource;
+  const dialect = queryHeaderProps?.dialect ?? 'other';
+  const { loading, error } = useAsync(async () => {
+    return () => {
+      if (datasource.getDB(datasource.id).init !== undefined) {
+        datasource.getDB(datasource.id).init!();
+      }
+    };
+  }, [datasource]);
+
+  const queryWithDefaults = applyQueryDefaults(query);
+  const [queryRowFilter, setQueryRowFilter] = useState<QueryRowFilter>({
+    filter: !!queryWithDefaults.sql?.whereString,
+    group: !!queryWithDefaults.sql?.groupBy?.[0]?.property.name,
+    order: !!queryWithDefaults.sql?.orderBy?.property.name,
+    preview: true,
+  });
+  const [queryToValidate, setQueryToValidate] = useState(queryWithDefaults);
+
+  useEffect(() => {
+    return () => {
+      if (datasource.getDB(datasource.id).dispose !== undefined) {
+        datasource.getDB(datasource.id).dispose!();
+      }
+    };
+  }, [datasource]);
+
+  const processQuery = useCallback(
+    (q: SQLQuery) => {
+      if (isQueryValid(q) && onRunQuery) {
+        onRunQuery();
+      }
+    },
+    [onRunQuery]
+  );
+
+  const onQueryChange = (q: SQLQuery, process = true) => {
+    setQueryToValidate(q);
+    onChange(q);
+
+    if (haveColumns(q.sql?.columns) && q.sql?.columns.some((c) => c.name) && !queryRowFilter.group) {
+      setQueryRowFilter({ ...queryRowFilter, group: true });
+    }
+
+    if (process) {
+      processQuery(q);
+    }
+  };
+
+  const onQueryHeaderChange = (q: SQLQuery) => {
+    setQueryToValidate(q);
+    onChange(q);
+  };
+
+  if (loading || error) {
+    return null;
+  }
+
+  return (
+    <>
+      <QueryHeader
+        db={db}
+        preconfiguredDataset={preconfiguredDatabase}
+        onChange={onQueryHeaderChange}
+        onRunQuery={onRunQuery}
+        onQueryRowChange={setQueryRowFilter}
+        queryRowFilter={queryRowFilter}
+        query={queryWithDefaults}
+        isQueryRunnable={isQueryRunnable}
+        dialect={dialect}
+      />
+
+      <Space v={0.5} />
+
+      {queryWithDefaults.editorMode !== EditorMode.Code && (
+        <VisualEditor
+          db={db}
+          query={queryWithDefaults}
+          onChange={(q: SQLQuery) => onQueryChange(q, false)}
+          queryRowFilter={queryRowFilter}
+          onValidate={setIsQueryRunnable}
+          range={range}
+        />
+      )}
+
+      {queryWithDefaults.editorMode === EditorMode.Code && (
+        <RawEditor
+          db={db}
+          query={queryWithDefaults}
+          queryToValidate={queryToValidate}
+          onChange={onQueryChange}
+          onRunQuery={onRunQuery}
+          onValidate={setIsQueryRunnable}
+          range={range}
+        />
+      )}
+    </>
+  );
+}
+
+const isQueryValid = (q: SQLQuery) => {
+  return Boolean(q.rawSql);
+};
diff --git a/public/app/features/plugins/sql/components/QueryEditorFeatureFlag.utils.ts b/packages/grafana-sql/src/components/QueryEditorFeatureFlag.utils.ts
similarity index 100%
rename from public/app/features/plugins/sql/components/QueryEditorFeatureFlag.utils.ts
rename to packages/grafana-sql/src/components/QueryEditorFeatureFlag.utils.ts
diff --git a/packages/grafana-sql/src/components/QueryHeader.tsx b/packages/grafana-sql/src/components/QueryHeader.tsx
new file mode 100644
index 0000000000000..3501a5e9ea320
--- /dev/null
+++ b/packages/grafana-sql/src/components/QueryHeader.tsx
@@ -0,0 +1,320 @@
+import React, { useCallback, useState } from 'react';
+import { useCopyToClipboard } from 'react-use';
+import { v4 as uuidv4 } from 'uuid';
+
+import { SelectableValue } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { EditorField, EditorHeader, EditorMode, EditorRow, FlexItem, InlineSelect } from '@grafana/experimental';
+import { reportInteraction } from '@grafana/runtime';
+import { Button, InlineSwitch, RadioButtonGroup, Tooltip, Space } from '@grafana/ui';
+
+import { QueryWithDefaults } from '../defaults';
+import { SQLQuery, QueryFormat, QueryRowFilter, QUERY_FORMAT_OPTIONS, DB, SQLDialect } from '../types';
+
+import { ConfirmModal } from './ConfirmModal';
+import { DatasetSelector } from './DatasetSelector';
+import { isSqlDatasourceDatabaseSelectionFeatureFlagEnabled } from './QueryEditorFeatureFlag.utils';
+import { TableSelector } from './TableSelector';
+
+export interface QueryHeaderProps {
+  db: DB;
+  dialect: SQLDialect;
+  isQueryRunnable: boolean;
+  onChange: (query: SQLQuery) => void;
+  onQueryRowChange: (queryRowFilter: QueryRowFilter) => void;
+  onRunQuery: () => void;
+  preconfiguredDataset: string;
+  query: QueryWithDefaults;
+  queryRowFilter: QueryRowFilter;
+}
+
+const editorModes = [
+  { label: 'Builder', value: EditorMode.Builder },
+  { label: 'Code', value: EditorMode.Code },
+];
+
+export function QueryHeader({
+  db,
+  dialect,
+  isQueryRunnable,
+  onChange,
+  onQueryRowChange,
+  onRunQuery,
+  preconfiguredDataset,
+  query,
+  queryRowFilter,
+}: QueryHeaderProps) {
+  const { editorMode } = query;
+  const [_, copyToClipboard] = useCopyToClipboard();
+  const [showConfirm, setShowConfirm] = useState(false);
+  const toRawSql = db.toRawSql;
+
+  const onEditorModeChange = useCallback(
+    (newEditorMode: EditorMode) => {
+      if (newEditorMode === EditorMode.Code) {
+        reportInteraction('grafana_sql_editor_mode_changed', {
+          datasource: query.datasource?.type,
+          selectedEditorMode: EditorMode.Code,
+        });
+      }
+
+      if (editorMode === EditorMode.Code) {
+        setShowConfirm(true);
+        return;
+      }
+      onChange({ ...query, editorMode: newEditorMode });
+    },
+    [editorMode, onChange, query]
+  );
+
+  const onFormatChange = (e: SelectableValue) => {
+    const next = { ...query, format: e.value !== undefined ? e.value : QueryFormat.Table };
+
+    reportInteraction('grafana_sql_format_changed', {
+      datasource: query.datasource?.type,
+      selectedFormat: next.format,
+    });
+    onChange(next);
+  };
+
+  const onDatasetChange = (e: SelectableValue) => {
+    if (e.value === query.dataset) {
+      return;
+    }
+
+    const next = {
+      ...query,
+      dataset: e.value,
+      table: undefined,
+      sql: undefined,
+      rawSql: '',
+    };
+
+    onChange(next);
+  };
+
+  const onTableChange = (e: SelectableValue) => {
+    if (e.value === query.table) {
+      return;
+    }
+
+    const next: SQLQuery = {
+      ...query,
+      table: e.value,
+      sql: undefined,
+      rawSql: '',
+    };
+
+    onChange(next);
+  };
+
+  const datasetDropdownIsAvailable = () => {
+    if (dialect === 'influx') {
+      return false;
+    }
+    // If the feature flag is DISABLED, && the datasource is Postgres (`dialect = 'postgres`),
+    // we want to hide the dropdown - as per previous behavior.
+    if (!isSqlDatasourceDatabaseSelectionFeatureFlagEnabled() && dialect === 'postgres') {
+      return false;
+    }
+
+    return true;
+  };
+
+  return (
+    <>
+      <EditorHeader>
+        <InlineSelect
+          label="Format"
+          value={query.format}
+          placeholder="Select format"
+          menuShouldPortal
+          onChange={onFormatChange}
+          options={QUERY_FORMAT_OPTIONS}
+        />
+
+        {editorMode === EditorMode.Builder && (
+          <>
+            <InlineSwitch
+              id={`sql-filter-${uuidv4()}}`}
+              label="Filter"
+              data-testid={selectors.components.SQLQueryEditor.headerFilterSwitch}
+              transparent={true}
+              showLabel={true}
+              value={queryRowFilter.filter}
+              onChange={(ev) => {
+                if (!(ev.target instanceof HTMLInputElement)) {
+                  return;
+                }
+
+                reportInteraction('grafana_sql_filter_toggled', {
+                  datasource: query.datasource?.type,
+                  displayed: ev.target.checked,
+                });
+
+                onQueryRowChange({ ...queryRowFilter, filter: ev.target.checked });
+              }}
+            />
+
+            <InlineSwitch
+              id={`sql-group-${uuidv4()}}`}
+              label="Group"
+              data-testid={selectors.components.SQLQueryEditor.headerGroupSwitch}
+              transparent={true}
+              showLabel={true}
+              value={queryRowFilter.group}
+              onChange={(ev) => {
+                if (!(ev.target instanceof HTMLInputElement)) {
+                  return;
+                }
+
+                reportInteraction('grafana_sql_group_toggled', {
+                  datasource: query.datasource?.type,
+                  displayed: ev.target.checked,
+                });
+
+                onQueryRowChange({ ...queryRowFilter, group: ev.target.checked });
+              }}
+            />
+
+            <InlineSwitch
+              id={`sql-order-${uuidv4()}}`}
+              label="Order"
+              data-testid={selectors.components.SQLQueryEditor.headerOrderSwitch}
+              transparent={true}
+              showLabel={true}
+              value={queryRowFilter.order}
+              onChange={(ev) => {
+                if (!(ev.target instanceof HTMLInputElement)) {
+                  return;
+                }
+
+                reportInteraction('grafana_sql_order_toggled', {
+                  datasource: query.datasource?.type,
+                  displayed: ev.target.checked,
+                });
+
+                onQueryRowChange({ ...queryRowFilter, order: ev.target.checked });
+              }}
+            />
+
+            <InlineSwitch
+              id={`sql-preview-${uuidv4()}}`}
+              label="Preview"
+              data-testid={selectors.components.SQLQueryEditor.headerPreviewSwitch}
+              transparent={true}
+              showLabel={true}
+              value={queryRowFilter.preview}
+              onChange={(ev) => {
+                if (!(ev.target instanceof HTMLInputElement)) {
+                  return;
+                }
+
+                reportInteraction('grafana_sql_preview_toggled', {
+                  datasource: query.datasource?.type,
+                  displayed: ev.target.checked,
+                });
+
+                onQueryRowChange({ ...queryRowFilter, preview: ev.target.checked });
+              }}
+            />
+          </>
+        )}
+
+        <FlexItem grow={1} />
+
+        {isQueryRunnable ? (
+          <Button icon="play" variant="primary" size="sm" onClick={() => onRunQuery()}>
+            Run query
+          </Button>
+        ) : (
+          <Tooltip
+            theme="error"
+            content={
+              <>
+                Your query is invalid. Check below for details. <br />
+                However, you can still run this query.
+              </>
+            }
+            placement="top"
+          >
+            <Button icon="exclamation-triangle" variant="secondary" size="sm" onClick={() => onRunQuery()}>
+              Run query
+            </Button>
+          </Tooltip>
+        )}
+
+        <RadioButtonGroup options={editorModes} size="sm" value={editorMode} onChange={onEditorModeChange} />
+
+        <ConfirmModal
+          isOpen={showConfirm}
+          onCopy={() => {
+            reportInteraction('grafana_sql_editor_mode_changed', {
+              datasource: query.datasource?.type,
+              selectedEditorMode: EditorMode.Builder,
+              type: 'copy',
+            });
+
+            setShowConfirm(false);
+            copyToClipboard(query.rawSql!);
+            onChange({
+              ...query,
+              rawSql: toRawSql(query),
+              editorMode: EditorMode.Builder,
+            });
+          }}
+          onDiscard={() => {
+            reportInteraction('grafana_sql_editor_mode_changed', {
+              datasource: query.datasource?.type,
+              selectedEditorMode: EditorMode.Builder,
+              type: 'discard',
+            });
+
+            setShowConfirm(false);
+            onChange({
+              ...query,
+              rawSql: toRawSql(query),
+              editorMode: EditorMode.Builder,
+            });
+          }}
+          onCancel={() => {
+            reportInteraction('grafana_sql_editor_mode_changed', {
+              datasource: query.datasource?.type,
+              selectedEditorMode: EditorMode.Builder,
+              type: 'cancel',
+            });
+
+            setShowConfirm(false);
+          }}
+        />
+      </EditorHeader>
+
+      {editorMode === EditorMode.Builder && (
+        <>
+          <Space v={0.5} />
+          <EditorRow>
+            {datasetDropdownIsAvailable() && (
+              <EditorField label="Dataset" width={25}>
+                <DatasetSelector
+                  db={db}
+                  dataset={query.dataset}
+                  dialect={dialect}
+                  preconfiguredDataset={preconfiguredDataset}
+                  onChange={onDatasetChange}
+                />
+              </EditorField>
+            )}
+            <EditorField label="Table" width={25}>
+              <TableSelector
+                db={db}
+                dataset={query.dataset || preconfiguredDataset}
+                table={query.table}
+                onChange={onTableChange}
+              />
+            </EditorField>
+          </EditorRow>
+        </>
+      )}
+    </>
+  );
+}
diff --git a/public/app/features/plugins/sql/components/SqlComponents.test.tsx b/packages/grafana-sql/src/components/SqlComponents.test.tsx
similarity index 97%
rename from public/app/features/plugins/sql/components/SqlComponents.test.tsx
rename to packages/grafana-sql/src/components/SqlComponents.test.tsx
index 864ac8a133efb..9cfd8b59565a9 100644
--- a/public/app/features/plugins/sql/components/SqlComponents.test.tsx
+++ b/packages/grafana-sql/src/components/SqlComponents.test.tsx
@@ -30,7 +30,7 @@ describe('DatasetSelector', () => {
   });
 
   it('should not query the database if Postgres instance, and no preconfigured database', async () => {
-    const mockProps = buildMockDatasetSelectorProps({ isPostgresInstance: true });
+    const mockProps = buildMockDatasetSelectorProps({ dialect: 'postgres' });
     render(<DatasetSelector {...mockProps} />);
 
     await waitFor(() => {
diff --git a/public/app/features/plugins/sql/components/SqlComponents.testHelpers.ts b/packages/grafana-sql/src/components/SqlComponents.testHelpers.ts
similarity index 98%
rename from public/app/features/plugins/sql/components/SqlComponents.testHelpers.ts
rename to packages/grafana-sql/src/components/SqlComponents.testHelpers.ts
index 4f605bbc0fb7e..df20f537a2d8e 100644
--- a/public/app/features/plugins/sql/components/SqlComponents.testHelpers.ts
+++ b/packages/grafana-sql/src/components/SqlComponents.testHelpers.ts
@@ -76,7 +76,7 @@ export function buildMockDatasetSelectorProps(overrides?: Partial<DatasetSelecto
   return {
     db: buildMockDB(),
     dataset: '',
-    isPostgresInstance: false,
+    dialect: 'other',
     onChange: jest.fn(),
     preconfiguredDataset: '',
     ...overrides,
diff --git a/public/app/features/plugins/sql/components/TableSelector.tsx b/packages/grafana-sql/src/components/TableSelector.tsx
similarity index 89%
rename from public/app/features/plugins/sql/components/TableSelector.tsx
rename to packages/grafana-sql/src/components/TableSelector.tsx
index bfd3f1f482862..70604b017965d 100644
--- a/public/app/features/plugins/sql/components/TableSelector.tsx
+++ b/packages/grafana-sql/src/components/TableSelector.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { useAsync } from 'react-use';
 
 import { SelectableValue, toOption } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import { Select } from '@grafana/ui';
 
 import { DB, ResourceSelectorProps } from '../types';
@@ -29,6 +30,7 @@ export const TableSelector = ({ db, dataset, table, className, onChange }: Table
       className={className}
       disabled={state.loading}
       aria-label="Table selector"
+      data-testid={selectors.components.SQLQueryEditor.headerTableSelector}
       value={table}
       options={state.value}
       onChange={onChange}
diff --git a/public/app/features/plugins/sql/components/configuration/ConnectionLimits.tsx b/packages/grafana-sql/src/components/configuration/ConnectionLimits.tsx
similarity index 81%
rename from public/app/features/plugins/sql/components/configuration/ConnectionLimits.tsx
rename to packages/grafana-sql/src/components/configuration/ConnectionLimits.tsx
index 10f0eebb1472c..667bc7fe5cb96 100644
--- a/public/app/features/plugins/sql/components/configuration/ConnectionLimits.tsx
+++ b/packages/grafana-sql/src/components/configuration/ConnectionLimits.tsx
@@ -3,25 +3,17 @@ import React from 'react';
 import { DataSourceSettings } from '@grafana/data';
 import { ConfigSubSection, Stack } from '@grafana/experimental';
 import { config } from '@grafana/runtime';
-import { Field, Icon, InlineLabel, Input, Label, Switch, Tooltip } from '@grafana/ui';
+import { Field, Icon, InlineLabel, Label, Switch, Tooltip } from '@grafana/ui';
 
 import { SQLConnectionLimits, SQLOptions } from '../../types';
 
+import { NumberInput } from './NumberInput';
+
 interface Props<T> {
   onOptionsChange: Function;
   options: DataSourceSettings<SQLOptions>;
 }
 
-function toNumber(text: string): number {
-  if (text.trim() === '') {
-    // calling `Number('')` returns zero,
-    // so we have to handle this case
-    return NaN;
-  }
-
-  return Number(text);
-}
-
 export const ConnectionLimits = <T extends SQLConnectionLimits>(props: Props<T>) => {
   const { onOptionsChange, options } = props;
   const jsonData = options.jsonData;
@@ -115,15 +107,11 @@ export const ConnectionLimits = <T extends SQLConnectionLimits>(props: Props<T>)
           </Label>
         }
       >
-        <Input
-          type="number"
-          placeholder="unlimited"
-          defaultValue={jsonData.maxOpenConns}
-          onChange={(e) => {
-            const newVal = toNumber(e.currentTarget.value);
-            if (!Number.isNaN(newVal)) {
-              onMaxConnectionsChanged(newVal);
-            }
+        <NumberInput
+          value={jsonData.maxOpenConns}
+          defaultValue={config.sqlConnectionLimits.maxOpenConns}
+          onChange={(value) => {
+            onMaxConnectionsChanged(value);
           }}
           width={labelWidth}
         />
@@ -133,7 +121,7 @@ export const ConnectionLimits = <T extends SQLConnectionLimits>(props: Props<T>)
         label={
           <Label>
             <Stack gap={0.5}>
-              <span>Auto Max Idle</span>
+              <span>Auto max idle</span>
               <Tooltip
                 content={
                   <span>
@@ -176,18 +164,13 @@ export const ConnectionLimits = <T extends SQLConnectionLimits>(props: Props<T>)
         {autoIdle ? (
           <InlineLabel width={labelWidth}>{options.jsonData.maxIdleConns}</InlineLabel>
         ) : (
-          <Input
-            type="number"
-            placeholder="2"
-            defaultValue={jsonData.maxIdleConns}
-            onChange={(e) => {
-              const newVal = toNumber(e.currentTarget.value);
-              if (!Number.isNaN(newVal)) {
-                onJSONDataNumberChanged('maxIdleConns')(newVal);
-              }
+          <NumberInput
+            value={jsonData.maxIdleConns}
+            defaultValue={config.sqlConnectionLimits.maxIdleConns}
+            onChange={(value) => {
+              onJSONDataNumberChanged('maxIdleConns')(value);
             }}
             width={labelWidth}
-            disabled={autoIdle}
           />
         )}
       </Field>
@@ -211,15 +194,11 @@ export const ConnectionLimits = <T extends SQLConnectionLimits>(props: Props<T>)
           </Label>
         }
       >
-        <Input
-          type="number"
-          placeholder="14400"
-          defaultValue={jsonData.connMaxLifetime}
-          onChange={(e) => {
-            const newVal = toNumber(e.currentTarget.value);
-            if (!Number.isNaN(newVal)) {
-              onJSONDataNumberChanged('connMaxLifetime')(newVal);
-            }
+        <NumberInput
+          value={jsonData.connMaxLifetime}
+          defaultValue={config.sqlConnectionLimits.connMaxLifetime}
+          onChange={(value) => {
+            onJSONDataNumberChanged('connMaxLifetime')(value);
           }}
           width={labelWidth}
         />
diff --git a/public/app/features/plugins/sql/components/configuration/Divider.tsx b/packages/grafana-sql/src/components/configuration/Divider.tsx
similarity index 100%
rename from public/app/features/plugins/sql/components/configuration/Divider.tsx
rename to packages/grafana-sql/src/components/configuration/Divider.tsx
diff --git a/packages/grafana-sql/src/components/configuration/NumberInput.tsx b/packages/grafana-sql/src/components/configuration/NumberInput.tsx
new file mode 100644
index 0000000000000..875dc921116b0
--- /dev/null
+++ b/packages/grafana-sql/src/components/configuration/NumberInput.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+
+import { Input } from '@grafana/ui/src/components/Input/Input';
+
+type NumberInputProps = {
+  value: number;
+  defaultValue: number;
+  onChange: (value: number) => void;
+  width: number;
+};
+
+export function NumberInput({ value, defaultValue, onChange, width }: NumberInputProps) {
+  const [isEmpty, setIsEmpty] = React.useState(false);
+  return (
+    <Input
+      type="number"
+      placeholder={String(defaultValue)}
+      value={isEmpty ? '' : value}
+      onChange={(e) => {
+        if (e.currentTarget.value?.trim() === '') {
+          setIsEmpty(true);
+          onChange(defaultValue);
+        } else {
+          setIsEmpty(false);
+          const newVal = Number(e.currentTarget.value);
+          if (!Number.isNaN(newVal)) {
+            onChange(newVal);
+          }
+        }
+      }}
+      width={width}
+    />
+  );
+}
diff --git a/public/app/features/plugins/sql/components/configuration/TLSSecretsConfig.tsx b/packages/grafana-sql/src/components/configuration/TLSSecretsConfig.tsx
similarity index 96%
rename from public/app/features/plugins/sql/components/configuration/TLSSecretsConfig.tsx
rename to packages/grafana-sql/src/components/configuration/TLSSecretsConfig.tsx
index f6d1b02a97e6f..a40a49db7e574 100644
--- a/public/app/features/plugins/sql/components/configuration/TLSSecretsConfig.tsx
+++ b/packages/grafana-sql/src/components/configuration/TLSSecretsConfig.tsx
@@ -7,8 +7,7 @@ import {
   onUpdateDatasourceSecureJsonDataOption,
   updateDatasourcePluginResetOption,
 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Field, Icon, Label, SecretTextArea, Tooltip } from '@grafana/ui';
+import { Field, Icon, Label, SecretTextArea, Tooltip, Stack } from '@grafana/ui';
 
 export interface Props<T extends DataSourceJsonData, S> {
   editorProps: DataSourcePluginOptionsEditorProps<T, S>;
diff --git a/public/app/features/plugins/sql/components/configuration/useMigrateDatabaseFields.test.ts b/packages/grafana-sql/src/components/configuration/useMigrateDatabaseFields.test.ts
similarity index 96%
rename from public/app/features/plugins/sql/components/configuration/useMigrateDatabaseFields.test.ts
rename to packages/grafana-sql/src/components/configuration/useMigrateDatabaseFields.test.ts
index cda44ce59245e..a193b4a273e51 100644
--- a/public/app/features/plugins/sql/components/configuration/useMigrateDatabaseFields.test.ts
+++ b/packages/grafana-sql/src/components/configuration/useMigrateDatabaseFields.test.ts
@@ -16,6 +16,9 @@ jest.mock('@grafana/runtime', () => {
       },
     },
     logDebug: jest.fn(),
+    createMonitoringLogger: jest.fn().mockReturnValue({
+      logDebug: jest.fn(),
+    }),
   };
 });
 
diff --git a/public/app/features/plugins/sql/components/configuration/useMigrateDatabaseFields.ts b/packages/grafana-sql/src/components/configuration/useMigrateDatabaseFields.ts
similarity index 90%
rename from public/app/features/plugins/sql/components/configuration/useMigrateDatabaseFields.ts
rename to packages/grafana-sql/src/components/configuration/useMigrateDatabaseFields.ts
index 2a7ffbe845833..fec8770975368 100644
--- a/public/app/features/plugins/sql/components/configuration/useMigrateDatabaseFields.ts
+++ b/packages/grafana-sql/src/components/configuration/useMigrateDatabaseFields.ts
@@ -1,9 +1,10 @@
 import { useEffect } from 'react';
 
 import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
-import { logDebug, config } from '@grafana/runtime';
+import { config } from '@grafana/runtime';
 
 import { SQLOptions } from '../../types';
+import { sqlPluginLogger } from '../../utils/logging';
 
 /**
  * 1. Moves the database field from the options object to jsonData.database and empties the database field.
@@ -20,7 +21,7 @@ export function useMigrateDatabaseFields<T extends SQLOptions, S = {}>({
 
     // Migrate the database field from the column into the jsonData object
     if (options.database) {
-      logDebug(`Migrating from options.database with value ${options.database} for ${options.name}`);
+      sqlPluginLogger.logDebug(`Migrating from options.database with value ${options.database} for ${options.name}`);
       newOptions.database = '';
       newOptions.jsonData = { ...jsonData, database: options.database };
       optionsUpdated = true;
@@ -35,7 +36,7 @@ export function useMigrateDatabaseFields<T extends SQLOptions, S = {}>({
     ) {
       const { maxOpenConns, maxIdleConns } = config.sqlConnectionLimits;
 
-      logDebug(
+      sqlPluginLogger.logDebug(
         `Setting default max open connections to ${maxOpenConns} and setting max idle connection to ${maxIdleConns}`
       );
 
diff --git a/public/app/features/plugins/sql/components/index.ts b/packages/grafana-sql/src/components/index.ts
similarity index 100%
rename from public/app/features/plugins/sql/components/index.ts
rename to packages/grafana-sql/src/components/index.ts
diff --git a/public/app/features/plugins/sql/components/query-editor-raw/QueryEditorRaw.tsx b/packages/grafana-sql/src/components/query-editor-raw/QueryEditorRaw.tsx
similarity index 100%
rename from public/app/features/plugins/sql/components/query-editor-raw/QueryEditorRaw.tsx
rename to packages/grafana-sql/src/components/query-editor-raw/QueryEditorRaw.tsx
diff --git a/public/app/features/plugins/sql/components/query-editor-raw/QueryToolbox.tsx b/packages/grafana-sql/src/components/query-editor-raw/QueryToolbox.tsx
similarity index 100%
rename from public/app/features/plugins/sql/components/query-editor-raw/QueryToolbox.tsx
rename to packages/grafana-sql/src/components/query-editor-raw/QueryToolbox.tsx
diff --git a/public/app/features/plugins/sql/components/query-editor-raw/QueryValidator.tsx b/packages/grafana-sql/src/components/query-editor-raw/QueryValidator.tsx
similarity index 100%
rename from public/app/features/plugins/sql/components/query-editor-raw/QueryValidator.tsx
rename to packages/grafana-sql/src/components/query-editor-raw/QueryValidator.tsx
diff --git a/public/app/features/plugins/sql/components/query-editor-raw/README.md b/packages/grafana-sql/src/components/query-editor-raw/README.md
similarity index 100%
rename from public/app/features/plugins/sql/components/query-editor-raw/README.md
rename to packages/grafana-sql/src/components/query-editor-raw/README.md
diff --git a/public/app/features/plugins/sql/components/query-editor-raw/RawEditor.tsx b/packages/grafana-sql/src/components/query-editor-raw/RawEditor.tsx
similarity index 100%
rename from public/app/features/plugins/sql/components/query-editor-raw/RawEditor.tsx
rename to packages/grafana-sql/src/components/query-editor-raw/RawEditor.tsx
diff --git a/packages/grafana-sql/src/components/visual-query-builder/AwesomeQueryBuilder.tsx b/packages/grafana-sql/src/components/visual-query-builder/AwesomeQueryBuilder.tsx
new file mode 100644
index 0000000000000..2f2db035813ac
--- /dev/null
+++ b/packages/grafana-sql/src/components/visual-query-builder/AwesomeQueryBuilder.tsx
@@ -0,0 +1,340 @@
+import {
+  AnyObject,
+  BasicConfig,
+  Config,
+  JsonTree,
+  Operator,
+  Settings,
+  SimpleField,
+  SqlFormatOperator,
+  Utils,
+  ValueSource,
+  Widgets,
+} from '@react-awesome-query-builder/ui';
+import { List } from 'immutable';
+import { isString } from 'lodash';
+import React from 'react';
+
+import { dateTime, toOption } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { Button, DateTimePicker, Input, Select } from '@grafana/ui';
+
+const buttonLabels = {
+  add: 'Add',
+  remove: 'Remove',
+};
+
+export const emptyInitTree: JsonTree = {
+  id: Utils.uuid(),
+  type: 'group',
+};
+
+const TIME_FILTER = 'timeFilter';
+const macros = [TIME_FILTER];
+
+// Widgets are the components rendered for each field type see the docs for more info
+// https://github.com/ukrbublik/react-awesome-query-builder/blob/master/CONFIG.adoc#configwidgets
+export const widgets: Widgets = {
+  ...BasicConfig.widgets,
+  text: {
+    ...BasicConfig.widgets.text,
+    factory: function TextInput(props) {
+      return (
+        <Input
+          value={props?.value || ''}
+          placeholder={props?.placeholder}
+          onChange={(e) => props?.setValue(e.currentTarget.value)}
+        />
+      );
+    },
+  },
+  number: {
+    ...BasicConfig.widgets.number,
+    factory: function NumberInput(props) {
+      return (
+        <Input
+          value={props?.value}
+          placeholder={props?.placeholder}
+          type="number"
+          onChange={(e) => props?.setValue(Number.parseInt(e.currentTarget.value, 10))}
+        />
+      );
+    },
+  },
+  datetime: {
+    ...BasicConfig.widgets.datetime,
+    factory: function DateTimeInput(props) {
+      if (props?.operator === Op.MACROS) {
+        return (
+          <Select
+            id={props.id}
+            aria-label="Macros value selector"
+            menuShouldPortal
+            options={macros.map(toOption)}
+            value={props?.value}
+            onChange={(val) => props.setValue(val.value)}
+          />
+        );
+      }
+      const dateValue = dateTime(props?.value).isValid() ? dateTime(props?.value).utc() : undefined;
+      return (
+        <DateTimePicker
+          onChange={(e) => {
+            props?.setValue(e.format(BasicConfig.widgets.datetime.valueFormat));
+          }}
+          date={dateValue}
+        />
+      );
+    },
+    // Function for formatting widget’s value in SQL WHERE query.
+    sqlFormatValue: (val, field, widget, operator, operatorDefinition, rightFieldDef) => {
+      if (operator === Op.MACROS) {
+        if (macros.includes(val)) {
+          return val;
+        }
+        return undefined;
+      }
+
+      // This is just satisfying the type checker, this should never happen
+      if (
+        typeof BasicConfig.widgets.datetime.sqlFormatValue === 'string' ||
+        typeof BasicConfig.widgets.datetime.sqlFormatValue === 'object'
+      ) {
+        return undefined;
+      }
+      const func = BasicConfig.widgets.datetime.sqlFormatValue;
+      // We need to pass the ctx to this function this way so *this* is correct
+      return func?.call(BasicConfig.ctx, val, field, widget, operator, operatorDefinition, rightFieldDef) || '';
+    },
+  },
+};
+
+// Settings are the configuration options for the query builder see the docs for more info
+// https://github.com/ukrbublik/react-awesome-query-builder/blob/master/CONFIG.adoc#configsettings
+export const settings: Settings = {
+  ...BasicConfig.settings,
+  canRegroup: false,
+  maxNesting: 1,
+  canReorder: false,
+  showNot: false,
+  addRuleLabel: buttonLabels.add,
+  deleteLabel: buttonLabels.remove,
+  // This is the component that renders conjunctions (logical operators)
+  renderConjs: function Conjunctions(conjProps) {
+    return (
+      <Select
+        id={conjProps?.id}
+        aria-label="Conjunction"
+        data-testid={selectors.components.SQLQueryEditor.filterConjunction}
+        menuShouldPortal
+        options={conjProps?.conjunctionOptions ? Object.keys(conjProps?.conjunctionOptions).map(toOption) : undefined}
+        value={conjProps?.selectedConjunction}
+        onChange={(val) => conjProps?.setConjunction(val.value!)}
+      />
+    );
+  },
+  // This is the component that renders fields
+  renderField: function Field(fieldProps) {
+    const fields = fieldProps?.config?.fields || {};
+    return (
+      <Select
+        id={fieldProps?.id}
+        width={25}
+        aria-label="Field"
+        data-testid={selectors.components.SQLQueryEditor.filterField}
+        menuShouldPortal
+        options={fieldProps?.items.map((f) => {
+          // @ts-ignore
+          const icon = fields[f.key].mainWidgetProps?.customProps?.icon;
+          return {
+            label: f.label,
+            value: f.key,
+            icon,
+          };
+        })}
+        value={fieldProps?.selectedKey}
+        onChange={(val) => {
+          fieldProps?.setField(val.label!);
+        }}
+      />
+    );
+  },
+  // This is the component used for the Add/Remove buttons
+  renderButton: function RAQBButton(buttonProps) {
+    return (
+      <Button
+        type="button"
+        title={`${buttonProps?.label} filter`}
+        onClick={buttonProps?.onClick}
+        variant="secondary"
+        size="md"
+        icon={buttonProps?.label === buttonLabels.add ? 'plus' : 'times'}
+      />
+    );
+  },
+  // This is the component used for the fields operator selector
+  renderOperator: function Operator(operatorProps) {
+    return (
+      <Select
+        options={operatorProps?.items.map((op) => ({ label: op.label, value: op.key }))}
+        aria-label="Operator"
+        data-testid={selectors.components.SQLQueryEditor.filterOperator}
+        menuShouldPortal
+        value={operatorProps?.selectedKey}
+        onChange={(val) => {
+          operatorProps?.setField(val.value || '');
+        }}
+      />
+    );
+  },
+};
+
+// add IN / NOT IN operators to text to support multi-value variables
+const enum Op {
+  IN = 'select_any_in',
+  NOT_IN = 'select_not_any_in',
+  MACROS = 'macros',
+}
+const customOperators = getCustomOperators(BasicConfig);
+const textWidget = BasicConfig.types.text.widgets.text;
+const opers = [...(textWidget.operators || []), Op.IN, Op.NOT_IN];
+const customTextWidget = {
+  ...textWidget,
+  operators: opers,
+};
+
+const customTypes = {
+  ...BasicConfig.types,
+  text: {
+    ...BasicConfig.types.text,
+    widgets: {
+      ...BasicConfig.types.text.widgets,
+      text: customTextWidget,
+    },
+  },
+  datetime: {
+    ...BasicConfig.types.datetime,
+    widgets: {
+      ...BasicConfig.types.datetime.widgets,
+      datetime: {
+        ...BasicConfig.types.datetime.widgets.datetime,
+        operators: [Op.MACROS, ...(BasicConfig.types.datetime.widgets.datetime.operators || [])],
+      },
+    },
+  },
+};
+
+// This is the configuration for the query builder that doesn't include the fields but all the other configuration for the UI
+// Fields should be added dynamically based on returned data
+// See the doc for more info https://github.com/ukrbublik/react-awesome-query-builder/blob/master/CONFIG.adoc
+export const raqbConfig: Config = {
+  ...BasicConfig,
+  widgets,
+  settings,
+  operators: customOperators,
+  types: customTypes,
+};
+
+export type { Config };
+
+const noop = () => '';
+
+const isSqlFormatOp = (func: unknown): func is SqlFormatOperator => {
+  return typeof func === 'function';
+};
+
+function getCustomOperators(config: BasicConfig) {
+  const { ...supportedOperators } = config.operators;
+
+  // IN operator expects array, override IN formatter for multi-value variables
+  const sqlFormatInOpOrNoop = () => {
+    const sqlFormatOp = supportedOperators[Op.IN].sqlFormatOp;
+    if (isSqlFormatOp(sqlFormatOp)) {
+      return sqlFormatOp;
+    }
+    return noop;
+  };
+
+  const customSqlInFormatter = (
+    field: string,
+    op: string,
+    value: string | List<string>,
+    valueSrc: ValueSource,
+    valueType: string,
+    opDef: Operator,
+    operatorOptions: AnyObject,
+    fieldDef: SimpleField
+  ) => {
+    return sqlFormatInOpOrNoop()(
+      field,
+      op,
+      splitIfString(value),
+      valueSrc,
+      valueType,
+      opDef,
+      operatorOptions,
+      fieldDef
+    );
+  };
+  // NOT IN operator expects array, override NOT IN formatter for multi-value variables
+  const sqlFormatNotInOpOrNoop = () => {
+    const sqlFormatOp = supportedOperators[Op.NOT_IN].sqlFormatOp;
+    if (isSqlFormatOp(sqlFormatOp)) {
+      return sqlFormatOp;
+    }
+    return noop;
+  };
+
+  const customSqlNotInFormatter = (
+    field: string,
+    op: string,
+    value: string | List<string>,
+    valueSrc: ValueSource,
+    valueType: string,
+    opDef: Operator,
+    operatorOptions: AnyObject,
+    fieldDef: SimpleField
+  ) => {
+    return sqlFormatNotInOpOrNoop()(
+      field,
+      op,
+      splitIfString(value),
+      valueSrc,
+      valueType,
+      opDef,
+      operatorOptions,
+      fieldDef
+    );
+  };
+
+  const customOperators = {
+    ...supportedOperators,
+    [Op.IN]: {
+      ...supportedOperators[Op.IN],
+      sqlFormatOp: customSqlInFormatter,
+    },
+    [Op.NOT_IN]: {
+      ...supportedOperators[Op.NOT_IN],
+      sqlFormatOp: customSqlNotInFormatter,
+    },
+    [Op.MACROS]: {
+      label: 'Macros',
+      sqlFormatOp: (field: string, _operator: string, value: string | List<string>) => {
+        if (value === TIME_FILTER) {
+          return `$__timeFilter(${field})`;
+        }
+        return value;
+      },
+    },
+  };
+
+  return customOperators;
+}
+
+// value: string | List<string> but AQB uses a different version of Immutable
+function splitIfString(value: any) {
+  if (isString(value)) {
+    return value.split(',');
+  }
+  return value;
+}
diff --git a/public/app/features/plugins/sql/components/visual-query-builder/GroupByRow.tsx b/packages/grafana-sql/src/components/visual-query-builder/GroupByRow.tsx
similarity index 100%
rename from public/app/features/plugins/sql/components/visual-query-builder/GroupByRow.tsx
rename to packages/grafana-sql/src/components/visual-query-builder/GroupByRow.tsx
diff --git a/public/app/features/plugins/sql/components/visual-query-builder/OrderByRow.tsx b/packages/grafana-sql/src/components/visual-query-builder/OrderByRow.tsx
similarity index 95%
rename from public/app/features/plugins/sql/components/visual-query-builder/OrderByRow.tsx
rename to packages/grafana-sql/src/components/visual-query-builder/OrderByRow.tsx
index 58c8ce3158abc..224f7e5c3fc23 100644
--- a/public/app/features/plugins/sql/components/visual-query-builder/OrderByRow.tsx
+++ b/packages/grafana-sql/src/components/visual-query-builder/OrderByRow.tsx
@@ -2,8 +2,8 @@ import { uniqueId } from 'lodash';
 import React, { useCallback } from 'react';
 
 import { SelectableValue, toOption } from '@grafana/data';
-import { EditorField, InputGroup, Space } from '@grafana/experimental';
-import { Input, RadioButtonGroup, Select } from '@grafana/ui';
+import { EditorField, InputGroup } from '@grafana/experimental';
+import { Input, RadioButtonGroup, Select, Space } from '@grafana/ui';
 
 import { SQLExpression } from '../../types';
 import { setPropertyField } from '../../utils/sql.utils';
diff --git a/public/app/features/plugins/sql/components/visual-query-builder/Preview.tsx b/packages/grafana-sql/src/components/visual-query-builder/Preview.tsx
similarity index 100%
rename from public/app/features/plugins/sql/components/visual-query-builder/Preview.tsx
rename to packages/grafana-sql/src/components/visual-query-builder/Preview.tsx
diff --git a/public/app/features/plugins/sql/components/visual-query-builder/SQLGroupByRow.tsx b/packages/grafana-sql/src/components/visual-query-builder/SQLGroupByRow.tsx
similarity index 100%
rename from public/app/features/plugins/sql/components/visual-query-builder/SQLGroupByRow.tsx
rename to packages/grafana-sql/src/components/visual-query-builder/SQLGroupByRow.tsx
diff --git a/public/app/features/plugins/sql/components/visual-query-builder/SQLOrderByRow.tsx b/packages/grafana-sql/src/components/visual-query-builder/SQLOrderByRow.tsx
similarity index 100%
rename from public/app/features/plugins/sql/components/visual-query-builder/SQLOrderByRow.tsx
rename to packages/grafana-sql/src/components/visual-query-builder/SQLOrderByRow.tsx
diff --git a/public/app/features/plugins/sql/components/visual-query-builder/SQLSelectRow.tsx b/packages/grafana-sql/src/components/visual-query-builder/SQLSelectRow.tsx
similarity index 100%
rename from public/app/features/plugins/sql/components/visual-query-builder/SQLSelectRow.tsx
rename to packages/grafana-sql/src/components/visual-query-builder/SQLSelectRow.tsx
diff --git a/public/app/features/plugins/sql/components/visual-query-builder/SQLWhereRow.tsx b/packages/grafana-sql/src/components/visual-query-builder/SQLWhereRow.tsx
similarity index 100%
rename from public/app/features/plugins/sql/components/visual-query-builder/SQLWhereRow.tsx
rename to packages/grafana-sql/src/components/visual-query-builder/SQLWhereRow.tsx
diff --git a/public/app/features/plugins/sql/components/visual-query-builder/SelectRow.tsx b/packages/grafana-sql/src/components/visual-query-builder/SelectRow.tsx
similarity index 95%
rename from public/app/features/plugins/sql/components/visual-query-builder/SelectRow.tsx
rename to packages/grafana-sql/src/components/visual-query-builder/SelectRow.tsx
index 411934f406e9d..5591fc237be15 100644
--- a/public/app/features/plugins/sql/components/visual-query-builder/SelectRow.tsx
+++ b/packages/grafana-sql/src/components/visual-query-builder/SelectRow.tsx
@@ -3,6 +3,7 @@ import { uniqueId } from 'lodash';
 import React, { useCallback } from 'react';
 
 import { SelectableValue, toOption } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import { EditorField, Stack } from '@grafana/experimental';
 import { Button, Select, useStyles2 } from '@grafana/ui';
 
@@ -115,6 +116,7 @@ export function SelectRow({ sql, format, columns, onSqlChange, functions }: Sele
             <EditorField label="Column" width={25}>
               <Select
                 value={getColumnValue(item)}
+                data-testid={selectors.components.SQLQueryEditor.selectColumn}
                 options={columnsWithAsterisk}
                 inputId={`select-column-${index}-${uniqueId()}`}
                 menuShouldPortal
@@ -127,6 +129,7 @@ export function SelectRow({ sql, format, columns, onSqlChange, functions }: Sele
               <Select
                 value={item.name ? toOption(item.name) : null}
                 inputId={`select-aggregation-${index}-${uniqueId()}`}
+                data-testid={selectors.components.SQLQueryEditor.selectAggregation}
                 isClearable
                 menuShouldPortal
                 allowCustomValue
@@ -138,6 +141,7 @@ export function SelectRow({ sql, format, columns, onSqlChange, functions }: Sele
               <Select
                 value={item.alias ? toOption(item.alias) : null}
                 inputId={`select-alias-${index}-${uniqueId()}`}
+                data-testid={selectors.components.SQLQueryEditor.selectAlias}
                 options={timeSeriesAliasOpts}
                 onChange={onAliasChange(item, index)}
                 isClearable
diff --git a/public/app/features/plugins/sql/components/visual-query-builder/VisualEditor.tsx b/packages/grafana-sql/src/components/visual-query-builder/VisualEditor.tsx
similarity index 100%
rename from public/app/features/plugins/sql/components/visual-query-builder/VisualEditor.tsx
rename to packages/grafana-sql/src/components/visual-query-builder/VisualEditor.tsx
diff --git a/public/app/features/plugins/sql/components/visual-query-builder/WhereRow.tsx b/packages/grafana-sql/src/components/visual-query-builder/WhereRow.tsx
similarity index 100%
rename from public/app/features/plugins/sql/components/visual-query-builder/WhereRow.tsx
rename to packages/grafana-sql/src/components/visual-query-builder/WhereRow.tsx
diff --git a/public/app/features/plugins/sql/components/visual-query-builder/index.ts b/packages/grafana-sql/src/components/visual-query-builder/index.ts
similarity index 100%
rename from public/app/features/plugins/sql/components/visual-query-builder/index.ts
rename to packages/grafana-sql/src/components/visual-query-builder/index.ts
diff --git a/public/app/features/plugins/sql/constants.ts b/packages/grafana-sql/src/constants.ts
similarity index 100%
rename from public/app/features/plugins/sql/constants.ts
rename to packages/grafana-sql/src/constants.ts
diff --git a/public/app/features/plugins/sql/datasource/SqlDatasource.ts b/packages/grafana-sql/src/datasource/SqlDatasource.ts
similarity index 94%
rename from public/app/features/plugins/sql/datasource/SqlDatasource.ts
rename to packages/grafana-sql/src/datasource/SqlDatasource.ts
index 75ce3aca310f2..ce5d3bc7ea2a3 100644
--- a/public/app/features/plugins/sql/datasource/SqlDatasource.ts
+++ b/packages/grafana-sql/src/datasource/SqlDatasource.ts
@@ -9,7 +9,6 @@ import {
   DataQueryRequest,
   DataQueryResponse,
   DataSourceInstanceSettings,
-  DataSourceRef,
   MetricFindValue,
   ScopedVars,
   CoreApp,
@@ -57,7 +56,7 @@ export abstract class SqlDatasource extends DataSourceWithBackend<SQLQuery, SQLO
     const settingsData = instanceSettings.jsonData || {};
     this.interval = settingsData.timeInterval || '1m';
     this.db = this.getDB();
-    /* 
+    /*
       The `settingsData.database` will be defined if a default database has been defined in either
       1) the ConfigurationEditor.tsx, OR 2) the provisioning config file, either under `jsondata.database`, or simply `database`.
     */
@@ -117,10 +116,7 @@ export abstract class SqlDatasource extends DataSourceWithBackend<SQLQuery, SQLO
     return !query.hide;
   }
 
-  applyTemplateVariables(
-    target: SQLQuery,
-    scopedVars: ScopedVars
-  ): Record<string, string | DataSourceRef | SQLQuery['format']> {
+  applyTemplateVariables(target: SQLQuery, scopedVars: ScopedVars) {
     return {
       refId: target.refId,
       datasource: this.getRef(),
@@ -167,7 +163,7 @@ export abstract class SqlDatasource extends DataSourceWithBackend<SQLQuery, SQLO
     // No need to check for database change/update issues if the datasource is being used in Explore.
     if (request.app !== CoreApp.Explore) {
       /*
-        If a preconfigured datasource database has been added/updated - and the user has built ANY number of queries using a 
+        If a preconfigured datasource database has been added/updated - and the user has built ANY number of queries using a
         database OTHER than the preconfigured one, return a database issue - since those databases are no longer available.
         The user will need to update their queries to use the preconfigured database.
       */
@@ -212,12 +208,20 @@ export abstract class SqlDatasource extends DataSourceWithBackend<SQLQuery, SQLO
       format: QueryFormat.Table,
     };
 
-    const response = await this.runMetaQuery(interpolatedQuery, range);
+    // NOTE: we can remove this try-catch when https://github.com/grafana/grafana/issues/82250
+    // is fixed.
+    let response;
+    try {
+      response = await this.runMetaQuery(interpolatedQuery, range);
+    } catch (error) {
+      console.error(error);
+      throw new Error('error when executing the sql query');
+    }
     return this.getResponseParser().transformMetricFindResponse(response);
   }
 
   // NOTE: this always runs with the `@grafana/data/getDefaultTimeRange` time range
-  async runSql<T>(query: string, options?: RunSQLOptions) {
+  async runSql<T extends object>(query: string, options?: RunSQLOptions) {
     const range = getDefaultTimeRange();
     const frame = await this.runMetaQuery({ rawSql: query, format: QueryFormat.Table, refId: options?.refId }, range);
     return new DataFrameView<T>(frame);
diff --git a/public/app/features/plugins/sql/defaults.ts b/packages/grafana-sql/src/defaults.ts
similarity index 100%
rename from public/app/features/plugins/sql/defaults.ts
rename to packages/grafana-sql/src/defaults.ts
diff --git a/public/app/features/plugins/sql/expressions.ts b/packages/grafana-sql/src/expressions.ts
similarity index 100%
rename from public/app/features/plugins/sql/expressions.ts
rename to packages/grafana-sql/src/expressions.ts
diff --git a/packages/grafana-sql/src/index.ts b/packages/grafana-sql/src/index.ts
new file mode 100644
index 0000000000000..a88463c3775b8
--- /dev/null
+++ b/packages/grafana-sql/src/index.ts
@@ -0,0 +1,22 @@
+export type {
+  DB,
+  RAQBFieldTypes,
+  SQLExpression,
+  SQLOptions,
+  SQLQuery,
+  SqlQueryModel,
+  SQLSelectableValue,
+} from './types';
+export { QueryFormat } from './types'; // this is an enum, we cannot export-type it
+export { SqlDatasource } from './datasource/SqlDatasource';
+export { formatSQL } from './utils/formatSQL';
+export { ConnectionLimits } from './components/configuration/ConnectionLimits';
+export { Divider } from './components/configuration/Divider';
+export { TLSSecretsConfig } from './components/configuration/TLSSecretsConfig';
+export { useMigrateDatabaseFields } from './components/configuration/useMigrateDatabaseFields';
+export { SqlQueryEditor } from './components/QueryEditor';
+export type { QueryHeaderProps } from './components/QueryHeader';
+export { createSelectClause, haveColumns } from './utils/sql.utils';
+export { applyQueryDefaults } from './defaults';
+export { makeVariable } from './utils/testHelpers';
+export { QueryEditorExpressionType } from './expressions';
diff --git a/packages/grafana-sql/src/types.ts b/packages/grafana-sql/src/types.ts
new file mode 100644
index 0000000000000..018f8d67b2c8e
--- /dev/null
+++ b/packages/grafana-sql/src/types.ts
@@ -0,0 +1,172 @@
+import { JsonTree } from '@react-awesome-query-builder/ui';
+
+import {
+  DataFrame,
+  DataQuery,
+  DataSourceJsonData,
+  MetricFindValue,
+  SelectableValue,
+  TimeRange,
+  toOption as toOptionFromData,
+} from '@grafana/data';
+import { CompletionItemKind, EditorMode, LanguageDefinition } from '@grafana/experimental';
+
+import { QueryWithDefaults } from './defaults';
+import {
+  QueryEditorFunctionExpression,
+  QueryEditorGroupByExpression,
+  QueryEditorPropertyExpression,
+} from './expressions';
+
+export interface SqlQueryForInterpolation {
+  dataset?: string;
+  alias?: string;
+  format?: QueryFormat;
+  rawSql?: string;
+  refId: string;
+  hide?: boolean;
+}
+
+export interface SQLConnectionLimits {
+  maxOpenConns: number;
+  maxIdleConns: number;
+  maxIdleConnsAuto: boolean;
+  connMaxLifetime: number;
+}
+
+export interface SQLOptions extends SQLConnectionLimits, DataSourceJsonData {
+  tlsAuth: boolean;
+  tlsAuthWithCACert: boolean;
+  timezone: string;
+  tlsSkipVerify: boolean;
+  user: string;
+  database: string;
+  url: string;
+  timeInterval: string;
+}
+
+export enum QueryFormat {
+  Timeseries = 'time_series',
+  Table = 'table',
+}
+
+export interface SQLQuery extends DataQuery {
+  alias?: string;
+  format?: QueryFormat;
+  rawSql?: string;
+  dataset?: string;
+  table?: string;
+  sql?: SQLExpression;
+  editorMode?: EditorMode;
+  rawQuery?: boolean;
+}
+
+export interface NameValue {
+  name: string;
+  value: string;
+}
+
+export type SQLFilters = NameValue[];
+
+export interface SQLExpression {
+  columns?: QueryEditorFunctionExpression[];
+  whereJsonTree?: JsonTree;
+  whereString?: string;
+  filters?: SQLFilters;
+  groupBy?: QueryEditorGroupByExpression[];
+  orderBy?: QueryEditorPropertyExpression;
+  orderByDirection?: 'ASC' | 'DESC';
+  limit?: number;
+  offset?: number;
+}
+
+export interface TableSchema {
+  name?: string;
+  schema?: TableFieldSchema[];
+}
+
+export interface TableFieldSchema {
+  name: string;
+  description?: string;
+  type: string;
+  repeated: boolean;
+  schema: TableFieldSchema[];
+}
+
+export interface QueryRowFilter {
+  filter: boolean;
+  group: boolean;
+  order: boolean;
+  preview: boolean;
+}
+
+export const QUERY_FORMAT_OPTIONS = [
+  { label: 'Time series', value: QueryFormat.Timeseries },
+  { label: 'Table', value: QueryFormat.Table },
+];
+
+const backWardToOption = (value: string) => ({ label: value, value });
+
+export const toOption = toOptionFromData ?? backWardToOption;
+
+export interface ResourceSelectorProps {
+  disabled?: boolean;
+  className?: string;
+  applyDefault?: boolean;
+}
+// React Awesome Query builder field types.
+// These are responsible for rendering the correct UI for the field.
+export type RAQBFieldTypes = 'text' | 'number' | 'boolean' | 'datetime' | 'date' | 'time';
+
+export interface SQLSelectableValue extends SelectableValue {
+  type?: string;
+  raqbFieldType?: RAQBFieldTypes;
+}
+
+export interface DB {
+  init?: (datasourceId?: string) => Promise<boolean>;
+  datasets: () => Promise<string[]>;
+  tables: (dataset?: string) => Promise<string[]>;
+  fields: (query: SQLQuery, order?: boolean) => Promise<SQLSelectableValue[]>;
+  validateQuery: (query: SQLQuery, range?: TimeRange) => Promise<ValidationResults>;
+  dsID: () => number;
+  dispose?: (dsID?: string) => void;
+  lookup?: (path?: string) => Promise<Array<{ name: string; completion: string }>>;
+  getEditorLanguageDefinition: () => LanguageDefinition;
+  toRawSql: (query: SQLQuery) => string;
+  functions?: () => string[];
+}
+
+export interface QueryEditorProps {
+  db: DB;
+  query: QueryWithDefaults;
+  onChange: (query: SQLQuery) => void;
+  range?: TimeRange;
+}
+
+export interface ValidationResults {
+  query: SQLQuery;
+  rawSql?: string;
+  error: string;
+  isError: boolean;
+  isValid: boolean;
+  statistics?: {
+    TotalBytesProcessed: number;
+  } | null;
+}
+
+export interface SqlQueryModel {
+  quoteLiteral: (v: string) => string;
+}
+
+export interface ResponseParser {
+  transformMetricFindResponse: (frame: DataFrame) => MetricFindValue[];
+}
+
+export interface MetaDefinition {
+  name: string;
+  completion?: string;
+  kind: CompletionItemKind;
+}
+
+export type SQLDialect = 'postgres' | 'influx' | 'other';
diff --git a/public/app/features/plugins/sql/utils/formatSQL.ts b/packages/grafana-sql/src/utils/formatSQL.ts
similarity index 100%
rename from public/app/features/plugins/sql/utils/formatSQL.ts
rename to packages/grafana-sql/src/utils/formatSQL.ts
diff --git a/packages/grafana-sql/src/utils/logging.ts b/packages/grafana-sql/src/utils/logging.ts
new file mode 100644
index 0000000000000..9590018435918
--- /dev/null
+++ b/packages/grafana-sql/src/utils/logging.ts
@@ -0,0 +1,3 @@
+import { createMonitoringLogger } from '@grafana/runtime';
+
+export const sqlPluginLogger = createMonitoringLogger('features.plugins.sql');
diff --git a/public/app/features/plugins/sql/utils/migration.test.ts b/packages/grafana-sql/src/utils/migration.test.ts
similarity index 100%
rename from public/app/features/plugins/sql/utils/migration.test.ts
rename to packages/grafana-sql/src/utils/migration.test.ts
diff --git a/public/app/features/plugins/sql/utils/migration.ts b/packages/grafana-sql/src/utils/migration.ts
similarity index 100%
rename from public/app/features/plugins/sql/utils/migration.ts
rename to packages/grafana-sql/src/utils/migration.ts
diff --git a/public/app/features/plugins/sql/utils/sql.utils.ts b/packages/grafana-sql/src/utils/sql.utils.ts
similarity index 100%
rename from public/app/features/plugins/sql/utils/sql.utils.ts
rename to packages/grafana-sql/src/utils/sql.utils.ts
diff --git a/public/app/features/plugins/sql/utils/testHelpers.ts b/packages/grafana-sql/src/utils/testHelpers.ts
similarity index 100%
rename from public/app/features/plugins/sql/utils/testHelpers.ts
rename to packages/grafana-sql/src/utils/testHelpers.ts
diff --git a/public/app/features/plugins/sql/utils/useSqlChange.ts b/packages/grafana-sql/src/utils/useSqlChange.ts
similarity index 100%
rename from public/app/features/plugins/sql/utils/useSqlChange.ts
rename to packages/grafana-sql/src/utils/useSqlChange.ts
diff --git a/packages/grafana-sql/tsconfig.json b/packages/grafana-sql/tsconfig.json
new file mode 100644
index 0000000000000..a2f6548df35e4
--- /dev/null
+++ b/packages/grafana-sql/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "baseUrl": "./",
+    "declarationDir": "./compiled",
+    "emitDeclarationOnly": true,
+    "isolatedModules": true,
+    "strict": true,
+    "rootDirs": ["."]
+  },
+  "exclude": ["dist/**/*"],
+  "extends": "@grafana/tsconfig",
+  "include": ["src/**/*.ts*", "../../public/app/types/*.d.ts", "../grafana-ui/src/types/*.d.ts"]
+}
diff --git a/packages/grafana-ui/.storybook/preview.ts b/packages/grafana-ui/.storybook/preview.ts
index effdab3a18f99..e58cfed723017 100644
--- a/packages/grafana-ui/.storybook/preview.ts
+++ b/packages/grafana-ui/.storybook/preview.ts
@@ -50,6 +50,10 @@ const preview: Preview = {
       // We should be able to use the builtin alphabetical sort, but is broken in SB 7.0
       // https://github.com/storybookjs/storybook/issues/22470
       storySort: (a, b) => {
+        // Skip sorting for stories with nosort tag
+        if (a.tags.includes('nosort') || b.tags.includes('nosort')) {
+          return 0;
+        }
         if (a.title.startsWith('Docs Overview')) {
           if (b.title.startsWith('Docs Overview')) {
             return 0;
diff --git a/packages/grafana-ui/README.md b/packages/grafana-ui/README.md
index c3291db341530..7c3625025565b 100644
--- a/packages/grafana-ui/README.md
+++ b/packages/grafana-ui/README.md
@@ -1,7 +1,5 @@
 # Grafana UI components library
 
-> **@grafana/ui is currently in BETA**.
-
 @grafana/ui is a collection of components used by [Grafana](https://github.com/grafana/grafana)
 
 Our goal is to deliver Grafana's common UI elements for plugins developers and contributors.
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index 3d782edcc6ae7..5fa4efeacd081 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": "10.3.0-pre",
+  "version": "11.0.0",
   "description": "Grafana Components Library",
   "keywords": [
     "grafana",
@@ -48,76 +48,69 @@
   ],
   "dependencies": {
     "@emotion/css": "11.11.2",
-    "@emotion/react": "11.11.1",
-    "@grafana/data": "10.3.0-pre",
-    "@grafana/e2e-selectors": "10.3.0-pre",
-    "@grafana/faro-web-sdk": "1.2.1",
-    "@grafana/schema": "10.3.0-pre",
-    "@leeoniya/ufuzzy": "1.0.8",
+    "@emotion/react": "11.11.4",
+    "@floating-ui/react": "0.26.10",
+    "@grafana/data": "11.0.0",
+    "@grafana/e2e-selectors": "11.0.0",
+    "@grafana/faro-web-sdk": "^1.3.6",
+    "@grafana/schema": "11.0.0",
+    "@leeoniya/ufuzzy": "1.0.14",
     "@monaco-editor/react": "4.6.0",
     "@popperjs/core": "2.11.8",
-    "@react-aria/button": "3.8.0",
-    "@react-aria/dialog": "3.5.3",
-    "@react-aria/focus": "3.13.0",
-    "@react-aria/menu": "3.10.0",
-    "@react-aria/overlays": "3.15.0",
-    "@react-aria/utils": "3.18.0",
-    "@react-stately/menu": "3.5.3",
+    "@react-aria/dialog": "3.5.12",
+    "@react-aria/focus": "3.16.2",
+    "@react-aria/overlays": "3.21.1",
+    "@react-aria/utils": "3.23.2",
     "ansicolor": "1.1.100",
     "calculate-size": "1.1.1",
-    "classnames": "2.3.2",
-    "core-js": "3.33.0",
-    "d3": "7.8.5",
-    "date-fns": "2.30.0",
+    "classnames": "2.5.1",
+    "d3": "7.9.0",
+    "date-fns": "3.6.0",
     "hoist-non-react-statics": "3.3.2",
-    "i18next": "^22.0.0",
+    "i18next": "^23.0.0",
     "i18next-browser-languagedetector": "^7.0.2",
-    "immutable": "4.3.1",
+    "immutable": "4.3.5",
     "is-hotkey": "0.2.0",
-    "jquery": "3.7.0",
+    "jquery": "3.7.1",
     "lodash": "4.17.21",
     "micro-memoize": "^4.1.2",
-    "moment": "2.29.4",
+    "moment": "2.30.1",
     "monaco-editor": "0.34.0",
     "ol": "7.4.0",
     "prismjs": "1.29.0",
-    "rc-cascader": "3.19.0",
-    "rc-drawer": "6.5.2",
-    "rc-slider": "10.3.1",
+    "rc-cascader": "3.24.0",
+    "rc-drawer": "7.1.0",
+    "rc-slider": "10.5.0",
     "rc-time-picker": "^3.7.3",
-    "rc-tooltip": "6.1.1",
+    "rc-tooltip": "6.2.0",
     "react-beautiful-dnd": "13.1.1",
-    "react-calendar": "4.6.0",
+    "react-calendar": "4.8.0",
     "react-colorful": "5.6.1",
     "react-custom-scrollbars-2": "4.5.0",
     "react-dropzone": "14.2.3",
     "react-highlight-words": "0.20.0",
-    "react-hook-form": "7.5.3",
+    "react-hook-form": "^7.49.2",
     "react-i18next": "^12.0.0",
     "react-inlinesvg": "3.0.2",
-    "react-loading-skeleton": "3.3.1",
-    "react-popper": "2.3.0",
-    "react-popper-tooltip": "4.4.2",
+    "react-loading-skeleton": "3.4.0",
     "react-router-dom": "5.3.3",
-    "react-select": "5.7.4",
-    "react-select-event": "^5.1.0",
+    "react-select": "5.8.0",
     "react-table": "7.8.0",
     "react-transition-group": "4.4.5",
-    "react-use": "17.4.0",
-    "react-window": "1.8.9",
+    "react-use": "17.5.0",
+    "react-window": "1.8.10",
     "rxjs": "7.8.1",
     "slate": "0.47.9",
     "slate-plain-serializer": "0.7.13",
     "slate-react": "0.22.10",
     "tinycolor2": "1.6.0",
-    "tslib": "2.6.0",
-    "uplot": "1.6.26",
-    "uuid": "9.0.0"
+    "tslib": "2.6.2",
+    "uplot": "1.6.30",
+    "uuid": "9.0.1"
   },
   "devDependencies": {
-    "@babel/core": "7.23.2",
-    "@grafana/tsconfig": "^1.2.0-rc1",
-    "@mdx-js/react": "1.6.22",
+    "@babel/core": "7.24.3",
+    "@grafana/tsconfig": "^1.3.0-rc1",
     "@rollup/plugin-node-resolve": "15.2.3",
     "@storybook/addon-a11y": "7.4.5",
     "@storybook/addon-actions": "7.4.5",
@@ -134,63 +127,66 @@
     "@storybook/react": "7.4.5",
     "@storybook/react-webpack5": "7.4.5",
     "@storybook/theming": "7.4.5",
-    "@testing-library/dom": "9.3.3",
-    "@testing-library/jest-dom": "5.16.5",
-    "@testing-library/react": "14.0.0",
-    "@testing-library/user-event": "14.5.1",
+    "@testing-library/dom": "9.3.4",
+    "@testing-library/jest-dom": "6.4.2",
+    "@testing-library/react": "14.2.2",
+    "@testing-library/user-event": "14.5.2",
     "@types/common-tags": "^1.8.0",
-    "@types/d3": "7.4.0",
-    "@types/hoist-non-react-statics": "3.3.1",
-    "@types/is-hotkey": "0.1.7",
-    "@types/jest": "29.5.4",
-    "@types/jquery": "3.5.16",
-    "@types/lodash": "4.14.195",
-    "@types/mock-raf": "1.0.3",
-    "@types/node": "18.18.4",
-    "@types/prismjs": "1.26.0",
-    "@types/react": "18.2.15",
-    "@types/react-beautiful-dnd": "13.1.4",
+    "@types/d3": "7.4.3",
+    "@types/hoist-non-react-statics": "3.3.5",
+    "@types/is-hotkey": "0.1.10",
+    "@types/jest": "29.5.12",
+    "@types/jquery": "3.5.29",
+    "@types/lodash": "4.17.0",
+    "@types/mock-raf": "1.0.6",
+    "@types/node": "20.11.30",
+    "@types/prismjs": "1.26.3",
+    "@types/react": "18.2.73",
+    "@types/react-beautiful-dnd": "13.1.8",
     "@types/react-calendar": "3.9.0",
-    "@types/react-color": "3.0.6",
-    "@types/react-dom": "18.2.7",
-    "@types/react-highlight-words": "0.16.4",
+    "@types/react-color": "3.0.12",
+    "@types/react-dom": "18.2.22",
+    "@types/react-highlight-words": "0.16.7",
     "@types/react-router-dom": "5.3.3",
-    "@types/react-table": "7.7.14",
-    "@types/react-test-renderer": "18.0.0",
-    "@types/react-transition-group": "4.4.6",
-    "@types/react-window": "1.8.5",
+    "@types/react-table": "7.7.20",
+    "@types/react-test-renderer": "18.0.7",
+    "@types/react-transition-group": "4.4.10",
+    "@types/react-window": "1.8.8",
     "@types/slate": "0.47.11",
-    "@types/slate-plain-serializer": "0.7.2",
+    "@types/slate-plain-serializer": "0.7.5",
     "@types/slate-react": "0.22.9",
-    "@types/testing-library__jest-dom": "5.14.8",
-    "@types/tinycolor2": "1.4.3",
-    "@types/uuid": "9.0.2",
+    "@types/testing-library__jest-dom": "5.14.9",
+    "@types/tinycolor2": "1.4.6",
+    "@types/uuid": "9.0.8",
     "common-tags": "1.8.2",
-    "css-loader": "6.8.1",
-    "csstype": "3.1.2",
+    "core-js": "3.36.1",
+    "css-loader": "6.10.0",
+    "csstype": "3.1.3",
     "esbuild": "0.18.12",
-    "expose-loader": "4.1.0",
+    "expose-loader": "5.0.0",
     "mock-raf": "1.0.1",
     "process": "^0.11.10",
     "react": "18.2.0",
     "react-dom": "18.2.0",
+    "react-select-event": "^5.1.0",
     "react-test-renderer": "18.2.0",
-    "rimraf": "5.0.1",
+    "rimraf": "5.0.5",
     "rollup": "2.79.1",
     "rollup-plugin-copy": "3.5.0",
     "rollup-plugin-dts": "^5.0.0",
     "rollup-plugin-esbuild": "5.0.0",
     "rollup-plugin-node-externals": "^5.0.0",
-    "sass-loader": "13.3.2",
+    "rollup-plugin-svg-import": "1.6.0",
+    "sass-loader": "14.1.1",
     "storybook": "7.4.5",
     "storybook-addon-turbo-build": "2.0.1",
     "storybook-dark-mode": "3.0.1",
-    "style-loader": "3.3.3",
-    "typescript": "4.8.4",
-    "webpack": "5.89.0"
+    "style-loader": "3.3.4",
+    "typescript": "5.3.3",
+    "webpack": "5.91.0"
   },
   "peerDependencies": {
-    "react": "^17.0.0 || ^18.0.0",
-    "react-dom": "^17.0.0 || ^18.0.0"
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
   }
 }
diff --git a/packages/grafana-ui/rollup.config.ts b/packages/grafana-ui/rollup.config.ts
index 3659a42c58bee..76891bf60c70f 100644
--- a/packages/grafana-ui/rollup.config.ts
+++ b/packages/grafana-ui/rollup.config.ts
@@ -4,6 +4,7 @@ import copy from 'rollup-plugin-copy';
 import dts from 'rollup-plugin-dts';
 import esbuild from 'rollup-plugin-esbuild';
 import { externals } from 'rollup-plugin-node-externals';
+import svg from 'rollup-plugin-svg-import';
 
 const icons = require('../../public/app/core/icons/cached.json');
 
@@ -18,6 +19,7 @@ export default [
     input: 'src/index.ts',
     plugins: [
       externals({ deps: true, packagePath: './package.json' }),
+      svg({ stringify: true }),
       resolve(),
       copy({
         targets: [{ src: iconSrcPaths, dest: './dist/public/' }],
diff --git a/packages/grafana-ui/src/Intro.mdx b/packages/grafana-ui/src/Intro.mdx
index 761846347e17d..c0f62ca1c763c 100644
--- a/packages/grafana-ui/src/Intro.mdx
+++ b/packages/grafana-ui/src/Intro.mdx
@@ -2,11 +2,9 @@ import { Meta } from '@storybook/blocks';
 
 <Meta title="Docs Overview/Intro" parameters={{ options: { isToolshown: false }, id: 1 }} />
 
-# Grafana design system
+# Grafana React Components
 
-> **@grafana/ui is currently in BETA**.
-
-With the design system @grafana/ui, we want to democratize development. This library of reusable [Grafana](https://github.com/grafana/grafana) components and guidelines helps you with contribution and plugin development.
+With @grafana/ui, we want to democratize development. This library of reusable [Grafana](https://github.com/grafana/grafana) components and guidelines is part of the [Saga Design System](https://grafana.com/developers/saga/about/overview) and should help you with contribution and plugin development.
 
 ## Our vision
 
@@ -17,23 +15,19 @@ Grafana Labs started @grafana/ui to make contributing to Grafana as easy as poss
 - A beautiful, visually consistent Grafana experience.
 - Transparency about how we work and what we do.
 
-### Maintained by Grafana Labs and you
-
-Grafana Labs has a task force that helps create and maintain components. We make sure that components are documented and easy to use. The current status of the @grafana/ui development is available on [GitHub](https://github.com/grafana/grafana/projects/26). Feel free to contribute!
-
 ### How to get involved
 
-When we notice that we need to change something, we determine together what the change should be, then we put the change in place and communicate it publicly. Developers and designers create and improve @grafana/ui together. Throughout the process, we strive to involve you and meet your needs. We are looking forward to discussing your design and improvement ideas on [GitHub](https://github.com/grafana/grafana/projects/26).
+When we notice that we need to change something, we determine together what the change should be, then we put the change in place and communicate it publicly. Developers and designers create and improve @grafana/ui together. Throughout the process, we strive to involve you and meet your needs. We are looking forward to discussing your design and improvement ideas, find out how you can help in the [Contribution Guidelines](https://grafana.com/developers/saga/contributing).
 
 ## Get started
 
 - **Explore UI components**
-  Click on any of the component in the sidebar to see how they look, and how to configure them. Each component pages contains documentation of its properties, as well as code examples for how to use it.
+  Click on any of the components in the sidebar to see how they look, and how to configure them. Each component contains documentation of its properties, as well as code examples for how to use it.
 - **Try them out**
-  - Experiment with different properties, by clicking **Canvas** at the top of each component page.
-  - Change the properties under **Knobs** in the bottom panel.
+  - Experiment with different properties, by clicking on each component story.
+  - Change the properties under **Controls** in the side panel.
 - **Use them**
-  Once you've found the right component for your use case, click the **Story** tab to see the code implementation, or look at examples under **Docs**.
+  Once you've found the right component for your use case, click the **Code** tab to see the code implementation, or look at examples under **Docs**.
 
   For more details, refer to the [package source](https://github.com/grafana/grafana/tree/main/packages/grafana-ui).
 
diff --git a/packages/grafana-ui/src/components/Alert/Alert.tsx b/packages/grafana-ui/src/components/Alert/Alert.tsx
index 4595aad88c3b9..98bbf23669ef0 100644
--- a/packages/grafana-ui/src/components/Alert/Alert.tsx
+++ b/packages/grafana-ui/src/components/Alert/Alert.tsx
@@ -54,15 +54,9 @@ export const Alert = React.forwardRef<HTMLDivElement, Props>(
     const ariaLabel = restProps['aria-label'] || title;
 
     return (
-      <div
-        ref={ref}
-        className={cx(styles.wrapper, className)}
-        data-testid={selectors.components.Alert.alertV2(severity)}
-        role={role}
-        aria-label={ariaLabel}
-        {...restProps}
-      >
+      <div ref={ref} className={cx(styles.wrapper, className)} role={role} aria-label={ariaLabel} {...restProps}>
         <Box
+          data-testid={selectors.components.Alert.alertV2(severity)}
           display="flex"
           backgroundColor={severity}
           borderRadius="default"
@@ -80,7 +74,9 @@ export const Alert = React.forwardRef<HTMLDivElement, Props>(
           </Box>
 
           <Box paddingY={1} grow={1}>
-            <Text weight="medium">{title}</Text>
+            <Text color="primary" weight="medium">
+              {title}
+            </Text>
             {children && <div className={styles.content}>{children}</div>}
           </Box>
           {/* If onRemove is specified, giving preference to onRemove */}
@@ -157,6 +153,7 @@ const getStyles = (
       color: color.text,
     }),
     content: css({
+      color: theme.colors.text.primary,
       paddingTop: hasTitle ? theme.spacing(0.5) : 0,
       maxHeight: '50vh',
       overflowY: 'auto',
diff --git a/packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.tsx b/packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.tsx
index 9aa84af51e08d..da268d610944c 100644
--- a/packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.tsx
+++ b/packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.tsx
@@ -104,17 +104,12 @@ export function AutoSaveField<T = string>(props: Props<T>) {
         )}
       </Field>
       {fieldState.isLoading && (
-        <InlineToast referenceElement={fieldRef.current} placement="right" alternativePlacement="bottom">
+        <InlineToast referenceElement={fieldRef.current} placement="right">
           Saving <EllipsisAnimated />
         </InlineToast>
       )}
       {fieldState.showSuccess && (
-        <InlineToast
-          suffixIcon={'check'}
-          referenceElement={fieldRef.current}
-          placement="right"
-          alternativePlacement="bottom"
-        >
+        <InlineToast suffixIcon={'check'} referenceElement={fieldRef.current} placement="right">
           Saved!
         </InlineToast>
       )}
diff --git a/packages/grafana-ui/src/components/Badge/Badge.tsx b/packages/grafana-ui/src/components/Badge/Badge.tsx
index d8cb863dea72e..969c6ebfb1013 100644
--- a/packages/grafana-ui/src/components/Badge/Badge.tsx
+++ b/packages/grafana-ui/src/components/Badge/Badge.tsx
@@ -1,11 +1,13 @@
 import { css, cx } from '@emotion/css';
 import React, { HTMLAttributes } from 'react';
+import Skeleton from 'react-loading-skeleton';
 import tinycolor from 'tinycolor2';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
 import { useStyles2 } from '../../themes/ThemeContext';
 import { IconName } from '../../types';
+import { SkeletonComponent, attachSkeleton } from '../../utils/skeleton';
 import { Icon } from '../Icon/Icon';
 import { Tooltip } from '../Tooltip/Tooltip';
 
@@ -18,7 +20,7 @@ export interface BadgeProps extends HTMLAttributes<HTMLDivElement> {
   tooltip?: string;
 }
 
-export const Badge = React.memo<BadgeProps>(({ icon, color, text, tooltip, className, ...otherProps }) => {
+const BadgeComponent = React.memo<BadgeProps>(({ icon, color, text, tooltip, className, ...otherProps }) => {
   const styles = useStyles2(getStyles, color);
   const badge = (
     <div className={cx(styles.wrapper, className)} {...otherProps}>
@@ -35,8 +37,21 @@ export const Badge = React.memo<BadgeProps>(({ icon, color, text, tooltip, class
     badge
   );
 });
+BadgeComponent.displayName = 'Badge';
 
-Badge.displayName = 'Badge';
+const BadgeSkeleton: SkeletonComponent = ({ rootProps }) => {
+  const styles = useStyles2(getSkeletonStyles);
+
+  return <Skeleton width={60} height={22} containerClassName={styles.container} {...rootProps} />;
+};
+
+export const Badge = attachSkeleton(BadgeComponent, BadgeSkeleton);
+
+const getSkeletonStyles = () => ({
+  container: css({
+    lineHeight: 1,
+  }),
+});
 
 const getStyles = (theme: GrafanaTheme2, color: BadgeColor) => {
   let sourceColor = theme.visualization.getColorByName(color);
diff --git a/packages/grafana-ui/src/components/BigValue/BigValue.story.tsx b/packages/grafana-ui/src/components/BigValue/BigValue.story.tsx
index 34bf52b492057..3527c9bfe76dd 100644
--- a/packages/grafana-ui/src/components/BigValue/BigValue.story.tsx
+++ b/packages/grafana-ui/src/components/BigValue/BigValue.story.tsx
@@ -57,6 +57,50 @@ interface StoryProps extends Partial<Props> {
   valueText: string;
 }
 
+export const ApplyNoValue: Story<StoryProps> = ({
+  valueText,
+  title,
+  colorMode,
+  graphMode,
+  height,
+  width,
+  color,
+  textMode,
+  justifyMode,
+}) => {
+  const theme = useTheme2();
+  const sparkline: FieldSparkline = {
+    y: {
+      name: '',
+      values: [1, 2, 3, null, null],
+      type: FieldType.number,
+      state: { range: { min: 1, max: 4, delta: 3 } },
+      config: {
+        noValue: '0',
+      },
+    },
+  };
+
+  return (
+    <BigValue
+      theme={theme}
+      width={width}
+      height={height}
+      colorMode={colorMode}
+      graphMode={graphMode}
+      textMode={textMode}
+      justifyMode={justifyMode}
+      value={{
+        text: valueText,
+        numeric: 5022,
+        color: color,
+        title,
+      }}
+      sparkline={graphMode === BigValueGraphMode.None ? undefined : sparkline}
+    />
+  );
+};
+
 export const Basic: Story<StoryProps> = ({
   valueText,
   title,
@@ -111,4 +155,16 @@ Basic.args = {
   textMode: BigValueTextMode.Auto,
 };
 
+ApplyNoValue.args = {
+  valueText: '$5022',
+  title: 'Total Earnings',
+  colorMode: BigValueColorMode.Value,
+  graphMode: BigValueGraphMode.Area,
+  justifyMode: BigValueJustifyMode.Auto,
+  width: 400,
+  height: 300,
+  color: 'red',
+  textMode: BigValueTextMode.Auto,
+};
+
 export default meta;
diff --git a/packages/grafana-ui/src/components/BigValue/BigValue.test.tsx b/packages/grafana-ui/src/components/BigValue/BigValue.test.tsx
index 645d40a1e48d7..a5e6fa46e1ee2 100644
--- a/packages/grafana-ui/src/components/BigValue/BigValue.test.tsx
+++ b/packages/grafana-ui/src/components/BigValue/BigValue.test.tsx
@@ -5,17 +5,19 @@ import { createTheme } from '@grafana/data';
 
 import { BigValue, BigValueColorMode, BigValueGraphMode, Props } from './BigValue';
 
+const valueObject = {
+  text: '25',
+  numeric: 25,
+  color: 'red',
+};
+
 function getProps(propOverrides?: Partial<Props>): Props {
   const props: Props = {
     colorMode: BigValueColorMode.Background,
     graphMode: BigValueGraphMode.Line,
     height: 300,
     width: 300,
-    value: {
-      text: '25',
-      numeric: 25,
-      color: 'red',
-    },
+    value: valueObject,
     theme: createTheme(),
   };
 
@@ -30,5 +32,22 @@ describe('BigValue', () => {
 
       expect(screen.getByText('25')).toBeInTheDocument();
     });
+
+    it('should render with percent change', () => {
+      render(
+        <BigValue
+          {...getProps({
+            value: { ...valueObject, percentChange: 0.5 },
+          })}
+        />
+      );
+
+      expect(screen.getByText('50%')).toBeInTheDocument();
+    });
+
+    it('should render without percent change', () => {
+      render(<BigValue {...getProps()} />);
+      expect(screen.queryByText('%')).toBeNull();
+    });
   });
 });
diff --git a/packages/grafana-ui/src/components/BigValue/BigValue.tsx b/packages/grafana-ui/src/components/BigValue/BigValue.tsx
index 762cd2e893bbb..dea9b428f56ba 100644
--- a/packages/grafana-ui/src/components/BigValue/BigValue.tsx
+++ b/packages/grafana-ui/src/components/BigValue/BigValue.tsx
@@ -1,7 +1,7 @@
 import { cx } from '@emotion/css';
 import React, { PureComponent } from 'react';
 
-import { DisplayValue, DisplayValueAlignmentFactors, FieldSparkline, VizOrientation } from '@grafana/data';
+import { DisplayValue, DisplayValueAlignmentFactors, FieldSparkline } from '@grafana/data';
 import { VizTextDisplayOptions } from '@grafana/schema';
 
 import { Themeable2 } from '../../types';
@@ -9,6 +9,7 @@ import { clearButtonStyles } from '../Button';
 import { FormattedValueDisplay } from '../FormattedValueDisplay/FormattedValueDisplay';
 
 import { buildLayout } from './BigValueLayout';
+import { PercentChange } from './PercentChange';
 
 export enum BigValueColorMode {
   Background = 'background',
@@ -66,8 +67,6 @@ export interface Props extends Themeable2 {
   textMode?: BigValueTextMode;
   /** If true disables the tooltip */
   hasLinks?: boolean;
-  /** The orientation of the parent container */
-  parentOrientation?: VizOrientation;
 
   /**
    * If part of a series of stat panes, this is the total number.
@@ -94,6 +93,8 @@ export class BigValue extends PureComponent<Props> {
     const valueStyles = layout.getValueStyles();
     const titleStyles = layout.getTitleStyles();
     const textValues = layout.textValues;
+    const percentChange = this.props.value.percentChange;
+    const showPercentChange = percentChange != null && !Number.isNaN(percentChange);
 
     // When there is an outer data link this tooltip will override the outer native tooltip
     const tooltip = hasLinks ? undefined : textValues.tooltip;
@@ -104,6 +105,9 @@ export class BigValue extends PureComponent<Props> {
           <div style={valueAndTitleContainerStyles}>
             {textValues.title && <div style={titleStyles}>{textValues.title}</div>}
             <FormattedValueDisplay value={textValues} style={valueStyles} />
+            {showPercentChange && (
+              <PercentChange percentChange={percentChange} styles={layout.getPercentChangeStyles(percentChange)} />
+            )}
           </div>
           {layout.renderChart()}
         </div>
diff --git a/packages/grafana-ui/src/components/BigValue/BigValueLayout.tsx b/packages/grafana-ui/src/components/BigValue/BigValueLayout.tsx
index 15ff7a04b6901..db0d506f86e27 100644
--- a/packages/grafana-ui/src/components/BigValue/BigValueLayout.tsx
+++ b/packages/grafana-ui/src/components/BigValue/BigValueLayout.tsx
@@ -1,7 +1,7 @@
 import React, { CSSProperties } from 'react';
 import tinycolor from 'tinycolor2';
 
-import { formattedValueToString, DisplayValue, FieldConfig, FieldType, VizOrientation } from '@grafana/data';
+import { formattedValueToString, DisplayValue, FieldConfig, FieldType } from '@grafana/data';
 import { GraphDrawStyle, GraphFieldConfig } from '@grafana/schema';
 
 import { getTextColorForAlphaBackground } from '../../utils';
@@ -9,6 +9,7 @@ import { calculateFontSize } from '../../utils/measureText';
 import { Sparkline } from '../Sparkline/Sparkline';
 
 import { BigValueColorMode, Props, BigValueJustifyMode, BigValueTextMode } from './BigValue';
+import { percentChangeString } from './PercentChange';
 
 const LINE_HEIGHT = 1.2;
 const MAX_TITLE_SIZE = 30;
@@ -63,10 +64,6 @@ export abstract class BigValueLayout {
       lineHeight: LINE_HEIGHT,
     };
 
-    if (this.props.parentOrientation === VizOrientation.Horizontal && this.justifyCenter) {
-      styles.paddingRight = '0.75ch';
-    }
-
     if (
       this.props.colorMode === BigValueColorMode.Background ||
       this.props.colorMode === BigValueColorMode.BackgroundSolid
@@ -106,27 +103,94 @@ export abstract class BigValueLayout {
     return styles;
   }
 
+  getPercentChangeStyles(percentChange: number): PercentChangeStyles {
+    const VALUE_TO_PERCENT_CHANGE_RATIO = 2.5;
+    const valueContainerStyles = this.getValueAndTitleContainerStyles();
+    const percentFontSize = Math.max(this.valueFontSize / VALUE_TO_PERCENT_CHANGE_RATIO, 12);
+    let iconSize = Math.max(this.valueFontSize / 3, 10);
+
+    const color =
+      percentChange > 0
+        ? this.props.theme.visualization.getColorByName('green')
+        : this.props.theme.visualization.getColorByName('red');
+
+    const containerStyles: CSSProperties = {
+      fontSize: percentFontSize,
+      fontWeight: VALUE_FONT_WEIGHT,
+      lineHeight: LINE_HEIGHT,
+      position: 'relative',
+      display: 'flex',
+      alignItems: 'center',
+      gap: Math.max(percentFontSize / 3, 4),
+      zIndex: 1,
+      color,
+    };
+
+    if (this.justifyCenter) {
+      containerStyles.textAlign = 'center';
+    }
+
+    if (valueContainerStyles.flexDirection === 'column' && percentFontSize > 12) {
+      containerStyles.marginTop = -(percentFontSize / 4);
+    }
+
+    if (valueContainerStyles.flexDirection === 'row') {
+      containerStyles.alignItems = 'baseline';
+
+      // Center the percent change vertically relative to the value
+      // This approach seems to work the best for all edge cases
+      // Note: the fixed min font size causes this to be off for a few edge cases
+      containerStyles.lineHeight = LINE_HEIGHT * VALUE_TO_PERCENT_CHANGE_RATIO;
+    }
+
+    switch (this.props.colorMode) {
+      case BigValueColorMode.Background:
+      case BigValueColorMode.BackgroundSolid:
+        containerStyles.color = getTextColorForAlphaBackground(this.valueColor, this.props.theme.isDark);
+        break;
+    }
+
+    if (this.props.textMode === BigValueTextMode.None) {
+      containerStyles.fontSize = calculateFontSize(
+        percentChangeString(percentChange),
+        this.maxTextWidth * 0.8,
+        this.maxTextHeight * 0.8,
+        LINE_HEIGHT,
+        undefined,
+        VALUE_FONT_WEIGHT
+      );
+      iconSize = containerStyles.fontSize * 0.8;
+    }
+
+    return {
+      containerStyles,
+      iconSize: iconSize,
+    };
+  }
+
   getValueAndTitleContainerStyles() {
     const styles: CSSProperties = {
       display: 'flex',
+      flexWrap: 'wrap',
     };
 
     if (this.justifyCenter) {
       styles.alignItems = 'center';
       styles.justifyContent = 'center';
       styles.flexGrow = 1;
+      styles.gap = '0.75ch';
     }
 
     return styles;
   }
 
   getPanelStyles(): CSSProperties {
-    const { width, height, theme, colorMode } = this.props;
+    const { width, height, theme, colorMode, textMode } = this.props;
 
     const panelStyles: CSSProperties = {
       width: `${width}px`,
       height: `${height}px`,
-      padding: `${this.panelPadding}px`,
+      padding: `${textMode === BigValueTextMode.None ? 2 : this.panelPadding}px`,
       borderRadius: theme.shape.radius.default,
       position: 'relative',
       display: 'flex',
@@ -528,3 +592,8 @@ function getTextValues(props: Props): BigValueTextValues {
       };
   }
 }
+
+export interface PercentChangeStyles {
+  containerStyles: CSSProperties;
+  iconSize: number;
+}
diff --git a/packages/grafana-ui/src/components/BigValue/PercentChange.tsx b/packages/grafana-ui/src/components/BigValue/PercentChange.tsx
new file mode 100644
index 0000000000000..b492dfb6398e5
--- /dev/null
+++ b/packages/grafana-ui/src/components/BigValue/PercentChange.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+
+import { Icon } from '../Icon/Icon';
+
+import { PercentChangeStyles } from './BigValueLayout';
+
+export interface Props {
+  percentChange: number;
+  styles: PercentChangeStyles;
+}
+
+export const PercentChange = ({ percentChange, styles }: Props) => {
+  const percentChangeIcon =
+    percentChange && (percentChange > 0 ? 'arrow-up' : percentChange < 0 ? 'arrow-down' : undefined);
+
+  return (
+    <div style={styles.containerStyles}>
+      {percentChangeIcon && (
+        <Icon name={percentChangeIcon} height={styles.iconSize} width={styles.iconSize} viewBox="6 6 12 12" />
+      )}
+      {percentChangeString(percentChange)}
+    </div>
+  );
+};
+
+export const percentChangeString = (percentChange: number) => {
+  return percentChange?.toLocaleString(undefined, { style: 'percent', maximumSignificantDigits: 3 }) ?? '';
+};
diff --git a/packages/grafana-ui/src/components/Button/Button.tsx b/packages/grafana-ui/src/components/Button/Button.tsx
index 8e4f00b1c87fb..7423a05a4d3e4 100644
--- a/packages/grafana-ui/src/components/Button/Button.tsx
+++ b/packages/grafana-ui/src/components/Button/Button.tsx
@@ -1,4 +1,4 @@
-import { css, CSSObject, cx } from '@emotion/css';
+import { css, cx } from '@emotion/css';
 import React, { AnchorHTMLAttributes, ButtonHTMLAttributes } from 'react';
 
 import { GrafanaTheme2, ThemeRichColor } from '@grafana/data';
@@ -83,7 +83,9 @@ export const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
 
 Button.displayName = 'Button';
 
-type ButtonLinkProps = CommonProps & ButtonHTMLAttributes<HTMLButtonElement> & AnchorHTMLAttributes<HTMLAnchorElement>;
+export type ButtonLinkProps = CommonProps &
+  ButtonHTMLAttributes<HTMLButtonElement> &
+  AnchorHTMLAttributes<HTMLAnchorElement>;
 
 export const LinkButton = React.forwardRef<HTMLAnchorElement, ButtonLinkProps>(
   (
@@ -222,7 +224,7 @@ export const getButtonStyles = (props: StyleProps) => {
   };
 };
 
-function getButtonVariantStyles(theme: GrafanaTheme2, color: ThemeRichColor, fill: ButtonFill): CSSObject {
+function getButtonVariantStyles(theme: GrafanaTheme2, color: ThemeRichColor, fill: ButtonFill) {
   let outlineBorderColor = color.border;
   let borderColor = 'transparent';
   let hoverBorderColor = 'transparent';
@@ -291,7 +293,7 @@ function getButtonVariantStyles(theme: GrafanaTheme2, color: ThemeRichColor, fil
 }
 
 function getPropertiesForDisabled(theme: GrafanaTheme2, variant: ButtonVariant, fill: ButtonFill) {
-  const disabledStyles: CSSObject = {
+  const disabledStyles = {
     cursor: 'not-allowed',
     boxShadow: 'none',
     color: theme.colors.text.disabled,
diff --git a/packages/grafana-ui/src/components/Button/FullWidthButtonContainer.tsx b/packages/grafana-ui/src/components/Button/FullWidthButtonContainer.tsx
index 446c9a2cbed12..9c3fcfa7ca741 100644
--- a/packages/grafana-ui/src/components/Button/FullWidthButtonContainer.tsx
+++ b/packages/grafana-ui/src/components/Button/FullWidthButtonContainer.tsx
@@ -1,20 +1,20 @@
 import { css, cx } from '@emotion/css';
 import React from 'react';
 
-import { stylesFactory } from '../../themes';
+import { useStyles2 } from '../../themes';
 
 export interface Props {
   className?: string;
 }
 
 export const FullWidthButtonContainer = ({ className, children }: React.PropsWithChildren<Props>) => {
-  const styles = getStyles();
+  const styles = useStyles2(getStyles);
 
   return <div className={cx(styles, className)}>{children}</div>;
 };
 
-const getStyles = stylesFactory(() => {
-  return css({
+const getStyles = () =>
+  css({
     display: 'flex',
 
     button: {
@@ -31,4 +31,3 @@ const getStyles = stylesFactory(() => {
       textAlign: 'center',
     },
   });
-});
diff --git a/packages/grafana-ui/src/components/ButtonCascader/ButtonCascader.tsx b/packages/grafana-ui/src/components/ButtonCascader/ButtonCascader.tsx
index c849c8edbfcd2..3fe1450c51c7c 100644
--- a/packages/grafana-ui/src/components/ButtonCascader/ButtonCascader.tsx
+++ b/packages/grafana-ui/src/components/ButtonCascader/ButtonCascader.tsx
@@ -4,7 +4,7 @@ import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
-import { stylesFactory, useTheme2 } from '../../themes';
+import { useStyles2 } from '../../themes';
 import { IconName } from '../../types/icon';
 import { Button, ButtonProps } from '../Button';
 import { CascaderOption } from '../Cascader/Cascader';
@@ -27,27 +27,9 @@ export interface ButtonCascaderProps {
   hideDownIcon?: boolean;
 }
 
-const getStyles = stylesFactory((theme: GrafanaTheme2) => {
-  return {
-    popup: css({
-      label: 'popup',
-      zIndex: theme.zIndex.dropdown,
-    }),
-    icons: {
-      right: css({
-        margin: '1px 0 0 4px',
-      }),
-      left: css({
-        margin: '-1px 4px 0 0',
-      }),
-    },
-  };
-});
-
 export const ButtonCascader = (props: ButtonCascaderProps) => {
   const { onChange, className, loadData, icon, buttonProps, hideDownIcon, variant, disabled, ...rest } = props;
-  const theme = useTheme2();
-  const styles = getStyles(theme);
+  const styles = useStyles2(getStyles);
 
   // Weird way to do this bit it goes around a styling issue in Button where even null/undefined child triggers
   // styling change which messes up the look if there is only single icon content.
@@ -72,3 +54,20 @@ export const ButtonCascader = (props: ButtonCascaderProps) => {
 };
 
 ButtonCascader.displayName = 'ButtonCascader';
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    popup: css({
+      label: 'popup',
+      zIndex: theme.zIndex.dropdown,
+    }),
+    icons: {
+      right: css({
+        margin: '1px 0 0 4px',
+      }),
+      left: css({
+        margin: '-1px 4px 0 0',
+      }),
+    },
+  };
+};
diff --git a/packages/grafana-ui/src/components/ButtonCascader/_ButtonCascader.scss b/packages/grafana-ui/src/components/ButtonCascader/_ButtonCascader.scss
index 63ba29bdd31ea..a7878bc96cf94 100644
--- a/packages/grafana-ui/src/components/ButtonCascader/_ButtonCascader.scss
+++ b/packages/grafana-ui/src/components/ButtonCascader/_ButtonCascader.scss
@@ -125,13 +125,15 @@
         position: relative;
 
         &:after {
-          content: '>';
-          font-size: 12px;
-          color: $text-color-weak;
+          background: $text-color-weak;
+          content: '';
+          height: 24px;
+          mask: url(../img/icons/unicons/angle-right.svg);
+          mask-type: luminance;
           position: absolute;
-          right: 16px;
-          top: 0;
-          line-height: 32px;
+          right: 0px;
+          top: calc((32px - 24px) / 2);
+          width: 24px;
         }
       }
     }
diff --git a/packages/grafana-ui/src/components/Card/Card.mdx b/packages/grafana-ui/src/components/Card/Card.mdx
deleted file mode 100644
index 2e604d527f7b9..0000000000000
--- a/packages/grafana-ui/src/components/Card/Card.mdx
+++ /dev/null
@@ -1,450 +0,0 @@
-import { Meta, Preview, ArgTypes } from '@storybook/blocks';
-import { Card } from './Card';
-import { Button } from '../Button';
-import { IconButton } from '../IconButton/IconButton';
-import { TagList } from '../Tags/TagList';
-
-export const logo = 'https://grafana.com/static/assets/img/apple-touch-icon.png';
-
-<Meta title="MDX/Card" component={Card} />
-
-# Card
-
-## Usage
-
-### Basic
-
-A basic `Card` component expects at least a heading, used as a title.
-
-```jsx
-<Card>
-  <Card.Heading>Filter by name</Card.Heading>
-  <Card.Description>Filter data by query.</Card.Description>
-</Card>
-```
-
-<Preview>
-  <Card>
-    <Card.Heading>Filter by name</Card.Heading>
-    <Card.Description>Filter data by query.</Card.Description>
-  </Card>
-</Preview>
-
-### Multiple metadata elements
-
-For providing metadata elements, which can be any extra information for the card, `Card.Meta` component should be used. If metadata consists of multiple strings, each of them has to be escaped (wrapped in brackets `{}`) or better passed in as an array.
-
-```jsx
-<Card>
-  <Card.Heading>Test dashboard</Card.Heading>
-  <Card.Meta>{['Folder: Test', 'Views: 100']}</Card.Meta>
-</Card>
-```
-
-<Preview>
-  <Card>
-    <Card.Heading>Test dashboard</Card.Heading>
-    <Card.Meta>{['Folder: Test', 'Views: 100']}</Card.Meta>
-  </Card>
-</Preview>
-
-Metadata also accepts HTML elements, which could be links, for example. For elements, that are not strings, a `key` prop has to be manually specified.
-
-```jsx
-<Card>
-  <Card.Heading>Test dashboard</Card.Heading>
-  <Card.Meta>
-    Grafana
-    <a key="prom-link" href="https://ops-us-east4.grafana.net/api/prom">
-      https://ops-us-east4.grafana.net/api/prom
-    </a>
-  </Card.Meta>
-</Card>
-```
-
-<Preview>
-  <Card>
-    <Card.Heading>Test dashboard</Card.Heading>
-    <Card.Meta>
-      Grafana
-      <a key="prom-link" href="https://ops-us-east4.grafana.net/api/prom">
-        https://ops-us-east4.grafana.net/api/prom
-      </a>
-    </Card.Meta>
-  </Card>
-</Preview>
-
-The separator for multiple metadata elements defaults to a vertical line `|`, but can be customised.
-
-```jsx
-<Card>
-  <Card.Heading>Test dashboard</Card.Heading>
-  <Card.Meta separator={'-'}>
-    Grafana
-    <a key="prom-link" href="https://ops-us-east4.grafana.net/api/prom">
-      https://ops-us-east4.grafana.net/api/prom
-    </a>
-  </Card.Meta>
-</Card>
-```
-
-<Preview>
-  <Card>
-    <Card.Heading>Test dashboard</Card.Heading>
-    <Card.Meta separator={'-'}>
-      Grafana
-      <a key="prom-link" href="https://ops-us-east4.grafana.net/api/prom">
-        https://ops-us-east4.grafana.net/api/prom
-      </a>
-    </Card.Meta>
-  </Card>
-</Preview>
-
-### Tags
-
-Tags can be rendered inside the Card, by being wrapped in `Card.Tags` component. Note that this component does not provide any tag styling and that should be handled by the children. It is recommended to use it with Grafana-UI's `TagList` component.
-
-```jsx
-<Card>
-  <Card.Heading>Test dashboard</Card.Heading>
-  <Card.Description>Card with a list of tags</Card.Description>
-  <Card.Tags>
-    <TagList tags={['tag1', 'tag2', 'tag3']} onClick={(tag) => console.log(tag)} />
-  </Card.Tags>
-</Card>
-```
-
-<Preview>
-  <Card>
-    <Card.Heading>Test dashboard</Card.Heading>
-    <Card.Description>Card with a list of tags</Card.Description>
-    <Card.Tags>
-      <TagList tags={['tag1', 'tag2', 'tag3']} onClick={(tag) => console.log(tag)} />
-    </Card.Tags>
-  </Card>
-</Preview>
-
-### As a link
-
-Card can be used as a clickable link item by specifying `href` prop.
-
-```jsx
-<Card href="https://grafana.com">
-  <Card.Heading>Redirect to Grafana</Card.Heading>
-  <Card.Description>Clicking this card will redirect to grafana website</Card.Description>
-</Card>
-```
-
-<Preview>
-  <Card href="https://grafana.com">
-    <Card.Heading>Redirect to Grafana</Card.Heading>
-    <Card.Description>Clicking this card will redirect to grafana website</Card.Description>
-  </Card>
-</Preview>
-
-### As a button
-
-Card can be used as a clickable buttons item by specifying `onClick` prop.
-
-```jsx
-<Card onClick={() => alert('Hello, Grafana!')}>
-  <Card.Heading>Hello, Grafana</Card.Heading>
-  <Card.Description>Clicking this card will create an alert</Card.Description>
-</Card>
-```
-
-<Preview>
-  <Card onClick={() => alert('Hello, Grafana!')}>
-    <Card.Heading>Hello, Grafana</Card.Heading>
-    <Card.Description>Clicking this card will create an alert</Card.Description>
-  </Card>
-</Preview>
-
-> **Note**: When used in conjunction with [Metadata elements](#multiple-metadata-elements), clicking on any element
-> inside `<Card.Meta>` will prevent the card action to be executed (either `href` to be followed or `onClick` to be called).
->
-> Example:
-
-```jsx
-<Card onClick={() => alert('Hello, Grafana!')}>
-  <Card.Heading>Hello, Grafana</Card.Heading>
-  <Card.Meta>Clicking on this text (Meta) WILL NOT trigger the alert!</Card.Meta>
-  <Card.Description>Clicking on this text (Description) WILL trigger the alert!</Card.Description>
-</Card>
-```
-
-<Preview>
-  <Card onClick={() => alert('Hello, Grafana!')}>
-    <Card.Heading>Hello, Grafana</Card.Heading>
-    <Card.Meta>Clicking on this text (Meta) WILL NOT trigger the alert!</Card.Meta>
-    <Card.Description>Clicking on this text (Description) WILL trigger the alert!</Card.Description>
-  </Card>
-</Preview>
-
-### Inside a list item
-
-To render cards in a list, it is possible to nest them inside `li` items.
-
-```jsx
-<ul>
-  <li>
-    <Card>
-      <Card.Heading>List card item</Card.Heading>
-      <Card.Description>Card that is rendered inside li element.</Card.Description>
-    </Card>
-  </li>
-  <li>
-    <Card>
-      <Card.Heading>List card item</Card.Heading>
-      <Card.Description>Card that is rendered inside li element.</Card.Description>
-    </Card>
-  </li>
-  <li>
-    <Card>
-      <Card.Heading>List card item</Card.Heading>
-      <Card.Description>Card that is rendered inside li element.</Card.Description>
-    </Card>
-  </li>
-  <li>
-    <Card>
-      <Card.Heading>List card item</Card.Heading>
-      <Card.Description>Card that is rendered inside li element.</Card.Description>
-    </Card>
-  </li>
-</ul>
-```
-
-<Preview>
-  <ul style={{ padding: '20px', maxWidth: '800px', listStyle: 'none', display: 'grid' }}>
-    <li>
-      <Card>
-        <Card.Heading>List card item</Card.Heading>
-        <Card.Description>Card that is rendered inside li element.</Card.Description>
-      </Card>
-    </li>
-    <li>
-      <Card>
-        <Card.Heading>List card item</Card.Heading>
-        <Card.Description>Card that is rendered inside li element.</Card.Description>
-      </Card>
-    </li>
-    <li>
-      <Card>
-        <Card.Heading>List card item</Card.Heading>
-        <Card.Description>Card that is rendered inside li element.</Card.Description>
-      </Card>
-    </li>
-    <li>
-      <Card>
-        <Card.Heading>List card item</Card.Heading>
-        <Card.Description>Card that is rendered inside li element.</Card.Description>
-      </Card>
-    </li>
-  </ul>
-</Preview>
-
-### With media elements
-
-Cards can also be rendered with media content such icons or images. Such elements need to be wrapped in `Card.Figure` component.
-
-```jsx
-<Card>
-  <Card.Heading>1-ops-tools1-fallback</Card.Heading>
-  <Card.Figure>
-    <img src={logo} alt="Grafana Logo" width="40" height="40" />
-  </Card.Figure>
-  <Card.Meta>
-    Grafana
-    <a key="prom-link" href="https://ops-us-east4.grafana.net/api/prom">
-      https://ops-us-east4.grafana.net/api/prom
-    </a>
-  </Card.Meta>
-</Card>
-```
-
-<Preview>
-  <Card>
-    <Card.Heading>1-ops-tools1-fallback</Card.Heading>
-    <Card.Figure>
-      <img src={logo} alt="Grafana Logo" width="40" height="40" />
-    </Card.Figure>
-    <Card.Meta>
-      Grafana
-      <a key="prom-link" href="https://ops-us-east4.grafana.net/api/prom">
-        https://ops-us-east4.grafana.net/api/prom
-      </a>
-    </Card.Meta>
-  </Card>
-</Preview>
-
-### Action Cards
-
-Cards also accept primary and secondary actions. Usually the primary actions are displayed as buttons while secondary actions are displayed as icon buttons. The actions need to be wrappd in `Card.Actions` and `Card.SecondaryActions` components respectively.
-
-```jsx
-<Card>
-  <Card.Heading>1-ops-tools1-fallback</Card.Heading>
-  <Card.Meta>
-    Grafana
-    <a key="prom-link" href="https://ops-us-east4.grafana.net/api/prom">
-      https://ops-us-east4.grafana.net/api/prom
-    </a>
-  </Card.Meta>
-  <Card.Figure>
-    <img src={logo} alt="Grafana Logo" width="40" height="40" />
-  </Card.Figure>
-  <Card.Actions>
-    <Button key="settings" variant="secondary">
-      Settings
-    </Button>
-    <Button key="explore" variant="secondary">
-      Explore
-    </Button>
-  </Card.Actions>
-  <Card.SecondaryActions>
-    <IconButton key="showAll" name="apps" tooltip="Show all dashboards for this data source" />
-    <IconButton key="delete" name="trash-alt" tooltip="Delete this data source" />
-  </Card.SecondaryActions>
-</Card>
-```
-
-<Preview>
-  <Card>
-    <Card.Heading>1-ops-tools1-fallback</Card.Heading>
-    <Card.Meta>
-      Grafana
-      <a key="prom-link" href="https://ops-us-east4.grafana.net/api/prom">
-        https://ops-us-east4.grafana.net/api/prom
-      </a>
-    </Card.Meta>
-    <Card.Figure>
-      <img src={logo} alt="Grafana Logo" width="40" height="40" />
-    </Card.Figure>
-    <Card.Actions>
-      <Button key="settings" variant="secondary">
-        Settings
-      </Button>
-      <Button key="explore" variant="secondary">
-        Explore
-      </Button>
-    </Card.Actions>
-    <Card.SecondaryActions>
-      <IconButton key="showAll" name="apps" tooltip="Show all dashboards for this data source" />
-      <IconButton key="delete" name="trash-alt" tooltip="Delete this data source" />
-    </Card.SecondaryActions>
-  </Card>
-</Preview>
-
-### Disabled state
-
-Card can have a disabled state, effectively making it and its actions non-clickable. If there are any actions, they will be disabled instead of the whole card.
-
-```jsx
-<Card disabled>
-  <Card.Heading>1-ops-tools1-fallback</Card.Heading>
-  <Card.Meta>
-    Grafana
-    <a key="prom-link" href="https://ops-us-east4.grafana.net/api/prom">
-      https://ops-us-east4.grafana.net/api/prom
-    </a>
-  </Card.Meta>
-  <Card.Figure>
-    <img src={logo} alt="Grafana Logo" width="40" height="40" />
-  </Card.Figure>
-</Card>
-```
-
-<Preview>
-  <Card disabled>
-    <Card.Heading>1-ops-tools1-fallback</Card.Heading>
-    <Card.Meta>
-      Grafana
-      <a key="prom-link" href="https://ops-us-east4.grafana.net/api/prom">
-        https://ops-us-east4.grafana.net/api/prom
-      </a>
-    </Card.Meta>
-    <Card.Figure>
-      <img src={logo} alt="Grafana Logo" width="40" height="40" />
-    </Card.Figure>
-  </Card>
-</Preview>
-
-```jsx
-<Card disabled>
-  <Card.Heading>1-ops-tools1-fallback</Card.Heading>
-  <Card.Meta>
-    Grafana
-    <a key="prom-link" href="https://ops-us-east4.grafana.net/api/prom">
-      https://ops-us-east4.grafana.net/api/prom
-    </a>
-  </Card.Meta>
-  <Card.Figure>
-    <img src={logo} alt="Grafana Logo" width="40" height="40" />
-  </Card.Figure>
-  <Card.Actions>
-    <Button key="settings" variant="secondary">
-      Settings
-    </Button>
-    <Button key="explore" variant="secondary">
-      Explore
-    </Button>
-  </Card.Actions>
-  <Card.SecondaryActions>
-    <IconButton key="showAll" name="apps" tooltip="Show all dashboards for this data source" />
-    <IconButton key="delete" name="trash-alt" tooltip="Delete this data source" />
-  </Card.SecondaryActions>
-</Card>
-```
-
-<Preview>
-  <Card disabled>
-    <Card.Heading>1-ops-tools1-fallback</Card.Heading>
-    <Card.Meta>
-      Grafana
-      <a key="prom-link" href="https://ops-us-east4.grafana.net/api/prom">
-        https://ops-us-east4.grafana.net/api/prom
-      </a>
-    </Card.Meta>
-    <Card.Figure>
-      <img src={logo} alt="Grafana Logo" width="40" height="40" />
-    </Card.Figure>
-    <Card.Actions>
-      <Button key="settings" variant="secondary">
-        Settings
-      </Button>
-      <Button key="explore" variant="secondary">
-        Explore
-      </Button>
-    </Card.Actions>
-    <Card.SecondaryActions>
-      <IconButton key="showAll" name="apps" tooltip="Show all dashboards for this data source" />
-      <IconButton key="delete" name="trash-alt" tooltip="Delete this data source" />
-    </Card.SecondaryActions>
-  </Card>
-</Preview>
-
-### Selectable
-
-```jsx
-<Card isSelected disabled>
-  <Card.Heading>Option #1</Card.Heading>
-  <Card.Meta>This is a really great option, you won't regret it.</Card.Meta>
-  <Card.Figure>
-    <img src={logo} alt="Grafana Logo" width="40" height="40" />
-  </Card.Figure>
-</Card>
-```
-
-<Preview>
-  <Card isSelected disabled>
-    <Card.Heading>Option #1</Card.Heading>
-    <Card.Description>This is a really great option, you won't regret it.</Card.Description>
-    <Card.Figure>
-      <img src={logo} alt="Grafana Logo" width="40" height="40" />
-    </Card.Figure>
-  </Card>
-</Preview>
-
-### Props
-
-<ArgTypes of={Card} />
diff --git a/packages/grafana-ui/src/components/Card/Card.story.tsx b/packages/grafana-ui/src/components/Card/Card.story.tsx
index f690442139429..c53e01798b011 100644
--- a/packages/grafana-ui/src/components/Card/Card.story.tsx
+++ b/packages/grafana-ui/src/components/Card/Card.story.tsx
@@ -3,30 +3,30 @@ import React from 'react';
 
 import { Button } from '../Button';
 import { IconButton } from '../IconButton/IconButton';
-import { VerticalGroup } from '../Layout/Layout';
 import { TagList } from '../Tags/TagList';
 
 import { Card } from './Card';
-import mdx from './Card.mdx';
 
 const logo = 'https://grafana.com/static/assets/img/apple-touch-icon.png';
 
 const meta: Meta<typeof Card> = {
   title: 'General/Card',
   component: Card,
+  // nosort is a custom tag used so the stories shown in docs keep the order they are defined in the file
+  tags: ['autodocs', 'nosort'],
   parameters: {
-    docs: {
-      page: mdx,
-    },
     controls: {
       exclude: ['onClick', 'href', 'heading', 'description', 'className'],
     },
   },
 };
 
-export const Basic: StoryFn<typeof Card> = ({ disabled }) => {
+/**
+ * A basic Card component expects at least a heading, used as a title.
+ */
+export const Basic: StoryFn<typeof Card> = (args) => {
   return (
-    <Card disabled={disabled}>
+    <Card {...args}>
       <Card.Heading>Filter by name</Card.Heading>
       <Card.Description>
         Filter data by query. This is useful if you are sharing the results from a different panel that has many queries
@@ -36,46 +36,159 @@ export const Basic: StoryFn<typeof Card> = ({ disabled }) => {
   );
 };
 
-export const AsLink: StoryFn<typeof Card> = ({ disabled }) => {
+/**
+ * For providing metadata elements, which can be any extra information for the card, Card.Meta component should be used.
+ * If metadata consists of multiple strings, each of them has to be escaped (wrapped in brackets {}) or better passed in as an array.
+ */
+export const MultipleMetadataElements: StoryFn<typeof Card> = (args) => {
+  return (
+    <Card>
+      <Card.Heading>Test dashboard</Card.Heading>
+      <Card.Meta>{['Folder: Test', 'Views: 100']}</Card.Meta>
+    </Card>
+  );
+};
+
+/**
+ * Metadata also accepts HTML elements, which could be links, for example.
+ * For elements, that are not strings, a `key` prop has to be manually specified.
+ */
+export const ComplexMetadataElements: StoryFn<typeof Card> = (args) => {
+  return (
+    <Card>
+      <Card.Heading>Test dashboard</Card.Heading>
+      <Card.Meta>
+        <>Grafana</>
+        <a key="prom-link" href="https://ops-us-east4.grafana.net/api/prom">
+          <>https://ops-us-east4.grafana.net/api/prom</>
+        </a>
+      </Card.Meta>
+    </Card>
+  );
+};
+
+/**
+ * The separator for multiple metadata elements defaults to a vertical line `|`, but can be customised.
+ */
+export const MultipleMetadataWithCustomSeparator: StoryFn<typeof Card> = (args) => {
   return (
-    <VerticalGroup>
-      <Card href="https://grafana.com" disabled={disabled}>
-        <Card.Heading>Filter by name</Card.Heading>
-        <Card.Description>
-          Filter data by query. This is useful if you are sharing the results from a different panel that has many
-          queries and you want to only visualize a subset of that in this panel.
-        </Card.Description>
-      </Card>
-      <Card href="https://grafana.com" disabled={disabled}>
-        <Card.Heading>Filter by name2</Card.Heading>
-        <Card.Description>
-          Filter data by query. This is useful if you are sharing the results from a different panel that has many
-          queries and you want to only visualize a subset of that in this panel.
-        </Card.Description>
-      </Card>
-      <Card href="https://grafana.com" disabled={disabled}>
-        <Card.Heading>Production system overview</Card.Heading>
-        <Card.Meta>Meta tags</Card.Meta>
-      </Card>
-    </VerticalGroup>
+    <Card>
+      <Card.Heading>Test dashboard</Card.Heading>
+      <Card.Meta separator={'-'}>
+        Grafana
+        <a key="prom-link" href="https://ops-us-east4.grafana.net/api/prom">
+          https://ops-us-east4.grafana.net/api/prom
+        </a>
+      </Card.Meta>
+    </Card>
   );
 };
 
-export const WithTags: StoryFn<typeof Card> = ({ disabled }) => {
+/**
+ * Tags can be rendered inside the Card, by being wrapped in `Card.Tags` component.
+ * Note that this component does not provide any tag styling and that should be handled by the children.
+ * It is recommended to use it with Grafana-UI's `TagList` component.
+ */
+export const Tags: StoryFn<typeof Card> = (args) => {
   return (
-    <Card disabled={disabled}>
-      <Card.Heading>Elasticsearch – Custom Templated Query</Card.Heading>
-      <Card.Meta>Elastic Search</Card.Meta>
+    <Card>
+      <Card.Heading>Test dashboard</Card.Heading>
+      <Card.Description>Card with a list of tags</Card.Description>
       <Card.Tags>
-        <TagList tags={['elasticsearch', 'test', 'testdata']} onClick={(tag) => console.log('tag', tag)} />
+        <TagList tags={['tag1', 'tag2', 'tag3']} onClick={(tag) => console.log(tag)} />
       </Card.Tags>
     </Card>
   );
 };
 
-export const WithMedia: StoryFn<typeof Card> = ({ disabled }) => {
+/**
+ * Card can be used as a clickable link item by specifying `href` prop.
+ */
+export const AsALink: StoryFn<typeof Card> = (args) => {
+  return (
+    <Card href="https://grafana.com">
+      <Card.Heading>Redirect to Grafana</Card.Heading>
+      <Card.Description>Clicking this card will redirect to grafana website</Card.Description>
+    </Card>
+  );
+};
+
+/**
+ * Card can be used as a clickable buttons item by specifying `onClick` prop.
+ * **Note:** When used in conjunction with [Metadata elements](#multiple-metadata-elements), clicking on any element
+ * inside `<Card.Meta>` will prevent the card action to be executed (either `href` to be followed or `onClick` to be called).
+ */
+export const AsAButton: StoryFn<typeof Card> = (args) => {
+  return (
+    <Card onClick={() => alert('Hello, Grafana!')}>
+      <Card.Heading>Hello, Grafana</Card.Heading>
+      <Card.Description>Clicking this card will create an alert</Card.Description>
+    </Card>
+  );
+};
+
+/**
+ * To render cards in a list, it is possible to nest them inside `li` items.
+ */
+export const InsideAListItem: StoryFn<typeof Card> = (args) => {
+  return (
+    <ul style={{ padding: '20px', listStyle: 'none', display: 'grid' }}>
+      <li>
+        <Card>
+          <Card.Heading>List card item</Card.Heading>
+          <Card.Description>Card that is rendered inside li element.</Card.Description>
+        </Card>
+      </li>
+      <li>
+        <Card>
+          <Card.Heading>List card item</Card.Heading>
+          <Card.Description>Card that is rendered inside li element.</Card.Description>
+        </Card>
+      </li>
+      <li>
+        <Card>
+          <Card.Heading>List card item</Card.Heading>
+          <Card.Description>Card that is rendered inside li element.</Card.Description>
+        </Card>
+      </li>
+      <li>
+        <Card>
+          <Card.Heading>List card item</Card.Heading>
+          <Card.Description>Card that is rendered inside li element.</Card.Description>
+        </Card>
+      </li>
+    </ul>
+  );
+};
+
+/**
+ * Cards can also be rendered with media content such icons or images. Such elements need to be wrapped in `Card.Figure` component.
+ */
+export const WithMediaElements: StoryFn<typeof Card> = (args) => {
+  return (
+    <Card>
+      <Card.Heading>1-ops-tools1-fallback</Card.Heading>
+      <Card.Figure>
+        <img src={logo} alt="Grafana Logo" width="40" height="40" />
+      </Card.Figure>
+      <Card.Meta>
+        Grafana
+        <a key="prom-link" href="https://ops-us-east4.grafana.net/api/prom">
+          https://ops-us-east4.grafana.net/api/prom
+        </a>
+      </Card.Meta>
+    </Card>
+  );
+};
+
+/**
+ * Cards also accept primary and secondary actions. Usually the primary actions are displayed as buttons
+ * while secondary actions are displayed as icon buttons. The actions need to be wrapped in `Card.Actions`
+ * and `Card.SecondaryActions` components respectively.
+ */
+export const ActionCards: StoryFn<typeof Card> = (args) => {
   return (
-    <Card disabled={disabled}>
+    <Card {...args}>
       <Card.Heading>1-ops-tools1-fallback</Card.Heading>
       <Card.Meta>
         Prometheus
@@ -86,21 +199,38 @@ export const WithMedia: StoryFn<typeof Card> = ({ disabled }) => {
       <Card.Figure>
         <img src={logo} alt="Prometheus Logo" height="40" width="40" />
       </Card.Figure>
+      <Card.Actions>
+        <Button key="settings" variant="secondary">
+          Settings
+        </Button>
+        <Button key="explore" variant="secondary">
+          Explore
+        </Button>
+      </Card.Actions>
+      <Card.SecondaryActions>
+        <IconButton key="showAll" name="apps" tooltip="Show all dashboards for this data source" />
+        <IconButton key="delete" name="trash-alt" tooltip="Delete this data source" />
+      </Card.SecondaryActions>
     </Card>
   );
 };
-export const WithActions: StoryFn<typeof Card> = ({ disabled }) => {
+
+/**
+ * Card can have a disabled state, effectively making it and its actions non-clickable.
+ * If there are any actions, they will be disabled instead of the whole card.
+ */
+export const DisabledState: StoryFn<typeof Card> = (args) => {
   return (
-    <Card disabled={disabled}>
+    <Card disabled>
       <Card.Heading>1-ops-tools1-fallback</Card.Heading>
       <Card.Meta>
-        Prometheus
-        <a key="link2" href="https://ops-us-east4.grafana.net/api/prom">
+        Grafana
+        <a key="prom-link" href="https://ops-us-east4.grafana.net/api/prom">
           https://ops-us-east4.grafana.net/api/prom
         </a>
       </Card.Meta>
       <Card.Figure>
-        <img src={logo} alt="Prometheus Logo" height="40" width="40" />
+        <img src={logo} alt="Grafana Logo" width="40" height="40" />
       </Card.Figure>
       <Card.Actions>
         <Button key="settings" variant="secondary">
@@ -118,9 +248,21 @@ export const WithActions: StoryFn<typeof Card> = ({ disabled }) => {
   );
 };
 
-export const Full: StoryFn<typeof Card> = ({ disabled }) => {
+export const Selectable: StoryFn<typeof Card> = () => {
   return (
-    <Card disabled={disabled}>
+    <Card isSelected disabled>
+      <Card.Heading>Option #1</Card.Heading>
+      <Card.Description>This is a really great option, you will not regret it.</Card.Description>
+      <Card.Figure>
+        <img src={logo} alt="Grafana Logo" width="40" height="40" />
+      </Card.Figure>
+    </Card>
+  );
+};
+
+export const Full: StoryFn<typeof Card> = (args) => {
+  return (
+    <Card {...args}>
       <Card.Heading>Card title</Card.Heading>
       <Card.Description>
         Description, body text. Greetings! Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
@@ -155,28 +297,4 @@ export const Full: StoryFn<typeof Card> = ({ disabled }) => {
   );
 };
 
-export const Selected: StoryFn<typeof Card> = () => {
-  return (
-    <Card isSelected>
-      <Card.Heading>Spaces</Card.Heading>
-      <Card.Description>Spaces are the superior form of indenting code.</Card.Description>
-      <Card.Figure>
-        <img src={logo} alt="Grafana Logo" width="40" height="40" />
-      </Card.Figure>
-    </Card>
-  );
-};
-
-export const NotSelected: StoryFn<typeof Card> = () => {
-  return (
-    <Card isSelected={false}>
-      <Card.Heading>Tabs</Card.Heading>
-      <Card.Description>Tabs are the preferred way of indentation.</Card.Description>
-      <Card.Figure>
-        <img src={logo} alt="Grafana Logo" width="40" height="40" />
-      </Card.Figure>
-    </Card>
-  );
-};
-
 export default meta;
diff --git a/packages/grafana-ui/src/components/Card/Card.tsx b/packages/grafana-ui/src/components/Card/Card.tsx
index 0f34721e03135..08f363dda255f 100644
--- a/packages/grafana-ui/src/components/Card/Card.tsx
+++ b/packages/grafana-ui/src/components/Card/Card.tsx
@@ -3,7 +3,7 @@ import React, { memo, cloneElement, FC, useMemo, useContext, ReactNode } from 'r
 
 import { GrafanaTheme2 } from '@grafana/data';
 
-import { useStyles2, useTheme2 } from '../../themes';
+import { useStyles2 } from '../../themes';
 import { getFocusStyles } from '../../themes/mixins';
 
 import { CardContainer, CardContainerProps, getCardContainerStyles } from './CardContainer';
@@ -23,6 +23,8 @@ export interface Props extends Omit<CardContainerProps, 'disableEvents' | 'disab
   /** @deprecated Use `Card.Description` instead */
   description?: string;
   isSelected?: boolean;
+  /** If true, the padding of the Card will be smaller */
+  isCompact?: boolean;
 }
 
 export interface CardInterface extends FC<Props> {
@@ -47,7 +49,16 @@ const CardContext = React.createContext<{
  *
  * @public
  */
-export const Card: CardInterface = ({ disabled, href, onClick, children, isSelected, className, ...htmlProps }) => {
+export const Card: CardInterface = ({
+  disabled,
+  href,
+  onClick,
+  children,
+  isSelected,
+  isCompact,
+  className,
+  ...htmlProps
+}) => {
   const hasHeadingComponent = useMemo(
     () => React.Children.toArray(children).some((c) => React.isValidElement(c) && c.type === Heading),
     [children]
@@ -55,8 +66,7 @@ export const Card: CardInterface = ({ disabled, href, onClick, children, isSelec
 
   const disableHover = disabled || (!onClick && !href);
   const onCardClick = onClick && !disabled ? onClick : undefined;
-  const theme = useTheme2();
-  const styles = getCardContainerStyles(theme, disabled, disableHover, isSelected);
+  const styles = useStyles2(getCardContainerStyles, disabled, disableHover, isSelected, isCompact);
 
   return (
     <CardContainer
@@ -85,7 +95,11 @@ const Heading = ({ children, className, 'aria-label': ariaLabel }: ChildProps &
   const context = useContext(CardContext);
   const styles = useStyles2(getHeadingStyles);
 
-  const { href, onClick, isSelected } = context ?? { href: undefined, onClick: undefined, isSelected: undefined };
+  const { href, onClick, isSelected } = context ?? {
+    href: undefined,
+    onClick: undefined,
+    isSelected: undefined,
+  };
 
   return (
     <h2 className={cx(styles.heading, className)}>
@@ -100,7 +114,8 @@ const Heading = ({ children, className, 'aria-label': ariaLabel }: ChildProps &
       ) : (
         <>{children}</>
       )}
-      {isSelected !== undefined && <input aria-label="option" type="radio" readOnly checked={isSelected} />}
+      {/* Input must be readonly because we are providing a value for the checked prop with no onChange handler */}
+      {isSelected !== undefined && <input aria-label="option" type="radio" checked={isSelected} readOnly />}
     </h2>
   );
 };
@@ -120,6 +135,9 @@ const getHeadingStyles = (theme: GrafanaTheme2) => ({
     lineHeight: theme.typography.body.lineHeight,
     color: theme.colors.text.primary,
     fontWeight: theme.typography.fontWeightMedium,
+    '& input[readonly]': {
+      cursor: 'inherit',
+    },
   }),
   linkHack: css({
     all: 'unset',
@@ -283,22 +301,22 @@ const BaseActions = ({ children, disabled, variant, className }: ActionsProps) =
 
 const getActionStyles = (theme: GrafanaTheme2) => ({
   actions: css({
+    display: 'flex',
+    flexDirection: 'row',
+    flexWrap: 'wrap',
+    gap: theme.spacing(1),
     gridArea: 'Actions',
     marginTop: theme.spacing(2),
-    '& > *': {
-      marginRight: theme.spacing(1),
-    },
   }),
   secondaryActions: css({
-    display: 'flex',
-    gridArea: 'Secondary',
     alignSelf: 'center',
     color: theme.colors.text.secondary,
-    marginTtop: theme.spacing(2),
-
-    '& > *': {
-      marginRight: `${theme.spacing(1)} !important`,
-    },
+    display: 'flex',
+    flexDirection: 'row',
+    flexWrap: 'wrap',
+    gap: theme.spacing(1),
+    gridArea: 'Secondary',
+    marginTop: theme.spacing(2),
   }),
 });
 
diff --git a/packages/grafana-ui/src/components/Card/CardContainer.tsx b/packages/grafana-ui/src/components/Card/CardContainer.tsx
index 7205f6df6cbbe..8879a87ed4f55 100644
--- a/packages/grafana-ui/src/components/Card/CardContainer.tsx
+++ b/packages/grafana-ui/src/components/Card/CardContainer.tsx
@@ -3,7 +3,7 @@ import React, { HTMLAttributes } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
-import { styleMixins, stylesFactory, useStyles2, useTheme2 } from '../../themes';
+import { styleMixins, useStyles2 } from '../../themes';
 
 /**
  * @public
@@ -57,8 +57,8 @@ export const CardContainer = ({
   href,
   ...props
 }: CardContainerProps) => {
-  const theme = useTheme2();
-  const { oldContainer } = getCardContainerStyles(theme, disableEvents, disableHover, isSelected);
+  const { oldContainer } = useStyles2(getCardContainerStyles, disableEvents, disableHover, isSelected);
+
   return (
     <div {...props} className={cx(oldContainer, className)}>
       <CardInner href={href}>{children}</CardInner>
@@ -66,71 +66,75 @@ export const CardContainer = ({
   );
 };
 
-export const getCardContainerStyles = stylesFactory(
-  (theme: GrafanaTheme2, disabled = false, disableHover = false, isSelected) => {
-    const isSelectable = isSelected !== undefined;
+export const getCardContainerStyles = (
+  theme: GrafanaTheme2,
+  disabled = false,
+  disableHover = false,
+  isSelected?: boolean,
+  isCompact?: boolean
+) => {
+  const isSelectable = isSelected !== undefined;
 
-    return {
-      container: css({
-        display: 'grid',
-        position: 'relative',
-        gridTemplateColumns: 'auto 1fr auto',
-        gridTemplateRows: '1fr auto auto auto',
-        gridAutoColumns: '1fr',
-        gridAutoFlow: 'row',
-        gridTemplateAreas: `
+  return {
+    container: css({
+      display: 'grid',
+      position: 'relative',
+      gridTemplateColumns: 'auto 1fr auto',
+      gridTemplateRows: '1fr auto auto auto',
+      gridAutoColumns: '1fr',
+      gridAutoFlow: 'row',
+      gridTemplateAreas: `
         "Figure Heading Tags"
         "Figure Meta Tags"
         "Figure Description Tags"
         "Figure Actions Secondary"`,
-        width: '100%',
-        padding: theme.spacing(2),
-        background: theme.colors.background.secondary,
-        borderRadius: theme.shape.radius.default,
-        marginBottom: '8px',
-        pointerEvents: disabled ? 'none' : 'auto',
-        transition: theme.transitions.create(['background-color', 'box-shadow', 'border-color', 'color'], {
-          duration: theme.transitions.duration.short,
-        }),
-
-        ...(!disableHover && {
-          '&:hover': {
-            background: theme.colors.emphasize(theme.colors.background.secondary, 0.03),
-            cursor: 'pointer',
-            zIndex: 1,
-          },
-          '&:focus': styleMixins.getFocusStyles(theme),
-        }),
+      width: '100%',
+      padding: theme.spacing(isCompact ? 1 : 2),
+      background: theme.colors.background.secondary,
+      borderRadius: theme.shape.radius.default,
+      marginBottom: '8px',
+      pointerEvents: disabled ? 'none' : 'auto',
+      transition: theme.transitions.create(['background-color', 'box-shadow', 'border-color', 'color'], {
+        duration: theme.transitions.duration.short,
+      }),
 
-        ...(isSelectable && {
+      ...(!disableHover && {
+        '&:hover': {
+          background: theme.colors.emphasize(theme.colors.background.secondary, 0.03),
           cursor: 'pointer',
-        }),
+          zIndex: 1,
+        },
+        '&:focus': styleMixins.getFocusStyles(theme),
+      }),
 
-        ...(isSelected && {
-          outline: `solid 2px ${theme.colors.primary.border}`,
-        }),
+      ...(isSelectable && {
+        cursor: 'pointer',
       }),
-      oldContainer: css({
-        display: 'flex',
-        width: '100%',
-        background: theme.colors.background.secondary,
-        borderRadius: theme.shape.radius.default,
-        position: 'relative',
-        pointerEvents: disabled ? 'none' : 'auto',
-        marginBottom: theme.spacing(1),
-        transition: theme.transitions.create(['background-color', 'box-shadow', 'border-color', 'color'], {
-          duration: theme.transitions.duration.short,
-        }),
 
-        ...(!disableHover && {
-          '&:hover': {
-            background: theme.colors.emphasize(theme.colors.background.secondary, 0.03),
-            cursor: 'pointer',
-            zIndex: 1,
-          },
-          '&:focus': styleMixins.getFocusStyles(theme),
-        }),
+      ...(isSelected && {
+        outline: `solid 2px ${theme.colors.primary.border}`,
+      }),
+    }),
+    oldContainer: css({
+      display: 'flex',
+      width: '100%',
+      background: theme.colors.background.secondary,
+      borderRadius: theme.shape.radius.default,
+      position: 'relative',
+      pointerEvents: disabled ? 'none' : 'auto',
+      marginBottom: theme.spacing(1),
+      transition: theme.transitions.create(['background-color', 'box-shadow', 'border-color', 'color'], {
+        duration: theme.transitions.duration.short,
       }),
-    };
-  }
-);
+
+      ...(!disableHover && {
+        '&:hover': {
+          background: theme.colors.emphasize(theme.colors.background.secondary, 0.03),
+          cursor: 'pointer',
+          zIndex: 1,
+        },
+        '&:focus': styleMixins.getFocusStyles(theme),
+      }),
+    }),
+  };
+};
diff --git a/packages/grafana-ui/src/components/Cascader/Cascader.test.tsx b/packages/grafana-ui/src/components/Cascader/Cascader.test.tsx
index e39b75043601a..56807ba60b3f3 100644
--- a/packages/grafana-ui/src/components/Cascader/Cascader.test.tsx
+++ b/packages/grafana-ui/src/components/Cascader/Cascader.test.tsx
@@ -1,7 +1,9 @@
 import { act, render, screen } from '@testing-library/react';
-import userEvent, { PointerEventsCheckLevel } from '@testing-library/user-event';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
 
+import { Field } from '../Forms/Field';
+
 import { Cascader, CascaderOption, CascaderProps } from './Cascader';
 
 const options = [
@@ -118,9 +120,8 @@ describe('Cascader', () => {
     expect(screen.queryByDisplayValue('First/Second')).not.toBeInTheDocument();
 
     await userEvent.click(screen.getByPlaceholderText(placeholder));
-    // TODO remove skipPointerEventsCheck once https://github.com/jsdom/jsdom/issues/3232 is fixed
-    await userEvent.click(screen.getByText('First'), { pointerEventsCheck: PointerEventsCheckLevel.Never });
-    await userEvent.click(screen.getByText('Second'), { pointerEventsCheck: PointerEventsCheckLevel.Never });
+    await userEvent.click(screen.getByText('First'));
+    await userEvent.click(screen.getByText('Second'));
 
     expect(screen.getByDisplayValue('First / Second')).toBeInTheDocument();
   });
@@ -141,9 +142,8 @@ describe('Cascader', () => {
     expect(screen.queryByDisplayValue('First/Second')).not.toBeInTheDocument();
 
     await userEvent.click(screen.getByPlaceholderText(placeholder));
-    // TODO remove skipPointerEventsCheck once https://github.com/jsdom/jsdom/issues/3232 is fixed
-    await userEvent.click(screen.getByText('First'), { pointerEventsCheck: PointerEventsCheckLevel.Never });
-    await userEvent.click(screen.getByText('Second'), { pointerEventsCheck: PointerEventsCheckLevel.Never });
+    await userEvent.click(screen.getByText('First'));
+    await userEvent.click(screen.getByText('Second'));
 
     expect(screen.getByDisplayValue(`First${separator}Second`)).toBeInTheDocument();
   });
@@ -154,9 +154,8 @@ describe('Cascader', () => {
     );
 
     await userEvent.click(screen.getByPlaceholderText(placeholder));
-    // TODO remove skipPointerEventsCheck once https://github.com/jsdom/jsdom/issues/3232 is fixed
-    await userEvent.click(screen.getByText('First'), { pointerEventsCheck: PointerEventsCheckLevel.Never });
-    await userEvent.click(screen.getByText('Second'), { pointerEventsCheck: PointerEventsCheckLevel.Never });
+    await userEvent.click(screen.getByText('First'));
+    await userEvent.click(screen.getByText('Second'));
 
     expect(screen.getByDisplayValue('Second')).toBeInTheDocument();
   });
@@ -165,10 +164,19 @@ describe('Cascader', () => {
     render(<Cascader placeholder={placeholder} options={options} onSelect={jest.fn()} />);
 
     await userEvent.click(screen.getByPlaceholderText(placeholder));
-    // TODO remove skipPointerEventsCheck once https://github.com/jsdom/jsdom/issues/3232 is fixed
-    await userEvent.click(screen.getByText('First'), { pointerEventsCheck: PointerEventsCheckLevel.Never });
-    await userEvent.click(screen.getByText('Second'), { pointerEventsCheck: PointerEventsCheckLevel.Never });
+    await userEvent.click(screen.getByText('First'));
+    await userEvent.click(screen.getByText('Second'));
 
     expect(screen.getByDisplayValue('Second')).toBeInTheDocument();
   });
+
+  it('should be properly associated with the Field label', () => {
+    render(
+      <Field label={'Cascader label'}>
+        <Cascader options={options} onSelect={jest.fn()} id={'cascader'} />
+      </Field>
+    );
+
+    expect(screen.getByRole('textbox', { name: 'Cascader label' })).toBeInTheDocument();
+  });
 });
diff --git a/packages/grafana-ui/src/components/Cascader/Cascader.tsx b/packages/grafana-ui/src/components/Cascader/Cascader.tsx
index 27c8f03f1760d..2e99cc652609e 100644
--- a/packages/grafana-ui/src/components/Cascader/Cascader.tsx
+++ b/packages/grafana-ui/src/components/Cascader/Cascader.tsx
@@ -6,7 +6,9 @@ import React, { PureComponent } from 'react';
 import { SelectableValue } from '@grafana/data';
 
 import { Icon } from '../Icon/Icon';
+import { IconButton } from '../IconButton/IconButton';
 import { Input } from '../Input/Input';
+import { Stack } from '../Layout/Stack/Stack';
 import { Select } from '../Select/Select';
 
 import { onChangeCascader } from './optionMappings';
@@ -37,6 +39,11 @@ export interface CascaderProps {
   /** Don't show what is selected in the cascader input/search. Useful when input is used just as search and the
       cascader is hidden after selection. */
   hideActiveLevelLabel?: boolean;
+  disabled?: boolean;
+  /** ID for the underlying Select/Cascader component */
+  id?: string;
+  /** Whether you can clear the selected value or not */
+  isClearable?: boolean;
 }
 
 interface CascaderState {
@@ -45,6 +52,7 @@ interface CascaderState {
   //Array for cascade navigation
   rcValue: SelectableValue<string[]>;
   activeLabel: string;
+  inputValue: string;
 }
 
 export interface CascaderOption {
@@ -83,6 +91,7 @@ export class Cascader extends PureComponent<CascaderProps, CascaderState> {
       focusCascade: false,
       rcValue,
       activeLabel,
+      inputValue: '',
     };
   }
 
@@ -93,7 +102,7 @@ export class Cascader extends PureComponent<CascaderProps, CascaderState> {
     for (const option of options) {
       const cpy = [...optionPath];
       cpy.push(option);
-      if (!option.items) {
+      if (!option.items || option.items.length === 0) {
         selectOptions.push({
           singleLabel: cpy[cpy.length - 1].label,
           label: cpy.map((o) => o.label).join(this.props.separator || DEFAULT_SEPARATOR),
@@ -133,31 +142,38 @@ export class Cascader extends PureComponent<CascaderProps, CascaderState> {
     const activeLabel = this.props.hideActiveLevelLabel
       ? ''
       : this.props.displayAllSelectedLevels
-      ? selectedOptions.map((option) => option.label).join(this.props.separator || DEFAULT_SEPARATOR)
-      : selectedOptions[selectedOptions.length - 1].label;
-    this.setState({
-      rcValue: value,
+        ? selectedOptions.map((option) => option.label).join(this.props.separator || DEFAULT_SEPARATOR)
+        : selectedOptions[selectedOptions.length - 1].label;
+    const state: CascaderState = {
+      rcValue: { value, label: activeLabel },
       focusCascade: true,
       activeLabel,
-    });
-
+      isSearching: false,
+      inputValue: activeLabel,
+    };
+    this.setState(state);
     this.props.onSelect(selectedOptions[selectedOptions.length - 1].value);
   };
 
   //For select
   onSelect = (obj: SelectableValue<string[]>) => {
     const valueArray = obj.value || [];
-    this.setState({
-      activeLabel: this.props.displayAllSelectedLevels ? obj.label : obj.singleLabel || '',
-      rcValue: valueArray,
+    const activeLabel = this.props.displayAllSelectedLevels ? obj.label : obj.singleLabel || '';
+    const state: CascaderState = {
+      activeLabel: activeLabel,
+      inputValue: activeLabel,
+      rcValue: { value: valueArray, label: activeLabel },
       isSearching: false,
-    });
+      focusCascade: false,
+    };
+    this.setState(state);
     this.props.onSelect(valueArray[valueArray.length - 1]);
   };
 
   onCreateOption = (value: string) => {
     this.setState({
       activeLabel: value,
+      inputValue: value,
       rcValue: [],
       isSearching: false,
     });
@@ -187,26 +203,36 @@ export class Cascader extends PureComponent<CascaderProps, CascaderState> {
   };
 
   onInputKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
-    if (['ArrowDown', 'ArrowUp', 'Enter', 'ArrowLeft', 'ArrowRight', 'Backspace'].includes(e.key)) {
+    if (['ArrowDown', 'ArrowUp', 'Enter', 'ArrowLeft', 'ArrowRight'].includes(e.key)) {
       return;
     }
+    const { activeLabel } = this.state;
     this.setState({
       focusCascade: false,
       isSearching: true,
+      inputValue: activeLabel,
     });
   };
 
   onSelectInputChange = (value: string) => {
-    if (value === '') {
-      this.setState({
-        isSearching: false,
-      });
-    }
+    this.setState({
+      inputValue: value,
+    });
   };
 
   render() {
-    const { allowCustomValue, formatCreateLabel, placeholder, width, changeOnSelect, options } = this.props;
-    const { focusCascade, isSearching, rcValue, activeLabel } = this.state;
+    const {
+      allowCustomValue,
+      formatCreateLabel,
+      placeholder,
+      width,
+      changeOnSelect,
+      options,
+      disabled,
+      id,
+      isClearable,
+    } = this.props;
+    const { focusCascade, isSearching, rcValue, activeLabel, inputValue } = this.state;
 
     const searchableOptions = this.getSearchableOptions(options);
 
@@ -224,6 +250,9 @@ export class Cascader extends PureComponent<CascaderProps, CascaderState> {
             formatCreateLabel={formatCreateLabel}
             width={width}
             onInputChange={this.onSelectInputChange}
+            disabled={disabled}
+            inputValue={inputValue}
+            inputId={id}
           />
         ) : (
           <RCCascader
@@ -234,6 +263,7 @@ export class Cascader extends PureComponent<CascaderProps, CascaderState> {
             fieldNames={{ label: 'label', value: 'value', children: 'items' }}
             expandIcon={null}
             open={this.props.alwaysOpen}
+            disabled={disabled}
           >
             <div className={disableDivFocus}>
               <Input
@@ -245,12 +275,24 @@ export class Cascader extends PureComponent<CascaderProps, CascaderState> {
                 onKeyDown={this.onInputKeyDown}
                 onChange={() => {}}
                 suffix={
-                  focusCascade ? (
-                    <Icon name="angle-up" />
-                  ) : (
-                    <Icon name="angle-down" style={{ marginBottom: 0, marginLeft: '4px' }} />
-                  )
+                  <Stack gap={0.5}>
+                    {isClearable && activeLabel !== '' && (
+                      <IconButton
+                        name="times"
+                        aria-label="Clear selection"
+                        onClick={(e) => {
+                          e.preventDefault();
+                          e.stopPropagation();
+                          this.setState({ rcValue: [], activeLabel: '', inputValue: '' });
+                          this.props.onSelect('');
+                        }}
+                      />
+                    )}
+                    <Icon name={focusCascade ? 'angle-up' : 'angle-down'} />
+                  </Stack>
                 }
+                disabled={disabled}
+                id={id}
               />
             </div>
           </RCCascader>
diff --git a/packages/grafana-ui/src/components/ColorPicker/ColorPicker.tsx b/packages/grafana-ui/src/components/ColorPicker/ColorPicker.tsx
index 65912a39d6a26..57fc7cfe6ce56 100644
--- a/packages/grafana-ui/src/components/ColorPicker/ColorPicker.tsx
+++ b/packages/grafana-ui/src/components/ColorPicker/ColorPicker.tsx
@@ -92,23 +92,6 @@ const getStyles = stylesFactory((theme: GrafanaTheme2) => {
       color: theme.colors.text.primary,
       maxWidth: '400px',
       fontSize: theme.typography.size.sm,
-      // !important because these styles are also provided to popper via .popper classes from Tooltip component
-      // hope to get rid of those soon
-      padding: '15px !important',
-      '& [data-placement^="top"]': {
-        paddingLeft: '0 !important',
-        paddingRight: '0 !important',
-      },
-      '& [data-placement^="bottom"]': {
-        paddingLeft: '0 !important',
-        paddingRight: '0 !important',
-      },
-      '& [data-placement^="left"]': {
-        paddingTop: '0 !important',
-      },
-      '& [data-placement^="right"]': {
-        paddingTop: '0 !important',
-      },
     }),
   };
 });
diff --git a/packages/grafana-ui/src/components/ConfirmButton/ConfirmButton.tsx b/packages/grafana-ui/src/components/ConfirmButton/ConfirmButton.tsx
index e12ed64745501..850da68b49e4b 100644
--- a/packages/grafana-ui/src/components/ConfirmButton/ConfirmButton.tsx
+++ b/packages/grafana-ui/src/components/ConfirmButton/ConfirmButton.tsx
@@ -1,14 +1,13 @@
 import { cx, css } from '@emotion/css';
-import React, { PureComponent, ReactElement } from 'react';
+import React, { ReactElement, useEffect, useRef, useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
-import { stylesFactory, withTheme2 } from '../../themes';
-import { Themeable2 } from '../../types';
+import { useStyles2 } from '../../themes';
 import { ComponentSize } from '../../types/size';
 import { Button, ButtonVariant } from '../Button';
 
-export interface Props extends Themeable2 {
+export interface Props {
   /** Confirm action callback */
   onConfirm(): void;
   children: string | ReactElement;
@@ -24,182 +23,161 @@ export interface Props extends Themeable2 {
   confirmVariant?: ButtonVariant;
   /** Hide confirm actions when after of them is clicked */
   closeOnConfirm?: boolean;
-  /** Move focus to button when mounted */
-  autoFocus?: boolean;
-
   /** Optional on click handler for the original button */
   onClick?(): void;
   /** Callback for the cancel action */
   onCancel?(): void;
 }
 
-interface State {
-  showConfirm: boolean;
-}
-
-class UnThemedConfirmButton extends PureComponent<Props, State> {
-  mainButtonRef = React.createRef<HTMLButtonElement>();
-  confirmButtonRef = React.createRef<HTMLButtonElement>();
-  state: State = {
-    showConfirm: false,
-  };
+export const ConfirmButton = ({
+  children,
+  className,
+  closeOnConfirm,
+  confirmText = 'Save',
+  confirmVariant = 'primary',
+  disabled = false,
+  onCancel,
+  onClick,
+  onConfirm,
+  size = 'md',
+}: Props) => {
+  const mainButtonRef = useRef<HTMLButtonElement>(null);
+  const confirmButtonRef = useRef<HTMLButtonElement>(null);
+  const [showConfirm, setShowConfirm] = useState(false);
+  const [shouldRestoreFocus, setShouldRestoreFocus] = useState(false);
+  const styles = useStyles2(getStyles);
+
+  useEffect(() => {
+    if (showConfirm) {
+      confirmButtonRef.current?.focus();
+      setShouldRestoreFocus(true);
+    } else {
+      if (shouldRestoreFocus) {
+        mainButtonRef.current?.focus();
+        setShouldRestoreFocus(false);
+      }
+    }
+  }, [shouldRestoreFocus, showConfirm]);
 
-  onClickButton = (event: React.MouseEvent<HTMLButtonElement>) => {
+  const onClickButton = (event: React.MouseEvent<HTMLButtonElement>) => {
     if (event) {
       event.preventDefault();
     }
 
-    this.setState(
-      {
-        showConfirm: true,
-      },
-      () => {
-        if (this.props.autoFocus && this.confirmButtonRef.current) {
-          this.confirmButtonRef.current.focus();
-        }
-      }
-    );
-
-    if (this.props.onClick) {
-      this.props.onClick();
-    }
+    setShowConfirm(true);
+    onClick?.();
   };
 
-  onClickCancel = (event: React.MouseEvent<HTMLButtonElement>) => {
+  const onClickCancel = (event: React.MouseEvent<HTMLButtonElement>) => {
     if (event) {
       event.preventDefault();
     }
-    this.setState(
-      {
-        showConfirm: false,
-      },
-      () => {
-        this.mainButtonRef.current?.focus();
-      }
-    );
-    if (this.props.onCancel) {
-      this.props.onCancel();
-    }
+    setShowConfirm(false);
+    mainButtonRef.current?.focus();
+    onCancel?.();
   };
-  onConfirm = (event: React.MouseEvent<HTMLButtonElement>) => {
+
+  const onClickConfirm = (event: React.MouseEvent<HTMLButtonElement>) => {
     if (event) {
       event.preventDefault();
     }
-    this.props.onConfirm();
-    if (this.props.closeOnConfirm) {
-      this.setState({
-        showConfirm: false,
-      });
+    onConfirm?.();
+    if (closeOnConfirm) {
+      setShowConfirm(false);
     }
   };
 
-  render() {
-    const {
-      theme,
-      className,
-      size,
-      disabled,
-      confirmText,
-      confirmVariant: confirmButtonVariant,
-      children,
-    } = this.props;
-    const styles = getStyles(theme);
-    const buttonClass = cx(
-      className,
-      this.state.showConfirm ? styles.buttonHide : styles.buttonShow,
-      disabled && styles.buttonDisabled
-    );
-    const confirmButtonClass = cx(
-      styles.confirmButton,
-      this.state.showConfirm ? styles.confirmButtonShow : styles.confirmButtonHide
-    );
-
-    const onClick = disabled ? () => {} : this.onClickButton;
-
-    return (
-      <span className={styles.buttonContainer}>
-        <div className={cx(disabled && styles.disabled)}>
-          <span className={buttonClass}>
-            {typeof children === 'string' ? (
-              <Button size={size} fill="text" onClick={onClick} ref={this.mainButtonRef}>
-                {children}
-              </Button>
-            ) : (
-              React.cloneElement(children, { onClick, ref: this.mainButtonRef })
-            )}
-          </span>
-        </div>
+  const buttonClass = cx(className, styles.mainButton, {
+    [styles.mainButtonHide]: showConfirm,
+  });
+  const confirmButtonClass = cx(styles.confirmButton, {
+    [styles.confirmButtonHide]: !showConfirm,
+  });
+  const confirmButtonContainerClass = cx(styles.confirmButtonContainer, {
+    [styles.confirmButtonContainerHide]: !showConfirm,
+  });
+
+  return (
+    <div className={styles.container}>
+      <span className={buttonClass}>
+        {typeof children === 'string' ? (
+          <Button disabled={disabled} size={size} fill="text" onClick={onClickButton} ref={mainButtonRef}>
+            {children}
+          </Button>
+        ) : (
+          React.cloneElement(children, { disabled, onClick: onClickButton, ref: mainButtonRef })
+        )}
+      </span>
+      <div className={confirmButtonContainerClass}>
         <span className={confirmButtonClass}>
-          <Button size={size} variant={confirmButtonVariant} onClick={this.onConfirm} ref={this.confirmButtonRef}>
+          <Button size={size} variant={confirmVariant} onClick={onClickConfirm} ref={confirmButtonRef}>
             {confirmText}
           </Button>
-          <Button size={size} fill="text" onClick={this.onClickCancel}>
+          <Button size={size} fill="text" onClick={onClickCancel}>
             Cancel
           </Button>
         </span>
-      </span>
-    );
-  }
-}
-
-export const ConfirmButton = withTheme2(UnThemedConfirmButton);
+      </div>
+    </div>
+  );
+};
+ConfirmButton.displayName = 'ConfirmButton';
 
-const getStyles = stylesFactory((theme: GrafanaTheme2) => {
+const getStyles = (theme: GrafanaTheme2) => {
   return {
-    buttonContainer: css({
-      display: 'flex',
+    container: css({
       alignItems: 'center',
+      display: 'flex',
       justifyContent: 'flex-end',
+      position: 'relative',
     }),
-    buttonDisabled: css({
-      textDecoration: 'none',
-      color: theme.colors.text.primary,
-      opacity: 0.65,
-      pointerEvents: 'none',
-    }),
-    buttonShow: css({
+    mainButton: css({
       opacity: 1,
-      transition: 'opacity 0.1s ease',
+      transition: theme.transitions.create(['opacity'], {
+        duration: theme.transitions.duration.shortest,
+        easing: theme.transitions.easing.easeOut,
+      }),
       zIndex: 2,
     }),
-    buttonHide: css({
+    mainButtonHide: css({
       opacity: 0,
-      transition: 'opacity 0.1s ease, visibility 0 0.1s',
+      transition: theme.transitions.create(['opacity', 'visibility'], {
+        duration: theme.transitions.duration.shortest,
+        easing: theme.transitions.easing.easeIn,
+      }),
       visibility: 'hidden',
       zIndex: 0,
     }),
+    confirmButtonContainer: css({
+      overflow: 'visible',
+      position: 'absolute',
+      pointerEvents: 'all',
+      right: 0,
+    }),
+    confirmButtonContainerHide: css({
+      overflow: 'hidden',
+      pointerEvents: 'none',
+    }),
     confirmButton: css({
       alignItems: 'flex-start',
       background: theme.colors.background.primary,
       display: 'flex',
-      position: 'absolute',
-      pointerEvents: 'none',
-    }),
-    confirmButtonShow: css({
-      zIndex: 1,
       opacity: 1,
-      transition: 'opacity 0.08s ease-out, transform 0.1s ease-out',
       transform: 'translateX(0)',
-      pointerEvents: 'all',
+      transition: theme.transitions.create(['opacity', 'transform'], {
+        duration: theme.transitions.duration.shortest,
+        easing: theme.transitions.easing.easeOut,
+      }),
+      zIndex: 1,
     }),
     confirmButtonHide: css({
       opacity: 0,
+      transform: 'translateX(100%)',
+      transition: theme.transitions.create(['opacity', 'transform', 'visibility'], {
+        duration: theme.transitions.duration.shortest,
+        easing: theme.transitions.easing.easeIn,
+      }),
       visibility: 'hidden',
-      transition: 'opacity 0.12s ease-in, transform 0.14s ease-in, visibility 0s 0.12s',
-      transform: 'translateX(100px)',
-    }),
-    disabled: css({
-      cursor: 'not-allowed',
     }),
   };
-});
-
-// Declare defaultProps directly on the themed component so they are displayed
-// in the props table
-ConfirmButton.defaultProps = {
-  size: 'md',
-  confirmText: 'Save',
-  disabled: false,
-  confirmVariant: 'primary',
 };
-ConfirmButton.displayName = 'ConfirmButton';
diff --git a/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.test.tsx b/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.test.tsx
index 1bcdc6a4a81d7..0ffeb63acd189 100644
--- a/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.test.tsx
+++ b/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.test.tsx
@@ -105,6 +105,32 @@ describe('ConfirmModal', () => {
     expect(mockOnConfirm).toHaveBeenCalled();
   });
 
+  it('typing the confirmation text and pressing enter should trigger the primary action', async () => {
+    render(
+      <ConfirmModal
+        title="Some Title"
+        body="Some Body"
+        confirmText="Please Confirm"
+        alternativeText="Alternative Text"
+        dismissText="Dismiss Text"
+        isOpen={true}
+        confirmationText="My confirmation text"
+        onConfirm={mockOnConfirm}
+        onDismiss={() => {}}
+        onAlternative={() => {}}
+      />
+    );
+
+    expect(screen.getByRole('button', { name: 'Please Confirm' })).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'Please Confirm' })).toBeDisabled();
+
+    await user.type(screen.getByPlaceholderText('Type "My confirmation text" to confirm'), 'mY CoNfIrMaTiOn TeXt');
+    expect(screen.getByRole('button', { name: 'Please Confirm' })).toBeEnabled();
+
+    await user.type(screen.getByPlaceholderText('Type "My confirmation text" to confirm'), '{enter}');
+    expect(mockOnConfirm).toHaveBeenCalled();
+  });
+
   it('returning a promise in the onConfirm callback disables the button whilst the callback is in progress', async () => {
     mockOnConfirm.mockImplementation(() => {
       return new Promise((resolve) => {
@@ -136,7 +162,9 @@ describe('ConfirmModal', () => {
 
     await user.click(screen.getByRole('button', { name: 'Please Confirm' }));
     expect(mockOnConfirm).toHaveBeenCalled();
-    expect(screen.getByRole('button', { name: 'Please Confirm' })).toBeDisabled();
+    await waitFor(() => {
+      expect(screen.getByRole('button', { name: 'Please Confirm' })).toBeDisabled();
+    });
 
     jest.runAllTimers();
     await waitFor(() => {
diff --git a/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx b/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx
index 52cccc03221c9..80c9b2f41c81a 100644
--- a/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx
+++ b/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx
@@ -1,5 +1,6 @@
 import { css, cx } from '@emotion/css';
 import React, { useEffect, useRef, useState } from 'react';
+import { useForm } from 'react-hook-form';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
@@ -8,7 +9,8 @@ import { useStyles2 } from '../../themes';
 import { IconName } from '../../types/icon';
 import { Button, ButtonVariant } from '../Button';
 import { Input } from '../Input/Input';
-import { HorizontalGroup } from '../Layout/Layout';
+import { Box } from '../Layout/Box/Box';
+import { Stack } from '../Layout/Stack/Stack';
 import { Modal } from '../Modal/Modal';
 
 export interface ConfirmModalProps {
@@ -95,38 +97,44 @@ export const ConfirmModal = ({
     }
   };
 
+  const { handleSubmit } = useForm();
+
   return (
     <Modal className={cx(styles.modal, modalClass)} title={title} icon={icon} isOpen={isOpen} onDismiss={onDismiss}>
-      <div className={styles.modalText}>
-        {body}
-        {description ? <div className={styles.modalDescription}>{description}</div> : null}
-        {confirmationText ? (
-          <div className={styles.modalConfirmationInput}>
-            <HorizontalGroup>
-              <Input placeholder={`Type "${confirmationText}" to confirm`} onChange={onConfirmationTextChange} />
-            </HorizontalGroup>
-          </div>
-        ) : null}
-      </div>
-      <Modal.ButtonRow>
-        <Button variant={dismissVariant} onClick={onDismiss} fill="outline">
-          {dismissText}
-        </Button>
-        <Button
-          variant={confirmButtonVariant}
-          onClick={onConfirmClick}
-          disabled={disabled}
-          ref={buttonRef}
-          data-testid={selectors.pages.ConfirmModal.delete}
-        >
-          {confirmText}
-        </Button>
-        {onAlternative ? (
-          <Button variant="primary" onClick={onAlternative}>
-            {alternativeText}
+      <form onSubmit={handleSubmit(onConfirmClick)}>
+        <div className={styles.modalText}>
+          {body}
+          {description ? <div className={styles.modalDescription}>{description}</div> : null}
+          {confirmationText ? (
+            <div className={styles.modalConfirmationInput}>
+              <Stack alignItems="flex-start">
+                <Box>
+                  <Input placeholder={`Type "${confirmationText}" to confirm`} onChange={onConfirmationTextChange} />
+                </Box>
+              </Stack>
+            </div>
+          ) : null}
+        </div>
+        <Modal.ButtonRow>
+          <Button variant={dismissVariant} onClick={onDismiss} fill="outline">
+            {dismissText}
+          </Button>
+          <Button
+            type="submit"
+            variant={confirmButtonVariant}
+            disabled={disabled}
+            ref={buttonRef}
+            data-testid={selectors.pages.ConfirmModal.delete}
+          >
+            {confirmText}
           </Button>
-        ) : null}
-      </Modal.ButtonRow>
+          {onAlternative ? (
+            <Button variant="primary" onClick={onAlternative}>
+              {alternativeText}
+            </Button>
+          ) : null}
+        </Modal.ButtonRow>
+      </form>
     </Modal>
   );
 };
diff --git a/packages/grafana-ui/src/components/ContextMenu/ContextMenu.tsx b/packages/grafana-ui/src/components/ContextMenu/ContextMenu.tsx
index 9a9fe8ff3aba3..a6a90a6ed35ac 100644
--- a/packages/grafana-ui/src/components/ContextMenu/ContextMenu.tsx
+++ b/packages/grafana-ui/src/components/ContextMenu/ContextMenu.tsx
@@ -39,7 +39,7 @@ export const ContextMenu = React.memo(
         setPositionStyles({
           position: 'fixed',
           left: collisions.right ? x - rect.width - OFFSET : x - OFFSET,
-          top: collisions.bottom ? y - rect.height - OFFSET : y + OFFSET,
+          top: Math.max(0, collisions.bottom ? y - rect.height - OFFSET : y + OFFSET),
         });
       }
     }, [x, y]);
diff --git a/packages/grafana-ui/src/components/CustomScrollbar/ScrollIndicators.tsx b/packages/grafana-ui/src/components/CustomScrollbar/ScrollIndicators.tsx
index eed018c364821..b22711457ffca 100644
--- a/packages/grafana-ui/src/components/CustomScrollbar/ScrollIndicators.tsx
+++ b/packages/grafana-ui/src/components/CustomScrollbar/ScrollIndicators.tsx
@@ -1,11 +1,9 @@
 import { css, cx } from '@emotion/css';
-import classNames from 'classnames';
 import React, { useEffect, useRef, useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
 import { useStyles2 } from '../../themes';
-import { Icon } from '../Icon/Icon';
 
 export const ScrollIndicators = ({ children }: React.PropsWithChildren<{}>) => {
   const [showScrollTopIndicator, setShowTopScrollIndicator] = useState(false);
@@ -39,9 +37,7 @@ export const ScrollIndicators = ({ children }: React.PropsWithChildren<{}>) => {
         className={cx(styles.scrollIndicator, styles.scrollTopIndicator, {
           [styles.scrollIndicatorVisible]: showScrollTopIndicator,
         })}
-      >
-        <Icon className={classNames(styles.scrollIcon, styles.scrollTopIcon)} name="angle-up" />
-      </div>
+      />
       <div className={styles.scrollContent}>
         <div ref={scrollTopMarker} />
         {children}
@@ -51,9 +47,7 @@ export const ScrollIndicators = ({ children }: React.PropsWithChildren<{}>) => {
         className={cx(styles.scrollIndicator, styles.scrollBottomIndicator, {
           [styles.scrollIndicatorVisible]: showScrollBottomIndicator,
         })}
-      >
-        <Icon className={classNames(styles.scrollIcon, styles.scrollBottomIcon)} name="angle-down" />
-      </div>
+      />
     </>
   );
 };
@@ -85,16 +79,5 @@ const getStyles = (theme: GrafanaTheme2) => {
     scrollIndicatorVisible: css({
       opacity: 1,
     }),
-    scrollIcon: css({
-      left: '50%',
-      position: 'absolute',
-      transform: 'translateX(-50%)',
-    }),
-    scrollTopIcon: css({
-      top: 0,
-    }),
-    scrollBottomIcon: css({
-      bottom: 0,
-    }),
   };
 };
diff --git a/packages/grafana-ui/src/components/DataLinks/DataLinkInput.tsx b/packages/grafana-ui/src/components/DataLinks/DataLinkInput.tsx
index 55186d2352fdd..ecc981cf3a2f1 100644
--- a/packages/grafana-ui/src/components/DataLinks/DataLinkInput.tsx
+++ b/packages/grafana-ui/src/components/DataLinks/DataLinkInput.tsx
@@ -1,7 +1,7 @@
 import { css, cx } from '@emotion/css';
+import { autoUpdate, flip, offset, shift, useFloating } from '@floating-ui/react';
 import Prism, { Grammar, LanguageMap } from 'prismjs';
-import React, { memo, useEffect, useMemo, useRef, useState } from 'react';
-import { Popper as ReactPopper } from 'react-popper';
+import React, { memo, useEffect, useRef, useState } from 'react';
 import usePrevious from 'react-use/lib/usePrevious';
 import { Value } from 'slate';
 import Plain from 'slate-plain-serializer';
@@ -86,6 +86,29 @@ export const DataLinkInput = memo(
     const prevLinkUrl = usePrevious<Value>(linkUrl);
     const [scrollTop, setScrollTop] = useState(0);
 
+    // the order of middleware is important!
+    const middleware = [
+      offset(({ rects }) => ({
+        alignmentAxis: rects.reference.width,
+      })),
+      flip({
+        fallbackAxisSideDirection: 'start',
+        // see https://floating-ui.com/docs/flip#combining-with-shift
+        crossAxis: false,
+        boundary: document.body,
+      }),
+      shift(),
+    ];
+
+    const { refs, floatingStyles } = useFloating({
+      open: showingSuggestions,
+      placement: 'bottom-start',
+      onOpenChange: setShowingSuggestions,
+      middleware,
+      whileElementsMounted: autoUpdate,
+      strategy: 'fixed',
+    });
+
     // Workaround for https://github.com/ianstormtaylor/slate/issues/2927
     const stateRef = useRef({ showingSuggestions, suggestions, suggestionsIndex, linkUrl, onChange });
     stateRef.current = { showingSuggestions, suggestions, suggestionsIndex, linkUrl, onChange };
@@ -96,12 +119,11 @@ export const DataLinkInput = memo(
       setScrollTop(getElementPosition(activeRef.current, suggestionsIndex));
     }, [suggestionsIndex]);
 
-    // SelectionReference is used to position the variables suggestion relatively to current DOM selection
-    const selectionRef = useMemo(() => new SelectionReference(), []);
-
     const onKeyDown = React.useCallback((event: React.KeyboardEvent, next: () => void) => {
       if (!stateRef.current.showingSuggestions) {
         if (event.key === '=' || event.key === '$' || (event.keyCode === 32 && event.ctrlKey)) {
+          const selectionRef = new SelectionReference();
+          refs.setReference(selectionRef);
           return setShowingSuggestions(true);
         }
         return next();
@@ -181,49 +203,21 @@ export const DataLinkInput = memo(
           <div id="data-link-input" className="slate-query-field">
             {showingSuggestions && (
               <Portal>
-                <ReactPopper
-                  referenceElement={selectionRef}
-                  placement="bottom-end"
-                  modifiers={[
-                    {
-                      name: 'preventOverflow',
-                      enabled: true,
-                      options: {
-                        rootBoundary: 'viewport',
-                      },
-                    },
-                    {
-                      name: 'arrow',
-                      enabled: false,
-                    },
-                    {
-                      name: 'offset',
-                      options: {
-                        offset: [250, 0],
-                      },
-                    },
-                  ]}
-                >
-                  {({ ref, style, placement }) => {
-                    return (
-                      <div ref={ref} style={style} data-placement={placement} className={styles.suggestionsWrapper}>
-                        <CustomScrollbar
-                          scrollTop={scrollTop}
-                          autoHeightMax="300px"
-                          setScrollTop={({ scrollTop }) => setScrollTop(scrollTop)}
-                        >
-                          <DataLinkSuggestions
-                            activeRef={activeRef}
-                            suggestions={stateRef.current.suggestions}
-                            onSuggestionSelect={onVariableSelect}
-                            onClose={() => setShowingSuggestions(false)}
-                            activeIndex={suggestionsIndex}
-                          />
-                        </CustomScrollbar>
-                      </div>
-                    );
-                  }}
-                </ReactPopper>
+                <div ref={refs.setFloating} style={floatingStyles}>
+                  <CustomScrollbar
+                    scrollTop={scrollTop}
+                    autoHeightMax="300px"
+                    setScrollTop={({ scrollTop }) => setScrollTop(scrollTop)}
+                  >
+                    <DataLinkSuggestions
+                      activeRef={activeRef}
+                      suggestions={stateRef.current.suggestions}
+                      onSuggestionSelect={onVariableSelect}
+                      onClose={() => setShowingSuggestions(false)}
+                      activeIndex={suggestionsIndex}
+                    />
+                  </CustomScrollbar>
+                </div>
               </Portal>
             )}
             <Editor
diff --git a/packages/grafana-ui/src/components/DataLinks/DataLinksContextMenu.test.tsx b/packages/grafana-ui/src/components/DataLinks/DataLinksContextMenu.test.tsx
index e64e04606185e..34c826a03f9ec 100644
--- a/packages/grafana-ui/src/components/DataLinks/DataLinksContextMenu.test.tsx
+++ b/packages/grafana-ui/src/components/DataLinks/DataLinksContextMenu.test.tsx
@@ -54,6 +54,6 @@ describe('DataLinksContextMenu', () => {
     );
 
     expect(screen.getByLabelText(fakeAriaLabel)).toBeInTheDocument();
-    expect(screen.getByLabelText(selectors.components.DataLinksContextMenu.singleLink)).toBeInTheDocument();
+    expect(screen.getByTestId(selectors.components.DataLinksContextMenu.singleLink)).toBeInTheDocument();
   });
 });
diff --git a/packages/grafana-ui/src/components/DataLinks/DataLinksContextMenu.tsx b/packages/grafana-ui/src/components/DataLinks/DataLinksContextMenu.tsx
index 56c17d7e59a36..64e11a28288da 100644
--- a/packages/grafana-ui/src/components/DataLinks/DataLinksContextMenu.tsx
+++ b/packages/grafana-ui/src/components/DataLinks/DataLinksContextMenu.tsx
@@ -24,11 +24,11 @@ export const DataLinksContextMenu = ({ children, links, style }: DataLinksContex
   const itemsGroup: MenuItemsGroup[] = [{ items: linkModelToContextMenuItems(links), label: 'Data links' }];
   const linksCounter = itemsGroup[0].items.length;
   const renderMenuGroupItems = () => {
-    return itemsGroup.map((group, index) => (
-      <MenuGroup key={`${group.label}${index}`} label={group.label}>
-        {(group.items || []).map((item) => (
+    return itemsGroup.map((group, groupIdx) => (
+      <MenuGroup key={`${group.label}${groupIdx}`} label={group.label}>
+        {(group.items || []).map((item, itemIdx) => (
           <MenuItem
-            key={item.label}
+            key={`${group.label}-${groupIdx}-${itemIdx}}`}
             url={item.url}
             label={item.label}
             target={item.target}
@@ -63,7 +63,7 @@ export const DataLinksContextMenu = ({ children, links, style }: DataLinksContex
         target={linkModel.target}
         title={linkModel.title}
         style={{ ...style, overflow: 'hidden', display: 'flex' }}
-        aria-label={selectors.components.DataLinksContextMenu.singleLink}
+        data-testid={selectors.components.DataLinksContextMenu.singleLink}
       >
         {children({})}
       </a>
diff --git a/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksInlineEditor.tsx b/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksInlineEditor.tsx
index ca69016f404e6..99914a5a4c30e 100644
--- a/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksInlineEditor.tsx
+++ b/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksInlineEditor.tsx
@@ -4,7 +4,7 @@ import React, { useState } from 'react';
 
 import { DataFrame, DataLink, GrafanaTheme2, VariableSuggestion } from '@grafana/data';
 
-import { stylesFactory, useTheme2 } from '../../../themes';
+import { useStyles2 } from '../../../themes';
 import { Button } from '../../Button/Button';
 import { Modal } from '../../Modal/Modal';
 
@@ -19,11 +19,10 @@ interface DataLinksInlineEditorProps {
 }
 
 export const DataLinksInlineEditor = ({ links, onChange, getSuggestions, data }: DataLinksInlineEditorProps) => {
-  const theme = useTheme2();
   const [editIndex, setEditIndex] = useState<number | null>(null);
   const [isNew, setIsNew] = useState(false);
 
-  const styles = getDataLinksInlineEditorStyles(theme);
+  const styles = useStyles2(getDataLinksInlineEditorStyles);
   const linksSafe: DataLink[] = links ?? [];
   const isEditing = editIndex !== null;
 
@@ -110,10 +109,8 @@ export const DataLinksInlineEditor = ({ links, onChange, getSuggestions, data }:
   );
 };
 
-const getDataLinksInlineEditorStyles = stylesFactory((theme: GrafanaTheme2) => {
-  return {
-    wrapper: css({
-      marginBottom: theme.spacing(2),
-    }),
-  };
+const getDataLinksInlineEditorStyles = (theme: GrafanaTheme2) => ({
+  wrapper: css({
+    marginBottom: theme.spacing(2),
+  }),
 });
diff --git a/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksListItem.tsx b/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksListItem.tsx
index 86044da878258..97a23834fe7e2 100644
--- a/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksListItem.tsx
+++ b/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksListItem.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 
 import { DataFrame, DataLink, GrafanaTheme2 } from '@grafana/data';
 
-import { stylesFactory, useTheme2 } from '../../../themes';
+import { useStyles2 } from '../../../themes';
 import { isCompactUrl } from '../../../utils/dataLinks';
 import { FieldValidationMessage } from '../../Forms/FieldValidationMessage';
 import { IconButton } from '../../IconButton/IconButton';
@@ -19,8 +19,7 @@ export interface DataLinksListItemProps {
 }
 
 export const DataLinksListItem = ({ link, onEdit, onRemove }: DataLinksListItemProps) => {
-  const theme = useTheme2();
-  const styles = getDataLinkListItemStyles(theme);
+  const styles = useStyles2(getDataLinkListItemStyles);
   const { title = '', url = '' } = link;
 
   const hasTitle = title.trim() !== '';
@@ -52,7 +51,7 @@ export const DataLinksListItem = ({ link, onEdit, onRemove }: DataLinksListItemP
   );
 };
 
-const getDataLinkListItemStyles = stylesFactory((theme: GrafanaTheme2) => {
+const getDataLinkListItemStyles = (theme: GrafanaTheme2) => {
   return {
     wrapper: css({
       marginBottom: theme.spacing(2),
@@ -95,4 +94,4 @@ const getDataLinkListItemStyles = stylesFactory((theme: GrafanaTheme2) => {
       maxWidth: '90%',
     }),
   };
-});
+};
diff --git a/packages/grafana-ui/src/components/DataSourceSettings/CustomHeadersSettings.tsx b/packages/grafana-ui/src/components/DataSourceSettings/CustomHeadersSettings.tsx
index 8802e32193905..0751890d5a0c6 100644
--- a/packages/grafana-ui/src/components/DataSourceSettings/CustomHeadersSettings.tsx
+++ b/packages/grafana-ui/src/components/DataSourceSettings/CustomHeadersSettings.tsx
@@ -4,7 +4,7 @@ import React, { PureComponent } from 'react';
 
 import { DataSourceSettings } from '@grafana/data';
 
-import { stylesFactory } from '../../themes';
+import { useStyles2 } from '../../themes';
 import { Button } from '../Button';
 import { FormField } from '../FormField/FormField';
 import { Icon } from '../Icon/Icon';
@@ -36,26 +36,25 @@ interface CustomHeaderRowProps {
   onBlur: () => void;
 }
 
-const getCustomHeaderRowStyles = stylesFactory(() => {
-  return {
-    layout: css({
-      display: 'flex',
-      alignItems: 'center',
-      marginBottom: '4px',
-      '> *': {
-        marginLeft: '4px',
-        marginBottom: 0,
-        height: '100%',
-        '&:first-child, &:last-child': {
-          marginLeft: 0,
-        },
+const getCustomHeaderRowStyles = () => ({
+  layout: css({
+    display: 'flex',
+    alignItems: 'center',
+    marginBottom: '4px',
+    '> *': {
+      marginLeft: '4px',
+      marginBottom: 0,
+      height: '100%',
+      '&:first-child, &:last-child': {
+        marginLeft: 0,
       },
-    }),
-  };
+    },
+  }),
 });
 
 const CustomHeaderRow = ({ header, onBlur, onChange, onRemove, onReset }: CustomHeaderRowProps) => {
-  const styles = getCustomHeaderRowStyles();
+  const styles = useStyles2(getCustomHeaderRowStyles);
+
   return (
     <div className={styles.layout}>
       <FormField
diff --git a/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx b/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx
index 2f5d295ef2ccb..998c614738ea9 100644
--- a/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx
+++ b/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx
@@ -1,5 +1,5 @@
 import { css, cx } from '@emotion/css';
-import React, { useState, useCallback } from 'react';
+import React, { useState, useCallback, useId } from 'react';
 
 import { SelectableValue } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
@@ -153,12 +153,15 @@ export const DataSourceHttpSettings = (props: HttpSettingsProps) => {
 
   const inputStyle = cx({ [`width-20`]: true, [notValidStyle]: !isValidUrl });
 
+  const fromFieldId = useId();
+
   const urlInput = (
     <Input
+      id={fromFieldId}
       className={inputStyle}
       placeholder={defaultUrl}
       value={dataSourceConfig.url}
-      aria-label={selectors.components.DataSource.DataSourceHttpSettings.urlInput}
+      data-testid={selectors.components.DataSource.DataSourceHttpSettings.urlInput}
       onChange={(event) => onSettingsChange({ url: event.currentTarget.value })}
       disabled={dataSourceConfig.readOnly}
     />
diff --git a/packages/grafana-ui/src/components/DateTimePickers/DatePicker/DatePicker.tsx b/packages/grafana-ui/src/components/DateTimePickers/DatePicker/DatePicker.tsx
index c2a7d8f64578c..358d985a169fb 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/DatePicker/DatePicker.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/DatePicker/DatePicker.tsx
@@ -67,7 +67,6 @@ export const getStyles = (theme: GrafanaTheme2) => {
   return {
     modal: css({
       zIndex: theme.zIndex.modal,
-      position: 'absolute',
       boxShadow: theme.shadows.z3,
       backgroundColor: theme.colors.background.primary,
       border: `1px solid ${theme.colors.border.weak}`,
diff --git a/packages/grafana-ui/src/components/DateTimePickers/DatePickerWithInput/DatePickerWithInput.tsx b/packages/grafana-ui/src/components/DateTimePickers/DatePickerWithInput/DatePickerWithInput.tsx
index 581d6b72e9679..515160fceed96 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/DatePickerWithInput/DatePickerWithInput.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/DatePickerWithInput/DatePickerWithInput.tsx
@@ -1,7 +1,8 @@
 import { css } from '@emotion/css';
-import React, { ChangeEvent } from 'react';
+import { autoUpdate, flip, shift, useClick, useDismiss, useFloating, useInteractions } from '@floating-ui/react';
+import React, { ChangeEvent, useState } from 'react';
 
-import { dateTime } from '@grafana/data';
+import { GrafanaTheme2, dateTime } from '@grafana/data';
 
 import { useStyles2 } from '../../../themes';
 import { Props as InputProps, Input } from '../../Input/Input';
@@ -35,17 +36,41 @@ export const DatePickerWithInput = ({
   placeholder = 'Date',
   ...rest
 }: DatePickerWithInputProps) => {
-  const [open, setOpen] = React.useState(false);
+  const [open, setOpen] = useState(false);
   const styles = useStyles2(getStyles);
 
+  // the order of middleware is important!
+  // see https://floating-ui.com/docs/arrow#order
+  const middleware = [
+    flip({
+      // see https://floating-ui.com/docs/flip#combining-with-shift
+      crossAxis: false,
+      boundary: document.body,
+    }),
+    shift(),
+  ];
+
+  const { context, refs, floatingStyles } = useFloating({
+    open,
+    placement: 'bottom-start',
+    onOpenChange: setOpen,
+    middleware,
+    whileElementsMounted: autoUpdate,
+    strategy: 'fixed',
+  });
+
+  const click = useClick(context);
+  const dismiss = useDismiss(context);
+  const { getReferenceProps, getFloatingProps } = useInteractions([dismiss, click]);
+
   return (
     <div className={styles.container}>
       <Input
+        ref={refs.setReference}
         type="text"
         autoComplete={'off'}
         placeholder={placeholder}
         value={value ? formatDate(value) : value}
-        onClick={() => setOpen(true)}
         onChange={(ev: ChangeEvent<HTMLInputElement>) => {
           // Allow resetting the date
           if (ev.target.value === '') {
@@ -54,25 +79,28 @@ export const DatePickerWithInput = ({
         }}
         className={styles.input}
         {...rest}
+        {...getReferenceProps()}
       />
-      <DatePicker
-        isOpen={open}
-        value={value && typeof value !== 'string' ? value : dateTime().toDate()}
-        minDate={minDate}
-        maxDate={maxDate}
-        onChange={(ev) => {
-          onChange(ev);
-          if (closeOnSelect) {
-            setOpen(false);
-          }
-        }}
-        onClose={() => setOpen(false)}
-      />
+      <div className={styles.popover} ref={refs.setFloating} style={floatingStyles} {...getFloatingProps()}>
+        <DatePicker
+          isOpen={open}
+          value={value && typeof value !== 'string' ? value : dateTime().toDate()}
+          minDate={minDate}
+          maxDate={maxDate}
+          onChange={(ev) => {
+            onChange(ev);
+            if (closeOnSelect) {
+              setOpen(false);
+            }
+          }}
+          onClose={() => setOpen(false)}
+        />
+      </div>
     </div>
   );
 };
 
-const getStyles = () => {
+const getStyles = (theme: GrafanaTheme2) => {
   return {
     container: css({
       position: 'relative',
@@ -84,5 +112,8 @@ const getStyles = () => {
         WebkitAppearance: 'none',
       },
     }),
+    popover: css({
+      zIndex: theme.zIndex.tooltip,
+    }),
   };
 };
diff --git a/packages/grafana-ui/src/components/DateTimePickers/DateTimePicker/DateTimePicker.test.tsx b/packages/grafana-ui/src/components/DateTimePickers/DateTimePicker/DateTimePicker.test.tsx
index 821ee4088a1e4..5258ee22ad07f 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/DateTimePicker/DateTimePicker.test.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/DateTimePicker/DateTimePicker.test.tsx
@@ -2,14 +2,23 @@ import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { dateTime } from '@grafana/data';
+import { dateTime, dateTimeAsMoment, dateTimeForTimeZone, getTimeZone, setTimeZoneResolver } from '@grafana/data';
+import { Components } from '@grafana/e2e-selectors';
 
 import { DateTimePicker, Props } from './DateTimePicker';
 
+// An assortment of timezones that we will test the behavior of the DateTimePicker with different timezones
+const TEST_TIMEZONES = ['browser', 'Europe/Stockholm', 'America/Indiana/Marengo'];
+
+const defaultTimeZone = getTimeZone();
+afterAll(() => {
+  return setTimeZoneResolver(() => defaultTimeZone);
+});
+
 const renderDatetimePicker = (props?: Props) => {
   const combinedProps = Object.assign(
     {
-      date: dateTime('2021-05-05 12:00:00'),
+      date: dateTimeForTimeZone(getTimeZone(), '2021-05-05 12:00:00'),
       onChange: () => {},
     },
     props
@@ -25,15 +34,25 @@ describe('Date time picker', () => {
     expect(screen.queryByTestId('date-time-picker')).toBeInTheDocument();
   });
 
-  it('input should have a value', () => {
+  it.each(TEST_TIMEZONES)('input should have a value (timezone: %s)', (timeZone) => {
+    setTimeZoneResolver(() => timeZone);
+    renderDatetimePicker();
+    const dateTimeInput = screen.getByTestId(Components.DateTimePicker.input);
+    expect(dateTimeInput).toHaveDisplayValue('2021-05-05 12:00:00');
+  });
+
+  it.each(TEST_TIMEZONES)('should render (timezone %s)', (timeZone) => {
+    setTimeZoneResolver(() => timeZone);
     renderDatetimePicker();
-    expect(screen.queryByDisplayValue('2021-05-05 12:00:00')).toBeInTheDocument();
+    const dateTimeInput = screen.getByTestId(Components.DateTimePicker.input);
+    expect(dateTimeInput).toHaveDisplayValue('2021-05-05 12:00:00');
   });
 
-  it('should update date onblur', async () => {
+  it.each(TEST_TIMEZONES)('should update date onblur (timezone: %)', async (timeZone) => {
+    setTimeZoneResolver(() => timeZone);
     const onChangeInput = jest.fn();
     render(<DateTimePicker date={dateTime('2021-05-05 12:00:00')} onChange={onChangeInput} />);
-    const dateTimeInput = screen.getByTestId('date-time-input');
+    const dateTimeInput = screen.getByTestId(Components.DateTimePicker.input);
     await userEvent.clear(dateTimeInput);
     await userEvent.type(dateTimeInput, '2021-07-31 12:30:30');
     expect(dateTimeInput).toHaveDisplayValue('2021-07-31 12:30:30');
@@ -41,10 +60,11 @@ describe('Date time picker', () => {
     expect(onChangeInput).toHaveBeenCalled();
   });
 
-  it('should not update onblur if invalid date', async () => {
+  it.each(TEST_TIMEZONES)('should not update onblur if invalid date (timezone: %s)', async (timeZone) => {
+    setTimeZoneResolver(() => timeZone);
     const onChangeInput = jest.fn();
     render(<DateTimePicker date={dateTime('2021-05-05 12:00:00')} onChange={onChangeInput} />);
-    const dateTimeInput = screen.getByTestId('date-time-input');
+    const dateTimeInput = screen.getByTestId(Components.DateTimePicker.input);
     await userEvent.clear(dateTimeInput);
     await userEvent.type(dateTimeInput, '2021:05:05 12-00-00');
     expect(dateTimeInput).toHaveDisplayValue('2021:05:05 12-00-00');
@@ -52,31 +72,167 @@ describe('Date time picker', () => {
     expect(onChangeInput).not.toHaveBeenCalled();
   });
 
-  it('should be able to select values in TimeOfDayPicker without blurring the element', async () => {
-    renderDatetimePicker();
+  it.each(TEST_TIMEZONES)(
+    'should not change the day at times near the day boundary (timezone: %s)',
+    async (timeZone) => {
+      setTimeZoneResolver(() => timeZone);
+      const onChangeInput = jest.fn();
+      render(<DateTimePicker date={dateTime('2021-05-05 12:34:56')} onChange={onChangeInput} />);
+
+      // Click the calendar button
+      await userEvent.click(screen.getByRole('button', { name: 'Time picker' }));
+
+      // Check the active day is the 5th
+      expect(screen.getByRole('button', { name: 'May 5, 2021' })).toHaveClass('react-calendar__tile--active');
+
+      // open the time of day overlay
+      await userEvent.click(screen.getAllByRole('textbox')[1]);
+
+      // change the hour
+      await userEvent.click(
+        screen.getAllByRole('button', {
+          name: '00',
+        })[0]
+      );
+
+      // Check the active day is the 5th
+      expect(screen.getByRole('button', { name: 'May 5, 2021' })).toHaveClass('react-calendar__tile--active');
 
-    // open the calendar + time picker
-    await userEvent.click(screen.getByLabelText('Time picker'));
+      // change the hour
+      await userEvent.click(
+        screen.getAllByRole('button', {
+          name: '23',
+        })[0]
+      );
 
-    // open the time of day overlay
-    await userEvent.click(screen.getAllByRole('textbox')[1]);
+      // Check the active day is the 5th
+      expect(screen.getByRole('button', { name: 'May 5, 2021' })).toHaveClass('react-calendar__tile--active');
+    }
+  );
+
+  it.each(TEST_TIMEZONES)(
+    'should not reset the time when selecting a different day (timezone: %s)',
+    async (timeZone) => {
+      setTimeZoneResolver(() => timeZone);
+      const onChangeInput = jest.fn();
+      render(<DateTimePicker date={dateTime('2021-05-05 12:34:56')} onChange={onChangeInput} />);
+
+      // Click the calendar button
+      await userEvent.click(screen.getByRole('button', { name: 'Time picker' }));
+
+      // Select a different day in the calendar
+      await userEvent.click(screen.getByRole('button', { name: 'May 15, 2021' }));
+
+      const timeInput = screen.getAllByRole('textbox')[1];
+      expect(timeInput).toHaveClass('rc-time-picker-input');
+      expect(timeInput).not.toHaveDisplayValue('00:00:00');
+    }
+  );
+
+  it.each(TEST_TIMEZONES)(
+    'should always show the correct matching day in the calendar (timezone: %s)',
+    async (timeZone) => {
+      setTimeZoneResolver(() => timeZone);
+      const onChangeInput = jest.fn();
+      render(<DateTimePicker date={dateTime('2021-05-05T23:59:41.000000Z')} onChange={onChangeInput} />);
+
+      const dateTimeInputValue = screen.getByTestId(Components.DateTimePicker.input).getAttribute('value')!;
+
+      // takes the string from the input
+      // depending on the timezone, this will look something like 2024-04-05 19:59:41
+      // parses out the day value and strips the leading 0
+      const day = parseInt(dateTimeInputValue.split(' ')[0].split('-')[2], 10);
+
+      // Click the calendar button
+      await userEvent.click(screen.getByRole('button', { name: 'Time picker' }));
+
+      // Check the active day matches the input
+      expect(screen.getByRole('button', { name: `May ${day}, 2021` })).toHaveClass('react-calendar__tile--active');
+    }
+  );
 
-    // check the hour element is visible
-    const hourElement = screen.getAllByRole('button', {
-      name: '00',
-    })[0];
-    expect(hourElement).toBeVisible();
+  it.each(TEST_TIMEZONES)(
+    'should always show the correct matching day when selecting a date in the calendar (timezone: %s)',
+    async (timeZone) => {
+      setTimeZoneResolver(() => timeZone);
+      const onChangeInput = jest.fn();
+      render(<DateTimePicker date={dateTime('2021-05-05T23:59:41.000000Z')} onChange={onChangeInput} />);
 
-    // select the hour value and check it's still visible
-    await userEvent.click(hourElement);
-    expect(hourElement).toBeVisible();
+      // Click the calendar button
+      await userEvent.click(screen.getByRole('button', { name: 'Time picker' }));
 
-    // click outside the overlay and check the hour element is no longer visible
+      // Select a new day
+      const day = 8;
+      await userEvent.click(screen.getByRole('button', { name: `May ${day}, 2021` }));
+      await userEvent.click(screen.getByRole('button', { name: 'Apply' }));
+
+      const onChangeInputArg = onChangeInput.mock.calls[0][0];
+
+      expect(dateTimeAsMoment(dateTimeForTimeZone(timeZone, onChangeInputArg)).date()).toBe(day);
+    }
+  );
+
+  it.each(TEST_TIMEZONES)('should not alter a UTC time when blurring (timezone: %s)', async (timeZone) => {
+    setTimeZoneResolver(() => timeZone);
+    const onChangeInput = jest.fn();
+
+    // render with a UTC value
+    const { rerender } = render(
+      <DateTimePicker date={dateTime('2024-04-16T08:44:41.000000Z')} onChange={onChangeInput} />
+    );
+
+    const inputValue = screen.getByTestId(Components.DateTimePicker.input).getAttribute('value')!;
+
+    // blur the input to trigger an onChange
+    await userEvent.click(screen.getByTestId(Components.DateTimePicker.input));
     await userEvent.click(document.body);
-    expect(
-      screen.queryByRole('button', {
-        name: '00',
-      })
-    ).not.toBeInTheDocument();
+
+    const onChangeValue = onChangeInput.mock.calls[0][0];
+    expect(onChangeInput).toHaveBeenCalledWith(onChangeValue);
+
+    // now rerender with the "changed" value
+    rerender(<DateTimePicker date={onChangeValue} onChange={onChangeInput} />);
+
+    // expect the input to show the same value
+    expect(screen.getByTestId(Components.DateTimePicker.input)).toHaveDisplayValue(inputValue);
+
+    // blur the input to trigger an onChange
+    await userEvent.click(screen.getByTestId(Components.DateTimePicker.input));
+    await userEvent.click(document.body);
+
+    // expect the onChange to be called with the same value
+    expect(onChangeInput).toHaveBeenCalledWith(onChangeValue);
   });
+
+  it.each(TEST_TIMEZONES)(
+    'should be able to select values in TimeOfDayPicker without blurring the element (timezone: %s)',
+    async (timeZone) => {
+      setTimeZoneResolver(() => timeZone);
+      renderDatetimePicker();
+
+      // open the calendar + time picker
+      await userEvent.click(screen.getByLabelText('Time picker'));
+
+      // open the time of day overlay
+      await userEvent.click(screen.getAllByRole('textbox')[1]);
+
+      // check the hour element is visible
+      const hourElement = screen.getAllByRole('button', {
+        name: '00',
+      })[0];
+      expect(hourElement).toBeVisible();
+
+      // select the hour value and check it's still visible
+      await userEvent.click(hourElement);
+      expect(hourElement).toBeVisible();
+
+      // click outside the overlay and check the hour element is no longer visible
+      await userEvent.click(document.body);
+      expect(
+        screen.queryByRole('button', {
+          name: '00',
+        })
+      ).not.toBeInTheDocument();
+    }
+  );
 });
diff --git a/packages/grafana-ui/src/components/DateTimePickers/DateTimePicker/DateTimePicker.tsx b/packages/grafana-ui/src/components/DateTimePickers/DateTimePicker/DateTimePicker.tsx
index c6d185672285e..569363bf45465 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/DateTimePicker/DateTimePicker.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/DateTimePicker/DateTimePicker.tsx
@@ -1,13 +1,22 @@
 import { css, cx } from '@emotion/css';
+import { autoUpdate, flip, shift, useFloating } from '@floating-ui/react';
 import { useDialog } from '@react-aria/dialog';
 import { FocusScope } from '@react-aria/focus';
 import { useOverlay } from '@react-aria/overlays';
 import React, { FormEvent, ReactNode, useCallback, useEffect, useRef, useState } from 'react';
 import Calendar from 'react-calendar';
-import { usePopper } from 'react-popper';
 import { useMedia } from 'react-use';
 
-import { dateTimeFormat, DateTime, dateTime, GrafanaTheme2, isDateTime } from '@grafana/data';
+import {
+  dateTimeFormat,
+  DateTime,
+  dateTime,
+  GrafanaTheme2,
+  isDateTime,
+  dateTimeForTimeZone,
+  getTimeZone,
+} from '@grafana/data';
+import { Components } from '@grafana/e2e-selectors';
 
 import { useStyles2, useTheme2 } from '../../../themes';
 import { Button } from '../../Button/Button';
@@ -20,6 +29,7 @@ import { Portal } from '../../Portal/Portal';
 import { TimeOfDayPicker, POPUP_CLASS_NAME } from '../TimeOfDayPicker';
 import { getBodyStyles } from '../TimeRangePicker/CalendarBody';
 import { isValid } from '../utils';
+import { adjustDateForReactCalendar } from '../utils/adjustDateForReactCalendar';
 
 export interface Props {
   /** Input date for the component */
@@ -71,15 +81,28 @@ export const DateTimePicker = ({
   const { dialogProps } = useDialog({}, ref);
 
   const theme = useTheme2();
-  const { modalBackdrop } = getModalStyles(theme);
+  const { modalBackdrop } = useStyles2(getModalStyles);
   const isFullscreen = useMedia(`(min-width: ${theme.breakpoints.values.lg}px)`);
   const styles = useStyles2(getStyles);
 
-  const [markerElement, setMarkerElement] = useState<HTMLInputElement | null>();
-  const [selectorElement, setSelectorElement] = useState<HTMLDivElement | null>();
+  // the order of middleware is important!
+  // see https://floating-ui.com/docs/arrow#order
+  const middleware = [
+    flip({
+      // see https://floating-ui.com/docs/flip#combining-with-shift
+      crossAxis: false,
+      boundary: document.body,
+    }),
+    shift(),
+  ];
 
-  const popper = usePopper(markerElement, selectorElement, {
+  const { refs, floatingStyles } = useFloating({
+    open: isOpen,
     placement: 'bottom-start',
+    onOpenChange: setOpen,
+    middleware,
+    whileElementsMounted: autoUpdate,
+    strategy: 'fixed',
   });
 
   const onApply = useCallback(
@@ -106,7 +129,7 @@ export const DateTimePicker = ({
         isFullscreen={isFullscreen}
         onOpen={onOpen}
         label={label}
-        ref={setMarkerElement}
+        ref={refs.setReference}
         showSeconds={showSeconds}
       />
       {isOpen ? (
@@ -121,8 +144,8 @@ export const DateTimePicker = ({
                   onClose={() => setOpen(false)}
                   maxDate={maxDate}
                   minDate={minDate}
-                  ref={setSelectorElement}
-                  style={popper.styles.popper}
+                  ref={refs.setFloating}
+                  style={floatingStyles}
                   showSeconds={showSeconds}
                   disabledHours={disabledHours}
                   disabledMinutes={disabledMinutes}
@@ -213,7 +236,7 @@ const DateTimeInput = React.forwardRef<HTMLInputElement, InputProps>(
 
     const onBlur = useCallback(() => {
       if (!internalDate.invalid) {
-        const date = dateTime(internalDate.value);
+        const date = dateTimeForTimeZone(getTimeZone(), internalDate.value);
         onChange(date);
       }
     }, [internalDate, onChange]);
@@ -232,7 +255,7 @@ const DateTimeInput = React.forwardRef<HTMLInputElement, InputProps>(
           addonAfter={icon}
           value={internalDate.value}
           onBlur={onBlur}
-          data-testid="date-time-input"
+          data-testid={Components.DateTimePicker.input}
           placeholder="Select date/time"
           ref={ref}
         />
@@ -262,9 +285,18 @@ const DateTimeCalendar = React.forwardRef<HTMLDivElement, DateTimeCalendarProps>
   ) => {
     const calendarStyles = useStyles2(getBodyStyles);
     const styles = useStyles2(getStyles);
-    const [internalDate, setInternalDate] = useState<Date>(() => {
+
+    // need to keep these 2 separate in state since react-calendar doesn't support different timezones
+    const [timeOfDayDateTime, setTimeOfDayDateTime] = useState(() => {
+      if (date && date.isValid()) {
+        return dateTimeForTimeZone(getTimeZone(), date);
+      }
+
+      return dateTimeForTimeZone(getTimeZone(), new Date());
+    });
+    const [reactCalendarDate, setReactCalendarDate] = useState<Date>(() => {
       if (date && date.isValid()) {
-        return date.toDate();
+        return adjustDateForReactCalendar(date.toDate(), getTimeZone());
       }
 
       return new Date();
@@ -272,28 +304,33 @@ const DateTimeCalendar = React.forwardRef<HTMLDivElement, DateTimeCalendarProps>
 
     const onChangeDate = useCallback<NonNullable<React.ComponentProps<typeof Calendar>['onChange']>>((date) => {
       if (date && !Array.isArray(date)) {
-        setInternalDate((prevState) => {
-          // If we don't use time from prevState
-          // the time will be reset to 00:00:00
-          date.setHours(prevState.getHours());
-          date.setMinutes(prevState.getMinutes());
-          date.setSeconds(prevState.getSeconds());
-
-          return date;
-        });
+        setReactCalendarDate(date);
       }
     }, []);
 
     const onChangeTime = useCallback((date: DateTime) => {
-      setInternalDate(date.toDate());
+      setTimeOfDayDateTime(date);
     }, []);
 
+    // here we need to stitch the 2 date objects back together
+    const handleApply = () => {
+      // we take the date that's set by TimeOfDayPicker
+      const newDate = dateTime(timeOfDayDateTime);
+
+      // and apply the date/month/year set by react-calendar
+      newDate.set('date', reactCalendarDate.getDate());
+      newDate.set('month', reactCalendarDate.getMonth());
+      newDate.set('year', reactCalendarDate.getFullYear());
+
+      onChange(newDate);
+    };
+
     return (
       <div className={cx(styles.container, { [styles.fullScreen]: isFullscreen })} style={style} ref={ref}>
         <Calendar
           next2Label={null}
           prev2Label={null}
-          value={internalDate}
+          value={reactCalendarDate}
           nextLabel={<Icon name="angle-right" />}
           nextAriaLabel="Next month"
           prevLabel={<Icon name="angle-left" />}
@@ -309,14 +346,14 @@ const DateTimeCalendar = React.forwardRef<HTMLDivElement, DateTimeCalendarProps>
           <TimeOfDayPicker
             showSeconds={showSeconds}
             onChange={onChangeTime}
-            value={dateTime(internalDate)}
+            value={timeOfDayDateTime}
             disabledHours={disabledHours}
             disabledMinutes={disabledMinutes}
             disabledSeconds={disabledSeconds}
           />
         </div>
         <HorizontalGroup>
-          <Button type="button" onClick={() => onChange(dateTime(internalDate))}>
+          <Button type="button" onClick={handleApply}>
             Apply
           </Button>
           <Button variant="secondary" type="button" onClick={onClose}>
diff --git a/packages/grafana-ui/src/components/DateTimePickers/RelativeTimeRangePicker/RelativeTimeRangePicker.tsx b/packages/grafana-ui/src/components/DateTimePickers/RelativeTimeRangePicker/RelativeTimeRangePicker.tsx
index ec797abbb770b..b7f5b76bda34c 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/RelativeTimeRangePicker/RelativeTimeRangePicker.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/RelativeTimeRangePicker/RelativeTimeRangePicker.tsx
@@ -1,9 +1,9 @@
 import { css, cx } from '@emotion/css';
+import { autoUpdate, flip, shift, useClick, useDismiss, useFloating, useInteractions } from '@floating-ui/react';
 import { useDialog } from '@react-aria/dialog';
 import { FocusScope } from '@react-aria/focus';
 import { useOverlay } from '@react-aria/overlays';
 import React, { FormEvent, useCallback, useRef, useState } from 'react';
-import { usePopper } from 'react-popper';
 
 import { RelativeTimeRange, GrafanaTheme2, TimeOption } from '@grafana/data';
 
@@ -59,12 +59,31 @@ export function RelativeTimeRangePicker(props: RelativeTimeRangePickerProps) {
   );
   const { dialogProps } = useDialog({}, ref);
 
-  const [markerElement, setMarkerElement] = useState<HTMLDivElement | null>(null);
-  const [selectorElement, setSelectorElement] = useState<HTMLDivElement | null>(null);
-  const popper = usePopper(markerElement, selectorElement, {
-    placement: 'auto-start',
+  // the order of middleware is important!
+  // see https://floating-ui.com/docs/arrow#order
+  const middleware = [
+    flip({
+      // see https://floating-ui.com/docs/flip#combining-with-shift
+      crossAxis: false,
+      boundary: document.body,
+    }),
+    shift(),
+  ];
+
+  const { context, refs, floatingStyles } = useFloating({
+    open: isOpen,
+    placement: 'bottom-start',
+    onOpenChange: setIsOpen,
+    middleware,
+    whileElementsMounted: autoUpdate,
+    strategy: 'fixed',
   });
 
+  const click = useClick(context);
+  const dismiss = useDismiss(context);
+
+  const { getReferenceProps, getFloatingProps } = useInteractions([dismiss, click]);
+
   const styles = useStyles2(getStyles(from.validation.errorMessage, to.validation.errorMessage));
 
   const onChangeTimeOption = (option: TimeOption) => {
@@ -109,8 +128,14 @@ export function RelativeTimeRangePicker(props: RelativeTimeRangePickerProps) {
   };
 
   return (
-    <div className={styles.container} ref={setMarkerElement}>
-      <button className={styles.pickerInput} type="button" onClick={onOpen}>
+    <div className={styles.container}>
+      <button
+        ref={refs.setReference}
+        className={styles.pickerInput}
+        type="button"
+        onClick={onOpen}
+        {...getReferenceProps()}
+      >
         <span className={styles.clockIcon}>
           <Icon name="clock-nine" />
         </span>
@@ -126,12 +151,7 @@ export function RelativeTimeRangePicker(props: RelativeTimeRangePickerProps) {
           <div role="presentation" className={styles.backdrop} {...underlayProps} />
           <FocusScope contain autoFocus restoreFocus>
             <div ref={ref} {...overlayProps} {...dialogProps}>
-              <div
-                className={styles.content}
-                ref={setSelectorElement}
-                style={popper.styles.popper}
-                {...popper.attributes}
-              >
+              <div className={styles.content} ref={refs.setFloating} style={floatingStyles} {...getFloatingProps()}>
                 <div className={styles.body}>
                   <CustomScrollbar className={styles.leftSide} hideHorizontalTrack>
                     <TimeRangeList
diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeOfDayPicker.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeOfDayPicker.tsx
index 7e0a4d848a8b5..13c5d69b68547 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeOfDayPicker.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeOfDayPicker.tsx
@@ -95,6 +95,7 @@ const getStyles = (theme: GrafanaTheme2) => {
       '.rc-time-picker-panel-select': {
         fontSize: '14px',
         backgroundColor: bgColor,
+        color: theme.colors.text.secondary,
         borderColor,
         li: {
           outlineWidth: '2px',
@@ -102,10 +103,12 @@ const getStyles = (theme: GrafanaTheme2) => {
             backgroundColor: 'inherit',
             border: `1px solid ${theme.v1.palette.orange}`,
             borderRadius,
+            color: theme.colors.text.primary,
           },
 
           '&:hover': {
             background: optionBgHover,
+            color: theme.colors.text.primary,
           },
 
           '&.rc-time-picker-panel-select-option-disabled': {
@@ -140,6 +143,7 @@ const getStyles = (theme: GrafanaTheme2) => {
         backgroundColor: bgColor,
         borderRadius,
         borderColor,
+        color: theme.colors.text.primary,
         height: theme.spacing(4),
 
         '&:focus': getFocusStyles(theme),
diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangeInput.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangeInput.tsx
index d0eb37aa84e17..03b48a4d7ffe2 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangeInput.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangeInput.tsx
@@ -4,8 +4,7 @@ import React, { FormEvent, MouseEvent, useState } from 'react';
 import { dateTime, getDefaultTimeRange, GrafanaTheme2, TimeRange, TimeZone } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 
-import { stylesFactory } from '../../themes';
-import { useTheme2 } from '../../themes/ThemeContext';
+import { useStyles2 } from '../../themes/ThemeContext';
 import { ClickOutsideWrapper } from '../ClickOutsideWrapper/ClickOutsideWrapper';
 import { Icon } from '../Icon/Icon';
 import { getInputStyles } from '../Input/Input';
@@ -47,8 +46,7 @@ export const TimeRangeInput = ({
   showIcon = false,
 }: TimeRangeInputProps) => {
   const [isOpen, setIsOpen] = useState(false);
-  const theme = useTheme2();
-  const styles = getStyles(theme, disabled);
+  const styles = useStyles2(getStyles, disabled);
 
   const onOpen = (event: FormEvent<HTMLButtonElement>) => {
     event.stopPropagation();
@@ -80,7 +78,7 @@ export const TimeRangeInput = ({
       <button
         type="button"
         className={styles.pickerInput}
-        aria-label={selectors.components.TimePicker.openButton}
+        data-testid={selectors.components.TimePicker.openButton}
         onClick={onOpen}
       >
         {showIcon && <Icon name="clock-nine" size={'sm'} className={styles.icon} />}
@@ -115,7 +113,7 @@ export const TimeRangeInput = ({
   );
 };
 
-const getStyles = stylesFactory((theme: GrafanaTheme2, disabled = false) => {
+const getStyles = (theme: GrafanaTheme2, disabled = false) => {
   const inputStyles = getInputStyles({ theme, invalid: false });
   return {
     container: css({
@@ -163,4 +161,4 @@ const getStyles = stylesFactory((theme: GrafanaTheme2, disabled = false) => {
       marginRight: theme.spacing(0.5),
     }),
   };
-});
+};
diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.test.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.test.tsx
index fcbdb8349143a..13b46255d37a8 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.test.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.test.tsx
@@ -1,10 +1,14 @@
-import { render } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
 
 import { dateTime, TimeRange } from '@grafana/data';
+import { selectors as e2eSelectors } from '@grafana/e2e-selectors';
 
 import { TimeRangePicker } from './TimeRangePicker';
 
+const selectors = e2eSelectors.components.TimePicker;
+
 const from = dateTime('2019-12-17T07:48:27.433Z');
 const to = dateTime('2019-12-18T07:48:27.433Z');
 
@@ -29,4 +33,25 @@ describe('TimePicker', () => {
 
     expect(container.queryByLabelText(/Time range selected/i)).toBeInTheDocument();
   });
+  it('switches overlay content visibility when toolbar button is clicked twice', async () => {
+    render(
+      <TimeRangePicker
+        onChangeTimeZone={() => {}}
+        onChange={(value) => {}}
+        value={value}
+        onMoveBackward={() => {}}
+        onMoveForward={() => {}}
+        onZoom={() => {}}
+      />
+    );
+
+    const openButton = screen.getByTestId(selectors.openButton);
+    const overlayContent = screen.queryByTestId(selectors.overlayContent);
+
+    expect(overlayContent).not.toBeInTheDocument();
+    await userEvent.click(openButton);
+    expect(screen.getByTestId(selectors.overlayContent)).toBeInTheDocument();
+    await userEvent.click(openButton);
+    expect(overlayContent).not.toBeInTheDocument();
+  });
 });
diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.tsx
index 1ce6ba3627eba..00d89fd12879f 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.tsx
@@ -2,10 +2,9 @@ import { css, cx } from '@emotion/css';
 import { useDialog } from '@react-aria/dialog';
 import { FocusScope } from '@react-aria/focus';
 import { useOverlay } from '@react-aria/overlays';
-import React, { memo, FormEvent, createRef, useState } from 'react';
+import React, { memo, createRef, useState, useEffect } from 'react';
 
 import {
-  isDateTime,
   rangeUtil,
   GrafanaTheme2,
   dateTimeFormat,
@@ -16,7 +15,7 @@ import {
 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 
-import { useStyles2, useTheme2 } from '../../themes/ThemeContext';
+import { useStyles2 } from '../../themes/ThemeContext';
 import { t, Trans } from '../../utils/i18n';
 import { ButtonGroup } from '../Button';
 import { getModalStyles } from '../Modal/getModalStyles';
@@ -40,10 +39,12 @@ export interface TimeRangePickerProps {
   onMoveBackward: () => void;
   onMoveForward: () => void;
   onZoom: () => void;
+  onError?: (error?: string) => void;
   history?: TimeRange[];
   hideQuickRanges?: boolean;
   widthOverride?: number;
   isOnCanvas?: boolean;
+  onToolbarTimePickerClick?: () => void;
 }
 
 export interface State {
@@ -58,6 +59,7 @@ export function TimeRangePicker(props: TimeRangePickerProps) {
     onMoveBackward,
     onMoveForward,
     onZoom,
+    onError,
     timeZone,
     fiscalYearStartMonth,
     timeSyncButton,
@@ -68,6 +70,7 @@ export function TimeRangePicker(props: TimeRangePickerProps) {
     hideQuickRanges,
     widthOverride,
     isOnCanvas,
+    onToolbarTimePickerClick,
   } = props;
 
   const onChange = (timeRange: TimeRange) => {
@@ -75,26 +78,44 @@ export function TimeRangePicker(props: TimeRangePickerProps) {
     setOpen(false);
   };
 
-  const onOpen = (event: FormEvent<HTMLButtonElement>) => {
-    event.stopPropagation();
-    event.preventDefault();
-    setOpen(!isOpen);
+  useEffect(() => {
+    if (isOpen && onToolbarTimePickerClick) {
+      onToolbarTimePickerClick();
+    }
+  }, [isOpen, onToolbarTimePickerClick]);
+
+  const onToolbarButtonSwitch = () => {
+    setOpen((prevState) => !prevState);
   };
 
   const onClose = () => {
     setOpen(false);
   };
 
-  const ref = createRef<HTMLElement>();
-  const { overlayProps, underlayProps } = useOverlay({ onClose, isDismissable: true, isOpen }, ref);
-  const { dialogProps } = useDialog({}, ref);
+  const overlayRef = createRef<HTMLElement>();
+  const buttonRef = createRef<HTMLElement>();
+  const { overlayProps, underlayProps } = useOverlay(
+    {
+      onClose,
+      isDismissable: true,
+      isOpen,
+      shouldCloseOnInteractOutside: (element) => {
+        return !buttonRef.current?.contains(element);
+      },
+    },
+    overlayRef
+  );
+  const { dialogProps } = useDialog({}, overlayRef);
 
-  const theme = useTheme2();
   const styles = useStyles2(getStyles);
-  const { modalBackdrop } = getModalStyles(theme);
-  const hasAbsolute = isDateTime(value.raw.from) || isDateTime(value.raw.to);
+  const { modalBackdrop } = useStyles2(getModalStyles);
+  const hasAbsolute = !rangeUtil.isRelativeTime(value.raw.from) || !rangeUtil.isRelativeTime(value.raw.to);
+
   const variant = isSynced ? 'active' : isOnCanvas ? 'canvas' : 'default';
 
+  const isFromAfterTo = value?.to?.isBefore(value.from);
+  const timePickerIcon = isFromAfterTo ? 'exclamation-triangle' : 'clock-nine';
+
   const currentTimeRange = formattedRange(value, timeZone);
 
   return (
@@ -109,15 +130,20 @@ export function TimeRangePicker(props: TimeRangePickerProps) {
         />
       )}
 
-      <Tooltip content={<TimePickerTooltip timeRange={value} timeZone={timeZone} />} placement="bottom" interactive>
+      <Tooltip
+        ref={buttonRef}
+        content={<TimePickerTooltip timeRange={value} timeZone={timeZone} />}
+        placement="bottom"
+        interactive
+      >
         <ToolbarButton
           data-testid={selectors.components.TimePicker.openButton}
           aria-label={t('time-picker.range-picker.current-time-selected', 'Time range selected: {{currentTimeRange}}', {
             currentTimeRange,
           })}
           aria-controls="TimePickerContent"
-          onClick={onOpen}
-          icon="clock-nine"
+          onClick={onToolbarButtonSwitch}
+          icon={timePickerIcon}
           isOpen={isOpen}
           variant={variant}
         >
@@ -125,10 +151,10 @@ export function TimeRangePicker(props: TimeRangePickerProps) {
         </ToolbarButton>
       </Tooltip>
       {isOpen && (
-        <div>
+        <div data-testid={selectors.components.TimePicker.overlayContent}>
           <div role="presentation" className={cx(modalBackdrop, styles.backdrop)} {...underlayProps} />
-          <FocusScope contain autoFocus>
-            <section className={styles.content} ref={ref} {...overlayProps} {...dialogProps}>
+          <FocusScope contain autoFocus restoreFocus>
+            <section className={styles.content} ref={overlayRef} {...overlayProps} {...dialogProps}>
               <TimePickerContent
                 timeZone={timeZone}
                 fiscalYearStartMonth={fiscalYearStartMonth}
@@ -141,6 +167,7 @@ export function TimeRangePicker(props: TimeRangePickerProps) {
                 onChangeTimeZone={onChangeTimeZone}
                 onChangeFiscalYearStartMonth={onChangeFiscalYearStartMonth}
                 hideQuickRanges={hideQuickRanges}
+                onError={onError}
               />
             </section>
           </FocusScope>
@@ -262,8 +289,9 @@ const getLabelStyles = (theme: GrafanaTheme2) => {
       alignItems: 'center',
       whiteSpace: 'nowrap',
     }),
+    // Psiphon change - use Psiphon orange for UTC label
     utc: css({
-      color: theme.v1.palette.orange,
+      color: theme.colors.psiphon.psiphonOrangeLight,
       fontSize: theme.typography.size.sm,
       paddingLeft: '6px',
       lineHeight: '28px',
diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/CalendarBody.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/CalendarBody.tsx
index f115d536d85bf..8e13c04a5b9c7 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/CalendarBody.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/CalendarBody.tsx
@@ -2,10 +2,11 @@ import { css } from '@emotion/css';
 import React, { useCallback } from 'react';
 import Calendar from 'react-calendar';
 
-import { GrafanaTheme2, dateTimeParse, DateTime, TimeZone, getZone } from '@grafana/data';
+import { GrafanaTheme2, dateTimeParse, DateTime, TimeZone } from '@grafana/data';
 
 import { useStyles2 } from '../../../themes';
 import { Icon } from '../../Icon/Icon';
+import { adjustDateForReactCalendar } from '../utils/adjustDateForReactCalendar';
 
 import { TimePickerCalendarProps } from './TimePickerCalendar';
 
@@ -42,7 +43,8 @@ export function inputToValue(
   let toAsDate = to.isValid() ? to.toDate() : invalidDateDefault;
 
   if (timezone) {
-    [fromAsDate, toAsDate] = adjustDateForReactCalendar(fromAsDate, toAsDate, timezone);
+    fromAsDate = adjustDateForReactCalendar(fromAsDate, timezone);
+    toAsDate = adjustDateForReactCalendar(toAsDate, timezone);
   }
 
   if (fromAsDate > toAsDate) {
@@ -52,39 +54,6 @@ export function inputToValue(
   return [fromAsDate, toAsDate];
 }
 
-/**
- * React calendar doesn't support showing ranges in other time zones, so attempting to show
- * 10th midnight - 11th midnight in another time zone than your browsers will span three days
- * instead of two.
- *
- * This function adjusts the dates by "moving" the time to appear as if it's local.
- * e.g. make 5 PM New York "look like" 5 PM in the user's local browser time.
- * See also https://github.com/wojtekmaj/react-calendar/issues/511#issuecomment-835333976
- */
-function adjustDateForReactCalendar(from: Date, to: Date, timeZone: string): [Date, Date] {
-  const zone = getZone(timeZone);
-  if (!zone) {
-    return [from, to];
-  }
-
-  // get utc offset for timezone preference
-  const timezonePrefFromOffset = zone.utcOffset(from.getTime());
-  const timezonePrefToOffset = zone.utcOffset(to.getTime());
-
-  // get utc offset for local timezone
-  const localFromOffset = from.getTimezoneOffset();
-  const localToOffset = to.getTimezoneOffset();
-
-  // calculate difference between timezone preference and local timezone
-  // we keep these as separate variables in case one of them crosses a daylight savings boundary
-  const fromDiff = timezonePrefFromOffset - localFromOffset;
-  const toDiff = timezonePrefToOffset - localToOffset;
-
-  const newFromDate = new Date(from.getTime() - fromDiff * 1000 * 60);
-  const newToDate = new Date(to.getTime() - toDiff * 1000 * 60);
-  return [newFromDate, newToDate];
-}
-
 function useOnCalendarChange(onChange: (from: DateTime, to: DateTime) => void, timeZone?: TimeZone) {
   return useCallback<NonNullable<React.ComponentProps<typeof Calendar>['onChange']>>(
     (value) => {
diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/CalendarFooter.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/CalendarFooter.tsx
index 4db12f188934c..1f5ab28cff4ec 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/CalendarFooter.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/CalendarFooter.tsx
@@ -1,44 +1,23 @@
-import { css } from '@emotion/css';
 import React from 'react';
 
-import { GrafanaTheme2 } from '@grafana/data';
-
-import { useStyles2 } from '../../../themes';
 import { Trans } from '../../../utils/i18n';
 import { Button } from '../../Button';
+import { Stack } from '../../Layout/Stack/Stack';
 
 import { TimePickerCalendarProps } from './TimePickerCalendar';
 
 export function Footer({ onClose, onApply }: TimePickerCalendarProps) {
-  const styles = useStyles2(getFooterStyles);
-
   return (
-    <div className={styles.container}>
-      <Button className={styles.apply} onClick={onApply}>
-        <Trans i18nKey="time-picker.calendar.apply-button">Apply time range</Trans>
-      </Button>
+    <Stack gap={2} justifyContent="space-between">
       <Button variant="secondary" onClick={onClose}>
         <Trans i18nKey="time-picker.calendar.cancel-button">Cancel</Trans>
       </Button>
-    </div>
+
+      <Button onClick={onApply}>
+        <Trans i18nKey="time-picker.calendar.apply-button">Apply time range</Trans>
+      </Button>
+    </Stack>
   );
 }
 
 Footer.displayName = 'Footer';
-
-const getFooterStyles = (theme: GrafanaTheme2) => {
-  return {
-    container: css({
-      backgroundColor: theme.colors.background.primary,
-      display: 'flex',
-      justifyContent: 'center',
-      padding: '10px',
-      alignItems: 'stretch',
-    }),
-    apply: css({
-      marginRight: '4px',
-      width: '100%',
-      justifyContent: 'center',
-    }),
-  };
-};
diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/CalendarHeader.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/CalendarHeader.tsx
index f87fcca805b64..c09d39d198a6e 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/CalendarHeader.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/CalendarHeader.tsx
@@ -1,44 +1,30 @@
-import { css } from '@emotion/css';
 import React from 'react';
 
-import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 
-import { useStyles2 } from '../../../themes';
-import { Trans } from '../../../utils/i18n';
-import { Button } from '../../Button';
+import { Trans, t } from '../../../utils/i18n';
+import { IconButton } from '../../IconButton/IconButton';
+import { Stack } from '../../Layout/Stack/Stack';
 
 import { TimePickerCalendarProps } from './TimePickerCalendar';
 import { TimePickerTitle } from './TimePickerTitle';
 
 export function Header({ onClose }: TimePickerCalendarProps) {
-  const styles = useStyles2(getHeaderStyles);
-
   return (
-    <div className={styles.container}>
+    <Stack justifyContent="space-between">
       <TimePickerTitle>
         <Trans i18nKey="time-picker.calendar.select-time">Select a time range</Trans>
       </TimePickerTitle>
-      <Button
-        aria-label={selectors.components.TimePicker.calendar.closeButton}
-        icon="times"
+
+      <IconButton
+        data-testid={selectors.components.TimePicker.calendar.closeButton}
+        tooltip={t(`time-picker.calendar.close`, 'Close calendar')}
+        name="times"
         variant="secondary"
         onClick={onClose}
       />
-    </div>
+    </Stack>
   );
 }
 
 Header.displayName = 'Header';
-
-const getHeaderStyles = (theme: GrafanaTheme2) => {
-  return {
-    container: css({
-      backgroundColor: theme.colors.background.primary,
-      display: 'flex',
-      alignItems: 'center',
-      justifyContent: 'space-between',
-      padding: '7px',
-    }),
-  };
-};
diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerCalendar.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerCalendar.tsx
index 2e32795301ee1..9b39f55f4afd7 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerCalendar.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerCalendar.tsx
@@ -7,7 +7,7 @@ import React, { FormEvent, memo } from 'react';
 import { DateTime, GrafanaTheme2, TimeZone } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 
-import { useTheme2 } from '../../../themes';
+import { useStyles2, useTheme2 } from '../../../themes';
 import { getModalStyles } from '../../Modal/getModalStyles';
 
 import { Body } from './CalendarBody';
@@ -19,27 +19,28 @@ export const getStyles = (theme: GrafanaTheme2, isReversed = false) => {
     container: css({
       top: 0,
       position: 'absolute',
-      [`${isReversed ? 'left' : 'right'}`]: '544px',
+      [`${isReversed ? 'left' : 'right'}`]: '546px', // lmao
+    }),
+
+    modalContainer: css({
+      label: 'modalContainer',
+      margin: '0 auto',
+    }),
+
+    calendar: css({
+      display: 'flex',
+      flexDirection: 'column',
+      gap: theme.spacing(1),
+      padding: theme.spacing(1),
+      label: 'calendar',
       boxShadow: theme.shadows.z3,
       backgroundColor: theme.colors.background.primary,
-      zIndex: -1,
       border: `1px solid ${theme.colors.border.weak}`,
-      borderTopLeftRadius: theme.shape.radius.default,
-      borderBottomLeftRadius: theme.shape.radius.default,
-
-      '&:after': {
-        display: 'block',
-        backgroundColor: theme.colors.background.primary,
-        width: '19px',
-        height: '100%',
-        content: `${!isReversed ? '" "' : '""'}`,
-        position: 'absolute',
-        top: 0,
-        right: '-19px',
-        borderLeft: `1px solid ${theme.colors.border.weak}`,
-      },
+      borderRadius: theme.shape.radius.default,
     }),
+
     modal: css({
+      label: 'modal',
       boxShadow: theme.shadows.z3,
       left: '50%',
       position: 'fixed',
@@ -47,10 +48,6 @@ export const getStyles = (theme: GrafanaTheme2, isReversed = false) => {
       transform: 'translate(-50%, -50%)',
       zIndex: theme.zIndex.modal,
     }),
-    content: css({
-      margin: '0 auto',
-      width: '268px',
-    }),
   };
 };
 
@@ -61,6 +58,11 @@ export interface TimePickerCalendarProps {
   onClose: () => void;
   onApply: (e: FormEvent<HTMLButtonElement>) => void;
   onChange: (from: DateTime, to: DateTime) => void;
+
+  /**
+   * When true, the calendar is rendered as a floating "tooltip" next to the input.
+   * When false, the calendar is rendered "fullscreen" in a modal. Yes. Don't ask.
+   */
   isFullscreen: boolean;
   timeZone?: TimeZone;
   isReversed?: boolean;
@@ -68,9 +70,9 @@ export interface TimePickerCalendarProps {
 
 function TimePickerCalendar(props: TimePickerCalendarProps) {
   const theme = useTheme2();
-  const { modalBackdrop } = getModalStyles(theme);
+  const { modalBackdrop } = useStyles2(getModalStyles);
   const styles = getStyles(theme, props.isReversed);
-  const { isOpen, isFullscreen, onClose } = props;
+  const { isOpen, isFullscreen: isFullscreenProp, onClose } = props;
   const ref = React.createRef<HTMLElement>();
   const { dialogProps } = useDialog(
     {
@@ -87,17 +89,31 @@ function TimePickerCalendar(props: TimePickerCalendarProps) {
     ref
   );
 
+  // This prop is confusingly worded, so rename it to something more intuitive.
+  const showInModal = !isFullscreenProp;
+
   if (!isOpen) {
     return null;
   }
 
-  if (isFullscreen) {
+  const calendar = (
+    <section
+      className={styles.calendar}
+      ref={ref}
+      {...overlayProps}
+      {...dialogProps}
+      data-testid={selectors.components.TimePicker.calendar.label}
+    >
+      <Header {...props} />
+      <Body {...props} />
+      {showInModal && <Footer {...props} />}
+    </section>
+  );
+
+  if (!showInModal) {
     return (
       <FocusScope contain restoreFocus autoFocus>
-        <section className={styles.container} ref={ref} {...overlayProps} {...dialogProps}>
-          <Header {...props} />
-          <Body {...props} />
-        </section>
+        <div className={styles.container}>{calendar}</div>
       </FocusScope>
     );
   }
@@ -105,14 +121,11 @@ function TimePickerCalendar(props: TimePickerCalendarProps) {
   return (
     <OverlayContainer>
       <div className={modalBackdrop} />
+
       <FocusScope contain autoFocus restoreFocus>
-        <section className={styles.modal} ref={ref} {...overlayProps} {...dialogProps}>
-          <div className={styles.content} aria-label={selectors.components.TimePicker.calendar.label}>
-            <Header {...props} />
-            <Body {...props} />
-            <Footer {...props} />
-          </div>
-        </section>
+        <div className={styles.modal}>
+          <div className={styles.modalContainer}>{calendar}</div>
+        </div>
       </FocusScope>
     </OverlayContainer>
   );
diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerContent.test.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerContent.test.tsx
index 40d9dc2b693bc..ba9c9a4f011e2 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerContent.test.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerContent.test.tsx
@@ -96,22 +96,22 @@ describe('TimePickerContent', () => {
 
     it('renders with absolute picker when absolute value and quick ranges are visible', () => {
       renderComponent({ value: absoluteValue, isFullscreen: false });
-      expect(screen.queryByLabelText(/time range from field/i)).toBeInTheDocument();
+      expect(screen.queryByLabelText('From')).toBeInTheDocument();
     });
 
     it('renders with absolute picker when absolute value and quick ranges are hidden', () => {
       renderComponent({ value: absoluteValue, isFullscreen: false, hideQuickRanges: true });
-      expect(screen.queryByLabelText(/time range from field/i)).toBeInTheDocument();
+      expect(screen.queryByLabelText('From')).toBeInTheDocument();
     });
 
     it('renders without absolute picker when narrow screen and quick ranges are visible', () => {
       renderComponent({ value: relativeValue, isFullscreen: false });
-      expect(screen.queryByLabelText(/time range from field/i)).not.toBeInTheDocument();
+      expect(screen.queryByLabelText('From')).not.toBeInTheDocument();
     });
 
     it('renders with absolute picker when narrow screen and quick ranges are hidden', () => {
       renderComponent({ value: relativeValue, isFullscreen: false, hideQuickRanges: true });
-      expect(screen.queryByLabelText(/time range from field/i)).toBeInTheDocument();
+      expect(screen.queryByLabelText('From')).toBeInTheDocument();
     });
 
     it('renders without timezone picker', () => {
diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerContent.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerContent.tsx
index 48d28f1e2fe9e..d7245a9bbcdf4 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerContent.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerContent.tsx
@@ -4,7 +4,7 @@ import React, { memo, useMemo, useState } from 'react';
 import { GrafanaTheme2, isDateTime, rangeUtil, RawTimeRange, TimeOption, TimeRange, TimeZone } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 
-import { stylesFactory, useTheme2 } from '../../../themes';
+import { useStyles2, useTheme2 } from '../../../themes';
 import { getFocusStyles } from '../../../themes/mixins';
 import { t, Trans } from '../../../utils/i18n';
 import { CustomScrollbar } from '../../CustomScrollbar/CustomScrollbar';
@@ -22,6 +22,7 @@ interface Props {
   onChange: (timeRange: TimeRange) => void;
   onChangeTimeZone: (timeZone: TimeZone) => void;
   onChangeFiscalYearStartMonth?: (month: number) => void;
+  onError?: (error?: string) => void;
   timeZone?: TimeZone;
   fiscalYearStartMonth?: number;
   quickOptions?: TimeOption[];
@@ -63,8 +64,7 @@ export const TimePickerContentWithScreenSize = (props: PropsWithScreenSize) => {
   const isHistoryEmpty = !history?.length;
   const isContainerTall =
     (isFullscreen && showHistory) || (!isFullscreen && ((showHistory && !isHistoryEmpty) || !hideQuickRanges));
-  const theme = useTheme2();
-  const styles = getStyles(theme, isReversed, hideQuickRanges, isContainerTall, isFullscreen);
+  const styles = useStyles2(getStyles, isReversed, hideQuickRanges, isContainerTall, isFullscreen);
   const historyOptions = mapToHistoryOptions(history, timeZone);
   const timeOption = useTimeOption(value.raw, quickOptions);
   const [searchTerm, setSearchQuery] = useState('');
@@ -83,7 +83,6 @@ export const TimePickerContentWithScreenSize = (props: PropsWithScreenSize) => {
             <div className={styles.timeRangeFilter}>
               <FilterInput
                 width={0}
-                autoFocus={true}
                 value={searchTerm}
                 onChange={setSearchQuery}
                 placeholder={t('time-picker.content.filter-placeholder', 'Search quick ranges')}
@@ -123,9 +122,8 @@ export const TimePickerContent = (props: Props) => {
 };
 
 const NarrowScreenForm = (props: FormProps) => {
-  const { value, hideQuickRanges, onChange, timeZone, historyOptions = [], showHistory } = props;
-  const theme = useTheme2();
-  const styles = getNarrowScreenStyles(theme);
+  const { value, hideQuickRanges, onChange, timeZone, historyOptions = [], showHistory, onError } = props;
+  const styles = useStyles2(getNarrowScreenStyles);
   const isAbsolute = isDateTime(value.raw.from) || isDateTime(value.raw.to);
   const [collapsedFlag, setCollapsedFlag] = useState(!isAbsolute);
   const collapsed = hideQuickRanges ? false : collapsedFlag;
@@ -158,7 +156,13 @@ const NarrowScreenForm = (props: FormProps) => {
       {!collapsed && (
         <div className={styles.body} id="expanded-timerange">
           <div className={styles.form}>
-            <TimeRangeContent value={value} onApply={onChange} timeZone={timeZone} isFullscreen={false} />
+            <TimeRangeContent
+              value={value}
+              onApply={onChange}
+              timeZone={timeZone}
+              isFullscreen={false}
+              onError={onError}
+            />
           </div>
           {showHistory && (
             <TimeRangeList
@@ -175,9 +179,8 @@ const NarrowScreenForm = (props: FormProps) => {
 };
 
 const FullScreenForm = (props: FormProps) => {
-  const { onChange, value, timeZone, fiscalYearStartMonth, isReversed, historyOptions } = props;
-  const theme = useTheme2();
-  const styles = getFullScreenStyles(theme, props.hideQuickRanges);
+  const { onChange, value, timeZone, fiscalYearStartMonth, isReversed, historyOptions, onError } = props;
+  const styles = useStyles2(getFullScreenStyles, props.hideQuickRanges);
   const onChangeTimeOption = (timeOption: TimeOption) => {
     return onChange(mapOptionToTimeRange(timeOption, timeZone));
   };
@@ -197,6 +200,7 @@ const FullScreenForm = (props: FormProps) => {
           onApply={onChange}
           isFullscreen={true}
           isReversed={isReversed}
+          onError={onError}
         />
       </div>
       {props.showHistory && (
@@ -214,8 +218,7 @@ const FullScreenForm = (props: FormProps) => {
 };
 
 const EmptyRecentList = memo(() => {
-  const theme = useTheme2();
-  const styles = getEmptyListStyles(theme);
+  const styles = useStyles2(getEmptyListStyles);
   const emptyRecentListText = t(
     'time-picker.content.empty-recent-list-info',
     "It looks like you haven't used this time picker before. As soon as you enter some time intervals, recently used intervals will appear here."
@@ -263,104 +266,104 @@ const useTimeOption = (raw: RawTimeRange, quickOptions: TimeOption[]): TimeOptio
   }, [raw, quickOptions]);
 };
 
-const getStyles = stylesFactory((theme: GrafanaTheme2, isReversed, hideQuickRanges, isContainerTall, isFullscreen) => {
-  return {
-    container: css({
-      background: theme.colors.background.primary,
-      boxShadow: theme.shadows.z3,
-      width: `${isFullscreen ? '546px' : '262px'}`,
-      borderRadius: theme.shape.radius.default,
-      border: `1px solid ${theme.colors.border.weak}`,
-      [`${isReversed ? 'left' : 'right'}`]: 0,
-    }),
-    body: css({
-      display: 'flex',
-      flexDirection: 'row-reverse',
-      height: `${isContainerTall ? '381px' : '217px'}`,
-      maxHeight: '100vh',
-    }),
-    leftSide: css({
-      display: 'flex',
-      flexDirection: 'column',
-      borderRight: `${isReversed ? 'none' : `1px solid ${theme.colors.border.weak}`}`,
-      width: `${!hideQuickRanges ? '60%' : '100%'}`,
-      overflow: 'hidden',
-      order: isReversed ? 1 : 0,
-    }),
-    rightSide: css({
-      width: `${isFullscreen ? '40%' : '100%'}; !important`,
-      borderRight: isReversed ? `1px solid ${theme.colors.border.weak}` : 'none',
-      display: 'flex',
-      flexDirection: 'column',
-    }),
-    timeRangeFilter: css({
-      padding: theme.spacing(1),
-    }),
-    spacing: css({
-      marginTop: '16px',
-    }),
-  };
+const getStyles = (
+  theme: GrafanaTheme2,
+  isReversed?: boolean,
+  hideQuickRanges?: boolean,
+  isContainerTall?: boolean,
+  isFullscreen?: boolean
+) => ({
+  container: css({
+    background: theme.colors.background.primary,
+    boxShadow: theme.shadows.z3,
+    width: `${isFullscreen ? '546px' : '262px'}`,
+    borderRadius: theme.shape.radius.default,
+    border: `1px solid ${theme.colors.border.weak}`,
+    [`${isReversed ? 'left' : 'right'}`]: 0,
+    display: 'flex',
+    flexDirection: 'column',
+  }),
+  body: css({
+    display: 'flex',
+    flexDirection: 'row-reverse',
+    height: `${isContainerTall ? '381px' : '217px'}`,
+    maxHeight: '100vh',
+  }),
+  leftSide: css({
+    display: 'flex',
+    flexDirection: 'column',
+    borderRight: `${isReversed ? 'none' : `1px solid ${theme.colors.border.weak}`}`,
+    width: `${!hideQuickRanges ? '60%' : '100%'}`,
+    overflow: 'auto',
+    order: isReversed ? 1 : 0,
+  }),
+  rightSide: css({
+    width: `${isFullscreen ? '40%' : '100%'}; !important`,
+    borderRight: isReversed ? `1px solid ${theme.colors.border.weak}` : 'none',
+    display: 'flex',
+    flexDirection: 'column',
+  }),
+  timeRangeFilter: css({
+    padding: theme.spacing(1),
+  }),
+  spacing: css({
+    marginTop: '16px',
+  }),
 });
 
-const getNarrowScreenStyles = stylesFactory((theme: GrafanaTheme2) => {
-  return {
-    header: css({
-      display: 'flex',
-      flexDirection: 'row',
-      justifyContent: 'space-between',
-      alignItems: 'center',
-      borderBottom: `1px solid ${theme.colors.border.weak}`,
-      padding: '7px 9px 7px 9px',
-    }),
-    expandButton: css({
-      backgroundColor: 'transparent',
-      border: 'none',
-      display: 'flex',
-      width: '100%',
+const getNarrowScreenStyles = (theme: GrafanaTheme2) => ({
+  header: css({
+    display: 'flex',
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    borderBottom: `1px solid ${theme.colors.border.weak}`,
+    padding: '7px 9px 7px 9px',
+  }),
+  expandButton: css({
+    backgroundColor: 'transparent',
+    border: 'none',
+    display: 'flex',
+    width: '100%',
 
-      '&:focus-visible': getFocusStyles(theme),
-    }),
-    body: css({
-      borderBottom: `1px solid ${theme.colors.border.weak}`,
-    }),
-    form: css({
-      padding: '7px 9px 7px 9px',
-    }),
-  };
+    '&:focus-visible': getFocusStyles(theme),
+  }),
+  body: css({
+    borderBottom: `1px solid ${theme.colors.border.weak}`,
+  }),
+  form: css({
+    padding: '7px 9px 7px 9px',
+  }),
 });
 
-const getFullScreenStyles = stylesFactory((theme: GrafanaTheme2, hideQuickRanges?: boolean) => {
-  return {
-    container: css({
-      paddingTop: '9px',
-      paddingLeft: '11px',
-      paddingRight: !hideQuickRanges ? '20%' : '11px',
-    }),
-    title: css({
-      marginBottom: '11px',
-    }),
-    recent: css({
-      flexGrow: 1,
-      display: 'flex',
-      flexDirection: 'column',
-      justifyContent: 'flex-end',
-      paddingTop: theme.spacing(1),
-    }),
-  };
+const getFullScreenStyles = (theme: GrafanaTheme2, hideQuickRanges?: boolean) => ({
+  container: css({
+    paddingTop: '9px',
+    paddingLeft: '11px',
+    paddingRight: !hideQuickRanges ? '20%' : '11px',
+  }),
+  title: css({
+    marginBottom: '11px',
+  }),
+  recent: css({
+    flexGrow: 1,
+    display: 'flex',
+    flexDirection: 'column',
+    justifyContent: 'flex-end',
+    paddingTop: theme.spacing(1),
+  }),
 });
 
-const getEmptyListStyles = stylesFactory((theme: GrafanaTheme2) => {
-  return {
-    container: css({
-      padding: '12px',
-      margin: '12px',
+const getEmptyListStyles = (theme: GrafanaTheme2) => ({
+  container: css({
+    padding: '12px',
+    margin: '12px',
 
-      'a, span': {
-        fontSize: '13px',
-      },
-    }),
-    link: css({
-      color: theme.colors.text.link,
-    }),
-  };
+    'a, span': {
+      fontSize: '13px',
+    },
+  }),
+  link: css({
+    color: theme.colors.text.link,
+  }),
 });
diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerFooter.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerFooter.tsx
index 3286314f7efff..31c40a0fb0a3b 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerFooter.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerFooter.tsx
@@ -5,7 +5,7 @@ import React, { useCallback, useState } from 'react';
 import { getTimeZoneInfo, GrafanaTheme2, TimeZone } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 
-import { stylesFactory, useTheme2 } from '../../../themes';
+import { useStyles2 } from '../../../themes';
 import { t, Trans } from '../../../utils/i18n';
 import { Button } from '../../Button';
 import { Field } from '../../Forms/Field';
@@ -46,8 +46,7 @@ export const TimePickerFooter = (props: Props) => {
     [isEditing, setEditing]
   );
 
-  const theme = useTheme2();
-  const style = getStyle(theme);
+  const style = useStyles2(getStyle);
 
   if (!isString(timeZone)) {
     return null;
@@ -74,7 +73,12 @@ export const TimePickerFooter = (props: Props) => {
           <TimeZoneOffset timeZone={timeZone} timestamp={timestamp} />
         </div>
         <div className={style.spacer} />
-        <Button variant="secondary" onClick={onToggleChangeTimeSettings} size="sm">
+        <Button
+          data-testid={selectors.components.TimeZonePicker.changeTimeSettingsButton}
+          variant="secondary"
+          onClick={onToggleChangeTimeSettings}
+          size="sm"
+        >
           <Trans i18nKey="time-picker.footer.change-settings-button">Change time settings</Trans>
         </Button>
       </section>
@@ -110,7 +114,7 @@ export const TimePickerFooter = (props: Props) => {
             </section>
           ) : (
             <section
-              aria-label={selectors.components.TimeZonePicker.containerV2}
+              data-testid={selectors.components.TimeZonePicker.containerV2}
               className={cx(style.timeZoneContainer, style.timeSettingContainer)}
             >
               <Field
@@ -136,43 +140,41 @@ export const TimePickerFooter = (props: Props) => {
   );
 };
 
-const getStyle = stylesFactory((theme: GrafanaTheme2) => {
-  return {
-    container: css({
-      borderTop: `1px solid ${theme.colors.border.weak}`,
-      padding: '11px',
-      display: 'flex',
-      flexDirection: 'row',
-      justifyContent: 'space-between',
-      alignItems: 'center',
-    }),
-    editContainer: css({
-      borderTop: `1px solid ${theme.colors.border.weak}`,
-      padding: '11px',
-      justifyContent: 'space-between',
-      alignItems: 'center',
-    }),
-    spacer: css({
-      marginLeft: '7px',
-    }),
-    timeSettingContainer: css({
-      paddingTop: theme.spacing(1),
-    }),
-    fiscalYearField: css({
-      marginBottom: 0,
-    }),
-    timeZoneContainer: css({
-      display: 'flex',
-      flexDirection: 'row',
-      justifyContent: 'space-between',
-      alignItems: 'center',
-      flexGrow: 1,
-    }),
-    timeZone: css({
-      display: 'flex',
-      flexDirection: 'row',
-      alignItems: 'baseline',
-      flexGrow: 1,
-    }),
-  };
+const getStyle = (theme: GrafanaTheme2) => ({
+  container: css({
+    borderTop: `1px solid ${theme.colors.border.weak}`,
+    padding: '11px',
+    display: 'flex',
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+  }),
+  editContainer: css({
+    borderTop: `1px solid ${theme.colors.border.weak}`,
+    padding: '11px',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+  }),
+  spacer: css({
+    marginLeft: '7px',
+  }),
+  timeSettingContainer: css({
+    paddingTop: theme.spacing(1),
+  }),
+  fiscalYearField: css({
+    marginBottom: 0,
+  }),
+  timeZoneContainer: css({
+    display: 'flex',
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    flexGrow: 1,
+  }),
+  timeZone: css({
+    display: 'flex',
+    flexDirection: 'row',
+    alignItems: 'baseline',
+    flexGrow: 1,
+  }),
 });
diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeContent.test.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeContent.test.tsx
index ac074c9ae281f..40a1964b22422 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeContent.test.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeContent.test.tsx
@@ -1,4 +1,5 @@
 import { fireEvent, render, RenderResult } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
 
 import { dateTimeParse, TimeRange } from '@grafana/data';
@@ -10,6 +11,15 @@ type TimeRangeFormRenderResult = RenderResult & {
   getCalendarDayByLabelText(label: string): HTMLButtonElement;
 };
 
+const mockClipboard = {
+  writeText: jest.fn(),
+  readText: jest.fn(),
+};
+
+Object.defineProperty(global.navigator, 'clipboard', {
+  value: mockClipboard,
+});
+
 const defaultTimeRange: TimeRange = {
   from: dateTimeParse('2021-06-17 00:00:00', { timeZone: 'utc' }),
   to: dateTimeParse('2021-06-19 23:59:00', { timeZone: 'utc' }),
@@ -19,6 +29,11 @@ const defaultTimeRange: TimeRange = {
   },
 };
 
+const customRawTimeRange = {
+  from: '2023-06-17 00:00:00',
+  to: '2023-06-19 23:59:00',
+};
+
 function setup(initial: TimeRange = defaultTimeRange, timeZone = 'utc'): TimeRangeFormRenderResult {
   const result = render(
     <TimeRangeContent isFullscreen={true} value={initial} onApply={() => {}} timeZone={timeZone} />
@@ -34,20 +49,19 @@ function setup(initial: TimeRange = defaultTimeRange, timeZone = 'utc'): TimeRan
 }
 
 describe('TimeRangeForm', () => {
-  it('should render form correcty', () => {
+  it('should render form correctly', () => {
     const { getByLabelText, getByText, getAllByRole } = setup();
-    const { TimePicker } = selectors.components;
 
     expect(getByText('Apply time range')).toBeInTheDocument();
-    expect(getAllByRole('button', { name: TimePicker.calendar.openButton })).toHaveLength(2);
-    expect(getByLabelText(TimePicker.fromField)).toBeInTheDocument();
-    expect(getByLabelText(TimePicker.toField)).toBeInTheDocument();
+    expect(getAllByRole('button', { name: 'Open calendar' })).toHaveLength(2);
+    expect(getByLabelText('From')).toBeInTheDocument();
+    expect(getByLabelText('To')).toBeInTheDocument();
   });
 
   it('should display calendar when clicking the calendar icon', () => {
     const { getByLabelText, getAllByRole } = setup();
     const { TimePicker } = selectors.components;
-    const openCalendarButton = getAllByRole('button', { name: TimePicker.calendar.openButton });
+    const openCalendarButton = getAllByRole('button', { name: 'Open calendar' });
 
     fireEvent.click(openCalendarButton[0]);
     expect(getByLabelText(TimePicker.calendar.label)).toBeInTheDocument();
@@ -55,24 +69,23 @@ describe('TimeRangeForm', () => {
 
   it('should have passed time range entered in form', () => {
     const { getByLabelText } = setup();
-    const { TimePicker } = selectors.components;
 
     const fromValue = defaultTimeRange.raw.from as string;
     const toValue = defaultTimeRange.raw.to as string;
 
-    expect(getByLabelText(TimePicker.fromField)).toHaveValue(fromValue);
-    expect(getByLabelText(TimePicker.toField)).toHaveValue(toValue);
+    expect(getByLabelText('From')).toHaveValue(fromValue);
+    expect(getByLabelText('To')).toHaveValue(toValue);
   });
 
   it('should close calendar when clicking the close icon', () => {
     const { queryByLabelText, getAllByRole, getByRole } = setup();
     const { TimePicker } = selectors.components;
-    const openCalendarButton = getAllByRole('button', { name: TimePicker.calendar.openButton });
+    const openCalendarButton = getAllByRole('button', { name: 'Open calendar' });
 
     fireEvent.click(openCalendarButton[0]);
-    expect(getByRole('button', { name: TimePicker.calendar.closeButton })).toBeInTheDocument();
+    expect(getByRole('button', { name: 'Close calendar' })).toBeInTheDocument();
 
-    fireEvent.click(getByRole('button', { name: TimePicker.calendar.closeButton }));
+    fireEvent.click(getByRole('button', { name: 'Close calendar' }));
     expect(queryByLabelText(TimePicker.calendar.label)).toBeNull();
   });
 
@@ -85,8 +98,7 @@ describe('TimeRangeForm', () => {
 
   it('should have passed time range selected in calendar', () => {
     const { getAllByRole, getCalendarDayByLabelText } = setup();
-    const { TimePicker } = selectors.components;
-    const openCalendarButton = getAllByRole('button', { name: TimePicker.calendar.openButton });
+    const openCalendarButton = getAllByRole('button', { name: 'Open calendar' });
 
     fireEvent.click(openCalendarButton[0]);
     const from = getCalendarDayByLabelText('June 17, 2021');
@@ -98,8 +110,7 @@ describe('TimeRangeForm', () => {
 
   it('should select correct time range in calendar when having a custom time zone', () => {
     const { getAllByRole, getCalendarDayByLabelText } = setup(defaultTimeRange, 'Asia/Tokyo');
-    const { TimePicker } = selectors.components;
-    const openCalendarButton = getAllByRole('button', { name: TimePicker.calendar.openButton });
+    const openCalendarButton = getAllByRole('button', { name: 'Open calendar' });
 
     fireEvent.click(openCalendarButton[1]);
     const from = getCalendarDayByLabelText('June 17, 2021');
@@ -109,6 +120,26 @@ describe('TimeRangeForm', () => {
     expect(to).toHaveClass('react-calendar__tile--rangeEnd');
   });
 
+  it('should copy time range to clipboard', async () => {
+    const { getByTestId } = setup();
+
+    await userEvent.click(getByTestId('data-testid TimePicker copy button'));
+    expect(global.navigator.clipboard.writeText).toHaveBeenCalledWith(
+      JSON.stringify({ from: defaultTimeRange.raw.from, to: defaultTimeRange.raw.to })
+    );
+  });
+
+  it('should paste time range from clipboard', async () => {
+    const { getByTestId, getByLabelText } = setup();
+
+    mockClipboard.readText.mockResolvedValue(JSON.stringify(customRawTimeRange));
+
+    await userEvent.click(getByTestId('data-testid TimePicker paste button'));
+
+    expect(getByLabelText('From')).toHaveValue(customRawTimeRange.from);
+    expect(getByLabelText('To')).toHaveValue(customRawTimeRange.to);
+  });
+
   describe('dates error handling', () => {
     it('should show error on invalid dates', () => {
       const invalidTimeRange: TimeRange = {
diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeContent.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeContent.tsx
index a91d10282ae78..d5a53aa10f30c 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeContent.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeContent.tsx
@@ -1,5 +1,5 @@
 import { css } from '@emotion/css';
-import React, { FormEvent, useCallback, useEffect, useState } from 'react';
+import React, { FormEvent, useCallback, useEffect, useId, useState } from 'react';
 
 import {
   DateTime,
@@ -33,6 +33,7 @@ interface Props {
   fiscalYearStartMonth?: number;
   roundup?: boolean;
   isReversed?: boolean;
+  onError?: (error?: string) => void;
 }
 
 interface InputState {
@@ -47,7 +48,15 @@ const ERROR_MESSAGES = {
 };
 
 export const TimeRangeContent = (props: Props) => {
-  const { value, isFullscreen = false, timeZone, onApply: onApplyFromProps, isReversed, fiscalYearStartMonth } = props;
+  const {
+    value,
+    isFullscreen = false,
+    timeZone,
+    onApply: onApplyFromProps,
+    isReversed,
+    fiscalYearStartMonth,
+    onError,
+  } = props;
   const [fromValue, toValue] = valueToState(value.raw.from, value.raw.to, timeZone);
   const style = useStyles2(getStyles);
 
@@ -55,6 +64,9 @@ export const TimeRangeContent = (props: Props) => {
   const [to, setTo] = useState<InputState>(toValue);
   const [isOpen, setOpen] = useState(false);
 
+  const fromFieldId = useId();
+  const toFieldId = useId();
+
   // Synchronize internal state with external value
   useEffect(() => {
     const [fromValue, toValue] = valueToState(value.raw.from, value.raw.to, timeZone);
@@ -96,6 +108,29 @@ export const TimeRangeContent = (props: Props) => {
     }
   };
 
+  const onCopy = () => {
+    const raw: RawTimeRange = { from: from.value, to: to.value };
+    navigator.clipboard.writeText(JSON.stringify(raw));
+  };
+
+  const onPaste = async () => {
+    const raw = await navigator.clipboard.readText();
+    let range;
+
+    try {
+      range = JSON.parse(raw);
+    } catch (error) {
+      if (onError) {
+        onError(raw);
+      }
+      return;
+    }
+
+    const [fromValue, toValue] = valueToState(range.from, range.to, timeZone);
+    setFrom(fromValue);
+    setTo(toValue);
+  };
+
   const fiscalYear = rangeUtil.convertRawToRange({ from: 'now/fy', to: 'now/fy' }, timeZone, fiscalYearStartMonth);
   const fiscalYearMessage = t('time-picker.range-content.fiscal-year', 'Fiscal year');
 
@@ -113,7 +148,8 @@ export const TimeRangeContent = (props: Props) => {
 
   const icon = (
     <Button
-      aria-label={selectors.components.TimePicker.calendar.openButton}
+      aria-label={t('time-picker.range-content.open-input-calendar', 'Open calendar')}
+      data-testid={selectors.components.TimePicker.calendar.openButton}
       icon="calendar-alt"
       variant="secondary"
       type="button"
@@ -130,11 +166,12 @@ export const TimeRangeContent = (props: Props) => {
           error={from.errorMessage}
         >
           <Input
+            id={fromFieldId}
             onClick={(event) => event.stopPropagation()}
             onChange={(event) => onChange(event.currentTarget.value, to.value)}
             addonAfter={icon}
             onKeyDown={submitOnEnter}
-            aria-label={selectors.components.TimePicker.fromField}
+            data-testid={selectors.components.TimePicker.fromField}
             value={from.value}
           />
         </Field>
@@ -143,19 +180,38 @@ export const TimeRangeContent = (props: Props) => {
       <div className={style.fieldContainer}>
         <Field label={t('time-picker.range-content.to-input', 'To')} invalid={to.invalid} error={to.errorMessage}>
           <Input
+            id={toFieldId}
             onClick={(event) => event.stopPropagation()}
             onChange={(event) => onChange(from.value, event.currentTarget.value)}
             addonAfter={icon}
             onKeyDown={submitOnEnter}
-            aria-label={selectors.components.TimePicker.toField}
+            data-testid={selectors.components.TimePicker.toField}
             value={to.value}
           />
         </Field>
         {fyTooltip}
       </div>
-      <Button data-testid={selectors.components.TimePicker.applyTimeRange} type="button" onClick={onApply}>
-        <Trans i18nKey="time-picker.range-content.apply-button">Apply time range</Trans>
-      </Button>
+      <div className={style.buttonsContainer}>
+        <Button
+          data-testid={selectors.components.TimePicker.copyTimeRange}
+          icon="copy"
+          variant="secondary"
+          tooltip={t('time-picker.copy-paste.tooltip-copy', 'Copy time range to clipboard')}
+          type="button"
+          onClick={onCopy}
+        />
+        <Button
+          data-testid={selectors.components.TimePicker.pasteTimeRange}
+          icon="clipboard-alt"
+          variant="secondary"
+          tooltip={t('time-picker.copy-paste.tooltip-paste', 'Paste time range')}
+          type="button"
+          onClick={onPaste}
+        />
+        <Button data-testid={selectors.components.TimePicker.applyTimeRange} type="button" onClick={onApply}>
+          <Trans i18nKey="time-picker.range-content.apply-button">Apply time range</Trans>
+        </Button>
+      </div>
 
       <TimePickerCalendar
         isFullscreen={isFullscreen}
@@ -214,6 +270,11 @@ function getStyles(theme: GrafanaTheme2) {
     fieldContainer: css({
       display: 'flex',
     }),
+    buttonsContainer: css({
+      display: 'flex',
+      gap: theme.spacing(0.5),
+      marginTop: theme.spacing(1),
+    }),
     tooltip: css({
       paddingLeft: theme.spacing(1),
       paddingTop: theme.spacing(3),
diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeList.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeList.tsx
index ea834651bffb6..0833e0990461e 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeList.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeList.tsx
@@ -3,32 +3,12 @@ import React, { ReactNode } from 'react';
 
 import { TimeOption } from '@grafana/data';
 
-import { stylesFactory } from '../../../themes';
+import { useStyles2 } from '../../../themes';
 import { t } from '../../../utils/i18n';
 
 import { TimePickerTitle } from './TimePickerTitle';
 import { TimeRangeOption } from './TimeRangeOption';
 
-const getStyles = stylesFactory(() => {
-  return {
-    title: css({
-      display: 'flex',
-      alignItems: 'center',
-      justifyContent: 'space-between',
-      padding: '8px 16px 5px 9px',
-    }),
-  };
-});
-
-const getOptionsStyles = stylesFactory(() => {
-  return {
-    grow: css({
-      flexGrow: 1,
-      alignItems: 'flex-start',
-    }),
-  };
-});
-
 interface Props {
   title?: string;
   options: TimeOption[];
@@ -38,7 +18,7 @@ interface Props {
 }
 
 export const TimeRangeList = (props: Props) => {
-  const styles = getStyles();
+  const styles = useStyles2(getStyles);
   const { title, options, placeholderEmpty } = props;
 
   if (typeof placeholderEmpty !== 'undefined' && options.length <= 0) {
@@ -62,7 +42,7 @@ export const TimeRangeList = (props: Props) => {
 };
 
 const Options = ({ options, value, onChange, title }: Props) => {
-  const styles = getOptionsStyles();
+  const styles = useStyles2(getOptionsStyles);
 
   return (
     <>
@@ -92,3 +72,19 @@ function isEqual(x: TimeOption, y?: TimeOption): boolean {
   }
   return y.from === x.from && y.to === x.to;
 }
+
+const getStyles = () => ({
+  title: css({
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    padding: '8px 16px 5px 9px',
+  }),
+});
+
+const getOptionsStyles = () => ({
+  grow: css({
+    flexGrow: 1,
+    alignItems: 'flex-start',
+  }),
+});
diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeZonePicker/TimeZoneOffset.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeZonePicker/TimeZoneOffset.tsx
index 0c1ca7fbb7d36..e9e269d2c15ec 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeZonePicker/TimeZoneOffset.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeZonePicker/TimeZoneOffset.tsx
@@ -33,9 +33,6 @@ export const formatUtcOffset = (timestamp: number, timeZone: TimeZone): string =
     format: 'Z',
   });
 
-  if (offset === '+00:00') {
-    return 'UTC';
-  }
   return `UTC${offset}`;
 };
 
diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeZonePicker/TimeZoneOption.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeZonePicker/TimeZoneOption.tsx
index d48fbcf964b88..0db448f3606ce 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeZonePicker/TimeZoneOption.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeZonePicker/TimeZoneOption.tsx
@@ -4,8 +4,7 @@ import React, { PropsWithChildren, RefCallback } from 'react';
 
 import { GrafanaTheme2, SelectableValue, getTimeZoneInfo } from '@grafana/data';
 
-import { useTheme2 } from '../../../themes/ThemeContext';
-import { stylesFactory } from '../../../themes/stylesFactory';
+import { useStyles2 } from '../../../themes';
 import { Icon } from '../../Icon/Icon';
 
 import { TimeZoneDescription } from './TimeZoneDescription';
@@ -28,8 +27,7 @@ export interface SelectableZone extends SelectableValue<string> {
 
 export const WideTimeZoneOption = (props: PropsWithChildren<Props>) => {
   const { children, innerProps, innerRef, data, isSelected, isFocused } = props;
-  const theme = useTheme2();
-  const styles = getStyles(theme);
+  const styles = useStyles2(getStyles);
   const timestamp = Date.now();
   const containerStyles = cx(styles.container, isFocused && styles.containerFocused);
 
@@ -68,8 +66,7 @@ export const WideTimeZoneOption = (props: PropsWithChildren<Props>) => {
 
 export const CompactTimeZoneOption = (props: React.PropsWithChildren<Props>) => {
   const { children, innerProps, innerRef, data, isSelected, isFocused } = props;
-  const theme = useTheme2();
-  const styles = getStyles(theme);
+  const styles = useStyles2(getStyles);
   const timestamp = Date.now();
   const containerStyles = cx(styles.container, isFocused && styles.containerFocused);
 
@@ -113,49 +110,47 @@ export const CompactTimeZoneOption = (props: React.PropsWithChildren<Props>) =>
   );
 };
 
-const getStyles = stylesFactory((theme: GrafanaTheme2) => {
-  return {
-    container: css({
-      display: 'flex',
-      alignItems: 'center',
-      flexDirection: 'row',
-      flexShrink: 0,
-      whiteSpace: 'nowrap',
-      cursor: 'pointer',
-      padding: '6px 8px 4px',
-
-      '&:hover': {
-        background: theme.colors.action.hover,
-      },
-    }),
-    containerFocused: css({
+const getStyles = (theme: GrafanaTheme2) => ({
+  container: css({
+    display: 'flex',
+    alignItems: 'center',
+    flexDirection: 'row',
+    flexShrink: 0,
+    whiteSpace: 'nowrap',
+    cursor: 'pointer',
+    padding: '6px 8px 4px',
+
+    '&:hover': {
       background: theme.colors.action.hover,
-    }),
-    body: css({
-      display: 'flex',
-      fontWeight: theme.typography.fontWeightMedium,
-      flexDirection: 'column',
-      flexGrow: 1,
-    }),
-    row: css({
-      display: 'flex',
-      flexDirection: 'row',
-    }),
-    leftColumn: css({
-      flexGrow: 1,
-      textOverflow: 'ellipsis',
-    }),
-    rightColumn: css({
-      justifyContent: 'flex-end',
-      alignItems: 'center',
-    }),
-    wideRow: css({
-      display: 'flex',
-      flexDirection: 'row',
-      alignItems: 'baseline',
-    }),
-    spacer: css({
-      marginLeft: '6px',
-    }),
-  };
+    },
+  }),
+  containerFocused: css({
+    background: theme.colors.action.hover,
+  }),
+  body: css({
+    display: 'flex',
+    fontWeight: theme.typography.fontWeightMedium,
+    flexDirection: 'column',
+    flexGrow: 1,
+  }),
+  row: css({
+    display: 'flex',
+    flexDirection: 'row',
+  }),
+  leftColumn: css({
+    flexGrow: 1,
+    textOverflow: 'ellipsis',
+  }),
+  rightColumn: css({
+    justifyContent: 'flex-end',
+    alignItems: 'center',
+  }),
+  wideRow: css({
+    display: 'flex',
+    flexDirection: 'row',
+    alignItems: 'baseline',
+  }),
+  spacer: css({
+    marginLeft: '6px',
+  }),
 });
diff --git a/packages/grafana-ui/src/components/DateTimePickers/options.ts b/packages/grafana-ui/src/components/DateTimePickers/options.ts
index c5f7926d98c00..7b27fefcf94ea 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/options.ts
+++ b/packages/grafana-ui/src/components/DateTimePickers/options.ts
@@ -1,32 +1,20 @@
 import { SelectableValue, TimeOption } from '@grafana/data';
 
+// Psiphon change - limit time range options.
+// Remove now - 5m, 15m, 30m, 1h, 3h, 6h, 12h, 24h, 90d, 5y, 2d/d, 7d/d, and now/d, now/d
 export const quickOptions: TimeOption[] = [
-  { from: 'now-5m', to: 'now', display: 'Last 5 minutes' },
-  { from: 'now-15m', to: 'now', display: 'Last 15 minutes' },
-  { from: 'now-30m', to: 'now', display: 'Last 30 minutes' },
-  { from: 'now-1h', to: 'now', display: 'Last 1 hour' },
-  { from: 'now-3h', to: 'now', display: 'Last 3 hours' },
-  { from: 'now-6h', to: 'now', display: 'Last 6 hours' },
-  { from: 'now-12h', to: 'now', display: 'Last 12 hours' },
-  { from: 'now-24h', to: 'now', display: 'Last 24 hours' },
   { from: 'now-2d', to: 'now', display: 'Last 2 days' },
   { from: 'now-7d', to: 'now', display: 'Last 7 days' },
   { from: 'now-30d', to: 'now', display: 'Last 30 days' },
-  { from: 'now-90d', to: 'now', display: 'Last 90 days' },
   { from: 'now-6M', to: 'now', display: 'Last 6 months' },
   { from: 'now-1y', to: 'now', display: 'Last 1 year' },
   { from: 'now-2y', to: 'now', display: 'Last 2 years' },
-  { from: 'now-5y', to: 'now', display: 'Last 5 years' },
   { from: 'now-1d/d', to: 'now-1d/d', display: 'Yesterday' },
-  { from: 'now-2d/d', to: 'now-2d/d', display: 'Day before yesterday' },
-  { from: 'now-7d/d', to: 'now-7d/d', display: 'This day last week' },
   { from: 'now-1w/w', to: 'now-1w/w', display: 'Previous week' },
   { from: 'now-1M/M', to: 'now-1M/M', display: 'Previous month' },
   { from: 'now-1Q/fQ', to: 'now-1Q/fQ', display: 'Previous fiscal quarter' },
   { from: 'now-1y/y', to: 'now-1y/y', display: 'Previous year' },
   { from: 'now-1y/fy', to: 'now-1y/fy', display: 'Previous fiscal year' },
-  { from: 'now/d', to: 'now/d', display: 'Today' },
-  { from: 'now/d', to: 'now', display: 'Today so far' },
   { from: 'now/w', to: 'now/w', display: 'This week' },
   { from: 'now/w', to: 'now', display: 'This week so far' },
   { from: 'now/M', to: 'now/M', display: 'This month' },
diff --git a/packages/grafana-ui/src/components/DateTimePickers/utils/adjustDateForReactCalendar.ts b/packages/grafana-ui/src/components/DateTimePickers/utils/adjustDateForReactCalendar.ts
new file mode 100644
index 0000000000000..b8f0f2e5f3c42
--- /dev/null
+++ b/packages/grafana-ui/src/components/DateTimePickers/utils/adjustDateForReactCalendar.ts
@@ -0,0 +1,28 @@
+import { getZone } from '@grafana/data';
+
+/**
+ * React calendar doesn't support showing dates in other time zones, so attempting to show
+ * values near midnight in another time zone than your browsers may end up showing the wrong date
+ *
+ * This function adjusts a date by "moving" the time to appear as if it's local.
+ * e.g. make 5 PM New York "look like" 5 PM in the user's local browser time.
+ * See also https://github.com/wojtekmaj/react-calendar/issues/511#issuecomment-835333976
+ */
+export function adjustDateForReactCalendar(date: Date, timeZone: string): Date {
+  const zone = getZone(timeZone);
+  if (!zone) {
+    return date;
+  }
+
+  // get utc offset for timezone preference
+  const timezonePrefOffset = zone.utcOffset(date.getTime());
+
+  // get utc offset for local timezone
+  const localOffset = date.getTimezoneOffset();
+
+  // calculate difference between timezone preference and local timezone
+  const diff = timezonePrefOffset - localOffset;
+
+  const newDate = new Date(date.getTime() - diff * 1000 * 60);
+  return newDate;
+}
diff --git a/packages/grafana-ui/src/components/DragHandle/DragHandle.tsx b/packages/grafana-ui/src/components/DragHandle/DragHandle.tsx
new file mode 100644
index 0000000000000..1c48a33992a05
--- /dev/null
+++ b/packages/grafana-ui/src/components/DragHandle/DragHandle.tsx
@@ -0,0 +1,105 @@
+import { css, cx } from '@emotion/css';
+
+import { GrafanaTheme2 } from '@grafana/data';
+
+export type DragHandlePosition = 'middle' | 'start' | 'end';
+
+export const getDragStyles = (theme: GrafanaTheme2, handlePosition?: DragHandlePosition) => {
+  const position = handlePosition || 'middle';
+  const baseColor = theme.colors.emphasize(theme.colors.background.secondary, 0.15);
+  const hoverColor = theme.colors.primary.border;
+  const clickTargetSize = theme.spacing(2);
+  const handlebarThickness = 4;
+  const handlebarWidth = 200;
+  let verticalOffset = '50%';
+  let horizontalOffset = '50%';
+
+  switch (position) {
+    case 'start': {
+      verticalOffset = '0%';
+      horizontalOffset = '0%';
+      break;
+    }
+    case 'end': {
+      verticalOffset = '100%';
+      horizontalOffset = '100%';
+      break;
+    }
+  }
+
+  const dragHandleBase = css({
+    position: 'relative',
+
+    '&:before': {
+      content: '""',
+      position: 'absolute',
+      transition: theme.transitions.create('border-color'),
+      zIndex: 1,
+    },
+
+    '&:after': {
+      background: baseColor,
+      content: '""',
+      position: 'absolute',
+      transition: theme.transitions.create('background'),
+      transform: 'translate(-50%, -50%)',
+      borderRadius: theme.shape.radius.pill,
+      zIndex: 1,
+    },
+
+    '&:hover': {
+      '&:before': {
+        borderColor: hoverColor,
+      },
+
+      '&:after': {
+        background: hoverColor,
+      },
+    },
+  });
+
+  return {
+    dragHandleVertical: cx(
+      dragHandleBase,
+      css({
+        cursor: 'col-resize',
+        width: clickTargetSize,
+
+        '&:before': {
+          borderRight: '1px solid transparent',
+          height: '100%',
+          left: verticalOffset,
+          transform: 'translateX(-50%)',
+        },
+
+        '&:after': {
+          left: verticalOffset,
+          top: '50%',
+          height: handlebarWidth,
+          width: handlebarThickness,
+        },
+      })
+    ),
+    dragHandleHorizontal: cx(
+      dragHandleBase,
+      css({
+        height: clickTargetSize,
+        cursor: 'row-resize',
+
+        '&:before': {
+          borderTop: '1px solid transparent',
+          top: horizontalOffset,
+          transform: 'translateY(-50%)',
+          width: '100%',
+        },
+
+        '&:after': {
+          left: '50%',
+          top: horizontalOffset,
+          height: handlebarThickness,
+          width: handlebarWidth,
+        },
+      })
+    ),
+  };
+};
diff --git a/packages/grafana-ui/src/components/Drawer/Drawer.tsx b/packages/grafana-ui/src/components/Drawer/Drawer.tsx
index 6359ea814ad08..3459c21ba599e 100644
--- a/packages/grafana-ui/src/components/Drawer/Drawer.tsx
+++ b/packages/grafana-ui/src/components/Drawer/Drawer.tsx
@@ -3,14 +3,16 @@ import { useDialog } from '@react-aria/dialog';
 import { FocusScope } from '@react-aria/focus';
 import { useOverlay } from '@react-aria/overlays';
 import RcDrawer from 'rc-drawer';
-import React, { ReactNode, useEffect } from 'react';
+import React, { ReactNode, useCallback, useEffect, useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 
 import { useStyles2 } from '../../themes';
-import { Button } from '../Button';
+import { t } from '../../utils/i18n';
 import { CustomScrollbar } from '../CustomScrollbar/CustomScrollbar';
+import { getDragStyles } from '../DragHandle/DragHandle';
+import { IconButton } from '../IconButton/IconButton';
 import { Text } from '../Text/Text';
 
 export interface Props {
@@ -60,7 +62,12 @@ export function Drawer({
   size = 'md',
   tabs,
 }: Props) {
+  const [drawerWidth, onMouseDown, onTouchStart] = useResizebleDrawer();
+
   const styles = useStyles2(getStyles);
+  const sizeStyles = useStyles2(getSizeStyles, size, drawerWidth ?? width);
+  const dragStyles = useStyles2(getDragStyles);
+
   const overlayRef = React.useRef(null);
   const { dialogProps, titleProps } = useDialog({}, overlayRef);
   const { overlayProps } = useOverlay(
@@ -75,8 +82,7 @@ export function Drawer({
   // Adds body class while open so the toolbar nav can hide some actions while drawer is open
   useBodyClassWhileOpen();
 
-  // Apply size styles (unless deprecated width prop is used)
-  const rootClass = cx(styles.drawer, !width && styles.sizes[size]);
+  const rootClass = cx(styles.drawer, sizeStyles);
   const content = <div className={styles.content}>{children}</div>;
 
   return (
@@ -84,11 +90,10 @@ export function Drawer({
       open={true}
       onClose={onClose}
       placement="right"
-      // Important to set this to empty string so that the width can be controlled by the css
-      width={width ?? ''}
       getContainer={'.main-view'}
       className={styles.drawerContent}
       rootClassName={rootClass}
+      width={''}
       motion={{
         motionAppear: true,
         motionName: styles.drawerMotion,
@@ -112,22 +117,32 @@ export function Drawer({
           {...dialogProps}
           ref={overlayRef}
         >
+          {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
+          <div
+            className={cx(dragStyles.dragHandleVertical, styles.resizer)}
+            onMouseDown={onMouseDown}
+            onTouchStart={onTouchStart}
+          />
           {typeof title === 'string' && (
             <div className={cx(styles.header, Boolean(tabs) && styles.headerWithTabs)}>
               <div className={styles.actions}>
-                <Button
-                  icon="times"
+                <IconButton
+                  name="times"
                   variant="secondary"
-                  fill="text"
                   onClick={onClose}
-                  aria-label={selectors.components.Drawer.General.close}
+                  data-testid={selectors.components.Drawer.General.close}
+                  tooltip={t(`grafana-ui.drawer.close`, 'Close')}
                 />
               </div>
               <div className={styles.titleWrapper}>
                 <Text element="h3" {...titleProps}>
                   {title}
                 </Text>
-                {subtitle && <div className={styles.subtitle}>{subtitle}</div>}
+                {subtitle && (
+                  <div className={styles.subtitle} data-testid={selectors.components.Drawer.General.subtitle}>
+                    {subtitle}
+                  </div>
+                )}
                 {tabs && <div className={styles.tabsWrapper}>{tabs}</div>}
               </div>
             </div>
@@ -140,6 +155,63 @@ export function Drawer({
   );
 }
 
+function useResizebleDrawer(): [
+  string | undefined,
+  React.EventHandler<React.MouseEvent>,
+  React.EventHandler<React.TouchEvent>,
+] {
+  const [drawerWidth, setDrawerWidth] = useState<string | undefined>(undefined);
+
+  const onMouseMove = useCallback((e: MouseEvent) => {
+    setDrawerWidth(getCustomDrawerWidth(e.clientX));
+  }, []);
+
+  const onTouchMove = useCallback((e: TouchEvent) => {
+    const touch = e.touches[0];
+    setDrawerWidth(getCustomDrawerWidth(touch.clientX));
+  }, []);
+
+  const onMouseUp = useCallback(
+    (e: MouseEvent) => {
+      document.removeEventListener('mousemove', onMouseMove);
+      document.removeEventListener('mouseup', onMouseUp);
+    },
+    [onMouseMove]
+  );
+
+  const onTouchEnd = useCallback(
+    (e: TouchEvent) => {
+      document.removeEventListener('touchmove', onTouchMove);
+      document.removeEventListener('touchend', onTouchEnd);
+    },
+    [onTouchMove]
+  );
+
+  function onMouseDown(e: React.MouseEvent<HTMLDivElement>) {
+    e.stopPropagation();
+    e.preventDefault();
+    // we will only add listeners when needed, and remove them afterward
+    document.addEventListener('mousemove', onMouseMove);
+    document.addEventListener('mouseup', onMouseUp);
+  }
+
+  function onTouchStart(e: React.TouchEvent<HTMLDivElement>) {
+    e.stopPropagation();
+    e.preventDefault();
+    // we will only add listeners when needed, and remove them afterward
+    document.addEventListener('touchmove', onTouchMove);
+    document.addEventListener('touchend', onTouchEnd);
+  }
+
+  return [drawerWidth, onMouseDown, onTouchStart];
+}
+
+function getCustomDrawerWidth(clientX: number) {
+  let offsetRight = document.body.offsetWidth - (clientX - document.body.offsetLeft);
+  let widthPercent = Math.min((offsetRight / document.body.clientWidth) * 100, 98).toFixed(2);
+  return `${widthPercent}vw`;
+}
+
 function useBodyClassWhileOpen() {
   useEffect(() => {
     if (!document.body) {
@@ -162,14 +234,15 @@ const getStyles = (theme: GrafanaTheme2) => {
       height: '100%',
       flex: '1 1 0',
       minHeight: '100%',
+      position: 'relative',
     }),
     drawer: css({
       '.main-view &': {
-        top: 81,
+        top: 80,
       },
 
       '.main-view--search-bar-hidden &': {
-        top: 41,
+        top: 40,
       },
 
       '.main-view--chrome-hidden &': {
@@ -178,47 +251,13 @@ const getStyles = (theme: GrafanaTheme2) => {
 
       '.rc-drawer-content-wrapper': {
         boxShadow: theme.shadows.z3,
-
-        [theme.breakpoints.down('sm')]: {
-          width: `calc(100% - ${theme.spacing(2)}) !important`,
-          minWidth: '0 !important',
-        },
       },
     }),
-    sizes: {
-      sm: css({
-        '.rc-drawer-content-wrapper': {
-          label: 'drawer-sm',
-          width: '25vw',
-          minWidth: theme.spacing(48),
-        },
-      }),
-      md: css({
-        '.rc-drawer-content-wrapper': {
-          label: 'drawer-md',
-          width: '50vw',
-          minWidth: theme.spacing(60),
-        },
-      }),
-      lg: css({
-        '.rc-drawer-content-wrapper': {
-          label: 'drawer-lg',
-          width: '75vw',
-          minWidth: theme.spacing(93),
-
-          [theme.breakpoints.down('md')]: {
-            width: `calc(100% - ${theme.spacing(2)}) !important`,
-            minWidth: 0,
-          },
-        },
-      }),
-    },
     drawerContent: css({
       backgroundColor: `${theme.colors.background.primary} !important`,
       display: 'flex',
+      overflow: 'unset',
       flexDirection: 'column',
-      overflow: 'hidden',
-      zIndex: theme.zIndex.dropdown,
     }),
     drawerMotion: css({
       '&-appear': {
@@ -249,11 +288,11 @@ const getStyles = (theme: GrafanaTheme2) => {
         right: 0,
 
         '.main-view &': {
-          top: 81,
+          top: 80,
         },
 
         '.main-view--search-bar-hidden &': {
-          top: 41,
+          top: 40,
         },
 
         '.main-view--chrome-hidden &': {
@@ -304,5 +343,37 @@ const getStyles = (theme: GrafanaTheme2) => {
       paddingLeft: theme.spacing(2),
       margin: theme.spacing(1, -1, -3, -3),
     }),
+    resizer: css({
+      top: 0,
+      left: theme.spacing(-1),
+      bottom: 0,
+      position: 'absolute',
+      zIndex: theme.zIndex.modal,
+    }),
   };
 };
+
+const drawerSizes = {
+  sm: { width: '25vw', minWidth: 384 },
+  md: { width: '50vw', minWidth: 568 },
+  lg: { width: '75vw', minWidth: 744 },
+};
+
+function getSizeStyles(theme: GrafanaTheme2, size: 'sm' | 'md' | 'lg', overrideWidth: number | string | undefined) {
+  let width = overrideWidth ?? drawerSizes[size].width;
+  let minWidth = drawerSizes[size].minWidth;
+
+  return css({
+    '.rc-drawer-content-wrapper': {
+      label: `drawer-content-wrapper-${size}`,
+      width: width,
+      minWidth: minWidth,
+      overflow: 'unset',
+
+      [theme.breakpoints.down('md')]: {
+        width: `calc(100% - ${theme.spacing(2)}) !important`,
+        minWidth: 0,
+      },
+    },
+  });
+}
diff --git a/packages/grafana-ui/src/components/Dropdown/ButtonSelect.internal.story.tsx b/packages/grafana-ui/src/components/Dropdown/ButtonSelect.internal.story.tsx
index b6f6dc9284b79..ba562bda8c571 100644
--- a/packages/grafana-ui/src/components/Dropdown/ButtonSelect.internal.story.tsx
+++ b/packages/grafana-ui/src/components/Dropdown/ButtonSelect.internal.story.tsx
@@ -27,6 +27,7 @@ export const Basic: StoryFn<typeof ButtonSelect> = (args) => {
   return (
     <div style={{ marginLeft: '100px', position: 'relative', display: 'inline-block' }}>
       <ButtonSelect
+        variant="canvas"
         {...args}
         onChange={(value) => {
           action('onChange fired')(value);
diff --git a/packages/grafana-ui/src/components/Dropdown/ButtonSelect.tsx b/packages/grafana-ui/src/components/Dropdown/ButtonSelect.tsx
index 12bc9d9afe963..e6fb86ea88258 100644
--- a/packages/grafana-ui/src/components/Dropdown/ButtonSelect.tsx
+++ b/packages/grafana-ui/src/components/Dropdown/ButtonSelect.tsx
@@ -1,15 +1,20 @@
 import { css } from '@emotion/css';
-import { useButton } from '@react-aria/button';
+import {
+  autoUpdate,
+  flip,
+  offset,
+  shift,
+  useClick,
+  useDismiss,
+  useFloating,
+  useInteractions,
+} from '@floating-ui/react';
 import { FocusScope } from '@react-aria/focus';
-import { useMenuTrigger } from '@react-aria/menu';
-import { useMenuTriggerState } from '@react-stately/menu';
-import React, { HTMLAttributes } from 'react';
+import React, { HTMLAttributes, useState } from 'react';
 
 import { GrafanaTheme2, SelectableValue } from '@grafana/data';
 
 import { useStyles2 } from '../../themes/ThemeContext';
-import { ButtonGroup } from '../Button';
-import { ClickOutsideWrapper } from '../ClickOutsideWrapper/ClickOutsideWrapper';
 import { Menu } from '../Menu/Menu';
 import { MenuItem } from '../Menu/MenuItem';
 import { ToolbarButton, ToolbarButtonVariant } from '../ToolbarButton';
@@ -34,56 +39,75 @@ export interface Props<T> extends HTMLAttributes<HTMLButtonElement> {
 const ButtonSelectComponent = <T,>(props: Props<T>) => {
   const { className, options, value, onChange, narrow, variant, ...restProps } = props;
   const styles = useStyles2(getStyles);
-  const state = useMenuTriggerState({});
+  const [isOpen, setIsOpen] = useState(false);
 
-  const ref = React.useRef(null);
-  const { menuTriggerProps, menuProps } = useMenuTrigger({}, state, ref);
-  const { buttonProps } = useButton(menuTriggerProps, ref);
+  // the order of middleware is important!
+  const middleware = [
+    offset(0),
+    flip({
+      fallbackAxisSideDirection: 'end',
+      // see https://floating-ui.com/docs/flip#combining-with-shift
+      crossAxis: false,
+      boundary: document.body,
+    }),
+    shift(),
+  ];
+
+  const { context, refs, floatingStyles } = useFloating({
+    open: isOpen,
+    placement: 'bottom-end',
+    onOpenChange: setIsOpen,
+    middleware,
+    whileElementsMounted: autoUpdate,
+  });
+
+  const click = useClick(context);
+  const dismiss = useDismiss(context);
+
+  const { getReferenceProps, getFloatingProps } = useInteractions([dismiss, click]);
 
   const onChangeInternal = (item: SelectableValue<T>) => {
     onChange(item);
-    state.close();
+    setIsOpen(false);
   };
 
   return (
-    <ButtonGroup className={styles.wrapper}>
+    <div className={styles.wrapper}>
       <ToolbarButton
         className={className}
-        isOpen={state.isOpen}
+        isOpen={isOpen}
         narrow={narrow}
         variant={variant}
-        ref={ref}
-        {...buttonProps}
+        ref={refs.setReference}
+        {...getReferenceProps()}
         {...restProps}
       >
         {value?.label || (value?.value != null ? String(value?.value) : null)}
       </ToolbarButton>
-      {state.isOpen && (
-        <div className={styles.menuWrapper}>
-          <ClickOutsideWrapper onClick={state.close} parent={document} includeButtonPress={false}>
-            <FocusScope contain autoFocus restoreFocus>
-              {/*
-                tabIndex=-1 is needed here to support highlighting text within the menu when using FocusScope
-                see https://github.com/adobe/react-spectrum/issues/1604#issuecomment-781574668
-              */}
-              <Menu tabIndex={-1} onClose={state.close} {...menuProps} autoFocus={!!menuProps.autoFocus}>
-                {options.map((item) => (
-                  <MenuItem
-                    key={`${item.value}`}
-                    label={item.label ?? String(item.value)}
-                    onClick={() => onChangeInternal(item)}
-                    active={item.value === value?.value}
-                    ariaChecked={item.value === value?.value}
-                    ariaLabel={item.ariaLabel || item.label}
-                    role="menuitemradio"
-                  />
-                ))}
-              </Menu>
-            </FocusScope>
-          </ClickOutsideWrapper>
+      {isOpen && (
+        <div className={styles.menuWrapper} ref={refs.setFloating} {...getFloatingProps()} style={floatingStyles}>
+          <FocusScope contain autoFocus restoreFocus>
+            {/*
+              tabIndex=-1 is needed here to support highlighting text within the menu when using FocusScope
+              see https://github.com/adobe/react-spectrum/issues/1604#issuecomment-781574668
+            */}
+            <Menu tabIndex={-1} onClose={() => setIsOpen(false)}>
+              {options.map((item) => (
+                <MenuItem
+                  key={`${item.value}`}
+                  label={item.label ?? String(item.value)}
+                  onClick={() => onChangeInternal(item)}
+                  active={item.value === value?.value}
+                  ariaChecked={item.value === value?.value}
+                  ariaLabel={item.ariaLabel || item.label}
+                  role="menuitemradio"
+                />
+              ))}
+            </Menu>
+          </FocusScope>
         </div>
       )}
-    </ButtonGroup>
+    </div>
   );
 };
 
@@ -101,10 +125,7 @@ const getStyles = (theme: GrafanaTheme2) => {
       display: 'inline-flex',
     }),
     menuWrapper: css({
-      position: 'absolute',
       zIndex: theme.zIndex.dropdown,
-      top: theme.spacing(4),
-      right: 0,
     }),
   };
 };
diff --git a/packages/grafana-ui/src/components/Dropdown/Dropdown.tsx b/packages/grafana-ui/src/components/Dropdown/Dropdown.tsx
index 3db8ed9c69f18..e1bc28cab9b9a 100644
--- a/packages/grafana-ui/src/components/Dropdown/Dropdown.tsx
+++ b/packages/grafana-ui/src/components/Dropdown/Dropdown.tsx
@@ -1,10 +1,20 @@
 import { css } from '@emotion/css';
-import { FocusScope } from '@react-aria/focus';
+import {
+  FloatingFocusManager,
+  autoUpdate,
+  flip,
+  offset as floatingUIOffset,
+  shift,
+  useClick,
+  useDismiss,
+  useFloating,
+  useInteractions,
+} from '@floating-ui/react';
 import React, { useEffect, useRef, useState } from 'react';
-import { usePopperTooltip } from 'react-popper-tooltip';
 import { CSSTransition } from 'react-transition-group';
 
 import { ReactUtils } from '../../utils';
+import { getPlacement } from '../../utils/tooltipUtils';
 import { Portal } from '../Portal/Portal';
 import { TooltipPlacement } from '../Tooltip/types';
 
@@ -25,17 +35,33 @@ export const Dropdown = React.memo(({ children, overlay, placement, offset, onVi
     onVisibleChange?.(show);
   }, [onVisibleChange, show]);
 
-  const { getArrowProps, getTooltipProps, setTooltipRef, setTriggerRef, visible } = usePopperTooltip({
-    visible: show,
-    placement: placement,
-    onVisibleChange: setShow,
-    interactive: true,
-    delayHide: 0,
-    delayShow: 0,
-    offset: offset ?? [0, 8],
-    trigger: ['click'],
+  // the order of middleware is important!
+  const middleware = [
+    floatingUIOffset({
+      mainAxis: offset?.[0] ?? 8,
+      crossAxis: offset?.[1] ?? 0,
+    }),
+    flip({
+      fallbackAxisSideDirection: 'end',
+      // see https://floating-ui.com/docs/flip#combining-with-shift
+      crossAxis: false,
+      boundary: document.body,
+    }),
+    shift(),
+  ];
+
+  const { context, refs, floatingStyles } = useFloating({
+    open: show,
+    placement: getPlacement(placement),
+    onOpenChange: setShow,
+    middleware,
+    whileElementsMounted: autoUpdate,
   });
 
+  const click = useClick(context);
+  const dismiss = useDismiss(context);
+  const { getReferenceProps, getFloatingProps } = useInteractions([dismiss, click]);
+
   const animationDuration = 150;
   const animationStyles = getStyles(animationDuration);
 
@@ -44,7 +70,7 @@ export const Dropdown = React.memo(({ children, overlay, placement, offset, onVi
   };
 
   const handleKeys = (event: React.KeyboardEvent) => {
-    if (event.key === 'Escape' || event.key === 'Tab') {
+    if (event.key === 'Tab') {
       setShow(false);
     }
   };
@@ -52,18 +78,18 @@ export const Dropdown = React.memo(({ children, overlay, placement, offset, onVi
   return (
     <>
       {React.cloneElement(children, {
-        ref: setTriggerRef,
+        ref: refs.setReference,
+        ...getReferenceProps(),
       })}
-      {visible && (
+      {show && (
         <Portal>
-          <FocusScope autoFocus restoreFocus contain>
+          <FloatingFocusManager context={context}>
             {/*
               this is handling bubbled events from the inner overlay
               see https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/main/docs/rules/no-static-element-interactions.md#case-the-event-handler-is-only-being-used-to-capture-bubbled-events
             */}
             {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions, jsx-a11y/click-events-have-key-events */}
-            <div ref={setTooltipRef} {...getTooltipProps()} onClick={onOverlayClicked} onKeyDown={handleKeys}>
-              <div {...getArrowProps({ className: 'tooltip-arrow' })} />
+            <div ref={refs.setFloating} style={floatingStyles} onClick={onOverlayClicked} onKeyDown={handleKeys}>
               <CSSTransition
                 nodeRef={transitionRef}
                 appear={true}
@@ -71,10 +97,10 @@ export const Dropdown = React.memo(({ children, overlay, placement, offset, onVi
                 timeout={{ appear: animationDuration, exit: 0, enter: 0 }}
                 classNames={animationStyles}
               >
-                <div ref={transitionRef}>{ReactUtils.renderOrCallToRender(overlay, {})}</div>
+                <div ref={transitionRef}>{ReactUtils.renderOrCallToRender(overlay, { ...getFloatingProps() })}</div>
               </CSSTransition>
             </div>
-          </FocusScope>
+          </FloatingFocusManager>
         </Portal>
       )}
     </>
diff --git a/packages/grafana-ui/src/components/EmptyState/EmptyState.mdx b/packages/grafana-ui/src/components/EmptyState/EmptyState.mdx
new file mode 100644
index 0000000000000..1851d7c91c21a
--- /dev/null
+++ b/packages/grafana-ui/src/components/EmptyState/EmptyState.mdx
@@ -0,0 +1,106 @@
+import { ArgTypes } from '@storybook/blocks';
+import { EmptyState } from './EmptyState';
+
+# EmptyState
+
+The EmptyState component consists of a message and optionally an image, button, and additional information.
+
+## When to use
+
+Use an empty state to communicate to the user that there is no data to display and provide instructions for what to do next.
+Example use cases:
+
+- When a user has not created a particular resource yet
+- When a filter or search query returns no results
+- When a user completes all actions, such as clearing their inbox or notifications
+
+There are different variants to handle the most common empty state use cases. These variants provide a specific default message and image.
+
+## Usage
+
+### `variant="call-to-action"`
+
+Use when there is no data to display and you want to encourage the user to take an action. Usually either to complete some initial configuration, or to create an item.
+
+```jsx
+import { EmptyState, LinkButton, TextLink } from '@grafana/ui';
+
+<EmptyState
+  variant="call-to-action"
+  message="You haven't created any playlists yet"
+  button={
+    <LinkButton icon="plus" href="playlists/new" size="lg">
+      Create playlist
+    </LinkButton>
+  }
+>
+  You can use playlists to cycle dashboards on TVs without user control.{' '}
+  <TextLink external href="<externalDocsLink>">
+    Learn more.
+  </TextLink>
+</EmptyState>;
+```
+
+For scenarios where there is no single button that can be clicked to create the item, you can omit the `button` prop. Instead, provide additional information to help the user understand how to create the specific resource.
+
+```jsx
+import { EmptyState, TextLink } from '@grafana/ui';
+
+<EmptyState variant="call-to-action" message="You haven't created any library panels yet">
+  Create a library panel from any existing dashboard panel through the panel context menu.{' '}
+  <TextLink external href="<externalDocsLink>">
+    Learn more.
+  </TextLink>
+</EmptyState>;
+```
+
+### `variant="not-found"`
+
+Use in place of content when a search query or filter returns no results.
+
+There are sensible defaults for the image, so in most cases all you need to provide is a message.
+
+```jsx
+import { EmptyState } from '@grafana/ui';
+
+<EmptyState variant="not-found" message="No playlists found" />;
+```
+
+### `variant="completed"`
+
+For when a user has completed all tasks on a page, such as reading all their notifications.
+
+```jsx
+import { EmptyState } from '@grafana/ui';
+
+<EmptyState variant="completed" message="You're all caught up" />;
+```
+
+## Customization
+
+For all variants you can:
+
+- provide a custom image or hide the image entirely
+- provide a button (e.g. to provide a call to action or clear the search query)
+- provide additional information via React children
+
+```jsx
+import { Button, EmptyState, TextLink } from '@grafana/ui';
+
+<EmptyState
+  variant="not-found"
+  button={<Button variant="secondary" onClick={clearSearchQuery} />}
+  image={<AnyReactNode />}
+  message="No playlists found"
+  variant="not-found"
+>
+  Optionally provide some additional information here. Maybe even a link to{' '}
+  <TextLink href="<externalDocsLink>" external>
+    documentation.
+  </TextLink>
+</EmptyState>;
+```
+
+## Props
+
+<ArgTypes of={EmptyState} />
diff --git a/packages/grafana-ui/src/components/EmptyState/EmptyState.story.tsx b/packages/grafana-ui/src/components/EmptyState/EmptyState.story.tsx
new file mode 100644
index 0000000000000..9e81d2e234e7b
--- /dev/null
+++ b/packages/grafana-ui/src/components/EmptyState/EmptyState.story.tsx
@@ -0,0 +1,52 @@
+import { Meta, StoryFn } from '@storybook/react';
+import React from 'react';
+
+import { Button } from '../Button';
+
+import { EmptyState } from './EmptyState';
+import mdx from './EmptyState.mdx';
+
+const meta: Meta<typeof EmptyState> = {
+  title: 'General/EmptyState',
+  component: EmptyState,
+  parameters: {
+    docs: {
+      page: mdx,
+    },
+    controls: {
+      exclude: ['image'],
+    },
+  },
+  argTypes: {
+    button: {
+      control: 'select',
+      options: ['None', 'Create', 'Clear filters'],
+    },
+    children: {
+      type: 'string',
+    },
+  },
+};
+
+export const Basic: StoryFn<typeof EmptyState> = (args) => {
+  let button;
+  if (args.button === 'Create') {
+    button = (
+      <Button icon="plus" size="lg">
+        Create dashboard
+      </Button>
+    );
+  } else if (args.button === 'Clear filters') {
+    button = <Button variant="secondary">Clear filters</Button>;
+  }
+  return <EmptyState {...args} button={button} />;
+};
+
+Basic.args = {
+  button: 'Create',
+  children: 'Use this space to add any additional information',
+  message: "You haven't created any dashboards yet",
+  variant: 'call-to-action',
+};
+
+export default meta;
diff --git a/packages/grafana-ui/src/components/EmptyState/EmptyState.tsx b/packages/grafana-ui/src/components/EmptyState/EmptyState.tsx
new file mode 100644
index 0000000000000..28d7f67724e0a
--- /dev/null
+++ b/packages/grafana-ui/src/components/EmptyState/EmptyState.tsx
@@ -0,0 +1,92 @@
+import { css } from '@emotion/css';
+import React, { ReactNode } from 'react';
+import SVG from 'react-inlinesvg';
+
+import { GrafanaTheme2 } from '@grafana/data';
+
+import { useStyles2 } from '../../themes';
+import { Box } from '../Layout/Box/Box';
+import { Stack } from '../Layout/Stack/Stack';
+import { Text } from '../Text/Text';
+
+import { GrotCTA } from './GrotCTA/GrotCTA';
+import { GrotNotFound } from './GrotNotFound/GrotNotFound';
+import GrotCompleted from './grot-completed.svg';
+
+interface Props {
+  /**
+   * Provide a button to render below the message
+   */
+  button?: ReactNode;
+  hideImage?: boolean;
+  /**
+   * Override the default image for the variant
+   */
+  image?: ReactNode;
+  /**
+   * Message to display to the user
+   */
+  message: string;
+  /**
+   * Which variant to use. Affects the default image shown.
+   */
+  variant: 'call-to-action' | 'not-found' | 'completed';
+}
+
+export const EmptyState = ({
+  button,
+  children,
+  image,
+  message,
+  hideImage = false,
+  variant,
+}: React.PropsWithChildren<Props>) => {
+  const styles = useStyles2(getStyles);
+  const imageToShow = image ?? getDefaultImageForVariant(variant);
+
+  return (
+    <Box paddingY={4} display="flex" direction="column" alignItems="center">
+      <div className={styles.container}>
+        {!hideImage && imageToShow}
+        <Stack direction="column" alignItems="center">
+          <Text variant="h4" textAlignment="center">
+            {message}
+          </Text>
+          {children && (
+            <Text color="secondary" textAlignment="center">
+              {children}
+            </Text>
+          )}
+        </Stack>
+        {button}
+      </div>
+    </Box>
+  );
+};
+
+function getDefaultImageForVariant(variant: Props['variant']) {
+  switch (variant) {
+    case 'call-to-action': {
+      return <GrotCTA width={300} />;
+    }
+    case 'not-found': {
+      return <GrotNotFound width={300} />;
+    }
+    case 'completed': {
+      return <SVG src={GrotCompleted} width={300} />;
+    }
+    default: {
+      throw new Error(`Unknown variant: ${variant}`);
+    }
+  }
+}
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  container: css({
+    display: 'flex',
+    flexDirection: 'column',
+    alignItems: 'center',
+    gap: theme.spacing(4),
+    maxWidth: '600px',
+  }),
+});
diff --git a/packages/grafana-ui/src/components/EmptyState/GrotCTA/GrotCTA.tsx b/packages/grafana-ui/src/components/EmptyState/GrotCTA/GrotCTA.tsx
new file mode 100644
index 0000000000000..ce7d363fb6fa6
--- /dev/null
+++ b/packages/grafana-ui/src/components/EmptyState/GrotCTA/GrotCTA.tsx
@@ -0,0 +1,32 @@
+import { css } from '@emotion/css';
+import React, { SVGProps } from 'react';
+import SVG from 'react-inlinesvg';
+
+import { GrafanaTheme2 } from '@grafana/data';
+
+import { useStyles2 } from '../../../themes';
+
+import grotCTASvg from './grot-cta.svg';
+
+export interface Props {
+  width?: SVGProps<SVGElement>['width'];
+  height?: SVGProps<SVGElement>['height'];
+}
+
+export const GrotCTA = ({ width = 'auto', height }: Props) => {
+  const styles = useStyles2(getStyles);
+
+  return <SVG src={grotCTASvg} className={styles.svg} height={height} width={width} />;
+};
+
+GrotCTA.displayName = 'GrotCTA';
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    svg: css({
+      '#grot-cta-cactus-1, #grot-cta-cactus-2': {
+        fill: theme.isDark ? '#58558c' : '#c9c5f4',
+      },
+    }),
+  };
+};
diff --git a/packages/grafana-ui/src/components/EmptyState/GrotCTA/grot-cta.svg b/packages/grafana-ui/src/components/EmptyState/GrotCTA/grot-cta.svg
new file mode 100644
index 0000000000000..7e44c92839c86
--- /dev/null
+++ b/packages/grafana-ui/src/components/EmptyState/GrotCTA/grot-cta.svg
@@ -0,0 +1,46 @@
+<svg viewBox="0 0 321 171" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <ellipse cx="160.5" cy="153.5" rx="160.5" ry="17.5" fill="#9087e9" fill-opacity="0.3" />
+  <g id="grot-cta-cactus-1" fill="#9087e9">
+    <path d="M12.496 76.3187C12.4507 76.4394 12.4205 76.5149 12.3752 76.5753C12.2998 76.681 12.2394 76.7112 12.179 76.7263C12.1488 76.7263 12.1186 76.7263 12.0884 76.7112C11.9827 76.6659 11.9374 76.6055 11.8771 76.53C11.8167 76.4394 11.7412 76.3338 11.6808 76.2281C11.5449 76.0016 11.4242 75.7299 11.3185 75.428C11.2128 75.1411 11.1373 74.8392 11.1071 74.5373C10.8656 76.5904 11.0769 78.7945 11.3034 80.8627L11.4242 81.9799C12.496 93.1664 18.7913 101.62 30.0835 107.146C30.0835 102.813 30.0835 98.2539 30.1137 93.7401C29.223 93.3928 28.3172 92.955 27.5171 92.0493C25.2828 89.5281 24.6487 85.7842 24.075 82.4932C23.9996 82.0252 23.9241 81.5723 23.8335 81.1345L23.592 79.7607C23.0183 76.4545 22.4144 73.0427 20.6783 70.4008C19.7423 68.9818 18.3082 68.1816 16.723 68.1816C15.2285 68.1816 13.7792 68.9063 12.7677 70.1593C11.9676 71.1406 11.5147 72.303 11.2581 73.556C11.2883 73.4956 11.3185 73.4201 11.3638 73.3748C11.394 73.3296 11.4543 73.2994 11.4996 73.2994C11.5449 73.2994 11.5751 73.2994 11.6053 73.3296C11.7261 73.4352 11.7865 73.5409 11.8469 73.6617C11.9072 73.7825 11.9374 73.9183 11.9827 74.0542C12.1488 74.6279 12.345 75.1713 12.5262 75.745C12.5413 75.8054 12.5564 75.896 12.5413 76.0016C12.5413 76.1677 12.5111 76.2583 12.4809 76.3489L12.496 76.3187ZM25.4941 97.2576C25.5243 97.3632 25.4941 97.4689 25.4639 97.5444C25.4035 97.6803 25.3583 97.7407 25.2979 97.7708C25.2375 97.801 25.2073 97.8161 25.1771 97.8161C24.9959 97.7105 24.9506 97.6501 24.9205 97.5142C24.8752 97.3028 24.845 97.0915 24.8299 96.8952C24.8299 96.699 24.8299 96.4876 24.8299 96.2612C24.8299 96.231 24.845 96.1857 24.8601 96.1555C24.9054 96.0951 24.9205 96.08 24.9506 96.0649C24.9808 96.0649 25.011 96.0649 25.0261 96.1253C25.1318 96.3065 25.2224 96.4876 25.2979 96.6688C25.3734 96.85 25.4337 97.0462 25.479 97.2576H25.4941ZM23.8486 87.792C23.8788 87.6713 23.8939 87.5958 23.9392 87.5505C23.9845 87.4901 24.0298 87.4599 24.0901 87.4599C24.1656 87.4599 24.2109 87.4599 24.2713 87.5203C24.6789 87.8071 24.9808 88.0638 25.2224 88.5167C25.2526 88.562 25.2677 88.6223 25.2677 88.7129C25.2677 88.8488 25.2677 88.9092 25.2677 88.9696C25.2677 88.9998 25.2677 89.03 25.2375 89.0601C25.2375 89.1054 25.2073 89.1507 25.1771 89.1809C25.0261 89.2564 24.9808 89.2564 24.9506 89.2413C24.7091 89.1356 24.5279 88.9998 24.3619 88.8337C24.1958 88.6676 24.06 88.4865 23.8939 88.2751C23.8637 88.2298 23.8335 88.1544 23.8184 88.0789C23.8184 87.9732 23.8184 87.8826 23.8184 87.8071L23.8486 87.792ZM24.1807 101.605C24.2562 101.696 24.2864 101.802 24.3015 101.922C24.3166 102.104 24.3015 102.224 24.2864 102.345C24.2411 102.496 24.1958 102.587 24.1354 102.647C24.0449 102.768 23.9694 102.798 23.8788 102.813C23.8335 102.813 23.8033 102.813 23.7731 102.813C23.6523 102.768 23.6071 102.723 23.5467 102.647C23.1844 102.164 22.8371 101.681 22.505 101.183C22.4748 101.122 22.4446 101.047 22.4446 100.956C22.4446 100.82 22.4446 100.715 22.4446 100.624C22.4748 100.473 22.505 100.383 22.5503 100.307C22.5956 100.232 22.656 100.201 22.7164 100.201C22.8069 100.201 22.8673 100.232 22.9277 100.292C23.3504 100.73 23.758 101.183 24.1656 101.651L24.1807 101.605ZM21.9313 80.3796C21.9615 80.2589 22.0219 80.1532 22.0823 80.0928C22.1125 80.0626 22.1276 80.0626 22.1578 80.0475C22.2031 80.0173 22.2635 79.9871 22.3088 79.972C22.3691 79.972 22.4144 80.0022 22.4446 80.0173C22.4748 80.0173 22.505 80.0173 22.5201 80.0475C22.5805 80.1079 22.6258 80.2136 22.6409 80.3494C22.7164 80.9835 22.8824 81.5572 23.1844 82.1157C23.2447 82.2214 23.2598 82.3422 23.2598 82.4781C23.2598 82.5082 23.2598 82.5384 23.2598 82.5686C23.2598 82.6743 23.2296 82.78 23.1994 82.8706C23.1391 83.0215 23.0787 83.1121 23.0032 83.1876C22.8824 83.2782 22.822 83.3084 22.7466 83.3235C22.6409 83.3235 22.5956 83.3084 22.5503 83.2782C22.5201 83.2782 22.505 83.2631 22.4748 83.248C22.3993 83.1876 22.3389 83.097 22.2786 82.9762C22.1729 82.7649 22.0823 82.5535 22.0219 82.3573C21.9464 82.1459 21.9011 81.9346 21.871 81.7232C21.8408 81.5119 21.8257 81.2854 21.8257 81.0741C21.8257 80.8627 21.8559 80.6363 21.9011 80.3947L21.9313 80.3796ZM20.0292 72.8163C20.0443 72.5596 20.0745 72.3181 20.1349 72.0614C20.165 71.9256 20.2254 71.8199 20.2858 71.7595C20.316 71.7293 20.3462 71.7293 20.3613 71.7142C20.4066 71.684 20.467 71.6538 20.5123 71.6387C20.5727 71.6387 20.6179 71.6689 20.6632 71.6991C20.6934 71.6991 20.7236 71.6991 20.7387 71.7293C20.7991 71.7897 20.8595 71.8954 20.8897 72.0313C20.9954 72.5294 21.0105 73.0276 21.0255 73.5409C21.0255 73.6617 21.0255 73.7674 20.9803 73.8579C20.9803 73.8881 20.9501 73.9183 20.935 73.9334C20.9048 73.9787 20.8897 74.0391 20.8595 74.0844C20.8444 74.1146 20.8142 74.1146 20.784 74.1448C20.7538 74.175 20.7236 74.2052 20.6934 74.2203C20.6632 74.2203 20.633 74.2203 20.6179 74.2354C20.5878 74.2354 20.5425 74.2655 20.5123 74.2655C20.467 74.2655 20.4368 74.2655 20.4066 74.2504C20.3764 74.2504 20.3462 74.2504 20.3311 74.2354C20.3009 74.2203 20.2707 74.1901 20.2405 74.1599C20.2254 74.1448 20.1952 74.1297 20.1801 74.0995C20.15 74.0542 20.1349 74.0089 20.1047 73.9636C20.1047 73.9334 20.0745 73.9183 20.0594 73.8881C20.0292 73.7976 20.0141 73.6919 20.0141 73.5711C20.0141 73.3145 20.0141 73.0578 20.0292 72.8163ZM19.3347 90.0716C19.4102 89.9659 19.4706 89.9206 19.5763 89.9056C19.6216 89.9056 19.6669 89.9056 19.6971 89.9056C20.0896 90.0112 20.4519 90.132 20.8293 90.2679C20.8897 90.283 20.935 90.3283 20.9803 90.3735C21.0406 90.4641 21.0708 90.5094 21.0859 90.5547C21.0859 90.5849 21.0859 90.6151 21.101 90.6453C21.101 90.6906 21.1161 90.7359 21.1312 90.7811C21.1312 90.8113 21.1312 90.8415 21.1312 90.8717C21.1312 90.917 21.1312 90.9623 21.1312 91.0076C21.1312 91.0378 21.1312 91.068 21.1161 91.0982C21.1161 91.1435 21.101 91.1737 21.0859 91.2189C21.0859 91.2491 21.0708 91.2793 21.0557 91.2944C21.0406 91.3246 21.0255 91.3548 20.9954 91.385C20.9199 91.4605 20.8897 91.4756 20.8595 91.4907C20.7236 91.5209 20.6783 91.5058 20.633 91.4907C20.2556 91.3246 19.8782 91.1737 19.5159 90.9774C19.4253 90.9321 19.3649 90.8415 19.3196 90.7359C19.2744 90.6151 19.2442 90.4943 19.2442 90.3886C19.2442 90.2377 19.2744 90.1471 19.3196 90.0565L19.3347 90.0716ZM16.7834 79.5191C16.7834 79.5191 16.8136 79.3682 16.8438 79.3078C16.874 79.2323 16.9193 79.187 16.9646 79.1417C17.0401 79.0662 17.1005 79.0511 17.1608 79.0511C17.3269 79.1115 17.3722 79.1417 17.4175 79.2021C17.5533 79.3531 17.6439 79.504 17.7496 79.6701C17.8402 79.8211 17.9308 79.9871 18.0213 80.1683C18.0666 80.2589 18.0817 80.3796 18.0968 80.4853C18.0968 80.5155 18.0968 80.5457 18.0968 80.5759C18.0968 80.6665 18.0666 80.7571 18.0364 80.8325C17.9761 80.9684 17.9308 81.0439 17.8704 81.1043C17.7647 81.1798 17.7043 81.2099 17.6439 81.225C17.5533 81.225 17.5081 81.2099 17.4779 81.1798C17.3571 81.0892 17.2967 81.0137 17.2363 80.908C17.0552 80.5457 16.9193 80.1985 16.8136 79.806C16.7985 79.7456 16.7985 79.6701 16.8136 79.5946V79.5493L16.7834 79.5191ZM16.7834 93.5438C16.7834 93.5438 16.7834 93.6193 16.7985 93.6646C16.8136 93.7401 16.8287 93.8156 16.8287 93.9061C16.8287 93.9514 16.8136 93.9816 16.7985 94.0269C16.7985 94.1024 16.7834 94.1779 16.7532 94.2232C16.7381 94.2534 16.6928 94.2534 16.6627 94.2835C16.6174 94.3137 16.5872 94.359 16.5268 94.359C16.0437 94.3288 15.7569 94.1779 15.3945 93.891C15.3191 93.8306 15.2587 93.7401 15.2285 93.6193C15.1832 93.4834 15.1832 93.3627 15.1832 93.2419C15.1983 93.0758 15.2285 92.9852 15.2889 92.8947C15.3794 92.7739 15.4549 92.7286 15.5455 92.7286C15.6059 92.7286 15.6361 92.7286 15.6814 92.7286C15.8927 92.789 16.0588 92.8494 16.2098 92.94C16.3607 93.0305 16.4966 93.1513 16.6476 93.3023C16.6928 93.3476 16.7381 93.4381 16.7834 93.5589V93.5438ZM15.1681 69.1478C15.1681 69.1478 15.1983 69.012 15.2285 68.9516C15.2889 68.8308 15.3342 68.7704 15.3945 68.7251C15.47 68.6647 15.5153 68.6496 15.5606 68.6496C15.6512 68.6496 15.6965 68.6647 15.7267 68.6949C15.8323 68.7855 15.8927 68.8459 15.9531 68.9516C16.0739 69.1478 16.1645 69.3592 16.2399 69.5705C16.2852 69.6913 16.3003 69.8272 16.3003 69.9479C16.3003 69.9781 16.3003 70.0234 16.3003 70.0536C16.3003 70.1442 16.2701 70.2197 16.2399 70.2952C16.2399 70.3253 16.2249 70.3555 16.2098 70.3857C16.1645 70.4763 16.1041 70.5518 16.0437 70.6122C15.9682 70.6726 15.8927 70.7028 15.8172 70.7028C15.6965 70.6877 15.6361 70.6575 15.5908 70.6122C15.5757 70.5971 15.5455 70.582 15.5304 70.5518C15.4549 70.4763 15.3945 70.3555 15.3493 70.1895C15.2738 69.963 15.2285 69.7215 15.1832 69.4799C15.1681 69.3894 15.1832 69.2988 15.1832 69.2082C15.1832 69.178 15.1832 69.1629 15.1832 69.1327L15.1681 69.1478ZM14.0057 82.8404C14.0359 82.7196 14.0811 82.6139 14.1566 82.5384C14.1717 82.5082 14.2019 82.5082 14.2321 82.4932C14.2774 82.4479 14.3378 82.4177 14.3982 82.4177C14.4737 82.4026 14.5038 82.4177 14.534 82.4177C14.6699 82.4932 14.7303 82.5535 14.7756 82.6743C14.8511 82.8555 14.9115 83.0517 14.9567 83.2329C15.0926 83.8066 15.1228 84.4104 15.1832 85.0143C15.1832 85.135 15.1832 85.2256 15.153 85.3313C15.153 85.3615 15.1228 85.3917 15.1228 85.4219C15.0926 85.4823 15.0775 85.5276 15.0322 85.5879C15.0171 85.6181 14.9869 85.6332 14.9718 85.6634C14.9416 85.6936 14.8964 85.7389 14.8511 85.754C14.8209 85.7691 14.8058 85.7842 14.7756 85.7993C14.7303 85.8144 14.685 85.8295 14.6397 85.8295C14.4737 85.8295 14.3831 85.7993 14.3076 85.7238C14.2019 85.5879 14.1264 85.4672 14.1113 85.286C14.066 84.8784 14.0057 84.4859 13.9755 84.0783C13.9453 83.6707 13.9453 83.2782 14.0208 82.8706L14.0057 82.8404Z" />
+    <path d="M60.248 62.0524C60.248 41.7325 53.1375 39 46.178 39C39.2185 39 32.1081 41.7325 32.1081 62.0524C32.1081 63.3205 32.0628 66.2794 32.0175 70.28C31.791 87.641 31.3231 123.752 32.5157 130.274C35.1274 144.449 40.1545 144.449 44.1853 144.449H48.0349C52.1261 144.449 57.2287 144.449 59.8555 130.138C61.0481 123.661 60.565 87.6259 60.3386 70.3102C60.2782 66.2794 60.248 63.3054 60.248 62.0373V62.0524ZM33.4517 58.6104C33.5422 58.4745 33.6479 58.3387 33.7687 58.2179C33.8291 58.1575 33.9046 58.1273 33.9649 58.1273C34.0857 58.1424 34.1461 58.1877 34.2065 58.2481C34.282 58.3387 34.3122 58.4443 34.3424 58.55C34.3726 58.7161 34.3877 58.8368 34.3726 58.9425C34.3273 59.1086 34.2971 59.1992 34.2065 59.2595L34.0404 59.5615L33.8744 59.8634C33.8744 59.9842 33.8291 60.0899 33.7687 60.1804C33.663 60.271 33.6177 60.3012 33.5724 60.3163C33.5121 60.3314 33.4819 60.3163 33.4517 60.3012C33.3309 60.2257 33.2856 60.1502 33.2554 60.0144C33.1346 59.5011 33.2101 59.0331 33.4668 58.6255L33.4517 58.6104ZM33.0893 98.5105C33.0592 98.586 33.0139 98.6464 32.9686 98.6766C32.8931 98.7219 32.8629 98.737 32.8327 98.737C32.7572 98.737 32.7119 98.7219 32.6817 98.6917C32.6214 98.6464 32.5761 98.6011 32.5459 98.5558C32.5006 98.4652 32.4855 98.42 32.4704 98.3747C32.4553 98.2539 32.4402 98.1935 32.4553 98.118C32.5308 97.6953 32.6063 97.2877 32.7119 96.8801C32.8176 96.4725 32.9384 96.08 33.1044 95.6875C33.1497 95.5818 33.195 95.5214 33.2554 95.461C33.346 95.4006 33.3762 95.3855 33.4215 95.3855C33.5271 95.3855 33.5724 95.4006 33.6177 95.4459C33.7083 95.5063 33.7536 95.5667 33.7838 95.6271C33.8442 95.7328 33.8593 95.7932 33.8744 95.8535C33.9046 96.0045 33.9046 96.0951 33.8895 96.1706C33.7989 96.5782 33.6932 96.9707 33.5573 97.3632C33.4215 97.7406 33.2554 98.118 33.0893 98.5105ZM33.0893 77.6924C33.029 77.783 32.9686 77.8283 32.9082 77.8283C32.8478 77.8283 32.8025 77.8132 32.7723 77.7679C32.7119 77.6924 32.6968 77.6471 32.6666 77.6018C32.6365 77.5263 32.6214 77.466 32.6214 77.3905C32.6214 77.2848 32.6214 77.2244 32.6214 77.1791C32.8025 76.6508 33.0139 76.1677 33.2705 75.6695C33.3007 75.6091 33.3309 75.5638 33.3762 75.5336C33.5422 75.5034 33.5875 75.5336 33.6328 75.5789C33.7083 75.6695 33.7536 75.7148 33.7838 75.7903C33.8291 75.8808 33.8442 75.9563 33.8593 76.0318C33.8593 76.1677 33.8593 76.2431 33.8442 76.3035C33.7385 76.5451 33.6177 76.7866 33.497 77.0131C33.3762 77.2546 33.2403 77.4811 33.0893 77.7075V77.6924ZM33.6026 117.728C33.6479 117.638 33.6932 117.577 33.7536 117.532C33.8442 117.472 33.8744 117.457 33.9197 117.457C34.0253 117.457 34.0706 117.472 34.1159 117.502C34.1914 117.547 34.2367 117.608 34.2669 117.668C34.3122 117.774 34.3424 117.819 34.3424 117.879C34.3726 118.03 34.3726 118.106 34.3424 118.181C34.2518 118.559 34.131 118.921 34.0102 119.268C33.8895 119.615 33.7385 119.978 33.6026 120.325C33.5573 120.431 33.5121 120.491 33.4668 120.536C33.3913 120.582 33.3611 120.612 33.3309 120.612C33.2403 120.612 33.195 120.582 33.1497 120.551C33.0592 120.476 33.0139 120.4 32.9837 120.325C32.9384 120.219 32.9233 120.144 32.9082 120.068C32.8931 119.902 32.8931 119.827 32.9082 119.736C33.0139 119.389 33.1044 119.042 33.2101 118.71C33.3158 118.378 33.4366 118.03 33.5875 117.713L33.6026 117.728ZM32.3647 66.4304C32.3949 66.2945 32.4251 66.204 32.4704 66.1436C32.5157 66.0832 32.561 66.053 32.6214 66.0379C32.7119 66.0379 32.7572 66.053 32.8176 66.1134C33.2554 66.5512 33.7234 66.9437 34.0706 67.457C34.1159 67.5173 34.131 67.6079 34.1461 67.7136C34.1461 67.8646 34.1461 67.9853 34.1461 68.091C34.1159 68.2571 34.0857 68.3628 34.0253 68.4382C33.98 68.5137 33.9197 68.5439 33.8442 68.559C33.7385 68.559 33.6781 68.5288 33.6026 68.4684C33.1346 68.0306 32.8025 67.4721 32.4402 66.9437C32.41 66.8984 32.3949 66.8078 32.3798 66.7323C32.3798 66.5965 32.3798 66.5059 32.3798 66.4153L32.3647 66.4304ZM32.0024 85.452C32.0024 85.3765 32.0326 85.286 32.0628 85.2256C32.1081 85.1048 32.1534 85.0293 32.2138 84.984C32.3043 84.9086 32.3496 84.8935 32.3949 84.8784C32.4704 84.8784 32.5006 84.8784 32.5459 84.9086C32.6516 84.984 32.6968 85.0595 32.7421 85.1501C32.9837 85.6634 33.2252 86.1767 33.4366 86.705C33.4819 86.7956 33.4819 86.9013 33.4819 87.007C33.4668 87.173 33.4517 87.2636 33.4215 87.3391C33.3762 87.475 33.3158 87.5504 33.2554 87.5957C33.1648 87.6712 33.1044 87.7014 33.0592 87.7014C32.9686 87.7014 32.9384 87.6863 32.9082 87.6561C32.8025 87.5806 32.7421 87.5052 32.6968 87.3995C32.4704 86.8711 32.259 86.3276 32.0477 85.7992C32.0175 85.7087 32.0024 85.6181 32.0024 85.5275C32.0024 85.4973 32.0024 85.4822 32.0024 85.452ZM31.9118 107.644C31.942 107.523 31.9571 107.493 31.9722 107.433C32.0326 107.327 32.0628 107.312 32.093 107.282C32.2138 107.236 32.259 107.267 32.3194 107.312C32.7421 107.75 33.0743 108.218 33.4064 108.731C33.4819 108.837 33.5121 108.972 33.5271 109.108C33.5271 109.138 33.5271 109.169 33.5271 109.199C33.5271 109.32 33.5271 109.44 33.4819 109.546C33.4366 109.682 33.3762 109.788 33.3158 109.863C33.195 109.969 33.1346 110.014 33.0592 110.014C32.9837 110.014 32.9384 109.999 32.8931 109.969C32.7572 109.878 32.6968 109.803 32.6365 109.667C32.3496 109.048 32.093 108.459 31.9118 107.81C31.9118 107.765 31.9118 107.704 31.9118 107.629V107.644ZM34.3575 129.489C34.3122 129.624 34.2669 129.715 34.2216 129.775C34.131 129.881 34.0706 129.926 33.98 129.926C33.7687 129.881 33.7083 129.836 33.6479 129.76C33.1799 129.232 32.8025 128.613 32.3949 128.024C32.3647 127.979 32.3496 127.919 32.3496 127.858C32.3496 127.753 32.3496 127.677 32.3496 127.617C32.3798 127.511 32.3949 127.435 32.4251 127.39C32.4553 127.345 32.5006 127.315 32.5459 127.315C32.6214 127.315 32.6515 127.33 32.7119 127.375C32.9686 127.617 33.2403 127.843 33.497 128.085C33.7536 128.326 34.0102 128.568 34.2367 128.839C34.2971 128.915 34.3424 129.021 34.3575 129.126C34.3726 129.292 34.3575 129.413 34.3575 129.519V129.489ZM34.6594 51.7717C34.6594 51.7717 34.6141 51.9075 34.5839 51.9679C34.5688 51.9981 34.5537 52.0283 34.5386 52.0434C34.4933 52.1038 34.448 52.134 34.4027 52.1793C34.2669 52.2699 34.1914 52.3 34.1159 52.3C34.0253 52.3 33.9499 52.2548 33.8744 52.1944C33.7536 52.0585 33.7083 51.9528 33.6781 51.7717C33.6177 51.3339 33.5724 50.881 33.5422 50.4432C33.5422 50.3677 33.5422 50.3073 33.5724 50.2469C33.6177 50.1412 33.6328 50.111 33.663 50.0658C33.7385 49.9752 33.7687 49.9299 33.814 49.8997C33.8744 49.8695 33.9197 49.8544 33.9649 49.8393C34.0404 49.8393 34.0857 49.8695 34.1159 49.8846C34.2065 49.9601 34.2367 50.0205 34.282 50.111C34.4178 50.5187 34.5537 50.9112 34.6745 51.3188C34.7047 51.4395 34.7047 51.5603 34.6896 51.666C34.6896 51.6962 34.6745 51.7264 34.6594 51.7566V51.7717ZM36.2143 137.988C36.2143 138.154 36.1539 138.245 36.1087 138.335C36.0181 138.441 35.9577 138.471 35.8822 138.471C35.7916 138.471 35.7463 138.456 35.7161 138.441C35.6105 138.38 35.5803 138.365 35.5501 138.32C35.4595 138.23 35.4293 138.184 35.4142 138.139C35.3538 138.003 35.3236 137.912 35.3236 137.822C35.2934 137.444 35.2934 137.082 35.2934 136.705C35.2934 136.478 35.3538 136.312 35.4444 136.191C35.535 136.071 35.6558 136.01 35.7765 136.01C35.8671 136.01 35.9426 136.071 36.0181 136.116C36.0483 136.146 36.0936 136.131 36.1238 136.176C36.2143 136.297 36.2747 136.463 36.2747 136.69C36.2747 137.127 36.2747 137.565 36.2294 138.003L36.2143 137.988ZM43.6267 107.508C43.7475 106.995 43.9136 106.497 44.0947 105.983C44.14 105.847 44.2004 105.772 44.2608 105.696C44.3665 105.621 44.4117 105.606 44.457 105.606C44.5778 105.621 44.6382 105.651 44.6986 105.696C44.8194 105.802 44.8797 105.878 44.9401 105.983C45.0005 106.134 45.0307 106.225 45.0458 106.315C45.0458 106.346 45.0458 106.376 45.0458 106.406C45.0458 106.527 45.0458 106.648 45.0005 106.753C44.7439 107.372 44.5174 108.006 44.1551 108.565C44.1098 108.625 44.0645 108.67 44.0343 108.701C43.974 108.731 43.9438 108.746 43.9136 108.746C43.8532 108.746 43.8079 108.716 43.7626 108.67C43.6871 108.595 43.6418 108.535 43.6116 108.474C43.5814 108.414 43.5512 108.338 43.5362 108.263C43.5211 108.142 43.506 108.067 43.5211 108.006C43.5512 107.825 43.6116 107.659 43.6418 107.493L43.6267 107.508ZM42.9625 81.1646C43.0531 81.1646 43.1285 81.2099 43.1889 81.2854C43.2644 81.3911 43.3097 81.4967 43.3248 81.6024C43.355 81.7685 43.355 81.8742 43.3399 81.9798C43.3248 82.1308 43.2946 82.2214 43.2493 82.2969C42.9776 82.7196 42.6455 83.0668 42.4492 83.5348C42.3888 83.6555 42.3284 83.731 42.2529 83.7763C42.0718 83.8216 42.0416 83.8065 41.9963 83.7914C41.8906 83.7461 41.8302 83.6857 41.785 83.6103C41.7095 83.4744 41.6793 83.3687 41.6944 83.2479C41.7246 82.8554 41.785 82.4176 41.951 82.0402C42.1171 81.6628 42.3888 81.3458 42.7964 81.1948C42.8568 81.1797 42.9021 81.1646 42.9474 81.1646H42.9625ZM41.4679 70.0234C41.3773 70.0083 41.317 69.963 41.2717 69.9026C41.2113 69.812 41.166 69.7365 41.1358 69.646C41.0905 69.495 41.0754 69.4044 41.0603 69.3138C41.0603 69.1629 41.0603 69.0874 41.0905 69.027C41.2264 68.7251 41.3622 68.4382 41.5283 68.1514C41.6944 67.8646 41.8755 67.6079 42.0869 67.3513C42.1624 67.2607 42.2378 67.2305 42.3133 67.2154C42.4341 67.2154 42.5096 67.2607 42.57 67.3362C42.6455 67.4419 42.6907 67.5324 42.7209 67.6381C42.7813 67.8042 42.7964 67.9099 42.8115 68.0155C42.8115 68.1816 42.8115 68.2722 42.7813 68.3477C42.5096 68.9213 42.1473 69.4346 41.7246 69.9177C41.6491 69.9932 41.5887 70.0234 41.5283 70.0234H41.5132H41.4679ZM41.4981 50.262C41.5887 50.0507 41.7246 49.8393 41.8906 49.5978C41.9661 49.4921 42.0416 49.4317 42.1171 49.3864C42.2228 49.3562 42.268 49.326 42.2982 49.326C42.4492 49.3713 42.4794 49.3864 42.5247 49.4166C42.6304 49.5072 42.6606 49.5525 42.7058 49.6129C42.7813 49.7336 42.8115 49.8242 42.8417 49.9148C42.8719 50.0658 42.887 50.1261 42.887 50.2016C42.887 50.2318 42.887 50.262 42.887 50.2922C42.887 50.3677 42.887 50.4281 42.8719 50.4885C42.8719 50.5187 42.8719 50.5488 42.8719 50.579C42.8417 50.6696 42.8115 50.7451 42.7662 50.8206C42.5398 51.1376 42.3586 51.4244 42.0567 51.5754C41.951 51.6207 41.8453 51.6509 41.7095 51.666C41.634 51.666 41.6189 51.6358 41.5736 51.6207C41.5434 51.6207 41.5132 51.6207 41.4981 51.5905C41.4679 51.5603 41.4528 51.515 41.4226 51.4697C41.3622 51.349 41.3622 51.2886 41.3472 51.2282C41.3321 51.0923 41.3321 51.0168 41.3321 50.9715C41.3622 50.6847 41.4226 50.4583 41.5132 50.2318L41.4981 50.262ZM39.9885 42.0495C40.0187 41.9438 40.0338 41.8985 40.0489 41.8381C40.0941 41.7476 40.1394 41.7023 40.1696 41.657C40.23 41.6117 40.2602 41.5966 40.3055 41.5966C40.381 41.5966 40.4112 41.5966 40.4263 41.6268C40.5168 41.6872 40.547 41.7476 40.5923 41.8231C40.7886 42.2307 40.9999 42.6081 41.1811 43.0308C41.2415 43.1666 41.2566 43.3025 41.2415 43.4233C41.2415 43.4686 41.2415 43.4988 41.2415 43.529C41.2415 43.6195 41.2113 43.695 41.1811 43.7705C41.1811 43.8007 41.1509 43.8309 41.1358 43.8611C41.0905 43.9517 41.0301 44.0271 40.9546 44.0875C40.8641 44.163 40.7886 44.1781 40.7131 44.1932C40.5923 44.1781 40.5319 44.1479 40.4716 44.1026C40.4565 44.0875 40.4263 44.0724 40.4112 44.0422C40.3357 43.9517 40.2753 43.846 40.2451 43.6648C40.1847 43.4233 40.1545 43.1817 40.1243 42.9402C40.0941 42.6987 40.0489 42.4722 40.0036 42.2156C40.0036 42.1552 40.0036 42.0797 40.0036 42.0193L39.9885 42.0495ZM39.6412 57.4631C39.6412 57.3272 39.7016 57.2366 39.7771 57.1611C39.7922 57.1309 39.8224 57.1309 39.8526 57.1158C39.8979 57.0705 39.9583 57.0555 40.0187 57.0404C40.0941 57.0253 40.1243 57.0404 40.1545 57.0555C40.2904 57.1158 40.3659 57.1913 40.4112 57.297C40.547 57.614 40.6829 57.8707 40.9094 58.1424C40.9999 58.2481 41.0301 58.3689 41.0452 58.5047C41.0452 58.5349 41.0452 58.5651 41.0452 58.5953C41.0452 58.7312 41.0452 58.867 40.9999 59.0029C40.9395 59.169 40.8943 59.2746 40.8188 59.3652C40.698 59.5011 40.6225 59.5464 40.5319 59.5615C40.4716 59.5615 40.4414 59.5615 40.4112 59.5464C40.2753 59.486 40.2149 59.4256 40.1545 59.335C39.8375 58.8972 39.6714 58.4594 39.6412 57.9763C39.6412 57.8103 39.6412 57.6442 39.6412 57.4631ZM41.3622 109.516C41.317 109.652 41.2717 109.742 41.2113 109.818C41.1207 109.939 41.0452 109.969 40.9697 109.984C40.7735 109.924 40.7131 109.878 40.6527 109.788C40.4263 109.471 40.23 109.138 40.0338 108.806C40.0036 108.761 39.9885 108.67 39.9734 108.58C39.9734 108.444 39.9734 108.338 39.9734 108.248C40.0036 108.097 40.0338 108.006 40.079 107.931C40.1243 107.855 40.1696 107.825 40.23 107.81C40.3206 107.81 40.381 107.84 40.4414 107.901C40.7131 108.187 40.9848 108.489 41.2415 108.791C41.317 108.882 41.3472 108.988 41.3622 109.093C41.3622 109.274 41.3622 109.395 41.3321 109.501L41.3622 109.516ZM38.5845 74.7788C38.5845 74.6429 38.5996 74.5523 38.6298 74.4618C38.66 74.3561 38.6902 74.2957 38.7355 74.2353C38.8109 74.1447 38.8562 74.1145 38.9166 74.1145C39.0827 74.1749 39.1431 74.2202 39.1883 74.2806C39.5809 74.7939 39.9885 75.2468 40.4867 75.6695C40.5319 75.7148 40.5772 75.7752 40.6074 75.8355C40.6527 75.9563 40.6678 76.0016 40.6829 76.062C40.6829 76.0922 40.6829 76.1224 40.6829 76.1526C40.6829 76.1979 40.6829 76.2582 40.6829 76.3035C40.6829 76.3337 40.6829 76.3639 40.6829 76.3941C40.6829 76.4545 40.6829 76.4998 40.6678 76.5451C40.6678 76.5753 40.6678 76.6055 40.6527 76.6357C40.6376 76.6809 40.6225 76.7413 40.5923 76.7715C40.5319 76.8923 40.4866 76.9376 40.4414 76.9678C40.381 76.998 40.3357 77.0131 40.2904 77.0131C40.1998 77.0131 40.1243 76.9829 40.0338 76.9074C39.3544 76.4092 38.8864 75.7601 38.6147 74.9599C38.5996 74.8996 38.5845 74.8241 38.5845 74.7335V74.7788ZM39.7318 90.9623C39.4299 90.5698 39.1582 90.1772 38.8713 89.7696C38.826 89.7093 38.8109 89.6187 38.8109 89.513C38.8109 89.362 38.8109 89.2564 38.8109 89.1507C38.8411 88.9846 38.8713 88.894 38.9317 88.8186C38.977 88.7431 39.0374 88.7129 39.0978 88.6978C39.2034 88.6978 39.2638 88.728 39.3242 88.7884C39.6865 89.1507 40.0338 89.5281 40.3508 89.9206C40.4263 90.0112 40.4565 90.1169 40.4716 90.2376C40.4867 90.4339 40.4716 90.5547 40.4565 90.6603C40.4112 90.8113 40.3659 90.9019 40.3055 90.9774C40.2149 91.0981 40.1394 91.1434 40.0489 91.1434C40.0036 91.1434 39.9734 91.1434 39.9432 91.1434C39.8224 91.0981 39.762 91.0528 39.7016 90.9623H39.7318ZM39.7771 115.856C39.7771 115.856 39.7469 115.721 39.7469 115.645C39.7469 115.524 39.7469 115.449 39.7771 115.373C39.8073 115.283 39.8375 115.237 39.8677 115.192C39.9281 115.117 39.9734 115.087 40.0338 115.087C40.1243 115.087 40.1998 115.132 40.2753 115.222C40.7282 115.736 41.1358 116.249 41.5132 116.838C41.5736 116.928 41.6038 117.064 41.6038 117.185C41.6038 117.215 41.6038 117.245 41.6038 117.276C41.6038 117.411 41.6038 117.532 41.5585 117.653C41.4981 117.804 41.4528 117.91 41.4075 117.985C41.3019 118.121 41.2264 118.166 41.1509 118.166C41.1056 118.166 41.0754 118.166 41.0452 118.151C40.9395 118.091 40.8792 118.03 40.8188 117.94C40.6074 117.608 40.4263 117.26 40.2602 116.913C40.079 116.566 39.9281 116.219 39.762 115.856H39.7771ZM41.8151 128.824C41.7699 128.96 41.7246 129.051 41.6642 129.126C41.5736 129.247 41.4981 129.277 41.4226 129.292C41.2264 129.232 41.166 129.187 41.1207 129.111C41.015 128.945 40.9094 128.779 40.8037 128.613C40.698 128.447 40.5923 128.281 40.4867 128.115C40.4565 128.07 40.4414 127.979 40.4263 127.888C40.4263 127.753 40.4263 127.647 40.4414 127.556C40.4716 127.405 40.5017 127.315 40.547 127.239C40.5923 127.164 40.6376 127.134 40.698 127.118C40.7886 127.118 40.849 127.149 40.9094 127.209C41.1811 127.511 41.4528 127.798 41.7095 128.115C41.785 128.205 41.8151 128.311 41.8302 128.417C41.8302 128.598 41.8302 128.719 41.8 128.824H41.8151ZM42.6455 99.2352C42.4341 99.8692 42.0869 100.352 41.634 100.835C41.5585 100.926 41.483 100.941 41.4226 100.956C41.317 100.956 41.2566 100.911 41.2113 100.835C41.166 100.745 41.1358 100.639 41.1056 100.533C41.0754 100.367 41.0603 100.262 41.0603 100.156C41.0603 100.005 41.0754 99.9145 41.1056 99.8541C41.2264 99.5824 41.3623 99.3257 41.5132 99.0842C41.6642 98.8427 41.8604 98.6162 42.102 98.4501C42.1775 98.4049 42.2378 98.3747 42.2982 98.3747C42.4039 98.3747 42.4643 98.4049 42.5096 98.4652C42.5549 98.5256 42.5851 98.6011 42.6153 98.6766C42.6455 98.7974 42.6605 98.8879 42.6605 98.9634C42.6605 99.0842 42.6606 99.1748 42.6304 99.2352H42.6455ZM43.8381 138.335C43.6871 138.637 43.5362 138.939 43.4003 139.241C43.3701 139.301 43.3399 139.347 43.3097 139.362C43.1587 139.392 43.1134 139.362 43.0833 139.316C43.0229 139.226 42.9927 139.181 42.9625 139.105C42.9323 138.999 42.9172 138.924 42.9021 138.848C42.9021 138.713 42.9021 138.637 42.9474 138.577C43.0983 138.29 43.2644 137.988 43.4154 137.701C43.4456 137.641 43.4758 137.611 43.506 137.58C43.6418 137.55 43.6871 137.58 43.7324 137.626C43.7928 137.701 43.823 137.762 43.8381 137.837C43.8683 137.928 43.8834 138.003 43.8834 138.079C43.8834 138.199 43.8834 138.275 43.8532 138.335H43.8381ZM44.5325 130.108C44.3816 130.847 44.2155 131.602 44.0645 132.342C44.0343 132.478 43.989 132.553 43.9287 132.629C43.8381 132.719 43.7777 132.749 43.7173 132.749C43.6569 132.749 43.5965 132.734 43.5512 132.704C43.4758 132.644 43.4456 132.614 43.4154 132.568C43.355 132.463 43.3399 132.417 43.3248 132.372C43.2946 132.221 43.2946 132.131 43.3097 132.04C43.4456 131.285 43.5814 130.53 43.7324 129.775C43.7626 129.64 43.8079 129.534 43.8683 129.474C43.9739 129.368 44.0343 129.338 44.1098 129.338C44.1853 129.338 44.2306 129.368 44.291 129.398C44.3816 129.458 44.4117 129.504 44.4419 129.534C44.5174 129.64 44.5325 129.7 44.5476 129.745C44.5778 129.911 44.5929 130.002 44.5627 130.092L44.5325 130.108ZM45.1666 119.706C45.0156 120.25 44.8043 120.778 44.7439 121.336C44.7439 121.487 44.6835 121.578 44.6382 121.654C44.5627 121.759 44.5023 121.789 44.4268 121.789C44.3363 121.789 44.3061 121.774 44.2759 121.759C44.1853 121.699 44.1551 121.684 44.1249 121.654C44.0494 121.563 44.0192 121.518 43.989 121.472C43.9287 121.336 43.8985 121.261 43.8985 121.186C43.8683 120.974 43.8683 120.748 43.8683 120.536C43.8683 120.37 43.8834 120.219 43.9136 120.068C44.0041 119.6 44.2004 119.178 44.5627 118.83C44.6382 118.755 44.7137 118.725 44.7741 118.725C44.8948 118.725 44.9552 118.77 45.0005 118.83C45.0609 118.906 45.0911 118.997 45.1213 119.087C45.1666 119.223 45.1817 119.329 45.1817 119.419C45.1817 119.555 45.1817 119.646 45.1817 119.706H45.1666ZM52.3978 78.7643C52.428 78.6133 52.4733 78.5076 52.5337 78.4321C52.6394 78.3265 52.7148 78.2812 52.7903 78.2812C52.8658 78.2812 52.9262 78.3114 52.9866 78.3416C53.0772 78.417 53.1224 78.4472 53.1526 78.4925C53.1677 78.5227 53.1828 78.5378 53.1979 78.568C53.2281 78.6133 53.2432 78.6737 53.2734 78.7341C53.2734 78.7643 53.2885 78.7945 53.3036 78.8247C53.3187 78.9152 53.3338 79.0209 53.3036 79.1266C53.2281 79.5795 53.1224 80.0173 53.0168 80.4551C52.9866 80.5909 52.9413 80.6815 52.8809 80.757C52.7903 80.8627 52.7148 80.8929 52.6545 80.8929C52.5941 80.8929 52.5337 80.8627 52.4884 80.8325C52.4129 80.7721 52.3676 80.7268 52.3525 80.6966C52.2921 80.5909 52.2619 80.5306 52.2468 80.4853C52.2016 80.3343 52.2016 80.2437 52.2167 80.138C52.277 79.6852 52.3223 79.2323 52.3978 78.7794V78.7643ZM52.1714 94.6005C52.1714 94.6005 52.0506 94.5703 52.0053 94.5401C51.9147 94.4647 51.8845 94.4345 51.8543 94.3892C51.7789 94.2684 51.7638 94.2231 51.7487 94.1627C51.7034 93.9967 51.7034 93.9061 51.7185 93.8004C51.7789 93.3626 51.8543 92.9248 51.9449 92.487C52.0355 92.0492 52.1261 91.6265 52.2468 91.1887C52.277 91.083 52.3223 91.0076 52.3676 90.9472C52.4431 90.8868 52.4733 90.8717 52.5186 90.8566C52.6243 90.8566 52.6696 90.8868 52.7148 90.917C52.8054 90.9774 52.8507 91.0377 52.896 91.1132C52.9564 91.2189 52.9866 91.2793 53.0017 91.3548C53.047 91.5057 53.0621 91.5963 53.047 91.6718C52.9413 92.5172 52.7752 93.3173 52.579 94.1325C52.5488 94.2835 52.4884 94.3741 52.428 94.4496C52.3223 94.5552 52.2619 94.5854 52.1865 94.5854L52.1714 94.6005ZM51.6883 66.219C51.6883 66.219 51.7638 66.2794 51.794 66.3096C51.8241 66.3398 51.8392 66.3549 51.8694 66.3851C51.8996 66.4304 51.9298 66.4908 51.9449 66.5512C51.9449 66.5814 51.9751 66.6116 51.9902 66.6417C52.0204 66.7474 52.0204 66.8682 52.0204 66.989C51.9902 67.3211 51.9147 67.623 51.8241 67.9401C51.794 68.0306 51.7487 68.091 51.7034 68.1212C51.5071 68.1363 51.4769 68.1212 51.4316 68.091C51.326 67.9853 51.2656 67.925 51.2505 67.8344C51.1448 67.4872 51.0995 67.1701 51.0693 66.8078C51.0693 66.687 51.0693 66.5814 51.0844 66.4908C51.0844 66.4606 51.0995 66.4455 51.1146 66.4153C51.1297 66.37 51.1448 66.3096 51.175 66.2794C51.2656 66.204 51.2958 66.1738 51.326 66.1587C51.5373 66.1436 51.5826 66.1587 51.6128 66.1587C51.643 66.1587 51.6732 66.1738 51.7034 66.1889L51.6883 66.219ZM50.9335 49.9903C51.024 49.9601 51.0542 49.945 51.0844 49.945C51.1901 49.9601 51.2656 50.0054 51.326 50.0809C51.4165 50.2016 51.4618 50.2922 51.492 50.3828C51.5373 50.5338 51.5524 50.6545 51.5524 50.7753C51.5373 50.9716 51.5071 51.0772 51.4316 51.1678C51.0693 51.6509 50.8429 52.134 50.6919 52.7227C50.6617 52.8133 50.6315 52.8737 50.5862 52.919C50.5258 52.9794 50.4806 52.9945 50.4504 52.9945C50.3749 52.9945 50.3296 52.9945 50.2843 52.9492C50.2239 52.9039 50.1937 52.8737 50.1635 52.8284C50.1031 52.7529 50.088 52.7077 50.0579 52.6624C50.0126 52.5567 49.9975 52.4963 49.9975 52.4359C49.9673 51.5754 50.1937 50.8055 50.7372 50.1412C50.7976 50.0658 50.8731 50.0054 50.9335 49.9752V49.9903ZM49.0011 59.0029C49.0313 58.8972 49.0615 58.8368 49.0917 58.7765C49.1521 58.6859 49.2124 58.6557 49.2577 58.6557C49.3634 58.6557 49.4238 58.701 49.4993 58.7916C49.7257 59.0784 49.9673 59.3652 50.1937 59.6521C50.2541 59.7124 50.2692 59.803 50.2843 59.9087C50.2843 60.0597 50.2843 60.1502 50.2692 60.2408C50.2239 60.3616 50.1937 60.422 50.1484 60.4824C50.0729 60.5729 50.0126 60.6031 49.9522 60.6182C49.7861 60.5729 49.7408 60.5277 49.6955 60.4673C49.4842 60.1502 49.2577 59.8483 49.0464 59.5313C49.0011 59.4709 48.986 59.3954 48.9709 59.3048C48.9709 59.169 48.9709 59.0784 48.9709 59.0029H49.0011ZM49.0766 73.3446C49.1219 73.1936 49.1521 73.1031 49.1974 73.0276C49.2426 72.9672 49.3181 72.9219 49.3936 72.9219C49.4993 72.9219 49.5748 72.937 49.6502 73.0125C49.9069 73.2087 50.0729 73.4352 50.2541 73.6918C50.3296 73.7975 50.3598 73.9183 50.3749 74.0541C50.3749 74.0843 50.3749 74.1145 50.3749 74.1447C50.3749 74.2806 50.3749 74.4014 50.3296 74.5372C50.2692 74.7033 50.2239 74.7939 50.1635 74.8694C50.0579 75.0052 49.9673 75.0505 49.8918 75.0505C49.8465 75.0505 49.8163 75.0505 49.7861 75.0354C49.6653 74.975 49.605 74.9146 49.5446 74.8241C49.3634 74.5221 49.1974 74.2655 49.0615 73.9334C49.0313 73.873 49.0313 73.7824 49.0313 73.6918C49.0313 73.5409 49.0313 73.4503 49.0615 73.3446H49.0766ZM49.6351 40.6153C49.6653 40.4342 49.7408 40.2681 49.8465 40.1322C49.9522 39.9964 50.1031 39.8907 50.2994 39.8303C50.3447 39.8303 50.3749 39.8152 50.4051 39.8152C50.5107 39.8303 50.5711 39.8756 50.6164 39.936C50.6768 40.0417 50.707 40.1322 50.7221 40.2228C50.7221 40.3738 50.7221 40.4644 50.6768 40.5549C50.6315 40.6757 50.5711 40.7512 50.4957 40.7965L50.3749 40.9475L50.2541 41.0984C50.239 41.2343 50.1937 41.3249 50.1182 41.3853C50.0126 41.4305 49.9824 41.4607 49.9522 41.4607C49.8616 41.4305 49.8163 41.4003 49.7559 41.3702C49.7257 41.3551 49.7106 41.34 49.6804 41.3098C49.6201 41.2192 49.5748 41.1135 49.5748 40.9776C49.5748 40.8418 49.5899 40.721 49.6201 40.6002L49.6351 40.6153ZM48.6539 44.3744C48.6539 44.2838 48.6841 44.1932 48.7143 44.1026C48.7595 43.997 48.8048 43.9215 48.8501 43.8762C48.9407 43.7856 49.0011 43.7403 49.0464 43.7403C49.2124 43.8158 49.2577 43.8611 49.303 43.9366C49.5748 44.4197 49.8314 44.8876 50.088 45.3707C50.1333 45.4613 50.1484 45.567 50.1484 45.6727C50.1484 45.8387 50.1182 45.9293 50.088 46.0048C50.0428 46.1407 49.9824 46.2161 49.922 46.2765C49.8163 46.352 49.771 46.3822 49.7106 46.3822C49.6201 46.3822 49.5899 46.3822 49.5446 46.352C49.4238 46.2765 49.3634 46.201 49.3181 46.0954C49.0917 45.6425 48.8954 45.1745 48.6841 44.7065C48.6539 44.631 48.6539 44.5404 48.6539 44.4498C48.6539 44.4348 48.6539 44.4046 48.6539 44.3895V44.3744ZM48.4576 85.2256C48.4878 85.0444 48.518 84.9237 48.5482 84.8029C48.6086 84.6368 48.669 84.5311 48.7294 84.4557C48.8199 84.35 48.8954 84.3047 48.986 84.2896C49.1823 84.3349 49.2577 84.3651 49.3181 84.4406C49.9069 85.0746 50.2088 85.7238 50.2541 86.5843C50.2541 86.6899 50.2541 86.8107 50.2088 86.9164C50.2088 86.9466 50.1786 86.9768 50.1786 87.007C50.1484 87.0825 50.1182 87.1428 50.0729 87.2032C50.0579 87.2334 50.0277 87.2636 49.9975 87.2787C49.9522 87.324 49.8918 87.3542 49.8314 87.3844C49.8012 87.3844 49.771 87.4146 49.7408 87.4146C49.6201 87.4146 49.5144 87.4146 49.4087 87.3391C49.2577 87.2485 49.1219 87.1126 49.0162 86.9768C48.6992 86.5541 48.5482 85.9804 48.4425 85.4822C48.4425 85.4067 48.4425 85.3162 48.4425 85.1954L48.4576 85.2256ZM48.8803 99.0842C48.8803 98.9785 48.8803 98.8728 48.8803 98.7823C48.9105 98.6162 48.9407 98.5256 48.986 98.4501C49.0464 98.3747 49.1219 98.3294 49.1974 98.3294C49.303 98.3294 49.3634 98.3294 49.454 98.3898C49.9673 98.7068 50.4051 99.1597 50.858 99.5673C50.9184 99.6277 50.9636 99.7032 51.0089 99.7786C51.0089 99.8088 51.024 99.839 51.0391 99.8692C51.0542 99.9296 51.0693 99.99 51.0844 100.05C51.0844 100.081 51.0844 100.126 51.0844 100.156C51.0844 100.216 51.0844 100.277 51.0844 100.337C51.0844 100.367 51.0844 100.413 51.0844 100.443C51.0844 100.503 51.0542 100.564 51.0391 100.624C51.0391 100.654 51.024 100.684 51.0089 100.715C50.9787 100.79 50.9485 100.85 50.9184 100.896C50.858 101.001 50.7976 101.047 50.7523 101.092C50.6768 101.122 50.6466 101.137 50.6013 101.137C50.5107 101.122 50.4353 101.092 50.3598 101.001C49.8918 100.473 49.3785 99.9749 48.986 99.3861C48.9407 99.3257 48.9105 99.2201 48.8954 99.1144C48.8954 99.0993 48.8954 99.0842 48.8954 99.0691L48.8803 99.0842ZM49.0162 113.486C49.0162 113.486 48.9709 113.366 48.9558 113.275C48.9407 113.154 48.9407 113.064 48.9558 112.973C48.9558 112.837 48.986 112.747 49.0162 112.671C49.0766 112.58 49.137 112.535 49.2124 112.535C49.2577 112.535 49.303 112.535 49.3634 112.565C49.771 112.747 50.088 113.003 50.4202 113.305C50.4957 113.366 50.5409 113.441 50.5711 113.516C50.5711 113.547 50.5862 113.577 50.6013 113.592C50.6164 113.652 50.6466 113.713 50.6466 113.773C50.6466 113.803 50.6466 113.834 50.6466 113.864C50.6466 113.924 50.6466 113.984 50.6466 114.06C50.6466 114.09 50.6466 114.12 50.6466 114.151C50.6466 114.226 50.6164 114.317 50.5862 114.392C50.5409 114.498 50.5107 114.573 50.4504 114.619C50.3749 114.694 50.3296 114.724 50.2843 114.739C50.1333 114.769 50.1031 114.754 50.088 114.739C49.9522 114.694 49.8767 114.634 49.8012 114.558C49.6502 114.377 49.5144 114.211 49.3785 114.045C49.2426 113.864 49.1219 113.683 49.0162 113.486ZM49.5144 127.677C49.5295 127.556 49.5446 127.466 49.5748 127.39C49.6201 127.269 49.6502 127.209 49.6955 127.149C49.7559 127.073 49.8163 127.043 49.8767 127.043C49.9824 127.043 50.0428 127.073 50.1031 127.134C50.5258 127.571 50.8127 128.024 51.0844 128.568C51.1448 128.689 51.175 128.824 51.175 128.96C51.175 128.99 51.175 129.021 51.175 129.066C51.175 129.187 51.1448 129.292 51.1146 129.398C51.0542 129.564 50.9787 129.655 50.9033 129.73C50.7825 129.836 50.707 129.866 50.6315 129.866C50.5107 129.866 50.4655 129.851 50.4202 129.821C50.39 129.821 50.3598 129.806 50.3447 129.775C50.2692 129.715 50.1937 129.624 50.1182 129.489C49.9824 129.217 49.8616 128.96 49.771 128.688C49.6804 128.417 49.5899 128.145 49.5295 127.858C49.5295 127.813 49.5295 127.737 49.5295 127.662L49.5144 127.677ZM51.1146 141.053C51.1146 141.053 51.1146 141.173 51.0844 141.219C51.0844 141.249 51.0844 141.279 51.0542 141.324C51.0391 141.385 51.0089 141.43 50.9938 141.475C50.9184 141.611 50.8731 141.656 50.8127 141.702C50.7523 141.747 50.6919 141.762 50.6315 141.762C50.5409 141.762 50.4504 141.732 50.3447 141.656C49.7861 141.264 49.5899 140.705 49.5446 140.041C49.5446 139.966 49.5597 139.875 49.5899 139.8C49.6502 139.679 49.6804 139.618 49.7257 139.588C49.8163 139.498 49.8767 139.467 49.9371 139.467C50.0428 139.483 50.1182 139.528 50.1937 139.618C50.39 139.86 50.6013 140.056 50.8429 140.237C50.9033 140.283 50.9485 140.343 50.9938 140.419C50.9938 140.449 51.0089 140.479 51.024 140.494C51.0391 140.554 51.0693 140.6 51.0844 140.66C51.0844 140.69 51.0844 140.736 51.0844 140.766C51.0844 140.826 51.0844 140.886 51.0844 140.947C51.0844 140.977 51.0844 141.022 51.0844 141.053H51.1146ZM51.9147 135.029C51.8241 135.497 51.7185 135.905 51.492 136.312C51.4467 136.403 51.3863 136.448 51.326 136.448C51.2505 136.448 51.2052 136.433 51.1599 136.388C51.0844 136.312 51.0542 136.267 51.0391 136.222C50.9787 136.101 50.9636 136.041 50.9636 135.98C50.9636 135.754 50.9636 135.542 50.9636 135.331C50.9787 135.12 51.024 134.908 51.0693 134.682C51.0995 134.531 51.1599 134.44 51.2052 134.365C51.3109 134.259 51.3713 134.229 51.4467 134.229C51.5222 134.229 51.5675 134.259 51.6279 134.289C51.7185 134.365 51.7487 134.395 51.7789 134.44C51.8543 134.561 51.8694 134.606 51.8845 134.667C51.9147 134.833 51.9298 134.923 51.8996 135.029H51.9147ZM53.2734 119.54C53.2734 119.646 53.2281 119.751 53.1677 119.842C52.8205 120.295 52.579 120.733 52.5035 121.306C52.4884 121.442 52.428 121.533 52.3676 121.593C52.2619 121.638 52.2318 121.669 52.1865 121.669C52.0959 121.638 52.0506 121.608 51.9902 121.563C51.96 121.548 51.9449 121.533 51.9147 121.503C51.8543 121.412 51.809 121.306 51.809 121.17C51.809 120.959 51.8392 120.748 51.8694 120.551C51.96 119.963 52.1563 119.419 52.5186 118.891C52.579 118.815 52.6243 118.77 52.6846 118.725C52.7601 118.695 52.7903 118.679 52.8205 118.679C52.9111 118.679 52.9866 118.74 53.047 118.8C53.1375 118.921 53.1828 118.997 53.213 119.087C53.2583 119.238 53.2734 119.344 53.2734 119.449C53.2734 119.48 53.2734 119.495 53.2734 119.525V119.54ZM53.4546 105.742C53.0772 106.527 52.7601 107.342 52.4431 108.157C52.4129 108.248 52.3676 108.308 52.3223 108.353C52.2468 108.399 52.2167 108.414 52.2016 108.429C52.1261 108.429 52.0808 108.414 52.0506 108.384C51.9751 108.323 51.9449 108.278 51.9147 108.218C51.8694 108.127 51.8543 108.082 51.8392 108.021C51.8091 107.901 51.794 107.825 51.809 107.765C51.8845 106.949 52.0959 106.18 52.4129 105.44C52.5186 105.198 52.6394 104.957 52.7601 104.7C52.8054 104.625 52.8507 104.564 52.9111 104.534C53.0017 104.504 53.047 104.489 53.0772 104.489C53.1375 104.489 53.1677 104.504 53.213 104.534C53.3338 104.594 53.3942 104.64 53.4546 104.7C53.515 104.776 53.5602 104.851 53.5753 104.942C53.6508 105.213 53.5753 105.53 53.4697 105.757L53.4546 105.742ZM59.0403 57.0102C59.0403 57.0102 59.1611 56.9649 59.2064 56.9649C59.2969 56.9649 59.3724 57.0253 59.4177 57.1007C59.4781 57.2215 59.5083 57.3272 59.5083 57.448C59.5083 57.6291 59.5083 57.7499 59.4932 57.8556C59.463 58.0065 59.4328 58.1122 59.3875 58.1575L59.2214 58.4141C59.2516 58.4896 59.2516 58.5802 59.2516 58.6708C59.2516 58.8217 59.2214 58.8972 59.2064 58.9576C59.1611 59.0784 59.1309 59.1388 59.0856 59.1841C59.0101 59.2595 58.9648 59.2746 58.9195 59.2746C58.844 59.2746 58.8138 59.2746 58.7836 59.2444C58.678 59.169 58.6327 59.1086 58.5874 59.018C58.4968 58.8368 58.4364 58.6557 58.4062 58.4594C58.376 58.3085 58.376 58.1726 58.4062 58.0216C58.4515 57.5989 58.6629 57.1913 59.0856 56.98L59.0403 57.0102ZM57.5004 78.2661C57.7269 77.783 57.9382 77.3301 58.3006 76.9376C58.3609 76.8772 58.4213 76.847 58.4666 76.847C58.5874 76.9074 58.6327 76.9376 58.6629 76.9829C58.7384 77.1036 58.7535 77.1489 58.7685 77.2093C58.8138 77.3603 58.8138 77.4358 58.7987 77.4962C58.7233 77.7981 58.6327 78.0849 58.5119 78.3567C58.3911 78.6284 58.2553 78.885 58.1194 79.1719C58.0741 79.2474 58.0288 79.3077 57.9835 79.3379C57.7873 79.3681 57.7269 79.3379 57.6816 79.2775C57.6061 79.1568 57.5608 79.0813 57.5306 78.9907C57.4853 78.8548 57.4702 78.7492 57.4552 78.6435C57.4552 78.4623 57.4552 78.3567 57.5004 78.2812V78.2661ZM57.4702 87.5504C57.5004 87.3995 57.5306 87.3089 57.5759 87.2334C57.6212 87.173 57.6665 87.1277 57.742 87.1277C57.8326 87.1277 57.893 87.1579 57.9533 87.2183C58.1496 87.4146 58.3157 87.5957 58.4817 87.8071C58.6478 88.0033 58.7836 88.2147 58.9195 88.4562C58.9497 88.5015 58.9648 88.577 58.9799 88.6676C58.9799 88.8035 58.9799 88.894 58.9799 88.9846C58.9497 89.1205 58.9346 89.2111 58.8893 89.2866C58.844 89.3469 58.7987 89.3771 58.7384 89.3922C58.6478 89.3922 58.5874 89.3771 58.527 89.3167C58.3157 89.1356 58.1496 88.9544 57.9835 88.7582C57.8175 88.5619 57.6816 88.3657 57.5306 88.1392C57.5004 88.0939 57.4702 88.0033 57.4702 87.9128C57.4702 87.7769 57.4702 87.6712 57.4702 87.5806V87.5504ZM58.3458 96.1555C58.3911 96.0498 58.4515 95.9743 58.4968 95.929C58.5874 95.8686 58.6327 95.8535 58.6629 95.8535C58.7685 95.8535 58.8138 95.8837 58.8591 95.929C58.9648 96.0196 59.0101 96.08 59.0403 96.1555C59.0856 96.2762 59.1007 96.3517 59.1158 96.4272C59.1158 96.5933 59.1158 96.6989 59.0705 96.7895C58.8289 97.3481 58.5723 97.9067 58.2855 98.435C58.2402 98.5105 58.21 98.5558 58.1647 98.586C57.9835 98.6313 57.9382 98.586 57.8779 98.5407C57.8024 98.4501 57.7571 98.3898 57.7269 98.3143C57.6816 98.2086 57.6665 98.1331 57.6514 98.0425C57.6514 97.8916 57.6514 97.8161 57.6514 97.7557C57.8477 97.2122 58.0741 96.6839 58.3157 96.1555H58.3458ZM57.5155 106.557C57.5155 106.557 57.5306 106.406 57.5608 106.346C57.591 106.255 57.6212 106.21 57.6665 106.164C57.742 106.089 57.7873 106.059 57.8326 106.059C57.9231 106.059 57.9835 106.104 58.059 106.195C58.376 106.617 58.678 107.04 58.9648 107.478C59.0252 107.553 59.0403 107.659 59.0554 107.765C59.0554 107.946 59.0554 108.052 59.0101 108.142C58.9648 108.263 58.9195 108.338 58.8742 108.414C58.7836 108.52 58.7233 108.55 58.6629 108.565C58.4968 108.504 58.4515 108.459 58.4062 108.384C58.1194 107.87 57.8326 107.342 57.5608 106.814C57.5306 106.753 57.5155 106.693 57.5155 106.617C57.5155 106.602 57.5155 106.587 57.5155 106.572V106.557ZM58.995 113.245C58.9648 113.381 58.9346 113.471 58.8742 113.532L58.1949 114.181C58.1949 114.181 58.0892 114.256 58.0288 114.256C57.9382 114.256 57.8779 114.211 57.8477 114.151C57.8024 114.09 57.7722 114 57.7571 113.909C57.7269 113.773 57.7269 113.683 57.7571 113.592C57.7873 113.456 57.8175 113.381 57.8628 113.32C58.0892 113.094 58.3006 112.852 58.527 112.626C58.5874 112.565 58.6327 112.55 58.6931 112.535C58.7836 112.535 58.844 112.58 58.8893 112.641C58.9346 112.716 58.9799 112.807 58.995 112.898C59.0252 113.048 59.0252 113.139 59.0252 113.23L58.995 113.245ZM57.4099 66.8984C57.4099 66.8984 57.4401 66.7776 57.4702 66.7172C57.5306 66.5965 57.5759 66.5512 57.6212 66.5059C57.6967 66.4606 57.742 66.4304 57.7873 66.4304C57.8779 66.4304 57.908 66.4455 57.9382 66.4757C58.0439 66.5512 58.0892 66.6116 58.1345 66.7172C58.2402 66.9588 58.376 67.2003 58.5421 67.4117C58.6931 67.6381 58.8591 67.8344 59.0403 68.0457C59.1158 68.1363 59.1611 68.2571 59.1913 68.3929C59.2214 68.6043 59.1913 68.7402 59.1762 68.8609C59.1158 69.027 59.0705 69.1327 59.0101 69.2082C58.9044 69.344 58.8138 69.3893 58.7233 69.3893C58.6629 69.3893 58.6327 69.3893 58.6025 69.3893C58.4666 69.3289 58.3911 69.2836 58.3308 69.1931C58.0892 68.8911 57.893 68.5892 57.742 68.2571C57.591 67.925 57.4853 67.5777 57.4099 67.2154C57.3948 67.1399 57.4099 67.0494 57.4099 66.9739C57.4099 66.9437 57.4099 66.9286 57.4099 66.9135V66.8984ZM55.8247 47.7258C55.704 47.4239 55.6134 47.1219 55.5228 46.8049C55.5077 46.7294 55.5077 46.6388 55.5228 46.5332C55.553 46.3671 55.5832 46.2765 55.6134 46.1859C55.6587 46.0954 55.704 46.0199 55.7643 45.9595C55.87 45.8689 55.9304 45.8236 56.0059 45.8236C56.0361 45.8236 56.0814 45.8387 56.1116 45.8538C56.2172 45.9142 56.2776 45.9595 56.3229 46.035C56.6852 46.5634 56.9268 47.1219 57.1834 47.6956C57.2287 47.8164 57.2438 47.9522 57.2438 48.0881C57.2438 48.1183 57.2438 48.1636 57.2438 48.1938C57.2438 48.3146 57.2136 48.4202 57.1683 48.5108C57.1079 48.6769 57.0324 48.7675 56.957 48.858C56.8362 48.9637 56.7607 48.9939 56.7003 48.9939C56.5947 48.9939 56.5343 48.9788 56.489 48.9486C56.4588 48.9486 56.4437 48.9335 56.4135 48.9033C56.338 48.8429 56.2776 48.7373 56.2021 48.6014C56.0663 48.2995 55.9455 48.0126 55.8247 47.7107V47.7258ZM57.6665 135.588C57.6665 135.588 57.6514 135.723 57.6212 135.784C57.5759 135.89 57.5457 135.935 57.5004 135.98C57.425 136.041 57.3797 136.056 57.3495 136.056C57.2891 136.056 57.2589 136.056 57.2287 136.025C57.1381 135.965 57.1079 135.905 57.0777 135.829L56.7607 135.029C56.655 134.757 56.5494 134.501 56.4437 134.229C56.4135 134.169 56.4135 134.093 56.4135 134.018C56.4135 133.897 56.4437 133.836 56.4588 133.791C56.489 133.701 56.5343 133.655 56.5645 133.61C56.6248 133.55 56.6701 133.534 56.7003 133.534C56.7607 133.534 56.7909 133.534 56.806 133.565C56.8815 133.625 56.9268 133.67 56.957 133.746C57.1834 134.259 57.425 134.772 57.6514 135.301C57.6816 135.376 57.6967 135.452 57.6967 135.527C57.6967 135.542 57.6967 135.573 57.6967 135.588H57.6665ZM59.146 127.088C59.0705 127.39 58.9648 127.692 58.844 128.009C58.7987 128.115 58.7535 128.175 58.7082 128.221C58.6176 128.281 58.5874 128.296 58.5572 128.296C58.4515 128.296 58.4062 128.281 58.3609 128.251C58.2704 128.19 58.2251 128.13 58.1949 128.07C58.1345 127.964 58.1194 127.903 58.1043 127.843C58.0741 127.692 58.0741 127.617 58.0892 127.541C58.1496 127.239 58.21 126.922 58.3006 126.62C58.3458 126.469 58.3911 126.318 58.4666 126.182C58.527 126.047 58.6176 125.911 58.7082 125.79C58.7836 125.699 58.8591 125.669 58.9195 125.669C59.0252 125.699 59.0856 125.73 59.1309 125.79C59.2214 125.926 59.2516 126.032 59.2667 126.122C59.2667 126.454 59.2365 126.771 59.1611 127.088H59.146ZM59.5687 121.201C59.5234 121.352 59.4781 121.457 59.4177 121.533C59.3271 121.654 59.2365 121.699 59.1611 121.714C59.1158 121.714 59.0856 121.714 59.0554 121.714C58.9346 121.669 58.8591 121.608 58.7987 121.533C58.527 121.201 58.2855 120.823 58.0288 120.476C57.7722 120.129 57.5004 119.782 57.2589 119.419C57.2136 119.359 57.1985 119.268 57.1985 119.163C57.1985 119.012 57.1985 118.906 57.2136 118.8C57.2438 118.634 57.2891 118.529 57.3344 118.453C57.3797 118.378 57.4401 118.332 57.5004 118.332C57.6061 118.332 57.6665 118.362 57.7269 118.438C58.3458 119.087 58.9195 119.736 59.463 120.446C59.5234 120.536 59.5687 120.657 59.5838 120.778C59.5989 120.974 59.5838 121.11 59.5687 121.216V121.201Z" />
+    <path d="M63.1768 78.145C63.0711 78.3262 63.0107 78.5073 62.9654 78.7036C62.6786 78.7791 62.3918 78.8395 62.0898 78.8999C62.1351 83.0967 62.1955 87.7313 62.2257 92.4565C63.1919 92.4565 64.2788 92.2301 65.4262 91.8074C65.4262 91.7923 65.396 91.7319 65.3658 91.6715C65.3658 91.6413 65.3356 91.6111 65.3356 91.5809C65.3054 91.4904 65.3054 91.3696 65.3054 91.2488C65.3356 90.9167 65.3507 90.7959 65.4866 90.494C65.5168 90.4185 65.562 90.3732 65.6073 90.3279C65.6828 90.2826 65.7281 90.2675 65.7583 90.2675C65.7885 90.2675 65.8187 90.2826 65.8489 90.2977C65.9395 90.343 65.9847 90.4034 66.0149 90.4789C66.1508 90.811 66.181 91.0526 66.2112 91.3998C66.2112 91.43 66.2112 91.4602 66.2112 91.4904C69.7287 90.026 72.899 87.7011 75.6012 84.6365C75.5559 84.6063 75.5107 84.5762 75.4654 84.5158C75.1785 84.1836 75.1031 83.7609 75.2087 83.3684C75.2389 83.2326 75.2993 83.1118 75.3597 82.9759C75.405 82.9004 75.4654 82.8552 75.5107 82.8401C75.6918 82.8401 75.7371 82.8702 75.7824 82.9155C75.8881 83.0363 75.9334 83.1118 75.9636 83.2024C76.0088 83.4288 76.0843 83.6553 76.1447 83.8666C76.1598 83.9421 76.1598 84.0176 76.1447 84.1082C76.1447 84.0478 76.1447 83.9874 76.1447 83.927C78.5602 81.0134 80.5831 77.511 82.0776 73.4953C82.0776 73.4651 82.1078 73.4198 82.1078 73.4047C82.1078 73.4047 82.0475 73.4349 81.9871 73.45C81.8814 73.45 81.821 73.4047 81.7757 73.3745C81.6549 73.2538 81.5946 73.1481 81.5493 72.9971C81.4436 72.6499 81.4134 72.3329 81.4134 71.9705C81.4134 71.88 81.4436 71.7894 81.4889 71.6988C81.5644 71.578 81.6248 71.5478 81.6851 71.5327C81.7757 71.5327 81.8361 71.5478 81.9116 71.6384C82.0173 71.7743 82.1078 71.8951 82.1833 72.0158C82.2588 72.1366 82.3192 72.2725 82.3796 72.4385C82.4249 72.5593 82.44 72.665 82.4249 72.7707C82.4249 72.7103 82.4249 72.6348 82.3947 72.5744C82.8476 71.2761 83.3609 69.6457 83.8288 67.8039C83.8288 67.8039 83.7534 67.7737 83.7081 67.7284C83.6326 67.6378 83.5873 67.5775 83.5571 67.502C83.5118 67.4114 83.4967 67.3208 83.4816 67.2453C83.4816 67.1095 83.4816 67.0189 83.5118 66.9585C83.6779 66.6113 83.8288 66.2792 84.0251 65.9621C84.0704 65.9017 84.1157 65.8565 84.1459 65.8263C84.3119 65.7961 84.3723 65.8263 84.4176 65.8715C84.3723 65.8263 84.3421 65.8112 84.2968 65.7961C84.5837 64.377 85.2328 60.6934 85.0064 57.1759C84.946 57.1458 84.8856 57.0854 84.8403 57.0099C84.6139 56.708 84.3874 56.406 84.1761 56.089C84.1157 55.9984 84.0855 55.8927 84.0704 55.772C84.0553 55.5757 84.0704 55.4549 84.0855 55.3493C84.1308 55.1983 84.161 55.1077 84.2214 55.0322C84.3119 54.9115 84.3874 54.8662 84.4629 54.8662C84.5082 54.8662 84.5384 54.8662 84.5686 54.8662C84.6592 54.8964 84.7044 54.9417 84.7497 54.9719C84.478 53.5528 83.9949 52.2545 83.2099 51.2883C82.2286 50.0806 80.885 49.5371 79.0432 49.6428C73.6689 49.9598 72.3706 57.9761 71.5101 63.2749C71.344 64.2864 71.193 65.2073 71.027 65.9923C69.94 71.2459 68.2039 76.5901 63.7505 78.4017C63.7203 78.2356 63.675 78.1601 63.6146 78.0997C63.675 78.1601 63.7203 78.2507 63.7203 78.3262C63.7354 78.4922 63.7807 78.6432 63.8259 78.7791C63.8712 78.9301 63.9316 79.0659 63.992 79.2169C64.0222 79.2924 64.0373 79.398 64.0373 79.5037C64.0373 79.6849 64.0071 79.7906 63.9769 79.8962C63.9316 80.017 63.8863 80.0925 63.841 80.168C63.7505 80.2736 63.6901 80.3189 63.6146 80.3189C63.5693 80.3189 63.5391 80.3189 63.5089 80.3038C63.3881 80.2585 63.3278 80.1982 63.2674 80.1227C63.1466 79.9717 63.056 79.8056 62.9956 79.6396C62.9352 79.4735 62.9051 79.3075 62.89 79.1263C62.89 78.9753 62.89 78.8093 62.9352 78.6583C62.9805 78.4621 63.0409 78.2809 63.1466 78.0997L63.1768 78.145ZM79.8283 77.9488C79.8283 77.9488 79.8283 78.0545 79.7981 78.1148C79.7981 78.145 79.7679 78.1752 79.7679 78.2054C79.7528 78.2507 79.7377 78.296 79.7075 78.3413C79.6924 78.3715 79.6622 78.3866 79.6471 78.4168C79.6169 78.447 79.5867 78.4772 79.5414 78.4923C79.5112 78.4923 79.481 78.5073 79.4509 78.5224C79.4207 78.5224 79.4056 78.5375 79.3754 78.5375C79.3452 78.5375 79.2999 78.5375 79.2546 78.5375C79.1791 78.613 79.1489 78.6583 79.1187 78.6734C79.0432 78.7036 79.0131 78.7187 78.9829 78.7187C78.9225 78.7187 78.8772 78.6885 78.8319 78.6583C78.7564 78.5828 78.7111 78.5224 78.6809 78.4621C78.6507 78.4017 78.6205 78.3262 78.6054 78.2507C78.5904 78.1299 78.5753 78.0545 78.5903 77.9941C78.6054 77.8733 78.6356 77.7676 78.6658 77.6619C78.7413 77.4657 78.8621 77.3298 79.0432 77.2392C79.1338 77.1939 79.2395 77.1638 79.3603 77.1487C79.4358 77.1487 79.481 77.1638 79.5112 77.1789C79.632 77.2392 79.6622 77.2845 79.7075 77.3298C79.7679 77.4204 79.7981 77.511 79.8132 77.5865C79.8283 77.7223 79.8434 77.7978 79.8434 77.8582C79.8434 77.8884 79.8434 77.9186 79.8434 77.9639L79.8283 77.9488ZM81.353 61.4634C81.353 61.5841 81.3681 61.7049 81.353 61.8257C81.3379 61.9766 81.3077 62.0823 81.2775 62.1578C81.0058 62.656 80.6586 63.0636 80.6888 63.6675C80.6888 63.8486 80.6435 63.9845 80.5831 64.0902C80.5529 64.1204 80.5227 64.1354 80.5076 64.1505C80.4472 64.1958 80.4019 64.2411 80.3265 64.2562C80.251 64.2713 80.2057 64.2562 80.1604 64.226C80.1302 64.226 80.1 64.226 80.0698 64.1958C79.9943 64.1354 79.9188 64.0298 79.8736 63.8637C79.8132 63.6071 79.7679 63.3353 79.7679 63.0636C79.7679 62.505 79.8736 61.9314 80.1755 61.4936C80.3265 61.2822 80.5378 61.101 80.7944 60.9652C80.8699 60.935 80.9303 60.9199 80.9756 60.9199C81.0813 60.9199 81.1568 60.9803 81.2171 61.0709C81.2926 61.1916 81.3228 61.2973 81.353 61.4181V61.4785V61.4634ZM80.1151 51.9073C80.251 51.5298 80.3868 51.1373 80.5378 50.7599C80.5831 50.6542 80.6284 50.5939 80.6737 50.5335C80.7643 50.4731 80.7944 50.458 80.8246 50.458C80.9303 50.458 80.9756 50.4882 81.0209 50.5335C81.1115 50.609 81.1568 50.6844 81.2021 50.7599C81.2473 50.8807 81.2624 50.9411 81.2775 51.0166C81.2775 51.1826 81.2775 51.2732 81.2473 51.3638C81.0964 51.7412 80.9303 52.1035 80.7793 52.4658C80.7341 52.5564 80.6888 52.6168 80.6435 52.6621C80.568 52.7074 80.5227 52.7225 80.4925 52.7376C80.4019 52.7376 80.3566 52.7074 80.3114 52.6772C80.2208 52.6017 80.1906 52.5413 80.1453 52.4658C80.1 52.3602 80.0849 52.2998 80.0849 52.2243C80.0849 52.0733 80.0849 51.9827 80.1 51.9073H80.1151ZM78.3035 54.0812C78.3035 54.0812 78.3337 53.9604 78.3639 53.9C78.4243 53.7792 78.4696 53.7188 78.53 53.6736C78.6054 53.6283 78.6658 53.5981 78.7111 53.5981C78.8017 53.5981 78.847 53.6132 78.8772 53.6434C78.9829 53.7188 79.0432 53.7943 79.0885 53.8849C79.1489 54.0359 79.2395 54.1566 79.315 54.2774C79.5716 54.6397 79.9188 54.9115 80.2359 55.2587C80.2963 55.3342 80.3415 55.4398 80.3868 55.5606C80.4321 55.7116 80.4472 55.8324 80.4472 55.9682C80.4472 56.1343 80.417 56.24 80.3566 56.3305C80.2812 56.4513 80.1906 56.4966 80.0849 56.5117C80.0245 56.5117 79.9792 56.5117 79.9339 56.5117C79.6924 56.4513 79.4961 56.3456 79.315 56.2098C78.9678 55.9229 78.7111 55.5153 78.53 55.0775C78.4394 54.8662 78.3639 54.6397 78.3035 54.4284C78.2733 54.3378 78.2733 54.2623 78.3035 54.1717C78.3035 54.1415 78.3035 54.1264 78.3035 54.0963V54.0812ZM76.5221 69.3136C76.5221 69.2381 76.5221 69.1626 76.5221 69.072C76.5221 69.0267 76.5523 68.9965 76.5674 68.9663C76.5976 68.906 76.6127 68.8456 76.658 68.8003C76.6882 68.7701 76.7335 68.7701 76.7637 68.755C76.809 68.7399 76.8392 68.6946 76.8844 68.6946C76.9146 68.6946 76.9448 68.6946 76.975 68.6946C77.1411 68.7248 77.2619 68.7852 77.3977 68.8607C77.5336 68.9361 77.6544 69.0116 77.7751 69.1022C77.8355 69.1475 77.8808 69.1928 77.911 69.2683C77.9563 69.389 77.9714 69.4343 77.9865 69.4796C77.9865 69.5098 77.9865 69.54 77.9865 69.5702C77.9865 69.6155 77.9865 69.6759 77.9865 69.7212C77.9865 69.7514 77.9865 69.7816 77.9865 69.8117C77.9865 69.857 77.9865 69.9174 77.9714 69.9627C77.9714 69.9929 77.9714 70.0231 77.9563 70.0533C77.9563 70.0986 77.9261 70.1439 77.8959 70.1892C77.8355 70.3099 77.7902 70.3401 77.76 70.3703C77.6695 70.4307 77.6242 70.4458 77.5638 70.4458C77.4883 70.4458 77.4128 70.4156 77.3222 70.3703C77.0203 70.1741 76.8241 69.9929 76.5976 69.7212C76.5372 69.6457 76.507 69.54 76.4919 69.4343C76.4919 69.4041 76.4919 69.3588 76.4919 69.3136H76.5221ZM74.5143 75.7296C74.5596 75.639 74.62 75.5937 74.6653 75.5484C74.7407 75.5182 74.7709 75.5031 74.8011 75.5031C74.8917 75.5031 74.9521 75.5635 75.0125 75.6239C75.1031 75.7447 75.1483 75.8353 75.1785 75.9258C75.2238 76.0768 75.2389 76.1825 75.254 76.3033C75.254 76.4995 75.2238 76.6052 75.1785 76.6958C75.0729 76.8769 74.937 77.0581 74.8162 77.2241C74.6954 77.4053 74.5898 77.5865 74.4539 77.7525C74.3935 77.828 74.3482 77.8733 74.3029 77.9035C74.1067 77.9337 74.0463 77.9035 74.001 77.8431C73.9255 77.7374 73.8953 77.6619 73.8802 77.5714C73.85 77.4506 73.8349 77.3449 73.8349 77.2392C73.8349 77.0732 73.85 76.9826 73.8802 76.9071C74.0765 76.4995 74.2576 76.0919 74.4992 75.6994L74.5143 75.7296ZM73.3368 56.2551C73.3368 56.1494 73.367 56.0588 73.3971 55.9682C73.4726 55.8324 73.5179 55.7569 73.5934 55.7267C73.6538 55.6965 73.6991 55.6814 73.7444 55.6814C73.9255 55.7569 73.9859 55.8173 74.0463 55.9531C74.1822 56.2551 74.2576 56.557 74.3331 56.8589C74.3633 56.9646 74.3784 57.0552 74.4086 57.1759C74.4237 57.2816 74.4237 57.3873 74.4086 57.4779C74.4086 57.5081 74.4086 57.5383 74.3935 57.5685C74.3784 57.6288 74.3482 57.6892 74.3331 57.7496C74.3331 57.7798 74.3029 57.7949 74.2878 57.8251C74.2576 57.8704 74.2124 57.9157 74.1671 57.9459C74.0614 58.0214 74.001 58.0515 73.9255 58.0515C73.8349 58.0515 73.7746 58.0063 73.7142 57.961C73.6085 57.8402 73.5481 57.7345 73.5179 57.5836C73.4122 57.1458 73.3519 56.723 73.3519 56.2702L73.3368 56.2551ZM72.4612 62.6258C72.4612 62.6258 72.4612 62.5654 72.4612 62.5352C72.4612 62.4748 72.4763 62.4295 72.4914 62.3842C72.5366 62.2484 72.5668 62.188 72.6121 62.1427L73.0499 61.6596C73.1254 61.5841 73.2009 61.5539 73.2613 61.5388C73.3066 61.5388 73.3368 61.5388 73.3669 61.5539C73.4726 61.5992 73.5179 61.6445 73.5632 61.7049C73.6085 61.7804 73.6538 61.8408 73.684 61.9163C73.684 61.9465 73.6991 61.9615 73.7142 61.9917C73.7293 62.0521 73.7444 62.0974 73.7595 62.1578C73.7595 62.188 73.7595 62.2182 73.7595 62.2484C73.7595 62.3088 73.7595 62.3541 73.7595 62.4144C73.7595 62.4446 73.7595 62.4748 73.7595 62.505C73.7595 62.5654 73.7444 62.6107 73.7293 62.6711C73.6689 62.822 73.6387 62.8824 73.5783 62.9428C73.4273 63.0787 73.2613 63.2146 73.1103 63.3504C73.0197 63.4259 72.9442 63.4561 72.8688 63.4561C72.8235 63.4561 72.7933 63.4561 72.7631 63.441C72.6725 63.3957 72.6272 63.3504 72.597 63.3051C72.5517 63.2297 72.5366 63.1693 72.5064 63.1089C72.4763 62.973 72.4612 62.9277 72.4612 62.8824C72.4612 62.8522 72.4612 62.822 72.4612 62.7919C72.4612 62.7315 72.4612 62.6862 72.4612 62.6409V62.6258ZM71.6761 68.1058C71.7214 67.9851 71.7667 67.9247 71.8271 67.8945C72.0385 67.8945 72.0837 67.9247 72.1441 67.9851C72.1592 68.0002 72.1894 68.0153 72.2045 68.0454C72.2649 68.136 72.3102 68.2417 72.3102 68.3474C72.3102 68.5738 72.3857 68.7701 72.5064 68.9512C72.5366 68.9965 72.5366 69.0871 72.5366 69.1626C72.5366 69.2985 72.5215 69.389 72.4914 69.4645C72.4461 69.6004 72.4159 69.6759 72.3706 69.7363C72.3102 69.8117 72.2649 69.8419 72.2045 69.8419C72.1139 69.8419 72.0536 69.8117 71.9932 69.7514C71.5403 69.2532 71.4648 68.7248 71.6761 68.0907V68.1058ZM71.4044 87.4747C71.6158 87.5502 71.6308 87.5955 71.6459 87.6257C71.6761 87.7464 71.6761 87.7917 71.661 87.837C71.6459 87.9729 71.6158 88.0333 71.5856 88.0635C71.4799 88.1842 71.3893 88.2295 71.2836 88.2597C71.0723 88.2899 70.9817 88.2597 70.8609 88.2144C70.8005 88.1993 70.7553 88.1389 70.7402 88.0785C70.71 87.9578 70.6949 87.9125 70.6949 87.8521C70.7251 87.7313 70.7251 87.686 70.7402 87.6408C70.8307 87.5804 70.8458 87.5502 70.8911 87.5502C71.0723 87.5502 71.2383 87.52 71.4044 87.4445V87.4747ZM70.2873 78.0846C70.2873 78.0846 70.3325 78.0394 70.3627 78.0243C70.4231 77.979 70.4684 77.9337 70.5288 77.9337C70.6043 77.9186 70.6345 77.9337 70.6798 77.9639C70.71 77.9639 70.7251 77.9639 70.7552 77.9941C70.8307 78.0545 70.8911 78.145 70.9364 78.296C71.027 78.6281 71.1025 78.915 71.1478 79.232C71.178 79.3829 71.1931 79.5339 71.1931 79.7C71.1931 79.8509 71.1931 80.017 71.1629 80.1831C71.1478 80.3038 71.1025 80.3944 71.0421 80.4548C70.9364 80.5303 70.8911 80.5605 70.8458 80.5605C70.7854 80.5605 70.7552 80.5605 70.7251 80.5454C70.6043 80.485 70.5439 80.4246 70.4986 80.334C70.1967 79.7453 70.2118 79.1263 70.1967 78.4772C70.1967 78.3111 70.2269 78.1903 70.3024 78.0846H70.2873ZM68.053 74.9597C68.053 74.8691 68.0832 74.7936 68.1285 74.7483C68.3398 74.4766 68.37 74.4162 68.6417 74.2199C68.7021 74.1746 68.7625 74.1595 68.8078 74.1595C68.8984 74.1595 68.9588 74.2048 69.0041 74.2501C69.0644 74.3105 69.0946 74.386 69.1097 74.4766C69.1399 74.5973 69.1399 74.6879 69.1399 74.7634C69.1248 74.8842 69.1097 74.9597 69.0644 75.02C69.0192 75.0955 68.989 75.1257 68.9437 75.171C68.8682 75.2616 68.7776 75.3673 68.687 75.4428C68.6417 75.488 68.6115 75.5182 68.5512 75.5635C68.4908 75.6088 68.4304 75.6239 68.3851 75.639C68.2794 75.639 68.2341 75.5937 68.1888 75.5484C68.1285 75.488 68.0983 75.4126 68.0832 75.322C68.053 75.1861 68.053 75.1106 68.053 75.02V74.9748V74.9597ZM64.7166 84.8026C64.8978 84.5309 65.079 84.3346 65.2903 84.2138C65.5168 84.0931 65.7734 84.0327 66.1055 84.0327C66.1508 84.0327 66.181 84.0478 66.2263 84.0629C66.2565 84.0629 66.3018 84.0629 66.3169 84.0931C66.3471 84.1082 66.3773 84.1535 66.4074 84.1836C66.4376 84.2138 66.4527 84.2289 66.4829 84.2591C66.498 84.2893 66.5131 84.3346 66.5282 84.3799C66.5282 84.4101 66.5584 84.4403 66.5735 84.4856C66.5735 84.5309 66.5735 84.5762 66.5886 84.6214C66.5886 84.6667 66.5886 84.6969 66.6037 84.7422C66.6037 84.7875 66.6037 84.8479 66.6037 84.8932C66.6037 84.9385 66.6037 84.9687 66.6037 85.014C66.6037 85.0743 66.5735 85.1196 66.5433 85.1649C66.5433 85.1951 66.5282 85.2253 66.5131 85.2404C66.4829 85.2857 66.4527 85.3159 66.4074 85.3612C66.3018 85.4518 66.2414 85.4819 66.1508 85.497C65.7734 85.5272 65.4715 85.648 65.1092 85.7537C65.0639 85.7537 65.0337 85.7688 65.0035 85.7688C64.9582 85.7688 64.928 85.7386 64.8978 85.7235C64.8676 85.7235 64.8223 85.7084 64.8072 85.6782C64.7619 85.6329 64.7468 85.5876 64.7166 85.5272C64.7166 85.497 64.6864 85.4668 64.6713 85.4216C64.6563 85.3461 64.6562 85.2706 64.6562 85.1951C64.6562 85.1649 64.6562 85.1196 64.6562 85.0894C64.6562 84.9838 64.7015 84.8781 64.7468 84.8177L64.7166 84.8026Z" />
+  </g>
+  <g id="grot-cta-cactus-2" fill="#9087e9">
+    <path d="M185.199 118.399C185.239 118.849 185.289 119.299 185.349 119.759C185.479 119.789 185.539 119.819 185.609 119.829C185.659 119.849 185.689 119.879 185.699 119.929C185.699 120.009 185.699 120.039 185.699 120.069C185.669 120.139 185.659 120.159 185.639 120.179C185.559 120.219 185.539 120.209 185.529 120.189C185.479 120.129 185.419 120.069 185.359 120.029C185.379 120.039 185.389 120.059 185.399 120.069C185.679 122.009 186.169 123.919 187.209 125.639C187.059 125.669 187.039 125.979 187.189 126.029C187.289 126.069 187.389 126.099 187.489 126.129C187.979 126.779 188.499 127.409 189.139 127.979C189.579 128.369 190.669 129.269 191.989 129.949C191.959 129.969 191.929 129.989 191.889 130.019C191.829 130.069 191.809 130.169 191.819 130.249C191.799 130.159 191.819 130.059 191.889 130.019C191.939 129.989 191.969 129.959 191.999 129.939C192.029 129.919 192.069 129.899 192.119 129.879C192.139 129.879 192.159 129.869 192.179 129.869C192.229 129.869 192.269 129.909 192.299 129.949C192.339 130.019 192.349 130.069 192.359 130.129C192.739 130.319 193.129 130.459 193.529 130.569C193.559 129.869 193.589 129.219 193.579 128.669V127.419C193.559 126.839 193.559 126.249 193.549 125.669C193.139 125.549 192.759 125.379 192.419 125.159C192.409 125.119 192.389 125.079 192.369 125.059C192.389 125.089 192.419 125.129 192.429 125.179L192.449 125.249C192.449 125.249 192.449 125.329 192.449 125.369C192.429 125.429 192.419 125.459 192.409 125.479C192.369 125.529 192.349 125.539 192.319 125.549C192.269 125.549 192.239 125.539 192.199 125.489L192.159 125.439C192.159 125.439 192.109 125.359 192.099 125.309C192.099 125.239 192.099 125.209 192.109 125.169C192.129 125.109 192.159 125.069 192.179 125.049C192.219 125.019 192.239 125.009 192.269 125.009C192.249 125.009 192.229 125.009 192.219 125.029C191.039 124.149 190.309 122.599 190.059 120.419C190.009 120.399 189.979 120.379 189.949 120.349C189.899 120.269 189.879 120.219 189.879 120.169C189.879 120.029 189.889 119.929 189.939 119.799C189.959 119.749 189.979 119.719 189.999 119.689C189.989 119.429 189.959 119.199 189.949 118.929C189.919 117.759 190.009 116.169 190.099 114.629C190.179 113.299 190.249 112.039 190.249 111.059C190.249 109.549 189.719 107.149 188.319 107.149C188.049 107.149 187.739 107.239 187.409 107.399C187.369 107.369 187.349 107.359 187.329 107.339L187.399 107.379C187.459 107.419 187.489 107.459 187.509 107.509C187.529 107.599 187.539 107.639 187.529 107.689C187.519 107.759 187.489 107.799 187.459 107.829C187.409 107.879 187.379 107.889 187.349 107.899C187.309 107.899 187.289 107.899 187.269 107.879C187.209 107.829 187.189 107.789 187.169 107.729L187.139 107.619C187.139 107.619 187.139 107.569 187.139 107.539C186.979 107.619 186.819 107.719 186.649 107.849C186.169 108.199 185.859 108.679 185.659 109.139C185.629 109.099 185.589 109.079 185.559 109.079C185.599 109.079 185.639 109.099 185.669 109.159C185.719 109.219 185.759 109.289 185.799 109.359C185.849 109.439 185.869 109.509 185.869 109.579C185.869 109.599 185.869 109.619 185.869 109.639C185.869 109.689 185.869 109.729 185.849 109.769C185.849 109.789 185.839 109.809 185.829 109.819C185.809 109.859 185.789 109.879 185.759 109.909C185.689 109.969 185.649 109.979 185.609 109.989C185.549 109.989 185.509 109.959 185.479 109.919C185.419 109.829 185.389 109.759 185.379 109.649C185.379 109.719 185.399 109.779 185.419 109.829C185.369 110.009 185.329 110.179 185.309 110.319C185.149 111.249 185.059 112.269 185.019 113.359C185.029 113.319 185.049 113.289 185.099 113.279C185.129 113.279 185.159 113.279 185.179 113.279C185.219 113.279 185.239 113.289 185.299 113.319C185.349 113.339 185.379 113.379 185.399 113.429C185.429 113.499 185.429 113.549 185.419 113.599C185.399 113.669 185.389 113.709 185.359 113.749C185.329 113.789 185.299 113.809 185.259 113.819C185.199 113.819 185.169 113.799 185.139 113.759C185.099 113.709 185.079 113.679 185.069 113.649C185.049 113.619 185.039 113.579 185.019 113.529C185.019 113.509 185.019 113.489 185.019 113.479C184.969 114.969 185.019 116.609 185.179 118.439L185.199 118.399ZM192.869 128.049C192.869 128.049 192.899 127.979 192.919 127.949C192.949 127.919 192.979 127.899 192.999 127.899C193.089 127.939 193.109 127.969 193.129 128.009C193.169 128.099 193.209 128.179 193.239 128.269C193.249 128.299 193.249 128.339 193.239 128.379C193.229 128.449 193.219 128.469 193.209 128.499C193.179 128.559 193.159 128.569 193.139 128.579C193.089 128.589 193.059 128.579 193.029 128.529C192.979 128.459 192.929 128.379 192.889 128.309C192.869 128.269 192.859 128.229 192.859 128.189C192.859 128.119 192.859 128.079 192.879 128.049H192.869ZM190.119 122.739C190.259 122.699 190.339 122.709 190.419 122.709C190.479 122.709 190.509 122.739 190.529 122.779C190.559 122.829 190.559 122.869 190.559 122.919C190.549 122.989 190.529 123.029 190.509 123.059C190.479 123.099 190.449 123.129 190.419 123.129C190.399 123.129 190.379 123.129 190.359 123.099C190.289 123.019 190.219 122.949 190.139 122.889C190.109 122.759 190.109 122.759 190.109 122.749L190.119 122.739ZM189.959 128.139C189.959 128.209 189.959 128.249 189.939 128.279C189.919 128.329 189.899 128.359 189.869 128.389C189.829 128.419 189.809 128.429 189.789 128.439C189.699 128.399 189.679 128.369 189.669 128.329C189.639 128.229 189.609 128.129 189.579 128.019C189.579 127.989 189.579 127.959 189.579 127.919C189.589 127.859 189.599 127.829 189.609 127.799C189.639 127.739 189.659 127.729 189.679 127.719C189.729 127.709 189.759 127.719 189.789 127.769C189.839 127.849 189.889 127.929 189.939 128.009C189.969 128.049 189.979 128.099 189.979 128.139H189.959ZM189.929 114.669L189.859 114.759C189.859 114.759 189.809 114.809 189.779 114.809C189.709 114.769 189.679 114.739 189.669 114.689C189.669 114.649 189.649 114.599 189.649 114.559C189.629 114.459 189.649 114.399 189.669 114.349C189.709 114.279 189.739 114.259 189.779 114.259C189.829 114.259 189.849 114.269 189.879 114.289C189.929 114.329 189.949 114.349 189.959 114.369C189.989 114.429 189.999 114.459 189.999 114.489C189.999 114.579 189.979 114.619 189.939 114.669H189.929ZM189.479 110.539C189.509 110.459 189.539 110.429 189.579 110.429C189.609 110.429 189.639 110.449 189.669 110.479C189.799 110.629 189.889 110.789 189.969 110.959C189.989 110.999 189.999 111.049 189.999 111.099C189.999 111.179 189.989 111.209 189.969 111.249C189.949 111.309 189.919 111.339 189.889 111.369C189.849 111.399 189.819 111.419 189.799 111.419C189.759 111.419 189.739 111.419 189.729 111.399C189.679 111.359 189.659 111.329 189.639 111.279C189.559 111.079 189.499 110.899 189.459 110.689C189.459 110.639 189.459 110.589 189.479 110.539ZM189.369 116.849C189.369 116.849 189.379 116.789 189.399 116.759C189.429 116.699 189.449 116.689 189.479 116.679C189.539 116.669 189.569 116.679 189.609 116.729L189.659 116.789L189.819 116.999C189.819 116.999 189.859 117.089 189.869 117.129C189.869 117.209 189.869 117.249 189.859 117.289C189.839 117.339 189.819 117.379 189.789 117.409C189.739 117.449 189.719 117.469 189.689 117.469C189.579 117.419 189.559 117.389 189.539 117.359C189.489 117.269 189.449 117.179 189.419 117.089L189.379 117.009C189.379 117.009 189.359 116.929 189.369 116.889C189.369 116.879 189.369 116.869 189.369 116.849ZM189.049 124.559C189.049 124.559 189.049 124.509 189.069 124.489C189.109 124.459 189.129 124.439 189.149 124.439C189.219 124.449 189.279 124.459 189.349 124.459C189.379 124.459 189.409 124.459 189.439 124.459C189.499 124.459 189.539 124.489 189.569 124.539C189.599 124.629 189.609 124.669 189.609 124.709C189.609 124.729 189.599 124.749 189.599 124.769C189.599 124.809 189.589 124.839 189.569 124.869C189.559 124.889 189.539 124.889 189.519 124.899C189.499 124.909 189.479 124.939 189.459 124.939C189.259 124.899 189.269 124.889 189.119 124.799C189.099 124.789 189.079 124.749 189.069 124.719C189.069 124.649 189.059 124.629 189.059 124.599C189.059 124.589 189.059 124.569 189.069 124.559H189.049ZM188.529 108.119C188.549 108.049 188.579 108.029 188.619 108.029C188.649 108.029 188.679 108.039 188.699 108.069C188.729 108.119 188.749 108.149 188.759 108.179C188.769 108.259 188.759 108.309 188.739 108.349C188.709 108.399 188.679 108.449 188.649 108.499C188.629 108.529 188.609 108.559 188.589 108.589C188.569 108.619 188.549 108.639 188.529 108.639C188.499 108.639 188.479 108.599 188.459 108.559C188.439 108.489 188.429 108.449 188.439 108.419C188.469 108.319 188.509 108.219 188.529 108.119ZM188.259 121.949C188.279 121.879 188.319 121.849 188.349 121.839C188.399 121.829 188.429 121.839 188.459 121.879C188.499 121.929 188.519 121.969 188.529 122.009C188.549 122.099 188.559 122.149 188.539 122.199C188.509 122.299 188.469 122.399 188.439 122.509C188.419 122.559 188.389 122.579 188.349 122.589C188.249 122.539 188.229 122.509 188.219 122.479C188.199 122.389 188.189 122.299 188.199 122.219C188.199 122.139 188.219 122.059 188.249 121.969L188.259 121.949ZM187.789 113.769C187.789 113.769 187.789 113.719 187.789 113.699C187.869 113.599 187.889 113.609 187.909 113.629C187.959 113.679 187.989 113.699 188.009 113.729C188.029 113.759 188.049 113.789 188.089 113.849C188.099 113.869 188.109 113.899 188.109 113.939C188.109 113.999 188.109 114.019 188.099 114.049C188.009 114.149 187.989 114.139 187.969 114.119C187.949 114.089 187.939 114.079 187.919 114.059C187.869 114.009 187.849 113.969 187.789 113.869C187.789 113.849 187.779 113.819 187.769 113.789C187.769 113.779 187.769 113.769 187.769 113.759L187.789 113.769ZM187.819 118.149C187.839 118.099 187.859 118.069 187.879 118.039C187.919 118.009 187.939 117.999 187.949 117.999C187.999 117.999 188.019 118.019 188.049 118.029C188.099 118.069 188.119 118.099 188.139 118.139C188.159 118.199 188.169 118.229 188.179 118.269C188.179 118.349 188.179 118.399 188.169 118.439C188.119 118.559 188.079 118.679 188.029 118.789C187.999 118.849 187.969 118.869 187.929 118.879C187.889 118.879 187.879 118.879 187.859 118.859C187.809 118.819 187.799 118.789 187.789 118.749C187.759 118.639 187.759 118.539 187.759 118.439C187.759 118.339 187.789 118.239 187.829 118.139L187.819 118.149ZM187.279 110.359C187.279 110.359 187.349 110.309 187.369 110.309C187.429 110.309 187.459 110.319 187.479 110.339C187.519 110.379 187.549 110.409 187.569 110.449C187.589 110.519 187.599 110.549 187.599 110.589C187.599 110.679 187.579 110.739 187.549 110.789C187.499 110.869 187.469 110.909 187.399 110.979C187.369 111.009 187.339 111.019 187.319 111.019C187.269 110.989 187.249 110.979 187.239 110.959C187.209 110.899 187.199 110.879 187.189 110.849C187.169 110.779 187.169 110.749 187.169 110.729C187.169 110.649 187.179 110.579 187.209 110.509C187.229 110.439 187.249 110.399 187.279 110.359ZM187.049 116.129C187.049 116.129 187.049 116.089 187.059 116.079C187.139 115.999 187.159 116.009 187.169 116.029C187.289 116.149 187.379 116.229 187.459 116.379C187.479 116.409 187.479 116.449 187.479 116.489C187.479 116.559 187.469 116.579 187.459 116.609C187.429 116.669 187.419 116.679 187.399 116.689C187.339 116.709 187.309 116.689 187.279 116.649C187.249 116.609 187.219 116.569 187.199 116.519C187.159 116.459 187.119 116.389 187.089 116.329C187.069 116.289 187.049 116.259 187.039 116.219C187.039 116.209 187.039 116.179 187.039 116.149V116.129H187.049ZM186.339 122.499C186.349 122.419 186.369 122.329 186.399 122.249C186.419 122.199 186.449 122.179 186.489 122.179C186.529 122.179 186.559 122.199 186.569 122.249C186.619 122.409 186.639 122.559 186.649 122.729C186.649 122.809 186.629 122.869 186.599 122.899C186.529 122.939 186.509 122.959 186.479 122.959C186.449 122.959 186.429 122.939 186.409 122.929C186.339 122.869 186.319 122.819 186.319 122.739C186.319 122.659 186.319 122.589 186.339 122.509V122.499ZM185.319 115.879C185.339 115.829 185.369 115.789 185.389 115.769C185.429 115.749 185.449 115.739 185.469 115.739C185.509 115.739 185.539 115.759 185.569 115.789C185.619 115.849 185.639 115.889 185.659 115.939C185.679 115.999 185.679 116.049 185.669 116.099C185.649 116.199 185.639 116.249 185.599 116.299C185.579 116.319 185.569 116.329 185.549 116.349C185.509 116.399 185.469 116.429 185.389 116.439C185.359 116.439 185.329 116.419 185.319 116.399C185.259 116.309 185.239 116.229 185.239 116.149C185.239 116.069 185.269 115.989 185.309 115.889L185.319 115.879Z" />
+    <path d="M204.809 110.7C204.809 110.64 204.839 110.62 204.869 110.62C204.839 110.62 204.819 110.64 204.809 110.7C204.809 110.75 204.809 110.78 204.799 110.82C204.779 110.85 204.759 110.87 204.739 110.9C204.739 111.76 204.739 112.61 204.719 113.46C204.719 114.1 204.709 114.72 204.699 115.34C204.699 115.4 204.699 115.47 204.699 115.53C204.759 115.48 204.829 115.44 204.889 115.39C204.909 115.36 204.939 115.34 204.989 115.33C205.339 115.06 205.689 114.78 205.999 114.52C205.999 114.5 205.989 114.49 205.999 114.46C205.999 114.42 206.009 114.38 206.019 114.34C206.019 114.3 206.029 114.26 206.039 114.22C206.059 114.15 206.099 114.12 206.139 114.12C206.179 114.12 206.219 114.15 206.229 114.22C206.229 114.25 206.239 114.28 206.249 114.32C206.279 114.3 206.319 114.27 206.339 114.24C207.249 113.45 207.979 112.44 208.509 111.33C208.459 111.22 208.449 111.19 208.449 111.16C208.449 111.07 208.459 111.02 208.489 110.99L208.639 110.82C208.639 110.82 208.679 110.78 208.699 110.78C208.999 110.18 209.189 109.52 209.329 108.84L209.249 108.76C209.249 108.76 209.209 108.69 209.199 108.65C209.199 108.58 209.199 108.55 209.199 108.52C209.219 108.46 209.229 108.44 209.249 108.42C209.309 108.39 209.339 108.4 209.359 108.42C209.509 107.8 209.599 107.13 209.649 106.46C209.599 106.36 209.599 106.34 209.599 106.32C209.599 106.25 209.599 106.22 209.619 106.2L209.689 106.04C209.739 105.29 209.749 104.53 209.739 103.78C209.729 103.76 209.719 103.75 209.709 103.72C209.709 103.69 209.699 103.65 209.699 103.61C209.699 103.54 209.709 103.51 209.719 103.49C209.739 103.31 209.739 103.18 209.739 103.05V102.66C209.739 101.79 209.739 100.97 209.189 100.47C208.859 100.17 208.359 100 207.819 100C207.439 100 207.059 100.09 206.749 100.25C206.179 100.55 205.879 101.05 205.709 101.55C205.729 101.58 205.749 101.6 205.779 101.64C205.809 101.67 205.809 101.72 205.809 101.76C205.799 101.83 205.789 101.86 205.779 101.88C205.749 101.94 205.729 101.95 205.709 101.96C205.659 101.98 205.629 101.96 205.609 101.92C205.559 102.18 205.529 102.43 205.529 102.63C205.529 103 205.529 103.36 205.529 103.73C205.519 103.75 205.499 103.76 205.489 103.79C205.509 103.74 205.529 103.71 205.559 103.69C205.669 103.66 205.699 103.68 205.719 103.7C205.759 103.75 205.789 103.79 205.799 103.83C205.809 103.88 205.819 103.93 205.809 103.97C205.799 104.06 205.779 104.11 205.739 104.15C205.679 104.22 205.649 104.24 205.579 104.29C205.539 105.02 205.539 105.71 205.509 106.4C205.529 106.41 205.539 106.45 205.549 106.49C205.549 106.56 205.549 106.59 205.549 106.63C205.539 106.67 205.519 106.7 205.499 106.72C205.499 107.02 205.489 107.32 205.449 107.63L205.399 108.11C205.319 108.92 205.219 109.93 204.899 110.61C204.939 110.65 204.959 110.68 204.959 110.71C204.979 110.8 204.979 110.9 204.969 111C204.969 111.05 204.959 111.08 204.939 111.1C204.789 111.08 204.779 111.05 204.779 111C204.779 110.97 204.779 110.95 204.779 110.92C204.779 110.84 204.779 110.78 204.799 110.68L204.809 110.7ZM208.439 106.07C208.439 106.07 208.399 106.15 208.369 106.18C208.319 106.23 208.289 106.24 208.259 106.25C208.169 106.21 208.159 106.18 208.149 106.16C208.069 105.97 208.049 105.9 208.049 105.74C208.049 105.71 208.059 105.67 208.079 105.64C208.109 105.59 208.139 105.57 208.159 105.56C208.189 105.56 208.219 105.57 208.239 105.61C208.259 105.63 208.279 105.66 208.299 105.68L208.359 105.75C208.359 105.75 208.419 105.84 208.439 105.89C208.449 105.98 208.449 106.02 208.439 106.07ZM208.549 102.55C208.549 102.55 208.609 102.57 208.629 102.59C208.669 102.63 208.689 102.66 208.699 102.7C208.719 102.75 208.729 102.8 208.729 102.84C208.729 102.91 208.719 102.95 208.699 102.99C208.619 103.12 208.589 103.15 208.459 103.22C208.379 103.22 208.349 103.19 208.339 103.15C208.319 103.09 208.309 103.04 208.319 103.01C208.349 102.85 208.369 102.77 208.449 102.62C208.479 102.57 208.509 102.55 208.549 102.54V102.55ZM207.979 100.36C207.979 100.36 207.979 100.31 207.989 100.28C208.009 100.22 208.019 100.21 208.029 100.19C208.189 100.21 208.229 100.24 208.269 100.26C208.309 100.29 208.339 100.32 208.399 100.37C208.439 100.41 208.459 100.45 208.469 100.5C208.479 100.58 208.479 100.63 208.469 100.68C208.449 100.75 208.429 100.78 208.409 100.81C208.369 100.86 208.339 100.87 208.309 100.88C208.249 100.88 208.219 100.86 208.179 100.81C208.129 100.75 208.099 100.7 208.069 100.64C208.039 100.59 208.009 100.54 207.969 100.46C207.969 100.44 207.959 100.41 207.959 100.38C207.959 100.37 207.959 100.36 207.959 100.35L207.979 100.36ZM207.459 109.07C207.479 109 207.519 108.94 207.569 108.88C207.609 108.83 207.649 108.81 207.689 108.81C207.749 108.81 207.779 108.83 207.809 108.86C207.839 108.91 207.859 108.95 207.879 108.99C207.899 109.06 207.899 109.11 207.889 109.16C207.869 109.24 207.849 109.28 207.809 109.31C207.729 109.37 207.699 109.39 207.609 109.42C207.479 109.38 207.469 109.35 207.459 109.33C207.439 109.26 207.439 109.24 207.439 109.21C207.439 109.13 207.449 109.09 207.459 109.07ZM206.929 101.24C206.959 101.16 206.999 101.09 207.049 101.01C207.079 100.96 207.119 100.94 207.149 100.93C207.189 100.93 207.219 100.94 207.239 100.97C207.279 101.01 207.289 101.05 207.309 101.08C207.329 101.14 207.339 101.18 207.339 101.22C207.339 101.29 207.319 101.33 207.299 101.37C207.219 101.49 207.129 101.6 207.059 101.72C207.029 101.77 206.999 101.79 206.969 101.79C206.929 101.77 206.909 101.76 206.899 101.73C206.869 101.67 206.859 101.65 206.849 101.62C206.839 101.55 206.829 101.51 206.849 101.48C206.879 101.39 206.899 101.31 206.929 101.23V101.24ZM206.719 103.95C206.739 103.89 206.749 103.87 206.769 103.86C206.839 103.83 206.859 103.84 206.879 103.86L207.029 103.96C207.029 103.96 207.099 104.03 207.109 104.08C207.109 104.16 207.109 104.2 207.109 104.23C207.079 104.3 207.069 104.32 207.049 104.34C206.969 104.38 206.949 104.37 206.929 104.34C206.879 104.28 206.819 104.22 206.759 104.17C206.729 104.15 206.719 104.11 206.709 104.07C206.709 104 206.709 103.98 206.709 103.95H206.719ZM206.559 106.74C206.609 106.65 206.649 106.57 206.689 106.5C206.739 106.43 206.789 106.36 206.859 106.3C206.889 106.27 206.919 106.26 206.939 106.26C206.999 106.3 207.009 106.32 207.019 106.35C207.039 106.42 207.039 106.45 207.049 106.48C207.049 106.56 207.049 106.6 207.029 106.63C206.939 106.81 206.849 106.89 206.699 107.03C206.669 107.05 206.649 107.07 206.629 107.07C206.579 107.03 206.569 107.02 206.559 106.99C206.539 106.93 206.539 106.9 206.529 106.88C206.529 106.81 206.529 106.77 206.539 106.75L206.559 106.74ZM206.539 110.62C206.539 110.62 206.559 110.53 206.579 110.49C206.619 110.44 206.639 110.43 206.659 110.42C206.719 110.42 206.759 110.44 206.789 110.5C206.849 110.61 206.889 110.72 206.919 110.84C206.939 110.9 206.939 110.96 206.939 111.01C206.929 111.09 206.919 111.12 206.909 111.14C206.879 111.2 206.859 111.22 206.839 111.23C206.789 111.27 206.769 111.27 206.749 111.28C206.689 111.28 206.649 111.26 206.619 111.23C206.569 111.16 206.549 111.1 206.539 111.01C206.539 110.94 206.539 110.88 206.539 110.82C206.539 110.75 206.539 110.69 206.539 110.62ZM205.699 109.39C205.729 109.32 205.749 109.27 205.779 109.21C205.789 109.19 205.809 109.16 205.819 109.13C205.849 109.08 205.879 109.06 205.909 109.06C205.969 109.09 205.989 109.11 206.009 109.14C206.039 109.21 206.049 109.25 206.049 109.28C206.049 109.38 206.039 109.43 205.999 109.47C205.919 109.54 205.899 109.56 205.809 109.61C205.689 109.51 205.679 109.49 205.679 109.47C205.679 109.41 205.679 109.39 205.679 109.38L205.699 109.39ZM205.049 112.86C205.139 112.79 205.179 112.76 205.279 112.71C205.299 112.71 205.319 112.7 205.329 112.7C205.379 112.7 205.409 112.73 205.439 112.77C205.479 112.83 205.489 112.88 205.499 112.94C205.499 113.02 205.499 113.08 205.469 113.12C205.439 113.18 205.399 113.21 205.339 113.22C205.299 113.22 205.259 113.23 205.219 113.23C205.189 113.23 205.159 113.23 205.119 113.23C205.079 113.23 205.049 113.21 205.029 113.18C205.009 113.15 204.989 113.11 204.989 113.07C204.979 112.99 204.989 112.9 205.049 112.86Z" />
+    <path d="M194.11 109.23C194.11 109.23 194.08 109.28 194.09 109.3C194.09 109.27 194.09 109.25 194.11 109.23C194.2 109.2 194.22 109.21 194.24 109.25C194.3 109.42 194.39 109.59 194.51 109.73C194.53 109.75 194.54 109.78 194.54 109.81C194.54 109.86 194.54 109.88 194.54 109.9C194.45 109.99 194.44 109.98 194.42 109.97C194.32 109.88 194.24 109.78 194.19 109.67C194.14 109.56 194.11 109.44 194.1 109.3C194.1 109.36 194.13 109.41 194.14 109.47C194.18 110.02 194.23 110.57 194.27 111.11C194.36 112.15 194.45 113.13 194.47 114.07C194.52 116 194.56 117.95 194.59 119.9C194.73 119.93 194.83 120.01 194.89 120.12C194.94 120.2 194.98 120.3 194.99 120.4C194.99 120.49 194.99 120.57 194.97 120.65C194.96 120.72 194.92 120.74 194.88 120.74C194.78 120.68 194.77 120.64 194.77 120.6C194.77 120.57 194.77 120.54 194.75 120.5C194.72 120.42 194.66 120.35 194.59 120.29C194.62 122.67 194.65 125.04 194.67 127.37V128.62C194.69 129.22 194.66 129.94 194.62 130.71C194.5 133.61 194.32 137.59 196.07 139.41C196.74 140.11 197.65 140.45 198.84 140.45C201.7 140.45 203.15 137.9 203.15 132.86V132.8C203.07 132.96 203 133.11 202.91 133.26C202.89 133.29 202.86 133.31 202.84 133.31C202.81 133.31 202.77 133.29 202.75 133.26C202.72 133.22 202.72 133.18 202.72 133.14C202.72 133.1 202.74 133.05 202.76 133.02C202.82 132.91 202.9 132.8 202.97 132.69C203 132.65 203.02 132.6 203.05 132.56C203.07 132.53 203.09 132.52 203.11 132.52C203.14 132.52 203.17 132.56 203.18 132.6C203.17 131.59 203.18 130.61 203.21 129.63C203.09 129.62 203.08 129.59 203.07 129.55C203.05 129.4 202.98 129.25 202.93 129.11C202.91 129.05 202.91 128.96 202.95 128.91C202.97 128.89 203 128.87 203.02 128.87C203.05 128.87 203.07 128.87 203.08 128.89C203.16 128.98 203.21 129.08 203.24 129.18C203.24 127.89 203.29 126.65 203.33 125.42C203.31 125.53 203.29 125.65 203.25 125.75C203.23 125.8 203.2 125.82 203.17 125.82C203.12 125.82 203.11 125.8 203.09 125.78C203.05 125.73 203.04 125.69 203.04 125.65C203.04 125.53 203.07 125.42 203.1 125.32C203.13 125.21 203.17 125.11 203.2 125C203.22 124.94 203.24 124.92 203.27 124.92C203.35 124.63 203.36 124.29 203.38 123.96C203.4 123.5 203.41 123.02 203.43 122.56C203.41 122.61 203.38 122.65 203.36 122.7C203.34 122.74 203.32 122.79 203.29 122.83C203.27 122.86 203.24 122.87 203.22 122.87C203.19 122.87 203.16 122.83 203.15 122.79C203.13 122.72 203.13 122.67 203.14 122.64C203.18 122.54 203.24 122.46 203.3 122.38C203.32 122.35 203.34 122.31 203.36 122.28C203.38 122.25 203.4 122.24 203.42 122.24C203.45 122.24 203.47 122.27 203.48 122.31C203.47 122.28 203.45 122.26 203.44 122.25C203.53 119.95 203.6 117.62 203.61 115.3C203.58 115.33 203.53 115.35 203.5 115.38C203.46 115.41 203.43 115.44 203.39 115.46C203.27 115.34 203.27 115.32 203.28 115.29C203.28 115.23 203.29 115.2 203.3 115.19C203.35 115.1 203.42 115.02 203.49 114.95C203.56 114.88 203.65 114.82 203.73 114.75C203.69 114.78 203.66 114.81 203.62 114.84C203.62 114.37 203.62 113.89 203.63 113.41C203.65 111.7 203.66 109.96 203.58 108.27C203.55 108.34 203.53 108.35 203.5 108.36C203.48 108.36 203.46 108.36 203.44 108.34C203.39 108.29 203.41 108.21 203.44 108.16C203.48 108.09 203.52 108.02 203.56 107.95C203.5 106.79 203.38 105.67 203.19 104.58C203.18 104.64 203.17 104.7 203.16 104.76C203.13 104.88 203.09 104.99 203.04 105.1C203.02 105.14 203 105.15 202.98 105.15C202.89 105.08 202.88 105.06 202.88 105.03C202.88 104.78 202.91 104.53 202.98 104.29C202.99 104.26 203.01 104.22 203.03 104.2C203.07 104.17 203.08 104.16 203.1 104.16C203.1 104.08 203.1 103.99 203.08 103.91C202.78 102.47 201.82 100.06 198.84 100.06C196.99 100.06 195.35 101.23 194.65 103.03C194.52 103.37 194.42 103.73 194.33 104.09C194.4 104.25 194.46 104.4 194.51 104.57C194.51 104.6 194.51 104.64 194.51 104.67C194.49 104.72 194.47 104.73 194.45 104.74C194.42 104.74 194.4 104.74 194.38 104.69C194.34 104.6 194.31 104.5 194.27 104.41C193.98 105.89 194 107.54 194.11 109.22V109.23ZM202.88 118.65C202.88 118.65 202.93 118.61 202.96 118.61C202.99 118.61 203.01 118.62 203.03 118.65C203.11 118.8 203.17 118.96 203.23 119.12C203.24 119.15 203.23 119.19 203.23 119.22C203.21 119.27 203.19 119.3 203.16 119.3C203.14 119.3 203.12 119.3 203.1 119.26C203.02 119.13 202.94 119.01 202.88 118.87C202.86 118.84 202.85 118.79 202.85 118.76C202.85 118.72 202.85 118.68 202.88 118.65ZM202.69 111.58C202.69 111.58 202.72 111.54 202.74 111.54C202.79 111.58 202.81 111.6 202.81 111.63C202.81 111.66 202.81 111.69 202.8 111.71C202.82 111.93 202.77 112.1 202.72 112.26C202.63 112.24 202.62 112.22 202.63 112.2C202.64 112.15 202.66 112.1 202.67 112.06C202.64 112.05 202.62 112 202.62 111.95C202.63 111.83 202.65 111.7 202.7 111.59L202.69 111.58ZM200.42 125.38C200.42 125.38 200.42 125.45 200.4 125.48C200.29 125.52 200.26 125.5 200.25 125.44L200.17 125.1C200.17 125.1 200.17 125.02 200.19 124.99C200.22 124.95 200.24 124.94 200.26 124.94C200.33 124.96 200.35 124.99 200.36 125.03C200.37 125.09 200.38 125.16 200.39 125.22C200.39 125.27 200.41 125.33 200.42 125.38ZM200.86 112.2C200.82 112.29 200.75 112.37 200.69 112.45C200.67 112.47 200.66 112.5 200.64 112.53C200.55 112.62 200.45 112.71 200.34 112.78C200.27 112.78 200.25 112.76 200.24 112.73C200.23 112.68 200.23 112.64 200.24 112.62C200.3 112.5 200.37 112.37 200.45 112.25C200.53 112.13 200.63 112.03 200.75 111.96C200.87 112.07 200.87 112.08 200.87 112.11C200.87 112.17 200.87 112.19 200.87 112.2H200.86ZM200.49 116.32C200.49 116.32 200.46 116.37 200.44 116.37C200.41 116.37 200.4 116.35 200.38 116.33C200.36 116.29 200.35 116.26 200.35 116.23C200.37 116.13 200.38 116.03 200.39 115.92C200.41 115.8 200.43 115.69 200.44 115.57C200.44 115.53 200.47 115.51 200.49 115.51C200.51 115.51 200.53 115.51 200.54 115.56C200.59 115.81 200.57 116.08 200.49 116.32ZM200.56 119.58C200.53 119.48 200.53 119.46 200.54 119.44C200.54 119.39 200.55 119.36 200.56 119.35C200.62 119.27 200.67 119.19 200.72 119.11C200.77 119.03 200.8 118.94 200.82 118.84C200.82 118.8 200.85 118.76 200.87 118.72C200.92 118.69 200.94 118.67 200.97 118.67C201.09 118.69 201.13 118.82 201.12 118.91C201.1 119.21 200.96 119.57 200.62 119.61C200.57 119.59 200.56 119.59 200.55 119.58H200.56ZM200.93 133.57C200.9 133.63 200.87 133.65 200.85 133.66C200.8 133.66 200.77 133.65 200.75 133.59C200.7 133.46 200.64 133.34 200.62 133.2C200.62 133.17 200.62 133.13 200.64 133.1C200.67 133.05 200.69 133.02 200.72 133.02C200.74 133.02 200.76 133.03 200.79 133.06C200.87 133.17 200.91 133.3 200.96 133.42C200.98 133.47 200.96 133.52 200.96 133.56L200.93 133.57ZM201.17 130.76C201.12 130.86 201.04 130.95 200.95 131.03C200.83 130.94 200.83 130.92 200.83 130.9C200.83 130.84 200.85 130.81 200.87 130.79C200.99 130.69 201.07 130.55 201.1 130.39C201.11 130.33 201.14 130.31 201.18 130.31C201.27 130.36 201.28 130.39 201.28 130.43C201.27 130.55 201.24 130.66 201.19 130.76H201.17ZM201.4 127.02C201.4 127.02 201.43 127.08 201.42 127.13C201.38 127.46 201.27 127.77 201.02 128C200.94 128 200.93 127.98 200.92 127.95C200.91 127.89 200.91 127.85 200.92 127.83C200.98 127.71 201.02 127.58 201.07 127.46C201.12 127.34 201.18 127.22 201.22 127.09C201.23 127.05 201.25 127.02 201.27 127C201.36 126.98 201.37 127 201.39 127C201.39 127 201.41 127 201.41 127.02H201.4ZM201.26 122.65C201.26 122.65 201.32 122.67 201.33 122.7C201.37 122.76 201.36 122.84 201.34 122.91C201.29 123.04 201.24 123.16 201.16 123.28C201.1 123.37 201.02 123.5 200.93 123.56C200.84 123.56 200.82 123.55 200.81 123.51C200.79 123.46 200.79 123.42 200.79 123.39C200.84 123.13 201 122.86 201.19 122.67C201.21 122.65 201.22 122.65 201.24 122.65C201.24 122.65 201.24 122.65 201.25 122.65H201.26ZM200.97 101.51C200.99 101.45 201 101.39 201.03 101.34C201.05 101.31 201.07 101.29 201.1 101.28C201.18 101.3 201.18 101.32 201.18 101.34C201.19 101.37 201.2 101.41 201.19 101.45C201.16 101.55 201.17 101.61 201.17 101.66C201.17 101.72 201.14 101.79 201.15 101.86C201.16 101.93 201.15 102.05 201.06 102.08C201.01 102.08 201 102.07 200.98 102.06C200.93 102.02 200.92 101.98 200.92 101.95C200.9 101.8 200.92 101.66 200.96 101.52L200.97 101.51ZM200.74 105.28C200.76 105.22 200.79 105.19 200.83 105.19C200.93 105.25 200.94 105.29 200.94 105.33C200.93 105.53 200.92 105.73 200.88 105.93C200.88 105.97 200.85 106.01 200.83 106.04C200.78 106.07 200.77 106.09 200.75 106.09C200.62 106.05 200.61 105.9 200.62 105.82C200.65 105.64 200.69 105.47 200.74 105.29V105.28ZM200.15 108.85C200.15 108.85 200.19 108.83 200.21 108.83C200.29 108.87 200.31 108.9 200.32 108.93C200.35 109 200.38 109.07 200.4 109.15C200.42 109.22 200.44 109.3 200.44 109.38C200.44 109.41 200.44 109.44 200.42 109.46C200.39 109.5 200.37 109.52 200.35 109.52C200.33 109.52 200.31 109.52 200.3 109.5C200.25 109.45 200.21 109.39 200.18 109.32C200.15 109.25 200.12 109.18 200.1 109.12C200.08 109.08 200.08 109.03 200.09 108.98C200.09 108.93 200.12 108.88 200.16 108.86L200.15 108.85ZM200.02 120.87C200.02 120.87 200.06 120.94 200.06 120.97C200.07 121.03 200.09 121.09 200.1 121.15C200.14 121.33 200.18 121.52 200.18 121.7C200.18 121.73 200.17 121.76 200.15 121.78C200.12 121.82 200.1 121.83 200.08 121.84C200.05 121.84 200.03 121.84 200.01 121.8C199.9 121.58 199.86 121.31 199.81 121.06C199.8 121 199.81 120.93 199.86 120.87C199.87 120.85 199.88 120.82 199.91 120.81C199.97 120.81 199.98 120.82 200 120.84C200 120.84 200.02 120.84 200.03 120.86L200.02 120.87ZM199.74 113.99C199.74 113.99 199.77 113.94 199.79 113.94C199.82 113.94 199.83 113.94 199.85 113.98L199.98 114.33C199.98 114.33 199.98 114.38 199.98 114.41C199.91 114.46 199.89 114.45 199.88 114.42L199.74 114.08C199.74 114.08 199.74 114.02 199.74 114V113.99ZM199.71 128.43C199.71 128.43 199.71 128.37 199.73 128.34C199.76 128.27 199.78 128.26 199.8 128.24C199.89 128.21 199.91 128.22 199.94 128.24C200.06 128.33 200.16 128.43 200.24 128.56C200.33 128.71 200.37 128.84 200.38 129.01C200.38 129.04 200.38 129.08 200.36 129.11C200.34 129.17 200.32 129.19 200.29 129.19C200.27 129.19 200.25 129.19 200.23 129.17C200.16 129.13 200.14 129.11 200.13 129.1C200.07 129.02 200.03 128.98 200 128.94C199.94 128.86 199.87 128.77 199.81 128.69L199.75 128.61C199.75 128.61 199.72 128.54 199.71 128.49C199.71 128.48 199.71 128.46 199.71 128.45V128.43ZM196.68 117.28C196.68 117.28 196.72 117.24 196.75 117.24C196.78 117.24 196.8 117.24 196.81 117.26C196.91 117.37 196.97 117.49 197.04 117.62C197.08 117.69 197.09 117.79 197.04 117.87C197.02 117.9 196.99 117.92 196.96 117.92C196.93 117.92 196.9 117.9 196.88 117.87C196.79 117.75 196.72 117.63 196.66 117.49C196.65 117.46 196.66 117.43 196.67 117.39C196.67 117.35 196.67 117.32 196.68 117.29V117.28ZM196.78 121.89C196.78 121.89 196.82 121.87 196.84 121.87C196.92 121.91 196.94 121.94 196.95 121.97C196.99 122.06 197.01 122.15 197.04 122.24C197.04 122.27 197.06 122.3 197.07 122.33C197.07 122.36 197.08 122.4 197.08 122.44C197.08 122.48 197.06 122.51 197.04 122.54C197.02 122.56 197 122.57 196.97 122.57C196.94 122.57 196.92 122.55 196.9 122.52C196.83 122.4 196.78 122.29 196.73 122.16C196.72 122.12 196.71 122.07 196.72 122.02C196.72 121.97 196.75 121.93 196.78 121.9V121.89ZM197.29 129.42C197.29 129.42 197.29 129.49 197.27 129.53C197.24 129.59 197.21 129.61 197.18 129.61C197.16 129.61 197.13 129.6 197.11 129.56C197.04 129.44 197 129.32 196.94 129.2C196.92 129.16 196.92 129.11 196.93 129.07C196.94 129.03 196.96 128.98 196.99 128.95C197.01 128.93 197.03 128.93 197.05 128.93C197.12 128.97 197.14 128.99 197.16 129.02C197.21 129.15 197.25 129.28 197.29 129.42ZM196.78 131.95C196.93 131.79 196.98 131.83 197.03 131.88C197.08 131.93 197.12 131.99 197.17 132.05C197.18 132.07 197.19 132.1 197.19 132.12C197.19 132.17 197.19 132.19 197.18 132.21C197.09 132.29 197.07 132.29 197.05 132.27C196.94 132.17 196.85 132.08 196.78 131.94V131.95ZM197.62 135.75C197.62 135.75 197.6 135.8 197.59 135.82C197.56 135.87 197.54 135.88 197.52 135.88C197.48 135.88 197.46 135.88 197.43 135.83C197.3 135.59 197.16 135.36 197.09 135.1C197.07 135.04 197.07 134.97 197.11 134.91C197.13 134.89 197.15 134.88 197.18 134.87C197.32 134.99 197.39 135.11 197.45 135.24C197.51 135.36 197.56 135.49 197.62 135.62C197.63 135.65 197.63 135.68 197.62 135.72C197.62 135.73 197.62 135.74 197.62 135.75ZM197.74 127.97C197.74 127.97 197.69 127.94 197.67 127.9C197.65 127.83 197.64 127.79 197.66 127.76C197.7 127.68 197.75 127.61 197.79 127.53C197.86 127.39 197.93 127.25 198.02 127.12C198.04 127.09 198.06 127.08 198.08 127.08C198.11 127.08 198.13 127.11 198.15 127.15C198.17 127.21 198.17 127.26 198.16 127.29C198.08 127.46 197.99 127.61 197.9 127.77C197.87 127.83 197.84 127.88 197.81 127.94C197.79 127.97 197.77 127.98 197.75 127.98L197.74 127.97ZM198.3 132.39C198.3 132.39 198.35 132.42 198.36 132.44C198.38 132.49 198.39 132.51 198.39 132.53C198.39 132.59 198.39 132.63 198.39 132.65C198.3 132.88 198.12 133.02 197.9 133.1C197.79 132.98 197.79 132.96 197.79 132.94C197.79 132.88 197.81 132.86 197.83 132.84C197.91 132.78 197.97 132.72 198.03 132.65C198.09 132.58 198.15 132.51 198.21 132.43C198.24 132.4 198.27 132.38 198.29 132.38L198.3 132.39ZM198.22 120.55C198.22 120.62 198.18 120.67 198.15 120.73C198.09 120.88 198 121.01 197.84 121.07C197.73 121.03 197.72 121.01 197.72 120.99C197.71 120.93 197.72 120.9 197.72 120.88C197.73 120.81 197.75 120.78 197.76 120.76C197.82 120.69 197.88 120.61 197.91 120.52C197.92 120.49 197.94 120.46 197.94 120.43C197.94 120.39 197.97 120.35 198 120.32C198.05 120.29 198.06 120.27 198.09 120.27C198.16 120.29 198.17 120.32 198.19 120.35C198.21 120.39 198.22 120.43 198.23 120.47C198.23 120.5 198.23 120.53 198.23 120.55H198.22ZM198.07 114.91C198.07 114.91 198.14 114.94 198.15 114.96C198.17 114.98 198.17 115.01 198.17 115.04C198.17 115.1 198.17 115.13 198.16 115.16C198.14 115.21 198.12 115.26 198.09 115.31C198.06 115.38 198.02 115.46 197.98 115.53C197.95 115.58 197.92 115.64 197.88 115.69C197.86 115.72 197.83 115.74 197.8 115.74C197.77 115.74 197.74 115.73 197.72 115.7C197.7 115.67 197.68 115.63 197.68 115.59C197.68 115.55 197.68 115.5 197.7 115.47C197.79 115.28 197.87 115.1 198.02 114.94C198.03 114.93 198.05 114.92 198.07 114.92V114.91ZM197.72 106.97C197.72 106.97 197.78 106.91 197.81 106.91C197.85 106.91 197.89 106.93 197.92 106.97C197.95 107.01 197.96 107.07 197.96 107.12C197.96 107.17 197.94 107.23 197.91 107.27C197.84 107.39 197.75 107.49 197.66 107.6C197.58 107.6 197.55 107.6 197.53 107.57C197.49 107.52 197.5 107.44 197.52 107.38C197.58 107.23 197.63 107.1 197.72 106.96V106.97ZM197.33 124.92C197.33 124.92 197.39 125.01 197.43 125.05C197.53 125.18 197.58 125.33 197.57 125.5C197.57 125.53 197.57 125.56 197.55 125.58C197.54 125.61 197.52 125.63 197.49 125.63C197.4 125.58 197.39 125.55 197.39 125.53C197.38 125.43 197.32 125.34 197.23 125.28C197.19 125.26 197.17 125.21 197.16 125.17C197.16 125.09 197.16 125.06 197.16 125.03C197.19 124.96 197.2 124.94 197.21 124.92C197.29 124.88 197.31 124.89 197.34 124.92H197.33ZM196.93 101.97C196.93 101.97 196.97 101.95 196.99 101.95C197.03 101.95 197.05 101.97 197.07 102C197.12 102.09 197.16 102.18 197.18 102.27C197.21 102.36 197.23 102.46 197.24 102.56C197.25 102.62 197.24 102.71 197.19 102.75C197.17 102.76 197.15 102.77 197.14 102.77C197.1 102.77 197.08 102.75 197.06 102.72C197.04 102.67 197.02 102.62 196.99 102.57C196.93 102.44 196.89 102.31 196.87 102.17C196.87 102.11 196.87 102.02 196.93 101.98V101.97ZM196.72 110.05C196.72 110.05 196.77 110.01 196.79 110.01C196.83 110.01 196.86 110.03 196.88 110.07C196.99 110.22 197.06 110.39 197.1 110.57C197.1 110.6 197.1 110.65 197.08 110.69C197.05 110.75 197.03 110.78 196.99 110.79C196.97 110.79 196.95 110.79 196.93 110.77C196.9 110.74 196.88 110.7 196.85 110.66C196.77 110.55 196.71 110.43 196.67 110.3C196.67 110.28 196.67 110.25 196.67 110.23C196.67 110.16 196.67 110.1 196.72 110.05ZM195.35 116.85C195.35 116.85 195.41 116.88 195.42 116.9C195.45 116.97 195.44 117.04 195.41 117.1C195.29 117.32 195.14 117.52 194.93 117.66C194.9 117.68 194.88 117.69 194.86 117.69C194.78 117.64 194.77 117.62 194.76 117.59C194.74 117.52 194.74 117.49 194.74 117.45C194.75 117.36 194.77 117.32 194.8 117.29C194.97 117.15 195.14 117.01 195.29 116.85C195.34 116.83 195.34 116.84 195.35 116.84V116.85ZM194.7 107.18C194.87 106.98 195.04 106.76 195.14 106.51C195.16 106.46 195.18 106.45 195.2 106.45C195.24 106.46 195.25 106.48 195.27 106.51C195.29 106.57 195.3 106.62 195.29 106.66C195.19 106.96 195.07 107.24 194.89 107.49C194.86 107.53 194.83 107.55 194.8 107.55C194.74 107.52 194.72 107.5 194.71 107.48C194.68 107.41 194.67 107.38 194.67 107.35C194.67 107.26 194.67 107.21 194.7 107.18ZM194.63 112.67C194.67 112.73 194.7 112.8 194.74 112.87C194.78 112.94 194.82 113 194.84 113.07C194.86 113.13 194.86 113.23 194.82 113.28C194.8 113.31 194.77 113.32 194.74 113.32C194.71 113.32 194.69 113.32 194.67 113.3C194.57 113.2 194.5 113.07 194.43 112.95C194.41 112.91 194.39 112.85 194.39 112.8C194.39 112.75 194.4 112.7 194.43 112.65C194.46 112.61 194.49 112.59 194.53 112.59C194.56 112.59 194.6 112.61 194.62 112.65L194.63 112.67Z" />
+  </g>
+  <path opacity="0.3" d="M125.654 159.24C155.834 159.24 180.3 156.368 180.3 152.825C180.3 149.282 155.834 146.409 125.654 146.409C95.4736 146.409 71.0078 149.282 71.0078 152.825C71.0078 156.368 95.4736 159.24 125.654 159.24Z" fill="#080821"/>
+  <path d="M189.979 110.609C194.593 111.964 202.76 118.5 200.546 124.948C198.332 131.397 190.512 130.335 181.539 123.907" fill="#F99F10"/>
+  <path d="M189.979 110.609C194.593 111.964 202.76 118.5 200.546 124.948C198.332 131.397 190.512 130.335 181.539 123.907" stroke="#3A1103" stroke-width="2.06554" stroke-miterlimit="10" stroke-linecap="round"/>
+  <path d="M115.554 36.1128C102.429 26.9625 85.6365 24.9093 82.6828 28.1935C80.2867 30.8539 89.3379 45.4284 87.8714 49.6875C86.409 53.9466 73.5696 51.1912 72.1651 56.607C71.5 59.1807 81.3484 65.3897 81.084 68.9837C80.8196 72.5778 73.2143 71.5615 72.6566 76.2131C72.2807 79.3403 79.2209 80.0302 78.9565 83.7565C78.6921 87.4827 73.6811 86.8011 73.9001 90.4116C74.0777 93.3405 79.5555 91.4113 81.0221 96.3356C82.4845 101.26 115.558 36.1128 115.558 36.1128H115.554Z" fill="#EF6122"/>
+  <path d="M57.0086 123.507C57.4093 111.461 65.816 108.788 71.9217 110.845C78.0233 112.902 77.6845 119.995 76.1437 122.664C73.6815 126.923 70.0669 125.085 71.4177 122.102C72.4175 119.239 72.6034 115.265 67.8733 116.529C61.9948 118.103 63.8248 133.909 76.2015 130.802C84.6785 128.675 84.0134 119.698 83.34 106.607C81.5347 93.9407 83.4887 77.3338 88.8757 61.5696C99.7899 29.6282 165.536 19.2468 187.36 48.7922C215.712 87.1699 184.448 124.655 179.639 129.443C164.66 141.068 167.089 151.586 156.357 152.284C146.157 152.949 146.996 142.584 140.25 142.006C139.853 142.006 139.457 142.006 139.06 141.997C131.141 142.58 129.612 152.457 117.669 152.284C107.936 152.143 112.27 143.642 105.768 139.564C104.404 138.92 103.223 138.465 102.132 138.168C101.273 137.986 100.319 137.854 99.2406 137.788C98.9927 137.771 97.4931 137.78 97.0552 137.78C93.1926 137.85 90.8751 138.763 82.1461 140.539C66.4191 143.737 56.6698 133.698 57.0086 123.507Z" fill="#FAC20C" stroke="#3A1103" stroke-width="2.06554" stroke-miterlimit="10"/>
+  <path d="M99.9346 44.2687C122.292 28.4302 148.314 37.0807 151.639 39.2784C154.965 41.4761 159.678 38.8653 157.03 32.268C148.157 10.175 125.262 -1.06152 119.099 2.7432C112.208 6.99821 120.875 25.9764 116.372 30.4255C112.757 33.9948 110.295 31.2683 104.148 29.2069C98.5961 27.3437 99.9346 44.2687 99.9346 44.2687Z" fill="#EF6122"/>
+  <path d="M139.09 19.7477C139.075 19.4295 139.023 19.0921 138.93 18.6947C138.837 18.2973 138.687 17.8773 138.477 17.4183C138.265 16.9789 137.977 16.4983 137.607 16.0548C137.472 15.8734 137.317 15.6929 137.141 15.5311C137.416 14.5044 136.856 13.603 136.856 13.603C135.867 13.5262 135.246 13.8727 135.005 14.0466C134.966 14.0269 134.926 14.0048 134.886 14.0047C134.729 13.943 134.551 13.8603 134.375 13.8177C134.197 13.7551 134.019 13.7121 133.842 13.6494C133.664 13.6064 133.468 13.5648 133.27 13.5208C133.23 13.5207 133.21 13.5197 133.172 13.4999C132.759 12.1245 131.541 11.5302 131.541 11.5302C130.158 12.3787 129.859 13.6023 129.859 13.6023C129.859 13.6023 129.858 13.6219 129.839 13.6808C129.759 13.6984 129.681 13.7183 129.601 13.7359C129.501 13.7745 129.381 13.8116 129.282 13.8306C129.183 13.8691 129.062 13.9063 128.963 13.9449C128.764 14.0398 128.543 14.1352 128.343 14.232C128.143 14.3485 127.943 14.4631 127.762 14.5786C127.744 14.558 127.724 14.5589 127.724 14.5589C125.833 13.8128 124.133 14.6764 124.133 14.6764C123.939 16.6946 124.829 17.9997 125.023 18.2397C124.981 18.3584 124.939 18.4949 124.899 18.6141C124.752 19.0685 124.645 19.5407 124.558 20.0359C124.556 20.115 124.535 20.1734 124.535 20.2529C122.737 21.0541 122.191 22.8301 122.191 22.8301C123.629 24.5402 125.35 24.6885 125.35 24.6885C125.561 25.088 125.812 25.4498 126.085 25.8112C126.201 25.9518 126.318 26.0929 126.454 26.2345C125.893 27.7522 126.485 29.0495 126.485 29.0495C128.128 29.1363 129.212 28.3815 129.433 28.2066C129.59 28.2683 129.769 28.3113 129.927 28.3533C130.421 28.5 130.935 28.5682 131.45 28.6167C131.569 28.6189 131.708 28.6201 131.827 28.6223L131.886 28.6234L131.926 28.6235L132.005 28.6255L132.084 28.6276C132.839 29.7513 134.183 29.9117 134.183 29.9117C135.172 28.9182 135.228 27.9078 135.232 27.6898L135.232 27.6702L135.233 27.6304L135.233 27.5906C135.434 27.4545 135.634 27.3002 135.815 27.1448C136.198 26.7939 136.561 26.4042 136.846 25.9927C136.866 25.954 136.907 25.9148 136.927 25.876C138.016 25.954 138.802 25.2336 138.802 25.2336C138.643 24.101 137.998 23.5344 137.861 23.4143L137.843 23.3936L137.823 23.3926C137.823 23.3926 137.803 23.3917 137.804 23.372C137.805 23.3126 137.827 23.2345 137.828 23.1751C137.83 23.0563 137.852 22.9385 137.853 22.7995L137.855 22.7003L137.855 22.6606L137.856 22.6409L137.856 22.6012L137.858 22.5221L137.859 22.4229L137.86 22.3238L137.861 22.2246L137.863 22.1254L137.844 22.0252C137.827 21.9054 137.808 21.7674 137.771 21.6466C137.66 21.149 137.489 20.6902 137.239 20.269C136.99 19.8478 136.678 19.4667 136.326 19.143C135.974 18.8194 135.582 18.5751 135.171 18.3697C134.758 18.1839 134.323 18.0383 133.888 17.99C133.671 17.967 133.452 17.9435 133.234 17.9383L133.155 17.9363L133.136 17.9353C133.136 17.9353 133.096 17.9352 133.116 17.9343L133.076 17.9342L132.997 17.9321L132.918 17.9301C132.798 17.9476 132.699 17.9464 132.581 17.9643C132.143 18.0367 131.745 18.1887 131.365 18.3992C131.005 18.6108 130.683 18.8635 130.421 19.1773C130.157 19.4709 129.954 19.8035 129.809 20.1587C129.663 20.5139 129.578 20.8683 129.553 21.2242L129.55 21.482L129.549 21.5414L129.547 21.6204L129.545 21.7393C129.561 21.9185 129.598 22.0968 129.635 22.2555C129.729 22.5935 129.862 22.8937 130.055 23.1356C130.23 23.3966 130.464 23.5988 130.698 23.7813C130.933 23.9442 131.189 24.0665 131.444 24.1508C131.699 24.2352 131.938 24.2578 132.176 24.2621L132.255 24.2642L132.295 24.2643L132.335 24.2644L132.414 24.2664L132.433 24.2674L132.453 24.2684L132.493 24.2685C132.533 24.2686 132.552 24.2696 132.573 24.2509C132.592 24.2519 132.633 24.2323 132.653 24.2333C132.713 24.2148 132.753 24.2149 132.812 24.1958C132.911 24.1572 133.012 24.121 133.111 24.0824C133.21 24.0438 133.29 23.9865 133.371 23.9273C133.391 23.9086 133.411 23.8876 133.43 23.8886C133.51 23.8312 133.533 23.7115 133.453 23.6318C133.396 23.5517 133.296 23.5304 133.216 23.5877C133.195 23.6064 133.175 23.6073 133.156 23.6264C133.097 23.6651 133.017 23.6827 132.936 23.7021C132.856 23.7197 132.778 23.7396 132.698 23.7572C132.658 23.7571 132.618 23.7748 132.578 23.7747L132.518 23.7736L132.459 23.7725L132.4 23.7714L132.32 23.7694L132.301 23.7684L132.261 23.7683L132.202 23.7672C132.024 23.7443 131.827 23.6826 131.649 23.5998C131.473 23.5175 131.295 23.3949 131.14 23.2542C130.984 23.1135 130.847 22.9316 130.751 22.7522C130.656 22.5532 130.579 22.3528 130.544 22.115C130.526 21.9952 130.528 21.896 130.53 21.7772L130.531 21.678L130.532 21.6584L130.533 21.6388L130.533 21.599C130.534 21.5396 130.555 21.4812 130.556 21.4217C130.644 20.9467 130.908 20.4762 131.291 20.1253C131.392 20.0273 131.493 19.9495 131.593 19.8931C131.694 19.8152 131.814 19.758 131.934 19.7007C132.054 19.6435 132.173 19.6059 132.313 19.5678C132.432 19.5302 132.572 19.5119 132.711 19.515L132.909 19.5192L132.948 19.5193L133.008 19.5204L133.048 19.5205L133.067 19.5215L133.127 19.5226C133.264 19.5454 133.424 19.5677 133.561 19.5887C133.838 19.6525 134.114 19.7561 134.369 19.92C134.88 20.2061 135.308 20.6703 135.577 21.2099C135.711 21.4905 135.806 21.7691 135.84 22.0662C135.858 22.1462 135.858 22.2258 135.857 22.2852L135.856 22.3446L135.854 22.404L135.853 22.4634L135.852 22.5228L135.852 22.5626L135.851 22.622L135.848 22.7605C135.846 22.8395 135.826 22.9181 135.824 22.9971C135.822 23.0762 135.802 23.1547 135.78 23.2347C135.758 23.3146 135.738 23.3932 135.716 23.4712C135.674 23.6297 135.612 23.7872 135.549 23.9443C135.425 24.2392 135.261 24.534 135.058 24.809C134.652 25.3371 134.13 25.7644 133.51 26.0314C133.21 26.1644 132.891 26.2591 132.553 26.313C132.394 26.3304 132.216 26.3473 132.057 26.3647L132.017 26.3646L131.997 26.3636L131.938 26.3625L131.859 26.3604L131.819 26.3604L131.8 26.3594C131.72 26.3573 131.621 26.3561 131.543 26.3363C131.187 26.3102 130.831 26.2241 130.495 26.1195C130.16 26.0148 129.826 25.8708 129.531 25.7068C128.923 25.3601 128.356 24.8946 127.929 24.3313C127.715 24.0505 127.523 23.7492 127.37 23.4499C127.216 23.1305 127.103 22.8116 127.01 22.4718C126.916 22.1338 126.883 21.795 126.848 21.4581L126.849 21.3987L126.85 21.379L126.851 21.3594L126.852 21.3397L126.853 21.2803L126.854 21.2607L126.855 21.241L126.856 21.2013L126.858 21.1222L126.859 21.1026L126.859 21.0628L126.861 20.944C126.864 20.7657 126.886 20.6081 126.909 20.429C126.932 20.2518 126.975 20.0736 126.998 19.9142C127.041 19.736 127.082 19.5794 127.127 19.4017C127.232 19.0661 127.356 18.7314 127.5 18.4375C127.787 17.8277 128.175 17.279 128.637 16.8506C128.758 16.734 128.878 16.637 129 16.5404C129.122 16.4439 129.241 16.3665 129.381 16.2686C129.502 16.1917 129.641 16.1135 129.781 16.0376C129.841 15.9989 129.921 15.9813 129.98 15.9426C130.021 15.9231 130.059 15.9049 130.08 15.904C130.12 15.8845 130.159 15.8663 130.179 15.8654C130.318 15.8092 130.478 15.752 130.617 15.7135C130.658 15.694 130.697 15.6959 130.736 15.6759C130.777 15.6564 130.816 15.6583 130.855 15.6383C130.935 15.6207 131.014 15.6008 131.074 15.5822C131.115 15.5627 131.154 15.5647 131.194 15.5648C131.234 15.5649 131.274 15.5472 131.314 15.5473C131.353 15.5474 131.394 15.5297 131.433 15.5298L131.494 15.5112L131.553 15.5123C131.593 15.5124 131.633 15.4947 131.673 15.4948C131.713 15.4949 131.753 15.4772 131.813 15.4783C131.852 15.4784 131.913 15.4599 131.952 15.4618L132.031 15.4639L132.09 15.465L132.11 15.466L132.15 15.466L132.288 15.4692L132.348 15.4703L132.367 15.4713L132.387 15.4722L132.506 15.4744L132.942 15.4811C133.238 15.5061 133.516 15.5307 133.793 15.5945C134.346 15.7025 134.878 15.8905 135.349 16.1368C135.82 16.383 136.251 16.6671 136.603 16.9908C136.622 17.0114 136.643 17.0307 136.661 17.0513C136.68 17.0719 136.701 17.0911 136.72 17.1118C136.759 17.1516 136.797 17.1929 136.856 17.2337C136.896 17.2736 136.933 17.3149 136.973 17.3547C137.012 17.3946 137.05 17.4358 137.089 17.4757C137.246 17.6365 137.381 17.8179 137.517 17.9974C137.768 18.3396 137.981 18.6797 138.134 19.0188C138.153 19.0394 138.154 19.0595 138.173 19.0783C138.192 19.0971 138.192 19.119 138.191 19.1387C138.211 19.1794 138.229 19.2178 138.248 19.2586C138.268 19.2993 138.286 19.3378 138.306 19.3785C138.325 19.4192 138.343 19.4577 138.363 19.4984C138.42 19.6581 138.476 19.7976 138.515 19.9367C138.591 20.1567 138.646 20.3557 138.682 20.534C138.701 20.5944 138.759 20.6549 138.84 20.6354C138.919 20.6375 138.979 20.5792 138.981 20.5001C139.106 20.2052 139.111 19.9877 139.094 19.7486L139.09 19.7477Z" fill="#FAC20C" fill-opacity="0.5"/>
+  <path d="M127.975 119.854C122.213 125.093 115.652 127.03 111.984 122.548C107.932 117.595 111.575 111.857 116.888 107.007" fill="#F99F10"/>
+  <path d="M127.975 119.854C122.213 125.093 115.652 127.03 111.984 122.548C107.932 117.595 111.575 111.857 116.888 107.007" stroke="#3A1103" stroke-width="2.06554" stroke-miterlimit="10" stroke-linecap="round"/>
+  <path d="M107.857 31.6853C96.5872 26.381 85.5944 23.5678 82.682 28.1946C79.5341 33.1973 90.2666 43.8224 87.8706 49.6886C85.6316 55.1746 72.9864 50.4652 72.1643 56.6081C71.5075 61.5241 81.3477 65.3908 81.0833 68.9848C80.8189 72.5788 73.1186 71.1123 72.5567 75.768C72.1808 78.8952 79.2201 80.0313 78.9516 83.7575C78.6872 87.4837 73.9654 86.798 73.8952 90.4127C73.8291 93.7878 82.5209 93.7423 82.7646 99.8604" stroke="#3A1103" stroke-width="2.06554" stroke-miterlimit="10"/>
+  <path d="M151.639 39.2779C154.965 41.4756 159.678 38.8648 157.03 32.2674C148.157 10.1745 125.94 -1.10338 119.099 2.74265C111.919 6.77871 120.875 25.9758 116.372 30.425C113.856 32.9119 110.552 32.8045 107.523 31.5321" stroke="#3A1103" stroke-width="2.06554" stroke-miterlimit="10"/>
+  <path d="M151.772 39.3768C139.812 32.2879 118.992 31.8665 100.232 45.8956" stroke="#3A1103" stroke-width="2.06554" stroke-miterlimit="10"/>
+  <path d="M133.284 88.646L194.34 93.5863C201.676 94.1799 208.104 88.7139 208.698 81.3777L208.698 81.3736C209.292 74.0374 203.826 67.6089 196.49 67.0153L135.434 62.0751C128.097 61.4814 121.669 66.9474 121.075 74.2837L121.075 74.2878C120.481 81.624 125.947 88.0524 133.284 88.646Z" fill="#5545EF" stroke="#231735" stroke-width="2.06554" stroke-miterlimit="10"/>
+  <path d="M147.72 85.3174L194.052 89.0663C198.918 89.4601 203.182 85.8342 203.576 80.9676C203.97 76.101 200.344 71.8367 195.478 71.4429L149.146 67.6941C144.28 67.3003 140.015 70.9262 139.622 75.7928C139.228 80.6593 142.854 84.9237 147.72 85.3174Z" fill="#19052D"/>
+  <path d="M157.095 82.5854C157.145 81.9596 156.519 81.395 155.704 81.329L148.111 80.7147C147.296 80.6487 146.588 81.1053 146.537 81.7312C146.486 82.3571 147.112 82.9216 147.927 82.9876L155.52 83.602C156.336 83.6679 157.044 83.2113 157.095 82.5854Z" fill="white"/>
+  <path d="M157.46 78.0845C157.51 77.4586 156.885 76.894 156.069 76.8281L148.477 76.2137C147.661 76.1477 146.953 76.6043 146.902 77.2302C146.852 77.8561 147.477 78.4207 148.293 78.4866L155.885 79.101C156.701 79.167 157.409 78.7104 157.46 78.0845Z" fill="white"/>
+  <path d="M170.198 83.645C170.249 83.0191 169.623 82.4546 168.808 82.3886L161.215 81.7742C160.399 81.7083 159.691 82.1649 159.64 82.7908C159.59 83.4166 160.216 83.9812 161.031 84.0472L168.624 84.6615C169.439 84.7275 170.147 84.2709 170.198 83.645Z" fill="white"/>
+  <path d="M170.561 79.145C170.612 78.5191 169.986 77.9546 169.171 77.8886L161.578 77.2742C160.763 77.2083 160.054 77.6649 160.004 78.2908C159.953 78.9166 160.579 79.4812 161.394 79.5472L168.987 80.1615C169.802 80.2275 170.511 79.7709 170.561 79.145Z" fill="white"/>
+  <path d="M170.927 74.6489C170.977 74.023 170.351 73.4585 169.536 73.3925L161.943 72.7781C161.128 72.7122 160.42 73.1688 160.369 73.7947C160.318 74.4205 160.944 74.9851 161.759 75.0511L169.352 75.6654C170.168 75.7314 170.876 75.2748 170.927 74.6489Z" fill="white"/>
+  <path d="M183.3 84.7056C183.35 84.0797 182.724 83.5151 181.909 83.4492L174.316 82.8348C173.501 82.7688 172.793 83.2254 172.742 83.8513C172.691 84.4772 173.317 85.0417 174.132 85.1077L181.725 85.7221C182.541 85.788 183.249 85.3314 183.3 84.7056Z" fill="white"/>
+  <path d="M196.401 85.7651C196.452 85.1393 195.826 84.5747 195.011 84.5087L187.418 83.8944C186.603 83.8284 185.894 84.285 185.844 84.9109C185.793 85.5368 186.419 86.1013 187.234 86.1673L194.827 86.7816C195.642 86.8476 196.351 86.391 196.401 85.7651Z" fill="white"/>
+  <path d="M196.766 81.2651C196.817 80.6393 196.191 80.0747 195.376 80.0087L187.783 79.3944C186.968 79.3284 186.259 79.785 186.209 80.4109C186.158 81.0368 186.784 81.6013 187.599 81.6673L195.192 82.2817C196.007 82.3476 196.716 81.891 196.766 81.2651Z" fill="white"/>
+  <path d="M171.748 104.198L159.416 102.806C157.532 102.593 156.172 100.887 156.385 99.0029C156.447 98.4491 156.947 98.0507 157.501 98.1132C158.055 98.1757 158.453 98.6755 158.391 99.2293C158.303 100.009 158.866 100.712 159.643 100.8L171.975 102.192C172.529 102.254 172.927 102.754 172.864 103.308C172.802 103.862 172.302 104.26 171.748 104.198Z" fill="#231F20"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M242 64.8081C243.527 65.5394 245.147 66.1493 246.865 66.5965C247.578 66.782 248.306 66.9366 249.047 67.0611C251.266 67.4329 253.59 67.5604 255.96 67.5349C259.346 67.4986 262.831 67.0989 266.275 66.4191C270.358 65.6132 274.377 64.3926 278.112 62.903C282.213 61.2684 285.971 59.3022 289.067 57.1158C289.342 56.9179 289.405 56.5333 289.208 56.2569C289.011 55.981 288.628 55.9172 288.353 56.1151C285.362 58.3081 281.727 60.3172 277.735 61.9653C274.072 63.4773 270.11 64.6817 266.093 65.5046C262.707 66.198 259.279 66.6069 255.946 66.6827C253.621 66.7356 251.345 66.6027 249.154 66.3282C248.422 66.2366 247.701 66.1342 246.988 66.0163C245.253 65.7295 243.585 65.3542 242 64.8085V64.8081Z" fill="#3B3B5A"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M242.827 68.5993C245.17 69.3267 247.614 69.9091 250.115 70.3215C252.571 70.7262 255.077 70.979 257.588 71.0501C259.6 71.1073 261.614 71.0451 263.603 70.875C266.656 70.6137 269.65 70.0823 272.499 69.2957C277.676 67.8599 282.939 65.2459 288.327 63.8297C291.878 62.8963 295.484 62.4866 299.158 63.3226C306.092 64.8984 308.96 69.1466 308.614 73.111C308.243 77.3738 304.17 81.1864 297.694 80.7859C294.532 80.5857 292.718 77.9559 292.465 75.226C292.213 72.5057 293.519 69.6521 296.677 69.0124C299.42 68.4574 301.072 69.7051 301.506 71.2612C301.762 72.1768 301.593 73.1806 300.971 73.8968C300.437 74.5109 299.573 74.8951 298.39 74.8723C298.052 74.8669 297.773 75.1386 297.768 75.4784C297.763 75.8181 298.033 76.0979 298.371 76.1034C299.993 76.1219 301.152 75.5329 301.877 74.6853C302.753 73.6606 303.006 72.2375 302.633 70.9396C302.056 68.9336 299.99 67.1676 296.452 67.9128C292.687 68.7044 291.096 72.0821 291.418 75.328C291.735 78.5334 293.918 81.5767 297.634 81.7913C304.772 82.2137 309.173 77.8941 309.571 73.1949C309.936 68.8702 306.926 64.12 299.36 62.4205C295.537 61.5632 291.788 61.9857 288.1 62.9686C282.711 64.4041 277.453 67.0412 272.277 68.4976C269.478 69.2892 266.533 69.8117 263.532 70.1051C261.57 70.2968 259.584 70.3845 257.596 70.3857C255.106 70.3869 252.615 70.25 250.166 69.9575C247.657 69.6575 245.194 69.2096 242.826 68.6004L242.827 68.5993Z" fill="#3B3B5A"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M291.436 59.5939C292.226 59.4088 293.019 59.2773 293.833 59.1382C294.098 59.093 294.361 59.047 294.625 58.9967C294.887 58.9469 295.148 58.8912 295.411 58.8402C298.474 58.2438 301.661 58.1151 304.617 58.8193C305.752 59.0899 306.856 59.4718 307.895 60.0048C309.392 60.772 310.752 61.8438 311.93 63.2368C312.154 63.4911 312.542 63.5154 312.795 63.2905C313.049 63.0655 313.073 62.6763 312.849 62.4216C311.457 60.9011 309.857 59.7871 308.131 58.994C306.375 58.1862 304.49 57.7042 302.546 57.5249C300.958 57.3784 299.335 57.4182 297.726 57.6281C296.667 57.7665 295.608 57.9532 294.584 58.2492C294.253 58.3451 293.929 58.4545 293.609 58.5789C292.852 58.8731 292.144 59.2267 291.436 59.5939H291.436Z" fill="#3B3B5A"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M10 9.80809C11.5269 10.5394 13.147 11.1493 14.8652 11.5965C15.5783 11.782 16.3059 11.9366 17.0475 12.0611C19.2659 12.4329 21.5902 12.5604 23.9599 12.5349C27.3459 12.4986 30.8311 12.0989 34.2748 11.4191C38.3577 10.6132 42.3771 9.39259 46.1125 7.90298C50.2127 6.26842 53.9708 4.30224 57.067 2.11575C57.3417 1.91786 57.4052 1.53328 57.2082 1.25693C57.0112 0.980957 56.6283 0.917183 56.3532 1.11508C53.362 3.30814 49.7274 5.31722 45.7354 6.9653C42.0723 8.47733 38.1103 9.6817 34.0928 10.5046C30.7072 11.198 27.2789 11.6069 23.946 11.6827C21.6206 11.7356 19.3448 11.6027 17.1541 11.3282C16.4222 11.2366 15.7006 11.1342 14.9876 11.0163C13.2532 10.7295 11.5847 10.3542 10 9.80848L10 9.80809Z" fill="#3B3B5A"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M10.8269 13.5993C13.1701 14.3267 15.614 14.9091 18.1153 15.3215C20.5708 15.7262 23.0771 15.979 25.5876 16.0501C27.5998 16.1073 29.6139 16.0451 31.603 15.875C34.6558 15.6137 37.6496 15.0823 40.4992 14.2957C45.6757 12.8599 50.9388 10.2459 56.3266 8.82971C59.878 7.89629 63.4841 7.48659 67.1579 8.32261C74.0915 9.89841 76.9595 14.1466 76.614 18.111C76.2426 22.3738 72.1701 26.1864 65.6945 25.7859C62.5325 25.5857 60.7177 22.9559 60.4649 20.226C60.2128 17.5057 61.5189 14.6521 64.6767 14.0124C67.4204 13.4574 69.072 14.7051 69.5065 16.2612C69.762 17.1768 69.5934 18.1806 68.9712 18.8968C68.4371 19.5109 67.5731 19.8951 66.3898 19.8723C66.0516 19.8669 65.773 20.1386 65.7676 20.4784C65.7626 20.8181 66.0327 21.0979 66.371 21.1034C67.993 21.1219 69.152 20.5329 69.877 19.6853C70.7533 18.6606 71.0065 17.2375 70.6332 15.9396C70.056 13.9336 67.9903 12.1676 64.4515 12.9128C60.6869 13.7044 59.0961 17.0821 59.4178 20.328C59.7353 23.5334 61.9179 26.5767 65.6341 26.7913C72.7716 27.2137 77.1735 22.8941 77.5706 18.1949C77.9362 13.8702 74.9262 9.11998 67.3596 7.42049C63.5372 6.56321 59.7884 6.98567 56.0995 7.96857C50.7114 9.40407 45.4533 12.0412 40.2771 13.4976C37.4776 14.2892 34.5326 14.8117 31.5322 15.1051C29.5701 15.2968 27.5841 15.3845 25.5961 15.3857C23.1064 15.3869 20.6155 15.25 18.1657 14.9575C15.6567 14.6575 13.1943 14.2096 10.8262 13.6004L10.8269 13.5993Z" fill="#3B3B5A"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M59.4359 4.59389C60.2263 4.40875 61.0187 4.27734 61.8333 4.1382C62.0981 4.09297 62.3605 4.04698 62.6253 3.99673C62.8873 3.94687 63.1482 3.89122 63.4107 3.8402C66.4738 3.24381 69.6612 3.1151 72.617 3.81933C73.7522 4.08988 74.8558 4.47176 75.8948 5.00475C77.3917 5.77198 78.7524 6.84377 79.9304 8.23676C80.1543 8.49108 80.5418 8.51543 80.7954 8.29048C81.049 8.06553 81.0729 7.67632 80.8489 7.42161C79.4574 5.90107 77.8566 4.78715 76.1315 3.99403C74.3748 3.18622 72.4896 2.70424 70.5459 2.5249C68.9582 2.37841 67.3346 2.41822 65.7257 2.6281C64.6667 2.76647 63.6081 2.95315 62.5841 3.24922C62.2532 3.34508 61.9288 3.45446 61.609 3.57892C60.852 3.87305 60.1444 4.22671 59.4355 4.59389H59.4359Z" fill="#3B3B5A"/>
+  <g id="grot-cta-tumbleweed" fill-opacity="0.8" fill="#9087e9">
+    <path d="M255.834 142.553C255.855 141.865 255.927 141.184 256.06 140.504C256.238 139.668 256.382 138.823 256.622 138.003C256.66 137.862 256.697 137.72 256.734 137.576C256.738 137.552 256.74 137.53 256.744 137.506C256.811 136.99 256.912 136.479 257.005 135.969C257.1 135.536 257.189 135.104 257.3 134.675C257.295 134.677 257.292 134.68 257.287 134.683C257.279 134.688 257.271 134.692 257.263 134.697C257.076 134.816 256.892 134.94 256.711 135.067C256.607 135.136 256.506 135.208 256.406 135.281L256.404 135.284C256.013 136.389 255.675 137.515 255.392 138.653C255.399 138.67 255.407 138.688 255.416 138.705C255.408 138.785 255.397 138.863 255.389 138.942C255.339 139.481 255.292 140.021 255.274 140.562C255.235 141.391 255.233 142.222 255.265 143.053C255.267 143.096 255.269 143.138 255.273 143.182C255.354 143.105 255.437 143.03 255.521 142.959C255.561 142.922 255.603 142.886 255.647 142.85C255.689 142.814 255.731 142.778 255.775 142.743C255.793 142.728 255.811 142.713 255.83 142.699C255.832 142.651 255.832 142.603 255.835 142.553L255.834 142.553ZM254.489 129.99C254.494 129.981 254.498 129.974 254.505 129.966C254.503 129.949 254.503 129.932 254.504 129.915C254.5 129.745 254.499 129.579 254.498 129.41C254.48 129.437 254.46 129.464 254.44 129.491C254.421 129.518 254.403 129.545 254.383 129.57C254.344 129.624 254.307 129.676 254.268 129.728C254.211 129.808 254.152 129.886 254.093 129.965C254.012 130.076 253.932 130.185 253.85 130.293L253.85 130.295C253.857 130.451 253.868 130.607 253.881 130.763C253.881 130.799 253.885 130.836 253.888 130.871C253.967 130.776 254.045 130.679 254.121 130.581C254.137 130.561 254.152 130.541 254.167 130.523C254.25 130.417 254.332 130.309 254.414 130.2C254.418 130.193 254.423 130.186 254.429 130.18C254.434 130.171 254.439 130.165 254.446 130.156C254.45 130.151 254.453 130.148 254.455 130.143L254.455 130.141C254.464 130.091 254.476 130.04 254.489 129.99ZM256.404 135.284L256.405 135.28C256.428 135.216 256.45 135.15 256.475 135.085C256.568 134.824 256.666 134.565 256.767 134.306C256.534 134.495 256.31 134.693 256.095 134.9L256.094 134.902C256.048 135.089 256.005 135.276 255.961 135.463C255.947 135.521 255.935 135.58 255.921 135.639C255.912 135.671 255.904 135.705 255.897 135.738C255.793 136.269 255.681 136.798 255.603 137.333C255.55 137.637 255.509 137.945 255.472 138.252C255.347 137.817 255.259 137.372 255.192 136.921C255.171 136.781 255.15 136.642 255.131 136.502C255.13 136.493 255.13 136.487 255.128 136.48L255.129 136.478C255.072 136.063 255.025 135.648 254.971 135.232C254.938 134.955 254.902 134.677 254.868 134.4C254.907 134.188 254.95 133.975 254.993 133.765C255.033 133.583 255.074 133.399 255.119 133.219C255.255 132.644 255.414 132.078 255.597 131.52C255.648 131.367 255.7 131.217 255.756 131.066L255.759 131.058C255.801 130.936 255.844 130.818 255.892 130.698C256.253 129.749 256.686 128.836 257.182 127.944C257.343 127.644 257.511 127.348 257.685 127.053L257.686 127.051C257.699 127.026 257.713 127.003 257.728 126.979C257.873 126.73 258.022 126.483 258.173 126.236C258.224 126.148 258.275 126.063 258.328 125.976C258.44 125.789 258.555 125.602 258.67 125.416C258.757 125.276 258.844 125.133 258.933 124.993C259.023 124.841 259.116 124.69 259.206 124.539C259.301 124.382 259.396 124.223 259.49 124.066C260.08 123.081 260.651 122.084 261.177 121.06C260.738 121.586 260.316 122.124 259.902 122.667C259.901 122.669 259.899 122.671 259.898 122.672C259.87 122.711 259.839 122.751 259.811 122.79C259.45 123.267 259.097 123.749 258.748 124.234C258.535 124.525 258.328 124.819 258.124 125.118C258.122 125.121 258.119 125.124 258.117 125.13L258.116 125.132C257.946 125.38 257.777 125.63 257.608 125.88C257.387 126.221 257.173 126.565 256.963 126.916C256.828 127.143 256.695 127.373 256.566 127.606C256.541 127.652 256.517 127.699 256.49 127.744C256.2 128.295 255.929 128.858 255.692 129.437C255.445 130.067 255.227 130.712 255.071 131.37C254.915 132 254.804 132.642 254.741 133.286C254.692 132.824 254.646 132.364 254.606 131.901C254.556 131.322 254.52 130.74 254.509 130.16C254.508 130.13 254.508 130.102 254.507 130.073L254.508 130.071C254.505 130.036 254.505 130 254.506 129.967C254.499 129.975 254.495 129.982 254.489 129.991C254.476 130.041 254.465 130.092 254.456 130.141L254.455 130.143C254.453 130.149 254.45 130.152 254.446 130.157C254.439 130.165 254.435 130.172 254.43 130.181C254.423 130.187 254.419 130.194 254.414 130.201C254.332 130.309 254.251 130.418 254.167 130.524C254.153 130.542 254.137 130.562 254.122 130.582C254.046 130.68 253.968 130.777 253.889 130.871L253.888 130.873C253.932 131.421 253.989 131.966 254.061 132.507C254.107 132.877 254.163 133.245 254.223 133.612C254.256 133.82 254.291 134.03 254.329 134.236C254.334 134.282 254.343 134.33 254.35 134.375C254.367 134.471 254.383 134.567 254.402 134.662L254.402 134.664C254.537 135.44 254.687 136.21 254.854 136.986C254.874 137.073 254.895 137.158 254.918 137.244C254.918 137.244 254.918 137.246 254.919 137.246C254.919 137.255 254.921 137.26 254.923 137.267C255.043 137.734 255.186 138.196 255.384 138.635L255.392 138.653C255.675 137.515 256.013 136.389 256.404 135.284L256.404 135.284ZM263.087 115.103C263.079 115.107 263.074 115.111 263.07 115.116C263.058 115.175 263.042 115.233 263.028 115.291L263.027 115.293C263.025 115.301 263.025 115.307 263.022 115.314C263.01 115.369 262.994 115.425 262.98 115.477C262.975 115.498 262.969 115.522 262.962 115.542C262.901 115.555 262.84 115.567 262.778 115.575C262.742 115.641 262.706 115.709 262.671 115.774C262.639 115.837 262.607 115.898 262.573 115.958C262.702 115.83 262.828 115.703 262.954 115.571L262.954 115.57C262.957 115.566 262.96 115.565 262.964 115.56C262.973 115.553 262.98 115.545 262.987 115.535C263.111 115.411 263.232 115.285 263.352 115.158C263.595 114.901 263.834 114.642 264.071 114.379C263.738 114.615 263.41 114.857 263.086 115.103L263.087 115.103ZM265.693 138.295C265.693 138.289 265.696 138.281 265.698 138.275C265.706 138.228 265.713 138.182 265.722 138.132C265.71 138.143 265.698 138.153 265.686 138.164C265.414 138.402 265.138 138.638 264.862 138.87C264.795 139.232 264.734 139.596 264.679 139.961C264.946 139.746 265.209 139.526 265.47 139.302C265.491 139.286 265.512 139.268 265.528 139.251C265.58 138.932 265.636 138.612 265.693 138.295ZM270.127 134.619L270.114 134.628C270.019 134.681 269.925 134.735 269.832 134.789C269.737 134.844 269.646 134.899 269.553 134.957L269.013 135.316L268.493 135.706L268.076 136.05L267.99 136.122C267.827 136.265 267.668 136.412 267.514 136.565C267.504 136.577 267.494 136.588 267.482 136.598C267.414 136.667 267.345 136.737 267.279 136.808C267.203 136.887 267.128 136.968 267.055 137.05C266.916 137.209 266.779 137.372 266.65 137.54C266.584 137.626 266.518 137.713 266.454 137.8C266.454 137.8 266.452 137.801 266.451 137.803C266.389 137.89 266.327 137.978 266.267 138.066L265.916 138.612L265.593 139.176C265.587 139.187 265.582 139.198 265.576 139.208C265.777 139.04 265.973 138.87 266.166 138.697C266.713 138.219 267.244 137.725 267.764 137.218C267.957 137.025 268.149 136.83 268.338 136.632C268.597 136.364 268.852 136.09 269.101 135.814C269.125 135.869 269.151 135.922 269.172 135.976C269.188 136.009 269.204 136.041 269.217 136.076L269.298 136.002C269.277 135.976 269.255 135.948 269.232 135.923C269.198 135.877 269.16 135.834 269.123 135.79C269.438 135.44 269.747 135.088 270.044 134.724C270.073 134.689 270.1 134.654 270.127 134.619L270.127 134.619ZM280.076 143.082C279.866 143.195 279.654 143.305 279.437 143.411C279.347 143.458 279.256 143.504 279.163 143.547L279.16 143.548C278.987 143.72 278.809 143.892 278.631 144.06L278.457 144.21C278.445 144.219 278.435 144.23 278.423 144.24L278.235 144.401L277.879 144.709L277.873 144.714L277.549 144.993C277.368 145.145 277.197 145.311 277.006 145.455L276.438 145.888L275.871 146.322C275.679 146.464 275.497 146.617 275.295 146.745C275.114 146.866 274.933 146.986 274.752 147.109C274.796 147.004 274.839 146.899 274.884 146.795C274.975 146.574 275.069 146.353 275.159 146.134C275.231 145.965 275.302 145.794 275.376 145.626C275.405 145.558 275.433 145.492 275.462 145.426C275.486 145.367 275.513 145.309 275.54 145.25C275.587 145.138 275.635 145.029 275.684 144.919C275.54 144.977 275.399 145.036 275.255 145.095C275.247 145.098 275.24 145.1 275.232 145.104C275.174 145.248 275.119 145.393 275.069 145.54L275.06 145.564C275.036 145.628 275.014 145.69 274.993 145.756L274.993 145.758C274.96 145.852 274.929 145.947 274.901 146.04C274.809 146.337 274.726 146.637 274.66 146.938C274.638 147.03 274.62 147.12 274.601 147.21C274.043 147.587 273.482 147.964 272.893 148.292L272.276 148.655L271.969 148.837L271.65 148.998L270.374 149.647C270.163 149.761 269.944 149.854 269.724 149.946L269.066 150.228C268.627 150.414 268.193 150.615 267.739 150.763L266.708 151.137C267.429 150.696 268.117 150.202 268.754 149.645C268.841 149.57 268.929 149.495 269.013 149.417C269.931 148.611 270.81 147.764 271.65 146.877C271.719 146.804 271.79 146.73 271.858 146.655L271.86 146.653C271.925 146.581 271.992 146.511 272.055 146.439C272.11 146.384 272.161 146.328 272.21 146.271C272.283 146.193 272.354 146.112 272.423 146.034C272.591 145.848 272.756 145.658 272.918 145.468C272.893 145.479 272.869 145.487 272.844 145.493C272.741 145.529 272.639 145.563 272.536 145.597C272.535 145.597 272.534 145.599 272.534 145.599C272.278 145.681 272.02 145.763 271.76 145.844C271.5 145.919 271.238 145.987 270.972 146.045L270.97 146.044C270.926 146.094 270.878 146.141 270.831 146.19C270.847 146.149 270.863 146.106 270.877 146.065C270.913 145.967 270.944 145.871 270.975 145.774C270.852 145.814 270.73 145.85 270.608 145.879C270.597 145.96 270.585 146.039 270.571 146.121C270.551 146.251 270.53 146.38 270.508 146.51C270.356 146.655 270.202 146.802 270.054 146.95C270.007 147 269.96 147.046 269.912 147.093C269.497 147.505 269.056 147.885 268.614 148.267C268.44 148.415 268.268 148.566 268.097 148.718C268.097 148.718 268.095 148.719 268.094 148.721C268.071 148.74 268.048 148.762 268.025 148.781C267.469 149.254 266.88 149.671 266.261 150.046C266.119 150.134 265.977 150.217 265.832 150.3C265.427 150.528 265.014 150.74 264.59 150.937C264.649 150.81 264.704 150.68 264.756 150.55C264.787 150.47 264.818 150.388 264.847 150.306L264.86 150.268C264.878 150.215 264.895 150.165 264.911 150.113C265.034 149.741 265.129 149.357 265.198 148.97C265.22 148.859 265.237 148.748 265.252 148.637C265.258 148.603 265.263 148.571 265.266 148.537L265.267 148.535C265.268 148.525 265.27 148.515 265.271 148.504C265.274 148.491 265.274 148.478 265.275 148.464C265.279 148.438 265.281 148.413 265.284 148.387C265.288 148.371 265.29 148.353 265.289 148.336C265.299 148.259 265.308 148.18 265.312 148.102C265.326 147.957 265.334 147.811 265.337 147.664C265.343 147.483 265.342 147.301 265.336 147.12C265.329 146.878 265.312 146.636 265.283 146.396C265.278 146.346 265.27 146.295 265.263 146.244C265.256 146.195 265.248 146.146 265.24 146.097C265.223 145.981 265.202 145.866 265.177 145.751C265.144 145.583 265.103 145.416 265.056 145.249L265.056 145.248C265.045 145.201 265.03 145.158 265.016 145.114C265 145.057 264.983 145.003 264.96 144.947C264.911 144.786 264.849 144.628 264.78 144.471C264.773 144.45 264.763 144.429 264.753 144.409C264.749 144.397 264.742 144.386 264.738 144.374C264.738 144.421 264.737 144.467 264.738 144.512C264.739 144.516 264.738 144.518 264.739 144.522C264.739 144.613 264.741 144.704 264.742 144.793C264.742 144.885 264.742 144.976 264.744 145.067C264.744 145.133 264.745 145.198 264.745 145.264C264.745 145.314 264.745 145.367 264.746 145.42C264.746 145.603 264.744 145.784 264.742 145.966C264.742 146.021 264.74 146.075 264.738 146.129C264.736 146.228 264.734 146.324 264.73 146.421L264.729 146.423C264.727 146.477 264.726 146.529 264.722 146.583C264.724 146.596 264.722 146.608 264.722 146.621C264.716 146.752 264.709 146.882 264.702 147.012L264.701 147.014C264.701 147.045 264.698 147.078 264.696 147.109C264.687 147.237 264.678 147.366 264.668 147.493C264.657 147.641 264.643 147.79 264.628 147.936C264.627 147.953 264.623 147.968 264.622 147.983C264.617 148.048 264.61 148.111 264.6 148.175L264.599 148.177C264.593 148.257 264.584 148.338 264.573 148.416C264.557 148.542 264.541 148.668 264.52 148.794C264.513 148.852 264.505 148.911 264.496 148.969C264.479 149.077 264.461 149.184 264.443 149.292C264.383 149.646 264.313 149.999 264.235 150.351C264.233 150.363 264.229 150.376 264.227 150.388L264.225 150.394C264.212 150.455 264.199 150.516 264.183 150.575L264.182 150.577C264.14 150.779 264.089 150.979 264.038 151.182C263.828 151.27 263.619 151.353 263.408 151.431C263.261 151.486 263.114 151.538 262.966 151.588C263.709 151.553 264.455 151.493 265.198 151.42C265.395 151.4 265.59 151.377 265.787 151.351C266.854 151.183 267.907 150.976 268.949 150.718L269.864 150.482L270.768 150.209C271.04 150.135 271.3 150.036 271.563 149.944C271.633 149.917 271.704 149.889 271.773 149.861C271.452 149.92 271.13 149.978 270.809 150.048C270.442 150.122 270.072 150.204 269.706 150.294L269.85 150.236C270.075 150.148 270.299 150.059 270.514 149.951L271.821 149.329L272.147 149.173L272.462 148.996L273.096 148.645C275.35 147.407 277.427 145.867 279.308 144.112C279.422 144.01 279.531 143.907 279.639 143.801C280.001 143.457 280.355 143.106 280.698 142.747C280.494 142.862 280.287 142.975 280.077 143.086L280.076 143.082ZM268.256 136.687L267.823 137.011L267.406 137.358C266.947 137.759 266.53 138.208 266.167 138.697C266.714 138.219 267.245 137.725 267.764 137.218C267.958 137.024 268.15 136.829 268.338 136.632L268.256 136.688L268.256 136.687ZM271.149 145.153C271.144 145.158 271.135 145.163 271.13 145.168C271.003 145.261 270.878 145.352 270.75 145.444C270.72 145.468 270.688 145.488 270.657 145.511L270.656 145.513C270.646 145.604 270.633 145.695 270.62 145.787C270.774 145.672 270.926 145.556 271.076 145.433C271.101 145.341 271.125 145.248 271.149 145.153ZM269.324 136.034C269.289 136.052 269.255 136.069 269.224 136.088C269.286 136.23 269.347 136.371 269.405 136.513C269.41 136.509 269.414 136.505 269.419 136.501C269.473 136.461 269.527 136.421 269.583 136.381C269.5 136.262 269.414 136.147 269.324 136.034ZM270.127 134.619L270.113 134.627L270.112 134.627C270.017 134.68 269.924 134.735 269.832 134.789C269.737 134.844 269.646 134.899 269.552 134.957L269.011 135.315L268.492 135.706L268.076 136.05L267.99 136.121C267.826 136.265 267.668 136.412 267.514 136.565C267.504 136.576 267.494 136.588 267.482 136.598C267.413 136.667 267.345 136.736 267.278 136.808C267.202 136.887 267.128 136.968 267.055 137.05C266.916 137.209 266.779 137.372 266.65 137.54C266.584 137.626 266.518 137.713 266.454 137.8C266.454 137.8 266.451 137.801 266.451 137.803C266.387 137.889 266.325 137.977 266.265 138.065L265.915 138.612L265.593 139.176C265.587 139.187 265.581 139.198 265.575 139.208C265.777 139.04 265.973 138.87 266.166 138.697C266.713 138.219 267.244 137.725 267.763 137.218C267.957 137.024 268.148 136.829 268.337 136.632C268.597 136.364 268.851 136.09 269.101 135.814C269.124 135.868 269.15 135.922 269.172 135.975C269.188 136.008 269.204 136.041 269.217 136.076L269.297 136.002C269.277 135.976 269.255 135.947 269.232 135.923C269.197 135.877 269.159 135.834 269.122 135.79C269.437 135.44 269.747 135.088 270.044 134.723C270.073 134.689 270.099 134.654 270.126 134.619L270.127 134.619ZM265.693 138.295C265.693 138.288 265.696 138.281 265.697 138.275C265.706 138.227 265.713 138.182 265.722 138.132C265.71 138.142 265.698 138.153 265.686 138.164C265.413 138.402 265.138 138.637 264.861 138.87C264.795 139.232 264.734 139.596 264.679 139.961C264.945 139.746 265.209 139.526 265.47 139.302C265.49 139.286 265.511 139.268 265.528 139.251C265.579 138.932 265.636 138.612 265.693 138.295ZM280.076 143.082C279.866 143.195 279.653 143.304 279.437 143.411C279.347 143.458 279.255 143.504 279.162 143.547L279.16 143.548C278.986 143.72 278.809 143.892 278.631 144.06L278.456 144.21C278.445 144.219 278.435 144.23 278.423 144.24L278.234 144.401L277.879 144.709L277.873 144.713L277.549 144.993C277.368 145.145 277.197 145.311 277.005 145.455L276.438 145.888L275.871 146.322C275.678 146.463 275.497 146.617 275.294 146.745C275.113 146.866 274.933 146.986 274.751 147.109C274.796 147.004 274.839 146.899 274.883 146.795C274.975 146.574 275.068 146.353 275.159 146.134C275.23 145.965 275.302 145.794 275.375 145.626C275.405 145.558 275.432 145.491 275.461 145.426C275.486 145.367 275.513 145.309 275.539 145.25C275.586 145.138 275.635 145.029 275.683 144.919C275.539 144.977 275.399 145.036 275.254 145.095C275.247 145.098 275.24 145.1 275.232 145.104C275.174 145.248 275.119 145.393 275.068 145.54L275.06 145.564C275.036 145.628 275.014 145.69 274.993 145.756L274.992 145.758C274.96 145.852 274.929 145.947 274.901 146.04C274.809 146.336 274.726 146.637 274.659 146.938C274.638 147.029 274.619 147.12 274.601 147.21C274.042 147.587 273.482 147.964 272.892 148.292L272.275 148.655L271.968 148.837L271.649 148.998L270.373 149.647C270.163 149.761 269.944 149.853 269.724 149.946L269.066 150.227C268.626 150.414 268.192 150.615 267.738 150.763L266.707 151.137C267.429 150.696 268.117 150.201 268.754 149.645C268.841 149.57 268.928 149.495 269.012 149.417C269.93 148.61 270.809 147.763 271.65 146.877C271.719 146.804 271.789 146.73 271.857 146.655L271.86 146.653C271.925 146.581 271.991 146.511 272.055 146.439C272.109 146.384 272.16 146.328 272.21 146.271C272.122 146.298 272.035 146.325 271.948 146.347C271.945 146.348 271.945 146.35 271.943 146.349C271.842 146.378 271.742 146.404 271.642 146.428C271.763 146.34 271.882 146.251 272.002 146.16C272.162 146.04 272.319 145.916 272.474 145.788C272.474 145.788 272.475 145.786 272.477 145.787C272.538 145.739 272.601 145.691 272.66 145.642C272.722 145.592 272.785 145.542 272.844 145.493C272.741 145.529 272.639 145.563 272.537 145.597C272.535 145.596 272.534 145.598 272.534 145.598C272.278 145.68 272.02 145.763 271.76 145.844C271.501 145.918 271.238 145.987 270.972 146.044L270.97 146.044C270.926 146.094 270.878 146.14 270.831 146.19C270.848 146.149 270.863 146.106 270.877 146.064C270.775 146.086 270.674 146.103 270.571 146.12C270.551 146.251 270.53 146.38 270.508 146.509C270.356 146.655 270.202 146.801 270.054 146.95C270.008 146.999 269.96 147.046 269.912 147.093C269.497 147.505 269.056 147.885 268.614 148.267C268.44 148.415 268.268 148.566 268.097 148.717C268.097 148.717 268.095 148.719 268.094 148.72C268.071 148.74 268.048 148.761 268.025 148.781C267.469 149.254 266.88 149.671 266.261 150.046C266.119 150.134 265.977 150.217 265.832 150.299C265.427 150.527 265.014 150.74 264.59 150.936C264.649 150.809 264.704 150.679 264.756 150.549C264.787 150.47 264.818 150.388 264.847 150.305L264.86 150.268C264.878 150.215 264.896 150.164 264.911 150.113C265.034 149.74 265.129 149.356 265.198 148.97C265.22 148.859 265.237 148.747 265.252 148.637C265.258 148.603 265.263 148.571 265.266 148.536L265.267 148.534C265.268 148.524 265.27 148.514 265.271 148.504C265.274 148.49 265.274 148.478 265.275 148.463C265.279 148.437 265.282 148.413 265.284 148.386C265.288 148.371 265.29 148.353 265.289 148.336C265.299 148.259 265.308 148.18 265.312 148.101C265.326 147.957 265.335 147.81 265.337 147.663C265.343 147.482 265.343 147.301 265.336 147.12C265.329 146.877 265.312 146.635 265.284 146.396C265.278 146.346 265.27 146.295 265.263 146.243C265.256 146.195 265.248 146.146 265.24 146.096C265.223 145.981 265.202 145.866 265.177 145.75C265.144 145.583 265.103 145.415 265.056 145.249L265.056 145.247C265.045 145.201 265.03 145.158 265.016 145.113C265 145.057 264.983 145.003 264.96 144.946C264.911 144.786 264.85 144.628 264.78 144.471C264.773 144.449 264.763 144.429 264.753 144.409C264.749 144.397 264.742 144.386 264.738 144.374C264.738 144.421 264.737 144.467 264.739 144.511C264.739 144.516 264.739 144.518 264.739 144.522C264.739 144.613 264.741 144.704 264.742 144.793C264.742 144.885 264.742 144.976 264.744 145.067C264.745 145.132 264.745 145.198 264.746 145.263C264.745 145.314 264.746 145.367 264.746 145.42C264.746 145.603 264.744 145.783 264.742 145.966C264.742 146.021 264.74 146.075 264.738 146.129C264.736 146.227 264.734 146.324 264.73 146.421L264.729 146.423C264.727 146.477 264.726 146.529 264.722 146.583C264.724 146.596 264.722 146.608 264.722 146.62C264.716 146.751 264.709 146.881 264.702 147.012L264.701 147.013C264.701 147.045 264.698 147.078 264.696 147.108C264.687 147.236 264.678 147.366 264.668 147.493C264.657 147.641 264.643 147.789 264.628 147.936C264.627 147.952 264.623 147.968 264.623 147.982C264.617 148.048 264.61 148.111 264.6 148.175L264.599 148.177C264.593 148.257 264.584 148.338 264.573 148.416C264.557 148.541 264.541 148.668 264.52 148.794C264.513 148.852 264.505 148.911 264.496 148.968C264.479 149.077 264.461 149.184 264.443 149.291C264.383 149.645 264.314 149.998 264.236 150.351C264.234 150.363 264.229 150.376 264.227 150.388L264.225 150.393C264.212 150.454 264.2 150.515 264.183 150.575L264.182 150.577C264.14 150.779 264.09 150.978 264.038 151.182C263.828 151.269 263.619 151.352 263.408 151.431C263.261 151.485 263.114 151.538 262.966 151.587C263.709 151.552 264.455 151.492 265.198 151.42C265.395 151.399 265.59 151.376 265.787 151.35C266.854 151.183 267.907 150.975 268.949 150.718L269.865 150.481L270.768 150.209C271.04 150.134 271.3 150.035 271.563 149.943C271.633 149.917 271.704 149.889 271.773 149.86C271.452 149.919 271.13 149.978 270.809 150.048C270.442 150.121 270.072 150.203 269.706 150.294L269.851 150.236C270.075 150.147 270.299 150.059 270.514 149.95L271.821 149.329L272.147 149.173L272.463 148.996L273.096 148.645C275.35 147.406 277.428 145.867 279.308 144.112C279.422 144.01 279.531 143.907 279.64 143.801C280.001 143.457 280.355 143.105 280.698 142.746C280.494 142.861 280.287 142.974 280.077 143.085L280.076 143.082ZM268.255 136.687L267.823 137.011L267.406 137.357C266.947 137.759 266.53 138.208 266.166 138.697C266.713 138.219 267.245 137.725 267.764 137.218C267.958 137.024 268.149 136.829 268.338 136.632L268.256 136.687L268.255 136.687ZM255.833 142.552C255.854 141.865 255.926 141.184 256.059 140.504C256.237 139.668 256.381 138.823 256.621 138.003C256.659 137.862 256.696 137.719 256.733 137.576C256.737 137.552 256.739 137.53 256.743 137.506C256.81 136.99 256.911 136.479 257.004 135.968C257.1 135.536 257.189 135.103 257.299 134.674C257.294 134.677 257.291 134.68 257.286 134.682C257.278 134.688 257.27 134.692 257.262 134.697C257.075 134.816 256.892 134.939 256.711 135.066C256.611 135.135 256.513 135.204 256.415 135.275C256.412 135.278 256.406 135.281 256.403 135.284C256.012 136.389 255.674 137.514 255.391 138.653C255.398 138.67 255.406 138.687 255.415 138.705C255.406 138.784 255.396 138.863 255.388 138.942C255.338 139.481 255.291 140.021 255.272 140.561C255.233 141.39 255.232 142.222 255.264 143.052C255.266 143.095 255.268 143.138 255.272 143.182C255.353 143.104 255.436 143.03 255.52 142.958C255.56 142.921 255.602 142.885 255.646 142.85C255.688 142.814 255.73 142.778 255.774 142.743C255.792 142.728 255.809 142.713 255.829 142.699C255.831 142.651 255.831 142.602 255.833 142.553L255.833 142.552ZM254.488 129.99C254.49 129.965 254.497 129.94 254.503 129.915C254.499 129.745 254.498 129.578 254.497 129.41C254.479 129.437 254.46 129.464 254.44 129.491C254.42 129.518 254.402 129.545 254.383 129.57C254.343 129.624 254.306 129.676 254.267 129.728C254.21 129.807 254.151 129.886 254.092 129.964C254.011 130.075 253.931 130.184 253.85 130.293L253.849 130.295C253.856 130.451 253.867 130.606 253.881 130.763C253.881 130.799 253.885 130.836 253.887 130.871C253.967 130.776 254.045 130.679 254.121 130.581C254.136 130.561 254.151 130.541 254.166 130.523C254.249 130.417 254.331 130.309 254.413 130.2C254.418 130.193 254.422 130.186 254.428 130.18C254.434 130.171 254.438 130.164 254.445 130.156C254.449 130.151 254.452 130.148 254.454 130.142L254.455 130.141C254.463 130.091 254.475 130.04 254.488 129.99ZM256.403 135.284L256.405 135.28C256.427 135.216 256.45 135.15 256.474 135.085C256.567 134.824 256.665 134.565 256.766 134.305C256.534 134.494 256.309 134.693 256.094 134.9L256.093 134.902C256.048 135.089 256.004 135.275 255.96 135.463C255.946 135.521 255.934 135.58 255.92 135.638C255.911 135.671 255.904 135.704 255.896 135.738C255.792 136.268 255.68 136.798 255.602 137.333C255.549 137.637 255.508 137.945 255.471 138.252C255.346 137.817 255.258 137.372 255.191 136.921C255.17 136.781 255.149 136.641 255.13 136.502C255.129 136.493 255.129 136.487 255.127 136.48L255.128 136.478C255.072 136.063 255.024 135.648 254.97 135.231C254.938 134.955 254.902 134.677 254.867 134.4C254.907 134.188 254.949 133.975 254.992 133.765C255.032 133.582 255.073 133.399 255.118 133.218C255.254 132.644 255.413 132.078 255.596 131.52C255.647 131.367 255.699 131.217 255.755 131.066L255.758 131.058C255.801 130.936 255.843 130.818 255.891 130.698C256.252 129.749 256.685 128.835 257.181 127.944C257.342 127.644 257.51 127.348 257.684 127.052L257.685 127.05C257.698 127.025 257.712 127.003 257.727 126.979C257.872 126.73 258.021 126.482 258.172 126.236C258.224 126.148 258.274 126.062 258.328 125.976C258.439 125.789 258.554 125.602 258.669 125.416C258.756 125.275 258.843 125.133 258.932 124.993C259.023 124.841 259.115 124.69 259.206 124.538C259.3 124.381 259.395 124.223 259.49 124.066C260.08 123.081 260.651 122.084 261.177 121.06C260.738 121.586 260.315 122.124 259.901 122.667C259.901 122.669 259.898 122.67 259.897 122.672C259.869 122.711 259.839 122.751 259.81 122.79C259.449 123.267 259.097 123.749 258.747 124.234C258.534 124.525 258.327 124.819 258.123 125.117C258.121 125.121 258.118 125.124 258.116 125.13L258.116 125.132C257.945 125.38 257.777 125.629 257.608 125.88C257.386 126.22 257.172 126.565 256.962 126.916C256.827 127.142 256.694 127.373 256.565 127.606C256.54 127.652 256.516 127.698 256.49 127.744C256.2 128.294 255.929 128.857 255.692 129.437C255.444 130.067 255.226 130.712 255.07 131.369C254.914 132 254.804 132.642 254.74 133.285C254.692 132.824 254.645 132.364 254.605 131.901C254.556 131.322 254.519 130.74 254.508 130.159C254.508 130.13 254.507 130.102 254.507 130.073L254.507 130.071C254.504 130.036 254.504 130 254.505 129.967C254.503 129.949 254.503 129.932 254.504 129.916C254.497 129.941 254.491 129.966 254.489 129.99C254.475 130.041 254.464 130.092 254.455 130.141L254.455 130.143C254.453 130.149 254.45 130.152 254.446 130.157C254.439 130.165 254.434 130.172 254.429 130.181C254.423 130.187 254.418 130.194 254.414 130.201C254.332 130.309 254.25 130.417 254.167 130.523C254.152 130.542 254.137 130.562 254.121 130.582C254.045 130.679 253.967 130.776 253.888 130.871L253.887 130.873C253.931 131.421 253.989 131.966 254.06 132.507C254.107 132.876 254.162 133.245 254.222 133.612C254.256 133.819 254.29 134.029 254.328 134.236C254.333 134.282 254.342 134.33 254.35 134.374C254.367 134.471 254.382 134.567 254.402 134.662L254.401 134.664C254.536 135.439 254.686 136.21 254.853 136.986C254.873 137.073 254.894 137.158 254.917 137.244C254.917 137.244 254.917 137.246 254.919 137.246C254.918 137.254 254.92 137.259 254.922 137.266C255.042 137.733 255.186 138.196 255.383 138.635L255.391 138.653C255.674 137.515 256.012 136.389 256.404 135.284L256.403 135.284ZM263.086 115.103C263.079 115.106 263.073 115.111 263.069 115.116C263.057 115.175 263.041 115.232 263.027 115.291L263.027 115.293C263.024 115.3 263.024 115.307 263.021 115.314C263.009 115.369 262.994 115.425 262.98 115.477C262.974 115.498 262.968 115.521 262.961 115.542C262.9 115.554 262.839 115.567 262.777 115.575C262.742 115.641 262.705 115.708 262.67 115.774C262.638 115.837 262.606 115.897 262.573 115.957C262.701 115.829 262.828 115.703 262.953 115.571L262.954 115.569C262.957 115.566 262.959 115.565 262.963 115.56C262.972 115.552 262.979 115.544 262.987 115.534C263.11 115.411 263.232 115.284 263.351 115.157C263.594 114.9 263.833 114.642 264.07 114.379C263.737 114.615 263.409 114.857 263.086 115.103L263.086 115.103ZM254.5 129.301C254.498 129.025 254.505 128.751 254.52 128.476C254.545 127.918 254.594 127.36 254.681 126.81C254.794 125.985 254.976 125.17 255.214 124.37C255.25 124.302 255.288 124.235 255.328 124.169C255.27 124.219 255.211 124.268 255.152 124.317C255.09 124.368 255.029 124.418 254.967 124.468C254.89 124.532 254.812 124.593 254.732 124.654C254.652 124.715 254.571 124.775 254.492 124.834C254.158 125.08 253.812 125.312 253.456 125.526C253.439 125.587 253.424 125.648 253.407 125.709C253.364 125.871 253.321 126.031 253.279 126.193C253.219 126.417 253.163 126.639 253.107 126.862L252.786 128.442C252.769 128.541 252.747 128.639 252.726 128.737C252.722 128.757 252.719 128.777 252.714 128.796C252.702 128.855 252.688 128.914 252.678 128.973C252.666 129.032 252.656 129.092 252.647 129.152C252.658 129.133 252.673 129.115 252.685 129.098C252.828 128.912 252.985 128.739 253.156 128.583C252.937 128.907 252.758 129.247 252.614 129.6C252.599 129.637 252.584 129.676 252.568 129.714L252.567 129.718L252.523 130.032L252.411 130.829C252.403 130.896 252.392 130.963 252.382 131.029C252.352 131.23 252.324 131.428 252.313 131.629C252.295 131.875 252.275 132.122 252.256 132.365C252.359 132.232 252.462 132.1 252.567 131.968C252.579 131.951 252.592 131.936 252.604 131.92C252.611 131.871 252.619 131.823 252.626 131.777C252.764 130.871 252.949 129.973 253.177 129.085C253.432 128.038 253.746 127.007 254.107 125.989C254.062 126.23 254.02 126.471 253.983 126.71C253.897 127.287 253.854 127.868 253.832 128.448C253.812 129.027 253.811 129.607 253.843 130.183C253.843 130.187 253.843 130.189 253.843 130.194C253.844 130.228 253.848 130.259 253.851 130.293C253.933 130.185 254.013 130.076 254.094 129.965C254.153 129.886 254.211 129.807 254.268 129.729C254.307 129.677 254.345 129.624 254.384 129.571C254.403 129.546 254.421 129.518 254.441 129.491C254.461 129.464 254.481 129.438 254.499 129.41L254.5 129.408C254.499 129.372 254.499 129.336 254.501 129.301L254.5 129.301ZM280.075 143.082C279.865 143.195 279.653 143.304 279.437 143.411C279.347 143.457 279.255 143.504 279.162 143.547L279.159 143.548C278.986 143.719 278.809 143.892 278.63 144.059L278.456 144.21C278.444 144.218 278.434 144.23 278.422 144.24L278.234 144.4L277.878 144.709L277.873 144.713L277.549 144.993C277.367 145.145 277.196 145.311 277.005 145.455L276.438 145.888L275.871 146.321C275.678 146.463 275.496 146.617 275.294 146.745C275.113 146.866 274.933 146.986 274.751 147.109C274.796 147.004 274.838 146.899 274.883 146.794C274.974 146.574 275.068 146.353 275.158 146.134C275.23 145.965 275.302 145.794 275.375 145.625C275.405 145.558 275.432 145.491 275.461 145.426C275.486 145.367 275.512 145.308 275.539 145.25C275.586 145.138 275.635 145.029 275.683 144.919C275.539 144.976 275.399 145.035 275.254 145.094C275.246 145.098 275.239 145.1 275.232 145.104C275.173 145.248 275.119 145.393 275.068 145.54L275.059 145.564C275.035 145.627 275.014 145.69 274.993 145.756L274.992 145.758C274.959 145.852 274.929 145.947 274.901 146.04C274.808 146.336 274.725 146.636 274.659 146.938C274.638 147.029 274.619 147.12 274.6 147.21C274.042 147.587 273.482 147.964 272.892 148.292L272.275 148.655L271.968 148.837L271.649 148.998L270.373 149.646C270.162 149.761 269.943 149.853 269.724 149.946L269.066 150.227C268.626 150.414 268.192 150.615 267.738 150.763L266.707 151.136C267.429 150.696 268.116 150.201 268.753 149.645C268.841 149.57 268.928 149.495 269.012 149.417C269.93 148.61 270.809 147.763 271.649 146.877C271.719 146.804 271.789 146.729 271.857 146.654L271.86 146.653C271.925 146.581 271.991 146.511 272.054 146.439C272.109 146.384 272.16 146.328 272.209 146.271C272.122 146.298 272.035 146.324 271.947 146.347C271.945 146.348 271.944 146.35 271.942 146.349C271.842 146.378 271.742 146.404 271.641 146.428C271.763 146.34 271.882 146.251 272.002 146.159C272.161 146.04 272.318 145.915 272.474 145.788C272.474 145.788 272.474 145.786 272.476 145.787C272.537 145.738 272.6 145.691 272.659 145.642C272.721 145.591 272.785 145.542 272.844 145.493C272.741 145.529 272.638 145.563 272.536 145.597C272.534 145.596 272.534 145.598 272.534 145.598C272.278 145.68 272.019 145.763 271.76 145.844C271.5 145.918 271.238 145.987 270.972 146.044L270.97 146.044C270.925 146.094 270.878 146.14 270.831 146.189C270.847 146.149 270.862 146.105 270.877 146.064C270.774 146.085 270.673 146.103 270.571 146.12C270.551 146.25 270.529 146.38 270.508 146.509C270.356 146.655 270.202 146.801 270.054 146.95C270.007 146.999 269.959 147.046 269.912 147.092C269.497 147.505 269.055 147.885 268.614 148.266C268.44 148.415 268.268 148.566 268.097 148.717C268.097 148.717 268.095 148.718 268.094 148.72C268.07 148.74 268.048 148.761 268.025 148.781C267.469 149.254 266.88 149.67 266.261 150.046C266.119 150.133 265.976 150.216 265.832 150.299C265.427 150.527 265.014 150.74 264.589 150.936C264.648 150.809 264.704 150.679 264.755 150.549C264.787 150.47 264.818 150.388 264.846 150.305L264.859 150.268C264.878 150.215 264.895 150.164 264.911 150.113C265.034 149.74 265.129 149.356 265.198 148.969C265.219 148.859 265.237 148.747 265.252 148.637C265.257 148.603 265.262 148.571 265.266 148.536L265.267 148.534C265.268 148.524 265.269 148.514 265.271 148.504C265.273 148.49 265.273 148.478 265.274 148.463C265.279 148.437 265.281 148.413 265.284 148.386C265.287 148.371 265.289 148.352 265.289 148.335C265.299 148.259 265.307 148.179 265.311 148.101C265.326 147.956 265.334 147.81 265.337 147.663C265.343 147.482 265.342 147.301 265.335 147.119C265.329 146.877 265.312 146.635 265.283 146.396C265.278 146.346 265.27 146.294 265.262 146.243C265.256 146.195 265.248 146.145 265.24 146.096C265.223 145.981 265.201 145.866 265.176 145.75C265.144 145.583 265.103 145.415 265.055 145.249L265.056 145.247C265.045 145.201 265.03 145.158 265.016 145.113C265 145.057 264.983 145.002 264.96 144.946C264.91 144.785 264.849 144.628 264.78 144.471C264.772 144.449 264.763 144.429 264.753 144.409C264.748 144.397 264.742 144.386 264.737 144.374C264.738 144.42 264.737 144.466 264.738 144.511C264.739 144.516 264.738 144.517 264.739 144.522C264.739 144.613 264.741 144.704 264.742 144.792C264.741 144.885 264.742 144.976 264.744 145.067C264.744 145.132 264.745 145.198 264.745 145.263C264.745 145.314 264.745 145.367 264.746 145.419C264.745 145.603 264.744 145.783 264.742 145.966C264.742 146.021 264.74 146.075 264.738 146.129C264.736 146.227 264.734 146.323 264.73 146.421L264.729 146.423C264.727 146.477 264.726 146.529 264.722 146.582C264.724 146.596 264.722 146.608 264.721 146.62C264.716 146.751 264.709 146.881 264.702 147.011L264.701 147.013C264.701 147.045 264.698 147.078 264.696 147.108C264.687 147.236 264.678 147.365 264.668 147.493C264.656 147.64 264.643 147.789 264.628 147.936C264.626 147.952 264.623 147.968 264.622 147.982C264.616 148.048 264.609 148.111 264.6 148.175L264.599 148.177C264.592 148.257 264.583 148.338 264.573 148.416C264.557 148.541 264.541 148.668 264.52 148.793C264.512 148.852 264.505 148.91 264.495 148.968C264.479 149.076 264.461 149.184 264.442 149.291C264.383 149.645 264.313 149.998 264.235 150.35C264.233 150.362 264.229 150.376 264.227 150.387L264.225 150.393C264.212 150.454 264.199 150.515 264.183 150.575L264.182 150.577C264.139 150.779 264.089 150.978 264.038 151.182C263.828 151.269 263.618 151.352 263.408 151.431C263.26 151.485 263.114 151.538 262.966 151.587C263.709 151.552 264.454 151.492 265.198 151.42C265.394 151.399 265.59 151.376 265.786 151.35C266.853 151.183 267.907 150.975 268.948 150.717L269.864 150.481L270.767 150.209C271.039 150.134 271.299 150.035 271.563 149.943C271.633 149.917 271.704 149.889 271.773 149.86C271.451 149.919 271.129 149.978 270.808 150.048C270.442 150.121 270.072 150.203 269.706 150.293L269.85 150.236C270.075 150.147 270.299 150.059 270.514 149.95L271.82 149.329L272.146 149.172L272.462 148.996L273.096 148.645C275.349 147.406 277.427 145.867 279.308 144.111C279.421 144.009 279.531 143.907 279.639 143.801C280.001 143.456 280.354 143.105 280.698 142.746C280.494 142.861 280.286 142.974 280.077 143.085L280.075 143.082ZM255.833 142.552C255.854 141.865 255.926 141.184 256.059 140.504C256.237 139.668 256.381 138.823 256.621 138.003C256.659 137.862 256.696 137.719 256.733 137.576C256.737 137.552 256.739 137.53 256.743 137.506C256.81 136.99 256.911 136.479 257.004 135.968C257.1 135.536 257.189 135.103 257.299 134.674C257.294 134.677 257.291 134.68 257.286 134.682C257.278 134.688 257.27 134.692 257.262 134.697C257.075 134.816 256.892 134.939 256.711 135.066C256.611 135.135 256.513 135.204 256.415 135.275C256.412 135.278 256.406 135.281 256.403 135.284C256.012 136.389 255.674 137.514 255.391 138.653C255.398 138.67 255.406 138.687 255.415 138.705C255.406 138.784 255.396 138.863 255.388 138.942C255.338 139.481 255.291 140.021 255.272 140.561C255.233 141.39 255.232 142.222 255.264 143.052C255.266 143.095 255.268 143.138 255.272 143.182C255.353 143.104 255.436 143.03 255.52 142.958C255.56 142.921 255.602 142.885 255.646 142.85C255.688 142.814 255.73 142.778 255.774 142.743C255.792 142.728 255.809 142.713 255.829 142.699C255.831 142.651 255.831 142.602 255.833 142.553L255.833 142.552ZM254.488 129.99C254.49 129.965 254.497 129.94 254.503 129.915C254.499 129.745 254.498 129.578 254.497 129.41C254.479 129.437 254.46 129.464 254.44 129.491C254.42 129.518 254.402 129.545 254.383 129.57C254.343 129.624 254.306 129.676 254.267 129.728C254.21 129.807 254.151 129.886 254.092 129.964C254.011 130.075 253.931 130.184 253.85 130.293L253.849 130.295C253.856 130.451 253.867 130.606 253.881 130.763C253.881 130.799 253.885 130.836 253.887 130.871C253.967 130.776 254.045 130.679 254.121 130.581C254.136 130.561 254.151 130.541 254.166 130.523C254.249 130.417 254.331 130.309 254.413 130.2C254.418 130.193 254.422 130.186 254.428 130.18C254.434 130.171 254.438 130.164 254.445 130.156C254.449 130.151 254.452 130.148 254.454 130.142L254.455 130.141C254.463 130.091 254.475 130.04 254.488 129.99ZM256.403 135.284L256.405 135.28C256.427 135.216 256.45 135.15 256.474 135.085C256.567 134.824 256.665 134.565 256.766 134.305C256.534 134.494 256.309 134.693 256.094 134.9L256.093 134.902C256.048 135.089 256.004 135.275 255.96 135.463C255.946 135.521 255.934 135.58 255.92 135.638C255.911 135.671 255.904 135.704 255.896 135.738C255.792 136.268 255.68 136.798 255.602 137.333C255.549 137.637 255.508 137.945 255.471 138.252C255.346 137.817 255.258 137.372 255.191 136.921C255.17 136.781 255.149 136.641 255.13 136.502C255.129 136.493 255.129 136.487 255.127 136.48L255.128 136.478C255.072 136.063 255.024 135.648 254.97 135.231C254.938 134.955 254.902 134.677 254.867 134.4C254.907 134.188 254.949 133.975 254.992 133.765C255.032 133.582 255.073 133.399 255.118 133.218C255.254 132.644 255.413 132.078 255.596 131.52C255.647 131.367 255.699 131.217 255.755 131.066L255.758 131.058C255.801 130.936 255.843 130.818 255.891 130.698C256.252 129.749 256.685 128.835 257.181 127.944C257.342 127.644 257.51 127.348 257.684 127.052L257.685 127.05C257.698 127.025 257.712 127.003 257.727 126.979C257.872 126.73 258.021 126.482 258.172 126.236C258.224 126.148 258.274 126.062 258.328 125.976C258.439 125.789 258.554 125.602 258.669 125.416C258.756 125.275 258.843 125.133 258.932 124.993C259.023 124.841 259.115 124.69 259.206 124.538C259.3 124.381 259.395 124.223 259.49 124.066C260.08 123.081 260.651 122.084 261.177 121.06C260.738 121.586 260.315 122.124 259.901 122.667C259.901 122.669 259.898 122.67 259.897 122.672C259.869 122.711 259.839 122.751 259.81 122.79C259.449 123.267 259.097 123.749 258.747 124.234C258.534 124.525 258.327 124.819 258.123 125.117C258.121 125.121 258.118 125.124 258.116 125.13L258.116 125.132C257.945 125.38 257.777 125.629 257.608 125.88C257.386 126.22 257.172 126.565 256.962 126.916C256.827 127.142 256.694 127.373 256.565 127.606C256.54 127.652 256.516 127.698 256.49 127.744C256.2 128.294 255.929 128.857 255.692 129.437C255.444 130.067 255.226 130.712 255.07 131.369C254.914 132 254.804 132.642 254.74 133.285C254.692 132.824 254.645 132.364 254.605 131.901C254.556 131.322 254.519 130.74 254.508 130.159C254.508 130.13 254.507 130.102 254.507 130.073L254.507 130.071C254.504 130.036 254.504 130 254.505 129.967C254.503 129.949 254.503 129.932 254.504 129.916C254.497 129.941 254.491 129.966 254.489 129.99C254.475 130.041 254.464 130.092 254.455 130.141L254.455 130.143C254.453 130.149 254.45 130.152 254.446 130.157C254.439 130.165 254.434 130.172 254.429 130.181C254.423 130.187 254.418 130.194 254.414 130.201C254.332 130.309 254.25 130.417 254.167 130.523C254.152 130.542 254.137 130.562 254.121 130.582C254.045 130.679 253.967 130.776 253.888 130.871L253.887 130.873C253.931 131.421 253.989 131.966 254.06 132.507C254.107 132.876 254.162 133.245 254.222 133.612C254.256 133.819 254.29 134.029 254.328 134.236C254.333 134.282 254.342 134.33 254.35 134.374C254.367 134.471 254.382 134.567 254.402 134.662L254.401 134.664C254.536 135.439 254.686 136.21 254.853 136.986C254.873 137.073 254.894 137.158 254.917 137.244C254.917 137.244 254.917 137.246 254.919 137.246C254.918 137.254 254.92 137.259 254.922 137.266C255.042 137.733 255.186 138.196 255.383 138.635L255.391 138.653C255.674 137.515 256.012 136.389 256.404 135.284L256.403 135.284ZM263.086 115.103C263.079 115.106 263.073 115.111 263.069 115.116C263.057 115.175 263.041 115.232 263.027 115.291L263.027 115.293C263.024 115.3 263.024 115.307 263.021 115.314C263.009 115.369 262.994 115.425 262.98 115.477C262.974 115.498 262.968 115.521 262.961 115.542C262.9 115.554 262.839 115.567 262.777 115.575C262.742 115.641 262.705 115.708 262.67 115.774C262.638 115.837 262.606 115.897 262.573 115.957C262.701 115.829 262.828 115.703 262.953 115.571L262.954 115.569C262.957 115.566 262.959 115.565 262.963 115.56C262.972 115.552 262.979 115.544 262.987 115.534C263.11 115.411 263.232 115.284 263.351 115.157C263.594 114.9 263.833 114.642 264.07 114.379C263.737 114.615 263.409 114.857 263.086 115.103L263.086 115.103ZM254.5 129.301C254.498 129.025 254.505 128.751 254.52 128.476C254.545 127.918 254.594 127.36 254.681 126.81C254.794 125.985 254.976 125.17 255.214 124.37C255.25 124.302 255.288 124.235 255.328 124.169C255.27 124.219 255.211 124.268 255.152 124.317C255.09 124.368 255.029 124.418 254.967 124.468C254.89 124.532 254.812 124.593 254.732 124.654C254.652 124.715 254.571 124.775 254.492 124.834C254.158 125.08 253.812 125.312 253.456 125.526C253.439 125.587 253.424 125.648 253.407 125.709C253.364 125.871 253.321 126.031 253.279 126.193C253.219 126.417 253.163 126.639 253.107 126.862L252.786 128.442C252.769 128.541 252.747 128.639 252.726 128.737C252.722 128.757 252.719 128.777 252.714 128.796C252.702 128.855 252.688 128.914 252.678 128.973C252.666 129.032 252.656 129.092 252.647 129.152C252.658 129.133 252.673 129.115 252.685 129.098C252.828 128.912 252.985 128.739 253.156 128.583C252.937 128.907 252.758 129.247 252.614 129.6C252.599 129.637 252.584 129.676 252.568 129.714L252.567 129.718L252.523 130.032L252.411 130.829C252.403 130.896 252.392 130.963 252.382 131.029C252.352 131.23 252.324 131.428 252.313 131.629C252.295 131.875 252.275 132.122 252.256 132.365C252.359 132.232 252.462 132.1 252.567 131.968C252.579 131.951 252.592 131.936 252.604 131.92C252.611 131.871 252.619 131.823 252.626 131.777C252.764 130.871 252.949 129.973 253.177 129.085C253.432 128.038 253.746 127.007 254.107 125.989C254.062 126.23 254.02 126.471 253.983 126.71C253.897 127.287 253.854 127.868 253.832 128.448C253.812 129.027 253.811 129.607 253.843 130.183C253.843 130.187 253.843 130.189 253.843 130.194C253.844 130.228 253.848 130.259 253.851 130.293C253.933 130.185 254.013 130.076 254.094 129.965C254.153 129.886 254.211 129.807 254.268 129.729C254.307 129.677 254.345 129.624 254.384 129.571C254.403 129.546 254.421 129.518 254.441 129.491C254.461 129.464 254.481 129.438 254.499 129.41L254.5 129.408C254.499 129.372 254.499 129.336 254.501 129.301L254.5 129.301ZM280.075 143.082C279.865 143.195 279.653 143.304 279.437 143.411C279.347 143.457 279.255 143.504 279.162 143.547L279.159 143.548C278.986 143.719 278.809 143.892 278.63 144.059L278.456 144.21C278.444 144.218 278.434 144.23 278.422 144.24L278.234 144.4L277.878 144.709L277.873 144.713L277.549 144.993C277.367 145.145 277.196 145.311 277.005 145.455L276.438 145.888L275.871 146.321C275.678 146.463 275.496 146.617 275.294 146.745C275.113 146.866 274.933 146.986 274.751 147.109C274.796 147.004 274.838 146.899 274.883 146.794C274.974 146.574 275.068 146.353 275.158 146.134C275.23 145.965 275.302 145.794 275.375 145.625C275.405 145.558 275.432 145.491 275.461 145.426C275.486 145.367 275.512 145.308 275.539 145.25C275.586 145.138 275.635 145.029 275.683 144.919C275.539 144.976 275.399 145.035 275.254 145.094C275.246 145.098 275.239 145.1 275.232 145.104C275.173 145.248 275.119 145.393 275.068 145.54L275.059 145.564C275.035 145.627 275.014 145.69 274.993 145.756L274.992 145.758C274.959 145.852 274.929 145.947 274.901 146.04C274.808 146.336 274.725 146.636 274.659 146.938C274.638 147.029 274.619 147.12 274.6 147.21C274.042 147.587 273.482 147.964 272.892 148.292L272.275 148.655L271.968 148.837L271.649 148.998L270.373 149.646C270.162 149.761 269.943 149.853 269.724 149.946L269.066 150.227C268.626 150.414 268.192 150.615 267.738 150.763L266.707 151.136C267.429 150.696 268.116 150.201 268.753 149.645C268.841 149.57 268.928 149.495 269.012 149.417C269.93 148.61 270.809 147.763 271.649 146.877C271.719 146.804 271.789 146.729 271.857 146.654L271.86 146.653C271.925 146.581 271.991 146.511 272.054 146.439C272.109 146.384 272.16 146.328 272.209 146.271C272.122 146.298 272.035 146.324 271.947 146.347C271.945 146.348 271.944 146.35 271.942 146.349C271.842 146.378 271.742 146.404 271.641 146.428C271.763 146.34 271.882 146.251 272.002 146.159C272.161 146.04 272.318 145.915 272.474 145.788C272.474 145.788 272.474 145.786 272.476 145.787C272.537 145.738 272.6 145.691 272.659 145.642C272.721 145.591 272.785 145.542 272.844 145.493C272.741 145.529 272.638 145.563 272.536 145.597C272.534 145.596 272.534 145.598 272.534 145.598C272.278 145.68 272.019 145.763 271.76 145.844C271.5 145.918 271.238 145.987 270.972 146.044L270.97 146.044C270.925 146.094 270.878 146.14 270.831 146.189C270.847 146.149 270.862 146.105 270.877 146.064C270.774 146.085 270.673 146.103 270.571 146.12C270.551 146.25 270.529 146.38 270.508 146.509C270.356 146.655 270.202 146.801 270.054 146.95C270.007 146.999 269.959 147.046 269.912 147.092C269.497 147.505 269.055 147.885 268.614 148.266C268.44 148.415 268.268 148.566 268.097 148.717C268.097 148.717 268.095 148.718 268.094 148.72C268.07 148.74 268.048 148.761 268.025 148.781C267.469 149.254 266.88 149.67 266.261 150.046C266.119 150.133 265.976 150.216 265.832 150.299C265.427 150.527 265.014 150.74 264.589 150.936C264.648 150.809 264.704 150.679 264.755 150.549C264.787 150.47 264.818 150.388 264.846 150.305L264.859 150.268C264.878 150.215 264.895 150.164 264.911 150.113C265.034 149.74 265.129 149.356 265.198 148.969C265.219 148.859 265.237 148.747 265.252 148.637C265.257 148.603 265.262 148.571 265.266 148.536L265.267 148.534C265.268 148.524 265.269 148.514 265.271 148.504C265.273 148.49 265.273 148.478 265.274 148.463C265.279 148.437 265.281 148.413 265.284 148.386C265.287 148.371 265.289 148.352 265.289 148.335C265.299 148.259 265.307 148.179 265.311 148.101C265.326 147.956 265.334 147.81 265.337 147.663C265.343 147.482 265.342 147.301 265.335 147.119C265.329 146.877 265.312 146.635 265.283 146.396C265.278 146.346 265.27 146.294 265.262 146.243C265.256 146.195 265.248 146.145 265.24 146.096C265.223 145.981 265.201 145.866 265.176 145.75C265.144 145.583 265.103 145.415 265.055 145.249L265.056 145.247C265.045 145.201 265.03 145.158 265.016 145.113C265 145.057 264.983 145.002 264.96 144.946C264.91 144.785 264.849 144.628 264.78 144.471C264.772 144.449 264.763 144.429 264.753 144.409C264.748 144.397 264.742 144.386 264.737 144.374C264.738 144.42 264.737 144.466 264.738 144.511C264.739 144.516 264.738 144.517 264.739 144.522C264.739 144.613 264.741 144.704 264.742 144.792C264.741 144.885 264.742 144.976 264.744 145.067C264.744 145.132 264.745 145.198 264.745 145.263C264.745 145.314 264.745 145.367 264.746 145.419C264.745 145.603 264.744 145.783 264.742 145.966C264.742 146.021 264.74 146.075 264.738 146.129C264.736 146.227 264.734 146.323 264.73 146.421L264.729 146.423C264.727 146.477 264.726 146.529 264.722 146.582C264.724 146.596 264.722 146.608 264.721 146.62C264.716 146.751 264.709 146.881 264.702 147.011L264.701 147.013C264.701 147.045 264.698 147.078 264.696 147.108C264.687 147.236 264.678 147.365 264.668 147.493C264.656 147.64 264.643 147.789 264.628 147.936C264.626 147.952 264.623 147.968 264.622 147.982C264.616 148.048 264.609 148.111 264.6 148.175L264.599 148.177C264.592 148.257 264.583 148.338 264.573 148.416C264.557 148.541 264.541 148.668 264.52 148.793C264.512 148.852 264.505 148.91 264.495 148.968C264.479 149.076 264.461 149.184 264.442 149.291C264.383 149.645 264.313 149.998 264.235 150.35C264.233 150.362 264.229 150.376 264.227 150.387L264.225 150.393C264.212 150.454 264.199 150.515 264.183 150.575L264.182 150.577C264.139 150.779 264.089 150.978 264.038 151.182C263.828 151.269 263.618 151.352 263.408 151.431C263.26 151.485 263.114 151.538 262.966 151.587C263.709 151.552 264.454 151.492 265.198 151.42C265.394 151.399 265.59 151.376 265.786 151.35C266.853 151.183 267.907 150.975 268.948 150.717L269.864 150.481L270.767 150.209C271.039 150.134 271.299 150.035 271.563 149.943C271.633 149.917 271.704 149.889 271.773 149.86C271.451 149.919 271.129 149.978 270.808 150.048C270.442 150.121 270.072 150.203 269.706 150.293L269.85 150.236C270.075 150.147 270.299 150.059 270.514 149.95L271.82 149.329L272.146 149.172L272.462 148.996L273.096 148.645C275.349 147.406 277.427 145.867 279.308 144.111C279.421 144.009 279.531 143.907 279.639 143.801C280.001 143.456 280.354 143.105 280.698 142.746C280.494 142.861 280.286 142.974 280.077 143.085L280.075 143.082ZM255.833 142.552C255.854 141.865 255.926 141.184 256.059 140.504C256.237 139.668 256.381 138.823 256.621 138.003C256.659 137.862 256.696 137.719 256.733 137.576C256.737 137.552 256.739 137.53 256.743 137.506C256.81 136.99 256.911 136.479 257.004 135.968C257.1 135.536 257.189 135.103 257.299 134.674C257.294 134.677 257.291 134.68 257.286 134.682C257.278 134.688 257.27 134.692 257.262 134.697C257.075 134.816 256.892 134.939 256.711 135.066C256.611 135.135 256.513 135.204 256.415 135.275C256.412 135.278 256.406 135.281 256.403 135.284C256.012 136.389 255.674 137.514 255.391 138.653C255.398 138.67 255.406 138.687 255.415 138.705C255.406 138.784 255.396 138.863 255.388 138.942C255.338 139.481 255.291 140.021 255.272 140.561C255.233 141.39 255.232 142.222 255.264 143.052C255.266 143.095 255.268 143.138 255.272 143.182C255.353 143.104 255.436 143.03 255.52 142.958C255.56 142.921 255.602 142.885 255.646 142.85C255.688 142.814 255.73 142.778 255.774 142.743C255.792 142.728 255.809 142.713 255.829 142.699C255.831 142.651 255.831 142.602 255.833 142.553L255.833 142.552ZM254.488 129.99C254.49 129.965 254.497 129.94 254.503 129.915C254.499 129.745 254.498 129.578 254.497 129.41C254.479 129.437 254.46 129.464 254.44 129.491C254.42 129.518 254.402 129.545 254.383 129.57C254.343 129.624 254.306 129.676 254.267 129.728C254.21 129.807 254.151 129.886 254.092 129.964C254.011 130.075 253.931 130.184 253.85 130.293L253.849 130.295C253.856 130.451 253.867 130.606 253.881 130.763C253.881 130.799 253.885 130.836 253.887 130.871C253.967 130.776 254.045 130.679 254.121 130.581C254.136 130.561 254.151 130.541 254.166 130.523C254.249 130.417 254.331 130.309 254.413 130.2C254.418 130.193 254.422 130.186 254.428 130.18C254.434 130.171 254.438 130.164 254.445 130.156C254.449 130.151 254.452 130.148 254.454 130.142L254.455 130.141C254.463 130.091 254.475 130.04 254.488 129.99ZM256.403 135.284L256.405 135.28C256.427 135.216 256.45 135.15 256.474 135.085C256.567 134.824 256.665 134.565 256.766 134.305C256.534 134.494 256.309 134.693 256.094 134.9L256.093 134.902C256.048 135.089 256.004 135.275 255.96 135.463C255.946 135.521 255.934 135.58 255.92 135.638C255.911 135.671 255.904 135.704 255.896 135.738C255.792 136.268 255.68 136.798 255.602 137.333C255.549 137.637 255.508 137.945 255.471 138.252C255.346 137.817 255.258 137.372 255.191 136.921C255.17 136.781 255.149 136.641 255.13 136.502C255.129 136.493 255.129 136.487 255.127 136.48L255.128 136.478C255.072 136.063 255.024 135.648 254.97 135.231C254.938 134.955 254.902 134.677 254.867 134.4C254.907 134.188 254.949 133.975 254.992 133.765C255.032 133.582 255.073 133.399 255.118 133.218C255.254 132.644 255.413 132.078 255.596 131.52C255.647 131.367 255.699 131.217 255.755 131.066L255.758 131.058C255.801 130.936 255.843 130.818 255.891 130.698C256.252 129.749 256.685 128.835 257.181 127.944C257.342 127.644 257.51 127.348 257.684 127.052L257.685 127.05C257.698 127.025 257.712 127.003 257.727 126.979C257.872 126.73 258.021 126.482 258.172 126.236C258.224 126.148 258.274 126.062 258.328 125.976C258.439 125.789 258.554 125.602 258.669 125.416C258.756 125.275 258.843 125.133 258.932 124.993C259.023 124.841 259.115 124.69 259.206 124.538C259.3 124.381 259.395 124.223 259.49 124.066C260.08 123.081 260.651 122.084 261.177 121.06C260.738 121.586 260.315 122.124 259.901 122.667C259.901 122.669 259.898 122.67 259.897 122.672C259.869 122.711 259.839 122.751 259.81 122.79C259.449 123.267 259.097 123.749 258.747 124.234C258.534 124.525 258.327 124.819 258.123 125.117C258.121 125.121 258.118 125.124 258.116 125.13L258.116 125.132C257.945 125.38 257.777 125.629 257.608 125.88C257.386 126.22 257.172 126.565 256.962 126.916C256.827 127.142 256.694 127.373 256.565 127.606C256.54 127.652 256.516 127.698 256.49 127.744C256.2 128.294 255.929 128.857 255.692 129.437C255.444 130.067 255.226 130.712 255.07 131.369C254.914 132 254.804 132.642 254.74 133.285C254.692 132.824 254.645 132.364 254.605 131.901C254.556 131.322 254.519 130.74 254.508 130.159C254.508 130.13 254.507 130.102 254.507 130.073L254.507 130.071C254.504 130.036 254.504 130 254.505 129.967C254.503 129.949 254.503 129.932 254.504 129.916C254.497 129.941 254.491 129.966 254.489 129.99C254.475 130.041 254.464 130.092 254.455 130.141L254.455 130.143C254.453 130.149 254.45 130.152 254.446 130.157C254.439 130.165 254.434 130.172 254.429 130.181C254.423 130.187 254.418 130.194 254.414 130.201C254.332 130.309 254.25 130.417 254.167 130.523C254.152 130.542 254.137 130.562 254.121 130.582C254.045 130.679 253.967 130.776 253.888 130.871L253.887 130.873C253.931 131.421 253.989 131.966 254.06 132.507C254.107 132.876 254.162 133.245 254.222 133.612C254.256 133.819 254.29 134.029 254.328 134.236C254.333 134.282 254.342 134.33 254.35 134.374C254.367 134.471 254.382 134.567 254.402 134.662L254.401 134.664C254.536 135.439 254.686 136.21 254.853 136.986C254.873 137.073 254.894 137.158 254.917 137.244C254.917 137.244 254.917 137.246 254.919 137.246C254.918 137.254 254.92 137.259 254.922 137.266C255.042 137.733 255.186 138.196 255.383 138.635L255.391 138.653C255.674 137.515 256.012 136.389 256.404 135.284L256.403 135.284ZM263.086 115.103C263.079 115.106 263.073 115.111 263.069 115.116C263.057 115.175 263.041 115.232 263.027 115.291L263.027 115.293C263.024 115.3 263.024 115.307 263.021 115.314C263.009 115.369 262.994 115.425 262.98 115.477C262.974 115.498 262.968 115.521 262.961 115.542C262.9 115.554 262.839 115.567 262.777 115.575C262.742 115.641 262.705 115.708 262.67 115.774C262.638 115.837 262.606 115.897 262.573 115.957C262.701 115.829 262.828 115.703 262.953 115.571L262.954 115.569C262.957 115.566 262.959 115.565 262.963 115.56C262.972 115.552 262.979 115.544 262.987 115.534C263.11 115.411 263.232 115.284 263.351 115.157C263.594 114.9 263.833 114.642 264.07 114.379C263.737 114.615 263.409 114.857 263.086 115.103L263.086 115.103ZM254.5 129.301C254.498 129.025 254.505 128.751 254.52 128.476C254.545 127.918 254.594 127.36 254.681 126.81C254.794 125.985 254.976 125.17 255.214 124.37C255.25 124.302 255.288 124.235 255.328 124.169C255.27 124.219 255.211 124.268 255.152 124.317C255.09 124.368 255.029 124.418 254.967 124.468C254.89 124.532 254.812 124.593 254.732 124.654C254.652 124.715 254.571 124.775 254.492 124.834C254.158 125.08 253.812 125.312 253.456 125.526C253.439 125.587 253.424 125.648 253.407 125.709C253.364 125.871 253.321 126.031 253.279 126.193C253.219 126.417 253.163 126.639 253.107 126.862L252.786 128.442C252.769 128.541 252.747 128.639 252.726 128.737C252.722 128.757 252.719 128.777 252.714 128.796C252.702 128.855 252.688 128.914 252.678 128.973C252.666 129.032 252.656 129.092 252.647 129.152C252.658 129.133 252.673 129.115 252.685 129.098C252.828 128.912 252.985 128.739 253.156 128.583C252.937 128.907 252.758 129.247 252.614 129.6C252.599 129.637 252.584 129.676 252.568 129.714L252.567 129.718L252.523 130.032L252.411 130.829C252.403 130.896 252.392 130.963 252.382 131.029C252.352 131.23 252.324 131.428 252.313 131.629C252.295 131.875 252.275 132.122 252.256 132.365C252.359 132.232 252.462 132.1 252.567 131.968C252.579 131.951 252.592 131.936 252.604 131.92C252.611 131.871 252.619 131.823 252.626 131.777C252.764 130.871 252.949 129.973 253.177 129.085C253.432 128.038 253.746 127.007 254.107 125.989C254.062 126.23 254.02 126.471 253.983 126.71C253.897 127.287 253.854 127.868 253.832 128.448C253.812 129.027 253.811 129.607 253.843 130.183C253.843 130.187 253.843 130.189 253.843 130.194C253.844 130.228 253.848 130.259 253.851 130.293C253.933 130.185 254.013 130.076 254.094 129.965C254.153 129.886 254.211 129.807 254.268 129.729C254.307 129.677 254.345 129.624 254.384 129.571C254.403 129.546 254.421 129.518 254.441 129.491C254.461 129.464 254.481 129.438 254.499 129.41L254.5 129.408C254.499 129.372 254.499 129.336 254.501 129.301L254.5 129.301ZM280.075 143.082C279.865 143.195 279.653 143.304 279.437 143.411C279.347 143.457 279.255 143.504 279.162 143.547L279.159 143.548C278.986 143.719 278.809 143.892 278.63 144.059L278.456 144.21C278.444 144.218 278.434 144.23 278.422 144.24L278.234 144.4L277.878 144.709L277.873 144.713L277.549 144.993C277.367 145.145 277.196 145.311 277.005 145.455L276.438 145.888L275.871 146.321C275.678 146.463 275.496 146.617 275.294 146.745C275.113 146.866 274.933 146.986 274.751 147.109C274.796 147.004 274.838 146.899 274.883 146.794C274.974 146.574 275.068 146.353 275.158 146.134C275.23 145.965 275.302 145.794 275.375 145.625C275.405 145.558 275.432 145.491 275.461 145.426C275.486 145.367 275.512 145.308 275.539 145.25C275.586 145.138 275.635 145.029 275.683 144.919C275.539 144.976 275.399 145.035 275.254 145.094C275.246 145.098 275.239 145.1 275.232 145.104C275.173 145.248 275.119 145.393 275.068 145.54L275.059 145.564C275.035 145.627 275.014 145.69 274.993 145.756L274.992 145.758C274.959 145.852 274.929 145.947 274.901 146.04C274.808 146.336 274.725 146.636 274.659 146.938C274.638 147.029 274.619 147.12 274.6 147.21C274.042 147.587 273.482 147.964 272.892 148.292L272.275 148.655L271.968 148.837L271.649 148.998L270.373 149.646C270.162 149.761 269.943 149.853 269.724 149.946L269.066 150.227C268.626 150.414 268.192 150.615 267.738 150.763L266.707 151.136C267.429 150.696 268.116 150.201 268.753 149.645C268.841 149.57 268.928 149.495 269.012 149.417C269.93 148.61 270.809 147.763 271.649 146.877C271.719 146.804 271.789 146.729 271.857 146.654L271.86 146.653C271.925 146.581 271.991 146.511 272.054 146.439C272.109 146.384 272.16 146.328 272.209 146.271C272.122 146.298 272.035 146.324 271.947 146.347C271.945 146.348 271.944 146.35 271.942 146.349C271.842 146.378 271.742 146.404 271.641 146.428C271.763 146.34 271.882 146.251 272.002 146.159C272.161 146.04 272.318 145.915 272.474 145.788C272.474 145.788 272.474 145.786 272.476 145.787C272.537 145.738 272.6 145.691 272.659 145.642C272.721 145.591 272.785 145.542 272.844 145.493C272.741 145.529 272.638 145.563 272.536 145.597C272.534 145.596 272.534 145.598 272.534 145.598C272.278 145.68 272.019 145.763 271.76 145.844C271.5 145.918 271.238 145.987 270.972 146.044L270.97 146.044C270.925 146.094 270.878 146.14 270.831 146.189C270.847 146.149 270.862 146.105 270.877 146.064C270.774 146.085 270.673 146.103 270.571 146.12C270.551 146.25 270.529 146.38 270.508 146.509C270.356 146.655 270.202 146.801 270.054 146.95C270.007 146.999 269.959 147.046 269.912 147.092C269.497 147.505 269.055 147.885 268.614 148.266C268.44 148.415 268.268 148.566 268.097 148.717C268.097 148.717 268.095 148.718 268.094 148.72C268.07 148.74 268.048 148.761 268.025 148.781C267.469 149.254 266.88 149.67 266.261 150.046C266.119 150.133 265.976 150.216 265.832 150.299C265.427 150.527 265.014 150.74 264.589 150.936C264.648 150.809 264.704 150.679 264.755 150.549C264.787 150.47 264.818 150.388 264.846 150.305L264.859 150.268C264.878 150.215 264.895 150.164 264.911 150.113C265.034 149.74 265.129 149.356 265.198 148.969C265.219 148.859 265.237 148.747 265.252 148.637C265.257 148.603 265.262 148.571 265.266 148.536L265.267 148.534C265.268 148.524 265.269 148.514 265.271 148.504C265.273 148.49 265.273 148.478 265.274 148.463C265.279 148.437 265.281 148.413 265.284 148.386C265.287 148.371 265.289 148.352 265.289 148.335C265.299 148.259 265.307 148.179 265.311 148.101C265.326 147.956 265.334 147.81 265.337 147.663C265.343 147.482 265.342 147.301 265.335 147.119C265.329 146.877 265.312 146.635 265.283 146.396C265.278 146.346 265.27 146.294 265.262 146.243C265.256 146.195 265.248 146.145 265.24 146.096C265.223 145.981 265.201 145.866 265.176 145.75C265.144 145.583 265.103 145.415 265.055 145.249L265.056 145.247C265.045 145.201 265.03 145.158 265.016 145.113C265 145.057 264.983 145.002 264.96 144.946C264.91 144.785 264.849 144.628 264.78 144.471C264.772 144.449 264.763 144.429 264.753 144.409C264.748 144.397 264.742 144.386 264.737 144.374C264.738 144.42 264.737 144.466 264.738 144.511C264.739 144.516 264.738 144.517 264.739 144.522C264.739 144.613 264.741 144.704 264.742 144.792C264.741 144.885 264.742 144.976 264.744 145.067C264.744 145.132 264.745 145.198 264.745 145.263C264.745 145.314 264.745 145.367 264.746 145.419C264.745 145.603 264.744 145.783 264.742 145.966C264.742 146.021 264.74 146.075 264.738 146.129C264.736 146.227 264.734 146.323 264.73 146.421L264.729 146.423C264.727 146.477 264.726 146.529 264.722 146.582C264.724 146.596 264.722 146.608 264.721 146.62C264.716 146.751 264.709 146.881 264.702 147.011L264.701 147.013C264.701 147.045 264.698 147.078 264.696 147.108C264.687 147.236 264.678 147.365 264.668 147.493C264.656 147.64 264.643 147.789 264.628 147.936C264.626 147.952 264.623 147.968 264.622 147.982C264.616 148.048 264.609 148.111 264.6 148.175L264.599 148.177C264.592 148.257 264.583 148.338 264.573 148.416C264.557 148.541 264.541 148.668 264.52 148.793C264.512 148.852 264.505 148.91 264.495 148.968C264.479 149.076 264.461 149.184 264.442 149.291C264.383 149.645 264.313 149.998 264.235 150.35C264.233 150.362 264.229 150.376 264.227 150.387L264.225 150.393C264.212 150.454 264.199 150.515 264.183 150.575L264.182 150.577C264.139 150.779 264.089 150.978 264.038 151.182C263.828 151.269 263.618 151.352 263.408 151.431C263.26 151.485 263.114 151.538 262.966 151.587C263.709 151.552 264.454 151.492 265.198 151.42C265.394 151.399 265.59 151.376 265.786 151.35C266.853 151.183 267.907 150.975 268.948 150.717L269.864 150.481L270.767 150.209C271.039 150.134 271.299 150.035 271.563 149.943C271.633 149.917 271.704 149.889 271.773 149.86C271.451 149.919 271.129 149.978 270.808 150.048C270.442 150.121 270.072 150.203 269.706 150.293L269.85 150.236C270.075 150.147 270.299 150.059 270.514 149.95L271.82 149.329L272.146 149.172L272.462 148.996L273.096 148.645C275.349 147.406 277.427 145.867 279.308 144.111C279.421 144.009 279.531 143.907 279.639 143.801C280.001 143.456 280.354 143.105 280.698 142.746C280.494 142.861 280.286 142.974 280.077 143.085L280.075 143.082ZM255.833 142.552C255.854 141.865 255.926 141.184 256.059 140.504C256.237 139.668 256.381 138.823 256.621 138.003C256.659 137.862 256.696 137.719 256.733 137.576C256.737 137.552 256.739 137.53 256.743 137.506C256.81 136.99 256.911 136.479 257.004 135.968C257.1 135.536 257.189 135.103 257.299 134.674C257.294 134.677 257.291 134.68 257.286 134.682C257.278 134.688 257.27 134.692 257.262 134.697C257.075 134.816 256.892 134.939 256.711 135.066C256.611 135.135 256.513 135.204 256.415 135.275C256.412 135.278 256.406 135.281 256.403 135.284C256.012 136.389 255.674 137.514 255.391 138.653C255.398 138.67 255.406 138.687 255.415 138.705C255.406 138.784 255.396 138.863 255.388 138.942C255.338 139.481 255.291 140.021 255.272 140.561C255.233 141.39 255.232 142.222 255.264 143.052C255.266 143.095 255.268 143.138 255.272 143.182C255.353 143.104 255.436 143.03 255.52 142.958C255.56 142.921 255.602 142.885 255.646 142.85C255.688 142.814 255.73 142.778 255.774 142.743C255.792 142.728 255.809 142.713 255.829 142.699C255.831 142.651 255.831 142.602 255.833 142.553L255.833 142.552ZM254.503 129.915C254.499 129.745 254.498 129.578 254.497 129.41C254.479 129.437 254.46 129.464 254.44 129.491C254.42 129.518 254.402 129.545 254.383 129.57C254.343 129.624 254.306 129.676 254.267 129.728C254.21 129.807 254.151 129.886 254.092 129.964C254.011 130.075 253.931 130.184 253.85 130.293L253.849 130.295C253.856 130.451 253.867 130.606 253.881 130.763C253.881 130.799 253.885 130.836 253.887 130.871C253.967 130.776 254.045 130.679 254.121 130.581C254.136 130.561 254.151 130.541 254.166 130.523C254.249 130.417 254.331 130.309 254.413 130.2C254.418 130.193 254.422 130.186 254.428 130.18C254.434 130.171 254.438 130.164 254.445 130.156C254.449 130.151 254.452 130.148 254.454 130.142L254.455 130.141C254.463 130.091 254.475 130.04 254.488 129.99C254.49 129.965 254.497 129.94 254.503 129.915ZM256.405 135.28C256.427 135.216 256.45 135.15 256.474 135.085C256.567 134.824 256.665 134.565 256.766 134.305C256.534 134.494 256.309 134.693 256.094 134.9L256.093 134.902C256.048 135.089 256.004 135.275 255.96 135.463C255.946 135.521 255.934 135.58 255.92 135.638C255.911 135.671 255.904 135.704 255.896 135.738C255.792 136.268 255.68 136.798 255.602 137.333C255.549 137.637 255.508 137.945 255.471 138.252C255.346 137.817 255.258 137.372 255.191 136.921C255.17 136.781 255.149 136.641 255.13 136.502C255.129 136.493 255.129 136.487 255.127 136.48L255.128 136.478C255.072 136.063 255.024 135.648 254.97 135.231C254.938 134.955 254.902 134.677 254.867 134.4C254.907 134.188 254.949 133.975 254.992 133.765C255.032 133.582 255.073 133.399 255.118 133.218C255.254 132.644 255.413 132.078 255.596 131.52C255.647 131.367 255.699 131.217 255.755 131.066L255.758 131.058C255.801 130.936 255.843 130.818 255.891 130.698C256.252 129.749 256.685 128.835 257.181 127.944C257.342 127.644 257.51 127.348 257.684 127.052L257.685 127.05C257.698 127.025 257.712 127.003 257.727 126.979C257.872 126.73 258.021 126.482 258.172 126.236C258.224 126.148 258.274 126.062 258.328 125.976C258.439 125.789 258.554 125.602 258.669 125.416C258.756 125.275 258.843 125.133 258.932 124.993C259.023 124.841 259.115 124.69 259.206 124.538C259.3 124.381 259.395 124.223 259.49 124.066C260.08 123.081 260.651 122.084 261.177 121.06C260.738 121.586 260.315 122.124 259.901 122.667C259.901 122.669 259.898 122.67 259.897 122.672C259.869 122.711 259.839 122.751 259.81 122.79C259.449 123.267 259.097 123.749 258.747 124.234C258.534 124.525 258.327 124.819 258.123 125.117C258.121 125.121 258.118 125.124 258.116 125.13L258.116 125.132C257.945 125.38 257.777 125.629 257.608 125.88C257.386 126.22 257.172 126.565 256.962 126.916C256.827 127.142 256.694 127.373 256.565 127.606C256.54 127.652 256.516 127.698 256.49 127.744C256.2 128.294 255.929 128.857 255.692 129.437C255.444 130.067 255.226 130.712 255.07 131.369C254.914 132 254.804 132.642 254.74 133.285C254.692 132.824 254.645 132.364 254.605 131.901C254.556 131.322 254.519 130.74 254.508 130.159C254.508 130.13 254.507 130.102 254.507 130.073L254.507 130.071C254.504 130.036 254.504 130 254.505 129.967C254.503 129.949 254.503 129.932 254.504 129.916C254.497 129.941 254.491 129.966 254.489 129.99C254.475 130.041 254.464 130.092 254.455 130.141L254.455 130.143C254.453 130.149 254.45 130.152 254.446 130.157C254.439 130.165 254.434 130.172 254.429 130.181C254.423 130.187 254.418 130.194 254.414 130.201C254.332 130.309 254.25 130.417 254.167 130.523C254.152 130.542 254.137 130.562 254.121 130.582C254.045 130.679 253.967 130.776 253.888 130.871L253.887 130.873C253.931 131.421 253.989 131.966 254.06 132.507C254.107 132.876 254.162 133.245 254.222 133.612C254.256 133.819 254.29 134.029 254.328 134.236C254.333 134.282 254.342 134.33 254.35 134.374C254.367 134.471 254.382 134.567 254.402 134.662L254.401 134.664C254.536 135.439 254.686 136.21 254.853 136.986C254.873 137.073 254.894 137.158 254.917 137.244C254.917 137.244 254.917 137.246 254.919 137.246C254.918 137.254 254.92 137.259 254.922 137.266C255.042 137.733 255.186 138.196 255.383 138.635L255.391 138.653C255.674 137.515 256.012 136.389 256.404 135.284L256.405 135.28L256.405 135.28ZM262.954 115.568C262.958 115.565 262.96 115.564 262.964 115.559C262.973 115.551 262.98 115.543 262.988 115.533C263.111 115.41 263.232 115.283 263.352 115.156C263.595 114.899 263.834 114.641 264.071 114.378C263.738 114.614 263.41 114.856 263.086 115.102C263.079 115.106 263.073 115.11 263.069 115.115C263.057 115.174 263.041 115.232 263.027 115.29L263.027 115.292C263.024 115.3 263.024 115.306 263.022 115.314C263.009 115.368 262.994 115.424 262.98 115.476C262.975 115.498 262.969 115.521 262.961 115.542C262.9 115.554 262.839 115.567 262.777 115.575C262.742 115.64 262.706 115.708 262.67 115.774C262.638 115.836 262.606 115.897 262.573 115.957C262.702 115.829 262.828 115.702 262.953 115.571L262.954 115.569L262.954 115.568ZM254.44 129.491C254.46 129.464 254.48 129.437 254.498 129.41L254.498 129.408C254.498 129.372 254.498 129.336 254.5 129.301C254.499 129.025 254.505 128.751 254.521 128.476C254.545 127.918 254.594 127.36 254.682 126.809C254.795 125.985 254.977 125.17 255.214 124.37C255.25 124.302 255.288 124.235 255.328 124.169C255.27 124.219 255.211 124.268 255.152 124.317C255.09 124.367 255.029 124.417 254.967 124.468C254.89 124.532 254.812 124.593 254.732 124.653C254.652 124.714 254.572 124.775 254.492 124.833C254.158 125.08 253.813 125.312 253.456 125.525C253.439 125.587 253.425 125.647 253.407 125.709C253.364 125.871 253.321 126.03 253.28 126.193C253.219 126.416 253.163 126.639 253.107 126.862L252.786 128.442C252.769 128.541 252.748 128.639 252.726 128.737C252.722 128.756 252.719 128.776 252.714 128.796C252.702 128.855 252.688 128.913 252.678 128.973C252.666 129.032 252.656 129.092 252.648 129.152C252.659 129.133 252.673 129.115 252.685 129.098C252.828 128.912 252.985 128.738 253.157 128.583C252.937 128.907 252.758 129.247 252.614 129.599C252.599 129.636 252.584 129.675 252.568 129.714L252.567 129.718L252.524 130.031L252.412 130.828C252.403 130.895 252.392 130.963 252.382 131.029C252.353 131.23 252.324 131.428 252.313 131.629C252.295 131.875 252.275 132.121 252.256 132.365C252.359 132.232 252.462 132.099 252.567 131.967C252.579 131.95 252.592 131.936 252.605 131.919C252.611 131.871 252.619 131.823 252.626 131.777C252.764 130.871 252.949 129.972 253.177 129.084C253.433 128.038 253.746 127.007 254.107 125.988C254.062 126.229 254.02 126.47 253.984 126.71C253.897 127.287 253.854 127.867 253.832 128.448C253.812 129.026 253.811 129.607 253.843 130.183C253.844 130.187 253.843 130.189 253.844 130.193C253.844 130.227 253.848 130.258 253.851 130.293C253.933 130.184 254.013 130.076 254.094 129.964C254.153 129.886 254.212 129.807 254.268 129.728C254.307 129.676 254.345 129.624 254.384 129.57C254.404 129.545 254.422 129.518 254.441 129.491L254.44 129.491ZM300.436 137.18C300.808 136.009 301.042 134.795 301.16 133.574L301.161 133.572C301.161 133.572 301.161 133.57 301.161 133.566C301.182 133.352 301.2 133.137 301.213 132.922C301.265 132.039 301.264 131.158 301.218 130.279C301.219 130.258 301.217 130.238 301.216 130.217C301.217 130.215 301.215 130.213 301.216 130.211C301.164 129.19 301.051 128.173 300.898 127.168C300.755 126.221 300.58 125.28 300.388 124.344C300.378 124.29 300.364 124.237 300.354 124.182C300.305 123.963 300.258 123.747 300.21 123.528C300.208 123.521 300.207 123.512 300.205 123.505C300.062 122.851 299.913 122.199 299.755 121.548C299.894 122.494 300.052 123.435 300.186 124.379C300.237 124.719 300.287 125.059 300.332 125.398C300.334 125.405 300.334 125.412 300.336 125.419C300.353 125.545 300.37 125.671 300.387 125.794C300.387 125.794 300.388 125.797 300.387 125.799C300.449 126.271 300.505 126.741 300.554 127.213C300.72 128.829 300.813 130.451 300.739 132.067C300.74 132.071 300.738 132.075 300.739 132.079L300.738 132.081C300.726 132.349 300.708 132.617 300.685 132.884C300.587 134.12 300.373 135.345 300.031 136.533C300.016 136.587 300.001 136.638 299.984 136.692L299.982 136.697C299.869 137.086 299.74 137.469 299.595 137.844C299.571 137.913 299.545 137.982 299.516 138.048C299.485 138.13 299.453 138.211 299.419 138.292C299.412 138.311 299.406 138.328 299.398 138.346C299.377 138.395 299.358 138.444 299.334 138.492C299.049 139.158 298.711 139.799 298.322 140.41C298.487 139.982 298.638 139.553 298.778 139.119L298.781 139.111C298.801 139.047 298.823 138.983 298.844 138.918C299.267 137.569 299.575 136.189 299.761 134.796L299.763 134.791C299.765 134.766 299.769 134.744 299.772 134.722C299.984 133.096 300.031 131.455 299.901 129.832C299.898 129.804 299.895 129.775 299.892 129.749C299.892 129.747 299.893 129.745 299.891 129.744C299.88 129.589 299.866 129.433 299.849 129.277C299.853 129.508 299.854 129.742 299.849 129.974C299.848 129.976 299.85 129.976 299.85 129.978C299.85 130.019 299.851 130.061 299.849 130.102C299.815 132.288 299.502 134.456 298.93 136.542C298.918 136.595 298.904 136.647 298.886 136.698C298.886 136.704 298.885 136.708 298.883 136.714C298.277 138.882 297.389 140.96 296.248 142.883C296.247 142.887 296.244 142.89 296.242 142.894C296.236 142.9 296.23 142.907 296.224 142.911L296.228 142.917C296.106 143.125 295.979 143.331 295.848 143.534C295.668 143.82 295.481 144.1 295.288 144.377C295.284 144.383 295.28 144.388 295.275 144.395C294.257 145.856 293.077 147.199 291.768 148.398C291.759 148.408 291.749 148.417 291.74 148.426C291.412 148.726 291.078 149.016 290.736 149.298C289.301 150.479 287.732 151.498 286.072 152.327C285.023 152.848 283.944 153.301 282.839 153.68C281.732 154.055 280.595 154.337 279.45 154.55C278.716 154.69 277.974 154.786 277.226 154.858L277.317 154.767L277.951 154.142L277.951 154.14L278.177 153.92L278.229 153.868L279.285 152.821L279.758 152.351C279.804 152.365 279.846 152.369 279.887 152.356C280.317 152.252 280.748 152.144 281.176 152.026C281.837 151.84 282.494 151.632 283.143 151.396C283.34 151.363 283.536 151.33 283.735 151.293C283.833 151.277 283.93 151.258 284.027 151.239C284.453 151.151 284.878 151.051 285.298 150.932C285.354 150.918 285.409 150.903 285.465 150.887C285.613 150.845 285.759 150.799 285.904 150.753C286.099 150.689 286.292 150.622 286.486 150.55C286.562 150.524 286.638 150.495 286.714 150.465C287.036 150.341 287.356 150.205 287.67 150.057C287.836 149.98 288.001 149.898 288.165 149.814C288.168 149.811 288.171 149.81 288.173 149.808C288.6 149.586 289.015 149.344 289.414 149.074C290.495 148.343 291.452 147.435 292.215 146.389C292.499 145.997 292.76 145.59 292.993 145.168C292.994 145.167 292.995 145.165 292.994 145.164C293.049 145.065 293.103 144.964 293.155 144.862C293.178 144.821 293.199 144.778 293.22 144.737C293.501 144.158 293.74 143.56 293.909 142.945C293.664 143.534 293.384 144.107 293.052 144.645C292.778 145.108 292.472 145.547 292.136 145.963C292.076 146.037 292.015 146.111 291.954 146.184C291.546 146.662 291.113 147.119 290.639 147.527C290.491 147.657 290.338 147.781 290.183 147.9C289.846 148.164 289.492 148.406 289.128 148.629C288.734 148.874 288.323 149.091 287.903 149.289C287.821 149.33 287.739 149.367 287.655 149.403C287.367 149.534 287.073 149.654 286.777 149.765C286.658 149.812 286.54 149.855 286.421 149.896C286.389 149.908 286.357 149.92 286.326 149.931C286.373 149.905 286.421 149.877 286.466 149.849L286.469 149.847C287.134 149.467 287.772 149.048 288.38 148.583C288.424 148.547 288.469 148.514 288.513 148.479C288.622 148.395 288.728 148.308 288.834 148.22C289.255 147.873 289.659 147.506 290.04 147.117C290.047 147.109 290.056 147.102 290.063 147.094C290.066 147.091 290.067 147.089 290.07 147.086C290.798 146.348 291.449 145.538 292.009 144.672C292.492 143.924 292.911 143.138 293.263 142.323C293.342 142.14 293.415 141.954 293.485 141.768C293.635 141.38 293.769 140.986 293.884 140.588C293.959 140.33 294.026 140.068 294.086 139.805C293.972 140.159 293.849 140.508 293.712 140.853C293.527 141.327 293.321 141.791 293.091 142.244C292.728 142.967 292.314 143.664 291.849 144.324C291.846 144.327 291.844 144.331 291.841 144.334C291.835 144.345 291.828 144.355 291.82 144.365C291.791 144.406 291.763 144.444 291.734 144.485C291.22 145.189 290.665 145.862 290.051 146.477C289.586 146.944 289.09 147.378 288.572 147.779C288.521 147.817 288.472 147.854 288.423 147.892C288.42 147.895 288.417 147.897 288.412 147.899C288.298 147.986 288.181 148.072 288.064 148.155C288.014 148.191 287.966 148.227 287.914 148.261C287.55 148.521 287.172 148.76 286.788 148.987C286.984 148.685 287.175 148.382 287.37 148.081C287.666 147.628 287.959 147.175 288.267 146.731C288.568 146.283 288.883 145.842 289.198 145.402C289.351 145.19 289.508 144.977 289.662 144.763C289.825 144.535 289.988 144.307 290.15 144.077C289.727 144.428 289.343 144.819 288.981 145.232C288.619 145.644 288.286 146.081 287.976 146.533C287.851 146.715 287.732 146.901 287.616 147.091C287.444 147.368 287.281 147.653 287.132 147.945C286.94 148.316 286.763 148.697 286.614 149.09C285.812 149.551 284.977 149.956 284.123 150.315C283.905 150.408 283.687 150.497 283.468 150.583C282.66 150.903 281.836 151.194 281.003 151.459C280.832 151.516 280.658 151.569 280.485 151.623C281.544 150.56 282.599 149.493 283.649 148.421L286.719 145.267L287.222 144.75L289.009 142.914C289.274 142.642 289.537 142.369 289.798 142.09C290.036 141.842 290.269 141.59 290.5 141.335C290.534 141.322 290.569 141.308 290.604 141.291C290.819 141.206 291.03 141.108 291.24 141.002C291.666 140.786 292.079 140.537 292.477 140.269C292.638 140.158 292.797 140.045 292.95 139.925C292.983 139.903 293.015 139.88 293.044 139.854C293.084 139.826 293.121 139.797 293.158 139.765C293.158 139.765 293.159 139.764 293.161 139.762C293.203 139.732 293.242 139.697 293.282 139.667C293.312 139.642 293.341 139.618 293.371 139.593L293.372 139.591C293.572 139.427 293.766 139.256 293.956 139.079C294.135 138.91 294.311 138.735 294.481 138.556C295.085 137.917 295.624 137.215 296.078 136.463C296.366 135.985 296.623 135.489 296.832 134.974L296.833 134.972C296.855 134.921 296.875 134.869 296.895 134.817C296.986 134.585 297.067 134.347 297.135 134.108L297.136 134.104C297.14 134.093 297.142 134.081 297.146 134.07C297.142 134.076 297.138 134.081 297.133 134.088L297.132 134.092C297.042 134.217 296.954 134.344 296.865 134.467C296.843 134.499 296.819 134.531 296.796 134.563C296.779 134.587 296.762 134.611 296.746 134.634C296.379 135.152 296.012 135.658 295.622 136.149C295.098 136.816 294.547 137.459 293.968 138.071C293.917 138.125 293.865 138.179 293.813 138.23C293.279 138.787 292.722 139.32 292.138 139.831C292.031 139.927 291.922 140.022 291.812 140.114C291.53 140.357 291.239 140.594 290.947 140.83C291.508 140.182 292.04 139.501 292.511 138.777C292.596 138.649 292.679 138.52 292.759 138.387C292.901 138.159 293.036 137.923 293.162 137.685C293.309 137.407 293.446 137.123 293.571 136.834C293.584 136.82 293.6 136.806 293.613 136.792C293.774 136.619 293.908 136.427 294.049 136.24C294.328 135.861 294.596 135.475 294.848 135.076C294.964 134.895 295.075 134.713 295.182 134.526C295.547 133.893 295.864 133.229 296.117 132.54C296.204 132.32 296.275 132.091 296.349 131.867C296.411 131.638 296.483 131.412 296.534 131.179C296.55 131.115 296.566 131.051 296.58 130.986C296.676 130.59 296.744 130.186 296.807 129.785C296.936 128.848 296.985 127.9 296.962 126.959C296.957 126.778 296.946 126.598 296.936 126.419C297.006 126.18 297.07 125.937 297.125 125.693C297.125 125.693 297.127 125.691 297.126 125.689C297.135 125.658 297.141 125.627 297.148 125.595C297.175 125.48 297.199 125.363 297.221 125.246C297.306 124.816 297.369 124.379 297.412 123.941L297.413 123.937C297.418 123.905 297.422 123.871 297.425 123.838C297.489 123.197 297.499 122.549 297.484 121.904C297.462 121.258 297.399 120.615 297.306 119.976C297.267 119.732 297.224 119.491 297.176 119.248C297.098 118.857 297.007 118.47 296.905 118.084C296.731 117.463 296.538 116.849 296.295 116.253C296.001 115.504 295.655 114.778 295.258 114.082C295.248 114.064 295.236 114.047 295.226 114.029L295.225 114.026C295.089 113.792 294.947 113.559 294.797 113.333C294.788 113.317 294.778 113.303 294.769 113.287L294.768 113.284C294.674 113.147 294.581 113.009 294.485 112.873C294.571 113.086 294.657 113.299 294.74 113.511C294.749 113.533 294.757 113.553 294.766 113.575C294.899 113.915 295.029 114.256 295.153 114.596C295.153 114.596 295.155 114.596 295.155 114.598C295.163 114.618 295.169 114.635 295.175 114.654C295.393 115.246 295.595 115.838 295.775 116.435C295.949 117.037 296.124 117.637 296.258 118.248C296.4 118.853 296.521 119.466 296.61 120.082C296.685 120.529 296.737 120.981 296.778 121.433C296.793 121.601 296.807 121.77 296.82 121.939C296.854 122.247 296.85 122.56 296.867 122.871C296.87 122.91 296.872 122.949 296.872 122.989C296.877 123.104 296.872 123.221 296.873 123.339L296.877 123.808C296.873 124.192 296.853 124.576 296.829 124.962C296.827 124.991 296.826 125.018 296.825 125.047L296.824 125.049C296.822 125.065 296.822 125.08 296.82 125.096C296.82 125.085 296.817 125.076 296.814 125.064L296.815 125.062C296.813 125.043 296.812 125.023 296.808 125.003C296.713 124.214 296.575 123.433 296.405 122.662C296.311 122.24 296.209 121.824 296.098 121.408C295.858 120.505 295.583 119.614 295.294 118.73C295.118 118.216 294.941 117.702 294.759 117.192C294.706 117.041 294.654 116.895 294.599 116.743L294.598 116.741C294.596 116.736 294.595 116.731 294.592 116.726C294.516 116.516 294.439 116.306 294.362 116.098C294.419 116.314 294.479 116.531 294.539 116.747C294.543 116.77 294.551 116.792 294.556 116.813C294.558 116.819 294.56 116.826 294.563 116.834L294.563 116.836C294.741 117.488 294.925 118.135 295.094 118.789C295.098 118.803 295.103 118.82 295.106 118.834C295.342 119.715 295.57 120.601 295.758 121.49C295.895 122.128 296.018 122.766 296.117 123.407C296.248 124.209 296.343 125.01 296.392 125.815C296.395 125.837 296.396 125.859 296.397 125.88L296.397 125.882C296.419 126.244 296.43 126.605 296.433 126.967C296.434 127.079 296.433 127.192 296.432 127.305C296.432 127.322 296.433 127.34 296.43 127.358C296.43 127.359 296.43 127.36 296.431 127.362C296.413 128.757 296.239 130.152 295.864 131.486C295.785 131.776 295.693 132.065 295.592 132.35C295.298 133.21 294.891 134.032 294.437 134.826C294.372 134.939 294.306 135.05 294.236 135.161C294.195 135.231 294.152 135.3 294.109 135.369C294.478 134.173 294.701 132.934 294.782 131.691C294.806 131.329 294.821 130.966 294.829 130.604C294.83 130.575 294.831 130.543 294.831 130.512C294.838 130.006 294.83 129.5 294.811 128.997C294.811 128.995 294.811 128.994 294.81 128.992C294.809 128.971 294.809 128.947 294.806 128.925C294.774 128.133 294.707 127.341 294.615 126.555C294.602 126.451 294.59 126.346 294.576 126.242C294.385 124.723 294.118 123.213 293.835 121.71C293.828 121.663 293.818 121.619 293.809 121.572L293.808 121.57C293.809 121.568 293.809 121.566 293.808 121.563C293.803 121.541 293.8 121.518 293.796 121.496C293.799 121.522 293.803 121.547 293.807 121.573C293.807 121.575 293.808 121.576 293.807 121.578C293.816 121.631 293.823 121.684 293.832 121.738C294.071 123.308 294.294 124.881 294.43 126.463C294.434 126.5 294.438 126.536 294.44 126.572C294.522 127.502 294.57 128.433 294.57 129.364C294.571 129.391 294.571 129.415 294.572 129.442L294.571 129.444C294.57 129.971 294.554 130.496 294.521 131.022C294.518 131.056 294.517 131.09 294.515 131.127L294.514 131.129C294.5 131.307 294.487 131.486 294.469 131.665C294.349 132.933 294.095 134.189 293.685 135.389C293.596 135.088 293.508 134.788 293.424 134.489C293.337 134.183 293.256 133.877 293.181 133.569C293.163 133.499 293.147 133.431 293.131 133.36C293.111 133.285 293.093 133.209 293.079 133.135L293.079 133.133C293.069 133.102 293.062 133.074 293.056 133.043C292.992 132.766 292.932 132.488 292.879 132.211C292.872 132.183 292.866 132.156 292.863 132.127C292.793 131.778 292.733 131.429 292.679 131.08C292.616 130.67 292.563 130.26 292.522 129.85C292.479 129.464 292.447 129.077 292.423 128.689C292.421 128.688 292.422 128.686 292.423 128.684L292.422 128.682C292.419 128.641 292.416 128.6 292.414 128.557C292.377 127.973 292.363 127.387 292.353 126.794C292.352 126.684 292.351 126.576 292.349 126.466C292.349 126.462 292.35 126.458 292.349 126.456L292.349 126.454C292.35 126.42 292.348 126.39 292.349 126.357C292.347 126.23 292.346 126.105 292.344 125.978C292.257 126.234 292.181 126.495 292.121 126.758C292.041 127.088 291.98 127.421 291.939 127.759C291.938 127.762 291.936 127.766 291.937 127.771C291.937 127.775 291.936 127.779 291.935 127.782C291.934 127.786 291.934 127.793 291.932 127.796C291.924 127.85 291.918 127.903 291.913 127.956C291.89 128.155 291.871 128.355 291.859 128.555C291.824 129.143 291.831 129.735 291.881 130.325C291.881 130.332 291.882 130.336 291.882 130.342C291.883 130.343 291.883 130.345 291.883 130.345C291.905 130.626 291.94 130.908 291.982 131.188C292.006 131.35 292.034 131.511 292.067 131.672C292.141 132.06 292.235 132.444 292.346 132.824C292.353 132.85 292.361 132.878 292.37 132.905C292.436 133.128 292.511 133.349 292.593 133.569C292.601 133.6 292.612 133.629 292.625 133.659C292.633 133.684 292.643 133.709 292.653 133.736C292.74 133.958 292.832 134.179 292.93 134.394C293.043 134.64 293.162 134.879 293.292 135.112C293.39 135.287 293.49 135.458 293.598 135.627C293.486 135.939 293.366 136.248 293.232 136.549C293.133 136.775 293.024 136.997 292.908 137.215C292.77 137.481 292.621 137.739 292.465 137.995C292.062 138.64 291.607 139.254 291.116 139.839C290.877 140.125 290.629 140.406 290.375 140.682C290.321 140.741 290.267 140.799 290.211 140.855C289.688 141.417 289.143 141.961 288.593 142.503L287.387 143.692L286.769 144.301L286.753 144.317L285.937 145.121L285.873 145.185L283.119 147.897C283.087 147.928 283.056 147.962 283.024 147.993C283.251 147.656 283.469 147.313 283.677 146.966L283.678 146.964C283.733 146.878 283.786 146.793 283.836 146.703C283.931 146.544 284.024 146.385 284.116 146.225C284.723 145.166 285.258 144.067 285.731 142.939C285.76 142.875 285.787 142.809 285.812 142.744C285.868 142.612 285.923 142.477 285.974 142.343C286.003 142.277 286.028 142.21 286.054 142.143C286.071 142.098 286.088 142.056 286.106 142.011C286.484 141.637 286.831 141.231 287.152 140.805C287.383 140.496 287.6 140.175 287.8 139.842C288.058 139.424 288.29 138.988 288.494 138.538C288.801 137.87 289.049 137.172 289.232 136.459L289.232 136.457C289.249 136.395 289.263 136.337 289.276 136.276C289.283 136.255 289.289 136.234 289.292 136.212L289.293 136.21C289.306 136.16 289.317 136.111 289.328 136.06L289.329 136.056C289.331 136.05 289.331 136.044 289.332 136.04L289.333 136.038C289.341 136.003 289.348 135.966 289.354 135.93C289.525 135.109 289.614 134.27 289.57 133.431C289.321 134.269 289.081 135.088 288.799 135.891C288.518 136.693 288.204 137.477 287.853 138.246C287.754 138.465 287.652 138.682 287.544 138.895C287.482 139.023 287.42 139.149 287.354 139.273L287.352 139.279C287.224 139.532 287.091 139.783 286.954 140.032C286.867 140.19 286.779 140.346 286.69 140.501C286.651 140.57 286.611 140.638 286.57 140.706C286.637 140.507 286.702 140.309 286.763 140.109L286.764 140.103C286.767 140.095 286.77 140.088 286.77 140.08L286.776 140.063C286.793 140.014 286.808 139.966 286.82 139.918C286.852 139.821 286.881 139.726 286.909 139.631C287.019 139.248 287.125 138.863 287.221 138.477C287.229 138.447 287.239 138.414 287.245 138.383C287.338 138.029 287.414 137.67 287.491 137.316C287.565 136.981 287.637 136.646 287.71 136.313C287.721 136.262 287.732 136.213 287.743 136.162C287.749 136.133 287.754 136.107 287.76 136.078L287.761 136.076L287.776 136.012C287.779 135.993 287.783 135.976 287.787 135.958C287.843 135.711 287.9 135.462 287.962 135.217C288.095 134.673 288.244 134.133 288.428 133.603C288.526 133.323 288.63 133.045 288.749 132.77C288.413 133.269 288.138 133.81 287.903 134.366C287.826 134.546 287.755 134.726 287.685 134.908C287.572 135.216 287.466 135.528 287.367 135.838C287.347 135.901 287.328 135.964 287.308 136.027L287.307 136.029C287.256 136.19 287.206 136.349 287.159 136.51C287.092 136.733 287.027 136.959 286.964 137.182C286.817 137.697 286.664 138.211 286.506 138.722C286.454 138.89 286.403 139.055 286.35 139.22C286.281 139.438 286.21 139.656 286.136 139.873C286.114 139.938 286.093 140.005 286.07 140.071L286.033 140.176C285.911 140.534 285.785 140.892 285.652 141.246C285.609 141.364 285.564 141.481 285.519 141.598C285.512 141.617 285.505 141.633 285.498 141.652C285.477 141.706 285.458 141.761 285.438 141.815L285.437 141.817C285.346 142.061 285.251 142.304 285.154 142.546C285.129 142.613 285.102 142.678 285.075 142.744L285.075 142.746C285.049 142.807 285.026 142.868 284.999 142.929C284.973 142.996 284.947 143.058 284.919 143.122L284.918 143.124C284.819 143.361 284.719 143.596 284.616 143.832C284.314 144.555 283.972 145.262 283.636 145.972C283.423 146.41 283.205 146.844 282.979 147.275C282.941 147.35 282.901 147.423 282.864 147.498C282.862 147.5 282.86 147.503 282.86 147.505C282.679 147.851 282.494 148.194 282.306 148.537C282.266 148.609 282.228 148.683 282.185 148.756C282.16 148.806 282.131 148.857 282.104 148.907C281.325 149.684 280.547 150.462 279.772 151.245C279.681 151.338 279.59 151.428 279.499 151.521L278.372 152.67C278.431 152.488 278.49 152.306 278.551 152.125C278.611 151.946 278.67 151.768 278.73 151.589C278.844 151.256 278.959 150.923 279.08 150.592C279.196 150.263 279.318 149.937 279.441 149.611C279.468 149.546 279.492 149.483 279.517 149.418C279.561 149.303 279.604 149.189 279.649 149.074C279.684 148.983 279.72 148.892 279.756 148.802C279.781 148.737 279.805 148.671 279.832 148.607C279.968 148.256 280.106 147.906 280.24 147.55C279.978 147.912 279.749 148.292 279.54 148.685C279.504 148.75 279.47 148.819 279.437 148.885L279.435 148.888C279.422 148.913 279.41 148.937 279.397 148.962C279.311 149.13 279.231 149.3 279.155 149.472C279.126 149.537 279.097 149.601 279.069 149.665C278.956 149.931 278.849 150.202 278.749 150.473C278.607 150.874 278.479 151.282 278.372 151.694C278.341 151.814 278.312 151.932 278.286 152.052C278.221 152.341 278.164 152.633 278.122 152.926L277.789 153.263L277.705 153.348L276.932 154.144L276.812 154.266L276.723 154.358L276.364 154.724C276.305 154.786 276.256 154.855 276.217 154.938C276.13 154.944 276.044 154.95 275.958 154.956C274.781 155.028 273.593 155.046 272.4 155.053C270.587 155.065 268.778 155.09 266.985 155.012C267.19 154.938 267.388 154.859 267.587 154.776L267.589 154.777C267.722 154.722 267.855 154.667 267.985 154.611C268.032 154.592 268.082 154.571 268.128 154.551C268.267 154.492 268.406 154.43 268.543 154.371C268.897 154.216 269.25 154.058 269.6 153.897C270.088 153.675 270.573 153.449 271.059 153.213C271.29 153.099 271.523 152.985 271.755 152.863C272.008 152.731 272.261 152.594 272.513 152.441C271.948 152.452 271.4 152.552 270.866 152.693C270.593 152.765 270.325 152.851 270.06 152.948C269.805 153.039 269.554 153.144 269.306 153.256C268.805 153.486 268.32 153.756 267.862 154.067C267.743 154.148 267.628 154.23 267.514 154.317C267.416 154.393 267.318 154.47 267.225 154.55C267.154 154.607 267.089 154.663 267.023 154.724L267.023 154.726C266.925 154.812 266.831 154.903 266.739 154.998C266.246 154.974 265.754 154.945 265.266 154.902C264.092 154.8 262.925 154.629 261.787 154.353C261.219 154.219 260.66 154.046 260.108 153.85C259.854 153.764 259.609 153.656 259.361 153.558C259.839 153.521 260.314 153.463 260.783 153.381C260.917 153.358 261.05 153.332 261.181 153.306C261.224 153.298 261.267 153.29 261.308 153.281L261.31 153.281C261.472 153.247 261.629 153.211 261.788 153.171C261.922 153.14 262.053 153.105 262.185 153.071C262.187 153.072 262.188 153.071 262.19 153.071C262.743 152.921 263.287 152.744 263.822 152.543C263.914 152.51 264.004 152.474 264.094 152.437C264.728 152.188 265.347 151.897 265.949 151.571C266.116 151.529 266.281 151.488 266.445 151.441L266.613 151.388C266.618 151.386 266.623 151.385 266.627 151.384L267.276 151.178C267.954 151.015 268.632 150.892 269.313 150.793L269.322 150.792C269.844 150.714 270.366 150.648 270.892 150.584C271.529 150.515 272.167 150.429 272.808 150.343C273.45 150.248 274.09 150.131 274.729 149.984C275.368 149.824 276 149.622 276.609 149.361C276.758 149.295 276.906 149.225 277.053 149.154C277.501 148.932 277.936 148.685 278.339 148.386C278.488 148.28 278.633 148.166 278.772 148.048C278.927 147.918 279.075 147.782 279.215 147.639C279.413 147.44 279.597 147.228 279.768 147.005C279.848 146.896 279.926 146.784 279.998 146.67C280.281 146.225 280.498 145.744 280.611 145.24C280.229 146.013 279.687 146.661 279.055 147.196C278.735 147.469 278.392 147.712 278.035 147.927C277.608 148.182 277.164 148.411 276.704 148.601C276.586 148.653 276.471 148.7 276.353 148.743C275.773 148.971 275.173 149.157 274.564 149.299C273.952 149.454 273.328 149.57 272.698 149.687C272.694 149.687 272.691 149.689 272.687 149.689C272.684 149.69 272.682 149.692 272.68 149.691C272.4 149.746 272.117 149.797 271.832 149.846C271.811 149.851 271.791 149.855 271.769 149.857C271.448 149.917 271.126 149.975 270.805 150.045C270.438 150.119 270.068 150.201 269.702 150.291L269.846 150.233C270.071 150.145 270.295 150.056 270.51 149.947L271.817 149.326L272.143 149.17L272.458 148.993L273.092 148.642C275.346 147.403 277.423 145.864 279.304 144.109C279.418 144.007 279.527 143.904 279.635 143.798C279.997 143.454 280.351 143.103 280.694 142.744C280.803 142.632 280.908 142.521 281.015 142.408C281.015 142.408 281.016 142.407 281.018 142.405C281.122 142.296 281.224 142.184 281.323 142.073C281.555 141.825 281.779 141.572 282 141.318L282.347 140.884L282.904 140.182C283.05 139.991 283.21 139.81 283.346 139.609L283.76 139.013L284.173 138.417C284.309 138.219 284.457 138.025 284.574 137.815L285.319 136.57C285.581 136.161 285.777 135.718 286.001 135.29L286.33 134.644L286.493 134.321L286.634 133.987L287.2 132.652C287.285 132.458 287.358 132.258 287.43 132.057L287.458 131.974C287.543 131.749 287.62 131.521 287.694 131.289C288.3 129.456 288.728 127.556 288.859 125.628C288.873 125.401 288.884 125.173 288.889 124.945C288.892 124.839 288.894 124.732 288.895 124.625L288.896 124.623C288.897 124.577 288.895 124.533 288.895 124.486C288.898 123.965 288.878 123.442 288.832 122.922C288.828 122.868 288.825 122.816 288.818 122.763C288.784 122.404 288.737 122.049 288.68 121.696C288.612 121.298 288.53 120.903 288.426 120.51C288.407 120.43 288.386 120.351 288.364 120.27C288.364 120.27 288.364 120.268 288.363 120.267C288.332 120.149 288.295 120.031 288.259 119.911C288.295 120.067 288.331 120.22 288.364 120.377C288.364 120.379 288.364 120.384 288.366 120.386C288.387 120.495 288.41 120.606 288.428 120.715C288.5 121.092 288.556 121.471 288.599 121.853C288.642 122.232 288.672 122.613 288.689 122.996L288.688 122.998C288.707 123.441 288.707 123.883 288.691 124.324C288.688 124.443 288.683 124.561 288.674 124.678C288.673 124.729 288.672 124.775 288.668 124.824L288.667 124.826C288.651 125.085 288.628 125.345 288.601 125.605C288.476 126.914 288.212 128.204 287.852 129.467C287.822 129.28 287.793 129.091 287.77 128.902L287.768 128.888C287.717 128.441 287.683 127.993 287.68 127.546C287.669 127.097 287.692 126.648 287.732 126.199C287.753 125.976 287.779 125.754 287.81 125.531L287.811 125.529C287.817 125.474 287.824 125.424 287.832 125.37C287.857 125.195 287.884 125.02 287.911 124.844C287.797 125.063 287.706 125.29 287.629 125.525C287.607 125.587 287.587 125.651 287.569 125.715C287.526 125.862 287.49 126.01 287.459 126.159C287.363 126.614 287.324 127.083 287.327 127.55C287.338 128.017 287.388 128.485 287.498 128.938C287.535 129.092 287.579 129.246 287.628 129.396C287.669 129.522 287.716 129.648 287.766 129.77C287.627 130.236 287.475 130.699 287.309 131.158C287.232 131.381 287.148 131.605 287.059 131.825C286.973 132.048 286.889 132.272 286.787 132.487L286.212 133.793L286.069 134.121L285.905 134.436L285.574 135.069C285.346 135.487 285.148 135.92 284.885 136.319L284.144 137.539C284.129 137.565 284.112 137.591 284.096 137.617C284.139 137.337 284.184 137.056 284.23 136.777C284.267 136.541 284.308 136.309 284.347 136.074C284.582 134.721 284.846 133.376 285.104 132.025L285.107 132.018C285.111 131.994 285.116 131.966 285.12 131.942C285.141 131.833 285.16 131.724 285.181 131.616L285.181 131.614C285.191 131.569 285.199 131.521 285.208 131.476C285.224 131.393 285.239 131.309 285.255 131.227C285.398 130.486 285.528 129.741 285.646 128.993C285.709 128.617 285.766 128.238 285.822 127.86C285.871 127.512 285.914 127.163 285.955 126.815L285.956 126.813C285.962 126.758 285.966 126.704 285.972 126.65C285.974 126.644 285.973 126.64 285.975 126.634C286.012 126.287 286.046 125.938 286.074 125.59L286.075 125.588C286.081 125.535 286.084 125.484 286.088 125.43C286.089 125.407 286.091 125.385 286.094 125.363C286.116 125.057 286.136 124.749 286.152 124.443C286.191 123.45 286.178 122.454 286.095 121.46C286.083 121.306 286.068 121.15 286.052 120.994C286.044 120.922 286.035 120.849 286.025 120.776C285.998 120.533 285.964 120.288 285.927 120.045C285.935 120.04 285.946 120.033 285.952 120.027C285.981 119.999 285.991 119.964 286.004 119.931L286.044 119.829L286.201 119.424C286.294 119.151 286.381 118.874 286.469 118.597C286.545 118.318 286.613 118.036 286.681 117.754C286.737 117.47 286.786 117.184 286.838 116.901C286.927 116.285 286.98 115.665 287.005 115.048C287.189 114.868 287.374 114.692 287.563 114.524C287.902 114.226 288.251 113.943 288.618 113.687C288.862 113.513 289.108 113.349 289.366 113.194L289.368 113.193C289.372 113.19 289.374 113.189 289.379 113.186C289.503 113.109 289.63 113.035 289.756 112.963C289.92 112.871 290.088 112.782 290.257 112.695L290.26 112.694C290.267 112.692 290.272 112.689 290.279 112.686C290.506 112.568 290.738 112.455 290.973 112.343C290.755 112.37 290.538 112.415 290.325 112.476C290.318 112.476 290.313 112.478 290.307 112.478L290.304 112.479C290.076 112.543 289.854 112.624 289.634 112.717C289.583 112.737 289.533 112.76 289.483 112.782C289.481 112.784 289.478 112.785 289.473 112.787C289.103 112.956 288.748 113.164 288.414 113.399C288.035 113.672 287.681 113.981 287.371 114.329C287.242 114.472 287.123 114.62 287.008 114.774C287.013 114.548 287.015 114.323 287.013 114.097C287.011 113.879 287.007 113.661 286.996 113.442C286.994 113.4 286.992 113.357 286.988 113.315C286.945 112.565 286.858 111.817 286.72 111.08C286.715 111.051 286.711 111.022 286.704 110.993L286.705 110.991C286.699 110.953 286.691 110.916 286.683 110.878C286.719 110.7 286.759 110.523 286.803 110.348L286.806 110.341C286.829 110.244 286.853 110.149 286.88 110.055C286.915 109.922 286.954 109.79 286.996 109.659C287.126 109.229 287.286 108.81 287.462 108.395C287.641 107.981 287.841 107.574 288.052 107.161C287.724 107.487 287.447 107.867 287.216 108.272C286.983 108.676 286.799 109.109 286.66 109.553C286.603 109.742 286.553 109.933 286.512 110.126C286.505 110.096 286.501 110.067 286.493 110.039L286.26 109.213L285.986 108.4L285.667 107.606L285.594 107.45L285.587 107.435L285.305 106.832L285.512 107.443L285.525 107.481L285.579 107.639L285.815 108.454L286.018 109.276L286.182 110.104C286.208 110.249 286.227 110.395 286.25 110.542C286.09 109.964 285.856 109.407 285.553 108.887C285.355 108.553 285.131 108.235 284.882 107.938C284.85 107.898 284.817 107.859 284.782 107.819C284.751 107.786 284.722 107.75 284.691 107.718C284.642 107.663 284.594 107.613 284.544 107.562C284.423 107.438 284.298 107.319 284.169 107.204C283.624 106.725 282.997 106.332 282.322 106.088C282.932 106.466 283.488 106.905 283.98 107.404C284.051 107.477 284.122 107.552 284.19 107.629C284.236 107.678 284.282 107.73 284.325 107.781C284.377 107.839 284.427 107.896 284.475 107.957C284.508 107.996 284.54 108.037 284.572 108.077C284.822 108.389 285.048 108.72 285.249 109.066C285.606 109.665 285.882 110.313 286.081 110.984C286.203 111.399 286.29 111.823 286.348 112.254L286.35 112.257C286.35 112.274 286.353 112.29 286.355 112.307C286.381 112.495 286.397 112.684 286.409 112.876C286.408 112.877 286.407 112.879 286.409 112.882C286.412 112.925 286.414 112.968 286.416 113.011C286.417 113.033 286.419 113.052 286.42 113.073C286.434 112.984 286.447 112.893 286.457 112.802C286.462 113.019 286.469 113.238 286.465 113.454C286.461 113.823 286.446 114.193 286.42 114.561C286.408 114.728 286.393 114.893 286.378 115.058C286.364 114.965 286.35 114.873 286.329 114.78C286.322 114.729 286.311 114.679 286.299 114.629C286.299 114.629 286.3 114.627 286.299 114.624C286.274 114.506 286.246 114.389 286.214 114.275C286.208 114.254 286.203 114.233 286.197 114.214C286.197 114.212 286.195 114.212 286.196 114.21C286.152 114.051 286.101 113.895 286.045 113.74C286.04 113.73 286.038 113.719 286.033 113.709C285.891 113.323 285.715 112.949 285.508 112.593C285.38 112.378 285.242 112.171 285.091 111.971C284.807 111.584 284.484 111.227 284.124 110.911C283.578 110.431 282.952 110.039 282.276 109.794C282.887 110.172 283.442 110.611 283.934 111.111C284.424 111.613 284.852 112.168 285.203 112.772C285.295 112.926 285.381 113.084 285.461 113.243C285.634 113.583 285.781 113.935 285.905 114.294C285.91 114.306 285.915 114.316 285.917 114.327C285.96 114.448 285.998 114.568 286.033 114.69C286.053 114.756 286.072 114.821 286.085 114.887C286.085 114.887 286.087 114.888 286.086 114.89C286.094 114.911 286.099 114.932 286.104 114.953C286.179 115.244 286.236 115.54 286.282 115.838C286.236 116.152 286.186 116.466 286.125 116.778C286.068 117.05 286.007 117.322 285.955 117.595C285.889 117.865 285.821 118.134 285.761 118.404C285.731 118.509 285.704 118.616 285.674 118.721C285.639 118.567 285.603 118.416 285.563 118.263C285.559 118.241 285.553 118.22 285.547 118.197L285.547 118.195C285.495 117.997 285.44 117.801 285.379 117.605C285.375 117.593 285.372 117.582 285.368 117.57C285.342 117.481 285.314 117.391 285.282 117.302C285.281 117.292 285.278 117.278 285.271 117.265L285.27 117.262C284.952 116.278 284.531 115.33 284.005 114.442C283.412 113.457 282.686 112.55 281.823 111.806C283.338 113.511 284.306 115.591 284.85 117.752C284.909 117.994 284.965 118.235 285.013 118.477C285.018 118.493 285.022 118.507 285.023 118.523C285.038 118.589 285.052 118.657 285.065 118.725C285.143 119.118 285.21 119.514 285.262 119.912L285.263 119.914C285.269 119.946 285.272 119.978 285.274 120.009C285.322 120.358 285.359 120.706 285.387 121.057C285.391 121.107 285.395 121.154 285.397 121.204C285.406 121.282 285.412 121.363 285.417 121.44C285.427 121.578 285.436 121.718 285.441 121.857C285.471 122.4 285.481 122.943 285.474 123.486C285.41 123.342 285.346 123.198 285.283 123.053C285.206 122.879 285.13 122.705 285.054 122.529C285.006 122.418 284.959 122.305 284.913 122.194C284.906 122.179 284.9 122.165 284.893 122.149L284.892 122.147C284.782 121.881 284.672 121.616 284.565 121.347C284.535 121.275 284.505 121.202 284.476 121.128C284.473 121.119 284.468 121.109 284.464 121.097L284.464 121.095C284.377 120.879 284.294 120.663 284.212 120.445C283.94 119.746 283.692 119.041 283.45 118.329C283.268 117.792 283.095 117.252 282.92 116.709C282.905 116.662 282.889 116.612 282.874 116.564C282.832 116.436 282.791 116.31 282.749 116.182C282.773 116.376 282.801 116.568 282.831 116.76C282.846 116.845 282.859 116.928 282.874 117.013C282.96 117.481 283.064 117.947 283.186 118.408C283.376 119.142 283.613 119.862 283.881 120.57C284.024 120.942 284.175 121.308 284.341 121.673L284.343 121.676C284.344 121.684 284.349 121.695 284.355 121.705C284.395 121.797 284.437 121.89 284.483 121.982C284.585 122.205 284.693 122.427 284.807 122.646L284.808 122.648L284.81 122.649C284.817 122.664 284.822 122.676 284.83 122.689C284.97 122.964 285.118 123.232 285.273 123.499C285.337 123.607 285.401 123.716 285.466 123.822C285.461 124.019 285.457 124.215 285.446 124.411C285.428 124.906 285.394 125.402 285.355 125.899C285.349 125.951 285.346 126.005 285.341 126.06C285.336 126.101 285.332 126.141 285.33 126.183C285.304 126.479 285.272 126.776 285.241 127.073C285.234 127.129 285.227 127.186 285.221 127.24C285.216 127.298 285.209 127.354 285.202 127.411C285.189 127.533 285.175 127.652 285.16 127.774C285.035 128.894 284.863 130.015 284.714 131.138C284.648 131.614 284.581 132.092 284.517 132.572C284.509 132.613 284.505 132.652 284.501 132.693L284.5 132.694C284.455 133.03 284.412 133.367 284.371 133.705C284.369 133.717 284.368 133.727 284.368 133.74C284.366 133.751 284.364 133.768 284.364 133.78L284.363 133.784C284.244 134.765 284.148 135.747 284.094 136.732C284.088 136.823 284.084 136.914 284.08 137.005C284.069 137.231 284.062 137.456 284.056 137.682C283.958 137.835 283.849 137.98 283.746 138.13L283.335 138.714L282.926 139.299C282.792 139.496 282.633 139.673 282.489 139.861L281.595 140.975C281.486 141.1 281.376 141.223 281.266 141.345C281.059 141.577 280.85 141.806 280.641 142.036L280.163 142.566L279.835 142.886L279.663 143.054C279.669 143.024 279.675 142.993 279.683 142.964C279.689 142.936 279.694 142.909 279.7 142.884C279.739 142.705 279.778 142.531 279.816 142.355C279.83 142.29 279.844 142.227 279.858 142.163L279.86 142.155C279.907 141.954 279.951 141.753 280 141.553L280.001 141.549C280.011 141.495 280.023 141.443 280.035 141.39L280.036 141.388C280.1 141.118 280.165 140.845 280.233 140.576C280.315 140.236 280.405 139.899 280.497 139.559C280.51 139.503 280.526 139.445 280.543 139.39C280.577 139.263 280.611 139.134 280.647 139.007C280.789 138.485 280.941 137.963 281.081 137.432C280.804 137.907 280.58 138.409 280.383 138.922C280.214 139.36 280.073 139.808 279.951 140.263C279.936 140.319 279.921 140.375 279.908 140.43L279.907 140.433C279.901 140.452 279.896 140.472 279.891 140.491C279.796 140.881 279.714 141.276 279.653 141.672C279.641 141.736 279.632 141.8 279.624 141.863C279.616 141.912 279.609 141.961 279.603 142.009L279.603 142.011C279.598 142.043 279.595 142.076 279.59 142.108C279.58 142.191 279.57 142.276 279.562 142.359C279.557 142.416 279.551 142.475 279.546 142.533C279.531 142.705 279.519 142.877 279.512 143.05C279.511 143.058 279.511 143.064 279.511 143.072C279.508 143.118 279.507 143.162 279.506 143.208C279.503 143.211 279.5 143.212 279.499 143.216C279.496 143.217 279.494 143.218 279.493 143.22C279.382 143.329 279.27 143.438 279.159 143.546L279.156 143.548C278.983 143.719 278.805 143.892 278.627 144.059L278.453 144.209C278.441 144.218 278.431 144.229 278.419 144.24L278.231 144.4L277.875 144.709L277.869 144.713L277.545 144.992C277.364 145.144 277.193 145.31 277.002 145.455L276.434 145.888L275.867 146.321C275.675 146.463 275.493 146.617 275.291 146.745C275.11 146.865 274.929 146.986 274.748 147.108C274.792 147.004 274.835 146.899 274.88 146.794C274.971 146.573 275.064 146.353 275.155 146.134C275.227 145.964 275.298 145.794 275.372 145.625C275.401 145.557 275.429 145.491 275.458 145.425C275.482 145.366 275.509 145.308 275.535 145.25C275.583 145.138 275.631 145.028 275.68 144.919C275.71 144.851 275.739 144.783 275.771 144.717C275.781 144.693 275.791 144.671 275.801 144.647C275.842 144.556 275.884 144.465 275.924 144.374C276.045 144.109 276.169 143.844 276.295 143.582C276.357 143.446 276.422 143.313 276.486 143.177C276.59 142.962 276.695 142.746 276.799 142.531C276.934 142.258 277.065 141.983 277.195 141.706C276.839 142.124 276.528 142.577 276.245 143.047C276.23 143.073 276.214 143.099 276.199 143.126C276.065 143.346 275.941 143.571 275.822 143.799C275.703 144.032 275.588 144.266 275.481 144.502C275.473 144.521 275.464 144.541 275.457 144.559C275.405 144.674 275.357 144.788 275.31 144.904C275.281 144.97 275.254 145.037 275.228 145.103C275.17 145.247 275.115 145.393 275.064 145.539L275.056 145.564C275.032 145.627 275.01 145.689 274.989 145.756L274.989 145.758C274.956 145.852 274.925 145.946 274.897 146.04C274.805 146.336 274.722 146.636 274.656 146.937C274.634 147.029 274.616 147.119 274.597 147.21C274.039 147.587 273.478 147.963 272.889 148.291L272.272 148.655L271.965 148.837L271.646 148.998L270.37 149.646C270.159 149.761 269.94 149.853 269.72 149.945L269.062 150.227C268.623 150.414 268.189 150.615 267.735 150.763L266.704 151.136C267.425 150.695 268.113 150.201 268.75 149.645C268.837 149.57 268.925 149.495 269.009 149.417C269.927 148.61 270.806 147.763 271.646 146.877C271.715 146.804 271.786 146.729 271.854 146.654L271.856 146.653C271.921 146.581 271.988 146.511 272.051 146.438C272.106 146.384 272.157 146.328 272.206 146.271C272.279 146.193 272.35 146.112 272.419 146.033C272.587 145.847 272.752 145.658 272.914 145.468C272.949 145.427 272.985 145.385 273.021 145.342C273.155 145.187 273.288 145.029 273.418 144.867C273.437 144.846 273.456 144.823 273.473 144.8C274.419 143.645 275.294 142.432 276.085 141.167C276.185 141.005 276.286 140.847 276.388 140.686C276.882 140.314 277.347 139.896 277.776 139.453C278.359 138.853 278.89 138.205 279.383 137.536C279.558 137.297 279.73 137.058 279.896 136.814C280.441 136.026 280.943 135.216 281.442 134.408C281.527 134.268 281.613 134.128 281.699 133.989C281.796 133.831 281.893 133.673 281.992 133.516L281.993 133.512C282.021 133.469 282.047 133.425 282.074 133.382L282.075 133.38C282.535 132.638 282.998 131.897 283.481 131.159C283.185 131.425 282.904 131.702 282.634 131.994L282.633 131.996C282.627 132.002 282.62 132.011 282.613 132.017C282.127 132.545 281.674 133.109 281.245 133.68C280.571 134.577 279.941 135.5 279.315 136.414C279.106 136.717 278.896 137.019 278.685 137.319C278.679 137.331 278.671 137.341 278.663 137.351C278.243 137.943 277.818 138.526 277.365 139.089C277.324 139.142 277.279 139.192 277.236 139.245L277.384 138.98L277.512 138.751C277.624 138.546 277.746 138.346 277.848 138.137L278.153 137.506C278.356 137.085 278.566 136.667 278.762 136.242L279.306 134.953C279.395 134.737 279.492 134.524 279.574 134.306L279.811 133.647C279.97 133.209 280.134 132.771 280.285 132.331L280.684 130.991C280.739 130.801 280.801 130.612 280.854 130.422C280.864 130.387 280.871 130.354 280.881 130.319L281.045 129.641L281.098 129.416L281.368 128.284L281.4 128.118C281.426 128.074 281.452 128.028 281.482 127.984C281.729 127.606 281.986 127.24 282.273 126.893C282.553 126.544 282.857 126.213 283.175 125.892C283.29 125.778 283.407 125.667 283.523 125.556C283.525 125.556 283.526 125.554 283.526 125.554C283.532 125.548 283.539 125.542 283.545 125.536C283.751 125.344 283.963 125.154 284.179 124.966C283.981 125.049 283.791 125.147 283.608 125.256C283.602 125.261 283.595 125.264 283.587 125.268C283.381 125.395 283.181 125.534 282.991 125.687C282.623 125.977 282.294 126.311 281.999 126.672C281.837 126.875 281.686 127.086 281.549 127.306L281.623 126.912C281.662 126.682 281.705 126.454 281.743 126.225L281.829 125.533L281.885 125.079L281.886 125.077L281.903 124.931L281.952 124.535L281.972 124.367L281.998 124.151L282.093 122.762L282.135 122.067L282.139 121.6L282.141 121.371L282.149 119.982L282.053 121.368L282.005 122.059L281.919 122.745L281.836 123.434L281.753 124.119L281.677 124.544L281.647 124.715L281.647 124.717L281.548 125.281L281.52 125.442L281.512 125.481L281.392 126.162L281.354 126.326L281.237 126.835L280.928 128.181L280.637 129.209C280.624 128.583 280.605 127.958 280.58 127.334C280.568 126.995 280.553 126.657 280.538 126.319C280.537 126.296 280.535 126.272 280.535 126.248C280.534 126.227 280.533 126.205 280.532 126.184C280.521 125.942 280.509 125.702 280.496 125.462L280.497 125.46C280.494 125.413 280.492 125.364 280.489 125.316C280.43 124.164 280.358 123.017 280.27 121.862C280.257 121.718 280.245 121.575 280.231 121.433C280.19 121.004 280.143 120.575 280.085 120.147C280.085 120.134 280.083 120.123 280.079 120.109C280.062 119.959 280.04 119.809 280.016 119.659C280.01 119.617 280.001 119.574 279.993 119.531C279.989 119.506 279.985 119.482 279.979 119.457C279.979 119.444 279.975 119.43 279.972 119.416C279.939 119.224 279.901 119.03 279.861 118.836C280.003 118.393 280.11 117.937 280.192 117.477C280.232 117.244 280.265 117.009 280.292 116.774C280.294 116.762 280.295 116.752 280.297 116.742C280.356 116.213 280.38 115.682 280.37 115.152C280.368 115.023 280.363 114.893 280.357 114.764L280.357 114.762C280.356 114.736 280.356 114.713 280.352 114.687C280.35 114.637 280.347 114.592 280.343 114.542L280.344 114.54C280.342 114.508 280.341 114.476 280.337 114.445C280.337 114.443 280.338 114.441 280.337 114.439C280.325 114.279 280.31 114.122 280.291 113.964C280.249 113.585 280.188 113.21 280.109 112.837C280.018 112.414 279.905 111.996 279.765 111.586L279.764 111.584C279.746 111.531 279.727 111.476 279.706 111.423C279.669 111.321 279.633 111.22 279.588 111.119L279.587 111.116C279.566 111.06 279.542 111.003 279.516 110.948C279.483 110.869 279.448 110.792 279.41 110.715C279.398 110.688 279.384 110.66 279.371 110.632C279.374 110.667 279.377 110.7 279.38 110.732L279.38 110.734C279.384 110.812 279.391 110.89 279.398 110.966C279.403 111.027 279.408 111.085 279.413 111.144C279.421 111.259 279.432 111.374 279.443 111.487C279.447 111.543 279.453 111.6 279.458 111.657L279.458 111.659C279.467 111.795 279.48 111.927 279.493 112.062C279.494 112.082 279.497 112.104 279.499 112.124C279.521 112.388 279.542 112.65 279.56 112.913C279.59 113.33 279.614 113.745 279.632 114.162C279.641 114.361 279.65 114.562 279.653 114.763C279.658 114.896 279.662 115.03 279.664 115.163C279.668 115.299 279.669 115.436 279.668 115.571C279.67 115.597 279.672 115.623 279.671 115.648L279.671 115.65C279.672 115.829 279.672 116.01 279.671 116.191C279.67 116.204 279.67 116.216 279.67 116.229C279.669 116.349 279.667 116.468 279.665 116.589C279.665 116.634 279.665 116.676 279.662 116.719C279.66 116.952 279.653 117.184 279.644 117.416C279.638 117.562 279.633 117.705 279.626 117.85C279.593 117.729 279.559 117.606 279.519 117.485C279.474 117.334 279.426 117.187 279.372 117.04L279.373 117.038C279.374 117.036 279.371 117.033 279.371 117.033C279.334 116.925 279.295 116.819 279.252 116.712C279.239 116.676 279.223 116.637 279.207 116.599C279.206 116.59 279.203 116.581 279.197 116.573C279.191 116.554 279.182 116.536 279.174 116.518C279.022 116.143 278.847 115.779 278.646 115.429C278.622 115.387 278.596 115.347 278.572 115.309C278.459 115.116 278.34 114.934 278.211 114.756C278.115 114.622 278.017 114.493 277.91 114.368L277.908 114.367C277.9 114.354 277.893 114.345 277.883 114.335C277.861 114.304 277.834 114.276 277.81 114.249C277.794 114.228 277.776 114.207 277.759 114.191C277.605 114.015 277.443 113.85 277.271 113.695C277.406 113.866 277.531 114.04 277.647 114.22C277.666 114.245 277.682 114.272 277.698 114.298C277.715 114.321 277.73 114.345 277.745 114.369C277.757 114.388 277.768 114.407 277.78 114.426C277.867 114.566 277.949 114.706 278.028 114.849C278.133 115.043 278.23 115.241 278.321 115.441C278.475 115.781 278.609 116.129 278.725 116.481C278.754 116.562 278.78 116.645 278.802 116.727C278.853 116.883 278.896 117.041 278.937 117.199C278.939 117.208 278.941 117.213 278.944 117.222L278.945 117.225C278.976 117.354 279.01 117.483 279.038 117.613C279.059 117.7 279.078 117.789 279.097 117.875C279.279 118.743 279.391 119.626 279.466 120.516C279.468 120.534 279.471 120.551 279.47 120.57C279.493 120.816 279.511 121.061 279.527 121.306C279.528 121.325 279.529 121.347 279.531 121.366C279.544 121.548 279.555 121.73 279.566 121.911L279.696 124.098C279.736 124.662 279.771 125.224 279.812 125.785C279.815 125.833 279.819 125.881 279.822 125.926C279.831 126.047 279.84 126.168 279.851 126.288C279.862 126.426 279.873 126.563 279.884 126.701C279.889 126.748 279.893 126.791 279.897 126.836L279.896 126.838C279.897 126.864 279.9 126.893 279.902 126.918C279.893 126.896 279.885 126.875 279.876 126.853C279.862 126.814 279.848 126.777 279.833 126.739C279.75 126.524 279.669 126.309 279.588 126.093C279.572 126.054 279.556 126.015 279.544 125.975C279.514 125.899 279.487 125.824 279.458 125.749C279.201 125.045 278.95 124.341 278.722 123.625C278.673 123.476 278.624 123.324 278.578 123.173L278.577 123.171C278.571 123.152 278.566 123.135 278.559 123.118C278.514 122.974 278.471 122.833 278.428 122.689L278.429 122.687C278.422 122.67 278.418 122.658 278.413 122.642C278.35 122.435 278.289 122.228 278.228 122.022L278.139 121.713C278.116 121.633 278.093 121.554 278.07 121.474C278.061 121.444 278.053 121.413 278.045 121.383C278.043 121.38 278.044 121.379 278.045 121.377C278.045 121.377 278.045 121.375 278.043 121.374C277.952 121.048 277.863 120.724 277.774 120.394C277.773 120.392 277.773 120.387 277.77 120.382C277.714 120.173 277.659 119.962 277.602 119.751C277.588 119.698 277.574 119.642 277.56 119.586C277.532 119.488 277.507 119.391 277.48 119.294C277.488 119.416 277.498 119.54 277.51 119.662C277.517 119.734 277.525 119.808 277.533 119.881C277.564 120.163 277.603 120.444 277.649 120.725C277.651 120.731 277.653 120.733 277.653 120.737L277.653 120.739C277.697 121.007 277.747 121.274 277.803 121.539C277.829 121.664 277.855 121.789 277.886 121.913C277.885 121.915 277.887 121.918 277.888 121.92C277.904 122.006 277.926 122.089 277.947 122.175C277.978 122.305 278.011 122.435 278.046 122.565C278.09 122.736 278.136 122.906 278.187 123.075C278.192 123.091 278.195 123.107 278.201 123.124C278.239 123.258 278.278 123.389 278.321 123.52C278.326 123.54 278.333 123.557 278.339 123.576L278.34 123.579C278.354 123.63 278.372 123.683 278.388 123.734C278.624 124.455 278.892 125.165 279.206 125.853C279.247 125.945 279.289 126.038 279.333 126.129C279.348 126.166 279.367 126.202 279.384 126.239C279.481 126.444 279.583 126.647 279.688 126.848C279.706 126.884 279.725 126.918 279.743 126.953C279.806 127.068 279.87 127.183 279.933 127.297C279.99 127.993 280.055 128.688 280.13 129.382C280.169 129.751 280.21 130.119 280.255 130.486C280.216 130.597 280.178 130.708 280.141 130.822L279.691 132.123C279.528 132.551 279.353 132.977 279.184 133.403L278.929 134.041C278.841 134.252 278.739 134.457 278.645 134.667L278.516 134.942C278.493 134.795 278.469 134.65 278.448 134.506C278.43 134.388 278.412 134.27 278.393 134.152C278.314 133.615 278.236 133.082 278.171 132.546C278.102 132.01 278.046 131.472 277.991 130.935C277.936 130.396 277.889 129.855 277.828 129.309C277.744 129.851 277.713 130.4 277.715 130.948C277.716 131.497 277.758 132.044 277.822 132.589C277.894 133.134 277.991 133.675 278.125 134.206C278.178 134.416 278.237 134.624 278.3 134.829C278.336 134.945 278.373 135.057 278.412 135.169L278.068 135.913C277.862 136.324 277.642 136.726 277.43 137.131L277.11 137.738C277.002 137.94 276.88 138.134 276.765 138.332L276.152 139.37L276.077 139.496L276.076 139.5L276.067 139.514C275.925 139.74 275.778 139.963 275.63 140.183C275.601 140.226 275.574 140.267 275.544 140.31L275.543 140.312C275.467 140.428 275.39 140.542 275.313 140.659L274.934 141.231C274.811 141.422 274.665 141.599 274.531 141.784L273.712 142.884C273.688 142.915 273.662 142.947 273.637 142.978C273.502 143.148 273.363 143.319 273.223 143.485C273.221 143.486 273.22 143.487 273.22 143.488C273.13 143.594 273.042 143.703 272.953 143.809C272.916 143.853 272.88 143.897 272.843 143.941C272.551 144.293 272.265 144.649 271.949 144.979L271.327 145.654L271.023 145.985C271.005 146.004 270.986 146.023 270.969 146.042L270.967 146.041C270.922 146.091 270.875 146.138 270.828 146.187C270.844 146.146 270.859 146.103 270.874 146.062C270.909 145.964 270.941 145.868 270.972 145.772C271.007 145.659 271.042 145.545 271.073 145.432C271.099 145.34 271.123 145.247 271.147 145.152C271.161 145.094 271.175 145.035 271.187 144.976C271.239 144.759 271.282 144.537 271.317 144.316C271.346 144.141 271.371 143.964 271.391 143.786C271.46 143.192 271.475 142.591 271.446 141.993C271.463 141.97 271.478 141.943 271.495 141.92L271.785 141.466L272.062 141.006L272.327 140.535C272.52 140.184 272.693 139.82 272.848 139.451C272.99 139.333 273.13 139.209 273.261 139.08C273.497 138.854 273.719 138.611 273.921 138.355C274.043 138.205 274.158 138.049 274.267 137.891C274.523 137.525 274.748 137.137 274.941 136.732L274.942 136.729C274.964 136.69 274.983 136.646 275.003 136.607C275.212 136.152 275.384 135.681 275.517 135.199C275.779 134.238 275.886 133.235 275.813 132.245C275.78 131.762 275.705 131.285 275.583 130.818C275.536 130.626 275.479 130.438 275.412 130.25C275.376 130.141 275.333 130.033 275.29 129.926C275.283 129.907 275.275 129.887 275.267 129.867L275.265 129.865C275.199 129.711 275.131 129.561 275.053 129.414C275.113 129.747 275.159 130.079 275.195 130.409C275.195 130.414 275.196 130.418 275.196 130.422L275.194 130.424C275.193 130.425 275.194 130.426 275.195 130.426C275.203 130.484 275.21 130.541 275.214 130.597C275.229 130.737 275.239 130.877 275.247 131.017C275.274 131.433 275.278 131.845 275.265 132.255C275.234 132.938 275.152 133.613 275.014 134.277C274.995 134.367 274.974 134.459 274.954 134.548L274.952 134.552C274.918 134.707 274.879 134.861 274.837 135.013C274.616 135.826 274.309 136.614 273.923 137.369C273.883 137.448 273.843 137.527 273.801 137.605C273.621 137.934 273.426 138.256 273.216 138.57C273.189 138.61 273.164 138.647 273.137 138.687C273.152 138.643 273.169 138.603 273.182 138.559C273.192 138.53 273.201 138.502 273.209 138.473C273.422 137.818 273.587 137.147 273.706 136.47C273.829 135.763 273.903 135.047 273.886 134.327C273.652 135.008 273.44 135.681 273.218 136.347L273.184 136.445C272.972 137.079 272.748 137.703 272.517 138.326L271.913 139.94L271.837 140.146L271.836 140.149L271.784 140.287L271.598 140.781L271.591 140.8L271.498 141.033L271.403 141.269L271.391 141.297C271.39 141.284 271.39 141.271 271.388 141.258C271.386 141.234 271.384 141.21 271.379 141.187L271.38 141.185C271.376 141.152 271.372 141.121 271.364 141.089C271.348 140.947 271.327 140.807 271.301 140.665C271.297 140.626 271.292 140.588 271.282 140.549C271.259 140.414 271.233 140.282 271.204 140.147C271.201 140.131 271.198 140.117 271.193 140.101C271.057 139.483 270.869 138.879 270.627 138.295C270.349 137.62 270.002 136.97 269.582 136.378C269.499 136.259 269.412 136.145 269.323 136.032C269.314 136.02 269.305 136.009 269.296 135.999C269.276 135.973 269.254 135.945 269.231 135.92C269.196 135.874 269.158 135.831 269.121 135.787C269.436 135.437 269.746 135.085 270.043 134.721C270.071 134.686 270.098 134.651 270.125 134.616L270.126 134.614C270.202 134.523 270.275 134.433 270.348 134.34C270.944 133.58 271.502 132.79 272.005 131.966C272.595 131.006 273.116 130 273.538 128.959C273.834 128.209 274.095 127.444 274.295 126.667C274.374 126.361 274.443 126.052 274.501 125.74C274.419 126 274.333 126.261 274.244 126.518C273.964 127.312 273.641 128.087 273.265 128.835C272.779 129.831 272.207 130.782 271.586 131.696C270.57 133.189 269.4 134.569 268.134 135.857C267.851 136.144 267.563 136.428 267.27 136.708C267.219 136.759 267.166 136.808 267.113 136.857C266.671 137.283 266.214 137.695 265.751 138.101C265.741 138.111 265.73 138.118 265.721 138.127L265.72 138.129C265.708 138.139 265.696 138.15 265.684 138.16C265.411 138.399 265.136 138.634 264.859 138.867C264.85 138.876 264.839 138.883 264.83 138.892C264.817 138.903 264.805 138.913 264.794 138.922C264.791 138.923 264.791 138.925 264.788 138.926C264.777 138.935 264.767 138.944 264.756 138.953C264.755 138.955 264.753 138.954 264.753 138.956C264.377 139.274 263.992 139.588 263.609 139.897C263.637 139.854 263.664 139.811 263.695 139.766L263.989 139.275L264.259 138.765C264.603 138.078 264.854 137.342 265.011 136.589L265.114 136.02L265.189 135.45L265.231 134.875C265.238 134.683 265.241 134.493 265.242 134.302C265.24 134.119 265.234 133.936 265.223 133.754C265.217 133.667 265.211 133.581 265.203 133.496C265.159 133.003 265.076 132.515 264.944 132.039C264.921 132.524 264.889 133.004 264.843 133.477C264.832 133.589 264.82 133.7 264.807 133.812C264.791 133.967 264.773 134.118 264.751 134.271C264.721 134.454 264.692 134.635 264.667 134.817L264.568 135.357L264.457 135.896L264.324 136.427C264.14 137.134 263.926 137.831 263.686 138.522L263.498 139.041L263.29 139.554C263.215 139.722 263.132 139.887 263.063 140.061C263.014 140.175 262.975 140.292 262.951 140.423C262.701 140.62 262.452 140.816 262.2 141.013L260.88 142.034C260.436 142.373 259.997 142.722 259.554 143.034C259.453 143.106 259.348 143.177 259.244 143.246C259.239 142.92 259.239 142.594 259.245 142.267C259.247 142.059 259.251 141.852 259.258 141.646C259.262 141.555 259.265 141.467 259.269 141.376L259.27 141.374C259.271 141.322 259.275 141.268 259.279 141.215C259.282 141.113 259.286 141.011 259.294 140.909L259.295 140.907C259.298 140.849 259.301 140.791 259.305 140.731C259.311 140.641 259.317 140.55 259.324 140.458C259.352 140.091 259.389 139.722 259.437 139.355L259.438 139.353C259.451 139.211 259.471 139.07 259.491 138.927C259.511 138.772 259.533 138.618 259.559 138.462C259.566 138.412 259.573 138.36 259.582 138.31C259.64 137.943 259.707 137.579 259.782 137.213L259.782 137.211C259.795 137.154 259.807 137.097 259.821 137.039C259.952 136.416 260.106 135.798 260.281 135.178C260.357 134.904 260.437 134.63 260.521 134.356C260.339 134.668 260.17 134.986 260.011 135.31C259.641 136.073 259.336 136.869 259.091 137.685C259.072 137.746 259.054 137.809 259.035 137.87L259.034 137.872C258.946 138.18 258.867 138.488 258.795 138.8C258.76 138.948 258.73 139.097 258.699 139.247C258.689 139.3 258.677 139.353 258.667 139.406L258.666 139.408C258.591 139.8 258.531 140.193 258.485 140.588C258.485 140.588 258.482 140.589 258.483 140.592C258.466 140.733 258.45 140.875 258.439 141.019C258.433 141.078 258.428 141.135 258.423 141.192C258.413 141.305 258.405 141.42 258.397 141.533L258.397 141.535C258.393 141.605 258.389 141.673 258.387 141.744C258.384 141.796 258.381 141.848 258.381 141.901C258.377 141.962 258.375 142.023 258.373 142.083C258.367 142.338 258.366 142.59 258.374 142.844C258.379 143.092 258.392 143.341 258.411 143.587L258.687 143.574C258.514 143.665 258.34 143.75 258.158 143.818C257.746 143.976 257.308 144.047 256.879 144.002C256.8 143.993 256.723 143.979 256.645 143.963L256.557 144.284L256.553 144.299C256.553 144.295 256.551 144.292 256.553 144.289C256.53 144.045 256.511 143.802 256.495 143.557C256.486 143.438 256.479 143.318 256.474 143.198C256.469 143.15 256.468 143.105 256.467 143.059C256.452 142.786 256.444 142.513 256.44 142.24L256.44 142.238C256.438 142.189 256.436 142.14 256.436 142.092C256.435 142.066 256.435 142.041 256.433 142.015L256.434 142.013C256.435 141.973 256.434 141.935 256.435 141.895C256.433 141.766 256.432 141.643 256.432 141.513L256.434 141.507C256.435 141.489 256.435 141.47 256.435 141.451C256.438 141.17 256.445 140.888 256.456 140.607C256.492 139.592 256.589 138.578 256.731 137.573C256.735 137.549 256.737 137.526 256.741 137.502C256.808 136.987 256.909 136.476 257.003 135.965C257.098 135.533 257.187 135.1 257.298 134.671C257.31 134.61 257.327 134.551 257.344 134.489C257.347 134.473 257.352 134.46 257.355 134.444C257.403 134.257 257.453 134.072 257.505 133.885C257.522 133.822 257.54 133.76 257.559 133.7C257.573 133.639 257.59 133.578 257.609 133.517L257.61 133.515C257.699 133.209 257.794 132.905 257.895 132.601C257.934 132.606 257.971 132.608 258.006 132.61C258.152 132.62 258.294 132.598 258.436 132.584C258.458 132.581 258.482 132.579 258.504 132.576C258.624 132.56 258.742 132.536 258.862 132.516C258.996 132.489 259.128 132.459 259.258 132.424C259.274 132.421 259.289 132.416 259.305 132.411L259.307 132.411C259.516 132.355 259.717 132.291 259.918 132.215C259.963 132.201 260.007 132.185 260.051 132.168L260.053 132.167C260.194 132.113 260.331 132.057 260.468 131.997C260.884 131.817 261.286 131.613 261.676 131.399C261.765 131.349 261.854 131.3 261.942 131.251C262.055 131.187 262.167 131.125 262.278 131.06C262.495 130.937 262.711 130.812 262.926 130.686C262.926 130.686 262.928 130.687 262.928 130.685C263.068 130.603 263.208 130.521 263.348 130.439C263.777 130.186 264.205 129.925 264.626 129.657C265.124 129.345 265.614 129.02 266.098 128.682C266.987 128.043 267.839 127.354 268.646 126.623C268.65 126.62 268.653 126.617 268.656 126.614C268.689 126.585 268.72 126.556 268.752 126.525L268.753 126.523C269.159 126.154 269.555 125.776 269.942 125.389C269.98 125.352 270.017 125.314 270.055 125.277C270.057 125.276 270.058 125.274 270.059 125.272C270.243 125.087 270.425 124.902 270.606 124.714C270.91 124.674 271.21 124.625 271.506 124.567C272.008 124.467 272.503 124.35 272.994 124.217C273.193 124.164 273.394 124.108 273.594 124.047C273.777 123.994 273.961 123.938 274.144 123.877C274.248 123.844 274.353 123.81 274.455 123.774C274.939 123.605 275.421 123.425 275.895 123.182C275.363 123.137 274.844 123.17 274.329 123.233C274.187 123.252 274.048 123.273 273.906 123.298C273.761 123.321 273.617 123.349 273.472 123.378C273.25 123.424 273.029 123.477 272.81 123.537C272.311 123.671 271.821 123.838 271.344 124.037L271.178 124.112C271.848 123.395 272.498 122.662 273.14 121.924C273.831 121.121 274.538 120.327 275.181 119.475C275.193 119.46 275.204 119.445 275.216 119.43C275.239 119.398 275.264 119.364 275.287 119.332C275.289 119.328 275.291 119.327 275.293 119.323C275.317 119.29 275.342 119.254 275.366 119.22C275.459 119.092 275.548 118.963 275.636 118.832C275.664 118.787 275.694 118.742 275.723 118.697C276.042 118.201 276.324 117.68 276.533 117.131C276.597 116.966 276.655 116.799 276.702 116.627C276.709 116.605 276.717 116.584 276.723 116.561C276.713 116.583 276.704 116.607 276.695 116.629C276.623 116.806 276.543 116.981 276.459 117.152C276.315 117.439 276.155 117.718 275.981 117.989C275.867 118.164 275.747 118.333 275.624 118.501C275.592 118.543 275.562 118.583 275.53 118.625L275.53 118.627C275.459 118.716 275.388 118.805 275.317 118.894C275.292 118.923 275.269 118.953 275.244 118.982C275.242 118.983 275.241 118.984 275.241 118.985C275.164 119.079 275.086 119.17 275.008 119.263C274.955 119.322 274.902 119.384 274.848 119.443C274.777 119.526 274.704 119.608 274.63 119.689C274.039 120.344 273.411 120.97 272.8 121.614C272.483 121.942 272.166 122.268 271.849 122.594L271.848 122.596C271.731 122.715 271.613 122.836 271.496 122.956C271.08 123.378 270.661 123.796 270.239 124.207L270.236 124.208C270.156 124.288 270.074 124.367 269.992 124.443C269.79 124.638 269.585 124.833 269.378 125.024C269.661 124.554 269.947 124.086 270.241 123.624C270.706 122.888 271.184 122.161 271.684 121.45C271.942 121.076 272.207 120.706 272.477 120.341C272.573 120.21 272.669 120.079 272.767 119.948C272.917 119.746 273.07 119.542 273.224 119.34C273.579 118.874 273.945 118.414 274.312 117.951C274.489 117.728 274.667 117.505 274.845 117.283C274.555 117.54 274.277 117.81 274.004 118.086C273.662 118.435 273.33 118.796 273.01 119.168C272.757 119.457 272.516 119.754 272.278 120.056C272.173 120.188 272.072 120.321 271.971 120.457C271.773 120.717 271.582 120.981 271.395 121.249C270.896 121.971 270.425 122.716 270.004 123.486C269.684 124.061 269.389 124.652 269.124 125.253C268.901 125.456 268.681 125.656 268.455 125.851C268.415 125.888 268.375 125.923 268.334 125.957C268.282 126.002 268.231 126.047 268.177 126.092C267.835 126.386 267.486 126.672 267.131 126.949C267.171 126.773 267.208 126.598 267.241 126.424C267.267 126.294 267.292 126.166 267.314 126.037C267.327 125.982 267.335 125.928 267.346 125.873C267.462 125.222 267.557 124.573 267.638 123.918C267.675 123.611 267.71 123.303 267.742 122.994C267.746 122.938 267.753 122.882 267.758 122.825C267.767 122.726 267.776 122.628 267.785 122.529C267.791 122.469 267.795 122.41 267.8 122.351C267.811 122.217 267.82 122.086 267.831 121.953C267.853 121.634 267.871 121.313 267.882 120.991C267.89 120.768 267.891 120.545 267.889 120.321C267.887 120.198 267.885 120.078 267.879 119.954C267.815 120.108 267.755 120.262 267.701 120.418C267.61 120.669 267.53 120.924 267.461 121.179L267.46 121.181C267.396 121.41 267.337 121.638 267.282 121.869C267.231 122.098 267.183 122.328 267.138 122.559C267.126 122.62 267.115 122.679 267.105 122.741C267.076 122.897 267.049 123.054 267.025 123.213C267.014 123.27 267.007 123.326 266.999 123.385C266.98 123.502 266.963 123.623 266.949 123.742C266.945 123.772 266.942 123.801 266.937 123.831C266.935 123.856 266.93 123.881 266.928 123.906C266.853 124.541 266.808 125.181 266.796 125.819C266.794 125.945 266.793 126.068 266.794 126.193C266.797 126.344 266.8 126.494 266.807 126.644C266.813 126.821 266.823 126.999 266.837 127.177C266.448 127.474 266.051 127.759 265.648 128.037C264.91 128.543 264.143 129.012 263.367 129.476C263.223 129.563 263.077 129.651 262.931 129.737C262.68 129.884 262.432 130.034 262.185 130.182C261.871 130.37 261.558 130.557 261.247 130.737L261.244 130.738C261.179 130.775 261.118 130.81 261.053 130.845C260.757 131.014 260.458 131.171 260.157 131.317C260.051 131.367 259.946 131.415 259.839 131.462C259.817 131.473 259.792 131.483 259.767 131.494C259.463 131.624 259.154 131.738 258.84 131.823C258.798 131.836 258.756 131.847 258.714 131.858C258.514 131.906 258.313 131.94 258.113 131.969C258.524 130.821 259.007 129.697 259.555 128.606C259.613 128.496 259.67 128.383 259.73 128.273C260.156 127.463 260.617 126.668 261.13 125.907C261.71 125.04 262.335 124.204 263.015 123.41C263.682 122.622 264.403 121.879 265.154 121.16C265.154 121.16 265.155 121.16 265.156 121.159C265.268 121.055 265.378 120.952 265.49 120.847C265.658 120.689 265.828 120.533 266.002 120.376L266.003 120.374C266.115 120.27 266.228 120.168 266.344 120.065C266.344 120.065 266.347 120.064 266.347 120.062C266.61 119.827 266.874 119.594 267.14 119.362L267.141 119.358C267.272 119.243 267.403 119.131 267.533 119.016C267.593 118.965 267.652 118.911 267.71 118.86C268.611 118.071 269.509 117.285 270.409 116.495C270.752 116.526 271.091 116.527 271.429 116.516C271.514 116.514 271.6 116.51 271.684 116.504C271.753 116.5 271.821 116.496 271.889 116.49C272.202 116.468 272.513 116.433 272.822 116.386C273.284 116.319 273.741 116.227 274.195 116.109C274.648 115.986 275.096 115.842 275.536 115.628C275.179 115.572 274.828 115.553 274.478 115.554C274.473 115.554 274.471 115.553 274.467 115.554C274.349 115.553 274.23 115.556 274.113 115.56C273.925 115.566 273.737 115.577 273.549 115.594C273.272 115.616 272.996 115.648 272.72 115.69C272.288 115.752 271.858 115.839 271.432 115.948C271.404 115.955 271.375 115.962 271.347 115.969C271.175 116.015 271.003 116.067 270.833 116.122C270.881 116.081 270.927 116.038 270.975 115.998C271.045 115.936 271.114 115.875 271.184 115.814C271.185 115.812 271.187 115.812 271.187 115.812C271.269 115.738 271.353 115.666 271.437 115.59C271.856 115.223 272.275 114.857 272.691 114.487C272.736 114.45 272.778 114.412 272.819 114.373C272.915 114.293 273.006 114.211 273.099 114.127C273.155 114.079 273.211 114.029 273.267 113.981C273.787 113.521 274.306 113.061 274.827 112.599L274.83 112.598C274.949 112.49 275.068 112.384 275.19 112.276C275.256 112.217 275.321 112.157 275.387 112.101C275.559 111.947 275.73 111.794 275.898 111.641C276.294 111.29 276.688 110.938 277.08 110.583C276.626 110.94 276.172 111.296 275.717 111.653C275.508 111.818 275.299 111.984 275.092 112.15C274.933 112.275 274.774 112.399 274.616 112.526C274.46 112.649 274.304 112.771 274.149 112.897C273.652 113.291 273.154 113.687 272.656 114.085C272.484 114.223 272.312 114.361 272.138 114.499C272.038 114.579 271.939 114.658 271.84 114.737C271.676 114.87 271.513 115.001 271.347 115.133C271.346 115.135 271.343 115.138 271.341 115.139C271.093 115.335 270.851 115.532 270.603 115.728C270.512 115.804 270.419 115.877 270.326 115.952C270.281 115.989 270.235 116.025 270.188 116.062C270.105 116.13 270.022 116.194 269.94 116.262L269.937 116.263C269.295 116.78 268.653 117.299 268.011 117.815C267.882 117.92 267.753 118.023 267.623 118.127C267.458 118.262 267.292 118.396 267.125 118.53C266.491 119.047 265.857 119.569 265.235 120.106C265.212 119.42 265.223 118.731 265.281 118.046C265.284 118 265.288 117.955 265.292 117.91C265.293 117.902 265.294 117.894 265.295 117.886C265.319 117.596 265.351 117.303 265.391 117.014C265.396 116.963 265.403 116.912 265.411 116.863C265.415 116.828 265.421 116.792 265.426 116.758C265.47 116.457 265.521 116.157 265.581 115.858C265.62 115.658 265.662 115.46 265.707 115.263C265.748 115.254 265.786 115.242 265.821 115.227L266.365 114.998C266.719 114.833 267.077 114.666 267.428 114.491C267.518 114.444 267.606 114.397 267.697 114.348C267.709 114.342 267.723 114.334 267.733 114.327C267.912 114.233 268.086 114.136 268.263 114.039C268.274 114.032 268.285 114.026 268.295 114.019L268.298 114.018C268.355 113.987 268.407 113.958 268.462 113.927C268.798 113.723 269.13 113.514 269.463 113.305C270.19 112.818 270.893 112.299 271.568 111.748C271.647 111.687 271.724 111.623 271.8 111.559C272.259 111.179 272.707 110.786 273.14 110.381C273.836 109.729 274.501 109.048 275.131 108.338C275.138 108.331 275.145 108.323 275.151 108.317C275.161 108.306 275.172 108.293 275.182 108.281C275.289 108.228 275.396 108.176 275.501 108.127C275.587 108.085 275.675 108.044 275.762 108.007C275.87 107.957 275.977 107.908 276.085 107.864C276.185 107.82 276.283 107.779 276.382 107.741C276.382 107.741 276.384 107.742 276.385 107.74C276.75 107.591 277.116 107.459 277.488 107.341C277.685 107.277 277.884 107.218 278.085 107.163C278.522 107.043 278.966 106.942 279.415 106.862C279.58 106.831 279.745 106.804 279.911 106.779C279.994 106.766 280.076 106.754 280.16 106.743C280.865 106.647 281.581 106.604 282.322 106.575C281.683 106.334 281.001 106.222 280.316 106.195C280.253 106.194 280.191 106.192 280.128 106.191C280.082 106.19 280.035 106.19 279.989 106.191C279.284 106.195 278.579 106.296 277.897 106.483C277.247 106.662 276.621 106.925 276.036 107.257C276.122 107.148 276.21 107.04 276.295 106.928L276.986 105.986L277.103 105.814L277.241 105.609L277.496 105.232L277.63 105.037L277.639 105.021L278.241 104.025C278.403 103.736 278.562 103.447 278.718 103.156C278.746 103.107 278.772 103.055 278.8 103.005C278.763 103.058 278.725 103.11 278.691 103.162C278.504 103.427 278.321 103.693 278.139 103.958L277.445 104.884L277.297 105.067L277.136 105.27L276.795 105.695L276.723 105.786L276.615 105.911L275.97 106.658C275.856 106.787 275.74 106.913 275.623 107.039C275.507 107.166 275.39 107.291 275.271 107.414C275.132 107.562 274.991 107.707 274.849 107.849C274.779 107.924 274.705 107.996 274.632 108.067C274.55 108.152 274.465 108.234 274.379 108.318L274.378 108.32C274.302 108.394 274.224 108.466 274.147 108.541C274.147 108.541 274.146 108.54 274.145 108.542C273.669 108.996 273.177 109.432 272.672 109.851C272.532 109.967 272.389 110.081 272.245 110.196C272.059 110.348 271.87 110.493 271.676 110.639L271.675 110.641C271.245 110.972 270.801 111.29 270.35 111.595C270.417 111.415 270.477 111.236 270.537 111.057C270.68 110.62 270.809 110.18 270.93 109.742C271.007 109.465 271.079 109.185 271.147 108.903C271.162 108.841 271.177 108.779 271.191 108.714C271.205 108.662 271.217 108.609 271.227 108.556C271.24 108.507 271.251 108.456 271.262 108.407C271.264 108.393 271.266 108.382 271.269 108.368C271.314 108.164 271.356 107.958 271.396 107.748L271.397 107.744C271.406 107.686 271.417 107.627 271.426 107.569C271.455 107.387 271.479 107.204 271.496 107.016C271.285 107.263 271.108 107.53 270.956 107.806C270.914 107.88 270.874 107.952 270.835 108.027C270.802 108.092 270.769 108.158 270.737 108.225C270.704 108.295 270.671 108.366 270.64 108.437C270.614 108.502 270.586 108.564 270.561 108.629C270.546 108.666 270.532 108.701 270.517 108.738C270.493 108.801 270.469 108.865 270.445 108.928C270.371 109.134 270.307 109.344 270.249 109.553C270.143 109.944 270.065 110.34 270.02 110.743C270.017 110.751 270.015 110.758 270.016 110.765C270.008 110.826 270.002 110.885 269.996 110.946C269.971 111.242 269.962 111.543 269.977 111.843C269.637 112.066 269.294 112.284 268.947 112.495C268.878 112.536 268.809 112.575 268.74 112.617C268.733 112.621 268.724 112.626 268.717 112.63C268.573 112.715 268.43 112.8 268.286 112.887C268.285 112.886 268.284 112.888 268.281 112.889C268.175 112.952 268.071 113.015 267.967 113.079C267.635 113.261 267.304 113.45 266.976 113.641C266.646 113.811 266.319 113.988 265.991 114.168C266.041 113.995 266.092 113.821 266.145 113.65C266.17 113.572 266.195 113.496 266.219 113.419C266.341 113.044 266.471 112.67 266.612 112.3C266.646 112.208 266.681 112.117 266.719 112.028C266.997 111.317 267.312 110.622 267.66 109.944C267.671 109.925 267.681 109.903 267.692 109.884L267.693 109.882C267.733 109.803 267.774 109.727 267.815 109.651C268.058 109.204 268.326 108.773 268.618 108.362L268.618 108.36C268.673 108.282 268.729 108.206 268.784 108.131C268.904 108.059 269.022 107.986 269.141 107.916C269.069 107.952 268.998 107.987 268.929 108.024C268.896 108.04 268.862 108.057 268.829 108.073C268.939 107.926 269.055 107.781 269.173 107.641C269.758 106.932 270.475 106.353 271.241 105.815C271.477 105.651 271.718 105.49 271.962 105.333C272.055 105.27 272.151 105.208 272.248 105.148C272.52 104.97 272.793 104.795 273.066 104.616C273.079 104.608 273.093 104.598 273.107 104.589C273.265 104.485 273.422 104.38 273.577 104.273C273.577 104.272 273.578 104.271 273.58 104.27L273.582 104.269C273.591 104.263 273.596 104.259 273.605 104.253C273.991 103.977 274.372 103.688 274.729 103.373C275.083 103.056 275.412 102.709 275.702 102.335C275.375 102.677 275.021 102.988 274.647 103.271C274.341 103.502 274.02 103.711 273.695 103.91C273.694 103.912 273.691 103.913 273.69 103.912C273.617 103.957 273.545 104.001 273.471 104.045C273.362 104.11 273.25 104.175 273.143 104.239C273.129 104.247 273.117 104.253 273.101 104.26C272.788 104.442 272.467 104.619 272.148 104.797C272.086 104.831 272.029 104.863 271.969 104.895C271.647 105.076 271.325 105.26 271.005 105.452C270.187 105.941 269.395 106.53 268.735 107.251C268.308 107.71 267.926 108.209 267.582 108.728C266.087 109.564 264.661 110.531 263.312 111.597C261.83 112.778 260.448 114.091 259.185 115.515C259.04 115.68 258.892 115.849 258.75 116.017C258.747 116.02 258.746 116.022 258.743 116.025C258.619 116.17 258.497 116.315 258.376 116.463C258.325 116.527 258.271 116.591 258.221 116.655C258.132 116.761 258.045 116.87 257.959 116.979C257.958 116.981 257.956 116.982 257.955 116.984C257.265 117.857 256.621 118.767 256.019 119.706C255.898 119.898 255.777 120.089 255.658 120.285C255.681 120.183 255.703 120.083 255.727 119.982C255.821 119.579 255.924 119.178 256.038 118.782C256.065 118.686 256.093 118.588 256.123 118.494L256.126 118.486C256.142 118.428 256.159 118.373 256.177 118.316L256.179 118.31C256.275 117.995 256.382 117.68 256.496 117.37C256.521 117.298 256.547 117.229 256.574 117.159C256.928 116.228 257.35 115.332 257.836 114.465L257.846 114.449C257.994 114.18 258.153 113.917 258.313 113.655C258.328 113.632 258.34 113.609 258.354 113.587C258.459 113.412 258.565 113.239 258.676 113.066C258.865 112.763 259.06 112.462 259.26 112.165C259.297 112.106 259.335 112.05 259.375 111.992C259.733 111.438 260.116 110.897 260.481 110.339C260.775 109.899 261.065 109.456 261.352 109.011C261.412 108.918 261.47 108.824 261.53 108.729C261.899 108.145 262.258 107.553 262.602 106.95C261.978 107.636 261.382 108.341 260.801 109.058C260.698 109.184 260.597 109.311 260.494 109.438C260.341 109.629 260.188 109.822 260.036 110.016C259.619 110.535 259.222 111.071 258.826 111.612C258.605 111.919 258.392 112.23 258.183 112.548C258.023 112.791 257.863 113.039 257.709 113.289C257.703 113.299 257.698 113.308 257.692 113.319C257.354 113.888 257.035 114.475 256.759 115.081C256.483 115.701 256.238 116.334 256.054 116.986C255.998 117.18 255.945 117.374 255.898 117.571C255.884 117.616 255.873 117.665 255.863 117.713C255.832 117.839 255.804 117.968 255.779 118.096C255.69 118.522 255.623 118.954 255.58 119.386C255.57 119.456 255.564 119.53 255.56 119.602C255.555 119.628 255.552 119.654 255.553 119.682C255.539 119.845 255.528 120.01 255.523 120.177C255.518 120.293 255.514 120.409 255.514 120.525C255.244 120.973 254.982 121.428 254.733 121.889C254.665 122.015 254.598 122.139 254.531 122.265C254.479 122.367 254.424 122.47 254.374 122.573L254.373 122.577C254.367 122.586 254.362 122.596 254.358 122.607C253.652 123.999 253.046 125.443 252.542 126.925C252.542 126.915 252.54 126.903 252.539 126.892C252.537 126.875 252.533 126.861 252.533 126.844L252.533 126.842C252.452 126.154 252.384 125.476 252.356 124.796C252.354 124.743 252.35 124.691 252.35 124.638C252.342 124.349 252.34 124.058 252.35 123.77C252.364 123.128 252.421 122.491 252.534 121.865C252.696 120.961 252.979 120.077 253.384 119.245C253.792 118.415 254.327 117.642 255.002 116.947C254.145 117.408 253.431 118.138 252.903 118.974C252.369 119.811 252.016 120.762 251.84 121.74C251.674 122.67 251.663 123.625 251.785 124.547C251.79 124.593 251.797 124.64 251.804 124.687C251.836 124.917 251.877 125.146 251.924 125.373C252.05 125.981 252.232 126.573 252.466 127.143L252.466 127.145C252.466 127.145 252.468 127.146 252.467 127.147L252.459 127.17C252.284 127.699 252.123 128.231 251.977 128.768L251.756 129.616L251.647 130.041L251.553 130.47C251.433 131.041 251.326 131.617 251.234 132.196C251.066 133.284 250.959 134.386 250.932 135.491C250.75 135.044 250.58 134.598 250.43 134.146C250.417 134.11 250.405 134.072 250.396 134.035C250.206 133.449 250.051 132.856 249.941 132.258C249.929 132.194 249.917 132.131 249.907 132.069C249.893 131.992 249.882 131.915 249.871 131.839C249.85 131.703 249.832 131.569 249.818 131.433C249.715 130.52 249.738 129.592 249.888 128.68C249.914 128.531 249.942 128.383 249.976 128.236C250.115 127.61 250.322 126.996 250.602 126.395C250.661 126.268 250.722 126.142 250.788 126.017C250.585 126.219 250.402 126.44 250.236 126.673C250.233 126.676 250.233 126.678 250.231 126.682C250.217 126.7 250.204 126.718 250.191 126.737C250.14 126.812 250.09 126.888 250.043 126.964C249.74 127.455 249.51 127.996 249.351 128.556C249.173 129.181 249.081 129.829 249.07 130.479C249.063 130.822 249.08 131.167 249.117 131.51C249.156 131.848 249.213 132.184 249.291 132.512C249.318 132.637 249.35 132.764 249.387 132.889C249.523 133.389 249.703 133.877 249.92 134.345C250.199 134.956 250.534 135.538 250.924 136.078C250.921 136.645 250.939 137.212 250.981 137.778C250.992 137.917 251.004 138.053 251.017 138.193L251.016 138.194C251.03 138.343 251.045 138.489 251.061 138.636C251.209 139.936 251.467 141.224 251.833 142.471C251.855 142.546 251.876 142.621 251.899 142.694C252.079 143.294 252.278 143.885 252.498 144.471C252.612 144.786 252.734 145.101 252.862 145.412C252.902 145.511 252.942 145.609 252.985 145.708C253.022 145.801 253.062 145.894 253.103 145.988C253.33 146.505 253.564 147.02 253.807 147.528C254.067 148.067 254.337 148.6 254.623 149.125C254.765 149.383 254.92 149.634 255.08 149.882C254.565 149.434 254.062 148.973 253.585 148.483C253.53 148.428 253.478 148.374 253.425 148.318L253.423 148.317C253.261 148.147 253.102 147.974 252.946 147.798C251.535 146.207 250.321 144.442 249.298 142.565C249.281 142.54 249.266 142.512 249.253 142.482L249.25 142.477C249.112 142.224 248.978 141.969 248.846 141.711C248.723 141.47 248.601 141.226 248.485 140.979C248.478 140.966 248.471 140.951 248.465 140.938C248.442 140.888 248.417 140.839 248.394 140.789C247.83 139.597 247.329 138.37 246.904 137.118C246.665 136.47 246.485 135.806 246.28 135.147C246.094 134.482 245.923 133.814 245.786 133.147C245.734 132.902 245.688 132.658 245.648 132.413C245.596 132.119 245.554 131.824 245.523 131.531C245.515 131.491 245.51 131.451 245.508 131.41C245.5 131.348 245.493 131.287 245.487 131.226L245.549 131.024L245.549 131.022L245.609 130.832L245.62 130.793C245.828 130.139 246.025 129.48 246.221 128.824C246.314 128.519 246.403 128.215 246.488 127.908C246.59 127.554 246.689 127.2 246.791 126.846L247.254 125.147L247.332 124.86C247.361 124.746 247.393 124.631 247.423 124.519L247.424 124.515C247.44 124.458 247.456 124.4 247.474 124.343C247.61 123.864 247.766 123.397 247.985 122.966C248.279 122.38 248.707 121.862 249.159 121.355C249.186 121.324 249.216 121.292 249.244 121.262C249.349 121.147 249.456 121.032 249.566 120.917C249.898 120.562 250.232 120.204 250.542 119.821C250.975 119.282 251.355 118.679 251.545 118.016C251.267 118.646 250.859 119.198 250.382 119.681C250.161 119.912 249.931 120.132 249.697 120.351C249.68 120.369 249.661 120.386 249.64 120.404C249.419 120.611 249.193 120.819 248.973 121.035C248.97 121.037 248.97 121.039 248.967 121.04C248.945 121.062 248.922 121.083 248.9 121.105C248.856 121.147 248.813 121.191 248.771 121.235C248.323 121.682 247.899 122.175 247.576 122.748C247.536 122.821 247.496 122.893 247.46 122.967C247.224 123.441 247.059 123.936 246.91 124.425C246.892 124.484 246.873 124.545 246.856 124.605L246.853 124.614C246.843 124.649 246.831 124.682 246.822 124.717L246.72 125.069L246.6 125.489L246.476 125.92L246.426 126.094L246.425 126.098L246.37 126.286L246.253 126.696C246.241 126.736 246.231 126.777 246.22 126.817C246.187 126.943 246.152 127.067 246.117 127.192C246.104 127.241 246.093 127.287 246.079 127.333C245.954 127.783 245.829 128.23 245.714 128.683C245.614 129.069 245.515 129.458 245.414 129.847C245.414 129.79 245.414 129.735 245.415 129.678C245.415 129.672 245.416 129.664 245.416 129.658C245.416 129.481 245.421 129.303 245.429 129.127C245.491 127.862 245.704 126.592 245.996 125.33C246.015 125.246 246.033 125.162 246.054 125.079C246.18 124.556 246.313 124.033 246.458 123.513C246.837 122.134 247.282 120.772 247.797 119.439L248.06 119.159C248.18 119.034 248.296 118.911 248.414 118.785L248.414 118.783C248.418 118.778 248.423 118.776 248.425 118.77C248.488 118.703 248.552 118.635 248.613 118.568C248.801 118.366 248.988 118.163 249.174 117.96C249.261 117.868 249.345 117.775 249.429 117.68C249.712 117.369 249.986 117.052 250.265 116.74L251.331 115.498C251.581 115.204 251.829 114.915 252.098 114.66C252.206 114.556 252.318 114.459 252.435 114.369C252.605 114.236 252.789 114.119 252.982 114.011C253.022 113.989 253.061 113.966 253.102 113.945C253.146 113.922 253.187 113.9 253.233 113.878C253.233 113.876 253.235 113.877 253.235 113.877C253.424 113.782 253.62 113.697 253.816 113.611C253.994 113.538 254.174 113.466 254.355 113.393C254.436 113.36 254.517 113.327 254.598 113.294C254.647 113.275 254.693 113.258 254.741 113.236L254.743 113.235C254.94 113.154 255.136 113.066 255.329 112.973C255.492 112.892 255.652 112.805 255.808 112.709C255.808 112.709 255.811 112.708 255.811 112.706C256.127 112.51 256.42 112.281 256.66 112.002C256.524 112.113 256.383 112.216 256.236 112.308C255.926 112.503 255.592 112.658 255.246 112.775C255.239 112.777 255.234 112.78 255.227 112.781C255.19 112.796 255.152 112.81 255.115 112.82C255.099 112.828 255.087 112.832 255.074 112.834L255.072 112.835C255.025 112.855 254.977 112.87 254.932 112.884C254.801 112.929 254.668 112.971 254.534 113.013C254.266 113.095 253.998 113.174 253.727 113.262C253.727 113.262 253.726 113.261 253.725 113.263C253.713 113.267 253.703 113.27 253.691 113.275C253.658 113.286 253.622 113.297 253.588 113.311C253.447 113.359 253.305 113.411 253.165 113.467C252.882 113.582 252.6 113.718 252.332 113.883C252.274 113.918 252.217 113.955 252.161 113.995C251.687 114.328 251.304 114.747 250.935 115.149L249.845 116.372C249.49 116.787 249.126 117.193 248.78 117.615C248.759 117.639 248.74 117.662 248.719 117.686L248.708 117.701C248.575 117.858 248.443 118.016 248.312 118.175C248.452 117.851 248.595 117.53 248.743 117.21C248.818 117.049 248.895 116.888 248.972 116.729L248.973 116.725C248.979 116.715 248.985 116.702 248.99 116.693C249.431 115.787 249.917 114.902 250.443 114.046C251.145 113.814 251.733 113.369 252.329 112.958C252.51 112.83 252.688 112.698 252.866 112.563C253.184 112.324 253.495 112.078 253.803 111.829C253.959 111.702 254.112 111.576 254.266 111.448C255.523 110.405 256.717 109.305 258.008 108.346C258.948 107.646 259.961 107.032 261.035 106.565C261.427 106.393 261.828 106.241 262.237 106.112C262.898 105.901 263.581 105.758 264.276 105.706C264.381 105.699 264.489 105.692 264.595 105.689C265.227 105.659 265.865 105.72 266.488 105.869C266.55 105.882 266.613 105.897 266.674 105.914L266.678 105.916C266.722 105.927 266.769 105.939 266.814 105.955C266.873 105.968 266.93 105.986 266.987 106.004C266.937 105.982 266.886 105.96 266.836 105.941C266.797 105.923 266.757 105.907 266.717 105.894L266.713 105.892C266.66 105.871 266.606 105.851 266.551 105.832C266.019 105.647 265.455 105.542 264.889 105.497C264.791 105.489 264.694 105.482 264.597 105.478C264.267 105.469 263.937 105.481 263.607 105.514C263.355 105.536 263.105 105.571 262.855 105.618C262.616 105.659 262.376 105.712 262.14 105.772C262.015 105.804 261.891 105.839 261.767 105.876C260.304 106.306 258.94 107.039 257.697 107.919C256.501 108.776 255.398 109.74 254.31 110.702C254.179 110.817 254.051 110.932 253.921 111.045C253.785 111.166 253.646 111.286 253.51 111.406C253.035 111.816 252.557 112.221 252.069 112.61C251.62 112.975 251.144 113.285 250.692 113.651C251.454 112.456 252.305 111.316 253.244 110.252C254.27 109.093 255.42 108.037 256.669 107.118C256.672 107.117 256.673 107.115 256.675 107.113C256.802 107.022 256.925 106.933 257.053 106.844C257.927 106.229 258.846 105.68 259.807 105.207C260.612 104.805 261.446 104.457 262.302 104.174C262.386 104.145 262.469 104.118 262.553 104.095C262.553 104.095 262.554 104.093 262.556 104.094C262.942 103.969 263.332 103.859 263.727 103.765C264.451 103.591 265.187 103.462 265.93 103.383C266.583 103.312 267.24 103.281 267.898 103.291C267.355 103.248 266.809 103.237 266.266 103.255C265.161 103.287 264.058 103.438 262.977 103.69C262.917 103.703 262.858 103.717 262.797 103.733C262.676 103.761 262.551 103.793 262.43 103.827L262.425 103.83C262.214 103.883 262.005 103.941 261.797 104.006C261.055 104.231 260.33 104.502 259.622 104.812C258.914 105.127 258.227 105.483 257.562 105.876C257.342 106 257.13 106.13 256.92 106.264L256.917 106.265C256.48 106.543 256.054 106.834 255.64 107.143C255.551 107.205 255.462 107.271 255.377 107.336C255.423 107.276 255.468 107.218 255.514 107.16C255.684 106.947 255.86 106.738 256.044 106.539C256.045 106.537 256.047 106.538 256.047 106.538C256.053 106.527 256.062 106.518 256.072 106.509C256.136 106.438 256.201 106.368 256.269 106.299C256.405 106.157 256.544 106.018 256.687 105.882C256.736 105.833 256.785 105.787 256.835 105.741C257.254 105.352 257.702 104.991 258.17 104.656C258.938 104.105 259.756 103.622 260.606 103.207C261.43 102.804 262.286 102.463 263.161 102.185C263.175 102.181 263.188 102.175 263.202 102.172C264.998 101.596 266.872 101.258 268.758 101.024C269.701 100.904 270.649 100.818 271.601 100.746C272.196 100.693 272.792 100.651 273.39 100.608C273.406 100.605 273.423 100.605 273.44 100.605C273.686 100.587 273.935 100.568 274.181 100.55C274.199 100.548 274.219 100.546 274.236 100.544C274.309 100.54 274.383 100.534 274.457 100.527C274.383 100.527 274.31 100.525 274.236 100.527C274.218 100.525 274.199 100.524 274.182 100.525L274.181 100.527C273.936 100.524 273.69 100.523 273.445 100.524C273.429 100.523 273.412 100.523 273.395 100.523C272.792 100.523 272.192 100.53 271.59 100.54C270.635 100.562 269.678 100.606 268.722 100.677C266.812 100.823 264.9 101.118 263.047 101.666C261.485 102.135 259.972 102.794 258.593 103.679L258.591 103.68C258.334 103.843 258.081 104.015 257.835 104.195C257.633 104.344 257.434 104.496 257.239 104.656C256.679 105.111 256.153 105.608 255.672 106.15C255.577 106.258 255.485 106.367 255.395 106.479C255.368 106.51 255.342 106.543 255.318 106.574C255.259 106.647 255.202 106.72 255.145 106.794C255.11 106.841 255.074 106.89 255.038 106.937C254.966 107.036 254.893 107.137 254.824 107.239C254.778 107.305 254.733 107.368 254.691 107.435L254.69 107.437C254.5 107.723 254.326 108.018 254.166 108.321C253.652 108.771 253.157 109.243 252.685 109.737C251.73 110.728 250.87 111.801 250.09 112.933L250.089 112.935C250.086 112.938 250.082 112.943 250.081 112.947C249.984 113.086 249.889 113.226 249.796 113.367C249.827 112.92 249.889 112.478 249.986 112.047C250.031 111.851 250.079 111.658 250.133 111.466C250.192 111.258 250.259 111.054 250.338 110.856C250.36 110.8 250.382 110.743 250.405 110.687C250.404 110.685 250.406 110.684 250.406 110.684C250.472 110.513 250.543 110.346 250.621 110.181C250.658 110.105 250.695 110.029 250.732 109.956C250.772 109.879 250.812 109.805 250.855 109.732C250.915 109.618 250.981 109.506 251.049 109.397C251.051 109.391 251.055 109.384 251.06 109.377C251.204 109.143 251.361 108.917 251.527 108.699C251.593 108.61 251.662 108.522 251.734 108.436C251.737 108.433 251.738 108.429 251.741 108.426C251.905 108.228 252.077 108.035 252.251 107.838C252.281 107.804 252.31 107.77 252.341 107.736C252.705 107.324 253.065 106.909 253.415 106.479C253.416 106.475 253.419 106.474 253.419 106.472C253.528 106.341 253.634 106.207 253.739 106.073C253.781 106.018 253.823 105.965 253.865 105.91C253.904 105.86 253.943 105.809 253.981 105.759C253.792 105.908 253.604 106.062 253.422 106.218C253.422 106.218 253.421 106.22 253.419 106.219C253.386 106.248 253.354 106.274 253.32 106.303C253.21 106.395 253.102 106.488 252.995 106.584C252.995 106.584 252.993 106.583 252.993 106.585C252.775 106.777 252.56 106.97 252.346 107.168L252.344 107.169C252.33 107.185 252.315 107.199 252.297 107.214C252.213 107.292 252.129 107.37 252.045 107.448C251.727 107.738 251.425 108.051 251.136 108.384C250.858 108.726 250.609 109.092 250.391 109.478C250.274 109.694 250.167 109.916 250.073 110.145C250.05 110.2 250.026 110.255 250.004 110.313C249.99 110.348 249.976 110.383 249.965 110.421L249.963 110.427C249.902 110.583 249.849 110.743 249.803 110.906C249.698 111.256 249.622 111.615 249.581 111.978C249.57 112.05 249.562 112.123 249.558 112.195C249.546 112.303 249.539 112.41 249.535 112.516C249.534 112.519 249.535 112.522 249.534 112.526C249.529 112.589 249.528 112.654 249.529 112.718C249.526 112.725 249.528 112.732 249.527 112.74C249.528 112.751 249.527 112.759 249.527 112.77C249.527 112.772 249.528 112.774 249.527 112.776C249.525 113.081 249.546 113.385 249.587 113.686C249.311 114.115 249.047 114.55 248.791 114.99L248.788 114.999C248.452 115.579 248.135 116.171 247.835 116.77C246.568 119.305 245.609 121.98 244.874 124.712C244.866 124.735 244.861 124.756 244.855 124.779C244.651 125.561 244.47 126.358 244.33 127.167C244.315 127.258 244.3 127.35 244.287 127.442L244.287 127.444C244.202 127.975 244.139 128.507 244.101 129.048C244.096 129.111 244.093 129.175 244.091 129.24C244.083 129.356 244.078 129.473 244.074 129.588C244.073 129.59 244.075 129.591 244.074 129.593C244.071 129.676 244.069 129.759 244.068 129.843C244.029 129.621 243.994 129.398 243.965 129.175C243.964 129.171 243.963 129.166 243.963 129.162C243.924 128.896 243.895 128.628 243.869 128.363C243.868 128.36 243.869 128.358 243.869 128.356C243.854 128.193 243.842 128.029 243.831 127.865C243.792 127.371 243.795 126.875 243.786 126.379L243.812 125.638C243.817 125.392 243.848 125.145 243.866 124.899C243.872 124.832 243.879 124.764 243.885 124.697C243.886 124.695 243.886 124.693 243.885 124.691C243.898 124.569 243.911 124.447 243.928 124.324C244.018 123.534 244.155 122.748 244.357 121.977C244.528 121.295 244.743 120.624 244.993 119.965L244.994 119.963C245.026 119.876 245.06 119.79 245.094 119.705C245.164 119.527 245.235 119.352 245.311 119.176C245.578 118.557 245.882 117.955 246.2 117.353L246.201 117.351C246.21 117.337 246.214 117.324 246.224 117.309C246.225 117.305 246.229 117.3 246.23 117.296C246.369 117.035 246.509 116.771 246.651 116.509C247.496 114.953 248.329 113.39 249.127 111.805L249.127 111.803C249.148 111.768 249.165 111.732 249.184 111.694C249.219 111.624 249.256 111.553 249.289 111.482C249.341 111.38 249.394 111.279 249.444 111.176C249.357 111.31 249.271 111.444 249.186 111.579C249.168 111.607 249.15 111.634 249.134 111.662L249.133 111.664C249.133 111.664 249.131 111.666 249.13 111.667C249.128 111.669 249.127 111.671 249.126 111.672C248.303 112.965 247.505 114.272 246.72 115.587C246.71 115.603 246.7 115.621 246.689 115.638C246.689 115.64 246.685 115.643 246.685 115.645C246.637 115.723 246.593 115.801 246.545 115.879C246.542 115.882 246.54 115.887 246.538 115.891C246.493 115.966 246.451 116.04 246.406 116.115C246.367 116.179 246.33 116.242 246.291 116.306C245.931 116.906 245.583 117.516 245.263 118.142C245.12 118.415 244.983 118.692 244.853 118.971C244.624 119.486 244.416 120.011 244.237 120.546C244.211 120.615 244.189 120.685 244.167 120.755L244.166 120.758C244.098 120.96 244.036 121.164 243.977 121.369C243.959 121.428 243.941 121.49 243.925 121.55C243.897 121.649 243.871 121.748 243.845 121.848C243.827 121.918 243.812 121.986 243.796 122.056C243.775 122.142 243.755 122.228 243.738 122.314L243.737 122.316C243.478 123.507 243.334 124.725 243.323 125.94C243.321 126.06 243.322 126.18 243.325 126.299C243.331 126.834 243.362 127.369 243.423 127.9C243.533 129.008 243.763 130.101 244.097 131.16L244.098 131.163C244.098 131.169 244.097 131.177 244.099 131.184C244.13 131.662 244.183 132.14 244.253 132.613C244.286 132.839 244.324 133.063 244.367 133.286C244.365 133.29 244.366 133.293 244.368 133.295C244.374 133.338 244.382 133.381 244.391 133.423C244.4 133.471 244.408 133.518 244.418 133.564C244.653 134.774 244.97 135.95 245.335 137.115C245.384 137.275 245.435 137.434 245.487 137.593C245.602 137.934 245.702 138.278 245.832 138.614L246.213 139.622C246.213 139.627 246.215 139.629 246.216 139.63C246.343 139.964 246.494 140.288 246.632 140.616L246.748 140.886C246.748 140.886 246.751 140.889 246.751 140.894L246.846 141.112C246.917 141.278 247.001 141.437 247.077 141.601C247.237 141.923 247.389 142.25 247.554 142.571L248.074 143.517C248.241 143.836 248.436 144.142 248.625 144.45L248.907 144.91L249.051 145.141L249.205 145.363L249.823 146.254C250.035 146.547 250.264 146.828 250.485 147.115L250.819 147.543L251.175 147.95C251.415 148.221 251.647 148.502 251.9 148.76L252.667 149.532C252.792 149.664 252.927 149.784 253.063 149.903L253.471 150.263C253.554 150.339 253.64 150.415 253.725 150.489L253.727 150.489C253.772 150.53 253.816 150.568 253.861 150.607C253.873 150.618 253.884 150.628 253.896 150.636C253.967 150.697 254.04 150.756 254.112 150.812C254.14 150.835 254.169 150.855 254.197 150.878C254.234 150.905 254.268 150.934 254.305 150.962L254.424 151.051L254.426 151.052L254.739 151.291C254.885 151.399 255.026 151.513 255.18 151.609C255.35 151.716 255.522 151.82 255.696 151.92C255.835 152.006 255.975 152.087 256.116 152.167L256.354 152.3C256.435 152.341 256.519 152.377 256.601 152.413C256.704 152.462 256.807 152.504 256.912 152.549C256.888 152.562 256.867 152.575 256.847 152.589C256.643 152.734 256.435 152.885 256.263 153.061C256.021 153.308 255.844 153.604 255.833 154.007C255.827 154.189 255.873 154.398 255.955 154.614C255.971 154.655 255.988 154.695 256.006 154.735L256.007 154.738C256.019 154.729 256.03 154.722 256.039 154.713C256.05 154.706 256.058 154.7 256.067 154.693C256.098 154.67 256.128 154.645 256.156 154.619C256.159 154.617 256.161 154.618 256.161 154.616C256.194 154.587 256.224 154.556 256.254 154.524C256.314 154.46 256.367 154.392 256.411 154.322C256.433 154.287 256.454 154.252 256.473 154.216L256.475 154.211C256.488 154.184 256.502 154.157 256.513 154.129C256.527 154.102 256.538 154.077 256.548 154.049C256.556 154.03 256.565 154.012 256.571 153.993L256.575 153.982C256.596 153.928 256.613 153.873 256.628 153.817C256.631 153.81 256.633 153.802 256.635 153.792L256.643 153.767C256.726 153.54 256.766 153.296 256.799 153.051C256.839 153.046 256.879 153.039 256.918 153.031C256.969 153.07 257.021 153.109 257.073 153.148C257.08 153.152 257.085 153.156 257.092 153.161C257.157 153.209 257.224 153.259 257.29 153.305C257.3 153.313 257.312 153.321 257.322 153.329L257.585 153.488C257.801 153.617 258.021 153.747 258.243 153.872C258.283 153.818 258.326 153.768 258.37 153.72C258.371 153.716 258.375 153.711 258.378 153.708C258.382 153.716 258.384 153.723 258.387 153.73C258.436 153.846 258.5 153.929 258.571 153.996C258.629 154.052 258.698 154.087 258.767 154.121C258.835 154.157 258.902 154.193 258.974 154.224C259.255 154.347 259.532 154.486 259.818 154.595C260.39 154.823 260.969 155.028 261.561 155.193C262.509 155.465 263.473 155.663 264.442 155.807C264.679 155.845 264.919 155.878 265.157 155.908C266.366 156.066 267.579 156.132 268.784 156.182C269.994 156.226 271.191 156.25 272.394 156.273C272.864 156.278 273.336 156.282 273.809 156.28C274.438 156.276 275.067 156.265 275.697 156.239L275.706 156.24C277.029 156.183 278.356 156.06 279.677 155.81C279.687 155.807 279.696 155.806 279.703 155.804C280.224 155.916 280.755 156.007 281.305 156.031C282.177 156.079 283.025 155.891 283.843 155.728C284.663 155.56 285.485 155.377 286.303 155.162C287.117 154.934 287.929 154.67 288.708 154.324C289.486 153.97 290.228 153.537 290.908 153.028C292.277 152.014 293.429 150.767 294.462 149.448C293.263 150.621 292.044 151.769 290.671 152.691C289.306 153.625 287.768 154.229 286.164 154.652C285.365 154.872 284.552 155.053 283.736 155.24C282.922 155.432 282.12 155.617 281.312 155.621C281.104 155.62 280.896 155.612 280.687 155.594C281.55 155.396 282.406 155.158 283.242 154.866C284.401 154.457 285.533 153.976 286.627 153.418C286.924 153.26 287.219 153.099 287.509 152.93C287.509 152.93 287.51 152.93 287.511 152.929C287.79 152.769 288.064 152.604 288.338 152.434C288.822 152.132 289.294 151.816 289.758 151.486C290.083 151.253 290.405 151.011 290.717 150.761C290.719 150.76 290.72 150.758 290.722 150.757C291.071 150.479 291.413 150.192 291.748 149.895C292.03 149.645 292.306 149.391 292.576 149.129C293.462 148.282 294.263 147.349 295.006 146.379C295.187 146.132 295.379 145.893 295.549 145.638L296.061 144.878C296.379 144.356 296.705 143.84 296.986 143.299C297.156 142.985 297.316 142.67 297.471 142.349C297.84 141.961 298.184 141.545 298.499 141.111C299.064 140.314 299.533 139.453 299.916 138.561C299.984 138.401 300.05 138.243 300.112 138.081C300.137 138.014 300.162 137.949 300.188 137.882C300.251 137.712 300.31 137.541 300.369 137.365L300.369 137.363C300.391 137.301 300.411 137.237 300.432 137.172L300.436 137.18ZM263.397 112.133C263.465 112.07 263.534 112.005 263.603 111.945C264.792 110.875 266.068 109.898 267.406 109.01C267.359 109.084 267.315 109.157 267.27 109.232C267.192 109.359 267.116 109.486 267.045 109.613C266.881 109.908 266.723 110.207 266.572 110.508C266.533 110.584 266.497 110.657 266.462 110.734L266.461 110.735C266.152 111.365 265.875 112.008 265.629 112.667C265.581 112.793 265.535 112.92 265.491 113.048C265.353 113.434 265.227 113.827 265.115 114.222C265.07 114.371 265.028 114.522 264.99 114.673C264.963 114.769 264.939 114.864 264.916 114.961C264.784 115.512 264.672 116.066 264.585 116.626C264.541 116.906 264.504 117.186 264.474 117.468C264.461 117.584 264.45 117.702 264.439 117.818C264.438 117.839 264.436 117.857 264.435 117.878C264.432 117.923 264.428 117.97 264.425 118.016C264.403 118.324 264.39 118.635 264.381 118.944C264.381 118.986 264.382 119.027 264.38 119.068L264.38 119.07C264.373 119.619 264.392 120.17 264.446 120.719L264.561 120.71C264.487 120.777 264.413 120.845 264.338 120.911C264.232 121.009 264.128 121.103 264.024 121.202L264.021 121.203C263.896 121.322 263.768 121.44 263.644 121.561C263.559 121.643 263.474 121.725 263.39 121.81C263.389 121.812 263.387 121.811 263.386 121.813C263.042 122.148 262.709 122.498 262.382 122.857C262.303 122.943 262.226 123.032 262.15 123.119C261.519 123.844 260.927 124.604 260.372 125.39C260.323 125.46 260.273 125.531 260.225 125.601C259.659 126.42 259.15 127.275 258.674 128.148C258.154 129.095 257.709 130.082 257.31 131.085C256.907 132.089 256.571 133.118 256.285 134.161C256.231 134.349 256.183 134.536 256.136 134.727C256.122 134.785 256.107 134.841 256.095 134.9L256.094 134.902C256.048 135.088 256.004 135.275 255.961 135.462C255.947 135.521 255.935 135.58 255.921 135.638C255.912 135.671 255.904 135.704 255.897 135.737C255.793 136.268 255.681 136.798 255.602 137.333C255.55 137.637 255.508 137.945 255.471 138.252C255.346 137.817 255.258 137.372 255.192 136.921C255.171 136.781 255.15 136.641 255.131 136.502C255.129 136.493 255.129 136.487 255.128 136.48L255.128 136.478C255.072 136.062 255.024 135.648 254.971 135.231C254.938 134.955 254.902 134.676 254.868 134.399C254.907 134.187 254.949 133.975 254.993 133.764C255.033 133.582 255.073 133.398 255.119 133.218C255.255 132.644 255.413 132.078 255.596 131.52C255.647 131.367 255.699 131.216 255.756 131.065L255.759 131.058C255.801 130.936 255.844 130.818 255.892 130.698C256.253 129.748 256.685 128.835 257.182 127.944C257.343 127.643 257.511 127.348 257.685 127.052L257.686 127.05C257.698 127.025 257.713 127.003 257.727 126.978C257.873 126.73 258.022 126.482 258.173 126.235C258.224 126.148 258.275 126.062 258.328 125.976C258.439 125.789 258.555 125.601 258.67 125.416C258.757 125.275 258.844 125.133 258.932 124.993C259.023 124.841 259.115 124.69 259.206 124.538C259.301 124.381 259.396 124.223 259.49 124.066C260.08 123.08 260.651 122.084 261.177 121.06C260.738 121.586 260.315 122.124 259.902 122.667C259.901 122.669 259.899 122.67 259.898 122.672C259.87 122.711 259.839 122.751 259.811 122.789C259.449 123.266 259.097 123.748 258.747 124.234C258.535 124.524 258.327 124.819 258.123 125.117C258.122 125.121 258.119 125.124 258.117 125.13L258.116 125.131C257.946 125.38 257.777 125.629 257.608 125.88C257.387 126.22 257.173 126.565 256.963 126.916C256.827 127.142 256.695 127.372 256.565 127.605C256.541 127.652 256.516 127.698 256.49 127.744C256.2 128.294 255.929 128.857 255.692 129.436C255.444 130.066 255.227 130.712 255.071 131.369C254.915 132 254.804 132.641 254.741 133.285C254.692 132.824 254.646 132.363 254.606 131.901C254.556 131.321 254.52 130.74 254.509 130.159C254.508 130.13 254.507 130.102 254.507 130.072L254.508 130.07C254.505 130.036 254.505 130 254.506 129.966C254.503 129.949 254.503 129.932 254.505 129.915C254.5 129.745 254.499 129.579 254.499 129.41L254.499 129.408C254.499 129.372 254.499 129.336 254.5 129.301C254.499 129.025 254.506 128.751 254.521 128.476C254.546 127.918 254.595 127.36 254.682 126.809C254.795 125.985 254.977 125.17 255.215 124.37C255.251 124.302 255.289 124.235 255.328 124.169C255.33 124.166 255.332 124.164 255.334 124.161C255.384 124.07 255.435 123.978 255.486 123.891C255.651 123.61 255.821 123.333 255.999 123.062C256.026 123.019 256.056 122.975 256.086 122.932C256.087 122.93 256.087 122.929 256.09 122.927C256.175 122.797 256.262 122.667 256.354 122.541C256.982 121.642 257.682 120.802 258.447 120.01C258.551 119.901 258.654 119.792 258.759 119.683C259.11 119.32 259.475 118.966 259.842 118.613C260.067 118.39 260.296 118.172 260.527 117.954C260.776 117.716 261.027 117.478 261.276 117.236C261.68 116.847 262.081 116.456 262.476 116.058C262.508 116.026 262.541 115.992 262.571 115.96C262.572 115.958 262.574 115.959 262.574 115.957C262.703 115.829 262.829 115.702 262.954 115.57L262.955 115.569C262.958 115.565 262.961 115.564 262.965 115.559C262.974 115.552 262.981 115.544 262.988 115.534C263.111 115.41 263.233 115.284 263.353 115.157C263.596 114.9 263.835 114.641 264.071 114.378C263.739 114.614 263.41 114.856 263.087 115.102C263.08 115.106 263.074 115.11 263.07 115.115C263.043 115.133 263.017 115.154 262.991 115.172C262.991 115.174 262.989 115.174 262.988 115.176C262.965 115.193 262.942 115.21 262.919 115.228C262.894 115.246 262.868 115.267 262.842 115.287C262.186 115.786 261.544 116.303 260.908 116.826C260.901 116.832 260.893 116.838 260.887 116.844C260.376 117.254 259.882 117.689 259.385 118.124C258.888 118.573 258.404 119.039 257.935 119.525C257.476 120.017 257.031 120.528 256.623 121.071C256.531 121.197 256.438 121.325 256.349 121.454C256.506 121.13 256.67 120.81 256.842 120.49C257.922 118.516 259.304 116.701 260.868 115.039C260.435 115.394 260.016 115.769 259.611 116.16C259.827 115.891 260.044 115.627 260.268 115.366C260.271 115.363 260.272 115.361 260.275 115.358C260.388 115.222 260.506 115.086 260.624 114.954C261.49 113.963 262.412 113.022 263.393 112.136C263.394 112.135 263.395 112.134 263.397 112.133L263.397 112.133ZM256.593 151.14C256.588 151.13 256.585 151.118 256.58 151.108C256.559 151.05 256.538 150.992 256.516 150.934C256.489 150.861 256.462 150.788 256.438 150.717C256.428 150.697 256.422 150.678 256.416 150.659C256.362 150.516 256.309 150.371 256.258 150.229C256.194 150.059 256.129 149.89 256.063 149.721C255.923 149.355 255.777 148.992 255.617 148.638C255.162 147.661 254.731 146.673 254.342 145.677C254.295 145.563 254.251 145.449 254.208 145.335C254.206 145.33 254.205 145.326 254.203 145.321C253.824 144.335 253.49 143.336 253.209 142.325L252.995 141.515L252.897 141.075L252.872 140.963L252.812 140.698C252.744 140.428 252.707 140.152 252.654 139.879L252.582 139.468C252.557 139.331 252.544 139.194 252.525 139.055C252.397 138.234 252.329 137.403 252.308 136.57L252.307 136.568C252.297 136.291 252.295 136.012 252.297 135.732C252.303 135.248 252.323 134.762 252.354 134.276C252.396 133.614 252.461 132.952 252.55 132.294C252.558 132.242 252.565 132.192 252.572 132.139C252.583 132.065 252.593 131.99 252.605 131.919C252.611 131.871 252.619 131.823 252.626 131.777C252.764 130.871 252.949 129.972 253.177 129.084C253.433 128.038 253.746 127.007 254.107 125.988C254.062 126.229 254.02 126.47 253.984 126.71C253.897 127.287 253.854 127.867 253.832 128.448C253.812 129.026 253.811 129.607 253.843 130.183C253.844 130.187 253.843 130.189 253.844 130.193C253.844 130.227 253.848 130.258 253.851 130.293L253.851 130.295C253.857 130.451 253.869 130.607 253.882 130.763C253.882 130.799 253.886 130.836 253.889 130.871L253.888 130.873C253.932 131.421 253.99 131.965 254.061 132.506C254.108 132.876 254.163 133.245 254.223 133.611C254.257 133.819 254.291 134.029 254.329 134.236C254.334 134.282 254.343 134.329 254.351 134.374C254.368 134.47 254.383 134.566 254.403 134.661L254.402 134.663C254.537 135.439 254.687 136.209 254.854 136.985C254.874 137.072 254.895 137.158 254.918 137.243C254.918 137.243 254.918 137.245 254.92 137.246C254.919 137.254 254.921 137.259 254.923 137.266C255.043 137.733 255.187 138.195 255.384 138.634L255.392 138.652C255.399 138.669 255.408 138.687 255.416 138.705C255.408 138.784 255.397 138.863 255.389 138.941C255.339 139.48 255.293 140.02 255.274 140.561C255.235 141.39 255.233 142.221 255.265 143.052C255.267 143.095 255.269 143.138 255.273 143.181L255.272 143.183C255.284 143.452 255.301 143.722 255.319 143.989C255.322 144.034 255.327 144.076 255.331 144.12L255.33 144.121C255.373 144.688 255.434 145.255 255.513 145.817C255.568 146.224 255.632 146.629 255.704 147.033C255.904 148.099 256.153 149.158 256.473 150.196C256.549 150.433 256.629 150.671 256.713 150.907C256.734 150.965 256.752 151.022 256.774 151.08L256.775 151.082C256.806 151.175 256.841 151.268 256.874 151.361C256.782 151.287 256.688 151.214 256.593 151.139L256.593 151.14ZM258.903 152.368C258.9 152.37 258.898 152.369 258.894 152.369C258.794 152.373 258.691 152.375 258.592 152.377C258.574 152.332 258.555 152.29 258.538 152.246C258.532 152.234 258.526 152.221 258.524 152.209C258.497 152.152 258.474 152.097 258.455 152.042C258.367 151.835 258.284 151.625 258.207 151.417C258.137 151.241 258.073 151.067 258.012 150.892C257.989 150.836 257.968 150.78 257.952 150.724C257.846 150.433 257.748 150.139 257.657 149.844C257.654 149.839 257.652 149.834 257.651 149.83C257.341 148.84 257.098 147.831 256.903 146.813C256.864 146.608 256.828 146.402 256.796 146.197C256.696 145.581 256.618 144.962 256.56 144.342C256.844 144.427 257.145 144.463 257.443 144.454C257.745 144.441 258.041 144.382 258.324 144.29C258.889 144.111 259.401 143.83 259.884 143.525C260.367 143.212 260.813 142.88 261.269 142.556C261.723 142.231 262.172 141.896 262.622 141.564C263.287 141.068 263.944 140.558 264.592 140.033C264.603 140.025 264.615 140.014 264.627 140.003C264.633 139.999 264.639 139.995 264.645 139.988C264.656 139.98 264.668 139.971 264.68 139.961C264.946 139.746 265.21 139.525 265.471 139.302C265.491 139.286 265.512 139.268 265.529 139.25C265.548 139.238 265.563 139.224 265.577 139.21L265.577 139.208C265.779 139.04 265.975 138.87 266.167 138.697C266.714 138.218 267.246 137.725 267.765 137.218C267.959 137.024 268.15 136.829 268.339 136.632C268.598 136.364 268.853 136.09 269.103 135.814C269.126 135.868 269.152 135.921 269.173 135.975C269.189 136.008 269.205 136.041 269.219 136.075C269.222 136.078 269.222 136.083 269.225 136.088C269.287 136.23 269.348 136.371 269.406 136.513C269.678 137.163 269.916 137.817 270.112 138.48C270.322 139.215 270.489 139.955 270.604 140.705C270.62 140.805 270.634 140.903 270.648 141.004C270.653 141.044 270.658 141.084 270.661 141.125C270.668 141.165 270.673 141.205 270.677 141.247C270.681 141.277 270.685 141.31 270.689 141.341C270.708 141.506 270.725 141.669 270.739 141.835C270.743 141.872 270.748 141.907 270.749 141.946L270.748 141.947C270.81 142.712 270.817 143.486 270.777 144.257C270.776 144.272 270.776 144.284 270.773 144.298C270.753 144.649 270.722 145 270.68 145.351C270.672 145.405 270.666 145.458 270.658 145.512L270.657 145.514C270.647 145.605 270.634 145.695 270.621 145.787C270.617 145.818 270.613 145.848 270.609 145.878C270.598 145.958 270.585 146.038 270.571 146.12C270.552 146.25 270.53 146.379 270.508 146.508C270.357 146.654 270.203 146.8 270.054 146.949C270.008 146.998 269.96 147.045 269.912 147.092C269.498 147.504 269.056 147.884 268.614 148.266C268.44 148.414 268.268 148.565 268.098 148.717C268.098 148.717 268.095 148.718 268.095 148.72C268.071 148.739 268.049 148.761 268.025 148.78C267.469 149.253 266.88 149.67 266.262 150.045C266.12 150.133 265.977 150.216 265.833 150.299C265.427 150.526 265.014 150.739 264.59 150.936C264.649 150.808 264.705 150.678 264.756 150.549C264.788 150.469 264.818 150.387 264.847 150.305L264.86 150.267C264.878 150.214 264.896 150.163 264.912 150.112C265.034 149.74 265.13 149.356 265.198 148.969C265.22 148.858 265.237 148.747 265.253 148.636C265.258 148.602 265.263 148.57 265.267 148.535L265.267 148.534C265.269 148.523 265.27 148.513 265.271 148.503C265.274 148.49 265.274 148.477 265.275 148.462C265.28 148.437 265.282 148.412 265.285 148.386C265.288 148.37 265.29 148.352 265.29 148.335C265.299 148.258 265.308 148.179 265.312 148.1C265.326 147.956 265.335 147.809 265.337 147.663C265.343 147.481 265.343 147.3 265.336 147.119C265.329 146.877 265.312 146.635 265.284 146.395C265.278 146.345 265.271 146.294 265.263 146.243C265.257 146.194 265.248 146.145 265.24 146.096C265.223 145.98 265.202 145.865 265.177 145.749C265.144 145.582 265.103 145.414 265.056 145.248L265.057 145.246C265.045 145.2 265.031 145.157 265.017 145.112C265 145.056 264.983 145.002 264.961 144.945C264.911 144.785 264.85 144.627 264.78 144.47C264.773 144.449 264.763 144.428 264.753 144.408C264.749 144.396 264.742 144.385 264.738 144.373C264.739 144.42 264.737 144.466 264.739 144.511C264.739 144.515 264.739 144.517 264.739 144.521C264.74 144.612 264.742 144.703 264.743 144.792C264.742 144.884 264.742 144.975 264.744 145.066C264.745 145.132 264.745 145.197 264.746 145.263C264.745 145.313 264.746 145.366 264.746 145.419C264.746 145.602 264.745 145.782 264.742 145.965C264.742 146.02 264.741 146.074 264.739 146.128C264.736 146.226 264.734 146.323 264.73 146.42L264.73 146.422C264.728 146.476 264.726 146.528 264.723 146.582C264.724 146.595 264.722 146.607 264.722 146.62C264.717 146.751 264.71 146.88 264.702 147.011L264.702 147.013C264.701 147.044 264.698 147.077 264.696 147.108C264.688 147.235 264.679 147.365 264.668 147.492C264.657 147.64 264.643 147.789 264.628 147.935C264.627 147.951 264.624 147.967 264.623 147.982C264.617 148.047 264.61 148.11 264.6 148.174L264.6 148.176C264.593 148.256 264.584 148.337 264.574 148.415C264.558 148.54 264.541 148.667 264.521 148.793C264.513 148.851 264.505 148.91 264.496 148.968C264.48 149.076 264.461 149.183 264.443 149.29C264.383 149.645 264.314 149.997 264.236 150.35C264.234 150.362 264.229 150.375 264.227 150.387L264.225 150.393C264.213 150.453 264.2 150.514 264.183 150.574L264.183 150.576C264.14 150.778 264.09 150.978 264.038 151.181C263.829 151.269 263.619 151.351 263.408 151.43C263.261 151.484 263.115 151.537 262.967 151.586C262.788 151.647 262.61 151.705 262.429 151.758C262.278 151.805 262.127 151.847 261.975 151.889C261.787 151.938 261.603 151.985 261.415 152.027L261.413 152.029C260.836 152.161 260.252 152.258 259.668 152.317C259.413 152.342 259.158 152.361 258.904 152.37L258.903 152.368ZM254.501 129.301C254.5 129.025 254.506 128.751 254.522 128.477C254.546 127.919 254.595 127.361 254.683 126.81C254.796 125.986 254.978 125.17 255.215 124.37C255.251 124.303 255.289 124.236 255.329 124.17C255.271 124.22 255.212 124.269 255.153 124.318C255.091 124.368 255.03 124.418 254.968 124.468C254.891 124.532 254.813 124.594 254.733 124.654C254.653 124.715 254.573 124.776 254.493 124.834C254.159 125.081 253.814 125.312 253.457 125.526C253.44 125.588 253.426 125.648 253.408 125.709C253.365 125.871 253.322 126.031 253.281 126.194C253.22 126.417 253.164 126.64 253.108 126.862L252.787 128.443C252.77 128.542 252.749 128.64 252.727 128.737C252.723 128.757 252.72 128.777 252.715 128.797C252.703 128.856 252.689 128.914 252.679 128.974C252.667 129.033 252.657 129.093 252.649 129.153C252.66 129.133 252.674 129.115 252.686 129.099C252.829 128.912 252.986 128.739 253.158 128.584C252.938 128.907 252.759 129.248 252.615 129.6C252.6 129.637 252.585 129.676 252.569 129.715L252.568 129.719L252.525 130.032L252.413 130.829C252.404 130.896 252.393 130.964 252.383 131.03C252.354 131.23 252.325 131.429 252.314 131.63C252.296 131.876 252.276 132.122 252.257 132.366C252.36 132.233 252.463 132.1 252.568 131.968C252.58 131.951 252.593 131.937 252.606 131.92C252.612 131.871 252.62 131.824 252.627 131.778C252.765 130.871 252.95 129.973 253.178 129.085C253.434 128.038 253.747 127.008 254.108 125.989C254.063 126.23 254.021 126.471 253.985 126.711C253.898 127.288 253.855 127.868 253.833 128.448C253.813 129.027 253.812 129.608 253.844 130.183C253.845 130.188 253.844 130.19 253.845 130.194C253.845 130.228 253.849 130.259 253.852 130.294C253.934 130.185 254.014 130.076 254.095 129.965C254.154 129.886 254.213 129.808 254.269 129.729C254.308 129.677 254.346 129.625 254.385 129.571C254.405 129.546 254.423 129.518 254.442 129.492C254.462 129.465 254.482 129.438 254.5 129.41L254.501 129.409C254.5 129.373 254.5 129.337 254.502 129.301L254.501 129.301ZM263.087 115.103C263.08 115.107 263.074 115.111 263.07 115.116C263.058 115.175 263.042 115.233 263.028 115.291L263.028 115.293C263.025 115.301 263.025 115.307 263.023 115.314C263.01 115.369 262.995 115.425 262.981 115.477C262.976 115.498 262.97 115.522 262.962 115.542C262.901 115.555 262.84 115.567 262.778 115.575C262.743 115.641 262.707 115.709 262.671 115.774C262.639 115.837 262.607 115.898 262.574 115.958C262.703 115.83 262.829 115.703 262.954 115.572L262.955 115.57C262.958 115.567 262.96 115.565 262.964 115.56C262.973 115.553 262.98 115.545 262.988 115.535C263.111 115.411 263.233 115.285 263.352 115.158C263.595 114.901 263.834 114.642 264.071 114.379C263.738 114.615 263.41 114.857 263.087 115.104L263.087 115.103ZM256.405 135.284L256.406 135.28C256.428 135.216 256.451 135.15 256.476 135.085C256.568 134.825 256.666 134.566 256.767 134.306C256.535 134.495 256.31 134.693 256.095 134.901L256.095 134.902C256.049 135.089 256.005 135.276 255.961 135.463C255.947 135.521 255.935 135.58 255.921 135.639C255.912 135.671 255.905 135.705 255.897 135.738C255.794 136.269 255.681 136.799 255.603 137.333C255.55 137.637 255.509 137.945 255.472 138.253C255.347 137.818 255.259 137.372 255.192 136.922C255.171 136.781 255.15 136.642 255.131 136.502C255.13 136.493 255.13 136.487 255.128 136.48L255.129 136.478C255.073 136.063 255.025 135.648 254.971 135.232C254.939 134.955 254.903 134.677 254.868 134.4C254.908 134.188 254.95 133.975 254.993 133.765C255.033 133.583 255.074 133.399 255.12 133.219C255.256 132.645 255.414 132.078 255.597 131.52C255.648 131.367 255.7 131.217 255.757 131.066L255.759 131.058C255.802 130.936 255.844 130.819 255.893 130.698C256.253 129.749 256.686 128.836 257.182 127.944C257.343 127.644 257.511 127.349 257.686 127.053L257.686 127.051C257.699 127.026 257.713 127.003 257.728 126.979C257.873 126.73 258.022 126.483 258.173 126.236C258.225 126.149 258.275 126.063 258.329 125.976C258.44 125.789 258.555 125.602 258.67 125.416C258.757 125.276 258.844 125.134 258.933 124.994C259.024 124.842 259.116 124.691 259.207 124.539C259.301 124.382 259.396 124.223 259.491 124.066C260.081 123.081 260.652 122.085 261.178 121.06C260.739 121.586 260.316 122.124 259.902 122.668C259.902 122.669 259.899 122.671 259.899 122.673C259.87 122.711 259.84 122.751 259.812 122.79C259.45 123.267 259.098 123.749 258.748 124.235C258.536 124.525 258.328 124.82 258.124 125.118C258.123 125.121 258.119 125.125 258.117 125.13L258.117 125.132C257.946 125.38 257.778 125.63 257.609 125.881C257.388 126.221 257.173 126.566 256.963 126.916C256.828 127.143 256.695 127.373 256.566 127.606C256.542 127.652 256.517 127.699 256.491 127.744C256.201 128.295 255.93 128.858 255.693 129.437C255.445 130.067 255.227 130.712 255.071 131.37C254.916 132 254.805 132.642 254.741 133.286C254.693 132.825 254.646 132.364 254.606 131.902C254.557 131.322 254.52 130.741 254.509 130.16C254.509 130.13 254.508 130.103 254.508 130.073L254.508 130.071C254.506 130.036 254.505 130 254.506 129.967C254.504 129.949 254.504 129.932 254.505 129.916C254.499 129.941 254.492 129.966 254.49 129.991C254.477 130.041 254.465 130.092 254.456 130.142L254.456 130.143C254.454 130.149 254.451 130.152 254.447 130.157C254.44 130.165 254.435 130.172 254.43 130.181C254.424 130.187 254.419 130.194 254.415 130.201C254.333 130.31 254.251 130.418 254.168 130.524C254.153 130.542 254.138 130.562 254.122 130.582C254.046 130.68 253.968 130.777 253.889 130.872L253.889 130.873C253.932 131.422 253.99 131.966 254.061 132.507C254.108 132.877 254.163 133.245 254.223 133.612C254.257 133.82 254.292 134.03 254.329 134.237C254.334 134.283 254.343 134.33 254.351 134.375C254.368 134.471 254.383 134.567 254.403 134.662L254.402 134.664C254.537 135.44 254.687 136.21 254.854 136.986C254.875 137.073 254.896 137.158 254.919 137.244C254.919 137.244 254.918 137.246 254.92 137.247C254.919 137.255 254.922 137.26 254.923 137.267C255.043 137.734 255.187 138.196 255.384 138.635L255.393 138.653C255.675 137.515 256.013 136.389 256.405 135.284L256.405 135.284ZM254.489 129.99C254.491 129.966 254.498 129.941 254.505 129.915C254.5 129.745 254.499 129.579 254.499 129.41C254.481 129.437 254.461 129.464 254.441 129.491C254.421 129.518 254.403 129.545 254.384 129.57C254.344 129.624 254.307 129.677 254.268 129.728C254.211 129.808 254.152 129.886 254.093 129.965C254.013 130.076 253.933 130.185 253.851 130.293L253.85 130.295C253.857 130.451 253.868 130.607 253.882 130.763C253.882 130.799 253.886 130.836 253.889 130.871C253.968 130.776 254.046 130.679 254.122 130.581C254.137 130.561 254.153 130.541 254.167 130.523C254.25 130.417 254.332 130.309 254.414 130.2C254.419 130.193 254.423 130.187 254.43 130.18C254.435 130.172 254.439 130.165 254.446 130.157C254.45 130.152 254.453 130.148 254.455 130.143L254.456 130.141C254.465 130.091 254.476 130.04 254.489 129.99ZM255.834 142.553C255.856 141.865 255.928 141.185 256.06 140.504C256.238 139.669 256.382 138.823 256.622 138.003C256.66 137.862 256.697 137.72 256.734 137.576C256.738 137.553 256.74 137.53 256.744 137.506C256.811 136.99 256.912 136.48 257.006 135.969C257.101 135.536 257.19 135.104 257.301 134.675C257.295 134.677 257.292 134.68 257.287 134.683C257.279 134.688 257.271 134.692 257.263 134.698C257.076 134.816 256.893 134.94 256.712 135.067C256.612 135.135 256.514 135.205 256.416 135.276C256.413 135.279 256.408 135.281 256.404 135.284C256.013 136.389 255.675 137.515 255.392 138.653C255.399 138.67 255.407 138.688 255.416 138.705C255.408 138.785 255.397 138.863 255.389 138.942C255.339 139.481 255.292 140.021 255.274 140.562C255.235 141.391 255.233 142.222 255.265 143.053C255.267 143.096 255.269 143.138 255.273 143.182C255.354 143.105 255.437 143.03 255.521 142.959C255.561 142.922 255.603 142.886 255.647 142.85C255.689 142.814 255.731 142.778 255.775 142.743C255.793 142.728 255.811 142.713 255.83 142.699C255.832 142.651 255.832 142.603 255.835 142.553L255.834 142.553ZM280.076 143.083C279.866 143.195 279.654 143.305 279.438 143.411C279.348 143.458 279.256 143.504 279.163 143.547L279.16 143.548C278.987 143.72 278.81 143.892 278.631 144.06L278.457 144.21C278.446 144.219 278.435 144.23 278.423 144.241L278.235 144.401L277.88 144.709L277.874 144.714L277.55 144.993C277.368 145.145 277.197 145.311 277.006 145.455L276.439 145.889L275.872 146.322C275.679 146.464 275.498 146.618 275.295 146.745C275.114 146.866 274.934 146.987 274.752 147.109C274.797 147.004 274.839 146.899 274.884 146.795C274.976 146.574 275.069 146.353 275.16 146.134C275.231 145.965 275.303 145.794 275.376 145.626C275.406 145.558 275.433 145.492 275.462 145.426C275.487 145.367 275.513 145.309 275.54 145.251C275.587 145.138 275.636 145.029 275.684 144.919C275.54 144.977 275.4 145.036 275.255 145.095C275.247 145.098 275.24 145.1 275.233 145.104C275.174 145.248 275.12 145.393 275.069 145.54L275.06 145.564C275.036 145.628 275.015 145.69 274.994 145.756L274.993 145.758C274.961 145.852 274.93 145.947 274.902 146.04C274.809 146.337 274.726 146.637 274.66 146.938C274.639 147.03 274.62 147.12 274.601 147.21C274.043 147.588 273.483 147.964 272.893 148.292L272.276 148.655L271.969 148.837L271.65 148.998L270.374 149.647C270.164 149.761 269.944 149.854 269.725 149.946L269.067 150.228C268.627 150.414 268.193 150.615 267.739 150.764L266.708 151.137C267.43 150.696 268.117 150.202 268.755 149.646C268.842 149.57 268.929 149.495 269.013 149.417C269.931 148.611 270.81 147.764 271.65 146.877C271.72 146.805 271.79 146.73 271.858 146.655L271.861 146.654C271.926 146.581 271.992 146.512 272.055 146.439C272.11 146.384 272.161 146.328 272.21 146.271C272.123 146.298 272.036 146.325 271.948 146.347C271.946 146.348 271.945 146.35 271.943 146.35C271.843 146.378 271.743 146.405 271.642 146.429C271.764 146.34 271.883 146.251 272.003 146.16C272.162 146.04 272.319 145.916 272.475 145.788C272.475 145.788 272.476 145.787 272.477 145.787C272.538 145.739 272.601 145.691 272.661 145.642C272.722 145.592 272.786 145.542 272.845 145.493C272.742 145.529 272.639 145.563 272.537 145.597C272.535 145.597 272.535 145.598 272.535 145.598C272.279 145.68 272.021 145.763 271.761 145.844C271.501 145.918 271.239 145.987 270.973 146.045L270.971 146.044C270.927 146.094 270.879 146.141 270.832 146.19C270.848 146.149 270.863 146.106 270.878 146.064C270.775 146.086 270.674 146.104 270.572 146.121C270.552 146.251 270.531 146.38 270.509 146.509C270.357 146.655 270.203 146.801 270.055 146.95C270.008 147 269.96 147.046 269.913 147.093C269.498 147.505 269.057 147.885 268.615 148.267C268.441 148.415 268.269 148.566 268.098 148.718C268.098 148.718 268.096 148.719 268.095 148.721C268.071 148.74 268.049 148.762 268.026 148.781C267.47 149.254 266.881 149.671 266.262 150.046C266.12 150.134 265.977 150.217 265.833 150.3C265.428 150.527 265.015 150.74 264.591 150.937C264.649 150.809 264.705 150.679 264.756 150.55C264.788 150.47 264.819 150.388 264.847 150.306L264.86 150.268C264.879 150.215 264.896 150.164 264.912 150.113C265.035 149.741 265.13 149.357 265.199 148.97C265.22 148.859 265.238 148.748 265.253 148.637C265.259 148.603 265.263 148.571 265.267 148.536L265.268 148.535C265.269 148.524 265.27 148.514 265.272 148.504C265.274 148.491 265.275 148.478 265.275 148.463C265.28 148.438 265.282 148.413 265.285 148.387C265.289 148.371 265.291 148.353 265.29 148.336C265.3 148.259 265.308 148.18 265.312 148.101C265.327 147.957 265.335 147.81 265.338 147.664C265.344 147.482 265.343 147.301 265.337 147.12C265.33 146.878 265.313 146.636 265.284 146.396C265.279 146.346 265.271 146.295 265.264 146.244C265.257 146.195 265.249 146.146 265.241 146.097C265.224 145.981 265.203 145.866 265.177 145.75C265.145 145.583 265.104 145.415 265.056 145.249L265.057 145.247C265.046 145.201 265.031 145.158 265.017 145.113C265.001 145.057 264.984 145.003 264.961 144.946C264.912 144.786 264.85 144.628 264.781 144.471C264.773 144.45 264.764 144.429 264.754 144.409C264.75 144.397 264.743 144.386 264.738 144.374C264.739 144.421 264.738 144.467 264.739 144.512C264.74 144.516 264.739 144.518 264.74 144.522C264.74 144.613 264.742 144.704 264.743 144.793C264.743 144.885 264.743 144.976 264.745 145.067C264.745 145.133 264.746 145.198 264.746 145.264C264.746 145.314 264.746 145.367 264.747 145.42C264.747 145.603 264.745 145.784 264.743 145.966C264.743 146.021 264.741 146.075 264.739 146.129C264.737 146.227 264.735 146.324 264.731 146.421L264.73 146.423C264.728 146.477 264.727 146.529 264.723 146.583C264.725 146.596 264.723 146.608 264.723 146.621C264.717 146.752 264.71 146.882 264.703 147.012L264.702 147.014C264.702 147.045 264.699 147.078 264.697 147.109C264.688 147.237 264.679 147.366 264.669 147.493C264.658 147.641 264.644 147.79 264.629 147.936C264.628 147.952 264.624 147.968 264.623 147.983C264.618 148.048 264.61 148.111 264.601 148.175L264.6 148.177C264.594 148.257 264.584 148.338 264.574 148.416C264.558 148.541 264.542 148.668 264.521 148.794C264.514 148.852 264.506 148.911 264.496 148.969C264.48 149.077 264.462 149.184 264.444 149.291C264.384 149.646 264.314 149.998 264.236 150.351C264.234 150.363 264.23 150.376 264.228 150.388L264.226 150.394C264.213 150.454 264.2 150.515 264.184 150.575L264.183 150.577C264.14 150.779 264.09 150.979 264.039 151.182C263.829 151.27 263.62 151.352 263.409 151.431C263.261 151.485 263.115 151.538 262.967 151.588C263.71 151.552 264.456 151.493 265.199 151.42C265.396 151.4 265.591 151.377 265.787 151.35C266.854 151.183 267.908 150.976 268.949 150.718L269.865 150.482L270.769 150.209C271.041 150.135 271.3 150.036 271.564 149.944C271.634 149.917 271.705 149.889 271.774 149.86C271.452 149.92 271.131 149.978 270.81 150.048C270.443 150.122 270.073 150.204 269.707 150.294L269.851 150.236C270.076 150.148 270.3 150.059 270.515 149.95L271.822 149.329L272.147 149.173L272.463 148.996L273.097 148.645C275.35 147.406 277.428 145.867 279.309 144.112C279.422 144.01 279.532 143.907 279.64 143.801C280.002 143.457 280.355 143.106 280.699 142.747C280.495 142.861 280.287 142.975 280.078 143.085L280.076 143.083ZM254.501 129.301C254.5 129.025 254.506 128.751 254.522 128.477C254.546 127.919 254.595 127.361 254.683 126.81C254.796 125.986 254.978 125.17 255.215 124.37C255.251 124.303 255.289 124.236 255.329 124.17C255.271 124.22 255.212 124.269 255.153 124.318C255.091 124.368 255.03 124.418 254.968 124.468C254.891 124.532 254.813 124.594 254.733 124.654C254.653 124.715 254.573 124.776 254.493 124.834C254.159 125.081 253.814 125.312 253.457 125.526C253.44 125.588 253.426 125.648 253.408 125.709C253.365 125.871 253.322 126.031 253.281 126.194C253.22 126.417 253.164 126.64 253.108 126.862L252.787 128.443C252.77 128.542 252.749 128.64 252.727 128.737C252.723 128.757 252.72 128.777 252.715 128.797C252.703 128.856 252.689 128.914 252.679 128.974C252.667 129.033 252.657 129.093 252.649 129.153C252.66 129.133 252.674 129.115 252.686 129.099C252.829 128.912 252.986 128.739 253.158 128.584C252.938 128.907 252.759 129.248 252.615 129.6C252.6 129.637 252.585 129.676 252.569 129.715L252.568 129.719L252.525 130.032L252.413 130.829C252.404 130.896 252.393 130.964 252.383 131.03C252.354 131.23 252.325 131.429 252.314 131.63C252.296 131.876 252.276 132.122 252.257 132.366C252.36 132.233 252.463 132.1 252.568 131.968C252.58 131.951 252.593 131.937 252.606 131.92C252.612 131.871 252.62 131.824 252.627 131.778C252.765 130.871 252.95 129.973 253.178 129.085C253.434 128.038 253.747 127.008 254.108 125.989C254.063 126.23 254.021 126.471 253.985 126.711C253.898 127.288 253.855 127.868 253.833 128.448C253.813 129.027 253.812 129.608 253.844 130.183C253.845 130.188 253.844 130.19 253.845 130.194C253.845 130.228 253.849 130.259 253.852 130.294C253.934 130.185 254.014 130.076 254.095 129.965C254.154 129.886 254.213 129.808 254.269 129.729C254.308 129.677 254.346 129.625 254.385 129.571C254.405 129.546 254.423 129.518 254.442 129.492C254.462 129.465 254.482 129.438 254.5 129.41L254.501 129.409C254.5 129.373 254.5 129.337 254.502 129.301L254.501 129.301ZM263.087 115.103C263.08 115.107 263.074 115.111 263.07 115.116C263.058 115.175 263.042 115.233 263.028 115.291L263.028 115.293C263.025 115.301 263.025 115.307 263.023 115.314C263.01 115.369 262.995 115.425 262.981 115.477C262.976 115.498 262.97 115.522 262.962 115.542C262.901 115.555 262.84 115.567 262.778 115.575C262.743 115.641 262.707 115.709 262.671 115.774C262.639 115.837 262.607 115.898 262.574 115.958C262.703 115.83 262.829 115.703 262.954 115.572L262.955 115.57C262.958 115.567 262.96 115.565 262.964 115.56C262.973 115.553 262.98 115.545 262.988 115.535C263.111 115.411 263.233 115.285 263.352 115.158C263.595 114.901 263.834 114.642 264.071 114.379C263.738 114.615 263.41 114.857 263.087 115.104L263.087 115.103ZM256.405 135.284L256.406 135.28C256.428 135.216 256.451 135.15 256.476 135.085C256.568 134.825 256.666 134.566 256.767 134.306C256.535 134.495 256.31 134.693 256.095 134.901L256.095 134.902C256.049 135.089 256.005 135.276 255.961 135.463C255.947 135.521 255.935 135.58 255.921 135.639C255.912 135.671 255.905 135.705 255.897 135.738C255.794 136.269 255.681 136.799 255.603 137.333C255.55 137.637 255.509 137.945 255.472 138.253C255.347 137.818 255.259 137.372 255.192 136.922C255.171 136.781 255.15 136.642 255.131 136.502C255.13 136.493 255.13 136.487 255.128 136.48L255.129 136.478C255.073 136.063 255.025 135.648 254.971 135.232C254.939 134.955 254.903 134.677 254.868 134.4C254.908 134.188 254.95 133.975 254.993 133.765C255.033 133.583 255.074 133.399 255.12 133.219C255.256 132.645 255.414 132.078 255.597 131.52C255.648 131.367 255.7 131.217 255.757 131.066L255.759 131.058C255.802 130.936 255.844 130.819 255.893 130.698C256.253 129.749 256.686 128.836 257.182 127.944C257.343 127.644 257.511 127.349 257.686 127.053L257.686 127.051C257.699 127.026 257.713 127.003 257.728 126.979C257.873 126.73 258.022 126.483 258.173 126.236C258.225 126.149 258.275 126.063 258.329 125.976C258.44 125.789 258.555 125.602 258.67 125.416C258.757 125.276 258.844 125.134 258.933 124.994C259.024 124.842 259.116 124.691 259.207 124.539C259.301 124.382 259.396 124.223 259.491 124.066C260.081 123.081 260.652 122.085 261.178 121.06C260.739 121.586 260.316 122.124 259.902 122.668C259.902 122.669 259.899 122.671 259.899 122.673C259.87 122.711 259.84 122.751 259.812 122.79C259.45 123.267 259.098 123.749 258.748 124.235C258.536 124.525 258.328 124.82 258.124 125.118C258.123 125.121 258.119 125.125 258.117 125.13L258.117 125.132C257.946 125.38 257.778 125.63 257.609 125.881C257.388 126.221 257.173 126.566 256.963 126.916C256.828 127.143 256.695 127.373 256.566 127.606C256.542 127.652 256.517 127.699 256.491 127.744C256.201 128.295 255.93 128.858 255.693 129.437C255.445 130.067 255.227 130.712 255.071 131.37C254.916 132 254.805 132.642 254.741 133.286C254.693 132.825 254.646 132.364 254.606 131.902C254.557 131.322 254.52 130.741 254.509 130.16C254.509 130.13 254.508 130.103 254.508 130.073L254.508 130.071C254.506 130.036 254.505 130 254.506 129.967C254.504 129.949 254.504 129.932 254.505 129.916C254.499 129.941 254.492 129.966 254.49 129.991C254.477 130.041 254.465 130.092 254.456 130.142L254.456 130.143C254.454 130.149 254.451 130.152 254.447 130.157C254.44 130.165 254.435 130.172 254.43 130.181C254.424 130.187 254.419 130.194 254.415 130.201C254.333 130.31 254.251 130.418 254.168 130.524C254.153 130.542 254.138 130.562 254.122 130.582C254.046 130.68 253.968 130.777 253.889 130.872L253.889 130.873C253.932 131.422 253.99 131.966 254.061 132.507C254.108 132.877 254.163 133.245 254.223 133.612C254.257 133.82 254.292 134.03 254.329 134.237C254.334 134.283 254.343 134.33 254.351 134.375C254.368 134.471 254.383 134.567 254.403 134.662L254.402 134.664C254.537 135.44 254.687 136.21 254.854 136.986C254.875 137.073 254.896 137.158 254.919 137.244C254.919 137.244 254.918 137.246 254.92 137.247C254.919 137.255 254.922 137.26 254.923 137.267C255.043 137.734 255.187 138.196 255.384 138.635L255.393 138.653C255.675 137.515 256.013 136.389 256.405 135.284L256.405 135.284ZM254.489 129.99C254.491 129.966 254.498 129.941 254.505 129.915C254.5 129.745 254.499 129.579 254.499 129.41C254.481 129.437 254.461 129.464 254.441 129.491C254.421 129.518 254.403 129.545 254.384 129.57C254.344 129.624 254.307 129.677 254.268 129.728C254.211 129.808 254.152 129.886 254.093 129.965C254.013 130.076 253.933 130.185 253.851 130.293L253.85 130.295C253.857 130.451 253.868 130.607 253.882 130.763C253.882 130.799 253.886 130.836 253.889 130.871C253.968 130.776 254.046 130.679 254.122 130.581C254.137 130.561 254.153 130.541 254.167 130.523C254.25 130.417 254.332 130.309 254.414 130.2C254.419 130.193 254.423 130.187 254.43 130.18C254.435 130.172 254.439 130.165 254.446 130.157C254.45 130.152 254.453 130.148 254.455 130.143L254.456 130.141C254.465 130.091 254.476 130.04 254.489 129.99ZM255.834 142.553C255.856 141.865 255.928 141.185 256.06 140.504C256.238 139.669 256.382 138.823 256.622 138.003C256.66 137.862 256.697 137.72 256.734 137.576C256.738 137.553 256.74 137.53 256.744 137.506C256.811 136.99 256.912 136.48 257.006 135.969C257.101 135.536 257.19 135.104 257.301 134.675C257.295 134.677 257.292 134.68 257.287 134.683C257.279 134.688 257.271 134.692 257.263 134.698C257.076 134.816 256.893 134.94 256.712 135.067C256.612 135.135 256.514 135.205 256.416 135.276C256.413 135.279 256.408 135.281 256.404 135.284C256.013 136.389 255.675 137.515 255.392 138.653C255.399 138.67 255.407 138.688 255.416 138.705C255.408 138.785 255.397 138.863 255.389 138.942C255.339 139.481 255.292 140.021 255.274 140.562C255.235 141.391 255.233 142.222 255.265 143.053C255.267 143.096 255.269 143.138 255.273 143.182C255.354 143.105 255.437 143.03 255.521 142.959C255.561 142.922 255.603 142.886 255.647 142.85C255.689 142.814 255.731 142.778 255.775 142.743C255.793 142.728 255.811 142.713 255.83 142.699C255.832 142.651 255.832 142.603 255.835 142.553L255.834 142.553ZM280.076 143.083C279.866 143.195 279.654 143.305 279.438 143.411C279.348 143.458 279.256 143.504 279.163 143.547L279.16 143.548C278.987 143.72 278.81 143.892 278.631 144.06L278.457 144.21C278.446 144.219 278.435 144.23 278.423 144.241L278.235 144.401L277.88 144.709L277.874 144.714L277.55 144.993C277.368 145.145 277.197 145.311 277.006 145.455L276.439 145.889L275.872 146.322C275.679 146.464 275.498 146.618 275.295 146.745C275.114 146.866 274.934 146.987 274.752 147.109C274.797 147.004 274.839 146.899 274.884 146.795C274.976 146.574 275.069 146.353 275.16 146.134C275.231 145.965 275.303 145.794 275.376 145.626C275.406 145.558 275.433 145.492 275.462 145.426C275.487 145.367 275.513 145.309 275.54 145.251C275.587 145.138 275.636 145.029 275.684 144.919C275.54 144.977 275.4 145.036 275.255 145.095C275.247 145.098 275.24 145.1 275.233 145.104C275.174 145.248 275.12 145.393 275.069 145.54L275.06 145.564C275.036 145.628 275.015 145.69 274.994 145.756L274.993 145.758C274.961 145.852 274.93 145.947 274.902 146.04C274.809 146.337 274.726 146.637 274.66 146.938C274.639 147.03 274.62 147.12 274.601 147.21C274.043 147.588 273.483 147.964 272.893 148.292L272.276 148.655L271.969 148.837L271.65 148.998L270.374 149.647C270.164 149.761 269.944 149.854 269.725 149.946L269.067 150.228C268.627 150.414 268.193 150.615 267.739 150.764L266.708 151.137C267.43 150.696 268.117 150.202 268.755 149.646C268.842 149.57 268.929 149.495 269.013 149.417C269.931 148.611 270.81 147.764 271.65 146.877C271.72 146.805 271.79 146.73 271.858 146.655L271.861 146.654C271.926 146.581 271.992 146.512 272.055 146.439C272.11 146.384 272.161 146.328 272.21 146.271C272.123 146.298 272.036 146.325 271.948 146.347C271.946 146.348 271.945 146.35 271.943 146.35C271.843 146.378 271.743 146.405 271.642 146.429C271.764 146.34 271.883 146.251 272.003 146.16C272.162 146.04 272.319 145.916 272.475 145.788C272.475 145.788 272.476 145.787 272.477 145.787C272.538 145.739 272.601 145.691 272.661 145.642C272.722 145.592 272.786 145.542 272.845 145.493C272.742 145.529 272.639 145.563 272.537 145.597C272.535 145.597 272.535 145.598 272.535 145.598C272.279 145.68 272.021 145.763 271.761 145.844C271.501 145.918 271.239 145.987 270.973 146.045L270.971 146.044C270.927 146.094 270.879 146.141 270.832 146.19C270.848 146.149 270.863 146.106 270.878 146.064C270.775 146.086 270.674 146.104 270.572 146.121C270.552 146.251 270.531 146.38 270.509 146.509C270.357 146.655 270.203 146.801 270.055 146.95C270.008 147 269.96 147.046 269.913 147.093C269.498 147.505 269.057 147.885 268.615 148.267C268.441 148.415 268.269 148.566 268.098 148.718C268.098 148.718 268.096 148.719 268.095 148.721C268.071 148.74 268.049 148.762 268.026 148.781C267.47 149.254 266.881 149.671 266.262 150.046C266.12 150.134 265.977 150.217 265.833 150.3C265.428 150.527 265.015 150.74 264.591 150.937C264.649 150.809 264.705 150.679 264.756 150.55C264.788 150.47 264.819 150.388 264.847 150.306L264.86 150.268C264.879 150.215 264.896 150.164 264.912 150.113C265.035 149.741 265.13 149.357 265.199 148.97C265.22 148.859 265.238 148.748 265.253 148.637C265.259 148.603 265.263 148.571 265.267 148.536L265.268 148.535C265.269 148.524 265.27 148.514 265.272 148.504C265.274 148.491 265.275 148.478 265.275 148.463C265.28 148.438 265.282 148.413 265.285 148.387C265.289 148.371 265.291 148.353 265.29 148.336C265.3 148.259 265.308 148.18 265.312 148.101C265.327 147.957 265.335 147.81 265.338 147.664C265.344 147.482 265.343 147.301 265.337 147.12C265.33 146.878 265.313 146.636 265.284 146.396C265.279 146.346 265.271 146.295 265.264 146.244C265.257 146.195 265.249 146.146 265.241 146.097C265.224 145.981 265.203 145.866 265.177 145.75C265.145 145.583 265.104 145.415 265.056 145.249L265.057 145.247C265.046 145.201 265.031 145.158 265.017 145.113C265.001 145.057 264.984 145.003 264.961 144.946C264.912 144.786 264.85 144.628 264.781 144.471C264.773 144.45 264.764 144.429 264.754 144.409C264.75 144.397 264.743 144.386 264.738 144.374C264.739 144.421 264.738 144.467 264.739 144.512C264.74 144.516 264.739 144.518 264.74 144.522C264.74 144.613 264.742 144.704 264.743 144.793C264.743 144.885 264.743 144.976 264.745 145.067C264.745 145.133 264.746 145.198 264.746 145.264C264.746 145.314 264.746 145.367 264.747 145.42C264.747 145.603 264.745 145.784 264.743 145.966C264.743 146.021 264.741 146.075 264.739 146.129C264.737 146.227 264.735 146.324 264.731 146.421L264.73 146.423C264.728 146.477 264.727 146.529 264.723 146.583C264.725 146.596 264.723 146.608 264.723 146.621C264.717 146.752 264.71 146.882 264.703 147.012L264.702 147.014C264.702 147.045 264.699 147.078 264.697 147.109C264.688 147.237 264.679 147.366 264.669 147.493C264.658 147.641 264.644 147.79 264.629 147.936C264.628 147.952 264.624 147.968 264.623 147.983C264.618 148.048 264.61 148.111 264.601 148.175L264.6 148.177C264.594 148.257 264.584 148.338 264.574 148.416C264.558 148.541 264.542 148.668 264.521 148.794C264.514 148.852 264.506 148.911 264.496 148.969C264.48 149.077 264.462 149.184 264.444 149.291C264.384 149.646 264.314 149.998 264.236 150.351C264.234 150.363 264.23 150.376 264.228 150.388L264.226 150.394C264.213 150.454 264.2 150.515 264.184 150.575L264.183 150.577C264.14 150.779 264.09 150.979 264.039 151.182C263.829 151.27 263.62 151.352 263.409 151.431C263.261 151.485 263.115 151.538 262.967 151.588C263.71 151.552 264.456 151.493 265.199 151.42C265.396 151.4 265.591 151.377 265.787 151.35C266.854 151.183 267.908 150.976 268.949 150.718L269.865 150.482L270.769 150.209C271.041 150.135 271.3 150.036 271.564 149.944C271.634 149.917 271.705 149.889 271.774 149.86C271.452 149.92 271.131 149.978 270.81 150.048C270.443 150.122 270.073 150.204 269.707 150.294L269.851 150.236C270.076 150.148 270.3 150.059 270.515 149.95L271.822 149.329L272.147 149.173L272.463 148.996L273.097 148.645C275.35 147.406 277.428 145.867 279.309 144.112C279.422 144.01 279.532 143.907 279.64 143.801C280.002 143.457 280.355 143.106 280.699 142.747C280.495 142.861 280.287 142.975 280.078 143.085L280.076 143.083ZM254.501 129.301C254.5 129.025 254.506 128.751 254.522 128.477C254.546 127.919 254.595 127.361 254.683 126.81C254.796 125.986 254.978 125.17 255.215 124.37C255.251 124.303 255.289 124.236 255.329 124.17C255.271 124.22 255.212 124.269 255.153 124.318C255.091 124.368 255.03 124.418 254.968 124.468C254.891 124.532 254.813 124.594 254.733 124.654C254.653 124.715 254.573 124.776 254.493 124.834C254.159 125.081 253.814 125.312 253.457 125.526C253.44 125.588 253.426 125.648 253.408 125.709C253.365 125.871 253.322 126.031 253.281 126.194C253.22 126.417 253.164 126.64 253.108 126.862L252.787 128.443C252.77 128.542 252.749 128.64 252.727 128.737C252.723 128.757 252.72 128.777 252.715 128.797C252.703 128.856 252.689 128.914 252.679 128.974C252.667 129.033 252.657 129.093 252.649 129.153C252.66 129.133 252.674 129.115 252.686 129.099C252.829 128.912 252.986 128.739 253.158 128.584C252.938 128.907 252.759 129.248 252.615 129.6C252.6 129.637 252.585 129.676 252.569 129.715L252.568 129.719L252.525 130.032L252.413 130.829C252.404 130.896 252.393 130.964 252.383 131.03C252.354 131.23 252.325 131.429 252.314 131.63C252.296 131.876 252.276 132.122 252.257 132.366C252.36 132.233 252.463 132.1 252.568 131.968C252.58 131.951 252.593 131.937 252.606 131.92C252.612 131.871 252.62 131.824 252.627 131.778C252.765 130.871 252.95 129.973 253.178 129.085C253.434 128.038 253.747 127.008 254.108 125.989C254.063 126.23 254.021 126.471 253.985 126.711C253.898 127.288 253.855 127.868 253.833 128.448C253.813 129.027 253.812 129.608 253.844 130.183C253.845 130.188 253.844 130.19 253.845 130.194C253.845 130.228 253.849 130.259 253.852 130.294C253.934 130.185 254.014 130.076 254.095 129.965C254.154 129.886 254.213 129.808 254.269 129.729C254.308 129.677 254.346 129.625 254.385 129.571C254.405 129.546 254.423 129.518 254.442 129.492C254.462 129.465 254.482 129.438 254.5 129.41L254.501 129.409C254.5 129.373 254.5 129.337 254.502 129.301L254.501 129.301ZM263.087 115.103C263.08 115.107 263.074 115.111 263.07 115.116C263.058 115.175 263.042 115.233 263.028 115.291L263.028 115.293C263.025 115.301 263.025 115.307 263.023 115.314C263.01 115.369 262.995 115.425 262.981 115.477C262.976 115.498 262.97 115.522 262.962 115.542C262.901 115.555 262.84 115.567 262.778 115.575C262.743 115.641 262.707 115.709 262.671 115.774C262.639 115.837 262.607 115.898 262.574 115.958C262.703 115.83 262.829 115.703 262.954 115.572L262.955 115.57C262.958 115.567 262.96 115.565 262.964 115.56C262.973 115.553 262.98 115.545 262.988 115.535C263.111 115.411 263.233 115.285 263.352 115.158C263.595 114.901 263.834 114.642 264.071 114.379C263.738 114.615 263.41 114.857 263.087 115.104L263.087 115.103ZM256.405 135.284L256.406 135.28C256.428 135.216 256.451 135.15 256.476 135.085C256.568 134.825 256.666 134.566 256.767 134.306C256.535 134.495 256.31 134.693 256.095 134.901L256.095 134.902C256.049 135.089 256.005 135.276 255.961 135.463C255.947 135.521 255.935 135.58 255.921 135.639C255.912 135.671 255.905 135.705 255.897 135.738C255.794 136.269 255.681 136.799 255.603 137.333C255.55 137.637 255.509 137.945 255.472 138.253C255.347 137.818 255.259 137.372 255.192 136.922C255.171 136.781 255.15 136.642 255.131 136.502C255.13 136.493 255.13 136.487 255.128 136.48L255.129 136.478C255.073 136.063 255.025 135.648 254.971 135.232C254.939 134.955 254.903 134.677 254.868 134.4C254.908 134.188 254.95 133.975 254.993 133.765C255.033 133.583 255.074 133.399 255.12 133.219C255.256 132.645 255.414 132.078 255.597 131.52C255.648 131.367 255.7 131.217 255.757 131.066L255.759 131.058C255.802 130.936 255.844 130.819 255.893 130.698C256.253 129.749 256.686 128.836 257.182 127.944C257.343 127.644 257.511 127.349 257.686 127.053L257.686 127.051C257.699 127.026 257.713 127.003 257.728 126.979C257.873 126.73 258.022 126.483 258.173 126.236C258.225 126.149 258.275 126.063 258.329 125.976C258.44 125.789 258.555 125.602 258.67 125.416C258.757 125.276 258.844 125.134 258.933 124.994C259.024 124.842 259.116 124.691 259.207 124.539C259.301 124.382 259.396 124.223 259.491 124.066C260.081 123.081 260.652 122.085 261.178 121.06C260.739 121.586 260.316 122.124 259.902 122.668C259.902 122.669 259.899 122.671 259.899 122.673C259.87 122.711 259.84 122.751 259.812 122.79C259.45 123.267 259.098 123.749 258.748 124.235C258.536 124.525 258.328 124.82 258.124 125.118C258.123 125.121 258.119 125.125 258.117 125.13L258.117 125.132C257.946 125.38 257.778 125.63 257.609 125.881C257.388 126.221 257.173 126.566 256.963 126.916C256.828 127.143 256.695 127.373 256.566 127.606C256.542 127.652 256.517 127.699 256.491 127.744C256.201 128.295 255.93 128.858 255.693 129.437C255.445 130.067 255.227 130.712 255.071 131.37C254.916 132 254.805 132.642 254.741 133.286C254.693 132.825 254.646 132.364 254.606 131.902C254.557 131.322 254.52 130.741 254.509 130.16C254.509 130.13 254.508 130.103 254.508 130.073L254.508 130.071C254.506 130.036 254.505 130 254.506 129.967C254.504 129.949 254.504 129.932 254.505 129.916C254.499 129.941 254.492 129.966 254.49 129.991C254.477 130.041 254.465 130.092 254.456 130.142L254.456 130.143C254.454 130.149 254.451 130.152 254.447 130.157C254.44 130.165 254.435 130.172 254.43 130.181C254.424 130.187 254.419 130.194 254.415 130.201C254.333 130.31 254.251 130.418 254.168 130.524C254.153 130.542 254.138 130.562 254.122 130.582C254.046 130.68 253.968 130.777 253.889 130.872L253.889 130.873C253.932 131.422 253.99 131.966 254.061 132.507C254.108 132.877 254.163 133.245 254.223 133.612C254.257 133.82 254.292 134.03 254.329 134.237C254.334 134.283 254.343 134.33 254.351 134.375C254.368 134.471 254.383 134.567 254.403 134.662L254.402 134.664C254.537 135.44 254.687 136.21 254.854 136.986C254.875 137.073 254.896 137.158 254.919 137.244C254.919 137.244 254.918 137.246 254.92 137.247C254.919 137.255 254.922 137.26 254.923 137.267C255.043 137.734 255.187 138.196 255.384 138.635L255.393 138.653C255.675 137.515 256.013 136.389 256.405 135.284L256.405 135.284ZM254.489 129.99C254.491 129.966 254.498 129.941 254.505 129.915C254.5 129.745 254.499 129.579 254.499 129.41C254.481 129.437 254.461 129.464 254.441 129.491C254.421 129.518 254.403 129.545 254.384 129.57C254.344 129.624 254.307 129.677 254.268 129.728C254.211 129.808 254.152 129.886 254.093 129.965C254.013 130.076 253.933 130.185 253.851 130.293L253.85 130.295C253.857 130.451 253.868 130.607 253.882 130.763C253.882 130.799 253.886 130.836 253.889 130.871C253.968 130.776 254.046 130.679 254.122 130.581C254.137 130.561 254.153 130.541 254.167 130.523C254.25 130.417 254.332 130.309 254.414 130.2C254.419 130.193 254.423 130.187 254.43 130.18C254.435 130.172 254.439 130.165 254.446 130.157C254.45 130.152 254.453 130.148 254.455 130.143L254.456 130.141C254.465 130.091 254.476 130.04 254.489 129.99ZM255.834 142.553C255.856 141.865 255.928 141.185 256.06 140.504C256.238 139.669 256.382 138.823 256.622 138.003C256.66 137.862 256.697 137.72 256.734 137.576C256.738 137.553 256.74 137.53 256.744 137.506C256.811 136.99 256.912 136.48 257.006 135.969C257.101 135.536 257.19 135.104 257.301 134.675C257.295 134.677 257.292 134.68 257.287 134.683C257.279 134.688 257.271 134.692 257.263 134.698C257.076 134.816 256.893 134.94 256.712 135.067C256.612 135.135 256.514 135.205 256.416 135.276C256.413 135.279 256.408 135.281 256.404 135.284C256.013 136.389 255.675 137.515 255.392 138.653C255.399 138.67 255.407 138.688 255.416 138.705C255.408 138.785 255.397 138.863 255.389 138.942C255.339 139.481 255.292 140.021 255.274 140.562C255.235 141.391 255.233 142.222 255.265 143.053C255.267 143.096 255.269 143.138 255.273 143.182C255.354 143.105 255.437 143.03 255.521 142.959C255.561 142.922 255.603 142.886 255.647 142.85C255.689 142.814 255.731 142.778 255.775 142.743C255.793 142.728 255.811 142.713 255.83 142.699C255.832 142.651 255.832 142.603 255.835 142.553L255.834 142.553ZM280.076 143.083C279.866 143.195 279.654 143.305 279.438 143.411C279.348 143.458 279.256 143.504 279.163 143.547L279.16 143.548C278.987 143.72 278.81 143.892 278.631 144.06L278.457 144.21C278.446 144.219 278.435 144.23 278.423 144.241L278.235 144.401L277.88 144.709L277.874 144.714L277.55 144.993C277.368 145.145 277.197 145.311 277.006 145.455L276.439 145.889L275.872 146.322C275.679 146.464 275.498 146.618 275.295 146.745C275.114 146.866 274.934 146.987 274.752 147.109C274.797 147.004 274.839 146.899 274.884 146.795C274.976 146.574 275.069 146.353 275.16 146.134C275.231 145.965 275.303 145.794 275.376 145.626C275.406 145.558 275.433 145.492 275.462 145.426C275.487 145.367 275.513 145.309 275.54 145.251C275.587 145.138 275.636 145.029 275.684 144.919C275.54 144.977 275.4 145.036 275.255 145.095C275.247 145.098 275.24 145.1 275.233 145.104C275.174 145.248 275.12 145.393 275.069 145.54L275.06 145.564C275.036 145.628 275.015 145.69 274.994 145.756L274.993 145.758C274.961 145.852 274.93 145.947 274.902 146.04C274.809 146.337 274.726 146.637 274.66 146.938C274.639 147.03 274.62 147.12 274.601 147.21C274.043 147.588 273.483 147.964 272.893 148.292L272.276 148.655L271.969 148.837L271.65 148.998L270.374 149.647C270.164 149.761 269.944 149.854 269.725 149.946L269.067 150.228C268.627 150.414 268.193 150.615 267.739 150.764L266.708 151.137C267.43 150.696 268.117 150.202 268.755 149.646C268.842 149.57 268.929 149.495 269.013 149.417C269.931 148.611 270.81 147.764 271.65 146.877C271.72 146.805 271.79 146.73 271.858 146.655L271.861 146.654C271.926 146.581 271.992 146.512 272.055 146.439C272.11 146.384 272.161 146.328 272.21 146.271C272.123 146.298 272.036 146.325 271.948 146.347C271.946 146.348 271.945 146.35 271.943 146.35C271.843 146.378 271.743 146.405 271.642 146.429C271.764 146.34 271.883 146.251 272.003 146.16C272.162 146.04 272.319 145.916 272.475 145.788C272.475 145.788 272.476 145.787 272.477 145.787C272.538 145.739 272.601 145.691 272.661 145.642C272.722 145.592 272.786 145.542 272.845 145.493C272.742 145.529 272.639 145.563 272.537 145.597C272.535 145.597 272.535 145.598 272.535 145.598C272.279 145.68 272.021 145.763 271.761 145.844C271.501 145.918 271.239 145.987 270.973 146.045L270.971 146.044C270.927 146.094 270.879 146.141 270.832 146.19C270.848 146.149 270.863 146.106 270.878 146.064C270.775 146.086 270.674 146.104 270.572 146.121C270.552 146.251 270.531 146.38 270.509 146.509C270.357 146.655 270.203 146.801 270.055 146.95C270.008 147 269.96 147.046 269.913 147.093C269.498 147.505 269.057 147.885 268.615 148.267C268.441 148.415 268.269 148.566 268.098 148.718C268.098 148.718 268.096 148.719 268.095 148.721C268.071 148.74 268.049 148.762 268.026 148.781C267.47 149.254 266.881 149.671 266.262 150.046C266.12 150.134 265.977 150.217 265.833 150.3C265.428 150.527 265.015 150.74 264.591 150.937C264.649 150.809 264.705 150.679 264.756 150.55C264.788 150.47 264.819 150.388 264.847 150.306L264.86 150.268C264.879 150.215 264.896 150.164 264.912 150.113C265.035 149.741 265.13 149.357 265.199 148.97C265.22 148.859 265.238 148.748 265.253 148.637C265.259 148.603 265.263 148.571 265.267 148.536L265.268 148.535C265.269 148.524 265.27 148.514 265.272 148.504C265.274 148.491 265.275 148.478 265.275 148.463C265.28 148.438 265.282 148.413 265.285 148.387C265.289 148.371 265.291 148.353 265.29 148.336C265.3 148.259 265.308 148.18 265.312 148.101C265.327 147.957 265.335 147.81 265.338 147.664C265.344 147.482 265.343 147.301 265.337 147.12C265.33 146.878 265.313 146.636 265.284 146.396C265.279 146.346 265.271 146.295 265.264 146.244C265.257 146.195 265.249 146.146 265.241 146.097C265.224 145.981 265.203 145.866 265.177 145.75C265.145 145.583 265.104 145.415 265.056 145.249L265.057 145.247C265.046 145.201 265.031 145.158 265.017 145.113C265.001 145.057 264.984 145.003 264.961 144.946C264.912 144.786 264.85 144.628 264.781 144.471C264.773 144.45 264.764 144.429 264.754 144.409C264.75 144.397 264.743 144.386 264.738 144.374C264.739 144.421 264.738 144.467 264.739 144.512C264.74 144.516 264.739 144.518 264.74 144.522C264.74 144.613 264.742 144.704 264.743 144.793C264.743 144.885 264.743 144.976 264.745 145.067C264.745 145.133 264.746 145.198 264.746 145.264C264.746 145.314 264.746 145.367 264.747 145.42C264.747 145.603 264.745 145.784 264.743 145.966C264.743 146.021 264.741 146.075 264.739 146.129C264.737 146.227 264.735 146.324 264.731 146.421L264.73 146.423C264.728 146.477 264.727 146.529 264.723 146.583C264.725 146.596 264.723 146.608 264.723 146.621C264.717 146.752 264.71 146.882 264.703 147.012L264.702 147.014C264.702 147.045 264.699 147.078 264.697 147.109C264.688 147.237 264.679 147.366 264.669 147.493C264.658 147.641 264.644 147.79 264.629 147.936C264.628 147.952 264.624 147.968 264.623 147.983C264.618 148.048 264.61 148.111 264.601 148.175L264.6 148.177C264.594 148.257 264.584 148.338 264.574 148.416C264.558 148.541 264.542 148.668 264.521 148.794C264.514 148.852 264.506 148.911 264.496 148.969C264.48 149.077 264.462 149.184 264.444 149.291C264.384 149.646 264.314 149.998 264.236 150.351C264.234 150.363 264.23 150.376 264.228 150.388L264.226 150.394C264.213 150.454 264.2 150.515 264.184 150.575L264.183 150.577C264.14 150.779 264.09 150.979 264.039 151.182C263.829 151.27 263.62 151.352 263.409 151.431C263.261 151.485 263.115 151.538 262.967 151.588C263.71 151.552 264.456 151.493 265.199 151.42C265.396 151.4 265.591 151.377 265.787 151.35C266.854 151.183 267.908 150.976 268.949 150.718L269.865 150.482L270.769 150.209C271.041 150.135 271.3 150.036 271.564 149.944C271.634 149.917 271.705 149.889 271.774 149.86C271.452 149.92 271.131 149.978 270.81 150.048C270.443 150.122 270.073 150.204 269.707 150.294L269.851 150.236C270.076 150.148 270.3 150.059 270.515 149.95L271.822 149.329L272.147 149.173L272.463 148.996L273.097 148.645C275.35 147.406 277.428 145.867 279.309 144.112C279.422 144.01 279.532 143.907 279.64 143.801C280.002 143.457 280.355 143.106 280.699 142.747C280.495 142.861 280.287 142.975 280.078 143.085L280.076 143.083ZM254.501 129.301C254.5 129.025 254.506 128.751 254.522 128.477C254.546 127.919 254.595 127.361 254.683 126.81C254.796 125.986 254.978 125.17 255.215 124.37C255.251 124.303 255.289 124.236 255.329 124.17C255.271 124.22 255.212 124.269 255.153 124.318C255.091 124.368 255.03 124.418 254.968 124.468C254.891 124.532 254.813 124.594 254.733 124.654C254.653 124.715 254.573 124.776 254.493 124.834C254.159 125.081 253.814 125.312 253.457 125.526C253.44 125.588 253.426 125.648 253.408 125.709C253.365 125.871 253.322 126.031 253.281 126.194C253.22 126.417 253.164 126.64 253.108 126.862L252.787 128.443C252.77 128.542 252.749 128.64 252.727 128.737C252.723 128.757 252.72 128.777 252.715 128.797C252.703 128.856 252.689 128.914 252.679 128.974C252.667 129.033 252.657 129.093 252.649 129.153C252.66 129.133 252.674 129.115 252.686 129.099C252.829 128.912 252.986 128.739 253.158 128.584C252.938 128.907 252.759 129.248 252.615 129.6C252.6 129.637 252.585 129.676 252.569 129.715L252.568 129.719L252.525 130.032L252.413 130.829C252.404 130.896 252.393 130.964 252.383 131.03C252.354 131.23 252.325 131.429 252.314 131.63C252.296 131.876 252.276 132.122 252.257 132.366C252.36 132.233 252.463 132.1 252.568 131.968C252.58 131.951 252.593 131.937 252.606 131.92C252.612 131.871 252.62 131.824 252.627 131.778C252.765 130.871 252.95 129.973 253.178 129.085C253.434 128.038 253.747 127.008 254.108 125.989C254.063 126.23 254.021 126.471 253.985 126.711C253.898 127.288 253.855 127.868 253.833 128.448C253.813 129.027 253.812 129.608 253.844 130.183C253.845 130.188 253.844 130.19 253.845 130.194C253.845 130.228 253.849 130.259 253.852 130.294C253.934 130.185 254.014 130.076 254.095 129.965C254.154 129.886 254.213 129.808 254.269 129.729C254.308 129.677 254.346 129.625 254.385 129.571C254.405 129.546 254.423 129.518 254.442 129.492C254.462 129.465 254.482 129.438 254.5 129.41L254.501 129.409C254.5 129.373 254.5 129.337 254.502 129.301L254.501 129.301ZM263.087 115.103C263.08 115.107 263.074 115.111 263.07 115.116C263.058 115.175 263.042 115.233 263.028 115.291L263.028 115.293C263.025 115.301 263.025 115.307 263.023 115.314C263.01 115.369 262.995 115.425 262.981 115.477C262.976 115.498 262.97 115.522 262.962 115.542C262.901 115.555 262.84 115.567 262.778 115.575C262.743 115.641 262.707 115.709 262.671 115.774C262.639 115.837 262.607 115.898 262.574 115.958C262.703 115.83 262.829 115.703 262.954 115.572L262.955 115.57C262.958 115.567 262.96 115.565 262.964 115.56C262.973 115.553 262.98 115.545 262.988 115.535C263.111 115.411 263.233 115.285 263.352 115.158C263.595 114.901 263.834 114.642 264.071 114.379C263.738 114.615 263.41 114.857 263.087 115.104L263.087 115.103ZM256.405 135.284L256.406 135.28C256.428 135.216 256.451 135.15 256.476 135.085C256.568 134.825 256.666 134.566 256.767 134.306C256.535 134.495 256.31 134.693 256.095 134.901L256.095 134.902C256.049 135.089 256.005 135.276 255.961 135.463C255.947 135.521 255.935 135.58 255.921 135.639C255.912 135.671 255.905 135.705 255.897 135.738C255.794 136.269 255.681 136.799 255.603 137.333C255.55 137.637 255.509 137.945 255.472 138.253C255.347 137.818 255.259 137.372 255.192 136.922C255.171 136.781 255.15 136.642 255.131 136.502C255.13 136.493 255.13 136.487 255.128 136.48L255.129 136.478C255.073 136.063 255.025 135.648 254.971 135.232C254.939 134.955 254.903 134.677 254.868 134.4C254.908 134.188 254.95 133.975 254.993 133.765C255.033 133.583 255.074 133.399 255.12 133.219C255.256 132.645 255.414 132.078 255.597 131.52C255.648 131.367 255.7 131.217 255.757 131.066L255.759 131.058C255.802 130.936 255.844 130.819 255.893 130.698C256.253 129.749 256.686 128.836 257.182 127.944C257.343 127.644 257.511 127.349 257.686 127.053L257.686 127.051C257.699 127.026 257.713 127.003 257.728 126.979C257.873 126.73 258.022 126.483 258.173 126.236C258.225 126.149 258.275 126.063 258.329 125.976C258.44 125.789 258.555 125.602 258.67 125.416C258.757 125.276 258.844 125.134 258.933 124.994C259.024 124.842 259.116 124.691 259.207 124.539C259.301 124.382 259.396 124.223 259.491 124.066C260.081 123.081 260.652 122.085 261.178 121.06C260.739 121.586 260.316 122.124 259.902 122.668C259.902 122.669 259.899 122.671 259.899 122.673C259.87 122.711 259.84 122.751 259.812 122.79C259.45 123.267 259.098 123.749 258.748 124.235C258.536 124.525 258.328 124.82 258.124 125.118C258.123 125.121 258.119 125.125 258.117 125.13L258.117 125.132C257.946 125.38 257.778 125.63 257.609 125.881C257.388 126.221 257.173 126.566 256.963 126.916C256.828 127.143 256.695 127.373 256.566 127.606C256.542 127.652 256.517 127.699 256.491 127.744C256.201 128.295 255.93 128.858 255.693 129.437C255.445 130.067 255.227 130.712 255.071 131.37C254.916 132 254.805 132.642 254.741 133.286C254.693 132.825 254.646 132.364 254.606 131.902C254.557 131.322 254.52 130.741 254.509 130.16C254.509 130.13 254.508 130.103 254.508 130.073L254.508 130.071C254.506 130.036 254.505 130 254.506 129.967C254.504 129.949 254.504 129.932 254.505 129.916C254.499 129.941 254.492 129.966 254.49 129.991C254.477 130.041 254.465 130.092 254.456 130.142L254.456 130.143C254.454 130.149 254.451 130.152 254.447 130.157C254.44 130.165 254.435 130.172 254.43 130.181C254.424 130.187 254.419 130.194 254.415 130.201C254.333 130.31 254.251 130.418 254.168 130.524C254.153 130.542 254.138 130.562 254.122 130.582C254.046 130.68 253.968 130.777 253.889 130.872L253.889 130.873C253.932 131.422 253.99 131.966 254.061 132.507C254.108 132.877 254.163 133.245 254.223 133.612C254.257 133.82 254.292 134.03 254.329 134.237C254.334 134.283 254.343 134.33 254.351 134.375C254.368 134.471 254.383 134.567 254.403 134.662L254.402 134.664C254.537 135.44 254.687 136.21 254.854 136.986C254.875 137.073 254.896 137.158 254.919 137.244C254.919 137.244 254.918 137.246 254.92 137.247C254.919 137.255 254.922 137.26 254.923 137.267C255.043 137.734 255.187 138.196 255.384 138.635L255.393 138.653C255.675 137.515 256.013 136.389 256.405 135.284L256.405 135.284ZM254.489 129.99C254.491 129.966 254.498 129.941 254.505 129.915C254.5 129.745 254.499 129.579 254.499 129.41C254.481 129.437 254.461 129.464 254.441 129.491C254.421 129.518 254.403 129.545 254.384 129.57C254.344 129.624 254.307 129.677 254.268 129.728C254.211 129.808 254.152 129.886 254.093 129.965C254.013 130.076 253.933 130.185 253.851 130.293L253.85 130.295C253.857 130.451 253.868 130.607 253.882 130.763C253.882 130.799 253.886 130.836 253.889 130.871C253.968 130.776 254.046 130.679 254.122 130.581C254.137 130.561 254.153 130.541 254.167 130.523C254.25 130.417 254.332 130.309 254.414 130.2C254.419 130.193 254.423 130.187 254.43 130.18C254.435 130.172 254.439 130.165 254.446 130.157C254.45 130.152 254.453 130.148 254.455 130.143L254.456 130.141C254.465 130.091 254.476 130.04 254.489 129.99ZM255.834 142.553C255.856 141.865 255.928 141.185 256.06 140.504C256.238 139.669 256.382 138.823 256.622 138.003C256.66 137.862 256.697 137.72 256.734 137.576C256.738 137.553 256.74 137.53 256.744 137.506C256.811 136.99 256.912 136.48 257.006 135.969C257.101 135.536 257.19 135.104 257.301 134.675C257.295 134.677 257.292 134.68 257.287 134.683C257.279 134.688 257.271 134.692 257.263 134.698C257.076 134.816 256.893 134.94 256.712 135.067C256.612 135.135 256.514 135.205 256.416 135.276C256.413 135.279 256.408 135.281 256.404 135.284C256.013 136.389 255.675 137.515 255.392 138.653C255.399 138.67 255.407 138.688 255.416 138.705C255.408 138.785 255.397 138.863 255.389 138.942C255.339 139.481 255.292 140.021 255.274 140.562C255.235 141.391 255.233 142.222 255.265 143.053C255.267 143.096 255.269 143.138 255.273 143.182C255.354 143.105 255.437 143.03 255.521 142.959C255.561 142.922 255.603 142.886 255.647 142.85C255.689 142.814 255.731 142.778 255.775 142.743C255.793 142.728 255.811 142.713 255.83 142.699C255.832 142.651 255.832 142.603 255.835 142.553L255.834 142.553ZM265.694 138.295C265.694 138.289 265.696 138.281 265.698 138.276C265.706 138.228 265.714 138.182 265.723 138.132C265.711 138.143 265.698 138.153 265.686 138.164C265.414 138.402 265.139 138.638 264.862 138.87C264.795 139.232 264.735 139.597 264.68 139.961C264.946 139.746 265.21 139.526 265.471 139.303C265.491 139.286 265.512 139.268 265.529 139.251C265.58 138.932 265.636 138.612 265.694 138.295ZM270.127 134.62L270.114 134.628C270.02 134.681 269.925 134.735 269.833 134.789C269.737 134.844 269.647 134.899 269.553 134.957L269.014 135.316L268.493 135.706L268.077 136.05L267.991 136.122C267.827 136.265 267.669 136.412 267.515 136.565C267.505 136.577 267.494 136.588 267.482 136.598C267.414 136.668 267.346 136.737 267.279 136.808C267.203 136.887 267.128 136.969 267.056 137.05C266.916 137.209 266.78 137.372 266.65 137.54C266.584 137.627 266.518 137.713 266.455 137.8C266.455 137.8 266.452 137.802 266.451 137.803C266.39 137.89 266.328 137.978 266.268 138.066L265.916 138.612L265.594 139.177C265.588 139.187 265.582 139.198 265.576 139.208C265.778 139.041 265.974 138.87 266.166 138.697C266.713 138.219 267.245 137.725 267.764 137.219C267.958 137.025 268.149 136.83 268.338 136.632C268.597 136.364 268.852 136.09 269.102 135.814C269.125 135.869 269.151 135.922 269.172 135.976C269.188 136.009 269.204 136.042 269.218 136.076L269.298 136.002C269.277 135.976 269.256 135.948 269.233 135.923C269.198 135.877 269.16 135.834 269.123 135.79C269.438 135.44 269.747 135.088 270.045 134.724C270.073 134.689 270.1 134.654 270.127 134.619L270.127 134.62ZM280.076 143.083C279.866 143.195 279.654 143.305 279.438 143.411C279.348 143.458 279.256 143.504 279.163 143.547L279.16 143.548C278.987 143.72 278.81 143.892 278.631 144.06L278.457 144.21C278.446 144.219 278.435 144.23 278.423 144.241L278.235 144.401L277.88 144.709L277.874 144.714L277.55 144.993C277.368 145.145 277.197 145.311 277.006 145.455L276.439 145.889L275.872 146.322C275.679 146.464 275.498 146.618 275.295 146.745C275.114 146.866 274.934 146.987 274.752 147.109C274.797 147.004 274.839 146.899 274.884 146.795C274.976 146.574 275.069 146.353 275.16 146.134C275.231 145.965 275.303 145.794 275.376 145.626C275.406 145.558 275.433 145.492 275.462 145.426C275.487 145.367 275.513 145.309 275.54 145.251C275.587 145.138 275.636 145.029 275.684 144.919C275.54 144.977 275.4 145.036 275.255 145.095C275.247 145.098 275.24 145.1 275.233 145.104C275.174 145.248 275.12 145.393 275.069 145.54L275.06 145.564C275.036 145.628 275.015 145.69 274.994 145.756L274.993 145.758C274.961 145.852 274.93 145.947 274.902 146.04C274.809 146.337 274.726 146.637 274.66 146.938C274.639 147.03 274.62 147.12 274.601 147.21C274.043 147.588 273.483 147.964 272.893 148.292L272.276 148.655L271.969 148.837L271.65 148.998L270.374 149.647C270.164 149.761 269.944 149.854 269.725 149.946L269.067 150.228C268.627 150.414 268.193 150.615 267.739 150.764L266.708 151.137C267.43 150.696 268.117 150.202 268.755 149.646C268.842 149.57 268.929 149.495 269.013 149.417C269.931 148.611 270.81 147.764 271.65 146.877C271.72 146.805 271.79 146.73 271.858 146.655L271.861 146.654C271.926 146.581 271.992 146.512 272.055 146.439C272.11 146.384 272.161 146.328 272.21 146.271C272.123 146.298 272.036 146.325 271.948 146.347C271.946 146.348 271.945 146.35 271.943 146.35C271.843 146.378 271.743 146.405 271.642 146.429C271.764 146.34 271.883 146.251 272.003 146.16C272.162 146.04 272.319 145.916 272.475 145.788C272.475 145.788 272.476 145.787 272.477 145.787C272.538 145.739 272.601 145.691 272.661 145.642C272.722 145.592 272.786 145.542 272.845 145.493C272.742 145.529 272.639 145.563 272.537 145.597C272.535 145.597 272.535 145.598 272.535 145.598C272.279 145.68 272.021 145.763 271.761 145.844C271.501 145.918 271.239 145.987 270.973 146.045L270.971 146.044C270.927 146.094 270.879 146.141 270.832 146.19C270.848 146.149 270.863 146.106 270.878 146.064C270.775 146.086 270.674 146.104 270.572 146.121C270.552 146.251 270.531 146.38 270.509 146.509C270.357 146.655 270.203 146.801 270.055 146.95C270.008 147 269.96 147.046 269.913 147.093C269.498 147.505 269.057 147.885 268.615 148.267C268.441 148.415 268.269 148.566 268.098 148.718C268.098 148.718 268.096 148.719 268.095 148.721C268.071 148.74 268.049 148.762 268.026 148.781C267.47 149.254 266.881 149.671 266.262 150.046C266.12 150.134 265.977 150.217 265.833 150.3C265.428 150.527 265.015 150.74 264.591 150.937C264.649 150.809 264.705 150.679 264.756 150.55C264.788 150.47 264.819 150.388 264.847 150.306L264.86 150.268C264.879 150.215 264.896 150.164 264.912 150.113C265.035 149.741 265.13 149.357 265.199 148.97C265.22 148.859 265.238 148.748 265.253 148.637C265.259 148.603 265.263 148.571 265.267 148.536L265.268 148.535C265.269 148.524 265.27 148.514 265.272 148.504C265.274 148.491 265.275 148.478 265.275 148.463C265.28 148.438 265.282 148.413 265.285 148.387C265.289 148.371 265.291 148.353 265.29 148.336C265.3 148.259 265.308 148.18 265.312 148.101C265.327 147.957 265.335 147.81 265.338 147.664C265.344 147.482 265.343 147.301 265.337 147.12C265.33 146.878 265.313 146.636 265.284 146.396C265.279 146.346 265.271 146.295 265.264 146.244C265.257 146.195 265.249 146.146 265.241 146.097C265.224 145.981 265.203 145.866 265.177 145.75C265.145 145.583 265.104 145.415 265.056 145.249L265.057 145.247C265.046 145.201 265.031 145.158 265.017 145.113C265.001 145.057 264.984 145.003 264.961 144.946C264.912 144.786 264.85 144.628 264.781 144.471C264.773 144.45 264.764 144.429 264.754 144.409C264.75 144.397 264.743 144.386 264.738 144.374C264.739 144.421 264.738 144.467 264.739 144.512C264.74 144.516 264.739 144.518 264.74 144.522C264.74 144.613 264.742 144.704 264.743 144.793C264.743 144.885 264.743 144.976 264.745 145.067C264.745 145.133 264.746 145.198 264.746 145.264C264.746 145.314 264.746 145.367 264.747 145.42C264.747 145.603 264.745 145.784 264.743 145.966C264.743 146.021 264.741 146.075 264.739 146.129C264.737 146.227 264.735 146.324 264.731 146.421L264.73 146.423C264.728 146.477 264.727 146.529 264.723 146.583C264.725 146.596 264.723 146.608 264.723 146.621C264.717 146.752 264.71 146.882 264.703 147.012L264.702 147.014C264.702 147.045 264.699 147.078 264.697 147.109C264.688 147.237 264.679 147.366 264.669 147.493C264.658 147.641 264.644 147.79 264.629 147.936C264.628 147.952 264.624 147.968 264.623 147.983C264.618 148.048 264.61 148.111 264.601 148.175L264.6 148.177C264.594 148.257 264.584 148.338 264.574 148.416C264.558 148.541 264.542 148.668 264.521 148.794C264.514 148.852 264.506 148.911 264.496 148.969C264.48 149.077 264.462 149.184 264.444 149.291C264.384 149.646 264.314 149.998 264.236 150.351C264.234 150.363 264.23 150.376 264.228 150.388L264.226 150.394C264.213 150.454 264.2 150.515 264.184 150.575L264.183 150.577C264.14 150.779 264.09 150.979 264.039 151.182C263.829 151.27 263.62 151.352 263.409 151.431C263.261 151.485 263.115 151.538 262.967 151.588C263.71 151.552 264.456 151.493 265.199 151.42C265.396 151.4 265.591 151.377 265.787 151.35C266.854 151.183 267.908 150.976 268.949 150.718L269.865 150.482L270.769 150.209C271.041 150.135 271.3 150.036 271.564 149.944C271.634 149.917 271.705 149.889 271.774 149.86C271.452 149.92 271.131 149.978 270.81 150.048C270.443 150.122 270.073 150.204 269.707 150.294L269.851 150.236C270.076 150.148 270.3 150.059 270.515 149.95L271.822 149.329L272.147 149.173L272.463 148.996L273.097 148.645C275.35 147.406 277.428 145.867 279.309 144.112C279.422 144.01 279.532 143.907 279.64 143.801C280.002 143.457 280.355 143.106 280.699 142.747C280.495 142.861 280.287 142.975 280.078 143.085L280.076 143.083ZM268.256 136.688L267.824 137.012L267.407 137.358C266.948 137.759 266.53 138.208 266.167 138.697C266.714 138.219 267.245 137.725 267.765 137.218C267.959 137.025 268.15 136.83 268.339 136.632L268.256 136.688L268.256 136.688ZM255.131 136.502C255.13 136.493 255.13 136.487 255.128 136.48L255.129 136.478C255.072 136.063 255.025 135.648 254.971 135.232C254.938 134.955 254.902 134.677 254.868 134.4C254.907 134.188 254.95 133.975 254.993 133.765C255.033 133.583 255.074 133.399 255.119 133.219C255.255 132.644 255.414 132.078 255.597 131.52C255.648 131.367 255.7 131.217 255.756 131.066L255.759 131.058C255.801 130.936 255.844 130.818 255.892 130.698C256.253 129.749 256.686 128.836 257.182 127.944C257.343 127.644 257.511 127.348 257.685 127.053L257.686 127.051C257.699 127.026 257.713 127.003 257.728 126.979C257.873 126.73 258.022 126.483 258.173 126.236C258.224 126.148 258.275 126.063 258.328 125.976C258.44 125.789 258.555 125.602 258.67 125.416C258.757 125.276 258.844 125.133 258.933 124.993C259.023 124.841 259.116 124.69 259.206 124.539C259.301 124.382 259.396 124.223 259.49 124.066C260.08 123.081 260.651 122.084 261.177 121.06C260.738 121.586 260.316 122.124 259.902 122.667C259.901 122.669 259.899 122.671 259.898 122.672C259.87 122.711 259.839 122.751 259.811 122.79C259.45 123.267 259.097 123.749 258.748 124.234C258.535 124.525 258.328 124.819 258.124 125.118C258.122 125.121 258.119 125.124 258.117 125.13L258.116 125.132C257.946 125.38 257.777 125.63 257.608 125.88C257.387 126.221 257.173 126.565 256.963 126.916C256.828 127.143 256.695 127.373 256.566 127.606C256.541 127.652 256.517 127.699 256.49 127.744C256.2 128.295 255.929 128.858 255.692 129.437C255.445 130.067 255.227 130.712 255.071 131.37C254.915 132 254.804 132.642 254.741 133.286C254.692 132.824 254.646 132.364 254.606 131.901C254.556 131.322 254.52 130.74 254.509 130.16C254.508 130.13 254.508 130.102 254.507 130.073L254.508 130.071C254.505 130.036 254.505 130 254.506 129.967C254.499 129.975 254.495 129.982 254.489 129.991C254.476 130.041 254.465 130.092 254.456 130.141L254.455 130.143C254.453 130.149 254.45 130.152 254.446 130.157C254.439 130.165 254.435 130.172 254.43 130.181C254.423 130.187 254.419 130.194 254.414 130.201C254.332 130.309 254.251 130.418 254.167 130.524C254.153 130.542 254.137 130.562 254.122 130.582C254.046 130.68 253.968 130.777 253.889 130.871L253.888 130.873C253.932 131.421 253.989 131.966 254.061 132.507C254.107 132.877 254.163 133.245 254.223 133.612C254.256 133.82 254.291 134.03 254.329 134.236C254.334 134.282 254.343 134.33 254.35 134.375C254.367 134.471 254.383 134.567 254.402 134.662L254.402 134.664C254.537 135.44 254.687 136.21 254.854 136.986C254.874 137.073 254.895 137.158 254.918 137.244C254.918 137.244 254.918 137.246 254.919 137.246C254.919 137.255 254.921 137.26 254.923 137.267C254.971 137.079 255.021 136.894 255.074 136.708C255.094 136.639 255.113 136.572 255.131 136.502L255.131 136.502ZM263.087 115.103C263.079 115.107 263.074 115.111 263.07 115.116C263.058 115.175 263.042 115.233 263.028 115.291L263.027 115.293C263.025 115.301 263.025 115.307 263.022 115.314C263.01 115.369 262.994 115.425 262.98 115.477C262.975 115.498 262.969 115.522 262.962 115.542C262.901 115.555 262.84 115.567 262.778 115.575C262.742 115.641 262.706 115.709 262.671 115.774C262.639 115.837 262.607 115.898 262.573 115.958C262.702 115.83 262.828 115.703 262.954 115.571L262.954 115.57C262.957 115.566 262.96 115.565 262.964 115.56C262.973 115.553 262.98 115.545 262.987 115.535C263.111 115.411 263.232 115.285 263.352 115.158C263.595 114.901 263.834 114.642 264.071 114.379C263.738 114.615 263.41 114.857 263.086 115.103L263.087 115.103ZM256.095 134.901L256.094 134.903C256.048 135.089 256.005 135.276 255.961 135.463C255.947 135.522 255.935 135.581 255.921 135.639C256.001 135.578 256.081 135.518 256.163 135.458C256.211 135.424 256.256 135.389 256.304 135.355C256.338 135.331 256.371 135.308 256.404 135.284L256.406 135.281C256.428 135.217 256.451 135.151 256.475 135.085C256.568 134.825 256.666 134.566 256.767 134.306C256.535 134.495 256.31 134.693 256.095 134.901L256.095 134.901ZM254.489 129.99C254.494 129.981 254.498 129.974 254.505 129.966C254.503 129.949 254.503 129.932 254.504 129.915C254.5 129.745 254.499 129.579 254.498 129.41C254.48 129.437 254.46 129.464 254.44 129.491C254.421 129.518 254.403 129.545 254.383 129.57C254.344 129.624 254.307 129.676 254.268 129.728C254.211 129.808 254.152 129.886 254.093 129.965C254.012 130.076 253.932 130.185 253.85 130.293L253.85 130.295C253.857 130.451 253.868 130.607 253.881 130.763C253.881 130.799 253.885 130.836 253.888 130.871C253.967 130.776 254.045 130.679 254.121 130.581C254.137 130.561 254.152 130.541 254.167 130.523C254.25 130.417 254.332 130.309 254.414 130.2C254.418 130.193 254.423 130.186 254.429 130.18C254.434 130.171 254.439 130.165 254.446 130.156C254.45 130.151 254.453 130.148 254.455 130.143L254.455 130.141C254.464 130.091 254.476 130.04 254.489 129.99ZM271.5 122.961C271.084 123.384 270.665 123.801 270.242 124.212L270.24 124.214C270.231 124.225 270.222 124.239 270.214 124.251C270.158 124.327 270.103 124.402 270.051 124.477C270.012 124.53 269.974 124.585 269.936 124.639C269.924 124.656 269.914 124.672 269.902 124.688C269.8 124.836 269.7 124.987 269.601 125.138C269.503 125.287 269.406 125.439 269.311 125.589C269.279 125.639 269.247 125.691 269.216 125.742C269.159 125.836 269.101 125.929 269.047 126.024C269.004 126.092 268.965 126.163 268.925 126.23C268.867 126.329 268.81 126.428 268.754 126.527C269.16 126.158 269.557 125.78 269.944 125.393C269.982 125.356 270.018 125.318 270.056 125.281C270.059 125.28 270.06 125.278 270.06 125.276C270.094 125.214 270.131 125.151 270.169 125.09C270.236 124.974 270.305 124.857 270.378 124.743C270.424 124.664 270.473 124.584 270.523 124.507C270.537 124.485 270.551 124.462 270.568 124.439C270.636 124.327 270.708 124.218 270.782 124.106C270.868 123.974 270.958 123.841 271.048 123.71C271.161 123.543 271.276 123.376 271.395 123.213C271.409 123.193 271.425 123.171 271.44 123.151C271.521 123.04 271.602 122.927 271.687 122.817C271.741 122.745 271.796 122.672 271.852 122.601C271.735 122.72 271.617 122.841 271.5 122.961L271.5 122.961ZM274.4 142.274C274.154 142.515 273.898 142.749 273.639 142.979C273.504 143.15 273.365 143.32 273.225 143.487C273.224 143.488 273.223 143.489 273.222 143.49C273.133 143.596 273.045 143.704 272.955 143.81C273.108 143.667 273.26 143.522 273.408 143.373C273.555 143.228 273.698 143.082 273.842 142.934C273.849 142.928 273.852 142.923 273.859 142.916C274.21 142.554 274.552 142.182 274.884 141.8C274.726 141.96 274.563 142.118 274.4 142.274ZM280.704 142.584C280.61 142.636 280.514 142.687 280.421 142.738C280.327 142.79 280.231 142.841 280.136 142.892C280.019 142.955 279.9 143.017 279.779 143.076C279.756 143.089 279.73 143.103 279.704 143.115C279.679 143.127 279.653 143.142 279.628 143.154C279.588 143.176 279.548 143.196 279.503 143.216C279.5 143.217 279.498 143.218 279.497 143.22C279.386 143.329 279.274 143.438 279.163 143.547L279.16 143.548C278.987 143.719 278.809 143.892 278.631 144.059L278.457 144.21C278.445 144.218 278.435 144.229 278.423 144.24L278.235 144.4L277.879 144.709L277.874 144.713L277.549 144.992C277.368 145.145 277.197 145.31 277.006 145.455L276.439 145.888L275.871 146.321C275.679 146.463 275.497 146.617 275.295 146.745C275.114 146.866 274.933 146.986 274.752 147.109C274.796 147.004 274.839 146.899 274.884 146.794C274.975 146.573 275.069 146.353 275.159 146.134C275.231 145.965 275.303 145.794 275.376 145.625C275.406 145.558 275.433 145.491 275.462 145.425C275.487 145.367 275.513 145.308 275.54 145.25C275.587 145.138 275.635 145.029 275.684 144.919C275.714 144.851 275.744 144.784 275.775 144.717C275.785 144.693 275.795 144.671 275.806 144.647C275.846 144.556 275.888 144.465 275.928 144.374C275.773 144.438 275.617 144.5 275.461 144.56C275.409 144.674 275.361 144.788 275.314 144.904C275.285 144.97 275.258 145.037 275.233 145.103C275.174 145.248 275.12 145.393 275.069 145.539L275.06 145.564C275.036 145.627 275.015 145.689 274.994 145.756L274.993 145.758C274.96 145.852 274.93 145.947 274.901 146.04C274.809 146.336 274.726 146.636 274.66 146.937C274.638 147.029 274.62 147.12 274.601 147.21C274.043 147.587 273.483 147.964 272.893 148.292L272.276 148.655L271.969 148.837L271.65 148.998L270.374 149.646C270.163 149.761 269.944 149.853 269.724 149.946L269.066 150.227C268.627 150.414 268.193 150.615 267.739 150.763L266.708 151.136C267.43 150.696 268.117 150.201 268.754 149.645C268.842 149.57 268.929 149.495 269.013 149.417C269.931 148.61 270.81 147.763 271.65 146.877C271.72 146.804 271.79 146.729 271.858 146.654L271.86 146.653C271.926 146.581 271.992 146.511 272.055 146.439C272.11 146.384 272.161 146.328 272.21 146.271C272.284 146.193 272.354 146.112 272.423 146.033C272.591 145.847 272.756 145.658 272.918 145.468C272.953 145.427 272.989 145.385 273.025 145.343C273.159 145.187 273.292 145.029 273.422 144.867C273.442 144.847 273.46 144.824 273.477 144.8C273.366 144.846 273.253 144.893 273.14 144.938C272.647 145.141 272.153 145.349 271.659 145.536C271.549 145.578 271.44 145.619 271.331 145.657L271.026 145.987C271.009 146.006 270.99 146.025 270.973 146.044L270.971 146.044C270.926 146.093 270.878 146.14 270.832 146.189C270.848 146.149 270.863 146.105 270.878 146.064C270.913 145.967 270.945 145.87 270.976 145.774C271.011 145.661 271.046 145.548 271.077 145.434C271.103 145.342 271.126 145.249 271.151 145.154C271.165 145.096 271.179 145.038 271.191 144.978C271.243 144.761 271.286 144.54 271.321 144.318C271.35 144.143 271.375 143.966 271.395 143.788C271.464 143.194 271.479 142.593 271.45 141.995C271.466 141.972 271.482 141.945 271.499 141.922L271.789 141.468L272.066 141.008L272.331 140.538C272.524 140.186 272.697 139.822 272.852 139.453C272.994 139.336 273.134 139.212 273.265 139.082C273.501 138.857 273.722 138.613 273.925 138.357C274.047 138.207 274.162 138.051 274.271 137.893C274.527 137.527 274.752 137.14 274.945 136.735C274.944 136.694 274.943 136.656 274.944 136.616C274.941 136.472 274.94 136.329 274.939 136.185C274.938 135.637 274.946 135.096 274.955 134.554C274.92 134.709 274.882 134.863 274.839 135.015C274.619 135.828 274.312 136.616 273.925 137.371C273.885 137.45 273.845 137.529 273.804 137.607C273.624 137.936 273.428 138.258 273.218 138.573C273.192 138.612 273.166 138.649 273.14 138.689C273.155 138.645 273.171 138.605 273.184 138.561C273.194 138.533 273.204 138.504 273.212 138.475C273.424 137.821 273.59 137.149 273.709 136.472C273.831 135.765 273.905 135.049 273.889 134.33C273.655 135.011 273.443 135.683 273.22 136.349L273.186 136.447C272.975 137.081 272.75 137.705 272.519 138.328L271.915 139.942L271.84 140.148L271.838 140.152L271.786 140.289L271.6 140.783L271.594 140.802L271.5 141.035L271.406 141.271L271.394 141.299C271.392 141.286 271.393 141.273 271.391 141.26C271.389 141.236 271.386 141.212 271.382 141.189L271.382 141.187C271.379 141.155 271.375 141.124 271.367 141.091C271.351 140.949 271.33 140.809 271.303 140.667C271.3 140.628 271.294 140.59 271.285 140.551C271.262 140.417 271.236 140.284 271.207 140.149C271.204 140.133 271.2 140.12 271.195 140.103C271.06 139.485 270.872 138.881 270.63 138.297C270.352 137.622 270.004 136.973 269.584 136.38C269.501 136.261 269.415 136.147 269.325 136.034C269.317 136.022 269.308 136.011 269.299 136.001C269.278 135.975 269.257 135.947 269.234 135.922C269.199 135.876 269.161 135.833 269.124 135.789C269.439 135.439 269.748 135.087 270.045 134.723C270.074 134.688 270.101 134.653 270.128 134.618L270.129 134.617C270.205 134.525 270.278 134.435 270.35 134.342C270.947 133.582 271.505 132.792 272.008 131.968C272.597 131.008 273.119 130.003 273.541 128.961C273.837 128.211 274.098 127.446 274.298 126.669C274.377 126.364 274.446 126.055 274.504 125.742C274.422 126.002 274.336 126.263 274.246 126.52C273.967 127.314 273.643 128.089 273.268 128.837C272.781 129.833 272.209 130.785 271.589 131.699C270.572 133.191 269.403 134.572 268.137 135.859C267.854 136.147 267.566 136.43 267.273 136.71C267.221 136.761 267.168 136.81 267.116 136.86C266.673 137.285 266.216 137.697 265.753 138.104C265.744 138.113 265.733 138.12 265.723 138.129L265.723 138.131C265.711 138.141 265.698 138.152 265.686 138.163C265.414 138.401 265.139 138.636 264.862 138.869C264.796 139.231 264.735 139.595 264.68 139.96C264.946 139.745 265.21 139.525 265.471 139.301C265.491 139.285 265.512 139.267 265.529 139.25C265.548 139.237 265.563 139.224 265.576 139.209L265.577 139.207C265.779 139.04 265.974 138.869 266.167 138.696C266.714 138.218 267.245 137.724 267.765 137.218C267.958 137.024 268.15 136.829 268.339 136.631C268.598 136.363 268.853 136.089 269.103 135.813C269.126 135.868 269.152 135.921 269.173 135.975C269.189 136.008 269.205 136.041 269.218 136.075C269.222 136.078 269.222 136.082 269.225 136.087C269.287 136.229 269.348 136.37 269.406 136.512C269.677 137.163 269.916 137.816 270.111 138.48C270.322 139.215 270.489 139.955 270.604 140.704C270.619 140.805 270.634 140.903 270.647 141.004C270.652 141.044 270.658 141.083 270.66 141.124C270.667 141.165 270.673 141.204 270.677 141.246C270.681 141.277 270.685 141.31 270.689 141.341C270.707 141.505 270.724 141.669 270.739 141.834C270.743 141.871 270.747 141.907 270.749 141.945L270.748 141.947C270.809 142.711 270.817 143.485 270.777 144.257C270.776 144.271 270.776 144.284 270.773 144.298C270.753 144.649 270.722 145 270.68 145.35C270.672 145.404 270.666 145.457 270.658 145.511L270.657 145.513C270.646 145.604 270.634 145.695 270.621 145.787C270.617 145.817 270.613 145.847 270.609 145.877C270.598 145.958 270.585 146.038 270.571 146.119C270.551 146.249 270.53 146.378 270.508 146.508C270.356 146.653 270.202 146.8 270.054 146.949C270.008 146.998 269.96 147.045 269.912 147.091C269.497 147.504 269.056 147.883 268.614 148.265C268.44 148.414 268.268 148.564 268.097 148.716C268.097 148.716 268.095 148.717 268.094 148.719C268.071 148.738 268.048 148.76 268.025 148.779C267.469 149.252 266.88 149.669 266.261 150.045C266.119 150.132 265.977 150.215 265.832 150.298C265.427 150.526 265.014 150.739 264.59 150.935C264.649 150.808 264.704 150.678 264.756 150.548C264.787 150.469 264.818 150.386 264.847 150.304L264.86 150.266C264.878 150.214 264.896 150.163 264.911 150.111C265.034 149.739 265.129 149.355 265.198 148.968C265.22 148.858 265.237 148.746 265.252 148.636C265.258 148.602 265.263 148.57 265.266 148.535L265.267 148.533C265.268 148.523 265.27 148.513 265.271 148.503C265.274 148.489 265.274 148.476 265.275 148.462C265.279 148.436 265.282 148.412 265.284 148.385C265.288 148.37 265.29 148.351 265.289 148.334C265.299 148.258 265.308 148.178 265.312 148.1C265.326 147.955 265.335 147.809 265.337 147.662C265.343 147.481 265.343 147.3 265.336 147.118C265.329 146.876 265.312 146.634 265.284 146.395C265.278 146.344 265.27 146.293 265.263 146.242C265.256 146.194 265.248 146.144 265.24 146.095C265.223 145.98 265.202 145.865 265.177 145.749C265.144 145.582 265.103 145.414 265.056 145.248L265.056 145.246C265.045 145.2 265.03 145.157 265.016 145.112C265 145.056 264.983 145.001 264.96 144.945C264.911 144.784 264.85 144.627 264.78 144.47C264.773 144.448 264.763 144.428 264.753 144.408C264.749 144.396 264.742 144.385 264.738 144.373C264.738 144.419 264.737 144.465 264.739 144.51C264.739 144.514 264.739 144.516 264.739 144.521C264.739 144.611 264.741 144.703 264.742 144.791C264.742 144.884 264.742 144.975 264.744 145.066C264.745 145.131 264.745 145.197 264.746 145.262C264.745 145.312 264.746 145.365 264.746 145.418C264.746 145.602 264.744 145.782 264.742 145.965C264.742 146.019 264.74 146.074 264.738 146.128C264.736 146.226 264.734 146.322 264.73 146.42L264.729 146.421C264.727 146.476 264.726 146.528 264.722 146.581C264.724 146.595 264.722 146.607 264.722 146.619C264.716 146.75 264.709 146.88 264.702 147.01L264.701 147.012C264.701 147.044 264.698 147.076 264.696 147.107C264.687 147.235 264.678 147.364 264.668 147.491C264.657 147.639 264.643 147.788 264.628 147.935C264.627 147.951 264.623 147.967 264.623 147.981C264.617 148.047 264.61 148.109 264.6 148.174L264.599 148.176C264.593 148.255 264.584 148.337 264.573 148.415C264.557 148.54 264.541 148.667 264.52 148.792C264.513 148.851 264.505 148.909 264.496 148.967C264.479 149.075 264.461 149.183 264.443 149.29C264.383 149.644 264.314 149.997 264.236 150.349C264.234 150.361 264.229 150.374 264.227 150.386L264.225 150.392C264.212 150.453 264.2 150.514 264.183 150.574L264.183 150.575C264.14 150.778 264.09 150.977 264.038 151.181C263.828 151.268 263.619 151.351 263.408 151.43C263.261 151.484 263.114 151.536 262.966 151.586C263.709 151.551 264.455 151.491 265.198 151.418C265.395 151.398 265.59 151.375 265.787 151.349C266.854 151.182 267.907 150.974 268.949 150.716L269.865 150.48L270.768 150.208C271.04 150.133 271.3 150.034 271.563 149.942C271.633 149.916 271.704 149.888 271.773 149.859C271.452 149.918 271.13 149.977 270.809 150.047C270.442 150.12 270.072 150.202 269.706 150.292L269.851 150.235C270.075 150.146 270.299 150.058 270.514 149.949L271.821 149.328L272.147 149.171L272.463 148.995L273.096 148.643C275.35 147.405 277.428 145.866 279.308 144.11C279.422 144.008 279.531 143.905 279.64 143.8C280.001 143.455 280.355 143.104 280.698 142.745C280.807 142.633 280.913 142.523 281.019 142.41C280.915 142.468 280.81 142.527 280.706 142.585L280.704 142.584Z" />
+    <path d="M264.626 147.981C264.627 147.966 264.63 147.95 264.632 147.934C264.589 147.869 264.552 147.799 264.515 147.729C264.411 147.524 264.328 147.31 264.266 147.093C264.233 146.987 264.209 146.881 264.186 146.775C264.05 146.119 264.043 145.457 264.077 144.814C264.116 144.166 264.197 143.545 264.261 142.917C264.329 142.289 264.41 141.662 264.489 141.037C264.527 140.747 264.567 140.455 264.609 140.164C264.614 140.111 264.623 140.057 264.631 140.003C264.636 139.999 264.642 139.995 264.649 139.988C264.66 139.98 264.671 139.971 264.684 139.961C264.738 139.596 264.799 139.232 264.866 138.869C265.074 137.703 265.325 136.543 265.633 135.395C265.713 135.102 265.799 134.812 265.887 134.522C265.914 134.439 265.939 134.353 265.966 134.27C266.011 134.127 266.056 133.987 266.102 133.847C266.122 133.783 266.142 133.72 266.164 133.656C266.071 133.664 265.979 133.672 265.888 133.682C265.897 133.65 265.907 133.615 265.914 133.582C265.913 133.579 265.911 133.579 265.908 133.58C265.899 133.614 265.889 133.649 265.881 133.684C265.872 133.71 265.865 133.735 265.858 133.762L265.855 133.772C265.847 133.805 265.837 133.84 265.828 133.872C265.813 133.928 265.798 133.982 265.785 134.039C265.742 134.199 265.701 134.361 265.662 134.523C265.617 134.699 265.573 134.875 265.533 135.053C265.504 135.172 265.476 135.29 265.449 135.409C265.416 135.546 265.386 135.682 265.357 135.82C265.317 135.996 265.279 136.172 265.243 136.349C265.202 136.541 265.163 136.734 265.125 136.927C265.101 137.045 265.079 137.162 265.056 137.278C265.023 137.452 264.99 137.626 264.96 137.799C264.889 138.185 264.822 138.572 264.76 138.959C264.751 139.013 264.742 139.065 264.736 139.12C264.708 139.285 264.682 139.451 264.657 139.619C264.635 139.757 264.614 139.895 264.596 140.034C264.588 140.088 264.58 140.14 264.572 140.194C264.522 140.539 264.474 140.883 264.43 141.228C264.351 141.853 264.27 142.48 264.202 143.107C264.138 143.736 264.057 144.357 264.018 145.005C263.984 145.648 263.991 146.309 264.127 146.966C264.136 147.007 264.145 147.05 264.156 147.091C264.222 147.375 264.322 147.657 264.456 147.92C264.475 147.956 264.494 147.992 264.515 148.029C264.534 148.061 264.551 148.094 264.573 148.125C264.579 148.137 264.587 148.149 264.594 148.16C264.597 148.165 264.601 148.171 264.603 148.176L264.604 148.174C264.614 148.11 264.621 148.047 264.627 147.981L264.626 147.981ZM266.436 131.859C266.398 131.969 266.364 132.079 266.328 132.188C266.308 132.253 266.286 132.315 266.269 132.379C266.322 132.205 266.378 132.033 266.436 131.859ZM260.261 140.725C260.219 140.73 260.178 140.734 260.137 140.741C260.063 140.749 259.991 140.762 259.917 140.775C259.863 140.785 259.809 140.796 259.754 140.807C259.672 140.82 259.589 140.84 259.509 140.858C259.468 140.867 259.428 140.877 259.389 140.888C259.359 140.895 259.33 140.904 259.301 140.911C259.284 140.916 259.268 140.92 259.251 140.925C259.152 140.952 259.051 140.98 258.954 141.012C258.905 141.026 258.857 141.043 258.809 141.059L258.807 141.06C258.678 141.102 258.553 141.147 258.429 141.196C258.414 141.202 258.4 141.207 258.385 141.213C258.325 141.236 258.264 141.259 258.204 141.285C258.168 141.299 258.133 141.315 258.098 141.33C258.08 141.339 258.061 141.347 258.043 141.355L258.041 141.355C257.482 141.599 256.948 141.896 256.446 142.242L256.446 142.244C256.394 142.279 256.341 142.315 256.29 142.352L256.137 142.464C256.115 142.479 256.095 142.496 256.072 142.513C255.992 142.574 255.913 142.637 255.832 142.699C255.813 142.714 255.795 142.728 255.777 142.743C255.733 142.779 255.691 142.815 255.649 142.851C255.605 142.886 255.563 142.922 255.523 142.959C255.439 143.031 255.356 143.106 255.275 143.182L255.274 143.184C255.286 143.454 255.303 143.723 255.321 143.99C255.324 144.035 255.329 144.077 255.333 144.121C255.48 143.995 255.628 143.871 255.779 143.751C255.8 143.733 255.823 143.715 255.844 143.697C255.87 143.677 255.894 143.656 255.92 143.635C255.996 143.575 256.071 143.515 256.147 143.455C256.236 143.387 256.325 143.319 256.413 143.253C256.434 143.235 256.457 143.219 256.479 143.202C256.523 143.168 256.566 143.135 256.611 143.102C256.928 142.867 257.252 142.64 257.578 142.42L257.579 142.418C257.583 142.418 257.586 142.416 257.589 142.413C257.625 142.39 257.663 142.365 257.698 142.342C257.723 142.325 257.748 142.308 257.776 142.293C257.779 142.29 257.78 142.288 257.783 142.287C257.832 142.253 257.884 142.22 257.937 142.188C257.956 142.176 257.975 142.164 257.994 142.151C258.104 142.078 258.217 142.007 258.333 141.938C258.35 141.925 258.369 141.915 258.387 141.904C258.42 141.882 258.454 141.862 258.487 141.842C258.616 141.762 258.746 141.683 258.878 141.607C258.992 141.539 259.105 141.473 259.224 141.409C259.24 141.4 259.258 141.389 259.274 141.38L259.275 141.378C259.387 141.316 259.494 141.256 259.604 141.193C259.761 141.106 259.917 141.02 260.076 140.932C260.214 140.855 260.355 140.778 260.495 140.7C260.417 140.707 260.338 140.715 260.259 140.726L260.261 140.725ZM262.864 131.592C262.767 131.604 262.668 131.621 262.572 131.638C262.458 131.658 262.345 131.679 262.232 131.703C262.182 131.714 262.132 131.724 262.081 131.736C262.054 131.741 262.029 131.747 262.001 131.754C261.993 131.76 261.988 131.768 261.981 131.775C261.954 131.805 261.928 131.838 261.898 131.868C261.915 131.832 261.932 131.8 261.951 131.764C261.931 131.768 261.913 131.772 261.892 131.777C261.779 131.804 261.666 131.832 261.555 131.861C261.522 131.995 261.492 132.129 261.468 132.267C261.383 132.376 261.298 132.488 261.219 132.599C261.164 132.675 261.11 132.751 261.059 132.826C261.092 132.814 261.126 132.801 261.16 132.789C261.316 132.734 261.474 132.679 261.63 132.628C261.704 132.605 261.775 132.582 261.846 132.56C261.953 132.525 262.059 132.492 262.166 132.462C262.188 132.455 262.211 132.448 262.235 132.441C262.212 132.446 262.19 132.453 262.167 132.46L262.36 132.23L262.539 132.021C262.663 131.874 262.786 131.732 262.913 131.586C262.896 131.586 262.88 131.589 262.864 131.592L262.864 131.592ZM255.263 144.18C255.209 144.228 255.152 144.276 255.098 144.327C255.176 144.257 255.254 144.189 255.334 144.122C255.31 144.142 255.287 144.161 255.263 144.18L255.263 144.18ZM284.388 141.041C284.409 141.022 284.432 141.005 284.454 140.985C284.457 140.982 284.458 140.98 284.461 140.977C284.437 140.998 284.412 141.019 284.388 141.041ZM281.133 143.065C280.939 143.17 280.741 143.272 280.543 143.37C280.332 143.474 280.12 143.577 279.906 143.675C279.818 143.717 279.73 143.758 279.642 143.799C280.004 143.455 280.357 143.103 280.701 142.744C280.497 142.859 280.289 142.972 280.08 143.083C279.87 143.196 279.658 143.305 279.442 143.411C279.352 143.458 279.26 143.504 279.167 143.548L279.164 143.549C279.07 143.594 278.977 143.64 278.885 143.682C278.586 143.966 278.28 144.241 277.968 144.51C277.847 144.615 277.725 144.718 277.603 144.821C277.695 144.786 277.785 144.752 277.878 144.714C277.917 144.698 277.955 144.684 277.993 144.668C278.054 144.643 278.118 144.618 278.18 144.591C278.211 144.579 278.244 144.565 278.275 144.553C278.41 144.498 278.545 144.442 278.679 144.385C278.891 144.296 279.102 144.203 279.311 144.11C279.404 144.068 279.496 144.026 279.589 143.983C279.629 143.965 279.671 143.948 279.712 143.928C279.753 143.911 279.794 143.891 279.834 143.872C280.053 143.77 280.268 143.666 280.484 143.56C280.573 143.515 280.665 143.47 280.755 143.424L280.755 143.422C280.77 143.414 280.786 143.407 280.799 143.399C280.892 143.351 280.984 143.303 281.075 143.255C281.085 143.25 281.093 143.244 281.103 143.239C281.189 143.193 281.274 143.147 281.358 143.1C281.453 143.046 281.547 142.993 281.64 142.941C281.828 142.833 282.014 142.721 282.198 142.61C282.219 142.598 282.238 142.584 282.257 142.572C281.89 142.745 281.514 142.906 281.134 143.065L281.133 143.065ZM275.259 145.094C275.251 145.098 275.244 145.1 275.236 145.104C275.122 145.148 275.008 145.197 274.893 145.243C274.299 145.488 273.706 145.739 273.11 145.962C272.984 146.011 272.856 146.058 272.729 146.104C272.608 146.146 272.487 146.187 272.367 146.223C272.316 146.238 272.265 146.257 272.214 146.271C272.127 146.297 272.039 146.324 271.952 146.346C271.949 146.347 271.949 146.349 271.947 146.349C271.846 146.377 271.746 146.404 271.646 146.428C271.767 146.339 271.887 146.25 272.006 146.159C272.166 146.039 272.323 145.915 272.478 145.788C272.478 145.788 272.479 145.786 272.481 145.786C272.542 145.738 272.605 145.69 272.664 145.641C272.726 145.591 272.789 145.541 272.848 145.492C272.745 145.528 272.643 145.562 272.541 145.596C272.539 145.596 272.538 145.598 272.538 145.598C272.282 145.679 272.024 145.762 271.764 145.843C271.505 145.918 271.243 145.986 270.977 146.044L270.975 146.043C270.93 146.093 270.882 146.14 270.836 146.189C270.852 146.148 270.867 146.105 270.881 146.063C270.779 146.085 270.678 146.103 270.575 146.12C270.556 146.25 270.534 146.379 270.512 146.508C270.361 146.654 270.206 146.8 270.058 146.949C270.012 146.999 269.964 147.045 269.916 147.092C269.502 147.504 269.06 147.884 268.618 148.266C268.444 148.414 268.272 148.565 268.102 148.717C268.104 148.715 268.107 148.714 268.109 148.713C268.259 148.628 268.408 148.543 268.558 148.456C268.635 148.411 268.714 148.367 268.791 148.32C268.871 148.273 268.947 148.228 269.025 148.181C269.181 148.09 269.333 147.996 269.487 147.899C269.618 147.82 269.747 147.739 269.874 147.657C270.202 147.444 270.527 147.226 270.848 147.004C270.85 147.005 270.85 147.003 270.85 147.003C270.906 146.965 270.961 146.928 271.016 146.89C271.087 146.837 271.16 146.784 271.234 146.731C271.264 146.729 271.29 146.728 271.318 146.725C271.396 146.718 271.475 146.71 271.553 146.699C271.658 146.687 271.76 146.671 271.863 146.654L271.865 146.653C271.91 146.645 271.956 146.636 272 146.628C272.099 146.61 272.199 146.592 272.296 146.571C272.612 146.503 272.925 146.42 273.234 146.331C273.548 146.234 273.86 146.136 274.169 146.034C274.169 146.034 274.171 146.035 274.172 146.033C274.45 145.942 274.724 145.85 274.998 145.757C275.001 145.756 275.003 145.755 275.006 145.753C275.13 145.712 275.256 145.669 275.381 145.625C275.411 145.557 275.438 145.49 275.467 145.425C275.492 145.366 275.518 145.307 275.545 145.249C275.592 145.137 275.64 145.028 275.689 144.918C275.545 144.976 275.405 145.034 275.26 145.093L275.259 145.094ZM291.867 128.086C291.87 128.049 291.875 128.01 291.881 127.973C291.902 127.914 291.92 127.855 291.938 127.796C291.94 127.793 291.94 127.786 291.941 127.782C291.922 127.837 291.904 127.894 291.885 127.949C291.808 128.179 291.728 128.408 291.647 128.637C291.721 128.452 291.795 128.269 291.867 128.085L291.867 128.086ZM291.49 128.264C291.454 128.379 291.417 128.492 291.38 128.605C291.218 129.107 291.046 129.606 290.86 130.099C290.527 130.991 290.157 131.865 289.745 132.716C289.769 132.68 289.79 132.641 289.812 132.604C290.119 132.052 290.405 131.49 290.669 130.92C290.837 130.553 291.003 130.183 291.161 129.814L291.162 129.81C291.289 129.298 291.398 128.782 291.489 128.264L291.49 128.264ZM288.523 134.171C288.564 134.053 288.604 133.932 288.643 133.813L288.648 133.8C288.668 133.735 288.687 133.674 288.707 133.609C288.787 133.342 288.863 133.076 288.935 132.808C288.966 132.692 288.997 132.579 289.026 132.465C289.082 132.249 289.136 132.033 289.185 131.819C289.217 131.691 289.246 131.562 289.274 131.433C289.432 130.693 289.587 129.955 289.711 129.215C289.973 127.736 290.208 126.251 290.365 124.749C290.245 125.107 290.128 125.467 290.018 125.827C289.979 125.952 289.943 126.074 289.906 126.199C289.835 126.433 289.766 126.668 289.698 126.903C289.631 127.139 289.562 127.374 289.496 127.611C289.438 127.822 289.382 128.032 289.325 128.244C289.25 128.523 289.176 128.803 289.104 129.081C288.908 129.807 288.74 130.535 288.543 131.254C288.358 131.976 288.165 132.695 287.942 133.399C287.923 133.461 287.904 133.527 287.883 133.589C287.847 133.709 287.811 133.827 287.772 133.946L287.764 133.969C287.714 134.124 287.662 134.279 287.61 134.431C287.537 134.64 287.461 134.847 287.383 135.054L287.382 135.056C287.302 135.268 287.219 135.48 287.134 135.688C287.101 135.771 287.066 135.852 287.031 135.935C286.998 136.014 286.963 136.094 286.928 136.172C286.907 136.22 286.887 136.266 286.866 136.313L286.866 136.315C286.831 136.392 286.796 136.466 286.762 136.542C286.688 136.704 286.612 136.863 286.534 137.022C286.457 137.183 286.377 137.34 286.296 137.497C286.096 137.877 285.888 138.253 285.667 138.623C285.595 138.747 285.521 138.869 285.444 138.992C285.281 139.16 285.113 139.328 284.943 139.49C284.604 139.817 284.253 140.131 283.891 140.429C283.864 140.452 283.838 140.474 283.81 140.494C284.47 140.371 285.149 140.294 285.82 140.205C285.931 140.098 286.039 139.986 286.144 139.873C286.217 139.656 286.288 139.439 286.358 139.221C286.411 139.056 286.462 138.89 286.513 138.723C286.65 138.275 286.783 137.824 286.912 137.372C286.995 137.085 287.078 136.797 287.167 136.51C287.214 136.35 287.263 136.19 287.315 136.029L287.316 136.027C287.335 135.964 287.355 135.901 287.375 135.839C287.435 135.779 287.496 135.72 287.555 135.659C287.697 135.517 287.835 135.369 287.969 135.217C287.907 135.463 287.851 135.711 287.794 135.959C287.79 135.976 287.786 135.994 287.784 136.012L287.768 136.076C287.773 136.069 287.777 136.062 287.78 136.053C287.794 136.026 287.806 135.999 287.819 135.972C287.848 135.908 287.879 135.843 287.907 135.779C287.942 135.702 287.975 135.625 288.006 135.548C288.036 135.48 288.064 135.412 288.092 135.344C288.107 135.307 288.122 135.27 288.136 135.234C288.183 135.116 288.229 134.995 288.273 134.876C288.279 134.865 288.282 134.856 288.286 134.844C288.287 134.842 288.29 134.839 288.291 134.837C288.292 134.834 288.291 134.829 288.292 134.827C288.374 134.609 288.45 134.391 288.524 134.171L288.523 134.171ZM282.285 141.627C282.269 141.638 282.255 141.648 282.239 141.657C282.09 141.758 281.939 141.852 281.788 141.948C281.618 142.055 281.445 142.161 281.271 142.263C281.189 142.311 281.107 142.358 281.025 142.406C281.025 142.406 281.024 142.407 281.022 142.409C280.917 142.467 280.813 142.526 280.708 142.584C280.615 142.636 280.519 142.687 280.426 142.739C280.332 142.79 280.236 142.842 280.14 142.892C280.024 142.955 279.905 143.017 279.784 143.076C279.761 143.089 279.735 143.103 279.709 143.115C279.684 143.128 279.658 143.142 279.632 143.154C279.593 143.176 279.553 143.196 279.508 143.216C279.505 143.218 279.503 143.219 279.502 143.221C279.489 143.227 279.476 143.235 279.461 143.24C279.385 143.279 279.308 143.318 279.23 143.354C279.228 143.355 279.227 143.357 279.224 143.358C279.156 143.392 279.085 143.426 279.015 143.459C278.658 143.63 278.297 143.795 277.936 143.957C277.764 144.034 277.591 144.108 277.419 144.184L277.414 144.186C277.255 144.255 277.094 144.326 276.936 144.395C277.284 144.149 277.623 143.89 277.951 143.616C278.075 143.514 278.196 143.408 278.317 143.301C278.353 143.271 278.387 143.24 278.42 143.21C278.44 143.191 278.461 143.173 278.48 143.153C278.519 143.12 278.554 143.086 278.589 143.051L278.594 143.049C278.61 143.035 278.623 143.021 278.638 143.007C278.727 142.926 278.815 142.843 278.9 142.757C279.036 142.625 279.167 142.492 279.297 142.353C279.313 142.336 279.33 142.318 279.347 142.299C279.413 142.231 279.478 142.159 279.541 142.088C279.553 142.078 279.563 142.064 279.574 142.053C279.587 142.039 279.598 142.026 279.611 142.011L279.612 142.01C279.739 141.868 279.862 141.726 279.984 141.58L279.985 141.579C279.994 141.571 280.002 141.561 280.009 141.553C280.071 141.478 280.133 141.402 280.195 141.325C280.229 141.282 280.263 141.239 280.297 141.196C280.298 141.194 280.3 141.193 280.301 141.191C280.354 141.123 280.407 141.055 280.459 140.985C280.834 140.491 281.183 139.977 281.514 139.455C281.91 138.805 282.282 138.144 282.632 137.475C282.972 136.799 283.311 136.127 283.619 135.442C283.744 135.174 283.867 134.904 283.99 134.635C284.106 134.379 284.222 134.124 284.334 133.866C284.341 133.853 284.346 133.838 284.353 133.826L284.354 133.82C284.36 133.81 284.366 133.794 284.371 133.784L284.373 133.78C284.492 133.508 284.611 133.233 284.727 132.959C284.843 132.684 284.956 132.409 285.069 132.132C285.083 132.097 285.098 132.06 285.112 132.025L285.115 132.017C285.178 131.858 285.242 131.697 285.302 131.537C285.335 131.455 285.367 131.376 285.397 131.294C285.327 131.4 285.258 131.507 285.189 131.614L285.189 131.616C285.171 131.643 285.153 131.669 285.137 131.697C285.017 131.879 284.901 132.061 284.786 132.247C284.773 132.268 284.759 132.29 284.745 132.311L284.744 132.313C284.739 132.323 284.731 132.333 284.725 132.344C284.651 132.46 284.58 132.576 284.509 132.693L284.509 132.694C284.495 132.717 284.481 132.739 284.466 132.762C284.373 132.915 284.281 133.066 284.19 133.22C283.805 133.861 283.431 134.507 283.067 135.158C282.691 135.809 282.344 136.472 281.969 137.115C281.787 137.439 281.603 137.763 281.415 138.086C281.229 138.404 281.037 138.721 280.838 139.034C280.781 139.125 280.724 139.217 280.667 139.309C280.614 139.394 280.56 139.476 280.506 139.56C280.501 139.567 280.497 139.574 280.492 139.581C280.488 139.586 280.486 139.592 280.483 139.597C280.299 139.878 280.111 140.157 279.918 140.431L279.916 140.434C279.91 140.441 279.905 140.448 279.901 140.454C279.822 140.566 279.741 140.677 279.659 140.788C279.562 140.921 279.464 141.051 279.365 141.179C279.343 141.205 279.324 141.232 279.301 141.26C279.232 141.35 279.16 141.441 279.088 141.529C278.803 141.887 278.506 142.235 278.197 142.574C278.179 142.593 278.159 142.614 278.142 142.633L278.14 142.634C278.038 142.745 277.935 142.854 277.832 142.964C277.788 143.01 277.742 143.057 277.697 143.102C277.619 143.183 277.54 143.263 277.46 143.342C277.228 143.573 276.991 143.801 276.749 144.025C276.632 144.132 276.515 144.238 276.397 144.343C276.382 144.356 276.364 144.371 276.349 144.385C276.293 144.437 276.233 144.488 276.173 144.539C276.04 144.655 275.905 144.77 275.769 144.885C275.752 144.892 275.736 144.9 275.719 144.906C275.709 144.911 275.698 144.914 275.688 144.918C275.639 145.028 275.591 145.137 275.543 145.25C275.517 145.308 275.49 145.366 275.466 145.425C275.436 145.491 275.409 145.557 275.379 145.625C275.389 145.622 275.397 145.618 275.406 145.615C275.903 145.444 276.401 145.267 276.9 145.084C277.113 145.006 277.325 144.927 277.537 144.844C277.558 144.839 277.579 144.829 277.6 144.822C277.6 144.822 277.601 144.82 277.603 144.82C277.725 144.717 277.847 144.614 277.967 144.509C278.28 144.24 278.586 143.965 278.884 143.681C278.977 143.639 279.071 143.594 279.164 143.548L279.167 143.547C279.26 143.503 279.352 143.457 279.442 143.411C279.658 143.304 279.87 143.195 280.08 143.082C280.289 142.971 280.497 142.858 280.701 142.743C280.357 143.102 280.004 143.454 279.642 143.798C279.73 143.757 279.818 143.716 279.906 143.675C280.12 143.576 280.332 143.473 280.543 143.369C280.741 143.271 280.939 143.169 281.133 143.064C281.103 143.077 281.072 143.089 281.042 143.102C281.471 142.623 281.886 142.131 282.284 141.626L282.285 141.627ZM284.388 141.04C284.409 141.022 284.432 141.005 284.454 140.985C284.457 140.982 284.458 140.98 284.461 140.977C284.437 140.998 284.413 141.019 284.388 141.04ZM281.133 143.064C280.939 143.17 280.742 143.272 280.543 143.369C280.332 143.473 280.12 143.576 279.906 143.675C279.818 143.716 279.73 143.757 279.642 143.799C280.004 143.454 280.357 143.103 280.701 142.744C280.497 142.859 280.289 142.972 280.08 143.083C279.87 143.195 279.658 143.305 279.442 143.411C279.352 143.458 279.26 143.504 279.167 143.547L279.164 143.548C279.071 143.594 278.977 143.639 278.885 143.681C278.586 143.965 278.28 144.24 277.968 144.509C277.847 144.615 277.725 144.718 277.603 144.821C277.695 144.785 277.785 144.751 277.878 144.714C277.917 144.698 277.956 144.684 277.993 144.667C278.054 144.642 278.118 144.618 278.18 144.591C278.211 144.579 278.244 144.564 278.275 144.552C278.41 144.498 278.546 144.441 278.679 144.385C278.891 144.296 279.102 144.203 279.311 144.109C279.404 144.067 279.496 144.026 279.589 143.982C279.629 143.964 279.671 143.947 279.712 143.928C279.753 143.91 279.794 143.891 279.835 143.871C280.053 143.77 280.268 143.666 280.484 143.559C280.573 143.514 280.665 143.47 280.755 143.423L280.755 143.421C280.771 143.414 280.786 143.407 280.799 143.399C280.892 143.351 280.984 143.303 281.075 143.254C281.085 143.249 281.093 143.244 281.103 143.239C281.189 143.193 281.274 143.146 281.358 143.1C281.453 143.046 281.547 142.992 281.641 142.941C281.828 142.833 282.014 142.721 282.198 142.609C282.219 142.598 282.238 142.584 282.257 142.571C281.89 142.745 281.514 142.905 281.134 143.064L281.133 143.064ZM275.259 145.094C275.251 145.098 275.244 145.099 275.237 145.103C275.122 145.148 275.008 145.197 274.893 145.243C274.299 145.488 273.706 145.739 273.11 145.962C272.984 146.011 272.856 146.057 272.729 146.103C272.609 146.146 272.487 146.186 272.368 146.222C272.316 146.238 272.265 146.256 272.214 146.27C272.127 146.297 272.039 146.323 271.952 146.346C271.949 146.347 271.949 146.349 271.947 146.348C271.846 146.377 271.747 146.403 271.646 146.427C271.767 146.339 271.887 146.25 272.006 146.159C272.166 146.039 272.323 145.915 272.478 145.787C272.478 145.787 272.479 145.785 272.481 145.786C272.542 145.738 272.605 145.69 272.664 145.641C272.726 145.59 272.789 145.541 272.849 145.492C272.745 145.528 272.643 145.562 272.541 145.596C272.539 145.595 272.538 145.597 272.538 145.597C272.282 145.679 272.024 145.762 271.764 145.843C271.505 145.917 271.243 145.986 270.977 146.043L270.975 146.043C270.93 146.093 270.882 146.139 270.836 146.189C270.852 146.148 270.867 146.104 270.881 146.063C270.779 146.085 270.678 146.102 270.576 146.119C270.556 146.25 270.534 146.379 270.512 146.508C270.361 146.654 270.207 146.8 270.058 146.949C270.012 146.998 269.964 147.045 269.916 147.092C269.502 147.504 269.06 147.884 268.618 148.265C268.444 148.414 268.272 148.565 268.102 148.716C268.104 148.715 268.107 148.714 268.109 148.713C268.259 148.627 268.408 148.543 268.559 148.456C268.635 148.411 268.714 148.366 268.791 148.319C268.871 148.273 268.947 148.228 269.025 148.181C269.181 148.09 269.333 147.995 269.487 147.899C269.618 147.82 269.747 147.739 269.874 147.656C270.203 147.444 270.527 147.225 270.848 147.004C270.85 147.005 270.851 147.003 270.851 147.003C270.906 146.965 270.961 146.927 271.016 146.889C271.088 146.836 271.161 146.784 271.234 146.731C271.264 146.729 271.29 146.727 271.318 146.724C271.396 146.718 271.475 146.709 271.553 146.698C271.658 146.686 271.76 146.671 271.863 146.654L271.865 146.653C271.91 146.645 271.956 146.636 272.001 146.628C272.1 146.61 272.199 146.591 272.296 146.57C272.612 146.503 272.926 146.42 273.234 146.331C273.548 146.233 273.86 146.135 274.169 146.034C274.169 146.034 274.171 146.034 274.172 146.032C274.45 145.941 274.724 145.849 274.998 145.757C275.001 145.755 275.003 145.754 275.006 145.753C275.13 145.712 275.256 145.669 275.381 145.624C275.411 145.557 275.438 145.49 275.467 145.424C275.492 145.365 275.518 145.307 275.545 145.249C275.592 145.137 275.641 145.027 275.689 144.918C275.545 144.975 275.405 145.034 275.26 145.093L275.259 145.094ZM264.626 147.98C264.627 147.966 264.63 147.95 264.632 147.934C264.589 147.868 264.552 147.799 264.515 147.729C264.411 147.524 264.328 147.31 264.266 147.093C264.233 146.986 264.209 146.881 264.187 146.775C264.05 146.118 264.043 145.457 264.077 144.813C264.116 144.166 264.197 143.545 264.261 142.916C264.329 142.289 264.41 141.662 264.49 141.037C264.527 140.746 264.567 140.455 264.609 140.164C264.614 140.111 264.623 140.057 264.631 140.003C264.637 139.999 264.642 139.994 264.649 139.988C264.66 139.979 264.672 139.971 264.684 139.96C264.738 139.596 264.799 139.232 264.866 138.869C265.074 137.703 265.325 136.543 265.633 135.394C265.713 135.102 265.799 134.811 265.887 134.522C265.914 134.438 265.939 134.352 265.966 134.269C266.011 134.127 266.056 133.987 266.102 133.847C266.122 133.782 266.142 133.719 266.164 133.655C266.071 133.663 265.98 133.671 265.888 133.682C265.897 133.649 265.907 133.615 265.914 133.581C265.913 133.579 265.911 133.578 265.909 133.579C265.899 133.614 265.889 133.648 265.881 133.684C265.872 133.71 265.865 133.735 265.858 133.762L265.855 133.772C265.847 133.805 265.837 133.839 265.828 133.872C265.813 133.928 265.799 133.982 265.785 134.038C265.742 134.198 265.701 134.361 265.662 134.522C265.617 134.699 265.573 134.875 265.533 135.052C265.504 135.171 265.476 135.29 265.449 135.409C265.417 135.545 265.386 135.682 265.357 135.819C265.317 135.995 265.28 136.171 265.243 136.349C265.202 136.541 265.163 136.733 265.125 136.927C265.101 137.045 265.08 137.162 265.056 137.278C265.023 137.452 264.99 137.626 264.96 137.798C264.889 138.185 264.822 138.572 264.76 138.959C264.752 139.013 264.742 139.065 264.736 139.119C264.708 139.285 264.682 139.45 264.657 139.619C264.635 139.756 264.615 139.894 264.596 140.033C264.588 140.087 264.58 140.14 264.572 140.194C264.522 140.539 264.474 140.882 264.431 141.227C264.351 141.853 264.27 142.48 264.202 143.107C264.138 143.736 264.057 144.356 264.018 145.004C263.985 145.648 263.991 146.309 264.128 146.965C264.137 147.006 264.145 147.049 264.156 147.091C264.222 147.375 264.322 147.656 264.456 147.92C264.475 147.956 264.494 147.992 264.515 148.029C264.534 148.06 264.552 148.094 264.573 148.124C264.579 148.137 264.587 148.149 264.594 148.159C264.597 148.164 264.601 148.17 264.604 148.175L264.604 148.173C264.614 148.109 264.621 148.046 264.627 147.981L264.626 147.98ZM266.436 131.859C266.398 131.968 266.364 132.078 266.328 132.188C266.308 132.253 266.286 132.315 266.269 132.378C266.322 132.205 266.378 132.033 266.436 131.859ZM260.261 140.725C260.22 140.729 260.178 140.734 260.138 140.741C260.063 140.749 259.991 140.762 259.917 140.774C259.863 140.785 259.809 140.795 259.754 140.806C259.672 140.82 259.589 140.839 259.509 140.858C259.468 140.867 259.429 140.877 259.389 140.888C259.359 140.895 259.331 140.904 259.301 140.91C259.284 140.915 259.268 140.92 259.252 140.925C259.152 140.951 259.051 140.98 258.954 141.011C258.905 141.026 258.857 141.043 258.809 141.058L258.807 141.059C258.679 141.101 258.553 141.146 258.429 141.196C258.415 141.201 258.4 141.207 258.385 141.212C258.325 141.235 258.264 141.259 258.204 141.284C258.168 141.299 258.133 141.314 258.098 141.33C258.08 141.338 258.061 141.346 258.043 141.355L258.041 141.354C257.482 141.599 256.948 141.895 256.446 142.242L256.446 142.244C256.394 142.278 256.341 142.315 256.29 142.352L256.138 142.464C256.115 142.479 256.095 142.495 256.072 142.513C255.992 142.573 255.913 142.637 255.833 142.699C255.813 142.713 255.795 142.728 255.777 142.743C255.733 142.778 255.691 142.814 255.649 142.85C255.605 142.886 255.563 142.922 255.523 142.958C255.439 143.031 255.356 143.105 255.275 143.182L255.274 143.184C255.286 143.453 255.303 143.722 255.321 143.99C255.324 144.035 255.329 144.077 255.333 144.12C255.48 143.994 255.628 143.871 255.779 143.75C255.8 143.732 255.823 143.715 255.844 143.697C255.87 143.677 255.894 143.655 255.92 143.635C255.996 143.575 256.072 143.515 256.147 143.455C256.236 143.387 256.325 143.318 256.413 143.252C256.434 143.234 256.457 143.219 256.48 143.202C256.523 143.168 256.566 143.135 256.611 143.102C256.928 142.866 257.252 142.639 257.578 142.42L257.579 142.418C257.583 142.417 257.586 142.416 257.589 142.413C257.625 142.389 257.663 142.365 257.698 142.341C257.723 142.325 257.748 142.308 257.776 142.292C257.78 142.289 257.78 142.287 257.783 142.286C257.832 142.253 257.884 142.22 257.937 142.188C257.956 142.176 257.975 142.163 257.994 142.151C258.104 142.077 258.217 142.007 258.333 141.938C258.35 141.925 258.369 141.914 258.387 141.904C258.42 141.882 258.454 141.862 258.487 141.841C258.616 141.762 258.746 141.683 258.878 141.606C258.992 141.538 259.106 141.472 259.224 141.409C259.24 141.399 259.258 141.389 259.274 141.38L259.275 141.378C259.387 141.315 259.494 141.256 259.604 141.193C259.761 141.106 259.917 141.019 260.076 140.931C260.214 140.855 260.355 140.778 260.495 140.7C260.417 140.706 260.338 140.715 260.259 140.725L260.261 140.725ZM262.864 131.591C262.767 131.604 262.668 131.62 262.572 131.638C262.458 131.657 262.345 131.679 262.232 131.703C262.182 131.713 262.132 131.723 262.081 131.735C262.054 131.741 262.029 131.747 262.001 131.754C261.993 131.759 261.988 131.768 261.981 131.774C261.954 131.805 261.928 131.838 261.898 131.868C261.915 131.831 261.933 131.8 261.951 131.764C261.931 131.767 261.913 131.772 261.892 131.777C261.78 131.803 261.666 131.832 261.556 131.861C261.522 131.994 261.492 132.129 261.468 132.266C261.383 132.376 261.298 132.487 261.219 132.599C261.164 132.675 261.11 132.751 261.059 132.825C261.092 132.814 261.126 132.8 261.16 132.789C261.316 132.733 261.474 132.679 261.631 132.628C261.704 132.605 261.775 132.581 261.846 132.559C261.953 132.525 262.059 132.492 262.166 132.462C262.188 132.454 262.211 132.448 262.235 132.441C262.212 132.446 262.19 132.453 262.167 132.46L262.361 132.23L262.539 132.02C262.663 131.874 262.786 131.731 262.913 131.586C262.896 131.586 262.88 131.589 262.864 131.592L262.864 131.591ZM255.263 144.179C255.209 144.228 255.152 144.276 255.099 144.327C255.176 144.256 255.254 144.189 255.334 144.122C255.31 144.141 255.287 144.16 255.263 144.18L255.263 144.179ZM291.867 128.085C291.87 128.048 291.875 128.01 291.881 127.972C291.902 127.914 291.92 127.855 291.938 127.796C291.94 127.792 291.94 127.786 291.941 127.782C291.922 127.837 291.904 127.894 291.886 127.948C291.808 128.178 291.728 128.408 291.647 128.636C291.722 128.451 291.795 128.269 291.868 128.085L291.867 128.085ZM291.49 128.264C291.454 128.378 291.417 128.491 291.38 128.605C291.218 129.107 291.046 129.605 290.86 130.099C290.527 130.99 290.157 131.864 289.746 132.716C289.769 132.68 289.791 132.641 289.812 132.604C290.119 132.051 290.405 131.489 290.67 130.92C290.837 130.552 291.003 130.182 291.161 129.814L291.162 129.81C291.289 129.298 291.398 128.782 291.489 128.264L291.49 128.264ZM288.523 134.171C288.564 134.052 288.604 133.932 288.643 133.812L288.648 133.799C288.668 133.735 288.687 133.674 288.707 133.609C288.787 133.342 288.863 133.075 288.935 132.808C288.966 132.692 288.997 132.579 289.026 132.464C289.082 132.248 289.136 132.033 289.185 131.818C289.217 131.69 289.246 131.562 289.274 131.432C289.432 130.693 289.587 129.955 289.711 129.214C289.973 127.736 290.208 126.251 290.365 124.748C290.245 125.107 290.128 125.466 290.018 125.826C289.979 125.952 289.943 126.074 289.906 126.198C289.835 126.432 289.767 126.668 289.698 126.903C289.631 127.139 289.562 127.374 289.497 127.61C289.438 127.821 289.382 128.032 289.325 128.244C289.25 128.523 289.176 128.803 289.105 129.081C288.908 129.807 288.74 130.534 288.543 131.254C288.358 131.975 288.166 132.694 287.943 133.398C287.923 133.461 287.905 133.526 287.883 133.588C287.848 133.709 287.811 133.827 287.772 133.946L287.764 133.968C287.714 134.124 287.663 134.278 287.61 134.431C287.537 134.639 287.461 134.847 287.383 135.054L287.383 135.056C287.303 135.268 287.219 135.479 287.134 135.688C287.101 135.771 287.066 135.852 287.032 135.934C286.998 136.013 286.963 136.094 286.928 136.172C286.907 136.22 286.887 136.265 286.866 136.313L286.866 136.315C286.831 136.391 286.797 136.466 286.762 136.542C286.689 136.704 286.613 136.863 286.534 137.021C286.457 137.182 286.378 137.34 286.296 137.497C286.097 137.876 285.888 138.253 285.667 138.623C285.595 138.747 285.521 138.869 285.445 138.992C285.281 139.16 285.113 139.327 284.943 139.49C284.604 139.817 284.253 140.131 283.891 140.429C283.865 140.451 283.838 140.474 283.81 140.493C284.47 140.371 285.149 140.294 285.82 140.205C285.931 140.098 286.04 139.986 286.144 139.873C286.217 139.656 286.289 139.438 286.358 139.22C286.411 139.055 286.462 138.89 286.514 138.722C286.65 138.275 286.783 137.824 286.912 137.372C286.995 137.084 287.078 136.797 287.167 136.51C287.214 136.349 287.263 136.19 287.315 136.028L287.316 136.026C287.335 135.964 287.355 135.901 287.375 135.838C287.435 135.779 287.496 135.72 287.555 135.659C287.697 135.516 287.835 135.368 287.969 135.217C287.907 135.463 287.851 135.711 287.794 135.958C287.79 135.976 287.786 135.994 287.784 136.012L287.768 136.076C287.773 136.069 287.777 136.062 287.781 136.053C287.794 136.026 287.806 135.998 287.819 135.971C287.848 135.907 287.879 135.842 287.907 135.778C287.942 135.702 287.975 135.625 288.006 135.547C288.036 135.48 288.064 135.411 288.092 135.343C288.107 135.306 288.122 135.269 288.136 135.234C288.184 135.116 288.23 134.995 288.273 134.875C288.279 134.865 288.282 134.855 288.286 134.844C288.287 134.842 288.29 134.839 288.291 134.837C288.292 134.833 288.291 134.829 288.292 134.827C288.374 134.609 288.45 134.391 288.524 134.17L288.523 134.171ZM282.285 141.627C282.269 141.638 282.255 141.648 282.239 141.657C282.09 141.757 281.939 141.852 281.789 141.947C281.618 142.055 281.445 142.161 281.271 142.263C281.189 142.31 281.107 142.358 281.025 142.405C281.025 142.405 281.024 142.406 281.022 142.408C280.917 142.467 280.813 142.525 280.709 142.584C280.615 142.636 280.519 142.687 280.426 142.738C280.332 142.79 280.236 142.841 280.14 142.892C280.024 142.955 279.905 143.017 279.784 143.076C279.761 143.089 279.735 143.103 279.709 143.115C279.684 143.127 279.658 143.142 279.633 143.154C279.593 143.176 279.553 143.196 279.508 143.216C279.505 143.217 279.503 143.218 279.502 143.22C279.489 143.226 279.476 143.235 279.461 143.24C279.385 143.279 279.308 143.318 279.23 143.354C279.228 143.355 279.227 143.357 279.224 143.358C279.156 143.391 279.085 143.426 279.015 143.458C278.659 143.629 278.298 143.795 277.936 143.956C277.764 144.033 277.591 144.108 277.42 144.183L277.414 144.186C277.256 144.255 277.095 144.325 276.936 144.395C277.284 144.149 277.623 143.89 277.951 143.616C278.075 143.513 278.196 143.408 278.317 143.3C278.353 143.27 278.387 143.24 278.421 143.21C278.44 143.191 278.461 143.173 278.48 143.152C278.519 143.119 278.554 143.085 278.589 143.051L278.594 143.048C278.61 143.035 278.623 143.02 278.638 143.007C278.728 142.926 278.815 142.843 278.9 142.757C279.037 142.625 279.167 142.491 279.297 142.353C279.314 142.335 279.33 142.318 279.347 142.299C279.413 142.231 279.478 142.158 279.541 142.088C279.553 142.077 279.564 142.064 279.574 142.053C279.587 142.039 279.598 142.025 279.612 142.011L279.612 142.009C279.739 141.868 279.862 141.725 279.984 141.58L279.985 141.578C279.994 141.571 280.002 141.561 280.009 141.553C280.071 141.477 280.133 141.402 280.195 141.325C280.229 141.282 280.263 141.239 280.297 141.196C280.298 141.194 280.3 141.192 280.301 141.191C280.354 141.123 280.407 141.055 280.459 140.984C280.834 140.491 281.183 139.976 281.514 139.455C281.91 138.804 282.282 138.143 282.632 137.475C282.972 136.799 283.311 136.126 283.619 135.441C283.744 135.173 283.867 134.904 283.99 134.635C284.106 134.378 284.222 134.123 284.335 133.866C284.341 133.853 284.346 133.838 284.353 133.825L284.355 133.82C284.36 133.809 284.366 133.794 284.371 133.783L284.373 133.78C284.492 133.508 284.611 133.232 284.727 132.959C284.844 132.684 284.956 132.408 285.069 132.132C285.083 132.097 285.098 132.06 285.112 132.025L285.115 132.017C285.178 131.858 285.243 131.697 285.302 131.537C285.335 131.455 285.367 131.375 285.397 131.294C285.327 131.4 285.258 131.506 285.189 131.613L285.189 131.615C285.171 131.643 285.153 131.668 285.137 131.696C285.017 131.878 284.901 132.061 284.786 132.247C284.773 132.267 284.759 132.29 284.745 132.31L284.745 132.312C284.739 132.323 284.731 132.333 284.725 132.344C284.651 132.459 284.58 132.575 284.51 132.692L284.509 132.694C284.495 132.717 284.481 132.739 284.467 132.762C284.373 132.915 284.281 133.066 284.19 133.22C283.805 133.861 283.432 134.507 283.067 135.158C282.691 135.809 282.344 136.472 281.969 137.115C281.787 137.439 281.603 137.763 281.415 138.085C281.229 138.404 281.037 138.72 280.838 139.033C280.781 139.125 280.724 139.217 280.667 139.308C280.614 139.393 280.56 139.476 280.506 139.56C280.501 139.567 280.497 139.574 280.492 139.581C280.488 139.586 280.487 139.591 280.483 139.596C280.299 139.878 280.111 140.156 279.918 140.43L279.916 140.434C279.91 140.44 279.906 140.447 279.901 140.454C279.822 140.566 279.742 140.677 279.659 140.787C279.562 140.92 279.464 141.05 279.365 141.178C279.344 141.204 279.324 141.231 279.301 141.259C279.232 141.349 279.161 141.44 279.088 141.528C278.803 141.887 278.506 142.234 278.197 142.574C278.179 142.593 278.16 142.614 278.142 142.633L278.14 142.634C278.038 142.744 277.935 142.854 277.832 142.963C277.788 143.009 277.742 143.057 277.697 143.102C277.619 143.182 277.54 143.263 277.46 143.342C277.228 143.573 276.991 143.801 276.75 144.024C276.632 144.131 276.515 144.238 276.397 144.342C276.382 144.356 276.364 144.371 276.349 144.385C276.293 144.437 276.233 144.488 276.173 144.539C276.04 144.655 275.905 144.77 275.769 144.885C275.752 144.892 275.737 144.899 275.719 144.906C275.709 144.911 275.698 144.913 275.688 144.918C275.639 145.028 275.591 145.137 275.543 145.249C275.517 145.307 275.49 145.366 275.466 145.425C275.437 145.49 275.409 145.557 275.38 145.625C275.389 145.622 275.397 145.618 275.406 145.615C275.903 145.444 276.401 145.267 276.9 145.084C277.113 145.006 277.326 144.926 277.538 144.844C277.558 144.838 277.579 144.828 277.6 144.821C277.6 144.821 277.601 144.819 277.603 144.82C277.725 144.717 277.847 144.614 277.968 144.508C278.28 144.24 278.586 143.965 278.885 143.68C278.977 143.639 279.071 143.593 279.164 143.548L279.167 143.546C279.26 143.503 279.352 143.457 279.442 143.41C279.658 143.304 279.87 143.195 280.08 143.082C280.289 142.971 280.497 142.858 280.701 142.743C280.357 143.102 280.004 143.453 279.642 143.798C279.73 143.756 279.818 143.715 279.906 143.674C280.12 143.575 280.332 143.472 280.543 143.368C280.741 143.271 280.939 143.169 281.133 143.063C281.104 143.076 281.072 143.088 281.042 143.101C281.471 142.622 281.887 142.131 282.285 141.626L282.285 141.627ZM284.389 141.04C284.41 141.022 284.432 141.004 284.454 140.984C284.457 140.981 284.458 140.979 284.461 140.976C284.437 140.998 284.413 141.019 284.389 141.04ZM281.134 143.064C280.939 143.169 280.742 143.271 280.543 143.369C280.332 143.473 280.12 143.576 279.907 143.675C279.818 143.716 279.73 143.757 279.642 143.798C280.004 143.454 280.357 143.103 280.701 142.744C280.497 142.858 280.29 142.971 280.08 143.082C279.87 143.195 279.658 143.304 279.442 143.411C279.352 143.457 279.26 143.504 279.167 143.547L279.164 143.548C279.071 143.594 278.977 143.639 278.885 143.681C278.586 143.965 278.28 144.24 277.968 144.509C277.847 144.614 277.725 144.717 277.603 144.82C277.695 144.785 277.785 144.751 277.878 144.713C277.917 144.697 277.956 144.683 277.993 144.667C278.055 144.642 278.118 144.617 278.18 144.59C278.211 144.578 278.244 144.564 278.275 144.552C278.41 144.497 278.546 144.441 278.679 144.384C278.891 144.296 279.102 144.203 279.312 144.109C279.404 144.067 279.496 144.025 279.59 143.982C279.63 143.964 279.671 143.947 279.712 143.927C279.754 143.91 279.794 143.89 279.835 143.871C280.053 143.769 280.268 143.665 280.484 143.559C280.574 143.514 280.665 143.47 280.755 143.423L280.756 143.421C280.771 143.414 280.786 143.406 280.799 143.398C280.892 143.35 280.984 143.302 281.075 143.254C281.085 143.249 281.093 143.243 281.103 143.239C281.189 143.192 281.275 143.146 281.358 143.099C281.453 143.046 281.547 142.992 281.641 142.94C281.828 142.832 282.014 142.72 282.198 142.609C282.219 142.597 282.238 142.583 282.258 142.571C281.89 142.744 281.514 142.905 281.134 143.064L281.134 143.064ZM275.259 145.094C275.251 145.097 275.244 145.099 275.237 145.103C275.122 145.147 275.008 145.196 274.893 145.243C274.299 145.487 273.706 145.739 273.111 145.962C272.984 146.011 272.856 146.057 272.729 146.103C272.609 146.146 272.487 146.186 272.368 146.222C272.316 146.238 272.265 146.256 272.214 146.27C272.127 146.296 272.04 146.323 271.952 146.345C271.95 146.347 271.949 146.349 271.947 146.348C271.847 146.376 271.747 146.403 271.646 146.427C271.767 146.338 271.887 146.249 272.007 146.158C272.166 146.039 272.323 145.914 272.479 145.787C272.479 145.787 272.479 145.785 272.481 145.786C272.542 145.737 272.605 145.689 272.664 145.64C272.726 145.59 272.79 145.54 272.849 145.491C272.746 145.527 272.643 145.561 272.541 145.596C272.539 145.595 272.539 145.597 272.539 145.597C272.282 145.679 272.024 145.762 271.764 145.842C271.505 145.917 271.243 145.986 270.977 146.043L270.975 146.042C270.93 146.092 270.882 146.139 270.836 146.188C270.852 146.147 270.867 146.104 270.881 146.063C270.779 146.084 270.678 146.102 270.576 146.119C270.556 146.249 270.534 146.378 270.512 146.508C270.361 146.653 270.207 146.8 270.059 146.949C270.012 146.998 269.964 147.044 269.916 147.091C269.502 147.504 269.06 147.883 268.618 148.265C268.445 148.414 268.273 148.564 268.102 148.716C268.104 148.715 268.107 148.713 268.11 148.712C268.259 148.627 268.408 148.542 268.559 148.455C268.635 148.41 268.714 148.366 268.792 148.319C268.871 148.273 268.948 148.228 269.025 148.181C269.181 148.089 269.334 147.995 269.487 147.899C269.618 147.819 269.747 147.738 269.874 147.656C270.203 147.443 270.527 147.225 270.848 147.004C270.85 147.004 270.851 147.002 270.851 147.002C270.906 146.965 270.961 146.927 271.016 146.889C271.088 146.836 271.161 146.783 271.234 146.73C271.264 146.728 271.29 146.727 271.318 146.724C271.396 146.717 271.475 146.709 271.553 146.698C271.658 146.686 271.76 146.671 271.863 146.654L271.866 146.652C271.91 146.645 271.956 146.635 272.001 146.627C272.1 146.609 272.199 146.591 272.296 146.57C272.612 146.502 272.926 146.42 273.234 146.331C273.548 146.233 273.86 146.135 274.169 146.033C274.169 146.033 274.171 146.034 274.172 146.032C274.45 145.941 274.724 145.849 274.998 145.756C275.001 145.755 275.003 145.754 275.006 145.753C275.13 145.711 275.256 145.669 275.381 145.624C275.411 145.556 275.438 145.49 275.467 145.424C275.492 145.365 275.518 145.307 275.545 145.248C275.592 145.136 275.641 145.027 275.689 144.917C275.545 144.975 275.405 145.034 275.26 145.093L275.259 145.094ZM264.626 147.98C264.627 147.965 264.63 147.95 264.632 147.933C264.589 147.868 264.552 147.798 264.515 147.728C264.411 147.524 264.328 147.31 264.266 147.092C264.233 146.986 264.209 146.881 264.187 146.774C264.05 146.118 264.043 145.457 264.077 144.813C264.116 144.165 264.197 143.545 264.261 142.916C264.329 142.288 264.41 141.662 264.49 141.036C264.527 140.746 264.567 140.454 264.609 140.164C264.615 140.111 264.623 140.057 264.631 140.003C264.637 139.998 264.642 139.994 264.649 139.988C264.66 139.979 264.672 139.97 264.684 139.96C264.738 139.595 264.799 139.231 264.866 138.869C265.075 137.702 265.325 136.542 265.633 135.394C265.713 135.102 265.799 134.811 265.887 134.521C265.914 134.438 265.94 134.352 265.966 134.269C266.011 134.127 266.056 133.986 266.102 133.846C266.123 133.782 266.142 133.719 266.164 133.655C266.071 133.663 265.98 133.671 265.888 133.681C265.897 133.649 265.907 133.614 265.914 133.581C265.913 133.578 265.911 133.578 265.909 133.579C265.899 133.614 265.889 133.648 265.881 133.683C265.872 133.71 265.865 133.735 265.858 133.762L265.855 133.771C265.847 133.804 265.838 133.839 265.828 133.872C265.813 133.927 265.799 133.981 265.785 134.038C265.743 134.198 265.701 134.36 265.662 134.522C265.618 134.698 265.573 134.874 265.533 135.052C265.504 135.171 265.476 135.289 265.449 135.409C265.417 135.545 265.386 135.681 265.358 135.819C265.318 135.995 265.28 136.171 265.244 136.348C265.202 136.54 265.163 136.733 265.125 136.927C265.101 137.045 265.08 137.161 265.056 137.277C265.023 137.452 264.99 137.625 264.96 137.798C264.889 138.184 264.822 138.572 264.76 138.959C264.752 139.013 264.742 139.064 264.736 139.119C264.708 139.284 264.682 139.45 264.658 139.618C264.635 139.756 264.615 139.894 264.596 140.033C264.588 140.087 264.58 140.139 264.572 140.193C264.522 140.538 264.475 140.882 264.431 141.227C264.351 141.852 264.27 142.479 264.202 143.107C264.138 143.735 264.057 144.356 264.018 145.004C263.985 145.648 263.991 146.309 264.128 146.965C264.137 147.006 264.145 147.049 264.156 147.091C264.222 147.375 264.322 147.656 264.456 147.919C264.475 147.955 264.494 147.991 264.515 148.028C264.534 148.06 264.552 148.094 264.573 148.124C264.579 148.137 264.588 148.148 264.594 148.159C264.597 148.164 264.601 148.17 264.604 148.175L264.604 148.173C264.614 148.109 264.621 148.046 264.627 147.98L264.626 147.98ZM266.436 131.859C266.398 131.968 266.364 132.078 266.328 132.188C266.308 132.252 266.287 132.314 266.269 132.378C266.323 132.205 266.378 132.032 266.436 131.859ZM260.261 140.724C260.22 140.729 260.178 140.733 260.138 140.741C260.063 140.748 259.991 140.761 259.917 140.774C259.863 140.784 259.809 140.795 259.755 140.806C259.672 140.819 259.589 140.839 259.509 140.858C259.468 140.867 259.429 140.876 259.389 140.888C259.359 140.894 259.331 140.903 259.301 140.91C259.285 140.915 259.268 140.92 259.252 140.924C259.152 140.951 259.051 140.979 258.954 141.011C258.905 141.026 258.857 141.043 258.81 141.058L258.807 141.059C258.679 141.101 258.553 141.146 258.429 141.195C258.415 141.201 258.4 141.206 258.386 141.212C258.325 141.235 258.264 141.258 258.205 141.284C258.168 141.299 258.133 141.314 258.098 141.329C258.08 141.338 258.061 141.346 258.043 141.354L258.041 141.354C257.483 141.598 256.948 141.895 256.447 142.241L256.446 142.243C256.394 142.278 256.341 142.315 256.29 142.352L256.138 142.463C256.115 142.479 256.095 142.495 256.072 142.512C255.992 142.573 255.913 142.636 255.833 142.699C255.813 142.713 255.795 142.728 255.777 142.743C255.733 142.778 255.691 142.814 255.649 142.85C255.606 142.885 255.564 142.921 255.523 142.958C255.439 143.03 255.357 143.105 255.275 143.182L255.275 143.183C255.286 143.453 255.303 143.722 255.321 143.989C255.325 144.035 255.329 144.076 255.333 144.12C255.48 143.994 255.628 143.871 255.779 143.75C255.8 143.732 255.823 143.715 255.844 143.697C255.87 143.676 255.894 143.655 255.92 143.635C255.996 143.574 256.072 143.514 256.147 143.454C256.236 143.386 256.325 143.318 256.414 143.252C256.435 143.234 256.457 143.219 256.48 143.201C256.523 143.168 256.566 143.134 256.611 143.101C256.929 142.866 257.252 142.639 257.578 142.419L257.579 142.418C257.584 142.417 257.586 142.416 257.589 142.413C257.625 142.389 257.663 142.364 257.698 142.341C257.723 142.324 257.748 142.307 257.777 142.292C257.78 142.289 257.78 142.287 257.783 142.286C257.832 142.252 257.884 142.22 257.937 142.188C257.956 142.175 257.975 142.163 257.994 142.15C258.104 142.077 258.217 142.006 258.333 141.937C258.351 141.924 258.369 141.914 258.387 141.903C258.42 141.881 258.455 141.861 258.487 141.841C258.616 141.761 258.746 141.683 258.878 141.606C258.992 141.538 259.106 141.472 259.224 141.408C259.24 141.399 259.259 141.389 259.274 141.379L259.275 141.377C259.387 141.315 259.495 141.255 259.604 141.193C259.761 141.106 259.917 141.019 260.076 140.931C260.215 140.854 260.355 140.777 260.496 140.699C260.417 140.706 260.339 140.714 260.259 140.725L260.261 140.724ZM262.864 131.591C262.767 131.604 262.669 131.62 262.572 131.637C262.458 131.657 262.345 131.679 262.232 131.703C262.182 131.713 262.132 131.723 262.082 131.735C262.054 131.74 262.029 131.746 262.001 131.753C261.993 131.759 261.988 131.768 261.982 131.774C261.954 131.804 261.928 131.838 261.899 131.867C261.915 131.831 261.933 131.799 261.951 131.764C261.931 131.767 261.913 131.771 261.892 131.777C261.78 131.803 261.667 131.831 261.556 131.86C261.522 131.994 261.492 132.129 261.468 132.266C261.383 132.376 261.298 132.487 261.22 132.599C261.164 132.674 261.11 132.75 261.059 132.825C261.092 132.814 261.127 132.8 261.16 132.789C261.316 132.733 261.474 132.678 261.631 132.628C261.704 132.604 261.776 132.581 261.846 132.559C261.953 132.524 262.059 132.492 262.167 132.461C262.188 132.454 262.211 132.447 262.235 132.441C262.212 132.445 262.191 132.453 262.167 132.459L262.361 132.23L262.539 132.02C262.663 131.873 262.787 131.731 262.913 131.585C262.896 131.586 262.88 131.589 262.864 131.591L262.864 131.591ZM255.264 144.179C255.209 144.227 255.152 144.275 255.099 144.326C255.176 144.256 255.254 144.188 255.334 144.122C255.311 144.141 255.287 144.16 255.263 144.179L255.264 144.179ZM291.868 128.085C291.87 128.048 291.875 128.01 291.882 127.972C291.902 127.913 291.92 127.855 291.939 127.796C291.94 127.792 291.94 127.785 291.941 127.782C291.922 127.836 291.905 127.893 291.886 127.948C291.808 128.178 291.728 128.407 291.647 128.636C291.722 128.451 291.796 128.268 291.868 128.085L291.868 128.085ZM291.49 128.264C291.455 128.378 291.417 128.491 291.38 128.604C291.219 129.107 291.046 129.605 290.86 130.098C290.528 130.99 290.157 131.864 289.746 132.716C289.769 132.679 289.791 132.641 289.812 132.604C290.12 132.051 290.405 131.489 290.67 130.919C290.837 130.552 291.003 130.182 291.161 129.813L291.162 129.809C291.289 129.297 291.399 128.781 291.49 128.263L291.49 128.264ZM288.523 134.17C288.564 134.052 288.604 133.931 288.643 133.812L288.648 133.799C288.668 133.734 288.687 133.673 288.707 133.609C288.787 133.342 288.863 133.075 288.935 132.807C288.966 132.692 288.997 132.578 289.026 132.464C289.082 132.248 289.136 132.032 289.185 131.818C289.217 131.69 289.247 131.561 289.275 131.432C289.432 130.693 289.587 129.954 289.711 129.214C289.973 127.736 290.208 126.25 290.365 124.748C290.245 125.106 290.128 125.466 290.018 125.826C289.979 125.951 289.943 126.073 289.906 126.198C289.836 126.432 289.767 126.667 289.698 126.902C289.631 127.138 289.562 127.374 289.497 127.61C289.438 127.821 289.382 128.031 289.326 128.243C289.25 128.522 289.176 128.802 289.105 129.081C288.908 129.806 288.74 130.534 288.543 131.253C288.358 131.975 288.166 132.694 287.943 133.398C287.923 133.461 287.905 133.526 287.883 133.588C287.848 133.709 287.811 133.826 287.772 133.945L287.764 133.968C287.714 134.124 287.663 134.278 287.61 134.431C287.538 134.639 287.461 134.847 287.383 135.054L287.383 135.055C287.303 135.268 287.219 135.479 287.134 135.687C287.101 135.771 287.067 135.851 287.032 135.934C286.998 136.013 286.964 136.094 286.928 136.172C286.907 136.219 286.887 136.265 286.867 136.313L286.866 136.314C286.831 136.391 286.797 136.465 286.762 136.541C286.689 136.704 286.613 136.862 286.535 137.021C286.458 137.182 286.378 137.339 286.296 137.496C286.097 137.876 285.888 138.252 285.668 138.622C285.595 138.747 285.521 138.868 285.445 138.991C285.281 139.16 285.113 139.327 284.943 139.49C284.605 139.816 284.254 140.131 283.891 140.428C283.865 140.451 283.838 140.473 283.81 140.493C284.47 140.37 285.149 140.294 285.82 140.204C285.931 140.097 286.04 139.986 286.144 139.872C286.217 139.656 286.289 139.438 286.358 139.22C286.411 139.055 286.462 138.89 286.514 138.722C286.65 138.274 286.783 137.823 286.913 137.371C286.995 137.084 287.078 136.797 287.167 136.51C287.214 136.349 287.264 136.189 287.315 136.028L287.316 136.026C287.336 135.963 287.355 135.901 287.375 135.838C287.435 135.779 287.496 135.72 287.555 135.658C287.697 135.516 287.835 135.368 287.969 135.216C287.907 135.462 287.851 135.71 287.794 135.958C287.79 135.976 287.786 135.993 287.784 136.011L287.768 136.075C287.773 136.069 287.777 136.062 287.781 136.052C287.794 136.025 287.806 135.998 287.819 135.971C287.848 135.907 287.879 135.842 287.907 135.778C287.942 135.702 287.975 135.624 288.006 135.547C288.036 135.479 288.064 135.411 288.092 135.343C288.107 135.306 288.122 135.269 288.136 135.234C288.184 135.115 288.23 134.995 288.273 134.875C288.279 134.864 288.282 134.855 288.286 134.843C288.287 134.842 288.29 134.838 288.291 134.837C288.292 134.833 288.292 134.828 288.292 134.827C288.374 134.609 288.45 134.39 288.524 134.17L288.523 134.17ZM282.285 141.626C282.269 141.637 282.255 141.647 282.239 141.657C282.09 141.757 281.939 141.852 281.789 141.947C281.619 142.054 281.445 142.16 281.271 142.262C281.189 142.31 281.107 142.357 281.025 142.405C281.025 142.405 281.024 142.406 281.022 142.408C280.917 142.467 280.813 142.525 280.709 142.583C280.615 142.635 280.519 142.686 280.426 142.738C280.332 142.79 280.236 142.841 280.141 142.892C280.024 142.954 279.905 143.017 279.784 143.075C279.761 143.088 279.735 143.102 279.709 143.115C279.684 143.127 279.658 143.141 279.633 143.153C279.593 143.176 279.553 143.195 279.508 143.216C279.505 143.217 279.503 143.218 279.502 143.22C279.49 143.226 279.476 143.234 279.462 143.24C279.385 143.278 279.308 143.317 279.23 143.353C279.228 143.355 279.227 143.356 279.225 143.358C279.156 143.391 279.085 143.425 279.015 143.458C278.659 143.629 278.298 143.795 277.937 143.956C277.764 144.033 277.591 144.108 277.42 144.183L277.415 144.185C277.256 144.255 277.095 144.325 276.936 144.394C277.284 144.149 277.623 143.889 277.951 143.615C278.075 143.513 278.196 143.408 278.318 143.3C278.353 143.27 278.387 143.24 278.421 143.209C278.44 143.19 278.461 143.172 278.481 143.152C278.519 143.119 278.554 143.085 278.589 143.051L278.595 143.048C278.61 143.034 278.623 143.02 278.639 143.006C278.728 142.926 278.816 142.842 278.9 142.756C279.037 142.624 279.167 142.491 279.297 142.352C279.314 142.335 279.33 142.317 279.348 142.298C279.413 142.23 279.478 142.158 279.541 142.087C279.553 142.077 279.564 142.064 279.574 142.052C279.587 142.038 279.598 142.025 279.612 142.011L279.612 142.009C279.739 141.867 279.863 141.725 279.985 141.58L279.985 141.578C279.994 141.57 280.002 141.56 280.009 141.552C280.071 141.477 280.133 141.401 280.195 141.324C280.229 141.281 280.263 141.238 280.297 141.195C280.298 141.193 280.3 141.192 280.301 141.19C280.354 141.122 280.407 141.054 280.459 140.984C280.834 140.491 281.183 139.976 281.514 139.454C281.91 138.804 282.282 138.143 282.632 137.475C282.972 136.799 283.311 136.126 283.619 135.441C283.744 135.173 283.867 134.903 283.99 134.634C284.106 134.378 284.222 134.123 284.335 133.865C284.341 133.853 284.346 133.838 284.353 133.825L284.355 133.819C284.361 133.809 284.366 133.794 284.372 133.783L284.373 133.779C284.493 133.507 284.611 133.232 284.727 132.959C284.844 132.683 284.956 132.408 285.069 132.131C285.083 132.096 285.098 132.059 285.112 132.024L285.115 132.017C285.179 131.857 285.243 131.697 285.303 131.536C285.335 131.455 285.367 131.375 285.397 131.293C285.327 131.399 285.258 131.506 285.19 131.613L285.189 131.615C285.171 131.642 285.154 131.668 285.138 131.696C285.018 131.878 284.901 132.061 284.786 132.246C284.773 132.267 284.759 132.289 284.745 132.31L284.745 132.312C284.739 132.323 284.731 132.333 284.725 132.343C284.652 132.459 284.58 132.575 284.51 132.692L284.509 132.694C284.495 132.716 284.481 132.739 284.467 132.761C284.373 132.914 284.281 133.065 284.19 133.219C283.805 133.861 283.432 134.507 283.067 135.157C282.691 135.808 282.344 136.471 281.969 137.114C281.787 137.439 281.603 137.762 281.415 138.085C281.229 138.403 281.037 138.72 280.838 139.033C280.781 139.125 280.724 139.217 280.667 139.308C280.614 139.393 280.56 139.476 280.506 139.56C280.501 139.566 280.497 139.573 280.492 139.58C280.489 139.585 280.487 139.591 280.483 139.596C280.299 139.877 280.111 140.156 279.918 140.43L279.917 140.434C279.91 140.44 279.906 140.447 279.901 140.454C279.822 140.566 279.742 140.676 279.659 140.787C279.562 140.92 279.465 141.05 279.365 141.178C279.344 141.204 279.324 141.231 279.301 141.259C279.232 141.349 279.161 141.44 279.088 141.528C278.803 141.886 278.506 142.234 278.197 142.573C278.18 142.593 278.16 142.613 278.143 142.632L278.14 142.634C278.038 142.744 277.935 142.853 277.832 142.963C277.788 143.009 277.743 143.056 277.697 143.102C277.619 143.182 277.54 143.262 277.46 143.342C277.228 143.573 276.992 143.801 276.75 144.024C276.632 144.131 276.515 144.237 276.397 144.342C276.382 144.356 276.364 144.371 276.349 144.384C276.293 144.436 276.233 144.487 276.173 144.538C276.04 144.655 275.905 144.77 275.769 144.885C275.752 144.891 275.737 144.899 275.72 144.906C275.709 144.91 275.698 144.913 275.688 144.918C275.639 145.027 275.591 145.137 275.544 145.249C275.517 145.307 275.491 145.365 275.466 145.424C275.437 145.49 275.409 145.556 275.38 145.624C275.389 145.621 275.397 145.617 275.406 145.614C275.904 145.444 276.401 145.267 276.9 145.084C277.113 145.005 277.326 144.926 277.538 144.843C277.559 144.838 277.579 144.828 277.6 144.821C277.6 144.821 277.601 144.819 277.603 144.82C277.725 144.716 277.847 144.614 277.968 144.508C278.28 144.239 278.586 143.964 278.885 143.68C278.977 143.638 279.071 143.593 279.164 143.547L279.167 143.546C279.26 143.502 279.352 143.456 279.442 143.41C279.658 143.303 279.87 143.194 280.08 143.081C280.289 142.971 280.497 142.857 280.701 142.743C280.357 143.102 280.004 143.453 279.642 143.797C279.73 143.756 279.818 143.715 279.906 143.674C280.12 143.575 280.332 143.472 280.543 143.368C280.742 143.27 280.939 143.168 281.133 143.063C281.104 143.076 281.072 143.088 281.042 143.101C281.472 142.622 281.887 142.13 282.285 141.626L282.285 141.626ZM284.389 141.039C284.41 141.021 284.433 141.004 284.454 140.984C284.457 140.981 284.458 140.979 284.461 140.976C284.437 140.997 284.413 141.018 284.389 141.039ZM281.134 143.064C280.939 143.169 280.742 143.271 280.543 143.369C280.332 143.472 280.12 143.575 279.907 143.674C279.819 143.715 279.731 143.757 279.642 143.798C280.004 143.453 280.358 143.102 280.701 142.743C280.497 142.858 280.29 142.971 280.08 143.082C279.871 143.195 279.658 143.304 279.442 143.41C279.352 143.457 279.26 143.503 279.167 143.546L279.165 143.548C279.071 143.593 278.977 143.639 278.885 143.681C278.586 143.964 278.28 144.24 277.968 144.508C277.847 144.614 277.725 144.717 277.603 144.82C277.696 144.785 277.785 144.75 277.878 144.713C277.917 144.697 277.956 144.683 277.993 144.667C278.055 144.641 278.118 144.617 278.18 144.59C278.212 144.578 278.244 144.564 278.276 144.551C278.41 144.497 278.546 144.441 278.679 144.384C278.891 144.295 279.102 144.202 279.312 144.108C279.404 144.067 279.497 144.025 279.59 143.981C279.63 143.964 279.671 143.947 279.712 143.927C279.754 143.91 279.794 143.89 279.835 143.87C280.053 143.769 280.268 143.665 280.484 143.558C280.574 143.514 280.665 143.469 280.755 143.423L280.756 143.421C280.771 143.413 280.786 143.406 280.799 143.398C280.892 143.35 280.984 143.302 281.075 143.254C281.085 143.249 281.093 143.243 281.104 143.238C281.189 143.192 281.275 143.146 281.358 143.099C281.453 143.045 281.547 142.992 281.641 142.94C281.828 142.832 282.014 142.72 282.198 142.609C282.219 142.597 282.239 142.583 282.258 142.57C281.89 142.744 281.514 142.904 281.135 143.063L281.134 143.064ZM275.259 145.093C275.251 145.097 275.244 145.099 275.237 145.102C275.122 145.147 275.008 145.196 274.894 145.242C274.299 145.487 273.706 145.738 273.111 145.961C272.984 146.01 272.856 146.057 272.729 146.103C272.609 146.145 272.487 146.185 272.368 146.221C272.316 146.237 272.265 146.256 272.214 146.269C272.127 146.296 272.04 146.323 271.952 146.345C271.95 146.346 271.949 146.348 271.947 146.348C271.847 146.376 271.747 146.402 271.646 146.427C271.768 146.338 271.887 146.249 272.007 146.158C272.166 146.038 272.323 145.914 272.479 145.786C272.479 145.786 272.479 145.785 272.481 145.785C272.542 145.737 272.605 145.689 272.664 145.64C272.726 145.59 272.79 145.54 272.849 145.491C272.746 145.527 272.643 145.561 272.541 145.595C272.539 145.595 272.539 145.596 272.539 145.596C272.283 145.678 272.024 145.761 271.765 145.842C271.505 145.916 271.243 145.985 270.977 146.043L270.975 146.042C270.93 146.092 270.883 146.139 270.836 146.188C270.852 146.147 270.867 146.104 270.882 146.062C270.779 146.084 270.678 146.101 270.576 146.119C270.556 146.249 270.534 146.378 270.513 146.507C270.361 146.653 270.207 146.799 270.059 146.948C270.012 146.997 269.964 147.044 269.916 147.091C269.502 147.503 269.06 147.883 268.618 148.265C268.445 148.413 268.273 148.564 268.102 148.716C268.105 148.714 268.107 148.713 268.11 148.712C268.259 148.627 268.409 148.542 268.559 148.455C268.636 148.41 268.714 148.365 268.792 148.318C268.871 148.272 268.948 148.227 269.025 148.18C269.181 148.089 269.334 147.995 269.487 147.898C269.618 147.819 269.747 147.738 269.875 147.656C270.203 147.443 270.527 147.225 270.848 147.003C270.85 147.004 270.851 147.002 270.851 147.002C270.906 146.964 270.961 146.927 271.017 146.889C271.088 146.835 271.161 146.783 271.234 146.73C271.264 146.728 271.29 146.726 271.318 146.724C271.397 146.717 271.475 146.708 271.553 146.697C271.658 146.685 271.761 146.67 271.863 146.653L271.866 146.652C271.91 146.644 271.956 146.635 272.001 146.627C272.1 146.609 272.199 146.59 272.297 146.569C272.613 146.502 272.926 146.419 273.235 146.33C273.548 146.232 273.861 146.135 274.17 146.033C274.17 146.033 274.171 146.034 274.172 146.032C274.45 145.94 274.724 145.848 274.998 145.756C275.001 145.755 275.003 145.753 275.006 145.752C275.13 145.711 275.256 145.668 275.381 145.623C275.411 145.556 275.438 145.489 275.467 145.424C275.492 145.365 275.519 145.306 275.545 145.248C275.592 145.136 275.641 145.027 275.689 144.917C275.545 144.974 275.405 145.033 275.26 145.092L275.259 145.093ZM264.626 147.979C264.627 147.965 264.63 147.949 264.632 147.933C264.589 147.868 264.552 147.798 264.515 147.728C264.411 147.523 264.328 147.309 264.266 147.092C264.234 146.986 264.209 146.88 264.187 146.774C264.05 146.118 264.043 145.456 264.077 144.813C264.116 144.165 264.197 143.544 264.261 142.916C264.329 142.288 264.41 141.661 264.49 141.036C264.527 140.746 264.567 140.454 264.609 140.163C264.615 140.11 264.623 140.056 264.631 140.002C264.637 139.998 264.643 139.994 264.649 139.987C264.66 139.979 264.672 139.97 264.684 139.959C264.739 139.595 264.8 139.231 264.866 138.868C265.075 137.702 265.326 136.542 265.633 135.393C265.714 135.101 265.8 134.811 265.887 134.521C265.914 134.438 265.94 134.352 265.966 134.269C266.012 134.126 266.056 133.986 266.102 133.846C266.123 133.781 266.142 133.719 266.165 133.655C266.071 133.662 265.98 133.671 265.888 133.681C265.897 133.648 265.907 133.614 265.915 133.581C265.913 133.578 265.911 133.577 265.909 133.579C265.899 133.613 265.889 133.648 265.881 133.683C265.872 133.709 265.865 133.734 265.858 133.761L265.855 133.771C265.848 133.804 265.838 133.839 265.829 133.871C265.813 133.927 265.799 133.981 265.786 134.038C265.743 134.198 265.701 134.36 265.662 134.521C265.618 134.698 265.574 134.874 265.533 135.052C265.504 135.17 265.476 135.289 265.449 135.408C265.417 135.544 265.386 135.681 265.358 135.819C265.318 135.994 265.28 136.171 265.244 136.348C265.202 136.54 265.163 136.733 265.125 136.926C265.101 137.044 265.08 137.161 265.056 137.277C265.023 137.451 264.991 137.625 264.96 137.798C264.889 138.184 264.823 138.571 264.76 138.958C264.752 139.012 264.742 139.064 264.736 139.119C264.708 139.284 264.682 139.45 264.658 139.618C264.635 139.756 264.615 139.894 264.596 140.033C264.588 140.087 264.58 140.139 264.572 140.193C264.522 140.538 264.475 140.881 264.431 141.227C264.351 141.852 264.27 142.479 264.202 143.106C264.138 143.735 264.057 144.356 264.018 145.004C263.985 145.647 263.991 146.308 264.128 146.965C264.137 147.006 264.145 147.049 264.156 147.09C264.222 147.374 264.322 147.656 264.456 147.919C264.475 147.955 264.495 147.991 264.516 148.028C264.534 148.06 264.552 148.093 264.573 148.124C264.579 148.136 264.588 148.148 264.595 148.159C264.597 148.164 264.601 148.169 264.604 148.174L264.604 148.173C264.614 148.108 264.621 148.046 264.627 147.98L264.626 147.979ZM266.436 131.858C266.398 131.967 266.365 132.078 266.329 132.187C266.308 132.252 266.287 132.314 266.269 132.377C266.323 132.204 266.378 132.032 266.436 131.858ZM260.262 140.724C260.22 140.729 260.178 140.733 260.138 140.74C260.063 140.748 259.991 140.761 259.918 140.773C259.863 140.784 259.809 140.795 259.755 140.805C259.672 140.819 259.589 140.839 259.509 140.857C259.468 140.866 259.429 140.876 259.389 140.887C259.359 140.894 259.331 140.903 259.301 140.91C259.285 140.914 259.268 140.919 259.252 140.924C259.152 140.951 259.052 140.979 258.955 141.011C258.905 141.025 258.857 141.042 258.81 141.057L258.807 141.059C258.679 141.101 258.554 141.146 258.429 141.195C258.415 141.2 258.4 141.206 258.386 141.211C258.325 141.235 258.264 141.258 258.205 141.284C258.168 141.298 258.133 141.314 258.098 141.329C258.081 141.338 258.061 141.345 258.043 141.354L258.041 141.353C257.483 141.598 256.948 141.895 256.447 142.241L256.446 142.243C256.394 142.278 256.341 142.314 256.29 142.351L256.138 142.463C256.116 142.478 256.095 142.494 256.072 142.512C255.992 142.573 255.913 142.636 255.833 142.698C255.813 142.712 255.795 142.727 255.777 142.742C255.734 142.778 255.692 142.814 255.65 142.85C255.606 142.885 255.564 142.921 255.524 142.958C255.44 143.03 255.357 143.104 255.275 143.181L255.275 143.183C255.287 143.452 255.303 143.722 255.321 143.989C255.325 144.034 255.329 144.076 255.333 144.12C255.48 143.993 255.628 143.87 255.779 143.75C255.8 143.732 255.823 143.714 255.844 143.696C255.87 143.676 255.894 143.655 255.921 143.634C255.996 143.574 256.072 143.514 256.147 143.454C256.236 143.386 256.325 143.318 256.414 143.252C256.435 143.234 256.457 143.218 256.48 143.201C256.523 143.167 256.566 143.134 256.611 143.101C256.929 142.866 257.252 142.638 257.579 142.419L257.579 142.417C257.584 142.417 257.586 142.415 257.589 142.412C257.625 142.389 257.663 142.364 257.699 142.34C257.723 142.324 257.748 142.307 257.777 142.292C257.78 142.289 257.78 142.287 257.783 142.285C257.833 142.252 257.884 142.219 257.937 142.187C257.956 142.175 257.975 142.162 257.994 142.15C258.104 142.076 258.217 142.006 258.333 141.937C258.351 141.924 258.369 141.914 258.387 141.903C258.42 141.881 258.455 141.861 258.487 141.841C258.616 141.761 258.746 141.682 258.878 141.606C258.992 141.538 259.106 141.472 259.224 141.408C259.24 141.399 259.259 141.388 259.275 141.379L259.275 141.377C259.388 141.315 259.495 141.255 259.605 141.192C259.761 141.105 259.917 141.019 260.076 140.93C260.215 140.854 260.355 140.777 260.496 140.699C260.418 140.706 260.339 140.714 260.26 140.725L260.262 140.724ZM262.864 131.591C262.767 131.603 262.669 131.62 262.573 131.637C262.458 131.656 262.345 131.678 262.232 131.702C262.182 131.712 262.132 131.722 262.082 131.734C262.055 131.74 262.029 131.746 262.001 131.753C261.993 131.759 261.988 131.767 261.982 131.774C261.954 131.804 261.928 131.837 261.899 131.867C261.915 131.831 261.933 131.799 261.952 131.763C261.931 131.767 261.913 131.771 261.892 131.776C261.78 131.803 261.667 131.831 261.556 131.86C261.522 131.994 261.492 132.128 261.468 132.265C261.383 132.375 261.298 132.487 261.22 132.598C261.164 132.674 261.11 132.75 261.059 132.825C261.092 132.813 261.127 132.8 261.16 132.788C261.316 132.733 261.474 132.678 261.631 132.627C261.704 132.604 261.776 132.58 261.846 132.559C261.953 132.524 262.06 132.491 262.167 132.461C262.188 132.454 262.212 132.447 262.235 132.44C262.212 132.445 262.191 132.452 262.167 132.459L262.361 132.229L262.539 132.02C262.664 131.873 262.787 131.731 262.913 131.585C262.896 131.585 262.88 131.588 262.865 131.591L262.864 131.591ZM255.264 144.179C255.209 144.227 255.152 144.275 255.099 144.326C255.176 144.256 255.254 144.188 255.334 144.121C255.311 144.14 255.287 144.16 255.264 144.179L255.264 144.179ZM291.868 128.085C291.87 128.048 291.875 128.009 291.882 127.971C291.902 127.913 291.92 127.854 291.939 127.795C291.94 127.791 291.94 127.785 291.941 127.781C291.922 127.836 291.905 127.893 291.886 127.948C291.808 128.177 291.729 128.407 291.647 128.636C291.722 128.451 291.796 128.268 291.868 128.084L291.868 128.085ZM291.49 128.263C291.455 128.377 291.418 128.491 291.38 128.604C291.219 129.106 291.046 129.605 290.86 130.098C290.528 130.99 290.157 131.864 289.746 132.715C289.769 132.679 289.791 132.64 289.812 132.603C290.12 132.051 290.405 131.489 290.67 130.919C290.837 130.551 291.004 130.182 291.161 129.813L291.162 129.809C291.289 129.297 291.399 128.781 291.49 128.263L291.49 128.263ZM288.523 134.17C288.564 134.052 288.604 133.931 288.643 133.812L288.648 133.798C288.668 133.734 288.687 133.673 288.708 133.608C288.787 133.341 288.863 133.075 288.935 132.807C288.967 132.691 288.997 132.578 289.026 132.464C289.082 132.247 289.136 132.032 289.185 131.818C289.217 131.689 289.247 131.561 289.275 131.432C289.432 130.692 289.587 129.954 289.711 129.214C289.974 127.735 290.208 126.25 290.365 124.747C290.245 125.106 290.129 125.466 290.019 125.826C289.979 125.951 289.943 126.073 289.906 126.197C289.836 126.432 289.767 126.667 289.698 126.902C289.631 127.138 289.562 127.373 289.497 127.609C289.438 127.821 289.382 128.031 289.326 128.243C289.25 128.522 289.176 128.802 289.105 129.08C288.908 129.806 288.74 130.534 288.543 131.253C288.358 131.974 288.166 132.694 287.943 133.397C287.923 133.46 287.905 133.526 287.883 133.588C287.848 133.708 287.811 133.826 287.772 133.945L287.764 133.968C287.714 134.123 287.663 134.278 287.61 134.43C287.538 134.639 287.462 134.846 287.383 135.053L287.383 135.055C287.303 135.267 287.219 135.479 287.134 135.687C287.101 135.77 287.067 135.851 287.032 135.933C286.998 136.012 286.964 136.093 286.928 136.171C286.908 136.219 286.887 136.265 286.867 136.312L286.866 136.314C286.831 136.39 286.797 136.465 286.762 136.541C286.689 136.703 286.613 136.862 286.535 137.02C286.458 137.181 286.378 137.339 286.296 137.496C286.097 137.875 285.888 138.252 285.668 138.622C285.595 138.746 285.521 138.868 285.445 138.991C285.281 139.159 285.113 139.327 284.944 139.489C284.605 139.816 284.254 140.13 283.892 140.428C283.865 140.45 283.838 140.473 283.81 140.493C284.47 140.37 285.149 140.293 285.821 140.204C285.931 140.097 286.04 139.985 286.144 139.872C286.217 139.655 286.289 139.438 286.358 139.22C286.411 139.055 286.462 138.889 286.514 138.722C286.65 138.274 286.783 137.823 286.913 137.371C286.995 137.084 287.078 136.796 287.167 136.509C287.215 136.348 287.264 136.189 287.315 136.028L287.316 136.026C287.336 135.963 287.355 135.9 287.375 135.837C287.436 135.778 287.496 135.719 287.555 135.658C287.697 135.515 287.835 135.368 287.97 135.216C287.907 135.462 287.851 135.71 287.795 135.958C287.791 135.975 287.787 135.993 287.784 136.011L287.769 136.075C287.773 136.068 287.778 136.061 287.781 136.052C287.794 136.025 287.806 135.997 287.82 135.971C287.848 135.907 287.879 135.841 287.908 135.778C287.943 135.701 287.976 135.624 288.007 135.547C288.036 135.479 288.064 135.411 288.092 135.342C288.107 135.305 288.122 135.268 288.136 135.233C288.184 135.115 288.23 134.994 288.273 134.874C288.279 134.864 288.283 134.854 288.286 134.843C288.287 134.841 288.29 134.838 288.291 134.836C288.292 134.832 288.292 134.828 288.292 134.826C288.374 134.608 288.45 134.39 288.524 134.17L288.523 134.17ZM282.285 141.626C282.269 141.637 282.255 141.647 282.239 141.656C282.09 141.756 281.94 141.851 281.789 141.947C281.619 142.054 281.445 142.16 281.271 142.262C281.189 142.309 281.107 142.357 281.025 142.404C281.025 142.404 281.024 142.406 281.022 142.408C280.918 142.466 280.813 142.525 280.709 142.583C280.615 142.635 280.519 142.686 280.426 142.738C280.332 142.789 280.236 142.84 280.141 142.891C280.024 142.954 279.906 143.016 279.784 143.075C279.761 143.088 279.735 143.102 279.71 143.114C279.684 143.127 279.658 143.141 279.633 143.153C279.594 143.175 279.553 143.195 279.508 143.215C279.505 143.216 279.503 143.218 279.502 143.22C279.49 143.226 279.476 143.234 279.462 143.239C279.385 143.278 279.308 143.317 279.23 143.353C279.228 143.354 279.227 143.356 279.225 143.357C279.156 143.391 279.085 143.425 279.015 143.457C278.659 143.629 278.298 143.794 277.937 143.955C277.764 144.033 277.591 144.107 277.42 144.183L277.415 144.185C277.256 144.254 277.095 144.325 276.936 144.394C277.284 144.148 277.623 143.889 277.952 143.615C278.076 143.512 278.196 143.407 278.318 143.3C278.353 143.27 278.387 143.239 278.421 143.209C278.44 143.19 278.461 143.172 278.481 143.152C278.519 143.119 278.555 143.084 278.59 143.05L278.595 143.048C278.61 143.034 278.623 143.02 278.639 143.006C278.728 142.925 278.816 142.842 278.9 142.756C279.037 142.624 279.167 142.49 279.297 142.352C279.314 142.335 279.33 142.317 279.348 142.298C279.413 142.23 279.478 142.158 279.541 142.087C279.553 142.076 279.564 142.063 279.574 142.052C279.587 142.038 279.598 142.025 279.612 142.01L279.612 142.008C279.739 141.867 279.863 141.725 279.985 141.579L279.985 141.577C279.994 141.57 280.002 141.56 280.009 141.552C280.071 141.476 280.133 141.401 280.196 141.324C280.229 141.281 280.263 141.238 280.297 141.195C280.298 141.193 280.3 141.192 280.301 141.19C280.354 141.122 280.407 141.054 280.459 140.984C280.835 140.49 281.183 139.975 281.514 139.454C281.91 138.804 282.282 138.143 282.632 137.474C282.972 136.798 283.311 136.125 283.62 135.441C283.744 135.172 283.867 134.903 283.99 134.634C284.106 134.378 284.222 134.123 284.335 133.865C284.341 133.852 284.346 133.837 284.353 133.825L284.355 133.819C284.361 133.808 284.366 133.793 284.372 133.783L284.373 133.779C284.493 133.507 284.611 133.232 284.727 132.958C284.844 132.683 284.956 132.408 285.069 132.131C285.083 132.096 285.098 132.059 285.112 132.024L285.115 132.016C285.179 131.857 285.243 131.696 285.303 131.536C285.335 131.454 285.367 131.375 285.398 131.293C285.327 131.399 285.258 131.506 285.19 131.613L285.189 131.614C285.171 131.642 285.154 131.668 285.138 131.696C285.018 131.878 284.902 132.06 284.787 132.246C284.773 132.267 284.759 132.289 284.745 132.31L284.745 132.312C284.739 132.322 284.731 132.332 284.726 132.343C284.652 132.459 284.58 132.574 284.51 132.691L284.509 132.693C284.495 132.716 284.481 132.738 284.467 132.761C284.374 132.914 284.281 133.065 284.19 133.219C283.805 133.86 283.432 134.506 283.067 135.157C282.692 135.808 282.344 136.471 281.969 137.114C281.787 137.438 281.603 137.762 281.416 138.084C281.229 138.403 281.037 138.72 280.838 139.032C280.781 139.124 280.724 139.216 280.667 139.308C280.614 139.393 280.561 139.475 280.506 139.559C280.502 139.566 280.497 139.573 280.493 139.58C280.489 139.585 280.487 139.591 280.483 139.596C280.299 139.877 280.112 140.156 279.918 140.43L279.917 140.433C279.91 140.44 279.906 140.446 279.901 140.453C279.822 140.565 279.742 140.676 279.659 140.786C279.563 140.919 279.465 141.049 279.366 141.177C279.344 141.204 279.324 141.23 279.302 141.259C279.232 141.348 279.161 141.44 279.088 141.528C278.804 141.886 278.506 142.234 278.197 142.573C278.18 142.592 278.16 142.613 278.143 142.632L278.14 142.633C278.039 142.744 277.935 142.853 277.832 142.962C277.789 143.009 277.743 143.056 277.697 143.101C277.619 143.182 277.541 143.262 277.46 143.341C277.228 143.572 276.992 143.8 276.75 144.024C276.633 144.131 276.516 144.237 276.397 144.342C276.382 144.355 276.364 144.37 276.349 144.384C276.293 144.436 276.233 144.487 276.173 144.538C276.04 144.654 275.906 144.769 275.769 144.884C275.752 144.891 275.737 144.898 275.72 144.905C275.71 144.91 275.698 144.912 275.688 144.917C275.639 145.027 275.591 145.136 275.544 145.248C275.517 145.307 275.491 145.365 275.466 145.424C275.437 145.49 275.41 145.556 275.38 145.624C275.389 145.621 275.397 145.617 275.406 145.614C275.904 145.443 276.401 145.266 276.9 145.083C277.113 145.005 277.326 144.925 277.538 144.843C277.559 144.838 277.579 144.828 277.6 144.82C277.6 144.82 277.601 144.818 277.603 144.819C277.725 144.716 277.847 144.613 277.968 144.508C278.28 144.239 278.586 143.964 278.885 143.68C278.977 143.638 279.071 143.592 279.165 143.547L279.167 143.546C279.26 143.502 279.352 143.456 279.442 143.409C279.658 143.303 279.87 143.194 280.08 143.081C280.29 142.97 280.497 142.857 280.701 142.742C280.358 143.101 280.004 143.453 279.642 143.797C279.73 143.756 279.818 143.715 279.907 143.673C280.12 143.575 280.332 143.472 280.543 143.368C280.742 143.27 280.939 143.168 281.134 143.063C281.104 143.076 281.072 143.088 281.042 143.101C281.472 142.622 281.887 142.13 282.285 141.625L282.285 141.626ZM284.389 141.039C284.41 141.021 284.433 141.004 284.454 140.984C284.458 140.981 284.458 140.979 284.461 140.976C284.437 140.997 284.413 141.018 284.389 141.039ZM280.544 143.368C280.333 143.472 280.121 143.575 279.907 143.674C279.819 143.715 279.731 143.756 279.643 143.798C280.004 143.453 280.358 143.102 280.702 142.743C280.498 142.858 280.29 142.971 280.081 143.082C279.871 143.194 279.659 143.304 279.443 143.41C279.353 143.457 279.261 143.503 279.168 143.546L279.165 143.547C279.071 143.593 278.978 143.638 278.885 143.68C278.587 143.964 278.281 144.239 277.968 144.508C277.847 144.614 277.725 144.717 277.604 144.82C277.696 144.784 277.786 144.75 277.879 144.713C277.918 144.697 277.956 144.683 277.994 144.666C278.055 144.641 278.118 144.617 278.18 144.59C278.212 144.578 278.244 144.563 278.276 144.551C278.411 144.497 278.546 144.44 278.679 144.384C278.892 144.295 279.103 144.202 279.312 144.108C279.405 144.066 279.497 144.025 279.59 143.981C279.63 143.963 279.672 143.946 279.712 143.927C279.754 143.909 279.795 143.89 279.835 143.87C280.054 143.769 280.269 143.665 280.485 143.558C280.574 143.513 280.665 143.469 280.756 143.422L280.756 143.42C280.771 143.413 280.787 143.406 280.8 143.398C280.892 143.35 280.985 143.302 281.076 143.253C281.086 143.248 281.094 143.243 281.104 143.238C281.19 143.192 281.275 143.145 281.359 143.099C281.453 143.045 281.548 142.991 281.641 142.94C281.828 142.832 282.014 142.72 282.198 142.608C282.219 142.597 282.239 142.583 282.258 142.57C281.891 142.744 281.514 142.904 281.135 143.063C280.94 143.169 280.743 143.27 280.545 143.368L280.544 143.368ZM275.237 145.102C275.123 145.147 275.009 145.196 274.894 145.242C274.3 145.487 273.707 145.738 273.111 145.961C272.985 146.01 272.857 146.056 272.73 146.102C272.609 146.145 272.488 146.185 272.368 146.221C272.317 146.237 272.266 146.255 272.215 146.269C272.127 146.296 272.04 146.322 271.953 146.345C271.95 146.346 271.95 146.348 271.948 146.347C271.847 146.376 271.747 146.402 271.647 146.426C271.768 146.338 271.887 146.249 272.007 146.158C272.167 146.038 272.324 145.914 272.479 145.786C272.479 145.786 272.48 145.784 272.482 145.785C272.543 145.737 272.606 145.689 272.665 145.64C272.727 145.589 272.79 145.54 272.849 145.491C272.746 145.527 272.644 145.561 272.542 145.595C272.54 145.594 272.539 145.596 272.539 145.596C272.283 145.678 272.025 145.761 271.765 145.842C271.506 145.916 271.244 145.985 270.977 146.042L270.976 146.042C270.931 146.092 270.883 146.138 270.836 146.188C270.853 146.147 270.868 146.103 270.882 146.062C270.78 146.084 270.679 146.101 270.576 146.118C270.556 146.249 270.535 146.378 270.513 146.507C270.361 146.653 270.207 146.799 270.059 146.948C270.013 146.997 269.965 147.044 269.917 147.091C269.502 147.503 269.061 147.883 268.619 148.264C268.445 148.413 268.273 148.564 268.103 148.715C268.105 148.714 268.108 148.713 268.11 148.712C268.26 148.627 268.409 148.542 268.559 148.455C268.636 148.41 268.715 148.365 268.792 148.318C268.871 148.272 268.948 148.227 269.026 148.18C269.182 148.089 269.334 147.994 269.488 147.898C269.618 147.819 269.748 147.738 269.875 147.655C270.203 147.443 270.528 147.224 270.849 147.003C270.851 147.004 270.851 147.002 270.851 147.002C270.907 146.964 270.962 146.926 271.017 146.889C271.088 146.835 271.161 146.783 271.234 146.73C271.265 146.728 271.291 146.726 271.319 146.723C271.397 146.717 271.476 146.708 271.554 146.697C271.659 146.685 271.761 146.67 271.864 146.653L271.866 146.652C271.911 146.644 271.956 146.635 272.001 146.627C272.1 146.609 272.2 146.59 272.297 146.569C272.613 146.502 272.926 146.419 273.235 146.33C273.549 146.232 273.861 146.134 274.17 146.033C274.17 146.033 274.172 146.033 274.173 146.031C274.45 145.94 274.725 145.848 274.999 145.756C275.001 145.754 275.004 145.753 275.007 145.752C275.13 145.711 275.257 145.668 275.382 145.623C275.412 145.556 275.439 145.489 275.468 145.423C275.493 145.364 275.519 145.306 275.546 145.248C275.593 145.136 275.641 145.026 275.69 144.917C275.546 144.974 275.405 145.033 275.261 145.092C275.253 145.096 275.246 145.098 275.238 145.101L275.237 145.102ZM264.627 147.979C264.628 147.965 264.631 147.949 264.632 147.933C264.59 147.867 264.553 147.798 264.516 147.728C264.412 147.523 264.328 147.309 264.267 147.092C264.234 146.985 264.209 146.88 264.187 146.774C264.051 146.117 264.044 145.456 264.078 144.812C264.117 144.165 264.198 143.544 264.262 142.915C264.33 142.288 264.41 141.661 264.49 141.036C264.528 140.745 264.568 140.454 264.61 140.163C264.615 140.11 264.623 140.056 264.632 140.002C264.637 139.998 264.643 139.993 264.649 139.987C264.661 139.978 264.672 139.97 264.684 139.959C264.739 139.595 264.8 139.231 264.867 138.868C265.075 137.702 265.326 136.542 265.634 135.393C265.714 135.101 265.8 134.81 265.888 134.521C265.915 134.437 265.94 134.351 265.967 134.268C266.012 134.126 266.057 133.986 266.103 133.846C266.123 133.781 266.143 133.718 266.165 133.654C266.072 133.662 265.98 133.67 265.889 133.681C265.898 133.648 265.908 133.614 265.915 133.58C265.914 133.578 265.912 133.577 265.909 133.578C265.9 133.613 265.89 133.647 265.882 133.683C265.873 133.709 265.866 133.734 265.859 133.761L265.855 133.771C265.848 133.804 265.838 133.838 265.829 133.871C265.814 133.927 265.799 133.981 265.786 134.037C265.743 134.197 265.702 134.36 265.663 134.521C265.618 134.698 265.574 134.874 265.533 135.051C265.505 135.17 265.477 135.289 265.45 135.408C265.417 135.544 265.387 135.681 265.358 135.818C265.318 135.994 265.28 136.17 265.244 136.348C265.203 136.54 265.163 136.732 265.126 136.926C265.102 137.044 265.08 137.161 265.057 137.277C265.024 137.451 264.991 137.625 264.961 137.797C264.89 138.184 264.823 138.571 264.761 138.958C264.752 139.012 264.743 139.064 264.737 139.118C264.709 139.284 264.683 139.449 264.658 139.618C264.636 139.755 264.615 139.893 264.597 140.032C264.588 140.086 264.581 140.139 264.573 140.193C264.523 140.538 264.475 140.881 264.431 141.226C264.351 141.852 264.271 142.479 264.203 143.106C264.139 143.735 264.058 144.355 264.019 145.003C263.985 145.647 263.992 146.308 264.128 146.964C264.137 147.005 264.146 147.048 264.156 147.09C264.222 147.374 264.323 147.655 264.457 147.919C264.476 147.955 264.495 147.991 264.516 148.028C264.535 148.059 264.552 148.093 264.573 148.123C264.58 148.136 264.588 148.148 264.595 148.158C264.598 148.163 264.602 148.169 264.604 148.174L264.605 148.172C264.615 148.108 264.622 148.045 264.627 147.98L264.627 147.979ZM266.329 132.187C266.309 132.252 266.287 132.314 266.269 132.377C266.323 132.204 266.379 132.032 266.437 131.858C266.399 131.967 266.365 132.077 266.329 132.187ZM260.138 140.74C260.064 140.748 259.992 140.761 259.918 140.773C259.864 140.784 259.81 140.794 259.755 140.805C259.673 140.819 259.59 140.838 259.51 140.857C259.469 140.866 259.429 140.876 259.39 140.887C259.36 140.894 259.331 140.903 259.302 140.909C259.285 140.914 259.269 140.919 259.252 140.924C259.153 140.95 259.052 140.979 258.955 141.01C258.906 141.025 258.858 141.042 258.81 141.057L258.808 141.058C258.679 141.1 258.554 141.145 258.43 141.195C258.415 141.2 258.401 141.206 258.386 141.211C258.325 141.234 258.265 141.258 258.205 141.283C258.168 141.298 258.134 141.313 258.099 141.329C258.081 141.337 258.061 141.345 258.044 141.354L258.042 141.353C257.483 141.598 256.948 141.894 256.447 142.241L256.447 142.243C256.394 142.277 256.342 142.314 256.291 142.351L256.138 142.463C256.116 142.478 256.096 142.494 256.073 142.512C255.993 142.572 255.914 142.636 255.833 142.698C255.814 142.712 255.796 142.727 255.778 142.742C255.734 142.777 255.692 142.813 255.65 142.849C255.606 142.885 255.564 142.921 255.524 142.957C255.44 143.03 255.357 143.104 255.276 143.181L255.275 143.183C255.287 143.452 255.303 143.721 255.322 143.989C255.325 144.034 255.33 144.076 255.334 144.119C255.481 143.993 255.629 143.87 255.78 143.749C255.801 143.731 255.824 143.714 255.845 143.696C255.871 143.676 255.895 143.654 255.921 143.634C255.997 143.574 256.072 143.514 256.148 143.454C256.237 143.386 256.326 143.317 256.414 143.251C256.435 143.233 256.457 143.218 256.48 143.201C256.524 143.167 256.567 143.134 256.612 143.101C256.929 142.865 257.253 142.638 257.579 142.419L257.58 142.417C257.584 142.416 257.587 142.415 257.59 142.412C257.625 142.388 257.664 142.364 257.699 142.34C257.724 142.324 257.749 142.307 257.777 142.291C257.78 142.288 257.781 142.286 257.784 142.285C257.833 142.252 257.884 142.219 257.938 142.187C257.957 142.175 257.976 142.162 257.995 142.15C258.105 142.076 258.218 142.006 258.334 141.937C258.351 141.924 258.37 141.913 258.388 141.903C258.421 141.881 258.455 141.861 258.488 141.84C258.616 141.761 258.747 141.682 258.879 141.605C258.993 141.537 259.106 141.471 259.225 141.408C259.241 141.398 259.259 141.388 259.275 141.379L259.276 141.377C259.388 141.314 259.495 141.255 259.605 141.192C259.762 141.105 259.918 141.018 260.077 140.93C260.215 140.854 260.356 140.777 260.496 140.699C260.418 140.705 260.339 140.714 260.26 140.724C260.218 140.729 260.177 140.733 260.136 140.74L260.138 140.74ZM261.632 132.627C261.705 132.603 261.776 132.58 261.847 132.558C261.954 132.523 262.06 132.491 262.167 132.46C262.189 132.453 262.212 132.446 262.236 132.44C262.213 132.444 262.191 132.452 262.168 132.458L262.361 132.229L262.54 132.019C262.664 131.872 262.787 131.73 262.914 131.584C262.897 131.585 262.881 131.588 262.865 131.59C262.768 131.603 262.67 131.62 262.573 131.637C262.459 131.656 262.346 131.678 262.233 131.702C262.183 131.712 262.133 131.722 262.083 131.734C262.055 131.74 262.03 131.746 262.002 131.753C261.994 131.758 261.989 131.767 261.983 131.773C261.955 131.804 261.929 131.837 261.9 131.867C261.916 131.831 261.934 131.799 261.952 131.763C261.932 131.767 261.914 131.771 261.893 131.776C261.781 131.803 261.668 131.831 261.557 131.86C261.523 131.994 261.493 132.128 261.469 132.265C261.384 132.375 261.299 132.486 261.221 132.598C261.165 132.674 261.111 132.75 261.06 132.825C261.093 132.813 261.128 132.8 261.161 132.788C261.317 132.733 261.475 132.678 261.632 132.627L261.632 132.627ZM255.099 144.326C255.176 144.255 255.255 144.188 255.335 144.121C255.311 144.14 255.288 144.159 255.264 144.179C255.209 144.227 255.153 144.275 255.099 144.326L255.099 144.326ZM291.868 128.085C291.87 128.048 291.875 128.009 291.882 127.972C291.902 127.913 291.921 127.854 291.939 127.795C291.94 127.792 291.94 127.785 291.942 127.781C291.923 127.836 291.905 127.893 291.886 127.948C291.809 128.178 291.729 128.407 291.648 128.636C291.722 128.451 291.796 128.268 291.868 128.084L291.868 128.085ZM291.38 128.605C291.219 129.107 291.046 129.605 290.86 130.099C290.528 130.99 290.157 131.864 289.746 132.716C289.769 132.68 289.791 132.641 289.812 132.604C290.12 132.051 290.405 131.489 290.67 130.919C290.838 130.552 291.004 130.182 291.161 129.813L291.162 129.81C291.289 129.297 291.399 128.781 291.49 128.264C291.455 128.378 291.417 128.491 291.38 128.604L291.38 128.605ZM288.644 133.812L288.648 133.799C288.668 133.734 288.687 133.673 288.708 133.609C288.788 133.342 288.863 133.075 288.935 132.807C288.967 132.692 288.998 132.579 289.027 132.464C289.083 132.248 289.136 132.033 289.185 131.818C289.217 131.69 289.247 131.562 289.275 131.432C289.432 130.693 289.587 129.954 289.712 129.214C289.974 127.736 290.209 126.25 290.365 124.748C290.245 125.106 290.129 125.466 290.019 125.826C289.979 125.952 289.943 126.074 289.907 126.198C289.836 126.432 289.767 126.668 289.698 126.903C289.631 127.138 289.562 127.374 289.497 127.61C289.439 127.821 289.383 128.031 289.326 128.243C289.25 128.522 289.176 128.802 289.105 129.081C288.908 129.806 288.74 130.534 288.543 131.254C288.359 131.975 288.166 132.694 287.943 133.398C287.923 133.461 287.905 133.526 287.883 133.588C287.848 133.709 287.811 133.826 287.772 133.945L287.764 133.968C287.715 134.124 287.663 134.278 287.61 134.431C287.538 134.639 287.462 134.847 287.384 135.054L287.383 135.056C287.303 135.268 287.219 135.479 287.134 135.687C287.101 135.771 287.067 135.852 287.032 135.934C286.998 136.013 286.964 136.094 286.928 136.172C286.908 136.219 286.888 136.265 286.867 136.313L286.866 136.315C286.831 136.391 286.797 136.466 286.762 136.542C286.689 136.704 286.613 136.863 286.535 137.021C286.458 137.182 286.378 137.339 286.296 137.496C286.097 137.876 285.889 138.252 285.668 138.622C285.595 138.747 285.521 138.868 285.445 138.991C285.281 139.16 285.114 139.327 284.944 139.49C284.605 139.817 284.254 140.131 283.892 140.429C283.865 140.451 283.838 140.473 283.81 140.493C284.47 140.37 285.149 140.294 285.821 140.205C285.932 140.098 286.04 139.986 286.145 139.872C286.218 139.656 286.289 139.438 286.358 139.22C286.411 139.055 286.462 138.89 286.514 138.722C286.65 138.274 286.784 137.824 286.913 137.371C286.996 137.084 287.079 136.797 287.168 136.51C287.215 136.349 287.264 136.189 287.316 136.028L287.316 136.026C287.336 135.963 287.356 135.901 287.375 135.838C287.436 135.779 287.496 135.72 287.556 135.658C287.698 135.516 287.835 135.368 287.97 135.216C287.908 135.462 287.851 135.71 287.795 135.958C287.791 135.976 287.787 135.993 287.785 136.012L287.769 136.076C287.773 136.069 287.778 136.062 287.781 136.052C287.795 136.026 287.806 135.998 287.82 135.971C287.848 135.907 287.879 135.842 287.908 135.778C287.943 135.702 287.976 135.625 288.007 135.547C288.037 135.48 288.065 135.411 288.092 135.343C288.107 135.306 288.122 135.269 288.137 135.234C288.184 135.115 288.23 134.995 288.274 134.875C288.28 134.864 288.283 134.855 288.287 134.844C288.287 134.842 288.291 134.839 288.291 134.837C288.293 134.833 288.292 134.829 288.293 134.827C288.374 134.609 288.45 134.391 288.524 134.17C288.566 134.052 288.605 133.931 288.645 133.812L288.644 133.812ZM282.239 141.657C282.091 141.757 281.94 141.852 281.789 141.947C281.619 142.055 281.446 142.161 281.271 142.262C281.189 142.31 281.107 142.357 281.026 142.405C281.026 142.405 281.025 142.406 281.022 142.408C280.918 142.467 280.813 142.525 280.709 142.584C280.615 142.635 280.519 142.686 280.426 142.738C280.332 142.79 280.237 142.841 280.141 142.892C280.024 142.955 279.906 143.017 279.785 143.075C279.761 143.088 279.735 143.103 279.71 143.115C279.684 143.127 279.658 143.141 279.633 143.154C279.594 143.176 279.553 143.195 279.508 143.216C279.506 143.217 279.503 143.218 279.503 143.22C279.49 143.226 279.477 143.234 279.462 143.24C279.385 143.279 279.309 143.317 279.231 143.353C279.228 143.355 279.228 143.357 279.225 143.358C279.157 143.391 279.086 143.425 279.015 143.458C278.659 143.629 278.298 143.795 277.937 143.956C277.765 144.033 277.592 144.108 277.42 144.183L277.415 144.186C277.256 144.255 277.095 144.325 276.936 144.394C277.284 144.149 277.623 143.889 277.952 143.615C278.076 143.513 278.197 143.408 278.318 143.3C278.354 143.27 278.387 143.24 278.421 143.209C278.44 143.191 278.461 143.173 278.481 143.152C278.52 143.119 278.555 143.085 278.59 143.051L278.595 143.048C278.61 143.035 278.624 143.02 278.639 143.007C278.728 142.926 278.816 142.842 278.901 142.756C279.037 142.624 279.168 142.491 279.297 142.352C279.314 142.335 279.331 142.318 279.348 142.298C279.414 142.23 279.479 142.158 279.541 142.087C279.553 142.077 279.564 142.064 279.574 142.053C279.588 142.038 279.599 142.025 279.612 142.011L279.613 142.009C279.74 141.868 279.863 141.725 279.985 141.58L279.986 141.578C279.995 141.571 280.002 141.561 280.009 141.552C280.071 141.477 280.133 141.401 280.196 141.325C280.23 141.281 280.264 141.238 280.297 141.195C280.298 141.193 280.301 141.192 280.301 141.19C280.354 141.122 280.408 141.054 280.459 140.984C280.835 140.491 281.184 139.976 281.514 139.454C281.911 138.804 282.283 138.143 282.633 137.475C282.972 136.799 283.311 136.126 283.62 135.441C283.745 135.173 283.867 134.904 283.99 134.635C284.107 134.378 284.222 134.123 284.335 133.865C284.342 133.853 284.347 133.838 284.353 133.825L284.355 133.82C284.361 133.809 284.366 133.794 284.372 133.783L284.373 133.779C284.493 133.507 284.612 133.232 284.727 132.959C284.844 132.683 284.956 132.408 285.069 132.131C285.083 132.096 285.098 132.059 285.113 132.024L285.115 132.017C285.179 131.858 285.243 131.697 285.303 131.536C285.335 131.455 285.367 131.375 285.398 131.293C285.327 131.4 285.259 131.506 285.19 131.613L285.189 131.615C285.171 131.642 285.154 131.668 285.138 131.696C285.018 131.878 284.902 132.061 284.787 132.246C284.773 132.267 284.759 132.29 284.746 132.31L284.745 132.312C284.739 132.323 284.732 132.333 284.726 132.343C284.652 132.459 284.58 132.575 284.51 132.692L284.509 132.694C284.495 132.716 284.481 132.739 284.467 132.761C284.374 132.914 284.281 133.065 284.19 133.219C283.805 133.861 283.432 134.507 283.067 135.157C282.692 135.808 282.344 136.472 281.969 137.115C281.787 137.439 281.604 137.763 281.416 138.085C281.229 138.404 281.037 138.72 280.839 139.033C280.782 139.125 280.724 139.217 280.667 139.308C280.615 139.393 280.561 139.476 280.506 139.56C280.502 139.567 280.497 139.574 280.493 139.58C280.489 139.585 280.487 139.591 280.483 139.596C280.299 139.877 280.112 140.156 279.918 140.43L279.917 140.434C279.911 140.44 279.906 140.447 279.902 140.454C279.823 140.566 279.742 140.676 279.66 140.787C279.563 140.92 279.465 141.05 279.366 141.178C279.344 141.204 279.324 141.231 279.302 141.259C279.233 141.349 279.161 141.44 279.088 141.528C278.804 141.887 278.507 142.234 278.197 142.573C278.18 142.593 278.16 142.613 278.143 142.633L278.14 142.634C278.039 142.744 277.936 142.853 277.832 142.963C277.789 143.009 277.743 143.056 277.698 143.102C277.619 143.182 277.541 143.262 277.461 143.342C277.229 143.573 276.992 143.801 276.75 144.024C276.633 144.131 276.516 144.238 276.398 144.342C276.382 144.356 276.365 144.371 276.349 144.384C276.293 144.437 276.233 144.488 276.174 144.538C276.041 144.655 275.906 144.77 275.769 144.885C275.752 144.892 275.737 144.899 275.72 144.906C275.71 144.911 275.698 144.913 275.688 144.918C275.64 145.028 275.591 145.137 275.544 145.249C275.517 145.307 275.491 145.365 275.466 145.424C275.437 145.49 275.41 145.557 275.38 145.624C275.39 145.621 275.397 145.618 275.407 145.615C275.904 145.444 276.401 145.267 276.901 145.084C277.113 145.006 277.326 144.926 277.538 144.843C277.559 144.838 277.579 144.828 277.601 144.821C277.601 144.821 277.601 144.819 277.603 144.82C277.725 144.717 277.847 144.614 277.968 144.508C278.28 144.24 278.586 143.964 278.885 143.68C278.978 143.638 279.071 143.593 279.165 143.547L279.167 143.546C279.26 143.503 279.352 143.456 279.442 143.41C279.658 143.304 279.871 143.194 280.081 143.082C280.29 142.971 280.497 142.858 280.701 142.743C280.358 143.102 280.004 143.453 279.643 143.797C279.731 143.756 279.819 143.715 279.907 143.674C280.12 143.575 280.333 143.472 280.544 143.368C280.742 143.27 280.939 143.169 281.134 143.063C281.104 143.076 281.072 143.088 281.043 143.101C281.472 142.622 281.887 142.13 282.285 141.626C282.269 141.637 282.255 141.647 282.239 141.656L282.239 141.657ZM303.613 133.556C303.645 133.452 303.675 133.348 303.704 133.245C303.706 133.233 303.711 133.22 303.715 133.208C303.73 133.151 303.744 133.092 303.759 133.036C303.785 132.938 303.809 132.839 303.832 132.742C304.061 131.803 304.269 130.862 304.421 129.902C304.374 130.008 304.328 130.114 304.285 130.222C304.173 130.488 304.064 130.756 303.961 131.023C303.857 131.292 303.757 131.561 303.659 131.831C303.566 132.089 303.473 132.35 303.385 132.61C303.304 132.836 303.226 133.062 303.147 133.285C303.106 133.395 303.065 133.507 303.023 133.617C302.981 133.727 302.937 133.834 302.889 133.941C302.88 133.961 302.871 133.981 302.862 134.001C302.853 134.022 302.845 134.04 302.836 134.06C302.8 134.14 302.763 134.22 302.726 134.297C302.668 134.416 302.61 134.533 302.549 134.649C302.508 134.725 302.467 134.802 302.424 134.877C302.366 134.977 302.306 135.076 302.245 135.175C302.007 135.575 301.724 135.946 301.425 136.304C301.131 136.667 300.796 136.996 300.448 137.311C300.427 137.331 300.405 137.351 300.382 137.368C300.382 137.368 300.382 137.37 300.38 137.369L300.379 137.371C300.114 137.606 299.834 137.827 299.541 138.033C299.535 138.037 299.527 138.043 299.521 138.047C299.451 138.097 299.382 138.144 299.311 138.191C299.294 138.204 299.275 138.217 299.256 138.229C299.294 138.154 299.334 138.077 299.37 138.001C299.42 137.901 299.471 137.802 299.519 137.701C299.526 137.687 299.532 137.674 299.539 137.66C299.642 137.449 299.743 137.236 299.841 137.021C299.886 136.921 299.931 136.823 299.976 136.723C299.979 136.713 299.984 136.706 299.987 136.697L299.989 136.691C300.231 136.152 300.455 135.604 300.662 135.048C300.722 134.89 300.781 134.731 300.834 134.571C300.888 134.421 300.939 134.27 300.989 134.119C301.031 133.998 301.068 133.877 301.106 133.755C301.127 133.695 301.146 133.634 301.165 133.573L301.166 133.571C301.188 133.507 301.207 133.442 301.227 133.377C301.234 133.35 301.243 133.326 301.25 133.299C301.284 133.189 301.315 133.08 301.346 132.968C301.383 132.837 301.419 132.707 301.454 132.578C301.483 132.474 301.509 132.37 301.537 132.264C301.579 132.095 301.621 131.924 301.661 131.755C301.693 131.614 301.725 131.474 301.755 131.332C301.758 131.317 301.762 131.299 301.766 131.283C301.776 131.234 301.787 131.185 301.798 131.136C301.866 131.031 301.932 130.926 301.996 130.82C302.035 130.755 302.072 130.69 302.11 130.625C302.258 130.367 302.398 130.104 302.527 129.835C302.581 129.721 302.633 129.609 302.685 129.496C302.735 129.381 302.785 129.268 302.833 129.154C302.93 128.924 303.019 128.689 303.103 128.455C303.129 128.38 303.15 128.305 303.174 128.23L303.175 128.228C303.189 128.188 303.202 128.151 303.214 128.111C303.222 128.086 303.228 128.063 303.237 128.038C303.248 127.998 303.262 127.961 303.273 127.92C303.284 127.884 303.294 127.849 303.304 127.813C303.315 127.775 303.327 127.736 303.338 127.698C303.361 127.62 303.383 127.543 303.402 127.464C303.413 127.427 303.424 127.389 303.433 127.35C303.45 127.29 303.465 127.228 303.478 127.167C303.497 127.098 303.513 127.028 303.528 126.955C303.551 126.864 303.571 126.77 303.59 126.68C303.609 126.594 303.627 126.507 303.641 126.422C303.718 126.031 303.778 125.637 303.826 125.243C304.084 123.06 303.908 120.849 303.429 118.72C302.941 116.593 302.173 114.548 301.258 112.59C300.8 111.609 300.31 110.645 299.806 109.693C299.291 108.744 298.769 107.8 298.229 106.868C298.497 107.445 298.769 108.02 299.04 108.594C299.23 108.994 299.416 109.394 299.598 109.796C300.052 110.771 300.493 111.753 300.898 112.747C301.202 113.491 301.492 114.242 301.757 115C302.068 115.885 302.345 116.777 302.576 117.681C302.642 117.939 302.704 118.197 302.761 118.457C302.79 118.587 302.819 118.717 302.845 118.848C303.279 120.926 303.416 123.069 303.188 125.172C303.175 125.288 303.161 125.401 303.147 125.516C303.132 125.631 303.116 125.745 303.097 125.859C303.063 126.085 303.023 126.309 302.979 126.534L302.976 126.543C302.96 126.626 302.944 126.709 302.924 126.79C302.905 126.889 302.881 126.986 302.858 127.083C302.84 127.161 302.821 127.239 302.8 127.318C302.792 127.353 302.782 127.389 302.771 127.426C302.746 127.522 302.72 127.621 302.691 127.718C302.659 127.835 302.622 127.953 302.585 128.071L302.585 128.073C302.567 128.136 302.547 128.199 302.526 128.261L302.525 128.263C302.401 128.65 302.26 129.028 302.098 129.402C302.147 129.056 302.185 128.708 302.22 128.359C302.286 127.664 302.325 126.965 302.33 126.268C302.33 126.152 302.331 126.035 302.331 125.919C302.329 125.687 302.326 125.454 302.318 125.222C302.31 124.99 302.298 124.758 302.284 124.525C302.276 124.408 302.268 124.292 302.259 124.177C302.251 124.061 302.241 123.945 302.23 123.83C302.211 123.636 302.188 123.441 302.163 123.245C302.16 123.229 302.159 123.214 302.158 123.199C302.136 123.044 302.115 122.887 302.091 122.731C302.055 122.489 302.016 122.248 301.971 122.007C301.941 121.834 301.905 121.662 301.87 121.492C301.837 121.333 301.801 121.173 301.765 121.017C301.747 120.935 301.727 120.852 301.706 120.769C301.67 120.622 301.633 120.474 301.592 120.327C301.543 120.139 301.491 119.951 301.433 119.764C301.414 119.697 301.394 119.629 301.371 119.562C301.335 119.446 301.299 119.33 301.259 119.216C301.226 119.109 301.19 119.002 301.151 118.896C301.103 118.759 301.054 118.622 301.003 118.485C300.942 118.324 300.881 118.168 300.817 118.012C300.764 117.881 300.711 117.753 300.656 117.627C300.652 117.62 300.649 117.612 300.645 117.604C300.592 117.478 300.536 117.354 300.48 117.231C300.472 117.216 300.466 117.199 300.456 117.183C300.395 117.05 300.331 116.918 300.265 116.786C300.264 116.779 300.26 116.772 300.256 116.766C300.175 116.603 300.091 116.44 300.003 116.279C299.917 116.116 299.826 115.954 299.734 115.793C299.66 115.664 299.585 115.537 299.506 115.411C299.494 115.39 299.482 115.371 299.468 115.35C299.446 115.312 299.421 115.274 299.396 115.236C299.315 115.105 299.231 114.977 299.145 114.848C299.344 115.191 299.532 115.538 299.707 115.889C299.741 115.956 299.772 116.022 299.804 116.09C299.836 116.155 299.867 116.223 299.898 116.291C299.942 116.378 299.981 116.467 300.02 116.554C300.084 116.691 300.143 116.827 300.2 116.964C300.203 116.968 300.204 116.972 300.206 116.977C300.359 117.342 300.501 117.711 300.631 118.085C300.761 118.456 300.881 118.833 300.989 119.214C301.418 120.734 301.661 122.299 301.74 123.868C301.755 124.134 301.766 124.401 301.77 124.668C301.774 124.935 301.775 125.201 301.771 125.467C301.77 125.572 301.766 125.674 301.765 125.776C301.761 125.939 301.755 126.103 301.746 126.267C301.734 126.532 301.716 126.798 301.693 127.063C301.688 127.135 301.682 127.207 301.674 127.276C301.666 127.387 301.655 127.495 301.643 127.604C301.63 127.739 301.613 127.872 301.599 128.006C301.597 128.016 301.596 128.026 301.594 128.036C301.58 128.155 301.564 128.276 301.548 128.395C301.533 128.486 301.52 128.579 301.508 128.669C301.497 128.75 301.484 128.829 301.47 128.911C301.43 129.154 301.389 129.394 301.342 129.633C301.312 129.785 301.282 129.938 301.251 130.09C301.242 130.133 301.232 130.174 301.224 130.217C301.144 130.592 301.055 130.965 300.954 131.335C300.919 131.479 300.88 131.623 300.837 131.764C300.816 131.843 300.793 131.922 300.77 132C300.765 132.027 300.755 132.054 300.746 132.08L300.746 132.082C300.719 132.176 300.689 132.269 300.659 132.363C300.64 132.429 300.618 132.493 300.597 132.559C300.539 132.745 300.477 132.93 300.413 133.115C300.296 133.451 300.175 133.784 300.045 134.114C300 134.233 299.952 134.351 299.904 134.467C299.86 134.576 299.816 134.685 299.77 134.791L299.768 134.797C299.753 134.836 299.735 134.874 299.72 134.913C299.71 134.935 299.7 134.957 299.69 134.979C299.57 135.266 299.444 135.549 299.315 135.83C299.243 135.982 299.172 136.132 299.101 136.285C299.031 136.429 298.961 136.571 298.89 136.715C298.823 136.848 298.756 136.98 298.689 137.113C298.686 137.116 298.684 137.12 298.683 137.123C298.617 137.252 298.55 137.38 298.482 137.509C298.483 137.507 298.483 137.505 298.482 137.502C298.508 137.343 298.532 137.183 298.553 137.024C298.615 136.542 298.66 136.06 298.743 135.577C298.887 134.677 299.069 133.784 299.257 132.887C299.397 132.228 299.54 131.567 299.676 130.903C299.71 130.733 299.744 130.566 299.775 130.398C299.783 130.363 299.791 130.329 299.797 130.293C299.813 130.204 299.832 130.114 299.848 130.023C299.851 130.009 299.854 129.993 299.857 129.98C299.87 129.904 299.885 129.827 299.899 129.75C299.902 129.734 299.905 129.72 299.906 129.704C299.965 129.383 300.019 129.063 300.068 128.739C300.084 128.639 300.1 128.537 300.114 128.437C300.117 128.416 300.119 128.398 300.121 128.378C300.147 128.214 300.168 128.049 300.19 127.884C300.209 127.736 300.226 127.589 300.241 127.442C300.254 127.322 300.264 127.202 300.275 127.079C300.285 126.958 300.293 126.837 300.301 126.718C300.309 126.596 300.316 126.474 300.322 126.354C300.335 126.098 300.342 125.839 300.341 125.582C300.343 125.528 300.342 125.475 300.342 125.42C300.342 125.384 300.343 125.346 300.339 125.307C300.34 125.276 300.34 125.246 300.338 125.214C300.339 125.187 300.339 125.157 300.336 125.129C300.335 125.04 300.332 124.952 300.327 124.863C300.326 124.78 300.321 124.696 300.315 124.612C300.313 124.54 300.308 124.468 300.303 124.397C300.302 124.388 300.302 124.382 300.301 124.373C300.294 124.265 300.284 124.159 300.273 124.052C300.265 123.954 300.255 123.856 300.244 123.76C300.242 123.751 300.241 123.744 300.239 123.735C300.233 123.668 300.226 123.598 300.216 123.529C300.213 123.496 300.207 123.463 300.202 123.431C300.174 123.223 300.139 123.016 300.1 122.808C300.087 122.736 300.072 122.663 300.057 122.591C300.044 122.519 300.029 122.446 300.012 122.375C299.974 122.21 299.934 122.045 299.892 121.883C299.648 120.983 299.301 120.106 298.82 119.306C298.77 119.225 298.718 119.144 298.666 119.067C298.638 119.023 298.612 118.983 298.583 118.945C298.533 118.871 298.482 118.799 298.429 118.727C298.362 118.635 298.293 118.543 298.221 118.455C298.219 118.454 298.22 118.452 298.218 118.452C298.154 118.373 298.089 118.293 298.023 118.218C297.799 117.961 297.557 117.721 297.299 117.501C297.273 117.477 297.245 117.455 297.217 117.432C297.184 117.404 297.153 117.379 297.118 117.352C297.072 117.315 297.025 117.28 296.978 117.244C297.045 117.308 297.113 117.373 297.177 117.438C297.208 117.469 297.238 117.499 297.267 117.53C297.276 117.54 297.287 117.55 297.296 117.561C297.321 117.587 297.344 117.612 297.367 117.636C297.437 117.709 297.505 117.785 297.569 117.862C297.59 117.886 297.611 117.911 297.632 117.935C297.665 117.974 297.697 118.014 297.728 118.053C297.832 118.184 297.933 118.318 298.029 118.454C298.074 118.514 298.117 118.577 298.158 118.642C298.161 118.641 298.161 118.645 298.161 118.645C298.209 118.719 298.258 118.792 298.303 118.869C298.355 118.95 298.403 119.035 298.451 119.121C298.453 119.121 298.454 119.124 298.455 119.126C298.51 119.224 298.564 119.324 298.613 119.423C299.032 120.226 299.321 121.093 299.506 121.976C299.871 123.747 299.878 125.58 299.648 127.373C299.419 129.174 299.001 130.958 298.671 132.771C298.502 133.678 298.354 134.591 298.257 135.513C298.24 135.708 298.219 135.903 298.202 136.099C298.2 136.111 298.2 136.122 298.199 136.132C298.189 136.232 298.181 136.33 298.175 136.431C298.162 136.584 298.155 136.738 298.152 136.892C298.151 136.945 298.15 136.995 298.149 137.045C298.149 137.083 298.149 137.119 298.151 137.156C298.151 137.192 298.152 137.228 298.154 137.264C298.157 137.381 298.166 137.496 298.177 137.611C298.183 137.66 298.189 137.708 298.196 137.755C298.202 137.805 298.212 137.855 298.22 137.905C298.223 137.927 298.227 137.947 298.232 137.97C298.208 138.012 298.186 138.053 298.161 138.095C297.904 138.555 297.635 139.008 297.356 139.456C297.29 139.562 297.224 139.667 297.156 139.772C297.07 139.911 296.981 140.046 296.891 140.182C296.713 140.454 296.529 140.724 296.343 140.992C296.25 141.126 296.155 141.26 296.061 141.391C295.948 141.548 295.835 141.703 295.721 141.857C295.608 142.012 295.492 142.163 295.376 142.317C295.367 142.328 295.357 142.34 295.349 142.351C295.377 142.277 295.407 142.201 295.435 142.127C295.505 141.944 295.574 141.764 295.643 141.582C295.754 141.294 295.859 141.003 295.961 140.714C296.066 140.424 296.166 140.135 296.273 139.845L296.872 138.099C296.896 138.024 296.921 137.951 296.945 137.877C296.955 137.849 296.962 137.82 296.972 137.792C297.017 137.65 297.063 137.506 297.104 137.358C297.116 137.315 297.129 137.273 297.139 137.231C297.168 137.131 297.193 137.028 297.215 136.927C297.226 136.884 297.235 136.84 297.245 136.798C297.255 136.746 297.265 136.693 297.274 136.641C297.286 136.578 297.297 136.514 297.305 136.449C297.315 136.383 297.324 136.317 297.33 136.249C297.365 135.864 297.351 135.48 297.309 135.107C297.287 134.892 297.253 134.679 297.215 134.469C297.208 134.429 297.199 134.388 297.192 134.348C297.176 134.266 297.16 134.185 297.143 134.103C297.142 134.101 297.141 134.098 297.14 134.094C297.139 134.093 297.139 134.091 297.139 134.091L297.141 134.087C297.136 134.058 297.129 134.031 297.121 134.003C297.114 133.975 297.109 133.948 297.103 133.921C297.091 133.87 297.081 133.82 297.069 133.77C297.068 133.763 297.067 133.758 297.065 133.751C296.978 133.346 296.885 132.946 296.821 132.542C296.709 131.943 296.689 131.331 296.799 130.721C296.776 130.782 296.756 130.845 296.74 130.911L296.733 130.932C296.726 130.951 296.72 130.967 296.716 130.987C296.714 130.993 296.711 131 296.711 131.006C296.71 131.01 296.708 131.016 296.708 131.02C296.691 131.088 296.673 131.158 296.66 131.227C296.646 131.296 296.634 131.368 296.623 131.437C296.622 131.446 296.619 131.453 296.62 131.462C296.61 131.53 296.602 131.601 296.595 131.67C296.587 131.746 296.581 131.819 296.578 131.894C296.57 132.045 296.569 132.194 296.571 132.345C296.573 132.419 296.577 132.494 296.58 132.569C296.616 133.193 296.718 133.807 296.788 134.41C296.792 134.443 296.795 134.476 296.798 134.509C296.799 134.513 296.799 134.52 296.799 134.524C296.801 134.537 296.803 134.55 296.803 134.563C296.807 134.594 296.811 134.625 296.812 134.657C296.822 134.749 296.831 134.841 296.837 134.933C296.839 134.946 296.84 134.959 296.84 134.972L296.839 134.974C296.842 134.985 296.842 134.996 296.843 135.007C296.858 135.241 296.865 135.471 296.855 135.7L296.854 135.702C296.855 135.706 296.854 135.71 296.854 135.714C296.853 135.792 296.847 135.868 296.84 135.945C296.84 135.949 296.84 135.956 296.838 135.961C296.831 136.037 296.822 136.112 296.81 136.187C296.799 136.268 296.785 136.345 296.769 136.423C296.756 136.49 296.742 136.555 296.725 136.621C296.719 136.644 296.713 136.669 296.707 136.693C296.692 136.759 296.673 136.826 296.651 136.895C296.648 136.911 296.645 136.926 296.639 136.941C296.639 136.95 296.636 136.957 296.632 136.962C296.617 137.018 296.598 137.074 296.58 137.131C296.58 137.138 296.578 137.143 296.574 137.148L296.573 137.152C296.545 137.239 296.514 137.326 296.484 137.414L296.445 137.525C296.402 137.649 296.355 137.774 296.309 137.899L295.68 139.635C295.528 140.086 295.366 140.534 295.215 140.982C295.17 141.117 295.127 141.249 295.084 141.384C295.032 141.54 294.98 141.697 294.93 141.852C294.923 141.873 294.915 141.896 294.91 141.917C294.872 142.033 294.834 142.148 294.797 142.261C294.775 142.323 294.755 142.388 294.737 142.451C294.687 142.601 294.64 142.75 294.594 142.899C294.57 142.981 294.545 143.061 294.52 143.143L294.449 143.366L294.39 143.556C293.971 144.065 293.544 144.563 293.102 145.052C293.068 145.089 293.036 145.128 293 145.164C293.001 145.166 293.001 145.167 292.999 145.168C292.872 145.309 292.746 145.449 292.616 145.587C292.574 145.634 292.531 145.678 292.488 145.724C292.198 146.036 291.905 146.343 291.605 146.648C291.485 146.769 291.366 146.889 291.246 147.01C291.176 147.078 291.107 147.149 291.037 147.217C290.879 147.375 290.718 147.53 290.557 147.685C290.424 147.814 290.286 147.943 290.151 148.071C290.145 148.077 290.136 148.085 290.13 148.091C290.023 148.193 289.916 148.294 289.807 148.394C289.674 148.516 289.541 148.638 289.405 148.76C289.003 149.122 288.596 149.471 288.179 149.809C288.177 149.81 288.174 149.812 288.171 149.815C287.987 149.962 287.803 150.106 287.617 150.248C287.5 150.336 287.38 150.425 287.262 150.511C287.16 150.587 287.054 150.662 286.949 150.735C286.921 150.755 286.891 150.776 286.861 150.795C286.765 150.863 286.669 150.929 286.569 150.992C286.527 151.022 286.484 151.049 286.438 151.078C286.396 151.107 286.35 151.136 286.306 151.165C286.263 151.194 286.217 151.222 286.173 151.252C286.133 151.278 286.093 151.302 286.05 151.327C286.016 151.347 285.981 151.368 285.949 151.389C285.907 151.412 285.866 151.438 285.824 151.462C285.824 151.463 285.819 151.464 285.819 151.464C285.782 151.487 285.747 151.508 285.71 151.529C285.663 151.555 285.618 151.582 285.573 151.608C285.539 151.626 285.507 151.647 285.473 151.665C285.476 151.663 285.477 151.661 285.477 151.66C285.61 151.531 285.745 151.403 285.878 151.274C285.878 151.274 285.879 151.272 285.881 151.273C285.971 151.184 286.062 151.096 286.153 151.009C286.246 150.919 286.34 150.83 286.432 150.742C286.438 150.735 286.444 150.731 286.45 150.725C286.541 150.64 286.63 150.554 286.719 150.467C286.725 150.46 286.734 150.453 286.741 150.445C286.934 150.259 287.124 150.07 287.314 149.879C287.411 149.784 287.506 149.691 287.601 149.595C287.703 149.494 287.806 149.393 287.908 149.291C287.975 149.226 288.04 149.16 288.107 149.095L288.78 148.412L288.951 148.24L289.738 147.441C289.84 147.335 289.942 147.229 290.046 147.12C290.053 147.112 290.062 147.104 290.069 147.096C290.072 147.093 290.072 147.091 290.076 147.088C290.185 146.974 290.292 146.858 290.399 146.739C290.483 146.643 290.567 146.547 290.647 146.448C290.869 146.186 291.074 145.91 291.258 145.611C291.288 145.56 291.319 145.508 291.347 145.456C291.35 145.453 291.352 145.449 291.353 145.446C291.372 145.41 291.392 145.375 291.41 145.341C291.43 145.304 291.449 145.266 291.468 145.228C291.503 145.16 291.536 145.094 291.568 145.027C291.569 145.023 291.572 145.022 291.573 145.018C291.572 145.014 291.574 145.01 291.577 145.007C291.611 144.933 291.644 144.857 291.676 144.783C291.708 144.707 291.738 144.633 291.767 144.557C291.776 144.529 291.787 144.503 291.797 144.475C291.817 144.425 291.837 144.377 291.855 144.326C291.866 144.295 291.875 144.262 291.886 144.23L291.894 144.209C291.9 144.184 291.909 144.158 291.918 144.133L291.952 144.035C291.957 144.02 291.962 144.007 291.964 143.993C291.993 143.904 292.022 143.813 292.047 143.725C292.074 143.635 292.099 143.545 292.123 143.457C292.129 143.438 292.135 143.417 292.139 143.397C292.149 143.363 292.158 143.326 292.168 143.291L292.168 143.289C292.239 143.019 292.305 142.749 292.371 142.481C292.391 142.391 292.414 142.302 292.436 142.213C292.479 142.034 292.524 141.856 292.57 141.68C292.617 141.503 292.667 141.329 292.721 141.154C292.726 141.134 292.733 141.113 292.74 141.095C292.75 141.058 292.761 141.022 292.773 140.986C292.782 140.955 292.792 140.927 292.802 140.897C292.849 140.749 292.9 140.602 292.958 140.458C292.96 140.446 292.965 140.438 292.971 140.429C292.993 140.369 293.017 140.312 293.044 140.254C293.079 140.171 293.116 140.087 293.158 140.005C293.178 139.957 293.202 139.913 293.227 139.867C293.251 139.82 293.276 139.774 293.301 139.73C293.319 139.696 293.338 139.663 293.357 139.629C293.364 139.617 293.372 139.607 293.378 139.594L293.379 139.593C293.383 139.586 293.388 139.577 293.393 139.57L293.394 139.566C293.403 139.546 293.417 139.526 293.429 139.507C293.434 139.5 293.439 139.491 293.444 139.484C293.483 139.42 293.524 139.356 293.567 139.293C293.571 139.288 293.572 139.285 293.576 139.28L293.576 139.278C293.622 139.214 293.667 139.149 293.715 139.086C293.673 139.128 293.63 139.172 293.591 139.218C293.564 139.247 293.538 139.278 293.514 139.307C293.492 139.331 293.471 139.356 293.452 139.381C293.413 139.426 293.376 139.472 293.343 139.52C293.332 139.533 293.323 139.547 293.312 139.56C293.285 139.597 293.258 139.632 293.234 139.67C293.21 139.701 293.189 139.732 293.167 139.765C293.167 139.766 293.166 139.767 293.164 139.768C293.158 139.778 293.151 139.788 293.145 139.799C293.104 139.861 293.064 139.923 293.027 139.988C293.014 140.007 293.002 140.028 292.991 140.047C292.938 140.139 292.884 140.234 292.835 140.328C292.785 140.422 292.739 140.52 292.693 140.615C292.663 140.679 292.633 140.744 292.604 140.81C292.565 140.898 292.529 140.986 292.494 141.073C292.381 141.358 292.278 141.647 292.182 141.936C292.102 142.18 292.026 142.423 291.949 142.664C291.926 142.736 291.903 142.808 291.881 142.878C291.838 143.013 291.794 143.147 291.75 143.281C291.701 143.422 291.652 143.561 291.602 143.701L291.522 143.914C291.49 144 291.457 144.083 291.421 144.167C291.361 144.315 291.297 144.459 291.229 144.6C291.208 144.641 291.188 144.682 291.168 144.722C291.138 144.783 291.106 144.844 291.074 144.902C291.05 144.947 291.024 144.99 290.998 145.034C290.976 145.075 290.951 145.115 290.928 145.153C290.927 145.155 290.924 145.156 290.924 145.158C290.922 145.164 290.918 145.169 290.915 145.172C290.912 145.175 290.911 145.177 290.91 145.18C290.906 145.184 290.906 145.185 290.904 145.189C290.877 145.237 290.847 145.283 290.816 145.329C290.764 145.406 290.712 145.483 290.657 145.556C290.549 145.702 290.436 145.842 290.318 145.98C290.312 145.986 290.305 145.994 290.3 146.001C290.244 146.066 290.187 146.128 290.129 146.192C290.046 146.284 289.96 146.374 289.872 146.463L289.872 146.465C289.8 146.539 289.728 146.612 289.654 146.685C289.61 146.728 289.565 146.772 289.52 146.815C289.455 146.883 289.385 146.952 289.315 147.018L288.428 147.894L288.24 148.077C288.24 148.077 288.238 148.078 288.237 148.08L287.859 148.452L287.661 148.649C287.592 148.72 287.524 148.789 287.453 148.859C287.125 149.189 286.797 149.516 286.474 149.848L286.471 149.849C286.457 149.865 286.441 149.881 286.425 149.897C286.356 149.969 286.284 150.042 286.215 150.114C286.153 150.177 286.09 150.242 286.03 150.305C285.978 150.358 285.928 150.411 285.878 150.465C285.741 150.605 285.605 150.747 285.47 150.888C285.394 150.967 285.319 151.044 285.243 151.123C285.207 151.161 285.171 151.199 285.134 151.237C284.896 151.485 284.661 151.734 284.426 151.986L284.073 152.358C283.408 152.65 282.724 152.903 282.019 153.127C281.286 153.361 280.536 153.562 279.78 153.746C279.627 153.778 279.474 153.813 279.323 153.847C279.063 153.906 278.8 153.967 278.538 154.023C278.437 154.045 278.335 154.067 278.236 154.087C278.197 154.095 278.161 154.103 278.122 154.111C278.088 154.118 278.056 154.124 278.023 154.129C278 154.134 277.978 154.139 277.955 154.144C277.801 154.173 277.646 154.201 277.493 154.225C277.287 154.264 277.083 154.301 276.88 154.335C276.83 154.343 276.779 154.351 276.73 154.359C276.582 154.385 276.435 154.408 276.286 154.431C275.153 154.606 274.014 154.727 272.872 154.805C272.644 154.821 272.413 154.836 272.185 154.845C271.974 154.856 271.763 154.865 271.552 154.872C271.147 154.885 270.744 154.893 270.34 154.892C270.199 154.891 270.056 154.89 269.916 154.888C269.853 154.887 269.79 154.886 269.725 154.885C269.551 154.883 269.378 154.878 269.204 154.871C269.187 154.871 269.17 154.869 269.151 154.869C268.949 154.862 268.749 154.852 268.548 154.841C268.342 154.833 268.137 154.819 267.931 154.802C267.818 154.795 267.707 154.788 267.594 154.778L267.593 154.778C267.451 154.767 267.312 154.754 267.171 154.741C267.151 154.739 267.132 154.738 267.112 154.736C267.098 154.733 267.084 154.732 267.069 154.731C267.055 154.73 267.042 154.73 267.029 154.728C266.949 154.719 266.872 154.711 266.793 154.703C266.57 154.678 266.349 154.652 266.128 154.624C266.003 154.608 265.877 154.589 265.752 154.572C265.635 154.556 265.517 154.539 265.4 154.519C265.253 154.498 265.106 154.474 264.959 154.448C264.813 154.425 264.667 154.398 264.52 154.372C264.227 154.317 263.935 154.26 263.643 154.197C263.402 154.145 263.161 154.088 262.92 154.028C262.751 153.986 262.582 153.94 262.415 153.895C262.383 153.884 262.35 153.875 262.317 153.865C262.233 153.842 262.147 153.817 262.063 153.792C261.749 153.7 261.438 153.602 261.128 153.499L261.049 153.472C260.962 153.444 260.875 153.414 260.789 153.384C260.663 153.34 260.539 153.297 260.414 153.252C260.712 153.271 261.014 153.283 261.314 153.284L261.316 153.285C261.348 153.285 261.38 153.283 261.411 153.284C261.439 153.283 261.469 153.283 261.496 153.282C261.577 153.28 261.655 153.28 261.736 153.276C261.834 153.274 261.932 153.27 262.029 153.268C262.04 153.268 262.051 153.267 262.062 153.267C262.085 153.267 262.109 153.264 262.132 153.264C262.133 153.264 262.135 153.264 262.137 153.263C263.202 153.228 264.268 153.147 265.337 153.042C265.577 153.016 265.817 152.987 266.057 152.957C266.328 152.923 266.598 152.886 266.867 152.844L266.869 152.845C266.891 152.842 266.913 152.839 266.933 152.836C267.079 152.812 267.223 152.79 267.368 152.767C267.757 152.702 268.143 152.632 268.531 152.553C268.638 152.531 268.744 152.511 268.849 152.486C268.981 152.458 269.113 152.43 269.245 152.4C271.695 151.858 274.098 150.949 276.291 149.696C277.038 149.778 277.797 149.789 278.552 149.724C278.639 149.716 278.726 149.709 278.813 149.699C278.896 149.69 278.98 149.681 279.061 149.669C279.066 149.668 279.07 149.668 279.075 149.667C279.083 149.666 279.092 149.665 279.101 149.664C279.217 149.651 279.331 149.634 279.447 149.613C279.452 149.612 279.459 149.611 279.463 149.61C279.561 149.594 279.661 149.575 279.759 149.557C279.954 149.519 280.147 149.476 280.339 149.429C280.83 149.305 281.314 149.144 281.783 148.944C281.921 148.887 282.058 148.825 282.191 148.757C282.211 148.748 282.232 148.738 282.252 148.728C282.296 148.705 282.341 148.685 282.382 148.662C282.552 148.575 282.717 148.485 282.88 148.387C282.962 148.338 283.043 148.288 283.124 148.236C283.145 148.225 283.164 148.212 283.184 148.198C283.268 148.143 283.353 148.086 283.437 148.027C283.509 147.976 283.58 147.925 283.651 147.872C283.662 147.865 283.671 147.856 283.68 147.848C283.744 147.803 283.805 147.755 283.865 147.704C283.885 147.69 283.903 147.675 283.921 147.66C283.976 147.616 284.032 147.568 284.087 147.521C284.148 147.467 284.211 147.413 284.27 147.357C284.283 147.345 284.297 147.333 284.31 147.321C284.396 147.243 284.479 147.162 284.56 147.079C284.618 147.021 284.675 146.961 284.732 146.901C284.736 146.896 284.74 146.891 284.743 146.887C284.803 146.822 284.864 146.757 284.921 146.688C284.978 146.624 285.035 146.557 285.087 146.491C285.098 146.476 285.112 146.462 285.121 146.446C285.141 146.421 285.162 146.397 285.181 146.372C285.192 146.359 285.203 146.346 285.212 146.332C285.227 146.312 285.242 146.294 285.255 146.273C285.302 146.21 285.351 146.144 285.394 146.08C285.436 146.018 285.479 145.957 285.517 145.895C285.547 145.85 285.576 145.805 285.602 145.76C285.636 145.704 285.67 145.648 285.702 145.592C285.74 145.525 285.777 145.455 285.813 145.388C285.814 145.385 285.818 145.38 285.819 145.376C285.838 145.34 285.857 145.303 285.874 145.266C285.898 145.217 285.92 145.17 285.943 145.122C285.983 145.036 286.02 144.95 286.055 144.866C286.057 144.86 286.061 144.855 286.062 144.847C286.099 144.758 286.131 144.671 286.162 144.583C286.185 144.517 286.205 144.452 286.225 144.387C286.238 144.345 286.252 144.304 286.263 144.261C286.114 144.49 285.958 144.709 285.796 144.923C285.631 145.135 285.461 145.34 285.284 145.535C285.196 145.633 285.105 145.73 285.013 145.824C284.828 146.011 284.64 146.192 284.442 146.365C284.345 146.452 284.244 146.535 284.144 146.618C284.094 146.659 284.042 146.699 283.991 146.738C283.922 146.79 283.853 146.842 283.783 146.893C283.751 146.918 283.717 146.942 283.684 146.964L283.684 146.966C283.577 147.043 283.471 147.118 283.362 147.19C283.28 147.243 283.198 147.297 283.117 147.351C283.033 147.404 282.952 147.456 282.867 147.506C282.771 147.563 282.674 147.618 282.575 147.672C282.456 147.738 282.336 147.802 282.214 147.865C281.972 147.99 281.725 148.104 281.475 148.211C280.925 148.446 280.359 148.639 279.78 148.798C279.774 148.801 279.768 148.801 279.763 148.803C279.721 148.816 279.676 148.828 279.633 148.838C279.57 148.856 279.506 148.874 279.442 148.89C279.389 148.903 279.333 148.918 279.281 148.929C279.012 148.996 278.74 149.055 278.466 149.11C278.335 149.136 278.203 149.16 278.07 149.183C277.938 149.207 277.804 149.228 277.671 149.249C277.537 149.27 277.404 149.289 277.27 149.31C277.242 149.313 277.215 149.317 277.186 149.321C277.125 149.33 277.063 149.338 277.001 149.346C276.955 149.351 276.91 149.358 276.864 149.364C277.133 149.202 277.398 149.039 277.659 148.87C277.743 148.815 277.827 148.76 277.91 148.705C277.983 148.659 278.054 148.612 278.123 148.564C278.23 148.493 278.335 148.422 278.437 148.351C278.468 148.33 278.498 148.309 278.527 148.287C278.554 148.269 278.582 148.249 278.607 148.231C278.715 148.156 278.821 148.081 278.926 148.004C278.943 147.991 278.959 147.98 278.977 147.967L278.979 147.966C279.041 147.922 279.103 147.876 279.163 147.831C279.188 147.813 279.211 147.795 279.235 147.776C279.344 147.698 279.449 147.619 279.553 147.539C279.684 147.441 279.811 147.342 279.938 147.241C280.457 146.831 280.964 146.407 281.461 145.972L281.83 145.641L281.931 145.546L281.931 145.544L282.07 145.411L282.187 145.299L282.901 144.614C283.354 144.164 283.794 143.704 284.222 143.233C284.264 143.229 284.305 143.224 284.346 143.215C284.354 143.216 284.361 143.216 284.368 143.214C284.445 143.205 284.52 143.193 284.596 143.182C284.659 143.172 284.721 143.162 284.782 143.149C284.831 143.143 284.878 143.134 284.926 143.125C284.93 143.124 284.933 143.123 284.935 143.122C284.94 143.121 284.942 143.12 284.946 143.12C285.212 143.07 285.475 143.01 285.738 142.939C285.745 142.937 285.752 142.935 285.759 142.934C285.877 142.903 285.996 142.868 286.113 142.833C286.205 142.806 286.297 142.777 286.39 142.746C286.597 142.676 286.804 142.603 287.011 142.523C287.087 142.492 287.164 142.464 287.24 142.432C287.316 142.401 287.39 142.37 287.465 142.337C287.565 142.292 287.667 142.247 287.766 142.197L287.778 142.193L287.779 142.191C287.872 142.147 287.964 142.101 288.058 142.054C288.217 141.972 288.374 141.888 288.528 141.796C289.005 141.521 289.461 141.208 289.889 140.857C289.984 140.776 290.079 140.695 290.172 140.612C290.238 140.555 290.302 140.497 290.364 140.439C290.444 140.363 290.523 140.285 290.599 140.206C290.83 139.971 291.05 139.72 291.252 139.46C291.256 139.455 291.259 139.451 291.263 139.446C291.4 139.269 291.531 139.087 291.653 138.899C291.783 138.698 291.906 138.492 292.019 138.281C292.113 138.107 292.2 137.929 292.28 137.746C292.355 137.58 292.422 137.411 292.481 137.24C292.501 137.188 292.519 137.137 292.535 137.084L292.541 137.067C292.56 137.006 292.578 136.947 292.597 136.886C292.615 136.823 292.633 136.759 292.651 136.696C292.655 136.685 292.656 136.675 292.66 136.663C292.671 136.614 292.683 136.566 292.694 136.517C292.706 136.471 292.716 136.422 292.726 136.374C292.74 136.31 292.754 136.247 292.763 136.185C292.772 136.135 292.78 136.085 292.788 136.033C292.794 136.004 292.798 135.973 292.8 135.944C292.807 135.899 292.813 135.852 292.818 135.805C292.827 135.733 292.833 135.659 292.838 135.585C292.843 135.54 292.844 135.494 292.845 135.448C292.85 135.405 292.851 135.364 292.851 135.321C292.854 135.247 292.853 135.17 292.852 135.094C292.834 135.16 292.815 135.221 292.792 135.285C292.788 135.304 292.781 135.325 292.773 135.346L292.762 135.379C292.745 135.433 292.727 135.485 292.709 135.538L292.708 135.54C292.671 135.645 292.633 135.75 292.594 135.852C292.565 135.928 292.535 136.002 292.505 136.076C292.472 136.153 292.441 136.231 292.407 136.305C292.37 136.387 292.333 136.469 292.294 136.55C292.261 136.621 292.226 136.693 292.191 136.763C292.102 136.942 292.006 137.12 291.907 137.292C291.869 137.359 291.828 137.427 291.786 137.492C291.692 137.649 291.592 137.804 291.489 137.956C291.419 138.054 291.349 138.151 291.277 138.249C291.206 138.346 291.133 138.441 291.056 138.534C291.052 138.539 291.049 138.542 291.045 138.547L291.044 138.551C290.981 138.628 290.919 138.704 290.857 138.781C290.732 138.929 290.603 139.074 290.47 139.216C290.13 139.582 289.768 139.924 289.382 140.241C289.173 140.412 288.96 140.579 288.74 140.736C288.526 140.892 288.306 141.041 288.081 141.186C288.078 141.189 288.073 141.192 288.068 141.194L288.066 141.198C288.035 141.216 288.007 141.236 287.975 141.255C287.934 141.281 287.894 141.307 287.851 141.332C287.84 141.339 287.83 141.346 287.819 141.352C287.473 141.567 287.118 141.769 286.756 141.959C286.506 142.088 286.255 142.211 286.001 142.331C285.993 142.335 285.988 142.337 285.98 142.341C285.693 142.477 285.399 142.609 285.102 142.736C285.095 142.739 285.089 142.744 285.082 142.745C284.914 142.818 284.741 142.89 284.569 142.961C284.512 142.986 284.455 143.01 284.399 143.033C284.44 142.986 284.483 142.938 284.526 142.892C284.605 142.803 284.682 142.714 284.758 142.625C284.82 142.555 284.88 142.486 284.94 142.416C284.943 142.413 284.946 142.41 284.95 142.405C285.013 142.332 285.074 142.258 285.138 142.184C285.242 142.062 285.343 141.939 285.445 141.816L285.445 141.814C285.453 141.806 285.46 141.796 285.467 141.788C285.588 141.64 285.709 141.491 285.828 141.343C285.948 141.192 286.066 141.042 286.183 140.891C286.222 140.839 286.263 140.788 286.3 140.735C286.361 140.657 286.419 140.58 286.478 140.502C286.576 140.372 286.675 140.24 286.771 140.109C286.783 140.092 286.794 140.077 286.807 140.06C286.843 140.009 286.88 139.959 286.917 139.906C286.954 139.854 286.99 139.803 287.028 139.751C287.101 139.648 287.172 139.546 287.245 139.441C287.272 139.406 287.297 139.368 287.323 139.331C287.336 139.312 287.349 139.291 287.362 139.273C287.408 139.208 287.45 139.147 287.493 139.084C287.515 139.05 287.539 139.018 287.561 138.983C287.604 138.92 287.648 138.855 287.69 138.79C287.755 138.693 287.82 138.595 287.884 138.497C287.985 138.339 288.087 138.18 288.186 138.021C288.387 137.703 288.581 137.381 288.771 137.057C288.867 136.894 288.961 136.733 289.054 136.569C289.083 136.552 289.112 136.535 289.14 136.517C289.169 136.5 289.198 136.482 289.225 136.464L289.233 136.461C289.235 136.459 289.236 136.458 289.24 136.457L289.241 136.455C289.321 136.407 289.398 136.36 289.479 136.31C289.562 136.259 289.646 136.205 289.728 136.152C289.894 136.043 290.057 135.931 290.217 135.816C290.287 135.767 290.355 135.715 290.425 135.665C290.673 135.479 290.916 135.288 291.152 135.087C291.178 135.067 291.203 135.044 291.227 135.023C291.276 134.98 291.324 134.94 291.37 134.897C291.397 134.873 291.425 134.849 291.452 134.825C291.5 134.784 291.546 134.741 291.593 134.698C291.633 134.662 291.673 134.625 291.713 134.588C291.745 134.559 291.776 134.53 291.808 134.499C291.954 134.362 292.096 134.22 292.236 134.076C292.331 133.981 292.422 133.886 292.513 133.787C292.523 133.778 292.533 133.767 292.543 133.757C292.573 133.724 292.604 133.69 292.635 133.656C292.761 133.517 292.884 133.376 293.006 133.231C293.034 133.199 293.06 133.166 293.088 133.133L293.089 133.131C293.121 133.092 293.154 133.053 293.187 133.012C293.198 132.998 293.208 132.987 293.217 132.973C293.389 132.764 293.556 132.545 293.719 132.328C293.78 132.244 293.841 132.16 293.9 132.075C293.911 132.06 293.921 132.043 293.933 132.028L293.934 132.026C294.121 131.76 294.298 131.484 294.471 131.21C294.476 131.201 294.481 131.194 294.486 131.185C294.499 131.165 294.51 131.147 294.523 131.126L294.524 131.125C294.566 131.057 294.607 130.989 294.648 130.919C294.71 130.818 294.77 130.718 294.828 130.617C294.832 130.612 294.834 130.607 294.838 130.602C294.876 130.535 294.916 130.469 294.954 130.402C295.028 130.267 295.102 130.131 295.175 129.994C295.25 129.858 295.321 129.721 295.391 129.585C295.409 129.551 295.427 129.517 295.445 129.483C295.496 129.385 295.546 129.285 295.595 129.186C295.617 129.139 295.642 129.092 295.664 129.045C295.735 128.901 295.805 128.755 295.874 128.611C295.876 128.605 295.881 128.598 295.883 128.592C295.903 128.551 295.925 128.508 295.943 128.466L295.944 128.464C295.96 128.436 295.973 128.405 295.987 128.376C296.089 128.15 296.189 127.928 296.288 127.703C296.339 127.588 296.39 127.471 296.44 127.356C296.467 127.295 296.493 127.233 296.521 127.173C296.548 127.113 296.574 127.05 296.599 126.989C296.651 126.868 296.702 126.747 296.753 126.623L296.754 126.622C296.799 126.515 296.843 126.408 296.886 126.301C296.928 126.198 296.97 126.096 297.012 125.993C297.053 125.893 297.094 125.792 297.136 125.691C297.136 125.691 297.138 125.689 297.137 125.687C297.154 125.651 297.167 125.613 297.182 125.574C297.203 125.522 297.224 125.472 297.244 125.42C297.321 125.23 297.397 125.042 297.471 124.85C297.545 124.663 297.618 124.476 297.69 124.288C297.944 123.628 298.185 122.962 298.412 122.289C298.436 122.219 298.459 122.149 298.483 122.08C298.194 122.561 297.915 123.048 297.645 123.535C297.57 123.667 297.496 123.802 297.425 123.935L297.423 123.939C297.407 123.967 297.392 123.997 297.376 124.026C297.37 124.036 297.365 124.045 297.359 124.056C297.287 124.191 297.215 124.326 297.143 124.461C297.04 124.655 296.937 124.848 296.835 125.045L296.834 125.047C296.831 125.05 296.829 125.056 296.825 125.061L296.825 125.063C296.811 125.091 296.794 125.121 296.78 125.15C296.773 125.163 296.766 125.177 296.759 125.191C296.74 125.227 296.722 125.263 296.703 125.299C296.68 125.339 296.659 125.382 296.638 125.424C296.56 125.576 296.483 125.726 296.407 125.878L296.406 125.88C296.384 125.921 296.363 125.962 296.342 126.004C296.336 126.016 296.329 126.031 296.322 126.043C296.23 126.22 296.14 126.399 296.049 126.576C295.982 126.713 295.915 126.848 295.849 126.983C295.767 127.146 295.685 127.309 295.601 127.472C295.561 127.553 295.52 127.634 295.479 127.714C295.47 127.734 295.46 127.751 295.449 127.771C295.405 127.863 295.356 127.956 295.309 128.047C295.269 128.127 295.229 128.206 295.187 128.284C295.149 128.364 295.109 128.443 295.067 128.52C295.055 128.542 295.046 128.562 295.035 128.581C294.999 128.649 294.964 128.719 294.928 128.786C294.894 128.856 294.857 128.926 294.82 128.995C294.8 129.034 294.778 129.075 294.756 129.114C294.699 129.223 294.641 129.33 294.581 129.441L294.581 129.442C294.559 129.479 294.539 129.514 294.519 129.552C294.434 129.706 294.35 129.858 294.261 130.01C294.246 130.036 294.233 130.062 294.218 130.088L294.217 130.09C294.216 130.092 294.216 130.093 294.213 130.095C294.197 130.123 294.183 130.152 294.166 130.177C294.128 130.242 294.092 130.31 294.055 130.375C293.894 130.658 293.725 130.936 293.55 131.211L293.549 131.214C293.535 131.235 293.522 131.256 293.508 131.276C293.452 131.364 293.397 131.452 293.341 131.54C293.227 131.716 293.111 131.888 292.992 132.06C292.958 132.109 292.923 132.16 292.888 132.209C292.863 132.245 292.838 132.28 292.813 132.316C292.672 132.513 292.528 132.71 292.379 132.903C292.352 132.939 292.322 132.976 292.295 133.012C292.145 133.209 291.99 133.404 291.832 133.595C291.813 133.618 291.795 133.639 291.777 133.662C291.705 133.747 291.633 133.834 291.558 133.917C291.486 134.002 291.412 134.088 291.335 134.17C291.313 134.198 291.286 134.227 291.262 134.255C291.231 134.288 291.2 134.324 291.169 134.357L291.168 134.359C291.148 134.382 291.125 134.405 291.104 134.428C290.832 134.727 290.55 135.019 290.261 135.306C290.243 135.321 290.227 135.336 290.213 135.353C290.066 135.496 289.917 135.64 289.765 135.781C289.614 135.925 289.46 136.067 289.302 136.208L289.301 136.21C289.295 136.214 289.289 136.22 289.283 136.225L289.282 136.227C289.258 136.248 289.233 136.271 289.209 136.292C289.242 136.234 289.272 136.177 289.303 136.118C289.314 136.098 289.326 136.077 289.337 136.058L289.338 136.054C289.355 136.022 289.372 135.992 289.39 135.96C289.477 135.799 289.565 135.636 289.652 135.472C289.737 135.311 289.822 135.152 289.903 134.99C289.969 134.859 290.036 134.727 290.102 134.594C290.42 133.956 290.717 133.311 290.996 132.659C291.158 132.277 291.315 131.891 291.464 131.504C291.591 131.176 291.715 130.846 291.831 130.513C291.852 130.457 291.873 130.399 291.892 130.343L291.954 130.164C292.006 130.015 292.058 129.865 292.106 129.713C292.136 129.627 292.166 129.54 292.194 129.453C292.213 129.388 292.232 129.327 292.254 129.263L292.26 129.244C292.267 129.225 292.272 129.206 292.278 129.187C292.286 129.164 292.291 129.143 292.299 129.121C292.323 129.04 292.349 128.959 292.373 128.877C292.393 128.812 292.412 128.747 292.432 128.682C292.443 128.644 292.454 128.606 292.466 128.567C292.502 128.443 292.538 128.321 292.573 128.196C292.621 128.034 292.665 127.872 292.709 127.708C292.745 127.573 292.781 127.438 292.815 127.305C292.846 127.185 292.877 127.065 292.906 126.945C292.941 126.809 292.972 126.675 293.004 126.541C293.017 126.492 293.027 126.443 293.037 126.396C293.065 126.279 293.092 126.165 293.118 126.049C293.167 125.822 293.216 125.596 293.261 125.368C293.28 125.271 293.301 125.175 293.317 125.078C293.323 125.049 293.329 125.019 293.335 124.99C293.35 124.91 293.365 124.831 293.38 124.752L293.38 124.75C293.397 124.666 293.412 124.58 293.427 124.495C293.427 124.487 293.43 124.479 293.431 124.471C293.445 124.394 293.459 124.317 293.471 124.239C293.488 124.143 293.503 124.05 293.519 123.955C293.546 123.787 293.571 123.617 293.594 123.448C293.618 123.281 293.64 123.114 293.661 122.944L293.663 122.939C293.683 122.789 293.702 122.638 293.719 122.486C293.722 122.458 293.726 122.428 293.729 122.397C293.744 122.267 293.758 122.135 293.772 122.005C293.774 121.979 293.777 121.952 293.78 121.926C293.782 121.916 293.782 121.908 293.784 121.898C293.796 121.79 293.805 121.684 293.815 121.576C293.816 121.575 293.815 121.573 293.815 121.571L293.817 121.57L293.816 121.568C293.816 121.566 293.817 121.564 293.816 121.561C293.828 121.448 293.837 121.335 293.846 121.22C293.851 121.163 293.855 121.107 293.86 121.05C293.865 121.001 293.869 120.952 293.871 120.904C293.875 120.861 293.879 120.82 293.881 120.777C293.886 120.732 293.889 120.687 293.891 120.641C293.895 120.579 293.9 120.516 293.901 120.453C293.911 120.34 293.918 120.227 293.923 120.115C293.933 119.954 293.94 119.795 293.945 119.632C293.947 119.608 293.948 119.582 293.949 119.555C293.955 119.387 293.96 119.218 293.964 119.051C293.971 118.78 293.974 118.509 293.974 118.237C293.974 118.214 293.974 118.189 293.974 118.165C294.042 118.029 294.111 117.891 294.176 117.751C294.234 117.632 294.289 117.512 294.342 117.39C294.373 117.318 294.404 117.247 294.434 117.173L294.436 117.167C294.459 117.112 294.481 117.055 294.505 117C294.528 116.944 294.549 116.889 294.571 116.833L294.579 116.81C294.589 116.786 294.597 116.762 294.606 116.737C294.672 116.564 294.733 116.39 294.79 116.213L294.795 116.198C294.8 116.183 294.806 116.166 294.809 116.151C294.822 116.109 294.837 116.065 294.849 116.023C294.857 115.994 294.867 115.966 294.875 115.937C294.895 115.866 294.916 115.795 294.932 115.724C294.943 115.685 294.955 115.647 294.963 115.61C294.98 115.544 294.996 115.478 295.009 115.411C295.023 115.359 295.035 115.306 295.045 115.253C295.068 115.151 295.086 115.05 295.104 114.949C295.112 114.914 295.119 114.876 295.125 114.84C295.128 114.82 295.132 114.8 295.135 114.78C295.136 114.772 295.136 114.764 295.137 114.756C295.143 114.726 295.147 114.696 295.152 114.666C295.156 114.64 295.158 114.616 295.162 114.592C295.177 114.508 295.187 114.425 295.197 114.34C295.201 114.317 295.205 114.293 295.207 114.268C295.216 114.187 295.226 114.104 295.233 114.023C295.243 113.935 295.251 113.85 295.258 113.762C295.265 113.676 295.272 113.589 295.277 113.503C295.288 113.33 295.295 113.158 295.3 112.985C295.333 111.907 295.292 110.842 295.32 109.781C295.326 109.516 295.337 109.252 295.354 108.987C295.36 108.896 295.365 108.803 295.375 108.712C295.379 108.64 295.385 108.568 295.395 108.497C295.402 108.397 295.414 108.295 295.428 108.195C295.5 107.67 295.609 107.15 295.763 106.639C295.713 106.759 295.666 106.881 295.622 107.003L295.518 107.302C295.506 107.344 295.493 107.386 295.478 107.429C295.476 107.441 295.471 107.452 295.468 107.464C295.463 107.481 295.458 107.5 295.452 107.517C295.448 107.53 295.444 107.542 295.441 107.556C295.414 107.645 295.389 107.736 295.365 107.828L295.364 107.832C295.334 107.944 295.307 108.056 295.283 108.17C295.17 108.696 295.096 109.23 295.039 109.764C294.94 110.834 294.913 111.902 294.811 112.954C294.8 113.064 294.79 113.174 294.777 113.283C294.768 113.358 294.759 113.433 294.748 113.507C294.747 113.511 294.747 113.515 294.746 113.519C294.737 113.6 294.726 113.68 294.715 113.761C294.701 113.855 294.687 113.951 294.671 114.044C294.652 114.168 294.629 114.293 294.606 114.415L294.605 114.419C294.578 114.564 294.546 114.709 294.511 114.852C294.476 114.996 294.439 115.139 294.399 115.281C294.398 115.289 294.396 115.295 294.393 115.302C294.381 115.344 294.368 115.386 294.354 115.428C294.323 115.529 294.293 115.628 294.259 115.725C294.228 115.814 294.198 115.902 294.163 115.989L294.161 115.997C294.139 116.052 294.12 116.109 294.096 116.164C294.091 116.179 294.084 116.193 294.079 116.209C294.074 116.222 294.068 116.234 294.064 116.245C294.059 116.259 294.054 116.274 294.048 116.286C294.009 116.385 293.968 116.48 293.927 116.575C293.921 116.487 293.919 116.397 293.913 116.309C293.911 116.266 293.909 116.223 293.907 116.182C293.905 116.218 293.906 116.252 293.904 116.287C293.903 116.289 293.904 116.293 293.903 116.295C293.902 116.347 293.901 116.4 293.899 116.454C293.898 116.498 293.897 116.544 293.897 116.588L293.895 116.613C293.894 116.625 293.894 116.64 293.893 116.652C293.884 116.674 293.875 116.694 293.865 116.716C293.856 116.736 293.846 116.758 293.837 116.778C293.828 116.798 293.818 116.82 293.807 116.84C293.783 116.897 293.756 116.952 293.73 117.007C293.678 117.115 293.626 117.223 293.57 117.33C293.534 117.402 293.498 117.47 293.46 117.538C293.237 117.956 292.992 118.364 292.733 118.76C291.791 120.188 290.702 121.525 289.501 122.741C289.497 122.321 289.489 121.901 289.474 121.481C289.475 121.456 289.475 121.43 289.475 121.405C289.475 121.395 289.476 121.386 289.475 121.376L289.476 121.374C289.484 120.981 289.483 120.589 289.478 120.195C289.485 120.01 289.491 119.825 289.495 119.641C289.497 119.574 289.499 119.507 289.501 119.441C289.503 119.395 289.504 119.349 289.503 119.302C289.507 119.171 289.507 119.041 289.511 118.909C289.518 118.707 289.525 118.505 289.536 118.302C289.543 118.141 289.552 117.977 289.564 117.815C289.565 117.775 289.568 117.736 289.571 117.697C289.573 117.641 289.577 117.588 289.581 117.532C289.622 117.513 289.663 117.491 289.703 117.469C289.718 117.46 289.735 117.453 289.751 117.444L289.752 117.442C289.796 117.419 289.839 117.398 289.879 117.374C289.938 117.342 289.995 117.307 290.053 117.272C290.072 117.26 290.093 117.248 290.114 117.236L290.115 117.235C290.23 117.165 290.343 117.092 290.453 117.017C290.55 116.952 290.643 116.883 290.735 116.814C290.757 116.798 290.777 116.782 290.797 116.768C290.886 116.7 290.976 116.629 291.062 116.557C291.085 116.539 291.108 116.52 291.129 116.502C291.171 116.466 291.213 116.43 291.254 116.393C291.301 116.355 291.344 116.315 291.389 116.276C291.424 116.243 291.457 116.213 291.49 116.18C291.518 116.154 291.548 116.128 291.574 116.102C291.584 116.092 291.592 116.085 291.602 116.076C291.611 116.068 291.62 116.059 291.63 116.049L291.631 116.048C291.649 116.031 291.665 116.015 291.684 115.998C291.767 115.916 291.849 115.832 291.926 115.748C292.003 115.667 292.076 115.585 292.148 115.503C292.154 115.498 292.158 115.493 292.162 115.488C292.226 115.414 292.29 115.339 292.352 115.264L292.354 115.262C292.385 115.221 292.417 115.183 292.449 115.141C292.542 115.024 292.632 114.906 292.719 114.782C292.773 114.704 292.826 114.625 292.879 114.545C292.907 114.502 292.934 114.459 292.962 114.414C292.977 114.391 292.991 114.369 293.005 114.346C293.03 114.305 293.055 114.263 293.08 114.221C293.084 114.216 293.087 114.213 293.089 114.207C293.109 114.174 293.127 114.14 293.147 114.107C293.208 113.997 293.265 113.887 293.318 113.772C293.349 113.707 293.379 113.64 293.408 113.572C293.42 113.545 293.432 113.517 293.441 113.489C293.46 113.449 293.474 113.407 293.49 113.367C293.482 113.372 293.476 113.377 293.468 113.382C293.379 113.444 293.292 113.507 293.206 113.571C293.19 113.582 293.173 113.595 293.158 113.607C293.091 113.66 293.022 113.712 292.956 113.764C292.936 113.779 292.918 113.795 292.9 113.81C292.88 113.826 292.862 113.841 292.841 113.858C292.824 113.871 292.809 113.884 292.794 113.898C292.702 113.974 292.61 114.051 292.519 114.131C292.428 114.209 292.34 114.288 292.252 114.367C292.154 114.453 292.058 114.542 291.963 114.629C291.677 114.892 291.398 115.157 291.124 115.431C291.047 115.506 290.973 115.581 290.898 115.658C290.823 115.733 290.75 115.803 290.682 115.88L290.681 115.882L290.673 115.885C290.576 115.984 290.48 116.084 290.384 116.185C290.292 116.28 290.202 116.375 290.113 116.474C290.093 116.495 290.073 116.516 290.053 116.538C290.05 116.541 290.049 116.543 290.046 116.546C289.96 116.641 289.875 116.735 289.79 116.832C289.773 116.852 289.756 116.871 289.739 116.89C289.698 116.935 289.659 116.981 289.62 117.026C289.632 116.876 289.645 116.728 289.659 116.579C289.666 116.524 289.67 116.468 289.676 116.414C289.681 116.371 289.685 116.328 289.69 116.284C289.708 116.115 289.727 115.947 289.748 115.777C289.799 115.342 289.859 114.908 289.93 114.475C289.966 114.242 290.007 114.009 290.049 113.778C290.076 113.627 290.106 113.475 290.135 113.323C290.164 113.173 290.195 113.022 290.229 112.871C290.235 112.835 290.242 112.802 290.25 112.767C290.255 112.741 290.261 112.716 290.266 112.69C290.281 112.617 290.297 112.547 290.313 112.475C290.337 112.369 290.362 112.262 290.388 112.157C290.409 112.059 290.432 111.962 290.458 111.864C290.471 111.807 290.485 111.749 290.5 111.693C290.541 111.526 290.583 111.362 290.628 111.196C290.645 111.124 290.666 111.051 290.687 110.979C290.73 110.817 290.776 110.656 290.823 110.495C290.826 110.473 290.833 110.454 290.84 110.433C290.868 110.329 290.899 110.226 290.931 110.124C290.963 110.019 290.994 109.916 291.026 109.813C291.05 109.729 291.077 109.648 291.103 109.567C291.126 109.493 291.148 109.418 291.173 109.347C291.201 109.253 291.23 109.162 291.261 109.072C291.295 108.97 291.328 108.868 291.363 108.766L291.804 107.544L292.293 106.336L292.819 105.141C292.886 105.008 292.95 104.873 293.015 104.739C293.142 104.482 293.266 104.222 293.389 103.963C293.343 104.038 293.295 104.114 293.248 104.188C293.062 104.482 292.877 104.778 292.695 105.075L292.049 106.22L291.46 107.395L290.919 108.598C290.897 108.647 290.876 108.697 290.857 108.747C290.815 108.842 290.777 108.939 290.738 109.034C290.74 108.277 290.652 107.515 290.468 106.775C290.417 106.57 290.358 106.364 290.293 106.163C290.228 105.961 290.156 105.762 290.078 105.564C289.998 105.367 289.912 105.173 289.818 104.981C289.725 104.788 289.627 104.605 289.522 104.421C289.465 104.323 289.406 104.227 289.345 104.13C289.295 104.049 289.242 103.97 289.189 103.892C289.185 103.887 289.183 103.882 289.178 103.876C289.128 103.802 289.075 103.728 289.022 103.657C288.777 103.32 288.505 103.004 288.205 102.721C288.171 102.69 288.14 102.66 288.106 102.63C288.049 102.576 287.989 102.524 287.929 102.473C288.006 102.622 288.08 102.772 288.155 102.92C288.285 103.178 288.409 103.434 288.528 103.692C288.555 103.748 288.58 103.803 288.604 103.86C288.648 103.953 288.688 104.045 288.728 104.136C288.767 104.224 288.805 104.31 288.84 104.396C288.882 104.495 288.921 104.593 288.961 104.693C289.035 104.879 289.107 105.066 289.174 105.256C289.242 105.444 289.307 105.632 289.367 105.822C289.43 106.012 289.488 106.201 289.542 106.392C289.596 106.584 289.647 106.776 289.696 106.968C289.841 107.547 289.956 108.133 290.041 108.726C290.055 108.826 290.067 108.923 290.081 109.024C290.095 109.124 290.107 109.223 290.116 109.323C290.137 109.488 290.151 109.655 290.165 109.822C290.176 109.942 290.182 110.062 290.191 110.183C290.195 110.262 290.199 110.342 290.205 110.421C290.207 110.428 290.207 110.434 290.207 110.441C290.155 110.585 290.107 110.73 290.058 110.876C289.989 111.082 289.922 111.288 289.859 111.493C289.854 111.508 289.849 111.522 289.846 111.537C289.796 111.699 289.747 111.859 289.699 112.021C289.679 112.086 289.66 112.151 289.642 112.217C289.6 112.36 289.559 112.504 289.521 112.649C289.506 112.692 289.495 112.737 289.483 112.783C289.466 112.845 289.449 112.906 289.434 112.968C289.432 112.974 289.43 112.98 289.43 112.986C289.421 113.019 289.411 113.053 289.403 113.086C289.395 113.122 289.387 113.157 289.378 113.189C289.34 113.33 289.304 113.471 289.269 113.613C289.222 113.81 289.178 114.005 289.133 114.202C289.108 114.309 289.085 114.417 289.063 114.525C288.957 115.019 288.862 115.517 288.778 116.019C288.759 116.128 288.742 116.24 288.724 116.352C288.721 116.365 288.72 116.38 288.718 116.394C288.695 116.538 288.674 116.684 288.653 116.828C288.647 116.879 288.639 116.931 288.632 116.981C288.625 117.032 288.618 117.082 288.611 117.134C288.603 117.186 288.597 117.241 288.591 117.294C288.579 117.389 288.566 117.483 288.556 117.578C288.538 117.728 288.522 117.876 288.506 118.025C288.503 118.053 288.498 118.079 288.497 118.106C288.491 118.159 288.486 118.211 288.482 118.265C288.473 118.359 288.464 118.451 288.457 118.545C288.453 118.598 288.448 118.649 288.444 118.703C288.439 118.743 288.437 118.784 288.433 118.825L288.433 118.827C288.432 118.835 288.432 118.842 288.431 118.85C288.43 118.866 288.43 118.883 288.429 118.9C288.407 119.326 288.385 119.752 288.373 120.178C288.373 120.207 288.374 120.235 288.372 120.264C288.374 120.264 288.374 120.266 288.374 120.266C288.374 120.302 288.374 120.338 288.374 120.374C288.374 120.376 288.374 120.38 288.375 120.383C288.373 120.487 288.373 120.591 288.376 120.697C288.375 120.766 288.377 120.834 288.379 120.902C288.38 121.105 288.384 121.306 288.39 121.509C288.402 121.73 288.416 121.949 288.432 122.17L288.431 122.172C288.433 122.198 288.435 122.222 288.437 122.248C288.449 122.444 288.465 122.641 288.479 122.835L288.532 123.279L288.531 123.281L288.54 123.353L288.556 123.496C288.559 123.539 288.569 123.585 288.584 123.628C288.556 123.654 288.528 123.678 288.498 123.704C288.368 123.823 288.235 123.939 288.101 124.053C288.05 124.098 287.996 124.145 287.942 124.189C287.904 124.222 287.865 124.253 287.827 124.284C287.768 124.333 287.709 124.382 287.648 124.431C287.524 124.533 287.396 124.634 287.267 124.733C287.232 124.763 287.195 124.79 287.155 124.818C287.011 124.931 286.863 125.041 286.715 125.148C286.555 125.263 286.396 125.376 286.233 125.486C286.186 125.52 286.136 125.554 286.085 125.587L286.084 125.588C286.068 125.598 286.053 125.61 286.038 125.619C285.993 125.65 285.949 125.679 285.903 125.709C285.807 125.773 285.712 125.835 285.615 125.896C285.528 125.952 285.44 126.006 285.352 126.059C285.338 126.069 285.322 126.078 285.306 126.087C285.298 126.091 285.292 126.097 285.282 126.1C285.263 126.114 285.242 126.126 285.221 126.138C285.181 126.162 285.142 126.184 285.102 126.208C285.005 126.268 284.906 126.324 284.806 126.38C284.693 126.446 284.578 126.509 284.464 126.572C284.438 126.587 284.414 126.599 284.388 126.614C284.285 126.668 284.184 126.722 284.082 126.775C284.132 126.527 284.181 126.278 284.226 126.031C284.274 125.784 284.32 125.535 284.364 125.287C284.403 125.079 284.441 124.871 284.477 124.664C284.513 124.456 284.549 124.249 284.585 124.042C284.65 123.654 284.715 123.266 284.78 122.878C284.792 122.8 284.806 122.725 284.818 122.647C284.846 122.48 284.875 122.313 284.901 122.145C284.97 121.741 285.037 121.335 285.104 120.929C285.144 120.686 285.185 120.441 285.225 120.198C285.241 120.102 285.257 120.008 285.273 119.913C285.289 119.811 285.307 119.712 285.323 119.611C285.387 119.224 285.452 118.838 285.513 118.453C285.528 118.368 285.541 118.282 285.556 118.196L285.557 118.195C285.724 117.176 285.89 116.16 286.055 115.143C286.07 115.057 286.082 114.973 286.096 114.89C286.132 114.664 286.17 114.439 286.206 114.214C286.222 114.108 286.239 114.002 286.257 113.897C286.311 113.56 286.363 113.222 286.417 112.882C286.416 112.88 286.416 112.878 286.417 112.876C286.502 112.341 286.586 111.805 286.669 111.27C286.684 111.178 286.698 111.084 286.712 110.992L286.713 110.991C286.745 110.776 286.779 110.563 286.811 110.348C286.818 110.317 286.823 110.285 286.828 110.253C286.826 110.25 286.828 110.247 286.828 110.245C286.848 110.115 286.869 109.983 286.888 109.853C286.855 110.003 286.821 110.156 286.788 110.307C286.643 110.955 286.498 111.605 286.356 112.255C286.339 112.335 286.321 112.417 286.304 112.497C286.249 112.739 286.196 112.984 286.145 113.23C286.128 113.308 286.112 113.385 286.095 113.463C286.078 113.543 286.058 113.625 286.042 113.708C286.025 113.782 286.01 113.855 285.995 113.929C285.968 114.05 285.941 114.171 285.915 114.293C285.898 114.367 285.882 114.442 285.867 114.516C285.837 114.658 285.807 114.799 285.777 114.94C285.61 115.714 285.445 116.489 285.281 117.264C285.265 117.341 285.247 117.415 285.231 117.491C285.162 117.821 285.092 118.148 285.023 118.476C285.006 118.555 284.989 118.633 284.973 118.711C284.949 118.829 284.923 118.945 284.899 119.063C284.896 119.047 284.893 119.033 284.89 119.017C284.852 118.834 284.81 118.651 284.766 118.471C284.632 117.959 284.468 117.458 284.281 116.965C284.093 116.475 283.881 115.995 283.637 115.523C283.51 115.281 283.378 115.039 283.229 114.804C283.2 114.754 283.171 114.706 283.138 114.659C283.053 114.528 282.963 114.4 282.867 114.274C282.84 114.237 282.811 114.2 282.782 114.162C282.789 114.264 282.796 114.365 282.808 114.464C282.807 114.466 282.809 114.466 282.808 114.468C282.82 114.576 282.834 114.682 282.851 114.789C282.862 114.862 282.875 114.938 282.89 115.013C282.897 115.064 282.909 115.114 282.919 115.166C282.958 115.357 283.002 115.545 283.049 115.731C283.051 115.732 283.05 115.734 283.05 115.734C283.051 115.738 283.053 115.743 283.054 115.748C283.055 115.755 283.058 115.76 283.06 115.767L283.059 115.769C283.061 115.78 283.066 115.792 283.07 115.804L283.069 115.806C283.103 115.929 283.136 116.051 283.172 116.17C283.208 116.292 283.244 116.414 283.284 116.533C283.323 116.654 283.363 116.774 283.406 116.893C283.446 117.013 283.492 117.132 283.537 117.25C283.726 117.741 283.939 118.222 284.182 118.693C284.358 119.03 284.548 119.364 284.767 119.684C284.668 120.153 284.569 120.622 284.473 121.092L284.472 121.094C284.455 121.168 284.44 121.241 284.425 121.316C284.4 121.436 284.376 121.555 284.352 121.673C284.335 121.746 284.32 121.82 284.305 121.893C284.163 122.564 284.023 123.236 283.882 123.907C283.797 124.324 283.709 124.74 283.618 125.155C283.612 125.191 283.603 125.228 283.595 125.263C283.583 125.322 283.569 125.382 283.557 125.441C283.552 125.461 283.548 125.479 283.544 125.496C283.543 125.504 283.542 125.514 283.539 125.524C283.538 125.532 283.537 125.542 283.534 125.55C283.477 125.812 283.418 126.072 283.355 126.332C283.306 126.534 283.259 126.737 283.209 126.941C283.207 126.948 283.206 126.957 283.204 126.962C283.15 127.186 283.094 127.408 283.036 127.63C282.989 127.812 282.941 127.995 282.891 128.176C282.879 128.223 282.866 128.271 282.852 128.317L282.852 128.319C282.835 128.38 282.818 128.44 282.801 128.501C282.796 128.521 282.789 128.542 282.785 128.561C282.752 128.672 282.72 128.783 282.686 128.893C282.666 128.964 282.646 129.033 282.624 129.103C282.599 129.194 282.57 129.285 282.54 129.375C282.537 129.391 282.531 129.408 282.525 129.425L282.495 129.524L282.481 129.565C282.466 129.615 282.45 129.665 282.433 129.715C282.376 129.892 282.317 130.067 282.257 130.242C282.196 130.417 282.129 130.604 282.062 130.785C281.657 131.892 281.179 132.971 280.651 134.022C280.518 134.283 280.381 134.546 280.239 134.802C279.813 135.576 279.35 136.328 278.864 137.065C278.808 137.149 278.752 137.233 278.693 137.315C278.687 137.328 278.679 137.338 278.672 137.348C278.589 137.469 278.506 137.589 278.42 137.707C278.322 137.85 278.221 137.99 278.118 138.129C277.996 138.298 277.874 138.461 277.749 138.627C277.612 138.809 277.472 138.988 277.333 139.167C277.314 139.192 277.294 139.217 277.273 139.241C277.175 139.367 277.075 139.49 276.973 139.613C276.906 139.698 276.838 139.779 276.77 139.859C276.716 139.924 276.662 139.99 276.606 140.054C276.523 140.152 276.441 140.25 276.357 140.345C276.331 140.279 276.308 140.214 276.286 140.149C276.277 140.125 276.267 140.101 276.258 140.077L276.259 140.075C276.212 139.949 276.17 139.82 276.133 139.692C276.121 139.648 276.109 139.602 276.099 139.558C276.096 139.549 276.093 139.539 276.091 139.528C276.088 139.518 276.085 139.507 276.082 139.497C276.073 139.456 276.062 139.415 276.054 139.372C276.046 139.329 276.037 139.288 276.029 139.245C276.011 139.156 275.993 139.068 275.979 138.979C275.977 138.962 275.973 138.943 275.971 138.926C275.966 138.897 275.962 138.87 275.958 138.841L275.958 138.839C275.95 138.79 275.943 138.739 275.937 138.688C275.927 138.609 275.916 138.531 275.909 138.453C275.891 138.293 275.877 138.133 275.865 137.972C275.791 136.801 275.864 135.583 275.883 134.369C275.913 133.158 275.944 131.951 276.053 130.755C276.057 130.726 276.058 130.699 276.061 130.671C276.065 130.617 276.071 130.563 276.075 130.509C276.082 130.421 276.092 130.334 276.103 130.247C276.118 130.105 276.133 129.965 276.151 129.824C276.156 129.771 276.163 129.716 276.168 129.663C276.183 129.535 276.2 129.409 276.218 129.282C276.224 129.223 276.233 129.167 276.24 129.109C276.356 129.054 276.472 129 276.586 128.943C276.759 128.859 276.928 128.771 277.097 128.679C277.18 128.633 277.264 128.586 277.348 128.539C277.433 128.493 277.515 128.445 277.597 128.398C277.921 128.209 278.239 128.009 278.551 127.802C278.863 127.596 279.169 127.38 279.471 127.158C279.565 127.089 279.658 127.021 279.748 126.949C279.759 126.942 279.769 126.933 279.78 126.924C279.799 126.914 279.816 126.901 279.831 126.887C279.848 126.874 279.865 126.861 279.883 126.848C279.889 126.842 279.894 126.839 279.902 126.834L279.903 126.832C280.099 126.681 280.291 126.526 280.479 126.368C280.502 126.351 280.523 126.331 280.544 126.313C280.643 126.233 280.737 126.152 280.831 126.071C280.839 126.063 280.846 126.057 280.855 126.05L280.855 126.048C280.976 125.944 281.095 125.838 281.211 125.731C281.299 125.65 281.386 125.568 281.473 125.487C281.48 125.479 281.489 125.472 281.495 125.465C281.499 125.462 281.502 125.459 281.505 125.456C281.511 125.45 281.518 125.442 281.527 125.436C281.536 125.427 281.543 125.419 281.553 125.409C281.653 125.314 281.753 125.214 281.851 125.115C281.864 125.1 281.88 125.087 281.893 125.072L281.894 125.071C282.117 124.845 282.334 124.608 282.54 124.361C282.615 124.272 282.692 124.179 282.765 124.084C282.708 124.113 282.654 124.142 282.599 124.172C282.514 124.216 282.431 124.261 282.35 124.307C282.218 124.379 282.086 124.453 281.959 124.529C281.946 124.537 281.933 124.543 281.92 124.551C281.83 124.602 281.744 124.657 281.654 124.71L281.654 124.711C281.643 124.716 281.635 124.722 281.627 124.728L281.624 124.729C281.614 124.734 281.605 124.741 281.595 124.746C281.568 124.764 281.539 124.781 281.511 124.799C281.374 124.884 281.239 124.97 281.106 125.059C281.088 125.067 281.071 125.078 281.057 125.088C281.049 125.094 281.042 125.098 281.033 125.103C280.965 125.147 280.895 125.192 280.826 125.238C280.717 125.31 280.61 125.382 280.503 125.454L280.502 125.456C280.48 125.472 280.459 125.485 280.436 125.501C280.433 125.504 280.428 125.506 280.423 125.509C280.224 125.644 280.027 125.782 279.829 125.922C279.804 125.939 279.782 125.954 279.759 125.972C279.703 126.011 279.648 126.049 279.594 126.089C279.525 126.137 279.457 126.187 279.389 126.235C279.35 126.262 279.314 126.287 279.279 126.315C279.185 126.382 279.094 126.449 279 126.518C278.403 126.959 277.815 127.415 277.239 127.887C276.922 128.15 276.609 128.416 276.3 128.692C276.377 128.19 276.462 127.689 276.563 127.189C276.644 126.777 276.733 126.363 276.827 125.952C276.839 125.899 276.85 125.848 276.862 125.795C277.311 125.201 277.725 124.584 278.117 123.951C278.167 123.869 278.218 123.788 278.267 123.707C278.276 123.693 278.283 123.678 278.292 123.665C278.311 123.635 278.328 123.605 278.346 123.576C278.386 123.512 278.423 123.446 278.46 123.382C278.475 123.355 278.49 123.331 278.506 123.305C278.512 123.292 278.52 123.28 278.527 123.268C278.546 123.237 278.564 123.203 278.584 123.17C278.612 123.118 278.643 123.068 278.672 123.015C278.719 122.932 278.765 122.849 278.811 122.766C278.88 122.64 278.948 122.515 279.015 122.388C279.076 122.274 279.136 122.161 279.194 122.044C279.291 121.862 279.382 121.677 279.474 121.492C279.495 121.449 279.516 121.406 279.538 121.362C279.54 121.357 279.544 121.35 279.546 121.344C279.614 121.203 279.68 121.062 279.746 120.919C279.789 120.826 279.831 120.735 279.872 120.642C279.896 120.591 279.918 120.538 279.942 120.487C279.966 120.432 279.992 120.376 280.015 120.321C280.018 120.311 280.023 120.303 280.027 120.293C280.048 120.244 280.07 120.192 280.092 120.141C280.108 120.106 280.122 120.073 280.136 120.038C280.16 119.981 280.184 119.924 280.208 119.867C280.235 119.802 280.261 119.738 280.289 119.671C280.337 119.557 280.383 119.441 280.428 119.324C280.476 119.204 280.522 119.085 280.565 118.965C280.611 118.844 280.656 118.723 280.699 118.603C280.787 118.362 280.869 118.118 280.95 117.875C280.974 117.803 280.997 117.731 281.02 117.659C281.034 117.618 281.048 117.574 281.061 117.53C281.068 117.509 281.073 117.49 281.08 117.469C281.094 117.428 281.107 117.384 281.12 117.34C281.138 117.283 281.154 117.223 281.172 117.166C281.207 117.047 281.241 116.931 281.272 116.811C281.296 116.731 281.317 116.65 281.339 116.569C281.371 116.447 281.402 116.326 281.432 116.203C281.469 116.054 281.504 115.904 281.537 115.755C281.351 116.213 281.165 116.671 280.978 117.129C280.793 117.585 280.602 118.039 280.409 118.49C280.33 118.678 280.249 118.862 280.166 119.046C280.106 119.182 280.047 119.317 279.985 119.451C279.982 119.462 279.976 119.473 279.972 119.484C279.954 119.523 279.936 119.563 279.919 119.601C279.913 119.618 279.905 119.634 279.897 119.65C279.864 119.723 279.833 119.795 279.799 119.867L279.799 119.869C279.775 119.918 279.754 119.967 279.731 120.016C279.683 120.122 279.634 120.229 279.585 120.334C279.549 120.412 279.514 120.489 279.477 120.566C279.457 120.612 279.435 120.657 279.413 120.702C279.339 120.86 279.264 121.014 279.189 121.172C279.067 121.426 278.943 121.679 278.817 121.932C278.692 122.183 278.563 122.433 278.434 122.684L278.434 122.685C278.409 122.734 278.384 122.78 278.359 122.828C278.31 122.927 278.26 123.023 278.207 123.121C278.182 123.167 278.157 123.215 278.133 123.262C278.039 123.44 277.943 123.619 277.848 123.797C277.556 124.34 277.253 124.88 276.949 125.419C276.975 125.314 276.999 125.208 277.026 125.104C277.035 125.059 277.046 125.016 277.057 124.972C277.091 124.838 277.124 124.707 277.158 124.573C277.193 124.442 277.226 124.308 277.262 124.175C277.328 123.918 277.398 123.662 277.469 123.407C277.481 123.354 277.498 123.301 277.512 123.248C277.525 123.198 277.539 123.151 277.552 123.1L277.554 123.097C277.592 122.956 277.632 122.816 277.672 122.676C277.715 122.523 277.76 122.368 277.803 122.214C277.813 122.178 277.823 122.143 277.834 122.107C277.852 122.041 277.871 121.974 277.892 121.91C277.944 121.729 277.997 121.552 278.05 121.373C278.096 121.218 278.141 121.063 278.186 120.908C278.26 120.66 278.333 120.413 278.408 120.166C278.469 119.965 278.53 119.766 278.589 119.565C278.666 119.307 278.742 119.049 278.819 118.792C278.847 118.7 278.874 118.608 278.902 118.517C278.945 118.38 278.986 118.243 279.029 118.108C279.032 118.093 279.038 118.076 279.043 118.061C279.05 118.035 279.057 118.013 279.066 117.988C279.078 117.948 279.091 117.911 279.103 117.87C279.111 117.842 279.12 117.815 279.129 117.787C279.167 117.665 279.208 117.543 279.248 117.42C279.27 117.351 279.293 117.285 279.316 117.218C279.335 117.157 279.356 117.097 279.378 117.034L279.425 116.897C279.442 116.848 279.459 116.799 279.478 116.751L279.499 116.691C279.514 116.647 279.531 116.605 279.546 116.562C279.561 116.518 279.577 116.478 279.594 116.435C279.601 116.414 279.61 116.396 279.617 116.375C279.636 116.325 279.657 116.273 279.676 116.223L279.683 116.204C279.717 116.117 279.751 116.032 279.786 115.948C279.823 115.861 279.858 115.776 279.896 115.693C279.946 115.579 279.997 115.469 280.05 115.359C280.103 115.247 280.158 115.137 280.215 115.029C280.244 114.975 280.271 114.922 280.299 114.87C280.32 114.833 280.342 114.794 280.363 114.758L280.364 114.756C280.408 114.678 280.454 114.601 280.499 114.525L280.5 114.523C280.545 114.446 280.592 114.371 280.639 114.297C280.649 114.282 280.661 114.265 280.67 114.249C280.707 114.192 280.746 114.134 280.785 114.078C280.799 114.054 280.819 114.029 280.835 114.005C280.883 113.935 280.932 113.866 280.983 113.797C281.003 113.771 281.024 113.742 281.045 113.716C281.097 113.645 281.153 113.576 281.208 113.507C281.109 113.603 281.015 113.705 280.924 113.809C280.9 113.836 280.874 113.863 280.851 113.893C280.834 113.91 280.817 113.93 280.802 113.948C280.789 113.962 280.778 113.977 280.765 113.994C280.755 114.005 280.746 114.014 280.737 114.026C280.701 114.071 280.664 114.115 280.63 114.16C280.574 114.229 280.52 114.301 280.467 114.373C280.465 114.374 280.464 114.376 280.464 114.378C280.425 114.43 280.387 114.482 280.35 114.535L280.35 114.536C280.342 114.546 280.334 114.556 280.328 114.567C280.283 114.631 280.239 114.696 280.195 114.763C280.181 114.785 280.166 114.805 280.153 114.829C280.099 114.911 280.047 114.994 279.997 115.079C279.948 115.159 279.898 115.241 279.853 115.324C279.839 115.345 279.828 115.366 279.816 115.389C279.767 115.474 279.722 115.557 279.677 115.642L279.677 115.644C279.6 115.786 279.526 115.933 279.454 116.079C279.395 116.202 279.335 116.326 279.278 116.452C279.267 116.473 279.256 116.497 279.247 116.519C279.238 116.539 279.229 116.557 279.22 116.577C279.218 116.583 279.214 116.588 279.212 116.593C279.197 116.63 279.18 116.669 279.165 116.706C279.157 116.722 279.149 116.74 279.143 116.757C279.123 116.803 279.102 116.85 279.084 116.897C279.066 116.937 279.049 116.98 279.031 117.02C279.004 117.086 278.978 117.153 278.951 117.22C278.908 117.327 278.863 117.435 278.822 117.543C278.767 117.678 278.715 117.814 278.664 117.95C278.58 118.169 278.5 118.388 278.419 118.608C278.249 119.074 278.085 119.539 277.916 120.003C277.87 120.13 277.825 120.26 277.78 120.39C277.757 120.449 277.737 120.508 277.716 120.568C277.697 120.622 277.676 120.678 277.659 120.733L277.658 120.735C277.495 121.199 277.335 121.666 277.179 122.134C277.068 122.468 276.959 122.806 276.85 123.143C276.844 123.076 276.839 123.006 276.831 122.938C276.795 122.633 276.749 122.33 276.693 122.031C276.693 122.031 276.693 122.029 276.691 122.028L276.692 122.027C276.659 121.859 276.625 121.69 276.584 121.524C276.582 121.512 276.58 121.501 276.577 121.492C276.557 121.401 276.536 121.311 276.512 121.221C276.368 120.655 276.187 120.099 275.968 119.558C275.876 119.332 275.777 119.108 275.668 118.887C275.659 118.869 275.651 118.852 275.641 118.831C275.617 118.785 275.594 118.737 275.57 118.691C275.559 118.668 275.547 118.647 275.536 118.624C275.518 118.59 275.498 118.556 275.48 118.524C275.475 118.514 275.471 118.507 275.465 118.498C275.436 118.444 275.404 118.389 275.372 118.335C275.36 118.316 275.35 118.296 275.338 118.277C275.304 118.221 275.267 118.164 275.231 118.109C275.205 118.069 275.179 118.028 275.153 117.989C275.157 118.092 275.164 118.196 275.171 118.297C275.171 118.301 275.171 118.307 275.172 118.312C275.179 118.407 275.188 118.503 275.199 118.597C275.204 118.645 275.209 118.691 275.215 118.74C275.216 118.75 275.217 118.764 275.22 118.775C275.224 118.812 275.229 118.852 275.235 118.89C275.238 118.923 275.242 118.954 275.246 118.984C275.258 119.066 275.27 119.148 275.284 119.229C275.288 119.26 275.294 119.292 275.298 119.323C275.299 119.325 275.298 119.327 275.299 119.33C275.303 119.356 275.308 119.383 275.312 119.41C275.312 119.414 275.314 119.417 275.314 119.421C275.318 119.446 275.322 119.472 275.328 119.498C275.332 119.522 275.335 119.549 275.341 119.574C275.35 119.628 275.359 119.679 275.368 119.733C275.473 120.3 275.598 120.862 275.741 121.417C275.85 121.848 275.973 122.278 276.106 122.708L276.105 122.71C276.108 122.715 276.11 122.72 276.111 122.724C276.146 122.84 276.184 122.956 276.221 123.072C276.248 123.149 276.274 123.225 276.298 123.301L276.3 123.306L276.3 123.308C276.388 123.554 276.476 123.797 276.575 124.04C276.45 124.455 276.33 124.873 276.216 125.293C276.187 125.401 276.159 125.506 276.131 125.613C276.093 125.751 276.057 125.89 276.022 126.03C275.977 126.206 275.934 126.38 275.891 126.558L275.891 126.559C275.879 126.606 275.869 126.653 275.857 126.7C275.832 126.809 275.807 126.916 275.782 127.025C275.749 127.168 275.719 127.309 275.689 127.452C275.687 127.456 275.686 127.46 275.687 127.464C275.649 127.64 275.613 127.817 275.579 127.993C275.574 128.015 275.57 128.038 275.566 128.062C275.527 128.26 275.49 128.455 275.458 128.653C275.423 128.851 275.389 129.05 275.359 129.248C275.357 129.254 275.355 129.258 275.357 129.265C275.326 129.465 275.299 129.664 275.271 129.865C275.245 130.05 275.221 130.235 275.201 130.42L275.199 130.421C275.198 130.422 275.199 130.423 275.2 130.424C275.19 130.507 275.18 130.59 275.171 130.672C275.166 130.709 275.163 130.748 275.159 130.784C275.156 130.811 275.153 130.839 275.152 130.866C275.145 130.94 275.139 131.013 275.131 131.084C275.127 131.14 275.122 131.195 275.118 131.249C275.096 131.506 275.076 131.767 275.06 132.025C275.045 132.255 275.031 132.486 275.02 132.718C275.005 132.991 274.993 133.263 274.985 133.534C274.975 133.806 274.968 134.077 274.961 134.349C274.961 134.387 274.96 134.426 274.959 134.464C274.958 134.491 274.959 134.519 274.958 134.546L274.957 134.55C274.948 135.092 274.94 135.633 274.941 136.181C274.942 136.324 274.943 136.468 274.946 136.612C274.945 136.652 274.946 136.69 274.947 136.73C274.947 136.741 274.948 136.752 274.948 136.762C274.949 136.773 274.949 136.784 274.95 136.795C274.954 136.99 274.961 137.188 274.972 137.386C274.985 137.605 275.003 137.826 275.026 138.045C275.041 138.196 275.06 138.347 275.083 138.501C275.101 138.636 275.125 138.77 275.149 138.905C275.199 139.164 275.258 139.423 275.332 139.678C275.339 139.706 275.349 139.732 275.356 139.76C275.372 139.812 275.388 139.864 275.404 139.914C275.433 139.989 275.459 140.065 275.485 140.142C275.506 140.198 275.527 140.253 275.55 140.308L275.549 140.31C275.557 140.329 275.566 140.347 275.574 140.367L275.576 140.372C275.617 140.466 275.654 140.561 275.7 140.653C275.717 140.684 275.733 140.715 275.751 140.744C275.762 140.767 275.774 140.786 275.787 140.805C275.787 140.806 275.788 140.808 275.79 140.808C275.809 140.842 275.834 140.876 275.856 140.909C275.821 140.948 275.784 140.987 275.748 141.025C275.599 141.189 275.448 141.351 275.295 141.511L275.29 141.513C275.154 141.658 275.013 141.803 274.871 141.945C274.858 141.96 274.842 141.973 274.829 141.988C274.67 142.148 274.508 142.306 274.345 142.462C274.223 142.582 274.097 142.703 273.968 142.818C273.928 142.857 273.888 142.894 273.847 142.932C273.823 142.953 273.8 142.975 273.777 142.994C273.712 143.052 273.648 143.11 273.584 143.167C273.465 143.274 273.347 143.378 273.23 143.485C273.228 143.485 273.227 143.486 273.227 143.488C273.165 143.542 273.105 143.595 273.044 143.65C272.705 143.93 272.369 144.216 272.024 144.49C271.94 144.556 271.856 144.622 271.77 144.687C271.738 144.711 271.707 144.736 271.675 144.759C271.638 144.788 271.601 144.815 271.562 144.844C271.525 144.871 271.49 144.899 271.45 144.928C271.353 145.003 271.253 145.076 271.154 145.151C271.148 145.155 271.14 145.161 271.134 145.165C271.007 145.258 270.882 145.35 270.754 145.442C270.725 145.466 270.692 145.486 270.661 145.509L270.66 145.511C270.649 145.52 270.635 145.529 270.624 145.538C270.352 145.73 270.079 145.918 269.802 146.102C269.466 146.326 269.124 146.545 268.779 146.758C268.637 146.846 268.495 146.931 268.352 147.017C268.281 147.059 268.209 147.102 268.137 147.145L268.135 147.144C267.382 147.586 266.605 147.997 265.816 148.372C265.669 148.442 265.526 148.509 265.379 148.574C265.353 148.589 265.33 148.6 265.306 148.608C265.302 148.613 265.298 148.614 265.296 148.613C265.283 148.621 265.27 148.627 265.256 148.633C265.243 148.639 265.23 148.645 265.218 148.649C265.178 148.669 265.135 148.688 265.093 148.707L265.228 148.573L265.254 148.546L265.269 148.532L265.27 148.53L265.337 148.471L265.34 148.468L265.343 148.459L265.375 148.43L265.373 148.429C265.37 148.426 265.368 148.423 265.366 148.418C265.362 148.417 265.361 148.414 265.36 148.412C265.343 148.393 265.328 148.375 265.314 148.356C265.306 148.349 265.3 148.34 265.293 148.332C265.259 148.288 265.226 148.245 265.195 148.201C265.188 148.194 265.183 148.186 265.177 148.178C265.149 148.138 265.123 148.098 265.099 148.056C265.079 148.023 265.061 147.992 265.043 147.958C265.036 147.947 265.029 147.937 265.024 147.922C265.022 147.919 265.021 147.917 265.019 147.916C265.003 147.883 264.987 147.85 264.971 147.819L264.949 147.774C264.933 147.741 264.917 147.706 264.904 147.672C264.826 147.489 264.767 147.3 264.724 147.104L264.724 147.102C264.717 147.07 264.71 147.04 264.704 147.008L264.705 147.007C264.695 146.957 264.687 146.907 264.678 146.858C264.677 146.856 264.678 146.854 264.678 146.852C264.673 146.825 264.668 146.796 264.666 146.767C264.655 146.694 264.649 146.62 264.643 146.547C264.634 146.434 264.627 146.318 264.625 146.203L264.648 146.252L264.682 146.314L264.733 146.416L264.732 146.418L264.766 146.484C264.894 146.425 265.018 146.365 265.142 146.303C265.157 146.296 265.171 146.288 265.183 146.282C265.211 146.268 265.239 146.255 265.266 146.239C265.459 146.143 265.648 146.041 265.837 145.935C265.931 145.882 266.026 145.828 266.118 145.774C266.211 145.72 266.303 145.665 266.395 145.609L266.4 145.606C266.717 145.413 267.031 145.208 267.336 144.996C267.336 144.994 267.338 144.995 267.339 144.993C267.759 144.698 268.169 144.385 268.564 144.059C268.801 143.863 269.035 143.662 269.262 143.457C269.438 143.294 269.614 143.128 269.784 142.959C269.868 142.881 269.948 142.801 270.027 142.719C270.252 142.492 270.469 142.259 270.682 142.022C270.692 142.011 270.702 141.999 270.711 141.987C270.726 141.974 270.737 141.959 270.751 141.944L270.752 141.943C270.845 141.836 270.94 141.728 271.03 141.62C271.094 141.543 271.159 141.467 271.22 141.389C271.251 141.353 271.281 141.315 271.31 141.279C271.319 141.267 271.328 141.258 271.337 141.246C271.354 141.227 271.369 141.207 271.385 141.187L271.385 141.185C271.426 141.134 271.465 141.084 271.504 141.032C271.515 141.017 271.526 141.004 271.538 140.989C271.594 140.916 271.65 140.842 271.703 140.768C271.742 140.717 271.781 140.665 271.818 140.612C271.87 140.542 271.92 140.471 271.97 140.4C272.008 140.344 272.049 140.286 272.088 140.23C272.147 140.143 272.206 140.054 272.263 139.967C272.331 139.863 272.396 139.76 272.46 139.656C272.464 139.649 272.468 139.644 272.472 139.637C272.542 139.526 272.609 139.413 272.676 139.299C272.514 139.468 272.352 139.637 272.188 139.802C272.073 139.92 271.957 140.035 271.842 140.149C271.745 140.246 271.646 140.342 271.546 140.436C271.467 140.514 271.388 140.59 271.307 140.665C271.281 140.69 271.254 140.714 271.228 140.739C271.228 140.741 271.226 140.74 271.225 140.742C271.128 140.833 271.032 140.923 270.935 141.014C270.851 141.092 270.765 141.168 270.68 141.244C270.655 141.267 270.629 141.289 270.604 141.312C270.521 141.387 270.44 141.462 270.356 141.534C270.338 141.548 270.323 141.562 270.305 141.577C270.303 141.578 270.302 141.58 270.302 141.58C270.208 141.663 270.112 141.746 270.015 141.826C270.014 141.828 270.011 141.829 270.011 141.831C269.888 141.936 269.766 142.038 269.64 142.14C269.557 142.21 269.472 142.278 269.388 142.345C269.285 142.43 269.178 142.513 269.071 142.596C268.966 142.679 268.86 142.762 268.752 142.843C268.408 143.105 268.058 143.36 267.701 143.603C267.692 143.611 267.682 143.616 267.673 143.623C267.544 143.713 267.412 143.802 267.281 143.89C267.139 143.984 266.998 144.075 266.855 144.167L266.854 144.169C266.853 144.171 266.851 144.172 266.848 144.173C266.704 144.267 266.559 144.357 266.412 144.447C265.969 144.723 265.517 144.988 265.06 145.242L265.059 145.244C265.026 145.262 264.992 145.28 264.96 145.298C264.892 145.338 264.821 145.378 264.749 145.415C264.73 145.427 264.71 145.437 264.689 145.449C264.673 145.458 264.655 145.466 264.64 145.476C264.644 145.408 264.651 145.34 264.656 145.271C264.66 145.217 264.665 145.16 264.671 145.105C264.673 145.087 264.675 145.071 264.677 145.052C264.679 145.028 264.681 145.003 264.686 144.977C264.695 144.871 264.709 144.764 264.724 144.656C264.729 144.605 264.735 144.556 264.742 144.506C264.745 144.471 264.751 144.438 264.756 144.404C264.808 144.005 264.871 143.599 264.926 143.197L265.199 141.33C265.221 141.186 265.244 141.041 265.268 140.895C265.275 140.843 265.285 140.791 265.292 140.739C265.309 140.635 265.324 140.531 265.34 140.425C265.35 140.372 265.358 140.319 265.366 140.265C265.378 140.255 265.389 140.246 265.4 140.235C265.424 140.212 265.449 140.191 265.472 140.167C265.541 140.101 265.602 140.029 265.659 139.956C265.756 139.832 265.849 139.704 265.94 139.578C265.971 139.536 266 139.493 266.032 139.452L266.422 138.965L266.826 138.492C267.1 138.181 267.38 137.878 267.664 137.581C267.807 137.432 267.951 137.284 268.094 137.138C268.166 137.064 268.239 136.992 268.313 136.919C268.387 136.845 268.46 136.774 268.535 136.703L268.705 136.541L268.984 136.28L269.117 136.162L269.175 136.112C269.175 136.112 269.177 136.111 269.178 136.109L269.222 136.071L269.303 135.998L269.45 135.87L269.929 135.474C270.011 135.412 270.093 135.347 270.175 135.286C270.257 135.221 270.339 135.155 270.42 135.09C270.486 135.04 270.554 134.991 270.62 134.94C271.073 134.605 271.542 134.285 272.026 133.972C272.185 133.87 272.345 133.767 272.507 133.665C272.366 133.701 272.225 133.738 272.085 133.782C272 133.808 271.915 133.835 271.832 133.863C271.665 133.919 271.499 133.979 271.335 134.045C271.13 134.125 270.926 134.214 270.725 134.313C270.671 134.337 270.615 134.364 270.559 134.393C270.47 134.436 270.383 134.481 270.295 134.529C270.239 134.556 270.185 134.583 270.132 134.614L270.132 134.616L270.118 134.624C270.024 134.677 269.929 134.731 269.837 134.785C269.742 134.84 269.651 134.895 269.557 134.953L269.018 135.312L268.497 135.702L268.081 136.046L267.995 136.118C267.831 136.261 267.673 136.408 267.519 136.561C267.509 136.573 267.499 136.584 267.486 136.594C267.418 136.663 267.35 136.733 267.283 136.804C267.207 136.883 267.132 136.965 267.06 137.046C266.921 137.205 266.784 137.368 266.654 137.536C266.588 137.622 266.523 137.709 266.459 137.796C266.459 137.796 266.456 137.798 266.455 137.799C266.394 137.886 266.332 137.974 266.272 138.062L265.92 138.608L265.598 139.172C265.592 139.183 265.586 139.194 265.58 139.204L265.58 139.206C265.559 139.248 265.539 139.287 265.518 139.328C265.524 139.301 265.527 139.274 265.532 139.247C265.584 138.928 265.64 138.608 265.697 138.291C265.697 138.284 265.7 138.277 265.702 138.271C265.71 138.223 265.717 138.178 265.726 138.128L265.727 138.126C265.757 137.959 265.789 137.789 265.821 137.622C265.872 137.359 265.922 137.094 265.976 136.831C266 136.704 266.025 136.578 266.052 136.451C266.055 136.443 266.056 136.435 266.058 136.428C266.082 136.299 266.109 136.172 266.137 136.044C266.143 136.015 266.149 135.983 266.157 135.954C266.185 135.812 266.217 135.674 266.248 135.533C266.249 135.525 266.249 135.519 266.252 135.511C266.283 135.372 266.315 135.232 266.346 135.093C266.383 134.937 266.421 134.78 266.459 134.622C266.463 134.605 266.467 134.587 266.473 134.57C266.522 134.366 266.574 134.163 266.627 133.96C266.748 133.492 266.874 133.024 267.007 132.561C267.051 132.418 267.094 132.275 267.137 132.132C267.155 132.073 267.172 132.013 267.19 131.954C267.215 131.87 267.243 131.785 267.269 131.702L267.27 131.7C267.288 131.636 267.309 131.574 267.329 131.511C267.351 131.441 267.374 131.371 267.397 131.304C267.469 131.082 267.545 130.86 267.621 130.64C267.685 130.462 267.749 130.282 267.815 130.105C267.832 130.056 267.848 130.009 267.866 129.962C267.931 129.789 267.997 129.616 268.063 129.443C268.069 129.428 268.076 129.412 268.081 129.397C268.096 129.36 268.112 129.321 268.127 129.284C268.141 129.25 268.152 129.218 268.165 129.185C268.175 129.163 268.185 129.141 268.193 129.119C268.198 129.102 268.206 129.086 268.214 129.069C268.227 129.032 268.244 128.993 268.259 128.956C268.294 128.869 268.33 128.783 268.367 128.695C268.431 128.54 268.497 128.388 268.565 128.235C268.579 128.2 268.595 128.165 268.609 128.13C268.678 127.975 268.748 127.82 268.821 127.666C268.933 127.423 269.048 127.18 269.167 126.94C269.304 126.663 269.446 126.387 269.592 126.116C269.637 126.03 269.683 125.947 269.728 125.864C269.78 125.769 269.834 125.674 269.888 125.579C269.944 125.478 270.003 125.376 270.061 125.276C270.063 125.275 270.064 125.273 270.064 125.271C270.099 125.209 270.135 125.146 270.173 125.086C270.241 124.97 270.309 124.853 270.382 124.739C270.428 124.66 270.477 124.58 270.527 124.503C270.541 124.48 270.555 124.458 270.572 124.434C270.64 124.323 270.712 124.213 270.786 124.102C270.872 123.969 270.962 123.837 271.052 123.706C271.165 123.538 271.28 123.372 271.4 123.209C271.413 123.188 271.429 123.166 271.444 123.146C271.525 123.035 271.606 122.922 271.691 122.813C271.745 122.741 271.8 122.667 271.856 122.596L271.857 122.595C271.972 122.447 272.088 122.3 272.207 122.156C272.22 122.137 272.235 122.119 272.25 122.101C272.362 121.965 272.475 121.829 272.591 121.695C272.613 121.668 272.634 121.644 272.655 121.62C272.695 121.571 272.736 121.524 272.778 121.477L272.779 121.475C272.832 121.413 272.887 121.352 272.941 121.292C273.096 121.118 273.255 120.946 273.413 120.775C273.306 120.864 273.201 120.954 273.098 121.047C273.011 121.126 272.924 121.206 272.838 121.285L272.837 121.287C272.744 121.373 272.653 121.459 272.562 121.545C272.472 121.634 272.383 121.721 272.293 121.81C272.115 121.99 271.942 122.172 271.771 122.357C271.684 122.449 271.601 122.542 271.517 122.638C271.436 122.728 271.357 122.82 271.277 122.912C271.108 123.106 270.943 123.304 270.781 123.505C270.69 123.621 270.599 123.737 270.51 123.853C270.426 123.961 270.347 124.068 270.267 124.177C270.259 124.187 270.252 124.196 270.247 124.206L270.244 124.207C270.236 124.219 270.227 124.233 270.218 124.245C270.163 124.32 270.107 124.396 270.056 124.471C270.016 124.524 269.978 124.579 269.941 124.633C269.928 124.65 269.919 124.665 269.907 124.682C269.805 124.83 269.704 124.981 269.605 125.132C269.507 125.281 269.41 125.433 269.316 125.583C269.284 125.633 269.251 125.685 269.221 125.736C269.163 125.83 269.105 125.923 269.051 126.018C269.009 126.086 268.969 126.156 268.929 126.224C268.872 126.322 268.814 126.422 268.759 126.521L268.758 126.523C268.728 126.574 268.699 126.627 268.671 126.678C268.648 126.719 268.625 126.761 268.602 126.802C268.542 126.91 268.483 127.017 268.424 127.128C268.356 127.258 268.287 127.388 268.221 127.518C268.148 127.662 268.078 127.804 268.007 127.946C267.936 128.09 267.868 128.232 267.801 128.377C267.754 128.475 267.71 128.573 267.664 128.673C267.512 129.01 267.366 129.347 267.226 129.688C267.164 129.835 267.105 129.983 267.047 130.131C266.855 130.625 266.677 131.126 266.509 131.628L266.505 131.626C266.485 131.624 266.464 131.618 266.444 131.616C266.377 131.601 266.311 131.591 266.246 131.579C266.228 131.576 266.209 131.574 266.19 131.57C266.106 131.557 266.021 131.545 265.939 131.533C265.831 131.519 265.721 131.506 265.611 131.496C265.57 131.492 265.528 131.488 265.487 131.484C265.411 131.477 265.335 131.471 265.261 131.467C265.154 131.461 265.048 131.456 264.942 131.453C264.806 131.448 264.673 131.446 264.537 131.45C264.478 131.448 264.419 131.449 264.361 131.452C264.278 131.453 264.195 131.455 264.112 131.46C264.061 131.462 264.007 131.464 263.955 131.469C263.706 131.482 263.456 131.505 263.207 131.536C263.176 131.54 263.148 131.543 263.119 131.548C263.09 131.552 263.061 131.555 263.03 131.561C262.99 131.566 262.95 131.571 262.912 131.577C262.897 131.58 262.879 131.583 262.863 131.586C262.766 131.598 262.668 131.615 262.571 131.632C262.457 131.651 262.344 131.673 262.231 131.697C262.181 131.707 262.131 131.717 262.08 131.729C262.053 131.735 262.028 131.741 262 131.748C261.991 131.749 261.983 131.75 261.976 131.752C261.972 131.751 261.967 131.753 261.964 131.754C261.96 131.755 261.955 131.756 261.95 131.758C261.93 131.762 261.912 131.766 261.891 131.771C261.779 131.798 261.665 131.826 261.555 131.855C261.55 131.855 261.548 131.857 261.543 131.857C261.404 131.895 261.266 131.934 261.127 131.976C260.977 132.021 260.825 132.07 260.676 132.123C260.545 132.166 260.415 132.213 260.286 132.263C260.182 132.303 260.077 132.345 259.974 132.387C259.94 132.4 259.906 132.413 259.874 132.428C259.861 132.434 259.846 132.441 259.833 132.447L259.853 132.42L259.865 132.404L260.057 132.167L260.059 132.166L260.229 131.957L260.608 131.501L261.002 131.035L261.252 130.738L261.255 130.737L262.134 129.694C262.644 129.094 263.16 128.498 263.692 127.911C264.13 127.425 264.58 126.943 265.026 126.447C265.121 126.343 265.214 126.238 265.307 126.134C265.152 126.217 264.998 126.304 264.845 126.397C264.77 126.442 264.695 126.49 264.619 126.538C264.557 126.577 264.495 126.617 264.435 126.657C264.041 126.916 263.665 127.201 263.301 127.498C262.753 127.948 262.231 128.433 261.743 128.946C261.673 129.021 261.605 129.094 261.537 129.169C261.52 129.189 261.502 129.208 261.485 129.227C261.468 129.247 261.453 129.266 261.436 129.284C261.573 129.003 261.721 128.73 261.877 128.462C261.913 128.396 261.952 128.33 261.992 128.266C262.038 128.187 262.085 128.111 262.133 128.033C262.7 127.14 263.361 126.317 264.107 125.579C264.165 125.523 264.222 125.467 264.28 125.414C264.288 125.406 264.294 125.399 264.303 125.392C264.335 125.361 264.366 125.332 264.4 125.301C264.469 125.234 264.54 125.17 264.613 125.106C264.65 125.072 264.686 125.04 264.723 125.007C264.765 124.971 264.81 124.933 264.852 124.897C264.914 124.845 264.977 124.791 265.041 124.74C265.095 124.695 265.15 124.651 265.203 124.606C265.27 124.554 265.336 124.503 265.402 124.452C265.43 124.428 265.458 124.406 265.489 124.385L265.494 124.382C265.687 124.232 265.886 124.089 266.092 123.951C266.142 123.916 266.197 123.88 266.249 123.846C266.359 123.772 266.472 123.702 266.584 123.631C266.712 123.554 266.842 123.477 266.975 123.403C266.986 123.396 266.996 123.391 267.009 123.385C267.237 123.255 267.47 123.13 267.708 123.014C267.723 123.007 267.736 123.001 267.751 122.993C267.891 122.926 268.031 122.859 268.174 122.795C268.317 122.728 268.46 122.666 268.605 122.607C268.696 122.569 268.787 122.533 268.877 122.497C268.943 122.471 269.009 122.444 269.076 122.421C269.215 122.368 269.353 122.316 269.494 122.267C269.402 122.271 269.31 122.275 269.217 122.282C269.148 122.286 269.08 122.294 269.011 122.299C268.962 122.306 268.913 122.31 268.863 122.318C268.503 122.361 268.146 122.431 267.794 122.528C267.78 122.532 267.764 122.537 267.75 122.54C267.536 122.597 267.324 122.664 267.114 122.741C267.079 122.754 267.043 122.767 267.009 122.781C266.976 122.792 266.94 122.805 266.905 122.82C266.696 122.9 266.491 122.988 266.289 123.085C265.275 123.561 264.346 124.222 263.547 125.013C263.463 125.096 263.382 125.18 263.302 125.265C263.301 125.267 263.299 125.266 263.298 125.268C263.219 125.352 263.143 125.438 263.066 125.525C263.038 125.557 263.011 125.588 262.982 125.62C262.982 125.622 262.98 125.621 262.98 125.621C262.919 125.693 262.858 125.766 262.798 125.84C262.758 125.891 262.717 125.943 262.676 125.994C262.653 126.022 262.631 126.05 262.61 126.079C262.564 126.139 262.52 126.199 262.476 126.259C262.465 126.272 262.456 126.286 262.447 126.3C262.409 126.35 262.375 126.399 262.34 126.45C262.311 126.491 262.283 126.53 262.258 126.572C262.229 126.612 262.202 126.655 262.175 126.697C262.148 126.736 262.121 126.777 262.099 126.818C262.066 126.864 262.037 126.912 262.009 126.962C261.991 126.989 261.975 127.017 261.959 127.046C261.924 127.105 261.888 127.164 261.855 127.224C261.812 127.298 261.772 127.373 261.732 127.449C261.683 127.544 261.636 127.637 261.59 127.733C261.512 127.889 261.441 128.047 261.374 128.21C261.351 128.265 261.328 128.318 261.306 128.374C261.261 128.487 261.219 128.602 261.178 128.719C261.155 128.785 261.135 128.849 261.114 128.916C261.093 128.978 261.072 129.043 261.055 129.106C261.049 129.123 261.045 129.141 261.039 129.158C261.02 129.225 261 129.294 260.983 129.362C260.926 129.569 260.88 129.779 260.842 129.991C260.832 130.004 260.823 130.016 260.812 130.029C260.547 130.375 260.292 130.734 260.063 131.105L259.845 131.463L259.747 131.625L259.714 131.685L259.448 132.153L259.31 132.411L259.204 132.614L259.163 132.69C259.147 132.718 259.132 132.747 259.118 132.778C258.984 132.846 258.851 132.913 258.719 132.985C258.688 133.004 258.654 133.022 258.622 133.04C258.5 133.107 258.376 133.178 258.257 133.25C258.247 133.255 258.238 133.263 258.228 133.267C258.219 133.273 258.209 133.278 258.201 133.284C257.983 133.414 257.77 133.553 257.564 133.699C257.561 133.7 257.558 133.703 257.556 133.704L257.555 133.706C257.331 133.86 257.115 134.021 256.905 134.19C256.867 134.221 256.829 134.251 256.793 134.282C256.787 134.289 256.778 134.294 256.77 134.3L256.769 134.302C256.537 134.491 256.313 134.689 256.098 134.896L256.097 134.898C256.094 134.901 256.091 134.903 256.088 134.906C256.085 134.909 256.082 134.91 256.079 134.913C256.019 134.972 255.958 135.031 255.899 135.093C255.832 135.158 255.769 135.225 255.705 135.293C255.641 135.361 255.58 135.428 255.518 135.497C255.456 135.566 255.396 135.638 255.336 135.708C255.359 135.629 255.379 135.552 255.404 135.474C255.41 135.451 255.416 135.426 255.424 135.404L255.463 135.284L255.904 133.935C255.911 133.908 255.921 133.88 255.93 133.854C255.96 133.755 255.992 133.656 256.026 133.559L256.07 133.432C256.086 133.385 256.102 133.34 256.119 133.296C256.181 133.123 256.246 132.954 256.311 132.785C256.351 132.683 256.39 132.583 256.427 132.482C256.49 132.318 256.552 132.157 256.613 131.993C256.645 131.907 256.677 131.823 256.71 131.738C256.742 131.652 256.776 131.567 256.81 131.482C256.841 131.396 256.875 131.311 256.91 131.228L256.912 131.223C256.937 131.162 256.962 131.103 256.987 131.042L257.338 130.25L257.464 129.967L257.614 129.629C257.723 129.396 257.817 129.154 257.936 128.926L258.289 128.236C258.526 127.778 258.751 127.313 258.999 126.86L259.775 125.519C259.807 125.463 259.841 125.408 259.873 125.351C259.948 125.221 260.021 125.091 260.101 124.963C260.122 124.926 260.146 124.888 260.169 124.851L260.589 124.201C260.633 124.134 260.675 124.066 260.717 123.999C260.816 123.848 260.911 123.698 261.007 123.548C261.147 123.331 261.288 123.114 261.434 122.9L261.974 122.15C262.004 122.143 262.035 122.139 262.067 122.131C262.084 122.129 262.1 122.126 262.119 122.122C262.206 122.106 262.295 122.086 262.383 122.068C262.466 122.05 262.546 122.03 262.629 122.01C262.668 122.001 262.705 121.992 262.742 121.984C262.778 121.975 262.817 121.966 262.855 121.956C262.93 121.938 263.007 121.918 263.082 121.897C263.147 121.88 263.21 121.862 263.276 121.842C263.315 121.831 263.353 121.819 263.394 121.805C263.46 121.786 263.525 121.766 263.589 121.746C263.606 121.742 263.625 121.736 263.642 121.729C263.717 121.706 263.793 121.682 263.869 121.656C264.195 121.548 264.519 121.428 264.84 121.299C264.948 121.255 265.055 121.207 265.161 121.16C265.161 121.16 265.162 121.16 265.164 121.159C265.256 121.119 265.348 121.08 265.438 121.037C265.493 121.012 265.545 120.988 265.601 120.961C265.744 120.895 265.886 120.824 266.029 120.753L266.032 120.75C266.083 120.726 266.132 120.699 266.181 120.673C266.293 120.617 266.403 120.556 266.512 120.496C266.599 120.448 266.683 120.399 266.767 120.35C266.852 120.3 266.936 120.251 267.02 120.198C267.103 120.149 267.184 120.097 267.267 120.046C267.267 120.045 267.268 120.044 267.27 120.043C267.352 119.989 267.434 119.935 267.514 119.879C267.608 119.817 267.701 119.75 267.793 119.683C267.796 119.68 267.802 119.676 267.81 119.672C267.842 119.646 267.876 119.621 267.91 119.595C267.937 119.577 267.963 119.559 267.986 119.54C268.012 119.521 268.036 119.5 268.06 119.481C268.055 119.481 268.051 119.482 268.045 119.486L268.042 119.487C267.887 119.553 267.731 119.621 267.574 119.689C267.319 119.801 267.067 119.913 266.815 120.026C266.669 120.089 266.522 120.155 266.375 120.219C266.348 120.231 266.323 120.241 266.296 120.253C266.296 120.255 266.293 120.256 266.293 120.256C266.199 120.295 266.105 120.336 266.012 120.376C265.972 120.393 265.933 120.409 265.893 120.427C265.712 120.505 265.532 120.582 265.351 120.658C265.131 120.753 264.91 120.842 264.689 120.932C264.554 120.989 264.419 121.043 264.283 121.097C264.198 121.13 264.113 121.166 264.029 121.198L264.026 121.199C263.682 121.337 263.334 121.469 262.987 121.603C262.914 121.631 262.844 121.657 262.771 121.684C262.766 121.687 262.761 121.687 262.756 121.69C262.589 121.752 262.42 121.815 262.253 121.878C262.25 121.881 262.248 121.88 262.245 121.881C262.228 121.888 262.214 121.893 262.197 121.9C262.178 121.906 262.158 121.914 262.141 121.921L262.305 121.692L262.329 121.658L262.341 121.643C262.401 121.56 262.459 121.479 262.519 121.397C262.61 121.269 262.703 121.141 262.8 121.017L263.124 120.613L263.13 120.607L263.131 120.605L263.287 120.41C263.613 120.01 263.932 119.602 264.264 119.203L264.327 119.13L264.385 119.066L264.386 119.064L265.241 118.104L265.29 118.049L265.297 118.041C265.386 117.943 265.473 117.843 265.562 117.743C266.381 117.403 267.194 117.052 268.003 116.689C268.01 116.686 268.015 116.683 268.023 116.68C268.032 116.677 268.042 116.672 268.05 116.668C268.073 116.657 268.098 116.647 268.12 116.637C268.374 116.523 268.624 116.41 268.877 116.295C268.997 116.295 269.117 116.294 269.236 116.291C269.247 116.291 269.259 116.291 269.27 116.29C269.281 116.29 269.293 116.29 269.304 116.29C269.378 116.288 269.455 116.287 269.53 116.282C269.632 116.281 269.736 116.277 269.839 116.271C269.876 116.269 269.911 116.266 269.947 116.266L269.949 116.264C270.011 116.261 270.076 116.258 270.138 116.254C270.325 116.243 270.513 116.228 270.701 116.211C270.777 116.204 270.851 116.198 270.925 116.19C271.078 116.176 271.231 116.159 271.383 116.14C271.431 116.134 271.48 116.127 271.528 116.121C271.621 116.111 271.714 116.097 271.806 116.085C271.846 116.079 271.888 116.073 271.929 116.066C272.046 116.05 272.162 116.033 272.28 116.013C272.409 115.992 272.541 115.97 272.671 115.946L272.745 115.934L272.748 115.933C272.79 115.926 272.833 115.918 272.876 115.91C272.997 115.888 273.117 115.865 273.237 115.841L273.239 115.841C273.327 115.824 273.413 115.805 273.5 115.785C273.687 115.744 273.874 115.703 274.06 115.659C274.204 115.626 274.345 115.591 274.488 115.555C274.531 115.544 274.574 115.532 274.618 115.52C274.803 115.472 274.987 115.42 275.17 115.368C275.355 115.314 275.536 115.259 275.719 115.2C275.771 115.183 275.825 115.167 275.878 115.148C275.986 115.116 276.094 115.079 276.202 115.041C276.228 115.033 276.253 115.025 276.28 115.015C276.405 114.972 276.529 114.929 276.653 114.881C276.734 114.853 276.815 114.822 276.895 114.791C276.972 114.763 277.048 114.732 277.124 114.701C277.168 114.685 277.212 114.667 277.255 114.648C277.271 114.643 277.286 114.637 277.301 114.63C277.419 114.582 277.534 114.534 277.649 114.483C277.686 114.467 277.723 114.45 277.761 114.433C277.771 114.428 277.78 114.425 277.79 114.421C277.833 114.402 277.875 114.382 277.918 114.362L277.92 114.362C277.983 114.333 278.043 114.306 278.106 114.275C278.037 114.293 277.965 114.312 277.894 114.33C277.847 114.341 277.801 114.353 277.755 114.364C277.739 114.367 277.725 114.372 277.709 114.375C277.672 114.386 277.634 114.396 277.598 114.404C276.943 114.573 276.291 114.743 275.635 114.901C274.813 115.098 273.989 115.288 273.159 115.451C272.867 115.512 272.571 115.569 272.276 115.623C271.979 115.678 271.683 115.731 271.388 115.781C271.325 115.792 271.26 115.802 271.197 115.814C271.197 115.814 271.195 115.813 271.194 115.815C271.016 115.843 270.841 115.874 270.663 115.902C270.627 115.908 270.589 115.914 270.554 115.919C270.48 115.931 270.409 115.942 270.335 115.953C270.152 115.982 269.969 116.009 269.786 116.036C269.613 116.062 269.44 116.089 269.267 116.113C269.483 116.013 269.7 115.915 269.916 115.813C270.229 115.669 270.543 115.523 270.854 115.374C271.02 115.297 271.184 115.219 271.35 115.14C271.497 115.068 271.643 114.999 271.79 114.928C271.912 114.869 272.035 114.813 272.156 114.754L272.396 114.637L272.701 114.488L272.723 114.479L273.012 114.337L273.048 114.318L273.433 114.131L274.029 113.841C274.029 113.841 274.03 113.841 274.031 113.839L274.378 113.671C275.195 113.272 276.017 112.886 276.852 112.543C277.018 112.472 277.186 112.406 277.354 112.342C277.691 112.213 278.029 112.09 278.371 111.977C278.491 111.936 278.61 111.897 278.729 111.861C278.784 111.843 278.841 111.826 278.897 111.81C279.061 111.761 279.226 111.715 279.393 111.672C279.417 111.664 279.442 111.658 279.468 111.652C279.53 111.636 279.592 111.621 279.656 111.608C279.696 111.596 279.734 111.588 279.773 111.579C279.849 111.561 279.924 111.545 279.999 111.53C280.113 111.505 280.229 111.482 280.343 111.462C280.458 111.439 280.574 111.42 280.689 111.403C280.79 111.387 280.892 111.372 280.991 111.36C281.125 111.343 281.26 111.329 281.395 111.317C281.48 111.31 281.563 111.301 281.646 111.297C281.733 111.291 281.817 111.286 281.899 111.285C281.914 111.284 281.931 111.284 281.946 111.283C282.03 111.278 282.111 111.276 282.193 111.275C282.201 111.276 282.208 111.276 282.214 111.274C282.39 111.272 282.564 111.275 282.74 111.284C282.84 111.287 282.939 111.294 283.039 111.301C283.07 111.303 283.099 111.305 283.129 111.309C283.222 111.316 283.315 111.325 283.408 111.336C283.516 111.348 283.623 111.362 283.73 111.378C283.613 111.34 283.494 111.303 283.374 111.27C283.291 111.247 283.207 111.224 283.123 111.206C283.02 111.18 282.916 111.159 282.81 111.137C282.707 111.118 282.605 111.102 282.501 111.087C282.399 111.071 282.296 111.058 282.193 111.045C281.886 111.009 281.574 110.991 281.264 110.986C281.236 110.987 281.207 110.986 281.179 110.987C281.156 110.987 281.133 110.987 281.109 110.988C281.008 110.988 280.908 110.99 280.808 110.995C280.751 110.996 280.693 110.999 280.636 111.003C280.382 111.016 280.126 111.041 279.874 111.071C279.805 111.081 279.738 111.091 279.672 111.1C279.648 111.102 279.621 111.106 279.597 111.11C279.554 111.116 279.51 111.124 279.467 111.132C279.452 111.133 279.436 111.136 279.423 111.138C279.398 111.142 279.373 111.146 279.349 111.15C279.149 111.184 278.953 111.222 278.757 111.265C278.753 111.266 278.75 111.267 278.746 111.267C278.609 111.298 278.476 111.33 278.339 111.364C278.479 111.278 278.616 111.191 278.757 111.107C278.888 111.026 279.021 110.946 279.156 110.866C279.234 110.819 279.31 110.774 279.39 110.728L279.39 110.726C279.391 110.725 279.392 110.724 279.395 110.724C279.402 110.718 279.409 110.714 279.42 110.709C279.56 110.625 279.703 110.542 279.845 110.459C279.924 110.414 280.003 110.368 280.081 110.325C280.084 110.322 280.089 110.322 280.092 110.319C280.162 110.28 280.233 110.239 280.302 110.2C280.328 110.185 280.351 110.172 280.375 110.159C280.401 110.145 280.424 110.132 280.45 110.118C280.62 110.023 280.789 109.93 280.96 109.838C281.333 109.637 281.708 109.442 282.086 109.251C282.402 109.093 282.72 108.938 283.04 108.786L283.052 108.78C283.111 108.751 283.171 108.722 283.232 108.694C283.252 108.684 283.27 108.676 283.289 108.668C283.294 108.665 283.297 108.662 283.303 108.66L283.304 108.66C283.373 108.627 283.443 108.595 283.511 108.563C283.813 108.42 284.119 108.281 284.426 108.142C284.478 108.119 284.53 108.096 284.583 108.072L284.733 108.003C284.786 107.98 284.84 107.956 284.893 107.932C284.958 107.902 285.022 107.874 285.088 107.844C285.217 107.786 285.346 107.725 285.476 107.665C285.498 107.656 285.523 107.645 285.546 107.634C285.558 107.628 285.569 107.623 285.581 107.617C285.566 107.618 285.553 107.62 285.538 107.619C285.53 107.62 285.521 107.62 285.514 107.621C285.497 107.622 285.48 107.624 285.464 107.627C285.427 107.631 285.388 107.632 285.349 107.636C285.311 107.637 285.274 107.641 285.236 107.645C285.146 107.652 285.057 107.663 284.967 107.674C284.914 107.681 284.861 107.688 284.808 107.697C284.772 107.701 284.737 107.706 284.701 107.712C284.632 107.722 284.563 107.734 284.495 107.747C284.442 107.755 284.39 107.765 284.336 107.775C284.33 107.774 284.325 107.776 284.318 107.778C284.223 107.797 284.13 107.816 284.036 107.838C283.905 107.864 283.772 107.896 283.642 107.931C283.54 107.957 283.436 107.984 283.335 108.014C283.224 108.043 283.115 108.077 283.005 108.111C282.91 108.141 282.815 108.171 282.72 108.204C282.619 108.239 282.518 108.275 282.417 108.312C282.379 108.326 282.343 108.339 282.303 108.355L282.301 108.354C282.19 108.395 282.08 108.439 281.97 108.485C281.947 108.494 281.923 108.503 281.901 108.514C281.869 108.526 281.839 108.539 281.809 108.552C281.701 108.596 281.592 108.643 281.484 108.694C281.37 108.743 281.258 108.794 281.145 108.852C281.083 108.881 281.019 108.911 280.955 108.944C280.83 109.006 280.705 109.07 280.583 109.137C280.464 109.201 280.346 109.268 280.228 109.336C280.128 109.394 280.027 109.454 279.926 109.515C279.84 109.568 279.754 109.622 279.667 109.678C279.591 109.728 279.515 109.777 279.44 109.827C279.43 109.832 279.422 109.837 279.413 109.845C279.342 109.892 279.27 109.941 279.2 109.99C279.17 110.011 279.139 110.032 279.11 110.056C279.048 110.1 278.987 110.142 278.928 110.187C278.914 110.195 278.9 110.205 278.889 110.213C278.881 110.219 278.872 110.226 278.863 110.234C278.852 110.241 278.845 110.249 278.837 110.254C278.806 110.275 278.778 110.297 278.748 110.321C278.628 110.412 278.512 110.504 278.395 110.598C278.297 110.68 278.199 110.764 278.101 110.85C278.002 110.936 277.907 111.022 277.813 111.11C277.808 111.113 277.804 111.118 277.801 111.121C277.615 111.292 277.435 111.472 277.262 111.656C277.253 111.663 277.246 111.67 277.239 111.678C277.092 111.726 276.945 111.774 276.797 111.823C276.647 111.874 276.496 111.928 276.347 111.981C276.342 111.983 276.337 111.984 276.332 111.986C276.114 112.067 275.899 112.154 275.683 112.241C275.627 112.264 275.573 112.285 275.516 112.31C275.29 112.402 275.065 112.499 274.839 112.598L274.837 112.599C274.746 112.635 274.656 112.675 274.567 112.716C274.43 112.774 274.294 112.834 274.159 112.897C274.119 112.914 274.079 112.932 274.039 112.95C273.325 113.284 272.619 113.62 271.914 113.963C271.68 114.078 271.445 114.192 271.211 114.307C270.939 114.441 270.67 114.575 270.4 114.709C270.125 114.845 269.852 114.982 269.579 115.119C269.33 115.243 269.082 115.37 268.833 115.497C268.179 115.828 267.529 116.167 266.882 116.513C266.789 116.561 266.699 116.61 266.608 116.658L267.459 115.802L268.401 114.945L268.605 114.759L268.611 114.752L268.796 114.585L268.915 114.477L269.187 114.228L269.79 113.733L270.55 113.11L270.953 112.78L270.997 112.743L271.484 112.385L271.484 112.383L271.764 112.179L272.255 111.818L272.885 111.352L273.038 111.251L273.537 110.923L274.847 110.061L273.486 110.84L272.803 111.229L272.485 111.436L272.482 111.438L272.146 111.656L272.11 111.679L271.647 111.982L271.598 112.013L271.552 112.044L271.506 112.074L270.83 112.516L269.769 113.298L269.565 113.449L269.089 113.8L268.933 113.917C268.904 113.94 268.875 113.962 268.848 113.986C268.773 114.044 268.701 114.106 268.627 114.166C268.527 114.25 268.426 114.332 268.323 114.417L268.044 114.65L267.976 114.707C268.012 114.639 268.048 114.572 268.083 114.502C268.089 114.49 268.096 114.475 268.103 114.461C268.131 114.407 268.156 114.35 268.182 114.294C268.193 114.275 268.203 114.253 268.213 114.231C268.236 114.182 268.257 114.132 268.279 114.083C268.288 114.061 268.297 114.041 268.305 114.02C268.321 113.986 268.336 113.949 268.35 113.914C268.408 113.765 268.461 113.618 268.51 113.466C268.517 113.443 268.525 113.422 268.531 113.399C268.544 113.36 268.557 113.318 268.569 113.276C268.615 113.121 268.656 112.965 268.691 112.808C268.705 112.75 268.717 112.691 268.727 112.631C268.744 112.552 268.758 112.471 268.771 112.391C268.781 112.325 268.791 112.259 268.799 112.193C268.805 112.159 268.808 112.126 268.811 112.091C268.813 112.087 268.813 112.081 268.813 112.075C268.821 112.008 268.828 111.941 268.832 111.873C268.841 111.787 268.846 111.699 268.848 111.613C268.851 111.526 268.852 111.438 268.853 111.352C268.852 111.324 268.852 111.294 268.851 111.265C268.85 111.252 268.85 111.239 268.85 111.226C268.85 111.214 268.851 111.199 268.849 111.186C268.848 111.158 268.846 111.128 268.844 111.098C268.84 111.006 268.832 110.914 268.821 110.823C268.803 110.907 268.786 110.99 268.768 111.074C268.764 111.091 268.759 111.111 268.755 111.128C268.754 111.138 268.753 111.148 268.749 111.158C268.745 111.184 268.74 111.207 268.734 111.233C268.729 111.258 268.722 111.285 268.715 111.31C268.707 111.346 268.7 111.379 268.692 111.414C268.625 111.723 268.549 112.026 268.466 112.326C268.445 112.399 268.424 112.471 268.403 112.546C268.384 112.611 268.365 112.674 268.343 112.736C268.327 112.787 268.312 112.839 268.297 112.888C268.286 112.919 268.278 112.949 268.267 112.979C268.255 113.013 268.246 113.048 268.232 113.081C268.154 113.313 268.07 113.541 267.98 113.766C267.944 113.855 267.909 113.944 267.871 114.032C267.866 114.045 267.862 114.056 267.856 114.069C267.823 114.15 267.787 114.23 267.751 114.31C267.749 114.316 267.746 114.323 267.742 114.328C267.74 114.336 267.738 114.342 267.733 114.348C267.724 114.375 267.713 114.402 267.7 114.427C267.682 114.466 267.665 114.504 267.646 114.539C267.592 114.66 267.534 114.778 267.474 114.895C267.432 114.979 267.389 115.063 267.347 115.147C267.318 115.201 267.287 115.251 267.259 115.303L267.113 115.425L266.465 116.026C266.465 116.026 266.464 116.027 266.462 116.027L265.956 116.496L265.8 116.642L265.4 117.015L265.38 117.034C265.374 117.04 265.367 117.048 265.361 117.054C265.177 117.23 265.006 117.415 264.829 117.596L264.431 118.01L264.381 118.063L263.734 118.733C263.383 119.125 263.045 119.529 262.699 119.927L262.184 120.525C262.014 120.727 261.859 120.939 261.697 121.146L260.73 122.397C260.69 122.45 260.651 122.504 260.613 122.558C260.573 122.612 260.536 122.665 260.498 122.719C260.27 123.042 260.049 123.37 259.823 123.694L259.436 124.251L259.372 124.344C259.296 124.453 259.226 124.565 259.157 124.678C259.123 124.734 259.088 124.791 259.054 124.847C259.043 124.867 259.032 124.888 259.019 124.907C258.998 124.943 258.975 124.98 258.952 125.016L258.815 125.238L258.654 125.504L258.62 125.56C258.639 125.51 258.656 125.461 258.676 125.411C258.681 125.394 258.688 125.375 258.696 125.359L258.7 125.345C258.729 125.275 258.757 125.207 258.785 125.137L258.786 125.135C258.839 125.006 258.893 124.875 258.948 124.747C259.026 124.565 259.105 124.385 259.187 124.204C259.37 123.792 259.56 123.382 259.757 122.974C259.805 122.87 259.855 122.77 259.903 122.667C259.953 122.566 260 122.467 260.05 122.366C260.117 122.227 260.187 122.087 260.254 121.948C260.4 121.649 260.547 121.35 260.694 121.049C260.795 120.842 260.895 120.635 260.996 120.428C261.041 120.334 261.087 120.238 261.132 120.144C261.139 120.132 261.145 120.119 261.15 120.106C261.179 120.045 261.21 119.981 261.24 119.918C261.292 119.81 261.343 119.701 261.393 119.592C261.444 119.483 261.495 119.373 261.546 119.262C261.582 119.188 261.617 119.112 261.652 119.036C261.726 118.87 261.801 118.702 261.874 118.535C262.199 117.797 262.5 117.045 262.749 116.272C262.807 116.098 262.86 115.923 262.911 115.744C262.913 115.739 262.916 115.731 262.916 115.723C262.932 115.671 262.946 115.619 262.961 115.565L262.961 115.563C262.964 115.556 262.967 115.547 262.968 115.536C262.976 115.516 262.982 115.493 262.987 115.471C263.001 115.419 263.016 115.363 263.029 115.309C263.031 115.301 263.031 115.295 263.034 115.287L263.034 115.285C263.048 115.227 263.064 115.169 263.076 115.11C263.082 115.087 263.088 115.065 263.092 115.042C263.101 115.009 263.109 114.974 263.116 114.94C263.089 114.994 263.061 115.046 263.034 115.098C263.021 115.123 263.008 115.148 262.994 115.17C262.987 115.185 262.979 115.201 262.972 115.215C262.95 115.254 262.93 115.293 262.909 115.332C262.901 115.347 262.892 115.36 262.885 115.375C262.881 115.388 262.874 115.401 262.866 115.412C262.844 115.457 262.821 115.5 262.797 115.544C262.792 115.553 262.789 115.561 262.784 115.57C262.749 115.635 262.713 115.703 262.677 115.769C262.645 115.831 262.613 115.892 262.58 115.952C262.537 116.032 262.493 116.111 262.45 116.191C262.44 116.209 262.432 116.225 262.422 116.243C262.057 116.918 261.688 117.589 261.316 118.26C261.137 118.588 260.957 118.913 260.776 119.24C260.685 119.404 260.597 119.567 260.508 119.733C260.418 119.895 260.332 120.059 260.243 120.224L260.242 120.226C260.196 120.309 260.153 120.393 260.109 120.477C260.095 120.504 260.079 120.532 260.066 120.559C260.029 120.628 259.993 120.696 259.958 120.765C259.937 120.809 259.914 120.849 259.893 120.893C259.862 120.951 259.834 121.009 259.803 121.068C259.772 121.127 259.743 121.186 259.714 121.246C259.654 121.362 259.596 121.481 259.538 121.6C259.504 121.668 259.471 121.737 259.437 121.805C259.368 121.949 259.299 122.094 259.231 122.241C258.912 122.93 258.619 123.636 258.369 124.358C258.33 124.469 258.294 124.58 258.257 124.692C258.233 124.766 258.211 124.838 258.187 124.912C258.164 124.984 258.143 125.052 258.122 125.125L258.115 125.143C258.099 125.197 258.085 125.249 258.069 125.302C258.055 125.354 258.04 125.404 258.028 125.457C258.008 125.526 257.988 125.595 257.972 125.665C257.95 125.746 257.93 125.83 257.911 125.913C257.906 125.935 257.901 125.956 257.896 125.976C257.891 125.997 257.886 126.016 257.881 126.038C257.872 126.075 257.863 126.114 257.856 126.151C257.852 126.169 257.848 126.188 257.844 126.206C257.834 126.253 257.824 126.3 257.814 126.347C257.798 126.416 257.785 126.483 257.775 126.551C257.772 126.565 257.769 126.579 257.766 126.593L257.766 126.594C257.756 126.646 257.746 126.699 257.739 126.752C257.731 126.799 257.722 126.847 257.714 126.895C257.706 126.945 257.698 126.997 257.691 127.047L257.69 127.049C257.683 127.089 257.678 127.127 257.673 127.165C257.672 127.175 257.671 127.183 257.67 127.194C257.656 127.22 257.64 127.249 257.627 127.276C257.617 127.291 257.609 127.309 257.599 127.325C257.522 127.469 257.446 127.615 257.366 127.758C257.133 128.187 256.906 128.623 256.687 129.06C256.615 129.206 256.544 129.352 256.473 129.5C256.364 129.725 256.258 129.952 256.154 130.179C256.081 130.333 256.013 130.488 255.945 130.642C255.909 130.722 255.872 130.804 255.837 130.884C255.813 130.941 255.788 130.998 255.764 131.055L255.761 131.062C255.681 131.25 255.602 131.435 255.524 131.623C255.511 131.656 255.495 131.689 255.483 131.724C255.391 131.945 255.304 132.168 255.216 132.392C255.13 132.615 255.044 132.838 254.962 133.062C254.886 133.263 254.814 133.464 254.744 133.665C254.735 133.687 254.726 133.712 254.718 133.736L254.646 133.943C254.618 134.024 254.591 134.103 254.565 134.184C254.542 134.25 254.521 134.317 254.498 134.382C254.466 134.475 254.436 134.566 254.406 134.658L254.406 134.66C254.393 134.702 254.379 134.743 254.367 134.785C254.357 134.805 254.352 134.827 254.347 134.848L254.346 134.85C254.319 134.934 254.291 135.016 254.265 135.102L254.257 135.125C254.253 135.136 254.25 135.147 254.247 135.159C254.244 135.168 254.241 135.178 254.24 135.188C254.228 135.222 254.215 135.258 254.206 135.292L254.204 135.296C254.198 135.313 254.192 135.332 254.188 135.349C254.137 135.513 254.086 135.678 254.04 135.843C253.979 136.042 253.922 136.243 253.867 136.445C253.857 136.473 253.85 136.5 253.842 136.529L253.841 136.531C253.835 136.554 253.829 136.577 253.823 136.601C253.796 136.697 253.769 136.793 253.744 136.889C253.712 137.008 253.679 137.127 253.65 137.248C253.619 137.362 253.59 137.474 253.562 137.586L253.544 137.656C253.518 137.761 253.494 137.866 253.469 137.971C253.428 138.129 253.389 138.291 253.353 138.451C253.321 138.585 253.292 138.718 253.262 138.853C253.255 138.878 253.25 138.906 253.243 138.931C253.226 139.003 253.211 139.078 253.196 139.15C253.158 139.323 253.122 139.493 253.087 139.666C253.059 139.802 253.033 139.938 253.008 140.075C252.985 140.204 252.964 140.331 252.944 140.461C252.927 140.565 252.914 140.67 252.901 140.775C252.892 140.837 252.884 140.897 252.876 140.96C252.863 141.061 252.851 141.162 252.841 141.262C252.805 141.605 252.777 141.951 252.763 142.296C252.76 142.365 252.757 142.434 252.754 142.504L252.753 142.495L252.549 141.285C252.444 140.756 252.401 140.218 252.341 139.681L252.255 138.879C252.223 138.611 252.194 138.344 252.188 138.074L252.12 136.46L252.115 136.349L252.102 136.056L252.105 135.945L252.111 135.653L252.128 134.846C252.126 134.609 252.131 134.375 252.141 134.141C252.142 134.071 252.147 134.003 252.149 133.937L252.166 133.633C252.174 133.48 252.185 133.328 252.197 133.178C252.197 133.176 252.196 133.174 252.197 133.172C252.208 133.018 252.221 132.867 252.233 132.715C252.236 132.665 252.24 132.616 252.244 132.567C252.26 132.553 252.277 132.54 252.293 132.525C252.338 132.486 252.382 132.448 252.426 132.409C252.456 132.381 252.487 132.354 252.517 132.327C252.53 132.314 252.542 132.304 252.555 132.291C252.614 132.238 252.672 132.184 252.73 132.128C252.786 132.074 252.843 132.02 252.899 131.963C253.011 131.851 253.122 131.738 253.229 131.623C253.326 131.522 253.421 131.418 253.515 131.311C253.534 131.293 253.552 131.271 253.569 131.252C253.642 131.168 253.716 131.084 253.788 130.998C253.802 130.981 253.813 130.966 253.827 130.95C253.849 130.924 253.872 130.896 253.893 130.87L253.894 130.868C253.973 130.773 254.051 130.676 254.127 130.578C254.143 130.558 254.158 130.538 254.173 130.52C254.256 130.414 254.338 130.306 254.42 130.197C254.424 130.19 254.429 130.183 254.435 130.177C254.44 130.168 254.445 130.162 254.452 130.153C254.455 130.148 254.459 130.145 254.461 130.14L254.461 130.138C254.48 130.115 254.496 130.093 254.513 130.069L254.513 130.067C254.623 129.915 254.728 129.763 254.832 129.609C254.867 129.558 254.902 129.507 254.935 129.453C254.97 129.4 255.006 129.345 255.04 129.289C255.091 129.21 255.142 129.13 255.19 129.051L255.206 129.024C255.282 128.897 255.357 128.77 255.429 128.641L255.43 128.639C255.474 128.561 255.518 128.484 255.559 128.408C255.584 128.36 255.609 128.311 255.634 128.265C255.644 128.247 255.653 128.227 255.663 128.21C255.699 128.144 255.732 128.078 255.766 128.01L255.769 128.002C255.853 127.833 255.933 127.663 256.009 127.492C256.051 127.395 256.094 127.296 256.132 127.198C256.164 127.12 256.193 127.041 256.222 126.963C256.21 126.978 256.201 126.992 256.192 127.008C256.069 127.178 255.948 127.351 255.828 127.522C255.708 127.693 255.589 127.865 255.47 128.036L255.469 128.04C255.463 128.046 255.458 128.053 255.454 128.06C255.359 128.2 255.263 128.337 255.167 128.475C255.005 128.705 254.842 128.937 254.679 129.165L254.678 129.167C254.671 129.175 254.666 129.185 254.658 129.193C254.609 129.265 254.559 129.336 254.505 129.405L254.504 129.407C254.486 129.435 254.466 129.462 254.447 129.488C254.427 129.515 254.409 129.543 254.39 129.568C254.35 129.621 254.313 129.674 254.274 129.726C254.217 129.805 254.158 129.884 254.099 129.962C254.018 130.073 253.938 130.182 253.856 130.291L253.856 130.292C253.833 130.322 253.812 130.351 253.789 130.381C253.596 130.64 253.399 130.897 253.203 131.153C253.134 131.243 253.065 131.333 252.996 131.422C252.925 131.512 252.856 131.603 252.785 131.692C252.727 131.767 252.668 131.841 252.61 131.916C252.598 131.933 252.585 131.947 252.572 131.964C252.467 132.096 252.365 132.229 252.262 132.362C252.281 132.118 252.301 131.872 252.319 131.626C252.329 131.425 252.358 131.226 252.388 131.026C252.398 130.96 252.409 130.892 252.417 130.825L252.529 130.028L252.572 129.715L252.574 129.711L252.631 129.284L252.64 129.228C252.643 129.202 252.647 129.176 252.652 129.15L252.653 129.148C252.661 129.088 252.671 129.028 252.683 128.969C252.693 128.91 252.707 128.851 252.719 128.792C252.724 128.773 252.727 128.752 252.732 128.733C252.753 128.635 252.774 128.537 252.792 128.438L253.112 126.858C253.168 126.635 253.224 126.412 253.285 126.189C253.326 126.027 253.369 125.867 253.413 125.705C253.43 125.643 253.444 125.583 253.462 125.522C253.818 125.308 254.164 125.076 254.498 124.83C254.577 124.771 254.657 124.71 254.737 124.65C254.817 124.589 254.895 124.528 254.972 124.464C255.034 124.414 255.096 124.363 255.157 124.313C255.216 124.264 255.276 124.215 255.333 124.165C255.366 124.137 255.399 124.108 255.431 124.077C255.514 124.007 255.597 123.934 255.679 123.86C255.761 123.787 255.842 123.712 255.922 123.639C256.035 123.533 256.144 123.425 256.254 123.316C256.583 122.988 256.897 122.644 257.192 122.287C257.214 122.261 257.236 122.233 257.258 122.205C257.305 122.149 257.35 122.093 257.395 122.037C257.514 121.887 257.631 121.733 257.743 121.579C257.932 121.32 258.109 121.054 258.271 120.778C258.271 120.78 258.268 120.781 258.266 120.782C258.215 120.83 258.164 120.88 258.116 120.929C258.049 120.994 257.983 121.057 257.918 121.121C257.88 121.16 257.841 121.199 257.802 121.237L257.802 121.239C257.519 121.52 257.243 121.799 256.963 122.077C256.742 122.295 256.522 122.512 256.3 122.727C256.232 122.794 256.163 122.859 256.095 122.923C256.092 122.925 256.091 122.927 256.091 122.928C255.943 123.069 255.795 123.209 255.648 123.35C255.207 123.772 254.755 124.18 254.302 124.589C254.045 124.82 253.786 125.051 253.526 125.283L253.712 124.583L253.729 124.521L253.986 123.757C254.094 123.439 254.199 123.117 254.307 122.801C254.332 122.727 254.356 122.653 254.381 122.58L254.383 122.576C254.412 122.492 254.439 122.406 254.471 122.323L254.502 122.232L254.552 122.106L254.553 122.105L255.103 120.737L255.107 120.723C255.139 120.652 255.166 120.579 255.195 120.508L255.196 120.506C255.213 120.461 255.23 120.419 255.247 120.376C255.264 120.331 255.281 120.289 255.3 120.247C255.317 120.204 255.336 120.162 255.355 120.12C255.373 120.078 255.393 120.034 255.413 119.993L255.51 119.795L255.563 119.685L255.762 119.267L255.763 119.265L255.912 118.957L256.111 118.542C256.117 118.531 256.122 118.52 256.126 118.509L256.128 118.503C256.128 118.503 256.13 118.498 256.133 118.496L256.135 118.489C256.171 118.417 256.204 118.346 256.237 118.274C256.283 118.178 256.331 118.083 256.38 117.989C256.405 117.974 256.429 117.959 256.453 117.944C256.54 117.894 256.625 117.842 256.711 117.79C256.821 117.722 256.933 117.654 257.04 117.586L257.043 117.585C257.07 117.569 257.094 117.552 257.119 117.535C257.179 117.497 257.238 117.461 257.298 117.422C257.443 117.329 257.59 117.233 257.735 117.138C257.813 117.089 257.887 117.039 257.964 116.988C258.033 116.942 258.101 116.896 258.171 116.849C258.374 116.713 258.578 116.573 258.778 116.434C258.98 116.293 259.181 116.152 259.382 116.009C259.581 115.867 259.78 115.724 259.978 115.578C260.079 115.507 260.176 115.433 260.274 115.362C260.373 115.289 260.473 115.214 260.57 115.141C261.044 114.789 261.515 114.432 261.985 114.075C262.142 113.956 262.297 113.837 262.454 113.719C262.708 113.527 262.962 113.333 263.217 113.139C263.979 112.557 264.739 111.976 265.514 111.417C265.829 111.187 266.148 110.956 266.467 110.732L266.468 110.73C266.485 110.719 266.502 110.706 266.518 110.695C266.705 110.564 266.891 110.432 267.081 110.304C267.286 110.163 267.492 110.024 267.702 109.888L267.702 109.886C267.724 109.872 267.744 109.858 267.765 109.844C267.902 109.755 268.04 109.666 268.18 109.577C268.338 109.474 268.499 109.372 268.663 109.273C268.851 109.155 269.041 109.042 269.231 108.927C269.335 108.931 269.438 108.933 269.54 108.935C269.845 108.941 270.149 108.939 270.455 108.932C270.459 108.931 270.463 108.933 270.468 108.932C270.563 108.931 270.657 108.928 270.753 108.923C270.883 108.918 271.013 108.913 271.142 108.907C271.146 108.906 271.153 108.906 271.157 108.906C271.372 108.894 271.581 108.878 271.796 108.86C271.811 108.859 271.827 108.858 271.842 108.857C271.935 108.849 272.031 108.84 272.125 108.829C272.236 108.819 272.346 108.806 272.455 108.795L272.457 108.794C272.47 108.792 272.486 108.791 272.499 108.789C272.768 108.76 273.037 108.726 273.305 108.686C273.477 108.659 273.648 108.632 273.819 108.603C273.932 108.585 274.043 108.563 274.155 108.545C274.155 108.543 274.157 108.543 274.157 108.543L274.239 108.527C274.27 108.523 274.299 108.517 274.329 108.51C274.597 108.46 274.863 108.403 275.128 108.343C275.133 108.342 275.135 108.341 275.14 108.34C275.145 108.338 275.151 108.338 275.155 108.338C275.196 108.329 275.236 108.319 275.275 108.307C275.337 108.293 275.399 108.279 275.462 108.262C275.468 108.263 275.475 108.261 275.482 108.259C275.517 108.25 275.551 108.241 275.586 108.232L275.711 108.199C275.748 108.191 275.783 108.182 275.817 108.173C276.052 108.111 276.282 108.048 276.513 107.978C276.628 107.944 276.744 107.908 276.859 107.873C276.973 107.836 277.087 107.798 277.201 107.76C277.352 107.709 277.503 107.656 277.652 107.602C277.7 107.583 277.751 107.565 277.8 107.546C277.863 107.522 277.926 107.497 277.99 107.473C278.077 107.44 278.163 107.404 278.249 107.369C277.977 107.424 277.708 107.478 277.438 107.534C277.089 107.605 276.742 107.676 276.394 107.743C276.394 107.745 276.392 107.744 276.392 107.744C276.177 107.786 275.962 107.829 275.748 107.869C275.683 107.882 275.618 107.893 275.552 107.906C275.496 107.916 275.44 107.926 275.384 107.936C275.327 107.946 275.271 107.958 275.215 107.966L275.181 107.973C275.053 107.996 274.927 108.02 274.799 108.041C274.748 108.051 274.694 108.059 274.642 108.069C274.604 108.075 274.568 108.083 274.53 108.087C274.102 108.162 273.674 108.23 273.246 108.293C273.037 108.325 272.824 108.355 272.614 108.385C272.587 108.388 272.558 108.393 272.532 108.397C272.516 108.4 272.499 108.4 272.483 108.403C272.381 108.418 272.277 108.431 272.174 108.443C272.123 108.451 272.072 108.459 272.02 108.464C271.969 108.471 271.918 108.477 271.865 108.484C271.849 108.487 271.832 108.487 271.817 108.488C271.623 108.514 271.43 108.535 271.237 108.558C271.231 108.558 271.225 108.561 271.219 108.561C271.056 108.58 270.892 108.599 270.73 108.617C270.684 108.622 270.636 108.626 270.59 108.631C270.584 108.631 270.577 108.633 270.571 108.633C270.547 108.635 270.52 108.639 270.496 108.641C270.293 108.661 270.092 108.682 269.89 108.7C269.778 108.712 269.667 108.722 269.556 108.734C269.98 108.489 270.41 108.253 270.845 108.031C270.865 108.021 270.886 108.009 270.906 107.999C270.984 107.959 271.063 107.919 271.139 107.88C271.228 107.837 271.317 107.794 271.406 107.751C271.477 107.717 271.548 107.682 271.621 107.646C271.701 107.609 271.783 107.57 271.865 107.533C271.883 107.524 271.9 107.518 271.917 107.509C271.943 107.497 271.968 107.484 271.993 107.474C272.156 107.398 272.32 107.324 272.486 107.253C272.508 107.244 272.531 107.235 272.553 107.226C272.892 107.078 273.237 106.941 273.584 106.81C273.697 106.768 273.816 106.724 273.93 106.684C274.046 106.642 274.163 106.603 274.28 106.564C274.493 106.49 274.706 106.421 274.922 106.357C275.04 106.32 275.159 106.283 275.277 106.25C275.298 106.245 275.317 106.239 275.338 106.232C275.392 106.217 275.448 106.2 275.505 106.184C275.517 106.18 275.53 106.178 275.542 106.174C275.558 106.169 275.572 106.165 275.588 106.162C275.93 106.068 276.275 105.986 276.624 105.913C276.664 105.903 276.704 105.896 276.745 105.887C276.755 105.884 276.765 105.884 276.775 105.881C276.888 105.857 277.001 105.837 277.113 105.817C277.117 105.816 277.122 105.814 277.126 105.815C277.147 105.809 277.17 105.805 277.192 105.802C277.304 105.782 277.414 105.763 277.526 105.747C277.526 105.747 277.527 105.745 277.529 105.746C277.634 105.728 277.74 105.714 277.846 105.7C277.938 105.685 278.03 105.673 278.124 105.663C278.23 105.65 278.336 105.636 278.442 105.626C278.582 105.611 278.721 105.599 278.862 105.588C279 105.577 279.141 105.567 279.282 105.561C279.419 105.554 279.557 105.549 279.693 105.546C279.715 105.545 279.734 105.545 279.753 105.543C279.876 105.542 279.999 105.54 280.12 105.542C280.129 105.541 280.139 105.542 280.148 105.541C280.258 105.541 280.368 105.544 280.479 105.546C280.502 105.546 280.525 105.547 280.547 105.549C280.585 105.549 280.623 105.55 280.66 105.552C280.76 105.555 280.862 105.561 280.962 105.568C281.039 105.572 281.115 105.577 281.19 105.584C281.23 105.585 281.271 105.589 281.312 105.593C281.374 105.597 281.436 105.604 281.499 105.611C281.549 105.614 281.599 105.621 281.648 105.627C281.721 105.633 281.793 105.641 281.865 105.652C281.986 105.666 282.107 105.683 282.227 105.701C282.333 105.717 282.44 105.735 282.548 105.753C282.599 105.763 282.653 105.773 282.704 105.782C282.825 105.805 282.945 105.828 283.066 105.855C283.019 105.839 282.971 105.82 282.924 105.804C282.811 105.765 282.698 105.728 282.583 105.694C282.558 105.686 282.536 105.678 282.511 105.671C282.448 105.651 282.383 105.633 282.319 105.617C282.258 105.598 282.196 105.581 282.136 105.566C281.999 105.53 281.863 105.497 281.726 105.468C281.646 105.449 281.567 105.432 281.487 105.417C281.461 105.411 281.436 105.406 281.409 105.403C281.324 105.386 281.24 105.369 281.154 105.355C281.027 105.334 280.898 105.312 280.769 105.295L280.763 105.293C280.755 105.292 280.747 105.291 280.739 105.291C280.733 105.289 280.729 105.289 280.723 105.287C280.703 105.284 280.681 105.281 280.66 105.28C280.543 105.265 280.428 105.25 280.312 105.24C280.196 105.227 280.08 105.216 279.963 105.207C279.73 105.187 279.498 105.176 279.265 105.169C278.983 105.162 278.704 105.165 278.423 105.174C278.141 105.184 277.861 105.203 277.581 105.227C277.557 105.23 277.531 105.231 277.507 105.234C277.431 105.239 277.357 105.247 277.28 105.254C277.27 105.255 277.258 105.257 277.248 105.257C277.215 105.261 277.18 105.265 277.146 105.271C276.725 105.319 276.307 105.384 275.89 105.467C275.775 105.489 275.66 105.512 275.545 105.539C275.521 105.542 275.498 105.548 275.475 105.553C275.448 105.558 275.42 105.566 275.393 105.571C275.386 105.573 275.379 105.575 275.372 105.576C275.356 105.579 275.341 105.582 275.324 105.587C275.302 105.59 275.279 105.597 275.256 105.601C274.939 105.671 274.626 105.754 274.317 105.843C274.254 105.861 274.193 105.878 274.132 105.896C274.219 105.809 274.308 105.724 274.395 105.636C274.628 105.426 274.856 105.21 275.084 104.997C275.325 104.796 275.558 104.586 275.794 104.379C275.901 104.288 276.008 104.199 276.119 104.111C276.181 104.059 276.245 104.007 276.309 103.958C276.416 103.873 276.524 103.788 276.633 103.703C277.046 103.544 277.469 103.412 277.897 103.312C277.993 103.291 278.091 103.27 278.186 103.25C278.256 103.236 278.328 103.223 278.398 103.212C278.432 103.205 278.465 103.199 278.499 103.194C278.566 103.182 278.633 103.171 278.701 103.163C278.711 103.16 278.72 103.159 278.728 103.158C278.879 103.136 279.03 103.119 279.182 103.106C279.268 103.096 279.352 103.09 279.436 103.085C279.478 103.08 279.52 103.078 279.563 103.078C279.623 103.074 279.683 103.071 279.742 103.071C279.805 103.067 279.868 103.066 279.93 103.064C280.036 103.063 280.141 103.064 280.245 103.066C281.031 103.078 281.817 103.192 282.581 103.394C282.793 103.45 283.005 103.515 283.211 103.589C283.291 103.617 283.374 103.648 283.453 103.677C283.539 103.709 283.625 103.743 283.711 103.779C283.804 103.816 283.894 103.853 283.984 103.895C284.258 104.016 284.526 104.149 284.791 104.295C284.715 104.229 284.636 104.165 284.556 104.104C284.231 103.852 283.877 103.633 283.505 103.449C283.415 103.405 283.325 103.361 283.232 103.321C283.05 103.238 282.863 103.165 282.672 103.099C281.898 102.824 281.076 102.687 280.252 102.668C279.428 102.658 278.6 102.768 277.816 103.013C277.812 103.014 277.809 103.015 277.804 103.018C277.65 103.066 277.498 103.118 277.346 103.177C277.453 103.102 277.56 103.03 277.667 102.957C277.731 102.912 277.796 102.869 277.864 102.827C277.994 102.742 278.125 102.657 278.257 102.574C278.308 102.541 278.359 102.509 278.41 102.478C278.565 102.384 278.721 102.293 278.877 102.201C279.088 102.079 279.304 101.964 279.521 101.85C279.436 101.911 279.354 101.973 279.274 102.038C279.996 101.671 280.745 101.392 281.517 101.213C282.288 101.038 283.076 100.951 283.864 100.969C284.652 100.979 285.437 101.093 286.202 101.298C286.312 101.327 286.419 101.358 286.527 101.391C286.663 101.432 286.796 101.478 286.931 101.527C287.064 101.575 287.198 101.626 287.329 101.68C287.421 101.716 287.513 101.756 287.604 101.796C287.681 101.83 287.758 101.864 287.833 101.901C287.943 101.954 288.055 102.008 288.165 102.067C288.25 102.109 288.331 102.154 288.414 102.2C288.274 102.079 288.128 101.966 287.977 101.861C287.93 101.825 287.882 101.794 287.834 101.762C287.768 101.716 287.699 101.671 287.628 101.63C287.571 101.593 287.513 101.56 287.453 101.527C287.432 101.513 287.411 101.502 287.388 101.489C287.301 101.441 287.212 101.395 287.123 101.349C287.038 101.307 286.951 101.266 286.865 101.228C286.678 101.142 286.487 101.068 286.293 101C285.516 100.727 284.694 100.589 283.871 100.571C283.676 100.569 283.483 100.573 283.288 100.586C283.145 100.593 283 100.604 282.857 100.622C282.857 100.622 282.855 100.621 282.853 100.623C282.686 100.641 282.519 100.667 282.353 100.696C282.189 100.725 282.023 100.76 281.86 100.8C282.015 100.742 282.169 100.68 282.327 100.625L283.233 100.327L284.153 100.073L284.366 100.022L285.087 99.853L286.03 99.6768L285.07 99.7482L284.113 99.8732L283.163 100.056L282.331 100.256L282.221 100.283C282.188 100.293 282.157 100.303 282.124 100.313C282.2 100.246 282.274 100.179 282.346 100.11C282.362 100.094 282.377 100.08 282.391 100.066C282.466 99.9952 282.537 99.9248 282.606 99.8524C282.965 99.4672 283.29 99.0468 283.558 98.5944C283.772 98.2389 283.953 97.8635 284.088 97.4744C284.117 97.3897 284.144 97.3062 284.169 97.2225C284.174 97.2011 284.182 97.1786 284.188 97.1572C283.898 97.5917 283.61 98.0163 283.301 98.421C283.146 98.6223 282.987 98.82 282.824 99.0137C282.659 99.2072 282.49 99.3973 282.316 99.5789C281.994 99.9242 281.648 100.249 281.29 100.563C280.368 100.864 279.467 101.24 278.594 101.673C278.156 101.892 277.728 102.133 277.306 102.383C277.296 102.388 277.285 102.393 277.277 102.398C277.307 102.33 277.336 102.265 277.365 102.194C277.375 102.171 277.385 102.147 277.394 102.122L277.448 101.983C277.472 101.92 277.494 101.858 277.516 101.796C277.522 101.777 277.529 101.756 277.534 101.737C277.555 101.675 277.576 101.61 277.594 101.547C277.611 101.489 277.627 101.432 277.643 101.374C277.677 101.251 277.705 101.128 277.731 101.004C277.745 100.946 277.756 100.889 277.766 100.829C277.772 100.801 277.778 100.772 277.781 100.744C277.791 100.69 277.8 100.634 277.809 100.58C277.817 100.526 277.825 100.472 277.831 100.417C277.839 100.363 277.846 100.308 277.852 100.254C277.904 99.7281 277.909 99.197 277.848 98.6745C277.825 98.4726 277.792 98.2698 277.75 98.0697C277.742 98.0268 277.732 97.9832 277.722 97.9396C277.704 97.8575 277.683 97.7766 277.658 97.6963C277.628 97.5889 277.595 97.4827 277.558 97.3793C277.553 97.3566 277.544 97.3325 277.534 97.3078C277.516 97.2553 277.497 97.2022 277.475 97.1503C277.478 97.219 277.483 97.2902 277.488 97.3614C277.497 97.5228 277.507 97.6819 277.513 97.842C277.519 97.9409 277.521 98.0367 277.526 98.1328C277.533 98.3206 277.537 98.5073 277.536 98.6925C277.535 99.2017 277.513 99.708 277.456 100.211C277.408 100.714 277.321 101.215 277.218 101.712C277.194 101.822 277.169 101.931 277.141 102.042C277.116 102.151 277.089 102.261 277.059 102.371C277.044 102.431 277.029 102.493 277.013 102.553C277.008 102.555 277.004 102.559 276.999 102.561C276.975 102.576 276.951 102.591 276.929 102.606C276.804 102.681 276.681 102.76 276.559 102.84C276.122 103.123 275.696 103.423 275.281 103.743C275.03 103.951 274.776 104.157 274.529 104.371C274.289 104.593 274.05 104.816 273.816 105.046C273.593 105.284 273.369 105.523 273.152 105.766L272.841 106.145L272.762 106.239C272.737 106.27 272.709 106.301 272.696 106.345C272.695 106.355 272.694 106.368 272.692 106.38C272.627 106.405 272.561 106.429 272.497 106.455C272.471 106.465 272.444 106.477 272.417 106.486C272.266 106.544 272.119 106.605 271.971 106.667C271.963 106.668 271.955 106.671 271.947 106.675C271.93 106.684 271.911 106.69 271.893 106.698C271.824 106.725 271.756 106.752 271.689 106.782C270.812 107.162 269.96 107.593 269.133 108.067C269.049 108.114 268.967 108.163 268.883 108.21C268.883 108.211 268.882 108.212 268.88 108.213C268.796 108.262 268.711 108.31 268.629 108.359L268.628 108.361C268.498 108.438 268.37 108.516 268.242 108.594C268.081 108.696 267.919 108.799 267.757 108.906C267.595 109.01 267.436 109.117 267.276 109.224C267.271 109.226 267.268 109.229 267.265 109.232C267.106 109.337 266.952 109.444 266.794 109.551C266.395 109.83 265.999 110.112 265.608 110.402C265.427 110.537 265.247 110.672 265.067 110.81C264.811 111.006 264.557 111.204 264.305 111.403C264.261 111.438 264.215 111.473 264.174 111.507C263.915 111.712 263.659 111.918 263.404 112.125C263.402 112.125 263.401 112.126 263.401 112.128C263.175 112.31 262.952 112.492 262.73 112.676C262.508 112.86 262.288 113.046 262.068 113.232C261.577 113.644 261.088 114.057 260.6 114.469C260.114 114.882 259.625 115.294 259.136 115.703C259.127 115.711 259.117 115.72 259.107 115.727C258.989 115.827 258.871 115.925 258.753 116.023C258.538 116.201 258.324 116.38 258.107 116.557C257.974 116.665 257.842 116.773 257.71 116.881C257.666 116.916 257.622 116.954 257.578 116.989C257.226 117.276 256.871 117.559 256.511 117.838C256.481 117.862 256.453 117.884 256.424 117.907C256.44 117.877 256.457 117.847 256.476 117.818L256.514 117.749L256.57 117.648L256.943 116.986L257.264 116.412C257.279 116.384 257.295 116.355 257.311 116.327C257.335 116.283 257.359 116.236 257.383 116.192L257.46 116.061C257.666 115.715 257.899 115.385 258.114 115.045L258.552 114.369L258.771 114.03L259.013 113.71L259.617 112.904L259.796 112.665L259.981 112.42C260.12 112.224 260.274 112.037 260.428 111.852C260.444 111.831 260.462 111.809 260.48 111.788C260.521 111.737 260.561 111.686 260.604 111.635C260.615 111.622 260.626 111.609 260.637 111.596L260.639 111.595C260.694 111.527 260.75 111.458 260.809 111.392C260.87 111.319 260.936 111.245 260.999 111.172C261.358 110.755 261.731 110.35 262.112 109.955C262.438 109.914 262.762 109.848 263.078 109.757C263.459 109.649 263.829 109.506 264.184 109.336C264.243 109.306 264.303 109.279 264.362 109.248C264.423 109.219 264.482 109.189 264.539 109.158C264.684 109.08 264.826 108.994 264.964 108.905C265.104 108.817 265.239 108.725 265.372 108.627C265.531 108.51 265.685 108.387 265.833 108.257C265.89 108.207 265.948 108.155 266.002 108.102C266.039 108.069 266.076 108.035 266.11 107.999C266.163 107.949 266.212 107.899 266.261 107.849C266.327 107.779 266.393 107.707 266.455 107.636C266.519 107.561 266.581 107.486 266.641 107.41C266.683 107.357 266.722 107.303 266.763 107.248C266.8 107.193 266.84 107.139 266.877 107.083C266.763 107.174 266.65 107.263 266.536 107.35C266.445 107.422 266.354 107.491 266.262 107.56C266.059 107.715 265.851 107.866 265.643 108.011C265.223 108.297 264.794 108.568 264.349 108.807C263.906 109.053 263.447 109.267 262.975 109.464C262.843 109.519 262.71 109.572 262.575 109.622C262.505 109.648 262.432 109.676 262.362 109.702C262.453 109.611 262.543 109.521 262.635 109.432C262.805 109.264 262.976 109.098 263.152 108.936C263.24 108.854 263.327 108.773 263.416 108.692C263.727 108.408 264.048 108.134 264.375 107.866C264.434 107.815 264.496 107.767 264.558 107.719C264.633 107.656 264.709 107.594 264.787 107.535C264.792 107.531 264.799 107.524 264.808 107.521C264.814 107.517 264.82 107.513 264.823 107.51C264.832 107.502 264.841 107.495 264.849 107.489C264.883 107.463 264.916 107.436 264.95 107.41L264.953 107.409C265.212 107.209 265.477 107.016 265.746 106.827C265.912 106.708 266.081 106.592 266.251 106.478C266.393 106.384 266.535 106.29 266.68 106.199C266.681 106.197 266.685 106.197 266.685 106.197C266.755 106.153 266.823 106.109 266.893 106.066C266.926 106.044 266.963 106.023 266.997 106.003C266.997 106.001 266.999 106.002 266.999 106.002C267 106 267.001 105.998 267.004 105.999C267.128 105.924 267.252 105.852 267.378 105.779C267.498 105.707 267.621 105.638 267.744 105.572C267.89 105.492 268.035 105.416 268.182 105.34C268.24 105.31 268.298 105.281 268.354 105.252C268.48 105.188 268.606 105.127 268.731 105.07C268.737 105.065 268.745 105.062 268.75 105.059C268.861 105.005 268.974 104.953 269.088 104.903C269.426 104.753 269.771 104.609 270.12 104.477C270.208 104.444 270.294 104.413 270.381 104.382C270.468 104.349 270.556 104.319 270.644 104.29C270.731 104.259 270.817 104.23 270.904 104.203C271.114 104.133 271.323 104.069 271.536 104.009C271.353 104.049 271.172 104.092 270.991 104.14C270.624 104.233 270.26 104.342 269.902 104.462C269.794 104.499 269.687 104.535 269.581 104.574C269.473 104.613 269.367 104.652 269.262 104.694C269.156 104.733 269.05 104.776 268.945 104.817C268.904 104.835 268.864 104.852 268.823 104.866C268.812 104.872 268.801 104.875 268.791 104.88C268.76 104.895 268.729 104.907 268.697 104.921C268.571 104.974 268.445 105.027 268.32 105.085C268.258 105.112 268.195 105.141 268.134 105.17C268.047 105.208 267.961 105.249 267.874 105.293C267.817 105.319 267.76 105.348 267.704 105.375C267.59 105.431 267.478 105.489 267.367 105.547C267.277 105.594 267.187 105.64 267.099 105.687C266.998 105.741 266.899 105.797 266.8 105.851C266.775 105.863 266.749 105.878 266.726 105.891C266.714 105.899 266.701 105.905 266.686 105.913C266.625 105.949 266.563 105.984 266.504 106.02C266.481 106.031 266.459 106.045 266.44 106.057C266.298 106.139 266.159 106.223 266.021 106.308C265.873 106.398 265.728 106.49 265.581 106.585C265.426 106.687 265.274 106.79 265.124 106.896C265.05 106.946 264.975 106.998 264.906 107.05C264.823 107.107 264.741 107.166 264.662 107.226C264.587 107.278 264.515 107.331 264.444 107.386C264.333 107.468 264.224 107.552 264.114 107.638C264.057 107.682 264.002 107.726 263.946 107.772L263.941 107.774C263.857 107.84 263.774 107.908 263.691 107.976L263.689 107.977C263.675 107.987 263.66 107.999 263.647 108.011C263.527 108.111 263.406 108.21 263.287 108.31C263.153 108.423 263.023 108.538 262.892 108.655C262.761 108.772 262.63 108.888 262.503 109.007C262.373 109.126 262.247 109.244 262.121 109.365C262.011 109.47 261.903 109.576 261.795 109.681C261.766 109.709 261.737 109.739 261.708 109.767C261.596 109.878 261.485 109.989 261.376 110.103C261.253 110.229 261.133 110.354 261.014 110.481C260.894 110.608 260.776 110.735 260.657 110.865C260.471 111.066 260.29 111.268 260.114 111.477C260.037 111.564 259.963 111.651 259.888 111.739C259.85 111.783 259.813 111.827 259.777 111.872C259.742 111.912 259.709 111.953 259.677 111.995C259.674 111.998 259.67 112.003 259.667 112.006C259.641 112.039 259.614 112.072 259.59 112.106L259.483 112.246L258.905 112.994L258.903 112.995L258.727 113.222L258.591 113.401L258.34 113.724L258.306 113.774L258.112 114.064L257.858 114.446L257.848 114.462L257.659 114.745C257.585 114.861 257.508 114.973 257.432 115.086C257.355 115.198 257.279 115.313 257.202 115.425C257.051 115.653 256.906 115.885 256.776 116.124L255.966 117.545C255.932 117.598 255.903 117.654 255.875 117.709C255.865 117.725 255.857 117.741 255.85 117.757C255.827 117.8 255.805 117.843 255.784 117.886C255.72 118.016 255.66 118.147 255.594 118.276L255.549 118.37L255.548 118.371L255.411 118.652L255.238 119.011L254.881 119.749C254.864 119.779 254.849 119.81 254.836 119.841C254.821 119.872 254.808 119.903 254.794 119.934C254.712 120.12 254.641 120.313 254.561 120.502L253.945 122.017C253.896 122.152 253.849 122.285 253.802 122.421C253.738 122.607 253.675 122.795 253.612 122.982C253.571 123.107 253.529 123.234 253.49 123.359C253.467 123.423 253.447 123.49 253.426 123.554C253.409 123.616 253.39 123.677 253.372 123.736C253.332 123.861 253.294 123.989 253.257 124.115C253.226 124.218 253.193 124.323 253.163 124.428C253.131 124.533 253.102 124.636 253.073 124.742C253.065 124.766 253.058 124.792 253.051 124.819C252.991 125.035 252.932 125.253 252.875 125.471C252.816 125.697 252.758 125.926 252.704 126.153C252.655 126.355 252.607 126.56 252.562 126.763C252.554 126.788 252.549 126.814 252.544 126.839L252.543 126.841C252.524 126.921 252.508 127 252.49 127.08C252.486 127.099 252.482 127.121 252.478 127.141L252.477 127.142C252.476 127.146 252.474 127.152 252.474 127.156L252.47 127.168C252.464 127.197 252.459 127.225 252.454 127.252C252.447 127.284 252.44 127.315 252.434 127.347C252.421 127.408 252.409 127.467 252.397 127.526C252.384 127.58 252.374 127.634 252.364 127.687C252.34 127.803 252.317 127.919 252.296 128.034C252.267 128.178 252.243 128.323 252.216 128.468C252.166 128.751 252.117 129.036 252.074 129.32C252.007 129.762 251.948 130.207 251.896 130.653L251.895 130.656C251.895 130.663 251.893 130.668 251.892 130.675L251.891 130.678C251.875 130.81 251.862 130.94 251.849 131.072C251.836 131.213 251.822 131.351 251.809 131.492C251.797 131.631 251.786 131.773 251.773 131.912C251.762 132.053 251.754 132.193 251.743 132.333C251.735 132.473 251.725 132.615 251.719 132.754C251.703 133.039 251.691 133.324 251.684 133.61C251.678 133.747 251.676 133.883 251.674 134.021C251.674 134.046 251.673 134.073 251.674 134.099C251.672 134.263 251.673 134.425 251.673 134.59C251.672 134.671 251.673 134.754 251.674 134.836L251.677 135.652L251.679 136.059L251.706 136.467L251.818 138.096C251.821 138.19 251.829 138.281 251.838 138.372C251.838 138.379 251.84 138.386 251.84 138.392C251.848 138.477 251.859 138.561 251.87 138.644C251.88 138.732 251.894 138.819 251.905 138.907L251.927 139.071C251.909 139.012 251.893 138.954 251.875 138.897C251.844 138.787 251.812 138.679 251.78 138.571C251.764 138.517 251.747 138.463 251.732 138.409C251.676 138.225 251.62 138.042 251.56 137.861C251.343 137.164 251.09 136.485 250.864 135.8C250.767 135.515 250.67 135.231 250.576 134.948C250.55 134.865 250.524 134.782 250.496 134.699C250.457 134.578 250.42 134.455 250.383 134.333C250.37 134.297 250.358 134.259 250.349 134.222C250.341 134.197 250.333 134.171 250.326 134.145C250.285 134.013 250.248 133.882 250.212 133.751C250.144 133.519 250.082 133.287 250.026 133.053C250.004 132.959 249.984 132.865 249.963 132.772C249.94 132.669 249.92 132.568 249.9 132.464C249.898 132.457 249.898 132.451 249.896 132.444C249.89 132.412 249.882 132.38 249.877 132.346C249.876 132.344 249.875 132.339 249.875 132.335C249.869 132.31 249.865 132.283 249.86 132.256C249.843 132.16 249.828 132.064 249.811 131.966C249.809 131.954 249.806 131.943 249.804 131.93L249.805 131.928C249.792 131.845 249.78 131.763 249.768 131.681C249.754 131.594 249.742 131.508 249.73 131.42C249.685 131.071 249.657 130.72 249.644 130.368C249.636 130.107 249.635 129.843 249.64 129.579C249.642 129.513 249.645 129.448 249.648 129.382C249.647 129.371 249.647 129.358 249.65 129.349C249.653 129.274 249.659 129.198 249.665 129.125C249.67 129.048 249.677 128.975 249.686 128.9C249.687 128.898 249.685 128.896 249.688 128.894C249.688 128.875 249.69 128.859 249.693 128.843C249.695 128.825 249.697 128.807 249.699 128.791C249.701 128.77 249.703 128.752 249.706 128.732C249.707 128.711 249.709 128.693 249.714 128.674L249.715 128.672C249.735 128.504 249.761 128.338 249.793 128.172C249.808 128.099 249.822 128.028 249.838 127.956C249.847 127.913 249.857 127.87 249.868 127.828C249.879 127.777 249.892 127.728 249.905 127.678C249.938 127.553 249.972 127.43 250.013 127.307C250.055 127.166 250.103 127.029 250.158 126.89C250.161 126.88 250.165 126.869 250.17 126.86C250.194 126.797 250.221 126.732 250.248 126.67C250.269 126.623 250.291 126.573 250.311 126.525C250.334 126.479 250.355 126.431 250.378 126.382C250.404 126.324 250.432 126.268 250.462 126.213C250.48 126.177 250.499 126.142 250.517 126.108C250.519 126.104 250.519 126.102 250.522 126.101C250.552 126.044 250.585 125.986 250.619 125.93C250.625 125.92 250.63 125.911 250.636 125.9C250.651 125.874 250.666 125.849 250.683 125.824C250.71 125.776 250.738 125.731 250.769 125.687C250.797 125.642 250.827 125.598 250.857 125.553C250.855 125.554 250.853 125.558 250.851 125.559C250.798 125.609 250.745 125.658 250.695 125.71C250.657 125.747 250.62 125.787 250.581 125.826C250.544 125.866 250.509 125.907 250.474 125.947C250.466 125.953 250.461 125.96 250.457 125.967C250.425 126.004 250.392 126.043 250.362 126.081C250.326 126.124 250.292 126.167 250.26 126.212L250.259 126.214C250.225 126.257 250.192 126.303 250.16 126.349C250.131 126.389 250.104 126.43 250.075 126.471C250.009 126.57 249.946 126.673 249.884 126.778C249.846 126.845 249.807 126.915 249.771 126.984C249.736 127.046 249.706 127.11 249.675 127.175C249.645 127.236 249.615 127.299 249.586 127.363C249.546 127.457 249.507 127.549 249.472 127.644C249.444 127.714 249.419 127.785 249.394 127.856C249.37 127.928 249.348 127.996 249.326 128.066C249.324 128.078 249.32 128.09 249.316 128.101L249.315 128.105C249.279 128.219 249.247 128.336 249.215 128.453C249.184 128.571 249.158 128.69 249.134 128.808C249.122 128.867 249.11 128.927 249.1 128.984C249.098 128.985 249.098 128.986 249.099 128.988C249.085 129.065 249.071 129.141 249.061 129.219C249.044 129.323 249.031 129.426 249.02 129.531C248.971 129.915 248.956 130.301 248.961 130.686C248.96 130.749 248.962 130.811 248.964 130.872C248.964 130.879 248.963 130.885 248.965 130.892C248.967 130.96 248.97 131.03 248.972 131.099C248.982 131.324 248.998 131.55 249.019 131.774C249.051 132.059 249.092 132.341 249.142 132.622C249.144 132.641 249.148 132.661 249.152 132.68L249.151 132.682C249.158 132.716 249.164 132.749 249.171 132.783C249.188 132.878 249.208 132.973 249.228 133.066C249.236 133.101 249.243 133.135 249.25 133.169C249.251 133.171 249.252 133.176 249.251 133.178C249.274 133.276 249.296 133.37 249.32 133.466C249.358 133.634 249.402 133.8 249.447 133.968C249.656 134.676 249.895 135.372 250.157 136.055C250.413 136.697 250.665 137.335 250.934 137.965C250.948 138.001 250.965 138.037 250.98 138.074C250.996 138.113 251.013 138.15 251.029 138.189L251.028 138.191C251.175 138.545 251.321 138.9 251.459 139.255C251.503 139.365 251.547 139.475 251.589 139.584C251.643 139.721 251.695 139.857 251.745 139.992C251.797 140.128 251.847 140.263 251.894 140.399C252.079 140.91 252.249 141.428 252.399 141.956L252.599 142.921C252.644 143.107 252.696 143.293 252.745 143.479C252.748 143.64 252.753 143.802 252.76 143.963C252.766 144.123 252.776 144.284 252.787 144.446C252.791 144.506 252.795 144.569 252.801 144.63C252.804 144.677 252.806 144.724 252.811 144.772C252.813 144.82 252.818 144.867 252.822 144.915C252.824 144.941 252.828 144.966 252.829 144.992C252.842 145.131 252.857 145.271 252.874 145.409C252.894 145.572 252.914 145.733 252.938 145.895C252.946 145.967 252.957 146.039 252.968 146.112C252.991 146.259 253.015 146.408 253.042 146.555C253.048 146.592 253.056 146.631 253.061 146.669C253.076 146.748 253.093 146.827 253.108 146.906C253.131 147.022 253.154 147.137 253.179 147.253C253.216 147.433 253.257 147.613 253.302 147.793C253.33 147.91 253.359 148.028 253.391 148.144C253.404 148.201 253.421 148.257 253.436 148.316C253.441 148.328 253.442 148.341 253.447 148.353C253.449 148.364 253.453 148.376 253.456 148.388C253.482 148.483 253.51 148.577 253.539 148.671C253.545 148.694 253.551 148.72 253.56 148.744C253.641 149.014 253.73 149.285 253.825 149.552C253.854 149.633 253.883 149.715 253.914 149.795C253.929 149.836 253.944 149.878 253.96 149.917C253.996 150.014 254.034 150.111 254.073 150.206C254.111 150.302 254.15 150.397 254.191 150.491C254.252 150.637 254.317 150.783 254.383 150.928C254.4 150.968 254.42 151.009 254.44 151.049C254.44 151.054 254.441 151.056 254.444 151.061C254.367 150.999 254.289 150.938 254.212 150.876C254.184 150.853 254.155 150.833 254.127 150.81C254.054 150.753 253.981 150.694 253.91 150.634C253.898 150.626 253.887 150.615 253.876 150.605C253.83 150.566 253.787 150.528 253.742 150.487L253.74 150.486C253.654 150.412 253.568 150.336 253.485 150.261C253.48 150.257 253.477 150.254 253.473 150.248C253.378 150.165 253.284 150.077 253.19 149.99C253.069 149.876 252.95 149.764 252.833 149.647C252.752 149.568 252.675 149.489 252.599 149.41C252.503 149.311 252.41 149.214 252.317 149.112C251.415 148.148 250.603 147.095 249.851 145.996C249.54 145.539 249.238 145.074 248.942 144.603C248.982 144.469 249.016 144.336 249.047 144.201C249.094 144 249.131 143.796 249.163 143.595C249.175 143.51 249.188 143.426 249.196 143.341C249.207 143.256 249.215 143.17 249.223 143.087C249.226 143.078 249.226 143.067 249.227 143.057C249.229 143.032 249.234 143.007 249.236 142.982C249.24 142.947 249.243 142.913 249.243 142.877C249.245 142.835 249.249 142.794 249.253 142.752C249.256 142.706 249.258 142.663 249.259 142.617C249.263 142.572 249.264 142.526 249.267 142.478C249.268 142.445 249.27 142.41 249.269 142.376C249.271 142.347 249.271 142.317 249.27 142.288C249.273 142.251 249.273 142.213 249.274 142.175C249.274 142.15 249.274 142.125 249.275 142.099C249.275 142.074 249.274 142.046 249.272 142.021C249.273 141.995 249.274 141.968 249.272 141.942L249.272 141.924C249.271 141.788 249.265 141.654 249.259 141.519C249.253 141.382 249.246 141.247 249.234 141.11C249.227 141.015 249.217 140.921 249.206 140.827C249.196 140.733 249.184 140.635 249.171 140.543C249.156 140.435 249.14 140.328 249.123 140.221C249.122 140.206 249.119 140.19 249.115 140.176C249.113 140.163 249.11 140.147 249.109 140.134C249.078 139.95 249.042 139.766 248.999 139.582C248.975 139.475 248.95 139.371 248.923 139.265C248.831 138.911 248.722 138.557 248.586 138.215C248.559 138.147 248.533 138.079 248.503 138.011C248.474 137.944 248.442 137.877 248.411 137.809C248.379 137.743 248.347 137.677 248.313 137.61C248.297 137.573 248.279 137.539 248.261 137.506C248.259 137.604 248.256 137.702 248.254 137.8C248.254 137.885 248.252 137.968 248.255 138.053C248.255 138.234 248.262 138.416 248.269 138.595C248.273 138.706 248.277 138.815 248.283 138.924C248.29 139.07 248.298 139.216 248.307 139.362C248.335 139.84 248.369 140.312 248.409 140.786C248.418 140.911 248.429 141.039 248.44 141.165C248.441 141.169 248.44 141.171 248.441 141.176C248.442 141.201 248.444 141.225 248.448 141.252C248.449 141.267 248.45 141.282 248.451 141.297C248.459 141.395 248.467 141.495 248.477 141.593C248.498 141.825 248.518 142.058 248.541 142.289C248.563 142.522 248.588 142.754 248.612 142.988C248.621 143.071 248.631 143.152 248.64 143.235C248.65 143.317 248.658 143.396 248.668 143.477C248.688 143.646 248.71 143.813 248.734 143.984C248.752 144.11 248.771 144.237 248.792 144.364C248.753 144.3 248.714 144.238 248.675 144.174C248.566 143.997 248.457 143.818 248.35 143.64C248.238 143.453 248.126 143.265 248.015 143.077C247.914 142.905 247.814 142.734 247.714 142.56C247.608 142.378 247.505 142.197 247.401 142.016C247.298 141.834 247.195 141.651 247.092 141.468C246.982 141.274 246.874 141.081 246.766 140.89C246.765 140.885 246.764 140.883 246.762 140.882C246.565 140.527 246.369 140.17 246.172 139.816C246.17 139.815 246.168 139.812 246.168 139.808C246.028 139.559 245.891 139.312 245.753 139.062C245.099 137.885 244.459 136.707 243.878 135.509C243.842 135.435 243.809 135.363 243.776 135.292L243.753 135.244C243.778 135.209 243.8 135.174 243.817 135.138C243.83 135.113 243.842 135.09 243.851 135.063C243.863 135.036 243.872 135.009 243.88 134.98L244.047 134.415L244.085 134.287L244.279 133.623L244.335 133.43L244.376 133.294L244.381 133.281L244.414 133.166L244.467 132.982L244.471 132.973L244.492 132.898L244.525 132.785L244.679 132.257C244.679 132.257 244.68 132.255 244.682 132.254C244.781 132.177 244.88 132.097 244.975 132.017C245.11 131.908 245.239 131.797 245.367 131.681C245.394 131.659 245.42 131.634 245.447 131.61C245.45 131.608 245.453 131.605 245.453 131.603C245.457 131.6 245.46 131.597 245.463 131.594C245.488 131.571 245.513 131.548 245.537 131.525C245.738 131.342 245.933 131.15 246.12 130.956C246.228 130.846 246.332 130.735 246.436 130.623C246.54 130.51 246.643 130.396 246.744 130.282C246.795 130.221 246.844 130.163 246.893 130.102C246.927 130.063 246.961 130.022 246.993 129.983C247.019 129.952 247.045 129.919 247.071 129.887C247.137 129.805 247.204 129.723 247.269 129.638C247.322 129.57 247.375 129.502 247.427 129.432C247.45 129.402 247.473 129.37 247.497 129.338C247.513 129.316 247.529 129.295 247.545 129.273C247.553 129.263 247.561 129.251 247.569 129.239C247.584 129.221 247.597 129.202 247.608 129.183C247.647 129.131 247.687 129.077 247.723 129.022C247.774 128.952 247.823 128.878 247.871 128.807C247.937 128.709 247.999 128.613 248.063 128.515C248.152 128.375 248.239 128.233 248.322 128.089C248.439 127.892 248.55 127.688 248.653 127.481C248.667 127.453 248.684 127.424 248.698 127.396C248.729 127.329 248.76 127.264 248.792 127.197C248.692 127.316 248.594 127.433 248.496 127.553C248.397 127.673 248.299 127.79 248.203 127.911C248.189 127.925 248.177 127.942 248.163 127.958C247.983 128.18 247.803 128.402 247.622 128.621C247.582 128.669 247.542 128.718 247.502 128.767L247.501 128.769C247.476 128.798 247.45 128.83 247.425 128.859C247.364 128.933 247.303 129.006 247.242 129.079C247.157 129.183 247.07 129.287 246.982 129.39C246.956 129.423 246.928 129.455 246.9 129.487C246.896 129.492 246.89 129.499 246.886 129.504C246.741 129.679 246.593 129.851 246.443 130.022C246.155 130.358 245.863 130.687 245.565 131.017L245.564 131.019L245.369 131.235C245.341 131.266 245.315 131.295 245.287 131.325C245.269 131.348 245.249 131.369 245.228 131.391C245.083 131.549 244.937 131.709 244.792 131.868L245.209 130.428L245.209 130.426L245.298 130.122C245.324 130.036 245.347 129.95 245.371 129.863C245.391 129.792 245.411 129.723 245.431 129.653C245.54 129.273 245.648 128.894 245.754 128.514C245.848 128.182 245.942 127.85 246.035 127.518C246.048 127.472 246.06 127.425 246.073 127.377C246.109 127.255 246.144 127.13 246.178 127.007C246.197 126.94 246.216 126.873 246.233 126.805C246.266 126.694 246.296 126.582 246.326 126.471C246.345 126.41 246.363 126.346 246.378 126.284C246.396 126.227 246.411 126.171 246.427 126.114C246.428 126.11 246.431 126.109 246.432 126.105C246.435 126.102 246.437 126.096 246.44 126.093L246.442 126.089C246.486 126.014 246.536 125.938 246.583 125.864C246.605 125.826 246.631 125.786 246.655 125.748C246.673 125.719 246.693 125.688 246.711 125.658L246.712 125.656C246.883 125.383 247.055 125.11 247.229 124.839C247.247 124.812 247.265 124.784 247.283 124.755C247.331 124.679 247.38 124.603 247.43 124.528C247.433 124.523 247.435 124.519 247.438 124.514L247.44 124.51C247.606 124.256 247.774 124.002 247.942 123.749C248.081 123.541 248.223 123.333 248.366 123.126C248.399 123.076 248.432 123.028 248.465 122.981C248.474 122.969 248.483 122.955 248.491 122.943C248.62 122.76 248.748 122.578 248.878 122.397C248.937 122.312 248.996 122.229 249.056 122.147C249.135 122.035 249.213 121.924 249.293 121.815C249.533 121.483 249.777 121.155 250.028 120.833C250.559 120.126 251.109 119.433 251.682 118.759C251.697 118.739 251.715 118.72 251.732 118.701C251.754 118.673 251.779 118.643 251.803 118.616C251.971 118.411 252.145 118.208 252.32 118.007C252.39 117.926 252.46 117.845 252.528 117.764C252.599 117.683 252.671 117.602 252.743 117.522C252.752 117.513 252.762 117.504 252.77 117.494C253.573 116.587 254.41 115.71 255.267 114.843C255.6 114.507 255.93 114.169 256.257 113.821C256.296 113.778 256.335 113.737 256.375 113.694C256.437 113.626 256.498 113.559 256.559 113.492C256.675 113.366 256.789 113.237 256.903 113.108C256.97 113.032 257.035 112.953 257.101 112.878C257.102 112.876 257.104 112.876 257.104 112.875C257.166 112.801 257.227 112.727 257.287 112.652C257.348 112.578 257.408 112.504 257.466 112.427C257.514 112.368 257.56 112.308 257.604 112.248C257.627 112.218 257.649 112.19 257.67 112.161C257.718 112.096 257.765 112.032 257.811 111.966C257.852 111.911 257.893 111.853 257.931 111.797C257.978 111.729 258.025 111.661 258.068 111.592C258.145 111.477 258.216 111.363 258.287 111.246C258.336 111.164 258.386 111.081 258.432 110.998C258.454 110.959 258.476 110.92 258.495 110.883C258.533 110.816 258.566 110.749 258.6 110.683L258.619 110.646C258.607 110.663 258.592 110.681 258.578 110.697C258.525 110.765 258.472 110.833 258.418 110.898C258.362 110.969 258.305 111.04 258.247 111.11C258.065 111.327 257.877 111.538 257.684 111.745C257.582 111.857 257.474 111.967 257.367 112.075C257.269 112.176 257.166 112.277 257.064 112.377C256.939 112.5 256.813 112.622 256.685 112.742C256.584 112.838 256.483 112.931 256.381 113.024C256.356 113.047 256.334 113.069 256.309 113.09C256.269 113.129 256.227 113.165 256.186 113.203C256.143 113.241 256.102 113.28 256.06 113.318C256.054 113.322 256.048 113.328 256.042 113.332C255.967 113.403 255.888 113.473 255.811 113.543C255.738 113.606 255.665 113.671 255.593 113.734C255.343 113.955 255.094 114.177 254.844 114.399C254.51 114.694 254.175 114.993 253.852 115.309C253.834 115.325 253.818 115.341 253.801 115.358C253.762 115.393 253.723 115.431 253.686 115.466C253.569 115.577 253.455 115.689 253.342 115.802C253.189 115.951 253.037 116.102 252.888 116.253C252.839 116.304 252.79 116.354 252.742 116.407C252.722 116.429 252.699 116.451 252.679 116.474C252.527 116.634 252.376 116.794 252.227 116.957L252.226 116.959C252.217 116.969 252.208 116.976 252.2 116.986C252.188 116.998 252.177 117.012 252.166 117.025C252.116 117.077 252.068 117.13 252.02 117.183C252.066 117.106 252.11 117.028 252.155 116.952C252.182 116.906 252.209 116.863 252.236 116.817C252.245 116.802 252.256 116.784 252.265 116.769L252.266 116.767C252.489 116.396 252.722 116.03 252.96 115.67C253.208 115.295 253.465 114.925 253.73 114.56C253.848 114.398 253.965 114.241 254.087 114.083L254.088 114.081C254.092 114.076 254.096 114.071 254.1 114.066C254.205 113.928 254.309 113.79 254.417 113.654C254.53 113.512 254.642 113.372 254.756 113.232L254.758 113.231C254.844 113.124 254.931 113.019 255.018 112.914C255.04 112.886 255.064 112.859 255.087 112.831L255.089 112.83C255.121 112.792 255.153 112.755 255.185 112.717L255.186 112.716C255.24 112.65 255.296 112.585 255.352 112.523C255.409 112.456 255.465 112.389 255.523 112.325C255.657 112.171 255.793 112.021 255.931 111.871C256.036 111.753 256.143 111.639 256.25 111.524C256.562 111.19 256.881 110.858 257.205 110.526C257.307 110.419 257.412 110.312 257.517 110.205C257.227 110.348 256.943 110.509 256.67 110.682C256.598 110.727 256.527 110.774 256.458 110.821C256.357 110.886 256.26 110.953 256.164 111.023C256.13 111.044 256.098 111.067 256.069 111.091C256.017 111.126 255.966 111.163 255.919 111.201C255.835 111.263 255.754 111.325 255.673 111.389C255.647 111.408 255.621 111.428 255.597 111.45C255.519 111.511 255.442 111.575 255.366 111.641C255.346 111.655 255.326 111.671 255.308 111.688C255.269 111.719 255.231 111.752 255.194 111.786L255.193 111.788C255.155 111.819 255.116 111.851 255.079 111.885C254.96 111.991 254.842 112.1 254.728 112.212C254.641 112.293 254.557 112.376 254.473 112.46C254.432 112.501 254.392 112.542 254.353 112.583C254.27 112.668 254.19 112.754 254.109 112.842C254.075 112.879 254.041 112.915 254.007 112.954C253.931 113.037 253.855 113.123 253.783 113.209C253.769 113.225 253.755 113.242 253.741 113.258C253.741 113.258 253.739 113.257 253.739 113.259C253.723 113.279 253.706 113.298 253.69 113.32C253.64 113.379 253.59 113.437 253.542 113.497C253.527 113.517 253.51 113.536 253.494 113.556C253.491 113.561 253.487 113.566 253.482 113.573C253.404 113.672 253.324 113.773 253.25 113.873C253.193 113.944 253.139 114.016 253.086 114.09C253.077 114.104 253.066 114.117 253.057 114.131C252.995 114.217 252.934 114.303 252.874 114.389C252.575 114.823 252.301 115.273 252.053 115.737C252.024 115.792 251.993 115.849 251.966 115.905C251.938 115.954 251.912 116.004 251.888 116.055C251.862 116.105 251.837 116.155 251.813 116.206L251.811 116.209C251.797 116.24 251.781 116.273 251.766 116.303C251.708 116.422 251.653 116.544 251.598 116.666C251.499 116.897 251.403 117.132 251.315 117.368C251.278 117.469 251.242 117.571 251.207 117.672C251.17 117.779 251.135 117.887 251.101 117.995C251.082 118.052 251.067 118.108 251.05 118.163L251.042 118.186C251.025 118.245 251.01 118.303 250.993 118.363C250.989 118.368 250.986 118.371 250.982 118.376C250.808 118.585 250.638 118.798 250.469 119.013C250.382 119.122 250.297 119.233 250.211 119.342C250.127 119.452 250.043 119.564 249.959 119.674C249.791 119.898 249.627 120.121 249.465 120.347C249.383 120.46 249.302 120.573 249.224 120.689C249.144 120.803 249.064 120.918 248.987 121.032C248.899 121.162 248.812 121.292 248.725 121.422C248.722 121.425 248.721 121.429 248.719 121.432C248.633 121.561 248.55 121.69 248.465 121.82C248.455 121.836 248.445 121.851 248.436 121.867C248.357 121.991 248.278 122.115 248.2 122.242C248.115 122.377 248.032 122.515 247.95 122.653C247.851 122.817 247.754 122.981 247.658 123.148C247.611 123.23 247.563 123.315 247.516 123.4C247.469 123.482 247.421 123.565 247.376 123.648L247.374 123.651C247.358 123.679 247.345 123.706 247.328 123.735C247.249 123.88 247.171 124.025 247.093 124.171C247.017 124.317 246.941 124.464 246.867 124.611C246.849 124.643 246.832 124.673 246.817 124.705L246.82 124.696C246.832 124.649 246.844 124.603 246.858 124.557L248.304 119.233L248.346 119.077L248.347 119.073L248.373 118.979L248.379 118.955L248.427 118.78L248.428 118.778L248.673 117.871L248.721 117.696L248.944 116.878L248.984 116.724L248.986 116.72L249.131 116.187C249.22 115.857 249.31 115.529 249.403 115.201C249.421 115.135 249.441 115.068 249.459 115.003C249.505 114.84 249.553 114.677 249.601 114.515C249.649 114.352 249.698 114.191 249.748 114.029C249.771 113.952 249.794 113.874 249.818 113.798C249.837 113.737 249.858 113.677 249.877 113.616C249.894 113.553 249.917 113.489 249.936 113.426C249.968 113.328 250 113.229 250.034 113.132C250.058 113.064 250.079 112.997 250.102 112.93L250.103 112.928C250.215 112.603 250.334 112.279 250.46 111.958C250.499 111.858 250.538 111.758 250.581 111.659C250.614 111.574 250.65 111.489 250.685 111.407C250.701 111.372 250.715 111.339 250.728 111.306C250.765 111.226 250.798 111.147 250.834 111.067L250.836 111.063C250.88 110.967 250.924 110.868 250.97 110.773C251.015 110.675 251.063 110.578 251.111 110.483C251.155 110.391 251.201 110.301 251.248 110.21C251.248 110.208 251.251 110.207 251.251 110.205C251.284 110.141 251.317 110.076 251.353 110.015C251.394 109.933 251.439 109.851 251.486 109.771C251.537 109.679 251.59 109.588 251.644 109.497C251.657 109.472 251.672 109.448 251.687 109.424C251.756 109.31 251.824 109.198 251.898 109.088C251.902 109.077 251.91 109.065 251.918 109.055C251.958 108.993 251.996 108.933 252.036 108.873C252.041 108.866 252.045 108.859 252.05 108.852C252.087 108.798 252.123 108.744 252.16 108.69C252.245 108.568 252.331 108.446 252.421 108.328C252.532 108.178 252.646 108.031 252.764 107.886C252.882 107.742 253.003 107.598 253.124 107.457C253.229 107.462 253.335 107.467 253.439 107.469C253.556 107.472 253.673 107.475 253.792 107.474C253.868 107.473 253.946 107.472 254.023 107.469C254.122 107.468 254.225 107.464 254.324 107.458C254.397 107.454 254.468 107.449 254.539 107.444C254.563 107.442 254.587 107.441 254.609 107.439C254.641 107.437 254.673 107.436 254.704 107.432C254.728 107.429 254.754 107.428 254.778 107.424C254.893 107.415 255.009 107.402 255.123 107.389C255.237 107.376 255.352 107.361 255.467 107.344C255.48 107.342 255.495 107.341 255.509 107.34C255.538 107.335 255.564 107.331 255.593 107.327C255.609 107.324 255.624 107.323 255.64 107.318C255.724 107.307 255.81 107.292 255.893 107.277C255.962 107.265 256.031 107.253 256.1 107.237C256.198 107.218 256.297 107.198 256.395 107.177C256.493 107.154 256.59 107.131 256.688 107.108C256.833 107.074 256.976 107.037 257.118 106.998C257.227 106.968 257.337 106.939 257.445 106.905C257.529 106.881 257.614 106.854 257.697 106.828C257.929 106.754 258.157 106.674 258.385 106.588C258.85 106.413 259.307 106.213 259.751 105.99C259.861 105.933 259.971 105.876 260.082 105.818C260.164 105.775 260.245 105.729 260.327 105.684C260.57 105.547 260.809 105.403 261.043 105.252C261.147 105.182 261.251 105.113 261.354 105.042C261.459 104.969 261.56 104.896 261.661 104.822C261.746 104.761 261.829 104.699 261.909 104.636C261.946 104.609 261.982 104.579 262.018 104.552C262.097 104.489 262.179 104.424 262.256 104.359C262.334 104.293 262.412 104.227 262.49 104.16C262.515 104.137 262.539 104.114 262.567 104.089C262.567 104.089 262.567 104.088 262.569 104.088C262.613 104.047 262.659 104.006 262.704 103.962C262.719 103.948 262.735 103.933 262.751 103.917C262.782 103.888 262.813 103.861 262.842 103.831C262.892 103.783 262.941 103.734 262.99 103.684C262.992 103.683 262.994 103.679 262.996 103.678C262.999 103.675 263.003 103.671 263.006 103.668C263.112 103.564 263.209 103.459 263.309 103.348L263.304 103.35C263.221 103.395 263.137 103.442 263.056 103.488C262.879 103.585 262.705 103.68 262.527 103.774C262.498 103.79 262.47 103.805 262.443 103.821L262.438 103.823C262.323 103.887 262.207 103.948 262.094 104.007C261.982 104.07 261.868 104.131 261.751 104.189C261.715 104.209 261.676 104.229 261.64 104.248C261.511 104.317 261.377 104.386 261.245 104.452C261.078 104.54 260.907 104.625 260.736 104.707L260.734 104.706C259.872 105.128 258.997 105.507 258.105 105.844C257.908 105.917 257.713 105.988 257.516 106.059C257.322 106.127 257.128 106.194 256.933 106.257L256.931 106.258C256.866 106.28 256.802 106.3 256.739 106.32C256.567 106.379 256.394 106.433 256.223 106.483C256.169 106.5 256.115 106.515 256.061 106.532C256.061 106.532 256.059 106.531 256.058 106.533C256.007 106.547 255.958 106.561 255.906 106.577C255.731 106.63 255.557 106.68 255.382 106.728C255.361 106.733 255.342 106.74 255.321 106.745C255.305 106.748 255.289 106.753 255.272 106.758C255.235 106.768 255.197 106.78 255.159 106.788C255.14 106.794 255.119 106.799 255.1 106.803C254.947 106.845 254.794 106.885 254.64 106.924C254.64 106.924 254.637 106.925 254.635 106.924C254.418 106.979 254.199 107.034 253.979 107.084C253.805 107.125 253.632 107.164 253.457 107.204C253.409 107.215 253.359 107.227 253.311 107.238C253.377 107.162 253.446 107.086 253.517 107.014C253.592 106.933 253.668 106.852 253.747 106.772C253.765 106.749 253.787 106.729 253.807 106.708C253.885 106.628 253.963 106.55 254.042 106.472C254.042 106.472 254.043 106.471 254.045 106.469C254.12 106.394 254.196 106.321 254.274 106.247C254.353 106.172 254.434 106.096 254.517 106.022C254.589 105.952 254.666 105.884 254.741 105.818C254.823 105.747 254.902 105.678 254.983 105.609C255.064 105.538 255.145 105.469 255.227 105.403C255.28 105.358 255.333 105.316 255.388 105.272C255.48 105.196 255.575 105.121 255.671 105.047C255.72 105.009 255.769 104.97 255.82 104.933C255.872 104.894 255.924 104.853 255.975 104.814L255.98 104.811C256.163 104.672 256.35 104.539 256.54 104.407C258.112 103.316 259.813 102.408 261.564 101.615C261.939 101.444 262.316 101.277 262.695 101.118C263.029 100.973 263.365 100.832 263.701 100.694C263.742 100.679 263.782 100.661 263.824 100.644C264.101 100.531 264.378 100.419 264.656 100.311C265.406 100.011 266.161 99.7228 266.917 99.4396C265.695 99.8521 264.477 100.274 263.269 100.732C263.097 100.796 262.925 100.861 262.755 100.928C262.543 101.01 262.329 101.092 262.118 101.177C261.908 101.26 261.697 101.347 261.486 101.434C259.705 102.183 257.968 103.051 256.342 104.115C256.23 104.188 256.12 104.261 256.01 104.336C255.899 104.412 255.788 104.489 255.681 104.568C255.587 104.634 255.493 104.703 255.4 104.771C255.119 104.981 254.842 105.201 254.572 105.428C254.494 105.494 254.417 105.559 254.341 105.626C254.251 105.704 254.162 105.783 254.073 105.863C253.988 105.939 253.904 106.017 253.82 106.093C253.817 106.098 253.811 106.101 253.808 106.106C253.722 106.184 253.638 106.266 253.555 106.349C253.514 106.387 253.475 106.427 253.434 106.465C253.425 106.474 253.415 106.484 253.406 106.493C253.338 106.56 253.271 106.632 253.205 106.701C253.167 106.737 253.133 106.775 253.097 106.811C253.153 106.711 253.206 106.612 253.264 106.512C253.299 106.448 253.336 106.385 253.372 106.321C253.394 106.284 253.415 106.248 253.436 106.211C253.439 106.203 253.443 106.196 253.448 106.189C253.581 105.968 253.717 105.748 253.857 105.531C253.927 105.422 253.998 105.315 254.071 105.207C254.214 104.994 254.363 104.784 254.517 104.576C254.746 104.268 254.989 103.967 255.244 103.681C256.596 102.133 258.265 100.876 260.073 99.8748C261.885 98.8667 263.838 98.1224 265.832 97.5055C266.829 97.192 267.841 96.9219 268.858 96.6634C269.088 96.6019 269.318 96.5432 269.55 96.4843C269.586 96.4759 269.622 96.465 269.658 96.4566C270.407 96.2656 271.161 96.0846 271.91 95.8917C271.553 95.9493 271.198 96.007 270.842 96.0689C270.162 96.1827 269.483 96.3072 268.805 96.4327C267.776 96.6381 266.746 96.8624 265.726 97.1255C265.582 97.1622 265.439 97.199 265.297 97.2379C265.174 97.271 265.053 97.3048 264.932 97.3388C264.82 97.3695 264.707 97.4022 264.597 97.4356C264.482 97.4695 264.367 97.5034 264.253 97.54C263.608 97.7354 262.969 97.9561 262.337 98.2003C262.237 98.2394 262.137 98.2785 262.038 98.3177C261.925 98.363 261.812 98.4082 261.7 98.4551C262.105 98.1894 262.516 97.9296 262.935 97.6873L263.398 97.4311C263.475 97.388 263.551 97.3448 263.627 97.2997C263.705 97.2591 263.783 97.2166 263.861 97.1785C263.941 97.1385 264.019 97.1004 264.097 97.0597C264.254 96.9772 264.41 96.8968 264.567 96.8206C264.646 96.7806 264.726 96.7451 264.806 96.7095C265.443 96.4082 266.088 96.1283 266.748 95.8876C267.403 95.6325 268.071 95.4133 268.748 95.2163C269.42 95.0093 270.107 94.8495 270.797 94.6886C270.991 94.6463 271.185 94.6037 271.379 94.5662C271.515 94.5376 271.653 94.5114 271.788 94.4847C272.546 94.339 273.313 94.2175 274.088 94.1092C274.395 94.0661 274.702 94.0255 275.013 93.9857C274.714 93.9557 274.413 93.9313 274.112 93.9173C274.003 93.911 273.894 93.9072 273.786 93.9053C273.655 93.9 273.525 93.8973 273.393 93.8976C273.306 93.8972 273.218 93.8961 273.132 93.8977C273.12 93.8957 273.109 93.8962 273.098 93.8967C272.929 93.899 272.761 93.9022 272.593 93.909C272.586 93.9089 272.582 93.9095 272.577 93.91C272.488 93.9127 272.4 93.918 272.31 93.9227C271.768 93.9496 271.227 94.0021 270.688 94.0759C269.968 94.1697 269.255 94.3184 268.549 94.4904C267.844 94.6694 267.15 94.8921 266.465 95.143C265.788 95.4074 265.119 95.7022 264.473 96.0361C264.392 96.0799 264.312 96.1218 264.232 96.1655C264.072 96.2537 263.913 96.3435 263.755 96.4341C263.597 96.5248 263.441 96.6178 263.287 96.7142C263.134 96.8106 262.98 96.9087 262.829 97.0102C262.754 97.0622 262.679 97.1142 262.604 97.1658C262.399 97.3076 262.199 97.4529 262.002 97.6017C261.805 97.7524 261.612 97.9086 261.422 98.0663C261.327 98.147 261.231 98.2277 261.14 98.3094C260.954 98.4728 260.774 98.6417 260.596 98.8141C260.508 98.8993 260.42 98.9867 260.335 99.0751C260.152 99.1636 259.97 99.2537 259.789 99.3492C259.554 99.4742 259.322 99.6022 259.092 99.7374C258.862 99.8707 258.636 100.009 258.409 100.152C257.96 100.438 257.521 100.743 257.094 101.065C256.675 101.397 256.261 101.734 255.874 102.105C255.675 102.285 255.492 102.483 255.301 102.669C255.164 102.817 255.026 102.963 254.896 103.116C254.853 103.167 254.81 103.219 254.767 103.27C254.245 103.882 253.78 104.541 253.369 105.228C253.233 105.457 253.102 105.69 252.976 105.924C252.928 106.015 252.88 106.104 252.832 106.194C252.792 106.273 252.752 106.354 252.712 106.432C252.679 106.495 252.647 106.557 252.617 106.62C252.579 106.7 252.539 106.779 252.503 106.859C252.476 106.911 252.452 106.963 252.429 107.017C252.404 107.065 252.383 107.112 252.362 107.162C252.331 107.225 252.303 107.289 252.274 107.353C252.233 107.446 252.191 107.539 252.148 107.631C252.124 107.688 252.098 107.745 252.076 107.802C252.055 107.852 252.035 107.904 252.017 107.955C252 107.997 251.984 108.043 251.971 108.087C251.97 108.09 251.968 108.096 251.969 108.1C251.963 108.115 251.961 108.129 251.957 108.145L251.955 108.152C251.955 108.152 251.954 108.154 251.952 108.156C251.886 108.242 251.821 108.332 251.756 108.421C251.753 108.424 251.752 108.427 251.749 108.431C251.744 108.439 251.737 108.446 251.732 108.454C251.639 108.584 251.548 108.717 251.46 108.851C251.413 108.919 251.369 108.986 251.326 109.053C251.28 109.127 251.232 109.203 251.185 109.279C251.127 109.373 251.071 109.468 251.015 109.562C251.011 109.568 251.006 109.575 251.004 109.581C250.968 109.642 250.932 109.704 250.897 109.767C250.881 109.796 250.865 109.824 250.849 109.852C250.839 109.869 250.828 109.889 250.819 109.907C250.754 110.028 250.689 110.15 250.625 110.273C250.561 110.397 250.499 110.52 250.437 110.644C250.431 110.655 250.426 110.665 250.421 110.679C250.421 110.679 250.418 110.68 250.42 110.682C250.398 110.721 250.379 110.763 250.36 110.805C250.312 110.902 250.265 111.002 250.22 111.1C250.17 111.209 250.121 111.32 250.074 111.43C250.036 111.516 250 111.601 249.965 111.685L249.963 111.689C249.93 111.768 249.895 111.848 249.863 111.928C249.784 112.128 249.704 112.325 249.631 112.525C249.6 112.608 249.57 112.688 249.542 112.77C249.52 112.828 249.498 112.886 249.477 112.944C249.479 112.94 249.478 112.936 249.479 112.932C249.481 112.922 249.482 112.912 249.483 112.902C249.505 112.774 249.525 112.647 249.548 112.52C249.55 112.516 249.548 112.514 249.55 112.51C249.565 112.431 249.579 112.353 249.593 112.275C249.602 112.225 249.61 112.177 249.619 112.128L249.62 112.126C249.674 111.822 249.733 111.52 249.797 111.22C249.812 111.145 249.828 111.069 249.845 110.995C249.848 110.988 249.849 110.979 249.851 110.972C249.861 110.925 249.871 110.878 249.881 110.83C249.9 110.753 249.916 110.676 249.936 110.599C249.944 110.566 249.952 110.531 249.959 110.497C249.966 110.472 249.97 110.446 249.977 110.421L249.979 110.416C249.98 110.406 249.983 110.396 249.986 110.384C249.99 110.367 249.994 110.347 250 110.33C250.003 110.31 250.009 110.293 250.013 110.276C250.017 110.258 250.021 110.24 250.025 110.223C250.038 110.171 250.05 110.118 250.064 110.066C250.078 110.014 250.092 109.962 250.107 109.908C250.122 109.839 250.14 109.769 250.159 109.702C250.181 109.609 250.207 109.515 250.233 109.423C250.271 109.28 250.31 109.138 250.351 108.996C250.356 108.983 250.358 108.971 250.362 108.96L250.362 108.958C250.404 108.812 250.447 108.669 250.493 108.525C250.5 108.498 250.507 108.473 250.516 108.447C250.527 108.408 250.54 108.373 250.553 108.335C250.599 108.191 250.645 108.045 250.693 107.899C250.932 107.175 251.199 106.461 251.492 105.754C251.575 105.553 251.659 105.353 251.747 105.153C251.779 105.08 251.81 105.007 251.842 104.934C251.898 104.808 251.955 104.682 252.013 104.555C252.103 104.357 252.196 104.157 252.29 103.958C252.382 103.759 252.477 103.557 252.572 103.356C252.612 103.273 252.652 103.188 252.692 103.103C252.672 103.124 252.65 103.145 252.632 103.167C252.55 103.25 252.473 103.333 252.395 103.419C252.379 103.435 252.365 103.451 252.351 103.467C252.284 103.543 252.217 103.621 252.151 103.697C252.15 103.699 252.147 103.702 252.146 103.706C252.07 103.795 251.996 103.887 251.925 103.978C251.702 104.261 251.496 104.558 251.302 104.862C251.173 105.064 251.049 105.269 250.93 105.479C250.728 105.838 250.541 106.207 250.37 106.584C250.165 107.041 249.984 107.507 249.828 107.984C249.818 108.01 249.811 108.037 249.802 108.064C249.785 108.113 249.77 108.162 249.755 108.212C249.75 108.225 249.747 108.241 249.742 108.254C249.715 108.345 249.687 108.437 249.662 108.529C249.626 108.651 249.593 108.775 249.561 108.898C249.546 108.961 249.531 109.023 249.516 109.083C249.499 109.149 249.485 109.216 249.47 109.282C249.454 109.348 249.439 109.415 249.427 109.48C249.413 109.537 249.403 109.592 249.392 109.647C249.369 109.763 249.347 109.88 249.328 109.996C249.315 110.069 249.303 110.141 249.293 110.213C249.283 110.264 249.275 110.318 249.268 110.371C249.263 110.401 249.259 110.431 249.257 110.462C249.255 110.474 249.253 110.486 249.251 110.498C249.239 110.582 249.229 110.665 249.22 110.75C249.206 110.876 249.194 111.002 249.182 111.128C249.17 111.266 249.16 111.403 249.153 111.54L249.152 111.542C249.151 111.581 249.149 111.618 249.149 111.656L249.148 111.658C249.145 111.701 249.143 111.745 249.141 111.786C249.14 111.79 249.141 111.793 249.142 111.797L249.141 111.799C249.138 111.825 249.139 111.853 249.139 111.878C249.131 112.095 249.131 112.309 249.138 112.527C249.139 112.589 249.141 112.65 249.145 112.713C249.144 112.732 249.147 112.749 249.147 112.768L249.146 112.77C249.149 112.803 249.151 112.835 249.152 112.867C249.157 112.934 249.159 113 249.165 113.068C249.178 113.268 249.199 113.467 249.225 113.666C249.203 113.728 249.184 113.789 249.165 113.851L249.155 113.88C249.114 114.002 249.073 114.127 249.035 114.251C249.015 114.313 248.995 114.378 248.975 114.441C248.944 114.535 248.914 114.63 248.884 114.727C248.859 114.813 248.831 114.898 248.806 114.984L248.802 114.993C248.76 115.128 248.719 115.265 248.678 115.401C248.616 115.603 248.557 115.805 248.497 116.006L247.984 117.747L247.984 117.749L247.931 117.931L247.806 118.353L247.681 118.781L246.502 122.787L246.443 122.988L246.05 124.328C246.021 124.43 245.99 124.533 245.961 124.634C245.94 124.699 245.921 124.766 245.903 124.831C245.717 125.47 245.534 126.106 245.353 126.745C245.211 127.247 245.068 127.75 244.925 128.254C244.852 128.506 244.782 128.758 244.711 129.011C244.691 129.078 244.672 129.145 244.653 129.213C244.653 129.208 244.652 129.206 244.651 129.201C244.607 129.005 244.566 128.808 244.527 128.611C244.447 128.221 244.371 127.83 244.302 127.439L244.302 127.437C244.296 127.408 244.29 127.38 244.286 127.351C244.278 127.307 244.269 127.259 244.263 127.215C244.233 127.048 244.205 126.883 244.179 126.718C244.171 126.669 244.161 126.617 244.155 126.569C244.143 126.499 244.133 126.432 244.123 126.363C244.088 126.143 244.055 125.921 244.024 125.7C244.001 125.531 243.979 125.364 243.959 125.197C243.943 125.067 243.927 124.937 243.913 124.808C243.909 124.769 243.905 124.731 243.9 124.692C243.901 124.69 243.901 124.688 243.9 124.685C243.881 124.527 243.867 124.369 243.852 124.21C243.847 124.157 243.844 124.106 243.84 124.051L243.84 124.049C243.833 123.986 243.829 123.923 243.824 123.858C243.825 123.857 243.824 123.854 243.824 123.852C243.813 123.72 243.805 123.586 243.796 123.455C243.788 123.319 243.78 123.184 243.774 123.049C243.768 122.914 243.764 122.78 243.76 122.646C243.757 122.533 243.753 122.423 243.752 122.311L243.752 122.309C243.752 122.286 243.751 122.264 243.751 122.241C243.75 122.226 243.751 122.209 243.75 122.194C243.749 122.093 243.749 121.996 243.75 121.895C243.749 121.857 243.75 121.817 243.751 121.779C243.812 121.706 243.874 121.63 243.932 121.554C243.935 121.551 243.937 121.547 243.94 121.544C244.09 121.354 244.235 121.16 244.372 120.961C244.377 120.952 244.384 120.944 244.389 120.935C244.423 120.886 244.457 120.837 244.491 120.787C244.525 120.738 244.559 120.689 244.592 120.637C244.672 120.515 244.75 120.393 244.825 120.267C244.888 120.165 244.949 120.064 245.008 119.96L245.008 119.958C245.023 119.935 245.037 119.913 245.049 119.89C245.212 119.607 245.366 119.317 245.513 119.025C245.58 118.886 245.647 118.747 245.712 118.605C245.761 118.5 245.808 118.394 245.853 118.288C245.906 118.165 245.96 118.041 246.01 117.915C246.06 117.789 246.109 117.665 246.156 117.538L246.156 117.536C246.172 117.495 246.187 117.454 246.201 117.412C246.212 117.38 246.225 117.349 246.236 117.317L246.245 117.29C246.292 117.157 246.336 117.023 246.379 116.888C246.414 116.78 246.445 116.671 246.476 116.564C246.499 116.487 246.521 116.411 246.541 116.334C246.567 116.242 246.588 116.15 246.612 116.057C246.613 116.055 246.611 116.053 246.615 116.05C246.636 115.958 246.656 115.864 246.675 115.772C246.687 115.725 246.695 115.68 246.705 115.632C246.711 115.597 246.718 115.563 246.724 115.527L246.721 115.535C246.667 115.649 246.614 115.761 246.56 115.873C246.557 115.876 246.555 115.882 246.554 115.885C246.489 116.023 246.424 116.161 246.362 116.299C246.291 116.449 246.221 116.6 246.155 116.75C246.086 116.901 246.017 117.049 245.949 117.198C245.819 117.476 245.689 117.753 245.558 118.028C245.427 118.302 245.294 118.576 245.157 118.849C245.088 118.994 245.016 119.135 244.945 119.279C244.873 119.418 244.802 119.556 244.73 119.697C244.595 119.958 244.46 120.219 244.324 120.479C244.28 120.563 244.236 120.647 244.192 120.73C244.188 120.737 244.186 120.743 244.181 120.75L244.18 120.753C244.039 121.02 243.897 121.285 243.755 121.554C243.763 121.125 243.786 120.695 243.823 120.265C243.835 120.122 243.85 119.98 243.866 119.838C243.971 118.865 244.152 117.9 244.417 116.954C244.453 116.825 244.491 116.7 244.531 116.572C244.55 116.509 244.571 116.445 244.59 116.382C244.632 116.249 244.675 116.119 244.72 115.989C244.826 115.683 244.942 115.379 245.063 115.08C245.185 114.783 245.312 114.488 245.446 114.195C245.857 113.302 246.345 112.439 246.898 111.622C246.966 111.519 247.037 111.417 247.108 111.316C247.178 111.216 247.249 111.116 247.32 111.019C247.322 111.015 247.325 111.012 247.328 111.009C247.381 110.934 247.434 110.862 247.49 110.791C247.542 110.721 247.596 110.651 247.651 110.582C247.675 110.548 247.699 110.516 247.725 110.485C247.812 110.374 247.9 110.264 247.991 110.156C248.078 110.05 248.167 109.946 248.258 109.842C248.33 109.756 248.404 109.67 248.482 109.585C248.496 109.567 248.514 109.548 248.53 109.53C248.602 109.45 248.674 109.37 248.748 109.292C248.742 109.297 248.738 109.302 248.732 109.306C248.675 109.356 248.62 109.406 248.568 109.458C248.509 109.513 248.451 109.569 248.392 109.624C248.333 109.679 248.276 109.735 248.22 109.794C248.162 109.852 248.106 109.908 248.05 109.966C247.695 110.328 247.36 110.706 247.04 111.099C246.931 111.23 246.827 111.362 246.724 111.495C246.119 112.292 245.577 113.143 245.109 114.031C244.62 114.961 244.219 115.936 243.908 116.942L243.9 116.965C243.875 117.049 243.848 117.132 243.826 117.215C243.792 117.325 243.76 117.434 243.73 117.546C243.702 117.652 243.673 117.758 243.646 117.866C243.624 117.949 243.603 118.033 243.585 118.117C243.566 118.19 243.55 118.265 243.533 118.339C243.427 118.809 243.34 119.285 243.273 119.763C243.257 119.877 243.242 119.992 243.228 120.107C243.194 120.374 243.169 120.641 243.148 120.909C243.14 120.999 243.134 121.088 243.129 121.176C243.121 121.29 243.113 121.403 243.11 121.515C243.103 121.622 243.099 121.729 243.096 121.837C243.087 122.067 243.083 122.298 243.083 122.529C243.064 122.426 243.047 122.323 243.031 122.218C243.029 122.201 243.025 122.181 243.023 122.163C243.004 122.051 242.987 121.938 242.971 121.825C242.952 121.692 242.935 121.56 242.919 121.428C242.904 121.307 242.89 121.184 242.879 121.062L242.88 121.061C242.878 121.043 242.875 121.027 242.874 121.01C242.858 120.857 242.846 120.703 242.836 120.548C242.836 120.542 242.835 120.535 242.835 120.529L242.835 120.527C242.818 120.302 242.809 120.075 242.805 119.849L242.806 119.847C242.801 119.582 242.802 119.317 242.814 119.053C242.838 118.35 242.918 117.649 243.061 116.957C243.079 116.868 243.097 116.778 243.118 116.689C243.134 116.618 243.15 116.548 243.17 116.477C243.182 116.424 243.194 116.371 243.211 116.318C243.234 116.225 243.258 116.132 243.286 116.041C243.29 116.023 243.296 116.005 243.3 115.987C243.309 115.956 243.319 115.926 243.328 115.895C243.331 115.88 243.337 115.863 243.342 115.848C243.356 115.8 243.371 115.752 243.387 115.705C243.392 115.686 243.397 115.664 243.406 115.646C243.482 115.401 243.566 115.16 243.653 114.919C243.684 114.837 243.715 114.753 243.748 114.67C243.781 114.589 243.813 114.507 243.848 114.425C243.881 114.341 243.918 114.261 243.954 114.179C244.027 114.017 244.102 113.856 244.18 113.698C244.259 113.537 244.342 113.379 244.427 113.223C244.472 113.143 244.515 113.066 244.559 112.989L244.69 112.756C244.705 112.732 244.721 112.706 244.735 112.681C244.766 112.629 244.799 112.577 244.829 112.526C244.877 112.45 244.924 112.374 244.973 112.298C245.021 112.222 245.072 112.149 245.121 112.074C245.186 111.978 245.252 111.885 245.318 111.79C245.319 111.789 245.32 111.787 245.322 111.785C245.392 111.687 245.464 111.59 245.535 111.493C245.607 111.396 245.68 111.299 245.756 111.203C245.521 111.437 245.296 111.686 245.082 111.943C245.005 112.034 244.93 112.126 244.858 112.219C244.855 112.222 244.854 112.226 244.85 112.229L244.85 112.23C244.778 112.323 244.705 112.416 244.637 112.51C244.621 112.53 244.606 112.55 244.591 112.57C244.518 112.671 244.447 112.773 244.376 112.875C244.337 112.931 244.299 112.987 244.262 113.044C244.225 113.101 244.188 113.16 244.152 113.217C244.078 113.332 244.008 113.449 243.938 113.566C243.707 113.957 243.497 114.363 243.307 114.777C243.149 115.123 243.007 115.478 242.882 115.837C242.85 115.929 242.819 116.025 242.789 116.118C242.758 116.215 242.728 116.312 242.701 116.409C242.688 116.447 242.677 116.483 242.668 116.522C242.639 116.624 242.612 116.726 242.585 116.828C242.555 116.945 242.527 117.061 242.5 117.176C242.498 117.183 242.497 117.192 242.496 117.2C242.474 117.295 242.454 117.39 242.435 117.486C242.427 117.515 242.422 117.547 242.416 117.576C242.394 117.689 242.374 117.802 242.355 117.915C242.318 118.134 242.288 118.353 242.263 118.572C242.244 118.722 242.229 118.87 242.217 119.02C242.151 119.829 242.16 120.643 242.229 121.45C242.24 121.583 242.252 121.713 242.267 121.845C242.281 121.982 242.299 122.119 242.317 122.256C242.318 122.269 242.321 122.28 242.323 122.294C242.333 122.378 242.344 122.461 242.361 122.547L242.361 122.549C242.391 122.764 242.429 122.979 242.468 123.193C242.475 123.233 242.483 123.272 242.49 123.31C242.495 123.339 242.501 123.371 242.507 123.4C242.581 123.761 242.664 124.114 242.761 124.468C242.807 124.644 242.858 124.819 242.909 124.993C242.962 125.17 243.015 125.344 243.071 125.517C243.098 125.598 243.124 125.679 243.152 125.758C243.177 125.836 243.206 125.918 243.235 125.998C243.242 126.019 243.248 126.04 243.257 126.062C243.264 126.084 243.272 126.105 243.279 126.127C243.3 126.182 243.32 126.24 243.341 126.295C243.362 126.356 243.384 126.414 243.405 126.474C243.455 126.775 243.509 127.074 243.569 127.373C243.598 127.522 243.629 127.67 243.661 127.818C243.661 127.82 243.663 127.82 243.662 127.822C243.693 127.97 243.726 128.116 243.76 128.263C243.761 128.265 243.76 128.269 243.761 128.271C243.766 128.294 243.771 128.315 243.776 128.336C243.792 128.407 243.807 128.477 243.825 128.549C243.84 128.62 243.858 128.689 243.875 128.758C243.909 128.896 243.943 129.034 243.98 129.171C244.001 129.257 244.024 129.341 244.047 129.427C244.06 129.48 244.075 129.533 244.089 129.585C244.089 129.586 244.09 129.587 244.09 129.589C244.109 129.655 244.126 129.722 244.144 129.785C244.183 129.927 244.225 130.068 244.264 130.21C244.271 130.256 244.301 130.296 244.341 130.333L244.13 131.094L244.112 131.158L244.114 131.16L244.055 131.371L243.931 131.821L243.874 132.023L243.747 132.478L243.694 132.675L243.693 132.676L243.569 133.137L243.315 134.07L243.277 134.211C243.275 134.206 243.273 134.203 243.273 134.199C243.189 134.01 243.105 133.821 243.024 133.628C243.023 133.626 243.022 133.623 243.021 133.619C242.947 133.443 242.875 133.269 242.803 133.093C242.788 133.053 242.772 133.014 242.758 132.976C242.689 132.802 242.622 132.627 242.556 132.451C242.506 132.311 242.455 132.172 242.409 132.031C242.388 131.971 242.368 131.914 242.348 131.854C242.188 131.388 242.039 130.917 241.901 130.442C241.81 130.126 241.725 129.808 241.644 129.487C241.524 129.007 241.418 128.524 241.328 128.038C241.297 127.876 241.269 127.714 241.242 127.551C241.188 127.227 241.139 126.9 241.094 126.573C241.071 126.409 241.052 126.247 241.033 126.082C240.994 125.755 240.961 125.427 240.934 125.098C240.905 124.768 240.884 124.44 240.866 124.11C240.836 123.492 240.827 122.874 240.837 122.256C240.844 121.865 240.858 121.472 240.882 121.082C240.889 120.956 240.898 120.829 240.907 120.704C240.934 120.33 240.968 119.956 241.012 119.583C241.026 119.451 241.04 119.32 241.058 119.189C241.062 119.154 241.067 119.12 241.072 119.088C241.094 118.915 241.117 118.744 241.143 118.572C241.146 118.551 241.149 118.531 241.154 118.512C241.18 118.333 241.208 118.156 241.239 117.979C241.27 117.794 241.304 117.61 241.34 117.426C241.359 117.317 241.383 117.207 241.405 117.099C241.425 116.999 241.445 116.898 241.467 116.799C241.487 116.706 241.509 116.613 241.53 116.521C241.552 116.413 241.578 116.309 241.605 116.202C241.625 116.106 241.649 116.013 241.675 115.921C241.697 115.826 241.72 115.73 241.746 115.636C241.776 115.52 241.805 115.406 241.838 115.291C241.865 115.191 241.892 115.093 241.922 114.994C241.937 114.94 241.951 114.888 241.969 114.836C241.988 114.762 242.01 114.687 242.033 114.616C242.041 114.587 242.05 114.558 242.058 114.53C242.074 114.484 242.087 114.44 242.1 114.397C242.107 114.378 242.111 114.358 242.118 114.339C242.156 114.222 242.194 114.103 242.232 113.985C242.277 113.851 242.322 113.715 242.368 113.582C242.719 112.57 243.128 111.579 243.595 110.614C243.784 110.229 243.979 109.848 244.183 109.472C244.286 109.284 244.392 109.096 244.499 108.909L244.506 108.912C244.509 108.903 244.511 108.892 244.514 108.883C244.515 108.879 244.517 108.876 244.52 108.872C244.694 108.571 244.874 108.271 245.058 107.976C245.137 107.852 245.215 107.73 245.294 107.607C245.299 107.597 245.307 107.587 245.314 107.579C245.391 107.455 245.47 107.336 245.551 107.217C245.584 107.167 245.618 107.117 245.653 107.068C245.687 107.015 245.724 106.962 245.761 106.91C245.816 106.83 245.871 106.75 245.928 106.671C246.043 106.504 246.161 106.339 246.283 106.177C246.415 105.997 246.548 105.82 246.684 105.646C246.984 105.255 247.297 104.87 247.618 104.497C247.689 104.414 247.761 104.332 247.832 104.249C247.961 104.102 248.092 103.956 248.223 103.814C248.303 103.724 248.386 103.637 248.467 103.549C248.504 103.509 248.541 103.469 248.58 103.43C248.657 103.347 248.737 103.263 248.818 103.182C249.454 102.525 250.121 101.895 250.819 101.298C250.921 101.211 251.022 101.127 251.125 101.04C251.209 100.97 251.294 100.901 251.379 100.832C251.456 100.768 251.535 100.704 251.613 100.643C251.782 100.508 251.955 100.374 252.127 100.242C252.248 100.149 252.37 100.059 252.494 99.9671C252.557 99.9194 252.621 99.8742 252.686 99.8271C252.836 99.7168 252.988 99.6119 253.141 99.5047C253.563 99.2089 253.994 98.9266 254.434 98.6538C254.587 98.5593 254.742 98.4656 254.896 98.3736C254.983 98.3218 255.071 98.2699 255.158 98.2203C255.408 98.0757 255.659 97.935 255.911 97.7988C255.432 98.0057 254.96 98.2271 254.494 98.4642C254.287 98.5694 254.081 98.6769 253.876 98.789C253.707 98.8802 253.541 98.9718 253.375 99.0681C253.299 99.1094 253.226 99.1513 253.154 99.1958C253.141 99.2019 253.13 99.2087 253.119 99.2155C252.966 99.3038 252.815 99.3943 252.665 99.4876C252.481 99.5987 252.298 99.7141 252.118 99.831C252.099 99.8433 252.083 99.8545 252.066 99.8656C251.871 99.9899 251.679 100.119 251.491 100.25C251.145 100.488 250.803 100.733 250.467 100.99C250.394 101.043 250.324 101.099 250.253 101.153C249.917 101.412 249.587 101.681 249.263 101.956C249.068 102.122 248.877 102.29 248.688 102.46C248.59 102.548 248.492 102.636 248.396 102.725C248.299 102.816 248.203 102.904 248.108 102.996C248.013 103.087 247.918 103.178 247.823 103.27C247.73 103.362 247.636 103.455 247.543 103.548C247.358 103.734 247.174 103.925 246.995 104.115C246.988 104.124 246.981 104.132 246.972 104.139C246.731 104.397 246.495 104.658 246.265 104.924C246.159 105.05 246.05 105.174 245.945 105.3C245.899 105.353 245.853 105.409 245.809 105.463C245.911 105.271 246.02 105.079 246.131 104.892C246.183 104.805 246.234 104.717 246.287 104.631C246.357 104.52 246.427 104.41 246.499 104.3C246.552 104.219 246.605 104.139 246.66 104.061C246.721 103.97 246.784 103.88 246.848 103.791C246.897 103.722 246.947 103.653 246.998 103.584C247.077 103.477 247.158 103.371 247.242 103.265C248.543 101.6 250.138 100.16 251.899 98.9742C253.664 97.779 255.584 96.8165 257.552 95.9619C258.535 95.534 259.536 95.1374 260.542 94.7576C260.851 94.6352 261.162 94.5178 261.472 94.3998C262.168 94.1358 262.868 93.8791 263.565 93.6132C263.29 93.6906 263.013 93.7694 262.737 93.8506C262.568 93.8996 262.402 93.9494 262.232 93.9998C261.643 94.1745 261.054 94.3555 260.464 94.5368C259.438 94.8672 258.415 95.2163 257.404 95.5986C255.381 96.3628 253.405 97.2927 251.571 98.4745C249.743 99.6645 248.071 101.126 246.733 102.871C246.151 103.632 245.633 104.44 245.198 105.294C245.133 105.421 245.072 105.547 245.011 105.676C244.792 106.156 244.595 106.65 244.432 107.151L244.42 107.183C244.405 107.235 244.388 107.288 244.372 107.341L244.361 107.373C244.133 107.703 243.91 108.036 243.697 108.377C243.318 108.952 242.992 109.559 242.655 110.16L242.191 111.086C242.034 111.393 241.908 111.714 241.765 112.029C241.439 112.786 241.141 113.555 240.88 114.336C240.822 114.504 240.768 114.672 240.717 114.842C240.693 114.92 240.668 114.996 240.646 115.072C240.622 115.148 240.601 115.227 240.579 115.303C240.518 115.516 240.459 115.727 240.404 115.942C240.054 117.278 239.796 118.642 239.645 120.018C239.498 121.395 239.442 122.782 239.478 124.168C239.5 124.687 239.535 125.205 239.583 125.723C239.647 126.413 239.735 127.103 239.843 127.787C239.872 127.957 239.901 128.129 239.93 128.299C239.938 128.344 239.946 128.387 239.954 128.432C239.983 128.59 240.014 128.75 240.046 128.906C240.079 129.072 240.115 129.236 240.153 129.4C240.163 129.45 240.175 129.501 240.187 129.549C240.218 129.686 240.25 129.824 240.285 129.96C240.389 130.382 240.504 130.798 240.625 131.214C240.554 131.109 240.487 131.003 240.421 130.899C240.363 130.805 240.307 130.709 240.254 130.615C239.81 129.819 239.548 128.928 239.286 128.019C239.152 127.567 239.018 127.116 238.888 126.664C238.823 126.437 238.761 126.212 238.698 125.985C238.637 125.76 238.577 125.533 238.521 125.305C238.05 123.494 237.791 121.647 237.955 119.788C238.101 117.928 238.555 116.091 239.046 114.262C238.821 114.802 238.61 115.35 238.417 115.906C238.374 116.028 238.335 116.149 238.294 116.272C238.251 116.403 238.21 116.533 238.171 116.665C238.095 116.908 238.024 117.156 237.957 117.402C237.928 117.51 237.899 117.62 237.873 117.729C237.863 117.763 237.854 117.796 237.846 117.831C237.82 117.944 237.793 118.059 237.768 118.173C237.748 118.254 237.732 118.337 237.714 118.419C237.697 118.491 237.683 118.562 237.671 118.634C237.599 119.001 237.538 119.369 237.492 119.741C237.444 120.097 237.414 120.457 237.396 120.818C237.387 121.056 237.383 121.3 237.384 121.54C237.387 121.781 237.396 122.022 237.409 122.26C237.416 122.381 237.425 122.501 237.436 122.621C237.526 123.581 237.715 124.525 237.944 125.451C238.184 126.375 238.46 127.283 238.748 128.184C238.775 128.267 238.802 128.352 238.83 128.436C238.911 128.689 238.995 128.944 239.087 129.201C239.148 129.37 239.212 129.539 239.279 129.708C239.325 129.821 239.372 129.932 239.423 130.042C239.548 130.319 239.69 130.589 239.854 130.849C240.184 131.376 240.566 131.847 240.965 132.298C240.968 132.307 240.971 132.317 240.975 132.326C241.865 134.969 243.194 137.399 244.551 139.749C245.24 140.919 245.925 142.083 246.638 143.246C247.354 144.407 248.093 145.562 248.918 146.665C249.737 147.769 250.625 148.831 251.612 149.805C252.101 150.295 252.623 150.752 253.165 151.188C253.431 151.409 253.72 151.604 253.997 151.813C254.065 151.866 254.14 151.911 254.211 151.959C254.285 152.008 254.357 152.056 254.443 152.082C254.473 152.092 254.505 152.101 254.539 152.107C254.551 152.111 254.563 152.113 254.577 152.114C254.635 152.123 254.697 152.126 254.767 152.12C254.786 152.119 254.804 152.116 254.821 152.114C254.826 152.113 254.83 152.113 254.835 152.112C254.812 152.176 254.788 152.242 254.762 152.304C254.746 152.343 254.731 152.382 254.713 152.42C254.7 152.451 254.685 152.484 254.67 152.515C254.654 152.549 254.637 152.584 254.619 152.617C254.603 152.654 254.585 152.688 254.567 152.721C254.55 152.722 254.533 152.72 254.518 152.721C254.532 152.722 254.549 152.724 254.566 152.723C254.531 152.787 254.496 152.851 254.458 152.912C254.393 153.02 254.326 153.124 254.25 153.227C254.222 153.272 254.19 153.315 254.156 153.357C254.14 153.379 254.123 153.4 254.105 153.421C254.066 153.473 254.025 153.524 253.981 153.572C253.976 153.581 253.969 153.587 253.96 153.594C253.913 153.652 253.863 153.706 253.81 153.761C253.79 153.782 253.77 153.802 253.748 153.822C253.708 153.865 253.664 153.909 253.618 153.95C253.598 153.97 253.574 153.991 253.55 154.011C253.508 154.053 253.463 154.092 253.414 154.13C253.397 154.147 253.38 154.162 253.359 154.178C253.305 154.225 253.25 154.269 253.193 154.313C253.135 154.356 253.079 154.397 253.02 154.44C253.051 154.466 253.082 154.491 253.116 154.516C253.123 154.52 253.129 154.525 253.136 154.529C253.17 154.554 253.204 154.578 253.241 154.599C253.287 154.63 253.336 154.658 253.388 154.684C253.413 154.699 253.438 154.712 253.463 154.723C253.47 154.727 253.476 154.729 253.484 154.732C253.515 154.749 253.551 154.763 253.585 154.78L253.602 154.785C253.655 154.808 253.711 154.83 253.766 154.849C253.82 154.867 253.877 154.885 253.933 154.9C254.021 154.927 254.111 154.947 254.201 154.966C254.205 154.965 254.207 154.966 254.211 154.967C254.306 154.985 254.402 155 254.497 155.01C254.764 155.037 255.028 155.035 255.266 155.003C255.306 154.997 255.342 154.991 255.381 154.983C255.423 154.977 255.464 154.966 255.506 154.957C255.538 154.949 255.568 154.941 255.598 154.932C255.629 154.924 255.66 154.914 255.689 154.903C255.698 154.899 255.708 154.896 255.717 154.893C255.752 154.88 255.784 154.866 255.816 154.852C255.848 154.838 255.882 154.82 255.913 154.803C255.926 154.797 255.938 154.791 255.949 154.784C255.976 154.768 256 154.753 256.025 154.737C256.036 154.728 256.047 154.721 256.057 154.712C256.067 154.705 256.076 154.699 256.084 154.692C256.116 154.669 256.146 154.643 256.174 154.617C256.176 154.616 256.178 154.617 256.179 154.615C256.212 154.586 256.242 154.555 256.272 154.523C256.332 154.459 256.385 154.391 256.428 154.32C256.451 154.286 256.471 154.251 256.49 154.215L256.492 154.21C256.506 154.183 256.519 154.156 256.531 154.128C256.544 154.101 256.555 154.076 256.565 154.047C256.574 154.029 256.582 154.011 256.589 153.992L256.592 153.981C256.613 153.927 256.63 153.872 256.645 153.816C256.648 153.808 256.651 153.801 256.652 153.791C256.667 153.735 256.681 153.676 256.694 153.62C256.696 153.61 256.698 153.602 256.699 153.594C256.719 153.494 256.736 153.39 256.749 153.287L256.749 153.285C256.756 153.248 256.761 153.209 256.764 153.17C256.769 153.132 256.772 153.093 256.777 153.054L256.777 153.053C256.779 153.036 256.781 153.018 256.782 153.002C256.783 152.975 256.785 152.946 256.787 152.917C256.835 152.954 256.885 152.993 256.935 153.029C256.987 153.068 257.039 153.107 257.091 153.146C257.097 153.151 257.102 153.155 257.109 153.159C257.175 153.207 257.242 153.258 257.307 153.304C257.317 153.312 257.329 153.32 257.339 153.328L257.602 153.486C257.818 153.616 258.039 153.745 258.261 153.871C258.284 153.883 258.305 153.896 258.328 153.909C258.333 153.912 258.338 153.916 258.345 153.919C258.453 153.979 258.56 154.04 258.668 154.098C258.849 154.197 259.037 154.273 259.225 154.357L259.79 154.601C259.98 154.678 260.165 154.765 260.358 154.834L261.518 155.236C261.712 155.303 261.905 155.37 262.103 155.42L263.286 155.748C263.472 155.798 263.655 155.838 263.842 155.878C263.936 155.898 264.028 155.917 264.122 155.937C264.215 155.956 264.307 155.976 264.401 155.996C264.429 156.001 264.456 156.008 264.483 156.014L265.083 156.137L265.689 156.23C266.093 156.285 266.496 156.358 266.901 156.404L268.118 156.518L268.425 156.547L268.729 156.56L269.339 156.583C269.746 156.598 270.153 156.621 270.56 156.609L271.781 156.596C272.187 156.579 272.593 156.551 272.998 156.525C273.201 156.511 273.405 156.504 273.606 156.486L273.768 156.468L274.212 156.42C274.615 156.374 275.021 156.345 275.422 156.283L275.716 156.238L276.625 156.1C277.026 156.041 277.421 155.947 277.82 155.874C279.412 155.552 280.978 155.166 282.531 154.643C283.336 154.373 284.138 154.053 284.917 153.678L284.919 153.679C285.06 153.648 285.199 153.618 285.339 153.585C285.35 153.582 285.362 153.58 285.373 153.578C285.509 153.545 285.644 153.512 285.779 153.476C285.883 153.451 285.985 153.423 286.088 153.392C286.246 153.35 286.403 153.303 286.561 153.255C286.66 153.226 286.76 153.193 286.859 153.16C286.875 153.157 286.89 153.152 286.904 153.146C287.002 153.114 287.097 153.082 287.193 153.048C287.305 153.009 287.416 152.969 287.527 152.928C287.527 152.928 287.529 152.929 287.53 152.927C287.548 152.921 287.568 152.913 287.588 152.905C287.713 152.86 287.835 152.812 287.957 152.762C288.07 152.716 288.183 152.669 288.296 152.622C288.362 152.597 288.429 152.567 288.496 152.538C288.761 152.425 289.021 152.307 289.279 152.184C289.408 152.121 289.537 152.058 289.665 151.993C289.921 151.863 290.172 151.727 290.422 151.584C291.79 150.803 293.064 149.85 294.215 148.771C295.042 147.973 295.803 147.108 296.487 146.187C297.156 145.254 297.751 144.279 298.313 143.296C298.455 143.051 298.595 142.806 298.735 142.56C298.877 142.315 299.017 142.068 299.155 141.821C299.295 141.575 299.436 141.329 299.574 141.082C299.712 140.835 299.851 140.588 299.989 140.341C300.127 140.095 300.264 139.847 300.401 139.598C300.485 139.447 300.567 139.295 300.651 139.145C300.761 138.941 300.872 138.737 300.983 138.532C301.107 138.303 301.231 138.074 301.352 137.845C301.441 137.681 301.528 137.52 301.615 137.356C301.361 137.73 301.109 138.104 300.861 138.479C300.747 138.65 300.633 138.821 300.52 138.995C300.413 139.156 300.307 139.317 300.202 139.478C300.046 139.715 299.892 139.952 299.738 140.191C299.584 140.429 299.432 140.667 299.278 140.904C299.076 141.219 298.875 141.537 298.675 141.853C298.42 142.253 298.168 142.654 297.915 143.055C297.838 143.174 297.763 143.293 297.688 143.413C297.461 143.77 297.234 144.125 297 144.478C296.691 144.946 296.373 145.406 296.034 145.851C295.694 146.293 295.339 146.724 294.968 147.138C294.784 147.346 294.593 147.55 294.4 147.75C294.206 147.95 294.007 148.147 293.806 148.338C293.724 148.417 293.642 148.496 293.558 148.572C293.499 148.628 293.442 148.682 293.383 148.733C293.246 148.858 293.106 148.978 292.965 149.098C292.906 149.149 292.846 149.198 292.787 149.247C292.436 149.538 292.076 149.815 291.707 150.083C291.541 150.205 291.374 150.323 291.205 150.44C291.049 150.542 290.897 150.651 290.742 150.755C290.739 150.756 290.738 150.758 290.736 150.76C290.662 150.81 290.586 150.857 290.509 150.904L289.792 151.338C289.669 151.405 289.547 151.472 289.425 151.539C289.178 151.673 288.934 151.807 288.684 151.933C288.559 151.995 288.434 152.058 288.307 152.116C288.137 152.199 287.969 152.277 287.797 152.352C287.672 152.408 287.548 152.462 287.423 152.513C287.358 152.543 287.292 152.571 287.226 152.597C287.105 152.647 286.983 152.696 286.859 152.743C286.781 152.775 286.701 152.804 286.621 152.835C286.494 152.884 286.366 152.93 286.237 152.976C286.351 152.908 286.466 152.84 286.578 152.77C286.719 152.686 286.857 152.597 286.994 152.506C287.139 152.408 287.283 152.311 287.427 152.211C287.621 152.076 287.812 151.936 288.003 151.794C288.142 151.69 288.278 151.584 288.414 151.477C288.439 151.459 288.465 151.438 288.491 151.418C288.61 151.324 288.727 151.23 288.843 151.133C289.485 150.606 290.099 150.05 290.69 149.48C290.719 149.452 290.747 149.426 290.776 149.398C290.958 149.219 291.14 149.04 291.318 148.86C291.465 148.715 291.609 148.567 291.753 148.418C291.763 148.409 291.772 148.4 291.782 148.39C291.92 148.247 292.061 148.102 292.198 147.955C292.362 147.785 292.523 147.613 292.684 147.439C292.816 147.295 292.949 147.15 293.081 147.006C293.108 146.977 293.135 146.947 293.161 146.916C293.304 146.759 293.445 146.601 293.582 146.44C293.73 146.275 293.875 146.106 294.02 145.937C294.02 145.935 294.023 145.934 294.024 145.932C294.158 145.774 294.291 145.616 294.422 145.457C294.492 145.376 294.561 145.292 294.628 145.209C294.767 145.04 294.904 144.87 295.038 144.7C295.127 144.589 295.214 144.479 295.301 144.368C295.415 144.222 295.529 144.074 295.642 143.925C295.696 143.856 295.75 143.786 295.801 143.716C296.215 143.166 296.616 142.606 297.004 142.035C297.42 141.417 297.819 140.788 298.199 140.147C298.301 139.976 298.401 139.803 298.502 139.629C298.551 139.54 298.6 139.454 298.65 139.366C298.699 139.278 298.747 139.189 298.794 139.103C298.817 139.06 298.839 139.019 298.863 138.977C298.931 138.853 298.998 138.727 299.064 138.602C299.159 138.566 299.253 138.525 299.347 138.483C299.355 138.48 299.365 138.477 299.372 138.473C299.632 138.356 299.885 138.226 300.13 138.079C300.135 138.076 300.141 138.072 300.146 138.069C300.245 138.009 300.342 137.948 300.439 137.882C300.442 137.879 300.448 137.875 300.453 137.873C300.554 137.804 300.652 137.735 300.749 137.662C301.552 137.079 302.226 136.325 302.76 135.482C302.825 135.376 302.888 135.267 302.946 135.159C303.037 134.994 303.122 134.828 303.2 134.657C303.28 134.489 303.354 134.317 303.421 134.142C303.47 134.007 303.516 133.874 303.561 133.739C303.581 133.675 303.601 133.61 303.621 133.547L303.613 133.556ZM284.583 127.581C284.693 127.526 284.802 127.471 284.908 127.413C285.003 127.364 285.097 127.314 285.19 127.263C285.204 127.255 285.216 127.249 285.23 127.241C285.336 127.183 285.441 127.124 285.544 127.063C285.565 127.052 285.585 127.042 285.604 127.029C285.701 126.974 285.798 126.915 285.891 126.857C285.903 126.853 285.912 126.846 285.921 126.84C285.934 126.832 285.948 126.822 285.963 126.815L285.964 126.813C286.009 126.786 286.051 126.761 286.094 126.734C286.188 126.676 286.282 126.618 286.375 126.558C286.513 126.47 286.646 126.382 286.781 126.292C287.052 126.106 287.316 125.913 287.577 125.715C287.646 125.663 287.714 125.613 287.78 125.56C287.792 125.549 287.806 125.541 287.818 125.531L287.818 125.529C287.942 125.433 288.068 125.333 288.189 125.232C288.315 125.13 288.439 125.026 288.562 124.921C288.571 124.914 288.58 124.904 288.589 124.897C288.601 124.888 288.613 124.878 288.622 124.868C288.625 124.867 288.625 124.865 288.628 124.864C288.643 124.85 288.658 124.838 288.675 124.825L288.676 124.824C288.694 124.807 288.715 124.789 288.734 124.772C288.77 124.74 288.806 124.709 288.843 124.675C288.849 124.671 288.854 124.668 288.858 124.663C288.86 124.662 288.861 124.661 288.861 124.66C288.867 124.656 288.87 124.653 288.874 124.648C288.883 124.638 288.892 124.633 288.903 124.624L288.904 124.622C288.91 124.616 288.918 124.612 288.924 124.606C288.983 124.553 289.044 124.498 289.102 124.444C289.176 124.377 289.251 124.308 289.325 124.24C289.434 124.138 289.542 124.035 289.645 123.931C289.742 123.839 289.835 123.747 289.927 123.652C290.197 123.38 290.46 123.1 290.715 122.813C290.804 122.716 290.891 122.616 290.979 122.515C291.034 122.452 291.089 122.387 291.145 122.322C291.206 122.249 291.268 122.175 291.329 122.102C291.335 122.096 291.342 122.088 291.347 122.079C291.395 122.022 291.442 121.964 291.489 121.907C291.49 121.905 291.493 121.902 291.494 121.9C291.505 121.885 291.517 121.87 291.528 121.855C291.542 121.841 291.553 121.826 291.565 121.811C291.571 121.805 291.578 121.796 291.583 121.788C291.59 121.781 291.597 121.773 291.601 121.766C291.604 121.763 291.608 121.76 291.61 121.755C291.744 121.586 291.876 121.417 292.005 121.245C292.09 121.135 292.172 121.025 292.254 120.912C292.334 120.801 292.416 120.688 292.495 120.575C292.611 120.41 292.726 120.244 292.839 120.076C292.89 120.002 292.939 119.926 292.989 119.851C293.132 119.633 293.274 119.412 293.41 119.188C293.546 118.962 293.676 118.731 293.804 118.497C293.781 118.824 293.752 119.151 293.719 119.476C293.704 119.627 293.688 119.779 293.671 119.93C293.661 120.025 293.65 120.118 293.639 120.211C293.638 120.234 293.634 120.256 293.631 120.278C293.625 120.337 293.618 120.394 293.61 120.452C293.608 120.477 293.606 120.501 293.602 120.525C293.596 120.578 293.588 120.632 293.58 120.684C293.546 120.954 293.509 121.224 293.466 121.493C293.447 121.628 293.425 121.763 293.402 121.897C293.36 122.166 293.311 122.434 293.261 122.7C293.237 122.835 293.21 122.969 293.182 123.103C293.155 123.235 293.128 123.368 293.099 123.501C293.084 123.574 293.07 123.645 293.054 123.717C293.045 123.754 293.038 123.792 293.03 123.829C293.027 123.841 293.024 123.852 293.022 123.864C293.009 123.925 292.994 123.985 292.98 124.046C292.938 124.246 292.891 124.447 292.841 124.646C292.794 124.847 292.745 125.045 292.693 125.244C292.644 125.432 292.596 125.621 292.544 125.807C292.534 125.84 292.525 125.873 292.516 125.905C292.484 126.021 292.452 126.138 292.419 126.253C292.402 126.314 292.386 126.372 292.365 126.432C292.362 126.44 292.362 126.448 292.359 126.456L292.358 126.457C292.339 126.525 292.321 126.59 292.299 126.658C292.289 126.693 292.279 126.727 292.27 126.762L292.213 126.944C292.184 127.04 292.155 127.135 292.124 127.231C292.118 127.248 292.113 127.268 292.107 127.285L292.092 127.33C292.081 127.366 292.07 127.405 292.057 127.44L292.057 127.442C292.046 127.481 292.034 127.514 292.021 127.552C291.996 127.63 291.969 127.707 291.944 127.785C291.926 127.839 291.908 127.896 291.889 127.951C291.811 128.181 291.732 128.41 291.65 128.639L291.648 128.644C291.596 128.789 291.544 128.934 291.49 129.078C291.428 129.249 291.363 129.417 291.298 129.587L291.286 129.623C291.22 129.789 291.154 129.956 291.087 130.122C291.103 130.06 291.12 129.999 291.135 129.937C291.145 129.896 291.154 129.857 291.164 129.816L291.165 129.812C291.292 129.3 291.402 128.784 291.493 128.266C291.457 128.38 291.42 128.494 291.383 128.607C291.221 129.109 291.049 129.608 290.863 130.101C290.53 130.993 290.16 131.867 289.749 132.718C289.747 132.722 289.744 132.725 289.743 132.729C289.732 132.755 289.718 132.782 289.705 132.807C289.639 132.944 289.57 133.08 289.5 133.216C289.49 133.238 289.481 133.258 289.47 133.279C289.456 133.308 289.441 133.337 289.425 133.365C289.354 133.504 289.282 133.644 289.207 133.78C289.14 133.908 289.07 134.036 289 134.161C288.971 134.214 288.942 134.267 288.911 134.318C288.85 134.429 288.787 134.538 288.721 134.648C288.682 134.716 288.642 134.785 288.6 134.852C288.522 134.985 288.441 135.115 288.359 135.247C288.266 135.395 288.168 135.544 288.07 135.692C287.973 135.839 287.876 135.985 287.775 136.131C287.768 136.143 287.76 136.153 287.752 136.165C287.743 136.179 287.734 136.193 287.726 136.204C287.71 136.224 287.698 136.243 287.684 136.264C287.702 136.226 287.72 136.19 287.736 136.151C287.744 136.133 287.752 136.117 287.76 136.098C287.764 136.093 287.766 136.088 287.769 136.08L287.77 136.078C287.774 136.072 287.779 136.065 287.782 136.055C287.795 136.028 287.807 136.001 287.821 135.974C287.849 135.91 287.88 135.845 287.909 135.781C287.943 135.704 287.977 135.627 288.008 135.55C288.037 135.482 288.065 135.414 288.093 135.346C288.108 135.309 288.123 135.272 288.137 135.237C288.185 135.118 288.231 134.998 288.274 134.878C288.28 134.867 288.284 134.858 288.287 134.846C288.288 134.845 288.291 134.841 288.292 134.84C288.293 134.836 288.293 134.831 288.293 134.829C288.375 134.612 288.451 134.393 288.525 134.173C288.566 134.054 288.606 133.934 288.645 133.814L288.65 133.801C288.67 133.737 288.689 133.676 288.71 133.611C288.789 133.344 288.865 133.077 288.937 132.81C288.969 132.694 288.999 132.581 289.028 132.467C289.084 132.25 289.138 132.035 289.187 131.82C289.219 131.692 289.249 131.564 289.277 131.434C289.434 130.695 289.589 129.957 289.713 129.216C289.976 127.738 290.21 126.253 290.367 124.75C290.247 125.109 290.131 125.469 290.021 125.828C289.981 125.954 289.945 126.076 289.908 126.2C289.838 126.435 289.769 126.67 289.7 126.905C289.633 127.141 289.564 127.376 289.499 127.612C289.44 127.823 289.384 128.034 289.328 128.246C289.252 128.525 289.178 128.805 289.107 129.083C288.91 129.809 288.742 130.536 288.545 131.256C288.36 131.977 288.168 132.696 287.945 133.4C287.925 133.463 287.907 133.528 287.885 133.59C287.85 133.711 287.813 133.829 287.774 133.948L287.766 133.97C287.716 134.126 287.665 134.281 287.612 134.433C287.54 134.641 287.463 134.849 287.385 135.056L287.385 135.058C287.305 135.27 287.221 135.481 287.136 135.69C287.103 135.773 287.069 135.854 287.034 135.936C287 136.015 286.966 136.096 286.93 136.174C286.909 136.222 286.889 136.267 286.869 136.315L286.868 136.317C286.833 136.393 286.799 136.468 286.764 136.544C286.691 136.706 286.615 136.865 286.537 137.023C286.46 137.184 286.38 137.342 286.298 137.499C286.099 137.878 285.89 138.255 285.67 138.625C285.597 138.749 285.523 138.871 285.447 138.994C285.283 139.162 285.115 139.33 284.946 139.492C284.607 139.819 284.256 140.133 283.893 140.431C283.867 140.453 283.84 140.476 283.812 140.495C283.656 140.623 283.499 140.747 283.339 140.869C283.06 141.09 282.773 141.3 282.478 141.501C282.416 141.545 282.353 141.586 282.288 141.627L282.288 141.629C282.271 141.64 282.257 141.65 282.241 141.659C282.093 141.759 281.942 141.854 281.791 141.949C281.621 142.057 281.448 142.163 281.273 142.265C281.191 142.312 281.11 142.36 281.028 142.407C281.028 142.407 281.027 142.408 281.025 142.411C280.92 142.469 280.815 142.528 280.711 142.586C280.617 142.638 280.522 142.689 280.428 142.74C280.334 142.792 280.239 142.843 280.143 142.894C280.026 142.957 279.908 143.019 279.787 143.078C279.763 143.091 279.737 143.105 279.712 143.117C279.687 143.13 279.661 143.144 279.635 143.156C279.596 143.178 279.555 143.198 279.51 143.218C279.508 143.219 279.505 143.221 279.505 143.223C279.492 143.229 279.479 143.237 279.464 143.242C279.387 143.281 279.311 143.32 279.233 143.356C279.23 143.357 279.23 143.359 279.227 143.36C279.159 143.393 279.088 143.428 279.017 143.46C278.661 143.632 278.3 143.797 277.939 143.958C277.767 144.036 277.594 144.11 277.422 144.186L277.417 144.188C277.258 144.257 277.097 144.328 276.938 144.397C277.287 144.151 277.625 143.892 277.954 143.618C278.078 143.515 278.199 143.41 278.32 143.302C278.356 143.273 278.389 143.242 278.423 143.212C278.442 143.193 278.463 143.175 278.483 143.154C278.522 143.122 278.557 143.087 278.592 143.053L278.597 143.051C278.612 143.037 278.626 143.023 278.641 143.009C278.73 142.928 278.818 142.845 278.903 142.759C279.039 142.627 279.17 142.493 279.3 142.355C279.316 142.337 279.333 142.32 279.35 142.301C279.416 142.233 279.481 142.161 279.543 142.09C279.555 142.079 279.566 142.066 279.576 142.055C279.59 142.041 279.601 142.028 279.614 142.013L279.615 142.011C279.742 141.87 279.865 141.728 279.987 141.582L279.988 141.58C279.997 141.573 280.004 141.563 280.011 141.555C280.073 141.479 280.135 141.404 280.198 141.327C280.232 141.284 280.266 141.241 280.3 141.198C280.3 141.196 280.303 141.195 280.303 141.193C280.357 141.125 280.41 141.057 280.461 140.987C280.837 140.493 281.186 139.978 281.516 139.457C281.913 138.807 282.285 138.146 282.635 137.477C282.975 136.801 283.313 136.128 283.622 135.444C283.747 135.175 283.87 134.906 283.992 134.637C284.109 134.38 284.225 134.126 284.337 133.868C284.344 133.855 284.349 133.84 284.355 133.828L284.357 133.822C284.363 133.811 284.368 133.796 284.374 133.786L284.375 133.782C284.495 133.51 284.614 133.235 284.73 132.961C284.846 132.686 284.958 132.411 285.071 132.134C285.086 132.099 285.1 132.062 285.115 132.027L285.117 132.019C285.181 131.86 285.245 131.699 285.305 131.539C285.338 131.457 285.369 131.378 285.4 131.296C285.329 131.402 285.261 131.509 285.192 131.615L285.191 131.617C285.173 131.645 285.156 131.67 285.14 131.699C285.02 131.88 284.904 132.063 284.789 132.249C284.775 132.27 284.761 132.292 284.748 132.313L284.747 132.315C284.741 132.325 284.734 132.335 284.728 132.346C284.654 132.461 284.582 132.577 284.512 132.694L284.512 132.696C284.497 132.719 284.483 132.741 284.469 132.764C284.376 132.917 284.284 133.068 284.192 133.222C283.807 133.863 283.434 134.509 283.069 135.16C282.694 135.811 282.346 136.474 281.972 137.117C281.79 137.441 281.606 137.765 281.418 138.087C281.232 138.406 281.039 138.723 280.841 139.035C280.784 139.127 280.726 139.219 280.669 139.311C280.617 139.396 280.563 139.478 280.508 139.562C280.504 139.569 280.499 139.576 280.495 139.583C280.491 139.588 280.489 139.593 280.485 139.598C280.301 139.88 280.114 140.159 279.92 140.433L279.919 140.436C279.913 140.443 279.908 140.449 279.904 140.456C279.825 140.568 279.744 140.679 279.662 140.789C279.565 140.922 279.467 141.052 279.368 141.18C279.346 141.207 279.326 141.233 279.304 141.261C279.235 141.351 279.163 141.442 279.09 141.531C278.806 141.889 278.509 142.237 278.199 142.576C278.182 142.595 278.162 142.616 278.145 142.635L278.142 142.636C278.041 142.747 277.938 142.856 277.834 142.965C277.791 143.011 277.745 143.059 277.7 143.104C277.621 143.185 277.543 143.265 277.463 143.344C277.231 143.575 276.994 143.803 276.752 144.027C276.635 144.133 276.518 144.24 276.4 144.345C276.385 144.358 276.367 144.373 276.351 144.387C276.295 144.439 276.236 144.49 276.176 144.541C276.043 144.657 275.908 144.772 275.771 144.887C275.754 144.894 275.739 144.901 275.722 144.908C275.712 144.913 275.701 144.915 275.69 144.92C275.546 144.978 275.406 145.037 275.261 145.096C275.253 145.099 275.247 145.101 275.239 145.105C275.124 145.149 275.01 145.198 274.896 145.245C274.301 145.489 273.708 145.741 273.113 145.964C272.986 146.013 272.858 146.059 272.731 146.105C272.611 146.148 272.49 146.188 272.37 146.224C272.318 146.24 272.268 146.258 272.216 146.272C272.129 146.298 272.042 146.325 271.954 146.348C271.952 146.349 271.951 146.351 271.949 146.35C271.849 146.378 271.749 146.405 271.648 146.429C271.77 146.34 271.889 146.251 272.009 146.16C272.168 146.041 272.325 145.916 272.481 145.789C272.481 145.789 272.481 145.787 272.483 145.788C272.544 145.739 272.607 145.691 272.666 145.642C272.728 145.592 272.792 145.543 272.851 145.493C272.913 145.443 272.972 145.394 273.032 145.343C273.304 145.118 273.571 144.886 273.839 144.654L273.842 144.653C273.857 144.64 273.872 144.628 273.887 144.614C274.056 144.46 274.225 144.304 274.394 144.149C274.563 143.995 274.731 143.839 274.895 143.681C275.005 143.575 275.114 143.468 275.221 143.36C275.388 143.194 275.553 143.03 275.714 142.861C275.878 142.694 276.04 142.525 276.197 142.354C276.256 142.295 276.312 142.232 276.368 142.172C276.379 142.158 276.389 142.147 276.4 142.134C276.427 142.105 276.453 142.079 276.478 142.049C276.545 141.98 276.608 141.907 276.672 141.837C276.828 141.661 276.982 141.485 277.133 141.308C277.32 141.093 277.501 140.873 277.679 140.651C278.444 139.703 279.169 138.718 279.813 137.682C279.892 137.557 279.969 137.433 280.044 137.307C280.122 137.18 280.197 137.055 280.272 136.929C280.373 136.757 280.472 136.588 280.572 136.416L280.574 136.41C280.622 136.327 280.669 136.247 280.714 136.164C280.716 136.158 280.719 136.155 280.721 136.15C280.781 136.044 280.841 135.938 280.899 135.832C280.933 135.77 280.967 135.71 280.999 135.647C281.056 135.543 281.111 135.438 281.165 135.332C281.227 135.213 281.291 135.092 281.349 134.971C281.431 134.809 281.509 134.649 281.587 134.487C281.648 134.358 281.708 134.228 281.768 134.097C281.827 133.971 281.883 133.844 281.94 133.716L281.945 133.703C281.992 133.597 282.039 133.492 282.085 133.383L282.086 133.381C282.098 133.352 282.111 133.322 282.124 133.291C282.172 133.181 282.219 133.072 282.264 132.959C282.349 132.757 282.431 132.551 282.511 132.345C282.557 132.23 282.601 132.115 282.644 131.997L282.645 131.995C282.757 131.702 282.862 131.405 282.964 131.105C282.988 131.031 283.014 130.956 283.037 130.882C283.051 130.843 283.063 130.803 283.076 130.763C283.086 130.729 283.098 130.695 283.108 130.66C283.118 130.632 283.126 130.601 283.136 130.573C283.165 130.484 283.192 130.394 283.216 130.304C283.263 130.152 283.308 129.997 283.351 129.843C283.44 129.537 283.522 129.228 283.598 128.92C283.614 128.86 283.628 128.802 283.643 128.741L283.643 128.74C283.672 128.625 283.699 128.513 283.726 128.398C283.759 128.266 283.788 128.133 283.819 128C283.819 127.996 283.82 127.992 283.821 127.988C283.838 127.916 283.854 127.846 283.871 127.774L283.926 127.894C284.15 127.795 284.369 127.692 284.586 127.582L284.583 127.581ZM257.225 151.018C257.15 151.029 257.077 151.04 257.001 151.051C256.926 151.061 256.853 151.072 256.779 151.082C256.74 151.087 256.699 151.094 256.658 151.097C256.634 151.101 256.609 151.105 256.585 151.107C256.545 151.115 256.503 151.119 256.461 151.124C256.404 151.131 256.345 151.138 256.285 151.145C256.272 151.147 256.261 151.149 256.248 151.151L256.176 151.157C256.174 151.158 256.172 151.158 256.171 151.158C256.171 151.158 256.169 151.159 256.167 151.159L256.028 151.176C255.948 151.03 255.871 150.881 255.797 150.731C255.794 150.728 255.79 150.72 255.788 150.715C255.713 150.565 255.642 150.414 255.57 150.261L255.571 150.259C255.551 150.219 255.534 150.177 255.514 150.136C255.481 150.057 255.445 149.977 255.412 149.898L255.41 149.896C255.318 149.676 255.232 149.457 255.15 149.232C255.14 149.206 255.131 149.182 255.122 149.155C255.077 149.034 255.035 148.912 254.995 148.791C254.956 148.674 254.918 148.558 254.881 148.44C254.807 148.205 254.738 147.967 254.675 147.728C254.653 147.647 254.633 147.566 254.613 147.483C254.584 147.372 254.557 147.261 254.532 147.15C254.503 147.026 254.476 146.903 254.452 146.781C254.391 146.493 254.34 146.205 254.293 145.915C254.29 145.899 254.287 145.881 254.286 145.866C254.272 145.786 254.26 145.705 254.25 145.624C254.235 145.528 254.222 145.431 254.211 145.335L254.209 145.322C254.207 145.306 254.205 145.293 254.204 145.278C254.199 145.238 254.193 145.198 254.188 145.159C254.365 144.99 254.542 144.824 254.72 144.663C254.743 144.641 254.767 144.62 254.79 144.6L254.791 144.598C254.816 144.575 254.841 144.552 254.865 144.531C254.942 144.461 255.02 144.393 255.098 144.326C255.175 144.256 255.254 144.188 255.334 144.121L255.334 144.12C255.481 143.993 255.63 143.87 255.781 143.75C255.802 143.732 255.824 143.714 255.845 143.696C255.871 143.676 255.896 143.655 255.922 143.634C255.997 143.574 256.073 143.514 256.149 143.454C256.238 143.386 256.327 143.318 256.415 143.252C256.436 143.234 256.458 143.218 256.481 143.201C256.524 143.167 256.568 143.134 256.613 143.101C256.93 142.866 257.253 142.638 257.58 142.419L257.58 142.417C257.585 142.417 257.587 142.415 257.591 142.412C257.626 142.389 257.664 142.364 257.7 142.341C257.725 142.324 257.749 142.307 257.778 142.292C257.781 142.289 257.782 142.287 257.784 142.285C257.834 142.252 257.885 142.219 257.939 142.187C257.958 142.175 257.977 142.162 257.996 142.15C258.106 142.076 258.219 142.006 258.335 141.937C258.352 141.924 258.37 141.914 258.389 141.903C258.422 141.881 258.456 141.861 258.488 141.841C258.617 141.761 258.748 141.682 258.879 141.606C258.994 141.538 259.107 141.472 259.226 141.408C259.242 141.399 259.26 141.388 259.276 141.379L259.277 141.377C259.389 141.315 259.496 141.255 259.606 141.192C259.762 141.105 259.919 141.019 260.078 140.931C260.216 140.854 260.357 140.777 260.497 140.699C260.419 140.706 260.34 140.714 260.261 140.725C260.219 140.729 260.178 140.734 260.137 140.741C260.063 140.749 259.991 140.762 259.917 140.774C259.863 140.785 259.808 140.795 259.754 140.806C259.671 140.82 259.589 140.839 259.508 140.858C259.467 140.867 259.428 140.876 259.388 140.888C259.359 140.894 259.33 140.904 259.301 140.91C259.284 140.915 259.268 140.92 259.251 140.925C259.151 140.951 259.051 140.98 258.954 141.011C258.905 141.026 258.857 141.043 258.809 141.058L258.807 141.059C258.678 141.101 258.553 141.146 258.429 141.196C258.414 141.201 258.4 141.207 258.385 141.212C258.324 141.235 258.264 141.258 258.204 141.284C258.167 141.299 258.132 141.314 258.098 141.33C258.08 141.338 258.06 141.346 258.043 141.355L258.041 141.354C257.482 141.598 256.947 141.895 256.446 142.242L256.445 142.244C256.393 142.278 256.341 142.315 256.29 142.352L256.137 142.463C256.115 142.479 256.095 142.495 256.072 142.512C255.992 142.573 255.913 142.637 255.832 142.699C255.812 142.713 255.795 142.728 255.777 142.743C255.733 142.778 255.691 142.814 255.649 142.85C255.605 142.886 255.563 142.922 255.523 142.958C255.439 143.03 255.356 143.105 255.275 143.182L255.274 143.184C255.252 143.205 255.227 143.227 255.207 143.249C255.136 143.315 255.068 143.382 255 143.451C254.91 143.54 254.824 143.632 254.738 143.726L254.737 143.728C254.681 143.789 254.626 143.85 254.572 143.913C254.517 143.974 254.463 144.038 254.412 144.101C254.31 144.224 254.216 144.349 254.121 144.479C254.079 143.954 254.059 143.429 254.06 142.905C254.061 142.659 254.066 142.414 254.076 142.172C254.082 142.077 254.087 141.982 254.093 141.887C254.098 141.775 254.106 141.662 254.117 141.55C254.123 141.478 254.128 141.408 254.136 141.337C254.138 141.313 254.14 141.288 254.142 141.264C254.155 141.15 254.166 141.036 254.18 140.923C254.19 140.848 254.198 140.775 254.209 140.701C254.23 140.536 254.255 140.374 254.285 140.21C254.289 140.186 254.293 140.16 254.297 140.136C254.303 140.096 254.312 140.059 254.318 140.021C254.325 139.983 254.334 139.946 254.341 139.907C254.343 139.895 254.347 139.883 254.349 139.871C254.368 139.787 254.385 139.702 254.402 139.616C254.466 139.304 254.528 138.99 254.592 138.677C254.654 138.372 254.72 138.066 254.79 137.762C254.815 137.659 254.839 137.558 254.864 137.455C254.867 137.442 254.872 137.427 254.875 137.413C254.888 137.356 254.904 137.298 254.919 137.243C254.925 137.219 254.931 137.198 254.938 137.175C254.964 137.083 254.988 136.988 255.016 136.897C255.036 136.828 255.055 136.761 255.073 136.691C255.091 136.62 255.109 136.55 255.129 136.479L255.13 136.477C255.136 136.446 255.145 136.415 255.154 136.384C255.168 136.324 255.184 136.266 255.199 136.206C255.431 136.017 255.666 135.831 255.903 135.652C255.908 135.648 255.915 135.642 255.922 135.638C256.002 135.577 256.082 135.516 256.164 135.457C256.212 135.422 256.258 135.388 256.305 135.354C256.339 135.33 256.373 135.303 256.407 135.279C256.508 135.207 256.609 135.134 256.713 135.065C256.894 134.938 257.077 134.815 257.264 134.696C257.272 134.691 257.28 134.687 257.288 134.681C257.293 134.679 257.296 134.676 257.302 134.673C257.442 134.585 257.581 134.499 257.722 134.415C257.74 134.404 257.759 134.394 257.775 134.383C257.783 134.379 257.788 134.376 257.793 134.372C258.119 134.18 258.449 133.995 258.782 133.822C258.941 133.74 259.099 133.66 259.259 133.583C259.361 133.532 259.464 133.483 259.566 133.437C259.77 133.343 259.973 133.254 260.178 133.167C260.324 133.106 260.469 133.046 260.617 132.99C260.724 132.948 260.832 132.905 260.939 132.869C260.978 132.853 261.017 132.839 261.055 132.825C261.089 132.813 261.123 132.8 261.156 132.788C261.313 132.733 261.47 132.678 261.627 132.627C261.7 132.604 261.772 132.58 261.843 132.559C261.95 132.524 262.056 132.491 262.163 132.461C262.184 132.454 262.208 132.447 262.231 132.44C262.253 132.433 262.276 132.426 262.298 132.419C262.321 132.412 262.344 132.406 262.37 132.398C262.485 132.366 262.599 132.334 262.714 132.304C262.769 132.287 262.824 132.275 262.879 132.26C263.023 132.224 263.168 132.187 263.312 132.154C263.575 132.093 263.839 132.037 264.106 131.989C264.209 131.967 264.312 131.948 264.416 131.934C264.47 131.923 264.526 131.913 264.582 131.905C264.687 131.887 264.796 131.87 264.903 131.854C265.119 131.821 265.333 131.792 265.55 131.767C265.659 131.752 265.768 131.739 265.877 131.729C266.082 131.705 266.286 131.685 266.492 131.668L266.495 131.667C266.477 131.718 266.461 131.771 266.443 131.822C266.439 131.833 266.435 131.846 266.433 131.858C266.395 131.967 266.361 132.078 266.325 132.187C266.304 132.252 266.283 132.314 266.265 132.377C266.245 132.442 266.223 132.504 266.206 132.568C266.182 132.642 266.158 132.716 266.136 132.792C266.107 132.881 266.084 132.968 266.058 133.055C266.016 133.194 265.975 133.336 265.934 133.478C265.924 133.512 265.914 133.547 265.905 133.579C265.895 133.614 265.885 133.649 265.878 133.684C265.868 133.71 265.862 133.735 265.855 133.762L265.851 133.772C265.844 133.805 265.834 133.839 265.825 133.872C265.81 133.928 265.795 133.982 265.782 134.038C265.739 134.199 265.697 134.361 265.658 134.522C265.614 134.699 265.57 134.875 265.529 135.053C265.501 135.171 265.472 135.29 265.446 135.409C265.413 135.545 265.383 135.682 265.354 135.819C265.314 135.995 265.276 136.171 265.24 136.349C265.199 136.541 265.159 136.733 265.122 136.927C265.098 137.045 265.076 137.162 265.053 137.278C265.02 137.452 264.987 137.626 264.956 137.799C264.886 138.185 264.819 138.572 264.756 138.959C264.748 139.013 264.739 139.065 264.732 139.119C264.705 139.285 264.679 139.45 264.654 139.619C264.632 139.757 264.611 139.894 264.592 140.033C264.584 140.088 264.577 140.14 264.568 140.194C264.518 140.539 264.471 140.882 264.427 141.228C264.347 141.853 264.267 142.48 264.199 143.107C264.134 143.736 264.054 144.356 264.015 145.004C263.981 145.648 263.987 146.309 264.124 146.965C264.133 147.006 264.141 147.049 264.152 147.091C264.218 147.375 264.318 147.656 264.453 147.92C264.472 147.956 264.491 147.992 264.512 148.029C264.53 148.06 264.548 148.094 264.569 148.125C264.575 148.137 264.584 148.149 264.591 148.159C264.593 148.164 264.598 148.17 264.6 148.175C264.63 148.222 264.661 148.266 264.694 148.311C264.73 148.361 264.766 148.41 264.804 148.457C264.833 148.494 264.863 148.53 264.895 148.564C264.945 148.622 264.998 148.676 265.051 148.728C264.994 148.755 264.937 148.779 264.88 148.804C264.845 148.819 264.808 148.835 264.773 148.849C264.681 148.891 264.589 148.93 264.496 148.968C264.484 148.974 264.474 148.979 264.462 148.983C263.795 149.266 263.115 149.525 262.432 149.76C261.321 150.131 260.193 150.45 259.05 150.693C258.705 150.765 258.359 150.833 258.013 150.894C258.011 150.895 258.006 150.896 258.005 150.895C257.863 150.92 257.72 150.944 257.578 150.966C257.459 150.986 257.339 151.004 257.222 151.02L257.225 151.018ZM258.484 152.436C258.439 152.443 258.395 152.449 258.35 152.457C258.33 152.448 258.309 152.44 258.287 152.431C258.184 152.388 258.081 152.346 257.976 152.304C258.116 152.281 258.259 152.256 258.401 152.232C258.444 152.223 258.486 152.217 258.529 152.209C258.648 152.187 258.767 152.167 258.885 152.142C258.909 152.14 258.931 152.135 258.954 152.131L259.24 152.072L259.242 152.072C259.278 152.066 259.312 152.059 259.346 152.051C259.794 151.954 260.24 151.848 260.684 151.728C260.837 151.686 260.989 151.644 261.14 151.602L261.142 151.603C261.15 151.599 261.159 151.596 261.168 151.595C261.743 151.43 262.313 151.251 262.881 151.058C263.101 150.982 263.318 150.904 263.536 150.821C263.703 150.759 263.868 150.697 264.036 150.631C264.087 150.612 264.136 150.591 264.187 150.571C264.231 150.555 264.275 150.538 264.319 150.52C264.498 150.449 264.676 150.376 264.852 150.302L264.857 150.3C264.894 150.283 264.933 150.267 264.971 150.251C265.568 149.997 266.158 149.725 266.738 149.436C266.894 149.359 267.047 149.28 267.199 149.202C267.353 149.122 267.505 149.041 267.658 148.959C267.805 148.879 267.951 148.799 268.099 148.718C268.1 148.716 268.102 148.715 268.102 148.715C268.105 148.714 268.107 148.712 268.11 148.711C268.26 148.626 268.409 148.541 268.559 148.454C268.636 148.409 268.715 148.365 268.792 148.318C268.871 148.271 268.948 148.226 269.025 148.179C269.181 148.088 269.334 147.994 269.487 147.897C269.618 147.818 269.748 147.737 269.875 147.655C270.203 147.442 270.528 147.224 270.849 147.002C270.85 147.003 270.851 147.001 270.851 147.001C270.906 146.964 270.962 146.926 271.017 146.888C271.088 146.835 271.161 146.782 271.234 146.729C271.264 146.727 271.29 146.726 271.319 146.723C271.397 146.716 271.476 146.708 271.553 146.697C271.659 146.685 271.761 146.67 271.863 146.652L271.866 146.651C271.911 146.644 271.956 146.634 272.001 146.626C272.1 146.608 272.199 146.59 272.297 146.569C272.613 146.501 272.926 146.418 273.235 146.329C273.549 146.232 273.861 146.134 274.17 146.032C274.17 146.032 274.172 146.033 274.172 146.031C274.45 145.94 274.725 145.848 274.999 145.755C275.001 145.754 275.004 145.753 275.006 145.751C275.13 145.71 275.257 145.668 275.381 145.623C275.391 145.62 275.399 145.616 275.408 145.613C275.905 145.442 276.403 145.265 276.902 145.082C277.115 145.004 277.327 144.924 277.539 144.842C277.56 144.836 277.581 144.827 277.602 144.819C277.602 144.819 277.603 144.817 277.605 144.818C277.697 144.783 277.787 144.748 277.88 144.711C277.919 144.695 277.957 144.681 277.995 144.665C278.056 144.639 278.119 144.615 278.182 144.588C278.213 144.576 278.245 144.562 278.277 144.549C278.412 144.495 278.547 144.439 278.68 144.382C278.893 144.293 279.104 144.2 279.313 144.106C279.406 144.065 279.498 144.023 279.591 143.979C279.631 143.962 279.673 143.945 279.714 143.925C279.755 143.908 279.796 143.888 279.836 143.868C280.055 143.767 280.27 143.663 280.486 143.556C280.575 143.512 280.667 143.467 280.757 143.421L280.757 143.419C280.772 143.411 280.788 143.404 280.801 143.396C280.893 143.348 280.986 143.3 281.077 143.252C281.087 143.247 281.095 143.241 281.105 143.236C281.191 143.19 281.276 143.144 281.36 143.097C281.454 143.043 281.549 142.99 281.642 142.938C281.829 142.83 282.015 142.718 282.2 142.607C282.22 142.595 282.24 142.581 282.259 142.568L282.267 142.565C282.398 142.484 282.53 142.401 282.66 142.316C282.785 142.237 282.907 142.157 283.026 142.074C283.161 141.984 283.292 141.891 283.424 141.795C283.559 141.699 283.693 141.598 283.823 141.495C283.904 141.433 283.982 141.369 284.061 141.307C284.134 141.248 284.205 141.19 284.276 141.131C284.314 141.1 284.352 141.069 284.391 141.038C284.412 141.02 284.434 141.002 284.456 140.982C284.459 140.979 284.462 140.978 284.465 140.975C284.388 141.062 284.311 141.151 284.233 141.237C284.155 141.327 284.077 141.413 283.999 141.499C283.908 141.601 283.817 141.7 283.726 141.799L283.724 141.8C283.686 141.842 283.649 141.882 283.612 141.921C283.542 141.996 283.471 142.071 283.4 142.145C283.174 142.387 282.943 142.623 282.708 142.857C282.624 142.942 282.538 143.025 282.45 143.109C282.378 143.183 282.302 143.255 282.227 143.326C282.13 143.419 282.032 143.511 281.935 143.604C280.104 145.361 278.058 146.888 275.883 148.148C275.846 148.169 275.81 148.19 275.771 148.21C275.635 148.287 275.496 148.363 275.357 148.439C275.341 148.449 275.323 148.457 275.307 148.467C275.185 148.534 275.061 148.6 274.938 148.663C274.927 148.67 274.917 148.676 274.905 148.681L274.903 148.68C274.756 148.756 274.61 148.831 274.463 148.904C274.43 148.92 274.396 148.938 274.361 148.953C274.29 148.988 274.221 149.023 274.148 149.057C274.077 149.091 274.006 149.126 273.934 149.157C273.844 149.2 273.753 149.242 273.662 149.28C273.561 149.327 273.459 149.372 273.359 149.413C273.301 149.439 273.247 149.463 273.191 149.485C273.057 149.542 272.922 149.599 272.789 149.649C272.756 149.663 272.727 149.676 272.696 149.686C272.693 149.687 272.69 149.689 272.689 149.688C272.622 149.716 272.554 149.741 272.489 149.766C272.342 149.823 272.199 149.885 272.052 149.939L271.781 150.033L271.606 150.094C271.573 150.106 271.542 150.116 271.508 150.128C271.244 150.22 270.985 150.319 270.713 150.393L269.81 150.666L269.331 150.79L269.322 150.791L268.894 150.902C268.762 150.934 268.634 150.966 268.503 150.996C268.372 151.026 268.242 151.057 268.11 151.085C267.621 151.195 267.13 151.293 266.636 151.382C266.631 151.383 266.627 151.384 266.622 151.386C266.458 151.414 266.295 151.441 266.131 151.471C265.999 151.492 265.866 151.513 265.732 151.534C265.456 151.58 265.176 151.619 264.898 151.658C264.618 151.698 264.339 151.733 264.06 151.765C263.78 151.801 263.5 151.832 263.218 151.861C262.939 151.89 262.655 151.918 262.375 151.943C262.322 151.95 262.267 151.955 262.213 151.959C262.131 151.966 262.051 151.972 261.968 151.979C261.879 151.986 261.789 151.993 261.698 152.001C261.604 152.009 261.513 152.017 261.421 152.023L261.418 152.025C261.397 152.026 261.375 152.029 261.353 152.03C261.005 152.061 260.66 152.103 260.313 152.151C260.18 152.168 260.047 152.188 259.916 152.207C259.802 152.225 259.69 152.241 259.578 152.259L259.576 152.258C259.529 152.267 259.48 152.273 259.434 152.28C259.377 152.291 259.321 152.301 259.264 152.308C259.145 152.328 259.027 152.346 258.909 152.366C258.906 152.367 258.905 152.367 258.9 152.367C258.761 152.391 258.623 152.413 258.485 152.434L258.484 152.436ZM282.286 141.627C282.27 141.638 282.256 141.648 282.24 141.657C282.091 141.757 281.94 141.852 281.789 141.947C281.619 142.055 281.446 142.161 281.272 142.263C281.19 142.31 281.108 142.358 281.026 142.405C281.026 142.405 281.025 142.406 281.023 142.408C280.918 142.467 280.814 142.525 280.709 142.584C280.616 142.635 280.52 142.687 280.427 142.738C280.333 142.79 280.237 142.841 280.141 142.892C280.025 142.955 279.906 143.017 279.785 143.076C279.762 143.089 279.736 143.103 279.71 143.115C279.685 143.127 279.659 143.141 279.633 143.154C279.594 143.176 279.554 143.196 279.509 143.216C279.506 143.217 279.504 143.218 279.503 143.22C279.49 143.226 279.477 143.234 279.462 143.24C279.386 143.279 279.309 143.317 279.231 143.354C279.229 143.355 279.228 143.357 279.225 143.358C279.157 143.391 279.086 143.426 279.016 143.458C278.659 143.629 278.298 143.795 277.937 143.956C277.765 144.033 277.592 144.108 277.42 144.183L277.415 144.186C277.256 144.255 277.095 144.325 276.937 144.394C277.285 144.149 277.624 143.889 277.952 143.615C278.076 143.513 278.197 143.408 278.318 143.3C278.354 143.27 278.388 143.24 278.421 143.209C278.441 143.191 278.462 143.173 278.481 143.152C278.52 143.119 278.555 143.085 278.59 143.051L278.595 143.048C278.611 143.035 278.624 143.02 278.639 143.007C278.728 142.926 278.816 142.843 278.901 142.756C279.037 142.625 279.168 142.491 279.298 142.353C279.314 142.335 279.331 142.318 279.348 142.298C279.414 142.231 279.479 142.158 279.542 142.088C279.554 142.077 279.565 142.064 279.575 142.053C279.588 142.038 279.599 142.025 279.612 142.011L279.613 142.009C279.74 141.868 279.863 141.725 279.985 141.58L279.986 141.578C279.995 141.571 280.003 141.561 280.01 141.553C280.072 141.477 280.134 141.402 280.196 141.325C280.23 141.282 280.264 141.239 280.298 141.195C280.299 141.194 280.301 141.192 280.302 141.19C280.355 141.122 280.408 141.054 280.46 140.984C280.835 140.491 281.184 139.976 281.515 139.455C281.911 138.804 282.283 138.143 282.633 137.475C282.973 136.799 283.312 136.126 283.62 135.441C283.745 135.173 283.868 134.904 283.991 134.635C284.107 134.378 284.223 134.123 284.335 133.865C284.342 133.853 284.347 133.838 284.354 133.825L284.356 133.82C284.361 133.809 284.367 133.794 284.372 133.783L284.374 133.78C284.493 133.507 284.612 133.232 284.728 132.959C284.844 132.683 284.957 132.408 285.07 132.132C285.084 132.097 285.099 132.06 285.113 132.024L285.116 132.017C285.179 131.858 285.243 131.697 285.303 131.536C285.336 131.455 285.368 131.375 285.398 131.294C285.328 131.4 285.259 131.506 285.19 131.613L285.19 131.615C285.172 131.643 285.154 131.668 285.138 131.696C285.018 131.878 284.902 132.061 284.787 132.247C284.774 132.267 284.76 132.29 284.746 132.31L284.745 132.312C284.74 132.323 284.732 132.333 284.726 132.344C284.652 132.459 284.581 132.575 284.51 132.692L284.51 132.694C284.496 132.716 284.482 132.739 284.467 132.761C284.374 132.915 284.282 133.066 284.191 133.219C283.806 133.861 283.432 134.507 283.068 135.157C282.692 135.808 282.345 136.472 281.97 137.115C281.788 137.439 281.604 137.763 281.416 138.085C281.23 138.404 281.038 138.72 280.839 139.033C280.782 139.125 280.725 139.217 280.668 139.308C280.615 139.393 280.561 139.476 280.507 139.56C280.502 139.567 280.498 139.574 280.493 139.581C280.489 139.585 280.487 139.591 280.484 139.596C280.3 139.878 280.112 140.156 279.919 140.43L279.917 140.434C279.911 140.44 279.906 140.447 279.902 140.454C279.823 140.566 279.743 140.677 279.66 140.787C279.563 140.92 279.465 141.05 279.366 141.178C279.344 141.204 279.325 141.231 279.302 141.259C279.233 141.349 279.161 141.44 279.089 141.528C278.804 141.887 278.507 142.234 278.198 142.574C278.18 142.593 278.161 142.613 278.143 142.633L278.141 142.634C278.039 142.744 277.936 142.853 277.833 142.963C277.789 143.009 277.743 143.056 277.698 143.102C277.62 143.182 277.541 143.263 277.461 143.342C277.229 143.573 276.992 143.801 276.75 144.024C276.633 144.131 276.516 144.238 276.398 144.342C276.383 144.356 276.365 144.371 276.35 144.385C276.294 144.437 276.234 144.488 276.174 144.539C276.041 144.655 275.906 144.77 275.77 144.885C275.753 144.892 275.737 144.899 275.72 144.906C275.71 144.911 275.699 144.913 275.689 144.918C275.64 145.028 275.592 145.137 275.544 145.249C275.518 145.307 275.491 145.366 275.467 145.425C275.437 145.49 275.41 145.557 275.38 145.624C275.39 145.621 275.398 145.618 275.407 145.615C275.904 145.444 276.402 145.267 276.901 145.084C277.114 145.006 277.326 144.926 277.538 144.844C277.559 144.838 277.58 144.828 277.601 144.821C277.601 144.821 277.602 144.819 277.604 144.82C277.726 144.717 277.848 144.614 277.968 144.508C278.281 144.24 278.587 143.965 278.885 143.68C278.978 143.639 279.072 143.593 279.165 143.547L279.168 143.546C279.261 143.503 279.353 143.456 279.443 143.41C279.659 143.304 279.871 143.194 280.081 143.082C280.29 142.971 280.498 142.858 280.702 142.743C280.358 143.102 280.005 143.453 279.643 143.798C279.731 143.756 279.819 143.715 279.907 143.674C280.121 143.575 280.333 143.472 280.544 143.368C280.742 143.271 280.94 143.169 281.134 143.063C281.104 143.076 281.073 143.088 281.043 143.101C281.472 142.622 281.887 142.13 282.285 141.626L282.286 141.627ZM288.524 134.171C288.565 134.052 288.605 133.931 288.644 133.812L288.649 133.799C288.669 133.734 288.688 133.674 288.708 133.609C288.788 133.342 288.864 133.075 288.936 132.807C288.967 132.692 288.998 132.579 289.027 132.464C289.083 132.248 289.137 132.033 289.186 131.818C289.218 131.69 289.247 131.562 289.275 131.432C289.433 130.693 289.588 129.954 289.712 129.214C289.974 127.736 290.209 126.25 290.366 124.748C290.246 125.107 290.129 125.466 290.019 125.826C289.98 125.952 289.944 126.074 289.907 126.198C289.836 126.432 289.767 126.668 289.699 126.903C289.632 127.138 289.563 127.374 289.498 127.61C289.439 127.821 289.383 128.032 289.326 128.243C289.251 128.522 289.177 128.803 289.105 129.081C288.909 129.807 288.741 130.534 288.544 131.254C288.359 131.975 288.167 132.694 287.943 133.398C287.924 133.461 287.905 133.526 287.884 133.588C287.848 133.709 287.812 133.826 287.773 133.946L287.765 133.968C287.715 134.124 287.664 134.278 287.611 134.431C287.538 134.639 287.462 134.847 287.384 135.054L287.383 135.056C287.303 135.268 287.22 135.479 287.135 135.688C287.102 135.771 287.067 135.852 287.032 135.934C286.999 136.013 286.964 136.094 286.929 136.172C286.908 136.219 286.888 136.265 286.867 136.313L286.867 136.315C286.832 136.391 286.797 136.466 286.763 136.542C286.69 136.704 286.613 136.863 286.535 137.021C286.458 137.182 286.378 137.339 286.297 137.497C286.097 137.876 285.889 138.252 285.668 138.622C285.596 138.747 285.522 138.868 285.445 138.992C285.282 139.16 285.114 139.327 284.944 139.49C284.605 139.817 284.254 140.131 283.892 140.429C283.865 140.451 283.839 140.473 283.811 140.493C284.471 140.37 285.15 140.294 285.821 140.205C285.932 140.098 286.04 139.986 286.145 139.873C286.218 139.656 286.289 139.438 286.359 139.22C286.412 139.055 286.463 138.89 286.514 138.722C286.651 138.275 286.784 137.824 286.913 137.371C286.996 137.084 287.079 136.797 287.168 136.51C287.215 136.349 287.264 136.189 287.316 136.028L287.317 136.026C287.336 135.964 287.356 135.901 287.376 135.838C287.436 135.779 287.497 135.72 287.556 135.659C287.698 135.516 287.836 135.368 287.97 135.217C287.908 135.462 287.852 135.711 287.795 135.958C287.791 135.976 287.787 135.993 287.785 136.012L287.769 136.076C287.774 136.069 287.778 136.062 287.781 136.053C287.795 136.026 287.807 135.998 287.82 135.971C287.849 135.907 287.88 135.842 287.908 135.778C287.943 135.702 287.976 135.625 288.007 135.547C288.037 135.48 288.065 135.411 288.093 135.343C288.108 135.306 288.123 135.269 288.137 135.234C288.184 135.116 288.23 134.995 288.274 134.875C288.28 134.864 288.283 134.855 288.287 134.844C288.288 134.842 288.291 134.839 288.292 134.837C288.293 134.833 288.292 134.829 288.293 134.827C288.375 134.609 288.451 134.391 288.525 134.17L288.524 134.171ZM291.491 128.264C291.455 128.378 291.418 128.491 291.381 128.605C291.219 129.107 291.047 129.605 290.861 130.099C290.528 130.99 290.158 131.864 289.746 132.716C289.77 132.68 289.791 132.641 289.813 132.604C290.12 132.051 290.406 131.489 290.67 130.919C290.838 130.552 291.004 130.182 291.162 129.813L291.163 129.81C291.29 129.298 291.399 128.781 291.49 128.264L291.491 128.264ZM291.868 128.085C291.871 128.048 291.876 128.01 291.882 127.972C291.903 127.914 291.921 127.855 291.939 127.796C291.941 127.792 291.941 127.786 291.942 127.782C291.923 127.837 291.905 127.894 291.886 127.948C291.809 128.178 291.729 128.408 291.648 128.636C291.722 128.451 291.796 128.269 291.869 128.085L291.868 128.085ZM255.264 144.179C255.21 144.228 255.153 144.275 255.099 144.326C255.177 144.256 255.255 144.188 255.335 144.122C255.311 144.141 255.288 144.16 255.264 144.18L255.264 144.179ZM262.865 131.591C262.768 131.604 262.669 131.62 262.573 131.638C262.459 131.657 262.346 131.679 262.233 131.703C262.183 131.713 262.133 131.723 262.082 131.735C262.055 131.74 262.03 131.746 262.002 131.754C261.994 131.759 261.989 131.768 261.982 131.774C261.955 131.805 261.929 131.838 261.899 131.868C261.916 131.831 261.934 131.799 261.952 131.764C261.932 131.767 261.914 131.772 261.893 131.777C261.78 131.803 261.667 131.832 261.556 131.861C261.523 131.994 261.493 132.129 261.469 132.266C261.384 132.376 261.299 132.487 261.22 132.599C261.165 132.675 261.111 132.751 261.06 132.825C261.093 132.814 261.127 132.8 261.161 132.789C261.317 132.733 261.475 132.678 261.631 132.628C261.705 132.605 261.776 132.581 261.847 132.559C261.954 132.525 262.06 132.492 262.167 132.462C262.189 132.454 262.212 132.448 262.236 132.441C262.213 132.446 262.191 132.453 262.168 132.46L262.361 132.23L262.54 132.02C262.664 131.874 262.787 131.731 262.914 131.585C262.897 131.586 262.881 131.589 262.865 131.592L262.865 131.591ZM260.262 140.725C260.22 140.729 260.179 140.734 260.138 140.741C260.064 140.749 259.992 140.762 259.918 140.774C259.864 140.785 259.81 140.795 259.755 140.806C259.673 140.82 259.59 140.839 259.51 140.858C259.469 140.867 259.429 140.876 259.39 140.888C259.36 140.895 259.331 140.904 259.302 140.91C259.285 140.915 259.269 140.92 259.253 140.925C259.153 140.951 259.052 140.98 258.955 141.011C258.906 141.026 258.858 141.043 258.81 141.058L258.808 141.059C258.679 141.101 258.554 141.146 258.43 141.196C258.415 141.201 258.401 141.207 258.386 141.212C258.326 141.235 258.265 141.258 258.205 141.284C258.169 141.299 258.134 141.314 258.099 141.33C258.081 141.338 258.062 141.346 258.044 141.355L258.042 141.354C257.483 141.598 256.949 141.895 256.447 142.242L256.447 142.244C256.395 142.278 256.342 142.315 256.291 142.352L256.138 142.464C256.116 142.479 256.096 142.495 256.073 142.512C255.993 142.573 255.914 142.637 255.833 142.699C255.814 142.713 255.796 142.728 255.778 142.743C255.734 142.778 255.692 142.814 255.65 142.85C255.606 142.886 255.564 142.922 255.524 142.958C255.44 143.03 255.357 143.105 255.276 143.182L255.275 143.184C255.287 143.453 255.304 143.722 255.322 143.99C255.325 144.035 255.33 144.077 255.334 144.12C255.481 143.994 255.629 143.871 255.78 143.75C255.801 143.732 255.824 143.715 255.845 143.697C255.871 143.676 255.895 143.655 255.921 143.635C255.997 143.575 256.072 143.515 256.148 143.455C256.237 143.387 256.326 143.318 256.414 143.252C256.435 143.234 256.458 143.219 256.48 143.201C256.524 143.168 256.567 143.134 256.612 143.102C256.929 142.866 257.253 142.639 257.579 142.42L257.58 142.418C257.584 142.417 257.587 142.416 257.59 142.413C257.626 142.389 257.664 142.365 257.699 142.341C257.724 142.324 257.749 142.308 257.777 142.292C257.78 142.289 257.781 142.287 257.784 142.286C257.833 142.253 257.885 142.22 257.938 142.188C257.957 142.175 257.976 142.163 257.995 142.151C258.105 142.077 258.218 142.007 258.334 141.938C258.351 141.925 258.37 141.914 258.388 141.904C258.421 141.881 258.455 141.862 258.488 141.841C258.617 141.762 258.747 141.683 258.879 141.606C258.993 141.538 259.106 141.472 259.225 141.409C259.241 141.399 259.259 141.389 259.275 141.38L259.276 141.378C259.388 141.315 259.495 141.256 259.605 141.193C259.762 141.106 259.918 141.019 260.077 140.931C260.215 140.855 260.356 140.777 260.496 140.7C260.418 140.706 260.339 140.715 260.26 140.725L260.262 140.725ZM266.437 131.859C266.399 131.968 266.365 132.078 266.329 132.188C266.309 132.253 266.287 132.315 266.27 132.378C266.323 132.205 266.379 132.033 266.437 131.859ZM264.627 147.98C264.628 147.966 264.631 147.95 264.633 147.934C264.59 147.868 264.553 147.798 264.516 147.729C264.412 147.524 264.329 147.31 264.267 147.092C264.234 146.986 264.21 146.881 264.187 146.774C264.051 146.118 264.044 145.457 264.078 144.813C264.117 144.165 264.198 143.545 264.262 142.916C264.33 142.289 264.411 141.662 264.49 141.037C264.528 140.746 264.568 140.455 264.61 140.164C264.615 140.111 264.624 140.057 264.632 140.003C264.637 139.998 264.643 139.994 264.65 139.988C264.661 139.979 264.672 139.971 264.685 139.96C264.739 139.596 264.8 139.231 264.867 138.869C265.075 137.703 265.326 136.543 265.634 135.394C265.714 135.102 265.8 134.811 265.888 134.522C265.915 134.438 265.94 134.352 265.967 134.269C266.012 134.127 266.057 133.987 266.103 133.847C266.123 133.782 266.143 133.719 266.165 133.655C266.072 133.663 265.98 133.671 265.889 133.682C265.898 133.649 265.908 133.615 265.915 133.581C265.914 133.579 265.912 133.578 265.91 133.579C265.9 133.614 265.89 133.648 265.882 133.684C265.873 133.71 265.866 133.735 265.859 133.762L265.856 133.771C265.848 133.805 265.838 133.839 265.829 133.872C265.814 133.928 265.799 133.982 265.786 134.038C265.743 134.198 265.702 134.361 265.663 134.522C265.618 134.699 265.574 134.875 265.534 135.052C265.505 135.171 265.477 135.289 265.45 135.409C265.418 135.545 265.387 135.682 265.358 135.819C265.318 135.995 265.28 136.171 265.244 136.348C265.203 136.541 265.164 136.733 265.126 136.927C265.102 137.045 265.08 137.161 265.057 137.278C265.024 137.452 264.991 137.626 264.961 137.798C264.89 138.185 264.823 138.572 264.761 138.959C264.752 139.013 264.743 139.064 264.737 139.119C264.709 139.285 264.683 139.45 264.658 139.619C264.636 139.756 264.615 139.894 264.597 140.033C264.589 140.087 264.581 140.14 264.573 140.194C264.523 140.538 264.475 140.882 264.431 141.227C264.352 141.853 264.271 142.48 264.203 143.107C264.139 143.736 264.058 144.356 264.019 145.004C263.985 145.648 263.992 146.309 264.128 146.965C264.137 147.006 264.146 147.049 264.157 147.091C264.223 147.375 264.323 147.656 264.457 147.919C264.476 147.956 264.495 147.992 264.516 148.029C264.535 148.06 264.553 148.094 264.574 148.124C264.58 148.137 264.588 148.148 264.595 148.159C264.598 148.164 264.602 148.17 264.604 148.175L264.605 148.173C264.615 148.109 264.622 148.046 264.628 147.981L264.627 147.98ZM275.26 145.094C275.252 145.098 275.245 145.099 275.237 145.103C275.123 145.148 275.009 145.197 274.894 145.243C274.3 145.487 273.707 145.739 273.111 145.962C272.985 146.011 272.857 146.057 272.73 146.103C272.61 146.146 272.488 146.186 272.368 146.222C272.317 146.238 272.266 146.256 272.215 146.27C272.128 146.297 272.04 146.323 271.953 146.346C271.95 146.347 271.95 146.349 271.948 146.348C271.847 146.377 271.747 146.403 271.647 146.427C271.768 146.339 271.888 146.25 272.007 146.158C272.167 146.039 272.324 145.914 272.479 145.787C272.479 145.787 272.48 145.785 272.482 145.786C272.543 145.737 272.606 145.69 272.665 145.641C272.727 145.59 272.79 145.541 272.849 145.492C272.746 145.528 272.644 145.562 272.542 145.596C272.54 145.595 272.539 145.597 272.539 145.597C272.283 145.679 272.025 145.762 271.765 145.843C271.506 145.917 271.244 145.986 270.978 146.043L270.976 146.043C270.931 146.093 270.883 146.139 270.837 146.188C270.853 146.148 270.868 146.104 270.882 146.063C270.78 146.084 270.679 146.102 270.576 146.119C270.557 146.249 270.535 146.379 270.513 146.508C270.362 146.654 270.207 146.8 270.059 146.949C270.013 146.998 269.965 147.045 269.917 147.091C269.503 147.504 269.061 147.884 268.619 148.265C268.445 148.414 268.273 148.565 268.103 148.716C268.105 148.715 268.108 148.714 268.11 148.713C268.26 148.627 268.409 148.543 268.559 148.456C268.636 148.41 268.715 148.366 268.792 148.319C268.872 148.273 268.948 148.228 269.026 148.181C269.182 148.089 269.334 147.995 269.488 147.899C269.619 147.82 269.748 147.739 269.875 147.656C270.204 147.444 270.528 147.225 270.849 147.004C270.851 147.005 270.851 147.003 270.851 147.003C270.907 146.965 270.962 146.927 271.017 146.889C271.088 146.836 271.161 146.783 271.235 146.731C271.265 146.729 271.291 146.727 271.319 146.724C271.397 146.718 271.476 146.709 271.554 146.698C271.659 146.686 271.761 146.671 271.864 146.654L271.866 146.653C271.911 146.645 271.957 146.635 272.001 146.628C272.1 146.609 272.2 146.591 272.297 146.57C272.613 146.503 272.926 146.42 273.235 146.331C273.549 146.233 273.861 146.135 274.17 146.034C274.17 146.034 274.172 146.034 274.173 146.032C274.451 145.941 274.725 145.849 274.999 145.757C275.002 145.755 275.004 145.754 275.007 145.753C275.131 145.711 275.257 145.669 275.382 145.624C275.412 145.556 275.439 145.49 275.468 145.424C275.493 145.365 275.519 145.307 275.546 145.249C275.593 145.137 275.641 145.027 275.69 144.918C275.546 144.975 275.406 145.034 275.261 145.093L275.26 145.094ZM281.134 143.064C280.94 143.17 280.742 143.271 280.544 143.369C280.333 143.473 280.121 143.576 279.907 143.675C279.819 143.716 279.731 143.757 279.643 143.798C280.005 143.454 280.358 143.103 280.702 142.744C280.498 142.859 280.29 142.972 280.081 143.083C279.871 143.195 279.659 143.305 279.443 143.411C279.353 143.458 279.261 143.504 279.168 143.547L279.165 143.548C279.071 143.594 278.978 143.639 278.886 143.681C278.587 143.965 278.281 144.24 277.969 144.509C277.848 144.615 277.726 144.717 277.604 144.821C277.696 144.785 277.786 144.751 277.879 144.714C277.918 144.698 277.956 144.684 277.994 144.667C278.055 144.642 278.119 144.618 278.181 144.591C278.212 144.578 278.245 144.564 278.276 144.552C278.411 144.498 278.546 144.441 278.68 144.385C278.892 144.296 279.103 144.203 279.312 144.109C279.405 144.067 279.497 144.026 279.59 143.982C279.63 143.964 279.672 143.947 279.713 143.927C279.754 143.91 279.795 143.891 279.835 143.871C280.054 143.77 280.269 143.665 280.485 143.559C280.574 143.514 280.666 143.47 280.756 143.423L280.756 143.421C280.771 143.414 280.787 143.407 280.8 143.399C280.893 143.35 280.985 143.302 281.076 143.254C281.086 143.249 281.094 143.244 281.104 143.239C281.19 143.193 281.275 143.146 281.359 143.1C281.454 143.046 281.548 142.992 281.641 142.941C281.829 142.833 282.015 142.721 282.199 142.609C282.22 142.598 282.239 142.583 282.258 142.571C281.891 142.745 281.515 142.905 281.135 143.064L281.134 143.064ZM284.389 141.04C284.41 141.022 284.433 141.005 284.455 140.985C284.458 140.982 284.459 140.98 284.462 140.977C284.438 140.998 284.413 141.019 284.389 141.04ZM282.286 141.627C282.269 141.638 282.255 141.648 282.24 141.657C282.091 141.757 281.94 141.852 281.789 141.948C281.619 142.055 281.446 142.161 281.271 142.263C281.19 142.31 281.108 142.358 281.026 142.405C281.026 142.405 281.025 142.407 281.023 142.409C280.918 142.467 280.813 142.526 280.709 142.584C280.615 142.636 280.52 142.687 280.426 142.739C280.333 142.79 280.237 142.841 280.141 142.892C280.025 142.955 279.906 143.017 279.785 143.076C279.761 143.089 279.735 143.103 279.71 143.115C279.685 143.128 279.659 143.142 279.633 143.154C279.594 143.176 279.553 143.196 279.509 143.216C279.506 143.217 279.503 143.219 279.503 143.221C279.49 143.227 279.477 143.235 279.462 143.24C279.386 143.279 279.309 143.318 279.231 143.354C279.228 143.355 279.228 143.357 279.225 143.358C279.157 143.392 279.086 143.426 279.016 143.458C278.659 143.63 278.298 143.795 277.937 143.956C277.765 144.034 277.592 144.108 277.42 144.184L277.415 144.186C277.256 144.255 277.095 144.326 276.936 144.395C277.285 144.149 277.623 143.89 277.952 143.616C278.076 143.513 278.197 143.408 278.318 143.301C278.354 143.271 278.388 143.24 278.421 143.21C278.44 143.191 278.461 143.173 278.481 143.153C278.52 143.12 278.555 143.085 278.59 143.051L278.595 143.049C278.61 143.035 278.624 143.021 278.639 143.007C278.728 142.926 278.816 142.843 278.901 142.757C279.037 142.625 279.168 142.491 279.298 142.353C279.314 142.336 279.331 142.318 279.348 142.299C279.414 142.231 279.479 142.159 279.541 142.088C279.554 142.077 279.564 142.064 279.575 142.053C279.588 142.039 279.599 142.026 279.612 142.011L279.613 142.009C279.74 141.868 279.863 141.726 279.985 141.58L279.986 141.578C279.995 141.571 280.002 141.561 280.009 141.553C280.071 141.477 280.133 141.402 280.196 141.325C280.23 141.282 280.264 141.239 280.298 141.196C280.298 141.194 280.301 141.193 280.302 141.191C280.355 141.123 280.408 141.055 280.46 140.985C280.835 140.491 281.184 139.976 281.515 139.455C281.911 138.805 282.283 138.144 282.633 137.475C282.973 136.799 283.311 136.127 283.62 135.442C283.745 135.173 283.868 134.904 283.991 134.635C284.107 134.379 284.223 134.124 284.335 133.866C284.342 133.853 284.347 133.838 284.353 133.826L284.355 133.82C284.361 133.809 284.366 133.794 284.372 133.784L284.373 133.78C284.493 133.508 284.612 133.233 284.728 132.959C284.844 132.684 284.957 132.409 285.069 132.132C285.084 132.097 285.099 132.06 285.113 132.025L285.116 132.017C285.179 131.858 285.243 131.697 285.303 131.537C285.336 131.455 285.368 131.376 285.398 131.294C285.327 131.4 285.259 131.507 285.19 131.614L285.19 131.615C285.172 131.643 285.154 131.669 285.138 131.697C285.018 131.879 284.902 132.061 284.787 132.247C284.774 132.268 284.759 132.29 284.746 132.311L284.745 132.313C284.74 132.323 284.732 132.333 284.726 132.344C284.652 132.46 284.58 132.575 284.51 132.692L284.51 132.694C284.496 132.717 284.481 132.739 284.467 132.762C284.374 132.915 284.282 133.066 284.19 133.22C283.806 133.861 283.432 134.507 283.068 135.158C282.692 135.809 282.344 136.472 281.97 137.115C281.788 137.439 281.604 137.763 281.416 138.085C281.23 138.404 281.038 138.721 280.839 139.033C280.782 139.125 280.725 139.217 280.668 139.309C280.615 139.394 280.561 139.476 280.507 139.56C280.502 139.567 280.498 139.574 280.493 139.581C280.489 139.586 280.487 139.592 280.483 139.597C280.299 139.878 280.112 140.157 279.918 140.431L279.917 140.434C279.911 140.441 279.906 140.447 279.902 140.454C279.823 140.566 279.742 140.677 279.66 140.787C279.563 140.92 279.465 141.051 279.366 141.178C279.344 141.205 279.324 141.231 279.302 141.26C279.233 141.349 279.161 141.441 279.089 141.529C278.804 141.887 278.507 142.235 278.197 142.574C278.18 142.593 278.16 142.614 278.143 142.633L278.141 142.634C278.039 142.745 277.936 142.854 277.833 142.963C277.789 143.01 277.743 143.057 277.698 143.102C277.619 143.183 277.541 143.263 277.461 143.342C277.229 143.573 276.992 143.801 276.75 144.025C276.633 144.132 276.516 144.238 276.398 144.343C276.383 144.356 276.365 144.371 276.35 144.385C276.294 144.437 276.234 144.488 276.174 144.539C276.041 144.655 275.906 144.77 275.77 144.885C275.752 144.892 275.737 144.899 275.72 144.906C275.71 144.911 275.699 144.913 275.689 144.918C275.64 145.028 275.592 145.137 275.544 145.249C275.518 145.308 275.491 145.366 275.466 145.425C275.437 145.491 275.41 145.557 275.38 145.625C275.39 145.622 275.397 145.618 275.407 145.615C275.904 145.444 276.402 145.267 276.901 145.084C277.114 145.006 277.326 144.926 277.538 144.844C277.559 144.839 277.579 144.829 277.601 144.821C277.601 144.821 277.602 144.82 277.603 144.82C277.726 144.717 277.848 144.614 277.968 144.509C278.281 144.24 278.587 143.965 278.885 143.681C278.978 143.639 279.072 143.593 279.165 143.548L279.168 143.547C279.261 143.503 279.353 143.457 279.442 143.41C279.659 143.304 279.871 143.195 280.081 143.082C280.29 142.971 280.498 142.858 280.702 142.743C280.358 143.102 280.005 143.454 279.643 143.798C279.731 143.757 279.819 143.716 279.907 143.674C280.12 143.576 280.333 143.473 280.544 143.369C280.742 143.271 280.939 143.169 281.134 143.064C281.104 143.077 281.073 143.089 281.043 143.102C281.472 142.623 281.887 142.131 282.285 141.626L282.286 141.627ZM288.524 134.171C288.565 134.053 288.605 133.932 288.644 133.813L288.648 133.799C288.669 133.735 288.688 133.674 288.708 133.609C288.788 133.342 288.864 133.076 288.935 132.808C288.967 132.692 288.998 132.579 289.027 132.465C289.083 132.248 289.137 132.033 289.186 131.819C289.217 131.69 289.247 131.562 289.275 131.433C289.433 130.693 289.587 129.955 289.712 129.215C289.974 127.736 290.209 126.251 290.366 124.748C290.245 125.107 290.129 125.467 290.019 125.827C289.98 125.952 289.944 126.074 289.907 126.198C289.836 126.433 289.767 126.668 289.698 126.903C289.631 127.139 289.562 127.374 289.497 127.61C289.439 127.822 289.383 128.032 289.326 128.244C289.251 128.523 289.177 128.803 289.105 129.081C288.908 129.807 288.74 130.535 288.544 131.254C288.359 131.975 288.166 132.695 287.943 133.399C287.924 133.461 287.905 133.527 287.884 133.589C287.848 133.709 287.812 133.827 287.772 133.946L287.765 133.969C287.715 134.124 287.663 134.279 287.611 134.431C287.538 134.64 287.462 134.847 287.384 135.054L287.383 135.056C287.303 135.268 287.22 135.48 287.135 135.688C287.102 135.771 287.067 135.852 287.032 135.934C286.999 136.013 286.964 136.094 286.929 136.172C286.908 136.22 286.888 136.266 286.867 136.313L286.867 136.315C286.832 136.391 286.797 136.466 286.763 136.542C286.689 136.704 286.613 136.863 286.535 137.021C286.458 137.182 286.378 137.34 286.296 137.497C286.097 137.876 285.889 138.253 285.668 138.623C285.596 138.747 285.522 138.869 285.445 138.992C285.282 139.16 285.114 139.328 284.944 139.49C284.605 139.817 284.254 140.131 283.892 140.429C283.865 140.451 283.839 140.474 283.811 140.494C284.47 140.371 285.15 140.294 285.821 140.205C285.932 140.098 286.04 139.986 286.145 139.873C286.218 139.656 286.289 139.439 286.359 139.221C286.412 139.056 286.463 138.89 286.514 138.723C286.651 138.275 286.784 137.824 286.913 137.372C286.996 137.085 287.079 136.797 287.168 136.51C287.215 136.349 287.264 136.19 287.316 136.029L287.316 136.027C287.336 135.964 287.356 135.901 287.375 135.838C287.436 135.779 287.497 135.72 287.556 135.659C287.698 135.516 287.836 135.369 287.97 135.217C287.908 135.463 287.851 135.711 287.795 135.959C287.791 135.976 287.787 135.994 287.785 136.012L287.769 136.076C287.774 136.069 287.778 136.062 287.781 136.053C287.795 136.026 287.807 135.998 287.82 135.972C287.849 135.908 287.88 135.843 287.908 135.779C287.943 135.702 287.976 135.625 288.007 135.548C288.037 135.48 288.065 135.412 288.093 135.343C288.108 135.306 288.123 135.269 288.137 135.234C288.184 135.116 288.23 134.995 288.274 134.875C288.28 134.865 288.283 134.855 288.287 134.844C288.288 134.842 288.291 134.839 288.291 134.837C288.293 134.833 288.292 134.829 288.293 134.827C288.375 134.609 288.45 134.391 288.525 134.171L288.524 134.171ZM291.491 128.264C291.455 128.378 291.418 128.492 291.381 128.605C291.219 129.107 291.046 129.606 290.861 130.099C290.528 130.991 290.158 131.865 289.746 132.716C289.769 132.68 289.791 132.641 289.813 132.604C290.12 132.052 290.406 131.49 290.67 130.92C290.838 130.552 291.004 130.183 291.161 129.814L291.163 129.81C291.29 129.298 291.399 128.782 291.49 128.264L291.491 128.264ZM291.868 128.086C291.871 128.049 291.875 128.01 291.882 127.972C291.902 127.914 291.921 127.855 291.939 127.796C291.94 127.792 291.941 127.786 291.942 127.782C291.923 127.837 291.905 127.894 291.886 127.949C291.809 128.178 291.729 128.408 291.648 128.637C291.722 128.452 291.796 128.269 291.868 128.085L291.868 128.086ZM255.264 144.18C255.209 144.228 255.153 144.276 255.099 144.327C255.176 144.257 255.255 144.189 255.335 144.122C255.311 144.141 255.288 144.161 255.264 144.18L255.264 144.18ZM262.865 131.592C262.768 131.604 262.669 131.621 262.573 131.638C262.459 131.657 262.346 131.679 262.232 131.703C262.183 131.713 262.133 131.723 262.082 131.735C262.055 131.741 262.03 131.747 262.002 131.754C261.994 131.76 261.989 131.768 261.982 131.775C261.955 131.805 261.929 131.838 261.899 131.868C261.916 131.832 261.933 131.8 261.952 131.764C261.932 131.768 261.914 131.772 261.893 131.777C261.78 131.804 261.667 131.832 261.556 131.861C261.523 131.995 261.493 132.129 261.468 132.266C261.384 132.376 261.299 132.488 261.22 132.599C261.164 132.675 261.111 132.751 261.059 132.826C261.093 132.814 261.127 132.801 261.161 132.789C261.317 132.734 261.475 132.679 261.631 132.628C261.705 132.605 261.776 132.581 261.847 132.56C261.954 132.525 262.06 132.492 262.167 132.462C262.189 132.455 262.212 132.448 262.235 132.441C262.213 132.446 262.191 132.453 262.168 132.46L262.361 132.23L262.539 132.021C262.664 131.874 262.787 131.732 262.914 131.586C262.897 131.586 262.881 131.589 262.865 131.592L262.865 131.592ZM260.262 140.725C260.22 140.73 260.179 140.734 260.138 140.741C260.064 140.749 259.992 140.762 259.918 140.774C259.864 140.785 259.81 140.796 259.755 140.806C259.673 140.82 259.59 140.84 259.51 140.858C259.468 140.867 259.429 140.877 259.39 140.888C259.36 140.895 259.331 140.904 259.302 140.911C259.285 140.915 259.269 140.92 259.252 140.925C259.153 140.952 259.052 140.98 258.955 141.012C258.906 141.026 258.858 141.043 258.81 141.058L258.808 141.06C258.679 141.102 258.554 141.147 258.43 141.196C258.415 141.201 258.401 141.207 258.386 141.212C258.325 141.236 258.265 141.259 258.205 141.285C258.168 141.299 258.134 141.315 258.099 141.33C258.081 141.339 258.061 141.346 258.044 141.355L258.042 141.354C257.483 141.599 256.948 141.896 256.447 142.242L256.446 142.244C256.394 142.279 256.342 142.315 256.291 142.352L256.138 142.464C256.116 142.479 256.096 142.496 256.073 142.513C255.993 142.574 255.914 142.637 255.833 142.699C255.814 142.713 255.796 142.728 255.778 142.743C255.734 142.779 255.692 142.815 255.65 142.851C255.606 142.886 255.564 142.922 255.524 142.959C255.44 143.031 255.357 143.105 255.276 143.182L255.275 143.184C255.287 143.453 255.303 143.723 255.322 143.99C255.325 144.035 255.33 144.077 255.334 144.121C255.481 143.994 255.629 143.871 255.78 143.751C255.801 143.733 255.824 143.715 255.845 143.697C255.871 143.677 255.895 143.656 255.921 143.635C255.997 143.575 256.072 143.515 256.148 143.455C256.237 143.387 256.326 143.319 256.414 143.253C256.435 143.235 256.457 143.219 256.48 143.202C256.524 143.168 256.567 143.135 256.612 143.102C256.929 142.867 257.253 142.639 257.579 142.42L257.58 142.418C257.584 142.418 257.587 142.416 257.59 142.413C257.625 142.39 257.664 142.365 257.699 142.342C257.724 142.325 257.749 142.308 257.777 142.293C257.78 142.29 257.781 142.288 257.784 142.286C257.833 142.253 257.884 142.22 257.938 142.188C257.957 142.176 257.976 142.163 257.995 142.151C258.105 142.077 258.218 142.007 258.334 141.938C258.351 141.925 258.37 141.915 258.388 141.904C258.421 141.882 258.455 141.862 258.488 141.842C258.616 141.762 258.747 141.683 258.879 141.607C258.993 141.539 259.106 141.473 259.225 141.409C259.241 141.4 259.259 141.389 259.275 141.38L259.276 141.378C259.388 141.316 259.495 141.256 259.605 141.193C259.762 141.106 259.918 141.02 260.077 140.932C260.215 140.855 260.356 140.778 260.496 140.7C260.418 140.707 260.339 140.715 260.26 140.726L260.262 140.725ZM266.437 131.859C266.399 131.968 266.365 132.079 266.329 132.188C266.309 132.253 266.287 132.315 266.269 132.379C266.323 132.205 266.379 132.033 266.437 131.859ZM264.627 147.98C264.628 147.966 264.631 147.95 264.632 147.934C264.59 147.869 264.553 147.799 264.516 147.729C264.412 147.524 264.328 147.31 264.267 147.093C264.234 146.987 264.209 146.881 264.187 146.775C264.051 146.119 264.044 145.457 264.078 144.814C264.117 144.166 264.198 143.545 264.262 142.917C264.33 142.289 264.41 141.662 264.49 141.037C264.528 140.747 264.568 140.455 264.61 140.164C264.615 140.111 264.623 140.057 264.632 140.003C264.637 139.999 264.643 139.995 264.649 139.988C264.661 139.98 264.672 139.971 264.684 139.96C264.739 139.596 264.8 139.232 264.867 138.869C265.075 137.703 265.326 136.543 265.634 135.394C265.714 135.102 265.8 134.812 265.888 134.522C265.915 134.439 265.94 134.353 265.967 134.27C266.012 134.127 266.057 133.987 266.103 133.847C266.123 133.782 266.143 133.72 266.165 133.656C266.072 133.663 265.98 133.672 265.889 133.682C265.898 133.649 265.908 133.615 265.915 133.582C265.914 133.579 265.912 133.578 265.909 133.58C265.9 133.614 265.89 133.649 265.882 133.684C265.873 133.71 265.866 133.735 265.859 133.762L265.855 133.772C265.848 133.805 265.838 133.84 265.829 133.872C265.814 133.928 265.799 133.982 265.786 134.039C265.743 134.199 265.702 134.361 265.663 134.522C265.618 134.699 265.574 134.875 265.533 135.053C265.505 135.171 265.477 135.29 265.45 135.409C265.417 135.545 265.387 135.682 265.358 135.82C265.318 135.996 265.28 136.172 265.244 136.349C265.203 136.541 265.163 136.734 265.126 136.927C265.102 137.045 265.08 137.162 265.057 137.278C265.024 137.452 264.991 137.626 264.961 137.799C264.89 138.185 264.823 138.572 264.761 138.959C264.752 139.013 264.743 139.065 264.737 139.12C264.709 139.285 264.683 139.451 264.658 139.619C264.636 139.757 264.615 139.895 264.597 140.034C264.588 140.088 264.581 140.14 264.573 140.194C264.523 140.539 264.475 140.882 264.431 141.228C264.351 141.853 264.271 142.48 264.203 143.107C264.139 143.736 264.058 144.357 264.019 145.005C263.985 145.648 263.992 146.309 264.128 146.966C264.137 147.007 264.146 147.05 264.156 147.091C264.222 147.375 264.323 147.657 264.457 147.92C264.476 147.956 264.495 147.992 264.516 148.029C264.535 148.061 264.552 148.094 264.573 148.125C264.58 148.137 264.588 148.149 264.595 148.16C264.598 148.165 264.602 148.17 264.604 148.175L264.605 148.174C264.615 148.109 264.622 148.047 264.627 147.981L264.627 147.98ZM275.259 145.094C275.252 145.098 275.245 145.1 275.237 145.103C275.123 145.148 275.009 145.197 274.894 145.243C274.3 145.488 273.707 145.739 273.111 145.962C272.985 146.011 272.857 146.058 272.73 146.104C272.609 146.146 272.488 146.186 272.368 146.222C272.317 146.238 272.266 146.257 272.215 146.27C272.127 146.297 272.04 146.324 271.953 146.346C271.95 146.347 271.95 146.349 271.948 146.349C271.847 146.377 271.747 146.403 271.647 146.428C271.768 146.339 271.887 146.25 272.007 146.159C272.167 146.039 272.324 145.915 272.479 145.787C272.479 145.787 272.48 145.786 272.482 145.786C272.543 145.738 272.606 145.69 272.665 145.641C272.727 145.591 272.79 145.541 272.849 145.492C272.746 145.528 272.644 145.562 272.542 145.596C272.54 145.596 272.539 145.597 272.539 145.597C272.283 145.679 272.025 145.762 271.765 145.843C271.506 145.917 271.244 145.986 270.977 146.044L270.976 146.043C270.931 146.093 270.883 146.14 270.836 146.189C270.853 146.148 270.868 146.105 270.882 146.063C270.78 146.085 270.679 146.102 270.576 146.12C270.556 146.25 270.535 146.379 270.513 146.508C270.361 146.654 270.207 146.8 270.059 146.949C270.013 146.998 269.965 147.045 269.917 147.092C269.502 147.504 269.061 147.884 268.619 148.266C268.445 148.414 268.273 148.565 268.103 148.717C268.105 148.715 268.108 148.714 268.11 148.713C268.26 148.628 268.409 148.543 268.559 148.456C268.636 148.411 268.715 148.366 268.792 148.319C268.871 148.273 268.948 148.228 269.026 148.181C269.182 148.09 269.334 147.996 269.488 147.899C269.618 147.82 269.748 147.739 269.875 147.657C270.203 147.444 270.528 147.226 270.849 147.004C270.851 147.005 270.851 147.003 270.851 147.003C270.907 146.965 270.962 146.928 271.017 146.89C271.088 146.836 271.161 146.784 271.234 146.731C271.265 146.729 271.291 146.727 271.319 146.725C271.397 146.718 271.476 146.709 271.554 146.698C271.659 146.686 271.761 146.671 271.864 146.654L271.866 146.653C271.911 146.645 271.956 146.636 272.001 146.628C272.1 146.61 272.199 146.591 272.297 146.57C272.613 146.503 272.926 146.42 273.235 146.331C273.549 146.233 273.861 146.136 274.17 146.034C274.17 146.034 274.172 146.035 274.173 146.033C274.45 145.941 274.725 145.849 274.999 145.757C275.001 145.756 275.004 145.754 275.006 145.753C275.13 145.712 275.257 145.669 275.382 145.624C275.411 145.557 275.439 145.49 275.468 145.425C275.493 145.366 275.519 145.307 275.546 145.249C275.593 145.137 275.641 145.028 275.69 144.918C275.546 144.975 275.405 145.034 275.261 145.093L275.259 145.094ZM281.134 143.065C280.94 143.17 280.742 143.272 280.544 143.37C280.333 143.473 280.121 143.577 279.907 143.675C279.819 143.716 279.731 143.758 279.643 143.799C280.004 143.454 280.358 143.103 280.702 142.744C280.498 142.859 280.29 142.972 280.081 143.083C279.871 143.196 279.659 143.305 279.443 143.411C279.353 143.458 279.261 143.504 279.168 143.547L279.165 143.549C279.071 143.594 278.978 143.64 278.885 143.682C278.587 143.965 278.281 144.241 277.968 144.509C277.847 144.615 277.725 144.718 277.604 144.821C277.696 144.786 277.786 144.751 277.879 144.714C277.918 144.698 277.956 144.684 277.994 144.668C278.055 144.642 278.118 144.618 278.18 144.591C278.212 144.579 278.244 144.565 278.276 144.553C278.411 144.498 278.546 144.442 278.679 144.385C278.892 144.296 279.103 144.203 279.312 144.109C279.405 144.068 279.497 144.026 279.59 143.982C279.63 143.965 279.672 143.948 279.712 143.928C279.754 143.911 279.795 143.891 279.835 143.871C280.054 143.77 280.269 143.666 280.485 143.559C280.574 143.515 280.665 143.47 280.755 143.424L280.756 143.422C280.771 143.414 280.787 143.407 280.8 143.399C280.892 143.351 280.985 143.303 281.076 143.255C281.086 143.25 281.094 143.244 281.104 143.239C281.19 143.193 281.275 143.147 281.359 143.1C281.453 143.046 281.548 142.993 281.641 142.941C281.828 142.833 282.014 142.721 282.198 142.61C282.219 142.598 282.239 142.584 282.258 142.571C281.891 142.745 281.514 142.905 281.135 143.064L281.134 143.065ZM284.389 141.04C284.41 141.022 284.433 141.005 284.455 140.985C284.458 140.982 284.459 140.98 284.462 140.977C284.438 140.998 284.413 141.019 284.389 141.04ZM282.286 141.627C282.269 141.638 282.255 141.648 282.239 141.658C282.091 141.758 281.94 141.853 281.789 141.948C281.619 142.055 281.446 142.161 281.271 142.263C281.189 142.311 281.108 142.358 281.026 142.406C281.026 142.406 281.025 142.407 281.023 142.409C280.918 142.468 280.813 142.526 280.709 142.584C280.615 142.636 280.52 142.687 280.426 142.739C280.332 142.791 280.237 142.842 280.141 142.893C280.024 142.955 279.906 143.018 279.785 143.076C279.761 143.089 279.735 143.103 279.71 143.116C279.685 143.128 279.659 143.142 279.633 143.155C279.594 143.177 279.553 143.196 279.508 143.217C279.506 143.218 279.503 143.219 279.503 143.221C279.49 143.227 279.477 143.235 279.462 143.241C279.385 143.279 279.309 143.318 279.231 143.354C279.228 143.356 279.228 143.357 279.225 143.359C279.157 143.392 279.086 143.426 279.015 143.459C278.659 143.63 278.298 143.796 277.937 143.957C277.765 144.034 277.592 144.109 277.42 144.184L277.415 144.186C277.256 144.256 277.095 144.326 276.936 144.395C277.285 144.15 277.623 143.89 277.952 143.616C278.076 143.514 278.197 143.409 278.318 143.301C278.354 143.271 278.387 143.241 278.421 143.21C278.44 143.192 278.461 143.173 278.481 143.153C278.52 143.12 278.555 143.086 278.59 143.052L278.595 143.049C278.61 143.035 278.624 143.021 278.639 143.007C278.728 142.927 278.816 142.843 278.901 142.757C279.037 142.625 279.168 142.492 279.298 142.353C279.314 142.336 279.331 142.319 279.348 142.299C279.414 142.231 279.479 142.159 279.541 142.088C279.553 142.078 279.564 142.065 279.574 142.053C279.588 142.039 279.599 142.026 279.612 142.012L279.613 142.01C279.74 141.868 279.863 141.726 279.985 141.581L279.986 141.579C279.995 141.571 280.002 141.561 280.009 141.553C280.071 141.478 280.133 141.402 280.196 141.325C280.23 141.282 280.264 141.239 280.298 141.196C280.298 141.194 280.301 141.193 280.301 141.191C280.355 141.123 280.408 141.055 280.459 140.985C280.835 140.492 281.184 139.977 281.514 139.455C281.911 138.805 282.283 138.144 282.633 137.476C282.973 136.8 283.311 136.127 283.62 135.442C283.745 135.174 283.868 134.904 283.99 134.635C284.107 134.379 284.223 134.124 284.335 133.866C284.342 133.854 284.347 133.839 284.353 133.826L284.355 133.82C284.361 133.81 284.366 133.795 284.372 133.784L284.373 133.78C284.493 133.508 284.612 133.233 284.728 132.96C284.844 132.684 284.956 132.409 285.069 132.132C285.084 132.097 285.098 132.06 285.113 132.025L285.115 132.018C285.179 131.858 285.243 131.698 285.303 131.537C285.336 131.456 285.367 131.376 285.398 131.294C285.327 131.401 285.259 131.507 285.19 131.614L285.189 131.616C285.171 131.643 285.154 131.669 285.138 131.697C285.018 131.879 284.902 132.062 284.787 132.247C284.773 132.268 284.759 132.291 284.746 132.311L284.745 132.313C284.739 132.324 284.732 132.334 284.726 132.344C284.652 132.46 284.58 132.576 284.51 132.693L284.51 132.695C284.495 132.717 284.481 132.74 284.467 132.762C284.374 132.915 284.282 133.066 284.19 133.22C283.805 133.862 283.432 134.508 283.067 135.158C282.692 135.809 282.344 136.472 281.97 137.115C281.788 137.44 281.604 137.763 281.416 138.086C281.23 138.404 281.037 138.721 280.839 139.034C280.782 139.126 280.724 139.218 280.667 139.309C280.615 139.394 280.561 139.477 280.506 139.561C280.502 139.568 280.497 139.574 280.493 139.581C280.489 139.586 280.487 139.592 280.483 139.597C280.299 139.878 280.112 140.157 279.918 140.431L279.917 140.435C279.911 140.441 279.906 140.448 279.902 140.455C279.823 140.567 279.742 140.677 279.66 140.788C279.563 140.921 279.465 141.051 279.366 141.179C279.344 141.205 279.324 141.232 279.302 141.26C279.233 141.35 279.161 141.441 279.088 141.529C278.804 141.887 278.507 142.235 278.197 142.574C278.18 142.594 278.16 142.614 278.143 142.633L278.14 142.635C278.039 142.745 277.936 142.854 277.832 142.964C277.789 143.01 277.743 143.057 277.698 143.103C277.619 143.183 277.541 143.263 277.461 143.343C277.229 143.574 276.992 143.802 276.75 144.025C276.633 144.132 276.516 144.238 276.398 144.343C276.383 144.357 276.365 144.372 276.349 144.385C276.293 144.437 276.234 144.488 276.174 144.539C276.041 144.656 275.906 144.771 275.769 144.886C275.752 144.892 275.737 144.9 275.72 144.907C275.71 144.911 275.699 144.914 275.688 144.919C275.64 145.028 275.591 145.138 275.544 145.25C275.518 145.308 275.491 145.366 275.466 145.425C275.437 145.491 275.41 145.558 275.38 145.625C275.39 145.622 275.397 145.618 275.407 145.615C275.904 145.445 276.401 145.268 276.901 145.085C277.113 145.006 277.326 144.927 277.538 144.844C277.559 144.839 277.579 144.829 277.601 144.822C277.601 144.822 277.601 144.82 277.603 144.821C277.726 144.717 277.848 144.615 277.968 144.509C278.281 144.24 278.586 143.965 278.885 143.681C278.978 143.639 279.071 143.594 279.165 143.548L279.167 143.547C279.261 143.503 279.352 143.457 279.442 143.411C279.658 143.304 279.871 143.195 280.081 143.082C280.29 142.972 280.497 142.858 280.702 142.744C280.358 143.103 280.005 143.454 279.643 143.798C279.731 143.757 279.819 143.716 279.907 143.675C280.12 143.576 280.333 143.473 280.544 143.369C280.742 143.271 280.939 143.169 281.134 143.064C281.104 143.077 281.073 143.089 281.043 143.102C281.472 142.623 281.887 142.131 282.285 141.627L282.286 141.627ZM288.524 134.171C288.565 134.053 288.604 133.932 288.644 133.813L288.648 133.8C288.669 133.735 288.688 133.674 288.708 133.61C288.788 133.343 288.863 133.076 288.935 132.808C288.967 132.693 288.998 132.579 289.027 132.465C289.083 132.249 289.136 132.033 289.186 131.819C289.217 131.691 289.247 131.562 289.275 131.433C289.432 130.694 289.587 129.955 289.712 129.215C289.974 127.737 290.209 126.251 290.365 124.749C290.245 125.107 290.129 125.467 290.019 125.827C289.98 125.952 289.944 126.074 289.907 126.199C289.836 126.433 289.767 126.668 289.698 126.903C289.631 127.139 289.562 127.375 289.497 127.611C289.439 127.822 289.383 128.032 289.326 128.244C289.25 128.523 289.176 128.803 289.105 129.082C288.908 129.807 288.74 130.535 288.544 131.254C288.359 131.976 288.166 132.695 287.943 133.399C287.924 133.462 287.905 133.527 287.884 133.589C287.848 133.71 287.812 133.827 287.772 133.946L287.764 133.969C287.715 134.125 287.663 134.279 287.61 134.432C287.538 134.64 287.462 134.848 287.384 135.055L287.383 135.056C287.303 135.269 287.219 135.48 287.135 135.688C287.101 135.772 287.067 135.852 287.032 135.935C286.998 136.014 286.964 136.095 286.929 136.173C286.908 136.22 286.888 136.266 286.867 136.314L286.866 136.315C286.831 136.392 286.797 136.466 286.762 136.542C286.689 136.705 286.613 136.863 286.535 137.022C286.458 137.183 286.378 137.34 286.296 137.497C286.097 137.877 285.889 138.253 285.668 138.623C285.595 138.748 285.522 138.869 285.445 138.992C285.281 139.161 285.114 139.328 284.944 139.491C284.605 139.817 284.254 140.132 283.892 140.429C283.865 140.452 283.838 140.474 283.81 140.494C284.47 140.371 285.15 140.295 285.821 140.205C285.932 140.098 286.04 139.987 286.145 139.873C286.218 139.657 286.289 139.439 286.358 139.221C286.411 139.056 286.462 138.891 286.514 138.723C286.651 138.275 286.784 137.824 286.913 137.372C286.996 137.085 287.079 136.798 287.168 136.511C287.215 136.35 287.264 136.19 287.316 136.029L287.316 136.027C287.336 135.964 287.356 135.902 287.375 135.839C287.436 135.78 287.496 135.721 287.556 135.659C287.698 135.517 287.836 135.369 287.97 135.217C287.908 135.463 287.851 135.711 287.795 135.959C287.791 135.977 287.787 135.994 287.785 136.012L287.769 136.077C287.773 136.07 287.778 136.063 287.781 136.053C287.795 136.026 287.806 135.999 287.82 135.972C287.848 135.908 287.879 135.843 287.908 135.779C287.943 135.703 287.976 135.625 288.007 135.548C288.037 135.48 288.065 135.412 288.093 135.344C288.108 135.307 288.122 135.27 288.137 135.235C288.184 135.116 288.23 134.996 288.274 134.876C288.28 134.865 288.283 134.856 288.287 134.844C288.287 134.843 288.291 134.84 288.291 134.838C288.293 134.834 288.292 134.829 288.293 134.828C288.375 134.61 288.45 134.391 288.525 134.171L288.524 134.171ZM291.49 128.265C291.455 128.379 291.418 128.492 291.381 128.606C291.219 129.108 291.046 129.606 290.86 130.099C290.528 130.991 290.157 131.865 289.746 132.717C289.769 132.68 289.791 132.642 289.812 132.605C290.12 132.052 290.406 131.49 290.67 130.92C290.838 130.553 291.004 130.183 291.161 129.814L291.163 129.81C291.29 129.298 291.399 128.782 291.49 128.264L291.49 128.265ZM291.868 128.086C291.87 128.049 291.875 128.011 291.882 127.973C291.902 127.915 291.921 127.856 291.939 127.797C291.94 127.793 291.94 127.786 291.942 127.783C291.923 127.837 291.905 127.894 291.886 127.949C291.809 128.179 291.729 128.408 291.648 128.637C291.722 128.452 291.796 128.269 291.868 128.086L291.868 128.086ZM255.264 144.18C255.209 144.228 255.153 144.276 255.099 144.327C255.176 144.257 255.255 144.189 255.335 144.123C255.311 144.142 255.288 144.161 255.264 144.18L255.264 144.18ZM262.865 131.592C262.768 131.605 262.669 131.621 262.573 131.638C262.459 131.658 262.346 131.68 262.232 131.704C262.182 131.714 262.133 131.724 262.082 131.736C262.055 131.741 262.03 131.747 262.002 131.754C261.994 131.76 261.988 131.769 261.982 131.775C261.955 131.806 261.928 131.839 261.899 131.868C261.916 131.832 261.933 131.8 261.952 131.765C261.932 131.768 261.913 131.772 261.893 131.778C261.78 131.804 261.667 131.832 261.556 131.861C261.522 131.995 261.493 132.13 261.468 132.267C261.384 132.377 261.299 132.488 261.22 132.6C261.164 132.675 261.11 132.752 261.059 132.826C261.093 132.815 261.127 132.801 261.161 132.79C261.317 132.734 261.475 132.679 261.631 132.629C261.705 132.605 261.776 132.582 261.847 132.56C261.954 132.525 262.06 132.493 262.167 132.462C262.189 132.455 262.212 132.448 262.235 132.442C262.213 132.446 262.191 132.454 262.168 132.46L262.361 132.231L262.539 132.021C262.664 131.874 262.787 131.732 262.914 131.586C262.897 131.587 262.881 131.59 262.865 131.592L262.865 131.592ZM260.262 140.725C260.22 140.73 260.179 140.734 260.138 140.742C260.064 140.749 259.992 140.762 259.918 140.775C259.864 140.785 259.809 140.796 259.755 140.807C259.672 140.82 259.59 140.84 259.509 140.859C259.468 140.868 259.429 140.877 259.389 140.889C259.36 140.895 259.331 140.904 259.302 140.911C259.285 140.916 259.269 140.921 259.252 140.925C259.152 140.952 259.052 140.98 258.955 141.012C258.906 141.027 258.858 141.044 258.81 141.059L258.808 141.06C258.679 141.102 258.554 141.147 258.43 141.196C258.415 141.202 258.401 141.207 258.386 141.213C258.325 141.236 258.265 141.259 258.205 141.285C258.168 141.3 258.133 141.315 258.099 141.33C258.081 141.339 258.061 141.347 258.044 141.355L258.042 141.355C257.483 141.599 256.948 141.896 256.447 142.242L256.446 142.244C256.394 142.279 256.342 142.316 256.291 142.353L256.138 142.464C256.116 142.48 256.096 142.496 256.073 142.513C255.993 142.574 255.914 142.637 255.833 142.7C255.813 142.714 255.796 142.729 255.778 142.744C255.734 142.779 255.692 142.815 255.65 142.851C255.606 142.886 255.564 142.922 255.524 142.959C255.44 143.031 255.357 143.106 255.276 143.183L255.275 143.184C255.287 143.454 255.303 143.723 255.322 143.99C255.325 144.036 255.33 144.077 255.333 144.121C255.481 143.995 255.629 143.872 255.78 143.751C255.801 143.733 255.824 143.716 255.845 143.698C255.871 143.677 255.895 143.656 255.921 143.636C255.997 143.575 256.072 143.515 256.148 143.455C256.237 143.387 256.326 143.319 256.414 143.253C256.435 143.235 256.457 143.22 256.48 143.202C256.523 143.169 256.567 143.135 256.612 143.102C256.929 142.867 257.252 142.64 257.579 142.42L257.58 142.419C257.584 142.418 257.587 142.417 257.59 142.414C257.625 142.39 257.663 142.365 257.699 142.342C257.724 142.325 257.748 142.308 257.777 142.293C257.78 142.29 257.781 142.288 257.783 142.287C257.833 142.253 257.884 142.221 257.938 142.189C257.957 142.176 257.976 142.164 257.995 142.151C258.105 142.078 258.218 142.007 258.334 141.938C258.351 141.925 258.369 141.915 258.388 141.904C258.421 141.882 258.455 141.862 258.487 141.842C258.616 141.762 258.747 141.684 258.878 141.607C258.993 141.539 259.106 141.473 259.225 141.409C259.241 141.4 259.259 141.39 259.275 141.38L259.276 141.378C259.388 141.316 259.495 141.256 259.605 141.194C259.762 141.107 259.918 141.02 260.077 140.932C260.215 140.855 260.356 140.778 260.496 140.7C260.418 140.707 260.339 140.715 260.26 140.726L260.262 140.725ZM266.437 131.86C266.399 131.969 266.365 132.079 266.329 132.189C266.309 132.253 266.287 132.315 266.269 132.379C266.323 132.206 266.379 132.034 266.437 131.86ZM264.627 147.981C264.627 147.966 264.631 147.951 264.632 147.934C264.59 147.869 264.553 147.799 264.516 147.729C264.412 147.525 264.328 147.311 264.267 147.093C264.234 146.987 264.209 146.882 264.187 146.775C264.05 146.119 264.044 145.458 264.078 144.814C264.117 144.166 264.197 143.546 264.262 142.917C264.33 142.29 264.41 141.663 264.49 141.037C264.528 140.747 264.568 140.455 264.609 140.165C264.615 140.112 264.623 140.058 264.632 140.004C264.637 139.999 264.643 139.995 264.649 139.989C264.661 139.98 264.672 139.971 264.684 139.961C264.739 139.596 264.8 139.232 264.867 138.87C265.075 137.704 265.326 136.543 265.634 135.395C265.714 135.103 265.8 134.812 265.888 134.522C265.915 134.439 265.94 134.353 265.967 134.27C266.012 134.128 266.056 133.987 266.103 133.847C266.123 133.783 266.143 133.72 266.165 133.656C266.072 133.664 265.98 133.672 265.888 133.682C265.898 133.65 265.908 133.615 265.915 133.582C265.914 133.579 265.912 133.579 265.909 133.58C265.899 133.615 265.89 133.649 265.882 133.684C265.872 133.711 265.866 133.736 265.859 133.763L265.855 133.772C265.848 133.805 265.838 133.84 265.829 133.873C265.814 133.928 265.799 133.982 265.786 134.039C265.743 134.199 265.702 134.361 265.662 134.523C265.618 134.699 265.574 134.875 265.533 135.053C265.505 135.172 265.476 135.29 265.45 135.41C265.417 135.546 265.387 135.682 265.358 135.82C265.318 135.996 265.28 136.172 265.244 136.349C265.203 136.541 265.163 136.734 265.126 136.928C265.102 137.046 265.08 137.162 265.057 137.278C265.024 137.453 264.991 137.626 264.96 137.799C264.89 138.185 264.823 138.573 264.76 138.96C264.752 139.014 264.743 139.065 264.736 139.12C264.709 139.285 264.683 139.451 264.658 139.619C264.636 139.757 264.615 139.895 264.596 140.034C264.588 140.088 264.581 140.14 264.573 140.194C264.522 140.539 264.475 140.883 264.431 141.228C264.351 141.854 264.271 142.48 264.203 143.108C264.138 143.736 264.058 144.357 264.019 145.005C263.985 145.649 263.992 146.31 264.128 146.966C264.137 147.007 264.145 147.05 264.156 147.092C264.222 147.376 264.322 147.657 264.457 147.92C264.476 147.956 264.495 147.992 264.516 148.029C264.534 148.061 264.552 148.095 264.573 148.125C264.579 148.138 264.588 148.149 264.595 148.16C264.597 148.165 264.602 148.171 264.604 148.176L264.605 148.174C264.614 148.11 264.621 148.047 264.627 147.981L264.627 147.981ZM275.259 145.095C275.252 145.098 275.245 145.1 275.237 145.104C275.123 145.148 275.009 145.197 274.894 145.244C274.299 145.488 273.707 145.74 273.111 145.963C272.985 146.012 272.857 146.058 272.729 146.104C272.609 146.147 272.488 146.187 272.368 146.223C272.316 146.239 272.266 146.257 272.215 146.271C272.127 146.297 272.04 146.324 271.953 146.346C271.95 146.348 271.949 146.35 271.948 146.349C271.847 146.377 271.747 146.404 271.647 146.428C271.768 146.339 271.887 146.25 272.007 146.159C272.167 146.04 272.324 145.915 272.479 145.788C272.479 145.788 272.48 145.786 272.482 145.787C272.543 145.738 272.606 145.69 272.665 145.641C272.726 145.591 272.79 145.542 272.849 145.492C272.746 145.528 272.644 145.562 272.542 145.597C272.54 145.596 272.539 145.598 272.539 145.598C272.283 145.68 272.025 145.763 271.765 145.843C271.506 145.918 271.243 145.987 270.977 146.044L270.975 146.043C270.931 146.093 270.883 146.14 270.836 146.189C270.853 146.148 270.868 146.105 270.882 146.064C270.78 146.085 270.679 146.103 270.576 146.12C270.556 146.25 270.535 146.379 270.513 146.509C270.361 146.654 270.207 146.801 270.059 146.95C270.012 146.999 269.965 147.045 269.917 147.092C269.502 147.505 269.061 147.884 268.619 148.266C268.445 148.415 268.273 148.565 268.102 148.717C268.105 148.716 268.107 148.714 268.11 148.713C268.26 148.628 268.409 148.543 268.559 148.456C268.636 148.411 268.715 148.367 268.792 148.32C268.871 148.274 268.948 148.229 269.026 148.182C269.182 148.09 269.334 147.996 269.488 147.9C269.618 147.82 269.748 147.739 269.875 147.657C270.203 147.444 270.528 147.226 270.849 147.005C270.851 147.005 270.851 147.003 270.851 147.003C270.906 146.966 270.962 146.928 271.017 146.89C271.088 146.837 271.161 146.784 271.234 146.732C271.265 146.729 271.29 146.728 271.319 146.725C271.397 146.718 271.476 146.71 271.553 146.699C271.659 146.687 271.761 146.672 271.863 146.655L271.866 146.653C271.911 146.646 271.956 146.636 272.001 146.629C272.1 146.61 272.199 146.592 272.297 146.571C272.613 146.503 272.926 146.421 273.235 146.332C273.549 146.234 273.861 146.136 274.17 146.034C274.17 146.034 274.172 146.035 274.172 146.033C274.45 145.942 274.725 145.85 274.999 145.757C275.001 145.756 275.004 145.755 275.006 145.754C275.13 145.712 275.257 145.67 275.382 145.625C275.411 145.557 275.439 145.491 275.468 145.425C275.492 145.366 275.519 145.308 275.545 145.249C275.593 145.137 275.641 145.028 275.69 144.918C275.545 144.976 275.405 145.035 275.26 145.094L275.259 145.095ZM281.134 143.065C280.939 143.17 280.742 143.272 280.544 143.37C280.333 143.474 280.12 143.577 279.907 143.676C279.819 143.717 279.731 143.758 279.643 143.799C280.004 143.455 280.358 143.104 280.702 142.745C280.497 142.859 280.29 142.972 280.081 143.083C279.871 143.196 279.658 143.305 279.442 143.412C279.352 143.459 279.261 143.505 279.168 143.548L279.165 143.549C279.071 143.595 278.977 143.64 278.885 143.682C278.587 143.966 278.281 144.241 277.968 144.51C277.847 144.615 277.725 144.718 277.603 144.821C277.696 144.786 277.786 144.752 277.878 144.714C277.918 144.698 277.956 144.684 277.994 144.668C278.055 144.643 278.118 144.618 278.18 144.591C278.212 144.579 278.244 144.565 278.276 144.553C278.411 144.498 278.546 144.442 278.679 144.385C278.891 144.297 279.102 144.204 279.312 144.11C279.405 144.068 279.497 144.026 279.59 143.983C279.63 143.965 279.672 143.948 279.712 143.928C279.754 143.911 279.795 143.891 279.835 143.872C280.054 143.77 280.269 143.666 280.485 143.56C280.574 143.515 280.665 143.471 280.755 143.424L280.756 143.422C280.771 143.415 280.786 143.407 280.8 143.399C280.892 143.351 280.985 143.303 281.075 143.255C281.086 143.25 281.094 143.244 281.104 143.24C281.189 143.193 281.275 143.147 281.359 143.1C281.453 143.047 281.548 142.993 281.641 142.941C281.828 142.833 282.014 142.721 282.198 142.61C282.219 142.598 282.239 142.584 282.258 142.572C281.89 142.745 281.514 142.906 281.135 143.065L281.134 143.065ZM284.389 141.041C284.41 141.023 284.433 141.005 284.455 140.986C284.458 140.982 284.458 140.981 284.462 140.977C284.437 140.999 284.413 141.02 284.389 141.041ZM282.286 141.628C282.269 141.639 282.255 141.649 282.239 141.658C282.091 141.758 281.94 141.853 281.789 141.948C281.619 142.056 281.446 142.162 281.271 142.264C281.189 142.311 281.107 142.359 281.026 142.406C281.026 142.406 281.025 142.407 281.022 142.409C280.918 142.468 280.813 142.527 280.709 142.585C280.615 142.637 280.519 142.688 280.426 142.739C280.332 142.791 280.237 142.842 280.141 142.893C280.024 142.956 279.906 143.018 279.785 143.077C279.761 143.09 279.735 143.104 279.71 143.116C279.684 143.128 279.658 143.143 279.633 143.155C279.594 143.177 279.553 143.197 279.508 143.217C279.506 143.218 279.503 143.219 279.503 143.221C279.49 143.227 279.477 143.236 279.462 143.241C279.385 143.28 279.309 143.319 279.231 143.355C279.228 143.356 279.228 143.358 279.225 143.359C279.157 143.392 279.086 143.427 279.015 143.459C278.659 143.63 278.298 143.796 277.937 143.957C277.765 144.034 277.592 144.109 277.42 144.184L277.415 144.187C277.256 144.256 277.095 144.326 276.936 144.396C277.284 144.15 277.623 143.891 277.952 143.617C278.076 143.514 278.197 143.409 278.318 143.301C278.353 143.271 278.387 143.241 278.421 143.211C278.44 143.192 278.461 143.174 278.481 143.153C278.52 143.12 278.555 143.086 278.59 143.052L278.595 143.05C278.61 143.036 278.624 143.022 278.639 143.008C278.728 142.927 278.816 142.844 278.901 142.758C279.037 142.626 279.168 142.492 279.297 142.354C279.314 142.336 279.331 142.319 279.348 142.3C279.414 142.232 279.479 142.159 279.541 142.089C279.553 142.078 279.564 142.065 279.574 142.054C279.588 142.04 279.599 142.026 279.612 142.012L279.613 142.01C279.74 141.869 279.863 141.726 279.985 141.581L279.986 141.579C279.994 141.572 280.002 141.562 280.009 141.554C280.071 141.478 280.133 141.403 280.196 141.326C280.23 141.283 280.264 141.24 280.297 141.197C280.298 141.195 280.301 141.193 280.301 141.192C280.354 141.124 280.408 141.056 280.459 140.985C280.835 140.492 281.184 139.977 281.514 139.456C281.911 138.805 282.283 138.144 282.633 137.476C282.972 136.8 283.311 136.127 283.62 135.443C283.745 135.174 283.867 134.905 283.99 134.636C284.107 134.379 284.222 134.124 284.335 133.867C284.341 133.854 284.347 133.839 284.353 133.826L284.355 133.821C284.361 133.81 284.366 133.795 284.372 133.784L284.373 133.781C284.493 133.509 284.612 133.233 284.727 132.96C284.844 132.685 284.956 132.409 285.069 132.133C285.083 132.098 285.098 132.061 285.113 132.026L285.115 132.018C285.179 131.859 285.243 131.698 285.303 131.538C285.335 131.456 285.367 131.376 285.398 131.295C285.327 131.401 285.259 131.507 285.19 131.614L285.189 131.616C285.171 131.644 285.154 131.669 285.138 131.697C285.018 131.879 284.902 132.062 284.787 132.248C284.773 132.268 284.759 132.291 284.746 132.312L284.745 132.313C284.739 132.324 284.732 132.334 284.726 132.345C284.652 132.46 284.58 132.576 284.51 132.693L284.509 132.695C284.495 132.718 284.481 132.74 284.467 132.763C284.374 132.916 284.281 133.067 284.19 133.221C283.805 133.862 283.432 134.508 283.067 135.159C282.692 135.81 282.344 136.473 281.969 137.116C281.787 137.44 281.603 137.764 281.416 138.086C281.229 138.405 281.037 138.721 280.839 139.034C280.782 139.126 280.724 139.218 280.667 139.309C280.615 139.395 280.561 139.477 280.506 139.561C280.502 139.568 280.497 139.575 280.493 139.582C280.489 139.587 280.487 139.592 280.483 139.597C280.299 139.879 280.112 140.157 279.918 140.431L279.917 140.435C279.911 140.441 279.906 140.448 279.902 140.455C279.823 140.567 279.742 140.678 279.66 140.788C279.563 140.921 279.465 141.051 279.366 141.179C279.344 141.205 279.324 141.232 279.302 141.26C279.233 141.35 279.161 141.441 279.088 141.529C278.804 141.888 278.507 142.235 278.197 142.575C278.18 142.594 278.16 142.615 278.143 142.634L278.14 142.635C278.039 142.745 277.936 142.855 277.832 142.964C277.789 143.01 277.743 143.058 277.698 143.103C277.619 143.183 277.541 143.264 277.461 143.343C277.229 143.574 276.992 143.802 276.75 144.025C276.633 144.132 276.516 144.239 276.398 144.343C276.382 144.357 276.365 144.372 276.349 144.386C276.293 144.438 276.233 144.489 276.174 144.54C276.041 144.656 275.906 144.771 275.769 144.886C275.752 144.893 275.737 144.9 275.72 144.907C275.71 144.912 275.698 144.914 275.688 144.919C275.64 145.029 275.591 145.138 275.544 145.25C275.517 145.308 275.491 145.367 275.466 145.426C275.437 145.491 275.41 145.558 275.38 145.626C275.39 145.623 275.397 145.619 275.407 145.616C275.904 145.445 276.401 145.268 276.901 145.085C277.113 145.007 277.326 144.927 277.538 144.845C277.559 144.839 277.579 144.829 277.601 144.822C277.601 144.822 277.601 144.82 277.603 144.821C277.725 144.718 277.847 144.615 277.968 144.509C278.28 144.241 278.586 143.966 278.885 143.681C278.978 143.64 279.071 143.594 279.165 143.549L279.167 143.547C279.26 143.504 279.352 143.458 279.442 143.411C279.658 143.305 279.871 143.196 280.081 143.083C280.29 142.972 280.497 142.859 280.701 142.744C280.358 143.103 280.004 143.454 279.643 143.799C279.731 143.757 279.819 143.716 279.907 143.675C280.12 143.576 280.333 143.473 280.544 143.369C280.742 143.272 280.939 143.17 281.134 143.064C281.104 143.077 281.072 143.089 281.043 143.102C281.472 142.623 281.887 142.132 282.285 141.627L282.286 141.628ZM288.523 134.172C288.565 134.053 288.604 133.933 288.644 133.813L288.648 133.8C288.668 133.736 288.687 133.675 288.708 133.61C288.788 133.343 288.863 133.076 288.935 132.809C288.967 132.693 288.998 132.58 289.027 132.465C289.083 132.249 289.136 132.034 289.185 131.819C289.217 131.691 289.247 131.563 289.275 131.433C289.432 130.694 289.587 129.956 289.712 129.215C289.974 127.737 290.209 126.252 290.365 124.749C290.245 125.108 290.129 125.467 290.019 125.827C289.979 125.953 289.943 126.075 289.907 126.199C289.836 126.433 289.767 126.669 289.698 126.904C289.631 127.14 289.562 127.375 289.497 127.611C289.439 127.822 289.383 128.033 289.326 128.245C289.25 128.524 289.176 128.804 289.105 129.082C288.908 129.808 288.74 130.535 288.543 131.255C288.359 131.976 288.166 132.695 287.943 133.399C287.923 133.462 287.905 133.527 287.883 133.589C287.848 133.71 287.811 133.828 287.772 133.947L287.764 133.969C287.715 134.125 287.663 134.28 287.61 134.432C287.538 134.64 287.462 134.848 287.384 135.055L287.383 135.057C287.303 135.269 287.219 135.48 287.134 135.689C287.101 135.772 287.067 135.853 287.032 135.935C286.998 136.014 286.964 136.095 286.928 136.173C286.908 136.221 286.888 136.266 286.867 136.314L286.866 136.316C286.831 136.392 286.797 136.467 286.762 136.543C286.689 136.705 286.613 136.864 286.535 137.022C286.458 137.183 286.378 137.341 286.296 137.498C286.097 137.877 285.889 138.254 285.668 138.624C285.595 138.748 285.521 138.87 285.445 138.993C285.281 139.161 285.114 139.329 284.944 139.491C284.605 139.818 284.254 140.132 283.892 140.43C283.865 140.452 283.838 140.475 283.81 140.494C284.47 140.372 285.149 140.295 285.821 140.206C285.932 140.099 286.04 139.987 286.145 139.874C286.218 139.657 286.289 139.439 286.358 139.221C286.411 139.056 286.462 138.891 286.514 138.723C286.65 138.276 286.784 137.825 286.913 137.373C286.996 137.085 287.079 136.798 287.168 136.511C287.215 136.35 287.264 136.191 287.316 136.029L287.316 136.027C287.336 135.965 287.356 135.902 287.375 135.839C287.436 135.78 287.496 135.721 287.555 135.66C287.698 135.517 287.835 135.369 287.97 135.218C287.908 135.464 287.851 135.712 287.795 135.959C287.791 135.977 287.787 135.995 287.785 136.013L287.769 136.077C287.773 136.07 287.778 136.063 287.781 136.054C287.795 136.027 287.806 135.999 287.82 135.972C287.848 135.908 287.879 135.843 287.908 135.779C287.943 135.703 287.976 135.626 288.007 135.548C288.037 135.481 288.065 135.413 288.092 135.344C288.107 135.307 288.122 135.27 288.137 135.235C288.184 135.117 288.23 134.996 288.274 134.876C288.28 134.866 288.283 134.856 288.287 134.845C288.287 134.843 288.291 134.84 288.291 134.838C288.292 134.834 288.292 134.83 288.293 134.828C288.374 134.61 288.45 134.392 288.524 134.171L288.523 134.172ZM291.49 128.265C291.455 128.379 291.418 128.492 291.38 128.606C291.219 129.108 291.046 129.606 290.86 130.1C290.528 130.991 290.157 131.865 289.746 132.717C289.769 132.681 289.791 132.642 289.812 132.605C290.12 132.052 290.405 131.49 290.67 130.921C290.838 130.553 291.004 130.183 291.161 129.815L291.162 129.811C291.289 129.299 291.399 128.783 291.49 128.265L291.49 128.265ZM291.868 128.086C291.87 128.049 291.875 128.011 291.882 127.973C291.902 127.915 291.921 127.856 291.939 127.797C291.94 127.793 291.94 127.787 291.942 127.783C291.923 127.838 291.905 127.895 291.886 127.949C291.808 128.179 291.729 128.409 291.647 128.637C291.722 128.452 291.796 128.27 291.868 128.086L291.868 128.086ZM255.264 144.18C255.209 144.229 255.153 144.277 255.099 144.328C255.176 144.257 255.254 144.19 255.334 144.123C255.311 144.142 255.287 144.161 255.264 144.181L255.264 144.18ZM262.865 131.592C262.767 131.605 262.669 131.622 262.573 131.639C262.459 131.658 262.346 131.68 262.232 131.704C262.182 131.714 262.132 131.724 262.082 131.736C262.055 131.742 262.03 131.748 262.002 131.755C261.993 131.76 261.988 131.769 261.982 131.775C261.954 131.806 261.928 131.839 261.899 131.869C261.916 131.832 261.933 131.801 261.952 131.765C261.932 131.768 261.913 131.773 261.892 131.778C261.78 131.804 261.667 131.833 261.556 131.862C261.522 131.995 261.492 132.13 261.468 132.267C261.384 132.377 261.299 132.488 261.22 132.6C261.164 132.676 261.11 132.752 261.059 132.826C261.093 132.815 261.127 132.801 261.16 132.79C261.317 132.734 261.474 132.68 261.631 132.629C261.704 132.606 261.776 132.582 261.847 132.56C261.954 132.526 262.06 132.493 262.167 132.463C262.188 132.455 262.212 132.449 262.235 132.442C262.212 132.447 262.191 132.454 262.168 132.461L262.361 132.231L262.539 132.021C262.664 131.875 262.787 131.732 262.913 131.587C262.896 131.587 262.881 131.59 262.865 131.593L262.865 131.592ZM260.262 140.726C260.22 140.73 260.178 140.735 260.138 140.742C260.064 140.75 259.992 140.763 259.918 140.775C259.864 140.786 259.809 140.797 259.755 140.807C259.672 140.821 259.59 140.84 259.509 140.859C259.468 140.868 259.429 140.878 259.389 140.889C259.36 140.896 259.331 140.905 259.301 140.911C259.285 140.916 259.269 140.921 259.252 140.926C259.152 140.952 259.052 140.981 258.955 141.012C258.905 141.027 258.857 141.044 258.81 141.059L258.807 141.06C258.679 141.102 258.554 141.147 258.43 141.197C258.415 141.202 258.4 141.208 258.386 141.213C258.325 141.236 258.264 141.26 258.205 141.285C258.168 141.3 258.133 141.315 258.099 141.331C258.081 141.339 258.061 141.347 258.043 141.356L258.042 141.355C257.483 141.6 256.948 141.896 256.447 142.243L256.446 142.245C256.394 142.279 256.341 142.316 256.291 142.353L256.138 142.465C256.116 142.48 256.095 142.496 256.073 142.514C255.993 142.574 255.914 142.638 255.833 142.7C255.813 142.714 255.795 142.729 255.778 142.744C255.734 142.779 255.692 142.815 255.65 142.851C255.606 142.887 255.564 142.923 255.524 142.96C255.44 143.032 255.357 143.106 255.276 143.183L255.275 143.185C255.287 143.454 255.303 143.723 255.322 143.991C255.325 144.036 255.329 144.078 255.333 144.121C255.48 143.995 255.629 143.872 255.78 143.751C255.801 143.733 255.823 143.716 255.844 143.698C255.87 143.678 255.895 143.657 255.921 143.636C255.996 143.576 256.072 143.516 256.148 143.456C256.237 143.388 256.326 143.319 256.414 143.253C256.435 143.235 256.457 143.22 256.48 143.203C256.523 143.169 256.567 143.136 256.612 143.103C256.929 142.867 257.252 142.64 257.579 142.421L257.579 142.419C257.584 142.418 257.586 142.417 257.59 142.414C257.625 142.39 257.663 142.366 257.699 142.342C257.724 142.326 257.748 142.309 257.777 142.293C257.78 142.29 257.781 142.288 257.783 142.287C257.833 142.254 257.884 142.221 257.938 142.189C257.957 142.177 257.976 142.164 257.995 142.152C258.105 142.078 258.217 142.008 258.334 141.939C258.351 141.926 258.369 141.915 258.388 141.905C258.421 141.883 258.455 141.863 258.487 141.842C258.616 141.763 258.747 141.684 258.878 141.607C258.992 141.54 259.106 141.473 259.225 141.41C259.241 141.4 259.259 141.39 259.275 141.381L259.275 141.379C259.388 141.317 259.495 141.257 259.605 141.194C259.761 141.107 259.918 141.02 260.077 140.932C260.215 140.856 260.356 140.779 260.496 140.701C260.418 140.707 260.339 140.716 260.26 140.726L260.262 140.726ZM266.437 131.86C266.399 131.969 266.365 132.079 266.329 132.189C266.308 132.254 266.287 132.316 266.269 132.379C266.323 132.206 266.378 132.034 266.437 131.86ZM264.627 147.981C264.627 147.967 264.631 147.951 264.632 147.935C264.589 147.869 264.553 147.8 264.516 147.73C264.412 147.525 264.328 147.311 264.267 147.094C264.234 146.987 264.209 146.882 264.187 146.776C264.05 146.119 264.044 145.458 264.077 144.815C264.117 144.167 264.197 143.546 264.261 142.917C264.329 142.29 264.41 141.663 264.49 141.038C264.527 140.748 264.567 140.456 264.609 140.165C264.615 140.112 264.623 140.058 264.631 140.004C264.637 140 264.643 139.995 264.649 139.989C264.661 139.98 264.672 139.972 264.684 139.961C264.739 139.597 264.8 139.233 264.867 138.87C265.075 137.704 265.326 136.544 265.633 135.395C265.714 135.103 265.8 134.812 265.888 134.523C265.914 134.439 265.94 134.353 265.967 134.27C266.012 134.128 266.056 133.988 266.103 133.848C266.123 133.783 266.143 133.72 266.165 133.656C266.071 133.664 265.98 133.672 265.888 133.683C265.898 133.65 265.907 133.616 265.915 133.582C265.914 133.58 265.912 133.579 265.909 133.58C265.899 133.615 265.889 133.649 265.881 133.685C265.872 133.711 265.866 133.736 265.858 133.763L265.855 133.773C265.848 133.806 265.838 133.84 265.829 133.873C265.814 133.929 265.799 133.983 265.786 134.039C265.743 134.199 265.701 134.362 265.662 134.523C265.618 134.7 265.574 134.876 265.533 135.054C265.505 135.172 265.476 135.291 265.45 135.41C265.417 135.546 265.387 135.683 265.358 135.82C265.318 135.996 265.28 136.172 265.244 136.35C265.203 136.542 265.163 136.734 265.126 136.928C265.101 137.046 265.08 137.163 265.057 137.279C265.024 137.453 264.991 137.627 264.96 137.8C264.89 138.186 264.823 138.573 264.76 138.96C264.752 139.014 264.743 139.066 264.736 139.12C264.708 139.286 264.683 139.451 264.658 139.62C264.635 139.757 264.615 139.895 264.596 140.034C264.588 140.088 264.581 140.141 264.572 140.195C264.522 140.54 264.475 140.883 264.431 141.228C264.351 141.854 264.27 142.481 264.202 143.108C264.138 143.737 264.058 144.357 264.018 145.005C263.985 145.649 263.991 146.31 264.128 146.966C264.137 147.007 264.145 147.05 264.156 147.092C264.222 147.376 264.322 147.657 264.457 147.921C264.476 147.957 264.495 147.993 264.516 148.03C264.534 148.061 264.552 148.095 264.573 148.125C264.579 148.138 264.588 148.15 264.595 148.16C264.597 148.165 264.602 148.171 264.604 148.176L264.605 148.174C264.614 148.11 264.621 148.047 264.627 147.982L264.627 147.981ZM275.259 145.095C275.252 145.099 275.245 145.1 275.237 145.104C275.123 145.149 275.009 145.198 274.894 145.244C274.299 145.489 273.707 145.74 273.111 145.963C272.984 146.012 272.857 146.058 272.729 146.104C272.609 146.147 272.488 146.187 272.368 146.223C272.316 146.239 272.266 146.257 272.214 146.271C272.127 146.298 272.04 146.324 271.952 146.347C271.95 146.348 271.949 146.35 271.947 146.349C271.847 146.378 271.747 146.404 271.646 146.428C271.768 146.34 271.887 146.251 272.007 146.16C272.166 146.04 272.323 145.916 272.479 145.788C272.479 145.788 272.48 145.786 272.481 145.787C272.542 145.739 272.605 145.691 272.665 145.642C272.726 145.592 272.79 145.542 272.849 145.493C272.746 145.529 272.644 145.563 272.541 145.597C272.54 145.596 272.539 145.598 272.539 145.598C272.283 145.68 272.025 145.763 271.765 145.844C271.505 145.918 271.243 145.987 270.977 146.044L270.975 146.044C270.931 146.094 270.883 146.14 270.836 146.19C270.852 146.149 270.867 146.105 270.882 146.064C270.779 146.086 270.678 146.103 270.576 146.12C270.556 146.251 270.535 146.38 270.513 146.509C270.361 146.655 270.207 146.801 270.059 146.95C270.012 146.999 269.965 147.046 269.917 147.093C269.502 147.505 269.061 147.885 268.619 148.266C268.445 148.415 268.273 148.566 268.102 148.717C268.105 148.716 268.107 148.715 268.11 148.714C268.26 148.629 268.409 148.544 268.559 148.457C268.636 148.412 268.714 148.367 268.792 148.32C268.871 148.274 268.948 148.229 269.025 148.182C269.181 148.091 269.334 147.996 269.487 147.9C269.618 147.821 269.748 147.74 269.875 147.657C270.203 147.445 270.528 147.226 270.849 147.005C270.85 147.006 270.851 147.004 270.851 147.004C270.906 146.966 270.962 146.928 271.017 146.891C271.088 146.837 271.161 146.785 271.234 146.732C271.264 146.73 271.29 146.728 271.319 146.725C271.397 146.719 271.476 146.71 271.553 146.699C271.659 146.687 271.761 146.672 271.863 146.655L271.866 146.654C271.911 146.646 271.956 146.637 272.001 146.629C272.1 146.611 272.199 146.592 272.297 146.571C272.613 146.504 272.926 146.421 273.235 146.332C273.549 146.234 273.861 146.136 274.17 146.035C274.17 146.035 274.172 146.035 274.172 146.034C274.45 145.942 274.725 145.85 274.999 145.758C275.001 145.756 275.004 145.755 275.006 145.754C275.13 145.713 275.257 145.67 275.381 145.625C275.411 145.558 275.438 145.491 275.468 145.425C275.492 145.366 275.519 145.308 275.545 145.25C275.593 145.138 275.641 145.028 275.69 144.919C275.545 144.976 275.405 145.035 275.26 145.094L275.259 145.095ZM281.134 143.065C280.939 143.171 280.742 143.273 280.544 143.37C280.333 143.474 280.12 143.577 279.907 143.676C279.819 143.717 279.731 143.758 279.643 143.8C280.004 143.455 280.358 143.104 280.702 142.745C280.497 142.86 280.29 142.973 280.081 143.084C279.871 143.196 279.658 143.306 279.442 143.412C279.352 143.459 279.26 143.505 279.167 143.548L279.165 143.549C279.071 143.595 278.977 143.64 278.885 143.682C278.586 143.966 278.281 144.241 277.968 144.51C277.847 144.616 277.725 144.719 277.603 144.822C277.696 144.786 277.786 144.752 277.878 144.715C277.918 144.699 277.956 144.685 277.993 144.668C278.055 144.643 278.118 144.619 278.18 144.592C278.212 144.58 278.244 144.565 278.276 144.553C278.411 144.499 278.546 144.443 278.679 144.386C278.891 144.297 279.102 144.204 279.312 144.11C279.404 144.069 279.497 144.027 279.59 143.983C279.63 143.965 279.672 143.948 279.712 143.929C279.754 143.911 279.795 143.892 279.835 143.872C280.054 143.771 280.269 143.667 280.485 143.56C280.574 143.515 280.665 143.471 280.755 143.424L280.756 143.422C280.771 143.415 280.786 143.408 280.8 143.4C280.892 143.352 280.985 143.304 281.075 143.255C281.085 143.25 281.094 143.245 281.104 143.24C281.189 143.194 281.275 143.147 281.359 143.101C281.453 143.047 281.548 142.993 281.641 142.942C281.828 142.834 282.014 142.722 282.198 142.61C282.219 142.599 282.239 142.585 282.258 142.572C281.89 142.746 281.514 142.906 281.135 143.065L281.134 143.065ZM284.389 141.041C284.41 141.023 284.433 141.006 284.454 140.986C284.458 140.983 284.458 140.981 284.461 140.978C284.437 140.999 284.413 141.02 284.389 141.041ZM268.062 119.483C268.062 119.483 268.06 119.485 268.059 119.486C268.062 119.485 268.064 119.486 268.064 119.484L268.062 119.483ZM282.001 133.513L282 133.517C281.884 133.778 281.766 134.038 281.643 134.297C281.372 134.866 281.081 135.424 280.771 135.974C280.483 136.487 280.182 136.993 279.87 137.492C279.226 138.528 278.501 139.513 277.736 140.461C277.558 140.683 277.376 140.903 277.19 141.118C276.937 141.466 276.674 141.805 276.398 142.134C276.424 142.106 276.451 142.079 276.476 142.05C276.542 141.98 276.605 141.907 276.669 141.837C276.825 141.662 276.979 141.485 277.131 141.308C277.317 141.093 277.499 140.874 277.676 140.651C278.441 139.703 279.166 138.718 279.81 137.682C279.889 137.558 279.966 137.433 280.041 137.307C280.119 137.18 280.194 137.055 280.269 136.929C280.371 136.758 280.47 136.588 280.569 136.416L280.571 136.41C280.619 136.328 280.666 136.247 280.712 136.164C280.714 136.159 280.717 136.156 280.719 136.15C280.779 136.044 280.838 135.939 280.896 135.832C280.93 135.77 280.964 135.71 280.996 135.648C281.053 135.543 281.109 135.439 281.162 135.333C281.225 135.213 281.288 135.092 281.347 134.971C281.428 134.81 281.507 134.65 281.584 134.487C281.646 134.359 281.706 134.228 281.766 134.097C281.824 133.972 281.881 133.844 281.938 133.717L281.942 133.703C281.99 133.598 282.037 133.492 282.083 133.384C282.055 133.427 282.029 133.47 282.002 133.514L282.001 133.513ZM285.189 131.615L285.189 131.617C285.171 131.644 285.153 131.67 285.137 131.698C285.017 131.88 284.901 132.063 284.786 132.248C284.773 132.269 284.759 132.292 284.745 132.312L284.744 132.314C284.739 132.325 284.731 132.335 284.725 132.345C284.651 132.461 284.58 132.577 284.509 132.694L284.509 132.696C284.495 132.718 284.481 132.741 284.466 132.763C284.373 132.916 284.281 133.067 284.19 133.221C283.805 133.863 283.431 134.509 283.067 135.159C282.691 135.81 282.344 136.473 281.969 137.116C281.787 137.441 281.603 137.764 281.415 138.087C281.229 138.405 281.037 138.722 280.838 139.035C280.781 139.127 280.724 139.219 280.667 139.31C280.614 139.395 280.56 139.478 280.506 139.562C280.501 139.569 280.497 139.575 280.492 139.582C280.488 139.587 280.486 139.593 280.483 139.598C280.299 139.879 280.111 140.158 279.918 140.432L279.916 140.436C279.91 140.442 279.905 140.449 279.901 140.456C279.822 140.568 279.741 140.678 279.659 140.789C279.562 140.922 279.464 141.052 279.365 141.18C279.343 141.206 279.324 141.233 279.301 141.261C279.232 141.351 279.16 141.442 279.088 141.53C278.803 141.888 278.506 142.236 278.196 142.575C278.179 142.595 278.159 142.615 278.142 142.634C278.391 142.495 278.632 142.352 278.872 142.201C279.141 142.033 279.405 141.859 279.661 141.674C279.65 141.738 279.64 141.802 279.633 141.865C279.62 141.879 279.609 141.892 279.596 141.906C279.308 142.224 279.013 142.53 278.698 142.819C278.475 143.028 278.245 143.232 278.011 143.427C278.092 143.386 278.172 143.344 278.252 143.302L278.255 143.301C278.307 143.273 278.359 143.244 278.411 143.216C278.415 143.215 278.418 143.212 278.421 143.211C278.44 143.192 278.461 143.174 278.481 143.154C278.52 143.121 278.555 143.087 278.59 143.052L278.595 143.05C278.61 143.036 278.623 143.022 278.639 143.008C278.728 142.927 278.816 142.844 278.901 142.758C279.037 142.626 279.168 142.493 279.297 142.354C279.314 142.337 279.331 142.319 279.348 142.3C279.413 142.232 279.479 142.16 279.541 142.089C279.553 142.079 279.564 142.065 279.574 142.054C279.588 142.04 279.598 142.027 279.612 142.012L279.613 142.011C279.74 141.869 279.863 141.727 279.985 141.581L279.985 141.58C279.994 141.572 280.002 141.562 280.009 141.554C280.071 141.479 280.133 141.403 280.196 141.326C280.23 141.283 280.263 141.24 280.297 141.197C280.298 141.195 280.301 141.194 280.301 141.192C280.354 141.124 280.407 141.056 280.459 140.986C280.835 140.492 281.184 139.978 281.514 139.456C281.91 138.806 282.283 138.145 282.632 137.476C282.972 136.8 283.311 136.128 283.62 135.443C283.744 135.175 283.867 134.905 283.99 134.636C284.106 134.38 284.222 134.125 284.335 133.867C284.341 133.854 284.347 133.839 284.353 133.827L284.355 133.821C284.361 133.811 284.366 133.796 284.372 133.785L284.373 133.781C284.493 133.509 284.611 133.234 284.727 132.96C284.844 132.685 284.956 132.41 285.069 132.133C285.083 132.098 285.098 132.061 285.113 132.026L285.115 132.018C285.179 131.859 285.243 131.698 285.303 131.538C285.335 131.456 285.367 131.377 285.398 131.295C285.327 131.401 285.258 131.508 285.19 131.615L285.189 131.615ZM287.839 125.37C287.773 125.423 287.705 125.473 287.636 125.525C287.614 125.588 287.594 125.652 287.576 125.716C287.645 125.664 287.713 125.613 287.78 125.561C287.792 125.55 287.805 125.542 287.817 125.531L287.818 125.53C287.824 125.475 287.831 125.425 287.839 125.37ZM288.523 134.172C288.565 134.053 288.604 133.933 288.644 133.813L288.648 133.8C288.668 133.736 288.687 133.675 288.708 133.61C288.788 133.343 288.863 133.076 288.935 132.809C288.967 132.693 288.998 132.58 289.027 132.465C289.083 132.249 289.136 132.034 289.185 131.819C289.217 131.691 289.247 131.563 289.275 131.433C289.432 130.694 289.587 129.956 289.712 129.215C289.974 127.737 290.209 126.252 290.365 124.749C290.245 125.108 290.129 125.467 290.019 125.827C289.979 125.953 289.943 126.075 289.907 126.199C289.836 126.433 289.767 126.669 289.698 126.904C289.631 127.14 289.562 127.375 289.497 127.611C289.439 127.822 289.383 128.033 289.326 128.245C289.25 128.524 289.176 128.804 289.105 129.082C288.908 129.808 288.74 130.535 288.543 131.255C288.359 131.976 288.166 132.695 287.943 133.399C287.923 133.462 287.905 133.527 287.883 133.589C287.848 133.71 287.811 133.828 287.772 133.947L287.764 133.969C287.715 134.125 287.663 134.28 287.61 134.432C287.538 134.64 287.462 134.848 287.384 135.055L287.383 135.057C287.303 135.269 287.219 135.48 287.134 135.689C287.101 135.772 287.067 135.853 287.032 135.935C286.998 136.014 286.964 136.095 286.928 136.173C286.908 136.221 286.888 136.266 286.867 136.314L286.866 136.316C286.831 136.392 286.797 136.467 286.762 136.543C286.689 136.705 286.613 136.864 286.535 137.022C286.458 137.183 286.378 137.341 286.296 137.498C286.097 137.877 285.889 138.254 285.668 138.624C285.595 138.748 285.521 138.87 285.445 138.993C285.281 139.161 285.114 139.329 284.944 139.491C284.605 139.818 284.254 140.132 283.892 140.43C283.865 140.452 283.838 140.475 283.81 140.494C283.654 140.622 283.498 140.746 283.338 140.868C283.059 141.089 282.771 141.299 282.476 141.5C282.414 141.544 282.351 141.585 282.287 141.626L282.286 141.628C282.27 141.639 282.256 141.649 282.24 141.658C282.091 141.758 281.94 141.853 281.789 141.948C281.619 142.056 281.446 142.162 281.272 142.264C281.19 142.311 281.108 142.359 281.026 142.406C281.026 142.406 281.025 142.407 281.023 142.409C280.916 142.522 280.811 142.633 280.702 142.745C280.358 143.104 280.005 143.455 279.643 143.799C279.731 143.758 279.819 143.717 279.907 143.676C280.121 143.577 280.333 143.474 280.544 143.37C280.743 143.272 280.94 143.17 281.134 143.065C281.514 142.906 281.89 142.746 282.257 142.572L282.265 142.568C282.396 142.487 282.528 142.405 282.659 142.32C282.783 142.24 282.906 142.161 283.025 142.078C283.159 141.988 283.291 141.894 283.422 141.799C283.557 141.702 283.691 141.602 283.821 141.499C283.902 141.436 283.981 141.373 284.06 141.31C284.133 141.251 284.203 141.193 284.274 141.134C284.313 141.103 284.351 141.072 284.389 141.041C284.41 141.023 284.433 141.006 284.454 140.986C284.458 140.983 284.46 140.982 284.463 140.978C284.387 141.066 284.31 141.154 284.231 141.241C284.154 141.33 284.075 141.416 283.997 141.503C283.907 141.605 283.816 141.703 283.724 141.802C283.81 141.75 283.895 141.699 283.981 141.645C284.401 141.382 284.805 141.097 285.184 140.782C285.405 140.6 285.617 140.408 285.82 140.206C285.931 140.099 286.039 139.988 286.144 139.874C286.217 139.658 286.288 139.44 286.357 139.222C286.41 139.057 286.461 138.891 286.513 138.724C286.672 138.212 286.824 137.699 286.971 137.183C287.034 136.961 287.1 136.735 287.166 136.512C287.214 136.351 287.263 136.191 287.314 136.03L287.315 136.028C287.335 135.966 287.354 135.903 287.374 135.84C287.435 135.781 287.495 135.722 287.554 135.661C287.697 135.518 287.834 135.37 287.969 135.219C287.907 135.464 287.85 135.713 287.794 135.96C287.783 135.984 287.773 136.008 287.761 136.031C287.755 136.046 287.749 136.059 287.742 136.073C287.746 136.066 287.751 136.059 287.755 136.052C287.764 136.039 287.773 136.027 287.784 136.014L287.768 136.078C287.772 136.071 287.777 136.064 287.78 136.055C287.793 136.028 287.805 136 287.819 135.973C287.847 135.909 287.878 135.844 287.907 135.78C287.942 135.704 287.975 135.627 288.006 135.549C288.035 135.482 288.063 135.413 288.091 135.345C288.106 135.308 288.121 135.271 288.135 135.236C288.183 135.118 288.229 134.997 288.273 134.877C288.278 134.866 288.282 134.857 288.286 134.846C288.286 134.844 288.289 134.841 288.29 134.839C288.291 134.835 288.291 134.831 288.291 134.829C288.373 134.611 288.449 134.393 288.523 134.172L288.523 134.172ZM291.49 128.265C291.455 128.379 291.418 128.492 291.38 128.606C291.219 129.108 291.046 129.606 290.86 130.1C290.528 130.991 290.157 131.865 289.746 132.717C289.769 132.681 289.791 132.642 289.812 132.605C290.12 132.052 290.405 131.49 290.67 130.921C290.838 130.553 291.004 130.183 291.161 129.815L291.162 129.811C291.289 129.299 291.399 128.783 291.49 128.265L291.49 128.265ZM292.356 126.467C292.38 126.392 292.402 126.317 292.421 126.242C292.654 125.455 292.859 124.658 293.036 123.856C293.035 123.847 293.03 123.837 293.026 123.829C293.024 123.841 293.02 123.853 293.018 123.865C293.005 123.926 292.991 123.986 292.976 124.046C292.934 124.247 292.888 124.447 292.837 124.647C292.791 124.848 292.741 125.045 292.689 125.244C292.641 125.432 292.592 125.621 292.54 125.808C292.531 125.841 292.522 125.873 292.512 125.906C292.481 126.021 292.449 126.138 292.415 126.253C292.398 126.315 292.382 126.373 292.361 126.433C292.359 126.44 292.358 126.448 292.355 126.456L292.355 126.458C292.336 126.525 292.317 126.59 292.296 126.659C292.286 126.693 292.276 126.728 292.266 126.762C292.296 126.663 292.326 126.566 292.355 126.469L292.356 126.467ZM291.939 127.797C291.94 127.794 291.94 127.787 291.941 127.783C291.923 127.838 291.905 127.895 291.886 127.95C291.808 128.18 291.729 128.409 291.647 128.638C291.722 128.453 291.796 128.27 291.868 128.086C291.885 128.044 291.902 127.999 291.919 127.957C291.925 127.904 291.931 127.851 291.939 127.797L291.939 127.797ZM283.881 141.309C283.364 141.713 282.815 142.08 282.257 142.42C281.889 142.644 281.514 142.862 281.134 143.065C280.939 143.171 280.742 143.273 280.544 143.37C280.333 143.474 280.12 143.577 279.907 143.676C279.819 143.717 279.731 143.758 279.643 143.8C280.004 143.455 280.358 143.104 280.702 142.745C280.81 142.633 280.916 142.522 281.022 142.41C280.918 142.468 280.813 142.527 280.709 142.585C280.615 142.637 280.519 142.688 280.426 142.74C280.332 142.791 280.236 142.843 280.141 142.893C280.024 142.956 279.906 143.018 279.784 143.077C279.761 143.09 279.735 143.104 279.71 143.117C279.684 143.129 279.658 143.143 279.633 143.155C279.594 143.177 279.553 143.197 279.508 143.217C279.506 143.219 279.503 143.22 279.502 143.222C279.49 143.228 279.476 143.236 279.462 143.241C279.385 143.28 279.308 143.319 279.231 143.355C279.228 143.356 279.227 143.358 279.225 143.359C279.148 143.434 279.073 143.507 278.995 143.579C278.96 143.613 278.922 143.648 278.885 143.682C278.587 143.966 278.281 144.241 277.968 144.51C277.633 144.646 277.298 144.772 276.961 144.895C276.461 145.078 275.964 145.255 275.466 145.426C275.491 145.367 275.518 145.309 275.544 145.251C275.592 145.139 275.64 145.029 275.689 144.92C275.544 144.977 275.404 145.036 275.259 145.095C275.252 145.099 275.245 145.1 275.237 145.104C275.179 145.248 275.124 145.393 275.073 145.54L275.065 145.565C275.041 145.628 275.019 145.69 274.998 145.757L274.997 145.759C274.997 145.759 275.003 145.756 275.005 145.755C275.129 145.713 275.256 145.671 275.38 145.626C275.39 145.623 275.397 145.619 275.407 145.616C275.904 145.446 276.402 145.269 276.901 145.085C277.114 145.007 277.326 144.928 277.538 144.845C277.559 144.84 277.579 144.83 277.601 144.823C277.601 144.823 277.602 144.821 277.603 144.821C277.696 144.786 277.786 144.752 277.878 144.714C277.918 144.698 277.956 144.684 277.994 144.668C278.055 144.643 278.118 144.618 278.18 144.591C278.212 144.579 278.244 144.565 278.276 144.553C278.411 144.498 278.546 144.442 278.679 144.385C278.891 144.297 279.102 144.204 279.312 144.11C279.405 144.068 279.497 144.026 279.59 143.983C279.63 143.965 279.672 143.948 279.712 143.928C279.754 143.911 279.795 143.891 279.835 143.872C280.054 143.77 280.269 143.666 280.485 143.56C280.574 143.515 280.665 143.471 280.755 143.424L280.756 143.422C280.771 143.415 280.786 143.407 280.8 143.399C280.892 143.351 280.985 143.303 281.075 143.255C281.086 143.25 281.094 143.244 281.104 143.24C281.189 143.193 281.275 143.147 281.359 143.1C281.453 143.047 281.548 142.993 281.641 142.941C281.828 142.833 282.014 142.721 282.198 142.61C282.219 142.598 282.239 142.584 282.258 142.572L282.266 142.568C282.397 142.487 282.529 142.405 282.659 142.319C282.784 142.24 282.906 142.161 283.025 142.078C283.16 141.987 283.291 141.894 283.423 141.799C283.558 141.702 283.692 141.601 283.822 141.499C283.902 141.436 283.981 141.373 284.06 141.31C284.216 141.139 284.368 140.962 284.521 140.787C284.312 140.965 284.1 141.14 283.881 141.309L283.881 141.309ZM260.261 140.726C260.22 140.731 260.178 140.735 260.138 140.742C260.063 140.75 259.991 140.763 259.917 140.775C259.863 140.786 259.809 140.797 259.754 140.807C259.672 140.821 259.589 140.841 259.509 140.859C259.468 140.868 259.429 140.878 259.389 140.889C259.359 140.896 259.331 140.905 259.301 140.912C259.284 140.916 259.268 140.921 259.252 140.926C259.152 140.953 259.051 140.981 258.954 141.013C258.905 141.027 258.857 141.044 258.809 141.059L258.807 141.061C258.679 141.103 258.553 141.148 258.429 141.197C258.415 141.202 258.4 141.208 258.385 141.213C258.325 141.237 258.264 141.26 258.204 141.286C258.168 141.3 258.133 141.316 258.098 141.331C258.08 141.34 258.061 141.347 258.043 141.356L258.041 141.355C257.482 141.6 256.948 141.897 256.446 142.243L256.446 142.245C256.394 142.28 256.341 142.316 256.29 142.353L256.138 142.465C256.115 142.48 256.095 142.497 256.072 142.514C255.992 142.575 255.913 142.638 255.833 142.7C255.813 142.714 255.795 142.729 255.777 142.744C255.733 142.78 255.691 142.816 255.649 142.852C255.605 142.887 255.563 142.923 255.523 142.96C255.439 143.032 255.356 143.106 255.275 143.183L255.274 143.185C255.286 143.454 255.303 143.724 255.321 143.991C255.298 144.01 255.276 144.03 255.254 144.052C255.142 144.148 255.033 144.245 254.923 144.344C254.875 144.386 254.826 144.43 254.779 144.475C254.781 144.518 254.786 144.557 254.79 144.601C254.814 144.578 254.839 144.555 254.864 144.534C254.941 144.464 255.019 144.396 255.097 144.329C255.174 144.258 255.252 144.191 255.332 144.124L255.333 144.122C255.48 143.996 255.628 143.873 255.779 143.752C255.8 143.734 255.823 143.717 255.844 143.699C255.87 143.678 255.894 143.657 255.92 143.637C255.996 143.577 256.072 143.516 256.147 143.457C256.236 143.388 256.325 143.32 256.414 143.254C256.435 143.236 256.457 143.221 256.48 143.203C256.523 143.17 256.566 143.136 256.611 143.104C256.929 142.868 257.252 142.641 257.579 142.422L257.579 142.42C257.584 142.419 257.586 142.418 257.589 142.415C257.625 142.391 257.663 142.367 257.699 142.343C257.723 142.326 257.748 142.31 257.777 142.294C257.78 142.291 257.78 142.289 257.783 142.288C257.833 142.255 257.884 142.222 257.937 142.19C257.956 142.177 257.975 142.165 257.994 142.153C258.104 142.079 258.217 142.008 258.333 141.94C258.351 141.927 258.369 141.916 258.387 141.906C258.42 141.883 258.455 141.864 258.487 141.843C258.616 141.763 258.746 141.685 258.878 141.608C258.992 141.54 259.106 141.474 259.224 141.41C259.24 141.401 259.259 141.391 259.275 141.381L259.275 141.38C259.387 141.317 259.495 141.257 259.605 141.195C259.761 141.108 259.917 141.021 260.076 140.933C260.215 140.857 260.355 140.779 260.496 140.701C260.418 140.708 260.339 140.717 260.26 140.727L260.261 140.726ZM266.506 131.634C266.486 131.631 266.465 131.626 266.445 131.623C266.378 131.608 266.312 131.598 266.247 131.586C266.228 131.584 266.21 131.582 266.191 131.577C266.106 131.565 266.022 131.552 265.94 131.541C265.831 131.526 265.722 131.514 265.612 131.503C265.571 131.499 265.529 131.495 265.488 131.491C265.412 131.484 265.336 131.479 265.262 131.474C265.154 131.469 265.049 131.464 264.943 131.46C264.807 131.456 264.673 131.454 264.537 131.457C264.479 131.456 264.42 131.456 264.362 131.459C264.279 131.46 264.196 131.463 264.112 131.468C264.061 131.469 264.008 131.471 263.955 131.477C263.707 131.489 263.457 131.512 263.208 131.544C263.177 131.548 263.149 131.55 263.12 131.555C263.091 131.56 263.062 131.563 263.031 131.569C262.991 131.574 262.951 131.579 262.913 131.585C262.897 131.588 262.88 131.59 262.864 131.593C262.767 131.606 262.668 131.622 262.572 131.639C262.458 131.659 262.345 131.681 262.232 131.705C262.182 131.715 262.132 131.725 262.081 131.737C262.054 131.742 262.029 131.748 262.001 131.755C261.992 131.757 261.983 131.758 261.976 131.76C261.973 131.758 261.968 131.761 261.965 131.762C261.961 131.762 261.956 131.763 261.951 131.766C261.931 131.769 261.913 131.773 261.892 131.779C261.779 131.805 261.666 131.833 261.555 131.862C261.551 131.863 261.548 131.864 261.544 131.865C261.404 131.903 261.267 131.941 261.128 131.983C260.978 132.028 260.826 132.077 260.677 132.13C260.546 132.173 260.416 132.221 260.287 132.271C260.183 132.31 260.078 132.352 259.975 132.394C259.941 132.407 259.907 132.421 259.874 132.435C259.862 132.441 259.847 132.449 259.834 132.455L259.854 132.428L259.866 132.411L260.058 132.174C260.014 132.191 259.97 132.207 259.925 132.221C259.724 132.297 259.523 132.362 259.314 132.418L259.312 132.417L259.206 132.62L259.164 132.696C259.148 132.725 259.134 132.753 259.119 132.784C258.986 132.852 258.853 132.919 258.721 132.991C258.689 133.01 258.656 133.028 258.624 133.046C258.502 133.113 258.378 133.184 258.258 133.256C258.248 133.261 258.239 133.269 258.229 133.274C258.221 133.279 258.211 133.284 258.203 133.29C257.984 133.421 257.772 133.559 257.566 133.705C257.547 133.766 257.53 133.827 257.512 133.891C257.46 134.077 257.41 134.262 257.362 134.45C257.359 134.466 257.354 134.479 257.351 134.494C257.346 134.497 257.343 134.5 257.338 134.502C257.334 134.506 257.33 134.506 257.327 134.509C257.039 134.694 256.756 134.886 256.48 135.087C256.455 135.153 256.432 135.218 256.41 135.282C256.511 135.21 256.612 135.137 256.716 135.068C256.897 134.941 257.08 134.818 257.267 134.699C257.275 134.694 257.283 134.69 257.291 134.684C257.296 134.682 257.299 134.679 257.304 134.676C257.445 134.588 257.584 134.502 257.725 134.418C257.743 134.407 257.761 134.397 257.778 134.386C257.785 134.382 257.791 134.38 257.796 134.375C258.122 134.183 258.452 133.998 258.785 133.825C258.944 133.743 259.102 133.664 259.262 133.586C259.364 133.535 259.467 133.487 259.569 133.44C259.773 133.346 259.976 133.257 260.181 133.17C260.327 133.109 260.471 133.049 260.619 132.994C260.727 132.951 260.834 132.908 260.941 132.872C260.981 132.856 261.019 132.842 261.058 132.828C261.091 132.816 261.126 132.803 261.159 132.791C261.315 132.736 261.473 132.681 261.63 132.63C261.703 132.607 261.775 132.583 261.845 132.562C261.952 132.527 262.059 132.494 262.166 132.464C262.187 132.457 262.211 132.45 262.234 132.443C262.255 132.436 262.279 132.429 262.3 132.422C262.324 132.415 262.347 132.409 262.373 132.401C262.487 132.369 262.602 132.337 262.717 132.307C262.771 132.29 262.826 132.278 262.882 132.263C263.025 132.227 263.17 132.19 263.315 132.157C263.578 132.096 263.842 132.04 264.109 131.992C264.211 131.97 264.315 131.952 264.419 131.937C264.473 131.926 264.529 131.916 264.585 131.908C264.69 131.89 264.799 131.873 264.905 131.857C265.121 131.824 265.335 131.795 265.553 131.77C265.661 131.755 265.771 131.742 265.88 131.732C266.084 131.708 266.289 131.688 266.495 131.671L266.496 131.669C266.498 131.657 266.502 131.646 266.505 131.635L266.506 131.634ZM264.626 147.981C264.627 147.967 264.63 147.951 264.632 147.935C264.589 147.869 264.552 147.799 264.515 147.73C264.411 147.525 264.328 147.311 264.266 147.093C264.233 146.987 264.209 146.882 264.187 146.775C264.05 146.119 264.043 145.458 264.077 144.814C264.116 144.166 264.197 143.546 264.261 142.917C264.329 142.29 264.41 141.663 264.49 141.038C264.527 140.747 264.567 140.456 264.609 140.165C264.615 140.112 264.623 140.058 264.631 140.004C264.637 139.999 264.642 139.995 264.649 139.989C264.66 139.98 264.672 139.972 264.684 139.961C264.738 139.597 264.799 139.232 264.866 138.87C265.074 137.704 265.325 136.544 265.633 135.395C265.713 135.103 265.799 134.812 265.887 134.523C265.914 134.439 265.94 134.353 265.966 134.27C266.011 134.128 266.056 133.988 266.102 133.848C266.123 133.783 266.142 133.72 266.164 133.656C266.071 133.664 265.98 133.672 265.888 133.683C265.897 133.65 265.907 133.616 265.914 133.582L265.918 133.573C266.009 133.236 266.108 132.904 266.209 132.568C266.186 132.642 266.162 132.716 266.14 132.792C266.111 132.881 266.087 132.968 266.061 133.056C266.019 133.195 265.979 133.336 265.938 133.478C265.928 133.513 265.918 133.547 265.909 133.58C265.899 133.614 265.889 133.649 265.881 133.684C265.872 133.71 265.865 133.736 265.858 133.763L265.855 133.772C265.848 133.805 265.838 133.84 265.828 133.872C265.813 133.928 265.799 133.982 265.786 134.039C265.743 134.199 265.701 134.361 265.662 134.523C265.618 134.699 265.573 134.875 265.533 135.053C265.504 135.172 265.476 135.29 265.449 135.409C265.417 135.546 265.386 135.682 265.358 135.82C265.318 135.996 265.28 136.172 265.244 136.349C265.202 136.541 265.163 136.734 265.125 136.927C265.101 137.046 265.08 137.162 265.056 137.278C265.023 137.452 264.991 137.626 264.96 137.799C264.889 138.185 264.823 138.573 264.76 138.96C264.752 139.014 264.742 139.065 264.736 139.12C264.708 139.285 264.682 139.451 264.658 139.619C264.635 139.757 264.615 139.895 264.596 140.034C264.588 140.088 264.58 140.14 264.572 140.194C264.522 140.539 264.475 140.883 264.431 141.228C264.351 141.853 264.27 142.48 264.202 143.108C264.138 143.736 264.057 144.357 264.018 145.005C263.985 145.648 263.991 146.31 264.128 146.966C264.137 147.007 264.145 147.05 264.156 147.092C264.222 147.375 264.322 147.657 264.456 147.92C264.475 147.956 264.495 147.992 264.515 148.029C264.534 148.061 264.552 148.094 264.573 148.125C264.579 148.138 264.588 148.149 264.595 148.16C264.597 148.165 264.601 148.171 264.604 148.176L264.604 148.174C264.614 148.11 264.621 148.047 264.627 147.981L264.626 147.981Z" />
+  </g>
+</svg>
diff --git a/packages/grafana-ui/src/components/EmptyState/GrotNotFound/GrotNotFound.tsx b/packages/grafana-ui/src/components/EmptyState/GrotNotFound/GrotNotFound.tsx
new file mode 100644
index 0000000000000..1f09105dbf63e
--- /dev/null
+++ b/packages/grafana-ui/src/components/EmptyState/GrotNotFound/GrotNotFound.tsx
@@ -0,0 +1,72 @@
+import { css } from '@emotion/css';
+import React, { SVGProps, useEffect, useRef } from 'react';
+import SVG from 'react-inlinesvg';
+
+import { GrafanaTheme2 } from '@grafana/data';
+
+import { useStyles2 } from '../../../themes';
+
+import notFoundSvg from './grot-not-found.svg';
+
+const MIN_ARM_ROTATION = -20;
+const MAX_ARM_ROTATION = 5;
+const MIN_ARM_TRANSLATION = -5;
+const MAX_ARM_TRANSLATION = 5;
+
+export interface Props {
+  width?: SVGProps<SVGElement>['width'];
+  height?: SVGProps<SVGElement>['height'];
+}
+
+export const GrotNotFound = ({ width = 'auto', height }: Props) => {
+  const svgRef = useRef<SVGElement>(null);
+  const styles = useStyles2(getStyles);
+
+  useEffect(() => {
+    const handleMouseMove = (event: MouseEvent) => {
+      const grotArm = svgRef.current?.querySelector('#grot-not-found-arm');
+      const grotMagnifier = svgRef.current?.querySelector('#grot-not-found-magnifier');
+
+      const { clientX, clientY } = event;
+      const { innerWidth, innerHeight } = window;
+      const heightRatio = clientY / innerHeight;
+      const widthRatio = clientX / innerWidth;
+      const rotation = getIntermediateValue(heightRatio, MIN_ARM_ROTATION, MAX_ARM_ROTATION);
+      const translation = getIntermediateValue(widthRatio, MIN_ARM_TRANSLATION, MAX_ARM_TRANSLATION);
+
+      window.requestAnimationFrame(() => {
+        grotArm?.setAttribute('style', `transform: rotate(${rotation}deg) translateX(${translation}%)`);
+        grotMagnifier?.setAttribute('style', `transform: rotate(${rotation}deg) translateX(${translation}%)`);
+      });
+    };
+
+    window.addEventListener('mousemove', handleMouseMove);
+
+    return () => {
+      window.removeEventListener('mousemove', handleMouseMove);
+    };
+  }, []);
+
+  return <SVG innerRef={svgRef} src={notFoundSvg} className={styles.svg} height={height} width={width} />;
+};
+
+GrotNotFound.displayName = 'GrotNotFound';
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    svg: css({
+      '#grot-not-found-arm, #grot-not-found-magnifier': {
+        transformOrigin: 'center',
+      },
+    }),
+  };
+};
+
+/**
+ * Given a start value, end value, and a ratio, return the intermediate value
+ * Works with negative and inverted start/end values
+ */
+const getIntermediateValue = (ratio: number, start: number, end: number) => {
+  const value = ratio * (end - start) + start;
+  return value;
+};
diff --git a/packages/grafana-ui/src/components/EmptyState/GrotNotFound/grot-not-found.svg b/packages/grafana-ui/src/components/EmptyState/GrotNotFound/grot-not-found.svg
new file mode 100644
index 0000000000000..f5574a959467e
--- /dev/null
+++ b/packages/grafana-ui/src/components/EmptyState/GrotNotFound/grot-not-found.svg
@@ -0,0 +1,62 @@
+<svg viewBox="0 0 722 480" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M514.59 3.80879C447.52 -7.78121 379.51 8.58879 314.8 32.5588C275.1 47.2688 236.85 58.9488 196.11 69.7588C150.35 81.8988 102.13 94.2588 62.7402 123.959C15.7502 159.389 -0.05983 214.349 0.000170029 274.969C0.04017 319.049 7.54023 365.349 33.0602 399.379C71.8302 451.069 139.04 459.809 196.03 455.539C267.53 450.189 313.45 436.549 383.95 458.929C471.35 486.669 580.88 498.339 659.07 416.129C765.14 304.599 726.89 126.169 614.63 45.6788C598.19 33.8888 580.48 24.2188 561.98 16.9888C546.27 10.8488 530.46 6.53878 514.59 3.79878V3.80879Z" fill="#9087E9" fill-opacity="0.3"/>
+  <path opacity="0.3" d="M273.041 410.45C346.097 410.45 405.321 403.497 405.321 394.92C405.321 386.343 346.097 379.39 273.041 379.39C199.985 379.39 140.761 386.343 140.761 394.92C140.761 403.497 199.985 410.45 273.041 410.45Z" fill="black"/>
+  <g id="grot-not-found-arm">
+    <path d="M346.921 293.19C358.131 296.32 448.181 322.33 432.881 344.87C418.531 366 348.841 340.92 326.921 325.65" fill="#F99F10"/>
+    <path d="M346.921 293.19C358.131 296.32 448.181 322.33 432.881 344.87C418.531 366 348.841 340.92 326.921 325.65" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+  </g>
+  <path d="M218.861 115.04C187.091 92.89 146.441 87.92 139.291 95.87C133.491 102.31 155.401 137.59 151.851 147.9C148.311 158.21 117.231 151.54 113.831 164.65C112.221 170.88 136.061 185.91 135.421 194.61C134.781 203.31 116.371 200.85 115.021 212.11C114.111 219.68 130.911 221.35 130.271 230.37C129.631 239.39 117.501 237.74 118.031 246.48C118.461 253.57 131.721 248.9 135.271 260.82C138.811 272.74 218.871 115.04 218.871 115.04H218.861Z" fill="#EF6122"/>
+  <path d="M77.1408 326.59C78.1108 297.43 98.4608 290.96 113.241 295.94C128.011 300.92 127.191 318.09 123.461 324.55C117.501 334.86 108.751 330.41 112.021 323.19C114.441 316.26 114.891 306.64 103.441 309.7C89.2109 313.51 93.6408 351.77 123.601 344.25C144.121 339.1 142.511 317.37 140.881 285.68C136.511 255.02 141.241 214.82 154.281 176.66C180.701 99.34 339.851 74.21 392.681 145.73C461.311 238.63 385.631 329.37 373.991 340.96C337.731 369.1 343.611 394.56 317.631 396.25C292.941 397.86 294.971 372.77 278.641 371.37C277.681 371.37 276.721 371.37 275.761 371.35C256.591 372.76 252.891 396.67 223.981 396.25C200.421 395.91 210.911 375.33 195.171 365.46C191.871 363.9 189.011 362.8 186.371 362.08C184.291 361.64 181.981 361.32 179.371 361.16C178.771 361.12 175.141 361.14 174.081 361.14C164.731 361.31 159.121 363.52 137.991 367.82C99.9208 375.56 76.3208 351.26 77.1408 326.59Z" fill="#FAC20C" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10"/>
+  <path d="M181.051 134.78C235.171 96.44 298.161 117.38 306.211 122.7C314.261 128.02 325.671 121.7 319.261 105.73C297.781 52.25 242.361 25.05 227.441 34.26C210.761 44.56 231.741 90.5 220.841 101.27C212.091 109.91 206.131 103.31 191.251 98.32C177.811 93.81 181.051 134.78 181.051 134.78Z" fill="#EF6122"/>
+  <path d="M262.101 239.52L410.381 239.52C428.197 239.52 442.641 225.077 442.641 207.26V207.25C442.641 189.433 428.197 174.99 410.381 174.99L262.101 174.99C244.284 174.99 229.841 189.433 229.841 207.25V207.26C229.841 225.077 244.284 239.52 262.101 239.52Z" fill="#5545EF" stroke="#231735" stroke-width="5" stroke-miterlimit="10"/>
+  <path d="M296.28 228.67L408.8 228.67C420.619 228.67 430.2 219.089 430.2 207.27C430.2 195.451 420.619 185.87 408.8 185.87H296.28C284.461 185.87 274.88 195.451 274.88 207.27C274.88 219.089 284.461 228.67 296.28 228.67Z" fill="#19052D"/>
+  <path d="M257.971 297.31C257.351 316.15 250.621 333.66 236.651 332.47C221.221 331.16 217.391 315.15 217.921 297.76" fill="#F99F10"/>
+  <path d="M257.971 297.31C257.351 316.15 250.621 333.66 236.651 332.47C221.221 331.16 217.391 315.15 217.921 297.76" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+  <path d="M200.23 104.32C172.95 91.48 146.34 84.67 139.29 95.87C131.67 107.98 157.65 133.7 151.85 147.9C146.43 161.18 115.82 149.78 113.83 164.65C112.24 176.55 136.06 185.91 135.42 194.61C134.78 203.31 116.14 199.76 114.78 211.03C113.87 218.6 130.91 221.35 130.26 230.37C129.62 239.39 118.02 237.73 118.02 246.48C118.02 253.6 138.81 254.21 139.4 269.02" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10"/>
+  <path d="M306.211 122.7C314.261 128.02 325.671 121.7 319.261 105.73C297.781 52.25 244.001 24.95 227.441 34.26C210.061 44.03 231.741 90.5 220.841 101.27C214.751 107.29 206.751 107.03 199.421 103.95" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10"/>
+  <path d="M306.531 122.94C277.581 105.78 226.39 104.87 180.98 138.83" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10"/>
+  <path d="M341.4 253.66C351.4 254.03 366.49 259.17 366.02 269.49C365.55 279.82 349.3 283.19 335.71 279.29C322.12 275.39 323.16 265.5 325.3 262.15C327.44 258.8 332.12 253.32 341.41 253.66H341.4Z" fill="black"/>
+  <path d="M345.16 258.45C351.6 259.28 356.39 262.63 356.39 262.63C356.39 262.63 355.45 269.62 344.22 269.4C332.99 269.18 336.07 258.72 336.07 258.72C336.07 258.72 339.03 257.66 345.15 258.44L345.16 258.45Z" fill="white"/>
+  <g opacity="0.6">
+    <path d="M621.96 318.31V332.84" stroke="#7F73F2" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+    <path d="M629.23 325.58H614.69" stroke="#7F73F2" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+    <path d="M657.411 162.86V175.25" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+    <path d="M663.601 169.05H651.221" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+    <g opacity="0.4">
+      <path d="M497.061 209.35V221.73" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+      <path d="M503.25 215.54H490.87" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+    </g>
+    <path d="M660.051 285.01L668.811 293.76" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+    <path d="M668.811 285.01L660.051 293.76" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+    <path d="M476.391 312.83L482.341 318.78" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+    <path d="M482.341 312.83L476.391 318.78" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+    <path d="M519 113.2H527.41" stroke="#7F73F2" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+    <path d="M523.21 109V117.41" stroke="#7F73F2" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+    <path d="M609.581 239.16L616.861 231.87C617.721 231.01 617.721 229.61 616.861 228.74C616.001 227.88 614.601 227.88 613.731 228.74L606.451 236.03L599.161 228.75C598.301 227.89 596.901 227.89 596.031 228.75C595.171 229.61 595.171 231.01 596.031 231.88L603.321 239.16L596.041 246.45C595.181 247.31 595.181 248.71 596.041 249.58C596.471 250.01 597.041 250.23 597.601 250.23C598.161 250.23 598.731 250.01 599.161 249.58L606.441 242.29L613.731 249.57C614.161 250 614.731 250.22 615.291 250.22C615.851 250.22 616.421 250 616.851 249.57C617.711 248.71 617.711 247.31 616.851 246.44L609.561 239.16H609.581Z" fill="#B4ADF8"/>
+    <path d="M557.84 280.71V267.77C557.83 266.23 556.581 264.99 555.051 264.99C553.521 264.99 552.271 266.23 552.271 267.77V280.71C552.281 282.25 553.531 283.49 555.061 283.49C556.591 283.49 557.84 282.25 557.84 280.71Z" fill="#A59DF7"/>
+    <path d="M648.21 244.27V257.21C648.22 258.75 649.47 259.99 651 259.99C652.53 259.99 653.78 258.75 653.78 257.21V244.27C653.77 242.73 652.52 241.49 650.99 241.49C649.46 241.49 648.21 242.73 648.21 244.27Z" fill="#402EED"/>
+    <path d="M561.34 181.68H548.4C546.86 181.69 545.62 182.94 545.62 184.47C545.62 186 546.86 187.25 548.4 187.25H561.34C562.88 187.24 564.12 185.99 564.12 184.46C564.12 182.93 562.88 181.68 561.34 181.68Z" fill="#5041E4"/>
+    <path d="M568.931 247.36L568.951 280.7C568.951 282.24 570.191 283.48 571.731 283.48C573.271 283.48 574.511 282.24 574.511 280.7L574.491 247.36C574.491 245.82 573.251 244.58 571.711 244.58C570.171 244.58 568.931 245.82 568.931 247.36Z" fill="#A59DF7"/>
+    <path d="M574.791 321.8L541.451 321.82C539.911 321.82 538.671 323.06 538.671 324.6C538.671 326.14 539.911 327.38 541.451 327.38L574.791 327.36C576.331 327.36 577.571 326.12 577.571 324.58C577.571 323.04 576.331 321.8 574.791 321.8Z" fill="#5041E4"/>
+    <path d="M601.3 192.84H588.12C586.46 192.84 585.11 194.2 585.11 195.86V209.04C585.11 210.71 586.47 212.05 588.13 212.05H601.31C602.97 212.05 604.32 210.7 604.32 209.03V195.85C604.32 194.19 602.96 192.84 601.3 192.84ZM599.82 207.55H589.61V197.35H599.82V207.55Z" fill="#7C6FFD"/>
+    <path d="M541.171 280.72V258.49C541.161 256.95 539.911 255.71 538.381 255.71C536.851 255.71 535.601 256.95 535.601 258.49V280.72C535.611 282.26 536.861 283.5 538.391 283.5C539.921 283.5 541.171 282.26 541.171 280.72Z" fill="#A59DF7"/>
+    <path d="M524.981 318.59C528.361 318.59 531.111 321.34 531.111 324.72C531.111 328.1 528.361 330.85 524.981 330.85C521.601 330.85 518.851 328.1 518.851 324.72C518.851 321.34 521.601 318.59 524.981 318.59ZM524.981 326.76C526.111 326.76 527.021 325.84 527.021 324.72C527.021 323.6 526.101 322.68 524.981 322.68C523.861 322.68 522.941 323.6 522.941 324.72C522.941 325.84 523.861 326.76 524.981 326.76Z" fill="#5545EF"/>
+    <path d="M656.781 228.23C656.781 231.6 654.041 234.34 650.671 234.34C647.301 234.34 644.561 231.6 644.561 228.23C644.561 224.86 647.301 222.12 650.671 222.12C654.041 222.12 656.781 224.86 656.781 228.23ZM648.641 228.23C648.641 229.35 649.551 230.27 650.681 230.27C651.811 230.27 652.72 229.36 652.72 228.23C652.72 227.1 651.811 226.19 650.681 226.19C649.551 226.19 648.641 227.1 648.641 228.23Z" fill="#402EED"/>
+    <path d="M607.45 279.74C607.04 279.74 606.56 279.67 606.15 279.47C605.74 279.33 605.33 279.06 605.06 278.72C604.72 278.45 604.45 278.04 604.31 277.63C604.1 277.22 604.04 276.81 604.04 276.33C604.04 275.44 604.38 274.55 605.06 273.94C605.33 273.6 605.74 273.33 606.15 273.19C606.97 272.85 607.93 272.85 608.75 273.19C609.16 273.33 609.57 273.6 609.84 273.94C610.52 274.55 610.87 275.44 610.87 276.33C610.87 276.81 610.8 277.22 610.6 277.63C610.46 278.04 610.19 278.45 609.85 278.72C609.58 279.06 609.17 279.34 608.76 279.47C608.35 279.67 607.94 279.74 607.46 279.74H607.45Z" fill="#7F73F2"/>
+    <path d="M560.38 219.83C559.24 219.83 558.111 219.4 557.331 218.52C556.461 217.74 556.021 216.61 556.021 215.47C556.021 214.33 556.451 213.21 557.331 212.42C558.901 210.77 561.861 210.77 563.421 212.42C563.861 212.77 564.21 213.3 564.38 213.82C564.64 214.35 564.73 214.95 564.73 215.48C564.73 216.08 564.64 216.61 564.38 217.13C564.21 217.66 563.861 218.18 563.421 218.53C562.641 219.41 561.51 219.84 560.37 219.84L560.38 219.83Z" fill="#5545EF"/>
+    <path d="M678.98 214.927C678.2 214.927 677.43 214.627 676.89 214.027C676.29 213.487 676 212.717 676 211.937C676 211.157 676.3 210.387 676.89 209.847C677.96 208.717 679.99 208.717 681.06 209.847C681.36 210.087 681.6 210.447 681.72 210.807C681.9 211.167 681.96 211.578 681.96 211.948C681.96 212.358 681.9 212.717 681.72 213.077C681.6 213.437 681.36 213.798 681.06 214.038C680.52 214.638 679.75 214.937 678.97 214.937L678.98 214.927Z" fill="#B4ADF8"/>
+    <path d="M614.5 106.948C614.08 106.948 613.59 106.878 613.17 106.668C612.75 106.528 612.33 106.247 612.05 105.897C611.35 105.267 611 104.358 611 103.448C611 102.958 611.07 102.537 611.28 102.117C611.42 101.697 611.7 101.278 612.05 100.998C613.31 99.6675 615.69 99.6675 616.95 100.998C617.3 101.278 617.58 101.697 617.72 102.117C617.93 102.537 618 102.958 618 103.448C618 104.358 617.65 105.267 616.95 105.897C616.67 106.247 616.25 106.528 615.83 106.668C615.41 106.878 614.92 106.948 614.5 106.948Z" fill="#5545EF"/>
+    <path d="M614.231 301.93H493.311C485.081 301.93 477.641 296.42 475.231 288.53C474.831 287.21 475.571 285.81 476.891 285.41C478.211 285.01 479.611 285.75 480.011 287.07C481.791 292.88 487.261 296.93 493.311 296.93H614.231C621.901 296.93 628.131 290.69 628.131 283.03V192.28C628.131 184.62 621.891 178.38 614.231 178.38H575.251C573.871 178.38 572.751 177.26 572.751 175.88C572.751 174.5 573.871 173.38 575.251 173.38H614.231C624.651 173.38 633.131 181.86 633.131 192.28V283.03C633.131 293.45 624.651 301.93 614.231 301.93Z" fill="#5A49FA"/>
+  </g>
+  <path d="M364.23 218.6L394.26 198.12" stroke="white" stroke-width="5.18" stroke-miterlimit="10" stroke-linecap="round"/>
+  <path d="M394.26 218.6L364.23 198.12" stroke="white" stroke-width="5.18" stroke-miterlimit="10" stroke-linecap="round"/>
+  <path d="M319.95 218.6L349.99 198.12" stroke="white" stroke-width="5.18" stroke-miterlimit="10" stroke-linecap="round"/>
+  <path d="M349.99 218.6L319.95 198.12" stroke="white" stroke-width="5.18" stroke-miterlimit="10" stroke-linecap="round"/>
+  <g id="grot-not-found-magnifier">
+    <path opacity="0.15" d="M459.55 269.6C493.527 269.6 521.07 242.057 521.07 208.08C521.07 174.103 493.527 146.56 459.55 146.56C425.574 146.56 398.03 174.103 398.03 208.08C398.03 242.057 425.574 269.6 459.55 269.6Z" fill="white"/>
+    <path d="M531.381 221.52C532.261 216.9 532.671 212.18 532.621 207.48C532.571 202.87 532.071 198.24 531.131 193.71C530.201 189.23 528.831 184.82 527.061 180.6C525.291 176.38 523.111 172.3 520.581 168.5C518.021 164.65 515.071 161.04 511.831 157.77C508.521 154.43 504.861 151.42 500.961 148.8C496.961 146.12 492.661 143.82 488.171 141.98C483.681 140.14 479.011 138.75 474.271 137.85C469.651 136.97 464.931 136.56 460.231 136.61C455.621 136.66 450.99 137.16 446.46 138.1C441.98 139.03 437.571 140.4 433.351 142.17C429.131 143.94 425.051 146.12 421.251 148.65C417.401 151.21 413.791 154.16 410.521 157.4C407.181 160.71 404.171 164.37 401.551 168.27C398.871 172.27 396.571 176.57 394.731 181.06C392.891 185.55 391.501 190.22 390.601 194.96C389.721 199.58 389.311 204.3 389.361 209C389.411 213.61 389.911 218.24 390.851 222.77C391.781 227.25 393.151 231.66 394.921 235.88C396.691 240.1 398.871 244.18 401.401 247.98C403.961 251.83 406.911 255.44 410.151 258.71C413.461 262.05 417.121 265.06 421.021 267.68C423.211 269.15 425.491 270.5 427.841 271.73L420.241 290.27L419.321 289.89C416.121 288.58 412.441 290.12 411.131 293.32L383.451 360.83C382.141 364.03 383.681 367.71 386.881 369.02L400.891 374.77C404.091 376.08 407.771 374.54 409.081 371.34L436.761 303.83C438.071 300.63 436.531 296.95 433.331 295.64L432.411 295.26L440.011 276.72C442.551 277.5 445.121 278.14 447.711 278.63C452.331 279.51 457.051 279.92 461.751 279.87C466.361 279.82 470.991 279.32 475.521 278.38C480.001 277.45 484.411 276.08 488.631 274.31C492.851 272.54 496.931 270.36 500.731 267.83C504.581 265.27 508.19 262.32 511.46 259.08C514.8 255.77 517.811 252.11 520.431 248.21C523.111 244.21 525.411 239.91 527.251 235.42C529.091 230.93 530.481 226.26 531.381 221.52ZM438.471 263.14C408.151 250.71 393.651 216.04 406.081 185.72C418.511 155.4 453.181 140.9 483.501 153.33C513.821 165.76 528.321 200.43 515.891 230.75C503.461 261.07 468.791 275.57 438.471 263.14Z" fill="black"/>
+    <path opacity="0.3" d="M431.661 246.88C433.981 248.49 436.401 249.85 438.881 250.99C422.951 235.18 420.151 209.77 433.381 190.69C446.611 171.61 471.401 165.33 491.781 174.71C489.841 172.79 487.721 171 485.401 169.39C464.001 154.55 434.621 159.86 419.781 181.26C404.941 202.66 410.251 232.04 431.651 246.88H431.661Z" fill="white"/>
+    <path d="M425.671 350.09C437.371 343.43 440.131 329.99 437.201 321.33C434.781 314.19 424.271 311.27 418.091 319.96C411.221 329.61 422.451 339.87 422.451 339.87" fill="#F99F10"/>
+    <path d="M425.671 350.09C437.371 343.43 440.131 329.99 437.201 321.33C434.781 314.19 424.271 311.27 418.091 319.96C411.221 329.61 422.451 339.87 422.451 339.87" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
+  </g>
+</svg>
diff --git a/packages/grafana-ui/src/components/EmptyState/grot-completed.svg b/packages/grafana-ui/src/components/EmptyState/grot-completed.svg
new file mode 100644
index 0000000000000..2205faa698d35
--- /dev/null
+++ b/packages/grafana-ui/src/components/EmptyState/grot-completed.svg
@@ -0,0 +1,91 @@
+<svg viewBox="0 0 269 196" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M190.886 173.235C237.118 175.202 274.318 140.851 259.601 84.308C249.806 46.8174 221.186 14.007 191.104 10.9849C161.022 7.9629 79.5466 4.64546 31.9694 53.4698C-15.6077 102.294 18.1404 168.354 54.3243 184.766C90.5082 201.179 144.653 171.267 190.886 173.235Z" fill="#9087E9" fill-opacity="0.3"/>
+  <path opacity="0.3" d="M127.931 164.331C156.997 164.331 180.56 161.565 180.56 158.152C180.56 154.739 156.997 151.973 127.931 151.973C98.8654 151.973 75.3027 154.739 75.3027 158.152C75.3027 161.565 98.8654 164.331 127.931 164.331Z" fill="black"/>
+  <path d="M151.419 40.8042C164.809 31.4686 181.942 29.3738 184.956 32.7236C187.401 35.4389 178.166 50.3077 179.663 54.6536C181.156 58.9994 194.255 56.1885 195.689 61.7124C196.368 64.339 186.319 70.6724 186.589 74.3394C186.86 78.0065 194.618 76.9708 195.188 81.7155C195.57 84.9067 188.49 85.6112 188.759 89.4112C189.029 93.2135 194.14 92.5184 193.919 96.2018C193.737 99.19 188.147 97.2212 186.652 102.246C185.159 107.271 151.414 40.7995 151.414 40.7995H151.419V40.8042Z" fill="#EE6224"/>
+  <path d="M211.16 129.971C210.751 117.68 202.174 114.953 195.943 117.052C189.717 119.152 190.062 126.388 191.635 129.113C194.147 133.458 197.835 131.583 196.456 128.539C195.437 125.618 195.246 121.564 200.072 122.854C206.07 124.459 204.203 140.587 191.574 137.417C182.924 135.248 183.603 126.087 184.291 112.73C186.134 99.8065 184.14 82.8616 178.644 66.7774C167.507 34.1869 100.427 23.5963 78.1592 53.7398C49.2311 92.8969 81.1311 131.144 86.0368 136.029C101.321 147.889 98.8412 158.622 109.793 159.333C120.2 160.012 119.343 149.438 126.227 148.845C126.631 148.845 127.037 148.845 127.44 148.836C135.521 149.431 137.079 159.508 149.265 159.331C159.196 159.188 154.775 150.513 161.41 146.354C162.8 145.696 164.006 145.232 165.119 144.928C165.996 144.744 166.968 144.609 168.069 144.541C168.321 144.525 169.852 144.532 170.3 144.532C174.24 144.604 176.605 145.535 185.511 147.347C201.558 150.609 211.505 140.368 211.16 129.969V129.971Z" fill="#F9C213" stroke="#38170F" stroke-width="2.19422" stroke-miterlimit="10"/>
+  <path d="M167.355 49.1243C144.544 32.9631 117.995 41.7902 114.601 44.0319C111.207 46.2737 106.399 43.6097 109.1 36.8798C118.153 14.3387 141.513 2.87331 147.802 6.75497C154.833 11.0962 145.99 30.4601 150.583 34.9996C154.271 38.641 156.783 35.8604 163.056 33.7563C168.72 31.8551 167.355 49.1243 167.355 49.1243Z" fill="#EE6224"/>
+  <path d="M133.194 93.2719H70.6951C63.1861 93.2719 57.0977 87.1834 57.0977 79.6744V79.6697C57.0977 72.1607 63.1861 66.0723 70.6951 66.0723H133.194C140.703 66.0723 146.791 72.1607 146.791 79.6697V79.6744C146.791 87.1834 140.703 93.2719 133.194 93.2719Z" fill="#5545EF" stroke="#231735" stroke-width="2.19422" stroke-miterlimit="10"/>
+  <path d="M118.785 88.6966H71.3585C66.3782 88.6966 62.3379 84.6586 62.3379 79.6759C62.3379 74.6932 66.3758 70.6553 71.3585 70.6553H118.785C123.768 70.6553 127.806 74.6932 127.806 79.6759C127.806 84.6586 123.768 88.6966 118.785 88.6966Z" fill="#1C0F2D"/>
+  <path d="M159.273 36.2856C170.771 30.8737 181.987 28.0045 184.959 32.7236C188.171 37.8276 177.221 48.6678 179.666 54.6535C181.95 60.2497 194.852 55.4467 195.692 61.7124C196.361 66.7277 186.321 70.6724 186.592 74.3394C186.863 78.0064 194.719 76.5112 195.291 81.2606C195.673 84.4518 188.493 85.6111 188.766 89.4135C189.037 93.2158 193.926 92.516 193.926 96.204C193.926 99.2039 185.162 99.4629 184.915 105.705" stroke="#38170F" stroke-width="2.19422" stroke-miterlimit="10"/>
+  <path d="M114.601 44.0325C111.207 46.2743 106.399 43.6103 109.1 36.8804C118.153 14.3393 140.823 2.83194 147.802 6.75559C155.127 10.8728 145.99 30.4608 150.583 35.0002C153.149 37.5382 156.522 37.4286 159.611 36.1293" stroke="#38170F" stroke-width="2.19422" stroke-miterlimit="10"/>
+  <path d="M114.467 44.133C126.669 36.8992 148.245 36.5166 167.385 50.8302" stroke="#38170F" stroke-width="2.19422" stroke-miterlimit="10"/>
+  <path d="M69.666 86.4961H79.6408" stroke="#5BBA47" stroke-width="2.19422" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M69.666 82.2236H79.6408" stroke="#5BBA47" stroke-width="2.19422" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M69.666 77.9531H79.6408" stroke="#5BBA47" stroke-width="2.19422" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M110.295 86.4961H120.27" stroke="#5BBA47" stroke-width="2.19422" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M110.295 82.2236H120.27" stroke="#5BBA47" stroke-width="2.19422" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M110.295 77.9531H120.27" stroke="#5BBA47" stroke-width="2.19422" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M96.752 86.4951H106.729" stroke="#5BBA47" stroke-width="2.19422" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M96.752 82.2246H106.729" stroke="#5BBA47" stroke-width="2.19422" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M83.2129 86.4961H93.1876" stroke="#5BBA47" stroke-width="2.19422" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M83.2129 82.2246H93.1876" stroke="#5BBA47" stroke-width="2.19422" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M83.2129 77.9521H93.1876" stroke="#5BBA47" stroke-width="2.19422" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M83.2129 73.6816H93.1876" stroke="#5BBA47" stroke-width="2.19422" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M143.089 23.8493C143.072 23.5039 143.016 23.1376 142.915 22.7062C142.815 22.2747 142.651 21.8188 142.423 21.3205C142.194 20.8435 141.88 20.3217 141.479 19.8403C141.333 19.6434 141.164 19.4474 140.973 19.2717C141.272 18.1572 140.664 17.1785 140.664 17.1785C139.59 17.0952 138.916 17.4714 138.654 17.6602C138.612 17.6387 138.569 17.6148 138.525 17.6147C138.354 17.5477 138.161 17.4579 137.97 17.4117C137.777 17.3437 137.584 17.297 137.392 17.229C137.198 17.1823 136.985 17.1371 136.77 17.0893C136.727 17.0892 136.706 17.0881 136.664 17.0667C136.216 15.5735 134.893 14.9283 134.893 14.9283C133.393 15.8495 133.068 17.1778 133.068 17.1778C133.068 17.1778 133.067 17.1991 133.046 17.263C132.959 17.2821 132.874 17.3038 132.787 17.3228C132.679 17.3647 132.548 17.4051 132.442 17.4256C132.334 17.4675 132.203 17.5078 132.095 17.5497C131.879 17.6528 131.639 17.7563 131.422 17.8614C131.205 17.9879 130.987 18.1123 130.792 18.2377C130.771 18.2153 130.749 18.2163 130.749 18.2163C128.697 17.4063 126.851 18.3439 126.851 18.3439C126.641 20.5349 127.607 21.9517 127.818 22.2122C127.772 22.3411 127.726 22.4893 127.683 22.6187C127.524 23.112 127.407 23.6246 127.312 24.1622C127.31 24.2481 127.288 24.3115 127.287 24.3978C125.336 25.2676 124.743 27.1956 124.743 27.1956C126.304 29.0521 128.173 29.2131 128.173 29.2131C128.402 29.6469 128.674 30.0396 128.97 30.4319C129.096 30.5846 129.224 30.7378 129.371 30.8915C128.762 32.5391 129.404 33.9475 129.404 33.9475C131.188 34.0417 132.365 33.2224 132.605 33.0325C132.776 33.0995 132.969 33.1461 133.142 33.1918C133.678 33.351 134.236 33.425 134.795 33.4777C134.924 33.48 135.075 33.4814 135.204 33.4837L135.268 33.4849L135.311 33.485L135.397 33.4873L135.483 33.4895C136.302 34.7094 137.762 34.8836 137.762 34.8836C138.835 33.805 138.896 32.7081 138.9 32.4714L138.901 32.4501L138.901 32.4069L138.901 32.3638C139.12 32.216 139.337 32.0484 139.533 31.8798C139.949 31.4989 140.343 31.0758 140.653 30.6291C140.674 30.587 140.719 30.5444 140.741 30.5023C141.922 30.587 142.777 29.8049 142.777 29.8049C142.603 28.5754 141.903 27.9602 141.755 27.8298L141.735 27.8074L141.713 27.8064C141.713 27.8064 141.692 27.8053 141.693 27.784C141.694 27.7195 141.718 27.6347 141.719 27.5702C141.721 27.4412 141.745 27.3133 141.746 27.1625L141.748 27.0548L141.748 27.0116L141.749 26.9903L141.749 26.9471L141.751 26.8613L141.753 26.7536L141.754 26.646L141.755 26.5383L141.756 26.4306L141.736 26.3219C141.717 26.1918 141.697 26.042 141.657 25.9108C141.536 25.3707 141.351 24.8725 141.08 24.4153C140.809 23.958 140.47 23.5443 140.088 23.1929C139.706 22.8416 139.281 22.5764 138.834 22.3534C138.386 22.1517 137.914 21.9936 137.441 21.9411C137.206 21.9162 136.968 21.8907 136.732 21.8851L136.646 21.8828L136.625 21.8818C136.625 21.8818 136.582 21.8817 136.603 21.8807L136.56 21.8806L136.474 21.8783L136.389 21.8761C136.258 21.8951 136.151 21.8938 136.023 21.9133C135.547 21.9919 135.115 22.1569 134.703 22.3855C134.312 22.6151 133.962 22.8895 133.677 23.2301C133.392 23.5488 133.171 23.9099 133.013 24.2955C132.855 24.6811 132.762 25.0659 132.736 25.4523L132.732 25.7321L132.731 25.7966L132.729 25.8824L132.726 26.0114C132.744 26.206 132.784 26.3996 132.825 26.5719C132.926 26.9388 133.071 27.2647 133.281 27.5273C133.471 27.8106 133.724 28.0301 133.978 28.2283C134.234 28.4052 134.511 28.5379 134.789 28.6295C135.066 28.7211 135.325 28.7456 135.583 28.7503L135.669 28.7525L135.712 28.7526L135.755 28.7527L135.841 28.755L135.862 28.756L135.884 28.7571L135.927 28.7572C135.97 28.7573 135.991 28.7584 136.014 28.7381C136.035 28.7392 136.079 28.718 136.101 28.719C136.166 28.6989 136.209 28.699 136.273 28.6783C136.381 28.6364 136.49 28.5971 136.598 28.5552C136.706 28.5133 136.793 28.451 136.88 28.3867C136.902 28.3665 136.923 28.3437 136.945 28.3447C137.032 28.2825 137.056 28.1525 136.97 28.066C136.907 27.979 136.799 27.9559 136.712 28.0181C136.689 28.0384 136.668 28.0393 136.647 28.0601C136.583 28.1021 136.496 28.1212 136.408 28.1423C136.321 28.1614 136.236 28.183 136.149 28.2021C136.106 28.202 136.062 28.2212 136.019 28.2211L135.955 28.2199L135.89 28.2188L135.826 28.2176L135.74 28.2153L135.718 28.2143L135.675 28.2142L135.611 28.213C135.418 28.1882 135.204 28.1211 135.011 28.0312C134.82 27.9419 134.626 27.8089 134.458 27.6561C134.289 27.5033 134.14 27.3059 134.036 27.1111C133.933 26.895 133.85 26.6775 133.811 26.4194C133.792 26.2893 133.793 26.1816 133.796 26.0526L133.797 25.945L133.798 25.9236L133.799 25.9023L133.799 25.8591C133.801 25.7946 133.823 25.7312 133.824 25.6667C133.92 25.151 134.207 24.6402 134.622 24.2593C134.731 24.1529 134.841 24.0684 134.95 24.0072C135.06 23.9226 135.19 23.8605 135.32 23.7983C135.45 23.7362 135.579 23.6954 135.732 23.6541C135.861 23.6133 136.013 23.5933 136.163 23.5967L136.378 23.6013L136.421 23.6014L136.486 23.6026L136.529 23.6027L136.55 23.6038L136.615 23.605C136.764 23.6297 136.937 23.654 137.087 23.6767C137.387 23.746 137.687 23.8585 137.964 24.0364C138.518 24.347 138.983 24.851 139.275 25.4368C139.421 25.7413 139.524 26.0438 139.561 26.3664C139.58 26.4533 139.58 26.5396 139.579 26.6041L139.577 26.6686L139.576 26.7331L139.575 26.7976L139.574 26.8621L139.574 26.9052L139.573 26.9697L139.569 27.1201C139.567 27.2059 139.545 27.2912 139.543 27.377C139.541 27.4628 139.519 27.5481 139.495 27.6349C139.471 27.7217 139.45 27.8069 139.426 27.8917C139.381 28.0637 139.314 28.2347 139.245 28.4052C139.11 28.7253 138.932 29.0454 138.712 29.344C138.271 29.9173 137.705 30.3811 137.031 30.671C136.705 30.8155 136.359 30.9182 135.993 30.9768C135.819 30.9956 135.627 31.014 135.454 31.0328L135.41 31.0327L135.389 31.0317L135.325 31.0305L135.239 31.0283L135.196 31.0282L135.174 31.0271C135.088 31.0248 134.981 31.0236 134.895 31.002C134.51 30.9737 134.123 30.8803 133.758 30.7666C133.394 30.653 133.032 30.4967 132.712 30.3187C132.051 29.9423 131.436 29.4369 130.972 28.8253C130.741 28.5206 130.532 28.1935 130.365 27.8685C130.198 27.5218 130.076 27.1756 129.975 26.8066C129.873 26.4397 129.836 26.0719 129.799 25.7062L129.8 25.6417L129.801 25.6203L129.802 25.599L129.804 25.5777L129.805 25.5132L129.806 25.4919L129.807 25.4705L129.807 25.4274L129.809 25.3415L129.81 25.3202L129.81 25.277L129.813 25.148C129.816 24.9545 129.84 24.7834 129.865 24.589C129.89 24.3966 129.937 24.2032 129.961 24.0301C130.008 23.8367 130.053 23.6666 130.102 23.4738C130.215 23.1094 130.35 22.7461 130.507 22.427C130.818 21.765 131.239 21.1693 131.741 20.7043C131.872 20.5776 132.002 20.4723 132.135 20.3675C132.267 20.2627 132.396 20.1787 132.548 20.0724C132.68 19.9889 132.831 19.904 132.983 19.8216C133.048 19.7796 133.135 19.7605 133.199 19.7185C133.244 19.6973 133.285 19.6776 133.307 19.6766C133.351 19.6554 133.393 19.6357 133.415 19.6347C133.566 19.5736 133.74 19.5116 133.891 19.4698C133.935 19.4486 133.978 19.4507 134.02 19.429C134.064 19.4077 134.107 19.4099 134.149 19.3881C134.236 19.3691 134.321 19.3474 134.387 19.3273C134.431 19.306 134.474 19.3082 134.517 19.3083C134.56 19.3084 134.604 19.2892 134.647 19.2893C134.69 19.2894 134.734 19.2702 134.777 19.2703L134.842 19.2502L134.907 19.2513C134.95 19.2515 134.994 19.2323 135.037 19.2324C135.08 19.2325 135.124 19.2133 135.188 19.2145C135.232 19.2146 135.297 19.1944 135.34 19.1965L135.426 19.1988L135.49 19.2L135.511 19.201L135.555 19.2011L135.705 19.2045L135.769 19.2057L135.791 19.2068L135.812 19.2079L135.941 19.2102L136.414 19.2174C136.736 19.2446 137.038 19.2713 137.338 19.3406C137.939 19.4578 138.516 19.6619 139.027 19.9293C139.538 20.1966 140.007 20.505 140.389 20.8564C140.409 20.8788 140.432 20.8997 140.452 20.9221C140.473 20.9445 140.495 20.9654 140.516 20.9878C140.559 21.031 140.599 21.0758 140.664 21.1202C140.707 21.1634 140.747 21.2082 140.79 21.2515C140.833 21.2948 140.874 21.3396 140.917 21.3828C141.087 21.5575 141.233 21.7544 141.381 21.9492C141.654 22.3207 141.885 22.6899 142.051 23.058C142.071 23.0804 142.072 23.1023 142.093 23.1226C142.114 23.143 142.114 23.1669 142.113 23.1882C142.134 23.2324 142.154 23.2741 142.175 23.3184C142.197 23.3626 142.216 23.4043 142.237 23.4485C142.259 23.4928 142.278 23.5345 142.3 23.5787C142.362 23.752 142.423 23.9035 142.465 24.0545C142.547 24.2934 142.607 24.5094 142.646 24.703C142.666 24.7685 142.73 24.8342 142.817 24.8131C142.903 24.8153 142.969 24.752 142.971 24.6662C143.106 24.346 143.111 24.1099 143.093 23.8503L143.089 23.8493Z" fill="#FAC20C" fill-opacity="0.5"/>
+  <path d="M49.6318 167.102C49.9857 160.328 54.1058 159.882 54.2811 159.867C54.3754 159.859 54.4713 159.869 54.5622 159.897L56.3717 160.469C56.9357 159.222 58.1448 155.804 56.7554 151.74C55.8193 149.002 55.8523 146.884 56.8497 145.446C57.9926 143.8 59.9476 143.738 60.0303 143.737C60.0931 143.737 60.1543 143.742 60.2139 143.757L64.5407 144.792L58.5119 118.195C57.422 114.096 57.6453 111.126 59.1752 109.371C60.7332 107.585 63.0438 107.765 63.3647 107.8L115.736 110.486C116.313 110.486 116.836 110.636 117.283 110.841C120.402 112.274 122.152 117.48 122.761 119.651C123.963 123.949 124.233 128.535 123.465 131.624C123.285 132.352 122.734 134.565 121.214 134.602C121.064 134.605 120.901 134.59 120.728 134.542L112.549 133.175C113.369 138.274 114.489 143.705 115.514 148.678C118.339 162.368 119.578 168.976 116.891 169.571C116.548 169.648 116.196 169.646 115.835 169.578C115.311 169.648 113.192 169.904 110.395 169.904C107.994 169.904 105.094 169.712 102.274 169.054C104.362 174.479 105.587 177.89 104.61 179.519C104.314 180.014 103.832 180.315 103.217 180.389C103.063 180.407 102.911 180.415 102.759 180.415C102.159 180.61 99.552 181.384 95.9248 181.384C94.4842 181.384 92.8815 181.261 91.1812 180.932C90.8554 184.842 90.9017 188.757 90.9033 188.825C90.9066 189.061 90.7958 189.286 90.6056 189.424C90.4799 189.515 90.3311 189.562 90.1806 189.562C90.1012 189.562 90.0234 189.549 89.9457 189.522L49.7095 175.687C49.4052 175.582 49.205 175.287 49.2216 174.962C49.2216 174.962 49.3026 173.325 49.6284 167.101L49.6318 167.102Z" fill="white"/>
+  <path d="M49.6318 167.102C49.9857 160.328 54.1058 159.882 54.2811 159.867C54.3754 159.859 54.4713 159.869 54.5622 159.897L56.3717 160.469C56.9357 159.222 58.1448 155.804 56.7554 151.74C55.8193 149.002 55.8523 146.884 56.8497 145.446C57.9926 143.8 59.9476 143.738 60.0303 143.737C60.0931 143.737 60.1543 143.742 60.2139 143.757L64.5407 144.792L58.5119 118.195C57.422 114.096 57.6453 111.126 59.1752 109.371C60.7332 107.585 63.0438 107.765 63.3647 107.8L115.736 110.486C116.313 110.486 116.836 110.636 117.283 110.841C120.402 112.274 122.152 117.48 122.761 119.651C123.963 123.949 124.233 128.535 123.465 131.624C123.285 132.352 122.734 134.565 121.214 134.602C121.064 134.605 120.903 134.59 120.728 134.542L112.549 133.175C113.369 138.274 114.489 143.705 115.514 148.678C118.339 162.368 119.578 168.976 116.891 169.571C116.548 169.648 116.196 169.646 115.835 169.578C115.311 169.648 113.192 169.904 110.395 169.904C107.994 169.904 105.094 169.712 102.274 169.054C104.362 174.479 105.587 177.89 104.61 179.519C104.314 180.014 103.832 180.315 103.217 180.389C103.063 180.407 102.911 180.415 102.759 180.415C102.159 180.61 99.552 181.384 95.9248 181.384C94.4842 181.384 92.8815 181.261 91.1812 180.932C90.8554 184.842 90.9017 188.757 90.9033 188.825C90.9066 189.061 90.7958 189.286 90.6056 189.424C90.4799 189.515 90.3311 189.562 90.1806 189.562C90.1012 189.562 90.0234 189.549 89.9457 189.522L49.7095 175.687C49.4052 175.582 49.205 175.287 49.2216 174.962C49.2216 174.962 49.3026 173.325 49.6284 167.101L49.6318 167.102ZM121.116 133.132L121.193 133.145C121.302 133.117 121.69 132.758 122.061 131.272C122.772 128.414 122.506 124.113 121.366 120.047C120.232 115.991 118.435 112.97 116.679 112.164C116.373 112.023 116.065 111.953 115.756 111.953C114.767 111.953 113.765 112.671 112.766 114.101C111.669 115.67 111.284 118.461 111.358 121.969L115.781 122.622C116.059 122.664 116.287 122.862 116.368 123.133C116.376 123.159 117.162 125.774 118.22 128.351C119.902 132.441 120.868 133.042 121.115 133.132H121.116ZM118.798 132.745C118.244 131.895 117.61 130.668 116.887 128.908C116.05 126.875 115.395 124.865 115.122 123.995L111.416 123.447C111.548 125.942 111.874 128.732 112.314 131.661L118.798 132.743V132.745ZM115.974 168.128C116.004 168.133 116.034 168.14 116.062 168.148C116.246 168.183 116.419 168.186 116.58 168.15C116.588 168.148 117.329 167.837 116.667 162.752C116.199 159.158 115.179 154.21 114.097 148.972C111.161 134.746 107.835 118.622 111.581 113.264C112.003 112.661 112.422 112.177 112.832 111.793L63.2655 109.251C63.2489 109.251 63.2291 109.248 63.2125 109.246C63.1943 109.245 61.375 109.04 60.2519 110.342C59.0842 111.695 58.9668 114.285 59.9112 117.834C59.9129 117.843 59.9162 117.853 59.9178 117.861L66.1086 145.17L100.554 153.415C102.905 153.662 105.606 157.045 108.713 160.94C111.138 163.979 114.095 167.679 115.973 168.13L115.974 168.128ZM113.449 168.339C111.616 166.895 109.636 164.414 107.587 161.849C104.969 158.569 102.003 154.854 100.285 154.854H100.281C100.071 154.854 99.7868 154.907 99.466 155.314C97.9708 157.209 99.8116 162.582 101.641 167.395C105.92 168.584 110.695 168.52 113.449 168.341V168.339ZM103.052 178.946C103.268 178.921 103.333 178.842 103.374 178.771C104.038 177.662 102.374 173.336 100.905 169.52C98.5695 163.448 96.153 157.171 98.333 154.41C98.3413 154.4 98.3495 154.391 98.3561 154.381L59.9873 145.196C59.6912 145.226 58.6409 145.396 58.029 146.29C57.3293 147.313 57.3624 149.033 58.1249 151.268C59.6251 155.66 58.4491 159.339 57.7643 160.91L93.4951 172.203C94.5652 172.484 95.6684 173.632 97.0015 175.021C98.7845 176.877 101.001 179.19 103.052 178.944V178.946ZM100.003 179.574C98.5133 178.693 97.1504 177.271 95.9612 176.031C95.0168 175.047 93.8706 173.852 93.2106 173.629C93.1742 173.624 93.1379 173.616 93.1015 173.604L93.08 173.597C93.0403 173.592 93.0022 173.591 92.9675 173.596C92.8219 173.614 92.6797 173.835 92.6086 173.965C91.9751 175.105 91.5765 177.208 91.3268 179.481C94.8547 180.182 97.979 179.923 100.005 179.574H100.003ZM89.4578 187.82C89.4677 184.839 89.6496 176.311 91.345 173.257C91.378 173.197 91.4128 173.139 91.4492 173.082L54.2943 161.339C53.732 161.463 51.3354 162.283 51.079 167.18C50.8524 171.493 50.7449 173.602 50.7002 174.49L89.4594 187.818L89.4578 187.82Z" fill="#38170F" stroke="#38170F" stroke-width="0.627339"/>
+  <g clip-path="url(#clip0_54475_3665)">
+    <path d="M91.666 170.086C91.4553 170.019 91.2538 169.925 91.0675 169.806C90.9494 169.73 90.8328 169.653 90.7264 169.563C89.7327 168.728 89.4848 167.28 90.132 166.154C90.6999 165.165 91.8217 164.622 92.9187 164.805C94.378 165.047 95.3632 166.348 95.2032 167.822C95.0308 169.409 93.4721 170.511 91.9009 170.157C91.882 170.153 91.7816 170.123 91.6658 170.086L91.666 170.086ZM93.8977 168.374C94.102 168.281 94.1917 168.039 94.0976 167.835C93.9237 167.458 93.7482 167.077 93.5745 166.7C93.4807 166.497 93.2403 166.408 93.0367 166.502L90.7559 167.553C90.5519 167.647 90.4633 167.888 90.5571 168.092L90.5666 168.112C90.6604 168.315 90.9011 168.405 91.1045 168.311C91.6151 168.075 92.1306 167.837 92.6491 167.598C92.8534 167.504 93.0955 167.594 93.1889 167.799C93.2465 167.925 93.3035 168.05 93.3599 168.174C93.453 168.378 93.6937 168.467 93.8976 168.374L93.8977 168.374Z" fill="#70D839"/>
+  </g>
+  <g clip-path="url(#clip1_54475_3665)">
+    <path d="M89.666 162.086C89.4553 162.019 89.2538 161.925 89.0675 161.806C88.9494 161.73 88.8328 161.653 88.7264 161.563C87.7327 160.728 87.4848 159.28 88.132 158.154C88.6999 157.165 89.8217 156.622 90.9187 156.805C92.378 157.047 93.3632 158.348 93.2032 159.822C93.0308 161.409 91.4721 162.511 89.9009 162.157C89.882 162.153 89.7816 162.123 89.6658 162.086L89.666 162.086ZM91.8977 160.374C92.102 160.281 92.1917 160.039 92.0976 159.835C91.9237 159.458 91.7482 159.077 91.5745 158.7C91.4807 158.497 91.2403 158.408 91.0367 158.502L88.7559 159.553C88.5519 159.647 88.4633 159.888 88.5571 160.092L88.5666 160.112C88.6604 160.315 88.9011 160.405 89.1045 160.311C89.6151 160.075 90.1306 159.837 90.6491 159.598C90.8534 159.504 91.0955 159.594 91.1889 159.799C91.2465 159.925 91.3035 160.05 91.3599 160.174C91.453 160.378 91.6937 160.467 91.8976 160.374L91.8977 160.374Z" fill="#70D839"/>
+  </g>
+  <path d="M69.3945 118.617L99.808 120.725" stroke="black" stroke-opacity="0.1" stroke-width="1.88202" stroke-linecap="round"/>
+  <path d="M69.3945 124.037L99.808 126.145" stroke="black" stroke-opacity="0.1" stroke-width="1.88202" stroke-linecap="round"/>
+  <path d="M69.3945 129.458L99.808 132.168" stroke="black" stroke-opacity="0.1" stroke-width="1.88202" stroke-linecap="round"/>
+  <path d="M69.3945 134.878L99.808 137.889" stroke="black" stroke-opacity="0.1" stroke-width="1.88202" stroke-linecap="round"/>
+  <path d="M69.3945 140.298L99.2057 144.815" stroke="black" stroke-opacity="0.1" stroke-width="1.88202" stroke-linecap="round"/>
+  <path d="M56.002 167.098L75.9746 174M61.9198 157.176L86.502 164.5M62.6595 152L83.002 158.039" stroke="black" stroke-opacity="0.1" stroke-width="1.88202" stroke-linecap="round"/>
+  <path d="M53.6501 112.828C47.3284 114.211 46.9948 122.133 49.3952 126.82C52.1968 132.288 55.7286 134.343 62.1086 133.081L60.1887 126.946" fill="#F9A01B"/>
+  <path d="M53.5078 112.866C57.4245 111.842 62.1249 114.284 63.1467 119.516C64.1684 124.749 60.3451 127.695 58.6258 128.089L54.6369 129.864L50.207 121.079L53.5078 112.866Z" fill="#F9A01B"/>
+  <path d="M53.6501 112.829C47.3284 114.212 46.9948 122.134 49.3952 126.821" stroke="#38170F" stroke-width="2.19422" stroke-miterlimit="10" stroke-linecap="round"/>
+  <path d="M53.5078 112.866C57.4245 111.842 62.1249 114.284 63.1466 119.516C63.8488 123.114 62.2625 125.631 60.6436 126.979" stroke="#38170F" stroke-width="2.19422" stroke-miterlimit="10" stroke-linecap="round"/>
+  <path d="M49.3945 126.82C52.1961 132.288 55.7279 134.343 62.1079 133.081" stroke="#38170F" stroke-width="2.19422" stroke-miterlimit="10" stroke-linecap="round"/>
+  <path d="M133.07 112.597C128.188 113.08 118.759 118.083 119.757 124.967C120.753 131.851 128.794 132.271 139.009 127.528" fill="#F9A01B"/>
+  <path d="M133.07 112.597C128.188 113.08 118.759 118.083 119.757 124.967C120.753 131.851 128.794 132.271 139.009 127.528" stroke="#38170F" stroke-width="2.19422" stroke-miterlimit="10" stroke-linecap="round"/>
+  <path d="M98.1195 102.247C102.94 105.085 108.425 104.247 112.237 99.5356" stroke="black" stroke-width="2.40181" stroke-miterlimit="10" stroke-linecap="round"/>
+  <g clip-path="url(#clip2_54475_3665)">
+    <path d="M103.399 148.569C103.211 148.556 103.026 148.514 102.85 148.445C102.738 148.402 102.627 148.356 102.522 148.296C101.545 147.739 101.082 146.429 101.423 145.212C101.722 144.145 102.562 143.368 103.51 143.284C104.771 143.171 105.824 144.17 105.951 145.6C106.088 147.141 104.982 148.548 103.608 148.582C103.591 148.583 103.502 148.577 103.399 148.57L103.399 148.569ZM104.959 146.428C105.113 146.292 105.145 146.043 105.031 145.872C104.819 145.556 104.605 145.237 104.393 144.922C104.279 144.751 104.062 144.724 103.909 144.86L102.191 146.389C102.037 146.525 102.006 146.774 102.121 146.944L102.132 146.961C102.246 147.132 102.463 147.16 102.616 147.023C103.001 146.681 103.389 146.335 103.779 145.987C103.933 145.85 104.151 145.879 104.265 146.05C104.336 146.156 104.406 146.261 104.475 146.365C104.588 146.536 104.805 146.564 104.959 146.428L104.959 146.428Z" fill="#70D839"/>
+  </g>
+  <g clip-path="url(#clip3_54475_3665)">
+    <path d="M103.399 140.57C103.211 140.557 103.026 140.515 102.85 140.446C102.738 140.403 102.627 140.357 102.522 140.297C101.545 139.74 101.082 138.43 101.423 137.213C101.722 136.146 102.562 135.369 103.51 135.284C104.771 135.172 105.824 136.171 105.951 137.601C106.088 139.142 104.982 140.549 103.608 140.583C103.591 140.583 103.502 140.578 103.399 140.571L103.399 140.57ZM104.959 138.429C105.113 138.293 105.145 138.044 105.031 137.873C104.819 137.557 104.605 137.238 104.393 136.923C104.279 136.752 104.062 136.725 103.909 136.861L102.191 138.39C102.037 138.526 102.006 138.775 102.121 138.945L102.132 138.962C102.246 139.133 102.463 139.161 102.616 139.024C103.001 138.682 103.389 138.336 103.779 137.988C103.933 137.851 104.151 137.88 104.265 138.051C104.336 138.157 104.406 138.262 104.475 138.366C104.588 138.537 104.805 138.565 104.959 138.429L104.959 138.429Z" fill="#70D839"/>
+  </g>
+  <g clip-path="url(#clip4_54475_3665)">
+    <path d="M103.399 134.57C103.211 134.557 103.026 134.515 102.85 134.446C102.738 134.403 102.627 134.357 102.522 134.297C101.545 133.74 101.082 132.43 101.423 131.213C101.722 130.146 102.562 129.369 103.51 129.284C104.771 129.172 105.824 130.171 105.951 131.601C106.088 133.142 104.982 134.549 103.608 134.583C103.591 134.583 103.502 134.578 103.399 134.571L103.399 134.57ZM104.959 132.429C105.113 132.293 105.145 132.044 105.031 131.873C104.819 131.557 104.605 131.238 104.393 130.923C104.279 130.752 104.062 130.725 103.909 130.861L102.191 132.39C102.037 132.526 102.006 132.775 102.121 132.945L102.132 132.962C102.246 133.133 102.463 133.161 102.616 133.024C103.001 132.682 103.389 132.336 103.779 131.988C103.933 131.851 104.151 131.88 104.265 132.051C104.336 132.157 104.406 132.262 104.475 132.366C104.588 132.537 104.805 132.565 104.959 132.429L104.959 132.429Z" fill="#70D839"/>
+  </g>
+  <g clip-path="url(#clip5_54475_3665)">
+    <path d="M103.399 124.569C103.211 124.556 103.026 124.514 102.85 124.445C102.738 124.402 102.627 124.356 102.522 124.296C101.545 123.739 101.082 122.429 101.423 121.212C101.722 120.145 102.562 119.368 103.51 119.284C104.771 119.171 105.824 120.17 105.951 121.6C106.088 123.141 104.982 124.548 103.608 124.582C103.591 124.583 103.502 124.577 103.399 124.57L103.399 124.569ZM104.959 122.428C105.113 122.292 105.145 122.043 105.031 121.872C104.819 121.556 104.605 121.237 104.393 120.922C104.279 120.751 104.062 120.724 103.909 120.86L102.191 122.389C102.037 122.525 102.006 122.774 102.121 122.944L102.132 122.961C102.246 123.132 102.463 123.16 102.616 123.023C103.001 122.681 103.389 122.335 103.779 121.987C103.933 121.85 104.151 121.879 104.265 122.05C104.336 122.156 104.406 122.261 104.475 122.365C104.588 122.536 104.805 122.564 104.959 122.428L104.959 122.428Z" fill="#70D839"/>
+  </g>
+  <path d="M210.502 25L206.002 31L203.002 28" stroke="#645DB5" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M222.008 64L218.027 69.308C217.896 69.4818 217.697 69.5904 217.48 69.6058C217.263 69.6211 217.05 69.5417 216.897 69.388L214.508 67" stroke="#7B76B8" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M216.988 55.6082C217.297 55.2237 217.764 55 218.258 55C218.751 55 219.218 55.2237 219.528 55.6082L221.04 57.4892C221.388 57.9229 221.933 58.1491 222.486 58.0892L224.886 57.8282C225.378 57.7736 225.868 57.9456 226.218 58.2957C226.568 58.6458 226.74 59.1361 226.686 59.6282L226.425 62.0282C226.365 62.581 226.591 63.1262 227.025 63.4742L228.906 64.9862C229.29 65.2956 229.514 65.7626 229.514 66.2562C229.514 66.7498 229.29 67.2168 228.906 67.5262L227.019 69.0312C226.585 69.3798 226.359 69.9252 226.419 70.4782L226.68 72.8782C226.735 73.3705 226.563 73.861 226.213 74.2112C225.863 74.5614 225.372 74.7333 224.88 74.6782L222.48 74.4172C221.927 74.3571 221.382 74.5834 221.034 75.0172L219.528 76.8912C219.219 77.2762 218.752 77.5001 218.258 77.5001C217.764 77.5001 217.297 77.2762 216.988 76.8912L215.477 75.0112C215.128 74.5775 214.583 74.3514 214.03 74.4112L211.63 74.6722C211.137 74.7277 210.647 74.556 210.296 74.2056C209.946 73.8553 209.774 73.3645 209.83 72.8722L210.091 70.4722C210.151 69.9191 209.924 69.3737 209.491 69.0252L207.611 67.5142C207.226 67.205 207.002 66.738 207.002 66.2442C207.002 65.7505 207.226 65.2834 207.611 64.9742L209.491 63.4622C209.925 63.1143 210.151 62.5691 210.091 62.0162L209.83 59.6162C209.775 59.124 209.947 58.6335 210.297 58.2833C210.647 57.933 211.138 57.7612 211.63 57.8162L214.03 58.0772C214.583 58.1369 215.128 57.9108 215.477 57.4772L216.988 55.6082Z" stroke="#7B76B8" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  <g opacity="0.6">
+    <path d="M223.002 119.615H228.234" stroke="#7F73F2" stroke-width="3.1107" stroke-miterlimit="10" stroke-linecap="round"/>
+    <path d="M225.621 117V122.232" stroke="#7F73F2" stroke-width="3.1107" stroke-miterlimit="10" stroke-linecap="round"/>
+    <path d="M19.8157 85C21.9185 85 23.6294 86.7109 23.6294 88.8137C23.6294 90.9165 21.9185 92.6274 19.8157 92.6274C17.7128 92.6274 16.002 90.9165 16.002 88.8137C16.002 86.7109 17.7128 85 19.8157 85ZM19.8157 90.0829C20.5187 90.0829 21.0849 89.5105 21.0849 88.8137C21.0849 88.1169 20.5125 87.5445 19.8157 87.5445C19.1189 87.5445 18.5466 88.1169 18.5466 88.8137C18.5466 89.5105 19.1189 90.0829 19.8157 90.0829Z" fill="#5545EF"/>
+    <path d="M198.123 37.6028C197.868 37.6028 197.57 37.5592 197.315 37.4348C197.06 37.3477 196.805 37.1797 196.637 36.9682C196.425 36.8002 196.257 36.5452 196.17 36.2901C196.039 36.035 196.002 35.7799 196.002 35.4813C196.002 34.9276 196.213 34.3739 196.637 33.9944C196.805 33.7829 197.06 33.6149 197.315 33.5278C197.825 33.3163 198.422 33.3163 198.932 33.5278C199.187 33.6149 199.442 33.7829 199.61 33.9944C200.033 34.3739 200.251 34.9276 200.251 35.4813C200.251 35.7799 200.208 36.035 200.083 36.2901C199.996 36.5452 199.828 36.8002 199.617 36.9682C199.449 37.1797 199.194 37.3539 198.938 37.4348C198.683 37.5592 198.428 37.6028 198.13 37.6028H198.123Z" fill="#7F73F2"/>
+    <path d="M35.1978 93H29.3398C28.602 93 28.002 93.6045 28.002 94.3423V100.2C28.002 100.942 28.6064 101.538 29.3442 101.538H35.2022C35.94 101.538 36.54 100.938 36.54 100.196V94.3378C36.54 93.6 35.9355 93 35.1978 93ZM34.54 99.538H30.002V95.0045H34.54V99.538Z" fill="#7C6FFD"/>
+  </g>
+  <path d="M250.324 57.5928V65.3011" stroke="#5545EF" stroke-width="3.1107" stroke-miterlimit="10" stroke-linecap="round"/>
+  <path d="M254.177 61.4443H246.475" stroke="#5545EF" stroke-width="3.1107" stroke-miterlimit="10" stroke-linecap="round"/>
+  <defs>
+    <clipPath id="clip0_54475_3665">
+      <rect width="5.45219" height="5.4418" fill="white" transform="translate(94.1172 170.993) rotate(-159.744)"/>
+    </clipPath>
+    <clipPath id="clip1_54475_3665">
+      <rect width="5.45219" height="5.4418" fill="white" transform="translate(92.1172 162.993) rotate(-159.744)"/>
+    </clipPath>
+    <clipPath id="clip2_54475_3665">
+      <rect width="4.64054" height="5.31007" fill="white" transform="translate(105.605 148.853) rotate(-172.756)"/>
+    </clipPath>
+    <clipPath id="clip3_54475_3665">
+      <rect width="4.64054" height="5.31007" fill="white" transform="translate(105.605 140.854) rotate(-172.756)"/>
+    </clipPath>
+    <clipPath id="clip4_54475_3665">
+      <rect width="4.64054" height="5.31007" fill="white" transform="translate(105.605 134.854) rotate(-172.756)"/>
+    </clipPath>
+    <clipPath id="clip5_54475_3665">
+      <rect width="4.64054" height="5.31007" fill="white" transform="translate(105.605 124.853) rotate(-172.756)"/>
+    </clipPath>
+  </defs>
+</svg>
diff --git a/packages/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.tsx b/packages/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.tsx
index 808ed22c4ca5a..4c5760a377e84 100644
--- a/packages/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.tsx
+++ b/packages/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.tsx
@@ -1,4 +1,4 @@
-import React, { PureComponent, ReactNode, ComponentType } from 'react';
+import React, { PureComponent, ReactNode, ComponentType, ErrorInfo } from 'react';
 
 import { faro } from '@grafana/faro-web-sdk';
 
@@ -6,9 +6,7 @@ import { Alert } from '../Alert/Alert';
 
 import { ErrorWithStack } from './ErrorWithStack';
 
-export interface ErrorInfo {
-  componentStack: string;
-}
+export type { ErrorInfo };
 
 export interface ErrorBoundaryApi {
   error: Error | null;
diff --git a/packages/grafana-ui/src/components/ErrorBoundary/ErrorWithStack.tsx b/packages/grafana-ui/src/components/ErrorBoundary/ErrorWithStack.tsx
index 5009b8f5df48f..f5d2395e8346f 100644
--- a/packages/grafana-ui/src/components/ErrorBoundary/ErrorWithStack.tsx
+++ b/packages/grafana-ui/src/components/ErrorBoundary/ErrorWithStack.tsx
@@ -1,30 +1,34 @@
 import { css } from '@emotion/css';
 import React from 'react';
 
-import { stylesFactory } from '../../themes';
+import { useStyles2 } from '../../themes';
 
 import { ErrorBoundaryApi } from './ErrorBoundary';
 
-const getStyles = stylesFactory(() => {
-  return css({
-    width: '500px',
-    margin: '64px auto',
-  });
-});
-
 export interface Props extends ErrorBoundaryApi {
   title: string;
 }
 
-export const ErrorWithStack = ({ error, errorInfo, title }: Props) => (
-  <div className={getStyles()}>
-    <h2>{title}</h2>
-    <details style={{ whiteSpace: 'pre-wrap' }}>
-      {error && error.toString()}
-      <br />
-      {errorInfo && errorInfo.componentStack}
-    </details>
-  </div>
-);
+export const ErrorWithStack = ({ error, errorInfo, title }: Props) => {
+  const style = useStyles2(getStyles);
+
+  return (
+    <div className={style}>
+      <h2>{title}</h2>
+      <details style={{ whiteSpace: 'pre-wrap' }}>
+        {error && error.toString()}
+        <br />
+        {errorInfo && errorInfo.componentStack}
+      </details>
+    </div>
+  );
+};
 
 ErrorWithStack.displayName = 'ErrorWithStack';
+
+const getStyles = () => {
+  return css({
+    width: '500px',
+    margin: '64px auto',
+  });
+};
diff --git a/packages/grafana-ui/src/components/Forms/Checkbox.tsx b/packages/grafana-ui/src/components/Forms/Checkbox.tsx
index 97ee940235b24..74716ec57d560 100644
--- a/packages/grafana-ui/src/components/Forms/Checkbox.tsx
+++ b/packages/grafana-ui/src/components/Forms/Checkbox.tsx
@@ -3,7 +3,7 @@ import React, { HTMLProps, useCallback } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
-import { useTheme2 } from '../../themes';
+import { useStyles2 } from '../../themes';
 import { getFocusStyles, getMouseFocusStyles } from '../../themes/mixins';
 
 import { getLabelStyles } from './Label';
@@ -12,7 +12,7 @@ export interface CheckboxProps extends Omit<HTMLProps<HTMLInputElement>, 'value'
   /** Label to display next to checkbox */
   label?: string;
   /** Description to display under the label */
-  description?: string;
+  description?: string | React.ReactElement;
   /** Current value of the checkbox */
   value?: boolean;
   /** htmlValue allows to specify the input "value" attribute */
@@ -36,8 +36,7 @@ export const Checkbox = React.forwardRef<HTMLInputElement, CheckboxProps>(
       },
       [onChange]
     );
-    const theme = useTheme2();
-    const styles = getCheckboxStyles(theme, invalid);
+    const styles = useStyles2(getCheckboxStyles, invalid);
 
     const ariaChecked = indeterminate ? 'mixed' : undefined;
 
diff --git a/packages/grafana-ui/src/components/Forms/Field.tsx b/packages/grafana-ui/src/components/Forms/Field.tsx
index 72fd2a45ee027..9b6e6ef5a7cd7 100644
--- a/packages/grafana-ui/src/components/Forms/Field.tsx
+++ b/packages/grafana-ui/src/components/Forms/Field.tsx
@@ -3,7 +3,7 @@ import React, { HTMLAttributes } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
-import { stylesFactory, useTheme2 } from '../../themes';
+import { useStyles2 } from '../../themes';
 import { getChildId } from '../../utils/reactUtils';
 
 import { FieldValidationMessage } from './FieldValidationMessage';
@@ -40,35 +40,6 @@ export interface FieldProps extends HTMLAttributes<HTMLDivElement> {
   htmlFor?: string;
 }
 
-export const getFieldStyles = stylesFactory((theme: GrafanaTheme2) => {
-  return {
-    field: css({
-      display: 'flex',
-      flexDirection: 'column',
-      marginBottom: theme.spacing(2),
-    }),
-    fieldHorizontal: css({
-      flexDirection: 'row',
-      justifyContent: 'space-between',
-      flexWrap: 'wrap',
-    }),
-    fieldValidationWrapper: css({
-      marginTop: theme.spacing(0.5),
-    }),
-    fieldValidationWrapperHorizontal: css({
-      flex: '1 1 100%',
-    }),
-    validationMessageHorizontalOverflow: css({
-      width: 0,
-      overflowX: 'visible',
-
-      '& > *': {
-        whiteSpace: 'nowrap',
-      },
-    }),
-  };
-});
-
 export const Field = React.forwardRef<HTMLDivElement, FieldProps>(
   (
     {
@@ -88,8 +59,7 @@ export const Field = React.forwardRef<HTMLDivElement, FieldProps>(
     }: FieldProps,
     ref
   ) => {
-    const theme = useTheme2();
-    const styles = getFieldStyles(theme);
+    const styles = useStyles2(getFieldStyles);
     const inputId = htmlFor ?? getChildId(children);
 
     const labelElement =
@@ -143,3 +113,30 @@ function deleteUndefinedProps<T extends Object>(obj: T): Partial<T> {
 
   return obj;
 }
+
+export const getFieldStyles = (theme: GrafanaTheme2) => ({
+  field: css({
+    display: 'flex',
+    flexDirection: 'column',
+    marginBottom: theme.spacing(2),
+  }),
+  fieldHorizontal: css({
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    flexWrap: 'wrap',
+  }),
+  fieldValidationWrapper: css({
+    marginTop: theme.spacing(0.5),
+  }),
+  fieldValidationWrapperHorizontal: css({
+    flex: '1 1 100%',
+  }),
+  validationMessageHorizontalOverflow: css({
+    width: 0,
+    overflowX: 'visible',
+
+    '& > *': {
+      whiteSpace: 'nowrap',
+    },
+  }),
+});
diff --git a/packages/grafana-ui/src/components/Forms/FieldArray.mdx b/packages/grafana-ui/src/components/Forms/FieldArray.mdx
index 04060391c1d61..8f428a46141a2 100644
--- a/packages/grafana-ui/src/components/Forms/FieldArray.mdx
+++ b/packages/grafana-ui/src/components/Forms/FieldArray.mdx
@@ -7,6 +7,8 @@ import { FieldArray } from './FieldArray';
 
 `FieldArray` provides a way to render a list of dynamic inputs. It exposes the functionality of `useFieldArray` in [react-hook-form](https://react-hook-form.com/advanced-usage/#FieldArrays). `FieldArray` must be wrapped at some level by a `<Form>` element.
 
+**Note: This component is deprecated and will be removed in the future versions of grafana/ui. Use the `useFieldArray` hook from react-hook-form instead.**
+
 ### Usage
 
 ```jsx
diff --git a/packages/grafana-ui/src/components/Forms/FieldArray.tsx b/packages/grafana-ui/src/components/Forms/FieldArray.tsx
index bab7d3ebae1fa..69ebbbca65789 100644
--- a/packages/grafana-ui/src/components/Forms/FieldArray.tsx
+++ b/packages/grafana-ui/src/components/Forms/FieldArray.tsx
@@ -7,6 +7,9 @@ export interface FieldArrayProps extends UseFieldArrayProps {
   children: (api: FieldArrayApi) => JSX.Element;
 }
 
+/**
+ * @deprecated use the `useFieldArray` hook from react-hook-form instead
+ */
 export const FieldArray: FC<FieldArrayProps> = ({ name, control, children, ...rest }) => {
   const { fields, append, prepend, remove, swap, move, insert } = useFieldArray({
     control,
diff --git a/packages/grafana-ui/src/components/Forms/FieldSet.tsx b/packages/grafana-ui/src/components/Forms/FieldSet.tsx
index c062021e20c77..3d3c098609235 100644
--- a/packages/grafana-ui/src/components/Forms/FieldSet.tsx
+++ b/packages/grafana-ui/src/components/Forms/FieldSet.tsx
@@ -3,7 +3,7 @@ import React, { HTMLProps } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
-import { stylesFactory, useTheme2 } from '../../themes';
+import { useStyles2 } from '../../themes';
 
 import { Legend } from './Legend';
 
@@ -14,8 +14,7 @@ export interface Props extends Omit<HTMLProps<HTMLFieldSetElement>, 'label'> {
 }
 
 export const FieldSet = ({ label, children, className, ...rest }: Props) => {
-  const theme = useTheme2();
-  const styles = getStyles(theme);
+  const styles = useStyles2(getStyles);
 
   return (
     <fieldset className={cx(styles.wrapper, className)} {...rest}>
@@ -25,14 +24,12 @@ export const FieldSet = ({ label, children, className, ...rest }: Props) => {
   );
 };
 
-const getStyles = stylesFactory((theme: GrafanaTheme2) => {
-  return {
-    wrapper: css({
-      marginBottom: theme.spacing(4),
+const getStyles = (theme: GrafanaTheme2) => ({
+  wrapper: css({
+    marginBottom: theme.spacing(4),
 
-      '&:last-child': {
-        marginBottom: 0,
-      },
-    }),
-  };
+    '&:last-child': {
+      marginBottom: 0,
+    },
+  }),
 });
diff --git a/packages/grafana-ui/src/components/Forms/FieldValidationMessage.tsx b/packages/grafana-ui/src/components/Forms/FieldValidationMessage.tsx
index 55f460653bf1f..8d8dc832b6636 100644
--- a/packages/grafana-ui/src/components/Forms/FieldValidationMessage.tsx
+++ b/packages/grafana-ui/src/components/Forms/FieldValidationMessage.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
-import { stylesFactory, useTheme2 } from '../../themes';
+import { useStyles2 } from '../../themes';
 import { Icon } from '../Icon/Icon';
 
 export interface FieldValidationMessageProps {
@@ -12,7 +12,23 @@ export interface FieldValidationMessageProps {
   horizontal?: boolean;
 }
 
-export const getFieldValidationMessageStyles = stylesFactory((theme: GrafanaTheme2) => {
+export const FieldValidationMessage = ({
+  children,
+  horizontal,
+  className,
+}: React.PropsWithChildren<FieldValidationMessageProps>) => {
+  const styles = useStyles2(getFieldValidationMessageStyles);
+  const cssName = cx(horizontal ? styles.horizontal : styles.vertical, className);
+
+  return (
+    <div role="alert" className={cssName}>
+      <Icon className={styles.fieldValidationMessageIcon} name="exclamation-triangle" />
+      {children}
+    </div>
+  );
+};
+
+export const getFieldValidationMessageStyles = (theme: GrafanaTheme2) => {
   const baseStyle = `
       font-size: ${theme.typography.size.sm};
       font-weight: ${theme.typography.fontWeightMedium};
@@ -69,21 +85,4 @@ export const getFieldValidationMessageStyles = stylesFactory((theme: GrafanaThem
       marginRight: theme.spacing(),
     }),
   };
-});
-
-export const FieldValidationMessage = ({
-  children,
-  horizontal,
-  className,
-}: React.PropsWithChildren<FieldValidationMessageProps>) => {
-  const theme = useTheme2();
-  const styles = getFieldValidationMessageStyles(theme);
-  const cssName = cx(horizontal ? styles.horizontal : styles.vertical, className);
-
-  return (
-    <div role="alert" className={cssName}>
-      <Icon className={styles.fieldValidationMessageIcon} name="exclamation-triangle" />
-      {children}
-    </div>
-  );
 };
diff --git a/packages/grafana-ui/src/components/Forms/Form.mdx b/packages/grafana-ui/src/components/Forms/Form.mdx
index 35757b43dddc6..3c85eb86636ff 100644
--- a/packages/grafana-ui/src/components/Forms/Form.mdx
+++ b/packages/grafana-ui/src/components/Forms/Form.mdx
@@ -7,6 +7,8 @@ import { Form } from './Form';
 
 Form component provides a way to build simple forms at Grafana. It is built on top of [react-hook-form](https://react-hook-form.com/) library and incorporates the same concepts while adjusting the API slightly.
 
+**Note: This component is deprecated and will be removed in the future versions of grafana/ui. Use the `useForm` hook from react-hook-form instead.**
+
 ## Usage
 
 ```tsx
diff --git a/packages/grafana-ui/src/components/Forms/Form.tsx b/packages/grafana-ui/src/components/Forms/Form.tsx
index d0362bd0824aa..065dab5c7941d 100644
--- a/packages/grafana-ui/src/components/Forms/Form.tsx
+++ b/packages/grafana-ui/src/components/Forms/Form.tsx
@@ -1,6 +1,6 @@
 import { css } from '@emotion/css';
 import React, { HTMLProps, useEffect } from 'react';
-import { useForm, Mode, DeepPartial, UnpackNestedValue, SubmitHandler, FieldValues } from 'react-hook-form';
+import { useForm, Mode, DefaultValues, SubmitHandler, FieldValues } from 'react-hook-form';
 
 import { FormAPI } from '../../types';
 
@@ -8,13 +8,16 @@ interface FormProps<T extends FieldValues> extends Omit<HTMLProps<HTMLFormElemen
   validateOn?: Mode;
   validateOnMount?: boolean;
   validateFieldsOnMount?: string | string[];
-  defaultValues?: UnpackNestedValue<DeepPartial<T>>;
+  defaultValues?: DefaultValues<T>;
   onSubmit: SubmitHandler<T>;
   children: (api: FormAPI<T>) => React.ReactNode;
   /** Sets max-width for container. Use it instead of setting individual widths on inputs.*/
   maxWidth?: number | 'none';
 }
 
+/**
+ * @deprecated use the `useForm` hook from react-hook-form instead
+ */
 export function Form<T extends FieldValues>({
   defaultValues,
   onSubmit,
diff --git a/packages/grafana-ui/src/components/Forms/Label.tsx b/packages/grafana-ui/src/components/Forms/Label.tsx
index a8f6826f90116..6abadee2fd949 100644
--- a/packages/grafana-ui/src/components/Forms/Label.tsx
+++ b/packages/grafana-ui/src/components/Forms/Label.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
-import { useTheme2, stylesFactory } from '../../themes';
+import { useStyles2 } from '../../themes';
 import { Icon } from '../Icon/Icon';
 
 export interface LabelProps extends React.LabelHTMLAttributes<HTMLLabelElement> {
@@ -12,43 +12,8 @@ export interface LabelProps extends React.LabelHTMLAttributes<HTMLLabelElement>
   category?: React.ReactNode[];
 }
 
-export const getLabelStyles = stylesFactory((theme: GrafanaTheme2) => {
-  return {
-    label: css({
-      label: 'Label',
-      fontSize: theme.typography.size.sm,
-      fontWeight: theme.typography.fontWeightMedium,
-      lineHeight: 1.25,
-      marginBottom: theme.spacing(0.5),
-      color: theme.colors.text.primary,
-      maxWidth: '480px',
-    }),
-    labelContent: css({
-      display: 'flex',
-      alignItems: 'center',
-    }),
-    description: css({
-      label: 'Label-description',
-      color: theme.colors.text.secondary,
-      fontSize: theme.typography.size.sm,
-      fontWeight: theme.typography.fontWeightRegular,
-      marginTop: theme.spacing(0.25),
-      display: 'block',
-    }),
-    categories: css({
-      label: 'Label-categories',
-      display: 'inline-flex',
-      alignItems: 'center',
-    }),
-    chevron: css({
-      margin: theme.spacing(0, 0.25),
-    }),
-  };
-});
-
 export const Label = ({ children, description, className, category, ...labelProps }: LabelProps) => {
-  const theme = useTheme2();
-  const styles = getLabelStyles(theme);
+  const styles = useStyles2(getLabelStyles);
   const categories = category?.map((c, i) => {
     return (
       <span className={styles.categories} key={`${c}/${i}`}>
@@ -70,3 +35,35 @@ export const Label = ({ children, description, className, category, ...labelProp
     </div>
   );
 };
+
+export const getLabelStyles = (theme: GrafanaTheme2) => ({
+  label: css({
+    label: 'Label',
+    fontSize: theme.typography.size.sm,
+    fontWeight: theme.typography.fontWeightMedium,
+    lineHeight: 1.25,
+    marginBottom: theme.spacing(0.5),
+    color: theme.colors.text.primary,
+    maxWidth: '480px',
+  }),
+  labelContent: css({
+    display: 'flex',
+    alignItems: 'center',
+  }),
+  description: css({
+    label: 'Label-description',
+    color: theme.colors.text.secondary,
+    fontSize: theme.typography.size.sm,
+    fontWeight: theme.typography.fontWeightRegular,
+    marginTop: theme.spacing(0.25),
+    display: 'block',
+  }),
+  categories: css({
+    label: 'Label-categories',
+    display: 'inline-flex',
+    alignItems: 'center',
+  }),
+  chevron: css({
+    margin: theme.spacing(0, 0.25),
+  }),
+});
diff --git a/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButton.tsx b/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButton.tsx
index 8a9b7a1998fe8..b33189239347e 100644
--- a/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButton.tsx
+++ b/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButton.tsx
@@ -2,10 +2,11 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { StringSelector } from '@grafana/e2e-selectors';
+import { StringSelector, selectors } from '@grafana/e2e-selectors';
 
-import { useTheme2, stylesFactory } from '../../../themes';
+import { useStyles2 } from '../../../themes';
 import { getFocusStyles, getMouseFocusStyles } from '../../../themes/mixins';
+import { Tooltip } from '../../Tooltip/Tooltip';
 import { getPropertiesForButtonSize } from '../commonStyles';
 
 export type RadioButtonSize = 'sm' | 'md';
@@ -41,23 +42,34 @@ export const RadioButton = React.forwardRef<HTMLInputElement, RadioButtonProps>(
     },
     ref
   ) => {
-    const theme = useTheme2();
-    const styles = getRadioButtonStyles(theme, size, fullWidth);
+    const styles = useStyles2(getRadioButtonStyles, size, fullWidth);
 
-    return (
-      <div className={styles.radioOption}>
-        <input
-          type="radio"
-          className={styles.radio}
-          onChange={onChange}
-          onClick={onClick}
-          disabled={disabled}
-          id={id}
-          checked={active}
-          name={name}
-          aria-label={ariaLabel || description}
-          ref={ref}
-        />
+    const inputRadioButton = (
+      <input
+        type="radio"
+        className={styles.radio}
+        onChange={onChange}
+        onClick={onClick}
+        disabled={disabled}
+        id={id}
+        checked={active}
+        name={name}
+        aria-label={ariaLabel}
+        ref={ref}
+      />
+    );
+    return description ? (
+      <div className={styles.radioOption} data-testid={selectors.components.RadioButton.container}>
+        <Tooltip content={description} placement="bottom">
+          {inputRadioButton}
+        </Tooltip>
+        <label className={styles.radioLabel} htmlFor={id} title={description || ariaLabel}>
+          {children}
+        </label>
+      </div>
+    ) : (
+      <div className={styles.radioOption} data-testid={selectors.components.RadioButton.container}>
+        {inputRadioButton}
         <label className={styles.radioLabel} htmlFor={id} title={description || ariaLabel}>
           {children}
         </label>
@@ -68,7 +80,7 @@ export const RadioButton = React.forwardRef<HTMLInputElement, RadioButtonProps>(
 
 RadioButton.displayName = 'RadioButton';
 
-const getRadioButtonStyles = stylesFactory((theme: GrafanaTheme2, size: RadioButtonSize, fullWidth?: boolean) => {
+const getRadioButtonStyles = (theme: GrafanaTheme2, size: RadioButtonSize, fullWidth?: boolean) => {
   const { fontSize, height, padding } = getPropertiesForButtonSize(size, theme);
 
   const textColor = theme.colors.text.secondary;
@@ -87,15 +99,16 @@ const getRadioButtonStyles = stylesFactory((theme: GrafanaTheme2, size: RadioBut
     radio: css({
       position: 'absolute',
       opacity: 0,
-      zIndex: -1000,
+      zIndex: 2,
       width: '100% !important',
       height: '100%',
+      cursor: 'pointer',
 
       '&:checked + label': {
         color: theme.colors.text.primary,
         fontWeight: theme.typography.fontWeightMedium,
         background: theme.colors.action.selected,
-        zIndex: 3,
+        zIndex: 1,
       },
 
       '&:focus + label, &:focus-visible + label': getFocusStyles(theme),
@@ -108,6 +121,9 @@ const getRadioButtonStyles = stylesFactory((theme: GrafanaTheme2, size: RadioBut
       },
     }),
     radioLabel: css({
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'center',
       fontSize,
       height: `${labelHeight}px`,
       // Deduct border from line-height for perfect vertical centering on windows and linux
@@ -117,7 +133,6 @@ const getRadioButtonStyles = stylesFactory((theme: GrafanaTheme2, size: RadioBut
       borderRadius: theme.shape.radius.default,
       background: theme.colors.background.primary,
       cursor: 'pointer',
-      zIndex: 1,
       userSelect: 'none',
       whiteSpace: 'nowrap',
       flexGrow: 1,
@@ -127,4 +142,4 @@ const getRadioButtonStyles = stylesFactory((theme: GrafanaTheme2, size: RadioBut
       },
     }),
   };
-});
+};
diff --git a/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.story.tsx b/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.story.tsx
index 466d9acfa6264..6add75c267b02 100644
--- a/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.story.tsx
+++ b/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.story.tsx
@@ -72,6 +72,8 @@ export const RadioButtons: Story = (args) => {
         <RadioButtonGroup
           options={optionsWithOnlyIcons}
           value={selected}
+          disabled={args.disabled}
+          disabledOptions={args.disabledOptions}
           onChange={(v) => setSelected(v!)}
           size={args.size}
           invalid={args.invalid}
diff --git a/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.tsx b/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.tsx
index 8c5153180d4c1..1ac45002e6afc 100644
--- a/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.tsx
+++ b/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.tsx
@@ -76,7 +76,7 @@ export function RadioButtonGroup<T>({
     <div
       role="radiogroup"
       aria-label={ariaLabel}
-      className={cx(styles.radioGroup, fullWidth && styles.fullWidth, className)}
+      className={cx(styles.radioGroup, fullWidth && styles.fullWidth, invalid && styles.invalid, className)}
     >
       {options.map((opt, i) => {
         const isItemDisabled = disabledOptions && opt.value && disabledOptions.includes(opt.value);
diff --git a/packages/grafana-ui/src/components/Graph/GraphTooltip/types.ts b/packages/grafana-ui/src/components/Graph/GraphTooltip/types.ts
deleted file mode 100644
index ccf04ef11751e..0000000000000
--- a/packages/grafana-ui/src/components/Graph/GraphTooltip/types.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Dimension, Dimensions, TimeZone } from '@grafana/data';
-
-import { ActiveDimensions } from '../../VizTooltip';
-
-export interface GraphDimensions extends Dimensions {
-  xAxis: Dimension<number>;
-  yAxis: Dimension<number>;
-}
-
-export interface GraphTooltipContentProps {
-  dimensions: GraphDimensions; // Dimension[]
-  activeDimensions: ActiveDimensions<GraphDimensions>;
-  timeZone?: TimeZone;
-}
diff --git a/packages/grafana-ui/src/components/Graph/types.ts b/packages/grafana-ui/src/components/Graph/types.ts
deleted file mode 100644
index be3c00dd59cf6..0000000000000
--- a/packages/grafana-ui/src/components/Graph/types.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-export interface FlotPosition {
-  pageX: number;
-  pageY: number;
-  x: number;
-  x1: number;
-  y: number;
-  y1: number;
-}
-
-export interface FlotItem<T> {
-  datapoint: [number, number];
-  dataIndex: number;
-  series: T;
-  seriesIndex: number;
-  pageX: number;
-  pageY: number;
-}
diff --git a/packages/grafana-ui/src/components/Graph/utils.ts b/packages/grafana-ui/src/components/Graph/utils.ts
deleted file mode 100644
index 9ac252c82fc01..0000000000000
--- a/packages/grafana-ui/src/components/Graph/utils.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-import {
-  GraphSeriesValue,
-  Field,
-  formattedValueToString,
-  getFieldDisplayName,
-  TimeZone,
-  dateTimeFormat,
-  systemDateFormats,
-} from '@grafana/data';
-
-/**
- * Returns index of the closest datapoint BEFORE hover position
- *
- * @param posX
- * @param series
- */
-export const findHoverIndexFromData = (xAxisDimension: Field, xPos: number) => {
-  let lower = 0;
-  let upper = xAxisDimension.values.length - 1;
-  let middle;
-
-  while (true) {
-    if (lower > upper) {
-      return Math.max(upper, 0);
-    }
-    middle = Math.floor((lower + upper) / 2);
-    const xPosition = xAxisDimension.values[middle];
-
-    if (xPosition === xPos) {
-      return middle;
-    } else if (xPosition && xPosition < xPos) {
-      lower = middle + 1;
-    } else {
-      upper = middle - 1;
-    }
-  }
-};
-
-interface MultiSeriesHoverInfo {
-  value: string;
-  time: string;
-  datapointIndex: number;
-  seriesIndex: number;
-  label?: string;
-  color?: string;
-}
-
-/**
- * Returns information about closest datapoints when hovering over a Graph
- *
- * @param seriesList list of series visible on the Graph
- * @param pos mouse cursor position, based on jQuery.flot position
- */
-export const getMultiSeriesGraphHoverInfo = (
-  // x and y axis dimensions order is aligned
-  yAxisDimensions: Field[],
-  xAxisDimensions: Field[],
-  /** Well, time basically */
-  xAxisPosition: number,
-  timeZone?: TimeZone
-): {
-  results: MultiSeriesHoverInfo[];
-  time?: GraphSeriesValue;
-} => {
-  let i, field, hoverIndex, hoverDistance, pointTime;
-
-  const results: MultiSeriesHoverInfo[] = [];
-
-  let minDistance, minTime;
-
-  for (i = 0; i < yAxisDimensions.length; i++) {
-    field = yAxisDimensions[i];
-    const time = xAxisDimensions[i];
-    hoverIndex = findHoverIndexFromData(time, xAxisPosition);
-    hoverDistance = xAxisPosition - time.values[hoverIndex];
-    pointTime = time.values[hoverIndex];
-    // Take the closest point before the cursor, or if it does not exist, the closest after
-    if (
-      minDistance === undefined ||
-      (hoverDistance >= 0 && (hoverDistance < minDistance || minDistance < 0)) ||
-      (hoverDistance < 0 && hoverDistance > minDistance)
-    ) {
-      minDistance = hoverDistance;
-      minTime = time.display ? formattedValueToString(time.display(pointTime)) : pointTime;
-    }
-
-    const disp = field.display!(field.values[hoverIndex]);
-
-    results.push({
-      value: formattedValueToString(disp),
-      datapointIndex: hoverIndex,
-      seriesIndex: i,
-      color: disp.color,
-      label: getFieldDisplayName(field),
-      time: time.display ? formattedValueToString(time.display(pointTime)) : pointTime,
-    });
-  }
-
-  return {
-    results,
-    time: minTime,
-  };
-};
-
-export const graphTickFormatter = (epoch: number, axis: any) => {
-  return dateTimeFormat(epoch, {
-    format: axis?.options?.timeformat,
-    timeZone: axis?.options?.timezone,
-  });
-};
-
-export const graphTimeFormat = (ticks: number | null, min: number | null, max: number | null): string => {
-  if (min && max && ticks) {
-    const range = max - min;
-    const secPerTick = range / ticks / 1000;
-    // Need have 10 millisecond margin on the day range
-    // As sometimes last 24 hour dashboard evaluates to more than 86400000
-    const oneDay = 86400010;
-    const oneYear = 31536000000;
-
-    if (secPerTick <= 10) {
-      return systemDateFormats.interval.millisecond;
-    }
-    if (secPerTick <= 45) {
-      return systemDateFormats.interval.second;
-    }
-    if (range <= oneDay) {
-      return systemDateFormats.interval.minute;
-    }
-    if (secPerTick <= 80000) {
-      return systemDateFormats.interval.hour;
-    }
-    if (range <= oneYear) {
-      return systemDateFormats.interval.day;
-    }
-    if (secPerTick <= 31536000) {
-      return systemDateFormats.interval.month;
-    }
-    return systemDateFormats.interval.year;
-  }
-
-  return systemDateFormats.interval.minute;
-};
diff --git a/packages/grafana-ui/src/components/GraphNG/GraphNG.tsx b/packages/grafana-ui/src/components/GraphNG/GraphNG.tsx
deleted file mode 100644
index d75ab59252b6e..0000000000000
--- a/packages/grafana-ui/src/components/GraphNG/GraphNG.tsx
+++ /dev/null
@@ -1,276 +0,0 @@
-import React, { Component } from 'react';
-import { Subscription } from 'rxjs';
-import { throttleTime } from 'rxjs/operators';
-import uPlot, { AlignedData } from 'uplot';
-
-import {
-  DataFrame,
-  DataHoverClearEvent,
-  DataHoverEvent,
-  Field,
-  FieldMatcherID,
-  fieldMatchers,
-  FieldType,
-  LegacyGraphHoverEvent,
-  TimeRange,
-  TimeZone,
-} from '@grafana/data';
-import { VizLegendOptions } from '@grafana/schema';
-
-import { Themeable2 } from '../../types';
-import { PanelContext, PanelContextRoot } from '../PanelChrome/PanelContext';
-import { VizLayout } from '../VizLayout/VizLayout';
-import { UPlotChart } from '../uPlot/Plot';
-import { AxisProps } from '../uPlot/config/UPlotAxisBuilder';
-import { Renderers, UPlotConfigBuilder } from '../uPlot/config/UPlotConfigBuilder';
-import { ScaleProps } from '../uPlot/config/UPlotScaleBuilder';
-import { findMidPointYPosition, pluginLog } from '../uPlot/utils';
-
-import { GraphNGLegendEvent, XYFieldMatchers } from './types';
-import { preparePlotFrame as defaultPreparePlotFrame } from './utils';
-
-/**
- * @internal -- not a public API
- */
-export const FIXED_UNIT = '__fixed';
-
-/**
- * @internal -- not a public API
- */
-export type PropDiffFn<T extends any = any> = (prev: T, next: T) => boolean;
-
-export interface GraphNGProps extends Themeable2 {
-  frames: DataFrame[];
-  structureRev?: number; // a number that will change when the frames[] structure changes
-  width: number;
-  height: number;
-  timeRange: TimeRange;
-  timeZone: TimeZone[] | TimeZone;
-  legend: VizLegendOptions;
-  fields?: XYFieldMatchers; // default will assume timeseries data
-  renderers?: Renderers;
-  tweakScale?: (opts: ScaleProps, forField: Field) => ScaleProps;
-  tweakAxis?: (opts: AxisProps, forField: Field) => AxisProps;
-  onLegendClick?: (event: GraphNGLegendEvent) => void;
-  children?: (builder: UPlotConfigBuilder, alignedFrame: DataFrame) => React.ReactNode;
-  prepConfig: (alignedFrame: DataFrame, allFrames: DataFrame[], getTimeRange: () => TimeRange) => UPlotConfigBuilder;
-  propsToDiff?: Array<string | PropDiffFn>;
-  preparePlotFrame?: (frames: DataFrame[], dimFields: XYFieldMatchers) => DataFrame | null;
-  renderLegend: (config: UPlotConfigBuilder) => React.ReactElement | null;
-
-  /**
-   * needed for propsToDiff to re-init the plot & config
-   * this is a generic approach to plot re-init, without having to specify which panel-level options
-   * should cause invalidation. we can drop this in favor of something like panelOptionsRev that gets passed in
-   * similar to structureRev. then we can drop propsToDiff entirely.
-   */
-  options?: Record<string, any>;
-}
-
-function sameProps(prevProps: any, nextProps: any, propsToDiff: Array<string | PropDiffFn> = []) {
-  for (const propName of propsToDiff) {
-    if (typeof propName === 'function') {
-      if (!propName(prevProps, nextProps)) {
-        return false;
-      }
-    } else if (nextProps[propName] !== prevProps[propName]) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-/**
- * @internal -- not a public API
- */
-export interface GraphNGState {
-  alignedFrame: DataFrame;
-  alignedData?: AlignedData;
-  config?: UPlotConfigBuilder;
-}
-
-/**
- * "Time as X" core component, expects ascending x
- */
-export class GraphNG extends Component<GraphNGProps, GraphNGState> {
-  static contextType = PanelContextRoot;
-  panelContext: PanelContext = {} as PanelContext;
-  private plotInstance: React.RefObject<uPlot>;
-
-  private subscription = new Subscription();
-
-  constructor(props: GraphNGProps) {
-    super(props);
-    let state = this.prepState(props);
-    state.alignedData = state.config!.prepData!([state.alignedFrame]) as AlignedData;
-    this.state = state;
-    this.plotInstance = React.createRef();
-  }
-
-  getTimeRange = () => this.props.timeRange;
-
-  prepState(props: GraphNGProps, withConfig = true) {
-    let state: GraphNGState = null as any;
-
-    const { frames, fields, preparePlotFrame } = props;
-
-    const preparePlotFrameFn = preparePlotFrame || defaultPreparePlotFrame;
-
-    const alignedFrame = preparePlotFrameFn(
-      frames,
-      fields || {
-        x: fieldMatchers.get(FieldMatcherID.firstTimeField).get({}),
-        y: fieldMatchers.get(FieldMatcherID.byTypes).get(new Set([FieldType.number, FieldType.enum])),
-      },
-      props.timeRange
-    );
-    pluginLog('GraphNG', false, 'data aligned', alignedFrame);
-
-    if (alignedFrame) {
-      let config = this.state?.config;
-
-      if (withConfig) {
-        config = props.prepConfig(alignedFrame, this.props.frames, this.getTimeRange);
-        pluginLog('GraphNG', false, 'config prepared', config);
-      }
-
-      state = {
-        alignedFrame,
-        config,
-      };
-
-      pluginLog('GraphNG', false, 'data prepared', state.alignedData);
-    }
-
-    return state;
-  }
-
-  handleCursorUpdate(evt: DataHoverEvent | LegacyGraphHoverEvent) {
-    const time = evt.payload?.point?.time;
-    const u = this.plotInstance.current;
-    if (u && time) {
-      // Try finding left position on time axis
-      const left = u.valToPos(time, 'x');
-      let top;
-      if (left) {
-        // find midpoint between points at current idx
-        top = findMidPointYPosition(u, u.posToIdx(left));
-      }
-
-      if (!top || !left) {
-        return;
-      }
-
-      u.setCursor({
-        left,
-        top,
-      });
-    }
-  }
-
-  componentDidMount() {
-    this.panelContext = this.context as PanelContext;
-    const { eventBus } = this.panelContext;
-
-    this.subscription.add(
-      eventBus
-        .getStream(DataHoverEvent)
-        .pipe(throttleTime(50))
-        .subscribe({
-          next: (evt) => {
-            if (eventBus === evt.origin) {
-              return;
-            }
-            this.handleCursorUpdate(evt);
-          },
-        })
-    );
-
-    // Legacy events (from flot graph)
-    this.subscription.add(
-      eventBus
-        .getStream(LegacyGraphHoverEvent)
-        .pipe(throttleTime(50))
-        .subscribe({
-          next: (evt) => this.handleCursorUpdate(evt),
-        })
-    );
-
-    this.subscription.add(
-      eventBus
-        .getStream(DataHoverClearEvent)
-        .pipe(throttleTime(50))
-        .subscribe({
-          next: () => {
-            const u = this.plotInstance?.current;
-
-            // @ts-ignore
-            if (u && !u.cursor._lock) {
-              u.setCursor({
-                left: -10,
-                top: -10,
-              });
-            }
-          },
-        })
-    );
-  }
-
-  componentDidUpdate(prevProps: GraphNGProps) {
-    const { frames, structureRev, timeZone, propsToDiff } = this.props;
-
-    const propsChanged = !sameProps(prevProps, this.props, propsToDiff);
-
-    if (frames !== prevProps.frames || propsChanged || timeZone !== prevProps.timeZone) {
-      let newState = this.prepState(this.props, false);
-
-      if (newState) {
-        const shouldReconfig =
-          this.state.config === undefined ||
-          timeZone !== prevProps.timeZone ||
-          structureRev !== prevProps.structureRev ||
-          !structureRev ||
-          propsChanged;
-
-        if (shouldReconfig) {
-          newState.config = this.props.prepConfig(newState.alignedFrame, this.props.frames, this.getTimeRange);
-          pluginLog('GraphNG', false, 'config recreated', newState.config);
-        }
-
-        newState.alignedData = newState.config!.prepData!([newState.alignedFrame]) as AlignedData;
-
-        this.setState(newState);
-      }
-    }
-  }
-
-  componentWillUnmount() {
-    this.subscription.unsubscribe();
-  }
-
-  render() {
-    const { width, height, children, renderLegend } = this.props;
-    const { config, alignedFrame, alignedData } = this.state;
-
-    if (!config) {
-      return null;
-    }
-
-    return (
-      <VizLayout width={width} height={height} legend={renderLegend(config)}>
-        {(vizWidth: number, vizHeight: number) => (
-          <UPlotChart
-            config={config}
-            data={alignedData!}
-            width={vizWidth}
-            height={vizHeight}
-            plotRef={(u) => ((this.plotInstance as React.MutableRefObject<uPlot>).current = u)}
-          >
-            {children ? children(config, alignedFrame) : null}
-          </UPlotChart>
-        )}
-      </VizLayout>
-    );
-  }
-}
diff --git a/packages/grafana-ui/src/components/GraphNG/__snapshots__/utils.test.ts.snap b/packages/grafana-ui/src/components/GraphNG/__snapshots__/utils.test.ts.snap
deleted file mode 100644
index 09f70e81c444d..0000000000000
--- a/packages/grafana-ui/src/components/GraphNG/__snapshots__/utils.test.ts.snap
+++ /dev/null
@@ -1,245 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`GraphNG utils preparePlotConfigBuilder 1`] = `
-{
-  "axes": [
-    {
-      "filter": undefined,
-      "font": "12px "Inter", "Helvetica", "Arial", sans-serif",
-      "gap": 5,
-      "grid": {
-        "show": true,
-        "stroke": "rgba(240, 250, 255, 0.09)",
-        "width": 1,
-      },
-      "incrs": undefined,
-      "labelGap": 0,
-      "rotate": undefined,
-      "scale": "x",
-      "show": true,
-      "side": 2,
-      "size": [Function],
-      "space": [Function],
-      "splits": undefined,
-      "stroke": "rgb(204, 204, 220)",
-      "ticks": {
-        "show": true,
-        "size": 4,
-        "stroke": "rgba(240, 250, 255, 0.09)",
-        "width": 1,
-      },
-      "timeZone": "utc",
-      "values": [Function],
-    },
-    {
-      "filter": undefined,
-      "font": "12px "Inter", "Helvetica", "Arial", sans-serif",
-      "gap": 5,
-      "grid": {
-        "show": true,
-        "stroke": "rgba(240, 250, 255, 0.09)",
-        "width": 1,
-      },
-      "incrs": undefined,
-      "labelGap": 0,
-      "rotate": undefined,
-      "scale": "__fixed/na-na/na-na/auto/linear/na/number",
-      "show": true,
-      "side": 3,
-      "size": [Function],
-      "space": [Function],
-      "splits": undefined,
-      "stroke": "rgb(204, 204, 220)",
-      "ticks": {
-        "show": false,
-        "size": 4,
-        "stroke": "rgb(204, 204, 220)",
-        "width": 1,
-      },
-      "timeZone": undefined,
-      "values": [Function],
-    },
-  ],
-  "cursor": {
-    "dataIdx": [Function],
-    "drag": {
-      "setScale": false,
-    },
-    "focus": {
-      "prox": 30,
-    },
-    "points": {
-      "fill": [Function],
-      "size": [Function],
-      "stroke": [Function],
-      "width": [Function],
-    },
-    "sync": {
-      "filters": {
-        "pub": [Function],
-      },
-      "key": "__global_",
-      "scales": [
-        "x",
-        "__fixed/na-na/na-na/auto/linear/na/number",
-      ],
-    },
-  },
-  "focus": {
-    "alpha": 1,
-  },
-  "hooks": {},
-  "legend": {
-    "show": false,
-  },
-  "mode": 1,
-  "ms": 1,
-  "padding": [
-    [Function],
-    [Function],
-    [Function],
-    [Function],
-  ],
-  "scales": {
-    "__fixed/na-na/na-na/auto/linear/na/number": {
-      "asinh": undefined,
-      "auto": true,
-      "dir": 1,
-      "distr": 1,
-      "log": undefined,
-      "ori": 1,
-      "range": [Function],
-      "time": undefined,
-    },
-    "x": {
-      "auto": false,
-      "dir": 1,
-      "ori": 0,
-      "range": [Function],
-      "time": true,
-    },
-  },
-  "select": undefined,
-  "series": [
-    {
-      "value": [Function],
-    },
-    {
-      "dash": [
-        1,
-        2,
-      ],
-      "facets": undefined,
-      "fill": [Function],
-      "paths": [Function],
-      "points": {
-        "fill": "#ff0000",
-        "filter": [Function],
-        "show": true,
-        "size": undefined,
-        "stroke": "#ff0000",
-      },
-      "pxAlign": undefined,
-      "scale": "__fixed/na-na/na-na/auto/linear/na/number",
-      "show": true,
-      "spanGaps": false,
-      "stroke": "#ff0000",
-      "value": [Function],
-      "width": 2,
-    },
-    {
-      "dash": [
-        1,
-        2,
-      ],
-      "facets": undefined,
-      "fill": [Function],
-      "paths": [Function],
-      "points": {
-        "fill": "#ff0000",
-        "filter": [Function],
-        "show": true,
-        "size": undefined,
-        "stroke": "#ff0000",
-      },
-      "pxAlign": undefined,
-      "scale": "__fixed/na-na/na-na/auto/linear/na/number",
-      "show": true,
-      "spanGaps": false,
-      "stroke": "#ff0000",
-      "value": [Function],
-      "width": 2,
-    },
-    {
-      "dash": [
-        1,
-        2,
-      ],
-      "facets": undefined,
-      "fill": [Function],
-      "paths": [Function],
-      "points": {
-        "fill": "#ff0000",
-        "filter": [Function],
-        "show": true,
-        "size": undefined,
-        "stroke": "#ff0000",
-      },
-      "pxAlign": undefined,
-      "scale": "__fixed/na-na/na-na/auto/linear/na/number",
-      "show": true,
-      "spanGaps": false,
-      "stroke": "#ff0000",
-      "value": [Function],
-      "width": 2,
-    },
-    {
-      "dash": [
-        1,
-        2,
-      ],
-      "facets": undefined,
-      "fill": [Function],
-      "paths": [Function],
-      "points": {
-        "fill": "#ff0000",
-        "filter": [Function],
-        "show": true,
-        "size": undefined,
-        "stroke": "#ff0000",
-      },
-      "pxAlign": undefined,
-      "scale": "__fixed/na-na/na-na/auto/linear/na/number",
-      "show": true,
-      "spanGaps": false,
-      "stroke": "#ff0000",
-      "value": [Function],
-      "width": 2,
-    },
-    {
-      "dash": [
-        1,
-        2,
-      ],
-      "facets": undefined,
-      "fill": [Function],
-      "paths": [Function],
-      "points": {
-        "fill": "#ff0000",
-        "filter": [Function],
-        "show": true,
-        "size": undefined,
-        "stroke": "#ff0000",
-      },
-      "pxAlign": undefined,
-      "scale": "__fixed/na-na/na-na/auto/linear/na/number",
-      "show": true,
-      "spanGaps": false,
-      "stroke": "#ff0000",
-      "value": [Function],
-      "width": 2,
-    },
-  ],
-  "tzDate": [Function],
-}
-`;
diff --git a/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.ts b/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.ts
deleted file mode 100644
index 352f2f0660bc1..0000000000000
--- a/packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.ts
+++ /dev/null
@@ -1,180 +0,0 @@
-import { DataFrame } from '@grafana/data';
-
-import { getRefField } from './utils';
-
-type InsertMode = (prev: number, next: number, threshold: number) => number;
-
-const INSERT_MODES = {
-  threshold: (prev: number, next: number, threshold: number) => prev + threshold,
-  midpoint: (prev: number, next: number, threshold: number) => (prev + next) / 2,
-  // previous time + 1ms to prevent StateTimeline from forward-interpolating prior state
-  plusone: (prev: number, next: number, threshold: number) => prev + 1,
-};
-
-interface NullInsertOptions {
-  frame: DataFrame;
-  refFieldName?: string | null;
-  refFieldPseudoMax?: number;
-  refFieldPseudoMin?: number;
-  insertMode?: InsertMode;
-}
-
-export function applyNullInsertThreshold(opts: NullInsertOptions): DataFrame {
-  if (opts.frame.length === 0) {
-    return opts.frame;
-  }
-
-  let thorough = true;
-  let { frame, refFieldName, refFieldPseudoMax, refFieldPseudoMin, insertMode } = opts;
-
-  if (!insertMode) {
-    insertMode = INSERT_MODES.threshold;
-  }
-
-  const refField = getRefField(frame, refFieldName);
-
-  if (refField == null) {
-    return frame;
-  }
-
-  refField.state = {
-    ...refField.state,
-    nullThresholdApplied: true,
-  };
-
-  const thresholds = frame.fields.map((field) => field.config.custom?.insertNulls || refField.config.interval || null);
-
-  const uniqueThresholds = new Set<number>(thresholds);
-
-  uniqueThresholds.delete(null as any);
-
-  if (uniqueThresholds.size === 0) {
-    return frame;
-  }
-
-  if (uniqueThresholds.size === 1) {
-    const threshold = uniqueThresholds.values().next().value;
-
-    if (threshold <= 0) {
-      return frame;
-    }
-
-    const refValues = refField.values;
-
-    const frameValues = frame.fields.map((field) => field.values);
-
-    const filledFieldValues = nullInsertThreshold(
-      refValues,
-      frameValues,
-      threshold,
-      refFieldPseudoMin,
-      refFieldPseudoMax,
-      insertMode,
-      thorough
-    );
-
-    if (filledFieldValues === frameValues) {
-      return frame;
-    }
-
-    return {
-      ...frame,
-      length: filledFieldValues[0].length,
-      fields: frame.fields.map((field, i) => ({
-        ...field,
-        values: filledFieldValues[i],
-      })),
-    };
-  }
-
-  // TODO: unique threshold-per-field (via overrides) is unimplemented
-  // should be done by processing each (refField + thresholdA-field1 + thresholdA-field2...)
-  // as a separate nullInsertThreshold() dataset, then re-join into single dataset via join()
-  return frame;
-}
-
-function nullInsertThreshold(
-  refValues: number[],
-  frameValues: any[][],
-  threshold: number,
-  refFieldPseudoMin: number | null = null,
-  // will insert a trailing null when refFieldPseudoMax > last datapoint + threshold
-  refFieldPseudoMax: number | null = null,
-  getInsertValue: InsertMode,
-  // will insert the value at every missing interval
-  thorough: boolean
-) {
-  const len = refValues.length;
-  const refValuesNew: number[] = [];
-
-  // Continuously subtract the threshold from the first data point, filling in insert values accordingly
-  if (refFieldPseudoMin != null && refFieldPseudoMin < refValues[0]) {
-    let preFillCount = Math.ceil((refValues[0] - refFieldPseudoMin) / threshold);
-    // this will be 0 or 1 threshold increment left of visible range
-    let prevSlot = refValues[0] - preFillCount * threshold;
-
-    while (prevSlot < refValues[0]) {
-      // (prevSlot - threshold) is used to simulate the previous 'real' data point, as getInsertValue expects
-      refValuesNew.push(getInsertValue(prevSlot - threshold, prevSlot, threshold));
-      prevSlot += threshold;
-    }
-  }
-
-  // Insert initial value
-  refValuesNew.push(refValues[0]);
-
-  let prevValue: number = refValues[0];
-
-  // Fill nulls when a value is greater than the threshold value
-  for (let i = 1; i < len; i++) {
-    const curValue = refValues[i];
-
-    while (curValue - prevValue > threshold) {
-      refValuesNew.push(getInsertValue(prevValue, curValue, threshold));
-
-      prevValue += threshold;
-
-      if (!thorough) {
-        break;
-      }
-    }
-
-    refValuesNew.push(curValue);
-
-    prevValue = curValue;
-  }
-
-  // At the end of the sequence
-  if (refFieldPseudoMax != null && refFieldPseudoMax > prevValue) {
-    while (prevValue + threshold < refFieldPseudoMax) {
-      refValuesNew.push(getInsertValue(prevValue, refFieldPseudoMax, threshold));
-      prevValue += threshold;
-    }
-  }
-
-  const filledLen = refValuesNew.length;
-
-  if (filledLen === len) {
-    return frameValues;
-  }
-
-  const filledFieldValues: any[][] = [];
-
-  for (let fieldValues of frameValues) {
-    let filledValues;
-
-    if (fieldValues !== refValues) {
-      filledValues = Array(filledLen);
-
-      for (let i = 0, j = 0; i < filledLen; i++) {
-        filledValues[i] = refValues[j] === refValuesNew[i] ? fieldValues[j++] : null;
-      }
-    } else {
-      filledValues = refValuesNew;
-    }
-
-    filledFieldValues.push(filledValues);
-  }
-
-  return filledFieldValues;
-}
diff --git a/packages/grafana-ui/src/components/GraphNG/nullToUndefThreshold.ts b/packages/grafana-ui/src/components/GraphNG/nullToUndefThreshold.ts
deleted file mode 100644
index dacc82a63fa67..0000000000000
--- a/packages/grafana-ui/src/components/GraphNG/nullToUndefThreshold.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// mutates all nulls -> undefineds in the fieldValues array for value-less refValues ranges below maxThreshold
-// refValues is typically a time array and maxThreshold is the allowable distance between in time
-export function nullToUndefThreshold(refValues: number[], fieldValues: any[], maxThreshold: number): any[] {
-  let prevRef;
-  let nullIdx;
-
-  for (let i = 0; i < fieldValues.length; i++) {
-    let fieldVal = fieldValues[i];
-
-    if (fieldVal == null) {
-      if (nullIdx == null && prevRef != null) {
-        nullIdx = i;
-      }
-    } else {
-      if (nullIdx != null) {
-        if (refValues[i] - (prevRef as number) < maxThreshold) {
-          while (nullIdx < i) {
-            fieldValues[nullIdx++] = undefined;
-          }
-        }
-
-        nullIdx = null;
-      }
-
-      prevRef = refValues[i];
-    }
-  }
-
-  return fieldValues;
-}
diff --git a/packages/grafana-ui/src/components/GraphNG/nullToValue.ts b/packages/grafana-ui/src/components/GraphNG/nullToValue.ts
deleted file mode 100644
index 62aea31b8371c..0000000000000
--- a/packages/grafana-ui/src/components/GraphNG/nullToValue.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { DataFrame } from '@grafana/data';
-
-export function nullToValue(frame: DataFrame) {
-  return {
-    ...frame,
-    fields: frame.fields.map((field) => {
-      const noValue = +field.config?.noValue!;
-
-      if (!Number.isNaN(noValue)) {
-        const transformedVals = field.values.slice();
-
-        for (let i = 0; i < transformedVals.length; i++) {
-          if (transformedVals[i] === null) {
-            transformedVals[i] = noValue;
-          }
-        }
-
-        return {
-          ...field,
-          values: transformedVals,
-        };
-      } else {
-        return field;
-      }
-    }),
-  };
-}
diff --git a/packages/grafana-ui/src/components/GraphNG/types.ts b/packages/grafana-ui/src/components/GraphNG/types.ts
deleted file mode 100644
index 534cd9edf4ded..0000000000000
--- a/packages/grafana-ui/src/components/GraphNG/types.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { DataFrameFieldIndex, FieldMatcher } from '@grafana/data';
-
-import { SeriesVisibilityChangeMode } from '../PanelChrome';
-
-/**
- * Event being triggered when the user interact with the Graph legend.
- * @alpha
- */
-export interface GraphNGLegendEvent {
-  fieldIndex: DataFrameFieldIndex;
-  mode: SeriesVisibilityChangeMode;
-}
-
-/** @alpha */
-export interface XYFieldMatchers {
-  x: FieldMatcher; // first match
-  y: FieldMatcher;
-}
diff --git a/packages/grafana-ui/src/components/GraphNG/utils.test.ts b/packages/grafana-ui/src/components/GraphNG/utils.test.ts
deleted file mode 100644
index 9675cd7ca562c..0000000000000
--- a/packages/grafana-ui/src/components/GraphNG/utils.test.ts
+++ /dev/null
@@ -1,522 +0,0 @@
-import {
-  createTheme,
-  DashboardCursorSync,
-  DataFrame,
-  DefaultTimeZone,
-  EventBusSrv,
-  FieldColorModeId,
-  FieldConfig,
-  FieldMatcherID,
-  fieldMatchers,
-  FieldType,
-  getDefaultTimeRange,
-  MutableDataFrame,
-} from '@grafana/data';
-import {
-  BarAlignment,
-  GraphDrawStyle,
-  GraphFieldConfig,
-  GraphGradientMode,
-  LineInterpolation,
-  VisibilityMode,
-  StackingMode,
-} from '@grafana/schema';
-
-import { preparePlotConfigBuilder } from '../TimeSeries/utils';
-
-import { preparePlotFrame } from './utils';
-
-function mockDataFrame() {
-  const df1 = new MutableDataFrame({
-    refId: 'A',
-    fields: [{ name: 'ts', type: FieldType.time, values: [1, 2, 3] }],
-  });
-  const df2 = new MutableDataFrame({
-    refId: 'B',
-    fields: [{ name: 'ts', type: FieldType.time, values: [1, 2, 4] }],
-  });
-
-  const f1Config: FieldConfig<GraphFieldConfig> = {
-    displayName: 'Metric 1',
-    color: {
-      mode: FieldColorModeId.Fixed,
-    },
-    decimals: 2,
-    custom: {
-      drawStyle: GraphDrawStyle.Line,
-      gradientMode: GraphGradientMode.Opacity,
-      lineColor: '#ff0000',
-      lineWidth: 2,
-      lineInterpolation: LineInterpolation.Linear,
-      lineStyle: {
-        fill: 'dash',
-        dash: [1, 2],
-      },
-      spanNulls: false,
-      fillColor: '#ff0000',
-      fillOpacity: 0.1,
-      showPoints: VisibilityMode.Always,
-      stacking: {
-        group: 'A',
-        mode: StackingMode.Normal,
-      },
-    },
-  };
-
-  const f2Config: FieldConfig<GraphFieldConfig> = {
-    displayName: 'Metric 2',
-    color: {
-      mode: FieldColorModeId.Fixed,
-    },
-    decimals: 2,
-    custom: {
-      drawStyle: GraphDrawStyle.Bars,
-      gradientMode: GraphGradientMode.Hue,
-      lineColor: '#ff0000',
-      lineWidth: 2,
-      lineInterpolation: LineInterpolation.Linear,
-      lineStyle: {
-        fill: 'dash',
-        dash: [1, 2],
-      },
-      barAlignment: BarAlignment.Before,
-      fillColor: '#ff0000',
-      fillOpacity: 0.1,
-      showPoints: VisibilityMode.Always,
-      stacking: {
-        group: 'A',
-        mode: StackingMode.Normal,
-      },
-    },
-  };
-
-  const f3Config: FieldConfig<GraphFieldConfig> = {
-    displayName: 'Metric 3',
-    decimals: 2,
-    color: {
-      mode: FieldColorModeId.Fixed,
-    },
-    custom: {
-      drawStyle: GraphDrawStyle.Line,
-      gradientMode: GraphGradientMode.Opacity,
-      lineColor: '#ff0000',
-      lineWidth: 2,
-      lineInterpolation: LineInterpolation.Linear,
-      lineStyle: {
-        fill: 'dash',
-        dash: [1, 2],
-      },
-      spanNulls: false,
-      fillColor: '#ff0000',
-      fillOpacity: 0.1,
-      showPoints: VisibilityMode.Always,
-      stacking: {
-        group: 'B',
-        mode: StackingMode.Normal,
-      },
-    },
-  };
-  const f4Config: FieldConfig<GraphFieldConfig> = {
-    displayName: 'Metric 4',
-    decimals: 2,
-    color: {
-      mode: FieldColorModeId.Fixed,
-    },
-    custom: {
-      drawStyle: GraphDrawStyle.Bars,
-      gradientMode: GraphGradientMode.Hue,
-      lineColor: '#ff0000',
-      lineWidth: 2,
-      lineInterpolation: LineInterpolation.Linear,
-      lineStyle: {
-        fill: 'dash',
-        dash: [1, 2],
-      },
-      barAlignment: BarAlignment.Before,
-      fillColor: '#ff0000',
-      fillOpacity: 0.1,
-      showPoints: VisibilityMode.Always,
-      stacking: {
-        group: 'B',
-        mode: StackingMode.Normal,
-      },
-    },
-  };
-  const f5Config: FieldConfig<GraphFieldConfig> = {
-    displayName: 'Metric 4',
-    decimals: 2,
-    color: {
-      mode: FieldColorModeId.Fixed,
-    },
-    custom: {
-      drawStyle: GraphDrawStyle.Bars,
-      gradientMode: GraphGradientMode.Hue,
-      lineColor: '#ff0000',
-      lineWidth: 2,
-      lineInterpolation: LineInterpolation.Linear,
-      lineStyle: {
-        fill: 'dash',
-        dash: [1, 2],
-      },
-      barAlignment: BarAlignment.Before,
-      fillColor: '#ff0000',
-      fillOpacity: 0.1,
-      showPoints: VisibilityMode.Always,
-      stacking: {
-        group: 'B',
-        mode: StackingMode.None,
-      },
-    },
-  };
-
-  df1.addField({
-    name: 'metric1',
-    type: FieldType.number,
-    config: f1Config,
-  });
-
-  df2.addField({
-    name: 'metric2',
-    type: FieldType.number,
-    config: f2Config,
-  });
-  df2.addField({
-    name: 'metric3',
-    type: FieldType.number,
-    config: f3Config,
-  });
-  df2.addField({
-    name: 'metric4',
-    type: FieldType.number,
-    config: f4Config,
-  });
-  df2.addField({
-    name: 'metric5',
-    type: FieldType.number,
-    config: f5Config,
-  });
-
-  return preparePlotFrame([df1, df2], {
-    x: fieldMatchers.get(FieldMatcherID.firstTimeField).get({}),
-    y: fieldMatchers.get(FieldMatcherID.numeric).get({}),
-  });
-}
-
-jest.mock('@grafana/data', () => ({
-  ...jest.requireActual('@grafana/data'),
-  DefaultTimeZone: 'utc',
-}));
-
-describe('GraphNG utils', () => {
-  test('preparePlotConfigBuilder', () => {
-    const frame = mockDataFrame();
-    const result = preparePlotConfigBuilder({
-      frame: frame!,
-      theme: createTheme(),
-      timeZones: [DefaultTimeZone],
-      getTimeRange: getDefaultTimeRange,
-      eventBus: new EventBusSrv(),
-      sync: () => DashboardCursorSync.Tooltip,
-      allFrames: [frame!],
-    }).getConfig();
-    expect(result).toMatchSnapshot();
-  });
-
-  test('preparePlotFrame appends min bar spaced nulls when > 1 bar series', () => {
-    const df1: DataFrame = {
-      name: 'A',
-      length: 5,
-      fields: [
-        {
-          name: 'time',
-          type: FieldType.time,
-          config: {},
-          values: [1, 2, 4, 6, 100], // should find smallest delta === 1 from here
-        },
-        {
-          name: 'value',
-          type: FieldType.number,
-          config: {
-            custom: {
-              drawStyle: GraphDrawStyle.Bars,
-            },
-          },
-          values: [1, 1, 1, 1, 1],
-        },
-      ],
-    };
-
-    const df2: DataFrame = {
-      name: 'B',
-      length: 5,
-      fields: [
-        {
-          name: 'time',
-          type: FieldType.time,
-          config: {},
-          values: [30, 40, 50, 90, 100], // should be appended with two smallest-delta increments
-        },
-        {
-          name: 'value',
-          type: FieldType.number,
-          config: {
-            custom: {
-              drawStyle: GraphDrawStyle.Bars,
-            },
-          },
-          values: [2, 2, 2, 2, 2], // bar series should be appended with nulls
-        },
-        {
-          name: 'value',
-          type: FieldType.number,
-          config: {
-            custom: {
-              drawStyle: GraphDrawStyle.Line,
-            },
-          },
-          values: [3, 3, 3, 3, 3], // line series should be appended with undefineds
-        },
-      ],
-    };
-
-    const df3: DataFrame = {
-      name: 'C',
-      length: 2,
-      fields: [
-        {
-          name: 'time',
-          type: FieldType.time,
-          config: {},
-          values: [1, 1.1], // should not trip up on smaller deltas of non-bars
-        },
-        {
-          name: 'value',
-          type: FieldType.number,
-          config: {
-            custom: {
-              drawStyle: GraphDrawStyle.Line,
-            },
-          },
-          values: [4, 4],
-        },
-        {
-          name: 'value',
-          type: FieldType.number,
-          config: {
-            custom: {
-              drawStyle: GraphDrawStyle.Bars,
-              hideFrom: {
-                viz: true, // should ignore hidden bar series
-              },
-            },
-          },
-          values: [4, 4],
-        },
-      ],
-    };
-
-    let aligndFrame = preparePlotFrame([df1, df2, df3], {
-      x: fieldMatchers.get(FieldMatcherID.firstTimeField).get({}),
-      y: fieldMatchers.get(FieldMatcherID.numeric).get({}),
-    });
-
-    expect(aligndFrame).toMatchInlineSnapshot(`
-      {
-        "fields": [
-          {
-            "config": {},
-            "name": "time",
-            "state": {
-              "nullThresholdApplied": true,
-              "origin": {
-                "fieldIndex": 0,
-                "frameIndex": 0,
-              },
-            },
-            "type": "time",
-            "values": [
-              1,
-              1.1,
-              2,
-              4,
-              6,
-              30,
-              40,
-              50,
-              90,
-              100,
-              101,
-              102,
-            ],
-          },
-          {
-            "config": {
-              "custom": {
-                "drawStyle": "bars",
-                "spanNulls": -1,
-              },
-            },
-            "labels": {
-              "name": "A",
-            },
-            "name": "value",
-            "state": {
-              "origin": {
-                "fieldIndex": 1,
-                "frameIndex": 0,
-              },
-            },
-            "type": "number",
-            "values": [
-              1,
-              undefined,
-              1,
-              1,
-              1,
-              undefined,
-              undefined,
-              undefined,
-              undefined,
-              1,
-              null,
-              null,
-            ],
-          },
-          {
-            "config": {
-              "custom": {
-                "drawStyle": "bars",
-                "spanNulls": -1,
-              },
-            },
-            "labels": {
-              "name": "B",
-            },
-            "name": "value",
-            "state": {
-              "origin": {
-                "fieldIndex": 1,
-                "frameIndex": 1,
-              },
-            },
-            "type": "number",
-            "values": [
-              undefined,
-              undefined,
-              undefined,
-              undefined,
-              undefined,
-              2,
-              2,
-              2,
-              2,
-              2,
-              null,
-              null,
-            ],
-          },
-          {
-            "config": {
-              "custom": {
-                "drawStyle": "line",
-              },
-            },
-            "labels": {
-              "name": "B",
-            },
-            "name": "value",
-            "state": {
-              "origin": {
-                "fieldIndex": 2,
-                "frameIndex": 1,
-              },
-            },
-            "type": "number",
-            "values": [
-              undefined,
-              undefined,
-              undefined,
-              undefined,
-              undefined,
-              3,
-              3,
-              3,
-              3,
-              3,
-              undefined,
-              undefined,
-            ],
-          },
-          {
-            "config": {
-              "custom": {
-                "drawStyle": "line",
-              },
-            },
-            "labels": {
-              "name": "C",
-            },
-            "name": "value",
-            "state": {
-              "origin": {
-                "fieldIndex": 1,
-                "frameIndex": 2,
-              },
-            },
-            "type": "number",
-            "values": [
-              4,
-              4,
-              undefined,
-              undefined,
-              undefined,
-              undefined,
-              undefined,
-              undefined,
-              undefined,
-              undefined,
-              undefined,
-              undefined,
-            ],
-          },
-          {
-            "config": {
-              "custom": {
-                "drawStyle": "bars",
-                "hideFrom": {
-                  "viz": true,
-                },
-              },
-            },
-            "labels": {
-              "name": "C",
-            },
-            "name": "value",
-            "state": {
-              "origin": {
-                "fieldIndex": 2,
-                "frameIndex": 2,
-              },
-            },
-            "type": "number",
-            "values": [
-              4,
-              4,
-              undefined,
-              undefined,
-              undefined,
-              undefined,
-              undefined,
-              undefined,
-              undefined,
-              undefined,
-              undefined,
-              undefined,
-            ],
-          },
-        ],
-        "length": 12,
-      }
-    `);
-  });
-});
diff --git a/packages/grafana-ui/src/components/GraphNG/utils.ts b/packages/grafana-ui/src/components/GraphNG/utils.ts
deleted file mode 100644
index 9922b85d9df02..0000000000000
--- a/packages/grafana-ui/src/components/GraphNG/utils.ts
+++ /dev/null
@@ -1,180 +0,0 @@
-import { DataFrame, Field, FieldConfig, FieldType, outerJoinDataFrames, TimeRange } from '@grafana/data';
-import {
-  AxisPlacement,
-  GraphDrawStyle,
-  GraphFieldConfig,
-  ScaleDistribution,
-  ScaleDistributionConfig,
-} from '@grafana/schema';
-
-import { FIXED_UNIT } from './GraphNG';
-import { applyNullInsertThreshold } from './nullInsertThreshold';
-import { nullToUndefThreshold } from './nullToUndefThreshold';
-import { XYFieldMatchers } from './types';
-
-function isVisibleBarField(f: Field) {
-  return (
-    f.type === FieldType.number && f.config.custom?.drawStyle === GraphDrawStyle.Bars && !f.config.custom?.hideFrom?.viz
-  );
-}
-
-export function getRefField(frame: DataFrame, refFieldName?: string | null) {
-  return frame.fields.find((field) => {
-    // note: getFieldDisplayName() would require full DF[]
-    return refFieldName != null ? field.name === refFieldName : field.type === FieldType.time;
-  });
-}
-
-// will mutate the DataFrame's fields' values
-function applySpanNullsThresholds(frame: DataFrame, refFieldName?: string | null) {
-  const refField = getRefField(frame, refFieldName);
-
-  let refValues = refField?.values;
-
-  for (let i = 0; i < frame.fields.length; i++) {
-    let field = frame.fields[i];
-
-    if (field === refField || isVisibleBarField(field)) {
-      continue;
-    }
-
-    let spanNulls = field.config.custom?.spanNulls;
-
-    if (typeof spanNulls === 'number') {
-      if (spanNulls !== -1 && refValues) {
-        field.values = nullToUndefThreshold(refValues, field.values, spanNulls);
-      }
-    }
-  }
-
-  return frame;
-}
-
-export function preparePlotFrame(frames: DataFrame[], dimFields: XYFieldMatchers, timeRange?: TimeRange | null) {
-  let xField: Field;
-  loop: for (let frame of frames) {
-    for (let field of frame.fields) {
-      if (dimFields.x(field, frame, frames)) {
-        xField = field;
-        break loop;
-      }
-    }
-  }
-
-  // apply null insertions at interval
-  frames = frames.map((frame) => {
-    if (!xField?.state?.nullThresholdApplied) {
-      return applyNullInsertThreshold({
-        frame,
-        refFieldName: xField.name,
-        refFieldPseudoMin: timeRange?.from.valueOf(),
-        refFieldPseudoMax: timeRange?.to.valueOf(),
-      });
-    } else {
-      return frame;
-    }
-  });
-
-  let numBarSeries = 0;
-
-  frames.forEach((frame) => {
-    frame.fields.forEach((f) => {
-      if (isVisibleBarField(f)) {
-        // prevent minesweeper-expansion of nulls (gaps) when joining bars
-        // since bar width is determined from the minimum distance between non-undefined values
-        // (this strategy will still retain any original pre-join nulls, though)
-        f.config.custom = {
-          ...f.config.custom,
-          spanNulls: -1,
-        };
-
-        numBarSeries++;
-      }
-    });
-  });
-
-  // to make bar widths of all series uniform (equal to narrowest bar series), find smallest distance between x points
-  let minXDelta = Infinity;
-
-  if (numBarSeries > 1) {
-    frames.forEach((frame) => {
-      if (!frame.fields.some(isVisibleBarField)) {
-        return;
-      }
-
-      const xVals = xField.values;
-
-      for (let i = 0; i < xVals.length; i++) {
-        if (i > 0) {
-          minXDelta = Math.min(minXDelta, xVals[i] - xVals[i - 1]);
-        }
-      }
-    });
-  }
-
-  let alignedFrame = outerJoinDataFrames({
-    frames,
-    joinBy: dimFields.x,
-    keep: dimFields.y,
-    keepOriginIndices: true,
-  });
-
-  if (alignedFrame) {
-    alignedFrame = applySpanNullsThresholds(alignedFrame, xField!.name);
-
-    // append 2 null vals at minXDelta to bar series
-    if (minXDelta !== Infinity) {
-      alignedFrame.fields.forEach((f, fi) => {
-        let vals = f.values;
-
-        if (fi === 0) {
-          let lastVal = vals[vals.length - 1];
-          vals.push(lastVal + minXDelta, lastVal + 2 * minXDelta);
-        } else if (isVisibleBarField(f)) {
-          vals.push(null, null);
-        } else {
-          vals.push(undefined, undefined);
-        }
-      });
-
-      alignedFrame.length += 2;
-    }
-
-    return alignedFrame;
-  }
-
-  return null;
-}
-
-export function buildScaleKey(config: FieldConfig<GraphFieldConfig>, fieldType: FieldType) {
-  const defaultPart = 'na';
-
-  const scaleRange = `${config.min !== undefined ? config.min : defaultPart}-${
-    config.max !== undefined ? config.max : defaultPart
-  }`;
-
-  const scaleSoftRange = `${config.custom?.axisSoftMin !== undefined ? config.custom.axisSoftMin : defaultPart}-${
-    config.custom?.axisSoftMax !== undefined ? config.custom.axisSoftMax : defaultPart
-  }`;
-
-  const scalePlacement = `${
-    config.custom?.axisPlacement !== undefined ? config.custom?.axisPlacement : AxisPlacement.Auto
-  }`;
-
-  const scaleUnit = config.unit ?? FIXED_UNIT;
-
-  const scaleDistribution = config.custom?.scaleDistribution
-    ? getScaleDistributionPart(config.custom.scaleDistribution)
-    : ScaleDistribution.Linear;
-
-  const scaleLabel = Boolean(config.custom?.axisLabel) ? config.custom!.axisLabel : defaultPart;
-
-  return `${scaleUnit}/${scaleRange}/${scaleSoftRange}/${scalePlacement}/${scaleDistribution}/${scaleLabel}/${fieldType}`;
-}
-
-function getScaleDistributionPart(config: ScaleDistributionConfig) {
-  if (config.type === ScaleDistribution.Log) {
-    return `${config.type}${config.log}`;
-  }
-  return config.type;
-}
diff --git a/packages/grafana-ui/src/components/Icon/utils.ts b/packages/grafana-ui/src/components/Icon/utils.ts
index 0d379f36c7a25..229aa5361e080 100644
--- a/packages/grafana-ui/src/components/Icon/utils.ts
+++ b/packages/grafana-ui/src/components/Icon/utils.ts
@@ -1,4 +1,4 @@
-import { IconName, IconSize } from '../../types/icon';
+import { IconName, IconSize, IconType } from '../../types/icon';
 
 const alwaysMonoIcons: IconName[] = [
   'grafana',
@@ -10,7 +10,7 @@ const alwaysMonoIcons: IconName[] = [
   'circle-mono',
 ];
 
-export function getIconSubDir(name: IconName, type: string): string {
+export function getIconSubDir(name: IconName, type: IconType): string {
   if (name?.startsWith('gf-')) {
     return 'custom';
   } else if (alwaysMonoIcons.includes(name)) {
diff --git a/packages/grafana-ui/src/components/IconButton/IconButton.tsx b/packages/grafana-ui/src/components/IconButton/IconButton.tsx
index a1f52a15758c2..ca40fd8c8fd11 100644
--- a/packages/grafana-ui/src/components/IconButton/IconButton.tsx
+++ b/packages/grafana-ui/src/components/IconButton/IconButton.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 
 import { GrafanaTheme2, colorManipulator, deprecationWarning } from '@grafana/data';
 
-import { useTheme2, stylesFactory } from '../../themes';
+import { useStyles2 } from '../../themes';
 import { getFocusStyles, getMouseFocusStyles } from '../../themes/mixins';
 import { ComponentSize } from '../../types';
 import { IconName, IconSize, IconType } from '../../types/icon';
@@ -44,8 +44,6 @@ export type Props = BasePropsWithTooltip | BasePropsWithAriaLabel;
 
 export const IconButton = React.forwardRef<HTMLButtonElement, Props>((props, ref) => {
   const { size = 'md', variant = 'secondary' } = props;
-
-  const theme = useTheme2();
   let limitedIconSize: LimitedIconSize;
 
   // very large icons (xl to xxxl) are unified to size xl
@@ -56,7 +54,7 @@ export const IconButton = React.forwardRef<HTMLButtonElement, Props>((props, ref
     limitedIconSize = size;
   }
 
-  const styles = getStyles(theme, limitedIconSize, variant);
+  const styles = useStyles2(getStyles, limitedIconSize, variant);
 
   let ariaLabel: string | undefined;
   let buttonRef: typeof ref | undefined;
@@ -104,7 +102,7 @@ export const IconButton = React.forwardRef<HTMLButtonElement, Props>((props, ref
 
 IconButton.displayName = 'IconButton';
 
-const getStyles = stylesFactory((theme: GrafanaTheme2, size, variant: IconButtonVariant) => {
+const getStyles = (theme: GrafanaTheme2, size: IconSize, variant: IconButtonVariant) => {
   // overall size of the IconButton on hover
   // theme.spacing.gridSize originates from 2*4px for padding and letting the IconSize generally decide on the hoverSize
   const hoverSize = getSvgSize(size) + theme.spacing.gridSize;
@@ -166,4 +164,4 @@ const getStyles = stylesFactory((theme: GrafanaTheme2, size, variant: IconButton
       verticalAlign: 'baseline',
     }),
   };
-});
+};
diff --git a/packages/grafana-ui/src/components/InfoBox/InfoBox.tsx b/packages/grafana-ui/src/components/InfoBox/InfoBox.tsx
index 9ed71a53e9d26..3ce7197a9c949 100644
--- a/packages/grafana-ui/src/components/InfoBox/InfoBox.tsx
+++ b/packages/grafana-ui/src/components/InfoBox/InfoBox.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
-import { stylesFactory, useStyles2 } from '../../themes';
+import { useStyles2 } from '../../themes';
 import { Alert, AlertVariant } from '../Alert/Alert';
 import { Icon } from '../Icon/Icon';
 
@@ -45,11 +45,9 @@ export const InfoBox = React.memo(
 
 InfoBox.displayName = 'InfoBox';
 
-const getStyles = stylesFactory((theme: GrafanaTheme2) => {
-  return {
-    docsLink: css({
-      display: 'inline-block',
-      marginTop: theme.spacing(2),
-    }),
-  };
+const getStyles = (theme: GrafanaTheme2) => ({
+  docsLink: css({
+    display: 'inline-block',
+    marginTop: theme.spacing(2),
+  }),
 });
diff --git a/packages/grafana-ui/src/components/InlineToast/InlineToast.tsx b/packages/grafana-ui/src/components/InlineToast/InlineToast.tsx
index efbda8b83909f..7efde97f352f4 100644
--- a/packages/grafana-ui/src/components/InlineToast/InlineToast.tsx
+++ b/packages/grafana-ui/src/components/InlineToast/InlineToast.tsx
@@ -1,11 +1,10 @@
-import { css, cx, keyframes } from '@emotion/css';
-import { BasePlacement } from '@popperjs/core';
-import React, { useState } from 'react';
-import { usePopper } from 'react-popper';
+import { css, cx } from '@emotion/css';
+import { autoUpdate, flip, offset, shift, Side, useFloating, useTransitionStyles } from '@floating-ui/react';
+import React, { useLayoutEffect } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
-import { useStyles2 } from '../../themes';
+import { useStyles2, useTheme2 } from '../../themes';
 import { IconName } from '../../types';
 import { Icon } from '../Icon/Icon';
 import { Portal } from '../Portal/Portal';
@@ -14,39 +13,59 @@ export interface InlineToastProps {
   children: React.ReactNode;
   suffixIcon?: IconName;
   referenceElement: HTMLElement | null;
-  placement: BasePlacement;
-  /** Placement to use if there is not enough space to show the full toast with the original placement*/
-  alternativePlacement?: BasePlacement;
+  placement: Side;
+  /**
+   * @deprecated
+   * Placement to use if there is not enough space to show the full toast with the original placement
+   * This is now done automatically.
+   */
+  alternativePlacement?: Side;
 }
 
-export function InlineToast({
-  referenceElement,
-  children,
-  suffixIcon,
-  placement,
-  alternativePlacement,
-}: InlineToastProps) {
-  const [indicatorElement, setIndicatorElement] = useState<HTMLElement | null>(null);
-  const [toastPlacement, setToastPlacement] = useState(placement);
-  const popper = usePopper(referenceElement, indicatorElement, { placement: toastPlacement });
+export function InlineToast({ referenceElement, children, suffixIcon, placement }: InlineToastProps) {
   const styles = useStyles2(getStyles);
-  const placementStyles = useStyles2(getPlacementStyles);
+  const theme = useTheme2();
 
-  React.useEffect(() => {
-    if (alternativePlacement && shouldUseAlt(placement, indicatorElement, referenceElement)) {
-      setToastPlacement(alternativePlacement);
-    }
-  }, [alternativePlacement, placement, indicatorElement, referenceElement]);
+  // the order of middleware is important!
+  // `arrow` should almost always be at the end
+  // see https://floating-ui.com/docs/arrow#order
+  const middleware = [
+    offset(8),
+    flip({
+      fallbackAxisSideDirection: 'end',
+      // see https://floating-ui.com/docs/flip#combining-with-shift
+      crossAxis: false,
+      boundary: document.body,
+    }),
+    shift(),
+  ];
+
+  const { context, refs, floatingStyles } = useFloating({
+    open: true,
+    placement,
+    middleware,
+    whileElementsMounted: autoUpdate,
+    strategy: 'fixed',
+  });
+
+  useLayoutEffect(() => {
+    refs.setReference(referenceElement);
+  }, [referenceElement, refs]);
+
+  const { styles: placementStyles } = useTransitionStyles(context, {
+    initial: ({ side }) => {
+      return {
+        opacity: 0,
+        transform: getInitialTransform(side, theme),
+      };
+    },
+    duration: theme.transitions.duration.shortest,
+  });
 
   return (
     <Portal>
-      <div
-        style={{ display: 'inline-block', ...popper.styles.popper }}
-        {...popper.attributes.popper}
-        ref={setIndicatorElement}
-        aria-live="polite"
-      >
-        <span className={cx(styles.root, placementStyles[toastPlacement])}>
+      <div style={{ display: 'inline-block', ...floatingStyles }} ref={refs.setFloating} aria-live="polite">
+        <span className={cx(styles.root)} style={placementStyles}>
           {children && <span>{children}</span>}
           {suffixIcon && <Icon name={suffixIcon} />}
         </span>
@@ -71,68 +90,17 @@ const getStyles = (theme: GrafanaTheme2) => {
   };
 };
 
-//To calculate if the InlineToast is displayed off-screen and should use the alternative placement
-const shouldUseAlt = (
-  placement: BasePlacement,
-  indicatorElement: HTMLElement | null,
-  referenceElement: HTMLElement | null
-) => {
-  const indicatorSizes = indicatorElement?.getBoundingClientRect();
-  const referenceSizes = referenceElement?.getBoundingClientRect();
-  if (!indicatorSizes || !referenceSizes) {
-    return false;
-  }
+const getInitialTransform = (placement: InlineToastProps['placement'], theme: GrafanaTheme2) => {
+  const gap = 1;
+
   switch (placement) {
-    case 'right':
-      return indicatorSizes.width + referenceSizes.right > window.innerWidth;
+    case 'top':
+      return `translateY(${theme.spacing(gap)})`;
     case 'bottom':
-      return indicatorSizes.height + referenceSizes.bottom > window.innerHeight;
+      return `translateY(-${theme.spacing(gap)})`;
     case 'left':
-      return referenceSizes.left - indicatorSizes.width < 0;
-    case 'top':
-      return referenceSizes.top - indicatorSizes.height < 0;
-    default:
-      return false;
+      return `translateX(${theme.spacing(gap)})`;
+    case 'right':
+      return `translateX(-${theme.spacing(gap)})`;
   }
 };
-
-const createAnimation = (fromX: string | number, fromY: string | number) =>
-  keyframes({
-    from: {
-      opacity: 0,
-      transform: `translate(${fromX}, ${fromY})`,
-    },
-
-    to: {
-      opacity: 1,
-      transform: 'translate(0, 0px)',
-    },
-  });
-
-const getPlacementStyles = (theme: GrafanaTheme2): Record<InlineToastProps['placement'], string> => {
-  const gap = 1;
-
-  const placementTopAnimation = createAnimation(0, theme.spacing(gap));
-  const placementBottomAnimation = createAnimation(0, theme.spacing(gap * -1));
-  const placementLeftAnimation = createAnimation(theme.spacing(gap), 0);
-  const placementRightAnimation = createAnimation(theme.spacing(gap * -1), 0);
-
-  return {
-    top: css({
-      marginBottom: theme.spacing(gap),
-      animation: `${placementTopAnimation} ease-out 100ms`,
-    }),
-    bottom: css({
-      marginTop: theme.spacing(gap),
-      animation: `${placementBottomAnimation} ease-out 100ms`,
-    }),
-    left: css({
-      marginRight: theme.spacing(gap),
-      animation: `${placementLeftAnimation} ease-out 100ms`,
-    }),
-    right: css({
-      marginLeft: theme.spacing(gap),
-      animation: `${placementRightAnimation} ease-out 100ms`,
-    }),
-  };
-};
diff --git a/packages/grafana-ui/src/components/InputControl.tsx b/packages/grafana-ui/src/components/InputControl.tsx
index ab9d7a4771f8d..3eec30ac53bb5 100644
--- a/packages/grafana-ui/src/components/InputControl.tsx
+++ b/packages/grafana-ui/src/components/InputControl.tsx
@@ -2,4 +2,8 @@
  * Rollup does not support renamed exports so do not change this to export { Controller as InputControl } ...
  */
 import { Controller } from 'react-hook-form';
+
+/**
+ * @deprecated use the `Controller` component from react-hook-form instead
+ */
 export const InputControl = Controller;
diff --git a/packages/grafana-ui/src/components/InteractiveTable/Expander/index.tsx b/packages/grafana-ui/src/components/InteractiveTable/Expander/index.tsx
new file mode 100644
index 0000000000000..9a57e38fc503a
--- /dev/null
+++ b/packages/grafana-ui/src/components/InteractiveTable/Expander/index.tsx
@@ -0,0 +1,44 @@
+import { css } from '@emotion/css';
+import React from 'react';
+import { CellProps, HeaderProps } from 'react-table';
+
+import { IconButton } from '../../IconButton/IconButton';
+
+const expanderContainerStyles = css({
+  display: 'flex',
+  alignItems: 'center',
+  height: '100%',
+});
+
+export function ExpanderCell<K extends object>({ row, __rowID }: CellProps<K, void>) {
+  return (
+    <div className={expanderContainerStyles}>
+      <IconButton
+        tooltip="toggle row expanded"
+        aria-controls={__rowID}
+        // @ts-expect-error react-table doesn't ship with useExpanded types and we can't use declaration merging without affecting the table viz
+        name={row.isExpanded ? 'angle-down' : 'angle-right'}
+        // @ts-expect-error same as the line above
+        aria-expanded={row.isExpanded}
+        // @ts-expect-error same as the line above
+        {...row.getToggleRowExpandedProps()}
+        size="lg"
+      />
+    </div>
+  );
+}
+
+export function ExpanderHeader<K extends object>({ isAllRowsExpanded, toggleAllRowsExpanded }: HeaderProps<K>) {
+  return (
+    <div className={expanderContainerStyles}>
+      <IconButton
+        aria-label={!isAllRowsExpanded ? 'Expand all rows' : 'Collapse all rows'}
+        name={!isAllRowsExpanded ? 'table-expand-all' : 'table-collapse-all'}
+        onClick={() => toggleAllRowsExpanded()}
+        size={'lg'}
+        tooltip={!isAllRowsExpanded ? 'Expand all rows' : 'Collapse all rows'}
+        variant={'secondary'}
+      />
+    </div>
+  );
+}
diff --git a/packages/grafana-ui/src/components/InteractiveTable/ExpanderCell.tsx b/packages/grafana-ui/src/components/InteractiveTable/ExpanderCell.tsx
deleted file mode 100644
index 03261f08dc024..0000000000000
--- a/packages/grafana-ui/src/components/InteractiveTable/ExpanderCell.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { css } from '@emotion/css';
-import React from 'react';
-import { CellProps } from 'react-table';
-
-import { IconButton } from '../IconButton/IconButton';
-
-const expanderContainerStyles = css({
-  display: 'flex',
-  alignItems: 'center',
-  height: '100%',
-});
-
-export function ExpanderCell<K extends object>({ row, __rowID }: CellProps<K, void>) {
-  return (
-    <div className={expanderContainerStyles}>
-      <IconButton
-        tooltip="toggle row expanded"
-        aria-controls={__rowID}
-        // @ts-expect-error react-table doesn't ship with useExpanded types and we can't use declaration merging without affecting the table viz
-        name={row.isExpanded ? 'angle-down' : 'angle-right'}
-        // @ts-expect-error same as the line above
-        aria-expanded={row.isExpanded}
-        // @ts-expect-error same as the line above
-        {...row.getToggleRowExpandedProps()}
-        size="lg"
-      />
-    </div>
-  );
-}
diff --git a/packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.mdx b/packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.mdx
index 4bde01ab91745..c5c04a59cf61d 100644
--- a/packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.mdx
+++ b/packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.mdx
@@ -111,6 +111,7 @@ export const MyComponent = () => {
       data={tableData}
       getRowId={(r) => r.datasource}
       renderExpandedRow={ExpandedCell}
+      showExpandAll
     />
   );
 };
diff --git a/packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.story.tsx b/packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.story.tsx
index 9d688b1d6d921..c4deeb1ed4adc 100644
--- a/packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.story.tsx
+++ b/packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.story.tsx
@@ -1,151 +1,25 @@
-import { Meta, StoryFn } from '@storybook/react';
+import { Meta, StoryFn, StoryObj } from '@storybook/react';
 import React, { useCallback, useMemo, useState } from 'react';
 
-import { InteractiveTable, Column, CellProps, LinkButton } from '@grafana/ui';
+import { InteractiveTable, CellProps, LinkButton } from '@grafana/ui';
+
+import { Field } from '../Forms/Field';
+import { Input } from '../Input/Input';
 
 import { FetchDataArgs, InteractiveTableHeaderTooltip } from './InteractiveTable';
 import mdx from './InteractiveTable.mdx';
 
 const EXCLUDED_PROPS = ['className', 'renderExpandedRow', 'getRowId', 'fetchData'];
 
-const meta: Meta<typeof InteractiveTable> = {
-  title: 'Experimental/InteractiveTable',
-  component: InteractiveTable,
-  parameters: {
-    docs: {
-      page: mdx,
-    },
-    controls: {
-      exclude: EXCLUDED_PROPS,
-    },
-  },
-  args: {},
-  argTypes: {},
-};
-
-interface TableData {
-  header1: string;
-  header2?: number;
-  noheader?: string;
-}
-
-export const Basic: StoryFn<typeof InteractiveTable> = (args) => {
-  const columns = useMemo<Array<Column<TableData>>>(
-    () => [
-      { id: 'header2', header: 'With missing values', sortType: 'number', disableGrow: true },
-      {
-        id: 'noheader',
-        sortType: 'number',
-      },
-    ],
-    []
-  );
-  const data: TableData[] = useMemo(
-    () => [
-      { header1: 'a', header2: 1 },
-      { header1: 'b', noheader: "This column doesn't have an header" },
-      { header1: 'c', noheader: "But it's still sortable" },
-    ],
-    []
-  );
-
-  return <InteractiveTable columns={columns} data={data} getRowId={(r) => r.header1} />;
-};
-
-interface WithRowExpansionData {
-  datasource: string;
-  repo: string;
-  description: string;
-}
-
-const ExpandedCell = ({ description }: WithRowExpansionData) => {
-  return <p>{description}</p>;
-};
-
-export const WithRowExpansion: StoryFn<typeof InteractiveTable> = (args) => {
-  const tableData: WithRowExpansionData[] = [
-    {
-      datasource: 'Prometheus',
-      repo: 'https://github.com/prometheus/prometheus',
-      description: 'Open source time series database & alerting.',
-    },
-    {
-      datasource: 'Loki',
-      repo: 'https://github.com/grafana/loki',
-      description: 'Like Prometheus but for logs. OSS logging solution from Grafana Labs.',
-    },
-    {
-      datasource: 'Tempo',
-      repo: 'https://github.com/grafana/tempo',
-      description: 'High volume, minimal dependency trace storage. OSS tracing solution from Grafana Labs.',
-    },
-  ];
-
-  const columns: Array<Column<WithRowExpansionData>> = [
-    { id: 'datasource', header: 'Data Source' },
-    { id: 'repo', header: 'Repo' },
-  ];
-
-  return (
-    <InteractiveTable
-      columns={columns}
-      data={tableData}
-      getRowId={(r) => r.datasource}
-      renderExpandedRow={ExpandedCell}
-    />
-  );
-};
-
-interface WithCustomCellData {
-  datasource: string;
-  repo: string;
-}
-
-const RepoCell = ({
-  row: {
-    original: { repo },
-  },
-}: CellProps<WithCustomCellData, void>) => {
-  return (
-    <LinkButton href={repo} size="sm" icon="external-link-alt">
-      Open on GithHub
-    </LinkButton>
-  );
-};
-
-export const WithCustomCell: StoryFn<typeof InteractiveTable> = (args) => {
-  const tableData: WithCustomCellData[] = [
-    {
-      datasource: 'Prometheus',
-      repo: 'https://github.com/prometheus/prometheus',
-    },
-    {
-      datasource: 'Loki',
-      repo: 'https://github.com/grafana/loki',
-    },
-    {
-      datasource: 'Tempo',
-      repo: 'https://github.com/grafana/tempo',
-    },
-  ];
-
-  const columns: Array<Column<WithCustomCellData>> = [
-    { id: 'datasource', header: 'Data Source' },
-    { id: 'repo', header: 'Repo', cell: RepoCell },
-  ];
-
-  return <InteractiveTable columns={columns} data={tableData} getRowId={(r) => r.datasource} />;
-};
-
-interface WithPaginationData {
+interface CarData {
   id: string;
   firstName: string;
   lastName: string;
-  car: string;
+  car?: string;
   age: number;
 }
 
-const pageableData: WithPaginationData[] = [
+const pageableData: CarData[] = [
   { id: '48a3926a-e82c-4c26-b959-3a5f473e186e', firstName: 'Brynne', lastName: 'Denisevich', car: 'Cougar', age: 47 },
   {
     id: 'cf281390-adbf-4407-8cf3-a52e012f63e6',
@@ -228,60 +102,177 @@ const pageableData: WithPaginationData[] = [
   { id: 'b9b0b559-acc1-4bd8-b052-160ecf3e4f68', firstName: 'Ermanno', lastName: 'Sinott', car: 'Thunderbird', age: 26 },
 ];
 
-export const WithPagination: StoryFn<typeof InteractiveTable> = (args) => {
-  const columns: Array<Column<WithPaginationData>> = [
-    { id: 'firstName', header: 'First name' },
-    { id: 'lastName', header: 'Last name' },
-    { id: 'car', header: 'Car', sortType: 'string' },
-    { id: 'age', header: 'Age', sortType: 'number' },
-  ];
-  return <InteractiveTable columns={columns} data={pageableData} getRowId={(r) => r.id} pageSize={15} />;
+const meta: Meta<typeof InteractiveTable<CarData>> = {
+  title: 'Experimental/InteractiveTable',
+  component: InteractiveTable,
+  parameters: {
+    docs: {
+      page: mdx,
+    },
+    controls: {
+      exclude: EXCLUDED_PROPS,
+    },
+  },
+  args: {
+    columns: [
+      { id: 'firstName', header: 'First name', sortType: 'string' },
+      { id: 'lastName', header: 'Last name', sortType: 'string' },
+      { id: 'car', header: 'Car', sortType: 'string' },
+      { id: 'age', header: 'Age' },
+    ],
+    data: pageableData.slice(0, 10),
+    getRowId: (r) => r.id,
+    pageSize: 0,
+    showExpandAll: false,
+  },
+  argTypes: {},
 };
 
-export const WithHeaderTooltips: StoryFn<typeof InteractiveTable> = (args) => {
-  const columns: Array<Column<WithPaginationData>> = [
-    { id: 'firstName', header: 'First name' },
-    { id: 'lastName', header: 'Last name' },
-    { id: 'car', header: 'Car', sortType: 'string' },
-    { id: 'age', header: 'Age', sortType: 'number' },
-  ];
+type TableStoryObj = StoryObj<typeof InteractiveTable<CarData>>;
 
-  const headerTooltips: Record<string, InteractiveTableHeaderTooltip> = {
-    age: { content: 'The number of years since the person was born' },
-    lastName: {
-      content: () => {
-        return (
-          <>
-            <h4>Here is an h4</h4>
-            <div>Some content</div>
-            <div>Some more content</div>
-          </>
-        );
+export const Basic: TableStoryObj = {
+  args: {
+    columns: [
+      {
+        id: 'firstName',
+        header: 'First name',
+        sortType: 'alphanumeric',
       },
-      iconName: 'plus-square',
-    },
-  };
+      {
+        id: 'lastName',
+        sortType: 'alphanumeric',
+      },
+      { id: 'car', header: 'With missing values', sortType: 'alphanumeric', disableGrow: true },
+    ],
+    data: [
+      {
+        id: 'be5736f5-7015-4668-a03d-44b56f2b012c',
+        firstName: 'Sonni',
+        lastName: 'Still sortable!',
+        car: 'Legend',
+        age: 75,
+      },
+      { id: 'fdbe3559-c68a-4f2f-b579-48ef02642628', firstName: 'Hanson', lastName: 'Giraudeau', car: 'X5', age: 67 },
+      { id: '7d0ee01a-7ac5-4e0a-9c73-e864d10c0152', firstName: 'Whitman', lastName: 'Seabridge', age: 99 },
+      { id: '177c2287-b7cb-4b5f-8976-56ee993bed61', firstName: 'Aleda', lastName: 'Friman', car: 'X5', age: 44 },
+      { id: '87c21e60-c2f4-4a01-b2af-a6d22c196e25', firstName: 'Cullen', lastName: 'Kobpac', car: 'Montero', age: 28 },
+      { id: 'dd89f32d-2ef4-4c35-8e23-a8b2219e3a69', firstName: 'Fitz', lastName: 'Butterwick', car: 'Fox', age: 70 },
+      {
+        id: 'cc1b4de7-8ec5-49bd-93bc-bee9fa1ccf37',
+        firstName: 'Jordon',
+        lastName: 'Harrington',
+        car: 'Elantra',
+        age: 39,
+      },
+    ],
+  },
+};
+
+const ExpandedCell = ({ car }: CarData) => {
+  return <p>{car}</p>;
+};
+
+export const WithRowExpansion: TableStoryObj = {
+  args: {
+    renderExpandedRow: ExpandedCell,
+  },
+};
+
+interface WithCustomCellData {
+  datasource: string;
+  repo: string;
+}
+
+const RepoCell = ({
+  row: {
+    original: { repo },
+  },
+}: CellProps<WithCustomCellData, void>) => {
+  return (
+    <LinkButton href={repo} size="sm" icon="external-link-alt">
+      Open on GithHub
+    </LinkButton>
+  );
+};
+
+export const WithCustomCell: StoryObj<typeof InteractiveTable<WithCustomCellData>> = {
+  args: {
+    columns: [
+      { id: 'datasource', header: 'Data Source' },
+      { id: 'repo', header: 'Repo', cell: RepoCell },
+    ],
+    data: [
+      {
+        datasource: 'Prometheus',
+        repo: 'https://github.com/prometheus/prometheus',
+      },
+      {
+        datasource: 'Loki',
+        repo: 'https://github.com/grafana/loki',
+      },
+      {
+        datasource: 'Tempo',
+        repo: 'https://github.com/grafana/tempo',
+      },
+    ],
+    getRowId: (r) => r.datasource,
+  },
+};
+
+export const WithPagination: StoryFn<typeof InteractiveTable> = (args) => {
+  const [filter, setFilter] = useState('');
+
+  const data = useMemo(() => {
+    if (filter) {
+      return pageableData.filter((d) => d.firstName.toLowerCase().includes(filter.toLowerCase()));
+    }
+    return pageableData;
+  }, [filter]);
 
   return (
-    <InteractiveTable
-      columns={columns}
-      data={pageableData.slice(0, 10)}
-      getRowId={(r) => r.id}
-      headerTooltips={headerTooltips}
-    />
+    <>
+      <Field label={'Filter data'}>
+        <Input
+          placeholder={'Filter by first name'}
+          onChange={(event) => {
+            setFilter(event.currentTarget.value);
+          }}
+        />
+      </Field>
+      <InteractiveTable {...args} data={data} />
+    </>
   );
 };
 
+WithPagination.args = {
+  pageSize: 15,
+};
+
+const headerTooltips: Record<string, InteractiveTableHeaderTooltip> = {
+  age: { content: 'The number of years since the person was born' },
+  lastName: {
+    content: () => {
+      return (
+        <>
+          <h4>Here is an h4</h4>
+          <div>Some content</div>
+          <div>Some more content</div>
+        </>
+      );
+    },
+    iconName: 'plus-square',
+  },
+};
+export const WithHeaderTooltips: TableStoryObj = {
+  args: {
+    headerTooltips,
+  },
+};
+
 export const WithControlledSort: StoryFn<typeof InteractiveTable> = (args) => {
-  const columns: Array<Column<WithPaginationData>> = [
-    { id: 'firstName', header: 'First name', sortType: 'string' },
-    { id: 'lastName', header: 'Last name', sortType: 'string' },
-    { id: 'car', header: 'Car', sortType: 'string' },
-    { id: 'age', header: 'Age' },
-  ];
   const [data, setData] = useState(pageableData);
 
-  const fetchData = useCallback(({ sortBy }: FetchDataArgs<WithPaginationData>) => {
+  const fetchData = useCallback(({ sortBy }: FetchDataArgs<CarData>) => {
     if (!sortBy?.length) {
       return setData(pageableData);
     }
@@ -291,9 +282,9 @@ export const WithControlledSort: StoryFn<typeof InteractiveTable> = (args) => {
       newData.sort((a, b) => {
         const sort = sortBy[0];
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        const aData = a[sort.id as keyof Omit<WithPaginationData, 'age'>];
+        const aData = a[sort.id as keyof Omit<CarData, 'age' | 'car'>];
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        const bData = b[sort.id as keyof Omit<WithPaginationData, 'age'>];
+        const bData = b[sort.id as keyof Omit<CarData, 'age' | 'car'>];
         if (sort.desc) {
           return bData.localeCompare(aData);
         }
@@ -303,6 +294,7 @@ export const WithControlledSort: StoryFn<typeof InteractiveTable> = (args) => {
     }, 300);
   }, []);
 
-  return <InteractiveTable columns={columns} data={data} getRowId={(r) => r.id} pageSize={15} fetchData={fetchData} />;
+  return <InteractiveTable {...args} data={data} pageSize={15} fetchData={fetchData} />;
 };
+
 export default meta;
diff --git a/packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.test.tsx b/packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.test.tsx
index 744a73c791ceb..ec6c704f832e1 100644
--- a/packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.test.tsx
+++ b/packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.test.tsx
@@ -77,28 +77,101 @@ describe('InteractiveTable', () => {
     expect(valueColumnHeader).not.toHaveAttribute('aria-sort');
     expect(countryColumnHeader).not.toHaveAttribute('aria-sort');
   });
-
-  it('correctly expands rows', async () => {
-    const columns: Array<Column<TableData>> = [{ id: 'id', header: 'ID' }];
-    const data: TableData[] = [{ id: '1', value: '1', country: 'Sweden' }];
-    const { user } = setup(
-      <InteractiveTable
-        columns={columns}
-        data={data}
-        getRowId={getRowId}
-        renderExpandedRow={(row) => <div data-testid={`test-${row.id}`}>{row.country}</div>}
-      />
-    );
-
-    const expanderButton = screen.getByRole('button', { name: /toggle row expanded/i });
-    await user.click(expanderButton);
-
-    expect(screen.getByTestId('test-1')).toHaveTextContent('Sweden');
-
-    expect(expanderButton.getAttribute('aria-controls')).toBe(
-      // ancestor tr's id should match the expander button's aria-controls attribute
-      screen.getByTestId('test-1').parentElement?.parentElement?.id
-    );
+  describe('row expansion', () => {
+    it('correctly expands rows', async () => {
+      const columns: Array<Column<TableData>> = [{ id: 'id', header: 'ID' }];
+      const data: TableData[] = [{ id: '1', value: '1', country: 'Sweden' }];
+      const { user } = setup(
+        <InteractiveTable
+          columns={columns}
+          data={data}
+          getRowId={getRowId}
+          renderExpandedRow={(row) => <div data-testid={`test-${row.id}`}>{row.country}</div>}
+        />
+      );
+
+      const expanderButton = screen.getByRole('button', { name: /toggle row expanded/i });
+      await user.click(expanderButton);
+
+      expect(screen.getByTestId('test-1')).toHaveTextContent('Sweden');
+
+      expect(expanderButton.getAttribute('aria-controls')).toBe(
+        // ancestor tr's id should match the expander button's aria-controls attribute
+        screen.getByTestId('test-1').parentElement?.parentElement?.id
+      );
+    });
+    it('does not render expand all when showExpandAll is false', async () => {
+      const columns: Array<Column<TableData>> = [{ id: 'id', header: 'ID' }];
+      const data: TableData[] = [{ id: '1', value: '1', country: 'Sweden' }];
+      setup(
+        <InteractiveTable
+          columns={columns}
+          data={data}
+          getRowId={getRowId}
+          renderExpandedRow={(row) => <div data-testid={`test-${row.id}`}>{row.country}</div>}
+          showExpandAll={false}
+        />
+      );
+
+      expect(screen.queryByRole('button', { name: 'Expand all rows' })).not.toBeInTheDocument();
+    });
+    it('does not render expand all when showExpandAll is not provided', async () => {
+      const columns: Array<Column<TableData>> = [{ id: 'id', header: 'ID' }];
+      const data: TableData[] = [{ id: '1', value: '1', country: 'Sweden' }];
+      setup(
+        <InteractiveTable
+          columns={columns}
+          data={data}
+          getRowId={getRowId}
+          renderExpandedRow={(row) => <div data-testid={`test-${row.id}`}>{row.country}</div>}
+        />
+      );
+
+      expect(screen.queryByRole('button', { name: 'Expand all rows' })).not.toBeInTheDocument();
+    });
+    it('renders expand all when showExpandAll is true', async () => {
+      const columns: Array<Column<TableData>> = [{ id: 'id', header: 'ID' }];
+      const data: TableData[] = [{ id: '1', value: '1', country: 'Sweden' }];
+      setup(
+        <InteractiveTable
+          columns={columns}
+          data={data}
+          getRowId={getRowId}
+          renderExpandedRow={(row) => <div data-testid={`test-${row.id}`}>{row.country}</div>}
+          showExpandAll
+        />
+      );
+
+      expect(screen.getByRole('button', { name: 'Expand all rows' })).toBeInTheDocument();
+    });
+    it('expands all rows when expand all is clicked', async () => {
+      const columns: Array<Column<TableData>> = [{ id: 'id', header: 'ID' }];
+      const data: TableData[] = [
+        { id: '1', value: '1', country: 'Sweden' },
+        { id: '2', value: '2', country: 'Belgium' },
+        { id: '3', value: '3', country: 'France' },
+      ];
+      const { user } = setup(
+        <InteractiveTable
+          columns={columns}
+          data={data}
+          getRowId={getRowId}
+          renderExpandedRow={(row) => <div data-testid={`test-${row.id}`}>{row.country}</div>}
+          showExpandAll
+        />
+      );
+
+      expect(screen.queryByTestId('test-1')).not.toBeInTheDocument();
+      expect(screen.queryByTestId('test-2')).not.toBeInTheDocument();
+      expect(screen.queryByTestId('test-3')).not.toBeInTheDocument();
+
+      const expandAllButton = screen.getByRole('button', { name: 'Expand all rows' });
+      await user.click(expandAllButton);
+
+      expect(screen.queryByTestId('test-1')).toBeInTheDocument();
+      expect(screen.queryByTestId('test-2')).toBeInTheDocument();
+      expect(screen.queryByTestId('test-3')).toBeInTheDocument();
+    });
   });
   describe('pagination', () => {
     it('does not render pagination controls if pageSize is not set', () => {
@@ -117,15 +190,28 @@ describe('InteractiveTable', () => {
       expect(screen.queryByRole('button', { name: /previous/i })).not.toBeInTheDocument();
     });
 
-    it('renders pagination controls if pageSize is set', () => {
+    it('renders pagination controls if pageSize is set and more items than page size', () => {
       const columns: Array<Column<TableData>> = [{ id: 'id', header: 'ID' }];
-      const data: TableData[] = [{ id: '1', value: '1', country: 'Sweden' }];
-      render(<InteractiveTable columns={columns} data={data} getRowId={getRowId} pageSize={10} />);
+      const data: TableData[] = [
+        { id: '1', value: '1', country: 'Sweden' },
+        { id: '2', value: '2', country: 'Belgium' },
+      ];
+      render(<InteractiveTable columns={columns} data={data} getRowId={getRowId} pageSize={1} />);
 
       expect(screen.getByRole('button', { name: /next/i })).toBeInTheDocument();
       expect(screen.getByRole('button', { name: /previous/i })).toBeInTheDocument();
     });
+
+    it('does not render pagination controls if pageSize is set and fewer items than page size', () => {
+      const columns: Array<Column<TableData>> = [{ id: 'id', header: 'ID' }];
+      const data: TableData[] = [{ id: '1', value: '1', country: 'Sweden' }];
+      render(<InteractiveTable columns={columns} data={data} getRowId={getRowId} pageSize={10} />);
+
+      expect(screen.queryByRole('button', { name: /next/i })).not.toBeInTheDocument();
+      expect(screen.queryByRole('button', { name: /previous/i })).not.toBeInTheDocument();
+    });
   });
+
   describe('headerTooltip', () => {
     it('does not render tooltips if headerTooltips is not set', () => {
       const columns: Array<Column<TableData>> = [{ id: 'id', header: 'ID' }];
diff --git a/packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.tsx b/packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.tsx
index 946d9d36779e4..a1ced1b5d0c71 100644
--- a/packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.tsx
+++ b/packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.tsx
@@ -120,7 +120,8 @@ export type InteractiveTableHeaderTooltip = {
 
 export type FetchDataArgs<Data> = { sortBy: Array<SortingRule<Data>> };
 export type FetchDataFunc<Data> = ({ sortBy }: FetchDataArgs<Data>) => void;
-interface Props<TableData extends object> {
+
+interface BaseProps<TableData extends object> {
   className?: string;
   /**
    * Table's columns definition. Must be memoized.
@@ -140,12 +141,10 @@ interface Props<TableData extends object> {
   headerTooltips?: Record<string, InteractiveTableHeaderTooltip>;
   /**
    * Number of rows per page. A value of zero disables pagination. Defaults to 0.
+   * A React hooks error will be thrown if pageSize goes from greater than 0 to 0 or vice versa. If enabling pagination,
+   * make sure pageSize remains a non-zero value.
    */
   pageSize?: number;
-  /**
-   * Render function for the expanded row. if not provided, the tables rows will not be expandable.
-   */
-  renderExpandedRow?: (row: TableData) => ReactNode;
   /**
    * A custom function to fetch data when the table is sorted. If not provided, the table will be sorted client-side.
    * It's important for this function to have a stable identity, e.g. being wrapped into useCallback to prevent unnecessary
@@ -154,6 +153,24 @@ interface Props<TableData extends object> {
   fetchData?: FetchDataFunc<TableData>;
 }
 
+interface WithExpandableRow<TableData extends object> extends BaseProps<TableData> {
+  /**
+   * Render function for the expanded row. if not provided, the tables rows will not be expandable.
+   */
+  renderExpandedRow: (row: TableData) => ReactNode;
+  /**
+   * Whether to show the "Expand all" button. Depends on renderExpandedRow to be provided. Defaults to false.
+   */
+  showExpandAll?: boolean;
+}
+
+interface WithoutExpandableRow<TableData extends object> extends BaseProps<TableData> {
+  renderExpandedRow?: never;
+  showExpandAll?: never;
+}
+
+type Props<TableData extends object> = WithExpandableRow<TableData> | WithoutExpandableRow<TableData>;
+
 /** @alpha */
 export function InteractiveTable<TableData extends object>({
   className,
@@ -163,12 +180,13 @@ export function InteractiveTable<TableData extends object>({
   headerTooltips,
   pageSize = 0,
   renderExpandedRow,
+  showExpandAll = false,
   fetchData,
 }: Props<TableData>) {
   const styles = useStyles2(getStyles);
   const tableColumns = useMemo(() => {
-    return getColumns<TableData>(columns);
-  }, [columns]);
+    return getColumns<TableData>(columns, showExpandAll);
+  }, [columns, showExpandAll]);
   const id = useUniqueId();
   const getRowHTMLID = useCallback(
     (row: Row<TableData>) => {
@@ -179,6 +197,7 @@ export function InteractiveTable<TableData extends object>({
 
   const tableHooks: Array<PluginHook<TableData>> = [useSortBy, useExpanded];
 
+  const multiplePages = data.length > pageSize;
   const paginationEnabled = pageSize > 0;
 
   if (paginationEnabled) {
@@ -287,7 +306,7 @@ export function InteractiveTable<TableData extends object>({
           })}
         </tbody>
       </table>
-      {paginationEnabled && (
+      {paginationEnabled && multiplePages && (
         <span>
           <Pagination
             currentPage={tableInstance.state.pageIndex + 1}
diff --git a/packages/grafana-ui/src/components/InteractiveTable/utils.ts b/packages/grafana-ui/src/components/InteractiveTable/utils.ts
index 7eb970008b134..68017bbfd1918 100644
--- a/packages/grafana-ui/src/components/InteractiveTable/utils.ts
+++ b/packages/grafana-ui/src/components/InteractiveTable/utils.ts
@@ -1,6 +1,6 @@
 import { Column as RTColumn } from 'react-table';
 
-import { ExpanderCell } from './ExpanderCell';
+import { ExpanderCell, ExpanderHeader } from './Expander';
 import { Column } from './types';
 
 export const EXPANDER_CELL_ID = '__expander' as const;
@@ -10,11 +10,17 @@ type InternalColumn<T extends object> = RTColumn<T> & {
 };
 
 // Returns the columns in a "react-table" acceptable format
-export function getColumns<K extends object>(columns: Array<Column<K>>): Array<InternalColumn<K>> {
+export function getColumns<K extends object>(
+  columns: Array<Column<K>>,
+  showExpandAll = false
+): Array<InternalColumn<K>> {
   return [
     {
       id: EXPANDER_CELL_ID,
       Cell: ExpanderCell,
+      ...(showExpandAll && {
+        Header: ExpanderHeader,
+      }),
       disableSortBy: true,
       width: 0,
     },
diff --git a/packages/grafana-ui/src/components/Layout/Box/Box.mdx b/packages/grafana-ui/src/components/Layout/Box/Box.mdx
index b789bead6d14a..e9ec57ed8127c 100644
--- a/packages/grafana-ui/src/components/Layout/Box/Box.mdx
+++ b/packages/grafana-ui/src/components/Layout/Box/Box.mdx
@@ -16,7 +16,7 @@ Use it whenever you would use custom CSS.
 
 #### When not to use
 
-If you need layout styles, use the Stack, Flex or Grid components instead.
+If you need layout styles, use the Stack or Grid components instead.
 
 ### How to add a prop to Box
 
diff --git a/packages/grafana-ui/src/components/Layout/Box/Box.story.tsx b/packages/grafana-ui/src/components/Layout/Box/Box.story.tsx
index 42d0b7f759e7f..b564a3d247671 100644
--- a/packages/grafana-ui/src/components/Layout/Box/Box.story.tsx
+++ b/packages/grafana-ui/src/components/Layout/Box/Box.story.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 
 import { SpacingTokenControl } from '../../../utils/storybook/themeStorybookControls';
 import { Text } from '../../Text/Text';
-import { Flex } from '../Flex/Flex';
+import { Stack } from '../Stack/Stack';
 
 import { Box, BackgroundColor, BorderColor, BorderStyle, BorderRadius, BoxShadow } from './Box';
 import mdx from './Box.mdx';
@@ -48,11 +48,11 @@ const Item = ({ background }: { background?: string }) => {
 
 export const Basic: StoryFn<typeof Box> = (args) => {
   return (
-    <Flex>
+    <Stack>
       <Box borderColor="medium" {...args}>
         Box
       </Box>
-    </Flex>
+    </Stack>
   );
 };
 
@@ -73,6 +73,7 @@ Basic.argTypes = {
   paddingBottom: SpacingTokenControl,
   paddingLeft: SpacingTokenControl,
   paddingRight: SpacingTokenControl,
+  direction: { control: 'select', options: ['row', 'row-reverse', 'column', 'column-reverse'] },
   display: { control: 'select', options: ['flex', 'block', 'inline', 'none'] },
   backgroundColor: { control: 'select', options: backgroundOptions },
   borderStyle: { control: 'select', options: borderStyleOptions },
@@ -88,64 +89,64 @@ Basic.args = {
 
 export const Background: StoryFn<typeof Box> = () => {
   return (
-    <Flex gap={4}>
+    <Stack gap={4}>
       {backgroundOptions.map((background) => (
-        <Flex key={background} direction="column" alignItems="flex-start">
+        <Stack key={background} direction="column" alignItems="flex-start">
           {background}
           <Box backgroundColor={background} borderColor="strong" borderStyle="solid">
             <Item />
           </Box>
-        </Flex>
+        </Stack>
       ))}
-    </Flex>
+    </Stack>
   );
 };
 
 export const Border: StoryFn<typeof Box> = () => {
   return (
-    <Flex direction="column" gap={4}>
+    <Stack direction="column" gap={4}>
       <div>
         <Text variant="h4">Border Color</Text>
-        <Flex gap={4} wrap="wrap">
+        <Stack gap={4} wrap="wrap">
           {borderColorOptions.map((border) => (
-            <Flex key={border} direction="column" alignItems="flex-start">
+            <Stack key={border} direction="column" alignItems="flex-start">
               {border}
               <Box borderColor={border} borderStyle="solid">
                 <Item />
               </Box>
-            </Flex>
+            </Stack>
           ))}
-        </Flex>
+        </Stack>
       </div>
       <div>
         <Text variant="h4">Border Style</Text>
-        <Flex gap={4} wrap="wrap">
+        <Stack gap={4} wrap="wrap">
           {borderStyleOptions.map((border) => (
-            <Flex key={border} direction="column" alignItems="flex-start">
+            <Stack key={border} direction="column" alignItems="flex-start">
               {border}
               <Box borderColor="info" borderStyle={border}>
                 <Item />
               </Box>
-            </Flex>
+            </Stack>
           ))}
-        </Flex>
+        </Stack>
       </div>
-    </Flex>
+    </Stack>
   );
 };
 
 export const Shadow: StoryFn<typeof Box> = () => {
   return (
-    <Flex gap={4}>
+    <Stack gap={4}>
       {boxShadowOptions.map((shadow) => (
-        <Flex key={shadow} direction="column" alignItems="flex-start">
+        <Stack key={shadow} direction="column" alignItems="flex-start">
           {shadow}
           <Box boxShadow={shadow} borderColor="strong" borderStyle="solid">
             <Item />
           </Box>
-        </Flex>
+        </Stack>
       ))}
-    </Flex>
+    </Stack>
   );
 };
 
diff --git a/packages/grafana-ui/src/components/Layout/Box/Box.tsx b/packages/grafana-ui/src/components/Layout/Box/Box.tsx
index 4a5a7e52e2f62..3f4a36c695038 100644
--- a/packages/grafana-ui/src/components/Layout/Box/Box.tsx
+++ b/packages/grafana-ui/src/components/Layout/Box/Box.tsx
@@ -4,17 +4,17 @@ import React, { ElementType, forwardRef, PropsWithChildren } from 'react';
 import { GrafanaTheme2, ThemeSpacingTokens, ThemeShape, ThemeShadows } from '@grafana/data';
 
 import { useStyles2 } from '../../../themes';
-import { AlignItems, JustifyContent } from '../Flex/Flex';
+import { AlignItems, Direction, FlexProps, JustifyContent } from '../types';
 import { ResponsiveProp, getResponsiveStyle } from '../utils/responsiveness';
 
-type Display = 'flex' | 'block' | 'inline' | 'none';
+type Display = 'flex' | 'block' | 'inline' | 'inline-block' | 'none';
 export type BackgroundColor = keyof GrafanaTheme2['colors']['background'] | 'error' | 'success' | 'warning' | 'info';
 export type BorderStyle = 'solid' | 'dashed';
 export type BorderColor = keyof GrafanaTheme2['colors']['border'] | 'error' | 'success' | 'warning' | 'info';
 export type BorderRadius = keyof ThemeShape['radius'];
 export type BoxShadow = keyof ThemeShadows;
 
-interface BoxProps extends Omit<React.HTMLAttributes<HTMLElement>, 'className' | 'style'> {
+interface BoxProps extends FlexProps, Omit<React.HTMLAttributes<HTMLElement>, 'className' | 'style'> {
   // Margin props
   /** Sets the property `margin` */
   margin?: ResponsiveProp<ThemeSpacingTokens>;
@@ -53,11 +53,8 @@ interface BoxProps extends Omit<React.HTMLAttributes<HTMLElement>, 'className' |
   borderRadius?: ResponsiveProp<BorderRadius>;
 
   // Flex Props
-  /** Sets the property `flex` */
-  grow?: ResponsiveProp<number>;
-  /** Sets the property `flex-shrink` */
-  shrink?: ResponsiveProp<number>;
   alignItems?: ResponsiveProp<AlignItems>;
+  direction?: ResponsiveProp<Direction>;
   justifyContent?: ResponsiveProp<JustifyContent>;
   gap?: ResponsiveProp<ThemeSpacingTokens>;
 
@@ -90,9 +87,12 @@ export const Box = forwardRef<HTMLElement, PropsWithChildren<BoxProps>>((props,
     backgroundColor,
     grow,
     shrink,
+    basis,
+    flex,
     borderColor,
     borderStyle,
     borderRadius,
+    direction,
     justifyContent,
     alignItems,
     boxShadow,
@@ -120,9 +120,12 @@ export const Box = forwardRef<HTMLElement, PropsWithChildren<BoxProps>>((props,
     backgroundColor,
     grow,
     shrink,
+    basis,
+    flex,
     borderColor,
     borderStyle,
     borderRadius,
+    direction,
     justifyContent,
     alignItems,
     boxShadow,
@@ -183,9 +186,12 @@ const getStyles = (
   backgroundColor: BoxProps['backgroundColor'],
   grow: BoxProps['grow'],
   shrink: BoxProps['shrink'],
+  basis: BoxProps['basis'],
+  flex: BoxProps['flex'],
   borderColor: BoxProps['borderColor'],
   borderStyle: BoxProps['borderStyle'],
   borderRadius: BoxProps['borderRadius'],
+  direction: BoxProps['direction'],
   justifyContent: BoxProps['justifyContent'],
   alignItems: BoxProps['alignItems'],
   boxShadow: BoxProps['boxShadow'],
@@ -245,12 +251,21 @@ const getStyles = (
       getResponsiveStyle(theme, backgroundColor, (val) => ({
         backgroundColor: customBackgroundColor(val, theme),
       })),
+      getResponsiveStyle(theme, direction, (val) => ({
+        flexDirection: val,
+      })),
       getResponsiveStyle(theme, grow, (val) => ({
-        flex: val,
+        flexGrow: val,
       })),
       getResponsiveStyle(theme, shrink, (val) => ({
         flexShrink: val,
       })),
+      getResponsiveStyle(theme, basis, (val) => ({
+        flexBasis: val,
+      })),
+      getResponsiveStyle(theme, flex, (val) => ({
+        flex: val,
+      })),
       getResponsiveStyle(theme, borderStyle, (val) => ({
         borderStyle: val,
       })),
diff --git a/packages/grafana-ui/src/components/Layout/Flex/Flex.internal.story.tsx b/packages/grafana-ui/src/components/Layout/Flex/Flex.internal.story.tsx
deleted file mode 100644
index 4bada87b32b47..0000000000000
--- a/packages/grafana-ui/src/components/Layout/Flex/Flex.internal.story.tsx
+++ /dev/null
@@ -1,202 +0,0 @@
-import { Meta, StoryFn } from '@storybook/react';
-import React from 'react';
-
-import { ThemeSpacingTokens } from '@grafana/data';
-
-import { useTheme2 } from '../../../themes';
-import { SpacingTokenControl } from '../../../utils/storybook/themeStorybookControls';
-
-import { Flex, JustifyContent, Wrap, Direction } from './Flex';
-import mdx from './Flex.mdx';
-
-const Item = ({ color, text, height }: { color: string; text?: string | number; height?: string }) => {
-  return (
-    <div
-      style={{
-        width: '5em',
-        height: height,
-        backgroundColor: color,
-        display: 'flex',
-        alignItems: 'center',
-        justifyContent: 'center',
-      }}
-    >
-      {text && <h3 style={{ color: 'black' }}>{text}</h3>}
-    </div>
-  );
-};
-
-const meta: Meta<typeof Flex> = {
-  title: 'General/Layout/Flex',
-  component: Flex,
-  parameters: {
-    docs: {
-      page: mdx,
-    },
-  },
-};
-
-export const Basic: StoryFn<typeof Flex> = ({ direction, wrap, alignItems, justifyContent, gap }) => {
-  const theme = useTheme2();
-  return (
-    <div style={{ width: '600px', height: '600px', border: '1px solid grey' }}>
-      <Flex direction={direction} wrap={wrap} alignItems={alignItems} justifyContent={justifyContent} gap={gap}>
-        {Array.from({ length: 5 }).map((_, i) => (
-          <Item key={i} color={theme.colors.warning.main} text={i + 1} />
-        ))}
-      </Flex>
-    </div>
-  );
-};
-
-Basic.argTypes = {
-  gap: SpacingTokenControl,
-  direction: { control: 'select', options: ['row', 'row-reverse', 'column', 'column-reverse'] },
-  wrap: { control: 'select', options: ['nowrap', 'wrap', 'wrap-reverse'] },
-  alignItems: {
-    control: 'select',
-    options: ['stretch', 'flex-start', 'flex-end', 'center', 'baseline', 'start', 'end', 'self-start', 'self-end'],
-  },
-  justifyContent: {
-    control: 'select',
-    options: [
-      'flex-start',
-      'flex-end',
-      'center',
-      'space-between',
-      'space-around',
-      'space-evenly',
-      'start',
-      'end',
-      'left',
-      'right',
-    ],
-  },
-};
-
-export const AlignItemsExamples: StoryFn<typeof Flex> = () => {
-  const theme = useTheme2();
-
-  return (
-    <div style={{ width: '600px' }}>
-      <p>Align items flex-start</p>
-      <Flex direction="row" wrap="wrap" alignItems="flex-start" justifyContent="start" gap={2}>
-        {Array.from({ length: 5 }).map((_, i) => (
-          <Item key={i} color={theme.colors.error.main} text={i + 1} />
-        ))}
-      </Flex>
-      <p>Align items flex-end</p>
-      <Flex direction="row" wrap="wrap" alignItems="flex-end" justifyContent="end" gap={2}>
-        {Array.from({ length: 5 }).map((_, i) => (
-          <Item key={i} color={theme.colors.error.main} text={i + 1} />
-        ))}
-      </Flex>
-      <p>Align items baseline</p>
-      <Flex direction="row" wrap="nowrap" alignItems="baseline" justifyContent="center" gap={2}>
-        {Array.from({ length: 5 }).map((_, i) => (
-          <Item key={i} color={theme.colors.error.main} text={i + 1} />
-        ))}
-      </Flex>
-      <p>Align items center</p>
-      <Flex direction="row" wrap="wrap" alignItems="center" justifyContent="center" gap={2}>
-        {Array.from({ length: 5 }).map((_, i) => (
-          <Item key={i} color={theme.colors.error.main} text={i + 1} />
-        ))}
-      </Flex>
-      <p>Align items stretch</p>
-      <Flex direction="row" wrap="wrap" alignItems="stretch" justifyContent="center" gap={2}>
-        <Item color={theme.colors.error.main} height="10em" />
-        <Item color={theme.colors.error.main} />
-        <Item color={theme.colors.error.main} height="3em" />
-        <Item color={theme.colors.error.main} />
-        <Item color={theme.colors.error.main} />
-      </Flex>
-    </div>
-  );
-};
-
-export const JustifyContentExamples: StoryFn<typeof Flex> = () => {
-  const theme = useTheme2();
-  const justifyContentOptions: JustifyContent[] = [
-    'space-between',
-    'space-around',
-    'space-evenly',
-    'flex-start',
-    'flex-end',
-    'center',
-  ];
-
-  return (
-    <div style={{ width: '600px' }}>
-      {justifyContentOptions.map((justifyContent) => (
-        <>
-          <p>Justify Content {justifyContent}</p>
-          <Flex direction="row" wrap="wrap" alignItems="center" justifyContent={justifyContent} gap={2}>
-            {Array.from({ length: 5 }).map((_, i) => (
-              <Item key={i} color={theme.colors.warning.main} text={i + 1} />
-            ))}
-          </Flex>
-        </>
-      ))}
-    </div>
-  );
-};
-
-export const GapExamples: StoryFn<typeof Flex> = () => {
-  const theme = useTheme2();
-  const gapOptions: ThemeSpacingTokens[] = [2, 8, 10];
-  return (
-    <div style={{ width: '800px' }}>
-      {gapOptions.map((gap) => (
-        <>
-          <p>Gap with spacingToken set to {gap}</p>
-          <Flex direction="row" wrap="wrap" alignItems="flex-start" justifyContent="flex-start" gap={gap}>
-            {Array.from({ length: 5 }).map((_, i) => (
-              <Item key={i} color={theme.colors.error.main} text={i + 1} />
-            ))}
-          </Flex>
-        </>
-      ))}
-    </div>
-  );
-};
-
-export const WrapExamples: StoryFn<typeof Flex> = () => {
-  const theme = useTheme2();
-  const wrapOptions: Wrap[] = ['nowrap', 'wrap', 'wrap-reverse'];
-  return (
-    <div style={{ width: '600px' }}>
-      {wrapOptions.map((wrap) => (
-        <>
-          <p>Wrap examples with {wrap} and gap set to spacingToken 2 (16px)</p>
-          <Flex direction="row" wrap={wrap} alignItems="center" justifyContent="center" gap={2}>
-            {Array.from({ length: 10 }).map((_, i) => (
-              <Item key={i} color={theme.colors.warning.main} text={i + 1} />
-            ))}
-          </Flex>
-        </>
-      ))}
-    </div>
-  );
-};
-
-export const DirectionExamples: StoryFn<typeof Flex> = () => {
-  const theme = useTheme2();
-  const directionOptions: Direction[] = ['row', 'row-reverse', 'column', 'column-reverse'];
-  return (
-    <div style={{ width: '600px' }}>
-      {directionOptions.map((direction) => (
-        <>
-          <p>Direction {direction}</p>
-          <Flex direction={direction} wrap="wrap" alignItems="center" justifyContent="center" gap={2}>
-            {Array.from({ length: 5 }).map((_, i) => (
-              <Item key={i} color={theme.colors.warning.main} text={i + 1} />
-            ))}
-          </Flex>
-        </>
-      ))}
-    </div>
-  );
-};
-
-export default meta;
diff --git a/packages/grafana-ui/src/components/Layout/Flex/Flex.mdx b/packages/grafana-ui/src/components/Layout/Flex/Flex.mdx
deleted file mode 100644
index a8dd4a58777b9..0000000000000
--- a/packages/grafana-ui/src/components/Layout/Flex/Flex.mdx
+++ /dev/null
@@ -1,138 +0,0 @@
-import { Meta, ArgTypes } from '@storybook/blocks';
-import { Flex } from './Flex';
-
-<Meta title="MDX|Flex" component={Flex} />
-
-# Flex
-
-The Flex Component aims at providing a more efficient way to lay out, align and distribute space among items in a container and
-the decision to create it is to ensure consistency in design across Grafana.
-
-### Usage
-
-#### When to use
-
-Use when in need to align components and small parts of the application. Use as parent container to wrap elements that you wish to align in a certain way.
-
-Also:
-
-    * when working with one dimension layout
-    * to display the direction of the elements
-    * to set the elements to wrap
-    * to align items (vertically or horizontally)
-
-#### When not to use
-
-When you need to lay out bigger parts of the application or when you want to create page lay out.
-
-Also:
-
-    * for complex grid layouts with various rows and columns
-    * bidirectional layouts
-    * complex nesting
-    * equal height columns
-
-### Variants
-
-Flex component has few variants that can be used based on the desired alignment you need for your case.
-
-Some examples of how to use the Flex component can be seen below:
-
-- AlignItems stretch
-
-```ts
-import { Flex } from '@grafana/ui'
-import { useTheme2 } from '../../themes';
-
-const theme = useTheme2();
-
-<header>
-    <h1>Using Flex component to align-items stretch and justify-content to be center</h1>
-</header>
-<Flex direction="row" wrap="wrap"  alignItems="stretch" justifyContent="center" gap={2}>
-    <Item color={theme.colors.warning.main} height="10em" />
-    <Item color={theme.colors.warning.main} />
-    <Item color={theme.colors.warning.main} height="3em" />
-    <Item color={theme.colors.warning.main} />
-</Flex>
-```
-
-- Wrap items wrap-reverse
-
-```ts
-import { Flex } from '@grafana/ui'
-import { useTheme2 } from '../../themes';
-
-const theme = useTheme2();
-
-<header>
-    <h1>Using Flex component to align-items with wrap-reverse property</h1>
-</header>
-<Flex direction="row" wrap="wrap-reverse"  alignItems="center" justifyContent="center" gap={4}>
-    <Item color={theme.colors.warning.main}  />
-    <Item color={theme.colors.warning.main} />
-    <Item color={theme.colors.warning.main} />
-    <Item color={theme.colors.warning.main} />
- </Flex>
-```
-
-- JustifyContent flex-start
-
-```ts
-import { Flex } from '@grafana/ui'
-import { useTheme2 } from '../../themes';
-
-const theme = useTheme2();
-
-<header>
-    <h1>Using Flex component to align-items with justify-content property</h1>
-</header>
-<Flex direction="row" wrap="wrap"  alignItems="center" justifyContent="flex-start" gap={2}>
-    <Item color={theme.colors.warning.main}  />
-    <Item color={theme.colors.warning.main} />
-    <Item color={theme.colors.warning.main} />
-    <Item color={theme.colors.warning.main} />
- </Flex>
-```
-
-- Gap of 16px using the ThemeSpacingTokens
-
-```ts
-import { Flex } from '@grafana/ui'
-import { useTheme2 } from '../../themes';
-
-const theme = useTheme2();
-
-<header>
-    <h1>Using Flex component to align-items with gap of 16px</h1>
-</header>
-<Flex direction="row" wrap="wrap"  alignItems="center" justifyContent="center" gap={2}>
-    <Item color={theme.colors.warning.main}  />
-    <Item color={theme.colors.warning.main} />
-    <Item color={theme.colors.warning.main} />
-    <Item color={theme.colors.warning.main} />
- </Flex>
-```
-
-- Direction column
-
-```ts
-import { Flex } from '@grafana/ui'
-import { useTheme2 } from '../../themes';
-
-const theme = useTheme2();
-
-<header>
-    <h1>Using Flex component to align-items with direction column</h1>
-</header>
-<Flex direction="column" wrap="wrap"  alignItems="center" justifyContent="center" gap={2}>
-    <Item color={theme.colors.warning.main}  />
-    <Item color={theme.colors.warning.main} />
-    <Item color={theme.colors.warning.main} />
-    <Item color={theme.colors.warning.main} />
- </Flex>
-```
-
-### Props
-
-<ArgTypes of={Flex} />
diff --git a/packages/grafana-ui/src/components/Layout/Flex/Flex.tsx b/packages/grafana-ui/src/components/Layout/Flex/Flex.tsx
deleted file mode 100644
index b54bce575b48a..0000000000000
--- a/packages/grafana-ui/src/components/Layout/Flex/Flex.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import { css } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2, ThemeSpacingTokens } from '@grafana/data';
-
-import { useStyles2 } from '../../../themes';
-import { ResponsiveProp, getResponsiveStyle } from '../utils/responsiveness';
-
-export type AlignItems =
-  | 'stretch'
-  | 'flex-start'
-  | 'flex-end'
-  | 'center'
-  | 'baseline'
-  | 'start'
-  | 'end'
-  | 'self-start'
-  | 'self-end';
-
-export type JustifyContent =
-  | 'flex-start'
-  | 'flex-end'
-  | 'center'
-  | 'space-between'
-  | 'space-around'
-  | 'space-evenly'
-  | 'start'
-  | 'end'
-  | 'left'
-  | 'right';
-
-export type Direction = 'row' | 'row-reverse' | 'column' | 'column-reverse';
-
-export type Wrap = 'nowrap' | 'wrap' | 'wrap-reverse';
-
-interface FlexProps extends Omit<React.HTMLAttributes<HTMLElement>, 'className' | 'style'> {
-  gap?: ResponsiveProp<ThemeSpacingTokens>;
-  alignItems?: ResponsiveProp<AlignItems>;
-  justifyContent?: ResponsiveProp<JustifyContent>;
-  direction?: ResponsiveProp<Direction>;
-  wrap?: ResponsiveProp<Wrap>;
-  children?: React.ReactNode;
-}
-
-export const Flex = React.forwardRef<HTMLDivElement, FlexProps>(
-  ({ gap = 1, alignItems, justifyContent, direction, wrap, children, ...rest }, ref) => {
-    const styles = useStyles2(getStyles, gap, alignItems, justifyContent, direction, wrap);
-
-    return (
-      <div ref={ref} className={styles.flex} {...rest}>
-        {children}
-      </div>
-    );
-  }
-);
-
-Flex.displayName = 'Flex';
-
-const getStyles = (
-  theme: GrafanaTheme2,
-  gap: FlexProps['gap'],
-  alignItems: FlexProps['alignItems'],
-  justifyContent: FlexProps['justifyContent'],
-  direction: FlexProps['direction'],
-  wrap: FlexProps['wrap']
-) => {
-  return {
-    flex: css([
-      {
-        display: 'flex',
-      },
-      getResponsiveStyle<Direction>(theme, direction, (val) => ({
-        flexDirection: val,
-      })),
-      getResponsiveStyle<Wrap>(theme, wrap, (val) => ({
-        flexWrap: val,
-      })),
-      getResponsiveStyle<AlignItems>(theme, alignItems, (val) => ({
-        alignItems: val,
-      })),
-      getResponsiveStyle<JustifyContent>(theme, justifyContent, (val) => ({
-        justifyContent: val,
-      })),
-      getResponsiveStyle<ThemeSpacingTokens>(theme, gap, (val) => ({
-        gap: theme.spacing(val),
-      })),
-    ]),
-  };
-};
diff --git a/packages/grafana-ui/src/components/Layout/Grid/Grid.internal.story.tsx b/packages/grafana-ui/src/components/Layout/Grid/Grid.internal.story.tsx
deleted file mode 100644
index 2c73d9d0f43f9..0000000000000
--- a/packages/grafana-ui/src/components/Layout/Grid/Grid.internal.story.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import { Meta, StoryFn } from '@storybook/react';
-import React from 'react';
-
-import { useTheme2 } from '../../../themes';
-
-import { Grid } from './Grid';
-import mdx from './Grid.mdx';
-
-const meta: Meta<typeof Grid> = {
-  title: 'General/Layout/Grid',
-  component: Grid,
-  parameters: {
-    docs: {
-      page: mdx,
-    },
-  },
-  args: {
-    gap: 1,
-  },
-};
-
-export const ColumnsNumber: StoryFn<typeof Grid> = (args) => {
-  const theme = useTheme2();
-  return (
-    <Grid gap={args.gap} columns={args.columns}>
-      {Array.from({ length: 9 }).map((_, i) => (
-        <div key={i} style={{ background: theme.colors.background.secondary, textAlign: 'center' }}>
-          N# {i}
-        </div>
-      ))}
-    </Grid>
-  );
-};
-ColumnsNumber.args = {
-  columns: 3,
-};
-ColumnsNumber.parameters = {
-  controls: {
-    exclude: ['minColumnWidth'],
-  },
-};
-
-export const ColumnsMinWidth: StoryFn<typeof Grid> = (args) => {
-  const theme = useTheme2();
-  return (
-    <Grid gap={args.gap} minColumnWidth={args.minColumnWidth}>
-      {Array.from({ length: 9 }).map((_, i) => (
-        <div key={i} style={{ background: theme.colors.background.secondary, textAlign: 'center' }}>
-          N# {i}
-        </div>
-      ))}
-    </Grid>
-  );
-};
-ColumnsMinWidth.args = {
-  minColumnWidth: 21,
-};
-ColumnsMinWidth.parameters = {
-  controls: {
-    exclude: ['columns'],
-  },
-};
-
-export default meta;
diff --git a/packages/grafana-ui/src/components/Layout/Grid/Grid.mdx b/packages/grafana-ui/src/components/Layout/Grid/Grid.mdx
index 34acd4b15f1b0..2b34c45e2b740 100644
--- a/packages/grafana-ui/src/components/Layout/Grid/Grid.mdx
+++ b/packages/grafana-ui/src/components/Layout/Grid/Grid.mdx
@@ -5,7 +5,7 @@ import { Grid } from './Grid';
 
 # Grid
 
-The `Grid` component allows for the organized layout and alignment of content into a grid-based structure.
+The Grid component is a layout component that allows you to create a grid of columns and rows to organize content and elements. It is a wrapper around the [CSS Grid](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Grid_Layout) specification.
 
 ## Usage
 
@@ -17,11 +17,6 @@ Use the Grid component when you want to create structured and organized layouts
 
 Use the `Stack` component instead for these use cases:
 
-- **Simple layouts:** When you need to arrange elements in a linear format, either vertically or horizontally.
-- **Regular flow:** When you want a "regular" site flow but with standardized spacing between the elements.
-
-Use the `Flex` component instead for these use cases:
-
 - **Alignment:** More options for item alignment.
 - **Flex items:** Custom flex basis or configure how items stretch and wrap.
 
diff --git a/packages/grafana-ui/src/components/Layout/Grid/Grid.story.tsx b/packages/grafana-ui/src/components/Layout/Grid/Grid.story.tsx
new file mode 100644
index 0000000000000..d4dadc083ad1d
--- /dev/null
+++ b/packages/grafana-ui/src/components/Layout/Grid/Grid.story.tsx
@@ -0,0 +1,74 @@
+import { Meta, StoryFn } from '@storybook/react';
+import React from 'react';
+
+import { useTheme2 } from '../../../themes';
+
+import { Grid } from './Grid';
+import mdx from './Grid.mdx';
+
+const dimensions = Array.from({ length: 9 }).map(() => ({
+  minHeight: `${Math.random() * 100 + 100}px`,
+}));
+
+const meta: Meta<typeof Grid> = {
+  title: 'General/Layout/Grid',
+  component: Grid,
+  parameters: {
+    docs: {
+      page: mdx,
+    },
+  },
+  args: {
+    gap: 1,
+  },
+};
+
+export const ColumnsNumber: StoryFn<typeof Grid> = (args) => {
+  const theme = useTheme2();
+  return (
+    <Grid {...args}>
+      {Array.from({ length: 9 }).map((_, i) => (
+        <div key={i} style={{ background: theme.colors.background.secondary, textAlign: 'center', ...dimensions[i] }}>
+          N# {i}
+        </div>
+      ))}
+    </Grid>
+  );
+};
+ColumnsNumber.argTypes = {
+  alignItems: {
+    control: 'select',
+    options: ['stretch', 'flex-start', 'flex-end', 'center', 'baseline', 'start', 'end', 'self-start', 'self-end'],
+  },
+};
+ColumnsNumber.args = {
+  columns: 3,
+};
+ColumnsNumber.parameters = {
+  controls: {
+    exclude: ['minColumnWidth'],
+  },
+};
+
+export const ColumnsMinWidth: StoryFn<typeof Grid> = (args) => {
+  const theme = useTheme2();
+  return (
+    <Grid gap={args.gap} minColumnWidth={args.minColumnWidth}>
+      {Array.from({ length: 9 }).map((_, i) => (
+        <div key={i} style={{ background: theme.colors.background.secondary, textAlign: 'center' }}>
+          N# {i}
+        </div>
+      ))}
+    </Grid>
+  );
+};
+ColumnsMinWidth.args = {
+  minColumnWidth: 21,
+};
+ColumnsMinWidth.parameters = {
+  controls: {
+    exclude: ['columns'],
+  },
+};
+
+export default meta;
diff --git a/packages/grafana-ui/src/components/Layout/Grid/Grid.tsx b/packages/grafana-ui/src/components/Layout/Grid/Grid.tsx
index 2ed66247af605..4225bb6074b15 100644
--- a/packages/grafana-ui/src/components/Layout/Grid/Grid.tsx
+++ b/packages/grafana-ui/src/components/Layout/Grid/Grid.tsx
@@ -4,25 +4,36 @@ import React, { forwardRef, HTMLAttributes } from 'react';
 import { GrafanaTheme2, ThemeSpacingTokens } from '@grafana/data';
 
 import { useStyles2 } from '../../../themes';
+import { AlignItems } from '../types';
+import { getResponsiveStyle, ResponsiveProp } from '../utils/responsiveness';
 
-interface GridProps extends Omit<HTMLAttributes<HTMLDivElement>, 'className' | 'style'> {
+interface GridPropsBase extends Omit<HTMLAttributes<HTMLDivElement>, 'className' | 'style'> {
   children: NonNullable<React.ReactNode>;
+  /** Specifies the gutters between columns and rows. It is overwritten when a column or row gap has a value. */
+  gap?: ResponsiveProp<ThemeSpacingTokens>;
+  alignItems?: ResponsiveProp<AlignItems>;
+}
 
-  /** Specifies the gutters between columns and rows. It is overwritten when a column or row gap has a value */
-  gap?: ThemeSpacingTokens;
-
+interface PropsWithColumns extends GridPropsBase {
   /** Number of columns */
-  columns?: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12;
+  columns?: ResponsiveProp<1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12>;
+  minColumnWidth?: never;
+}
 
+interface PropsWithMinColumnWidth extends GridPropsBase {
+  columns?: never;
   /** For a responsive layout, fit as many columns while maintaining this minimum column width.
    *  The real width will be calculated based on the theme spacing tokens: `theme.spacing(minColumnWidth)`
    */
-  minColumnWidth?: 1 | 2 | 3 | 5 | 8 | 13 | 21 | 34 | 44 | 55 | 72 | 89 | 144;
+  minColumnWidth?: ResponsiveProp<1 | 2 | 3 | 5 | 8 | 13 | 21 | 34 | 44 | 55 | 72 | 89 | 144>;
 }
 
+/** 'columns' and 'minColumnWidth' are mutually exclusive */
+type GridProps = PropsWithColumns | PropsWithMinColumnWidth;
+
 export const Grid = forwardRef<HTMLDivElement, GridProps>((props, ref) => {
-  const { children, gap, columns, minColumnWidth, ...rest } = props;
-  const styles = useStyles2(getGridStyles, gap, columns, minColumnWidth);
+  const { alignItems, children, gap, columns, minColumnWidth, ...rest } = props;
+  const styles = useStyles2(getGridStyles, gap, columns, minColumnWidth, alignItems);
 
   return (
     <div ref={ref} {...rest} className={styles.grid}>
@@ -37,20 +48,26 @@ const getGridStyles = (
   theme: GrafanaTheme2,
   gap: GridProps['gap'],
   columns: GridProps['columns'],
-  minColumnWidth: GridProps['minColumnWidth']
+  minColumnWidth: GridProps['minColumnWidth'],
+  alignItems: GridProps['alignItems']
 ) => {
   return {
     grid: css([
-      {
-        display: 'grid',
-        gap: gap ? theme.spacing(gap) : undefined,
-      },
-      minColumnWidth && {
-        gridTemplateColumns: `repeat(auto-fill, minmax(${theme.spacing(minColumnWidth)}, 1fr))`,
-      },
-      columns && {
-        gridTemplateColumns: `repeat(${columns}, 1fr)`,
-      },
+      { display: 'grid' },
+      getResponsiveStyle(theme, gap, (val) => ({
+        gap: theme.spacing(val),
+      })),
+      minColumnWidth &&
+        getResponsiveStyle(theme, minColumnWidth, (val) => ({
+          gridTemplateColumns: `repeat(auto-fill, minmax(${theme.spacing(val)}, 1fr))`,
+        })),
+      columns &&
+        getResponsiveStyle(theme, columns, (val) => ({
+          gridTemplateColumns: `repeat(${val}, 1fr)`,
+        })),
+      getResponsiveStyle(theme, alignItems, (val) => ({
+        alignItems: val,
+      })),
     ]),
   };
 };
diff --git a/packages/grafana-ui/src/components/Layout/Layout.tsx b/packages/grafana-ui/src/components/Layout/Layout.tsx
index d56b07d4b6b0e..7fcd44af45432 100644
--- a/packages/grafana-ui/src/components/Layout/Layout.tsx
+++ b/packages/grafana-ui/src/components/Layout/Layout.tsx
@@ -30,6 +30,9 @@ export interface ContainerProps {
   shrink?: number;
 }
 
+/**
+ * @deprecated use Stack component instead
+ */
 export const Layout = ({
   children,
   orientation = Orientation.Horizontal,
@@ -58,6 +61,9 @@ export const Layout = ({
   );
 };
 
+/**
+ * @deprecated use Stack component instead
+ */
 export const HorizontalGroup = ({
   children,
   spacing,
@@ -79,6 +85,10 @@ export const HorizontalGroup = ({
     {children}
   </Layout>
 );
+
+/**
+ * @deprecated use Stack component with the "column" direction instead
+ */
 export const VerticalGroup = ({
   children,
   spacing,
diff --git a/packages/grafana-ui/src/components/Layout/Space.mdx b/packages/grafana-ui/src/components/Layout/Space.mdx
new file mode 100644
index 0000000000000..47bc0cb8e546d
--- /dev/null
+++ b/packages/grafana-ui/src/components/Layout/Space.mdx
@@ -0,0 +1,22 @@
+import { Meta, ArgTypes } from '@storybook/blocks';
+import { Space } from './Space';
+
+<Meta title="MDX|Space" component={Space} />
+
+# Space
+
+The `Space` component is a component used to add space between elements. Horizontal space is added using the `h` prop, while vertical space is added using the `v` prop. When adding horizontal space between inline or inline-block elements, the `layout` props should be set to `inline`, otherwise the `block` value of the prop can be used.
+
+### Usage
+
+#### When to use
+
+Use the `Space` component to add space between elements that cannot be spaced using flex or grid layout.
+
+#### When not to use
+
+Do not use the `Space` component to add space between elements inside the `Stack` component. Instead, use the `gap` prop on the `Stack` component.
+
+### Props
+
+<ArgTypes of={Space} />
diff --git a/packages/grafana-ui/src/components/Layout/Space.story.tsx b/packages/grafana-ui/src/components/Layout/Space.story.tsx
new file mode 100644
index 0000000000000..fd6ca746db73b
--- /dev/null
+++ b/packages/grafana-ui/src/components/Layout/Space.story.tsx
@@ -0,0 +1,70 @@
+import { StoryFn, Meta } from '@storybook/react';
+import React from 'react';
+
+import { SpacingTokenControl } from '../../utils/storybook/themeStorybookControls';
+
+import { Box } from './Box/Box';
+import { Space } from './Space';
+import mdx from './Space.mdx';
+
+const meta: Meta<typeof Space> = {
+  title: 'General/Layout/Space',
+  component: Space,
+  parameters: {
+    docs: {
+      page: mdx,
+    },
+  },
+  argTypes: {
+    v: SpacingTokenControl,
+    h: SpacingTokenControl,
+  },
+};
+
+export default meta;
+
+export const Horizontal: StoryFn<typeof Space> = (args) => {
+  return (
+    <div style={{ display: 'flex' }}>
+      <Box borderStyle={'solid'} padding={1}>
+        Box without space
+      </Box>
+      <Box borderStyle={'solid'} padding={1}>
+        Box with space on the right
+      </Box>
+      <Space {...args} />
+      <Box borderStyle={'solid'} padding={1}>
+        Box without space
+      </Box>
+    </div>
+  );
+};
+
+Horizontal.args = {
+  v: 0,
+  h: 2,
+  layout: 'inline',
+};
+
+export const Vertical: StoryFn<typeof Space> = (args) => {
+  return (
+    <div>
+      <Box borderStyle={'solid'} padding={1}>
+        Box without space
+      </Box>
+      <Box borderStyle={'solid'} padding={1}>
+        Box with bottom space
+      </Box>
+      <Space {...args} />
+      <Box borderStyle={'solid'} padding={1}>
+        Box without space
+      </Box>
+    </div>
+  );
+};
+
+Vertical.args = {
+  v: 2,
+  h: 0,
+  layout: 'block',
+};
diff --git a/packages/grafana-ui/src/components/Layout/Space.tsx b/packages/grafana-ui/src/components/Layout/Space.tsx
new file mode 100644
index 0000000000000..6e3c53ed2eead
--- /dev/null
+++ b/packages/grafana-ui/src/components/Layout/Space.tsx
@@ -0,0 +1,26 @@
+import React from 'react';
+
+import { ThemeSpacingTokens } from '@grafana/data';
+
+import { Box } from './Box/Box';
+import { ResponsiveProp } from './utils/responsiveness';
+
+export interface SpaceProps {
+  /**
+   * The amount of vertical space to use.
+   */
+  v?: ResponsiveProp<ThemeSpacingTokens>;
+  /**
+   * The amount of horizontal space to use.
+   */
+  h?: ResponsiveProp<ThemeSpacingTokens>;
+  /**
+   * The layout of the space. If set to `inline`, the component will behave like an inline-block element,
+   * otherwise it will behave like a block element.
+   */
+  layout?: 'block' | 'inline';
+}
+
+export const Space = ({ v = 0, h = 0, layout }: SpaceProps) => {
+  return <Box paddingRight={h} paddingBottom={v} display={layout === 'inline' ? 'inline-block' : 'block'} />;
+};
diff --git a/packages/grafana-ui/src/components/Layout/Stack/HorizontalStack.tsx b/packages/grafana-ui/src/components/Layout/Stack/HorizontalStack.tsx
deleted file mode 100644
index 57944ad2946c0..0000000000000
--- a/packages/grafana-ui/src/components/Layout/Stack/HorizontalStack.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react';
-
-import { ThemeSpacingTokens } from '@grafana/data';
-
-import { ResponsiveProp } from '../utils/responsiveness';
-
-import { Stack } from './Stack';
-
-interface HorizontalStackProps extends Omit<React.HTMLAttributes<HTMLElement>, 'className' | 'style'> {
-  gap?: ResponsiveProp<ThemeSpacingTokens>;
-}
-
-export const HorizontalStack = React.forwardRef<HTMLDivElement, React.PropsWithChildren<HorizontalStackProps>>(
-  ({ children, gap = 1, ...rest }, ref) => (
-    <Stack ref={ref} direction="row" gap={gap} {...rest}>
-      {children}
-    </Stack>
-  )
-);
-HorizontalStack.displayName = 'HorizontalStack';
diff --git a/packages/grafana-ui/src/components/Layout/Stack/Stack.internal.story.tsx b/packages/grafana-ui/src/components/Layout/Stack/Stack.internal.story.tsx
deleted file mode 100644
index 53ab64778fdcc..0000000000000
--- a/packages/grafana-ui/src/components/Layout/Stack/Stack.internal.story.tsx
+++ /dev/null
@@ -1,222 +0,0 @@
-import { Meta, StoryFn } from '@storybook/react';
-import React, { ReactNode } from 'react';
-
-import { SpacingTokenControl } from '../../../utils/storybook/themeStorybookControls';
-import { Alert } from '../../Alert/Alert';
-import { Button } from '../../Button';
-import { Card } from '../../Card/Card';
-import { Text } from '../../Text/Text';
-
-import { HorizontalStack } from './HorizontalStack';
-import { Stack } from './Stack';
-import mdx from './Stack.mdx';
-
-const meta: Meta<typeof Stack> = {
-  title: 'General/Layout/Stack',
-  component: Stack,
-  parameters: {
-    docs: {
-      page: mdx,
-    },
-  },
-  argTypes: {
-    gap: SpacingTokenControl,
-    direction: { control: 'select', options: ['row', 'column'] },
-  },
-};
-
-const Item = ({ children }: { children: ReactNode }) => (
-  <div style={{ backgroundColor: 'lightgrey', width: '100px', height: '50px' }}>{children}</div>
-);
-
-export const Basic: StoryFn<typeof Stack> = ({ direction = 'column', gap = 2 }) => {
-  return (
-    <Stack direction={direction} gap={gap}>
-      <Item>Item 1</Item>
-      <Item>Item 2</Item>
-      <Item>Item 3</Item>
-    </Stack>
-  );
-};
-
-export const TestCases: StoryFn<typeof Stack> = () => {
-  return (
-    <div style={{ width: '100%' }}>
-      <Stack gap={4}>
-        <h2>Comparisons Stack vs No stack</h2>
-        <HorizontalStack>
-          <Example title="No stack">
-            <Button>A button</Button>
-            <Button>Longer button button</Button>
-          </Example>
-
-          <Example title="Horizontal stack">
-            <HorizontalStack>
-              <Button>A button</Button>
-              <Button>Longer button button</Button>
-            </HorizontalStack>
-          </Example>
-
-          <Example title="Vertical stack">
-            <Stack>
-              <Button>A button</Button>
-              <Button>Longer button button</Button>
-            </Stack>
-          </Example>
-        </HorizontalStack>
-
-        <HorizontalStack>
-          <Example title="No stack, mismatched heights">
-            <Card>
-              <Card.Heading>I am a card heading</Card.Heading>
-            </Card>
-
-            <Card>
-              <Card.Heading>I am a card heading</Card.Heading>
-              <Card.Description>Ohhhhh - and now a description and some actions</Card.Description>
-              <Card.Actions>
-                <Button variant="secondary">Settings</Button>
-                <Button variant="secondary">Explore</Button>
-              </Card.Actions>
-            </Card>
-
-            <Card>
-              <Card.Heading>I am a card heading</Card.Heading>
-              <Card.Description>Ohhhhh - and now a description!</Card.Description>
-            </Card>
-            <Button>Please press me!</Button>
-          </Example>
-          <Example title="Vertical stack, mismatched heights">
-            <Stack>
-              <Card>
-                <Card.Heading>I am a card heading</Card.Heading>
-              </Card>
-
-              <Card>
-                <Card.Heading>I am a card heading</Card.Heading>
-                <Card.Description>Ohhhhh - and now a description and some actions</Card.Description>
-                <Card.Actions>
-                  <Button variant="secondary">Settings</Button>
-                  <Button variant="secondary">Explore</Button>
-                </Card.Actions>
-              </Card>
-
-              <Card>
-                <Card.Heading>I am a card heading</Card.Heading>
-                <Card.Description>Ohhhhh - and now a description!</Card.Description>
-              </Card>
-              <Button>Please press me!</Button>
-            </Stack>
-          </Example>
-        </HorizontalStack>
-
-        <div style={{ width: 500 }}>
-          <Example title="No stack, too many items">
-            <Button>A button</Button>
-            <Button>Longer button button</Button>
-            <Button>Another button</Button>
-            <Button>And another</Button>
-            <Button>Why not - one last button!</Button>
-          </Example>
-
-          <Example title="Horizontal stack, too many items">
-            <HorizontalStack>
-              <Button>A button</Button>
-              <Button>Longer button button</Button>
-              <Button>Another button</Button>
-              <Button>And another</Button>
-              <Button>Why not - one last button!</Button>
-            </HorizontalStack>
-          </Example>
-        </div>
-
-        <h2>Child alignment</h2>
-
-        <div style={{ width: 500 }}>
-          <Example title="Row, mismatched heights">
-            <HorizontalStack>
-              <MyComponent>
-                <div style={{ height: 50, width: 100, background: 'blue' }} />
-              </MyComponent>
-              <MyComponent>
-                <div style={{ height: 150, width: 100, background: 'orange' }} />
-              </MyComponent>
-            </HorizontalStack>
-          </Example>
-        </div>
-
-        <Example title="Horizontal stack, mismatched heights">
-          <HorizontalStack>
-            <Card>
-              <Card.Heading>I am a card heading</Card.Heading>
-            </Card>
-
-            <Card>
-              <Card.Heading>I am a card heading</Card.Heading>
-              <Card.Description>Ohhhhh - and now a description and some actions</Card.Description>
-              <Card.Actions>
-                <Button variant="secondary">Settings</Button>
-                <Button variant="secondary">Explore</Button>
-              </Card.Actions>
-            </Card>
-
-            <Card>
-              <Card.Heading>I am a card heading</Card.Heading>
-              <Card.Description>Ohhhhh - and now a description!</Card.Description>
-            </Card>
-          </HorizontalStack>
-        </Example>
-
-        <Example title="Horizontal stack, mismatched heights with different components">
-          <HorizontalStack>
-            <Card>
-              <Card.Heading>I am a card heading</Card.Heading>
-            </Card>
-
-            <Card>
-              <Card.Heading>I am a card heading</Card.Heading>
-              <Card.Description>Ohhhhh - and now a description!</Card.Description>
-            </Card>
-
-            <Alert severity="info" title="Plus an alert!" />
-          </HorizontalStack>
-        </Example>
-
-        <Example title="Horizontal stack, alerts with even heights">
-          <HorizontalStack>
-            <Alert severity="info" title="Plus an alert!" />
-            <Alert severity="success" title="Plus an alert!" />
-            <Alert severity="warning" title="Plus an alert!" />
-            <Alert severity="error" title="Plus an alert!" />
-          </HorizontalStack>
-        </Example>
-
-        <Example title="Horizontal stack, alerts with mismatched heights">
-          <HorizontalStack>
-            <Alert severity="info" title="Plus an alert!" />
-            <Alert severity="success" title="Plus an alert!" />
-            <Alert severity="warning" title="Plus an alert!">
-              Surprise - a description! What will happen to the height of all the other alerts?
-            </Alert>
-            <Alert severity="error" title="Plus an alert!" />
-          </HorizontalStack>
-        </Example>
-      </Stack>
-    </div>
-  );
-};
-
-function Example({ title, children }: { title: string; children: React.ReactNode }) {
-  return (
-    <div>
-      <Text variant="h3">{title}</Text>
-      <div style={{ background: 'rgba(255,255,255,0.1)', border: '1px dashed green' }}>{children}</div>
-    </div>
-  );
-}
-
-function MyComponent({ children }: { children: React.ReactNode }) {
-  return <div style={{ background: 'rgba(0,255,255, 0.2)', padding: 16 }}>{children}</div>;
-}
-
-export default meta;
diff --git a/packages/grafana-ui/src/components/Layout/Stack/Stack.mdx b/packages/grafana-ui/src/components/Layout/Stack/Stack.mdx
index b21e7652f8ff3..046f414b697ca 100644
--- a/packages/grafana-ui/src/components/Layout/Stack/Stack.mdx
+++ b/packages/grafana-ui/src/components/Layout/Stack/Stack.mdx
@@ -1,44 +1,27 @@
-import { Meta, ArgTypes, Canvas } from '@storybook/blocks';
-import { Stack, HorizontalStack } from './index';
-import * as Stories from './Stack.internal.story';
+import { Meta, ArgTypes } from '@storybook/blocks';
+import { Stack } from './Stack';
 
 <Meta title="MDX|Stack" component={Stack} />
 
 # Stack
 
-The `Stack` component is designed to assist with layout and positioning of elements within a container, offering a simple and flexible way to stack elements vertically or horizontally. This documentation outlines the proper usage of the Stack component and provides guidance on when to use it over the Grid or Flex components.
-
-There is also a `HorizontalStack` component, which is a thin wrapper around Stack, equivalent to `<Stack direction="row">`.
+The Stack component is a simple wrapper around the flexbox layout model that allows to easily create responsive and flexible layouts. It provides a simple and intuitive way to align and distribute items within a container either horizontally or vertically.
 
 ### Usage
 
 #### When to use
 
-Use the Stack component when you need to arrange elements in a linear format, either vertically or horizontally. It's particularly useful when you want to maintain consistent spacing between items.
-
-Use the Stack component when:
-
-- You need a simple way to stack elements with predictable spacing.
-- You want to ensure consistent alignment.
+- For creating responsive and flexible layouts that can adapt to different screen sizes and orientations.
+- When needing a simple and intuitive way to align and distribute items within a container either horizontally or vertically.
+- To easily reorder and rearrange elements without changing the HTML structure.
+- When aiming to create equal height columns.
+- To create a grid-like structure with automatic wrapping and sizing of items based on the available space.
 
 #### When not to use
 
-Use the `Grid` component instead for these use cases:
-
-- **Intricate Layouts:** Grids are ideal for complex dashboard and magazine-style designs with rows and columns.
-- **Structured Grid:** Use Grids when items need to span multiple rows/columns, creating structured layouts.
-
-Use the `Flex` component instead for these use cases:
+- For complex multi-dimensional layouts with intricate requirements that are better suited for CSS frameworks or grid systems.
+- When precise control over spacing and positioning of elements is necessary.
 
-- **Alignment:** More options for item alignment.
-- **Flex items:** Custom flex basis or configure how items stretch and wrap.
-
-## Props
-
-### Stack
+### Props
 
 <ArgTypes of={Stack} />
-
-### HorizontalStack
-
-<ArgTypes of={HorizontalStack} />
diff --git a/packages/grafana-ui/src/components/Layout/Stack/Stack.story.tsx b/packages/grafana-ui/src/components/Layout/Stack/Stack.story.tsx
new file mode 100644
index 0000000000000..259c67e913258
--- /dev/null
+++ b/packages/grafana-ui/src/components/Layout/Stack/Stack.story.tsx
@@ -0,0 +1,203 @@
+import { Meta, StoryFn } from '@storybook/react';
+import React from 'react';
+
+import { ThemeSpacingTokens } from '@grafana/data';
+
+import { useTheme2 } from '../../../themes';
+import { SpacingTokenControl } from '../../../utils/storybook/themeStorybookControls';
+import { JustifyContent, Wrap, Direction } from '../types';
+
+import { Stack } from './Stack';
+import mdx from './Stack.mdx';
+
+const Item = ({ color, text, height }: { color: string; text?: string | number; height?: string }) => {
+  return (
+    <div
+      style={{
+        width: '5em',
+        height: height,
+        backgroundColor: color,
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+      }}
+    >
+      {text && <h3 style={{ color: 'black' }}>{text}</h3>}
+    </div>
+  );
+};
+
+const meta: Meta<typeof Stack> = {
+  title: 'General/Layout/Stack',
+  component: Stack,
+  parameters: {
+    docs: {
+      page: mdx,
+    },
+  },
+};
+
+export const Basic: StoryFn<typeof Stack> = ({ direction, wrap, alignItems, justifyContent, gap }) => {
+  const theme = useTheme2();
+  return (
+    <div style={{ width: '600px', height: '600px', border: '1px solid grey' }}>
+      <Stack direction={direction} wrap={wrap} alignItems={alignItems} justifyContent={justifyContent} gap={gap}>
+        {Array.from({ length: 5 }).map((_, i) => (
+          <Item key={i} color={theme.colors.warning.main} text={i + 1} />
+        ))}
+      </Stack>
+    </div>
+  );
+};
+
+Basic.argTypes = {
+  gap: SpacingTokenControl,
+  direction: { control: 'select', options: ['row', 'row-reverse', 'column', 'column-reverse'] },
+  wrap: { control: 'select', options: ['nowrap', 'wrap', 'wrap-reverse'] },
+  alignItems: {
+    control: 'select',
+    options: ['stretch', 'flex-start', 'flex-end', 'center', 'baseline', 'start', 'end', 'self-start', 'self-end'],
+  },
+  justifyContent: {
+    control: 'select',
+    options: [
+      'flex-start',
+      'flex-end',
+      'center',
+      'space-between',
+      'space-around',
+      'space-evenly',
+      'start',
+      'end',
+      'left',
+      'right',
+    ],
+  },
+};
+
+export const AlignItemsExamples: StoryFn<typeof Stack> = () => {
+  const theme = useTheme2();
+
+  return (
+    <div style={{ width: '600px' }}>
+      <p>Align items flex-start</p>
+      <Stack direction="row" wrap="wrap" alignItems="flex-start" justifyContent="start" gap={2}>
+        {Array.from({ length: 5 }).map((_, i) => (
+          <Item key={i} color={theme.colors.error.main} text={i + 1} />
+        ))}
+      </Stack>
+      <p>Align items flex-end</p>
+      <Stack direction="row" wrap="wrap" alignItems="flex-end" justifyContent="end" gap={2}>
+        {Array.from({ length: 5 }).map((_, i) => (
+          <Item key={i} color={theme.colors.error.main} text={i + 1} />
+        ))}
+      </Stack>
+      <p>Align items baseline</p>
+      <Stack direction="row" wrap="nowrap" alignItems="baseline" justifyContent="center" gap={2}>
+        {Array.from({ length: 5 }).map((_, i) => (
+          <Item key={i} color={theme.colors.error.main} text={i + 1} />
+        ))}
+      </Stack>
+      <p>Align items center</p>
+      <Stack direction="row" wrap="wrap" alignItems="center" justifyContent="center" gap={2}>
+        {Array.from({ length: 5 }).map((_, i) => (
+          <Item key={i} color={theme.colors.error.main} text={i + 1} />
+        ))}
+      </Stack>
+      <p>Align items stretch</p>
+      <Stack direction="row" wrap="wrap" alignItems="stretch" justifyContent="center" gap={2}>
+        <Item color={theme.colors.error.main} height="10em" />
+        <Item color={theme.colors.error.main} />
+        <Item color={theme.colors.error.main} height="3em" />
+        <Item color={theme.colors.error.main} />
+        <Item color={theme.colors.error.main} />
+      </Stack>
+    </div>
+  );
+};
+
+export const JustifyContentExamples: StoryFn<typeof Stack> = () => {
+  const theme = useTheme2();
+  const justifyContentOptions: JustifyContent[] = [
+    'space-between',
+    'space-around',
+    'space-evenly',
+    'flex-start',
+    'flex-end',
+    'center',
+  ];
+
+  return (
+    <div style={{ width: '600px' }}>
+      {justifyContentOptions.map((justifyContent) => (
+        <>
+          <p>Justify Content {justifyContent}</p>
+          <Stack direction="row" wrap="wrap" alignItems="center" justifyContent={justifyContent} gap={2}>
+            {Array.from({ length: 5 }).map((_, i) => (
+              <Item key={i} color={theme.colors.warning.main} text={i + 1} />
+            ))}
+          </Stack>
+        </>
+      ))}
+    </div>
+  );
+};
+
+export const GapExamples: StoryFn<typeof Stack> = () => {
+  const theme = useTheme2();
+  const gapOptions: ThemeSpacingTokens[] = [2, 8, 10];
+  return (
+    <div style={{ width: '800px' }}>
+      {gapOptions.map((gap) => (
+        <>
+          <p>Gap with spacingToken set to {gap}</p>
+          <Stack direction="row" wrap="wrap" alignItems="flex-start" justifyContent="flex-start" gap={gap}>
+            {Array.from({ length: 5 }).map((_, i) => (
+              <Item key={i} color={theme.colors.error.main} text={i + 1} />
+            ))}
+          </Stack>
+        </>
+      ))}
+    </div>
+  );
+};
+
+export const WrapExamples: StoryFn<typeof Stack> = () => {
+  const theme = useTheme2();
+  const wrapOptions: Wrap[] = ['nowrap', 'wrap', 'wrap-reverse'];
+  return (
+    <div style={{ width: '600px' }}>
+      {wrapOptions.map((wrap) => (
+        <>
+          <p>Wrap examples with {wrap} and gap set to spacingToken 2 (16px)</p>
+          <Stack direction="row" wrap={wrap} alignItems="center" justifyContent="center" gap={2}>
+            {Array.from({ length: 10 }).map((_, i) => (
+              <Item key={i} color={theme.colors.warning.main} text={i + 1} />
+            ))}
+          </Stack>
+        </>
+      ))}
+    </div>
+  );
+};
+
+export const DirectionExamples: StoryFn<typeof Stack> = () => {
+  const theme = useTheme2();
+  const directionOptions: Direction[] = ['row', 'row-reverse', 'column', 'column-reverse'];
+  return (
+    <div style={{ width: '600px' }}>
+      {directionOptions.map((direction) => (
+        <>
+          <p>Direction {direction}</p>
+          <Stack direction={direction} wrap="wrap" alignItems="center" justifyContent="center" gap={2}>
+            {Array.from({ length: 5 }).map((_, i) => (
+              <Item key={i} color={theme.colors.warning.main} text={i + 1} />
+            ))}
+          </Stack>
+        </>
+      ))}
+    </div>
+  );
+};
+
+export default meta;
diff --git a/packages/grafana-ui/src/components/Layout/Stack/Stack.tsx b/packages/grafana-ui/src/components/Layout/Stack/Stack.tsx
index 2e24f2332f9d3..835282b8e171c 100644
--- a/packages/grafana-ui/src/components/Layout/Stack/Stack.tsx
+++ b/packages/grafana-ui/src/components/Layout/Stack/Stack.tsx
@@ -1,26 +1,78 @@
+import { css } from '@emotion/css';
 import React from 'react';
 
-import { ThemeSpacingTokens } from '@grafana/data';
+import { GrafanaTheme2, ThemeSpacingTokens } from '@grafana/data';
 
-import { Flex } from '../Flex/Flex';
-import { ResponsiveProp } from '../utils/responsiveness';
-interface StackProps extends Omit<React.HTMLAttributes<HTMLElement>, 'className' | 'style'> {
-  direction?: ResponsiveProp<'column' | 'row'>;
+import { useStyles2 } from '../../../themes';
+import { AlignItems, Direction, FlexProps, JustifyContent, Wrap } from '../types';
+import { ResponsiveProp, getResponsiveStyle } from '../utils/responsiveness';
+
+interface StackProps extends FlexProps, Omit<React.HTMLAttributes<HTMLElement>, 'className' | 'style'> {
   gap?: ResponsiveProp<ThemeSpacingTokens>;
+  alignItems?: ResponsiveProp<AlignItems>;
+  justifyContent?: ResponsiveProp<JustifyContent>;
+  direction?: ResponsiveProp<Direction>;
+  wrap?: ResponsiveProp<Wrap>;
+  children?: React.ReactNode;
 }
 
-export const Stack = React.forwardRef<HTMLDivElement, React.PropsWithChildren<StackProps>>(
-  ({ gap = 1, direction = 'column', children, ...rest }, ref) => {
-    return (
-      <Flex ref={ref} gap={gap} direction={direction} wrap="wrap" {...rest}>
-        {React.Children.toArray(children)
-          .filter(Boolean)
-          .map((child, index) => (
-            <div key={index}>{child}</div>
-          ))}
-      </Flex>
-    );
-  }
-);
+export const Stack = React.forwardRef<HTMLDivElement, StackProps>((props, ref) => {
+  const { gap = 1, alignItems, justifyContent, direction, wrap, children, grow, shrink, basis, flex, ...rest } = props;
+  const styles = useStyles2(getStyles, gap, alignItems, justifyContent, direction, wrap, grow, shrink, basis, flex);
+
+  return (
+    <div ref={ref} className={styles.flex} {...rest}>
+      {children}
+    </div>
+  );
+});
 
 Stack.displayName = 'Stack';
+
+const getStyles = (
+  theme: GrafanaTheme2,
+  gap: StackProps['gap'],
+  alignItems: StackProps['alignItems'],
+  justifyContent: StackProps['justifyContent'],
+  direction: StackProps['direction'],
+  wrap: StackProps['wrap'],
+  grow: StackProps['grow'],
+  shrink: StackProps['shrink'],
+  basis: StackProps['basis'],
+  flex: StackProps['flex']
+) => {
+  return {
+    flex: css([
+      {
+        display: 'flex',
+      },
+      getResponsiveStyle(theme, direction, (val) => ({
+        flexDirection: val,
+      })),
+      getResponsiveStyle(theme, wrap, (val) => ({
+        flexWrap: val,
+      })),
+      getResponsiveStyle(theme, alignItems, (val) => ({
+        alignItems: val,
+      })),
+      getResponsiveStyle(theme, justifyContent, (val) => ({
+        justifyContent: val,
+      })),
+      getResponsiveStyle(theme, gap, (val) => ({
+        gap: theme.spacing(val),
+      })),
+      getResponsiveStyle(theme, grow, (val) => ({
+        flexGrow: val,
+      })),
+      getResponsiveStyle(theme, shrink, (val) => ({
+        flexShrink: val,
+      })),
+      getResponsiveStyle(theme, basis, (val) => ({
+        flexBasis: val,
+      })),
+      getResponsiveStyle(theme, flex, (val) => ({
+        flex: val,
+      })),
+    ]),
+  };
+};
diff --git a/packages/grafana-ui/src/components/Layout/Stack/index.ts b/packages/grafana-ui/src/components/Layout/Stack/index.ts
deleted file mode 100644
index 89768e71dc004..0000000000000
--- a/packages/grafana-ui/src/components/Layout/Stack/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { Stack } from './Stack';
-export { HorizontalStack } from './HorizontalStack';
diff --git a/packages/grafana-ui/src/components/Layout/types.ts b/packages/grafana-ui/src/components/Layout/types.ts
new file mode 100644
index 0000000000000..b31f68c97abb8
--- /dev/null
+++ b/packages/grafana-ui/src/components/Layout/types.ts
@@ -0,0 +1,51 @@
+import { ResponsiveProp } from './utils/responsiveness';
+
+export type AlignItems =
+  | 'stretch'
+  | 'flex-start'
+  | 'flex-end'
+  | 'center'
+  | 'baseline'
+  | 'start'
+  | 'end'
+  | 'self-start'
+  | 'self-end';
+
+export type JustifyContent =
+  | 'flex-start'
+  | 'flex-end'
+  | 'center'
+  | 'space-between'
+  | 'space-around'
+  | 'space-evenly'
+  | 'start'
+  | 'end'
+  | 'left'
+  | 'right';
+
+export type Direction = 'row' | 'row-reverse' | 'column' | 'column-reverse';
+export type Wrap = 'nowrap' | 'wrap' | 'wrap-reverse';
+
+type FlexGrow = number;
+type FlexShrink = number;
+type FlexBasis = 'auto' | 'initial' | '0' | `${number}%` | `${number}px`;
+
+// Support the following formats for the "flex" shorthand property:
+// - 1
+// - '1'
+// - '1 1'
+// - '1 1 0'
+// - '1 1 0px'
+// - '1 1 auto'
+type Flex = FlexGrow | `${FlexGrow}` | `${FlexGrow} ${FlexShrink}` | `${FlexGrow} ${FlexShrink} ${FlexBasis}`;
+
+export type FlexProps = {
+  /** Sets the property `flex-grow` */
+  grow?: ResponsiveProp<FlexGrow>;
+  /** Sets the property `flex-shrink` */
+  shrink?: ResponsiveProp<FlexShrink>;
+  /** Sets the property `flex-basis` */
+  basis?: ResponsiveProp<FlexBasis>;
+  /** Sets the property `flex` */
+  flex?: ResponsiveProp<Flex>;
+};
diff --git a/packages/grafana-ui/src/components/Link/TextLink.story.tsx b/packages/grafana-ui/src/components/Link/TextLink.story.tsx
index a4dcdc74a3169..deeed326145d8 100644
--- a/packages/grafana-ui/src/components/Link/TextLink.story.tsx
+++ b/packages/grafana-ui/src/components/Link/TextLink.story.tsx
@@ -18,7 +18,10 @@ const meta: Meta = {
     controls: { exclude: ['href', 'external'] },
   },
   argTypes: {
-    variant: { control: 'select', options: ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'body', 'bodySmall', undefined] },
+    variant: {
+      control: 'select',
+      options: ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'body', 'bodySmall', undefined],
+    },
     weight: {
       control: 'select',
       options: ['bold', 'medium', 'light', 'regular', undefined],
@@ -30,10 +33,6 @@ const meta: Meta = {
     inline: { control: 'boolean' },
   },
   args: {
-    variant: 'body',
-    weight: 'light',
-    color: undefined,
-    inline: false,
     href: 'https://www.google.com',
     external: true,
     icon: 'external-link-alt',
diff --git a/packages/grafana-ui/src/components/Link/TextLink.test.tsx b/packages/grafana-ui/src/components/Link/TextLink.test.tsx
new file mode 100644
index 0000000000000..442bbcf10258b
--- /dev/null
+++ b/packages/grafana-ui/src/components/Link/TextLink.test.tsx
@@ -0,0 +1,52 @@
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+import { MemoryRouter } from 'react-router-dom';
+
+import { GrafanaConfig, locationUtil } from '@grafana/data';
+
+import { TextLink } from './TextLink';
+
+describe('TextLink', () => {
+  let windowSpy: jest.SpyInstance;
+
+  beforeAll(() => {
+    windowSpy = jest.spyOn(window, 'location', 'get');
+    windowSpy.mockImplementation(() => ({
+      origin: 'http://www.grafana.com',
+    }));
+  });
+
+  afterAll(() => {
+    windowSpy.mockRestore();
+  });
+
+  const link = 'http://www.grafana.com/grafana/after-sub-url';
+  it('should keep the whole url, including app sub url, if external', () => {
+    locationUtil.initialize({
+      config: { appSubUrl: '/grafana' } as GrafanaConfig,
+      getVariablesUrlParams: jest.fn(),
+      getTimeRangeForUrl: jest.fn(),
+    });
+
+    render(
+      <TextLink href={link} external>
+        Link to Grafana
+      </TextLink>
+    );
+    expect(screen.getByRole('link')).toHaveAttribute('href', link);
+  });
+  it('should turn it into a relative url, if not external', () => {
+    locationUtil.initialize({
+      config: { appSubUrl: '/grafana' } as GrafanaConfig,
+      getVariablesUrlParams: jest.fn(),
+      getTimeRangeForUrl: jest.fn(),
+    });
+
+    render(
+      <MemoryRouter>
+        <TextLink href={link}>Link to Grafana</TextLink>
+      </MemoryRouter>
+    );
+    expect(screen.getByRole('link')).toHaveAttribute('href', '/after-sub-url');
+  });
+});
diff --git a/packages/grafana-ui/src/components/Link/TextLink.tsx b/packages/grafana-ui/src/components/Link/TextLink.tsx
index b925308738a5c..2d5a253bee800 100644
--- a/packages/grafana-ui/src/components/Link/TextLink.tsx
+++ b/packages/grafana-ui/src/components/Link/TextLink.tsx
@@ -10,6 +10,8 @@ import { customWeight } from '../Text/utils';
 
 import { Link } from './Link';
 
+type TextLinkVariants = keyof Omit<ThemeTypographyVariantTypes, 'code'>;
+
 interface TextLinkProps extends Omit<AnchorHTMLAttributes<HTMLAnchorElement>, 'target' | 'rel'> {
   /** url to which redirect the user, external or internal */
   href: string;
@@ -19,8 +21,8 @@ interface TextLinkProps extends Omit<AnchorHTMLAttributes<HTMLAnchorElement>, 't
   external?: boolean;
   /** True when the link will be displayed inline with surrounding text, false if it will be displayed as a block. Depending on this prop correspondant default styles will be applied */
   inline?: boolean;
-  /** The default variant is 'body'. To fit another styles set the correspondent variant as it is necessary also to adjust the icon size */
-  variant?: keyof ThemeTypographyVariantTypes;
+  /** The default variant is 'body'. To fit another styles set the correspondent variant as it is necessary also to adjust the icon size. `code` is excluded, as it is not fit for links. */
+  variant?: TextLinkVariants;
   /** Override the default weight for the used variant */
   weight?: 'light' | 'regular' | 'medium' | 'bold';
   /** Set the icon to be shown. An external link will show the 'external-link-alt' icon as default.*/
@@ -29,7 +31,7 @@ interface TextLinkProps extends Omit<AnchorHTMLAttributes<HTMLAnchorElement>, 't
 }
 
 const svgSizes: {
-  [key in keyof ThemeTypographyVariantTypes]: IconSize;
+  [key in TextLinkVariants]: IconSize;
 } = {
   h1: 'xl',
   h2: 'xl',
@@ -46,19 +48,25 @@ export const TextLink = forwardRef<HTMLAnchorElement, TextLinkProps>(
     { href, color = 'link', external = false, inline = true, variant = 'body', weight, icon, children, ...rest },
     ref
   ) => {
-    const validUrl = locationUtil.stripBaseFromUrl(textUtil.sanitizeUrl(href ?? ''));
+    const validUrl = textUtil.sanitizeUrl(href ?? '');
 
     const theme = useTheme2();
     const styles = getLinkStyles(theme, inline, variant, weight, color);
     const externalIcon = icon || 'external-link-alt';
 
-    return external ? (
-      <a href={validUrl} ref={ref} {...rest} target="_blank" rel="noreferrer" className={styles}>
-        {children}
-        <Icon size={svgSizes[variant] || 'md'} name={externalIcon} />
-      </a>
-    ) : (
-      <Link ref={ref} href={validUrl} {...rest} className={styles}>
+    if (external) {
+      return (
+        <a href={validUrl} ref={ref} {...rest} target="_blank" rel="noreferrer" className={styles}>
+          {children}
+          <Icon size={svgSizes[variant] || 'md'} name={externalIcon} />
+        </a>
+      );
+    }
+
+    const strippedUrl = locationUtil.stripBaseFromUrl(validUrl);
+
+    return (
+      <Link ref={ref} href={strippedUrl} {...rest} className={styles}>
         {children}
         {icon && <Icon name={icon} size={svgSizes[variant] || 'md'} />}
       </Link>
diff --git a/packages/grafana-ui/src/components/MatchersUI/FieldNamePicker.tsx b/packages/grafana-ui/src/components/MatchersUI/FieldNamePicker.tsx
index 9c2f70dcfe2a5..0db0740945b0e 100644
--- a/packages/grafana-ui/src/components/MatchersUI/FieldNamePicker.tsx
+++ b/packages/grafana-ui/src/components/MatchersUI/FieldNamePicker.tsx
@@ -12,7 +12,7 @@ type Props = StandardEditorProps<string, FieldNamePickerConfigSettings>;
 export const FieldNamePicker = ({ value, onChange, context, item }: Props) => {
   const settings: FieldNamePickerConfigSettings = item.settings ?? {};
   const names = useFieldDisplayNames(context.data, settings?.filter);
-  const selectOptions = useSelectOptions(names, value);
+  const selectOptions = useSelectOptions(names, value, undefined, undefined, settings.baseNameMode);
 
   const onSelectChange = useCallback(
     (selection?: SelectableValue<string>) => {
diff --git a/packages/grafana-ui/src/components/MatchersUI/utils.ts b/packages/grafana-ui/src/components/MatchersUI/utils.ts
index c60679524a44e..d9806bac2b5cc 100644
--- a/packages/grafana-ui/src/components/MatchersUI/utils.ts
+++ b/packages/grafana-ui/src/components/MatchersUI/utils.ts
@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
 
-import { DataFrame, Field, getFieldDisplayName, SelectableValue } from '@grafana/data';
+import { DataFrame, Field, getFieldDisplayName, SelectableValue, FieldNamePickerBaseNameMode } from '@grafana/data';
 
 import { getFieldTypeIcon } from '../../types';
 
@@ -74,7 +74,8 @@ export function useSelectOptions(
   displayNames: FrameFieldsDisplayNames,
   currentName?: string,
   firstItem?: SelectableValue<string>,
-  fieldType?: string
+  fieldType?: string,
+  baseNameMode?: FieldNamePickerBaseNameMode
 ): Array<SelectableValue<string>> {
   return useMemo(() => {
     let found = false;
@@ -82,21 +83,8 @@ export function useSelectOptions(
     if (firstItem) {
       options.push(firstItem);
     }
-    for (const name of displayNames.display) {
-      if (!found && name === currentName) {
-        found = true;
-      }
-      const field = displayNames.fields.get(name);
-      if (!fieldType || fieldType === field?.type) {
-        options.push({
-          value: name,
-          label: name,
-          icon: field ? getFieldTypeIcon(field) : undefined,
-        });
-      }
-    }
-    for (const name of displayNames.raw) {
-      if (!displayNames.display.has(name)) {
+    if (baseNameMode === FieldNamePickerBaseNameMode.OnlyBaseNames) {
+      for (const name of displayNames.raw) {
         if (!found && name === currentName) {
           found = true;
         }
@@ -105,6 +93,34 @@ export function useSelectOptions(
           label: `${name} (base field name)`,
         });
       }
+    } else {
+      for (const name of displayNames.display) {
+        if (!found && name === currentName) {
+          found = true;
+        }
+        const field = displayNames.fields.get(name);
+        if (!fieldType || fieldType === field?.type) {
+          options.push({
+            value: name,
+            label: name,
+            icon: field ? getFieldTypeIcon(field) : undefined,
+          });
+        }
+      }
+
+      if (baseNameMode !== FieldNamePickerBaseNameMode.ExcludeBaseNames) {
+        for (const name of displayNames.raw) {
+          if (!displayNames.display.has(name)) {
+            if (!found && name === currentName) {
+              found = true;
+            }
+            options.push({
+              value: name,
+              label: `${name} (base field name)`,
+            });
+          }
+        }
+      }
     }
 
     if (currentName && !found) {
@@ -114,5 +130,5 @@ export function useSelectOptions(
       });
     }
     return options;
-  }, [displayNames, currentName, firstItem, fieldType]);
+  }, [displayNames, currentName, firstItem, fieldType, baseNameMode]);
 }
diff --git a/packages/grafana-ui/src/components/Menu/Menu.story.tsx b/packages/grafana-ui/src/components/Menu/Menu.story.tsx
index e3e0c597f5c6b..4a547fb84aebb 100644
--- a/packages/grafana-ui/src/components/Menu/Menu.story.tsx
+++ b/packages/grafana-ui/src/components/Menu/Menu.story.tsx
@@ -49,6 +49,42 @@ export function Examples() {
           <Menu.Item label="With destructive prop set" icon="trash-alt" destructive />
         </Menu>
       </StoryExample>
+      <StoryExample name="With item menu description">
+        <Menu>
+          <Menu.Item label="item1" icon="history" description="item 1 is an important element" shortcut="q p" />
+          <Menu.Item
+            label="Item with a very long title"
+            icon="apps"
+            description="long titles can be hard to read"
+            childItems={[
+              <Menu.Item key="subitem1" label="subitem1" icon="history" />,
+              <Menu.Item key="subitem2" label="subitem2" icon="apps" />,
+              <Menu.Item
+                key="subitem3"
+                label="subitem3"
+                icon="search-plus"
+                childItems={[
+                  <Menu.Item key="subitem1" label="subitem1" icon="history" />,
+                  <Menu.Item key="subitem2" label="subitem2" icon="apps" />,
+                  <Menu.Item key="subitem3" label="subitem3" icon="search-plus" />,
+                ]}
+              />,
+            ]}
+            shortcut="p s"
+          />
+          <Menu.Item
+            label="item3"
+            icon="filter"
+            description="item 3 is an important element"
+            childItems={[
+              <Menu.Item key="subitem1" label="subitem1" icon="history" description="a subitem with a description" />,
+              <Menu.Item key="subitem2" label="subitem2" icon="apps" />,
+              <Menu.Item key="subitem3" label="subitem3" icon="search-plus" />,
+            ]}
+          />
+        </Menu>
+      </StoryExample>
+
       <StoryExample name="With disabled items">
         <Menu>
           <Menu.Item label="Google" icon="search-plus" />
diff --git a/packages/grafana-ui/src/components/Menu/Menu.tsx b/packages/grafana-ui/src/components/Menu/Menu.tsx
index 4d52692fe6970..9dc03f1ee5505 100644
--- a/packages/grafana-ui/src/components/Menu/Menu.tsx
+++ b/packages/grafana-ui/src/components/Menu/Menu.tsx
@@ -4,6 +4,7 @@ import React, { useImperativeHandle, useRef } from 'react';
 import { GrafanaTheme2 } from '@grafana/data';
 
 import { useStyles2 } from '../../themes';
+import { Box } from '../Layout/Box/Box';
 
 import { MenuDivider } from './MenuDivider';
 import { MenuGroup } from './MenuGroup';
@@ -27,17 +28,22 @@ const MenuComp = React.forwardRef<HTMLDivElement, MenuProps>(
     const localRef = useRef<HTMLDivElement>(null);
     useImperativeHandle(forwardedRef, () => localRef.current!);
 
-    const [handleKeys] = useMenuFocus({ localRef, onOpen, onClose, onKeyDown });
+    const [handleKeys] = useMenuFocus({ isMenuOpen: true, localRef, onOpen, onClose, onKeyDown });
 
     return (
-      <div
+      <Box
         {...otherProps}
-        tabIndex={-1}
-        ref={localRef}
-        className={styles.wrapper}
-        role="menu"
         aria-label={ariaLabel}
+        backgroundColor="primary"
+        borderRadius="default"
+        boxShadow="z3"
+        display="inline-block"
         onKeyDown={handleKeys}
+        paddingX={0}
+        paddingY={0.5}
+        ref={localRef}
+        role="menu"
+        tabIndex={-1}
       >
         {header && (
           <div
@@ -50,7 +56,7 @@ const MenuComp = React.forwardRef<HTMLDivElement, MenuProps>(
           </div>
         )}
         {children}
-      </div>
+      </Box>
     );
   }
 );
@@ -66,17 +72,10 @@ export const Menu = Object.assign(MenuComp, {
 const getStyles = (theme: GrafanaTheme2) => {
   return {
     header: css({
-      padding: `${theme.spacing(0.5, 1, 1, 1)}`,
+      padding: theme.spacing(0.5, 1, 1, 1),
     }),
     headerBorder: css({
       borderBottom: `1px solid ${theme.colors.border.weak}`,
     }),
-    wrapper: css({
-      background: `${theme.colors.background.primary}`,
-      boxShadow: `${theme.shadows.z3}`,
-      display: `inline-block`,
-      borderRadius: `${theme.shape.radius.default}`,
-      padding: `${theme.spacing(0.5, 0)}`,
-    }),
   };
 };
diff --git a/packages/grafana-ui/src/components/Menu/MenuItem.test.tsx b/packages/grafana-ui/src/components/Menu/MenuItem.test.tsx
index 0a9c729903a21..cb64a4e960312 100644
--- a/packages/grafana-ui/src/components/Menu/MenuItem.test.tsx
+++ b/packages/grafana-ui/src/components/Menu/MenuItem.test.tsx
@@ -39,12 +39,12 @@ describe('MenuItem', () => {
     render(getMenuItem({ childItems }));
 
     expect(screen.getByLabelText(selectors.components.Menu.MenuItem('Test')).nodeName).toBe('DIV');
-    expect(screen.getByLabelText(selectors.components.Menu.SubMenu.icon)).toBeInTheDocument();
-    expect(screen.queryByLabelText(selectors.components.Menu.SubMenu.container)).not.toBeInTheDocument();
+    expect(screen.getByTestId(selectors.components.Menu.SubMenu.icon)).toBeInTheDocument();
+    expect(screen.queryByTestId(selectors.components.Menu.SubMenu.container)).not.toBeInTheDocument();
 
     fireEvent.mouseOver(screen.getByLabelText(selectors.components.Menu.MenuItem('Test')));
 
-    const subMenuContainer = await screen.findByLabelText(selectors.components.Menu.SubMenu.container);
+    const subMenuContainer = await screen.findByTestId(selectors.components.Menu.SubMenu.container);
 
     expect(subMenuContainer).toBeInTheDocument();
     expect(subMenuContainer.firstChild?.childNodes.length).toBe(2);
@@ -72,10 +72,10 @@ describe('MenuItem', () => {
 
     render(getMenuItem({ childItems }));
 
-    expect(screen.queryByLabelText(selectors.components.Menu.SubMenu.container)).not.toBeInTheDocument();
+    expect(screen.queryByTestId(selectors.components.Menu.SubMenu.container)).not.toBeInTheDocument();
 
     fireEvent.keyDown(screen.getByLabelText(selectors.components.Menu.MenuItem('Test')), { key: 'ArrowRight' });
 
-    expect(await screen.findByLabelText(selectors.components.Menu.SubMenu.container)).toBeInTheDocument();
+    expect(await screen.findByTestId(selectors.components.Menu.SubMenu.container)).toBeInTheDocument();
   });
 });
diff --git a/packages/grafana-ui/src/components/Menu/MenuItem.tsx b/packages/grafana-ui/src/components/Menu/MenuItem.tsx
index 74ef322bd43d4..b694764306419 100644
--- a/packages/grafana-ui/src/components/Menu/MenuItem.tsx
+++ b/packages/grafana-ui/src/components/Menu/MenuItem.tsx
@@ -7,6 +7,7 @@ import { useStyles2 } from '../../themes';
 import { getFocusStyles } from '../../themes/mixins';
 import { IconName } from '../../types/icon';
 import { Icon } from '../Icon/Icon';
+import { Stack } from '../Layout/Stack/Stack';
 
 import { SubMenu } from './SubMenu';
 
@@ -17,6 +18,8 @@ export type MenuItemElement = HTMLAnchorElement & HTMLButtonElement & HTMLDivEle
 export interface MenuItemProps<T = unknown> {
   /** Label of the menu item */
   label: string;
+  /** Description of item */
+  description?: string;
   /** Aria label for accessibility support */
   ariaLabel?: string;
   /** Aria checked for accessibility support */
@@ -57,6 +60,7 @@ export const MenuItem = React.memo(
       url,
       icon,
       label,
+      description,
       ariaLabel,
       ariaChecked,
       target,
@@ -75,7 +79,6 @@ export const MenuItem = React.memo(
     const styles = useStyles2(getStyles);
     const [isActive, setIsActive] = useState(active);
     const [isSubMenuOpen, setIsSubMenuOpen] = useState(false);
-    const [openedWithArrow, setOpenedWithArrow] = useState(false);
     const onMouseEnter = useCallback(() => {
       if (disabled) {
         return;
@@ -104,6 +107,7 @@ export const MenuItem = React.memo(
       },
       className
     );
+
     const disabledProps = {
       [ItemElement === 'button' ? 'disabled' : 'aria-disabled']: disabled,
       ...(ItemElement === 'a' && disabled && { href: undefined, onClick: undefined }),
@@ -123,7 +127,6 @@ export const MenuItem = React.memo(
           event.stopPropagation();
           if (hasSubMenu) {
             setIsSubMenuOpen(true);
-            setOpenedWithArrow(true);
             setIsActive(true);
           }
           break;
@@ -159,10 +162,9 @@ export const MenuItem = React.memo(
         tabIndex={tabIndex}
         {...disabledProps}
       >
-        <>
+        <Stack direction="row" justifyContent="flex-start" alignItems="center">
           {icon && <Icon name={icon} className={styles.icon} aria-hidden />}
-          {label}
-
+          <span className={styles.ellipsis}>{label}</span>
           <div className={cx(styles.rightWrapper, { [styles.withShortcut]: hasShortcut })}>
             {hasShortcut && (
               <div className={styles.shortcut}>
@@ -174,14 +176,21 @@ export const MenuItem = React.memo(
               <SubMenu
                 items={childItems}
                 isOpen={isSubMenuOpen}
-                openedWithArrow={openedWithArrow}
-                setOpenedWithArrow={setOpenedWithArrow}
                 close={closeSubMenu}
                 customStyle={customSubMenuContainerStyles}
               />
             )}
           </div>
-        </>
+        </Stack>
+        {description && (
+          <div
+            className={cx(styles.description, styles.ellipsis, {
+              [styles.descriptionWithIcon]: icon !== undefined,
+            })}
+          >
+            {description}
+          </div>
+        )}
       </ItemElement>
     );
   })
@@ -197,7 +206,8 @@ const getStyles = (theme: GrafanaTheme2) => {
       whiteSpace: 'nowrap',
       color: theme.colors.text.primary,
       display: 'flex',
-      alignItems: 'center',
+      flexDirection: 'column',
+      alignItems: 'stretch',
       padding: theme.spacing(0.5, 2),
       minHeight: theme.spacing(4),
       margin: 0,
@@ -205,7 +215,7 @@ const getStyles = (theme: GrafanaTheme2) => {
       width: '100%',
       position: 'relative',
 
-      '&:hover, &:focus, &:focus-visible': {
+      '&:hover, &:focus-visible': {
         background: theme.colors.action.hover,
         color: theme.colors.text.primary,
         textDecoration: 'none',
@@ -234,7 +244,7 @@ const getStyles = (theme: GrafanaTheme2) => {
     }),
     disabled: css({
       color: theme.colors.action.disabledText,
-
+      label: 'menu-item-disabled',
       '&:hover, &:focus, &:focus-visible': {
         cursor: 'not-allowed',
         background: 'none',
@@ -243,8 +253,6 @@ const getStyles = (theme: GrafanaTheme2) => {
     }),
     icon: css({
       opacity: 0.7,
-      marginRight: '10px',
-      marginLeft: '-4px',
       color: theme.colors.text.secondary,
     }),
     rightWrapper: css({
@@ -252,9 +260,6 @@ const getStyles = (theme: GrafanaTheme2) => {
       alignItems: 'center',
       marginLeft: 'auto',
     }),
-    shortcutIcon: css({
-      marginRight: theme.spacing(1),
-    }),
     withShortcut: css({
       minWidth: theme.spacing(10.5),
     }),
@@ -266,5 +271,18 @@ const getStyles = (theme: GrafanaTheme2) => {
       color: theme.colors.text.secondary,
       opacity: 0.7,
     }),
+    description: css({
+      ...theme.typography.bodySmall,
+      color: theme.colors.text.secondary,
+      textAlign: 'start',
+    }),
+    descriptionWithIcon: css({
+      marginLeft: theme.spacing(3),
+    }),
+    ellipsis: css({
+      overflow: 'hidden',
+      textOverflow: 'ellipsis',
+      whiteSpace: 'nowrap',
+    }),
   };
 };
diff --git a/packages/grafana-ui/src/components/Menu/SubMenu.test.tsx b/packages/grafana-ui/src/components/Menu/SubMenu.test.tsx
index a7785fe8974c4..b86d43e5e3461 100644
--- a/packages/grafana-ui/src/components/Menu/SubMenu.test.tsx
+++ b/packages/grafana-ui/src/components/Menu/SubMenu.test.tsx
@@ -13,13 +13,11 @@ describe('SubMenu', () => {
       <MenuItem key="subitem2" label="subitem2" icon="apps" />,
     ];
 
-    render(
-      <SubMenu items={items} isOpen={true} openedWithArrow={false} setOpenedWithArrow={jest.fn()} close={jest.fn()} />
-    );
+    render(<SubMenu items={items} isOpen={true} close={jest.fn()} />);
 
-    expect(screen.getByLabelText(selectors.components.Menu.SubMenu.icon)).toBeInTheDocument();
+    expect(screen.getByTestId(selectors.components.Menu.SubMenu.icon)).toBeInTheDocument();
 
-    const subMenuContainer = await screen.findByLabelText(selectors.components.Menu.SubMenu.container);
+    const subMenuContainer = await screen.findByTestId(selectors.components.Menu.SubMenu.container);
 
     expect(subMenuContainer).toBeInTheDocument();
     expect(subMenuContainer.firstChild?.childNodes.length).toBe(2);
diff --git a/packages/grafana-ui/src/components/Menu/SubMenu.tsx b/packages/grafana-ui/src/components/Menu/SubMenu.tsx
index 03b9229b1bff9..50b4982887407 100644
--- a/packages/grafana-ui/src/components/Menu/SubMenu.tsx
+++ b/packages/grafana-ui/src/components/Menu/SubMenu.tsx
@@ -17,10 +17,6 @@ export interface SubMenuProps {
   items?: Array<ReactElement<MenuItemProps>>;
   /** Open */
   isOpen: boolean;
-  /** Marks whether subMenu was opened with arrow */
-  openedWithArrow: boolean;
-  /** Changes value of openedWithArrow */
-  setOpenedWithArrow: (openedWithArrow: boolean) => void;
   /** Closes the subMenu */
   close: () => void;
   /** Custom style */
@@ -28,46 +24,42 @@ export interface SubMenuProps {
 }
 
 /** @internal */
-export const SubMenu = React.memo(
-  ({ items, isOpen, openedWithArrow, setOpenedWithArrow, close, customStyle }: SubMenuProps) => {
-    const styles = useStyles2(getStyles);
-    const localRef = useRef<HTMLDivElement>(null);
-    const [handleKeys] = useMenuFocus({
-      localRef,
-      isMenuOpen: isOpen,
-      openedWithArrow,
-      setOpenedWithArrow,
-      close,
-    });
+export const SubMenu = React.memo(({ items, isOpen, close, customStyle }: SubMenuProps) => {
+  const styles = useStyles2(getStyles);
+  const localRef = useRef<HTMLDivElement>(null);
+  const [handleKeys] = useMenuFocus({
+    localRef,
+    isMenuOpen: isOpen,
+    close,
+  });
 
-    const [pushLeft, setPushLeft] = useState(false);
-    useEffect(() => {
-      if (isOpen && localRef.current) {
-        setPushLeft(isElementOverflowing(localRef.current));
-      }
-    }, [isOpen]);
+  const [pushLeft, setPushLeft] = useState(false);
+  useEffect(() => {
+    if (isOpen && localRef.current) {
+      setPushLeft(isElementOverflowing(localRef.current));
+    }
+  }, [isOpen]);
 
-    return (
-      <>
-        <div className={styles.iconWrapper} aria-label={selectors.components.Menu.SubMenu.icon}>
-          <Icon name="angle-right" className={styles.icon} aria-hidden />
-        </div>
-        {isOpen && (
-          <div
-            ref={localRef}
-            className={cx(styles.subMenu, { [styles.pushLeft]: pushLeft })}
-            aria-label={selectors.components.Menu.SubMenu.container}
-            style={customStyle}
-          >
-            <div tabIndex={-1} className={styles.itemsWrapper} role="menu" onKeyDown={handleKeys}>
-              {items}
-            </div>
+  return (
+    <>
+      <div className={styles.iconWrapper} aria-hidden data-testid={selectors.components.Menu.SubMenu.icon}>
+        <Icon name="angle-right" className={styles.icon} />
+      </div>
+      {isOpen && (
+        <div
+          ref={localRef}
+          className={cx(styles.subMenu, { [styles.pushLeft]: pushLeft })}
+          data-testid={selectors.components.Menu.SubMenu.container}
+          style={customStyle}
+        >
+          <div tabIndex={-1} className={styles.itemsWrapper} role="menu" onKeyDown={handleKeys}>
+            {items}
           </div>
-        )}
-      </>
-    );
-  }
-);
+        </div>
+      )}
+    </>
+  );
+});
 
 SubMenu.displayName = 'SubMenu';
 
diff --git a/packages/grafana-ui/src/components/Menu/hooks.test.tsx b/packages/grafana-ui/src/components/Menu/hooks.test.tsx
index 254f41c7a8a40..4ca9e69045c8b 100644
--- a/packages/grafana-ui/src/components/Menu/hooks.test.tsx
+++ b/packages/grafana-ui/src/components/Menu/hooks.test.tsx
@@ -141,18 +141,15 @@ describe('useMenuFocus', () => {
     expect(onKeyDown).toHaveBeenCalledTimes(2);
   });
 
-  it('focuses on first item when menu was opened with arrow', () => {
+  it('focuses on first item', () => {
     const ref = createRef<HTMLDivElement>();
 
     render(getMenuElement(ref));
 
     const isMenuOpen = true;
-    const openedWithArrow = true;
-    const setOpenedWithArrow = jest.fn();
-    renderHook(() => useMenuFocus({ localRef: ref, isMenuOpen, openedWithArrow, setOpenedWithArrow }));
+    renderHook(() => useMenuFocus({ localRef: ref, isMenuOpen }));
 
     expect(screen.getByText('Item 1').tabIndex).toBe(0);
-    expect(setOpenedWithArrow).toHaveBeenCalledWith(false);
   });
 
   it('clicks focused item when Enter key is pressed', () => {
diff --git a/packages/grafana-ui/src/components/Menu/hooks.ts b/packages/grafana-ui/src/components/Menu/hooks.ts
index 6713535827ad1..b6111f9804f35 100644
--- a/packages/grafana-ui/src/components/Menu/hooks.ts
+++ b/packages/grafana-ui/src/components/Menu/hooks.ts
@@ -8,8 +8,6 @@ const UNFOCUSED = -1;
 export interface UseMenuFocusProps {
   localRef: RefObject<HTMLDivElement>;
   isMenuOpen?: boolean;
-  openedWithArrow?: boolean;
-  setOpenedWithArrow?: (openedWithArrow: boolean) => void;
   close?: () => void;
   onOpen?: (focusOnItem: (itemId: number) => void) => void;
   onClose?: () => void;
@@ -23,8 +21,6 @@ export type UseMenuFocusReturn = [(event: React.KeyboardEvent) => void];
 export const useMenuFocus = ({
   localRef,
   isMenuOpen,
-  openedWithArrow,
-  setOpenedWithArrow,
   close,
   onOpen,
   onClose,
@@ -33,11 +29,10 @@ export const useMenuFocus = ({
   const [focusedItem, setFocusedItem] = useState(UNFOCUSED);
 
   useEffect(() => {
-    if (isMenuOpen && openedWithArrow) {
+    if (isMenuOpen) {
       setFocusedItem(0);
-      setOpenedWithArrow?.(false);
     }
-  }, [isMenuOpen, openedWithArrow, setOpenedWithArrow]);
+  }, [isMenuOpen]);
 
   useEffect(() => {
     const menuItems = localRef?.current?.querySelectorAll<HTMLElement | HTMLButtonElement | HTMLAnchorElement>(
diff --git a/packages/grafana-ui/src/components/Modal/Modal.tsx b/packages/grafana-ui/src/components/Modal/Modal.tsx
index 53040b267d66b..cacd311585a03 100644
--- a/packages/grafana-ui/src/components/Modal/Modal.tsx
+++ b/packages/grafana-ui/src/components/Modal/Modal.tsx
@@ -4,7 +4,7 @@ import { FocusScope } from '@react-aria/focus';
 import { OverlayContainer, useOverlay } from '@react-aria/overlays';
 import React, { PropsWithChildren, useRef } from 'react';
 
-import { useTheme2 } from '../../themes';
+import { useStyles2 } from '../../themes';
 import { IconName } from '../../types';
 import { t } from '../../utils/i18n';
 import { IconButton } from '../IconButton/IconButton';
@@ -46,8 +46,7 @@ export function Modal(props: PropsWithChildren<Props>) {
     onClickBackdrop,
     trapFocus = true,
   } = props;
-  const theme = useTheme2();
-  const styles = getModalStyles(theme);
+  const styles = useStyles2(getModalStyles);
 
   const ref = useRef<HTMLDivElement>(null);
 
@@ -89,7 +88,7 @@ export function Modal(props: PropsWithChildren<Props>) {
                 name="times"
                 size="xl"
                 onClick={onDismiss}
-                tooltip={t('grafana-ui.modal.close-tooltip', 'Close')}
+                aria-label={t('grafana-ui.modal.close-tooltip', 'Close')}
               />
             </div>
           </div>
@@ -101,8 +100,7 @@ export function Modal(props: PropsWithChildren<Props>) {
 }
 
 function ModalButtonRow({ leftItems, children }: { leftItems?: React.ReactNode; children: React.ReactNode }) {
-  const theme = useTheme2();
-  const styles = getModalStyles(theme);
+  const styles = useStyles2(getModalStyles);
 
   if (leftItems) {
     return (
diff --git a/packages/grafana-ui/src/components/Modal/ModalsContext.tsx b/packages/grafana-ui/src/components/Modal/ModalsContext.tsx
index d2841532942db..aa69fc4ed5277 100644
--- a/packages/grafana-ui/src/components/Modal/ModalsContext.tsx
+++ b/packages/grafana-ui/src/components/Modal/ModalsContext.tsx
@@ -22,6 +22,10 @@ interface ModalsProviderProps {
   props?: any;
 }
 
+/**
+ * @deprecated.
+ * Not the real implementation used by core.
+ */
 export class ModalsProvider extends Component<ModalsProviderProps, ModalsContextState> {
   constructor(props: ModalsProviderProps) {
     super(props);
diff --git a/packages/grafana-ui/src/components/Modal/getModalStyles.ts b/packages/grafana-ui/src/components/Modal/getModalStyles.ts
index c9b115736da61..ede316fbd3211 100644
--- a/packages/grafana-ui/src/components/Modal/getModalStyles.ts
+++ b/packages/grafana-ui/src/components/Modal/getModalStyles.ts
@@ -2,9 +2,7 @@ import { css } from '@emotion/css';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
-import { stylesFactory } from '../../themes';
-
-export const getModalStyles = stylesFactory((theme: GrafanaTheme2) => {
+export const getModalStyles = (theme: GrafanaTheme2) => {
   const borderRadius = theme.shape.radius.default;
 
   return {
@@ -80,4 +78,4 @@ export const getModalStyles = stylesFactory((theme: GrafanaTheme2) => {
       paddingTop: theme.spacing(3),
     }),
   };
-});
+};
diff --git a/packages/grafana-ui/src/components/Monaco/CodeEditor.tsx b/packages/grafana-ui/src/components/Monaco/CodeEditor.tsx
index d995299ddc328..7ab4854ec2c0e 100644
--- a/packages/grafana-ui/src/components/Monaco/CodeEditor.tsx
+++ b/packages/grafana-ui/src/components/Monaco/CodeEditor.tsx
@@ -27,6 +27,8 @@ class UnthemedCodeEditor extends PureComponent<Props> {
     if (this.completionCancel) {
       this.completionCancel.dispose();
     }
+
+    this.props.onEditorWillUnmount?.();
   }
 
   componentDidUpdate(oldProps: Props) {
@@ -77,6 +79,13 @@ class UnthemedCodeEditor extends PureComponent<Props> {
     }
   };
 
+  onFocus = () => {
+    const { onFocus } = this.props;
+    if (onFocus) {
+      onFocus(this.getEditorValue());
+    }
+  };
+
   onSave = () => {
     const { onSave } = this.props;
     if (onSave) {
@@ -110,14 +119,12 @@ class UnthemedCodeEditor extends PureComponent<Props> {
       }
     });
 
-    const languagePromise = this.loadCustomLanguage();
-
     if (onChange) {
       editor.getModel()?.onDidChangeContent(() => onChange(editor.getValue()));
     }
 
     if (onEditorDidMount) {
-      languagePromise.then(() => onEditorDidMount(editor, monaco));
+      onEditorDidMount(editor, monaco);
     }
   };
 
@@ -164,7 +171,12 @@ class UnthemedCodeEditor extends PureComponent<Props> {
     }
 
     return (
-      <div className={containerStyles} onBlur={this.onBlur} data-testid={selectors.components.CodeEditor.container}>
+      <div
+        className={containerStyles}
+        onFocus={this.onFocus}
+        onBlur={this.onBlur}
+        data-testid={selectors.components.CodeEditor.container}
+      >
         <ReactMonacoEditorLazy
           width={width}
           height={height}
diff --git a/packages/grafana-ui/src/components/Monaco/ReactMonacoEditor.tsx b/packages/grafana-ui/src/components/Monaco/ReactMonacoEditor.tsx
index a6db1ce5fc346..0f0ab1b3ee31a 100644
--- a/packages/grafana-ui/src/components/Monaco/ReactMonacoEditor.tsx
+++ b/packages/grafana-ui/src/components/Monaco/ReactMonacoEditor.tsx
@@ -1,4 +1,5 @@
-import MonacoEditor, { loader as monacoEditorLoader, Monaco } from '@monaco-editor/react';
+import Editor, { loader as monacoEditorLoader, Monaco } from '@monaco-editor/react';
+import * as monaco from 'monaco-editor';
 import React, { useCallback } from 'react';
 
 import { useTheme2 } from '../../themes';
@@ -6,11 +7,8 @@ import { useTheme2 } from '../../themes';
 import defineThemes from './theme';
 import type { ReactMonacoEditorProps } from './types';
 
-monacoEditorLoader.config({
-  paths: {
-    vs: (window.__grafana_public_path__ ?? 'public/') + 'lib/monaco/min/vs',
-  },
-});
+// pass the monaco editor to the loader to bypass requirejs
+monacoEditorLoader.config({ monaco });
 
 export const ReactMonacoEditor = (props: ReactMonacoEditorProps) => {
   const { beforeMount } = props;
@@ -25,10 +23,6 @@ export const ReactMonacoEditor = (props: ReactMonacoEditorProps) => {
   );
 
   return (
-    <MonacoEditor
-      {...props}
-      theme={theme.isDark ? 'grafana-dark' : 'grafana-light'}
-      beforeMount={onMonacoBeforeMount}
-    />
+    <Editor {...props} theme={theme.isDark ? 'grafana-dark' : 'grafana-light'} beforeMount={onMonacoBeforeMount} />
   );
 };
diff --git a/packages/grafana-ui/src/components/Monaco/types.ts b/packages/grafana-ui/src/components/Monaco/types.ts
index 79a21a394f80a..d41fcbe13d305 100644
--- a/packages/grafana-ui/src/components/Monaco/types.ts
+++ b/packages/grafana-ui/src/components/Monaco/types.ts
@@ -39,9 +39,15 @@ export interface CodeEditorProps {
    */
   onEditorDidMount?: (editor: MonacoEditor, monaco: Monaco) => void;
 
+  /** Callback before the edior has unmounted */
+  onEditorWillUnmount?: () => void;
+
   /** Handler to be performed when editor is blurred */
   onBlur?: CodeEditorChangeHandler;
 
+  /** Handler to be performed when editor is focused */
+  onFocus?: CodeEditorChangeHandler;
+
   /** Handler to be performed whenever the text inside the editor changes */
   onChange?: CodeEditorChangeHandler;
 
diff --git a/packages/grafana-ui/src/components/PageLayout/PageToolbar.tsx b/packages/grafana-ui/src/components/PageLayout/PageToolbar.tsx
index c7d70c4918803..3d9e76057507f 100644
--- a/packages/grafana-ui/src/components/PageLayout/PageToolbar.tsx
+++ b/packages/grafana-ui/src/components/PageLayout/PageToolbar.tsx
@@ -92,7 +92,7 @@ export const PageToolbar = React.memo(
                 tooltip="Go back (Esc)"
                 tooltipPlacement="bottom"
                 size="xxl"
-                aria-label={selectors.components.BackButton.backArrow}
+                data-testid={selectors.components.BackButton.backArrow}
                 onClick={onGoBack}
               />
             </div>
diff --git a/packages/grafana-ui/src/components/PanelChrome/LoadingIndicator.tsx b/packages/grafana-ui/src/components/PanelChrome/LoadingIndicator.tsx
index e597c17ca3e5f..77255379cdaf1 100644
--- a/packages/grafana-ui/src/components/PanelChrome/LoadingIndicator.tsx
+++ b/packages/grafana-ui/src/components/PanelChrome/LoadingIndicator.tsx
@@ -32,7 +32,7 @@ export const LoadingIndicator = ({ onCancel, loading }: LoadingIndicatorProps) =
         name="sync"
         size="sm"
         onClick={onCancel}
-        aria-label={selectors.components.LoadingIndicator.icon}
+        data-testid={selectors.components.LoadingIndicator.icon}
       />
     </Tooltip>
   );
diff --git a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.story.tsx b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.story.tsx
index b0ef4858be14c..16ed96da300c0 100644
--- a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.story.tsx
+++ b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.story.tsx
@@ -51,7 +51,7 @@ function renderPanel(name: string, overrides?: Partial<PanelChromeProps>) {
 
   return (
     <PanelChrome {...props}>
-      {(innerWidth, innerHeight) => {
+      {(innerWidth: number, innerHeight: number) => {
         return <div style={{ width: innerWidth, height: innerHeight, ...contentStyle }}>{name}</div>;
       }}
     </PanelChrome>
@@ -75,7 +75,7 @@ function renderCollapsiblePanel(name: string, overrides?: Partial<PanelChromePro
 
     return (
       <PanelChrome {...props} collapsed={collapsed} onToggleCollapse={toggleCollapsed}>
-        {(innerWidth, innerHeight) => {
+        {(innerWidth: number, innerHeight: number) => {
           return <div style={{ width: innerWidth, height: innerHeight, ...contentStyle }}>{name}</div>;
         }}
       </PanelChrome>
diff --git a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx
index 474ace6c3efb0..4f4d690a42d04 100644
--- a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx
+++ b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx
@@ -25,7 +25,7 @@ export type PanelChromeProps = (AutoSize | FixedDimensions) & (Collapsible | Hov
 
 interface BaseProps {
   padding?: PanelPadding;
-  title?: string;
+  title?: string | React.ReactElement;
   description?: string | (() => string);
   titleItems?: ReactNode;
   menu?: ReactElement | (() => ReactElement);
@@ -161,13 +161,13 @@ export function PanelChrome({
     actions = leftItems;
   }
 
-  const testid = title ? selectors.components.Panels.Panel.title(title) : 'Panel';
+  const testid = typeof title === 'string' ? selectors.components.Panels.Panel.title(title) : 'Panel';
 
   const headerContent = (
     <>
       {/* Non collapsible title */}
       {!collapsible && title && (
-        <h6 title={title} className={styles.title}>
+        <h6 title={typeof title === 'string' ? title : undefined} className={styles.title}>
           {title}
         </h6>
       )}
@@ -246,7 +246,7 @@ export function PanelChrome({
         <>
           <HoverWidget
             menu={menu}
-            title={title}
+            title={typeof title === 'string' ? title : undefined}
             offset={hoverHeaderOffset}
             dragClass={dragClass}
             onOpenMenu={onOpenMenu}
@@ -275,7 +275,7 @@ export function PanelChrome({
           {menu && (
             <PanelMenu
               menu={menu}
-              title={title}
+              title={typeof title === 'string' ? title : undefined}
               placement="bottom-end"
               menuButtonClass={cx(styles.menuItem, dragClassCancel, showOnHoverClass)}
               onOpenMenu={onOpenMenu}
@@ -358,15 +358,6 @@ const getStyles = (theme: GrafanaTheme2) => {
       display: 'flex',
       flexDirection: 'column',
 
-      '> *': {
-        zIndex: 0,
-      },
-
-      // matches .react-grid-item styles in _dashboard_grid.scss to ensure any contained tooltips occlude adjacent panels
-      '&:hover, &:active, &:focus': {
-        zIndex: theme.zIndex.activePanel,
-      },
-
       '.show-on-hover': {
         opacity: '0',
         visibility: 'hidden',
@@ -465,7 +456,7 @@ const getStyles = (theme: GrafanaTheme2) => {
       position: 'absolute',
       left: 0,
       top: 0,
-      zIndex: theme.zIndex.tooltip,
+      zIndex: 1,
     }),
     rightActions: css({
       display: 'flex',
diff --git a/packages/grafana-ui/src/components/PanelChrome/PanelContext.ts b/packages/grafana-ui/src/components/PanelChrome/PanelContext.ts
index ede3ffbe4ebd3..8159f3a5a4a63 100644
--- a/packages/grafana-ui/src/components/PanelChrome/PanelContext.ts
+++ b/packages/grafana-ui/src/components/PanelChrome/PanelContext.ts
@@ -6,7 +6,6 @@ import {
   DashboardCursorSync,
   AnnotationEventUIModel,
   ThresholdsConfig,
-  SplitOpen,
   CoreApp,
   DataFrame,
   DataLinkPostProcessor,
@@ -70,13 +69,6 @@ export interface PanelContext {
    */
   onThresholdsChange?: (thresholds: ThresholdsConfig) => void;
 
-  /**
-   * onSplitOpen is used in Explore to open the split view. It can be used in panels which has intercations and used in Explore as well.
-   * For example TimeSeries panel.
-   * @deprecated will be removed in the future. It's not needed as visualization can just field.getLinks now
-   */
-  onSplitOpen?: SplitOpen;
-
   /** For instance state that can be shared between panel & options UI  */
   instanceState?: any;
 
diff --git a/packages/grafana-ui/src/components/Portal/Portal.tsx b/packages/grafana-ui/src/components/Portal/Portal.tsx
index 0e00c7b202519..aa6f309bb0763 100644
--- a/packages/grafana-ui/src/components/Portal/Portal.tsx
+++ b/packages/grafana-ui/src/components/Portal/Portal.tsx
@@ -9,7 +9,7 @@ interface Props {
   forwardedRef?: React.ForwardedRef<HTMLDivElement>;
 }
 
-export function Portal(props: PropsWithChildren<Props>) {
+export function Portal(props: PropsWithChildren<Props>): JSX.Element {
   const { children, className, root, forwardedRef } = props;
   const theme = useTheme2();
   const node = useRef<HTMLDivElement | null>(null);
diff --git a/packages/grafana-ui/src/components/QueryField/QueryField.tsx b/packages/grafana-ui/src/components/QueryField/QueryField.tsx
index 040e265df4651..d42fa8ab3b8ec 100644
--- a/packages/grafana-ui/src/components/QueryField/QueryField.tsx
+++ b/packages/grafana-ui/src/components/QueryField/QueryField.tsx
@@ -210,7 +210,7 @@ export class UnThemedQueryField extends PureComponent<QueryFieldProps, QueryFiel
 
     return (
       <div className={cx(wrapperClassName, styles.wrapper)}>
-        <div className="slate-query-field" aria-label={selectors.components.QueryField.container}>
+        <div className="slate-query-field" data-testid={selectors.components.QueryField.container}>
           <Editor
             ref={(editor) => (this.editor = editor!)}
             schema={SCHEMA}
diff --git a/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.tsx b/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.tsx
index 1ea9e8e216325..7420a8034e0d0 100644
--- a/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.tsx
+++ b/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.tsx
@@ -1,4 +1,4 @@
-import formatDuration from 'date-fns/formatDuration';
+import { formatDuration } from 'date-fns';
 import React, { PureComponent } from 'react';
 
 import { SelectableValue, parseDuration } from '@grafana/data';
diff --git a/packages/grafana-ui/src/components/SecretInput/SecretInput.tsx b/packages/grafana-ui/src/components/SecretInput/SecretInput.tsx
index b996cf70236dd..da7dc303264b9 100644
--- a/packages/grafana-ui/src/components/SecretInput/SecretInput.tsx
+++ b/packages/grafana-ui/src/components/SecretInput/SecretInput.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 
 import { Button } from '../Button';
 import { Input } from '../Input/Input';
-import { HorizontalGroup } from '../Layout/Layout';
+import { Stack } from '../Layout/Stack/Stack';
 
 export type Props = React.ComponentProps<typeof Input> & {
   /** TRUE if the secret was already configured. (It is needed as often the backend doesn't send back the actual secret, only the information that it was configured) */
@@ -15,13 +15,15 @@ export const CONFIGURED_TEXT = 'configured';
 export const RESET_BUTTON_TEXT = 'Reset';
 
 export const SecretInput = ({ isConfigured, onReset, ...props }: Props) => (
-  <HorizontalGroup>
+  <Stack>
     {!isConfigured && <Input {...props} type="password" />}
-    {isConfigured && <Input {...props} type="text" disabled={true} value={CONFIGURED_TEXT} />}
     {isConfigured && (
-      <Button onClick={onReset} variant="secondary">
-        {RESET_BUTTON_TEXT}
-      </Button>
+      <>
+        <Input {...props} type="text" disabled={true} value={CONFIGURED_TEXT} />
+        <Button onClick={onReset} variant="secondary">
+          {RESET_BUTTON_TEXT}
+        </Button>
+      </>
     )}
-  </HorizontalGroup>
+  </Stack>
 );
diff --git a/packages/grafana-ui/src/components/Segment/Segment.story.tsx b/packages/grafana-ui/src/components/Segment/Segment.story.tsx
index c17f6729d3d57..771fc011ba7af 100644
--- a/packages/grafana-ui/src/components/Segment/Segment.story.tsx
+++ b/packages/grafana-ui/src/components/Segment/Segment.story.tsx
@@ -33,7 +33,7 @@ const SegmentFrame = ({
   children: React.ReactNode;
 }) => (
   <>
-    <SegmentSection label="Segment Name">
+    <SegmentSection label="Segment">
       {children}
       <Segment Component={AddButton} onChange={({ value }) => action('New value added')(value)} options={options} />
     </SegmentSection>
diff --git a/packages/grafana-ui/src/components/Segment/SegmentAsync.story.tsx b/packages/grafana-ui/src/components/Segment/SegmentAsync.story.tsx
index 918a5af232f79..edf49d2564729 100644
--- a/packages/grafana-ui/src/components/Segment/SegmentAsync.story.tsx
+++ b/packages/grafana-ui/src/components/Segment/SegmentAsync.story.tsx
@@ -29,12 +29,13 @@ const SegmentFrame = ({
   loadOptions: (options: Array<SelectableValue<string>>) => Promise<Array<SelectableValue<string>>>;
 }>) => (
   <>
-    <SegmentSection label="Segment Name">
+    <SegmentSection label="Segment">
       {children}
       <SegmentAsync
         Component={AddButton}
         onChange={(value) => action('New value added')(value)}
         loadOptions={() => loadOptions(options)}
+        inputMinWidth={100}
       />
     </SegmentSection>
   </>
diff --git a/packages/grafana-ui/src/components/Segment/SegmentInput.story.tsx b/packages/grafana-ui/src/components/Segment/SegmentInput.story.tsx
index 0f596e5f33444..85e9122ef4f94 100644
--- a/packages/grafana-ui/src/components/Segment/SegmentInput.story.tsx
+++ b/packages/grafana-ui/src/components/Segment/SegmentInput.story.tsx
@@ -8,7 +8,7 @@ import { SegmentInputProps } from './SegmentInput';
 
 const SegmentFrame = ({ children }: React.PropsWithChildren) => (
   <>
-    <SegmentSection label="Segment Name">{children}</SegmentSection>
+    <SegmentSection label="Segment">{children}</SegmentSection>
   </>
 );
 
diff --git a/packages/grafana-ui/src/components/Select/DropdownIndicator.tsx b/packages/grafana-ui/src/components/Select/DropdownIndicator.tsx
index e54058ff53f8a..5e56ce531d65b 100644
--- a/packages/grafana-ui/src/components/Select/DropdownIndicator.tsx
+++ b/packages/grafana-ui/src/components/Select/DropdownIndicator.tsx
@@ -1,13 +1,11 @@
 import React from 'react';
+import { DropdownIndicatorProps } from 'react-select';
 
 import { Icon } from '../Icon/Icon';
 
-interface DropdownIndicatorProps {
-  isOpen: boolean;
-}
-
-export const DropdownIndicator = ({ isOpen }: DropdownIndicatorProps) => {
+export function DropdownIndicator({ selectProps }: DropdownIndicatorProps) {
+  const isOpen = selectProps.menuIsOpen;
   const icon = isOpen ? 'search' : 'angle-down';
   const size = isOpen ? 'sm' : 'md';
   return <Icon name={icon} size={size} />;
-};
+}
diff --git a/packages/grafana-ui/src/components/Select/InputControl.tsx b/packages/grafana-ui/src/components/Select/InputControl.tsx
index 14b979ed8d84f..c4a3e4b90f281 100644
--- a/packages/grafana-ui/src/components/Select/InputControl.tsx
+++ b/packages/grafana-ui/src/components/Select/InputControl.tsx
@@ -3,8 +3,7 @@ import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
-import { stylesFactory } from '../../themes';
-import { useTheme2 } from '../../themes/ThemeContext';
+import { useStyles2 } from '../../themes/ThemeContext';
 import { inputPadding } from '../Forms/commonStyles';
 import { getInputStyles } from '../Input/Input';
 
@@ -17,7 +16,20 @@ interface InputControlProps {
   innerProps: JSX.IntrinsicElements['div'];
 }
 
-const getInputControlStyles = stylesFactory((theme: GrafanaTheme2, invalid: boolean, withPrefix: boolean) => {
+export const InputControl = React.forwardRef<HTMLDivElement, React.PropsWithChildren<InputControlProps>>(
+  function InputControl({ focused, invalid, disabled, children, innerProps, prefix, ...otherProps }, ref) {
+    const styles = useStyles2(getInputControlStyles, invalid, !!prefix);
+
+    return (
+      <div className={styles.input} {...innerProps} ref={ref}>
+        {prefix && <div className={cx(styles.prefix)}>{prefix}</div>}
+        {children}
+      </div>
+    );
+  }
+);
+
+const getInputControlStyles = (theme: GrafanaTheme2, invalid: boolean, withPrefix: boolean) => {
   const styles = getInputStyles({ theme, invalid });
 
   return {
@@ -47,17 +59,4 @@ const getInputControlStyles = stylesFactory((theme: GrafanaTheme2, invalid: bool
       })
     ),
   };
-});
-
-export const InputControl = React.forwardRef<HTMLDivElement, React.PropsWithChildren<InputControlProps>>(
-  function InputControl({ focused, invalid, disabled, children, innerProps, prefix, ...otherProps }, ref) {
-    const theme = useTheme2();
-    const styles = getInputControlStyles(theme, invalid, !!prefix);
-    return (
-      <div className={styles.input} {...innerProps} ref={ref}>
-        {prefix && <div className={cx(styles.prefix)}>{prefix}</div>}
-        {children}
-      </div>
-    );
-  }
-);
+};
diff --git a/packages/grafana-ui/src/components/Select/Select.mdx b/packages/grafana-ui/src/components/Select/Select.mdx
index 78318d5931487..5af27ea2344ba 100644
--- a/packages/grafana-ui/src/components/Select/Select.mdx
+++ b/packages/grafana-ui/src/components/Select/Select.mdx
@@ -1,8 +1,11 @@
-import { ArgTypes, Preview } from '@storybook/blocks';
-import { Select, AsyncSelect, MultiSelect, AsyncMultiSelect } from './Select';
-import { generateOptions } from './mockOptions';
+import { ArgTypes } from '@storybook/blocks';
+import { Select, AsyncSelect } from './Select';
 
-# Select variants
+# Select
+
+Select is the base for every component on this page. The approaches mentioned here are also applicable to `AsyncSelect`, `MultiSelect`, `AsyncMultiSelect`.
+
+## Select variants
 
 Select is an input with the ability to search and create new values. It should be used when you have a list of options. If the data has a tree structure, consider using `Cascader` instead.
 Select has some features:
@@ -12,10 +15,6 @@ Select has some features:
 - Select from async data
 - Create custom values that aren't in the list
 
-## Select
-
-Select is the base for every component on this page. The approaches mentioned here are also applicable to `AsyncSelect`, `MultiSelect`, `AsyncMultiSelect`.
-
 ### Options format
 
 There are four properties for each option:
@@ -61,6 +60,57 @@ const SelectComponent = () => {
 };
 ```
 
+### Resetting selected value from outside the component
+
+If you want to reset the selected value from outside the component, e.g. if there are two Select components that should be in sync, you can set the dependent Select value to `null` in the `onChange` handler of the first Select component.
+
+```tsx
+import React, { useState } from 'react';
+import { Select } from '@grafana/ui';
+
+const SelectComponent = () => {
+  const [person, setPerson] = useState<string | undefined>('');
+  const [team, setTeam] = useState<string | undefined | null>('');
+
+  return (
+    <form>
+      <Select
+        onChange={({ value }) => {
+          setPerson(value);
+          setTeam(null); // Setting the team to null will reset the selected value in the team Select
+        }}
+        options={[
+          {
+            value: 'option1',
+            label: 'Option 1',
+          },
+          {
+            value: 'option2',
+            label: 'Option 2',
+          },
+        ]}
+        value={person}
+        backspaceRemovesValue
+      />
+      <Select
+        onChange={({ value }) => setTeam(value)}
+        options={[
+          {
+            value: 'team1',
+            label: 'Team 1',
+          },
+          {
+            value: 'team',
+            label: 'Team 2',
+          },
+        ]}
+        value={team}
+      />
+    </form>
+  );
+};
+```
+
 ## AsyncSelect
 
 Like regular Select, but handles fetching options asynchronously. Use the `loadOptions` prop for the async function that loads the options. If `defaultOptions` is set to `true`, `loadOptions` will be called when the component is mounted.
@@ -83,7 +133,6 @@ const basicSelectAsync = () => {
     />
   );
 };
-
 ```
 
 Where the async function could look like this:
@@ -126,7 +175,7 @@ const multiSelect = () => {
 
 Like MultiSelect but handles data asynchronously with the `loadOptions` prop.
 
-# Testing
+## Testing
 
 Using React Testing Library, you can select the `<Select />` using its matching label, such as the label assigned with the `inputId` prop. Use the `react-select-event` package to select values from the options.
 
@@ -156,6 +205,6 @@ it('should call onChange', () => {
 });
 ```
 
-# Props
+## Props
 
 <ArgTypes of={Select} />
diff --git a/packages/grafana-ui/src/components/Select/Select.story.tsx b/packages/grafana-ui/src/components/Select/Select.story.tsx
index 2c8751b54ee22..b3e8161aba9c3 100644
--- a/packages/grafana-ui/src/components/Select/Select.story.tsx
+++ b/packages/grafana-ui/src/components/Select/Select.story.tsx
@@ -45,7 +45,6 @@ const meta: Meta = {
         'renderControl',
         'options',
         'isOptionDisabled',
-        'maxVisibleValues',
         'aria-label',
         'noOptionsMessage',
         'menuPosition',
@@ -106,6 +105,7 @@ export const Basic: Story<StoryProps> = (args) => {
     </>
   );
 };
+
 export const BasicVirtualizedList: Story<StoryProps> = (args) => {
   const [value, setValue] = useState<SelectableValue<string>>();
 
@@ -124,6 +124,7 @@ export const BasicVirtualizedList: Story<StoryProps> = (args) => {
     </>
   );
 };
+
 /**
  * Uses plain values instead of SelectableValue<T>
  */
@@ -144,6 +145,7 @@ export const BasicSelectPlainValue: Story<StoryProps> = (args) => {
     </>
   );
 };
+
 /**
  * Uses plain values instead of SelectableValue<T>
  */
@@ -225,7 +227,7 @@ export const MultiSelectBasic: Story = (args) => {
   const [value, setValue] = useState<Array<SelectableValue<string>>>([]);
 
   return (
-    <>
+    <div style={{ maxWidth: '450px' }}>
       <MultiSelect
         options={generateOptions()}
         value={value}
@@ -236,13 +238,15 @@ export const MultiSelectBasic: Story = (args) => {
         prefix={getPrefix(args.icon)}
         {...args}
       />
-    </>
+    </div>
   );
 };
+
 MultiSelectBasic.args = {
   isClearable: false,
   closeMenuOnSelect: false,
   maxVisibleValues: 5,
+  noMultiValueWrap: false,
 };
 
 export const MultiSelectAsync: Story = (args) => {
diff --git a/packages/grafana-ui/src/components/Select/SelectBase.test.tsx b/packages/grafana-ui/src/components/Select/SelectBase.test.tsx
index 4b4eb14b8bb52..a17c1e6e3269e 100644
--- a/packages/grafana-ui/src/components/Select/SelectBase.test.tsx
+++ b/packages/grafana-ui/src/components/Select/SelectBase.test.tsx
@@ -1,13 +1,16 @@
-import { render, screen, fireEvent } from '@testing-library/react';
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React, { useState } from 'react';
+import { select } from 'react-select-event';
 
 import { SelectableValue } from '@grafana/data';
 
-import { selectOptionInTest } from '../../../../../public/test/helpers/selectOptionInTest';
-
 import { SelectBase } from './SelectBase';
 
+// Used to select an option or options from a Select in unit tests
+const selectOptionInTest = async (input: HTMLElement, optionOrOptions: string | RegExp | Array<string | RegExp>) =>
+  await waitFor(() => select(input, optionOrOptions, { container: document.body }));
+
 describe('SelectBase', () => {
   const onChangeHandler = jest.fn();
   const options: Array<SelectableValue<number>> = [
diff --git a/packages/grafana-ui/src/components/Select/SelectBase.tsx b/packages/grafana-ui/src/components/Select/SelectBase.tsx
index c47d9cf3c5ce9..a29ab34754574 100644
--- a/packages/grafana-ui/src/components/Select/SelectBase.tsx
+++ b/packages/grafana-ui/src/components/Select/SelectBase.tsx
@@ -1,6 +1,6 @@
 import { t } from 'i18next';
 import React, { ComponentProps, useCallback, useEffect, useRef, useState } from 'react';
-import { default as ReactSelect } from 'react-select';
+import { default as ReactSelect, IndicatorsContainerProps, Props as ReactSelectProps } from 'react-select';
 import { default as ReactAsyncSelect } from 'react-select/async';
 import { default as AsyncCreatable } from 'react-select/async-creatable';
 import Creatable from 'react-select/creatable';
@@ -25,31 +25,6 @@ import { useCustomSelectStyles } from './resetSelectStyles';
 import { ActionMeta, InputActionMeta, SelectBaseProps } from './types';
 import { cleanValue, findSelectedValue, omitDescriptions } from './utils';
 
-interface ExtraValuesIndicatorProps {
-  maxVisibleValues?: number | undefined;
-  selectedValuesCount: number;
-  menuIsOpen: boolean;
-  showAllSelectedWhenOpen: boolean;
-}
-
-const renderExtraValuesIndicator = (props: ExtraValuesIndicatorProps) => {
-  const { maxVisibleValues, selectedValuesCount, menuIsOpen, showAllSelectedWhenOpen } = props;
-
-  if (
-    maxVisibleValues !== undefined &&
-    selectedValuesCount > maxVisibleValues &&
-    !(showAllSelectedWhenOpen && menuIsOpen)
-  ) {
-    return (
-      <span key="excess-values" id="excess-values">
-        (+{selectedValuesCount - maxVisibleValues})
-      </span>
-    );
-  }
-
-  return null;
-};
-
 const CustomControl = (props: any) => {
   const {
     children,
@@ -88,10 +63,17 @@ const CustomControl = (props: any) => {
   );
 };
 
+interface SelectPropsWithExtras extends ReactSelectProps {
+  maxVisibleValues?: number | undefined;
+  showAllSelectedWhenOpen: boolean;
+  noMultiValueWrap?: boolean;
+}
+
 export function SelectBase<T, Rest = {}>({
   allowCustomValue = false,
   allowCreateWhileLoading = false,
   'aria-label': ariaLabel,
+  'data-testid': dataTestid,
   autoFocus = false,
   backspaceRemovesValue = true,
   blurInputOnSelect,
@@ -145,6 +127,7 @@ export function SelectBase<T, Rest = {}>({
   tabSelectsValue = true,
   value,
   virtualized = false,
+  noMultiValueWrap,
   width,
   isValidNewOption,
   formatOptionLabel,
@@ -217,6 +200,7 @@ export function SelectBase<T, Rest = {}>({
 
   const commonSelectProps = {
     'aria-label': ariaLabel,
+    'data-testid': dataTestid,
     autoFocus,
     backspaceRemovesValue,
     blurInputOnSelect,
@@ -256,8 +240,13 @@ export function SelectBase<T, Rest = {}>({
     onBlur,
     onChange: onChangeWithEmpty,
     onInputChange: (val: string, actionMeta: InputActionMeta) => {
-      setHasInputValue(!!val);
-      onInputChange?.(val, actionMeta);
+      const newValue = onInputChange?.(val, actionMeta) ?? val;
+      const newHasValue = !!newValue;
+      if (newHasValue !== hasInputValue) {
+        setHasInputValue(newHasValue);
+      }
+
+      return newValue;
     },
     onKeyDown,
     onMenuClose: onCloseMenu,
@@ -274,6 +263,7 @@ export function SelectBase<T, Rest = {}>({
     showAllSelectedWhenOpen,
     tabSelectsValue,
     value: isMulti ? selectedValue : selectedValue?.[0],
+    noMultiValueWrap,
   };
 
   if (allowCustomValue) {
@@ -305,31 +295,8 @@ export function SelectBase<T, Rest = {}>({
           MenuList: SelectMenuComponent,
           Group: SelectOptionGroup,
           ValueContainer,
-          IndicatorsContainer(props: any) {
-            const { selectProps } = props;
-            const { value, showAllSelectedWhenOpen, maxVisibleValues, menuIsOpen } = selectProps;
-
-            if (maxVisibleValues !== undefined) {
-              const selectedValuesCount = value.length;
-              const indicatorChildren = [...props.children];
-              indicatorChildren.splice(
-                -1,
-                0,
-                renderExtraValuesIndicator({
-                  maxVisibleValues,
-                  selectedValuesCount,
-                  showAllSelectedWhenOpen,
-                  menuIsOpen,
-                })
-              );
-              return <IndicatorsContainer {...props}>{indicatorChildren}</IndicatorsContainer>;
-            }
-
-            return <IndicatorsContainer {...props} />;
-          },
-          IndicatorSeparator() {
-            return <></>;
-          },
+          IndicatorsContainer: CustomIndicatorsContainer,
+          IndicatorSeparator: IndicatorSeparator,
           Control: CustomControl,
           Option: SelectMenuOptions,
           ClearIndicator(props: any) {
@@ -361,9 +328,7 @@ export function SelectBase<T, Rest = {}>({
               </div>
             );
           },
-          DropdownIndicator(props) {
-            return <DropdownIndicator isOpen={props.selectProps.menuIsOpen} />;
-          },
+          DropdownIndicator: DropdownIndicator,
           SingleValue(props: any) {
             return <SingleValue {...props} isDisabled={disabled} />;
           },
@@ -394,3 +359,37 @@ function defaultFormatCreateLabel(input: string) {
     </div>
   );
 }
+
+type CustomIndicatorsContainerProps = IndicatorsContainerProps & {
+  selectProps: SelectPropsWithExtras;
+  children: React.ReactNode;
+};
+
+function CustomIndicatorsContainer(props: CustomIndicatorsContainerProps) {
+  const { showAllSelectedWhenOpen, maxVisibleValues, menuIsOpen } = props.selectProps;
+
+  const value = props.getValue();
+
+  if (maxVisibleValues !== undefined && Array.isArray(props.children)) {
+    const selectedValuesCount = value.length;
+
+    if (selectedValuesCount > maxVisibleValues && !(showAllSelectedWhenOpen && menuIsOpen)) {
+      const indicatorChildren = [...props.children];
+      indicatorChildren.splice(
+        -1,
+        0,
+        <span key="excess-values" id="excess-values">
+          (+{selectedValuesCount - maxVisibleValues})
+        </span>
+      );
+
+      return <IndicatorsContainer {...props}>{indicatorChildren}</IndicatorsContainer>;
+    }
+  }
+
+  return <IndicatorsContainer {...props} />;
+}
+
+function IndicatorSeparator() {
+  return <></>;
+}
diff --git a/packages/grafana-ui/src/components/Select/SelectContainer.tsx b/packages/grafana-ui/src/components/Select/SelectContainer.tsx
index 95a3d0c3d8b1f..8e6f4ff895d11 100644
--- a/packages/grafana-ui/src/components/Select/SelectContainer.tsx
+++ b/packages/grafana-ui/src/components/Select/SelectContainer.tsx
@@ -4,8 +4,7 @@ import { components, ContainerProps as BaseContainerProps, GroupBase } from 'rea
 
 import { GrafanaTheme2 } from '@grafana/data';
 
-import { stylesFactory } from '../../themes';
-import { useTheme2 } from '../../themes/ThemeContext';
+import { useStyles2 } from '../../themes/ThemeContext';
 import { getFocusStyles } from '../../themes/mixins';
 import { sharedInputStyle } from '../Forms/commonStyles';
 import { getInputStyles } from '../Input/Input';
@@ -26,8 +25,7 @@ export const SelectContainer = <Option, isMulti extends boolean, Group extends G
     selectProps: { invalid = false },
   } = props;
 
-  const theme = useTheme2();
-  const styles = getSelectContainerStyles(theme, isFocused, isDisabled, invalid);
+  const styles = useStyles2(getSelectContainerStyles, isFocused, isDisabled, invalid);
 
   return (
     <components.SelectContainer {...props} className={cx(styles.wrapper, props.className)}>
@@ -36,33 +34,31 @@ export const SelectContainer = <Option, isMulti extends boolean, Group extends G
   );
 };
 
-const getSelectContainerStyles = stylesFactory(
-  (theme: GrafanaTheme2, focused: boolean, disabled: boolean, invalid: boolean) => {
-    const styles = getInputStyles({ theme, invalid });
+const getSelectContainerStyles = (theme: GrafanaTheme2, focused: boolean, disabled: boolean, invalid: boolean) => {
+  const styles = getInputStyles({ theme, invalid });
 
-    return {
-      wrapper: cx(
-        styles.wrapper,
-        sharedInputStyle(theme, invalid),
-        focused && css(getFocusStyles(theme)),
-        disabled && styles.inputDisabled,
-        css({
-          position: 'relative',
-          boxSizing: 'border-box',
-          /* The display property is set by the styles prop in SelectBase because it's dependant on the width prop  */
-          flexDirection: 'row',
-          flexWrap: 'wrap',
-          alignItems: 'stretch',
-          justifyContent: 'space-between',
-          minHeight: '32px',
-          height: 'auto',
-          maxWidth: '100%',
+  return {
+    wrapper: cx(
+      styles.wrapper,
+      sharedInputStyle(theme, invalid),
+      focused && css(getFocusStyles(theme)),
+      disabled && styles.inputDisabled,
+      css({
+        position: 'relative',
+        boxSizing: 'border-box',
+        /* The display property is set by the styles prop in SelectBase because it's dependant on the width prop  */
+        flexDirection: 'row',
+        flexWrap: 'wrap',
+        alignItems: 'stretch',
+        justifyContent: 'space-between',
+        minHeight: '32px',
+        height: 'auto',
+        maxWidth: '100%',
 
-          /* Input padding is applied to the InputControl so the menu is aligned correctly */
-          padding: 0,
-          cursor: disabled ? 'not-allowed' : 'pointer',
-        })
-      ),
-    };
-  }
-);
+        /* Input padding is applied to the InputControl so the menu is aligned correctly */
+        padding: 0,
+        cursor: disabled ? 'not-allowed' : 'pointer',
+      })
+    ),
+  };
+};
diff --git a/packages/grafana-ui/src/components/Select/SelectMenu.tsx b/packages/grafana-ui/src/components/Select/SelectMenu.tsx
index b7b9af15e5e1c..faa6a3f4f0ef6 100644
--- a/packages/grafana-ui/src/components/Select/SelectMenu.tsx
+++ b/packages/grafana-ui/src/components/Select/SelectMenu.tsx
@@ -34,7 +34,10 @@ export const SelectMenu = ({ children, maxHeight, innerRef, innerProps }: React.
 SelectMenu.displayName = 'SelectMenu';
 
 const VIRTUAL_LIST_ITEM_HEIGHT = 37;
-const VIRTUAL_LIST_WIDTH_ESTIMATE_MULTIPLIER = 7;
+const VIRTUAL_LIST_WIDTH_ESTIMATE_MULTIPLIER = 8;
+const VIRTUAL_LIST_PADDING = 8;
+// Some list items have icons or checkboxes so we need some extra width
+const VIRTUAL_LIST_WIDTH_EXTRA = 36;
 
 // A virtualized version of the SelectMenu, descriptions for SelectableValue options not supported since those are of a variable height.
 //
@@ -50,16 +53,20 @@ export const VirtualizedSelectMenu = ({ children, maxHeight, options, getValue }
   const [value] = getValue();
 
   const valueIndex = value ? options.findIndex((option: SelectableValue<unknown>) => option.value === value.value) : 0;
-  const initialOffset = valueIndex * VIRTUAL_LIST_ITEM_HEIGHT;
+  const valueYOffset = valueIndex * VIRTUAL_LIST_ITEM_HEIGHT;
 
   if (!Array.isArray(children)) {
     return null;
   }
 
   const longestOption = max(options.map((option) => option.label?.length)) ?? 0;
-  const widthEstimate = longestOption * VIRTUAL_LIST_WIDTH_ESTIMATE_MULTIPLIER;
+  const widthEstimate =
+    longestOption * VIRTUAL_LIST_WIDTH_ESTIMATE_MULTIPLIER + VIRTUAL_LIST_PADDING * 2 + VIRTUAL_LIST_WIDTH_EXTRA;
   const heightEstimate = Math.min(options.length * VIRTUAL_LIST_ITEM_HEIGHT, maxHeight);
 
+  // Try to scroll to keep current value in the middle
+  const scrollOffset = Math.max(0, valueYOffset - heightEstimate / 2);
+
   return (
     <List
       className={styles.menu}
@@ -68,7 +75,7 @@ export const VirtualizedSelectMenu = ({ children, maxHeight, options, getValue }
       aria-label="Select options menu"
       itemCount={children.length}
       itemSize={VIRTUAL_LIST_ITEM_HEIGHT}
-      initialScrollOffset={initialOffset}
+      initialScrollOffset={scrollOffset}
     >
       {({ index, style }) => <div style={{ ...style, overflow: 'hidden' }}>{children[index]}</div>}
     </List>
diff --git a/packages/grafana-ui/src/components/Select/ValueContainer.tsx b/packages/grafana-ui/src/components/Select/ValueContainer.tsx
index b7c6f957fcb4e..5ad36ce8f9263 100644
--- a/packages/grafana-ui/src/components/Select/ValueContainer.tsx
+++ b/packages/grafana-ui/src/components/Select/ValueContainer.tsx
@@ -29,10 +29,20 @@ class UnthemedValueContainer extends Component<any & { theme: GrafanaTheme2 }> {
   }
 
   renderContainer(children?: ReactNode) {
-    const { isMulti, theme } = this.props;
+    const { isMulti, theme, selectProps } = this.props;
+    const noWrap = this.props.selectProps?.noMultiValueWrap && !this.props.selectProps?.menuIsOpen;
     const styles = getSelectStyles(theme);
-    const className = cx(styles.valueContainer, isMulti && styles.valueContainerMulti);
-    return <div className={className}>{children}</div>;
+    const dataTestid = selectProps['data-testid'];
+    const className = cx(styles.valueContainer, {
+      [styles.valueContainerMulti]: isMulti && !noWrap,
+      [styles.valueContainerMultiNoWrap]: isMulti && noWrap,
+    });
+
+    return (
+      <div data-testid={dataTestid} className={className}>
+        {children}
+      </div>
+    );
   }
 }
 
diff --git a/packages/grafana-ui/src/components/Select/getSelectStyles.ts b/packages/grafana-ui/src/components/Select/getSelectStyles.ts
index d0a017089f9bf..7ce6d12c462c8 100644
--- a/packages/grafana-ui/src/components/Select/getSelectStyles.ts
+++ b/packages/grafana-ui/src/components/Select/getSelectStyles.ts
@@ -27,6 +27,9 @@ export const getSelectStyles = stylesFactory((theme: GrafanaTheme2) => {
 
       '&:hover': {
         background: theme.colors.action.hover,
+        '@media (forced-colors: active), (prefers-contrast: more)': {
+          border: `1px solid ${theme.colors.primary.border}`,
+        },
       },
     }),
     optionIcon: css({
@@ -55,6 +58,9 @@ export const getSelectStyles = stylesFactory((theme: GrafanaTheme2) => {
     optionFocused: css({
       label: 'grafana-select-option-focused',
       background: theme.colors.action.focus,
+      '@media (forced-colors: active), (prefers-contrast: more)': {
+        border: `1px solid ${theme.colors.primary.border}`,
+      },
     }),
     optionSelected: css({
       background: theme.colors.action.selected,
@@ -90,6 +96,10 @@ export const getSelectStyles = stylesFactory((theme: GrafanaTheme2) => {
       flexWrap: 'wrap',
       display: 'flex',
     }),
+    valueContainerMultiNoWrap: css({
+      display: 'grid',
+      gridAutoFlow: 'column',
+    }),
     loadingMessage: css({
       label: 'grafana-select-loading-message',
       padding: theme.spacing(1),
@@ -107,6 +117,8 @@ export const getSelectStyles = stylesFactory((theme: GrafanaTheme2) => {
       padding: theme.spacing(0.25, 0, 0.25, 1),
       color: theme.colors.text.primary,
       fontSize: theme.typography.size.sm,
+      overflow: 'hidden',
+      whiteSpace: 'nowrap',
 
       '&:hover': {
         background: theme.colors.emphasize(theme.colors.background.secondary),
diff --git a/packages/grafana-ui/src/components/Select/mockOptions.tsx b/packages/grafana-ui/src/components/Select/mockOptions.tsx
index 12d56b0bdc0a5..7af01826de632 100644
--- a/packages/grafana-ui/src/components/Select/mockOptions.tsx
+++ b/packages/grafana-ui/src/components/Select/mockOptions.tsx
@@ -24,6 +24,7 @@ export const generateOptions = (desc = false) => {
     'Ok Vicente',
     'Garry Spitz',
     'Han Harnish',
+    'A very long value that is very long and takes up a lot of space and should be truncated preferrably if it does not fit',
   ];
 
   return values.map<SelectableValue<string>>((name) => ({
diff --git a/packages/grafana-ui/src/components/Select/resetSelectStyles.ts b/packages/grafana-ui/src/components/Select/resetSelectStyles.ts
index fb844575d668c..0449fd94e0621 100644
--- a/packages/grafana-ui/src/components/Select/resetSelectStyles.ts
+++ b/packages/grafana-ui/src/components/Select/resetSelectStyles.ts
@@ -13,7 +13,7 @@ export default function resetSelectStyles(theme: GrafanaTheme2) {
     groupHeading: () => ({}),
     indicatorsContainer: () => ({}),
     indicatorSeparator: () => ({}),
-    input: function (originalStyles: CSSObjectWithLabel): CSSObjectWithLabel {
+    input: function (originalStyles: CSSObjectWithLabel) {
       return {
         ...originalStyles,
         color: 'inherit',
@@ -30,11 +30,14 @@ export default function resetSelectStyles(theme: GrafanaTheme2) {
       maxHeight,
     }),
     multiValue: () => ({}),
-    multiValueLabel: () => ({}),
+    multiValueLabel: () => ({
+      overflow: 'hidden',
+      textOverflow: 'ellipsis',
+    }),
     multiValueRemove: () => ({}),
     noOptionsMessage: () => ({}),
     option: () => ({}),
-    placeholder: (originalStyles: CSSObjectWithLabel): CSSObjectWithLabel => ({
+    placeholder: (originalStyles: CSSObjectWithLabel) => ({
       ...originalStyles,
       color: theme.colors.text.secondary,
     }),
diff --git a/packages/grafana-ui/src/components/Select/types.ts b/packages/grafana-ui/src/components/Select/types.ts
index e3fe5c6b76632..9ab7b93066463 100644
--- a/packages/grafana-ui/src/components/Select/types.ts
+++ b/packages/grafana-ui/src/components/Select/types.ts
@@ -18,6 +18,7 @@ export type LoadOptionsCallback<T> = (options: Array<SelectableValue<T>>) => voi
 export interface SelectCommonProps<T> {
   /** Aria label applied to the input field */
   ['aria-label']?: string;
+  ['data-testid']?: string;
   allowCreateWhileLoading?: boolean;
   allowCustomValue?: boolean;
   /** Focus is set to the Select when rendered*/
@@ -36,7 +37,7 @@ export interface SelectCommonProps<T> {
   filterOption?: (option: SelectableValue<T>, searchQuery: string) => boolean;
   formatOptionLabel?: (item: SelectableValue<T>, formatOptionMeta: FormatOptionLabelMeta<T>) => React.ReactNode;
   /** Function for formatting the text that is displayed when creating a new value*/
-  formatCreateLabel?: (input: string) => string;
+  formatCreateLabel?: (input: string) => React.ReactNode;
   getOptionLabel?: (item: SelectableValue<T>) => React.ReactNode;
   getOptionValue?: (item: SelectableValue<T>) => T | undefined;
   hideSelectedOptions?: boolean;
@@ -99,6 +100,8 @@ export interface SelectCommonProps<T> {
   ) => boolean;
   /** Message to display isLoading=true*/
   loadingMessage?: string;
+  /** Disables wrapping of multi value values when closed */
+  noMultiValueWrap?: boolean;
 }
 
 export interface SelectAsyncProps<T> {
diff --git a/packages/grafana-ui/src/components/Slider/HandleTooltip.tsx b/packages/grafana-ui/src/components/Slider/HandleTooltip.tsx
index bd195649b0811..50845a0608d44 100644
--- a/packages/grafana-ui/src/components/Slider/HandleTooltip.tsx
+++ b/packages/grafana-ui/src/components/Slider/HandleTooltip.tsx
@@ -1,17 +1,11 @@
 import { css } from '@emotion/css';
-import Tooltip from 'rc-tooltip';
+import Tooltip, { TooltipRef } from 'rc-tooltip';
 import React, { useEffect, useRef } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
 import { useStyles2 } from '../../themes/ThemeContext';
 
-// this is now typed in rc-tooltip, but they don't export it :(
-// let's mirror the interface here. if there's any discrepancy, we'll get a type error
-interface RCTooltipRef {
-  forceAlign: () => {};
-}
-
 const HandleTooltip = (props: {
   value: number;
   children: React.ReactElement;
@@ -21,7 +15,7 @@ const HandleTooltip = (props: {
 }) => {
   const { value, children, visible, placement, tipFormatter, ...restProps } = props;
 
-  const tooltipRef = useRef<RCTooltipRef>(null);
+  const tooltipRef = useRef<TooltipRef>(null);
   const rafRef = useRef<number | null>(null);
   const styles = useStyles2(tooltipStyles);
 
diff --git a/packages/grafana-ui/src/components/Slider/RangeSlider.tsx b/packages/grafana-ui/src/components/Slider/RangeSlider.tsx
index dcd0df00e169f..a95ca126ffbe3 100644
--- a/packages/grafana-ui/src/components/Slider/RangeSlider.tsx
+++ b/packages/grafana-ui/src/components/Slider/RangeSlider.tsx
@@ -3,7 +3,7 @@ import { Global } from '@emotion/react';
 import Slider, { SliderProps } from 'rc-slider';
 import React, { useCallback } from 'react';
 
-import { useTheme2 } from '../../themes/ThemeContext';
+import { useStyles2 } from '../../themes/ThemeContext';
 
 import HandleTooltip from './HandleTooltip';
 import { getStyles } from './styles';
@@ -34,7 +34,7 @@ export const RangeSlider = ({
     [onChange]
   );
 
-  const handleAfterChange = useCallback(
+  const handleChangeComplete = useCallback(
     (v: number | number[]) => {
       const value = typeof v === 'number' ? [v, v] : v;
       onAfterChange?.(value);
@@ -43,8 +43,7 @@ export const RangeSlider = ({
   );
 
   const isHorizontal = orientation === 'horizontal';
-  const theme = useTheme2();
-  const styles = getStyles(theme, isHorizontal);
+  const styles = useStyles2(getStyles, isHorizontal);
 
   const tipHandleRender: SliderProps['handleRender'] = (node, handleProps) => {
     return (
@@ -70,7 +69,7 @@ export const RangeSlider = ({
         defaultValue={value}
         range={true}
         onChange={handleChange}
-        onAfterChange={handleAfterChange}
+        onChangeComplete={handleChangeComplete}
         vertical={!isHorizontal}
         reverse={reverse}
         handleRender={tipHandleRender}
diff --git a/packages/grafana-ui/src/components/Slider/Slider.tsx b/packages/grafana-ui/src/components/Slider/Slider.tsx
index ca442bd440a61..4a52fb1ca333f 100644
--- a/packages/grafana-ui/src/components/Slider/Slider.tsx
+++ b/packages/grafana-ui/src/components/Slider/Slider.tsx
@@ -3,7 +3,7 @@ import { Global } from '@emotion/react';
 import SliderComponent from 'rc-slider';
 import React, { useState, useCallback, ChangeEvent, FocusEvent } from 'react';
 
-import { useTheme2 } from '../../themes/ThemeContext';
+import { useStyles2 } from '../../themes/ThemeContext';
 import { Input } from '../Input/Input';
 
 import { getStyles } from './styles';
@@ -26,8 +26,7 @@ export const Slider = ({
   included,
 }: SliderProps) => {
   const isHorizontal = orientation === 'horizontal';
-  const theme = useTheme2();
-  const styles = getStyles(theme, isHorizontal, Boolean(marks));
+  const styles = useStyles2(getStyles, isHorizontal, Boolean(marks));
   const SliderWithTooltip = SliderComponent;
   const [sliderValue, setSliderValue] = useState<number>(value ?? min);
 
@@ -77,7 +76,7 @@ export const Slider = ({
     [max, min]
   );
 
-  const handleAfterChange = useCallback(
+  const handleChangeComplete = useCallback(
     (v: number | number[]) => {
       const value = typeof v === 'number' ? v : v[0];
       onAfterChange?.(value);
@@ -100,7 +99,7 @@ export const Slider = ({
           defaultValue={value}
           value={sliderValue}
           onChange={onSliderChange}
-          onAfterChange={handleAfterChange}
+          onChangeComplete={handleChangeComplete}
           vertical={!isHorizontal}
           reverse={reverse}
           ariaLabelForHandle={ariaLabelForHandle}
diff --git a/packages/grafana-ui/src/components/Slider/styles.ts b/packages/grafana-ui/src/components/Slider/styles.ts
index e5d7873698613..0b422da66baac 100644
--- a/packages/grafana-ui/src/components/Slider/styles.ts
+++ b/packages/grafana-ui/src/components/Slider/styles.ts
@@ -3,9 +3,7 @@ import { css as cssCore } from '@emotion/react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
-import { stylesFactory } from '../../themes';
-
-export const getStyles = stylesFactory((theme: GrafanaTheme2, isHorizontal: boolean, hasMarks = false) => {
+export const getStyles = (theme: GrafanaTheme2, isHorizontal: boolean, hasMarks = false) => {
   const { spacing } = theme;
   const railColor = theme.colors.border.strong;
   const trackColor = theme.colors.primary.main;
@@ -127,4 +125,4 @@ export const getStyles = stylesFactory((theme: GrafanaTheme2, isHorizontal: bool
       order: 1,
     }),
   };
-});
+};
diff --git a/packages/grafana-ui/src/components/Sparkline/Sparkline.tsx b/packages/grafana-ui/src/components/Sparkline/Sparkline.tsx
index 288aa4077b36a..d56ecd4283b73 100644
--- a/packages/grafana-ui/src/components/Sparkline/Sparkline.tsx
+++ b/packages/grafana-ui/src/components/Sparkline/Sparkline.tsx
@@ -10,6 +10,7 @@ import {
   FieldSparkline,
   FieldType,
   getFieldColorModeForField,
+  nullToValue,
 } from '@grafana/data';
 import {
   AxisPlacement,
@@ -62,7 +63,8 @@ export class Sparkline extends PureComponent<SparklineProps, State> {
   }
 
   static getDerivedStateFromProps(props: SparklineProps, state: State) {
-    const frame = preparePlotFrame(props.sparkline, props.config);
+    const _frame = preparePlotFrame(props.sparkline, props.config);
+    const frame = nullToValue(_frame);
     if (!frame) {
       return { ...state };
     }
@@ -96,6 +98,12 @@ export class Sparkline extends PureComponent<SparklineProps, State> {
 
   getYRange(field: Field): Range.MinMax {
     let { min, max } = this.state.alignedDataFrame.fields[1].state?.range!;
+    const noValue = +this.state.alignedDataFrame.fields[1].config?.noValue!;
+
+    if (!Number.isNaN(noValue)) {
+      min = Math.min(min!, +noValue);
+      max = Math.max(max!, +noValue);
+    }
 
     if (min === max) {
       if (min === 0) {
diff --git a/packages/grafana-ui/src/components/Sparkline/utils.ts b/packages/grafana-ui/src/components/Sparkline/utils.ts
index c643d375a370d..aa77fd64dc48e 100644
--- a/packages/grafana-ui/src/components/Sparkline/utils.ts
+++ b/packages/grafana-ui/src/components/Sparkline/utils.ts
@@ -5,11 +5,10 @@ import {
   FieldType,
   isLikelyAscendingVector,
   sortDataFrame,
+  applyNullInsertThreshold,
 } from '@grafana/data';
 import { GraphFieldConfig } from '@grafana/schema';
 
-import { applyNullInsertThreshold } from '../GraphNG/nullInsertThreshold';
-
 /** @internal
  * Given a sparkline config returns a DataFrame ready to be turned into Plot data set
  **/
diff --git a/packages/grafana-ui/src/components/Splitter/useSplitter.mdx b/packages/grafana-ui/src/components/Splitter/useSplitter.mdx
new file mode 100644
index 0000000000000..332782e1d92df
--- /dev/null
+++ b/packages/grafana-ui/src/components/Splitter/useSplitter.mdx
@@ -0,0 +1,34 @@
+import { Meta, ArgTypes } from '@storybook/blocks';
+import { Box, useSplitter, Text } from '@grafana/ui';
+
+# useSplitter
+
+The splitter creates two resizable panes, either horizontally or vertically.
+
+### Usage
+
+```tsx
+import { useSplitter } from '@grafana/ui';
+
+const { containerProps, primaryProps, secondaryProps, splitterProps } = useSplitter({
+  direction: 'row',
+  initialSize: 0.5,
+  dragPosition: 'end',
+});
+
+return (
+  <div {...containerProps}>
+    <div {...primaryProps}>
+      <Box display="flex" grow={1} backgroundColor="primary" padding={2}>
+        Primary
+      </Box>
+    </div>
+    <div {...splitterProps} />
+    <div {...secondaryProps}>
+      <Box display="flex" grow={1} backgroundColor="primary" padding={2}>
+        Secondary
+      </Box>
+    </div>
+  </div>
+);
+```
diff --git a/packages/grafana-ui/src/components/Splitter/useSplitter.story.tsx b/packages/grafana-ui/src/components/Splitter/useSplitter.story.tsx
new file mode 100644
index 0000000000000..ca929b79efc33
--- /dev/null
+++ b/packages/grafana-ui/src/components/Splitter/useSplitter.story.tsx
@@ -0,0 +1,71 @@
+import { Meta, StoryFn } from '@storybook/react';
+import React from 'react';
+
+import { Box } from '@grafana/ui';
+
+import { DashboardStoryCanvas } from '../../utils/storybook/DashboardStoryCanvas';
+
+import { UseSplitterOptions, useSplitter } from './useSplitter';
+import mdx from './useSplitter.mdx';
+
+const meta: Meta = {
+  title: 'General/Layout/useSplitter',
+  parameters: {
+    docs: { page: mdx },
+    controls: {
+      exclude: [],
+    },
+  },
+  argTypes: {
+    initialSize: { control: { type: 'number', min: 0.1, max: 1 } },
+    direction: { control: { type: 'radio' }, options: ['row', 'column'] },
+    dragPosition: { control: { type: 'radio' }, options: ['start', 'middle', 'end'] },
+    hasSecondPane: { type: 'boolean', options: [true, false] },
+  },
+};
+
+interface StoryOptions extends UseSplitterOptions {
+  hasSecondPane: boolean;
+}
+
+export const Basic: StoryFn<StoryOptions> = (options) => {
+  const { containerProps, primaryProps, secondaryProps, splitterProps } = useSplitter({
+    ...options,
+  });
+
+  if (!options.hasSecondPane) {
+    primaryProps.style.flexGrow = 1;
+  }
+
+  return (
+    <DashboardStoryCanvas>
+      <div style={{ display: 'flex', width: '700px', height: '500px' }}>
+        <div {...containerProps}>
+          <div {...primaryProps}>
+            <Box display="flex" grow={1} backgroundColor="primary" padding={2}>
+              Primary
+            </Box>
+          </div>
+          {options.hasSecondPane && (
+            <>
+              <div {...splitterProps} />
+              <div {...secondaryProps}>
+                <Box display="flex" grow={1} backgroundColor="primary" padding={2}>
+                  Secondary
+                </Box>
+              </div>
+            </>
+          )}
+        </div>
+      </div>
+    </DashboardStoryCanvas>
+  );
+};
+
+Basic.args = {
+  direction: 'row',
+  dragPosition: 'middle',
+  hasSecondPane: true,
+};
+
+export default meta;
diff --git a/packages/grafana-ui/src/components/Splitter/useSplitter.ts b/packages/grafana-ui/src/components/Splitter/useSplitter.ts
new file mode 100644
index 0000000000000..5f3b0b8e4a804
--- /dev/null
+++ b/packages/grafana-ui/src/components/Splitter/useSplitter.ts
@@ -0,0 +1,410 @@
+import { css } from '@emotion/css';
+import { clamp, throttle } from 'lodash';
+import React, { useCallback, useId, useLayoutEffect, useRef } from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+
+import { useStyles2 } from '../../themes';
+import { DragHandlePosition, getDragStyles } from '../DragHandle/DragHandle';
+
+export interface UseSplitterOptions {
+  /**
+   * The initial size of the primary pane between 0-1, defaults to 0.5
+   */
+  initialSize?: number;
+  direction: 'row' | 'column';
+  dragPosition?: DragHandlePosition;
+  /**
+   * Called when ever the size of the primary pane changes
+   * @param flexSize (float from 0-1)
+   */
+  onSizeChanged?: (flexSize: number, pixelSize: number) => void;
+  onResizing?: (flexSize: number, pixelSize: number) => void;
+}
+
+const PIXELS_PER_MS = 0.3 as const;
+const VERTICAL_KEYS = new Set(['ArrowUp', 'ArrowDown']);
+const HORIZONTAL_KEYS = new Set(['ArrowLeft', 'ArrowRight']);
+
+const propsForDirection = {
+  row: {
+    dim: 'width',
+    axis: 'clientX',
+    min: 'minWidth',
+    max: 'maxWidth',
+  },
+  column: {
+    dim: 'height',
+    axis: 'clientY',
+    min: 'minHeight',
+    max: 'maxHeight',
+  },
+} as const;
+
+export function useSplitter(options: UseSplitterOptions) {
+  const { direction, initialSize = 0.5, dragPosition = 'middle', onResizing, onSizeChanged } = options;
+
+  const handleSize = 16;
+  const splitterRef = useRef<HTMLDivElement | null>(null);
+  const firstPaneRef = useRef<HTMLDivElement | null>(null);
+  const secondPaneRef = useRef<HTMLDivElement | null>(null);
+  const containerRef = useRef<HTMLDivElement | null>(null);
+  const containerSize = useRef<number | null>(null);
+  const primarySizeRef = useRef<'1fr' | number>('1fr');
+  const firstPaneMeasurements = useRef<MeasureResult | undefined>(undefined);
+  const savedPos = useRef<string | undefined>(undefined);
+
+  const measurementProp = propsForDirection[direction].dim;
+  const clientAxis = propsForDirection[direction].axis;
+  const minDimProp = propsForDirection[direction].min;
+  const maxDimProp = propsForDirection[direction].max;
+
+  // Using a resize observer here, as with content or screen based width/height the ratio between panes might
+  // change after a window resize, so ariaValueNow needs to be updated accordingly
+  useResizeObserver(
+    containerRef.current!,
+    (entries) => {
+      for (const entry of entries) {
+        if (!entry.target.isSameNode(containerRef.current)) {
+          return;
+        }
+
+        if (!firstPaneRef.current) {
+          return;
+        }
+
+        const curSize = firstPaneRef.current!.getBoundingClientRect()[measurementProp];
+        const newDims = measureElement(firstPaneRef.current);
+
+        splitterRef.current!.ariaValueNow = ariaValue(curSize, newDims[minDimProp], newDims[maxDimProp]);
+      }
+    },
+    500,
+    [maxDimProp, minDimProp, direction, measurementProp]
+  );
+
+  const dragStart = useRef<number | null>(null);
+  const onPointerDown = useCallback(
+    (e: React.PointerEvent<HTMLDivElement>) => {
+      if (!firstPaneRef.current) {
+        return;
+      }
+
+      // measure left-side width
+      primarySizeRef.current = firstPaneRef.current!.getBoundingClientRect()[measurementProp];
+      containerSize.current = containerRef.current!.getBoundingClientRect()[measurementProp];
+
+      // set position at start of drag
+      dragStart.current = e[clientAxis];
+      splitterRef.current!.setPointerCapture(e.pointerId);
+      firstPaneMeasurements.current = measureElement(firstPaneRef.current);
+
+      savedPos.current = undefined;
+    },
+    [measurementProp, clientAxis]
+  );
+
+  const onPointerMove = useCallback(
+    (e: React.PointerEvent<HTMLDivElement>) => {
+      if (dragStart.current !== null && primarySizeRef.current !== '1fr') {
+        const diff = e[clientAxis] - dragStart.current;
+        const dims = firstPaneMeasurements.current!;
+        const newSize = clamp(primarySizeRef.current + diff, dims[minDimProp], dims[maxDimProp]);
+        const newFlex = newSize / (containerSize.current! - handleSize);
+
+        firstPaneRef.current!.style.flexGrow = `${newFlex}`;
+        secondPaneRef.current!.style.flexGrow = `${1 - newFlex}`;
+        splitterRef.current!.ariaValueNow = ariaValue(newSize, dims[minDimProp], dims[maxDimProp]);
+
+        onResizing?.(newFlex, newSize);
+      }
+    },
+    [handleSize, clientAxis, minDimProp, maxDimProp, onResizing]
+  );
+
+  const onPointerUp = useCallback(
+    (e: React.PointerEvent<HTMLDivElement>) => {
+      e.preventDefault();
+      e.stopPropagation();
+
+      splitterRef.current!.releasePointerCapture(e.pointerId);
+      dragStart.current = null;
+
+      if (typeof primarySizeRef.current === 'number') {
+        onSizeChanged?.(parseFloat(firstPaneRef.current!.style.flexGrow), primarySizeRef.current);
+      }
+    },
+    [onSizeChanged]
+  );
+
+  const pressedKeys = useRef(new Set<string>());
+  const keysLastHandledAt = useRef<number | null>(null);
+  const handlePressedKeys = useCallback(
+    (time: number) => {
+      const nothingPressed = pressedKeys.current.size === 0;
+      if (nothingPressed) {
+        keysLastHandledAt.current = null;
+        return;
+      } else if (primarySizeRef.current === '1fr') {
+        return;
+      }
+
+      const dt = time - (keysLastHandledAt.current ?? time);
+      const dx = dt * PIXELS_PER_MS;
+      let sizeChange = 0;
+
+      if (direction === 'row') {
+        if (pressedKeys.current.has('ArrowLeft')) {
+          sizeChange -= dx;
+        }
+        if (pressedKeys.current.has('ArrowRight')) {
+          sizeChange += dx;
+        }
+      } else {
+        if (pressedKeys.current.has('ArrowUp')) {
+          sizeChange -= dx;
+        }
+        if (pressedKeys.current.has('ArrowDown')) {
+          sizeChange += dx;
+        }
+      }
+
+      const firstPaneDims = firstPaneMeasurements.current!;
+      const curSize = firstPaneRef.current!.getBoundingClientRect()[measurementProp];
+      const newSize = clamp(curSize + sizeChange, firstPaneDims[minDimProp], firstPaneDims[maxDimProp]);
+      const newFlex = newSize / (containerSize.current! - handleSize);
+
+      firstPaneRef.current!.style.flexGrow = `${newFlex}`;
+      secondPaneRef.current!.style.flexGrow = `${1 - newFlex}`;
+      splitterRef.current!.ariaValueNow = ariaValue(newSize, firstPaneDims[minDimProp], firstPaneDims[maxDimProp]);
+
+      onResizing?.(newFlex, newSize);
+
+      keysLastHandledAt.current = time;
+      window.requestAnimationFrame(handlePressedKeys);
+    },
+    [direction, handleSize, minDimProp, maxDimProp, measurementProp, onResizing]
+  );
+
+  const onKeyDown = useCallback(
+    (e: React.KeyboardEvent<HTMLDivElement>) => {
+      if (!firstPaneRef.current || !secondPaneRef.current || !splitterRef.current || !containerRef.current) {
+        return;
+      }
+
+      if (e.key === 'Enter') {
+        if (savedPos.current === undefined) {
+          savedPos.current = firstPaneRef.current!.style.flexGrow;
+          firstPaneRef.current!.style.flexGrow = '0';
+          secondPaneRef.current!.style.flexGrow = '1';
+        } else {
+          firstPaneRef.current!.style.flexGrow = savedPos.current;
+          secondPaneRef.current!.style.flexGrow = `${1 - parseFloat(savedPos.current)}`;
+          savedPos.current = undefined;
+        }
+        return;
+      } else if (e.key === 'Home') {
+        firstPaneMeasurements.current = measureElement(firstPaneRef.current);
+        containerSize.current = containerRef.current!.getBoundingClientRect()[measurementProp];
+        const newFlex = firstPaneMeasurements.current[minDimProp] / (containerSize.current - handleSize);
+        firstPaneRef.current.style.flexGrow = `${newFlex}`;
+        secondPaneRef.current.style.flexGrow = `${1 - newFlex}`;
+        splitterRef.current.ariaValueNow = '0';
+        return;
+      } else if (e.key === 'End') {
+        firstPaneMeasurements.current = measureElement(firstPaneRef.current);
+        containerSize.current = containerRef.current!.getBoundingClientRect()[measurementProp];
+        const newFlex = firstPaneMeasurements.current[maxDimProp] / (containerSize.current - handleSize);
+        firstPaneRef.current!.style.flexGrow = `${newFlex}`;
+        secondPaneRef.current!.style.flexGrow = `${1 - newFlex}`;
+        splitterRef.current!.ariaValueNow = '100';
+        return;
+      }
+
+      if (
+        !(
+          (direction === 'column' && VERTICAL_KEYS.has(e.key)) ||
+          (direction === 'row' && HORIZONTAL_KEYS.has(e.key))
+        ) ||
+        pressedKeys.current.has(e.key)
+      ) {
+        return;
+      }
+
+      savedPos.current = undefined;
+      e.preventDefault();
+      e.stopPropagation();
+      primarySizeRef.current = firstPaneRef.current.getBoundingClientRect()[measurementProp];
+      containerSize.current = containerRef.current!.getBoundingClientRect()[measurementProp];
+      firstPaneMeasurements.current = measureElement(firstPaneRef.current);
+      const newKey = !pressedKeys.current.has(e.key);
+
+      if (newKey) {
+        const initiateAnimationLoop = pressedKeys.current.size === 0;
+        pressedKeys.current.add(e.key);
+
+        if (initiateAnimationLoop) {
+          window.requestAnimationFrame(handlePressedKeys);
+        }
+      }
+    },
+    [direction, handlePressedKeys, handleSize, maxDimProp, measurementProp, minDimProp]
+  );
+
+  const onKeyUp = useCallback(
+    (e: React.KeyboardEvent<HTMLDivElement>) => {
+      if (
+        (direction === 'row' && !HORIZONTAL_KEYS.has(e.key)) ||
+        (direction === 'column' && !VERTICAL_KEYS.has(e.key))
+      ) {
+        return;
+      }
+
+      pressedKeys.current.delete(e.key);
+
+      if (typeof primarySizeRef.current === 'number') {
+        onSizeChanged?.(parseFloat(firstPaneRef.current!.style.flexGrow), primarySizeRef.current);
+      }
+    },
+    [direction, onSizeChanged]
+  );
+
+  const onDoubleClick = useCallback(() => {
+    if (!firstPaneRef.current || !secondPaneRef.current) {
+      return;
+    }
+
+    firstPaneRef.current.style.flexGrow = '0.5';
+    secondPaneRef.current.style.flexGrow = '0.5';
+    const dim = measureElement(firstPaneRef.current);
+    firstPaneMeasurements.current = dim;
+    primarySizeRef.current = firstPaneRef.current!.getBoundingClientRect()[measurementProp];
+    splitterRef.current!.ariaValueNow = `${ariaValue(primarySizeRef.current, dim[minDimProp], dim[maxDimProp])}`;
+  }, [maxDimProp, measurementProp, minDimProp]);
+
+  const onBlur = useCallback(() => {
+    // If focus is lost while keys are held, stop changing panel sizes
+    if (pressedKeys.current.size > 0) {
+      pressedKeys.current.clear();
+      dragStart.current = null;
+
+      if (typeof primarySizeRef.current === 'number') {
+        onSizeChanged?.(parseFloat(firstPaneRef.current!.style.flexGrow), primarySizeRef.current);
+      }
+    }
+  }, [onSizeChanged]);
+
+  const styles = useStyles2(getStyles, direction);
+  const dragStyles = useStyles2(getDragStyles, dragPosition);
+  const dragHandleStyle = direction === 'column' ? dragStyles.dragHandleHorizontal : dragStyles.dragHandleVertical;
+  const id = useId();
+
+  return {
+    containerProps: {
+      ref: containerRef,
+      className: styles.container,
+    },
+    primaryProps: {
+      ref: firstPaneRef,
+      className: styles.panel,
+      style: {
+        [minDimProp]: 'min-content',
+        flexGrow: clamp(initialSize ?? 0.5, 0, 1),
+      },
+    },
+    secondaryProps: {
+      ref: secondPaneRef,
+      className: styles.panel,
+      style: {
+        flexGrow: clamp(1 - initialSize, 0, 1),
+        [minDimProp]: 'min-content',
+      },
+    },
+    splitterProps: {
+      onPointerUp,
+      onPointerDown,
+      onPointerMove,
+      onKeyDown,
+      onKeyUp,
+      onDoubleClick,
+      onBlur,
+      ref: splitterRef,
+      style: { [measurementProp]: `${handleSize}px` },
+      role: 'separator',
+      'aria-valuemin': 0,
+      'aria-valuemax': 100,
+      'aria-valuenow': initialSize * 100,
+      'aria-controls': `start-panel-${id}`,
+      'aria-label': 'Pane resize widget',
+      tabIndex: 0,
+      className: dragHandleStyle,
+    },
+  };
+}
+
+function ariaValue(value: number, min: number, max: number) {
+  return `${clamp(((value - min) / (max - min)) * 100, 0, 100)}`;
+}
+
+interface MeasureResult {
+  minWidth: number;
+  maxWidth: number;
+  minHeight: number;
+  maxHeight: number;
+}
+
+function measureElement<T extends HTMLElement>(ref: T): MeasureResult {
+  const savedBodyOverflow = document.body.style.overflow;
+  const savedWidth = ref.style.width;
+  const savedHeight = ref.style.height;
+  const savedFlex = ref.style.flexGrow;
+
+  document.body.style.overflow = 'hidden';
+  ref.style.flexGrow = '0';
+
+  const { width: minWidth, height: minHeight } = ref.getBoundingClientRect();
+
+  ref.style.flexGrow = '100';
+  const { width: maxWidth, height: maxHeight } = ref.getBoundingClientRect();
+
+  document.body.style.overflow = savedBodyOverflow;
+  ref.style.width = savedWidth;
+  ref.style.height = savedHeight;
+  ref.style.flexGrow = savedFlex;
+
+  return { minWidth, maxWidth, minHeight, maxHeight };
+}
+
+function useResizeObserver(
+  target: Element,
+  cb: (entries: ResizeObserverEntry[]) => void,
+  throttleWait = 0,
+  deps?: React.DependencyList
+) {
+  const throttledCallback = throttle(cb, throttleWait);
+
+  useLayoutEffect(() => {
+    if (!target) {
+      return;
+    }
+
+    const resizeObserver = new ResizeObserver(throttledCallback);
+
+    resizeObserver.observe(target, { box: 'device-pixel-content-box' });
+    return () => resizeObserver.disconnect();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, deps);
+}
+
+function getStyles(theme: GrafanaTheme2, direction: UseSplitterOptions['direction']) {
+  return {
+    container: css({
+      display: 'flex',
+      flexDirection: direction === 'row' ? 'row' : 'column',
+      width: '100%',
+      flexGrow: 1,
+      overflow: 'hidden',
+    }),
+    panel: css({ display: 'flex', position: 'relative', flexBasis: 0 }),
+  };
+}
diff --git a/packages/grafana-ui/src/components/Switch/Switch.story.tsx b/packages/grafana-ui/src/components/Switch/Switch.story.tsx
index ee78fefe4ae5d..76594e3272d26 100644
--- a/packages/grafana-ui/src/components/Switch/Switch.story.tsx
+++ b/packages/grafana-ui/src/components/Switch/Switch.story.tsx
@@ -19,7 +19,6 @@ const meta: Meta<typeof Switch> = {
   args: {
     disabled: false,
     value: false,
-    transparent: false,
     invalid: false,
   },
 };
@@ -29,13 +28,13 @@ export const Controlled: StoryFn<typeof Switch> = (args) => {
     <div>
       <div style={{ marginBottom: '32px' }}>
         <Field label="Normal switch" description="For horizontal forms" invalid={args.invalid}>
-          <Switch value={args.value} disabled={args.disabled} transparent={args.transparent} />
+          <Switch value={args.value} disabled={args.disabled} />
         </Field>
       </div>
       <div style={{ marginBottom: '32px' }}>
         <InlineFieldRow>
           <InlineField label="My switch" invalid={args.invalid}>
-            <InlineSwitch value={args.value} disabled={args.disabled} transparent={args.transparent} />
+            <InlineSwitch value={args.value} disabled={args.disabled} />
           </InlineField>
         </InlineFieldRow>
       </div>
@@ -47,7 +46,6 @@ export const Controlled: StoryFn<typeof Switch> = (args) => {
             showLabel={true}
             value={args.value}
             disabled={args.disabled}
-            transparent={args.transparent}
             invalid={args.invalid}
           />
         </span>
@@ -62,15 +60,7 @@ export const Uncontrolled: StoryFn<typeof Switch> = (args) => {
     (e: React.FormEvent<HTMLInputElement>) => setChecked(e.currentTarget.checked),
     [setChecked]
   );
-  return (
-    <Switch
-      value={checked}
-      disabled={args.disabled}
-      transparent={args.transparent}
-      onChange={onChange}
-      invalid={args.invalid}
-    />
-  );
+  return <Switch value={checked} disabled={args.disabled} onChange={onChange} invalid={args.invalid} />;
 };
 
 export default meta;
diff --git a/packages/grafana-ui/src/components/Switch/Switch.tsx b/packages/grafana-ui/src/components/Switch/Switch.tsx
index aa9cbd6026281..462d517cd9b4b 100644
--- a/packages/grafana-ui/src/components/Switch/Switch.tsx
+++ b/packages/grafana-ui/src/components/Switch/Switch.tsx
@@ -4,13 +4,11 @@ import React, { HTMLProps, useRef } from 'react';
 
 import { GrafanaTheme2, deprecationWarning } from '@grafana/data';
 
-import { stylesFactory, useTheme2 } from '../../themes';
+import { useStyles2 } from '../../themes';
 import { getFocusStyles, getMouseFocusStyles } from '../../themes/mixins';
 
 export interface Props extends Omit<HTMLProps<HTMLInputElement>, 'value'> {
   value?: boolean;
-  /** Make inline switch's background and border transparent */
-  transparent?: boolean;
   /** Show an invalid state around the input */
   invalid?: boolean;
 }
@@ -21,8 +19,7 @@ export const Switch = React.forwardRef<HTMLInputElement, Props>(
       deprecationWarning('Switch', 'checked prop', 'value');
     }
 
-    const theme = useTheme2();
-    const styles = getSwitchStyles(theme);
+    const styles = useStyles2(getSwitchStyles);
     const switchIdRef = useRef(id ? id : uniqueId('switch-'));
 
     return (
@@ -47,13 +44,15 @@ export const Switch = React.forwardRef<HTMLInputElement, Props>(
 Switch.displayName = 'Switch';
 
 export interface InlineSwitchProps extends Props {
+  /** Label to show next to the switch */
   showLabel?: boolean;
+  /** Make inline switch's background and border transparent */
+  transparent?: boolean;
 }
 
 export const InlineSwitch = React.forwardRef<HTMLInputElement, InlineSwitchProps>(
   ({ transparent, className, showLabel, label, value, id, invalid, ...props }, ref) => {
-    const theme = useTheme2();
-    const styles = getSwitchStyles(theme, transparent);
+    const styles = useStyles2(getSwitchStyles, transparent);
 
     return (
       <div
@@ -75,110 +74,120 @@ export const InlineSwitch = React.forwardRef<HTMLInputElement, InlineSwitchProps
 
 InlineSwitch.displayName = 'Switch';
 
-const getSwitchStyles = stylesFactory((theme: GrafanaTheme2, transparent?: boolean) => {
-  return {
-    switch: css({
-      width: '32px',
-      height: '16px',
-      position: 'relative',
-
-      input: {
-        opacity: 0,
-        left: '-100vw',
-        zIndex: -1000,
-        position: 'absolute',
+const getSwitchStyles = (theme: GrafanaTheme2, transparent?: boolean) => ({
+  switch: css({
+    width: '32px',
+    height: '16px',
+    position: 'relative',
+    lineHeight: 1,
 
-        '&:disabled + label': {
-          background: theme.colors.action.disabledBackground,
-          cursor: 'not-allowed',
-        },
-
-        '&:checked + label': {
-          background: theme.colors.primary.main,
-          borderColor: theme.colors.primary.main,
+    input: {
+      opacity: 0,
+      left: '-100vw',
+      zIndex: -1000,
+      position: 'absolute',
 
-          '&:hover': {
-            background: theme.colors.primary.shade,
-          },
+      '&:checked + label': {
+        background: theme.colors.primary.main,
+        borderColor: theme.colors.primary.main,
 
-          '&::after': {
-            transform: 'translate3d(18px, -50%, 0)',
-            background: theme.colors.primary.contrastText,
-          },
+        '&:hover': {
+          background: theme.colors.primary.shade,
         },
 
-        '&:focus + label, &:focus-visible + label': getFocusStyles(theme),
-
-        '&:focus:not(:focus-visible) + label': getMouseFocusStyles(theme),
+        '&::after': {
+          transform: 'translate3d(18px, -50%, 0)',
+          background: theme.colors.primary.contrastText,
+        },
       },
 
-      label: {
-        width: '100%',
-        height: '100%',
-        cursor: 'pointer',
-        borderRadius: theme.shape.radius.pill,
-        background: theme.components.input.background,
-        border: `1px solid ${theme.components.input.borderColor}`,
-        transition: 'all 0.3s ease',
+      '&:disabled + label': {
+        background: theme.colors.action.disabledBackground,
+        borderColor: theme.colors.border.weak,
+        cursor: 'not-allowed',
 
         '&:hover': {
-          borderColor: theme.components.input.borderHover,
+          background: theme.colors.action.disabledBackground,
         },
+      },
 
+      '&:disabled:checked + label': {
         '&::after': {
-          position: 'absolute',
-          display: 'block',
-          content: '""',
-          width: '12px',
-          height: '12px',
-          borderRadius: theme.shape.radius.circle,
-          background: theme.colors.text.secondary,
-          boxShadow: theme.shadows.z1,
-          top: '50%',
-          transform: 'translate3d(2px, -50%, 0)',
-          transition: 'transform 0.2s cubic-bezier(0.19, 1, 0.22, 1)',
-
-          '@media (forced-colors: active)': {
-            border: '1px solid transparent',
-          },
+          background: theme.colors.text.disabled,
         },
       },
-    }),
-    inlineContainer: css({
-      padding: theme.spacing(0, 1),
-      height: theme.spacing(theme.components.height.md),
-      display: 'inline-flex',
-      alignItems: 'center',
-      background: transparent ? 'transparent' : theme.components.input.background,
-      border: `1px solid ${transparent ? 'transparent' : theme.components.input.borderColor}`,
-      borderRadius: theme.shape.radius.default,
+
+      '&:focus + label, &:focus-visible + label': getFocusStyles(theme),
+
+      '&:focus:not(:focus-visible) + label': getMouseFocusStyles(theme),
+    },
+
+    label: {
+      width: '100%',
+      height: '100%',
+      cursor: 'pointer',
+      borderRadius: theme.shape.radius.pill,
+      background: theme.components.input.background,
+      border: `1px solid ${theme.components.input.borderColor}`,
+      transition: 'all 0.3s ease',
 
       '&:hover': {
-        border: `1px solid ${transparent ? 'transparent' : theme.components.input.borderHover}`,
+        borderColor: theme.components.input.borderHover,
+      },
 
-        '.inline-switch-label': {
-          color: theme.colors.text.primary,
+      '&::after': {
+        position: 'absolute',
+        display: 'block',
+        content: '""',
+        width: '12px',
+        height: '12px',
+        borderRadius: theme.shape.radius.circle,
+        background: theme.colors.text.secondary,
+        boxShadow: theme.shadows.z1,
+        top: '50%',
+        transform: 'translate3d(2px, -50%, 0)',
+        transition: 'transform 0.2s cubic-bezier(0.19, 1, 0.22, 1)',
+
+        '@media (forced-colors: active)': {
+          border: '1px solid transparent',
         },
       },
-    }),
-    disabled: css({
-      backgroundColor: 'rgba(204, 204, 220, 0.04)',
-      color: 'rgba(204, 204, 220, 0.6)',
-      border: '1px solid rgba(204, 204, 220, 0.04)',
-    }),
-    inlineLabel: css({
-      cursor: 'pointer',
-      paddingRight: theme.spacing(1),
-      color: theme.colors.text.secondary,
-      whiteSpace: 'nowrap',
-    }),
-    inlineLabelEnabled: css({
-      color: theme.colors.text.primary,
-    }),
-    invalid: css({
-      'input + label, input:checked + label, input:hover + label': {
-        border: `1px solid ${theme.colors.error.border}`,
+    },
+  }),
+  inlineContainer: css({
+    padding: theme.spacing(0, 1),
+    height: theme.spacing(theme.components.height.md),
+    display: 'inline-flex',
+    alignItems: 'center',
+    background: transparent ? 'transparent' : theme.components.input.background,
+    border: `1px solid ${transparent ? 'transparent' : theme.components.input.borderColor}`,
+    borderRadius: theme.shape.radius.default,
+
+    '&:hover': {
+      border: `1px solid ${transparent ? 'transparent' : theme.components.input.borderHover}`,
+
+      '.inline-switch-label': {
+        color: theme.colors.text.primary,
       },
-    }),
-  };
+    },
+  }),
+  disabled: css({
+    backgroundColor: 'rgba(204, 204, 220, 0.04)',
+    color: 'rgba(204, 204, 220, 0.6)',
+    border: '1px solid rgba(204, 204, 220, 0.04)',
+  }),
+  inlineLabel: css({
+    cursor: 'pointer',
+    paddingRight: theme.spacing(1),
+    color: theme.colors.text.secondary,
+    whiteSpace: 'nowrap',
+  }),
+  inlineLabelEnabled: css({
+    color: theme.colors.text.primary,
+  }),
+  invalid: css({
+    'input + label, input:checked + label, input:hover + label': {
+      border: `1px solid ${theme.colors.error.border}`,
+    },
+  }),
 });
diff --git a/packages/grafana-ui/src/components/TabbedContainer/TabbedContainer.tsx b/packages/grafana-ui/src/components/TabbedContainer/TabbedContainer.tsx
index 86973201467cb..7a527bad32596 100644
--- a/packages/grafana-ui/src/components/TabbedContainer/TabbedContainer.tsx
+++ b/packages/grafana-ui/src/components/TabbedContainer/TabbedContainer.tsx
@@ -5,7 +5,7 @@ import { SelectableValue, GrafanaTheme2 } from '@grafana/data';
 
 import { IconButton } from '../../components/IconButton/IconButton';
 import { TabsBar, Tab, TabContent } from '../../components/Tabs';
-import { stylesFactory, useTheme2 } from '../../themes';
+import { useStyles2, useTheme2 } from '../../themes';
 import { IconName } from '../../types/icon';
 import { CustomScrollbar } from '../CustomScrollbar/CustomScrollbar';
 
@@ -23,45 +23,16 @@ export interface TabbedContainerProps {
   onClose: () => void;
 }
 
-const getStyles = stylesFactory((theme: GrafanaTheme2) => {
-  return {
-    container: css({
-      height: '100%',
-    }),
-    tabContent: css({
-      padding: theme.spacing(2),
-      backgroundColor: theme.colors.background.primary,
-      height: `calc(100% - ${theme.components.menuTabs.height}px)`,
-    }),
-    close: css({
-      position: 'absolute',
-      right: '16px',
-      top: '5px',
-      cursor: 'pointer',
-      fontSize: theme.typography.size.lg,
-    }),
-    tabs: css({
-      paddingTop: theme.spacing(1),
-      borderColor: theme.colors.border.weak,
-      ul: {
-        marginLeft: theme.spacing(2),
-      },
-    }),
-  };
-});
-
-export function TabbedContainer(props: TabbedContainerProps) {
-  const [activeTab, setActiveTab] = useState(
-    props.tabs.some((tab) => tab.value === props.defaultTab) ? props.defaultTab : props.tabs?.[0].value
-  );
+export function TabbedContainer({ tabs, defaultTab, closeIconTooltip, onClose }: TabbedContainerProps) {
+  const [activeTab, setActiveTab] = useState(tabs.some((tab) => tab.value === defaultTab) ? defaultTab : tabs[0].value);
+  const styles = useStyles2(getStyles);
+  const theme = useTheme2();
 
   const onSelectTab = (item: SelectableValue<string>) => {
     setActiveTab(item.value!);
   };
 
-  const { tabs, onClose, closeIconTooltip } = props;
-  const theme = useTheme2();
-  const styles = getStyles(theme);
+  const autoHeight = `calc(100% - (${theme.components.menuTabs.height}px + ${theme.spacing(1)}))`;
 
   return (
     <div className={styles.container}>
@@ -77,9 +48,34 @@ export function TabbedContainer(props: TabbedContainerProps) {
         ))}
         <IconButton className={styles.close} onClick={onClose} name="times" tooltip={closeIconTooltip ?? 'Close'} />
       </TabsBar>
-      <CustomScrollbar autoHeightMin="100%">
+      <CustomScrollbar autoHeightMin={autoHeight} autoHeightMax={autoHeight}>
         <TabContent className={styles.tabContent}>{tabs.find((t) => t.value === activeTab)?.content}</TabContent>
       </CustomScrollbar>
     </div>
   );
 }
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  container: css({
+    height: '100%',
+  }),
+  tabContent: css({
+    padding: theme.spacing(2),
+    backgroundColor: theme.colors.background.primary,
+    height: `100%`,
+  }),
+  close: css({
+    position: 'absolute',
+    right: '16px',
+    top: '5px',
+    cursor: 'pointer',
+    fontSize: theme.typography.size.lg,
+  }),
+  tabs: css({
+    paddingTop: theme.spacing(1),
+    borderColor: theme.colors.border.weak,
+    ul: {
+      marginLeft: theme.spacing(2),
+    },
+  }),
+});
diff --git a/packages/grafana-ui/src/components/Table/CellActions.tsx b/packages/grafana-ui/src/components/Table/CellActions.tsx
index bb8f4be90108c..b8a2dc62d6360 100644
--- a/packages/grafana-ui/src/components/Table/CellActions.tsx
+++ b/packages/grafana-ui/src/components/Table/CellActions.tsx
@@ -48,7 +48,7 @@ export function CellActions({ field, cell, previewMode, showFilters, onCellFilte
 
   return (
     <>
-      <div className={`cellActions ${isRightAligned ? 'cellActionsLeft' : ''}`}>
+      <div className={`cellActions${isRightAligned ? ' cellActionsLeft' : ''}`}>
         <HorizontalGroup spacing="xs">
           {inspectEnabled && (
             <IconButton
diff --git a/packages/grafana-ui/src/components/Table/DataLinksCell.tsx b/packages/grafana-ui/src/components/Table/DataLinksCell.tsx
new file mode 100644
index 0000000000000..45d8d3eb0935c
--- /dev/null
+++ b/packages/grafana-ui/src/components/Table/DataLinksCell.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+
+import { getCellLinks } from '../../utils';
+
+import { TableCellProps } from './types';
+
+export const DataLinksCell = (props: TableCellProps) => {
+  const { field, row, cellProps, tableStyles } = props;
+
+  const links = getCellLinks(field, row);
+
+  return (
+    <div {...cellProps} className={tableStyles.cellContainerText}>
+      {links &&
+        links.map((link, idx) => {
+          return (
+            // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
+            <span key={idx} className={tableStyles.cellLink} onClick={link.onClick}>
+              <a href={link.href} target={link.target}>
+                {link.title}
+              </a>
+            </span>
+          );
+        })}
+    </div>
+  );
+};
diff --git a/packages/grafana-ui/src/components/Table/DefaultCell.tsx b/packages/grafana-ui/src/components/Table/DefaultCell.tsx
index c6a00b05ae53b..eab0963cb28df 100644
--- a/packages/grafana-ui/src/components/Table/DefaultCell.tsx
+++ b/packages/grafana-ui/src/components/Table/DefaultCell.tsx
@@ -1,22 +1,21 @@
 import { cx } from '@emotion/css';
 import React, { ReactElement, useState } from 'react';
-import tinycolor from 'tinycolor2';
 
 import { DisplayValue, formattedValueToString } from '@grafana/data';
-import { TableCellBackgroundDisplayMode, TableCellDisplayMode } from '@grafana/schema';
+import { TableCellDisplayMode } from '@grafana/schema';
 
 import { useStyles2 } from '../../themes';
-import { getCellLinks, getTextColorForAlphaBackground } from '../../utils';
+import { getCellLinks } from '../../utils';
 import { clearLinkButtonStyles } from '../Button';
 import { DataLinksContextMenu } from '../DataLinks/DataLinksContextMenu';
 
 import { CellActions } from './CellActions';
 import { TableStyles } from './styles';
 import { TableCellProps, CustomCellRendererProps, TableCellOptions } from './types';
-import { getCellOptions } from './utils';
+import { getCellColors, getCellOptions } from './utils';
 
 export const DefaultCell = (props: TableCellProps) => {
-  const { field, cell, tableStyles, row, cellProps, frame } = props;
+  const { field, cell, tableStyles, row, cellProps, frame, rowStyled } = props;
 
   const inspectEnabled = Boolean(field.config.custom?.inspect);
   const displayValue = field.display!(cell.value);
@@ -29,6 +28,8 @@ export const DefaultCell = (props: TableCellProps) => {
   const [hover, setHover] = useState(false);
   let value: string | ReactElement;
 
+  const OG_TWEET_LENGTH = 140; // 🙏
+
   const onMouseLeave = () => {
     setHover(false);
   };
@@ -49,10 +50,26 @@ export const DefaultCell = (props: TableCellProps) => {
 
   const isStringValue = typeof value === 'string';
 
-  const cellStyle = getCellStyle(tableStyles, cellOptions, displayValue, inspectEnabled, isStringValue);
+  // Text should wrap when the content length is less than or equal to the length of an OG tweet and it contains whitespace
+  const textShouldWrap = displayValue.text.length <= OG_TWEET_LENGTH && /\s/.test(displayValue.text);
+  const cellStyle = getCellStyle(
+    tableStyles,
+    cellOptions,
+    displayValue,
+    inspectEnabled,
+    isStringValue,
+    textShouldWrap,
+    rowStyled
+  );
+
+  if (isStringValue) {
+    let justifyContent = cellProps.style?.justifyContent;
 
-  if (isStringValue && cellProps.style?.justifyContent === 'flex-end') {
-    cellProps.style = { ...cellProps.style, textAlign: 'right' };
+    if (justifyContent === 'flex-end') {
+      cellProps.style = { ...cellProps.style, textAlign: 'right' };
+    } else if (justifyContent === 'center') {
+      cellProps.style = { ...cellProps.style, textAlign: 'center' };
+    }
   }
 
   return (
@@ -93,43 +110,29 @@ function getCellStyle(
   cellOptions: TableCellOptions,
   displayValue: DisplayValue,
   disableOverflowOnHover = false,
-  isStringValue = false
+  isStringValue = false,
+  shouldWrapText = false,
+  rowStyled = false
 ) {
-  // How much to darken elements depends upon if we're in dark mode
-  const darkeningFactor = tableStyles.theme.isDark ? 1 : -0.7;
-
   // Setup color variables
   let textColor: string | undefined = undefined;
   let bgColor: string | undefined = undefined;
 
-  if (cellOptions.type === TableCellDisplayMode.ColorText) {
-    textColor = displayValue.color;
-  } else if (cellOptions.type === TableCellDisplayMode.ColorBackground) {
-    const mode = cellOptions.mode ?? TableCellBackgroundDisplayMode.Gradient;
-
-    if (mode === TableCellBackgroundDisplayMode.Basic) {
-      textColor = getTextColorForAlphaBackground(displayValue.color!, tableStyles.theme.isDark);
-      bgColor = tinycolor(displayValue.color).toRgbString();
-    } else if (mode === TableCellBackgroundDisplayMode.Gradient) {
-      const bgColor2 = tinycolor(displayValue.color)
-        .darken(10 * darkeningFactor)
-        .spin(5);
-      textColor = getTextColorForAlphaBackground(displayValue.color!, tableStyles.theme.isDark);
-      bgColor = `linear-gradient(120deg, ${bgColor2.toRgbString()}, ${displayValue.color})`;
-    }
-  }
+  // Get colors
+  const colors = getCellColors(tableStyles, cellOptions, displayValue);
+  textColor = colors.textColor;
+  bgColor = colors.bgColor;
 
   // If we have definied colors return those styles
   // Otherwise we return default styles
-  if (textColor !== undefined || bgColor !== undefined) {
-    return tableStyles.buildCellContainerStyle(textColor, bgColor, !disableOverflowOnHover, isStringValue);
-  }
-
-  if (isStringValue) {
-    return disableOverflowOnHover ? tableStyles.cellContainerTextNoOverflow : tableStyles.cellContainerText;
-  } else {
-    return disableOverflowOnHover ? tableStyles.cellContainerNoOverflow : tableStyles.cellContainer;
-  }
+  return tableStyles.buildCellContainerStyle(
+    textColor,
+    bgColor,
+    !disableOverflowOnHover,
+    isStringValue,
+    shouldWrapText,
+    rowStyled
+  );
 }
 
 function getLinkStyle(tableStyles: TableStyles, cellOptions: TableCellOptions, targetClassName: string | undefined) {
diff --git a/packages/grafana-ui/src/components/Table/Filter.tsx b/packages/grafana-ui/src/components/Table/Filter.tsx
index 5f4474782cfa3..dd5b4ca8ba68b 100644
--- a/packages/grafana-ui/src/components/Table/Filter.tsx
+++ b/packages/grafana-ui/src/components/Table/Filter.tsx
@@ -1,12 +1,13 @@
 import { css, cx } from '@emotion/css';
 import React, { useCallback, useMemo, useRef, useState } from 'react';
 
-import { Field, GrafanaTheme2 } from '@grafana/data';
+import { Field, GrafanaTheme2, SelectableValue } from '@grafana/data';
 
 import { Popover } from '..';
 import { useStyles2 } from '../../themes';
 import { Icon } from '../Icon/Icon';
 
+import { REGEX_OPERATOR } from './FilterList';
 import { FilterPopup } from './FilterPopup';
 import { TableStyles } from './styles';
 
@@ -23,6 +24,8 @@ export const Filter = ({ column, field, tableStyles }: Props) => {
   const filterEnabled = useMemo(() => Boolean(column.filterValue), [column.filterValue]);
   const onShowPopover = useCallback(() => setPopoverVisible(true), [setPopoverVisible]);
   const onClosePopover = useCallback(() => setPopoverVisible(false), [setPopoverVisible]);
+  const [searchFilter, setSearchFilter] = useState('');
+  const [operator, setOperator] = useState<SelectableValue<string>>(REGEX_OPERATOR);
 
   if (!field || !field.config.custom?.filterable) {
     return null;
@@ -37,7 +40,18 @@ export const Filter = ({ column, field, tableStyles }: Props) => {
       <Icon name="filter" />
       {isPopoverVisible && ref.current && (
         <Popover
-          content={<FilterPopup column={column} tableStyles={tableStyles} field={field} onClose={onClosePopover} />}
+          content={
+            <FilterPopup
+              column={column}
+              tableStyles={tableStyles}
+              field={field}
+              onClose={onClosePopover}
+              searchFilter={searchFilter}
+              setSearchFilter={setSearchFilter}
+              operator={operator}
+              setOperator={setOperator}
+            />
+          }
           placement="bottom-start"
           referenceElement={ref.current}
           show
diff --git a/packages/grafana-ui/src/components/Table/FilterList.tsx b/packages/grafana-ui/src/components/Table/FilterList.tsx
index 1900aae00add5..1ea721809d546 100644
--- a/packages/grafana-ui/src/components/Table/FilterList.tsx
+++ b/packages/grafana-ui/src/components/Table/FilterList.tsx
@@ -1,47 +1,152 @@
-import { css } from '@emotion/css';
-import React, { useCallback, useMemo, useState } from 'react';
+import { css, cx } from '@emotion/css';
+import React, { useCallback, useMemo } from 'react';
 import { FixedSizeList as List } from 'react-window';
 
-import { GrafanaTheme2, SelectableValue } from '@grafana/data';
+import { GrafanaTheme2, formattedValueToString, getValueFormat, SelectableValue } from '@grafana/data';
 
-import { Checkbox, FilterInput, Label, VerticalGroup } from '..';
-import { stylesFactory, useTheme2 } from '../../themes';
+import { ButtonSelect, Checkbox, FilterInput, Label, Stack } from '..';
+import { useStyles2, useTheme2 } from '../../themes';
 
 interface Props {
   values: SelectableValue[];
   options: SelectableValue[];
   onChange: (options: SelectableValue[]) => void;
   caseSensitive?: boolean;
+  showOperators?: boolean;
+  searchFilter: string;
+  setSearchFilter: (value: string) => void;
+  operator: SelectableValue<string>;
+  setOperator: (item: SelectableValue<string>) => void;
 }
 
 const ITEM_HEIGHT = 28;
 const MIN_HEIGHT = ITEM_HEIGHT * 5;
 
-export const FilterList = ({ options, values, caseSensitive, onChange }: Props) => {
-  const theme = useTheme2();
-  const styles = getStyles(theme);
-  const [searchFilter, setSearchFilter] = useState('');
+const operatorSelectableValues: { [key: string]: SelectableValue<string> } = {
+  Contains: { label: 'Contains', value: 'Contains', description: 'Contains' },
+  '=': { label: '=', value: '=', description: 'Equals' },
+  '!=': { label: '!=', value: '!=', description: 'Not equals' },
+  '>': { label: '>', value: '>', description: 'Greater' },
+  '>=': { label: '>=', value: '>=', description: 'Greater or Equal' },
+  '<': { label: '<', value: '<', description: 'Less' },
+  '<=': { label: '<=', value: '<=', description: 'Less or Equal' },
+  Expression: {
+    label: 'Expression',
+    value: 'Expression',
+    description: 'Bool Expression (Char $ represents the column value in the expression, e.g. "$ >= 10 && $ <= 12")',
+  },
+};
+const OPERATORS = Object.values(operatorSelectableValues);
+export const REGEX_OPERATOR = operatorSelectableValues['Contains'];
+const XPR_OPERATOR = operatorSelectableValues['Expression'];
+
+const comparableValue = (value: string): string | number | Date | boolean => {
+  value = value.trim().replace(/\\/g, '');
+
+  // Does it look like a Date (Starting with pattern YYYY-MM-DD* or YYYY/MM/DD*)?
+  if (/^(\d{4}-\d{2}-\d{2}|\d{4}\/\d{2}\/\d{2})/.test(value)) {
+    const date = new Date(value);
+    if (!isNaN(date.getTime())) {
+      const fmt = getValueFormat('dateTimeAsIso');
+      return formattedValueToString(fmt(date.getTime()));
+    }
+  }
+  // Does it look like a Number?
+  const num = parseFloat(value);
+  if (!isNaN(num)) {
+    return num;
+  }
+  // Does it look like a Bool?
+  const lvalue = value.toLowerCase();
+  if (lvalue === 'true' || lvalue === 'false') {
+    return lvalue === 'true';
+  }
+  // Anything else
+  return value;
+};
+
+export const FilterList = ({
+  options,
+  values,
+  caseSensitive,
+  showOperators,
+  onChange,
+  searchFilter,
+  setSearchFilter,
+  operator,
+  setOperator,
+}: Props) => {
   const regex = useMemo(() => new RegExp(searchFilter, caseSensitive ? undefined : 'i'), [searchFilter, caseSensitive]);
   const items = useMemo(
     () =>
       options.filter((option) => {
-        if (option.label === undefined) {
+        if (!showOperators || !searchFilter || operator.value === REGEX_OPERATOR.value) {
+          if (option.label === undefined) {
+            return false;
+          }
+          return regex.test(option.label);
+        } else if (operator.value === XPR_OPERATOR.value) {
+          if (option.value === undefined) {
+            return false;
+          }
+          try {
+            const xpr = searchFilter.replace(/\\/g, '');
+            const fnc = new Function('$', `'use strict'; return ${xpr};`);
+            const val = comparableValue(option.value);
+            return fnc(val);
+          } catch (_) {}
+          return false;
+        } else {
+          if (option.value === undefined) {
+            return false;
+          }
+
+          const value1 = comparableValue(option.value);
+          const value2 = comparableValue(searchFilter);
+
+          switch (operator.value) {
+            case '=':
+              return value1 === value2;
+            case '!=':
+              return value1 !== value2;
+            case '>':
+              return value1 > value2;
+            case '>=':
+              return value1 >= value2;
+            case '<':
+              return value1 < value2;
+            case '<=':
+              return value1 <= value2;
+          }
           return false;
         }
-        return regex.test(option.label);
       }),
-    [options, regex]
+    [options, regex, showOperators, operator, searchFilter]
   );
-  const gutter = theme.spacing.gridSize;
-  const height = useMemo(() => Math.min(items.length * ITEM_HEIGHT, MIN_HEIGHT) + gutter, [gutter, items.length]);
+  const selectedItems = useMemo(() => items.filter((item) => values.includes(item)), [items, values]);
 
-  const onInputChange = useCallback(
-    (v: string) => {
-      setSearchFilter(v);
-    },
-    [setSearchFilter]
+  const selectCheckValue = useMemo(() => items.length === selectedItems.length, [items, selectedItems]);
+  const selectCheckIndeterminate = useMemo(
+    () => selectedItems.length > 0 && items.length > selectedItems.length,
+    [items, selectedItems]
+  );
+  const selectCheckLabel = useMemo(
+    () => (selectedItems.length ? `${selectedItems.length} selected` : `Select all`),
+    [selectedItems]
+  );
+  const selectCheckDescription = useMemo(
+    () =>
+      items.length !== selectedItems.length
+        ? 'Add all displayed values to the filter'
+        : 'Remove all displayed values from the filter',
+    [items, selectedItems]
   );
 
+  const styles = useStyles2(getStyles);
+  const theme = useTheme2();
+  const gutter = theme.spacing.gridSize;
+  const height = useMemo(() => Math.min(items.length * ITEM_HEIGHT, MIN_HEIGHT) + gutter, [gutter, items.length]);
+
   const onCheckedChanged = useCallback(
     (option: SelectableValue) => (event: React.FormEvent<HTMLInputElement>) => {
       const newValues = event.currentTarget.checked
@@ -53,9 +158,31 @@ export const FilterList = ({ options, values, caseSensitive, onChange }: Props)
     [onChange, values]
   );
 
+  const onSelectChanged = useCallback(() => {
+    if (items.length === selectedItems.length) {
+      const newValues = values.filter((item) => !items.includes(item));
+      onChange(newValues);
+    } else {
+      const newValues = [...new Set([...values, ...items])];
+      onChange(newValues);
+    }
+  }, [onChange, values, items, selectedItems]);
+
   return (
-    <VerticalGroup spacing="md">
-      <FilterInput placeholder="Filter values" onChange={onInputChange} value={searchFilter} />
+    <Stack direction="column" gap={0.25}>
+      {!showOperators && <FilterInput placeholder="Filter values" onChange={setSearchFilter} value={searchFilter} />}
+      {showOperators && (
+        <Stack direction="row" gap={0}>
+          <ButtonSelect
+            variant="canvas"
+            options={OPERATORS}
+            onChange={setOperator}
+            value={operator}
+            tooltip={operator.description}
+          />
+          <FilterInput placeholder="Filter values" onChange={setSearchFilter} value={searchFilter} />
+        </Stack>
+      )}
       {!items.length && <Label>No values</Label>}
       {items.length && (
         <List
@@ -78,11 +205,25 @@ export const FilterList = ({ options, values, caseSensitive, onChange }: Props)
           }}
         </List>
       )}
-    </VerticalGroup>
+      {items.length && (
+        <Stack direction="column" gap={0.25}>
+          <div className={cx(styles.selectDivider)} />
+          <div className={cx(styles.filterListRow)}>
+            <Checkbox
+              value={selectCheckValue}
+              indeterminate={selectCheckIndeterminate}
+              label={selectCheckLabel}
+              description={selectCheckDescription}
+              onChange={onSelectChanged}
+            />
+          </div>
+        </Stack>
+      )}
+    </Stack>
   );
 };
 
-const getStyles = stylesFactory((theme: GrafanaTheme2) => ({
+const getStyles = (theme: GrafanaTheme2) => ({
   filterList: css({
     label: 'filterList',
   }),
@@ -98,4 +239,10 @@ const getStyles = stylesFactory((theme: GrafanaTheme2) => ({
       backgroundColor: theme.colors.action.hover,
     },
   }),
-}));
+  selectDivider: css({
+    label: 'selectDivider',
+    width: '100%',
+    borderTop: `1px solid ${theme.colors.border.medium}`,
+    padding: theme.spacing(0.5, 2),
+  }),
+});
diff --git a/packages/grafana-ui/src/components/Table/FilterPopup.tsx b/packages/grafana-ui/src/components/Table/FilterPopup.tsx
index f1e2ec807bfd8..fcb4803f9bca4 100644
--- a/packages/grafana-ui/src/components/Table/FilterPopup.tsx
+++ b/packages/grafana-ui/src/components/Table/FilterPopup.tsx
@@ -15,9 +15,21 @@ interface Props {
   tableStyles: TableStyles;
   onClose: () => void;
   field?: Field;
+  searchFilter: string;
+  setSearchFilter: (value: string) => void;
+  operator: SelectableValue<string>;
+  setOperator: (item: SelectableValue<string>) => void;
 }
 
-export const FilterPopup = ({ column: { preFilteredRows, filterValue, setFilter }, onClose, field }: Props) => {
+export const FilterPopup = ({
+  column: { preFilteredRows, filterValue, setFilter },
+  onClose,
+  field,
+  searchFilter,
+  setSearchFilter,
+  operator,
+  setOperator,
+}: Props) => {
   const theme = useTheme2();
   const uniqueValues = useMemo(() => calculateUniqueFieldValues(preFilteredRows, field), [preFilteredRows, field]);
   const options = useMemo(() => valuesToOptions(uniqueValues), [uniqueValues]);
@@ -67,7 +79,17 @@ export const FilterPopup = ({ column: { preFilteredRows, filterValue, setFilter
               />
             </HorizontalGroup>
             <div className={cx(styles.listDivider)} />
-            <FilterList onChange={setValues} values={values} options={options} caseSensitive={matchCase} />
+            <FilterList
+              onChange={setValues}
+              values={values}
+              options={options}
+              caseSensitive={matchCase}
+              showOperators={true}
+              searchFilter={searchFilter}
+              setSearchFilter={setSearchFilter}
+              operator={operator}
+              setOperator={setOperator}
+            />
           </VerticalGroup>
           <HorizontalGroup spacing="lg">
             <HorizontalGroup>
@@ -102,7 +124,6 @@ const getStyles = (theme: GrafanaTheme2) => ({
     backgroundColor: theme.colors.background.primary,
     border: `1px solid ${theme.colors.border.weak}`,
     padding: theme.spacing(2),
-    margin: theme.spacing(1, 0),
     boxShadow: theme.shadows.z3,
     borderRadius: theme.shape.radius.default,
   }),
diff --git a/packages/grafana-ui/src/components/Table/HeaderRow.tsx b/packages/grafana-ui/src/components/Table/HeaderRow.tsx
index 62f61e494d193..2bd1ef0480137 100644
--- a/packages/grafana-ui/src/components/Table/HeaderRow.tsx
+++ b/packages/grafana-ui/src/components/Table/HeaderRow.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { HeaderGroup, Column } from 'react-table';
 
+import { Field } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 
 import { getFieldTypeIcon } from '../../types';
@@ -8,6 +9,7 @@ import { Icon } from '../Icon/Icon';
 
 import { Filter } from './Filter';
 import { TableStyles } from './styles';
+import { TableFieldOptions } from './types';
 
 export interface HeaderRowProps {
   headerGroups: HeaderGroup[];
@@ -43,7 +45,8 @@ export const HeaderRow = (props: HeaderRowProps) => {
 
 function renderHeaderCell(column: any, tableStyles: TableStyles, showTypeIcons?: boolean) {
   const headerProps = column.getHeaderProps();
-  const field = column.field ?? null;
+  const field: Field = column.field ?? null;
+  const tableFieldOptions: TableFieldOptions | undefined = field?.config.custom;
 
   if (column.canResize) {
     headerProps.style.userSelect = column.isResizing ? 'none' : 'auto'; // disables selecting text while resizing
@@ -51,27 +54,37 @@ function renderHeaderCell(column: any, tableStyles: TableStyles, showTypeIcons?:
 
   headerProps.style.position = 'absolute';
   headerProps.style.justifyContent = column.justifyContent;
+  headerProps.style.left = column.totalLeft;
+
+  let headerContent = column.render('Header');
+
+  let sortHeaderContent = column.canSort && (
+    <>
+      <button {...column.getSortByToggleProps()} className={tableStyles.headerCellLabel}>
+        {showTypeIcons && (
+          <Icon name={getFieldTypeIcon(field)} title={field?.type} size="sm" className={tableStyles.typeIcon} />
+        )}
+        <div>{headerContent}</div>
+        {column.isSorted &&
+          (column.isSortedDesc ? (
+            <Icon size="lg" name="arrow-down" className={tableStyles.sortIcon} />
+          ) : (
+            <Icon name="arrow-up" size="lg" className={tableStyles.sortIcon} />
+          ))}
+      </button>
+      {column.canFilter && <Filter column={column} tableStyles={tableStyles} field={field} />}
+    </>
+  );
+  if (sortHeaderContent && tableFieldOptions?.headerComponent) {
+    sortHeaderContent = <tableFieldOptions.headerComponent field={field} defaultContent={sortHeaderContent} />;
+  } else if (tableFieldOptions?.headerComponent) {
+    headerContent = <tableFieldOptions.headerComponent field={field} defaultContent={headerContent} />;
+  }
 
   return (
     <div className={tableStyles.headerCell} {...headerProps} role="columnheader">
-      {column.canSort && (
-        <>
-          <button {...column.getSortByToggleProps()} className={tableStyles.headerCellLabel}>
-            {showTypeIcons && (
-              <Icon name={getFieldTypeIcon(field)} title={field?.type} size="sm" className={tableStyles.typeIcon} />
-            )}
-            <div>{column.render('Header')}</div>
-            {column.isSorted &&
-              (column.isSortedDesc ? (
-                <Icon size="lg" name="arrow-down" className={tableStyles.sortIcon} />
-              ) : (
-                <Icon name="arrow-up" size="lg" className={tableStyles.sortIcon} />
-              ))}
-          </button>
-          {column.canFilter && <Filter column={column} tableStyles={tableStyles} field={field} />}
-        </>
-      )}
-      {!column.canSort && column.render('Header')}
+      {column.canSort && sortHeaderContent}
+      {!column.canSort && headerContent}
       {!column.canSort && column.canFilter && <Filter column={column} tableStyles={tableStyles} field={field} />}
       {column.canResize && <div {...column.getResizerProps()} className={tableStyles.resizeHandle} />}
     </div>
diff --git a/packages/grafana-ui/src/components/Table/ImageCell.tsx b/packages/grafana-ui/src/components/Table/ImageCell.tsx
index 33c87d22b9fd0..6732bb6c54f46 100644
--- a/packages/grafana-ui/src/components/Table/ImageCell.tsx
+++ b/packages/grafana-ui/src/components/Table/ImageCell.tsx
@@ -1,33 +1,51 @@
-import { cx } from '@emotion/css';
 import React from 'react';
 
-import { useStyles2 } from '../../themes';
 import { getCellLinks } from '../../utils';
-import { Button, clearLinkButtonStyles } from '../Button';
 import { DataLinksContextMenu } from '../DataLinks/DataLinksContextMenu';
 
 import { TableCellProps } from './types';
 
+const DATALINKS_HEIGHT_OFFSET = 10;
+
 export const ImageCell = (props: TableCellProps) => {
   const { field, cell, tableStyles, row, cellProps } = props;
 
   const displayValue = field.display!(cell.value);
 
   const hasLinks = Boolean(getCellLinks(field, row)?.length);
-  const clearButtonStyle = useStyles2(clearLinkButtonStyles);
 
   return (
     <div {...cellProps} className={tableStyles.cellContainer}>
       {!hasLinks && <img src={displayValue.text} className={tableStyles.imageCell} alt="" />}
       {hasLinks && (
-        <DataLinksContextMenu style={{ height: '100%' }} links={() => getCellLinks(field, row) || []}>
+        <DataLinksContextMenu
+          style={{ height: tableStyles.cellHeight - DATALINKS_HEIGHT_OFFSET, width: 'auto' }}
+          links={() => getCellLinks(field, row) || []}
+        >
           {(api) => {
-            const img = <img src={displayValue.text} className={tableStyles.imageCell} alt="" />;
+            const img = (
+              <img
+                style={{ height: tableStyles.cellHeight - DATALINKS_HEIGHT_OFFSET, width: 'auto' }}
+                src={displayValue.text}
+                className={tableStyles.imageCell}
+                alt=""
+              />
+            );
             if (api.openMenu) {
               return (
-                <Button className={cx(clearButtonStyle)} onClick={api.openMenu}>
+                <div
+                  onClick={api.openMenu}
+                  role="button"
+                  tabIndex={0}
+                  onKeyDown={(e: React.KeyboardEvent) => {
+                    if (e.key === 'Enter' && api.openMenu) {
+                      // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/consistent-type-assertions
+                      api.openMenu(e as any);
+                    }
+                  }}
+                >
                   {img}
-                </Button>
+                </div>
               );
             } else {
               return img;
diff --git a/packages/grafana-ui/src/components/Table/RowsList.tsx b/packages/grafana-ui/src/components/Table/RowsList.tsx
new file mode 100644
index 0000000000000..5194d9d693d9e
--- /dev/null
+++ b/packages/grafana-ui/src/components/Table/RowsList.tsx
@@ -0,0 +1,333 @@
+import { css, cx } from '@emotion/css';
+import React, { CSSProperties, UIEventHandler, useCallback, useEffect, useMemo, useState } from 'react';
+import { Cell, Row, TableState } from 'react-table';
+import { VariableSizeList } from 'react-window';
+import { Subscription, debounceTime } from 'rxjs';
+
+import {
+  DataFrame,
+  DataHoverClearEvent,
+  DataHoverEvent,
+  Field,
+  FieldType,
+  TimeRange,
+  hasTimeField,
+} from '@grafana/data';
+import { TableCellDisplayMode, TableCellHeight } from '@grafana/schema';
+
+import { useTheme2 } from '../../themes';
+import CustomScrollbar from '../CustomScrollbar/CustomScrollbar';
+import { usePanelContext } from '../PanelChrome';
+
+import { ExpandedRow, getExpandedRowHeight } from './ExpandedRow';
+import { TableCell } from './TableCell';
+import { TableStyles } from './styles';
+import { CellColors, TableFieldOptions, TableFilterActionCallback } from './types';
+import { calculateAroundPointThreshold, getCellColors, isPointTimeValAroundTableTimeVal } from './utils';
+
+interface RowsListProps {
+  data: DataFrame;
+  rows: Row[];
+  enableSharedCrosshair: boolean;
+  headerHeight: number;
+  rowHeight: number;
+  itemCount: number;
+  pageIndex: number;
+  listHeight: number;
+  width: number;
+  cellHeight?: TableCellHeight;
+  listRef: React.RefObject<VariableSizeList>;
+  tableState: TableState;
+  tableStyles: TableStyles;
+  nestedDataField?: Field;
+  prepareRow: (row: Row) => void;
+  onCellFilterAdded?: TableFilterActionCallback;
+  timeRange?: TimeRange;
+  footerPaginationEnabled: boolean;
+  initialRowIndex?: number;
+}
+
+export const RowsList = (props: RowsListProps) => {
+  const {
+    data,
+    rows,
+    headerHeight,
+    footerPaginationEnabled,
+    rowHeight,
+    itemCount,
+    pageIndex,
+    tableState,
+    prepareRow,
+    onCellFilterAdded,
+    width,
+    cellHeight = TableCellHeight.Sm,
+    timeRange,
+    tableStyles,
+    nestedDataField,
+    listHeight,
+    listRef,
+    enableSharedCrosshair = false,
+    initialRowIndex = undefined,
+  } = props;
+
+  const [rowHighlightIndex, setRowHighlightIndex] = useState<number | undefined>(initialRowIndex);
+
+  const theme = useTheme2();
+  const panelContext = usePanelContext();
+
+  const threshold = useMemo(() => {
+    const timeField = data.fields.find((f) => f.type === FieldType.time);
+
+    if (!timeField) {
+      return 0;
+    }
+
+    return calculateAroundPointThreshold(timeField);
+  }, [data]);
+
+  const onRowHover = useCallback(
+    (idx: number, frame: DataFrame) => {
+      if (!panelContext || !enableSharedCrosshair || !hasTimeField(frame)) {
+        return;
+      }
+
+      const timeField: Field = frame!.fields.find((f) => f.type === FieldType.time)!;
+
+      panelContext.eventBus.publish(
+        new DataHoverEvent({
+          point: {
+            time: timeField.values[idx],
+          },
+        })
+      );
+    },
+    [enableSharedCrosshair, panelContext]
+  );
+
+  const onRowLeave = useCallback(() => {
+    if (!panelContext || !enableSharedCrosshair) {
+      return;
+    }
+
+    panelContext.eventBus.publish(new DataHoverClearEvent());
+  }, [enableSharedCrosshair, panelContext]);
+
+  const onDataHoverEvent = useCallback(
+    (evt: DataHoverEvent) => {
+      if (evt.payload.point?.time && evt.payload.rowIndex !== undefined) {
+        const timeField = data.fields.find((f) => f.type === FieldType.time);
+        const time = timeField!.values[evt.payload.rowIndex];
+        const pointTime = evt.payload.point.time;
+
+        // If the time value of the hovered point is around the time value of the
+        // row with same index, highlight the row
+        if (isPointTimeValAroundTableTimeVal(pointTime, time, threshold)) {
+          setRowHighlightIndex(evt.payload.rowIndex);
+          return;
+        }
+
+        // If the time value of the hovered point is not around the time value of the
+        // row with same index, try to find a row with same time value
+        const matchedRowIndex = timeField!.values.findIndex((t) =>
+          isPointTimeValAroundTableTimeVal(pointTime, t, threshold)
+        );
+
+        if (matchedRowIndex !== -1) {
+          setRowHighlightIndex(matchedRowIndex);
+          return;
+        }
+
+        setRowHighlightIndex(undefined);
+      }
+    },
+    [data.fields, threshold]
+  );
+
+  useEffect(() => {
+    if (!panelContext || !enableSharedCrosshair || !hasTimeField(data) || footerPaginationEnabled) {
+      return;
+    }
+
+    const subs = new Subscription();
+
+    subs.add(
+      panelContext.eventBus
+        .getStream(DataHoverEvent)
+        .pipe(debounceTime(250))
+        .subscribe({
+          next: (evt) => {
+            if (panelContext.eventBus === evt.origin) {
+              return;
+            }
+
+            onDataHoverEvent(evt);
+          },
+        })
+    );
+
+    subs.add(
+      panelContext.eventBus
+        .getStream(DataHoverClearEvent)
+        .pipe(debounceTime(250))
+        .subscribe({
+          next: (evt) => {
+            if (panelContext.eventBus === evt.origin) {
+              return;
+            }
+
+            setRowHighlightIndex(undefined);
+          },
+        })
+    );
+
+    return () => {
+      subs.unsubscribe();
+    };
+  }, [data, enableSharedCrosshair, footerPaginationEnabled, onDataHoverEvent, panelContext]);
+
+  let scrollTop: number | undefined = undefined;
+  if (rowHighlightIndex !== undefined) {
+    const firstMatchedRowIndex = rows.findIndex((row) => row.index === rowHighlightIndex);
+
+    if (firstMatchedRowIndex !== -1) {
+      scrollTop = headerHeight + (firstMatchedRowIndex - 1) * rowHeight;
+    }
+  }
+
+  const rowIndexForPagination = useCallback(
+    (index: number) => {
+      return tableState.pageIndex * tableState.pageSize + index;
+    },
+    [tableState.pageIndex, tableState.pageSize]
+  );
+
+  let rowBg: Function | undefined = undefined;
+  for (const field of data.fields) {
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    const fieldOptions = field.config.custom as TableFieldOptions;
+
+    if (
+      fieldOptions !== undefined &&
+      fieldOptions.cellOptions !== undefined &&
+      fieldOptions.cellOptions.type === TableCellDisplayMode.ColorBackground &&
+      fieldOptions.cellOptions.applyToRow
+    ) {
+      rowBg = (rowIndex: number): CellColors => {
+        const display = field.display!(field.values.get(rowIndex));
+        const colors = getCellColors(tableStyles, fieldOptions.cellOptions, display);
+        return colors;
+      };
+    }
+  }
+
+  const RenderRow = useCallback(
+    ({ index, style, rowHighlightIndex }: { index: number; style: CSSProperties; rowHighlightIndex?: number }) => {
+      const indexForPagination = rowIndexForPagination(index);
+      const row = rows[indexForPagination];
+      let additionalProps: React.HTMLAttributes<HTMLDivElement> = {};
+      prepareRow(row);
+
+      const expandedRowStyle = tableState.expanded[row.id] ? css({ '&:hover': { background: 'inherit' } }) : {};
+
+      if (rowHighlightIndex !== undefined && row.index === rowHighlightIndex) {
+        style = { ...style, backgroundColor: theme.components.table.rowHoverBackground };
+        additionalProps = {
+          'aria-selected': 'true',
+        };
+      }
+
+      if (rowBg) {
+        const { bgColor, textColor } = rowBg(row.index);
+        style.background = bgColor;
+        style.color = textColor;
+      }
+
+      return (
+        <div
+          {...row.getRowProps({ style, ...additionalProps })}
+          className={cx(tableStyles.row, expandedRowStyle)}
+          onMouseEnter={() => onRowHover(index, data)}
+          onMouseLeave={onRowLeave}
+        >
+          {/*add the nested data to the DOM first to prevent a 1px border CSS issue on the last cell of the row*/}
+          {nestedDataField && tableState.expanded[row.id] && (
+            <ExpandedRow
+              nestedData={nestedDataField}
+              tableStyles={tableStyles}
+              rowIndex={index}
+              width={width}
+              cellHeight={cellHeight}
+            />
+          )}
+          {row.cells.map((cell: Cell, index: number) => (
+            <TableCell
+              key={index}
+              tableStyles={tableStyles}
+              cell={cell}
+              onCellFilterAdded={onCellFilterAdded}
+              columnIndex={index}
+              columnCount={row.cells.length}
+              timeRange={timeRange}
+              frame={data}
+              rowStyled={rowBg !== undefined}
+            />
+          ))}
+        </div>
+      );
+    },
+    [
+      cellHeight,
+      data,
+      nestedDataField,
+      onCellFilterAdded,
+      onRowHover,
+      onRowLeave,
+      prepareRow,
+      rowIndexForPagination,
+      rows,
+      tableState.expanded,
+      tableStyles,
+      theme.components.table.rowHoverBackground,
+      timeRange,
+      width,
+      rowBg,
+    ]
+  );
+
+  const getItemSize = (index: number): number => {
+    const indexForPagination = rowIndexForPagination(index);
+    const row = rows[indexForPagination];
+    if (tableState.expanded[row.id] && nestedDataField) {
+      return getExpandedRowHeight(nestedDataField, index, tableStyles);
+    }
+
+    return tableStyles.rowHeight;
+  };
+
+  const handleScroll: UIEventHandler = (event) => {
+    const { scrollTop } = event.currentTarget;
+
+    if (listRef.current !== null) {
+      listRef.current.scrollTo(scrollTop);
+    }
+  };
+
+  return (
+    <>
+      <CustomScrollbar onScroll={handleScroll} hideHorizontalTrack={true} scrollTop={scrollTop}>
+        <VariableSizeList
+          // This component needs an unmount/remount when row height or page changes
+          key={rowHeight + pageIndex}
+          height={listHeight}
+          itemCount={itemCount}
+          itemSize={getItemSize}
+          width={'100%'}
+          ref={listRef}
+          style={{ overflow: undefined }}
+        >
+          {({ index, style }) => RenderRow({ index, style, rowHighlightIndex })}
+        </VariableSizeList>
+      </CustomScrollbar>
+    </>
+  );
+};
diff --git a/packages/grafana-ui/src/components/Table/Table.mdx b/packages/grafana-ui/src/components/Table/Table.mdx
index f4879965e2d51..bfb25d7517c19 100644
--- a/packages/grafana-ui/src/components/Table/Table.mdx
+++ b/packages/grafana-ui/src/components/Table/Table.mdx
@@ -13,6 +13,12 @@ This nested fields values can contain an array of one or more dataframes. Each o
 
 For each dataframe and index in the nested field, the dataframe will be rendered as one or more sub-tables below the main dataframe row at that index.
 
+### Unique rowId
+
+In some cases it makes sense to persist the opened/closed state of the sub-tables. For example: with streaming queries where a user may manipulate the state while additional data is still loading. In such cases use `dataframe.meta.uniqueRowIdFields` property to specify which fields create unique row id and table will use it to persist the state across data changes.
+
+## Custom dataframe properties
+
 Each dataframe also supports using the following custom property under `dataframe.meta.custom`:
 
 - **noHeader**: boolean - Hides that sub-tables header.
diff --git a/packages/grafana-ui/src/components/Table/Table.test.tsx b/packages/grafana-ui/src/components/Table/Table.test.tsx
index 4b2322923d4e9..3d3fc8f5e16c3 100644
--- a/packages/grafana-ui/src/components/Table/Table.test.tsx
+++ b/packages/grafana-ui/src/components/Table/Table.test.tsx
@@ -4,60 +4,85 @@ import React from 'react';
 
 import { applyFieldOverrides, createTheme, DataFrame, FieldType, toDataFrame } from '@grafana/data';
 
+import { Icon } from '../Icon/Icon';
+
 import { Table } from './Table';
-import { Props } from './types';
-
-function getDefaultDataFrame(): DataFrame {
-  const dataFrame = toDataFrame({
-    name: 'A',
-    fields: [
-      {
-        name: 'time',
-        type: FieldType.time,
-        values: [1609459200000, 1609470000000, 1609462800000, 1609466400000],
-        config: {
-          custom: {
-            filterable: false,
-          },
+import { CustomHeaderRendererProps, Props } from './types';
+
+// mock transition styles to ensure consistent behaviour in unit tests
+jest.mock('@floating-ui/react', () => ({
+  ...jest.requireActual('@floating-ui/react'),
+  useTransitionStyles: () => ({
+    styles: {},
+  }),
+}));
+
+const dataFrameData = {
+  name: 'A',
+  fields: [
+    {
+      name: 'time',
+      type: FieldType.time,
+      values: [1609459200000, 1609470000000, 1609462800000, 1609466400000],
+      config: {
+        custom: {
+          filterable: false,
         },
       },
-      {
-        name: 'temperature',
-        type: FieldType.number,
-        values: [10, NaN, 11, 12],
-        config: {
-          custom: {
-            filterable: false,
-          },
-          links: [
-            {
-              targetBlank: true,
-              title: 'Value link',
-              url: '${__value.text}',
-            },
-          ],
+    },
+    {
+      name: 'temperature',
+      type: FieldType.number,
+      values: [10, NaN, 11, 12],
+      config: {
+        custom: {
+          filterable: false,
+          headerComponent: (props: CustomHeaderRendererProps) => (
+            <span>
+              {props.defaultContent}
+              <Icon aria-label={'header-icon'} name={'ellipsis-v'} />
+            </span>
+          ),
         },
-      },
-      {
-        name: 'img',
-        type: FieldType.string,
-        values: ['data:image/png;base64,1', 'data:image/png;base64,2', 'data:image/png;base64,3'],
-        config: {
-          custom: {
-            filterable: false,
-            displayMode: 'image',
+        links: [
+          {
+            targetBlank: true,
+            title: 'Value link',
+            url: '${__value.text}',
           },
-          links: [
-            {
-              targetBlank: true,
-              title: 'Image link',
-              url: '${__value.text}',
-            },
-          ],
+        ],
+      },
+    },
+    {
+      name: 'img',
+      type: FieldType.string,
+      values: ['data:image/png;base64,1', 'data:image/png;base64,2', 'data:image/png;base64,3'],
+      config: {
+        custom: {
+          filterable: false,
+          displayMode: 'image',
         },
+        links: [
+          {
+            targetBlank: true,
+            title: 'Image link',
+            url: '${__value.text}',
+          },
+        ],
       },
-    ],
-  });
+    },
+  ],
+};
+
+const fullDataFrame = toDataFrame(dataFrameData);
+
+const emptyValuesDataFrame = toDataFrame({
+  ...dataFrameData,
+  // Remove all values
+  fields: dataFrameData.fields.map((field) => ({ ...field, values: [] })),
+});
+
+function getDataFrame(dataFrame: DataFrame): DataFrame {
   return applyOverrides(dataFrame);
 }
 
@@ -68,7 +93,7 @@ function applyOverrides(dataFrame: DataFrame) {
       defaults: {},
       overrides: [],
     },
-    replaceVariables: (value, vars, format) => {
+    replaceVariables: (value, vars, _format) => {
       return vars && value === '${__value.text}' ? '${__value.text} interpolation' : value;
     },
     timeZone: 'utc',
@@ -83,12 +108,13 @@ function getTestContext(propOverrides: Partial<Props> = {}) {
   const onColumnResize = jest.fn();
   const props: Props = {
     ariaLabel: 'aria-label',
-    data: getDefaultDataFrame(),
+    data: getDataFrame(fullDataFrame),
     height: 600,
     width: 800,
     onSortByChange,
     onCellFilterAdded,
     onColumnResize,
+    initialRowIndex: undefined,
   };
 
   Object.assign(props, propOverrides);
@@ -127,16 +153,53 @@ function getRowsData(rows: HTMLElement[]): Object[] {
 }
 
 describe('Table', () => {
-  describe('when mounted without data', () => {
-    it('then no data to show should be displayed', () => {
-      getTestContext({ data: toDataFrame([]) });
-      expect(getTable()).toBeInTheDocument();
-      expect(screen.queryByRole('row')).not.toBeInTheDocument();
-      expect(screen.getByText(/No data/i)).toBeInTheDocument();
+  describe('when mounted with EMPTY data', () => {
+    describe('and Standard Options `No value` value is NOT set', () => {
+      it('the default `no data` message should be displayed', () => {
+        getTestContext({ data: toDataFrame([]) });
+        expect(getTable()).toBeInTheDocument();
+        expect(screen.queryByRole('row')).not.toBeInTheDocument();
+        expect(screen.getByText(/No data/i)).toBeInTheDocument();
+      });
+    });
+
+    describe('and Standard Options `No value` value IS set', () => {
+      it('the `No value` Standard Options message should be displayed', () => {
+        const noValuesDisplayText = 'All healthy';
+        getTestContext({
+          data: toDataFrame([]),
+          fieldConfig: { defaults: { noValue: noValuesDisplayText }, overrides: [] },
+        });
+        expect(getTable()).toBeInTheDocument();
+        expect(screen.queryByRole('row')).not.toBeInTheDocument();
+        expect(screen.getByText(noValuesDisplayText)).toBeInTheDocument();
+      });
     });
   });
 
   describe('when mounted with data', () => {
+    describe('but empty values', () => {
+      describe('and Standard Options `No value` value is NOT set', () => {
+        it('the default `no data` message should be displayed', () => {
+          getTestContext({ data: getDataFrame(emptyValuesDataFrame) });
+          expect(getTable()).toBeInTheDocument();
+          expect(screen.getByText(/No data/i)).toBeInTheDocument();
+        });
+      });
+
+      describe('and Standard Options `No value` value IS set', () => {
+        it('the `No value` Standard Options message should be displayed', () => {
+          const noValuesDisplayText = 'All healthy';
+          getTestContext({
+            data: getDataFrame(emptyValuesDataFrame),
+            fieldConfig: { defaults: { noValue: noValuesDisplayText }, overrides: [] },
+          });
+          expect(getTable()).toBeInTheDocument();
+          expect(screen.getByText(noValuesDisplayText)).toBeInTheDocument();
+        });
+      });
+    });
+
     it('then correct rows should be rendered', () => {
       getTestContext();
       expect(getTable()).toBeInTheDocument();
@@ -183,6 +246,19 @@ describe('Table', () => {
     });
   });
 
+  describe('custom header', () => {
+    it('Should be rendered', async () => {
+      getTestContext();
+
+      await userEvent.click(within(getColumnHeader(/temperature/)).getByText(/temperature/i));
+      await userEvent.click(within(getColumnHeader(/temperature/)).getByText(/temperature/i));
+
+      const rows = within(getTable()).getAllByRole('row');
+      expect(rows).toHaveLength(5);
+      expect(within(rows[0]).getByLabelText('header-icon')).toBeInTheDocument();
+    });
+  });
+
   describe('on filtering', () => {
     it('the rows should be filtered', async () => {
       getTestContext({
@@ -342,7 +418,7 @@ describe('Table', () => {
       const onColumnResize = jest.fn();
       const props: Props = {
         ariaLabel: 'aria-label',
-        data: getDefaultDataFrame(),
+        data: getDataFrame(fullDataFrame),
         height: 600,
         width: 800,
         onSortByChange,
@@ -484,7 +560,7 @@ describe('Table', () => {
       const onColumnResize = jest.fn();
       const props: Props = {
         ariaLabel: 'aria-label',
-        data: getDefaultDataFrame(),
+        data: getDataFrame(fullDataFrame),
         height: 600,
         width: 800,
         onSortByChange,
@@ -540,7 +616,7 @@ describe('Table', () => {
           })
         );
 
-      const defaultFrame = getDefaultDataFrame();
+      const defaultFrame = getDataFrame(fullDataFrame);
 
       getTestContext({
         data: applyOverrides({
@@ -657,4 +733,19 @@ describe('Table', () => {
       expect(subTable.style.height).toBe('108px');
     });
   });
+
+  describe('when mounted with scrolled to specific row', () => {
+    it('the row should be visible', async () => {
+      getTestContext({
+        initialRowIndex: 2,
+      });
+      expect(getTable()).toBeInTheDocument();
+
+      const rows = within(getTable()).getAllByRole('row');
+      expect(rows).toHaveLength(5);
+
+      let selected = within(getTable()).getByRole('row', { selected: true });
+      expect(selected).toBeVisible();
+    });
+  });
 });
diff --git a/packages/grafana-ui/src/components/Table/Table.tsx b/packages/grafana-ui/src/components/Table/Table.tsx
index 398732e792204..b418401bc94cc 100644
--- a/packages/grafana-ui/src/components/Table/Table.tsx
+++ b/packages/grafana-ui/src/components/Table/Table.tsx
@@ -1,7 +1,5 @@
-import { css, cx } from '@emotion/css';
-import React, { CSSProperties, memo, useCallback, useEffect, useMemo, useRef, useState, UIEventHandler } from 'react';
+import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import {
-  Cell,
   useAbsoluteLayout,
   useExpanded,
   useFilters,
@@ -12,7 +10,7 @@ import {
 } from 'react-table';
 import { VariableSizeList } from 'react-window';
 
-import { FieldType, ReducerID } from '@grafana/data';
+import { FieldType, ReducerID, getRowUniqueId } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { TableCellHeight } from '@grafana/schema';
 
@@ -20,10 +18,9 @@ import { useTheme2 } from '../../themes';
 import { CustomScrollbar } from '../CustomScrollbar/CustomScrollbar';
 import { Pagination } from '../Pagination/Pagination';
 
-import { getExpandedRowHeight, ExpandedRow } from './ExpandedRow';
 import { FooterRow } from './FooterRow';
 import { HeaderRow } from './HeaderRow';
-import { TableCell } from './TableCell';
+import { RowsList } from './RowsList';
 import { useFixScrollbarContainer, useResetVariableListSizeCache } from './hooks';
 import { getInitialState, useTableStateReducer } from './reducer';
 import { useTableStyles } from './styles';
@@ -32,6 +29,7 @@ import { getColumns, sortCaseInsensitive, sortNumber, getFooterItems, createFoot
 
 const COLUMN_MIN_WIDTH = 150;
 const FOOTER_ROW_HEIGHT = 36;
+const NO_DATA_TEXT = 'No data';
 
 export const Table = memo((props: Props) => {
   const {
@@ -50,6 +48,9 @@ export const Table = memo((props: Props) => {
     enablePagination,
     cellHeight = TableCellHeight.Sm,
     timeRange,
+    enableSharedCrosshair = false,
+    initialRowIndex = undefined,
+    fieldConfig,
   } = props;
 
   const listRef = useRef<VariableSizeList>(null);
@@ -59,6 +60,7 @@ export const Table = memo((props: Props) => {
   const tableStyles = useTableStyles(theme, cellHeight);
   const headerHeight = noHeader ? 0 : tableStyles.rowHeight;
   const [footerItems, setFooterItems] = useState<FooterItem[] | undefined>(footerValues);
+  const noValuesDisplayText = fieldConfig?.defaults?.noValue ?? NO_DATA_TEXT;
 
   const footerHeight = useMemo(() => {
     const EXTENDED_ROW_HEIGHT = FOOTER_ROW_HEIGHT;
@@ -131,8 +133,12 @@ export const Table = memo((props: Props) => {
     },
   });
 
-  const options: any = useMemo(
-    () => ({
+  const hasUniqueId = !!data.meta?.uniqueRowIdFields?.length;
+
+  const options: any = useMemo(() => {
+    // This is a bit hard to type with the react-table types here, the reducer does not actually match with the
+    // TableOptions.
+    const options: any = {
       columns: memoizedColumns,
       data: memoizedData,
       disableResizing: !resizable,
@@ -141,12 +147,24 @@ export const Table = memo((props: Props) => {
       initialState: getInitialState(initialSortBy, memoizedColumns),
       autoResetFilters: false,
       sortTypes: {
-        number: sortNumber, // the builtin number type on react-table does not handle NaN values
-        'alphanumeric-insensitive': sortCaseInsensitive, // should be replace with the builtin string when react-table is upgraded, see https://github.com/tannerlinsley/react-table/pull/3235
+        // the builtin number type on react-table does not handle NaN values
+        number: sortNumber,
+        // should be replaced with the builtin string when react-table is upgraded,
+        // see https://github.com/tannerlinsley/react-table/pull/3235
+        'alphanumeric-insensitive': sortCaseInsensitive,
       },
-    }),
-    [initialSortBy, memoizedColumns, memoizedData, resizable, stateReducer]
-  );
+    };
+    if (hasUniqueId) {
+      // row here is just always 0 because here we don't use real data but just a dummy array filled with 0.
+      // See memoizedData variable above.
+      options.getRowId = (row: Record<string, unknown>, relativeIndex: number) => getRowUniqueId(data, relativeIndex);
+
+      // If we have unique field we assume we can count on it as being globally unique, and we don't need to reset when
+      // data changes.
+      options.autoResetExpanded = false;
+    }
+    return options;
+  }, [initialSortBy, memoizedColumns, memoizedData, resizable, stateReducer, hasUniqueId, data]);
 
   const {
     getTableProps,
@@ -166,12 +184,6 @@ export const Table = memo((props: Props) => {
   const extendedState = state as GrafanaTableState;
   toggleAllRowsExpandedRef.current = toggleAllRowsExpanded;
 
-  const expandedRowsRepr = JSON.stringify(Object.keys(state.expanded));
-  useEffect(() => {
-    // Reset the list size cache when the expanded rows change
-    listRef.current?.resetAfterIndex(0);
-  }, [expandedRowsRepr]);
-
   /*
     Footer value calculation is being moved in the Table component and the footerValues prop will be deprecated.
     The footerValues prop is still used in the Table component for backwards compatibility. Adding the
@@ -228,66 +240,19 @@ export const Table = memo((props: Props) => {
     setPageSize(pageSize);
   }, [pageSize, setPageSize]);
 
-  useResetVariableListSizeCache(extendedState, listRef, data);
-  useFixScrollbarContainer(variableSizeListScrollbarRef, tableDivRef);
-
-  const rowIndexForPagination = useCallback(
-    (index: number) => {
-      return state.pageIndex * state.pageSize + index;
-    },
-    [state.pageIndex, state.pageSize]
-  );
-
-  const RenderRow = useCallback(
-    ({ index, style }: { index: number; style: CSSProperties }) => {
-      const indexForPagination = rowIndexForPagination(index);
-      const row = rows[indexForPagination];
-
-      prepareRow(row);
-
-      const expandedRowStyle = state.expanded[row.index] ? css({ '&:hover': { background: 'inherit' } }) : {};
+  useEffect(() => {
+    // Reset page index when data changes
+    // This is needed because react-table does not do this automatically
+    // autoResetPage is set to false because setting it to true causes the issue described in
+    // https://github.com/grafana/grafana/pull/67477
+    if (data.length / pageSize < state.pageIndex) {
+      gotoPage(0);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [data]);
 
-      return (
-        <div {...row.getRowProps({ style })} className={cx(tableStyles.row, expandedRowStyle)}>
-          {/*add the nested data to the DOM first to prevent a 1px border CSS issue on the last cell of the row*/}
-          {nestedDataField && state.expanded[row.index] && (
-            <ExpandedRow
-              nestedData={nestedDataField}
-              tableStyles={tableStyles}
-              rowIndex={index}
-              width={width}
-              cellHeight={cellHeight}
-            />
-          )}
-          {row.cells.map((cell: Cell, index: number) => (
-            <TableCell
-              key={index}
-              tableStyles={tableStyles}
-              cell={cell}
-              onCellFilterAdded={onCellFilterAdded}
-              columnIndex={index}
-              columnCount={row.cells.length}
-              timeRange={timeRange}
-              frame={data}
-            />
-          ))}
-        </div>
-      );
-    },
-    [
-      rowIndexForPagination,
-      rows,
-      prepareRow,
-      state.expanded,
-      tableStyles,
-      nestedDataField,
-      width,
-      cellHeight,
-      onCellFilterAdded,
-      timeRange,
-      data,
-    ]
-  );
+  useResetVariableListSizeCache(extendedState, listRef, data, hasUniqueId);
+  useFixScrollbarContainer(variableSizeListScrollbarRef, tableDivRef);
 
   const onNavigate = useCallback(
     (toPage: number) => {
@@ -322,24 +287,6 @@ export const Table = memo((props: Props) => {
     );
   }
 
-  const getItemSize = (index: number): number => {
-    const indexForPagination = rowIndexForPagination(index);
-    const row = rows[indexForPagination];
-    if (state.expanded[row.index] && nestedDataField) {
-      return getExpandedRowHeight(nestedDataField, index, tableStyles);
-    }
-
-    return tableStyles.rowHeight;
-  };
-
-  const handleScroll: UIEventHandler = (event) => {
-    const { scrollTop } = event.currentTarget;
-
-    if (listRef.current !== null) {
-      listRef.current.scrollTo(scrollTop);
-    }
-  };
-
   return (
     <div
       {...getTableProps()}
@@ -356,24 +303,31 @@ export const Table = memo((props: Props) => {
           )}
           {itemCount > 0 ? (
             <div data-testid={selectors.components.Panels.Visualization.Table.body} ref={variableSizeListScrollbarRef}>
-              <CustomScrollbar onScroll={handleScroll} hideHorizontalTrack={true}>
-                <VariableSizeList
-                  // This component needs an unmount/remount when row height or page changes
-                  key={tableStyles.rowHeight + state.pageIndex}
-                  height={listHeight}
-                  itemCount={itemCount}
-                  itemSize={getItemSize}
-                  width={'100%'}
-                  ref={listRef}
-                  style={{ overflow: undefined }}
-                >
-                  {RenderRow}
-                </VariableSizeList>
-              </CustomScrollbar>
+              <RowsList
+                data={data}
+                rows={rows}
+                width={width}
+                cellHeight={cellHeight}
+                headerHeight={headerHeight}
+                rowHeight={tableStyles.rowHeight}
+                itemCount={itemCount}
+                pageIndex={state.pageIndex}
+                listHeight={listHeight}
+                listRef={listRef}
+                tableState={state}
+                prepareRow={prepareRow}
+                timeRange={timeRange}
+                onCellFilterAdded={onCellFilterAdded}
+                nestedDataField={nestedDataField}
+                tableStyles={tableStyles}
+                footerPaginationEnabled={Boolean(enablePagination)}
+                enableSharedCrosshair={enableSharedCrosshair}
+                initialRowIndex={initialRowIndex}
+              />
             </div>
           ) : (
-            <div style={{ height: height - headerHeight }} className={tableStyles.noData}>
-              No data
+            <div style={{ height: height - headerHeight, width }} className={tableStyles.noData}>
+              {noValuesDisplayText}
             </div>
           )}
           {footerItems && (
diff --git a/packages/grafana-ui/src/components/Table/TableCell.tsx b/packages/grafana-ui/src/components/Table/TableCell.tsx
index 8b0452a855076..4419560aa93ec 100644
--- a/packages/grafana-ui/src/components/Table/TableCell.tsx
+++ b/packages/grafana-ui/src/components/Table/TableCell.tsx
@@ -15,9 +15,10 @@ export interface Props {
   timeRange?: TimeRange;
   userProps?: object;
   frame: DataFrame;
+  rowStyled?: boolean;
 }
 
-export const TableCell = ({ cell, tableStyles, onCellFilterAdded, timeRange, userProps, frame }: Props) => {
+export const TableCell = ({ cell, tableStyles, onCellFilterAdded, timeRange, userProps, frame, rowStyled }: Props) => {
   const cellProps = cell.getCellProps();
   const field = (cell.column as unknown as GrafanaTableColumn).field;
 
@@ -43,6 +44,7 @@ export const TableCell = ({ cell, tableStyles, onCellFilterAdded, timeRange, use
         timeRange,
         userProps,
         frame,
+        rowStyled,
       })}
     </>
   );
diff --git a/packages/grafana-ui/src/components/Table/TableCellInspectModal.tsx b/packages/grafana-ui/src/components/Table/TableCellInspectModal.tsx
index 0f6611f844fdc..37729684b149a 100644
--- a/packages/grafana-ui/src/components/Table/TableCellInspectModal.tsx
+++ b/packages/grafana-ui/src/components/Table/TableCellInspectModal.tsx
@@ -14,9 +14,18 @@ interface TableCellInspectModalProps {
 export function TableCellInspectModal({ value, onDismiss, mode }: TableCellInspectModalProps) {
   let displayValue = value;
   if (isString(value)) {
-    try {
-      value = JSON.parse(value);
-    } catch {} // ignore errors
+    const trimmedValue = value.trim();
+    // Exclude numeric strings like '123' from being displayed in code/JSON mode
+    if (trimmedValue[0] === '{' || trimmedValue[0] === '[' || mode === 'code') {
+      try {
+        value = JSON.parse(value);
+        mode = 'code';
+      } catch {
+        mode = 'text';
+      } // ignore errors
+    } else {
+      mode = 'text';
+    }
   } else {
     displayValue = JSON.stringify(value, null, ' ');
   }
diff --git a/packages/grafana-ui/src/components/Table/hooks.ts b/packages/grafana-ui/src/components/Table/hooks.ts
index 870abc3c7e2e6..f6060fd15c519 100644
--- a/packages/grafana-ui/src/components/Table/hooks.ts
+++ b/packages/grafana-ui/src/components/Table/hooks.ts
@@ -23,7 +23,7 @@ export function useFixScrollbarContainer(
       // Select Table custom scrollbars
       const tableScrollbarView = tableDivRef.current.firstChild;
 
-      //If they exists, move the scrollbar element to the Table container scope
+      //If they exist, move the scrollbar element to the Table container scope
       if (tableScrollbarView && listVerticalScrollbarHTML) {
         listVerticalScrollbarHTML.remove();
         if (tableScrollbarView instanceof HTMLElement) {
@@ -36,41 +36,47 @@ export function useFixScrollbarContainer(
 }
 
 /**
-  react-table caches the height of cells so we need to reset them when expanding/collapsing rows
-   We need to take the minimum of the current expanded indexes and the previous expandedIndexes array to account
-  for collapsed rows, since they disappear from expandedIndexes but still keep their expanded height
+  react-table caches the height of cells, so we need to reset them when expanding/collapsing rows.
+  We use `lastExpandedOrCollapsedIndex` since collapsed rows disappear from `expandedIndexes` but still keep their expanded
+  height.
  */
 export function useResetVariableListSizeCache(
   extendedState: GrafanaTableState,
   listRef: React.RefObject<VariableSizeList>,
-  data: DataFrame
+  data: DataFrame,
+  hasUniqueId: boolean
 ) {
+  // Make sure we trigger the reset when keys change in any way
+  const expandedRowsRepr = JSON.stringify(Object.keys(extendedState.expanded));
+
   useEffect(() => {
-    if (extendedState.lastExpandedIndex !== undefined) {
-      // Gets the expanded row with the lowest index. Needed to reset all expanded row heights from that index on
-      let resetIndex = extendedState.lastExpandedIndex;
-      const expandedIndexes = Object.keys(extendedState.expanded);
-      if (expandedIndexes.length > 0) {
-        const lowestExpandedIndex = parseInt(expandedIndexes[0], 10);
-        if (!isNaN(lowestExpandedIndex)) {
-          resetIndex = Math.min(resetIndex, lowestExpandedIndex);
-        }
+    // By default, reset all rows
+    let resetIndex = 0;
+
+    // If we have unique field, extendedState.expanded keys are not row indexes but IDs so instead of trying to search
+    // for correct index we just reset the whole table.
+    if (!hasUniqueId) {
+      // If we don't have we reset from the last changed index.
+      if (Number.isFinite(extendedState.lastExpandedOrCollapsedIndex)) {
+        resetIndex = extendedState.lastExpandedOrCollapsedIndex!;
       }
 
-      const index =
+      // Account for paging.
+      resetIndex =
         extendedState.pageIndex === 0
           ? resetIndex - 1
           : resetIndex - extendedState.pageIndex - extendedState.pageIndex * extendedState.pageSize;
-      listRef.current?.resetAfterIndex(Math.max(index, 0));
-      return;
     }
+
+    listRef.current?.resetAfterIndex(Math.max(resetIndex, 0));
+    return;
   }, [
-    extendedState.lastExpandedIndex,
-    extendedState.toggleRowExpandedCounter,
-    extendedState.pageIndex,
+    extendedState.lastExpandedOrCollapsedIndex,
     extendedState.pageSize,
+    extendedState.pageIndex,
     listRef,
     data,
-    extendedState.expanded,
+    expandedRowsRepr,
+    hasUniqueId,
   ]);
 }
diff --git a/packages/grafana-ui/src/components/Table/reducer.ts b/packages/grafana-ui/src/components/Table/reducer.ts
index 1cac3c99ed6d0..1f450d4a8bacf 100644
--- a/packages/grafana-ui/src/components/Table/reducer.ts
+++ b/packages/grafana-ui/src/components/Table/reducer.ts
@@ -50,8 +50,7 @@ export function useTableStateReducer({ onColumnResize, onSortByChange, data }: P
           if (action.id) {
             return {
               ...newState,
-              lastExpandedIndex: parseInt(action.id, 10),
-              toggleRowExpandedCounter: newState.toggleRowExpandedCounter + 1,
+              lastExpandedOrCollapsedIndex: parseInt(action.id, 10),
             };
           }
         }
@@ -67,9 +66,7 @@ export function getInitialState(
   initialSortBy: Props['initialSortBy'],
   columns: GrafanaTableColumn[]
 ): Partial<GrafanaTableState> {
-  const state: Partial<GrafanaTableState> = {
-    toggleRowExpandedCounter: 0,
-  };
+  const state: Partial<GrafanaTableState> = {};
 
   if (initialSortBy) {
     state.sortBy = [];
diff --git a/packages/grafana-ui/src/components/Table/styles.ts b/packages/grafana-ui/src/components/Table/styles.ts
index 13632af7ff061..e4f7e20f0c643 100644
--- a/packages/grafana-ui/src/components/Table/styles.ts
+++ b/packages/grafana-ui/src/components/Table/styles.ts
@@ -15,7 +15,9 @@ export function useTableStyles(theme: GrafanaTheme2, cellHeightOption: TableCell
     color?: string,
     background?: string,
     overflowOnHover?: boolean,
-    asCellText?: boolean
+    asCellText?: boolean,
+    textShouldWrap?: boolean,
+    rowStyled?: boolean
   ) => {
     return css({
       label: overflowOnHover ? 'cellContainerOverflow' : 'cellContainerNoOverflow',
@@ -24,7 +26,7 @@ export function useTableStyles(theme: GrafanaTheme2, cellHeightOption: TableCell
       // Cell height need to account for row border
       height: `${rowHeight - 1}px`,
 
-      display: asCellText ? 'block' : 'flex',
+      display: 'flex',
 
       ...(asCellText
         ? {
@@ -38,8 +40,8 @@ export function useTableStyles(theme: GrafanaTheme2, cellHeightOption: TableCell
       alignItems: 'center',
       borderRight: `1px solid ${borderColor}`,
 
-      color: color ?? undefined,
-      background: background ?? undefined,
+      color: rowStyled ? 'inherit' : color ?? undefined,
+      background: rowStyled ? undefined : background ?? undefined,
       backgroundClip: 'padding-box',
 
       '&:last-child:not(:only-child)': {
@@ -48,14 +50,20 @@ export function useTableStyles(theme: GrafanaTheme2, cellHeightOption: TableCell
 
       '&:hover': {
         overflow: overflowOnHover ? 'visible' : undefined,
-        width: overflowOnHover ? 'auto !important' : undefined,
+        width: textShouldWrap || !overflowOnHover ? 'auto' : 'auto !important',
+        height: textShouldWrap || overflowOnHover ? 'auto !important' : `${rowHeight - 1}px`,
+        minHeight: `${rowHeight - 1}px`,
+        wordBreak: textShouldWrap ? 'break-word' : undefined,
+        whiteSpace: textShouldWrap && overflowOnHover ? 'normal' : 'nowrap',
         boxShadow: overflowOnHover ? `0 0 2px ${theme.colors.primary.main}` : undefined,
-        background: overflowOnHover ? background ?? theme.components.table.rowHoverBackground : undefined,
-        zIndex: overflowOnHover ? 1 : undefined,
+        background: rowStyled ? 'inherit' : background ?? theme.colors.background.primary,
+        zIndex: 1,
         '.cellActions': {
+          color: '#FFF',
           visibility: 'visible',
           opacity: 1,
           width: 'auto',
+          background: 'rgba(0, 0, 0, 0.6)',
         },
       },
 
@@ -66,7 +74,7 @@ export function useTableStyles(theme: GrafanaTheme2, cellHeightOption: TableCell
       '.cellActions': {
         display: 'flex',
         position: overflowOnHover ? undefined : 'absolute',
-        top: overflowOnHover ? undefined : 0,
+        top: overflowOnHover ? undefined : '1px',
         right: overflowOnHover ? undefined : 0,
         margin: overflowOnHover ? theme.spacing(0, -0.5, 0, 0.5) : 'auto',
         visibility: 'hidden',
@@ -74,8 +82,8 @@ export function useTableStyles(theme: GrafanaTheme2, cellHeightOption: TableCell
         width: 0,
         alignItems: 'center',
         height: '100%',
-        padding: theme.spacing(1, 0.5, 1, 0.5),
-        background: background ? 'none' : theme.colors.emphasize(theme.colors.background.primary, 0.03),
+        padding: theme.spacing(1, 0.5, 1, 1),
+        background: background ? 'none' : 'rgba(0, 0, 0, 0.5)',
 
         svg: {
           color,
@@ -179,6 +187,7 @@ export function useTableStyles(theme: GrafanaTheme2, cellHeightOption: TableCell
       whiteSpace: 'nowrap',
       color: theme.colors.text.link,
       fontWeight: theme.typography.fontWeightMedium,
+      paddingRight: theme.spacing(1.5),
       '&:hover': {
         textDecoration: 'underline',
         color: theme.colors.text.link,
diff --git a/packages/grafana-ui/src/components/Table/types.ts b/packages/grafana-ui/src/components/Table/types.ts
index 1cb4f5d85b489..160edbc2742e6 100644
--- a/packages/grafana-ui/src/components/Table/types.ts
+++ b/packages/grafana-ui/src/components/Table/types.ts
@@ -2,7 +2,7 @@ import { Property } from 'csstype';
 import { FC } from 'react';
 import { CellProps, Column, Row, TableState, UseExpandedRowProps } from 'react-table';
 
-import { DataFrame, Field, KeyValue, SelectableValue, TimeRange } from '@grafana/data';
+import { DataFrame, Field, KeyValue, SelectableValue, TimeRange, FieldConfigSource } from '@grafana/data';
 import * as schema from '@grafana/schema';
 
 import { TableStyles } from './styles';
@@ -67,8 +67,10 @@ export interface TableFooterCalc {
 }
 
 export interface GrafanaTableState extends TableState {
-  lastExpandedIndex?: number;
-  toggleRowExpandedCounter: number;
+  // We manually track this to know where to reset the row heights. This is needed because react-table removed the
+  // collapsed IDs/indexes from the state.expanded map so when collapsing we would have to do a diff of current and
+  // previous state.expanded to know what changed.
+  lastExpandedOrCollapsedIndex?: number;
 }
 
 export interface GrafanaTableRow extends Row, UseExpandedRowProps<{}> {}
@@ -94,6 +96,10 @@ export interface Props {
   cellHeight?: schema.TableCellHeight;
   /** @alpha Used by SparklineCell when provided */
   timeRange?: TimeRange;
+  enableSharedCrosshair?: boolean;
+  // The index of the field value that the table will initialize scrolled to
+  initialRowIndex?: number;
+  fieldConfig?: FieldConfigSource;
 }
 
 /**
@@ -118,9 +124,26 @@ export interface TableCustomCellOptions {
   type: schema.TableCellDisplayMode.Custom;
 }
 
+/**
+ * @alpha
+ * Props that will be passed to the TableCustomCellOptions.cellComponent when rendered.
+ */
+export interface CustomHeaderRendererProps {
+  field: Field;
+  defaultContent: React.ReactNode;
+}
+
 // As cue/schema cannot define function types (as main point of schema is to be serializable) we have to extend the
 // types here with the dynamic API. This means right now this is not usable as a table panel option for example.
 export type TableCellOptions = schema.TableCellOptions | TableCustomCellOptions;
 export type TableFieldOptions = Omit<schema.TableFieldOptions, 'cellOptions'> & {
   cellOptions: TableCellOptions;
+  headerComponent?: React.ComponentType<CustomHeaderRendererProps>;
 };
+
+// Cell background and text colors
+// Can also be used for table rows
+export interface CellColors {
+  textColor?: string;
+  bgColor?: string;
+}
diff --git a/packages/grafana-ui/src/components/Table/utils.ts b/packages/grafana-ui/src/components/Table/utils.ts
index 91c18ebc02997..5605e3c61752c 100644
--- a/packages/grafana-ui/src/components/Table/utils.ts
+++ b/packages/grafana-ui/src/components/Table/utils.ts
@@ -2,6 +2,7 @@ import { Property } from 'csstype';
 import { clone } from 'lodash';
 import memoize from 'micro-memoize';
 import { Row } from 'react-table';
+import tinycolor from 'tinycolor2';
 
 import {
   DataFrame,
@@ -27,7 +28,10 @@ import {
   TableCellDisplayMode,
 } from '@grafana/schema';
 
+import { getTextColorForAlphaBackground } from '../../utils';
+
 import { BarGaugeCell } from './BarGaugeCell';
+import { DataLinksCell } from './DataLinksCell';
 import { DefaultCell } from './DefaultCell';
 import { getFooterValue } from './FooterRow';
 import { GeoCell } from './GeoCell';
@@ -35,6 +39,7 @@ import { ImageCell } from './ImageCell';
 import { JSONViewCell } from './JSONViewCell';
 import { RowExpander } from './RowExpander';
 import { SparklineCell } from './SparklineCell';
+import { TableStyles } from './styles';
 import {
   CellComponent,
   TableCellOptions,
@@ -42,6 +47,7 @@ import {
   FooterItem,
   GrafanaTableColumn,
   TableFooterCalc,
+  CellColors,
 } from './types';
 
 export const EXPANDER_WIDTH = 50;
@@ -183,6 +189,8 @@ export function getCellComponent(displayMode: TableCellDisplayMode, field: Field
       return SparklineCell;
     case TableCellDisplayMode.JSONView:
       return JSONViewCell;
+    case TableCellDisplayMode.DataLinks:
+      return DataLinksCell;
   }
 
   if (field.type === FieldType.geo) {
@@ -382,10 +390,25 @@ export function getFooterItems(
 }
 
 function getFormattedValue(field: Field, reducer: string[], theme: GrafanaTheme2) {
-  const fmt = field.display ?? getDisplayProcessor({ field, theme });
+  // If we don't have anything to return then we display nothing
   const calc = reducer[0];
-  const v = reduceField({ field, reducers: reducer })[calc];
-  return formattedValueToString(fmt(v));
+  if (calc === undefined) {
+    return '';
+  }
+
+  // Calculate the reduction
+  const format = field.display ?? getDisplayProcessor({ field, theme });
+  const fieldCalcValue = reduceField({ field, reducers: reducer })[calc];
+
+  // If the reducer preserves units then format the
+  // end value with the field display processor
+  const reducerInfo = fieldReducers.get(calc);
+  if (reducerInfo.preservesUnits) {
+    return formattedValueToString(format(fieldCalcValue));
+  }
+
+  // Otherwise we simply return the formatted string
+  return formattedValueToString({ text: fieldCalcValue });
 }
 
 // This strips the raw vales from the `rows` object.
@@ -533,3 +556,76 @@ export function getAlignmentFactor(
     return alignmentFactor;
   }
 }
+
+// since the conversion from timeseries panel crosshair to time is pixel based, we need
+// to set a threshold where the table row highlights when the crosshair is hovered over a certain point
+// because multiple pixels (converted to times) may represent the same point/row in table
+export function isPointTimeValAroundTableTimeVal(pointTime: number, rowTime: number, threshold: number) {
+  return Math.abs(Math.floor(pointTime) - rowTime) < threshold;
+}
+
+// calculate the threshold for which we consider a point in a chart
+// to match a row in a table based on a time value
+export function calculateAroundPointThreshold(timeField: Field): number {
+  let max = -Number.MAX_VALUE;
+  let min = Number.MAX_VALUE;
+
+  if (timeField.values.length < 2) {
+    return 0;
+  }
+
+  for (let i = 0; i < timeField.values.length; i++) {
+    const value = timeField.values[i];
+    if (value > max) {
+      max = value;
+    }
+    if (value < min) {
+      min = value;
+    }
+  }
+
+  return (max - min) / timeField.values.length;
+}
+
+/**
+ * Retrieve colors for a table cell (or table row).
+ *
+ * @param tableStyles
+ *  Styles for the table
+ * @param cellOptions
+ *  Table cell configuration options
+ * @param displayValue
+ *  The value that will be displayed
+ * @returns CellColors
+ */
+export function getCellColors(
+  tableStyles: TableStyles,
+  cellOptions: TableCellOptions,
+  displayValue: DisplayValue
+): CellColors {
+  // How much to darken elements depends upon if we're in dark mode
+  const darkeningFactor = tableStyles.theme.isDark ? 1 : -0.7;
+
+  // Setup color variables
+  let textColor: string | undefined = undefined;
+  let bgColor: string | undefined = undefined;
+
+  if (cellOptions.type === TableCellDisplayMode.ColorText) {
+    textColor = displayValue.color;
+  } else if (cellOptions.type === TableCellDisplayMode.ColorBackground) {
+    const mode = cellOptions.mode ?? TableCellBackgroundDisplayMode.Gradient;
+
+    if (mode === TableCellBackgroundDisplayMode.Basic) {
+      textColor = getTextColorForAlphaBackground(displayValue.color!, tableStyles.theme.isDark);
+      bgColor = tinycolor(displayValue.color).setAlpha(0.9).toRgbString();
+    } else if (mode === TableCellBackgroundDisplayMode.Gradient) {
+      const bgColor2 = tinycolor(displayValue.color)
+        .darken(10 * darkeningFactor)
+        .spin(5);
+      textColor = getTextColorForAlphaBackground(displayValue.color!, tableStyles.theme.isDark);
+      bgColor = `linear-gradient(120deg, ${bgColor2.toRgbString()}, ${displayValue.color})`;
+    }
+  }
+
+  return { textColor, bgColor };
+}
diff --git a/packages/grafana-ui/src/components/Tabs/Counter.tsx b/packages/grafana-ui/src/components/Tabs/Counter.tsx
index 351863c7cf463..8a8c507bff25c 100644
--- a/packages/grafana-ui/src/components/Tabs/Counter.tsx
+++ b/packages/grafana-ui/src/components/Tabs/Counter.tsx
@@ -3,22 +3,7 @@ import React from 'react';
 
 import { GrafanaTheme2, locale } from '@grafana/data';
 
-import { stylesFactory, useStyles2 } from '../../themes';
-
-const getStyles = stylesFactory((theme: GrafanaTheme2) => {
-  return {
-    counter: css({
-      label: 'counter',
-      marginLeft: theme.spacing(1),
-      borderRadius: theme.spacing(3),
-      backgroundColor: theme.colors.action.hover,
-      padding: theme.spacing(0.25, 1),
-      color: theme.colors.text.secondary,
-      fontWeight: theme.typography.fontWeightMedium,
-      fontSize: theme.typography.size.sm,
-    }),
-  };
-});
+import { useStyles2 } from '../../themes';
 
 export interface CounterProps {
   value: number;
@@ -29,3 +14,16 @@ export const Counter = ({ value }: CounterProps) => {
 
   return <span className={styles.counter}>{locale(value, 0).text}</span>;
 };
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  counter: css({
+    label: 'counter',
+    marginLeft: theme.spacing(1),
+    borderRadius: theme.spacing(3),
+    backgroundColor: theme.colors.action.hover,
+    padding: theme.spacing(0.25, 1),
+    color: theme.colors.text.secondary,
+    fontWeight: theme.typography.fontWeightMedium,
+    fontSize: theme.typography.size.sm,
+  }),
+});
diff --git a/packages/grafana-ui/src/components/Tabs/Tab.tsx b/packages/grafana-ui/src/components/Tabs/Tab.tsx
index 01ae75bb5c4c1..83028989b0fae 100644
--- a/packages/grafana-ui/src/components/Tabs/Tab.tsx
+++ b/packages/grafana-ui/src/components/Tabs/Tab.tsx
@@ -7,26 +7,29 @@ import { selectors } from '@grafana/e2e-selectors';
 import { useStyles2 } from '../../themes';
 import { getFocusStyles } from '../../themes/mixins';
 import { IconName } from '../../types';
+import { clearButtonStyles } from '../Button';
 import { Icon } from '../Icon/Icon';
 
 import { Counter } from './Counter';
 
-export interface TabProps extends HTMLProps<HTMLAnchorElement> {
+export interface TabProps extends HTMLProps<HTMLElement> {
   label: string;
   active?: boolean;
   /** When provided, it is possible to use the tab as a hyperlink. Use in cases where the tabs update location. */
   href?: string;
   icon?: IconName;
-  onChangeTab?: (event?: React.MouseEvent<HTMLAnchorElement>) => void;
+  onChangeTab?: (event: React.MouseEvent<HTMLElement>) => void;
   /** A number rendered next to the text. Usually used to display the number of items in a tab's view. */
   counter?: number | null;
   /** Extra content, displayed after the tab label and counter */
   suffix?: NavModelItem['tabSuffix'];
 }
 
-export const Tab = React.forwardRef<HTMLAnchorElement, TabProps>(
+export const Tab = React.forwardRef<HTMLElement, TabProps>(
   ({ label, active, icon, onChangeTab, counter, suffix: Suffix, className, href, ...otherProps }, ref) => {
     const tabsStyles = useStyles2(getStyles);
+    const clearStyles = useStyles2(clearButtonStyles);
+
     const content = () => (
       <>
         {icon && <Icon name={icon} />}
@@ -36,23 +39,44 @@ export const Tab = React.forwardRef<HTMLAnchorElement, TabProps>(
       </>
     );
 
-    const linkClass = cx(tabsStyles.link, active ? tabsStyles.activeStyle : tabsStyles.notActive);
+    const linkClass = cx(clearStyles, tabsStyles.link, active ? tabsStyles.activeStyle : tabsStyles.notActive);
+
+    const commonProps = {
+      className: linkClass,
+      ...otherProps,
+      onClick: onChangeTab,
+      'aria-label': otherProps['aria-label'] || selectors.components.Tab.title(label),
+      role: 'tab',
+      'aria-selected': active,
+    };
+
+    if (href) {
+      return (
+        <div className={tabsStyles.item}>
+          <a
+            {...commonProps}
+            href={href}
+            // don't think we can avoid the type assertion here :(
+            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+            ref={ref as React.ForwardedRef<HTMLAnchorElement>}
+          >
+            {content()}
+          </a>
+        </div>
+      );
+    }
 
     return (
       <div className={tabsStyles.item}>
-        <a
-          // in case there is no href '#' is set in order to maintain a11y
-          href={href ? href : '#'}
-          className={linkClass}
-          {...otherProps}
-          onClick={onChangeTab}
-          aria-label={otherProps['aria-label'] || selectors.components.Tab.title(label)}
-          role="tab"
-          aria-selected={active}
-          ref={ref}
+        <button
+          {...commonProps}
+          type="button"
+          // don't think we can avoid the type assertion here :(
+          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+          ref={ref as React.ForwardedRef<HTMLButtonElement>}
         >
           {content()}
-        </a>
+        </button>
       </div>
     );
   }
@@ -103,17 +127,14 @@ const getStyles = (theme: GrafanaTheme2) => {
         },
       },
     }),
+    // Psiphon change - change active highlight color to Psiphon orange
     activeStyle: css({
       label: 'activeTabStyle',
       color: theme.colors.text.primary,
       overflow: 'hidden',
 
-      a: {
-        color: theme.colors.text.primary,
-      },
-
       '&::before': {
-        backgroundImage: theme.colors.gradients.brandHorizontal,
+        background: theme.colors.psiphon.psiphonOrangeLight,
       },
     }),
     suffix: css({
diff --git a/packages/grafana-ui/src/components/Tabs/TabContent.tsx b/packages/grafana-ui/src/components/Tabs/TabContent.tsx
index 929c7f854ddf9..76c7b88f18270 100644
--- a/packages/grafana-ui/src/components/Tabs/TabContent.tsx
+++ b/packages/grafana-ui/src/components/Tabs/TabContent.tsx
@@ -3,23 +3,14 @@ import React, { HTMLAttributes, ReactNode } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
-import { stylesFactory, useTheme2 } from '../../themes';
+import { useStyles2 } from '../../themes';
 
 interface Props extends HTMLAttributes<HTMLDivElement> {
   children: ReactNode;
 }
 
-const getTabContentStyle = stylesFactory((theme: GrafanaTheme2) => {
-  return {
-    tabContent: css({
-      background: theme.colors.background.primary,
-    }),
-  };
-});
-
 export const TabContent = ({ children, className, ...restProps }: Props) => {
-  const theme = useTheme2();
-  const styles = getTabContentStyle(theme);
+  const styles = useStyles2(getTabContentStyle);
 
   return (
     <div {...restProps} className={cx(styles.tabContent, className)}>
@@ -27,3 +18,9 @@ export const TabContent = ({ children, className, ...restProps }: Props) => {
     </div>
   );
 };
+
+const getTabContentStyle = (theme: GrafanaTheme2) => ({
+  tabContent: css({
+    background: theme.colors.background.primary,
+  }),
+});
diff --git a/packages/grafana-ui/src/components/Tags/Tag.tsx b/packages/grafana-ui/src/components/Tags/Tag.tsx
index 84742cfd98713..81a857ee4ffd0 100644
--- a/packages/grafana-ui/src/components/Tags/Tag.tsx
+++ b/packages/grafana-ui/src/components/Tags/Tag.tsx
@@ -7,6 +7,7 @@ import { GrafanaTheme2 } from '@grafana/data';
 import { useStyles2, useTheme2 } from '../../themes';
 import { IconName } from '../../types/icon';
 import { getTagColor, getTagColorsFromName } from '../../utils';
+import { SkeletonComponent, attachSkeleton } from '../../utils/skeleton';
 import { Icon } from '../Icon/Icon';
 
 /**
@@ -50,18 +51,12 @@ const TagComponent = forwardRef<HTMLElement, Props>(({ name, onClick, icon, clas
 });
 TagComponent.displayName = 'Tag';
 
-const TagSkeleton = () => {
+const TagSkeleton: SkeletonComponent = ({ rootProps }) => {
   const styles = useStyles2(getSkeletonStyles);
-  return <Skeleton width={60} height={22} containerClassName={styles.container} />;
+  return <Skeleton width={60} height={22} containerClassName={styles.container} {...rootProps} />;
 };
 
-interface TagWithSkeleton extends React.ForwardRefExoticComponent<Props & React.RefAttributes<HTMLElement>> {
-  Skeleton: typeof TagSkeleton;
-}
-
-export const Tag: TagWithSkeleton = Object.assign(TagComponent, {
-  Skeleton: TagSkeleton,
-});
+export const Tag = attachSkeleton(TagComponent, TagSkeleton);
 
 const getSkeletonStyles = () => ({
   container: css({
diff --git a/packages/grafana-ui/src/components/Tags/TagList.tsx b/packages/grafana-ui/src/components/Tags/TagList.tsx
index 6749f2fc78185..fefd90c4b4c4f 100644
--- a/packages/grafana-ui/src/components/Tags/TagList.tsx
+++ b/packages/grafana-ui/src/components/Tags/TagList.tsx
@@ -5,6 +5,7 @@ import { GrafanaTheme2 } from '@grafana/data';
 
 import { useStyles2, useTheme2 } from '../../themes';
 import { IconName } from '../../types/icon';
+import { SkeletonComponent, attachSkeleton } from '../../utils/skeleton';
 
 import { OnTagClick, Tag } from './Tag';
 
@@ -56,23 +57,17 @@ const TagListComponent = memo(
 );
 TagListComponent.displayName = 'TagList';
 
-const TagListSkeleton = () => {
+const TagListSkeleton: SkeletonComponent = ({ rootProps }) => {
   const styles = useStyles2(getSkeletonStyles);
   return (
-    <div className={styles.container}>
+    <div className={styles.container} {...rootProps}>
       <Tag.Skeleton />
       <Tag.Skeleton />
     </div>
   );
 };
 
-interface TagListWithSkeleton extends React.ForwardRefExoticComponent<Props & React.RefAttributes<HTMLUListElement>> {
-  Skeleton: typeof TagListSkeleton;
-}
-
-export const TagList: TagListWithSkeleton = Object.assign(TagListComponent, {
-  Skeleton: TagListSkeleton,
-});
+export const TagList = attachSkeleton(TagListComponent, TagListSkeleton);
 
 const getSkeletonStyles = (theme: GrafanaTheme2) => ({
   container: css({
diff --git a/packages/grafana-ui/src/components/Text/Text.mdx b/packages/grafana-ui/src/components/Text/Text.mdx
index 8d35135973fdf..30b148afc3aa9 100644
--- a/packages/grafana-ui/src/components/Text/Text.mdx
+++ b/packages/grafana-ui/src/components/Text/Text.mdx
@@ -47,6 +47,7 @@ In this documentation you can find:
 
 - Do not use the `element` prop because of its appearance, use it to organize the structure of the page.
 - Do not use color for emphasis as colors are related to states such as `error`, `success`, `disabled` and so on.
+- Do not use the `code` variant for anything other than code snippets.
 
   <br />
   <br />
diff --git a/packages/grafana-ui/src/components/Text/Text.story.tsx b/packages/grafana-ui/src/components/Text/Text.story.tsx
index 01988abef65dc..0ab0427e8c9d2 100644
--- a/packages/grafana-ui/src/components/Text/Text.story.tsx
+++ b/packages/grafana-ui/src/components/Text/Text.story.tsx
@@ -16,7 +16,10 @@ const meta: Meta = {
     },
   },
   argTypes: {
-    variant: { control: 'select', options: ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'body', 'bodySmall', undefined] },
+    variant: {
+      control: 'select',
+      options: ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'body', 'bodySmall', 'code', undefined],
+    },
     weight: {
       control: 'select',
       options: ['bold', 'medium', 'light', 'regular', undefined],
diff --git a/packages/grafana-ui/src/components/Text/Text.tsx b/packages/grafana-ui/src/components/Text/Text.tsx
index eb036f186e761..29f3a46c1134a 100644
--- a/packages/grafana-ui/src/components/Text/Text.tsx
+++ b/packages/grafana-ui/src/components/Text/Text.tsx
@@ -1,12 +1,11 @@
 import { css } from '@emotion/css';
-import React, { createElement, CSSProperties, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
-import ReactDomServer from 'react-dom/server';
+import React, { createElement, CSSProperties } from 'react';
 
 import { GrafanaTheme2, ThemeTypographyVariantTypes } from '@grafana/data';
 
 import { useStyles2 } from '../../themes';
-import { Tooltip } from '../Tooltip/Tooltip';
 
+import { TruncatedText } from './TruncatedText';
 import { customWeight, customColor, customVariant } from './utils';
 
 export interface TextProps extends Omit<React.HTMLAttributes<HTMLElement>, 'className' | 'style'> {
@@ -30,70 +29,35 @@ export interface TextProps extends Omit<React.HTMLAttributes<HTMLElement>, 'clas
 export const Text = React.forwardRef<HTMLElement, TextProps>(
   ({ element = 'span', variant, weight, color, truncate, italic, textAlignment, children, ...restProps }, ref) => {
     const styles = useStyles2(getTextStyles, element, variant, color, weight, truncate, italic, textAlignment);
-    const [isOverflowing, setIsOverflowing] = useState(false);
-    const internalRef = useRef<HTMLElement>(null);
 
-    // wire up the forwarded ref to the internal ref
-    useImperativeHandle<HTMLElement | null, HTMLElement | null>(ref, () => internalRef.current);
+    const childElement = (ref: React.ForwardedRef<HTMLElement> | undefined) => {
+      return createElement(
+        element,
+        {
+          ...restProps,
+          style: undefined, // Remove the style prop to avoid overriding the styles
+          className: styles,
+          // When overflowing, the internalRef is passed to the tooltip, which forwards it to the child element
+          ref,
+        },
+        children
+      );
+    };
 
-    const childElement = createElement(
-      element,
-      {
-        ...restProps,
-        style: undefined, // remove style prop to avoid overriding the styles
-        className: styles,
-        // when overflowing, the internalRef is passed to the tooltip which forwards it on to the child element
-        ref: isOverflowing ? undefined : internalRef,
-      },
-      children
-    );
+    // A 'span' is an inline element, so it can't be truncated
+    // and it should be wrapped in a parent element that will show the tooltip
+    if (!truncate || element === 'span') {
+      return childElement(undefined);
+    }
 
-    const resizeObserver = useMemo(
-      () =>
-        new ResizeObserver((entries) => {
-          for (const entry of entries) {
-            if (entry.target.clientWidth && entry.target.scrollWidth) {
-              if (entry.target.scrollWidth > entry.target.clientWidth) {
-                setIsOverflowing(true);
-              }
-              if (entry.target.scrollWidth <= entry.target.clientWidth) {
-                setIsOverflowing(false);
-              }
-            }
-          }
-        }),
-      []
+    return (
+      <TruncatedText
+        childElement={childElement}
+        // eslint-disable-next-line react/no-children-prop
+        children={children}
+        ref={ref}
+      />
     );
-
-    useEffect(() => {
-      const { current } = internalRef;
-      if (current && truncate) {
-        resizeObserver.observe(current);
-      }
-      return () => {
-        resizeObserver.disconnect();
-      };
-    }, [isOverflowing, resizeObserver, truncate]);
-
-    const getTooltipText = (children: NonNullable<React.ReactNode>) => {
-      if (typeof children === 'string') {
-        return children;
-      }
-      const html = ReactDomServer.renderToStaticMarkup(<>{children}</>);
-      const getRidOfTags = html.replace(/(<([^>]+)>)/gi, '');
-      return getRidOfTags;
-    };
-    // A 'span' is an inline element therefore it can't be truncated
-    // and it should be wrapped in a parent element that is the one that will show the tooltip
-    if (truncate && isOverflowing && element !== 'span') {
-      return (
-        <Tooltip ref={internalRef} content={getTooltipText(children)}>
-          {childElement}
-        </Tooltip>
-      );
-    } else {
-      return childElement;
-    }
   }
 );
 
diff --git a/packages/grafana-ui/src/components/Text/TruncatedText.tsx b/packages/grafana-ui/src/components/Text/TruncatedText.tsx
new file mode 100644
index 0000000000000..e74cbd36bb72e
--- /dev/null
+++ b/packages/grafana-ui/src/components/Text/TruncatedText.tsx
@@ -0,0 +1,64 @@
+import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
+import ReactDOMServer from 'react-dom/server';
+
+import { Tooltip } from '../Tooltip/Tooltip';
+
+interface TruncatedTextProps {
+  childElement: (ref: React.ForwardedRef<HTMLElement> | undefined) => React.ReactElement;
+  children: NonNullable<React.ReactNode>;
+}
+
+export const TruncatedText = React.forwardRef<HTMLElement, TruncatedTextProps>(({ childElement, children }, ref) => {
+  const [isOverflowing, setIsOverflowing] = useState(false);
+  const internalRef = useRef<HTMLElement>(null);
+
+  // Wire up the forwarded ref to the internal ref
+  useImperativeHandle<HTMLElement | null, HTMLElement | null>(ref, () => internalRef.current);
+
+  const resizeObserver = useMemo(
+    () =>
+      new ResizeObserver((entries) => {
+        for (const entry of entries) {
+          if (entry.target.clientWidth && entry.target.scrollWidth) {
+            if (entry.target.scrollWidth > entry.target.clientWidth) {
+              setIsOverflowing(true);
+            }
+            if (entry.target.scrollWidth <= entry.target.clientWidth) {
+              setIsOverflowing(false);
+            }
+          }
+        }
+      }),
+    []
+  );
+
+  useEffect(() => {
+    const { current } = internalRef;
+    if (current) {
+      resizeObserver.observe(current);
+    }
+    return () => {
+      resizeObserver.disconnect();
+    };
+  }, [setIsOverflowing, resizeObserver]);
+
+  const getTooltipText = (children: NonNullable<React.ReactNode>) => {
+    if (typeof children === 'string') {
+      return children;
+    }
+    const html = ReactDOMServer.renderToStaticMarkup(<>{children}</>);
+    return html.replace(/(<([^>]+)>)/gi, '');
+  };
+
+  if (isOverflowing) {
+    return (
+      <Tooltip ref={internalRef} content={getTooltipText(children)}>
+        {childElement(undefined)}
+      </Tooltip>
+    );
+  } else {
+    return childElement(internalRef);
+  }
+});
+
+TruncatedText.displayName = 'TruncatedText';
diff --git a/packages/grafana-ui/src/components/Text/Typography.internal.story.tsx b/packages/grafana-ui/src/components/Text/Typography.internal.story.tsx
new file mode 100644
index 0000000000000..d7014936a0261
--- /dev/null
+++ b/packages/grafana-ui/src/components/Text/Typography.internal.story.tsx
@@ -0,0 +1,87 @@
+import { Meta, StoryFn } from '@storybook/react';
+import React, { useState } from 'react';
+
+import { Divider } from '../Divider/Divider';
+import { Field } from '../Forms/Field';
+import { Stack } from '../Layout/Stack/Stack';
+
+import { Text } from './Text';
+
+const meta: Meta = {
+  title: 'General/Text',
+};
+
+const FONT_WEIGHTS = [/*100, 200, 300, */ 400, 500 /*600, 700, 800, 900*/];
+
+export const TypographySamples: StoryFn = () => {
+  const [fontWeight, setFontWeight] = useState(400);
+  const [fontSize, setFontSize] = useState(30);
+
+  const handleFontWeightChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    setFontWeight(Number(event.target.value));
+  };
+
+  const handleFontSizeChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    setFontSize(Number(event.target.value));
+  };
+
+  return (
+    <div style={{ fontSynthesis: 'none' }}>
+      <Field label={`Font weight - ${fontWeight}`}>
+        <input
+          type="range"
+          min={100}
+          max={900}
+          step={10}
+          value={fontWeight}
+          onChange={handleFontWeightChange}
+          style={{ width: '100%', maxWidth: 400 }}
+        />
+      </Field>
+
+      <Field label={`Font size - ${fontSize}`}>
+        <input
+          type="range"
+          min={8}
+          max={100}
+          value={fontSize}
+          onChange={handleFontSizeChange}
+          style={{ width: '100%', maxWidth: 400 }}
+        />
+      </Field>
+
+      <div style={{ fontWeight: fontWeight, fontSize: fontSize }}>Add new time series panel to Grafana dashboard</div>
+
+      <Divider />
+
+      <Stack direction="column" gap={4}>
+        {FONT_WEIGHTS.map((weight) => {
+          return (
+            <div key={weight}>
+              <Text>Font weight {weight}</Text>
+
+              <div style={{ fontWeight: weight, fontSize: fontSize }} contentEditable>
+                Add new time series panel
+                <br />
+                Figure A⃝ #⃞ 3⃝ ×⃞
+                <br />
+                3x9 12:34 3–8 +8+x
+                <br />
+                01 02 03 04 05 06 07 08 09 00
+                <br />
+                11 12 13 14 15 16 17 18 19 10
+                <div style={{ fontFeatureSettings: '"tnum"' }}>
+                  01 02 03 04 05 06 07 08 09 00
+                  <br />
+                  11 12 13 14 15 16 17 18 19 10
+                </div>
+              </div>
+            </div>
+          );
+        })}
+      </Stack>
+    </div>
+  );
+};
+
+export default meta;
diff --git a/packages/grafana-ui/src/components/TextArea/TextArea.tsx b/packages/grafana-ui/src/components/TextArea/TextArea.tsx
index bae097216e1e5..5f438b9982ce5 100644
--- a/packages/grafana-ui/src/components/TextArea/TextArea.tsx
+++ b/packages/grafana-ui/src/components/TextArea/TextArea.tsx
@@ -3,7 +3,7 @@ import React, { HTMLProps } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
-import { stylesFactory, useTheme2 } from '../../themes';
+import { useStyles2 } from '../../themes';
 import { getFocusStyle, sharedInputStyle } from '../Forms/commonStyles';
 
 export interface Props extends Omit<HTMLProps<HTMLTextAreaElement>, 'size'> {
@@ -12,26 +12,23 @@ export interface Props extends Omit<HTMLProps<HTMLTextAreaElement>, 'size'> {
 }
 
 export const TextArea = React.forwardRef<HTMLTextAreaElement, Props>(({ invalid, className, ...props }, ref) => {
-  const theme = useTheme2();
-  const styles = getTextAreaStyle(theme, invalid);
+  const styles = useStyles2(getTextAreaStyle, invalid);
 
   return <textarea {...props} className={cx(styles.textarea, className)} ref={ref} />;
 });
 
-const getTextAreaStyle = stylesFactory((theme: GrafanaTheme2, invalid = false) => {
-  return {
-    textarea: cx(
-      sharedInputStyle(theme),
-      getFocusStyle(theme),
-      css({
-        display: 'block',
-        borderRadius: theme.shape.radius.default,
-        padding: `${theme.spacing.gridSize / 4}px ${theme.spacing.gridSize}px`,
-        width: '100%',
-        borderColor: invalid ? theme.colors.error.border : theme.components.input.borderColor,
-      })
-    ),
-  };
+const getTextAreaStyle = (theme: GrafanaTheme2, invalid = false) => ({
+  textarea: cx(
+    sharedInputStyle(theme),
+    getFocusStyle(theme),
+    css({
+      display: 'block',
+      borderRadius: theme.shape.radius.default,
+      padding: `${theme.spacing.gridSize / 4}px ${theme.spacing.gridSize}px`,
+      width: '100%',
+      borderColor: invalid ? theme.colors.error.border : theme.components.input.borderColor,
+    })
+  ),
 });
 
 TextArea.displayName = 'TextArea';
diff --git a/packages/grafana-ui/src/components/ThemeDemos/EmotionPerfTest.tsx b/packages/grafana-ui/src/components/ThemeDemos/EmotionPerfTest.tsx
index 468f91dd50e12..3399fff3fc0bb 100644
--- a/packages/grafana-ui/src/components/ThemeDemos/EmotionPerfTest.tsx
+++ b/packages/grafana-ui/src/components/ThemeDemos/EmotionPerfTest.tsx
@@ -1,6 +1,6 @@
 /** @jsxRuntime classic */
 /** @jsx jsx */
-import { css, CSSInterpolation, cx } from '@emotion/css';
+import { css, cx } from '@emotion/css';
 import { jsx } from '@emotion/react';
 import classnames from 'classnames';
 import { Profiler, ProfilerOnRenderCallback, useState, FC } from 'react';
@@ -126,14 +126,7 @@ function NoStyles({ index }: TestComponentProps) {
 }
 
 function MeasureRender({ children, id }: { children: React.ReactNode; id: string }) {
-  const onRender: ProfilerOnRenderCallback = (
-    id: string,
-    phase: 'mount' | 'update',
-    actualDuration: number,
-    baseDuration: number,
-    startTime: number,
-    commitTime: number
-  ) => {
+  const onRender: ProfilerOnRenderCallback = (id, phase, actualDuration, baseDuration, startTime, commitTime) => {
     console.log('Profile ' + id, actualDuration);
   };
 
@@ -174,7 +167,7 @@ const getStylesObjects = (theme: GrafanaTheme2) => {
   };
 };
 
-function getStylesObjectMain(theme: GrafanaTheme2): CSSInterpolation {
+function getStylesObjectMain(theme: GrafanaTheme2) {
   return {
     background: 'blue',
     border: '1px solid red',
@@ -187,12 +180,12 @@ function getStylesObjectMain(theme: GrafanaTheme2): CSSInterpolation {
   };
 }
 
-function getStylesObjectChild(theme: GrafanaTheme2): CSSInterpolation {
+function getStylesObjectChild(theme: GrafanaTheme2) {
   return {
     padding: '2px',
     fontSize: '10px',
     boxShadow: 'none',
     textAlign: 'center',
     textDecoration: 'none',
-  };
+  } as const;
 }
diff --git a/packages/grafana-ui/src/components/TimeSeries/TimeSeries.tsx b/packages/grafana-ui/src/components/TimeSeries/TimeSeries.tsx
deleted file mode 100644
index 019671e2b6ae5..0000000000000
--- a/packages/grafana-ui/src/components/TimeSeries/TimeSeries.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import React, { Component } from 'react';
-
-import { DataFrame, TimeRange } from '@grafana/data';
-
-import { withTheme2 } from '../../themes/ThemeContext';
-import { GraphNG, GraphNGProps, PropDiffFn } from '../GraphNG/GraphNG';
-import { PanelContextRoot } from '../PanelChrome/PanelContext';
-import { hasVisibleLegendSeries, PlotLegend } from '../uPlot/PlotLegend';
-import { UPlotConfigBuilder } from '../uPlot/config/UPlotConfigBuilder';
-
-import { preparePlotConfigBuilder } from './utils';
-
-const propsToDiff: Array<string | PropDiffFn> = ['legend', 'options', 'theme'];
-
-type TimeSeriesProps = Omit<GraphNGProps, 'prepConfig' | 'propsToDiff' | 'renderLegend'>;
-
-export class UnthemedTimeSeries extends Component<TimeSeriesProps> {
-  static contextType = PanelContextRoot;
-  declare context: React.ContextType<typeof PanelContextRoot>;
-
-  prepConfig = (alignedFrame: DataFrame, allFrames: DataFrame[], getTimeRange: () => TimeRange) => {
-    const { eventBus, eventsScope, sync } = this.context;
-    const { theme, timeZone, renderers, tweakAxis, tweakScale } = this.props;
-
-    return preparePlotConfigBuilder({
-      frame: alignedFrame,
-      theme,
-      timeZones: Array.isArray(timeZone) ? timeZone : [timeZone],
-      getTimeRange,
-      eventBus,
-      sync,
-      allFrames,
-      renderers,
-      tweakScale,
-      tweakAxis,
-      eventsScope,
-    });
-  };
-
-  renderLegend = (config: UPlotConfigBuilder) => {
-    const { legend, frames } = this.props;
-
-    if (!config || (legend && !legend.showLegend) || !hasVisibleLegendSeries(config, frames)) {
-      return null;
-    }
-
-    return <PlotLegend data={frames} config={config} {...legend} />;
-  };
-
-  render() {
-    return (
-      <GraphNG
-        {...this.props}
-        prepConfig={this.prepConfig}
-        propsToDiff={propsToDiff}
-        renderLegend={this.renderLegend}
-      />
-    );
-  }
-}
-
-export const TimeSeries = withTheme2(UnthemedTimeSeries);
-TimeSeries.displayName = 'TimeSeries';
diff --git a/packages/grafana-ui/src/components/TimeSeries/utils.ts b/packages/grafana-ui/src/components/TimeSeries/utils.ts
deleted file mode 100644
index 9d2d373b33d8c..0000000000000
--- a/packages/grafana-ui/src/components/TimeSeries/utils.ts
+++ /dev/null
@@ -1,668 +0,0 @@
-import { isNumber } from 'lodash';
-import uPlot from 'uplot';
-
-import {
-  DashboardCursorSync,
-  DataFrame,
-  DataHoverClearEvent,
-  DataHoverEvent,
-  DataHoverPayload,
-  FieldConfig,
-  FieldType,
-  formattedValueToString,
-  getFieldColorModeForField,
-  getFieldSeriesColor,
-  getFieldDisplayName,
-  getDisplayProcessor,
-  FieldColorModeId,
-  DecimalCount,
-} from '@grafana/data';
-import {
-  AxisPlacement,
-  GraphDrawStyle,
-  GraphFieldConfig,
-  GraphTresholdsStyleMode,
-  VisibilityMode,
-  ScaleDirection,
-  ScaleOrientation,
-  StackingMode,
-  GraphTransform,
-  AxisColorMode,
-  GraphGradientMode,
-} from '@grafana/schema';
-
-// unit lookup needed to determine if we want power-of-2 or power-of-10 axis ticks
-// see categories.ts is @grafana/data
-const IEC_UNITS = new Set([
-  'bytes',
-  'bits',
-  'kbytes',
-  'mbytes',
-  'gbytes',
-  'tbytes',
-  'pbytes',
-  'binBps',
-  'binbps',
-  'KiBs',
-  'Kibits',
-  'MiBs',
-  'Mibits',
-  'GiBs',
-  'Gibits',
-  'TiBs',
-  'Tibits',
-  'PiBs',
-  'Pibits',
-]);
-
-const BIN_INCRS = Array(53);
-
-for (let i = 0; i < BIN_INCRS.length; i++) {
-  BIN_INCRS[i] = 2 ** i;
-}
-
-import { buildScaleKey } from '../GraphNG/utils';
-import { UPlotConfigBuilder, UPlotConfigPrepFn } from '../uPlot/config/UPlotConfigBuilder';
-import { getScaleGradientFn } from '../uPlot/config/gradientFills';
-import { getStackingGroups, preparePlotData2 } from '../uPlot/utils';
-
-const defaultFormatter = (v: any, decimals: DecimalCount = 1) => (v == null ? '-' : v.toFixed(decimals));
-
-const defaultConfig: GraphFieldConfig = {
-  drawStyle: GraphDrawStyle.Line,
-  showPoints: VisibilityMode.Auto,
-  axisPlacement: AxisPlacement.Auto,
-};
-
-export const preparePlotConfigBuilder: UPlotConfigPrepFn<{
-  sync?: () => DashboardCursorSync;
-}> = ({
-  frame,
-  theme,
-  timeZones,
-  getTimeRange,
-  eventBus,
-  sync,
-  allFrames,
-  renderers,
-  tweakScale = (opts) => opts,
-  tweakAxis = (opts) => opts,
-  eventsScope = '__global_',
-}) => {
-  const builder = new UPlotConfigBuilder(timeZones[0]);
-
-  let alignedFrame: DataFrame;
-
-  builder.setPrepData((frames) => {
-    // cache alignedFrame
-    alignedFrame = frames[0];
-
-    return preparePlotData2(frames[0], builder.getStackingGroups());
-  });
-
-  // X is the first field in the aligned frame
-  const xField = frame.fields[0];
-  if (!xField) {
-    return builder; // empty frame with no options
-  }
-
-  const xScaleKey = 'x';
-  let xScaleUnit = '_x';
-  let yScaleKey = '';
-
-  const xFieldAxisPlacement =
-    xField.config.custom?.axisPlacement !== AxisPlacement.Hidden ? AxisPlacement.Bottom : AxisPlacement.Hidden;
-  const xFieldAxisShow = xField.config.custom?.axisPlacement !== AxisPlacement.Hidden;
-
-  if (xField.type === FieldType.time) {
-    xScaleUnit = 'time';
-    builder.addScale({
-      scaleKey: xScaleKey,
-      orientation: ScaleOrientation.Horizontal,
-      direction: ScaleDirection.Right,
-      isTime: true,
-      range: () => {
-        const r = getTimeRange();
-        return [r.from.valueOf(), r.to.valueOf()];
-      },
-    });
-
-    // filters first 2 ticks to make space for timezone labels
-    const filterTicks: uPlot.Axis.Filter | undefined =
-      timeZones.length > 1
-        ? (u, splits) => {
-            return splits.map((v, i) => (i < 2 ? null : v));
-          }
-        : undefined;
-
-    for (let i = 0; i < timeZones.length; i++) {
-      const timeZone = timeZones[i];
-      builder.addAxis({
-        scaleKey: xScaleKey,
-        isTime: true,
-        placement: xFieldAxisPlacement,
-        show: xFieldAxisShow,
-        label: xField.config.custom?.axisLabel,
-        timeZone,
-        theme,
-        grid: { show: i === 0 && xField.config.custom?.axisGridShow },
-        filter: filterTicks,
-      });
-    }
-
-    // render timezone labels
-    if (timeZones.length > 1) {
-      builder.addHook('drawAxes', (u: uPlot) => {
-        u.ctx.save();
-
-        u.ctx.fillStyle = theme.colors.text.primary;
-        u.ctx.textAlign = 'left';
-        u.ctx.textBaseline = 'bottom';
-
-        let i = 0;
-        u.axes.forEach((a) => {
-          if (a.side === 2) {
-            //@ts-ignore
-            let cssBaseline: number = a._pos + a._size;
-            u.ctx.fillText(timeZones[i], u.bbox.left, cssBaseline * uPlot.pxRatio);
-            i++;
-          }
-        });
-
-        u.ctx.restore();
-      });
-    }
-  } else {
-    // Not time!
-    if (xField.config.unit) {
-      xScaleUnit = xField.config.unit;
-    }
-
-    builder.addScale({
-      scaleKey: xScaleKey,
-      orientation: ScaleOrientation.Horizontal,
-      direction: ScaleDirection.Right,
-      range: (u, dataMin, dataMax) => [xField.config.min ?? dataMin, xField.config.max ?? dataMax],
-    });
-
-    builder.addAxis({
-      scaleKey: xScaleKey,
-      placement: xFieldAxisPlacement,
-      show: xFieldAxisShow,
-      label: xField.config.custom?.axisLabel,
-      theme,
-      grid: { show: xField.config.custom?.axisGridShow },
-      formatValue: (v, decimals) => formattedValueToString(xField.display!(v, decimals)),
-    });
-  }
-
-  let customRenderedFields =
-    renderers?.flatMap((r) => Object.values(r.fieldMap).filter((name) => r.indicesOnly.indexOf(name) === -1)) ?? [];
-
-  let indexByName: Map<string, number> | undefined;
-
-  for (let i = 1; i < frame.fields.length; i++) {
-    const field = frame.fields[i];
-
-    const config: FieldConfig<GraphFieldConfig> = {
-      ...field.config,
-      custom: {
-        ...defaultConfig,
-        ...field.config.custom,
-      },
-    };
-
-    const customConfig: GraphFieldConfig = config.custom!;
-
-    if (field === xField || (field.type !== FieldType.number && field.type !== FieldType.enum)) {
-      continue;
-    }
-
-    let fmt = field.display ?? defaultFormatter;
-    if (field.config.custom?.stacking?.mode === StackingMode.Percent) {
-      fmt = getDisplayProcessor({
-        field: {
-          ...field,
-          config: {
-            ...field.config,
-            unit: 'percentunit',
-          },
-        },
-        theme,
-      });
-    }
-    const scaleKey = buildScaleKey(config, field.type);
-    const colorMode = getFieldColorModeForField(field);
-    const scaleColor = getFieldSeriesColor(field, theme);
-    const seriesColor = scaleColor.color;
-
-    // The builder will manage unique scaleKeys and combine where appropriate
-    builder.addScale(
-      tweakScale(
-        {
-          scaleKey,
-          orientation: ScaleOrientation.Vertical,
-          direction: ScaleDirection.Up,
-          distribution: customConfig.scaleDistribution?.type,
-          log: customConfig.scaleDistribution?.log,
-          linearThreshold: customConfig.scaleDistribution?.linearThreshold,
-          min: field.config.min,
-          max: field.config.max,
-          softMin: customConfig.axisSoftMin,
-          softMax: customConfig.axisSoftMax,
-          centeredZero: customConfig.axisCenteredZero,
-          range:
-            customConfig.stacking?.mode === StackingMode.Percent
-              ? (u: uPlot, dataMin: number, dataMax: number) => {
-                  dataMin = dataMin < 0 ? -1 : 0;
-                  dataMax = dataMax > 0 ? 1 : 0;
-                  return [dataMin, dataMax];
-                }
-              : field.type === FieldType.enum
-              ? (u: uPlot, dataMin: number, dataMax: number) => {
-                  // this is the exhaustive enum (stable)
-                  let len = field.config.type!.enum!.text!.length;
-
-                  return [-1, len];
-
-                  // these are only values that are present
-                  // return [dataMin - 1, dataMax + 1]
-                }
-              : undefined,
-          decimals: field.config.decimals,
-        },
-        field
-      )
-    );
-
-    if (!yScaleKey) {
-      yScaleKey = scaleKey;
-    }
-
-    if (customConfig.axisPlacement !== AxisPlacement.Hidden) {
-      let axisColor: uPlot.Axis.Stroke | undefined;
-
-      if (customConfig.axisColorMode === AxisColorMode.Series) {
-        if (
-          colorMode.isByValue &&
-          field.config.custom?.gradientMode === GraphGradientMode.Scheme &&
-          colorMode.id === FieldColorModeId.Thresholds
-        ) {
-          axisColor = getScaleGradientFn(1, theme, colorMode, field.config.thresholds);
-        } else {
-          axisColor = seriesColor;
-        }
-      }
-
-      const axisDisplayOptions = {
-        border: {
-          show: customConfig.axisBorderShow || false,
-          width: 1 / devicePixelRatio,
-          stroke: axisColor || theme.colors.text.primary,
-        },
-        ticks: {
-          show: customConfig.axisBorderShow || false,
-          stroke: axisColor || theme.colors.text.primary,
-        },
-        color: axisColor || theme.colors.text.primary,
-      };
-
-      let incrs: uPlot.Axis.Incrs | undefined;
-
-      // TODO: these will be dynamic with frame updates, so need to accept getYTickLabels()
-      let values: uPlot.Axis.Values | undefined;
-      let splits: uPlot.Axis.Splits | undefined;
-
-      if (IEC_UNITS.has(config.unit!)) {
-        incrs = BIN_INCRS;
-      } else if (field.type === FieldType.enum) {
-        let text = field.config.type!.enum!.text!;
-        splits = text.map((v: string, i: number) => i);
-        values = text;
-      }
-
-      builder.addAxis(
-        tweakAxis(
-          {
-            scaleKey,
-            label: customConfig.axisLabel,
-            size: customConfig.axisWidth,
-            placement: customConfig.axisPlacement ?? AxisPlacement.Auto,
-            formatValue: (v, decimals) => formattedValueToString(fmt(v, decimals)),
-            theme,
-            grid: { show: customConfig.axisGridShow },
-            decimals: field.config.decimals,
-            distr: customConfig.scaleDistribution?.type,
-            splits,
-            values,
-            incrs,
-            ...axisDisplayOptions,
-          },
-          field
-        )
-      );
-    }
-
-    const showPoints =
-      customConfig.drawStyle === GraphDrawStyle.Points ? VisibilityMode.Always : customConfig.showPoints;
-
-    let pointsFilter: uPlot.Series.Points.Filter = () => null;
-
-    if (customConfig.spanNulls !== true) {
-      pointsFilter = (u, seriesIdx, show, gaps) => {
-        let filtered = [];
-
-        let series = u.series[seriesIdx];
-
-        if (!show && gaps && gaps.length) {
-          const [firstIdx, lastIdx] = series.idxs!;
-          const xData = u.data[0];
-          const yData = u.data[seriesIdx];
-          const firstPos = Math.round(u.valToPos(xData[firstIdx], 'x', true));
-          const lastPos = Math.round(u.valToPos(xData[lastIdx], 'x', true));
-
-          if (gaps[0][0] === firstPos) {
-            filtered.push(firstIdx);
-          }
-
-          // show single points between consecutive gaps that share end/start
-          for (let i = 0; i < gaps.length; i++) {
-            let thisGap = gaps[i];
-            let nextGap = gaps[i + 1];
-
-            if (nextGap && thisGap[1] === nextGap[0]) {
-              // approx when data density is > 1pt/px, since gap start/end pixels are rounded
-              let approxIdx = u.posToIdx(thisGap[1], true);
-
-              if (yData[approxIdx] == null) {
-                // scan left/right alternating to find closest index with non-null value
-                for (let j = 1; j < 100; j++) {
-                  if (yData[approxIdx + j] != null) {
-                    approxIdx += j;
-                    break;
-                  }
-                  if (yData[approxIdx - j] != null) {
-                    approxIdx -= j;
-                    break;
-                  }
-                }
-              }
-
-              filtered.push(approxIdx);
-            }
-          }
-
-          if (gaps[gaps.length - 1][1] === lastPos) {
-            filtered.push(lastIdx);
-          }
-        }
-
-        return filtered.length ? filtered : null;
-      };
-    }
-
-    let { fillOpacity } = customConfig;
-
-    let pathBuilder: uPlot.Series.PathBuilder | null = null;
-    let pointsBuilder: uPlot.Series.Points.Show | null = null;
-
-    if (field.state?.origin) {
-      if (!indexByName) {
-        indexByName = getNamesToFieldIndex(frame, allFrames);
-      }
-
-      const originFrame = allFrames[field.state.origin.frameIndex];
-      const originField = originFrame?.fields[field.state.origin.fieldIndex];
-
-      const dispName = getFieldDisplayName(originField ?? field, originFrame, allFrames);
-
-      // disable default renderers
-      if (customRenderedFields.indexOf(dispName) >= 0) {
-        pathBuilder = () => null;
-        pointsBuilder = () => undefined;
-      } else if (customConfig.transform === GraphTransform.Constant) {
-        // patch some monkeys!
-        const defaultBuilder = uPlot.paths!.linear!();
-
-        pathBuilder = (u, seriesIdx) => {
-          //eslint-disable-next-line
-          const _data: any[] = (u as any)._data; // uplot.AlignedData not exposed in types
-
-          // the data we want the line renderer to pull is x at each plot edge with paired flat y values
-
-          const r = getTimeRange();
-          let xData = [r.from.valueOf(), r.to.valueOf()];
-          let firstY = _data[seriesIdx].find((v: number | null | undefined) => v != null);
-          let yData = [firstY, firstY];
-          let fauxData = _data.slice();
-          fauxData[0] = xData;
-          fauxData[seriesIdx] = yData;
-
-          //eslint-disable-next-line
-          return defaultBuilder(
-            {
-              ...u,
-              _data: fauxData,
-            } as any,
-            seriesIdx,
-            0,
-            1
-          );
-        };
-      }
-
-      if (customConfig.fillBelowTo) {
-        const fillBelowToField = frame.fields.find(
-          (f) =>
-            customConfig.fillBelowTo === f.name ||
-            customConfig.fillBelowTo === f.config?.displayNameFromDS ||
-            customConfig.fillBelowTo === getFieldDisplayName(f, frame, allFrames)
-        );
-
-        const fillBelowDispName = fillBelowToField
-          ? getFieldDisplayName(fillBelowToField, frame, allFrames)
-          : customConfig.fillBelowTo;
-
-        const t = indexByName.get(dispName);
-        const b = indexByName.get(fillBelowDispName);
-        if (isNumber(b) && isNumber(t)) {
-          builder.addBand({
-            series: [t, b],
-            fill: undefined, // using null will have the band use fill options from `t`
-          });
-
-          if (!fillOpacity) {
-            fillOpacity = 35; // default from flot
-          }
-        } else {
-          fillOpacity = 0;
-        }
-      }
-    }
-
-    let dynamicSeriesColor: ((seriesIdx: number) => string | undefined) | undefined = undefined;
-
-    if (colorMode.id === FieldColorModeId.Thresholds) {
-      dynamicSeriesColor = (seriesIdx) => getFieldSeriesColor(alignedFrame.fields[seriesIdx], theme).color;
-    }
-
-    builder.addSeries({
-      pathBuilder,
-      pointsBuilder,
-      scaleKey,
-      showPoints,
-      pointsFilter,
-      colorMode,
-      fillOpacity,
-      theme,
-      dynamicSeriesColor,
-      drawStyle: customConfig.drawStyle!,
-      lineColor: customConfig.lineColor ?? seriesColor,
-      lineWidth: customConfig.lineWidth,
-      lineInterpolation: customConfig.lineInterpolation,
-      lineStyle: customConfig.lineStyle,
-      barAlignment: customConfig.barAlignment,
-      barWidthFactor: customConfig.barWidthFactor,
-      barMaxWidth: customConfig.barMaxWidth,
-      pointSize: customConfig.pointSize,
-      spanNulls: customConfig.spanNulls || false,
-      show: !customConfig.hideFrom?.viz,
-      gradientMode: customConfig.gradientMode,
-      thresholds: config.thresholds,
-      hardMin: field.config.min,
-      hardMax: field.config.max,
-      softMin: customConfig.axisSoftMin,
-      softMax: customConfig.axisSoftMax,
-      // The following properties are not used in the uPlot config, but are utilized as transport for legend config
-      dataFrameFieldIndex: field.state?.origin,
-    });
-
-    // Render thresholds in graph
-    if (customConfig.thresholdsStyle && config.thresholds) {
-      const thresholdDisplay = customConfig.thresholdsStyle.mode ?? GraphTresholdsStyleMode.Off;
-      if (thresholdDisplay !== GraphTresholdsStyleMode.Off) {
-        builder.addThresholds({
-          config: customConfig.thresholdsStyle,
-          thresholds: config.thresholds,
-          scaleKey,
-          theme,
-          hardMin: field.config.min,
-          hardMax: field.config.max,
-          softMin: customConfig.axisSoftMin,
-          softMax: customConfig.axisSoftMax,
-        });
-      }
-    }
-  }
-
-  let stackingGroups = getStackingGroups(frame);
-
-  builder.setStackingGroups(stackingGroups);
-
-  // hook up custom/composite renderers
-  renderers?.forEach((r) => {
-    if (!indexByName) {
-      indexByName = getNamesToFieldIndex(frame, allFrames);
-    }
-    let fieldIndices: Record<string, number> = {};
-
-    for (let key in r.fieldMap) {
-      let dispName = r.fieldMap[key];
-      fieldIndices[key] = indexByName.get(dispName)!;
-    }
-
-    r.init(builder, fieldIndices);
-  });
-
-  builder.scaleKeys = [xScaleKey, yScaleKey];
-
-  // if hovered value is null, how far we may scan left/right to hover nearest non-null
-  const hoverProximityPx = 15;
-
-  let cursor: Partial<uPlot.Cursor> = {
-    // this scans left and right from cursor position to find nearest data index with value != null
-    // TODO: do we want to only scan past undefined values, but halt at explicit null values?
-    dataIdx: (self, seriesIdx, hoveredIdx, cursorXVal) => {
-      let seriesData = self.data[seriesIdx];
-
-      if (seriesData[hoveredIdx] == null) {
-        let nonNullLft = null,
-          nonNullRgt = null,
-          i;
-
-        i = hoveredIdx;
-        while (nonNullLft == null && i-- > 0) {
-          if (seriesData[i] != null) {
-            nonNullLft = i;
-          }
-        }
-
-        i = hoveredIdx;
-        while (nonNullRgt == null && i++ < seriesData.length) {
-          if (seriesData[i] != null) {
-            nonNullRgt = i;
-          }
-        }
-
-        let xVals = self.data[0];
-
-        let curPos = self.valToPos(cursorXVal, 'x');
-        let rgtPos = nonNullRgt == null ? Infinity : self.valToPos(xVals[nonNullRgt], 'x');
-        let lftPos = nonNullLft == null ? -Infinity : self.valToPos(xVals[nonNullLft], 'x');
-
-        let lftDelta = curPos - lftPos;
-        let rgtDelta = rgtPos - curPos;
-
-        if (lftDelta <= rgtDelta) {
-          if (lftDelta <= hoverProximityPx) {
-            hoveredIdx = nonNullLft!;
-          }
-        } else {
-          if (rgtDelta <= hoverProximityPx) {
-            hoveredIdx = nonNullRgt!;
-          }
-        }
-      }
-
-      return hoveredIdx;
-    },
-  };
-
-  if (sync && sync() !== DashboardCursorSync.Off) {
-    const payload: DataHoverPayload = {
-      point: {
-        [xScaleKey]: null,
-        [yScaleKey]: null,
-      },
-      data: frame,
-    };
-
-    const hoverEvent = new DataHoverEvent(payload);
-    cursor.sync = {
-      key: eventsScope,
-      filters: {
-        pub: (type: string, src: uPlot, x: number, y: number, w: number, h: number, dataIdx: number) => {
-          if (sync && sync() === DashboardCursorSync.Off) {
-            return false;
-          }
-
-          payload.rowIndex = dataIdx;
-          if (x < 0 && y < 0) {
-            payload.point[xScaleUnit] = null;
-            payload.point[yScaleKey] = null;
-            eventBus.publish(new DataHoverClearEvent());
-          } else {
-            // convert the points
-            payload.point[xScaleUnit] = src.posToVal(x, xScaleKey);
-            payload.point[yScaleKey] = src.posToVal(y, yScaleKey);
-            payload.point.panelRelY = y > 0 ? y / h : 1; // used by old graph panel to position tooltip
-            eventBus.publish(hoverEvent);
-            hoverEvent.payload.down = undefined;
-          }
-          return true;
-        },
-      },
-      scales: [xScaleKey, yScaleKey],
-      // match: [() => true, (a, b) => a === b],
-    };
-  }
-
-  builder.setSync();
-  builder.setCursor(cursor);
-
-  return builder;
-};
-
-export function getNamesToFieldIndex(frame: DataFrame, allFrames: DataFrame[]): Map<string, number> {
-  const originNames = new Map<string, number>();
-  frame.fields.forEach((field, i) => {
-    const origin = field.state?.origin;
-    if (origin) {
-      const origField = allFrames[origin.frameIndex]?.fields[origin.fieldIndex];
-      if (origField) {
-        originNames.set(getFieldDisplayName(origField, allFrames[origin.frameIndex], allFrames), i);
-      }
-    }
-  });
-  return originNames;
-}
diff --git a/packages/grafana-ui/src/components/Toggletip/Toggletip.story.tsx b/packages/grafana-ui/src/components/Toggletip/Toggletip.story.tsx
index 406a8594fed3f..1a4ebea1fec2b 100644
--- a/packages/grafana-ui/src/components/Toggletip/Toggletip.story.tsx
+++ b/packages/grafana-ui/src/components/Toggletip/Toggletip.story.tsx
@@ -15,7 +15,7 @@ const meta: Meta<typeof Toggletip> = {
       page: mdx,
     },
     controls: {
-      exclude: ['onClose', 'children'],
+      exclude: ['children'],
     },
   },
   argTypes: {
diff --git a/packages/grafana-ui/src/components/Toggletip/Toggletip.test.tsx b/packages/grafana-ui/src/components/Toggletip/Toggletip.test.tsx
index db37c8753ee05..ddc49db1c410d 100644
--- a/packages/grafana-ui/src/components/Toggletip/Toggletip.test.tsx
+++ b/packages/grafana-ui/src/components/Toggletip/Toggletip.test.tsx
@@ -1,8 +1,8 @@
-import { act, render, screen } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { Button } from '../Button';
+import { Button, LinkButton } from '../Button';
 
 import { Toggletip } from './Toggletip';
 
@@ -48,16 +48,15 @@ describe('Toggletip', () => {
 
     expect(await screen.findByTestId('toggletip-content')).toBeInTheDocument();
 
+    // Escape should not close the toggletip
+    const button = screen.getByTestId('myButton');
+    await userEvent.click(button);
+    expect(onClose).toHaveBeenCalledTimes(1);
+
     // Close button should not close the toggletip
     const closeButton = screen.getByTestId('toggletip-header-close');
     expect(closeButton).toBeInTheDocument();
     await userEvent.click(closeButton);
-    expect(onClose).toHaveBeenCalledTimes(1);
-
-    // Escape should not close the toggletip
-    const button = screen.getByTestId('myButton');
-    await userEvent.click(button);
-    await userEvent.keyboard('{escape}');
     expect(onClose).toHaveBeenCalledTimes(2);
 
     // Either way, the toggletip should still be visible
@@ -162,7 +161,7 @@ describe('Toggletip', () => {
     const button = screen.getByTestId('myButton');
     const afterButton = screen.getByText(afterInDom);
     await userEvent.click(button);
-    await userEvent.tab();
+
     const closeButton = screen.getByTestId('toggletip-header-close');
     expect(closeButton).toHaveFocus();
 
@@ -183,14 +182,7 @@ describe('Toggletip', () => {
     let user: ReturnType<typeof userEvent.setup>;
 
     beforeEach(() => {
-      jest.useFakeTimers();
-      // Need to use delay: null here to work with fakeTimers
-      // see https://github.com/testing-library/user-event/issues/833
-      user = userEvent.setup({ delay: null });
-    });
-
-    afterEach(() => {
-      jest.useRealTimers();
+      user = userEvent.setup();
     });
 
     it('should restore focus to the button that opened the toggletip when closed from within the toggletip', async () => {
@@ -208,11 +200,10 @@ describe('Toggletip', () => {
       const closeButton = await screen.findByTestId('toggletip-header-close');
       expect(closeButton).toBeInTheDocument();
       await user.click(closeButton);
-      act(() => {
-        jest.runAllTimers();
-      });
 
-      expect(button).toHaveFocus();
+      await waitFor(() => {
+        expect(button).toHaveFocus();
+      });
     });
 
     it('should NOT restore focus to the button that opened the toggletip when closed from outside the toggletip', async () => {
@@ -239,11 +230,34 @@ describe('Toggletip', () => {
       afterButton.focus();
 
       await user.keyboard('{escape}');
-      act(() => {
-        jest.runAllTimers();
-      });
 
       expect(afterButton).toHaveFocus();
     });
   });
+
+  it(`should render LinkButtons correctly with no additional styles`, () => {
+    const identicalProps = {
+      children: 'Click me!',
+      href: 'https://grafana.com',
+    };
+
+    const outsideLinkButton = <LinkButton {...identicalProps} data-testid="outside" />;
+    const insideLinkButton = <LinkButton {...identicalProps} data-testid="inside" />;
+
+    render(
+      <>
+        <Toggletip placement="auto" content={insideLinkButton} show>
+          <Button type="button" data-testid="myButton">
+            Click me!
+          </Button>
+        </Toggletip>
+        {outsideLinkButton}
+      </>
+    );
+
+    const outsideButton = screen.getByTestId('outside');
+    const insideButton = screen.getByTestId('inside');
+
+    expect(getComputedStyle(outsideButton).cssText).toStrictEqual(getComputedStyle(insideButton).cssText);
+  });
 });
diff --git a/packages/grafana-ui/src/components/Toggletip/Toggletip.tsx b/packages/grafana-ui/src/components/Toggletip/Toggletip.tsx
index 3708f849892bc..f45fee4483111 100644
--- a/packages/grafana-ui/src/components/Toggletip/Toggletip.tsx
+++ b/packages/grafana-ui/src/components/Toggletip/Toggletip.tsx
@@ -1,12 +1,24 @@
 import { css, cx } from '@emotion/css';
+import {
+  arrow,
+  autoUpdate,
+  flip,
+  FloatingArrow,
+  FloatingFocusManager,
+  offset,
+  shift,
+  useClick,
+  useDismiss,
+  useFloating,
+  useInteractions,
+} from '@floating-ui/react';
 import { Placement } from '@popperjs/core';
-import React, { useCallback, useEffect, useRef } from 'react';
-import { usePopperTooltip } from 'react-popper-tooltip';
+import React, { useRef, useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
-import { useStyles2 } from '../../themes/ThemeContext';
-import { buildTooltipTheme } from '../../utils/tooltipUtils';
+import { useStyles2, useTheme2 } from '../../themes/ThemeContext';
+import { buildTooltipTheme, getPlacement } from '../../utils/tooltipUtils';
 import { IconButton } from '../IconButton/IconButton';
 
 import { ToggletipContent } from './types';
@@ -19,7 +31,7 @@ export interface ToggletipProps {
   /** determine whether to show or not the close button **/
   closeButton?: boolean;
   /** Callback function to be called when the toggletip is closed */
-  onClose?: Function;
+  onClose?: () => void;
   /** The preferred placement of the toggletip */
   placement?: Placement;
   /** The text or component that houses the content of the toggleltip */
@@ -50,94 +62,100 @@ export const Toggletip = React.memo(
     onOpen,
     show,
   }: ToggletipProps) => {
+    const arrowRef = useRef(null);
+    const grafanaTheme = useTheme2();
     const styles = useStyles2(getStyles);
     const style = styles[theme];
-    const contentRef = useRef(null);
-    const [controlledVisible, setControlledVisible] = React.useState(show);
+    const [controlledVisible, setControlledVisible] = useState(show);
+    const isOpen = show ?? controlledVisible;
 
-    const { getArrowProps, getTooltipProps, setTooltipRef, setTriggerRef, visible, update, tooltipRef, triggerRef } =
-      usePopperTooltip(
-        {
-          visible: show ?? controlledVisible,
-          placement: placement,
-          interactive: true,
-          offset: [0, 8],
-          // If show is undefined, the toggletip will be shown on click
-          trigger: 'click',
-          onVisibleChange: (visible: boolean) => {
-            if (show === undefined) {
-              setControlledVisible(visible);
-            }
-            if (!visible) {
-              onClose?.();
-            } else {
-              onOpen?.();
-            }
-          },
-        },
-        {
-          strategy: 'fixed',
-        }
-      );
-
-    const closeToggletip = useCallback(
-      (event: KeyboardEvent | React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
-        setControlledVisible(false);
-        onClose?.();
+    // the order of middleware is important!
+    // `arrow` should almost always be at the end
+    // see https://floating-ui.com/docs/arrow#order
+    const middleware = [
+      offset(8),
+      flip({
+        fallbackAxisSideDirection: 'end',
+        // see https://floating-ui.com/docs/flip#combining-with-shift
+        crossAxis: false,
+        boundary: document.body,
+      }),
+      shift(),
+      arrow({
+        element: arrowRef,
+      }),
+    ];
 
-        if (event.target instanceof Node && tooltipRef?.contains(event.target)) {
-          triggerRef?.focus();
+    const { context, refs, floatingStyles } = useFloating({
+      open: isOpen,
+      placement: getPlacement(placement),
+      onOpenChange: (open) => {
+        if (show === undefined) {
+          setControlledVisible(open);
+        }
+        if (!open) {
+          onClose?.();
+        } else {
+          onOpen?.();
         }
       },
-      [onClose, tooltipRef, triggerRef]
-    );
+      middleware,
+      whileElementsMounted: autoUpdate,
+      strategy: 'fixed',
+    });
+
+    const click = useClick(context);
+    const dismiss = useDismiss(context);
 
-    useEffect(() => {
-      if (controlledVisible) {
-        const handleKeyDown = (enterKey: KeyboardEvent) => {
-          if (enterKey.key === 'Escape') {
-            closeToggletip(enterKey);
-          }
-        };
-        document.addEventListener('keydown', handleKeyDown);
-        return () => {
-          document.removeEventListener('keydown', handleKeyDown);
-        };
-      }
-      return;
-    }, [controlledVisible, closeToggletip]);
+    const { getReferenceProps, getFloatingProps } = useInteractions([dismiss, click]);
 
     return (
       <>
         {React.cloneElement(children, {
-          ref: setTriggerRef,
+          ref: refs.setReference,
           tabIndex: 0,
-          'aria-expanded': visible,
+          'aria-expanded': isOpen,
+          ...getReferenceProps(),
         })}
-        {visible && (
-          <div
-            data-testid="toggletip-content"
-            ref={setTooltipRef}
-            {...getTooltipProps({ className: cx(style.container, fitContent && styles.fitContent) })}
-          >
-            {Boolean(title) && <div className={style.header}>{title}</div>}
-            {closeButton && (
-              <div className={style.headerClose}>
-                <IconButton
-                  tooltip="Close"
-                  name="times"
-                  data-testid="toggletip-header-close"
-                  onClick={closeToggletip}
-                />
+        {isOpen && (
+          <FloatingFocusManager context={context} modal={false} closeOnFocusOut={false}>
+            <div
+              data-testid="toggletip-content"
+              className={cx(style.container, {
+                [styles.fitContent]: fitContent,
+              })}
+              ref={refs.setFloating}
+              style={floatingStyles}
+              {...getFloatingProps()}
+            >
+              <FloatingArrow
+                strokeWidth={0.3}
+                stroke={grafanaTheme.colors.border.weak}
+                className={style.arrow}
+                ref={arrowRef}
+                context={context}
+              />
+              {Boolean(title) && <div className={style.header}>{title}</div>}
+              {closeButton && (
+                <div className={style.headerClose}>
+                  <IconButton
+                    aria-label="Close"
+                    name="times"
+                    data-testid="toggletip-header-close"
+                    onClick={() => {
+                      setControlledVisible(false);
+                      onClose?.();
+                    }}
+                  />
+                </div>
+              )}
+              <div className={style.body}>
+                {(typeof content === 'string' || React.isValidElement(content)) && content}
+                {typeof content === 'function' && content({})}
               </div>
-            )}
-            <div ref={contentRef} {...getArrowProps({ className: style.arrow })} />
-            <div className={style.body}>
-              {(typeof content === 'string' || React.isValidElement(content)) && content}
-              {typeof content === 'function' && update && content({ update })}
+              {Boolean(footer) && <div className={style.footer}>{footer}</div>}
             </div>
-            {Boolean(footer) && <div className={style.footer}>{footer}</div>}
-          </div>
+          </FloatingFocusManager>
         )}
       </>
     );
@@ -149,8 +167,8 @@ Toggletip.displayName = 'Toggletip';
 export const getStyles = (theme: GrafanaTheme2) => {
   const info = buildTooltipTheme(
     theme,
-    theme.components.tooltip.background,
-    theme.components.tooltip.background,
+    theme.colors.background.primary,
+    theme.colors.border.weak,
     theme.components.tooltip.text,
     { topBottom: 2, rightLeft: 2 }
   );
diff --git a/packages/grafana-ui/src/components/Toggletip/types.ts b/packages/grafana-ui/src/components/Toggletip/types.ts
index 4f3332b08101f..62d0335a8685a 100644
--- a/packages/grafana-ui/src/components/Toggletip/types.ts
+++ b/packages/grafana-ui/src/components/Toggletip/types.ts
@@ -1,8 +1,9 @@
-/**
- * This API allows popovers to update Popper's position when e.g. popover content changes
- * update is delivered to content by react-popper.
- */
 export interface ToggletipContentProps {
+  /**
+   * @deprecated
+   * This prop is deprecated and no longer has any effect as popper position updates automatically.
+   * It will be removed in a future release.
+   */
   update?: () => void;
 }
 
diff --git a/packages/grafana-ui/src/components/ToolbarButton/ToolbarButton.tsx b/packages/grafana-ui/src/components/ToolbarButton/ToolbarButton.tsx
index f34b96c99f964..9bebc40b83c5b 100644
--- a/packages/grafana-ui/src/components/ToolbarButton/ToolbarButton.tsx
+++ b/packages/grafana-ui/src/components/ToolbarButton/ToolbarButton.tsx
@@ -97,7 +97,7 @@ export const ToolbarButton = forwardRef<HTMLButtonElement, ToolbarButtonProps>(
     );
 
     return tooltip ? (
-      <Tooltip content={tooltip} placement="bottom">
+      <Tooltip ref={ref} content={tooltip} placement="bottom">
         {body}
       </Tooltip>
     ) : (
diff --git a/packages/grafana-ui/src/components/ToolbarButton/ToolbarButtonRow.tsx b/packages/grafana-ui/src/components/ToolbarButton/ToolbarButtonRow.tsx
index c6cecb958b5a3..c3f59a9d9f9f3 100644
--- a/packages/grafana-ui/src/components/ToolbarButton/ToolbarButtonRow.tsx
+++ b/packages/grafana-ui/src/components/ToolbarButton/ToolbarButtonRow.tsx
@@ -117,7 +117,7 @@ const getStyles = (theme: GrafanaTheme2, overflowButtonOrder: number, alignment:
     alignItems: 'center',
     backgroundColor: theme.colors.background.primary,
     borderRadius: theme.shape.radius.default,
-    boxShadow: theme.shadows.z3,
+    boxShadow: theme.shadows.z2,
     display: 'flex',
     flexWrap: 'wrap',
     gap: theme.spacing(1),
@@ -128,7 +128,7 @@ const getStyles = (theme: GrafanaTheme2, overflowButtonOrder: number, alignment:
     right: 0,
     top: '100%',
     width: 'max-content',
-    zIndex: theme.zIndex.sidemenu,
+    zIndex: theme.zIndex.dropdown,
   }),
   container: css({
     alignItems: 'center',
diff --git a/packages/grafana-ui/src/components/Tooltip/Popover.tsx b/packages/grafana-ui/src/components/Tooltip/Popover.tsx
index cb760b3cf5e6a..81527f3cde6a7 100644
--- a/packages/grafana-ui/src/components/Tooltip/Popover.tsx
+++ b/packages/grafana-ui/src/components/Tooltip/Popover.tsx
@@ -1,96 +1,102 @@
-import { Placement, VirtualElement } from '@popperjs/core';
-import React, { PureComponent } from 'react';
-import { Manager, Popper as ReactPopper, PopperArrowProps } from 'react-popper';
-import Transition from 'react-transition-group/Transition';
+import {
+  FloatingArrow,
+  arrow,
+  autoUpdate,
+  flip,
+  offset,
+  shift,
+  useFloating,
+  useTransitionStyles,
+} from '@floating-ui/react';
+import React, { useLayoutEffect, useRef } from 'react';
 
+import { useTheme2 } from '../../themes';
+import { getPlacement } from '../../utils/tooltipUtils';
 import { Portal } from '../Portal/Portal';
 
-import { PopoverContent } from './types';
-
-const defaultTransitionStyles = {
-  transitionProperty: 'opacity',
-  transitionDuration: '200ms',
-  transitionTimingFunction: 'linear',
-  opacity: 0,
-};
-
-const transitionStyles: { [key: string]: object } = {
-  exited: { opacity: 0 },
-  entering: { opacity: 0 },
-  entered: { opacity: 1, transitionDelay: '0s' },
-  exiting: { opacity: 0, transitionDelay: '500ms' },
-};
-
-export type RenderPopperArrowFn = (props: { arrowProps: PopperArrowProps; placement: string }) => JSX.Element;
+import { PopoverContent, TooltipPlacement } from './types';
 
 interface Props extends Omit<React.HTMLAttributes<HTMLDivElement>, 'content'> {
   show: boolean;
-  placement?: Placement;
+  placement?: TooltipPlacement;
   content: PopoverContent;
-  referenceElement: HTMLElement | VirtualElement;
+  referenceElement: HTMLElement;
   wrapperClassName?: string;
-  renderArrow?: RenderPopperArrowFn;
+  renderArrow?: boolean;
 }
 
-class Popover extends PureComponent<Props> {
-  render() {
-    const { content, show, placement, className, wrapperClassName, renderArrow, referenceElement, ...rest } =
-      this.props;
+export function Popover({
+  content,
+  show,
+  placement,
+  className,
+  wrapperClassName,
+  referenceElement,
+  renderArrow,
+  ...rest
+}: Props) {
+  const theme = useTheme2();
+  const arrowRef = useRef(null);
 
-    return (
-      <Manager>
-        <Transition in={show} timeout={100} mountOnEnter={true} unmountOnExit={true}>
-          {(transitionState) => {
-            return (
-              <Portal>
-                <ReactPopper
-                  placement={placement}
-                  referenceElement={referenceElement}
-                  modifiers={[
-                    { name: 'preventOverflow', enabled: true, options: { rootBoundary: 'viewport' } },
-                    {
-                      name: 'eventListeners',
-                      options: { scroll: true, resize: true },
-                    },
-                  ]}
-                >
-                  {({ ref, style, placement, arrowProps, update }) => {
-                    return (
-                      <div
-                        ref={ref}
-                        style={{
-                          ...style,
-                          ...defaultTransitionStyles,
-                          ...transitionStyles[transitionState],
-                        }}
-                        data-placement={placement}
-                        className={`${wrapperClassName}`}
-                        {...rest}
-                      >
-                        <div className={className}>
-                          {typeof content === 'string' && content}
-                          {React.isValidElement(content) && React.cloneElement(content)}
-                          {typeof content === 'function' &&
-                            content({
-                              updatePopperPosition: update,
-                            })}
-                          {renderArrow &&
-                            renderArrow({
-                              arrowProps,
-                              placement,
-                            })}
-                        </div>
-                      </div>
-                    );
-                  }}
-                </ReactPopper>
-              </Portal>
-            );
-          }}
-        </Transition>
-      </Manager>
+  // the order of middleware is important!
+  // `arrow` should almost always be at the end
+  // see https://floating-ui.com/docs/arrow#order
+  const middleware = [
+    offset(8),
+    flip({
+      fallbackAxisSideDirection: 'end',
+      // see https://floating-ui.com/docs/flip#combining-with-shift
+      crossAxis: false,
+      boundary: document.body,
+    }),
+    shift(),
+  ];
+
+  if (renderArrow) {
+    middleware.push(
+      arrow({
+        element: arrowRef,
+      })
     );
   }
-}
 
-export { Popover };
+  const { context, refs, floatingStyles } = useFloating({
+    open: show,
+    placement: getPlacement(placement),
+    middleware,
+    whileElementsMounted: autoUpdate,
+    strategy: 'fixed',
+  });
+
+  useLayoutEffect(() => {
+    refs.setReference(referenceElement);
+  }, [referenceElement, refs]);
+
+  const { styles: placementStyles } = useTransitionStyles(context, {
+    initial: () => ({
+      opacity: 0,
+    }),
+    duration: theme.transitions.duration.enteringScreen,
+  });
+
+  return show ? (
+    <Portal>
+      <div
+        ref={refs.setFloating}
+        style={{
+          ...floatingStyles,
+          ...placementStyles,
+        }}
+        className={wrapperClassName}
+        {...rest}
+      >
+        <div className={className}>
+          {renderArrow && <FloatingArrow fill={theme.colors.border.weak} ref={arrowRef} context={context} />}
+          {typeof content === 'string' && content}
+          {React.isValidElement(content) && React.cloneElement(content)}
+          {typeof content === 'function' && content({})}
+        </div>
+      </div>
+    </Portal>
+  ) : undefined;
+}
diff --git a/packages/grafana-ui/src/components/Tooltip/Tooltip.story.tsx b/packages/grafana-ui/src/components/Tooltip/Tooltip.story.tsx
index 67ed60768ad30..23f66282e901e 100644
--- a/packages/grafana-ui/src/components/Tooltip/Tooltip.story.tsx
+++ b/packages/grafana-ui/src/components/Tooltip/Tooltip.story.tsx
@@ -2,6 +2,7 @@ import { Meta, StoryFn } from '@storybook/react';
 import React from 'react';
 
 import { Button } from '../Button';
+import { Stack } from '../Layout/Stack/Stack';
 import mdx from '../Tooltip/Tooltip.mdx';
 
 import { Tooltip } from './Tooltip';
@@ -62,6 +63,23 @@ export const Basic: StoryFn<typeof Tooltip> = ({ content, ...args }) => {
   );
 };
 
+export const OverflowViewport: StoryFn<typeof Tooltip> = ({}) => {
+  const content = () => <div>A really long tooltip that will overflow the viewport.</div>;
+
+  return (
+    <Stack justifyContent={'flex-end'}>
+      <Stack direction="column" alignItems={'flex-end'}>
+        <Tooltip content="Static string tooltip" placement="bottom">
+          <Button>Static string tooltip</Button>
+        </Tooltip>
+        <Tooltip content={content} placement="bottom">
+          <Button>Lazy content defined in a function</Button>
+        </Tooltip>
+      </Stack>
+    </Stack>
+  );
+};
+
 Basic.args = {
   content: 'This is a tooltip',
   theme: 'info',
diff --git a/packages/grafana-ui/src/components/Tooltip/Tooltip.tsx b/packages/grafana-ui/src/components/Tooltip/Tooltip.tsx
index 0b881601f84e8..dcc37ac9f32ff 100644
--- a/packages/grafana-ui/src/components/Tooltip/Tooltip.tsx
+++ b/packages/grafana-ui/src/components/Tooltip/Tooltip.tsx
@@ -1,11 +1,23 @@
-import React, { useCallback, useEffect, useId, useState } from 'react';
-import { usePopperTooltip } from 'react-popper-tooltip';
+import {
+  arrow,
+  autoUpdate,
+  flip,
+  FloatingArrow,
+  offset,
+  shift,
+  useDismiss,
+  useFloating,
+  useFocus,
+  useHover,
+  useInteractions,
+} from '@floating-ui/react';
+import React, { useCallback, useId, useRef, useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 
 import { useStyles2 } from '../../themes/ThemeContext';
-import { buildTooltipTheme } from '../../utils/tooltipUtils';
+import { buildTooltipTheme, getPlacement } from '../../utils/tooltipUtils';
 import { Portal } from '../Portal/Portal';
 
 import { PopoverContent, TooltipPlacement } from './types';
@@ -24,41 +36,55 @@ export interface TooltipProps {
 
 export const Tooltip = React.forwardRef<HTMLElement, TooltipProps>(
   ({ children, theme, interactive, show, placement, content }, forwardedRef) => {
+    const arrowRef = useRef(null);
     const [controlledVisible, setControlledVisible] = useState(show);
+    const isOpen = show ?? controlledVisible;
+
+    // the order of middleware is important!
+    // `arrow` should almost always be at the end
+    // see https://floating-ui.com/docs/arrow#order
+    const middleware = [
+      offset(8),
+      flip({
+        fallbackAxisSideDirection: 'end',
+        // see https://floating-ui.com/docs/flip#combining-with-shift
+        crossAxis: false,
+        boundary: document.body,
+      }),
+      shift(),
+      arrow({
+        element: arrowRef,
+      }),
+    ];
+
+    const { context, refs, floatingStyles } = useFloating({
+      open: isOpen,
+      placement: getPlacement(placement),
+      onOpenChange: setControlledVisible,
+      middleware,
+      whileElementsMounted: autoUpdate,
+    });
     const tooltipId = useId();
 
-    useEffect(() => {
-      if (controlledVisible !== false) {
-        const handleKeyDown = (enterKey: KeyboardEvent) => {
-          if (enterKey.key === 'Escape') {
-            setControlledVisible(false);
-          }
-        };
-        document.addEventListener('keydown', handleKeyDown);
-        return () => {
-          document.removeEventListener('keydown', handleKeyDown);
-        };
-      } else {
-        return;
-      }
-    }, [controlledVisible]);
-
-    const { getArrowProps, getTooltipProps, setTooltipRef, setTriggerRef, visible, update } = usePopperTooltip({
-      visible: show ?? controlledVisible,
-      placement,
-      interactive,
-      delayHide: interactive ? 100 : 0,
-      offset: [0, 8],
-      trigger: ['hover', 'focus'],
-      onVisibleChange: setControlledVisible,
+    const hover = useHover(context, {
+      delay: {
+        close: interactive ? 100 : 0,
+      },
+      move: false,
     });
+    const focus = useFocus(context);
+    const dismiss = useDismiss(context);
+
+    const { getReferenceProps, getFloatingProps } = useInteractions([dismiss, hover, focus]);
+
+    const contentIsFunction = typeof content === 'function';
 
     const styles = useStyles2(getStyles);
     const style = styles[theme ?? 'info'];
 
     const handleRef = useCallback(
       (ref: HTMLElement | null) => {
-        setTriggerRef(ref);
+        refs.setReference(ref);
 
         if (typeof forwardedRef === 'function') {
           forwardedRef(ref);
@@ -66,36 +92,35 @@ export const Tooltip = React.forwardRef<HTMLElement, TooltipProps>(
           forwardedRef.current = ref;
         }
       },
-      [forwardedRef, setTriggerRef]
+      [forwardedRef, refs]
     );
 
-    // if the child has an aria-label, this should take precedence over the tooltip content
-    const childHasAriaLabel = 'aria-label' in children.props;
+    // if the child has a matching aria-label, this should take precedence over the tooltip content
+    // otherwise we end up double announcing things in e.g. IconButton
+    const childHasMatchingAriaLabel = 'aria-label' in children.props && children.props['aria-label'] === content;
 
     return (
       <>
         {React.cloneElement(children, {
           ref: handleRef,
           tabIndex: 0, // tooltip trigger should be keyboard focusable
-          'aria-describedby': !childHasAriaLabel && visible ? tooltipId : undefined,
+          'aria-describedby': !childHasMatchingAriaLabel && isOpen ? tooltipId : undefined,
+          ...getReferenceProps(),
         })}
-        {visible && (
+        {isOpen && (
           <Portal>
-            <div
-              data-testid={selectors.components.Tooltip.container}
-              ref={setTooltipRef}
-              id={tooltipId}
-              role="tooltip"
-              {...getTooltipProps({ className: style.container })}
-            >
-              <div {...getArrowProps({ className: style.arrow })} />
-              {typeof content === 'string' && content}
-              {React.isValidElement(content) && React.cloneElement(content)}
-              {typeof content === 'function' &&
-                update &&
-                content({
-                  updatePopperPosition: update,
-                })}
+            <div ref={refs.setFloating} style={floatingStyles} {...getFloatingProps()}>
+              <FloatingArrow className={style.arrow} ref={arrowRef} context={context} />
+              <div
+                data-testid={selectors.components.Tooltip.container}
+                id={tooltipId}
+                role="tooltip"
+                className={style.container}
+              >
+                {typeof content === 'string' && content}
+                {React.isValidElement(content) && React.cloneElement(content)}
+                {contentIsFunction && content({})}
+              </div>
             </div>
           </Portal>
         )}
diff --git a/packages/grafana-ui/src/components/Tooltip/types.ts b/packages/grafana-ui/src/components/Tooltip/types.ts
index cec0b6dd8a0c0..bd4d9ba852972 100644
--- a/packages/grafana-ui/src/components/Tooltip/types.ts
+++ b/packages/grafana-ui/src/components/Tooltip/types.ts
@@ -1,27 +1,14 @@
-/**
- * This API allows popovers to update Popper's position when e.g. popover content changes
- * updatePopperPosition is delivered to content by react-popper.
- */
+import { Placement } from '@floating-ui/react';
+
 export interface PopoverContentProps {
-  // Is this used anywhere in plugins? Can we remove it or rename it to just update?
+  /**
+   * @deprecated
+   * This prop is deprecated and no longer has any effect as popper position updates automatically.
+   * It will be removed in a future release.
+   */
   updatePopperPosition?: () => void;
 }
 
 export type PopoverContent = string | React.ReactElement | ((props: PopoverContentProps) => JSX.Element);
 
-export type TooltipPlacement =
-  | 'auto-start'
-  | 'auto'
-  | 'auto-end'
-  | 'top-start'
-  | 'top'
-  | 'top-end'
-  | 'right-start'
-  | 'right'
-  | 'right-end'
-  | 'bottom-end'
-  | 'bottom'
-  | 'bottom-start'
-  | 'left-end'
-  | 'left'
-  | 'left-start';
+export type TooltipPlacement = Placement | 'auto' | 'auto-start' | 'auto-end';
diff --git a/packages/grafana-ui/src/components/UnitPicker/UnitPicker.tsx b/packages/grafana-ui/src/components/UnitPicker/UnitPicker.tsx
index 983aded2a6ccd..b9142f46b0d26 100644
--- a/packages/grafana-ui/src/components/UnitPicker/UnitPicker.tsx
+++ b/packages/grafana-ui/src/components/UnitPicker/UnitPicker.tsx
@@ -62,6 +62,7 @@ export class UnitPicker extends PureComponent<UnitPickerProps> {
         formatCreateLabel={formatCreateLabel}
         options={groupOptions}
         placeholder="Choose"
+        isClearable
         onSelect={this.props.onChange}
       />
     );
diff --git a/packages/grafana-ui/src/components/ValuePicker/ValuePicker.tsx b/packages/grafana-ui/src/components/ValuePicker/ValuePicker.tsx
index 2fda7a1c086a7..092d09a193138 100644
--- a/packages/grafana-ui/src/components/ValuePicker/ValuePicker.tsx
+++ b/packages/grafana-ui/src/components/ValuePicker/ValuePicker.tsx
@@ -65,7 +65,7 @@ export function ValuePicker<T>({
           variant={variant}
           fill={fill}
           fullWidth={isFullWidth}
-          aria-label={selectors.components.ValuePicker.button(ariaLabel ?? label)}
+          data-testid={selectors.components.ValuePicker.button(ariaLabel ?? label)}
         >
           {label}
         </Button>
diff --git a/packages/grafana-ui/src/components/VizLegend/VizLegend.tsx b/packages/grafana-ui/src/components/VizLegend/VizLegend.tsx
index 140e5c3df377c..8aad8d1decc82 100644
--- a/packages/grafana-ui/src/components/VizLegend/VizLegend.tsx
+++ b/packages/grafana-ui/src/components/VizLegend/VizLegend.tsx
@@ -72,7 +72,7 @@ export function VizLegend<T>({
       }
       if (onToggleSeriesVisibility) {
         onToggleSeriesVisibility(
-          item.label,
+          item.fieldName ?? item.label,
           seriesVisibilityChangeBehavior === SeriesVisibilityChangeBehavior.Hide
             ? SeriesVisibilityChangeMode.AppendToSelection
             : mapMouseEventToMode(event)
diff --git a/packages/grafana-ui/src/components/VizLegend/VizLegendListItem.tsx b/packages/grafana-ui/src/components/VizLegend/VizLegendListItem.tsx
index f1ba5bf74887d..5a43727e7286f 100644
--- a/packages/grafana-ui/src/components/VizLegend/VizLegendListItem.tsx
+++ b/packages/grafana-ui/src/components/VizLegend/VizLegendListItem.tsx
@@ -68,9 +68,14 @@ export const VizLegendListItem = <T = unknown,>({
   return (
     <div
       className={cx(styles.itemWrapper, item.disabled && styles.itemDisabled, className)}
-      aria-label={selectors.components.VizLegend.seriesName(item.label)}
+      data-testid={selectors.components.VizLegend.seriesName(item.label)}
     >
-      <VizLegendSeriesIcon seriesName={item.label} color={item.color} gradient={item.gradient} readonly={readonly} />
+      <VizLegendSeriesIcon
+        seriesName={item.fieldName ?? item.label}
+        color={item.color}
+        gradient={item.gradient}
+        readonly={readonly}
+      />
       <button
         disabled={readonly}
         type="button"
diff --git a/packages/grafana-ui/src/components/VizLegend/VizLegendTable.tsx b/packages/grafana-ui/src/components/VizLegend/VizLegendTable.tsx
index a8c29c7d10e6d..6d289dd1cc7be 100644
--- a/packages/grafana-ui/src/components/VizLegend/VizLegendTable.tsx
+++ b/packages/grafana-ui/src/components/VizLegend/VizLegendTable.tsx
@@ -1,14 +1,16 @@
 import { css, cx } from '@emotion/css';
-import { orderBy } from 'lodash';
 import React from 'react';
 
-import { DisplayValue, GrafanaTheme2 } from '@grafana/data';
+import { GrafanaTheme2 } from '@grafana/data';
 
 import { useStyles2 } from '../../themes/ThemeContext';
 import { Icon } from '../Icon/Icon';
 
 import { LegendTableItem } from './VizLegendTableItem';
-import { VizLegendTableProps } from './types';
+import { VizLegendItem, VizLegendTableProps } from './types';
+
+const nameSortKey = 'Name';
+const naturalCompare = new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' }).compare;
 
 /**
  * @internal
@@ -27,42 +29,48 @@ export const VizLegendTable = <T extends unknown>({
   isSortable,
 }: VizLegendTableProps<T>): JSX.Element => {
   const styles = useStyles2(getStyles);
-  const stats: Record<string, DisplayValue> = {};
-  const nameSortKey = 'Name';
+  const header: Record<string, string> = {};
 
   if (isSortable) {
-    // placeholder displayValue for Name
-    stats[nameSortKey] = { description: 'name', numeric: 0, text: '' };
+    header[nameSortKey] = '';
   }
 
   for (const item of items) {
     if (item.getDisplayValues) {
       for (const displayValue of item.getDisplayValues()) {
-        stats[displayValue.title ?? '?'] = displayValue;
+        header[displayValue.title ?? '?'] = displayValue.description ?? '';
       }
     }
   }
 
-  const sortedItems = sortKey
-    ? orderBy(
-        items,
-        (item) => {
-          if (sortKey === nameSortKey) {
-            return item.label;
-          }
+  if (sortKey != null) {
+    let itemVals = new Map<VizLegendItem, number>();
+
+    items.forEach((item) => {
+      if (sortKey !== nameSortKey && item.getDisplayValues) {
+        const stat = item.getDisplayValues().find((stat) => stat.title === sortKey);
+        const val = stat == null || Number.isNaN(stat.numeric) ? -Infinity : stat.numeric;
+        itemVals.set(item, val);
+      }
+    });
+
+    let sortMult = sortDesc ? -1 : 1;
 
-          if (item.getDisplayValues) {
-            const stat = item.getDisplayValues().filter((stat) => stat.title === sortKey)[0];
+    if (sortKey === nameSortKey) {
+      // string sort
+      items.sort((a, b) => {
+        return sortMult * naturalCompare(a.label, b.label);
+      });
+    } else {
+      // numeric sort
+      items.sort((a, b) => {
+        const aVal = itemVals.get(a) ?? 0;
+        const bVal = itemVals.get(b) ?? 0;
 
-            if (stat) {
-              return isNaN(stat.numeric) ? -Infinity : stat.numeric;
-            }
-          }
-          return undefined;
-        },
-        sortDesc ? 'desc' : 'asc'
-      )
-    : items;
+        return sortMult * (aVal - bVal);
+      });
+    }
+  }
 
   if (!itemRenderer) {
     /* eslint-disable-next-line react/display-name */
@@ -83,29 +91,26 @@ export const VizLegendTable = <T extends unknown>({
       <thead>
         <tr>
           {!isSortable && <th></th>}
-          {Object.keys(stats).map((columnTitle) => {
-            const displayValue = stats[columnTitle];
-            return (
-              <th
-                title={displayValue.description}
-                key={columnTitle}
-                className={cx(styles.header, onToggleSort && styles.headerSortable, isSortable && styles.nameHeader, {
-                  [styles.withIcon]: sortKey === columnTitle,
-                })}
-                onClick={() => {
-                  if (onToggleSort) {
-                    onToggleSort(columnTitle);
-                  }
-                }}
-              >
-                {columnTitle}
-                {sortKey === columnTitle && <Icon size="xs" name={sortDesc ? 'angle-down' : 'angle-up'} />}
-              </th>
-            );
-          })}
+          {Object.keys(header).map((columnTitle) => (
+            <th
+              title={header[columnTitle]}
+              key={columnTitle}
+              className={cx(styles.header, onToggleSort && styles.headerSortable, isSortable && styles.nameHeader, {
+                [styles.withIcon]: sortKey === columnTitle,
+              })}
+              onClick={() => {
+                if (onToggleSort) {
+                  onToggleSort(columnTitle);
+                }
+              }}
+            >
+              {columnTitle}
+              {sortKey === columnTitle && <Icon size="xs" name={sortDesc ? 'angle-down' : 'angle-up'} />}
+            </th>
+          ))}
         </tr>
       </thead>
-      <tbody>{sortedItems.map(itemRenderer!)}</tbody>
+      <tbody>{items.map(itemRenderer!)}</tbody>
     </table>
   );
 };
diff --git a/packages/grafana-ui/src/components/VizLegend/VizLegendTableItem.tsx b/packages/grafana-ui/src/components/VizLegend/VizLegendTableItem.tsx
index 41321b615220e..3dc94c0741f73 100644
--- a/packages/grafana-ui/src/components/VizLegend/VizLegendTableItem.tsx
+++ b/packages/grafana-ui/src/components/VizLegend/VizLegendTableItem.tsx
@@ -69,7 +69,7 @@ export const LegendTableItem = ({
     <tr className={cx(styles.row, className)}>
       <td>
         <span className={styles.itemWrapper}>
-          <VizLegendSeriesIcon color={item.color} seriesName={item.label} readonly={readonly} />
+          <VizLegendSeriesIcon color={item.color} seriesName={item.fieldName ?? item.label} readonly={readonly} />
           <button
             disabled={readonly}
             type="button"
@@ -126,6 +126,7 @@ const getStyles = (theme: GrafanaTheme2) => {
       maxWidth: '600px',
       textOverflow: 'ellipsis',
       overflow: 'hidden',
+      userSelect: 'text',
     }),
     labelDisabled: css({
       label: 'LegendLabelDisabled',
diff --git a/packages/grafana-ui/src/components/VizLegend/types.ts b/packages/grafana-ui/src/components/VizLegend/types.ts
index d64a96f1d5fb5..341008ba48057 100644
--- a/packages/grafana-ui/src/components/VizLegend/types.ts
+++ b/packages/grafana-ui/src/components/VizLegend/types.ts
@@ -47,5 +47,6 @@ export interface VizLegendItem<T = any> {
   // displayValues?: DisplayValue[];
   getDisplayValues?: () => DisplayValue[];
   fieldIndex?: DataFrameFieldIndex;
+  fieldName?: string;
   data?: T;
 }
diff --git a/packages/grafana-ui/src/components/VizRepeater/VizRepeater.tsx b/packages/grafana-ui/src/components/VizRepeater/VizRepeater.tsx
index 7fb1cc112dc5b..0af1bfb3e7bcb 100644
--- a/packages/grafana-ui/src/components/VizRepeater/VizRepeater.tsx
+++ b/packages/grafana-ui/src/components/VizRepeater/VizRepeater.tsx
@@ -1,3 +1,4 @@
+import { clamp } from 'lodash';
 import React, { PureComponent, CSSProperties } from 'react';
 
 import { VizOrientation } from '@grafana/data';
@@ -28,6 +29,7 @@ interface Props<V, D> {
   autoGrid?: boolean;
   minVizWidth?: number;
   minVizHeight?: number;
+  maxVizHeight?: number;
 }
 
 export interface VizRepeaterRenderValueProps<V, D = {}> {
@@ -149,6 +151,7 @@ export class VizRepeater<V, D = {}> extends PureComponent<Props<V, D>, State<V>>
       getAlignmentFactors,
       autoGrid,
       orientation,
+      maxVizHeight,
       minVizWidth,
       minVizHeight,
     } = this.props as PropsWithDefaults<V, D>;
@@ -170,15 +173,16 @@ export class VizRepeater<V, D = {}> extends PureComponent<Props<V, D>, State<V>>
     let vizHeight = height;
     let vizWidth = width;
 
-    let resolvedOrientation = this.getOrientation();
+    const resolvedOrientation = this.getOrientation();
 
     switch (resolvedOrientation) {
       case VizOrientation.Horizontal:
+        const defaultVizHeight = (height + itemSpacing) / values.length - itemSpacing;
         repeaterStyle.flexDirection = 'column';
         repeaterStyle.height = `${height}px`;
         itemStyles.marginBottom = `${itemSpacing}px`;
         vizWidth = width;
-        vizHeight = Math.max(height / values.length - itemSpacing + itemSpacing / values.length, minVizHeight ?? 0);
+        vizHeight = clamp(defaultVizHeight, minVizHeight ?? 0, maxVizHeight ?? defaultVizHeight);
         break;
       case VizOrientation.Vertical:
         repeaterStyle.flexDirection = 'row';
diff --git a/packages/grafana-ui/src/components/VizTooltip/HeaderLabel.tsx b/packages/grafana-ui/src/components/VizTooltip/HeaderLabel.tsx
deleted file mode 100644
index 9303073f222ec..0000000000000
--- a/packages/grafana-ui/src/components/VizTooltip/HeaderLabel.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import { css } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-
-import { HorizontalGroup, Tooltip } from '..';
-import { useStyles2 } from '../../themes';
-
-import { LabelValue } from './types';
-
-interface Props {
-  headerLabel: LabelValue;
-}
-
-export const HeaderLabel = ({ headerLabel }: Props) => {
-  const styles = useStyles2(getStyles);
-
-  return (
-    <HorizontalGroup justify-content="space-between" spacing="lg" wrap>
-      <div className={styles.wrapper}>
-        <span className={styles.label}>{headerLabel.label}</span>
-        <Tooltip content={headerLabel.value ? headerLabel.value.toString() : ''}>
-          <span className={styles.value}>{headerLabel.value}</span>
-        </Tooltip>
-      </div>
-    </HorizontalGroup>
-  );
-};
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  label: css({
-    color: theme.colors.text.secondary,
-    paddingRight: theme.spacing(0.5),
-    fontWeight: 400,
-  }),
-  value: css({
-    fontWeight: 500,
-    lineHeight: '18px',
-    alignSelf: 'center',
-  }),
-  wrapper: css({
-    display: 'flex',
-    flexDirection: 'row',
-    textOverflow: 'ellipsis',
-    overflow: 'hidden',
-    whiteSpace: 'nowrap',
-    width: '250px',
-    maskImage: 'linear-gradient(90deg, rgba(0, 0, 0, 1) 80%, transparent)',
-  }),
-});
diff --git a/packages/grafana-ui/src/components/VizTooltip/VizTooltip.tsx b/packages/grafana-ui/src/components/VizTooltip/VizTooltip.tsx
index 62b8448c64311..5f7c4cf551e1b 100644
--- a/packages/grafana-ui/src/components/VizTooltip/VizTooltip.tsx
+++ b/packages/grafana-ui/src/components/VizTooltip/VizTooltip.tsx
@@ -5,11 +5,19 @@ import { Dimensions, TimeZone } from '@grafana/data';
 import { TooltipDisplayMode } from '@grafana/schema';
 
 import { useStyles2 } from '../../themes';
-import { FlotPosition } from '../Graph/types';
 import { Portal } from '../Portal/Portal';
 
 import { VizTooltipContainer } from './VizTooltipContainer';
 
+export interface FlotPosition {
+  pageX: number;
+  pageY: number;
+  x: number;
+  x1: number;
+  y: number;
+  y1: number;
+}
+
 // Describes active dimensions user interacts with
 // It's a key-value pair where:
 // - key is the name of the dimension
diff --git a/packages/grafana-ui/src/components/VizTooltip/VizTooltipColorIndicator.tsx b/packages/grafana-ui/src/components/VizTooltip/VizTooltipColorIndicator.tsx
new file mode 100644
index 0000000000000..5525dd2e9a56b
--- /dev/null
+++ b/packages/grafana-ui/src/components/VizTooltip/VizTooltipColorIndicator.tsx
@@ -0,0 +1,85 @@
+import { css, cx } from '@emotion/css';
+import React from 'react';
+
+import { FALLBACK_COLOR, GrafanaTheme2 } from '@grafana/data';
+
+import { useStyles2 } from '../../themes';
+
+import { ColorIndicator, DEFAULT_COLOR_INDICATOR } from './types';
+import { getColorIndicatorClass } from './utils';
+
+export enum ColorIndicatorPosition {
+  Leading,
+  Trailing,
+}
+
+interface Props {
+  color?: string;
+  colorIndicator?: ColorIndicator;
+  position?: ColorIndicatorPosition;
+}
+
+export type ColorIndicatorStyles = ReturnType<typeof getStyles>;
+
+export const VizTooltipColorIndicator = ({
+  color = FALLBACK_COLOR,
+  colorIndicator = DEFAULT_COLOR_INDICATOR,
+  position = ColorIndicatorPosition.Leading,
+}: Props) => {
+  const styles = useStyles2(getStyles);
+
+  return (
+    <span
+      style={{ backgroundColor: color }}
+      className={cx(
+        position === ColorIndicatorPosition.Leading ? styles.leading : styles.trailing,
+        getColorIndicatorClass(colorIndicator, styles)
+      )}
+    />
+  );
+};
+
+// @TODO Update classes/add svgs
+const getStyles = (theme: GrafanaTheme2) => ({
+  leading: css({
+    marginRight: theme.spacing(0.5),
+  }),
+  trailing: css({
+    marginLeft: theme.spacing(0.5),
+  }),
+  series: css({
+    width: '14px',
+    height: '4px',
+    borderRadius: theme.shape.radius.pill,
+    minWidth: '14px',
+  }),
+  value: css({
+    width: '12px',
+    height: '12px',
+    borderRadius: theme.shape.radius.default,
+    fontWeight: 500,
+    minWidth: '12px',
+  }),
+  hexagon: css({}),
+  pie_1_4: css({}),
+  pie_2_4: css({}),
+  pie_3_4: css({}),
+  marker_sm: css({
+    width: '4px',
+    height: '4px',
+    borderRadius: theme.shape.radius.circle,
+    minWidth: '4px',
+  }),
+  marker_md: css({
+    width: '8px',
+    height: '8px',
+    borderRadius: theme.shape.radius.circle,
+    minWidth: '8px',
+  }),
+  marker_lg: css({
+    width: '12px',
+    height: '12px',
+    borderRadius: theme.shape.radius.circle,
+    minWidth: '12px',
+  }),
+});
diff --git a/packages/grafana-ui/src/components/VizTooltip/VizTooltipContent.tsx b/packages/grafana-ui/src/components/VizTooltip/VizTooltipContent.tsx
index 6cedcfa974427..802debb59c80a 100644
--- a/packages/grafana-ui/src/components/VizTooltip/VizTooltipContent.tsx
+++ b/packages/grafana-ui/src/components/VizTooltip/VizTooltipContent.tsx
@@ -1,33 +1,46 @@
 import { css } from '@emotion/css';
-import React, { ReactElement } from 'react';
+import React, { CSSProperties, ReactNode } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
-import { HorizontalGroup } from '..';
 import { useStyles2 } from '../../themes';
 
-import { LabelValue } from './types';
+import { VizTooltipRow } from './VizTooltipRow';
+import { VizTooltipItem } from './types';
 
-interface Props {
-  contentLabelValue: LabelValue[];
-  customContent?: ReactElement | null;
+interface VizTooltipContentProps {
+  items: VizTooltipItem[];
+  children?: ReactNode;
+  scrollable?: boolean;
+  isPinned: boolean;
 }
-export const VizTooltipContent = ({ contentLabelValue, customContent }: Props) => {
+
+export const VizTooltipContent = ({ items, children, isPinned, scrollable = false }: VizTooltipContentProps) => {
   const styles = useStyles2(getStyles);
 
+  const scrollableStyle: CSSProperties = scrollable
+    ? {
+        maxHeight: 400,
+        overflowY: 'auto',
+      }
+    : {};
+
   return (
-    <div className={styles.wrapper}>
-      <div>
-        {contentLabelValue?.map((labelValue, i) => {
-          return (
-            <HorizontalGroup justify="space-between" spacing="lg" key={i}>
-              <div className={styles.label}>{labelValue.label}</div>
-              <div className={styles.value}>{labelValue.value}</div>
-            </HorizontalGroup>
-          );
-        })}
-      </div>
-      {customContent && <div className={styles.customContentPadding}>{customContent}</div>}
+    <div className={styles.wrapper} style={scrollableStyle}>
+      {items.map(({ label, value, color, colorIndicator, colorPlacement, isActive }, i) => (
+        <VizTooltipRow
+          key={i}
+          label={label}
+          value={value}
+          color={color}
+          colorIndicator={colorIndicator}
+          colorPlacement={colorPlacement}
+          isActive={isActive}
+          justify={'space-between'}
+          isPinned={isPinned}
+        />
+      ))}
+      {children}
     </div>
   );
 };
@@ -39,16 +52,6 @@ const getStyles = (theme: GrafanaTheme2) => ({
     flex: 1,
     gap: 4,
     borderTop: `1px solid ${theme.colors.border.medium}`,
-    padding: `${theme.spacing(1)} 0`,
-  }),
-  customContentPadding: css({
-    padding: `${theme.spacing(1)} 0`,
-  }),
-  label: css({
-    color: theme.colors.text.secondary,
-    fontWeight: 400,
-  }),
-  value: css({
-    fontWeight: 500,
+    padding: theme.spacing(1),
   }),
 });
diff --git a/packages/grafana-ui/src/components/VizTooltip/VizTooltipFooter.tsx b/packages/grafana-ui/src/components/VizTooltip/VizTooltipFooter.tsx
index 490d62bf582bd..834c3b1f54dcd 100644
--- a/packages/grafana-ui/src/components/VizTooltip/VizTooltipFooter.tsx
+++ b/packages/grafana-ui/src/components/VizTooltip/VizTooltipFooter.tsx
@@ -3,17 +3,17 @@ import React from 'react';
 
 import { Field, GrafanaTheme2, LinkModel } from '@grafana/data';
 
-import { Button, ButtonProps, DataLinkButton, HorizontalGroup } from '..';
+import { Button, ButtonProps, DataLinkButton, Stack } from '..';
 import { useStyles2 } from '../../themes';
 
-interface Props {
+interface VizTooltipFooterProps {
   dataLinks: Array<LinkModel<Field>>;
-  canAnnotate: boolean;
+  annotate?: () => void;
 }
 
 export const ADD_ANNOTATION_ID = 'add-annotation-button';
 
-export const VizTooltipFooter = ({ dataLinks, canAnnotate }: Props) => {
+export const VizTooltipFooter = ({ dataLinks, annotate }: VizTooltipFooterProps) => {
   const styles = useStyles2(getStyles);
 
   const renderDataLinks = () => {
@@ -22,20 +22,20 @@ export const VizTooltipFooter = ({ dataLinks, canAnnotate }: Props) => {
     };
 
     return (
-      <HorizontalGroup>
+      <Stack direction="column" justifyContent="flex-start">
         {dataLinks.map((link, i) => (
           <DataLinkButton key={i} link={link} buttonProps={buttonProps} />
         ))}
-      </HorizontalGroup>
+      </Stack>
     );
   };
 
   return (
     <div className={styles.wrapper}>
       {dataLinks.length > 0 && <div className={styles.dataLinks}>{renderDataLinks()}</div>}
-      {canAnnotate && (
+      {annotate != null && (
         <div className={styles.addAnnotations}>
-          <Button icon="comment-alt" variant="secondary" size="sm" id={ADD_ANNOTATION_ID}>
+          <Button icon="comment-alt" variant="secondary" size="sm" id={ADD_ANNOTATION_ID} onClick={annotate}>
             Add annotation
           </Button>
         </div>
@@ -49,17 +49,14 @@ const getStyles = (theme: GrafanaTheme2) => ({
     display: 'flex',
     flexDirection: 'column',
     flex: 1,
+    padding: theme.spacing(0),
   }),
   dataLinks: css({
-    height: 40,
-    overflowX: 'auto',
-    overflowY: 'hidden',
-    whiteSpace: 'nowrap',
     borderTop: `1px solid ${theme.colors.border.medium}`,
-    maskImage: 'linear-gradient(90deg, rgba(0, 0, 0, 1) 80%, transparent)',
+    padding: theme.spacing(1),
   }),
   addAnnotations: css({
     borderTop: `1px solid ${theme.colors.border.medium}`,
-    paddingTop: theme.spacing(1),
+    padding: theme.spacing(1),
   }),
 });
diff --git a/packages/grafana-ui/src/components/VizTooltip/VizTooltipHeader.tsx b/packages/grafana-ui/src/components/VizTooltip/VizTooltipHeader.tsx
index fe7233f551d5b..360145db48f74 100644
--- a/packages/grafana-ui/src/components/VizTooltip/VizTooltipHeader.tsx
+++ b/packages/grafana-ui/src/components/VizTooltip/VizTooltipHeader.tsx
@@ -1,33 +1,32 @@
 import { css } from '@emotion/css';
-import React, { ReactElement } from 'react';
+import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
 import { useStyles2 } from '../../themes';
 
-import { HeaderLabel } from './HeaderLabel';
-import { VizTooltipHeaderLabelValue } from './VizTooltipHeaderLabelValue';
-import { LabelValue } from './types';
+import { VizTooltipRow } from './VizTooltipRow';
+import { VizTooltipItem } from './types';
 
 interface Props {
-  headerLabel: LabelValue;
-  keyValuePairs?: LabelValue[];
-  customValueDisplay?: ReactElement | null;
+  item: VizTooltipItem;
+  isPinned: boolean;
 }
-export const VizTooltipHeader = ({ headerLabel, keyValuePairs, customValueDisplay }: Props) => {
+export const VizTooltipHeader = ({ item, isPinned }: Props) => {
   const styles = useStyles2(getStyles);
 
-  const renderValue = () => {
-    if (customValueDisplay) {
-      return customValueDisplay;
-    }
+  const { label, value, color, colorIndicator } = item;
 
-    return <VizTooltipHeaderLabelValue keyValuePairs={keyValuePairs} />;
-  };
   return (
     <div className={styles.wrapper}>
-      <HeaderLabel headerLabel={headerLabel} />
-      {renderValue()}
+      <VizTooltipRow
+        label={label}
+        value={value}
+        color={color}
+        colorIndicator={colorIndicator}
+        marginRight={'22px'}
+        isPinned={isPinned}
+      />
     </div>
   );
 };
@@ -37,6 +36,6 @@ const getStyles = (theme: GrafanaTheme2) => ({
     display: 'flex',
     flexDirection: 'column',
     flex: 1,
-    paddingBottom: theme.spacing(1),
+    padding: theme.spacing(1),
   }),
 });
diff --git a/packages/grafana-ui/src/components/VizTooltip/VizTooltipHeaderLabelValue.tsx b/packages/grafana-ui/src/components/VizTooltip/VizTooltipHeaderLabelValue.tsx
deleted file mode 100644
index 13d8db31a8cc9..0000000000000
--- a/packages/grafana-ui/src/components/VizTooltip/VizTooltipHeaderLabelValue.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import { css, cx } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-
-import { HorizontalGroup } from '..';
-import { useStyles2 } from '../../themes';
-
-import { LabelValue } from './types';
-import { getColorIndicatorClass } from './utils';
-
-interface Props {
-  keyValuePairs?: LabelValue[];
-}
-
-export type HeaderLabelValueStyles = ReturnType<typeof getStyles>;
-
-export const VizTooltipHeaderLabelValue = ({ keyValuePairs }: Props) => {
-  const styles = useStyles2(getStyles);
-
-  return (
-    <>
-      {keyValuePairs?.map((keyValuePair, i) => {
-        return (
-          <HorizontalGroup justify="space-between" spacing="md" className={styles.hgContainer} key={i}>
-            <div className={styles.label}>{keyValuePair.label}</div>
-            <>
-              <span
-                style={{ backgroundColor: keyValuePair.color }}
-                className={cx(styles.colorIndicator, getColorIndicatorClass(keyValuePair.colorIndicator!, styles))}
-              />
-              {keyValuePair.value}
-            </>
-          </HorizontalGroup>
-        );
-      })}
-    </>
-  );
-};
-
-// @TODO Update classes/add svgs?
-const getStyles = (theme: GrafanaTheme2) => ({
-  hgContainer: css({
-    flexGrow: 1,
-  }),
-  colorIndicator: css({
-    marginRight: theme.spacing(0.5),
-  }),
-  label: css({
-    color: theme.colors.text.secondary,
-    fontWeight: 400,
-  }),
-  series: css({
-    width: '14px',
-    height: '4px',
-    borderRadius: theme.shape.radius.pill,
-  }),
-  value: css({
-    width: '12px',
-    height: '12px',
-    borderRadius: theme.shape.radius.default,
-    fontWeight: 500,
-  }),
-  hexagon: css({}),
-  pie_1_4: css({}),
-  pie_2_4: css({}),
-  pie_3_4: css({}),
-  marker_sm: css({
-    width: '4px',
-    height: '4px',
-    borderRadius: theme.shape.radius.circle,
-  }),
-  marker_md: css({
-    width: '8px',
-    height: '8px',
-    borderRadius: theme.shape.radius.circle,
-  }),
-  marker_lg: css({
-    width: '12px',
-    height: '12px',
-    borderRadius: theme.shape.radius.circle,
-  }),
-});
diff --git a/packages/grafana-ui/src/components/VizTooltip/VizTooltipRow.tsx b/packages/grafana-ui/src/components/VizTooltip/VizTooltipRow.tsx
new file mode 100644
index 0000000000000..5faa6b31dfa22
--- /dev/null
+++ b/packages/grafana-ui/src/components/VizTooltip/VizTooltipRow.tsx
@@ -0,0 +1,228 @@
+import { css, cx } from '@emotion/css';
+import React, { ReactNode, useEffect, useRef, useState } from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+
+import { useStyles2 } from '../../themes';
+import { InlineToast } from '../InlineToast/InlineToast';
+import { Tooltip } from '../Tooltip';
+
+import { ColorIndicatorPosition, VizTooltipColorIndicator } from './VizTooltipColorIndicator';
+import { ColorPlacement, VizTooltipItem } from './types';
+
+interface VizTooltipRowProps extends Omit<VizTooltipItem, 'value'> {
+  value: string | number | null | ReactNode;
+  justify?: string;
+  isActive?: boolean; // for series list
+  marginRight?: string;
+  isPinned: boolean;
+}
+
+enum LabelValueTypes {
+  label = 'label',
+  value = 'value',
+}
+
+const SUCCESSFULLY_COPIED_TEXT = 'Copied to clipboard';
+const SHOW_SUCCESS_DURATION = 2 * 1000;
+
+export const VizTooltipRow = ({
+  label,
+  value,
+  color,
+  colorIndicator,
+  colorPlacement = ColorPlacement.first,
+  justify = 'flex-start',
+  isActive = false,
+  marginRight = '0px',
+  isPinned,
+}: VizTooltipRowProps) => {
+  const styles = useStyles2(getStyles, justify, marginRight);
+
+  const [showLabelTooltip, setShowLabelTooltip] = useState(false);
+  const [showValueTooltip, setShowValueTooltip] = useState(false);
+
+  const [copiedText, setCopiedText] = useState<Record<string, string> | null>(null);
+  const [showCopySuccess, setShowCopySuccess] = useState(false);
+
+  const labelRef = useRef<null | HTMLDivElement>(null);
+  const valueRef = useRef<null | HTMLDivElement>(null);
+
+  useEffect(() => {
+    let timeoutId: ReturnType<typeof setTimeout>;
+
+    if (showCopySuccess) {
+      timeoutId = setTimeout(() => {
+        setShowCopySuccess(false);
+      }, SHOW_SUCCESS_DURATION);
+    }
+
+    return () => {
+      window.clearTimeout(timeoutId);
+    };
+  }, [showCopySuccess]);
+
+  const copyToClipboard = async (text: string, type: LabelValueTypes) => {
+    if (!(navigator?.clipboard && window.isSecureContext)) {
+      fallbackCopyToClipboard(text, type);
+      return;
+    }
+
+    try {
+      await navigator.clipboard.writeText(text);
+      setCopiedText({ [`${type}`]: text });
+      setShowCopySuccess(true);
+    } catch (error) {
+      setCopiedText(null);
+    }
+  };
+
+  const fallbackCopyToClipboard = (text: string, type: LabelValueTypes) => {
+    // Use a fallback method for browsers/contexts that don't support the Clipboard API.
+    const textarea = document.createElement('textarea');
+    labelRef.current?.appendChild(textarea);
+    textarea.value = text;
+    textarea.focus();
+    textarea.select();
+    try {
+      const successful = document.execCommand('copy');
+      if (successful) {
+        setCopiedText({ [`${type}`]: text });
+        setShowCopySuccess(true);
+      }
+    } catch (err) {
+      console.error('Unable to copy to clipboard', err);
+    }
+
+    textarea.remove();
+  };
+
+  const onMouseEnterLabel = (event: React.MouseEvent<HTMLDivElement>) => {
+    if (event.currentTarget.offsetWidth < event.currentTarget.scrollWidth) {
+      setShowLabelTooltip(true);
+    }
+  };
+
+  const onMouseLeaveLabel = () => setShowLabelTooltip(false);
+
+  const onMouseEnterValue = (event: React.MouseEvent<HTMLDivElement>) => {
+    if (event.currentTarget.offsetWidth < event.currentTarget.scrollWidth) {
+      setShowValueTooltip(true);
+    }
+  };
+
+  const onMouseLeaveValue = () => setShowValueTooltip(false);
+
+  return (
+    <div className={styles.contentWrapper}>
+      {(color || label) && (
+        <div className={styles.valueWrapper}>
+          {color && colorPlacement === ColorPlacement.first && (
+            <VizTooltipColorIndicator color={color} colorIndicator={colorIndicator} />
+          )}
+          {!isPinned ? (
+            <div className={cx(styles.label, isActive && styles.activeSeries)}>{label}</div>
+          ) : (
+            <>
+              <Tooltip content={label} interactive={false} show={showLabelTooltip}>
+                <>
+                  {showCopySuccess && copiedText?.label && (
+                    <InlineToast placement="top" referenceElement={labelRef.current}>
+                      {SUCCESSFULLY_COPIED_TEXT}
+                    </InlineToast>
+                  )}
+                  {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */}
+                  <div
+                    className={cx(styles.label, isActive && styles.activeSeries, navigator?.clipboard && styles.copy)}
+                    onMouseEnter={onMouseEnterLabel}
+                    onMouseLeave={onMouseLeaveLabel}
+                    onClick={() => copyToClipboard(label, LabelValueTypes.label)}
+                    ref={labelRef}
+                  >
+                    {label}
+                  </div>
+                </>
+              </Tooltip>
+            </>
+          )}
+        </div>
+      )}
+
+      <div className={styles.valueWrapper}>
+        {color && colorPlacement === ColorPlacement.leading && (
+          <VizTooltipColorIndicator
+            color={color}
+            colorIndicator={colorIndicator}
+            position={ColorIndicatorPosition.Leading}
+          />
+        )}
+
+        {!isPinned ? (
+          <div className={cx(styles.value, isActive)}>{value}</div>
+        ) : (
+          <Tooltip content={value ? value.toString() : ''} interactive={false} show={showValueTooltip}>
+            <>
+              {showCopySuccess && copiedText?.value && (
+                <InlineToast placement="top" referenceElement={valueRef.current}>
+                  {SUCCESSFULLY_COPIED_TEXT}
+                </InlineToast>
+              )}
+              {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */}
+              <div
+                className={cx(styles.value, isActive, navigator?.clipboard && styles.copy)}
+                onMouseEnter={onMouseEnterValue}
+                onMouseLeave={onMouseLeaveValue}
+                onClick={() => copyToClipboard(value ? value.toString() : '', LabelValueTypes.value)}
+                ref={valueRef}
+              >
+                {value}
+              </div>
+            </>
+          </Tooltip>
+        )}
+
+        {color && colorPlacement === ColorPlacement.trailing && (
+          <VizTooltipColorIndicator
+            color={color}
+            colorIndicator={colorIndicator}
+            position={ColorIndicatorPosition.Trailing}
+          />
+        )}
+      </div>
+    </div>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2, justify: string, marginRight: string) => ({
+  contentWrapper: css({
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: justify,
+    flexWrap: 'wrap',
+    marginRight: marginRight,
+  }),
+  label: css({
+    color: theme.colors.text.secondary,
+    fontWeight: 400,
+    textOverflow: 'ellipsis',
+    overflow: 'hidden',
+    marginRight: theme.spacing(2),
+  }),
+  value: css({
+    fontWeight: 500,
+    textOverflow: 'ellipsis',
+    overflow: 'hidden',
+  }),
+  valueWrapper: css({
+    display: 'flex',
+    alignItems: 'center',
+    minWidth: 0,
+  }),
+  activeSeries: css({
+    fontWeight: theme.typography.fontWeightBold,
+    color: theme.colors.text.maxContrast,
+  }),
+  copy: css({
+    cursor: 'pointer',
+  }),
+});
diff --git a/packages/grafana-ui/src/components/VizTooltip/types.ts b/packages/grafana-ui/src/components/VizTooltip/types.ts
index 615ad81b3319f..8a734a85092a7 100644
--- a/packages/grafana-ui/src/components/VizTooltip/types.ts
+++ b/packages/grafana-ui/src/components/VizTooltip/types.ts
@@ -10,15 +10,23 @@ export enum ColorIndicator {
   marker_lg = 'marker_lg',
 }
 
-export enum LabelValuePlacement {
+export enum ColorPlacement {
   hidden = 'hidden',
+  first = 'first',
   leading = 'leading',
   trailing = 'trailing',
 }
 
-export interface LabelValue {
+export interface VizTooltipItem {
   label: string;
-  value: string | number | null;
+  value: string;
   color?: string;
   colorIndicator?: ColorIndicator;
+  colorPlacement?: ColorPlacement;
+  isActive?: boolean;
+
+  // internal/tmp for sorting
+  numeric?: number;
 }
+
+export const DEFAULT_COLOR_INDICATOR = ColorIndicator.series;
diff --git a/packages/grafana-ui/src/components/VizTooltip/utils.test.ts b/packages/grafana-ui/src/components/VizTooltip/utils.test.ts
index 92c59cdba5cd2..5c4189012bbfc 100644
--- a/packages/grafana-ui/src/components/VizTooltip/utils.test.ts
+++ b/packages/grafana-ui/src/components/VizTooltip/utils.test.ts
@@ -1,4 +1,7 @@
-import { calculateTooltipPosition } from './utils';
+import { DataFrame, FieldType } from '@grafana/data';
+import { SortOrder, TooltipDisplayMode } from '@grafana/schema';
+
+import { calculateTooltipPosition, getContentItems } from './utils';
 
 describe('utils', () => {
   describe('calculateTooltipPosition', () => {
@@ -162,4 +165,171 @@ describe('utils', () => {
       });
     });
   });
+
+  describe('it tests getContentItems with numeric values', () => {
+    const timeValues = [1707833954056, 1707838274056, 1707842594056];
+    const seriesAValues = [1, 20, 70];
+    const seriesBValues = [-100, -26, null];
+
+    const frame = {
+      name: 'a',
+      length: timeValues.length,
+      fields: [
+        {
+          name: 'time',
+          type: FieldType.time,
+          values: timeValues[0],
+          config: {},
+          display: (value: string) => ({
+            text: value,
+            color: undefined,
+            numeric: NaN,
+          }),
+        },
+        {
+          name: 'A-series',
+          type: FieldType.number,
+          values: seriesAValues,
+          config: {},
+          display: (value: string) => ({
+            text: value,
+            color: undefined,
+            numeric: Number(value),
+          }),
+        },
+        {
+          name: 'B-series',
+          type: FieldType.number,
+          values: seriesBValues,
+          config: {},
+          display: (value: string) => ({
+            text: value,
+            color: undefined,
+            numeric: Number(value),
+          }),
+        },
+      ],
+    } as unknown as DataFrame;
+
+    const fields = frame.fields;
+    const xField = frame.fields[0];
+    const dataIdxs = [1, 1, 1];
+
+    it('displays one series in single mode', () => {
+      const rows = getContentItems(fields, xField, dataIdxs, 2, TooltipDisplayMode.Single, SortOrder.None);
+      expect(rows.length).toBe(1);
+      expect(rows[0].value).toBe('-26');
+    });
+
+    it('displays the right content in multi mode', () => {
+      const rows = getContentItems(fields, xField, dataIdxs, null, TooltipDisplayMode.Multi, SortOrder.None);
+      expect(rows.length).toBe(2);
+      expect(rows[0].value).toBe('20');
+      expect(rows[1].value).toBe('-26');
+    });
+
+    it('displays the values sorted ASC', () => {
+      const rows = getContentItems(fields, xField, dataIdxs, null, TooltipDisplayMode.Multi, SortOrder.Ascending);
+      expect(rows.length).toBe(2);
+      expect(rows[0].value).toBe('-26');
+      expect(rows[1].value).toBe('20');
+    });
+
+    it('displays the values sorted DESC', () => {
+      const rows = getContentItems(fields, xField, dataIdxs, null, TooltipDisplayMode.Multi, SortOrder.Descending);
+      expect(rows.length).toBe(2);
+      expect(rows[0].value).toBe('20');
+      expect(rows[1].value).toBe('-26');
+    });
+
+    it('displays the correct value when NULL values', () => {
+      const rows = getContentItems(fields, xField, [2, 2, null], null, TooltipDisplayMode.Multi, SortOrder.Descending);
+      expect(rows.length).toBe(1);
+      expect(rows[0].value).toBe('70');
+    });
+  });
+
+  describe('it tests getContentItems with string values', () => {
+    const timeValues = [1707833954056, 1707838274056, 1707842594056];
+    const seriesAValues = ['LOW', 'HIGH', 'NORMAL'];
+    const seriesBValues = ['NORMAL', 'LOW', 'LOW'];
+
+    const frame = {
+      name: 'a',
+      length: timeValues.length,
+      fields: [
+        {
+          name: 'time',
+          type: FieldType.time,
+          values: timeValues[0],
+          config: {},
+          display: (value: string) => ({
+            text: value,
+            color: undefined,
+            numeric: NaN,
+          }),
+        },
+        {
+          name: 'A-series',
+          type: FieldType.string,
+          values: seriesAValues,
+          config: {},
+          display: (value: string) => ({
+            text: value,
+            color: undefined,
+            numeric: NaN,
+          }),
+        },
+        {
+          name: 'B-series',
+          type: FieldType.string,
+          values: seriesBValues,
+          config: {},
+          display: (value: string) => ({
+            text: value,
+            color: undefined,
+            numeric: NaN,
+          }),
+        },
+      ],
+    } as unknown as DataFrame;
+
+    const fields = frame.fields;
+    const xField = frame.fields[0];
+    const dataIdxs = [null, 0, 0];
+
+    it('displays one series in single mode', () => {
+      const rows = getContentItems(fields, xField, [null, null, 0], 2, TooltipDisplayMode.Single, SortOrder.None);
+      expect(rows.length).toBe(1);
+      expect(rows[0].value).toBe('NORMAL');
+    });
+
+    it('displays the right content in multi mode', () => {
+      const rows = getContentItems(fields, xField, dataIdxs, 2, TooltipDisplayMode.Multi, SortOrder.None);
+      expect(rows.length).toBe(2);
+      expect(rows[0].value).toBe('LOW');
+      expect(rows[1].value).toBe('NORMAL');
+    });
+
+    it('displays the values sorted ASC', () => {
+      const rows = getContentItems(fields, xField, dataIdxs, 2, TooltipDisplayMode.Multi, SortOrder.Ascending);
+      expect(rows.length).toBe(2);
+      expect(rows[0].value).toBe('LOW');
+      expect(rows[1].value).toBe('NORMAL');
+    });
+
+    it('displays the values sorted DESC', () => {
+      const rows = getContentItems(
+        frame.fields,
+        frame.fields[0],
+        dataIdxs,
+        2,
+        TooltipDisplayMode.Multi,
+        SortOrder.Descending
+      );
+      expect(rows.length).toBe(2);
+      expect(rows[0].value).toBe('NORMAL');
+      expect(rows[1].value).toBe('LOW');
+    });
+  });
 });
diff --git a/packages/grafana-ui/src/components/VizTooltip/utils.ts b/packages/grafana-ui/src/components/VizTooltip/utils.ts
index 44f65d28ffabe..0d8058fc53118 100644
--- a/packages/grafana-ui/src/components/VizTooltip/utils.ts
+++ b/packages/grafana-ui/src/components/VizTooltip/utils.ts
@@ -1,5 +1,8 @@
-import { HeaderLabelValueStyles } from './VizTooltipHeaderLabelValue';
-import { ColorIndicator } from './types';
+import { FALLBACK_COLOR, Field, FieldType, formattedValueToString } from '@grafana/data';
+import { SortOrder, TooltipDisplayMode } from '@grafana/schema';
+
+import { ColorIndicatorStyles } from './VizTooltipColorIndicator';
+import { ColorIndicator, ColorPlacement, VizTooltipItem } from './types';
 
 export const calculateTooltipPosition = (
   xPos = 0,
@@ -42,7 +45,7 @@ export const calculateTooltipPosition = (
   return { x, y };
 };
 
-export const getColorIndicatorClass = (colorIndicator: string, styles: HeaderLabelValueStyles) => {
+export const getColorIndicatorClass = (colorIndicator: string, styles: ColorIndicatorStyles) => {
   switch (colorIndicator) {
     case ColorIndicator.value:
       return styles.value;
@@ -66,3 +69,84 @@ export const getColorIndicatorClass = (colorIndicator: string, styles: HeaderLab
       return styles.value;
   }
 };
+
+const numberCmp = (a: VizTooltipItem, b: VizTooltipItem) => a.numeric! - b.numeric!;
+const collator = new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' });
+const stringCmp = (a: VizTooltipItem, b: VizTooltipItem) => collator.compare(`${a.value}`, `${b.value}`);
+
+export const getContentItems = (
+  fields: Field[],
+  xField: Field,
+  dataIdxs: Array<number | null>,
+  seriesIdx: number | null | undefined,
+  mode: TooltipDisplayMode,
+  sortOrder: SortOrder,
+  fieldFilter = (field: Field) => true
+): VizTooltipItem[] => {
+  let rows: VizTooltipItem[] = [];
+
+  let allNumeric = true;
+
+  for (let i = 0; i < fields.length; i++) {
+    const field = fields[i];
+
+    if (
+      field === xField ||
+      field.type === FieldType.time ||
+      !fieldFilter(field) ||
+      field.config.custom?.hideFrom?.tooltip ||
+      field.config.custom?.hideFrom?.viz
+    ) {
+      continue;
+    }
+
+    // in single mode, skip all but closest field
+    if (mode === TooltipDisplayMode.Single && seriesIdx !== i) {
+      continue;
+    }
+
+    let dataIdx = dataIdxs[i];
+
+    // omit non-hovered
+    if (dataIdx == null) {
+      continue;
+    }
+
+    if (!(field.type === FieldType.number || field.type === FieldType.boolean || field.type === FieldType.enum)) {
+      allNumeric = false;
+    }
+
+    const v = fields[i].values[dataIdx];
+
+    if (v == null && field.config.noValue == null) {
+      continue;
+    }
+
+    const display = field.display!(v); // super expensive :(
+
+    // sort NaN and non-numeric to bottom (regardless of sort order)
+    const numeric = !Number.isNaN(display.numeric)
+      ? display.numeric
+      : sortOrder === SortOrder.Descending
+        ? Number.MIN_SAFE_INTEGER
+        : Number.MAX_SAFE_INTEGER;
+
+    rows.push({
+      label: field.state?.displayName ?? field.name,
+      value: formattedValueToString(display),
+      color: display.color ?? FALLBACK_COLOR,
+      colorIndicator: ColorIndicator.series,
+      colorPlacement: ColorPlacement.first,
+      isActive: mode === TooltipDisplayMode.Multi && seriesIdx === i,
+      numeric,
+    });
+  }
+
+  if (sortOrder !== SortOrder.None && rows.length > 1) {
+    const cmp = allNumeric ? numberCmp : stringCmp;
+    const mult = sortOrder === SortOrder.Descending ? -1 : 1;
+    rows.sort((a, b) => mult * cmp(a, b));
+  }
+
+  return rows;
+};
diff --git a/packages/grafana-ui/src/components/index.ts b/packages/grafana-ui/src/components/index.ts
index 0f5dd38ea0215..ca48dd03bc395 100644
--- a/packages/grafana-ui/src/components/index.ts
+++ b/packages/grafana-ui/src/components/index.ts
@@ -30,6 +30,7 @@ export { ColorPicker, SeriesColorPicker } from './ColorPicker/ColorPicker';
 export { ColorPickerInput } from './ColorPicker/ColorPickerInput';
 export { SeriesColorPickerPopover, SeriesColorPickerPopoverWithTheme } from './ColorPicker/SeriesColorPickerPopover';
 export { EmptySearchResult } from './EmptySearchResult/EmptySearchResult';
+export { EmptyState } from './EmptyState/EmptyState';
 export { UnitPicker } from './UnitPicker/UnitPicker';
 export { StatsPicker } from './StatsPicker/StatsPicker';
 export { RefreshPicker, defaultIntervals } from './RefreshPicker/RefreshPicker';
@@ -100,7 +101,7 @@ export {
 } from './Table/types';
 export { TableInputCSV } from './TableInputCSV/TableInputCSV';
 export { TabsBar } from './Tabs/TabsBar';
-export { Tab } from './Tabs/Tab';
+export { Tab, type TabProps } from './Tabs/Tab';
 export { VerticalTab } from './Tabs/VerticalTab';
 export { TabContent } from './Tabs/TabContent';
 export { Counter } from './Tabs/Counter';
@@ -117,9 +118,6 @@ export {
 export { Sparkline } from './Sparkline/Sparkline';
 
 export { Gauge } from './Gauge/Gauge';
-export { Graph } from './Graph/Graph';
-export { GraphWithLegend } from './Graph/GraphWithLegend';
-export { GraphContextMenu, GraphContextMenuHeader } from './Graph/GraphContextMenu';
 export { BarGauge } from './BarGauge/BarGauge';
 export {
   VizTooltip,
@@ -130,7 +128,6 @@ export {
   type SeriesTableRowProps,
 } from './VizTooltip';
 export { VizRepeater, type VizRepeaterRenderValueProps } from './VizRepeater/VizRepeater';
-export { graphTimeFormat, graphTickFormatter } from './Graph/utils';
 export {
   PanelChrome,
   type PanelChromeProps,
@@ -154,7 +151,7 @@ export { VizLegend } from './VizLegend/VizLegend';
 export { VizLegendListItem } from './VizLegend/VizLegendListItem';
 
 export { Alert, type AlertVariant } from './Alert/Alert';
-export { GraphSeriesToggler, type GraphSeriesTogglerAPI } from './Graph/GraphSeriesToggler';
+export { GraphSeriesToggler, type GraphSeriesTogglerAPI } from '../graveyard/Graph/GraphSeriesToggler';
 export { Collapse, ControlledCollapse } from './Collapse/Collapse';
 export { CollapsableSection } from './Collapse/CollapsableSection';
 export { DataLinkButton } from './DataLinks/DataLinkButton';
@@ -215,6 +212,9 @@ export { Link } from './Link/Link';
 export { TextLink } from './Link/TextLink';
 export { Text } from './Text/Text';
 export { Box } from './Layout/Box/Box';
+export { Stack } from './Layout/Stack/Stack';
+export { Grid } from './Layout/Grid/Grid';
+export { Space } from './Layout/Space';
 
 export { Label } from './Forms/Label';
 export { Field, type FieldProps } from './Forms/Field';
@@ -230,7 +230,6 @@ export { FieldArray } from './Forms/FieldArray';
 // Select
 export { default as resetSelectStyles } from './Select/resetSelectStyles';
 export * from './Select/Select';
-export { DropdownIndicator } from './Select/DropdownIndicator';
 export { getSelectStyles } from './Select/getSelectStyles';
 export * from './Select/types';
 
@@ -266,6 +265,8 @@ export { Avatar } from './UsersIndicator/Avatar';
 // Export this until we've figured out a good approach to inline form styles.
 export { InlineFormLabel } from './FormLabel/FormLabel';
 export { Divider } from './Divider/Divider';
+export { getDragStyles, type DragHandlePosition } from './DragHandle/DragHandle';
+export { useSplitter } from './Splitter/useSplitter';
 
 /** @deprecated Please use non-legacy versions of these components */
 const LegacyForms = {
@@ -289,13 +290,24 @@ export { UPlotChart } from './uPlot/Plot';
 export { PlotLegend } from './uPlot/PlotLegend';
 export * from './uPlot/geometries';
 export * from './uPlot/plugins';
-export { type PlotTooltipInterpolator, type PlotSelection } from './uPlot/types';
+export { type PlotTooltipInterpolator, type PlotSelection, FIXED_UNIT } from './uPlot/types';
 export { type UPlotConfigPrepFn } from './uPlot/config/UPlotConfigBuilder';
-export { GraphNG, type GraphNGProps, FIXED_UNIT } from './GraphNG/GraphNG';
-export { TimeSeries } from './TimeSeries/TimeSeries';
-export { useGraphNGContext } from './GraphNG/hooks';
-export { preparePlotFrame, buildScaleKey } from './GraphNG/utils';
-export { type GraphNGLegendEvent } from './GraphNG/types';
 export * from './PanelChrome/types';
 export { Label as BrowserLabel } from './BrowserLabel/Label';
 export { PanelContainer } from './PanelContainer/PanelContainer';
+
+// -----------------------------------------------------
+// Graveyard: exported, but no longer used internally
+// These will be removed in the future
+// -----------------------------------------------------
+
+export { Graph } from '../graveyard/Graph/Graph';
+export { GraphWithLegend } from '../graveyard/Graph/GraphWithLegend';
+export { GraphContextMenu, GraphContextMenuHeader } from '../graveyard/Graph/GraphContextMenu';
+export { graphTimeFormat, graphTickFormatter } from '../graveyard/Graph/utils';
+
+export { GraphNG, type GraphNGProps } from '../graveyard/GraphNG/GraphNG';
+export { TimeSeries } from '../graveyard/TimeSeries/TimeSeries';
+export { useGraphNGContext } from '../graveyard/GraphNG/hooks';
+export { preparePlotFrame, buildScaleKey } from '../graveyard/GraphNG/utils';
+export { type GraphNGLegendEvent } from '../graveyard/GraphNG/types';
diff --git a/packages/grafana-ui/src/components/transitions/FadeTransition.tsx b/packages/grafana-ui/src/components/transitions/FadeTransition.tsx
index 5de4717ae2b06..c1d9d6be2232b 100644
--- a/packages/grafana-ui/src/components/transitions/FadeTransition.tsx
+++ b/packages/grafana-ui/src/components/transitions/FadeTransition.tsx
@@ -2,30 +2,9 @@ import { css } from '@emotion/css';
 import React from 'react';
 import { CSSTransition } from 'react-transition-group';
 
-import { stylesFactory } from '../../themes';
+import { GrafanaTheme2 } from '@grafana/data';
 
-const getStyles = stylesFactory((duration: number) => {
-  return {
-    enter: css({
-      label: 'enter',
-      opacity: 0,
-    }),
-    enterActive: css({
-      label: 'enterActive',
-      opacity: 1,
-      transition: `opacity ${duration}ms ease-out`,
-    }),
-    exit: css({
-      label: 'exit',
-      opacity: 1,
-    }),
-    exitActive: css({
-      label: 'exitActive',
-      opacity: 0,
-      transition: `opacity ${duration}ms ease-out`,
-    }),
-  };
-});
+import { useStyles2 } from '../../themes';
 
 type Props = {
   children: React.ReactNode;
@@ -35,10 +14,32 @@ type Props = {
 
 export function FadeTransition(props: Props) {
   const { visible, children, duration = 250 } = props;
-  const styles = getStyles(duration);
+  const styles = useStyles2(getStyles, duration);
+
   return (
     <CSSTransition in={visible} mountOnEnter={true} unmountOnExit={true} timeout={duration} classNames={styles}>
       {children}
     </CSSTransition>
   );
 }
+
+const getStyles = (_theme: GrafanaTheme2, duration: number) => ({
+  enter: css({
+    label: 'enter',
+    opacity: 0,
+  }),
+  enterActive: css({
+    label: 'enterActive',
+    opacity: 1,
+    transition: `opacity ${duration}ms ease-out`,
+  }),
+  exit: css({
+    label: 'exit',
+    opacity: 1,
+  }),
+  exitActive: css({
+    label: 'exitActive',
+    opacity: 0,
+    transition: `opacity ${duration}ms ease-out`,
+  }),
+});
diff --git a/packages/grafana-ui/src/components/transitions/SlideOutTransition.tsx b/packages/grafana-ui/src/components/transitions/SlideOutTransition.tsx
index 44bf20eac8d9d..5981f28d49e0a 100644
--- a/packages/grafana-ui/src/components/transitions/SlideOutTransition.tsx
+++ b/packages/grafana-ui/src/components/transitions/SlideOutTransition.tsx
@@ -2,34 +2,9 @@ import { css } from '@emotion/css';
 import React from 'react';
 import { CSSTransition } from 'react-transition-group';
 
-import { stylesFactory } from '../../themes';
+import { GrafanaTheme2 } from '@grafana/data';
 
-const getStyles = stylesFactory((duration: number, measurement: 'width' | 'height', size: number) => {
-  return {
-    enter: css({
-      label: 'enter',
-      [`${measurement}`]: 0,
-      opacity: 0,
-    }),
-    enterActive: css({
-      label: 'enterActive',
-      [`${measurement}`]: `${size}px`,
-      opacity: 1,
-      transition: `opacity ${duration}ms ease-out, ${measurement} ${duration}ms ease-out`,
-    }),
-    exit: css({
-      label: 'exit',
-      [`${measurement}`]: `${size}px`,
-      opacity: 1,
-    }),
-    exitActive: css({
-      label: 'exitActive',
-      opacity: 0,
-      [`${measurement}`]: 0,
-      transition: `opacity ${duration}ms ease-out, ${measurement} ${duration}ms ease-out`,
-    }),
-  };
-});
+import { useStyles2 } from '../../themes';
 
 type Props = {
   children: React.ReactNode;
@@ -42,10 +17,36 @@ type Props = {
 
 export function SlideOutTransition(props: Props) {
   const { visible, children, duration = 250, horizontal, size } = props;
-  const styles = getStyles(duration, horizontal ? 'width' : 'height', size);
+  const styles = useStyles2(getStyles, duration, horizontal ? 'width' : 'height', size);
+
   return (
     <CSSTransition in={visible} mountOnEnter={true} unmountOnExit={true} timeout={duration} classNames={styles}>
       {children}
     </CSSTransition>
   );
 }
+
+const getStyles = (_theme: GrafanaTheme2, duration: number, measurement: 'width' | 'height', size: number) => ({
+  enter: css({
+    label: 'enter',
+    [`${measurement}`]: 0,
+    opacity: 0,
+  }),
+  enterActive: css({
+    label: 'enterActive',
+    [`${measurement}`]: `${size}px`,
+    opacity: 1,
+    transition: `opacity ${duration}ms ease-out, ${measurement} ${duration}ms ease-out`,
+  }),
+  exit: css({
+    label: 'exit',
+    [`${measurement}`]: `${size}px`,
+    opacity: 1,
+  }),
+  exitActive: css({
+    label: 'exitActive',
+    opacity: 0,
+    [`${measurement}`]: 0,
+    transition: `opacity ${duration}ms ease-out, ${measurement} ${duration}ms ease-out`,
+  }),
+});
diff --git a/packages/grafana-ui/src/components/uPlot/Plot.scss b/packages/grafana-ui/src/components/uPlot/Plot.scss
index 86614e7496bbe..895e3329895e6 100644
--- a/packages/grafana-ui/src/components/uPlot/Plot.scss
+++ b/packages/grafana-ui/src/components/uPlot/Plot.scss
@@ -9,12 +9,13 @@
   background: rgba(120, 120, 130, 0.2);
 }
 
-.u-cursor-x {
+.u-hz .u-cursor-x,
+.u-vt .u-cursor-y {
   border-right: 1px dashed rgba(120, 120, 130, 0.5);
 }
 
-.u-cursor-y {
-  width: 100%;
+.u-hz .u-cursor-y,
+.u-vt .u-cursor-x {
   border-bottom: 1px dashed rgba(120, 120, 130, 0.5);
 }
 
diff --git a/packages/grafana-ui/src/components/uPlot/config.ts b/packages/grafana-ui/src/components/uPlot/config.ts
index 89478ff6b2710..ade88cc258bfb 100644
--- a/packages/grafana-ui/src/components/uPlot/config.ts
+++ b/packages/grafana-ui/src/components/uPlot/config.ts
@@ -4,7 +4,7 @@ import {
   BarAlignment,
   GraphDrawStyle,
   GraphGradientMode,
-  GraphTresholdsStyleMode,
+  GraphThresholdsStyleMode,
   LineInterpolation,
   VisibilityMode,
   StackingMode,
@@ -21,7 +21,7 @@ export const graphFieldOptions: {
   axisPlacement: Array<SelectableValue<AxisPlacement>>;
   fillGradient: Array<SelectableValue<GraphGradientMode>>;
   stacking: Array<SelectableValue<StackingMode>>;
-  thresholdsDisplayModes: Array<SelectableValue<GraphTresholdsStyleMode>>;
+  thresholdsDisplayModes: Array<SelectableValue<GraphThresholdsStyleMode>>;
 } = {
   drawStyle: [
     { label: 'Lines', value: GraphDrawStyle.Line },
@@ -73,11 +73,11 @@ export const graphFieldOptions: {
   ],
 
   thresholdsDisplayModes: [
-    { label: 'Off', value: GraphTresholdsStyleMode.Off },
-    { label: 'As lines', value: GraphTresholdsStyleMode.Line },
-    { label: 'As lines (dashed)', value: GraphTresholdsStyleMode.Dashed },
-    { label: 'As filled regions', value: GraphTresholdsStyleMode.Area },
-    { label: 'As filled regions and lines', value: GraphTresholdsStyleMode.LineAndArea },
-    { label: 'As filled regions and lines (dashed)', value: GraphTresholdsStyleMode.DashedAndArea },
+    { label: 'Off', value: GraphThresholdsStyleMode.Off },
+    { label: 'As lines', value: GraphThresholdsStyleMode.Line },
+    { label: 'As lines (dashed)', value: GraphThresholdsStyleMode.Dashed },
+    { label: 'As filled regions', value: GraphThresholdsStyleMode.Area },
+    { label: 'As filled regions and lines', value: GraphThresholdsStyleMode.LineAndArea },
+    { label: 'As filled regions and lines (dashed)', value: GraphThresholdsStyleMode.DashedAndArea },
   ],
 };
diff --git a/packages/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts b/packages/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts
index f446d8129a01a..d7435b2514eba 100644
--- a/packages/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts
+++ b/packages/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts
@@ -213,7 +213,8 @@ export class UPlotAxisBuilder extends PlotConfigBuilder<AxisProps, Axis> {
   }
 }
 
-const timeUnitSize = {
+/** @internal */
+export const timeUnitSize = {
   second: 1000,
   minute: 60 * 1000,
   hour: 60 * 60 * 1000,
diff --git a/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.test.ts b/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.test.ts
index 827f1268cf9c0..2c381e896f461 100644
--- a/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.test.ts
+++ b/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.test.ts
@@ -8,7 +8,7 @@ import {
   VisibilityMode,
   ScaleOrientation,
   ScaleDirection,
-  GraphTresholdsStyleMode,
+  GraphThresholdsStyleMode,
   ScaleDistribution,
 } from '@grafana/schema';
 
@@ -379,8 +379,6 @@ describe('UPlotConfigBuilder', () => {
       max: 100,
     });
 
-    expect(builder.getConfig().scales!['scale-y']!.auto).toEqual(false);
-
     builder.addScale({
       isTime: false,
       scaleKey: 'scale-y2',
@@ -391,6 +389,7 @@ describe('UPlotConfigBuilder', () => {
       softMin: -50,
     });
 
+    expect(builder.getConfig().scales!['scale-y']!.auto).toEqual(false);
     expect(builder.getConfig().scales!['scale-y2']!.auto).toEqual(true);
   });
 
@@ -812,7 +811,7 @@ describe('UPlotConfigBuilder', () => {
           steps: [],
         },
         config: {
-          mode: GraphTresholdsStyleMode.Area,
+          mode: GraphThresholdsStyleMode.Area,
         },
         theme: darkTheme,
       });
@@ -823,7 +822,7 @@ describe('UPlotConfigBuilder', () => {
           steps: [],
         },
         config: {
-          mode: GraphTresholdsStyleMode.Area,
+          mode: GraphThresholdsStyleMode.Area,
         },
         theme: darkTheme,
       });
diff --git a/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.ts b/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.ts
index dd6d1da4770a8..baf292e42b4a6 100644
--- a/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.ts
+++ b/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.ts
@@ -1,17 +1,8 @@
 import { merge } from 'lodash';
 import uPlot, { Cursor, Band, Hooks, Select, AlignedData, Padding, Series } from 'uplot';
 
-import {
-  DataFrame,
-  DefaultTimeZone,
-  EventBus,
-  Field,
-  getTimeZoneInfo,
-  GrafanaTheme2,
-  TimeRange,
-  TimeZone,
-} from '@grafana/data';
-import { AxisPlacement } from '@grafana/schema';
+import { DataFrame, DefaultTimeZone, Field, getTimeZoneInfo, GrafanaTheme2, TimeRange, TimeZone } from '@grafana/data';
+import { AxisPlacement, VizOrientation } from '@grafana/schema';
 
 import { FacetedData, PlotConfig, PlotTooltipInterpolator } from '../types';
 import { DEFAULT_PLOT_CONFIG, getStackingBands, pluginLog, StackingGroup } from '../utils';
@@ -58,6 +49,8 @@ export class UPlotConfigBuilder {
   private tooltipInterpolator: PlotTooltipInterpolator | undefined = undefined;
   private padding?: Padding = undefined;
 
+  private cachedConfig?: PlotConfig;
+
   prepData: PrepData | undefined = undefined;
 
   constructor(timeZone: TimeZone = DefaultTimeZone) {
@@ -190,6 +183,10 @@ export class UPlotConfigBuilder {
   }
 
   getConfig() {
+    if (this.cachedConfig) {
+      return this.cachedConfig;
+    }
+
     const config: PlotConfig = {
       ...DEFAULT_PLOT_CONFIG,
       mode: this.mode,
@@ -244,18 +241,18 @@ export class UPlotConfigBuilder {
       config.padding = this.padding;
     }
 
-    if (this.stackingGroups.length) {
-      this.stackingGroups.forEach((group) => {
-        getStackingBands(group).forEach((band) => {
-          this.addBand(band);
-        });
+    this.stackingGroups.forEach((group) => {
+      getStackingBands(group).forEach((band) => {
+        this.addBand(band);
       });
-    }
+    });
 
     if (this.bands.length) {
       config.bands = this.bands;
     }
 
+    this.cachedConfig = config;
+
     return config;
   }
 
@@ -300,13 +297,14 @@ type UPlotConfigPrepOpts<T extends Record<string, unknown> = {}> = {
   theme: GrafanaTheme2;
   timeZones: TimeZone[];
   getTimeRange: () => TimeRange;
-  eventBus: EventBus;
   allFrames: DataFrame[];
   renderers?: Renderers;
   tweakScale?: (opts: ScaleProps, forField: Field) => ScaleProps;
   tweakAxis?: (opts: AxisProps, forField: Field) => AxisProps;
   // Identifies the shared key for uPlot cursor sync
   eventsScope?: string;
+  hoverProximity?: number;
+  orientation?: VizOrientation;
 } & T;
 
 /** @alpha */
diff --git a/packages/grafana-ui/src/components/uPlot/config/UPlotScaleBuilder.ts b/packages/grafana-ui/src/components/uPlot/config/UPlotScaleBuilder.ts
index 45313d9e3e5fc..1e2e6f749910c 100644
--- a/packages/grafana-ui/src/components/uPlot/config/UPlotScaleBuilder.ts
+++ b/packages/grafana-ui/src/components/uPlot/config/UPlotScaleBuilder.ts
@@ -51,10 +51,10 @@ export class UPlotScaleBuilder extends PlotConfigBuilder<ScaleProps, Scale> {
             distr === ScaleDistribution.Symlog
               ? 4
               : distr === ScaleDistribution.Log
-              ? 3
-              : distr === ScaleDistribution.Ordinal
-              ? 2
-              : 1,
+                ? 3
+                : distr === ScaleDistribution.Ordinal
+                  ? 2
+                  : 1,
           log: distr === ScaleDistribution.Log || distr === ScaleDistribution.Symlog ? this.props.log ?? 2 : undefined,
           asinh: distr === ScaleDistribution.Symlog ? this.props.linearThreshold ?? 1 : undefined,
         }
diff --git a/packages/grafana-ui/src/components/uPlot/config/UPlotSeriesBuilder.ts b/packages/grafana-ui/src/components/uPlot/config/UPlotSeriesBuilder.ts
index 74b4140e23da6..62e651f919b7a 100644
--- a/packages/grafana-ui/src/components/uPlot/config/UPlotSeriesBuilder.ts
+++ b/packages/grafana-ui/src/components/uPlot/config/UPlotSeriesBuilder.ts
@@ -172,6 +172,10 @@ export class UPlotSeriesBuilder extends PlotConfigBuilder<SeriesProps, Series> {
       return getScaleGradientFn(1, theme, colorMode, thresholds, hardMin, hardMax, softMin, softMax);
     }
 
+    if (gradientMode === GraphGradientMode.Hue) {
+      return getHueGradientFn(lineColor ?? FALLBACK_COLOR, 1, theme);
+    }
+
     return lineColor ?? FALLBACK_COLOR;
   }
 
diff --git a/packages/grafana-ui/src/components/uPlot/config/UPlotThresholds.ts b/packages/grafana-ui/src/components/uPlot/config/UPlotThresholds.ts
index 9c71a3e4a99d3..56e17f47c3f39 100644
--- a/packages/grafana-ui/src/components/uPlot/config/UPlotThresholds.ts
+++ b/packages/grafana-ui/src/components/uPlot/config/UPlotThresholds.ts
@@ -2,7 +2,7 @@ import tinycolor from 'tinycolor2';
 import uPlot from 'uplot';
 
 import { GrafanaTheme2, Threshold, ThresholdsConfig, ThresholdsMode } from '@grafana/data';
-import { GraphThresholdsStyleConfig, GraphTresholdsStyleMode } from '@grafana/schema';
+import { GraphThresholdsStyleConfig, GraphThresholdsStyleMode } from '@grafana/schema';
 
 import { getGradientRange, scaleGradient } from './gradientFills';
 
@@ -19,8 +19,8 @@ export interface UPlotThresholdOptions {
 
 export function getThresholdsDrawHook(options: UPlotThresholdOptions) {
   const dashSegments =
-    options.config.mode === GraphTresholdsStyleMode.Dashed ||
-    options.config.mode === GraphTresholdsStyleMode.DashedAndArea
+    options.config.mode === GraphThresholdsStyleMode.Dashed ||
+    options.config.mode === GraphThresholdsStyleMode.DashedAndArea
       ? [10, 10]
       : null;
 
@@ -123,15 +123,15 @@ export function getThresholdsDrawHook(options: UPlotThresholdOptions) {
     ctx.save();
 
     switch (config.mode) {
-      case GraphTresholdsStyleMode.Line:
-      case GraphTresholdsStyleMode.Dashed:
+      case GraphThresholdsStyleMode.Line:
+      case GraphThresholdsStyleMode.Dashed:
         addLines(u, scaleKey, steps, theme);
         break;
-      case GraphTresholdsStyleMode.Area:
+      case GraphThresholdsStyleMode.Area:
         addAreas(u, scaleKey, steps, theme);
         break;
-      case GraphTresholdsStyleMode.LineAndArea:
-      case GraphTresholdsStyleMode.DashedAndArea:
+      case GraphThresholdsStyleMode.LineAndArea:
+      case GraphThresholdsStyleMode.DashedAndArea:
         addAreas(u, scaleKey, steps, theme);
         addLines(u, scaleKey, steps, theme);
     }
diff --git a/packages/grafana-ui/src/components/uPlot/config/gradientFills.ts b/packages/grafana-ui/src/components/uPlot/config/gradientFills.ts
index 2d580c2986fea..8c6ce29e37d92 100644
--- a/packages/grafana-ui/src/components/uPlot/config/gradientFills.ts
+++ b/packages/grafana-ui/src/components/uPlot/config/gradientFills.ts
@@ -68,8 +68,8 @@ export function getHueGradientFn(
       ctx
     );
 
-    const color1 = tinycolor(color).spin(-15);
-    const color2 = tinycolor(color).spin(15);
+    const color1 = tinycolor(color).spin(-25).darken(5);
+    const color2 = tinycolor(color).saturate(20).spin(20).brighten(10);
 
     if (theme.isDark) {
       gradient.addColorStop(0, color2.lighten(10).setAlpha(opacity).toString());
diff --git a/packages/grafana-ui/src/components/uPlot/internal.ts b/packages/grafana-ui/src/components/uPlot/internal.ts
new file mode 100644
index 0000000000000..e7a9c6a14d126
--- /dev/null
+++ b/packages/grafana-ui/src/components/uPlot/internal.ts
@@ -0,0 +1,40 @@
+import { FieldConfig, FieldType } from '@grafana/data';
+import { AxisPlacement, GraphFieldConfig, ScaleDistribution, ScaleDistributionConfig } from '@grafana/schema';
+
+import { FIXED_UNIT } from './types';
+
+/**
+ * @internal -- not a public API
+ */
+export function buildScaleKey(config: FieldConfig<GraphFieldConfig>, fieldType: FieldType) {
+  const defaultPart = 'na';
+
+  const scaleRange = `${config.min !== undefined ? config.min : defaultPart}-${
+    config.max !== undefined ? config.max : defaultPart
+  }`;
+
+  const scaleSoftRange = `${config.custom?.axisSoftMin !== undefined ? config.custom.axisSoftMin : defaultPart}-${
+    config.custom?.axisSoftMax !== undefined ? config.custom.axisSoftMax : defaultPart
+  }`;
+
+  const scalePlacement = `${
+    config.custom?.axisPlacement !== undefined ? config.custom?.axisPlacement : AxisPlacement.Auto
+  }`;
+
+  const scaleUnit = config.unit ?? FIXED_UNIT;
+
+  const scaleDistribution = config.custom?.scaleDistribution
+    ? getScaleDistributionPart(config.custom.scaleDistribution)
+    : ScaleDistribution.Linear;
+
+  const scaleLabel = Boolean(config.custom?.axisLabel) ? config.custom!.axisLabel : defaultPart;
+
+  return `${scaleUnit}/${scaleRange}/${scaleSoftRange}/${scalePlacement}/${scaleDistribution}/${scaleLabel}/${fieldType}`;
+}
+
+function getScaleDistributionPart(config: ScaleDistributionConfig) {
+  if (config.type === ScaleDistribution.Log) {
+    return `${config.type}${config.log}`;
+  }
+  return config.type;
+}
diff --git a/packages/grafana-ui/src/components/uPlot/plugins/CloseButton.tsx b/packages/grafana-ui/src/components/uPlot/plugins/CloseButton.tsx
index e1ddfa2dd897f..6fab4b71c2157 100644
--- a/packages/grafana-ui/src/components/uPlot/plugins/CloseButton.tsx
+++ b/packages/grafana-ui/src/components/uPlot/plugins/CloseButton.tsx
@@ -16,20 +16,14 @@ type Props = {
 export const CloseButton = ({ onClick, 'aria-label': ariaLabel, style }: Props) => {
   const styles = useStyles2(getStyles);
   return (
-    <IconButton
-      aria-label={ariaLabel ?? 'Close'}
-      className={styles}
-      name="times"
-      onClick={onClick}
-      style={style}
-      tooltip="Close"
-    />
+    <IconButton aria-label={ariaLabel ?? 'Close'} className={styles} name="times" onClick={onClick} style={style} />
   );
 };
 
 const getStyles = (theme: GrafanaTheme2) =>
   css({
     position: 'absolute',
-    right: theme.spacing(0.5),
-    top: theme.spacing(1),
+    margin: '0px',
+    right: theme.spacing(1),
+    top: theme.spacing(1.25),
   });
diff --git a/packages/grafana-ui/src/components/uPlot/plugins/EventBusPlugin.tsx b/packages/grafana-ui/src/components/uPlot/plugins/EventBusPlugin.tsx
new file mode 100644
index 0000000000000..f3528620dec95
--- /dev/null
+++ b/packages/grafana-ui/src/components/uPlot/plugins/EventBusPlugin.tsx
@@ -0,0 +1,164 @@
+import { throttle } from 'lodash';
+import { useLayoutEffect, useRef } from 'react';
+import { Subscription } from 'rxjs';
+import { throttleTime } from 'rxjs/operators';
+
+import {
+  DataFrame,
+  DataHoverClearEvent,
+  DataHoverEvent,
+  DataHoverPayload,
+  EventBus,
+  LegacyGraphHoverEvent,
+} from '@grafana/data';
+
+import { UPlotConfigBuilder } from '../config/UPlotConfigBuilder';
+
+interface EventBusPluginProps {
+  config: UPlotConfigBuilder;
+  eventBus: EventBus;
+  sync: () => boolean;
+  frame?: DataFrame;
+}
+
+/**
+ * @alpha
+ */
+export const EventBusPlugin = ({ config, eventBus, sync, frame }: EventBusPluginProps) => {
+  const frameRef = useRef<DataFrame | undefined>(frame);
+  frameRef.current = frame;
+
+  useLayoutEffect(() => {
+    let u: uPlot | null = null;
+
+    const payload: DataHoverPayload = {
+      point: {
+        time: null,
+      },
+      data: frameRef.current,
+    };
+
+    config.addHook('init', (_u) => {
+      u = _u;
+    });
+
+    let closestSeriesIdx: number | null = null;
+
+    config.addHook('setSeries', (u, seriesIdx) => {
+      closestSeriesIdx = seriesIdx;
+    });
+
+    config.addHook('setLegend', () => {
+      let viaSync = u!.cursor.event == null;
+
+      if (!viaSync && sync()) {
+        let dataIdx = u!.cursor.idxs!.find((v) => v != null);
+
+        if (dataIdx == null) {
+          throttledClear();
+        } else {
+          let rowIdx = dataIdx;
+          let colIdx = closestSeriesIdx;
+
+          let xData = u!.data[0] ?? u!.data[1][0];
+
+          payload.point.time = xData[rowIdx];
+          payload.rowIndex = rowIdx ?? undefined;
+          payload.columnIndex = colIdx ?? undefined;
+          payload.data = frameRef.current;
+
+          // used by old graph panel to position tooltip
+          let top = u!.cursor.top!;
+          payload.point.panelRelY = top === 0 ? 0.001 : top > 0 ? top / u!.rect.height : 1;
+
+          throttledHover();
+        }
+      }
+    });
+
+    function handleCursorUpdate(evt: DataHoverEvent | LegacyGraphHoverEvent) {
+      const time = evt.payload?.point?.time;
+
+      if (time) {
+        // Try finding left position on time axis
+        const left = u!.valToPos(time, 'x');
+
+        // let top;
+
+        // if (left) {
+        //   top = findMidPointYPosition(u!, u!.posToIdx(left));
+        // }
+
+        // if (!top || !left) {
+        //   return;
+        // }
+
+        u!.setCursor({
+          left,
+          top: u!.rect.height / 2,
+        });
+      }
+    }
+
+    const subscription = new Subscription();
+
+    const hoverEvent = new DataHoverEvent(payload).setTags(['uplot']);
+    const clearEvent = new DataHoverClearEvent().setTags(['uplot']);
+
+    let throttledHover = throttle(() => {
+      eventBus.publish(hoverEvent);
+    }, 100);
+
+    let throttledClear = throttle(() => {
+      eventBus.publish(clearEvent);
+    }, 100);
+
+    subscription.add(
+      eventBus.getStream(DataHoverEvent).subscribe({
+        next: (evt) => {
+          // ignore uplot-emitted events, since we already use uPlot's sync
+          if (eventBus === evt.origin || evt.tags?.has('uplot')) {
+            return;
+          }
+
+          handleCursorUpdate(evt);
+        },
+      })
+    );
+
+    // Legacy events (from flot graph)
+    subscription.add(
+      eventBus.getStream(LegacyGraphHoverEvent).subscribe({
+        next: (evt) => handleCursorUpdate(evt),
+      })
+    );
+
+    subscription.add(
+      eventBus
+        .getStream(DataHoverClearEvent)
+        .pipe(throttleTime(50)) // dont throttle here, throttle on emission
+        .subscribe({
+          next: (evt) => {
+            // ignore uplot-emitted events, since we already use uPlot's sync
+            if (eventBus === evt.origin || evt.tags?.has('uplot')) {
+              return;
+            }
+
+            // @ts-ignore
+            if (!u!.cursor._lock) {
+              u!.setCursor({
+                left: -10,
+                top: -10,
+              });
+            }
+          },
+        })
+    );
+
+    return () => {
+      subscription.unsubscribe();
+    };
+  }, [config]);
+
+  return null;
+};
diff --git a/packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin2.tsx b/packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin2.tsx
index 9699817e6c168..174699eec39c3 100644
--- a/packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin2.tsx
+++ b/packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin2.tsx
@@ -1,4 +1,4 @@
-import { css } from '@emotion/css';
+import { css, cx } from '@emotion/css';
 import React, { useLayoutEffect, useRef, useReducer, CSSProperties } from 'react';
 import { createPortal } from 'react-dom';
 import uPlot from 'uplot';
@@ -6,19 +6,49 @@ import uPlot from 'uplot';
 import { GrafanaTheme2 } from '@grafana/data';
 
 import { useStyles2 } from '../../../themes';
+import { getPortalContainer } from '../../Portal/Portal';
 import { UPlotConfigBuilder } from '../config/UPlotConfigBuilder';
 
 import { CloseButton } from './CloseButton';
 
+export const DEFAULT_TOOLTIP_WIDTH = undefined;
+export const DEFAULT_TOOLTIP_HEIGHT = undefined;
+export const TOOLTIP_OFFSET = 10;
+
+// todo: barchart? histogram?
+export const enum TooltipHoverMode {
+  // Single mode in TimeSeries, Candlestick, Trend, StateTimeline, Heatmap?
+  xOne,
+  // All mode in TimeSeries, Candlestick, Trend, StateTimeline, Heatmap?
+  xAll,
+  // Single mode in XYChart, Heatmap?
+  xyOne,
+}
+
 interface TooltipPlugin2Props {
   config: UPlotConfigBuilder;
+  hoverMode: TooltipHoverMode;
+
+  syncTooltip?: () => boolean;
+
+  // x only
+  queryZoom?: (range: { from: number; to: number }) => void;
+  // y-only, via shiftKey
+  clientZoom?: boolean;
+
   render: (
     u: uPlot,
     dataIdxs: Array<number | null>,
     seriesIdx: number | null,
     isPinned: boolean,
-    dismiss: () => void
+    dismiss: () => void,
+    // selected time range (for annotation triggering)
+    timeRange: TimeRange2 | null,
+    viaSync: boolean
   ) => React.ReactNode;
+
+  maxWidth?: number;
+  maxHeight?: number;
 }
 
 interface TooltipContainerState {
@@ -36,6 +66,11 @@ interface TooltipContainerSize {
   height: number;
 }
 
+export interface TimeRange2 {
+  from: number;
+  to: number;
+}
+
 function mergeState(prevState: TooltipContainerState, nextState: Partial<TooltipContainerState>) {
   return {
     ...prevState,
@@ -47,26 +82,52 @@ function mergeState(prevState: TooltipContainerState, nextState: Partial<Tooltip
   };
 }
 
-const INITIAL_STATE: TooltipContainerState = {
-  style: { transform: '', pointerEvents: 'none' },
-  isHovering: false,
-  isPinned: false,
-  contents: null,
-  plot: null,
-  dismiss: () => {},
-};
+function initState(): TooltipContainerState {
+  return {
+    style: { transform: '', pointerEvents: 'none' },
+    isHovering: false,
+    isPinned: false,
+    contents: null,
+    plot: null,
+    dismiss: () => {},
+  };
+}
+
+// min px width that triggers zoom
+const MIN_ZOOM_DIST = 5;
+
+const maybeZoomAction = (e?: MouseEvent | null) => e != null && !e.ctrlKey && !e.metaKey;
 
 /**
  * @alpha
  */
-export const TooltipPlugin2 = ({ config, render }: TooltipPlugin2Props) => {
+export const TooltipPlugin2: React.FC<TooltipPlugin2Props> = ({
+  config,
+  hoverMode,
+  render,
+  clientZoom = false,
+  queryZoom,
+  maxWidth,
+  maxHeight,
+  syncTooltip = () => false,
+}: TooltipPlugin2Props) => {
   const domRef = useRef<HTMLDivElement>(null);
+  const portalRoot = useRef<HTMLElement | null>(null);
+
+  if (portalRoot.current == null) {
+    portalRoot.current = getPortalContainer();
+  }
 
-  const [{ plot, isHovering, isPinned, contents, style, dismiss }, setState] = useReducer(mergeState, INITIAL_STATE);
+  const [{ plot, isHovering, isPinned, contents, style, dismiss }, setState] = useReducer(mergeState, null, initState);
 
   const sizeRef = useRef<TooltipContainerSize>();
 
-  const styles = useStyles2(getStyles);
+  maxWidth = isPinned ? DEFAULT_TOOLTIP_WIDTH : maxWidth ?? DEFAULT_TOOLTIP_WIDTH;
+  maxHeight ??= DEFAULT_TOOLTIP_HEIGHT;
+  const styles = useStyles2(getStyles, maxWidth, maxHeight);
+
+  const renderRef = useRef(render);
+  renderRef.current = render;
 
   useLayoutEffect(() => {
     sizeRef.current = {
@@ -87,24 +148,32 @@ export const TooltipPlugin2 = ({ config, render }: TooltipPlugin2Props) => {
       }),
     };
 
+    let yZoomed = false;
+    let yDrag = false;
+
     let _plot = plot;
     let _isHovering = isHovering;
+    let _someSeriesIdx = false;
     let _isPinned = isPinned;
     let _style = style;
 
-    let offsetX = 0;
-    let offsetY = 0;
+    let plotVisible = false;
 
-    let htmlEl = document.documentElement;
-    let winWidth = htmlEl.clientWidth - 16;
-    let winHeight = htmlEl.clientHeight - 16;
+    const updateHovering = () => {
+      if (viaSync) {
+        _isHovering = plotVisible && _someSeriesIdx && syncTooltip();
+      } else {
+        _isHovering = closestSeriesIdx != null || (hoverMode === TooltipHoverMode.xAll && _someSeriesIdx);
+      }
+    };
 
-    window.addEventListener('resize', (e) => {
-      winWidth = htmlEl.clientWidth - 5;
-      winHeight = htmlEl.clientHeight - 5;
-    });
+    let offsetX = 0;
+    let offsetY = 0;
 
+    let selectedRange: TimeRange2 | null = null;
+    let seriesIdxs: Array<number | null> = plot?.cursor.idxs!.slice()!;
     let closestSeriesIdx: number | null = null;
+    let viaSync = false;
 
     let pendingRender = false;
     let pendingPinned = false;
@@ -128,9 +197,8 @@ export const TooltipPlugin2 = ({ config, render }: TooltipPlugin2Props) => {
 
     // in some ways this is similar to ClickOutsideWrapper.tsx
     const downEventOutside = (e: Event) => {
-      let isOutside = (e.target as HTMLDivElement).closest(`.${styles.tooltipWrapper}`) !== domRef.current;
-
-      if (isOutside) {
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      if (!domRef.current!.contains(e.target as Node)) {
         dismiss();
       }
     };
@@ -141,8 +209,6 @@ export const TooltipPlugin2 = ({ config, render }: TooltipPlugin2Props) => {
       if (pendingPinned) {
         _style = { pointerEvents: _isPinned ? 'all' : 'none' };
 
-        domRef.current!.closest<HTMLDivElement>('.react-grid-item')?.classList.toggle('context-menu-open', _isPinned);
-
         // @ts-ignore
         _plot!.cursor._lock = _isPinned;
 
@@ -161,116 +227,296 @@ export const TooltipPlugin2 = ({ config, render }: TooltipPlugin2Props) => {
         style: _style,
         isPinned: _isPinned,
         isHovering: _isHovering,
-        contents: _isHovering ? render(_plot!, _plot!.cursor.idxs!, closestSeriesIdx, _isPinned, dismiss) : null,
+        contents:
+          _isHovering || selectedRange != null
+            ? renderRef.current(_plot!, seriesIdxs, closestSeriesIdx, _isPinned, dismiss, selectedRange, viaSync)
+            : null,
         dismiss,
       };
 
       setState(state);
+
+      selectedRange = null;
     };
 
     const dismiss = () => {
+      let prevIsPinned = _isPinned;
       _isPinned = false;
       _isHovering = false;
       _plot!.setCursor({ left: -10, top: -10 });
-      scheduleRender(true);
+      scheduleRender(prevIsPinned);
     };
 
     config.addHook('init', (u) => {
       setState({ plot: (_plot = u) });
 
+      // detect shiftKey and mutate drag mode from x-only to y-only
+      if (clientZoom) {
+        u.over.addEventListener(
+          'mousedown',
+          (e) => {
+            if (!maybeZoomAction(e)) {
+              return;
+            }
+
+            if (e.button === 0 && e.shiftKey) {
+              yDrag = true;
+
+              u.cursor.drag!.x = false;
+              u.cursor.drag!.y = true;
+
+              let onUp = (e: MouseEvent) => {
+                u.cursor.drag!.x = true;
+                u.cursor.drag!.y = false;
+                document.removeEventListener('mouseup', onUp, true);
+              };
+
+              document.addEventListener('mouseup', onUp, true);
+            }
+          },
+          true
+        );
+      }
+
       // this handles pinning
       u.over.addEventListener('click', (e) => {
-        if (_isHovering && !_isPinned && e.target === u.over) {
-          _isPinned = true;
-          scheduleRender(true);
+        if (e.target === u.over) {
+          if (e.ctrlKey || e.metaKey) {
+            let xVal;
+
+            const isXAxisHorizontal = u.scales.x.ori === 0;
+            if (isXAxisHorizontal) {
+              xVal = u.posToVal(u.cursor.left!, 'x');
+            } else {
+              xVal = u.posToVal(u.select.top + u.select.height, 'x');
+            }
+
+            selectedRange = {
+              from: xVal,
+              to: xVal,
+            };
+
+            scheduleRender(false);
+          }
+          // only pinnable tooltip is visible *and* is within proximity to series/point
+          else if (_isHovering && closestSeriesIdx != null && !_isPinned) {
+            _isPinned = true;
+            scheduleRender(true);
+          }
         }
       });
     });
 
-    // fires on data value hovers/unhovers (before setSeries)
-    config.addHook('setLegend', (u) => {
-      let _isHoveringNow = _plot!.cursor.idxs!.some((v) => v != null);
+    config.addHook('setSelect', (u) => {
+      const isXAxisHorizontal = u.scales.x.ori === 0;
+      if (!viaSync && (clientZoom || queryZoom != null)) {
+        if (maybeZoomAction(u.cursor!.event)) {
+          if (clientZoom && yDrag) {
+            if (u.select.height >= MIN_ZOOM_DIST) {
+              for (let key in u.scales!) {
+                if (key !== 'x') {
+                  const maxY = isXAxisHorizontal
+                    ? u.posToVal(u.select.top, key)
+                    : u.posToVal(u.select.left + u.select.width, key);
+                  const minY = isXAxisHorizontal
+                    ? u.posToVal(u.select.top + u.select.height, key)
+                    : u.posToVal(u.select.left, key);
+
+                  u.setScale(key, { min: minY, max: maxY });
+                }
+              }
+
+              yZoomed = true;
+            }
+
+            yDrag = false;
+          } else if (queryZoom != null) {
+            if (u.select.width >= MIN_ZOOM_DIST) {
+              const minX = isXAxisHorizontal
+                ? u.posToVal(u.select.left, 'x')
+                : u.posToVal(u.select.top + u.select.height, 'x');
+              const maxX = isXAxisHorizontal
+                ? u.posToVal(u.select.left + u.select.width, 'x')
+                : u.posToVal(u.select.top, 'x');
+
+              queryZoom({ from: minX, to: maxX });
+
+              yZoomed = false;
+            }
+          }
+        } else {
+          selectedRange = {
+            from: isXAxisHorizontal ? u.posToVal(u.select.left!, 'x') : u.posToVal(u.select.top + u.select.height, 'x'),
+            to: isXAxisHorizontal ? u.posToVal(u.select.left! + u.select.width, 'x') : u.posToVal(u.select.top, 'x'),
+          };
 
-      if (_isHoveringNow) {
-        // create
-        if (!_isHovering) {
-          _isHovering = true;
-        }
-      } else {
-        // destroy...TODO: debounce this
-        if (_isHovering) {
-          _isHovering = false;
+          scheduleRender(true);
         }
       }
 
-      scheduleRender();
+      // manually hide selected region (since cursor.drag.setScale = false)
+      u.setSelect({ left: 0, width: 0, top: 0, height: 0 }, false);
+    });
+
+    if (clientZoom || queryZoom != null) {
+      config.setCursor({
+        bind: {
+          dblclick: (u) => () => {
+            if (!maybeZoomAction(u.cursor!.event)) {
+              return null;
+            }
+
+            if (clientZoom && yZoomed) {
+              for (let key in u.scales!) {
+                if (key !== 'x') {
+                  // @ts-ignore (this is not typed correctly in uPlot, assigning nulls means auto-scale / reset)
+                  u.setScale(key, { min: null, max: null });
+                }
+              }
+
+              yZoomed = false;
+            } else if (queryZoom != null) {
+              let xScale = u.scales.x;
+
+              const frTs = xScale.min!;
+              const toTs = xScale.max!;
+              const pad = (toTs - frTs) / 2;
+
+              queryZoom({ from: frTs - pad, to: toTs + pad });
+            }
+
+            return null;
+          },
+        },
+      });
+    }
+
+    config.addHook('setData', (u) => {
+      yZoomed = false;
+      yDrag = false;
     });
 
     // fires on series focus/proximity changes
     // e.g. to highlight the hovered/closest series
     // TODO: we only need this for multi/all mode?
     config.addHook('setSeries', (u, seriesIdx) => {
-      // don't jiggle focused series styling when there's only one series
-      const isMultiSeries = u.series.length > 2;
+      closestSeriesIdx = seriesIdx;
+
+      viaSync = u.cursor.event == null;
+      updateHovering();
+      scheduleRender();
+    });
+
+    // fires on data value hovers/unhovers
+    config.addHook('setLegend', (u) => {
+      seriesIdxs = _plot?.cursor!.idxs!.slice()!;
+      _someSeriesIdx = seriesIdxs.some((v, i) => i > 0 && v != null);
+
+      viaSync = u.cursor.event == null;
+      let prevIsHovering = _isHovering;
+      updateHovering();
 
-      if (isMultiSeries && closestSeriesIdx !== seriesIdx) {
-        closestSeriesIdx = seriesIdx;
+      if (_isHovering || _isHovering !== prevIsHovering) {
         scheduleRender();
       }
     });
 
+    const scrollbarWidth = 16;
+    let winWid = 0;
+    let winHgt = 0;
+
+    const updateWinSize = () => {
+      _isHovering && !_isPinned && dismiss();
+
+      winWid = window.innerWidth - scrollbarWidth;
+      winHgt = window.innerHeight - scrollbarWidth;
+    };
+
+    const updatePlotVisible = () => {
+      plotVisible =
+        _plot!.rect.bottom <= winHgt && _plot!.rect.top >= 0 && _plot!.rect.left >= 0 && _plot!.rect.right <= winWid;
+    };
+
+    updateWinSize();
+    config.addHook('ready', updatePlotVisible);
+
     // fires on mousemoves
     config.addHook('setCursor', (u) => {
+      viaSync = u.cursor.event == null;
+
+      if (!_isHovering) {
+        return;
+      }
+
       let { left = -10, top = -10 } = u.cursor;
 
       if (left >= 0 || top >= 0) {
-        let { width, height } = sizeRef.current!;
-
         let clientX = u.rect.left + left;
         let clientY = u.rect.top + top;
 
-        if (offsetY) {
-          if (clientY + height < winHeight || clientY - height < 0) {
+        let transform = '';
+
+        let { width, height } = sizeRef.current!;
+
+        width += TOOLTIP_OFFSET;
+        height += TOOLTIP_OFFSET;
+
+        if (offsetY !== 0) {
+          if (clientY + height < winHgt || clientY - height < 0) {
             offsetY = 0;
           } else if (offsetY !== -height) {
             offsetY = -height;
           }
         } else {
-          if (clientY + height > winHeight && clientY - height >= 0) {
+          if (clientY + height > winHgt && clientY - height >= 0) {
             offsetY = -height;
           }
         }
 
-        if (offsetX) {
-          if (clientX + width < winWidth || clientX - width < 0) {
+        if (offsetX !== 0) {
+          if (clientX + width < winWid || clientX - width < 0) {
             offsetX = 0;
           } else if (offsetX !== -width) {
             offsetX = -width;
           }
         } else {
-          if (clientX + width > winWidth && clientX - width >= 0) {
+          if (clientX + width > winWid && clientX - width >= 0) {
             offsetX = -width;
           }
         }
 
-        const shiftX = offsetX !== 0 ? 'translateX(-100%)' : '';
-        const shiftY = offsetY !== 0 ? 'translateY(-100%)' : '';
+        const shiftX = clientX + (offsetX === 0 ? TOOLTIP_OFFSET : -TOOLTIP_OFFSET);
+        const shiftY = clientY + (offsetY === 0 ? TOOLTIP_OFFSET : -TOOLTIP_OFFSET);
+
+        const reflectX = offsetX === 0 ? '' : 'translateX(-100%)';
+        const reflectY = offsetY === 0 ? '' : 'translateY(-100%)';
 
         // TODO: to a transition only when switching sides
         // transition: transform 100ms;
 
-        const transform = `${shiftX} translateX(${left}px) ${shiftY} translateY(${top}px)`;
+        transform = `translateX(${shiftX}px) ${reflectX} translateY(${shiftY}px) ${reflectY}`;
 
-        if (_isHovering) {
-          if (domRef.current != null) {
-            domRef.current.style.transform = transform;
-          } else {
-            _style.transform = transform;
-            scheduleRender();
-          }
+        if (domRef.current != null) {
+          domRef.current.style.transform = transform;
+        } else {
+          _style.transform = transform;
+          scheduleRender();
         }
       }
     });
+
+    const onscroll = (e: Event) => {
+      updatePlotVisible();
+      _isHovering && !_isPinned && e.target instanceof HTMLElement && e.target.contains(_plot!.root) && dismiss();
+    };
+
+    window.addEventListener('resize', updateWinSize);
+    window.addEventListener('scroll', onscroll, true);
+
+    return () => {
+      window.removeEventListener('resize', updateWinSize);
+      window.removeEventListener('scroll', onscroll, true);
+    };
   }, [config]);
 
   useLayoutEffect(() => {
@@ -278,33 +524,69 @@ export const TooltipPlugin2 = ({ config, render }: TooltipPlugin2Props) => {
 
     if (domRef.current != null) {
       size.observer.observe(domRef.current);
+
+      // since the above observer is attached after container is in DOM, we need to manually update sizeRef
+      // and re-trigger a cursor move to do initial positioning math
+      const { width, height } = domRef.current.getBoundingClientRect();
+      size.width = width;
+      size.height = height;
+
+      const event = plot!.cursor.event;
+
+      // if not viaSync, re-dispatch real event
+      if (event != null) {
+        plot!.over.dispatchEvent(event);
+      } else {
+        plot!.setCursor(
+          {
+            left: plot!.cursor.left!,
+            top: plot!.cursor.top!,
+          },
+          true
+        );
+      }
+    } else {
+      size.width = 0;
+      size.height = 0;
     }
-  }, [domRef.current]);
+  }, [isHovering]);
 
   if (plot && isHovering) {
     return createPortal(
-      <div className={styles.tooltipWrapper} style={style} ref={domRef}>
-        {isPinned && <CloseButton onClick={dismiss} style={{ top: '16px' }} />}
+      <div
+        className={cx(styles.tooltipWrapper, isPinned && styles.pinned)}
+        style={style}
+        aria-live="polite"
+        aria-atomic="true"
+        ref={domRef}
+      >
+        {isPinned && <CloseButton onClick={dismiss} />}
         {contents}
       </div>,
-      plot.over
+      portalRoot.current
     );
   }
 
   return null;
 };
 
-const getStyles = (theme: GrafanaTheme2) => ({
+const getStyles = (theme: GrafanaTheme2, maxWidth?: number, maxHeight?: number) => ({
   tooltipWrapper: css({
     top: 0,
     left: 0,
-    zIndex: theme.zIndex.tooltip,
-    padding: '8px',
+    zIndex: theme.zIndex.portal,
     whiteSpace: 'pre',
     borderRadius: theme.shape.radius.default,
-    position: 'absolute',
-    background: theme.colors.background.secondary,
-    boxShadow: `0 4px 8px ${theme.colors.background.primary}`,
+    position: 'fixed',
+    background: theme.colors.background.primary,
+    border: `1px solid ${theme.colors.border.weak}`,
+    boxShadow: theme.shadows.z2,
     userSelect: 'text',
+    maxWidth: maxWidth ?? 'none',
+    maxHeight: maxHeight ?? 'none',
+    overflowY: 'auto',
+  }),
+  pinned: css({
+    boxShadow: theme.shadows.z3,
   }),
 });
diff --git a/packages/grafana-ui/src/components/uPlot/plugins/ZoomPlugin.tsx b/packages/grafana-ui/src/components/uPlot/plugins/ZoomPlugin.tsx
index faed1ae95a9a0..1e412e41fcc03 100644
--- a/packages/grafana-ui/src/components/uPlot/plugins/ZoomPlugin.tsx
+++ b/packages/grafana-ui/src/components/uPlot/plugins/ZoomPlugin.tsx
@@ -51,14 +51,18 @@ export const ZoomPlugin = ({ onZoom, config, withZoomY = false }: ZoomPluginProp
     }
 
     config.addHook('setSelect', (u) => {
+      const isXAxisHorizontal = u.scales.x.ori === 0;
       if (maybeZoomAction(u.cursor!.event)) {
         if (withZoomY && yDrag) {
           if (u.select.height >= MIN_ZOOM_DIST) {
             for (let key in u.scales!) {
               if (key !== 'x') {
-                const maxY = u.posToVal(u.select.top, key);
-                const minY = u.posToVal(u.select.top + u.select.height, key);
-
+                const maxY = isXAxisHorizontal
+                  ? u.posToVal(u.select.top, key)
+                  : u.posToVal(u.select.left + u.select.width, key);
+                const minY = isXAxisHorizontal
+                  ? u.posToVal(u.select.top + u.select.height, key)
+                  : u.posToVal(u.select.left, key);
                 u.setScale(key, { min: minY, max: maxY });
               }
             }
@@ -69,8 +73,12 @@ export const ZoomPlugin = ({ onZoom, config, withZoomY = false }: ZoomPluginProp
           yDrag = false;
         } else {
           if (u.select.width >= MIN_ZOOM_DIST) {
-            const minX = u.posToVal(u.select.left, 'x');
-            const maxX = u.posToVal(u.select.left + u.select.width, 'x');
+            const minX = isXAxisHorizontal
+              ? u.posToVal(u.select.left, 'x')
+              : u.posToVal(u.select.top + u.select.height, 'x');
+            const maxX = isXAxisHorizontal
+              ? u.posToVal(u.select.left + u.select.width, 'x')
+              : u.posToVal(u.select.top, 'x');
 
             onZoom({ from: minX, to: maxX });
 
diff --git a/packages/grafana-ui/src/components/uPlot/plugins/index.ts b/packages/grafana-ui/src/components/uPlot/plugins/index.ts
index b2936f2397d1a..4f07a8d80f7bb 100644
--- a/packages/grafana-ui/src/components/uPlot/plugins/index.ts
+++ b/packages/grafana-ui/src/components/uPlot/plugins/index.ts
@@ -1,4 +1,5 @@
 export { ZoomPlugin } from './ZoomPlugin';
 export { TooltipPlugin } from './TooltipPlugin';
 export { TooltipPlugin2 } from './TooltipPlugin2';
+export { EventBusPlugin } from './EventBusPlugin';
 export { KeyboardPlugin } from './KeyboardPlugin';
diff --git a/packages/grafana-ui/src/components/uPlot/types.ts b/packages/grafana-ui/src/components/uPlot/types.ts
index 959787608d738..86f3c99c277c7 100644
--- a/packages/grafana-ui/src/components/uPlot/types.ts
+++ b/packages/grafana-ui/src/components/uPlot/types.ts
@@ -3,6 +3,11 @@ import uPlot, { Options, AlignedData } from 'uplot';
 
 import { UPlotConfigBuilder } from './config/UPlotConfigBuilder';
 
+/**
+ * @internal -- not a public API
+ */
+export const FIXED_UNIT = '__fixed';
+
 export type PlotConfig = Pick<
   Options,
   'mode' | 'series' | 'scales' | 'axes' | 'cursor' | 'bands' | 'hooks' | 'select' | 'tzDate' | 'padding'
diff --git a/packages/grafana-ui/src/components/uPlot/utils.test.ts b/packages/grafana-ui/src/components/uPlot/utils.test.ts
index 605c8649e63e9..3ecbc180bd951 100644
--- a/packages/grafana-ui/src/components/uPlot/utils.test.ts
+++ b/packages/grafana-ui/src/components/uPlot/utils.test.ts
@@ -1,7 +1,7 @@
 import { FieldMatcherID, fieldMatchers, FieldType, MutableDataFrame } from '@grafana/data';
 import { BarAlignment, GraphDrawStyle, GraphTransform, LineInterpolation, StackingMode } from '@grafana/schema';
 
-import { preparePlotFrame } from '../GraphNG/utils';
+import { preparePlotFrame } from '..';
 
 import { getStackingGroups, preparePlotData2, timeFormatToTemplate } from './utils';
 
diff --git a/packages/grafana-ui/src/components/uPlot/utils.ts b/packages/grafana-ui/src/components/uPlot/utils.ts
index b9312097b661b..85f67b256b7b8 100644
--- a/packages/grafana-ui/src/components/uPlot/utils.ts
+++ b/packages/grafana-ui/src/components/uPlot/utils.ts
@@ -5,7 +5,8 @@ import { BarAlignment, GraphDrawStyle, GraphTransform, LineInterpolation, Stacki
 
 import { attachDebugger } from '../../utils';
 import { createLogger } from '../../utils/logger';
-import { buildScaleKey } from '../GraphNG/utils';
+
+import { buildScaleKey } from './internal';
 
 const ALLOWED_FORMAT_STRINGS_REGEX = /\b(YYYY|YY|MMMM|MMM|MM|M|DD|D|WWWW|WWW|HH|H|h|AA|aa|a|mm|m|ss|s|fff)\b/g;
 
@@ -122,8 +123,8 @@ export function getStackingGroups(frame: DataFrame) {
       drawStyle === GraphDrawStyle.Bars
         ? custom.barAlignment
         : drawStyle === GraphDrawStyle.Line
-        ? custom.lineInterpolation
-        : null;
+          ? custom.lineInterpolation
+          : null;
 
     let stackKey = `${stackDir}|${stackingMode}|${stackingGroup}|${buildScaleKey(
       config,
@@ -380,7 +381,7 @@ function hasNegSample(data: unknown[], samples = 100) {
     for (let i = firstIdx; i <= lastIdx; i += stride) {
       const v = data[i];
 
-      if (v != null) {
+      if (v != null && typeof v === 'number') {
         if (v < 0 || Object.is(v, -0)) {
           negCount++;
         } else if (v > 0) {
diff --git a/packages/grafana-ui/src/components/Graph/Graph.test.tsx b/packages/grafana-ui/src/graveyard/Graph/Graph.test.tsx
similarity index 98%
rename from packages/grafana-ui/src/components/Graph/Graph.test.tsx
rename to packages/grafana-ui/src/graveyard/Graph/Graph.test.tsx
index fc616c31cd8e4..847d6e883c002 100644
--- a/packages/grafana-ui/src/components/Graph/Graph.test.tsx
+++ b/packages/grafana-ui/src/graveyard/Graph/Graph.test.tsx
@@ -5,7 +5,7 @@ import React from 'react';
 import { GraphSeriesXY, FieldType, dateTime, FieldColorModeId, DisplayProcessor } from '@grafana/data';
 import { TooltipDisplayMode } from '@grafana/schema';
 
-import { VizTooltip } from '../VizTooltip';
+import { VizTooltip } from '../../components/VizTooltip';
 
 import Graph from './Graph';
 
diff --git a/packages/grafana-ui/src/components/Graph/Graph.tsx b/packages/grafana-ui/src/graveyard/Graph/Graph.tsx
similarity index 98%
rename from packages/grafana-ui/src/components/Graph/Graph.tsx
rename to packages/grafana-ui/src/graveyard/Graph/Graph.tsx
index b9c48023de721..624d19e29c656 100644
--- a/packages/grafana-ui/src/components/Graph/Graph.tsx
+++ b/packages/grafana-ui/src/graveyard/Graph/Graph.tsx
@@ -7,14 +7,16 @@ import React, { PureComponent } from 'react';
 import { TimeRange, GraphSeriesXY, TimeZone, createDimension } from '@grafana/data';
 import { TooltipDisplayMode } from '@grafana/schema';
 
-import { VizTooltipProps, VizTooltipContentProps, ActiveDimensions, VizTooltip } from '../VizTooltip';
+import { VizTooltipProps, VizTooltipContentProps, ActiveDimensions, VizTooltip } from '../../components/VizTooltip';
+import { FlotPosition } from '../../components/VizTooltip/VizTooltip';
 
 import { GraphContextMenu, GraphContextMenuProps, ContextDimensions } from './GraphContextMenu';
 import { GraphTooltip } from './GraphTooltip/GraphTooltip';
 import { GraphDimensions } from './GraphTooltip/types';
-import { FlotPosition, FlotItem } from './types';
+import { FlotItem } from './types';
 import { graphTimeFormat, graphTickFormatter } from './utils';
 
+/** @deprecated */
 export interface GraphProps {
   ariaLabel?: string;
   children?: JSX.Element | JSX.Element[];
@@ -31,6 +33,7 @@ export interface GraphProps {
   onHorizontalRegionSelected?: (from: number, to: number) => void;
 }
 
+/** @deprecated */
 interface GraphState {
   pos?: FlotPosition;
   contextPos?: FlotPosition;
diff --git a/packages/grafana-ui/src/components/Graph/GraphContextMenu.tsx b/packages/grafana-ui/src/graveyard/Graph/GraphContextMenu.tsx
similarity index 87%
rename from packages/grafana-ui/src/components/Graph/GraphContextMenu.tsx
rename to packages/grafana-ui/src/graveyard/Graph/GraphContextMenu.tsx
index 963fb8624598b..5b3da31708a77 100644
--- a/packages/grafana-ui/src/components/Graph/GraphContextMenu.tsx
+++ b/packages/grafana-ui/src/graveyard/Graph/GraphContextMenu.tsx
@@ -11,18 +11,20 @@ import {
   GrafanaTheme2,
 } from '@grafana/data';
 
+import { ContextMenu, ContextMenuProps } from '../../components/ContextMenu/ContextMenu';
+import { FormattedValueDisplay } from '../../components/FormattedValueDisplay/FormattedValueDisplay';
+import { HorizontalGroup } from '../../components/Layout/Layout';
+import { MenuGroup, MenuGroupProps } from '../../components/Menu/MenuGroup';
+import { MenuItem } from '../../components/Menu/MenuItem';
+import { SeriesIcon } from '../../components/VizLegend/SeriesIcon';
 import { useStyles2 } from '../../themes';
-import { ContextMenu, ContextMenuProps } from '../ContextMenu/ContextMenu';
-import { FormattedValueDisplay } from '../FormattedValueDisplay/FormattedValueDisplay';
-import { HorizontalGroup } from '../Layout/Layout';
-import { MenuGroup, MenuGroupProps } from '../Menu/MenuGroup';
-import { MenuItem } from '../Menu/MenuItem';
-import { SeriesIcon } from '../VizLegend/SeriesIcon';
 
 import { GraphDimensions } from './GraphTooltip/types';
 
+/** @deprecated */
 export type ContextDimensions<T extends Dimensions = any> = { [key in keyof T]: [number, number | undefined] | null };
 
+/** @deprecated */
 export type GraphContextMenuProps = ContextMenuProps & {
   getContextMenuSource: () => FlotDataPoint | null;
   timeZone?: TimeZone;
diff --git a/packages/grafana-ui/src/components/Graph/GraphSeriesToggler.tsx b/packages/grafana-ui/src/graveyard/Graph/GraphSeriesToggler.tsx
similarity index 97%
rename from packages/grafana-ui/src/components/Graph/GraphSeriesToggler.tsx
rename to packages/grafana-ui/src/graveyard/Graph/GraphSeriesToggler.tsx
index 693cf9e9758f3..fc960695a6817 100644
--- a/packages/grafana-ui/src/components/Graph/GraphSeriesToggler.tsx
+++ b/packages/grafana-ui/src/graveyard/Graph/GraphSeriesToggler.tsx
@@ -3,22 +3,26 @@ import React, { Component } from 'react';
 
 import { GraphSeriesXY } from '@grafana/data';
 
+/** @deprecated */
 export interface GraphSeriesTogglerAPI {
   onSeriesToggle: (label: string, event: React.MouseEvent<HTMLElement>) => void;
   toggledSeries: GraphSeriesXY[];
 }
 
+/** @deprecated */
 export interface GraphSeriesTogglerProps {
   children: (api: GraphSeriesTogglerAPI) => JSX.Element;
   series: GraphSeriesXY[];
   onHiddenSeriesChanged?: (hiddenSeries: string[]) => void;
 }
 
+/** @deprecated */
 export interface GraphSeriesTogglerState {
   hiddenSeries: string[];
   toggledSeries: GraphSeriesXY[];
 }
 
+/** @deprecated */
 export class GraphSeriesToggler extends Component<GraphSeriesTogglerProps, GraphSeriesTogglerState> {
   constructor(props: GraphSeriesTogglerProps) {
     super(props);
diff --git a/packages/grafana-ui/src/components/Graph/GraphTooltip/GraphTooltip.tsx b/packages/grafana-ui/src/graveyard/Graph/GraphTooltip/GraphTooltip.tsx
similarity index 91%
rename from packages/grafana-ui/src/components/Graph/GraphTooltip/GraphTooltip.tsx
rename to packages/grafana-ui/src/graveyard/Graph/GraphTooltip/GraphTooltip.tsx
index 53008e1dd6886..d58c0816dfe91 100644
--- a/packages/grafana-ui/src/components/Graph/GraphTooltip/GraphTooltip.tsx
+++ b/packages/grafana-ui/src/graveyard/Graph/GraphTooltip/GraphTooltip.tsx
@@ -2,12 +2,13 @@ import React from 'react';
 
 import { TooltipDisplayMode } from '@grafana/schema';
 
-import { VizTooltipContentProps } from '../../VizTooltip';
+import { VizTooltipContentProps } from '../../../components/VizTooltip';
 
 import { MultiModeGraphTooltip } from './MultiModeGraphTooltip';
 import { SingleModeGraphTooltip } from './SingleModeGraphTooltip';
 import { GraphDimensions } from './types';
 
+/** @deprecated */
 export const GraphTooltip = ({
   mode = TooltipDisplayMode.Single,
   dimensions,
diff --git a/packages/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.test.tsx b/packages/grafana-ui/src/graveyard/Graph/GraphTooltip/MultiModeGraphTooltip.test.tsx
similarity index 98%
rename from packages/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.test.tsx
rename to packages/grafana-ui/src/graveyard/Graph/GraphTooltip/MultiModeGraphTooltip.test.tsx
index 0ab5281266750..1af501183a675 100644
--- a/packages/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.test.tsx
+++ b/packages/grafana-ui/src/graveyard/Graph/GraphTooltip/MultiModeGraphTooltip.test.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 
 import { createDimension, createTheme, FieldType, DisplayProcessor } from '@grafana/data';
 
-import { ActiveDimensions } from '../../VizTooltip';
+import { ActiveDimensions } from '../../../components/VizTooltip';
 
 import { MultiModeGraphTooltip } from './MultiModeGraphTooltip';
 import { GraphDimensions } from './types';
diff --git a/packages/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.tsx b/packages/grafana-ui/src/graveyard/Graph/GraphTooltip/MultiModeGraphTooltip.tsx
similarity index 88%
rename from packages/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.tsx
rename to packages/grafana-ui/src/graveyard/Graph/GraphTooltip/MultiModeGraphTooltip.tsx
index f071abdcea252..bfe2856c7004d 100644
--- a/packages/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.tsx
+++ b/packages/grafana-ui/src/graveyard/Graph/GraphTooltip/MultiModeGraphTooltip.tsx
@@ -2,17 +2,19 @@ import React from 'react';
 
 import { getValueFromDimension } from '@grafana/data';
 
-import { SeriesTable } from '../../VizTooltip';
-import { FlotPosition } from '../types';
+import { SeriesTable } from '../../../components/VizTooltip';
+import { FlotPosition } from '../../../components/VizTooltip/VizTooltip';
 import { getMultiSeriesGraphHoverInfo } from '../utils';
 
 import { GraphTooltipContentProps } from './types';
 
+/** @deprecated */
 type Props = GraphTooltipContentProps & {
   // We expect position to figure out correct values when not hovering over a datapoint
   pos: FlotPosition;
 };
 
+/** @deprecated */
 export const MultiModeGraphTooltip = ({ dimensions, activeDimensions, pos, timeZone }: Props) => {
   let activeSeriesIndex: number | null = null;
   // when no x-axis provided, skip rendering
diff --git a/packages/grafana-ui/src/components/Graph/GraphTooltip/SingleModeGraphTooltip.tsx b/packages/grafana-ui/src/graveyard/Graph/GraphTooltip/SingleModeGraphTooltip.tsx
similarity index 94%
rename from packages/grafana-ui/src/components/Graph/GraphTooltip/SingleModeGraphTooltip.tsx
rename to packages/grafana-ui/src/graveyard/Graph/GraphTooltip/SingleModeGraphTooltip.tsx
index 3b5ad3b2adea6..7eb4d61872c1d 100644
--- a/packages/grafana-ui/src/components/Graph/GraphTooltip/SingleModeGraphTooltip.tsx
+++ b/packages/grafana-ui/src/graveyard/Graph/GraphTooltip/SingleModeGraphTooltip.tsx
@@ -7,10 +7,11 @@ import {
   getFieldDisplayName,
 } from '@grafana/data';
 
-import { SeriesTable } from '../../VizTooltip';
+import { SeriesTable } from '../../../components/VizTooltip';
 
 import { GraphTooltipContentProps } from './types';
 
+/** @deprecated */
 export const SingleModeGraphTooltip = ({ dimensions, activeDimensions, timeZone }: GraphTooltipContentProps) => {
   // not hovering over a point, skip rendering
   if (
diff --git a/packages/grafana-ui/src/graveyard/Graph/GraphTooltip/types.ts b/packages/grafana-ui/src/graveyard/Graph/GraphTooltip/types.ts
new file mode 100644
index 0000000000000..d4d68b729c189
--- /dev/null
+++ b/packages/grafana-ui/src/graveyard/Graph/GraphTooltip/types.ts
@@ -0,0 +1,16 @@
+import { Dimension, Dimensions, TimeZone } from '@grafana/data';
+
+import { ActiveDimensions } from '../../../components/VizTooltip';
+
+/** @deprecated */
+export interface GraphDimensions extends Dimensions {
+  xAxis: Dimension<number>;
+  yAxis: Dimension<number>;
+}
+
+/** @deprecated */
+export interface GraphTooltipContentProps {
+  dimensions: GraphDimensions; // Dimension[]
+  activeDimensions: ActiveDimensions<GraphDimensions>;
+  timeZone?: TimeZone;
+}
diff --git a/packages/grafana-ui/src/components/Graph/GraphWithLegend.internal.story.tsx b/packages/grafana-ui/src/graveyard/Graph/GraphWithLegend.internal.story.tsx
similarity index 100%
rename from packages/grafana-ui/src/components/Graph/GraphWithLegend.internal.story.tsx
rename to packages/grafana-ui/src/graveyard/Graph/GraphWithLegend.internal.story.tsx
diff --git a/packages/grafana-ui/src/components/Graph/GraphWithLegend.tsx b/packages/grafana-ui/src/graveyard/Graph/GraphWithLegend.tsx
similarity index 86%
rename from packages/grafana-ui/src/components/Graph/GraphWithLegend.tsx
rename to packages/grafana-ui/src/graveyard/Graph/GraphWithLegend.tsx
index f7c28de0d3d03..a590d5d1ed105 100644
--- a/packages/grafana-ui/src/components/Graph/GraphWithLegend.tsx
+++ b/packages/grafana-ui/src/graveyard/Graph/GraphWithLegend.tsx
@@ -3,13 +3,13 @@
 import { css } from '@emotion/css';
 import React from 'react';
 
-import { GraphSeriesValue } from '@grafana/data';
+import { GrafanaTheme2, GraphSeriesValue } from '@grafana/data';
 import { LegendDisplayMode, LegendPlacement } from '@grafana/schema';
 
-import { stylesFactory } from '../../themes';
-import { CustomScrollbar } from '../CustomScrollbar/CustomScrollbar';
-import { VizLegend } from '../VizLegend/VizLegend';
-import { VizLegendItem } from '../VizLegend/types';
+import { CustomScrollbar } from '../../components/CustomScrollbar/CustomScrollbar';
+import { VizLegend } from '../../components/VizLegend/VizLegend';
+import { VizLegendItem } from '../../components/VizLegend/types';
+import { useStyles2 } from '../../themes';
 
 import { Graph, GraphProps } from './Graph';
 
@@ -25,21 +25,6 @@ export interface GraphWithLegendProps extends GraphProps {
   onToggleSort: (sortBy: string) => void;
 }
 
-const getGraphWithLegendStyles = stylesFactory(({ placement }: GraphWithLegendProps) => ({
-  wrapper: css({
-    display: 'flex',
-    flexDirection: placement === 'bottom' ? 'column' : 'row',
-  }),
-  graphContainer: css({
-    minHeight: '65%',
-    flexGrow: 1,
-  }),
-  legendContainer: css({
-    padding: '10px 0',
-    maxHeight: placement === 'bottom' ? '35%' : 'none',
-  }),
-}));
-
 const shouldHideLegendItem = (data: GraphSeriesValue[][], hideEmpty = false, hideZero = false) => {
   const isZeroOnlySeries = data.reduce((acc, current) => acc + (current[1] || 0), 0) === 0;
   const isNullOnlySeries = !data.reduce((acc, current) => acc && current[1] !== null, true);
@@ -72,7 +57,7 @@ export const GraphWithLegend = (props: GraphWithLegendProps) => {
     children,
     ariaLabel,
   } = props;
-  const { graphContainer, wrapper, legendContainer } = getGraphWithLegendStyles(props);
+  const { graphContainer, wrapper, legendContainer } = useStyles2(getGraphWithLegendStyles, props.placement);
 
   const legendItems = series.reduce<VizLegendItem[]>((acc, s) => {
     return shouldHideLegendItem(s.data, hideEmpty, hideZero)
@@ -130,3 +115,18 @@ export const GraphWithLegend = (props: GraphWithLegendProps) => {
     </div>
   );
 };
+
+const getGraphWithLegendStyles = (_theme: GrafanaTheme2, placement: LegendPlacement) => ({
+  wrapper: css({
+    display: 'flex',
+    flexDirection: placement === 'bottom' ? 'column' : 'row',
+  }),
+  graphContainer: css({
+    minHeight: '65%',
+    flexGrow: 1,
+  }),
+  legendContainer: css({
+    padding: '10px 0',
+    maxHeight: placement === 'bottom' ? '35%' : 'none',
+  }),
+});
diff --git a/packages/grafana-ui/src/graveyard/Graph/types.ts b/packages/grafana-ui/src/graveyard/Graph/types.ts
new file mode 100644
index 0000000000000..60cdb44b983f8
--- /dev/null
+++ b/packages/grafana-ui/src/graveyard/Graph/types.ts
@@ -0,0 +1,9 @@
+/** @deprecated */
+export interface FlotItem<T> {
+  datapoint: [number, number];
+  dataIndex: number;
+  series: T;
+  seriesIndex: number;
+  pageX: number;
+  pageY: number;
+}
diff --git a/packages/grafana-ui/src/components/Graph/utils.test.ts b/packages/grafana-ui/src/graveyard/Graph/utils.test.ts
similarity index 100%
rename from packages/grafana-ui/src/components/Graph/utils.test.ts
rename to packages/grafana-ui/src/graveyard/Graph/utils.test.ts
diff --git a/packages/grafana-ui/src/graveyard/Graph/utils.ts b/packages/grafana-ui/src/graveyard/Graph/utils.ts
new file mode 100644
index 0000000000000..ebc34ad470ea7
--- /dev/null
+++ b/packages/grafana-ui/src/graveyard/Graph/utils.ts
@@ -0,0 +1,147 @@
+import {
+  GraphSeriesValue,
+  Field,
+  formattedValueToString,
+  getFieldDisplayName,
+  TimeZone,
+  dateTimeFormat,
+  systemDateFormats,
+} from '@grafana/data';
+
+/**
+ * Returns index of the closest datapoint BEFORE hover position
+ *
+ * @param posX
+ * @param series
+ * @deprecated
+ */
+export const findHoverIndexFromData = (xAxisDimension: Field, xPos: number) => {
+  let lower = 0;
+  let upper = xAxisDimension.values.length - 1;
+  let middle;
+
+  while (true) {
+    if (lower > upper) {
+      return Math.max(upper, 0);
+    }
+    middle = Math.floor((lower + upper) / 2);
+    const xPosition = xAxisDimension.values[middle];
+
+    if (xPosition === xPos) {
+      return middle;
+    } else if (xPosition && xPosition < xPos) {
+      lower = middle + 1;
+    } else {
+      upper = middle - 1;
+    }
+  }
+};
+
+interface MultiSeriesHoverInfo {
+  value: string;
+  time: string;
+  datapointIndex: number;
+  seriesIndex: number;
+  label?: string;
+  color?: string;
+}
+
+/**
+ * Returns information about closest datapoints when hovering over a Graph
+ *
+ * @param seriesList list of series visible on the Graph
+ * @param pos mouse cursor position, based on jQuery.flot position
+ * @deprecated
+ */
+export const getMultiSeriesGraphHoverInfo = (
+  // x and y axis dimensions order is aligned
+  yAxisDimensions: Field[],
+  xAxisDimensions: Field[],
+  /** Well, time basically */
+  xAxisPosition: number,
+  timeZone?: TimeZone
+): {
+  results: MultiSeriesHoverInfo[];
+  time?: GraphSeriesValue;
+} => {
+  let i, field, hoverIndex, hoverDistance, pointTime;
+
+  const results: MultiSeriesHoverInfo[] = [];
+
+  let minDistance, minTime;
+
+  for (i = 0; i < yAxisDimensions.length; i++) {
+    field = yAxisDimensions[i];
+    const time = xAxisDimensions[i];
+    hoverIndex = findHoverIndexFromData(time, xAxisPosition);
+    hoverDistance = xAxisPosition - time.values[hoverIndex];
+    pointTime = time.values[hoverIndex];
+    // Take the closest point before the cursor, or if it does not exist, the closest after
+    if (
+      minDistance === undefined ||
+      (hoverDistance >= 0 && (hoverDistance < minDistance || minDistance < 0)) ||
+      (hoverDistance < 0 && hoverDistance > minDistance)
+    ) {
+      minDistance = hoverDistance;
+      minTime = time.display ? formattedValueToString(time.display(pointTime)) : pointTime;
+    }
+
+    const disp = field.display!(field.values[hoverIndex]);
+
+    results.push({
+      value: formattedValueToString(disp),
+      datapointIndex: hoverIndex,
+      seriesIndex: i,
+      color: disp.color,
+      label: getFieldDisplayName(field),
+      time: time.display ? formattedValueToString(time.display(pointTime)) : pointTime,
+    });
+  }
+
+  return {
+    results,
+    time: minTime,
+  };
+};
+
+/** @deprecated */
+export const graphTickFormatter = (epoch: number, axis: any) => {
+  return dateTimeFormat(epoch, {
+    format: axis?.options?.timeformat,
+    timeZone: axis?.options?.timezone,
+  });
+};
+
+/** @deprecated */
+export const graphTimeFormat = (ticks: number | null, min: number | null, max: number | null): string => {
+  if (min && max && ticks) {
+    const range = max - min;
+    const secPerTick = range / ticks / 1000;
+    // Need have 10 millisecond margin on the day range
+    // As sometimes last 24 hour dashboard evaluates to more than 86400000
+    const oneDay = 86400010;
+    const oneYear = 31536000000;
+
+    if (secPerTick <= 10) {
+      return systemDateFormats.interval.millisecond;
+    }
+    if (secPerTick <= 45) {
+      return systemDateFormats.interval.second;
+    }
+    if (range <= oneDay) {
+      return systemDateFormats.interval.minute;
+    }
+    if (secPerTick <= 80000) {
+      return systemDateFormats.interval.hour;
+    }
+    if (range <= oneYear) {
+      return systemDateFormats.interval.day;
+    }
+    if (secPerTick <= 31536000) {
+      return systemDateFormats.interval.month;
+    }
+    return systemDateFormats.interval.year;
+  }
+
+  return systemDateFormats.interval.minute;
+};
diff --git a/packages/grafana-ui/src/graveyard/GraphNG/GraphNG.tsx b/packages/grafana-ui/src/graveyard/GraphNG/GraphNG.tsx
new file mode 100644
index 0000000000000..52dfadb27a6cd
--- /dev/null
+++ b/packages/grafana-ui/src/graveyard/GraphNG/GraphNG.tsx
@@ -0,0 +1,275 @@
+import React, { Component } from 'react';
+import { Subscription } from 'rxjs';
+import { throttleTime } from 'rxjs/operators';
+import uPlot, { AlignedData } from 'uplot';
+
+import {
+  DataFrame,
+  DataHoverClearEvent,
+  DataHoverEvent,
+  Field,
+  FieldMatcherID,
+  fieldMatchers,
+  FieldType,
+  LegacyGraphHoverEvent,
+  TimeRange,
+  TimeZone,
+} from '@grafana/data';
+import { VizLegendOptions } from '@grafana/schema';
+
+import { PanelContext, PanelContextRoot } from '../../components/PanelChrome/PanelContext';
+import { VizLayout } from '../../components/VizLayout/VizLayout';
+import { UPlotChart } from '../../components/uPlot/Plot';
+import { AxisProps } from '../../components/uPlot/config/UPlotAxisBuilder';
+import { Renderers, UPlotConfigBuilder } from '../../components/uPlot/config/UPlotConfigBuilder';
+import { ScaleProps } from '../../components/uPlot/config/UPlotScaleBuilder';
+import { findMidPointYPosition, pluginLog } from '../../components/uPlot/utils';
+import { Themeable2 } from '../../types';
+
+import { GraphNGLegendEvent, XYFieldMatchers } from './types';
+import { preparePlotFrame as defaultPreparePlotFrame } from './utils';
+
+/**
+ * @deprecated
+ * @internal -- not a public API
+ */
+export type PropDiffFn<T extends any = any> = (prev: T, next: T) => boolean;
+
+/** @deprecated */
+export interface GraphNGProps extends Themeable2 {
+  frames: DataFrame[];
+  structureRev?: number; // a number that will change when the frames[] structure changes
+  width: number;
+  height: number;
+  timeRange: TimeRange;
+  timeZone: TimeZone[] | TimeZone;
+  legend: VizLegendOptions;
+  fields?: XYFieldMatchers; // default will assume timeseries data
+  renderers?: Renderers;
+  tweakScale?: (opts: ScaleProps, forField: Field) => ScaleProps;
+  tweakAxis?: (opts: AxisProps, forField: Field) => AxisProps;
+  onLegendClick?: (event: GraphNGLegendEvent) => void;
+  children?: (builder: UPlotConfigBuilder, alignedFrame: DataFrame) => React.ReactNode;
+  prepConfig: (alignedFrame: DataFrame, allFrames: DataFrame[], getTimeRange: () => TimeRange) => UPlotConfigBuilder;
+  propsToDiff?: Array<string | PropDiffFn>;
+  preparePlotFrame?: (frames: DataFrame[], dimFields: XYFieldMatchers) => DataFrame | null;
+  renderLegend: (config: UPlotConfigBuilder) => React.ReactElement | null;
+
+  /**
+   * needed for propsToDiff to re-init the plot & config
+   * this is a generic approach to plot re-init, without having to specify which panel-level options
+   * should cause invalidation. we can drop this in favor of something like panelOptionsRev that gets passed in
+   * similar to structureRev. then we can drop propsToDiff entirely.
+   */
+  options?: Record<string, any>;
+}
+
+function sameProps(prevProps: any, nextProps: any, propsToDiff: Array<string | PropDiffFn> = []) {
+  for (const propName of propsToDiff) {
+    if (typeof propName === 'function') {
+      if (!propName(prevProps, nextProps)) {
+        return false;
+      }
+    } else if (nextProps[propName] !== prevProps[propName]) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+/**
+ * @internal -- not a public API
+ * @deprecated
+ */
+export interface GraphNGState {
+  alignedFrame: DataFrame;
+  alignedData?: AlignedData;
+  config?: UPlotConfigBuilder;
+}
+
+/**
+ * "Time as X" core component, expects ascending x
+ * @deprecated
+ */
+export class GraphNG extends Component<GraphNGProps, GraphNGState> {
+  static contextType = PanelContextRoot;
+  panelContext: PanelContext = {} as PanelContext;
+  private plotInstance: React.RefObject<uPlot>;
+
+  private subscription = new Subscription();
+
+  constructor(props: GraphNGProps) {
+    super(props);
+    let state = this.prepState(props);
+    state.alignedData = state.config!.prepData!([state.alignedFrame]) as AlignedData;
+    this.state = state;
+    this.plotInstance = React.createRef();
+  }
+
+  getTimeRange = () => this.props.timeRange;
+
+  prepState(props: GraphNGProps, withConfig = true) {
+    let state: GraphNGState = null as any;
+
+    const { frames, fields, preparePlotFrame } = props;
+
+    const preparePlotFrameFn = preparePlotFrame || defaultPreparePlotFrame;
+
+    const alignedFrame = preparePlotFrameFn(
+      frames,
+      fields || {
+        x: fieldMatchers.get(FieldMatcherID.firstTimeField).get({}),
+        y: fieldMatchers.get(FieldMatcherID.byTypes).get(new Set([FieldType.number, FieldType.enum])),
+      },
+      props.timeRange
+    );
+    pluginLog('GraphNG', false, 'data aligned', alignedFrame);
+
+    if (alignedFrame) {
+      let config = this.state?.config;
+
+      if (withConfig) {
+        config = props.prepConfig(alignedFrame, this.props.frames, this.getTimeRange);
+        pluginLog('GraphNG', false, 'config prepared', config);
+      }
+
+      state = {
+        alignedFrame,
+        config,
+      };
+
+      pluginLog('GraphNG', false, 'data prepared', state.alignedData);
+    }
+
+    return state;
+  }
+
+  handleCursorUpdate(evt: DataHoverEvent | LegacyGraphHoverEvent) {
+    const time = evt.payload?.point?.time;
+    const u = this.plotInstance.current;
+    if (u && time) {
+      // Try finding left position on time axis
+      const left = u.valToPos(time, 'x');
+      let top;
+      if (left) {
+        // find midpoint between points at current idx
+        top = findMidPointYPosition(u, u.posToIdx(left));
+      }
+
+      if (!top || !left) {
+        return;
+      }
+
+      u.setCursor({
+        left,
+        top,
+      });
+    }
+  }
+
+  componentDidMount() {
+    this.panelContext = this.context as PanelContext;
+    const { eventBus } = this.panelContext;
+
+    this.subscription.add(
+      eventBus
+        .getStream(DataHoverEvent)
+        .pipe(throttleTime(50))
+        .subscribe({
+          next: (evt) => {
+            if (eventBus === evt.origin) {
+              return;
+            }
+            this.handleCursorUpdate(evt);
+          },
+        })
+    );
+
+    // Legacy events (from flot graph)
+    this.subscription.add(
+      eventBus
+        .getStream(LegacyGraphHoverEvent)
+        .pipe(throttleTime(50))
+        .subscribe({
+          next: (evt) => this.handleCursorUpdate(evt),
+        })
+    );
+
+    this.subscription.add(
+      eventBus
+        .getStream(DataHoverClearEvent)
+        .pipe(throttleTime(50))
+        .subscribe({
+          next: () => {
+            const u = this.plotInstance?.current;
+
+            // @ts-ignore
+            if (u && !u.cursor._lock) {
+              u.setCursor({
+                left: -10,
+                top: -10,
+              });
+            }
+          },
+        })
+    );
+  }
+
+  componentDidUpdate(prevProps: GraphNGProps) {
+    const { frames, structureRev, timeZone, propsToDiff } = this.props;
+
+    const propsChanged = !sameProps(prevProps, this.props, propsToDiff);
+
+    if (frames !== prevProps.frames || propsChanged || timeZone !== prevProps.timeZone) {
+      let newState = this.prepState(this.props, false);
+
+      if (newState) {
+        const shouldReconfig =
+          this.state.config === undefined ||
+          timeZone !== prevProps.timeZone ||
+          structureRev !== prevProps.structureRev ||
+          !structureRev ||
+          propsChanged;
+
+        if (shouldReconfig) {
+          newState.config = this.props.prepConfig(newState.alignedFrame, this.props.frames, this.getTimeRange);
+          pluginLog('GraphNG', false, 'config recreated', newState.config);
+        }
+
+        newState.alignedData = newState.config!.prepData!([newState.alignedFrame]) as AlignedData;
+
+        this.setState(newState);
+      }
+    }
+  }
+
+  componentWillUnmount() {
+    this.subscription.unsubscribe();
+  }
+
+  render() {
+    const { width, height, children, renderLegend } = this.props;
+    const { config, alignedFrame, alignedData } = this.state;
+
+    if (!config) {
+      return null;
+    }
+
+    return (
+      <VizLayout width={width} height={height} legend={renderLegend(config)}>
+        {(vizWidth: number, vizHeight: number) => (
+          <UPlotChart
+            config={config}
+            data={alignedData!}
+            width={vizWidth}
+            height={vizHeight}
+            plotRef={(u) => ((this.plotInstance as React.MutableRefObject<uPlot>).current = u)}
+          >
+            {children ? children(config, alignedFrame) : null}
+          </UPlotChart>
+        )}
+      </VizLayout>
+    );
+  }
+}
diff --git a/packages/grafana-ui/src/graveyard/GraphNG/__snapshots__/utils.test.ts.snap b/packages/grafana-ui/src/graveyard/GraphNG/__snapshots__/utils.test.ts.snap
new file mode 100644
index 0000000000000..2aff27a97fa13
--- /dev/null
+++ b/packages/grafana-ui/src/graveyard/GraphNG/__snapshots__/utils.test.ts.snap
@@ -0,0 +1,242 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`GraphNG utils preparePlotConfigBuilder 1`] = `
+{
+  "axes": [
+    {
+      "filter": undefined,
+      "font": "12px "Inter", "Helvetica", "Arial", sans-serif",
+      "gap": 5,
+      "grid": {
+        "show": true,
+        "stroke": "rgba(240, 250, 255, 0.09)",
+        "width": 1,
+      },
+      "incrs": undefined,
+      "labelGap": 0,
+      "rotate": undefined,
+      "scale": "x",
+      "show": true,
+      "side": 2,
+      "size": [Function],
+      "space": [Function],
+      "splits": undefined,
+      "stroke": "rgb(204, 204, 220)",
+      "ticks": {
+        "show": true,
+        "size": 4,
+        "stroke": "rgba(240, 250, 255, 0.09)",
+        "width": 1,
+      },
+      "timeZone": "utc",
+      "values": [Function],
+    },
+    {
+      "filter": undefined,
+      "font": "12px "Inter", "Helvetica", "Arial", sans-serif",
+      "gap": 5,
+      "grid": {
+        "show": true,
+        "stroke": "rgba(240, 250, 255, 0.09)",
+        "width": 1,
+      },
+      "incrs": undefined,
+      "labelGap": 0,
+      "rotate": undefined,
+      "scale": "__fixed/na-na/na-na/auto/linear/na/number",
+      "show": true,
+      "side": 3,
+      "size": [Function],
+      "space": [Function],
+      "splits": undefined,
+      "stroke": "rgb(204, 204, 220)",
+      "ticks": {
+        "show": false,
+        "size": 4,
+        "stroke": "rgb(204, 204, 220)",
+        "width": 1,
+      },
+      "timeZone": undefined,
+      "values": [Function],
+    },
+  ],
+  "cursor": {
+    "dataIdx": [Function],
+    "drag": {
+      "setScale": false,
+    },
+    "focus": {
+      "prox": 30,
+    },
+    "points": {
+      "fill": [Function],
+      "size": [Function],
+      "stroke": [Function],
+      "width": [Function],
+    },
+    "sync": {
+      "key": "__global_",
+      "scales": [
+        "x",
+        null,
+      ],
+    },
+  },
+  "focus": {
+    "alpha": 1,
+  },
+  "hooks": {},
+  "legend": {
+    "show": false,
+  },
+  "mode": 1,
+  "ms": 1,
+  "padding": [
+    [Function],
+    [Function],
+    [Function],
+    [Function],
+  ],
+  "scales": {
+    "__fixed/na-na/na-na/auto/linear/na/number": {
+      "asinh": undefined,
+      "auto": true,
+      "dir": 1,
+      "distr": 1,
+      "log": undefined,
+      "ori": 1,
+      "range": [Function],
+      "time": undefined,
+    },
+    "x": {
+      "auto": false,
+      "dir": 1,
+      "ori": 0,
+      "range": [Function],
+      "time": true,
+    },
+  },
+  "select": undefined,
+  "series": [
+    {
+      "value": [Function],
+    },
+    {
+      "dash": [
+        1,
+        2,
+      ],
+      "facets": undefined,
+      "fill": [Function],
+      "paths": [Function],
+      "points": {
+        "fill": "#ff0000",
+        "filter": [Function],
+        "show": true,
+        "size": undefined,
+        "stroke": "#ff0000",
+      },
+      "pxAlign": undefined,
+      "scale": "__fixed/na-na/na-na/auto/linear/na/number",
+      "show": true,
+      "spanGaps": false,
+      "stroke": "#ff0000",
+      "value": [Function],
+      "width": 2,
+    },
+    {
+      "dash": [
+        1,
+        2,
+      ],
+      "facets": undefined,
+      "fill": [Function],
+      "paths": [Function],
+      "points": {
+        "fill": [Function],
+        "filter": [Function],
+        "show": true,
+        "size": undefined,
+        "stroke": [Function],
+      },
+      "pxAlign": undefined,
+      "scale": "__fixed/na-na/na-na/auto/linear/na/number",
+      "show": true,
+      "spanGaps": false,
+      "stroke": [Function],
+      "value": [Function],
+      "width": 2,
+    },
+    {
+      "dash": [
+        1,
+        2,
+      ],
+      "facets": undefined,
+      "fill": [Function],
+      "paths": [Function],
+      "points": {
+        "fill": "#ff0000",
+        "filter": [Function],
+        "show": true,
+        "size": undefined,
+        "stroke": "#ff0000",
+      },
+      "pxAlign": undefined,
+      "scale": "__fixed/na-na/na-na/auto/linear/na/number",
+      "show": true,
+      "spanGaps": false,
+      "stroke": "#ff0000",
+      "value": [Function],
+      "width": 2,
+    },
+    {
+      "dash": [
+        1,
+        2,
+      ],
+      "facets": undefined,
+      "fill": [Function],
+      "paths": [Function],
+      "points": {
+        "fill": [Function],
+        "filter": [Function],
+        "show": true,
+        "size": undefined,
+        "stroke": [Function],
+      },
+      "pxAlign": undefined,
+      "scale": "__fixed/na-na/na-na/auto/linear/na/number",
+      "show": true,
+      "spanGaps": false,
+      "stroke": [Function],
+      "value": [Function],
+      "width": 2,
+    },
+    {
+      "dash": [
+        1,
+        2,
+      ],
+      "facets": undefined,
+      "fill": [Function],
+      "paths": [Function],
+      "points": {
+        "fill": [Function],
+        "filter": [Function],
+        "show": true,
+        "size": undefined,
+        "stroke": [Function],
+      },
+      "pxAlign": undefined,
+      "scale": "__fixed/na-na/na-na/auto/linear/na/number",
+      "show": true,
+      "spanGaps": false,
+      "stroke": [Function],
+      "value": [Function],
+      "width": 2,
+    },
+  ],
+  "tzDate": [Function],
+}
+`;
diff --git a/packages/grafana-ui/src/graveyard/GraphNG/hooks.ts b/packages/grafana-ui/src/graveyard/GraphNG/hooks.ts
new file mode 100644
index 0000000000000..e4f1d46550a20
--- /dev/null
+++ b/packages/grafana-ui/src/graveyard/GraphNG/hooks.ts
@@ -0,0 +1,41 @@
+import React, { useCallback, useContext } from 'react';
+
+import { DataFrame, DataFrameFieldIndex, Field } from '@grafana/data';
+
+import { XYFieldMatchers } from './types';
+
+/** @deprecated */
+interface GraphNGContextType {
+  mapSeriesIndexToDataFrameFieldIndex: (index: number) => DataFrameFieldIndex;
+  dimFields: XYFieldMatchers;
+  data: DataFrame;
+}
+
+/** @deprecated */
+export const GraphNGContext = React.createContext<GraphNGContextType>({} as GraphNGContextType);
+
+/** @deprecated */
+export const useGraphNGContext = () => {
+  const { data, dimFields, mapSeriesIndexToDataFrameFieldIndex } = useContext<GraphNGContextType>(GraphNGContext);
+
+  const getXAxisField = useCallback(() => {
+    const xFieldMatcher = dimFields.x;
+    let xField: Field | null = null;
+
+    for (let j = 0; j < data.fields.length; j++) {
+      if (xFieldMatcher(data.fields[j], data, [data])) {
+        xField = data.fields[j];
+        break;
+      }
+    }
+
+    return xField;
+  }, [data, dimFields]);
+
+  return {
+    dimFields,
+    mapSeriesIndexToDataFrameFieldIndex,
+    getXAxisField,
+    alignedData: data,
+  };
+};
diff --git a/packages/grafana-ui/src/graveyard/GraphNG/nullInsertThreshold.test.ts b/packages/grafana-ui/src/graveyard/GraphNG/nullInsertThreshold.test.ts
new file mode 100644
index 0000000000000..7a2ceb15e8dbd
--- /dev/null
+++ b/packages/grafana-ui/src/graveyard/GraphNG/nullInsertThreshold.test.ts
@@ -0,0 +1,334 @@
+import { FieldType, createDataFrame } from '@grafana/data';
+
+import { applyNullInsertThreshold } from './nullInsertThreshold';
+
+function randInt(min: number, max: number) {
+  return Math.floor(Math.random() * (max - min + 1) + min);
+}
+
+function genFrame() {
+  let fieldCount = 10;
+  let valueCount = 3000;
+  let step = 1000;
+  let skipProb = 0.5;
+  let skipSteps = [1, 5]; // min, max
+
+  let allValues = Array(fieldCount);
+
+  allValues[0] = Array(valueCount);
+
+  for (let i = 0, curStep = Date.now(); i < valueCount; i++) {
+    curStep = allValues[0][i] = curStep + step * (Math.random() < skipProb ? randInt(skipSteps[0], skipSteps[1]) : 1);
+  }
+
+  for (let fi = 1; fi < fieldCount; fi++) {
+    let values = Array(valueCount);
+
+    for (let i = 0; i < valueCount; i++) {
+      values[i] = Math.random() * 100;
+    }
+
+    allValues[fi] = values;
+  }
+
+  return {
+    length: valueCount,
+    fields: allValues.map((values, i) => {
+      return {
+        name: 'A-' + i,
+        type: i === 0 ? FieldType.time : FieldType.number,
+        config: {
+          interval: i === 0 ? step : null,
+        },
+        values: values,
+      };
+    }),
+  };
+}
+
+describe('nullInsertThreshold Transformer', () => {
+  test('should insert nulls at +threshold between adjacent > threshold: 1', () => {
+    const df = createDataFrame({
+      refId: 'A',
+      fields: [
+        { name: 'Time', type: FieldType.time, values: [1, 3, 10] },
+        { name: 'One', type: FieldType.number, config: { custom: { insertNulls: 1 } }, values: [4, 6, 8] },
+        { name: 'Two', type: FieldType.string, config: { custom: { insertNulls: 1 } }, values: ['a', 'b', 'c'] },
+      ],
+    });
+
+    const result = applyNullInsertThreshold({ frame: df });
+
+    expect(result.fields[0].values).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+    expect(result.fields[1].values).toEqual([4, null, 6, null, null, null, null, null, null, 8]);
+    expect(result.fields[2].values).toEqual(['a', null, 'b', null, null, null, null, null, null, 'c']);
+  });
+
+  test('should insert nulls at +threshold between adjacent > threshold: 2', () => {
+    const df = createDataFrame({
+      refId: 'A',
+      fields: [
+        { name: 'Time', type: FieldType.time, values: [5, 7, 11] },
+        { name: 'One', type: FieldType.number, config: { custom: { insertNulls: 2 } }, values: [4, 6, 8] },
+        { name: 'Two', type: FieldType.string, config: { custom: { insertNulls: 2 } }, values: ['a', 'b', 'c'] },
+      ],
+    });
+
+    const result = applyNullInsertThreshold({ frame: df });
+
+    expect(result.fields[0].values).toEqual([5, 7, 9, 11]);
+    expect(result.fields[1].values).toEqual([4, 6, null, 8]);
+    expect(result.fields[2].values).toEqual(['a', 'b', null, 'c']);
+  });
+
+  test('should insert nulls at +interval between adjacent > interval: 1', () => {
+    const df = createDataFrame({
+      refId: 'A',
+      fields: [
+        { name: 'Time', type: FieldType.time, config: { interval: 1 }, values: [1, 3, 10] },
+        { name: 'One', type: FieldType.number, values: [4, 6, 8] },
+        { name: 'Two', type: FieldType.string, values: ['a', 'b', 'c'] },
+      ],
+    });
+
+    const result = applyNullInsertThreshold({ frame: df });
+
+    expect(result.fields[0].values).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+    expect(result.fields[1].values).toEqual([4, null, 6, null, null, null, null, null, null, 8]);
+    expect(result.fields[2].values).toEqual(['a', null, 'b', null, null, null, null, null, null, 'c']);
+  });
+
+  test('should insert leading null at beginning +interval when timeRange.from.valueOf() exceeds threshold', () => {
+    const df = createDataFrame({
+      refId: 'A',
+      fields: [
+        { name: 'Time', type: FieldType.time, config: { interval: 1 }, values: [4, 6, 13] },
+        { name: 'One', type: FieldType.number, values: [4, 6, 8] },
+        { name: 'Two', type: FieldType.string, values: ['a', 'b', 'c'] },
+      ],
+    });
+
+    const result = applyNullInsertThreshold({
+      frame: df,
+      refFieldName: null,
+      refFieldPseudoMin: -0.5,
+      refFieldPseudoMax: 13,
+    });
+
+    expect(result.fields[0].values).toEqual([-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]);
+    expect(result.fields[1].values).toEqual([
+      null,
+      null,
+      null,
+      null,
+      null,
+      4,
+      null,
+      6,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      8,
+    ]);
+    expect(result.fields[2].values).toEqual([
+      null,
+      null,
+      null,
+      null,
+      null,
+      'a',
+      null,
+      'b',
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      'c',
+    ]);
+  });
+
+  // this tests that intervals at 24hr but starting not at 12am UTC are not always snapped to 12am UTC
+  test('should insert leading null at beginning +interval when timeRange.from.valueOf() exceeds threshold 11PM UTC', () => {
+    const df = createDataFrame({
+      refId: 'A',
+      fields: [
+        {
+          name: 'Time',
+          type: FieldType.time,
+          config: { interval: 86400000 },
+          values: [1679439600000, 1679526000000, 1679612400000, 1679698800000, 1679785200000],
+        },
+        { name: 'One', type: FieldType.number, values: [0, 1, 2, 3, 4] },
+      ],
+    });
+
+    const result = applyNullInsertThreshold({
+      frame: df,
+      refFieldName: null,
+      refFieldPseudoMin: 1679320395828,
+      refFieldPseudoMax: 1679815217157,
+    });
+
+    expect(result.fields[0].values).toEqual([
+      1679266800000, 1679353200000, 1679439600000, 1679526000000, 1679612400000, 1679698800000, 1679785200000,
+    ]);
+    expect(result.fields[1].values).toEqual([null, null, 0, 1, 2, 3, 4]);
+  });
+
+  test('should insert trailing null at end +interval when timeRange.to.valueOf() exceeds threshold', () => {
+    const df = createDataFrame({
+      refId: 'A',
+      fields: [
+        { name: 'Time', type: FieldType.time, config: { interval: 1 }, values: [1, 3, 10] },
+        { name: 'One', type: FieldType.number, values: [4, 6, 8] },
+        { name: 'Two', type: FieldType.string, values: ['a', 'b', 'c'] },
+      ],
+    });
+
+    const result = applyNullInsertThreshold({ frame: df, refFieldName: null, refFieldPseudoMax: 13 });
+
+    expect(result.fields[0].values).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]);
+    expect(result.fields[1].values).toEqual([4, null, 6, null, null, null, null, null, null, 8, null, null]);
+    expect(result.fields[2].values).toEqual(['a', null, 'b', null, null, null, null, null, null, 'c', null, null]);
+
+    // should work for frames with 1 datapoint
+    const df2 = createDataFrame({
+      refId: 'A',
+      fields: [
+        { name: 'Time', type: FieldType.time, config: { interval: 1 }, values: [1] },
+        { name: 'One', type: FieldType.number, values: [1] },
+        { name: 'Two', type: FieldType.string, values: ['a'] },
+      ],
+    });
+
+    // Max is 2.5 as opposed to the above 13 otherwise
+    // we get 12 nulls instead of the additional 1
+    const result2 = applyNullInsertThreshold({ frame: df2, refFieldName: null, refFieldPseudoMax: 2.5 });
+
+    expect(result2.fields[0].values).toEqual([1, 2]);
+    expect(result2.fields[1].values).toEqual([1, null]);
+    expect(result2.fields[2].values).toEqual(['a', null]);
+  });
+
+  test('should not insert trailing null at end +interval when timeRange.to.valueOf() equals threshold', () => {
+    const df = createDataFrame({
+      refId: 'A',
+      fields: [
+        { name: 'Time', type: FieldType.time, config: { interval: 1 }, values: [1] },
+        { name: 'One', type: FieldType.number, values: [1] },
+        { name: 'Two', type: FieldType.string, values: ['a'] },
+      ],
+    });
+
+    const result = applyNullInsertThreshold({ frame: df, refFieldName: null, refFieldPseudoMax: 2 });
+
+    expect(result.fields[0].values).toEqual([1]);
+    expect(result.fields[1].values).toEqual([1]);
+    expect(result.fields[2].values).toEqual(['a']);
+  });
+
+  // TODO: make this work
+  test.skip('should insert nulls at +threshold (when defined) instead of +interval', () => {
+    const df = createDataFrame({
+      refId: 'A',
+      fields: [
+        { name: 'Time', type: FieldType.time, config: { interval: 2 }, values: [5, 7, 11] },
+        { name: 'One', type: FieldType.number, config: { custom: { insertNulls: 1 } }, values: [4, 6, 8] },
+        { name: 'Two', type: FieldType.string, config: { custom: { insertNulls: 1 } }, values: ['a', 'b', 'c'] },
+      ],
+    });
+
+    const result = applyNullInsertThreshold({ frame: df });
+
+    expect(result.fields[0].values).toEqual([5, 6, 7, 8, 11]);
+    expect(result.fields[1].values).toEqual([4, null, 6, null, 8]);
+    expect(result.fields[2].values).toEqual(['a', null, 'b', null, 'c']);
+  });
+
+  test('should noop on 0 datapoints', () => {
+    const df = createDataFrame({
+      refId: 'A',
+      fields: [
+        { name: 'Time', type: FieldType.time, config: { interval: 1 }, values: [] },
+        { name: 'Value', type: FieldType.number, values: [] },
+      ],
+    });
+
+    const result = applyNullInsertThreshold({ frame: df });
+
+    expect(result).toBe(df);
+  });
+
+  test('should noop on invalid threshold', () => {
+    const df = createDataFrame({
+      refId: 'A',
+      fields: [
+        { name: 'Time', type: FieldType.time, values: [1, 2, 4] },
+        { name: 'Value', type: FieldType.number, config: { custom: { insertNulls: -1 } }, values: [1, 1, 1] },
+      ],
+    });
+
+    const result = applyNullInsertThreshold({ frame: df });
+
+    expect(result).toBe(df);
+  });
+
+  test('should noop on invalid interval', () => {
+    const df = createDataFrame({
+      refId: 'A',
+      fields: [
+        { name: 'Time', type: FieldType.time, config: { interval: -1 }, values: [1, 2, 4] },
+        { name: 'Value', type: FieldType.number, values: [1, 1, 1] },
+      ],
+    });
+
+    const result = applyNullInsertThreshold({ frame: df });
+
+    expect(result).toBe(df);
+  });
+
+  test('should noop when no missing steps', () => {
+    const df = createDataFrame({
+      refId: 'A',
+      fields: [
+        { name: 'Time', type: FieldType.time, config: { interval: 1 }, values: [1, 2, 3] },
+        { name: 'Value', type: FieldType.number, values: [1, 1, 1] },
+      ],
+    });
+
+    const result = applyNullInsertThreshold({ frame: df });
+
+    expect(result).toBe(df);
+  });
+
+  test('should noop when refFieldName not found', () => {
+    const df = createDataFrame({
+      refId: 'A',
+      fields: [
+        { name: 'Time', type: FieldType.time, config: { interval: 1 }, values: [1, 2, 5] },
+        { name: 'Value', type: FieldType.number, values: [1, 1, 1] },
+      ],
+    });
+
+    const result = applyNullInsertThreshold({ frame: df, refFieldName: 'Time2' });
+
+    expect(result).toBe(df);
+  });
+
+  // Leave this test skipped - it should be run manually
+  test.skip('perf stress test should be <= 10ms', () => {
+    // 10 fields x 3,000 values with 50% skip (output = 10 fields x 6,000 values)
+    let bigFrameA = genFrame();
+
+    // eslint-disable-next-line no-console
+    console.time('insertValues-10x3k');
+    applyNullInsertThreshold({ frame: bigFrameA });
+    // eslint-disable-next-line no-console
+    console.timeEnd('insertValues-10x3k');
+  });
+});
diff --git a/packages/grafana-ui/src/graveyard/GraphNG/nullInsertThreshold.ts b/packages/grafana-ui/src/graveyard/GraphNG/nullInsertThreshold.ts
new file mode 100644
index 0000000000000..9361a6bab8dcc
--- /dev/null
+++ b/packages/grafana-ui/src/graveyard/GraphNG/nullInsertThreshold.ts
@@ -0,0 +1,181 @@
+import { DataFrame } from '@grafana/data';
+
+import { getRefField } from './utils';
+
+type InsertMode = (prev: number, next: number, threshold: number) => number;
+
+const INSERT_MODES = {
+  threshold: (prev: number, next: number, threshold: number) => prev + threshold,
+  midpoint: (prev: number, next: number, threshold: number) => (prev + next) / 2,
+  // previous time + 1ms to prevent StateTimeline from forward-interpolating prior state
+  plusone: (prev: number, next: number, threshold: number) => prev + 1,
+};
+
+interface NullInsertOptions {
+  frame: DataFrame;
+  refFieldName?: string | null;
+  refFieldPseudoMax?: number;
+  refFieldPseudoMin?: number;
+  insertMode?: InsertMode;
+}
+
+/** @deprecated */
+export function applyNullInsertThreshold(opts: NullInsertOptions): DataFrame {
+  if (opts.frame.length === 0) {
+    return opts.frame;
+  }
+
+  let thorough = true;
+  let { frame, refFieldName, refFieldPseudoMax, refFieldPseudoMin, insertMode } = opts;
+
+  if (!insertMode) {
+    insertMode = INSERT_MODES.threshold;
+  }
+
+  const refField = getRefField(frame, refFieldName);
+
+  if (refField == null) {
+    return frame;
+  }
+
+  refField.state = {
+    ...refField.state,
+    nullThresholdApplied: true,
+  };
+
+  const thresholds = frame.fields.map((field) => field.config.custom?.insertNulls || refField.config.interval || null);
+
+  const uniqueThresholds = new Set<number>(thresholds);
+
+  uniqueThresholds.delete(null as any);
+
+  if (uniqueThresholds.size === 0) {
+    return frame;
+  }
+
+  if (uniqueThresholds.size === 1) {
+    const threshold = uniqueThresholds.values().next().value;
+
+    if (threshold <= 0) {
+      return frame;
+    }
+
+    const refValues = refField.values;
+
+    const frameValues = frame.fields.map((field) => field.values);
+
+    const filledFieldValues = nullInsertThreshold(
+      refValues,
+      frameValues,
+      threshold,
+      refFieldPseudoMin,
+      refFieldPseudoMax,
+      insertMode,
+      thorough
+    );
+
+    if (filledFieldValues === frameValues) {
+      return frame;
+    }
+
+    return {
+      ...frame,
+      length: filledFieldValues[0].length,
+      fields: frame.fields.map((field, i) => ({
+        ...field,
+        values: filledFieldValues[i],
+      })),
+    };
+  }
+
+  // TODO: unique threshold-per-field (via overrides) is unimplemented
+  // should be done by processing each (refField + thresholdA-field1 + thresholdA-field2...)
+  // as a separate nullInsertThreshold() dataset, then re-join into single dataset via join()
+  return frame;
+}
+
+function nullInsertThreshold(
+  refValues: number[],
+  frameValues: any[][],
+  threshold: number,
+  refFieldPseudoMin: number | null = null,
+  // will insert a trailing null when refFieldPseudoMax > last datapoint + threshold
+  refFieldPseudoMax: number | null = null,
+  getInsertValue: InsertMode,
+  // will insert the value at every missing interval
+  thorough: boolean
+) {
+  const len = refValues.length;
+  const refValuesNew: number[] = [];
+
+  // Continuously subtract the threshold from the first data point, filling in insert values accordingly
+  if (refFieldPseudoMin != null && refFieldPseudoMin < refValues[0]) {
+    let preFillCount = Math.ceil((refValues[0] - refFieldPseudoMin) / threshold);
+    // this will be 0 or 1 threshold increment left of visible range
+    let prevSlot = refValues[0] - preFillCount * threshold;
+
+    while (prevSlot < refValues[0]) {
+      // (prevSlot - threshold) is used to simulate the previous 'real' data point, as getInsertValue expects
+      refValuesNew.push(getInsertValue(prevSlot - threshold, prevSlot, threshold));
+      prevSlot += threshold;
+    }
+  }
+
+  // Insert initial value
+  refValuesNew.push(refValues[0]);
+
+  let prevValue: number = refValues[0];
+
+  // Fill nulls when a value is greater than the threshold value
+  for (let i = 1; i < len; i++) {
+    const curValue = refValues[i];
+
+    while (curValue - prevValue > threshold) {
+      refValuesNew.push(getInsertValue(prevValue, curValue, threshold));
+
+      prevValue += threshold;
+
+      if (!thorough) {
+        break;
+      }
+    }
+
+    refValuesNew.push(curValue);
+
+    prevValue = curValue;
+  }
+
+  // At the end of the sequence
+  if (refFieldPseudoMax != null && refFieldPseudoMax > prevValue) {
+    while (prevValue + threshold < refFieldPseudoMax) {
+      refValuesNew.push(getInsertValue(prevValue, refFieldPseudoMax, threshold));
+      prevValue += threshold;
+    }
+  }
+
+  const filledLen = refValuesNew.length;
+
+  if (filledLen === len) {
+    return frameValues;
+  }
+
+  const filledFieldValues: any[][] = [];
+
+  for (let fieldValues of frameValues) {
+    let filledValues;
+
+    if (fieldValues !== refValues) {
+      filledValues = Array(filledLen);
+
+      for (let i = 0, j = 0; i < filledLen; i++) {
+        filledValues[i] = refValues[j] === refValuesNew[i] ? fieldValues[j++] : null;
+      }
+    } else {
+      filledValues = refValuesNew;
+    }
+
+    filledFieldValues.push(filledValues);
+  }
+
+  return filledFieldValues;
+}
diff --git a/packages/grafana-ui/src/graveyard/GraphNG/nullToUndefThreshold.ts b/packages/grafana-ui/src/graveyard/GraphNG/nullToUndefThreshold.ts
new file mode 100644
index 0000000000000..bcc52e5e1b984
--- /dev/null
+++ b/packages/grafana-ui/src/graveyard/GraphNG/nullToUndefThreshold.ts
@@ -0,0 +1,33 @@
+/**
+ * mutates all nulls -> undefineds in the fieldValues array for value-less refValues ranges below maxThreshold
+ * refValues is typically a time array and maxThreshold is the allowable distance between in time
+ * @deprecated
+ */
+export function nullToUndefThreshold(refValues: number[], fieldValues: any[], maxThreshold: number): any[] {
+  let prevRef;
+  let nullIdx;
+
+  for (let i = 0; i < fieldValues.length; i++) {
+    let fieldVal = fieldValues[i];
+
+    if (fieldVal == null) {
+      if (nullIdx == null && prevRef != null) {
+        nullIdx = i;
+      }
+    } else {
+      if (nullIdx != null) {
+        if (refValues[i] - (prevRef as number) < maxThreshold) {
+          while (nullIdx < i) {
+            fieldValues[nullIdx++] = undefined;
+          }
+        }
+
+        nullIdx = null;
+      }
+
+      prevRef = refValues[i];
+    }
+  }
+
+  return fieldValues;
+}
diff --git a/packages/grafana-ui/src/graveyard/GraphNG/nullToValue.test.ts b/packages/grafana-ui/src/graveyard/GraphNG/nullToValue.test.ts
new file mode 100644
index 0000000000000..e14f64e17109c
--- /dev/null
+++ b/packages/grafana-ui/src/graveyard/GraphNG/nullToValue.test.ts
@@ -0,0 +1,94 @@
+import { FieldType, createDataFrame } from '@grafana/data';
+
+import { applyNullInsertThreshold } from './nullInsertThreshold';
+import { nullToValue } from './nullToValue';
+
+describe('nullToValue Transformer', () => {
+  test('should change all nulls to configured zero value', () => {
+    const df = createDataFrame({
+      refId: 'A',
+      fields: [
+        { name: 'Time', type: FieldType.time, values: [1, 3, 10] },
+        {
+          name: 'One',
+          type: FieldType.number,
+          config: { custom: { insertNulls: 1 }, noValue: '0' },
+          values: [4, 6, 8],
+        },
+        {
+          name: 'Two',
+          type: FieldType.string,
+          config: { custom: { insertNulls: 1 }, noValue: '0' },
+          values: ['a', 'b', 'c'],
+        },
+      ],
+    });
+
+    const result = nullToValue(applyNullInsertThreshold({ frame: df }));
+
+    expect(result.fields[0].values).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+    expect(result.fields[1].values).toEqual([4, 0, 6, 0, 0, 0, 0, 0, 0, 8]);
+    expect(result.fields[2].values).toEqual(['a', 0, 'b', 0, 0, 0, 0, 0, 0, 'c']);
+  });
+
+  test('should change all nulls to configured positive value', () => {
+    const df = createDataFrame({
+      refId: 'A',
+      fields: [
+        { name: 'Time', type: FieldType.time, values: [5, 7, 11] },
+        {
+          name: 'One',
+          type: FieldType.number,
+          config: { custom: { insertNulls: 2 }, noValue: '1' },
+          values: [4, 6, 8],
+        },
+        {
+          name: 'Two',
+          type: FieldType.string,
+          config: { custom: { insertNulls: 2 }, noValue: '1' },
+          values: ['a', 'b', 'c'],
+        },
+      ],
+    });
+
+    const result = nullToValue(applyNullInsertThreshold({ frame: df }));
+
+    expect(result.fields[0].values).toEqual([5, 7, 9, 11]);
+    expect(result.fields[1].values).toEqual([4, 6, 1, 8]);
+    expect(result.fields[2].values).toEqual(['a', 'b', 1, 'c']);
+  });
+
+  test('should change all nulls to configured negative value', () => {
+    const df = createDataFrame({
+      refId: 'A',
+      fields: [
+        { name: 'Time', type: FieldType.time, config: { interval: 1 }, values: [1, 3, 10] },
+        { name: 'One', type: FieldType.number, config: { noValue: '-1' }, values: [4, 6, 8] },
+        { name: 'Two', type: FieldType.string, config: { noValue: '-1' }, values: ['a', 'b', 'c'] },
+      ],
+    });
+
+    const result = nullToValue(applyNullInsertThreshold({ frame: df }));
+
+    expect(result.fields[0].values).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+    expect(result.fields[1].values).toEqual([4, -1, 6, -1, -1, -1, -1, -1, -1, 8]);
+    expect(result.fields[2].values).toEqual(['a', -1, 'b', -1, -1, -1, -1, -1, -1, 'c']);
+  });
+
+  test('should have no effect without nulls', () => {
+    const df = createDataFrame({
+      refId: 'A',
+      fields: [
+        { name: 'Time', type: FieldType.time, config: { interval: 1 }, values: [1, 2, 3] },
+        { name: 'One', type: FieldType.number, values: [4, 6, 8] },
+        { name: 'Two', type: FieldType.string, values: ['a', 'b', 'c'] },
+      ],
+    });
+
+    const result = nullToValue(applyNullInsertThreshold({ frame: df, refFieldName: null }));
+
+    expect(result.fields[0].values).toEqual([1, 2, 3]);
+    expect(result.fields[1].values).toEqual([4, 6, 8]);
+    expect(result.fields[2].values).toEqual(['a', 'b', 'c']);
+  });
+});
diff --git a/packages/grafana-ui/src/graveyard/GraphNG/nullToValue.ts b/packages/grafana-ui/src/graveyard/GraphNG/nullToValue.ts
new file mode 100644
index 0000000000000..7ad8e3705aaf9
--- /dev/null
+++ b/packages/grafana-ui/src/graveyard/GraphNG/nullToValue.ts
@@ -0,0 +1,28 @@
+import { DataFrame } from '@grafana/data';
+
+/** @deprecated */
+export function nullToValue(frame: DataFrame) {
+  return {
+    ...frame,
+    fields: frame.fields.map((field) => {
+      const noValue = +field.config?.noValue!;
+
+      if (!Number.isNaN(noValue)) {
+        const transformedVals = field.values.slice();
+
+        for (let i = 0; i < transformedVals.length; i++) {
+          if (transformedVals[i] === null) {
+            transformedVals[i] = noValue;
+          }
+        }
+
+        return {
+          ...field,
+          values: transformedVals,
+        };
+      } else {
+        return field;
+      }
+    }),
+  };
+}
diff --git a/packages/grafana-ui/src/graveyard/GraphNG/types.ts b/packages/grafana-ui/src/graveyard/GraphNG/types.ts
new file mode 100644
index 0000000000000..91dd83fb5a8fd
--- /dev/null
+++ b/packages/grafana-ui/src/graveyard/GraphNG/types.ts
@@ -0,0 +1,18 @@
+import { DataFrameFieldIndex, FieldMatcher } from '@grafana/data';
+
+import { SeriesVisibilityChangeMode } from '../../components/PanelChrome';
+
+/**
+ * Event being triggered when the user interact with the Graph legend.
+ * @deprecated
+ */
+export interface GraphNGLegendEvent {
+  fieldIndex: DataFrameFieldIndex;
+  mode: SeriesVisibilityChangeMode;
+}
+
+/** @deprecated */
+export interface XYFieldMatchers {
+  x: FieldMatcher; // first match
+  y: FieldMatcher;
+}
diff --git a/packages/grafana-ui/src/graveyard/GraphNG/utils.test.ts b/packages/grafana-ui/src/graveyard/GraphNG/utils.test.ts
new file mode 100644
index 0000000000000..23775b1df23dd
--- /dev/null
+++ b/packages/grafana-ui/src/graveyard/GraphNG/utils.test.ts
@@ -0,0 +1,521 @@
+import {
+  createTheme,
+  DashboardCursorSync,
+  DataFrame,
+  DefaultTimeZone,
+  // EventBusSrv,
+  FieldColorModeId,
+  FieldConfig,
+  FieldMatcherID,
+  fieldMatchers,
+  FieldType,
+  getDefaultTimeRange,
+  MutableDataFrame,
+} from '@grafana/data';
+import {
+  BarAlignment,
+  GraphDrawStyle,
+  GraphFieldConfig,
+  GraphGradientMode,
+  LineInterpolation,
+  VisibilityMode,
+  StackingMode,
+} from '@grafana/schema';
+
+import { preparePlotConfigBuilder } from '../TimeSeries/utils';
+
+import { preparePlotFrame } from './utils';
+
+function mockDataFrame() {
+  const df1 = new MutableDataFrame({
+    refId: 'A',
+    fields: [{ name: 'ts', type: FieldType.time, values: [1, 2, 3] }],
+  });
+  const df2 = new MutableDataFrame({
+    refId: 'B',
+    fields: [{ name: 'ts', type: FieldType.time, values: [1, 2, 4] }],
+  });
+
+  const f1Config: FieldConfig<GraphFieldConfig> = {
+    displayName: 'Metric 1',
+    color: {
+      mode: FieldColorModeId.Fixed,
+    },
+    decimals: 2,
+    custom: {
+      drawStyle: GraphDrawStyle.Line,
+      gradientMode: GraphGradientMode.Opacity,
+      lineColor: '#ff0000',
+      lineWidth: 2,
+      lineInterpolation: LineInterpolation.Linear,
+      lineStyle: {
+        fill: 'dash',
+        dash: [1, 2],
+      },
+      spanNulls: false,
+      fillColor: '#ff0000',
+      fillOpacity: 0.1,
+      showPoints: VisibilityMode.Always,
+      stacking: {
+        group: 'A',
+        mode: StackingMode.Normal,
+      },
+    },
+  };
+
+  const f2Config: FieldConfig<GraphFieldConfig> = {
+    displayName: 'Metric 2',
+    color: {
+      mode: FieldColorModeId.Fixed,
+    },
+    decimals: 2,
+    custom: {
+      drawStyle: GraphDrawStyle.Bars,
+      gradientMode: GraphGradientMode.Hue,
+      lineColor: '#ff0000',
+      lineWidth: 2,
+      lineInterpolation: LineInterpolation.Linear,
+      lineStyle: {
+        fill: 'dash',
+        dash: [1, 2],
+      },
+      barAlignment: BarAlignment.Before,
+      fillColor: '#ff0000',
+      fillOpacity: 0.1,
+      showPoints: VisibilityMode.Always,
+      stacking: {
+        group: 'A',
+        mode: StackingMode.Normal,
+      },
+    },
+  };
+
+  const f3Config: FieldConfig<GraphFieldConfig> = {
+    displayName: 'Metric 3',
+    decimals: 2,
+    color: {
+      mode: FieldColorModeId.Fixed,
+    },
+    custom: {
+      drawStyle: GraphDrawStyle.Line,
+      gradientMode: GraphGradientMode.Opacity,
+      lineColor: '#ff0000',
+      lineWidth: 2,
+      lineInterpolation: LineInterpolation.Linear,
+      lineStyle: {
+        fill: 'dash',
+        dash: [1, 2],
+      },
+      spanNulls: false,
+      fillColor: '#ff0000',
+      fillOpacity: 0.1,
+      showPoints: VisibilityMode.Always,
+      stacking: {
+        group: 'B',
+        mode: StackingMode.Normal,
+      },
+    },
+  };
+  const f4Config: FieldConfig<GraphFieldConfig> = {
+    displayName: 'Metric 4',
+    decimals: 2,
+    color: {
+      mode: FieldColorModeId.Fixed,
+    },
+    custom: {
+      drawStyle: GraphDrawStyle.Bars,
+      gradientMode: GraphGradientMode.Hue,
+      lineColor: '#ff0000',
+      lineWidth: 2,
+      lineInterpolation: LineInterpolation.Linear,
+      lineStyle: {
+        fill: 'dash',
+        dash: [1, 2],
+      },
+      barAlignment: BarAlignment.Before,
+      fillColor: '#ff0000',
+      fillOpacity: 0.1,
+      showPoints: VisibilityMode.Always,
+      stacking: {
+        group: 'B',
+        mode: StackingMode.Normal,
+      },
+    },
+  };
+  const f5Config: FieldConfig<GraphFieldConfig> = {
+    displayName: 'Metric 4',
+    decimals: 2,
+    color: {
+      mode: FieldColorModeId.Fixed,
+    },
+    custom: {
+      drawStyle: GraphDrawStyle.Bars,
+      gradientMode: GraphGradientMode.Hue,
+      lineColor: '#ff0000',
+      lineWidth: 2,
+      lineInterpolation: LineInterpolation.Linear,
+      lineStyle: {
+        fill: 'dash',
+        dash: [1, 2],
+      },
+      barAlignment: BarAlignment.Before,
+      fillColor: '#ff0000',
+      fillOpacity: 0.1,
+      showPoints: VisibilityMode.Always,
+      stacking: {
+        group: 'B',
+        mode: StackingMode.None,
+      },
+    },
+  };
+
+  df1.addField({
+    name: 'metric1',
+    type: FieldType.number,
+    config: f1Config,
+  });
+
+  df2.addField({
+    name: 'metric2',
+    type: FieldType.number,
+    config: f2Config,
+  });
+  df2.addField({
+    name: 'metric3',
+    type: FieldType.number,
+    config: f3Config,
+  });
+  df2.addField({
+    name: 'metric4',
+    type: FieldType.number,
+    config: f4Config,
+  });
+  df2.addField({
+    name: 'metric5',
+    type: FieldType.number,
+    config: f5Config,
+  });
+
+  return preparePlotFrame([df1, df2], {
+    x: fieldMatchers.get(FieldMatcherID.firstTimeField).get({}),
+    y: fieldMatchers.get(FieldMatcherID.numeric).get({}),
+  });
+}
+
+jest.mock('@grafana/data', () => ({
+  ...jest.requireActual('@grafana/data'),
+  DefaultTimeZone: 'utc',
+}));
+
+describe('GraphNG utils', () => {
+  test('preparePlotConfigBuilder', () => {
+    const frame = mockDataFrame();
+    const result = preparePlotConfigBuilder({
+      frame: frame!,
+      theme: createTheme(),
+      timeZones: [DefaultTimeZone],
+      getTimeRange: getDefaultTimeRange,
+      sync: () => DashboardCursorSync.Tooltip,
+      allFrames: [frame!],
+    }).getConfig();
+    expect(result).toMatchSnapshot();
+  });
+
+  test('preparePlotFrame appends min bar spaced nulls when > 1 bar series', () => {
+    const df1: DataFrame = {
+      name: 'A',
+      length: 5,
+      fields: [
+        {
+          name: 'time',
+          type: FieldType.time,
+          config: {},
+          values: [1, 2, 4, 6, 100], // should find smallest delta === 1 from here
+        },
+        {
+          name: 'value',
+          type: FieldType.number,
+          config: {
+            custom: {
+              drawStyle: GraphDrawStyle.Bars,
+            },
+          },
+          values: [1, 1, 1, 1, 1],
+        },
+      ],
+    };
+
+    const df2: DataFrame = {
+      name: 'B',
+      length: 5,
+      fields: [
+        {
+          name: 'time',
+          type: FieldType.time,
+          config: {},
+          values: [30, 40, 50, 90, 100], // should be appended with two smallest-delta increments
+        },
+        {
+          name: 'value',
+          type: FieldType.number,
+          config: {
+            custom: {
+              drawStyle: GraphDrawStyle.Bars,
+            },
+          },
+          values: [2, 2, 2, 2, 2], // bar series should be appended with nulls
+        },
+        {
+          name: 'value',
+          type: FieldType.number,
+          config: {
+            custom: {
+              drawStyle: GraphDrawStyle.Line,
+            },
+          },
+          values: [3, 3, 3, 3, 3], // line series should be appended with undefineds
+        },
+      ],
+    };
+
+    const df3: DataFrame = {
+      name: 'C',
+      length: 2,
+      fields: [
+        {
+          name: 'time',
+          type: FieldType.time,
+          config: {},
+          values: [1, 1.1], // should not trip up on smaller deltas of non-bars
+        },
+        {
+          name: 'value',
+          type: FieldType.number,
+          config: {
+            custom: {
+              drawStyle: GraphDrawStyle.Line,
+            },
+          },
+          values: [4, 4],
+        },
+        {
+          name: 'value',
+          type: FieldType.number,
+          config: {
+            custom: {
+              drawStyle: GraphDrawStyle.Bars,
+              hideFrom: {
+                viz: true, // should ignore hidden bar series
+              },
+            },
+          },
+          values: [4, 4],
+        },
+      ],
+    };
+
+    let aligndFrame = preparePlotFrame([df1, df2, df3], {
+      x: fieldMatchers.get(FieldMatcherID.firstTimeField).get({}),
+      y: fieldMatchers.get(FieldMatcherID.numeric).get({}),
+    });
+
+    expect(aligndFrame).toMatchInlineSnapshot(`
+      {
+        "fields": [
+          {
+            "config": {},
+            "name": "time",
+            "state": {
+              "nullThresholdApplied": true,
+              "origin": {
+                "fieldIndex": 0,
+                "frameIndex": 0,
+              },
+            },
+            "type": "time",
+            "values": [
+              1,
+              1.1,
+              2,
+              4,
+              6,
+              30,
+              40,
+              50,
+              90,
+              100,
+              101,
+              102,
+            ],
+          },
+          {
+            "config": {
+              "custom": {
+                "drawStyle": "bars",
+                "spanNulls": -1,
+              },
+            },
+            "labels": {
+              "name": "A",
+            },
+            "name": "value",
+            "state": {
+              "origin": {
+                "fieldIndex": 1,
+                "frameIndex": 0,
+              },
+            },
+            "type": "number",
+            "values": [
+              1,
+              undefined,
+              1,
+              1,
+              1,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              1,
+              null,
+              null,
+            ],
+          },
+          {
+            "config": {
+              "custom": {
+                "drawStyle": "bars",
+                "spanNulls": -1,
+              },
+            },
+            "labels": {
+              "name": "B",
+            },
+            "name": "value",
+            "state": {
+              "origin": {
+                "fieldIndex": 1,
+                "frameIndex": 1,
+              },
+            },
+            "type": "number",
+            "values": [
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              2,
+              2,
+              2,
+              2,
+              2,
+              null,
+              null,
+            ],
+          },
+          {
+            "config": {
+              "custom": {
+                "drawStyle": "line",
+              },
+            },
+            "labels": {
+              "name": "B",
+            },
+            "name": "value",
+            "state": {
+              "origin": {
+                "fieldIndex": 2,
+                "frameIndex": 1,
+              },
+            },
+            "type": "number",
+            "values": [
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              3,
+              3,
+              3,
+              3,
+              3,
+              undefined,
+              undefined,
+            ],
+          },
+          {
+            "config": {
+              "custom": {
+                "drawStyle": "line",
+              },
+            },
+            "labels": {
+              "name": "C",
+            },
+            "name": "value",
+            "state": {
+              "origin": {
+                "fieldIndex": 1,
+                "frameIndex": 2,
+              },
+            },
+            "type": "number",
+            "values": [
+              4,
+              4,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+            ],
+          },
+          {
+            "config": {
+              "custom": {
+                "drawStyle": "bars",
+                "hideFrom": {
+                  "viz": true,
+                },
+              },
+            },
+            "labels": {
+              "name": "C",
+            },
+            "name": "value",
+            "state": {
+              "origin": {
+                "fieldIndex": 2,
+                "frameIndex": 2,
+              },
+            },
+            "type": "number",
+            "values": [
+              4,
+              4,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+            ],
+          },
+        ],
+        "length": 12,
+      }
+    `);
+  });
+});
diff --git a/packages/grafana-ui/src/graveyard/GraphNG/utils.ts b/packages/grafana-ui/src/graveyard/GraphNG/utils.ts
new file mode 100644
index 0000000000000..742031446acd3
--- /dev/null
+++ b/packages/grafana-ui/src/graveyard/GraphNG/utils.ts
@@ -0,0 +1,181 @@
+import { DataFrame, Field, FieldConfig, FieldType, outerJoinDataFrames, TimeRange } from '@grafana/data';
+import {
+  AxisPlacement,
+  GraphDrawStyle,
+  GraphFieldConfig,
+  ScaleDistribution,
+  ScaleDistributionConfig,
+} from '@grafana/schema';
+
+import { FIXED_UNIT } from '../../components/uPlot/types';
+
+import { applyNullInsertThreshold } from './nullInsertThreshold';
+import { nullToUndefThreshold } from './nullToUndefThreshold';
+import { XYFieldMatchers } from './types';
+
+function isVisibleBarField(f: Field) {
+  return (
+    f.type === FieldType.number && f.config.custom?.drawStyle === GraphDrawStyle.Bars && !f.config.custom?.hideFrom?.viz
+  );
+}
+
+export function getRefField(frame: DataFrame, refFieldName?: string | null) {
+  return frame.fields.find((field) => {
+    // note: getFieldDisplayName() would require full DF[]
+    return refFieldName != null ? field.name === refFieldName : field.type === FieldType.time;
+  });
+}
+
+// will mutate the DataFrame's fields' values
+function applySpanNullsThresholds(frame: DataFrame, refFieldName?: string | null) {
+  const refField = getRefField(frame, refFieldName);
+
+  let refValues = refField?.values;
+
+  for (let i = 0; i < frame.fields.length; i++) {
+    let field = frame.fields[i];
+
+    if (field === refField || isVisibleBarField(field)) {
+      continue;
+    }
+
+    let spanNulls = field.config.custom?.spanNulls;
+
+    if (typeof spanNulls === 'number') {
+      if (spanNulls !== -1 && refValues) {
+        field.values = nullToUndefThreshold(refValues, field.values, spanNulls);
+      }
+    }
+  }
+
+  return frame;
+}
+
+export function preparePlotFrame(frames: DataFrame[], dimFields: XYFieldMatchers, timeRange?: TimeRange | null) {
+  let xField: Field;
+  loop: for (let frame of frames) {
+    for (let field of frame.fields) {
+      if (dimFields.x(field, frame, frames)) {
+        xField = field;
+        break loop;
+      }
+    }
+  }
+
+  // apply null insertions at interval
+  frames = frames.map((frame) => {
+    if (!xField?.state?.nullThresholdApplied) {
+      return applyNullInsertThreshold({
+        frame,
+        refFieldName: xField.name,
+        refFieldPseudoMin: timeRange?.from.valueOf(),
+        refFieldPseudoMax: timeRange?.to.valueOf(),
+      });
+    } else {
+      return frame;
+    }
+  });
+
+  let numBarSeries = 0;
+
+  frames.forEach((frame) => {
+    frame.fields.forEach((f) => {
+      if (isVisibleBarField(f)) {
+        // prevent minesweeper-expansion of nulls (gaps) when joining bars
+        // since bar width is determined from the minimum distance between non-undefined values
+        // (this strategy will still retain any original pre-join nulls, though)
+        f.config.custom = {
+          ...f.config.custom,
+          spanNulls: -1,
+        };
+
+        numBarSeries++;
+      }
+    });
+  });
+
+  // to make bar widths of all series uniform (equal to narrowest bar series), find smallest distance between x points
+  let minXDelta = Infinity;
+
+  if (numBarSeries > 1) {
+    frames.forEach((frame) => {
+      if (!frame.fields.some(isVisibleBarField)) {
+        return;
+      }
+
+      const xVals = xField.values;
+
+      for (let i = 0; i < xVals.length; i++) {
+        if (i > 0) {
+          minXDelta = Math.min(minXDelta, xVals[i] - xVals[i - 1]);
+        }
+      }
+    });
+  }
+
+  let alignedFrame = outerJoinDataFrames({
+    frames,
+    joinBy: dimFields.x,
+    keep: dimFields.y,
+    keepOriginIndices: true,
+  });
+
+  if (alignedFrame) {
+    alignedFrame = applySpanNullsThresholds(alignedFrame, xField!.name);
+
+    // append 2 null vals at minXDelta to bar series
+    if (minXDelta !== Infinity) {
+      alignedFrame.fields.forEach((f, fi) => {
+        let vals = f.values;
+
+        if (fi === 0) {
+          let lastVal = vals[vals.length - 1];
+          vals.push(lastVal + minXDelta, lastVal + 2 * minXDelta);
+        } else if (isVisibleBarField(f)) {
+          vals.push(null, null);
+        } else {
+          vals.push(undefined, undefined);
+        }
+      });
+
+      alignedFrame.length += 2;
+    }
+
+    return alignedFrame;
+  }
+
+  return null;
+}
+
+export function buildScaleKey(config: FieldConfig<GraphFieldConfig>, fieldType: FieldType) {
+  const defaultPart = 'na';
+
+  const scaleRange = `${config.min !== undefined ? config.min : defaultPart}-${
+    config.max !== undefined ? config.max : defaultPart
+  }`;
+
+  const scaleSoftRange = `${config.custom?.axisSoftMin !== undefined ? config.custom.axisSoftMin : defaultPart}-${
+    config.custom?.axisSoftMax !== undefined ? config.custom.axisSoftMax : defaultPart
+  }`;
+
+  const scalePlacement = `${
+    config.custom?.axisPlacement !== undefined ? config.custom?.axisPlacement : AxisPlacement.Auto
+  }`;
+
+  const scaleUnit = config.unit ?? FIXED_UNIT;
+
+  const scaleDistribution = config.custom?.scaleDistribution
+    ? getScaleDistributionPart(config.custom.scaleDistribution)
+    : ScaleDistribution.Linear;
+
+  const scaleLabel = Boolean(config.custom?.axisLabel) ? config.custom!.axisLabel : defaultPart;
+
+  return `${scaleUnit}/${scaleRange}/${scaleSoftRange}/${scalePlacement}/${scaleDistribution}/${scaleLabel}/${fieldType}`;
+}
+
+function getScaleDistributionPart(config: ScaleDistributionConfig) {
+  if (config.type === ScaleDistribution.Log) {
+    return `${config.type}${config.log}`;
+  }
+  return config.type;
+}
diff --git a/packages/grafana-ui/src/graveyard/README.md b/packages/grafana-ui/src/graveyard/README.md
new file mode 100644
index 0000000000000..2715ecec38a5e
--- /dev/null
+++ b/packages/grafana-ui/src/graveyard/README.md
@@ -0,0 +1 @@
+Items in this folder are all deprecated and will be removed in the future
diff --git a/packages/grafana-ui/src/graveyard/TimeSeries/TimeSeries.tsx b/packages/grafana-ui/src/graveyard/TimeSeries/TimeSeries.tsx
new file mode 100644
index 0000000000000..9ee08192383aa
--- /dev/null
+++ b/packages/grafana-ui/src/graveyard/TimeSeries/TimeSeries.tsx
@@ -0,0 +1,62 @@
+import React, { Component } from 'react';
+
+import { DataFrame, TimeRange } from '@grafana/data';
+
+import { PanelContextRoot } from '../../components/PanelChrome/PanelContext';
+import { hasVisibleLegendSeries, PlotLegend } from '../../components/uPlot/PlotLegend';
+import { UPlotConfigBuilder } from '../../components/uPlot/config/UPlotConfigBuilder';
+import { withTheme2 } from '../../themes/ThemeContext';
+import { GraphNG, GraphNGProps, PropDiffFn } from '../GraphNG/GraphNG';
+
+import { preparePlotConfigBuilder } from './utils';
+
+const propsToDiff: Array<string | PropDiffFn> = ['legend', 'options', 'theme'];
+
+type TimeSeriesProps = Omit<GraphNGProps, 'prepConfig' | 'propsToDiff' | 'renderLegend'>;
+
+export class UnthemedTimeSeries extends Component<TimeSeriesProps> {
+  static contextType = PanelContextRoot;
+  declare context: React.ContextType<typeof PanelContextRoot>;
+
+  prepConfig = (alignedFrame: DataFrame, allFrames: DataFrame[], getTimeRange: () => TimeRange) => {
+    const { eventsScope, sync } = this.context;
+    const { theme, timeZone, renderers, tweakAxis, tweakScale } = this.props;
+
+    return preparePlotConfigBuilder({
+      frame: alignedFrame,
+      theme,
+      timeZones: Array.isArray(timeZone) ? timeZone : [timeZone],
+      getTimeRange,
+      sync,
+      allFrames,
+      renderers,
+      tweakScale,
+      tweakAxis,
+      eventsScope,
+    });
+  };
+
+  renderLegend = (config: UPlotConfigBuilder) => {
+    const { legend, frames } = this.props;
+
+    if (!config || (legend && !legend.showLegend) || !hasVisibleLegendSeries(config, frames)) {
+      return null;
+    }
+
+    return <PlotLegend data={frames} config={config} {...legend} />;
+  };
+
+  render() {
+    return (
+      <GraphNG
+        {...this.props}
+        prepConfig={this.prepConfig}
+        propsToDiff={propsToDiff}
+        renderLegend={this.renderLegend}
+      />
+    );
+  }
+}
+
+export const TimeSeries = withTheme2(UnthemedTimeSeries);
+TimeSeries.displayName = 'TimeSeries';
diff --git a/packages/grafana-ui/src/components/TimeSeries/utils.test.ts b/packages/grafana-ui/src/graveyard/TimeSeries/utils.test.ts
similarity index 100%
rename from packages/grafana-ui/src/components/TimeSeries/utils.test.ts
rename to packages/grafana-ui/src/graveyard/TimeSeries/utils.test.ts
diff --git a/packages/grafana-ui/src/graveyard/TimeSeries/utils.ts b/packages/grafana-ui/src/graveyard/TimeSeries/utils.ts
new file mode 100644
index 0000000000000..41090a35a47f3
--- /dev/null
+++ b/packages/grafana-ui/src/graveyard/TimeSeries/utils.ts
@@ -0,0 +1,625 @@
+import { isNumber } from 'lodash';
+import uPlot from 'uplot';
+
+import {
+  DashboardCursorSync,
+  DataFrame,
+  FieldConfig,
+  FieldType,
+  formattedValueToString,
+  getFieldColorModeForField,
+  getFieldSeriesColor,
+  getFieldDisplayName,
+  getDisplayProcessor,
+  FieldColorModeId,
+  DecimalCount,
+} from '@grafana/data';
+import {
+  AxisPlacement,
+  GraphDrawStyle,
+  GraphFieldConfig,
+  GraphThresholdsStyleMode,
+  VisibilityMode,
+  ScaleDirection,
+  ScaleOrientation,
+  StackingMode,
+  GraphTransform,
+  AxisColorMode,
+  GraphGradientMode,
+} from '@grafana/schema';
+
+// unit lookup needed to determine if we want power-of-2 or power-of-10 axis ticks
+// see categories.ts is @grafana/data
+const IEC_UNITS = new Set([
+  'bytes',
+  'bits',
+  'kbytes',
+  'mbytes',
+  'gbytes',
+  'tbytes',
+  'pbytes',
+  'binBps',
+  'binbps',
+  'KiBs',
+  'Kibits',
+  'MiBs',
+  'Mibits',
+  'GiBs',
+  'Gibits',
+  'TiBs',
+  'Tibits',
+  'PiBs',
+  'Pibits',
+]);
+
+const BIN_INCRS = Array(53);
+
+for (let i = 0; i < BIN_INCRS.length; i++) {
+  BIN_INCRS[i] = 2 ** i;
+}
+
+import { UPlotConfigBuilder, UPlotConfigPrepFn } from '../../components/uPlot/config/UPlotConfigBuilder';
+import { getScaleGradientFn } from '../../components/uPlot/config/gradientFills';
+import { getStackingGroups, preparePlotData2 } from '../../components/uPlot/utils';
+import { buildScaleKey } from '../GraphNG/utils';
+
+const defaultFormatter = (v: any, decimals: DecimalCount = 1) => (v == null ? '-' : v.toFixed(decimals));
+
+const defaultConfig: GraphFieldConfig = {
+  drawStyle: GraphDrawStyle.Line,
+  showPoints: VisibilityMode.Auto,
+  axisPlacement: AxisPlacement.Auto,
+};
+
+export const preparePlotConfigBuilder: UPlotConfigPrepFn<{
+  sync?: () => DashboardCursorSync;
+}> = ({
+  frame,
+  theme,
+  timeZones,
+  getTimeRange,
+  sync,
+  allFrames,
+  renderers,
+  tweakScale = (opts) => opts,
+  tweakAxis = (opts) => opts,
+  eventsScope = '__global_',
+}) => {
+  const builder = new UPlotConfigBuilder(timeZones[0]);
+
+  let alignedFrame: DataFrame;
+
+  builder.setPrepData((frames) => {
+    // cache alignedFrame
+    alignedFrame = frames[0];
+
+    return preparePlotData2(frames[0], builder.getStackingGroups());
+  });
+
+  // X is the first field in the aligned frame
+  const xField = frame.fields[0];
+  if (!xField) {
+    return builder; // empty frame with no options
+  }
+
+  const xScaleKey = 'x';
+  let yScaleKey = '';
+
+  const xFieldAxisPlacement =
+    xField.config.custom?.axisPlacement !== AxisPlacement.Hidden ? AxisPlacement.Bottom : AxisPlacement.Hidden;
+  const xFieldAxisShow = xField.config.custom?.axisPlacement !== AxisPlacement.Hidden;
+
+  if (xField.type === FieldType.time) {
+    builder.addScale({
+      scaleKey: xScaleKey,
+      orientation: ScaleOrientation.Horizontal,
+      direction: ScaleDirection.Right,
+      isTime: true,
+      range: () => {
+        const r = getTimeRange();
+        return [r.from.valueOf(), r.to.valueOf()];
+      },
+    });
+
+    // filters first 2 ticks to make space for timezone labels
+    const filterTicks: uPlot.Axis.Filter | undefined =
+      timeZones.length > 1
+        ? (u, splits) => {
+            return splits.map((v, i) => (i < 2 ? null : v));
+          }
+        : undefined;
+
+    for (let i = 0; i < timeZones.length; i++) {
+      const timeZone = timeZones[i];
+      builder.addAxis({
+        scaleKey: xScaleKey,
+        isTime: true,
+        placement: xFieldAxisPlacement,
+        show: xFieldAxisShow,
+        label: xField.config.custom?.axisLabel,
+        timeZone,
+        theme,
+        grid: { show: i === 0 && xField.config.custom?.axisGridShow },
+        filter: filterTicks,
+      });
+    }
+
+    // render timezone labels
+    if (timeZones.length > 1) {
+      builder.addHook('drawAxes', (u: uPlot) => {
+        u.ctx.save();
+
+        u.ctx.fillStyle = theme.colors.text.primary;
+        u.ctx.textAlign = 'left';
+        u.ctx.textBaseline = 'bottom';
+
+        let i = 0;
+        u.axes.forEach((a) => {
+          if (a.side === 2) {
+            //@ts-ignore
+            let cssBaseline: number = a._pos + a._size;
+            u.ctx.fillText(timeZones[i], u.bbox.left, cssBaseline * uPlot.pxRatio);
+            i++;
+          }
+        });
+
+        u.ctx.restore();
+      });
+    }
+  } else {
+    builder.addScale({
+      scaleKey: xScaleKey,
+      orientation: ScaleOrientation.Horizontal,
+      direction: ScaleDirection.Right,
+      range: (u, dataMin, dataMax) => [xField.config.min ?? dataMin, xField.config.max ?? dataMax],
+    });
+
+    builder.addAxis({
+      scaleKey: xScaleKey,
+      placement: xFieldAxisPlacement,
+      show: xFieldAxisShow,
+      label: xField.config.custom?.axisLabel,
+      theme,
+      grid: { show: xField.config.custom?.axisGridShow },
+      formatValue: (v, decimals) => formattedValueToString(xField.display!(v, decimals)),
+    });
+  }
+
+  let customRenderedFields =
+    renderers?.flatMap((r) => Object.values(r.fieldMap).filter((name) => r.indicesOnly.indexOf(name) === -1)) ?? [];
+
+  let indexByName: Map<string, number> | undefined;
+
+  for (let i = 1; i < frame.fields.length; i++) {
+    const field = frame.fields[i];
+
+    const config: FieldConfig<GraphFieldConfig> = {
+      ...field.config,
+      custom: {
+        ...defaultConfig,
+        ...field.config.custom,
+      },
+    };
+
+    const customConfig: GraphFieldConfig = config.custom!;
+
+    if (field === xField || (field.type !== FieldType.number && field.type !== FieldType.enum)) {
+      continue;
+    }
+
+    let fmt = field.display ?? defaultFormatter;
+    if (field.config.custom?.stacking?.mode === StackingMode.Percent) {
+      fmt = getDisplayProcessor({
+        field: {
+          ...field,
+          config: {
+            ...field.config,
+            unit: 'percentunit',
+          },
+        },
+        theme,
+      });
+    }
+    const scaleKey = buildScaleKey(config, field.type);
+    const colorMode = getFieldColorModeForField(field);
+    const scaleColor = getFieldSeriesColor(field, theme);
+    const seriesColor = scaleColor.color;
+
+    // The builder will manage unique scaleKeys and combine where appropriate
+    builder.addScale(
+      tweakScale(
+        {
+          scaleKey,
+          orientation: ScaleOrientation.Vertical,
+          direction: ScaleDirection.Up,
+          distribution: customConfig.scaleDistribution?.type,
+          log: customConfig.scaleDistribution?.log,
+          linearThreshold: customConfig.scaleDistribution?.linearThreshold,
+          min: field.config.min,
+          max: field.config.max,
+          softMin: customConfig.axisSoftMin,
+          softMax: customConfig.axisSoftMax,
+          centeredZero: customConfig.axisCenteredZero,
+          range:
+            customConfig.stacking?.mode === StackingMode.Percent
+              ? (u: uPlot, dataMin: number, dataMax: number) => {
+                  dataMin = dataMin < 0 ? -1 : 0;
+                  dataMax = dataMax > 0 ? 1 : 0;
+                  return [dataMin, dataMax];
+                }
+              : field.type === FieldType.enum
+                ? (u: uPlot, dataMin: number, dataMax: number) => {
+                    // this is the exhaustive enum (stable)
+                    let len = field.config.type!.enum!.text!.length;
+
+                    return [-1, len];
+
+                    // these are only values that are present
+                    // return [dataMin - 1, dataMax + 1]
+                  }
+                : undefined,
+          decimals: field.config.decimals,
+        },
+        field
+      )
+    );
+
+    if (!yScaleKey) {
+      yScaleKey = scaleKey;
+    }
+
+    if (customConfig.axisPlacement !== AxisPlacement.Hidden) {
+      let axisColor: uPlot.Axis.Stroke | undefined;
+
+      if (customConfig.axisColorMode === AxisColorMode.Series) {
+        if (
+          colorMode.isByValue &&
+          field.config.custom?.gradientMode === GraphGradientMode.Scheme &&
+          colorMode.id === FieldColorModeId.Thresholds
+        ) {
+          axisColor = getScaleGradientFn(1, theme, colorMode, field.config.thresholds);
+        } else {
+          axisColor = seriesColor;
+        }
+      }
+
+      const axisDisplayOptions = {
+        border: {
+          show: customConfig.axisBorderShow || false,
+          width: 1 / devicePixelRatio,
+          stroke: axisColor || theme.colors.text.primary,
+        },
+        ticks: {
+          show: customConfig.axisBorderShow || false,
+          stroke: axisColor || theme.colors.text.primary,
+        },
+        color: axisColor || theme.colors.text.primary,
+      };
+
+      let incrs: uPlot.Axis.Incrs | undefined;
+
+      // TODO: these will be dynamic with frame updates, so need to accept getYTickLabels()
+      let values: uPlot.Axis.Values | undefined;
+      let splits: uPlot.Axis.Splits | undefined;
+
+      if (IEC_UNITS.has(config.unit!)) {
+        incrs = BIN_INCRS;
+      } else if (field.type === FieldType.enum) {
+        let text = field.config.type!.enum!.text!;
+        splits = text.map((v: string, i: number) => i);
+        values = text;
+      }
+
+      builder.addAxis(
+        tweakAxis(
+          {
+            scaleKey,
+            label: customConfig.axisLabel,
+            size: customConfig.axisWidth,
+            placement: customConfig.axisPlacement ?? AxisPlacement.Auto,
+            formatValue: (v, decimals) => formattedValueToString(fmt(v, decimals)),
+            theme,
+            grid: { show: customConfig.axisGridShow },
+            decimals: field.config.decimals,
+            distr: customConfig.scaleDistribution?.type,
+            splits,
+            values,
+            incrs,
+            ...axisDisplayOptions,
+          },
+          field
+        )
+      );
+    }
+
+    const showPoints =
+      customConfig.drawStyle === GraphDrawStyle.Points ? VisibilityMode.Always : customConfig.showPoints;
+
+    let pointsFilter: uPlot.Series.Points.Filter = () => null;
+
+    if (customConfig.spanNulls !== true) {
+      pointsFilter = (u, seriesIdx, show, gaps) => {
+        let filtered = [];
+
+        let series = u.series[seriesIdx];
+
+        if (!show && gaps && gaps.length) {
+          const [firstIdx, lastIdx] = series.idxs!;
+          const xData = u.data[0];
+          const yData = u.data[seriesIdx];
+          const firstPos = Math.round(u.valToPos(xData[firstIdx], 'x', true));
+          const lastPos = Math.round(u.valToPos(xData[lastIdx], 'x', true));
+
+          if (gaps[0][0] === firstPos) {
+            filtered.push(firstIdx);
+          }
+
+          // show single points between consecutive gaps that share end/start
+          for (let i = 0; i < gaps.length; i++) {
+            let thisGap = gaps[i];
+            let nextGap = gaps[i + 1];
+
+            if (nextGap && thisGap[1] === nextGap[0]) {
+              // approx when data density is > 1pt/px, since gap start/end pixels are rounded
+              let approxIdx = u.posToIdx(thisGap[1], true);
+
+              if (yData[approxIdx] == null) {
+                // scan left/right alternating to find closest index with non-null value
+                for (let j = 1; j < 100; j++) {
+                  if (yData[approxIdx + j] != null) {
+                    approxIdx += j;
+                    break;
+                  }
+                  if (yData[approxIdx - j] != null) {
+                    approxIdx -= j;
+                    break;
+                  }
+                }
+              }
+
+              filtered.push(approxIdx);
+            }
+          }
+
+          if (gaps[gaps.length - 1][1] === lastPos) {
+            filtered.push(lastIdx);
+          }
+        }
+
+        return filtered.length ? filtered : null;
+      };
+    }
+
+    let { fillOpacity } = customConfig;
+
+    let pathBuilder: uPlot.Series.PathBuilder | null = null;
+    let pointsBuilder: uPlot.Series.Points.Show | null = null;
+
+    if (field.state?.origin) {
+      if (!indexByName) {
+        indexByName = getNamesToFieldIndex(frame, allFrames);
+      }
+
+      const originFrame = allFrames[field.state.origin.frameIndex];
+      const originField = originFrame?.fields[field.state.origin.fieldIndex];
+
+      const dispName = getFieldDisplayName(originField ?? field, originFrame, allFrames);
+
+      // disable default renderers
+      if (customRenderedFields.indexOf(dispName) >= 0) {
+        pathBuilder = () => null;
+        pointsBuilder = () => undefined;
+      } else if (customConfig.transform === GraphTransform.Constant) {
+        // patch some monkeys!
+        const defaultBuilder = uPlot.paths!.linear!();
+
+        pathBuilder = (u, seriesIdx) => {
+          //eslint-disable-next-line
+          const _data: any[] = (u as any)._data; // uplot.AlignedData not exposed in types
+
+          // the data we want the line renderer to pull is x at each plot edge with paired flat y values
+
+          const r = getTimeRange();
+          let xData = [r.from.valueOf(), r.to.valueOf()];
+          let firstY = _data[seriesIdx].find((v: number | null | undefined) => v != null);
+          let yData = [firstY, firstY];
+          let fauxData = _data.slice();
+          fauxData[0] = xData;
+          fauxData[seriesIdx] = yData;
+
+          //eslint-disable-next-line
+          return defaultBuilder(
+            {
+              ...u,
+              _data: fauxData,
+            } as any,
+            seriesIdx,
+            0,
+            1
+          );
+        };
+      }
+
+      if (customConfig.fillBelowTo) {
+        const fillBelowToField = frame.fields.find(
+          (f) =>
+            customConfig.fillBelowTo === f.name ||
+            customConfig.fillBelowTo === f.config?.displayNameFromDS ||
+            customConfig.fillBelowTo === getFieldDisplayName(f, frame, allFrames)
+        );
+
+        const fillBelowDispName = fillBelowToField
+          ? getFieldDisplayName(fillBelowToField, frame, allFrames)
+          : customConfig.fillBelowTo;
+
+        const t = indexByName.get(dispName);
+        const b = indexByName.get(fillBelowDispName);
+        if (isNumber(b) && isNumber(t)) {
+          builder.addBand({
+            series: [t, b],
+            fill: undefined, // using null will have the band use fill options from `t`
+          });
+
+          if (!fillOpacity) {
+            fillOpacity = 35; // default from flot
+          }
+        } else {
+          fillOpacity = 0;
+        }
+      }
+    }
+
+    let dynamicSeriesColor: ((seriesIdx: number) => string | undefined) | undefined = undefined;
+
+    if (colorMode.id === FieldColorModeId.Thresholds) {
+      dynamicSeriesColor = (seriesIdx) => getFieldSeriesColor(alignedFrame.fields[seriesIdx], theme).color;
+    }
+
+    builder.addSeries({
+      pathBuilder,
+      pointsBuilder,
+      scaleKey,
+      showPoints,
+      pointsFilter,
+      colorMode,
+      fillOpacity,
+      theme,
+      dynamicSeriesColor,
+      drawStyle: customConfig.drawStyle!,
+      lineColor: customConfig.lineColor ?? seriesColor,
+      lineWidth: customConfig.lineWidth,
+      lineInterpolation: customConfig.lineInterpolation,
+      lineStyle: customConfig.lineStyle,
+      barAlignment: customConfig.barAlignment,
+      barWidthFactor: customConfig.barWidthFactor,
+      barMaxWidth: customConfig.barMaxWidth,
+      pointSize: customConfig.pointSize,
+      spanNulls: customConfig.spanNulls || false,
+      show: !customConfig.hideFrom?.viz,
+      gradientMode: customConfig.gradientMode,
+      thresholds: config.thresholds,
+      hardMin: field.config.min,
+      hardMax: field.config.max,
+      softMin: customConfig.axisSoftMin,
+      softMax: customConfig.axisSoftMax,
+      // The following properties are not used in the uPlot config, but are utilized as transport for legend config
+      dataFrameFieldIndex: field.state?.origin,
+    });
+
+    // Render thresholds in graph
+    if (customConfig.thresholdsStyle && config.thresholds) {
+      const thresholdDisplay = customConfig.thresholdsStyle.mode ?? GraphThresholdsStyleMode.Off;
+      if (thresholdDisplay !== GraphThresholdsStyleMode.Off) {
+        builder.addThresholds({
+          config: customConfig.thresholdsStyle,
+          thresholds: config.thresholds,
+          scaleKey,
+          theme,
+          hardMin: field.config.min,
+          hardMax: field.config.max,
+          softMin: customConfig.axisSoftMin,
+          softMax: customConfig.axisSoftMax,
+        });
+      }
+    }
+  }
+
+  let stackingGroups = getStackingGroups(frame);
+
+  builder.setStackingGroups(stackingGroups);
+
+  // hook up custom/composite renderers
+  renderers?.forEach((r) => {
+    if (!indexByName) {
+      indexByName = getNamesToFieldIndex(frame, allFrames);
+    }
+    let fieldIndices: Record<string, number> = {};
+
+    for (let key in r.fieldMap) {
+      let dispName = r.fieldMap[key];
+      fieldIndices[key] = indexByName.get(dispName)!;
+    }
+
+    r.init(builder, fieldIndices);
+  });
+
+  builder.scaleKeys = [xScaleKey, yScaleKey];
+
+  // if hovered value is null, how far we may scan left/right to hover nearest non-null
+  const hoverProximityPx = 15;
+
+  let cursor: Partial<uPlot.Cursor> = {
+    // this scans left and right from cursor position to find nearest data index with value != null
+    // TODO: do we want to only scan past undefined values, but halt at explicit null values?
+    dataIdx: (self, seriesIdx, hoveredIdx, cursorXVal) => {
+      let seriesData = self.data[seriesIdx];
+
+      if (seriesData[hoveredIdx] == null) {
+        let nonNullLft = null,
+          nonNullRgt = null,
+          i;
+
+        i = hoveredIdx;
+        while (nonNullLft == null && i-- > 0) {
+          if (seriesData[i] != null) {
+            nonNullLft = i;
+          }
+        }
+
+        i = hoveredIdx;
+        while (nonNullRgt == null && i++ < seriesData.length) {
+          if (seriesData[i] != null) {
+            nonNullRgt = i;
+          }
+        }
+
+        let xVals = self.data[0];
+
+        let curPos = self.valToPos(cursorXVal, 'x');
+        let rgtPos = nonNullRgt == null ? Infinity : self.valToPos(xVals[nonNullRgt], 'x');
+        let lftPos = nonNullLft == null ? -Infinity : self.valToPos(xVals[nonNullLft], 'x');
+
+        let lftDelta = curPos - lftPos;
+        let rgtDelta = rgtPos - curPos;
+
+        if (lftDelta <= rgtDelta) {
+          if (lftDelta <= hoverProximityPx) {
+            hoveredIdx = nonNullLft!;
+          }
+        } else {
+          if (rgtDelta <= hoverProximityPx) {
+            hoveredIdx = nonNullRgt!;
+          }
+        }
+      }
+
+      return hoveredIdx;
+    },
+  };
+
+  if (sync && sync() !== DashboardCursorSync.Off) {
+    cursor.sync = {
+      key: eventsScope,
+      scales: [xScaleKey, null],
+    };
+  }
+
+  builder.setSync();
+  builder.setCursor(cursor);
+
+  return builder;
+};
+
+export function getNamesToFieldIndex(frame: DataFrame, allFrames: DataFrame[]): Map<string, number> {
+  const originNames = new Map<string, number>();
+  frame.fields.forEach((field, i) => {
+    const origin = field.state?.origin;
+    if (origin) {
+      const origField = allFrames[origin.frameIndex]?.fields[origin.fieldIndex];
+      if (origField) {
+        originNames.set(getFieldDisplayName(origField, allFrames[origin.frameIndex], allFrames), i);
+      }
+    }
+  });
+  return originNames;
+}
diff --git a/packages/grafana-ui/src/options/builder/axis.tsx b/packages/grafana-ui/src/options/builder/axis.tsx
index 70b2876bfb809..2b8400be13885 100644
--- a/packages/grafana-ui/src/options/builder/axis.tsx
+++ b/packages/grafana-ui/src/options/builder/axis.tsx
@@ -43,6 +43,7 @@ export function addAxisConfig(
       defaultValue: '',
       settings: {
         placeholder: 'Optional text',
+        expandTemplateVars: true,
       },
       showIf: (c) => c.axisPlacement !== AxisPlacement.Hidden,
       // Do not apply default settings to time and string fields which are used as x-axis fields in Time series and Bar chart panels
diff --git a/packages/grafana-ui/src/options/builder/hideSeries.tsx b/packages/grafana-ui/src/options/builder/hideSeries.tsx
index a70dfe74885dd..90ae2deb6c504 100644
--- a/packages/grafana-ui/src/options/builder/hideSeries.tsx
+++ b/packages/grafana-ui/src/options/builder/hideSeries.tsx
@@ -1,13 +1,13 @@
 import { startCase } from 'lodash';
 import React, { useCallback } from 'react';
 
-import { FieldConfigEditorBuilder, FieldConfigEditorProps } from '@grafana/data';
+import { FieldConfigEditorBuilder, StandardEditorProps } from '@grafana/data';
 import { HideableFieldConfig, HideSeriesConfig } from '@grafana/schema';
 
 import { FilterPill } from '../../components/FilterPill/FilterPill';
 import { HorizontalGroup } from '../../components/Layout/Layout';
 
-const SeriesConfigEditor = ({ value, onChange }: FieldConfigEditorProps<HideSeriesConfig, {}>) => {
+const SeriesConfigEditor = ({ value, onChange }: StandardEditorProps<HideSeriesConfig, {}>) => {
   const onChangeToggle = useCallback(
     (prop: keyof HideSeriesConfig) => {
       onChange({ ...value, [prop]: !value[prop] });
diff --git a/packages/grafana-ui/src/options/builder/stacking.tsx b/packages/grafana-ui/src/options/builder/stacking.tsx
index 7ab189c398e5f..5d561c824a2a8 100644
--- a/packages/grafana-ui/src/options/builder/stacking.tsx
+++ b/packages/grafana-ui/src/options/builder/stacking.tsx
@@ -2,9 +2,10 @@ import React from 'react';
 
 import {
   FieldConfigEditorBuilder,
-  FieldOverrideEditorProps,
+  StandardEditorProps,
   FieldType,
   identityOverrideProcessor,
+  SelectableValue,
 } from '@grafana/data';
 import { GraphFieldConfig, StackingConfig, StackingMode } from '@grafana/schema';
 
@@ -14,12 +15,17 @@ import { Input } from '../../components/Input/Input';
 import { HorizontalGroup } from '../../components/Layout/Layout';
 import { graphFieldOptions } from '../../components/uPlot/config';
 
-export const StackingEditor = ({ value, context, onChange, item }: FieldOverrideEditorProps<StackingConfig, any>) => {
+export const StackingEditor = ({
+  value,
+  context,
+  onChange,
+  item,
+}: StandardEditorProps<StackingConfig, { options: Array<SelectableValue<StackingMode>> }>) => {
   return (
     <HorizontalGroup>
       <RadioButtonGroup
         value={value?.mode || StackingMode.None}
-        options={item.settings.options}
+        options={item.settings?.options ?? []}
         onChange={(v) => {
           onChange({
             ...value,
diff --git a/packages/grafana-ui/src/options/builder/tooltip.tsx b/packages/grafana-ui/src/options/builder/tooltip.tsx
index 4d8db87396750..0ff12becc3ec2 100644
--- a/packages/grafana-ui/src/options/builder/tooltip.tsx
+++ b/packages/grafana-ui/src/options/builder/tooltip.tsx
@@ -3,7 +3,9 @@ import { OptionsWithTooltip, TooltipDisplayMode, SortOrder } from '@grafana/sche
 
 export function addTooltipOptions<T extends OptionsWithTooltip>(
   builder: PanelOptionsEditorBuilder<T>,
-  singleOnly = false
+  singleOnly = false,
+  setProximity = false,
+  defaultOptions?: Partial<OptionsWithTooltip>
 ) {
   const category = ['Tooltip'];
   const modeOptions = singleOnly
@@ -28,7 +30,7 @@ export function addTooltipOptions<T extends OptionsWithTooltip>(
       path: 'tooltip.mode',
       name: 'Tooltip mode',
       category,
-      defaultValue: 'single',
+      defaultValue: defaultOptions?.tooltip?.mode ?? TooltipDisplayMode.Single,
       settings: {
         options: modeOptions,
       },
@@ -37,10 +39,43 @@ export function addTooltipOptions<T extends OptionsWithTooltip>(
       path: 'tooltip.sort',
       name: 'Values sort order',
       category,
-      defaultValue: SortOrder.None,
+      defaultValue: defaultOptions?.tooltip?.sort ?? SortOrder.None,
       showIf: (options: T) => options.tooltip?.mode === TooltipDisplayMode.Multi,
       settings: {
         options: sortOptions,
       },
     });
+
+  if (setProximity) {
+    builder.addNumberInput({
+      path: 'tooltip.hoverProximity',
+      name: 'Hover proximity',
+      description: 'How close the cursor must be to a point to trigger the tooltip, in pixels',
+      category,
+      settings: {
+        integer: true,
+      },
+    });
+  }
+
+  builder
+    .addNumberInput({
+      path: 'tooltip.maxWidth',
+      name: 'Max width',
+      category,
+      settings: {
+        integer: true,
+      },
+      showIf: (options: T) => false, // options.tooltip?.mode !== TooltipDisplayMode.None,
+    })
+    .addNumberInput({
+      path: 'tooltip.maxHeight',
+      name: 'Max height',
+      category,
+      defaultValue: 600,
+      settings: {
+        integer: true,
+      },
+      showIf: (options: T) => false, //options.tooltip?.mode !== TooltipDisplayMode.None,
+    });
 }
diff --git a/packages/grafana-ui/src/schema.ts b/packages/grafana-ui/src/schema.ts
index b52babdb54282..294886e09c3e0 100644
--- a/packages/grafana-ui/src/schema.ts
+++ b/packages/grafana-ui/src/schema.ts
@@ -27,7 +27,7 @@ export {
   StackingMode,
   type StackingConfig,
   type StackableFieldConfig,
-  GraphTresholdsStyleMode,
+  GraphThresholdsStyleMode,
   type GraphThresholdsStyleConfig,
   type GraphFieldConfig,
   type LegendPlacement,
diff --git a/packages/grafana-ui/src/slate-plugins/suggestions.test.tsx b/packages/grafana-ui/src/slate-plugins/suggestions.test.tsx
new file mode 100644
index 0000000000000..039e9bcac08e5
--- /dev/null
+++ b/packages/grafana-ui/src/slate-plugins/suggestions.test.tsx
@@ -0,0 +1,29 @@
+import { getNumCharsToDelete } from './suggestions';
+
+describe('suggestions', () => {
+  describe('getNumCharsToDelete', () => {
+    const splunkCleanText = (s: string) => s.replace(/[{}[\]="(),!~+\-*/^%:\\]/g, '').trim();
+    it.each([
+      // | represents the caret position
+      ['$query0 ', '', '', false, 0, undefined, { forward: 0, backward: 0 }], // "|" --> "$query0 |"
+      ['$query0 ', '$que', '$que', false, 0, undefined, { forward: 0, backward: 4 }], // "$que|" --> "$query0 |"
+      ['$query0 ', '$q', '$que', false, 0, undefined, { forward: 2, backward: 2 }], // "$q|ue" --> "$query0 |"
+      ['$query0 ', '$que', '($que)', false, 0, splunkCleanText, { forward: 0, backward: 4 }], // "($que|)" --> "($query0 |)"
+      ['$query0 ', '$que', 'esarvotionUsagePercent=$que', false, 0, undefined, { forward: 0, backward: 4 }], // "esarvotionUsagePercent=$que|" --> "esarvotionUsagePercent=$query0 |"
+    ])(
+      'should calculate the correct number of characters to delete forwards and backwards',
+      (suggestionText, typeaheadPrefix, typeaheadText, preserveSuffix, deleteBackwards, cleanText, expected) => {
+        expect(
+          getNumCharsToDelete(
+            suggestionText,
+            typeaheadPrefix,
+            typeaheadText,
+            preserveSuffix,
+            deleteBackwards,
+            cleanText
+          )
+        ).toEqual(expected);
+      }
+    );
+  });
+});
diff --git a/packages/grafana-ui/src/slate-plugins/suggestions.tsx b/packages/grafana-ui/src/slate-plugins/suggestions.tsx
index a6366e1a06789..917895c437f24 100644
--- a/packages/grafana-ui/src/slate-plugins/suggestions.tsx
+++ b/packages/grafana-ui/src/slate-plugins/suggestions.tsx
@@ -2,6 +2,8 @@ import { debounce, sortBy } from 'lodash';
 import React from 'react';
 import { Editor, Plugin as SlatePlugin } from 'slate-react';
 
+import { BootData } from '@grafana/data';
+
 import { Typeahead } from '../components/Typeahead/Typeahead';
 import { CompletionItem, SuggestionsState, TypeaheadInput, TypeaheadOutput } from '../types';
 import { makeFragment, SearchFunctionType } from '../utils';
@@ -11,6 +13,12 @@ import TOKEN_MARK from './slate-prism/TOKEN_MARK';
 
 export const TYPEAHEAD_DEBOUNCE = 250;
 
+declare global {
+  interface Window {
+    grafanaBootData?: BootData;
+  }
+}
+
 // Commands added to the editor by this plugin.
 interface SuggestionsPluginCommands {
   selectSuggestion: (suggestion: CompletionItem) => Editor;
@@ -157,13 +165,14 @@ export function SuggestionsPlugin({
           });
         }
 
-        // Remove the current, incomplete text and replace it with the selected suggestion
-        const backward = suggestion.deleteBackwards || typeaheadPrefix.length;
-        const text = cleanText ? cleanText(typeaheadText) : typeaheadText;
-        const suffixLength = text.length - typeaheadPrefix.length;
-        const offset = typeaheadText.indexOf(typeaheadPrefix);
-        const midWord = typeaheadPrefix && ((suffixLength > 0 && offset > -1) || suggestionText === typeaheadText);
-        const forward = midWord && !preserveSuffix ? suffixLength + offset : 0;
+        const { forward, backward } = getNumCharsToDelete(
+          suggestionText,
+          typeaheadPrefix,
+          typeaheadText,
+          preserveSuffix,
+          suggestion.deleteBackwards,
+          cleanText
+        );
 
         // If new-lines, apply suggestion as block
         if (suggestionText.match(/\n/)) {
@@ -337,3 +346,27 @@ const handleTypeahead = async (
   // Bogus edit to force re-render
   editor.blur().focus();
 };
+
+export function getNumCharsToDelete(
+  suggestionText: string,
+  typeaheadPrefix: string,
+  typeaheadText: string,
+  preserveSuffix: boolean,
+  deleteBackwards?: number,
+  cleanText?: (text: string) => string
+) {
+  // remove the current, incomplete text and replace it with the selected suggestion
+  const backward = deleteBackwards || typeaheadPrefix.length;
+  const text = cleanText ? cleanText(typeaheadText) : typeaheadText;
+  const offset = typeaheadText.indexOf(typeaheadPrefix);
+
+  const suffixLength =
+    offset > -1 ? text.length - offset - typeaheadPrefix.length : text.length - typeaheadPrefix.length;
+  const midWord = Boolean((typeaheadPrefix && suffixLength > 0) || suggestionText === typeaheadText);
+  const forward = midWord && !preserveSuffix ? suffixLength + offset : 0;
+
+  return {
+    forward,
+    backward,
+  };
+}
diff --git a/packages/grafana-ui/src/themes/GlobalStyles/GlobalStyles.tsx b/packages/grafana-ui/src/themes/GlobalStyles/GlobalStyles.tsx
index 996ab95620176..5b2d5fef6572b 100644
--- a/packages/grafana-ui/src/themes/GlobalStyles/GlobalStyles.tsx
+++ b/packages/grafana-ui/src/themes/GlobalStyles/GlobalStyles.tsx
@@ -10,6 +10,7 @@ import { getExtraStyles } from './extra';
 import { getFormElementStyles } from './forms';
 import { getMarkdownStyles } from './markdownStyles';
 import { getPageStyles } from './page';
+import { getSkeletonStyles } from './skeletonStyles';
 
 /** @internal */
 export function GlobalStyles() {
@@ -25,6 +26,7 @@ export function GlobalStyles() {
         getCardStyles(theme),
         getAgularPanelStyles(theme),
         getMarkdownStyles(theme),
+        getSkeletonStyles(theme),
       ]}
     />
   );
diff --git a/packages/grafana-ui/src/themes/GlobalStyles/elements.ts b/packages/grafana-ui/src/themes/GlobalStyles/elements.ts
index bb8278efe4eb6..a37f5561b251b 100644
--- a/packages/grafana-ui/src/themes/GlobalStyles/elements.ts
+++ b/packages/grafana-ui/src/themes/GlobalStyles/elements.ts
@@ -1,4 +1,4 @@
-import { css, CSSObject } from '@emotion/react';
+import { css } from '@emotion/react';
 
 import { GrafanaTheme2, ThemeTypographyVariant } from '@grafana/data';
 
@@ -144,7 +144,7 @@ export function getElementStyles(theme: GrafanaTheme2) {
   });
 }
 
-export function getVariantStyles(variant: ThemeTypographyVariant): CSSObject {
+export function getVariantStyles(variant: ThemeTypographyVariant) {
   return {
     margin: 0,
     fontSize: variant.fontSize,
diff --git a/packages/grafana-ui/src/themes/GlobalStyles/skeletonStyles.ts b/packages/grafana-ui/src/themes/GlobalStyles/skeletonStyles.ts
new file mode 100644
index 0000000000000..21ff50536a373
--- /dev/null
+++ b/packages/grafana-ui/src/themes/GlobalStyles/skeletonStyles.ts
@@ -0,0 +1,11 @@
+import { css } from '@emotion/react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+
+import { skeletonAnimation } from '../../utils/skeleton';
+
+export const getSkeletonStyles = (theme: GrafanaTheme2) => {
+  return css({
+    '.react-loading-skeleton': skeletonAnimation,
+  });
+};
diff --git a/packages/grafana-ui/src/themes/_variables.scss.tmpl.ts b/packages/grafana-ui/src/themes/_variables.scss.tmpl.ts
index 5651553f12560..75a8ad0d4af3d 100644
--- a/packages/grafana-ui/src/themes/_variables.scss.tmpl.ts
+++ b/packages/grafana-ui/src/themes/_variables.scss.tmpl.ts
@@ -161,7 +161,6 @@ $form-icon-danger: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www
 // -------------------------
 // Used for a bird's eye view of components dependent on the z-axis
 // Try to avoid customizing these :)
-$zindex-active-panel: ${theme.zIndex.activePanel};
 $zindex-dropdown: ${theme.zIndex.dropdown};
 $zindex-navbar-fixed: ${theme.zIndex.navbarFixed};
 $zindex-sidemenu: ${theme.zIndex.sidemenu};
diff --git a/packages/grafana-ui/src/themes/mixins.ts b/packages/grafana-ui/src/themes/mixins.ts
index e633ae2a98320..537ccaea44c51 100644
--- a/packages/grafana-ui/src/themes/mixins.ts
+++ b/packages/grafana-ui/src/themes/mixins.ts
@@ -1,4 +1,3 @@
-import { CSSObject } from '@emotion/css';
 import tinycolor from 'tinycolor2';
 
 import { GrafanaTheme, GrafanaTheme2 } from '@grafana/data';
@@ -55,14 +54,14 @@ export const focusCss = (theme: GrafanaTheme | GrafanaTheme2) => {
   transition-timing-function: cubic-bezier(0.19, 1, 0.22, 1);`;
 };
 
-export function getMouseFocusStyles(theme: GrafanaTheme | GrafanaTheme2): CSSObject {
+export function getMouseFocusStyles(theme: GrafanaTheme | GrafanaTheme2) {
   return {
     outline: 'none',
     boxShadow: `none`,
   };
 }
 
-export function getFocusStyles(theme: GrafanaTheme2): CSSObject {
+export function getFocusStyles(theme: GrafanaTheme2) {
   return {
     outline: '2px dotted transparent',
     outlineOffset: '2px',
@@ -74,7 +73,7 @@ export function getFocusStyles(theme: GrafanaTheme2): CSSObject {
 }
 
 // max-width is set up based on .grafana-tooltip class that's used in dashboard
-export const getTooltipContainerStyles = (theme: GrafanaTheme2): CSSObject => ({
+export const getTooltipContainerStyles = (theme: GrafanaTheme2) => ({
   overflow: 'hidden',
   background: theme.colors.background.secondary,
   boxShadow: theme.shadows.z2,
diff --git a/packages/grafana-ui/src/types/forms.ts b/packages/grafana-ui/src/types/forms.ts
index 86e5869c86143..f7e654f27c1d2 100644
--- a/packages/grafana-ui/src/types/forms.ts
+++ b/packages/grafana-ui/src/types/forms.ts
@@ -1,12 +1,18 @@
 import { UseFormReturn, FieldValues, FieldErrors, FieldArrayMethodProps } from 'react-hook-form';
 export type { SubmitHandler as FormsOnSubmit, FieldErrors as FormFieldErrors } from 'react-hook-form';
 
+/**
+ * @deprecated use the types from react-hook-form instead
+ */
 export type FormAPI<T extends FieldValues> = Omit<UseFormReturn<T>, 'handleSubmit'> & {
   errors: FieldErrors<T>;
 };
 
 type FieldArrayValue = Partial<FieldValues> | Array<Partial<FieldValues>>;
 
+/**
+ * @deprecated use the types from react-hook-form instead
+ */
 export interface FieldArrayApi {
   fields: Array<Record<string, any>>;
   append: (value: FieldArrayValue, options?: FieldArrayMethodProps) => void;
diff --git a/packages/grafana-ui/src/unstable.ts b/packages/grafana-ui/src/unstable.ts
index dedc5841a5b60..02938ddf2d288 100644
--- a/packages/grafana-ui/src/unstable.ts
+++ b/packages/grafana-ui/src/unstable.ts
@@ -9,7 +9,4 @@
  * be subject to the standard policies
  */
 
-export * from './components/Layout/Flex/Flex';
-
-export { Grid } from './components/Layout/Grid/Grid';
-export { Stack, HorizontalStack } from './components/Layout/Stack';
+export * from './utils/skeleton';
diff --git a/packages/grafana-ui/src/utils/skeleton.tsx b/packages/grafana-ui/src/utils/skeleton.tsx
new file mode 100644
index 0000000000000..042e14e3ea46f
--- /dev/null
+++ b/packages/grafana-ui/src/utils/skeleton.tsx
@@ -0,0 +1,51 @@
+import { keyframes } from '@emotion/css';
+import React from 'react';
+
+const fadeIn = keyframes({
+  '0%': {
+    opacity: 0,
+  },
+  '100%': {
+    opacity: 1,
+  },
+});
+
+export const skeletonAnimation = {
+  animationName: fadeIn,
+  animationDelay: '100ms',
+  animationTimingFunction: 'ease-in',
+  animationDuration: '100ms',
+  animationFillMode: 'backwards',
+};
+
+interface SkeletonProps {
+  /**
+   * Spread these props at the root of your skeleton to handle animation logic
+   */
+  rootProps: {
+    style: React.CSSProperties;
+  };
+}
+
+export type SkeletonComponent<P = {}> = React.ComponentType<P & SkeletonProps>;
+
+/**
+ * Use this to attach a skeleton as a static property on the component.
+ * e.g. if you render a component with `<Component />`, you can render the skeleton with `<Component.Skeleton />`.
+ * @param Component   A functional or class component
+ * @param Skeleton    A functional or class skeleton component
+ * @returns           A wrapped component with a static skeleton property
+ */
+export const attachSkeleton = <C extends object, P>(Component: C, Skeleton: SkeletonComponent<P>) => {
+  const skeletonWrapper = (props: P) => {
+    return (
+      <Skeleton
+        {...props}
+        rootProps={{
+          style: skeletonAnimation,
+        }}
+      />
+    );
+  };
+  return Object.assign(Component, { Skeleton: skeletonWrapper });
+};
diff --git a/packages/grafana-ui/src/utils/tooltipUtils.ts b/packages/grafana-ui/src/utils/tooltipUtils.ts
index e7d555e69cfb7..b666ca85b294f 100644
--- a/packages/grafana-ui/src/utils/tooltipUtils.ts
+++ b/packages/grafana-ui/src/utils/tooltipUtils.ts
@@ -1,6 +1,22 @@
 import { css } from '@emotion/css';
-
-import { colorManipulator, GrafanaTheme2 } from '@grafana/data';
+import { Placement } from '@floating-ui/react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+
+import { TooltipPlacement } from '../components/Tooltip';
+
+export function getPlacement(placement?: TooltipPlacement): Placement {
+  switch (placement) {
+    case 'auto':
+      return 'bottom';
+    case 'auto-start':
+      return 'bottom-start';
+    case 'auto-end':
+      return 'bottom-end';
+    default:
+      return placement ?? 'bottom';
+  }
+}
 
 export function buildTooltipTheme(
   theme: GrafanaTheme2,
@@ -11,29 +27,7 @@ export function buildTooltipTheme(
 ) {
   return {
     arrow: css({
-      height: '1rem',
-      width: '1rem',
-      position: 'absolute',
-      pointerEvents: 'none',
-
-      '&::before': {
-        borderStyle: 'solid',
-        content: '""',
-        display: 'block',
-        height: 0,
-        margin: 'auto',
-        width: 0,
-      },
-
-      '&::after': {
-        borderStyle: 'solid',
-        content: '""',
-        display: 'block',
-        height: 0,
-        margin: 'auto',
-        position: 'absolute',
-        width: 0,
-      },
+      fill: tooltipBg,
     }),
     container: css({
       backgroundColor: tooltipBg,
@@ -51,97 +45,6 @@ export function buildTooltipTheme(
       "&[data-popper-interactive='false']": {
         pointerEvents: 'none',
       },
-
-      "&[data-popper-placement*='bottom'] > div[data-popper-arrow='true']": {
-        left: 0,
-        marginTop: '-7px',
-        top: 0,
-
-        '&::before': {
-          borderColor: `transparent transparent ${toggletipBorder} transparent`,
-          borderWidth: '0 8px 7px 8px',
-          position: 'absolute',
-          top: '-1px',
-        },
-
-        '&::after': {
-          borderColor: `transparent transparent ${tooltipBg} transparent`,
-          borderWidth: '0 8px 7px 8px',
-        },
-      },
-
-      "&[data-popper-placement*='top'] > div[data-popper-arrow='true']": {
-        bottom: 0,
-        left: 0,
-        marginBottom: '-14px',
-
-        '&::before': {
-          borderColor: `${toggletipBorder} transparent transparent transparent`,
-          borderWidth: '7px 8px 0 7px',
-          position: 'absolute',
-          top: '1px',
-        },
-
-        '&::after': {
-          borderColor: `${tooltipBg} transparent transparent transparent`,
-          borderWidth: '7px 8px 0 7px',
-        },
-      },
-
-      "&[data-popper-placement*='right'] > div[data-popper-arrow='true']": {
-        left: 0,
-        marginLeft: '-10px',
-
-        '&::before': {
-          borderColor: `transparent ${toggletipBorder} transparent transparent`,
-          borderWidth: '7px 6px 7px 0',
-        },
-
-        '&::after': {
-          borderColor: `transparent ${tooltipBg} transparent transparent`,
-          borderWidth: '6px 7px 7px 0',
-          left: '2px',
-          top: '1px',
-        },
-      },
-
-      "&[data-popper-placement*='left'] > div[data-popper-arrow='true']": {
-        marginRight: '-11px',
-        right: 0,
-
-        '&::before': {
-          borderColor: `transparent transparent transparent ${toggletipBorder}`,
-          borderWidth: '7px 0 6px 7px',
-        },
-
-        '&::after': {
-          borderColor: `transparent transparent transparent ${tooltipBg}`,
-          borderWidth: '6px 0 5px 5px',
-          left: '1px',
-          top: '1px',
-        },
-      },
-
-      code: {
-        border: 'none',
-        display: 'inline',
-        background: colorManipulator.darken(tooltipBg, 0.1),
-        color: tooltipText,
-      },
-
-      pre: {
-        background: colorManipulator.darken(tooltipBg, 0.1),
-        color: tooltipText,
-      },
-
-      a: {
-        color: tooltipText,
-        textDecoration: 'underline',
-      },
-
-      'a:hover': {
-        textDecoration: 'none',
-      },
     }),
     headerClose: css({
       color: theme.colors.text.secondary,
diff --git a/packaging/deb/control/postinst b/packaging/deb/control/postinst
index 2245b56c13151..e304646df9abe 100755
--- a/packaging/deb/control/postinst
+++ b/packaging/deb/control/postinst
@@ -12,11 +12,12 @@ IS_UPGRADE=false
 if [ "$1" = configure ]; then
   [ -z "$GRAFANA_USER" ] && GRAFANA_USER="grafana"
   [ -z "$GRAFANA_GROUP" ] && GRAFANA_GROUP="grafana"
+  [ -z "$GRAFANA_HOME" ] && GRAFANA_HOME="/usr/share/grafana"
   if ! getent group "$GRAFANA_GROUP" > /dev/null 2>&1 ; then
     addgroup --system "$GRAFANA_GROUP" --quiet
   fi
   if ! id "$GRAFANA_USER" > /dev/null 2>&1 ; then
-    adduser --system --home /usr/share/grafana --no-create-home \
+    adduser --system --home "$GRAFANA_HOME" --no-create-home \
       --ingroup "$GRAFANA_GROUP" --disabled-password --shell /bin/false \
       "$GRAFANA_USER"
   fi
@@ -28,34 +29,29 @@ if [ "$1" = configure ]; then
 
   # copy user config files
   if [ ! -f $CONF_FILE ]; then
-    cp /usr/share/grafana/conf/sample.ini $CONF_FILE
-    cp /usr/share/grafana/conf/ldap.toml /etc/grafana/ldap.toml
+    cp "${GRAFANA_HOME}/conf/sample.ini" $CONF_FILE
+    cp "${GRAFANA_HOME}/conf/ldap.toml" /etc/grafana/ldap.toml
   fi
 
   if [ ! -d $PROVISIONING_CFG_DIR ]; then
     mkdir -p $PROVISIONING_CFG_DIR/dashboards $PROVISIONING_CFG_DIR/datasources
-    cp /usr/share/grafana/conf/provisioning/dashboards/sample.yaml $PROVISIONING_CFG_DIR/dashboards/sample.yaml
-    cp /usr/share/grafana/conf/provisioning/datasources/sample.yaml $PROVISIONING_CFG_DIR/datasources/sample.yaml
-  fi
-
-  if [ ! -d $PROVISIONING_CFG_DIR/notifiers ]; then
-    mkdir -p $PROVISIONING_CFG_DIR/notifiers
-    cp /usr/share/grafana/conf/provisioning/notifiers/sample.yaml $PROVISIONING_CFG_DIR/notifiers/sample.yaml
+    cp "${GRAFANA_HOME}/conf/provisioning/dashboards/sample.yaml" $PROVISIONING_CFG_DIR/dashboards/sample.yaml
+    cp "${GRAFANA_HOME}/conf/provisioning/datasources/sample.yaml" $PROVISIONING_CFG_DIR/datasources/sample.yaml
   fi
 
   if [ ! -d $PROVISIONING_CFG_DIR/plugins ]; then
     mkdir -p $PROVISIONING_CFG_DIR/plugins
-    cp /usr/share/grafana/conf/provisioning/plugins/sample.yaml $PROVISIONING_CFG_DIR/plugins/sample.yaml
+    cp "${GRAFANA_HOME}/conf/provisioning/plugins/sample.yaml" $PROVISIONING_CFG_DIR/plugins/sample.yaml
   fi
 
   if [ ! -d $PROVISIONING_CFG_DIR/access-control ]; then
     mkdir -p $PROVISIONING_CFG_DIR/access-control
-    cp /usr/share/grafana/conf/provisioning/access-control/sample.yaml $PROVISIONING_CFG_DIR/access-control/sample.yaml
+    cp "${GRAFANA_HOME}/conf/provisioning/access-control/sample.yaml" $PROVISIONING_CFG_DIR/access-control/sample.yaml
   fi
 
   if [ ! -d $PROVISIONING_CFG_DIR/alerting ]; then
     mkdir -p $PROVISIONING_CFG_DIR/alerting
-    cp /usr/share/grafana/conf/provisioning/alerting/sample.yaml $PROVISIONING_CFG_DIR/alerting/sample.yaml
+    cp "${GRAFANA_HOME}/conf/provisioning/alerting/sample.yaml" $PROVISIONING_CFG_DIR/alerting/sample.yaml
   fi
 
 	# configuration files should not be modifiable by grafana user, as this can be a security issue
diff --git a/packaging/docker/build.sh b/packaging/docker/build.sh
index 5a16049d1331e..3c6ec7274cb49 100755
--- a/packaging/docker/build.sh
+++ b/packaging/docker/build.sh
@@ -59,7 +59,7 @@ docker_build () {
   esac
   if [ $UBUNTU_BASE = "0" ]; then
     libc="-musl"
-    base_image="${base_arch}alpine:3.18.3"
+    base_image="${base_arch}alpine:3.18.5"
   else
     libc=""
     base_image="${base_arch}ubuntu:22.04"
diff --git a/packaging/rpm/control/postinst b/packaging/rpm/control/postinst
index 4ec126c335540..129dc84540edf 100755
--- a/packaging/rpm/control/postinst
+++ b/packaging/rpm/control/postinst
@@ -56,11 +56,6 @@ if [ $1 -eq 1 ] ; then
     cp /usr/share/grafana/conf/provisioning/datasources/sample.yaml $PROVISIONING_CFG_DIR/datasources/sample.yaml
   fi
 
-  if [ ! -d $PROVISIONING_CFG_DIR/notifiers ]; then
-    mkdir -p $PROVISIONING_CFG_DIR/notifiers
-    cp /usr/share/grafana/conf/provisioning/notifiers/sample.yaml $PROVISIONING_CFG_DIR/notifiers/sample.yaml
-  fi
-
   if [ ! -d $PROVISIONING_CFG_DIR/plugins ]; then
     mkdir -p $PROVISIONING_CFG_DIR/plugins
     cp /usr/share/grafana/conf/provisioning/plugins/sample.yaml $PROVISIONING_CFG_DIR/plugins/sample.yaml
diff --git a/pkg/api/README.md b/pkg/api/README.md
index 63088d9f8de01..1449c6077b610 100644
--- a/pkg/api/README.md
+++ b/pkg/api/README.md
@@ -73,10 +73,13 @@ type UpdateServiceAccountResponse struct {
 Developers can re-create the OpenAPI v2 and v3 specifications using the following command:
 
 ```bash
-
 make swagger-clean && make openapi3-gen
 ```
 
 They can observe its output into the `public/api-merged.json` and `public/openapi3.json` files.
 
-Finally, they can browser and try out both the OpenAPI v2 and v3 via the Swagger UI editor (served by the grafana server) by navigating to `/swagger-ui` and `/openapi3` respectively.
+Finally, they can browser and try out both the OpenAPI v2 and v3 via the Swagger UI editor (served by the grafana server) by navigating to `/swagger`.
+
+If there are any issues generating the specifications (e.g., diff containing unrelated changes to your PR or unusually large diff), please run the following two commands to ensure your Swagger version is up to date, then re-run the make commands.
+- `go install github.com/bwplotka/bingo@latest`
+- `bingo get swagger`
\ No newline at end of file
diff --git a/pkg/api/accesscontrol.go b/pkg/api/accesscontrol.go
index 65136a3cf8693..c2b4be1abee65 100644
--- a/pkg/api/accesscontrol.go
+++ b/pkg/api/accesscontrol.go
@@ -1,12 +1,14 @@
 package api
 
 import (
+	"context"
 	"fmt"
 
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/libraryelements"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginaccesscontrol"
@@ -33,14 +35,14 @@ var (
 // that HTTPServer needs
 func (hs *HTTPServer) declareFixedRoles() error {
 	// Declare plugins roles
-	if err := pluginaccesscontrol.DeclareRBACRoles(hs.accesscontrolService, hs.Cfg); err != nil {
+	if err := pluginaccesscontrol.DeclareRBACRoles(hs.accesscontrolService, hs.Cfg, hs.Features); err != nil {
 		return err
 	}
 
 	provisioningWriterRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:provisioning:writer",
-			DisplayName: "Provisioning writer",
+			DisplayName: "Writer",
 			Description: "Reload provisioning.",
 			Group:       "Provisioning",
 			Permissions: []ac.Permission{
@@ -56,7 +58,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	datasourcesExplorerRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:datasources:explorer",
-			DisplayName: "Data source explorer",
+			DisplayName: "Explorer",
 			Description: "Enable the Explore feature. Data source permissions still apply; you can only query data sources for which you have query permissions.",
 			Group:       "Data sources",
 			Permissions: []ac.Permission{
@@ -75,7 +77,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	datasourcesReaderRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:datasources:reader",
-			DisplayName: "Data source reader",
+			DisplayName: "Reader",
 			Description: "Read and query all data sources.",
 			Group:       "Data sources",
 			Permissions: []ac.Permission{
@@ -95,7 +97,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	builtInDatasourceReader := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:datasources.builtin:reader",
-			DisplayName: "Built in data source reader",
+			DisplayName: "Built in reader",
 			Description: "Read and query Grafana's built in test data sources.",
 			Group:       "Data sources",
 			Permissions: []ac.Permission{
@@ -121,7 +123,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	datasourcesCreatorRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:datasources:creator",
-			DisplayName: "Data source creator",
+			DisplayName: "Creator",
 			Description: "Create data sources.",
 			Group:       "Data sources",
 			Permissions: []ac.Permission{
@@ -136,7 +138,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	datasourcesWriterRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:datasources:writer",
-			DisplayName: "Data source writer",
+			DisplayName: "Writer",
 			Description: "Create, update, delete, read, or query data sources.",
 			Group:       "Data sources",
 			Permissions: ac.ConcatPermissions(datasourcesReaderRole.Role.Permissions, []ac.Permission{
@@ -175,7 +177,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	apikeyReaderRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:apikeys:reader",
-			DisplayName: "APIKeys reader",
+			DisplayName: "Reader",
 			Description: "Gives access to read api keys.",
 			Group:       "API Keys",
 			Permissions: []ac.Permission{
@@ -191,7 +193,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	apikeyWriterRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:apikeys:writer",
-			DisplayName: "APIKeys writer",
+			DisplayName: "Writer",
 			Description: "Gives access to add and delete api keys.",
 			Group:       "API Keys",
 			Permissions: ac.ConcatPermissions(apikeyReaderRole.Role.Permissions, []ac.Permission{
@@ -210,7 +212,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	orgReaderRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:organization:reader",
-			DisplayName: "Organization reader",
+			DisplayName: "Reader",
 			Description: "Read an organization, such as its ID, name, address, or quotas.",
 			Group:       "Organizations",
 			Permissions: []ac.Permission{
@@ -224,7 +226,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	orgWriterRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:organization:writer",
-			DisplayName: "Organization writer",
+			DisplayName: "Writer",
 			Description: "Read an organization, its quotas, or its preferences. Update organization properties, or its preferences.",
 			Group:       "Organizations",
 			Permissions: ac.ConcatPermissions(orgReaderRole.Role.Permissions, []ac.Permission{
@@ -239,7 +241,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	orgMaintainerRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:organization:maintainer",
-			DisplayName: "Organization maintainer",
+			DisplayName: "Maintainer",
 			Description: "Create, read, write, or delete an organization. Read or write an organization's quotas. Needs to be assigned globally.",
 			Group:       "Organizations",
 			Permissions: ac.ConcatPermissions(orgReaderRole.Role.Permissions, []ac.Permission{
@@ -259,7 +261,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	teamsCreatorRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:teams:creator",
-			DisplayName: "Team creator",
+			DisplayName: "Creator",
 			Description: "Create teams and read organisation users (required to manage the created teams).",
 			Group:       "Teams",
 			Permissions: []ac.Permission{
@@ -273,7 +275,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	teamsReaderRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:teams:read",
-			DisplayName: "Team reader",
+			DisplayName: "Reader",
 			Description: "List all teams.",
 			Group:       "Teams",
 			Permissions: []ac.Permission{
@@ -286,7 +288,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	teamsWriterRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:teams:writer",
-			DisplayName: "Team writer",
+			DisplayName: "Writer",
 			Description: "Create, read, write, or delete a team as well as controlling team memberships.",
 			Group:       "Teams",
 			Permissions: []ac.Permission{
@@ -304,7 +306,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	annotationsReaderRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:annotations:reader",
-			DisplayName: "Annotation reader",
+			DisplayName: "Reader",
 			Description: "Read annotations and tags",
 			Group:       "Annotations",
 			Permissions: []ac.Permission{
@@ -314,6 +316,8 @@ func (hs *HTTPServer) declareFixedRoles() error {
 		Grants: []string{string(org.RoleViewer)},
 	}
 
+	// TODO this role can be removed once we have rolled out FlagAnnotationPermissionUpdate to all users
+	// keeping it in for now for backwards compatibility
 	dashboardAnnotationsWriterRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:annotations.dashboard:writer",
@@ -332,7 +336,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	annotationsWriterRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:annotations:writer",
-			DisplayName: "Annotation writer",
+			DisplayName: "Writer",
 			Description: "Update all annotations.",
 			Group:       "Annotations",
 			Permissions: []ac.Permission{
@@ -344,10 +348,48 @@ func (hs *HTTPServer) declareFixedRoles() error {
 		Grants: []string{string(org.RoleEditor)},
 	}
 
+	if hs.Features.IsEnabled(context.Background(), featuremgmt.FlagAnnotationPermissionUpdate) {
+		// Keeping the name to avoid breaking changes (for users who have assigned this role to grant permissions on organization annotations)
+		annotationsReaderRole = ac.RoleRegistration{
+			Role: ac.RoleDTO{
+				Name:        "fixed:annotations:reader",
+				DisplayName: "Organization annotation reader",
+				Description: "Read organization annotations and annotation tags",
+				Group:       "Annotations",
+				Permissions: []ac.Permission{
+					// Need to leave the permissions as they are, so that the seeder doesn't replace permissions when they have been removed from the basic role by the user
+					// Otherwise we could split this into ac.ScopeAnnotationsTypeOrganization and ac.ScopeAnnotationsTypeDashboard scopes and eventually remove the dashboard scope.
+					// https://github.com/grafana/identity-access-team/issues/524
+					{Action: ac.ActionAnnotationsRead, Scope: ac.ScopeAnnotationsAll},
+				},
+			},
+			Grants: []string{string(org.RoleViewer)},
+		}
+
+		// Keeping the name to avoid breaking changes (for users who have assigned this role to grant permissions on organization annotations)
+		annotationsWriterRole = ac.RoleRegistration{
+			Role: ac.RoleDTO{
+				Name:        "fixed:annotations:writer",
+				DisplayName: "Organization annotation writer",
+				Description: "Update organization annotations.",
+				Group:       "Annotations",
+				Permissions: []ac.Permission{
+					// Need to leave the permissions as they are, so that the seeder doesn't replace permissions when they have been removed from the basic role by the user
+					// Otherwise we could split this into ac.ScopeAnnotationsTypeOrganization and ac.ScopeAnnotationsTypeDashboard scopes and eventually remove the dashboard scope.
+					// https://github.com/grafana/identity-access-team/issues/524
+					{Action: ac.ActionAnnotationsCreate, Scope: ac.ScopeAnnotationsAll},
+					{Action: ac.ActionAnnotationsDelete, Scope: ac.ScopeAnnotationsAll},
+					{Action: ac.ActionAnnotationsWrite, Scope: ac.ScopeAnnotationsAll},
+				},
+			},
+			Grants: []string{string(org.RoleEditor)},
+		}
+	}
+
 	dashboardsCreatorRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:dashboards:creator",
-			DisplayName: "Dashboard creator",
+			DisplayName: "Creator",
 			Description: "Create dashboard in general folder.",
 			Group:       "Dashboards",
 			Permissions: []ac.Permission{
@@ -361,7 +403,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	dashboardsReaderRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:dashboards:reader",
-			DisplayName: "Dashboard reader",
+			DisplayName: "Reader",
 			Description: "Read all dashboards.",
 			Group:       "Dashboards",
 			Permissions: []ac.Permission{
@@ -374,7 +416,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	dashboardsWriterRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:dashboards:writer",
-			DisplayName: "Dashboard writer",
+			DisplayName: "Writer",
 			Group:       "Dashboards",
 			Description: "Create, read, write or delete all dashboards and their permissions.",
 			Permissions: ac.ConcatPermissions(dashboardsReaderRole.Role.Permissions, []ac.Permission{
@@ -391,7 +433,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	foldersCreatorRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:folders:creator",
-			DisplayName: "Folder creator",
+			DisplayName: "Creator",
 			Description: "Create folders.",
 			Group:       "Folders",
 			Permissions: []ac.Permission{
@@ -404,7 +446,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	foldersReaderRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:folders:reader",
-			DisplayName: "Folder reader",
+			DisplayName: "Reader",
 			Description: "Read all folders and dashboards.",
 			Group:       "Folders",
 			Permissions: []ac.Permission{
@@ -415,10 +457,25 @@ func (hs *HTTPServer) declareFixedRoles() error {
 		Grants: []string{"Admin"},
 	}
 
+	// Needed to be able to list permissions on the general folder for viewers, doesn't actually grant access to any resources
+	generalFolderReaderRole := ac.RoleRegistration{
+		Role: ac.RoleDTO{
+			Name:        "fixed:folders.general:reader",
+			DisplayName: "General folder reader",
+			Description: "Access the general (root) folder.",
+			Group:       "Folders",
+			Hidden:      true,
+			Permissions: []ac.Permission{
+				{Action: dashboards.ActionFoldersRead, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID(ac.GeneralFolderUID)},
+			},
+		},
+		Grants: []string{string(org.RoleViewer)},
+	}
+
 	foldersWriterRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:folders:writer",
-			DisplayName: "Folder writer",
+			DisplayName: "Writer",
 			Description: "Create, read, write or delete all folders and dashboards and their permissions.",
 			Group:       "Folders",
 			Permissions: ac.ConcatPermissions(
@@ -440,7 +497,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	libraryPanelsCreatorRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:library.panels:creator",
-			DisplayName: "Library panel creator",
+			DisplayName: "Creator",
 			Description: "Create library panel in general folder.",
 			Group:       "Library panels",
 			Permissions: []ac.Permission{
@@ -454,7 +511,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	libraryPanelsReaderRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:library.panels:reader",
-			DisplayName: "Library panel reader",
+			DisplayName: "Reader",
 			Description: "Read all library panels.",
 			Group:       "Library panels",
 			Permissions: []ac.Permission{
@@ -467,7 +524,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	libraryPanelsGeneralReaderRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:library.panels:general.reader",
-			DisplayName: "Library panel general reader",
+			DisplayName: "General reader",
 			Description: "Read all library panels in general folder.",
 			Group:       "Library panels",
 			Permissions: []ac.Permission{
@@ -480,7 +537,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	libraryPanelsWriterRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:library.panels:writer",
-			DisplayName: "Library panel writer",
+			DisplayName: "Writer",
 			Group:       "Library panels",
 			Description: "Create, read, write or delete all library panels and their permissions.",
 			Permissions: ac.ConcatPermissions(libraryPanelsReaderRole.Role.Permissions, []ac.Permission{
@@ -495,7 +552,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	libraryPanelsGeneralWriterRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:library.panels:general.writer",
-			DisplayName: "Library panel general writer",
+			DisplayName: "General writer",
 			Group:       "Library panels",
 			Description: "Create, read, write or delete all library panels and their permissions in the general folder.",
 			Permissions: ac.ConcatPermissions(libraryPanelsGeneralReaderRole.Role.Permissions, []ac.Permission{
@@ -523,7 +580,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	featuremgmtReaderRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:featuremgmt:reader",
-			DisplayName: "Feature Management reader",
+			DisplayName: "Reader",
 			Description: "Read feature toggles",
 			Group:       "Feature Management",
 			Permissions: []ac.Permission{
@@ -536,7 +593,7 @@ func (hs *HTTPServer) declareFixedRoles() error {
 	featuremgmtWriterRole := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        "fixed:featuremgmt:writer",
-			DisplayName: "Feature Management writer",
+			DisplayName: "Writer",
 			Description: "Write feature toggles",
 			Group:       "Feature Management",
 			Permissions: []ac.Permission{
@@ -551,17 +608,53 @@ func (hs *HTTPServer) declareFixedRoles() error {
 		orgMaintainerRole, teamsCreatorRole, teamsWriterRole, teamsReaderRole, datasourcesExplorerRole,
 		annotationsReaderRole, dashboardAnnotationsWriterRole, annotationsWriterRole,
 		dashboardsCreatorRole, dashboardsReaderRole, dashboardsWriterRole,
-		foldersCreatorRole, foldersReaderRole, foldersWriterRole, apikeyReaderRole, apikeyWriterRole,
+		foldersCreatorRole, foldersReaderRole, generalFolderReaderRole, foldersWriterRole, apikeyReaderRole, apikeyWriterRole,
 		publicDashboardsWriterRole, featuremgmtReaderRole, featuremgmtWriterRole, libraryPanelsCreatorRole,
 		libraryPanelsReaderRole, libraryPanelsWriterRole, libraryPanelsGeneralReaderRole, libraryPanelsGeneralWriterRole}
 
+	if hs.Features.IsEnabled(context.Background(), featuremgmt.FlagAnnotationPermissionUpdate) {
+		allAnnotationsReaderRole := ac.RoleRegistration{
+			Role: ac.RoleDTO{
+				Name:        "fixed:annotations.all:reader",
+				DisplayName: "Reader",
+				Description: "Read all annotations and tags",
+				Group:       "Annotations",
+				Permissions: []ac.Permission{
+					{Action: ac.ActionAnnotationsRead, Scope: ac.ScopeAnnotationsTypeOrganization},
+					{Action: ac.ActionAnnotationsRead, Scope: dashboards.ScopeFoldersAll},
+				},
+			},
+			Grants: []string{string(org.RoleAdmin)},
+		}
+
+		allAnnotationsWriterRole := ac.RoleRegistration{
+			Role: ac.RoleDTO{
+				Name:        "fixed:annotations.all:writer",
+				DisplayName: "Writer",
+				Description: "Update all annotations.",
+				Group:       "Annotations",
+				Permissions: []ac.Permission{
+					{Action: ac.ActionAnnotationsCreate, Scope: ac.ScopeAnnotationsTypeOrganization},
+					{Action: ac.ActionAnnotationsCreate, Scope: dashboards.ScopeFoldersAll},
+					{Action: ac.ActionAnnotationsDelete, Scope: ac.ScopeAnnotationsTypeOrganization},
+					{Action: ac.ActionAnnotationsDelete, Scope: dashboards.ScopeFoldersAll},
+					{Action: ac.ActionAnnotationsWrite, Scope: ac.ScopeAnnotationsTypeOrganization},
+					{Action: ac.ActionAnnotationsWrite, Scope: dashboards.ScopeFoldersAll},
+				},
+			},
+			Grants: []string{string(org.RoleAdmin)},
+		}
+
+		roles = append(roles, allAnnotationsReaderRole, allAnnotationsWriterRole)
+	}
+
 	return hs.accesscontrolService.DeclareFixedRoles(roles...)
 }
 
 // Metadata helpers
 // getAccessControlMetadata returns the accesscontrol metadata associated with a given resource
 func (hs *HTTPServer) getAccessControlMetadata(c *contextmodel.ReqContext,
-	orgID int64, prefix string, resourceID string) ac.Metadata {
+	prefix string, resourceID string) ac.Metadata {
 	ids := map[string]bool{resourceID: true}
 	return hs.getMultiAccessControlMetadata(c, prefix, ids)[resourceID]
 }
diff --git a/pkg/api/admin.go b/pkg/api/admin.go
index d0ccd476cc1eb..da2d61c430658 100644
--- a/pkg/api/admin.go
+++ b/pkg/api/admin.go
@@ -3,6 +3,7 @@ package api
 import (
 	"context"
 	"net/http"
+	"time"
 
 	"github.com/grafana/grafana/pkg/api/response"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
@@ -61,8 +62,14 @@ func (hs *HTTPServer) AdminGetVerboseSettings(c *contextmodel.ReqContext) respon
 func (hs *HTTPServer) AdminGetStats(c *contextmodel.ReqContext) response.Response {
 	adminStats, err := hs.statsService.GetAdminStats(c.Req.Context(), &stats.GetAdminStatsQuery{})
 	if err != nil {
-		return response.Error(500, "Failed to get admin stats from database", err)
+		return response.Error(http.StatusInternalServerError, "Failed to get admin stats from database", err)
 	}
+	anonymousDeviceExpiration := 30 * 24 * time.Hour
+	devicesCount, err := hs.anonService.CountDevices(c.Req.Context(), time.Now().Add(-anonymousDeviceExpiration), time.Now().Add(time.Minute))
+	if err != nil {
+		return response.Error(http.StatusInternalServerError, "Failed to get anon stats from database", err)
+	}
+	adminStats.AnonymousStats.ActiveDevices = devicesCount
 
 	return response.JSON(http.StatusOK, adminStats)
 }
diff --git a/pkg/api/admin_provisioning.go b/pkg/api/admin_provisioning.go
index 704a2e51b997a..e46d5b486b721 100644
--- a/pkg/api/admin_provisioning.go
+++ b/pkg/api/admin_provisioning.go
@@ -3,6 +3,7 @@ package api
 import (
 	"context"
 	"errors"
+	"net/http"
 
 	"github.com/grafana/grafana/pkg/api/response"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
@@ -26,7 +27,7 @@ import (
 func (hs *HTTPServer) AdminProvisioningReloadDashboards(c *contextmodel.ReqContext) response.Response {
 	err := hs.ProvisioningService.ProvisionDashboards(c.Req.Context())
 	if err != nil && !errors.Is(err, context.Canceled) {
-		return response.Error(500, "", err)
+		return response.Error(http.StatusInternalServerError, "", err)
 	}
 	return response.Success("Dashboards config reloaded")
 }
@@ -49,7 +50,7 @@ func (hs *HTTPServer) AdminProvisioningReloadDashboards(c *contextmodel.ReqConte
 func (hs *HTTPServer) AdminProvisioningReloadDatasources(c *contextmodel.ReqContext) response.Response {
 	err := hs.ProvisioningService.ProvisionDatasources(c.Req.Context())
 	if err != nil {
-		return response.Error(500, "", err)
+		return response.Error(http.StatusInternalServerError, "", err)
 	}
 	return response.Success("Datasources config reloaded")
 }
@@ -72,38 +73,15 @@ func (hs *HTTPServer) AdminProvisioningReloadDatasources(c *contextmodel.ReqCont
 func (hs *HTTPServer) AdminProvisioningReloadPlugins(c *contextmodel.ReqContext) response.Response {
 	err := hs.ProvisioningService.ProvisionPlugins(c.Req.Context())
 	if err != nil {
-		return response.Error(500, "Failed to reload plugins config", err)
+		return response.Error(http.StatusInternalServerError, "Failed to reload plugins config", err)
 	}
 	return response.Success("Plugins config reloaded")
 }
 
-// swagger:route POST /admin/provisioning/notifications/reload admin_provisioning adminProvisioningReloadNotifications
-//
-// Reload legacy alert notifier provisioning configurations.
-//
-// Reloads the provisioning config files for legacy alert notifiers again. It won’t return until the new provisioned entities are already stored in the database. In case of dashboards, it will stop polling for changes in dashboard files and then restart it with new configurations after returning.
-// If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `provisioning:reload` and scope `provisioners:notifications`.
-//
-// Security:
-// - basic:
-//
-// Responses:
-// 200: okResponse
-// 401: unauthorisedError
-// 403: forbiddenError
-// 500: internalServerError
-func (hs *HTTPServer) AdminProvisioningReloadNotifications(c *contextmodel.ReqContext) response.Response {
-	err := hs.ProvisioningService.ProvisionNotifications(c.Req.Context())
-	if err != nil {
-		return response.Error(500, "", err)
-	}
-	return response.Success("Notifications config reloaded")
-}
-
 func (hs *HTTPServer) AdminProvisioningReloadAlerting(c *contextmodel.ReqContext) response.Response {
 	err := hs.ProvisioningService.ProvisionAlerting(c.Req.Context())
 	if err != nil {
-		return response.Error(500, "", err)
+		return response.Error(http.StatusInternalServerError, "", err)
 	}
 	return response.Success("Alerting config reloaded")
 }
diff --git a/pkg/api/admin_provisioning_test.go b/pkg/api/admin_provisioning_test.go
index dcfe9726f2615..96dc43e7cfc69 100644
--- a/pkg/api/admin_provisioning_test.go
+++ b/pkg/api/admin_provisioning_test.go
@@ -71,26 +71,6 @@ func TestAPI_AdminProvisioningReload_AccessControl(t *testing.T) {
 			expectedCode: http.StatusForbidden,
 			url:          "/api/admin/provisioning/dashboards/reload",
 		},
-		{
-			desc:         "should work for notifications with specific scope",
-			expectedCode: http.StatusOK,
-			expectedBody: `{"message":"Notifications config reloaded"}`,
-			permissions: []accesscontrol.Permission{
-				{
-					Action: ActionProvisioningReload,
-					Scope:  ScopeProvisionersNotifications,
-				},
-			},
-			url: "/api/admin/provisioning/notifications/reload",
-			checkCall: func(mock provisioning.ProvisioningServiceMock) {
-				assert.Len(t, mock.Calls.ProvisionNotifications, 1)
-			},
-		},
-		{
-			desc:         "should fail for notifications with no permission",
-			expectedCode: http.StatusForbidden,
-			url:          "/api/admin/provisioning/notifications/reload",
-		},
 		{
 			desc:         "should work for datasources with specific scope",
 			expectedCode: http.StatusOK,
diff --git a/pkg/api/admin_test.go b/pkg/api/admin_test.go
index 04c69f4755bc7..90227573bac9f 100644
--- a/pkg/api/admin_test.go
+++ b/pkg/api/admin_test.go
@@ -10,6 +10,8 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/db/dbtest"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/anonymous/anontest"
+	"github.com/grafana/grafana/pkg/services/stats"
 	"github.com/grafana/grafana/pkg/services/stats/statstest"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/web/webtest"
@@ -150,11 +152,16 @@ func TestAdmin_AccessControl(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.desc, func(t *testing.T) {
+			fakeStatsService := statstest.NewFakeService()
+			fakeStatsService.ExpectedAdminStats = &stats.AdminStats{}
+			fakeAnonService := anontest.NewFakeService()
+			fakeAnonService.ExpectedCountDevices = 0
 			server := SetupAPITestServer(t, func(hs *HTTPServer) {
 				hs.Cfg = setting.NewCfg()
 				hs.SQLStore = dbtest.NewFakeDB()
 				hs.SettingsProvider = &setting.OSSImpl{Cfg: hs.Cfg}
-				hs.statsService = statstest.NewFakeService()
+				hs.statsService = fakeStatsService
+				hs.anonService = fakeAnonService
 			})
 
 			res, err := server.Send(webtest.RequestWithSignedInUser(server.NewGetRequest(tt.url), userWithPermissions(1, tt.permissions)))
diff --git a/pkg/api/admin_users.go b/pkg/api/admin_users.go
index 6539fb3de0b06..53b733bcf746e 100644
--- a/pkg/api/admin_users.go
+++ b/pkg/api/admin_users.go
@@ -58,7 +58,7 @@ func (hs *HTTPServer) AdminCreateUser(c *contextmodel.ReqContext) response.Respo
 	}
 
 	if len(cmd.Password) < 4 {
-		return response.Error(400, "Password is missing or too short", nil)
+		return response.Error(http.StatusBadRequest, "Password is missing or too short", nil)
 	}
 
 	usr, err := hs.userService.Create(c.Req.Context(), &cmd)
@@ -100,6 +100,11 @@ func (hs *HTTPServer) AdminCreateUser(c *contextmodel.ReqContext) response.Respo
 // 403: forbiddenError
 // 500: internalServerError
 func (hs *HTTPServer) AdminUpdateUserPassword(c *contextmodel.ReqContext) response.Response {
+	if hs.Cfg.DisableLoginForm || hs.Cfg.DisableLogin {
+		return response.Error(http.StatusForbidden,
+			"Not allowed to reset password when login form is disabled", nil)
+	}
+
 	form := dtos.AdminUpdateUserPasswordForm{}
 	if err := web.Bind(c.Req, &form); err != nil {
 		return response.Error(http.StatusBadRequest, "bad request data", err)
@@ -110,29 +115,48 @@ func (hs *HTTPServer) AdminUpdateUserPassword(c *contextmodel.ReqContext) respon
 		return response.Error(http.StatusBadRequest, "id is invalid", err)
 	}
 
-	if len(form.Password) < 4 {
-		return response.Error(400, "New password too short", nil)
+	if err := form.Password.Validate(hs.Cfg); err != nil {
+		return response.Err(err)
 	}
 
 	userQuery := user.GetUserByIDQuery{ID: userID}
 
 	usr, err := hs.userService.GetByID(c.Req.Context(), &userQuery)
 	if err != nil {
-		return response.Error(500, "Could not read user from database", err)
+		return response.Error(http.StatusInternalServerError, "Could not read user from database", err)
+	}
+
+	getAuthQuery := login.GetAuthInfoQuery{UserId: usr.ID}
+	if authInfo, err := hs.authInfoService.GetAuthInfo(c.Req.Context(), &getAuthQuery); err == nil {
+		oauthInfo := hs.SocialService.GetOAuthInfoProvider(authInfo.AuthModule)
+		if login.IsProviderEnabled(hs.Cfg, authInfo.AuthModule, oauthInfo) {
+			return response.Error(http.StatusBadRequest, "Cannot update external user password", err)
+		}
 	}
 
-	passwordHashed, err := util.EncodePassword(form.Password, usr.Salt)
+	passwordHashed, err := util.EncodePassword(string(form.Password), usr.Salt)
 	if err != nil {
-		return response.Error(500, "Could not encode password", err)
+		return response.Error(http.StatusInternalServerError, "Could not encode password", err)
 	}
 
 	cmd := user.ChangeUserPasswordCommand{
 		UserID:      userID,
-		NewPassword: passwordHashed,
+		NewPassword: user.Password(passwordHashed),
 	}
 
 	if err := hs.userService.ChangePassword(c.Req.Context(), &cmd); err != nil {
-		return response.Error(500, "Failed to update user password", err)
+		return response.Error(http.StatusInternalServerError, "Failed to update user password", err)
+	}
+
+	if err := hs.loginAttemptService.Reset(c.Req.Context(),
+		usr.Login); err != nil {
+		c.Logger.Warn("could not reset login attempts", "err", err, "username", usr.Login)
+	}
+
+	if err := hs.AuthTokenService.RevokeAllUserTokens(c.Req.Context(),
+		userID); err != nil {
+		return response.Error(http.StatusExpectationFailed,
+			"User password updated but unable to revoke user sessions", err)
 	}
 
 	return response.Success("User password updated")
@@ -163,11 +187,8 @@ func (hs *HTTPServer) AdminUpdateUserPermissions(c *contextmodel.ReqContext) res
 
 	getAuthQuery := login.GetAuthInfoQuery{UserId: userID}
 	if authInfo, err := hs.authInfoService.GetAuthInfo(c.Req.Context(), &getAuthQuery); err == nil && authInfo != nil {
-		oAuthAndAllowAssignGrafanaAdmin := false
-		if oauthInfo := hs.SocialService.GetOAuthInfoProvider(strings.TrimPrefix(authInfo.AuthModule, "oauth_")); oauthInfo != nil {
-			oAuthAndAllowAssignGrafanaAdmin = oauthInfo.AllowAssignGrafanaAdmin
-		}
-		if login.IsGrafanaAdminExternallySynced(hs.Cfg, authInfo.AuthModule, oAuthAndAllowAssignGrafanaAdmin) {
+		oauthInfo := hs.SocialService.GetOAuthInfoProvider(authInfo.AuthModule)
+		if login.IsGrafanaAdminExternallySynced(hs.Cfg, oauthInfo, authInfo.AuthModule) {
 			return response.Error(http.StatusForbidden, "Cannot change Grafana Admin role for externally synced user", nil)
 		}
 	}
@@ -175,10 +196,10 @@ func (hs *HTTPServer) AdminUpdateUserPermissions(c *contextmodel.ReqContext) res
 	err = hs.userService.UpdatePermissions(c.Req.Context(), userID, form.IsGrafanaAdmin)
 	if err != nil {
 		if errors.Is(err, user.ErrLastGrafanaAdmin) {
-			return response.Error(400, user.ErrLastGrafanaAdmin.Error(), nil)
+			return response.Error(http.StatusBadRequest, user.ErrLastGrafanaAdmin.Error(), nil)
 		}
 
-		return response.Error(500, "Failed to update user permissions", err)
+		return response.Error(http.StatusInternalServerError, "Failed to update user permissions", err)
 	}
 
 	return response.Success("User permissions updated")
@@ -209,9 +230,9 @@ func (hs *HTTPServer) AdminDeleteUser(c *contextmodel.ReqContext) response.Respo
 
 	if err := hs.userService.Delete(c.Req.Context(), &cmd); err != nil {
 		if errors.Is(err, user.ErrUserNotFound) {
-			return response.Error(404, user.ErrUserNotFound.Error(), nil)
+			return response.Error(http.StatusNotFound, user.ErrUserNotFound.Error(), nil)
 		}
-		return response.Error(500, "Failed to delete user", err)
+		return response.Error(http.StatusInternalServerError, "Failed to delete user", err)
 	}
 
 	g, ctx := errgroup.WithContext(c.Req.Context())
@@ -227,12 +248,6 @@ func (hs *HTTPServer) AdminDeleteUser(c *contextmodel.ReqContext) response.Respo
 		}
 		return nil
 	})
-	g.Go(func() error {
-		if err := hs.DashboardService.DeleteACLByUser(ctx, cmd.UserID); err != nil {
-			return err
-		}
-		return nil
-	})
 	g.Go(func() error {
 		if err := hs.preferenceService.DeleteByUser(ctx, cmd.UserID); err != nil {
 			return err
@@ -270,7 +285,7 @@ func (hs *HTTPServer) AdminDeleteUser(c *contextmodel.ReqContext) response.Respo
 		return nil
 	})
 	if err := g.Wait(); err != nil {
-		return response.Error(500, "Failed to delete user", err)
+		return response.Error(http.StatusInternalServerError, "Failed to delete user", err)
 	}
 
 	return response.Success("User deleted")
@@ -300,20 +315,20 @@ func (hs *HTTPServer) AdminDisableUser(c *contextmodel.ReqContext) response.Resp
 	// External users shouldn't be disabled from API
 	authInfoQuery := &login.GetAuthInfoQuery{UserId: userID}
 	if _, err := hs.authInfoService.GetAuthInfo(c.Req.Context(), authInfoQuery); !errors.Is(err, user.ErrUserNotFound) {
-		return response.Error(500, "Could not disable external user", nil)
+		return response.Error(http.StatusInternalServerError, "Could not disable external user", nil)
 	}
 
 	disableCmd := user.DisableUserCommand{UserID: userID, IsDisabled: true}
 	if err := hs.userService.Disable(c.Req.Context(), &disableCmd); err != nil {
 		if errors.Is(err, user.ErrUserNotFound) {
-			return response.Error(404, user.ErrUserNotFound.Error(), nil)
+			return response.Error(http.StatusNotFound, user.ErrUserNotFound.Error(), nil)
 		}
-		return response.Error(500, "Failed to disable user", err)
+		return response.Error(http.StatusInternalServerError, "Failed to disable user", err)
 	}
 
 	err = hs.AuthTokenService.RevokeAllUserTokens(c.Req.Context(), userID)
 	if err != nil {
-		return response.Error(500, "Failed to disable user", err)
+		return response.Error(http.StatusInternalServerError, "Failed to disable user", err)
 	}
 
 	return response.Success("User disabled")
@@ -343,15 +358,15 @@ func (hs *HTTPServer) AdminEnableUser(c *contextmodel.ReqContext) response.Respo
 	// External users shouldn't be disabled from API
 	authInfoQuery := &login.GetAuthInfoQuery{UserId: userID}
 	if _, err := hs.authInfoService.GetAuthInfo(c.Req.Context(), authInfoQuery); !errors.Is(err, user.ErrUserNotFound) {
-		return response.Error(500, "Could not enable external user", nil)
+		return response.Error(http.StatusInternalServerError, "Could not enable external user", nil)
 	}
 
 	disableCmd := user.DisableUserCommand{UserID: userID, IsDisabled: false}
 	if err := hs.userService.Disable(c.Req.Context(), &disableCmd); err != nil {
 		if errors.Is(err, user.ErrUserNotFound) {
-			return response.Error(404, user.ErrUserNotFound.Error(), nil)
+			return response.Error(http.StatusNotFound, user.ErrUserNotFound.Error(), nil)
 		}
-		return response.Error(500, "Failed to enable user", err)
+		return response.Error(http.StatusInternalServerError, "Failed to enable user", err)
 	}
 
 	return response.Success("User enabled")
diff --git a/pkg/api/admin_users_test.go b/pkg/api/admin_users_test.go
index 2c2f8a49aa79a..d40417f72f302 100644
--- a/pkg/api/admin_users_test.go
+++ b/pkg/api/admin_users_test.go
@@ -15,12 +15,12 @@ import (
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/db/dbtest"
 	"github.com/grafana/grafana/pkg/login/social"
-	"github.com/grafana/grafana/pkg/login/socialtest"
+	"github.com/grafana/grafana/pkg/login/social/socialtest"
 	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/auth/authtest"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/login"
-	"github.com/grafana/grafana/pkg/services/login/logintest"
+	"github.com/grafana/grafana/pkg/services/login/authinfotest"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/user/usertest"
@@ -230,7 +230,7 @@ func TestAdminAPIEndpoint(t *testing.T) {
 
 			respJSON, err := simplejson.NewJson(sc.resp.Body.Bytes())
 			require.NoError(t, err)
-			assert.Equal(t, "user already exists", respJSON.Get("error").MustString())
+			assert.Equal(t, "User with email '' or username 'existing@example.com' already exists", respJSON.Get("message").MustString())
 		})
 	})
 }
@@ -312,19 +312,17 @@ func Test_AdminUpdateUserPermissions(t *testing.T) {
 	for _, tc := range testcases {
 		t.Run(tc.name, func(t *testing.T) {
 			userAuth := &login.UserAuth{AuthModule: tc.authModule}
-			authInfoService := &logintest.AuthInfoServiceFake{ExpectedUserAuth: userAuth}
+			authInfoService := &authinfotest.FakeService{ExpectedUserAuth: userAuth}
 			socialService := &socialtest.FakeSocialService{}
 			cfg := setting.NewCfg()
 
 			switch tc.authModule {
 			case login.GenericOAuthModule:
-				socialService.ExpectedAuthInfoProvider = &social.OAuthInfo{AllowAssignGrafanaAdmin: tc.allowAssignGrafanaAdmin, Enabled: tc.authEnabled}
-				cfg.GenericOAuthAuthEnabled = tc.authEnabled
-				cfg.GenericOAuthSkipOrgRoleSync = tc.skipOrgRoleSync
+				socialService.ExpectedAuthInfoProvider = &social.OAuthInfo{AllowAssignGrafanaAdmin: tc.allowAssignGrafanaAdmin, Enabled: tc.authEnabled, SkipOrgRoleSync: tc.skipOrgRoleSync}
 			case login.JWTModule:
-				cfg.JWTAuthEnabled = tc.authEnabled
-				cfg.JWTAuthSkipOrgRoleSync = tc.skipOrgRoleSync
-				cfg.JWTAuthAllowAssignGrafanaAdmin = tc.allowAssignGrafanaAdmin
+				cfg.JWTAuth.Enabled = tc.authEnabled
+				cfg.JWTAuth.SkipOrgRoleSync = tc.skipOrgRoleSync
+				cfg.JWTAuth.AllowAssignGrafanaAdmin = tc.allowAssignGrafanaAdmin
 			}
 
 			hs := &HTTPServer{
@@ -357,7 +355,7 @@ func putAdminScenario(t *testing.T, desc string, url string, routePattern string
 		hs := &HTTPServer{
 			Cfg:             setting.NewCfg(),
 			SQLStore:        sqlStore,
-			authInfoService: &logintest.AuthInfoServiceFake{},
+			authInfoService: &authinfotest.FakeService{},
 			userService:     userSvc,
 		}
 
@@ -462,7 +460,7 @@ func adminDisableUserScenario(t *testing.T, desc string, action string, url stri
 	t.Run(fmt.Sprintf("%s %s", desc, url), func(t *testing.T) {
 		fakeAuthTokenService := authtest.NewFakeUserAuthTokenService()
 
-		authInfoService := &logintest.AuthInfoServiceFake{}
+		authInfoService := &authinfotest.FakeService{}
 
 		hs := HTTPServer{
 			SQLStore:         dbtest.NewFakeDB(),
@@ -500,7 +498,7 @@ func adminDeleteUserScenario(t *testing.T, desc string, url string, routePattern
 	t.Run(fmt.Sprintf("%s %s", desc, url), func(t *testing.T) {
 		sc := setupScenarioContext(t, url)
 		sc.sqlStore = hs.SQLStore
-		sc.authInfoService = &logintest.AuthInfoServiceFake{}
+		sc.authInfoService = &authinfotest.FakeService{}
 		sc.defaultHandler = routing.Wrap(func(c *contextmodel.ReqContext) response.Response {
 			sc.context = c
 			sc.context.UserID = testUserID
diff --git a/pkg/api/alerting.go b/pkg/api/alerting.go
index 8967773be52c2..1c7b9c6dcd356 100644
--- a/pkg/api/alerting.go
+++ b/pkg/api/alerting.go
@@ -1,1045 +1,15 @@
 package api
 
 import (
-	"context"
-	"errors"
-	"fmt"
 	"net/http"
-	"strconv"
 
-	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/api/response"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	alertmodels "github.com/grafana/grafana/pkg/services/alerting/models"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/datasources"
-	"github.com/grafana/grafana/pkg/services/guardian"
 	"github.com/grafana/grafana/pkg/services/ngalert/notifier/channels_config"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/services/search"
-	"github.com/grafana/grafana/pkg/services/search/model"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/util"
-	"github.com/grafana/grafana/pkg/web"
 )
 
-func (hs *HTTPServer) ValidateOrgAlert(c *contextmodel.ReqContext) {
-	id, err := strconv.ParseInt(web.Params(c.Req)[":alertId"], 10, 64)
-	if err != nil {
-		c.JsonApiErr(http.StatusBadRequest, "alertId is invalid", nil)
-		return
-	}
-	query := alertmodels.GetAlertByIdQuery{ID: id}
-
-	res, err := hs.AlertEngine.AlertStore.GetAlertById(c.Req.Context(), &query)
-	if err != nil {
-		c.JsonApiErr(404, "Alert not found", nil)
-		return
-	}
-
-	if c.SignedInUser.GetOrgID() != res.OrgID {
-		c.JsonApiErr(403, "You are not allowed to edit/view alert", nil)
-		return
-	}
-}
-
-// swagger:route GET /alerts/states-for-dashboard legacy_alerts getDashboardStates
-//
-// Get alert states for a dashboard.
-//
-// Responses:
-// Responses:
-// 200: getDashboardStatesResponse
-// 400: badRequestError
-// 500: internalServerError
-func (hs *HTTPServer) GetAlertStatesForDashboard(c *contextmodel.ReqContext) response.Response {
-	dashboardID := c.QueryInt64("dashboardId")
-
-	if dashboardID == 0 {
-		return response.Error(400, "Missing query parameter dashboardId", nil)
-	}
-
-	query := alertmodels.GetAlertStatesForDashboardQuery{
-		OrgID:       c.SignedInUser.GetOrgID(),
-		DashboardID: c.QueryInt64("dashboardId"),
-	}
-
-	res, err := hs.AlertEngine.AlertStore.GetAlertStatesForDashboard(c.Req.Context(), &query)
-	if err != nil {
-		return response.Error(500, "Failed to fetch alert states", err)
-	}
-
-	return response.JSON(http.StatusOK, res)
-}
-
-// swagger:route GET /alerts legacy_alerts getAlerts
-//
-// Get legacy alerts.
-//
-// Responses:
-// 200: getAlertsResponse
-// 401: unauthorisedError
-// 500: internalServerError
-func (hs *HTTPServer) GetAlerts(c *contextmodel.ReqContext) response.Response {
-	dashboardQuery := c.Query("dashboardQuery")
-	dashboardTags := c.QueryStrings("dashboardTag")
-	stringDashboardIDs := c.QueryStrings("dashboardId")
-	stringFolderIDs := c.QueryStrings("folderId")
-
-	dashboardIDs := make([]int64, 0)
-	for _, id := range stringDashboardIDs {
-		dashboardID, err := strconv.ParseInt(id, 10, 64)
-		if err == nil {
-			dashboardIDs = append(dashboardIDs, dashboardID)
-		}
-	}
-
-	if dashboardQuery != "" || len(dashboardTags) > 0 || len(stringFolderIDs) > 0 {
-		folderIDs := make([]int64, 0)
-		for _, id := range stringFolderIDs {
-			folderID, err := strconv.ParseInt(id, 10, 64)
-			if err == nil {
-				folderIDs = append(folderIDs, folderID)
-			}
-		}
-
-		searchQuery := search.Query{
-			Title:        dashboardQuery,
-			Tags:         dashboardTags,
-			SignedInUser: c.SignedInUser,
-			Limit:        1000,
-			OrgId:        c.SignedInUser.GetOrgID(),
-			DashboardIds: dashboardIDs,
-			Type:         string(model.DashHitDB),
-			FolderIds:    folderIDs,
-			Permission:   dashboards.PERMISSION_VIEW,
-		}
-
-		hits, err := hs.SearchService.SearchHandler(c.Req.Context(), &searchQuery)
-		if err != nil {
-			return response.Error(500, "List alerts failed", err)
-		}
-
-		for _, d := range hits {
-			if d.Type == model.DashHitDB && d.ID > 0 {
-				dashboardIDs = append(dashboardIDs, d.ID)
-			}
-		}
-
-		// if we didn't find any dashboards, return empty result
-		if len(dashboardIDs) == 0 {
-			return response.JSON(http.StatusOK, []*alertmodels.AlertListItemDTO{})
-		}
-	}
-
-	query := alertmodels.GetAlertsQuery{
-		OrgID:        c.SignedInUser.GetOrgID(),
-		DashboardIDs: dashboardIDs,
-		PanelID:      c.QueryInt64("panelId"),
-		Limit:        c.QueryInt64("limit"),
-		User:         c.SignedInUser,
-		Query:        c.Query("query"),
-	}
-
-	states := c.QueryStrings("state")
-	if len(states) > 0 {
-		query.State = states
-	}
-
-	res, err := hs.AlertEngine.AlertStore.HandleAlertsQuery(c.Req.Context(), &query)
-	if err != nil {
-		return response.Error(500, "List alerts failed", err)
-	}
-
-	for _, alert := range res {
-		alert.URL = dashboards.GetDashboardURL(alert.DashboardUID, alert.DashboardSlug)
-	}
-
-	return response.JSON(http.StatusOK, res)
-}
-
-// swagger:route POST /alerts/test legacy_alerts testAlert
-//
-// Test alert.
-//
-// Responses:
-// 200: testAlertResponse
-// 400: badRequestError
-// 422: unprocessableEntityError
-// 403: forbiddenError
-// 500: internalServerError
-func (hs *HTTPServer) AlertTest(c *contextmodel.ReqContext) response.Response {
-	dto := dtos.AlertTestCommand{}
-	if err := web.Bind(c.Req, &dto); err != nil {
-		return response.Error(http.StatusBadRequest, "bad request data", err)
-	}
-	if _, idErr := dto.Dashboard.Get("id").Int64(); idErr != nil {
-		return response.Error(400, "The dashboard needs to be saved at least once before you can test an alert rule", nil)
-	}
-
-	res, err := hs.AlertEngine.AlertTest(c.SignedInUser.GetOrgID(), dto.Dashboard, dto.PanelId, c.SignedInUser)
-	if err != nil {
-		var validationErr alerting.ValidationError
-		if errors.As(err, &validationErr) {
-			return response.Error(422, validationErr.Error(), nil)
-		}
-		if errors.Is(err, datasources.ErrDataSourceAccessDenied) {
-			return response.Error(403, "Access denied to datasource", err)
-		}
-		return response.Error(500, "Failed to test rule", err)
-	}
-
-	dtoRes := &dtos.AlertTestResult{
-		Firing:         res.Firing,
-		ConditionEvals: res.ConditionEvals,
-		State:          res.Rule.State,
-	}
-
-	if res.Error != nil {
-		dtoRes.Error = res.Error.Error()
-	}
-
-	for _, log := range res.Logs {
-		dtoRes.Logs = append(dtoRes.Logs, &dtos.AlertTestResultLog{Message: log.Message, Data: log.Data})
-	}
-	for _, match := range res.EvalMatches {
-		dtoRes.EvalMatches = append(dtoRes.EvalMatches, &dtos.EvalMatch{Metric: match.Metric, Value: match.Value})
-	}
-
-	dtoRes.TimeMs = fmt.Sprintf("%1.3fms", res.GetDurationMs())
-
-	return response.JSON(http.StatusOK, dtoRes)
-}
-
-// swagger:route GET /alerts/{alert_id} legacy_alerts getAlertByID
-//
-// Get alert by ID.
-//
-// “evalMatches” data in the response is cached in the db when and only when the state of the alert changes (e.g. transitioning from “ok” to “alerting” state).
-// If data from one server triggers the alert first and, before that server is seen leaving alerting state, a second server also enters a state that would trigger the alert, the second server will not be visible in “evalMatches” data.
-//
-// Responses:
-// 200: getAlertResponse
-// 401: unauthorisedError
-// 500: internalServerError
-func (hs *HTTPServer) GetAlert(c *contextmodel.ReqContext) response.Response {
-	id, err := strconv.ParseInt(web.Params(c.Req)[":alertId"], 10, 64)
-	if err != nil {
-		return response.Error(http.StatusBadRequest, "alertId is invalid", err)
-	}
-	query := alertmodels.GetAlertByIdQuery{ID: id}
-
-	res, err := hs.AlertEngine.AlertStore.GetAlertById(c.Req.Context(), &query)
-	if err != nil {
-		return response.Error(500, "List alerts failed", err)
-	}
-
-	return response.JSON(http.StatusOK, &res)
-}
-
-func (hs *HTTPServer) GetAlertNotifiers(ngalertEnabled bool) func(*contextmodel.ReqContext) response.Response {
+func (hs *HTTPServer) GetAlertNotifiers() func(*contextmodel.ReqContext) response.Response {
 	return func(_ *contextmodel.ReqContext) response.Response {
-		if ngalertEnabled {
-			return response.JSON(http.StatusOK, channels_config.GetAvailableNotifiers())
-		}
-		// TODO(codesome): This wont be required in 8.0 since ngalert
-		// will be enabled by default with no disabling. This is to be removed later.
-		return response.JSON(http.StatusOK, alerting.GetNotifiers())
+		return response.JSON(http.StatusOK, channels_config.GetAvailableNotifiers())
 	}
 }
-
-// swagger:route GET /alert-notifications/lookup legacy_alerts_notification_channels getAlertNotificationLookup
-//
-// Get all notification channels (lookup).
-//
-// Returns all notification channels, but with less detailed information. Accessible by any authenticated user and is mainly used by providing alert notification channels in Grafana UI when configuring alert rule.
-//
-// Responses:
-// 200: getAlertNotificationLookupResponse
-// 401: unauthorisedError
-// 403: forbiddenError
-// 500: internalServerError
-func (hs *HTTPServer) GetAlertNotificationLookup(c *contextmodel.ReqContext) response.Response {
-	alertNotifications, err := hs.getAlertNotificationsInternal(c)
-	if err != nil {
-		return response.Error(500, "Failed to get alert notifications", err)
-	}
-
-	result := make([]*dtos.AlertNotificationLookup, 0)
-
-	for _, notification := range alertNotifications {
-		result = append(result, dtos.NewAlertNotificationLookup(notification))
-	}
-
-	return response.JSON(http.StatusOK, result)
-}
-
-// swagger:route GET /alert-notifications legacy_alerts_notification_channels getAlertNotificationChannels
-//
-// Get all notification channels.
-//
-// Returns all notification channels that the authenticated user has permission to view.
-//
-// Responses:
-// 200: getAlertNotificationChannelsResponse
-// 401: unauthorisedError
-// 403: forbiddenError
-// 500: internalServerError
-func (hs *HTTPServer) GetAlertNotifications(c *contextmodel.ReqContext) response.Response {
-	alertNotifications, err := hs.getAlertNotificationsInternal(c)
-	if err != nil {
-		return response.Error(500, "Failed to get alert notifications", err)
-	}
-
-	result := make([]*dtos.AlertNotification, 0)
-
-	for _, notification := range alertNotifications {
-		result = append(result, dtos.NewAlertNotification(notification))
-	}
-
-	return response.JSON(http.StatusOK, result)
-}
-
-func (hs *HTTPServer) getAlertNotificationsInternal(c *contextmodel.ReqContext) ([]*alertmodels.AlertNotification, error) {
-	query := &alertmodels.GetAllAlertNotificationsQuery{OrgID: c.SignedInUser.GetOrgID()}
-	return hs.AlertNotificationService.GetAllAlertNotifications(c.Req.Context(), query)
-}
-
-// swagger:route GET /alert-notifications/{notification_channel_id} legacy_alerts_notification_channels getAlertNotificationChannelByID
-//
-// Get notification channel by ID.
-//
-// Returns the notification channel given the notification channel ID.
-//
-// Responses:
-// 200: getAlertNotificationChannelResponse
-// 401: unauthorisedError
-// 403: forbiddenError
-// 404: notFoundError
-// 500: internalServerError
-func (hs *HTTPServer) GetAlertNotificationByID(c *contextmodel.ReqContext) response.Response {
-	notificationId, err := strconv.ParseInt(web.Params(c.Req)[":notificationId"], 10, 64)
-	if err != nil {
-		return response.Error(http.StatusBadRequest, "notificationId is invalid", err)
-	}
-	query := &alertmodels.GetAlertNotificationsQuery{
-		OrgID: c.SignedInUser.GetOrgID(),
-		ID:    notificationId,
-	}
-
-	if query.ID == 0 {
-		return response.Error(404, "Alert notification not found", nil)
-	}
-
-	res, err := hs.AlertNotificationService.GetAlertNotifications(c.Req.Context(), query)
-	if err != nil {
-		return response.Error(500, "Failed to get alert notifications", err)
-	}
-
-	if res == nil {
-		return response.Error(404, "Alert notification not found", nil)
-	}
-
-	return response.JSON(http.StatusOK, dtos.NewAlertNotification(res))
-}
-
-// swagger:route GET /alert-notifications/uid/{notification_channel_uid} legacy_alerts_notification_channels getAlertNotificationChannelByUID
-//
-// Get notification channel by UID.
-//
-// Returns the notification channel given the notification channel UID.
-//
-// Responses:
-// 200: getAlertNotificationChannelResponse
-// 401: unauthorisedError
-// 403: forbiddenError
-// 404: notFoundError
-// 500: internalServerError
-func (hs *HTTPServer) GetAlertNotificationByUID(c *contextmodel.ReqContext) response.Response {
-	query := &alertmodels.GetAlertNotificationsWithUidQuery{
-		OrgID: c.SignedInUser.GetOrgID(),
-		UID:   web.Params(c.Req)[":uid"],
-	}
-
-	if query.UID == "" {
-		return response.Error(404, "Alert notification not found", nil)
-	}
-
-	res, err := hs.AlertNotificationService.GetAlertNotificationsWithUid(c.Req.Context(), query)
-	if err != nil {
-		return response.Error(500, "Failed to get alert notifications", err)
-	}
-
-	if res == nil {
-		return response.Error(404, "Alert notification not found", nil)
-	}
-
-	return response.JSON(http.StatusOK, dtos.NewAlertNotification(res))
-}
-
-// swagger:route POST /alert-notifications legacy_alerts_notification_channels createAlertNotificationChannel
-//
-// Create notification channel.
-//
-// You can find the full list of [supported notifiers](https://grafana.com/docs/grafana/latest/alerting/old-alerting/notifications/#list-of-supported-notifiers) on the alert notifiers page.
-//
-// Responses:
-// 200: getAlertNotificationChannelResponse
-// 401: unauthorisedError
-// 403: forbiddenError
-// 409: conflictError
-// 500: internalServerError
-func (hs *HTTPServer) CreateAlertNotification(c *contextmodel.ReqContext) response.Response {
-	cmd := alertmodels.CreateAlertNotificationCommand{}
-	if err := web.Bind(c.Req, &cmd); err != nil {
-		return response.Error(http.StatusBadRequest, "bad request data", err)
-	}
-	cmd.OrgID = c.SignedInUser.GetOrgID()
-
-	res, err := hs.AlertNotificationService.CreateAlertNotificationCommand(c.Req.Context(), &cmd)
-	if err != nil {
-		if errors.Is(err, alertmodels.ErrAlertNotificationWithSameNameExists) || errors.Is(err, alertmodels.ErrAlertNotificationWithSameUIDExists) {
-			return response.Error(409, "Failed to create alert notification", err)
-		}
-		var alertingErr alerting.ValidationError
-		if errors.As(err, &alertingErr) {
-			return response.Error(400, err.Error(), err)
-		}
-		return response.Error(500, "Failed to create alert notification", err)
-	}
-
-	return response.JSON(http.StatusOK, dtos.NewAlertNotification(res))
-}
-
-// swagger:route PUT /alert-notifications/{notification_channel_id} legacy_alerts_notification_channels updateAlertNotificationChannel
-//
-// Update notification channel by ID.
-//
-// Updates an existing notification channel identified by ID.
-//
-// Responses:
-// 200: getAlertNotificationChannelResponse
-// 401: unauthorisedError
-// 403: forbiddenError
-// 404: notFoundError
-// 500: internalServerError
-func (hs *HTTPServer) UpdateAlertNotification(c *contextmodel.ReqContext) response.Response {
-	cmd := alertmodels.UpdateAlertNotificationCommand{}
-	if err := web.Bind(c.Req, &cmd); err != nil {
-		return response.Error(http.StatusBadRequest, "bad request data", err)
-	}
-	cmd.OrgID = c.SignedInUser.GetOrgID()
-
-	err := hs.fillWithSecureSettingsData(c.Req.Context(), &cmd)
-	if err != nil {
-		return response.Error(500, "Failed to update alert notification", err)
-	}
-
-	if _, err := hs.AlertNotificationService.UpdateAlertNotification(c.Req.Context(), &cmd); err != nil {
-		if errors.Is(err, alertmodels.ErrAlertNotificationNotFound) {
-			return response.Error(404, err.Error(), err)
-		}
-		var alertingErr alerting.ValidationError
-		if errors.As(err, &alertingErr) {
-			return response.Error(400, err.Error(), err)
-		}
-		return response.Error(500, "Failed to update alert notification", err)
-	}
-
-	query := alertmodels.GetAlertNotificationsQuery{
-		OrgID: c.SignedInUser.GetOrgID(),
-		ID:    cmd.ID,
-	}
-
-	res, err := hs.AlertNotificationService.GetAlertNotifications(c.Req.Context(), &query)
-	if err != nil {
-		return response.Error(500, "Failed to get alert notification", err)
-	}
-
-	return response.JSON(http.StatusOK, dtos.NewAlertNotification(res))
-}
-
-// swagger:route PUT /alert-notifications/uid/{notification_channel_uid} legacy_alerts_notification_channels updateAlertNotificationChannelByUID
-//
-// Update notification channel by UID.
-//
-// Updates an existing notification channel identified by uid.
-//
-// Responses:
-// 200: getAlertNotificationChannelResponse
-// 401: unauthorisedError
-// 403: forbiddenError
-// 404: notFoundError
-// 500: internalServerError
-func (hs *HTTPServer) UpdateAlertNotificationByUID(c *contextmodel.ReqContext) response.Response {
-	cmd := alertmodels.UpdateAlertNotificationWithUidCommand{}
-	if err := web.Bind(c.Req, &cmd); err != nil {
-		return response.Error(http.StatusBadRequest, "bad request data", err)
-	}
-	cmd.OrgID = c.SignedInUser.GetOrgID()
-	cmd.UID = web.Params(c.Req)[":uid"]
-
-	err := hs.fillWithSecureSettingsDataByUID(c.Req.Context(), &cmd)
-	if err != nil {
-		return response.Error(500, "Failed to update alert notification", err)
-	}
-
-	if _, err := hs.AlertNotificationService.UpdateAlertNotificationWithUid(c.Req.Context(), &cmd); err != nil {
-		if errors.Is(err, alertmodels.ErrAlertNotificationNotFound) {
-			return response.Error(404, err.Error(), nil)
-		}
-		return response.Error(500, "Failed to update alert notification", err)
-	}
-
-	query := alertmodels.GetAlertNotificationsWithUidQuery{
-		OrgID: cmd.OrgID,
-		UID:   cmd.UID,
-	}
-
-	res, err := hs.AlertNotificationService.GetAlertNotificationsWithUid(c.Req.Context(), &query)
-	if err != nil {
-		return response.Error(500, "Failed to get alert notification", err)
-	}
-
-	return response.JSON(http.StatusOK, dtos.NewAlertNotification(res))
-}
-
-func (hs *HTTPServer) fillWithSecureSettingsData(ctx context.Context, cmd *alertmodels.UpdateAlertNotificationCommand) error {
-	if len(cmd.SecureSettings) == 0 {
-		return nil
-	}
-
-	query := &alertmodels.GetAlertNotificationsQuery{
-		OrgID: cmd.OrgID,
-		ID:    cmd.ID,
-	}
-
-	res, err := hs.AlertNotificationService.GetAlertNotifications(ctx, query)
-	if err != nil {
-		return err
-	}
-
-	secureSettings, err := hs.EncryptionService.DecryptJsonData(ctx, res.SecureSettings, setting.SecretKey)
-	if err != nil {
-		return err
-	}
-
-	for k, v := range secureSettings {
-		if _, ok := cmd.SecureSettings[k]; !ok {
-			cmd.SecureSettings[k] = v
-		}
-	}
-
-	return nil
-}
-
-func (hs *HTTPServer) fillWithSecureSettingsDataByUID(ctx context.Context, cmd *alertmodels.UpdateAlertNotificationWithUidCommand) error {
-	if len(cmd.SecureSettings) == 0 {
-		return nil
-	}
-
-	query := &alertmodels.GetAlertNotificationsWithUidQuery{
-		OrgID: cmd.OrgID,
-		UID:   cmd.UID,
-	}
-
-	res, err := hs.AlertNotificationService.GetAlertNotificationsWithUid(ctx, query)
-	if err != nil {
-		return err
-	}
-
-	secureSettings, err := hs.EncryptionService.DecryptJsonData(ctx, res.SecureSettings, setting.SecretKey)
-	if err != nil {
-		return err
-	}
-
-	for k, v := range secureSettings {
-		if _, ok := cmd.SecureSettings[k]; !ok {
-			cmd.SecureSettings[k] = v
-		}
-	}
-
-	return nil
-}
-
-// swagger:route DELETE /alert-notifications/{notification_channel_id} legacy_alerts_notification_channels deleteAlertNotificationChannel
-//
-// Delete alert notification by ID.
-//
-// Deletes an existing notification channel identified by ID.
-//
-// Responses:
-// 200: okResponse
-// 401: unauthorisedError
-// 403: forbiddenError
-// 404: notFoundError
-// 500: internalServerError
-func (hs *HTTPServer) DeleteAlertNotification(c *contextmodel.ReqContext) response.Response {
-	notificationId, err := strconv.ParseInt(web.Params(c.Req)[":notificationId"], 10, 64)
-	if err != nil {
-		return response.Error(http.StatusBadRequest, "notificationId is invalid", err)
-	}
-
-	cmd := alertmodels.DeleteAlertNotificationCommand{
-		OrgID: c.SignedInUser.GetOrgID(),
-		ID:    notificationId,
-	}
-
-	if err := hs.AlertNotificationService.DeleteAlertNotification(c.Req.Context(), &cmd); err != nil {
-		if errors.Is(err, alertmodels.ErrAlertNotificationNotFound) {
-			return response.Error(404, err.Error(), nil)
-		}
-		return response.Error(500, "Failed to delete alert notification", err)
-	}
-
-	return response.Success("Notification deleted")
-}
-
-// swagger:route DELETE /alert-notifications/uid/{notification_channel_uid} legacy_alerts_notification_channels deleteAlertNotificationChannelByUID
-//
-// Delete alert notification by UID.
-//
-// Deletes an existing notification channel identified by UID.
-//
-// Responses:
-// 200: deleteAlertNotificationChannelResponse
-// 401: unauthorisedError
-// 403: forbiddenError
-// 404: notFoundError
-// 500: internalServerError
-func (hs *HTTPServer) DeleteAlertNotificationByUID(c *contextmodel.ReqContext) response.Response {
-	cmd := alertmodels.DeleteAlertNotificationWithUidCommand{
-		OrgID: c.SignedInUser.GetOrgID(),
-		UID:   web.Params(c.Req)[":uid"],
-	}
-
-	if err := hs.AlertNotificationService.DeleteAlertNotificationWithUid(c.Req.Context(), &cmd); err != nil {
-		if errors.Is(err, alertmodels.ErrAlertNotificationNotFound) {
-			return response.Error(404, err.Error(), nil)
-		}
-		return response.Error(500, "Failed to delete alert notification", err)
-	}
-
-	return response.JSON(http.StatusOK, util.DynMap{
-		"message": "Notification deleted",
-		"id":      cmd.DeletedAlertNotificationID,
-	})
-}
-
-// swagger:route POST /alert-notifications/test legacy_alerts_notification_channels notificationChannelTest
-//
-// Test notification channel.
-//
-// Sends a test notification to the channel.
-//
-// Responses:
-// 200: okResponse
-// 400: badRequestError
-// 401: unauthorisedError
-// 403: forbiddenError
-// 412: SMTPNotEnabledError
-// 500: internalServerError
-func (hs *HTTPServer) NotificationTest(c *contextmodel.ReqContext) response.Response {
-	dto := dtos.NotificationTestCommand{}
-	if err := web.Bind(c.Req, &dto); err != nil {
-		return response.Error(http.StatusBadRequest, "bad request data", err)
-	}
-	cmd := &alerting.NotificationTestCommand{
-		OrgID:          c.SignedInUser.GetOrgID(),
-		ID:             dto.ID,
-		Name:           dto.Name,
-		Type:           dto.Type,
-		Settings:       dto.Settings,
-		SecureSettings: dto.SecureSettings,
-	}
-
-	if err := hs.AlertNotificationService.HandleNotificationTestCommand(c.Req.Context(), cmd); err != nil {
-		if errors.Is(err, notifications.ErrSmtpNotEnabled) {
-			return response.Error(412, err.Error(), err)
-		}
-		var alertingErr alerting.ValidationError
-		if errors.As(err, &alertingErr) {
-			return response.Error(400, err.Error(), err)
-		}
-
-		return response.Error(500, "Failed to send alert notifications", err)
-	}
-
-	return response.Success("Test notification sent")
-}
-
-// swagger:route POST /alerts/{alert_id}/pause legacy_alerts pauseAlert
-//
-// Pause/unpause alert by id.
-//
-// Responses:
-// 200: pauseAlertResponse
-// 401: unauthorisedError
-// 403: forbiddenError
-// 404: notFoundError
-// 500: internalServerError
-func (hs *HTTPServer) PauseAlert(legacyAlertingEnabled *bool) func(c *contextmodel.ReqContext) response.Response {
-	if legacyAlertingEnabled == nil || !*legacyAlertingEnabled {
-		return func(_ *contextmodel.ReqContext) response.Response {
-			return response.Error(http.StatusBadRequest, "legacy alerting is disabled, so this call has no effect.", nil)
-		}
-	}
-
-	return func(c *contextmodel.ReqContext) response.Response {
-		dto := dtos.PauseAlertCommand{}
-		if err := web.Bind(c.Req, &dto); err != nil {
-			return response.Error(http.StatusBadRequest, "bad request data", err)
-		}
-		alertID, err := strconv.ParseInt(web.Params(c.Req)[":alertId"], 10, 64)
-		if err != nil {
-			return response.Error(http.StatusBadRequest, "alertId is invalid", err)
-		}
-		result := make(map[string]any)
-		result["alertId"] = alertID
-
-		query := alertmodels.GetAlertByIdQuery{ID: alertID}
-		res, err := hs.AlertEngine.AlertStore.GetAlertById(c.Req.Context(), &query)
-		if err != nil {
-			return response.Error(500, "Get Alert failed", err)
-		}
-
-		guardian, err := guardian.New(c.Req.Context(), res.DashboardID, c.SignedInUser.GetOrgID(), c.SignedInUser)
-		if err != nil {
-			return response.ErrOrFallback(http.StatusInternalServerError, "Error while creating permission guardian", err)
-		}
-		if canEdit, err := guardian.CanEdit(); err != nil || !canEdit {
-			if err != nil {
-				return response.Error(500, "Error while checking permissions for Alert", err)
-			}
-
-			return response.Error(403, "Access denied to this dashboard and alert", nil)
-		}
-
-		// Alert state validation
-		if res.State != alertmodels.AlertStatePaused && !dto.Paused {
-			result["state"] = "un-paused"
-			result["message"] = "Alert is already un-paused"
-			return response.JSON(http.StatusOK, result)
-		} else if res.State == alertmodels.AlertStatePaused && dto.Paused {
-			result["state"] = alertmodels.AlertStatePaused
-			result["message"] = "Alert is already paused"
-			return response.JSON(http.StatusOK, result)
-		}
-
-		cmd := alertmodels.PauseAlertCommand{
-			OrgID:    c.SignedInUser.GetOrgID(),
-			AlertIDs: []int64{alertID},
-			Paused:   dto.Paused,
-		}
-
-		if err := hs.AlertEngine.AlertStore.PauseAlert(c.Req.Context(), &cmd); err != nil {
-			return response.Error(500, "", err)
-		}
-
-		resp := alertmodels.AlertStateUnknown
-		pausedState := "un-paused"
-		if cmd.Paused {
-			resp = alertmodels.AlertStatePaused
-			pausedState = "paused"
-		}
-
-		result["state"] = resp
-		result["message"] = "Alert " + pausedState
-		return response.JSON(http.StatusOK, result)
-	}
-}
-
-// swagger:route POST /admin/pause-all-alerts admin pauseAllAlerts
-//
-// Pause/unpause all (legacy) alerts.
-//
-// Security:
-// - basic:
-//
-// Responses:
-// 200: pauseAlertsResponse
-// 401: unauthorisedError
-// 403: forbiddenError
-// 500: internalServerError
-func (hs *HTTPServer) PauseAllAlerts(legacyAlertingEnabled *bool) func(c *contextmodel.ReqContext) response.Response {
-	if legacyAlertingEnabled == nil || !*legacyAlertingEnabled {
-		return func(_ *contextmodel.ReqContext) response.Response {
-			return response.Error(http.StatusBadRequest, "legacy alerting is disabled, so this call has no effect.", nil)
-		}
-	}
-
-	return func(c *contextmodel.ReqContext) response.Response {
-		dto := dtos.PauseAllAlertsCommand{}
-		if err := web.Bind(c.Req, &dto); err != nil {
-			return response.Error(http.StatusBadRequest, "bad request data", err)
-		}
-		updateCmd := alertmodels.PauseAllAlertCommand{
-			Paused: dto.Paused,
-		}
-
-		if err := hs.AlertEngine.AlertStore.PauseAllAlerts(c.Req.Context(), &updateCmd); err != nil {
-			return response.Error(500, "Failed to pause alerts", err)
-		}
-
-		resp := alertmodels.AlertStatePending
-		pausedState := "un paused"
-		if updateCmd.Paused {
-			resp = alertmodels.AlertStatePaused
-			pausedState = "paused"
-		}
-
-		result := map[string]any{
-			"state":          resp,
-			"message":        "alerts " + pausedState,
-			"alertsAffected": updateCmd.ResultCount,
-		}
-
-		return response.JSON(http.StatusOK, result)
-	}
-}
-
-// swagger:parameters pauseAllAlerts
-type PauseAllAlertsParams struct {
-	// in:body
-	// required:true
-	Body dtos.PauseAllAlertsCommand `json:"body"`
-}
-
-// swagger:parameters deleteAlertNotificationChannel
-type DeleteAlertNotificationChannelParams struct {
-	// in:path
-	// required:true
-	NotificationID int64 `json:"notification_channel_id"`
-}
-
-// swagger:parameters getAlertNotificationChannelByID
-type GetAlertNotificationChannelByIDParams struct {
-	// in:path
-	// required:true
-	NotificationID int64 `json:"notification_channel_id"`
-}
-
-// swagger:parameters deleteAlertNotificationChannelByUID
-type DeleteAlertNotificationChannelByUIDParams struct {
-	// in:path
-	// required:true
-	NotificationUID string `json:"notification_channel_uid"`
-}
-
-// swagger:parameters getAlertNotificationChannelByUID
-type GetAlertNotificationChannelByUIDParams struct {
-	// in:path
-	// required:true
-	NotificationUID string `json:"notification_channel_uid"`
-}
-
-// swagger:parameters notificationChannelTest
-type NotificationChannelTestParams struct {
-	// in:body
-	// required:true
-	Body dtos.NotificationTestCommand `json:"body"`
-}
-
-// swagger:parameters createAlertNotificationChannel
-type CreateAlertNotificationChannelParams struct {
-	// in:body
-	// required:true
-	Body alertmodels.CreateAlertNotificationCommand `json:"body"`
-}
-
-// swagger:parameters updateAlertNotificationChannel
-type UpdateAlertNotificationChannelParams struct {
-	// in:body
-	// required:true
-	Body alertmodels.UpdateAlertNotificationCommand `json:"body"`
-	// in:path
-	// required:true
-	NotificationID int64 `json:"notification_channel_id"`
-}
-
-// swagger:parameters updateAlertNotificationChannelByUID
-type UpdateAlertNotificationChannelByUIDParams struct {
-	// in:body
-	// required:true
-	Body alertmodels.UpdateAlertNotificationWithUidCommand `json:"body"`
-	// in:path
-	// required:true
-	NotificationUID string `json:"notification_channel_uid"`
-}
-
-// swagger:parameters getAlertByID
-type GetAlertByIDParams struct {
-	// in:path
-	// required:true
-	AlertID string `json:"alert_id"`
-}
-
-// swagger:parameters pauseAlert
-type PauseAlertParams struct {
-	// in:path
-	// required:true
-	AlertID string `json:"alert_id"`
-	// in:body
-	// required:true
-	Body dtos.PauseAlertCommand `json:"body"`
-}
-
-// swagger:parameters getAlerts
-type GetAlertsParams struct {
-	// Limit response to alerts in specified dashboard(s). You can specify multiple dashboards.
-	// in:query
-	// required:false
-	DashboardID []string `json:"dashboardId"`
-	//  Limit response to alert for a specified panel on a dashboard.
-	// in:query
-	// required:false
-	PanelID int64 `json:"panelId"`
-	// Limit response to alerts having a name like this value.
-	// in:query
-	// required: false
-	Query string `json:"query"`
-	// Return alerts with one or more of the following alert states
-	// in:query
-	// required:false
-	// Description:
-	// * `all`
-	// * `no_data`
-	// * `paused`
-	// * `alerting`
-	// * `ok`
-	// * `pending`
-	// * `unknown`
-	// enum: all,no_data,paused,alerting,ok,pending,unknown
-	State string `json:"state"`
-	// Limit response to X number of alerts.
-	// in:query
-	// required:false
-	Limit int64 `json:"limit"`
-	// Limit response to alerts of dashboards in specified folder(s). You can specify multiple folders
-	// in:query
-	// required:false
-	// type array
-	// collectionFormat: multi
-	FolderID []string `json:"folderId"`
-	// Limit response to alerts having a dashboard name like this value./ Limit response to alerts having a dashboard name like this value.
-	// in:query
-	// required:false
-	DashboardQuery string `json:"dashboardQuery"`
-	// Limit response to alerts of dashboards with specified tags. To do an “AND” filtering with multiple tags, specify the tags parameter multiple times
-	// in:query
-	// required:false
-	// type: array
-	// collectionFormat: multi
-	DashboardTag []string `json:"dashboardTag"`
-}
-
-// swagger:parameters testAlert
-type TestAlertParams struct {
-	// in:body
-	Body dtos.AlertTestCommand `json:"body"`
-}
-
-// swagger:parameters getDashboardStates
-type GetDashboardStatesParams struct {
-	// in:query
-	// required: true
-	DashboardID int64 `json:"dashboardId"`
-}
-
-// swagger:response pauseAlertsResponse
-type PauseAllAlertsResponse struct {
-	// in:body
-	Body struct {
-		// AlertsAffected is the number of the affected alerts.
-		// required: true
-		AlertsAffected int64 `json:"alertsAffected"`
-		// required: true
-		Message string `json:"message"`
-		// Alert result state
-		// required true
-		State string `json:"state"`
-	} `json:"body"`
-}
-
-// swagger:response getAlertNotificationChannelsResponse
-type GetAlertNotificationChannelsResponse struct {
-	// The response message
-	// in: body
-	Body []*dtos.AlertNotification `json:"body"`
-}
-
-// swagger:response getAlertNotificationLookupResponse
-type LookupAlertNotificationChannelsResponse struct {
-	// The response message
-	// in: body
-	Body []*dtos.AlertNotificationLookup `json:"body"`
-}
-
-// swagger:response getAlertNotificationChannelResponse
-type GetAlertNotificationChannelResponse struct {
-	// The response message
-	// in: body
-	Body *dtos.AlertNotification `json:"body"`
-}
-
-// swagger:response deleteAlertNotificationChannelResponse
-type DeleteAlertNotificationChannelResponse struct {
-	// The response message
-	// in: body
-	Body struct {
-		// ID Identifier of the deleted notification channel.
-		// required: true
-		// example: 65
-		ID int64 `json:"id"`
-
-		// Message Message of the deleted notificatiton channel.
-		// required: true
-		Message string `json:"message"`
-	} `json:"body"`
-}
-
-// swagger:response SMTPNotEnabledError
-type SMTPNotEnabledError PreconditionFailedError
-
-// swagger:response getAlertsResponse
-type GetAlertsResponse struct {
-	// The response message
-	// in: body
-	Body []*alertmodels.AlertListItemDTO `json:"body"`
-}
-
-// swagger:response getAlertResponse
-type GetAlertResponse struct {
-	// The response message
-	// in: body
-	Body *alertmodels.Alert `json:"body"`
-}
-
-// swagger:response pauseAlertResponse
-type PauseAlertResponse struct {
-	// in:body
-	Body struct {
-		// required: true
-		AlertID int64 `json:"alertId"`
-		// required: true
-		Message string `json:"message"`
-		// Alert result state
-		// required true
-		State string `json:"state"`
-	} `json:"body"`
-}
-
-// swagger:response testAlertResponse
-type TestAlertResponse struct {
-	// The response message
-	// in: body
-	Body *dtos.AlertTestResult `json:"body"`
-}
-
-// swagger:response getDashboardStatesResponse
-type GetDashboardStatesResponse struct {
-	// The response message
-	// in: body
-	Body []*alertmodels.AlertStateInfoDTO `json:"body"`
-}
diff --git a/pkg/api/annotations.go b/pkg/api/annotations.go
index 4247f15a48aba..717d8601ca2c0 100644
--- a/pkg/api/annotations.go
+++ b/pkg/api/annotations.go
@@ -14,6 +14,8 @@ import (
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/guardian"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/util"
@@ -60,14 +62,14 @@ func (hs *HTTPServer) GetAnnotations(c *contextmodel.ReqContext) response.Respon
 
 	items, err := hs.annotationsRepo.Find(c.Req.Context(), query)
 	if err != nil {
-		return response.Error(500, "Failed to get annotations", err)
+		return response.Error(http.StatusInternalServerError, "Failed to get annotations", err)
 	}
 
 	// since there are several annotations per dashboard, we can cache dashboard uid
 	dashboardCache := make(map[int64]*string)
 	for _, item := range items {
 		if item.Email != "" {
-			item.AvatarURL = dtos.GetGravatarUrl(item.Email)
+			item.AvatarURL = dtos.GetGravatarUrl(hs.Cfg, item.Email)
 		}
 
 		if item.DashboardID != 0 {
@@ -125,12 +127,18 @@ func (hs *HTTPServer) PostAnnotation(c *contextmodel.ReqContext) response.Respon
 	}
 
 	if canSave, err := hs.canCreateAnnotation(c, cmd.DashboardId); err != nil || !canSave {
-		return dashboardGuardianResponse(err)
+		if !hs.Features.IsEnabled(c.Req.Context(), featuremgmt.FlagAnnotationPermissionUpdate) {
+			return dashboardGuardianResponse(err)
+		} else if err != nil {
+			return response.Error(http.StatusInternalServerError, "Error while checking annotation permissions", err)
+		} else {
+			return response.Error(http.StatusForbidden, "Access denied to save the annotation", nil)
+		}
 	}
 
 	if cmd.Text == "" {
 		err := &AnnotationError{"text field should not be empty"}
-		return response.Error(400, "Failed to save annotation", err)
+		return response.Error(http.StatusBadRequest, "Failed to save annotation", err)
 	}
 
 	userID, err := identity.UserIdentifier(c.SignedInUser.GetNamespacedID())
@@ -152,9 +160,9 @@ func (hs *HTTPServer) PostAnnotation(c *contextmodel.ReqContext) response.Respon
 
 	if err := hs.annotationsRepo.Save(c.Req.Context(), &item); err != nil {
 		if errors.Is(err, annotations.ErrTimerangeMissing) {
-			return response.Error(400, "Failed to save annotation", err)
+			return response.Error(http.StatusBadRequest, "Failed to save annotation", err)
 		}
-		return response.ErrOrFallback(500, "Failed to save annotation", err)
+		return response.ErrOrFallback(http.StatusInternalServerError, "Failed to save annotation", err)
 	}
 
 	startID := item.ID
@@ -192,7 +200,7 @@ func (hs *HTTPServer) PostGraphiteAnnotation(c *contextmodel.ReqContext) respons
 	}
 	if cmd.What == "" {
 		err := &AnnotationError{"what field should not be empty"}
-		return response.Error(400, "Failed to save Graphite annotation", err)
+		return response.Error(http.StatusBadRequest, "Failed to save Graphite annotation", err)
 	}
 
 	text := formatGraphiteAnnotation(cmd.What, cmd.Data)
@@ -212,12 +220,12 @@ func (hs *HTTPServer) PostGraphiteAnnotation(c *contextmodel.ReqContext) respons
 				tagsArray = append(tagsArray, tagStr)
 			} else {
 				err := &AnnotationError{"tag should be a string"}
-				return response.Error(400, "Failed to save Graphite annotation", err)
+				return response.Error(http.StatusBadRequest, "Failed to save Graphite annotation", err)
 			}
 		}
 	default:
 		err := &AnnotationError{"unsupported tags format"}
-		return response.Error(400, "Failed to save Graphite annotation", err)
+		return response.Error(http.StatusBadRequest, "Failed to save Graphite annotation", err)
 	}
 
 	userID, err := identity.UserIdentifier(c.SignedInUser.GetNamespacedID())
@@ -234,7 +242,7 @@ func (hs *HTTPServer) PostGraphiteAnnotation(c *contextmodel.ReqContext) respons
 	}
 
 	if err := hs.annotationsRepo.Save(c.Req.Context(), &item); err != nil {
-		return response.ErrOrFallback(500, "Failed to save Graphite annotation", err)
+		return response.ErrOrFallback(http.StatusInternalServerError, "Failed to save Graphite annotation", err)
 	}
 
 	return response.JSON(http.StatusOK, util.DynMap{
@@ -271,8 +279,10 @@ func (hs *HTTPServer) UpdateAnnotation(c *contextmodel.ReqContext) response.Resp
 		return resp
 	}
 
-	if canSave, err := hs.canSaveAnnotation(c, annotation); err != nil || !canSave {
-		return dashboardGuardianResponse(err)
+	if !hs.Features.IsEnabled(c.Req.Context(), featuremgmt.FlagAnnotationPermissionUpdate) {
+		if canSave, err := hs.canSaveAnnotation(c, annotation); err != nil || !canSave {
+			return dashboardGuardianResponse(err)
+		}
 	}
 
 	userID, err := identity.UserIdentifier(c.SignedInUser.GetNamespacedID())
@@ -297,7 +307,7 @@ func (hs *HTTPServer) UpdateAnnotation(c *contextmodel.ReqContext) response.Resp
 	}
 
 	if err := hs.annotationsRepo.Update(c.Req.Context(), &item); err != nil {
-		return response.ErrOrFallback(500, "Failed to update annotation", err)
+		return response.ErrOrFallback(http.StatusInternalServerError, "Failed to update annotation", err)
 	}
 
 	return response.Success("Annotation updated")
@@ -332,8 +342,10 @@ func (hs *HTTPServer) PatchAnnotation(c *contextmodel.ReqContext) response.Respo
 		return resp
 	}
 
-	if canSave, err := hs.canSaveAnnotation(c, annotation); err != nil || !canSave {
-		return dashboardGuardianResponse(err)
+	if !hs.Features.IsEnabled(c.Req.Context(), featuremgmt.FlagAnnotationPermissionUpdate) {
+		if canSave, err := hs.canSaveAnnotation(c, annotation); err != nil || !canSave {
+			return dashboardGuardianResponse(err)
+		}
 	}
 
 	userID, err := identity.UserIdentifier(c.SignedInUser.GetNamespacedID())
@@ -374,7 +386,7 @@ func (hs *HTTPServer) PatchAnnotation(c *contextmodel.ReqContext) response.Respo
 	}
 
 	if err := hs.annotationsRepo.Update(c.Req.Context(), &existing); err != nil {
-		return response.ErrOrFallback(500, "Failed to update annotation", err)
+		return response.ErrOrFallback(http.StatusInternalServerError, "Failed to update annotation", err)
 	}
 
 	return response.Success("Annotation patched")
@@ -435,13 +447,19 @@ func (hs *HTTPServer) MassDeleteAnnotations(c *contextmodel.ReqContext) response
 
 	canSave, err := hs.canMassDeleteAnnotations(c, dashboardId)
 	if err != nil || !canSave {
-		return dashboardGuardianResponse(err)
+		if !hs.Features.IsEnabled(c.Req.Context(), featuremgmt.FlagAnnotationPermissionUpdate) {
+			return dashboardGuardianResponse(err)
+		} else if err != nil {
+			return response.Error(http.StatusInternalServerError, "Error while checking annotation permissions", err)
+		} else {
+			return response.Error(http.StatusForbidden, "Access denied to mass delete annotations", nil)
+		}
 	}
 
 	err = hs.annotationsRepo.Delete(c.Req.Context(), deleteParams)
 
 	if err != nil {
-		return response.Error(500, "Failed to delete annotations", err)
+		return response.Error(http.StatusInternalServerError, "Failed to delete annotations", err)
 	}
 
 	return response.Success("Annotations deleted")
@@ -467,10 +485,10 @@ func (hs *HTTPServer) GetAnnotationByID(c *contextmodel.ReqContext) response.Res
 	}
 
 	if annotation.Email != "" {
-		annotation.AvatarURL = dtos.GetGravatarUrl(annotation.Email)
+		annotation.AvatarURL = dtos.GetGravatarUrl(hs.Cfg, annotation.Email)
 	}
 
-	return response.JSON(200, annotation)
+	return response.JSON(http.StatusOK, annotation)
 }
 
 // swagger:route DELETE /annotations/{annotation_id} annotations deleteAnnotationByID
@@ -490,13 +508,15 @@ func (hs *HTTPServer) DeleteAnnotationByID(c *contextmodel.ReqContext) response.
 		return response.Error(http.StatusBadRequest, "annotationId is invalid", err)
 	}
 
-	annotation, resp := findAnnotationByID(c.Req.Context(), hs.annotationsRepo, annotationID, c.SignedInUser)
-	if resp != nil {
-		return resp
-	}
+	if !hs.Features.IsEnabled(c.Req.Context(), featuremgmt.FlagAnnotationPermissionUpdate) {
+		annotation, resp := findAnnotationByID(c.Req.Context(), hs.annotationsRepo, annotationID, c.SignedInUser)
+		if resp != nil {
+			return resp
+		}
 
-	if canSave, err := hs.canSaveAnnotation(c, annotation); err != nil || !canSave {
-		return dashboardGuardianResponse(err)
+		if canSave, err := hs.canSaveAnnotation(c, annotation); err != nil || !canSave {
+			return dashboardGuardianResponse(err)
+		}
 	}
 
 	err = hs.annotationsRepo.Delete(c.Req.Context(), &annotations.DeleteParams{
@@ -504,7 +524,7 @@ func (hs *HTTPServer) DeleteAnnotationByID(c *contextmodel.ReqContext) response.
 		ID:    annotationID,
 	})
 	if err != nil {
-		return response.Error(500, "Failed to delete annotation", err)
+		return response.Error(http.StatusInternalServerError, "Failed to delete annotation", err)
 	}
 
 	return response.Success("Annotation deleted")
@@ -540,11 +560,11 @@ func findAnnotationByID(ctx context.Context, repo annotations.Repository, annota
 	items, err := repo.Find(ctx, query)
 
 	if err != nil {
-		return nil, response.Error(500, "Failed to find annotation", err)
+		return nil, response.Error(http.StatusInternalServerError, "Failed to find annotation", err)
 	}
 
 	if len(items) == 0 {
-		return nil, response.Error(404, "Annotation not found", nil)
+		return nil, response.Error(http.StatusNotFound, "Annotation not found", nil)
 	}
 
 	return items[0], nil
@@ -569,7 +589,7 @@ func (hs *HTTPServer) GetAnnotationTags(c *contextmodel.ReqContext) response.Res
 
 	result, err := hs.annotationsRepo.FindTags(c.Req.Context(), query)
 	if err != nil {
-		return response.Error(500, "Failed to find annotation tags", err)
+		return response.Error(http.StatusInternalServerError, "Failed to find annotation tags", err)
 	}
 
 	return response.JSON(http.StatusOK, annotations.GetAnnotationTagsResponse{Result: result})
@@ -578,7 +598,9 @@ func (hs *HTTPServer) GetAnnotationTags(c *contextmodel.ReqContext) response.Res
 // AnnotationTypeScopeResolver provides an ScopeAttributeResolver able to
 // resolve annotation types. Scope "annotations:id:<id>" will be translated to "annotations:type:<type>,
 // where <type> is the type of annotation with id <id>.
-func AnnotationTypeScopeResolver(annotationsRepo annotations.Repository) (string, accesscontrol.ScopeAttributeResolver) {
+// If annotationPermissionUpdate feature toggle is enabled, dashboard annotation scope will be resolved to the corresponding
+// dashboard and folder scopes (eg, "dashboards:uid:<annotation_dashboard_uid>", "folders:uid:<parent_folder_uid>" etc).
+func AnnotationTypeScopeResolver(annotationsRepo annotations.Repository, features featuremgmt.FeatureToggles, dashSvc dashboards.DashboardService, folderSvc folder.Service) (string, accesscontrol.ScopeAttributeResolver) {
 	prefix := accesscontrol.ScopeAnnotationsProvider.GetResourceScope("")
 	return prefix, accesscontrol.ScopeAttributeResolverFunc(func(ctx context.Context, orgID int64, initialScope string) ([]string, error) {
 		scopeParts := strings.Split(initialScope, ":")
@@ -604,20 +626,66 @@ func AnnotationTypeScopeResolver(annotationsRepo annotations.Repository) (string
 			},
 		}
 
+		if features.IsEnabled(ctx, featuremgmt.FlagAnnotationPermissionUpdate) {
+			tempUser = &user.SignedInUser{
+				OrgID: orgID,
+				Permissions: map[int64]map[string][]string{
+					orgID: {
+						accesscontrol.ActionAnnotationsRead: {accesscontrol.ScopeAnnotationsTypeOrganization, dashboards.ScopeDashboardsAll},
+					},
+				},
+			}
+		}
+
 		annotation, resp := findAnnotationByID(ctx, annotationsRepo, int64(annotationId), tempUser)
 		if resp != nil {
 			return nil, errors.New("could not resolve annotation type")
 		}
 
-		if annotation.GetType() == annotations.Organization {
+		if !features.IsEnabled(ctx, featuremgmt.FlagAnnotationPermissionUpdate) {
+			switch annotation.GetType() {
+			case annotations.Organization:
+				return []string{accesscontrol.ScopeAnnotationsTypeOrganization}, nil
+			case annotations.Dashboard:
+				return []string{accesscontrol.ScopeAnnotationsTypeDashboard}, nil
+			}
+		}
+
+		if annotation.DashboardID == 0 {
 			return []string{accesscontrol.ScopeAnnotationsTypeOrganization}, nil
 		} else {
-			return []string{accesscontrol.ScopeAnnotationsTypeDashboard}, nil
+			dashboard, err := dashSvc.GetDashboard(ctx, &dashboards.GetDashboardQuery{ID: annotation.DashboardID, OrgID: orgID})
+			if err != nil {
+				return nil, err
+			}
+			scopes := []string{dashboards.ScopeDashboardsProvider.GetResourceScopeUID(dashboard.UID)}
+			// Append dashboard parent scopes if dashboard is in a folder or the general scope if dashboard is not in a folder
+			if dashboard.FolderUID != "" {
+				scopes = append(scopes, dashboards.ScopeFoldersProvider.GetResourceScopeUID(dashboard.FolderUID))
+				inheritedScopes, err := dashboards.GetInheritedScopes(ctx, orgID, dashboard.FolderUID, folderSvc)
+				if err != nil {
+					return nil, err
+				}
+				scopes = append(scopes, inheritedScopes...)
+			} else {
+				scopes = append(scopes, dashboards.ScopeFoldersProvider.GetResourceScopeUID(folder.GeneralFolderUID))
+			}
+			return scopes, nil
 		}
 	})
 }
 
 func (hs *HTTPServer) canCreateAnnotation(c *contextmodel.ReqContext, dashboardId int64) (bool, error) {
+	if hs.Features.IsEnabled(c.Req.Context(), featuremgmt.FlagAnnotationPermissionUpdate) {
+		if dashboardId != 0 {
+			evaluator := accesscontrol.EvalPermission(accesscontrol.ActionAnnotationsCreate, dashboards.ScopeDashboardsProvider.GetResourceScope(strconv.FormatInt(dashboardId, 10)))
+			return hs.AccessControl.Evaluate(c.Req.Context(), c.SignedInUser, evaluator)
+		} else { // organization annotations
+			evaluator := accesscontrol.EvalPermission(accesscontrol.ActionAnnotationsCreate, accesscontrol.ScopeAnnotationsTypeOrganization)
+			return hs.AccessControl.Evaluate(c.Req.Context(), c.SignedInUser, evaluator)
+		}
+	}
+
 	if dashboardId != 0 {
 		evaluator := accesscontrol.EvalPermission(accesscontrol.ActionAnnotationsCreate, accesscontrol.ScopeAnnotationsTypeDashboard)
 		if canSave, err := hs.AccessControl.Evaluate(c.Req.Context(), c.SignedInUser, evaluator); err != nil || !canSave {
@@ -632,6 +700,16 @@ func (hs *HTTPServer) canCreateAnnotation(c *contextmodel.ReqContext, dashboardI
 }
 
 func (hs *HTTPServer) canMassDeleteAnnotations(c *contextmodel.ReqContext, dashboardID int64) (bool, error) {
+	if hs.Features.IsEnabled(c.Req.Context(), featuremgmt.FlagAnnotationPermissionUpdate) {
+		if dashboardID == 0 {
+			evaluator := accesscontrol.EvalPermission(accesscontrol.ActionAnnotationsDelete, accesscontrol.ScopeAnnotationsTypeOrganization)
+			return hs.AccessControl.Evaluate(c.Req.Context(), c.SignedInUser, evaluator)
+		} else {
+			evaluator := accesscontrol.EvalPermission(accesscontrol.ActionAnnotationsDelete, dashboards.ScopeDashboardsProvider.GetResourceScope(strconv.FormatInt(dashboardID, 10)))
+			return hs.AccessControl.Evaluate(c.Req.Context(), c.SignedInUser, evaluator)
+		}
+	}
+
 	if dashboardID == 0 {
 		evaluator := accesscontrol.EvalPermission(accesscontrol.ActionAnnotationsDelete, accesscontrol.ScopeAnnotationsTypeOrganization)
 		return hs.AccessControl.Evaluate(c.Req.Context(), c.SignedInUser, evaluator)
diff --git a/pkg/api/annotations_test.go b/pkg/api/annotations_test.go
index b930f2333bea2..c8e4a0d101a00 100644
--- a/pkg/api/annotations_test.go
+++ b/pkg/api/annotations_test.go
@@ -8,24 +8,33 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
 	"github.com/grafana/grafana/pkg/services/annotations"
 	"github.com/grafana/grafana/pkg/services/annotations/annotationstest"
+	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/folder"
+	"github.com/grafana/grafana/pkg/services/folder/foldertest"
 	"github.com/grafana/grafana/pkg/services/guardian"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/web/webtest"
 )
 
 func TestAPI_Annotations(t *testing.T) {
+	dashUID := "test-dash"
+	folderUID := "test-folder"
+
 	type testCase struct {
 		desc         string
 		path         string
 		method       string
 		body         string
 		expectedCode int
+		featureFlags []any
 		permissions  []accesscontrol.Permission
 	}
 
@@ -58,6 +67,30 @@ func TestAPI_Annotations(t *testing.T) {
 			expectedCode: http.StatusForbidden,
 			permissions:  []accesscontrol.Permission{},
 		},
+		{
+			desc:         "should be able to fetch dashboard annotation by id with correct dashboard scope with annotationPermissionUpdate enabled",
+			path:         "/api/annotations/2",
+			featureFlags: []any{featuremgmt.FlagAnnotationPermissionUpdate},
+			method:       http.MethodGet,
+			expectedCode: http.StatusOK,
+			permissions:  []accesscontrol.Permission{{Action: accesscontrol.ActionAnnotationsRead, Scope: dashboards.ScopeDashboardsProvider.GetResourceScopeUID(dashUID)}},
+		},
+		{
+			desc:         "should be able to fetch dashboard annotation by id with correct folder scope with annotationPermissionUpdate enabled",
+			path:         "/api/annotations/2",
+			featureFlags: []any{featuremgmt.FlagAnnotationPermissionUpdate},
+			method:       http.MethodGet,
+			expectedCode: http.StatusOK,
+			permissions:  []accesscontrol.Permission{{Action: accesscontrol.ActionAnnotationsRead, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID(folderUID)}},
+		},
+		{
+			desc:         "should not be able to fetch dashboard annotation by id with the old dashboard scope when annotationPermissionUpdate enabled",
+			path:         "/api/annotations/2",
+			featureFlags: []any{featuremgmt.FlagAnnotationPermissionUpdate},
+			method:       http.MethodGet,
+			expectedCode: http.StatusForbidden,
+			permissions:  []accesscontrol.Permission{{Action: accesscontrol.ActionAnnotationsRead, Scope: accesscontrol.ScopeAnnotationsTypeDashboard}},
+		},
 		{
 			desc:         "should be able to fetch annotation tags with correct permission",
 			path:         "/api/annotations/tags",
@@ -86,6 +119,30 @@ func TestAPI_Annotations(t *testing.T) {
 			expectedCode: http.StatusForbidden,
 			permissions:  []accesscontrol.Permission{},
 		},
+		{
+			desc:         "should be able to update dashboard annotation with correct dashboard scope with annotationPermissionUpdate enabled",
+			path:         "/api/annotations/2",
+			featureFlags: []any{featuremgmt.FlagAnnotationPermissionUpdate},
+			method:       http.MethodPut,
+			expectedCode: http.StatusOK,
+			permissions:  []accesscontrol.Permission{{Action: accesscontrol.ActionAnnotationsWrite, Scope: dashboards.ScopeDashboardsProvider.GetResourceScopeUID(dashUID)}},
+		},
+		{
+			desc:         "should be able to update dashboard annotation with correct folder scope with annotationPermissionUpdate enabled",
+			path:         "/api/annotations/2",
+			featureFlags: []any{featuremgmt.FlagAnnotationPermissionUpdate},
+			method:       http.MethodPut,
+			expectedCode: http.StatusOK,
+			permissions:  []accesscontrol.Permission{{Action: accesscontrol.ActionAnnotationsWrite, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID(folderUID)}},
+		},
+		{
+			desc:         "should not be able to update dashboard annotation with the old dashboard scope when annotationPermissionUpdate enabled",
+			path:         "/api/annotations/2",
+			featureFlags: []any{featuremgmt.FlagAnnotationPermissionUpdate},
+			method:       http.MethodPut,
+			expectedCode: http.StatusForbidden,
+			permissions:  []accesscontrol.Permission{{Action: accesscontrol.ActionAnnotationsWrite, Scope: accesscontrol.ScopeAnnotationsTypeDashboard}},
+		},
 		{
 			desc:         "should be able to update organization annotation with correct permission",
 			path:         "/api/annotations/1",
@@ -114,6 +171,30 @@ func TestAPI_Annotations(t *testing.T) {
 			expectedCode: http.StatusForbidden,
 			permissions:  []accesscontrol.Permission{},
 		},
+		{
+			desc:         "should be able to patch dashboard annotation with correct dashboard scope with annotationPermissionUpdate enabled",
+			path:         "/api/annotations/2",
+			featureFlags: []any{featuremgmt.FlagAnnotationPermissionUpdate},
+			method:       http.MethodPatch,
+			expectedCode: http.StatusOK,
+			permissions:  []accesscontrol.Permission{{Action: accesscontrol.ActionAnnotationsWrite, Scope: dashboards.ScopeDashboardsProvider.GetResourceScopeUID(dashUID)}},
+		},
+		{
+			desc:         "should be able to patch dashboard annotation with correct folder scope with annotationPermissionUpdate enabled",
+			path:         "/api/annotations/2",
+			featureFlags: []any{featuremgmt.FlagAnnotationPermissionUpdate},
+			method:       http.MethodPatch,
+			expectedCode: http.StatusOK,
+			permissions:  []accesscontrol.Permission{{Action: accesscontrol.ActionAnnotationsWrite, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID(folderUID)}},
+		},
+		{
+			desc:         "should not be able to patch dashboard annotation with the old dashboard scope when annotationPermissionUpdate enabled",
+			path:         "/api/annotations/2",
+			featureFlags: []any{featuremgmt.FlagAnnotationPermissionUpdate},
+			method:       http.MethodPatch,
+			expectedCode: http.StatusForbidden,
+			permissions:  []accesscontrol.Permission{{Action: accesscontrol.ActionAnnotationsWrite, Scope: accesscontrol.ScopeAnnotationsTypeDashboard}},
+		},
 		{
 			desc:         "should be able to patch organization annotation with correct permission",
 			path:         "/api/annotations/1",
@@ -144,6 +225,33 @@ func TestAPI_Annotations(t *testing.T) {
 			expectedCode: http.StatusForbidden,
 			permissions:  []accesscontrol.Permission{{Action: accesscontrol.ActionAnnotationsCreate, Scope: accesscontrol.ScopeAnnotationsTypeOrganization}},
 		},
+		{
+			desc:         "should be able to create dashboard annotation with correct dashboard scope with annotationPermissionUpdate enabled",
+			path:         "/api/annotations",
+			method:       http.MethodPost,
+			body:         "{\"dashboardId\": 2,\"text\": \"test\"}",
+			featureFlags: []any{featuremgmt.FlagAnnotationPermissionUpdate},
+			expectedCode: http.StatusOK,
+			permissions:  []accesscontrol.Permission{{Action: accesscontrol.ActionAnnotationsCreate, Scope: dashboards.ScopeDashboardsProvider.GetResourceScopeUID(dashUID)}},
+		},
+		{
+			desc:         "should be able to create dashboard annotation with correct folder scope with annotationPermissionUpdate enabled",
+			path:         "/api/annotations",
+			method:       http.MethodPost,
+			body:         "{\"dashboardId\": 2,\"text\": \"test\"}",
+			featureFlags: []any{featuremgmt.FlagAnnotationPermissionUpdate},
+			expectedCode: http.StatusOK,
+			permissions:  []accesscontrol.Permission{{Action: accesscontrol.ActionAnnotationsCreate, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID(folderUID)}},
+		},
+		{
+			desc:         "should not be able to create dashboard annotation with the old dashboard scope when annotationPermissionUpdate enabled",
+			path:         "/api/annotations",
+			method:       http.MethodPost,
+			body:         "{\"dashboardId\": 2,\"text\": \"test\"}",
+			featureFlags: []any{featuremgmt.FlagAnnotationPermissionUpdate},
+			expectedCode: http.StatusForbidden,
+			permissions:  []accesscontrol.Permission{{Action: accesscontrol.ActionAnnotationsCreate, Scope: accesscontrol.ScopeAnnotationsTypeDashboard}},
+		},
 		{
 			desc:         "should be able to create organization annotation with correct permission",
 			path:         "/api/annotations",
@@ -174,6 +282,30 @@ func TestAPI_Annotations(t *testing.T) {
 			expectedCode: http.StatusForbidden,
 			permissions:  []accesscontrol.Permission{{Action: accesscontrol.ActionAnnotationsDelete, Scope: accesscontrol.ScopeAnnotationsTypeOrganization}},
 		},
+		{
+			desc:         "should be able to delete dashboard annotation with correct dashboard scope with annotationPermissionUpdate enabled",
+			path:         "/api/annotations/2",
+			featureFlags: []any{featuremgmt.FlagAnnotationPermissionUpdate},
+			method:       http.MethodDelete,
+			expectedCode: http.StatusOK,
+			permissions:  []accesscontrol.Permission{{Action: accesscontrol.ActionAnnotationsDelete, Scope: dashboards.ScopeDashboardsProvider.GetResourceScopeUID(dashUID)}},
+		},
+		{
+			desc:         "should be able to delete dashboard annotation with correct folder scope with annotationPermissionUpdate enabled",
+			path:         "/api/annotations/2",
+			featureFlags: []any{featuremgmt.FlagAnnotationPermissionUpdate},
+			method:       http.MethodDelete,
+			expectedCode: http.StatusOK,
+			permissions:  []accesscontrol.Permission{{Action: accesscontrol.ActionAnnotationsDelete, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID(folderUID)}},
+		},
+		{
+			desc:         "should not be able to delete dashboard annotation with the old dashboard scope when annotationPermissionUpdate enabled",
+			path:         "/api/annotations/2",
+			featureFlags: []any{featuremgmt.FlagAnnotationPermissionUpdate},
+			method:       http.MethodDelete,
+			expectedCode: http.StatusForbidden,
+			permissions:  []accesscontrol.Permission{{Action: accesscontrol.ActionAnnotationsDelete, Scope: accesscontrol.ScopeAnnotationsTypeDashboard}},
+		},
 		{
 			desc:         "should be able to delete organization annotation with correct permission",
 			path:         "/api/annotations/1",
@@ -219,19 +351,59 @@ func TestAPI_Annotations(t *testing.T) {
 			expectedCode: http.StatusForbidden,
 			permissions:  []accesscontrol.Permission{{Action: accesscontrol.ActionAnnotationsDelete, Scope: accesscontrol.ScopeAnnotationsTypeOrganization}},
 		},
+		{
+			desc:         "should be able to mass delete dashboard annotation with correct dashboard scope with annotationPermissionUpdate enabled",
+			path:         "/api/annotations/mass-delete",
+			body:         "{\"dashboardId\": 2, \"panelId\": 1}",
+			method:       http.MethodPost,
+			featureFlags: []any{featuremgmt.FlagAnnotationPermissionUpdate},
+			expectedCode: http.StatusOK,
+			permissions:  []accesscontrol.Permission{{Action: accesscontrol.ActionAnnotationsDelete, Scope: dashboards.ScopeDashboardsProvider.GetResourceScopeUID(dashUID)}},
+		},
+		{
+			desc:         "should be able to mass delete dashboard annotation with correct folder scope with annotationPermissionUpdate enabled",
+			path:         "/api/annotations/mass-delete",
+			body:         "{\"dashboardId\": 2, \"panelId\": 1}",
+			method:       http.MethodPost,
+			featureFlags: []any{featuremgmt.FlagAnnotationPermissionUpdate},
+			expectedCode: http.StatusOK,
+			permissions:  []accesscontrol.Permission{{Action: accesscontrol.ActionAnnotationsDelete, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID(folderUID)}},
+		},
+		{
+			desc:         "should not be able to mass delete dashboard annotation with the old dashboard scope when annotationPermissionUpdate enabled",
+			path:         "/api/annotations/mass-delete",
+			body:         "{\"dashboardId\": 2, \"panelId\": 1}",
+			method:       http.MethodPost,
+			featureFlags: []any{featuremgmt.FlagAnnotationPermissionUpdate},
+			expectedCode: http.StatusForbidden,
+			permissions:  []accesscontrol.Permission{{Action: accesscontrol.ActionAnnotationsDelete, Scope: accesscontrol.ScopeAnnotationsTypeDashboard}},
+		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.desc, func(t *testing.T) {
-			setUpRBACGuardian(t)
+			// Don't need access to dashboards if annotationPermissionUpdate is enabled
+			if len(tt.featureFlags) == 0 {
+				setUpRBACGuardian(t)
+			}
 			server := SetupAPITestServer(t, func(hs *HTTPServer) {
 				hs.Cfg = setting.NewCfg()
 				repo := annotationstest.NewFakeAnnotationsRepo()
 				_ = repo.Save(context.Background(), &annotations.Item{ID: 1, DashboardID: 0})
 				_ = repo.Save(context.Background(), &annotations.Item{ID: 2, DashboardID: 1})
 				hs.annotationsRepo = repo
+				hs.Features = featuremgmt.WithFeatures(tt.featureFlags...)
+				dashService := &dashboards.FakeDashboardService{}
+				dashService.On("GetDashboard", mock.Anything, mock.Anything).Return(&dashboards.Dashboard{UID: dashUID, FolderUID: folderUID, FolderID: 1}, nil)
+				folderService := &foldertest.FakeService{}
+				folderService.ExpectedFolder = &folder.Folder{UID: folderUID, ID: 1}
+				folderDB := &foldertest.FakeFolderStore{}
+				folderDB.On("GetFolderByID", mock.Anything, mock.Anything, mock.Anything).Return(&folder.Folder{UID: folderUID, ID: 1}, nil)
+				hs.DashboardService = dashService
+				hs.folderService = folderService
 				hs.AccessControl = acimpl.ProvideAccessControl(hs.Cfg)
-				hs.AccessControl.RegisterScopeAttributeResolver(AnnotationTypeScopeResolver(hs.annotationsRepo))
+				hs.AccessControl.RegisterScopeAttributeResolver(AnnotationTypeScopeResolver(hs.annotationsRepo, hs.Features, dashService, folderService))
+				hs.AccessControl.RegisterScopeAttributeResolver(dashboards.NewDashboardIDScopeResolver(folderDB, dashService, folderService))
 			})
 			var body io.Reader
 			if tt.body != "" {
@@ -246,61 +418,102 @@ func TestAPI_Annotations(t *testing.T) {
 		})
 	}
 }
+
 func TestService_AnnotationTypeScopeResolver(t *testing.T) {
+	rootDashUID := "root-dashboard"
+	folderDashUID := "folder-dashboard"
+	folderUID := "folder"
+	dashSvc := &dashboards.FakeDashboardService{}
+	rootDash := &dashboards.Dashboard{ID: 1, OrgID: 1, UID: rootDashUID}
+	folderDash := &dashboards.Dashboard{ID: 2, OrgID: 1, UID: folderDashUID, FolderUID: folderUID}
+	dashSvc.On("GetDashboard", context.Background(), &dashboards.GetDashboardQuery{ID: rootDash.ID, OrgID: 1}).Return(rootDash, nil)
+	dashSvc.On("GetDashboard", context.Background(), &dashboards.GetDashboardQuery{ID: folderDash.ID, OrgID: 1}).Return(folderDash, nil)
+
+	rootDashboardAnnotation := annotations.Item{ID: 1, DashboardID: rootDash.ID}
+	folderDashboardAnnotation := annotations.Item{ID: 3, DashboardID: folderDash.ID}
+	organizationAnnotation := annotations.Item{ID: 2}
+
+	fakeAnnoRepo := annotationstest.NewFakeAnnotationsRepo()
+	_ = fakeAnnoRepo.Save(context.Background(), &rootDashboardAnnotation)
+	_ = fakeAnnoRepo.Save(context.Background(), &folderDashboardAnnotation)
+	_ = fakeAnnoRepo.Save(context.Background(), &organizationAnnotation)
+
 	type testCaseResolver struct {
-		desc    string
-		given   string
-		want    string
-		wantErr error
+		desc           string
+		given          string
+		featureToggles []any
+		want           []string
+		wantErr        error
 	}
 
 	testCases := []testCaseResolver{
 		{
 			desc:    "correctly resolves dashboard annotations",
 			given:   "annotations:id:1",
-			want:    accesscontrol.ScopeAnnotationsTypeDashboard,
+			want:    []string{accesscontrol.ScopeAnnotationsTypeDashboard},
 			wantErr: nil,
 		},
 		{
 			desc:    "correctly resolves organization annotations",
 			given:   "annotations:id:2",
-			want:    accesscontrol.ScopeAnnotationsTypeOrganization,
+			want:    []string{accesscontrol.ScopeAnnotationsTypeOrganization},
 			wantErr: nil,
 		},
 		{
 			desc:    "invalid annotation ID",
 			given:   "annotations:id:123abc",
-			want:    "",
+			want:    []string{""},
 			wantErr: accesscontrol.ErrInvalidScope,
 		},
 		{
 			desc:    "malformed scope",
 			given:   "annotations:1",
-			want:    "",
+			want:    []string{""},
 			wantErr: accesscontrol.ErrInvalidScope,
 		},
+		{
+			desc:           "correctly resolves organization annotations with feature toggle",
+			given:          "annotations:id:2",
+			featureToggles: []any{featuremgmt.FlagAnnotationPermissionUpdate},
+			want:           []string{accesscontrol.ScopeAnnotationsTypeOrganization},
+			wantErr:        nil,
+		},
+		{
+			desc:           "correctly resolves annotations from root dashboard with feature toggle",
+			given:          "annotations:id:1",
+			featureToggles: []any{featuremgmt.FlagAnnotationPermissionUpdate},
+			want: []string{
+				dashboards.ScopeDashboardsProvider.GetResourceScopeUID(rootDashUID),
+				dashboards.ScopeFoldersProvider.GetResourceScopeUID(accesscontrol.GeneralFolderUID),
+			},
+			wantErr: nil,
+		},
+		{
+			desc:           "correctly resolves annotations from dashboard in a folder with feature toggle",
+			given:          "annotations:id:3",
+			featureToggles: []any{featuremgmt.FlagAnnotationPermissionUpdate},
+			want: []string{
+				dashboards.ScopeDashboardsProvider.GetResourceScopeUID(folderDashUID),
+				dashboards.ScopeFoldersProvider.GetResourceScopeUID(folderUID),
+			},
+			wantErr: nil,
+		},
 	}
 
-	dashboardAnnotation := annotations.Item{ID: 1, DashboardID: 1}
-	organizationAnnotation := annotations.Item{ID: 2}
-
-	fakeAnnoRepo := annotationstest.NewFakeAnnotationsRepo()
-	_ = fakeAnnoRepo.Save(context.Background(), &dashboardAnnotation)
-	_ = fakeAnnoRepo.Save(context.Background(), &organizationAnnotation)
-
-	prefix, resolver := AnnotationTypeScopeResolver(fakeAnnoRepo)
-	require.Equal(t, "annotations:id:", prefix)
-
 	for _, tc := range testCases {
 		t.Run(tc.desc, func(t *testing.T) {
+			features := featuremgmt.WithFeatures(tc.featureToggles...)
+			prefix, resolver := AnnotationTypeScopeResolver(fakeAnnoRepo, features, dashSvc, &foldertest.FakeService{})
+			require.Equal(t, "annotations:id:", prefix)
+
 			resolved, err := resolver.Resolve(context.Background(), 1, tc.given)
 			if tc.wantErr != nil {
 				require.Error(t, err)
 				require.Equal(t, tc.wantErr, err)
 			} else {
 				require.NoError(t, err)
-				require.Len(t, resolved, 1)
-				require.Equal(t, tc.want, resolved[0])
+				require.Len(t, resolved, len(tc.want))
+				require.Equal(t, tc.want, resolved)
 			}
 		})
 	}
@@ -312,5 +525,5 @@ func setUpRBACGuardian(t *testing.T) {
 		guardian.New = origNewGuardian
 	})
 
-	guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanEditValue: true})
+	guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanEditValue: true, CanViewValue: true})
 }
diff --git a/pkg/api/api.go b/pkg/api/api.go
index da3814fc882e6..1dde93806db8b 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -31,10 +31,10 @@ package api
 
 import (
 	"github.com/grafana/grafana/pkg/api/routing"
-	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/middleware"
 	"github.com/grafana/grafana/pkg/middleware/requestmeta"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/ssoutils"
 	"github.com/grafana/grafana/pkg/services/apikey"
 	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/correlations"
@@ -46,12 +46,8 @@ import (
 	publicdashboardsapi "github.com/grafana/grafana/pkg/services/publicdashboards/api"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts"
 	"github.com/grafana/grafana/pkg/services/user"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/web"
 )
 
-var plog = log.New("api")
-
 // registerRoutes registers all API HTTP routes.
 func (hs *HTTPServer) registerRoutes() {
 	reqNoAuth := middleware.NoAuth()
@@ -59,12 +55,12 @@ func (hs *HTTPServer) registerRoutes() {
 	reqNotSignedIn := middleware.ReqNotSignedIn
 	reqSignedInNoAnonymous := middleware.ReqSignedInNoAnonymous
 	reqGrafanaAdmin := middleware.ReqGrafanaAdmin
-	reqEditorRole := middleware.ReqEditorRole
 	reqOrgAdmin := middleware.ReqOrgAdmin
+	reqRoleForAppRoute := middleware.RoleAppPluginAuth(hs.AccessControl, hs.pluginStore, hs.Features, hs.log)
 	reqSnapshotPublicModeOrSignedIn := middleware.SnapshotPublicModeOrSignedIn(hs.Cfg)
 	redirectFromLegacyPanelEditURL := middleware.RedirectFromLegacyPanelEditURL(hs.Cfg)
 	authorize := ac.Middleware(hs.AccessControl)
-	authorizeInOrg := ac.AuthorizeInOrgMiddleware(hs.AccessControl, hs.accesscontrolService, hs.userService)
+	authorizeInOrg := ac.AuthorizeInOrgMiddleware(hs.AccessControl, hs.accesscontrolService, hs.userService, hs.teamService)
 	quota := middleware.Quota(hs.QuotaService)
 
 	r := hs.RouteRegister
@@ -107,14 +103,13 @@ func (hs *HTTPServer) registerRoutes() {
 	r.Get("/admin/orgs", authorizeInOrg(ac.UseGlobalOrg, ac.OrgsAccessEvaluator), hs.Index)
 	r.Get("/admin/orgs/edit/:id", authorizeInOrg(ac.UseGlobalOrg, ac.OrgsAccessEvaluator), hs.Index)
 	r.Get("/admin/stats", authorize(ac.EvalPermission(ac.ActionServerStatsRead)), hs.Index)
-	r.Get("/admin/authentication/ldap", authorize(ac.EvalPermission(ac.ActionLDAPStatusRead)), hs.Index)
-	if hs.Features.IsEnabled(featuremgmt.FlagStorage) {
+	if hs.Features.IsEnabledGlobally(featuremgmt.FlagStorage) {
 		r.Get("/admin/storage", reqSignedIn, hs.Index)
 		r.Get("/admin/storage/*", reqSignedIn, hs.Index)
 	}
 
 	// feature toggle admin page
-	if hs.Features.IsEnabled(featuremgmt.FlagFeatureToggleAdminPage) {
+	if hs.Features.IsEnabledGlobally(featuremgmt.FlagFeatureToggleAdminPage) {
 		r.Get("/admin/featuretoggles", authorize(ac.EvalPermission(ac.ActionFeatureManagementRead)), hs.Index)
 	}
 
@@ -140,8 +135,8 @@ func (hs *HTTPServer) registerRoutes() {
 
 	// App Root Page
 	appPluginIDScope := pluginaccesscontrol.ScopeProvider.GetResourceScope(ac.Parameter(":id"))
-	r.Get("/a/:id/*", authorize(ac.EvalPermission(pluginaccesscontrol.ActionAppAccess, appPluginIDScope)), hs.Index)
-	r.Get("/a/:id", authorize(ac.EvalPermission(pluginaccesscontrol.ActionAppAccess, appPluginIDScope)), hs.Index)
+	r.Get("/a/:id/*", authorize(ac.EvalPermission(pluginaccesscontrol.ActionAppAccess, appPluginIDScope)), reqSignedIn, reqRoleForAppRoute, hs.Index)
+	r.Get("/a/:id", authorize(ac.EvalPermission(pluginaccesscontrol.ActionAppAccess, appPluginIDScope)), reqSignedIn, reqRoleForAppRoute, hs.Index)
 
 	r.Get("/d/:uid/:slug", reqSignedIn, redirectFromLegacyPanelEditURL, hs.Index)
 	r.Get("/d/:uid", reqSignedIn, redirectFromLegacyPanelEditURL, hs.Index)
@@ -156,16 +151,17 @@ func (hs *HTTPServer) registerRoutes() {
 	r.Get("/dashboards/*", reqSignedIn, hs.Index)
 	r.Get("/goto/:uid", reqSignedIn, hs.redirectFromShortURL, hs.Index)
 
-	if hs.Features.IsEnabled(featuremgmt.FlagDashboardEmbed) {
+	if hs.Features.IsEnabledGlobally(featuremgmt.FlagDashboardEmbed) {
 		r.Get("/d-embed", reqSignedIn, middleware.AddAllowEmbeddingHeader(), hs.Index)
 	}
 
-	if hs.Features.IsEnabled(featuremgmt.FlagPublicDashboards) {
+	if hs.Features.IsEnabledGlobally(featuremgmt.FlagPublicDashboards) && hs.Cfg.PublicDashboardsEnabled {
 		// list public dashboards
 		r.Get("/public-dashboards/list", reqSignedIn, hs.Index)
 
 		// anonymous view public dashboard
 		r.Get("/public-dashboards/:accessToken",
+			hs.PublicDashboardsApi.Middleware.HandleView,
 			publicdashboardsapi.SetPublicDashboardAccessToken,
 			publicdashboardsapi.SetPublicDashboardOrgIdOnContext(hs.PublicDashboardsApi.PublicDashboardService),
 			publicdashboardsapi.CountPublicDashboardRequest(),
@@ -192,6 +188,11 @@ func (hs *HTTPServer) registerRoutes() {
 	r.Post("/api/user/signup", quota(user.QuotaTargetSrv), quota(org.QuotaTargetSrv), routing.Wrap(hs.SignUp))
 	r.Post("/api/user/signup/step2", routing.Wrap(hs.SignUpStep2))
 
+	// update user email
+	if hs.Cfg.Smtp.Enabled && hs.Cfg.VerifyEmailEnabled {
+		r.Get("/user/email/update", reqSignedInNoAnonymous, routing.Wrap(hs.UpdateUserEmail))
+	}
+
 	// invited
 	r.Get("/api/user/invite/:code", routing.Wrap(hs.GetInviteInfoByCode))
 	r.Post("/api/user/invite/complete", routing.Wrap(hs.CompleteInvite))
@@ -213,15 +214,26 @@ func (hs *HTTPServer) registerRoutes() {
 	// expose plugin file system assets
 	r.Get("/public/plugins/:pluginId/*", hs.getPluginAssets)
 
-	r.Get("/swagger-ui", swaggerUI)
-	r.Get("/openapi3", openapi3)
+	// add swagger support
+	registerSwaggerUI(r)
+
+	r.Post("/api/user/auth-tokens/rotate", routing.Wrap(hs.RotateUserAuthToken))
+	r.Get("/user/auth-tokens/rotate", routing.Wrap(hs.RotateUserAuthTokenRedirect))
 
-	if hs.Features.IsEnabled(featuremgmt.FlagClientTokenRotation) {
-		r.Post("/api/user/auth-tokens/rotate", routing.Wrap(hs.RotateUserAuthToken))
-		r.Get("/user/auth-tokens/rotate", routing.Wrap(hs.RotateUserAuthTokenRedirect))
+	adminAuthPageEvaluator := func() ac.Evaluator {
+		authnSettingsEval := ssoutils.EvalAuthenticationSettings(hs.Cfg)
+		if hs.Features.IsEnabledGlobally(featuremgmt.FlagSsoSettingsApi) {
+			return ac.EvalAny(authnSettingsEval, ssoutils.OauthSettingsEvaluator(hs.Cfg))
+		}
+		return authnSettingsEval
 	}
 
-	r.Get("/admin/authentication/", authorize(evalAuthenticationSettings()), hs.Index)
+	r.Get("/admin/authentication", authorize(adminAuthPageEvaluator()), hs.Index)
+	r.Get("/admin/authentication/ldap", authorize(ac.EvalPermission(ac.ActionLDAPStatusRead)), hs.Index)
+	if hs.Features.IsEnabledGlobally(featuremgmt.FlagSsoSettingsApi) {
+		providerParam := ac.Parameter(":provider")
+		r.Get("/admin/authentication/:provider", authorize(ac.EvalPermission(ac.ActionSettingsRead, ac.ScopeSettingsOAuth(providerParam))), hs.Index)
+	}
 
 	// authed api
 	r.Group("/api", func(apiRoute routing.RouteRegister) {
@@ -277,17 +289,12 @@ func (hs *HTTPServer) registerRoutes() {
 			orgRoute.Get("/quotas", authorize(ac.EvalPermission(ac.ActionOrgsQuotasRead)), routing.Wrap(hs.GetCurrentOrgQuotas))
 		})
 
-		if hs.Features.IsEnabled(featuremgmt.FlagStorage) {
+		if hs.Features.IsEnabledGlobally(featuremgmt.FlagStorage) {
 			// Will eventually be replaced with the 'object' route
 			apiRoute.Group("/storage", hs.StorageService.RegisterHTTPRoutes)
 		}
 
-		// Allow HTTP access to the entity storage feature (dev only for now)
-		if hs.Features.IsEnabled(featuremgmt.FlagEntityStore) {
-			apiRoute.Group("/entity", hs.httpEntityStore.RegisterHTTPRoutes)
-		}
-
-		if hs.Features.IsEnabled(featuremgmt.FlagPanelTitleSearch) {
+		if hs.Features.IsEnabledGlobally(featuremgmt.FlagPanelTitleSearch) {
 			apiRoute.Group("/search-v2", hs.SearchV2HTTPService.RegisterHTTPRoutes)
 		}
 
@@ -390,35 +397,29 @@ func (hs *HTTPServer) registerRoutes() {
 		apiRoute.Get("/plugins", routing.Wrap(hs.GetPluginList))
 		apiRoute.Get("/plugins/:pluginId/settings", routing.Wrap(hs.GetPluginSettingByID)) // RBAC check performed in handler for App Plugins
 		apiRoute.Get("/plugins/:pluginId/markdown/:name", routing.Wrap(hs.GetPluginMarkdown))
-		apiRoute.Get("/plugins/:pluginId/health", requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow), routing.Wrap(hs.CheckHealth))
-		apiRoute.Any("/plugins/:pluginId/resources", requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow), authorize(ac.EvalPermission(pluginaccesscontrol.ActionAppAccess, pluginIDScope)), hs.CallResource)
-		apiRoute.Any("/plugins/:pluginId/resources/*", requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow), authorize(ac.EvalPermission(pluginaccesscontrol.ActionAppAccess, pluginIDScope)), hs.CallResource)
+		apiRoute.Get("/plugins/:pluginId/health", requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow), checkAppEnabled(hs.pluginStore, hs.PluginSettings), routing.Wrap(hs.CheckHealth))
+		apiRoute.Any("/plugins/:pluginId/resources", requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow), authorize(ac.EvalPermission(pluginaccesscontrol.ActionAppAccess, pluginIDScope)), checkAppEnabled(hs.pluginStore, hs.PluginSettings), hs.CallResource)
+		apiRoute.Any("/plugins/:pluginId/resources/*", requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow), authorize(ac.EvalPermission(pluginaccesscontrol.ActionAppAccess, pluginIDScope)), checkAppEnabled(hs.pluginStore, hs.PluginSettings), hs.CallResource)
 		apiRoute.Get("/plugins/errors", routing.Wrap(hs.GetPluginErrorsList))
-		apiRoute.Any("/plugin-proxy/:pluginId/*", requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow), authorize(ac.EvalPermission(pluginaccesscontrol.ActionAppAccess, pluginIDScope)), hs.ProxyPluginRequest)
-		apiRoute.Any("/plugin-proxy/:pluginId", requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow), authorize(ac.EvalPermission(pluginaccesscontrol.ActionAppAccess, pluginIDScope)), hs.ProxyPluginRequest)
+		apiRoute.Any("/plugin-proxy/:pluginId/*", requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow), authorize(ac.EvalPermission(pluginaccesscontrol.ActionAppAccess, pluginIDScope)), checkAppEnabled(hs.pluginStore, hs.PluginSettings), hs.ProxyPluginRequest)
+		apiRoute.Any("/plugin-proxy/:pluginId", requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow), authorize(ac.EvalPermission(pluginaccesscontrol.ActionAppAccess, pluginIDScope)), checkAppEnabled(hs.pluginStore, hs.PluginSettings), hs.ProxyPluginRequest)
 
-		if hs.Cfg.PluginAdminEnabled && !hs.Cfg.PluginAdminExternalManageEnabled {
+		if hs.Cfg.PluginAdminEnabled && (hs.Features.IsEnabledGlobally(featuremgmt.FlagManagedPluginsInstall) || !hs.Cfg.PluginAdminExternalManageEnabled) {
 			apiRoute.Group("/plugins", func(pluginRoute routing.RouteRegister) {
-				pluginRoute.Post("/:pluginId/install", authorize(ac.EvalPermission(pluginaccesscontrol.ActionInstall)), routing.Wrap(hs.InstallPlugin))
-				pluginRoute.Post("/:pluginId/uninstall", authorize(ac.EvalPermission(pluginaccesscontrol.ActionInstall)), routing.Wrap(hs.UninstallPlugin))
+				pluginRoute.Post("/:pluginId/install", authorizeInOrg(ac.UseGlobalOrSingleOrg(hs.Cfg), ac.EvalPermission(pluginaccesscontrol.ActionInstall)), routing.Wrap(hs.InstallPlugin))
+				pluginRoute.Post("/:pluginId/uninstall", authorizeInOrg(ac.UseGlobalOrSingleOrg(hs.Cfg), ac.EvalPermission(pluginaccesscontrol.ActionInstall)), routing.Wrap(hs.UninstallPlugin))
 			})
 		}
 
 		apiRoute.Group("/plugins", func(pluginRoute routing.RouteRegister) {
-			pluginRoute.Get("/:pluginId/dashboards/", reqOrgAdmin, routing.Wrap(hs.GetPluginDashboards))
+			pluginRoute.Get("/:pluginId/dashboards/", reqOrgAdmin, checkAppEnabled(hs.pluginStore, hs.PluginSettings), routing.Wrap(hs.GetPluginDashboards))
 			pluginRoute.Post("/:pluginId/settings", authorize(ac.EvalPermission(pluginaccesscontrol.ActionWrite, pluginIDScope)), routing.Wrap(hs.UpdatePluginSetting))
 			pluginRoute.Get("/:pluginId/metrics", reqOrgAdmin, routing.Wrap(hs.CollectPluginMetrics))
 		})
 
-		if hs.Features.IsEnabled(featuremgmt.FlagFeatureToggleAdminPage) {
-			apiRoute.Group("/featuremgmt", func(featuremgmtRoute routing.RouteRegister) {
-				featuremgmtRoute.Get("/state", authorize(ac.EvalPermission(ac.ActionFeatureManagementRead)), hs.GetFeatureMgmtState)
-				featuremgmtRoute.Get("/", authorize(ac.EvalPermission(ac.ActionFeatureManagementRead)), hs.GetFeatureToggles)
-				featuremgmtRoute.Post("/", authorize(ac.EvalPermission(ac.ActionFeatureManagementWrite)), hs.UpdateFeatureToggle)
-			})
-		}
-
 		apiRoute.Get("/frontend/settings/", hs.GetFrontendSettings)
+		apiRoute.Get("/frontend/assets", hs.GetFrontendAssets)
+
 		apiRoute.Any("/datasources/proxy/:id/*", requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow), authorize(ac.EvalPermission(datasources.ActionQuery)), hs.ProxyDataSourceRequest)
 		apiRoute.Any("/datasources/proxy/uid/:uid/*", requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow), authorize(ac.EvalPermission(datasources.ActionQuery)), hs.ProxyDataSourceRequestWithUID)
 		apiRoute.Any("/datasources/proxy/:id", requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow), authorize(ac.EvalPermission(datasources.ActionQuery)), hs.ProxyDataSourceRequest)
@@ -470,8 +471,6 @@ func (hs *HTTPServer) registerRoutes() {
 			})
 
 			dashboardRoute.Post("/calculate-diff", authorize(ac.EvalPermission(dashboards.ActionDashboardsWrite)), routing.Wrap(hs.CalculateDashboardDiff))
-			dashboardRoute.Post("/validate", authorize(ac.EvalPermission(dashboards.ActionDashboardsWrite)), routing.Wrap(hs.ValidateDashboard))
-			dashboardRoute.Post("/trim", routing.Wrap(hs.TrimDashboard))
 
 			dashboardRoute.Post("/db", authorize(ac.EvalAny(ac.EvalPermission(dashboards.ActionDashboardsCreate), ac.EvalPermission(dashboards.ActionDashboardsWrite))), routing.Wrap(hs.PostDashboard))
 			dashboardRoute.Get("/home", routing.Wrap(hs.GetHomeDashboard))
@@ -499,14 +498,7 @@ func (hs *HTTPServer) registerRoutes() {
 		})
 
 		// Playlist
-		apiRoute.Group("/playlists", func(playlistRoute routing.RouteRegister) {
-			playlistRoute.Get("/", routing.Wrap(hs.SearchPlaylists))
-			playlistRoute.Get("/:uid", hs.ValidateOrgPlaylist, routing.Wrap(hs.GetPlaylist))
-			playlistRoute.Get("/:uid/items", hs.ValidateOrgPlaylist, routing.Wrap(hs.GetPlaylistItems))
-			playlistRoute.Delete("/:uid", reqEditorRole, hs.ValidateOrgPlaylist, routing.Wrap(hs.DeletePlaylist))
-			playlistRoute.Put("/:uid", reqEditorRole, hs.ValidateOrgPlaylist, routing.Wrap(hs.UpdatePlaylist))
-			playlistRoute.Post("/", reqEditorRole, routing.Wrap(hs.CreatePlaylist))
-		})
+		hs.registerPlaylistAPI(apiRoute)
 
 		// Search
 		apiRoute.Get("/search/sorting", routing.Wrap(hs.ListSortOptions))
@@ -514,44 +506,13 @@ func (hs *HTTPServer) registerRoutes() {
 
 		// metrics
 		// DataSource w/ expressions
-		apiRoute.Post("/ds/query", requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow), authorize(ac.EvalPermission(datasources.ActionQuery)), routing.Wrap(hs.QueryMetricsV2))
-
-		apiRoute.Group("/alerts", func(alertsRoute routing.RouteRegister) {
-			alertsRoute.Post("/test", routing.Wrap(hs.AlertTest))
-			alertsRoute.Post("/:alertId/pause", reqEditorRole, routing.Wrap(hs.PauseAlert(setting.AlertingEnabled)))
-			alertsRoute.Get("/:alertId", hs.ValidateOrgAlert, routing.Wrap(hs.GetAlert))
-			alertsRoute.Get("/", routing.Wrap(hs.GetAlerts))
-			alertsRoute.Get("/states-for-dashboard", routing.Wrap(hs.GetAlertStatesForDashboard))
-		}, requestmeta.SetOwner(requestmeta.TeamAlerting))
-
-		var notifiersAuthHandler web.Handler
-		if hs.Cfg.UnifiedAlerting.IsEnabled() {
-			notifiersAuthHandler = reqSignedIn
-		} else {
-			notifiersAuthHandler = reqEditorRole
-		}
+		apiRoute.Post("/ds/query", requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow), authorize(ac.EvalPermission(datasources.ActionQuery)), hs.getDSQueryEndpoint())
 
-		apiRoute.Get("/alert-notifiers", notifiersAuthHandler, requestmeta.SetOwner(requestmeta.TeamAlerting), routing.Wrap(
-			hs.GetAlertNotifiers(hs.Cfg.UnifiedAlerting.IsEnabled())),
+		// Unified Alerting
+		apiRoute.Get("/alert-notifiers", reqSignedIn, requestmeta.SetOwner(requestmeta.TeamAlerting), routing.Wrap(
+			hs.GetAlertNotifiers()),
 		)
 
-		apiRoute.Group("/alert-notifications", func(alertNotifications routing.RouteRegister) {
-			alertNotifications.Get("/", routing.Wrap(hs.GetAlertNotifications))
-			alertNotifications.Post("/test", routing.Wrap(hs.NotificationTest))
-			alertNotifications.Post("/", routing.Wrap(hs.CreateAlertNotification))
-			alertNotifications.Put("/:notificationId", routing.Wrap(hs.UpdateAlertNotification))
-			alertNotifications.Get("/:notificationId", routing.Wrap(hs.GetAlertNotificationByID))
-			alertNotifications.Delete("/:notificationId", routing.Wrap(hs.DeleteAlertNotification))
-			alertNotifications.Get("/uid/:uid", routing.Wrap(hs.GetAlertNotificationByUID))
-			alertNotifications.Put("/uid/:uid", routing.Wrap(hs.UpdateAlertNotificationByUID))
-			alertNotifications.Delete("/uid/:uid", routing.Wrap(hs.DeleteAlertNotificationByUID))
-		}, reqEditorRole, requestmeta.SetOwner(requestmeta.TeamAlerting))
-
-		// alert notifications without requirement of user to be org editor
-		apiRoute.Group("/alert-notifications", func(orgRoute routing.RouteRegister) {
-			orgRoute.Get("/lookup", routing.Wrap(hs.GetAlertNotificationLookup))
-		}, requestmeta.SetOwner(requestmeta.TeamAlerting))
-
 		apiRoute.Get("/annotations", authorize(ac.EvalPermission(ac.ActionAnnotationsRead)), routing.Wrap(hs.GetAnnotations))
 		apiRoute.Post("/annotations/mass-delete", authorize(ac.EvalPermission(ac.ActionAnnotationsDelete)), routing.Wrap(hs.MassDeleteAnnotations))
 
@@ -591,7 +552,6 @@ func (hs *HTTPServer) registerRoutes() {
 		adminRoute.Get("/settings", authorize(ac.EvalPermission(ac.ActionSettingsRead)), routing.Wrap(hs.AdminGetSettings))
 		adminRoute.Get("/settings-verbose", authorize(ac.EvalPermission(ac.ActionSettingsRead)), routing.Wrap(hs.AdminGetVerboseSettings))
 		adminRoute.Get("/stats", authorize(ac.EvalPermission(ac.ActionServerStatsRead)), routing.Wrap(hs.AdminGetStats))
-		adminRoute.Post("/pause-all-alerts", reqGrafanaAdmin, routing.Wrap(hs.PauseAllAlerts(setting.AlertingEnabled)))
 
 		adminRoute.Post("/encryption/rotate-data-keys", reqGrafanaAdmin, routing.Wrap(hs.AdminRotateDataEncryptionKeys))
 		adminRoute.Post("/encryption/reencrypt-data-keys", reqGrafanaAdmin, routing.Wrap(hs.AdminReEncryptEncryptionKeys))
@@ -604,7 +564,6 @@ func (hs *HTTPServer) registerRoutes() {
 		adminRoute.Post("/provisioning/dashboards/reload", authorize(ac.EvalPermission(ActionProvisioningReload, ScopeProvisionersDashboards)), routing.Wrap(hs.AdminProvisioningReloadDashboards))
 		adminRoute.Post("/provisioning/plugins/reload", authorize(ac.EvalPermission(ActionProvisioningReload, ScopeProvisionersPlugins)), routing.Wrap(hs.AdminProvisioningReloadPlugins))
 		adminRoute.Post("/provisioning/datasources/reload", authorize(ac.EvalPermission(ActionProvisioningReload, ScopeProvisionersDatasources)), routing.Wrap(hs.AdminProvisioningReloadDatasources))
-		adminRoute.Post("/provisioning/notifications/reload", authorize(ac.EvalPermission(ActionProvisioningReload, ScopeProvisionersNotifications)), routing.Wrap(hs.AdminProvisioningReloadNotifications))
 		adminRoute.Post("/provisioning/alerting/reload", authorize(ac.EvalPermission(ActionProvisioningReload, ScopeProvisionersAlertRules)), routing.Wrap(hs.AdminProvisioningReloadAlerting))
 	}, reqSignedIn)
 
@@ -636,16 +595,9 @@ func (hs *HTTPServer) registerRoutes() {
 	r.Get("/avatar/:hash", requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow), hs.AvatarCacheServer.Handler)
 
 	// Snapshots
-	r.Post("/api/snapshots/", reqSnapshotPublicModeOrSignedIn, hs.CreateDashboardSnapshot)
+	r.Post("/api/snapshots/", reqSnapshotPublicModeOrSignedIn, hs.getCreatedSnapshotHandler())
 	r.Get("/api/snapshot/shared-options/", reqSignedIn, hs.GetSharingOptions)
 	r.Get("/api/snapshots/:key", routing.Wrap(hs.GetDashboardSnapshot))
 	r.Get("/api/snapshots-delete/:deleteKey", reqSnapshotPublicModeOrSignedIn, routing.Wrap(hs.DeleteDashboardSnapshotByDeleteKey))
 	r.Delete("/api/snapshots/:key", reqSignedIn, routing.Wrap(hs.DeleteDashboardSnapshot))
 }
-
-func evalAuthenticationSettings() ac.Evaluator {
-	return ac.EvalAny(ac.EvalAll(
-		ac.EvalPermission(ac.ActionSettingsWrite, ac.ScopeSettingsSAML),
-		ac.EvalPermission(ac.ActionSettingsRead, ac.ScopeSettingsSAML),
-	), ac.EvalPermission(ac.ActionLDAPStatusRead))
-}
diff --git a/pkg/api/api_test.go b/pkg/api/api_test.go
new file mode 100644
index 0000000000000..0cbeea1f75292
--- /dev/null
+++ b/pkg/api/api_test.go
@@ -0,0 +1,11 @@
+package api
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana/pkg/tests/testsuite"
+)
+
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
diff --git a/pkg/api/apierrors/dashboard.go b/pkg/api/apierrors/dashboard.go
index 6b80347e01279..6f740d80afd57 100644
--- a/pkg/api/apierrors/dashboard.go
+++ b/pkg/api/apierrors/dashboard.go
@@ -7,7 +7,6 @@ import (
 	"net/http"
 
 	"github.com/grafana/grafana/pkg/api/response"
-	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 	"github.com/grafana/grafana/pkg/util"
@@ -30,11 +29,6 @@ func ToDashboardErrorResponse(ctx context.Context, pluginStore pluginstore.Store
 		return response.Error(http.StatusBadRequest, err.Error(), nil)
 	}
 
-	var validationErr alerting.ValidationError
-	if ok := errors.As(err, &validationErr); ok {
-		return response.Error(http.StatusUnprocessableEntity, validationErr.Error(), err)
-	}
-
 	var pluginErr dashboards.UpdatePluginDashboardError
 	if ok := errors.As(err, &pluginErr); ok {
 		message := fmt.Sprintf("The dashboard belongs to plugin %s.", pluginErr.PluginId)
diff --git a/pkg/api/apierrors/folder.go b/pkg/api/apierrors/folder.go
index 38a0f3a534c9b..edad9a40a0f89 100644
--- a/pkg/api/apierrors/folder.go
+++ b/pkg/api/apierrors/folder.go
@@ -2,6 +2,7 @@ package apierrors
 
 import (
 	"errors"
+	"net/http"
 
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/services/dashboards"
@@ -18,27 +19,26 @@ func ToFolderErrorResponse(err error) response.Response {
 	if errors.Is(err, dashboards.ErrFolderTitleEmpty) ||
 		errors.Is(err, dashboards.ErrDashboardTypeMismatch) ||
 		errors.Is(err, dashboards.ErrDashboardInvalidUid) ||
-		errors.Is(err, dashboards.ErrDashboardUidTooLong) ||
-		errors.Is(err, dashboards.ErrFolderContainsAlertRules) {
-		return response.Error(400, err.Error(), nil)
+		errors.Is(err, dashboards.ErrDashboardUidTooLong) {
+		return response.Error(http.StatusBadRequest, err.Error(), nil)
 	}
 
 	if errors.Is(err, dashboards.ErrFolderAccessDenied) {
-		return response.Error(403, "Access denied", err)
+		return response.Error(http.StatusForbidden, "Access denied", err)
 	}
 
 	if errors.Is(err, dashboards.ErrFolderNotFound) {
-		return response.JSON(404, util.DynMap{"status": "not-found", "message": dashboards.ErrFolderNotFound.Error()})
+		return response.JSON(http.StatusNotFound, util.DynMap{"status": "not-found", "message": dashboards.ErrFolderNotFound.Error()})
 	}
 
 	if errors.Is(err, dashboards.ErrFolderSameNameExists) ||
 		errors.Is(err, dashboards.ErrFolderWithSameUIDExists) {
-		return response.Error(409, err.Error(), nil)
+		return response.Error(http.StatusConflict, err.Error(), nil)
 	}
 
 	if errors.Is(err, dashboards.ErrFolderVersionMismatch) {
-		return response.JSON(412, util.DynMap{"status": "version-mismatch", "message": dashboards.ErrFolderVersionMismatch.Error()})
+		return response.JSON(http.StatusPreconditionFailed, util.DynMap{"status": "version-mismatch", "message": dashboards.ErrFolderVersionMismatch.Error()})
 	}
 
-	return response.ErrOrFallback(500, "Folder API error", err)
+	return response.ErrOrFallback(http.StatusInternalServerError, "Folder API error", err)
 }
diff --git a/pkg/api/apikey.go b/pkg/api/apikey.go
index 2ca740ce5b0f7..fafaddecb6813 100644
--- a/pkg/api/apikey.go
+++ b/pkg/api/apikey.go
@@ -92,9 +92,9 @@ func (hs *HTTPServer) DeleteAPIKey(c *contextmodel.ReqContext) response.Response
 	if err != nil {
 		var status int
 		if errors.Is(err, apikey.ErrNotFound) {
-			status = 404
+			status = http.StatusNotFound
 		} else {
-			status = 500
+			status = http.StatusInternalServerError
 		}
 		return response.Error(status, "Failed to delete API key", err)
 	}
diff --git a/pkg/api/avatar/avatar.go b/pkg/api/avatar/avatar.go
index d331cee8664b5..864d6187af072 100644
--- a/pkg/api/avatar/avatar.go
+++ b/pkg/api/avatar/avatar.go
@@ -107,7 +107,7 @@ func (a *AvatarCacheServer) Handler(ctx *contextmodel.ReqContext) {
 		return
 	}
 
-	avatar := a.GetAvatarForHash(hash)
+	avatar := a.GetAvatarForHash(a.cfg, hash)
 
 	ctx.Resp.Header().Set("Content-Type", "image/jpeg")
 
@@ -123,8 +123,8 @@ func (a *AvatarCacheServer) Handler(ctx *contextmodel.ReqContext) {
 	}
 }
 
-func (a *AvatarCacheServer) GetAvatarForHash(hash string) *Avatar {
-	if setting.DisableGravatar {
+func (a *AvatarCacheServer) GetAvatarForHash(cfg *setting.Cfg, hash string) *Avatar {
+	if cfg.DisableGravatar {
 		alog.Warn("'GetGravatarForHash' called despite gravatars being disabled; returning default profile image")
 		return a.notFound
 	}
diff --git a/pkg/api/common_test.go b/pkg/api/common_test.go
index 9f40753df17cc..fb408d33e1fec 100644
--- a/pkg/api/common_test.go
+++ b/pkg/api/common_test.go
@@ -11,6 +11,7 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/api/response"
@@ -31,7 +32,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/licensing"
 	"github.com/grafana/grafana/pkg/services/login"
-	"github.com/grafana/grafana/pkg/services/login/logintest"
+	"github.com/grafana/grafana/pkg/services/login/authinfotest"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
 	"github.com/grafana/grafana/pkg/services/search"
@@ -164,7 +165,7 @@ type scenarioContext struct {
 	url                     string
 	userAuthTokenService    *authtest.FakeUserAuthTokenService
 	sqlStore                db.DB
-	authInfoService         *logintest.AuthInfoServiceFake
+	authInfoService         *authinfotest.FakeService
 	dashboardVersionService dashver.Service
 	userService             user.Service
 	ctxHdlr                 *contexthandler.ContextHandler
@@ -214,6 +215,40 @@ func setupScenarioContext(t *testing.T, url string) *scenarioContext {
 	return sc
 }
 
+func setupScenarioContextSamlLogout(t *testing.T, url string) *scenarioContext {
+	cfg := setting.NewCfg()
+	//seed sections and keys
+	cfg.Raw.DeleteSection("DEFAULT")
+	saml, err := cfg.Raw.NewSection("auth.saml")
+	assert.NoError(t, err)
+	_, err = saml.NewKey("enabled", "true")
+	assert.NoError(t, err)
+	_, err = saml.NewKey("allow_idp_initiated", "false")
+	assert.NoError(t, err)
+	_, err = saml.NewKey("single_logout", "true")
+	assert.NoError(t, err)
+
+	ctxHdlr := getContextHandler(t, cfg)
+	sc := &scenarioContext{
+		url:     url,
+		t:       t,
+		cfg:     cfg,
+		ctxHdlr: ctxHdlr,
+	}
+	viewsPath, err := filepath.Abs("../../public/views")
+	require.NoError(t, err)
+	exists, err := fs.Exists(viewsPath)
+	require.NoError(t, err)
+	require.Truef(t, exists, "Views should be in %q", viewsPath)
+
+	sc.m = web.New()
+	sc.m.UseMiddleware(web.Renderer(viewsPath, "[[", "]]"))
+	sc.m.Use(ctxHdlr.Middleware)
+
+	return sc
+}
+
+// FIXME: This user should not be anonymous
 func authedUserWithPermissions(userID, orgID int64, permissions []accesscontrol.Permission) *user.SignedInUser {
 	return &user.SignedInUser{UserID: userID, OrgID: orgID, OrgRole: org.RoleViewer, Permissions: map[int64]map[string][]string{orgID: accesscontrol.GroupScopesByAction(permissions)}}
 }
@@ -223,12 +258,12 @@ func userWithPermissions(orgID int64, permissions []accesscontrol.Permission) *u
 	return &user.SignedInUser{IsAnonymous: true, OrgID: orgID, OrgRole: org.RoleViewer, Permissions: map[int64]map[string][]string{orgID: accesscontrol.GroupScopesByAction(permissions)}}
 }
 
-func setupSimpleHTTPServer(features *featuremgmt.FeatureManager) *HTTPServer {
+func setupSimpleHTTPServer(features featuremgmt.FeatureToggles) *HTTPServer {
 	if features == nil {
 		features = featuremgmt.WithFeatures()
 	}
-	cfg := setting.NewCfg()
-	cfg.IsFeatureToggleEnabled = features.IsEnabled
+	// nolint:staticcheck
+	cfg := setting.NewCfgWithFeatures(features.IsEnabledGlobally)
 
 	return &HTTPServer{
 		Cfg:             cfg,
@@ -236,7 +271,7 @@ func setupSimpleHTTPServer(features *featuremgmt.FeatureManager) *HTTPServer {
 		License:         &licensing.OSSLicensingService{},
 		AccessControl:   acimpl.ProvideAccessControl(cfg),
 		annotationsRepo: annotationstest.NewFakeAnnotationsRepo(),
-		authInfoService: &logintest.AuthInfoServiceFake{
+		authInfoService: &authinfotest.FakeService{
 			ExpectedLabels: map[int64]string{int64(1): login.GetAuthProviderLabel(login.LDAPAuthModule)},
 		},
 	}
diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go
index 91b3851833596..bc24cc4d36563 100644
--- a/pkg/api/dashboard.go
+++ b/pkg/api/dashboard.go
@@ -14,18 +14,16 @@ import (
 	"github.com/grafana/grafana/pkg/api/apierrors"
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/api/response"
+	dashboardsV0 "github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1"
 	"github.com/grafana/grafana/pkg/components/dashdiffs"
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/metrics"
-	"github.com/grafana/grafana/pkg/kinds/dashboard"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	dashver "github.com/grafana/grafana/pkg/services/dashboardversion"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/guardian"
 	"github.com/grafana/grafana/pkg/services/org"
 	pref "github.com/grafana/grafana/pkg/services/preference"
@@ -68,32 +66,6 @@ func dashboardGuardianResponse(err error) response.Response {
 	return response.Error(http.StatusForbidden, "Access denied to this dashboard", nil)
 }
 
-// swagger:route POST /dashboards/trim dashboards trimDashboard
-//
-// Trim defaults from dashboard.
-//
-// Responses:
-// 200: trimDashboardResponse
-// 401: unauthorisedError
-// 500: internalServerError
-func (hs *HTTPServer) TrimDashboard(c *contextmodel.ReqContext) response.Response {
-	cmd := dashboards.TrimDashboardCommand{}
-	if err := web.Bind(c.Req, &cmd); err != nil {
-		return response.Error(http.StatusBadRequest, "bad request data", err)
-	}
-	dash := cmd.Dashboard
-	meta := cmd.Meta
-
-	// TODO temporarily just return the input as a no-op while we convert to thema calls
-	dto := dtos.TrimDashboardFullWithMeta{
-		Dashboard: dash,
-		Meta:      meta,
-	}
-
-	c.TimeRequest(metrics.MApiDashboardGet)
-	return response.JSON(http.StatusOK, dto)
-}
-
 // swagger:route GET /dashboards/uid/{uid} dashboards getDashboardByUID
 //
 // Get dashboard by uid.
@@ -118,15 +90,14 @@ func (hs *HTTPServer) GetDashboard(c *contextmodel.ReqContext) response.Response
 		err                    error
 	)
 
-	// If public dashboards is enabled and we have a public dashboard, update meta
-	// values
-	if hs.Features.IsEnabled(featuremgmt.FlagPublicDashboards) {
+	// If public dashboards is enabled and we have a public dashboard, update meta values
+	if hs.Features.IsEnabledGlobally(featuremgmt.FlagPublicDashboards) && hs.Cfg.PublicDashboardsEnabled {
 		publicDashboard, err := hs.PublicDashboardsApi.PublicDashboardService.FindByDashboardUid(c.Req.Context(), c.SignedInUser.GetOrgID(), dash.UID)
 		if err != nil && !errors.Is(err, publicdashboardModels.ErrPublicDashboardNotFound) {
 			return response.Error(http.StatusInternalServerError, "Error while retrieving public dashboards", err)
 		}
 
-		if publicDashboard != nil {
+		if publicDashboard != nil && (hs.License.FeatureEnabled(publicdashboardModels.FeaturePublicDashboardsEmailSharing) || publicDashboard.Share != publicdashboardModels.EmailShareType) {
 			publicDashboardEnabled = publicDashboard.IsEnabled
 		}
 	}
@@ -170,8 +141,12 @@ func (hs *HTTPServer) GetDashboard(c *contextmodel.ReqContext) response.Response
 		creator = hs.getUserLogin(c.Req.Context(), dash.CreatedBy)
 	}
 
-	annotationPermissions := &dtos.AnnotationPermission{}
-	hs.getAnnotationPermissionsByScope(c, &annotationPermissions.Dashboard, accesscontrol.ScopeAnnotationsTypeDashboard)
+	annotationPermissions := &dashboardsV0.AnnotationPermission{}
+	if hs.Features.IsEnabled(c.Req.Context(), featuremgmt.FlagAnnotationPermissionUpdate) {
+		hs.getAnnotationPermissionsByScope(c, &annotationPermissions.Dashboard, dashboards.ScopeDashboardsProvider.GetResourceScopeUID(dash.UID))
+	} else {
+		hs.getAnnotationPermissionsByScope(c, &annotationPermissions.Dashboard, accesscontrol.ScopeAnnotationsTypeDashboard)
+	}
 	hs.getAnnotationPermissionsByScope(c, &annotationPermissions.Organization, accesscontrol.ScopeAnnotationsTypeOrganization)
 
 	meta := dtos.DashboardMeta{
@@ -190,16 +165,19 @@ func (hs *HTTPServer) GetDashboard(c *contextmodel.ReqContext) response.Response
 		Version:                dash.Version,
 		HasACL:                 dash.HasACL,
 		IsFolder:               dash.IsFolder,
-		FolderId:               dash.FolderID,
+		FolderId:               dash.FolderID, // nolint:staticcheck
 		Url:                    dash.GetURL(),
 		FolderTitle:            "General",
 		AnnotationsPermissions: annotationPermissions,
 		PublicDashboardEnabled: publicDashboardEnabled,
 	}
-
+	metrics.MFolderIDsAPICount.WithLabelValues(metrics.GetDashboard).Inc()
 	// lookup folder title
+	// nolint:staticcheck
 	if dash.FolderID > 0 {
+		// nolint:staticcheck
 		query := dashboards.GetDashboardQuery{ID: dash.FolderID, OrgID: c.SignedInUser.GetOrgID()}
+		metrics.MFolderIDsAPICount.WithLabelValues(metrics.GetDashboard).Inc()
 		queryResult, err := hs.DashboardService.GetDashboard(c.Req.Context(), &query)
 		if err != nil {
 			if errors.Is(err, dashboards.ErrFolderNotFound) {
@@ -246,7 +224,7 @@ func (hs *HTTPServer) GetDashboard(c *contextmodel.ReqContext) response.Response
 	return response.JSON(http.StatusOK, dto)
 }
 
-func (hs *HTTPServer) getAnnotationPermissionsByScope(c *contextmodel.ReqContext, actions *dtos.AnnotationActions, scope string) {
+func (hs *HTTPServer) getAnnotationPermissionsByScope(c *contextmodel.ReqContext, actions *dashboardsV0.AnnotationActions, scope string) {
 	var err error
 
 	evaluate := accesscontrol.EvalPermission(accesscontrol.ActionAnnotationsCreate, scope)
@@ -324,6 +302,10 @@ func (hs *HTTPServer) deleteDashboard(c *contextmodel.ReqContext) response.Respo
 		return dashboardGuardianResponse(err)
 	}
 
+	if dash.IsFolder {
+		return response.Error(http.StatusBadRequest, "Use folders endpoint for deleting folders.", nil)
+	}
+
 	namespaceID, userIDStr := c.SignedInUser.GetNamespacedID()
 
 	// disconnect all library elements for this dashboard
@@ -377,6 +359,7 @@ func (hs *HTTPServer) deleteDashboard(c *contextmodel.ReqContext) response.Respo
 // Create / Update dashboard
 //
 // Creates a new dashboard or updates an existing dashboard.
+// Note: This endpoint is not intended for creating folders, use `POST /api/folders` for that.
 //
 // Responses:
 // 200: postDashboardResponse
@@ -396,6 +379,10 @@ func (hs *HTTPServer) PostDashboard(c *contextmodel.ReqContext) response.Respons
 }
 
 func (hs *HTTPServer) postDashboard(c *contextmodel.ReqContext, cmd dashboards.SaveDashboardCommand) response.Response {
+	if cmd.IsFolder {
+		return response.Error(http.StatusBadRequest, "Use folders endpoint for saving folders.", nil)
+	}
+
 	ctx := c.Req.Context()
 	var err error
 
@@ -412,25 +399,6 @@ func (hs *HTTPServer) postDashboard(c *contextmodel.ReqContext, cmd dashboards.S
 
 	cmd.OrgID = c.SignedInUser.GetOrgID()
 	cmd.UserID = userID
-	// nolint:staticcheck
-	if cmd.FolderUID != "" || cmd.FolderID != 0 {
-		folder, err := hs.folderService.Get(ctx, &folder.GetFolderQuery{
-			OrgID: c.SignedInUser.GetOrgID(),
-			UID:   &cmd.FolderUID,
-			// nolint:staticcheck
-			ID:           &cmd.FolderID,
-			SignedInUser: c.SignedInUser,
-		})
-		if err != nil {
-			if errors.Is(err, dashboards.ErrFolderNotFound) {
-				return response.Error(http.StatusBadRequest, "Folder not found", err)
-			}
-			return response.Error(http.StatusInternalServerError, "Error while checking folder ID", err)
-		}
-		// nolint:staticcheck
-		cmd.FolderID = folder.ID
-		cmd.FolderUID = folder.UID
-	}
 
 	dash := cmd.GetDashboardModel()
 	newDashboard := dash.ID == 0
@@ -472,7 +440,7 @@ func (hs *HTTPServer) postDashboard(c *contextmodel.ReqContext, cmd dashboards.S
 		Overwrite: cmd.Overwrite,
 	}
 
-	dashboard, err := hs.DashboardService.SaveDashboard(alerting.WithUAEnabled(ctx, hs.Cfg.UnifiedAlerting.IsEnabled()), dashItem, allowUiUpdate)
+	dashboard, err := hs.DashboardService.SaveDashboard(ctx, dashItem, allowUiUpdate)
 
 	if hs.Live != nil {
 		// Tell everyone listening that the dashboard changed
@@ -521,12 +489,13 @@ func (hs *HTTPServer) postDashboard(c *contextmodel.ReqContext, cmd dashboards.S
 
 	c.TimeRequest(metrics.MApiDashboardSave)
 	return response.JSON(http.StatusOK, util.DynMap{
-		"status":  "success",
-		"slug":    dashboard.Slug,
-		"version": dashboard.Version,
-		"id":      dashboard.ID,
-		"uid":     dashboard.UID,
-		"url":     dashboard.GetURL(),
+		"status":    "success",
+		"slug":      dashboard.Slug,
+		"version":   dashboard.Version,
+		"id":        dashboard.ID,
+		"uid":       dashboard.UID,
+		"url":       dashboard.GetURL(),
+		"folderUid": dashboard.FolderUID,
 	})
 }
 
@@ -831,72 +800,6 @@ func (hs *HTTPServer) GetDashboardVersion(c *contextmodel.ReqContext) response.R
 	return response.JSON(http.StatusOK, dashVersionMeta)
 }
 
-// swagger:route POST /dashboards/validate dashboards alpha validateDashboard
-//
-// Validates a dashboard JSON against the schema.
-//
-// Produces:
-// - application/json
-//
-// Responses:
-// 200: validateDashboardResponse
-// 412: validateDashboardResponse
-// 422: validateDashboardResponse
-// 401: unauthorisedError
-// 403: forbiddenError
-// 500: internalServerError
-func (hs *HTTPServer) ValidateDashboard(c *contextmodel.ReqContext) response.Response {
-	cmd := dashboards.ValidateDashboardCommand{}
-
-	if err := web.Bind(c.Req, &cmd); err != nil {
-		return response.Error(http.StatusBadRequest, "Bad request data", err)
-	}
-
-	dk := hs.Kinds.Dashboard()
-	dashboardBytes := []byte(cmd.Dashboard)
-
-	// POST api receives dashboard as a string of json (so line numbers for errors stay consistent),
-	// but we need to parse the schema version out of it
-	dashboardJson, err := simplejson.NewJson(dashboardBytes)
-	if err != nil {
-		return response.Error(http.StatusBadRequest, "unable to parse dashboard", err)
-	}
-
-	schemaVersion, err := dashboardJson.Get("schemaVersion").Int()
-
-	isValid := false
-	statusCode := http.StatusOK
-	validationMessage := ""
-
-	// Only try to validate if the schemaVersion is at least the handoff version
-	// (the minimum schemaVersion against which the dashboard schema is known to
-	// work), or if schemaVersion is absent (which will happen once the Thema
-	// schema becomes canonical).
-	if err != nil || schemaVersion >= dashboard.HandoffSchemaVersion {
-		// Schemas expect the dashboard to live in the spec field
-		k8sResource := `{"spec": ` + cmd.Dashboard + "}"
-
-		_, _, validationErr := dk.JSONValueMux([]byte(k8sResource))
-
-		if validationErr == nil {
-			isValid = true
-		} else {
-			validationMessage = validationErr.Error()
-			statusCode = http.StatusUnprocessableEntity
-		}
-	} else {
-		validationMessage = "invalid schema version"
-		statusCode = http.StatusPreconditionFailed
-	}
-
-	respData := &ValidateDashboardResponse{
-		IsValid: isValid,
-		Message: validationMessage,
-	}
-
-	return response.JSON(statusCode, respData)
-}
-
 // swagger:route POST /dashboards/calculate-diff dashboards calculateDashboardDiff
 //
 // Perform diff on two dashboards.
@@ -1080,6 +983,7 @@ func (hs *HTTPServer) RestoreDashboardVersion(c *contextmodel.ReqContext) respon
 	saveCmd.Message = fmt.Sprintf("Restored from version %d", version.Version)
 	// nolint:staticcheck
 	saveCmd.FolderID = dash.FolderID
+	metrics.MFolderIDsAPICount.WithLabelValues(metrics.RestoreDashboardVersion).Inc()
 	saveCmd.FolderUID = dash.FolderUID
 
 	return hs.postDashboard(c, saveCmd)
@@ -1125,12 +1029,6 @@ func (hs *HTTPServer) GetDashboardUIDs(c *contextmodel.ReqContext) {
 	c.JSON(http.StatusOK, uids)
 }
 
-// swagger:parameters renderReportPDF
-type RenderReportPDFParams struct {
-	// in:path
-	DashboardID int64
-}
-
 // swagger:parameters restoreDashboardVersionByID
 type RestoreDashboardVersionByIDParams struct {
 	// in:body
@@ -1232,13 +1130,6 @@ type CalcDashboardDiffParams struct {
 	}
 }
 
-// swagger:parameters trimDashboard
-type TrimDashboardParams struct {
-	// in:body
-	// required:true
-	Body dashboards.TrimDashboardCommand
-}
-
 // swagger:response dashboardResponse
 type DashboardResponse struct {
 	// The response message
@@ -1301,6 +1192,10 @@ type PostDashboardResponse struct {
 		// required: true
 		// example: /d/nHz3SXiiz/my-dashboard
 		URL string `json:"url"`
+
+		// FolderUID The unique identifier (uid) of the folder the dashboard belongs to.
+		// required: false
+		FolderUID string `json:"folderUid"`
 	} `json:"body"`
 }
 
@@ -1310,12 +1205,6 @@ type CalculateDashboardDiffResponse struct {
 	Body []byte `json:"body"`
 }
 
-// swagger:response trimDashboardResponse
-type TrimDashboardResponse struct {
-	// in: body
-	Body dtos.TrimDashboardFullWithMeta `json:"body"`
-}
-
 // swagger:response getHomeDashboardResponse
 type GetHomeDashboardResponse struct {
 	// in: body
@@ -1351,9 +1240,3 @@ type DashboardVersionResponse struct {
 	// in: body
 	Body *dashver.DashboardVersionMeta `json:"body"`
 }
-
-// swagger:response validateDashboardResponse
-type ValidateDashboardResponse struct {
-	IsValid bool   `json:"isValid"`
-	Message string `json:"message,omitempty"`
-}
diff --git a/pkg/api/dashboard_permission.go b/pkg/api/dashboard_permission.go
index adf739148c81c..1754ef752b7b6 100644
--- a/pkg/api/dashboard_permission.go
+++ b/pkg/api/dashboard_permission.go
@@ -8,10 +8,12 @@ import (
 
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/api/response"
+	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/web"
 )
@@ -59,7 +61,7 @@ func (hs *HTTPServer) GetDashboardPermissionList(c *contextmodel.ReqContext) res
 
 	acl, err := hs.getDashboardACL(c.Req.Context(), c.SignedInUser, dash)
 	if err != nil {
-		return response.Error(500, "Failed to get dashboard permissions", err)
+		return response.Error(http.StatusInternalServerError, "Failed to get dashboard permissions", err)
 	}
 
 	filteredACLs := make([]*dashboards.DashboardACLInfoDTO, 0, len(acl))
@@ -68,10 +70,10 @@ func (hs *HTTPServer) GetDashboardPermissionList(c *contextmodel.ReqContext) res
 			continue
 		}
 
-		perm.UserAvatarURL = dtos.GetGravatarUrl(perm.UserEmail)
+		perm.UserAvatarURL = dtos.GetGravatarUrl(hs.Cfg, perm.UserEmail)
 
 		if perm.TeamID > 0 {
-			perm.TeamAvatarURL = dtos.GetGravatarUrlWithDefault(perm.TeamEmail, perm.Team)
+			perm.TeamAvatarURL = dtos.GetGravatarUrlWithDefault(hs.Cfg, perm.TeamEmail, perm.Team)
 		}
 		if perm.Slug != "" {
 			perm.URL = dashboards.GetDashboardFolderURL(perm.IsFolder, perm.UID, perm.Slug)
@@ -122,7 +124,7 @@ func (hs *HTTPServer) UpdateDashboardPermissions(c *contextmodel.ReqContext) res
 		return response.Error(http.StatusBadRequest, "bad request data", err)
 	}
 	if err := validatePermissionsUpdate(apiCmd); err != nil {
-		return response.Error(400, err.Error(), err)
+		return response.Error(http.StatusBadRequest, err.Error(), err)
 	}
 
 	dashUID := web.Params(c.Req)[":uid"]
@@ -166,10 +168,10 @@ func (hs *HTTPServer) UpdateDashboardPermissions(c *contextmodel.ReqContext) res
 	return response.Success("Dashboard permissions updated")
 }
 
-var dashboardPermissionMap = map[string]dashboards.PermissionType{
-	"View":  dashboards.PERMISSION_VIEW,
-	"Edit":  dashboards.PERMISSION_EDIT,
-	"Admin": dashboards.PERMISSION_ADMIN,
+var dashboardPermissionMap = map[string]dashboardaccess.PermissionType{
+	"View":  dashboardaccess.PERMISSION_VIEW,
+	"Edit":  dashboardaccess.PERMISSION_EDIT,
+	"Admin": dashboardaccess.PERMISSION_ADMIN,
 }
 
 func (hs *HTTPServer) getDashboardACL(ctx context.Context, user identity.Requester, dashboard *dashboards.Dashboard) ([]*dashboards.DashboardACLInfoDTO, error) {
@@ -192,10 +194,11 @@ func (hs *HTTPServer) getDashboardACL(ctx context.Context, user identity.Request
 
 		permission := dashboardPermissionMap[hs.dashboardPermissionsService.MapActions(p)]
 
+		metrics.MFolderIDsAPICount.WithLabelValues(metrics.GetDashboardACL).Inc()
 		acl = append(acl, &dashboards.DashboardACLInfoDTO{
 			OrgID:          dashboard.OrgID,
 			DashboardID:    dashboard.ID,
-			FolderID:       dashboard.FolderID,
+			FolderID:       dashboard.FolderID, // nolint:staticcheck
 			Created:        p.Created,
 			Updated:        p.Updated,
 			UserID:         p.UserId,
@@ -313,11 +316,11 @@ func (hs *HTTPServer) updateDashboardAccessControl(ctx context.Context, orgID in
 func validatePermissionsUpdate(apiCmd dtos.UpdateDashboardACLCommand) error {
 	for _, item := range apiCmd.Items {
 		if item.UserID > 0 && item.TeamID > 0 {
-			return dashboards.ErrPermissionsWithUserAndTeamNotAllowed
+			return dashboardaccess.ErrPermissionsWithUserAndTeamNotAllowed
 		}
 
 		if (item.UserID > 0 || item.TeamID > 0) && item.Role != nil {
-			return dashboards.ErrPermissionsWithRoleNotAllowed
+			return dashboardaccess.ErrPermissionsWithRoleNotAllowed
 		}
 	}
 	return nil
diff --git a/pkg/api/dashboard_snapshot.go b/pkg/api/dashboard_snapshot.go
index 2b0c5e5471b52..de672ba51aa07 100644
--- a/pkg/api/dashboard_snapshot.go
+++ b/pkg/api/dashboard_snapshot.go
@@ -1,8 +1,6 @@
 package api
 
 import (
-	"bytes"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"net/http"
@@ -10,21 +8,37 @@ import (
 
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/api/response"
-	"github.com/grafana/grafana/pkg/components/simplejson"
+	dashboardsnapshot "github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1"
+	"github.com/grafana/grafana/pkg/infra/appcontext"
 	"github.com/grafana/grafana/pkg/infra/metrics"
-	"github.com/grafana/grafana/pkg/services/auth/identity"
+	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/dashboardsnapshots"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/guardian"
-	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
+	"github.com/grafana/grafana/pkg/util/errutil/errhttp"
 	"github.com/grafana/grafana/pkg/web"
 )
 
-var client = &http.Client{
-	Timeout:   time.Second * 5,
-	Transport: &http.Transport{Proxy: http.ProxyFromEnvironment},
+// r.Post("/api/snapshots/"
+func (hs *HTTPServer) getCreatedSnapshotHandler() web.Handler {
+	if hs.Features.IsEnabledGlobally(featuremgmt.FlagKubernetesSnapshots) {
+		namespaceMapper := request.GetNamespaceMapper(hs.Cfg)
+		return func(w http.ResponseWriter, r *http.Request) {
+			user, err := appcontext.User(r.Context())
+			if err != nil || user == nil {
+				errhttp.Write(r.Context(), fmt.Errorf("no user"), w)
+				return
+			}
+			r.URL.Path = "/apis/dashboardsnapshot.grafana.app/v0alpha1/namespaces/" +
+				namespaceMapper(user.OrgID) + "/dashboardsnapshots/create"
+			hs.clientConfigProvider.DirectlyServeHTTP(w, r)
+		}
+	}
+	return hs.CreateDashboardSnapshot
 }
 
 // swagger:route GET /snapshot/shared-options snapshots getSharingOptions
@@ -43,58 +57,6 @@ func (hs *HTTPServer) GetSharingOptions(c *contextmodel.ReqContext) {
 	})
 }
 
-type CreateExternalSnapshotResponse struct {
-	Key       string `json:"key"`
-	DeleteKey string `json:"deleteKey"`
-	Url       string `json:"url"`
-	DeleteUrl string `json:"deleteUrl"`
-}
-
-func createExternalDashboardSnapshot(cmd dashboardsnapshots.CreateDashboardSnapshotCommand, externalSnapshotUrl string) (*CreateExternalSnapshotResponse, error) {
-	var createSnapshotResponse CreateExternalSnapshotResponse
-	message := map[string]any{
-		"name":      cmd.Name,
-		"expires":   cmd.Expires,
-		"dashboard": cmd.Dashboard,
-		"key":       cmd.Key,
-		"deleteKey": cmd.DeleteKey,
-	}
-
-	messageBytes, err := simplejson.NewFromAny(message).Encode()
-	if err != nil {
-		return nil, err
-	}
-
-	resp, err := client.Post(externalSnapshotUrl+"/api/snapshots", "application/json", bytes.NewBuffer(messageBytes))
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		if err := resp.Body.Close(); err != nil {
-			plog.Warn("Failed to close response body", "err", err)
-		}
-	}()
-
-	if resp.StatusCode != 200 {
-		return nil, fmt.Errorf("create external snapshot response status code %d", resp.StatusCode)
-	}
-
-	if err := json.NewDecoder(resp.Body).Decode(&createSnapshotResponse); err != nil {
-		return nil, err
-	}
-
-	return &createSnapshotResponse, nil
-}
-
-func createOriginalDashboardURL(cmd *dashboardsnapshots.CreateDashboardSnapshotCommand) (string, error) {
-	dashUID := cmd.Dashboard.Get("uid").MustString("")
-	if ok := util.IsValidShortUID(dashUID); !ok {
-		return "", fmt.Errorf("invalid dashboard UID")
-	}
-
-	return fmt.Sprintf("/d/%v", dashUID), nil
-}
-
 // swagger:route POST /snapshots snapshots createDashboardSnapshot
 //
 // When creating a snapshot using the API, you have to provide the full dashboard payload including the snapshot data. This endpoint is designed for the Grafana UI.
@@ -106,95 +68,28 @@ func createOriginalDashboardURL(cmd *dashboardsnapshots.CreateDashboardSnapshotC
 // 401: unauthorisedError
 // 403: forbiddenError
 // 500: internalServerError
-func (hs *HTTPServer) CreateDashboardSnapshot(c *contextmodel.ReqContext) response.Response {
-	if !hs.Cfg.SnapshotEnabled {
-		c.JsonApiErr(http.StatusForbidden, "Dashboard Snapshots are disabled", nil)
-		return nil
-	}
-
+func (hs *HTTPServer) CreateDashboardSnapshot(c *contextmodel.ReqContext) {
 	cmd := dashboardsnapshots.CreateDashboardSnapshotCommand{}
 	if err := web.Bind(c.Req, &cmd); err != nil {
-		return response.Error(http.StatusBadRequest, "bad request data", err)
-	}
-	if cmd.Name == "" {
-		cmd.Name = "Unnamed snapshot"
+		c.JsonApiErr(http.StatusBadRequest, "bad request data", err)
+		return
 	}
 
-	userID, err := identity.UserIdentifier(c.SignedInUser.GetNamespacedID())
-	if err != nil {
-		return response.Error(http.StatusInternalServerError,
-			"Failed to create external snapshot", err)
-	}
-
-	var snapshotUrl string
-	cmd.ExternalURL = ""
-	cmd.OrgID = c.SignedInUser.GetOrgID()
-	cmd.UserID = userID
-	originalDashboardURL, err := createOriginalDashboardURL(&cmd)
-	if err != nil {
-		return response.Error(http.StatusInternalServerError, "Invalid app URL", err)
-	}
-
-	if cmd.External {
-		if !hs.Cfg.ExternalEnabled {
-			c.JsonApiErr(http.StatusForbidden, "External dashboard creation is disabled", nil)
-			return nil
-		}
-
-		resp, err := createExternalDashboardSnapshot(cmd, hs.Cfg.ExternalSnapshotUrl)
-		if err != nil {
-			c.JsonApiErr(http.StatusInternalServerError, "Failed to create external snapshot", err)
-			return nil
-		}
-
-		snapshotUrl = resp.Url
-		cmd.Key = resp.Key
-		cmd.DeleteKey = resp.DeleteKey
-		cmd.ExternalURL = resp.Url
-		cmd.ExternalDeleteURL = resp.DeleteUrl
-		cmd.Dashboard = simplejson.New()
-
-		metrics.MApiDashboardSnapshotExternal.Inc()
-	} else {
-		cmd.Dashboard.SetPath([]string{"snapshot", "originalUrl"}, originalDashboardURL)
-
-		if cmd.Key == "" {
-			var err error
-			cmd.Key, err = util.GetRandomString(32)
-			if err != nil {
-				c.JsonApiErr(http.StatusInternalServerError, "Could not generate random string", err)
-				return nil
-			}
+	// Do not check permissions when the instance snapshot public mode is enabled
+	if !hs.Cfg.SnapshotPublicMode {
+		evaluator := ac.EvalPermission(dashboards.ActionDashboardsWrite, dashboards.ScopeDashboardsProvider.GetResourceScopeUID(cmd.Dashboard.GetNestedString("uid")))
+		if canSave, err := hs.AccessControl.Evaluate(c.Req.Context(), c.SignedInUser, evaluator); err != nil || !canSave {
+			c.JsonApiErr(http.StatusForbidden, "forbidden", err)
+			return
 		}
-
-		if cmd.DeleteKey == "" {
-			var err error
-			cmd.DeleteKey, err = util.GetRandomString(32)
-			if err != nil {
-				c.JsonApiErr(http.StatusInternalServerError, "Could not generate random string", err)
-				return nil
-			}
-		}
-
-		snapshotUrl = setting.ToAbsUrl("dashboard/snapshot/" + cmd.Key)
-
-		metrics.MApiDashboardSnapshotCreate.Inc()
 	}
 
-	result, err := hs.dashboardsnapshotsService.CreateDashboardSnapshot(c.Req.Context(), &cmd)
-	if err != nil {
-		c.JsonApiErr(http.StatusInternalServerError, "Failed to create snapshot", err)
-		return nil
-	}
-
-	c.JSON(http.StatusOK, util.DynMap{
-		"key":       cmd.Key,
-		"deleteKey": cmd.DeleteKey,
-		"url":       snapshotUrl,
-		"deleteUrl": setting.ToAbsUrl("api/snapshots-delete/" + cmd.DeleteKey),
-		"id":        result.ID,
-	})
-	return nil
+	dashboardsnapshots.CreateDashboardSnapshot(c, dashboardsnapshot.SnapshotSharingOptions{
+		SnapshotsEnabled:     hs.Cfg.SnapshotEnabled,
+		ExternalEnabled:      hs.Cfg.ExternalEnabled,
+		ExternalSnapshotName: hs.Cfg.ExternalSnapshotName,
+		ExternalSnapshotURL:  hs.Cfg.ExternalSnapshotUrl,
+	}, cmd, hs.dashboardsnapshotsService)
 }
 
 // GET /api/snapshots/:key
@@ -229,7 +124,7 @@ func (hs *HTTPServer) GetDashboardSnapshot(c *contextmodel.ReqContext) response.
 
 	// expired snapshots should also be removed from db
 	if snapshot.Expires.Before(time.Now()) {
-		return response.Error(404, "Dashboard snapshot not found", err)
+		return response.Error(http.StatusNotFound, "Dashboard snapshot not found", err)
 	}
 
 	dto := dtos.DashboardFullWithMeta{
@@ -247,38 +142,6 @@ func (hs *HTTPServer) GetDashboardSnapshot(c *contextmodel.ReqContext) response.
 	return response.JSON(http.StatusOK, dto).SetHeader("Cache-Control", "public, max-age=3600")
 }
 
-func deleteExternalDashboardSnapshot(externalUrl string) error {
-	resp, err := client.Get(externalUrl)
-	if err != nil {
-		return err
-	}
-
-	defer func() {
-		if err := resp.Body.Close(); err != nil {
-			plog.Warn("Failed to close response body", "err", err)
-		}
-	}()
-
-	if resp.StatusCode == 200 {
-		return nil
-	}
-
-	// Gracefully ignore "snapshot not found" errors as they could have already
-	// been removed either via the cleanup script or by request.
-	if resp.StatusCode == 500 {
-		var respJson map[string]any
-		if err := json.NewDecoder(resp.Body).Decode(&respJson); err != nil {
-			return err
-		}
-
-		if respJson["message"] == "Failed to get dashboard snapshot" {
-			return nil
-		}
-	}
-
-	return fmt.Errorf("unexpected response when deleting external snapshot, status code: %d", resp.StatusCode)
-}
-
 // swagger:route GET /snapshots-delete/{deleteKey} snapshots deleteDashboardSnapshotByDeleteKey
 //
 // Delete Snapshot by deleteKey.
@@ -299,31 +162,19 @@ func (hs *HTTPServer) DeleteDashboardSnapshotByDeleteKey(c *contextmodel.ReqCont
 
 	key := web.Params(c.Req)[":deleteKey"]
 	if len(key) == 0 {
-		return response.Error(404, "Snapshot not found", nil)
+		return response.Error(http.StatusNotFound, "Snapshot not found", nil)
 	}
 
-	query := &dashboardsnapshots.GetDashboardSnapshotQuery{DeleteKey: key}
-	queryResult, err := hs.dashboardsnapshotsService.GetDashboardSnapshot(c.Req.Context(), query)
+	err := dashboardsnapshots.DeleteWithKey(c.Req.Context(), key, hs.dashboardsnapshotsService)
 	if err != nil {
-		return response.Err(err)
-	}
-
-	if queryResult.External {
-		err := deleteExternalDashboardSnapshot(queryResult.ExternalDeleteURL)
-		if err != nil {
-			return response.Error(500, "Failed to delete external dashboard", err)
+		if errors.Is(err, dashboardsnapshots.ErrBaseNotFound) {
+			return response.Error(http.StatusNotFound, "Snapshot not found", err)
 		}
-	}
-
-	cmd := &dashboardsnapshots.DeleteDashboardSnapshotCommand{DeleteKey: queryResult.DeleteKey}
-
-	if err := hs.dashboardsnapshotsService.DeleteDashboardSnapshot(c.Req.Context(), cmd); err != nil {
-		return response.Error(500, "Failed to delete dashboard snapshot", err)
+		return response.Error(http.StatusInternalServerError, "Failed to delete dashboard snapshot", err)
 	}
 
 	return response.JSON(http.StatusOK, util.DynMap{
 		"message": "Snapshot deleted. It might take an hour before it's cleared from any CDN caches.",
-		"id":      queryResult.ID,
 	})
 }
 
@@ -357,8 +208,12 @@ func (hs *HTTPServer) DeleteDashboardSnapshot(c *contextmodel.ReqContext) respon
 		return response.Error(http.StatusNotFound, "Failed to get dashboard snapshot", nil)
 	}
 
+	if queryResult.OrgID != c.OrgID {
+		return response.Error(http.StatusUnauthorized, "OrgID mismatch", nil)
+	}
+
 	if queryResult.External {
-		err := deleteExternalDashboardSnapshot(queryResult.ExternalDeleteURL)
+		err := dashboardsnapshots.DeleteExternalDashboardSnapshot(queryResult.ExternalDeleteURL)
 		if err != nil {
 			return response.Error(http.StatusInternalServerError, "Failed to delete external dashboard", err)
 		}
@@ -430,7 +285,7 @@ func (hs *HTTPServer) SearchDashboardSnapshots(c *contextmodel.ReqContext) respo
 
 	searchQueryResult, err := hs.dashboardsnapshotsService.SearchDashboardSnapshots(c.Req.Context(), &searchQuery)
 	if err != nil {
-		return response.Error(500, "Search failed", err)
+		return response.Error(http.StatusInternalServerError, "Search failed", err)
 	}
 
 	dto := make([]*dashboardsnapshots.DashboardSnapshotDTO, len(searchQueryResult))
diff --git a/pkg/api/dashboard_snapshot_test.go b/pkg/api/dashboard_snapshot_test.go
index d8023a9e83e31..3fd0553610e9e 100644
--- a/pkg/api/dashboard_snapshot_test.go
+++ b/pkg/api/dashboard_snapshot_test.go
@@ -9,13 +9,14 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/web/webtest"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/db/dbtest"
@@ -148,12 +149,11 @@ func TestDashboardSnapshotAPIEndpoint_singleSnapshot(t *testing.T) {
 				sc.handlerFunc = hs.DeleteDashboardSnapshotByDeleteKey
 				sc.fakeReqWithParams("GET", sc.url, map[string]string{"deleteKey": "12345"}).exec()
 
-				require.Equal(t, 200, sc.resp.Code)
+				require.Equal(t, 200, sc.resp.Code, "BODY: "+sc.resp.Body.String())
 				respJSON, err := simplejson.NewJson(sc.resp.Body.Bytes())
 				require.NoError(t, err)
 
 				assert.True(t, strings.HasPrefix(respJSON.Get("message").MustString(), "Snapshot deleted"))
-				assert.Equal(t, 1, respJSON.Get("id").MustInt())
 
 				assert.Equal(t, http.MethodGet, externalRequest.Method)
 				assert.Equal(t, ts.URL, fmt.Sprintf("http://%s", externalRequest.Host))
@@ -271,7 +271,7 @@ func TestGetDashboardSnapshotNotFound(t *testing.T) {
 			sc.handlerFunc = hs.DeleteDashboardSnapshot
 			sc.fakeReqWithParams("DELETE", sc.url, map[string]string{"key": "12345"}).exec()
 
-			assert.Equal(t, http.StatusNotFound, sc.resp.Code)
+			assert.Equal(t, http.StatusNotFound, sc.resp.Code, "BODY: "+sc.resp.Body.String())
 		}, sqlmock)
 
 	loggedInUserScenarioWithRole(t,
@@ -282,7 +282,7 @@ func TestGetDashboardSnapshotNotFound(t *testing.T) {
 			sc.handlerFunc = hs.DeleteDashboardSnapshotByDeleteKey
 			sc.fakeReqWithParams("DELETE", sc.url, map[string]string{"deleteKey": "12345"}).exec()
 
-			assert.Equal(t, http.StatusNotFound, sc.resp.Code)
+			assert.Equal(t, http.StatusNotFound, sc.resp.Code, "BODY: "+sc.resp.Body.String())
 		}, sqlmock)
 }
 
@@ -345,7 +345,7 @@ func TestGetDashboardSnapshotFailure(t *testing.T) {
 			sc.handlerFunc = hs.DeleteDashboardSnapshot
 			sc.fakeReqWithParams("DELETE", sc.url, map[string]string{"key": "12345"}).exec()
 
-			assert.Equal(t, http.StatusForbidden, sc.resp.Code)
+			assert.Equal(t, http.StatusForbidden, sc.resp.Code, "BODY: "+sc.resp.Body.String())
 		}, sqlmock)
 
 	loggedInUserScenarioWithRole(t,
@@ -356,7 +356,7 @@ func TestGetDashboardSnapshotFailure(t *testing.T) {
 			sc.handlerFunc = hs.DeleteDashboardSnapshotByDeleteKey
 			sc.fakeReqWithParams("DELETE", sc.url, map[string]string{"deleteKey": "12345"}).exec()
 
-			assert.Equal(t, http.StatusInternalServerError, sc.resp.Code)
+			assert.Equal(t, http.StatusInternalServerError, sc.resp.Code, "BODY: "+sc.resp.Body.String())
 		}, sqlmock)
 
 	loggedInUserScenarioWithRole(t,
@@ -367,7 +367,7 @@ func TestGetDashboardSnapshotFailure(t *testing.T) {
 			sc.handlerFunc = hs.DeleteDashboardSnapshotByDeleteKey
 			sc.fakeReqWithParams("DELETE", sc.url, map[string]string{"deleteKey": "12345"}).exec()
 
-			assert.Equal(t, http.StatusForbidden, sc.resp.Code)
+			assert.Equal(t, http.StatusForbidden, sc.resp.Code, "BODY: "+sc.resp.Body.String())
 		}, sqlmock)
 }
 
@@ -391,6 +391,7 @@ func setUpSnapshotTest(t *testing.T, userId int64, deleteUrl string) dashboardsn
 
 	res := &dashboardsnapshots.DashboardSnapshot{
 		ID:        1,
+		OrgID:     1,
 		Key:       "12345",
 		DeleteKey: "54321",
 		Dashboard: jsonModel,
diff --git a/pkg/api/dashboard_test.go b/pkg/api/dashboard_test.go
index 50471218474a0..be403723bb35e 100644
--- a/pkg/api/dashboard_test.go
+++ b/pkg/api/dashboard_test.go
@@ -3,7 +3,6 @@ package api
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"net/http"
 	"os"
@@ -25,12 +24,10 @@ import (
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/infra/usagestats"
-	"github.com/grafana/grafana/pkg/registry/corekind"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
 	accesscontrolmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
-	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/services/annotations/annotationstest"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
@@ -46,6 +43,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/guardian"
 	"github.com/grafana/grafana/pkg/services/libraryelements/model"
 	"github.com/grafana/grafana/pkg/services/librarypanels"
+	"github.com/grafana/grafana/pkg/services/licensing/licensingtest"
 	"github.com/grafana/grafana/pkg/services/live"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
@@ -54,8 +52,10 @@ import (
 	"github.com/grafana/grafana/pkg/services/provisioning"
 	"github.com/grafana/grafana/pkg/services/publicdashboards"
 	"github.com/grafana/grafana/pkg/services/publicdashboards/api"
+	publicdashboardModels "github.com/grafana/grafana/pkg/services/publicdashboards/models"
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
 	"github.com/grafana/grafana/pkg/services/star/startest"
+	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
 	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/user/usertest"
@@ -80,7 +80,6 @@ func TestGetHomeDashboard(t *testing.T) {
 		SQLStore:                dbtest.NewFakeDB(),
 		preferenceService:       prefService,
 		dashboardVersionService: dashboardVersionService,
-		Kinds:                   corekind.NewBase(nil),
 		log:                     log.New("test-logger"),
 	}
 
@@ -121,8 +120,8 @@ func TestGetHomeDashboard(t *testing.T) {
 
 func newTestLive(t *testing.T, store db.DB) *live.GrafanaLive {
 	features := featuremgmt.WithFeatures()
-	cfg := &setting.Cfg{AppURL: "http://localhost:3000/"}
-	cfg.IsFeatureToggleEnabled = features.IsEnabled
+	cfg := setting.NewCfg()
+	cfg.AppURL = "http://localhost:3000/"
 	gLive, err := live.ProvideService(nil, cfg,
 		routing.NewRouteRegister(),
 		nil, nil, nil, nil,
@@ -274,7 +273,10 @@ func TestHTTPServer_DeleteDashboardByUID_AccessControl(t *testing.T) {
 
 			pubDashService := publicdashboards.NewFakePublicDashboardService(t)
 			pubDashService.On("DeleteByDashboard", mock.Anything, mock.Anything).Return(nil).Maybe()
-			hs.PublicDashboardsApi = api.ProvideApi(pubDashService, nil, hs.AccessControl, featuremgmt.WithFeatures())
+			middleware := publicdashboards.NewFakePublicDashboardMiddleware(t)
+			license := licensingtest.NewFakeLicensing()
+			license.On("FeatureEnabled", publicdashboardModels.FeaturePublicDashboardsEmailSharing).Return(false)
+			hs.PublicDashboardsApi = api.ProvideApi(pubDashService, nil, hs.AccessControl, featuremgmt.WithFeatures(), middleware, hs.Cfg, license)
 
 			guardian.InitAccessControlGuardian(hs.Cfg, hs.AccessControl, hs.DashboardService)
 		})
@@ -379,12 +381,12 @@ func TestDashboardAPIEndpoint(t *testing.T) {
 	t.Run("Given two dashboards with the same title in different folders", func(t *testing.T) {
 		dashOne := dashboards.NewDashboard("dash")
 		dashOne.ID = 2
-		dashOne.FolderID = 1
+		dashOne.FolderUID = "folderUID"
 		dashOne.HasACL = false
 
 		dashTwo := dashboards.NewDashboard("dash")
 		dashTwo.ID = 4
-		dashTwo.FolderID = 3
+		dashTwo.FolderUID = "folderUID2"
 		dashTwo.HasACL = false
 	})
 
@@ -393,7 +395,6 @@ func TestDashboardAPIEndpoint(t *testing.T) {
 		defer dashboardStore.AssertExpectations(t)
 		// This tests that a valid request returns correct response
 		t.Run("Given a correct request for creating a dashboard", func(t *testing.T) {
-			const folderID int64 = 3
 			folderUID := "Folder"
 			const dashID int64 = 2
 
@@ -404,7 +405,6 @@ func TestDashboardAPIEndpoint(t *testing.T) {
 					"title": "Dash",
 				}),
 				Overwrite: true,
-				FolderID:  folderID,
 				FolderUID: folderUID,
 				IsFolder:  false,
 				Message:   "msg",
@@ -412,9 +412,9 @@ func TestDashboardAPIEndpoint(t *testing.T) {
 
 			dashboardService := dashboards.NewFakeDashboardService(t)
 			dashboardService.On("SaveDashboard", mock.Anything, mock.AnythingOfType("*dashboards.SaveDashboardDTO"), mock.AnythingOfType("bool")).
-				Return(&dashboards.Dashboard{ID: dashID, UID: "uid", Title: "Dash", Slug: "dash", Version: 2, FolderUID: folderUID, FolderID: folderID}, nil)
+				Return(&dashboards.Dashboard{ID: dashID, UID: "uid", Title: "Dash", Slug: "dash", Version: 2, FolderUID: folderUID}, nil)
 			mockFolderService := &foldertest.FakeService{
-				ExpectedFolder: &folder.Folder{ID: 1, UID: folderUID, Title: "Folder"},
+				ExpectedFolder: &folder.Folder{UID: folderUID, Title: "Folder"},
 			}
 
 			postDashboardScenario(t, "When calling POST on", "/api/dashboards", "/api/dashboards", cmd, dashboardService, mockFolderService, func(sc *scenarioContext) {
@@ -450,7 +450,7 @@ func TestDashboardAPIEndpoint(t *testing.T) {
 				Return(&dashboards.Dashboard{ID: dashID, UID: "uid", Title: "Dash", Slug: "dash", Version: 2}, nil)
 
 			mockFolder := &foldertest.FakeService{
-				ExpectedFolder: &folder.Folder{ID: 1, UID: "folderUID", Title: "Folder"},
+				ExpectedFolder: &folder.Folder{UID: "folderUID", Title: "Folder"},
 			}
 
 			postDashboardScenario(t, "When calling POST on", "/api/dashboards", "/api/dashboards", cmd, dashboardService, mockFolder, func(sc *scenarioContext) {
@@ -465,31 +465,6 @@ func TestDashboardAPIEndpoint(t *testing.T) {
 			})
 		})
 
-		t.Run("Given a request with incorrect folder uid for creating a dashboard with", func(t *testing.T) {
-			cmd := dashboards.SaveDashboardCommand{
-				OrgID:  1,
-				UserID: 5,
-				Dashboard: simplejson.NewFromAny(map[string]any{
-					"title": "Dash",
-				}),
-				Overwrite: true,
-				FolderUID: "folderUID",
-				IsFolder:  false,
-				Message:   "msg",
-			}
-
-			dashboardService := dashboards.NewFakeDashboardService(t)
-
-			mockFolder := &foldertest.FakeService{
-				ExpectedError: errors.New("Error while searching Folder ID"),
-			}
-
-			postDashboardScenario(t, "When calling POST on", "/api/dashboards", "/api/dashboards", cmd, dashboardService, mockFolder, func(sc *scenarioContext) {
-				callPostDashboard(sc)
-				assert.Equal(t, http.StatusInternalServerError, sc.resp.Code)
-			})
-		})
-
 		// This tests that invalid requests returns expected error responses
 		t.Run("Given incorrect requests for creating a dashboard", func(t *testing.T) {
 			testCases := []struct {
@@ -503,7 +478,6 @@ func TestDashboardAPIEndpoint(t *testing.T) {
 				{SaveError: dashboards.ErrDashboardVersionMismatch, ExpectedStatusCode: http.StatusPreconditionFailed},
 				{SaveError: dashboards.ErrDashboardTitleEmpty, ExpectedStatusCode: http.StatusBadRequest},
 				{SaveError: dashboards.ErrDashboardFolderCannotHaveParent, ExpectedStatusCode: http.StatusBadRequest},
-				{SaveError: alerting.ValidationError{Reason: "Mu"}, ExpectedStatusCode: http.StatusUnprocessableEntity},
 				{SaveError: dashboards.ErrDashboardTypeMismatch, ExpectedStatusCode: http.StatusBadRequest},
 				{SaveError: dashboards.ErrDashboardFolderWithSameNameAsDashboard, ExpectedStatusCode: http.StatusBadRequest},
 				{SaveError: dashboards.ErrDashboardWithSameNameAsFolder, ExpectedStatusCode: http.StatusBadRequest},
@@ -535,60 +509,6 @@ func TestDashboardAPIEndpoint(t *testing.T) {
 		})
 	})
 
-	t.Run("Given a dashboard to validate", func(t *testing.T) {
-		sqlmock := dbtest.NewFakeDB()
-
-		t.Run("When an invalid dashboard json is posted", func(t *testing.T) {
-			cmd := dashboards.ValidateDashboardCommand{
-				Dashboard: "{\"hello\": \"world\"}",
-			}
-
-			role := org.RoleAdmin
-			postValidateScenario(t, "When calling POST on", "/api/dashboards/validate", "/api/dashboards/validate", cmd, role, func(sc *scenarioContext) {
-				callPostDashboard(sc)
-
-				result := sc.ToJSON()
-				assert.Equal(t, http.StatusUnprocessableEntity, sc.resp.Code)
-				assert.False(t, result.Get("isValid").MustBool())
-				assert.NotEmpty(t, result.Get("message").MustString())
-			}, sqlmock)
-		})
-
-		t.Run("When a dashboard with a too-low schema version is posted", func(t *testing.T) {
-			cmd := dashboards.ValidateDashboardCommand{
-				Dashboard: "{\"schemaVersion\": 1}",
-			}
-
-			role := org.RoleAdmin
-			postValidateScenario(t, "When calling POST on", "/api/dashboards/validate", "/api/dashboards/validate", cmd, role, func(sc *scenarioContext) {
-				callPostDashboard(sc)
-
-				result := sc.ToJSON()
-				assert.Equal(t, http.StatusPreconditionFailed, sc.resp.Code)
-				assert.False(t, result.Get("isValid").MustBool())
-				assert.Equal(t, "invalid schema version", result.Get("message").MustString())
-			}, sqlmock)
-		})
-
-		t.Run("When a valid dashboard is posted", func(t *testing.T) {
-			devenvDashboard, readErr := os.ReadFile("../../devenv/dev-dashboards/home.json")
-			assert.Empty(t, readErr)
-
-			cmd := dashboards.ValidateDashboardCommand{
-				Dashboard: string(devenvDashboard),
-			}
-
-			role := org.RoleAdmin
-			postValidateScenario(t, "When calling POST on", "/api/dashboards/validate", "/api/dashboards/validate", cmd, role, func(sc *scenarioContext) {
-				callPostDashboard(sc)
-
-				result := sc.ToJSON()
-				assert.Equal(t, http.StatusOK, sc.resp.Code)
-				assert.True(t, result.Get("isValid").MustBool())
-			}, sqlmock)
-		})
-	})
-
 	t.Run("Given two dashboards being compared", func(t *testing.T) {
 		fakeDashboardVersionService := dashvertest.NewDashboardVersionServiceFake()
 		fakeDashboardVersionService.ExpectedDashboardVersions = []*dashver.DashboardVersionDTO{
@@ -643,10 +563,8 @@ func TestDashboardAPIEndpoint(t *testing.T) {
 	})
 
 	t.Run("Given dashboard in folder being restored should restore to folder", func(t *testing.T) {
-		const folderID int64 = 1
 		fakeDash := dashboards.NewDashboard("Child dash")
 		fakeDash.ID = 2
-		fakeDash.FolderID = folderID
 		fakeDash.HasACL = false
 
 		dashboardService := dashboards.NewFakeDashboardService(t)
@@ -761,7 +679,6 @@ func TestDashboardAPIEndpoint(t *testing.T) {
 				AccessControl:                accesscontrolmock.New(),
 				DashboardService:             dashboardService,
 				Features:                     featuremgmt.WithFeatures(),
-				Kinds:                        corekind.NewBase(nil),
 				starService:                  startest.NewStarServiceFake(),
 			}
 			hs.callGetDashboard(sc)
@@ -779,8 +696,6 @@ func TestDashboardAPIEndpoint(t *testing.T) {
 
 func TestDashboardVersionsAPIEndpoint(t *testing.T) {
 	fakeDash := dashboards.NewDashboard("Child dash")
-	fakeDash.ID = 1
-	fakeDash.FolderID = 1
 
 	fakeDashboardVersionService := dashvertest.NewDashboardVersionServiceFake()
 	dashboardService := dashboards.NewFakeDashboardService(t)
@@ -799,7 +714,6 @@ func TestDashboardVersionsAPIEndpoint(t *testing.T) {
 			Features:                featuremgmt.WithFeatures(),
 			DashboardService:        dashboardService,
 			dashboardVersionService: fakeDashboardVersionService,
-			Kinds:                   corekind.NewBase(nil),
 			QuotaService:            quotatest.New(false, nil),
 			userService:             userSvc,
 			CacheService:            localcache.New(5*time.Minute, 10*time.Minute),
@@ -897,11 +811,12 @@ func getDashboardShouldReturn200WithConfig(t *testing.T, sc *scenarioContext, pr
 		provisioningService = provisioning.NewProvisioningServiceMock(context.Background())
 	}
 
+	features := featuremgmt.WithFeatures()
 	var err error
 	if dashboardStore == nil {
 		sql := db.InitTestDB(t)
 		quotaService := quotatest.New(false, nil)
-		dashboardStore, err = database.ProvideDashboardStore(sql, sql.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sql, sql.Cfg), quotaService)
+		dashboardStore, err = database.ProvideDashboardStore(sql, sql.Cfg, features, tagimpl.ProvideService(sql), quotaService)
 		require.NoError(t, err)
 	}
 
@@ -911,22 +826,21 @@ func getDashboardShouldReturn200WithConfig(t *testing.T, sc *scenarioContext, pr
 	ac := accesscontrolmock.New()
 	folderPermissions := accesscontrolmock.NewMockedPermissionsService()
 	dashboardPermissions := accesscontrolmock.NewMockedPermissionsService()
-	features := featuremgmt.WithFeatures()
 
 	folderSvc := folderimpl.ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()),
-		cfg, dashboardStore, folderStore, db.InitTestDB(t), featuremgmt.WithFeatures())
+		cfg, dashboardStore, folderStore, db.InitTestDB(t), features, supportbundlestest.NewFakeBundleService(), nil)
 
 	if dashboardService == nil {
 		dashboardService, err = service.ProvideDashboardServiceImpl(
-			cfg, dashboardStore, folderStore, nil, features, folderPermissions, dashboardPermissions,
-			ac, folderSvc,
+			cfg, dashboardStore, folderStore, features, folderPermissions, dashboardPermissions,
+			ac, folderSvc, nil,
 		)
 		require.NoError(t, err)
 	}
 
 	dashboardProvisioningService, err := service.ProvideDashboardServiceImpl(
-		cfg, dashboardStore, folderStore, nil, features, folderPermissions, dashboardPermissions,
-		ac, folderSvc,
+		cfg, dashboardStore, folderStore, features, folderPermissions, dashboardPermissions,
+		ac, folderSvc, nil,
 	)
 	require.NoError(t, err)
 
@@ -940,7 +854,6 @@ func getDashboardShouldReturn200WithConfig(t *testing.T, sc *scenarioContext, pr
 		dashboardProvisioningService: dashboardProvisioningService,
 		DashboardService:             dashboardService,
 		Features:                     featuremgmt.WithFeatures(),
-		Kinds:                        corekind.NewBase(nil),
 		starService:                  startest.NewStarServiceFake(),
 	}
 
@@ -993,7 +906,6 @@ func postDashboardScenario(t *testing.T, desc string, url string, routePattern s
 			DashboardService:      dashboardService,
 			folderService:         folderService,
 			Features:              featuremgmt.WithFeatures(),
-			Kinds:                 corekind.NewBase(nil),
 			accesscontrolService:  actest.FakeService{},
 			log:                   log.New("test-logger"),
 		}
@@ -1014,42 +926,6 @@ func postDashboardScenario(t *testing.T, desc string, url string, routePattern s
 	})
 }
 
-func postValidateScenario(t *testing.T, desc string, url string, routePattern string, cmd dashboards.ValidateDashboardCommand,
-	role org.RoleType, fn scenarioFunc, sqlmock db.DB) {
-	t.Run(fmt.Sprintf("%s %s", desc, url), func(t *testing.T) {
-		cfg := setting.NewCfg()
-		hs := HTTPServer{
-			Cfg:                   cfg,
-			ProvisioningService:   provisioning.NewProvisioningServiceMock(context.Background()),
-			Live:                  newTestLive(t, db.InitTestDB(t)),
-			QuotaService:          quotatest.New(false, nil),
-			LibraryPanelService:   &mockLibraryPanelService{},
-			LibraryElementService: &mockLibraryElementService{},
-			SQLStore:              sqlmock,
-			Features:              featuremgmt.WithFeatures(),
-			Kinds:                 corekind.NewBase(nil),
-		}
-
-		sc := setupScenarioContext(t, url)
-		sc.defaultHandler = routing.Wrap(func(c *contextmodel.ReqContext) response.Response {
-			c.Req.Body = mockRequestBody(cmd)
-			c.Req.Header.Add("Content-Type", "application/json")
-			sc.context = c
-			sc.context.SignedInUser = &user.SignedInUser{
-				OrgID:  testOrgID,
-				UserID: testUserID,
-			}
-			sc.context.OrgRole = role
-
-			return hs.ValidateDashboard(c)
-		})
-
-		sc.m.Post(routePattern, sc.defaultHandler)
-
-		fn(sc)
-	})
-}
-
 func postDiffScenario(t *testing.T, desc string, url string, routePattern string, cmd dtos.CalculateDiffOptions,
 	role org.RoleType, fn scenarioFunc, sqlmock db.DB, fakeDashboardVersionService *dashvertest.FakeDashboardVersionService) {
 	t.Run(fmt.Sprintf("%s %s", desc, url), func(t *testing.T) {
@@ -1066,7 +942,6 @@ func postDiffScenario(t *testing.T, desc string, url string, routePattern string
 			SQLStore:                sqlmock,
 			dashboardVersionService: fakeDashboardVersionService,
 			Features:                featuremgmt.WithFeatures(),
-			Kinds:                   corekind.NewBase(nil),
 			DashboardService:        dashSvc,
 		}
 
@@ -1109,7 +984,6 @@ func restoreDashboardVersionScenario(t *testing.T, desc string, url string, rout
 			SQLStore:                sqlStore,
 			Features:                featuremgmt.WithFeatures(),
 			dashboardVersionService: fakeDashboardVersionService,
-			Kinds:                   corekind.NewBase(nil),
 			accesscontrolService:    actest.FakeService{},
 			folderService:           folderSvc,
 		}
@@ -1161,7 +1035,7 @@ func (m *mockLibraryPanelService) ConnectLibraryPanelsForDashboard(c context.Con
 	return nil
 }
 
-func (m *mockLibraryPanelService) ImportLibraryPanelsForDashboard(c context.Context, signedInUser identity.Requester, libraryPanels *simplejson.Json, panels []any, folderID int64) error {
+func (m *mockLibraryPanelService) ImportLibraryPanelsForDashboard(c context.Context, signedInUser identity.Requester, libraryPanels *simplejson.Json, panels []any, folderID int64, folderUID string) error {
 	return nil
 }
 
diff --git a/pkg/api/datasource/validation.go b/pkg/api/datasource/validation.go
index b4939352d399e..55628e4e9300b 100644
--- a/pkg/api/datasource/validation.go
+++ b/pkg/api/datasource/validation.go
@@ -69,7 +69,7 @@ func ValidateURL(typeName, urlStr string) (*url.URL, error) {
 	var err error
 	switch strings.ToLower(typeName) {
 	case "mssql":
-		u, err = mssql.ParseURL(urlStr)
+		u, err = mssql.ParseURL(urlStr, logger)
 	default:
 		logger.Debug("Applying default URL parsing for this data source type", "type", typeName, "url", urlStr)
 
diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go
index 8da5961d4c34c..67f2d0dad3a46 100644
--- a/pkg/api/datasources.go
+++ b/pkg/api/datasources.go
@@ -6,10 +6,14 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"regexp"
 	"sort"
 	"strconv"
 	"strings"
 
+	"github.com/prometheus/prometheus/promql/parser"
+	"golang.org/x/exp/slices"
+
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 
 	"github.com/grafana/grafana/pkg/api/datasource"
@@ -17,6 +21,7 @@ import (
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/log"
+	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/datasources"
@@ -46,12 +51,12 @@ func (hs *HTTPServer) GetDataSources(c *contextmodel.ReqContext) response.Respon
 
 	dataSources, err := hs.DataSourcesService.GetDataSources(c.Req.Context(), &query)
 	if err != nil {
-		return response.Error(500, "Failed to query datasources", err)
+		return response.Error(http.StatusInternalServerError, "Failed to query datasources", err)
 	}
 
 	filtered, err := hs.dsGuardian.New(c.SignedInUser.OrgID, c.SignedInUser).FilterDatasourcesByQueryPermissions(dataSources)
 	if err != nil {
-		return response.Error(500, "Failed to query datasources", err)
+		return response.Error(http.StatusInternalServerError, "Failed to query datasources", err)
 	}
 
 	result := make(dtos.DataSourceList, 0)
@@ -120,18 +125,18 @@ func (hs *HTTPServer) GetDataSourceById(c *contextmodel.ReqContext) response.Res
 	dataSource, err := hs.DataSourcesService.GetDataSource(c.Req.Context(), &query)
 	if err != nil {
 		if errors.Is(err, datasources.ErrDataSourceNotFound) {
-			return response.Error(404, "Data source not found", nil)
+			return response.Error(http.StatusNotFound, "Data source not found", nil)
 		}
 		if errors.Is(err, datasources.ErrDataSourceIdentifierNotSet) {
-			return response.Error(400, "Datasource id is missing", nil)
+			return response.Error(http.StatusBadRequest, "Datasource id is missing", nil)
 		}
-		return response.Error(500, "Failed to query datasources", err)
+		return response.Error(http.StatusInternalServerError, "Failed to query datasources", err)
 	}
 
 	dto := hs.convertModelToDtos(c.Req.Context(), dataSource)
 
 	// Add accesscontrol metadata
-	dto.AccessControl = hs.getAccessControlMetadata(c, c.SignedInUser.GetOrgID(), datasources.ScopePrefix, dto.UID)
+	dto.AccessControl = hs.getAccessControlMetadata(c, datasources.ScopePrefix, dto.UID)
 
 	return response.JSON(http.StatusOK, &dto)
 }
@@ -160,19 +165,19 @@ func (hs *HTTPServer) DeleteDataSourceById(c *contextmodel.ReqContext) response.
 	}
 
 	if id <= 0 {
-		return response.Error(400, "Missing valid datasource id", nil)
+		return response.Error(http.StatusBadRequest, "Missing valid datasource id", nil)
 	}
 
 	ds, err := hs.getRawDataSourceById(c.Req.Context(), id, c.SignedInUser.GetOrgID())
 	if err != nil {
 		if errors.Is(err, datasources.ErrDataSourceNotFound) {
-			return response.Error(404, "Data source not found", nil)
+			return response.Error(http.StatusNotFound, "Data source not found", nil)
 		}
-		return response.Error(400, "Failed to delete datasource", nil)
+		return response.Error(http.StatusBadRequest, "Failed to delete datasource", nil)
 	}
 
 	if ds.ReadOnly {
-		return response.Error(403, "Cannot delete read-only data source", nil)
+		return response.Error(http.StatusForbidden, "Cannot delete read-only data source", nil)
 	}
 
 	cmd := &datasources.DeleteDataSourceCommand{ID: id, OrgID: c.SignedInUser.GetOrgID(), Name: ds.Name}
@@ -180,9 +185,9 @@ func (hs *HTTPServer) DeleteDataSourceById(c *contextmodel.ReqContext) response.
 	err = hs.DataSourcesService.DeleteDataSource(c.Req.Context(), cmd)
 	if err != nil {
 		if errors.As(err, &secretsPluginError) {
-			return response.Error(500, "Failed to delete datasource: "+err.Error(), err)
+			return response.Error(http.StatusInternalServerError, "Failed to delete datasource: "+err.Error(), err)
 		}
-		return response.Error(500, "Failed to delete datasource", err)
+		return response.Error(http.StatusInternalServerError, "Failed to delete datasource", err)
 	}
 
 	hs.Live.HandleDatasourceDelete(c.SignedInUser.GetOrgID(), ds.UID)
@@ -217,7 +222,7 @@ func (hs *HTTPServer) GetDataSourceByUID(c *contextmodel.ReqContext) response.Re
 	dto := hs.convertModelToDtos(c.Req.Context(), ds)
 
 	// Add accesscontrol metadata
-	dto.AccessControl = hs.getAccessControlMetadata(c, c.SignedInUser.GetOrgID(), datasources.ScopePrefix, dto.UID)
+	dto.AccessControl = hs.getAccessControlMetadata(c, datasources.ScopePrefix, dto.UID)
 
 	return response.JSON(http.StatusOK, &dto)
 }
@@ -239,19 +244,19 @@ func (hs *HTTPServer) DeleteDataSourceByUID(c *contextmodel.ReqContext) response
 	uid := web.Params(c.Req)[":uid"]
 
 	if uid == "" {
-		return response.Error(400, "Missing datasource uid", nil)
+		return response.Error(http.StatusBadRequest, "Missing datasource uid", nil)
 	}
 
 	ds, err := hs.getRawDataSourceByUID(c.Req.Context(), uid, c.SignedInUser.GetOrgID())
 	if err != nil {
 		if errors.Is(err, datasources.ErrDataSourceNotFound) {
-			return response.Error(404, "Data source not found", nil)
+			return response.Error(http.StatusNotFound, "Data source not found", nil)
 		}
-		return response.Error(400, "Failed to delete datasource", nil)
+		return response.Error(http.StatusBadRequest, "Failed to delete datasource", nil)
 	}
 
 	if ds.ReadOnly {
-		return response.Error(403, "Cannot delete read-only data source", nil)
+		return response.Error(http.StatusForbidden, "Cannot delete read-only data source", nil)
 	}
 
 	cmd := &datasources.DeleteDataSourceCommand{UID: uid, OrgID: c.SignedInUser.GetOrgID(), Name: ds.Name}
@@ -259,9 +264,9 @@ func (hs *HTTPServer) DeleteDataSourceByUID(c *contextmodel.ReqContext) response
 	err = hs.DataSourcesService.DeleteDataSource(c.Req.Context(), cmd)
 	if err != nil {
 		if errors.As(err, &secretsPluginError) {
-			return response.Error(500, "Failed to delete datasource: "+err.Error(), err)
+			return response.Error(http.StatusInternalServerError, "Failed to delete datasource: "+err.Error(), err)
 		}
-		return response.Error(500, "Failed to delete datasource", err)
+		return response.Error(http.StatusInternalServerError, "Failed to delete datasource", err)
 	}
 
 	hs.Live.HandleDatasourceDelete(c.SignedInUser.GetOrgID(), ds.UID)
@@ -289,29 +294,29 @@ func (hs *HTTPServer) DeleteDataSourceByName(c *contextmodel.ReqContext) respons
 	name := web.Params(c.Req)[":name"]
 
 	if name == "" {
-		return response.Error(400, "Missing valid datasource name", nil)
+		return response.Error(http.StatusBadRequest, "Missing valid datasource name", nil)
 	}
 
 	getCmd := &datasources.GetDataSourceQuery{Name: name, OrgID: c.SignedInUser.GetOrgID()}
 	dataSource, err := hs.DataSourcesService.GetDataSource(c.Req.Context(), getCmd)
 	if err != nil {
 		if errors.Is(err, datasources.ErrDataSourceNotFound) {
-			return response.Error(404, "Data source not found", nil)
+			return response.Error(http.StatusNotFound, "Data source not found", nil)
 		}
-		return response.Error(500, "Failed to delete datasource", err)
+		return response.Error(http.StatusInternalServerError, "Failed to delete datasource", err)
 	}
 
 	if dataSource.ReadOnly {
-		return response.Error(403, "Cannot delete read-only data source", nil)
+		return response.Error(http.StatusForbidden, "Cannot delete read-only data source", nil)
 	}
 
 	cmd := &datasources.DeleteDataSourceCommand{Name: name, OrgID: c.SignedInUser.GetOrgID()}
 	err = hs.DataSourcesService.DeleteDataSource(c.Req.Context(), cmd)
 	if err != nil {
 		if errors.As(err, &secretsPluginError) {
-			return response.Error(500, "Failed to delete datasource: "+err.Error(), err)
+			return response.Error(http.StatusInternalServerError, "Failed to delete datasource: "+err.Error(), err)
 		}
-		return response.Error(500, "Failed to delete datasource", err)
+		return response.Error(http.StatusInternalServerError, "Failed to delete datasource", err)
 	}
 
 	hs.Live.HandleDatasourceDelete(c.SignedInUser.GetOrgID(), dataSource.UID)
@@ -334,45 +339,86 @@ func validateURL(cmdType string, url string) response.Response {
 // validateJSONData prevents the user from adding a custom header with name that matches the auth proxy header name.
 // This is done to prevent data source proxy from being used to circumvent auth proxy.
 // For more context take a look at CVE-2022-35957
-func validateJSONData(ctx context.Context, jsonData *simplejson.Json, cfg *setting.Cfg, features *featuremgmt.FeatureManager) error {
-	if jsonData == nil || !cfg.AuthProxyEnabled {
+func validateJSONData(ctx context.Context, jsonData *simplejson.Json, cfg *setting.Cfg, features featuremgmt.FeatureToggles) error {
+	if jsonData == nil {
 		return nil
 	}
 
-	for key, value := range jsonData.MustMap() {
-		if strings.HasPrefix(key, datasources.CustomHeaderName) {
-			header := fmt.Sprint(value)
-			if http.CanonicalHeaderKey(header) == http.CanonicalHeaderKey(cfg.AuthProxyHeaderName) {
-				datasourcesLogger.Error("Forbidden to add a data source header with a name equal to auth proxy header name", "headerName", key)
-				return errors.New("validation error, invalid header name specified")
+	if cfg.AuthProxy.Enabled {
+		for key, value := range jsonData.MustMap() {
+			if strings.HasPrefix(key, datasources.CustomHeaderName) {
+				header := fmt.Sprint(value)
+				if http.CanonicalHeaderKey(header) == http.CanonicalHeaderKey(cfg.AuthProxy.HeaderName) {
+					datasourcesLogger.Error("Forbidden to add a data source header with a name equal to auth proxy header name", "headerName", key)
+					return errors.New("validation error, invalid header name specified")
+				}
 			}
 		}
 	}
 
 	// Prevent adding a data source team header with a name that matches the auth proxy header name
-	if features.IsEnabled(featuremgmt.FlagTeamHttpHeaders) {
-		teamHTTPHeadersJSON, err := datasources.GetTeamHTTPHeaders(jsonData)
+	if features.IsEnabled(ctx, featuremgmt.FlagTeamHttpHeaders) {
+		err := validateTeamHTTPHeaderJSON(jsonData)
 		if err != nil {
-			datasourcesLogger.Error("Unable to marshal TeamHTTPHeaders")
-			return errors.New("validation error, invalid format of TeamHTTPHeaders")
+			return err
 		}
-		// whitelisting X-Prom-Label-Policy
-		for _, headers := range teamHTTPHeadersJSON {
-			for _, header := range headers {
-				// TODO: currently we only allow for X-Prom-Label-Policy header to be used by our proxy
-				for _, name := range []string{"X-Prom-Label-Policy"} {
-					if http.CanonicalHeaderKey(header.Header) != http.CanonicalHeaderKey(name) {
-						datasourcesLogger.Error("Cannot add a data source team header that is different than", "headerName", name)
-						return errors.New("validation error, invalid header name specified")
-					}
-				}
+	}
+
+	return nil
+}
+
+// we only allow for now the following headers to be added to a data source team header
+var validHeaders = []string{"X-Prom-Label-Policy"}
+
+func validateTeamHTTPHeaderJSON(jsonData *simplejson.Json) error {
+	teamHTTPHeadersJSON, err := datasources.GetTeamHTTPHeaders(jsonData)
+	if err != nil {
+		datasourcesLogger.Error("Unable to marshal TeamHTTPHeaders")
+		return errors.New("validation error, invalid format of TeamHTTPHeaders")
+	}
+	if teamHTTPHeadersJSON == nil {
+		return nil
+	}
+	// whitelisting ValidHeaders
+	// each teams headers
+	for _, teamheaders := range teamHTTPHeadersJSON.Headers {
+		for _, header := range teamheaders {
+			if !slices.ContainsFunc(validHeaders, func(v string) bool {
+				return http.CanonicalHeaderKey(v) == http.CanonicalHeaderKey(header.Header)
+			}) {
+				datasourcesLogger.Error("Cannot add a data source team header that is different than", "headerName", header.Header)
+				return errors.New("validation error, invalid header name specified")
+			}
+			if !validateLBACHeader(header.Value) {
+				datasourcesLogger.Error("Cannot add a data source team header value with invalid value", "headerValue", header.Value)
+				return errors.New("validation error, invalid header value syntax")
 			}
 		}
 	}
-
 	return nil
 }
 
+// validateLBACHeader returns true if the header value matches the syntax
+// 1234:{ name!="value",foo!~"bar" }
+func validateLBACHeader(headervalue string) bool {
+	exp := `^\d+:(.+)`
+	pattern, err := regexp.Compile(exp)
+	if err != nil {
+		return false
+	}
+	match := pattern.FindSubmatch([]byte(strings.TrimSpace(headervalue)))
+	if match == nil || len(match) < 2 {
+		return false
+	}
+	_, err = parser.ParseMetricSelector(string(match[1]))
+	return err == nil
+}
+
+func evaluateTeamHTTPHeaderPermissions(hs *HTTPServer, c *contextmodel.ReqContext, scope string) (bool, error) {
+	ev := ac.EvalPermission(datasources.ActionPermissionsWrite, ac.Scope(scope))
+	return hs.AccessControl.Evaluate(c.Req.Context(), c.SignedInUser, ev)
+}
+
 // swagger:route POST /datasources datasources addDataSource
 //
 // Create a data source.
@@ -410,6 +456,7 @@ func (hs *HTTPServer) AddDataSource(c *contextmodel.ReqContext) response.Respons
 			return resp
 		}
 	}
+
 	if err := validateJSONData(c.Req.Context(), cmd.JsonData, hs.Cfg, hs.Features); err != nil {
 		return response.Error(http.StatusBadRequest, "Failed to add datasource", err)
 	}
@@ -478,14 +525,20 @@ func (hs *HTTPServer) UpdateDataSourceByID(c *contextmodel.ReqContext) response.
 	if err := validateJSONData(c.Req.Context(), cmd.JsonData, hs.Cfg, hs.Features); err != nil {
 		return response.Error(http.StatusBadRequest, "Failed to update datasource", err)
 	}
-
 	ds, err := hs.getRawDataSourceById(c.Req.Context(), cmd.ID, cmd.OrgID)
 	if err != nil {
 		if errors.Is(err, datasources.ErrDataSourceNotFound) {
-			return response.Error(404, "Data source not found", nil)
+			return response.Error(http.StatusNotFound, "Data source not found", nil)
 		}
-		return response.Error(500, "Failed to update datasource", err)
+		return response.Error(http.StatusInternalServerError, "Failed to update datasource", err)
 	}
+
+	// check if LBAC rules have been modified
+	hasAccess, errAccess := checkTeamHTTPHeaderPermissions(hs, c, ds, cmd)
+	if !hasAccess {
+		return response.Error(http.StatusForbidden, fmt.Sprintf("You'll need additional permissions to perform this action. Permissions needed: %s", datasources.ActionPermissionsWrite), errAccess)
+	}
+
 	return hs.updateDataSourceByID(c, ds, cmd)
 }
 
@@ -527,12 +580,40 @@ func (hs *HTTPServer) UpdateDataSourceByUID(c *contextmodel.ReqContext) response
 		return response.Error(http.StatusInternalServerError, "Failed to update datasource", err)
 	}
 	cmd.ID = ds.ID
+
+	// check if LBAC rules have been modified
+	hasAccess, errAccess := checkTeamHTTPHeaderPermissions(hs, c, ds, cmd)
+	if !hasAccess {
+		return response.Error(http.StatusForbidden, fmt.Sprintf("You'll need additional permissions to perform this action. Permissions needed: %s", datasources.ActionPermissionsWrite), errAccess)
+	}
+
 	return hs.updateDataSourceByID(c, ds, cmd)
 }
 
+func getEncodedString(jsonData *simplejson.Json, key string) string {
+	if jsonData == nil {
+		return ""
+	}
+	jsonValues, exists := jsonData.CheckGet(key)
+	if !exists {
+		return ""
+	}
+	val, _ := jsonValues.Encode()
+	return string(val)
+}
+
+func checkTeamHTTPHeaderPermissions(hs *HTTPServer, c *contextmodel.ReqContext, ds *datasources.DataSource, cmd datasources.UpdateDataSourceCommand) (bool, error) {
+	currentTeamHTTPHeaders := getEncodedString(ds.JsonData, "teamHttpHeaders")
+	newTeamHTTPHeaders := getEncodedString(cmd.JsonData, "teamHttpHeaders")
+	if (currentTeamHTTPHeaders != "" || newTeamHTTPHeaders != "") && currentTeamHTTPHeaders != newTeamHTTPHeaders {
+		return evaluateTeamHTTPHeaderPermissions(hs, c, datasources.ScopePrefix+ds.UID)
+	}
+	return true, nil
+}
+
 func (hs *HTTPServer) updateDataSourceByID(c *contextmodel.ReqContext, ds *datasources.DataSource, cmd datasources.UpdateDataSourceCommand) response.Response {
 	if ds.ReadOnly {
-		return response.Error(403, "Cannot update read-only data source", nil)
+		return response.Error(http.StatusForbidden, "Cannot update read-only data source", nil)
 	}
 
 	_, err := hs.DataSourcesService.UpdateDataSource(c.Req.Context(), &cmd)
@@ -560,9 +641,9 @@ func (hs *HTTPServer) updateDataSourceByID(c *contextmodel.ReqContext, ds *datas
 	dataSource, err := hs.DataSourcesService.GetDataSource(c.Req.Context(), &query)
 	if err != nil {
 		if errors.Is(err, datasources.ErrDataSourceNotFound) {
-			return response.Error(404, "Data source not found", nil)
+			return response.Error(http.StatusNotFound, "Data source not found", nil)
 		}
-		return response.Error(500, "Failed to query datasource", err)
+		return response.Error(http.StatusInternalServerError, "Failed to query datasource", err)
 	}
 
 	datasourceDTO := hs.convertModelToDtos(c.Req.Context(), dataSource)
@@ -623,9 +704,9 @@ func (hs *HTTPServer) GetDataSourceByName(c *contextmodel.ReqContext) response.R
 	dataSource, err := hs.DataSourcesService.GetDataSource(c.Req.Context(), &query)
 	if err != nil {
 		if errors.Is(err, datasources.ErrDataSourceNotFound) {
-			return response.Error(404, "Data source not found", nil)
+			return response.Error(http.StatusNotFound, "Data source not found", nil)
 		}
-		return response.Error(500, "Failed to query datasources", err)
+		return response.Error(http.StatusInternalServerError, "Failed to query datasources", err)
 	}
 
 	dto := hs.convertModelToDtos(c.Req.Context(), dataSource)
@@ -651,9 +732,9 @@ func (hs *HTTPServer) GetDataSourceIdByName(c *contextmodel.ReqContext) response
 	ds, err := hs.DataSourcesService.GetDataSource(c.Req.Context(), &query)
 	if err != nil {
 		if errors.Is(err, datasources.ErrDataSourceNotFound) {
-			return response.Error(404, "Data source not found", nil)
+			return response.Error(http.StatusNotFound, "Data source not found", nil)
 		}
-		return response.Error(500, "Failed to query datasources", err)
+		return response.Error(http.StatusInternalServerError, "Failed to query datasources", err)
 	}
 
 	dtos := dtos.AnyId{
diff --git a/pkg/api/datasources_test.go b/pkg/api/datasources_test.go
index de0bea99891c4..61481bec706e1 100644
--- a/pkg/api/datasources_test.go
+++ b/pkg/api/datasources_test.go
@@ -3,6 +3,7 @@ package api
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"io"
 	"net/http"
 	"strings"
@@ -146,10 +147,10 @@ func TestAddDataSource_InvalidJSONData(t *testing.T) {
 	sc := setupScenarioContext(t, "/api/datasources")
 
 	hs.Cfg = setting.NewCfg()
-	hs.Cfg.AuthProxyEnabled = true
-	hs.Cfg.AuthProxyHeaderName = "X-AUTH-PROXY-HEADER"
+	hs.Cfg.AuthProxy.Enabled = true
+	hs.Cfg.AuthProxy.HeaderName = "X-AUTH-PROXY-HEADER"
 	jsonData := simplejson.New()
-	jsonData.Set("httpHeaderName1", hs.Cfg.AuthProxyHeaderName)
+	jsonData.Set("httpHeaderName1", hs.Cfg.AuthProxy.HeaderName)
 
 	sc.m.Post(sc.url, routing.Wrap(func(c *contextmodel.ReqContext) response.Response {
 		c.Req.Body = mockRequestBody(datasources.AddDataSourceCommand{
@@ -200,10 +201,10 @@ func TestUpdateDataSource_InvalidJSONData(t *testing.T) {
 	}
 	sc := setupScenarioContext(t, "/api/datasources/1234")
 
-	hs.Cfg.AuthProxyEnabled = true
-	hs.Cfg.AuthProxyHeaderName = "X-AUTH-PROXY-HEADER"
+	hs.Cfg.AuthProxy.Enabled = true
+	hs.Cfg.AuthProxy.HeaderName = "X-AUTH-PROXY-HEADER"
 	jsonData := simplejson.New()
-	jsonData.Set("httpHeaderName1", hs.Cfg.AuthProxyHeaderName)
+	jsonData.Set("httpHeaderName1", hs.Cfg.AuthProxy.HeaderName)
 
 	sc.m.Put(sc.url, routing.Wrap(func(c *contextmodel.ReqContext) response.Response {
 		c.Req.Body = mockRequestBody(datasources.AddDataSourceCommand{
@@ -224,44 +225,101 @@ func TestUpdateDataSource_InvalidJSONData(t *testing.T) {
 
 // Using a team HTTP header whose name matches the name specified for auth proxy header should fail
 func TestUpdateDataSourceTeamHTTPHeaders_InvalidJSONData(t *testing.T) {
-	hs := &HTTPServer{
-		DataSourcesService: &dataSourcesServiceMock{},
-		Cfg:                setting.NewCfg(),
-		Features:           featuremgmt.WithFeatures(featuremgmt.FlagTeamHttpHeaders),
-	}
-	sc := setupScenarioContext(t, "/api/datasources/1234")
-
-	data := datasources.TeamHTTPHeaders{
-		"1234": []datasources.TeamHTTPHeader{
-			// Authorization is used by the auth proxy
-			// As part of
-			// contexthandler.AuthHTTPHeaderListFromContext(ctx)
-			{
-				Header: "Authorization",
-				Value:  "Could be anything",
-			},
+	tenantID := "1234"
+	testcases := []struct {
+		desc string
+		data datasources.TeamHTTPHeaders
+		want int
+	}{
+		{
+			desc: "We should only allow for headers being X-Prom-Label-Policy",
+			data: datasources.TeamHTTPHeaders{
+				Headers: datasources.TeamHeaders{
+					tenantID: []datasources.TeamHTTPHeader{
+						{
+							Header: "Authorization",
+							Value:  "foo!=bar",
+						},
+					},
+				}},
+			want: 400,
+		},
+		{
+			desc: "Allowed header but no team id",
+			data: datasources.TeamHTTPHeaders{
+				Headers: datasources.TeamHeaders{"": []datasources.TeamHTTPHeader{
+					{
+						Header: "X-Prom-Label-Policy",
+						Value:  "foo=bar",
+					},
+				},
+				}},
+			want: 400,
+		},
+		{
+			desc: "Allowed team id and header name with invalid header values ",
+			data: datasources.TeamHTTPHeaders{
+				Headers: datasources.TeamHeaders{tenantID: []datasources.TeamHTTPHeader{
+					{
+						Header: "X-Prom-Label-Policy",
+						Value:  "Bad value",
+					},
+				},
+				}},
+			want: 400,
+		},
+		// Complete valid case, with team id, header name and header value
+		{
+			desc: "Allowed header and header values ",
+			data: datasources.TeamHTTPHeaders{
+				Headers: datasources.TeamHeaders{tenantID: []datasources.TeamHTTPHeader{
+					{
+						Header: "X-Prom-Label-Policy",
+						Value:  `1234:{ name!="value",foo!~"bar" }`,
+					},
+				},
+				}},
+			want: 200,
 		},
 	}
-
-	hs.Cfg.AuthProxyEnabled = true
-	jsonData := simplejson.New()
-	jsonData.Set("teamHttpHeaders", data)
-
-	sc.m.Put(sc.url, routing.Wrap(func(c *contextmodel.ReqContext) response.Response {
-		c.Req.Body = mockRequestBody(datasources.AddDataSourceCommand{
-			Name:     "Test",
-			URL:      "localhost:5432",
-			Access:   "direct",
-			Type:     "test",
-			JsonData: jsonData,
+	for _, tc := range testcases {
+		t.Run(tc.desc, func(t *testing.T) {
+			hs := &HTTPServer{
+				DataSourcesService: &dataSourcesServiceMock{
+					expectedDatasource: &datasources.DataSource{},
+				},
+				Cfg:                  setting.NewCfg(),
+				Features:             featuremgmt.WithFeatures(featuremgmt.FlagTeamHttpHeaders),
+				accesscontrolService: actest.FakeService{},
+				AccessControl: actest.FakeAccessControl{
+					ExpectedEvaluate: true,
+					ExpectedErr:      nil,
+				},
+			}
+			sc := setupScenarioContext(t, fmt.Sprintf("/api/datasources/%s", tenantID))
+			hs.Cfg.AuthProxy.Enabled = true
+
+			jsonData := simplejson.New()
+			jsonData.Set("teamHttpHeaders", tc.data)
+			sc.m.Put(sc.url, routing.Wrap(func(c *contextmodel.ReqContext) response.Response {
+				c.Req.Body = mockRequestBody(datasources.AddDataSourceCommand{
+					Name:     "Test",
+					URL:      "localhost:5432",
+					Access:   "direct",
+					Type:     "test",
+					JsonData: jsonData,
+				})
+				c.SignedInUser = authedUserWithPermissions(1, 1, []ac.Permission{
+					{Action: datasources.ActionPermissionsWrite, Scope: datasources.ScopeAll},
+				})
+				return hs.AddDataSource(c)
+			}))
+
+			sc.fakeReqWithParams("PUT", sc.url, map[string]string{}).exec()
+
+			assert.Equal(t, tc.want, sc.resp.Code)
 		})
-		c.SignedInUser = authedUserWithPermissions(1, 1, []ac.Permission{})
-		return hs.AddDataSource(c)
-	}))
-
-	sc.fakeReqWithParams("PUT", sc.url, map[string]string{}).exec()
-
-	assert.Equal(t, 400, sc.resp.Code)
+	}
 }
 
 // Updating data sources with URLs not specifying protocol should work.
@@ -434,6 +492,35 @@ func TestAPI_datasources_AccessControl(t *testing.T) {
 	}
 }
 
+func TestValidateLBACHeader(t *testing.T) {
+	testcases := []struct {
+		desc            string
+		teamHeaderValue string
+		want            bool
+	}{
+		{
+			desc:            "Should allow valid header",
+			teamHeaderValue: `1234:{ name!="value",foo!~"bar" }`,
+			want:            true,
+		},
+		{
+			desc:            "Should allow valid selector",
+			teamHeaderValue: `1234:{ name!="value",foo!~"bar/baz.foo" }`,
+			want:            true,
+		},
+		{
+			desc:            "Should return false for incorrect header value",
+			teamHeaderValue: `1234:!="value",foo!~"bar" }`,
+			want:            false,
+		},
+	}
+	for _, tc := range testcases {
+		t.Run(tc.desc, func(t *testing.T) {
+			assert.Equal(t, tc.want, validateLBACHeader(tc.teamHeaderValue))
+		})
+	}
+}
+
 type dataSourcesServiceMock struct {
 	datasources.DataSourceService
 
diff --git a/pkg/api/dtos/acl.go b/pkg/api/dtos/acl.go
index d6f4114157a04..f17719a0c62a5 100644
--- a/pkg/api/dtos/acl.go
+++ b/pkg/api/dtos/acl.go
@@ -1,7 +1,7 @@
 package dtos
 
 import (
-	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/org"
 )
 
@@ -21,5 +21,5 @@ type DashboardACLUpdateItem struct {
 	// * `2` - Edit
 	// * `4` - Admin
 	// Enum: 1,2,4
-	Permission dashboards.PermissionType `json:"permission"`
+	Permission dashboardaccess.PermissionType `json:"permission"`
 }
diff --git a/pkg/api/dtos/alerting.go b/pkg/api/dtos/alerting.go
deleted file mode 100644
index 5c0685b1be8bf..0000000000000
--- a/pkg/api/dtos/alerting.go
+++ /dev/null
@@ -1,137 +0,0 @@
-package dtos
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/grafana/grafana/pkg/components/null"
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-)
-
-func formatShort(interval time.Duration) string {
-	var result string
-
-	hours := interval / time.Hour
-	if hours > 0 {
-		result += fmt.Sprintf("%dh", hours)
-	}
-
-	remaining := interval - (hours * time.Hour)
-	mins := remaining / time.Minute
-	if mins > 0 {
-		result += fmt.Sprintf("%dm", mins)
-	}
-
-	remaining -= (mins * time.Minute)
-	seconds := remaining / time.Second
-	if seconds > 0 {
-		result += fmt.Sprintf("%ds", seconds)
-	}
-
-	return result
-}
-
-func NewAlertNotification(notification *models.AlertNotification) *AlertNotification {
-	dto := &AlertNotification{
-		Id:                    notification.ID,
-		Uid:                   notification.UID,
-		Name:                  notification.Name,
-		Type:                  notification.Type,
-		IsDefault:             notification.IsDefault,
-		Created:               notification.Created,
-		Updated:               notification.Updated,
-		Frequency:             formatShort(notification.Frequency),
-		SendReminder:          notification.SendReminder,
-		DisableResolveMessage: notification.DisableResolveMessage,
-		Settings:              notification.Settings,
-		SecureFields:          map[string]bool{},
-	}
-
-	if notification.SecureSettings != nil {
-		for k := range notification.SecureSettings {
-			dto.SecureFields[k] = true
-		}
-	}
-
-	return dto
-}
-
-type AlertNotification struct {
-	Id                    int64            `json:"id"`
-	Uid                   string           `json:"uid"`
-	Name                  string           `json:"name"`
-	Type                  string           `json:"type"`
-	IsDefault             bool             `json:"isDefault"`
-	SendReminder          bool             `json:"sendReminder"`
-	DisableResolveMessage bool             `json:"disableResolveMessage"`
-	Frequency             string           `json:"frequency"`
-	Created               time.Time        `json:"created"`
-	Updated               time.Time        `json:"updated"`
-	Settings              *simplejson.Json `json:"settings"`
-	SecureFields          map[string]bool  `json:"secureFields"`
-}
-
-func NewAlertNotificationLookup(notification *models.AlertNotification) *AlertNotificationLookup {
-	return &AlertNotificationLookup{
-		Id:        notification.ID,
-		Uid:       notification.UID,
-		Name:      notification.Name,
-		Type:      notification.Type,
-		IsDefault: notification.IsDefault,
-	}
-}
-
-type AlertNotificationLookup struct {
-	Id        int64  `json:"id"`
-	Uid       string `json:"uid"`
-	Name      string `json:"name"`
-	Type      string `json:"type"`
-	IsDefault bool   `json:"isDefault"`
-}
-
-type AlertTestCommand struct {
-	Dashboard *simplejson.Json `json:"dashboard" binding:"Required"`
-	PanelId   int64            `json:"panelId" binding:"Required"`
-}
-
-type AlertTestResult struct {
-	Firing         bool                  `json:"firing"`
-	State          models.AlertStateType `json:"state"`
-	ConditionEvals string                `json:"conditionEvals"`
-	TimeMs         string                `json:"timeMs"`
-	Error          string                `json:"error,omitempty"`
-	EvalMatches    []*EvalMatch          `json:"matches,omitempty"`
-	Logs           []*AlertTestResultLog `json:"logs,omitempty"`
-}
-
-type AlertTestResultLog struct {
-	Message string `json:"message"`
-	Data    any    `json:"data"`
-}
-
-type EvalMatch struct {
-	Tags   map[string]string `json:"tags,omitempty"`
-	Metric string            `json:"metric"`
-	Value  null.Float        `json:"value"`
-}
-
-type NotificationTestCommand struct {
-	ID                    int64             `json:"id,omitempty"`
-	Name                  string            `json:"name"`
-	Type                  string            `json:"type"`
-	SendReminder          bool              `json:"sendReminder"`
-	DisableResolveMessage bool              `json:"disableResolveMessage"`
-	Frequency             string            `json:"frequency"`
-	Settings              *simplejson.Json  `json:"settings"`
-	SecureSettings        map[string]string `json:"secureSettings"`
-}
-
-type PauseAlertCommand struct {
-	AlertId int64 `json:"alertId"`
-	Paused  bool  `json:"paused"`
-}
-
-type PauseAllAlertsCommand struct {
-	Paused bool `json:"paused"`
-}
diff --git a/pkg/api/dtos/alerting_test.go b/pkg/api/dtos/alerting_test.go
deleted file mode 100644
index f4c09f202cbb0..0000000000000
--- a/pkg/api/dtos/alerting_test.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package dtos
-
-import (
-	"testing"
-	"time"
-)
-
-func TestFormatShort(t *testing.T) {
-	tcs := []struct {
-		interval time.Duration
-		expected string
-	}{
-		{interval: time.Hour, expected: "1h"},
-		{interval: time.Hour + time.Minute, expected: "1h1m"},
-		{interval: (time.Hour * 10) + time.Minute, expected: "10h1m"},
-		{interval: (time.Hour * 10) + (time.Minute * 10) + time.Second, expected: "10h10m1s"},
-		{interval: time.Minute * 10, expected: "10m"},
-	}
-
-	for _, tc := range tcs {
-		got := formatShort(tc.interval)
-		if got != tc.expected {
-			t.Errorf("expected %s got %s interval: %v", tc.expected, got, tc.interval)
-		}
-
-		parsed, err := time.ParseDuration(tc.expected)
-		if err != nil {
-			t.Fatalf("could not parse expected duration")
-		}
-
-		if parsed != tc.interval {
-			t.Errorf("expects the parsed duration to equal the interval. Got %v expected: %v", parsed, tc.interval)
-		}
-	}
-}
diff --git a/pkg/api/dtos/dashboard.go b/pkg/api/dtos/dashboard.go
index 8e920a20e125a..3cc53476a3a51 100644
--- a/pkg/api/dtos/dashboard.go
+++ b/pkg/api/dtos/dashboard.go
@@ -3,47 +3,39 @@ package dtos
 import (
 	"time"
 
+	dashboardsV0 "github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1"
 	"github.com/grafana/grafana/pkg/components/simplejson"
 )
 
 type DashboardMeta struct {
-	IsStarred              bool                  `json:"isStarred,omitempty"`
-	IsSnapshot             bool                  `json:"isSnapshot,omitempty"`
-	Type                   string                `json:"type,omitempty"`
-	CanSave                bool                  `json:"canSave"`
-	CanEdit                bool                  `json:"canEdit"`
-	CanAdmin               bool                  `json:"canAdmin"`
-	CanStar                bool                  `json:"canStar"`
-	CanDelete              bool                  `json:"canDelete"`
-	Slug                   string                `json:"slug"`
-	Url                    string                `json:"url"`
-	Expires                time.Time             `json:"expires"`
-	Created                time.Time             `json:"created"`
-	Updated                time.Time             `json:"updated"`
-	UpdatedBy              string                `json:"updatedBy"`
-	CreatedBy              string                `json:"createdBy"`
-	Version                int                   `json:"version"`
-	HasACL                 bool                  `json:"hasAcl" xorm:"has_acl"`
-	IsFolder               bool                  `json:"isFolder"`
-	FolderId               int64                 `json:"folderId"`
-	FolderUid              string                `json:"folderUid"`
-	FolderTitle            string                `json:"folderTitle"`
-	FolderUrl              string                `json:"folderUrl"`
-	Provisioned            bool                  `json:"provisioned"`
-	ProvisionedExternalId  string                `json:"provisionedExternalId"`
-	AnnotationsPermissions *AnnotationPermission `json:"annotationsPermissions"`
-	PublicDashboardUID     string                `json:"publicDashboardUid,omitempty"`
-	PublicDashboardEnabled bool                  `json:"publicDashboardEnabled,omitempty"`
-}
-type AnnotationPermission struct {
-	Dashboard    AnnotationActions `json:"dashboard"`
-	Organization AnnotationActions `json:"organization"`
-}
-
-type AnnotationActions struct {
-	CanAdd    bool `json:"canAdd"`
-	CanEdit   bool `json:"canEdit"`
-	CanDelete bool `json:"canDelete"`
+	IsStarred  bool      `json:"isStarred,omitempty"`
+	IsSnapshot bool      `json:"isSnapshot,omitempty"`
+	Type       string    `json:"type,omitempty"`
+	CanSave    bool      `json:"canSave"`
+	CanEdit    bool      `json:"canEdit"`
+	CanAdmin   bool      `json:"canAdmin"`
+	CanStar    bool      `json:"canStar"`
+	CanDelete  bool      `json:"canDelete"`
+	Slug       string    `json:"slug"`
+	Url        string    `json:"url"`
+	Expires    time.Time `json:"expires"`
+	Created    time.Time `json:"created"`
+	Updated    time.Time `json:"updated"`
+	UpdatedBy  string    `json:"updatedBy"`
+	CreatedBy  string    `json:"createdBy"`
+	Version    int       `json:"version"`
+	HasACL     bool      `json:"hasAcl" xorm:"has_acl"`
+	IsFolder   bool      `json:"isFolder"`
+	// Deprecated: use FolderUID instead
+	FolderId               int64                              `json:"folderId"`
+	FolderUid              string                             `json:"folderUid"`
+	FolderTitle            string                             `json:"folderTitle"`
+	FolderUrl              string                             `json:"folderUrl"`
+	Provisioned            bool                               `json:"provisioned"`
+	ProvisionedExternalId  string                             `json:"provisionedExternalId"`
+	AnnotationsPermissions *dashboardsV0.AnnotationPermission `json:"annotationsPermissions"`
+	PublicDashboardUID     string                             `json:"publicDashboardUid,omitempty"`
+	PublicDashboardEnabled bool                               `json:"publicDashboardEnabled,omitempty"`
 }
 
 type DashboardFullWithMeta struct {
@@ -51,11 +43,6 @@ type DashboardFullWithMeta struct {
 	Dashboard *simplejson.Json `json:"dashboard"`
 }
 
-type TrimDashboardFullWithMeta struct {
-	Meta      *simplejson.Json `json:"meta"`
-	Dashboard *simplejson.Json `json:"dashboard"`
-}
-
 type DashboardRedirect struct {
 	RedirectUri string `json:"redirectUri"`
 }
diff --git a/pkg/api/dtos/folder.go b/pkg/api/dtos/folder.go
index 6a8152343e436..5830187ce7870 100644
--- a/pkg/api/dtos/folder.go
+++ b/pkg/api/dtos/folder.go
@@ -7,10 +7,12 @@ import (
 )
 
 type Folder struct {
-	Id            int64                  `json:"id"`
-	Uid           string                 `json:"uid"`
+	// Deprecated: use UID instead
+	ID            int64                  `json:"id" xorm:"pk autoincr 'id'"`
+	UID           string                 `json:"uid" xorm:"uid"`
+	OrgID         int64                  `json:"orgId" xorm:"org_id"`
 	Title         string                 `json:"title"`
-	Url           string                 `json:"url"`
+	URL           string                 `json:"url" xorm:"url"`
 	HasACL        bool                   `json:"hasAcl" xorm:"has_acl"`
 	CanSave       bool                   `json:"canSave"`
 	CanEdit       bool                   `json:"canEdit"`
@@ -29,8 +31,8 @@ type Folder struct {
 }
 
 type FolderSearchHit struct {
-	Id        int64  `json:"id"`
-	Uid       string `json:"uid"`
+	ID        int64  `json:"id" xorm:"pk autoincr 'id'"`
+	UID       string `json:"uid" xorm:"uid"`
 	Title     string `json:"title"`
 	ParentUID string `json:"parentUid,omitempty"`
 }
diff --git a/pkg/api/dtos/frontend_settings.go b/pkg/api/dtos/frontend_settings.go
index 63389fe5c080f..8d384ab02c793 100644
--- a/pkg/api/dtos/frontend_settings.go
+++ b/pkg/api/dtos/frontend_settings.go
@@ -6,24 +6,45 @@ import (
 )
 
 type FrontendSettingsAuthDTO struct {
-	OAuthSkipOrgRoleUpdateSync  bool `json:"OAuthSkipOrgRoleUpdateSync"`
-	SAMLSkipOrgRoleSync         bool `json:"SAMLSkipOrgRoleSync"`
-	LDAPSkipOrgRoleSync         bool `json:"LDAPSkipOrgRoleSync"`
-	GoogleSkipOrgRoleSync       bool `json:"GoogleSkipOrgRoleSync"`
+	AuthProxyEnableLoginToken bool `json:"AuthProxyEnableLoginToken"`
+	// Deprecated: this is no longer used and will be removed in Grafana 11
+	OAuthSkipOrgRoleUpdateSync bool `json:"OAuthSkipOrgRoleUpdateSync"`
+	// Deprecated: this is no longer used and will be removed in Grafana 11
+	SAMLSkipOrgRoleSync bool `json:"SAMLSkipOrgRoleSync"`
+	// Deprecated: this is no longer used and will be removed in Grafana 11
+	LDAPSkipOrgRoleSync bool `json:"LDAPSkipOrgRoleSync"`
+	// Deprecated: this is no longer used and will be removed in Grafana 11
+	GoogleSkipOrgRoleSync bool `json:"GoogleSkipOrgRoleSync"`
+	// Deprecated: this is no longer used and will be removed in Grafana 11
 	GenericOAuthSkipOrgRoleSync bool `json:"GenericOAuthSkipOrgRoleSync"`
-	JWTAuthSkipOrgRoleSync      bool `json:"JWTAuthSkipOrgRoleSync"`
-	GrafanaComSkipOrgRoleSync   bool `json:"GrafanaComSkipOrgRoleSync"`
-	AzureADSkipOrgRoleSync      bool `json:"AzureADSkipOrgRoleSync"`
-	GithubSkipOrgRoleSync       bool `json:"GithubSkipOrgRoleSync"`
-	GitLabSkipOrgRoleSync       bool `json:"GitLabSkipOrgRoleSync"`
-	OktaSkipOrgRoleSync         bool `json:"OktaSkipOrgRoleSync"`
-	AuthProxyEnableLoginToken   bool `json:"AuthProxyEnableLoginToken"`
+	// Deprecated: this is no longer used and will be removed in Grafana 11
+	JWTAuthSkipOrgRoleSync bool `json:"JWTAuthSkipOrgRoleSync"`
+	// Deprecated: this is no longer used and will be removed in Grafana 11
+	GrafanaComSkipOrgRoleSync bool `json:"GrafanaComSkipOrgRoleSync"`
+	// Deprecated: this is no longer used and will be removed in Grafana 11
+	AzureADSkipOrgRoleSync bool `json:"AzureADSkipOrgRoleSync"`
+	// Deprecated: this is no longer used and will be removed in Grafana 11
+	GithubSkipOrgRoleSync bool `json:"GithubSkipOrgRoleSync"`
+	// Deprecated: this is no longer used and will be removed in Grafana 11
+	GitLabSkipOrgRoleSync bool `json:"GitLabSkipOrgRoleSync"`
+	// Deprecated: this is no longer used and will be removed in Grafana 11
+	OktaSkipOrgRoleSync bool `json:"OktaSkipOrgRoleSync"`
+
+	DisableLogin                  bool `json:"disableLogin"`
+	BasicAuthStrongPasswordPolicy bool `json:"basicAuthStrongPasswordPolicy"`
 }
 
 type FrontendSettingsBuildInfoDTO struct {
-	HideVersion   bool   `json:"hideVersion"`
-	Version       string `json:"version"`
+	HideVersion bool `json:"hideVersion"`
+
+	// A semver-ish version string, such as "11.0.0-12345"
+	Version string `json:"version"`
+
+	// A branded version string to show in the UI, such as "Grafana v11.0.0-12345"
+	VersionString string `json:"versionString,omitempty"`
+
 	Commit        string `json:"commit"`
+	CommitShort   string `json:"commitShort"`
 	Buildstamp    int64  `json:"buildstamp"`
 	Edition       string `json:"edition"`
 	LatestVersion string `json:"latestVersion"`
@@ -44,10 +65,11 @@ type FrontendSettingsLicenseInfoDTO struct {
 }
 
 type FrontendSettingsAzureDTO struct {
-	Cloud                   string `json:"cloud"`
-	ManagedIdentityEnabled  bool   `json:"managedIdentityEnabled"`
-	WorkloadIdentityEnabled bool   `json:"workloadIdentityEnabled"`
-	UserIdentityEnabled     bool   `json:"userIdentityEnabled"`
+	Cloud                                  string `json:"cloud"`
+	ManagedIdentityEnabled                 bool   `json:"managedIdentityEnabled"`
+	WorkloadIdentityEnabled                bool   `json:"workloadIdentityEnabled"`
+	UserIdentityEnabled                    bool   `json:"userIdentityEnabled"`
+	UserIdentityFallbackCredentialsEnabled bool   `json:"userIdentityFallbackCredentialsEnabled"`
 }
 
 type FrontendSettingsCachingDTO struct {
@@ -62,6 +84,10 @@ type FrontendSettingsReportingDTO struct {
 	Enabled bool `json:"enabled"`
 }
 
+type FrontendSettingsAnalyticsDTO struct {
+	Enabled bool `json:"enabled"`
+}
+
 type FrontendSettingsUnifiedAlertingDTO struct {
 	MinInterval              string `json:"minInterval"`
 	AlertStateHistoryBackend string `json:"alertStateHistoryBackend,omitempty"`
@@ -123,24 +149,20 @@ type FrontendSettingsSqlConnectionLimitsDTO struct {
 }
 
 type FrontendSettingsDTO struct {
-	DefaultDatasource          string                           `json:"defaultDatasource"`
-	Datasources                map[string]plugins.DataSourceDTO `json:"datasources"`
-	MinRefreshInterval         string                           `json:"minRefreshInterval"`
-	Panels                     map[string]plugins.PanelDTO      `json:"panels"`
-	Apps                       map[string]*plugins.AppDTO       `json:"apps"`
-	AppUrl                     string                           `json:"appUrl"`
-	AppSubUrl                  string                           `json:"appSubUrl"`
-	AllowOrgCreate             bool                             `json:"allowOrgCreate"`
-	AuthProxyEnabled           bool                             `json:"authProxyEnabled"`
-	LdapEnabled                bool                             `json:"ldapEnabled"`
-	JwtHeaderName              string                           `json:"jwtHeaderName"`
-	JwtUrlLogin                bool                             `json:"jwtUrlLogin"`
-	AlertingEnabled            bool                             `json:"alertingEnabled"`
-	AlertingErrorOrTimeout     string                           `json:"alertingErrorOrTimeout"`
-	AlertingNoDataOrNullValues string                           `json:"alertingNoDataOrNullValues"`
-	AlertingMinInterval        int64                            `json:"alertingMinInterval"`
-	LiveEnabled                bool                             `json:"liveEnabled"`
-	AutoAssignOrg              bool                             `json:"autoAssignOrg"`
+	DefaultDatasource  string                           `json:"defaultDatasource"`
+	Datasources        map[string]plugins.DataSourceDTO `json:"datasources"`
+	MinRefreshInterval string                           `json:"minRefreshInterval"`
+	Panels             map[string]plugins.PanelDTO      `json:"panels"`
+	Apps               map[string]*plugins.AppDTO       `json:"apps"`
+	AppUrl             string                           `json:"appUrl"`
+	AppSubUrl          string                           `json:"appSubUrl"`
+	AllowOrgCreate     bool                             `json:"allowOrgCreate"`
+	AuthProxyEnabled   bool                             `json:"authProxyEnabled"`
+	LdapEnabled        bool                             `json:"ldapEnabled"`
+	JwtHeaderName      string                           `json:"jwtHeaderName"`
+	JwtUrlLogin        bool                             `json:"jwtUrlLogin"`
+	LiveEnabled        bool                             `json:"liveEnabled"`
+	AutoAssignOrg      bool                             `json:"autoAssignOrg"`
 
 	VerifyEmailEnabled  bool `json:"verifyEmailEnabled"`
 	SigV4AuthEnabled    bool `json:"sigV4AuthEnabled"`
@@ -188,8 +210,12 @@ type FrontendSettingsDTO struct {
 
 	FeatureToggles                   map[string]bool                `json:"featureToggles"`
 	AnonymousEnabled                 bool                           `json:"anonymousEnabled"`
+	AnonymousDeviceLimit             int64                          `json:"anonymousDeviceLimit"`
 	RendererAvailable                bool                           `json:"rendererAvailable"`
 	RendererVersion                  string                         `json:"rendererVersion"`
+	RendererDefaultImageWidth        int                            `json:"rendererDefaultImageWidth"`
+	RendererDefaultImageHeight       int                            `json:"rendererDefaultImageHeight"`
+	RendererDefaultImageScale        float64                        `json:"rendererDefaultImageScale"`
 	SecretsManagerPluginEnabled      bool                           `json:"secretsManagerPluginEnabled"`
 	Http2Enabled                     bool                           `json:"http2Enabled"`
 	GrafanaJavascriptAgent           setting.GrafanaJavascriptAgent `json:"grafanaJavascriptAgent"`
@@ -209,22 +235,31 @@ type FrontendSettingsDTO struct {
 	Caching                 FrontendSettingsCachingDTO         `json:"caching"`
 	RecordedQueries         FrontendSettingsRecordedQueriesDTO `json:"recordedQueries"`
 	Reporting               FrontendSettingsReportingDTO       `json:"reporting"`
+	Analytics               FrontendSettingsAnalyticsDTO       `json:"analytics"`
 	UnifiedAlertingEnabled  bool                               `json:"unifiedAlertingEnabled"`
 	UnifiedAlerting         FrontendSettingsUnifiedAlertingDTO `json:"unifiedAlerting"`
 	Oauth                   map[string]any                     `json:"oauth"`
 	SamlEnabled             bool                               `json:"samlEnabled"`
 	SamlName                string                             `json:"samlName"`
 	TokenExpirationDayLimit int                                `json:"tokenExpirationDayLimit"`
+	SharedWithMeFolderUID   string                             `json:"sharedWithMeFolderUID"`
+	RootFolderUID           string                             `json:"rootFolderUID"`
 
 	GeomapDefaultBaseLayerConfig *map[string]any `json:"geomapDefaultBaseLayerConfig,omitempty"`
 	GeomapDisableCustomBaseLayer bool            `json:"geomapDisableCustomBaseLayer"`
 
 	PublicDashboardAccessToken string `json:"publicDashboardAccessToken"`
+	PublicDashboardsEnabled    bool   `json:"publicDashboardsEnabled"`
+
+	CloudMigrationIsTarget bool `json:"cloudMigrationIsTarget"`
 
 	DateFormats setting.DateFormats `json:"dateFormats,omitempty"`
 
 	LoginError string `json:"loginError,omitempty"`
 
+	// The K8s namespace to use for this user
+	Namespace string `json:"namespace,omitempty"`
+
 	PluginsCDNBaseURL string `json:"pluginsCDNBaseURL,omitempty"`
 
 	SqlConnectionLimits FrontendSettingsSqlConnectionLimitsDTO `json:"sqlConnectionLimits"`
@@ -232,4 +267,9 @@ type FrontendSettingsDTO struct {
 	// Enterprise
 	Licensing     *FrontendSettingsLicensingDTO     `json:"licensing,omitempty"`
 	Whitelabeling *FrontendSettingsWhitelabelingDTO `json:"whitelabeling,omitempty"`
+
+	LocalFileSystemAvailable bool `json:"localFileSystemAvailable"`
+	// Experimental Scope settings
+	ListScopesEndpoint          string `json:"listScopesEndpoint"`
+	ListDashboardScopesEndpoint string `json:"listDashboardScopesEndpoint"`
 }
diff --git a/pkg/api/dtos/index.go b/pkg/api/dtos/index.go
index b8d769c0904e1..89d5bff68824c 100644
--- a/pkg/api/dtos/index.go
+++ b/pkg/api/dtos/index.go
@@ -26,7 +26,6 @@ type IndexViewData struct {
 	FavIcon                             template.URL
 	AppleTouchIcon                      template.URL
 	AppTitle                            string
-	ContentDeliveryURL                  string
 	LoadingLogo                         template.URL
 	CSPContent                          string
 	CSPEnabled                          bool
@@ -34,4 +33,29 @@ type IndexViewData struct {
 	// Nonce is a cryptographic identifier for use with Content Security Policy.
 	Nonce           string
 	NewsFeedEnabled bool
+	Assets          *EntryPointAssets // Includes CDN info
+}
+
+type EntryPointAssets struct {
+	ContentDeliveryURL string            `json:"cdn,omitempty"`
+	JSFiles            []EntryPointAsset `json:"jsFiles"`
+	Dark               string            `json:"dark"`
+	Light              string            `json:"light"`
+}
+
+type EntryPointAsset struct {
+	FilePath  string `json:"filePath"`
+	Integrity string `json:"integrity"`
+}
+
+func (a *EntryPointAssets) SetContentDeliveryURL(prefix string) {
+	if prefix == "" {
+		return
+	}
+	a.ContentDeliveryURL = prefix
+	a.Dark = prefix + a.Dark
+	a.Light = prefix + a.Light
+	for i, p := range a.JSFiles {
+		a.JSFiles[i].FilePath = prefix + p.FilePath
+	}
 }
diff --git a/pkg/api/dtos/invite.go b/pkg/api/dtos/invite.go
index 9586ba95cbd77..a0fe16472ebc0 100644
--- a/pkg/api/dtos/invite.go
+++ b/pkg/api/dtos/invite.go
@@ -1,6 +1,9 @@
 package dtos
 
-import "github.com/grafana/grafana/pkg/services/org"
+import (
+	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/services/user"
+)
 
 type AddInviteForm struct {
 	LoginOrEmail string       `json:"loginOrEmail" binding:"Required"`
@@ -17,10 +20,10 @@ type InviteInfo struct {
 }
 
 type CompleteInviteForm struct {
-	InviteCode      string `json:"inviteCode"`
-	Email           string `json:"email" binding:"Required"`
-	Name            string `json:"name"`
-	Username        string `json:"username"`
-	Password        string `json:"password"`
-	ConfirmPassword string `json:"confirmPassword"`
+	InviteCode      string        `json:"inviteCode"`
+	Email           string        `json:"email" binding:"Required"`
+	Name            string        `json:"name"`
+	Username        string        `json:"username"`
+	Password        user.Password `json:"password"`
+	ConfirmPassword user.Password `json:"confirmPassword"`
 }
diff --git a/pkg/api/dtos/models.go b/pkg/api/dtos/models.go
index 64e868239a79a..8933f8b49bb79 100644
--- a/pkg/api/dtos/models.go
+++ b/pkg/api/dtos/models.go
@@ -30,6 +30,7 @@ type LoginCommand struct {
 type CurrentUser struct {
 	IsSignedIn                 bool               `json:"isSignedIn"`
 	Id                         int64              `json:"id"`
+	UID                        string             `json:"uid"`
 	Login                      string             `json:"login"`
 	Email                      string             `json:"email"`
 	Name                       string             `json:"name"`
@@ -108,9 +109,9 @@ func (mr *MetricRequest) CloneWithQueries(queries []*simplejson.Json) MetricRequ
 	}
 }
 
-func GetGravatarUrl(text string) string {
-	if setting.DisableGravatar {
-		return setting.AppSubUrl + "/public/img/user_profile.png"
+func GetGravatarUrl(cfg *setting.Cfg, text string) string {
+	if cfg.DisableGravatar {
+		return cfg.AppSubURL + "/public/img/user_profile.png"
 	}
 
 	if text == "" {
@@ -118,7 +119,7 @@ func GetGravatarUrl(text string) string {
 	}
 
 	hash, _ := GetGravatarHash(text)
-	return fmt.Sprintf(setting.AppSubUrl+"/avatar/%x", hash)
+	return fmt.Sprintf(cfg.AppSubURL+"/avatar/%x", hash)
 }
 
 func GetGravatarHash(text string) ([]byte, bool) {
@@ -133,14 +134,14 @@ func GetGravatarHash(text string) ([]byte, bool) {
 	return hasher.Sum(nil), true
 }
 
-func GetGravatarUrlWithDefault(text string, defaultText string) string {
+func GetGravatarUrlWithDefault(cfg *setting.Cfg, text string, defaultText string) string {
 	if text != "" {
-		return GetGravatarUrl(text)
+		return GetGravatarUrl(cfg, text)
 	}
 
 	text = regNonAlphaNumeric.ReplaceAllString(defaultText, "") + "@localhost"
 
-	return GetGravatarUrl(text)
+	return GetGravatarUrl(cfg, text)
 }
 
 func IsHiddenUser(userLogin string, signedInUser identity.Requester, cfg *setting.Cfg) bool {
diff --git a/pkg/api/dtos/plugins.go b/pkg/api/dtos/plugins.go
index 325e3fd40c9f6..7d768e059e4d5 100644
--- a/pkg/api/dtos/plugins.go
+++ b/pkg/api/dtos/plugins.go
@@ -2,6 +2,7 @@ package dtos
 
 import (
 	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/pfs"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 )
 
@@ -47,6 +48,7 @@ type PluginListItem struct {
 	SignatureOrg    string                  `json:"signatureOrg"`
 	AccessControl   accesscontrol.Metadata  `json:"accessControl,omitempty"`
 	AngularDetected bool                    `json:"angularDetected"`
+	IAM             *pfs.IAM                `json:"iam,omitempty"`
 }
 
 type PluginList []PluginListItem
diff --git a/pkg/api/dtos/user.go b/pkg/api/dtos/user.go
index 2cd16df1c0204..35cdb3c78b039 100644
--- a/pkg/api/dtos/user.go
+++ b/pkg/api/dtos/user.go
@@ -1,28 +1,30 @@
 package dtos
 
+import "github.com/grafana/grafana/pkg/services/user"
+
 type SignUpForm struct {
 	Email string `json:"email" binding:"Required"`
 }
 
 type SignUpStep2Form struct {
-	Email    string `json:"email"`
-	Name     string `json:"name"`
-	Username string `json:"username"`
-	Password string `json:"password"`
-	Code     string `json:"code"`
-	OrgName  string `json:"orgName"`
+	Email    string        `json:"email"`
+	Name     string        `json:"name"`
+	Username string        `json:"username"`
+	Password user.Password `json:"password"`
+	Code     string        `json:"code"`
+	OrgName  string        `json:"orgName"`
 }
 
 type AdminCreateUserForm struct {
-	Email    string `json:"email"`
-	Login    string `json:"login"`
-	Name     string `json:"name"`
-	Password string `json:"password" binding:"Required"`
-	OrgId    int64  `json:"orgId"`
+	Email    string        `json:"email"`
+	Login    string        `json:"login"`
+	Name     string        `json:"name"`
+	Password user.Password `json:"password" binding:"Required"`
+	OrgId    int64         `json:"orgId"`
 }
 
 type AdminUpdateUserPasswordForm struct {
-	Password string `json:"password" binding:"Required"`
+	Password user.Password `json:"password" binding:"Required"`
 }
 
 type AdminUpdateUserPermissionsForm struct {
@@ -34,9 +36,9 @@ type SendResetPasswordEmailForm struct {
 }
 
 type ResetUserPasswordForm struct {
-	Code            string `json:"code"`
-	NewPassword     string `json:"newPassword"`
-	ConfirmPassword string `json:"confirmPassword"`
+	Code            string        `json:"code"`
+	NewPassword     user.Password `json:"newPassword"`
+	ConfirmPassword user.Password `json:"confirmPassword"`
 }
 
 type UserLookupDTO struct {
diff --git a/pkg/api/fakes.go b/pkg/api/fakes.go
index 629bf56eb6cd8..28b1a74744314 100644
--- a/pkg/api/fakes.go
+++ b/pkg/api/fakes.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/services/rendering"
 )
 
 type fakePluginInstaller struct {
@@ -29,17 +30,17 @@ func (pm *fakePluginInstaller) Add(_ context.Context, pluginID, version string,
 	return nil
 }
 
-func (pm *fakePluginInstaller) Remove(_ context.Context, pluginID string) error {
+func (pm *fakePluginInstaller) Remove(_ context.Context, pluginID, _ string) error {
 	delete(pm.plugins, pluginID)
 	return nil
 }
 
-type fakeRendererManager struct {
-	plugins.RendererManager
+type fakeRendererPluginManager struct {
+	rendering.PluginManager
 }
 
-func (ps *fakeRendererManager) Renderer(_ context.Context) *plugins.Plugin {
-	return nil
+func (ps *fakeRendererPluginManager) Renderer(_ context.Context) (rendering.Plugin, bool) {
+	return nil, false
 }
 
 type fakePluginStaticRouteResolver struct {
diff --git a/pkg/api/featuremgmt.go b/pkg/api/featuremgmt.go
deleted file mode 100644
index da34568366f72..0000000000000
--- a/pkg/api/featuremgmt.go
+++ /dev/null
@@ -1,160 +0,0 @@
-package api
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"sort"
-	"strconv"
-
-	"github.com/grafana/grafana/pkg/api/response"
-	"github.com/grafana/grafana/pkg/infra/log"
-	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/web"
-)
-
-func (hs *HTTPServer) GetFeatureToggles(ctx *contextmodel.ReqContext) response.Response {
-	cfg := hs.Cfg.FeatureManagement
-	enabledFeatures := hs.Features.GetEnabled(ctx.Req.Context())
-
-	// object being returned
-	dtos := make([]featuremgmt.FeatureToggleDTO, 0)
-
-	// loop through features an add features that should be visible to dtos
-	for _, ft := range hs.Features.GetFlags() {
-		if isFeatureHidden(ft, cfg.HiddenToggles) {
-			continue
-		}
-		dto := featuremgmt.FeatureToggleDTO{
-			Name:        ft.Name,
-			Description: ft.Description,
-			Enabled:     enabledFeatures[ft.Name],
-			ReadOnly:    !isFeatureWriteable(ft, cfg.ReadOnlyToggles) || !isFeatureEditingAllowed(*hs.Cfg),
-		}
-
-		dtos = append(dtos, dto)
-		sort.Slice(dtos, func(i, j int) bool {
-			return dtos[i].Name < dtos[j].Name
-		})
-	}
-
-	return response.JSON(http.StatusOK, dtos)
-}
-
-func (hs *HTTPServer) UpdateFeatureToggle(ctx *contextmodel.ReqContext) response.Response {
-	featureMgmtCfg := hs.Cfg.FeatureManagement
-	if !featureMgmtCfg.AllowEditing {
-		return response.Error(http.StatusForbidden, "feature toggles are read-only", fmt.Errorf("feature toggles are configured to be read-only"))
-	}
-
-	if featureMgmtCfg.UpdateWebhook == "" {
-		return response.Error(http.StatusInternalServerError, "feature toggles service is misconfigured", fmt.Errorf("[feature_management]update_webhook is not set"))
-	}
-
-	cmd := featuremgmt.UpdateFeatureTogglesCommand{}
-	if err := web.Bind(ctx.Req, &cmd); err != nil {
-		return response.Error(http.StatusBadRequest, "bad request data", err)
-	}
-
-	payload := UpdatePayload{
-		FeatureToggles: make(map[string]string, len(cmd.FeatureToggles)),
-		User:           ctx.SignedInUser.Email,
-	}
-
-	for _, t := range cmd.FeatureToggles {
-		// make sure flag exists, and only continue if flag is writeable
-		if f, ok := hs.Features.LookupFlag(t.Name); ok && isFeatureWriteable(f, hs.Cfg.FeatureManagement.ReadOnlyToggles) {
-			hs.log.Info("UpdateFeatureToggle: updating toggle", "toggle_name", t.Name, "enabled", t.Enabled, "username", ctx.SignedInUser.Login)
-			payload.FeatureToggles[t.Name] = strconv.FormatBool(t.Enabled)
-		} else {
-			hs.log.Warn("UpdateFeatureToggle: invalid toggle passed in", "toggle_name", t.Name)
-			return response.Error(http.StatusBadRequest, "invalid toggle passed in", fmt.Errorf("invalid toggle passed in: %s", t.Name))
-		}
-	}
-
-	err := sendWebhookUpdate(featureMgmtCfg, payload, hs.log)
-	if err != nil {
-		hs.log.Error("UpdateFeatureToggle: Failed to perform webhook request", "error", err)
-		return response.Respond(http.StatusBadRequest, "Failed to perform webhook request")
-	}
-
-	hs.Features.SetRestartRequired()
-
-	return response.Respond(http.StatusOK, "feature toggles updated successfully")
-}
-
-func (hs *HTTPServer) GetFeatureMgmtState(ctx *contextmodel.ReqContext) response.Response {
-	fmState := hs.Features.GetState()
-	return response.Respond(http.StatusOK, fmState)
-}
-
-// isFeatureHidden returns whether a toggle should be hidden from the admin page.
-// filters out statuses Unknown, Experimental, and Private Preview
-func isFeatureHidden(flag featuremgmt.FeatureFlag, hideCfg map[string]struct{}) bool {
-	if _, ok := hideCfg[flag.Name]; ok {
-		return true
-	}
-	return flag.Stage == featuremgmt.FeatureStageUnknown || flag.Stage == featuremgmt.FeatureStageExperimental || flag.Stage == featuremgmt.FeatureStagePrivatePreview
-}
-
-// isFeatureWriteable returns whether a toggle on the admin page can be updated by the user.
-// only allows writing of GA and Deprecated toggles, and excludes the feature toggle admin page toggle
-func isFeatureWriteable(flag featuremgmt.FeatureFlag, readOnlyCfg map[string]struct{}) bool {
-	if _, ok := readOnlyCfg[flag.Name]; ok {
-		return false
-	}
-	if flag.Name == featuremgmt.FlagFeatureToggleAdminPage {
-		return false
-	}
-	return flag.Stage == featuremgmt.FeatureStageGeneralAvailability || flag.Stage == featuremgmt.FeatureStageDeprecated
-}
-
-// isFeatureEditingAllowed checks if the backend is properly configured to allow feature toggle changes from the UI
-func isFeatureEditingAllowed(cfg setting.Cfg) bool {
-	return cfg.FeatureManagement.AllowEditing && cfg.FeatureManagement.UpdateWebhook != ""
-}
-
-type UpdatePayload struct {
-	FeatureToggles map[string]string `json:"feature_toggles"`
-	User           string            `json:"user"`
-}
-
-func sendWebhookUpdate(cfg setting.FeatureMgmtSettings, payload UpdatePayload, logger log.Logger) error {
-	data, err := json.Marshal(payload)
-	if err != nil {
-		return err
-	}
-
-	req, err := http.NewRequest(http.MethodPost, cfg.UpdateWebhook, bytes.NewBuffer(data))
-	if err != nil {
-		return err
-	}
-
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("Authorization", "Bearer "+cfg.UpdateWebhookToken)
-
-	client := &http.Client{}
-	resp, err := client.Do(req)
-	if err != nil {
-		return err
-	}
-	defer func() {
-		if err := resp.Body.Close(); err != nil {
-			logger.Warn("Failed to close response body", "err", err)
-		}
-	}()
-
-	if resp.StatusCode >= http.StatusBadRequest {
-		if body, err := io.ReadAll(resp.Body); err != nil {
-			return fmt.Errorf("SendWebhookUpdate failed with status=%d, error: %s", resp.StatusCode, string(body))
-		} else {
-			return fmt.Errorf("SendWebhookUpdate failed with status=%d, error: %w", resp.StatusCode, err)
-		}
-	}
-
-	return nil
-}
diff --git a/pkg/api/featuremgmt_test.go b/pkg/api/featuremgmt_test.go
deleted file mode 100644
index ae3f52fef4560..0000000000000
--- a/pkg/api/featuremgmt_test.go
+++ /dev/null
@@ -1,491 +0,0 @@
-package api
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/services/org/orgtest"
-	"github.com/grafana/grafana/pkg/services/user"
-	"github.com/grafana/grafana/pkg/services/user/usertest"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/web/webtest"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestGetFeatureToggles(t *testing.T) {
-	readPermissions := []accesscontrol.Permission{{Action: accesscontrol.ActionFeatureManagementRead}}
-
-	t.Run("should not be able to get feature toggles without permissions", func(t *testing.T) {
-		result := runGetScenario(t, []*featuremgmt.FeatureFlag{}, setting.FeatureMgmtSettings{}, []accesscontrol.Permission{}, http.StatusForbidden)
-		assert.Len(t, result, 0)
-	})
-
-	t.Run("should be able to get feature toggles with correct permissions", func(t *testing.T) {
-		features := []*featuremgmt.FeatureFlag{
-			{
-				Name:    "toggle1",
-				Enabled: true,
-				Stage:   featuremgmt.FeatureStageGeneralAvailability,
-			}, {
-				Name:    "toggle2",
-				Enabled: false,
-				Stage:   featuremgmt.FeatureStageGeneralAvailability,
-			},
-		}
-
-		result := runGetScenario(t, features, setting.FeatureMgmtSettings{}, readPermissions, http.StatusOK)
-		assert.Len(t, result, 2)
-		t1, _ := findResult(t, result, "toggle1")
-		assert.True(t, t1.Enabled)
-		t2, _ := findResult(t, result, "toggle2")
-		assert.False(t, t2.Enabled)
-	})
-
-	t.Run("toggles hidden by config are not present in the response", func(t *testing.T) {
-		features := []*featuremgmt.FeatureFlag{
-			{
-				Name:    "toggle1",
-				Enabled: true,
-				Stage:   featuremgmt.FeatureStageGeneralAvailability,
-			}, {
-				Name:    "toggle2",
-				Enabled: false,
-				Stage:   featuremgmt.FeatureStageGeneralAvailability,
-			},
-		}
-		settings := setting.FeatureMgmtSettings{
-			HiddenToggles: map[string]struct{}{"toggle1": {}},
-		}
-
-		result := runGetScenario(t, features, settings, readPermissions, http.StatusOK)
-		assert.Len(t, result, 1)
-		assert.Equal(t, "toggle2", result[0].Name)
-	})
-
-	t.Run("toggles that are read-only by config have the readOnly field set", func(t *testing.T) {
-		features := []*featuremgmt.FeatureFlag{
-			{
-				Name:    "toggle1",
-				Enabled: true,
-				Stage:   featuremgmt.FeatureStageGeneralAvailability,
-			}, {
-				Name:    "toggle2",
-				Enabled: false,
-				Stage:   featuremgmt.FeatureStageGeneralAvailability,
-			},
-		}
-		settings := setting.FeatureMgmtSettings{
-			HiddenToggles:   map[string]struct{}{"toggle1": {}},
-			ReadOnlyToggles: map[string]struct{}{"toggle2": {}},
-			AllowEditing:    true,
-			UpdateWebhook:   "bogus",
-		}
-
-		result := runGetScenario(t, features, settings, readPermissions, http.StatusOK)
-		assert.Len(t, result, 1)
-		assert.Equal(t, "toggle2", result[0].Name)
-		assert.True(t, result[0].ReadOnly)
-	})
-
-	t.Run("feature toggle defailts", func(t *testing.T) {
-		features := []*featuremgmt.FeatureFlag{
-			{
-				Name:  "toggle1",
-				Stage: featuremgmt.FeatureStageUnknown,
-			}, {
-				Name:  "toggle2",
-				Stage: featuremgmt.FeatureStageExperimental,
-			}, {
-				Name:  "toggle3",
-				Stage: featuremgmt.FeatureStagePrivatePreview,
-			}, {
-				Name:  "toggle4",
-				Stage: featuremgmt.FeatureStagePublicPreview,
-			}, {
-				Name:  "toggle5",
-				Stage: featuremgmt.FeatureStageGeneralAvailability,
-			}, {
-				Name:  "toggle6",
-				Stage: featuremgmt.FeatureStageDeprecated,
-			},
-		}
-
-		t.Run("unknown, experimental, and private preview toggles are hidden by default", func(t *testing.T) {
-			result := runGetScenario(t, features, setting.FeatureMgmtSettings{}, readPermissions, http.StatusOK)
-			assert.Len(t, result, 3)
-
-			_, ok := findResult(t, result, "toggle1")
-			assert.False(t, ok)
-			_, ok = findResult(t, result, "toggle2")
-			assert.False(t, ok)
-			_, ok = findResult(t, result, "toggle3")
-			assert.False(t, ok)
-		})
-
-		t.Run("only public preview and GA are writeable by default", func(t *testing.T) {
-			settings := setting.FeatureMgmtSettings{
-				AllowEditing:  true,
-				UpdateWebhook: "bogus",
-			}
-			result := runGetScenario(t, features, settings, readPermissions, http.StatusOK)
-			assert.Len(t, result, 3)
-
-			t4, ok := findResult(t, result, "toggle4")
-			assert.True(t, ok)
-			assert.True(t, t4.ReadOnly)
-			t5, ok := findResult(t, result, "toggle5")
-			assert.True(t, ok)
-			assert.False(t, t5.ReadOnly)
-			t6, ok := findResult(t, result, "toggle6")
-			assert.True(t, ok)
-			assert.False(t, t6.ReadOnly)
-		})
-
-		t.Run("all toggles are read-only when server is misconfigured", func(t *testing.T) {
-			settings := setting.FeatureMgmtSettings{
-				AllowEditing:  false,
-				UpdateWebhook: "",
-			}
-			result := runGetScenario(t, features, settings, readPermissions, http.StatusOK)
-			assert.Len(t, result, 3)
-
-			t4, ok := findResult(t, result, "toggle4")
-			assert.True(t, ok)
-			assert.True(t, t4.ReadOnly)
-			t5, ok := findResult(t, result, "toggle5")
-			assert.True(t, ok)
-			assert.True(t, t5.ReadOnly)
-			t6, ok := findResult(t, result, "toggle6")
-			assert.True(t, ok)
-			assert.True(t, t6.ReadOnly)
-		})
-	})
-}
-
-func TestSetFeatureToggles(t *testing.T) {
-	writePermissions := []accesscontrol.Permission{{Action: accesscontrol.ActionFeatureManagementWrite}}
-
-	t.Run("fails without adequate permissions", func(t *testing.T) {
-		res := runSetScenario(t, nil, nil, setting.FeatureMgmtSettings{}, []accesscontrol.Permission{}, http.StatusForbidden)
-		defer func() { require.NoError(t, res.Body.Close()) }()
-	})
-
-	t.Run("fails when toggle editing is not enabled", func(t *testing.T) {
-		res := runSetScenario(t, nil, nil, setting.FeatureMgmtSettings{}, writePermissions, http.StatusForbidden)
-		defer func() { require.NoError(t, res.Body.Close()) }()
-		p := readBody(t, res.Body)
-		assert.Equal(t, "feature toggles are read-only", p["message"])
-	})
-
-	t.Run("fails when update toggle url is not set", func(t *testing.T) {
-		s := setting.FeatureMgmtSettings{
-			AllowEditing: true,
-		}
-		res := runSetScenario(t, nil, nil, s, writePermissions, http.StatusInternalServerError)
-		defer func() { require.NoError(t, res.Body.Close()) }()
-		p := readBody(t, res.Body)
-		assert.Equal(t, "feature toggles service is misconfigured", p["message"])
-	})
-
-	t.Run("fails with non-existent toggle", func(t *testing.T) {
-		features := []*featuremgmt.FeatureFlag{
-			{
-				Name:    "toggle1",
-				Enabled: true,
-				Stage:   featuremgmt.FeatureStageGeneralAvailability,
-			}, {
-				Name:    "toggle2",
-				Enabled: false,
-				Stage:   featuremgmt.FeatureStageGeneralAvailability,
-			},
-		}
-
-		updates := []featuremgmt.FeatureToggleDTO{
-			{
-				Name:    "toggle3",
-				Enabled: true,
-			},
-		}
-
-		s := setting.FeatureMgmtSettings{
-			AllowEditing:  true,
-			UpdateWebhook: "random",
-		}
-		res := runSetScenario(t, features, updates, s, writePermissions, http.StatusBadRequest)
-		defer func() { require.NoError(t, res.Body.Close()) }()
-		p := readBody(t, res.Body)
-		assert.Equal(t, "invalid toggle passed in", p["message"])
-	})
-
-	t.Run("fails with read-only toggles", func(t *testing.T) {
-		features := []*featuremgmt.FeatureFlag{
-			{
-				Name:    featuremgmt.FlagFeatureToggleAdminPage,
-				Enabled: true,
-				Stage:   featuremgmt.FeatureStageGeneralAvailability,
-			}, {
-				Name:    "toggle2",
-				Enabled: false,
-				Stage:   featuremgmt.FeatureStagePublicPreview,
-			}, {
-				Name:    "toggle3",
-				Enabled: false,
-				Stage:   featuremgmt.FeatureStageGeneralAvailability,
-			},
-		}
-
-		s := setting.FeatureMgmtSettings{
-			AllowEditing:  true,
-			UpdateWebhook: "random",
-			ReadOnlyToggles: map[string]struct{}{
-				"toggle3": {},
-			},
-		}
-
-		t.Run("because it is the feature toggle admin page toggle", func(t *testing.T) {
-			updates := []featuremgmt.FeatureToggleDTO{
-				{
-					Name:    featuremgmt.FlagFeatureToggleAdminPage,
-					Enabled: true,
-				},
-			}
-			res := runSetScenario(t, features, updates, s, writePermissions, http.StatusBadRequest)
-			defer func() { require.NoError(t, res.Body.Close()) }()
-			p := readBody(t, res.Body)
-			assert.Equal(t, fmt.Sprintf("invalid toggle passed in: %s", featuremgmt.FlagFeatureToggleAdminPage), p["error"])
-		})
-
-		t.Run("because it is not GA or Deprecated", func(t *testing.T) {
-			updates := []featuremgmt.FeatureToggleDTO{
-				{
-					Name:    "toggle2",
-					Enabled: true,
-				},
-			}
-			res := runSetScenario(t, features, updates, s, writePermissions, http.StatusBadRequest)
-			defer func() { require.NoError(t, res.Body.Close()) }()
-			p := readBody(t, res.Body)
-			assert.Equal(t, "invalid toggle passed in: toggle2", p["error"])
-		})
-
-		t.Run("because it is configured to be read-only", func(t *testing.T) {
-			updates := []featuremgmt.FeatureToggleDTO{
-				{
-					Name:    "toggle3",
-					Enabled: true,
-				},
-			}
-			res := runSetScenario(t, features, updates, s, writePermissions, http.StatusBadRequest)
-			defer func() { require.NoError(t, res.Body.Close()) }()
-			p := readBody(t, res.Body)
-			assert.Equal(t, "invalid toggle passed in: toggle3", p["error"])
-		})
-	})
-
-	t.Run("when all conditions met", func(t *testing.T) {
-		features := []*featuremgmt.FeatureFlag{
-			{
-				Name:    featuremgmt.FlagFeatureToggleAdminPage,
-				Enabled: true,
-				Stage:   featuremgmt.FeatureStageGeneralAvailability,
-			}, {
-				Name:    "toggle2",
-				Enabled: false,
-				Stage:   featuremgmt.FeatureStagePublicPreview,
-			}, {
-				Name:    "toggle3",
-				Enabled: false,
-				Stage:   featuremgmt.FeatureStageGeneralAvailability,
-			}, {
-				Name:    "toggle4",
-				Enabled: false,
-				Stage:   featuremgmt.FeatureStageGeneralAvailability,
-			}, {
-				Name:    "toggle5",
-				Enabled: false,
-				Stage:   featuremgmt.FeatureStageDeprecated,
-			},
-		}
-
-		s := setting.FeatureMgmtSettings{
-			AllowEditing:       true,
-			UpdateWebhook:      "random",
-			UpdateWebhookToken: "token",
-			ReadOnlyToggles: map[string]struct{}{
-				"toggle3": {},
-			},
-		}
-
-		updates := []featuremgmt.FeatureToggleDTO{
-			{
-				Name:    "toggle4",
-				Enabled: true,
-			}, {
-				Name:    "toggle5",
-				Enabled: false,
-			},
-		}
-		t.Run("fail when webhook request is not successful", func(t *testing.T) {
-			webhookServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				w.WriteHeader(http.StatusBadRequest)
-			}))
-			defer webhookServer.Close()
-			s.UpdateWebhook = webhookServer.URL
-			res := runSetScenario(t, features, updates, s, writePermissions, http.StatusBadRequest)
-			defer func() { require.NoError(t, res.Body.Close()) }()
-			assert.Equal(t, http.StatusBadRequest, res.StatusCode)
-		})
-
-		t.Run("succeed when webhook request is successul", func(t *testing.T) {
-			webhookServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				assert.Equal(t, "Bearer "+s.UpdateWebhookToken, r.Header.Get("Authorization"))
-
-				var req UpdatePayload
-				require.NoError(t, json.NewDecoder(r.Body).Decode(&req))
-
-				assert.Equal(t, "true", req.FeatureToggles["toggle4"])
-				assert.Equal(t, "false", req.FeatureToggles["toggle5"])
-				w.WriteHeader(http.StatusOK)
-			}))
-			defer webhookServer.Close()
-			s.UpdateWebhook = webhookServer.URL
-			res := runSetScenario(t, features, updates, s, writePermissions, http.StatusOK)
-			defer func() { require.NoError(t, res.Body.Close()) }()
-			assert.Equal(t, http.StatusOK, res.StatusCode)
-		})
-	})
-}
-
-func findResult(t *testing.T, result []featuremgmt.FeatureToggleDTO, name string) (featuremgmt.FeatureToggleDTO, bool) {
-	t.Helper()
-
-	for _, t := range result {
-		if t.Name == name {
-			return t, true
-		}
-	}
-	return featuremgmt.FeatureToggleDTO{}, false
-}
-
-func readBody(t *testing.T, rc io.ReadCloser) map[string]any {
-	t.Helper()
-
-	b, err := io.ReadAll(rc)
-	require.NoError(t, err)
-	payload := map[string]any{}
-	require.NoError(t, json.Unmarshal(b, &payload))
-	return payload
-}
-
-func runGetScenario(
-	t *testing.T,
-	features []*featuremgmt.FeatureFlag,
-	settings setting.FeatureMgmtSettings,
-	permissions []accesscontrol.Permission,
-	expectedCode int,
-) []featuremgmt.FeatureToggleDTO {
-	// Set up server and send request
-	cfg := setting.NewCfg()
-	cfg.FeatureManagement = settings
-
-	server := SetupAPITestServer(t, func(hs *HTTPServer) {
-		hs.Cfg = cfg
-		hs.Features = featuremgmt.WithFeatureFlags(append([]*featuremgmt.FeatureFlag{{
-			Name:    featuremgmt.FlagFeatureToggleAdminPage,
-			Enabled: true,
-			Stage:   featuremgmt.FeatureStageGeneralAvailability,
-		}}, features...))
-		hs.orgService = orgtest.NewOrgServiceFake()
-		hs.userService = &usertest.FakeUserService{
-			ExpectedUser: &user.User{ID: 1},
-		}
-		hs.log = log.New("test")
-	})
-	req := webtest.RequestWithSignedInUser(server.NewGetRequest("/api/featuremgmt"), userWithPermissions(1, permissions))
-	res, err := server.SendJSON(req)
-	defer func() { require.NoError(t, res.Body.Close()) }()
-
-	// Do some general checks for every request
-	require.NoError(t, err)
-	require.Equal(t, expectedCode, res.StatusCode)
-	if res.StatusCode >= 400 {
-		return nil
-	}
-
-	var result []featuremgmt.FeatureToggleDTO
-	err = json.NewDecoder(res.Body).Decode(&result)
-	require.NoError(t, err)
-
-	for i := 0; i < len(result); {
-		ft := result[i]
-		// Always make sure admin page toggle is read-only, then remove it to make assertions easier
-		if ft.Name == featuremgmt.FlagFeatureToggleAdminPage {
-			assert.True(t, ft.ReadOnly)
-			result = append(result[:i], result[i+1:]...)
-			continue
-		}
-
-		// Make sure toggles explicitly marked "hidden" by config are hidden
-		if _, ok := cfg.FeatureManagement.HiddenToggles[ft.Name]; ok {
-			t.Fail()
-		}
-
-		// Make sure toggles explicitly marked "read only" by config are read only
-		if _, ok := cfg.FeatureManagement.ReadOnlyToggles[ft.Name]; ok {
-			assert.True(t, ft.ReadOnly)
-		}
-		i++
-	}
-
-	return result
-}
-
-func runSetScenario(
-	t *testing.T,
-	serverFeatures []*featuremgmt.FeatureFlag,
-	updateFeatures []featuremgmt.FeatureToggleDTO,
-	settings setting.FeatureMgmtSettings,
-	permissions []accesscontrol.Permission,
-	expectedCode int,
-) *http.Response {
-	// Set up server and send request
-	cfg := setting.NewCfg()
-	cfg.FeatureManagement = settings
-
-	server := SetupAPITestServer(t, func(hs *HTTPServer) {
-		hs.Cfg = cfg
-		hs.Features = featuremgmt.WithFeatureFlags(append([]*featuremgmt.FeatureFlag{{
-			Name:    featuremgmt.FlagFeatureToggleAdminPage,
-			Enabled: true,
-			Stage:   featuremgmt.FeatureStageGeneralAvailability,
-		}}, serverFeatures...))
-		hs.orgService = orgtest.NewOrgServiceFake()
-		hs.userService = &usertest.FakeUserService{
-			ExpectedUser: &user.User{ID: 1},
-		}
-		hs.log = log.New("test")
-	})
-
-	cmd := featuremgmt.UpdateFeatureTogglesCommand{
-		FeatureToggles: updateFeatures,
-	}
-	b, err := json.Marshal(cmd)
-	require.NoError(t, err)
-	req := webtest.RequestWithSignedInUser(server.NewPostRequest("/api/featuremgmt", bytes.NewReader(b)), userWithPermissions(1, permissions))
-	res, err := server.SendJSON(req)
-
-	require.NoError(t, err)
-	require.NotNil(t, res)
-	require.Equal(t, expectedCode, res.StatusCode)
-
-	return res
-}
diff --git a/pkg/api/folder.go b/pkg/api/folder.go
index 4e93eeb066dc2..899f976a6a5f2 100644
--- a/pkg/api/folder.go
+++ b/pkg/api/folder.go
@@ -9,10 +9,12 @@ import (
 	"github.com/grafana/grafana/pkg/api/apierrors"
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/api/response"
+	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/guardian"
@@ -29,7 +31,7 @@ const REDACTED = "redacted"
 //
 // Get all folders.
 //
-// Returns all folders that the authenticated user has permission to view.
+// It returns all folders that the authenticated user has permission to view.
 // If nested folders are enabled, it expects an additional query parameter with the parent folder UID
 // and returns the immediate subfolders that the authenticated user has permission to view.
 // If the parameter is not supplied then it returns immediate subfolders under the root
@@ -41,35 +43,46 @@ const REDACTED = "redacted"
 // 403: forbiddenError
 // 500: internalServerError
 func (hs *HTTPServer) GetFolders(c *contextmodel.ReqContext) response.Response {
-	var folders []*folder.Folder
-	var err error
-	if hs.Features.IsEnabled(featuremgmt.FlagNestedFolders) {
-		folders, err = hs.folderService.GetChildren(c.Req.Context(), &folder.GetChildrenQuery{
+	permission := dashboardaccess.PERMISSION_VIEW
+	if c.Query("permission") == "Edit" {
+		permission = dashboardaccess.PERMISSION_EDIT
+	}
+
+	if hs.Features.IsEnabled(c.Req.Context(), featuremgmt.FlagNestedFolders) {
+		q := &folder.GetChildrenQuery{
 			OrgID:        c.SignedInUser.GetOrgID(),
 			Limit:        c.QueryInt64("limit"),
 			Page:         c.QueryInt64("page"),
 			UID:          c.Query("parentUid"),
+			Permission:   permission,
 			SignedInUser: c.SignedInUser,
-		})
-	} else {
-		folders, err = hs.searchFolders(c)
+		}
+
+		folders, err := hs.folderService.GetChildren(c.Req.Context(), q)
+		if err != nil {
+			return apierrors.ToFolderErrorResponse(err)
+		}
+
+		hits := make([]dtos.FolderSearchHit, 0)
+		for _, f := range folders {
+			hits = append(hits, dtos.FolderSearchHit{
+				ID:        f.ID, // nolint:staticcheck
+				UID:       f.UID,
+				Title:     f.Title,
+				ParentUID: f.ParentUID,
+			})
+			metrics.MFolderIDsAPICount.WithLabelValues(metrics.GetFolders).Inc()
+		}
+
+		return response.JSON(http.StatusOK, hits)
 	}
 
+	hits, err := hs.searchFolders(c, permission)
 	if err != nil {
 		return apierrors.ToFolderErrorResponse(err)
 	}
 
-	result := make([]dtos.FolderSearchHit, 0)
-	for _, f := range folders {
-		result = append(result, dtos.FolderSearchHit{
-			Id:        f.ID,
-			Uid:       f.UID,
-			Title:     f.Title,
-			ParentUID: f.ParentUID,
-		})
-	}
-
-	return response.JSON(http.StatusOK, result)
+	return response.JSON(http.StatusOK, hits)
 }
 
 // swagger:route GET /folders/{folder_uid} folders getFolderByUID
@@ -117,6 +130,8 @@ func (hs *HTTPServer) GetFolderByID(c *contextmodel.ReqContext) response.Respons
 	if err != nil {
 		return response.Error(http.StatusBadRequest, "id is invalid", err)
 	}
+	metrics.MFolderIDsAPICount.WithLabelValues(metrics.GetFolderByID).Inc()
+	// nolint:staticcheck
 	folder, err := hs.folderService.Get(c.Req.Context(), &folder.GetFolderQuery{ID: &id, OrgID: c.SignedInUser.GetOrgID(), SignedInUser: c.SignedInUser})
 	if err != nil {
 		return apierrors.ToFolderErrorResponse(err)
@@ -185,15 +200,15 @@ func (hs *HTTPServer) setDefaultFolderPermissions(ctx context.Context, orgID int
 		}
 
 		permissions = append(permissions, accesscontrol.SetResourcePermissionCommand{
-			UserID: userID, Permission: dashboards.PERMISSION_ADMIN.String(),
+			UserID: userID, Permission: dashboardaccess.PERMISSION_ADMIN.String(),
 		})
 	}
 
 	isNested := folder.ParentUID != ""
-	if !isNested || !hs.Features.IsEnabled(featuremgmt.FlagNestedFolders) {
+	if !isNested || !hs.Features.IsEnabled(ctx, featuremgmt.FlagNestedFolders) {
 		permissions = append(permissions, []accesscontrol.SetResourcePermissionCommand{
-			{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
-			{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_VIEW.String()},
+			{BuiltinRole: string(org.RoleEditor), Permission: dashboardaccess.PERMISSION_EDIT.String()},
+			{BuiltinRole: string(org.RoleViewer), Permission: dashboardaccess.PERMISSION_VIEW.String()},
 		}...)
 	}
 
@@ -212,7 +227,7 @@ func (hs *HTTPServer) setDefaultFolderPermissions(ctx context.Context, orgID int
 // 404: notFoundError
 // 500: internalServerError
 func (hs *HTTPServer) MoveFolder(c *contextmodel.ReqContext) response.Response {
-	if hs.Features.IsEnabled(featuremgmt.FlagNestedFolders) {
+	if hs.Features.IsEnabled(c.Req.Context(), featuremgmt.FlagNestedFolders) {
 		cmd := folder.MoveFolderCommand{}
 		if err := web.Bind(c.Req, &cmd); err != nil {
 			return response.Error(http.StatusBadRequest, "bad request data", err)
@@ -289,7 +304,7 @@ func (hs *HTTPServer) DeleteFolder(c *contextmodel.ReqContext) response.Response
 	err := hs.LibraryElementService.DeleteLibraryElementsInFolder(c.Req.Context(), c.SignedInUser, web.Params(c.Req)[":uid"])
 	if err != nil {
 		if errors.Is(err, model.ErrFolderHasConnectedLibraryElements) {
-			return response.Error(403, "Folder could not be deleted because it contains library elements in use", err)
+			return response.Error(http.StatusForbidden, "Folder could not be deleted because it contains library elements in use", err)
 		}
 		return apierrors.ToFolderErrorResponse(err)
 	}
@@ -358,17 +373,17 @@ func (hs *HTTPServer) newToFolderDto(c *contextmodel.ReqContext, f *folder.Folde
 			canView, _ := g.CanView()
 			if !canView {
 				return dtos.Folder{
-					Uid:   REDACTED,
+					UID:   REDACTED,
 					Title: REDACTED,
 				}, nil
 			}
 		}
-
+		metrics.MFolderIDsAPICount.WithLabelValues(metrics.NewToFolderDTO).Inc()
 		return dtos.Folder{
-			Id:            f.ID,
-			Uid:           f.UID,
+			ID:            f.ID, // nolint:staticcheck
+			UID:           f.UID,
 			Title:         f.Title,
-			Url:           f.URL,
+			URL:           f.URL,
 			HasACL:        f.HasACL,
 			CanSave:       canSave,
 			CanEdit:       canEdit,
@@ -390,7 +405,7 @@ func (hs *HTTPServer) newToFolderDto(c *contextmodel.ReqContext, f *folder.Folde
 		return dtos.Folder{}, err
 	}
 
-	if !hs.Features.IsEnabled(featuremgmt.FlagNestedFolders) {
+	if !hs.Features.IsEnabled(c.Req.Context(), featuremgmt.FlagNestedFolders) {
 		return folderDTO, nil
 	}
 
@@ -429,8 +444,7 @@ func (hs *HTTPServer) getFolderACMetadata(c *contextmodel.ReqContext, f *folder.
 	}
 
 	allMetadata := hs.getMultiAccessControlMetadata(c, dashboards.ScopeFoldersPrefix, folderIDs)
-	metadata := allMetadata[f.UID]
-
+	metadata := map[string]bool{}
 	// Flatten metadata - if any parent has a permission, the child folder inherits it
 	for _, md := range allMetadata {
 		for action := range md {
@@ -440,15 +454,15 @@ func (hs *HTTPServer) getFolderACMetadata(c *contextmodel.ReqContext, f *folder.
 	return metadata, nil
 }
 
-func (hs *HTTPServer) searchFolders(c *contextmodel.ReqContext) ([]*folder.Folder, error) {
+func (hs *HTTPServer) searchFolders(c *contextmodel.ReqContext, permission dashboardaccess.PermissionType) ([]dtos.FolderSearchHit, error) {
 	searchQuery := search.Query{
 		SignedInUser: c.SignedInUser,
 		DashboardIds: make([]int64, 0),
-		FolderIds:    make([]int64, 0),
+		FolderIds:    make([]int64, 0), // nolint:staticcheck
 		Limit:        c.QueryInt64("limit"),
 		OrgId:        c.SignedInUser.GetOrgID(),
 		Type:         "dash-folder",
-		Permission:   dashboards.PERMISSION_VIEW,
+		Permission:   permission,
 		Page:         c.QueryInt64("page"),
 	}
 
@@ -457,17 +471,17 @@ func (hs *HTTPServer) searchFolders(c *contextmodel.ReqContext) ([]*folder.Folde
 		return nil, err
 	}
 
-	folders := make([]*folder.Folder, 0)
-
+	folderHits := make([]dtos.FolderSearchHit, 0)
 	for _, hit := range hits {
-		folders = append(folders, &folder.Folder{
-			ID:    hit.ID,
+		folderHits = append(folderHits, dtos.FolderSearchHit{
+			ID:    hit.ID, // nolint:staticcheck
 			UID:   hit.UID,
 			Title: hit.Title,
 		})
+		metrics.MFolderIDsAPICount.WithLabelValues(metrics.SearchFolders).Inc()
 	}
 
-	return folders, nil
+	return folderHits, nil
 }
 
 // swagger:parameters getFolders
@@ -486,6 +500,12 @@ type GetFoldersParams struct {
 	// in:query
 	// required:false
 	ParentUID string `json:"parentUid"`
+	// Set to `Edit` to return folders that the user can edit
+	// in:query
+	// required: false
+	// default:View
+	// Enum: Edit,View
+	Permission string `json:"permission"`
 }
 
 // swagger:parameters getFolderByUID
@@ -513,6 +533,8 @@ type UpdateFolderParams struct {
 type GetFolderByIDParams struct {
 	// in:path
 	// required:true
+	//
+	// Deprecated: use FolderUID instead
 	FolderID int64 `json:"folder_id"`
 }
 
diff --git a/pkg/api/folder_bench_test.go b/pkg/api/folder_bench_test.go
index 9a52eec53e42a..8e753d86d0f4c 100644
--- a/pkg/api/folder_bench_test.go
+++ b/pkg/api/folder_bench_test.go
@@ -10,6 +10,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/api/routing"
 	"github.com/grafana/grafana/pkg/bus"
@@ -24,6 +27,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/contexthandler/ctxkey"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/dashboards/database"
 	dashboardservice "github.com/grafana/grafana/pkg/services/dashboards/service"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
@@ -37,6 +41,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/star"
 	"github.com/grafana/grafana/pkg/services/star/startest"
 	"github.com/grafana/grafana/pkg/services/supportbundles/bundleregistry"
+	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
 	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
 	"github.com/grafana/grafana/pkg/services/team"
 	"github.com/grafana/grafana/pkg/services/team/teamimpl"
@@ -45,8 +50,6 @@ import (
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/web"
 	"github.com/grafana/grafana/pkg/web/webtest"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 const (
@@ -93,52 +96,82 @@ func BenchmarkFolderListAndSearch(b *testing.B) {
 		desc        string
 		url         string
 		expectedLen int
-		features    *featuremgmt.FeatureManager
+		features    featuremgmt.FeatureToggles
 	}{
 		{
-			desc:        "get root folders with nested folders feature enabled",
+			desc:        "impl=default nested_folders=on get root folders",
 			url:         "/api/folders",
-			expectedLen: LEVEL0_FOLDER_NUM,
-			features:    featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders, featuremgmt.FlagPermissionsFilterRemoveSubquery),
+			expectedLen: LEVEL0_FOLDER_NUM + 1, // for shared with me folder
+			features:    featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders),
 		},
 		{
-			desc:        "get subfolders with nested folders feature enabled",
+			desc:        "impl=default nested_folders=on get subfolders",
 			url:         "/api/folders?parentUid=folder0",
 			expectedLen: LEVEL1_FOLDER_NUM,
-			features:    featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders, featuremgmt.FlagPermissionsFilterRemoveSubquery),
+			features:    featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders),
 		},
 		{
-			desc:        "list all inherited dashboards with nested folders feature enabled",
+			desc:        "impl=default nested_folders=on list all inherited dashboards",
+			url:         "/api/search?type=dash-db&limit=5000",
+			expectedLen: withLimit(all),
+			features:    featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders),
+		},
+		{
+			desc:        "impl=permissionsFilterRemoveSubquery nested_folders=on list all inherited dashboards",
 			url:         "/api/search?type=dash-db&limit=5000",
 			expectedLen: withLimit(all),
 			features:    featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders, featuremgmt.FlagPermissionsFilterRemoveSubquery),
 		},
 		{
-			desc:        "search for pattern with nested folders feature enabled",
+			desc:        "impl=default nested_folders=on search for pattern",
+			url:         "/api/search?type=dash-db&query=dashboard_0_0&limit=5000",
+			expectedLen: withLimit(1 + LEVEL1_DASHBOARD_NUM + LEVEL2_FOLDER_NUM*LEVEL2_DASHBOARD_NUM),
+			features:    featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders),
+		},
+		{
+			desc:        "impl=permissionsFilterRemoveSubquery nested_folders=on search for pattern",
 			url:         "/api/search?type=dash-db&query=dashboard_0_0&limit=5000",
 			expectedLen: withLimit(1 + LEVEL1_DASHBOARD_NUM + LEVEL2_FOLDER_NUM*LEVEL2_DASHBOARD_NUM),
 			features:    featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders, featuremgmt.FlagPermissionsFilterRemoveSubquery),
 		},
 		{
-			desc:        "search for specific dashboard nested folders feature enabled",
+			desc:        "impl=default nested_folders=on search for specific dashboard",
+			url:         "/api/search?type=dash-db&query=dashboard_0_0_0_0",
+			expectedLen: 1,
+			features:    featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders),
+		},
+		{
+			desc:        "impl=permissionsFilterRemoveSubquery nested_folders=on search for specific dashboard",
 			url:         "/api/search?type=dash-db&query=dashboard_0_0_0_0",
 			expectedLen: 1,
 			features:    featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders, featuremgmt.FlagPermissionsFilterRemoveSubquery),
 		},
 		{
-			desc:        "get root folders with nested folders feature disabled",
+			desc:        "impl=default nested_folders=off get root folders",
 			url:         "/api/folders?limit=5000",
 			expectedLen: withLimit(LEVEL0_FOLDER_NUM),
-			features:    featuremgmt.WithFeatures(featuremgmt.FlagPermissionsFilterRemoveSubquery),
+			features:    featuremgmt.WithFeatures(),
 		},
 		{
-			desc:        "list all dashboards with nested folders feature disabled",
+			desc:        "impl=default nested_folders=off list all dashboards",
+			url:         "/api/search?type=dash-db&limit=5000",
+			expectedLen: withLimit(LEVEL0_FOLDER_NUM * LEVEL0_DASHBOARD_NUM),
+			features:    featuremgmt.WithFeatures(),
+		},
+		{
+			desc:        "impl=permissionsFilterRemoveSubquery nested_folders=off list all dashboards",
 			url:         "/api/search?type=dash-db&limit=5000",
 			expectedLen: withLimit(LEVEL0_FOLDER_NUM * LEVEL0_DASHBOARD_NUM),
 			features:    featuremgmt.WithFeatures(featuremgmt.FlagPermissionsFilterRemoveSubquery),
 		},
 		{
-			desc:        "search specific dashboard with nested folders feature disabled",
+			desc:        "impl=default nested_folders=off search specific dashboard",
+			url:         "/api/search?type=dash-db&query=dashboard_0_0",
+			expectedLen: 1,
+			features:    featuremgmt.WithFeatures(),
+		},
+		{
+			desc:        "impl=permissionsFilterRemoveSubquery nested_folders=off search specific dashboard",
 			url:         "/api/search?type=dash-db&query=dashboard_0_0",
 			expectedLen: 1,
 			features:    featuremgmt.WithFeatures(featuremgmt.FlagPermissionsFilterRemoveSubquery),
@@ -174,7 +207,8 @@ func setupDB(b testing.TB) benchScenario {
 	quotaService := quotatest.New(false, nil)
 	cfg := setting.NewCfg()
 
-	teamSvc := teamimpl.ProvideService(db, cfg)
+	teamSvc, err := teamimpl.ProvideService(db, cfg)
+	require.NoError(b, err)
 	orgService, err := orgimpl.ProvideService(db, cfg, quotaService)
 	require.NoError(b, err)
 
@@ -221,7 +255,7 @@ func setupDB(b testing.TB) benchScenario {
 				UserID:     userID,
 				TeamID:     teamID,
 				OrgID:      orgID,
-				Permission: dashboards.PERMISSION_VIEW,
+				Permission: dashboardaccess.PERMISSION_VIEW,
 				Created:    now,
 				Updated:    now,
 			})
@@ -293,20 +327,21 @@ func setupDB(b testing.TB) benchScenario {
 			str := fmt.Sprintf("dashboard_%d_%d", i, j)
 			dashID := generateID(IDs)
 			dashs = append(dashs, &dashboards.Dashboard{
-				ID:       dashID,
-				OrgID:    signedInUser.OrgID,
-				IsFolder: false,
-				UID:      str,
-				FolderID: f0.ID,
-				Slug:     str,
-				Title:    str,
-				Data:     simplejson.New(),
-				Created:  now,
-				Updated:  now,
+				ID:        dashID,
+				OrgID:     signedInUser.OrgID,
+				IsFolder:  false,
+				UID:       str,
+				FolderID:  f0.ID,
+				FolderUID: f0.UID,
+				Slug:      str,
+				Title:     str,
+				Data:      simplejson.New(),
+				Created:   now,
+				Updated:   now,
 			})
 
 			dashTags = append(dashTags, &dashboardTag{
-				DashboardId: dashID,
+				DashboardID: dashID,
 				Term:        fmt.Sprintf("tag%d", j),
 			})
 		}
@@ -320,20 +355,21 @@ func setupDB(b testing.TB) benchScenario {
 				str := fmt.Sprintf("dashboard_%d_%d_%d", i, j, k)
 				dashID := generateID(IDs)
 				dashs = append(dashs, &dashboards.Dashboard{
-					ID:       dashID,
-					OrgID:    signedInUser.OrgID,
-					IsFolder: false,
-					UID:      str,
-					FolderID: f1.ID,
-					Slug:     str,
-					Title:    str,
-					Data:     simplejson.New(),
-					Created:  now,
-					Updated:  now,
+					ID:        dashID,
+					OrgID:     signedInUser.OrgID,
+					IsFolder:  false,
+					UID:       str,
+					FolderID:  f1.ID,
+					FolderUID: f1.UID,
+					Slug:      str,
+					Title:     str,
+					Data:      simplejson.New(),
+					Created:   now,
+					Updated:   now,
 				})
 
 				dashTags = append(dashTags, &dashboardTag{
-					DashboardId: dashID,
+					DashboardID: dashID,
 					Term:        fmt.Sprintf("tag%d", k),
 				})
 			}
@@ -347,20 +383,21 @@ func setupDB(b testing.TB) benchScenario {
 					str := fmt.Sprintf("dashboard_%d_%d_%d_%d", i, j, k, l)
 					dashID := generateID(IDs)
 					dashs = append(dashs, &dashboards.Dashboard{
-						ID:       dashID,
-						OrgID:    signedInUser.OrgID,
-						IsFolder: false,
-						UID:      str,
-						FolderID: f2.ID,
-						Slug:     str,
-						Title:    str,
-						Data:     simplejson.New(),
-						Created:  now,
-						Updated:  now,
+						ID:        dashID,
+						OrgID:     signedInUser.OrgID,
+						IsFolder:  false,
+						UID:       str,
+						FolderID:  f1.ID,
+						FolderUID: f2.UID,
+						Slug:      str,
+						Title:     str,
+						Data:      simplejson.New(),
+						Created:   now,
+						Updated:   now,
 					})
 
 					dashTags = append(dashTags, &dashboardTag{
-						DashboardId: dashID,
+						DashboardID: dashID,
 						Term:        fmt.Sprintf("tag%d", l),
 					})
 				}
@@ -391,7 +428,7 @@ func setupDB(b testing.TB) benchScenario {
 	}
 }
 
-func setupServer(b testing.TB, sc benchScenario, features *featuremgmt.FeatureManager) *web.Macaron {
+func setupServer(b testing.TB, sc benchScenario, features featuremgmt.FeatureToggles) *web.Macaron {
 	b.Helper()
 
 	m := web.New()
@@ -411,25 +448,26 @@ func setupServer(b testing.TB, sc benchScenario, features *featuremgmt.FeatureMa
 
 	quotaSrv := quotatest.New(false, nil)
 
-	dashStore, err := database.ProvideDashboardStore(sc.db, sc.db.Cfg, features, tagimpl.ProvideService(sc.db, sc.db.Cfg), quotaSrv)
+	dashStore, err := database.ProvideDashboardStore(sc.db, sc.db.Cfg, features, tagimpl.ProvideService(sc.db), quotaSrv)
 	require.NoError(b, err)
 
 	folderStore := folderimpl.ProvideDashboardFolderStore(sc.db)
 
 	ac := acimpl.ProvideAccessControl(sc.cfg)
-	folderServiceWithFlagOn := folderimpl.ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), sc.cfg, dashStore, folderStore, sc.db, features)
+	folderServiceWithFlagOn := folderimpl.ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), sc.cfg, dashStore, folderStore, sc.db, features, supportbundlestest.NewFakeBundleService(), nil)
 
+	cfg := setting.NewCfg()
 	folderPermissions, err := ossaccesscontrol.ProvideFolderPermissions(
-		features, routing.NewRouteRegister(), sc.db, ac, license, &dashboards.FakeDashboardStore{}, folderServiceWithFlagOn, acSvc, sc.teamSvc, sc.userSvc)
+		cfg, features, routing.NewRouteRegister(), sc.db, ac, license, &dashboards.FakeDashboardStore{}, folderServiceWithFlagOn, acSvc, sc.teamSvc, sc.userSvc)
 	require.NoError(b, err)
 	dashboardPermissions, err := ossaccesscontrol.ProvideDashboardPermissions(
-		features, routing.NewRouteRegister(), sc.db, ac, license, &dashboards.FakeDashboardStore{}, folderServiceWithFlagOn, acSvc, sc.teamSvc, sc.userSvc)
+		cfg, features, routing.NewRouteRegister(), sc.db, ac, license, &dashboards.FakeDashboardStore{}, folderServiceWithFlagOn, acSvc, sc.teamSvc, sc.userSvc)
 	require.NoError(b, err)
 
 	dashboardSvc, err := dashboardservice.ProvideDashboardServiceImpl(
-		sc.cfg, dashStore, folderStore, nil,
+		sc.cfg, dashStore, folderStore,
 		features, folderPermissions, dashboardPermissions, ac,
-		folderServiceWithFlagOn,
+		folderServiceWithFlagOn, nil,
 	)
 	require.NoError(b, err)
 
@@ -474,8 +512,8 @@ func (f *f) TableName() string {
 
 // SQL bean helper to save tags
 type dashboardTag struct {
-	Id          int64
-	DashboardId int64
+	ID          int64 `xorm:"pk autoincr 'id'"`
+	DashboardID int64 `xorm:"dashboard_id"`
 	Term        string
 }
 
diff --git a/pkg/api/folder_permission.go b/pkg/api/folder_permission.go
index 12afa5e13751b..8901eaa30732c 100644
--- a/pkg/api/folder_permission.go
+++ b/pkg/api/folder_permission.go
@@ -8,9 +8,11 @@ import (
 	"github.com/grafana/grafana/pkg/api/apierrors"
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/api/response"
+	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/web"
@@ -36,7 +38,7 @@ func (hs *HTTPServer) GetFolderPermissionList(c *contextmodel.ReqContext) respon
 
 	acl, err := hs.getFolderACL(c.Req.Context(), c.SignedInUser, folder)
 	if err != nil {
-		return response.Error(500, "Failed to get folder permissions", err)
+		return response.Error(http.StatusInternalServerError, "Failed to get folder permissions", err)
 	}
 
 	filteredACLs := make([]*dashboards.DashboardACLInfoDTO, 0, len(acl))
@@ -44,14 +46,15 @@ func (hs *HTTPServer) GetFolderPermissionList(c *contextmodel.ReqContext) respon
 		if perm.UserID > 0 && dtos.IsHiddenUser(perm.UserLogin, c.SignedInUser, hs.Cfg) {
 			continue
 		}
-
+		metrics.MFolderIDsAPICount.WithLabelValues(metrics.GetFolderPermissionList).Inc()
+		// nolint:staticcheck
 		perm.FolderID = folder.ID
 		perm.DashboardID = 0
 
-		perm.UserAvatarURL = dtos.GetGravatarUrl(perm.UserEmail)
+		perm.UserAvatarURL = dtos.GetGravatarUrl(hs.Cfg, perm.UserEmail)
 
 		if perm.TeamID > 0 {
-			perm.TeamAvatarURL = dtos.GetGravatarUrlWithDefault(perm.TeamEmail, perm.Team)
+			perm.TeamAvatarURL = dtos.GetGravatarUrlWithDefault(hs.Cfg, perm.TeamEmail, perm.Team)
 		}
 
 		if perm.Slug != "" {
@@ -80,7 +83,7 @@ func (hs *HTTPServer) UpdateFolderPermissions(c *contextmodel.ReqContext) respon
 		return response.Error(http.StatusBadRequest, "bad request data", err)
 	}
 	if err := validatePermissionsUpdate(apiCmd); err != nil {
-		return response.Error(400, err.Error(), err)
+		return response.Error(http.StatusBadRequest, err.Error(), err)
 	}
 
 	uid := web.Params(c.Req)[":uid"]
@@ -93,7 +96,7 @@ func (hs *HTTPServer) UpdateFolderPermissions(c *contextmodel.ReqContext) respon
 	for _, item := range apiCmd.Items {
 		items = append(items, &dashboards.DashboardACL{
 			OrgID:       c.SignedInUser.GetOrgID(),
-			DashboardID: folder.ID,
+			DashboardID: folder.ID, // nolint:staticcheck
 			UserID:      item.UserID,
 			TeamID:      item.TeamID,
 			Role:        item.Role,
@@ -101,6 +104,7 @@ func (hs *HTTPServer) UpdateFolderPermissions(c *contextmodel.ReqContext) respon
 			Created:     time.Now(),
 			Updated:     time.Now(),
 		})
+		metrics.MFolderIDsAPICount.WithLabelValues(metrics.UpdateFolderPermissions).Inc()
 	}
 
 	acl, err := hs.getFolderACL(c.Req.Context(), c.SignedInUser, folder)
@@ -117,10 +121,10 @@ func (hs *HTTPServer) UpdateFolderPermissions(c *contextmodel.ReqContext) respon
 	return response.Success("Folder permissions updated")
 }
 
-var folderPermissionMap = map[string]dashboards.PermissionType{
-	"View":  dashboards.PERMISSION_VIEW,
-	"Edit":  dashboards.PERMISSION_EDIT,
-	"Admin": dashboards.PERMISSION_ADMIN,
+var folderPermissionMap = map[string]dashboardaccess.PermissionType{
+	"View":  dashboardaccess.PERMISSION_VIEW,
+	"Edit":  dashboardaccess.PERMISSION_EDIT,
+	"Admin": dashboardaccess.PERMISSION_ADMIN,
 }
 
 func (hs *HTTPServer) getFolderACL(ctx context.Context, user identity.Requester, folder *folder.Folder) ([]*dashboards.DashboardACLInfoDTO, error) {
@@ -145,7 +149,7 @@ func (hs *HTTPServer) getFolderACL(ctx context.Context, user identity.Requester,
 
 		acl = append(acl, &dashboards.DashboardACLInfoDTO{
 			OrgID:          folder.OrgID,
-			DashboardID:    folder.ID,
+			DashboardID:    folder.ID, // nolint:staticcheck
 			FolderUID:      folder.ParentUID,
 			Created:        p.Created,
 			Updated:        p.Updated,
@@ -164,6 +168,7 @@ func (hs *HTTPServer) getFolderACL(ctx context.Context, user identity.Requester,
 			IsFolder:       true,
 			Inherited:      false,
 		})
+		metrics.MFolderIDsAPICount.WithLabelValues(metrics.GetFolderPermissionList).Inc()
 	}
 
 	return acl, nil
diff --git a/pkg/api/folder_permission_test.go b/pkg/api/folder_permission_test.go
index 8eb8368fb44a3..6176bff587027 100644
--- a/pkg/api/folder_permission_test.go
+++ b/pkg/api/folder_permission_test.go
@@ -30,7 +30,7 @@ func TestHTTPServer_GetFolderPermissionList(t *testing.T) {
 
 	t.Run("should be able to list acl with correct permission", func(t *testing.T) {
 		server := SetupAPITestServer(t, func(hs *HTTPServer) {
-			hs.folderService = &foldertest.FakeService{ExpectedFolder: &folder.Folder{ID: 1, UID: "1"}}
+			hs.folderService = &foldertest.FakeService{ExpectedFolder: &folder.Folder{UID: "1"}}
 			hs.folderPermissionsService = &actest.FakePermissionsService{
 				ExpectedPermissions: []accesscontrol.ResourcePermission{},
 			}
@@ -50,7 +50,7 @@ func TestHTTPServer_GetFolderPermissionList(t *testing.T) {
 			cfg := setting.NewCfg()
 			cfg.HiddenUsers = map[string]struct{}{"hidden": {}}
 			hs.Cfg = cfg
-			hs.folderService = &foldertest.FakeService{ExpectedFolder: &folder.Folder{ID: 1, UID: "1"}}
+			hs.folderService = &foldertest.FakeService{ExpectedFolder: &folder.Folder{UID: "1"}}
 
 			hs.folderPermissionsService = &actest.FakePermissionsService{
 				ExpectedPermissions: []accesscontrol.ResourcePermission{
@@ -88,7 +88,7 @@ func TestHTTPServer_UpdateFolderPermissions(t *testing.T) {
 
 	t.Run("should be able to update acl with correct permissions", func(t *testing.T) {
 		server := SetupAPITestServer(t, func(hs *HTTPServer) {
-			hs.folderService = &foldertest.FakeService{ExpectedFolder: &folder.Folder{ID: 1, UID: "1"}}
+			hs.folderService = &foldertest.FakeService{ExpectedFolder: &folder.Folder{UID: "1"}}
 			hs.folderPermissionsService = &actest.FakePermissionsService{}
 		})
 
@@ -104,7 +104,7 @@ func TestHTTPServer_UpdateFolderPermissions(t *testing.T) {
 
 	t.Run("should not be able to specify team and user in same acl", func(t *testing.T) {
 		server := SetupAPITestServer(t, func(hs *HTTPServer) {
-			hs.folderService = &foldertest.FakeService{ExpectedFolder: &folder.Folder{ID: 1, UID: "1"}}
+			hs.folderService = &foldertest.FakeService{ExpectedFolder: &folder.Folder{UID: "1"}}
 			hs.folderPermissionsService = &actest.FakePermissionsService{}
 		})
 
@@ -120,7 +120,7 @@ func TestHTTPServer_UpdateFolderPermissions(t *testing.T) {
 
 	t.Run("should not be able to specify team and role in same acl", func(t *testing.T) {
 		server := SetupAPITestServer(t, func(hs *HTTPServer) {
-			hs.folderService = &foldertest.FakeService{ExpectedFolder: &folder.Folder{ID: 1, UID: "1"}}
+			hs.folderService = &foldertest.FakeService{ExpectedFolder: &folder.Folder{UID: "1"}}
 			hs.folderPermissionsService = &actest.FakePermissionsService{}
 		})
 
@@ -136,7 +136,7 @@ func TestHTTPServer_UpdateFolderPermissions(t *testing.T) {
 
 	t.Run("should not be able to specify user and role in same acl", func(t *testing.T) {
 		server := SetupAPITestServer(t, func(hs *HTTPServer) {
-			hs.folderService = &foldertest.FakeService{ExpectedFolder: &folder.Folder{ID: 1, UID: "1"}}
+			hs.folderService = &foldertest.FakeService{ExpectedFolder: &folder.Folder{UID: "1"}}
 			hs.folderPermissionsService = &actest.FakePermissionsService{}
 		})
 
diff --git a/pkg/api/folder_test.go b/pkg/api/folder_test.go
index b5c60bf8e3c50..dc5b2df4458f6 100644
--- a/pkg/api/folder_test.go
+++ b/pkg/api/folder_test.go
@@ -47,7 +47,7 @@ func TestFoldersCreateAPIEndpoint(t *testing.T) {
 			description:    "folder creation succeeds given the correct request for creating a folder",
 			input:          folderWithoutParentInput,
 			expectedCode:   http.StatusOK,
-			expectedFolder: &folder.Folder{ID: 1, UID: "uid", Title: "Folder"},
+			expectedFolder: &folder.Folder{UID: "uid", Title: "Folder"},
 			permissions:    []accesscontrol.Permission{{Action: dashboards.ActionFoldersCreate}},
 		},
 		{
@@ -145,8 +145,7 @@ func TestFoldersCreateAPIEndpoint(t *testing.T) {
 			require.NoError(t, resp.Body.Close())
 
 			if tc.expectedCode == http.StatusOK {
-				assert.Equal(t, int64(1), folder.Id)
-				assert.Equal(t, "uid", folder.Uid)
+				assert.Equal(t, "uid", folder.UID)
 				assert.Equal(t, "Folder", folder.Title)
 			}
 		})
@@ -168,7 +167,7 @@ func TestFoldersUpdateAPIEndpoint(t *testing.T) {
 		{
 			description:    "folder updating succeeds given the correct request and permissions to update a folder",
 			expectedCode:   http.StatusOK,
-			expectedFolder: &folder.Folder{ID: 1, UID: "uid", Title: "Folder upd"},
+			expectedFolder: &folder.Folder{UID: "uid", Title: "Folder upd"},
 			permissions:    []accesscontrol.Permission{{Action: dashboards.ActionFoldersWrite, Scope: dashboards.ScopeFoldersAll}},
 		},
 		{
@@ -249,8 +248,7 @@ func TestFoldersUpdateAPIEndpoint(t *testing.T) {
 			require.NoError(t, resp.Body.Close())
 
 			if tc.expectedCode == http.StatusOK {
-				assert.Equal(t, int64(1), folder.Id)
-				assert.Equal(t, "uid", folder.Uid)
+				assert.Equal(t, "uid", folder.UID)
 				assert.Equal(t, "Folder upd", folder.Title)
 			}
 		})
@@ -419,7 +417,6 @@ func TestFolderMoveAPIEndpoint(t *testing.T) {
 func TestFolderGetAPIEndpoint(t *testing.T) {
 	folderService := &foldertest.FakeService{
 		ExpectedFolder: &folder.Folder{
-			ID:    1,
 			UID:   "uid",
 			Title: "uid title",
 		},
@@ -438,9 +435,10 @@ func TestFolderGetAPIEndpoint(t *testing.T) {
 	type testCase struct {
 		description          string
 		URL                  string
-		features             *featuremgmt.FeatureManager
+		features             featuremgmt.FeatureToggles
 		expectedCode         int
 		expectedParentUIDs   []string
+		expectedParentOrgIDs []int64
 		expectedParentTitles []string
 		permissions          []accesscontrol.Permission
 		g                    *guardian.FakeDashboardGuardian
@@ -452,6 +450,7 @@ func TestFolderGetAPIEndpoint(t *testing.T) {
 			expectedCode:         http.StatusOK,
 			features:             featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders),
 			expectedParentUIDs:   []string{"parent", "subfolder"},
+			expectedParentOrgIDs: []int64{0, 0},
 			expectedParentTitles: []string{"parent title", "subfolder title"},
 			permissions: []accesscontrol.Permission{
 				{Action: dashboards.ActionFoldersRead, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID("uid")},
@@ -464,6 +463,7 @@ func TestFolderGetAPIEndpoint(t *testing.T) {
 			expectedCode:         http.StatusOK,
 			features:             featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders),
 			expectedParentUIDs:   []string{REDACTED, REDACTED},
+			expectedParentOrgIDs: []int64{0, 0},
 			expectedParentTitles: []string{REDACTED, REDACTED},
 			permissions: []accesscontrol.Permission{
 				{Action: dashboards.ActionFoldersRead, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID("uid")},
@@ -476,6 +476,7 @@ func TestFolderGetAPIEndpoint(t *testing.T) {
 			expectedCode:         http.StatusOK,
 			features:             featuremgmt.WithFeatures(),
 			expectedParentUIDs:   []string{},
+			expectedParentOrgIDs: []int64{0, 0},
 			expectedParentTitles: []string{},
 			permissions: []accesscontrol.Permission{
 				{Action: dashboards.ActionFoldersRead, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID("uid")},
@@ -513,7 +514,8 @@ func TestFolderGetAPIEndpoint(t *testing.T) {
 			require.Equal(t, len(folder.Parents), len(tc.expectedParentTitles))
 
 			for i := 0; i < len(tc.expectedParentUIDs); i++ {
-				assert.Equal(t, tc.expectedParentUIDs[i], folder.Parents[i].Uid)
+				assert.Equal(t, tc.expectedParentUIDs[i], folder.Parents[i].UID)
+				assert.Equal(t, tc.expectedParentOrgIDs[i], folder.Parents[i].OrgID)
 				assert.Equal(t, tc.expectedParentTitles[i], folder.Parents[i].Title)
 			}
 			require.NoError(t, resp.Body.Close())
diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index cdf4268a0dbe1..5c2cf58aacef8 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -2,18 +2,23 @@ package api
 
 import (
 	"context"
+	"crypto/sha256"
 	"fmt"
+	"hash"
 	"net/http"
+	"slices"
+	"sort"
 	"strings"
 
-	"golang.org/x/exp/slices"
-
 	"github.com/grafana/grafana/pkg/api/dtos"
+	"github.com/grafana/grafana/pkg/api/webassets"
+	"github.com/grafana/grafana/pkg/login/social"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/licensing"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
@@ -23,6 +28,61 @@ import (
 	"github.com/grafana/grafana/pkg/util"
 )
 
+// Returns a file that is easy to check for changes
+// Any changes to the file means we should refresh the frontend
+func (hs *HTTPServer) GetFrontendAssets(c *contextmodel.ReqContext) {
+	hash := sha256.New()
+	keys := map[string]any{}
+
+	// BuildVersion
+	hash.Reset()
+	_, _ = hash.Write([]byte(setting.BuildVersion))
+	_, _ = hash.Write([]byte(setting.BuildCommit))
+	_, _ = hash.Write([]byte(fmt.Sprintf("%d", setting.BuildStamp)))
+	keys["version"] = fmt.Sprintf("%x", hash.Sum(nil))
+
+	// Plugin configs
+	plugins := []string{}
+	for _, p := range hs.pluginStore.Plugins(c.Req.Context()) {
+		plugins = append(plugins, fmt.Sprintf("%s@%s", p.Name, p.Info.Version))
+	}
+	keys["plugins"] = sortedHash(plugins, hash)
+
+	// Feature flags
+	enabled := []string{}
+	for flag, set := range hs.Features.GetEnabled(c.Req.Context()) {
+		if set {
+			enabled = append(enabled, flag)
+		}
+	}
+	keys["flags"] = sortedHash(enabled, hash)
+
+	// Assets
+	hash.Reset()
+	dto, err := webassets.GetWebAssets(c.Req.Context(), hs.Cfg, hs.License)
+	if err == nil && dto != nil {
+		_, _ = hash.Write([]byte(dto.ContentDeliveryURL))
+		_, _ = hash.Write([]byte(dto.Dark))
+		_, _ = hash.Write([]byte(dto.Light))
+		for _, f := range dto.JSFiles {
+			_, _ = hash.Write([]byte(f.FilePath))
+			_, _ = hash.Write([]byte(f.Integrity))
+		}
+	}
+	keys["assets"] = fmt.Sprintf("%x", hash.Sum(nil))
+
+	c.JSON(http.StatusOK, keys)
+}
+
+func sortedHash(vals []string, hash hash.Hash) string {
+	hash.Reset()
+	sort.Strings(vals)
+	for _, v := range vals {
+		_, _ = hash.Write([]byte(v))
+	}
+	return fmt.Sprintf("%x", hash.Sum(nil))
+}
+
 func (hs *HTTPServer) GetFrontendSettings(c *contextmodel.ReqContext) {
 	settings, err := hs.getFrontendSettings(c)
 	if err != nil {
@@ -34,6 +94,8 @@ func (hs *HTTPServer) GetFrontendSettings(c *contextmodel.ReqContext) {
 }
 
 // getFrontendSettings returns a json object with all the settings needed for front end initialisation.
+//
+//nolint:gocyclo
 func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.FrontendSettingsDTO, error) {
 	availablePlugins, err := hs.availablePlugins(c.Req.Context(), c.SignedInUser.GetOrgID())
 	if err != nil {
@@ -67,67 +129,69 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
 			continue
 		}
 
-		if panel.ID == "datagrid" && !hs.Features.IsEnabled(featuremgmt.FlagEnableDatagridEditing) {
+		if panel.ID == "datagrid" && !hs.Features.IsEnabled(c.Req.Context(), featuremgmt.FlagEnableDatagridEditing) {
 			continue
 		}
 
 		panels[panel.ID] = plugins.PanelDTO{
-			ID:              panel.ID,
-			Name:            panel.Name,
-			AliasIDs:        panel.AliasIDs,
-			Info:            panel.Info,
-			Module:          panel.Module,
-			BaseURL:         panel.BaseURL,
-			SkipDataQuery:   panel.SkipDataQuery,
-			HideFromList:    panel.HideFromList,
-			ReleaseState:    string(panel.State),
-			Signature:       string(panel.Signature),
-			Sort:            getPanelSort(panel.ID),
-			AngularDetected: panel.AngularDetected,
+			ID:            panel.ID,
+			Name:          panel.Name,
+			AliasIDs:      panel.AliasIDs,
+			Info:          panel.Info,
+			Module:        panel.Module,
+			BaseURL:       panel.BaseURL,
+			SkipDataQuery: panel.SkipDataQuery,
+			HideFromList:  panel.HideFromList,
+			ReleaseState:  string(panel.State),
+			Signature:     string(panel.Signature),
+			Sort:          getPanelSort(panel.ID),
+			Angular:       panel.Angular,
 		}
 	}
 
 	hideVersion := hs.Cfg.AnonymousHideVersion && !c.IsSignedIn
 	version := setting.BuildVersion
 	commit := setting.BuildCommit
+	commitShort := getShortCommitHash(setting.BuildCommit, 10)
 	buildstamp := setting.BuildStamp
+	versionString := fmt.Sprintf(`%s v%s (%s)`, setting.ApplicationName, version, commitShort)
 
 	if hideVersion {
 		version = ""
+		versionString = setting.ApplicationName
 		commit = ""
+		commitShort = ""
 		buildstamp = 0
 	}
 
 	hasAccess := accesscontrol.HasAccess(hs.AccessControl, c)
 	secretsManagerPluginEnabled := kvstore.EvaluateRemoteSecretsPlugin(c.Req.Context(), hs.secretsPluginManager, hs.Cfg) == nil
 	trustedTypesDefaultPolicyEnabled := (hs.Cfg.CSPEnabled && strings.Contains(hs.Cfg.CSPTemplate, "require-trusted-types-for")) || (hs.Cfg.CSPReportOnlyEnabled && strings.Contains(hs.Cfg.CSPReportOnlyTemplate, "require-trusted-types-for"))
+	isCloudMigrationTarget := hs.Features.IsEnabled(c.Req.Context(), featuremgmt.FlagOnPremToCloudMigrations) && hs.Cfg.CloudMigration.IsTarget
 
 	frontendSettings := &dtos.FrontendSettingsDTO{
 		DefaultDatasource:                   defaultDS,
 		Datasources:                         dataSources,
-		MinRefreshInterval:                  setting.MinRefreshInterval,
+		MinRefreshInterval:                  hs.Cfg.MinRefreshInterval,
 		Panels:                              panels,
 		Apps:                                apps,
 		AppUrl:                              hs.Cfg.AppURL,
 		AppSubUrl:                           hs.Cfg.AppSubURL,
-		AllowOrgCreate:                      (setting.AllowUserOrgCreate && c.IsSignedIn) || c.IsGrafanaAdmin,
-		AuthProxyEnabled:                    hs.Cfg.AuthProxyEnabled,
+		AllowOrgCreate:                      (hs.Cfg.AllowUserOrgCreate && c.IsSignedIn) || c.IsGrafanaAdmin,
+		AuthProxyEnabled:                    hs.Cfg.AuthProxy.Enabled,
 		LdapEnabled:                         hs.Cfg.LDAPAuthEnabled,
-		JwtHeaderName:                       hs.Cfg.JWTAuthHeaderName,
-		JwtUrlLogin:                         hs.Cfg.JWTAuthURLLogin,
-		AlertingErrorOrTimeout:              setting.AlertingErrorOrTimeout,
-		AlertingNoDataOrNullValues:          setting.AlertingNoDataOrNullValues,
-		AlertingMinInterval:                 setting.AlertingMinInterval,
+		JwtHeaderName:                       hs.Cfg.JWTAuth.HeaderName,
+		JwtUrlLogin:                         hs.Cfg.JWTAuth.URLLogin,
 		LiveEnabled:                         hs.Cfg.LiveMaxConnections != 0,
 		AutoAssignOrg:                       hs.Cfg.AutoAssignOrg,
-		VerifyEmailEnabled:                  setting.VerifyEmailEnabled,
-		SigV4AuthEnabled:                    setting.SigV4AuthEnabled,
-		AzureAuthEnabled:                    setting.AzureAuthEnabled,
+		VerifyEmailEnabled:                  hs.Cfg.VerifyEmailEnabled,
+		SigV4AuthEnabled:                    hs.Cfg.SigV4AuthEnabled,
+		AzureAuthEnabled:                    hs.Cfg.AzureAuthEnabled,
 		RbacEnabled:                         true,
-		ExploreEnabled:                      setting.ExploreEnabled,
-		HelpEnabled:                         setting.HelpEnabled,
-		ProfileEnabled:                      setting.ProfileEnabled,
-		NewsFeedEnabled:                     setting.NewsFeedEnabled,
+		ExploreEnabled:                      hs.Cfg.ExploreEnabled,
+		HelpEnabled:                         hs.Cfg.HelpEnabled,
+		ProfileEnabled:                      hs.Cfg.ProfileEnabled,
+		NewsFeedEnabled:                     hs.Cfg.NewsFeedEnabled,
 		QueryHistoryEnabled:                 hs.Cfg.QueryHistoryEnabled,
 		GoogleAnalyticsId:                   hs.Cfg.GoogleAnalyticsID,
 		GoogleAnalytics4Id:                  hs.Cfg.GoogleAnalytics4ID,
@@ -141,12 +205,12 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
 		ApplicationInsightsConnectionString: hs.Cfg.ApplicationInsightsConnectionString,
 		ApplicationInsightsEndpointUrl:      hs.Cfg.ApplicationInsightsEndpointUrl,
 		DisableLoginForm:                    hs.Cfg.DisableLoginForm,
-		DisableUserSignUp:                   !setting.AllowUserSignUp,
-		LoginHint:                           setting.LoginHint,
-		PasswordHint:                        setting.PasswordHint,
-		ExternalUserMngInfo:                 setting.ExternalUserMngInfo,
-		ExternalUserMngLinkUrl:              setting.ExternalUserMngLinkUrl,
-		ExternalUserMngLinkName:             setting.ExternalUserMngLinkName,
+		DisableUserSignUp:                   !hs.Cfg.AllowUserSignUp,
+		LoginHint:                           hs.Cfg.LoginHint,
+		PasswordHint:                        hs.Cfg.PasswordHint,
+		ExternalUserMngInfo:                 hs.Cfg.ExternalUserMngInfo,
+		ExternalUserMngLinkUrl:              hs.Cfg.ExternalUserMngLinkUrl,
+		ExternalUserMngLinkName:             hs.Cfg.ExternalUserMngLinkName,
 		ViewersCanEdit:                      hs.Cfg.ViewersCanEdit,
 		AngularSupportEnabled:               hs.Cfg.AngularSupportEnabled,
 		EditorsCanAdmin:                     hs.Cfg.EditorsCanAdmin,
@@ -157,31 +221,23 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
 		SecureSocksDSProxyEnabled:           hs.Cfg.SecureSocksDSProxy.Enabled && hs.Cfg.SecureSocksDSProxy.ShowUI,
 		DisableFrontendSandboxForPlugins:    hs.Cfg.DisableFrontendSandboxForPlugins,
 		PublicDashboardAccessToken:          c.PublicDashboardAccessToken,
-
-		Auth: dtos.FrontendSettingsAuthDTO{
-			OAuthSkipOrgRoleUpdateSync:  hs.Cfg.OAuthSkipOrgRoleUpdateSync,
-			SAMLSkipOrgRoleSync:         hs.Cfg.SAMLSkipOrgRoleSync,
-			LDAPSkipOrgRoleSync:         hs.Cfg.LDAPSkipOrgRoleSync,
-			GoogleSkipOrgRoleSync:       hs.Cfg.GoogleSkipOrgRoleSync,
-			JWTAuthSkipOrgRoleSync:      hs.Cfg.JWTAuthSkipOrgRoleSync,
-			GrafanaComSkipOrgRoleSync:   hs.Cfg.GrafanaComSkipOrgRoleSync,
-			GenericOAuthSkipOrgRoleSync: hs.Cfg.GenericOAuthSkipOrgRoleSync,
-			AzureADSkipOrgRoleSync:      hs.Cfg.AzureADSkipOrgRoleSync,
-			GithubSkipOrgRoleSync:       hs.Cfg.GitHubSkipOrgRoleSync,
-			GitLabSkipOrgRoleSync:       hs.Cfg.GitLabSkipOrgRoleSync,
-			OktaSkipOrgRoleSync:         hs.Cfg.OktaSkipOrgRoleSync,
-			AuthProxyEnableLoginToken:   hs.Cfg.AuthProxyEnableLoginToken,
-		},
+		PublicDashboardsEnabled:             hs.Cfg.PublicDashboardsEnabled,
+		CloudMigrationIsTarget:              isCloudMigrationTarget,
+		SharedWithMeFolderUID:               folder.SharedWithMeFolderUID,
+		RootFolderUID:                       accesscontrol.GeneralFolderUID,
+		LocalFileSystemAvailable:            hs.Cfg.LocalFileSystemAvailable,
 
 		BuildInfo: dtos.FrontendSettingsBuildInfoDTO{
 			HideVersion:   hideVersion,
 			Version:       version,
+			VersionString: versionString,
 			Commit:        commit,
+			CommitShort:   commitShort,
 			Buildstamp:    buildstamp,
 			Edition:       hs.License.Edition(),
 			LatestVersion: hs.grafanaUpdateChecker.LatestVersion(),
 			HasUpdate:     hs.grafanaUpdateChecker.UpdateAvailable(),
-			Env:           setting.Env,
+			Env:           hs.Cfg.Env,
 		},
 
 		LicenseInfo: dtos.FrontendSettingsLicenseInfoDTO{
@@ -194,8 +250,12 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
 
 		FeatureToggles:                   hs.Features.GetEnabled(c.Req.Context()),
 		AnonymousEnabled:                 hs.Cfg.AnonymousEnabled,
+		AnonymousDeviceLimit:             hs.Cfg.AnonymousDeviceLimit,
 		RendererAvailable:                hs.RenderService.IsAvailable(c.Req.Context()),
 		RendererVersion:                  hs.RenderService.Version(),
+		RendererDefaultImageWidth:        hs.Cfg.RendererDefaultImageWidth,
+		RendererDefaultImageHeight:       hs.Cfg.RendererDefaultImageHeight,
+		RendererDefaultImageScale:        hs.Cfg.RendererDefaultImageScale,
 		SecretsManagerPluginEnabled:      secretsManagerPluginEnabled,
 		Http2Enabled:                     hs.Cfg.Protocol == setting.HTTP2Scheme,
 		GrafanaJavascriptAgent:           hs.Cfg.GrafanaJavascriptAgent,
@@ -209,10 +269,11 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
 		SupportBundlesEnabled:            isSupportBundlesEnabled(hs),
 
 		Azure: dtos.FrontendSettingsAzureDTO{
-			Cloud:                   hs.Cfg.Azure.Cloud,
-			ManagedIdentityEnabled:  hs.Cfg.Azure.ManagedIdentityEnabled,
-			WorkloadIdentityEnabled: hs.Cfg.Azure.WorkloadIdentityEnabled,
-			UserIdentityEnabled:     hs.Cfg.Azure.UserIdentityEnabled,
+			Cloud:                                  hs.Cfg.Azure.Cloud,
+			ManagedIdentityEnabled:                 hs.Cfg.Azure.ManagedIdentityEnabled,
+			WorkloadIdentityEnabled:                hs.Cfg.Azure.WorkloadIdentityEnabled,
+			UserIdentityEnabled:                    hs.Cfg.Azure.UserIdentityEnabled,
+			UserIdentityFallbackCredentialsEnabled: hs.Cfg.Azure.UserIdentityFallbackCredentialsEnabled,
 		},
 
 		Caching: dtos.FrontendSettingsCachingDTO{
@@ -224,6 +285,9 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
 		Reporting: dtos.FrontendSettingsReportingDTO{
 			Enabled: hs.Cfg.SectionWithEnvOverrides("reporting").Key("enabled").MustBool(true),
 		},
+		Analytics: dtos.FrontendSettingsAnalyticsDTO{
+			Enabled: hs.Cfg.SectionWithEnvOverrides("analytics").Key("enabled").MustBool(true),
+		},
 
 		UnifiedAlerting: dtos.FrontendSettingsUnifiedAlertingDTO{
 			MinInterval: hs.Cfg.UnifiedAlerting.MinInterval.String(),
@@ -252,8 +316,29 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
 		frontendSettings.UnifiedAlertingEnabled = *hs.Cfg.UnifiedAlerting.Enabled
 	}
 
-	if setting.AlertingEnabled != nil {
-		frontendSettings.AlertingEnabled = *setting.AlertingEnabled
+	// It returns false if the provider is not enabled or the skip org role sync is false.
+	parseSkipOrgRoleSyncEnabled := func(info *social.OAuthInfo) bool {
+		if info == nil {
+			return false
+		}
+		return info.SkipOrgRoleSync
+	}
+
+	oauthProviders := hs.SocialService.GetOAuthInfoProviders()
+	frontendSettings.Auth = dtos.FrontendSettingsAuthDTO{
+		AuthProxyEnableLoginToken:     hs.Cfg.AuthProxy.EnableLoginToken,
+		SAMLSkipOrgRoleSync:           hs.Cfg.SAMLSkipOrgRoleSync,
+		LDAPSkipOrgRoleSync:           hs.Cfg.LDAPSkipOrgRoleSync,
+		JWTAuthSkipOrgRoleSync:        hs.Cfg.JWTAuth.SkipOrgRoleSync,
+		GoogleSkipOrgRoleSync:         parseSkipOrgRoleSyncEnabled(oauthProviders[social.GoogleProviderName]),
+		GrafanaComSkipOrgRoleSync:     parseSkipOrgRoleSyncEnabled(oauthProviders[social.GrafanaComProviderName]),
+		GenericOAuthSkipOrgRoleSync:   parseSkipOrgRoleSyncEnabled(oauthProviders[social.GenericOAuthProviderName]),
+		AzureADSkipOrgRoleSync:        parseSkipOrgRoleSyncEnabled(oauthProviders[social.AzureADProviderName]),
+		GithubSkipOrgRoleSync:         parseSkipOrgRoleSyncEnabled(oauthProviders[social.GitHubProviderName]),
+		GitLabSkipOrgRoleSync:         parseSkipOrgRoleSyncEnabled(oauthProviders[social.GitlabProviderName]),
+		OktaSkipOrgRoleSync:           parseSkipOrgRoleSyncEnabled(oauthProviders[social.OktaProviderName]),
+		DisableLogin:                  hs.Cfg.DisableLogin,
+		BasicAuthStrongPasswordPolicy: hs.Cfg.BasicAuthStrongPasswordPolicy,
 	}
 
 	if hs.pluginsCDNService != nil && hs.pluginsCDNService.IsEnabled() {
@@ -272,6 +357,15 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
 		frontendSettings.GeomapDisableCustomBaseLayer = true
 	}
 
+	// Set the kubernetes namespace
+	frontendSettings.Namespace = hs.namespacer(c.SignedInUser.OrgID)
+
+	// experimental scope features
+	if hs.Features.IsEnabled(c.Req.Context(), featuremgmt.FlagScopeFilters) {
+		frontendSettings.ListScopesEndpoint = hs.Cfg.ScopesListScopesURL
+		frontendSettings.ListDashboardScopesEndpoint = hs.Cfg.ScopesListDashboardsURL
+	}
+
 	return frontendSettings, nil
 }
 
@@ -279,6 +373,13 @@ func isSupportBundlesEnabled(hs *HTTPServer) bool {
 	return hs.Cfg.SectionWithEnvOverrides("support_bundles").Key("enabled").MustBool(true)
 }
 
+func getShortCommitHash(commitHash string, maxLength int) string {
+	if len(commitHash) > maxLength {
+		return commitHash[:maxLength]
+	}
+	return commitHash
+}
+
 func (hs *HTTPServer) getFSDataSources(c *contextmodel.ReqContext, availablePlugins AvailablePlugins) (map[string]plugins.DataSourceDTO, error) {
 	orgDataSources := make([]*datasources.DataSource, 0)
 	if c.SignedInUser.GetOrgID() != 0 {
@@ -334,8 +435,8 @@ func (hs *HTTPServer) getFSDataSources(c *contextmodel.ReqContext, availablePlug
 			Signature: plugin.Signature,
 			Module:    plugin.Module,
 			BaseURL:   plugin.BaseURL,
+			Angular:   plugin.Angular,
 		}
-		dsDTO.AngularDetected = plugin.AngularDetected
 
 		if ds.JsonData == nil {
 			dsDTO.JSONData = make(map[string]any)
@@ -417,8 +518,8 @@ func (hs *HTTPServer) getFSDataSources(c *contextmodel.ReqContext, availablePlug
 					Signature: ds.Signature,
 					Module:    ds.Module,
 					BaseURL:   ds.BaseURL,
+					Angular:   ds.Angular,
 				},
-				AngularDetected: ds.AngularDetected,
 			}
 			if ds.Name == grafanads.DatasourceName {
 				dto.ID = grafanads.DatasourceID
@@ -433,11 +534,11 @@ func (hs *HTTPServer) getFSDataSources(c *contextmodel.ReqContext, availablePlug
 
 func newAppDTO(plugin pluginstore.Plugin, settings pluginsettings.InfoDTO) *plugins.AppDTO {
 	app := &plugins.AppDTO{
-		ID:              plugin.ID,
-		Version:         plugin.Info.Version,
-		Path:            plugin.Module,
-		Preload:         false,
-		AngularDetected: plugin.AngularDetected,
+		ID:      plugin.ID,
+		Version: plugin.Info.Version,
+		Path:    plugin.Module,
+		Preload: false,
+		Angular: plugin.Angular,
 	}
 
 	if settings.Enabled {
diff --git a/pkg/api/frontendsettings_test.go b/pkg/api/frontendsettings_test.go
index 5d40f01f79055..d0fbcb0c1472e 100644
--- a/pkg/api/frontendsettings_test.go
+++ b/pkg/api/frontendsettings_test.go
@@ -14,35 +14,36 @@ import (
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/remotecache"
 	"github.com/grafana/grafana/pkg/infra/usagestats"
-	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/login/social/socialimpl"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/pluginscdn"
 	accesscontrolmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/licensing"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 	"github.com/grafana/grafana/pkg/services/rendering"
+	"github.com/grafana/grafana/pkg/services/ssosettings/ssosettingstests"
 	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
 	"github.com/grafana/grafana/pkg/services/updatechecker"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/web"
 )
 
-func setupTestEnvironment(t *testing.T, cfg *setting.Cfg, features *featuremgmt.FeatureManager, pstore pluginstore.Store, psettings pluginsettings.Service) (*web.Mux, *HTTPServer) {
+func setupTestEnvironment(t *testing.T, cfg *setting.Cfg, features featuremgmt.FeatureToggles, pstore pluginstore.Store, psettings pluginsettings.Service) (*web.Mux, *HTTPServer) {
 	t.Helper()
 	db.InitTestDB(t)
-	cfg.IsFeatureToggleEnabled = features.IsEnabled
+	// nolint:staticcheck
+	cfg.IsFeatureToggleEnabled = features.IsEnabledGlobally
 
 	{
 		oldVersion := setting.BuildVersion
 		oldCommit := setting.BuildCommit
-		oldEnv := setting.Env
 		t.Cleanup(func() {
 			setting.BuildVersion = oldVersion
 			setting.BuildCommit = oldCommit
-			setting.Env = oldEnv
 		})
 	}
 
@@ -62,7 +63,7 @@ func setupTestEnvironment(t *testing.T, cfg *setting.Cfg, features *featuremgmt.
 		License:  &licensing.OSSLicensingService{Cfg: cfg},
 		RenderService: &rendering.RenderingService{
 			Cfg:                   cfg,
-			RendererPluginManager: &fakeRendererManager{},
+			RendererPluginManager: &fakeRendererPluginManager{},
 		},
 		SQLStore:             db.InitTestDB(t),
 		SettingsProvider:     setting.ProvideProvider(cfg),
@@ -70,16 +71,17 @@ func setupTestEnvironment(t *testing.T, cfg *setting.Cfg, features *featuremgmt.
 		grafanaUpdateChecker: &updatechecker.GrafanaService{},
 		AccessControl:        accesscontrolmock.New(),
 		PluginSettings:       pluginsSettings,
-		pluginsCDNService: pluginscdn.ProvideService(&config.Cfg{
+		pluginsCDNService: pluginscdn.ProvideService(&config.PluginManagementCfg{
 			PluginsCDNURLTemplate: cfg.PluginsCDNURLTemplate,
 			PluginSettings:        cfg.PluginSettings,
 		}),
-		SocialService: social.ProvideService(cfg, features, &usagestats.UsageStatsMock{}, supportbundlestest.NewFakeBundleService(), remotecache.NewFakeCacheStorage()),
+		namespacer:    request.GetNamespaceMapper(cfg),
+		SocialService: socialimpl.ProvideService(cfg, features, &usagestats.UsageStatsMock{}, supportbundlestest.NewFakeBundleService(), remotecache.NewFakeCacheStorage(), &ssosettingstests.MockService{}),
 	}
 
 	m := web.New()
 	m.Use(getContextHandler(t, cfg).Middleware)
-	m.UseMiddleware(web.Renderer(filepath.Join(setting.StaticRootPath, "views"), "[[", "]]"))
+	m.UseMiddleware(web.Renderer(filepath.Join("", "views"), "[[", "]]"))
 	m.Get("/api/frontend/settings/", hs.GetFrontendSettings)
 
 	return m, hs
@@ -107,7 +109,6 @@ func TestHTTPServer_GetFrontendSettings_hideVersionAnonymous(t *testing.T) {
 	// TODO: Remove
 	setting.BuildVersion = cfg.BuildVersion
 	setting.BuildCommit = cfg.BuildCommit
-	setting.Env = cfg.Env
 
 	tests := []struct {
 		desc        string
@@ -121,7 +122,7 @@ func TestHTTPServer_GetFrontendSettings_hideVersionAnonymous(t *testing.T) {
 				BuildInfo: buildInfo{
 					Version: setting.BuildVersion,
 					Commit:  setting.BuildCommit,
-					Env:     setting.Env,
+					Env:     cfg.Env,
 				},
 			},
 		},
@@ -132,7 +133,7 @@ func TestHTTPServer_GetFrontendSettings_hideVersionAnonymous(t *testing.T) {
 				BuildInfo: buildInfo{
 					Version: "",
 					Commit:  "",
-					Env:     setting.Env,
+					Env:     cfg.Env,
 				},
 			},
 		},
@@ -295,7 +296,7 @@ func TestHTTPServer_GetFrontendSettings_apps(t *testing.T) {
 								Type:    plugins.TypeApp,
 								Preload: true,
 							},
-							AngularDetected: true,
+							Angular: plugins.AngularMeta{Detected: true},
 						},
 					},
 				}
@@ -308,11 +309,11 @@ func TestHTTPServer_GetFrontendSettings_apps(t *testing.T) {
 			expected: settings{
 				Apps: map[string]*plugins.AppDTO{
 					"test-app": {
-						ID:              "test-app",
-						Preload:         true,
-						Path:            "/test-app/module.js",
-						Version:         "0.5.0",
-						AngularDetected: true,
+						ID:      "test-app",
+						Preload: true,
+						Path:    "/test-app/module.js",
+						Version: "0.5.0",
+						Angular: plugins.AngularMeta{Detected: true},
 					},
 				},
 			},
diff --git a/pkg/api/http_server.go b/pkg/api/http_server.go
index 4f3a9c04ef5a2..777d1e8dd3378 100644
--- a/pkg/api/http_server.go
+++ b/pkg/api/http_server.go
@@ -1,10 +1,17 @@
 package api
 
 import (
+	"bytes"
 	"context"
+	"crypto/rand"
+	"crypto/rsa"
 	"crypto/tls"
+	"crypto/x509"
+	"crypto/x509/pkix"
+	"encoding/pem"
 	"errors"
 	"fmt"
+	"math/big"
 	"net"
 	"net/http"
 	"os"
@@ -12,10 +19,15 @@ import (
 	"path/filepath"
 	"strings"
 	"sync"
+	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 
+	"github.com/grafana/grafana/pkg/services/anonymous"
+	grafanaapiserver "github.com/grafana/grafana/pkg/services/apiserver"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+
 	"github.com/grafana/grafana/pkg/api/avatar"
 	"github.com/grafana/grafana/pkg/api/routing"
 	httpstatic "github.com/grafana/grafana/pkg/api/static"
@@ -34,9 +46,7 @@ import (
 	"github.com/grafana/grafana/pkg/middleware/requestmeta"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/pluginscdn"
-	"github.com/grafana/grafana/pkg/registry/corekind"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/services/annotations"
 	"github.com/grafana/grafana/pkg/services/apikey"
 	"github.com/grafana/grafana/pkg/services/auth"
@@ -91,7 +101,6 @@ import (
 	starApi "github.com/grafana/grafana/pkg/services/star/api"
 	"github.com/grafana/grafana/pkg/services/stats"
 	"github.com/grafana/grafana/pkg/services/store"
-	"github.com/grafana/grafana/pkg/services/store/entity/httpentitystore"
 	"github.com/grafana/grafana/pkg/services/tag"
 	"github.com/grafana/grafana/pkg/services/team"
 	tempUser "github.com/grafana/grafana/pkg/services/temp_user"
@@ -116,7 +125,7 @@ type HTTPServer struct {
 	RouteRegister                routing.RouteRegister
 	RenderService                rendering.Service
 	Cfg                          *setting.Cfg
-	Features                     *featuremgmt.FeatureManager
+	Features                     featuremgmt.FeatureToggles
 	SettingsProvider             setting.Provider
 	HooksService                 *hooks.HooksService
 	navTreeService               navtree.Service
@@ -144,12 +153,10 @@ type HTTPServer struct {
 	Live                         *live.GrafanaLive
 	LivePushGateway              *pushhttp.Gateway
 	StorageService               store.StorageService
-	httpEntityStore              httpentitystore.HTTPEntityStore
 	SearchV2HTTPService          searchV2.SearchHTTPService
 	ContextHandler               *contexthandler.ContextHandler
 	LoggerMiddleware             loggermw.Logger
 	SQLStore                     db.DB
-	AlertEngine                  *alerting.AlertEngine
 	AlertNG                      *ngalert.AlertNG
 	LibraryPanelService          librarypanels.Service
 	LibraryElementService        libraryelements.Service
@@ -170,12 +177,11 @@ type HTTPServer struct {
 	queryDataService             query.Service
 	serviceAccountsService       serviceaccounts.Service
 	authInfoService              login.AuthInfoService
-	NotificationService          *notifications.NotificationService
+	NotificationService          notifications.Service
 	DashboardService             dashboards.DashboardService
 	dashboardProvisioningService dashboards.DashboardProvisioningService
 	folderService                folder.Service
 	dsGuardian                   guardian.DatasourceGuardianProvider
-	AlertNotificationService     *alerting.AlertNotificationService
 	dashboardsnapshotsService    dashboardsnapshots.Service
 	PluginSettings               pluginSettings.Service
 	AvatarCacheServer            *avatar.AvatarCacheServer
@@ -186,7 +192,6 @@ type HTTPServer struct {
 	dashboardVersionService      dashver.Service
 	PublicDashboardsApi          *publicdashboardsApi.Api
 	starService                  star.Service
-	Kinds                        *corekind.Base
 	playlistService              playlist.Service
 	apiKeyService                apikey.Service
 	kvStore                      kvstore.KVStore
@@ -205,6 +210,19 @@ type HTTPServer struct {
 	authnService         authn.Service
 	starApi              *starApi.API
 	promRegister         prometheus.Registerer
+	promGatherer         prometheus.Gatherer
+	clientConfigProvider grafanaapiserver.DirectRestConfigProvider
+	namespacer           request.NamespaceMapper
+	anonService          anonymous.Service
+	userVerifier         user.Verifier
+	tlsCerts             TLSCerts
+}
+
+type TLSCerts struct {
+	certLock  sync.RWMutex
+	certMtime time.Time
+	keyMtime  time.Time
+	certs     *tls.Certificate
 }
 
 type ServerOptions struct {
@@ -213,7 +231,7 @@ type ServerOptions struct {
 
 func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routing.RouteRegister, bus bus.Bus,
 	renderService rendering.Service, licensing licensing.Licensing, hooksService *hooks.HooksService,
-	cacheService *localcache.CacheService, sqlStore *sqlstore.SQLStore, alertEngine *alerting.AlertEngine,
+	cacheService *localcache.CacheService, sqlStore *sqlstore.SQLStore,
 	pluginRequestValidator validations.PluginRequestValidator, pluginStaticRouteResolver plugins.StaticRouteResolver,
 	pluginDashboardService plugindashboards.Service, pluginStore pluginstore.Store, pluginClient plugins.Client,
 	pluginErrorResolver plugins.ErrorResolver, pluginInstaller plugins.Installer, settingsProvider setting.Provider,
@@ -222,22 +240,22 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
 	correlationsService correlations.Service, remoteCache *remotecache.RemoteCache, provisioningService provisioning.ProvisioningService,
 	accessControl accesscontrol.AccessControl, dataSourceProxy *datasourceproxy.DataSourceProxyService, searchService *search.SearchService,
 	live *live.GrafanaLive, livePushGateway *pushhttp.Gateway, plugCtxProvider *plugincontext.Provider,
-	contextHandler *contexthandler.ContextHandler, loggerMiddleware loggermw.Logger, features *featuremgmt.FeatureManager,
+	contextHandler *contexthandler.ContextHandler, loggerMiddleware loggermw.Logger, features featuremgmt.FeatureToggles,
 	alertNG *ngalert.AlertNG, libraryPanelService librarypanels.Service, libraryElementService libraryelements.Service,
 	quotaService quota.Service, socialService social.Service, tracer tracing.Tracer,
 	encryptionService encryption.Internal, grafanaUpdateChecker *updatechecker.GrafanaService,
 	pluginsUpdateChecker *updatechecker.PluginsService, searchUsersService searchusers.Service,
 	dataSourcesService datasources.DataSourceService, queryDataService query.Service, pluginFileStore plugins.FileStore,
 	serviceaccountsService serviceaccounts.Service,
-	authInfoService login.AuthInfoService, storageService store.StorageService, httpEntityStore httpentitystore.HTTPEntityStore,
-	notificationService *notifications.NotificationService, dashboardService dashboards.DashboardService,
+	authInfoService login.AuthInfoService, storageService store.StorageService,
+	notificationService notifications.Service, dashboardService dashboards.DashboardService,
 	dashboardProvisioningService dashboards.DashboardProvisioningService, folderService folder.Service,
-	dsGuardian guardian.DatasourceGuardianProvider, alertNotificationService *alerting.AlertNotificationService,
+	dsGuardian guardian.DatasourceGuardianProvider,
 	dashboardsnapshotsService dashboardsnapshots.Service, pluginSettings pluginSettings.Service,
 	avatarCacheServer *avatar.AvatarCacheServer, preferenceService pref.Service,
 	folderPermissionsService accesscontrol.FolderPermissionsService,
 	dashboardPermissionsService accesscontrol.DashboardPermissionsService, dashboardVersionService dashver.Service,
-	starService star.Service, csrfService csrf.Service, basekinds *corekind.Base,
+	starService star.Service, csrfService csrf.Service,
 	playlistService playlist.Service, apiKeyService apikey.Service, kvStore kvstore.KVStore,
 	secretsMigrator secrets.Migrator, secretsPluginManager plugins.SecretsPluginManager, secretsService secrets.Service,
 	secretsPluginMigrator spm.SecretMigrationProvider, secretsStore secretsKV.SecretsKVStore,
@@ -245,9 +263,9 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
 	loginAttemptService loginAttempt.Service, orgService org.Service, teamService team.Service,
 	accesscontrolService accesscontrol.Service, navTreeService navtree.Service,
 	annotationRepo annotations.Repository, tagService tag.Service, searchv2HTTPService searchV2.SearchHTTPService, oauthTokenService oauthtoken.OAuthTokenService,
-	statsService stats.Service, authnService authn.Service, pluginsCDNService *pluginscdn.Service,
-	starApi *starApi.API, promRegister prometheus.Registerer,
-
+	statsService stats.Service, authnService authn.Service, pluginsCDNService *pluginscdn.Service, promGatherer prometheus.Gatherer,
+	starApi *starApi.API, promRegister prometheus.Registerer, clientConfigProvider grafanaapiserver.DirectRestConfigProvider, anonService anonymous.Service,
+	userVerifier user.Verifier,
 ) (*HTTPServer, error) {
 	web.Env = cfg.Env
 	m := web.New()
@@ -261,7 +279,6 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
 		HooksService:                 hooksService,
 		CacheService:                 cacheService,
 		SQLStore:                     sqlStore,
-		AlertEngine:                  alertEngine,
 		PluginRequestValidator:       pluginRequestValidator,
 		pluginInstaller:              pluginInstaller,
 		pluginClient:                 pluginClient,
@@ -279,7 +296,7 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
 		ShortURLService:              shortURLService,
 		QueryHistoryService:          queryHistoryService,
 		CorrelationsService:          correlationsService,
-		Features:                     features,
+		Features:                     features, // a read only view of the managers state
 		StorageService:               storageService,
 		RemoteCacheService:           remoteCache,
 		ProvisioningService:          provisioningService,
@@ -307,7 +324,6 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
 		secretsMigrator:              secretsMigrator,
 		secretsPluginMigrator:        secretsPluginMigrator,
 		secretsStore:                 secretsStore,
-		httpEntityStore:              httpEntityStore,
 		DataSourcesService:           dataSourcesService,
 		searchUsersService:           searchUsersService,
 		queryDataService:             queryDataService,
@@ -318,7 +334,6 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
 		dashboardProvisioningService: dashboardProvisioningService,
 		folderService:                folderService,
 		dsGuardian:                   dsGuardian,
-		AlertNotificationService:     alertNotificationService,
 		dashboardsnapshotsService:    dashboardsnapshotsService,
 		PluginSettings:               pluginSettings,
 		AvatarCacheServer:            avatarCacheServer,
@@ -328,7 +343,6 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
 		dashboardPermissionsService:  dashboardPermissionsService,
 		dashboardVersionService:      dashboardVersionService,
 		starService:                  starService,
-		Kinds:                        basekinds,
 		playlistService:              playlistService,
 		apiKeyService:                apiKeyService,
 		kvStore:                      kvStore,
@@ -348,6 +362,11 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
 		pluginsCDNService:            pluginsCDNService,
 		starApi:                      starApi,
 		promRegister:                 promRegister,
+		promGatherer:                 promGatherer,
+		clientConfigProvider:         clientConfigProvider,
+		namespacer:                   request.GetNamespaceMapper(cfg),
+		anonService:                  anonService,
+		userVerifier:                 userVerifier,
 	}
 	if hs.Listener != nil {
 		hs.log.Debug("Using provided listener")
@@ -355,7 +374,7 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
 	hs.registerRoutes()
 
 	// Register access control scope resolver for annotations
-	hs.AccessControl.RegisterScopeAttributeResolver(AnnotationTypeScopeResolver(hs.annotationsRepo))
+	hs.AccessControl.RegisterScopeAttributeResolver(AnnotationTypeScopeResolver(hs.annotationsRepo, features, dashboardService, folderService))
 
 	if err := hs.declareFixedRoles(); err != nil {
 		return nil, err
@@ -384,13 +403,18 @@ func (hs *HTTPServer) Run(ctx context.Context) error {
 		ReadTimeout: hs.Cfg.ReadTimeout,
 	}
 	switch hs.Cfg.Protocol {
-	case setting.HTTP2Scheme:
-		if err := hs.configureHttp2(); err != nil {
+	case setting.HTTP2Scheme, setting.HTTPSScheme:
+		if err := hs.configureTLS(); err != nil {
 			return err
 		}
-	case setting.HTTPSScheme:
-		if err := hs.configureHttps(); err != nil {
-			return err
+		if hs.Cfg.CertFile != "" && hs.Cfg.KeyFile != "" {
+			if hs.Cfg.CertWatchInterval > 0 {
+				hs.httpSrv.TLSConfig.GetCertificate = hs.GetCertificate
+				go hs.WatchAndUpdateCerts(ctx)
+				hs.log.Debug("HTTP Server certificates reload feature is enabled")
+			} else {
+				hs.log.Debug("HTTP Server certificates reload feature is NOT enabled")
+			}
 		}
 	default:
 	}
@@ -426,7 +450,7 @@ func (hs *HTTPServer) Run(ctx context.Context) error {
 			return err
 		}
 	case setting.HTTP2Scheme, setting.HTTPSScheme:
-		if err := hs.httpSrv.ServeTLS(listener, hs.Cfg.CertFile, hs.Cfg.KeyFile); err != nil {
+		if err := hs.httpSrv.ServeTLS(listener, "", ""); err != nil {
 			if errors.Is(err, http.ErrServerClosed) {
 				hs.log.Debug("server was shutdown gracefully")
 				return nil
@@ -479,83 +503,75 @@ func (hs *HTTPServer) getListener() (net.Listener, error) {
 	}
 }
 
-func (hs *HTTPServer) configureHttps() error {
-	if hs.Cfg.CertFile == "" {
-		return errors.New("cert_file cannot be empty when using HTTPS")
-	}
-
-	if hs.Cfg.KeyFile == "" {
-		return errors.New("cert_key cannot be empty when using HTTPS")
+func (hs *HTTPServer) selfSignedCert() ([]tls.Certificate, error) {
+	template := &x509.Certificate{
+		IsCA:                  true,
+		BasicConstraintsValid: true,
+		SubjectKeyId:          []byte{1},
+		SerialNumber:          big.NewInt(1),
+		Subject: pkix.Name{
+			CommonName: hs.Cfg.Domain,
+		},
+		NotBefore: time.Now(),
+		NotAfter:  time.Now().AddDate(1, 0, 0),
+		// see http://golang.org/pkg/crypto/x509/#KeyUsage
+		ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth},
+		KeyUsage:    x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
 	}
 
-	if _, err := os.Stat(hs.Cfg.CertFile); os.IsNotExist(err) {
-		return fmt.Errorf(`cannot find SSL cert_file at %q`, hs.Cfg.CertFile)
+	// generate private key
+	privatekey, err := rsa.GenerateKey(rand.Reader, 4096)
+	if err != nil {
+		return nil, fmt.Errorf("error generating tls private key: %w", err)
 	}
 
-	if _, err := os.Stat(hs.Cfg.KeyFile); os.IsNotExist(err) {
-		return fmt.Errorf(`cannot find SSL key_file at %q`, hs.Cfg.KeyFile)
-	}
+	publickey := &privatekey.PublicKey
 
-	minTlsVersion, err := util.TlsNameToVersion(hs.Cfg.MinTLSVersion)
+	// create a self-signed certificate
+	var parent = template
+	certBytes, err := x509.CreateCertificate(rand.Reader, template, parent, publickey, privatekey)
 	if err != nil {
-		return err
+		return nil, fmt.Errorf("error generating tls self-signed certificate: %w", err)
 	}
 
-	tlsCiphers := hs.getDefaultCiphers(minTlsVersion, string(setting.HTTPSScheme))
-	if err != nil {
-		return err
-	}
+	// encode certificate and private key to PEM
+	certPEM := new(bytes.Buffer)
+	_ = pem.Encode(certPEM, &pem.Block{
+		Type:  "CERTIFICATE",
+		Bytes: certBytes,
+	})
 
-	hs.log.Info("HTTP Server TLS settings", "Min TLS Version", hs.Cfg.MinTLSVersion,
-		"configured ciphers", util.TlsCipherIdsToString(tlsCiphers))
+	certPrivKeyPEM := new(bytes.Buffer)
+	_ = pem.Encode(certPrivKeyPEM, &pem.Block{
+		Type:  "RSA PRIVATE KEY",
+		Bytes: x509.MarshalPKCS1PrivateKey(privatekey),
+	})
 
-	tlsCfg := &tls.Config{
-		MinVersion:   minTlsVersion,
-		CipherSuites: tlsCiphers,
+	// create tlsCertificate from generated certificate and private key
+	tlsCert, err := tls.X509KeyPair(certPEM.Bytes(), certPrivKeyPEM.Bytes())
+	if err != nil {
+		return nil, fmt.Errorf("error creating tls self-signed certificate: %w", err)
 	}
 
-	hs.httpSrv.TLSConfig = tlsCfg
-	hs.httpSrv.TLSNextProto = make(map[string]func(*http.Server, *tls.Conn, http.Handler))
-
-	return nil
+	return []tls.Certificate{tlsCert}, nil
 }
 
-func (hs *HTTPServer) configureHttp2() error {
-	if hs.Cfg.CertFile == "" {
-		return errors.New("cert_file cannot be empty when using HTTP2")
-	}
-
-	if hs.Cfg.KeyFile == "" {
-		return errors.New("cert_key cannot be empty when using HTTP2")
+func (hs *HTTPServer) tlsCertificates() ([]tls.Certificate, error) {
+	// if we don't have either a cert or key specified, generate a self-signed certificate
+	if hs.Cfg.CertFile == "" && hs.Cfg.KeyFile == "" {
+		return hs.selfSignedCert()
 	}
 
-	if _, err := os.Stat(hs.Cfg.CertFile); os.IsNotExist(err) {
-		return fmt.Errorf("cannot find SSL cert_file at %q", hs.Cfg.CertFile)
-	}
-
-	if _, err := os.Stat(hs.Cfg.KeyFile); os.IsNotExist(err) {
-		return fmt.Errorf("cannot find SSL key_file at %q", hs.Cfg.KeyFile)
-	}
-
-	minTlsVersion, err := util.TlsNameToVersion(hs.Cfg.MinTLSVersion)
+	tlsCert, err := hs.readCertificates()
 	if err != nil {
-		return err
+		return nil, err
 	}
+	hs.tlsCerts.certs = tlsCert
 
-	tlsCiphers := hs.getDefaultCiphers(minTlsVersion, string(setting.HTTP2Scheme))
-
-	hs.log.Info("HTTP Server TLS settings", "Min TLS Version", hs.Cfg.MinTLSVersion,
-		"configured ciphers", util.TlsCipherIdsToString(tlsCiphers))
-
-	tlsCfg := &tls.Config{
-		MinVersion:   minTlsVersion,
-		CipherSuites: tlsCiphers,
-		NextProtos:   []string{"h2", "http/1.1"},
+	if err := hs.updateMtimeOfServerCerts(); err != nil {
+		return nil, err
 	}
-
-	hs.httpSrv.TLSConfig = tlsCfg
-
-	return nil
+	return []tls.Certificate{*tlsCert}, nil
 }
 
 func (hs *HTTPServer) applyRoutes() {
@@ -580,7 +596,7 @@ func (hs *HTTPServer) addMiddlewaresAndStaticRoutes() {
 		m.UseMiddleware(middleware.Gziper())
 	}
 
-	m.UseMiddleware(middleware.Recovery(hs.Cfg))
+	m.UseMiddleware(middleware.Recovery(hs.Cfg, hs.License))
 	m.UseMiddleware(hs.Csrf.Middleware())
 
 	hs.mapStatic(m, hs.Cfg.StaticRootPath, "build", "public/build")
@@ -646,7 +662,7 @@ func (hs *HTTPServer) metricsEndpoint(ctx *web.Context) {
 	}
 
 	promhttp.
-		HandlerFor(prometheus.DefaultGatherer, promhttp.HandlerOpts{EnableOpenMetrics: true}).
+		HandlerFor(hs.promGatherer, promhttp.HandlerOpts{EnableOpenMetrics: true}).
 		ServeHTTP(ctx.Resp, ctx.Req)
 }
 
@@ -768,3 +784,141 @@ func (hs *HTTPServer) getDefaultCiphers(tlsVersion uint16, protocol string) []ui
 	}
 	return nil
 }
+
+func (hs *HTTPServer) readCertificates() (*tls.Certificate, error) {
+	if hs.Cfg.CertFile == "" {
+		return nil, errors.New("cert_file cannot be empty when using HTTPS")
+	}
+
+	if hs.Cfg.KeyFile == "" {
+		return nil, errors.New("cert_key cannot be empty when using HTTPS")
+	}
+
+	if _, err := os.Stat(hs.Cfg.CertFile); os.IsNotExist(err) {
+		return nil, fmt.Errorf(`cannot find SSL cert_file at %q`, hs.Cfg.CertFile)
+	}
+
+	if _, err := os.Stat(hs.Cfg.KeyFile); os.IsNotExist(err) {
+		return nil, fmt.Errorf(`cannot find SSL key_file at %q`, hs.Cfg.KeyFile)
+	}
+
+	tlsCert, err := tls.LoadX509KeyPair(hs.Cfg.CertFile, hs.Cfg.KeyFile)
+	if err != nil {
+		return nil, fmt.Errorf("could not load SSL certificate: %w", err)
+	}
+	return &tlsCert, nil
+}
+
+func (hs *HTTPServer) configureTLS() error {
+	tlsCerts, err := hs.tlsCertificates()
+	if err != nil {
+		return err
+	}
+
+	minTlsVersion, err := util.TlsNameToVersion(hs.Cfg.MinTLSVersion)
+	if err != nil {
+		return err
+	}
+
+	tlsCiphers := hs.getDefaultCiphers(minTlsVersion, string(hs.Cfg.Protocol))
+
+	hs.log.Info("HTTP Server TLS settings", "scheme", hs.Cfg.Protocol, "Min TLS Version", hs.Cfg.MinTLSVersion,
+		"configured ciphers", util.TlsCipherIdsToString(tlsCiphers))
+
+	tlsCfg := &tls.Config{
+		Certificates: tlsCerts,
+		MinVersion:   minTlsVersion,
+		CipherSuites: tlsCiphers,
+	}
+
+	hs.httpSrv.TLSConfig = tlsCfg
+
+	if hs.Cfg.Protocol == setting.HTTP2Scheme {
+		hs.httpSrv.TLSConfig.NextProtos = []string{"h2", "http/1.1"}
+	}
+
+	if hs.Cfg.Protocol == setting.HTTPSScheme {
+		hs.httpSrv.TLSNextProto = make(map[string]func(*http.Server, *tls.Conn, http.Handler))
+	}
+
+	return nil
+}
+
+func (hs *HTTPServer) GetCertificate(*tls.ClientHelloInfo) (*tls.Certificate, error) {
+	hs.tlsCerts.certLock.RLock()
+	defer hs.tlsCerts.certLock.RUnlock()
+
+	tlsCerts := hs.tlsCerts.certs
+	return tlsCerts, nil
+}
+
+// fsnotify module can be used to detect file changes and based on the event certs can be reloaded
+// since it adds a direct dependency for the optional feature. So that is the reason periodic watching
+// of cert files is chosen. If fsnotify is added as direct dependency in future, then the implementation
+// can be revisited to align to fsnotify.
+func (hs *HTTPServer) WatchAndUpdateCerts(ctx context.Context) {
+	ticker := time.NewTicker(hs.Cfg.CertWatchInterval)
+
+	for {
+		select {
+		case <-ticker.C:
+			if err := hs.updateCerts(); err != nil {
+				hs.log.Error("Not able to reload certificates", "error", err)
+			}
+		case <-ctx.Done():
+			hs.log.Debug("Stopping the CertWatchInterval ticker")
+			ticker.Stop()
+			return
+		}
+	}
+}
+
+func (hs *HTTPServer) updateCerts() error {
+	tlsInfo := &hs.tlsCerts
+	cMtime, err := getMtime(hs.Cfg.CertFile)
+	if err != nil {
+		return err
+	}
+	kMtime, err := getMtime(hs.Cfg.KeyFile)
+	if err != nil {
+		return err
+	}
+
+	if cMtime.Compare(tlsInfo.certMtime) != 0 || kMtime.Compare(tlsInfo.keyMtime) != 0 {
+		certs, err := hs.readCertificates()
+		if err != nil {
+			return err
+		}
+		tlsInfo.certLock.Lock()
+		defer tlsInfo.certLock.Unlock()
+
+		tlsInfo.certs = certs
+		tlsInfo.certMtime = cMtime
+		tlsInfo.keyMtime = kMtime
+		hs.log.Info("Server certificates updated", "cMtime", tlsInfo.certMtime, "kMtime", tlsInfo.keyMtime)
+	}
+	return nil
+}
+
+func getMtime(name string) (time.Time, error) {
+	fInfo, err := os.Stat(name)
+	if err != nil {
+		return time.Time{}, err
+	}
+	return fInfo.ModTime(), nil
+}
+
+func (hs *HTTPServer) updateMtimeOfServerCerts() error {
+	var err error
+	hs.tlsCerts.certMtime, err = getMtime(hs.Cfg.CertFile)
+	if err != nil {
+		return err
+	}
+
+	hs.tlsCerts.keyMtime, err = getMtime(hs.Cfg.KeyFile)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/pkg/api/http_server_test.go b/pkg/api/http_server_test.go
index 5cb99004bef7b..6f827934577ce 100644
--- a/pkg/api/http_server_test.go
+++ b/pkg/api/http_server_test.go
@@ -27,3 +27,13 @@ func TestHTTPServer_MetricsBasicAuth(t *testing.T) {
 		assert.False(t, ts.metricsEndpointBasicAuthEnabled())
 	})
 }
+
+func TestHTTPServer_readCertificates(t *testing.T) {
+	ts := &HTTPServer{
+		Cfg: setting.NewCfg(),
+	}
+	t.Run("ReadCertificates should return error when cert files are not configured", func(t *testing.T) {
+		_, err := ts.readCertificates()
+		assert.NotNil(t, err)
+	})
+}
diff --git a/pkg/api/index.go b/pkg/api/index.go
index db692c272f69f..30e417a0eed0d 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -1,7 +1,6 @@
 package api
 
 import (
-	"context"
 	"crypto/hmac"
 	"crypto/sha256"
 	"encoding/hex"
@@ -11,6 +10,7 @@ import (
 	"strings"
 
 	"github.com/grafana/grafana/pkg/api/dtos"
+	"github.com/grafana/grafana/pkg/api/webassets"
 	"github.com/grafana/grafana/pkg/middleware"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
@@ -38,7 +38,7 @@ func (hs *HTTPServer) setIndexViewData(c *contextmodel.ReqContext) (*dtos.IndexV
 		return nil, err
 	}
 
-	if hs.Features.IsEnabled(featuremgmt.FlagIndividualCookiePreferences) {
+	if hs.Features.IsEnabled(c.Req.Context(), featuremgmt.FlagIndividualCookiePreferences) {
 		if !prefs.Cookies("analytics") {
 			settings.GoogleAnalytics4Id = ""
 			settings.GoogleAnalyticsId = ""
@@ -60,7 +60,7 @@ func (hs *HTTPServer) setIndexViewData(c *contextmodel.ReqContext) (*dtos.IndexV
 		locale = parts[0]
 	}
 
-	appURL := setting.AppUrl
+	appURL := hs.Cfg.AppURL
 	appSubURL := hs.Cfg.AppSubURL
 
 	// special case when doing localhost call from image renderer
@@ -81,15 +81,9 @@ func (hs *HTTPServer) setIndexViewData(c *contextmodel.ReqContext) (*dtos.IndexV
 	}
 
 	theme := hs.getThemeForIndexData(prefs.Theme, c.Query("theme"))
-
-	userOrgCount := 1
-	userOrgs, err := hs.orgService.GetUserOrgList(c.Req.Context(), &org.GetUserOrgListQuery{UserID: userID})
+	assets, err := webassets.GetWebAssets(c.Req.Context(), hs.Cfg, hs.License)
 	if err != nil {
-		hs.log.Error("Failed to count user orgs", "error", err)
-	}
-
-	if len(userOrgs) > 0 {
-		userOrgCount = len(userOrgs)
+		return nil, err
 	}
 
 	hasAccess := ac.HasAccess(hs.AccessControl, c)
@@ -98,6 +92,7 @@ func (hs *HTTPServer) setIndexViewData(c *contextmodel.ReqContext) (*dtos.IndexV
 	data := dtos.IndexViewData{
 		User: &dtos.CurrentUser{
 			Id:                         userID,
+			UID:                        c.UserUID, // << not set yet
 			IsSignedIn:                 c.IsSignedIn,
 			Login:                      c.Login,
 			Email:                      c.SignedInUser.GetEmail(),
@@ -105,8 +100,8 @@ func (hs *HTTPServer) setIndexViewData(c *contextmodel.ReqContext) (*dtos.IndexV
 			OrgId:                      c.SignedInUser.GetOrgID(),
 			OrgName:                    c.OrgName,
 			OrgRole:                    c.SignedInUser.GetOrgRole(),
-			OrgCount:                   userOrgCount,
-			GravatarUrl:                dtos.GetGravatarUrl(c.SignedInUser.GetEmail()),
+			OrgCount:                   hs.getUserOrgCount(c, userID),
+			GravatarUrl:                dtos.GetGravatarUrl(hs.Cfg, c.SignedInUser.GetEmail()),
 			IsGrafanaAdmin:             c.IsGrafanaAdmin,
 			Theme:                      theme.ID,
 			LightTheme:                 theme.Type == "light",
@@ -116,14 +111,15 @@ func (hs *HTTPServer) setIndexViewData(c *contextmodel.ReqContext) (*dtos.IndexV
 			Language:                   language,
 			HelpFlags1:                 c.HelpFlags1,
 			HasEditPermissionInFolders: hasEditPerm,
-			Analytics:                  hs.buildUserAnalyticsSettings(c.Req.Context(), c.SignedInUser),
-			AuthenticatedBy:            c.SignedInUser.AuthenticatedBy,
+			Analytics:                  hs.buildUserAnalyticsSettings(c),
+			AuthenticatedBy:            hs.getUserAuthenticatedBy(c, userID),
 		},
+		// Psiphon change - change icons to Psiphon logo and update AppTitle to Psiphon
 		Settings:                            settings,
 		ThemeType:                           theme.Type,
 		AppUrl:                              appURL,
 		AppSubUrl:                           appSubURL,
-		NewsFeedEnabled:                     setting.NewsFeedEnabled,
+		NewsFeedEnabled:                     hs.Cfg.NewsFeedEnabled,
 		GoogleAnalyticsId:                   settings.GoogleAnalyticsId,
 		GoogleAnalytics4Id:                  settings.GoogleAnalytics4Id,
 		GoogleAnalytics4SendManualPageViews: hs.Cfg.GoogleAnalytics4SendManualPageViews,
@@ -134,21 +130,20 @@ func (hs *HTTPServer) setIndexViewData(c *contextmodel.ReqContext) (*dtos.IndexV
 		NewGrafanaVersionExists:             hs.grafanaUpdateChecker.UpdateAvailable(),
 		AppName:                             setting.ApplicationName,
 		AppNameBodyClass:                    "app-grafana",
-		FavIcon:                             "public/img/fav32.png",
-		AppleTouchIcon:                      "public/img/apple-touch-icon.png",
-		AppTitle:                            "Grafana",
+		FavIcon:                             "public/img/psiphonlogo.png",
+		AppleTouchIcon:                      "public/img/psiphonlogo.png",
+		AppTitle:                            "Psiphon",
 		NavTree:                             navTree,
 		Nonce:                               c.RequestNonce,
-		ContentDeliveryURL:                  hs.Cfg.GetContentDeliveryURL(hs.License.ContentDeliveryPrefix()),
 		LoadingLogo:                         "public/img/grafana_icon.svg",
 		IsDevelopmentEnv:                    hs.Cfg.Env == setting.Dev,
+		Assets:                              assets,
 	}
 
 	if hs.Cfg.CSPEnabled {
 		data.CSPEnabled = true
 		data.CSPContent = middleware.ReplacePolicyVariables(hs.Cfg.CSPTemplate, appURL, c.RequestNonce)
 	}
-
 	userPermissions, err := hs.accesscontrolService.GetUserPermissions(c.Req.Context(), c.SignedInUser, ac.Options{ReloadCache: false})
 	if err != nil {
 		return nil, err
@@ -156,7 +151,7 @@ func (hs *HTTPServer) setIndexViewData(c *contextmodel.ReqContext) (*dtos.IndexV
 
 	data.User.Permissions = ac.BuildPermissionsMap(userPermissions)
 
-	if setting.DisableGravatar {
+	if hs.Cfg.DisableGravatar {
 		data.User.GravatarUrl = hs.Cfg.AppSubURL + "/public/img/user_profile.png"
 	}
 
@@ -166,28 +161,34 @@ func (hs *HTTPServer) setIndexViewData(c *contextmodel.ReqContext) (*dtos.IndexV
 
 	hs.HooksService.RunIndexDataHooks(&data, c)
 
-	data.NavTree.ApplyAdminIA(hs.Cfg.IsFeatureToggleEnabled(featuremgmt.FlagNavAdminSubsections))
+	data.NavTree.ApplyAdminIA()
+	data.NavTree.ApplyHelpVersion(data.Settings.BuildInfo.VersionString) // RunIndexDataHooks can modify the version string
 	data.NavTree.Sort()
 
 	return &data, nil
 }
 
-func (hs *HTTPServer) buildUserAnalyticsSettings(ctx context.Context, signedInUser identity.Requester) dtos.AnalyticsSettings {
-	namespace, id := signedInUser.GetNamespacedID()
+func (hs *HTTPServer) buildUserAnalyticsSettings(c *contextmodel.ReqContext) dtos.AnalyticsSettings {
+	namespace, id := c.SignedInUser.GetNamespacedID()
+
 	// Anonymous users do not have an email or auth info
 	if namespace != identity.NamespaceUser {
-		return dtos.AnalyticsSettings{Identifier: "@" + setting.AppUrl}
+		return dtos.AnalyticsSettings{Identifier: "@" + hs.Cfg.AppURL}
+	}
+
+	if !c.IsSignedIn {
+		return dtos.AnalyticsSettings{}
 	}
 
 	userID, err := identity.IntIdentifier(namespace, id)
 	if err != nil {
 		hs.log.Error("Failed to parse user ID", "error", err)
-		return dtos.AnalyticsSettings{Identifier: "@" + setting.AppUrl}
+		return dtos.AnalyticsSettings{Identifier: "@" + hs.Cfg.AppURL}
 	}
 
-	identifier := signedInUser.GetEmail() + "@" + setting.AppUrl
+	identifier := c.SignedInUser.GetEmail() + "@" + hs.Cfg.AppURL
 
-	authInfo, err := hs.authInfoService.GetAuthInfo(ctx, &login.GetAuthInfoQuery{UserId: userID})
+	authInfo, err := hs.authInfoService.GetAuthInfo(c.Req.Context(), &login.GetAuthInfoQuery{UserId: userID})
 	if err != nil && !errors.Is(err, user.ErrUserNotFound) {
 		hs.log.Error("Failed to get auth info for analytics", "error", err)
 	}
@@ -202,6 +203,46 @@ func (hs *HTTPServer) buildUserAnalyticsSettings(ctx context.Context, signedInUs
 	}
 }
 
+func (hs *HTTPServer) getUserOrgCount(c *contextmodel.ReqContext, userID int64) int {
+	if userID == 0 {
+		return 1
+	}
+
+	userOrgs, err := hs.orgService.GetUserOrgList(c.Req.Context(), &org.GetUserOrgListQuery{UserID: userID})
+	if err != nil {
+		hs.log.FromContext(c.Req.Context()).Error("Failed to count user orgs", "userId", userID, "error", err)
+		return 1
+	}
+
+	return len(userOrgs)
+}
+
+// getUserAuthenticatedBy returns external authentication method used for user.
+// If user does not have an external authentication method an empty string is returned
+func (hs *HTTPServer) getUserAuthenticatedBy(c *contextmodel.ReqContext, userID int64) string {
+	if userID == 0 {
+		return ""
+	}
+
+	// Special case for image renderer. Frontend relies on this information
+	// to render dashboards in a bit different way.
+	if c.IsRenderCall {
+		return login.RenderModule
+	}
+
+	info, err := hs.authInfoService.GetAuthInfo(c.Req.Context(), &login.GetAuthInfoQuery{UserId: userID})
+	// we ignore errors where a user does not have external user auth
+	if err != nil && !errors.Is(err, user.ErrUserNotFound) {
+		hs.log.FromContext(c.Req.Context()).Error("Failed to fetch auth info", "userId", c.SignedInUser.UserID, "error", err)
+	}
+
+	if err != nil {
+		return ""
+	}
+
+	return info.AuthModule
+}
+
 func hashUserIdentifier(identifier string, secret string) string {
 	if secret == "" {
 		return ""
@@ -216,7 +257,7 @@ func hashUserIdentifier(identifier string, secret string) string {
 func (hs *HTTPServer) Index(c *contextmodel.ReqContext) {
 	data, err := hs.setIndexViewData(c)
 	if err != nil {
-		c.Handle(hs.Cfg, 500, "Failed to get settings", err)
+		c.Handle(hs.Cfg, http.StatusInternalServerError, "Failed to get settings", err)
 		return
 	}
 	c.HTML(http.StatusOK, "index", data)
@@ -224,17 +265,17 @@ func (hs *HTTPServer) Index(c *contextmodel.ReqContext) {
 
 func (hs *HTTPServer) NotFoundHandler(c *contextmodel.ReqContext) {
 	if c.IsApiRequest() {
-		c.JsonApiErr(404, "Not found", nil)
+		c.JsonApiErr(http.StatusNotFound, "Not found", nil)
 		return
 	}
 
 	data, err := hs.setIndexViewData(c)
 	if err != nil {
-		c.Handle(hs.Cfg, 500, "Failed to get settings", err)
+		c.Handle(hs.Cfg, http.StatusInternalServerError, "Failed to get settings", err)
 		return
 	}
 
-	c.HTML(404, "index", data)
+	c.HTML(http.StatusNotFound, "index", data)
 }
 
 func (hs *HTTPServer) getThemeForIndexData(themePrefId string, themeURLParam string) *pref.ThemeDTO {
@@ -244,7 +285,7 @@ func (hs *HTTPServer) getThemeForIndexData(themePrefId string, themeURLParam str
 
 	if pref.IsValidThemeID(themePrefId) {
 		theme := pref.GetThemeByID(themePrefId)
-		if !theme.IsExtra || hs.Features.IsEnabled(featuremgmt.FlagExtraThemes) {
+		if !theme.IsExtra || hs.Features.IsEnabledGlobally(featuremgmt.FlagExtraThemes) {
 			return theme
 		}
 	}
diff --git a/pkg/api/login.go b/pkg/api/login.go
index 81728e3f9b68d..697ebfdd65a07 100644
--- a/pkg/api/login.go
+++ b/pkg/api/login.go
@@ -12,6 +12,7 @@ import (
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/infra/network"
+	"github.com/grafana/grafana/pkg/login/social"
 	"github.com/grafana/grafana/pkg/middleware/cookies"
 	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
@@ -29,8 +30,6 @@ import (
 const (
 	viewIndex            = "index"
 	loginErrorCookieName = "login_error"
-	// #nosec G101 - this is not a hardcoded secret
-	postLogoutRedirectParam = "post_logout_redirect_uri"
 )
 
 var setIndexViewData = (*HTTPServer).setIndexViewData
@@ -91,16 +90,14 @@ func (hs *HTTPServer) CookieOptionsFromCfg() cookies.CookieOptions {
 }
 
 func (hs *HTTPServer) LoginView(c *contextmodel.ReqContext) {
-	if hs.Features.IsEnabled(featuremgmt.FlagClientTokenRotation) {
-		if errors.Is(c.LookupTokenErr, authn.ErrTokenNeedsRotation) {
-			c.Redirect(hs.Cfg.AppSubURL + "/")
-			return
-		}
+	if errors.Is(c.LookupTokenErr, authn.ErrTokenNeedsRotation) {
+		c.Redirect(hs.Cfg.AppSubURL + "/")
+		return
 	}
 
 	viewData, err := setIndexViewData(hs, c)
 	if err != nil {
-		c.Handle(hs.Cfg, 500, "Failed to get settings", err)
+		c.Handle(hs.Cfg, http.StatusInternalServerError, "Failed to get settings", err)
 		return
 	}
 
@@ -129,7 +126,10 @@ func (hs *HTTPServer) LoginView(c *contextmodel.ReqContext) {
 
 	if c.IsSignedIn {
 		// Assign login token to auth proxy users if enable_login_token = true
-		if hs.Cfg.AuthProxyEnabled && hs.Cfg.AuthProxyEnableLoginToken {
+		// LDAP users authenticated by auth proxy are also assigned login token but their auth module is LDAP
+		if hs.Cfg.AuthProxy.Enabled &&
+			hs.Cfg.AuthProxy.EnableLoginToken &&
+			c.SignedInUser.IsAuthenticatedBy(loginservice.AuthProxyAuthModule, loginservice.LDAPAuthModule) {
 			user := &user.User{ID: c.SignedInUser.UserID, Email: c.SignedInUser.Email, Login: c.SignedInUser.Login}
 			err := hs.loginUserWithUser(user, c)
 			if err != nil {
@@ -198,7 +198,7 @@ func (hs *HTTPServer) LoginAPIPing(c *contextmodel.ReqContext) response.Response
 		return response.JSON(http.StatusOK, util.DynMap{"message": "Logged in"})
 	}
 
-	return response.Error(401, "Unauthorized", nil)
+	return response.Error(http.StatusUnauthorized, "Unauthorized", nil)
 }
 
 func (hs *HTTPServer) LoginPost(c *contextmodel.ReqContext) response.Response {
@@ -241,58 +241,32 @@ func (hs *HTTPServer) loginUserWithUser(user *user.User, c *contextmodel.ReqCont
 }
 
 func (hs *HTTPServer) Logout(c *contextmodel.ReqContext) {
-	userID, errID := identity.UserIdentifier(c.SignedInUser.GetNamespacedID())
-	if errID != nil {
-		hs.log.Error("failed to retrieve user ID", "error", errID)
-	}
-
-	// If SAML is enabled and this is a SAML user use saml logout
+	// FIXME: restructure saml client to implement authn.LogoutClient
 	if hs.samlSingleLogoutEnabled() {
-		getAuthQuery := loginservice.GetAuthInfoQuery{UserId: userID}
-		if authInfo, err := hs.authInfoService.GetAuthInfo(c.Req.Context(), &getAuthQuery); err == nil {
-			if authInfo.AuthModule == loginservice.SAMLAuthModule {
-				c.Redirect(hs.Cfg.AppSubURL + "/logout/saml")
-				return
-			}
-		}
-	}
-
-	idTokenHint := ""
-	oidcLogout := isPostLogoutRedirectConfigured(hs.Cfg.SignoutRedirectUrl)
-
-	// Invalidate the OAuth tokens in case the User logged in with OAuth or the last external AuthEntry is an OAuth one
-	if entry, exists, _ := hs.oauthTokenService.HasOAuthEntry(c.Req.Context(), c.SignedInUser); exists {
-		token := hs.oauthTokenService.GetCurrentOAuthToken(c.Req.Context(), c.SignedInUser)
-		if oidcLogout {
-			if token.Valid() {
-				idTokenHint = token.Extra("id_token").(string)
-			} else {
-				hs.log.Warn("Token is not valid")
-			}
+		id, err := identity.UserIdentifier(c.SignedInUser.GetNamespacedID())
+		if err != nil {
+			hs.log.Error("failed to retrieve user ID", "error", err)
 		}
 
-		if err := hs.oauthTokenService.InvalidateOAuthTokens(c.Req.Context(), entry); err != nil {
-			hs.log.Warn("failed to invalidate oauth tokens for user", "userId", userID, "error", err)
+		authInfo, _ := hs.authInfoService.GetAuthInfo(c.Req.Context(), &loginservice.GetAuthInfoQuery{UserId: id})
+		if authInfo != nil && authInfo.AuthModule == loginservice.SAMLAuthModule {
+			c.Redirect(hs.Cfg.AppSubURL + "/logout/saml")
+			return
 		}
 	}
 
-	err := hs.AuthTokenService.RevokeToken(c.Req.Context(), c.UserToken, false)
-	if err != nil && !errors.Is(err, auth.ErrUserTokenNotFound) {
-		hs.log.Error("failed to revoke auth token", "error", err)
-	}
-
+	redirect, err := hs.authnService.Logout(c.Req.Context(), c.SignedInUser, c.UserToken)
 	authn.DeleteSessionCookie(c.Resp, hs.Cfg)
 
-	rdUrl := hs.Cfg.SignoutRedirectUrl
-	if rdUrl != "" {
-		if oidcLogout {
-			rdUrl = getPostRedirectUrl(hs.Cfg.SignoutRedirectUrl, idTokenHint)
-		}
-		c.Redirect(rdUrl)
-	} else {
-		hs.log.Info("Successful Logout", "User", c.SignedInUser.GetEmail())
+	if err != nil {
+		hs.log.Error("Failed perform proper logout", "error", err)
 		c.Redirect(hs.Cfg.AppSubURL + "/login")
+		return
 	}
+
+	_, id := c.SignedInUser.GetNamespacedID()
+	hs.log.Info("Successful Logout", "userID", id)
+	c.Redirect(redirect.URL)
 }
 
 func (hs *HTTPServer) tryGetEncryptedCookie(ctx *contextmodel.ReqContext, cookieName string) (string, bool) {
@@ -316,7 +290,7 @@ func (hs *HTTPServer) trySetEncryptedCookie(ctx *contextmodel.ReqContext, cookie
 		return err
 	}
 
-	cookies.WriteCookie(ctx.Resp, cookieName, hex.EncodeToString(encryptedError), 60, hs.CookieOptionsFromCfg)
+	cookies.WriteCookie(ctx.Resp, cookieName, hex.EncodeToString(encryptedError), maxAge, hs.CookieOptionsFromCfg)
 
 	return nil
 }
@@ -334,7 +308,7 @@ func (hs *HTTPServer) RedirectResponseWithError(c *contextmodel.ReqContext, err
 
 func (hs *HTTPServer) redirectURLWithErrorCookie(c *contextmodel.ReqContext, err error) string {
 	setCookie := true
-	if hs.Features.IsEnabled(featuremgmt.FlagIndividualCookiePreferences) {
+	if hs.Features.IsEnabled(c.Req.Context(), featuremgmt.FlagIndividualCookiePreferences) {
 		var userID int64
 		if c.SignedInUser != nil && !c.SignedInUser.IsNil() {
 			var errID error
@@ -362,7 +336,7 @@ func (hs *HTTPServer) redirectURLWithErrorCookie(c *contextmodel.ReqContext, err
 }
 
 func (hs *HTTPServer) samlEnabled() bool {
-	return hs.SettingsProvider.KeyValue("auth.saml", "enabled").MustBool(false) && hs.License.FeatureEnabled("saml")
+	return hs.SettingsProvider.KeyValue("auth.saml", "enabled").MustBool(false) && hs.License.FeatureEnabled(social.SAMLProviderName)
 }
 
 func (hs *HTTPServer) samlName() string {
@@ -406,38 +380,3 @@ func getFirstPublicErrorMessage(err *errutil.Error) string {
 
 	return errPublic.Message
 }
-
-func isPostLogoutRedirectConfigured(redirectUrl string) bool {
-	if redirectUrl == "" {
-		return false
-	}
-
-	u, err := url.Parse(redirectUrl)
-	if err != nil {
-		return false
-	}
-
-	q := u.Query()
-	_, ok := q[postLogoutRedirectParam]
-	return ok
-}
-
-func getPostRedirectUrl(rdUrl string, tokenHint string) string {
-	if tokenHint == "" {
-		return rdUrl
-	}
-	if rdUrl == "" {
-		return rdUrl
-	}
-
-	u, err := url.Parse(rdUrl)
-	if err != nil {
-		return rdUrl
-	}
-
-	q := u.Query()
-	q.Set("id_token_hint", tokenHint)
-	u.RawQuery = q.Encode()
-
-	return u.String()
-}
diff --git a/pkg/api/login_test.go b/pkg/api/login_test.go
index de63dfdbe284c..2b0ef5df7c3ff 100644
--- a/pkg/api/login_test.go
+++ b/pkg/api/login_test.go
@@ -29,6 +29,9 @@ import (
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/hooks"
 	"github.com/grafana/grafana/pkg/services/licensing"
+	"github.com/grafana/grafana/pkg/services/licensing/licensingtest"
+	loginservice "github.com/grafana/grafana/pkg/services/login"
+	"github.com/grafana/grafana/pkg/services/login/authinfotest"
 	"github.com/grafana/grafana/pkg/services/navtree"
 	"github.com/grafana/grafana/pkg/services/secrets"
 	"github.com/grafana/grafana/pkg/services/secrets/fakes"
@@ -49,6 +52,11 @@ func fakeSetIndexViewData(t *testing.T) {
 			User:     &dtos.CurrentUser{},
 			Settings: &dtos.FrontendSettingsDTO{},
 			NavTree:  &navtree.NavTreeRoot{},
+			Assets: &dtos.EntryPointAssets{
+				JSFiles: []dtos.EntryPointAsset{},
+				Dark:    "dark.css",
+				Light:   "light.css",
+			},
 		}
 		return data, nil
 	}
@@ -60,7 +68,7 @@ func fakeViewIndex(t *testing.T) {
 		getViewIndex = origGetViewIndex
 	})
 	getViewIndex = func() string {
-		return "index-template"
+		return "index"
 	}
 }
 
@@ -114,16 +122,14 @@ func TestLoginErrorCookieAPIEndpoint(t *testing.T) {
 	})
 
 	cfg.LoginCookieName = loginCookieName
-	setting.SecretKey = "login_testing"
-
 	cfg.OAuthAutoLogin = true
 
 	oauthError := errors.New("User not a member of one of the required organizations")
 	encryptedError, err := hs.SecretsService.Encrypt(context.Background(), []byte(oauthError.Error()), secrets.WithoutScope())
 	require.NoError(t, err)
 	expCookiePath := "/"
-	if len(setting.AppSubUrl) > 0 {
-		expCookiePath = setting.AppSubUrl
+	if len(cfg.AppSubURL) > 0 {
+		expCookiePath = cfg.AppSubURL
 	}
 	cookie := http.Cookie{
 		Name:     loginErrorCookieName,
@@ -587,14 +593,15 @@ func TestAuthProxyLoginWithEnableLoginTokenAndEnabledOauthAutoLogin(t *testing.T
 	sc.defaultHandler = routing.Wrap(func(c *contextmodel.ReqContext) response.Response {
 		c.IsSignedIn = true
 		c.SignedInUser = &user.SignedInUser{
-			UserID: 10,
+			UserID:          10,
+			AuthenticatedBy: loginservice.AuthProxyAuthModule,
 		}
 		hs.LoginView(c)
 		return response.Empty(http.StatusOK)
 	})
 
-	sc.cfg.AuthProxyEnabled = true
-	sc.cfg.AuthProxyEnableLoginToken = true
+	sc.cfg.AuthProxy.Enabled = true
+	sc.cfg.AuthProxy.EnableLoginToken = true
 
 	sc.m.Get(sc.url, sc.defaultHandler)
 	sc.fakeReqNoAssertions("GET", sc.url).exec()
@@ -626,14 +633,15 @@ func setupAuthProxyLoginTest(t *testing.T, enableLoginToken bool) *scenarioConte
 	sc.defaultHandler = routing.Wrap(func(c *contextmodel.ReqContext) response.Response {
 		c.IsSignedIn = true
 		c.SignedInUser = &user.SignedInUser{
-			UserID: 10,
+			UserID:          10,
+			AuthenticatedBy: loginservice.AuthProxyAuthModule,
 		}
 		hs.LoginView(c)
 		return response.Empty(http.StatusOK)
 	})
 
-	sc.cfg.AuthProxyEnabled = true
-	sc.cfg.AuthProxyEnableLoginToken = enableLoginToken
+	sc.cfg.AuthProxy.Enabled = true
+	sc.cfg.AuthProxy.EnableLoginToken = enableLoginToken
 
 	sc.m.Get(sc.url, sc.defaultHandler)
 	sc.fakeReqNoAssertions("GET", sc.url).exec()
@@ -641,6 +649,37 @@ func setupAuthProxyLoginTest(t *testing.T, enableLoginToken bool) *scenarioConte
 	return sc
 }
 
+func TestLogoutSaml(t *testing.T) {
+	fakeSetIndexViewData(t)
+	fakeViewIndex(t)
+	sc := setupScenarioContextSamlLogout(t, "/logout")
+	license := licensingtest.NewFakeLicensing()
+	license.On("FeatureEnabled", "saml").Return(true)
+
+	hs := &HTTPServer{
+		Cfg:              sc.cfg,
+		SettingsProvider: &setting.OSSImpl{Cfg: sc.cfg},
+		License:          license,
+		SocialService:    &mockSocialService{},
+		Features:         featuremgmt.WithFeatures(),
+		authInfoService: &authinfotest.FakeService{
+			ExpectedUserAuth: &loginservice.UserAuth{AuthModule: loginservice.SAMLAuthModule},
+		},
+	}
+
+	assert.Equal(t, true, hs.samlSingleLogoutEnabled())
+	sc.defaultHandler = routing.Wrap(func(c *contextmodel.ReqContext) response.Response {
+		c.SignedInUser = &user.SignedInUser{
+			UserID: 1,
+		}
+		hs.Logout(c)
+		return response.Empty(http.StatusOK)
+	})
+	sc.m.Get(sc.url, sc.defaultHandler)
+	sc.fakeReqNoAssertions("GET", sc.url).exec()
+	require.Equal(t, 302, sc.resp.Code)
+}
+
 type mockSocialService struct {
 	oAuthInfo       *social.OAuthInfo
 	oAuthInfos      map[string]*social.OAuthInfo
diff --git a/pkg/api/metrics.go b/pkg/api/metrics.go
index ea201d5214687..df798af8ca886 100644
--- a/pkg/api/metrics.go
+++ b/pkg/api/metrics.go
@@ -10,10 +10,14 @@ import (
 
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/api/response"
+	"github.com/grafana/grafana/pkg/api/routing"
+	"github.com/grafana/grafana/pkg/infra/appcontext"
 	"github.com/grafana/grafana/pkg/middleware/requestmeta"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/util/errutil/errhttp"
 	"github.com/grafana/grafana/pkg/web"
 )
 
@@ -33,6 +37,26 @@ func (hs *HTTPServer) handleQueryMetricsError(err error) *response.NormalRespons
 	return response.ErrOrFallback(http.StatusInternalServerError, "Query data error", err)
 }
 
+// metrics.go
+func (hs *HTTPServer) getDSQueryEndpoint() web.Handler {
+	if hs.Features.IsEnabledGlobally(featuremgmt.FlagKubernetesQueryServiceRewrite) {
+		// DEV ONLY FEATURE FLAG!
+		// rewrite requests from /ds/query to the new query service
+		namespaceMapper := request.GetNamespaceMapper(hs.Cfg)
+		return func(w http.ResponseWriter, r *http.Request) {
+			user, err := appcontext.User(r.Context())
+			if err != nil || user == nil {
+				errhttp.Write(r.Context(), fmt.Errorf("no user"), w)
+				return
+			}
+			r.URL.Path = "/apis/query.grafana.app/v0alpha1/namespaces/" + namespaceMapper(user.OrgID) + "/query"
+			hs.clientConfigProvider.DirectlyServeHTTP(w, r)
+		}
+	}
+
+	return routing.Wrap(hs.QueryMetricsV2)
+}
+
 // QueryMetricsV2 returns query metrics.
 // swagger:route POST /ds/query ds queryMetricsWithExpressions
 //
@@ -63,7 +87,7 @@ func (hs *HTTPServer) QueryMetricsV2(c *contextmodel.ReqContext) response.Respon
 
 func (hs *HTTPServer) toJsonStreamingResponse(ctx context.Context, qdr *backend.QueryDataResponse) response.Response {
 	statusWhenError := http.StatusBadRequest
-	if hs.Features.IsEnabled(featuremgmt.FlagDatasourceQueryMultiStatus) {
+	if hs.Features.IsEnabled(ctx, featuremgmt.FlagDatasourceQueryMultiStatus) {
 		statusWhenError = http.StatusMultiStatus
 	}
 
diff --git a/pkg/api/metrics_test.go b/pkg/api/metrics_test.go
index 06dd98da94893..8139a4c7302d1 100644
--- a/pkg/api/metrics_test.go
+++ b/pkg/api/metrics_test.go
@@ -18,13 +18,12 @@ import (
 	"github.com/grafana/grafana/pkg/infra/localcache"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin"
-	"github.com/grafana/grafana/pkg/plugins/config"
 	pluginClient "github.com/grafana/grafana/pkg/plugins/manager/client"
-	pluginFakes "github.com/grafana/grafana/pkg/plugins/manager/fakes"
 	"github.com/grafana/grafana/pkg/plugins/manager/registry"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	fakeDatasources "github.com/grafana/grafana/pkg/services/datasources/fakes"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginconfig"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
 	pluginSettings "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings/service"
@@ -77,8 +76,8 @@ func TestAPIEndpoint_Metrics_QueryMetricsV2(t *testing.T) {
 					},
 				},
 			},
-		}, &fakeDatasources.FakeDataSourceService{}, pluginSettings.ProvideService(dbtest.NewFakeDB(),
-			secretstest.NewFakeSecretsService()), pluginFakes.NewFakeLicensingService(), &config.Cfg{}),
+		}, &fakeDatasources.FakeCacheService{}, &fakeDatasources.FakeDataSourceService{},
+			pluginSettings.ProvideService(dbtest.NewFakeDB(), secretstest.NewFakeSecretsService()), pluginconfig.NewFakePluginRequestConfigProvider()),
 	)
 	serverFeatureEnabled := SetupAPITestServer(t, func(hs *HTTPServer) {
 		hs.queryDataService = qds
@@ -124,7 +123,8 @@ func TestAPIEndpoint_Metrics_PluginDecryptionFailure(t *testing.T) {
 				},
 			},
 		},
-		ds, pluginSettings.ProvideService(db, secretstest.NewFakeSecretsService()), pluginFakes.NewFakeLicensingService(), &config.Cfg{},
+		&fakeDatasources.FakeCacheService{},
+		ds, pluginSettings.ProvideService(db, secretstest.NewFakeSecretsService()), pluginconfig.NewFakePluginRequestConfigProvider(),
 	)
 	qds := query.ProvideService(
 		cfg,
@@ -162,7 +162,7 @@ func TestAPIEndpoint_Metrics_PluginDecryptionFailure(t *testing.T) {
 		var resObj secretsErrorResponseBody
 		err = json.Unmarshal(buf.Bytes(), &resObj)
 		require.NoError(t, err)
-		require.Equal(t, "unknown error", resObj.Error)
+		require.Equal(t, "", resObj.Error)
 		require.Contains(t, resObj.Message, "Secrets Plugin error:")
 	})
 }
@@ -264,12 +264,12 @@ func TestDataSourceQueryError(t *testing.T) {
 		{
 			request:        reqDatasourceByUidNotFound,
 			expectedStatus: http.StatusNotFound,
-			expectedBody:   `{"error":"data source not found","message":"Data source not found","traceID":""}`,
+			expectedBody:   `{"message":"Data source not found","traceID":""}`,
 		},
 		{
 			request:        reqDatasourceByIdNotFound,
 			expectedStatus: http.StatusNotFound,
-			expectedBody:   `{"error":"data source not found","message":"Data source not found","traceID":""}`,
+			expectedBody:   `{"message":"Data source not found","traceID":""}`,
 		},
 	}
 
@@ -296,12 +296,13 @@ func TestDataSourceQueryError(t *testing.T) {
 					&fakeDatasources.FakeCacheService{},
 					nil,
 					&fakePluginRequestValidator{},
-					pluginClient.ProvideService(r, &config.Cfg{}),
+					pluginClient.ProvideService(r),
 					plugincontext.ProvideService(cfg, localcache.ProvideService(), &pluginstore.FakePluginStore{
 						PluginList: []pluginstore.Plugin{pluginstore.ToGrafanaDTO(p)},
 					},
-						ds, pluginSettings.ProvideService(dbtest.NewFakeDB(),
-							secretstest.NewFakeSecretsService()), pluginFakes.NewFakeLicensingService(), &config.Cfg{}),
+						&fakeDatasources.FakeCacheService{}, ds,
+						pluginSettings.ProvideService(dbtest.NewFakeDB(),
+							secretstest.NewFakeSecretsService()), pluginconfig.NewFakePluginRequestConfigProvider()),
 				)
 				hs.QuotaService = quotatest.New(false, nil)
 			})
diff --git a/pkg/api/openapi3.go b/pkg/api/openapi3.go
deleted file mode 100644
index f148a5358fa94..0000000000000
--- a/pkg/api/openapi3.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package api
-
-import (
-	"net/http"
-	"strings"
-
-	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
-)
-
-func openapi3(c *contextmodel.ReqContext) {
-	data := map[string]any{
-		"Nonce": c.RequestNonce,
-	}
-
-	// Add CSP for unpkg.com to allow loading of Swagger UI assets
-	if existingCSP := c.Resp.Header().Get("Content-Security-Policy"); existingCSP != "" {
-		newCSP := strings.Replace(existingCSP, "style-src", "style-src https://unpkg.com/", 1)
-		c.Resp.Header().Set("Content-Security-Policy", newCSP)
-	}
-
-	c.HTML(http.StatusOK, "openapi3", data)
-}
diff --git a/pkg/api/org_invite.go b/pkg/api/org_invite.go
index ab4f1b944b9fb..a2f08b9607b24 100644
--- a/pkg/api/org_invite.go
+++ b/pkg/api/org_invite.go
@@ -216,14 +216,14 @@ func (hs *HTTPServer) GetInviteInfoByCode(c *contextmodel.ReqContext) response.R
 	queryResult, err := hs.tempUserService.GetTempUserByCode(c.Req.Context(), &query)
 	if err != nil {
 		if errors.Is(err, tempuser.ErrTempUserNotFound) {
-			return response.Error(404, "Invite not found", nil)
+			return response.Error(http.StatusNotFound, "Invite not found", nil)
 		}
-		return response.Error(500, "Failed to get invite", err)
+		return response.Error(http.StatusInternalServerError, "Failed to get invite", err)
 	}
 
 	invite := queryResult
 	if invite.Status != tempuser.TmpUserInvitePending {
-		return response.Error(404, "Invite not found", nil)
+		return response.Error(http.StatusNotFound, "Invite not found", nil)
 	}
 
 	return response.JSON(http.StatusOK, dtos.InviteInfo{
@@ -270,6 +270,10 @@ func (hs *HTTPServer) CompleteInvite(c *contextmodel.ReqContext) response.Respon
 		}
 	}
 
+	if err := completeInvite.Password.Validate(hs.Cfg); err != nil {
+		return response.Err(err)
+	}
+
 	cmd := user.CreateUserCommand{
 		Email:        completeInvite.Email,
 		Name:         completeInvite.Name,
@@ -281,17 +285,17 @@ func (hs *HTTPServer) CompleteInvite(c *contextmodel.ReqContext) response.Respon
 	usr, err := hs.userService.Create(c.Req.Context(), &cmd)
 	if err != nil {
 		if errors.Is(err, user.ErrUserAlreadyExists) {
-			return response.Error(412, fmt.Sprintf("User with email '%s' or username '%s' already exists", completeInvite.Email, completeInvite.Username), err)
+			return response.Error(http.StatusPreconditionFailed, fmt.Sprintf("User with email '%s' or username '%s' already exists", completeInvite.Email, completeInvite.Username), err)
 		}
 
-		return response.Error(500, "failed to create user", err)
+		return response.Error(http.StatusInternalServerError, "failed to create user", err)
 	}
 
 	if err := hs.bus.Publish(c.Req.Context(), &events.SignUpCompleted{
 		Name:  usr.NameOrFallback(),
 		Email: usr.Email,
 	}); err != nil {
-		return response.Error(500, "failed to publish event", err)
+		return response.Error(http.StatusInternalServerError, "failed to publish event", err)
 	}
 
 	if ok, rsp := hs.applyUserInvite(c.Req.Context(), usr, invite, true); !ok {
@@ -300,7 +304,7 @@ func (hs *HTTPServer) CompleteInvite(c *contextmodel.ReqContext) response.Respon
 
 	err = hs.loginUserWithUser(usr, c)
 	if err != nil {
-		return response.Error(500, "failed to accept invite", err)
+		return response.Error(http.StatusInternalServerError, "failed to accept invite", err)
 	}
 
 	metrics.MApiUserSignUpCompleted.Inc()
@@ -316,7 +320,7 @@ func (hs *HTTPServer) updateTempUserStatus(ctx context.Context, code string, sta
 	// update temp user status
 	updateTmpUserCmd := tempuser.UpdateTempUserStatusCommand{Code: code, Status: status}
 	if err := hs.tempUserService.UpdateTempUserStatus(ctx, &updateTmpUserCmd); err != nil {
-		return false, response.Error(500, "Failed to update invite status", err)
+		return false, response.Error(http.StatusInternalServerError, "Failed to update invite status", err)
 	}
 
 	return true, nil
@@ -327,7 +331,7 @@ func (hs *HTTPServer) applyUserInvite(ctx context.Context, usr *user.User, invit
 	addOrgUserCmd := org.AddOrgUserCommand{OrgID: invite.OrgID, UserID: usr.ID, Role: invite.Role}
 	if err := hs.orgService.AddOrgUser(ctx, &addOrgUserCmd); err != nil {
 		if !errors.Is(err, org.ErrOrgUserAlreadyAdded) {
-			return false, response.Error(500, "Error while trying to create org user", err)
+			return false, response.Error(http.StatusInternalServerError, "Error while trying to create org user", err)
 		}
 	}
 
@@ -339,13 +343,16 @@ func (hs *HTTPServer) applyUserInvite(ctx context.Context, usr *user.User, invit
 	if setActive {
 		// set org to active
 		if err := hs.userService.SetUsingOrg(ctx, &user.SetUsingOrgCommand{OrgID: invite.OrgID, UserID: usr.ID}); err != nil {
-			return false, response.Error(500, "Failed to set org as active", err)
+			return false, response.Error(http.StatusInternalServerError, "Failed to set org as active", err)
 		}
 	}
 
 	return true, nil
 }
 
+// swagger:response SMTPNotEnabledError
+type SMTPNotEnabledError PreconditionFailedError
+
 // swagger:parameters addOrgInvite
 type AddInviteParams struct {
 	// in:body
diff --git a/pkg/api/org_users.go b/pkg/api/org_users.go
index f55641edf40f6..401148307c884 100644
--- a/pkg/api/org_users.go
+++ b/pkg/api/org_users.go
@@ -11,7 +11,6 @@ import (
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/login"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/searchusers/sortopts"
@@ -125,7 +124,7 @@ func (hs *HTTPServer) GetOrgUsersForCurrentOrg(c *contextmodel.ReqContext) respo
 	})
 
 	if err != nil {
-		return response.Error(500, "Failed to get users for current organization", err)
+		return response.Error(http.StatusInternalServerError, "Failed to get users for current organization", err)
 	}
 
 	return response.JSON(http.StatusOK, result.OrgUsers)
@@ -155,7 +154,7 @@ func (hs *HTTPServer) GetOrgUsersForCurrentOrgLookup(c *contextmodel.ReqContext)
 	})
 
 	if err != nil {
-		return response.Error(500, "Failed to get users for current organization", err)
+		return response.Error(http.StatusInternalServerError, "Failed to get users for current organization", err)
 	}
 
 	result := make([]*dtos.UserLookupDTO, 0)
@@ -200,7 +199,7 @@ func (hs *HTTPServer) GetOrgUsers(c *contextmodel.ReqContext) response.Response
 	})
 
 	if err != nil {
-		return response.Error(500, "Failed to get users for organization", err)
+		return response.Error(http.StatusInternalServerError, "Failed to get users for organization", err)
 	}
 
 	return response.JSON(http.StatusOK, result.OrgUsers)
@@ -252,7 +251,7 @@ func (hs *HTTPServer) SearchOrgUsers(c *contextmodel.ReqContext) response.Respon
 	})
 
 	if err != nil {
-		return response.Error(500, "Failed to get users for organization", err)
+		return response.Error(http.StatusInternalServerError, "Failed to get users for organization", err)
 	}
 
 	return response.JSON(http.StatusOK, result)
@@ -287,7 +286,7 @@ func (hs *HTTPServer) SearchOrgUsersWithPaging(c *contextmodel.ReqContext) respo
 
 	result, err := hs.searchOrgUsersHelper(c, query)
 	if err != nil {
-		return response.Error(500, "Failed to get users for current organization", err)
+		return response.Error(http.StatusInternalServerError, "Failed to get users for current organization", err)
 	}
 
 	return response.JSON(http.StatusOK, result)
@@ -306,7 +305,7 @@ func (hs *HTTPServer) searchOrgUsersHelper(c *contextmodel.ReqContext, query *or
 		if dtos.IsHiddenUser(user.Login, c.SignedInUser, hs.Cfg) {
 			continue
 		}
-		user.AvatarURL = dtos.GetGravatarUrl(user.Email)
+		user.AvatarURL = dtos.GetGravatarUrl(hs.Cfg, user.Email)
 
 		userIDs[fmt.Sprint(user.UserID)] = true
 		authLabelsUserIDs = append(authLabelsUserIDs, user.UserID)
@@ -324,19 +323,24 @@ func (hs *HTTPServer) searchOrgUsersHelper(c *contextmodel.ReqContext, query *or
 
 	// Get accesscontrol metadata and IPD labels for users in the target org
 	accessControlMetadata := map[string]accesscontrol.Metadata{}
-	if c.QueryBool("accesscontrol") && c.SignedInUser.Permissions != nil {
-		// TODO https://github.com/grafana/grafana-authnz-team/issues/268 - user access control service for fetching permissions from another organization
-		permissions, ok := c.SignedInUser.Permissions[query.OrgID]
-		if ok {
-			accessControlMetadata = accesscontrol.GetResourcesMetadata(c.Req.Context(), permissions, "users:id:", userIDs)
+	if c.QueryBool("accesscontrol") {
+		permissions := c.SignedInUser.GetPermissions()
+		if query.OrgID != c.SignedInUser.GetOrgID() {
+			identity, err := hs.authnService.ResolveIdentity(c.Req.Context(), query.OrgID, c.SignedInUser.GetID())
+			if err != nil {
+				return nil, err
+			}
+			permissions = identity.GetPermissions()
 		}
+		accessControlMetadata = accesscontrol.GetResourcesMetadata(c.Req.Context(), permissions, "users:id:", userIDs)
 	}
 
 	for i := range filteredUsers {
 		filteredUsers[i].AccessControl = accessControlMetadata[fmt.Sprint(filteredUsers[i].UserID)]
 		if module, ok := modules[filteredUsers[i].UserID]; ok {
+			oauthInfo := hs.SocialService.GetOAuthInfoProvider(module)
 			filteredUsers[i].AuthLabels = []string{login.GetAuthProviderLabel(module)}
-			filteredUsers[i].IsExternallySynced = login.IsExternallySynced(hs.Cfg, module)
+			filteredUsers[i].IsExternallySynced = login.IsExternallySynced(hs.Cfg, module, oauthInfo)
 		}
 	}
 
@@ -422,10 +426,9 @@ func (hs *HTTPServer) updateOrgUserHelper(c *contextmodel.ReqContext, cmd org.Up
 			return response.Error(http.StatusInternalServerError, "Failed to get user auth info", nil)
 		}
 	}
-	if authInfo != nil && authInfo.AuthModule != "" && login.IsExternallySynced(hs.Cfg, authInfo.AuthModule) {
-		// A GCom specific feature toggle for role locking has been introduced, as the previous implementation had a bug with locking down external users synced through GCom (https://github.com/grafana/grafana/pull/72044)
-		// Remove this conditional once FlagGcomOnlyExternalOrgRoleSync feature toggle has been removed
-		if authInfo.AuthModule != login.GrafanaComAuthModule || hs.Features.IsEnabled(featuremgmt.FlagGcomOnlyExternalOrgRoleSync) {
+	if authInfo != nil && authInfo.AuthModule != "" {
+		oauthInfo := hs.SocialService.GetOAuthInfoProvider(authInfo.AuthModule)
+		if login.IsExternallySynced(hs.Cfg, authInfo.AuthModule, oauthInfo) {
 			return response.Err(org.ErrCannotChangeRoleForExternallySyncedUser.Errorf("Cannot change role for externally synced user"))
 		}
 	}
@@ -502,9 +505,9 @@ func (hs *HTTPServer) RemoveOrgUser(c *contextmodel.ReqContext) response.Respons
 func (hs *HTTPServer) removeOrgUserHelper(ctx context.Context, cmd *org.RemoveOrgUserCommand) response.Response {
 	if err := hs.orgService.RemoveOrgUser(ctx, cmd); err != nil {
 		if errors.Is(err, org.ErrLastOrgAdmin) {
-			return response.Error(400, "Cannot remove last organization admin", nil)
+			return response.Error(http.StatusBadRequest, "Cannot remove last organization admin", nil)
 		}
-		return response.Error(500, "Failed to remove user from organization", err)
+		return response.Error(http.StatusInternalServerError, "Failed to remove user from organization", err)
 	}
 
 	if cmd.UserWasDeleted {
diff --git a/pkg/api/org_users_test.go b/pkg/api/org_users_test.go
index b18e5ecb8f661..e1820ca6158d5 100644
--- a/pkg/api/org_users_test.go
+++ b/pkg/api/org_users_test.go
@@ -15,12 +15,14 @@ import (
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/db/dbtest"
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/login/social/socialtest"
 	"github.com/grafana/grafana/pkg/models/roletype"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/login"
-	"github.com/grafana/grafana/pkg/services/login/logintest"
+	"github.com/grafana/grafana/pkg/services/login/authinfotest"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/org/orgimpl"
 	"github.com/grafana/grafana/pkg/services/org/orgtest"
@@ -195,12 +197,11 @@ func TestOrgUsersAPIEndpoint_userLoggedIn(t *testing.T) {
 
 func TestOrgUsersAPIEndpoint_updateOrgRole(t *testing.T) {
 	type testCase struct {
-		desc                        string
-		SkipOrgRoleSync             bool
-		GcomOnlyExternalOrgRoleSync bool
-		AuthEnabled                 bool
-		AuthModule                  string
-		expectedCode                int
+		desc            string
+		SkipOrgRoleSync bool
+		AuthEnabled     bool
+		AuthModule      string
+		expectedCode    int
 	}
 	permissions := []accesscontrol.Permission{
 		{Action: accesscontrol.ActionOrgUsersRead, Scope: "users:*"},
@@ -224,28 +225,12 @@ func TestOrgUsersAPIEndpoint_updateOrgRole(t *testing.T) {
 			expectedCode:    http.StatusForbidden,
 		},
 		{
-			desc:            "should not be able to change basicRole with a different provider",
+			desc:            "should not be able to change basicRole for a user synced through an OAuth provider",
 			SkipOrgRoleSync: false,
 			AuthEnabled:     true,
-			AuthModule:      login.GenericOAuthModule,
+			AuthModule:      login.GrafanaComAuthModule,
 			expectedCode:    http.StatusForbidden,
 		},
-		{
-			desc:                        "should be able to change basicRole for a user synced through GCom if GcomOnlyExternalOrgRoleSync flag is set to false",
-			SkipOrgRoleSync:             false,
-			GcomOnlyExternalOrgRoleSync: false,
-			AuthEnabled:                 true,
-			AuthModule:                  login.GrafanaComAuthModule,
-			expectedCode:                http.StatusOK,
-		},
-		{
-			desc:                        "should not be able to change basicRole for a user synced through GCom if GcomOnlyExternalOrgRoleSync flag is set to true",
-			SkipOrgRoleSync:             false,
-			GcomOnlyExternalOrgRoleSync: true,
-			AuthEnabled:                 true,
-			AuthModule:                  login.GrafanaComAuthModule,
-			expectedCode:                http.StatusForbidden,
-		},
 		{
 			desc:            "should be able to change basicRole with a basic Auth",
 			SkipOrgRoleSync: false,
@@ -273,24 +258,17 @@ func TestOrgUsersAPIEndpoint_updateOrgRole(t *testing.T) {
 				if tt.AuthModule == login.LDAPAuthModule {
 					hs.Cfg.LDAPAuthEnabled = tt.AuthEnabled
 					hs.Cfg.LDAPSkipOrgRoleSync = tt.SkipOrgRoleSync
-				} else if tt.AuthModule == login.GenericOAuthModule {
-					hs.Cfg.GenericOAuthAuthEnabled = tt.AuthEnabled
-					hs.Cfg.GenericOAuthSkipOrgRoleSync = tt.SkipOrgRoleSync
-				} else if tt.AuthModule == login.GrafanaComAuthModule {
-					hs.Cfg.GrafanaNetAuthEnabled = tt.AuthEnabled
-					hs.Cfg.GrafanaComSkipOrgRoleSync = tt.SkipOrgRoleSync
-				} else if tt.AuthModule == "" {
-					// authmodule empty means basic auth
-				} else {
-					t.Errorf("invalid auth module for test: %s", tt.AuthModule)
 				}
+				// AuthModule empty means basic auth
 
-				hs.authInfoService = &logintest.AuthInfoServiceFake{
+				hs.authInfoService = &authinfotest.FakeService{
 					ExpectedUserAuth: &login.UserAuth{AuthModule: tt.AuthModule},
 				}
-				hs.Features = featuremgmt.WithFeatures(featuremgmt.FlagGcomOnlyExternalOrgRoleSync, tt.GcomOnlyExternalOrgRoleSync)
 				hs.userService = &usertest.FakeUserService{ExpectedSignedInUser: userWithPermissions}
 				hs.orgService = &orgtest.FakeOrgService{}
+				hs.SocialService = &socialtest.FakeSocialService{
+					ExpectedAuthInfoProvider: &social.OAuthInfo{Enabled: tt.AuthEnabled, SkipOrgRoleSync: tt.SkipOrgRoleSync},
+				}
 				hs.accesscontrolService = &actest.FakeService{
 					ExpectedPermissions: permissions,
 				}
@@ -330,7 +308,7 @@ func TestOrgUsersAPIEndpoint(t *testing.T) {
 			server := SetupAPITestServer(t, func(hs *HTTPServer) {
 				hs.Cfg = setting.NewCfg()
 				hs.orgService = &orgtest.FakeOrgService{ExpectedSearchOrgUsersResult: &org.SearchOrgUsersQueryResult{}}
-				hs.authInfoService = &logintest.AuthInfoServiceFake{}
+				hs.authInfoService = &authinfotest.FakeService{}
 			})
 			res, err := server.Send(webtest.RequestWithSignedInUser(server.NewGetRequest("/api/org/users/lookup"), userWithPermissions(1, tt.permissions)))
 			require.NoError(t, err)
@@ -388,8 +366,9 @@ func TestGetOrgUsersAPIEndpoint_AccessControlMetadata(t *testing.T) {
 				hs.orgService = &orgtest.FakeOrgService{
 					ExpectedSearchOrgUsersResult: &org.SearchOrgUsersQueryResult{OrgUsers: []*org.OrgUserDTO{{UserID: 1}}},
 				}
-				hs.authInfoService = &logintest.AuthInfoServiceFake{}
+				hs.authInfoService = &authinfotest.FakeService{}
 				hs.userService = &usertest.FakeUserService{ExpectedSignedInUser: userWithPermissions(1, tt.permissions)}
+				hs.accesscontrolService = actest.FakeService{ExpectedPermissions: tt.permissions}
 			})
 
 			url := "/api/orgs/1/users"
@@ -446,8 +425,9 @@ func TestGetOrgUsersAPIEndpoint_AccessControl(t *testing.T) {
 				hs.orgService = &orgtest.FakeOrgService{
 					ExpectedSearchOrgUsersResult: &org.SearchOrgUsersQueryResult{},
 				}
-				hs.authInfoService = &logintest.AuthInfoServiceFake{}
+				hs.authInfoService = &authinfotest.FakeService{}
 				hs.userService = &usertest.FakeUserService{ExpectedSignedInUser: userWithPermissions(1, tc.permissions)}
+				hs.accesscontrolService = &actest.FakeService{}
 			})
 
 			u := userWithPermissions(1, tc.permissions)
@@ -488,11 +468,12 @@ func TestPostOrgUsersAPIEndpoint_AccessControl(t *testing.T) {
 			server := SetupAPITestServer(t, func(hs *HTTPServer) {
 				hs.Cfg = setting.NewCfg()
 				hs.orgService = &orgtest.FakeOrgService{}
-				hs.authInfoService = &logintest.AuthInfoServiceFake{}
+				hs.authInfoService = &authinfotest.FakeService{}
 				hs.userService = &usertest.FakeUserService{
 					ExpectedUser:         &user.User{},
 					ExpectedSignedInUser: userWithPermissions(1, tt.permissions),
 				}
+				hs.accesscontrolService = &actest.FakeService{}
 			})
 
 			u := userWithPermissions(1, tt.permissions)
@@ -612,7 +593,7 @@ func TestOrgUsersAPIEndpointWithSetPerms_AccessControl(t *testing.T) {
 			server := SetupAPITestServer(t, func(hs *HTTPServer) {
 				hs.Cfg = setting.NewCfg()
 				hs.orgService = &orgtest.FakeOrgService{}
-				hs.authInfoService = &logintest.AuthInfoServiceFake{
+				hs.authInfoService = &authinfotest.FakeService{
 					ExpectedUserAuth: &login.UserAuth{
 						AuthModule: "",
 					},
@@ -674,7 +655,7 @@ func TestPatchOrgUsersAPIEndpoint_AccessControl(t *testing.T) {
 			server := SetupAPITestServer(t, func(hs *HTTPServer) {
 				hs.Cfg = setting.NewCfg()
 				hs.orgService = &orgtest.FakeOrgService{}
-				hs.authInfoService = &logintest.AuthInfoServiceFake{
+				hs.authInfoService = &authinfotest.FakeService{
 					ExpectedUserAuth: &login.UserAuth{
 						AuthModule: "",
 					},
@@ -727,7 +708,7 @@ func TestDeleteOrgUsersAPIEndpoint_AccessControl(t *testing.T) {
 						Response error
 					}{OrgID: 1, Response: nil}},
 				}
-				hs.authInfoService = &logintest.AuthInfoServiceFake{}
+				hs.authInfoService = &authinfotest.FakeService{}
 				hs.userService = &usertest.FakeUserService{
 					ExpectedUser:         &user.User{},
 					ExpectedSignedInUser: userWithPermissions(1, tt.permissions),
diff --git a/pkg/api/password.go b/pkg/api/password.go
index 5567c9af3f973..f3b265029e492 100644
--- a/pkg/api/password.go
+++ b/pkg/api/password.go
@@ -16,13 +16,14 @@ import (
 )
 
 func (hs *HTTPServer) SendResetPasswordEmail(c *contextmodel.ReqContext) response.Response {
+	if hs.Cfg.DisableLoginForm || hs.Cfg.DisableLogin {
+		return response.Error(http.StatusUnauthorized, "Not allowed to reset password when login form is disabled", nil)
+	}
+
 	form := dtos.SendResetPasswordEmailForm{}
 	if err := web.Bind(c.Req, &form); err != nil {
 		return response.Error(http.StatusBadRequest, "bad request data", err)
 	}
-	if hs.Cfg.DisableLoginForm {
-		return response.Error(401, "Not allowed to reset password when login form is disabled", nil)
-	}
 
 	userQuery := user.GetUserByLoginQuery{LoginOrEmail: form.UserOrEmail}
 
@@ -39,21 +40,27 @@ func (hs *HTTPServer) SendResetPasswordEmail(c *contextmodel.ReqContext) respons
 
 	getAuthQuery := login.GetAuthInfoQuery{UserId: usr.ID}
 	if authInfo, err := hs.authInfoService.GetAuthInfo(c.Req.Context(), &getAuthQuery); err == nil {
-		authModule := authInfo.AuthModule
-		if authModule == login.LDAPAuthModule || authModule == login.AuthProxyAuthModule {
-			return response.Error(401, "Not allowed to reset password for LDAP or Auth Proxy user", nil)
+		oauthInfo := hs.SocialService.GetOAuthInfoProvider(authInfo.AuthModule)
+		if login.IsProviderEnabled(hs.Cfg, authInfo.AuthModule, oauthInfo) {
+			c.Logger.Info("Requested password reset for external user", nil)
+			return response.Error(http.StatusOK, "Email sent", nil)
 		}
 	}
 
 	emailCmd := notifications.SendResetPasswordEmailCommand{User: usr}
 	if err := hs.NotificationService.SendResetPasswordEmail(c.Req.Context(), &emailCmd); err != nil {
-		return response.Error(500, "Failed to send email", err)
+		return response.Error(http.StatusInternalServerError, "Failed to send email", err)
 	}
 
 	return response.Success("Email sent")
 }
 
 func (hs *HTTPServer) ResetPassword(c *contextmodel.ReqContext) response.Response {
+	if hs.Cfg.DisableLoginForm || hs.Cfg.DisableLogin {
+		return response.Error(http.StatusUnauthorized,
+			"Not allowed to reset password when grafana authentication is disabled", nil)
+	}
+
 	form := dtos.ResetUserPasswordForm{}
 	if err := web.Bind(c.Req, &form); err != nil {
 		return response.Error(http.StatusBadRequest, "bad request data", err)
@@ -73,34 +80,49 @@ func (hs *HTTPServer) ResetPassword(c *contextmodel.ReqContext) response.Respons
 	userResult, err := hs.NotificationService.ValidateResetPasswordCode(c.Req.Context(), &query, getUserByLogin)
 	if err != nil {
 		if errors.Is(err, notifications.ErrInvalidEmailCode) {
-			return response.Error(400, "Invalid or expired reset password code", nil)
+			return response.Error(http.StatusBadRequest, "Invalid or expired reset password code", nil)
+		}
+		return response.Error(http.StatusInternalServerError, "Unknown error validating email code", err)
+	}
+
+	getAuthQuery := login.GetAuthInfoQuery{UserId: userResult.ID}
+	if authInfo, err := hs.authInfoService.GetAuthInfo(c.Req.Context(), &getAuthQuery); err == nil {
+		oauthInfo := hs.SocialService.GetOAuthInfoProvider(authInfo.AuthModule)
+		if login.IsProviderEnabled(hs.Cfg, authInfo.AuthModule, oauthInfo) {
+			return response.Error(http.StatusBadRequest, "Cannot update external user password", err)
 		}
-		return response.Error(500, "Unknown error validating email code", err)
 	}
 
 	if form.NewPassword != form.ConfirmPassword {
-		return response.Error(400, "Passwords do not match", nil)
+		return response.Error(http.StatusBadRequest, "Passwords do not match", nil)
 	}
 
-	password := user.Password(form.NewPassword)
-	if password.IsWeak() {
-		return response.Error(400, "New password is too short", nil)
+	if err := form.NewPassword.Validate(hs.Cfg); err != nil {
+		c.Logger.Warn("the new password doesn't meet the password policy criteria", "err", err)
+		return response.Err(err)
 	}
 
 	cmd := user.ChangeUserPasswordCommand{}
 	cmd.UserID = userResult.ID
-	cmd.NewPassword, err = util.EncodePassword(form.NewPassword, userResult.Salt)
+	encodedPassword, err := util.EncodePassword(string(form.NewPassword), userResult.Salt)
 	if err != nil {
-		return response.Error(500, "Failed to encode password", err)
+		return response.Error(http.StatusInternalServerError, "Failed to encode password", err)
 	}
+	cmd.NewPassword = user.Password(encodedPassword)
 
 	if err := hs.userService.ChangePassword(c.Req.Context(), &cmd); err != nil {
-		return response.Error(500, "Failed to change user password", err)
+		return response.Error(http.StatusInternalServerError, "Failed to change user password", err)
 	}
 
 	if err := hs.loginAttemptService.Reset(c.Req.Context(), username); err != nil {
 		c.Logger.Warn("could not reset login attempts", "err", err, "username", username)
 	}
 
+	if err := hs.AuthTokenService.RevokeAllUserTokens(c.Req.Context(),
+		userResult.ID); err != nil {
+		return response.Error(http.StatusExpectationFailed,
+			"User password updated but unable to revoke user sessions", err)
+	}
+
 	return response.Success("User password changed")
 }
diff --git a/pkg/api/playlist.go b/pkg/api/playlist.go
index e8e6f4cdc8c69..40daad0e6f5f4 100644
--- a/pkg/api/playlist.go
+++ b/pkg/api/playlist.go
@@ -2,15 +2,53 @@ package api
 
 import (
 	"net/http"
+	"strings"
+
+	"k8s.io/apimachinery/pkg/api/errors"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/client-go/dynamic"
 
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/api/response"
+	"github.com/grafana/grafana/pkg/api/routing"
+	"github.com/grafana/grafana/pkg/apis/playlist/v0alpha1"
+	"github.com/grafana/grafana/pkg/middleware"
+	internalplaylist "github.com/grafana/grafana/pkg/registry/apis/playlist"
+	grafanaapiserver "github.com/grafana/grafana/pkg/services/apiserver"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/playlist"
+	"github.com/grafana/grafana/pkg/util/errutil/errhttp"
 	"github.com/grafana/grafana/pkg/web"
 )
 
-func (hs *HTTPServer) ValidateOrgPlaylist(c *contextmodel.ReqContext) {
+func (hs *HTTPServer) registerPlaylistAPI(apiRoute routing.RouteRegister) {
+	// Register the actual handlers
+	apiRoute.Group("/playlists", func(playlistRoute routing.RouteRegister) {
+		if hs.Features.IsEnabledGlobally(featuremgmt.FlagKubernetesPlaylists) {
+			// Use k8s client to implement legacy API
+			handler := newPlaylistK8sHandler(hs)
+			playlistRoute.Get("/", handler.searchPlaylists)
+			playlistRoute.Get("/:uid", handler.getPlaylist)
+			playlistRoute.Get("/:uid/items", handler.getPlaylistItems)
+			playlistRoute.Delete("/:uid", handler.deletePlaylist)
+			playlistRoute.Put("/:uid", handler.updatePlaylist)
+			playlistRoute.Post("/", handler.createPlaylist)
+		} else {
+			// Legacy handlers
+			playlistRoute.Get("/", routing.Wrap(hs.SearchPlaylists))
+			playlistRoute.Get("/:uid", hs.validateOrgPlaylist, routing.Wrap(hs.GetPlaylist))
+			playlistRoute.Get("/:uid/items", hs.validateOrgPlaylist, routing.Wrap(hs.GetPlaylistItems))
+			playlistRoute.Delete("/:uid", middleware.ReqEditorRole, hs.validateOrgPlaylist, routing.Wrap(hs.DeletePlaylist))
+			playlistRoute.Put("/:uid", middleware.ReqEditorRole, hs.validateOrgPlaylist, routing.Wrap(hs.UpdatePlaylist))
+			playlistRoute.Post("/", middleware.ReqEditorRole, routing.Wrap(hs.CreatePlaylist))
+		}
+	})
+}
+
+func (hs *HTTPServer) validateOrgPlaylist(c *contextmodel.ReqContext) {
 	uid := web.Params(c.Req)[":uid"]
 	query := playlist.GetPlaylistByUidQuery{UID: uid, OrgId: c.SignedInUser.GetOrgID()}
 	p, err := hs.playlistService.GetWithoutItems(c.Req.Context(), &query)
@@ -54,7 +92,7 @@ func (hs *HTTPServer) SearchPlaylists(c *contextmodel.ReqContext) response.Respo
 
 	playlists, err := hs.playlistService.Search(c.Req.Context(), &searchQuery)
 	if err != nil {
-		return response.Error(500, "Search failed", err)
+		return response.Error(http.StatusInternalServerError, "Search failed", err)
 	}
 
 	return response.JSON(http.StatusOK, playlists)
@@ -76,7 +114,7 @@ func (hs *HTTPServer) GetPlaylist(c *contextmodel.ReqContext) response.Response
 
 	dto, err := hs.playlistService.Get(c.Req.Context(), &cmd)
 	if err != nil {
-		return response.Error(500, "Playlist not found", err)
+		return response.Error(http.StatusInternalServerError, "Playlist not found", err)
 	}
 
 	return response.JSON(http.StatusOK, dto)
@@ -98,7 +136,7 @@ func (hs *HTTPServer) GetPlaylistItems(c *contextmodel.ReqContext) response.Resp
 
 	dto, err := hs.playlistService.Get(c.Req.Context(), &cmd)
 	if err != nil {
-		return response.Error(500, "Playlist not found", err)
+		return response.Error(http.StatusInternalServerError, "Playlist not found", err)
 	}
 
 	return response.JSON(http.StatusOK, dto.Items)
@@ -119,7 +157,7 @@ func (hs *HTTPServer) DeletePlaylist(c *contextmodel.ReqContext) response.Respon
 
 	cmd := playlist.DeletePlaylistCommand{UID: uid, OrgId: c.SignedInUser.GetOrgID()}
 	if err := hs.playlistService.Delete(c.Req.Context(), &cmd); err != nil {
-		return response.Error(500, "Failed to delete playlist", err)
+		return response.Error(http.StatusInternalServerError, "Failed to delete playlist", err)
 	}
 
 	return response.JSON(http.StatusOK, "")
@@ -144,7 +182,7 @@ func (hs *HTTPServer) CreatePlaylist(c *contextmodel.ReqContext) response.Respon
 
 	p, err := hs.playlistService.Create(c.Req.Context(), &cmd)
 	if err != nil {
-		return response.Error(500, "Failed to create playlist", err)
+		return response.Error(http.StatusInternalServerError, "Failed to create playlist", err)
 	}
 
 	return response.JSON(http.StatusOK, p)
@@ -170,7 +208,7 @@ func (hs *HTTPServer) UpdatePlaylist(c *contextmodel.ReqContext) response.Respon
 
 	_, err := hs.playlistService.Update(c.Req.Context(), &cmd)
 	if err != nil {
-		return response.Error(500, "Failed to save playlist", err)
+		return response.Error(http.StatusInternalServerError, "Failed to save playlist", err)
 	}
 
 	dto, err := hs.playlistService.Get(c.Req.Context(), &playlist.GetPlaylistByUidQuery{
@@ -178,7 +216,7 @@ func (hs *HTTPServer) UpdatePlaylist(c *contextmodel.ReqContext) response.Respon
 		OrgId: c.SignedInUser.GetOrgID(),
 	})
 	if err != nil {
-		return response.Error(500, "Failed to load playlist", err)
+		return response.Error(http.StatusInternalServerError, "Failed to load playlist", err)
 	}
 	return response.JSON(http.StatusOK, dto)
 }
@@ -279,3 +317,152 @@ type CreatePlaylistResponse struct {
 	// in: body
 	Body *playlist.Playlist `json:"body"`
 }
+
+type playlistK8sHandler struct {
+	namespacer           request.NamespaceMapper
+	gvr                  schema.GroupVersionResource
+	clientConfigProvider grafanaapiserver.DirectRestConfigProvider
+}
+
+//-----------------------------------------------------------------------------------------
+// Playlist k8s wrapper functions
+//-----------------------------------------------------------------------------------------
+
+func newPlaylistK8sHandler(hs *HTTPServer) *playlistK8sHandler {
+	return &playlistK8sHandler{
+		gvr:                  v0alpha1.PlaylistResourceInfo.GroupVersionResource(),
+		namespacer:           request.GetNamespaceMapper(hs.Cfg),
+		clientConfigProvider: hs.clientConfigProvider,
+	}
+}
+
+func (pk8s *playlistK8sHandler) searchPlaylists(c *contextmodel.ReqContext) {
+	client, ok := pk8s.getClient(c)
+	if !ok {
+		return // error is already sent
+	}
+	out, err := client.List(c.Req.Context(), v1.ListOptions{})
+	if err != nil {
+		pk8s.writeError(c, err)
+		return
+	}
+
+	query := strings.ToUpper(c.Query("query"))
+	playlists := []playlist.Playlist{}
+	for _, item := range out.Items {
+		p := internalplaylist.UnstructuredToLegacyPlaylist(item)
+		if p == nil {
+			continue
+		}
+		if query != "" && !strings.Contains(strings.ToUpper(p.Name), query) {
+			continue // query filter
+		}
+		playlists = append(playlists, *p)
+	}
+	c.JSON(http.StatusOK, playlists)
+}
+
+func (pk8s *playlistK8sHandler) getPlaylist(c *contextmodel.ReqContext) {
+	client, ok := pk8s.getClient(c)
+	if !ok {
+		return // error is already sent
+	}
+	uid := web.Params(c.Req)[":uid"]
+	out, err := client.Get(c.Req.Context(), uid, v1.GetOptions{})
+	if err != nil {
+		pk8s.writeError(c, err)
+		return
+	}
+	c.JSON(http.StatusOK, internalplaylist.UnstructuredToLegacyPlaylistDTO(*out))
+}
+
+func (pk8s *playlistK8sHandler) getPlaylistItems(c *contextmodel.ReqContext) {
+	client, ok := pk8s.getClient(c)
+	if !ok {
+		return // error is already sent
+	}
+	uid := web.Params(c.Req)[":uid"]
+	out, err := client.Get(c.Req.Context(), uid, v1.GetOptions{})
+	if err != nil {
+		pk8s.writeError(c, err)
+		return
+	}
+	c.JSON(http.StatusOK, internalplaylist.UnstructuredToLegacyPlaylistDTO(*out).Items)
+}
+
+func (pk8s *playlistK8sHandler) deletePlaylist(c *contextmodel.ReqContext) {
+	client, ok := pk8s.getClient(c)
+	if !ok {
+		return // error is already sent
+	}
+	uid := web.Params(c.Req)[":uid"]
+	err := client.Delete(c.Req.Context(), uid, v1.DeleteOptions{})
+	if err != nil {
+		pk8s.writeError(c, err)
+		return
+	}
+	c.JSON(http.StatusOK, "")
+}
+
+func (pk8s *playlistK8sHandler) updatePlaylist(c *contextmodel.ReqContext) {
+	client, ok := pk8s.getClient(c)
+	if !ok {
+		return // error is already sent
+	}
+	uid := web.Params(c.Req)[":uid"]
+	cmd := playlist.UpdatePlaylistCommand{}
+	if err := web.Bind(c.Req, &cmd); err != nil {
+		c.JsonApiErr(http.StatusBadRequest, "bad request data", err)
+		return
+	}
+	obj := internalplaylist.LegacyUpdateCommandToUnstructured(cmd)
+	obj.SetName(uid)
+	out, err := client.Update(c.Req.Context(), &obj, v1.UpdateOptions{})
+	if err != nil {
+		pk8s.writeError(c, err)
+		return
+	}
+	c.JSON(http.StatusOK, internalplaylist.UnstructuredToLegacyPlaylistDTO(*out))
+}
+
+func (pk8s *playlistK8sHandler) createPlaylist(c *contextmodel.ReqContext) {
+	client, ok := pk8s.getClient(c)
+	if !ok {
+		return // error is already sent
+	}
+	cmd := playlist.UpdatePlaylistCommand{}
+	if err := web.Bind(c.Req, &cmd); err != nil {
+		c.JsonApiErr(http.StatusBadRequest, "bad request data", err)
+		return
+	}
+	obj := internalplaylist.LegacyUpdateCommandToUnstructured(cmd)
+	out, err := client.Create(c.Req.Context(), &obj, v1.CreateOptions{})
+	if err != nil {
+		pk8s.writeError(c, err)
+		return
+	}
+	c.JSON(http.StatusOK, internalplaylist.UnstructuredToLegacyPlaylistDTO(*out))
+}
+
+//-----------------------------------------------------------------------------------------
+// Utility functions
+//-----------------------------------------------------------------------------------------
+
+func (pk8s *playlistK8sHandler) getClient(c *contextmodel.ReqContext) (dynamic.ResourceInterface, bool) {
+	dyn, err := dynamic.NewForConfig(pk8s.clientConfigProvider.GetDirectRestConfig(c))
+	if err != nil {
+		c.JsonApiErr(500, "client", err)
+		return nil, false
+	}
+	return dyn.Resource(pk8s.gvr).Namespace(pk8s.namespacer(c.OrgID)), true
+}
+
+func (pk8s *playlistK8sHandler) writeError(c *contextmodel.ReqContext, err error) {
+	//nolint:errorlint
+	statusError, ok := err.(*errors.StatusError)
+	if ok {
+		c.JsonApiErr(int(statusError.Status().Code), statusError.Status().Message, err)
+		return
+	}
+	errhttp.Write(c.Req.Context(), err, c.Resp)
+}
diff --git a/pkg/api/plugin_checks.go b/pkg/api/plugin_checks.go
new file mode 100644
index 0000000000000..9a7deb876309a
--- /dev/null
+++ b/pkg/api/plugin_checks.go
@@ -0,0 +1,43 @@
+package api
+
+import (
+	"errors"
+	"net/http"
+
+	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
+	"github.com/grafana/grafana/pkg/web"
+)
+
+func checkAppEnabled(pluginStore pluginstore.Store, pluginSettings pluginsettings.Service) func(c *contextmodel.ReqContext) {
+	return func(c *contextmodel.ReqContext) {
+		pluginID := web.Params(c.Req)[":pluginId"]
+		p, exists := pluginStore.Plugin(c.Req.Context(), pluginID)
+		if !exists {
+			c.JsonApiErr(http.StatusNotFound, "Plugin not found", nil)
+			return
+		}
+		if !p.IsApp() {
+			return
+		}
+
+		ps, err := pluginSettings.GetPluginSettingByPluginID(c.Req.Context(), &pluginsettings.GetByPluginIDArgs{
+			OrgID:    c.OrgID,
+			PluginID: pluginID,
+		})
+		if err != nil {
+			if errors.Is(err, pluginsettings.ErrPluginSettingNotFound) {
+				c.JsonApiErr(http.StatusNotFound, "Plugin not found", nil)
+				return
+			}
+			c.JsonApiErr(http.StatusInternalServerError, "Failed to get plugin settings", err)
+			return
+		}
+
+		if !ps.Enabled {
+			c.JsonApiErr(http.StatusNotFound, "Plugin is not enabled", nil)
+			return
+		}
+	}
+}
diff --git a/pkg/api/plugin_checks_test.go b/pkg/api/plugin_checks_test.go
new file mode 100644
index 0000000000000..fffa04453f307
--- /dev/null
+++ b/pkg/api/plugin_checks_test.go
@@ -0,0 +1,72 @@
+package api
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/grafana/grafana/pkg/plugins"
+	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/web"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestHTTPServer_CheckEnabled(t *testing.T) {
+	tests := []struct {
+		name         string
+		pluginID     string
+		expectedCode int
+	}{
+		{
+			name:         "should return a 404 if the plugin doesn't exist",
+			pluginID:     "missing",
+			expectedCode: 404,
+		},
+		{
+			name:         "should not set an error code if the plugin is not an app",
+			pluginID:     "mysql",
+			expectedCode: 0, // unset
+		},
+		{
+			name:         "should not set an error code if the plugin is enabled",
+			pluginID:     "grafana-test-app",
+			expectedCode: 0, // unset
+		},
+		{
+			name:         "should return a 404 if the plugin is disabled",
+			pluginID:     "grafana-test-app_disabled",
+			expectedCode: 404,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			hs := &HTTPServer{}
+			hs.pluginStore = &pluginstore.FakePluginStore{
+				PluginList: []pluginstore.Plugin{
+					{JSONData: plugins.JSONData{ID: "mysql"}},
+					{JSONData: plugins.JSONData{Type: plugins.TypeApp, ID: "grafana-test-app"}},
+					{JSONData: plugins.JSONData{Type: plugins.TypeApp, ID: "grafana-test-app_disabled"}},
+				},
+			}
+			hs.PluginSettings = &pluginsettings.FakePluginSettings{Plugins: map[string]*pluginsettings.DTO{
+				"grafana-test-app":          {ID: 0, OrgID: 1, PluginID: "grafana-test-app", PluginVersion: "1.0.0", Enabled: true},
+				"grafana-test-app_disabled": {ID: 0, OrgID: 1, PluginID: "grafana-test-app_disabled", PluginVersion: "1.0.0", Enabled: false},
+			}}
+			httpReq, err := http.NewRequest(http.MethodGet, "", nil)
+			httpReq = web.SetURLParams(httpReq, map[string]string{":pluginId": tt.pluginID})
+			require.NoError(t, err)
+
+			responseWriter := web.NewResponseWriter("GET", httptest.NewRecorder())
+			c := &contextmodel.ReqContext{
+				Context:      &web.Context{Req: httpReq, Resp: responseWriter},
+				SignedInUser: &user.SignedInUser{OrgID: 1},
+			}
+			checkAppEnabled(hs.pluginStore, hs.PluginSettings)(c)
+			assert.Equal(t, tt.expectedCode, c.Resp.Status())
+		})
+	}
+}
diff --git a/pkg/api/plugin_dashboards_test.go b/pkg/api/plugin_dashboards_test.go
index ae3709ba39c4d..b815b42428c1f 100644
--- a/pkg/api/plugin_dashboards_test.go
+++ b/pkg/api/plugin_dashboards_test.go
@@ -14,6 +14,7 @@ import (
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/plugindashboards"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/web/webtest"
@@ -44,6 +45,12 @@ func TestGetPluginDashboards(t *testing.T) {
 	s := SetupAPITestServer(t, func(hs *HTTPServer) {
 		hs.pluginDashboardService = pluginDashboardService
 		hs.QuotaService = quotatest.New(false, nil)
+		hs.pluginStore = &pluginstore.FakePluginStore{
+			PluginList: []pluginstore.Plugin{
+				{JSONData: plugins.JSONData{ID: existingPluginID}},
+				{JSONData: plugins.JSONData{ID: "boom"}},
+			},
+		}
 	})
 
 	t.Run("Not signed in should return 404 Not Found", func(t *testing.T) {
diff --git a/pkg/api/plugin_proxy.go b/pkg/api/plugin_proxy.go
index 4a81afbc34f69..1a8a3fbd1909f 100644
--- a/pkg/api/plugin_proxy.go
+++ b/pkg/api/plugin_proxy.go
@@ -51,7 +51,7 @@ func (hs *HTTPServer) ProxyPluginRequest(c *contextmodel.ReqContext) {
 	}
 
 	proxyPath := getProxyPath(c)
-	p, err := pluginproxy.NewPluginProxy(ps, plugin.Routes, c, proxyPath, hs.Cfg, hs.SecretsService, hs.tracer, pluginProxyTransport, hs.Features)
+	p, err := pluginproxy.NewPluginProxy(ps, plugin.Routes, c, proxyPath, hs.Cfg, hs.SecretsService, hs.tracer, pluginProxyTransport, hs.AccessControl, hs.Features)
 	if err != nil {
 		c.JsonApiErr(http.StatusInternalServerError, "Failed to create plugin proxy", err)
 		return
diff --git a/pkg/api/plugin_resource.go b/pkg/api/plugin_resource.go
index 814f0329f8fd1..6f0530effcd2f 100644
--- a/pkg/api/plugin_resource.go
+++ b/pkg/api/plugin_resource.go
@@ -90,14 +90,11 @@ func (hs *HTTPServer) callPluginResourceWithDataSource(c *contextmodel.ReqContex
 func (hs *HTTPServer) pluginResourceRequest(c *contextmodel.ReqContext) (*http.Request, error) {
 	clonedReq := c.Req.Clone(c.Req.Context())
 	rawURL := web.Params(c.Req)["*"]
-	if clonedReq.URL.RawQuery != "" {
-		rawURL += "?" + clonedReq.URL.RawQuery
-	}
-	urlPath, err := url.Parse(rawURL)
-	if err != nil {
-		return nil, err
+
+	clonedReq.URL = &url.URL{
+		Path:     rawURL,
+		RawQuery: clonedReq.URL.RawQuery,
 	}
-	clonedReq.URL = urlPath
 
 	return clonedReq, nil
 }
diff --git a/pkg/api/plugin_resource_test.go b/pkg/api/plugin_resource_test.go
index 914ef903c736b..fa8b32e12a1ad 100644
--- a/pkg/api/plugin_resource_test.go
+++ b/pkg/api/plugin_resource_test.go
@@ -5,11 +5,12 @@ import (
 	"encoding/json"
 	"errors"
 	"io"
+	"net/url"
 	"path/filepath"
 	"strings"
 	"testing"
 
-	"github.com/grafana/grafana-azure-sdk-go/azsettings"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/require"
@@ -29,6 +30,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/oauthtoken/oauthtokentest"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginaccesscontrol"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginconfig"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
 	pluginSettings "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings/service"
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
@@ -46,30 +48,27 @@ func TestCallResource(t *testing.T) {
 
 	cfg := setting.NewCfg()
 	cfg.StaticRootPath = staticRootPath
-	cfg.IsFeatureToggleEnabled = func(_ string) bool {
-		return false
-	}
 	cfg.Azure = &azsettings.AzureSettings{}
 
 	coreRegistry := coreplugin.ProvideCoreRegistry(tracing.InitializeTracerForTest(), nil, &cloudwatch.CloudWatchService{}, nil, nil, nil, nil,
 		nil, nil, nil, nil, testdatasource.ProvideService(), nil, nil, nil, nil, nil, nil)
 
-	textCtx := pluginsintegration.CreateIntegrationTestCtx(t, cfg, coreRegistry)
+	testCtx := pluginsintegration.CreateIntegrationTestCtx(t, cfg, coreRegistry)
 
-	pcp := plugincontext.ProvideService(cfg, localcache.ProvideService(), textCtx.PluginStore, &datasources.FakeDataSourceService{},
-		pluginSettings.ProvideService(db.InitTestDB(t), fakeSecrets.NewFakeSecretsService()), nil, nil)
+	pcp := plugincontext.ProvideService(cfg, localcache.ProvideService(), testCtx.PluginStore, &datasources.FakeCacheService{},
+		&datasources.FakeDataSourceService{}, pluginSettings.ProvideService(db.InitTestDB(t), fakeSecrets.NewFakeSecretsService()), pluginconfig.NewFakePluginRequestConfigProvider())
 
 	srv := SetupAPITestServer(t, func(hs *HTTPServer) {
 		hs.Cfg = cfg
 		hs.pluginContextProvider = pcp
 		hs.QuotaService = quotatest.New(false, nil)
-		hs.pluginStore = textCtx.PluginStore
-		hs.pluginClient = textCtx.PluginClient
+		hs.pluginStore = testCtx.PluginStore
+		hs.pluginClient = testCtx.PluginClient
 		hs.log = log.New("test")
 	})
 
 	t.Run("Test successful response is received for valid request", func(t *testing.T) {
-		req := srv.NewPostRequest("/api/plugins/grafana-testdata-datasource/resources/test", strings.NewReader("{ \"test\": true }"))
+		req := srv.NewPostRequest("/api/plugins/grafana-testdata-datasource/resources/test", strings.NewReader(`{"test": "true"}`))
 		webtest.RequestWithSignedInUser(req, &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{
 			1: accesscontrol.GroupScopesByAction([]accesscontrol.Permission{
 				{Action: pluginaccesscontrol.ActionAppAccess, Scope: pluginaccesscontrol.ScopeProvider.GetResourceAllScope()},
@@ -89,6 +88,82 @@ func TestCallResource(t *testing.T) {
 		require.NoError(t, resp.Body.Close())
 		require.Equal(t, 200, resp.StatusCode)
 	})
+
+	t.Run("Test successful response is received for valid request with the colon character", func(t *testing.T) {
+		req := srv.NewPostRequest("/api/plugins/grafana-testdata-datasource/resources/test-*,*:test-*/_mapping", strings.NewReader(`{"test": "true"}`))
+		webtest.RequestWithSignedInUser(req, &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{
+			1: accesscontrol.GroupScopesByAction([]accesscontrol.Permission{
+				{Action: pluginaccesscontrol.ActionAppAccess, Scope: pluginaccesscontrol.ScopeProvider.GetResourceAllScope()},
+			}),
+		}})
+		resp, err := srv.SendJSON(req)
+		require.NoError(t, err)
+
+		require.NoError(t, resp.Body.Close())
+		require.Equal(t, 200, resp.StatusCode)
+	})
+
+	t.Run("CallResource plugin resource request is created correctly", func(t *testing.T) {
+		type testdataCallResourceTestResponse struct {
+			Message string `json:"message"`
+			Request struct {
+				URL  url.URL
+				Body map[string]any `json:"body"`
+			} `json:"request"`
+		}
+
+		for _, tc := range []struct {
+			name string
+			url  string
+			exp  func(t *testing.T, resp testdataCallResourceTestResponse)
+		}{
+			{
+				name: "Simple URL",
+				url:  "/api/plugins/grafana-testdata-datasource/resources/test",
+				exp: func(t *testing.T, resp testdataCallResourceTestResponse) {
+					require.Equal(t, "Hello world from test datasource!", resp.Message)
+					require.Equal(t, "/test", resp.Request.URL.Path)
+					require.Equal(t, "true", resp.Request.Body["test"])
+					require.Len(t, resp.Request.Body, 1)
+					require.Empty(t, resp.Request.URL.RawQuery)
+					require.Empty(t, resp.Request.URL.Query())
+				},
+			},
+			{
+				name: "URL with query params",
+				url:  "/api/plugins/grafana-testdata-datasource/resources/test?test=true&a=b",
+				exp: func(t *testing.T, resp testdataCallResourceTestResponse) {
+					require.Equal(t, "Hello world from test datasource!", resp.Message)
+					require.Equal(t, "/test", resp.Request.URL.Path)
+					require.Equal(t, "test=true&a=b", resp.Request.URL.RawQuery)
+					query := resp.Request.URL.Query()
+					require.Equal(t, "true", query.Get("test"))
+					require.Equal(t, "b", query.Get("a"))
+					require.Len(t, query, 2)
+				},
+			},
+		} {
+			t.Run(tc.name, func(t *testing.T) {
+				req := srv.NewPostRequest(tc.url, strings.NewReader(`{"test": "true"}`))
+				webtest.RequestWithSignedInUser(req, &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{
+					1: accesscontrol.GroupScopesByAction([]accesscontrol.Permission{
+						{Action: pluginaccesscontrol.ActionAppAccess, Scope: pluginaccesscontrol.ScopeProvider.GetResourceAllScope()},
+					}),
+				}})
+				resp, err := srv.SendJSON(req)
+				require.NoError(t, err)
+
+				var body testdataCallResourceTestResponse
+				require.NoError(t, json.NewDecoder(resp.Body).Decode(&body))
+
+				tc.exp(t, body)
+
+				require.NoError(t, resp.Body.Close())
+				require.Equal(t, 200, resp.StatusCode)
+			})
+		}
+	})
+
 	pluginRegistry := fakes.NewFakePluginRegistry()
 	require.NoError(t, pluginRegistry.Add(context.Background(), &plugins.Plugin{
 		JSONData: plugins.JSONData{
@@ -109,7 +184,7 @@ func TestCallResource(t *testing.T) {
 		hs.Cfg = cfg
 		hs.pluginContextProvider = pcp
 		hs.QuotaService = quotatest.New(false, nil)
-		hs.pluginStore = textCtx.PluginStore
+		hs.pluginStore = testCtx.PluginStore
 		hs.pluginClient = pc
 		hs.log = log.New("test")
 	})
@@ -128,7 +203,7 @@ func TestCallResource(t *testing.T) {
 		_, err = io.Copy(body, resp.Body)
 		require.NoError(t, err)
 
-		expectedBody := `{ "error": "something went wrong", "message": "Failed to call resource", "traceID": "" }`
+		expectedBody := `{ "message": "Failed to call resource", "traceID": "" }`
 		require.JSONEq(t, expectedBody, body.String())
 		require.NoError(t, resp.Body.Close())
 		require.Equal(t, 500, resp.StatusCode)
diff --git a/pkg/api/pluginproxy/ds_auth_provider.go b/pkg/api/pluginproxy/ds_auth_provider.go
index 8eeecc8b88578..c0fe875b9c4f6 100644
--- a/pkg/api/pluginproxy/ds_auth_provider.go
+++ b/pkg/api/pluginproxy/ds_auth_provider.go
@@ -16,6 +16,7 @@ import (
 type DSInfo struct {
 	ID                      int64
 	Updated                 time.Time
+	URL                     string
 	JSONData                map[string]any
 	DecryptedSecureJSONData map[string]string
 }
@@ -24,8 +25,8 @@ type DSInfo struct {
 func ApplyRoute(ctx context.Context, req *http.Request, proxyPath string, route *plugins.Route,
 	ds DSInfo, cfg *setting.Cfg) {
 	proxyPath = strings.TrimPrefix(proxyPath, route.Path)
-
 	data := templateData{
+		URL:            ds.URL,
 		JsonData:       ds.JSONData,
 		SecureJsonData: ds.DecryptedSecureJSONData,
 	}
diff --git a/pkg/api/pluginproxy/ds_proxy.go b/pkg/api/pluginproxy/ds_proxy.go
index 35c1ca2efc559..8037c79a12366 100644
--- a/pkg/api/pluginproxy/ds_proxy.go
+++ b/pkg/api/pluginproxy/ds_proxy.go
@@ -252,6 +252,7 @@ func (proxy *DataSourceProxy) director(req *http.Request) {
 
 		ApplyRoute(req.Context(), req, proxy.proxyPath, proxy.matchedRoute, DSInfo{
 			ID:                      proxy.ds.ID,
+			URL:                     proxy.ds.URL,
 			Updated:                 proxy.ds.Updated,
 			JSONData:                jsonData,
 			DecryptedSecureJSONData: decryptedValues,
@@ -269,13 +270,13 @@ func (proxy *DataSourceProxy) director(req *http.Request) {
 		}
 	}
 
-	if proxy.features.IsEnabled(featuremgmt.FlagIdForwarding) {
+	if proxy.features.IsEnabled(req.Context(), featuremgmt.FlagIdForwarding) {
 		proxyutil.ApplyForwardIDHeader(req, proxy.ctx.SignedInUser)
 	}
 }
 
 func (proxy *DataSourceProxy) validateRequest() error {
-	if !checkWhiteList(proxy.ctx, proxy.targetUrl.Host) {
+	if !proxy.checkWhiteList() {
 		return errors.New("target URL is not a valid target")
 	}
 
@@ -343,6 +344,8 @@ func (proxy *DataSourceProxy) logRequest() {
 		}
 	}
 
+	panelPluginId := proxy.ctx.Req.Header.Get("X-Panel-Plugin-Id")
+
 	ctxLogger := logger.FromContext(proxy.ctx.Req.Context())
 	ctxLogger.Info("Proxying incoming request",
 		"userid", proxy.ctx.UserID,
@@ -351,13 +354,14 @@ func (proxy *DataSourceProxy) logRequest() {
 		"datasource", proxy.ds.Type,
 		"uri", proxy.ctx.Req.RequestURI,
 		"method", proxy.ctx.Req.Method,
+		"panelPluginId", panelPluginId,
 		"body", body)
 }
 
-func checkWhiteList(c *contextmodel.ReqContext, host string) bool {
-	if host != "" && len(setting.DataProxyWhiteList) > 0 {
-		if _, exists := setting.DataProxyWhiteList[host]; !exists {
-			c.JsonApiErr(403, "Data proxy hostname and ip are not included in whitelist", nil)
+func (proxy *DataSourceProxy) checkWhiteList() bool {
+	if proxy.targetUrl.Host != "" && len(proxy.cfg.DataProxyWhiteList) > 0 {
+		if _, exists := proxy.cfg.DataProxyWhiteList[proxy.targetUrl.Host]; !exists {
+			proxy.ctx.JsonApiErr(403, "Data proxy hostname and ip are not included in whitelist", nil)
 			return false
 		}
 	}
diff --git a/pkg/api/pluginproxy/ds_proxy_test.go b/pkg/api/pluginproxy/ds_proxy_test.go
index 9bc1739c82f77..13e6ed00735ba 100644
--- a/pkg/api/pluginproxy/ds_proxy_test.go
+++ b/pkg/api/pluginproxy/ds_proxy_test.go
@@ -45,9 +45,14 @@ import (
 	secretsmng "github.com/grafana/grafana/pkg/services/secrets/manager"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 	"github.com/grafana/grafana/pkg/web"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestDataSourceProxy_routeRule(t *testing.T) {
 	cfg := &setting.Cfg{}
 
@@ -158,6 +163,36 @@ func TestDataSourceProxy_routeRule(t *testing.T) {
 			assert.Equal(t, "http://localhost/asd", req.URL.String())
 		})
 
+		t.Run("When matching route path and has setting url", func(t *testing.T) {
+			ctx, req := setUp()
+			proxy, err := setupDSProxyTest(t, ctx, ds, routes, "api/common/some/method")
+			require.NoError(t, err)
+			proxy.matchedRoute = &plugins.Route{
+				Path: "api/common",
+				URL:  "{{.URL}}",
+				Headers: []plugins.Header{
+					{Name: "x-header", Content: "my secret {{.SecureJsonData.key}}"},
+				},
+				URLParams: []plugins.URLParam{
+					{Name: "{{.JsonData.queryParam}}", Content: "{{.SecureJsonData.key}}"},
+				},
+			}
+
+			dsInfo := DSInfo{
+				ID:       ds.ID,
+				Updated:  ds.Updated,
+				JSONData: jd,
+				DecryptedSecureJSONData: map[string]string{
+					"key": "123",
+				},
+				URL: "https://dynamic.grafana.com",
+			}
+			ApplyRoute(proxy.ctx.Req.Context(), req, proxy.proxyPath, proxy.matchedRoute, dsInfo, proxy.cfg)
+
+			assert.Equal(t, "https://dynamic.grafana.com/some/method?apiKey=123", req.URL.String())
+			assert.Equal(t, "my secret 123", req.Header.Get("x-header"))
+		})
+
 		t.Run("When matching route path and has dynamic body", func(t *testing.T) {
 			ctx, req := setUp()
 			proxy, err := setupDSProxyTest(t, ctx, ds, routes, "api/body")
diff --git a/pkg/api/pluginproxy/pluginproxy.go b/pkg/api/pluginproxy/pluginproxy.go
index ba1bda14c5434..c61a6a284b995 100644
--- a/pkg/api/pluginproxy/pluginproxy.go
+++ b/pkg/api/pluginproxy/pluginproxy.go
@@ -7,8 +7,11 @@ import (
 	"net/http"
 	"net/url"
 
+	"go.opentelemetry.io/otel/attribute"
+
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/plugins"
+	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
@@ -17,10 +20,10 @@ import (
 	"github.com/grafana/grafana/pkg/util"
 	"github.com/grafana/grafana/pkg/util/proxyutil"
 	"github.com/grafana/grafana/pkg/web"
-	"go.opentelemetry.io/otel/attribute"
 )
 
 type PluginProxy struct {
+	accessControl  ac.AccessControl
 	ps             *pluginsettings.DTO
 	pluginRoutes   []*plugins.Route
 	ctx            *contextmodel.ReqContext
@@ -36,8 +39,9 @@ type PluginProxy struct {
 // NewPluginProxy creates a plugin proxy.
 func NewPluginProxy(ps *pluginsettings.DTO, routes []*plugins.Route, ctx *contextmodel.ReqContext,
 	proxyPath string, cfg *setting.Cfg, secretsService secrets.Service, tracer tracing.Tracer,
-	transport *http.Transport, features featuremgmt.FeatureToggles) (*PluginProxy, error) {
+	transport *http.Transport, accessControl ac.AccessControl, features featuremgmt.FeatureToggles) (*PluginProxy, error) {
 	return &PluginProxy{
+		accessControl:  accessControl,
 		ps:             ps,
 		pluginRoutes:   routes,
 		ctx:            ctx,
@@ -66,11 +70,9 @@ func (proxy *PluginProxy) HandleRequest() {
 			continue
 		}
 
-		if route.ReqRole.IsValid() {
-			if !proxy.ctx.HasUserRole(route.ReqRole) {
-				proxy.ctx.JsonApiErr(http.StatusForbidden, "plugin proxy route access denied", nil)
-				return
-			}
+		if !proxy.hasAccessToRoute(route) {
+			proxy.ctx.JsonApiErr(http.StatusForbidden, "plugin proxy route access denied", nil)
+			return
 		}
 
 		if path, exists := params["*"]; exists {
@@ -119,6 +121,21 @@ func (proxy *PluginProxy) HandleRequest() {
 	reverseProxy.ServeHTTP(proxy.ctx.Resp, proxy.ctx.Req)
 }
 
+func (proxy *PluginProxy) hasAccessToRoute(route *plugins.Route) bool {
+	useRBAC := proxy.features.IsEnabled(proxy.ctx.Req.Context(), featuremgmt.FlagAccessControlOnCall) && route.RequiresRBACAction()
+	if useRBAC {
+		hasAccess := ac.HasAccess(proxy.accessControl, proxy.ctx)(ac.EvalPermission(route.ReqAction))
+		if !hasAccess {
+			proxy.ctx.Logger.Debug("plugin route is covered by RBAC, user doesn't have access", "route", proxy.ctx.Req.URL.Path)
+		}
+		return hasAccess
+	}
+	if route.ReqRole.IsValid() {
+		return proxy.ctx.HasUserRole(route.ReqRole)
+	}
+	return true
+}
+
 func (proxy PluginProxy) director(req *http.Request) {
 	secureJsonData, err := proxy.secretsService.DecryptJsonData(proxy.ctx.Req.Context(), proxy.ps.SecureJSONData)
 	if err != nil {
@@ -161,7 +178,7 @@ func (proxy PluginProxy) director(req *http.Request) {
 
 	proxyutil.ApplyUserHeader(proxy.cfg.SendUserHeader, req, proxy.ctx.SignedInUser)
 
-	if proxy.features.IsEnabled(featuremgmt.FlagIdForwarding) {
+	if proxy.features.IsEnabled(req.Context(), featuremgmt.FlagIdForwarding) {
 		proxyutil.ApplyForwardIDHeader(req, proxy.ctx.SignedInUser)
 	}
 
@@ -201,6 +218,7 @@ func (proxy PluginProxy) logRequest() {
 }
 
 type templateData struct {
+	URL            string
 	JsonData       map[string]any
 	SecureJsonData map[string]string
 }
diff --git a/pkg/api/pluginproxy/pluginproxy_test.go b/pkg/api/pluginproxy/pluginproxy_test.go
index 89a5467c168d6..bbd9fe27de119 100644
--- a/pkg/api/pluginproxy/pluginproxy_test.go
+++ b/pkg/api/pluginproxy/pluginproxy_test.go
@@ -14,6 +14,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/org"
@@ -27,7 +28,6 @@ import (
 )
 
 func TestPluginProxy(t *testing.T) {
-	setting.SecretKey = "password"
 	secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore())
 
 	t.Run("When getting proxy headers", func(t *testing.T) {
@@ -262,7 +262,8 @@ func TestPluginProxy(t *testing.T) {
 		ps := &pluginsettings.DTO{
 			SecureJSONData: map[string][]byte{},
 		}
-		proxy, err := NewPluginProxy(ps, routes, ctx, "", &setting.Cfg{}, secretsService, tracing.InitializeTracerForTest(), &http.Transport{}, featuremgmt.WithFeatures())
+		cfg := &setting.Cfg{}
+		proxy, err := NewPluginProxy(ps, routes, ctx, "", cfg, secretsService, tracing.InitializeTracerForTest(), &http.Transport{}, acimpl.ProvideAccessControl(cfg), featuremgmt.WithFeatures())
 		require.NoError(t, err)
 		proxy.HandleRequest()
 
@@ -400,7 +401,8 @@ func TestPluginProxyRoutes(t *testing.T) {
 			ps := &pluginsettings.DTO{
 				SecureJSONData: map[string][]byte{},
 			}
-			proxy, err := NewPluginProxy(ps, testRoutes, ctx, tc.proxyPath, &setting.Cfg{}, secretsService, tracing.InitializeTracerForTest(), &http.Transport{}, featuremgmt.WithFeatures())
+			cfg := &setting.Cfg{}
+			proxy, err := NewPluginProxy(ps, testRoutes, ctx, tc.proxyPath, cfg, secretsService, tracing.InitializeTracerForTest(), &http.Transport{}, acimpl.ProvideAccessControl(cfg), featuremgmt.WithFeatures())
 			require.NoError(t, err)
 			proxy.HandleRequest()
 
@@ -421,6 +423,121 @@ func TestPluginProxyRoutes(t *testing.T) {
 	}
 }
 
+func TestPluginProxyRoutesAccessControl(t *testing.T) {
+	routes := []*plugins.Route{
+		{
+			Path:    "settings",
+			Method:  "GET",
+			URL:     "http://localhost/api/settings",
+			ReqRole: org.RoleAdmin, // Protected by role
+		},
+		{
+			Path:      "projects",
+			Method:    "GET",
+			URL:       "http://localhost/api/projects",
+			ReqAction: "plugin-id.projects:read", // Protected by RBAC action
+		},
+	}
+
+	tcs := []struct {
+		proxyPath       string
+		usrRole         org.RoleType
+		usrPerms        map[string][]string
+		expectedURLPath string
+		expectedStatus  int
+	}{
+		{
+			proxyPath:       "/settings",
+			usrRole:         org.RoleAdmin,
+			expectedURLPath: "/api/settings",
+			expectedStatus:  http.StatusOK,
+		},
+		{
+			proxyPath:       "/settings",
+			usrRole:         org.RoleViewer,
+			expectedURLPath: "/api/settings",
+			expectedStatus:  http.StatusForbidden,
+		},
+		{
+			proxyPath:       "/projects",
+			usrPerms:        map[string][]string{"plugin-id.projects:read": {}},
+			expectedURLPath: "/api/projects",
+			expectedStatus:  http.StatusOK,
+		},
+		{
+			proxyPath:       "/projects",
+			usrPerms:        map[string][]string{},
+			expectedURLPath: "/api/projects",
+			expectedStatus:  http.StatusForbidden,
+		},
+	}
+
+	for _, tc := range tcs {
+		t.Run(fmt.Sprintf("Should enforce RBAC when proxying path %s %s", tc.proxyPath, http.StatusText(tc.expectedStatus)), func(t *testing.T) {
+			secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore())
+			requestHandled := false
+			requestURL := ""
+			backendServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				requestURL = r.URL.RequestURI()
+				w.WriteHeader(200)
+				_, _ = w.Write([]byte("I am the backend"))
+				requestHandled = true
+			}))
+			t.Cleanup(backendServer.Close)
+
+			backendURL, err := url.Parse(backendServer.URL)
+			require.NoError(t, err)
+
+			testRoutes := make([]*plugins.Route, len(routes))
+			for i, r := range routes {
+				u, err := url.Parse(r.URL)
+				require.NoError(t, err)
+				u.Scheme = backendURL.Scheme
+				u.Host = backendURL.Host
+				testRoute := *r
+				testRoute.URL = u.String()
+				testRoutes[i] = &testRoute
+			}
+
+			responseWriter := web.NewResponseWriter("GET", httptest.NewRecorder())
+
+			ctx := &contextmodel.ReqContext{
+				Logger: logger.New("pluginproxy-test"),
+				SignedInUser: &user.SignedInUser{
+					OrgID:       1,
+					OrgRole:     tc.usrRole,
+					Permissions: map[int64]map[string][]string{1: tc.usrPerms},
+				},
+				Context: &web.Context{
+					Req:  httptest.NewRequest("GET", tc.proxyPath, nil),
+					Resp: responseWriter,
+				},
+			}
+			ps := &pluginsettings.DTO{
+				SecureJSONData: map[string][]byte{},
+			}
+			cfg := &setting.Cfg{}
+			proxy, err := NewPluginProxy(ps, testRoutes, ctx, tc.proxyPath, cfg, secretsService, tracing.InitializeTracerForTest(), &http.Transport{}, acimpl.ProvideAccessControl(cfg), featuremgmt.WithFeatures(featuremgmt.FlagAccessControlOnCall))
+			require.NoError(t, err)
+			proxy.HandleRequest()
+
+			for {
+				if requestHandled || ctx.Resp.Written() {
+					break
+				}
+			}
+
+			require.Equal(t, tc.expectedStatus, ctx.Resp.Status())
+
+			if tc.expectedStatus == http.StatusForbidden {
+				return
+			}
+
+			require.Equal(t, tc.expectedURLPath, requestURL)
+		})
+	}
+}
+
 // getPluginProxiedRequest is a helper for easier setup of tests based on global config and ReqContext.
 func getPluginProxiedRequest(t *testing.T, ps *pluginsettings.DTO, secretsService secrets.Service, ctx *contextmodel.ReqContext, cfg *setting.Cfg, route *plugins.Route) *http.Request {
 	// insert dummy route if none is specified
@@ -431,7 +548,7 @@ func getPluginProxiedRequest(t *testing.T, ps *pluginsettings.DTO, secretsServic
 			ReqRole: org.RoleEditor,
 		}
 	}
-	proxy, err := NewPluginProxy(ps, []*plugins.Route{}, ctx, "", cfg, secretsService, tracing.InitializeTracerForTest(), &http.Transport{}, featuremgmt.WithFeatures())
+	proxy, err := NewPluginProxy(ps, []*plugins.Route{}, ctx, "", cfg, secretsService, tracing.InitializeTracerForTest(), &http.Transport{}, acimpl.ProvideAccessControl(cfg), featuremgmt.WithFeatures())
 	require.NoError(t, err)
 
 	req, err := http.NewRequest(http.MethodGet, "/api/plugin-proxy/grafana-simple-app/api/v4/alerts", nil)
diff --git a/pkg/api/pluginproxy/token_provider_azure.go b/pkg/api/pluginproxy/token_provider_azure.go
index c2ef22bfe8dc3..aa42ac8b62678 100644
--- a/pkg/api/pluginproxy/token_provider_azure.go
+++ b/pkg/api/pluginproxy/token_provider_azure.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"strings"
 
-	"github.com/grafana/grafana-azure-sdk-go/azcredentials"
-	"github.com/grafana/grafana-azure-sdk-go/azsettings"
-	"github.com/grafana/grafana-azure-sdk-go/aztokenprovider"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azcredentials"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
+	"github.com/grafana/grafana-azure-sdk-go/v2/aztokenprovider"
 
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/setting"
diff --git a/pkg/api/plugins.go b/pkg/api/plugins.go
index 30500e1cae348..59209f4491053 100644
--- a/pkg/api/plugins.go
+++ b/pkg/api/plugins.go
@@ -21,10 +21,12 @@ import (
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/pfs"
 	"github.com/grafana/grafana/pkg/plugins/repo"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginaccesscontrol"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
@@ -139,7 +141,11 @@ func (hs *HTTPServer) GetPluginList(c *contextmodel.ReqContext) response.Respons
 			SignatureType:   pluginDef.SignatureType,
 			SignatureOrg:    pluginDef.SignatureOrg,
 			AccessControl:   pluginsMetadata[pluginDef.ID],
-			AngularDetected: pluginDef.AngularDetected,
+			AngularDetected: pluginDef.Angular.Detected,
+		}
+
+		if hs.Features.IsEnabled(c.Req.Context(), featuremgmt.FlagExternalServiceAccounts) {
+			listItem.IAM = pluginDef.IAM
 		}
 
 		update, exists := hs.pluginsUpdateChecker.HasUpdate(c.Req.Context(), pluginDef.ID)
@@ -196,7 +202,7 @@ func (hs *HTTPServer) GetPluginSettingByID(c *contextmodel.ReqContext) response.
 		SignatureType:    plugin.SignatureType,
 		SignatureOrg:     plugin.SignatureOrg,
 		SecureJsonFields: map[string]bool{},
-		AngularDetected:  plugin.AngularDetected,
+		AngularDetected:  plugin.Angular.Detected,
 	}
 
 	if plugin.IsApp() {
@@ -241,7 +247,7 @@ func (hs *HTTPServer) UpdatePluginSetting(c *contextmodel.ReqContext) response.R
 	pluginID := web.Params(c.Req)[":pluginId"]
 
 	if _, exists := hs.pluginStore.Plugin(c.Req.Context(), pluginID); !exists {
-		return response.Error(404, "Plugin not installed", nil)
+		return response.Error(http.StatusNotFound, "Plugin not installed", nil)
 	}
 
 	cmd.OrgId = c.SignedInUser.GetOrgID()
@@ -256,7 +262,7 @@ func (hs *HTTPServer) UpdatePluginSetting(c *contextmodel.ReqContext) response.R
 		OrgID:                   cmd.OrgId,
 		EncryptedSecureJSONData: cmd.EncryptedSecureJsonData,
 	}); err != nil {
-		return response.Error(500, "Failed to update plugin setting", err)
+		return response.Error(http.StatusInternalServerError, "Failed to update plugin setting", err)
 	}
 
 	hs.pluginContextProvider.InvalidateSettingsCache(c.Req.Context(), pluginID)
@@ -268,7 +274,12 @@ func (hs *HTTPServer) GetPluginMarkdown(c *contextmodel.ReqContext) response.Res
 	pluginID := web.Params(c.Req)[":pluginId"]
 	name := web.Params(c.Req)[":name"]
 
-	content, err := hs.pluginMarkdown(c.Req.Context(), pluginID, name)
+	p, exists := hs.pluginStore.Plugin(c.Req.Context(), pluginID)
+	if !exists {
+		return response.Error(http.StatusNotFound, "Plugin not installed", nil)
+	}
+
+	content, err := hs.pluginMarkdown(c.Req.Context(), pluginID, p.Info.Version, name)
 	if err != nil {
 		var notFound plugins.NotFoundError
 		if errors.As(err, &notFound) {
@@ -280,7 +291,7 @@ func (hs *HTTPServer) GetPluginMarkdown(c *contextmodel.ReqContext) response.Res
 
 	// fallback try readme
 	if len(content) == 0 {
-		content, err = hs.pluginMarkdown(c.Req.Context(), pluginID, "readme")
+		content, err = hs.pluginMarkdown(c.Req.Context(), pluginID, p.Info.Version, "readme")
 		if err != nil {
 			if errors.Is(err, plugins.ErrFileNotExist) {
 				return response.Error(http.StatusNotFound, plugins.ErrFileNotExist.Error(), nil)
@@ -348,7 +359,7 @@ func (hs *HTTPServer) getPluginAssets(c *contextmodel.ReqContext) {
 
 // serveLocalPluginAsset returns the content of a plugin asset file from the local filesystem to the http client.
 func (hs *HTTPServer) serveLocalPluginAsset(c *contextmodel.ReqContext, plugin pluginstore.Plugin, assetPath string) {
-	f, err := hs.pluginFileStore.File(c.Req.Context(), plugin.ID, assetPath)
+	f, err := hs.pluginFileStore.File(c.Req.Context(), plugin.ID, plugin.Info.Version, assetPath)
 	if err != nil {
 		if errors.Is(err, plugins.ErrFileNotExist) {
 			c.JsonApiErr(404, "Plugin file not found", nil)
@@ -380,6 +391,8 @@ func (hs *HTTPServer) redirectCDNPluginAsset(c *contextmodel.ReqContext, plugin
 		"pluginVersion", plugin.Info.Version,
 		"assetPath", assetPath,
 		"remoteURL", remoteURL,
+		"referer", c.Req.Referer(),
+		"user", c.Login,
 	)
 	pluginsCDNFallbackRedirectRequests.With(prometheus.Labels{
 		"plugin_id":      plugin.ID,
@@ -445,14 +458,6 @@ func (hs *HTTPServer) InstallPlugin(c *contextmodel.ReqContext) response.Respons
 		if errors.As(err, &dupeErr) {
 			return response.Error(http.StatusConflict, "Plugin already installed", err)
 		}
-		var versionUnsupportedErr repo.ErrVersionUnsupported
-		if errors.As(err, &versionUnsupportedErr) {
-			return response.Error(http.StatusConflict, "Plugin version not supported", err)
-		}
-		var versionNotFoundErr repo.ErrVersionNotFound
-		if errors.As(err, &versionNotFoundErr) {
-			return response.Error(http.StatusNotFound, "Plugin version not found", err)
-		}
 		var clientError repo.ErrResponse4xx
 		if errors.As(err, &clientError) {
 			return response.Error(clientError.StatusCode(), clientError.Message(), err)
@@ -460,12 +465,15 @@ func (hs *HTTPServer) InstallPlugin(c *contextmodel.ReqContext) response.Respons
 		if errors.Is(err, plugins.ErrInstallCorePlugin) {
 			return response.Error(http.StatusForbidden, "Cannot install or change a Core plugin", err)
 		}
-		var archError repo.ErrArcNotFound
-		if errors.As(err, &archError) {
-			return response.Error(http.StatusNotFound, archError.Error(), nil)
-		}
 
-		return response.Error(http.StatusInternalServerError, "Failed to install plugin", err)
+		return response.ErrOrFallback(http.StatusInternalServerError, "Failed to install plugin", err)
+	}
+
+	if hs.Features.IsEnabled(c.Req.Context(), featuremgmt.FlagExternalServiceAccounts) {
+		// This is a non-blocking function that verifies that the installer has
+		// the permissions that the plugin requests to have on Grafana.
+		// If we want to make this blocking, the check will have to happen before or during the installation.
+		hs.hasPluginRequestedPermissions(c, pluginID)
 	}
 
 	return response.JSON(http.StatusOK, []byte{})
@@ -473,8 +481,12 @@ func (hs *HTTPServer) InstallPlugin(c *contextmodel.ReqContext) response.Respons
 
 func (hs *HTTPServer) UninstallPlugin(c *contextmodel.ReqContext) response.Response {
 	pluginID := web.Params(c.Req)[":pluginId"]
+	plugin, exists := hs.pluginStore.Plugin(c.Req.Context(), pluginID)
+	if !exists {
+		return response.Error(http.StatusNotFound, "Plugin not installed", nil)
+	}
 
-	err := hs.pluginInstaller.Remove(c.Req.Context(), pluginID)
+	err := hs.pluginInstaller.Remove(c.Req.Context(), pluginID, plugin.Info.Version)
 	if err != nil {
 		if errors.Is(err, plugins.ErrPluginNotInstalled) {
 			return response.Error(http.StatusNotFound, "Plugin not installed", err)
@@ -491,19 +503,19 @@ func translatePluginRequestErrorToAPIError(err error) response.Response {
 	return response.ErrOrFallback(http.StatusInternalServerError, "Plugin request failed", err)
 }
 
-func (hs *HTTPServer) pluginMarkdown(ctx context.Context, pluginID string, name string) ([]byte, error) {
+func (hs *HTTPServer) pluginMarkdown(ctx context.Context, pluginID, pluginVersion, name string) ([]byte, error) {
 	file, err := mdFilepath(strings.ToUpper(name))
 	if err != nil {
 		return make([]byte, 0), err
 	}
 
-	md, err := hs.pluginFileStore.File(ctx, pluginID, file)
+	md, err := hs.pluginFileStore.File(ctx, pluginID, pluginVersion, file)
 	if err != nil {
 		if errors.Is(err, plugins.ErrPluginNotInstalled) {
 			return make([]byte, 0), plugins.NotFoundError{PluginID: pluginID}
 		}
 
-		md, err = hs.pluginFileStore.File(ctx, pluginID, strings.ToLower(file))
+		md, err = hs.pluginFileStore.File(ctx, pluginID, pluginVersion, strings.ToLower(file))
 		if err != nil {
 			return make([]byte, 0), nil
 		}
@@ -511,6 +523,47 @@ func (hs *HTTPServer) pluginMarkdown(ctx context.Context, pluginID string, name
 	return md.Content, nil
 }
 
+// hasPluginRequestedPermissions logs if the plugin installer does not have the permissions that the plugin requests to have on Grafana.
+func (hs *HTTPServer) hasPluginRequestedPermissions(c *contextmodel.ReqContext, pluginID string) {
+	plugin, ok := hs.pluginStore.Plugin(c.Req.Context(), pluginID)
+	if !ok {
+		hs.log.Debug("plugin has not been installed", "pluginID", pluginID)
+		return
+	}
+
+	// No registration => Early return
+	if plugin.JSONData.IAM == nil || len(plugin.JSONData.IAM.Permissions) == 0 {
+		hs.log.Debug("plugin did not request permissions on Grafana", "pluginID", pluginID)
+		return
+	}
+
+	hs.log.Debug("check installer's permissions, plugin wants to register an external service")
+	evaluator := evalAllPermissions(plugin.JSONData.IAM.Permissions)
+	hasAccess := ac.HasGlobalAccess(hs.AccessControl, hs.accesscontrolService, c)
+	if hs.Cfg.RBACSingleOrganization {
+		// In a single organization setup, no need for a global check
+		hasAccess = ac.HasAccess(hs.AccessControl, c)
+	}
+
+	// Log a warning if the user does not have the plugin requested permissions
+	if !hasAccess(evaluator) {
+		hs.log.Warn("Plugin installer has less permission than what the plugin requires.", "Permissions", evaluator.String())
+	}
+}
+
+// evalAllPermissions generates an evaluator with all permissions from the input slice
+func evalAllPermissions(ps []pfs.Permission) ac.Evaluator {
+	res := []ac.Evaluator{}
+	for _, p := range ps {
+		if p.Scope != nil {
+			res = append(res, ac.EvalPermission(p.Action, *p.Scope))
+			continue
+		}
+		res = append(res, ac.EvalPermission(p.Action))
+	}
+	return ac.EvalAll(res...)
+}
+
 func mdFilepath(mdFilename string) (string, error) {
 	fileExt := filepath.Ext(mdFilename)
 	switch fileExt {
diff --git a/pkg/api/plugins_test.go b/pkg/api/plugins_test.go
index e0f6a1457b2b0..9fdcf916ebcb5 100644
--- a/pkg/api/plugins_test.go
+++ b/pkg/api/plugins_test.go
@@ -20,14 +20,18 @@ import (
 
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/log/logtest"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/manager/fakes"
 	"github.com/grafana/grafana/pkg/plugins/manager/filestore"
 	"github.com/grafana/grafana/pkg/plugins/manager/registry"
+	"github.com/grafana/grafana/pkg/plugins/pfs"
 	"github.com/grafana/grafana/pkg/plugins/pluginscdn"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/org/orgtest"
@@ -35,7 +39,9 @@ import (
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 	"github.com/grafana/grafana/pkg/services/updatechecker"
+	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/web"
 	"github.com/grafana/grafana/pkg/web/webtest"
 )
 
@@ -43,38 +49,57 @@ func Test_PluginsInstallAndUninstall(t *testing.T) {
 	canInstall := []ac.Permission{{Action: pluginaccesscontrol.ActionInstall}}
 	cannotInstall := []ac.Permission{{Action: "plugins:cannotinstall"}}
 
+	pluginID := "grafana-test-datasource"
+	localOrg := int64(1)
+	globalOrg := int64(ac.GlobalOrgID)
+
 	type testCase struct {
 		expectedCode                     int
+		permissionOrg                    int64
 		permissions                      []ac.Permission
 		pluginAdminEnabled               bool
 		pluginAdminExternalManageEnabled bool
+		singleOrganization               bool
 	}
 	tcs := []testCase{
-		{expectedCode: http.StatusNotFound, permissions: canInstall, pluginAdminEnabled: true, pluginAdminExternalManageEnabled: true},
-		{expectedCode: http.StatusNotFound, permissions: canInstall, pluginAdminEnabled: false, pluginAdminExternalManageEnabled: true},
-		{expectedCode: http.StatusNotFound, permissions: canInstall, pluginAdminEnabled: false, pluginAdminExternalManageEnabled: false},
-		{expectedCode: http.StatusForbidden, permissions: cannotInstall, pluginAdminEnabled: true, pluginAdminExternalManageEnabled: false},
-		{expectedCode: http.StatusOK, permissions: canInstall, pluginAdminEnabled: true, pluginAdminExternalManageEnabled: false},
+		{expectedCode: http.StatusNotFound, permissionOrg: globalOrg, permissions: canInstall, pluginAdminEnabled: true, pluginAdminExternalManageEnabled: true},
+		{expectedCode: http.StatusNotFound, permissionOrg: globalOrg, permissions: canInstall, pluginAdminEnabled: false, pluginAdminExternalManageEnabled: true},
+		{expectedCode: http.StatusNotFound, permissionOrg: globalOrg, permissions: canInstall, pluginAdminEnabled: false, pluginAdminExternalManageEnabled: false},
+		{expectedCode: http.StatusForbidden, permissionOrg: globalOrg, permissions: cannotInstall, pluginAdminEnabled: true, pluginAdminExternalManageEnabled: false},
+		{expectedCode: http.StatusOK, permissionOrg: globalOrg, permissions: canInstall, pluginAdminEnabled: true, pluginAdminExternalManageEnabled: false},
+		{expectedCode: http.StatusForbidden, permissionOrg: localOrg, permissions: canInstall, pluginAdminEnabled: true, pluginAdminExternalManageEnabled: false},
+		{expectedCode: http.StatusForbidden, permissionOrg: localOrg, permissions: cannotInstall, pluginAdminEnabled: true, pluginAdminExternalManageEnabled: false, singleOrganization: true},
+		{expectedCode: http.StatusOK, permissionOrg: localOrg, permissions: canInstall, pluginAdminEnabled: true, pluginAdminExternalManageEnabled: false, singleOrganization: true},
 	}
 
 	testName := func(action string, tc testCase) string {
-		return fmt.Sprintf("%s request returns %d when adminEnabled: %t, externalEnabled: %t, permissions: %q",
-			action, tc.expectedCode, tc.pluginAdminEnabled, tc.pluginAdminExternalManageEnabled, tc.permissions)
+		return fmt.Sprintf("%s request returns %d when adminEnabled: %t, externalEnabled: %t, permissions: %d: %s, single_org: %t",
+			action, tc.expectedCode, tc.pluginAdminEnabled, tc.pluginAdminExternalManageEnabled, tc.permissionOrg, tc.permissions[0].Action, tc.singleOrganization)
 	}
 
 	for _, tc := range tcs {
 		server := SetupAPITestServer(t, func(hs *HTTPServer) {
-			hs.Cfg = &setting.Cfg{
-				PluginAdminEnabled:               tc.pluginAdminEnabled,
-				PluginAdminExternalManageEnabled: tc.pluginAdminExternalManageEnabled}
+			hs.Cfg = setting.NewCfg()
+			hs.Cfg.PluginAdminEnabled = tc.pluginAdminEnabled
+			hs.Cfg.PluginAdminExternalManageEnabled = tc.pluginAdminExternalManageEnabled
+			hs.Cfg.RBACSingleOrganization = tc.singleOrganization
+
 			hs.orgService = &orgtest.FakeOrgService{ExpectedOrg: &org.Org{}}
+			hs.accesscontrolService = &actest.FakeService{}
+
 			hs.pluginInstaller = NewFakePluginInstaller()
 			hs.pluginFileStore = &fakes.FakePluginFileStore{}
+			hs.pluginStore = pluginstore.NewFakePluginStore(pluginstore.Plugin{
+				JSONData: plugins.JSONData{
+					ID: pluginID,
+				},
+			})
 		})
 
 		t.Run(testName("Install", tc), func(t *testing.T) {
 			input := strings.NewReader(`{"version": "1.0.2"}`)
-			req := webtest.RequestWithSignedInUser(server.NewPostRequest("/api/plugins/test/install", input), userWithPermissions(1, tc.permissions))
+			endpoint := fmt.Sprintf("/api/plugins/%s/install", pluginID)
+			req := webtest.RequestWithSignedInUser(server.NewPostRequest(endpoint, input), userWithPermissions(tc.permissionOrg, tc.permissions))
 			res, err := server.SendJSON(req)
 			require.NoError(t, err)
 			require.Equal(t, tc.expectedCode, res.StatusCode)
@@ -83,7 +108,8 @@ func Test_PluginsInstallAndUninstall(t *testing.T) {
 
 		t.Run(testName("Uninstall", tc), func(t *testing.T) {
 			input := strings.NewReader("{ }")
-			req := webtest.RequestWithSignedInUser(server.NewPostRequest("/api/plugins/test/uninstall", input), userWithPermissions(1, tc.permissions))
+			endpoint := fmt.Sprintf("/api/plugins/%s/uninstall", pluginID)
+			req := webtest.RequestWithSignedInUser(server.NewPostRequest(endpoint, input), userWithPermissions(tc.permissionOrg, tc.permissions))
 			res, err := server.SendJSON(req)
 			require.NoError(t, err)
 			require.Equal(t, tc.expectedCode, res.StatusCode)
@@ -383,14 +409,14 @@ func TestMakePluginResourceRequestContentTypeEmpty(t *testing.T) {
 func TestPluginMarkdown(t *testing.T) {
 	t.Run("Plugin not installed returns error", func(t *testing.T) {
 		pluginFileStore := &fakes.FakePluginFileStore{
-			FileFunc: func(ctx context.Context, pluginID, filename string) (*plugins.File, error) {
+			FileFunc: func(ctx context.Context, pluginID, pluginVersion, filename string) (*plugins.File, error) {
 				return nil, plugins.ErrPluginNotInstalled
 			},
 		}
 		hs := HTTPServer{pluginFileStore: pluginFileStore}
 
 		pluginID := "test-datasource"
-		md, err := hs.pluginMarkdown(context.Background(), pluginID, "test")
+		md, err := hs.pluginMarkdown(context.Background(), pluginID, "", "test")
 		require.ErrorAs(t, err, &plugins.NotFoundError{PluginID: pluginID})
 		require.Equal(t, []byte{}, md)
 	})
@@ -398,7 +424,7 @@ func TestPluginMarkdown(t *testing.T) {
 	t.Run("File fetch will be retried using different casing if error occurs", func(t *testing.T) {
 		var requestedFiles []string
 		pluginFileStore := &fakes.FakePluginFileStore{
-			FileFunc: func(ctx context.Context, pluginID, filename string) (*plugins.File, error) {
+			FileFunc: func(ctx context.Context, pluginID, pluginVersion, filename string) (*plugins.File, error) {
 				requestedFiles = append(requestedFiles, filename)
 				return nil, errors.New("some error")
 			},
@@ -406,7 +432,7 @@ func TestPluginMarkdown(t *testing.T) {
 
 		hs := HTTPServer{pluginFileStore: pluginFileStore}
 
-		md, err := hs.pluginMarkdown(context.Background(), "", "reAdMe")
+		md, err := hs.pluginMarkdown(context.Background(), "", "", "reAdMe")
 		require.NoError(t, err)
 		require.Equal(t, []byte{}, md)
 		require.Equal(t, []string{"README.md", "readme.md"}, requestedFiles)
@@ -435,7 +461,7 @@ func TestPluginMarkdown(t *testing.T) {
 			data := []byte{123}
 			var requestedFiles []string
 			pluginFileStore := &fakes.FakePluginFileStore{
-				FileFunc: func(ctx context.Context, pluginID, filename string) (*plugins.File, error) {
+				FileFunc: func(ctx context.Context, pluginID, pluginVersion, filename string) (*plugins.File, error) {
 					requestedFiles = append(requestedFiles, filename)
 					return &plugins.File{Content: data}, nil
 				},
@@ -443,7 +469,7 @@ func TestPluginMarkdown(t *testing.T) {
 
 			hs := HTTPServer{pluginFileStore: pluginFileStore}
 
-			md, err := hs.pluginMarkdown(context.Background(), "test-datasource", tc.filePath)
+			md, err := hs.pluginMarkdown(context.Background(), "test-datasource", "", tc.filePath)
 			require.NoError(t, err)
 			require.Equal(t, data, md)
 			require.Equal(t, tc.expected, requestedFiles)
@@ -453,7 +479,7 @@ func TestPluginMarkdown(t *testing.T) {
 	t.Run("Non markdown file request returns an error", func(t *testing.T) {
 		hs := HTTPServer{pluginFileStore: &fakes.FakePluginFileStore{}}
 
-		md, err := hs.pluginMarkdown(context.Background(), "", "test.json")
+		md, err := hs.pluginMarkdown(context.Background(), "", "", "test.json")
 		require.ErrorIs(t, err, ErrUnexpectedFileExtension)
 		require.Equal(t, []byte{}, md)
 	})
@@ -462,14 +488,14 @@ func TestPluginMarkdown(t *testing.T) {
 		data := []byte{1, 2, 3}
 
 		pluginFileStore := &fakes.FakePluginFileStore{
-			FileFunc: func(ctx context.Context, pluginID, filename string) (*plugins.File, error) {
+			FileFunc: func(ctx context.Context, pluginID, pluginVersion, filename string) (*plugins.File, error) {
 				return &plugins.File{Content: data}, nil
 			},
 		}
 
 		hs := HTTPServer{pluginFileStore: pluginFileStore}
 
-		md, err := hs.pluginMarkdown(context.Background(), "", "someFile")
+		md, err := hs.pluginMarkdown(context.Background(), "", "", "someFile")
 		require.NoError(t, err)
 		require.Equal(t, data, md)
 	})
@@ -482,13 +508,12 @@ func callGetPluginAsset(sc *scenarioContext) {
 func pluginAssetScenario(t *testing.T, desc string, url string, urlPattern string,
 	cfg *setting.Cfg, pluginRegistry registry.Service, fn scenarioFunc) {
 	t.Run(fmt.Sprintf("%s %s", desc, url), func(t *testing.T) {
-		cfg.IsFeatureToggleEnabled = func(_ string) bool { return false }
 		hs := HTTPServer{
 			Cfg:             cfg,
 			pluginStore:     pluginstore.New(pluginRegistry, &fakes.FakeLoader{}),
 			pluginFileStore: filestore.ProvideService(pluginRegistry),
 			log:             log.NewNopLogger(),
-			pluginsCDNService: pluginscdn.ProvideService(&config.Cfg{
+			pluginsCDNService: pluginscdn.ProvideService(&config.PluginManagementCfg{
 				PluginsCDNURLTemplate: cfg.PluginsCDNURLTemplate,
 				PluginSettings:        cfg.PluginSettings,
 			}),
@@ -625,3 +650,97 @@ func createPlugin(jd plugins.JSONData, class plugins.Class, files plugins.FS) *p
 		FS:       files,
 	}
 }
+
+func TestHTTPServer_hasPluginRequestedPermissions(t *testing.T) {
+	newStr := func(s string) *string {
+		return &s
+	}
+	pluginReg := pluginstore.Plugin{
+		JSONData: plugins.JSONData{
+			ID: "grafana-test-app",
+			IAM: &pfs.IAM{
+				Permissions: []pfs.Permission{{Action: ac.ActionUsersRead, Scope: newStr(ac.ScopeUsersAll)}, {Action: ac.ActionUsersCreate}},
+			},
+		},
+	}
+
+	tests := []struct {
+		name        string
+		plugin      pluginstore.Plugin
+		orgID       int64
+		singleOrg   bool
+		permissions map[int64]map[string][]string
+		warnCount   int
+	}{
+		{
+			name: "no warn if plugin has no registration",
+			plugin: pluginstore.Plugin{
+				JSONData: plugins.JSONData{
+					ID: "grafana-test-app",
+				},
+			},
+			warnCount: 0,
+		},
+		{
+			name:   "warn if user does not have plugin permissions globally",
+			plugin: pluginReg,
+			orgID:  1,
+			permissions: map[int64]map[string][]string{
+				1: {ac.ActionUsersRead: {ac.ScopeUsersAll}, ac.ActionUsersCreate: {}},
+			},
+			warnCount: 1,
+		},
+		{
+			name:   "no warn if user has plugin permissions globally",
+			plugin: pluginReg,
+			orgID:  0,
+			permissions: map[int64]map[string][]string{
+				0: {ac.ActionUsersRead: {ac.ScopeUsersAll}, ac.ActionUsersCreate: {}},
+			},
+			warnCount: 0,
+		},
+		{
+			name:      "no warn if user has plugin permissions in single organization",
+			plugin:    pluginReg,
+			singleOrg: true,
+			orgID:     1,
+			permissions: map[int64]map[string][]string{
+				1: {ac.ActionUsersRead: {ac.ScopeUsersAll}, ac.ActionUsersCreate: {}},
+			},
+			warnCount: 0,
+		},
+		{
+			name:        "warn if user does not have all plugin permissions",
+			plugin:      pluginReg,
+			singleOrg:   true,
+			orgID:       1,
+			permissions: map[int64]map[string][]string{1: {ac.ActionUsersCreate: {}}},
+			warnCount:   1,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			logger := &logtest.Fake{}
+			hs := &HTTPServer{}
+			httpReq, err := http.NewRequest(http.MethodGet, "", nil)
+			require.NoError(t, err)
+
+			hs.Cfg = setting.NewCfg()
+			hs.Cfg.RBACSingleOrganization = tt.singleOrg
+			hs.pluginStore = &pluginstore.FakePluginStore{
+				PluginList: []pluginstore.Plugin{tt.plugin},
+			}
+			hs.log = logger
+			hs.accesscontrolService = actest.FakeService{}
+			hs.AccessControl = acimpl.ProvideAccessControl(hs.Cfg)
+
+			c := &contextmodel.ReqContext{
+				Context:      &web.Context{Req: httpReq},
+				SignedInUser: &user.SignedInUser{OrgID: tt.orgID, Permissions: tt.permissions},
+			}
+			hs.hasPluginRequestedPermissions(c, "grafana-test-app")
+
+			assert.Equal(t, tt.warnCount, logger.WarnLogs.Calls)
+		})
+	}
+}
diff --git a/pkg/api/render.go b/pkg/api/render.go
index eb895d3bfa6a9..289d4d988c9dd 100644
--- a/pkg/api/render.go
+++ b/pkg/api/render.go
@@ -18,34 +18,31 @@ import (
 func (hs *HTTPServer) RenderToPng(c *contextmodel.ReqContext) {
 	queryReader, err := util.NewURLQueryReader(c.Req.URL)
 	if err != nil {
-		c.Handle(hs.Cfg, 400, "Render parameters error", err)
+		c.Handle(hs.Cfg, http.StatusBadRequest, "Render parameters error", err)
 		return
 	}
 
 	queryParams := fmt.Sprintf("?%s", c.Req.URL.RawQuery)
 
-	width, err := strconv.Atoi(queryReader.Get("width", "800"))
-	if err != nil {
-		c.Handle(hs.Cfg, 400, "Render parameters error", fmt.Errorf("cannot parse width as int: %s", err))
-		return
+	width := c.QueryInt("width")
+	if width == 0 {
+		width = hs.Cfg.RendererDefaultImageWidth
 	}
 
-	height, err := strconv.Atoi(queryReader.Get("height", "400"))
-	if err != nil {
-		c.Handle(hs.Cfg, 400, "Render parameters error", fmt.Errorf("cannot parse height as int: %s", err))
-		return
+	height := c.QueryInt("height")
+	if height == 0 {
+		height = hs.Cfg.RendererDefaultImageHeight
 	}
 
 	timeout, err := strconv.Atoi(queryReader.Get("timeout", "60"))
 	if err != nil {
-		c.Handle(hs.Cfg, 400, "Render parameters error", fmt.Errorf("cannot parse timeout as int: %s", err))
+		c.Handle(hs.Cfg, http.StatusBadRequest, "Render parameters error", fmt.Errorf("cannot parse timeout as int: %s", err))
 		return
 	}
 
-	scale, err := strconv.ParseFloat(queryReader.Get("scale", "1"), 64)
-	if err != nil {
-		c.Handle(hs.Cfg, 400, "Render parameters error", fmt.Errorf("cannot parse scale as float: %s", err))
-		return
+	scale := c.QueryFloat64("scale")
+	if scale == 0 {
+		scale = hs.Cfg.RendererDefaultImageScale
 	}
 
 	headers := http.Header{}
@@ -59,7 +56,9 @@ func (hs *HTTPServer) RenderToPng(c *contextmodel.ReqContext) {
 		hs.log.Error("Failed to parse user id", "err", errID)
 	}
 
-	result, err := hs.RenderService.Render(c.Req.Context(), rendering.Opts{
+	encoding := queryReader.Get("encoding", "")
+
+	result, err := hs.RenderService.Render(c.Req.Context(), rendering.RenderPNG, rendering.Opts{
 		TimeoutOpts: rendering.TimeoutOpts{
 			Timeout: time.Duration(timeout) * time.Second,
 		},
@@ -72,7 +71,7 @@ func (hs *HTTPServer) RenderToPng(c *contextmodel.ReqContext) {
 		Height:            height,
 		Path:              web.Params(c.Req)["*"] + queryParams,
 		Timezone:          queryReader.Get("tz", ""),
-		Encoding:          queryReader.Get("encoding", ""),
+		Encoding:          encoding,
 		ConcurrentLimit:   hs.Cfg.RendererConcurrentRequestLimit,
 		DeviceScaleFactor: scale,
 		Headers:           headers,
@@ -80,14 +79,20 @@ func (hs *HTTPServer) RenderToPng(c *contextmodel.ReqContext) {
 	}, nil)
 	if err != nil {
 		if errors.Is(err, rendering.ErrTimeout) {
-			c.Handle(hs.Cfg, 500, err.Error(), err)
+			c.Handle(hs.Cfg, http.StatusInternalServerError, err.Error(), err)
 			return
 		}
 
-		c.Handle(hs.Cfg, 500, "Rendering failed.", err)
+		c.Handle(hs.Cfg, http.StatusInternalServerError, "Rendering failed.", err)
 		return
 	}
 
-	c.Resp.Header().Set("Content-Type", "image/png")
+	if encoding == "pdf" {
+		c.Resp.Header().Set("Content-Type", "application/pdf")
+	} else {
+		c.Resp.Header().Set("Content-Type", "image/png")
+	}
+
+	c.Resp.Header().Set("Cache-Control", "private")
 	http.ServeFile(c.Resp, c.Req, result.FilePath)
 }
diff --git a/pkg/api/response/response.go b/pkg/api/response/response.go
index c6c760562bf78..a1d9d24325568 100644
--- a/pkg/api/response/response.go
+++ b/pkg/api/response/response.go
@@ -15,7 +15,6 @@ import (
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/middleware/requestmeta"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
-	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util/errutil"
 )
 
@@ -253,12 +252,6 @@ func Error(status int, message string, err error) *NormalResponse {
 		data["message"] = message
 	}
 
-	if err != nil {
-		if setting.Env != setting.Prod {
-			data["error"] = err.Error()
-		}
-	}
-
 	resp := JSON(status, data)
 
 	if err != nil {
@@ -318,10 +311,12 @@ func Respond(status int, body any) *NormalResponse {
 		b = t
 	case string:
 		b = []byte(t)
+	case nil:
+		break
 	default:
 		var err error
 		if b, err = json.Marshal(body); err != nil {
-			return Error(500, "body json marshal", err)
+			return Error(http.StatusInternalServerError, "body json marshal", err)
 		}
 	}
 
diff --git a/pkg/api/response/response_test.go b/pkg/api/response/response_test.go
index 5d8d10fdfa9a9..ec0c318194e53 100644
--- a/pkg/api/response/response_test.go
+++ b/pkg/api/response/response_test.go
@@ -125,3 +125,49 @@ func TestErrors(t *testing.T) {
 		)
 	}
 }
+
+func TestRespond(t *testing.T) {
+	testCases := []struct {
+		name     string
+		status   int
+		body     any
+		expected []byte
+	}{
+		{
+			name:     "with body of type []byte",
+			status:   200,
+			body:     []byte("message body"),
+			expected: []byte("message body"),
+		},
+		{
+			name:     "with body of type string",
+			status:   400,
+			body:     "message body",
+			expected: []byte("message body"),
+		},
+		{
+			name:     "with nil body",
+			status:   204,
+			body:     nil,
+			expected: nil,
+		},
+		{
+			name:   "with body of type struct",
+			status: 200,
+			body: struct {
+				Name  string
+				Value int
+			}{"name", 1},
+			expected: []byte(`{"Name":"name","Value":1}`),
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			resp := Respond(tc.status, tc.body)
+
+			require.Equal(t, tc.status, resp.status)
+			require.Equal(t, tc.expected, resp.body.Bytes())
+		})
+	}
+}
diff --git a/pkg/api/routing/routing.go b/pkg/api/routing/routing.go
index c5f5ec09759b3..8d6dcc03c017f 100644
--- a/pkg/api/routing/routing.go
+++ b/pkg/api/routing/routing.go
@@ -1,6 +1,8 @@
 package routing
 
 import (
+	"net/http"
+
 	"github.com/grafana/grafana/pkg/api/response"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/web"
@@ -8,7 +10,7 @@ import (
 
 var (
 	ServerError = func(err error) response.Response {
-		return response.Error(500, "Server error", err)
+		return response.Error(http.StatusInternalServerError, "Server error", err)
 	}
 )
 
diff --git a/pkg/api/search.go b/pkg/api/search.go
index 018d926dd9240..19c606f6c285f 100644
--- a/pkg/api/search.go
+++ b/pkg/api/search.go
@@ -7,7 +7,7 @@ import (
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/infra/metrics"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
-	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/search"
 	"github.com/grafana/grafana/pkg/services/search/model"
 	"github.com/grafana/grafana/pkg/util"
@@ -28,14 +28,14 @@ func (hs *HTTPServer) Search(c *contextmodel.ReqContext) response.Response {
 	page := c.QueryInt64("page")
 	dashboardType := c.Query("type")
 	sort := c.Query("sort")
-	permission := dashboards.PERMISSION_VIEW
+	permission := dashboardaccess.PERMISSION_VIEW
 
 	if limit > 5000 {
-		return response.Error(422, "Limit is above maximum allowed (5000), use page parameter to access hits beyond limit", nil)
+		return response.Error(http.StatusUnprocessableEntity, "Limit is above maximum allowed (5000), use page parameter to access hits beyond limit", nil)
 	}
 
 	if c.Query("permission") == "Edit" {
-		permission = dashboards.PERMISSION_EDIT
+		permission = dashboardaccess.PERMISSION_EDIT
 	}
 
 	dbIDs := make([]int64, 0)
@@ -57,6 +57,7 @@ func (hs *HTTPServer) Search(c *contextmodel.ReqContext) response.Response {
 		folderID, err := strconv.ParseInt(id, 10, 64)
 		if err == nil {
 			folderIDs = append(folderIDs, folderID)
+			metrics.MFolderIDsAPICount.WithLabelValues(metrics.Search).Inc()
 		}
 	}
 
@@ -66,7 +67,7 @@ func (hs *HTTPServer) Search(c *contextmodel.ReqContext) response.Response {
 	bothFolderIds := len(folderIDs) > 0 && len(folderUIDs) > 0
 
 	if bothDashboardIds || bothFolderIds {
-		return response.Error(400, "search supports UIDs or IDs, not both", nil)
+		return response.Error(http.StatusBadRequest, "search supports UIDs or IDs, not both", nil)
 	}
 
 	searchQuery := search.Query{
@@ -80,7 +81,7 @@ func (hs *HTTPServer) Search(c *contextmodel.ReqContext) response.Response {
 		DashboardIds:  dbIDs,
 		DashboardUIDs: dbUIDs,
 		Type:          dashboardType,
-		FolderIds:     folderIDs,
+		FolderIds:     folderIDs, // nolint:staticcheck
 		FolderUIDs:    folderUIDs,
 		Permission:    permission,
 		Sort:          sort,
@@ -88,7 +89,7 @@ func (hs *HTTPServer) Search(c *contextmodel.ReqContext) response.Response {
 
 	hits, err := hs.SearchService.SearchHandler(c.Req.Context(), &searchQuery)
 	if err != nil {
-		return response.Error(500, "Search failed", err)
+		return response.Error(http.StatusInternalServerError, "Search failed", err)
 	}
 
 	defer c.TimeRequest(metrics.MApiDashboardSearch)
@@ -157,6 +158,8 @@ type SearchParams struct {
 	// in:query
 	// required: false
 	// deprecated: true
+	//
+	// Deprecated: use FolderUIDs instead
 	FolderIds []int64 `json:"folderIds"`
 	// List of folder UID’s to search in for dashboards
 	// If it's an empty string then it will query for the top level folders
diff --git a/pkg/api/short_url.go b/pkg/api/short_url.go
index b7f3603c001ae..6a1292c65b8ae 100644
--- a/pkg/api/short_url.go
+++ b/pkg/api/short_url.go
@@ -26,7 +26,7 @@ func (hs *HTTPServer) createShortURL(c *contextmodel.ReqContext) response.Respon
 		return response.Err(err)
 	}
 
-	url := fmt.Sprintf("%s/goto/%s?orgId=%d", strings.TrimSuffix(setting.AppUrl, "/"), shortURL.Uid, c.SignedInUser.GetOrgID())
+	url := fmt.Sprintf("%s/goto/%s?orgId=%d", strings.TrimSuffix(hs.Cfg.AppURL, "/"), shortURL.Uid, c.SignedInUser.GetOrgID())
 	c.Logger.Debug("Created short URL", "url", url)
 
 	dto := dtos.ShortURL{
diff --git a/pkg/api/signup.go b/pkg/api/signup.go
index 0f9310d35f66f..935817aaed761 100644
--- a/pkg/api/signup.go
+++ b/pkg/api/signup.go
@@ -14,7 +14,6 @@ import (
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	tempuser "github.com/grafana/grafana/pkg/services/temp_user"
 	"github.com/grafana/grafana/pkg/services/user"
-	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
 	"github.com/grafana/grafana/pkg/web"
 )
@@ -22,7 +21,7 @@ import (
 // GET /api/user/signup/options
 func (hs *HTTPServer) GetSignUpOptions(c *contextmodel.ReqContext) response.Response {
 	return response.JSON(http.StatusOK, util.DynMap{
-		"verifyEmailEnabled": setting.VerifyEmailEnabled,
+		"verifyEmailEnabled": hs.Cfg.VerifyEmailEnabled,
 		"autoAssignOrg":      hs.Cfg.AutoAssignOrg,
 	})
 }
@@ -34,8 +33,8 @@ func (hs *HTTPServer) SignUp(c *contextmodel.ReqContext) response.Response {
 	if err = web.Bind(c.Req, &form); err != nil {
 		return response.Error(http.StatusBadRequest, "bad request data", err)
 	}
-	if !setting.AllowUserSignUp {
-		return response.Error(401, "User signup is disabled", nil)
+	if !hs.Cfg.AllowUserSignUp {
+		return response.Error(http.StatusUnauthorized, "User signup is disabled", nil)
 	}
 
 	form.Email, err = ValidateAndNormalizeEmail(form.Email)
@@ -46,7 +45,7 @@ func (hs *HTTPServer) SignUp(c *contextmodel.ReqContext) response.Response {
 	existing := user.GetUserByLoginQuery{LoginOrEmail: form.Email}
 	_, err = hs.userService.GetByLogin(c.Req.Context(), &existing)
 	if err == nil {
-		return response.Error(422, "User with same email address already exists", nil)
+		return response.Error(http.StatusUnprocessableEntity, "User with same email address already exists", nil)
 	}
 
 	userID, errID := identity.UserIdentifier(c.SignedInUser.GetNamespacedID())
@@ -61,19 +60,19 @@ func (hs *HTTPServer) SignUp(c *contextmodel.ReqContext) response.Response {
 	cmd.InvitedByUserID = userID
 	cmd.Code, err = util.GetRandomString(20)
 	if err != nil {
-		return response.Error(500, "Failed to generate random string", err)
+		return response.Error(http.StatusInternalServerError, "Failed to generate random string", err)
 	}
 	cmd.RemoteAddr = c.RemoteAddr()
 
 	if _, err := hs.tempUserService.CreateTempUser(c.Req.Context(), &cmd); err != nil {
-		return response.Error(500, "Failed to create signup", err)
+		return response.Error(http.StatusInternalServerError, "Failed to create signup", err)
 	}
 
 	if err := hs.bus.Publish(c.Req.Context(), &events.SignUpStarted{
 		Email: form.Email,
 		Code:  cmd.Code,
 	}); err != nil {
-		return response.Error(500, "Failed to publish event", err)
+		return response.Error(http.StatusInternalServerError, "Failed to publish event", err)
 	}
 
 	metrics.MApiUserSignUpStarted.Inc()
@@ -86,8 +85,8 @@ func (hs *HTTPServer) SignUpStep2(c *contextmodel.ReqContext) response.Response
 	if err := web.Bind(c.Req, &form); err != nil {
 		return response.Error(http.StatusBadRequest, "bad request data", err)
 	}
-	if !setting.AllowUserSignUp {
-		return response.Error(401, "User signup is disabled", nil)
+	if !hs.Cfg.AllowUserSignUp {
+		return response.Error(http.StatusUnauthorized, "User signup is disabled", nil)
 	}
 
 	form.Email = strings.TrimSpace(form.Email)
@@ -102,7 +101,7 @@ func (hs *HTTPServer) SignUpStep2(c *contextmodel.ReqContext) response.Response
 	}
 
 	// verify email
-	if setting.VerifyEmailEnabled {
+	if hs.Cfg.VerifyEmailEnabled {
 		if ok, rsp := hs.verifyUserSignUpEmail(c.Req.Context(), form.Email, form.Code); !ok {
 			return rsp
 		}
@@ -112,10 +111,10 @@ func (hs *HTTPServer) SignUpStep2(c *contextmodel.ReqContext) response.Response
 	usr, err := hs.userService.Create(c.Req.Context(), &createUserCmd)
 	if err != nil {
 		if errors.Is(err, user.ErrUserAlreadyExists) {
-			return response.Error(401, "User with same email address already exists", nil)
+			return response.Error(http.StatusUnauthorized, "User with same email address already exists", nil)
 		}
 
-		return response.Error(500, "Failed to create user", err)
+		return response.Error(http.StatusInternalServerError, "Failed to create user", err)
 	}
 
 	// publish signup event
@@ -123,7 +122,7 @@ func (hs *HTTPServer) SignUpStep2(c *contextmodel.ReqContext) response.Response
 		Email: usr.Email,
 		Name:  usr.NameOrFallback(),
 	}); err != nil {
-		return response.Error(500, "Failed to publish event", err)
+		return response.Error(http.StatusInternalServerError, "Failed to publish event", err)
 	}
 
 	// mark temp user as completed
@@ -135,7 +134,7 @@ func (hs *HTTPServer) SignUpStep2(c *contextmodel.ReqContext) response.Response
 	invitesQuery := tempuser.GetTempUsersQuery{Email: form.Email, Status: tempuser.TmpUserInvitePending}
 	invitesQueryResult, err := hs.tempUserService.GetTempUsersQuery(c.Req.Context(), &invitesQuery)
 	if err != nil {
-		return response.Error(500, "Failed to query database for invites", err)
+		return response.Error(http.StatusInternalServerError, "Failed to query database for invites", err)
 	}
 
 	apiResponse := util.DynMap{"message": "User sign up completed successfully", "code": "redirect-to-landing-page"}
@@ -148,7 +147,7 @@ func (hs *HTTPServer) SignUpStep2(c *contextmodel.ReqContext) response.Response
 
 	err = hs.loginUserWithUser(usr, c)
 	if err != nil {
-		return response.Error(500, "failed to login user", err)
+		return response.Error(http.StatusInternalServerError, "failed to login user", err)
 	}
 
 	metrics.MApiUserSignUpCompleted.Inc()
@@ -162,14 +161,14 @@ func (hs *HTTPServer) verifyUserSignUpEmail(ctx context.Context, email string, c
 	queryResult, err := hs.tempUserService.GetTempUserByCode(ctx, &query)
 	if err != nil {
 		if errors.Is(err, tempuser.ErrTempUserNotFound) {
-			return false, response.Error(404, "Invalid email verification code", nil)
+			return false, response.Error(http.StatusNotFound, "Invalid email verification code", nil)
 		}
-		return false, response.Error(500, "Failed to read temp user", err)
+		return false, response.Error(http.StatusInternalServerError, "Failed to read temp user", err)
 	}
 
 	tempUser := queryResult
 	if tempUser.Email != email {
-		return false, response.Error(404, "Email verification code does not match email", nil)
+		return false, response.Error(http.StatusNotFound, "Email verification code does not match email", nil)
 	}
 
 	return true, nil
diff --git a/pkg/api/swagger.go b/pkg/api/swagger.go
index 2943bf08557fd..3212dbc43f3e1 100644
--- a/pkg/api/swagger.go
+++ b/pkg/api/swagger.go
@@ -4,19 +4,31 @@ import (
 	"net/http"
 	"strings"
 
+	"github.com/grafana/grafana/pkg/api/routing"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 )
 
-func swaggerUI(c *contextmodel.ReqContext) {
-	data := map[string]any{
-		"Nonce": c.RequestNonce,
-	}
+func registerSwaggerUI(r routing.RouteRegister) {
+	// Deprecated
+	r.Get("/swagger-ui", func(w http.ResponseWriter, r *http.Request) {
+		http.Redirect(w, r, "swagger", http.StatusMovedPermanently)
+	})
+	// Deprecated
+	r.Get("/openapi3", func(w http.ResponseWriter, r *http.Request) {
+		http.Redirect(w, r, "swagger?show=v3", http.StatusMovedPermanently)
+	})
 
-	// Add CSP for unpkg.com to allow loading of Swagger UI assets
-	if existingCSP := c.Resp.Header().Get("Content-Security-Policy"); existingCSP != "" {
-		newCSP := strings.Replace(existingCSP, "style-src", "style-src https://unpkg.com/", 1)
-		c.Resp.Header().Set("Content-Security-Policy", newCSP)
-	}
+	r.Get("/swagger", func(c *contextmodel.ReqContext) {
+		data := map[string]any{
+			"Nonce": c.RequestNonce,
+		}
 
-	c.HTML(http.StatusOK, "swagger", data)
+		// Add CSP for unpkg.com to allow loading of Swagger UI assets
+		if existingCSP := c.Resp.Header().Get("Content-Security-Policy"); existingCSP != "" {
+			newCSP := strings.Replace(existingCSP, "style-src", "style-src https://unpkg.com/", 1)
+			c.Resp.Header().Set("Content-Security-Policy", newCSP)
+		}
+
+		c.HTML(http.StatusOK, "swagger", data)
+	})
 }
diff --git a/pkg/api/swagger_responses.go b/pkg/api/swagger_responses.go
index 49e310051d813..715aa1e6c38d2 100644
--- a/pkg/api/swagger_responses.go
+++ b/pkg/api/swagger_responses.go
@@ -81,3 +81,56 @@ type UnauthorizedError GenericError
 //
 // swagger:response acceptedResponse
 type AcceptedResponse GenericError
+
+// documentation for PublicError defined in errutil.Error
+
+// swagger:response publicErrorResponse
+type PublicErrorResponse struct {
+	// The response message
+	// in: body
+	Body PublicError `json:"body"`
+}
+
+// PublicError is derived from Error and only contains information
+// available to the end user.
+// swagger:model publicError
+type PublicError struct {
+	// StatusCode The HTTP status code returned
+	// required: true
+	StatusCode int `json:"statusCode"`
+
+	// MessageID A unique identifier for the error
+	// required: true
+	MessageID string `json:"messageId"`
+
+	// Message A human readable message
+	Message string `json:"message"`
+
+	// Extra Additional information about the error
+	Extra map[string]any `json:"extra"`
+}
+
+// NotFoundPublicError is returned when the requested resource was not found.
+//
+// swagger:response notFoundPublicError
+type NotFoundPublicError PublicErrorResponse
+
+// BadRequestPublicError is returned when the request is invalid and it cannot be processed.
+//
+// swagger:response badRequestPublicError
+type BadRequestPublicError PublicErrorResponse
+
+// UnauthorisedPublicError is returned when the request is not authenticated.
+//
+// swagger:response unauthorisedPublicError
+type UnauthorisedPublicError PublicErrorResponse
+
+// ForbiddenPublicError is returned if the user/token has insufficient permissions to access the requested resource.
+//
+// swagger:response forbiddenPublicError
+type ForbiddenPublicError PublicErrorResponse
+
+// InternalServerPublicError is a general error indicating something went wrong internally.
+//
+// swagger:response internalServerPublicError
+type InternalServerPublicError PublicErrorResponse
diff --git a/pkg/api/user.go b/pkg/api/user.go
index 32b7db5259770..eadacc1ed6d2e 100644
--- a/pkg/api/user.go
+++ b/pkg/api/user.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"net/http"
+	"net/url"
 	"strconv"
 	"strings"
 
@@ -61,9 +62,9 @@ func (hs *HTTPServer) getUserUserProfile(c *contextmodel.ReqContext, userID int6
 	userProfile, err := hs.userService.GetProfile(c.Req.Context(), &query)
 	if err != nil {
 		if errors.Is(err, user.ErrUserNotFound) {
-			return response.Error(404, user.ErrUserNotFound.Error(), nil)
+			return response.Error(http.StatusNotFound, user.ErrUserNotFound.Error(), nil)
 		}
-		return response.Error(500, "Failed to get user", err)
+		return response.Error(http.StatusInternalServerError, "Failed to get user", err)
 	}
 
 	getAuthQuery := login.GetAuthInfoQuery{UserId: userID}
@@ -72,16 +73,14 @@ func (hs *HTTPServer) getUserUserProfile(c *contextmodel.ReqContext, userID int6
 		authLabel := login.GetAuthProviderLabel(authInfo.AuthModule)
 		userProfile.AuthLabels = append(userProfile.AuthLabels, authLabel)
 		userProfile.IsExternal = true
-		userProfile.IsExternallySynced = login.IsExternallySynced(hs.Cfg, authInfo.AuthModule)
-		oAuthAndAllowAssignGrafanaAdmin := false
-		if oauthInfo := hs.SocialService.GetOAuthInfoProvider(strings.TrimPrefix(authInfo.AuthModule, "oauth_")); oauthInfo != nil {
-			oAuthAndAllowAssignGrafanaAdmin = oauthInfo.AllowAssignGrafanaAdmin
-		}
-		userProfile.IsGrafanaAdminExternallySynced = login.IsGrafanaAdminExternallySynced(hs.Cfg, authInfo.AuthModule, oAuthAndAllowAssignGrafanaAdmin)
+
+		oauthInfo := hs.SocialService.GetOAuthInfoProvider(authInfo.AuthModule)
+		userProfile.IsExternallySynced = login.IsExternallySynced(hs.Cfg, authInfo.AuthModule, oauthInfo)
+		userProfile.IsGrafanaAdminExternallySynced = login.IsGrafanaAdminExternallySynced(hs.Cfg, oauthInfo, authInfo.AuthModule)
 	}
 
-	userProfile.AccessControl = hs.getAccessControlMetadata(c, c.SignedInUser.GetOrgID(), "global.users:id:", strconv.FormatInt(userID, 10))
-	userProfile.AvatarURL = dtos.GetGravatarUrl(userProfile.Email)
+	userProfile.AccessControl = hs.getAccessControlMetadata(c, "global.users:id:", strconv.FormatInt(userID, 10))
+	userProfile.AvatarURL = dtos.GetGravatarUrl(hs.Cfg, userProfile.Email)
 
 	return response.JSON(http.StatusOK, userProfile)
 }
@@ -101,9 +100,9 @@ func (hs *HTTPServer) GetUserByLoginOrEmail(c *contextmodel.ReqContext) response
 	usr, err := hs.userService.GetByLogin(c.Req.Context(), &query)
 	if err != nil {
 		if errors.Is(err, user.ErrUserNotFound) {
-			return response.Error(404, user.ErrUserNotFound.Error(), nil)
+			return response.Error(http.StatusNotFound, user.ErrUserNotFound.Error(), nil)
 		}
-		return response.Error(500, "Failed to get user", err)
+		return response.Error(http.StatusInternalServerError, "Failed to get user", err)
 	}
 	result := user.UserProfileDTO{
 		ID:             usr.ID,
@@ -127,6 +126,7 @@ func (hs *HTTPServer) GetUserByLoginOrEmail(c *contextmodel.ReqContext) response
 // 200: okResponse
 // 401: unauthorisedError
 // 403: forbiddenError
+// 409: conflictError
 // 500: internalServerError
 func (hs *HTTPServer) UpdateSignedInUser(c *contextmodel.ReqContext) response.Response {
 	cmd := user.UpdateUserCommand{}
@@ -143,11 +143,11 @@ func (hs *HTTPServer) UpdateSignedInUser(c *contextmodel.ReqContext) response.Re
 		return errResponse
 	}
 
-	if hs.Cfg.AuthProxyEnabled {
-		if hs.Cfg.AuthProxyHeaderProperty == "email" && cmd.Email != c.SignedInUser.GetEmail() {
+	if hs.Cfg.AuthProxy.Enabled {
+		if hs.Cfg.AuthProxy.HeaderProperty == "email" && cmd.Email != c.SignedInUser.GetEmail() {
 			return response.Error(http.StatusBadRequest, "Not allowed to change email when auth proxy is using email property", nil)
 		}
-		if hs.Cfg.AuthProxyHeaderProperty == "username" && cmd.Login != c.SignedInUser.GetLogin() {
+		if hs.Cfg.AuthProxy.HeaderProperty == "username" && cmd.Login != c.SignedInUser.GetLogin() {
 			return response.Error(http.StatusBadRequest, "Not allowed to change username when auth proxy is using username property", nil)
 		}
 	}
@@ -167,6 +167,7 @@ func (hs *HTTPServer) UpdateSignedInUser(c *contextmodel.ReqContext) response.Re
 // 401: unauthorisedError
 // 403: forbiddenError
 // 404: notFoundError
+// 409: conflictError
 // 500: internalServerError
 func (hs *HTTPServer) UpdateUser(c *contextmodel.ReqContext) response.Response {
 	cmd := user.UpdateUserCommand{}
@@ -198,13 +199,13 @@ func (hs *HTTPServer) UpdateUserActiveOrg(c *contextmodel.ReqContext) response.R
 	}
 
 	if !hs.validateUsingOrg(c.Req.Context(), userID, orgID) {
-		return response.Error(401, "Not a valid organization", nil)
+		return response.Error(http.StatusUnauthorized, "Not a valid organization", nil)
 	}
 
 	cmd := user.SetUsingOrgCommand{UserID: userID, OrgID: orgID}
 
 	if err := hs.userService.SetUsingOrg(c.Req.Context(), &cmd); err != nil {
-		return response.Error(500, "Failed to change active organization", err)
+		return response.Error(http.StatusInternalServerError, "Failed to change active organization", err)
 	}
 
 	return response.Success("Active organization changed")
@@ -221,6 +222,45 @@ func (hs *HTTPServer) handleUpdateUser(ctx context.Context, cmd user.UpdateUserC
 		return response.Error(http.StatusForbidden, "User info cannot be updated for external Users", nil)
 	}
 
+	if len(cmd.Login) == 0 {
+		cmd.Login = cmd.Email
+	}
+
+	// if login is still empty both email and login field is missing
+	if len(cmd.Login) == 0 {
+		return response.Err(user.ErrEmptyUsernameAndEmail.Errorf("user cannot be created with empty username and email"))
+	}
+
+	// If email is being updated, we need to verify it. Likewise, if username is being updated and the new username
+	// is an email, we also need to verify it.
+	// To avoid breaking changes, email verification is implemented in a way that if the email field is being updated,
+	// all the other fields being updated in the same request are disregarded. We do this because email might need to
+	// be verified and if so, it goes through a different code flow.
+	if hs.Cfg.Smtp.Enabled && hs.Cfg.VerifyEmailEnabled {
+		query := user.GetUserByIDQuery{ID: cmd.UserID}
+		usr, err := hs.userService.GetByID(ctx, &query)
+		if err != nil {
+			if errors.Is(err, user.ErrUserNotFound) {
+				return response.Error(http.StatusNotFound, user.ErrUserNotFound.Error(), err)
+			}
+			return response.Error(http.StatusInternalServerError, "Failed to get user", err)
+		}
+
+		if len(cmd.Email) != 0 && usr.Email != cmd.Email {
+			normalized, err := ValidateAndNormalizeEmail(cmd.Email)
+			if err != nil {
+				return response.Error(http.StatusBadRequest, "Invalid email address", err)
+			}
+			return hs.verifyEmailUpdate(ctx, normalized, user.EmailUpdateAction, usr)
+		}
+		if len(cmd.Login) != 0 && usr.Login != cmd.Login {
+			normalized, err := ValidateAndNormalizeEmail(cmd.Login)
+			if err == nil && usr.Email != normalized {
+				return hs.verifyEmailUpdate(ctx, cmd.Login, user.LoginUpdateAction, usr)
+			}
+		}
+	}
+
 	if err := hs.userService.Update(ctx, &cmd); err != nil {
 		if errors.Is(err, user.ErrCaseInsensitive) {
 			return response.Error(http.StatusConflict, "Update would result in user login conflict", err)
@@ -231,6 +271,39 @@ func (hs *HTTPServer) handleUpdateUser(ctx context.Context, cmd user.UpdateUserC
 	return response.Success("User updated")
 }
 
+func (hs *HTTPServer) verifyEmailUpdate(ctx context.Context, email string, field user.UpdateEmailActionType, usr *user.User) response.Response {
+	if err := hs.userVerifier.Start(ctx, user.StartVerifyEmailCommand{
+		User:   *usr,
+		Email:  email,
+		Action: field,
+	}); err != nil {
+		return response.ErrOrFallback(http.StatusInternalServerError, "Failed to generate email verification", err)
+	}
+
+	return response.Success("Email sent for verification")
+}
+
+// swagger:route GET /user/email/update user updateUserEmail
+//
+// Update user email.
+//
+// Update the email of user given a verification code.
+//
+// Responses:
+// 302: okResponse
+func (hs *HTTPServer) UpdateUserEmail(c *contextmodel.ReqContext) response.Response {
+	code, err := url.QueryUnescape(c.Req.URL.Query().Get("code"))
+	if err != nil || code == "" {
+		return hs.RedirectResponseWithError(c, errors.New("bad request data"))
+	}
+
+	if err := hs.userVerifier.Complete(c.Req.Context(), user.CompleteEmailVerifyCommand{Code: code}); err != nil {
+		return hs.RedirectResponseWithError(c, err)
+	}
+
+	return response.Redirect(hs.Cfg.AppSubURL + "/profile")
+}
+
 func (hs *HTTPServer) isExternalUser(ctx context.Context, userID int64) (bool, error) {
 	getAuthQuery := login.GetAuthInfoQuery{UserId: userID}
 	var err error
@@ -317,7 +390,7 @@ func (hs *HTTPServer) getUserTeamList(c *contextmodel.ReqContext, orgID int64, u
 	}
 
 	for _, team := range queryResult {
-		team.AvatarURL = dtos.GetGravatarUrlWithDefault(team.Email, team.Name)
+		team.AvatarURL = dtos.GetGravatarUrlWithDefault(hs.Cfg, team.Email, team.Name)
 	}
 	return response.JSON(http.StatusOK, queryResult)
 }
@@ -477,30 +550,31 @@ func (hs *HTTPServer) ChangeUserPassword(c *contextmodel.ReqContext) response.Re
 
 	getAuthQuery := login.GetAuthInfoQuery{UserId: usr.ID}
 	if authInfo, err := hs.authInfoService.GetAuthInfo(c.Req.Context(), &getAuthQuery); err == nil {
-		authModule := authInfo.AuthModule
-		if authModule == login.LDAPAuthModule || authModule == login.AuthProxyAuthModule {
-			return response.Error(http.StatusBadRequest, "Not allowed to reset password for LDAP or Auth Proxy user", nil)
+		oauthInfo := hs.SocialService.GetOAuthInfoProvider(authInfo.AuthModule)
+		if login.IsProviderEnabled(hs.Cfg, authInfo.AuthModule, oauthInfo) {
+			return response.Error(http.StatusBadRequest, "Cannot update external user password", err)
 		}
 	}
 
-	passwordHashed, err := util.EncodePassword(cmd.OldPassword, usr.Salt)
+	passwordHashed, err := util.EncodePassword(string(cmd.OldPassword), usr.Salt)
 	if err != nil {
 		return response.Error(http.StatusInternalServerError, "Failed to encode password", err)
 	}
-	if passwordHashed != usr.Password {
+	if user.Password(passwordHashed) != usr.Password {
 		return response.Error(http.StatusUnauthorized, "Invalid old password", nil)
 	}
 
-	password := user.Password(cmd.NewPassword)
-	if password.IsWeak() {
-		return response.Error(http.StatusBadRequest, "New password is too short", nil)
+	if err := cmd.NewPassword.Validate(hs.Cfg); err != nil {
+		c.Logger.Warn("the new password doesn't meet the password policy criteria", "err", err)
+		return response.Err(err)
 	}
 
 	cmd.UserID = userID
-	cmd.NewPassword, err = util.EncodePassword(cmd.NewPassword, usr.Salt)
+	encodedPassword, err := util.EncodePassword(string(cmd.NewPassword), usr.Salt)
 	if err != nil {
 		return response.Error(http.StatusInternalServerError, "Failed to encode password", err)
 	}
+	cmd.NewPassword = user.Password(encodedPassword)
 
 	if err := hs.userService.ChangePassword(c.Req.Context(), &cmd); err != nil {
 		return response.Error(http.StatusInternalServerError, "Failed to change user password", err)
@@ -575,7 +649,7 @@ func (hs *HTTPServer) ClearHelpFlags(c *contextmodel.ReqContext) response.Respon
 	}
 
 	if err := hs.userService.SetUserHelpFlag(c.Req.Context(), &cmd); err != nil {
-		return response.Error(500, "Failed to update help flag", err)
+		return response.Error(http.StatusInternalServerError, "Failed to update help flag", err)
 	}
 
 	return response.JSON(http.StatusOK, &util.DynMap{"message": "Help flag set", "helpFlags1": cmd.HelpFlags1})
diff --git a/pkg/api/user_test.go b/pkg/api/user_test.go
index c75101a52db17..1f445a128cade 100644
--- a/pkg/api/user_test.go
+++ b/pkg/api/user_test.go
@@ -5,9 +5,18 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"net/url"
+	"strings"
 	"testing"
 	"time"
 
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/notifications"
+	"github.com/grafana/grafana/pkg/services/secrets/fakes"
+	tempuser "github.com/grafana/grafana/pkg/services/temp_user"
+	"github.com/grafana/grafana/pkg/services/temp_user/tempuserimpl"
+	"github.com/grafana/grafana/pkg/web/webtest"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/oauth2"
@@ -18,16 +27,15 @@ import (
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/db/dbtest"
-	"github.com/grafana/grafana/pkg/infra/usagestats"
+	"github.com/grafana/grafana/pkg/infra/remotecache"
 	"github.com/grafana/grafana/pkg/login/social"
-	"github.com/grafana/grafana/pkg/login/socialtest"
+	"github.com/grafana/grafana/pkg/login/social/socialtest"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
 	acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/login"
-	"github.com/grafana/grafana/pkg/services/login/authinfoservice"
-	authinfostore "github.com/grafana/grafana/pkg/services/login/authinfoservice/database"
-	"github.com/grafana/grafana/pkg/services/login/logintest"
+	"github.com/grafana/grafana/pkg/services/login/authinfoimpl"
+	"github.com/grafana/grafana/pkg/services/login/authinfotest"
 	"github.com/grafana/grafana/pkg/services/org/orgimpl"
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
 	"github.com/grafana/grafana/pkg/services/searchusers"
@@ -41,6 +49,8 @@ import (
 	"github.com/grafana/grafana/pkg/setting"
 )
 
+const newEmail = "newemail@localhost"
+
 func TestUserAPIEndpoint_userLoggedIn(t *testing.T) {
 	settings := setting.NewCfg()
 	sqlStore := db.InitTestDB(t)
@@ -64,16 +74,12 @@ func TestUserAPIEndpoint_userLoggedIn(t *testing.T) {
 	loggedInUserScenario(t, "When calling GET on", "api/users/1", "api/users/:id", func(sc *scenarioContext) {
 		fakeNow := time.Date(2019, 2, 11, 17, 30, 40, 0, time.UTC)
 		secretsService := secretsManager.SetupTestService(t, database.ProvideSecretsStore(sqlStore))
-		authInfoStore := authinfostore.ProvideAuthInfoStore(sqlStore, secretsService, userMock)
-		srv := authinfoservice.ProvideAuthInfoService(
-			&authinfoservice.OSSUserProtectionImpl{},
-			authInfoStore,
-			&usagestats.UsageStatsMock{},
-		)
+		authInfoStore := authinfoimpl.ProvideStore(sqlStore, secretsService)
+		srv := authinfoimpl.ProvideService(
+			authInfoStore, remotecache.NewFakeCacheStorage(), secretsService)
 		hs.authInfoService = srv
 		orgSvc, err := orgimpl.ProvideService(sqlStore, sqlStore.Cfg, quotatest.New(false, nil))
 		require.NoError(t, err)
-		require.NoError(t, err)
 		userSvc, err := userimpl.ProvideService(sqlStore, orgSvc, sc.cfg, nil, nil, quotatest.New(false, nil), supportbundlestest.NewFakeBundleService())
 		require.NoError(t, err)
 		hs.userService = userSvc
@@ -86,6 +92,7 @@ func TestUserAPIEndpoint_userLoggedIn(t *testing.T) {
 		}
 		usr, err := userSvc.Create(context.Background(), &createUserCmd)
 		require.NoError(t, err)
+		theUserUID := usr.UID
 
 		sc.handlerFunc = hs.GetUserByID
 
@@ -107,11 +114,12 @@ func TestUserAPIEndpoint_userLoggedIn(t *testing.T) {
 		}
 		err = srv.UpdateAuthInfo(context.Background(), cmd)
 		require.NoError(t, err)
-		avatarUrl := dtos.GetGravatarUrl("@test.com")
+		avatarUrl := dtos.GetGravatarUrl(hs.Cfg, "@test.com")
 		sc.fakeReqWithParams("GET", sc.url, map[string]string{"id": fmt.Sprintf("%v", usr.ID)}).exec()
 
 		expected := user.UserProfileDTO{
 			ID:             1,
+			UID:            theUserUID, // from original request
 			Email:          "user@test.com",
 			Name:           "user",
 			Login:          "loginuser",
@@ -164,7 +172,7 @@ func TestUserAPIEndpoint_userLoggedIn(t *testing.T) {
 	loggedInUserScenario(t, "When calling GET on", "/api/users", "/api/users", func(sc *scenarioContext) {
 		userMock.ExpectedSearchUsers = mockResult
 
-		searchUsersService := searchusers.ProvideUsersService(filters.ProvideOSSSearchUserFilter(), userMock)
+		searchUsersService := searchusers.ProvideUsersService(sc.cfg, filters.ProvideOSSSearchUserFilter(), userMock)
 		sc.handlerFunc = searchUsersService.SearchUsers
 		sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
 
@@ -177,7 +185,7 @@ func TestUserAPIEndpoint_userLoggedIn(t *testing.T) {
 	loggedInUserScenario(t, "When calling GET with page and limit querystring parameters on", "/api/users", "/api/users", func(sc *scenarioContext) {
 		userMock.ExpectedSearchUsers = mockResult
 
-		searchUsersService := searchusers.ProvideUsersService(filters.ProvideOSSSearchUserFilter(), userMock)
+		searchUsersService := searchusers.ProvideUsersService(sc.cfg, filters.ProvideOSSSearchUserFilter(), userMock)
 		sc.handlerFunc = searchUsersService.SearchUsers
 		sc.fakeReqWithParams("GET", sc.url, map[string]string{"perpage": "10", "page": "2"}).exec()
 
@@ -190,7 +198,7 @@ func TestUserAPIEndpoint_userLoggedIn(t *testing.T) {
 	loggedInUserScenario(t, "When calling GET on", "/api/users/search", "/api/users/search", func(sc *scenarioContext) {
 		userMock.ExpectedSearchUsers = mockResult
 
-		searchUsersService := searchusers.ProvideUsersService(filters.ProvideOSSSearchUserFilter(), userMock)
+		searchUsersService := searchusers.ProvideUsersService(sc.cfg, filters.ProvideOSSSearchUserFilter(), userMock)
 		sc.handlerFunc = searchUsersService.SearchUsersWithPaging
 		sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
 
@@ -206,7 +214,7 @@ func TestUserAPIEndpoint_userLoggedIn(t *testing.T) {
 	loggedInUserScenario(t, "When calling GET with page and perpage querystring parameters on", "/api/users/search", "/api/users/search", func(sc *scenarioContext) {
 		userMock.ExpectedSearchUsers = mockResult
 
-		searchUsersService := searchusers.ProvideUsersService(filters.ProvideOSSSearchUserFilter(), userMock)
+		searchUsersService := searchusers.ProvideUsersService(sc.cfg, filters.ProvideOSSSearchUserFilter(), userMock)
 		sc.handlerFunc = searchUsersService.SearchUsersWithPaging
 		sc.fakeReqWithParams("GET", sc.url, map[string]string{"perpage": "10", "page": "2"}).exec()
 
@@ -295,20 +303,18 @@ func Test_GetUserByID(t *testing.T) {
 	for _, tc := range testcases {
 		t.Run(tc.name, func(t *testing.T) {
 			userAuth := &login.UserAuth{AuthModule: tc.authModule}
-			authInfoService := &logintest.AuthInfoServiceFake{ExpectedUserAuth: userAuth}
+			authInfoService := &authinfotest.FakeService{ExpectedUserAuth: userAuth}
 			socialService := &socialtest.FakeSocialService{}
 			userService := &usertest.FakeUserService{ExpectedUserProfileDTO: &user.UserProfileDTO{}}
 			cfg := setting.NewCfg()
 
 			switch tc.authModule {
 			case login.GenericOAuthModule:
-				socialService.ExpectedAuthInfoProvider = &social.OAuthInfo{AllowAssignGrafanaAdmin: tc.allowAssignGrafanaAdmin, Enabled: tc.authEnabled}
-				cfg.GenericOAuthAuthEnabled = tc.authEnabled
-				cfg.GenericOAuthSkipOrgRoleSync = tc.skipOrgRoleSync
+				socialService.ExpectedAuthInfoProvider = &social.OAuthInfo{AllowAssignGrafanaAdmin: tc.allowAssignGrafanaAdmin, Enabled: tc.authEnabled, SkipOrgRoleSync: tc.skipOrgRoleSync}
 			case login.JWTModule:
-				cfg.JWTAuthEnabled = tc.authEnabled
-				cfg.JWTAuthSkipOrgRoleSync = tc.skipOrgRoleSync
-				cfg.JWTAuthAllowAssignGrafanaAdmin = tc.allowAssignGrafanaAdmin
+				cfg.JWTAuth.Enabled = tc.authEnabled
+				cfg.JWTAuth.SkipOrgRoleSync = tc.skipOrgRoleSync
+				cfg.JWTAuth.AllowAssignGrafanaAdmin = tc.allowAssignGrafanaAdmin
 			}
 
 			hs := &HTTPServer{
@@ -367,6 +373,685 @@ func TestHTTPServer_UpdateUser(t *testing.T) {
 	}, hs)
 }
 
+func setupUpdateEmailTests(t *testing.T, cfg *setting.Cfg) (*user.User, *HTTPServer, *notifications.NotificationServiceMock) {
+	t.Helper()
+
+	sqlStore := db.InitTestDB(t)
+	sqlStore.Cfg = cfg
+
+	tempUserService := tempuserimpl.ProvideService(sqlStore, cfg)
+	orgSvc, err := orgimpl.ProvideService(sqlStore, cfg, quotatest.New(false, nil))
+	require.NoError(t, err)
+	userSvc, err := userimpl.ProvideService(sqlStore, orgSvc, cfg, nil, nil, quotatest.New(false, nil), supportbundlestest.NewFakeBundleService())
+	require.NoError(t, err)
+
+	// Create test user
+	createUserCmd := user.CreateUserCommand{
+		Email:   "testuser@localhost",
+		Name:    "testuser",
+		Login:   "loginuser",
+		Company: "testCompany",
+		IsAdmin: true,
+	}
+	usr, err := userSvc.Create(context.Background(), &createUserCmd)
+	require.NoError(t, err)
+
+	nsMock := notifications.MockNotificationService()
+	verifier := userimpl.ProvideVerifier(cfg, userSvc, tempUserService, nsMock)
+
+	hs := &HTTPServer{
+		Cfg:                 cfg,
+		SQLStore:            sqlStore,
+		userService:         userSvc,
+		tempUserService:     tempUserService,
+		NotificationService: nsMock,
+		userVerifier:        verifier,
+	}
+	return usr, hs, nsMock
+}
+
+func TestUser_UpdateEmail(t *testing.T) {
+	cases := []struct {
+		Name  string
+		Field user.UpdateEmailActionType
+	}{
+		{
+			Name:  "Updating Email field",
+			Field: user.EmailUpdateAction,
+		},
+		{
+			Name:  "Updating Login (username) field",
+			Field: user.LoginUpdateAction,
+		},
+	}
+
+	for _, tt := range cases {
+		t.Run(tt.Name, func(t *testing.T) {
+			t.Run("With verification disabled should update without verifying", func(t *testing.T) {
+				tests := []struct {
+					name               string
+					smtpConfigured     bool
+					verifyEmailEnabled bool
+				}{
+					{
+						name:               "SMTP not configured",
+						smtpConfigured:     false,
+						verifyEmailEnabled: true,
+					},
+					{
+						name:               "config verify_email_enabled = false",
+						smtpConfigured:     true,
+						verifyEmailEnabled: false,
+					},
+					{
+						name:               "config verify_email_enabled = false and SMTP not configured",
+						smtpConfigured:     false,
+						verifyEmailEnabled: false,
+					},
+				}
+				for _, ttt := range tests {
+					settings := setting.NewCfg()
+					settings.Smtp.Enabled = ttt.smtpConfigured
+					settings.VerifyEmailEnabled = ttt.verifyEmailEnabled
+
+					usr, hs, nsMock := setupUpdateEmailTests(t, settings)
+
+					updateUserCommand := user.UpdateUserCommand{
+						Email:  usr.Email,
+						Name:   "newName",
+						Login:  usr.Login,
+						UserID: usr.ID,
+					}
+
+					switch tt.Field {
+					case user.LoginUpdateAction:
+						updateUserCommand.Login = newEmail
+					case user.EmailUpdateAction:
+						updateUserCommand.Email = newEmail
+					}
+
+					fn := func(sc *scenarioContext) {
+						// User is internal
+						sc.authInfoService.ExpectedError = user.ErrUserNotFound
+
+						sc.fakeReqWithParams("PUT", sc.url, nil).exec()
+						assert.Equal(t, http.StatusOK, sc.resp.Code)
+
+						// Verify that no email has been sent after update
+						require.False(t, nsMock.EmailVerified)
+
+						userQuery := user.GetUserByIDQuery{ID: usr.ID}
+						updatedUsr, err := hs.userService.GetByID(context.Background(), &userQuery)
+						require.NoError(t, err)
+
+						// Verify fields have been updated
+						require.NotEqual(t, usr.Name, updatedUsr.Name)
+						require.Equal(t, updateUserCommand.Name, updatedUsr.Name)
+
+						switch tt.Field {
+						case user.LoginUpdateAction:
+							require.Equal(t, usr.Email, updatedUsr.Email)
+							require.NotEqual(t, usr.Login, updatedUsr.Login)
+							require.Equal(t, updateUserCommand.Login, updatedUsr.Login)
+						case user.EmailUpdateAction:
+							require.Equal(t, usr.Login, updatedUsr.Login)
+							require.NotEqual(t, usr.Email, updatedUsr.Email)
+							require.Equal(t, updateUserCommand.Email, updatedUsr.Email)
+						}
+
+						// Verify other fields have been kept
+						require.Equal(t, usr.Company, updatedUsr.Company)
+					}
+
+					updateUserScenario(t, updateUserContext{
+						desc:         ttt.name,
+						url:          fmt.Sprintf("/api/users/%d", usr.ID),
+						routePattern: "/api/users/:id",
+						cmd:          updateUserCommand,
+						fn:           fn,
+					}, hs)
+
+					updateSignedInUserScenario(t, updateUserContext{
+						desc:         ttt.name,
+						url:          "/api/user",
+						routePattern: "/api/user",
+						cmd:          updateUserCommand,
+						fn:           fn,
+					}, hs)
+				}
+			})
+		})
+	}
+
+	doReq := func(req *http.Request, usr *user.User) (*http.Response, error) {
+		r := webtest.RequestWithSignedInUser(
+			req,
+			authedUserWithPermissions(
+				usr.ID,
+				usr.OrgID,
+				[]accesscontrol.Permission{
+					{
+						Action: accesscontrol.ActionUsersWrite,
+						Scope:  accesscontrol.ScopeGlobalUsersAll,
+					},
+				},
+			),
+		)
+		client := &http.Client{
+			CheckRedirect: func(req *http.Request, via []*http.Request) error {
+				return http.ErrUseLastResponse
+			}}
+		return client.Do(r)
+	}
+
+	sendUpdateReq := func(server *webtest.Server, usr *user.User, body string) {
+		req := server.NewRequest(
+			http.MethodPut,
+			"/api/user",
+			strings.NewReader(body),
+		)
+		req.Header.Add("Content-Type", "application/json")
+		res, err := doReq(req, usr)
+		require.NoError(t, err)
+		assert.Equal(t, http.StatusOK, res.StatusCode)
+		require.NoError(t, res.Body.Close())
+	}
+
+	sendVerificationReq := func(server *webtest.Server, usr *user.User, code string) {
+		url := fmt.Sprintf("/user/email/update?code=%s", url.QueryEscape(code))
+		req := server.NewGetRequest(url)
+		res, err := doReq(req, usr)
+		require.NoError(t, err)
+		assert.Equal(t, http.StatusFound, res.StatusCode)
+		require.NoError(t, res.Body.Close())
+	}
+
+	getVerificationTempUser := func(tempUserSvc tempuser.Service, code string) *tempuser.TempUserDTO {
+		tmpUserQuery := tempuser.GetTempUserByCodeQuery{Code: code}
+		tmpUser, err := tempUserSvc.GetTempUserByCode(context.Background(), &tmpUserQuery)
+		require.NoError(t, err)
+		return tmpUser
+	}
+
+	verifyEmailData := func(tempUserSvc tempuser.Service, nsMock *notifications.NotificationServiceMock, originalUsr *user.User, newEmail string) {
+		verification := nsMock.EmailVerification
+		tmpUsr := getVerificationTempUser(tempUserSvc, verification.Code)
+
+		require.True(t, nsMock.EmailVerified)
+		require.Equal(t, newEmail, verification.Email)
+		require.Equal(t, originalUsr.ID, verification.User.ID)
+		require.Equal(t, tmpUsr.Code, verification.Code)
+	}
+
+	verifyUserNotUpdated := func(userSvc user.Service, usr *user.User) {
+		userQuery := user.GetUserByIDQuery{ID: usr.ID}
+		checkUsr, err := userSvc.GetByID(context.Background(), &userQuery)
+		require.NoError(t, err)
+		require.Equal(t, usr.Email, checkUsr.Email)
+		require.Equal(t, usr.Login, checkUsr.Login)
+		require.Equal(t, usr.Name, checkUsr.Name)
+	}
+
+	setupScenario := func(cfg *setting.Cfg) (*webtest.Server, user.Service, tempuser.Service, *notifications.NotificationServiceMock) {
+		settings := setting.NewCfg()
+		settings.Smtp.Enabled = true
+		settings.VerificationEmailMaxLifetime = 1 * time.Hour
+		settings.VerifyEmailEnabled = true
+
+		if cfg != nil {
+			settings = cfg
+		}
+
+		nsMock := notifications.MockNotificationService()
+		sqlStore := db.InitTestDB(t)
+		sqlStore.Cfg = settings
+
+		tempUserSvc := tempuserimpl.ProvideService(sqlStore, settings)
+		orgSvc, err := orgimpl.ProvideService(sqlStore, settings, quotatest.New(false, nil))
+		require.NoError(t, err)
+		userSvc, err := userimpl.ProvideService(sqlStore, orgSvc, settings, nil, nil, quotatest.New(false, nil), supportbundlestest.NewFakeBundleService())
+		require.NoError(t, err)
+
+		server := SetupAPITestServer(t, func(hs *HTTPServer) {
+			hs.Cfg = settings
+
+			hs.SQLStore = sqlStore
+			hs.userService = userSvc
+			hs.tempUserService = tempUserSvc
+			hs.NotificationService = nsMock
+			hs.SecretsService = fakes.NewFakeSecretsService()
+			hs.userVerifier = userimpl.ProvideVerifier(settings, userSvc, tempUserSvc, nsMock)
+			// User is internal
+			hs.authInfoService = &authinfotest.FakeService{ExpectedError: user.ErrUserNotFound}
+		})
+
+		return server, userSvc, tempUserSvc, nsMock
+	}
+
+	createUser := func(userSvc user.Service, name string, email string, login string) *user.User {
+		createUserCmd := user.CreateUserCommand{
+			Email:   email,
+			Name:    name,
+			Login:   login,
+			Company: "testCompany",
+			IsAdmin: true,
+		}
+		usr, err := userSvc.Create(context.Background(), &createUserCmd)
+		require.NoError(t, err)
+		return usr
+	}
+
+	t.Run("Update Email and disregard other fields", func(t *testing.T) {
+		server, userSvc, tempUserSvc, nsMock := setupScenario(nil)
+
+		originalUsr := createUser(userSvc, "name", "email@localhost", "login")
+
+		// Verify that no email has been sent yet
+		require.False(t, nsMock.EmailVerified)
+
+		// Start email update
+		newName := "newname"
+		body := fmt.Sprintf(`{"email": "%s", "name": "%s"}`, newEmail, newName)
+		sendUpdateReq(server, originalUsr, body)
+
+		// Verify email data
+		verifyEmailData(tempUserSvc, nsMock, originalUsr, newEmail)
+
+		// Verify user has not been updated yet
+		verifyUserNotUpdated(userSvc, originalUsr)
+
+		// Second part of the verification flow, when user clicks email button
+		code := nsMock.EmailVerification.Code
+		sendVerificationReq(server, originalUsr, code)
+
+		// Verify Email has been updated
+		userQuery := user.GetUserByIDQuery{ID: originalUsr.ID}
+		updatedUsr, err := userSvc.GetByID(context.Background(), &userQuery)
+		require.NoError(t, err)
+		require.NotEqual(t, originalUsr.Email, updatedUsr.Email)
+		require.Equal(t, newEmail, updatedUsr.Email)
+		// Fields unchanged
+		require.Equal(t, originalUsr.Login, updatedUsr.Login)
+		require.Equal(t, originalUsr.Name, updatedUsr.Name)
+		require.NotEqual(t, newName, updatedUsr.Name)
+	})
+
+	t.Run("Update Email when Login was also an email should update both", func(t *testing.T) {
+		server, userSvc, tempUserSvc, nsMock := setupScenario(nil)
+
+		originalUsr := createUser(userSvc, "name", "email@localhost", "email@localhost")
+
+		// Verify that no email has been sent yet
+		require.False(t, nsMock.EmailVerified)
+
+		// Start email update
+		body := fmt.Sprintf(`{"email": "%s"}`, newEmail)
+		sendUpdateReq(server, originalUsr, body)
+
+		// Verify email data
+		verifyEmailData(tempUserSvc, nsMock, originalUsr, newEmail)
+
+		// Verify user has not been updated yet
+		verifyUserNotUpdated(userSvc, originalUsr)
+
+		// Second part of the verification flow, when user clicks email button
+		code := nsMock.EmailVerification.Code
+		sendVerificationReq(server, originalUsr, code)
+
+		// Verify Email and Login have been updated
+		userQuery := user.GetUserByIDQuery{ID: originalUsr.ID}
+		updatedUsr, err := userSvc.GetByID(context.Background(), &userQuery)
+		require.NoError(t, err)
+		require.NotEqual(t, originalUsr.Email, updatedUsr.Email)
+		require.Equal(t, newEmail, updatedUsr.Email)
+		require.Equal(t, newEmail, updatedUsr.Login)
+		// Fields unchanged
+		require.Equal(t, originalUsr.Name, updatedUsr.Name)
+	})
+
+	t.Run("Update Login with an email should update Email too", func(t *testing.T) {
+		server, userSvc, tempUserSvc, nsMock := setupScenario(nil)
+
+		originalUsr := createUser(userSvc, "name", "email@localhost", "login")
+
+		// Verify that no email has been sent yet
+		require.False(t, nsMock.EmailVerified)
+
+		// Start email update
+		body := fmt.Sprintf(`{"login": "%s"}`, newEmail)
+		sendUpdateReq(server, originalUsr, body)
+
+		// Verify email data
+		verifyEmailData(tempUserSvc, nsMock, originalUsr, newEmail)
+
+		// Verify user has not been updated yet
+		verifyUserNotUpdated(userSvc, originalUsr)
+
+		// Second part of the verification flow, when user clicks email button
+		code := nsMock.EmailVerification.Code
+		sendVerificationReq(server, originalUsr, code)
+
+		// Verify Email and Login have been updated
+		userQuery := user.GetUserByIDQuery{ID: originalUsr.ID}
+		updatedUsr, err := userSvc.GetByID(context.Background(), &userQuery)
+		require.NoError(t, err)
+		require.NotEqual(t, originalUsr.Email, updatedUsr.Email)
+		require.NotEqual(t, originalUsr.Login, updatedUsr.Login)
+		require.Equal(t, newEmail, updatedUsr.Email)
+		require.Equal(t, newEmail, updatedUsr.Login)
+		// Fields unchanged
+		require.Equal(t, originalUsr.Name, updatedUsr.Name)
+	})
+
+	t.Run("Update Login should not need verification if it is not an email", func(t *testing.T) {
+		server, userSvc, _, nsMock := setupScenario(nil)
+
+		originalUsr := createUser(userSvc, "name", "email@localhost", "login")
+
+		// Verify that no email has been sent yet
+		require.False(t, nsMock.EmailVerified)
+
+		// Start email update
+		newLogin := "newlogin"
+		newName := "newname"
+		body := fmt.Sprintf(`{"login": "%s", "name": "%s"}`, newLogin, newName)
+		sendUpdateReq(server, originalUsr, body)
+
+		// Verify that email has not been sent
+		require.False(t, nsMock.EmailVerified)
+
+		// Verify Login has been updated
+		userQuery := user.GetUserByIDQuery{ID: originalUsr.ID}
+		updatedUsr, err := userSvc.GetByID(context.Background(), &userQuery)
+		require.NoError(t, err)
+		require.NotEqual(t, originalUsr.Login, updatedUsr.Login)
+		require.NotEqual(t, originalUsr.Name, updatedUsr.Name)
+		require.Equal(t, newLogin, updatedUsr.Login)
+		require.Equal(t, newName, updatedUsr.Name)
+		// Fields unchanged
+		require.Equal(t, originalUsr.Email, updatedUsr.Email)
+	})
+
+	t.Run("Update Login should not need verification if it is being updated to the already configured email", func(t *testing.T) {
+		server, userSvc, _, nsMock := setupScenario(nil)
+
+		originalUsr := createUser(userSvc, "name", "email@localhost", "login")
+
+		// Verify that no email has been sent yet
+		require.False(t, nsMock.EmailVerified)
+
+		// Start email update
+		body := fmt.Sprintf(`{"login": "%s"}`, originalUsr.Email)
+		sendUpdateReq(server, originalUsr, body)
+
+		// Verify that email has not been sent
+		require.False(t, nsMock.EmailVerified)
+
+		// Verify Login has been updated
+		userQuery := user.GetUserByIDQuery{ID: originalUsr.ID}
+		updatedUsr, err := userSvc.GetByID(context.Background(), &userQuery)
+		require.NoError(t, err)
+		require.NotEqual(t, originalUsr.Login, updatedUsr.Login)
+		require.Equal(t, originalUsr.Email, updatedUsr.Login)
+		require.Equal(t, originalUsr.Email, updatedUsr.Email)
+	})
+
+	t.Run("Update Login and Email with different email values at once should disregard the Login update", func(t *testing.T) {
+		server, userSvc, tempUserSvc, nsMock := setupScenario(nil)
+
+		originalUsr := createUser(userSvc, "name", "email@localhost", "login")
+
+		// Verify that no email has been sent yet
+		require.False(t, nsMock.EmailVerified)
+
+		// Start email update
+		newLogin := "newemail2@localhost"
+		body := fmt.Sprintf(`{"email": "%s", "login": "%s"}`, newEmail, newLogin)
+		sendUpdateReq(server, originalUsr, body)
+
+		// Verify email data
+		verifyEmailData(tempUserSvc, nsMock, originalUsr, newEmail)
+
+		// Verify user has not been updated yet
+		verifyUserNotUpdated(userSvc, originalUsr)
+
+		// Second part of the verification flow, when user clicks email button
+		code := nsMock.EmailVerification.Code
+		sendVerificationReq(server, originalUsr, code)
+
+		// Verify only Email has been updated
+		userQuery := user.GetUserByIDQuery{ID: originalUsr.ID}
+		updatedUsr, err := userSvc.GetByID(context.Background(), &userQuery)
+		require.NoError(t, err)
+		require.NotEqual(t, originalUsr.Email, updatedUsr.Email)
+		require.Equal(t, newEmail, updatedUsr.Email)
+		// Fields unchanged
+		require.NotEqual(t, newLogin, updatedUsr.Login)
+		require.Equal(t, originalUsr.Login, updatedUsr.Login)
+		require.Equal(t, originalUsr.Name, updatedUsr.Name)
+	})
+
+	t.Run("Update Login and Email with different email values at once when Login was already an email should update both with Email", func(t *testing.T) {
+		server, userSvc, tempUserSvc, nsMock := setupScenario(nil)
+
+		originalUsr := createUser(userSvc, "name", "email@localhost", "email@localhost")
+
+		// Verify that no email has been sent yet
+		require.False(t, nsMock.EmailVerified)
+
+		// Start email update
+		newLogin := "newemail2@localhost"
+		body := fmt.Sprintf(`{"email": "%s", "login": "%s"}`, newEmail, newLogin)
+		sendUpdateReq(server, originalUsr, body)
+
+		// Verify email data
+		verifyEmailData(tempUserSvc, nsMock, originalUsr, newEmail)
+
+		// Verify user has not been updated yet
+		verifyUserNotUpdated(userSvc, originalUsr)
+
+		// Second part of the verification flow, when user clicks email button
+		code := nsMock.EmailVerification.Code
+		sendVerificationReq(server, originalUsr, code)
+
+		// Verify only Email has been updated
+		userQuery := user.GetUserByIDQuery{ID: originalUsr.ID}
+		updatedUsr, err := userSvc.GetByID(context.Background(), &userQuery)
+		require.NoError(t, err)
+		require.NotEqual(t, originalUsr.Email, updatedUsr.Email)
+		require.NotEqual(t, originalUsr.Login, updatedUsr.Login)
+		require.NotEqual(t, newLogin, updatedUsr.Login)
+		require.Equal(t, newEmail, updatedUsr.Email)
+		require.Equal(t, newEmail, updatedUsr.Login)
+		// Fields unchanged
+		require.Equal(t, originalUsr.Name, updatedUsr.Name)
+	})
+
+	t.Run("Email verification should expire", func(t *testing.T) {
+		cfg := setting.NewCfg()
+		cfg.Smtp.Enabled = true
+		cfg.VerificationEmailMaxLifetime = 0 // Expire instantly
+		cfg.VerifyEmailEnabled = true
+
+		server, userSvc, tempUserSvc, nsMock := setupScenario(cfg)
+
+		originalUsr := createUser(userSvc, "name", "email@localhost", "login")
+
+		// Verify that no email has been sent yet
+		require.False(t, nsMock.EmailVerified)
+
+		// Start email update
+		body := fmt.Sprintf(`{"email": "%s"}`, newEmail)
+		sendUpdateReq(server, originalUsr, body)
+
+		// Verify email data
+		verifyEmailData(tempUserSvc, nsMock, originalUsr, newEmail)
+
+		// Verify user has not been updated yet
+		verifyUserNotUpdated(userSvc, originalUsr)
+
+		// Second part of the verification flow, when user clicks email button
+		code := nsMock.EmailVerification.Code
+		sendVerificationReq(server, originalUsr, code)
+
+		// Verify user has not been updated
+		userQuery := user.GetUserByIDQuery{ID: originalUsr.ID}
+		updatedUsr, err := userSvc.GetByID(context.Background(), &userQuery)
+		require.NoError(t, err)
+		require.NotEqual(t, newEmail, updatedUsr.Email)
+		require.Equal(t, originalUsr.Email, updatedUsr.Email)
+		require.Equal(t, originalUsr.Login, updatedUsr.Login)
+	})
+
+	t.Run("A new verification should revoke other pending verifications", func(t *testing.T) {
+		server, userSvc, tempUserSvc, nsMock := setupScenario(nil)
+
+		originalUsr := createUser(userSvc, "name", "email@localhost", "login")
+
+		// Verify that no email has been sent yet
+		require.False(t, nsMock.EmailVerified)
+
+		// First email verification
+		firstNewEmail := "newemail1@localhost"
+		body := fmt.Sprintf(`{"email": "%s"}`, firstNewEmail)
+		sendUpdateReq(server, originalUsr, body)
+		verifyEmailData(tempUserSvc, nsMock, originalUsr, firstNewEmail)
+		firstCode := nsMock.EmailVerification.Code
+
+		// Second email verification
+		secondNewEmail := "newemail2@localhost"
+		body = fmt.Sprintf(`{"email": "%s"}`, secondNewEmail)
+		sendUpdateReq(server, originalUsr, body)
+		verifyEmailData(tempUserSvc, nsMock, originalUsr, secondNewEmail)
+		secondCode := nsMock.EmailVerification.Code
+
+		// Verify user has not been updated yet
+		verifyUserNotUpdated(userSvc, originalUsr)
+
+		// Try to follow through with the first verification unsuccessfully
+		sendVerificationReq(server, originalUsr, firstCode)
+		verifyUserNotUpdated(userSvc, originalUsr)
+
+		// Follow through with second verification successfully
+		sendVerificationReq(server, originalUsr, secondCode)
+
+		userQuery := user.GetUserByIDQuery{ID: originalUsr.ID}
+		updatedUsr, err := userSvc.GetByID(context.Background(), &userQuery)
+		require.NoError(t, err)
+		require.NotEqual(t, originalUsr.Email, updatedUsr.Email)
+		require.Equal(t, secondNewEmail, updatedUsr.Email)
+		// Fields unchanged
+		require.Equal(t, originalUsr.Login, updatedUsr.Login)
+	})
+
+	t.Run("Email verification should fail if code is not valid", func(t *testing.T) {
+		server, userSvc, tempUserSvc, nsMock := setupScenario(nil)
+
+		originalUsr := createUser(userSvc, "name", "email@localhost", "login")
+
+		// Verify that no email has been sent yet
+		require.False(t, nsMock.EmailVerified)
+
+		// Start email update
+		body := fmt.Sprintf(`{"email": "%s"}`, newEmail)
+		sendUpdateReq(server, originalUsr, body)
+
+		// Verify email data
+		verifyEmailData(tempUserSvc, nsMock, originalUsr, newEmail)
+
+		// Verify user has not been updated yet
+		verifyUserNotUpdated(userSvc, originalUsr)
+
+		// Second part of the verification flow should fail if using the wrong code
+		sendVerificationReq(server, originalUsr, "notTheRightCode")
+		verifyUserNotUpdated(userSvc, originalUsr)
+	})
+
+	t.Run("Email verification code can only be used once", func(t *testing.T) {
+		server, userSvc, _, nsMock := setupScenario(nil)
+
+		originalUsr := createUser(userSvc, "name", "email@localhost", "login")
+
+		// Start email update
+		require.NotEqual(t, originalUsr.Email, newEmail)
+
+		body := fmt.Sprintf(`{"email": "%s"}`, newEmail)
+		sendUpdateReq(server, originalUsr, body)
+
+		// Verify user has not been updated yet
+		verifyUserNotUpdated(userSvc, originalUsr)
+
+		// Use code to verify successfully
+		codeToReuse := nsMock.EmailVerification.Code
+		sendVerificationReq(server, originalUsr, codeToReuse)
+
+		// User should have an updated Email
+		userQuery := user.GetUserByIDQuery{ID: originalUsr.ID}
+		updatedUsr, err := userSvc.GetByID(context.Background(), &userQuery)
+		require.NoError(t, err)
+		require.Equal(t, newEmail, updatedUsr.Email)
+
+		// Change email back to what it was
+		body = fmt.Sprintf(`{"email": "%s"}`, originalUsr.Email)
+		sendUpdateReq(server, originalUsr, body)
+		sendVerificationReq(server, originalUsr, nsMock.EmailVerification.Code)
+		verifyUserNotUpdated(userSvc, originalUsr)
+
+		// Re-use code to verify new email again, unsuccessfully
+		sendVerificationReq(server, originalUsr, codeToReuse)
+		verifyUserNotUpdated(userSvc, originalUsr)
+	})
+
+	t.Run("Update Email with an email that is already being used should fail", func(t *testing.T) {
+		testCases := []struct {
+			description string
+			clashLogin  bool
+		}{
+			{
+				description: "when Email clashes",
+				clashLogin:  false,
+			},
+			{
+				description: "when Login clashes",
+				clashLogin:  true,
+			},
+		}
+		for _, tt := range testCases {
+			t.Run(tt.description, func(t *testing.T) {
+				server, userSvc, _, nsMock := setupScenario(nil)
+
+				originalUsr := createUser(userSvc, "name1", "email1@localhost", "login1@localhost")
+				badUsr := createUser(userSvc, "name2", "email2@localhost", "login2")
+
+				// Verify that no email has been sent yet
+				require.False(t, nsMock.EmailVerified)
+
+				// Update `badUsr` to use the same email as `originalUsr`
+				body := fmt.Sprintf(`{"email": "%s"}`, originalUsr.Email)
+				if tt.clashLogin {
+					body = fmt.Sprintf(`{"login": "%s"}`, originalUsr.Login)
+				}
+				req := server.NewRequest(
+					http.MethodPut,
+					"/api/user",
+					strings.NewReader(body),
+				)
+				req.Header.Add("Content-Type", "application/json")
+				res, err := doReq(req, badUsr)
+				require.NoError(t, err)
+				assert.Equal(t, http.StatusConflict, res.StatusCode)
+				require.NoError(t, res.Body.Close())
+
+				// Verify that no email has been sent
+				require.False(t, nsMock.EmailVerified)
+
+				// Verify user has not been updated
+				verifyUserNotUpdated(userSvc, badUsr)
+			})
+		}
+	})
+}
+
 type updateUserContext struct {
 	desc         string
 	url          string
@@ -379,7 +1064,7 @@ func updateUserScenario(t *testing.T, ctx updateUserContext, hs *HTTPServer) {
 	t.Run(fmt.Sprintf("%s %s", ctx.desc, ctx.url), func(t *testing.T) {
 		sc := setupScenarioContext(t, ctx.url)
 
-		sc.authInfoService = &logintest.AuthInfoServiceFake{}
+		sc.authInfoService = &authinfotest.FakeService{}
 		hs.authInfoService = sc.authInfoService
 
 		sc.defaultHandler = routing.Wrap(func(c *contextmodel.ReqContext) response.Response {
@@ -432,7 +1117,7 @@ func updateSignedInUserScenario(t *testing.T, ctx updateUserContext, hs *HTTPSer
 	t.Run(fmt.Sprintf("%s %s", ctx.desc, ctx.url), func(t *testing.T) {
 		sc := setupScenarioContext(t, ctx.url)
 
-		sc.authInfoService = &logintest.AuthInfoServiceFake{}
+		sc.authInfoService = &authinfotest.FakeService{}
 		hs.authInfoService = sc.authInfoService
 
 		sc.defaultHandler = routing.Wrap(func(c *contextmodel.ReqContext) response.Response {
diff --git a/pkg/api/user_token.go b/pkg/api/user_token.go
index ece71fe617c97..0662abcf5d7f2 100644
--- a/pkg/api/user_token.go
+++ b/pkg/api/user_token.go
@@ -80,6 +80,7 @@ func (hs *HTTPServer) RotateUserAuthTokenRedirect(c *contextmodel.ReqContext) re
 	if err := hs.rotateToken(c); err != nil {
 		hs.log.FromContext(c.Req.Context()).Debug("Failed to rotate token", "error", err)
 		if errors.Is(err, auth.ErrInvalidSessionToken) {
+			hs.log.FromContext(c.Req.Context()).Debug("Deleting session cookie")
 			authn.DeleteSessionCookie(c.Resp, hs.Cfg)
 		}
 		return response.Redirect(hs.Cfg.AppSubURL + "/login")
@@ -103,6 +104,7 @@ func (hs *HTTPServer) RotateUserAuthToken(c *contextmodel.ReqContext) response.R
 	if err := hs.rotateToken(c); err != nil {
 		hs.log.FromContext(c.Req.Context()).Debug("Failed to rotate token", "error", err)
 		if errors.Is(err, auth.ErrInvalidSessionToken) {
+			hs.log.FromContext(c.Req.Context()).Debug("Deleting session cookie")
 			authn.DeleteSessionCookie(c.Resp, hs.Cfg)
 			return response.ErrOrFallback(http.StatusUnauthorized, http.StatusText(http.StatusUnauthorized), err)
 		}
@@ -147,14 +149,14 @@ func (hs *HTTPServer) logoutUserFromAllDevicesInternal(ctx context.Context, user
 	_, err := hs.userService.GetByID(ctx, &userQuery)
 	if err != nil {
 		if errors.Is(err, user.ErrUserNotFound) {
-			return response.Error(404, "User not found", err)
+			return response.Error(http.StatusNotFound, "User not found", err)
 		}
-		return response.Error(500, "Could not read user from database", err)
+		return response.Error(http.StatusInternalServerError, "Could not read user from database", err)
 	}
 
 	err = hs.AuthTokenService.RevokeAllUserTokens(ctx, userID)
 	if err != nil {
-		return response.Error(500, "Failed to logout user", err)
+		return response.Error(http.StatusInternalServerError, "Failed to logout user", err)
 	}
 
 	return response.JSON(http.StatusOK, util.DynMap{
@@ -179,7 +181,7 @@ func (hs *HTTPServer) getUserAuthTokensInternal(c *contextmodel.ReqContext, user
 
 	tokens, err := hs.AuthTokenService.GetUserTokens(c.Req.Context(), userID)
 	if err != nil {
-		return response.Error(500, "Failed to get user auth tokens", err)
+		return response.Error(http.StatusInternalServerError, "Failed to get user auth tokens", err)
 	}
 
 	result := []*dtos.UserToken{}
@@ -239,29 +241,29 @@ func (hs *HTTPServer) revokeUserAuthTokenInternal(c *contextmodel.ReqContext, us
 	_, err := hs.userService.GetByID(c.Req.Context(), &userQuery)
 	if err != nil {
 		if errors.Is(err, user.ErrUserNotFound) {
-			return response.Error(404, "User not found", err)
+			return response.Error(http.StatusNotFound, "User not found", err)
 		}
-		return response.Error(500, "Failed to get user", err)
+		return response.Error(http.StatusInternalServerError, "Failed to get user", err)
 	}
 
 	token, err := hs.AuthTokenService.GetUserToken(c.Req.Context(), userID, cmd.AuthTokenId)
 	if err != nil {
 		if errors.Is(err, auth.ErrUserTokenNotFound) {
-			return response.Error(404, "User auth token not found", err)
+			return response.Error(http.StatusNotFound, "User auth token not found", err)
 		}
-		return response.Error(500, "Failed to get user auth token", err)
+		return response.Error(http.StatusInternalServerError, "Failed to get user auth token", err)
 	}
 
 	if c.UserToken != nil && c.UserToken.Id == token.Id {
-		return response.Error(400, "Cannot revoke active user auth token", nil)
+		return response.Error(http.StatusBadRequest, "Cannot revoke active user auth token", nil)
 	}
 
 	err = hs.AuthTokenService.RevokeToken(c.Req.Context(), token, false)
 	if err != nil {
 		if errors.Is(err, auth.ErrUserTokenNotFound) {
-			return response.Error(404, "User auth token not found", err)
+			return response.Error(http.StatusNotFound, "User auth token not found", err)
 		}
-		return response.Error(500, "Failed to revoke user auth token", err)
+		return response.Error(http.StatusInternalServerError, "Failed to revoke user auth token", err)
 	}
 
 	return response.JSON(http.StatusOK, util.DynMap{
diff --git a/pkg/api/user_token_test.go b/pkg/api/user_token_test.go
index c520a52fea395..62fa0c2b0db15 100644
--- a/pkg/api/user_token_test.go
+++ b/pkg/api/user_token_test.go
@@ -16,7 +16,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/auth/authtest"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/user/usertest"
@@ -200,7 +199,6 @@ func TestHTTPServer_RotateUserAuthToken(t *testing.T) {
 				hs.Cfg = cfg
 				hs.log = log.New()
 				hs.Cfg.LoginCookieName = "grafana_session"
-				hs.Features = featuremgmt.WithFeatures(featuremgmt.FlagClientTokenRotation)
 				hs.AuthTokenService = &authtest.FakeUserAuthTokenService{
 					RotateTokenProvider: func(ctx context.Context, cmd auth.RotateCommand) (*auth.UserToken, error) {
 						return tt.rotatedToken, tt.rotatedErr
diff --git a/pkg/api/webassets/testdata/sample-assets-manifest.json b/pkg/api/webassets/testdata/sample-assets-manifest.json
new file mode 100644
index 0000000000000..0c70ba84a1df2
--- /dev/null
+++ b/pkg/api/webassets/testdata/sample-assets-manifest.json
@@ -0,0 +1,1554 @@
+{
+    "1096.0bbf0dc9a95cc43faff1.js": {
+      "src": "public/build/1096.0bbf0dc9a95cc43faff1.js",
+      "integrity": "sha256-2MmK6Fdl2s04lqZfWopPfNrmzTFXLu/00hebpopjde8= sha384-fZK2YPHN2Dj31PVKnviGOFKi+cwHcJpSPgr0sQ/80H2O317Cl/Zdsv/crbIJOEiu sha512-icDQmF4jkZWrmZlkfyIDCLKxFVOvQUqm0Kk+G1KRfV1gVcaGQt70QVyyjqJOFiHSGQC21M57ZVxJWOpzDw7zyA=="
+    },
+    "1096.0bbf0dc9a95cc43faff1.js.map": {
+      "src": "public/build/1096.0bbf0dc9a95cc43faff1.js.map",
+      "integrity": "sha256-BCWKOirm4b+oTe12qFFjUWiWTJaPH/+9CMgmunRqYic= sha384-i4F5exKTjhSpoy97TbSh0V+kycQfzajw6Toa9Sz309VKrZ+tsUgzYHZDZkZGeKNj sha512-3ue1qgyEE4Wzn1i+4fvEM/iiWKkLUGGEYskHuB6LpPhGf1cAYvDb9CbTGX3Udmerao/0vG1Uu5l8VB3JnTqEjg=="
+    },
+    "110.1663152e35f7704331c8.js": {
+      "src": "public/build/110.1663152e35f7704331c8.js",
+      "integrity": "sha256-wTcRRQeEftw5hcGIMnzrarv8YKOXvVSLmJHoPI1y9Q4= sha384-kGFxqUiwHhe15PbgqYY1YAx3iwzsChH4lbEbx31I6CNtSHHpw6b/3d0q8Kq8jAbd sha512-oRz1JyQmB10ZcZUq2aNJa8+wujUTkYkjQa55yUCZDNrgaxudadDFRD34QVeO3NHkz2Tug5FWF5WtQgZtKEwd+Q=="
+    },
+    "110.1663152e35f7704331c8.js.map": {
+      "src": "public/build/110.1663152e35f7704331c8.js.map",
+      "integrity": "sha256-CMhVs6zc+t8qhE/Z7E2ltDipwNTPe1FocZT1bM5Dgt0= sha384-LLumGpgIt9ON3wxYj1wWXd9vCRU7k3WDEmxyCnqiInlHYPZswi7HX+4b4I/dMczE sha512-a+R9g7uCeO53I0TMPoUY29uxtoE7x4aSQM8YMPrAbgI+LHrG2b+/w8CLGgKw6Hbjys9Y0Avgt8TQ+FikscCWmA=="
+    },
+    "113.d643bd6ee171b9d94893.js": {
+      "src": "public/build/113.d643bd6ee171b9d94893.js",
+      "integrity": "sha256-bqwCriziADnqyo0Y2uqI5+3YIYOM2rXV7t2B8ZKw+n8= sha384-ZocY+HW7pBlckC9OSXq6dLf62eVmGWWsliPkb/ngjf3rL0oF8ARC75paB1TrqitR sha512-DC0BXYPvP4fa9YOQq9IZM4ByVztEA9yTueJZ2mgKpZwmhRO0yZvDSDXWIrsJeztPrgnoz0LwXjHGkC8xbO3eSA=="
+    },
+    "113.d643bd6ee171b9d94893.js.map": {
+      "src": "public/build/113.d643bd6ee171b9d94893.js.map",
+      "integrity": "sha256-onDCVBz1fQ/P5gsC4KEVw0520BmTiWiqyzX26s9m0Ow= sha384-pL0UmZiVIvnZ4U13PrsflNtIRUy4ihqgwsf9R+fXbM72pHW5YOGJQlh+w9trpuNp sha512-eqhDkIGKfOHPFUFh8EdeJZPcWysbsz64nUVT3u0utoVcU7Ni9cvUwS38PbUotUirHAdnBTcsxmPMlk6DtIxpmw=="
+    },
+    "1272.8c79fc44bf7cd993c953.js": {
+      "src": "public/build/1272.8c79fc44bf7cd993c953.js",
+      "integrity": "sha256-d7MRVimV83v4YQ5rdURfTaaFtiedXP3EMLT06gvvBuQ= sha384-8tRpYHQ+sEkZ8ptiIbKAbKPpHTJVnmaWDN56vJoWWUCzV1Q2w034wcJNKDJDJdAs sha512-cIZWoJHusF8qODBOj2j4b18ewcLLMo/92YQSwYQjln2G5e3o1bSO476ox2I2iecJ/tnhQK5j01h9BzTt3dNTrA=="
+    },
+    "1272.8c79fc44bf7cd993c953.js.map": {
+      "src": "public/build/1272.8c79fc44bf7cd993c953.js.map",
+      "integrity": "sha256-LQ1nvFCj7QPop1xV7eL+me26aT789UIextaqMt7p0sM= sha384-uDFiuDYoIgkMTEdGfeGiIKuq5jx3F/VSyCY4q0d+E3dmcysvdJfcZZ4MXrAA9KHC sha512-Mxq4mfUd45Du+ZjBKoETjHbvHCJQI4qfiT10Qv3YISYArUEDrVb5ZHEGWDf7G702SafG0P7J3JADuKRN0x3QXA=="
+    },
+    "1291.8f4e290b36b8749c990a.js": {
+      "src": "public/build/1291.8f4e290b36b8749c990a.js",
+      "integrity": "sha256-TlYEGk1/L7at64KnsU9OebCvK/I0dpRssXrNqZzkB1Q= sha384-o+0Tw5W4HpPMxqcRdsSUeyZvQlCrCbvRcfendULDYDQdN/cSiLfqTPT9X6eB/6DE sha512-/35qP9ME3xJiMvL2aYLCrxliU0PrCfFj42/UQnPL6hUs0OPSrWBdUah+7eT+xFVhE9A28FtkUmau/CfxeoLwng=="
+    },
+    "1291.8f4e290b36b8749c990a.js.map": {
+      "src": "public/build/1291.8f4e290b36b8749c990a.js.map",
+      "integrity": "sha256-MhogH4hksd4ytZbYLVkpkcBHMezJIZjKd79Ge9nhT+A= sha384-1JB4a06PPb97GG2XnA/4BiDj0W/GY8JrOVFFEUWyAU63XCcxHGrfm3vE0T0JORjz sha512-3R1jmUPGfiube0ULIKcmV12AguLtdq3z8CANZjfFRJH8btSTlmxjubyz6Gyi6D2UsLAqs0Ern8EeQXJenZy9ZQ=="
+    },
+    "1408.40b4c4f92c64bffbd82e.js": {
+      "src": "public/build/1408.40b4c4f92c64bffbd82e.js",
+      "integrity": "sha256-w/PYIhHC+fCtf/BWhSjLHjdXhkNJmmZyDmA0nusP308= sha384-U9vQasiiOfJWwbi3U3qjpiWs4CysbS4U+VBfNB1sw+CMZ5GXhMoC2JaGEiDU1J2z sha512-VroeQGNwP+Qwbt0gpqS5S2Rl9wx6CqGKIi71plAyYCOjwMk/xAT4H4Xvn3z+6EFFjpkU3BiRb3PSOrdnTFIFHQ=="
+    },
+    "1408.40b4c4f92c64bffbd82e.js.map": {
+      "src": "public/build/1408.40b4c4f92c64bffbd82e.js.map",
+      "integrity": "sha256-BaMvWO7S7qWJBxDRyNQpVN5TVB7pBEqcktjqES+X7/8= sha384-hPFTbsC6oFfbH8mfxvs0D8liv7jWm5yKg3u4txCenCzFmOA/IRHLAfpVLZLoTvFO sha512-EdGaBbUOcsODL/taGYtZIK34/77jL32cfRpMIgno63AmXuRAlJAt/M4L7EGFnuYvFzhLTguJPm21GwGMPDb1pQ=="
+    },
+    "1435.970ae6e137f30385f5c4.js": {
+      "src": "public/build/1435.970ae6e137f30385f5c4.js",
+      "integrity": "sha256-o6e/vId33JQqaWO5ZI1uP+BF4hr4xOOw9U63Un7yeZM= sha384-miOMy4ynLZuOFRTO51MOrPKVvwYu8axBDOam47iBSpv4FXN5PA7qx2/ufMTSyck4 sha512-FOoKwNVOgltGw7KYoBQpOPvkQ6qOW60jGZYqXSchBAS9Pi4siLyyUT6uSS7QeBsesj0YFrTcIb697VAKoSTtfg=="
+    },
+    "1435.970ae6e137f30385f5c4.js.map": {
+      "src": "public/build/1435.970ae6e137f30385f5c4.js.map",
+      "integrity": "sha256-OudSBZasp6KESeb5LWyzRSzxFUpFGySW5p5OZZJZmPw= sha384-crnxkKw8I+CV4RBGBJNsD2lY8c53d4Z3XYnFSXMGI0Wl4swRHs7lI1kGlL4dNL5X sha512-X/WDvtXz4dNmvJXHmEzf+z1OHjacUjQNZ9tG+Gk2YU6tOtSgOwQjqIhTh4gdvGz9eJNSmqx4uHaNQrXqlXCYVw=="
+    },
+    "1478.18f05a0e8b0b10dff226.js": {
+      "src": "public/build/1478.18f05a0e8b0b10dff226.js",
+      "integrity": "sha256-68IPpU9IA4tCNCkDMdvVZMwvBu43fFEKjOVqduOfCd0= sha384-4jnou875zqPqAK1CiKWHddOJzs+YFipnm9g5f9DiY/BY8SNqIjpObUWGOEzifh+U sha512-6pyG/uMnzXoqDI/iTlq5NXqjLrfJNvmCuIJ639rfBJusZSuBZEHPC64BilNJYQbi+u9CUkl2RHdtLZT/AhNixA=="
+    },
+    "1478.18f05a0e8b0b10dff226.js.map": {
+      "src": "public/build/1478.18f05a0e8b0b10dff226.js.map",
+      "integrity": "sha256-5tEtS4XPhMW/JClSUUL4kEkZaDRdbX2hecV8BUXI9bg= sha384-tcFjeiMNlSUUDeLYifYV/wt3XHDLMK/Ku32RWTj/hNBZSr5mWO3mkwKMsrMiiAqp sha512-RueqPbDjXP7IsfDR0scNJFrPy7UurMsaBRzEGr/glJ3ItoGelI/0VUhzpdJfBVl5MCiVzrTJok94CJK462MdVw=="
+    },
+    "1634.a5a9fd867843c0715212.js": {
+      "src": "public/build/1634.a5a9fd867843c0715212.js",
+      "integrity": "sha256-YQFMMxC5Jd667xkAJKZ40JzhgtzCdn0cxOVij0Bo3xA= sha384-1YRgKbTIN0W06esB4qlKGeI+lzF/Vsw/Ff8qcYEflt672W2PKC83eRUzRy0Pgaln sha512-fwVIxqbhOnOHSwqMWogL9MlXIYCI07wZr4zvQA+BcvELP6YKvvRbTgS+QeDnoE4Kn17Mum3lgStzpfqSOQg6EA=="
+    },
+    "1634.a5a9fd867843c0715212.js.map": {
+      "src": "public/build/1634.a5a9fd867843c0715212.js.map",
+      "integrity": "sha256-3a+bEwIHnowmTJcbYCVQKqbTQDRJvYsgguR3Z4GnbfM= sha384-+k77PwAxoVrxEeMAV2xQXB6yCBmQRw9R/TNn+fpVteiRQcpGXVdI1XWltqFd1Q+g sha512-4drzjwBysi54GJUYt+OjVmzez7nEzPQ1MWLm6qkoXlwjYPC4Qof4tzguVST+zCuLim2t+CZci0rfsjUouk/61Q=="
+    },
+    "1637.b4c62da200c64d2ae101.js": {
+      "src": "public/build/1637.b4c62da200c64d2ae101.js",
+      "integrity": "sha256-0u2U+PkD31+bqZDpwwHqHUMU9KY8VgfVmMAIkqPZx1o= sha384-A0fybEpk7562cEAYxPC4C/O2D6Bn2On/ayk4BB9BqUIuySkwiKkDegFPqH62KAuT sha512-6ZlE1UjtFrrgglT5clefaEVZjtDlBwTib3aFZAjP57SUufWhjIjSHhiLzqwCKqvHV7H8y1yVip4EXmrE611kRA=="
+    },
+    "1637.b4c62da200c64d2ae101.js.map": {
+      "src": "public/build/1637.b4c62da200c64d2ae101.js.map",
+      "integrity": "sha256-7oNbw1bGYKjQKYYCTDZRWgNJ2BS1/s2Qgb7x0yl96F0= sha384-SiOFb5KFO5LFCD0vYSKgzvDJwmgi4N4DczSXKX5Eae676nH1hSBXKx2N9+FDjXBQ sha512-jeRYhfVaaxlf+v0Zt4HIlMZgBLLsyT9Qf4i0he+Qn54I2vVlfGEpdjg1Lu0dMHePss0Zqv7MIx/kcihafcKfig=="
+    },
+    "1679.5dc95a2627a70affc590.js": {
+      "src": "public/build/1679.5dc95a2627a70affc590.js",
+      "integrity": "sha256-YV7DfQuju9FHll9HARig7FfJVpJYA+s5FaozT94ug/s= sha384-/uKIkLvQZF2ZEvfCaOBEU6CSLvY0Eo6d28/yIImUEZJbVGGXGZHD9j1mihvmL//l sha512-7Ah8GlURAhztKUxIenPOyrUovpYEg/p3+xRRalmMQf8Yv7tK2pqGGj5ub51+0wPCAwcyNGI27JhgwWiSGV98Qw=="
+    },
+    "1679.5dc95a2627a70affc590.js.map": {
+      "src": "public/build/1679.5dc95a2627a70affc590.js.map",
+      "integrity": "sha256-2CqORYuXTuZqxYgBuDZooeHVkGLVLzWTZke+ElynQB0= sha384-rrDZUA9GawyIENo7+8oXEw8MlsR5wYXstcOTKGp89qpg7Z5565YUB/2PE/sT3Zsi sha512-3sEQwpmpmMV/fDzG5LYbeE0XA1npXkVO3aHsISljBa2RrxKm6rv2FOQd4j1MKKl5Ih9Qx/aYo86Oh2LES/hrAw=="
+    },
+    "1693.33493a6f33ff9f3a43bc.js": {
+      "src": "public/build/1693.33493a6f33ff9f3a43bc.js",
+      "integrity": "sha256-cgIOB5K2apXbq2KUFlM9eD2UsPDmpd2OzigNx8Kwyw0= sha384-I4s4I1a7z3qfFBOURSBRToUBmWHvD/nWfu+EsHfO2/fQ1OXHCZyyaDdYD/2l6Va5 sha512-vhs0s59jlP0Jqb+3sXte3FW0ih2jUOvxi4r9EneOJtlttOYxSjpnoaNXoXILnwXGeOPHwklQc06OlcELW+tUEA=="
+    },
+    "1693.33493a6f33ff9f3a43bc.js.map": {
+      "src": "public/build/1693.33493a6f33ff9f3a43bc.js.map",
+      "integrity": "sha256-qfDaH1QD0CvR9la/QOp5MFM2ezW3bywB1N8ciVUfst4= sha384-lp1imS2X92XMnSrR9VQ2HOnQNHIGtMsK0CZHX8gF+jpGh9tteF07lkRCpycICydm sha512-BNQ9Hltqm8oIgYQh1RdXvBDo2J4Z6mwoZSekXEnn2DDdCZ3ncjCtd/HlpXg1n7heaMaazJFdvgahgVd3OcFcQA=="
+    },
+    "1707.858164710130be9a7d75.js": {
+      "src": "public/build/1707.858164710130be9a7d75.js",
+      "integrity": "sha256-lOf3ZmokqLQ+nq/2FfacWQbieSbTk7MCT6am5Iqv9Fo= sha384-GZQYzrenrgSV4Bj2g5JJ6KVrstFgbFEcrla2rU4xsgTtLfzjyYeWrCxKQA7sMuPG sha512-lAl1lCTUqP/HQAbWSrBmxgzcOURd1ePS5S50fSFiCbhQAZzjI1g0rAaO0/aapAKFaSeF7HWysZG0dfGSoH6HaA=="
+    },
+    "1707.858164710130be9a7d75.js.map": {
+      "src": "public/build/1707.858164710130be9a7d75.js.map",
+      "integrity": "sha256-f17nDL/G6rSy/5Q0uAxd8FAs9XDuX26k+NW74bIyP7A= sha384-fvgL9xh7vPR8+58MOtz5YGBFrO5sKKjx8MPwTNq2ARorGxDIR3O8L7wuHFUlF2KZ sha512-cyjuY/xjPsRcHtZkTnEyNNRbCtPCK4MUmP+LvnuDkieTRnBZWJtnGyulzLcnEyhudkKU8io5DfrmXm5ZFTDqYQ=="
+    },
+    "1733.8daf8c8b19dde16aa272.js": {
+      "src": "public/build/1733.8daf8c8b19dde16aa272.js",
+      "integrity": "sha256-ttlIcJR/jnfwSc3IItuCfxg24ai3aHWvO3kHoVMNbHw= sha384-WJZnXPGFykssFFQI5xUod+9YoAMXGT7dR4YGeAK/hnhDFAE8L/ckZ0ryXZ+eVN5B sha512-VQJYeL90LoxWaRzD1UZQ9KBW1aXfVEVCSoXJH6V5G/W/mok4HRqbierXYGcOtYj0zJ18mYdhsMJ7e4n1/Pi8Yg=="
+    },
+    "1733.8daf8c8b19dde16aa272.js.map": {
+      "src": "public/build/1733.8daf8c8b19dde16aa272.js.map",
+      "integrity": "sha256-esN7JFr06BILcL+IZHtaHw+ZyaY/HUb4YxZ0m1MC1ZI= sha384-mIO+gAHZsQobPvFqvRS8mMGlQGi9gT1o/+FfIlenrkgmu9Tm3RmMV1CrCUsIx/8W sha512-Q2zkYrCx2z2Im73/MeV042haicfuipba2sNjUkP6K0c8XrZTihnmvCMRsDGb1XOSOFnQMSbWqWoh3prokUm+lQ=="
+    },
+    "1788.bfc60a5ad6b97985daa0.js": {
+      "src": "public/build/1788.bfc60a5ad6b97985daa0.js",
+      "integrity": "sha256-iZ8mvEGAa0KNO/88BO6FGeQ1Ot0x2s06MeUDc7/SfPk= sha384-9c1hxb7Iq6m+1FmSCltVWrMnOmv1WuITGRSYTyI9W3R5FzJf9eW46ad7f4r4ZV1d sha512-b8UAqMguPTJiIwKlwEvfqoFKGypSK+Z4N+D/R+YGbfYzzErFHPxTBTCYTnqvdagQkNTySP9508RRG+h9gPXkuw=="
+    },
+    "1788.bfc60a5ad6b97985daa0.js.map": {
+      "src": "public/build/1788.bfc60a5ad6b97985daa0.js.map",
+      "integrity": "sha256-oghTKxFRhc99rXZKV2l9bjumNoJBwI3RfGzb2AzEK0Y= sha384-n4oAbUXy8MEmJw/h/ppmRhs9MQp2inVVDZqxlirZFJJffHfbpki7HnnD37Y5eelc sha512-k9jCNMBvSJ2Bfl5whTMTYWNiL+KFZtEyj/aW+Avn/it7bJP1Zc2jdk95X6sXqChhvkFMTBBrxdk9bTL32pDuQw=="
+    },
+    "1847.4971926e0e5bb76e3d4f.js": {
+      "src": "public/build/1847.4971926e0e5bb76e3d4f.js",
+      "integrity": "sha256-Y7IZamOdAgBobQBZRNNNUP8BsRspL4w8TxaWY3v0jlw= sha384-HtXW8Z8o68ogitSiLytaAUzMZmjJPw0b61BxTPqNr6hs4x/+MXt00X10vmeA7M6/ sha512-fjNtjLbfK94PBnYc6A+MVfkISs/0xq3PiSmKr1ZOa9TJgUbYgAfHMmfYZvakL7OZgZfKh/hLXc6h8nXFPi4pLg=="
+    },
+    "1847.4971926e0e5bb76e3d4f.js.map": {
+      "src": "public/build/1847.4971926e0e5bb76e3d4f.js.map",
+      "integrity": "sha256-bwGwfL8JbAvJosz4Z+d3ml0JrPyQQY7ndtUFfnPTbw4= sha384-2m1kltLPP4GE4LtimqDkz77Xd6MK6Nf/Hg1SgBP62mZJy8YjCCy8A9oSHc11Lx5g sha512-lO1v6S4WuBtNQ/fDBnA1csrQMO8NEBy3457tex75XxS75kZMY4ObPKSZBdGVsCftE3f2xq6d/KNFf8QtCjeK9w=="
+    },
+    "187.5dd5a3b7c36b1d96c527.js": {
+      "src": "public/build/187.5dd5a3b7c36b1d96c527.js",
+      "integrity": "sha256-RgQMjeTiRAqwseVHRYBXXcW4jXXvTpLuIGm3DUmlx00= sha384-KIK5ktpnMErGyZVganQ99UVSo9xcJWTML+u2OUw5k+LXpTsU0XyEXl5rfSN8qHWE sha512-uRBvnAWdSbqzkzTlOcd4k9xW3NovqZMwc0UcRAtqIPkDJjiNUw9s+xF63jfwzC/nGAl2P6kHl3sqsEn6xOq+pg=="
+    },
+    "187.5dd5a3b7c36b1d96c527.js.map": {
+      "src": "public/build/187.5dd5a3b7c36b1d96c527.js.map",
+      "integrity": "sha256-PD6yHm8FLcfy/uqvqykGozLsmJutpUpfSytCLNVtSFg= sha384-y4CRYLW5Tjvf8bhQ5VTOeVFh9nF4z6jB+6wzljs2D6hxITxMXkQfQDEfNnEU3Gr3 sha512-AOBQglbrq3qlbT06+6N7By9dRzx4x7Ry7SMWT45nDgAYqj0bLXjM4lLi+fxpztb89L9TDrvZV6LeWXq/mfH3Rw=="
+    },
+    "1955.92b44dee504667245aab.js": {
+      "src": "public/build/1955.92b44dee504667245aab.js",
+      "integrity": "sha256-BdF/2mOWX8jqf2YT21soUpWDeJoLfDhd07H9JTTBP6c= sha384-rlY1GNMWfMTa0a3mbfqysB+lEKswcATV4+FKEc550I2wRfen1K+k60JaYzwHbh76 sha512-tIr5ASV9eGdBrpsLVMttJQorBoaoyNiJyu56NTfCQbZPf0dXBfa2cOfSDgWjboBSnvNEGVc5Npmkk2qlFmB0BA=="
+    },
+    "1955.92b44dee504667245aab.js.map": {
+      "src": "public/build/1955.92b44dee504667245aab.js.map",
+      "integrity": "sha256-QdUhCdoThktkPwCwJKzueQlh8kQxT3CnftHjRyHqqwQ= sha384-ZCUvhqQfLa2O6wUZZ3VEylMiwNhwWNUrT8khpMdKRaSDOyqPXpSQb9wbjj1Di4ZG sha512-B9UDW4EeAA2u+2er5FKw/GVWmz2vjK5ydocuLhUP7KLwu8/sZq8rhLpGt7Fj9UutA9XoAvTK7FPzYYphNwF7Dw=="
+    },
+    "1962.e65cee65e979f3d26272.js": {
+      "src": "public/build/1962.e65cee65e979f3d26272.js",
+      "integrity": "sha256-ZllaCHb7OLGYof5Ctvo8YTgdflzEEV2nKyjicQ/ASh0= sha384-Fji/C+j2mdCPnUG3PLmU5F95LHox+KLNE22uhFmCEpfSRmu5vr4+eLFLi/AHWPSx sha512-0l9KRuNcm0tzF5C1+IUD5yhA5fn1IYJdb3LwX0zCVAmgtRkof/DE6zqzFgPdE+8qU+R1h2SCm2a7KFzRKhtspg=="
+    },
+    "1962.e65cee65e979f3d26272.js.map": {
+      "src": "public/build/1962.e65cee65e979f3d26272.js.map",
+      "integrity": "sha256-KUn+V5IXCqDAwOt9SpUsxVNGmosMVh6mC7EhlHan+u8= sha384-cnTgzuMCujpuzaz7PDXoPtDPL40rU49d4aETtPYtgKzQ0/utWKBSdC/4AppjLxzG sha512-JhsUGdq9NnSTAPQjHDdAIt7nPI6w/HnHaAGyjVjThIdQlZ1PfaNAGeuUE066gt2aSC4ThMVPlZHNj6DstLfngA=="
+    },
+    "1982.b4ec4b0bcc512a95ecb8.js": {
+      "src": "public/build/1982.b4ec4b0bcc512a95ecb8.js",
+      "integrity": "sha256-ArytqNXqam4PUrnj3ppNgiGHAUZdq9KyVZGu9z20kko= sha384-lTxxf57b+8fc93p0XFTOHPc9DPDSZOFuZ1hj4CBu6wNGOcU11OvEATFq2SmylkzC sha512-7cLz62T90Xz1dC+ZjoythfmP4TOS+UEqCbGvg0l8Nndnz+wLV9W9hS0GLYoeZxzGa+QWkUn8hmW8TutCf4YmdQ=="
+    },
+    "1982.b4ec4b0bcc512a95ecb8.js.map": {
+      "src": "public/build/1982.b4ec4b0bcc512a95ecb8.js.map",
+      "integrity": "sha256-Q44ZxEaxAS2ZJsHr5On1WatsMvQYviFMgkx50vKClNQ= sha384-21cQksVKgL5fRoue2G+1muYC8SJdUDGtpnzBEYUYE3XC4nCsZzsA5S/8DT+pNsHo sha512-1+1AyepM+qecrzHs4dO8bH5MnYZuR9+I4EhkkXi9/CcEO8HIkBv99pnDpIiU2ti/k0RBfq/fuIcjefAZII7LBw=="
+    },
+    "2048.2041d397d92073ff6b52.js": {
+      "src": "public/build/2048.2041d397d92073ff6b52.js",
+      "integrity": "sha256-yvF/uGDMHT2oaez3EY8po974dIm7jUBSIUHfC6Ldp38= sha384-7etxqN1PB0lYjrxFd7e69uRdnpqnUew1jfhA7M/22DXHyQLTyRYafy1Ms32v7GW2 sha512-NTgI7/W3vXIEG41XDxrlvBviGgrK/cTdb80GGmcPzcHV0j7YOnP7GC5Uv0vB1SEhPp1yz5SxlIsmtBf2JEY4bQ=="
+    },
+    "2048.2041d397d92073ff6b52.js.map": {
+      "src": "public/build/2048.2041d397d92073ff6b52.js.map",
+      "integrity": "sha256-9Dzx7V2dSSamBJ0/409pcSCawDDNLnZ9Su8204RTfYY= sha384-Y3yhR1Z0U0/TXsgCA7muXu7nZ5sqy9m/P71pmfi/TJUiGHa6LaIIH6cPgIDOo+ce sha512-SHacXuJPcMxtZQV9jBaj3pV5oZDqrgAiGiuJvH2FRqtX06/MUKQVaz4susP0lUjNqs95i43HkBA+F4U22wPz7Q=="
+    },
+    "2087.4ccab8e0799bf1e68d3f.js": {
+      "src": "public/build/2087.4ccab8e0799bf1e68d3f.js",
+      "integrity": "sha256-2xsr/5tJ2Nx04BrWCfwmzSZxhU6PQ9lO6RSQ0dc53X4= sha384-zTHNFyunf989MCIGeYViAqi1UT0Bs3150jJt9JVW22PA4qOXvAShLgZKLPncTmpx sha512-O5KPEJNl8qqimgP/YYREjWqjGLe4SnzYMCtWk9s1vssdan+unB6h79I9RI/cWaHIzC5MkqPpdg1RisoJLEkbUw=="
+    },
+    "2087.4ccab8e0799bf1e68d3f.js.map": {
+      "src": "public/build/2087.4ccab8e0799bf1e68d3f.js.map",
+      "integrity": "sha256-VUBPsD3TpDSVusEDTUDdp5iJHRRZywwNgzEIRPmydXE= sha384-RYg1YEDB3mNKFb88A6OM2WWyt9DEP2AVE4g3a3/F2nuXuy/TCLNjvG20032MFYmP sha512-rMbDg65T09P4d7GmGDiTYTHMLSo/XPahduXjLj6+6qYEGjrkb2zvZ1ZYXRBPvEkt8sE0RP+3r7KVtSjJbp6Khg=="
+    },
+    "2094.838ae1cfaea42e4382db.js": {
+      "src": "public/build/2094.838ae1cfaea42e4382db.js",
+      "integrity": "sha256-KXh1Z+bfDz+/mT/yupdCPMFz/thDikUwlY8FVHdm+EY= sha384-HsCK0JV15Ei4uhshghAyk4qJiiGC/TaYBPiF+qGVzO5kUgndpWEg1RArZW9rpb/7 sha512-K2Bs5UUeT8hmbvZci56NjD1wAC6NunSWCLCG2JBG/2OmuR1aqBSibRRG/UKsg4UNbtXHLrOj5QO0i8Ew20keVA=="
+    },
+    "2094.838ae1cfaea42e4382db.js.map": {
+      "src": "public/build/2094.838ae1cfaea42e4382db.js.map",
+      "integrity": "sha256-V7rswRR8m2nK2bVAyBR3sJ6NcVFWg9RzSB7T/ZLaLmM= sha384-Gj40yyQJi8UFafkpwDDVn3hBQbVoPxF2FIryyf8E3ok0/8CKVXyiOhHbA7UTqjnb sha512-nQ29qrooOcztdi+rfZtZfCQF1L0pOI+CDeM7El3IfBvdtHlUP093vXfJU3ncr/o7jbwmxdzwkJW6ECcrN+HAcA=="
+    },
+    "2136.9d4188b6ffaf2f647d57.js": {
+      "src": "public/build/2136.9d4188b6ffaf2f647d57.js",
+      "integrity": "sha256-j4jRjFK0V0yTV8Haf45UOCOsgqRlbzRfDy1SZbzxWBo= sha384-bccRrSzefMFmD2Ec8c3KpWkhgswbEsKFKVP7wPg0Gsz4esFz8zGQbxeynF1kCvO5 sha512-ZHGBH1fOIrJTsv8AOOIKsYHNHz3xqnTTT+cpgnpq69YHuoT/eqpN38UiBAlLiyiCl/Ae+CD2cjSGCyC8BFU1BQ=="
+    },
+    "2136.9d4188b6ffaf2f647d57.js.map": {
+      "src": "public/build/2136.9d4188b6ffaf2f647d57.js.map",
+      "integrity": "sha256-djJdrm86OitIquIWgJ41YZprJeHA+V2EyBs60wrzXEY= sha384-qDSunwCuTf9OreqHxC7tRS+ZzyNGKYMuD56ODtqCEL9NinVD6H/oRHNLvkbq43uy sha512-ZsER0FvJWMXHLXKK5pPl+FrEFhBRl8lucejpKjsup6uJofD9NZbhjFSYm9f2vDStaC8YAUuxDWk4MgX36XdkQg=="
+    },
+    "2195.5d8ecd8ac8c6bfa7c32f.js": {
+      "src": "public/build/2195.5d8ecd8ac8c6bfa7c32f.js",
+      "integrity": "sha256-0M0FdG6F4tiJ/dxTtb6x9vGyXPtzqpdpz5frBP13n8M= sha384-LvNUTb2cmULmh8d2bbgWe7tYQO8SkMPglxEQ4hgsQy6gg86pCj8uyKIj+TO/1a1k sha512-ivaOFjuzbZ3GP36OmWi79Gbd6ADEC+/iihe0p/5PriYlZwNiJ5R9/jgTfFTqFOXdk2RR16l552+yjBNGgmmA+A=="
+    },
+    "2195.5d8ecd8ac8c6bfa7c32f.js.map": {
+      "src": "public/build/2195.5d8ecd8ac8c6bfa7c32f.js.map",
+      "integrity": "sha256-ISIsoN6qgTW3iv+9KL2eO9CJnTm6M/0ZB9Zqv4/2Dds= sha384-ByERsDQx+ouQ6qJYbkGolJWmnH0n+iICIccX2qA6GU+PCnNc/t4VMLmpUAJdn5gy sha512-2Zc6LiNrAJhKDtmbSvZtTlNUH7PmwV3WUXf1oTkBEgKAOVLcgJBQwfFj99E3UqLhCjYCAclEe8Zc3AXVUHJXDw=="
+    },
+    "2267.a09098475a89300f3546.js": {
+      "src": "public/build/2267.a09098475a89300f3546.js",
+      "integrity": "sha256-GfV9r7G76eIkfWp42jL5u5XA5VWLDxNd1uHznG87tVM= sha384-u1gyBgaMKD22LERL4+KbJPPqHnFRz9PGA/kxNOBdaygzuOD4V7WzVlBz9Y+SO9u/ sha512-8GoCWS373EXivOXuuV6Cemr+Nn9msB0bGK/8qzdbA/yXAver1WN3Fj9iMYIghJjPnkB1sERU1DrF8iqCUd9KIQ=="
+    },
+    "2267.a09098475a89300f3546.js.map": {
+      "src": "public/build/2267.a09098475a89300f3546.js.map",
+      "integrity": "sha256-diELXEPADvMIOpOa8mG9sWRxIxJDp/Zbzi23zNKOt60= sha384-sCO4kFZoQQEjX+bFRMY6ImDb5r6JMPuy8OyvwEkxKFN6IWn8RGi3YQKqfrnIYLhx sha512-A5fPPCeTT+LWniIKVsrV9u+rbY80YToBs44KzWvsOWj9Q2nFXwFgEhM8wehjGiPYcn3Tdw1lMzW93lr9djqjfw=="
+    },
+    "2279.9102ff833be4d026f20c.js": {
+      "src": "public/build/2279.9102ff833be4d026f20c.js",
+      "integrity": "sha256-ze6zHuotKumpEXFqIVlcULZqKpq57BkcRBiclTunVhQ= sha384-sGQY5fDqrmJqPvhrsKy3OWwRsVjoyNzxHSc7tJMF3dKWsF68aWFJAMwgD1hkPc9Q sha512-aEBTzdM+y9cL2zVUJRowDYKMOw0azd4QrVcCHzRKCX5bik5o4IwvLVQWBQrEPyRH9hv4/QVlYQWXE9OCNAlk2A=="
+    },
+    "2279.9102ff833be4d026f20c.js.map": {
+      "src": "public/build/2279.9102ff833be4d026f20c.js.map",
+      "integrity": "sha256-XDZTzoytAa2u00c/diM7hwoZVmt1bzAuHkVGhHsFKlw= sha384-VfdCA5YT2oLhUvzQw87Qbojo9fAa3a5PXq+y5+OrQQ/gcxiIhzZi4Lw8mNbu8k6p sha512-9MZPXbw9Q32B13YK9EIDd7xRuUt9BmPCDcdUFzyQ5yzT1uSQNHJCIFxBs0t5ywLPVV0Mf75A2QEx19ZuKsj1wg=="
+    },
+    "2372.072b6e502445280093d5.js": {
+      "src": "public/build/2372.072b6e502445280093d5.js",
+      "integrity": "sha256-or0Fl6xqyc/sqPRpPyzPbtgOCuTjdvwdMS3ImPhgWaM= sha384-Jj9Dv/+GQIesO4GcMqhc9dzFHhEozPJ9GgSKSDhAypC9zzvxoYr3UD0j92QeZ25S sha512-U4M9m43Fkz2dUmVCuD0YLX8b3kl+CsubKUvJQ669Fk2mUbPab3fA8g8Xc16JRNN0h4fOa2xeHgRIX/jqLlL6FQ=="
+    },
+    "2372.072b6e502445280093d5.js.map": {
+      "src": "public/build/2372.072b6e502445280093d5.js.map",
+      "integrity": "sha256-8xo+T6kGHo3HtSR8GoZpcr44cu/hlVKAjZHYNH4PT14= sha384-2gJrE7uVgm1sdnxb4QNjCXul5aQwBXh8KirzgCe+I/f7CI2oSBHJvwBanJJeZw2k sha512-HaPnV/XifYewE0QaPEtJSrOzUH8yumUSU3eXE+IEazLbuu1TYTQ7RhScvQtDUUFv0ihIyl9IOdwCBWfmTjyUOA=="
+    },
+    "2407.fc24675b640cc14cca79.js": {
+      "src": "public/build/2407.fc24675b640cc14cca79.js",
+      "integrity": "sha256-mLowvrScjMEWYH8cHYhdZkuhD9TbqvIFBLbW5iUcpEM= sha384-wi2dRxWcFUjQFjBGBjtEBOpG+jYNgccDqbSf3joIPoNb4EPCHqeWqnLlU4BGGmeU sha512-CZK9ravlq0DPCyQsQGLCphC/WuhC1juEUunTjj4noO6FECPtj8j5ksH2x56UuXr7T3QU0fSuU24eef/9hNkRew=="
+    },
+    "2407.fc24675b640cc14cca79.js.map": {
+      "src": "public/build/2407.fc24675b640cc14cca79.js.map",
+      "integrity": "sha256-/cwbngMnePwnK5J0c/TMe/eSlv/hxluH2Jg5auS1aec= sha384-Ko64Hup8bQv1lpY6Ecgk0DHW4c8CBIBVQ+e/V7Zh8UBV2FCr+UZN9fpPnoHK3bP7 sha512-Y5Zw9CDFyoDuyHyd6q+PeZN+vSQW0LwNs4qEIcZnlSeDP0F2yqz1PfByVmnyr5FYdXDTR1uE45bnJVdEvl6Z7A=="
+    },
+    "2430.60f4d7f9475d9fb12ef4.js": {
+      "src": "public/build/2430.60f4d7f9475d9fb12ef4.js",
+      "integrity": "sha256-5rx4ZUfhvGBSv4GfTI6n1FEJIo3KtKSFzpsRPSsZX5Y= sha384-fMKVvkyUTxT2HGr9iBHhyzTtsq+Ta9OffFiC9Od9djUpaYyH8oTSfjbnrASFTi5E sha512-PV6L/lPEMypIAhH6v+ldWuqzfMvKByF/AaoeRlGNj/OSA+yMeaARaFRTUBmBFiuhbp0g2DUtibihLga6hYCobQ=="
+    },
+    "2430.60f4d7f9475d9fb12ef4.js.map": {
+      "src": "public/build/2430.60f4d7f9475d9fb12ef4.js.map",
+      "integrity": "sha256-yoyHMLDUcr+yr9Sh4CI8NHIdrmHZFa9/Uf2J+mCXd2Q= sha384-EuQzrrjJPGcLwPXbL+qVj+HXAanq/ZpvMjUVwTXCOw1eOStNGzYX1S2wI0jb2n5i sha512-a3QbDI+VwIQlieXCEu5jN7iab6k4rmIVHkHEja89lt4fXaBOw61ZhNd8K+u2qrzTOoWGKB9TKjcOC8piiEfcRA=="
+    },
+    "2464.27fd2866bd484d9ee3d0.js": {
+      "src": "public/build/2464.27fd2866bd484d9ee3d0.js",
+      "integrity": "sha256-XHilz7RuWF3oZyz5YqSkY8CyFPPVA8mHJ5Tu7fX8ONg= sha384-5ztcC0GBsExblP7dSYpfF5p3Yp75HY1McAm4WcWQjIfz8rKrW8uiJpPMssIUNVUL sha512-uQpu/FqgpeSzpou3hZ9YfN7rfYO5VuuURFT3FLXLzY7y1CnbD9c9cRH0sC3+QPDWXA6kfGdld75iyiI3eTHvAQ=="
+    },
+    "2464.27fd2866bd484d9ee3d0.js.map": {
+      "src": "public/build/2464.27fd2866bd484d9ee3d0.js.map",
+      "integrity": "sha256-JAJnDikz3iRd2ZZyBHiEOLh61F6ZvD1RVypBO7QjDLs= sha384-ukmZbcp6l1S4fAoVHjkNIe6mTK0pqKm5sDT5UBkWq3FU2+v1AAispnZUNUFLiRGs sha512-dfOxPdUdbDOVy1aC3VnYoXp5bOaBiNeC0TPVTJRtv+7pvx4I8g/wxB3TYKuNHyTPgNDCXrQcKDbdWaLpEZXF9g=="
+    },
+    "2617.8ddfdf27e3442159301e.js": {
+      "src": "public/build/2617.8ddfdf27e3442159301e.js",
+      "integrity": "sha256-r1wq3CE/0gLZXQoeKHb0nrTzJsO01YJGCBMT20lwrAg= sha384-0hYahQiwEg0Us6Mgf94489iPxTEH98eOLcNB52adzXg/LJUM9wR3dYTA7Me7okdd sha512-V+UDQ5iW9U6h6+LuyqgBFJVPdNoUbIPP0aby64+7O5MY2R9i0dxMBnOrdVhg8jBRm/hubmyZu8uVRXtK/tJ8zA=="
+    },
+    "2617.8ddfdf27e3442159301e.js.map": {
+      "src": "public/build/2617.8ddfdf27e3442159301e.js.map",
+      "integrity": "sha256-VhgzvsQCF8xf5qZ+Vaf3KM+ugvjsEJYsT0dqEyOOz7I= sha384-gXDrD7alRCToqPAs5U8hA4pWNAJHv1nOfdqhGa9xILLfEu8C1S2b2up7sQcOZdNe sha512-IoJethhv2Y4QSdR0bjYNymB8KRi5WAaT83g7u+jXmo7ajkmrvxXwyfRkJBghIYqcQJFtTfhoJ/VztcC3JdAqhg=="
+    },
+    "2641.ee8fc523538f0499124c.js": {
+      "src": "public/build/2641.ee8fc523538f0499124c.js",
+      "integrity": "sha256-gNpsjaBBezlpbwB6FZ6bl2GGjj7pwmFPT/M4azAMzV0= sha384-/cA+/fjdyKiY0Ih38538ug6osb20EJ4hiOangG9V0S4rib9yPnfQlBNmEmTqZLn2 sha512-GQzPRH6St/r/eTasIgcDp+P29ElPHDyjMfRrvBTnyjhdPNVpQ89Xveo0ioOXWeLAqbu4oe0iUxpZH0IrDMll+A=="
+    },
+    "2641.ee8fc523538f0499124c.js.map": {
+      "src": "public/build/2641.ee8fc523538f0499124c.js.map",
+      "integrity": "sha256-4V4HNRtFnYp0BA2eIsy3mQYx8sz9U74XuIAlR+nMfbY= sha384-sRMtJlv8BJYVHjf9iqecM1diVVtO94b7WftDTtlPxzQAQf2oF557MStgqMf5jikh sha512-cnwNs+ndQm0bEJc9wccody0+mZRk+T/4Xb60MPk/aqBzwToEARh6dh3u7xba7xMujUXTIteGFBGS3zzjC0t7uw=="
+    },
+    "2663.57d1a0df4af4df85efdd.js": {
+      "src": "public/build/2663.57d1a0df4af4df85efdd.js",
+      "integrity": "sha256-7cNt12csfPO5e67tBXh7dvZWL1mzv8hQJ8Sg98m9AZA= sha384-JWf7ADinkFMGuGpibQpyCs5VCcw9l8miKeiJNv4n2HOn1wYCVLY7n45LlENkOEjT sha512-yLecNZqsJc+NrgJRtXfnByYa+rQDukbhHkC2cMZvfR72uFG5Jenucpz0Sk0/7ukzeP7pNWx/xQQH2puMXXlUBQ=="
+    },
+    "2663.57d1a0df4af4df85efdd.js.map": {
+      "src": "public/build/2663.57d1a0df4af4df85efdd.js.map",
+      "integrity": "sha256-NIzEPXHrboMRSpWFBNUtpz0yO6/kSmH4LN/kgW1ixWs= sha384-10K6nNTT5W9zp8heK8lOM8oqK9BrTr9l6+u8vb7WCObmusAPZHeX3LhxZMBa8JVw sha512-f3NkQcRGgwJi/ep6mapF/1aoMRbuhTrE/BVvKrFFmNMZJEu0srQHlqCyWWNB7LGBup/lZ370ApUgD4eWOWtamQ=="
+    },
+    "2667.fa473e1382422c3c8f8f.js": {
+      "src": "public/build/2667.fa473e1382422c3c8f8f.js",
+      "integrity": "sha256-jhE/bRLC7FBd6t8gABmQmO98GC8upmyvQfVLiiXO394= sha384-7fsvoD0DeX3MYnr8paY+IhTr3ddQqidm2IEMTv3aEINkUOaLsCVeJY6REvkm08Ua sha512-F1vec4K/lCjQgkOg65HHBdnKAUoekjohlcPL2NceYlxBua41bCzPA4IWgqB6xC+BJKb7ft3Moa6QXpSA6DwFNw=="
+    },
+    "2667.fa473e1382422c3c8f8f.js.map": {
+      "src": "public/build/2667.fa473e1382422c3c8f8f.js.map",
+      "integrity": "sha256-Q82gQ913bvBzWPzO7ehDtA1RPqvG13drxs1/qzlDKVA= sha384-lf+XVxlg3G3JcGhV3E/Ti4hqX7XwDvOxG4d9i8Jv+Xhs679RrZ10LP2dNXneSo1R sha512-mCYLKzgmRVFKCJHpr3bBt7Nk5MUhfGcTKgvTqYZ1JxnshqIeYngS0RnTL7/OjJYuAwefMIUne4DRuFAITCQCzg=="
+    },
+    "2713.3938fc460df7148dc91c.js": {
+      "src": "public/build/2713.3938fc460df7148dc91c.js",
+      "integrity": "sha256-xI7hbasqcyhU1OVZVJqbwyfLsF5NZ93kD/meWkB1+30= sha384-4F+EyCyDi8Zum13JOKilcKMbQZAg4hlCehbeNGwCSSqzIjat9F4o5RlOdIrb6oNz sha512-M/pxLoukOxHAi+iQXv3QZsrXPW2Z6snMXJvB3/Ln0Q1ytmij5UTMyZEszEJ+y7gNBtCaVxvTjFIw2O7Im80+gw=="
+    },
+    "2713.3938fc460df7148dc91c.js.map": {
+      "src": "public/build/2713.3938fc460df7148dc91c.js.map",
+      "integrity": "sha256-BC9+5DEmPFMfH3xhwkyWTFSbfUzqGTDizXeFxkuQ7JU= sha384-l/Ce3m1D3SiA0oBoRfL7l3dAYFd+veKXQKM0AKZWSmWsUtvJwGEiCF5RlNm4SKsO sha512-4KvnxUdDpgowJd+2wx2Asif1O9hvmxMkYl4thkbhw68w4B9NhWjAGcKo+qev2qIaRN1HcjwBe4S06ke4HXnQIA=="
+    },
+    "2801.3add88244248fe8a77cf.js": {
+      "src": "public/build/2801.3add88244248fe8a77cf.js",
+      "integrity": "sha256-ponEn/vdYylqya5+bnrKfF9eDxzjUASwTJ3b0F99sGI= sha384-YdYg4WSZsIB/VQy5UQth6Gjex+OjW9SFmZW3EV358IW72fsQjNr/8dVedV6CQNCr sha512-nwjhaQHsJc97PNOQi7ouElyWaC1heS7189Njht4TK9XNYSzo3ITEqhmlyyJgJPv6UuxBXiaQkJYN/AcVZpR4mA=="
+    },
+    "2801.3add88244248fe8a77cf.js.map": {
+      "src": "public/build/2801.3add88244248fe8a77cf.js.map",
+      "integrity": "sha256-ltEWOnWYl+sgRwEW1k1KL9OaOv4vHT7nVITFw4kg/Ks= sha384-WiZvfTYlXlN/16BsNX95TiXSl7VP8nUkPnGxR+nZjii7W8pPSyMpJCawWe7yauat sha512-ZoHN49Lv5/jS5mxsT0gSQqg7WG5TQQ0S9hn5oTKpDAR3SOI69TzS6/x+PTzLXQWo5d/kC64dBiiI3OXGT3PcZQ=="
+    },
+    "2815.2006d79ea7431389c3dc.js": {
+      "src": "public/build/2815.2006d79ea7431389c3dc.js",
+      "integrity": "sha256-b2NeHRlVu/oYYlSiaTJIhrN5tut9gdgmcBl7d+QCW5w= sha384-ZnK7E/7byhIZ3vn5L5UzYC9FtbPz3IpcIhEuzQtGVcuAXjrLCz47HX5ACJGap8yI sha512-z/RjubNAUrQZGQ0D+3ds8Zez746gFj0d55kuXXZHuv4sVyaZE3KjqpJ+VVJM94dcEWoH+8LJvKBsuejDMci0hg=="
+    },
+    "2815.2006d79ea7431389c3dc.js.map": {
+      "src": "public/build/2815.2006d79ea7431389c3dc.js.map",
+      "integrity": "sha256-+Cj9pPctx06Y4OEjMoh85cz6EzutSzBtGrHkq4Ep1j0= sha384-qHttDwywMM0LBtJH8HHa76C5St1S3mZ37pFsDy7UtV5DWCSXPc2uUM5g8Y0jtm49 sha512-QuM63Ckof0CupVnKydrazzXHdfBWo7bmMmCVd2GCmtbnGnS4rw07j333Z27olQ49WHb1klaPhi+tb61yPfn8CQ=="
+    },
+    "2820.0493df9b42825ff9661c.js": {
+      "src": "public/build/2820.0493df9b42825ff9661c.js",
+      "integrity": "sha256-vZKM7btIoZ41i6jhHfxEBMCw5e/D0WWuOozE97AUcKw= sha384-/LV5OpQ99fyDfZYXtZCLkPhBj3xSW1qNVHkxEGRo28og5lRyUp0Loitz+woHzooG sha512-VUYsmFtSUV5WWwaMLwaigNd8O8xT8xgUU8g2bvDFNUbR0zjqT9OhzPec5ZCVRlkesSTaV24C0rFhto/UG1Oa0A=="
+    },
+    "2820.0493df9b42825ff9661c.js.map": {
+      "src": "public/build/2820.0493df9b42825ff9661c.js.map",
+      "integrity": "sha256-UpSXQkwLjuAOXFESQuAFUqc1KMmNJiFvGABf6uTHgVA= sha384-pNQmaqksJgw2EseB1Cowq8fw2fySzfRplAg0+HoNYcXYMG43Rn5dwEQbfL7Kqf9a sha512-Sub2f3vHSw1M34ShN7Mgv8/XhWwzhskLFAZIr2b50scS+i6J4NpNnLDG5D0U6mUh8su2Lj9ANhUghEA4pbhe1Q=="
+    },
+    "2849.a9b2fafca7bd4679c231.js": {
+      "src": "public/build/2849.a9b2fafca7bd4679c231.js",
+      "integrity": "sha256-XULmrifLPTmlGtvhn3Ifesha7FSK9BFv7Q6izQqvVus= sha384-GrJg9jNgs5ITKNi7Zusz3NPnLdr47dOZrKIwa0wZPTI133Zu9F0FOygEioBvnQYg sha512-lXgA5bTlUbSEzYx837iooRQc47Hwd9uBRG5UYgQO4ijBzoMzeyMGuOligyxTIcen0oFgsUaDLY22o08z7w5tAw=="
+    },
+    "2849.a9b2fafca7bd4679c231.js.map": {
+      "src": "public/build/2849.a9b2fafca7bd4679c231.js.map",
+      "integrity": "sha256-De2lyqGiPd9UdyUGq8ix+15Kj434QlXtmPHKp38x2Wk= sha384-UtNTAIpVlW0IAtxfQwXfpVgRCd7ch8PrwHEgjMq3kxxgPfdaAEW2t6on3ZN8pn7c sha512-ngjKqIlF14GctFsZGsr0tx9ovWnJYLb4yqtpAbOarmm6e+Hli4HXgg9bRU6Flcy+nhbUcSiF2NYk8Hw/c3r5Cg=="
+    },
+    "2970.7bb157a0b0d359c25c03.js": {
+      "src": "public/build/2970.7bb157a0b0d359c25c03.js",
+      "integrity": "sha256-cTpGy9kJNV5Y2vILM4MAdSrvZ78Th2f6KIFvq/CKj+Q= sha384-N6+VeNLV/B+ipvnjFzTsoRakconHUaJ7qL7pyQkKi/jJ2+U3Pkp/BwWEI9KjdscS sha512-9KuGBd8NSWEAaBHoEA2O9l/tR+F+GQlOmtOhO7JzQELFFreu16R+xipVT2wZASDGRlWnvEc8iOmYojOZmobWPA=="
+    },
+    "2970.7bb157a0b0d359c25c03.js.map": {
+      "src": "public/build/2970.7bb157a0b0d359c25c03.js.map",
+      "integrity": "sha256-ztxWXsq+aR+6WH+LY4phafm2CcYwTJzklcJS8lnMlbo= sha384-gp4TfB9xDCPdwa8oKu36dDTZSUoV6vuInaI+NwMemoJhAlc18vIwWoj+Mx2n9L+w sha512-sn+XVc7gN+A81ipw35qy8QWhy6EQiKbIPz5mZN0ajcG2+F42cmINMlfZ8vC71QKsl/NS7Inq7Kej7T/l0YaBVg=="
+    },
+    "3149.a5295654e3ef024ba8a2.js": {
+      "src": "public/build/3149.a5295654e3ef024ba8a2.js",
+      "integrity": "sha256-SzbDuhD+bW8N0ou9+IK2EoOzz+Ui3iw8fL4IFl4p1i8= sha384-WHfM+JqQBPlsItBDbm6ZLUpF/aTZvlZWVFOn5jyXVqjmFOszn3lJ1Gggg4ZieXdf sha512-11armUwB/QTroTQFbcAxXr0oOsfZHX+ju0IdX5b8ESufiJYCl4ig0xrCebfGGGUKaurgdWvI3bRTR8wdE2T9IQ=="
+    },
+    "3149.a5295654e3ef024ba8a2.js.map": {
+      "src": "public/build/3149.a5295654e3ef024ba8a2.js.map",
+      "integrity": "sha256-J2bZ8gHMcsz2v4un76lxo2XbyUAt06xwyck9IX8zF0A= sha384-ecGFuWHThh3LzcPAcIHDiKjhAdvb6X7+Bd4vpXQSPs0Z10UarW2yeNCKIm7xyGkn sha512-P9Gr0ZfUnxo/f+YswQ4DZ6NiqsaR5jk2jmj/SYFIk1gK+yoj9lYzT7O3YA15yX86tN2WK101R2cwKKWnet2k3w=="
+    },
+    "3201.b5c52017387c6b3ea690.js": {
+      "src": "public/build/3201.b5c52017387c6b3ea690.js",
+      "integrity": "sha256-NCD0QDL1oA36XBlzH+oJbu7OL/GWxaR/h54J1bvUSIc= sha384-w8dSucAnAUkeD1JI480+31hyrt8sG9GPhSISYVTqYAYsaeHm2FB4RKAYd2tPb0y2 sha512-n5RmxvpBVtcQFIA29Cprg9LrdbPkudy4Ne1J2K4xZ2upZ7wLY1NhZdEAxEmjhHxlk1LExLkN3QRcVAIqTTEs7g=="
+    },
+    "3201.b5c52017387c6b3ea690.js.map": {
+      "src": "public/build/3201.b5c52017387c6b3ea690.js.map",
+      "integrity": "sha256-AWLsDpa/wOmnAlb1en3cvPu5yZRdY7oY+LLCZlJ1jqE= sha384-rOJxLIjFqSM3BepukBbfPLLmFS1OZ4z/uHOylExGJOqu4SevU8JDalzwVlXll4GX sha512-PhftsPYLOzT3SGCaR6nVDu/G62appFQhI7TUJMSwFqaA0duZS6gu3YxSkEL2vxjz7yZGmdu6/tQ2POomdK5f/A=="
+    },
+    "3215.d0d82c4367621c77896b.js": {
+      "src": "public/build/3215.d0d82c4367621c77896b.js",
+      "integrity": "sha256-fhhPN7yeeB8hoCzDWNzHsh6B+gbA4nlmc20dzgXlopA= sha384-slBPi2546qQ/ysG8l/UJnor2xcf9SyY2VIfT2yuyZvwFiy4QzWnNo2ZA479p06Tj sha512-3BuNTs71pRlMRgfDrUsG2ygh81S8XkS5BQ5+v9rGyfyyOzPTFtkLkNvnoEL0nt1x1NlVYA/oy9z/p9UGzAvD+Q=="
+    },
+    "3215.d0d82c4367621c77896b.js.map": {
+      "src": "public/build/3215.d0d82c4367621c77896b.js.map",
+      "integrity": "sha256-lr780V56i1FdookURVa0VKkQKbyCN27Ub7+7hELzns0= sha384-1mf3VskL0BrspA9bNPr/gk0N2jaQb1n8xjNxzY+IiaA6vkCPEGgHcMyxcoiXIe35 sha512-GIxG89KKQktI5LBmEwm3uWfgUWFUvII35EFDgx56YyZ1pSP3ffTc3ZS1i2kV7lPq8BSWGqz0DeGSuBz4/bCJ/g=="
+    },
+    "3241.c4afeb01aa936f320cb1.js": {
+      "src": "public/build/3241.c4afeb01aa936f320cb1.js",
+      "integrity": "sha256-+Cqbi0yWy26EoQ5Yt3XJgrvuYsTg5oWpsi+z4dzw3MI= sha384-PLd1FuI2my5o+x5LgNq/+v62R4REeHEJZCbDOM0LIjB3e6coPARNjcSDYEJM9qDt sha512-nCRtDOv9u6tR6omfLpQ9agrVi+YgnZSHMIpLsh15aHssrrNB889TbRG8Wfvf6o5h3awGZ4OHRSxn+PVD0AAMIQ=="
+    },
+    "3241.c4afeb01aa936f320cb1.js.map": {
+      "src": "public/build/3241.c4afeb01aa936f320cb1.js.map",
+      "integrity": "sha256-UBfrmfPJXy9f6WA2GaVF3aCjcrN3S/78HAFuTUi1URU= sha384-ZFGdWrVA8HVH0FWgjwYlQod1fRzoLtfWe91NfHWyHX633+I7ZuX9nD9Ko/1qi6Q4 sha512-11ShIT1c1HUjCA+c/26vzaMtDhByn5WxYk4hX4At4rdxmoPCdKH28T/o6/xderwnfe4Zsj+QucaVlQmTfuNxiw=="
+    },
+    "3316.92b867cebdd0d07f492e.js": {
+      "src": "public/build/3316.92b867cebdd0d07f492e.js",
+      "integrity": "sha256-PtB6SbJdKOrL37Xpkog1AsmyMLWDMEGKsiK1nOS8WUw= sha384-XlKDN0Xk9sDVMgAmWIyfh49QvEZfirjcSqkxSZZqqfUurqt5QNKlstfOo5saeL+l sha512-W01L42ckj0KBLK6MrqzSc3kh/t0006LqX0T+p1yaEHzxTc3heKrDReojS79lah1kWJ6/Ep3WMcXud1MWzdXFgg=="
+    },
+    "3316.92b867cebdd0d07f492e.js.map": {
+      "src": "public/build/3316.92b867cebdd0d07f492e.js.map",
+      "integrity": "sha256-qLLCUumxeNY25rZlvfJsMcJ/r/0plmkcU7ae2uLSz1I= sha384-5d7WeGy9Z3NqQ1hbC0LfTunczBiEIDAU4NiZGTyLawf0ckgjlouXbErzwLoECHZU sha512-oqJX4gjL+Rgi+YzjOFFgSByBv53X+VlUgrf3KtNUwPlpDcAv++RGcLdA/nL6iYXz9aHBH8LoFpWVFPmEarevyw=="
+    },
+    "3338.e6409df602983d331b43.js": {
+      "src": "public/build/3338.e6409df602983d331b43.js",
+      "integrity": "sha256-eVHNPHEyL/jRIaGvV9j7F165a0rSQjGsZCte9lqnCO8= sha384-+xC7H9u1JzmyON3uorn4B5QG2Ae/FYVzqzWU+GmQBWM4qfhTJN6L9lPGM5yZP+ri sha512-+GRhPWGgcRa0/A2VUG83RRS+HI0azC7C5r6oyr9XlLLZUsZ5hQHjeMBYjzgXzG3Ki8PCcWO+ZGPLJrYcM64zBw=="
+    },
+    "3338.e6409df602983d331b43.js.map": {
+      "src": "public/build/3338.e6409df602983d331b43.js.map",
+      "integrity": "sha256-ARs1mKIFbpL8NKPZApaB+3Dl9plj/a/MhszjS9r/014= sha384-+8UKtPoOqZ+ZCrlsU9eOce5CJ59oVmXzgNjZ+nRCIJVIRsVzMDiJ4qjPrTnHOp0g sha512-V2vHpOqlMU7Z/1qFaZAXKDN3HT91WUc7dO3Yw/sz44OMFLVgD1G5/0l0RSpWIHDzUyJldpZis+MQ5AE7cSCoQg=="
+    },
+    "3341.7f5db5dd8afb5ae0ea92.js": {
+      "src": "public/build/3341.7f5db5dd8afb5ae0ea92.js",
+      "integrity": "sha256-U6O7GzssJiac2xQrh62PM4dUJd0pyFEddaLSyVSKV/g= sha384-QuqxEXGWMpntkQ9iHAPWiYkTgr1LGjfK7oHfglWq7LxbrTUQvFTaAguBOA6kODgT sha512-yRMHRBdVjPzNfJHEkUxv0lUQVkeQPyMeqc5rLBe/ggvOon9N2fySoFNxcunUxgOHNXoylx91h3yy6OjM/SYvBQ=="
+    },
+    "3341.7f5db5dd8afb5ae0ea92.js.map": {
+      "src": "public/build/3341.7f5db5dd8afb5ae0ea92.js.map",
+      "integrity": "sha256-CCBhXUL1wI0N1pv8CIXAaGjVWIl/4UzuPSH1UH4z8TQ= sha384-pSc+xsWKZTf7+2E9bnZClAspGBRbXVD8igGTyVBRNIFSg/o739HOmGfwb5/kho7m sha512-oxY4ucRmfJW49tPbMKQyoKdMkK3uICXGOKD9kt7UHvh/GYkPFCNQrCTe3pnkN7gxu2mZPLdI6mrvE6KXDD9sWw=="
+    },
+    "3413.531e5ce6f6d3cc4e5a37.js": {
+      "src": "public/build/3413.531e5ce6f6d3cc4e5a37.js",
+      "integrity": "sha256-WMNZsaMIMyT5pQ3VSlZAsMDrPW11UAl0NkXMNL440+I= sha384-Aehw1iDvSCP7QrJ4mawTVv+J6mCu3+Ouwt6qQ5rgHvagdiroqci64OJubQ7Pkk2H sha512-Mh2oc/AuWBXvmvNrCTNKKDiieY+luKYG8c99DXLglvuqGg8NcdYq1gqXRAyLIWC1uZrh84Fe0crO3k2EKvsl1Q=="
+    },
+    "3413.531e5ce6f6d3cc4e5a37.js.map": {
+      "src": "public/build/3413.531e5ce6f6d3cc4e5a37.js.map",
+      "integrity": "sha256-OoaZbOhEna/OdP7VozR2JaK42H/EOdP482+AnE+ZCOI= sha384-VBWAzL1Gqq2NnWxVTqQX7+3turWjdYZbeCvnkNkqb42ktK6SugqOdMXf6DJmMRQp sha512-oYP2nfbVgYG032uB+Ngyxako9OBP/C5VtMzJJzlCyhVXpsxrbBYdQZiy3UCirYtkuuIKI6I5It+5sGLRXbvQNw=="
+    },
+    "3608.ff8ef5558b4fbf9efdf9.js": {
+      "src": "public/build/3608.ff8ef5558b4fbf9efdf9.js",
+      "integrity": "sha256-Ha+86uqNdSGnaTH1vNdzwpq4TmYvjdcgvAT0hr4pLuM= sha384-FZoo2UAyXoqOa54+Yy5W+ZDrRL2ne/NqiQ4OeiJyKzwYZKslhqRTFqn+IWqegcZU sha512-bSsm7WgvKOf4I8G8lzFtTIHtPRGh7BElDf54F36rBhC/h3NRAJxFbkNlRdT55OPZLC9v2dwNOGpscKEGFoU9Lg=="
+    },
+    "3608.ff8ef5558b4fbf9efdf9.js.map": {
+      "src": "public/build/3608.ff8ef5558b4fbf9efdf9.js.map",
+      "integrity": "sha256-WnbHy6eavN7wDFYs3lgzm//DOs1XRKf2uWpoM/2hL9o= sha384-zTLgSVz9buKOVJnn8E4rW25v1TWXfeh1xel+S7JOrPkrT5jFQNC3rYjvaUkVaBe6 sha512-T2afByycO2XGJl0rlmSyAe5SXlUlXetpdb9/+VpX0yMJp6sjohXaK4q1MMK9IRzusYUzo3BMe36Shguz7hPXww=="
+    },
+    "3651.4e8f7603e9778e1e9b59.js": {
+      "src": "public/build/3651.4e8f7603e9778e1e9b59.js",
+      "integrity": "sha256-+N7caL91pVANd7C/aquAneRTjBQenCwaEKqj+3qkjxc= sha384-GQR7GyHPEwwEVph9gGYWEWvMYxkITwcOjieehbPidXZrybuQyw9cpDkjnWo1tj/w sha512-zyPM+8AxyLuECEXjb9w6Z2Sy8zmJdkfTWQphcvAb8AU4ZdkCqLmyjmOs/QQlpfKDe0wdOLyR3V9QgTDDlxtVlQ=="
+    },
+    "3651.4e8f7603e9778e1e9b59.js.map": {
+      "src": "public/build/3651.4e8f7603e9778e1e9b59.js.map",
+      "integrity": "sha256-qCSjIttKgQC2w3uy/XkePf0dtsq/zgak+8FkzvOJPP8= sha384-mS7Zk1k8vgyoHTTh7UKQRIE0JBVBk3rlmiArC1gGe4xTUw6a+5x9wturFKtFzijN sha512-g5OqBUtEnrIe29tX8elENWFZa6BvSHsFjnF02mXZmJSzlTTB4iMhdD16SD0ot6hdW/kdTXCzLXH79Gj5XT0OFw=="
+    },
+    "3699.56716aca28b9e7c4251e.js": {
+      "src": "public/build/3699.56716aca28b9e7c4251e.js",
+      "integrity": "sha256-GG7S2xV+VxGvrMrTtItxrqcN+Qa1lXjuXbXiNGW0hMw= sha384-XAkCXhi/Sc10Vx07wLlhYwmzPsNfT2dO/ihuQDhXXq1L3fWo6XeDLOZ8DXlTJBqm sha512-LCzkqpxMiUT+t7moDhpgRThdXS5b1vd0gh521CLPFjIJwWr47CqSWhvs3WvcxhPPo4AXqS8Cp0GfTx7gPrr2XQ=="
+    },
+    "3699.56716aca28b9e7c4251e.js.map": {
+      "src": "public/build/3699.56716aca28b9e7c4251e.js.map",
+      "integrity": "sha256-OENmLig4/9h1tfox9HgjTrTdeiRpkuCHGRfV/ZiUH1I= sha384-+N0iVaUv+FwYrRcHkHdDLGSb96Kaj8mkHvHWnwK5bhpr4Yf92Zzn2ZjlgwJjwdHK sha512-NkQF5OTRmlpjqPein6YRWt90T/gvKiT2SsDpRB3uD2AIyIBkjEidKYa6qzIMXbCwIIgeM1wfbC2ord9bIgYu7w=="
+    },
+    "3703.4ea05839dbfe76c52d73.js": {
+      "src": "public/build/3703.4ea05839dbfe76c52d73.js",
+      "integrity": "sha256-zJGV8rkNUyLtivPXbptksVJfd/CRXCFSr7aDknXhNYY= sha384-QZEc58HwhVPrYkvC4JqBPHNaRezX5nRluLi5dhw0BTPNyYoEyKoxkBoKOz3Jjala sha512-g+Gse6RYKfwTSxo29BkK/4bmzhcvLbo9sQVAGb8jePFuTjLVw/WiVsOZNaK7yhogLGUyqCAk7sy5T8fDUHFYLA=="
+    },
+    "3703.4ea05839dbfe76c52d73.js.map": {
+      "src": "public/build/3703.4ea05839dbfe76c52d73.js.map",
+      "integrity": "sha256-VJxiJv5SZOqJD8uGavrvOGPDWiQPBgtwFw4Xbq4kOtM= sha384-WckTcYshna35sA21RzPxYV86xRQxw0wAbSJDN19pxnHm5CfU8fWNd1O8HNApFNaP sha512-8Y26gu7Z9om505WjcjD4/2RYhy/SIVex3qNS+LQIXjFdouA4d0S0Z73J8W21jobmj3WOLPoMQInZIX7hCANQXg=="
+    },
+    "3758.6c2c7266059deaeccf41.js": {
+      "src": "public/build/3758.6c2c7266059deaeccf41.js",
+      "integrity": "sha256-V4l6BOmjxCr8rInd+gZQwtgbw79wXoDgtmq8GRV617c= sha384-DXrcHJxU/cc/SvleZ1K1TC/m2PzzDgyytloqPw2kiKTapv0BW1u90nwUbyTJdAm9 sha512-dXR0K2u4cxEOs0S3uW2VU5vAb3WDEtHZIDQwaxORlrIpumcvV9WmmgkAB12qAvO32J1eOjQqSFs0JCRxQ7o1uw=="
+    },
+    "3758.6c2c7266059deaeccf41.js.map": {
+      "src": "public/build/3758.6c2c7266059deaeccf41.js.map",
+      "integrity": "sha256-aeK1nRW03YsodPBpc/F1PldTokeuCDfr7O6cfaKVXtA= sha384-YJ+juR8fZQCZNnsCfAIZH2Sznu8jHhiqaMdc6e65X8IZbx4lHOOLv7FrL8+Ke0fU sha512-gkDSOS97jPcNscLWw2Dgd/1pcnnSugtO00EzW3AwVCz3O6aQgodHZOntaA3w8l8tOM1ineqmPMdXt/FVbj5pCw=="
+    },
+    "3951.4e474348841d792ab1ba.js": {
+      "src": "public/build/3951.4e474348841d792ab1ba.js",
+      "integrity": "sha256-dHqXXTRA3osYhHr9rol8hOV0nC4VP0pr5tbMp5VD95Q= sha384-4QJaSTibnxdYeYsLnmXtd1+If6IkAmXlLR0uYHN5+N+fS0FegHRH7MIFaRGjiO1B sha512-vRLEeEGbxBCx0z+l/m14fSK49reqWGA9zQzsCrD+TQQBmP07YIoRPwopMMyxtKljbbRFV0bW2bUZ7ZvzOZYoIQ=="
+    },
+    "3951.4e474348841d792ab1ba.js.map": {
+      "src": "public/build/3951.4e474348841d792ab1ba.js.map",
+      "integrity": "sha256-EoFbO+cMtqm+yAtJ6utxIvYt3Xnge2TLoIV4BFCy4HI= sha384-jaI5hnVe8AStbvzy+tgOZAGPcZqKNyDPOJnk4Gp4W1fdwAhhx5imLKAutberXgvH sha512-YHYt3C7ti6/xhLOM4cxfQzipxuojMb00paTJr5KXyD9yOJ5WlbLvroogzItieS2PX0JXVyrK/Bh9ltBwiOwaMQ=="
+    },
+    "3964.f7a1161f7501a4a3fca1.js": {
+      "src": "public/build/3964.f7a1161f7501a4a3fca1.js",
+      "integrity": "sha256-53hBPbij4wpxq8HKiSrBAr93ZGy05Au+gSYdRUadGns= sha384-xXuC39HjojWtN7fjpllEanxd+24fKdikNEYQXgw3SNmOkixMiV+bTtTx80QjL5OQ sha512-GpT4/g4hPwkudEIaYux5M+0lIDtnpz1xs1jsOyoLxcbneO3YBbiYwwjEMZf7fioEhi01HFAYoqRvcK40jslLJA=="
+    },
+    "3964.f7a1161f7501a4a3fca1.js.map": {
+      "src": "public/build/3964.f7a1161f7501a4a3fca1.js.map",
+      "integrity": "sha256-QxIp8H/hAU7Pm0OvIgE2PVT3ELNutPqL2BEmiESxXIk= sha384-u64XG5lq2MMJYBbwxjqZtQJ+NZKBkvDe+0lf7DwZG7pbH5/mKkDNV7qEHDRS4LYE sha512-HZYMeY78f5Ms/eZ+hUOFywYmSy/AQI/H2/DuVUlZvfLcg4lJLmMEKMare+hMbyoAgDfUx6DdvmNfb4efyj9/oQ=="
+    },
+    "401.66540148aa7ea47a3128.js": {
+      "src": "public/build/401.66540148aa7ea47a3128.js",
+      "integrity": "sha256-tpSmINpafSk6Ckry5ZQE5fSM81kB6CT98VewvAkhbG4= sha384-s9ri+rMrms+4ZOKzTetI/+HcI7BBtBW37iYSHN9HdX6P78eFJs+GMiMp9kBC7dzq sha512-na/PytxYNhAWQfclUdXKaIXD2Fe0/GvsjXcgehiZfafBVIFKX9EUtsViHX2a3YxDZQ62tDwIxAxQEDBrG6Ck9g=="
+    },
+    "401.66540148aa7ea47a3128.js.map": {
+      "src": "public/build/401.66540148aa7ea47a3128.js.map",
+      "integrity": "sha256-13nWpyX77mUHNQmUTz3DavrZDCvtCRMoHeSWp1BO7vw= sha384-uA+ARu8Ac2O02n2CBhk7Sih8tnntvBzNish8Zb7OdSFQzGsyyMiCCI0jfPQPXHhu sha512-GSgOfp8qpGH0nnOy8iKk5nBnPyRSUiFX0MeSBAqNz1l+YV2XsKjQCnslvfaH0itWVWvjCJ1TlGuLB4aZx+vPUg=="
+    },
+    "4028.4f2be00144c4730927e4.js": {
+      "src": "public/build/4028.4f2be00144c4730927e4.js",
+      "integrity": "sha256-1Dd+/pU+qNhdUIxjxRI7dmnct2DbSoniknwuAruPn80= sha384-tPLzpXpRjvC0Gj2msGqlaeQQVWU/953jGVPmDBgC2Q/7PqlLqT47lGl/UogHKM54 sha512-3dNJq4xL0+L4tYSOileb934PqB2CZM/ij7NN1eIH38iH5Nozur/ZeKn/I9aXZnfHs/7e5ktMC40uKdrhp4zZzQ=="
+    },
+    "4028.4f2be00144c4730927e4.js.map": {
+      "src": "public/build/4028.4f2be00144c4730927e4.js.map",
+      "integrity": "sha256-6VDfNO6mKPiV5lxEC+5LKrom78fhBAxZAe+LVfe5TDM= sha384-mLbbpzYoKNHeMKhkieNl4MRuhwoyN1w6sFw9XuamIJLus81n941f2Cen9Ji4ko2z sha512-t8DecbO1aXu2i81SuQAM7uQngc5LQq1YQLy/ywO6QhNMwClDft7xDHJws9+EKYoR9HvLHkh/fTkghHPwhiaA4A=="
+    },
+    "4073.d26424cd376e63227dbc.js": {
+      "src": "public/build/4073.d26424cd376e63227dbc.js",
+      "integrity": "sha256-1cSg7/76tbCHMzG5oYk1ezwk+kamTR38DINUcJNO0hE= sha384-zmqNTPL3vk/P3fFBXuYH5shqpFqycXur4t9LLmji1exW1g62fQPJ8v+ZTklr5q8B sha512-76ydkgjskWvFG947+P4Z48jWb11N2yoeXNQhNhiNVxBjoaAfu9ewp46D9bPRIcPxZoG6os9lP8DxKqUcwO1k0w=="
+    },
+    "4073.d26424cd376e63227dbc.js.map": {
+      "src": "public/build/4073.d26424cd376e63227dbc.js.map",
+      "integrity": "sha256-pZSU8HhSuo6p5MyPw5UVgDv4L9yADGBR+uvKl+GKlyk= sha384-pVRxwQ73gnpoLpG2X8JlxIEihYp6QQAYUEXOdJz0w5Vu9/USPBB9o1Ti5F8fUaC8 sha512-6TADoGAKCOJe3tdGzlGlnxuM41slKotBErD8UezdbeBe2f5z+iSKf4EiNuKanzkdv5MaEl+RfN9KbWIvLjtUwQ=="
+    },
+    "4104.887fe44122846158a1c5.js": {
+      "src": "public/build/4104.887fe44122846158a1c5.js",
+      "integrity": "sha256-FutyU7elq0nkj+dTKyxpkQGzUK7XLduRXo6SRMi0LLc= sha384-3mt+swxabD09yukkkFCeBJVwLfzKmDqqfdYTdDUqltSnirDdorPWMs1sw5DSou5j sha512-USnofPECxaJRaZt5FtvE8FywzoIcYRcJgYEhDCYoIaHyI+VGuP75yIIQryZOmWdCVH2Ei+ChmQbUM4pLPC67lw=="
+    },
+    "4104.887fe44122846158a1c5.js.map": {
+      "src": "public/build/4104.887fe44122846158a1c5.js.map",
+      "integrity": "sha256-AKzcGYLFUQIC7B5vGeHIrDYIP7L+49W1dKp5gue55AA= sha384-GQqIYcmvvjwuC9LZBqM22JlJcBNooBT7kAjOY+/F6hi0ctSI1GVTgrD6+9qMVUck sha512-0gyUvJmwQdDTM3d+o2O84EIltA+5apJCm5Z+S4RfPoILpOoEtwdWUvJFTMyF2miKC/UKMS4tpix8ir3IwO3jlg=="
+    },
+    "4107.dcdb4e85e8553f25b17e.js": {
+      "src": "public/build/4107.dcdb4e85e8553f25b17e.js",
+      "integrity": "sha256-9cpar1t7MJrMNlf7hlyr/bACeutKlvGa8i/zts88xxg= sha384-wFrw53NXiIuqJHea+ksc0izn+5i9CpqJTKs6jMJPjze17jbT9CbwAtj2HSofvJAD sha512-i2LGq2Xa+dIRJkdzAV9WCWrWm8VVmEzcIx0x/McrohXDAbFuCFEhuYqTDvvcG5Oa2VOJBv6lKJ+MX9Vzsgzn8g=="
+    },
+    "4107.dcdb4e85e8553f25b17e.js.map": {
+      "src": "public/build/4107.dcdb4e85e8553f25b17e.js.map",
+      "integrity": "sha256-zrAMQHgTO0DqddA058tEPANamSRskrG5TdlyTHbx+h4= sha384-GI3r3V89rpWlHxlkIsVRVQyh7ql3cOTJRttTyD2n1pMJrZTOZkJfY8ivZV/Fp/Gv sha512-wciEC+JNHUEduHgfTKwTr26QxkjmZe8NLOBxgltMrMPwgbt9wI3XhhBiBYXrRYRLhXjFw9kmd5sipQR5GHmy0Q=="
+    },
+    "4205.a45758edf661d4ed4a20.js": {
+      "src": "public/build/4205.a45758edf661d4ed4a20.js",
+      "integrity": "sha256-Y5j5cFyFfQRT66xrke1La/QZHmWmhTtzQVT7mc5adHA= sha384-fokQ7fR4lk8os5/W8hdu4RzhHc9NL0TF5nXFH42EzYzwxlOWy1foYIhP8uRb5V95 sha512-5x2NyvXcUUcuCl7cUfaXAXTpmEbsSFYHPNBW01EEjdohfSxQat+OO6xKR4yucbe9BrpPyGX6H/8jDF2tjAn0KQ=="
+    },
+    "4205.a45758edf661d4ed4a20.js.map": {
+      "src": "public/build/4205.a45758edf661d4ed4a20.js.map",
+      "integrity": "sha256-dQN39lgsQ2Pa7iajDNlK7yc+HRxCOBuF2smT+VecnWc= sha384-eo9xdKettUheLYOtKhPTZlidsmwNb1/2r8aClRsj61Js9car0yMfNfyekh+yMFGB sha512-czzldwbEVr1lUbRl3tQWU0ypPH86NiCBJv5Yqd63dZsWAIn4AU858COA2ZKG/V/00HVkI8YwVF3IVf6pYZ1Fkg=="
+    },
+    "4253.ca4005cdf6735f16fc56.js": {
+      "src": "public/build/4253.ca4005cdf6735f16fc56.js",
+      "integrity": "sha256-3WwT7SbuT+wvsguzJ77p1mdWgk4UwPz0yjsWqKZsSwI= sha384-/b29vaLVu69Y66fHTTWxUgToSyBPe5Irw+0dLRd1D5WF987tKXzeq+ucEUoscD3U sha512-vXshGypiEJKWZmySoO/1jc7sXrfDBwfP8NNsn8ElszEzp4/dJiK2BrGR8udfLXFlij4g4PKzMH6iLFnPuPJDhg=="
+    },
+    "4253.ca4005cdf6735f16fc56.js.map": {
+      "src": "public/build/4253.ca4005cdf6735f16fc56.js.map",
+      "integrity": "sha256-nBABjlck/cgrqO2I9Nt5DhGaLfLqwOYTIdbu8KRWtUI= sha384-sxB7gEyB7qpzpRqXt9D46ImCITW58NbMYNr9Z/mH9ljHUlgctQ9Cwy/t2+uCSZlD sha512-5D+hijpWaSxHqJ8htm2cTwiJGidChuX/d1Gd4ktzmThJn+RUlgwMzX4tFcVHZejOltqdqy8h81hGOTn4XtTr/w=="
+    },
+    "447.413ef3f658f94fda0119.js": {
+      "src": "public/build/447.413ef3f658f94fda0119.js",
+      "integrity": "sha256-3qceRtq0UaqBx4aa0SITnIufDyyjd2sVkf46BYa4dqI= sha384-4Jwv+5hX6UBry0r0ax2PvkKn44Ul/UYTpfwsmXqmXUnPF7Xt9jmfu6sVqAHGpMvV sha512-QjPrbgNPbUxOjzebHnL09mXtcYNCNIiKk1+1c91B3DFhHQQUC8j7Hkr9Ocy85AY6sbwAwlM8z+rVPBVKMaSsEg=="
+    },
+    "447.413ef3f658f94fda0119.js.map": {
+      "src": "public/build/447.413ef3f658f94fda0119.js.map",
+      "integrity": "sha256-foSkAzFGh3sB//HrQ5c8yYRvCj+otODvwOK1Wh56+Ig= sha384-tPn6xYjyEgJjZ3oQhzm4Fo6mPokN18SzagqCDA1bjXI+VdcBfY4GQpkAlE7DI0tL sha512-cDtU0UHtwPYtjgkKUBY138iXapJKxpCPrUjkm87xKI9qOLydXNQyRWIiGOR6oq5orRqi0Szq6rNo/2pGciPCyw=="
+    },
+    "4628.b5754f34a502a6653ba6.js": {
+      "src": "public/build/4628.b5754f34a502a6653ba6.js",
+      "integrity": "sha256-p0WCDshJNzWCPXdOUF275kDxHneBEEAZChsaNWF+6gU= sha384-dG0nGcbDqe1OrIb/Ac8+YFl3dbZVvc5snDNAIdDdYhelZx8UBPKZAGwjKEkQmfIW sha512-hYs+MyFAFg/zqSm1oYk0eZIzVkJvDTHfPaYulvIZLVrY9CuyD2TIYeYlVdPcKl2VvUu5Y9+gGfu+pNFDbEoCig=="
+    },
+    "4628.b5754f34a502a6653ba6.js.map": {
+      "src": "public/build/4628.b5754f34a502a6653ba6.js.map",
+      "integrity": "sha256-Ox1/etWWZ14gdMQakzPv0lesPf4ILw4wxOQk/vF1+2E= sha384-wzuNeZxqjHKL27z1NCOoG7TjPyXrxh36ibL1iooCoQ41j8LHx9F7zN2kNrl0raIQ sha512-fULeqagKyaC8tQxFNmL/bnXY6xO8naQVUN3M+nEgTPQyqJ77krEzdFOt7HFot8EoaPBXJas782lfNIBNYE62Vw=="
+    },
+    "4629.dd9bfb20c62e191d46f7.js": {
+      "src": "public/build/4629.dd9bfb20c62e191d46f7.js",
+      "integrity": "sha256-YiEKFWRALq8kd4mhdEQKRMokM+YCdMPwwHmlHlFOLuM= sha384-qdTfnhwoOrgikFnamYPfL3kXWoA0JUsZe7OLdJWcPVuxSJC30Bv4ta7AL8NJK0ia sha512-z/X9zHudIyYWp0wCbWL/EHz7ozppmdXA/gfe/VPhDnOiyaW2JIbsP/bIM8+PrzmxTojWZFIukzvwrDIr8AXlyQ=="
+    },
+    "4629.dd9bfb20c62e191d46f7.js.map": {
+      "src": "public/build/4629.dd9bfb20c62e191d46f7.js.map",
+      "integrity": "sha256-dHlG/j5o+ZHrsrr1skNN7eyKjtLyT55KxOzzOvRCzew= sha384-e69fVFamaikkveHnZx2IFoktbgcF2Idf+LhwsX2RtCOCJ/DLL8+X/yGo26p42Cij sha512-WBxwQGddPyAeoxNIrVCch+XqLLuHCQUenJq2S+gzsFTQfCx70/45ifvd38wkhlFp6pHU7FLmOcuGrq/0/YcYTA=="
+    },
+    "4835.c0808b7953e55c821116.js": {
+      "src": "public/build/4835.c0808b7953e55c821116.js",
+      "integrity": "sha256-D2gdKwfCRYqHMk7WFwl1SBqcZ0FisIlorzAt6qbmIz4= sha384-NQjCwfu4onm5yK+7HNc89KIwc8wzI6St/3OGw5pafJphCgC7XKiEnNbRRKzDDNKY sha512-q20L0gytv/SpCsFEYP5bOmboPO/V3mQWJqinvSBsuPqWONxQku4q475S2AbhFOoC5CQzexUuUwYYWG4rOhuELQ=="
+    },
+    "4835.c0808b7953e55c821116.js.map": {
+      "src": "public/build/4835.c0808b7953e55c821116.js.map",
+      "integrity": "sha256-wNdJND+L38YtVcbVlTEzrC05CQonD3rAbqfJbr12B+M= sha384-jOM8Sj/6j8Ff3bQRI1pKpziaU4hyD1QnAgVqou9dvpr4Nqeuek16Jvz29rgYR8hX sha512-AfIYEHRCTxZU6jtU6tnP9q1UlYVPpckgya/gVFv88KcjfWTrqge/lqDuB9acb457QYfBHRy8DWoLbrHDhtaKrw=="
+    },
+    "4923.00d206097aa85e85865b.js": {
+      "src": "public/build/4923.00d206097aa85e85865b.js",
+      "integrity": "sha256-6EtbExpcOF7Ww8ZmRi+eZN2GLlMCJYE3lHWxi0jijrA= sha384-DBxojqMT3RU2kuyzU8C3vabZvMHQlrA0E/i/DtZsoPXCQHXpVqp9ixfUVBePEwb+ sha512-ZTJh+Z/i28X6iT0vRVIOUvuSrIJBz4Cw4z7tC3trG9EjJ62IMxXZ9NrGwcFIwGSYELlJEiZQ/GQQrP2L/rajbA=="
+    },
+    "4923.00d206097aa85e85865b.js.map": {
+      "src": "public/build/4923.00d206097aa85e85865b.js.map",
+      "integrity": "sha256-0hYNdavEtoHRadIYsmHwWClpne60ytIFcAimOjwhRxk= sha384-NgKRMIacIP1SrNsOAqSO5/YFZPHwlK33OV992s6NGy0E/LXFgyB+FkEOj4y3qgoW sha512-P+uA5jI8lG8I+uDiyDtZBcPR7L9/pXIdJ0rsahx6VpyK0N2OY+lrREbHxNm4NU6LjT5BDNJhv/YpZ8KX+fJEgA=="
+    },
+    "4951.148d378508347e189b0e.js": {
+      "src": "public/build/4951.148d378508347e189b0e.js",
+      "integrity": "sha256-wnoSIrvLd04/gxXHOMxBJYfGpn9wtiQgICbLXX80rjw= sha384-rQnZzioLzSIAy43XEli8lAEXbJnxZ+LF1a3j5owsIPInWhXH3cc0AzwBeqy9GI9k sha512-5vXNwy+hxNRsgqcpsFl69Uk3qZiWh/yEPpHLzcfWR7Kdf843D35lX+fNPZWlw6nOSgpjqeqplu0Asbj5QJY/yA=="
+    },
+    "4951.148d378508347e189b0e.js.map": {
+      "src": "public/build/4951.148d378508347e189b0e.js.map",
+      "integrity": "sha256-lSTj1Vpy8EOujXFR0K47C8uBZpLs7c0ak600X1Y1+ns= sha384-AuWhy7e1N7GGOPvZalAxWhZCePgQfgqUl/MZ1shPu4dhV5n4gz62v9tPwNN395hH sha512-Aqerd2xdrNRQ6ckTWXh1ZgJtMx7SrKinH6lmuI1eAhuni4K1rkeqJVIFZgB/1Qa1gudhlTx6/tCSwNqAUoe9Ng=="
+    },
+    "4956.42f21baebd211a5b083e.js": {
+      "src": "public/build/4956.42f21baebd211a5b083e.js",
+      "integrity": "sha256-EnXxvb0QnEXzlAfrL/PdsVj3tKCzYioTbMxr+qAQ2lo= sha384-A34wM9SoMoQWh0LRIA/aq9Zr8PU9taiaJP6w4ofKFq38sMMeMmEWIZ/agwaOIFhI sha512-yGcot6Sgi0Ml4DoOHjHC1jL8RUTjU7Ii+n4x3M0R27NgGl0IE/k7dGtxGhsp8KCLvGe2kdbyNdUWstvlVpxRHQ=="
+    },
+    "4956.42f21baebd211a5b083e.js.map": {
+      "src": "public/build/4956.42f21baebd211a5b083e.js.map",
+      "integrity": "sha256-B9JssXN0newoSnfD/AtfKoasmdGRi6IndEfN1+vGZjQ= sha384-xavSziapjXhToEDnO0EWr+nXqIUVgZ3RolA9tYQkeqXong15HuxDoEgdZzzSIHMf sha512-fB7GvmitCP+HNjBvYy5Vifvp23iJTao0o8W8UDjJGr6mUHIe5wybu94qaWS0QpkIxvXrty08BJeXuqB4GvieTw=="
+    },
+    "4963.4a4e80afbc17f39f3350.js": {
+      "src": "public/build/4963.4a4e80afbc17f39f3350.js",
+      "integrity": "sha256-+jgZ60bB0/GQuYARYmjsQxXDBKf7xRxuNsfuPYd7nR0= sha384-5EeuOss5ASQB983KW5y3W3gafGyr+gYmsfbcJr0lUHcopjuY5pe++kaeriLj8kzs sha512-PG7byijHE2quEHo1qrlgFQ6ORKxUFQUBLB74lr92jE4BymDpHMAcG8IL7OMEdEGvfVM08wPpUuVEujkD4zietw=="
+    },
+    "4963.4a4e80afbc17f39f3350.js.map": {
+      "src": "public/build/4963.4a4e80afbc17f39f3350.js.map",
+      "integrity": "sha256-pQbN5nD+99CYNDH+vlgF6TeLu5XcrSP+XHbGkPajVqQ= sha384-s14JP5AkRIiSndVccVHe/aBDOFhOGA3Md39He293Jlyd9lSg/7D4UayvykjN+CIR sha512-p4CBwfdFavSS9SqKNraGJ+/H5XZpg6zdwdse44Mm4tLLnQ3QUUJn/mn+ezGA16I9IvYrr1RLP7XOxe06oPaeZQ=="
+    },
+    "5001.ab765e66a8eb9db56fa9.js": {
+      "src": "public/build/5001.ab765e66a8eb9db56fa9.js",
+      "integrity": "sha256-IqMfEesihqeTXCNqHS+6fgw9uE8zCVhrvdSjnh1+lU0= sha384-v9voPXroOyvJctIRbFYqfuFIQaYviDzh99GKuvE9ZoNWNUL7TjaChaNZa6lX3hqG sha512-6XPu+p9VGll5z5v++AyaRFJ8pVPjeQkseA8pqx4E3T1RNA+vDLtICepr1YezAhRc2XVuOmHjW+GLuWK2kuzZTQ=="
+    },
+    "5001.ab765e66a8eb9db56fa9.js.map": {
+      "src": "public/build/5001.ab765e66a8eb9db56fa9.js.map",
+      "integrity": "sha256-U2lA5b8FtVWJ/DdBF/la3WnB2snqCDl3tRD9n4CWI3g= sha384-m5eOQNzWpk/JnDwvrxIVaPN/RRSyrHXN9X8YRADcYUFaXdX5f/x5DVI0u/FLcb1M sha512-pDkNo5JgQp54OeGWjwOpwSpjvKePZFUgtCOCqYwO+r3/oBtGgqwKK9BYPU98mHEMe54y7Twa4Eu6qY1RFjd+SQ=="
+    },
+    "5191.4542603cffb4e7486e83.js": {
+      "src": "public/build/5191.4542603cffb4e7486e83.js",
+      "integrity": "sha256-oNlNspvN72gXptUZDik2tQ4DnEVpFHO6X8ax0GNXvC4= sha384-MFZJD1vSTeR/JTcwgxImJT3DW53AWPkqhQUq2AbmmNSKSvMIplXULxO+vVKB4NlG sha512-nwOkGqzfOn2xc8OAFf+Zi+xt+jxomXWAFPHJAjvgGepbRjBLVfFOdejPitPVfpDeaghF74Depm1gLg0TLD4t3A=="
+    },
+    "5266.513a9db1a49d6bb02ab2.js": {
+      "src": "public/build/5266.513a9db1a49d6bb02ab2.js",
+      "integrity": "sha256-dw9V2w/j37WkCgxy0VG9GHqrx83RGW1R/FA3xQz02AU= sha384-hZ4TkySYBl8idKKCZh8RgDpJEezy8h8CcPWl5e9KitQ0Kx6Ye6Nmxs74rFkq0y05 sha512-9tx6LO/PhsrevR8BzjLGAM38bHGcuLjdBgPqXl3HaFbMFdPgwenp0mmcoLuBXEu8do/1yNgn1lYY6lDt4IjMeg=="
+    },
+    "5266.513a9db1a49d6bb02ab2.js.map": {
+      "src": "public/build/5266.513a9db1a49d6bb02ab2.js.map",
+      "integrity": "sha256-z7E6KqCME699jjLopwGRNCGsFDfYoO5qtgcHhKl7szk= sha384-Csuj730IdTiytGPtigwz62RK3Mjj8LjuclQ5V3ColyQhcM8K1xOPQroORWum57RE sha512-CXm0YwCBoFv6B5JmNgFWPpQsxQXNRHsKiNTzwRQY9gHsDuRqgSj/rphTik7R3FTY1tOs9BIQyXDSabMXkgYnhA=="
+    },
+    "5291.3cc719ae08ec549df43e.js": {
+      "src": "public/build/5291.3cc719ae08ec549df43e.js",
+      "integrity": "sha256-MStobf+o9HTpdMrMCY9vkLLoo0lkwMjiicSzbgtvZGs= sha384-qcSPHZK308c1z+guKXSy/GpzP1jt55AMu3SFbpB9j1xA7lKammRqzcNBifAso6KW sha512-5MJavdXGklaDOx7ALQXqal+DlKYkRYoJqVpCO9LvTMmL3axkIvYs6Xw7YSPgR0Dt0T/fdGAY3KFlvsRmQ4wOEg=="
+    },
+    "5291.3cc719ae08ec549df43e.js.map": {
+      "src": "public/build/5291.3cc719ae08ec549df43e.js.map",
+      "integrity": "sha256-XnC7FID0L6VQUecsiiDW5Fb4ANiVZ1V2hFlV8I/qN/g= sha384-4G2pQESKuFuefEIC58+IjeLnlvCPeexPSEC3gVIbyPFEJ9HKv/DEcr90mEMRy6p3 sha512-T+dy0a0KCYHm1wbXIc8PSkbrtLACz8CQ6uV3F6oW3iJ7yH0rSwQo+7MD39s5jrjjT1N0KFEusfYqAxmTc/ROQg=="
+    },
+    "5299.aea71d17d995ab6f1373.js": {
+      "src": "public/build/5299.aea71d17d995ab6f1373.js",
+      "integrity": "sha256-AJKCcbGLpESOgHPxrKnJklklzH8+Zpoaw2cITFf81dM= sha384-GcxbZ2yTlX21QFMmUFltb8yI+iMStcujlemAwgyLpc/9Vl/WCdBrftHkVJ1E4c6o sha512-BXTiPfdhAhYzED9CRu1CLAkd0bOBEvnYXlmZVBHMmKpp2PKH9wZsEukXJorzC813Jop5BrM7gNRO905PWre+Xw=="
+    },
+    "5299.aea71d17d995ab6f1373.js.map": {
+      "src": "public/build/5299.aea71d17d995ab6f1373.js.map",
+      "integrity": "sha256-Xs29kqK3VKz7fkVrM8bV0gIHalldV7X5Sqg2nXUMbn0= sha384-3/PfXFn0N9uJ4Wki7ptPpb5Pr4vHTITp2eabeHtNZr13e8Zxhk/ySjbRJvGzVoJP sha512-8nxAUKJ5MB8rdZOIU31Ut7Oms95OL5aHPoQ7mA04SuVN8bSvwLpupbnjXuFtrp1Saig8Ku1O+D6oef4+E5OQDQ=="
+    },
+    "5369.269243967df7c484c12e.js": {
+      "src": "public/build/5369.269243967df7c484c12e.js",
+      "integrity": "sha256-R8dznOgcR9u7EL6Zr9oCNowKdb6A/2GUSu7j4ql76qc= sha384-W4afr6qc1AjxdEbcELS31NDDA3ZK0Jy4gciT8WEnhYhKsouNoYxRP3cJj4RFK88t sha512-0d4nNSdo08LPd7KWdlJTYWSN7s71HNO3sYnt94+4XaX2CGXzDnavvjA9ZdcEYVTZmZNMGSiyJs9F+gslnyN/fA=="
+    },
+    "5369.269243967df7c484c12e.js.map": {
+      "src": "public/build/5369.269243967df7c484c12e.js.map",
+      "integrity": "sha256-UjmTMsWbpw4AQu2YJfRUd9Ux6coR+wdvcz1U/suFNVU= sha384-KaLsVwIGburwMBLF+/e/wFC19zsjc86lWOt7HpIlTCbiLs+dL+Aqo2ul+1pWyv/j sha512-cmXosEq2HMB9cmpS07j9TMnK/hSBHuaOIaUHN6hMbWrntghFyiAc6Yiz7fXIyze4Nkj1dd0EU1sdXT27Ww8mPw=="
+    },
+    "5379.e9e7cbbe00c2ce64a50f.js": {
+      "src": "public/build/5379.e9e7cbbe00c2ce64a50f.js",
+      "integrity": "sha256-MKBs6zw0PxlRCMo692cO8LyrWmkfTzmf+qNMj3Ksr+Q= sha384-TWoosK84vyJcjZ5DqX+Vh+ZKFz19llZeQXhj5n8Ei8T0Wkzv/S9sT/pyQGTp/Xai sha512-Advwyx3hovHSd+t7eJQ6kk86BePvmLLDv7fDDA8Ki2PtzFGAldiOD2MSGN+wQWkR7t+J4S++DFvYTtSIfABzaA=="
+    },
+    "5379.e9e7cbbe00c2ce64a50f.js.map": {
+      "src": "public/build/5379.e9e7cbbe00c2ce64a50f.js.map",
+      "integrity": "sha256-Nz/GR1Fbsqz8BSyHK/YK9uSFm5UCT3WnZfaOGJpDysY= sha384-5nejPSXRMzd39GAT0jkqKi8UWPTNNDmK8M8sHqpcg4/KLQh8CF4p+g4DE9y/K6Nj sha512-DgNzsD7Zbmf3WY4JFWvaQqJg+yBqPQRZBOcHD7EGEPCL0JXEdLW01Ox3j2yLO/zjldu1K24CACiaEyuh+uZisg=="
+    },
+    "5388.7539c1dbeab2e3cb0fb7.js": {
+      "src": "public/build/5388.7539c1dbeab2e3cb0fb7.js",
+      "integrity": "sha256-kjf63N5vc+mm9pcdgBGnGrPwAwszZIgH2Kv3m3no8KY= sha384-KFUu1GlRIWv/NhkxJ3XuE9OdJEaqeOI2iKayK6GqbAKLK4cEhgS4IPF2z0v6Bisv sha512-/PqcDo7stbpEOa3XU94gGVQ9kbBQNo3jVYQ7wY+5yyt+QR+6UHv7nmS5PAvazcOuEBUmWpU9x2XNYi5whLsfXg=="
+    },
+    "5388.7539c1dbeab2e3cb0fb7.js.map": {
+      "src": "public/build/5388.7539c1dbeab2e3cb0fb7.js.map",
+      "integrity": "sha256-5hmtdzqlVwknmFTX0Q2lAQij5Ge4m/16SdDD5Bpg5Pk= sha384-kWmQXi19AV69FW2eXraVyQyJIwatPulBuygmd7C2+Gge8WUbEc3F7GXYG1EEdjW6 sha512-YMHRF+bfc5wcA/nAGn3xFjcnOrc4Rmsj6fNSSmgssIZp2YCFl3ownwiw2GeRa2mostCpl0D1txslFe1vPAbjYw=="
+    },
+    "5389.5f14b37d3b0509c11711.js": {
+      "src": "public/build/5389.5f14b37d3b0509c11711.js",
+      "integrity": "sha256-LpFe7zBvZGKaeEaz2dry7xWsTGq/BrHnuLXrQsbuLoU= sha384-tsgdYW2YeL44wUIlVSVIw1JfDfGkX3xB631uZfHC0uPdVD6cfxQ79kB9VB31ktr8 sha512-xBGR1vmfycmIxvJt1L7ffaQgPfP2RuRrvn0gtO9f1D2/fmjAjv/ggQY0aVs/ixp9tnrf03iXc5kBJUgOVwVSHQ=="
+    },
+    "5389.5f14b37d3b0509c11711.js.map": {
+      "src": "public/build/5389.5f14b37d3b0509c11711.js.map",
+      "integrity": "sha256-S0I3TXaJSzRHSso/yx2Ts2qPE+nS+6FSZouOcWpfD94= sha384-hhUVggnhiwVkfI1ddz+bsnmHsG2c8A45ArZJphYELoTRbIBw958o0kArwJHBiN8i sha512-lpfhD608P2aVPdzGyrzPA391ddrnAIq4u+gEy67o34zHmipPqzDnIAoBa+5PLwfwo71Zd5kA3cP71/tlc2fzgg=="
+    },
+    "54.57669f843e09e2d132b8.js": {
+      "src": "public/build/54.57669f843e09e2d132b8.js",
+      "integrity": "sha256-bO3o+tXfxHvWP0Btns6MWTabYDdvO1lSlR9JGQBC/iU= sha384-NY/epnMZv6xdTGHW7YZBBEn0ijVaY8w3AWCAMwp1/Q47rNVbFHdFRgLOwrlo/Kis sha512-xJdo/S+gdX1aeNB40fvHnabikupMFNbe8pb4G44k1BRovFq8pVkKk9pYobM7GGRNKkgM3pnxf5OuzJxUA71RqQ=="
+    },
+    "54.57669f843e09e2d132b8.js.map": {
+      "src": "public/build/54.57669f843e09e2d132b8.js.map",
+      "integrity": "sha256-SS+KbD8AXHSZi9MxJpZf0P6Zn9Ijf7qIOPu8J2yVC4w= sha384-spq5xPMzDKBSF/aRoG28FJrCe2fIq8qqQ0BlcK/U0bLeI5CKoBT6VVdqwW9XDbac sha512-x5Qs007XGMtBabKo/TdK6sQ83hHgXoy62QWl7JBuEoCxXyqSR25Li+Sk6Ut/SgRShfvB8YNYBqHqJI3pIy9zYw=="
+    },
+    "5414.a8725215856cac1a7715.js": {
+      "src": "public/build/5414.a8725215856cac1a7715.js",
+      "integrity": "sha256-CgSsKb4wvHJOUuoylJXSCygBus3dVpGFGNwFBZoim1I= sha384-lGDceeCVlkkylQmNBvPguEmpT7rUhsMQjq2VXJ9IQCsFqgZSNNjAxZ1X33+YApXc sha512-5ZUdSIJ97TAHWVwQ8S1HJ2nTAckYPxYy+jiCEB+Nl82TBqigMq+MEd4+Zdko2WoKA8yhaJiiGiiOGgiTsYQE6Q=="
+    },
+    "5414.a8725215856cac1a7715.js.map": {
+      "src": "public/build/5414.a8725215856cac1a7715.js.map",
+      "integrity": "sha256-dy1San9GPugRzQ+p9LJ6tbOtadewoYw2+GbURglqFFw= sha384-2KBg0TzCzZOQ5JsW5cSX2MZqjduUP20CL58v8FN8zdjFd+N0j9b5FIoo54rw92es sha512-xuxy33jyKoigBBdTCFG2ENzs/S9bOEEH360nWsHv6gFucT+3pf98aV9LqusbYIigBIj6MvdRLN3wnqn1acpJpA=="
+    },
+    "5440.7093e61748e501d4bb3f.js": {
+      "src": "public/build/5440.7093e61748e501d4bb3f.js",
+      "integrity": "sha256-DuUQrWlNxdLZLV0FTj/qrX5iAR16CDHhnuYn/TY6ZM0= sha384-Yxhqtgmd1kFc5VFxjbE3qGd2EA5xi+1+5R6e1os0G5E+zr3ckz4dmgMGAkKxsjge sha512-sF/GAYSMh5HuoEACHHc9LjHviJz0uABjwHUzzd83uFi5KvbJQoAOQGG/J5yAAVPZCJmD7hVFSg1Yd+ERWsssbQ=="
+    },
+    "5440.7093e61748e501d4bb3f.js.map": {
+      "src": "public/build/5440.7093e61748e501d4bb3f.js.map",
+      "integrity": "sha256-tq7XtH2hYvcecuFFImfLjrE7/KioQC8I0EsS1lwhz3o= sha384-INxAbquXN1+sUGLCcPTROLIR2i6sd7iFu7uUMDU7FWX1SK+7LLFCVbAxfA/Qv9X3 sha512-U81SQogUYQm1j4JuVnESGEshcwLNUp4CNlPS4Y1dBrwimeCNixSaz6vwhjXngpCW98cB35hPvhDd+W/vXEBJyw=="
+    },
+    "5475.a50e4dcef52b55177ca6.js": {
+      "src": "public/build/5475.a50e4dcef52b55177ca6.js",
+      "integrity": "sha256-eJHdgUV95YTjTofMyZPPPPNCXkJJf6ZmOnz1qtUmfG4= sha384-XznduKgg50byL6X2LVnJ6TxI2CpcGbD8w0TUQCMoz2sfwGtStSB/gXJ9DFTk6bTy sha512-DbpBr1KAGbvCKtzKZuScsPNuCHUB6gGfab8BGeOXy44nxGkHBukjlZJfQoJ+cayvu7c6W9sYXxWeiq4P6l1+XQ=="
+    },
+    "5475.a50e4dcef52b55177ca6.js.map": {
+      "src": "public/build/5475.a50e4dcef52b55177ca6.js.map",
+      "integrity": "sha256-D1onY6JeUvXwnbu6Lucyt4D/R/G6Zx0iUdV9U+AGDbU= sha384-D/zBFW71c4UbkBh0felw1V06MuFkmdLhMoboXccGia+RQek20vfQYLmo5yl3L/Uo sha512-kFrNDCbFcGWX+CCwtyzjO2FYSotCJhPIpoaMDGLBbfiLzJMuTqKXuAyJY/UVItjb2Wogd7RDUUMkSLpNAeIIrw=="
+    },
+    "5487.2c8589866f9f51fd7b58.js": {
+      "src": "public/build/5487.2c8589866f9f51fd7b58.js",
+      "integrity": "sha256-Wk7zoTGsEFwTgeydtWSuexk7Q5P3NCT6wMSOTcnJzuw= sha384-NiJTp9U3bZkWGi0FLjZwaGtByh071Cz1S0QBi3KqxeX+skuMoAiCS5WFAZVN74HT sha512-ZA4rzfmu1eBIgecyyxjBnqf1B0wRpo46H/np9dEUbrdZ+sq5t1GA7+yAvTTvPWvY2xDLMvvolAtJxm2DoNC8EA=="
+    },
+    "5487.2c8589866f9f51fd7b58.js.map": {
+      "src": "public/build/5487.2c8589866f9f51fd7b58.js.map",
+      "integrity": "sha256-1T+rFqt08VkSagoY9rRVDz8jyGcR10JO1nhN59LAjPY= sha384-F3apQVv0KP7Q78UbMw0kpBuXDu9v8stAMF8ov+fM8I7yuzIkAx2HqIRL7sXU3hTA sha512-SAZ70Ibd1uQ9snMRzrMfCFsklGaxDI+eiLaoqkFeSxmMJvBJUQ1pht/HL9PewTzTD8lmCtkXzh/5JcjgxJK0sg=="
+    },
+    "5517.34ccbc414af32430f2f2.js": {
+      "src": "public/build/5517.34ccbc414af32430f2f2.js",
+      "integrity": "sha256-k7SmRCgt28w9EgukTYg3JaeG9e6zN4ia2OIMY467pPw= sha384-gFR9ojXgdzR6+u5eCmACYcbplu8KZZjGVYy1RaKndcWcGE6om34FCGNuthclDdUF sha512-tAFRWtjGThYHQf8MgPrIea4428I8u1CdhznfDswdkfIwX+lTSWo6y7YwB56NfWP/1mVPIF/vrV9BUpQJ7W++XA=="
+    },
+    "5517.34ccbc414af32430f2f2.js.map": {
+      "src": "public/build/5517.34ccbc414af32430f2f2.js.map",
+      "integrity": "sha256-RdheKHxG9rzITGSYd0HgjcozKtQnnJZeMvuYJr4Uf/0= sha384-aYccVyalvNZuTgNcD1ne30X2GeYbCIMMlmnK7xlI+F1HU9fZwqidaZaxgtLZ5W7E sha512-KcyDOu6mDdjVMOPYj7FEnehfvQNAywD0QqblApJLWHaLblLPrqurL0fyxDSuIsd6ID+MSmGpxRnB02x3firYZg=="
+    },
+    "5528.71106bbfde3f43e83337.js": {
+      "src": "public/build/5528.71106bbfde3f43e83337.js",
+      "integrity": "sha256-ikby09Gxf2Voxu2+yUfphV+wjUZKCbwVjvQH5Cfo2tw= sha384-vM2xqRfTBzGfTxYL5OqACRH11S4vD1TRUxT6LAtolELv8j5w7DlNiq1B+F4oqhtr sha512-s//nEqUQpWRjAKKf927lvMJ1Ibgipx3rKSMV+f0699dxxIQktFIxuPlbSVQR9p+UQluIocZSC/3/y8gTObvOXQ=="
+    },
+    "5528.71106bbfde3f43e83337.js.map": {
+      "src": "public/build/5528.71106bbfde3f43e83337.js.map",
+      "integrity": "sha256-sKW7luON2V7OFv+RduU1psdVf4JNSdh8MCPgsUN36F8= sha384-/1h1s3O8C6AcQ/wc4ZES74eVawPafr6hP49yz7NOQbb9Id4lAvf71YVCFLWSKVSz sha512-MrmCCOhpFdgVX0SIw65nFDB0owh6r1yNqaVkZkztGDpt6T3qx/59hSpvyiiOmW8UIp2aFM1WymjjP+lOTVsATw=="
+    },
+    "5529.6619104091c2a28f4423.js": {
+      "src": "public/build/5529.6619104091c2a28f4423.js",
+      "integrity": "sha256-1kPpPf9qbfay6DBMl+CEmOkCpI2OLuCfq/pPODmzzFA= sha384-FYyKVqUy+n7ZcIyCK/cOHntFdSyRbC2ShREzvxrJglE3u+j2csMlf0nQxG90flfM sha512-tLAhsHo+9zfiHHYD1ozDXa5uMxiYCUP8PrwTMt3IVviJedqXPfxdhsly+8FoDKspl1HEt11yfQ1f1LfYNn/I1g=="
+    },
+    "5529.6619104091c2a28f4423.js.map": {
+      "src": "public/build/5529.6619104091c2a28f4423.js.map",
+      "integrity": "sha256-658KEH0EPG/4gt/t9xA/DbGGLYbFKI9eqDj1uLgWK0c= sha384-Qr+FD87+hq5i3G1UY+LdvEXhbtPTpI45VRUP7NjhBL1gTDOlx09AXdmp7J5ON3QU sha512-R58zNjruG8V5+9+yStfOzz4I/CsfzE8LoO4bqnT/D0T4oUmRLgeFR8s4L8H/ospXBr/DNzZWMyhY+SL2RphZEQ=="
+    },
+    "5546.fa4500180bf5d3a0bd1c.js": {
+      "src": "public/build/5546.fa4500180bf5d3a0bd1c.js",
+      "integrity": "sha256-7b8EKyfxOWzPUM3xOBWhaiZODu7cMFNztsR/ybYfxbA= sha384-rOdgMJqJcL4aVEke7yZXZbNsrIGvTC1MHnqfEYd4cgcw42hUdIJHEVfhJYzADXLm sha512-nI2uOkFe3eW+3kAuvglWl+OJx7c2ZfTXhlhCpgTZqsvE9sT+z5s+wUlEgAcjw5ZNrriisRBewop3LAt6ZxlGWA=="
+    },
+    "5546.fa4500180bf5d3a0bd1c.js.map": {
+      "src": "public/build/5546.fa4500180bf5d3a0bd1c.js.map",
+      "integrity": "sha256-c3V4hUyBhpTNKcypNZ3uJmVDWNGSePjDhsGzqRxinjQ= sha384-xx34wezKdF0qrWbXx1wNKvznp2flsLLDKwnmwGwU9E7f55PdeMKi0j6qCwOPT9kl sha512-nyhytBvVG35x9ghg2MUDRNpo3N8v/o4y58FdSXBFRMTIMTVy/SGwoF8/6l9Aqjv9wZVv8xt2nmPhhTuy6sETiw=="
+    },
+    "5591.a8ec742be1610af00743.js": {
+      "src": "public/build/5591.a8ec742be1610af00743.js",
+      "integrity": "sha256-0p46lNOXAF4xGmviaU/EAZchXl0JBILjMGeXciPPuuY= sha384-O6TMYarVF9HXWLbIrsFoyuvNWHKueSEbaMfC7FeqUMtYyCFF95Brx5aQhAS2dkwN sha512-5nDXjF+558ZIZ+MBByLFNxu85r/T4CeoB8lwXlJ9W+WDvwQitEqYGazfMpQetyj0fiWB/0DmauykWuzfmmOjkw=="
+    },
+    "5591.a8ec742be1610af00743.js.map": {
+      "src": "public/build/5591.a8ec742be1610af00743.js.map",
+      "integrity": "sha256-sCrs2Yik+cdSHZjbBuItmnYPX+c88kOpyoWrnE2Ze10= sha384-5XdxPA1jYnFoMd/ptSR4rCEjYkvfSkJ0VS0RvNORQjQkHwyWn7Pb9qeW7lwqsyIZ sha512-KIqOCBTczMz0cescPHXinNyQ1q+5N7icHvfa/vq6Gtoy9t06wLTqGzsXa3VIKbKOKfGilclY3dKG5CqNLbEVEA=="
+    },
+    "5592.0a6feb85cf1ca8115661.js": {
+      "src": "public/build/5592.0a6feb85cf1ca8115661.js",
+      "integrity": "sha256-bDjlR+9ty2HCZMd3TbWFMXOfvycOP32xWe5Fjs0Ewvo= sha384-aNLt60owlH6s+xDeDta05oGnQWuJUK+ZYzNOYrR0TmBHVYp+DYbBghkXIPsunRJx sha512-AcWpvskMvfUisIS/ltU+B9QyllTtj3FMIWtZd6wEiep4hh/SP5yQVyQV06MotqeDUPKBO0iiR28brhZwWEmGqw=="
+    },
+    "5592.0a6feb85cf1ca8115661.js.map": {
+      "src": "public/build/5592.0a6feb85cf1ca8115661.js.map",
+      "integrity": "sha256-sDRZpSLLHNVweagELX83VodPgMDW+wGYpQVEh919loc= sha384-M5pg1e4SdgJxvM2kc0og8o2NccuE0GnkGgyTqNVkCG3SefvFciJCOg5ksSEjr4AI sha512-aMS+trLiUopnc28Jou694HUhVu2ZAVlV1Po5OulvK0rtvFP3O+KAfgWh1BE73c85FAoAK41JguphkvvBuWA11A=="
+    },
+    "5695.264a340df03ecb1ab614.js": {
+      "src": "public/build/5695.264a340df03ecb1ab614.js",
+      "integrity": "sha256-aqm2frgn4WhAhbhJ0Ackf0UCMLP/wvvlzeXPhHgT27A= sha384-X3q3T6WVIX4q/+4EbQdxCR7qv1onLh7JSRaPDHqgZXK1gYHw5A2T4KDtWny5xsPf sha512-x/cd26gFq/67ikVr0KAhaslCLALijf0rmtuwaabT3acOJo7dV/hMpLYom+JE9jLTipWyUde8z4dYRNeeSDHW6A=="
+    },
+    "5695.264a340df03ecb1ab614.js.map": {
+      "src": "public/build/5695.264a340df03ecb1ab614.js.map",
+      "integrity": "sha256-+Z3AKCXx7ZcvgH1NGb1MPIHh9R0T3iGGHg0Dp664qOg= sha384-Z8hQi9+k7HucBaVzm3gt4Tk/nSy/goy0jDjuNxEPBLYdoFU3B2yMprjSq08Sl+za sha512-n6nKWvI3obNmRWiHSncnHfsAerWFsfXwab2j95hDT9WgLSsJN5NWC9eOhMQ7hoUWUCslm6lcmyMlWMqLCvs+KA=="
+    },
+    "5837.8ab393994dc53896dff5.js": {
+      "src": "public/build/5837.8ab393994dc53896dff5.js",
+      "integrity": "sha256-vBlOWKhPQz2JTCiq4MT/YJUUFmPJqN5MryNZag8SXcw= sha384-7w1aCvbCGoaxAyK3kTzk1+WGtvLd4KzI2RPTqZJxeapzQOA/kn3UYic8rZj1S6IA sha512-DiO16j7mxP6EXjSpAYXzxjFB61eAcPlSMouM4RY2OvI3VCXL7kQMpjO+lGRsAica0hsX4IR5KEZRdBYnj6DxNw=="
+    },
+    "5837.8ab393994dc53896dff5.js.map": {
+      "src": "public/build/5837.8ab393994dc53896dff5.js.map",
+      "integrity": "sha256-zo7Y4oQ3JI6tcGRCaVZOS7Ymy6optTZru4YkCiJXbJw= sha384-fkor+hkT/+H+YmMuexWNnIAfpsv1PAyUu6tdqEORNBtnoqac6GRft6MGP1XsCoqx sha512-IFcd6YCGn0E3US1ECCKa/rGGRVwyJ+IBrtiXnXBe97CqgYLYVd2XY3Zw/TYCe+l9oEx5/7lInJmsYnC7E/Y/wQ=="
+    },
+    "5888.2cefe2ada56cdc23794c.js": {
+      "src": "public/build/5888.2cefe2ada56cdc23794c.js",
+      "integrity": "sha256-OaH272NKl2pjwkxKpVmI+759TlI7FWMRHeMiyNt3xOw= sha384-IX4buRFmOTTNhINjsUgiFEFI5Dtu4QG/wyHl/AS3UxHt7y3nSgWCh9dT1EUt8kl/ sha512-UiaXFoTzbGPT8hcWII5IQIvRshdELcCOzXaGnswVBz0kTZSwRL6DD9+J0oGf1IViDwWK3G2ebf+9PxkpstKNLA=="
+    },
+    "5888.2cefe2ada56cdc23794c.js.map": {
+      "src": "public/build/5888.2cefe2ada56cdc23794c.js.map",
+      "integrity": "sha256-oUenmF5AWm31ut6iMFlW8ImcG3dWVk3z/2R0z3ZneE4= sha384-ofVd9o3HrRHi5APl+aGZ9iosiWOfyzsTTclOK1AJ+S16tnpT8+nv1XdE3+PmPUW1 sha512-3EapvWwdCGSJxgnrOmq/4G3K1D4g+GeInJ2T1/fq0gX2ci8W6+iQ8cpFCVm2CaR+2x/Oi9ZwgCJdlTC5oqRZkw=="
+    },
+    "5890.2b89731cce6e5fdb2964.js": {
+      "src": "public/build/5890.2b89731cce6e5fdb2964.js",
+      "integrity": "sha256-nlq0xQSR2EeTgZ9oWUlaszx7RLz4WyWbWYSgTIAjfzQ= sha384-vpgtgyBtuBv4F8RxJev4gRfdBNmRI7Xmu1aCj3OcBeVuQLfDTKN7JGXHfolRLzUi sha512-BtGeEQGRQlI/xzyzIRlz23v0OAs+Fb2ApQnfb/cCSVo/ayFko7gLzpAyf7groMSMpmpZRiKak0o1P+SY+WkQ7g=="
+    },
+    "5890.2b89731cce6e5fdb2964.js.map": {
+      "src": "public/build/5890.2b89731cce6e5fdb2964.js.map",
+      "integrity": "sha256-OTuO1bw0fZrWB+GJJx5bQyGjgdOzwqpNXbS68C/rL+0= sha384-7DH5UttLVwBc6B7YsDk1CntZH8Rb7TxPNe+LI38wgWizIXNCn9QLQB2nOS4cgar3 sha512-SxjuuuJ/vGvVUmg75GyuyFsJq1d2loH4NjmGYRPA5P+6Nxituxmvh33wRKBC6op6OCJp7tCHGKMxFhsLELTciA=="
+    },
+    "5939.949dabcd13672dda4bcd.js": {
+      "src": "public/build/5939.949dabcd13672dda4bcd.js",
+      "integrity": "sha256-cVPYRg3jpaDPDh6s1W/nvC57sEIBgOBNQEivoOzobFI= sha384-FfEvwc/S5dexgzSl8BWKtaD8hWzxoHHZkAbtG4tK3Xj+XiAZ05ORC7Yx+0bTzOYQ sha512-3hSrMyB5kvz84YlveytWmQJC+nVF6QUwdGxRzG5qVGoJ63DipLaGwEbEGu4Sn45Y2rxzOTrBHizSjMFWwZvxJw=="
+    },
+    "5939.949dabcd13672dda4bcd.js.map": {
+      "src": "public/build/5939.949dabcd13672dda4bcd.js.map",
+      "integrity": "sha256-q6I0d4PTSg8+3uCeq3bTTru6ZpoMwH3pPOKy9Y86VFM= sha384-HdqkVmUM87L1Ubv8aNgvCCxvc+puNO+MOUPC5WG0jhWG2yBwpN8erpgIhdNeQhsm sha512-NPgdhaWTBFwc1Zx8KjGWY66J3RHk4Nr7W1f6z7mq8mDO41g8ar+bvnaJosWdbeaqUv2F9tbokj90cg2tLIRRTw=="
+    },
+    "5991.4e7db73b32f2eb442de0.js": {
+      "src": "public/build/5991.4e7db73b32f2eb442de0.js",
+      "integrity": "sha256-Vucx02NQwhdC0FyhQKA0Z7fdgcLiNv+mNhPYdOF9bt4= sha384-q9rKi2CCGlf5MVmDkjso4ColaQZuivMOGwBE4DTdQFBUhpR4qn0Fe3QRBxtl0UKv sha512-8v+J9Kt2sKpNP/zFbfO6P3vvtbdq74YKgjtzoHKxEvgZwFbuTmDUsGycatr8Y3kNYBZeoJWeYVYEy0Qp3ZlukQ=="
+    },
+    "5991.4e7db73b32f2eb442de0.js.map": {
+      "src": "public/build/5991.4e7db73b32f2eb442de0.js.map",
+      "integrity": "sha256-27i05N2S5y8nJO6SzbeQ4Bg8ntX6iPKVJ9SQEZR4FmY= sha384-ijZjTVPYKV5ODfRXv0dKK/9iwkk+PfbfG/IA7zqZfoB3WhzD1yPTB3hat7+yEU66 sha512-1dA8OwUO817Zemd9CRSRNwxLSDa+h7q2HeLLo54kr88DAEP2/crYx3LU32RcOnAJBbvCXV+epidC+QjcIIItMg=="
+    },
+    "6016.97bd978d61c9d2453885.js": {
+      "src": "public/build/6016.97bd978d61c9d2453885.js",
+      "integrity": "sha256-IvPgUmudowwwHSbJsovbhQTPxPn6yxk3MAFGmUyV38Q= sha384-oHhFOjmO0Zx2WovUZfhrdvKGOaF63VpoD3k//Xguk6wh4IzKS+4vyMwnNHblLcXX sha512-SDty1nCVosbHpvp1JPP3g5PyFvBrXn7zX3tmvdMPoqHzIX8sST8MrOAn9+K3yg/Bbj+gqNnB8BMuqaa619zxuA=="
+    },
+    "6016.97bd978d61c9d2453885.js.map": {
+      "src": "public/build/6016.97bd978d61c9d2453885.js.map",
+      "integrity": "sha256-dA7gKmkGiUBAECslUe1qaiu9vLMZT8MS/i02g7YXMOg= sha384-xb8p4927Ure87Tpco590kU6cySbdMTv/RM/lse3bw7/Qvy5kJLcIEtbcTZtdHGUI sha512-CdSHnrBmX0Jd5zgkcAtxPLYvDfEaxSYf6JpXZwA6S4ZQDbO3SilvAmraBFIiRGlJVBZcFmP6uwI6diOyy2Qq0Q=="
+    },
+    "6087.6ad6a32e1e512ca3b29c.js": {
+      "src": "public/build/6087.6ad6a32e1e512ca3b29c.js",
+      "integrity": "sha256-QvtxJBAq6cDRbNxYkfJYJtFyMZrBjhgsTsWB1J2OT6k= sha384-4yEoRYviwNTEc6mgiUke0fghC4yoc8juthoSyQ06lrmyyXc7dv0OabftTNVPwvdO sha512-qW1SOOV0TlX0oacCAHH4iP1ATfL7e1HpouM2KQBx6EskkNOStFG3ZiWLX3shzWtnHMt91cY6ajnU3G7kOx3LYQ=="
+    },
+    "6087.6ad6a32e1e512ca3b29c.js.map": {
+      "src": "public/build/6087.6ad6a32e1e512ca3b29c.js.map",
+      "integrity": "sha256-6EwDU5W65T6IDCozQsvcTO6BXqUMr4LzdfgCF7xYBqE= sha384-fpZ2j15ku2PrY2gXX/y4Y3ScUazKdfLZ9H2C1YURmOBfKOS7kw0AfJ596CknI3Ew sha512-6AsFUK+ypme39jzlk2BX11hxLkPFEDIAyFcNAla20t6eF2DspCHp0DOpMIwSAxbT9L0yxnUATDpoPPgxUBJMgw=="
+    },
+    "6146.27384226edb568cf8bb2.js": {
+      "src": "public/build/6146.27384226edb568cf8bb2.js",
+      "integrity": "sha256-8BQcqAHfXNNTDkawF5ek8O22jMrTmTxcTGZCYT/y4f0= sha384-x6ah+ifskSdfTYZ/qA+GzcOdSMuvzDzYgwVSBabQro2z7ShwrhYrI0bxD3U5wGis sha512-u6CYDYQtRmE2z05iGqF5HxtBZO9TG5H6VNa61cVxqFQ4HZIfNDNKG0R5RWMyeeKv2lg+JjRj40fLNxNVyy2eLQ=="
+    },
+    "6146.27384226edb568cf8bb2.js.map": {
+      "src": "public/build/6146.27384226edb568cf8bb2.js.map",
+      "integrity": "sha256-sSrft4WgTowUVIifRK1d25Vk/OhihEavnwFVOuEOUGE= sha384-BmpjbackoqVYdpgU9pjX93xoKYlrzeucmD0d1zx7bhjKEgj8pbmyloTR3I4GV52Z sha512-kXTLobl7XS3Q6gv5W11vD22GRjWInNXrI7bLbovTNKuM3O0CTa5T/JNfsok30HSodkVa+tbnAE6YRxj6CJuDmQ=="
+    },
+    "6166.b09e49f3c6ddbf4422f8.js": {
+      "src": "public/build/6166.b09e49f3c6ddbf4422f8.js",
+      "integrity": "sha256-vrnDzaVM8LeaJQqIqHqGHYmJ1oF925+/cVQ6sF4bMOk= sha384-IsLNKA7fwU08IeIhNKuvILkoSlx+/GB/vBGCknBjicSSu3GKDOLBwwPc7CSA0YIq sha512-mAQtVs3ijecJ0AvpfAX/6ZwuADVmUnBFpdKxvCHMPVN/AhxTKLoVLJmcY/uLiaBVeyysZ8cTPizYnaDGZf7MMw=="
+    },
+    "6166.b09e49f3c6ddbf4422f8.js.map": {
+      "src": "public/build/6166.b09e49f3c6ddbf4422f8.js.map",
+      "integrity": "sha256-HPtU1FT4X4TY6NRufTFMBGKWTRwKLW+hi26tbz77+kU= sha384-/Td242Y5UXvSykhnPhAuAqQPvzmOhjiCpWVxP8wWYv+zTdv07jSKh6uZ51IMit4C sha512-nnra7MEGxw9sR3wAY2ZyYmr0dJWS4gUDPHCeSKdn4jv6LEXc6FIjGpscB56DvEyLB8TtUEcRh6tl5GB7BBbi+A=="
+    },
+    "6219.2468f799f75a2723936c.js": {
+      "src": "public/build/6219.2468f799f75a2723936c.js",
+      "integrity": "sha256-vd7cpgd+NxIHn7E4bOgccgvhRHAdZ6+Sts641ZxJx5Y= sha384-oyps7mlKK1ZQoVS3/rYm8lh9h39ptmLYUAtbaBGy6NoHpnxJh045U5FBTrbp/I5/ sha512-MkPP1j8HVjf/GZCeA2mEiYLUxsMmFd6fQhMj0XTJKkHbI/ITFKtKdrOJ0ZKWdbhA7p95xrnPDkp3yLaB+KbhoA=="
+    },
+    "6219.2468f799f75a2723936c.js.map": {
+      "src": "public/build/6219.2468f799f75a2723936c.js.map",
+      "integrity": "sha256-1o8PEZA+m44TByd2CKRiyG+PXOJt1S2HCPikoatJ2LM= sha384-s39uoPVkz+EKqKTmli5/PyPQWkS3XvNGPKJTgxD5CD4YhR/7wdFFvQnKCFOLNpIq sha512-kcF5LU0jdvT+YD4fAcUodpdbweC3v/HuR5fmQZ4KEXJoE7szPkwc4EOaqFj2s+qyHOcBILNdXuA/r6zpcS1kqA=="
+    },
+    "624.a08127fd79c29724fee7.js": {
+      "src": "public/build/624.a08127fd79c29724fee7.js",
+      "integrity": "sha256-s/rQgCXOQFxSgNh+0CPdVIPR2B3erSmYP9gbz0LKMN0= sha384-a2L3AclDih4gupqyPRuUKeNxNLoAt4YQ6YCm1poN84VKCAFXOuRHzHLR4naoowZK sha512-PfAtwacyqm1Dwi8swuxVbozjNNmQhFNgc9jwTple2YZ8/iXdWiMnIDDRLPlCTrN4qUaDABzQOQuKc3ApfXYxYg=="
+    },
+    "624.a08127fd79c29724fee7.js.map": {
+      "src": "public/build/624.a08127fd79c29724fee7.js.map",
+      "integrity": "sha256-QYRFUVEAyXiOzNZgE3/82nNScrCAuA2i/vYeQJlUUAg= sha384-KhZdgMuHNfHcx0umZhl03OS2PjH+WhZ0NGUmyf5r2tGwYF7Nd7pXKh9o6lRttR0T sha512-bASQyAg2npwt3pK35YVMhfOB2Hy8fYLkk3fNxb3l7YVqeVuAy/2+37qF5Do4VqbdXcawLoztfbq0TpE6dIuewQ=="
+    },
+    "6272.1fef3be6506f4522bd06.js": {
+      "src": "public/build/6272.1fef3be6506f4522bd06.js",
+      "integrity": "sha256-VRhDmAVfnc4x8jT4JnscyGW0Jd5UuCOiYj/gDGCi/+0= sha384-9Onqhwe92CB5UkbZXmkyDf8PcQ6TmgX239FbCvdcsavj8Ly8KWjUDVkzKwh9egG8 sha512-wLfXhZhyz1VBQdG988flj2NMJMOxi8oF2UpLajG2pxgcm/uODA2XJ7gtU/7SPiEI4Hwzm2Sm0uhBNPidsXQd1A=="
+    },
+    "6272.1fef3be6506f4522bd06.js.map": {
+      "src": "public/build/6272.1fef3be6506f4522bd06.js.map",
+      "integrity": "sha256-KjNpniXGp/lT4+/b5wXBpBZcdvwTH4X5vkSwr8h7bSE= sha384-gA0GtNCSRRr3fWzrhFjfGCnojPg2BpE2pKxqJgSp1rOIWwB0514MZ7UatVHpdNq2 sha512-tQ88BzWjgJg+yaVrBOQListUxcb2E9vKtvEraDv7OquCWMv4XKU3mwGFpUpyUVkBE4nYIkBKogEOlfmXPmJO5A=="
+    },
+    "6338.40e0e369786afedbb7fe.js": {
+      "src": "public/build/6338.40e0e369786afedbb7fe.js",
+      "integrity": "sha256-pr3z+K46z4z/Dzew47oUGhLi+hVdkJ1KFv0/++xzhSY= sha384-52qPXg6OY27yYAiUvmUYtadJeB7v0kxS1lGaInn3w41XpMn3iVASvB7RLu78F54j sha512-3pRl3VRbCLuFZZLApKng8tT71g6Qu6/v82iRwdwSLDxk0UweBvnaVYCWqMqOj3Qbvp5yHk1wCarXidhUuRFDEg=="
+    },
+    "6338.40e0e369786afedbb7fe.js.map": {
+      "src": "public/build/6338.40e0e369786afedbb7fe.js.map",
+      "integrity": "sha256-USdwEej5EJvYebajnsxvv/45XqEa+P0DpGcB1XVeuu4= sha384-SbZr+jJxJES8K0M62BT5rnj4EPKTLNhT8IDqx5Qz45lZmHvRkG/bRRNStPQVKtKF sha512-/UXN3hf+eyzEC4j3s5iFcbVnE6Kf3PWbbmIFmv7CeUGtmf5Ioggw+QrZbliV0vkTigBqjCjzHXnq8kQ0LXplnQ=="
+    },
+    "6355.e33747f1d326e00cba20.js": {
+      "src": "public/build/6355.e33747f1d326e00cba20.js",
+      "integrity": "sha256-ZKCBugnyNgwTBQ1qL0p82/4UdV4imxT4xHPyZhg1t0E= sha384-dwUyP4YMiX5SOCjBJsurI3LpVdGxMCIIzsyux8Ls0kz5bh09fUlDyQNfaUk17hMV sha512-etWR7E2ohleLXB99Mpx0R/EnVJxpA64gjMR9112Fbmm+dp2+t9mEL4GFOOEA7gJdbG/Nyw3o7GwO13aE/8mFQg=="
+    },
+    "6355.e33747f1d326e00cba20.js.map": {
+      "src": "public/build/6355.e33747f1d326e00cba20.js.map",
+      "integrity": "sha256-8YP3koUdYp7/J0nLNwBUyBdnGd5o+nneejlQxemV8aM= sha384-VDOG+3pazFU89SpvB4/nYgBSEwNfUNHKBknXPNr/Tnfm+1MZ8A8x+tbefDQz+C13 sha512-C+nAr83vaMtTxXRmUY0wVQYe3rTnqsZC+WGAK0WtbhG46WcnlsDAklZE2W+35sQwa7hgg3dYB6othdtbeIFFQQ=="
+    },
+    "6419.ef0e839695d3d6a7671a.js": {
+      "src": "public/build/6419.ef0e839695d3d6a7671a.js",
+      "integrity": "sha256-iYIl2+iJL67zBiq8zGW9FXpdFqEF1PqJC9d7WSLrTVQ= sha384-y3Mq5vYYzRdiX3IjafYgI1RvtnIw6NcuPj8UPKFj3EQjBpMWyvWKoYftFgL9KI1D sha512-h+EUqjg+J2lYMJd+aH7k1C+1TIfPeIg9kIjMS2QDg9/yECH1TTZdGDPZcZ4JguZfmB3S8QD7+RVbuN6WJnQqiw=="
+    },
+    "6419.ef0e839695d3d6a7671a.js.map": {
+      "src": "public/build/6419.ef0e839695d3d6a7671a.js.map",
+      "integrity": "sha256-YtV6lX4xkW3dGNDJO9uL1CEOj9uXyYzRyJj9Oc9SAuM= sha384-cDDBuAEObsqVq9ajzdGuOzbpdy7rsnj7XWQvL7uzXcjNMyeeYWhqWbZtqw3ln2sO sha512-J372ECyWHj/DrC59zODHxsMOAeDZ+AsD151iZpymSNEETNOOchTtq4smpZAjXOFwzgcXzH6+ZJmMC/BmHStrmg=="
+    },
+    "6427.ccfdbab29b80fdfdbf53.js": {
+      "src": "public/build/6427.ccfdbab29b80fdfdbf53.js",
+      "integrity": "sha256-FE2pf6kKISp32tC2iKVAYisKe4ORwpsnALESM7w9QI0= sha384-L5iAD+CYZaNKeH4rILUT+gDw7OE1gQsxk/vjZtvqiAfUb7TCqUiT1WGUKDUdgEXa sha512-BDi45FaoI2IGgy7fmanXY7zrlpN1FhkubKKf0nPUbCwXLAJfoSyMs/uHVZj3H/oqcm9kroYNz2T9w4TtvnL1fA=="
+    },
+    "6427.ccfdbab29b80fdfdbf53.js.map": {
+      "src": "public/build/6427.ccfdbab29b80fdfdbf53.js.map",
+      "integrity": "sha256-2v10It6xc5BlW4TupI2w0KzX0Ixes/GsrtnT08NioWo= sha384-iQoIY2GGuWLUVl2P96nSFLBmo1g9xylmFAhOzYBeiaQR5v6gUpimUWQ/Ub+vCrmS sha512-+6FU4C+SiiMh7NxN9JrYPF2EVA/VrjDoRbHNkfQjG6k0WOYvueap7OX8uX8FPmeUFYFoTxmGOqEZRt4e4rk+Ww=="
+    },
+    "6490.58072670c07ee1015098.js": {
+      "src": "public/build/6490.58072670c07ee1015098.js",
+      "integrity": "sha256-M5tcuYsLwgLNmjkSeZdIhXSMAgMRq6UD0sWNdpC5nZc= sha384-e5cUpZkx8Ud6zTtg2Bu4IXfjuoCjMIh2YzHu+rSXkLzmWj/AeMdFTooFCWunWjMh sha512-EtBp5RLURaoSN9SUHAQmrkTqv13s1GzkOSSCldoHjiIBw9pBYR5Z5QPOd+KbcQ2q054Meoy6W+vwsEjdLzwSMQ=="
+    },
+    "6490.58072670c07ee1015098.js.map": {
+      "src": "public/build/6490.58072670c07ee1015098.js.map",
+      "integrity": "sha256-KYQaWm99ZO3h8sgPOTW4uR0ThDfpYp0LI+G99/is3HA= sha384-bcukxjyPtaYgrDuEm6+x0eeINt9wUdLypjRGUJzBmY3SSCuTbeU/IuAg1R7BFLmO sha512-UyqHIpaqBF4/o8NCGnGSLnJLq+DcbtegS7m4F0DEPEetmVdma/TUrbgj73cAqlckZjKuf/Rq6u97P9vUxn4g7w=="
+    },
+    "6657.f78d38cc964fcf9f79c1.js": {
+      "src": "public/build/6657.f78d38cc964fcf9f79c1.js",
+      "integrity": "sha256-GM6BFS15k+hq0ik2grKzVWTGPAD2JwsgO6Erhz74scs= sha384-3GV31IcqXy+pfp1H+RFyxQXy31RWoylJj9s9X2kjFhi03tk37Z/w/dd065niSWEV sha512-D1Fo09PE+xjSHS1N+8kMBLiPcLmzE/+hz3s32x890BkpOaF7Ml+wpBg3s8w3O1Kwl8qBFlMtcJY2GgP/MPEoJg=="
+    },
+    "6657.f78d38cc964fcf9f79c1.js.map": {
+      "src": "public/build/6657.f78d38cc964fcf9f79c1.js.map",
+      "integrity": "sha256-jWIWcbyppLUmed/LJbYNRcpMFsJIfrdIWI/jTGL4Fbw= sha384-OnVBpqZ4CQavssZSSqC5Vju6UjP11q5pUS2o8XQaSDRWlwH/Ydpv3MJxjW+Q1rAE sha512-uE8i84JnZdNFH/ebhr0lng1Nqx+DEhBFWFYbOckG3QSeY2IOd/Pwi0JVyNvtWbmuodEJ2mTmaZo+Jvb+2IbYBw=="
+    },
+    "6665.08aae79ea58eb2cd7431.js": {
+      "src": "public/build/6665.08aae79ea58eb2cd7431.js",
+      "integrity": "sha256-ICqoMPeT3Y32DVAp0gAIblWsepjcrWlaleaX88oqpTA= sha384-psb9xTxMl11Jpf9FnbavEpHYgc0vxsUdyAfCv118EvT5e8W748rhMx0/gMgmAzk2 sha512-owsFd9He7zcqPVm+439tZcv0qHLWqUY84hg5yJPotVCcNPOVLIyKcIWF8lel6aun0ZW72G2jKhwoeVEdidzHmQ=="
+    },
+    "6665.08aae79ea58eb2cd7431.js.map": {
+      "src": "public/build/6665.08aae79ea58eb2cd7431.js.map",
+      "integrity": "sha256-Z0bYmPY4zojPhNFaSqUIbwUTqyrr6o1Oo9Tkg/1eYag= sha384-awWJ9+/mu12onycmRsg1XCKzxufEbCg8KZllKD4VbtCDO4e1Z/Y9afsEKzj49nuS sha512-zOKcRFuAEN5pmzy5z4hA60QtI3JhYRNTdI0lqr2/gVNWX2F5+MjEyqvmXWbhiO/5TFg5WRy9xsibRi1wI2B45w=="
+    },
+    "6671.317a79cce6553644adbf.js": {
+      "src": "public/build/6671.317a79cce6553644adbf.js",
+      "integrity": "sha256-vbAAxLvrLI40Yjt31jgmhyPA9yK1gHHkWmNV2cOLuoE= sha384-W6o5GKy9r66owsaCvQGs3WEb70ghogv7KU8ijMWWTGEJ+uxdHMgligRU1xBOFX7d sha512-nrCbcUt3uA5+ml8Kjz06z3jl7R2BM5PV+hTdYs8DDdK8L+FEApJE6ghE2HXzK7+cEOOAgJ16iucl8jS7tXogeg=="
+    },
+    "6671.317a79cce6553644adbf.js.map": {
+      "src": "public/build/6671.317a79cce6553644adbf.js.map",
+      "integrity": "sha256-ORkSrW9avVb+Ii/dAIPjrzqleuzaTYgm9Da3i/imJhc= sha384-Hb4uU5IXtk/p/hVA8wuF6KFKhl2IkFoS0TZR2Y8HocE4Wr7kY2m+oljPxvlBcF3T sha512-ozi9VCpoa9xQScFaMhe262CZHn/irOFfyCmoZl/WRqNd1wSfDrdtMdM0+FSUcWm4gUt9QDhmxD/NGq7W96Mu/g=="
+    },
+    "6767.23529a21d6c5a88d3fb8.js": {
+      "src": "public/build/6767.23529a21d6c5a88d3fb8.js",
+      "integrity": "sha256-P8eE22CJL89Fgu1WEaj7KCCqrFnaTFySSMuTFl07tnU= sha384-BREnSs3Ty1dAWRKvjflAqmtn8Y2KInW3P5Zdg62Ke4X39qVdPUrx8rGtTFI9d/xe sha512-Kwi+REA+F2xNOwW/EqRpkvHXQ4bvm0qBdbf2KdcW+0e+L4D+4siLrHQypCZ0vVLBThRaju08ZGH6B7RRKAE28w=="
+    },
+    "6767.23529a21d6c5a88d3fb8.js.map": {
+      "src": "public/build/6767.23529a21d6c5a88d3fb8.js.map",
+      "integrity": "sha256-j+9jClMLJFngQJvQGU4OHwyZKr1X7zKKOw69GmrnQIg= sha384-7+oawq8/fjd+lBFVFimYW4XDmAJ4aUrHu3XSuvjbjsExtf936MDSlY9dFdezojIG sha512-xQ2N8gaKl9Z4+GbeYv6Fshft1rq+LdBfWyX7M8/wJ8Tw/b/WvaH2OMBm7+jSrX1doRC91BDKbXTyKXDfpkML9A=="
+    },
+    "6769.140738764401e043b974.js": {
+      "src": "public/build/6769.140738764401e043b974.js",
+      "integrity": "sha256-xYq91aYGcizm3QmpbGxbuB5t0SDnxXRhRsXigK+if9o= sha384-pzZcXwQflM4MtUphCJfYZ2ZCL9wh3hwtDEm07dDKfR5IGtefUSTsQCnG6b4T6z8c sha512-da+jEj1EHzgRmEeOAiMIpqGB9aOfrqgWoZAeAR67aKpiHRqQJZUAZDXeoqEKCYIYLlJACwvpOs2sfgTIrnyGEg=="
+    },
+    "6769.140738764401e043b974.js.map": {
+      "src": "public/build/6769.140738764401e043b974.js.map",
+      "integrity": "sha256-d/n1stdqV9NRnOXTzuHZSQMg7KWc1pQ++BsmNi7Sd7k= sha384-QFxagw6xtXoM3HVZW4B/V8ww16vGQDQLy9HVAZB6/3ZM/oJ6pLNDj4QJ2XZjmq5t sha512-oHS4VpWwWfDmYMvW9/f7R7/iUaCgEfiXDJqyGvPXuJ1MS53yHWgn3cRSQCHRwCe2yV70o7Ws6rGK/17RMrrVMw=="
+    },
+    "6826.67b44c3524b6a1402b8d.js": {
+      "src": "public/build/6826.67b44c3524b6a1402b8d.js",
+      "integrity": "sha256-HNWdriqblJJaSDm4XPlsg3WIU5c9Xc7nuFmND9G91sw= sha384-jvHo1yYeLJDys0Co/pm1mAZdUtS1URSDHeDCrfjXnz4lVTbAVyA04BQ/pbrlLmWJ sha512-Od6TJgxpF4MRC0l+eP3M4VL/8tfVBBxhBRQ5TF4u4kcS3Kml4sWvOjkjHBnuwHNqdkr+sQzLHN1RQTiZOee16g=="
+    },
+    "6826.67b44c3524b6a1402b8d.js.map": {
+      "src": "public/build/6826.67b44c3524b6a1402b8d.js.map",
+      "integrity": "sha256-7wVbviNTEJ1q0+PyDAeiv8xrgosdbBTyaEvswPTN5RI= sha384-fvCmpuWFq7qcfOmgVyIEkZgYY9JkrHXasnDDOB/85XF2Q+E4SBWdwbKzH+DtgtnK sha512-KmOzvBwxkD+D3oYqx6IZUuGNH1V3kC2Cqf2PynN0MgtJfD0sLxZ5bm7Emu8ce8WyBbImTl23JtCxxzm1bZFZPA=="
+    },
+    "6902.070074e8f5a989b8f4c3.js": {
+      "src": "public/build/6902.070074e8f5a989b8f4c3.js",
+      "integrity": "sha256-TMo/uTZueyEHtkBzlLZzhwYKWF0epE4qbouo5xcwZkU= sha384-xylZJMtJ7+EsUBBdQZvPh+BeHJ3BnfclqI2vx/8QC9jvfYe/lhRsWW9OMJsxE/Aq sha512-EOmf+KZQMFPoTWAROL8bBLFfHhgvDH8ONycq37JaV7lz+sQOTaWBN2ZD0F/mMdOD5zueTg/Y1RAUP6apoEcHNQ=="
+    },
+    "6902.070074e8f5a989b8f4c3.js.map": {
+      "src": "public/build/6902.070074e8f5a989b8f4c3.js.map",
+      "integrity": "sha256-1vBQ1b4QqQLHLYHJmg7eVOVov6yrEldyVKE40CTtXWo= sha384-0/x8FUD913rSLH1r0PTnXtwclXNBWIM/QG06QYJjFdvB6RyXRqB0TyZdMO9BOqG3 sha512-6b9H2Wn68gOTzKQ+FcSRshVl8ISLOKoctC6oQY5e3pO/in2DH4VtnsRa/0+Sng3VtEbU6iJuxuRC721MpoYBjw=="
+    },
+    "6919.90cc4988940f615d1524.js": {
+      "src": "public/build/6919.90cc4988940f615d1524.js",
+      "integrity": "sha256-NhopEfBUMt8bUIBBcthuBdue++U0Rnin032RmYPvxBo= sha384-eGdy4RH0r3BtLjqJ+K+3LnkUnkCtG5R0b+gXV46ZoBWTW25w1+TFpEKpOzm+g5iK sha512-i6Eh1Ny+EZQBWQ+jV4qEBPHb8FObB8kgv/toxsPRNZEXlaoW7vCj/LfoQdIU4BuyXKzL86IqSqrebW5sbjYuwg=="
+    },
+    "6919.90cc4988940f615d1524.js.map": {
+      "src": "public/build/6919.90cc4988940f615d1524.js.map",
+      "integrity": "sha256-jC6JuxNUzXng0+yMh0u3Hml3hHptut9sTwwn+B96t5k= sha384-6Wvi/ArNwSXGH6uAWg+hYHuWPgHjDwf6X5JUCiUp9KPAmDGtUZlXROFdMKpoe+vU sha512-NEq6i1tnCWFOozGwYTmBRXHl2UxQYbQm/ayc95VSSoMTeuv5FxHvIBkIoy7YLbFrR0QJONKA+j64TAYvvjWCeg=="
+    },
+    "6941.c84a5fbde942398f2f72.js": {
+      "src": "public/build/6941.c84a5fbde942398f2f72.js",
+      "integrity": "sha256-H3APtQIHM+pYfV475Js1REeQK7COgRTOLfkHFQiHWeU= sha384-PHH7r9EEvifKh6AKbIpSYqHKyL9z5b151IED2IfiVFeriy5EvIm6SpbdG7LeOCWG sha512-4xjI9W6OBW+0vVmF8DZwM/4h9bg1DpLGdEqXsQ9dg3cblDc8+4AjeOeAD9RT+bJYgjvBYyNF4dVL3oxEVJUosg=="
+    },
+    "6941.c84a5fbde942398f2f72.js.map": {
+      "src": "public/build/6941.c84a5fbde942398f2f72.js.map",
+      "integrity": "sha256-3PMnZVTyoQF3Vmd2pH63/y3og1BVrLbBcQDXm/YiNX8= sha384-fP5QoKrS9F4JZC3f1RZ0SpknEdy9NYXjdGNMotqfGq1iEeLssW/EcW/PX7K+zBTr sha512-ZTHMn4l5KwVKJKey9eUPtidQPFvaFZhOAgrLPhl91DoS4v5BwWRwt4D7PwfUozdg2V3bja8eZRHatDNpFVie+A=="
+    },
+    "6954.c6e0b5720d2e08179ad9.js": {
+      "src": "public/build/6954.c6e0b5720d2e08179ad9.js",
+      "integrity": "sha256-2YbAY1k2nM/EAwoBylEbiUDSXGMPQDdXicuRF5tzRpU= sha384-9GrPMRK6CnU/OnUpHy6fFd5gZ5Ewk1T/PZDGB+PZNPUiqzFAqIq37kTmQzKoIBCX sha512-XoMrG5aR2OInKZNwymvPhH3+Ru8qWbadgbPy/26us+ZdJOI8owPXQD10xCMfqCuV0oJJVX4ZyRMP/lz8WNaFQA=="
+    },
+    "6954.c6e0b5720d2e08179ad9.js.map": {
+      "src": "public/build/6954.c6e0b5720d2e08179ad9.js.map",
+      "integrity": "sha256-9qrSmXcpomjaR3jPxt/h0gGvTjGt8OfTgvR84IgcMgY= sha384-TMui0Fla9YtoUnwMRRnTnjo4lwpTeiuHDY7njIuEJ8V2PnlI783mwMbsYp0fJBxV sha512-5N6dutF9dRSYOTZaLrXHJ8JuoIOVyBZnAMrXsZbFtnQUOYiSnofNoBDz/y39bz0DSIQWIFrJeEePR7ZHdSohxg=="
+    },
+    "7252.b2afdf279f50344fbe6c.js": {
+      "src": "public/build/7252.b2afdf279f50344fbe6c.js",
+      "integrity": "sha256-vGKEcRxcdJJYKLbgbIkhh3nVD0G6LNQPvzcRa+WBYR0= sha384-5MgtfpIyIgVOQn5Zp5P7GJtYfmDNMzgTOouPS2nicYlKjbwWekRiVntFsv/vyQJl sha512-f2Paxij1Xucngt7aerKMgjEwnJ8+/VeFv/uK7O6Fqt4xh2k8TqU60l1myKbZUVyg6kiz5+iSBT0eUOXrOWHEdQ=="
+    },
+    "7252.b2afdf279f50344fbe6c.js.map": {
+      "src": "public/build/7252.b2afdf279f50344fbe6c.js.map",
+      "integrity": "sha256-Q4WQCt0jh/tjML2Uvnajs66WswfvU2oAkTo3rxguoi0= sha384-hv8ec3XUSoR8s1Rh6X9Seln83dtVgsoBn9sBBs+iDmZFHQzNQoJxGpdSoSzmIqtL sha512-l/SJ6hrDCo6G3hbDNFVhxuuiPcvyRiIIbci1o3LySDrKk0RsP7SF+pHqS4GSiUAEyjh5f4648uAQurV2vQjPTg=="
+    },
+    "7321.60e2d9dc554ac4e65316.js": {
+      "src": "public/build/7321.60e2d9dc554ac4e65316.js",
+      "integrity": "sha256-OwSHz5KnDvwla7W09TunFc+BTOESKeH0fgeO7ezeMT4= sha384-Veb2nUhgmtuMUIZLu9+5ZRiIrOkbzm3k/yirdhvaAQeh7ZdsYojj77InRUZog0UB sha512-0nMSuDnfGn1kwy1w0SsE1NW3gb+Y0xvpvuiAFFa1tu4KlaCVlCTb/eJpNhX9r3bEKUiIT0vRvAiaxD6ZFGP9IQ=="
+    },
+    "7321.60e2d9dc554ac4e65316.js.map": {
+      "src": "public/build/7321.60e2d9dc554ac4e65316.js.map",
+      "integrity": "sha256-yYrytorNSeTNomQCVqUwgkJ5HVfd6b5vaveDst+50kQ= sha384-KpB5sxBS0XTYWb9Ag+MJWJ6U8g4bMuLe+GzlC6y233J7XFsvEfhWj8qX8LGf2KVJ sha512-40XLC9Kr44MxSnuAi4ghfTaf3MXQOXJA5gH6Wy13c+tDbzHf8d3uybnNg6QAoKKd7sn8cMdR+DClntW5X8wFwg=="
+    },
+    "736.83d7f52deb0dccadc189.js": {
+      "src": "public/build/736.83d7f52deb0dccadc189.js",
+      "integrity": "sha256-lZa18EAPIA8WjmPFLxbbJI9Fzbwm9HUf56Ag+ch6Dak= sha384-sUihRkMVypxrwjL5vtY5fzKxCR7n29YigOI7/jCQjQCYnFgerJoP3IFtg1X8X+PB sha512-RVuyFpVe6+mU6qQhtrbGEzHu4BhO1BAUzs7DH32G61PqrZQDkvRKPzbSDU+e+OWmWWAtnpuRXTK2vEEDfWMPmw=="
+    },
+    "736.83d7f52deb0dccadc189.js.map": {
+      "src": "public/build/736.83d7f52deb0dccadc189.js.map",
+      "integrity": "sha256-n6cmxFCMasaKX0Yf8slVelhW2/y7SS5G8ikWAnhLmvM= sha384-Sjt1BcaII6JS8b/WzAk9bJmAHLcZjFKS2cq3cwqKhd5YZm/St5HokmaPkMHaGU9D sha512-Ajiuk0n4XHmytFm0YWsruEfu2mKXb01a24QkQpVvOw+q579dwXN14BNYWVOZxAj31XkwrwSuBYtf/3z4wjZZYw=="
+    },
+    "7414.230d9622b2f8f3f2b9bb.js": {
+      "src": "public/build/7414.230d9622b2f8f3f2b9bb.js",
+      "integrity": "sha256-UeKdCfqJPwibcbn9/u62QGSbn/DXsowKXiYME09uW2I= sha384-Dq8eGf2UurLLPox0QVqlEvrXoy7mw28an3jLq1g/l1CpBmsrhoQveawlcgew43ro sha512-aC/5iybRixWQiuGnBedRwZQUt61+hGyyR716PIjOiPxn6saO5wj7Kq38e6jAyOGf5rNHzNixC2MFCsISGyQ23w=="
+    },
+    "7414.230d9622b2f8f3f2b9bb.js.map": {
+      "src": "public/build/7414.230d9622b2f8f3f2b9bb.js.map",
+      "integrity": "sha256-/+sl/tjSARHRXvfZCkMTkC0TsLp0matWGWdA4navfTI= sha384-yeF1hLtQ5lkBHnL1l06E/0MCQM4jil0RgDMWiC+qEmqneWMf9mL9b1jZzFzbxB2J sha512-0AKnrniBgX4hZZW8O3lCSkn+4EaW/VL+YTAK5rEQv4evdhDdRdiG4AEOYG6K+/oGKtlgtyGxx6cwatMt0VRbzA=="
+    },
+    "7424.300430230a06f34fdc01.js": {
+      "src": "public/build/7424.300430230a06f34fdc01.js",
+      "integrity": "sha256-qWtFwNMsytj4DvvTp/3enDlEOPWYtvaElSilBAaImuU= sha384-HH1RouYQUMMI0yRdZ72a7GcMetrgQW9ghmITqQDQvbtBY1T/EjvgEGcuDxXdBecE sha512-pSdU37Ay8SjSxB6y1NhV5QYujpYeQI/icqaB8aaodHnDA5gxkZyOmqDiuTQ3YkQrY1SkhLz+3qRXdKa85c6NKA=="
+    },
+    "7424.300430230a06f34fdc01.js.map": {
+      "src": "public/build/7424.300430230a06f34fdc01.js.map",
+      "integrity": "sha256-L9G5G+ec3Z4nwfxAmkoO8PhmGYEhc5zud92Dm+jGOx0= sha384-N3coc2BbJ8YCcPsirdM1OU1telEq7757+SgVXARqghbo0SSkTisjxxwdLr8yU9ye sha512-+DAnWJzANEKLdUNa1C+zZVD+SYCyzbEaFGHBpPkSokW7xiKKP9PS6KJ+1bGGmn+nCQsqK47QbABPMScUSqIr3A=="
+    },
+    "7428.287fe0174dc7a82f4e03.js": {
+      "src": "public/build/7428.287fe0174dc7a82f4e03.js",
+      "integrity": "sha256-7NsPd2m+tAAIqCYqVpG+PMgLN8zo9AmA0SmFW00YTPE= sha384-fzC1WRpTXDhAyvaAezcved2YhwwfrBtVrP7cDZcysT6tCwLrp9bDnrs/acMeMQ0C sha512-51Z9rEKQ1aqxajO6zHeORJsMPCS9Jx7H3s6Ror2dyXXZfL2Ku3RZkHzs7Yzbf9C12AsXwE5rJlTcK8gYfsfu6A=="
+    },
+    "7428.287fe0174dc7a82f4e03.js.map": {
+      "src": "public/build/7428.287fe0174dc7a82f4e03.js.map",
+      "integrity": "sha256-E8o5LTF48LWq/7f5vhuUUrxMenOZANNIhCN980M/PK8= sha384-oDJEOxuuCG1M5Alx9TWC71Q/F8Tb9W04rHvhDp4lWfyiQBKDepXWd0wj4IljBSDu sha512-9o9xDCIS8zJTdLeforB+NdDTn2qQllWkmwuL+XR53zwkLOJvlC/Zgpy7emPhKQOXgCt1UMq48hxZ27c1e2ktxA=="
+    },
+    "7550.d02d50f57be974fac53e.js": {
+      "src": "public/build/7550.d02d50f57be974fac53e.js",
+      "integrity": "sha256-Y0P4Nrbf7qDpW/Sh/ywl56lo7nxsWVPiGl1kImXlpRg= sha384-qQGkmoa7owKJnWvL45kpAj/7r9Ra2L9O4de9M4zq53kVK0YgkZkvr7dJswUxMLZS sha512-u8AOURELF9aRN4KTK/43Z2Co8MPjqwKeXmDqijs/J4jvrs5N9+t9Fat7rEFNsONWJlpVV783fSoBvhBsRZL2qw=="
+    },
+    "7550.d02d50f57be974fac53e.js.map": {
+      "src": "public/build/7550.d02d50f57be974fac53e.js.map",
+      "integrity": "sha256-T+MLhTvVF7LVDCygawtH8LgB473ZjHxH8mT1QxLuQn8= sha384-friccfrQhoXfE4ZdBP8xNjl6u+EC7k+rFYe/KaL7e4BYBItFqeTxddX4qelIgS7F sha512-YybrcIGgaKhawX6id9riUcL7unHvJOLhzR5sDVWRQnetrbLIxPaBv6Ze8bJtfAPIOtPV+tLwBjmcfMgy9G/ykA=="
+    },
+    "7566.035b324c605db9e1d785.js": {
+      "src": "public/build/7566.035b324c605db9e1d785.js",
+      "integrity": "sha256-O5uVV2EVzrPsSwoKPKU7NH11ECk8cEEc+1c/XZcoGvk= sha384-SWV0YPMaQdxU4R8JAjhD2sE0fbRZlcwe2B27z9WVSfErq21rKKKjrwB16qVgpZkU sha512-Hdv3IL+7z4kHh/gCso12nvxw7ZMgSRCwbCsF6v9crbpgV/xqw2T//oBDTSCqZ3JRy8tXwS0F8SEu/quTlh2kWQ=="
+    },
+    "7566.035b324c605db9e1d785.js.map": {
+      "src": "public/build/7566.035b324c605db9e1d785.js.map",
+      "integrity": "sha256-Bj83QJoz35zuQUJAsyZxf5Ef2v2UeCBwsrthgbKZalE= sha384-9drX/o3ABIeP5AlqnL+TE8r0XntdF+NMROoXJAI/dkTzdW0cgHQn07vy9ew5Q/j/ sha512-ilrGkNjIIlOsxealyU13olcNtj53guvk2rG4uGj1MPENQH8zuH90V1MIeB5n0bAzG0Tu+nGqt5lisYR5w9dOBA=="
+    },
+    "7596.d8eac0bafb38436fdb0b.js": {
+      "src": "public/build/7596.d8eac0bafb38436fdb0b.js",
+      "integrity": "sha256-HdTToTG39+tBUGugHbA/cvu/XX1SUoc1zfxKx9DkTHc= sha384-ni0mZNsFl0lVOjVEB2iyN5zG9YJNpnTghgWOJo13kWgt/q4bLUMXfEXSWDiLWrlj sha512-Htsj3PB7Z/ToHDDWAFUzmaasNphPwgbVl4bgaXMxVSqD72FFZN66N0xY9z/i73v9u5Uh5fUChapO4skF39UsXw=="
+    },
+    "7596.d8eac0bafb38436fdb0b.js.map": {
+      "src": "public/build/7596.d8eac0bafb38436fdb0b.js.map",
+      "integrity": "sha256-rKvIcJ0ozlU6czbWBqzyJPwqHEH6jogN/x0B6cBugfg= sha384-5+/lLdsPIH1Cs5I0GcmB7u4O/m0N6GZlqi3lOYGnzhURHX/ChisO8i3ZWRiqHPvt sha512-5NbIl8EfNdF4wPrJwMJ4Nw3A50IcXcXwUeeaoiW2EY8oWMMshK44ZfKLoGToamARnvHLkgeAnEMeWNMgIjczcw=="
+    },
+    "7628.f0ebcbecdf144537f216.js": {
+      "src": "public/build/7628.f0ebcbecdf144537f216.js",
+      "integrity": "sha256-cGIrENWiNEH8ulA7a8SKBdk/OkSHbUmQ7/yWBkUpWvY= sha384-nHozFHnjLcdL8ewbV8rmSw9DtkVEVoltzPmAaj+snHuuullKT5FINku1Ahw9VFjj sha512-Cy7BZzoTapR3HHf8uLcf9Jeo/tugdz/ocBYr8Jqfk7fcrPcMlMrCTWPgUNTw+GJ2tEzgDIhr4h0slAp9ZnKZzA=="
+    },
+    "7628.f0ebcbecdf144537f216.js.map": {
+      "src": "public/build/7628.f0ebcbecdf144537f216.js.map",
+      "integrity": "sha256-J16wb+z6Ys4npOI+3uApJv9Mx0O0gAw3T5Enk3sJPDU= sha384-eopZZza/vjSj9UUTwtDC2pW9CahqdQ8Bacza84h3en2miJvHv/iSeiB+IycPawyD sha512-Unr7zeQGU8zArMX1mmX+UZCINJjV2dLQC6p9idGuv3KyaIYQgI62Y2JpC0AvYvHqoc2D/gCJ+qy70HTFslqbQA=="
+    },
+    "77.4e7ec0746c7de7149c91.js": {
+      "src": "public/build/77.4e7ec0746c7de7149c91.js",
+      "integrity": "sha256-XgocBEdV5K2GY/XKL5UCwwzxxqWfWI2EyfQ4blPwwH0= sha384-e78yCHuqFwmnNAcNpZqRvV2HiLXfhPrfdMDfgXARQUrBjXNsVcofXFvjaEj67XPn sha512-BQ/yy0OcPqwMCbTKG2YfW9KqDDNBILmO7xaHRl359h9s90NoSkBvZEh5x4gv5XbUYc3gUWhz39pzccpX+P2BGA=="
+    },
+    "77.4e7ec0746c7de7149c91.js.map": {
+      "src": "public/build/77.4e7ec0746c7de7149c91.js.map",
+      "integrity": "sha256-1YgWSMZM6ODeDRAHuCsVFwq0A7m/eBFCTAVNVMdqbTM= sha384-Q1X5RLTjM/t9T9GBBP7GbMAE2k+YZW4JEsW13Eyo0lZUu4fGF4DY0r0gXCPUCwDX sha512-w2tKDi/wj+LnYMnrPsSWba3SIcg6AhIX+1WDFcZxMoMvSkUaNm9y1ZCgYWCjnFJG4eMUCiMF2CbO0OnSS7yZUA=="
+    },
+    "7731.66768c5bda91a9573e0e.js": {
+      "src": "public/build/7731.66768c5bda91a9573e0e.js",
+      "integrity": "sha256-kGuLW0LbsPs0CpIq4BGN1Gq+74XAK3NBmk1omQc4jw4= sha384-Bq51gMCNYGlDCPlTlvP18KbPKsfBK10r4qmf7YhWeWuREKBkuVRxNnGypeQgOANT sha512-K85js4rXHtZMv4mi5guWDeuMOl+AsUjBN8yDcVhnw4dPtYoRj8c3Rxo0PBIcWquH0lR2IXYJzy8B3QnwZ+gC8w=="
+    },
+    "7731.66768c5bda91a9573e0e.js.map": {
+      "src": "public/build/7731.66768c5bda91a9573e0e.js.map",
+      "integrity": "sha256-VVAhSUwA2Fc4fHduOa8Ap+umo1IUo8hwIAW6fqDffow= sha384-SxQZeVk00mq/dwRi7VCew3XluCc8FFj/94oHRlqjdZZ/bFXRQmF8bxhFmyZeF9sg sha512-o0Ckdw3/lvmhnxs5hT/FIK5RSIYWQbXTYCgI7ecAQqdpKdRvWc/1RKGlHhYu4k9LaxOA6IVUeEA+gRPuOaeoyg=="
+    },
+    "782.f6f4d3ea0c9c7b603f36.js": {
+      "src": "public/build/782.f6f4d3ea0c9c7b603f36.js",
+      "integrity": "sha256-ERxAJMZ26gOfwbDXyfVIwBpuZk/TDi3Romvpxq7sfrs= sha384-J6TT6ywx9jDnAYjDf+QsWqY7VEyBnHG6RSPuW1IeCHC+5WuI+2MYf2xgdt06oqKi sha512-2GiR54q1JzMF02Xk3v2KZFPuLxJKsnjr1lQo+GyL/fzBLxlCSur6xDj5csgzH/4482d7K4IAWCc8PZhKolECBQ=="
+    },
+    "782.f6f4d3ea0c9c7b603f36.js.map": {
+      "src": "public/build/782.f6f4d3ea0c9c7b603f36.js.map",
+      "integrity": "sha256-SpntZNzixkWPgYZYYZwEYoRSoWcrLewC9LLbpeHoHbI= sha384-mTqeV3823eEgmgWVHPezKjc+04o4T50+pFaPCafpqmjphkRGp+5O6Xn/eNJc/jQW sha512-SVVp0mdYdbjK8bAz/RnzuV7Q6yPeHLkejtQFUYEY0L6gsSR7iwHOQyb0Z/2o9Vmtt1anVK3kaW7j1E/g5DzsPA=="
+    },
+    "789.98ca0f684e9aa758b5ea.js": {
+      "src": "public/build/789.98ca0f684e9aa758b5ea.js",
+      "integrity": "sha256-I7F65cB3eprAPoPByvl9URx4iImd1gvv0KV2Kckxs3M= sha384-51DBtH7kyC5yhTvtZjtpPs2mOAfvnn6xMk2VP4NccQlDGNEg2rA2Jj01oVu6OzK+ sha512-obBQSzcKtImiKwHbE/YHgQPMcLp/F7QlQxoEbowfUd1Jc+2aJ4N7f7nAkY2I9nUf1NAEMP6ZBuKQQNzomXzSpA=="
+    },
+    "789.98ca0f684e9aa758b5ea.js.map": {
+      "src": "public/build/789.98ca0f684e9aa758b5ea.js.map",
+      "integrity": "sha256-7itDG8xrnEwZIyYEfQWWjxNzt4KY/fiT2M+UcDCzJ/w= sha384-iviRctFy/FY4Jv3XVV8ar7/Szf7c3alK4OtFXzT+JOxxeTc98OMXqm/QXprGUq7D sha512-6ivaiawDmPMtem8cly7d/qkhAeEZpJNzC1d78X0dW2NOnLZ6T4UmHkKs4ShZVqxFJVoHDSCCaskcD37nDDzrPA=="
+    },
+    "7932.4f19ee06474f59187235.js": {
+      "src": "public/build/7932.4f19ee06474f59187235.js",
+      "integrity": "sha256-jPLVb8xzOajAM7wbyIc23X2kh7g6ahUd8RP6fFNoxJw= sha384-M8FKTWIqMS5OlCQG72H382QeYZCwzMzYXp50UDmiUGRm0840DA+C1WQjnrldLdke sha512-VbT1//eAKUFX0Sen+gdnUYXLoIjRjGQJxQSlAYlrUu8wcnz86aKzz6KCjeWQ78jcJiBm50amiFxUUCq2bc9X7g=="
+    },
+    "7932.4f19ee06474f59187235.js.map": {
+      "src": "public/build/7932.4f19ee06474f59187235.js.map",
+      "integrity": "sha256-aM3q/QSpmX/vMv6wXwrSOJgYYJNGpKiGU73FjqonMgA= sha384-SBaZdgjNXGmRJTneAsjozQdcM2zqADiV0EcPzNGt9NGcZYuCU8umiGONBC8/jCtY sha512-bG1xlfoq1EwCPhdEw+KGV/e5pQTQiairsavxvWRrjN9mrvYsIfbep9Ad9IVfqxcWyRIeqDrLYFs2WNA16cLIyA=="
+    },
+    "7995.d9496cd7269cd13d9c80.js": {
+      "src": "public/build/7995.d9496cd7269cd13d9c80.js",
+      "integrity": "sha256-rTggm7fWuZ+q3eYeJlrSyXexCYbm3sVeOJqrRoj8X0I= sha384-1TY6IJ1Wq9QPPhvZZOxnIzLpaJMG6hicQjpibRUGXlCgCpiGuz9JmF/RcGBk2P/Z sha512-ldgx3uwW3CZWYegZC7FwvsD4aznRaU/GLl827j73LsrlgtJ/stwv3W3dyTDkwRGdUJxafsOnwnqWw+jjSc/jrw=="
+    },
+    "7995.d9496cd7269cd13d9c80.js.map": {
+      "src": "public/build/7995.d9496cd7269cd13d9c80.js.map",
+      "integrity": "sha256-OkWHsfoQl4oGlmuKFeHpf7i5g3GVhLbD4u9fEoDEb84= sha384-E9JPyXbrw0+TC7MDVXc2Q2EBGee0tJ0Df+TbMsPW6K/K2iqTL1s/HcIrh7wmHCpR sha512-BD/ENhKDCT0X1M1nzzEbi13qRHTfhRUAqk4u3EbwrmoUkwo0P/Vdygi1UCsHrhDGjH4IXez0BBu5XYucG7VrHQ=="
+    },
+    "8012.ab340ce4cc0f0d91d57d.js": {
+      "src": "public/build/8012.ab340ce4cc0f0d91d57d.js",
+      "integrity": "sha256-uUAGySLoBw5APPoRG+k/x4kz811WZFl7s0agurDg1KU= sha384-uyfSisn7v5U7RUGoK6rmCz/z6I5mYN5Fm05XnSw/U2NmP/q0XWO4UWhIR3LrcXnO sha512-qBDzkO+tN2igdnu2Ny4mkHKdNNhoViRm/8aNeMI7AlpRQjse+p7F8tXEq2K89pCXZGbqv8Udc1qKKn9554CySw=="
+    },
+    "8012.ab340ce4cc0f0d91d57d.js.map": {
+      "src": "public/build/8012.ab340ce4cc0f0d91d57d.js.map",
+      "integrity": "sha256-FaHAoVugP5hYvDg3cBaifQU1EM49TtobQX8z5VF4k20= sha384-CJzK2Fihvd8eB0iQWOnN7sh5GnBMCGB0XFn0rZ334dsnRfXV2eBcYIRipQ0RBgeW sha512-15AiG9TR9LlicHGiEoZPk4sPxnj/mTTiRpUt3QHPZJnqpN979OPhW1500hfme0zp3F6VJyHgN/mHEfDfmhll1g=="
+    },
+    "8082.4fe9523acd2c5300a4b1.js": {
+      "src": "public/build/8082.4fe9523acd2c5300a4b1.js",
+      "integrity": "sha256-pKx8dBT2L6KmFp3Wc2Wqf6bAOCaVd5ejaKRG/dr5mWE= sha384-Q0TDekn083qmWfr4cH/98611I29VkNubZaP+EyFKZHluUhsP9TSzf3RoEzlQCncd sha512-fPChVQjx3XQfyFkRRILv65yBMu3io3kBDNzYJSaipMFtpgpOBPNaLEWYEYqkGR7AfSwD+TIr6lINR+uC9T4IRQ=="
+    },
+    "8082.4fe9523acd2c5300a4b1.js.map": {
+      "src": "public/build/8082.4fe9523acd2c5300a4b1.js.map",
+      "integrity": "sha256-Srrw2VWfIwC76cvI9ZHFa2WayWttfnCfGUr/sAvOaFE= sha384-U8qFIUdZmbTO19pUMAKACtFloqJLNqng19NBAnKPIJ2fR7BRLhSiyNtaDoEzupTg sha512-STl/w71rMgLEeNUMgldI14VPs/p5hyHBjItFJWtg8BD/tg8p/9glqyg26UpFWfk94EC0V7OVrYQhom9IYF+mtg=="
+    },
+    "810.c869f6029724424989d1.js": {
+      "src": "public/build/810.c869f6029724424989d1.js",
+      "integrity": "sha256-u0UlKSujzG4O7Meg4K/WePGAZ1yvrkca3I40ZDrHLLQ= sha384-ullkyW9AgHw43zLBZsCufFcXZIEp3zFf4/SzMiSzejvv7k3cI/zuvYd2ksiOUW7M sha512-ocR6tp67lF1ur1s7IP+VsKQxlCs6Z4Xhz4Cyjwqs/gjheNaQaJd4HHKwEw5uj4/fL7RY8oBICe8cF3IKTqBYeg=="
+    },
+    "810.c869f6029724424989d1.js.map": {
+      "src": "public/build/810.c869f6029724424989d1.js.map",
+      "integrity": "sha256-WwSmC0Zk5YJxzkUMpJTEAkJTMCL7ptyavmiPHcOzqCc= sha384-dau2r9MBquhCnega9df1Wa2w2lLERhfQjme9uCYCaSjnajd/98Cx2ZZV1dhVR7Ak sha512-4zkQ2cfjKNuw+k1d1LE1vV1WV4pOCFmH3uwfOTTDJjxpG9i5sDNtVtu0B5SYzv9qzCptYHCTN//0fAKrUQ0img=="
+    },
+    "8127.fc2d3b4874b645360072.js": {
+      "src": "public/build/8127.fc2d3b4874b645360072.js",
+      "integrity": "sha256-DDc33E3YCic7IsO+2p1IBERvh6TkHeS6WTJ/klxw51A= sha384-dkwaOgYUgTBtgnD7y8H1NW1gEcAxVV9W+KQLOSHVdttYOqoLEzfGYkLzd3vNT1sQ sha512-sMNGDQxCHibs5hfkSQ1ITge3gHurTFPnUu14czj2EnVV7Pf7iOmCN0EOTZD3n9BZWGLBTfNMAErbuHuCnP2pYA=="
+    },
+    "8127.fc2d3b4874b645360072.js.map": {
+      "src": "public/build/8127.fc2d3b4874b645360072.js.map",
+      "integrity": "sha256-dJQ7aItgExf8w911RPMjrtfCcVggNZekB0++o6lsXFM= sha384-B5A90IartlEMTi2wXAOQk+1fXRS4a8vahEoXy2lntX4DPrtkkLRBEeloaLX27ntu sha512-mERlyUSvh9Q62HdhDdPN6SiZ/XyoosxbObmO8hckd5iD+3aEJB0wMp+dgqjmVfAK4x82GRqghS7NVAhQiOyXGQ=="
+    },
+    "8266.a08ac2157b285f94e243.js": {
+      "src": "public/build/8266.a08ac2157b285f94e243.js",
+      "integrity": "sha256-oFMamPz42+U4sDKCAwrcNk62W5jCqcuCxKmDOrel0p4= sha384-fjHQvXe1VZ7dDvlqClWebUcfh4TQwFQ2mT9tL8qm5dI7GuEAOT1DArMB3vHCLRTa sha512-98lp4BBr1MgLUImfG0uAN+sDFJaOXphCdK/T35tYZ4SG8DvBOp/Y7RGsV5AQ2+UdL27Osrv7tHZvk668eCr+oQ=="
+    },
+    "8266.a08ac2157b285f94e243.js.map": {
+      "src": "public/build/8266.a08ac2157b285f94e243.js.map",
+      "integrity": "sha256-aXuVSm9taMjNOa5vGikQtRwFaL5odaJLd4n2nGZy4+g= sha384-69KOZhDWT6C9//hTzitM2umS2EFqiXjtgBlUdvwmcneVM440VfZ3oZdhPNGGLrvo sha512-+cG5yhd/Qfn7PnfkINk5d0hyAbDHIcF0iZFnQlIuoi3XT4V6loZ2hHULMHATKVMT3EoM0JPmgwHuRNgr1GXneg=="
+    },
+    "8269.34a406a621fc1aa57d02.js": {
+      "src": "public/build/8269.34a406a621fc1aa57d02.js",
+      "integrity": "sha256-BnyxbwSUBg+jo1Kv1W+0XCR4WeveDRlLlAMuNv4iPdc= sha384-bxJ+aSRhsrZEDVOMhuSCkF3eCQGtnY6iJVqEQ8a9XDSh+7paGOlmEoUog8rxCOoQ sha512-3/3vWRXfmO8PaqkLIQ2+/94nRRW6XsM73yE0W8NO6MyjfrCbG/iL1YG7B/SP+ZW//dagaXRq8q1TqskBBoki8Q=="
+    },
+    "8269.34a406a621fc1aa57d02.js.map": {
+      "src": "public/build/8269.34a406a621fc1aa57d02.js.map",
+      "integrity": "sha256-O9HNeuv7ijvx2VI/uzSOCSiSFFQf7aJjlU/0HicRSPs= sha384-MaOuqfw2yIrZgkzsahOmVPZGKS3DfBy3hHBoZnjyH+5TQYd75fveqUGDohs3O5ze sha512-jeUg+RuT286zsiZt4B8hDLQC07GCqUhLQoaUiavoJ/hVFJXs9JGlaQV9ce6234e0EYYydbUC1BKElEr2B6Xsaw=="
+    },
+    "8296.809bdf3db1b4f0f14b27.js": {
+      "src": "public/build/8296.809bdf3db1b4f0f14b27.js",
+      "integrity": "sha256-lRh+vS7LzH0+wHwx1XqvYgfKzBf6DwczpxzwecVe3lA= sha384-k+eHpT+UBe1T/vS2Yr389mpR5i6FCagDmTrM/ptgTOEp1q7tli2iz7LAZhanMrZW sha512-WbO4ktEMlyy6LEEA5peY+M4qNKmBpTB4+RV+M76f1jcThpoM1eoyYvmDiDV7a/AjoQXdDrTU31TVRhRahA08pA=="
+    },
+    "8296.809bdf3db1b4f0f14b27.js.map": {
+      "src": "public/build/8296.809bdf3db1b4f0f14b27.js.map",
+      "integrity": "sha256-BvVpBydKWQz7YMmgp6hSrnOSuP/wjga+VI6c7vLgaBE= sha384-uIz6qdJVSduKuLfkUUY8aQXBPJNhs4ubJRk19DQgcdAp6jJ/W7w9dkudTp4mNZiQ sha512-fLe+0MtUr9pvs062PLXy/d3DYeY//VYTbjrWl5jAPYQ9OFizpaP42+A0CDJQOOPBkqeX+j8yzQDJbO+dXYDiCQ=="
+    },
+    "8541.84ef5020894463684e10.js": {
+      "src": "public/build/8541.84ef5020894463684e10.js",
+      "integrity": "sha256-yKR+NXC9aHuU2y9ogq1KVB9NrCWbPAsK9nPDuofxSVE= sha384-y3ULs/oGz+g/h6XYGVnXD2/d7aCjfDT66Fi+AvHWkg9Sx6D/FXAmenHmKcMicrhY sha512-aOXhvY0gZsYC+jxiHaYqztjESCEJCHShko5VbXk8Pd3VBLhKKr2bivueT2iLHYwampwC0SFNCM4IcrO9XWYQvA=="
+    },
+    "8541.84ef5020894463684e10.js.map": {
+      "src": "public/build/8541.84ef5020894463684e10.js.map",
+      "integrity": "sha256-Hu3p7achW07513iahYnaby4qc22fjVYSxjI8bdev13E= sha384-Ge53PC+nre25ImN++mFJZ8wgH/PTV3DywZ15mPR0gqrNWVybR1+5zpcvFo42ivEI sha512-ZJ8PQL5ePaU9qWTtCT2u8VR3y9ppOmRk0RLsO5wCYbIi5EzYP9Affho2bRlk4+qZtT4T/vJgdKP9ArecTvRICA=="
+    },
+    "86.c89ae29a06ae86bcfadc.js": {
+      "src": "public/build/86.c89ae29a06ae86bcfadc.js",
+      "integrity": "sha256-F8kI/0NzQz9xazah0T/+yaEuJ1SOZaVHxEY6pO/h4G0= sha384-S8aPyi3X/E7LnURAWsFy4p0GVrUfZTeQVNLnUOkr+HrnwVFR5WGDpLw/YheT7Gw+ sha512-9mrDY4TiFInlTXSvaXuyoVYYm/J0+IGjTBPOyXBgqXbl4TR94HaTKYj0yVevPHzcW3rNmkb8uWm2fRiBPzGURw=="
+    },
+    "86.c89ae29a06ae86bcfadc.js.map": {
+      "src": "public/build/86.c89ae29a06ae86bcfadc.js.map",
+      "integrity": "sha256-nnoYmaT5cDJIJZtMU06yztcueqqoKe3GoW6n3ChavzI= sha384-Kj+vjApGloc680s2JZ4NNyWgh6zBx2kfrag4kcSrpkcextpXUaeOwxfHEOsLnwG0 sha512-mRCdrxt/AhEv22Q1b0VQOP3ai8Qy77Ixz8y6pP1h1q5YWzWXpTO8zfMM5Kqipyj+OKQKFUUUPBodUoAh6a0c+Q=="
+    },
+    "8615.c96ef058689b62a690b6.js": {
+      "src": "public/build/8615.c96ef058689b62a690b6.js",
+      "integrity": "sha256-cy1Ebg7h54t1Lk7lpNaDKWANDKwSOv5LA85L8j2JgTk= sha384-FcC1UA4INxJBwz9NH9pFC4UeM4KZlqCRilfyp1R99BQva3Wy7yQ9MLsCRhNoDb5/ sha512-hxVgiXwZ0d1hDUz398rDRdAxiHBK2uS78U8ufxjHojyiy9CH10B9fzTW5rX0rmnA8KQlkluPePgB4vzXk5DqQQ=="
+    },
+    "8615.c96ef058689b62a690b6.js.map": {
+      "src": "public/build/8615.c96ef058689b62a690b6.js.map",
+      "integrity": "sha256-IfkfItdOj9V2sSuQYr2NUl7rsYVHyaKEBWPgM5/2txQ= sha384-IURKYEFi3puLkBIeckBRlYfd2+eUYBk03wEU3RV9Mt01EyBdFVAjDAjUiPNEXHRS sha512-Sz3VOOZCmCyUungUC7eT2E8ru6PBLhNxQA5IzummD8vJe4oO4V93fhjrLGFduA8DY59uoiD7YR5C9+Vkme/rSA=="
+    },
+    "8651.cb33d52b6f3be3eca4f1.js": {
+      "src": "public/build/8651.cb33d52b6f3be3eca4f1.js",
+      "integrity": "sha256-yTRmDJT7sFW3DyVfabXJJ49ODt1qKfHxjQ3mwg7DLVU= sha384-RM/mkUHsVx+1yjMBSFiaiUzOIJQB9d7JHE/1FAYXLWmTO+EaXbAPs4SL1lkc8KJ3 sha512-ntHg80LfIuFiKEsR9S+KQbsy+skl3/I/My1bzHbsmJrHYha/iCXxcb1zu7ic+KucD8xs8sIXfq8xj82TcoKm3w=="
+    },
+    "8651.cb33d52b6f3be3eca4f1.js.map": {
+      "src": "public/build/8651.cb33d52b6f3be3eca4f1.js.map",
+      "integrity": "sha256-I+YGvXCTGeclCKTDKrIpVCaMjuKZr1IPNF8d2q3wUKg= sha384-55U+QCLwfbiX8xyBlID8PmFdIuGFR8eKPa6JU30aZzxvzw/B2IT2Bus7cRdk2bM+ sha512-35Ua4yCiCfNtULk6DyRPn6PWFJZZpPftPmoG/ytmsC0LX7yCuL/GD2BKC+AiI/cfSbwa1YgX2QOCg1vlv1HA1g=="
+    },
+    "8719.3130c99ae56acf74fc19.js": {
+      "src": "public/build/8719.3130c99ae56acf74fc19.js",
+      "integrity": "sha256-hBEZbgoAoTjdsXxfmVo+PgVTjFEROsn+fLE3LfuLUyI= sha384-SBm2A1lejZhQJTUShbmaGfhOJofh/Jw0tBZQcj1Gu10Nzf0DXbtzvceRfNfefYkr sha512-4snu3iC9XxcIx/J+fn+qXWIZdKXaFC23juRSAxIwm6oH+ulNvEQJzSXQ5GRknh1omweqlJ7DloZRrefJyh3Uag=="
+    },
+    "8719.3130c99ae56acf74fc19.js.map": {
+      "src": "public/build/8719.3130c99ae56acf74fc19.js.map",
+      "integrity": "sha256-J8lZxjznUFCZd64G8bqJcsdnXPqTh6kKbxl2AXGh+/8= sha384-Q9P7djse9M1E77o5Sq++P0NKAlFbaWJDEbAoqJYeHaUlOCTWFyZXTOW7U0O5Mkex sha512-rWEuHiqATKVOeLpe5rwm+irUtGaU04Oum9Ma1DxRxi1vcG4g4rULFqTkX6sAF61ge2IvZwZQ7E5lPv+uLXFwHg=="
+    },
+    "8735.c75126652b902567c33a.js": {
+      "src": "public/build/8735.c75126652b902567c33a.js",
+      "integrity": "sha256-QtZ1Ev9ap9O0spM6oA+0QQIuAriaVa0wYqdsAjMa+zg= sha384-oEmNQK6sjsGTZSStL2FWEr5hpZhgOFSLEqoeyO8GSnAfJF4dLzNgqSZ3X9VvA6lz sha512-045ysqGBOJLhXDtHuORBKW+J3fedOPKu7tErzuYRgiVr3dVGshNf3sKpJlfo1nWxlGEsH2bJJzu4gizi8lDyYg=="
+    },
+    "8735.c75126652b902567c33a.js.map": {
+      "src": "public/build/8735.c75126652b902567c33a.js.map",
+      "integrity": "sha256-r3Uey8FxqUAt61IvpzEFzzDDnj4cyxpSfY51aoLMFrg= sha384-mrOhXq7W79+BjDwaHCK/aWlwNhWaAx6IvdPdQmFtKjkzk5l+xhkm0XirDLpBbiHj sha512-NHvLEd5pfM8XM/7AP3shwtu2v9lzopOn7oJ+V1To1xoxvSs6PFMe+Dm1rst/tQVbgXN5bcBb0Mge5tuYmiIwcw=="
+    },
+    "8746.6f548e3b235c0af521a6.js": {
+      "src": "public/build/8746.6f548e3b235c0af521a6.js",
+      "integrity": "sha256-brN7tQZl3nbz/j+VP3RmgVHy8ncEEsdap6L0vogt4TE= sha384-s1oyFegy3/YiOQREitvIPD3jHyOpKkoCRkTWxIoD1Y0b6LDiLCZRzvEYwHpR/Uml sha512-eFce0RLoBUKtjFrppJwGrkjObVrXbBkFot+aYuGYMCgoHC+Fsx0deN8euTqPjSwLXkpxgcjQBNMwAZHcr86oxA=="
+    },
+    "8746.6f548e3b235c0af521a6.js.map": {
+      "src": "public/build/8746.6f548e3b235c0af521a6.js.map",
+      "integrity": "sha256-IYoTlgqS/mNZ+7ZJcth0sLZJ3wDCE0OGkReFUz63pbI= sha384-2NRMbJX/4yG3Il7rE1JzjWwJxICnFq1dn1AXGSTuLRGOiZCzRGiRzUwm9fD1zswP sha512-8jXQybBUK813iVxS8MV3yj+3TEAUjTfNn8CIZ+nCKQvT2xTGsgxin2S2vqX7M1H9OkDXUqXvC+k0KhfM7E4KnA=="
+    },
+    "880.62647fd5ccfae4357773.js": {
+      "src": "public/build/880.62647fd5ccfae4357773.js",
+      "integrity": "sha256-PErSTdCfD2I7oqPZyjADwCiD2V8TvStc9ljB+VLZjOE= sha384-brX8vFneWhJ8bldhq1mdD08jnU8ddIl40iiPC+92ncPD0sNvKTgM/q63z1UNXZyH sha512-RVABDuczbPprQaALAeChbdFlc320wuP/Lw8955HQj+OhWO9B4DLtAjXOW3i1WskQyLs8XZbDE+IOXcfZzg9i4A=="
+    },
+    "880.62647fd5ccfae4357773.js.map": {
+      "src": "public/build/880.62647fd5ccfae4357773.js.map",
+      "integrity": "sha256-ZadTqwnqlK7EpP1QIMI/KgjNpdzrEbQZbXsjWoC8A10= sha384-B3Px6yW7URz71H9g6BuTwSjcheBJZupYMthrR1Qxf367HxsQL7g0aiPWUCEDbXEg sha512-0epWb1FXSTM2xZ52/cXNtEZxhY9neVtlQ/nhrnSUrUGMMQHlWyxkVGkBVpE18DgkI/B59+bXAOB9wv6IJNL6ag=="
+    },
+    "8811.4bfad926cde0ae8e6fff.js": {
+      "src": "public/build/8811.4bfad926cde0ae8e6fff.js",
+      "integrity": "sha256-LSG5msy1rOU1AqQArRv90U+ymTDBp6CEiZT4XRlI2xY= sha384-qu8doKBTA0WSmXWNEvGR1D16dMETZ24kzE5tb9ncG9zDYzrsxL8262VrFLDRmnS1 sha512-vrzoBgYiRXsE4sVPBHSMhLrek8tT4B50dowCxIlpyw8cyk0sX3TZtkOq4OU/EGLwCO1+MpkFH6/UbKZVtPte5A=="
+    },
+    "8811.4bfad926cde0ae8e6fff.js.map": {
+      "src": "public/build/8811.4bfad926cde0ae8e6fff.js.map",
+      "integrity": "sha256-XMjcpcxj/INs05/saFeqk2ZgxVOkbRSdkE4nbtodubk= sha384-tHcg0ZfrgXldMdQDxtYsdtsZ1AS7mOjgKyasBnWJm+hZWNAhvUDNkejlUJpFIfBj sha512-G23WECkJ1a1hVj2az6kOz1oZjM0z5+sBvSXmS9q6gWFcB2Ev5X/BB5WD+InOtph5ewhVdJRz4kDCDuCfLEe1LQ=="
+    },
+    "8990.327925cc38162a35998f.js": {
+      "src": "public/build/8990.327925cc38162a35998f.js",
+      "integrity": "sha256-y+AeMVOjmX9a+7e0M/aO5isF7cLgKxkMKXnNC5X9Q8Y= sha384-os5Mh9073VK7VmA3QRmfbOEO1Q1Zv44zJa9sCBbnk2gxtpWaeERbGe2oBEs+AfsZ sha512-Vf8iVD2HkLMdllwtsqRd1dS1posTtpv+Le2LXs0oZa6E6Vn/AnhtoWdYfdBesnfxBRqGxS/uZKunyWgObVF3LQ=="
+    },
+    "8990.327925cc38162a35998f.js.map": {
+      "src": "public/build/8990.327925cc38162a35998f.js.map",
+      "integrity": "sha256-RIB4uL+nTGAqZ43hSsKMwQKPouGKGw0AnD0UYd9axmQ= sha384-8lkU3HJ6sZx9d5P/XNt295/Lk5M5vQDeW1GV9EqLNfEszqKr8aOCswZG1y2bnpkR sha512-sq0I1TPZvRAecP+m0iGFzKtxE7ao1tOMjcRAoEg3SikJ7lNT1oYRfLeJk5dJW0FrzXT3/2oxaMaI3+nZ36cSYA=="
+    },
+    "9095.e8405026e63c490f8ae8.js": {
+      "src": "public/build/9095.e8405026e63c490f8ae8.js",
+      "integrity": "sha256-vfZ8vFvLTRlvxRoCwjc3KMpav3uhS4KABFx+thzdxWs= sha384-eKw9/f3H/mh+Q/C040wZOsYaQcBouNxHxLi/XdbhLTPJaPNyXouBZUXrpG1MGkIQ sha512-Y8WkvoR4eU50uA8mFIAsNyzW9HMxmBvbPHLw/OIJl0QSQ8GgvzsNUOpjBX0boXtGFxkopkKSDUAPL8l6iruPUA=="
+    },
+    "9095.e8405026e63c490f8ae8.js.map": {
+      "src": "public/build/9095.e8405026e63c490f8ae8.js.map",
+      "integrity": "sha256-IKwZbv+Klx7EW+1Zp+eDIBarLRcJ29NXHRC2SNTfveo= sha384-/rvdOTzMM4RaTwznKNUxo6feV7+lXgVAedN2Yftl1W9xB1Eagvu0zkfhq6i02WPE sha512-jOJ8KylvQp/BbVjPxfXhwIYWC9fgefVAfJuYBus+R8eGr3Ns0My+QgRzV+klHblRDqTv/phX3H6kJFei4fIM2Q=="
+    },
+    "9112.1e5f1c2242c922690a11.js": {
+      "src": "public/build/9112.1e5f1c2242c922690a11.js",
+      "integrity": "sha256-OgCTNzkVL791+yin0SzCl+91lVDDZf0vrrF/2lX7xWo= sha384-13u3YvsWyUfEtSZP/HjUkF5Ldlj6TTpGgcgnHzC7FwgW1evaPcPrm+t+Ig3tqcKF sha512-4qeBU5v8haN0xO2NOWcNogLRj0IxYqcK73OQU/azcbILVSOD4S4HVxDiAeOraSTMXgFbnW5KkAfEhqAAvxricg=="
+    },
+    "9112.1e5f1c2242c922690a11.js.map": {
+      "src": "public/build/9112.1e5f1c2242c922690a11.js.map",
+      "integrity": "sha256-3gqpq5UMXDCNnmYgTUlatqSn3B3WiMOXbhwnz4MXBFM= sha384-OSrjE68Ape5pKPjbB8EGBnZC2Acr4/aGBBOc4BteIYvr1X+zBMv6Grs27RjWfsLS sha512-EjeJPH14ouy3oY4owLw9r+AC5SX6Y0lTBOIXQbfvGkLVjjR8M9C/Ac5QV9IjQm8pv6mC0iOtK76JJRswKfb48w=="
+    },
+    "9119.44527391d7d0e0258302.js": {
+      "src": "public/build/9119.44527391d7d0e0258302.js",
+      "integrity": "sha256-pmgdoDqBnkNmVuwT2TZVrTAMuwT7CyqHwOwSOd9bHn4= sha384-NM3eM6aA4cW7RNIeDCMfmkOezDgMXREr/8jWCv3iNMzfpQ6kli+/X0AcqiQIiDt5 sha512-G70yr2WnMT8eC/YdIJheXfcCiHx+L/QTaHNZ/LC9AbHEDY+O6CTurXB10lS95xvSfyFZPzbHegYjFBuM806Log=="
+    },
+    "9119.44527391d7d0e0258302.js.map": {
+      "src": "public/build/9119.44527391d7d0e0258302.js.map",
+      "integrity": "sha256-WnfM6mR0UfXEfAazE1bdZGxbKl8lJMq6n0ghGFnbTFc= sha384-iFrtv39zWcdACv2jP2tXVGf/0ZW4mmMlpZBR7PqY7iEIXlh5/rwMp6fEqF4JUjmS sha512-4a+TEsv3tMIGwXq3b3bkaBbP3FWwdhPQoIJ6hXkJ/BCAmRS2Idl1gJ3EwzfSDLfNGXNSeyXJ0lyxTJzw6uLZmQ=="
+    },
+    "9122.5a18d2bba1e5b3874b24.js": {
+      "src": "public/build/9122.5a18d2bba1e5b3874b24.js",
+      "integrity": "sha256-51tv20IkaILMdHR2W/SW9X//oy+w6OPfd5WU+FNskM4= sha384-hnxdk31ao49PkCPiY+gzM8/76BIa9BX5NdHtkAu5yUSAXbZZhkqZqyjJUABnsMk7 sha512-z6JsRakB1PPWPcWiqVFHagH+blK9uNFsonThw4svvDI3UdObPaiQYNig3luDfZ25wUV5wXIs75RXdhjcL0Mn3Q=="
+    },
+    "9122.5a18d2bba1e5b3874b24.js.map": {
+      "src": "public/build/9122.5a18d2bba1e5b3874b24.js.map",
+      "integrity": "sha256-crvb43rVh2DGrWY4jFhDZhPuBtRbJIYLm0/ciOCMEYA= sha384-cj8IUtJEoF3lquGX3cWTpp2NxbByLp+U6gyPt2ry6kYhKqCFJz+cqjLUlemOC8/9 sha512-4CsquafKDKFbNEM4pltfxkNMUcDzzqEYTe6aM61R71wZ3U6jCdA4StcNlvG0v3U3VmFdkJB/EYivy5+SC8EVrQ=="
+    },
+    "9133.aae01e25b740e175b43c.js": {
+      "src": "public/build/9133.aae01e25b740e175b43c.js",
+      "integrity": "sha256-1JOnjGO0X9NJWKWwzILhhveukdulmBrov73gq5/jvHo= sha384-qJOFntiv/spvo+9BBFdIIPXfSae4jBFkS9vDFqJpvKYU+v3xyYLKQfP1KTg317YO sha512-69nzajsQKOExbvBGjBk2qf+/VRBDZ8SAzIIh4Y498fy8pKiH61JYCG4KEOJr4xV3tlRVs2EkJ+U/tSuoeE+hBQ=="
+    },
+    "9133.aae01e25b740e175b43c.js.map": {
+      "src": "public/build/9133.aae01e25b740e175b43c.js.map",
+      "integrity": "sha256-wE7FmvobeqH5tCJQFilo1bdR9KayrcylhHOfGApMpnY= sha384-ooJ22KockUKsduP80VlLYt6Vj9Mo4Qfw1bkl7XTgT6CTZF/z9OgRqvJ1Lvg7CHj+ sha512-gIq67xXJAgDo9b7FJ7qHo/bcmYUIFP5NN89QARKsojq7803HvwmR/A+ggVh5Se4X7BrDlTxivmoiiCjxr4uDww=="
+    },
+    "9191.806aca4c8423987d4dc8.js": {
+      "src": "public/build/9191.806aca4c8423987d4dc8.js",
+      "integrity": "sha256-iBalWp7t5TU7/FJBlcUY4ZoY5Zvlw7Fs+qY7ltEOYno= sha384-lOZrSD5ndzF6U4rNcZ0jg0B+SjF23whFOSLdvH6ryXRQbKwHe7wnH6WHKnPWLOKL sha512-ExpEZjdZVciAN/RnbbDFAgVdKC2B6IOiN+bCmQK6AYSokuj+Q7yCev++q3nuzkpsJupqht8WbJ60Vw8dRPS4Rg=="
+    },
+    "9191.806aca4c8423987d4dc8.js.map": {
+      "src": "public/build/9191.806aca4c8423987d4dc8.js.map",
+      "integrity": "sha256-m8OckWvEu7fvCK2FeTCBtJ1ESnNJbXJERFvKTwjD0nA= sha384-jn+1Mv7MCwIvQ6iAEw1mYLuFX3I7dXmIqx39P0euppQU7hjRZmM5+UCoD1MfO/Sm sha512-YarcUBM2+JRKnLVAtS/2etNW8EWyyKrf1At9xTvFWrrsZyyegovNaC9gznB9QR440QXDchODnBfHw/HkTryhgg=="
+    },
+    "9289.b10a0ab9096b7017da10.js": {
+      "src": "public/build/9289.b10a0ab9096b7017da10.js",
+      "integrity": "sha256-9QakK6Igkn3XEi5XcRRrZKyIm/eaRxBMbDbYqirVgMg= sha384-Fj47gr0GUhkaf0MKm9YfdXGWv2zpvpZWRMcYvDjQRkUM7VNP2egqK7/cNNK4romZ sha512-NfhLFJiW3E0jXNM96Pn3gesBfUWcgO4gL6mUahQW9XkENqYuSb0dL3iGP2lYHiWKiJjpclEaCsQ0qYnyoyUlYA=="
+    },
+    "9289.b10a0ab9096b7017da10.js.map": {
+      "src": "public/build/9289.b10a0ab9096b7017da10.js.map",
+      "integrity": "sha256-PKBCRZonUFCuIerWIS6f2NMAFEe7AKZgq08dXha9NMY= sha384-wO8x7zZbsu7jbmwaOZ0EuwpCO8jJF/bRMXGghBo7qe9hOCH+hY0MNyobqSS7qWkJ sha512-3v9nKFe27tMopw5SLhOO7ZcjjcEBrIXe9aE/ID6W6NQsx8dysczgoxbdFtttjU+AukCq09UMfPyMsnbJtXtbNg=="
+    },
+    "9371.6b320063a5d907c0cebc.js": {
+      "src": "public/build/9371.6b320063a5d907c0cebc.js",
+      "integrity": "sha256-tRaxnkSKSm07UMyxc8Rnyub9PeZrQjr/E8uSQVRFXOA= sha384-YEsAwNhVlO0IUYN2/MoyOiEVLzjSnIRGcQxqIb4vHcwhbfJK22HY6CXzvccy7nHf sha512-NXpIS87LQtc0schB3aAXxDVHCIqlHc7QsEgJTDe+vB9M0aBLVdhtKXfkB/0dG6iqJjz0x906L38Sy9OT//89VQ=="
+    },
+    "9371.6b320063a5d907c0cebc.js.map": {
+      "src": "public/build/9371.6b320063a5d907c0cebc.js.map",
+      "integrity": "sha256-vuKcBmBsvWjJBb5HQn0ywohq0DFw92zaIXIT6T88bOE= sha384-c1/U8WzqD7hBvOxubAZN0HYLekVaC/SYkZXrUX0jAnB6v+Y2jkJ0sQtxru+yxjL8 sha512-yKN5QrijfBkObTY2ky7eSniMUilnc8/9DTgO7qOX5pAbsvrPkkK2EuABSIO/bF4CNLLSOUNo3y3Hjf7vDcizbA=="
+    },
+    "9521.d57fe0b58a4cb6d0d606.js": {
+      "src": "public/build/9521.d57fe0b58a4cb6d0d606.js",
+      "integrity": "sha256-k76HCWndQ30h8asuWAmlxYq0+0nDloKwEDLPfgG1Gnc= sha384-tg8wuv5WXhYzR+k052hlGb6cydkEK5SlxwzP71R6gypum6KMaVLhcRj6g6QeiRUM sha512-zY0tU1IfzGyfCB13xGlJv64insT9a5acE4PKf43G1C1uf+fHX8Pc1ifWCe2fwEoiC58B2AQF3Ud57J+rNdSPYg=="
+    },
+    "9521.d57fe0b58a4cb6d0d606.js.map": {
+      "src": "public/build/9521.d57fe0b58a4cb6d0d606.js.map",
+      "integrity": "sha256-vPRGh6fuGOgQLOiSJ4cI9380u8KCn+kcE6lSHvegCz4= sha384-A0KTb2gfmdeufWlB76tsdjfQL0NP7ZjYyllVXduiDd+BIMOkc14hwYguoemB+e4M sha512-XJOLH1CQ94W2AwenxaMlMfmMLFO7oVQJbUqUVPOxKlmc5X1Q0uAhHqGyr7NZxek/SIIjxTLykZRoM2XFlJ1Aww=="
+    },
+    "9524.300cc988a37e8befc1fc.js": {
+      "src": "public/build/9524.300cc988a37e8befc1fc.js",
+      "integrity": "sha256-oB/Am/gdEhvyN4qD/rSEo2GkOkKORWbu+qJRA2YK3CE= sha384-QNrehkp5agCaAhL8X1h8oFBt7wNQNeBunPMaA0Jhw8vZpiOIcA+TJLouaYfDVhKJ sha512-octCCkRdid384Nf7kWyejXXvKRafPK1gv2i5h6lYsDml/7h+1nkOunZIhfsNVfTeXpFrrNutNq7ObauvcSbGXQ=="
+    },
+    "9524.300cc988a37e8befc1fc.js.map": {
+      "src": "public/build/9524.300cc988a37e8befc1fc.js.map",
+      "integrity": "sha256-Eyt/uXBhD/Js2jDsjkJwrsUkmMjqClB9aNUrpMwayPU= sha384-iioD2gRAZ/j/pK6gXwZkzEvPWbcfnd3M/xunJG0KhHYibqdCIZsrJeQnin/SnkbH sha512-cNi+jo8DOgr9aFT4fae0fszoH78YyqgxkBmqQAdykYMUH9BCeXPQmwHkuhpBCk9llGvcmzB/TeUZ4ARYg8eZkQ=="
+    },
+    "9601.c32884f70725148d69ae.js": {
+      "src": "public/build/9601.c32884f70725148d69ae.js",
+      "integrity": "sha256-ejaFOfufsTxdhSuq53fkghc5A7pJ3GL0B0aYqWEqBVU= sha384-3gWXTThTMCY3atZ7yxM6hJHVd1PabmD6VCr7a/cbazfOTlxnGrRSfqk3w4EXTcLB sha512-wvHBCuXljchhpk/PSDiP32fXJ+YBw9edqVjDmmN8UrvfOnNmoP3tOCrUCdRzOkDIf2VjoU0y86FLwS+vBSmi5g=="
+    },
+    "9601.c32884f70725148d69ae.js.map": {
+      "src": "public/build/9601.c32884f70725148d69ae.js.map",
+      "integrity": "sha256-HwXASAvdKINM+mzN+coiFj5ZZRWGFWUA5INoYkKjM5k= sha384-ElyMdHqugJXjawxAMIUTEH7d/F2TweEeNd7/5UK4Z/ueWAszRoCCkKm+Z2J07RzQ sha512-07g7xRZt1HL5vjW3IoMqgYpc/LYPa+mL11piyglw+fSkcTw/bD+fNCfeBEoaVERSLvg8/YaU8zkn06HWNBpHLg=="
+    },
+    "9652.1787146be3f0cbb3df06.js": {
+      "src": "public/build/9652.1787146be3f0cbb3df06.js",
+      "integrity": "sha256-jK5Ctqn37+Yf7Oi/WdqsTaWkeS055VnspulKZwEDCjE= sha384-6eqByTFURhjbmCi03fyDnZN+om9LAXLiugyxhdeljSzDhkJVwCbW4EJu39nVSPSx sha512-fdzwTP2Rd8St3uAZFNMJ6umzT3RliBVMwlm3rxZaXwGD2Bo/9cIT5ITPxXURSC6A8A7iZCn5yji5c0OLXQjBig=="
+    },
+    "9652.1787146be3f0cbb3df06.js.map": {
+      "src": "public/build/9652.1787146be3f0cbb3df06.js.map",
+      "integrity": "sha256-YbKtBZgdjCkJdhrwm8YqiaeX+RUcYvutquBn49cbrbA= sha384-NMb9HMS6MGr31aCwz3XeGfTYxrIiQrmc0CYUH+4tPZfjthDSeOW91sEUfP9CLpzZ sha512-I2GE5nQIO+PsxgQS3y/bMKInNnrrVnViVxVfrHTwn5y1npOOrgIagnrE/Dsz0v5ImOlUsNhZiNUGOFC6oyKNgQ=="
+    },
+    "988.3117daab08d33416e8db.js": {
+      "src": "public/build/988.3117daab08d33416e8db.js",
+      "integrity": "sha256-u24AfEd6K+wFfBC7gg2T4kI+2E52YIUO7g+D9rojTkU= sha384-OUIXfW+gsUxsIuKLPxw1UddsPUsQq90A/ZL4Eyeae3vmM9EzjOA/Xh4jLfHc16Ag sha512-2fobucYH1JCGWssXm42pMBVkxvp7OKjJi0AYrQ+Q85fw6L4bQd30Hj1tNoGGuBgdP91HVd5SCxRn2aq++ZTxdQ=="
+    },
+    "988.3117daab08d33416e8db.js.map": {
+      "src": "public/build/988.3117daab08d33416e8db.js.map",
+      "integrity": "sha256-yvno3xjYh7SnoqP48o5MyijsV0UcDLFd5zg2aGf59ZA= sha384-5Eg+Cdh5futRsct+zi3HceH09EnOFL00C74sWb+MON2fGsAGZJqkwvHn2m32LT15 sha512-vBIXdW8IEHdU1BcjR/bpKvKGcHoGtp39gaRRNTd9U02Oa+7Yf4d6bshE72lVkNhWVhLbsmfl7xO9O+E5bdgbdw=="
+    },
+    "app.0439db6f56ee4aa501b2.js.map": {
+      "src": "public/build/app.0439db6f56ee4aa501b2.js.map",
+      "integrity": "sha256-YPm3dnwCReFUyrqsbfXV+aNFzpwBfYh6J9AkvO5RExU= sha384-V62BdOeZuZ4v3xWS17/gVmCn18lVA/gmY4jNKEhbO3GPGLnQNEukzqZZ0V33L/ts sha512-CODBINnmIH36XtaOX/mEwnWaAOeRJn5ZKs3nf79VJ2KQLtcPswSvjUHTeKqUorbfOL6lO/BCgyGGoTTVlUTxdA=="
+    },
+    "app.js": {
+      "src": "public/build/app.0439db6f56ee4aa501b2.js",
+      "integrity": "sha256-q6muaKY7BuN2Ff+00aw69628MXatcFnLNzWRnAD98DI= sha384-gv6lAbkngOHR05bvyOR8dm/J3wIjQQWSjyxK7W8vt2rG9uxcjvvDQV7aI6YbUhfX sha512-o/0mSlJ/OoqrpGdOIWCE3ZCe8n+qqLbgNCERtx9G8FIzsv++CvIWSGbbILjOTGfnEfEQWcKMH0macVpVBSe1Og=="
+    },
+    "dark.css": {
+      "src": "public/build/grafana.dark.a28b24b45b2bbcc628cc.css",
+      "integrity": "sha256-jO3tO2VnIu6Rl8QIpq4rgw4Gqap0MlEqpku9v1JGOjU= sha384-Ss8rDO0Wo5gL536UcB45IeODOOl4uyLCXRQd3T8uthyAQ2/0QuVu1sxfaypdtOnK sha512-2HEPGHMfrbWJdEuXh5DK5YV8lLm0VnRj6LqoGmIb7790bfTNRm4HHue2j0xCuLvwFAxft4oBRyi8QpbTgW7BbQ=="
+    },
+    "dark.js": {
+      "src": "public/build/dark.a2212d3486121d8d85e6.js",
+      "integrity": "sha256-51CyEa2jLesSPWazP3irvVG83B6yf+yHeUc07ZWbftQ= sha384-0ybs2PG30lSYw0nJjpQjCaHDrin+YCfMkhSmQOkzKrgj2+uLVKnbGHiOe/Il/ppb sha512-6Sz7RV08CleDTRcjlqW/iRdc8nYZYX4a2wEgUIYa2k448z95sCv7d0bv5HZSMOlpMsBD6MPYSnjTmzdFwbbKCw=="
+    },
+    "elasticsearchPlugin.33a3fa3a36d580167bc3.js.map": {
+      "src": "public/build/elasticsearchPlugin.33a3fa3a36d580167bc3.js.map",
+      "integrity": "sha256-JyAvNNE07BYMMf5egEhZS2gWKwjM1Mxwv4CaiACYpf4= sha384-X87i1y7GhJYCdKXThnV3M6MEXi3hQpIpsQPTdTZGFf8K7vbEd/56Yw+HxiRoBwZf sha512-utHH+6x+MhPMF+a10BnyrLr41VGoZ5VRcKQNqzILa+n232Xtkr/qNwy0wA9b4QHyh2/vmQ3xnEKhDOkgh7URGQ=="
+    },
+    "elasticsearchPlugin.js": {
+      "src": "public/build/elasticsearchPlugin.33a3fa3a36d580167bc3.js",
+      "integrity": "sha256-fAD+EADWm7TD1yo+vN+quOTZ45HIleinxW1MmCAdkIo= sha384-J1xZZb3bkRVUFTwF94keBLh274p3bAgZ7zc76fIeSLHuYNAtSBnfdvLKU5nAoJaG sha512-sB35V5tOjy2UKOFdX4ImnvYlHNpVBvgOqTtM0vm42Rh6a2yVjvjtOxn/kWThbniq9Efom9niG339w3qL6v54zQ=="
+    },
+    "entrypoints": {
+      "app": {
+        "assets": {
+          "js": [
+            "public/build/runtime.20ed8c01880b812ed29f.js",
+            "public/build/3951.4e474348841d792ab1ba.js",
+            "public/build/3651.4e8f7603e9778e1e9b59.js",
+            "public/build/1272.8c79fc44bf7cd993c953.js",
+            "public/build/6902.070074e8f5a989b8f4c3.js",
+            "public/build/app.0439db6f56ee4aa501b2.js"
+          ]
+        }
+      },
+      "dark": {
+        "assets": {
+          "js": [
+            "public/build/runtime.20ed8c01880b812ed29f.js",
+            "public/build/dark.a2212d3486121d8d85e6.js"
+          ],
+          "css": [
+            "public/build/grafana.dark.a28b24b45b2bbcc628cc.css"
+          ]
+        }
+      },
+      "light": {
+        "assets": {
+          "js": [
+            "public/build/runtime.20ed8c01880b812ed29f.js",
+            "public/build/light.9c3939717055f231e000.js"
+          ],
+          "css": [
+            "public/build/grafana.light.3572f6d5f8b7daa8d8d0.css"
+          ]
+        }
+      }
+    },
+    "explore-feature-toggle-page.50398398ecdeaf58968c.js.map": {
+      "src": "public/build/explore-feature-toggle-page.50398398ecdeaf58968c.js.map",
+      "integrity": "sha256-k1g7TksMHFQhhQGE0nGj7nC50CTTESeqVaMlA6Md30o= sha384-a46sgLcYg0NkYxD3lm6oOWS+IKDSX7h2djfLZ23Pck4F6b2vssDaGgB+rVrsVKZ7 sha512-MYeWbSpGU4EwmG5xRWuz/uzCT5Bg79bXrl4rx/kwwKzUtmj3XJzsY6iKG2ZSG2JSgiKPco2ZIBvlvUD2lICiLA=="
+    },
+    "explore-feature-toggle-page.js": {
+      "src": "public/build/explore-feature-toggle-page.50398398ecdeaf58968c.js",
+      "integrity": "sha256-kENhRbPcLyWQeO6zsJHEdQiSYnxxX1y1b0zt2JP2ARA= sha384-ufZQBv4cLyvwrE0l+FiCcICko9+KGx852zeW9Vu/CKzYOPg8DXpvwquzml7c6uYu sha512-Blww0RlXhprwDmkjrEYZZuX9UnxAPEW+9kUJx9WyaiYWZLUet8fbkSqSoB1nPzkEWCs9wuHp+2NSZ6lKdeMeLg=="
+    },
+    "explore.1dbde0274467c9fede83.js.map": {
+      "src": "public/build/explore.1dbde0274467c9fede83.js.map",
+      "integrity": "sha256-CtPqMsiNUI6F9Y6AlaDvZA72gDLXS2wvVSPnDzHOYug= sha384-IPCw/dtSHbuPoBypZk1ebcmgroax1JBZAJMqa0RLiBYVmQmiFThSP3J4csxTuucA sha512-bZXREkbGNIl1kmGHu1VGvBmm4Af9xITdmPjd3Ol1Sq9sLyGzEVfExHsZhibumeD1Xek6kSltyJZTQv9dBWDn7w=="
+    },
+    "explore.js": {
+      "src": "public/build/explore.1dbde0274467c9fede83.js",
+      "integrity": "sha256-w3KzvXxwtkiunIJFV3NTeaqXEmWxZ/MaQUY8ttIDaAA= sha384-o4aCKV6N2qU4GLKFeiKnkQf7s13yi46NlnsSyvE56AihYl4OfEKGc27htejxRdSc sha512-FAFX8BJMIj6rPlKAJBZ65IvJQEfN9WIjDsvtFLvC897N3TJuPGlPZFNgn7EcJ+OU1opCTKrbky3x3sHk6eNx0Q=="
+    },
+    "geomapPanel.8f44ba570611dfc5113b.js.map": {
+      "src": "public/build/geomapPanel.8f44ba570611dfc5113b.js.map",
+      "integrity": "sha256-RRMSR7mPbLrk2/sUQevsqf7jUXwU0Imf12XAdwbbP8o= sha384-BH61TAdcwiles2uVqGkB5jnqKOtFCl++VZ71bsPOdgkyhfR/KwQfCkutHiik/J/b sha512-FZptkylEeB9LzVlO9Cy+1A7U8uWaYuPYpwZWf8ceBV32Y/3CPpbPwPIJR6W9DFkno43Ry/73vCoN7AHJ0P7t+A=="
+    },
+    "geomapPanel.js": {
+      "src": "public/build/geomapPanel.8f44ba570611dfc5113b.js",
+      "integrity": "sha256-MJda3fDbLmV/sN28KBDWw8Lz0uOPM5wtmorqXvp3O9Q= sha384-CYfopnpbiqd0EtJu/5z38+BZ8HeinPpT0tWrDBpbRXvDWbDKBYWb/+fdnrIgKevL sha512-cwEwipsHaCwdl9H96MlWzf2V+p4waDiNxn2HXclfJEv/1l4pjF8zCsKdnuI+/8i0zb9a5GaAUNGopTdtPV1vgQ=="
+    },
+    "grafanaPlugin.79a1c08b258122d69e7f.js.map": {
+      "src": "public/build/grafanaPlugin.79a1c08b258122d69e7f.js.map",
+      "integrity": "sha256-/QmIr+7EIACE9idLU2kNe4EcyF8U/N6v56SmzOi9h/A= sha384-niE18uXic8wS2RWvhaX1ZsumFmrzdMafhOyWBpGfS6C28NllXMA0oFQF3zyF7sR1 sha512-W42oSUnDXbeaXIG9gy+ENuHyBdAWaJipWGENnZTADivb13ZgIwUsPw19UbCNFCzJUJ87rmIKcptIdv4zQEaSpg=="
+    },
+    "grafanaPlugin.js": {
+      "src": "public/build/grafanaPlugin.79a1c08b258122d69e7f.js",
+      "integrity": "sha256-15ZQ1725pHAP8kbRNAvPvT1sUPGRsuRuWeGhVZwKF8Q= sha384-E3PFm2VR5lanFJKpkplYJhsA+8L+n5usn4XsrpGxN0gCGIdtb1pOp8AzW82em4fG sha512-RT3jka2APWXnQQUeFUvsZvqyK2UiodPheKQQ/W9ryJ0AduoGQLYHGDJHXGbLqEQrUYx8hDF7PpaoGDWZWWHjAA=="
+    },
+    "graphPlugin.e4c8b97846b873b0a516.js.map": {
+      "src": "public/build/graphPlugin.e4c8b97846b873b0a516.js.map",
+      "integrity": "sha256-chxTBnBTjCfX/5tdmGRUIEgy7Qu5JfPb6HoFlmYqVoo= sha384-94wlurZXVfifN9KxQfjKzaiT6bQiUqtlzMgaddPiyV0e4U0OpLpvYJ/WO+RbFoCD sha512-ROSCrJLceqnN5rDiWRJgRbh5che1mOVuH0PHIy44JqUlVd6G0tbPmF3ZgJimfRyU1HyJ8wxUq4Yw8XfNM94lnQ=="
+    },
+    "graphPlugin.js": {
+      "src": "public/build/graphPlugin.e4c8b97846b873b0a516.js",
+      "integrity": "sha256-fTUQ3cOJwzRoohOOQXlzLeOCRBML3+o5E1Y8mduS8sI= sha384-V3UnJ8d0vKZACzBvhEiYL4QB3yW8kRC18+flyoFI+IjzKKSn7HMdPMdNrjrLXis1 sha512-g+x/11lnODvTdpd5nnEO8dzoALQA9Mbo56C69OLRv0dg10hR7e583eWkCg2X6KKLCbnYWrVg47LsHe4s8DZLdg=="
+    },
+    "graphitePlugin.6a08cdefc93bb5e9f606.js.map": {
+      "src": "public/build/graphitePlugin.6a08cdefc93bb5e9f606.js.map",
+      "integrity": "sha256-BNwo/dYXEfR42rpxE3GQeA8AIERpn7zNqbEfN/8HOqU= sha384-shICs0VLbwT27tMpHzLmCUxGR7etkw/4qQrPjRtUCedpygAjUzBMRiw5sxU44ifb sha512-2U3ETmqSMAMPDbogPNIuJltdEnJBycgR1W1AfZH/7Sp/UjpHdkLGRRKjAsLFBtr5LFTXC/jLPT9XKwbQy/HzJw=="
+    },
+    "graphitePlugin.js": {
+      "src": "public/build/graphitePlugin.6a08cdefc93bb5e9f606.js",
+      "integrity": "sha256-0/lsoD5nR8z3V70qgIguSop6fs2ro1gfAjrtUBB+wIg= sha384-tl2uTHRsu2YYPUvFeEO0cbwi0zUkjzOstdAJ936VCI7DIypryBlTNIElOi0Z8n9n sha512-oH3/S82mO96uDPDpKg9Y4AzHaLBdETtMXb8CsthRk8bmM1pOmJzQevTDrOaZk+JV96oH5f/pMZ7anAsLcG6yYg=="
+    },
+    "heatmapPanel.a5475a5dd218739c7933.js.map": {
+      "src": "public/build/heatmapPanel.a5475a5dd218739c7933.js.map",
+      "integrity": "sha256-AedIPwTXGR3y4o4EX0KcSLH5QsnHVlLI+5QXkEB1rZ0= sha384-BFnAmV08iuyNrS2u2cqQOWwtLeUt8vrfogM/XCP6OqVPeNplNtgvFZlvs2zsyt2k sha512-bWLCUXEkNfKQd59/Qexs1cZC3Pgi9dLE8LA82056ri3aYTS8IGY/QAcpWwnV/37Xv4cEGviIW4pXtPRbVyvgxg=="
+    },
+    "heatmapPanel.js": {
+      "src": "public/build/heatmapPanel.a5475a5dd218739c7933.js",
+      "integrity": "sha256-BppmoB49VglJS43gCN095xUgrpO05DD3LEzKdZsY0GU= sha384-twi+ry/XzNg9uAcSZi4xdGzd56fvjQd9NDZMmmefN8/oxDylh/hEKDWIkwR9sCYy sha512-ckkCa2P6Y2fAE81KsjDWcsFc2Qa+mWRuxTRxTpeGV9PcsKkvew1jiB/kOrFQDedp1CZvIMHFaeIQlNp9Qp7FeA=="
+    },
+    "influxdbPlugin.js": {
+      "src": "public/build/influxdbPlugin.091fe5049db4d59f86c8.js",
+      "integrity": "sha256-ljflxKN54UHSEgXhYpbywp28wYenpamaUF2JVvC2W3c= sha384-PpCzFNkPe3BwRgcbqmauL3bRoTGArGs+etOIacB3eNPVJog8PyaVERxyzAV/mjPf sha512-rnBRzDoJZ8m8lMrBfa9lg+1FgcnjI9Bu0SfEe2Gv7itWoVdvKtbSqlKGsnahoOJDIEqs8pu14Hby82PJZmjv+g=="
+    },
+    "jaegerPlugin.f8cc738079eb8aed4f60.js.map": {
+      "src": "public/build/jaegerPlugin.f8cc738079eb8aed4f60.js.map",
+      "integrity": "sha256-mshDyUGEBFFW3mSEOIWJKlB0Q7oVqYwuZ6IOezOdMOI= sha384-reLX4b03FGk85fDt5CRTFxkw/zxmhEqpUTKNalLMIps4g95EPosC3/Cg6xUW9ftS sha512-HgOEODJ537c7jQdqQrIEl5Rd8dxoVEINuiRdni5yHjQfqANSHBPOc1nKuD0+jSGksHoenww/QZAP5fYp7hSDww=="
+    },
+    "jaegerPlugin.js": {
+      "src": "public/build/jaegerPlugin.f8cc738079eb8aed4f60.js",
+      "integrity": "sha256-5Hw9eSRhyswJ0vaXJXXkC7NMwZ/UuJjhpqAsTrLlzIA= sha384-lYP4isPZMXNO90Jr6kh7Hs2l8dHf28L6OVt/6oWoCPWnj/+KnaTi4ICB+3hI39vi sha512-YVCR9soy2Q7TzoTCOa/+WCTlwErmb8ETCJY78yYfo3OcM9zlDv/H5lNxCeNMeJrHplmeK09QvFUFg2hH2+rnxw=="
+    },
+    "light.css": {
+      "src": "public/build/grafana.light.3572f6d5f8b7daa8d8d0.css",
+      "integrity": "sha256-O/s1VmwrGVCvjzjaHLbE4g1VS7sDVTnnGC5Bww2yROY= sha384-VZUqyZU+WUrMEYYurCifJH9QH+lf+IajBnKQDNzi/BX86lPRZO0ulpe38rXsSkiL sha512-RY3MIXlux98zLH4icMUHQgxOdn+gSSGG6gFZNrzaenKWHnj17QGBf0zZaxNtY674FvgqfmUU3gZsiGR2xFqZUQ=="
+    },
+    "light.js": {
+      "src": "public/build/light.9c3939717055f231e000.js",
+      "integrity": "sha256-8lx9dOJep30YAgCLs6RxtqMItoqznzk30F4zrq3rUN8= sha384-2W6VA3HbXNXaWT4yujVt70OPg7W7oSr1OiFQGV+UAhHzEtsyV7wActllwBwdQLaE sha512-poxt4zghPSpD9fLdVBZAfwyqAI9GRJwAr/0KvW7tacApxlRpU/MyPL9Hu8EmmXqHdHmfMWUpy6s39JxEyV70FQ=="
+    },
+    "loki-query-field.af1886d06780f32fed20.js.map": {
+      "src": "public/build/loki-query-field.af1886d06780f32fed20.js.map",
+      "integrity": "sha256-P/DygP2yvmvCtPNwomZyFRuGJ4eIrYEKZStljKez9A0= sha384-zskgKm7+2C3AuAjxbZBTUaRyxlF+mgGqLxX3rox/w9y6jwnZlRb9AbIvyzFkRCsl sha512-7n1NjgbH1MzPMCwAiUQMQeUDvifqqBEY4wHfp7DOBZwqFJw3MWKK7+GaCT3anuSyupWSPJAc0uMygdwMLjaX1Q=="
+    },
+    "loki-query-field.js": {
+      "src": "public/build/loki-query-field.af1886d06780f32fed20.js",
+      "integrity": "sha256-PC5+sf0c6+QzVmMez/3cnnGqU81E7r2O4+PngKbpums= sha384-67pHaphAjK6dVSWqqacDMGlTrdzBaEydc+b0n3/+fFvY7bK1c3HPhqR/GNETctFo sha512-wdI8eTcgXbeQZoves+u9qU+fvxxhDDAUk+IHhnGd/pWr/VchYDYXMkmIuGD80UokL1eniH9zqCU9ozUxqplCWw=="
+    },
+    "lokiPlugin.cc1d5d5bb34f38026718.js.map": {
+      "src": "public/build/lokiPlugin.cc1d5d5bb34f38026718.js.map",
+      "integrity": "sha256-jQarV0xTbTdgFYaWKrPxvfbEANB7C9V3h8D30vMnm4U= sha384-kNZ/fyaNr8SJ6grUA4nkoTXEQBLzbwqG4OK/btTZG1AVWAtjpNSNoskyLEcHugJc sha512-MdD9CxfH1RqdpZE998ZFhEGOhIcJvDKVrRcPwb2c790UA/U+yuHslnGIYiZuwJihjc2BBCc8/8vcMK60uqx4sQ=="
+    },
+    "lokiPlugin.js": {
+      "src": "public/build/lokiPlugin.cc1d5d5bb34f38026718.js",
+      "integrity": "sha256-/XKwyPDRs61SrBpKELyrjEdcZtJPvZy42F9Cq+L0dC0= sha384-7wzbQ/k4W8ngj9PPIhORCTCoeOlNB/5N48iBoew/FJEf/U2jFMStsn2ImufFBvib sha512-wyJ0X+4ukBCVW9ZgmDzbfi4m2eQY7sL0ytzC3H88b2uFYCkJo0yqPrhMs03b5o9jPc1v1PKHK6/TpZOZabrxjQ=="
+    },
+    "mixedPlugin.js": {
+      "src": "public/build/mixedPlugin.675f1b3373954322650a.js",
+      "integrity": "sha256-DP7OldgIzI/XEGo2Kx+Nxkgv2X7veg/Mc1wh0lWzU1Y= sha384-L1Lso3PBT24wJ71+ga+6H49yI7Oc/MSJ9+gfTfzOBvlalMgOYnKUCrq9+9rMe7FL sha512-LxirIcMi5u/ivBtmdtUqM0lIS2n4hEzpg6lRFktNuuugGMEWUiQCNzB1LmzQKSviE5wtqR+rn3QaG2OIC/Ptag=="
+    },
+    "mssqlPlugin.9bcd57a7a910a0b11194.js.map": {
+      "src": "public/build/mssqlPlugin.9bcd57a7a910a0b11194.js.map",
+      "integrity": "sha256-L7qlCPzRr7UKkVy07Uls9evaTcLkSEMU9eGFrb0FgZQ= sha384-464mHntzoXpg2MJ/5w5Mr1GEOk+Nxxh8uV5bFo6aEaxrw9D4OcWUbIACQ4R4ugDo sha512-n9rMabPLGUQl3h29KQoVcqPOE0r+KqQkTm0gGcT9IgAeCj1wzBVj6cjlwelb7bnrtYEBOfohv6nJp9ycUGvimw=="
+    },
+    "mssqlPlugin.js": {
+      "src": "public/build/mssqlPlugin.9bcd57a7a910a0b11194.js",
+      "integrity": "sha256-Ip7SatrBuOSs2+7wP9hqTJWnEi57n5dFoJO/hCq5aiY= sha384-fLnbVsCWRJ2SZ+5YiuToR7q2DPO4HfcdG/dotPMqPPpZH/BrU4oW9w9FGKWE5vFL sha512-OAZbuL6Oh8E97PrvgMh8Zoldyv2/Zh6AakC2KdzJgEPzMMakuBryBvuNpgIrGU/ILiZpD8bUe8X3QuTcFX/6SQ=="
+    },
+    "mysqlPlugin.24899c102c7a4c35e1e3.js.map": {
+      "src": "public/build/mysqlPlugin.24899c102c7a4c35e1e3.js.map",
+      "integrity": "sha256-zzALbKTwC0L7VUZQgn56pHKU3B0DcQbOLhb1xec5SvI= sha384-6rdUbCbNBBFI2+4tRDgeo2g0zwrCnwHLXHe7yzQjtflqSMXeFx1umFwft3iWnPEs sha512-kHhZdk3WjtXCY+pGY09Y4iez2HIPUzWu7pyVCqHFmgsp6lFtfbeR8eqf/Pzzl3FiWLJSIbh6+WZbjBPsnBAO6w=="
+    },
+    "mysqlPlugin.js": {
+      "src": "public/build/mysqlPlugin.24899c102c7a4c35e1e3.js",
+      "integrity": "sha256-qBwPi47Wm2a6o/yO2eiVCp9h8ekTzVCYI7RAPyGW5z0= sha384-iBjfIc2A9u9ZJFoxyljiTloIZM0mxvNbQqCmRSeuFQU6O2II9xwtjkRofaS0Q8xQ sha512-FiZCBtS30ssnIhEgILwXbgCabC2oJrCNjBJj3iRvI8sfu2xb0GS2HO5dscrlX1e4fsZMr7JMTDqigawXYoICPQ=="
+    },
+    "opentsdbPlugin.1d7e6e226a812251e509.js.map": {
+      "src": "public/build/opentsdbPlugin.1d7e6e226a812251e509.js.map",
+      "integrity": "sha256-yKvHfiQmyLuCje3/AW0r0LKtqNaOdMhg1uBTmjTpCqA= sha384-+KkLe85lkxczuZB4teHWAqWlCPJbbLQ9guRrUykcblxGyi3l1CcmugW2D/7U/bXL sha512-+FxEwRNX5WdlzHftWJiAlqAHnfcSWsSOk8NhZeeDmSo6omDjVrjpsssmXW/mMPl4/wrVXGAo5zfxkrj+RObzdg=="
+    },
+    "opentsdbPlugin.js": {
+      "src": "public/build/opentsdbPlugin.1d7e6e226a812251e509.js",
+      "integrity": "sha256-2EqRkgOa5HPH0aky0Cep2JKiYP/0lIBS4uovOC4FotQ= sha384-roK2AZ29uN8bIHr3AJs0Y9q1s/7bRQCOiFw+7QZ46BJdCREf0cM69aCQXMb46k9M sha512-1q45r7ph0yP8AESq0jCOsXnkRhtvyy6T5NxJy5zKenOf9rPk9/m1HJuhK1jXozSqZUhqFRS29qMhtpMLco/kRg=="
+    },
+    "parcaPlugin.b79037a31bda0ed74939.js.map": {
+      "src": "public/build/parcaPlugin.b79037a31bda0ed74939.js.map",
+      "integrity": "sha256-vjFnZHoRks1x3k4jRkkJqO5SNPmPrcQJsau1Ygo1mjQ= sha384-BrGx4/BAYHkKxFlMgtQXE0nWyTXKAqUPjpIGZ19U8nYNl+uoO2FctUmH97yn2gJ3 sha512-hCNJ7evJkKZEuXgf2xYDjcI0BRyXWBcnuat3O4kabnagYDLY7yi4f/rU4rusHgaOjh8YKaObokx+WNmMkQO3+Q=="
+    },
+    "parcaPlugin.js": {
+      "src": "public/build/parcaPlugin.b79037a31bda0ed74939.js",
+      "integrity": "sha256-UR1pwulbWJ19SfblexsSsEuc4RBNHI+nR94ULHu4HjA= sha384-QA2miQA41nuo0lfdjrFf5ivaM4jpU9RmJNlX2vBebDpJLtEQjP0jCF46lwNj3NVF sha512-ufzRIg4ZeW8EWh03QPjdA+h2ADzMqdB824hy47aZ64ZmmCvcYBwD/XMnOYlFex0jDJezr7okyaPmFupY3ShWUQ=="
+    },
+    "postgresPlugin.bbfb0950e69251c53a9a.js.map": {
+      "src": "public/build/postgresPlugin.bbfb0950e69251c53a9a.js.map",
+      "integrity": "sha256-9mSrgbncyOcEA5YOrSoTwSKuX2cQUh/QbIkds1/61HQ= sha384-FNP0xbLOhIfLY23IFSp+5ApCrpI0+al/dmPWRO21v+s3wUQ3vU8jOz2QpuFc9IiA sha512-6te3lyPZVDxUrkeovITIO5ifTx5in3gjTkM48oe18NLFqCm4tv6CmJ8//c7CxD8ObTGBuYcS81dVkMNF8mDFkQ=="
+    },
+    "postgresPlugin.js": {
+      "src": "public/build/postgresPlugin.bbfb0950e69251c53a9a.js",
+      "integrity": "sha256-enHN1YxYeP7V7w0irJ72bDvvGt9BYrEC4+GVXHPXSVI= sha384-LDb7q26H7rFsplKZ4FR8TyH8Ip7/lqO8Vw157Uv2Q0DFbJIUkIlcg6ImsFaIPRcA sha512-GJEGcMLkwVMubfCJBGsCnQAKWLmelie+eN2hllxTIw4ffdHpvJqUvE4Ul4L3ZqcNb/2CsXvzva03LFsv0rCgJA=="
+    },
+    "prom-query-field.c8d76beed0f9a9f9dd2b.js.map": {
+      "src": "public/build/prom-query-field.c8d76beed0f9a9f9dd2b.js.map",
+      "integrity": "sha256-TVhIY8A+oAVGHfSbS1//6nsTNJbkfn1LkZkzfvy6UWQ= sha384-ufxcjR8l13ALh84zxUdAOciyLOlcA9W7QIOnP+sox20fNEfn4Ag6+yEfNJTh+RJX sha512-zjBOZK7j8WAnz9N68LJ+mDPYebM17o14zM0lsztsXi67A9vVlho2gvKhb3vzXiXk5IS1kKKowU6pMrlBd8rxXw=="
+    },
+    "prom-query-field.js": {
+      "src": "public/build/prom-query-field.c8d76beed0f9a9f9dd2b.js",
+      "integrity": "sha256-bEH0Zpj8VOSQl3jTBVzq42T4386hfHaw7/Y6q6iochw= sha384-VtFOUNOoZkMwcqrAEcQx9Ah+Qz3Q7W7j5VoEicJNCeNVYCaLqlLF4qNM4EHr5sWI sha512-WqU3Y5M5hCGzYI3WWLCxu/9mION8DbqVl8PZfslRj2i7GrCDAvyOAD+YEzn1pWoDphX70H+QXkiiSZ6S3PvtiQ=="
+    },
+    "prometheusPlugin.f2940e59af127f0ed4ed.js.map": {
+      "src": "public/build/prometheusPlugin.f2940e59af127f0ed4ed.js.map",
+      "integrity": "sha256-hO3HWS90mOSGieqF9TLe/ngZ7QYhbcSnEDURkaUBZIc= sha384-XRaa3/lvWkYQru339jzrUm3X1wGaJeARK110XfXpMonheQFmeZXATXSithuvdP+H sha512-Pg6jAYi/TJ0HfjKpUNPXJD51MKIrQygw75Zzr24bmc4enBcPJ2CZpHN3SKCt6aamqJwUylY1hDJ8EIZ3RMeGOg=="
+    },
+    "prometheusPlugin.js": {
+      "src": "public/build/prometheusPlugin.f2940e59af127f0ed4ed.js",
+      "integrity": "sha256-YN1q6k+eQK/arYsOzKw64Xml6CCKD0O4DGU9OW3eHn8= sha384-vukVsKoeTNXmkyVDAfHr37U23J077wmpboQaT1K/DR7NwnlzQ/vCZL51GSvoCKKW sha512-2CDAoAn5q04DMu7tmmcC6L7VMj+4AvxzDEJ1MuuFQJx8+s5dSLPsLDVBqfFDxcd7AeEoMjsH1ogdwfU/DzZyaA=="
+    },
+    "pyroscopePlugin.7baede567a32cf4fdbbc.js.map": {
+      "src": "public/build/pyroscopePlugin.7baede567a32cf4fdbbc.js.map",
+      "integrity": "sha256-rf33vrmgQtFn8yeSqF4EXkf+Xd534/X/ID7QVOalBZw= sha384-5Ha0Oy4ei1mjEuGtKJz0RRXjzESlWjE6I0iUCGwZgfFIldiFDL2x1jKpLGXa33Mk sha512-mt8tOryD/NZ9IEEScPIGVyzm3ksOOXUxOS0eCGq3e8YuVhyZ6G4T8DlFPMmoihSdUeoJMri9ie23hPZOe67//w=="
+    },
+    "pyroscopePlugin.js": {
+      "src": "public/build/pyroscopePlugin.7baede567a32cf4fdbbc.js",
+      "integrity": "sha256-h+GrL5YgmyHaHSBoNdVNOcg1akGdrq+xgkwvh4TaKNk= sha384-iOs3b0yBZVjuS8C5kBg0iUL0AWsBmJpPMXQoJ3NjA7Y84UyYFCa7w+2xOYErOsjg sha512-1f1dVkputePT02zslD51WcngJlcMmcGjxv+klBi5PP845asgNgq9DzJ8CPOZSmxYaHisXbimnD5sP9RdQY8Mmw=="
+    },
+    "react-monaco-editor.c99c3894a7131fa06882.js.map": {
+      "src": "public/build/react-monaco-editor.c99c3894a7131fa06882.js.map",
+      "integrity": "sha256-GR0oEvpCXJ3Mo5vLhIzQWFP7gPavqKLBKy0Ep4EURqI= sha384-GBdNVwyIGf51BNqJnHLtySjHku5qFJ7TwqOWC5f7QLR5B/qavr0tQ6gLAbTc87KV sha512-Rffj6My8lIdPLud9tm/FmH95pKTDZwYpoxnK5Y9FpDSsy3izv+DHs2Dv7eFm0Q0P1dWNd4n+H0fOtYdg3Yz1Lw=="
+    },
+    "react-monaco-editor.js": {
+      "src": "public/build/react-monaco-editor.c99c3894a7131fa06882.js",
+      "integrity": "sha256-mqxgNrZySYF0B4xA91AF8euaniu8PTWAfFBYS5ZcDV4= sha384-SyWKK8HW1oj5HwTZhXwC3e895iZXMQFEoghX/nsqOwdeCY+jM0751Hf1pfQmOIyP sha512-yD/0+1EVLR25j/yBG1crZ/34Yzy+gLi+FUjsTSl0GtQyJxl3QVTlKKibNRoo6G8HOUpapcqySC0/bNWptBM23A=="
+    },
+    "runtime.20ed8c01880b812ed29f.js.map": {
+      "src": "public/build/runtime.20ed8c01880b812ed29f.js.map",
+      "integrity": "sha256-9VM4XI9GyoUzsUX2t+V5oyIWEzt3a73fUqs/SmPiWwA= sha384-dPy2go8AG/YbNQfHJEd0F3NqrD+akz7aaI3Nzlf+ZzBdYcy3f76X/jIkLzUu7wST sha512-/ep4Z8bLSSrNp7taOGmlSOcskKWZ08lcL0Qm6NYHaH6upl7wAFKAFtujNHqSy6EnpwArjDyU3BSntsBG+EzEaQ=="
+    },
+    "runtime.js": {
+      "src": "public/build/runtime.20ed8c01880b812ed29f.js",
+      "integrity": "sha256-rcdxIHk6cWgu4jiFa1a+pWlileYD/R72GaS8ZACBUdw= sha384-I/VJZQkt+TuJTvu61ihdWPds7EHfLrW5CxeQ0x9gtSqoPg9Z17Uawz1yoYaTdxqQ sha512-4CPAbh4KdTmGxHoQw4pgpYmgAquupVfwfo6UBV2cGU3vGFnEwkhq320037ETwWs+n9xB/bAMOvrdabp1SA1+8g=="
+    }
+  }
\ No newline at end of file
diff --git a/pkg/api/webassets/webassets.go b/pkg/api/webassets/webassets.go
new file mode 100644
index 0000000000000..197c5f7628151
--- /dev/null
+++ b/pkg/api/webassets/webassets.go
@@ -0,0 +1,135 @@
+package webassets
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"path/filepath"
+
+	"github.com/grafana/grafana/pkg/api/dtos"
+	"github.com/grafana/grafana/pkg/services/licensing"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+type ManifestInfo struct {
+	FilePath  string `json:"src,omitempty"`
+	Integrity string `json:"integrity,omitempty"`
+
+	// The known entrypoints
+	App   *EntryPointInfo `json:"app,omitempty"`
+	Dark  *EntryPointInfo `json:"dark,omitempty"`
+	Light *EntryPointInfo `json:"light,omitempty"`
+}
+
+type EntryPointInfo struct {
+	Assets struct {
+		JS  []string `json:"js,omitempty"`
+		CSS []string `json:"css,omitempty"`
+	} `json:"assets,omitempty"`
+}
+
+var entryPointAssetsCache *dtos.EntryPointAssets = nil
+
+func GetWebAssets(ctx context.Context, cfg *setting.Cfg, license licensing.Licensing) (*dtos.EntryPointAssets, error) {
+	if cfg.Env != setting.Dev && entryPointAssetsCache != nil {
+		return entryPointAssetsCache, nil
+	}
+
+	var err error
+	var result *dtos.EntryPointAssets
+
+	cdn := "" // "https://grafana-assets.grafana.net/grafana/10.3.0-64123/"
+	if cdn != "" {
+		result, err = readWebAssetsFromCDN(ctx, cdn)
+	}
+
+	if result == nil {
+		result, err = readWebAssetsFromFile(filepath.Join(cfg.StaticRootPath, "build", "assets-manifest.json"))
+		if err == nil {
+			cdn, _ = cfg.GetContentDeliveryURL(license.ContentDeliveryPrefix())
+			if cdn != "" {
+				result.SetContentDeliveryURL(cdn)
+			}
+		}
+	}
+
+	entryPointAssetsCache = result
+	return entryPointAssetsCache, err
+}
+
+func readWebAssetsFromFile(manifestpath string) (*dtos.EntryPointAssets, error) {
+	//nolint:gosec
+	f, err := os.Open(manifestpath)
+	if err != nil {
+		return nil, fmt.Errorf("failed to load assets-manifest.json %w", err)
+	}
+	defer func() {
+		_ = f.Close()
+	}()
+	return readWebAssets(f)
+}
+
+func readWebAssetsFromCDN(ctx context.Context, baseURL string) (*dtos.EntryPointAssets, error) {
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, baseURL+"public/build/assets-manifest.json", nil)
+	if err != nil {
+		return nil, err
+	}
+	response, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		_ = response.Body.Close()
+	}()
+	dto, err := readWebAssets(response.Body)
+	if err == nil {
+		dto.SetContentDeliveryURL(baseURL)
+	}
+	return dto, err
+}
+
+func readWebAssets(r io.Reader) (*dtos.EntryPointAssets, error) {
+	manifest := map[string]ManifestInfo{}
+	if err := json.NewDecoder(r).Decode(&manifest); err != nil {
+		return nil, fmt.Errorf("failed to read assets-manifest.json %w", err)
+	}
+
+	integrity := make(map[string]string, 100)
+	for _, v := range manifest {
+		if v.Integrity != "" && v.FilePath != "" {
+			integrity[v.FilePath] = v.Integrity
+		}
+	}
+
+	entryPoints, ok := manifest["entrypoints"]
+	if !ok {
+		return nil, fmt.Errorf("could not find entrypoints in asssets-manifest")
+	}
+
+	if entryPoints.App == nil || len(entryPoints.App.Assets.JS) == 0 {
+		return nil, fmt.Errorf("missing app entry")
+	}
+	if entryPoints.Dark == nil || len(entryPoints.Dark.Assets.CSS) == 0 {
+		return nil, fmt.Errorf("missing dark entry")
+	}
+	if entryPoints.Light == nil || len(entryPoints.Light.Assets.CSS) == 0 {
+		return nil, fmt.Errorf("missing light entry")
+	}
+
+	entryPointJSAssets := make([]dtos.EntryPointAsset, 0)
+	for _, entry := range entryPoints.App.Assets.JS {
+		entryPointJSAssets = append(entryPointJSAssets, dtos.EntryPointAsset{
+			FilePath:  entry,
+			Integrity: integrity[entry],
+		})
+	}
+
+	return &dtos.EntryPointAssets{
+		JSFiles: entryPointJSAssets,
+		Dark:    entryPoints.Dark.Assets.CSS[0],
+		Light:   entryPoints.Light.Assets.CSS[0],
+	}, nil
+}
diff --git a/pkg/api/webassets/webassets_test.go b/pkg/api/webassets/webassets_test.go
new file mode 100644
index 0000000000000..4c4f0013cacad
--- /dev/null
+++ b/pkg/api/webassets/webassets_test.go
@@ -0,0 +1,130 @@
+package webassets
+
+import (
+	"context"
+	"encoding/json"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestReadWebassets(t *testing.T) {
+	assets, err := readWebAssetsFromFile("testdata/sample-assets-manifest.json")
+	require.NoError(t, err)
+
+	dto, err := json.MarshalIndent(assets, "", "  ")
+	require.NoError(t, err)
+	//fmt.Printf("%s\n", string(dto))
+
+	require.JSONEq(t, `{
+		"jsFiles": [
+		  {
+			"filePath": "public/build/runtime.20ed8c01880b812ed29f.js",
+			"integrity": "sha256-rcdxIHk6cWgu4jiFa1a+pWlileYD/R72GaS8ZACBUdw= sha384-I/VJZQkt+TuJTvu61ihdWPds7EHfLrW5CxeQ0x9gtSqoPg9Z17Uawz1yoYaTdxqQ sha512-4CPAbh4KdTmGxHoQw4pgpYmgAquupVfwfo6UBV2cGU3vGFnEwkhq320037ETwWs+n9xB/bAMOvrdabp1SA1+8g=="
+		  },
+		  {
+			"filePath": "public/build/3951.4e474348841d792ab1ba.js",
+			"integrity": "sha256-dHqXXTRA3osYhHr9rol8hOV0nC4VP0pr5tbMp5VD95Q= sha384-4QJaSTibnxdYeYsLnmXtd1+If6IkAmXlLR0uYHN5+N+fS0FegHRH7MIFaRGjiO1B sha512-vRLEeEGbxBCx0z+l/m14fSK49reqWGA9zQzsCrD+TQQBmP07YIoRPwopMMyxtKljbbRFV0bW2bUZ7ZvzOZYoIQ=="
+		  },
+		  {
+			"filePath": "public/build/3651.4e8f7603e9778e1e9b59.js",
+			"integrity": "sha256-+N7caL91pVANd7C/aquAneRTjBQenCwaEKqj+3qkjxc= sha384-GQR7GyHPEwwEVph9gGYWEWvMYxkITwcOjieehbPidXZrybuQyw9cpDkjnWo1tj/w sha512-zyPM+8AxyLuECEXjb9w6Z2Sy8zmJdkfTWQphcvAb8AU4ZdkCqLmyjmOs/QQlpfKDe0wdOLyR3V9QgTDDlxtVlQ=="
+		  },
+		  {
+			"filePath": "public/build/1272.8c79fc44bf7cd993c953.js",
+			"integrity": "sha256-d7MRVimV83v4YQ5rdURfTaaFtiedXP3EMLT06gvvBuQ= sha384-8tRpYHQ+sEkZ8ptiIbKAbKPpHTJVnmaWDN56vJoWWUCzV1Q2w034wcJNKDJDJdAs sha512-cIZWoJHusF8qODBOj2j4b18ewcLLMo/92YQSwYQjln2G5e3o1bSO476ox2I2iecJ/tnhQK5j01h9BzTt3dNTrA=="
+		  },
+		  {
+			"filePath": "public/build/6902.070074e8f5a989b8f4c3.js",
+			"integrity": "sha256-TMo/uTZueyEHtkBzlLZzhwYKWF0epE4qbouo5xcwZkU= sha384-xylZJMtJ7+EsUBBdQZvPh+BeHJ3BnfclqI2vx/8QC9jvfYe/lhRsWW9OMJsxE/Aq sha512-EOmf+KZQMFPoTWAROL8bBLFfHhgvDH8ONycq37JaV7lz+sQOTaWBN2ZD0F/mMdOD5zueTg/Y1RAUP6apoEcHNQ=="
+		  },
+		  {
+			"filePath": "public/build/app.0439db6f56ee4aa501b2.js",
+			"integrity": "sha256-q6muaKY7BuN2Ff+00aw69628MXatcFnLNzWRnAD98DI= sha384-gv6lAbkngOHR05bvyOR8dm/J3wIjQQWSjyxK7W8vt2rG9uxcjvvDQV7aI6YbUhfX sha512-o/0mSlJ/OoqrpGdOIWCE3ZCe8n+qqLbgNCERtx9G8FIzsv++CvIWSGbbILjOTGfnEfEQWcKMH0macVpVBSe1Og=="
+		  }
+		],
+		"dark": "public/build/grafana.dark.a28b24b45b2bbcc628cc.css",
+		"light": "public/build/grafana.light.3572f6d5f8b7daa8d8d0.css"
+	  }`, string(dto))
+
+	assets.SetContentDeliveryURL("https://grafana-assets.grafana.net/grafana/10.3.0-64123/")
+
+	dto, err = json.MarshalIndent(assets, "", "  ")
+	require.NoError(t, err)
+	//fmt.Printf("%s\n", string(dto))
+
+	require.JSONEq(t, `{
+		"cdn": "https://grafana-assets.grafana.net/grafana/10.3.0-64123/",
+		"jsFiles": [
+		  {
+			"filePath": "https://grafana-assets.grafana.net/grafana/10.3.0-64123/public/build/runtime.20ed8c01880b812ed29f.js",
+			"integrity": "sha256-rcdxIHk6cWgu4jiFa1a+pWlileYD/R72GaS8ZACBUdw= sha384-I/VJZQkt+TuJTvu61ihdWPds7EHfLrW5CxeQ0x9gtSqoPg9Z17Uawz1yoYaTdxqQ sha512-4CPAbh4KdTmGxHoQw4pgpYmgAquupVfwfo6UBV2cGU3vGFnEwkhq320037ETwWs+n9xB/bAMOvrdabp1SA1+8g=="
+		  },
+		  {
+			"filePath": "https://grafana-assets.grafana.net/grafana/10.3.0-64123/public/build/3951.4e474348841d792ab1ba.js",
+			"integrity": "sha256-dHqXXTRA3osYhHr9rol8hOV0nC4VP0pr5tbMp5VD95Q= sha384-4QJaSTibnxdYeYsLnmXtd1+If6IkAmXlLR0uYHN5+N+fS0FegHRH7MIFaRGjiO1B sha512-vRLEeEGbxBCx0z+l/m14fSK49reqWGA9zQzsCrD+TQQBmP07YIoRPwopMMyxtKljbbRFV0bW2bUZ7ZvzOZYoIQ=="
+		  },
+		  {
+			"filePath": "https://grafana-assets.grafana.net/grafana/10.3.0-64123/public/build/3651.4e8f7603e9778e1e9b59.js",
+			"integrity": "sha256-+N7caL91pVANd7C/aquAneRTjBQenCwaEKqj+3qkjxc= sha384-GQR7GyHPEwwEVph9gGYWEWvMYxkITwcOjieehbPidXZrybuQyw9cpDkjnWo1tj/w sha512-zyPM+8AxyLuECEXjb9w6Z2Sy8zmJdkfTWQphcvAb8AU4ZdkCqLmyjmOs/QQlpfKDe0wdOLyR3V9QgTDDlxtVlQ=="
+		  },
+		  {
+			"filePath": "https://grafana-assets.grafana.net/grafana/10.3.0-64123/public/build/1272.8c79fc44bf7cd993c953.js",
+			"integrity": "sha256-d7MRVimV83v4YQ5rdURfTaaFtiedXP3EMLT06gvvBuQ= sha384-8tRpYHQ+sEkZ8ptiIbKAbKPpHTJVnmaWDN56vJoWWUCzV1Q2w034wcJNKDJDJdAs sha512-cIZWoJHusF8qODBOj2j4b18ewcLLMo/92YQSwYQjln2G5e3o1bSO476ox2I2iecJ/tnhQK5j01h9BzTt3dNTrA=="
+		  },
+		  {
+			"filePath": "https://grafana-assets.grafana.net/grafana/10.3.0-64123/public/build/6902.070074e8f5a989b8f4c3.js",
+			"integrity": "sha256-TMo/uTZueyEHtkBzlLZzhwYKWF0epE4qbouo5xcwZkU= sha384-xylZJMtJ7+EsUBBdQZvPh+BeHJ3BnfclqI2vx/8QC9jvfYe/lhRsWW9OMJsxE/Aq sha512-EOmf+KZQMFPoTWAROL8bBLFfHhgvDH8ONycq37JaV7lz+sQOTaWBN2ZD0F/mMdOD5zueTg/Y1RAUP6apoEcHNQ=="
+		  },
+		  {
+			"filePath": "https://grafana-assets.grafana.net/grafana/10.3.0-64123/public/build/app.0439db6f56ee4aa501b2.js",
+			"integrity": "sha256-q6muaKY7BuN2Ff+00aw69628MXatcFnLNzWRnAD98DI= sha384-gv6lAbkngOHR05bvyOR8dm/J3wIjQQWSjyxK7W8vt2rG9uxcjvvDQV7aI6YbUhfX sha512-o/0mSlJ/OoqrpGdOIWCE3ZCe8n+qqLbgNCERtx9G8FIzsv++CvIWSGbbILjOTGfnEfEQWcKMH0macVpVBSe1Og=="
+		  }
+		],
+		"dark": "https://grafana-assets.grafana.net/grafana/10.3.0-64123/public/build/grafana.dark.a28b24b45b2bbcc628cc.css",
+		"light": "https://grafana-assets.grafana.net/grafana/10.3.0-64123/public/build/grafana.light.3572f6d5f8b7daa8d8d0.css"
+	  }`, string(dto))
+}
+
+func TestReadWebassetsFromCDN(t *testing.T) {
+	t.Skip()
+
+	assets, err := readWebAssetsFromCDN(context.Background(), "https://grafana-assets.grafana.net/grafana/10.3.0-64123/")
+	require.NoError(t, err)
+
+	dto, err := json.MarshalIndent(assets, "", "  ")
+	require.NoError(t, err)
+	//fmt.Printf("%s\n", string(dto))
+
+	require.JSONEq(t, `{
+		"cdn": "https://grafana-assets.grafana.net/grafana/10.3.0-64123/",
+		"jsFiles": [
+		  {
+			"filePath": "https://grafana-assets.grafana.net/grafana/10.3.0-64123/public/build/runtime.6d702760ddd47772f116.js",
+			"integrity": "sha256-6tSxwMwqd9McukcH+i56v1v+8JsVlMXPWKUCIK30yK8= sha384-dfRWJ5QfPAiQKJ9fUugmeXVdRSx8OS3XUdkEyEhxkm9CZQf9KeUyUe6fGV7VL7s9 sha512-0kjFCSBeQtdS3F9B/uqX45KMMUffYpsU7Ve7AYjy75HiBzovxRGG4hWPZD7d4Gha0Y3Oj4AmZA37TJoafptlRQ=="
+		  },
+		  {
+			"filePath": "https://grafana-assets.grafana.net/grafana/10.3.0-64123/public/build/7653.f5c70a70add3b711f560.js",
+			"integrity": "sha256-p65DYfZPt9NU7vDwlxW+sY9sK+wQ9tJgTGlCJt+LvxY= sha384-P1TDQw3ZJ4X6Fiyn6UpLpVuHq+UW3zKRUM6U0vjucSl/bjFmQJfGR9XE64uEn6sJ sha512-sPqhDs/mWUBL6txtyoTdlgyZvVfdttUAXdV39aEroYpSnl/uEoLIcNBem5mNxoh4ut4TpSb9hlW6tTD7QV07/g=="
+		  },
+		  {
+			"filePath": "https://grafana-assets.grafana.net/grafana/10.3.0-64123/public/build/182.0b85a6da60c3ae0a9093.js",
+			"integrity": "sha256-4vJBytomvJYkSsXlAo7BXDiXRsi5JVWBosIZSMCYlqs= sha384-MWfyWG85/+OvsA4E9CvG1NGiSzrp/EH37Xd/+qfdMFKmvAEGzGx9N/4xF+3N3/yj sha512-j1h6qobFAJYU+7QFdcChEeHa/FPXuArEsHJuXSYtaqrDU7oNHyW1PqFz6kNUwqE674Hutl93EeY+UsUlpZgZZQ=="
+		  },
+		  {
+			"filePath": "https://grafana-assets.grafana.net/grafana/10.3.0-64123/public/build/8781.91ede282a7f6078508e7.js",
+			"integrity": "sha256-b68VAYMTugwWaHtffKI4qCMSWTN/fg0xQv+MnSILQgg= sha384-ptDkcAAAQhuG9Mhvs6gvGIp0HIjCfAP+ysaMltIr3L5alN6Ki71Si/zO6C70YArC sha512-N5tkcDgTPcNvQymegqnx0syp0kS7wVzPnt7i5KSu/RAi6cfM9XiRfz7bZh6fcZAJxApvpL1OJhUQQwPFFBN4ZA=="
+		  },
+		  {
+			"filePath": "https://grafana-assets.grafana.net/grafana/10.3.0-64123/public/build/3958.1d29ae9e8eb421432f48.js",
+			"integrity": "sha256-9c+QGDOI8HtAzVBLA3nJOOU+LzhoENAhIEw7gGSkgWY= sha384-Y05zEdrM/ab9jzGH6segO9GyE8OTV5RvWPZFgynXX4XgvMOyWJcySqwW4RoIVo6P sha512-+ro4iXipgz1zUySd8oMbOY6XX+RjP4gi8bksFNjJGiLQOHVb/EKZKDj5UBeIE96XMd1AoEvZdymCvaft3d8oeA=="
+		  },
+		  {
+			"filePath": "https://grafana-assets.grafana.net/grafana/10.3.0-64123/public/build/app.18e8d3e07edcc1356a6a.js",
+			"integrity": "sha256-ueeH8P/rDaft7jtzRmTN4UpNtiPfhzYa7c1VbBiRLTo= sha384-SijeOWlmIMzm/WNVg5e+yMieef6LOFXMu8d2laBtaY/2m/fviGI+8W55jazWzb+C sha512-qr5MoBZ4wNTCm6aRQ5/mglO8gShmKFpvr066SJgKyAJA4j8cK0snL2XhubUNxND+KkpKAnRe7EjsHYd28/uvkw=="
+		  }
+		],
+		"dark": "https://grafana-assets.grafana.net/grafana/10.3.0-64123/public/build/grafana.dark.b44253d019cd9cb46428.css",
+		"light": "https://grafana-assets.grafana.net/grafana/10.3.0-64123/public/build/grafana.light.e8e11c59b604d62836be.css"
+	  }`, string(dto))
+}
diff --git a/pkg/apimachinery/apis/common/v0alpha1/doc.go b/pkg/apimachinery/apis/common/v0alpha1/doc.go
new file mode 100644
index 0000000000000..8dbffd26f9040
--- /dev/null
+++ b/pkg/apimachinery/apis/common/v0alpha1/doc.go
@@ -0,0 +1,5 @@
+// +k8s:openapi-gen=true
+// +k8s:defaulter-gen=TypeMeta
+// +groupName=common.grafana.app
+
+package v0alpha1 // import "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
diff --git a/pkg/apimachinery/apis/common/v0alpha1/resource.go b/pkg/apimachinery/apis/common/v0alpha1/resource.go
new file mode 100644
index 0000000000000..b801ed69e9edc
--- /dev/null
+++ b/pkg/apimachinery/apis/common/v0alpha1/resource.go
@@ -0,0 +1,118 @@
+package v0alpha1
+
+import (
+	"k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+// ResourceInfo helps define a k8s resource
+// +k8s:openapi-gen=false
+type ResourceInfo struct {
+	group        string
+	version      string
+	resourceName string
+	singularName string
+	shortName    string
+	kind         string
+	newObj       func() runtime.Object
+	newList      func() runtime.Object
+}
+
+func NewResourceInfo(group, version, resourceName, singularName, kind string,
+	newObj func() runtime.Object, newList func() runtime.Object) ResourceInfo {
+	shortName := "" // an optional alias helpful in kubectl eg ("sa" for serviceaccounts)
+	return ResourceInfo{group, version, resourceName, singularName, shortName, kind, newObj, newList}
+}
+
+func (info *ResourceInfo) WithGroupAndShortName(group string, shortName string) ResourceInfo {
+	return ResourceInfo{
+		group:        group,
+		version:      info.version,
+		resourceName: info.resourceName,
+		singularName: info.singularName,
+		kind:         info.kind,
+		shortName:    shortName,
+		newObj:       info.newObj,
+		newList:      info.newList,
+	}
+}
+
+func (info *ResourceInfo) GetSingularName() string {
+	return info.singularName
+}
+
+func (info *ResourceInfo) GetShortNames() []string {
+	if info.shortName == "" {
+		return []string{}
+	}
+	return []string{info.shortName}
+}
+
+// TypeMeta returns k8s type
+func (info *ResourceInfo) TypeMeta() metav1.TypeMeta {
+	return metav1.TypeMeta{
+		Kind:       info.kind,
+		APIVersion: info.group + "/" + info.version,
+	}
+}
+
+func (info *ResourceInfo) GroupVersion() schema.GroupVersion {
+	return schema.GroupVersion{
+		Group:   info.group,
+		Version: info.version,
+	}
+}
+
+func (info *ResourceInfo) GroupResource() schema.GroupResource {
+	return schema.GroupResource{
+		Group:    info.group,
+		Resource: info.resourceName,
+	}
+}
+
+func (info *ResourceInfo) GroupVersionKind() schema.GroupVersionKind {
+	return schema.GroupVersionKind{
+		Group:   info.group,
+		Version: info.version,
+		Kind:    info.kind,
+	}
+}
+
+func (info *ResourceInfo) SingularGroupResource() schema.GroupResource {
+	return schema.GroupResource{
+		Group:    info.group,
+		Resource: info.singularName,
+	}
+}
+
+func (info *ResourceInfo) GroupVersionResource() schema.GroupVersionResource {
+	return schema.GroupVersionResource{
+		Group:    info.group,
+		Version:  info.version,
+		Resource: info.resourceName,
+	}
+}
+
+func (info *ResourceInfo) StoragePath(sub ...string) string {
+	switch len(sub) {
+	case 0:
+		return info.resourceName
+	case 1:
+		return info.resourceName + "/" + sub[0]
+	}
+	panic("invalid subresource path")
+}
+
+func (info *ResourceInfo) NewFunc() runtime.Object {
+	return info.newObj()
+}
+
+func (info *ResourceInfo) NewListFunc() runtime.Object {
+	return info.newList()
+}
+
+func (info *ResourceInfo) NewNotFound(name string) *errors.StatusError {
+	return errors.NewNotFound(info.SingularGroupResource(), name)
+}
diff --git a/pkg/apimachinery/apis/common/v0alpha1/types.go b/pkg/apimachinery/apis/common/v0alpha1/types.go
new file mode 100644
index 0000000000000..63ea94a8a96e6
--- /dev/null
+++ b/pkg/apimachinery/apis/common/v0alpha1/types.go
@@ -0,0 +1,17 @@
+package v0alpha1
+
+// Similar to
+// https://dev-k8sref-io.web.app/docs/common-definitions/objectreference-/
+// ObjectReference contains enough information to let you inspect or modify the referred object.
+type ObjectReference struct {
+	Resource  string `json:"resource,omitempty"`
+	Namespace string `json:"namespace,omitempty"`
+	Name      string `json:"name,omitempty"`
+
+	// APIGroup is the name of the API group that contains the referred object.
+	// The empty string represents the core API group.
+	APIGroup string `json:"apiGroup,omitempty"`
+
+	// APIVersion is the version of the API group that contains the referred object.
+	APIVersion string `json:"apiVersion,omitempty"`
+}
diff --git a/pkg/apimachinery/apis/common/v0alpha1/unstructured.go b/pkg/apimachinery/apis/common/v0alpha1/unstructured.go
new file mode 100644
index 0000000000000..3a735623a68c9
--- /dev/null
+++ b/pkg/apimachinery/apis/common/v0alpha1/unstructured.go
@@ -0,0 +1,118 @@
+package v0alpha1
+
+import (
+	"encoding/json"
+
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	runtime "k8s.io/apimachinery/pkg/runtime"
+	openapi "k8s.io/kube-openapi/pkg/common"
+	spec "k8s.io/kube-openapi/pkg/validation/spec"
+)
+
+// Unstructured allows objects that do not have Golang structs registered to be manipulated
+// generically.
+type Unstructured struct {
+	// Object is a JSON compatible map with string, float, int, bool, []interface{},
+	// or map[string]interface{} children.
+	Object map[string]any
+}
+
+// Produce an API definition that represents map[string]any
+func (u Unstructured) OpenAPIDefinition() openapi.OpenAPIDefinition {
+	return openapi.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type:                 []string{"object"},
+				AdditionalProperties: &spec.SchemaOrBool{Allows: true},
+			},
+			VendorExtensible: spec.VendorExtensible{
+				Extensions: map[string]interface{}{
+					"x-kubernetes-preserve-unknown-fields": true,
+				},
+			},
+		},
+	}
+}
+
+func (u *Unstructured) UnstructuredContent() map[string]interface{} {
+	if u.Object == nil {
+		return make(map[string]interface{})
+	}
+	return u.Object
+}
+
+func (u *Unstructured) SetUnstructuredContent(content map[string]interface{}) {
+	u.Object = content
+}
+
+// MarshalJSON ensures that the unstructured object produces proper
+// JSON when passed to Go's standard JSON library.
+func (u *Unstructured) MarshalJSON() ([]byte, error) {
+	return json.Marshal(u.Object)
+}
+
+// UnmarshalJSON ensures that the unstructured object properly decodes
+// JSON when passed to Go's standard JSON library.
+func (u *Unstructured) UnmarshalJSON(b []byte) error {
+	return json.Unmarshal(b, &u.Object)
+}
+
+func (u *Unstructured) DeepCopy() *Unstructured {
+	if u == nil {
+		return nil
+	}
+	out := new(Unstructured)
+	*out = *u
+	out.Object = runtime.DeepCopyJSON(u.Object)
+	return out
+}
+
+func (u *Unstructured) DeepCopyInto(out *Unstructured) {
+	clone := u.DeepCopy()
+	*out = *clone
+}
+
+func (u *Unstructured) Set(field string, value interface{}) {
+	if u.Object == nil {
+		u.Object = make(map[string]interface{})
+	}
+	_ = unstructured.SetNestedField(u.Object, value, field)
+}
+
+func (u *Unstructured) Remove(fields ...string) {
+	if u.Object == nil {
+		u.Object = make(map[string]interface{})
+	}
+	unstructured.RemoveNestedField(u.Object, fields...)
+}
+
+func (u *Unstructured) SetNestedField(value interface{}, fields ...string) {
+	if u.Object == nil {
+		u.Object = make(map[string]interface{})
+	}
+	_ = unstructured.SetNestedField(u.Object, value, fields...)
+}
+
+func (u *Unstructured) GetNestedString(fields ...string) string {
+	val, found, err := unstructured.NestedString(u.Object, fields...)
+	if !found || err != nil {
+		return ""
+	}
+	return val
+}
+
+func (u *Unstructured) GetNestedStringSlice(fields ...string) []string {
+	val, found, err := unstructured.NestedStringSlice(u.Object, fields...)
+	if !found || err != nil {
+		return nil
+	}
+	return val
+}
+
+func (u *Unstructured) GetNestedInt64(fields ...string) int64 {
+	val, found, err := unstructured.NestedInt64(u.Object, fields...)
+	if !found || err != nil {
+		return 0
+	}
+	return val
+}
diff --git a/pkg/apimachinery/apis/common/v0alpha1/zz_generated.defaults.go b/pkg/apimachinery/apis/common/v0alpha1/zz_generated.defaults.go
new file mode 100644
index 0000000000000..238fc2f4edcfe
--- /dev/null
+++ b/pkg/apimachinery/apis/common/v0alpha1/zz_generated.defaults.go
@@ -0,0 +1,19 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by defaulter-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// RegisterDefaults adds defaulters functions to the given scheme.
+// Public to allow building arbitrary schemes.
+// All generated defaulters are covering - they call all nested defaulters.
+func RegisterDefaults(scheme *runtime.Scheme) error {
+	return nil
+}
diff --git a/pkg/apimachinery/apis/common/v0alpha1/zz_generated.openapi.go b/pkg/apimachinery/apis/common/v0alpha1/zz_generated.openapi.go
new file mode 100644
index 0000000000000..2dd8493f321ca
--- /dev/null
+++ b/pkg/apimachinery/apis/common/v0alpha1/zz_generated.openapi.go
@@ -0,0 +1,2539 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by openapi-gen. DO NOT EDIT.
+
+// This file was autogenerated by openapi-gen. Do not edit it manually!
+
+package v0alpha1
+
+import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	common "k8s.io/kube-openapi/pkg/common"
+	spec "k8s.io/kube-openapi/pkg/validation/spec"
+)
+
+func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
+	return map[string]common.OpenAPIDefinition{
+		"github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.ObjectReference": schema_apimachinery_apis_common_v0alpha1_ObjectReference(ref),
+		"github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured":    Unstructured{}.OpenAPIDefinition(),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup":                                    schema_pkg_apis_meta_v1_APIGroup(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList":                                schema_pkg_apis_meta_v1_APIGroupList(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.APIResource":                                 schema_pkg_apis_meta_v1_APIResource(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.APIResourceList":                             schema_pkg_apis_meta_v1_APIResourceList(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.APIVersions":                                 schema_pkg_apis_meta_v1_APIVersions(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.ApplyOptions":                                schema_pkg_apis_meta_v1_ApplyOptions(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.Condition":                                   schema_pkg_apis_meta_v1_Condition(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.CreateOptions":                               schema_pkg_apis_meta_v1_CreateOptions(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions":                               schema_pkg_apis_meta_v1_DeleteOptions(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.Duration":                                    schema_pkg_apis_meta_v1_Duration(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1":                                    schema_pkg_apis_meta_v1_FieldsV1(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions":                                  schema_pkg_apis_meta_v1_GetOptions(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind":                                   schema_pkg_apis_meta_v1_GroupKind(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource":                               schema_pkg_apis_meta_v1_GroupResource(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersion":                                schema_pkg_apis_meta_v1_GroupVersion(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery":                    schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionKind":                            schema_pkg_apis_meta_v1_GroupVersionKind(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionResource":                        schema_pkg_apis_meta_v1_GroupVersionResource(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.InternalEvent":                               schema_pkg_apis_meta_v1_InternalEvent(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector":                               schema_pkg_apis_meta_v1_LabelSelector(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement":                    schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.List":                                        schema_pkg_apis_meta_v1_List(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta":                                    schema_pkg_apis_meta_v1_ListMeta(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.ListOptions":                                 schema_pkg_apis_meta_v1_ListOptions(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry":                          schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.MicroTime":                                   schema_pkg_apis_meta_v1_MicroTime(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta":                                  schema_pkg_apis_meta_v1_ObjectMeta(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference":                              schema_pkg_apis_meta_v1_OwnerReference(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata":                       schema_pkg_apis_meta_v1_PartialObjectMetadata(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadataList":                   schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.Patch":                                       schema_pkg_apis_meta_v1_Patch(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions":                                schema_pkg_apis_meta_v1_PatchOptions(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions":                               schema_pkg_apis_meta_v1_Preconditions(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths":                                   schema_pkg_apis_meta_v1_RootPaths(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR":                   schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.Status":                                      schema_pkg_apis_meta_v1_Status(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause":                                 schema_pkg_apis_meta_v1_StatusCause(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails":                               schema_pkg_apis_meta_v1_StatusDetails(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.Table":                                       schema_pkg_apis_meta_v1_Table(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition":                       schema_pkg_apis_meta_v1_TableColumnDefinition(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.TableOptions":                                schema_pkg_apis_meta_v1_TableOptions(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.TableRow":                                    schema_pkg_apis_meta_v1_TableRow(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition":                           schema_pkg_apis_meta_v1_TableRowCondition(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.Time":                                        schema_pkg_apis_meta_v1_Time(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.Timestamp":                                   schema_pkg_apis_meta_v1_Timestamp(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta":                                    schema_pkg_apis_meta_v1_TypeMeta(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.UpdateOptions":                               schema_pkg_apis_meta_v1_UpdateOptions(ref),
+		"k8s.io/apimachinery/pkg/apis/meta/v1.WatchEvent":                                  schema_pkg_apis_meta_v1_WatchEvent(ref),
+		"k8s.io/apimachinery/pkg/runtime.RawExtension":                                     schema_k8sio_apimachinery_pkg_runtime_RawExtension(ref),
+		"k8s.io/apimachinery/pkg/runtime.TypeMeta":                                         schema_k8sio_apimachinery_pkg_runtime_TypeMeta(ref),
+		"k8s.io/apimachinery/pkg/runtime.Unknown":                                          schema_k8sio_apimachinery_pkg_runtime_Unknown(ref),
+		"k8s.io/apimachinery/pkg/version.Info":                                             schema_k8sio_apimachinery_pkg_version_Info(ref),
+	}
+}
+
+func schema_apimachinery_apis_common_v0alpha1_ObjectReference(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Similar to https://dev-k8sref-io.web.app/docs/common-definitions/objectreference-/ ObjectReference contains enough information to let you inspect or modify the referred object.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"resource": {
+						SchemaProps: spec.SchemaProps{
+							Type:   []string{"string"},
+							Format: "",
+						},
+					},
+					"namespace": {
+						SchemaProps: spec.SchemaProps{
+							Type:   []string{"string"},
+							Format: "",
+						},
+					},
+					"name": {
+						SchemaProps: spec.SchemaProps{
+							Type:   []string{"string"},
+							Format: "",
+						},
+					},
+					"apiGroup": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIGroup is the name of the API group that contains the referred object. The empty string represents the core API group.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion is the version of the API group that contains the referred object.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_APIGroup(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "APIGroup contains the name, the supported versions, and the preferred version of a group.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"name": {
+						SchemaProps: spec.SchemaProps{
+							Description: "name is the name of the group.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"versions": {
+						SchemaProps: spec.SchemaProps{
+							Description: "versions are the versions supported in this group.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery"),
+									},
+								},
+							},
+						},
+					},
+					"preferredVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "preferredVersion is the version preferred by the API server, which probably is the storage version.",
+							Default:     map[string]interface{}{},
+							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery"),
+						},
+					},
+					"serverAddressByClientCIDRs": {
+						SchemaProps: spec.SchemaProps{
+							Description: "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR"),
+									},
+								},
+							},
+						},
+					},
+				},
+				Required: []string{"name", "versions"},
+			},
+		},
+		Dependencies: []string{
+			"k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery", "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR"},
+	}
+}
+
+func schema_pkg_apis_meta_v1_APIGroupList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "APIGroupList is a list of APIGroup, to allow clients to discover the API at /apis.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"groups": {
+						SchemaProps: spec.SchemaProps{
+							Description: "groups is a list of APIGroup.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup"),
+									},
+								},
+							},
+						},
+					},
+				},
+				Required: []string{"groups"},
+			},
+		},
+		Dependencies: []string{
+			"k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup"},
+	}
+}
+
+func schema_pkg_apis_meta_v1_APIResource(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "APIResource specifies the name of a resource and whether it is namespaced.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"name": {
+						SchemaProps: spec.SchemaProps{
+							Description: "name is the plural name of the resource.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"singularName": {
+						SchemaProps: spec.SchemaProps{
+							Description: "singularName is the singular name of the resource.  This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"namespaced": {
+						SchemaProps: spec.SchemaProps{
+							Description: "namespaced indicates if a resource is namespaced or not.",
+							Default:     false,
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+					"group": {
+						SchemaProps: spec.SchemaProps{
+							Description: "group is the preferred group of the resource.  Empty implies the group of the containing resource list. For subresources, this may have a different value, for example: Scale\".",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"version": {
+						SchemaProps: spec.SchemaProps{
+							Description: "version is the preferred version of the resource.  Empty implies the version of the containing resource list For subresources, this may have a different value, for example: v1 (while inside a v1beta1 version of the core resource's group)\".",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "kind is the kind for the resource (e.g. 'Foo' is the kind for a resource 'foo')",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"verbs": {
+						SchemaProps: spec.SchemaProps{
+							Description: "verbs is a list of supported kube verbs (this includes get, list, watch, create, update, patch, delete, deletecollection, and proxy)",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: "",
+										Type:    []string{"string"},
+										Format:  "",
+									},
+								},
+							},
+						},
+					},
+					"shortNames": {
+						SchemaProps: spec.SchemaProps{
+							Description: "shortNames is a list of suggested short names of the resource.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: "",
+										Type:    []string{"string"},
+										Format:  "",
+									},
+								},
+							},
+						},
+					},
+					"categories": {
+						SchemaProps: spec.SchemaProps{
+							Description: "categories is a list of the grouped resources this resource belongs to (e.g. 'all')",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: "",
+										Type:    []string{"string"},
+										Format:  "",
+									},
+								},
+							},
+						},
+					},
+					"storageVersionHash": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The hash value of the storage version, the version this resource is converted to when written to the data store. Value must be treated as opaque by clients. Only equality comparison on the value is valid. This is an alpha feature and may change or be removed in the future. The field is populated by the apiserver only if the StorageVersionHash feature gate is enabled. This field will remain optional even if it graduates.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+				Required: []string{"name", "singularName", "namespaced", "kind", "verbs"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_APIResourceList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"groupVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "groupVersion is the group and version this APIResourceList is for.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"resources": {
+						SchemaProps: spec.SchemaProps{
+							Description: "resources contains the name of the resources and if they are namespaced.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.APIResource"),
+									},
+								},
+							},
+						},
+					},
+				},
+				Required: []string{"groupVersion", "resources"},
+			},
+		},
+		Dependencies: []string{
+			"k8s.io/apimachinery/pkg/apis/meta/v1.APIResource"},
+	}
+}
+
+func schema_pkg_apis_meta_v1_APIVersions(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "APIVersions lists the versions that are available, to allow clients to discover the API at /api, which is the root path of the legacy v1 API.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"versions": {
+						SchemaProps: spec.SchemaProps{
+							Description: "versions are the api versions that are available.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: "",
+										Type:    []string{"string"},
+										Format:  "",
+									},
+								},
+							},
+						},
+					},
+					"serverAddressByClientCIDRs": {
+						SchemaProps: spec.SchemaProps{
+							Description: "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR"),
+									},
+								},
+							},
+						},
+					},
+				},
+				Required: []string{"versions", "serverAddressByClientCIDRs"},
+			},
+		},
+		Dependencies: []string{
+			"k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR"},
+	}
+}
+
+func schema_pkg_apis_meta_v1_ApplyOptions(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "ApplyOptions may be provided when applying an API object. FieldManager is required for apply requests. ApplyOptions is equivalent to PatchOptions. It is provided as a convenience with documentation that speaks specifically to how the options fields relate to apply.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"dryRun": {
+						SchemaProps: spec.SchemaProps{
+							Description: "When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: "",
+										Type:    []string{"string"},
+										Format:  "",
+									},
+								},
+							},
+						},
+					},
+					"force": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Force is going to \"force\" Apply requests. It means user will re-acquire conflicting fields owned by other people.",
+							Default:     false,
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+					"fieldManager": {
+						SchemaProps: spec.SchemaProps{
+							Description: "fieldManager is a name associated with the actor or entity that is making these changes. The value must be less than or 128 characters long, and only contain printable characters, as defined by https://golang.org/pkg/unicode/#IsPrint. This field is required.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+				Required: []string{"force", "fieldManager"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_Condition(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Condition contains details for one aspect of the current state of this API Resource.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"type": {
+						SchemaProps: spec.SchemaProps{
+							Description: "type of condition in CamelCase or in foo.example.com/CamelCase.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"status": {
+						SchemaProps: spec.SchemaProps{
+							Description: "status of the condition, one of True, False, Unknown.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"observedGeneration": {
+						SchemaProps: spec.SchemaProps{
+							Description: "observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance.",
+							Type:        []string{"integer"},
+							Format:      "int64",
+						},
+					},
+					"lastTransitionTime": {
+						SchemaProps: spec.SchemaProps{
+							Description: "lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.",
+							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"),
+						},
+					},
+					"reason": {
+						SchemaProps: spec.SchemaProps{
+							Description: "reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"message": {
+						SchemaProps: spec.SchemaProps{
+							Description: "message is a human readable message indicating details about the transition. This may be an empty string.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+				Required: []string{"type", "status", "lastTransitionTime", "reason", "message"},
+			},
+		},
+		Dependencies: []string{
+			"k8s.io/apimachinery/pkg/apis/meta/v1.Time"},
+	}
+}
+
+func schema_pkg_apis_meta_v1_CreateOptions(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "CreateOptions may be provided when creating an API object.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"dryRun": {
+						SchemaProps: spec.SchemaProps{
+							Description: "When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: "",
+										Type:    []string{"string"},
+										Format:  "",
+									},
+								},
+							},
+						},
+					},
+					"fieldManager": {
+						SchemaProps: spec.SchemaProps{
+							Description: "fieldManager is a name associated with the actor or entity that is making these changes. The value must be less than or 128 characters long, and only contain printable characters, as defined by https://golang.org/pkg/unicode/#IsPrint.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"fieldValidation": {
+						SchemaProps: spec.SchemaProps{
+							Description: "fieldValidation instructs the server on how to handle objects in the request (POST/PUT/PATCH) containing unknown or duplicate fields. Valid values are: - Ignore: This will ignore any unknown fields that are silently dropped from the object, and will ignore all but the last duplicate field that the decoder encounters. This is the default behavior prior to v1.23. - Warn: This will send a warning via the standard warning response header for each unknown field that is dropped from the object, and for each duplicate field that is encountered. The request will still succeed if there are no other errors, and will only persist the last of any duplicate fields. This is the default in v1.23+ - Strict: This will fail the request with a BadRequest error if any unknown fields would be dropped from the object, or if any duplicate fields are present. The error returned from the server will contain all unknown and duplicate fields encountered.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_DeleteOptions(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "DeleteOptions may be provided when deleting an API object.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"gracePeriodSeconds": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The duration in seconds before the object should be deleted. Value must be non-negative integer. The value zero indicates delete immediately. If this value is nil, the default grace period for the specified type will be used. Defaults to a per object value if not specified. zero means delete immediately.",
+							Type:        []string{"integer"},
+							Format:      "int64",
+						},
+					},
+					"preconditions": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Must be fulfilled before a deletion is carried out. If not possible, a 409 Conflict status will be returned.",
+							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions"),
+						},
+					},
+					"orphanDependents": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Deprecated: please use the PropagationPolicy, this field will be deprecated in 1.7. Should the dependent objects be orphaned. If true/false, the \"orphan\" finalizer will be added to/removed from the object's finalizers list. Either this field or PropagationPolicy may be set, but not both.",
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+					"propagationPolicy": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy. Acceptable values are: 'Orphan' - orphan the dependents; 'Background' - allow the garbage collector to delete the dependents in the background; 'Foreground' - a cascading policy that deletes all dependents in the foreground.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"dryRun": {
+						SchemaProps: spec.SchemaProps{
+							Description: "When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: "",
+										Type:    []string{"string"},
+										Format:  "",
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions"},
+	}
+}
+
+func schema_pkg_apis_meta_v1_Duration(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Duration is a wrapper around time.Duration which supports correct marshaling to YAML and JSON. In particular, it marshals into strings, which can be used as map keys in json.",
+				Type:        v1.Duration{}.OpenAPISchemaType(),
+				Format:      v1.Duration{}.OpenAPISchemaFormat(),
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_FieldsV1(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "FieldsV1 stores a set of fields in a data structure like a Trie, in JSON format.\n\nEach key is either a '.' representing the field itself, and will always map to an empty set, or a string representing a sub-field or item. The string will follow one of these four formats: 'f:<name>', where <name> is the name of a field in a struct, or key in a map 'v:<value>', where <value> is the exact json formatted value of a list item 'i:<index>', where <index> is position of a item in a list 'k:<keys>', where <keys> is a map of  a list item's key fields to their unique values If a key maps to an empty Fields value, the field that key represents is part of the set.\n\nThe exact format is defined in sigs.k8s.io/structured-merge-diff",
+				Type:        []string{"object"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_GetOptions(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "GetOptions is the standard query options to the standard REST get call.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"resourceVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "resourceVersion sets a constraint on what resource versions a request may be served from. See https://kubernetes.io/docs/reference/using-api/api-concepts/#resource-versions for details.\n\nDefaults to unset",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_GroupKind(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "GroupKind specifies a Group and a Kind, but does not force a version.  This is useful for identifying concepts during lookup stages without having partially valid types",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"group": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+				},
+				Required: []string{"group", "kind"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_GroupResource(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "GroupResource specifies a Group and a Resource, but does not force a version.  This is useful for identifying concepts during lookup stages without having partially valid types",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"group": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+					"resource": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+				},
+				Required: []string{"group", "resource"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_GroupVersion(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "GroupVersion contains the \"group\" and the \"version\", which uniquely identifies the API.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"group": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+					"version": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+				},
+				Required: []string{"group", "version"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"groupVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "groupVersion specifies the API group and version in the form \"group/version\"",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"version": {
+						SchemaProps: spec.SchemaProps{
+							Description: "version specifies the version in the form of \"version\". This is to save the clients the trouble of splitting the GroupVersion.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+				Required: []string{"groupVersion", "version"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_GroupVersionKind(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "GroupVersionKind unambiguously identifies a kind.  It doesn't anonymously include GroupVersion to avoid automatic coercion.  It doesn't use a GroupVersion to avoid custom marshalling",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"group": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+					"version": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+				},
+				Required: []string{"group", "version", "kind"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_GroupVersionResource(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "GroupVersionResource unambiguously identifies a resource.  It doesn't anonymously include GroupVersion to avoid automatic coercion.  It doesn't use a GroupVersion to avoid custom marshalling",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"group": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+					"version": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+					"resource": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+				},
+				Required: []string{"group", "version", "resource"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_InternalEvent(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "InternalEvent makes watch.Event versioned",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"Type": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+					"Object": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Object is:\n * If Type is Added or Modified: the new state of the object.\n * If Type is Deleted: the state of the object immediately before deletion.\n * If Type is Bookmark: the object (instance of a type being watched) where\n   only ResourceVersion field is set. On successful restart of watch from a\n   bookmark resourceVersion, client is guaranteed to not get repeat event\n   nor miss any events.\n * If Type is Error: *api.Status is recommended; other types may make sense\n   depending on context.",
+							Ref:         ref("k8s.io/apimachinery/pkg/runtime.Object"),
+						},
+					},
+				},
+				Required: []string{"Type", "Object"},
+			},
+		},
+		Dependencies: []string{
+			"k8s.io/apimachinery/pkg/runtime.Object"},
+	}
+}
+
+func schema_pkg_apis_meta_v1_LabelSelector(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"matchLabels": {
+						SchemaProps: spec.SchemaProps{
+							Description: "matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is \"key\", the operator is \"In\", and the values array contains only \"value\". The requirements are ANDed.",
+							Type:        []string{"object"},
+							AdditionalProperties: &spec.SchemaOrBool{
+								Allows: true,
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: "",
+										Type:    []string{"string"},
+										Format:  "",
+									},
+								},
+							},
+						},
+					},
+					"matchExpressions": {
+						SchemaProps: spec.SchemaProps{
+							Description: "matchExpressions is a list of label selector requirements. The requirements are ANDed.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement"),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+			VendorExtensible: spec.VendorExtensible{
+				Extensions: spec.Extensions{
+					"x-kubernetes-map-type": "atomic",
+				},
+			},
+		},
+		Dependencies: []string{
+			"k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement"},
+	}
+}
+
+func schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"key": {
+						SchemaProps: spec.SchemaProps{
+							Description: "key is the label key that the selector applies to.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"operator": {
+						SchemaProps: spec.SchemaProps{
+							Description: "operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"values": {
+						SchemaProps: spec.SchemaProps{
+							Description: "values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: "",
+										Type:    []string{"string"},
+										Format:  "",
+									},
+								},
+							},
+						},
+					},
+				},
+				Required: []string{"key", "operator"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_List(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "List holds a list of objects, which may not be known by the server.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Default:     map[string]interface{}{},
+							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Description: "List of objects",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Ref: ref("k8s.io/apimachinery/pkg/runtime.RawExtension"),
+									},
+								},
+							},
+						},
+					},
+				},
+				Required: []string{"items"},
+			},
+		},
+		Dependencies: []string{
+			"k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "k8s.io/apimachinery/pkg/runtime.RawExtension"},
+	}
+}
+
+func schema_pkg_apis_meta_v1_ListMeta(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"selfLink": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Deprecated: selfLink is a legacy read-only field that is no longer populated by the system.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"resourceVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "String that identifies the server's internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"continue": {
+						SchemaProps: spec.SchemaProps{
+							Description: "continue may be set if the user set a limit on the number of items returned, and indicates that the server has more data available. The value is opaque and may be used to issue another request to the endpoint that served this list to retrieve the next set of available objects. Continuing a consistent list may not be possible if the server configuration has changed or more than a few minutes have passed. The resourceVersion field returned when using this continue value will be identical to the value in the first response, unless you have received this token from an error message.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"remainingItemCount": {
+						SchemaProps: spec.SchemaProps{
+							Description: "remainingItemCount is the number of subsequent items in the list which are not included in this list response. If the list request contained label or field selectors, then the number of remaining items is unknown and the field will be left unset and omitted during serialization. If the list is complete (either because it is not chunking or because this is the last chunk), then there are no more remaining items and this field will be left unset and omitted during serialization. Servers older than v1.15 do not set this field. The intended use of the remainingItemCount is *estimating* the size of a collection. Clients should not rely on the remainingItemCount to be set or to be exact.",
+							Type:        []string{"integer"},
+							Format:      "int64",
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_ListOptions(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "ListOptions is the query options to a standard REST list call.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"labelSelector": {
+						SchemaProps: spec.SchemaProps{
+							Description: "A selector to restrict the list of returned objects by their labels. Defaults to everything.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"fieldSelector": {
+						SchemaProps: spec.SchemaProps{
+							Description: "A selector to restrict the list of returned objects by their fields. Defaults to everything.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"watch": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.",
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+					"allowWatchBookmarks": {
+						SchemaProps: spec.SchemaProps{
+							Description: "allowWatchBookmarks requests watch events with type \"BOOKMARK\". Servers that do not implement bookmarks may ignore this flag and bookmarks are sent at the server's discretion. Clients should not assume bookmarks are returned at any specific interval, nor may they assume the server will send any BOOKMARK event during a session. If this is not a watch, this field is ignored.",
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+					"resourceVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "resourceVersion sets a constraint on what resource versions a request may be served from. See https://kubernetes.io/docs/reference/using-api/api-concepts/#resource-versions for details.\n\nDefaults to unset",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"resourceVersionMatch": {
+						SchemaProps: spec.SchemaProps{
+							Description: "resourceVersionMatch determines how resourceVersion is applied to list calls. It is highly recommended that resourceVersionMatch be set for list calls where resourceVersion is set See https://kubernetes.io/docs/reference/using-api/api-concepts/#resource-versions for details.\n\nDefaults to unset",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"timeoutSeconds": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Timeout for the list/watch call. This limits the duration of the call, regardless of any activity or inactivity.",
+							Type:        []string{"integer"},
+							Format:      "int64",
+						},
+					},
+					"limit": {
+						SchemaProps: spec.SchemaProps{
+							Description: "limit is a maximum number of responses to return for a list call. If more items exist, the server will set the `continue` field on the list metadata to a value that can be used with the same initial query to retrieve the next set of results. Setting a limit may return fewer than the requested amount of items (up to zero items) in the event all requested objects are filtered out and clients should only use the presence of the continue field to determine whether more results are available. Servers may choose not to support the limit argument and will return all of the available results. If limit is specified and the continue field is empty, clients may assume that no more results are available. This field is not supported if watch is true.\n\nThe server guarantees that the objects returned when using continue will be identical to issuing a single list call without a limit - that is, no objects created, modified, or deleted after the first request is issued will be included in any subsequent continued requests. This is sometimes referred to as a consistent snapshot, and ensures that a client that is using limit to receive smaller chunks of a very large result can ensure they see all possible objects. If objects are updated during a chunked list the version of the object that was present at the time the first list result was calculated is returned.",
+							Type:        []string{"integer"},
+							Format:      "int64",
+						},
+					},
+					"continue": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The continue option should be set when retrieving more results from the server. Since this value is server defined, clients may only use the continue value from a previous query result with identical query parameters (except for the value of continue) and the server may reject a continue value it does not recognize. If the specified continue value is no longer valid whether due to expiration (generally five to fifteen minutes) or a configuration change on the server, the server will respond with a 410 ResourceExpired error together with a continue token. If the client needs a consistent list, it must restart their list without the continue field. Otherwise, the client may send another list request with the token received with the 410 error, the server will respond with a list starting from the next key, but from the latest snapshot, which is inconsistent from the previous list results - objects that are created, modified, or deleted after the first list request will be included in the response, as long as their keys are after the \"next key\".\n\nThis field is not supported when watch is true. Clients may start a watch from the last resourceVersion value returned by the server and not miss any modifications.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"sendInitialEvents": {
+						SchemaProps: spec.SchemaProps{
+							Description: "`sendInitialEvents=true` may be set together with `watch=true`. In that case, the watch stream will begin with synthetic events to produce the current state of objects in the collection. Once all such events have been sent, a synthetic \"Bookmark\" event  will be sent. The bookmark will report the ResourceVersion (RV) corresponding to the set of objects, and be marked with `\"k8s.io/initial-events-end\": \"true\"` annotation. Afterwards, the watch stream will proceed as usual, sending watch events corresponding to changes (subsequent to the RV) to objects watched.\n\nWhen `sendInitialEvents` option is set, we require `resourceVersionMatch` option to also be set. The semantic of the watch request is as following: - `resourceVersionMatch` = NotOlderThan\n  is interpreted as \"data at least as new as the provided `resourceVersion`\"\n  and the bookmark event is send when the state is synced\n  to a `resourceVersion` at least as fresh as the one provided by the ListOptions.\n  If `resourceVersion` is unset, this is interpreted as \"consistent read\" and the\n  bookmark event is send when the state is synced at least to the moment\n  when request started being processed.\n- `resourceVersionMatch` set to any other value or unset\n  Invalid error is returned.\n\nDefaults to true if `resourceVersion=\"\"` or `resourceVersion=\"0\"` (for backward compatibility reasons) and to false otherwise.",
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "ManagedFieldsEntry is a workflow-id, a FieldSet and the group version of the resource that the fieldset applies to.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"manager": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Manager is an identifier of the workflow managing these fields.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"operation": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Operation is the type of operation which lead to this ManagedFieldsEntry being created. The only valid values for this field are 'Apply' and 'Update'.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the version of this resource that this field set applies to. The format is \"group/version\" just like the top-level APIVersion field. It is necessary to track the version of a field set because it cannot be automatically converted.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"time": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Time is the timestamp of when the ManagedFields entry was added. The timestamp will also be updated if a field is added, the manager changes any of the owned fields value or removes a field. The timestamp does not update when a field is removed from the entry because another manager took it over.",
+							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"),
+						},
+					},
+					"fieldsType": {
+						SchemaProps: spec.SchemaProps{
+							Description: "FieldsType is the discriminator for the different fields format and version. There is currently only one possible value: \"FieldsV1\"",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"fieldsV1": {
+						SchemaProps: spec.SchemaProps{
+							Description: "FieldsV1 holds the first JSON version format as described in the \"FieldsV1\" type.",
+							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1"),
+						},
+					},
+					"subresource": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Subresource is the name of the subresource used to update that object, or empty string if the object was updated through the main resource. The value of this field is used to distinguish between managers, even if they share the same name. For example, a status update will be distinct from a regular update using the same manager name. Note that the APIVersion field is not related to the Subresource field and it always corresponds to the version of the main resource.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"},
+	}
+}
+
+func schema_pkg_apis_meta_v1_MicroTime(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "MicroTime is version of Time with microsecond level precision.",
+				Type:        v1.MicroTime{}.OpenAPISchemaType(),
+				Format:      v1.MicroTime{}.OpenAPISchemaFormat(),
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_ObjectMeta(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "ObjectMeta is metadata that all persisted resources must have, which includes all objects users must create.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"name": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Name must be unique within a namespace. Is required when creating resources, although some resources may allow a client to request the generation of an appropriate name automatically. Name is primarily intended for creation idempotence and configuration definition. Cannot be updated. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#names",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"generateName": {
+						SchemaProps: spec.SchemaProps{
+							Description: "GenerateName is an optional prefix, used by the server, to generate a unique name ONLY IF the Name field has not been provided. If this field is used, the name returned to the client will be different than the name passed. This value will also be combined with a unique suffix. The provided value has the same validation rules as the Name field, and may be truncated by the length of the suffix required to make the value unique on the server.\n\nIf this field is specified and the generated name exists, the server will return a 409.\n\nApplied only if Name is not specified. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"namespace": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Namespace defines the space within which each name must be unique. An empty namespace is equivalent to the \"default\" namespace, but \"default\" is the canonical representation. Not all objects are required to be scoped to a namespace - the value of this field for those objects will be empty.\n\nMust be a DNS_LABEL. Cannot be updated. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"selfLink": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Deprecated: selfLink is a legacy read-only field that is no longer populated by the system.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"uid": {
+						SchemaProps: spec.SchemaProps{
+							Description: "UID is the unique in time and space value for this object. It is typically generated by the server on successful creation of a resource and is not allowed to change on PUT operations.\n\nPopulated by the system. Read-only. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#uids",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"resourceVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "An opaque value that represents the internal version of this object that can be used by clients to determine when objects have changed. May be used for optimistic concurrency, change detection, and the watch operation on a resource or set of resources. Clients must treat these values as opaque and passed unmodified back to the server. They may only be valid for a particular resource or set of resources.\n\nPopulated by the system. Read-only. Value must be treated as opaque by clients and . More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"generation": {
+						SchemaProps: spec.SchemaProps{
+							Description: "A sequence number representing a specific generation of the desired state. Populated by the system. Read-only.",
+							Type:        []string{"integer"},
+							Format:      "int64",
+						},
+					},
+					"creationTimestamp": {
+						SchemaProps: spec.SchemaProps{
+							Description: "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata",
+							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"),
+						},
+					},
+					"deletionTimestamp": {
+						SchemaProps: spec.SchemaProps{
+							Description: "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field, once the finalizers list is empty. As long as the finalizers list contains items, deletion is blocked. Once the deletionTimestamp is set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata",
+							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"),
+						},
+					},
+					"deletionGracePeriodSeconds": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Number of seconds allowed for this object to gracefully terminate before it will be removed from the system. Only set when deletionTimestamp is also set. May only be shortened. Read-only.",
+							Type:        []string{"integer"},
+							Format:      "int64",
+						},
+					},
+					"labels": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Map of string keys and values that can be used to organize and categorize (scope and select) objects. May match selectors of replication controllers and services. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels",
+							Type:        []string{"object"},
+							AdditionalProperties: &spec.SchemaOrBool{
+								Allows: true,
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: "",
+										Type:    []string{"string"},
+										Format:  "",
+									},
+								},
+							},
+						},
+					},
+					"annotations": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. They are not queryable and should be preserved when modifying objects. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations",
+							Type:        []string{"object"},
+							AdditionalProperties: &spec.SchemaOrBool{
+								Allows: true,
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: "",
+										Type:    []string{"string"},
+										Format:  "",
+									},
+								},
+							},
+						},
+					},
+					"ownerReferences": {
+						VendorExtensible: spec.VendorExtensible{
+							Extensions: spec.Extensions{
+								"x-kubernetes-patch-merge-key": "uid",
+								"x-kubernetes-patch-strategy":  "merge",
+							},
+						},
+						SchemaProps: spec.SchemaProps{
+							Description: "List of objects depended by this object. If ALL objects in the list have been deleted, this object will be garbage collected. If this object is managed by a controller, then an entry in this list will point to this controller, with the controller field set to true. There cannot be more than one managing controller.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference"),
+									},
+								},
+							},
+						},
+					},
+					"finalizers": {
+						VendorExtensible: spec.VendorExtensible{
+							Extensions: spec.Extensions{
+								"x-kubernetes-patch-strategy": "merge",
+							},
+						},
+						SchemaProps: spec.SchemaProps{
+							Description: "Must be empty before the object is deleted from the registry. Each entry is an identifier for the responsible component that will remove the entry from the list. If the deletionTimestamp of the object is non-nil, entries in this list can only be removed. Finalizers may be processed and removed in any order.  Order is NOT enforced because it introduces significant risk of stuck finalizers. finalizers is a shared field, any actor with permission can reorder it. If the finalizer list is processed in order, then this can lead to a situation in which the component responsible for the first finalizer in the list is waiting for a signal (field value, external system, or other) produced by a component responsible for a finalizer later in the list, resulting in a deadlock. Without enforced ordering finalizers are free to order amongst themselves and are not vulnerable to ordering changes in the list.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: "",
+										Type:    []string{"string"},
+										Format:  "",
+									},
+								},
+							},
+						},
+					},
+					"managedFields": {
+						SchemaProps: spec.SchemaProps{
+							Description: "ManagedFields maps workflow-id and version to the set of fields that are managed by that workflow. This is mostly for internal housekeeping, and users typically shouldn't need to set or understand this field. A workflow can be the user's name, a controller's name, or the name of a specific apply path like \"ci-cd\". The set of fields is always in the version that the workflow used when modifying the object.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry"),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry", "k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"},
+	}
+}
+
+func schema_pkg_apis_meta_v1_OwnerReference(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "OwnerReference contains enough information to let you identify an owning object. An owning object must be in the same namespace as the dependent, or be cluster-scoped, so there is no namespace field.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "API version of the referent.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"name": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#names",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"uid": {
+						SchemaProps: spec.SchemaProps{
+							Description: "UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#uids",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"controller": {
+						SchemaProps: spec.SchemaProps{
+							Description: "If true, this reference points to the managing controller.",
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+					"blockOwnerDeletion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "If true, AND if the owner has the \"foregroundDeletion\" finalizer, then the owner cannot be deleted from the key-value store until this reference is removed. See https://kubernetes.io/docs/concepts/architecture/garbage-collection/#foreground-deletion for how the garbage collector interacts with this field and enforces the foreground deletion. Defaults to false. To set this field, a user needs \"delete\" permission of the owner, otherwise 422 (Unprocessable Entity) will be returned.",
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+				},
+				Required: []string{"apiVersion", "kind", "name", "uid"},
+			},
+			VendorExtensible: spec.VendorExtensible{
+				Extensions: spec.Extensions{
+					"x-kubernetes-map-type": "atomic",
+				},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_PartialObjectMetadata(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "PartialObjectMetadata is a generic representation of any object with ObjectMeta. It allows clients to get access to a particular ObjectMeta schema without knowing the details of the version.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata",
+							Default:     map[string]interface{}{},
+							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+	}
+}
+
+func schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "PartialObjectMetadataList contains a list of objects containing only their metadata",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Default:     map[string]interface{}{},
+							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Description: "items contains each of the included items.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata"),
+									},
+								},
+							},
+						},
+					},
+				},
+				Required: []string{"items"},
+			},
+		},
+		Dependencies: []string{
+			"k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata"},
+	}
+}
+
+func schema_pkg_apis_meta_v1_Patch(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.",
+				Type:        []string{"object"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_PatchOptions(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "PatchOptions may be provided when patching an API object. PatchOptions is meant to be a superset of UpdateOptions.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"dryRun": {
+						SchemaProps: spec.SchemaProps{
+							Description: "When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: "",
+										Type:    []string{"string"},
+										Format:  "",
+									},
+								},
+							},
+						},
+					},
+					"force": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Force is going to \"force\" Apply requests. It means user will re-acquire conflicting fields owned by other people. Force flag must be unset for non-apply patch requests.",
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+					"fieldManager": {
+						SchemaProps: spec.SchemaProps{
+							Description: "fieldManager is a name associated with the actor or entity that is making these changes. The value must be less than or 128 characters long, and only contain printable characters, as defined by https://golang.org/pkg/unicode/#IsPrint. This field is required for apply requests (application/apply-patch) but optional for non-apply patch types (JsonPatch, MergePatch, StrategicMergePatch).",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"fieldValidation": {
+						SchemaProps: spec.SchemaProps{
+							Description: "fieldValidation instructs the server on how to handle objects in the request (POST/PUT/PATCH) containing unknown or duplicate fields. Valid values are: - Ignore: This will ignore any unknown fields that are silently dropped from the object, and will ignore all but the last duplicate field that the decoder encounters. This is the default behavior prior to v1.23. - Warn: This will send a warning via the standard warning response header for each unknown field that is dropped from the object, and for each duplicate field that is encountered. The request will still succeed if there are no other errors, and will only persist the last of any duplicate fields. This is the default in v1.23+ - Strict: This will fail the request with a BadRequest error if any unknown fields would be dropped from the object, or if any duplicate fields are present. The error returned from the server will contain all unknown and duplicate fields encountered.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_Preconditions(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Preconditions must be fulfilled before an operation (update, delete, etc.) is carried out.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"uid": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Specifies the target UID.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"resourceVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Specifies the target ResourceVersion",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_RootPaths(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "RootPaths lists the paths available at root. For example: \"/healthz\", \"/apis\".",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"paths": {
+						SchemaProps: spec.SchemaProps{
+							Description: "paths are the paths available at root.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: "",
+										Type:    []string{"string"},
+										Format:  "",
+									},
+								},
+							},
+						},
+					},
+				},
+				Required: []string{"paths"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"clientCIDR": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The CIDR with which clients can match their IP to figure out the server address that they should use.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"serverAddress": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Address of this server, suitable for a client that matches the above CIDR. This can be a hostname, hostname:port, IP or IP:port.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+				Required: []string{"clientCIDR", "serverAddress"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_Status(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Status is a return value for calls that don't return other objects.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Default:     map[string]interface{}{},
+							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+						},
+					},
+					"status": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Status of the operation. One of: \"Success\" or \"Failure\". More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"message": {
+						SchemaProps: spec.SchemaProps{
+							Description: "A human-readable description of the status of this operation.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"reason": {
+						SchemaProps: spec.SchemaProps{
+							Description: "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"details": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Extended data associated with the reason.  Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.",
+							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails"),
+						},
+					},
+					"code": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Suggested HTTP return code for this status, 0 if not set.",
+							Type:        []string{"integer"},
+							Format:      "int32",
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails"},
+	}
+}
+
+func schema_pkg_apis_meta_v1_StatusCause(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"reason": {
+						SchemaProps: spec.SchemaProps{
+							Description: "A machine-readable description of the cause of the error. If this value is empty there is no information available.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"message": {
+						SchemaProps: spec.SchemaProps{
+							Description: "A human-readable description of the cause of the error.  This field may be presented as-is to a reader.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"field": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed.  Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.\n\nExamples:\n  \"name\" - the field \"name\" on the current resource\n  \"items[0].name\" - the field \"name\" on the first array entry in \"items\"",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_StatusDetails(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"name": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"group": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The group attribute of the resource associated with the status StatusReason.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"uid": {
+						SchemaProps: spec.SchemaProps{
+							Description: "UID of the resource. (when there is a single resource which can be described). More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#uids",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"causes": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause"),
+									},
+								},
+							},
+						},
+					},
+					"retryAfterSeconds": {
+						SchemaProps: spec.SchemaProps{
+							Description: "If specified, the time in seconds before the operation should be retried. Some errors may indicate the client must take an alternate action - for those errors this field may indicate how long to wait before taking the alternate action.",
+							Type:        []string{"integer"},
+							Format:      "int32",
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause"},
+	}
+}
+
+func schema_pkg_apis_meta_v1_Table(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Table is a tabular representation of a set of API resources. The server transforms the object into a set of preferred columns for quickly reviewing the objects.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Default:     map[string]interface{}{},
+							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+						},
+					},
+					"columnDefinitions": {
+						SchemaProps: spec.SchemaProps{
+							Description: "columnDefinitions describes each column in the returned items array. The number of cells per row will always match the number of column definitions.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition"),
+									},
+								},
+							},
+						},
+					},
+					"rows": {
+						SchemaProps: spec.SchemaProps{
+							Description: "rows is the list of items in the table.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.TableRow"),
+									},
+								},
+							},
+						},
+					},
+				},
+				Required: []string{"columnDefinitions", "rows"},
+			},
+		},
+		Dependencies: []string{
+			"k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition", "k8s.io/apimachinery/pkg/apis/meta/v1.TableRow"},
+	}
+}
+
+func schema_pkg_apis_meta_v1_TableColumnDefinition(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "TableColumnDefinition contains information about a column returned in the Table.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"name": {
+						SchemaProps: spec.SchemaProps{
+							Description: "name is a human readable name for the column.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"type": {
+						SchemaProps: spec.SchemaProps{
+							Description: "type is an OpenAPI type definition for this column, such as number, integer, string, or array. See https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#data-types for more.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"format": {
+						SchemaProps: spec.SchemaProps{
+							Description: "format is an optional OpenAPI type modifier for this column. A format modifies the type and imposes additional rules, like date or time formatting for a string. The 'name' format is applied to the primary identifier column which has type 'string' to assist in clients identifying column is the resource name. See https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#data-types for more.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"description": {
+						SchemaProps: spec.SchemaProps{
+							Description: "description is a human readable description of this column.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"priority": {
+						SchemaProps: spec.SchemaProps{
+							Description: "priority is an integer defining the relative importance of this column compared to others. Lower numbers are considered higher priority. Columns that may be omitted in limited space scenarios should be given a higher priority.",
+							Default:     0,
+							Type:        []string{"integer"},
+							Format:      "int32",
+						},
+					},
+				},
+				Required: []string{"name", "type", "format", "description", "priority"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_TableOptions(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "TableOptions are used when a Table is requested by the caller.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"includeObject": {
+						SchemaProps: spec.SchemaProps{
+							Description: "includeObject decides whether to include each object along with its columnar information. Specifying \"None\" will return no object, specifying \"Object\" will return the full object contents, and specifying \"Metadata\" (the default) will return the object's metadata in the PartialObjectMetadata kind in version v1beta1 of the meta.k8s.io API group.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_TableRow(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "TableRow is an individual row in a table.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"cells": {
+						SchemaProps: spec.SchemaProps{
+							Description: "cells will be as wide as the column definitions array and may contain strings, numbers (float64 or int64), booleans, simple maps, lists, or null. See the type field of the column definition for a more detailed description.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Type:   []string{"object"},
+										Format: "",
+									},
+								},
+							},
+						},
+					},
+					"conditions": {
+						SchemaProps: spec.SchemaProps{
+							Description: "conditions describe additional status of a row that are relevant for a human user. These conditions apply to the row, not to the object, and will be specific to table output. The only defined condition type is 'Completed', for a row that indicates a resource that has run to completion and can be given less visual priority.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition"),
+									},
+								},
+							},
+						},
+					},
+					"object": {
+						SchemaProps: spec.SchemaProps{
+							Description: "This field contains the requested additional information about each object based on the includeObject policy when requesting the Table. If \"None\", this field is empty, if \"Object\" this will be the default serialization of the object for the current API version, and if \"Metadata\" (the default) will contain the object metadata. Check the returned kind and apiVersion of the object before parsing. The media type of the object will always match the enclosing list - if this as a JSON table, these will be JSON encoded objects.",
+							Ref:         ref("k8s.io/apimachinery/pkg/runtime.RawExtension"),
+						},
+					},
+				},
+				Required: []string{"cells"},
+			},
+		},
+		Dependencies: []string{
+			"k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition", "k8s.io/apimachinery/pkg/runtime.RawExtension"},
+	}
+}
+
+func schema_pkg_apis_meta_v1_TableRowCondition(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "TableRowCondition allows a row to be marked with additional information.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"type": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Type of row condition. The only defined value is 'Completed' indicating that the object this row represents has reached a completed state and may be given less visual priority than other rows. Clients are not required to honor any conditions but should be consistent where possible about handling the conditions.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"status": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Status of the condition, one of True, False, Unknown.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"reason": {
+						SchemaProps: spec.SchemaProps{
+							Description: "(brief) machine readable reason for the condition's last transition.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"message": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Human readable message indicating details about last transition.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+				Required: []string{"type", "status"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_Time(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Time is a wrapper around time.Time which supports correct marshaling to YAML and JSON.  Wrappers are provided for many of the factory methods that the time package offers.",
+				Type:        v1.Time{}.OpenAPISchemaType(),
+				Format:      v1.Time{}.OpenAPISchemaFormat(),
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_Timestamp(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Timestamp is a struct that is equivalent to Time, but intended for protobuf marshalling/unmarshalling. It is generated into a serialization that matches Time. Do not use in Go structs.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"seconds": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Represents seconds of UTC time since Unix epoch 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59Z inclusive.",
+							Default:     0,
+							Type:        []string{"integer"},
+							Format:      "int64",
+						},
+					},
+					"nanos": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Non-negative fractions of a second at nanosecond resolution. Negative second values with fractions must still have non-negative nanos values that count forward in time. Must be from 0 to 999,999,999 inclusive. This field may be limited in precision depending on context.",
+							Default:     0,
+							Type:        []string{"integer"},
+							Format:      "int32",
+						},
+					},
+				},
+				Required: []string{"seconds", "nanos"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_TypeMeta(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "TypeMeta describes an individual object in an API response or request with strings representing the type of the object and its API schema version. Structures that are versioned or persisted should inline TypeMeta.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_UpdateOptions(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "UpdateOptions may be provided when updating an API object. All fields in UpdateOptions should also be present in PatchOptions.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"dryRun": {
+						SchemaProps: spec.SchemaProps{
+							Description: "When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: "",
+										Type:    []string{"string"},
+										Format:  "",
+									},
+								},
+							},
+						},
+					},
+					"fieldManager": {
+						SchemaProps: spec.SchemaProps{
+							Description: "fieldManager is a name associated with the actor or entity that is making these changes. The value must be less than or 128 characters long, and only contain printable characters, as defined by https://golang.org/pkg/unicode/#IsPrint.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"fieldValidation": {
+						SchemaProps: spec.SchemaProps{
+							Description: "fieldValidation instructs the server on how to handle objects in the request (POST/PUT/PATCH) containing unknown or duplicate fields. Valid values are: - Ignore: This will ignore any unknown fields that are silently dropped from the object, and will ignore all but the last duplicate field that the decoder encounters. This is the default behavior prior to v1.23. - Warn: This will send a warning via the standard warning response header for each unknown field that is dropped from the object, and for each duplicate field that is encountered. The request will still succeed if there are no other errors, and will only persist the last of any duplicate fields. This is the default in v1.23+ - Strict: This will fail the request with a BadRequest error if any unknown fields would be dropped from the object, or if any duplicate fields are present. The error returned from the server will contain all unknown and duplicate fields encountered.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_meta_v1_WatchEvent(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Event represents a single event to a watched resource.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"type": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+					"object": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Object is:\n * If Type is Added or Modified: the new state of the object.\n * If Type is Deleted: the state of the object immediately before deletion.\n * If Type is Error: *Status is recommended; other types may make sense\n   depending on context.",
+							Ref:         ref("k8s.io/apimachinery/pkg/runtime.RawExtension"),
+						},
+					},
+				},
+				Required: []string{"type", "object"},
+			},
+		},
+		Dependencies: []string{
+			"k8s.io/apimachinery/pkg/runtime.RawExtension"},
+	}
+}
+
+func schema_k8sio_apimachinery_pkg_runtime_RawExtension(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "RawExtension is used to hold extensions in external versions.\n\nTo use this, make a field which has RawExtension as its type in your external, versioned struct, and Object in your internal struct. You also need to register your various plugin types.\n\n// Internal package:\n\n\ttype MyAPIObject struct {\n\t\truntime.TypeMeta `json:\",inline\"`\n\t\tMyPlugin runtime.Object `json:\"myPlugin\"`\n\t}\n\n\ttype PluginA struct {\n\t\tAOption string `json:\"aOption\"`\n\t}\n\n// External package:\n\n\ttype MyAPIObject struct {\n\t\truntime.TypeMeta `json:\",inline\"`\n\t\tMyPlugin runtime.RawExtension `json:\"myPlugin\"`\n\t}\n\n\ttype PluginA struct {\n\t\tAOption string `json:\"aOption\"`\n\t}\n\n// On the wire, the JSON will look something like this:\n\n\t{\n\t\t\"kind\":\"MyAPIObject\",\n\t\t\"apiVersion\":\"v1\",\n\t\t\"myPlugin\": {\n\t\t\t\"kind\":\"PluginA\",\n\t\t\t\"aOption\":\"foo\",\n\t\t},\n\t}\n\nSo what happens? Decode first uses json or yaml to unmarshal the serialized data into your external MyAPIObject. That causes the raw JSON to be stored, but not unpacked. The next step is to copy (using pkg/conversion) into the internal struct. The runtime package's DefaultScheme has conversion functions installed which will unpack the JSON stored in RawExtension, turning it into the correct object type, and storing it in the Object. (TODO: In the case where the object is of an unknown type, a runtime.Unknown object will be created and stored.)",
+				Type:        []string{"object"},
+			},
+		},
+	}
+}
+
+func schema_k8sio_apimachinery_pkg_runtime_TypeMeta(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "TypeMeta is shared by all top level objects. The proper way to use it is to inline it in your type, like this:\n\n\ttype MyAwesomeAPIObject struct {\n\t     runtime.TypeMeta    `json:\",inline\"`\n\t     ... // other fields\n\t}\n\nfunc (obj *MyAwesomeAPIObject) SetGroupVersionKind(gvk *metav1.GroupVersionKind) { metav1.UpdateTypeMeta(obj,gvk) }; GroupVersionKind() *GroupVersionKind\n\nTypeMeta is provided here for convenience. You may use it directly from this package or define your own with the same fields.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Type:   []string{"string"},
+							Format: "",
+						},
+					},
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Type:   []string{"string"},
+							Format: "",
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func schema_k8sio_apimachinery_pkg_runtime_Unknown(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Unknown allows api objects with unknown types to be passed-through. This can be used to deal with the API objects from a plug-in. Unknown objects still have functioning TypeMeta features-- kind, version, etc. metadata and field mutatation.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Type:   []string{"string"},
+							Format: "",
+						},
+					},
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Type:   []string{"string"},
+							Format: "",
+						},
+					},
+					"ContentEncoding": {
+						SchemaProps: spec.SchemaProps{
+							Description: "ContentEncoding is encoding used to encode 'Raw' data. Unspecified means no encoding.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"ContentType": {
+						SchemaProps: spec.SchemaProps{
+							Description: "ContentType  is serialization method used to serialize 'Raw'. Unspecified means ContentTypeJSON.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+				Required: []string{"ContentEncoding", "ContentType"},
+			},
+		},
+	}
+}
+
+func schema_k8sio_apimachinery_pkg_version_Info(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Info contains versioning information. how we'll want to distribute that information.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"major": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+					"minor": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+					"gitVersion": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+					"gitCommit": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+					"gitTreeState": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+					"buildDate": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+					"goVersion": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+					"compiler": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+					"platform": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+				},
+				Required: []string{"major", "minor", "gitVersion", "gitCommit", "gitTreeState", "buildDate", "goVersion", "compiler", "platform"},
+			},
+		},
+	}
+}
diff --git a/pkg/apimachinery/apis/common/v0alpha1/zz_generated.openapi_violation_exceptions.list b/pkg/apimachinery/apis/common/v0alpha1/zz_generated.openapi_violation_exceptions.list
new file mode 100644
index 0000000000000..3061580736b52
--- /dev/null
+++ b/pkg/apimachinery/apis/common/v0alpha1/zz_generated.openapi_violation_exceptions.list
@@ -0,0 +1,37 @@
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIGroup,ServerAddressByClientCIDRs
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIGroup,Versions
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIGroupList,Groups
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIResource,Categories
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIResource,ShortNames
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIResourceList,APIResources
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVersions,ServerAddressByClientCIDRs
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVersions,Versions
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ApplyOptions,DryRun
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,CreateOptions,DryRun
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,DeleteOptions,DryRun
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,FieldsV1,Raw
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelector,MatchExpressions
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelectorRequirement,Values
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ObjectMeta,Finalizers
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ObjectMeta,ManagedFields
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ObjectMeta,OwnerReferences
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,PatchOptions,DryRun
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,RootPaths,Paths
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,StatusDetails,Causes
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Table,ColumnDefinitions
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Table,Rows
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,TableRow,Cells
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,TableRow,Conditions
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,UpdateOptions,DryRun
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/runtime,RawExtension,Raw
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/runtime,Unknown,Raw
+API rule violation: names_match,github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1,Unstructured,Object
+API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,APIResourceList,APIResources
+API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,Duration,Duration
+API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,InternalEvent,Object
+API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,InternalEvent,Type
+API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,MicroTime,Time
+API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,StatusCause,Type
+API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,Time,Time
+API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,Unknown,ContentEncoding
+API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,Unknown,ContentType
diff --git a/pkg/apimachinery/go.mod b/pkg/apimachinery/go.mod
new file mode 100644
index 0000000000000..7b5ff6e532f70
--- /dev/null
+++ b/pkg/apimachinery/go.mod
@@ -0,0 +1,38 @@
+module github.com/grafana/grafana/pkg/apimachinery
+
+go 1.21.10
+
+require (
+	k8s.io/apimachinery v0.29.2
+	k8s.io/kube-openapi v0.0.0-20240220201932-37d671a357a5
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-openapi/jsonpointer v0.20.2 // indirect
+	github.com/go-openapi/jsonreference v0.20.4 // indirect
+	github.com/go-openapi/swag v0.22.9 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/stretchr/testify v1.9.0 // indirect
+	golang.org/x/net v0.22.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/klog/v2 v2.120.1 // indirect
+	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+)
diff --git a/pkg/apimachinery/go.sum b/pkg/apimachinery/go.sum
new file mode 100644
index 0000000000000..50160411c083a
--- /dev/null
+++ b/pkg/apimachinery/go.sum
@@ -0,0 +1,103 @@
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
+github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
+github.com/go-openapi/jsonpointer v0.20.2 h1:mQc3nmndL8ZBzStEo3JYF8wzmeWffDH4VbXz58sAx6Q=
+github.com/go-openapi/jsonreference v0.20.4 h1:bKlDxQxQJgwpUSgOENiMPzCTBVuc7vTdXSSgNeAhojU=
+github.com/go-openapi/swag v0.22.9 h1:XX2DssF+mQKM2DHsbgZK74y/zj4mo9I99+89xUmuZCE=
+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
+github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
+github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
+github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
+gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8=
+k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU=
+k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
+k8s.io/kube-openapi v0.0.0-20240220201932-37d671a357a5 h1:QSpdNrZ9uRlV0VkqLvVO0Rqg8ioKi3oSw7O5P7pJV8M=
+k8s.io/kube-openapi v0.0.0-20240220201932-37d671a357a5/go.mod h1:Pa1PvrP7ACSkuX6I7KYomY6cmMA0Tx86waBhDUgoKPw=
+k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
+k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
+sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
+sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
diff --git a/pkg/apis/dashboard/v0alpha1/doc.go b/pkg/apis/dashboard/v0alpha1/doc.go
new file mode 100644
index 0000000000000..92822b1a59e72
--- /dev/null
+++ b/pkg/apis/dashboard/v0alpha1/doc.go
@@ -0,0 +1,6 @@
+// +k8s:deepcopy-gen=package
+// +k8s:openapi-gen=true
+// +k8s:defaulter-gen=TypeMeta
+// +groupName=dashboard.grafana.app
+
+package v0alpha1 // import "github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1"
diff --git a/pkg/apis/dashboard/v0alpha1/register.go b/pkg/apis/dashboard/v0alpha1/register.go
new file mode 100644
index 0000000000000..1bb1bf2235166
--- /dev/null
+++ b/pkg/apis/dashboard/v0alpha1/register.go
@@ -0,0 +1,31 @@
+package v0alpha1
+
+import (
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+)
+
+const (
+	GROUP      = "dashboard.grafana.app"
+	VERSION    = "v0alpha1"
+	APIVERSION = GROUP + "/" + VERSION
+)
+
+var DashboardResourceInfo = common.NewResourceInfo(GROUP, VERSION,
+	"dashboards", "dashboard", "Dashboard",
+	func() runtime.Object { return &Dashboard{} },
+	func() runtime.Object { return &DashboardList{} },
+)
+
+var DashboardSummaryResourceInfo = common.NewResourceInfo(GROUP, VERSION,
+	"summary", "summary", "DashboardSummary",
+	func() runtime.Object { return &DashboardSummary{} },
+	func() runtime.Object { return &DashboardSummaryList{} },
+)
+
+var (
+	// SchemeGroupVersion is group version used to register these objects
+	SchemeGroupVersion = schema.GroupVersion{Group: GROUP, Version: VERSION}
+)
diff --git a/pkg/apis/dashboard/v0alpha1/types.go b/pkg/apis/dashboard/v0alpha1/types.go
new file mode 100644
index 0000000000000..df69ef7c1abda
--- /dev/null
+++ b/pkg/apis/dashboard/v0alpha1/types.go
@@ -0,0 +1,114 @@
+package v0alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+)
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type Dashboard struct {
+	metav1.TypeMeta `json:",inline"`
+	// Standard object's metadata
+	// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
+	// +optional
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	// The dashboard body (unstructured for now)
+	Spec common.Unstructured `json:"spec"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type DashboardList struct {
+	metav1.TypeMeta `json:",inline"`
+	// +optional
+	metav1.ListMeta `json:"metadata,omitempty"`
+
+	Items []Dashboard `json:"items,omitempty"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type DashboardSummary struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	// The dashboard body
+	Spec DashboardSummarySpec `json:"spec,omitempty"`
+}
+
+type DashboardSummarySpec struct {
+	Title string   `json:"title"`
+	Tags  []string `json:"tags,omitempty"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type DashboardSummaryList struct {
+	metav1.TypeMeta `json:",inline"`
+	// +optional
+	metav1.ListMeta `json:"metadata,omitempty"`
+
+	Items []DashboardSummary `json:"items,omitempty"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type DashboardVersionList struct {
+	metav1.TypeMeta `json:",inline"`
+	// +optional
+	metav1.ListMeta `json:"metadata,omitempty"`
+
+	Items []DashboardVersionInfo `json:"items,omitempty"`
+}
+
+type DashboardVersionInfo struct {
+	// The internal ID for this version (will be replaced with resourceVersion)
+	Version int `json:"version"`
+
+	// If the dashboard came from a previous version, it is set here
+	ParentVersion int `json:"parentVersion,omitempty"`
+
+	// The creation timestamp for this version
+	Created int64 `json:"created"`
+
+	// The user who created this version
+	CreatedBy string `json:"createdBy,omitempty"`
+
+	// Message passed while saving the version
+	Message string `json:"message,omitempty"`
+}
+
+// +k8s:conversion-gen:explicit-from=net/url.Values
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type VersionsQueryOptions struct {
+	metav1.TypeMeta `json:",inline"`
+
+	// Path is the URL path
+	// +optional
+	Path string `json:"path,omitempty"`
+
+	// +optional
+	Version int64 `json:"version,omitempty"`
+}
+
+// Information about how the requesting user can use a given dashboard
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type DashboardAccessInfo struct {
+	metav1.TypeMeta `json:",inline"`
+
+	CanSave                bool                  `json:"canSave"`
+	CanEdit                bool                  `json:"canEdit"`
+	CanAdmin               bool                  `json:"canAdmin"`
+	CanStar                bool                  `json:"canStar"`
+	CanDelete              bool                  `json:"canDelete"`
+	AnnotationsPermissions *AnnotationPermission `json:"annotationsPermissions"`
+}
+
+type AnnotationPermission struct {
+	Dashboard    AnnotationActions `json:"dashboard"`
+	Organization AnnotationActions `json:"organization"`
+}
+
+type AnnotationActions struct {
+	CanAdd    bool `json:"canAdd"`
+	CanEdit   bool `json:"canEdit"`
+	CanDelete bool `json:"canDelete"`
+}
diff --git a/pkg/apis/dashboard/v0alpha1/zz_generated.deepcopy.go b/pkg/apis/dashboard/v0alpha1/zz_generated.deepcopy.go
new file mode 100644
index 0000000000000..2e0aa21fd2072
--- /dev/null
+++ b/pkg/apis/dashboard/v0alpha1/zz_generated.deepcopy.go
@@ -0,0 +1,289 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by deepcopy-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AnnotationActions) DeepCopyInto(out *AnnotationActions) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AnnotationActions.
+func (in *AnnotationActions) DeepCopy() *AnnotationActions {
+	if in == nil {
+		return nil
+	}
+	out := new(AnnotationActions)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AnnotationPermission) DeepCopyInto(out *AnnotationPermission) {
+	*out = *in
+	out.Dashboard = in.Dashboard
+	out.Organization = in.Organization
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AnnotationPermission.
+func (in *AnnotationPermission) DeepCopy() *AnnotationPermission {
+	if in == nil {
+		return nil
+	}
+	out := new(AnnotationPermission)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Dashboard) DeepCopyInto(out *Dashboard) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Dashboard.
+func (in *Dashboard) DeepCopy() *Dashboard {
+	if in == nil {
+		return nil
+	}
+	out := new(Dashboard)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *Dashboard) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DashboardAccessInfo) DeepCopyInto(out *DashboardAccessInfo) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	if in.AnnotationsPermissions != nil {
+		in, out := &in.AnnotationsPermissions, &out.AnnotationsPermissions
+		*out = new(AnnotationPermission)
+		**out = **in
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DashboardAccessInfo.
+func (in *DashboardAccessInfo) DeepCopy() *DashboardAccessInfo {
+	if in == nil {
+		return nil
+	}
+	out := new(DashboardAccessInfo)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *DashboardAccessInfo) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DashboardList) DeepCopyInto(out *DashboardList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]Dashboard, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DashboardList.
+func (in *DashboardList) DeepCopy() *DashboardList {
+	if in == nil {
+		return nil
+	}
+	out := new(DashboardList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *DashboardList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DashboardSummary) DeepCopyInto(out *DashboardSummary) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DashboardSummary.
+func (in *DashboardSummary) DeepCopy() *DashboardSummary {
+	if in == nil {
+		return nil
+	}
+	out := new(DashboardSummary)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *DashboardSummary) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DashboardSummaryList) DeepCopyInto(out *DashboardSummaryList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]DashboardSummary, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DashboardSummaryList.
+func (in *DashboardSummaryList) DeepCopy() *DashboardSummaryList {
+	if in == nil {
+		return nil
+	}
+	out := new(DashboardSummaryList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *DashboardSummaryList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DashboardSummarySpec) DeepCopyInto(out *DashboardSummarySpec) {
+	*out = *in
+	if in.Tags != nil {
+		in, out := &in.Tags, &out.Tags
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DashboardSummarySpec.
+func (in *DashboardSummarySpec) DeepCopy() *DashboardSummarySpec {
+	if in == nil {
+		return nil
+	}
+	out := new(DashboardSummarySpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DashboardVersionInfo) DeepCopyInto(out *DashboardVersionInfo) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DashboardVersionInfo.
+func (in *DashboardVersionInfo) DeepCopy() *DashboardVersionInfo {
+	if in == nil {
+		return nil
+	}
+	out := new(DashboardVersionInfo)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DashboardVersionList) DeepCopyInto(out *DashboardVersionList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]DashboardVersionInfo, len(*in))
+		copy(*out, *in)
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DashboardVersionList.
+func (in *DashboardVersionList) DeepCopy() *DashboardVersionList {
+	if in == nil {
+		return nil
+	}
+	out := new(DashboardVersionList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *DashboardVersionList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *VersionsQueryOptions) DeepCopyInto(out *VersionsQueryOptions) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VersionsQueryOptions.
+func (in *VersionsQueryOptions) DeepCopy() *VersionsQueryOptions {
+	if in == nil {
+		return nil
+	}
+	out := new(VersionsQueryOptions)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *VersionsQueryOptions) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
diff --git a/pkg/apis/dashboard/v0alpha1/zz_generated.defaults.go b/pkg/apis/dashboard/v0alpha1/zz_generated.defaults.go
new file mode 100644
index 0000000000000..238fc2f4edcfe
--- /dev/null
+++ b/pkg/apis/dashboard/v0alpha1/zz_generated.defaults.go
@@ -0,0 +1,19 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by defaulter-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// RegisterDefaults adds defaulters functions to the given scheme.
+// Public to allow building arbitrary schemes.
+// All generated defaulters are covering - they call all nested defaulters.
+func RegisterDefaults(scheme *runtime.Scheme) error {
+	return nil
+}
diff --git a/pkg/apis/dashboard/v0alpha1/zz_generated.openapi.go b/pkg/apis/dashboard/v0alpha1/zz_generated.openapi.go
new file mode 100644
index 0000000000000..e2fa02b3a91de
--- /dev/null
+++ b/pkg/apis/dashboard/v0alpha1/zz_generated.openapi.go
@@ -0,0 +1,509 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by openapi-gen. DO NOT EDIT.
+
+// This file was autogenerated by openapi-gen. Do not edit it manually!
+
+package v0alpha1
+
+import (
+	common "k8s.io/kube-openapi/pkg/common"
+	spec "k8s.io/kube-openapi/pkg/validation/spec"
+)
+
+func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
+	return map[string]common.OpenAPIDefinition{
+		"github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.AnnotationActions":    schema_pkg_apis_dashboard_v0alpha1_AnnotationActions(ref),
+		"github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.AnnotationPermission": schema_pkg_apis_dashboard_v0alpha1_AnnotationPermission(ref),
+		"github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.Dashboard":            schema_pkg_apis_dashboard_v0alpha1_Dashboard(ref),
+		"github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.DashboardAccessInfo":  schema_pkg_apis_dashboard_v0alpha1_DashboardAccessInfo(ref),
+		"github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.DashboardList":        schema_pkg_apis_dashboard_v0alpha1_DashboardList(ref),
+		"github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.DashboardSummary":     schema_pkg_apis_dashboard_v0alpha1_DashboardSummary(ref),
+		"github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.DashboardSummaryList": schema_pkg_apis_dashboard_v0alpha1_DashboardSummaryList(ref),
+		"github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.DashboardSummarySpec": schema_pkg_apis_dashboard_v0alpha1_DashboardSummarySpec(ref),
+		"github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.DashboardVersionInfo": schema_pkg_apis_dashboard_v0alpha1_DashboardVersionInfo(ref),
+		"github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.DashboardVersionList": schema_pkg_apis_dashboard_v0alpha1_DashboardVersionList(ref),
+		"github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.VersionsQueryOptions": schema_pkg_apis_dashboard_v0alpha1_VersionsQueryOptions(ref),
+	}
+}
+
+func schema_pkg_apis_dashboard_v0alpha1_AnnotationActions(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"canAdd": {
+						SchemaProps: spec.SchemaProps{
+							Default: false,
+							Type:    []string{"boolean"},
+							Format:  "",
+						},
+					},
+					"canEdit": {
+						SchemaProps: spec.SchemaProps{
+							Default: false,
+							Type:    []string{"boolean"},
+							Format:  "",
+						},
+					},
+					"canDelete": {
+						SchemaProps: spec.SchemaProps{
+							Default: false,
+							Type:    []string{"boolean"},
+							Format:  "",
+						},
+					},
+				},
+				Required: []string{"canAdd", "canEdit", "canDelete"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_dashboard_v0alpha1_AnnotationPermission(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"dashboard": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.AnnotationActions"),
+						},
+					},
+					"organization": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.AnnotationActions"),
+						},
+					},
+				},
+				Required: []string{"dashboard", "organization"},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.AnnotationActions"},
+	}
+}
+
+func schema_pkg_apis_dashboard_v0alpha1_Dashboard(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Standard object's metadata More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata",
+							Default:     map[string]interface{}{},
+							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
+						},
+					},
+					"spec": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The dashboard body (unstructured for now)",
+							Ref:         ref("github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured"),
+						},
+					},
+				},
+				Required: []string{"spec"},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+	}
+}
+
+func schema_pkg_apis_dashboard_v0alpha1_DashboardAccessInfo(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Information about how the requesting user can use a given dashboard",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"canSave": {
+						SchemaProps: spec.SchemaProps{
+							Default: false,
+							Type:    []string{"boolean"},
+							Format:  "",
+						},
+					},
+					"canEdit": {
+						SchemaProps: spec.SchemaProps{
+							Default: false,
+							Type:    []string{"boolean"},
+							Format:  "",
+						},
+					},
+					"canAdmin": {
+						SchemaProps: spec.SchemaProps{
+							Default: false,
+							Type:    []string{"boolean"},
+							Format:  "",
+						},
+					},
+					"canStar": {
+						SchemaProps: spec.SchemaProps{
+							Default: false,
+							Type:    []string{"boolean"},
+							Format:  "",
+						},
+					},
+					"canDelete": {
+						SchemaProps: spec.SchemaProps{
+							Default: false,
+							Type:    []string{"boolean"},
+							Format:  "",
+						},
+					},
+					"annotationsPermissions": {
+						SchemaProps: spec.SchemaProps{
+							Ref: ref("github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.AnnotationPermission"),
+						},
+					},
+				},
+				Required: []string{"canSave", "canEdit", "canAdmin", "canStar", "canDelete", "annotationsPermissions"},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.AnnotationPermission"},
+	}
+}
+
+func schema_pkg_apis_dashboard_v0alpha1_DashboardList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.Dashboard"),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.Dashboard", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+	}
+}
+
+func schema_pkg_apis_dashboard_v0alpha1_DashboardSummary(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
+						},
+					},
+					"spec": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The dashboard body",
+							Default:     map[string]interface{}{},
+							Ref:         ref("github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.DashboardSummarySpec"),
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.DashboardSummarySpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+	}
+}
+
+func schema_pkg_apis_dashboard_v0alpha1_DashboardSummaryList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.DashboardSummary"),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.DashboardSummary", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+	}
+}
+
+func schema_pkg_apis_dashboard_v0alpha1_DashboardSummarySpec(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"title": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+					"tags": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: "",
+										Type:    []string{"string"},
+										Format:  "",
+									},
+								},
+							},
+						},
+					},
+				},
+				Required: []string{"title"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_dashboard_v0alpha1_DashboardVersionInfo(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"version": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The internal ID for this version (will be replaced with resourceVersion)",
+							Default:     0,
+							Type:        []string{"integer"},
+							Format:      "int32",
+						},
+					},
+					"parentVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "If the dashboard came from a previous version, it is set here",
+							Type:        []string{"integer"},
+							Format:      "int32",
+						},
+					},
+					"created": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The creation timestamp for this version",
+							Default:     0,
+							Type:        []string{"integer"},
+							Format:      "int64",
+						},
+					},
+					"createdBy": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The user who created this version",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"message": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Message passed while saving the version",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+				Required: []string{"version", "created"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_dashboard_v0alpha1_DashboardVersionList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.DashboardVersionInfo"),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.DashboardVersionInfo", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+	}
+}
+
+func schema_pkg_apis_dashboard_v0alpha1_VersionsQueryOptions(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"path": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Path is the URL path",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"version": {
+						SchemaProps: spec.SchemaProps{
+							Type:   []string{"integer"},
+							Format: "int64",
+						},
+					},
+				},
+			},
+		},
+	}
+}
diff --git a/pkg/apis/dashboard/v0alpha1/zz_generated.openapi_violation_exceptions.list b/pkg/apis/dashboard/v0alpha1/zz_generated.openapi_violation_exceptions.list
new file mode 100644
index 0000000000000..1428ccea7ae58
--- /dev/null
+++ b/pkg/apis/dashboard/v0alpha1/zz_generated.openapi_violation_exceptions.list
@@ -0,0 +1 @@
+API rule violation: list_type_missing,github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1,DashboardSummarySpec,Tags
diff --git a/pkg/apis/dashboardsnapshot/v0alpha1/doc.go b/pkg/apis/dashboardsnapshot/v0alpha1/doc.go
new file mode 100644
index 0000000000000..a6b2fec52cbdb
--- /dev/null
+++ b/pkg/apis/dashboardsnapshot/v0alpha1/doc.go
@@ -0,0 +1,6 @@
+// +k8s:deepcopy-gen=package
+// +k8s:openapi-gen=true
+// +k8s:defaulter-gen=TypeMeta
+// +groupName=dashboardsnapshot.grafana.app
+
+package v0alpha1
diff --git a/pkg/apis/dashboardsnapshot/v0alpha1/register.go b/pkg/apis/dashboardsnapshot/v0alpha1/register.go
new file mode 100644
index 0000000000000..57209ad7b91e4
--- /dev/null
+++ b/pkg/apis/dashboardsnapshot/v0alpha1/register.go
@@ -0,0 +1,25 @@
+package v0alpha1
+
+import (
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+)
+
+const (
+	GROUP      = "dashboardsnapshot.grafana.app"
+	VERSION    = "v0alpha1"
+	APIVERSION = GROUP + "/" + VERSION
+)
+
+var DashboardSnapshotResourceInfo = common.NewResourceInfo(GROUP, VERSION,
+	"dashboardsnapshots", "dashboardsnapshot", "DashboardSnapshot",
+	func() runtime.Object { return &DashboardSnapshot{} },
+	func() runtime.Object { return &DashboardSnapshotList{} },
+)
+
+var (
+	// SchemeGroupVersion is group version used to register these objects
+	SchemeGroupVersion = schema.GroupVersion{Group: GROUP, Version: VERSION}
+)
diff --git a/pkg/apis/dashboardsnapshot/v0alpha1/types.go b/pkg/apis/dashboardsnapshot/v0alpha1/types.go
new file mode 100644
index 0000000000000..8e3aa7520f9ca
--- /dev/null
+++ b/pkg/apis/dashboardsnapshot/v0alpha1/types.go
@@ -0,0 +1,136 @@
+package v0alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+)
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type DashboardSnapshot struct {
+	metav1.TypeMeta `json:",inline"`
+	// +optional
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	// Snapshot summary info
+	Spec SnapshotInfo `json:"spec"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type DashboardSnapshotList struct {
+	metav1.TypeMeta `json:",inline"`
+	// +optional
+	metav1.ListMeta `json:"metadata,omitempty"`
+
+	Items []DashboardSnapshot `json:"items,omitempty"`
+}
+
+type SnapshotInfo struct {
+	Title string `json:"title,omitempty"`
+	// Optionally auto-remove the snapshot at a future date
+	Expires int64 `json:"expires,omitempty"`
+	// When set to true, the snapshot exists in a remote server
+	External bool `json:"external,omitempty"`
+	// The external URL where the snapshot can be seen
+	ExternalURL string `json:"externalUrl,omitempty"`
+	// The URL that created the dashboard originally
+	OriginalUrl string `json:"originalUrl,omitempty"`
+	// Snapshot creation timestamp
+	Timestamp string `json:"timestamp,omitempty"`
+}
+
+// This is returned from the POST command
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type DashboardSnapshotWithDeleteKey struct {
+	DashboardSnapshot `json:",inline"`
+
+	// The delete key is only returned when the item is created.  It is not returned from a get request
+	DeleteKey string `json:"deleteKey,omitempty"`
+}
+
+// This is the snapshot returned from the subresource
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type FullDashboardSnapshot struct {
+	metav1.TypeMeta `json:",inline"`
+	// +optional
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	// Snapshot summary info
+	Info SnapshotInfo `json:"info"`
+
+	// The raw dashboard (unstructured for now)
+	Dashboard common.Unstructured `json:"dashboard"`
+}
+
+// Each tenant, may have different sharing options
+// This is currently set using custom.ini, but multi-tenant support will need
+// to be managed differently
+type SnapshotSharingOptions struct {
+	SnapshotsEnabled     bool   `json:"snapshotEnabled"`
+	ExternalSnapshotURL  string `json:"externalSnapshotURL,omitempty"`
+	ExternalSnapshotName string `json:"externalSnapshotName,omitempty"`
+	ExternalEnabled      bool   `json:"externalEnabled,omitempty"`
+}
+
+// These are the values expected to be sent from an end user
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type DashboardCreateCommand struct {
+	metav1.TypeMeta `json:",inline"`
+
+	// Snapshot name
+	// required:false
+	Name string `json:"name"`
+
+	// The complete dashboard model.
+	// required:true
+	Dashboard *common.Unstructured `json:"dashboard" binding:"Required"`
+
+	// When the snapshot should expire in seconds in seconds. Default is never to expire.
+	// required:false
+	// default:0
+	Expires int64 `json:"expires"`
+
+	// these are passed when storing an external snapshot ref
+	// Save the snapshot on an external server rather than locally.
+	// required:false
+	// default: false
+	External bool `json:"external"`
+}
+
+// The create response
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type DashboardCreateResponse struct {
+	metav1.TypeMeta `json:",inline"`
+
+	// The unique key
+	Key string `json:"key"`
+
+	// A unique key that will allow delete
+	DeleteKey string `json:"deleteKey"`
+
+	// Absolute URL to show the dashboard
+	URL string `json:"url"`
+
+	// URL that will delete the response
+	DeleteURL string `json:"deleteUrl"`
+}
+
+// Represents an options object that must be named for each namespace/team/user
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type SharingOptions struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	// Show the options inline
+	Spec SnapshotSharingOptions `json:"spec"`
+}
+
+// Represents a list of namespaced options
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type SharingOptionsList struct {
+	metav1.TypeMeta `json:",inline"`
+	// +optional
+	metav1.ListMeta `json:"metadata,omitempty"`
+
+	Items []SharingOptions `json:"items,omitempty"`
+}
diff --git a/pkg/apis/dashboardsnapshot/v0alpha1/zz_generated.deepcopy.go b/pkg/apis/dashboardsnapshot/v0alpha1/zz_generated.deepcopy.go
new file mode 100644
index 0000000000000..51b5075f310ea
--- /dev/null
+++ b/pkg/apis/dashboardsnapshot/v0alpha1/zz_generated.deepcopy.go
@@ -0,0 +1,271 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by deepcopy-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DashboardCreateCommand) DeepCopyInto(out *DashboardCreateCommand) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	if in.Dashboard != nil {
+		in, out := &in.Dashboard, &out.Dashboard
+		*out = (*in).DeepCopy()
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DashboardCreateCommand.
+func (in *DashboardCreateCommand) DeepCopy() *DashboardCreateCommand {
+	if in == nil {
+		return nil
+	}
+	out := new(DashboardCreateCommand)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *DashboardCreateCommand) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DashboardCreateResponse) DeepCopyInto(out *DashboardCreateResponse) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DashboardCreateResponse.
+func (in *DashboardCreateResponse) DeepCopy() *DashboardCreateResponse {
+	if in == nil {
+		return nil
+	}
+	out := new(DashboardCreateResponse)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *DashboardCreateResponse) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DashboardSnapshot) DeepCopyInto(out *DashboardSnapshot) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	out.Spec = in.Spec
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DashboardSnapshot.
+func (in *DashboardSnapshot) DeepCopy() *DashboardSnapshot {
+	if in == nil {
+		return nil
+	}
+	out := new(DashboardSnapshot)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *DashboardSnapshot) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DashboardSnapshotList) DeepCopyInto(out *DashboardSnapshotList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]DashboardSnapshot, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DashboardSnapshotList.
+func (in *DashboardSnapshotList) DeepCopy() *DashboardSnapshotList {
+	if in == nil {
+		return nil
+	}
+	out := new(DashboardSnapshotList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *DashboardSnapshotList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DashboardSnapshotWithDeleteKey) DeepCopyInto(out *DashboardSnapshotWithDeleteKey) {
+	*out = *in
+	in.DashboardSnapshot.DeepCopyInto(&out.DashboardSnapshot)
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DashboardSnapshotWithDeleteKey.
+func (in *DashboardSnapshotWithDeleteKey) DeepCopy() *DashboardSnapshotWithDeleteKey {
+	if in == nil {
+		return nil
+	}
+	out := new(DashboardSnapshotWithDeleteKey)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *DashboardSnapshotWithDeleteKey) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *FullDashboardSnapshot) DeepCopyInto(out *FullDashboardSnapshot) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	out.Info = in.Info
+	in.Dashboard.DeepCopyInto(&out.Dashboard)
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FullDashboardSnapshot.
+func (in *FullDashboardSnapshot) DeepCopy() *FullDashboardSnapshot {
+	if in == nil {
+		return nil
+	}
+	out := new(FullDashboardSnapshot)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *FullDashboardSnapshot) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *SharingOptions) DeepCopyInto(out *SharingOptions) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	out.Spec = in.Spec
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SharingOptions.
+func (in *SharingOptions) DeepCopy() *SharingOptions {
+	if in == nil {
+		return nil
+	}
+	out := new(SharingOptions)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *SharingOptions) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *SharingOptionsList) DeepCopyInto(out *SharingOptionsList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]SharingOptions, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SharingOptionsList.
+func (in *SharingOptionsList) DeepCopy() *SharingOptionsList {
+	if in == nil {
+		return nil
+	}
+	out := new(SharingOptionsList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *SharingOptionsList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *SnapshotInfo) DeepCopyInto(out *SnapshotInfo) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SnapshotInfo.
+func (in *SnapshotInfo) DeepCopy() *SnapshotInfo {
+	if in == nil {
+		return nil
+	}
+	out := new(SnapshotInfo)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *SnapshotSharingOptions) DeepCopyInto(out *SnapshotSharingOptions) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SnapshotSharingOptions.
+func (in *SnapshotSharingOptions) DeepCopy() *SnapshotSharingOptions {
+	if in == nil {
+		return nil
+	}
+	out := new(SnapshotSharingOptions)
+	in.DeepCopyInto(out)
+	return out
+}
diff --git a/pkg/apis/dashboardsnapshot/v0alpha1/zz_generated.defaults.go b/pkg/apis/dashboardsnapshot/v0alpha1/zz_generated.defaults.go
new file mode 100644
index 0000000000000..238fc2f4edcfe
--- /dev/null
+++ b/pkg/apis/dashboardsnapshot/v0alpha1/zz_generated.defaults.go
@@ -0,0 +1,19 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by defaulter-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// RegisterDefaults adds defaulters functions to the given scheme.
+// Public to allow building arbitrary schemes.
+// All generated defaulters are covering - they call all nested defaulters.
+func RegisterDefaults(scheme *runtime.Scheme) error {
+	return nil
+}
diff --git a/pkg/apis/dashboardsnapshot/v0alpha1/zz_generated.openapi.go b/pkg/apis/dashboardsnapshot/v0alpha1/zz_generated.openapi.go
new file mode 100644
index 0000000000000..7566695cfaad5
--- /dev/null
+++ b/pkg/apis/dashboardsnapshot/v0alpha1/zz_generated.openapi.go
@@ -0,0 +1,521 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by openapi-gen. DO NOT EDIT.
+
+// This file was autogenerated by openapi-gen. Do not edit it manually!
+
+package v0alpha1
+
+import (
+	common "k8s.io/kube-openapi/pkg/common"
+	spec "k8s.io/kube-openapi/pkg/validation/spec"
+)
+
+func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
+	return map[string]common.OpenAPIDefinition{
+		"github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1.DashboardCreateCommand":         schema_pkg_apis_dashboardsnapshot_v0alpha1_DashboardCreateCommand(ref),
+		"github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1.DashboardCreateResponse":        schema_pkg_apis_dashboardsnapshot_v0alpha1_DashboardCreateResponse(ref),
+		"github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1.DashboardSnapshot":              schema_pkg_apis_dashboardsnapshot_v0alpha1_DashboardSnapshot(ref),
+		"github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1.DashboardSnapshotList":          schema_pkg_apis_dashboardsnapshot_v0alpha1_DashboardSnapshotList(ref),
+		"github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1.DashboardSnapshotWithDeleteKey": schema_pkg_apis_dashboardsnapshot_v0alpha1_DashboardSnapshotWithDeleteKey(ref),
+		"github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1.FullDashboardSnapshot":          schema_pkg_apis_dashboardsnapshot_v0alpha1_FullDashboardSnapshot(ref),
+		"github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1.SharingOptions":                 schema_pkg_apis_dashboardsnapshot_v0alpha1_SharingOptions(ref),
+		"github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1.SharingOptionsList":             schema_pkg_apis_dashboardsnapshot_v0alpha1_SharingOptionsList(ref),
+		"github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1.SnapshotInfo":                   schema_pkg_apis_dashboardsnapshot_v0alpha1_SnapshotInfo(ref),
+		"github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1.SnapshotSharingOptions":         schema_pkg_apis_dashboardsnapshot_v0alpha1_SnapshotSharingOptions(ref),
+	}
+}
+
+func schema_pkg_apis_dashboardsnapshot_v0alpha1_DashboardCreateCommand(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "These are the values expected to be sent from an end user",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"name": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Snapshot name required:false",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"dashboard": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The complete dashboard model. required:true",
+							Ref:         ref("github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured"),
+						},
+					},
+					"expires": {
+						SchemaProps: spec.SchemaProps{
+							Description: "When the snapshot should expire in seconds in seconds. Default is never to expire. required:false default:0",
+							Default:     0,
+							Type:        []string{"integer"},
+							Format:      "int64",
+						},
+					},
+					"external": {
+						SchemaProps: spec.SchemaProps{
+							Description: "these are passed when storing an external snapshot ref Save the snapshot on an external server rather than locally. required:false default: false",
+							Default:     false,
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+				},
+				Required: []string{"name", "dashboard", "expires", "external"},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured"},
+	}
+}
+
+func schema_pkg_apis_dashboardsnapshot_v0alpha1_DashboardCreateResponse(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "The create response",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"key": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The unique key",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"deleteKey": {
+						SchemaProps: spec.SchemaProps{
+							Description: "A unique key that will allow delete",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"url": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Absolute URL to show the dashboard",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"deleteUrl": {
+						SchemaProps: spec.SchemaProps{
+							Description: "URL that will delete the response",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+				Required: []string{"key", "deleteKey", "url", "deleteUrl"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_dashboardsnapshot_v0alpha1_DashboardSnapshot(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
+						},
+					},
+					"spec": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Snapshot summary info",
+							Default:     map[string]interface{}{},
+							Ref:         ref("github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1.SnapshotInfo"),
+						},
+					},
+				},
+				Required: []string{"spec"},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1.SnapshotInfo", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+	}
+}
+
+func schema_pkg_apis_dashboardsnapshot_v0alpha1_DashboardSnapshotList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1.DashboardSnapshot"),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1.DashboardSnapshot", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+	}
+}
+
+func schema_pkg_apis_dashboardsnapshot_v0alpha1_DashboardSnapshotWithDeleteKey(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "This is returned from the POST command",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
+						},
+					},
+					"spec": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Snapshot summary info",
+							Default:     map[string]interface{}{},
+							Ref:         ref("github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1.SnapshotInfo"),
+						},
+					},
+					"deleteKey": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The delete key is only returned when the item is created.  It is not returned from a get request",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+				Required: []string{"spec"},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1.SnapshotInfo", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+	}
+}
+
+func schema_pkg_apis_dashboardsnapshot_v0alpha1_FullDashboardSnapshot(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "This is the snapshot returned from the subresource",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
+						},
+					},
+					"info": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Snapshot summary info",
+							Default:     map[string]interface{}{},
+							Ref:         ref("github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1.SnapshotInfo"),
+						},
+					},
+					"dashboard": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The raw dashboard (unstructured for now)",
+							Ref:         ref("github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured"),
+						},
+					},
+				},
+				Required: []string{"info", "dashboard"},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured", "github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1.SnapshotInfo", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+	}
+}
+
+func schema_pkg_apis_dashboardsnapshot_v0alpha1_SharingOptions(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Represents an options object that must be named for each namespace/team/user",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
+						},
+					},
+					"spec": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Show the options inline",
+							Default:     map[string]interface{}{},
+							Ref:         ref("github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1.SnapshotSharingOptions"),
+						},
+					},
+				},
+				Required: []string{"spec"},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1.SnapshotSharingOptions", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+	}
+}
+
+func schema_pkg_apis_dashboardsnapshot_v0alpha1_SharingOptionsList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Represents a list of namespaced options",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1.SharingOptions"),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1.SharingOptions", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+	}
+}
+
+func schema_pkg_apis_dashboardsnapshot_v0alpha1_SnapshotInfo(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"title": {
+						SchemaProps: spec.SchemaProps{
+							Type:   []string{"string"},
+							Format: "",
+						},
+					},
+					"expires": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Optionally auto-remove the snapshot at a future date",
+							Type:        []string{"integer"},
+							Format:      "int64",
+						},
+					},
+					"external": {
+						SchemaProps: spec.SchemaProps{
+							Description: "When set to true, the snapshot exists in a remote server",
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+					"externalUrl": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The external URL where the snapshot can be seen",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"originalUrl": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The URL that created the dashboard originally",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"timestamp": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Snapshot creation timestamp",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_dashboardsnapshot_v0alpha1_SnapshotSharingOptions(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Each tenant, may have different sharing options This is currently set using custom.ini, but multi-tenant support will need to be managed differently",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"snapshotEnabled": {
+						SchemaProps: spec.SchemaProps{
+							Default: false,
+							Type:    []string{"boolean"},
+							Format:  "",
+						},
+					},
+					"externalSnapshotURL": {
+						SchemaProps: spec.SchemaProps{
+							Type:   []string{"string"},
+							Format: "",
+						},
+					},
+					"externalSnapshotName": {
+						SchemaProps: spec.SchemaProps{
+							Type:   []string{"string"},
+							Format: "",
+						},
+					},
+					"externalEnabled": {
+						SchemaProps: spec.SchemaProps{
+							Type:   []string{"boolean"},
+							Format: "",
+						},
+					},
+				},
+				Required: []string{"snapshotEnabled"},
+			},
+		},
+	}
+}
diff --git a/pkg/apis/dashboardsnapshot/v0alpha1/zz_generated.openapi_violation_exceptions.list b/pkg/apis/dashboardsnapshot/v0alpha1/zz_generated.openapi_violation_exceptions.list
new file mode 100644
index 0000000000000..58fc05ad93000
--- /dev/null
+++ b/pkg/apis/dashboardsnapshot/v0alpha1/zz_generated.openapi_violation_exceptions.list
@@ -0,0 +1,3 @@
+API rule violation: names_match,github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1,DashboardCreateResponse,DeleteURL
+API rule violation: names_match,github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1,SnapshotInfo,ExternalURL
+API rule violation: names_match,github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1,SnapshotSharingOptions,SnapshotsEnabled
diff --git a/pkg/apis/datasource/v0alpha1/doc.go b/pkg/apis/datasource/v0alpha1/doc.go
new file mode 100644
index 0000000000000..43d5863c3c084
--- /dev/null
+++ b/pkg/apis/datasource/v0alpha1/doc.go
@@ -0,0 +1,6 @@
+// +k8s:deepcopy-gen=package
+// +k8s:openapi-gen=true
+// +k8s:defaulter-gen=TypeMeta
+// +groupName=datasource.grafana.com
+
+package v0alpha1
diff --git a/pkg/apis/datasource/v0alpha1/register.go b/pkg/apis/datasource/v0alpha1/register.go
new file mode 100644
index 0000000000000..7eae1938ef729
--- /dev/null
+++ b/pkg/apis/datasource/v0alpha1/register.go
@@ -0,0 +1,18 @@
+package v0alpha1
+
+import (
+	"k8s.io/apimachinery/pkg/runtime"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+)
+
+const (
+	GROUP   = "*.datasource.grafana.app"
+	VERSION = "v0alpha1"
+)
+
+var GenericConnectionResourceInfo = common.NewResourceInfo(GROUP, VERSION,
+	"connections", "connection", "DataSourceConnection",
+	func() runtime.Object { return &DataSourceConnection{} },
+	func() runtime.Object { return &DataSourceConnectionList{} },
+)
diff --git a/pkg/apis/datasource/v0alpha1/types.go b/pkg/apis/datasource/v0alpha1/types.go
new file mode 100644
index 0000000000000..509810ff0c25e
--- /dev/null
+++ b/pkg/apis/datasource/v0alpha1/types.go
@@ -0,0 +1,44 @@
+package v0alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+)
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type DataSourceConnection struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	// The display name
+	Title string `json:"title"`
+
+	// Optional description for the data source (does not exist yet)
+	Description string `json:"description,omitempty"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type DataSourceConnectionList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+
+	Items []DataSourceConnection `json:"items,omitempty"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type HealthCheckResult struct {
+	metav1.TypeMeta `json:",inline"`
+
+	// The string description
+	Status string `json:"status,omitempty"`
+
+	// Explicit status code
+	Code int `json:"code,omitempty"`
+
+	// Optional description for the data source
+	Message string `json:"message,omitempty"`
+
+	// Spec depends on the plugin
+	Details *common.Unstructured `json:"details,omitempty"`
+}
diff --git a/pkg/apis/datasource/v0alpha1/zz_generated.deepcopy.go b/pkg/apis/datasource/v0alpha1/zz_generated.deepcopy.go
new file mode 100644
index 0000000000000..5f9e41d7ad2b4
--- /dev/null
+++ b/pkg/apis/datasource/v0alpha1/zz_generated.deepcopy.go
@@ -0,0 +1,100 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by deepcopy-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DataSourceConnection) DeepCopyInto(out *DataSourceConnection) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DataSourceConnection.
+func (in *DataSourceConnection) DeepCopy() *DataSourceConnection {
+	if in == nil {
+		return nil
+	}
+	out := new(DataSourceConnection)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *DataSourceConnection) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DataSourceConnectionList) DeepCopyInto(out *DataSourceConnectionList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]DataSourceConnection, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DataSourceConnectionList.
+func (in *DataSourceConnectionList) DeepCopy() *DataSourceConnectionList {
+	if in == nil {
+		return nil
+	}
+	out := new(DataSourceConnectionList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *DataSourceConnectionList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *HealthCheckResult) DeepCopyInto(out *HealthCheckResult) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	if in.Details != nil {
+		in, out := &in.Details, &out.Details
+		*out = (*in).DeepCopy()
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HealthCheckResult.
+func (in *HealthCheckResult) DeepCopy() *HealthCheckResult {
+	if in == nil {
+		return nil
+	}
+	out := new(HealthCheckResult)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *HealthCheckResult) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
diff --git a/pkg/apis/datasource/v0alpha1/zz_generated.defaults.go b/pkg/apis/datasource/v0alpha1/zz_generated.defaults.go
new file mode 100644
index 0000000000000..238fc2f4edcfe
--- /dev/null
+++ b/pkg/apis/datasource/v0alpha1/zz_generated.defaults.go
@@ -0,0 +1,19 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by defaulter-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// RegisterDefaults adds defaulters functions to the given scheme.
+// Public to allow building arbitrary schemes.
+// All generated defaulters are covering - they call all nested defaulters.
+func RegisterDefaults(scheme *runtime.Scheme) error {
+	return nil
+}
diff --git a/pkg/apis/datasource/v0alpha1/zz_generated.openapi.go b/pkg/apis/datasource/v0alpha1/zz_generated.openapi.go
new file mode 100644
index 0000000000000..5a0f971e3d650
--- /dev/null
+++ b/pkg/apis/datasource/v0alpha1/zz_generated.openapi.go
@@ -0,0 +1,175 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by openapi-gen. DO NOT EDIT.
+
+// This file was autogenerated by openapi-gen. Do not edit it manually!
+
+package v0alpha1
+
+import (
+	common "k8s.io/kube-openapi/pkg/common"
+	spec "k8s.io/kube-openapi/pkg/validation/spec"
+)
+
+func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
+	return map[string]common.OpenAPIDefinition{
+		"github.com/grafana/grafana/pkg/apis/datasource/v0alpha1.DataSourceConnection":     schema_pkg_apis_datasource_v0alpha1_DataSourceConnection(ref),
+		"github.com/grafana/grafana/pkg/apis/datasource/v0alpha1.DataSourceConnectionList": schema_pkg_apis_datasource_v0alpha1_DataSourceConnectionList(ref),
+		"github.com/grafana/grafana/pkg/apis/datasource/v0alpha1.HealthCheckResult":        schema_pkg_apis_datasource_v0alpha1_HealthCheckResult(ref),
+	}
+}
+
+func schema_pkg_apis_datasource_v0alpha1_DataSourceConnection(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
+						},
+					},
+					"title": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The display name",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"description": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Optional description for the data source (does not exist yet)",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+				Required: []string{"title"},
+			},
+		},
+		Dependencies: []string{
+			"k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+	}
+}
+
+func schema_pkg_apis_datasource_v0alpha1_DataSourceConnectionList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/pkg/apis/datasource/v0alpha1.DataSourceConnection"),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/datasource/v0alpha1.DataSourceConnection", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+	}
+}
+
+func schema_pkg_apis_datasource_v0alpha1_HealthCheckResult(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"status": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The string description",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"code": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Explicit status code",
+							Type:        []string{"integer"},
+							Format:      "int32",
+						},
+					},
+					"message": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Optional description for the data source",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"details": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Spec depends on the plugin",
+							Ref:         ref("github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured"),
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured"},
+	}
+}
diff --git a/pkg/apis/example/v0alpha1/doc.go b/pkg/apis/example/v0alpha1/doc.go
index 84d861cb5b70d..96849073b83cc 100644
--- a/pkg/apis/example/v0alpha1/doc.go
+++ b/pkg/apis/example/v0alpha1/doc.go
@@ -1,6 +1,7 @@
 // +k8s:deepcopy-gen=package
 // +k8s:openapi-gen=true
-// +groupName=example.grafana.com
+// +k8s:defaulter-gen=TypeMeta
+// +groupName=example.grafana.app
 
 // The testing api is a dependency free service that we can use to experiment with
 // api aggregation across multiple deployment models.  Specifically:
diff --git a/pkg/apis/example/v0alpha1/openapi.go b/pkg/apis/example/v0alpha1/openapi.go
deleted file mode 100644
index 7d10f829ae03a..0000000000000
--- a/pkg/apis/example/v0alpha1/openapi.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package v0alpha1
-
-import (
-	common "k8s.io/kube-openapi/pkg/common"
-	spec "k8s.io/kube-openapi/pkg/validation/spec"
-)
-
-// NOTE: this must match the golang fully qualified name!
-const kindKey = "github.com/grafana/grafana/pkg/apis/example/v0alpha1.RuntimeInfo"
-
-func getOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
-	return map[string]common.OpenAPIDefinition{
-		kindKey: schema_pkg_apis_example_v0alpha1_RuntimeInfo(ref),
-	}
-}
-
-func schema_pkg_apis_example_v0alpha1_RuntimeInfo(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Type: []string{"object"},
-				Properties: map[string]spec.Schema{
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"startupTime": {
-						SchemaProps: spec.SchemaProps{
-							Type:   []string{"integer"},
-							Format: "int64",
-						},
-					},
-					"buildVersion": {
-						SchemaProps: spec.SchemaProps{
-							Type:   []string{"string"},
-							Format: "",
-						},
-					},
-					"buildCommit": {
-						SchemaProps: spec.SchemaProps{
-							Type:   []string{"string"},
-							Format: "",
-						},
-					},
-					"enterpriseBuildCommit": {
-						SchemaProps: spec.SchemaProps{
-							Type:   []string{"string"},
-							Format: "",
-						},
-					},
-					"buildBranch": {
-						SchemaProps: spec.SchemaProps{
-							Type:   []string{"string"},
-							Format: "",
-						},
-					},
-					"buildStamp": {
-						SchemaProps: spec.SchemaProps{
-							Type:   []string{"integer"},
-							Format: "int64",
-						},
-					},
-					"enterprise": {
-						SchemaProps: spec.SchemaProps{
-							Type:   []string{"boolean"},
-							Format: "",
-						},
-					},
-					"packaging": {
-						SchemaProps: spec.SchemaProps{
-							Type:   []string{"string"},
-							Format: "",
-						},
-					},
-				},
-			},
-		},
-	}
-}
diff --git a/pkg/apis/example/v0alpha1/register.go b/pkg/apis/example/v0alpha1/register.go
index 7dfca278ae6c8..e254cad1d3472 100644
--- a/pkg/apis/example/v0alpha1/register.go
+++ b/pkg/apis/example/v0alpha1/register.go
@@ -1,195 +1,30 @@
 package v0alpha1
 
 import (
-	"fmt"
-	"net/http"
-
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	grafanaapiserver "github.com/grafana/grafana/pkg/services/grafana-apiserver"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/runtime/serializer"
-	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
-	"k8s.io/apiserver/pkg/endpoints/request"
-	"k8s.io/apiserver/pkg/registry/generic"
-	"k8s.io/apiserver/pkg/registry/rest"
-	genericapiserver "k8s.io/apiserver/pkg/server"
-	common "k8s.io/kube-openapi/pkg/common"
-	"k8s.io/kube-openapi/pkg/spec3"
-	"k8s.io/kube-openapi/pkg/validation/spec"
-)
-
-// GroupName is the group name for this API.
-const GroupName = "example.grafana.app"
-const VersionID = "v0alpha1" //
-const APIVersion = GroupName + "/" + VersionID
-
-var _ grafanaapiserver.APIGroupBuilder = (*TestingAPIBuilder)(nil)
-
-// This is used just so wire has something unique to return
-type TestingAPIBuilder struct {
-	codecs serializer.CodecFactory
-}
-
-func RegisterAPIService(features featuremgmt.FeatureToggles, apiregistration grafanaapiserver.APIRegistrar) *TestingAPIBuilder {
-	if !features.IsEnabled(featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs) {
-		return nil // skip registration unless opting into experimental apis
-	}
-	builder := &TestingAPIBuilder{}
-	apiregistration.RegisterAPI(builder)
-	return builder
-}
-
-func (b *TestingAPIBuilder) GetGroupVersion() schema.GroupVersion {
-	return SchemeGroupVersion
-}
-
-func (b *TestingAPIBuilder) InstallSchema(scheme *runtime.Scheme) error {
-	err := AddToScheme(scheme)
-	if err != nil {
-		return err
-	}
-	return scheme.SetVersionPriority(SchemeGroupVersion)
-}
 
-func (b *TestingAPIBuilder) GetAPIGroupInfo(
-	scheme *runtime.Scheme,
-	codecs serializer.CodecFactory, // pointer?
-	optsGetter generic.RESTOptionsGetter,
-) (*genericapiserver.APIGroupInfo, error) {
-	apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(GroupName, scheme, metav1.ParameterCodec, codecs)
-	storage := map[string]rest.Storage{}
-	storage["runtime"] = newDeploymentInfoStorage()
-	apiGroupInfo.VersionedResourcesStorageMap[VersionID] = storage
-	b.codecs = codecs
-	return &apiGroupInfo, nil
-}
-
-func (b *TestingAPIBuilder) GetOpenAPIDefinitions() common.GetOpenAPIDefinitions {
-	return getOpenAPIDefinitions
-}
-
-// Register additional routes with the server
-func (b *TestingAPIBuilder) GetAPIRoutes() *grafanaapiserver.APIRoutes {
-	return &grafanaapiserver.APIRoutes{
-		Root: []grafanaapiserver.APIRouteHandler{
-			{
-				Path: "/aaa",
-				Spec: &spec3.PathProps{
-					Summary:     "an example at the root level",
-					Description: "longer description here?",
-					Get: &spec3.Operation{
-						OperationProps: spec3.OperationProps{
-							Parameters: []*spec3.Parameter{
-								{ParameterProps: spec3.ParameterProps{
-									Name: "a",
-								}},
-							},
-							Responses: &spec3.Responses{
-								ResponsesProps: spec3.ResponsesProps{
-									StatusCodeResponses: map[int]*spec3.Response{
-										200: {
-											ResponseProps: spec3.ResponseProps{
-												Description: "OK",
-												Content: map[string]*spec3.MediaType{
-													"text/plain": {
-														MediaTypeProps: spec3.MediaTypeProps{
-															Schema: &spec.Schema{
-																SchemaProps: spec.SchemaProps{
-																	Type: []string{"string"},
-																},
-															},
-														},
-													},
-												},
-											},
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-				Handler: func(w http.ResponseWriter, r *http.Request) {
-					_, _ = w.Write([]byte("Root level handler (aaa)"))
-				},
-			},
-			{
-				Path: "/bbb",
-				Spec: &spec3.PathProps{
-					Summary:     "an example at the root level",
-					Description: "longer description here?",
-					Get: &spec3.Operation{
-						OperationProps: spec3.OperationProps{
-							Parameters: []*spec3.Parameter{
-								{ParameterProps: spec3.ParameterProps{
-									Name: "b",
-								}},
-							},
-						},
-					},
-				},
-				Handler: func(w http.ResponseWriter, r *http.Request) {
-					_, _ = w.Write([]byte("Root level handler (bbb)"))
-				},
-			},
-		},
-		Namespace: []grafanaapiserver.APIRouteHandler{
-			{
-				Path: "/ccc",
-				Spec: &spec3.PathProps{
-					Summary:     "an example at the root level",
-					Description: "longer description here?",
-					Get: &spec3.Operation{
-						OperationProps: spec3.OperationProps{
-							Parameters: []*spec3.Parameter{
-								{ParameterProps: spec3.ParameterProps{
-									Name: "a",
-								}},
-							},
-						},
-					},
-				},
-				Handler: func(w http.ResponseWriter, r *http.Request) {
-					info, ok := request.RequestInfoFrom(r.Context())
-					if !ok {
-						responsewriters.ErrorNegotiated(
-							apierrors.NewInternalError(fmt.Errorf("no RequestInfo found in the context")),
-							b.codecs, schema.GroupVersion{}, w, r,
-						)
-						return
-					}
-
-					_, _ = w.Write([]byte("Custom namespace route ccc: " + info.Namespace))
-				},
-			},
-		},
-	}
-}
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+)
 
-// SchemeGroupVersion is group version used to register these objects
-var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: VersionID}
+const (
+	GROUP      = "example.grafana.app"
+	VERSION    = "v0alpha1"
+	APIVERSION = GROUP + "/" + VERSION
+)
 
-// Resource takes an unqualified resource and returns a Group qualified GroupResource
-func Resource(resource string) schema.GroupResource {
-	return SchemeGroupVersion.WithResource(resource).GroupResource()
-}
+var RuntimeResourceInfo = common.NewResourceInfo(GROUP, VERSION,
+	"runtime", "runtime", "RuntimeInfo",
+	func() runtime.Object { return &RuntimeInfo{} },
+	func() runtime.Object { return &RuntimeInfo{} },
+)
+var DummyResourceInfo = common.NewResourceInfo(GROUP, VERSION,
+	"dummy", "dummy", "DummyResource",
+	func() runtime.Object { return &DummyResource{} },
+	func() runtime.Object { return &DummyResourceList{} },
+)
 
 var (
-	// SchemeBuilder points to a list of functions added to Scheme.
-	SchemeBuilder      = runtime.NewSchemeBuilder(addKnownTypes)
-	localSchemeBuilder = &SchemeBuilder
-	// AddToScheme is a common registration function for mapping packaged scoped group & version keys to a scheme.
-	AddToScheme = localSchemeBuilder.AddToScheme
+	// SchemeGroupVersion is group version used to register these objects
+	SchemeGroupVersion = schema.GroupVersion{Group: GROUP, Version: VERSION}
 )
-
-// Adds the list of known types to the given scheme.
-func addKnownTypes(scheme *runtime.Scheme) error {
-	scheme.AddKnownTypes(SchemeGroupVersion,
-		&RuntimeInfo{},
-	)
-	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
-	return nil
-}
diff --git a/pkg/apis/example/v0alpha1/storage.go b/pkg/apis/example/v0alpha1/storage.go
deleted file mode 100644
index 33322f9581b9f..0000000000000
--- a/pkg/apis/example/v0alpha1/storage.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package v0alpha1
-
-import (
-	"context"
-	"time"
-
-	"k8s.io/apimachinery/pkg/apis/meta/internalversion"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apiserver/pkg/registry/rest"
-
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-var (
-	_ rest.Scoper               = (*staticStorage)(nil)
-	_ rest.SingularNameProvider = (*staticStorage)(nil)
-	_ rest.Lister               = (*staticStorage)(nil)
-	_ rest.Storage              = (*staticStorage)(nil)
-)
-
-type staticStorage struct {
-	info RuntimeInfo
-}
-
-func newDeploymentInfoStorage() *staticStorage {
-	return &staticStorage{
-		info: RuntimeInfo{
-			TypeMeta: metav1.TypeMeta{
-				APIVersion: APIVersion,
-				Kind:       "DeploymentInfo",
-			},
-			BuildVersion:          setting.BuildVersion,
-			BuildCommit:           setting.BuildCommit,
-			BuildBranch:           setting.BuildBranch,
-			EnterpriseBuildCommit: setting.EnterpriseBuildCommit,
-			BuildStamp:            setting.BuildStamp,
-			IsEnterprise:          setting.IsEnterprise,
-			Packaging:             setting.Packaging,
-			StartupTime:           time.Now().UnixMilli(),
-		},
-	}
-}
-
-func (s *staticStorage) New() runtime.Object {
-	return &RuntimeInfo{}
-}
-
-func (s *staticStorage) Destroy() {}
-
-func (s *staticStorage) NamespaceScoped() bool {
-	return false
-}
-
-func (s *staticStorage) GetSingularName() string {
-	return "runtime"
-}
-
-func (s *staticStorage) NewList() runtime.Object {
-	return &RuntimeInfo{}
-}
-
-func (s *staticStorage) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) {
-	return rest.NewDefaultTableConvertor(Resource("runtime")).ConvertToTable(ctx, object, tableOptions)
-}
-
-func (s *staticStorage) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) {
-	return &s.info, nil
-}
diff --git a/pkg/apis/example/v0alpha1/types.go b/pkg/apis/example/v0alpha1/types.go
index 61ba3e89474fd..a8fef3ffe6f3a 100644
--- a/pkg/apis/example/v0alpha1/types.go
+++ b/pkg/apis/example/v0alpha1/types.go
@@ -2,12 +2,16 @@ package v0alpha1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
 )
 
+// Mirrors the info exposed in "github.com/grafana/grafana/pkg/setting"
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type RuntimeInfo struct {
 	metav1.TypeMeta `json:",inline"`
 
+	// Unix timestamp when the process started
 	StartupTime int64 `json:"startupTime,omitempty"`
 
 	BuildVersion          string `json:"buildVersion,omitempty"`
@@ -18,3 +22,27 @@ type RuntimeInfo struct {
 	IsEnterprise          bool   `json:"enterprise,omitempty"`
 	Packaging             string `json:"packaging,omitempty"`
 }
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type DummyResource struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec common.Unstructured `json:"spec,omitempty"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type DummyResourceList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+
+	Items []DummyResource `json:"items,omitempty"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type DummySubresource struct {
+	metav1.TypeMeta `json:",inline"`
+
+	// add subresource info here
+	Info string `json:"info,omitempty"`
+}
diff --git a/pkg/apis/example/v0alpha1/zz_generated.deepcopy.go b/pkg/apis/example/v0alpha1/zz_generated.deepcopy.go
index 487bf8de81925..063ad395718c4 100644
--- a/pkg/apis/example/v0alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/example/v0alpha1/zz_generated.deepcopy.go
@@ -11,6 +11,91 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DummyResource) DeepCopyInto(out *DummyResource) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DummyResource.
+func (in *DummyResource) DeepCopy() *DummyResource {
+	if in == nil {
+		return nil
+	}
+	out := new(DummyResource)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *DummyResource) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DummyResourceList) DeepCopyInto(out *DummyResourceList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]DummyResource, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DummyResourceList.
+func (in *DummyResourceList) DeepCopy() *DummyResourceList {
+	if in == nil {
+		return nil
+	}
+	out := new(DummyResourceList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *DummyResourceList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DummySubresource) DeepCopyInto(out *DummySubresource) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DummySubresource.
+func (in *DummySubresource) DeepCopy() *DummySubresource {
+	if in == nil {
+		return nil
+	}
+	out := new(DummySubresource)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *DummySubresource) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *RuntimeInfo) DeepCopyInto(out *RuntimeInfo) {
 	*out = *in
diff --git a/pkg/apis/example/v0alpha1/zz_generated.defaults.go b/pkg/apis/example/v0alpha1/zz_generated.defaults.go
new file mode 100644
index 0000000000000..238fc2f4edcfe
--- /dev/null
+++ b/pkg/apis/example/v0alpha1/zz_generated.defaults.go
@@ -0,0 +1,19 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by defaulter-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// RegisterDefaults adds defaulters functions to the given scheme.
+// Public to allow building arbitrary schemes.
+// All generated defaulters are covering - they call all nested defaulters.
+func RegisterDefaults(scheme *runtime.Scheme) error {
+	return nil
+}
diff --git a/pkg/apis/example/v0alpha1/zz_generated.openapi.go b/pkg/apis/example/v0alpha1/zz_generated.openapi.go
new file mode 100644
index 0000000000000..8c441c55064ea
--- /dev/null
+++ b/pkg/apis/example/v0alpha1/zz_generated.openapi.go
@@ -0,0 +1,219 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by openapi-gen. DO NOT EDIT.
+
+// This file was autogenerated by openapi-gen. Do not edit it manually!
+
+package v0alpha1
+
+import (
+	common "k8s.io/kube-openapi/pkg/common"
+	spec "k8s.io/kube-openapi/pkg/validation/spec"
+)
+
+func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
+	return map[string]common.OpenAPIDefinition{
+		"github.com/grafana/grafana/pkg/apis/example/v0alpha1.DummyResource":     schema_pkg_apis_example_v0alpha1_DummyResource(ref),
+		"github.com/grafana/grafana/pkg/apis/example/v0alpha1.DummyResourceList": schema_pkg_apis_example_v0alpha1_DummyResourceList(ref),
+		"github.com/grafana/grafana/pkg/apis/example/v0alpha1.DummySubresource":  schema_pkg_apis_example_v0alpha1_DummySubresource(ref),
+		"github.com/grafana/grafana/pkg/apis/example/v0alpha1.RuntimeInfo":       schema_pkg_apis_example_v0alpha1_RuntimeInfo(ref),
+	}
+}
+
+func schema_pkg_apis_example_v0alpha1_DummyResource(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
+						},
+					},
+					"spec": {
+						SchemaProps: spec.SchemaProps{
+							Ref: ref("github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured"),
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+	}
+}
+
+func schema_pkg_apis_example_v0alpha1_DummyResourceList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/pkg/apis/example/v0alpha1.DummyResource"),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/example/v0alpha1.DummyResource", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+	}
+}
+
+func schema_pkg_apis_example_v0alpha1_DummySubresource(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"info": {
+						SchemaProps: spec.SchemaProps{
+							Description: "add subresource info here",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_example_v0alpha1_RuntimeInfo(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Mirrors the info exposed in \"github.com/grafana/grafana/pkg/setting\"",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"startupTime": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Unix timestamp when the process started",
+							Type:        []string{"integer"},
+							Format:      "int64",
+						},
+					},
+					"buildVersion": {
+						SchemaProps: spec.SchemaProps{
+							Type:   []string{"string"},
+							Format: "",
+						},
+					},
+					"buildCommit": {
+						SchemaProps: spec.SchemaProps{
+							Type:   []string{"string"},
+							Format: "",
+						},
+					},
+					"enterpriseBuildCommit": {
+						SchemaProps: spec.SchemaProps{
+							Type:   []string{"string"},
+							Format: "",
+						},
+					},
+					"buildBranch": {
+						SchemaProps: spec.SchemaProps{
+							Type:   []string{"string"},
+							Format: "",
+						},
+					},
+					"buildStamp": {
+						SchemaProps: spec.SchemaProps{
+							Type:   []string{"integer"},
+							Format: "int64",
+						},
+					},
+					"enterprise": {
+						SchemaProps: spec.SchemaProps{
+							Type:   []string{"boolean"},
+							Format: "",
+						},
+					},
+					"packaging": {
+						SchemaProps: spec.SchemaProps{
+							Type:   []string{"string"},
+							Format: "",
+						},
+					},
+				},
+			},
+		},
+	}
+}
diff --git a/pkg/apis/example/v0alpha1/zz_generated.openapi_violation_exceptions.list b/pkg/apis/example/v0alpha1/zz_generated.openapi_violation_exceptions.list
new file mode 100644
index 0000000000000..75c16b7b44ee4
--- /dev/null
+++ b/pkg/apis/example/v0alpha1/zz_generated.openapi_violation_exceptions.list
@@ -0,0 +1 @@
+API rule violation: names_match,github.com/grafana/grafana/pkg/apis/example/v0alpha1,RuntimeInfo,IsEnterprise
diff --git a/pkg/apis/featuretoggle/v0alpha1/doc.go b/pkg/apis/featuretoggle/v0alpha1/doc.go
new file mode 100644
index 0000000000000..222ebfd88b528
--- /dev/null
+++ b/pkg/apis/featuretoggle/v0alpha1/doc.go
@@ -0,0 +1,6 @@
+// +k8s:deepcopy-gen=package
+// +k8s:openapi-gen=true
+// +k8s:defaulter-gen=TypeMeta
+// +groupName=featuretoggle.grafana.app
+
+package v0alpha1 // import "github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1"
diff --git a/pkg/apis/featuretoggle/v0alpha1/register.go b/pkg/apis/featuretoggle/v0alpha1/register.go
new file mode 100644
index 0000000000000..b1e7d06238723
--- /dev/null
+++ b/pkg/apis/featuretoggle/v0alpha1/register.go
@@ -0,0 +1,33 @@
+package v0alpha1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+)
+
+const (
+	GROUP      = "featuretoggle.grafana.app"
+	VERSION    = "v0alpha1"
+	APIVERSION = GROUP + "/" + VERSION
+)
+
+// FeatureResourceInfo represents each feature that may have a toggle
+var FeatureResourceInfo = common.NewResourceInfo(GROUP, VERSION,
+	"features", "feature", "Feature",
+	func() runtime.Object { return &Feature{} },
+	func() runtime.Object { return &FeatureList{} },
+)
+
+// TogglesResourceInfo represents the actual configuration
+var TogglesResourceInfo = common.NewResourceInfo(GROUP, VERSION,
+	"featuretoggles", "featuretoggle", "FeatureToggles",
+	func() runtime.Object { return &FeatureToggles{} },
+	func() runtime.Object { return &FeatureTogglesList{} },
+)
+
+var (
+	// SchemeGroupVersion is group version used to register these objects
+	SchemeGroupVersion = schema.GroupVersion{Group: GROUP, Version: VERSION}
+)
diff --git a/pkg/apis/featuretoggle/v0alpha1/types.go b/pkg/apis/featuretoggle/v0alpha1/types.go
new file mode 100644
index 0000000000000..223ffd6096e30
--- /dev/null
+++ b/pkg/apis/featuretoggle/v0alpha1/types.go
@@ -0,0 +1,117 @@
+package v0alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+)
+
+// Feature represents a feature in development and information about that feature
+// It does *not* know the status, only defines properties about the feature itself
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type Feature struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec FeatureSpec `json:"spec,omitempty"`
+}
+
+type FeatureSpec struct {
+	// The feature description
+	Description string `json:"description"`
+
+	// Indicates the features level of stability
+	Stage string `json:"stage"`
+
+	// The team who owns this feature development
+	Owner string `json:"codeowner,omitempty"`
+
+	// Enabled by default for version >=
+	EnabledVersion string `json:"enabledVersion,omitempty"`
+
+	// Must be run using in development mode (early dev)
+	RequiresDevMode bool `json:"requiresDevMode,omitempty"`
+
+	// The flab behavior only effects frontend -- it is not used in the backend
+	FrontendOnly bool `json:"frontend,omitempty"`
+
+	// The flag is used at startup, so any change requires a restart
+	RequiresRestart bool `json:"requiresRestart,omitempty"`
+
+	// Allow cloud users to set the values in UI
+	AllowSelfServe bool `json:"allowSelfServe,omitempty"`
+
+	// Do not show the value in the UI
+	HideFromAdminPage bool `json:"hideFromAdminPage,omitempty"`
+
+	// Do not show the value in docs
+	HideFromDocs bool `json:"hideFromDocs,omitempty"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type FeatureList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+
+	Items []Feature `json:"items,omitempty"`
+}
+
+// FeatureToggles define the feature state
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type FeatureToggles struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	// The configured toggles.  Note this may include unknown fields
+	Spec map[string]bool `json:"spec"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type FeatureTogglesList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+
+	Items []FeatureToggles `json:"items,omitempty"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type ResolvedToggleState struct {
+	metav1.TypeMeta `json:",inline"`
+
+	// The user is allowed to edit feature toggles on this system
+	AllowEditing bool `json:"allowEditing,omitempty"`
+
+	// The system has changes that require still require a restart
+	RestartRequired bool `json:"restartRequired,omitempty"`
+
+	// The currently enabled flags
+	Enabled map[string]bool `json:"enabled,omitempty"`
+
+	// Details on the current status
+	Toggles []ToggleStatus `json:"toggles,omitempty"`
+}
+
+type ToggleStatus struct {
+	// The feature toggle name
+	Name string `json:"name"`
+
+	// The flag description
+	Description string `json:"description,omitempty"`
+
+	// The feature toggle stage
+	Stage string `json:"stage"`
+
+	// Is the flag enabled
+	Enabled bool `json:"enabled"`
+
+	// Can this flag be updated
+	Writeable bool `json:"writeable"`
+
+	// Where was the value configured
+	// eg: startup | tenant|org | user | browser
+	// missing means default
+	Source *common.ObjectReference `json:"source,omitempty"`
+
+	// eg: unknown flag
+	Warning string `json:"warning,omitempty"`
+}
diff --git a/pkg/apis/featuretoggle/v0alpha1/zz_generated.deepcopy.go b/pkg/apis/featuretoggle/v0alpha1/zz_generated.deepcopy.go
new file mode 100644
index 0000000000000..6b06fab2b6d16
--- /dev/null
+++ b/pkg/apis/featuretoggle/v0alpha1/zz_generated.deepcopy.go
@@ -0,0 +1,215 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by deepcopy-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	commonv0alpha1 "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Feature) DeepCopyInto(out *Feature) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	out.Spec = in.Spec
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Feature.
+func (in *Feature) DeepCopy() *Feature {
+	if in == nil {
+		return nil
+	}
+	out := new(Feature)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *Feature) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *FeatureList) DeepCopyInto(out *FeatureList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]Feature, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FeatureList.
+func (in *FeatureList) DeepCopy() *FeatureList {
+	if in == nil {
+		return nil
+	}
+	out := new(FeatureList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *FeatureList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *FeatureSpec) DeepCopyInto(out *FeatureSpec) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FeatureSpec.
+func (in *FeatureSpec) DeepCopy() *FeatureSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(FeatureSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *FeatureToggles) DeepCopyInto(out *FeatureToggles) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	if in.Spec != nil {
+		in, out := &in.Spec, &out.Spec
+		*out = make(map[string]bool, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FeatureToggles.
+func (in *FeatureToggles) DeepCopy() *FeatureToggles {
+	if in == nil {
+		return nil
+	}
+	out := new(FeatureToggles)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *FeatureToggles) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *FeatureTogglesList) DeepCopyInto(out *FeatureTogglesList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]FeatureToggles, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FeatureTogglesList.
+func (in *FeatureTogglesList) DeepCopy() *FeatureTogglesList {
+	if in == nil {
+		return nil
+	}
+	out := new(FeatureTogglesList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *FeatureTogglesList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ResolvedToggleState) DeepCopyInto(out *ResolvedToggleState) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	if in.Enabled != nil {
+		in, out := &in.Enabled, &out.Enabled
+		*out = make(map[string]bool, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
+	if in.Toggles != nil {
+		in, out := &in.Toggles, &out.Toggles
+		*out = make([]ToggleStatus, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ResolvedToggleState.
+func (in *ResolvedToggleState) DeepCopy() *ResolvedToggleState {
+	if in == nil {
+		return nil
+	}
+	out := new(ResolvedToggleState)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ResolvedToggleState) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ToggleStatus) DeepCopyInto(out *ToggleStatus) {
+	*out = *in
+	if in.Source != nil {
+		in, out := &in.Source, &out.Source
+		*out = new(commonv0alpha1.ObjectReference)
+		**out = **in
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ToggleStatus.
+func (in *ToggleStatus) DeepCopy() *ToggleStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(ToggleStatus)
+	in.DeepCopyInto(out)
+	return out
+}
diff --git a/pkg/apis/featuretoggle/v0alpha1/zz_generated.defaults.go b/pkg/apis/featuretoggle/v0alpha1/zz_generated.defaults.go
new file mode 100644
index 0000000000000..238fc2f4edcfe
--- /dev/null
+++ b/pkg/apis/featuretoggle/v0alpha1/zz_generated.defaults.go
@@ -0,0 +1,19 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by defaulter-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// RegisterDefaults adds defaulters functions to the given scheme.
+// Public to allow building arbitrary schemes.
+// All generated defaulters are covering - they call all nested defaulters.
+func RegisterDefaults(scheme *runtime.Scheme) error {
+	return nil
+}
diff --git a/pkg/apis/featuretoggle/v0alpha1/zz_generated.openapi.go b/pkg/apis/featuretoggle/v0alpha1/zz_generated.openapi.go
new file mode 100644
index 0000000000000..a7817ad4248b4
--- /dev/null
+++ b/pkg/apis/featuretoggle/v0alpha1/zz_generated.openapi.go
@@ -0,0 +1,438 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by openapi-gen. DO NOT EDIT.
+
+// This file was autogenerated by openapi-gen. Do not edit it manually!
+
+package v0alpha1
+
+import (
+	common "k8s.io/kube-openapi/pkg/common"
+	spec "k8s.io/kube-openapi/pkg/validation/spec"
+)
+
+func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
+	return map[string]common.OpenAPIDefinition{
+		"github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1.Feature":             schema_pkg_apis_featuretoggle_v0alpha1_Feature(ref),
+		"github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1.FeatureList":         schema_pkg_apis_featuretoggle_v0alpha1_FeatureList(ref),
+		"github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1.FeatureSpec":         schema_pkg_apis_featuretoggle_v0alpha1_FeatureSpec(ref),
+		"github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1.FeatureToggles":      schema_pkg_apis_featuretoggle_v0alpha1_FeatureToggles(ref),
+		"github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1.FeatureTogglesList":  schema_pkg_apis_featuretoggle_v0alpha1_FeatureTogglesList(ref),
+		"github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1.ResolvedToggleState": schema_pkg_apis_featuretoggle_v0alpha1_ResolvedToggleState(ref),
+		"github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1.ToggleStatus":        schema_pkg_apis_featuretoggle_v0alpha1_ToggleStatus(ref),
+	}
+}
+
+func schema_pkg_apis_featuretoggle_v0alpha1_Feature(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Feature represents a feature in development and information about that feature It does *not* know the status, only defines properties about the feature itself",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
+						},
+					},
+					"spec": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1.FeatureSpec"),
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1.FeatureSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+	}
+}
+
+func schema_pkg_apis_featuretoggle_v0alpha1_FeatureList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1.Feature"),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1.Feature", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+	}
+}
+
+func schema_pkg_apis_featuretoggle_v0alpha1_FeatureSpec(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"description": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The feature description",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"stage": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Indicates the features level of stability",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"codeowner": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The team who owns this feature development",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"enabledVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Enabled by default for version >=",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"requiresDevMode": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Must be run using in development mode (early dev)",
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+					"frontend": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The flab behavior only effects frontend -- it is not used in the backend",
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+					"requiresRestart": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The flag is used at startup, so any change requires a restart",
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+					"allowSelfServe": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Allow cloud users to set the values in UI",
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+					"hideFromAdminPage": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Do not show the value in the UI",
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+					"hideFromDocs": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Do not show the value in docs",
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+				},
+				Required: []string{"description", "stage"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_featuretoggle_v0alpha1_FeatureToggles(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "FeatureToggles define the feature state",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
+						},
+					},
+					"spec": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The configured toggles.  Note this may include unknown fields",
+							Type:        []string{"object"},
+							AdditionalProperties: &spec.SchemaOrBool{
+								Allows: true,
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: false,
+										Type:    []string{"boolean"},
+										Format:  "",
+									},
+								},
+							},
+						},
+					},
+				},
+				Required: []string{"spec"},
+			},
+		},
+		Dependencies: []string{
+			"k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+	}
+}
+
+func schema_pkg_apis_featuretoggle_v0alpha1_FeatureTogglesList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1.FeatureToggles"),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1.FeatureToggles", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+	}
+}
+
+func schema_pkg_apis_featuretoggle_v0alpha1_ResolvedToggleState(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"allowEditing": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The user is allowed to edit feature toggles on this system",
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+					"restartRequired": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The system has changes that require still require a restart",
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+					"enabled": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The currently enabled flags",
+							Type:        []string{"object"},
+							AdditionalProperties: &spec.SchemaOrBool{
+								Allows: true,
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: false,
+										Type:    []string{"boolean"},
+										Format:  "",
+									},
+								},
+							},
+						},
+					},
+					"toggles": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Details on the current status",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1.ToggleStatus"),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1.ToggleStatus"},
+	}
+}
+
+func schema_pkg_apis_featuretoggle_v0alpha1_ToggleStatus(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"name": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The feature toggle name",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"description": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The flag description",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"stage": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The feature toggle stage",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"enabled": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Is the flag enabled",
+							Default:     false,
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+					"writeable": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Can this flag be updated",
+							Default:     false,
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+					"source": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Where was the value configured eg: startup | tenant|org | user | browser missing means default",
+							Ref:         ref("github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.ObjectReference"),
+						},
+					},
+					"warning": {
+						SchemaProps: spec.SchemaProps{
+							Description: "eg: unknown flag",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+				Required: []string{"name", "stage", "enabled", "writeable"},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.ObjectReference"},
+	}
+}
diff --git a/pkg/apis/featuretoggle/v0alpha1/zz_generated.openapi_violation_exceptions.list b/pkg/apis/featuretoggle/v0alpha1/zz_generated.openapi_violation_exceptions.list
new file mode 100644
index 0000000000000..2a3961b3eee73
--- /dev/null
+++ b/pkg/apis/featuretoggle/v0alpha1/zz_generated.openapi_violation_exceptions.list
@@ -0,0 +1,3 @@
+API rule violation: list_type_missing,github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1,ResolvedToggleState,Toggles
+API rule violation: names_match,github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1,FeatureSpec,FrontendOnly
+API rule violation: names_match,github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1,FeatureSpec,Owner
diff --git a/pkg/apis/folder/v0alpha1/doc.go b/pkg/apis/folder/v0alpha1/doc.go
new file mode 100644
index 0000000000000..fc85f689f0ea9
--- /dev/null
+++ b/pkg/apis/folder/v0alpha1/doc.go
@@ -0,0 +1,6 @@
+// +k8s:deepcopy-gen=package
+// +k8s:openapi-gen=true
+// +k8s:defaulter-gen=TypeMeta
+// +groupName=folder.grafana.app
+
+package v0alpha1 // import "github.com/grafana/grafana/pkg/apis/folder/v0alpha1"
diff --git a/pkg/apis/folder/v0alpha1/register.go b/pkg/apis/folder/v0alpha1/register.go
new file mode 100644
index 0000000000000..010054ad15c44
--- /dev/null
+++ b/pkg/apis/folder/v0alpha1/register.go
@@ -0,0 +1,26 @@
+package v0alpha1
+
+import (
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+)
+
+const (
+	GROUP      = "folder.grafana.app"
+	VERSION    = "v0alpha1"
+	RESOURCE   = "folders"
+	APIVERSION = GROUP + "/" + VERSION
+)
+
+var FolderResourceInfo = common.NewResourceInfo(GROUP, VERSION,
+	RESOURCE, "folder", "Folder",
+	func() runtime.Object { return &Folder{} },
+	func() runtime.Object { return &FolderList{} },
+)
+
+var (
+	// SchemeGroupVersion is group version used to register these objects
+	SchemeGroupVersion = schema.GroupVersion{Group: GROUP, Version: VERSION}
+)
diff --git a/pkg/apis/folder/v0alpha1/types.go b/pkg/apis/folder/v0alpha1/types.go
new file mode 100644
index 0000000000000..05a29fc09e879
--- /dev/null
+++ b/pkg/apis/folder/v0alpha1/types.go
@@ -0,0 +1,72 @@
+package v0alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type Folder struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec Spec `json:"spec,omitempty"`
+}
+
+type Spec struct {
+	// Describe the feature toggle
+	Title string `json:"title"`
+
+	// Describe the feature toggle
+	Description string `json:"description,omitempty"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type FolderList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+
+	Items []Folder `json:"items,omitempty"`
+}
+
+// FolderInfoList returns a list of folder references (parents or children)
+// Unlike FolderList, each item is not a full k8s object
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type FolderInfoList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+
+	// +listType=map
+	// +listMapKey=uid
+	Items []FolderInfo `json:"items,omitempty"`
+}
+
+// FolderInfo briefly describes a folder -- unlike a folder resource,
+// this is a partial record of the folder metadata used for navigating parents and children
+type FolderInfo struct {
+	// UID is the unique identifier for a folder (and the k8s name)
+	UID string `json:"uid"`
+
+	// Title is the display value
+	Title string `json:"title"`
+
+	// The parent folder UID
+	Parent string `json:"parent,omitempty"`
+}
+
+// Access control information for the current user
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type FolderAccessInfo struct {
+	metav1.TypeMeta `json:",inline"`
+
+	CanSave   bool `json:"canSave"`
+	CanEdit   bool `json:"canEdit"`
+	CanAdmin  bool `json:"canAdmin"`
+	CanDelete bool `json:"canDelete"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type DescendantCounts struct {
+	metav1.TypeMeta `json:",inline"`
+
+	Counts map[string]int64 `json:"counts"`
+}
diff --git a/pkg/apis/folder/v0alpha1/zz_generated.deepcopy.go b/pkg/apis/folder/v0alpha1/zz_generated.deepcopy.go
new file mode 100644
index 0000000000000..2ddf035b53334
--- /dev/null
+++ b/pkg/apis/folder/v0alpha1/zz_generated.deepcopy.go
@@ -0,0 +1,192 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by deepcopy-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DescendantCounts) DeepCopyInto(out *DescendantCounts) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	if in.Counts != nil {
+		in, out := &in.Counts, &out.Counts
+		*out = make(map[string]int64, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DescendantCounts.
+func (in *DescendantCounts) DeepCopy() *DescendantCounts {
+	if in == nil {
+		return nil
+	}
+	out := new(DescendantCounts)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *DescendantCounts) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Folder) DeepCopyInto(out *Folder) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	out.Spec = in.Spec
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Folder.
+func (in *Folder) DeepCopy() *Folder {
+	if in == nil {
+		return nil
+	}
+	out := new(Folder)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *Folder) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *FolderAccessInfo) DeepCopyInto(out *FolderAccessInfo) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FolderAccessInfo.
+func (in *FolderAccessInfo) DeepCopy() *FolderAccessInfo {
+	if in == nil {
+		return nil
+	}
+	out := new(FolderAccessInfo)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *FolderAccessInfo) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *FolderInfo) DeepCopyInto(out *FolderInfo) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FolderInfo.
+func (in *FolderInfo) DeepCopy() *FolderInfo {
+	if in == nil {
+		return nil
+	}
+	out := new(FolderInfo)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *FolderInfoList) DeepCopyInto(out *FolderInfoList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]FolderInfo, len(*in))
+		copy(*out, *in)
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FolderInfoList.
+func (in *FolderInfoList) DeepCopy() *FolderInfoList {
+	if in == nil {
+		return nil
+	}
+	out := new(FolderInfoList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *FolderInfoList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *FolderList) DeepCopyInto(out *FolderList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]Folder, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FolderList.
+func (in *FolderList) DeepCopy() *FolderList {
+	if in == nil {
+		return nil
+	}
+	out := new(FolderList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *FolderList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Spec) DeepCopyInto(out *Spec) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Spec.
+func (in *Spec) DeepCopy() *Spec {
+	if in == nil {
+		return nil
+	}
+	out := new(Spec)
+	in.DeepCopyInto(out)
+	return out
+}
diff --git a/pkg/apis/folder/v0alpha1/zz_generated.defaults.go b/pkg/apis/folder/v0alpha1/zz_generated.defaults.go
new file mode 100644
index 0000000000000..238fc2f4edcfe
--- /dev/null
+++ b/pkg/apis/folder/v0alpha1/zz_generated.defaults.go
@@ -0,0 +1,19 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by defaulter-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// RegisterDefaults adds defaulters functions to the given scheme.
+// Public to allow building arbitrary schemes.
+// All generated defaulters are covering - they call all nested defaulters.
+func RegisterDefaults(scheme *runtime.Scheme) error {
+	return nil
+}
diff --git a/pkg/apis/folder/v0alpha1/zz_generated.openapi.go b/pkg/apis/folder/v0alpha1/zz_generated.openapi.go
new file mode 100644
index 0000000000000..71d03fb914dfe
--- /dev/null
+++ b/pkg/apis/folder/v0alpha1/zz_generated.openapi.go
@@ -0,0 +1,333 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by openapi-gen. DO NOT EDIT.
+
+// This file was autogenerated by openapi-gen. Do not edit it manually!
+
+package v0alpha1
+
+import (
+	common "k8s.io/kube-openapi/pkg/common"
+	spec "k8s.io/kube-openapi/pkg/validation/spec"
+)
+
+func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
+	return map[string]common.OpenAPIDefinition{
+		"github.com/grafana/grafana/pkg/apis/folder/v0alpha1.DescendantCounts": schema_pkg_apis_folder_v0alpha1_DescendantCounts(ref),
+		"github.com/grafana/grafana/pkg/apis/folder/v0alpha1.Folder":           schema_pkg_apis_folder_v0alpha1_Folder(ref),
+		"github.com/grafana/grafana/pkg/apis/folder/v0alpha1.FolderAccessInfo": schema_pkg_apis_folder_v0alpha1_FolderAccessInfo(ref),
+		"github.com/grafana/grafana/pkg/apis/folder/v0alpha1.FolderInfo":       schema_pkg_apis_folder_v0alpha1_FolderInfo(ref),
+		"github.com/grafana/grafana/pkg/apis/folder/v0alpha1.FolderInfoList":   schema_pkg_apis_folder_v0alpha1_FolderInfoList(ref),
+		"github.com/grafana/grafana/pkg/apis/folder/v0alpha1.FolderList":       schema_pkg_apis_folder_v0alpha1_FolderList(ref),
+		"github.com/grafana/grafana/pkg/apis/folder/v0alpha1.Spec":             schema_pkg_apis_folder_v0alpha1_Spec(ref),
+	}
+}
+
+func schema_pkg_apis_folder_v0alpha1_DescendantCounts(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"counts": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"object"},
+							AdditionalProperties: &spec.SchemaOrBool{
+								Allows: true,
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: 0,
+										Type:    []string{"integer"},
+										Format:  "int64",
+									},
+								},
+							},
+						},
+					},
+				},
+				Required: []string{"counts"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_folder_v0alpha1_Folder(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
+						},
+					},
+					"spec": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("github.com/grafana/grafana/pkg/apis/folder/v0alpha1.Spec"),
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/folder/v0alpha1.Spec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+	}
+}
+
+func schema_pkg_apis_folder_v0alpha1_FolderAccessInfo(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Access control information for the current user",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"canSave": {
+						SchemaProps: spec.SchemaProps{
+							Default: false,
+							Type:    []string{"boolean"},
+							Format:  "",
+						},
+					},
+					"canEdit": {
+						SchemaProps: spec.SchemaProps{
+							Default: false,
+							Type:    []string{"boolean"},
+							Format:  "",
+						},
+					},
+					"canAdmin": {
+						SchemaProps: spec.SchemaProps{
+							Default: false,
+							Type:    []string{"boolean"},
+							Format:  "",
+						},
+					},
+					"canDelete": {
+						SchemaProps: spec.SchemaProps{
+							Default: false,
+							Type:    []string{"boolean"},
+							Format:  "",
+						},
+					},
+				},
+				Required: []string{"canSave", "canEdit", "canAdmin", "canDelete"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_folder_v0alpha1_FolderInfo(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "FolderInfo briefly describes a folder -- unlike a folder resource, this is a partial record of the folder metadata used for navigating parents and children",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"uid": {
+						SchemaProps: spec.SchemaProps{
+							Description: "UID is the unique identifier for a folder (and the k8s name)",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"title": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Title is the display value",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"parent": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The parent folder UID",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+				Required: []string{"uid", "title"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_folder_v0alpha1_FolderInfoList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "FolderInfoList returns a list of folder references (parents or children) Unlike FolderList, each item is not a full k8s object",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+						},
+					},
+					"items": {
+						VendorExtensible: spec.VendorExtensible{
+							Extensions: spec.Extensions{
+								"x-kubernetes-list-map-keys": []interface{}{
+									"uid",
+								},
+								"x-kubernetes-list-type": "map",
+							},
+						},
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/pkg/apis/folder/v0alpha1.FolderInfo"),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/folder/v0alpha1.FolderInfo", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+	}
+}
+
+func schema_pkg_apis_folder_v0alpha1_FolderList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/pkg/apis/folder/v0alpha1.Folder"),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/folder/v0alpha1.Folder", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+	}
+}
+
+func schema_pkg_apis_folder_v0alpha1_Spec(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"title": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Describe the feature toggle",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"description": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Describe the feature toggle",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+				Required: []string{"title"},
+			},
+		},
+	}
+}
diff --git a/pkg/apis/folder/v0alpha1/zz_generated.openapi_violation_exceptions.list b/pkg/apis/folder/v0alpha1/zz_generated.openapi_violation_exceptions.list
new file mode 100644
index 0000000000000..aa6d71f3ca967
--- /dev/null
+++ b/pkg/apis/folder/v0alpha1/zz_generated.openapi_violation_exceptions.list
@@ -0,0 +1 @@
+API rule violation: list_type_missing,github.com/grafana/grafana/pkg/apis/folder/v0alpha1,FolderInfoList,Items
diff --git a/pkg/apis/peakq/v0alpha1/doc.go b/pkg/apis/peakq/v0alpha1/doc.go
new file mode 100644
index 0000000000000..52a9e2be69c9b
--- /dev/null
+++ b/pkg/apis/peakq/v0alpha1/doc.go
@@ -0,0 +1,6 @@
+// +k8s:deepcopy-gen=package
+// +k8s:openapi-gen=true
+// +k8s:defaulter-gen=TypeMeta
+// +groupName=peakq.grafana.app
+
+package v0alpha1 // import "github.com/grafana/grafana/pkg/apis/peakq/v0alpha1"
diff --git a/pkg/apis/peakq/v0alpha1/register.go b/pkg/apis/peakq/v0alpha1/register.go
new file mode 100644
index 0000000000000..b58288d353834
--- /dev/null
+++ b/pkg/apis/peakq/v0alpha1/register.go
@@ -0,0 +1,51 @@
+package v0alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+)
+
+const (
+	GROUP      = "peakq.grafana.app"
+	VERSION    = "v0alpha1"
+	APIVERSION = GROUP + "/" + VERSION
+)
+
+var QueryTemplateResourceInfo = common.NewResourceInfo(GROUP, VERSION,
+	"querytemplates", "querytemplate", "QueryTemplate",
+	func() runtime.Object { return &QueryTemplate{} },
+	func() runtime.Object { return &QueryTemplateList{} },
+)
+
+var (
+	// SchemeGroupVersion is group version used to register these objects
+	SchemeGroupVersion = schema.GroupVersion{Group: GROUP, Version: VERSION}
+
+	// SchemaBuilder is used by standard codegen
+	SchemeBuilder      runtime.SchemeBuilder
+	localSchemeBuilder = &SchemeBuilder
+	AddToScheme        = localSchemeBuilder.AddToScheme
+)
+
+func init() {
+	localSchemeBuilder.Register(addKnownTypes)
+}
+
+// Adds the list of known types to the given scheme.
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(SchemeGroupVersion,
+		&QueryTemplate{},
+		&QueryTemplateList{},
+		&RenderedQuery{},
+	)
+	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
+	return nil
+}
+
+// Resource takes an unqualified resource and returns a Group qualified GroupResource
+func Resource(resource string) schema.GroupResource {
+	return SchemeGroupVersion.WithResource(resource).GroupResource()
+}
diff --git a/pkg/apis/peakq/v0alpha1/types.go b/pkg/apis/peakq/v0alpha1/types.go
new file mode 100644
index 0000000000000..0c67564df3508
--- /dev/null
+++ b/pkg/apis/peakq/v0alpha1/types.go
@@ -0,0 +1,32 @@
+package v0alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/grafana/grafana/pkg/apis/query/v0alpha1/template"
+)
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type QueryTemplate struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec template.QueryTemplate `json:"spec,omitempty"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type QueryTemplateList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+
+	Items []QueryTemplate `json:"items,omitempty"`
+}
+
+// Dummy object that represents a real query object
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type RenderedQuery struct {
+	metav1.TypeMeta `json:",inline"`
+
+	// +listType=atomic
+	Targets []template.Target `json:"targets,omitempty"`
+}
diff --git a/pkg/apis/peakq/v0alpha1/zz_generated.deepcopy.go b/pkg/apis/peakq/v0alpha1/zz_generated.deepcopy.go
new file mode 100644
index 0000000000000..6f50c376eb6a3
--- /dev/null
+++ b/pkg/apis/peakq/v0alpha1/zz_generated.deepcopy.go
@@ -0,0 +1,105 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by deepcopy-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	template "github.com/grafana/grafana/pkg/apis/query/v0alpha1/template"
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *QueryTemplate) DeepCopyInto(out *QueryTemplate) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new QueryTemplate.
+func (in *QueryTemplate) DeepCopy() *QueryTemplate {
+	if in == nil {
+		return nil
+	}
+	out := new(QueryTemplate)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *QueryTemplate) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *QueryTemplateList) DeepCopyInto(out *QueryTemplateList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]QueryTemplate, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new QueryTemplateList.
+func (in *QueryTemplateList) DeepCopy() *QueryTemplateList {
+	if in == nil {
+		return nil
+	}
+	out := new(QueryTemplateList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *QueryTemplateList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *RenderedQuery) DeepCopyInto(out *RenderedQuery) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	if in.Targets != nil {
+		in, out := &in.Targets, &out.Targets
+		*out = make([]template.Target, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RenderedQuery.
+func (in *RenderedQuery) DeepCopy() *RenderedQuery {
+	if in == nil {
+		return nil
+	}
+	out := new(RenderedQuery)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *RenderedQuery) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
diff --git a/pkg/apis/peakq/v0alpha1/zz_generated.defaults.go b/pkg/apis/peakq/v0alpha1/zz_generated.defaults.go
new file mode 100644
index 0000000000000..238fc2f4edcfe
--- /dev/null
+++ b/pkg/apis/peakq/v0alpha1/zz_generated.defaults.go
@@ -0,0 +1,19 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by defaulter-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// RegisterDefaults adds defaulters functions to the given scheme.
+// Public to allow building arbitrary schemes.
+// All generated defaulters are covering - they call all nested defaulters.
+func RegisterDefaults(scheme *runtime.Scheme) error {
+	return nil
+}
diff --git a/pkg/apis/peakq/v0alpha1/zz_generated.openapi.go b/pkg/apis/peakq/v0alpha1/zz_generated.openapi.go
new file mode 100644
index 0000000000000..42bdb435e5069
--- /dev/null
+++ b/pkg/apis/peakq/v0alpha1/zz_generated.openapi.go
@@ -0,0 +1,157 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by openapi-gen. DO NOT EDIT.
+
+// This file was autogenerated by openapi-gen. Do not edit it manually!
+
+package v0alpha1
+
+import (
+	common "k8s.io/kube-openapi/pkg/common"
+	spec "k8s.io/kube-openapi/pkg/validation/spec"
+)
+
+func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
+	return map[string]common.OpenAPIDefinition{
+		"github.com/grafana/grafana/pkg/apis/peakq/v0alpha1.QueryTemplate":     schema_pkg_apis_peakq_v0alpha1_QueryTemplate(ref),
+		"github.com/grafana/grafana/pkg/apis/peakq/v0alpha1.QueryTemplateList": schema_pkg_apis_peakq_v0alpha1_QueryTemplateList(ref),
+		"github.com/grafana/grafana/pkg/apis/peakq/v0alpha1.RenderedQuery":     schema_pkg_apis_peakq_v0alpha1_RenderedQuery(ref),
+	}
+}
+
+func schema_pkg_apis_peakq_v0alpha1_QueryTemplate(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
+						},
+					},
+					"spec": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("github.com/grafana/grafana/pkg/apis/query/v0alpha1/template.QueryTemplate"),
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/query/v0alpha1/template.QueryTemplate", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+	}
+}
+
+func schema_pkg_apis_peakq_v0alpha1_QueryTemplateList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/pkg/apis/peakq/v0alpha1.QueryTemplate"),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/peakq/v0alpha1.QueryTemplate", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+	}
+}
+
+func schema_pkg_apis_peakq_v0alpha1_RenderedQuery(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Dummy object that represents a real query object",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"targets": {
+						VendorExtensible: spec.VendorExtensible{
+							Extensions: spec.Extensions{
+								"x-kubernetes-list-type": "atomic",
+							},
+						},
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/pkg/apis/query/v0alpha1/template.Target"),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/query/v0alpha1/template.Target"},
+	}
+}
diff --git a/pkg/apis/playlist/v0alpha1/conversions.go b/pkg/apis/playlist/v0alpha1/conversions.go
deleted file mode 100644
index b512f2072949a..0000000000000
--- a/pkg/apis/playlist/v0alpha1/conversions.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package v0alpha1
-
-import (
-	"fmt"
-	"time"
-
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
-
-	"github.com/grafana/grafana/pkg/services/grafana-apiserver/endpoints/request"
-	"github.com/grafana/grafana/pkg/services/playlist"
-)
-
-func convertToK8sResource(v *playlist.PlaylistDTO, namespacer request.NamespaceMapper) *Playlist {
-	spec := Spec{
-		Title:    v.Name,
-		Interval: v.Interval,
-	}
-	for _, item := range v.Items {
-		spec.Items = append(spec.Items, Item{
-			Type:  ItemType(item.Type),
-			Value: item.Value,
-		})
-	}
-	return &Playlist{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:              v.Uid,
-			UID:               types.UID(v.Uid),
-			ResourceVersion:   fmt.Sprintf("%d", v.UpdatedAt),
-			CreationTimestamp: metav1.NewTime(time.UnixMilli(v.CreatedAt)),
-			Namespace:         namespacer(v.OrgID),
-		},
-		Spec: spec,
-	}
-}
diff --git a/pkg/apis/playlist/v0alpha1/doc.go b/pkg/apis/playlist/v0alpha1/doc.go
index 525126b0b7e72..72fdc02063146 100644
--- a/pkg/apis/playlist/v0alpha1/doc.go
+++ b/pkg/apis/playlist/v0alpha1/doc.go
@@ -1,5 +1,6 @@
 // +k8s:deepcopy-gen=package
 // +k8s:openapi-gen=true
-// +groupName=playlist.grafana.io
+// +k8s:defaulter-gen=TypeMeta
+// +groupName=playlist.grafana.app
 
 package v0alpha1 // import "github.com/grafana/grafana/pkg/apis/playlist/v0alpha1"
diff --git a/pkg/apis/playlist/v0alpha1/legacy_storage.go b/pkg/apis/playlist/v0alpha1/legacy_storage.go
deleted file mode 100644
index e504d37b62e39..0000000000000
--- a/pkg/apis/playlist/v0alpha1/legacy_storage.go
+++ /dev/null
@@ -1,112 +0,0 @@
-package v0alpha1
-
-import (
-	"context"
-	"errors"
-
-	k8serrors "k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/apis/meta/internalversion"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apiserver/pkg/registry/rest"
-
-	"github.com/grafana/grafana/pkg/services/grafana-apiserver/endpoints/request"
-	"github.com/grafana/grafana/pkg/services/playlist"
-)
-
-var (
-	_ rest.Scoper               = (*legacyStorage)(nil)
-	_ rest.SingularNameProvider = (*legacyStorage)(nil)
-	_ rest.Getter               = (*legacyStorage)(nil)
-	_ rest.Lister               = (*legacyStorage)(nil)
-	_ rest.Storage              = (*legacyStorage)(nil)
-)
-
-type legacyStorage struct {
-	service        playlist.Service
-	namespacer     request.NamespaceMapper
-	tableConverter rest.TableConvertor
-
-	DefaultQualifiedResource  schema.GroupResource
-	SingularQualifiedResource schema.GroupResource
-}
-
-func (s *legacyStorage) New() runtime.Object {
-	return &Playlist{}
-}
-
-func (s *legacyStorage) Destroy() {}
-
-func (s *legacyStorage) NamespaceScoped() bool {
-	return true // namespace == org
-}
-
-func (s *legacyStorage) GetSingularName() string {
-	return "playlist"
-}
-
-func (s *legacyStorage) NewList() runtime.Object {
-	return &PlaylistList{}
-}
-
-func (s *legacyStorage) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) {
-	return s.tableConverter.ConvertToTable(ctx, object, tableOptions)
-}
-
-func (s *legacyStorage) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) {
-	// TODO: handle fetching all available orgs when no namespace is specified
-	// To test: kubectl get playlists --all-namespaces
-	info, err := request.NamespaceInfoFrom(ctx, true)
-	if err != nil {
-		return nil, err
-	}
-
-	limit := 100
-	if options.Limit > 0 {
-		limit = int(options.Limit)
-	}
-	res, err := s.service.Search(ctx, &playlist.GetPlaylistsQuery{
-		OrgId: info.OrgID,
-		Limit: limit,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	list := &PlaylistList{}
-	for _, v := range res {
-		p, err := s.service.Get(ctx, &playlist.GetPlaylistByUidQuery{
-			UID:   v.UID,
-			OrgId: info.OrgID,
-		})
-		if err != nil {
-			return nil, err
-		}
-		list.Items = append(list.Items, *convertToK8sResource(p, s.namespacer))
-	}
-	if len(list.Items) == limit {
-		list.Continue = "<more>" // TODO?
-	}
-	return list, nil
-}
-
-func (s *legacyStorage) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) {
-	info, err := request.NamespaceInfoFrom(ctx, true)
-	if err != nil {
-		return nil, err
-	}
-
-	dto, err := s.service.Get(ctx, &playlist.GetPlaylistByUidQuery{
-		UID:   name,
-		OrgId: info.OrgID,
-	})
-	if err != nil || dto == nil {
-		if errors.Is(err, playlist.ErrPlaylistNotFound) || err == nil {
-			err = k8serrors.NewNotFound(s.SingularQualifiedResource, name)
-		}
-		return nil, err
-	}
-
-	return convertToK8sResource(dto, s.namespacer), nil
-}
diff --git a/pkg/apis/playlist/v0alpha1/register.go b/pkg/apis/playlist/v0alpha1/register.go
index 520f7b5c2d120..c1886b2d572bc 100644
--- a/pkg/apis/playlist/v0alpha1/register.go
+++ b/pkg/apis/playlist/v0alpha1/register.go
@@ -1,119 +1,25 @@
 package v0alpha1
 
 import (
-	"fmt"
-	"time"
-
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/runtime/serializer"
-	"k8s.io/apiserver/pkg/registry/generic"
-	"k8s.io/apiserver/pkg/registry/rest"
-	genericapiserver "k8s.io/apiserver/pkg/server"
-	common "k8s.io/kube-openapi/pkg/common"
 
-	grafanaapiserver "github.com/grafana/grafana/pkg/services/grafana-apiserver"
-	"github.com/grafana/grafana/pkg/services/grafana-apiserver/endpoints/request"
-	grafanarest "github.com/grafana/grafana/pkg/services/grafana-apiserver/rest"
-	"github.com/grafana/grafana/pkg/services/grafana-apiserver/utils"
-	"github.com/grafana/grafana/pkg/services/playlist"
-	"github.com/grafana/grafana/pkg/setting"
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
 )
 
-// GroupName is the group name for this API.
-const GroupName = "playlist.grafana.app"
-const VersionID = "v0alpha1"
-
-var _ grafanaapiserver.APIGroupBuilder = (*PlaylistAPIBuilder)(nil)
-
-// This is used just so wire has something unique to return
-type PlaylistAPIBuilder struct {
-	service    playlist.Service
-	namespacer request.NamespaceMapper
-	gv         schema.GroupVersion
-}
-
-func RegisterAPIService(p playlist.Service,
-	apiregistration grafanaapiserver.APIRegistrar,
-	cfg *setting.Cfg,
-) *PlaylistAPIBuilder {
-	builder := &PlaylistAPIBuilder{
-		service:    p,
-		namespacer: request.GetNamespaceMapper(cfg),
-		gv:         schema.GroupVersion{Group: GroupName, Version: VersionID},
-	}
-	apiregistration.RegisterAPI(builder)
-	return builder
-}
-
-func (b *PlaylistAPIBuilder) GetGroupVersion() schema.GroupVersion {
-	return b.gv
-}
-
-func (b *PlaylistAPIBuilder) InstallSchema(scheme *runtime.Scheme) error {
-	scheme.AddKnownTypes(b.gv,
-		&Playlist{},
-		&PlaylistList{},
-	)
-	metav1.AddToGroupVersion(scheme, b.gv)
-	return scheme.SetVersionPriority(b.gv)
-}
-
-func (b *PlaylistAPIBuilder) GetAPIGroupInfo(
-	scheme *runtime.Scheme,
-	codecs serializer.CodecFactory, // pointer?
-	optsGetter generic.RESTOptionsGetter,
-) (*genericapiserver.APIGroupInfo, error) {
-	apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(GroupName, scheme, metav1.ParameterCodec, codecs)
-	storage := map[string]rest.Storage{}
-
-	legacyStore := &legacyStorage{
-		service:                   b.service,
-		namespacer:                b.namespacer,
-		DefaultQualifiedResource:  b.gv.WithResource("playlists").GroupResource(),
-		SingularQualifiedResource: b.gv.WithResource("playlist").GroupResource(),
-	}
-	legacyStore.tableConverter = utils.NewTableConverter(
-		legacyStore.DefaultQualifiedResource,
-		[]metav1.TableColumnDefinition{
-			{Name: "Name", Type: "string", Format: "name"},
-			{Name: "Title", Type: "string", Format: "string", Description: "The playlist name"},
-			{Name: "Interval", Type: "string", Format: "string", Description: "How often the playlist will update"},
-			{Name: "Created At", Type: "date"},
-		},
-		func(obj runtime.Object) ([]interface{}, error) {
-			m, ok := obj.(*Playlist)
-			if !ok {
-				return nil, fmt.Errorf("expected playlist")
-			}
-			return []interface{}{
-				m.Name,
-				m.Spec.Title,
-				m.Spec.Interval,
-				m.CreationTimestamp.UTC().Format(time.RFC3339),
-			}, nil
-		},
-	)
-	storage["playlists"] = legacyStore
-
-	// enable dual writes if a RESTOptionsGetter is provided
-	if optsGetter != nil {
-		store, err := newStorage(scheme, optsGetter, legacyStore)
-		if err != nil {
-			return nil, err
-		}
-		storage["playlists"] = grafanarest.NewDualWriter(legacyStore, store)
-	}
-
-	apiGroupInfo.VersionedResourcesStorageMap[VersionID] = storage
-	return &apiGroupInfo, nil
-}
+const (
+	GROUP      = "playlist.grafana.app"
+	VERSION    = "v0alpha1"
+	APIVERSION = GROUP + "/" + VERSION
+)
 
-func (b *PlaylistAPIBuilder) GetOpenAPIDefinitions() common.GetOpenAPIDefinitions {
-	return getOpenAPIDefinitions
-}
+var PlaylistResourceInfo = common.NewResourceInfo(GROUP, VERSION,
+	"playlists", "playlist", "Playlist",
+	func() runtime.Object { return &Playlist{} },
+	func() runtime.Object { return &PlaylistList{} },
+)
 
-func (b *PlaylistAPIBuilder) GetAPIRoutes() *grafanaapiserver.APIRoutes {
-	return nil // no custom API routes
-}
+var (
+	// SchemeGroupVersion is group version used to register these objects
+	SchemeGroupVersion = schema.GroupVersion{Group: GROUP, Version: VERSION}
+)
diff --git a/pkg/apis/playlist/v0alpha1/storage.go b/pkg/apis/playlist/v0alpha1/storage.go
deleted file mode 100644
index d9934841468f2..0000000000000
--- a/pkg/apis/playlist/v0alpha1/storage.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package v0alpha1
-
-import (
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apiserver/pkg/registry/generic"
-	genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"
-
-	grafanaregistry "github.com/grafana/grafana/pkg/services/grafana-apiserver/registry/generic"
-	grafanarest "github.com/grafana/grafana/pkg/services/grafana-apiserver/rest"
-)
-
-var _ grafanarest.Storage = (*storage)(nil)
-
-type storage struct {
-	*genericregistry.Store
-}
-
-func newStorage(scheme *runtime.Scheme, optsGetter generic.RESTOptionsGetter, legacy *legacyStorage) (*storage, error) {
-	strategy := grafanaregistry.NewStrategy(scheme)
-
-	store := &genericregistry.Store{
-		NewFunc:                   func() runtime.Object { return &Playlist{} },
-		NewListFunc:               func() runtime.Object { return &PlaylistList{} },
-		PredicateFunc:             grafanaregistry.Matcher,
-		DefaultQualifiedResource:  legacy.DefaultQualifiedResource,
-		SingularQualifiedResource: legacy.SingularQualifiedResource,
-		TableConvertor:            legacy.tableConverter,
-
-		CreateStrategy: strategy,
-		UpdateStrategy: strategy,
-		DeleteStrategy: strategy,
-	}
-	options := &generic.StoreOptions{RESTOptions: optsGetter, AttrFunc: grafanaregistry.GetAttrs}
-	if err := store.CompleteWithOptions(options); err != nil {
-		return nil, err
-	}
-	return &storage{Store: store}, nil
-}
diff --git a/pkg/apis/playlist/v0alpha1/types.go b/pkg/apis/playlist/v0alpha1/types.go
index fb5b9e6faa675..84e8ee0f19977 100644
--- a/pkg/apis/playlist/v0alpha1/types.go
+++ b/pkg/apis/playlist/v0alpha1/types.go
@@ -36,12 +36,16 @@ type Spec struct {
 	Items []Item `json:"items,omitempty"`
 }
 
+// Type of the item.
+// +enum
+type ItemType string
+
 // Defines values for ItemType.
 const (
 	ItemTypeDashboardByTag ItemType = "dashboard_by_tag"
 	ItemTypeDashboardByUid ItemType = "dashboard_by_uid"
 
-	// deprecated -- should use UID
+	// Deprecated -- should use UID
 	ItemTypeDashboardById ItemType = "dashboard_by_id"
 )
 
@@ -60,6 +64,3 @@ type Item struct {
 	//  - dashboard_by_uid: The value is the dashboard UID
 	Value string `json:"value"`
 }
-
-// Type of the item.
-type ItemType string
diff --git a/pkg/apis/playlist/v0alpha1/types_test.go b/pkg/apis/playlist/v0alpha1/types_test.go
index 8ae306ddf2e46..9920b217b6201 100644
--- a/pkg/apis/playlist/v0alpha1/types_test.go
+++ b/pkg/apis/playlist/v0alpha1/types_test.go
@@ -16,7 +16,7 @@ func TestPlaylistClone(t *testing.T) {
 			ResourceVersion:   "12345",
 			CreationTimestamp: metav1.NewTime(time.Now()),
 			Annotations: map[string]string{
-				"grafana.com/updatedTime": time.Now().Format(time.RFC3339),
+				"grafana.app/updatedTimestamp": time.Now().Format(time.RFC3339),
 			},
 		},
 		Spec: Spec{
diff --git a/pkg/apis/playlist/v0alpha1/zz_generated.defaults.go b/pkg/apis/playlist/v0alpha1/zz_generated.defaults.go
new file mode 100644
index 0000000000000..238fc2f4edcfe
--- /dev/null
+++ b/pkg/apis/playlist/v0alpha1/zz_generated.defaults.go
@@ -0,0 +1,19 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by defaulter-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// RegisterDefaults adds defaulters functions to the given scheme.
+// Public to allow building arbitrary schemes.
+// All generated defaulters are covering - they call all nested defaulters.
+func RegisterDefaults(scheme *runtime.Scheme) error {
+	return nil
+}
diff --git a/pkg/apis/playlist/v0alpha1/zz_generated.openapi.go b/pkg/apis/playlist/v0alpha1/zz_generated.openapi.go
index 4be50c3a8f743..534cc7312dd53 100644
--- a/pkg/apis/playlist/v0alpha1/zz_generated.openapi.go
+++ b/pkg/apis/playlist/v0alpha1/zz_generated.openapi.go
@@ -14,7 +14,7 @@ import (
 	spec "k8s.io/kube-openapi/pkg/validation/spec"
 )
 
-func getOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
+func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
 	return map[string]common.OpenAPIDefinition{
 		"github.com/grafana/grafana/pkg/apis/playlist/v0alpha1.Item":         schema_pkg_apis_playlist_v0alpha1_Item(ref),
 		"github.com/grafana/grafana/pkg/apis/playlist/v0alpha1.Playlist":     schema_pkg_apis_playlist_v0alpha1_Playlist(ref),
@@ -32,10 +32,11 @@ func schema_pkg_apis_playlist_v0alpha1_Item(ref common.ReferenceCallback) common
 				Properties: map[string]spec.Schema{
 					"type": {
 						SchemaProps: spec.SchemaProps{
-							Description: "Type of the item.",
+							Description: "Type of the item.\n\nPossible enum values:\n - `\"dashboard_by_id\"` Deprecated -- should use UID\n - `\"dashboard_by_tag\"`\n - `\"dashboard_by_uid\"`",
 							Default:     "",
 							Type:        []string{"string"},
 							Format:      "",
+							Enum:        []interface{}{"dashboard_by_id", "dashboard_by_tag", "dashboard_by_uid"},
 						},
 					},
 					"value": {
diff --git a/pkg/apis/playlist/v0alpha1/zz_generated.openapi_violation_exceptions.list b/pkg/apis/playlist/v0alpha1/zz_generated.openapi_violation_exceptions.list
new file mode 100644
index 0000000000000..67057de3d4851
--- /dev/null
+++ b/pkg/apis/playlist/v0alpha1/zz_generated.openapi_violation_exceptions.list
@@ -0,0 +1 @@
+API rule violation: list_type_missing,github.com/grafana/grafana/pkg/apis/playlist/v0alpha1,Spec,Items
diff --git a/pkg/apis/query/v0alpha1/datasource.go b/pkg/apis/query/v0alpha1/datasource.go
new file mode 100644
index 0000000000000..1a39487c9376b
--- /dev/null
+++ b/pkg/apis/query/v0alpha1/datasource.go
@@ -0,0 +1,49 @@
+package v0alpha1
+
+import (
+	"context"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+type DataSourceApiServerRegistry interface {
+	// Get the group and preferred version for a plugin
+	GetDatasourceGroupVersion(pluginId string) (schema.GroupVersion, error)
+
+	// Get the list of available datasource api servers
+	// The values will be managed though API discovery/reconciliation
+	GetDatasourceApiServers(ctx context.Context) (*DataSourceApiServerList, error)
+}
+
+// The data source resource is a reflection of the individual datasource instances
+// that are exposed in the groups: {datasource}.datasource.grafana.app
+// The status is updated periodically.
+// The name is the plugin id
+//
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type DataSourceApiServer struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	// The display name
+	Title string `json:"title"`
+
+	// Describe the plugin
+	Description string `json:"description,omitempty"`
+
+	// The group + preferred version
+	GroupVersion string `json:"groupVersion"`
+
+	// Possible alternative plugin IDs
+	AliasIDs []string `json:"aliasIDs,omitempty"`
+}
+
+// List of datasource plugins
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type DataSourceApiServerList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+
+	Items []DataSourceApiServer `json:"items,omitempty"`
+}
diff --git a/pkg/apis/query/v0alpha1/doc.go b/pkg/apis/query/v0alpha1/doc.go
new file mode 100644
index 0000000000000..d0e053d47a701
--- /dev/null
+++ b/pkg/apis/query/v0alpha1/doc.go
@@ -0,0 +1,6 @@
+// +k8s:deepcopy-gen=package
+// +k8s:openapi-gen=true
+// +k8s:defaulter-gen=TypeMeta
+// +groupName=query.grafana.app
+
+package v0alpha1 // import "github.com/grafana/grafana/pkg/apis/query/v0alpha1"
diff --git a/pkg/apis/query/v0alpha1/query.go b/pkg/apis/query/v0alpha1/query.go
new file mode 100644
index 0000000000000..dd7ce99c390b7
--- /dev/null
+++ b/pkg/apis/query/v0alpha1/query.go
@@ -0,0 +1,59 @@
+package v0alpha1
+
+import (
+	"net/http"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	data "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// Generic query request with shared time across all values
+// Copied from: https://github.com/grafana/grafana/blob/main/pkg/api/dtos/models.go#L62
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type QueryDataRequest struct {
+	metav1.TypeMeta `json:",inline"`
+
+	// The time range used when not included on each query
+	data.QueryDataRequest `json:",inline"`
+}
+
+// Wraps backend.QueryDataResponse, however it includes TypeMeta and implements runtime.Object
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type QueryDataResponse struct {
+	metav1.TypeMeta `json:",inline"`
+
+	// Backend wrapper (external dependency)
+	backend.QueryDataResponse `json:",inline"`
+}
+
+// If errors exist, return multi-status
+func GetResponseCode(rsp *backend.QueryDataResponse) int {
+	if rsp == nil {
+		return http.StatusInternalServerError
+	}
+	for _, v := range rsp.Responses {
+		if v.Error != nil {
+			return http.StatusMultiStatus
+		}
+	}
+	return http.StatusOK
+}
+
+// Defines a query behavior in a datasource.  This is a similar model to a CRD where the
+// payload describes a valid query
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type QueryTypeDefinition struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec data.QueryTypeDefinitionSpec `json:"spec,omitempty"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type QueryTypeDefinitionList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+
+	Items []QueryTypeDefinition `json:"items,omitempty"`
+}
diff --git a/pkg/apis/query/v0alpha1/query_test.go b/pkg/apis/query/v0alpha1/query_test.go
new file mode 100644
index 0000000000000..03656d5b4197a
--- /dev/null
+++ b/pkg/apis/query/v0alpha1/query_test.go
@@ -0,0 +1,78 @@
+package v0alpha1_test
+
+import (
+	"encoding/json"
+	"testing"
+
+	data "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+	"github.com/stretchr/testify/require"
+
+	query "github.com/grafana/grafana/pkg/apis/query/v0alpha1"
+)
+
+func TestParseQueriesIntoQueryDataRequest(t *testing.T) {
+	request := []byte(`{
+		"queries": [
+			{
+				"refId": "A",
+				"datasource": {
+					"type": "grafana-googlesheets-datasource",
+					"uid": "b1808c48-9fc9-4045-82d7-081781f8a553"
+				},
+				"cacheDurationSeconds": 300,
+				"spreadsheet": "spreadsheetID",
+				"datasourceId": 4,
+				"intervalMs": 30000,
+				"maxDataPoints": 794
+			},
+			{
+				"refId": "Z",
+				"datasource": "old",
+				"maxDataPoints": 10,
+				"timeRange": {
+					"from": "100",
+					"to": "200"
+				},
+				"queryType": "foo"
+			}
+		],
+		"from": "1692624667389",
+		"to": "1692646267389"
+	}`)
+
+	req := &query.QueryDataRequest{}
+	err := json.Unmarshal(request, req)
+	require.NoError(t, err)
+
+	require.Len(t, req.Queries, 2)
+	require.Equal(t, "b1808c48-9fc9-4045-82d7-081781f8a553", req.Queries[0].Datasource.UID)
+	require.Equal(t, "spreadsheetID", req.Queries[0].GetString("spreadsheet"))
+
+	// Write the query (with additional spreadsheetID) to JSON
+	out, err := json.MarshalIndent(req.Queries[0], "", "  ")
+	require.NoError(t, err)
+
+	// And read it back with standard JSON marshal functions
+	query := &data.DataQuery{}
+	err = json.Unmarshal(out, query)
+	require.NoError(t, err)
+	require.Equal(t, "spreadsheetID", query.GetString("spreadsheet"))
+
+	// The second query has an explicit time range, and legacy datasource name
+	out, err = json.MarshalIndent(req.Queries[1], "", "  ")
+	require.NoError(t, err)
+	// fmt.Printf("%s\n", string(out))
+	require.JSONEq(t, `{
+		"datasource": {
+		  "type": "", ` /* NOTE! this implies legacy naming */ +`
+		  "uid": "old"
+		},
+		"maxDataPoints": 10,
+		"queryType": "foo",
+		"refId": "Z",
+		"timeRange": {
+		  "from": "100",
+		  "to": "200"
+		}
+	  }`, string(out))
+}
diff --git a/pkg/apis/query/v0alpha1/register.go b/pkg/apis/query/v0alpha1/register.go
new file mode 100644
index 0000000000000..c62fc559eb758
--- /dev/null
+++ b/pkg/apis/query/v0alpha1/register.go
@@ -0,0 +1,31 @@
+package v0alpha1
+
+import (
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+)
+
+const (
+	GROUP      = "query.grafana.app"
+	VERSION    = "v0alpha1"
+	APIVERSION = GROUP + "/" + VERSION
+)
+
+var DataSourceApiServerResourceInfo = common.NewResourceInfo(GROUP, VERSION,
+	"datasourceapiservers", "datasourceapiserver", "DataSourceApiServer",
+	func() runtime.Object { return &DataSourceApiServer{} },
+	func() runtime.Object { return &DataSourceApiServerList{} },
+)
+
+var QueryTypeDefinitionResourceInfo = common.NewResourceInfo(GROUP, VERSION,
+	"querytypes", "querytype", "QueryTypeDefinition",
+	func() runtime.Object { return &QueryTypeDefinition{} },
+	func() runtime.Object { return &QueryTypeDefinitionList{} },
+)
+
+var (
+	// SchemeGroupVersion is group version used to register these objects
+	SchemeGroupVersion = schema.GroupVersion{Group: GROUP, Version: VERSION}
+)
diff --git a/pkg/apis/query/v0alpha1/template/doc.go b/pkg/apis/query/v0alpha1/template/doc.go
new file mode 100644
index 0000000000000..3585a3a5806c8
--- /dev/null
+++ b/pkg/apis/query/v0alpha1/template/doc.go
@@ -0,0 +1,6 @@
+// +k8s:deepcopy-gen=package
+// +k8s:openapi-gen=true
+// +k8s:defaulter-gen=TypeMeta
+// +groupName=query.grafana.app
+
+package template // import "github.com/grafana/grafana/pkg/apis/query/v0alpha1/template"
diff --git a/pkg/apis/query/v0alpha1/template/format.go b/pkg/apis/query/v0alpha1/template/format.go
new file mode 100644
index 0000000000000..353a49ef2d366
--- /dev/null
+++ b/pkg/apis/query/v0alpha1/template/format.go
@@ -0,0 +1,68 @@
+package template
+
+import (
+	"bytes"
+	"encoding/csv"
+	"encoding/json"
+	"strings"
+)
+
+func FormatVariables(fmt VariableFormat, input []string) string {
+	if len(input) < 1 {
+		return ""
+	}
+
+	// MultiValued formats
+	// nolint: exhaustive
+	switch fmt {
+	case FormatJSON:
+		v, _ := json.Marshal(input)
+		return string(v)
+
+	case FormatDoubleQuote:
+		sb := bytes.NewBufferString("")
+		for idx, val := range input {
+			if idx > 0 {
+				_, _ = sb.WriteRune(',')
+			}
+			_, _ = sb.WriteRune('"')
+			_, _ = sb.WriteString(strings.ReplaceAll(val, `"`, `\"`))
+			_, _ = sb.WriteRune('"')
+		}
+		return sb.String()
+
+	case FormatSingleQuote:
+		sb := bytes.NewBufferString("")
+		for idx, val := range input {
+			if idx > 0 {
+				_, _ = sb.WriteRune(',')
+			}
+			_, _ = sb.WriteRune('\'')
+			_, _ = sb.WriteString(strings.ReplaceAll(val, `'`, `\'`))
+			_, _ = sb.WriteRune('\'')
+		}
+		return sb.String()
+
+	case FormatCSV:
+		sb := bytes.NewBufferString("")
+		w := csv.NewWriter(sb)
+		_ = w.Write(input)
+		w.Flush()
+		v := sb.Bytes()
+		return string(v[:len(v)-1])
+	}
+
+	// Single valued formats
+	if len(input) == 1 {
+		return input[0]
+	}
+
+	// nolint: exhaustive
+	switch fmt {
+	case FormatPipe:
+		return strings.Join(input, "|")
+	}
+
+	// Raw output (joined with a comma)
+	return strings.Join(input, ",")
+}
diff --git a/pkg/apis/query/v0alpha1/template/format_test.go b/pkg/apis/query/v0alpha1/template/format_test.go
new file mode 100644
index 0000000000000..ace0a499efe23
--- /dev/null
+++ b/pkg/apis/query/v0alpha1/template/format_test.go
@@ -0,0 +1,81 @@
+package template
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestFormat(t *testing.T) {
+	// Invalid input
+	require.Equal(t, "", FormatVariables(FormatCSV, nil))
+	require.Equal(t, "", FormatVariables(FormatCSV, []string{}))
+
+	type check struct {
+		name   string
+		input  []string
+		output map[VariableFormat]string
+	}
+
+	tests := []check{
+		{
+			name:  "three simple variables",
+			input: []string{"a", "b", "c"},
+			output: map[VariableFormat]string{
+				FormatCSV:         "a,b,c",
+				FormatJSON:        `["a","b","c"]`,
+				FormatDoubleQuote: `"a","b","c"`,
+				FormatSingleQuote: `'a','b','c'`,
+				FormatPipe:        `a|b|c`,
+				FormatRaw:         "a,b,c",
+			},
+		},
+		{
+			name:  "single value",
+			input: []string{"a"},
+			output: map[VariableFormat]string{
+				FormatCSV:         "a",
+				FormatJSON:        `["a"]`,
+				FormatDoubleQuote: `"a"`,
+				FormatSingleQuote: `'a'`,
+				FormatPipe:        "a",
+				FormatRaw:         "a",
+			},
+		},
+		{
+			name:  "value with quote",
+			input: []string{`hello "world"`},
+			output: map[VariableFormat]string{
+				FormatCSV:         `"hello ""world"""`, // note the double quotes
+				FormatJSON:        `["hello \"world\""]`,
+				FormatDoubleQuote: `"hello \"world\""`,
+				FormatSingleQuote: `'hello "world"'`,
+				FormatPipe:        `hello "world"`,
+				FormatRaw:         `hello "world"`,
+			},
+		},
+	}
+	for _, test := range tests {
+		// Make sure all keys are set in tests
+		all := map[VariableFormat]bool{
+			FormatRaw:         true,
+			FormatCSV:         true,
+			FormatJSON:        true,
+			FormatDoubleQuote: true,
+			FormatSingleQuote: true,
+			FormatPipe:        true,
+		}
+
+		// Check the default (no format) matches CSV
+		require.Equal(t, test.output[FormatRaw],
+			FormatVariables("", test.input),
+			"test %s default values are not raw", test.name)
+
+		// Check each input value
+		for format, v := range test.output {
+			require.Equal(t, v, FormatVariables(format, test.input), "Test: %s (format:%s)", test.name, format)
+			delete(all, format)
+		}
+		require.Empty(t, all, "test %s is missing cases for: %v", test.name, all)
+	}
+}
diff --git a/pkg/apis/query/v0alpha1/template/render.go b/pkg/apis/query/v0alpha1/template/render.go
new file mode 100644
index 0000000000000..372756139a37a
--- /dev/null
+++ b/pkg/apis/query/v0alpha1/template/render.go
@@ -0,0 +1,119 @@
+package template
+
+import (
+	"fmt"
+	"sort"
+
+	data "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+	"github.com/spyzhov/ajson"
+)
+
+// RenderTemplate applies selected values into a query template
+func RenderTemplate(qt QueryTemplate, selectedValues map[string][]string) ([]Target, error) {
+	targets := qt.DeepCopy().Targets
+
+	rawTargetObjects := make([]*ajson.Node, len(qt.Targets))
+	for i, t := range qt.Targets {
+		b, err := t.Properties.MarshalJSON()
+		if err != nil {
+			return nil, err
+		}
+		rawTargetObjects[i], err = ajson.Unmarshal(b)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	rm := getReplacementMap(qt)
+	for targetIdx, byTargetIdx := range rm {
+		for path, reps := range byTargetIdx {
+			o := rawTargetObjects[targetIdx]
+			nodes, err := o.JSONPath(path)
+			if err != nil {
+				return nil, fmt.Errorf("failed to find path %v: %w", path, err)
+			}
+			if len(nodes) != 1 {
+				return nil, fmt.Errorf("expected one lead node at path %v but got %v", path, len(nodes))
+			}
+			n := nodes[0]
+			if !n.IsString() {
+				return nil, fmt.Errorf("only string type leaf notes supported currently, %v is not a string", path)
+			}
+			s := []rune(n.String())
+			s = s[1 : len(s)-1]
+			var offSet int64
+			for _, r := range reps {
+				sV := selectedValues[r.Key]
+				if sV == nil {
+					sV = r.DefaultValues
+				}
+				value := []rune(FormatVariables(r.format, sV))
+				if r.Position == nil {
+					return nil, fmt.Errorf("nil position not support yet, will be full replacement")
+				}
+				s = append(s[:r.Start+offSet], append(value, s[r.End+offSet:]...)...)
+				offSet += int64(len(value)) - (r.End - r.Start)
+			}
+			if err = n.SetString(string(s)); err != nil {
+				return nil, err
+			}
+		}
+	}
+
+	for i, aT := range rawTargetObjects {
+		raw, err := ajson.Marshal(aT)
+		if err != nil {
+			return nil, err
+		}
+		u := data.DataQuery{}
+		err = u.UnmarshalJSON(raw)
+		if err != nil {
+			return nil, err
+		}
+		targets[i].Properties = u
+	}
+
+	return targets, nil
+}
+
+type replacement struct {
+	*Position
+	*TemplateVariable
+	format VariableFormat
+}
+
+func getReplacementMap(qt QueryTemplate) map[int]map[string][]replacement {
+	byTargetPath := make(map[int]map[string][]replacement)
+
+	varMap := make(map[string]*TemplateVariable, len(qt.Variables))
+	for i, v := range qt.Variables {
+		varMap[v.Key] = &qt.Variables[i]
+	}
+
+	for i, target := range qt.Targets {
+		if byTargetPath[i] == nil {
+			byTargetPath[i] = make(map[string][]replacement)
+		}
+		for k, vReps := range target.Variables {
+			for rI, rep := range vReps {
+				byTargetPath[i][rep.Path] = append(byTargetPath[i][rep.Path],
+					replacement{
+						Position:         vReps[rI].Position,
+						TemplateVariable: varMap[k],
+						format:           rep.Format,
+					},
+				)
+			}
+		}
+	}
+
+	for idx, byTargetIdx := range byTargetPath {
+		for path := range byTargetIdx {
+			sort.Slice(byTargetPath[idx][path], func(i, j int) bool {
+				return byTargetPath[idx][path][i].Start < byTargetPath[idx][path][j].Start
+			})
+		}
+	}
+
+	return byTargetPath
+}
diff --git a/pkg/apis/query/v0alpha1/template/render_test.go b/pkg/apis/query/v0alpha1/template/render_test.go
new file mode 100644
index 0000000000000..0ac5ae144afb0
--- /dev/null
+++ b/pkg/apis/query/v0alpha1/template/render_test.go
@@ -0,0 +1,244 @@
+package template
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	apidata "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+	"github.com/stretchr/testify/require"
+)
+
+var nestedFieldRender = QueryTemplate{
+	Title: "Test",
+	Variables: []TemplateVariable{
+		{
+			Key:           "metricName",
+			DefaultValues: []string{"cow_count"},
+		},
+	},
+	Targets: []Target{
+		{
+			DataType: data.FrameTypeUnknown,
+			//DataTypeVersion: data.FrameTypeVersion{0, 0},
+
+			Variables: map[string][]VariableReplacement{
+				"metricName": {
+					{
+						Path: "$.nestedObject.anArray[0]",
+						Position: &Position{
+							Start: 0,
+							End:   3,
+						},
+					},
+				},
+			},
+			Properties: apidata.NewDataQuery(map[string]any{
+				"nestedObject": map[string]any{
+					"anArray": []any{"foo", .2},
+				},
+			}),
+		},
+	},
+}
+
+var nestedFieldRenderedTargets = []Target{
+	{
+		DataType: data.FrameTypeUnknown,
+		Variables: map[string][]VariableReplacement{
+			"metricName": {
+				{
+					Path: "$.nestedObject.anArray[0]",
+					Position: &Position{
+						Start: 0,
+						End:   3,
+					},
+				},
+			},
+		},
+		//DataTypeVersion: data.FrameTypeVersion{0, 0},
+		Properties: apidata.NewDataQuery(
+			map[string]any{
+				"nestedObject": map[string]any{
+					"anArray": []any{"up", .2},
+				},
+			}),
+	},
+}
+
+var nestedFieldDefaultRenderedTargets = []Target{
+	{
+		DataType: data.FrameTypeUnknown,
+		Variables: map[string][]VariableReplacement{
+			"metricName": {
+				{
+					Path: "$.nestedObject.anArray[0]",
+					Position: &Position{
+						Start: 0,
+						End:   3,
+					},
+				},
+			},
+		},
+		//DataTypeVersion: data.FrameTypeVersion{0, 0},
+		Properties: apidata.NewDataQuery(
+			map[string]any{
+				"nestedObject": map[string]any{
+					"anArray": []any{"cow_count", .2},
+				},
+			}),
+	},
+}
+
+func TestNestedFieldRender(t *testing.T) {
+	rT, err := RenderTemplate(nestedFieldRender, map[string][]string{"metricName": {"up"}})
+	require.NoError(t, err)
+	require.Equal(t,
+		nestedFieldRenderedTargets,
+		rT,
+	)
+}
+
+func TestNestedFieldDefaultsRender(t *testing.T) {
+	rT, err := RenderTemplate(nestedFieldRender, nil)
+	require.NoError(t, err)
+	require.Equal(t,
+		nestedFieldDefaultRenderedTargets,
+		rT,
+	)
+}
+
+var multiVarTemplate = QueryTemplate{
+	Title: "Test",
+	Variables: []TemplateVariable{
+		{
+			Key: "metricName",
+		},
+		{
+			Key: "anotherMetric",
+		},
+	},
+	Targets: []Target{
+		{
+			DataType: data.FrameTypeUnknown,
+			//DataTypeVersion: data.FrameTypeVersion{0, 0},
+
+			Variables: map[string][]VariableReplacement{
+				"metricName": {
+					{
+						Path: "$.expr",
+						Position: &Position{
+							Start: 4,
+							End:   14,
+						},
+					},
+					{
+						Path: "$.expr",
+						Position: &Position{
+							Start: 37,
+							End:   47,
+						},
+					},
+				},
+				"anotherMetric": {
+					{
+						Path: "$.expr",
+						Position: &Position{
+							Start: 21,
+							End:   34,
+						},
+					},
+				},
+			},
+
+			Properties: apidata.NewDataQuery(map[string]any{
+				"expr": "1 + metricName + 1 + anotherMetric + metricName",
+			}),
+		},
+	},
+}
+
+var multiVarRenderedTargets = []Target{
+	{
+		DataType: data.FrameTypeUnknown,
+		Variables: map[string][]VariableReplacement{
+			"metricName": {
+				{
+					Path: "$.expr",
+					Position: &Position{
+						Start: 4,
+						End:   14,
+					},
+				},
+				{
+					Path: "$.expr",
+					Position: &Position{
+						Start: 37,
+						End:   47,
+					},
+				},
+			},
+			"anotherMetric": {
+				{
+					Path: "$.expr",
+					Position: &Position{
+						Start: 21,
+						End:   34,
+					},
+				},
+			},
+		},
+		//DataTypeVersion: data.FrameTypeVersion{0, 0},
+		Properties: apidata.NewDataQuery(map[string]any{
+			"expr": "1 + up + 1 + sloths_do_like_a_good_nap + up",
+		}),
+	},
+}
+
+func TestMultiVarTemplate(t *testing.T) {
+	rT, err := RenderTemplate(multiVarTemplate, map[string][]string{
+		"metricName":    {"up"},
+		"anotherMetric": {"sloths_do_like_a_good_nap"},
+	})
+	require.NoError(t, err)
+	require.Equal(t,
+		multiVarRenderedTargets,
+		rT,
+	)
+}
+
+func TestRenderWithRune(t *testing.T) {
+	qt := QueryTemplate{
+		Variables: []TemplateVariable{
+			{
+				Key: "name",
+			},
+		},
+		Targets: []Target{
+			{
+				Properties: apidata.NewDataQuery(map[string]any{
+					"message": "🐦 name!",
+				}),
+				Variables: map[string][]VariableReplacement{
+					"name": {
+						{
+							Path: "$.message",
+							Position: &Position{
+								Start: 2,
+								End:   6,
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	selectedValues := map[string][]string{
+		"name": {"🦥"},
+	}
+
+	rq, err := RenderTemplate(qt, selectedValues)
+	require.NoError(t, err)
+
+	require.Equal(t, "🐦 🦥!", rq[0].Properties.GetString("message"))
+}
diff --git a/pkg/apis/query/v0alpha1/template/types.go b/pkg/apis/query/v0alpha1/template/types.go
new file mode 100644
index 0000000000000..07ef89493363d
--- /dev/null
+++ b/pkg/apis/query/v0alpha1/template/types.go
@@ -0,0 +1,112 @@
+package template
+
+import (
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	apidata "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+)
+
+type QueryTemplate struct {
+	// A display name
+	Title string `json:"title,omitempty"`
+
+	// Longer description for why it is interesting
+	Description string `json:"description,omitempty"`
+
+	// The variables that can be used to render
+	// +listType=map
+	// +listMapKey=key
+	Variables []TemplateVariable `json:"vars,omitempty"`
+
+	// Output variables
+	// +listType=set
+	Targets []Target `json:"targets"`
+}
+
+type Target struct {
+	// DataType is the returned Dataplane type from the query.
+	DataType data.FrameType `json:"dataType,omitempty"`
+
+	// DataTypeVersion is the version for the Dataplane type.
+	// TODO 2[uint] seems to panic, maybe implement DeepCopy on data.FrameTypeVersion?
+	// DataTypeVersion data.FrameTypeVersion `json:"dataTypeVersion,omitempty"`
+
+	// Variables that will be replaced in the query
+	Variables map[string][]VariableReplacement `json:"variables"`
+
+	// Query target
+	Properties apidata.DataQuery `json:"properties"`
+}
+
+// TemplateVariable is the definition of a variable that will be interpolated
+// in targets.
+type TemplateVariable struct {
+	// Key is the name of the variable.
+	Key string `json:"key"`
+
+	// DefaultValue is the value to be used when there is no selected value
+	// during render.
+	// +listType=atomic
+	DefaultValues []string `json:"defaultValues,omitempty"`
+
+	// ValueListDefinition is the object definition used by the FE
+	// to get a list of possible values to select for render.
+	ValueListDefinition common.Unstructured `json:"valueListDefinition,omitempty"`
+}
+
+// QueryVariable is the definition of a variable that will be interpolated
+// in targets.
+type VariableReplacement struct {
+	// Path is the location of the property within a target.
+	// The format for this is not figured out yet (Maybe JSONPath?).
+	// Idea: ["string", int, "string"] where int indicates array offset
+	Path string `json:"path"`
+
+	// Positions is a list of where to perform the interpolation
+	// within targets during render.
+	// The first string is the Idx of the target as a string, since openAPI
+	// does not support ints as map keys
+	Position *Position `json:"position,omitempty"`
+
+	// How values should be interpolated
+	Format VariableFormat `json:"format,omitempty"`
+}
+
+// Define how to format values in the template.
+// See: https://grafana.com/docs/grafana/latest/dashboards/variables/variable-syntax/#advanced-variable-format-options
+// +enum
+type VariableFormat string
+
+// Defines values for ItemType.
+const (
+	// Formats variables with multiple values as a comma-separated string.
+	FormatCSV VariableFormat = "csv"
+
+	// Formats variables with multiple values as a comma-separated string.
+	FormatJSON VariableFormat = "json"
+
+	// Formats single- and multi-valued variables into a comma-separated string
+	FormatDoubleQuote VariableFormat = "doublequote"
+
+	// Formats single- and multi-valued variables into a comma-separated string
+	FormatSingleQuote VariableFormat = "singlequote"
+
+	// Formats variables with multiple values into a pipe-separated string.
+	FormatPipe VariableFormat = "pipe"
+
+	// Formats variables with multiple values into comma-separated string.
+	// This is the default behavior when no format is specified
+	FormatRaw VariableFormat = "raw"
+)
+
+// Position is where to do replacement in the targets
+// during render.
+type Position struct {
+	// Start is the byte offset within TargetKey's property of the variable.
+	// It is the start location for replacements).
+	Start int64 `json:"start"` // TODO: byte, rune?
+
+	// End is the byte offset of the end of the variable.
+	End int64 `json:"end"`
+}
diff --git a/pkg/apis/query/v0alpha1/template/zz_generated.deepcopy.go b/pkg/apis/query/v0alpha1/template/zz_generated.deepcopy.go
new file mode 100644
index 0000000000000..e8337fcdc34d2
--- /dev/null
+++ b/pkg/apis/query/v0alpha1/template/zz_generated.deepcopy.go
@@ -0,0 +1,131 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by deepcopy-gen. DO NOT EDIT.
+
+package template
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Position) DeepCopyInto(out *Position) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Position.
+func (in *Position) DeepCopy() *Position {
+	if in == nil {
+		return nil
+	}
+	out := new(Position)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *QueryTemplate) DeepCopyInto(out *QueryTemplate) {
+	*out = *in
+	if in.Variables != nil {
+		in, out := &in.Variables, &out.Variables
+		*out = make([]TemplateVariable, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	if in.Targets != nil {
+		in, out := &in.Targets, &out.Targets
+		*out = make([]Target, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new QueryTemplate.
+func (in *QueryTemplate) DeepCopy() *QueryTemplate {
+	if in == nil {
+		return nil
+	}
+	out := new(QueryTemplate)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Target) DeepCopyInto(out *Target) {
+	*out = *in
+	if in.Variables != nil {
+		in, out := &in.Variables, &out.Variables
+		*out = make(map[string][]VariableReplacement, len(*in))
+		for key, val := range *in {
+			var outVal []VariableReplacement
+			if val == nil {
+				(*out)[key] = nil
+			} else {
+				in, out := &val, &outVal
+				*out = make([]VariableReplacement, len(*in))
+				for i := range *in {
+					(*in)[i].DeepCopyInto(&(*out)[i])
+				}
+			}
+			(*out)[key] = outVal
+		}
+	}
+	in.Properties.DeepCopyInto(&out.Properties)
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Target.
+func (in *Target) DeepCopy() *Target {
+	if in == nil {
+		return nil
+	}
+	out := new(Target)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *TemplateVariable) DeepCopyInto(out *TemplateVariable) {
+	*out = *in
+	if in.DefaultValues != nil {
+		in, out := &in.DefaultValues, &out.DefaultValues
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	in.ValueListDefinition.DeepCopyInto(&out.ValueListDefinition)
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TemplateVariable.
+func (in *TemplateVariable) DeepCopy() *TemplateVariable {
+	if in == nil {
+		return nil
+	}
+	out := new(TemplateVariable)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *VariableReplacement) DeepCopyInto(out *VariableReplacement) {
+	*out = *in
+	if in.Position != nil {
+		in, out := &in.Position, &out.Position
+		*out = new(Position)
+		**out = **in
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VariableReplacement.
+func (in *VariableReplacement) DeepCopy() *VariableReplacement {
+	if in == nil {
+		return nil
+	}
+	out := new(VariableReplacement)
+	in.DeepCopyInto(out)
+	return out
+}
diff --git a/pkg/apis/query/v0alpha1/template/zz_generated.defaults.go b/pkg/apis/query/v0alpha1/template/zz_generated.defaults.go
new file mode 100644
index 0000000000000..f50cedd63968b
--- /dev/null
+++ b/pkg/apis/query/v0alpha1/template/zz_generated.defaults.go
@@ -0,0 +1,19 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by defaulter-gen. DO NOT EDIT.
+
+package template
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// RegisterDefaults adds defaulters functions to the given scheme.
+// Public to allow building arbitrary schemes.
+// All generated defaulters are covering - they call all nested defaulters.
+func RegisterDefaults(scheme *runtime.Scheme) error {
+	return nil
+}
diff --git a/pkg/apis/query/v0alpha1/zz_generated.deepcopy.go b/pkg/apis/query/v0alpha1/zz_generated.deepcopy.go
new file mode 100644
index 0000000000000..8f36003313da2
--- /dev/null
+++ b/pkg/apis/query/v0alpha1/zz_generated.deepcopy.go
@@ -0,0 +1,188 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by deepcopy-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DataSourceApiServer) DeepCopyInto(out *DataSourceApiServer) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	if in.AliasIDs != nil {
+		in, out := &in.AliasIDs, &out.AliasIDs
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DataSourceApiServer.
+func (in *DataSourceApiServer) DeepCopy() *DataSourceApiServer {
+	if in == nil {
+		return nil
+	}
+	out := new(DataSourceApiServer)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *DataSourceApiServer) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DataSourceApiServerList) DeepCopyInto(out *DataSourceApiServerList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]DataSourceApiServer, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DataSourceApiServerList.
+func (in *DataSourceApiServerList) DeepCopy() *DataSourceApiServerList {
+	if in == nil {
+		return nil
+	}
+	out := new(DataSourceApiServerList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *DataSourceApiServerList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *QueryDataRequest) DeepCopyInto(out *QueryDataRequest) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.QueryDataRequest.DeepCopyInto(&out.QueryDataRequest)
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new QueryDataRequest.
+func (in *QueryDataRequest) DeepCopy() *QueryDataRequest {
+	if in == nil {
+		return nil
+	}
+	out := new(QueryDataRequest)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *QueryDataRequest) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *QueryDataResponse) DeepCopyInto(out *QueryDataResponse) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.QueryDataResponse.DeepCopyInto(&out.QueryDataResponse)
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new QueryDataResponse.
+func (in *QueryDataResponse) DeepCopy() *QueryDataResponse {
+	if in == nil {
+		return nil
+	}
+	out := new(QueryDataResponse)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *QueryDataResponse) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *QueryTypeDefinition) DeepCopyInto(out *QueryTypeDefinition) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new QueryTypeDefinition.
+func (in *QueryTypeDefinition) DeepCopy() *QueryTypeDefinition {
+	if in == nil {
+		return nil
+	}
+	out := new(QueryTypeDefinition)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *QueryTypeDefinition) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *QueryTypeDefinitionList) DeepCopyInto(out *QueryTypeDefinitionList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]QueryTypeDefinition, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new QueryTypeDefinitionList.
+func (in *QueryTypeDefinitionList) DeepCopy() *QueryTypeDefinitionList {
+	if in == nil {
+		return nil
+	}
+	out := new(QueryTypeDefinitionList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *QueryTypeDefinitionList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
diff --git a/pkg/apis/query/v0alpha1/zz_generated.defaults.go b/pkg/apis/query/v0alpha1/zz_generated.defaults.go
new file mode 100644
index 0000000000000..238fc2f4edcfe
--- /dev/null
+++ b/pkg/apis/query/v0alpha1/zz_generated.defaults.go
@@ -0,0 +1,19 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by defaulter-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// RegisterDefaults adds defaulters functions to the given scheme.
+// Public to allow building arbitrary schemes.
+// All generated defaulters are covering - they call all nested defaulters.
+func RegisterDefaults(scheme *runtime.Scheme) error {
+	return nil
+}
diff --git a/pkg/apis/query/v0alpha1/zz_generated.openapi.go b/pkg/apis/query/v0alpha1/zz_generated.openapi.go
new file mode 100644
index 0000000000000..94065764f1ebc
--- /dev/null
+++ b/pkg/apis/query/v0alpha1/zz_generated.openapi.go
@@ -0,0 +1,625 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by openapi-gen. DO NOT EDIT.
+
+// This file was autogenerated by openapi-gen. Do not edit it manually!
+
+package v0alpha1
+
+import (
+	common "k8s.io/kube-openapi/pkg/common"
+	spec "k8s.io/kube-openapi/pkg/validation/spec"
+)
+
+func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
+	return map[string]common.OpenAPIDefinition{
+		"github.com/grafana/grafana/pkg/apis/query/v0alpha1.DataSourceApiServer":          schema_pkg_apis_query_v0alpha1_DataSourceApiServer(ref),
+		"github.com/grafana/grafana/pkg/apis/query/v0alpha1.DataSourceApiServerList":      schema_pkg_apis_query_v0alpha1_DataSourceApiServerList(ref),
+		"github.com/grafana/grafana/pkg/apis/query/v0alpha1.QueryDataRequest":             schema_pkg_apis_query_v0alpha1_QueryDataRequest(ref),
+		"github.com/grafana/grafana/pkg/apis/query/v0alpha1.QueryDataResponse":            schema_pkg_apis_query_v0alpha1_QueryDataResponse(ref),
+		"github.com/grafana/grafana/pkg/apis/query/v0alpha1.QueryTypeDefinition":          schema_pkg_apis_query_v0alpha1_QueryTypeDefinition(ref),
+		"github.com/grafana/grafana/pkg/apis/query/v0alpha1.QueryTypeDefinitionList":      schema_pkg_apis_query_v0alpha1_QueryTypeDefinitionList(ref),
+		"github.com/grafana/grafana/pkg/apis/query/v0alpha1/template.Position":            schema_apis_query_v0alpha1_template_Position(ref),
+		"github.com/grafana/grafana/pkg/apis/query/v0alpha1/template.QueryTemplate":       schema_apis_query_v0alpha1_template_QueryTemplate(ref),
+		"github.com/grafana/grafana/pkg/apis/query/v0alpha1/template.Target":              schema_apis_query_v0alpha1_template_Target(ref),
+		"github.com/grafana/grafana/pkg/apis/query/v0alpha1/template.TemplateVariable":    schema_apis_query_v0alpha1_template_TemplateVariable(ref),
+		"github.com/grafana/grafana/pkg/apis/query/v0alpha1/template.VariableReplacement": schema_apis_query_v0alpha1_template_VariableReplacement(ref),
+		"github.com/grafana/grafana/pkg/apis/query/v0alpha1/template.replacement":         schema_apis_query_v0alpha1_template_replacement(ref),
+	}
+}
+
+func schema_pkg_apis_query_v0alpha1_DataSourceApiServer(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "The data source resource is a reflection of the individual datasource instances that are exposed in the groups: {datasource}.datasource.grafana.app The status is updated periodically. The name is the plugin id",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
+						},
+					},
+					"title": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The display name",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"description": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Describe the plugin",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"groupVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The group + preferred version",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"aliasIDs": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Possible alternative plugin IDs",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: "",
+										Type:    []string{"string"},
+										Format:  "",
+									},
+								},
+							},
+						},
+					},
+				},
+				Required: []string{"title", "groupVersion"},
+			},
+		},
+		Dependencies: []string{
+			"k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+	}
+}
+
+func schema_pkg_apis_query_v0alpha1_DataSourceApiServerList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "List of datasource plugins",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/pkg/apis/query/v0alpha1.DataSourceApiServer"),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/query/v0alpha1.DataSourceApiServer", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+	}
+}
+
+func schema_pkg_apis_query_v0alpha1_QueryDataRequest(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Generic query request with shared time across all values Copied from: https://github.com/grafana/grafana/blob/main/pkg/api/dtos/models.go#L62",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"from": {
+						SchemaProps: spec.SchemaProps{
+							Description: "From is the start time of the query.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"to": {
+						SchemaProps: spec.SchemaProps{
+							Description: "To is the end time of the query.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"queries": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Datasource queries",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Ref: ref("github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1.DataQuery"),
+									},
+								},
+							},
+						},
+					},
+					"debug": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Optionally include debug information in the response",
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+				},
+				Required: []string{"from", "to", "queries"},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1.DataQuery"},
+	}
+}
+
+func schema_pkg_apis_query_v0alpha1_QueryDataResponse(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Wraps backend.QueryDataResponse, however it includes TypeMeta and implements runtime.Object",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"results": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Responses is a map of RefIDs (Unique Query ID) to *DataResponse.",
+							Type:        []string{"object"},
+							AdditionalProperties: &spec.SchemaOrBool{
+								Allows: true,
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana-plugin-sdk-go/backend.DataResponse"),
+									},
+								},
+							},
+						},
+					},
+				},
+				Required: []string{"results"},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana-plugin-sdk-go/backend.DataResponse"},
+	}
+}
+
+func schema_pkg_apis_query_v0alpha1_QueryTypeDefinition(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Defines a query behavior in a datasource.  This is a similar model to a CRD where the payload describes a valid query",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
+						},
+					},
+					"spec": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1.QueryTypeDefinitionSpec"),
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1.QueryTypeDefinitionSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+	}
+}
+
+func schema_pkg_apis_query_v0alpha1_QueryTypeDefinitionList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/pkg/apis/query/v0alpha1.QueryTypeDefinition"),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/query/v0alpha1.QueryTypeDefinition", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+	}
+}
+
+func schema_apis_query_v0alpha1_template_Position(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Position is where to do replacement in the targets during render.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"start": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Start is the byte offset within TargetKey's property of the variable. It is the start location for replacements).",
+							Default:     0,
+							Type:        []string{"integer"},
+							Format:      "int64",
+						},
+					},
+					"end": {
+						SchemaProps: spec.SchemaProps{
+							Description: "End is the byte offset of the end of the variable.",
+							Default:     0,
+							Type:        []string{"integer"},
+							Format:      "int64",
+						},
+					},
+				},
+				Required: []string{"start", "end"},
+			},
+		},
+	}
+}
+
+func schema_apis_query_v0alpha1_template_QueryTemplate(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"title": {
+						SchemaProps: spec.SchemaProps{
+							Description: "A display name",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"description": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Longer description for why it is interesting",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"vars": {
+						VendorExtensible: spec.VendorExtensible{
+							Extensions: spec.Extensions{
+								"x-kubernetes-list-map-keys": []interface{}{
+									"key",
+								},
+								"x-kubernetes-list-type": "map",
+							},
+						},
+						SchemaProps: spec.SchemaProps{
+							Description: "The variables that can be used to render",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/pkg/apis/query/v0alpha1/template.TemplateVariable"),
+									},
+								},
+							},
+						},
+					},
+					"targets": {
+						VendorExtensible: spec.VendorExtensible{
+							Extensions: spec.Extensions{
+								"x-kubernetes-list-type": "set",
+							},
+						},
+						SchemaProps: spec.SchemaProps{
+							Description: "Output variables",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/pkg/apis/query/v0alpha1/template.Target"),
+									},
+								},
+							},
+						},
+					},
+				},
+				Required: []string{"targets"},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/query/v0alpha1/template.Target", "github.com/grafana/grafana/pkg/apis/query/v0alpha1/template.TemplateVariable"},
+	}
+}
+
+func schema_apis_query_v0alpha1_template_Target(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"dataType": {
+						SchemaProps: spec.SchemaProps{
+							Description: "DataType is the returned Dataplane type from the query.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"variables": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Variables that will be replaced in the query",
+							Type:        []string{"object"},
+							AdditionalProperties: &spec.SchemaOrBool{
+								Allows: true,
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Type: []string{"array"},
+										Items: &spec.SchemaOrArray{
+											Schema: &spec.Schema{
+												SchemaProps: spec.SchemaProps{
+													Default: map[string]interface{}{},
+													Ref:     ref("github.com/grafana/grafana/pkg/apis/query/v0alpha1/template.VariableReplacement"),
+												},
+											},
+										},
+									},
+								},
+							},
+						},
+					},
+					"properties": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Query target",
+							Ref:         ref("github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1.DataQuery"),
+						},
+					},
+				},
+				Required: []string{"variables", "properties"},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1.DataQuery", "github.com/grafana/grafana/pkg/apis/query/v0alpha1/template.VariableReplacement"},
+	}
+}
+
+func schema_apis_query_v0alpha1_template_TemplateVariable(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "TemplateVariable is the definition of a variable that will be interpolated in targets.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"key": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Key is the name of the variable.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"defaultValues": {
+						VendorExtensible: spec.VendorExtensible{
+							Extensions: spec.Extensions{
+								"x-kubernetes-list-type": "atomic",
+							},
+						},
+						SchemaProps: spec.SchemaProps{
+							Description: "DefaultValue is the value to be used when there is no selected value during render.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: "",
+										Type:    []string{"string"},
+										Format:  "",
+									},
+								},
+							},
+						},
+					},
+					"valueListDefinition": {
+						SchemaProps: spec.SchemaProps{
+							Description: "ValueListDefinition is the object definition used by the FE to get a list of possible values to select for render.",
+							Ref:         ref("github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured"),
+						},
+					},
+				},
+				Required: []string{"key"},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured"},
+	}
+}
+
+func schema_apis_query_v0alpha1_template_VariableReplacement(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "QueryVariable is the definition of a variable that will be interpolated in targets.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"path": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Path is the location of the property within a target. The format for this is not figured out yet (Maybe JSONPath?). Idea: [\"string\", int, \"string\"] where int indicates array offset",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"position": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Positions is a list of where to perform the interpolation within targets during render. The first string is the Idx of the target as a string, since openAPI does not support ints as map keys",
+							Ref:         ref("github.com/grafana/grafana/pkg/apis/query/v0alpha1/template.Position"),
+						},
+					},
+					"format": {
+						SchemaProps: spec.SchemaProps{
+							Description: "How values should be interpolated\n\nPossible enum values:\n - `\"csv\"` Formats variables with multiple values as a comma-separated string.\n - `\"doublequote\"` Formats single- and multi-valued variables into a comma-separated string\n - `\"json\"` Formats variables with multiple values as a comma-separated string.\n - `\"pipe\"` Formats variables with multiple values into a pipe-separated string.\n - `\"raw\"` Formats variables with multiple values into comma-separated string. This is the default behavior when no format is specified\n - `\"singlequote\"` Formats single- and multi-valued variables into a comma-separated string",
+							Type:        []string{"string"},
+							Format:      "",
+							Enum:        []interface{}{"csv", "doublequote", "json", "pipe", "raw", "singlequote"},
+						},
+					},
+				},
+				Required: []string{"path"},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/query/v0alpha1/template.Position"},
+	}
+}
+
+func schema_apis_query_v0alpha1_template_replacement(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"Position": {
+						SchemaProps: spec.SchemaProps{
+							Ref: ref("github.com/grafana/grafana/pkg/apis/query/v0alpha1/template.Position"),
+						},
+					},
+					"TemplateVariable": {
+						SchemaProps: spec.SchemaProps{
+							Ref: ref("github.com/grafana/grafana/pkg/apis/query/v0alpha1/template.TemplateVariable"),
+						},
+					},
+					"format": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Possible enum values:\n - `\"csv\"` Formats variables with multiple values as a comma-separated string.\n - `\"doublequote\"` Formats single- and multi-valued variables into a comma-separated string\n - `\"json\"` Formats variables with multiple values as a comma-separated string.\n - `\"pipe\"` Formats variables with multiple values into a pipe-separated string.\n - `\"raw\"` Formats variables with multiple values into comma-separated string. This is the default behavior when no format is specified\n - `\"singlequote\"` Formats single- and multi-valued variables into a comma-separated string",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+							Enum:        []interface{}{"csv", "doublequote", "json", "pipe", "raw", "singlequote"},
+						},
+					},
+				},
+				Required: []string{"Position", "TemplateVariable", "format"},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/query/v0alpha1/template.Position", "github.com/grafana/grafana/pkg/apis/query/v0alpha1/template.TemplateVariable"},
+	}
+}
diff --git a/pkg/apis/query/v0alpha1/zz_generated.openapi_violation_exceptions.list b/pkg/apis/query/v0alpha1/zz_generated.openapi_violation_exceptions.list
new file mode 100644
index 0000000000000..ccded35944675
--- /dev/null
+++ b/pkg/apis/query/v0alpha1/zz_generated.openapi_violation_exceptions.list
@@ -0,0 +1,5 @@
+API rule violation: list_type_missing,github.com/grafana/grafana/pkg/apis/query/v0alpha1,DataSourceApiServer,AliasIDs
+API rule violation: names_match,github.com/grafana/grafana/pkg/apis/query/v0alpha1/template,QueryTemplate,Variables
+API rule violation: names_match,github.com/grafana/grafana/pkg/apis/query/v0alpha1/template,replacement,Position
+API rule violation: names_match,github.com/grafana/grafana/pkg/apis/query/v0alpha1/template,replacement,TemplateVariable
+API rule violation: names_match,github.com/grafana/grafana/pkg/apis/query/v0alpha1/template,replacement,format
diff --git a/pkg/apis/scope/v0alpha1/doc.go b/pkg/apis/scope/v0alpha1/doc.go
new file mode 100644
index 0000000000000..f9f43a0ea3822
--- /dev/null
+++ b/pkg/apis/scope/v0alpha1/doc.go
@@ -0,0 +1,6 @@
+// +k8s:deepcopy-gen=package
+// +k8s:openapi-gen=true
+// +k8s:defaulter-gen=TypeMeta
+// +groupName=scope.grafana.app
+
+package v0alpha1 // import "github.com/grafana/grafana/pkg/apis/scope/v0alpha1"
diff --git a/pkg/apis/scope/v0alpha1/register.go b/pkg/apis/scope/v0alpha1/register.go
new file mode 100644
index 0000000000000..1503e9d9294fe
--- /dev/null
+++ b/pkg/apis/scope/v0alpha1/register.go
@@ -0,0 +1,60 @@
+package v0alpha1
+
+import (
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+)
+
+const (
+	GROUP      = "scope.grafana.app"
+	VERSION    = "v0alpha1"
+	APIVERSION = GROUP + "/" + VERSION
+)
+
+var ScopeResourceInfo = common.NewResourceInfo(GROUP, VERSION,
+	"scopes", "scope", "Scope",
+	func() runtime.Object { return &Scope{} },
+	func() runtime.Object { return &ScopeList{} },
+)
+
+var ScopeDashboardBindingResourceInfo = common.NewResourceInfo(GROUP, VERSION,
+	"scopedashboardbindings", "scopedashboardbinding", "ScopeDashboardBinding",
+	func() runtime.Object { return &ScopeDashboardBinding{} },
+	func() runtime.Object { return &ScopeDashboardBindingList{} },
+)
+
+var (
+	// SchemeGroupVersion is group version used to register these objects
+	SchemeGroupVersion   = schema.GroupVersion{Group: GROUP, Version: VERSION}
+	InternalGroupVersion = schema.GroupVersion{Group: GROUP, Version: runtime.APIVersionInternal}
+
+	// SchemaBuilder is used by standard codegen
+	SchemeBuilder      runtime.SchemeBuilder
+	localSchemeBuilder = &SchemeBuilder
+	AddToScheme        = localSchemeBuilder.AddToScheme
+)
+
+func init() {
+	localSchemeBuilder.Register(func(s *runtime.Scheme) error {
+		return AddKnownTypes(SchemeGroupVersion, s)
+	})
+}
+
+// Adds the list of known types to the given scheme.
+func AddKnownTypes(gv schema.GroupVersion, scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(gv,
+		&Scope{},
+		&ScopeList{},
+		&ScopeDashboardBinding{},
+		&ScopeDashboardBindingList{},
+	)
+	//metav1.AddToGroupVersion(scheme, gv)
+	return nil
+}
+
+// Resource takes an unqualified resource and returns a Group qualified GroupResource
+func Resource(resource string) schema.GroupResource {
+	return SchemeGroupVersion.WithResource(resource).GroupResource()
+}
diff --git a/pkg/apis/scope/v0alpha1/types.go b/pkg/apis/scope/v0alpha1/types.go
new file mode 100644
index 0000000000000..0bab9e922c82b
--- /dev/null
+++ b/pkg/apis/scope/v0alpha1/types.go
@@ -0,0 +1,75 @@
+package v0alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+/*
+Please keep pkg/promlib/models/query.go and pkg/promlib/models/scope.go in sync
+with this file until this package is out of the grafana/grafana module.
+*/
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type Scope struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec ScopeSpec `json:"spec,omitempty"`
+}
+
+type ScopeSpec struct {
+	Title       string `json:"title"`
+	Type        string `json:"type"`
+	Description string `json:"description"`
+	Category    string `json:"category"`
+
+	// +listType=atomic
+	Filters []ScopeFilter `json:"filters"`
+}
+
+type ScopeFilter struct {
+	Key      string         `json:"key"`
+	Value    string         `json:"value"`
+	Operator FilterOperator `json:"operator"`
+}
+
+// Type of the filter operator.
+// +enum
+type FilterOperator string
+
+// Defines values for FilterOperator.
+const (
+	FilterOperatorEquals        FilterOperator = "equals"
+	FilterOperatorNotEquals     FilterOperator = "not-equals"
+	FilterOperatorRegexMatch    FilterOperator = "regex-match"
+	FilterOperatorRegexNotMatch FilterOperator = "regex-not-match"
+)
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type ScopeList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+
+	Items []Scope `json:"items,omitempty"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type ScopeDashboardBinding struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec ScopeDashboardBindingSpec `json:"spec,omitempty"`
+}
+
+type ScopeDashboardBindingSpec struct {
+	Dashboard string `json:"dashboard"`
+	Scope     string `json:"scope"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type ScopeDashboardBindingList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+
+	Items []ScopeDashboardBinding `json:"items,omitempty"`
+}
diff --git a/pkg/apis/scope/v0alpha1/zz_generated.deepcopy.go b/pkg/apis/scope/v0alpha1/zz_generated.deepcopy.go
new file mode 100644
index 0000000000000..a7840e969a601
--- /dev/null
+++ b/pkg/apis/scope/v0alpha1/zz_generated.deepcopy.go
@@ -0,0 +1,185 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by deepcopy-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Scope) DeepCopyInto(out *Scope) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Scope.
+func (in *Scope) DeepCopy() *Scope {
+	if in == nil {
+		return nil
+	}
+	out := new(Scope)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *Scope) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ScopeDashboardBinding) DeepCopyInto(out *ScopeDashboardBinding) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	out.Spec = in.Spec
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ScopeDashboardBinding.
+func (in *ScopeDashboardBinding) DeepCopy() *ScopeDashboardBinding {
+	if in == nil {
+		return nil
+	}
+	out := new(ScopeDashboardBinding)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ScopeDashboardBinding) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ScopeDashboardBindingList) DeepCopyInto(out *ScopeDashboardBindingList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]ScopeDashboardBinding, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ScopeDashboardBindingList.
+func (in *ScopeDashboardBindingList) DeepCopy() *ScopeDashboardBindingList {
+	if in == nil {
+		return nil
+	}
+	out := new(ScopeDashboardBindingList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ScopeDashboardBindingList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ScopeDashboardBindingSpec) DeepCopyInto(out *ScopeDashboardBindingSpec) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ScopeDashboardBindingSpec.
+func (in *ScopeDashboardBindingSpec) DeepCopy() *ScopeDashboardBindingSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(ScopeDashboardBindingSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ScopeFilter) DeepCopyInto(out *ScopeFilter) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ScopeFilter.
+func (in *ScopeFilter) DeepCopy() *ScopeFilter {
+	if in == nil {
+		return nil
+	}
+	out := new(ScopeFilter)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ScopeList) DeepCopyInto(out *ScopeList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]Scope, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ScopeList.
+func (in *ScopeList) DeepCopy() *ScopeList {
+	if in == nil {
+		return nil
+	}
+	out := new(ScopeList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ScopeList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ScopeSpec) DeepCopyInto(out *ScopeSpec) {
+	*out = *in
+	if in.Filters != nil {
+		in, out := &in.Filters, &out.Filters
+		*out = make([]ScopeFilter, len(*in))
+		copy(*out, *in)
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ScopeSpec.
+func (in *ScopeSpec) DeepCopy() *ScopeSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(ScopeSpec)
+	in.DeepCopyInto(out)
+	return out
+}
diff --git a/pkg/apis/scope/v0alpha1/zz_generated.defaults.go b/pkg/apis/scope/v0alpha1/zz_generated.defaults.go
new file mode 100644
index 0000000000000..238fc2f4edcfe
--- /dev/null
+++ b/pkg/apis/scope/v0alpha1/zz_generated.defaults.go
@@ -0,0 +1,19 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by defaulter-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// RegisterDefaults adds defaulters functions to the given scheme.
+// Public to allow building arbitrary schemes.
+// All generated defaulters are covering - they call all nested defaulters.
+func RegisterDefaults(scheme *runtime.Scheme) error {
+	return nil
+}
diff --git a/pkg/apis/scope/v0alpha1/zz_generated.openapi.go b/pkg/apis/scope/v0alpha1/zz_generated.openapi.go
new file mode 100644
index 0000000000000..b1857d6c49a98
--- /dev/null
+++ b/pkg/apis/scope/v0alpha1/zz_generated.openapi.go
@@ -0,0 +1,325 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by openapi-gen. DO NOT EDIT.
+
+// This file was autogenerated by openapi-gen. Do not edit it manually!
+
+package v0alpha1
+
+import (
+	common "k8s.io/kube-openapi/pkg/common"
+	spec "k8s.io/kube-openapi/pkg/validation/spec"
+)
+
+func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
+	return map[string]common.OpenAPIDefinition{
+		"github.com/grafana/grafana/pkg/apis/scope/v0alpha1.Scope":                     schema_pkg_apis_scope_v0alpha1_Scope(ref),
+		"github.com/grafana/grafana/pkg/apis/scope/v0alpha1.ScopeDashboardBinding":     schema_pkg_apis_scope_v0alpha1_ScopeDashboardBinding(ref),
+		"github.com/grafana/grafana/pkg/apis/scope/v0alpha1.ScopeDashboardBindingList": schema_pkg_apis_scope_v0alpha1_ScopeDashboardBindingList(ref),
+		"github.com/grafana/grafana/pkg/apis/scope/v0alpha1.ScopeDashboardBindingSpec": schema_pkg_apis_scope_v0alpha1_ScopeDashboardBindingSpec(ref),
+		"github.com/grafana/grafana/pkg/apis/scope/v0alpha1.ScopeFilter":               schema_pkg_apis_scope_v0alpha1_ScopeFilter(ref),
+		"github.com/grafana/grafana/pkg/apis/scope/v0alpha1.ScopeList":                 schema_pkg_apis_scope_v0alpha1_ScopeList(ref),
+		"github.com/grafana/grafana/pkg/apis/scope/v0alpha1.ScopeSpec":                 schema_pkg_apis_scope_v0alpha1_ScopeSpec(ref),
+	}
+}
+
+func schema_pkg_apis_scope_v0alpha1_Scope(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
+						},
+					},
+					"spec": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("github.com/grafana/grafana/pkg/apis/scope/v0alpha1.ScopeSpec"),
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/scope/v0alpha1.ScopeSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+	}
+}
+
+func schema_pkg_apis_scope_v0alpha1_ScopeDashboardBinding(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
+						},
+					},
+					"spec": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("github.com/grafana/grafana/pkg/apis/scope/v0alpha1.ScopeDashboardBindingSpec"),
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/scope/v0alpha1.ScopeDashboardBindingSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+	}
+}
+
+func schema_pkg_apis_scope_v0alpha1_ScopeDashboardBindingList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/pkg/apis/scope/v0alpha1.ScopeDashboardBinding"),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/scope/v0alpha1.ScopeDashboardBinding", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+	}
+}
+
+func schema_pkg_apis_scope_v0alpha1_ScopeDashboardBindingSpec(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"dashboard": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+					"scope": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+				},
+				Required: []string{"dashboard", "scope"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_scope_v0alpha1_ScopeFilter(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"key": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+					"value": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+					"operator": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Possible enum values:\n - `\"equals\"`\n - `\"not-equals\"`\n - `\"regex-match\"`\n - `\"regex-not-match\"`",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+							Enum:        []interface{}{"equals", "not-equals", "regex-match", "regex-not-match"},
+						},
+					},
+				},
+				Required: []string{"key", "value", "operator"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_scope_v0alpha1_ScopeList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/pkg/apis/scope/v0alpha1.Scope"),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/scope/v0alpha1.Scope", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+	}
+}
+
+func schema_pkg_apis_scope_v0alpha1_ScopeSpec(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"title": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+					"type": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+					"description": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+					"category": {
+						SchemaProps: spec.SchemaProps{
+							Default: "",
+							Type:    []string{"string"},
+							Format:  "",
+						},
+					},
+					"filters": {
+						VendorExtensible: spec.VendorExtensible{
+							Extensions: spec.Extensions{
+								"x-kubernetes-list-type": "atomic",
+							},
+						},
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/pkg/apis/scope/v0alpha1.ScopeFilter"),
+									},
+								},
+							},
+						},
+					},
+				},
+				Required: []string{"title", "type", "description", "category", "filters"},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/scope/v0alpha1.ScopeFilter"},
+	}
+}
diff --git a/pkg/apis/service/v0alpha1/doc.go b/pkg/apis/service/v0alpha1/doc.go
new file mode 100644
index 0000000000000..a334e2f5a3bb1
--- /dev/null
+++ b/pkg/apis/service/v0alpha1/doc.go
@@ -0,0 +1,6 @@
+// +k8s:deepcopy-gen=package
+// +k8s:openapi-gen=true
+// +k8s:defaulter-gen=TypeMeta
+// +groupName=service.grafana.app
+
+package v0alpha1 // import "github.com/grafana/grafana/pkg/apis/service/v0alpha1"
diff --git a/pkg/apis/service/v0alpha1/register.go b/pkg/apis/service/v0alpha1/register.go
new file mode 100644
index 0000000000000..530b1914feba5
--- /dev/null
+++ b/pkg/apis/service/v0alpha1/register.go
@@ -0,0 +1,50 @@
+package v0alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+)
+
+const (
+	GROUP      = "service.grafana.app"
+	VERSION    = "v0alpha1"
+	APIVERSION = GROUP + "/" + VERSION
+)
+
+var ExternalNameResourceInfo = common.NewResourceInfo(GROUP, VERSION,
+	"externalnames", "externalname", "ExternalName",
+	func() runtime.Object { return &ExternalName{} },
+	func() runtime.Object { return &ExternalNameList{} },
+)
+
+var (
+	// SchemeGroupVersion is group version used to register these objects
+	SchemeGroupVersion = schema.GroupVersion{Group: GROUP, Version: VERSION}
+
+	// SchemaBuilder is used by standard codegen
+	SchemeBuilder      runtime.SchemeBuilder
+	localSchemeBuilder = &SchemeBuilder
+	AddToScheme        = localSchemeBuilder.AddToScheme
+)
+
+func init() {
+	localSchemeBuilder.Register(addKnownTypes)
+}
+
+// Adds the list of known types to the given scheme.
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(SchemeGroupVersion,
+		&ExternalName{},
+		&ExternalNameList{},
+	)
+	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
+	return nil
+}
+
+// Resource takes an unqualified resource and returns a Group qualified GroupResource
+func Resource(resource string) schema.GroupResource {
+	return SchemeGroupVersion.WithResource(resource).GroupResource()
+}
diff --git a/pkg/apis/service/v0alpha1/types.go b/pkg/apis/service/v0alpha1/types.go
new file mode 100644
index 0000000000000..ae2e4fd4581e5
--- /dev/null
+++ b/pkg/apis/service/v0alpha1/types.go
@@ -0,0 +1,27 @@
+package v0alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type ExternalName struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec ExternalNameSpec `json:"spec,omitempty"`
+}
+
+type ExternalNameSpec struct {
+	Host string `json:"host,omitempty"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type ExternalNameList struct {
+	metav1.TypeMeta `json:",inline"`
+	// +optional
+	metav1.ListMeta `json:"metadata,omitempty"`
+
+	Items []ExternalName `json:"items,omitempty"`
+}
diff --git a/pkg/apis/service/v0alpha1/zz_generated.deepcopy.go b/pkg/apis/service/v0alpha1/zz_generated.deepcopy.go
new file mode 100644
index 0000000000000..215d8218c151b
--- /dev/null
+++ b/pkg/apis/service/v0alpha1/zz_generated.deepcopy.go
@@ -0,0 +1,88 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by deepcopy-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ExternalName) DeepCopyInto(out *ExternalName) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	out.Spec = in.Spec
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ExternalName.
+func (in *ExternalName) DeepCopy() *ExternalName {
+	if in == nil {
+		return nil
+	}
+	out := new(ExternalName)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ExternalName) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ExternalNameList) DeepCopyInto(out *ExternalNameList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]ExternalName, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ExternalNameList.
+func (in *ExternalNameList) DeepCopy() *ExternalNameList {
+	if in == nil {
+		return nil
+	}
+	out := new(ExternalNameList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ExternalNameList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ExternalNameSpec) DeepCopyInto(out *ExternalNameSpec) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ExternalNameSpec.
+func (in *ExternalNameSpec) DeepCopy() *ExternalNameSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(ExternalNameSpec)
+	in.DeepCopyInto(out)
+	return out
+}
diff --git a/pkg/apis/service/v0alpha1/zz_generated.defaults.go b/pkg/apis/service/v0alpha1/zz_generated.defaults.go
new file mode 100644
index 0000000000000..238fc2f4edcfe
--- /dev/null
+++ b/pkg/apis/service/v0alpha1/zz_generated.defaults.go
@@ -0,0 +1,19 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by defaulter-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// RegisterDefaults adds defaulters functions to the given scheme.
+// Public to allow building arbitrary schemes.
+// All generated defaulters are covering - they call all nested defaulters.
+func RegisterDefaults(scheme *runtime.Scheme) error {
+	return nil
+}
diff --git a/pkg/apis/service/v0alpha1/zz_generated.openapi.go b/pkg/apis/service/v0alpha1/zz_generated.openapi.go
new file mode 100644
index 0000000000000..bf951cc52c201
--- /dev/null
+++ b/pkg/apis/service/v0alpha1/zz_generated.openapi.go
@@ -0,0 +1,128 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by openapi-gen. DO NOT EDIT.
+
+// This file was autogenerated by openapi-gen. Do not edit it manually!
+
+package v0alpha1
+
+import (
+	common "k8s.io/kube-openapi/pkg/common"
+	spec "k8s.io/kube-openapi/pkg/validation/spec"
+)
+
+func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
+	return map[string]common.OpenAPIDefinition{
+		"github.com/grafana/grafana/pkg/apis/service/v0alpha1.ExternalName":     schema_pkg_apis_service_v0alpha1_ExternalName(ref),
+		"github.com/grafana/grafana/pkg/apis/service/v0alpha1.ExternalNameList": schema_pkg_apis_service_v0alpha1_ExternalNameList(ref),
+		"github.com/grafana/grafana/pkg/apis/service/v0alpha1.ExternalNameSpec": schema_pkg_apis_service_v0alpha1_ExternalNameSpec(ref),
+	}
+}
+
+func schema_pkg_apis_service_v0alpha1_ExternalName(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
+						},
+					},
+					"spec": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("github.com/grafana/grafana/pkg/apis/service/v0alpha1.ExternalNameSpec"),
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/service/v0alpha1.ExternalNameSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+	}
+}
+
+func schema_pkg_apis_service_v0alpha1_ExternalNameList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/pkg/apis/service/v0alpha1.ExternalName"),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/service/v0alpha1.ExternalName", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+	}
+}
+
+func schema_pkg_apis_service_v0alpha1_ExternalNameSpec(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"host": {
+						SchemaProps: spec.SchemaProps{
+							Type:   []string{"string"},
+							Format: "",
+						},
+					},
+				},
+			},
+		},
+	}
+}
diff --git a/pkg/apis/wireset.go b/pkg/apis/wireset.go
deleted file mode 100644
index 30b3cbe489ca0..0000000000000
--- a/pkg/apis/wireset.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package apis
-
-import (
-	"github.com/google/wire"
-
-	examplev0alpha1 "github.com/grafana/grafana/pkg/apis/example/v0alpha1"
-	playlistsv0alpha1 "github.com/grafana/grafana/pkg/apis/playlist/v0alpha1"
-)
-
-// WireSet is the list of all services
-// NOTE: you must also register the service in: pkg/registry/apis/apis.go
-var WireSet = wire.NewSet(
-	playlistsv0alpha1.RegisterAPIService,
-	examplev0alpha1.RegisterAPIService,
-)
diff --git a/pkg/apiserver/builder/common.go b/pkg/apiserver/builder/common.go
new file mode 100644
index 0000000000000..0f380c1eafe46
--- /dev/null
+++ b/pkg/apiserver/builder/common.go
@@ -0,0 +1,69 @@
+package builder
+
+import (
+	"net/http"
+
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
+	"k8s.io/apiserver/pkg/authorization/authorizer"
+	"k8s.io/apiserver/pkg/registry/generic"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+	"k8s.io/kube-openapi/pkg/common"
+	"k8s.io/kube-openapi/pkg/spec3"
+)
+
+// TODO: this (or something like it) belongs in grafana-app-sdk,
+// but lets keep it here while we iterate on a few simple examples
+type APIGroupBuilder interface {
+	// Get the main group name
+	GetGroupVersion() schema.GroupVersion
+
+	// Add the kinds to the server scheme
+	InstallSchema(scheme *runtime.Scheme) error
+
+	// Build the group+version behavior
+	GetAPIGroupInfo(
+		scheme *runtime.Scheme,
+		codecs serializer.CodecFactory,
+		optsGetter generic.RESTOptionsGetter,
+		dualWrite bool,
+	) (*genericapiserver.APIGroupInfo, error)
+
+	// Get OpenAPI definitions
+	GetOpenAPIDefinitions() common.GetOpenAPIDefinitions
+
+	// Get the API routes for each version
+	GetAPIRoutes() *APIRoutes
+
+	// Optionally add an authorization hook
+	// Standard namespace checking will happen before this is called, specifically
+	// the namespace must matches an org|stack that the user belongs to
+	GetAuthorizer() authorizer.Authorizer
+}
+
+// Builders that implement OpenAPIPostProcessor are given a chance to modify the schema directly
+type OpenAPIPostProcessor interface {
+	PostProcessOpenAPI(*spec3.OpenAPI) (*spec3.OpenAPI, error)
+}
+
+// This is used to implement dynamic sub-resources like pods/x/logs
+type APIRouteHandler struct {
+	Path    string           // added to the appropriate level
+	Spec    *spec3.PathProps // Exposed in the open api service discovery
+	Handler http.HandlerFunc // when Level = resource, the resource will be available in context
+}
+
+// APIRoutes define explicit HTTP handlers in an apiserver
+// TBD: is this actually necessary -- there may be more k8s native options for this
+type APIRoutes struct {
+	// Root handlers are registered directly after the apiVersion identifier
+	Root []APIRouteHandler
+
+	// Namespace handlers are mounted under the namespace
+	Namespace []APIRouteHandler
+}
+
+type APIRegistrar interface {
+	RegisterAPI(builder APIGroupBuilder)
+}
diff --git a/pkg/apiserver/builder/helper.go b/pkg/apiserver/builder/helper.go
new file mode 100644
index 0000000000000..f41626e2e2a88
--- /dev/null
+++ b/pkg/apiserver/builder/helper.go
@@ -0,0 +1,153 @@
+package builder
+
+import (
+	"fmt"
+	"net/http"
+	goruntime "runtime"
+	"runtime/debug"
+	"strconv"
+	"strings"
+	"time"
+
+	"golang.org/x/mod/semver"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
+	"k8s.io/apimachinery/pkg/version"
+	openapinamer "k8s.io/apiserver/pkg/endpoints/openapi"
+	"k8s.io/apiserver/pkg/registry/generic"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+	"k8s.io/apiserver/pkg/util/openapi"
+	k8sscheme "k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/kube-openapi/pkg/common"
+
+	"github.com/grafana/grafana/pkg/apiserver/endpoints/filters"
+)
+
+func SetupConfig(
+	scheme *runtime.Scheme,
+	serverConfig *genericapiserver.RecommendedConfig,
+	builders []APIGroupBuilder,
+	buildTimestamp int64,
+	buildVersion string,
+	buildCommit string,
+	buildBranch string,
+) error {
+	defsGetter := GetOpenAPIDefinitions(builders)
+	serverConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(
+		openapi.GetOpenAPIDefinitionsWithoutDisabledFeatures(defsGetter),
+		openapinamer.NewDefinitionNamer(scheme, k8sscheme.Scheme))
+
+	serverConfig.OpenAPIV3Config = genericapiserver.DefaultOpenAPIV3Config(
+		openapi.GetOpenAPIDefinitionsWithoutDisabledFeatures(defsGetter),
+		openapinamer.NewDefinitionNamer(scheme, k8sscheme.Scheme))
+
+	// Add the custom routes to service discovery
+	serverConfig.OpenAPIV3Config.PostProcessSpec = getOpenAPIPostProcessor(buildVersion, builders)
+	serverConfig.OpenAPIV3Config.GetOperationIDAndTagsFromRoute = func(r common.Route) (string, []string, error) {
+		tags := []string{}
+		prop, ok := r.Metadata()["x-kubernetes-group-version-kind"]
+		if ok {
+			gvk, ok := prop.(metav1.GroupVersionKind)
+			if ok && gvk.Kind != "" {
+				tags = append(tags, gvk.Kind)
+			}
+		}
+		return r.OperationName(), tags, nil
+	}
+
+	// Set the swagger build versions
+	serverConfig.OpenAPIConfig.Info.Version = buildVersion
+	serverConfig.OpenAPIV3Config.Info.Version = buildVersion
+
+	serverConfig.SkipOpenAPIInstallation = false
+	serverConfig.BuildHandlerChainFunc = func(delegateHandler http.Handler, c *genericapiserver.Config) http.Handler {
+		// Call DefaultBuildHandlerChain on the main entrypoint http.Handler
+		// See https://github.com/kubernetes/apiserver/blob/v0.28.0/pkg/server/config.go#L906
+		// DefaultBuildHandlerChain provides many things, notably CORS, HSTS, cache-control, authz and latency tracking
+		requestHandler, err := getAPIHandler(
+			delegateHandler,
+			c.LoopbackClientConfig,
+			builders)
+		if err != nil {
+			panic(fmt.Sprintf("could not build handler chain func: %s", err.Error()))
+		}
+
+		handler := genericapiserver.DefaultBuildHandlerChain(requestHandler, c)
+		handler = filters.WithAcceptHeader(handler)
+
+		return handler
+	}
+
+	k8sVersion, err := getK8sApiserverVersion()
+	if err != nil {
+		return err
+	}
+	before, after, _ := strings.Cut(buildVersion, ".")
+	serverConfig.Version = &version.Info{
+		Major:        before,
+		Minor:        after,
+		GoVersion:    goruntime.Version(),
+		Platform:     fmt.Sprintf("%s/%s", goruntime.GOOS, goruntime.GOARCH),
+		Compiler:     goruntime.Compiler,
+		GitTreeState: buildBranch,
+		GitCommit:    buildCommit,
+		BuildDate:    time.Unix(buildTimestamp, 0).UTC().Format(time.DateTime),
+		GitVersion:   k8sVersion,
+	}
+	return nil
+}
+
+func InstallAPIs(
+	scheme *runtime.Scheme,
+	codecs serializer.CodecFactory,
+	server *genericapiserver.GenericAPIServer,
+	optsGetter generic.RESTOptionsGetter,
+	builders []APIGroupBuilder,
+	dualWrite bool,
+) error {
+	for _, b := range builders {
+		g, err := b.GetAPIGroupInfo(scheme, codecs, optsGetter, dualWrite)
+		if err != nil {
+			return err
+		}
+		if g == nil || len(g.PrioritizedVersions) < 1 {
+			continue
+		}
+		err = server.InstallAPIGroup(g)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// find the k8s version according to build info
+func getK8sApiserverVersion() (string, error) {
+	bi, ok := debug.ReadBuildInfo()
+	if !ok {
+		return "", fmt.Errorf("debug.ReadBuildInfo() failed")
+	}
+
+	if len(bi.Deps) == 0 {
+		return "v?.?", nil // this is normal while debugging
+	}
+
+	for _, dep := range bi.Deps {
+		if dep.Path == "k8s.io/apiserver" {
+			if !semver.IsValid(dep.Version) {
+				return "", fmt.Errorf("invalid semantic version for k8s.io/apiserver")
+			}
+			// v0 => v1
+			majorVersion := strings.TrimPrefix(semver.Major(dep.Version), "v")
+			majorInt, err := strconv.Atoi(majorVersion)
+			if err != nil {
+				return "", fmt.Errorf("could not convert majorVersion to int. majorVersion: %s", majorVersion)
+			}
+			newMajor := fmt.Sprintf("v%d", majorInt+1)
+			return strings.Replace(dep.Version, semver.Major(dep.Version), newMajor, 1), nil
+		}
+	}
+
+	return "", fmt.Errorf("could not find k8s.io/apiserver in build info")
+}
diff --git a/pkg/apiserver/builder/openapi.go b/pkg/apiserver/builder/openapi.go
new file mode 100644
index 0000000000000..0790ba733aa07
--- /dev/null
+++ b/pkg/apiserver/builder/openapi.go
@@ -0,0 +1,115 @@
+package builder
+
+import (
+	"maps"
+	"strings"
+
+	data "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+	common "k8s.io/kube-openapi/pkg/common"
+	"k8s.io/kube-openapi/pkg/spec3"
+	spec "k8s.io/kube-openapi/pkg/validation/spec"
+
+	"github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+)
+
+// This should eventually live in grafana-app-sdk
+func GetOpenAPIDefinitions(builders []APIGroupBuilder) common.GetOpenAPIDefinitions {
+	return func(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
+		defs := v0alpha1.GetOpenAPIDefinitions(ref) // common grafana apis
+		maps.Copy(defs, data.GetOpenAPIDefinitions(ref))
+		for _, b := range builders {
+			g := b.GetOpenAPIDefinitions()
+			if g != nil {
+				out := g(ref)
+				maps.Copy(defs, out)
+			}
+		}
+		return defs
+	}
+}
+
+// Modify the OpenAPI spec to include the additional routes.
+// Currently this requires: https://github.com/kubernetes/kube-openapi/pull/420
+// In future k8s release, the hook will use Config3 rather than the same hook for both v2 and v3
+func getOpenAPIPostProcessor(version string, builders []APIGroupBuilder) func(*spec3.OpenAPI) (*spec3.OpenAPI, error) {
+	return func(s *spec3.OpenAPI) (*spec3.OpenAPI, error) {
+		if s.Paths == nil {
+			return s, nil
+		}
+		for _, b := range builders {
+			routes := b.GetAPIRoutes()
+			gv := b.GetGroupVersion()
+			prefix := "/apis/" + gv.String() + "/"
+			if s.Paths.Paths[prefix] != nil {
+				copy := spec3.OpenAPI{
+					Version: s.Version,
+					Info: &spec.Info{
+						InfoProps: spec.InfoProps{
+							Title:   gv.String(),
+							Version: version,
+						},
+					},
+					Components:   s.Components,
+					ExternalDocs: s.ExternalDocs,
+					Servers:      s.Servers,
+					Paths:        s.Paths,
+				}
+
+				if routes == nil {
+					routes = &APIRoutes{}
+				}
+
+				for _, route := range routes.Root {
+					copy.Paths.Paths[prefix+route.Path] = &spec3.Path{
+						PathProps: *route.Spec,
+					}
+				}
+
+				for _, route := range routes.Namespace {
+					copy.Paths.Paths[prefix+"namespaces/{namespace}/"+route.Path] = &spec3.Path{
+						PathProps: *route.Spec,
+					}
+				}
+
+				// Make the sub-resources (connect) share the same tags as the main resource
+				for path, spec := range copy.Paths.Paths {
+					idx := strings.LastIndex(path, "{name}/")
+					if idx > 0 {
+						parent := copy.Paths.Paths[path[:idx+6]]
+						if parent != nil && parent.Get != nil {
+							for _, op := range GetPathOperations(spec) {
+								if op != nil && op.Extensions != nil {
+									action, ok := op.Extensions.GetString("x-kubernetes-action")
+									if ok && action == "connect" {
+										op.Tags = parent.Get.Tags
+									}
+								}
+							}
+						}
+					}
+				}
+
+				// Support direct manipulation of API results
+				processor, ok := b.(OpenAPIPostProcessor)
+				if ok {
+					return processor.PostProcessOpenAPI(&copy)
+				}
+				return &copy, nil
+			}
+		}
+		return s, nil
+	}
+}
+
+func GetPathOperations(path *spec3.Path) []*spec3.Operation {
+	return []*spec3.Operation{
+		path.Get,
+		path.Head,
+		path.Delete,
+		path.Patch,
+		path.Post,
+		path.Put,
+		path.Trace,
+		path.Options,
+	}
+}
diff --git a/pkg/apiserver/builder/request_handler.go b/pkg/apiserver/builder/request_handler.go
new file mode 100644
index 0000000000000..38385d7b77828
--- /dev/null
+++ b/pkg/apiserver/builder/request_handler.go
@@ -0,0 +1,115 @@
+package builder
+
+import (
+	"fmt"
+	"net/http"
+
+	"github.com/gorilla/mux"
+	restclient "k8s.io/client-go/rest"
+	"k8s.io/kube-openapi/pkg/spec3"
+)
+
+type requestHandler struct {
+	router *mux.Router
+}
+
+func getAPIHandler(delegateHandler http.Handler, restConfig *restclient.Config, builders []APIGroupBuilder) (http.Handler, error) {
+	useful := false // only true if any routes exist anywhere
+	router := mux.NewRouter()
+
+	for _, builder := range builders {
+		routes := builder.GetAPIRoutes()
+		if routes == nil {
+			continue
+		}
+
+		gv := builder.GetGroupVersion()
+		prefix := "/apis/" + gv.String()
+
+		// Root handlers
+		var sub *mux.Router
+		for _, route := range routes.Root {
+			if sub == nil {
+				sub = router.PathPrefix(prefix).Subrouter()
+				sub.MethodNotAllowedHandler = &methodNotAllowedHandler{}
+			}
+
+			useful = true
+			methods, err := methodsFromSpec(route.Path, route.Spec)
+			if err != nil {
+				return nil, err
+			}
+			sub.HandleFunc("/"+route.Path, route.Handler).
+				Methods(methods...)
+		}
+
+		// Namespace handlers
+		sub = nil
+		prefix += "/namespaces/{namespace}"
+		for _, route := range routes.Namespace {
+			if sub == nil {
+				sub = router.PathPrefix(prefix).Subrouter()
+				sub.MethodNotAllowedHandler = &methodNotAllowedHandler{}
+			}
+
+			useful = true
+			methods, err := methodsFromSpec(route.Path, route.Spec)
+			if err != nil {
+				return nil, err
+			}
+			sub.HandleFunc("/"+route.Path, route.Handler).
+				Methods(methods...)
+		}
+	}
+
+	if !useful {
+		return delegateHandler, nil
+	}
+
+	// Per Gorilla Mux issue here: https://github.com/gorilla/mux/issues/616#issuecomment-798807509
+	// default handler must come last
+	router.PathPrefix("/").Handler(delegateHandler)
+
+	return &requestHandler{
+		router: router,
+	}, nil
+}
+
+func (h *requestHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	h.router.ServeHTTP(w, req)
+}
+
+func methodsFromSpec(slug string, props *spec3.PathProps) ([]string, error) {
+	if props == nil {
+		return []string{"GET", "POST", "PUT", "PATCH", "DELETE"}, nil
+	}
+
+	methods := make([]string, 0)
+	if props.Get != nil {
+		methods = append(methods, "GET")
+	}
+	if props.Post != nil {
+		methods = append(methods, "POST")
+	}
+	if props.Put != nil {
+		methods = append(methods, "PUT")
+	}
+	if props.Patch != nil {
+		methods = append(methods, "PATCH")
+	}
+	if props.Delete != nil {
+		methods = append(methods, "DELETE")
+	}
+
+	if len(methods) == 0 {
+		return nil, fmt.Errorf("invalid OpenAPI Spec for slug=%s without any methods in PathProps", slug)
+	}
+
+	return methods, nil
+}
+
+type methodNotAllowedHandler struct{}
+
+func (h *methodNotAllowedHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	w.WriteHeader(405) // method not allowed
+}
diff --git a/pkg/apiserver/endpoints/filters/accept.go b/pkg/apiserver/endpoints/filters/accept.go
new file mode 100644
index 0000000000000..8fa8f34bef21c
--- /dev/null
+++ b/pkg/apiserver/endpoints/filters/accept.go
@@ -0,0 +1,15 @@
+package filters
+
+import (
+	"net/http"
+
+	"github.com/grafana/grafana/pkg/apiserver/endpoints/request"
+)
+
+// WithAcceptHeader adds the Accept header to the request context.
+func WithAcceptHeader(handler http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		ctx := request.WithAcceptHeader(req.Context(), req.Header.Get("Accept"))
+		handler.ServeHTTP(w, req.WithContext(ctx))
+	})
+}
diff --git a/pkg/apiserver/endpoints/filters/accept_test.go b/pkg/apiserver/endpoints/filters/accept_test.go
new file mode 100644
index 0000000000000..e90da56e4c4d3
--- /dev/null
+++ b/pkg/apiserver/endpoints/filters/accept_test.go
@@ -0,0 +1,46 @@
+package filters
+
+import (
+	"context"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/grafana/grafana/pkg/apiserver/endpoints/request"
+	"github.com/stretchr/testify/require"
+)
+
+func TestWithAcceptHeader(t *testing.T) {
+	t.Run("should not set accept header in context for empty header", func(t *testing.T) {
+		req := httptest.NewRequest(http.MethodGet, "/", nil)
+
+		rr := httptest.NewRecorder()
+		handler := &fakeHandler{}
+		WithAcceptHeader(handler).ServeHTTP(rr, req)
+
+		acceptHeader, ok := request.AcceptHeaderFrom(handler.ctx)
+		require.False(t, ok)
+		require.Empty(t, acceptHeader)
+	})
+
+	t.Run("should set accept header in context", func(t *testing.T) {
+		req := httptest.NewRequest(http.MethodGet, "/", nil)
+		req.Header.Set("Accept", "application/json")
+
+		rr := httptest.NewRecorder()
+		handler := &fakeHandler{}
+		WithAcceptHeader(handler).ServeHTTP(rr, req)
+
+		acceptHeader, ok := request.AcceptHeaderFrom(handler.ctx)
+		require.True(t, ok)
+		require.Equal(t, "application/json", acceptHeader)
+	})
+}
+
+type fakeHandler struct {
+	ctx context.Context
+}
+
+func (h *fakeHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	h.ctx = req.Context()
+}
diff --git a/pkg/apiserver/endpoints/request/accept.go b/pkg/apiserver/endpoints/request/accept.go
new file mode 100644
index 0000000000000..535688206743c
--- /dev/null
+++ b/pkg/apiserver/endpoints/request/accept.go
@@ -0,0 +1,22 @@
+package request
+
+import (
+	"context"
+)
+
+type acceptHeaderKey struct{}
+
+// WithAcceptHeader adds the accept header to the supplied context.
+func WithAcceptHeader(ctx context.Context, acceptHeader string) context.Context {
+	// only add the accept header to ctx if it is not empty
+	if acceptHeader == "" {
+		return ctx
+	}
+	return context.WithValue(ctx, acceptHeaderKey{}, acceptHeader)
+}
+
+// AcceptHeaderFrom returns the accept header from the supplied context and a boolean indicating if the value was present.
+func AcceptHeaderFrom(ctx context.Context) (string, bool) {
+	acceptHeader, ok := ctx.Value(acceptHeaderKey{}).(string)
+	return acceptHeader, ok
+}
diff --git a/pkg/apiserver/endpoints/request/accept_test.go b/pkg/apiserver/endpoints/request/accept_test.go
new file mode 100644
index 0000000000000..0a415896a550d
--- /dev/null
+++ b/pkg/apiserver/endpoints/request/accept_test.go
@@ -0,0 +1,26 @@
+package request
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestAcceptHeader(t *testing.T) {
+	ctx := context.Background()
+
+	t.Run("should not set ctx for empty header", func(t *testing.T) {
+		out := WithAcceptHeader(ctx, "")
+		acceptHeader, ok := AcceptHeaderFrom(out)
+		require.False(t, ok)
+		require.Empty(t, acceptHeader)
+	})
+
+	t.Run("should add header to ctx", func(t *testing.T) {
+		out := WithAcceptHeader(ctx, "application/json")
+		acceptHeader, ok := AcceptHeaderFrom(out)
+		require.True(t, ok)
+		require.Equal(t, "application/json", acceptHeader)
+	})
+}
diff --git a/pkg/apiserver/endpoints/responsewriter/responsewriter.go b/pkg/apiserver/endpoints/responsewriter/responsewriter.go
new file mode 100644
index 0000000000000..6e635203cfa9f
--- /dev/null
+++ b/pkg/apiserver/endpoints/responsewriter/responsewriter.go
@@ -0,0 +1,132 @@
+package responsewriter
+
+import (
+	"bufio"
+	"fmt"
+	"io"
+	"net/http"
+
+	"k8s.io/apiserver/pkg/endpoints/responsewriter"
+	"k8s.io/klog/v2"
+)
+
+var _ responsewriter.CloseNotifierFlusher = (*ResponseAdapter)(nil)
+var _ http.ResponseWriter = (*ResponseAdapter)(nil)
+var _ io.ReadCloser = (*ResponseAdapter)(nil)
+
+func WrapHandler(handler http.Handler) func(req *http.Request) (*http.Response, error) {
+	// ignore the lint error because the response is passed directly to the client,
+	// so the client will be responsible for closing the response body.
+	//nolint:bodyclose
+	return func(req *http.Request) (*http.Response, error) {
+		w := NewAdapter(req)
+		resp := w.Response()
+		go func() {
+			handler.ServeHTTP(w, req)
+			if err := w.CloseWriter(); err != nil {
+				klog.Errorf("error closing writer: %v", err)
+			}
+		}()
+		return resp, nil
+	}
+}
+
+// ResponseAdapter is an implementation of [http.ResponseWriter] that allows conversion to a [http.Response].
+type ResponseAdapter struct {
+	req      *http.Request
+	res      *http.Response
+	reader   io.ReadCloser
+	writer   io.WriteCloser
+	buffered *bufio.ReadWriter
+}
+
+// NewAdapter returns an initialized [ResponseAdapter].
+func NewAdapter(req *http.Request) *ResponseAdapter {
+	r, w := io.Pipe()
+	writer := bufio.NewWriter(w)
+	reader := bufio.NewReader(r)
+	buffered := bufio.NewReadWriter(reader, writer)
+	return &ResponseAdapter{
+		req: req,
+		res: &http.Response{
+			Proto:      req.Proto,
+			ProtoMajor: req.ProtoMajor,
+			ProtoMinor: req.ProtoMinor,
+			Header:     make(http.Header),
+		},
+		reader:   r,
+		writer:   w,
+		buffered: buffered,
+	}
+}
+
+// Header implements [http.ResponseWriter].
+// It returns the response headers to mutate within a handler.
+func (ra *ResponseAdapter) Header() http.Header {
+	return ra.res.Header
+}
+
+// Write implements [http.ResponseWriter].
+func (ra *ResponseAdapter) Write(buf []byte) (int, error) {
+	return ra.buffered.Write(buf)
+}
+
+// Read implements [io.Reader].
+func (ra *ResponseAdapter) Read(buf []byte) (int, error) {
+	return ra.buffered.Read(buf)
+}
+
+// WriteHeader implements [http.ResponseWriter].
+func (ra *ResponseAdapter) WriteHeader(code int) {
+	ra.res.StatusCode = code
+	ra.res.Status = fmt.Sprintf("%03d %s", code, http.StatusText(code))
+}
+
+// Flush implements [http.Flusher].
+func (ra *ResponseAdapter) Flush() {
+	if ra.buffered.Writer.Buffered() == 0 {
+		return
+	}
+
+	if err := ra.buffered.Writer.Flush(); err != nil {
+		klog.Error("Error flushing response buffer: ", "error", err)
+	}
+}
+
+// Response returns the [http.Response] generated by the [http.Handler].
+func (ra *ResponseAdapter) Response() *http.Response {
+	// make sure to set the status code to 200 if the request is a watch
+	// this is to ensure that client-go uses a streamwatcher:
+	// https://github.com/kubernetes/client-go/blob/76174b8af8cfd938018b04198595d65b48a69334/rest/request.go#L737
+	if ra.res.StatusCode == 0 && ra.req.URL.Query().Get("watch") == "true" {
+		ra.WriteHeader(http.StatusOK)
+	}
+	ra.res.Body = ra
+	return ra.res
+}
+
+// Decorate implements [responsewriter.UserProvidedDecorator].
+func (ra *ResponseAdapter) Unwrap() http.ResponseWriter {
+	return ra
+}
+
+// CloseNotify implements [http.CloseNotifier].
+func (ra *ResponseAdapter) CloseNotify() <-chan bool {
+	ch := make(chan bool)
+	go func() {
+		<-ra.req.Context().Done()
+		ch <- true
+	}()
+	return ch
+}
+
+// Close implements [io.Closer].
+func (ra *ResponseAdapter) Close() error {
+	return ra.reader.Close()
+}
+
+// CloseWriter should be called after the http.Handler has returned.
+func (ra *ResponseAdapter) CloseWriter() error {
+	ra.Flush()
+	return ra.writer.Close()
+}
diff --git a/pkg/apiserver/endpoints/responsewriter/responsewriter_test.go b/pkg/apiserver/endpoints/responsewriter/responsewriter_test.go
new file mode 100644
index 0000000000000..4c759ac64859c
--- /dev/null
+++ b/pkg/apiserver/endpoints/responsewriter/responsewriter_test.go
@@ -0,0 +1,137 @@
+package responsewriter_test
+
+import (
+	"io"
+	"math/rand"
+	"net/http"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+
+	grafanaresponsewriter "github.com/grafana/grafana/pkg/apiserver/endpoints/responsewriter"
+)
+
+func TestResponseAdapter(t *testing.T) {
+	t.Run("should handle synchronous write", func(t *testing.T) {
+		client := &http.Client{
+			Transport: &roundTripperFunc{
+				ready: make(chan struct{}),
+				// ignore the lint error because the response is passed directly to the client,
+				// so the client will be responsible for closing the response body.
+				//nolint:bodyclose
+				fn: grafanaresponsewriter.WrapHandler(http.HandlerFunc(syncHandler)),
+			},
+		}
+		close(client.Transport.(*roundTripperFunc).ready)
+		req, err := http.NewRequest("GET", "http://localhost/test", nil)
+		require.NoError(t, err)
+
+		resp, err := client.Do(req)
+		require.NoError(t, err)
+
+		defer func() {
+			err := resp.Body.Close()
+			require.NoError(t, err)
+		}()
+
+		bodyBytes, err := io.ReadAll(resp.Body)
+		require.NoError(t, err)
+		require.Equal(t, "OK", string(bodyBytes))
+	})
+
+	t.Run("should handle synchronous write", func(t *testing.T) {
+		generateRandomStrings(10)
+		client := &http.Client{
+			Transport: &roundTripperFunc{
+				ready: make(chan struct{}),
+				// ignore the lint error because the response is passed directly to the client,
+				// so the client will be responsible for closing the response body.
+				//nolint:bodyclose
+				fn: grafanaresponsewriter.WrapHandler(http.HandlerFunc(asyncHandler)),
+			},
+		}
+		close(client.Transport.(*roundTripperFunc).ready)
+		req, err := http.NewRequest("GET", "http://localhost/test?watch=true", nil)
+		require.NoError(t, err)
+
+		resp, err := client.Do(req)
+		require.NoError(t, err)
+
+		defer func() {
+			err := resp.Body.Close()
+			require.NoError(t, err)
+		}()
+
+		// ensure that watch request is a 200
+		require.Equal(t, http.StatusOK, resp.StatusCode)
+
+		// limit to 100 bytes to test the reader buffer
+		buf := make([]byte, 100)
+		// holds the read bytes between iterations
+		cache := []byte{}
+
+		for i := 0; i < 10; {
+			n, err := resp.Body.Read(buf)
+			require.NoError(t, err)
+			if n == 0 {
+				continue
+			}
+			cache = append(cache, buf[:n]...)
+
+			if len(cache) >= len(randomStrings[i]) {
+				str := cache[:len(randomStrings[i])]
+				require.Equal(t, randomStrings[i], string(str))
+				cache = cache[len(randomStrings[i]):]
+				i++
+			}
+		}
+	})
+}
+
+func syncHandler(w http.ResponseWriter, r *http.Request) {
+	w.WriteHeader(http.StatusOK)
+	_, _ = w.Write([]byte("OK"))
+}
+
+func asyncHandler(w http.ResponseWriter, r *http.Request) {
+	w.WriteHeader(http.StatusOK)
+	for _, s := range randomStrings {
+		time.Sleep(100 * time.Millisecond)
+		// write the current iteration
+		_, _ = w.Write([]byte(s))
+		w.(http.Flusher).Flush()
+	}
+}
+
+var randomStrings = []string{}
+
+func generateRandomStrings(n int) {
+	for i := 0; i < n; i++ {
+		randomString := generateRandomString(1000 * (i + 1))
+		randomStrings = append(randomStrings, randomString)
+	}
+}
+
+func generateRandomString(n int) string {
+	gen := rand.New(rand.NewSource(time.Now().UnixNano()))
+	var chars = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
+	b := make([]rune, n)
+	for i := range b {
+		b[i] = chars[gen.Intn(len(chars))]
+	}
+	return string(b)
+}
+
+type roundTripperFunc struct {
+	ready chan struct{}
+	fn    func(req *http.Request) (*http.Response, error)
+}
+
+func (f *roundTripperFunc) RoundTrip(req *http.Request) (*http.Response, error) {
+	if f.fn == nil {
+		<-f.ready
+	}
+	res, err := f.fn(req)
+	return res, err
+}
diff --git a/pkg/apiserver/go.mod b/pkg/apiserver/go.mod
new file mode 100644
index 0000000000000..fab2f1c2d4e70
--- /dev/null
+++ b/pkg/apiserver/go.mod
@@ -0,0 +1,151 @@
+module github.com/grafana/grafana/pkg/apiserver
+
+go 1.21.10
+
+require (
+	github.com/bwmarrin/snowflake v0.3.0
+	github.com/gorilla/mux v1.8.1
+	github.com/grafana/grafana-plugin-sdk-go v0.222.0
+	github.com/stretchr/testify v1.9.0
+	golang.org/x/mod v0.14.0
+	k8s.io/apimachinery v0.29.2
+	k8s.io/apiserver v0.29.2
+	k8s.io/client-go v0.29.2
+	k8s.io/klog/v2 v2.120.1
+	k8s.io/kube-openapi v0.0.0-20240220201932-37d671a357a5
+)
+
+require (
+	github.com/BurntSushi/toml v1.3.2 // indirect
+	github.com/NYTimes/gziphandler v1.1.1 // indirect
+	github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
+	github.com/apache/arrow/go/v15 v15.0.2 // indirect
+	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/blang/semver/v4 v4.0.0 // indirect
+	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cheekybits/genny v1.0.0 // indirect
+	github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89 // indirect
+	github.com/coreos/go-semver v0.3.1 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/elazarl/goproxy v0.0.0-20230731152917-f99041a5c027 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
+	github.com/fatih/color v1.15.0 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/getkin/kin-openapi v0.120.0 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-openapi/jsonpointer v0.20.2 // indirect
+	github.com/go-openapi/jsonreference v0.20.4 // indirect
+	github.com/go-openapi/swag v0.22.9 // indirect
+	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/google/btree v1.1.2 // indirect
+	github.com/google/cel-go v0.17.7 // indirect
+	github.com/google/flatbuffers v23.5.26+incompatible // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/pprof v0.0.0-20231205033806-a5a03c77bf08 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
+	github.com/hashicorp/go-hclog v1.6.3 // indirect
+	github.com/hashicorp/go-plugin v1.6.0 // indirect
+	github.com/hashicorp/yamux v0.1.1 // indirect
+	github.com/imdario/mergo v0.3.16 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/invopop/yaml v0.2.0 // indirect
+	github.com/jonboulle/clockwork v0.4.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/compress v1.17.4 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
+	github.com/magefile/mage v1.15.0 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattetti/filebuffer v1.0.1 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
+	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/oklog/run v1.1.0 // indirect
+	github.com/olekukonko/tablewriter v0.0.5 // indirect
+	github.com/perimeterx/marshmallow v1.1.5 // indirect
+	github.com/pierrec/lz4/v4 v4.1.18 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/prometheus/client_golang v1.18.0 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/common v0.46.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
+	github.com/rivo/uniseg v0.3.4 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/smartystreets/goconvey v1.6.4 // indirect
+	github.com/spf13/cobra v1.8.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/stoewer/go-strcase v1.3.0 // indirect
+	github.com/ugorji/go/codec v1.2.11 // indirect
+	github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 // indirect
+	github.com/unknwon/com v1.0.1 // indirect
+	github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3 // indirect
+	github.com/urfave/cli v1.22.14 // indirect
+	github.com/zeebo/xxh3 v1.0.2 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.10 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
+	go.etcd.io/etcd/client/v3 v3.5.10 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.49.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
+	go.opentelemetry.io/contrib/propagators/jaeger v1.22.0 // indirect
+	go.opentelemetry.io/contrib/samplers/jaegerremote v0.18.0 // indirect
+	go.opentelemetry.io/otel v1.24.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 // indirect
+	go.opentelemetry.io/otel/metric v1.24.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.24.0 // indirect
+	go.opentelemetry.io/otel/trace v1.24.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.1.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.26.0 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // indirect
+	golang.org/x/net v0.22.0 // indirect
+	golang.org/x/oauth2 v0.18.0 // indirect
+	golang.org/x/sync v0.6.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/term v0.18.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
+	golang.org/x/tools v0.17.0 // indirect
+	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
+	google.golang.org/grpc v1.62.1 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
+	gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/api v0.29.2 // indirect
+	k8s.io/component-base v0.29.2 // indirect
+	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
+	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
+)
diff --git a/pkg/apiserver/go.sum b/pkg/apiserver/go.sum
new file mode 100644
index 0000000000000..474dd53b7ddcf
--- /dev/null
+++ b/pkg/apiserver/go.sum
@@ -0,0 +1,307 @@
+github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
+github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
+github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df h1:7RFfzj4SSt6nnvCPbCqijJi1nWCd+TqAT3bYCStRC18=
+github.com/apache/arrow/go/v15 v15.0.2 h1:60IliRbiyTWCWjERBCkO1W4Qun9svcYoZrSLcyOsMLE=
+github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
+github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
+github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
+github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA=
+github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0=
+github.com/bwmarrin/snowflake v0.3.0/go.mod h1:NdZxfVWX+oR6y2K0o6qAYv6gIOP9rjG0/E9WsDpxqwE=
+github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
+github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
+github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
+github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE=
+github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89 h1:aPflPkRFkVwbW6dmcVqfgwp1i+UWGFH6VgR1Jim5Ygc=
+github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
+github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
+github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
+github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
+github.com/elazarl/goproxy v0.0.0-20230731152917-f99041a5c027 h1:1L0aalTpPz7YlMxETKpmQoWMBkeiuorElZIXoNmgiPE=
+github.com/elazarl/goproxy/ext v0.0.0-20220115173737-adb46da277ac h1:9yrT5tmn9Zc0ytWPASlaPwQfQMQYnRf0RSDe1XvHw0Q=
+github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
+github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
+github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
+github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
+github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/getkin/kin-openapi v0.120.0 h1:MqJcNJFrMDFNc07iwE8iFC5eT2k/NPUFDIpNeiZv8Jg=
+github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
+github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A=
+github.com/go-openapi/jsonpointer v0.20.2 h1:mQc3nmndL8ZBzStEo3JYF8wzmeWffDH4VbXz58sAx6Q=
+github.com/go-openapi/jsonreference v0.20.4 h1:bKlDxQxQJgwpUSgOENiMPzCTBVuc7vTdXSSgNeAhojU=
+github.com/go-openapi/swag v0.22.9 h1:XX2DssF+mQKM2DHsbgZK74y/zj4mo9I99+89xUmuZCE=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
+github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM=
+github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
+github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
+github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
+github.com/google/cel-go v0.17.7 h1:6ebJFzu1xO2n7TLtN+UBqShGBhlD85bhvglh5DpcfqQ=
+github.com/google/flatbuffers v23.5.26+incompatible h1:M9dgRyhJemaM4Sw8+66GHBu8ioaQmyPLg1b8VwK5WJg=
+github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
+github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
+github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/pprof v0.0.0-20231205033806-a5a03c77bf08 h1:PxlBVtIFHR/mtWk2i0gTEdCz+jBnqiuHNSki0epDbVs=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg=
+github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/grafana/grafana-plugin-sdk-go v0.222.0 h1:bWK35de9Kl9+lRGyh+41zW2X8MkQ4959aqUsi08/8ig=
+github.com/grafana/grafana-plugin-sdk-go v0.222.0/go.mod h1:0lYONo3rJrjIoJNOQP0h2NXmOaF5rFIuH/rwSVSeIrQ=
+github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340 h1:uGoIog/wiQHI9GAxXO5TJbT0wWKH3O9HhOJW1F9c3fY=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 h1:Wqo399gCIufwto+VfwCSvsnfGpF/w5E9CNxSwbpD6No=
+github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k=
+github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
+github.com/hashicorp/go-plugin v1.6.0 h1:wgd4KxHJTVGGqWBq4QPB1i5BZNEx9BR8+OFmHDmTk8A=
+github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
+github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
+github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
+github.com/invopop/yaml v0.2.0 h1:7zky/qH+O0DwAyoobXUqvVBwgBFRxKoQ/3FjcVpjTMY=
+github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
+github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4=
+github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
+github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg=
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
+github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/mattetti/filebuffer v1.0.1 h1:gG7pyfnSIZCxdoKq+cPa8T0hhYtD9NxCdI4D7PTjRLM=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
+github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
+github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU=
+github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA=
+github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
+github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
+github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
+github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg=
+github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
+github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s=
+github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
+github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
+github.com/prometheus/common v0.46.0 h1:doXzt5ybi1HBKpsZOL0sSkaNHJJqkyfEWZGGqqScV0Y=
+github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
+github.com/rivo/uniseg v0.3.4 h1:3Z3Eu6FGHZWSfNKJTOUiPatWwfc7DzJRU04jFUqJODw=
+github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
+github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 h1:Jpy1PXuP99tXNrhbq2BaPz9B+jNAvH1JPQQpG/9GCXY=
+github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
+github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js=
+github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0=
+github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7otjonDflCTK0BCfls4SPy3NcCVb5dqqmbRknE=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk=
+github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
+github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 h1:aVGB3YnaS/JNfOW3tiHIlmNmTDg618va+eT0mVomgyI=
+github.com/unknwon/com v1.0.1 h1:3d1LTxD+Lnf3soQiD4Cp/0BRB+Rsa/+RTvz8GMMzIXs=
+github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3 h1:4EYQaWAatQokdji3zqZloVIW/Ke1RQjYw2zHULyrHJg=
+github.com/urfave/cli v1.22.14 h1:ebbhrRiGK2i4naQJr+1Xj92HXZCrK7MsyTS/ob3HnAk=
+github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=
+github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
+github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
+go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA=
+go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
+go.etcd.io/etcd/api/v3 v3.5.10 h1:szRajuUUbLyppkhs9K6BRtjY37l66XQQmw7oZRANE4k=
+go.etcd.io/etcd/api/v3 v3.5.10/go.mod h1:TidfmT4Uycad3NM/o25fG3J07odo4GBB9hoxaodFCtI=
+go.etcd.io/etcd/client/pkg/v3 v3.5.10 h1:kfYIdQftBnbAq8pUWFXfpuuxFSKzlmM5cSn76JByiT0=
+go.etcd.io/etcd/client/pkg/v3 v3.5.10/go.mod h1:DYivfIviIuQ8+/lCq4vcxuseg2P2XbHygkKwFo9fc8U=
+go.etcd.io/etcd/client/v2 v2.305.10 h1:MrmRktzv/XF8CvtQt+P6wLUlURaNpSDJHFZhe//2QE4=
+go.etcd.io/etcd/client/v2 v2.305.10/go.mod h1:m3CKZi69HzilhVqtPDcjhSGp+kA1OmbNn0qamH80xjA=
+go.etcd.io/etcd/client/v3 v3.5.10 h1:W9TXNZ+oB3MCd/8UjxHTWK5J9Nquw9fQBLJd5ne5/Ao=
+go.etcd.io/etcd/client/v3 v3.5.10/go.mod h1:RVeBnDz2PUEZqTpgqwAtUd8nAPf5kjyFyND7P1VkOKc=
+go.etcd.io/etcd/pkg/v3 v3.5.10 h1:WPR8K0e9kWl1gAhB5A7gEa5ZBTNkT9NdNWrR8Qpo1CM=
+go.etcd.io/etcd/pkg/v3 v3.5.10/go.mod h1:TKTuCKKcF1zxmfKWDkfz5qqYaE3JncKKZPFf8c1nFUs=
+go.etcd.io/etcd/raft/v3 v3.5.10 h1:cgNAYe7xrsrn/5kXMSaH8kM/Ky8mAdMqGOxyYwpP0LA=
+go.etcd.io/etcd/raft/v3 v3.5.10/go.mod h1:odD6kr8XQXTy9oQnyMPBOr0TVe+gT0neQhElQ6jbGRc=
+go.etcd.io/etcd/server/v3 v3.5.10 h1:4NOGyOwD5sUZ22PiWYKmfxqoeh72z6EhYjNosKGLmZg=
+go.etcd.io/etcd/server/v3 v3.5.10/go.mod h1:gBplPHfs6YI0L+RpGkTQO7buDbHv5HJGG/Bst0/zIPo=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg=
+go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.49.0 h1:RtcvQ4iw3w9NBB5yRwgA4sSa82rfId7n4atVpvKx3bY=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk=
+go.opentelemetry.io/contrib/propagators/jaeger v1.22.0 h1:bAHX+zN/inu+Rbqk51REmC8oXLl+Dw6pp9ldQf/onaY=
+go.opentelemetry.io/contrib/samplers/jaegerremote v0.18.0 h1:Q9PrD94WoMolBx44ef5UWWvufpVSME0MiSymXZfedso=
+go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 h1:t6wl9SPayj+c7lEIFgm4ooDBZVb01IhLB4InpomhRw8=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 h1:Mw5xcxMwlqoJd97vwPxA8isEaIoxsta9/Q51+TTJLGE=
+go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI=
+go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw=
+go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI=
+go.opentelemetry.io/proto/otlp v1.1.0 h1:2Di21piLrCqJ3U3eXGCTPHE9R8Nh+0uglSnOyxikMeI=
+go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
+golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb h1:c0vyKkb6yr3KR7jEfJaOSv4lG7xPkbN6r52aJz1d8a8=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
+golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
+gonum.org/v1/gonum v0.12.0 h1:xKuo6hzt+gMav00meVPUlXwSdoEJP46BR+wdxQEFK2o=
+google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
+google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ=
+google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 h1:Lj5rbfG876hIAYFjqiJnPHfhXbv+nzTWfm04Fg/XSVU=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM=
+google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/fsnotify/fsnotify.v1 v1.4.7 h1:XNNYLJHt73EyYiCZi6+xjupS9CpvmiDgjPTAjrBlQbo=
+gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
+gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
+gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A=
+k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0=
+k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8=
+k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU=
+k8s.io/apiserver v0.29.2 h1:+Z9S0dSNr+CjnVXQePG8TcBWHr3Q7BmAr7NraHvsMiQ=
+k8s.io/apiserver v0.29.2/go.mod h1:B0LieKVoyU7ykQvPFm7XSdIHaCHSzCzQWPFa5bqbeMQ=
+k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg=
+k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA=
+k8s.io/component-base v0.29.2 h1:lpiLyuvPA9yV1aQwGLENYyK7n/8t6l3nn3zAtFTJYe8=
+k8s.io/component-base v0.29.2/go.mod h1:BfB3SLrefbZXiBfbM+2H1dlat21Uewg/5qtKOl8degM=
+k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
+k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
+k8s.io/kube-openapi v0.0.0-20240220201932-37d671a357a5 h1:QSpdNrZ9uRlV0VkqLvVO0Rqg8ioKi3oSw7O5P7pJV8M=
+k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
+k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2SGwkQasmbeqDo8th5wOBA5h/AjTKA4I=
+sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y=
+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
+sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
+sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
diff --git a/pkg/services/grafana-apiserver/registry/generic/strategy.go b/pkg/apiserver/registry/generic/strategy.go
similarity index 98%
rename from pkg/services/grafana-apiserver/registry/generic/strategy.go
rename to pkg/apiserver/registry/generic/strategy.go
index 797f2acc4fb09..95bf1424e04ed 100644
--- a/pkg/services/grafana-apiserver/registry/generic/strategy.go
+++ b/pkg/apiserver/registry/generic/strategy.go
@@ -39,11 +39,11 @@ func (genericStrategy) Validate(ctx context.Context, obj runtime.Object) field.E
 func (genericStrategy) WarningsOnCreate(ctx context.Context, obj runtime.Object) []string { return nil }
 
 func (genericStrategy) AllowCreateOnUpdate() bool {
-	return false
+	return true
 }
 
 func (genericStrategy) AllowUnconditionalUpdate() bool {
-	return false
+	return true
 }
 
 func (genericStrategy) Canonicalize(obj runtime.Object) {}
diff --git a/pkg/apiserver/rest/dualwriter.go b/pkg/apiserver/rest/dualwriter.go
new file mode 100644
index 0000000000000..81dcca18bfb20
--- /dev/null
+++ b/pkg/apiserver/rest/dualwriter.go
@@ -0,0 +1,192 @@
+package rest
+
+import (
+	"context"
+
+	"k8s.io/apimachinery/pkg/api/meta"
+	metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
+	"k8s.io/klog/v2"
+)
+
+var (
+	_ rest.Storage              = (*DualWriter)(nil)
+	_ rest.Scoper               = (*DualWriter)(nil)
+	_ rest.TableConvertor       = (*DualWriter)(nil)
+	_ rest.CreaterUpdater       = (*DualWriter)(nil)
+	_ rest.CollectionDeleter    = (*DualWriter)(nil)
+	_ rest.GracefulDeleter      = (*DualWriter)(nil)
+	_ rest.SingularNameProvider = (*DualWriter)(nil)
+)
+
+// Storage is a storage implementation that satisfies the same interfaces as genericregistry.Store.
+type Storage interface {
+	rest.Storage
+	rest.StandardStorage
+	rest.Scoper
+	rest.TableConvertor
+	rest.SingularNameProvider
+	rest.Getter
+}
+
+// LegacyStorage is a storage implementation that writes to the Grafana SQL database.
+type LegacyStorage interface {
+	rest.Storage
+	rest.Scoper
+	rest.SingularNameProvider
+	rest.TableConvertor
+	rest.Getter
+}
+
+// DualWriter is a storage implementation that writes first to LegacyStorage and then to Storage.
+// If writing to LegacyStorage fails, the write to Storage is skipped and the error is returned.
+// Storage is used for all read operations.  This is useful as a migration step from SQL based
+// legacy storage to a more standard kubernetes backed storage interface.
+//
+// NOTE: Only values supported by legacy storage will be preserved in the CREATE/UPDATE commands.
+// For example, annotations, labels, and managed fields may not be preserved.  Everything in upstream
+// storage can be recrated from the data in legacy storage.
+//
+// The LegacyStorage implementation must implement the following interfaces:
+// - rest.Storage
+// - rest.TableConvertor
+// - rest.Scoper
+// - rest.SingularNameProvider
+//
+// These interfaces are optional, but they all should be implemented to fully support dual writes:
+// - rest.Creater
+// - rest.Updater
+// - rest.GracefulDeleter
+// - rest.CollectionDeleter
+type DualWriter struct {
+	Storage
+	legacy LegacyStorage
+}
+
+// NewDualWriter returns a new DualWriter.
+func NewDualWriter(legacy LegacyStorage, storage Storage) *DualWriter {
+	return &DualWriter{
+		Storage: storage,
+		legacy:  legacy,
+	}
+}
+
+// Create overrides the default behavior of the Storage and writes to both the LegacyStorage and Storage.
+func (d *DualWriter) Create(ctx context.Context, obj runtime.Object, createValidation rest.ValidateObjectFunc, options *metav1.CreateOptions) (runtime.Object, error) {
+	if legacy, ok := d.legacy.(rest.Creater); ok {
+		created, err := legacy.Create(ctx, obj, createValidation, options)
+		if err != nil {
+			return nil, err
+		}
+
+		accessor, err := meta.Accessor(created)
+		if err != nil {
+			return created, err
+		}
+		accessor.SetResourceVersion("")
+		accessor.SetUID("")
+
+		rsp, err := d.Storage.Create(ctx, created, createValidation, options)
+		if err != nil {
+			klog.Error("unable to create object in duplicate storage", "error", err)
+		}
+		return rsp, err
+	}
+
+	return d.Storage.Create(ctx, obj, createValidation, options)
+}
+
+// Update overrides the default behavior of the Storage and writes to both the LegacyStorage and Storage.
+func (d *DualWriter) Update(ctx context.Context, name string, objInfo rest.UpdatedObjectInfo, createValidation rest.ValidateObjectFunc, updateValidation rest.ValidateObjectUpdateFunc, forceAllowCreate bool, options *metav1.UpdateOptions) (runtime.Object, bool, error) {
+	if legacy, ok := d.legacy.(rest.Updater); ok {
+		// Get the previous version from k8s storage (the one)
+		old, err := d.Get(ctx, name, &metav1.GetOptions{})
+		if err != nil {
+			return nil, false, err
+		}
+		accessor, err := meta.Accessor(old)
+		if err != nil {
+			return nil, false, err
+		}
+		// Hold on to the RV+UID for the dual write
+		theRV := accessor.GetResourceVersion()
+		theUID := accessor.GetUID()
+
+		// Changes applied within new storage
+		// will fail if RV is out of sync
+		updated, err := objInfo.UpdatedObject(ctx, old)
+		if err != nil {
+			return nil, false, err
+		}
+
+		accessor, err = meta.Accessor(updated)
+		if err != nil {
+			return nil, false, err
+		}
+		accessor.SetUID("")             // clear it
+		accessor.SetResourceVersion("") // remove it so it is not a constraint
+		obj, created, err := legacy.Update(ctx, name, &updateWrapper{
+			upstream: objInfo,
+			updated:  updated, // returned as the object that will be updated
+		}, createValidation, updateValidation, forceAllowCreate, options)
+		if err != nil {
+			return obj, created, err
+		}
+
+		accessor, err = meta.Accessor(obj)
+		if err != nil {
+			return nil, false, err
+		}
+		accessor.SetResourceVersion(theRV) // the original RV
+		accessor.SetUID(theUID)
+		objInfo = &updateWrapper{
+			upstream: objInfo,
+			updated:  obj, // returned as the object that will be updated
+		}
+	}
+
+	return d.Storage.Update(ctx, name, objInfo, createValidation, updateValidation, forceAllowCreate, options)
+}
+
+// Delete overrides the default behavior of the Storage and delete from both the LegacyStorage and Storage.
+func (d *DualWriter) Delete(ctx context.Context, name string, deleteValidation rest.ValidateObjectFunc, options *metav1.DeleteOptions) (runtime.Object, bool, error) {
+	// Delete from storage *first* so the item is still exists if a failure happens
+	obj, async, err := d.Storage.Delete(ctx, name, deleteValidation, options)
+	if err == nil {
+		if legacy, ok := d.legacy.(rest.GracefulDeleter); ok {
+			obj, async, err = legacy.Delete(ctx, name, deleteValidation, options)
+		}
+	}
+	return obj, async, err
+}
+
+// DeleteCollection overrides the default behavior of the Storage and delete from both the LegacyStorage and Storage.
+func (d *DualWriter) DeleteCollection(ctx context.Context, deleteValidation rest.ValidateObjectFunc, options *metav1.DeleteOptions, listOptions *metainternalversion.ListOptions) (runtime.Object, error) {
+	out, err := d.Storage.DeleteCollection(ctx, deleteValidation, options, listOptions)
+	if err == nil {
+		if legacy, ok := d.legacy.(rest.CollectionDeleter); ok {
+			out, err = legacy.DeleteCollection(ctx, deleteValidation, options, listOptions)
+		}
+	}
+	return out, err
+}
+
+type updateWrapper struct {
+	upstream rest.UpdatedObjectInfo
+	updated  runtime.Object
+}
+
+// Returns preconditions built from the updated object, if applicable.
+// May return nil, or a preconditions object containing nil fields,
+// if no preconditions can be determined from the updated object.
+func (u *updateWrapper) Preconditions() *metav1.Preconditions {
+	return u.upstream.Preconditions()
+}
+
+// UpdatedObject returns the updated object, given a context and old object.
+// The only time an empty oldObj should be passed in is if a "create on update" is occurring (there is no oldObj).
+func (u *updateWrapper) UpdatedObject(ctx context.Context, oldObj runtime.Object) (newObj runtime.Object, err error) {
+	return u.updated, nil
+}
diff --git a/pkg/apiserver/storage/file/file.go b/pkg/apiserver/storage/file/file.go
new file mode 100644
index 0000000000000..8f4fafc97a76d
--- /dev/null
+++ b/pkg/apiserver/storage/file/file.go
@@ -0,0 +1,761 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+// Provenance-includes-location: https://github.com/kubernetes-sigs/apiserver-runtime/blob/main/pkg/experimental/storage/filepath/jsonfile_rest.go
+// Provenance-includes-license: Apache-2.0
+// Provenance-includes-copyright: The Kubernetes Authors.
+
+package file
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"path/filepath"
+	"reflect"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/bwmarrin/snowflake"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/conversion"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/watch"
+	"k8s.io/apiserver/pkg/storage"
+	"k8s.io/apiserver/pkg/storage/storagebackend"
+	"k8s.io/apiserver/pkg/storage/storagebackend/factory"
+	"k8s.io/client-go/tools/cache"
+	"k8s.io/klog/v2"
+)
+
+const MaxUpdateAttempts = 30
+
+var _ storage.Interface = (*Storage)(nil)
+
+// Replace with: https://github.com/kubernetes/kubernetes/blob/v1.29.0-alpha.3/staging/src/k8s.io/apiserver/pkg/storage/errors.go#L28
+// When we upgrade to 1.29
+var errResourceVersionSetOnCreate = errors.New("resourceVersion should not be set on objects to be created")
+
+type parsedKey struct {
+	group     string
+	resource  string
+	namespace string
+	name      string
+}
+
+// Storage implements storage.Interface and storage resources as JSON files on disk.
+type Storage struct {
+	root           string
+	resourcePrefix string
+	gr             schema.GroupResource
+	codec          runtime.Codec
+	keyFunc        func(obj runtime.Object) (string, error)
+	newFunc        func() runtime.Object
+	newListFunc    func() runtime.Object
+	getAttrsFunc   storage.AttrFunc
+	trigger        storage.IndexerFuncs
+	indexers       *cache.Indexers
+
+	rvGenerationNode *snowflake.Node
+	// rvMutex provides synchronization between Get and GetList+Watch+CUD methods
+	// with access to resource version generation for the latter group
+	rvMutex   sync.RWMutex
+	currentRV uint64
+
+	watchSet  *WatchSet
+	versioner storage.Versioner
+}
+
+// ErrFileNotExists means the file doesn't actually exist.
+var ErrFileNotExists = fmt.Errorf("file doesn't exist")
+
+// ErrNamespaceNotExists means the directory for the namespace doesn't actually exist.
+var ErrNamespaceNotExists = errors.New("namespace does not exist")
+
+// NewStorage instantiates a new Storage.
+func NewStorage(
+	config *storagebackend.ConfigForResource,
+	resourcePrefix string,
+	keyFunc func(obj runtime.Object) (string, error),
+	newFunc func() runtime.Object,
+	newListFunc func() runtime.Object,
+	getAttrsFunc storage.AttrFunc,
+	trigger storage.IndexerFuncs,
+	indexers *cache.Indexers,
+) (storage.Interface, factory.DestroyFunc, error) {
+	root := config.Prefix
+	if err := ensureDir(root); err != nil {
+		return nil, func() {}, fmt.Errorf("could not establish a writable directory at path=%s", root)
+	}
+
+	rvGenerationNode, err := snowflake.NewNode(1)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	s := &Storage{
+		root:           root,
+		resourcePrefix: resourcePrefix,
+		gr:             config.GroupResource,
+		codec:          config.Codec,
+		keyFunc:        keyFunc,
+		newFunc:        newFunc,
+		newListFunc:    newListFunc,
+		getAttrsFunc:   getAttrsFunc,
+		trigger:        trigger,
+		indexers:       indexers,
+
+		rvGenerationNode: rvGenerationNode,
+		watchSet:         NewWatchSet(),
+
+		versioner: &storage.APIObjectVersioner{},
+	}
+
+	// Initialize the RV stored in storage
+	s.getNewResourceVersion()
+
+	return s, func() {
+		s.watchSet.cleanupWatchers()
+	}, nil
+}
+
+func (s *Storage) getNewResourceVersion() uint64 {
+	snowflakeNumber := s.rvGenerationNode.Generate().Int64()
+	s.currentRV = uint64(snowflakeNumber)
+	return s.currentRV
+}
+
+func (s *Storage) getCurrentResourceVersion() uint64 {
+	return s.currentRV
+}
+
+func (s *Storage) Versioner() storage.Versioner {
+	return s.versioner
+}
+
+// Create adds a new object at a key unless it already exists. 'ttl' is time-to-live
+// in seconds (0 means forever). If no error is returned and out is not nil, out will be
+// set to the read value from database.
+func (s *Storage) Create(ctx context.Context, key string, obj runtime.Object, out runtime.Object, ttl uint64) error {
+	s.rvMutex.Lock()
+	defer s.rvMutex.Unlock()
+
+	fpath := s.filePath(key)
+	if exists(fpath) {
+		return storage.NewKeyExistsError(key, 0)
+	}
+
+	dirname := filepath.Dir(fpath)
+	if err := ensureDir(dirname); err != nil {
+		return err
+	}
+
+	generatedRV := s.getNewResourceVersion()
+
+	metaObj, err := meta.Accessor(obj)
+	if err != nil {
+		return err
+	}
+	metaObj.SetSelfLink("")
+	if metaObj.GetResourceVersion() != "" {
+		return errResourceVersionSetOnCreate
+	}
+
+	if err := s.versioner.UpdateObject(obj, generatedRV); err != nil {
+		return err
+	}
+
+	if err := writeFile(s.codec, fpath, obj); err != nil {
+		return err
+	}
+
+	// set a timer to delete the file after ttl seconds
+	if ttl > 0 {
+		time.AfterFunc(time.Second*time.Duration(ttl), func() {
+			if err := s.Delete(ctx, key, s.newFunc(), &storage.Preconditions{}, func(ctx context.Context, obj runtime.Object) error { return nil }, obj); err != nil {
+				panic(err)
+			}
+		})
+	}
+
+	if err := s.Get(ctx, key, storage.GetOptions{}, out); err != nil {
+		return err
+	}
+
+	s.watchSet.notifyWatchers(watch.Event{
+		Object: out.DeepCopyObject(),
+		Type:   watch.Added,
+	}, nil)
+
+	return nil
+}
+
+// Delete removes the specified key and returns the value that existed at that spot.
+// If key didn't exist, it will return NotFound storage error.
+// If 'cachedExistingObject' is non-nil, it can be used as a suggestion about the
+// current version of the object to avoid read operation from storage to get it.
+// However, the implementations have to retry in case suggestion is stale.
+func (s *Storage) Delete(
+	ctx context.Context,
+	key string,
+	out runtime.Object,
+	preconditions *storage.Preconditions,
+	validateDeletion storage.ValidateObjectFunc,
+	cachedExistingObject runtime.Object,
+) error {
+	// TODO: is it gonna be contentious
+	// Either way, this should have max attempts logic
+	s.rvMutex.Lock()
+	defer s.rvMutex.Unlock()
+
+	fpath := s.filePath(key)
+	var currentState runtime.Object
+	var stateIsCurrent bool
+	if cachedExistingObject != nil {
+		currentState = cachedExistingObject
+	} else {
+		getOptions := storage.GetOptions{}
+		if preconditions != nil && preconditions.ResourceVersion != nil {
+			getOptions.ResourceVersion = *preconditions.ResourceVersion
+		}
+		if err := s.Get(ctx, key, getOptions, currentState); err == nil {
+			stateIsCurrent = true
+		}
+	}
+
+	for {
+		if preconditions != nil {
+			if err := preconditions.Check(key, out); err != nil {
+				if stateIsCurrent {
+					return err
+				}
+
+				// If the state is not current, we need to re-read the state and try again.
+				if err := s.Get(ctx, key, storage.GetOptions{}, currentState); err != nil {
+					return err
+				}
+				stateIsCurrent = true
+				continue
+			}
+		}
+
+		if err := validateDeletion(ctx, out); err != nil {
+			if stateIsCurrent {
+				return err
+			}
+
+			// If the state is not current, we need to re-read the state and try again.
+			if err := s.Get(ctx, key, storage.GetOptions{}, currentState); err == nil {
+				stateIsCurrent = true
+			}
+			continue
+		}
+
+		if err := s.Get(ctx, key, storage.GetOptions{}, out); err != nil {
+			return err
+		}
+
+		generatedRV := s.getNewResourceVersion()
+		if err := s.versioner.UpdateObject(out, generatedRV); err != nil {
+			return err
+		}
+
+		if err := deleteFile(fpath); err != nil {
+			return err
+		}
+
+		s.watchSet.notifyWatchers(watch.Event{
+			Object: out.DeepCopyObject(),
+			Type:   watch.Deleted,
+		}, nil)
+
+		return nil
+	}
+}
+
+// Watch begins watching the specified key. Events are decoded into API objects,
+// and any items selected by the predicate are sent down to returned watch.Interface.
+// resourceVersion may be used to specify what version to begin watching,
+// which should be the current resourceVersion, and no longer rv+1
+// (e.g. reconnecting without missing any updates).
+// If resource version is "0", this interface will get current object at given key
+// and send it in an "ADDED" event, before watch starts.
+func (s *Storage) Watch(ctx context.Context, key string, opts storage.ListOptions) (watch.Interface, error) {
+	p := opts.Predicate
+	listObj := s.newListFunc()
+
+	// Parses to 0 for opts.ResourceVersion == 0
+	requestedRV, err := s.versioner.ParseResourceVersion(opts.ResourceVersion)
+	if err != nil {
+		return nil, apierrors.NewBadRequest(fmt.Sprintf("invalid resource version: %v", err))
+	}
+
+	parsedkey, err := s.convertToParsedKey(key, p)
+	if err != nil {
+		return nil, err
+	}
+
+	var namespace *string
+	if parsedkey.namespace != "" {
+		namespace = &parsedkey.namespace
+	}
+
+	if (opts.SendInitialEvents == nil && requestedRV == 0) || (opts.SendInitialEvents != nil && *opts.SendInitialEvents) {
+		if err := s.GetList(ctx, key, opts, listObj); err != nil {
+			return nil, err
+		}
+
+		listAccessor, err := meta.ListAccessor(listObj)
+		if err != nil {
+			klog.Errorf("could not determine new list accessor in watch")
+			return nil, err
+		}
+		// Updated if requesting RV was either "0" or ""
+		maybeUpdatedRV, err := s.versioner.ParseResourceVersion(listAccessor.GetResourceVersion())
+		if err != nil {
+			klog.Errorf("could not determine new list RV in watch")
+			return nil, err
+		}
+
+		jw := s.watchSet.newWatch(ctx, maybeUpdatedRV, p, s.versioner, namespace)
+
+		initEvents := make([]watch.Event, 0)
+		listPtr, err := meta.GetItemsPtr(listObj)
+		if err != nil {
+			return nil, err
+		}
+		v, err := conversion.EnforcePtr(listPtr)
+		if err != nil || v.Kind() != reflect.Slice {
+			return nil, fmt.Errorf("need pointer to slice: %v", err)
+		}
+
+		for i := 0; i < v.Len(); i++ {
+			obj, ok := v.Index(i).Addr().Interface().(runtime.Object)
+			if !ok {
+				return nil, fmt.Errorf("need item to be a runtime.Object: %v", err)
+			}
+
+			initEvents = append(initEvents, watch.Event{
+				Type:   watch.Added,
+				Object: obj.DeepCopyObject(),
+			})
+		}
+
+		if p.AllowWatchBookmarks && len(initEvents) > 0 {
+			lastInitEvent := initEvents[len(initEvents)-1]
+			lastItemRV, err := s.versioner.ObjectResourceVersion(lastInitEvent.Object)
+			if err != nil {
+				return nil, fmt.Errorf("could not get last init event's revision for bookmark: %v", err)
+			}
+
+			bookmarkEvent := watch.Event{
+				Type:   watch.Bookmark,
+				Object: s.newFunc(),
+			}
+
+			if err := s.versioner.UpdateObject(bookmarkEvent.Object, lastItemRV); err != nil {
+				return nil, err
+			}
+
+			bookmarkObject, err := meta.Accessor(bookmarkEvent.Object)
+			if err != nil {
+				return nil, fmt.Errorf("could not get bookmark object's acccesor: %v", err)
+			}
+			bookmarkObject.SetAnnotations(map[string]string{"k8s.io/initial-events-end": "true"})
+			initEvents = append(initEvents, bookmarkEvent)
+		}
+
+		jw.Start(initEvents...)
+		return jw, nil
+	}
+
+	maybeUpdatedRV := requestedRV
+	if maybeUpdatedRV == 0 {
+		s.rvMutex.RLock()
+		maybeUpdatedRV = s.getCurrentResourceVersion()
+		s.rvMutex.RUnlock()
+	}
+	jw := s.watchSet.newWatch(ctx, maybeUpdatedRV, p, s.versioner, namespace)
+
+	jw.Start()
+	return jw, nil
+}
+
+// Get unmarshals object found at key into objPtr. On a not found error, will either
+// return a zero object of the requested type, or an error, depending on 'opts.ignoreNotFound'.
+// Treats empty responses and nil response nodes exactly like a not found error.
+// The returned contents may be delayed, but it is guaranteed that they will
+// match 'opts.ResourceVersion' according 'opts.ResourceVersionMatch'.
+func (s *Storage) Get(ctx context.Context, key string, opts storage.GetOptions, objPtr runtime.Object) error {
+	// No RV generation locking in single item get since its read from the disk
+	fpath := s.filePath(key)
+
+	// Since it's a get, check if the dir exists and return early as needed
+	dirname := filepath.Dir(fpath)
+	if !exists(dirname) {
+		return apierrors.NewNotFound(s.gr, s.nameFromKey(key))
+	}
+
+	obj, err := readFile(s.codec, fpath, func() runtime.Object {
+		return objPtr
+	})
+	if err != nil {
+		if opts.IgnoreNotFound {
+			return runtime.SetZeroValue(objPtr)
+		}
+		rv, err := s.versioner.ParseResourceVersion(opts.ResourceVersion)
+		if err != nil {
+			return err
+		}
+		return storage.NewKeyNotFoundError(key, int64(rv))
+	}
+
+	currentVersion, err := s.versioner.ObjectResourceVersion(obj)
+	if err != nil {
+		return err
+	}
+
+	if err = s.validateMinimumResourceVersion(opts.ResourceVersion, currentVersion); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// GetList unmarshalls objects found at key into a *List api object (an object
+// that satisfies runtime.IsList definition).
+// If 'opts.Recursive' is false, 'key' is used as an exact match. If `opts.Recursive'
+// is true, 'key' is used as a prefix.
+// The returned contents may be delayed, but it is guaranteed that they will
+// match 'opts.ResourceVersion' according 'opts.ResourceVersionMatch'.
+func (s *Storage) GetList(ctx context.Context, key string, opts storage.ListOptions, listObj runtime.Object) error {
+	remainingItems := int64(0)
+
+	resourceVersionInt, err := s.versioner.ParseResourceVersion(opts.ResourceVersion)
+	if err != nil {
+		return err
+	}
+
+	// read state protected by mutex
+	objs, err := func() ([]runtime.Object, error) {
+		s.rvMutex.Lock()
+		defer s.rvMutex.Unlock()
+
+		var fpath string
+		dirpath := s.dirPath(key)
+		// Since it's a get, check if the dir exists and return early as needed
+		if !exists(dirpath) {
+			// We may have gotten the key targeting an individual item
+			dirpath = filepath.Dir(dirpath)
+			if !exists(dirpath) {
+				// ensure we return empty list in listObj instead of a not found error
+				return []runtime.Object{}, nil
+			}
+			fpath = s.filePath(key)
+		}
+
+		var objs []runtime.Object
+		if fpath != "" {
+			obj, err := readFile(s.codec, fpath, func() runtime.Object {
+				return s.newFunc()
+			})
+			if err == nil {
+				objs = append(objs, obj)
+			}
+		} else {
+			var err error
+			objs, err = readDirRecursive(s.codec, dirpath, s.newFunc)
+			if err != nil {
+				return nil, err
+			}
+		}
+		return objs, nil
+	}()
+
+	if err != nil {
+		return err
+	}
+
+	listPtr, err := meta.GetItemsPtr(listObj)
+	if err != nil {
+		return err
+	}
+	v, err := conversion.EnforcePtr(listPtr)
+	if err != nil {
+		return err
+	}
+
+	for _, obj := range objs {
+		currentVersion, err := s.versioner.ObjectResourceVersion(obj)
+		if err != nil {
+			return err
+		}
+
+		if opts.SendInitialEvents == nil || (opts.SendInitialEvents != nil && !*opts.SendInitialEvents) {
+			// Apply the minimum resource version validation when we are not being called as part of Watch
+			// SendInitialEvents flow
+			// reason: the resource version of currently returned init items will always be < list RV
+			// they are being generated for, unless of course, the requestedRV == "0"/""
+			if err := s.validateMinimumResourceVersion(opts.ResourceVersion, currentVersion); err != nil {
+				// Below log left for debug. It's usually not an error condition
+				// klog.Infof("failed to assert minimum resource version constraint against list version")
+				continue
+			}
+		}
+
+		ok, err := opts.Predicate.Matches(obj)
+		if err == nil && ok {
+			v.Set(reflect.Append(v, reflect.ValueOf(obj).Elem()))
+		}
+	}
+
+	if resourceVersionInt == 0 {
+		resourceVersionInt = s.getNewResourceVersion()
+	}
+
+	if err := s.versioner.UpdateList(listObj, resourceVersionInt, "", &remainingItems); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// GuaranteedUpdate keeps calling 'tryUpdate()' to update key 'key' (of type 'destination')
+// retrying the update until success if there is index conflict.
+// Note that object passed to tryUpdate may change across invocations of tryUpdate() if
+// other writers are simultaneously updating it, so tryUpdate() needs to take into account
+// the current contents of the object when deciding how the update object should look.
+// If the key doesn't exist, it will return NotFound storage error if ignoreNotFound=false
+// else `destination` will be set to the zero value of it's type.
+// If the eventual successful invocation of `tryUpdate` returns an output with the same serialized
+// contents as the input, it won't perform any update, but instead set `destination` to an object with those
+// contents.
+// If 'cachedExistingObject' is non-nil, it can be used as a suggestion about the
+// current version of the object to avoid read operation from storage to get it.
+// However, the implementations have to retry in case suggestion is stale.
+func (s *Storage) GuaranteedUpdate(
+	ctx context.Context,
+	key string,
+	destination runtime.Object,
+	ignoreNotFound bool,
+	preconditions *storage.Preconditions,
+	tryUpdate storage.UpdateFunc,
+	cachedExistingObject runtime.Object,
+) error {
+	var (
+		res         storage.ResponseMeta
+		updatedObj  runtime.Object
+		objFromDisk runtime.Object
+		created     bool
+		fpath       = s.filePath(key)
+		dirpath     = filepath.Dir(fpath)
+	)
+
+	for attempt := 1; attempt <= MaxUpdateAttempts; attempt = attempt + 1 {
+		var err error
+
+		if !exists(dirpath) {
+			if err := ensureDir(dirpath); err != nil {
+				return err
+			}
+		}
+
+		if !exists(fpath) && !ignoreNotFound {
+			return apierrors.NewNotFound(s.gr, s.nameFromKey(key))
+		}
+
+		objFromDisk, err = readFile(s.codec, fpath, s.newFunc)
+		if err != nil {
+			// fallback to new object if the file is not found
+			objFromDisk = s.newFunc()
+			created = true
+		}
+
+		if err := preconditions.Check(key, objFromDisk); err != nil {
+			if attempt >= MaxUpdateAttempts {
+				return fmt.Errorf("precondition failed: %w", err)
+			}
+			continue
+		}
+
+		updatedObj, _, err = tryUpdate(objFromDisk, res)
+		if err != nil {
+			if attempt >= MaxUpdateAttempts {
+				return err
+			}
+			continue
+		}
+		break
+	}
+
+	unchanged, err := isUnchanged(s.codec, objFromDisk, updatedObj)
+	if err != nil {
+		return err
+	}
+
+	if unchanged {
+		if err := copyModifiedObjectToDestination(updatedObj, destination); err != nil {
+			return err
+		}
+		return nil
+	}
+
+	s.rvMutex.Lock()
+	generatedRV := s.getNewResourceVersion()
+	if err != nil {
+		s.rvMutex.Unlock()
+		return err
+	}
+	s.rvMutex.Unlock()
+
+	if err := s.versioner.UpdateObject(updatedObj, generatedRV); err != nil {
+		return err
+	}
+
+	if err := writeFile(s.codec, fpath, updatedObj); err != nil {
+		return err
+	}
+
+	if err := copyModifiedObjectToDestination(updatedObj, destination); err != nil {
+		return err
+	}
+
+	eventType := watch.Modified
+	if created {
+		eventType = watch.Added
+		s.watchSet.notifyWatchers(watch.Event{
+			Object: destination.DeepCopyObject(),
+			Type:   eventType,
+		}, nil)
+		return nil
+	}
+
+	s.watchSet.notifyWatchers(watch.Event{
+		Object: destination.DeepCopyObject(),
+		Type:   eventType,
+	}, objFromDisk.DeepCopyObject())
+
+	return nil
+}
+
+// Count returns number of different entries under the key (generally being path prefix).
+func (s *Storage) Count(key string) (int64, error) {
+	return 0, nil
+}
+
+// RequestWatchProgress requests the a watch stream progress status be sent in the
+// watch response stream as soon as possible.
+// Used for monitor watch progress even if watching resources with no changes.
+//
+// If watch is lagging, progress status might:
+// * be pointing to stale resource version. Use etcd KV request to get linearizable resource version.
+// * not be delivered at all. It's recommended to poll request progress periodically.
+//
+// Note: Only watches with matching context grpc metadata will be notified.
+// https://github.com/kubernetes/kubernetes/blob/9325a57125e8502941d1b0c7379c4bb80a678d5c/vendor/go.etcd.io/etcd/client/v3/watch.go#L1037-L1042
+//
+// TODO: Remove when storage.Interface will be separate from etc3.store.
+// Deprecated: Added temporarily to simplify exposing RequestProgress for watch cache.
+func (s *Storage) RequestWatchProgress(_ context.Context) error {
+	return nil
+}
+
+// validateMinimumResourceVersion returns a 'too large resource' version error when the provided minimumResourceVersion is
+// greater than the most recent actualRevision available from storage.
+func (s *Storage) validateMinimumResourceVersion(minimumResourceVersion string, actualRevision uint64) error {
+	if minimumResourceVersion == "" {
+		return nil
+	}
+	minimumRV, err := s.versioner.ParseResourceVersion(minimumResourceVersion)
+	if err != nil {
+		return apierrors.NewBadRequest(fmt.Sprintf("invalid resource version: %v", err))
+	}
+	// Enforce the storage.Interface guarantee that the resource version of the returned data
+	// "will be at least 'resourceVersion'".
+	if minimumRV > actualRevision {
+		return storage.NewTooLargeResourceVersionError(minimumRV, actualRevision, 0)
+	}
+	return nil
+}
+
+func (s *Storage) nameFromKey(key string) string {
+	return strings.Replace(key, s.resourcePrefix+"/", "", 1)
+}
+
+// While this is an inefficient way to differentiate the ambiguous keys,
+// we only need it for initial namespace calculation in watch
+// This helps us with watcher tests that don't always set up requestcontext correctly
+func (s *Storage) convertToParsedKey(key string, p storage.SelectionPredicate) (*parsedKey, error) {
+	// NOTE: the following supports the watcher tests that run against v1/pods
+	// Other than that, there are ambiguities in the key format that only field selector
+	// when set to use metadata.name can be used to bring clarity in the 3-segment case
+
+	// Cases handled below:
+	// namespace scoped:
+	// /<group>/<resource>/[<namespace>]/[<name>]
+	// /<group>/<resource>/[<namespace>]
+	//
+	// cluster scoped:
+	// /<group>/<resource>/[<name>]
+	// /<group>/<resource>
+	parts := strings.SplitN(key, "/", 5)
+	if len(parts) < 3 && s.gr.Group != "" {
+		return nil, fmt.Errorf("invalid key (expecting at least 2 parts): %s", key)
+	}
+
+	if len(parts) < 2 && s.gr.Group == "" {
+		return nil, fmt.Errorf("invalid key (expecting at least 1 part): %s", key)
+	}
+
+	// beware this empty "" as the first separated part for the rest of the parsing below
+	if parts[0] != "" {
+		return nil, fmt.Errorf("invalid key (expecting leading slash): %s", key)
+	}
+
+	k := &parsedKey{}
+
+	// for v1/pods that tests use, Group is empty
+	if len(parts) > 1 && s.gr.Group == "" {
+		k.resource = parts[1]
+	}
+
+	if len(parts) > 2 {
+		// for v1/pods that tests use, Group is empty
+		if parts[1] == s.gr.Resource {
+			k.resource = parts[1]
+			if _, found := p.Field.RequiresExactMatch("metadata.name"); !found {
+				k.namespace = parts[2]
+			}
+		} else {
+			k.group = parts[1]
+			k.resource = parts[2]
+		}
+	}
+
+	if len(parts) > 3 {
+		// for v1/pods that tests use, Group is empty
+		if parts[1] == s.gr.Resource {
+			k.name = parts[3]
+		} else {
+			if _, found := p.Field.RequiresExactMatch("metadata.name"); !found {
+				k.namespace = parts[3]
+			}
+		}
+	}
+
+	return k, nil
+}
+
+func copyModifiedObjectToDestination(updatedObj runtime.Object, destination runtime.Object) error {
+	u, err := conversion.EnforcePtr(updatedObj)
+	if err != nil {
+		return fmt.Errorf("unable to enforce updated object pointer: %w", err)
+	}
+	d, err := conversion.EnforcePtr(destination)
+	if err != nil {
+		return fmt.Errorf("unable to enforce destination pointer: %w", err)
+	}
+	d.Set(u)
+	return nil
+}
diff --git a/pkg/apiserver/storage/file/restoptions.go b/pkg/apiserver/storage/file/restoptions.go
new file mode 100644
index 0000000000000..52981cef7feb3
--- /dev/null
+++ b/pkg/apiserver/storage/file/restoptions.go
@@ -0,0 +1,80 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+package file
+
+import (
+	"os"
+	"path/filepath"
+	"time"
+
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apiserver/pkg/registry/generic"
+	"k8s.io/apiserver/pkg/storage/storagebackend"
+	flowcontrolrequest "k8s.io/apiserver/pkg/util/flowcontrol/request"
+)
+
+var _ generic.RESTOptionsGetter = (*RESTOptionsGetter)(nil)
+
+type RESTOptionsGetter struct {
+	path     string
+	original storagebackend.Config
+}
+
+// Optionally, this constructor allows specifying directories
+// for resources that are required to be read/watched on startup and there
+// won't be any write operations that initially bootstrap their directories
+func NewRESTOptionsGetter(path string,
+	originalStorageConfig storagebackend.Config,
+	createResourceDirs ...string) (*RESTOptionsGetter, error) {
+	if path == "" {
+		path = filepath.Join(os.TempDir(), "grafana-apiserver")
+	}
+
+	if err := initializeDirs(path, createResourceDirs); err != nil {
+		return nil, err
+	}
+
+	return &RESTOptionsGetter{path: path, original: originalStorageConfig}, nil
+}
+
+func initializeDirs(root string, createResourceDirs []string) error {
+	for _, dir := range createResourceDirs {
+		if err := ensureDir(filepath.Join(root, dir)); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (r *RESTOptionsGetter) GetRESTOptions(resource schema.GroupResource) (generic.RESTOptions, error) {
+	storageConfig := &storagebackend.ConfigForResource{
+		Config: storagebackend.Config{
+			Type:                      "file",
+			Prefix:                    r.path,
+			Transport:                 storagebackend.TransportConfig{},
+			Codec:                     r.original.Codec,
+			EncodeVersioner:           r.original.EncodeVersioner,
+			Transformer:               r.original.Transformer,
+			CompactionInterval:        0,
+			CountMetricPollPeriod:     0,
+			DBMetricPollInterval:      0,
+			HealthcheckTimeout:        0,
+			ReadycheckTimeout:         0,
+			StorageObjectCountTracker: flowcontrolrequest.NewStorageObjectCountTracker(),
+		},
+		GroupResource: resource,
+	}
+
+	ret := generic.RESTOptions{
+		StorageConfig:           storageConfig,
+		Decorator:               NewStorage,
+		DeleteCollectionWorkers: 0,
+		EnableGarbageCollection: false,
+		// k8s expects forward slashes here, we'll convert them to os path separators in the storage
+		ResourcePrefix:            "/" + resource.Group + "/" + resource.Resource,
+		CountMetricPollPeriod:     1 * time.Second,
+		StorageObjectCountTracker: storageConfig.Config.StorageObjectCountTracker,
+	}
+
+	return ret, nil
+}
diff --git a/pkg/apiserver/storage/file/util.go b/pkg/apiserver/storage/file/util.go
new file mode 100644
index 0000000000000..67cd5452bca23
--- /dev/null
+++ b/pkg/apiserver/storage/file/util.go
@@ -0,0 +1,113 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+// Provenance-includes-location: https://github.com/kubernetes-sigs/apiserver-runtime/blob/main/pkg/experimental/storage/filepath/jsonfile_rest.go
+// Provenance-includes-license: Apache-2.0
+// Provenance-includes-copyright: The Kubernetes Authors.
+
+package file
+
+import (
+	"bytes"
+	"errors"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+func (s *Storage) filePath(key string) string {
+	// Replace backslashes with underscores to avoid creating bogus subdirectories
+	key = strings.Replace(key, "\\", "_", -1)
+	fileName := filepath.Join(s.root, filepath.Clean(key+".json"))
+	return fileName
+}
+
+// this is for constructing dirPath in a sanitized way provided you have
+// already calculated the key. In order to go in the other direction, from a file path
+// key to its dir, use the go standard library: filepath.Dir
+func (s *Storage) dirPath(key string) string {
+	return dirPath(s.root, key)
+}
+
+func writeFile(codec runtime.Codec, path string, obj runtime.Object) error {
+	buf := new(bytes.Buffer)
+	if err := codec.Encode(obj, buf); err != nil {
+		return err
+	}
+	return os.WriteFile(path, buf.Bytes(), 0600)
+}
+
+func readFile(codec runtime.Codec, path string, newFunc func() runtime.Object) (runtime.Object, error) {
+	content, err := os.ReadFile(filepath.Clean(path))
+	if err != nil {
+		return nil, err
+	}
+	newObj := newFunc()
+	decodedObj, _, err := codec.Decode(content, nil, newObj)
+	if err != nil {
+		return nil, err
+	}
+	return decodedObj, nil
+}
+
+func readDirRecursive(codec runtime.Codec, path string, newFunc func() runtime.Object) ([]runtime.Object, error) {
+	var objs []runtime.Object
+	err := filepath.Walk(path, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		if info.IsDir() || filepath.Ext(path) != ".json" {
+			return nil
+		}
+		obj, err := readFile(codec, path, newFunc)
+		if err != nil {
+			return err
+		}
+		objs = append(objs, obj)
+		return nil
+	})
+	if err != nil {
+		if errors.Is(err, os.ErrNotExist) {
+			return objs, nil
+		}
+		return nil, err
+	}
+	return objs, nil
+}
+
+func deleteFile(path string) error {
+	return os.Remove(path)
+}
+
+func exists(filepath string) bool {
+	_, err := os.Stat(filepath)
+	return err == nil
+}
+
+func dirPath(root string, key string) string {
+	// Replace backslashes with underscores to avoid creating bogus subdirectories
+	key = strings.Replace(key, "\\", "_", -1)
+	dirName := filepath.Join(root, filepath.Clean(key))
+	return dirName
+}
+
+func ensureDir(dirname string) error {
+	if !exists(dirname) {
+		return os.MkdirAll(dirname, 0700)
+	}
+	return nil
+}
+
+func isUnchanged(codec runtime.Codec, obj runtime.Object, newObj runtime.Object) (bool, error) {
+	buf := new(bytes.Buffer)
+	if err := codec.Encode(obj, buf); err != nil {
+		return false, err
+	}
+
+	newBuf := new(bytes.Buffer)
+	if err := codec.Encode(newObj, newBuf); err != nil {
+		return false, err
+	}
+
+	return bytes.Equal(buf.Bytes(), newBuf.Bytes()), nil
+}
diff --git a/pkg/apiserver/storage/file/watcher_test.go b/pkg/apiserver/storage/file/watcher_test.go
new file mode 100644
index 0000000000000..51b72bf66ffd9
--- /dev/null
+++ b/pkg/apiserver/storage/file/watcher_test.go
@@ -0,0 +1,230 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+// Provenance-includes-location: https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go
+// Provenance-includes-license: Apache-2.0
+// Provenance-includes-copyright: The Kubernetes Authors.
+
+package file
+
+import (
+	"context"
+	"io/fs"
+	"os"
+	"path"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"k8s.io/apimachinery/pkg/api/apitesting"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	"k8s.io/apiserver/pkg/apis/example"
+	examplev1 "k8s.io/apiserver/pkg/apis/example/v1"
+	"k8s.io/apiserver/pkg/storage"
+	"k8s.io/apiserver/pkg/storage/storagebackend"
+	"k8s.io/apiserver/pkg/storage/storagebackend/factory"
+	storagetesting "k8s.io/apiserver/pkg/storage/testing"
+)
+
+var scheme = runtime.NewScheme()
+var codecs = serializer.NewCodecFactory(scheme)
+
+func init() {
+	metav1.AddToGroupVersion(scheme, metav1.SchemeGroupVersion)
+	utilruntime.Must(example.AddToScheme(scheme))
+	utilruntime.Must(examplev1.AddToScheme(scheme))
+}
+
+type setupOptions struct {
+	codec          runtime.Codec
+	newFunc        func() runtime.Object
+	newListFunc    func() runtime.Object
+	prefix         string
+	resourcePrefix string
+	groupResource  schema.GroupResource
+}
+
+type setupOption func(*setupOptions, testing.TB)
+
+func withDefaults(options *setupOptions, t testing.TB) {
+	options.codec = apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion)
+	options.newFunc = newPod
+	options.newListFunc = newPodList
+	options.prefix = t.TempDir()
+	options.resourcePrefix = "/pods"
+	options.groupResource = schema.GroupResource{Resource: "pods"}
+}
+
+var _ setupOption = withDefaults
+
+func testSetup(t testing.TB, opts ...setupOption) (context.Context, storage.Interface, factory.DestroyFunc, error) {
+	setupOpts := setupOptions{}
+	opts = append([]setupOption{withDefaults}, opts...)
+	for _, opt := range opts {
+		opt(&setupOpts, t)
+	}
+
+	config := storagebackend.NewDefaultConfig(setupOpts.prefix, setupOpts.codec)
+	store, destroyFunc, err := NewStorage(
+		config.ForResource(setupOpts.groupResource),
+		setupOpts.resourcePrefix,
+		func(obj runtime.Object) (string, error) {
+			return storage.NamespaceKeyFunc(setupOpts.resourcePrefix, obj)
+		},
+		setupOpts.newFunc,
+		setupOpts.newListFunc,
+		storage.DefaultNamespaceScopedAttr,
+		make(map[string]storage.IndexerFunc, 0),
+		nil,
+	)
+
+	// Some tests may start reading before writing
+	if err := os.MkdirAll(path.Join(setupOpts.prefix, "pods", "test-ns"), fs.ModePerm); err != nil {
+		return nil, nil, nil, err
+	}
+
+	if err != nil {
+		return nil, nil, nil, err
+	}
+	ctx := context.Background()
+	return ctx, store, destroyFunc, nil
+}
+
+func TestWatch(t *testing.T) {
+	ctx, store, destroyFunc, err := testSetup(t)
+	defer destroyFunc()
+	assert.NoError(t, err)
+
+	storagetesting.RunTestWatch(ctx, t, store)
+}
+
+func TestClusterScopedWatch(t *testing.T) {
+	ctx, store, destroyFunc, err := testSetup(t)
+	defer destroyFunc()
+	assert.NoError(t, err)
+	storagetesting.RunTestClusterScopedWatch(ctx, t, store)
+}
+
+func TestNamespaceScopedWatch(t *testing.T) {
+	ctx, store, destroyFunc, err := testSetup(t)
+	defer destroyFunc()
+	assert.NoError(t, err)
+	storagetesting.RunTestNamespaceScopedWatch(ctx, t, store)
+}
+
+func TestDeleteTriggerWatch(t *testing.T) {
+	ctx, store, destroyFunc, err := testSetup(t)
+	defer destroyFunc()
+	assert.NoError(t, err)
+	storagetesting.RunTestDeleteTriggerWatch(ctx, t, store)
+}
+
+func TestWatchFromZero(t *testing.T) {
+	ctx, store, destroyFunc, err := testSetup(t)
+	defer destroyFunc()
+	assert.NoError(t, err)
+	storagetesting.RunTestWatchFromZero(ctx, t, store, nil)
+}
+
+// TestWatchFromNonZero tests that
+// - watch from non-0 should just watch changes after given version
+func TestWatchFromNoneZero(t *testing.T) {
+	ctx, store, destroyFunc, err := testSetup(t)
+	defer destroyFunc()
+	assert.NoError(t, err)
+	storagetesting.RunTestWatchFromNonZero(ctx, t, store)
+}
+
+func TestDelayedWatchDelivery(t *testing.T) {
+	ctx, store, destroyFunc, err := testSetup(t)
+	defer destroyFunc()
+	assert.NoError(t, err)
+	storagetesting.RunTestDelayedWatchDelivery(ctx, t, store)
+}
+
+/* func TestWatchError(t *testing.T) {
+	ctx, store, _ := testSetup(t)
+	storagetesting.RunTestWatchError(ctx, t, &storeWithPrefixTransformer{store})
+} */
+
+func TestWatchContextCancel(t *testing.T) {
+	ctx, store, destroyFunc, err := testSetup(t)
+	defer destroyFunc()
+	assert.NoError(t, err)
+	storagetesting.RunTestWatchContextCancel(ctx, t, store)
+}
+
+func TestWatcherTimeout(t *testing.T) {
+	ctx, store, destroyFunc, err := testSetup(t)
+	defer destroyFunc()
+	assert.NoError(t, err)
+	storagetesting.RunTestWatcherTimeout(ctx, t, store)
+}
+
+func TestWatchDeleteEventObjectHaveLatestRV(t *testing.T) {
+	ctx, store, destroyFunc, err := testSetup(t)
+	defer destroyFunc()
+	assert.NoError(t, err)
+	storagetesting.RunTestWatchDeleteEventObjectHaveLatestRV(ctx, t, store)
+}
+
+// TODO: enable when we support flow control and priority fairness
+/* func TestWatchInitializationSignal(t *testing.T) {
+	ctx, store, destroyFunc, err := testSetup(t)
+	defer destroyFunc()
+	assert.NoError(t, err)
+	storagetesting.RunTestWatchInitializationSignal(ctx, t, store)
+} */
+
+/* func TestProgressNotify(t *testing.T) {
+	ctx, store, destroyFunc, err := testSetup(t)
+	defer destroyFunc()
+	assert.NoError(t, err)
+	storagetesting.RunOptionalTestProgressNotify(ctx, t, store)
+} */
+
+// TestWatchDispatchBookmarkEvents makes sure that
+// setting allowWatchBookmarks query param against
+// etcd implementation doesn't have any effect.
+func TestWatchDispatchBookmarkEvents(t *testing.T) {
+	ctx, store, destroyFunc, err := testSetup(t)
+	defer destroyFunc()
+	assert.NoError(t, err)
+	storagetesting.RunTestWatchDispatchBookmarkEvents(ctx, t, store, false)
+}
+
+func TestSendInitialEventsBackwardCompatibility(t *testing.T) {
+	ctx, store, destroyFunc, err := testSetup(t)
+	defer destroyFunc()
+	assert.NoError(t, err)
+	storagetesting.RunSendInitialEventsBackwardCompatibility(ctx, t, store)
+}
+
+func TestEtcdWatchSemantics(t *testing.T) {
+	ctx, store, destroyFunc, err := testSetup(t)
+	defer destroyFunc()
+	assert.NoError(t, err)
+	storagetesting.RunWatchSemantics(ctx, t, store)
+}
+
+// TODO: determine if this test case is useful to pass
+// If we simply generate Snowflakes for List RVs (when none is passed in) as opposed to maxRV calculation, it makes
+// our watch implementation and comparing items against the requested RV much more reliable.
+// There is no guarantee that maxRV+1 won't end up being a future item's RV.
+/*
+func TestEtcdWatchSemanticInitialEventsExtended(t *testing.T) {
+	ctx, store, destroyFunc, err := testSetup(t)
+	defer destroyFunc()
+	assert.NoError(t, err)
+	storagetesting.RunWatchSemanticInitialEventsExtended(ctx, t, store)
+}
+*/
+
+func newPod() runtime.Object {
+	return &example.Pod{}
+}
+
+func newPodList() runtime.Object {
+	return &example.PodList{}
+}
diff --git a/pkg/apiserver/storage/file/watchset.go b/pkg/apiserver/storage/file/watchset.go
new file mode 100644
index 0000000000000..98c028727e08c
--- /dev/null
+++ b/pkg/apiserver/storage/file/watchset.go
@@ -0,0 +1,376 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+// Provenance-includes-location: https://github.com/tilt-dev/tilt-apiserver/blob/main/pkg/storage/filepath/watchset.go
+// Provenance-includes-license: Apache-2.0
+// Provenance-includes-copyright: The Kubernetes Authors.
+
+package file
+
+import (
+	"context"
+	"fmt"
+	"sync"
+	"sync/atomic"
+
+	"k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/watch"
+	"k8s.io/apiserver/pkg/storage"
+	"k8s.io/klog/v2"
+)
+
+const (
+	UpdateChannelSize         = 25
+	InitialWatchNodesSize     = 20
+	InitialBufferedEventsSize = 25
+)
+
+type eventWrapper struct {
+	ev watch.Event
+	// optional: oldObject is only set for modifications for determining their type as necessary (when using predicate filtering)
+	oldObject runtime.Object
+}
+
+type watchNode struct {
+	ctx         context.Context
+	s           *WatchSet
+	id          uint64
+	updateCh    chan eventWrapper
+	outCh       chan watch.Event
+	requestedRV uint64
+	// the watch may or may not be namespaced for a namespaced resource. This is always nil for cluster-scoped kinds
+	watchNamespace *string
+	predicate      storage.SelectionPredicate
+	versioner      storage.Versioner
+}
+
+// Keeps track of which watches need to be notified
+type WatchSet struct {
+	mu sync.RWMutex
+	// mu protects both nodes and counter
+	nodes         map[uint64]*watchNode
+	counter       atomic.Uint64
+	buffered      []eventWrapper
+	bufferedMutex sync.RWMutex
+}
+
+func NewWatchSet() *WatchSet {
+	return &WatchSet{
+		buffered: make([]eventWrapper, 0, InitialBufferedEventsSize),
+		nodes:    make(map[uint64]*watchNode, InitialWatchNodesSize),
+	}
+}
+
+// Creates a new watch with a unique id, but
+// does not start sending events to it until start() is called.
+func (s *WatchSet) newWatch(ctx context.Context, requestedRV uint64, p storage.SelectionPredicate, versioner storage.Versioner, namespace *string) *watchNode {
+	s.counter.Add(1)
+
+	node := &watchNode{
+		ctx:         ctx,
+		requestedRV: requestedRV,
+		id:          s.counter.Load(),
+		s:           s,
+		// updateCh size needs to be > 1 to allow slower clients to not block passing new events
+		updateCh: make(chan eventWrapper, UpdateChannelSize),
+		// outCh size needs to be > 1 for single process use-cases such as tests where watch and event seeding from CUD
+		// events is happening on the same thread
+		outCh:          make(chan watch.Event, UpdateChannelSize),
+		predicate:      p,
+		watchNamespace: namespace,
+		versioner:      versioner,
+	}
+
+	return node
+}
+
+func (s *WatchSet) cleanupWatchers() {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	for _, w := range s.nodes {
+		w.stop()
+	}
+}
+
+// oldObject is only passed in the event of a modification
+// in case a predicate filtered watch is impacted as a result of modification
+// NOTE: this function gives one the misperception that a newly added node will never
+// get a double event, one from buffered and one from the update channel
+// That perception is not true. Even though this function maintains the lock throughout the function body
+// it is not true of the Start function. So basically, the Start function running after this function
+// fully stands the chance of another future notifyWatchers double sending it the event through the two means mentioned
+func (s *WatchSet) notifyWatchers(ev watch.Event, oldObject runtime.Object) {
+	s.mu.RLock()
+	defer s.mu.RUnlock()
+
+	updateEv := eventWrapper{
+		ev: ev,
+	}
+	if oldObject != nil {
+		updateEv.oldObject = oldObject
+	}
+
+	// Events are always buffered.
+	// this is because of an inadvertent delay which is built into the watch process
+	// Watch() from storage returns Watch.Interface with a async start func.
+	// The only way to guarantee that we can interpret the passed RV correctly is to play it against missed events
+	// (notice the loop below over s.nodes isn't exactly going to work on a new node
+	// unless start is called on it)
+	s.bufferedMutex.Lock()
+	s.buffered = append(s.buffered, updateEv)
+	s.bufferedMutex.Unlock()
+
+	for _, w := range s.nodes {
+		w.updateCh <- updateEv
+	}
+}
+
+// isValid is not necessary to be called on oldObject in UpdateEvents - assuming the Watch pushes correctly setup eventWrapper our way
+// first bool is whether the event is valid for current watcher
+// second bool is whether checking the old value against the predicate may be valuable to the caller
+// second bool may be a helpful aid to establish context around MODIFIED events
+// (note that this second bool is only marked true if we pass other checks first, namely RV and namespace)
+func (w *watchNode) isValid(e eventWrapper) (bool, bool, error) {
+	obj, err := meta.Accessor(e.ev.Object)
+	if err != nil {
+		klog.Error("Could not get accessor to object in event")
+		return false, false, nil
+	}
+
+	eventRV, err := w.getResourceVersionAsInt(e.ev.Object)
+	if err != nil {
+		return false, false, err
+	}
+
+	if eventRV < w.requestedRV {
+		return false, false, nil
+	}
+
+	if w.watchNamespace != nil && *w.watchNamespace != obj.GetNamespace() {
+		return false, false, err
+	}
+
+	valid, err := w.predicate.Matches(e.ev.Object)
+	if err != nil {
+		return false, false, err
+	}
+
+	return valid, e.ev.Type == watch.Modified, nil
+}
+
+// Only call this method if current object matches the predicate
+func (w *watchNode) handleAddedForFilteredList(e eventWrapper) (*watch.Event, error) {
+	if e.oldObject == nil {
+		return nil, fmt.Errorf("oldObject should be set for modified events")
+	}
+
+	ok, err := w.predicate.Matches(e.oldObject)
+	if err != nil {
+		return nil, err
+	}
+
+	if !ok {
+		e.ev.Type = watch.Added
+		return &e.ev, nil
+	}
+
+	return nil, nil
+}
+
+func (w *watchNode) handleDeletedForFilteredList(e eventWrapper) (*watch.Event, error) {
+	if e.oldObject == nil {
+		return nil, fmt.Errorf("oldObject should be set for modified events")
+	}
+
+	ok, err := w.predicate.Matches(e.oldObject)
+	if err != nil {
+		return nil, err
+	}
+
+	if !ok {
+		return nil, nil
+	}
+
+	// isn't a match but used to be
+	e.ev.Type = watch.Deleted
+
+	oldObjectAccessor, err := meta.Accessor(e.oldObject)
+	if err != nil {
+		klog.Errorf("Could not get accessor to correct the old RV of filtered out object")
+		return nil, err
+	}
+
+	currentRV, err := getResourceVersion(e.ev.Object)
+	if err != nil {
+		klog.Errorf("Could not get accessor to object in event")
+		return nil, err
+	}
+
+	oldObjectAccessor.SetResourceVersion(currentRV)
+	e.ev.Object = e.oldObject
+
+	return &e.ev, nil
+}
+
+func (w *watchNode) processEvent(e eventWrapper, isInitEvent bool) error {
+	if isInitEvent {
+		// Init events have already been vetted against the predicate and other RV behavior
+		// Let them pass through
+		w.outCh <- e.ev
+		return nil
+	}
+
+	valid, runDeleteFromFilteredListHandler, err := w.isValid(e)
+	if err != nil {
+		klog.Errorf("Could not determine validity of the event: %v", err)
+		return err
+	}
+	if valid {
+		if e.ev.Type == watch.Modified {
+			ev, err := w.handleAddedForFilteredList(e)
+			if err != nil {
+				return err
+			}
+			if ev != nil {
+				w.outCh <- *ev
+			} else {
+				// forward the original event if add handling didn't signal any impact
+				w.outCh <- e.ev
+			}
+		} else {
+			w.outCh <- e.ev
+		}
+		return nil
+	}
+
+	if runDeleteFromFilteredListHandler {
+		if e.ev.Type == watch.Modified {
+			ev, err := w.handleDeletedForFilteredList(e)
+			if err != nil {
+				return err
+			}
+			if ev != nil {
+				w.outCh <- *ev
+			}
+		} // explicitly doesn't have an event forward for the else case here
+		return nil
+	}
+
+	return nil
+}
+
+// Start sending events to this watch.
+func (w *watchNode) Start(initEvents ...watch.Event) {
+	w.s.mu.Lock()
+	w.s.nodes[w.id] = w
+	w.s.mu.Unlock()
+
+	go func() {
+		maxRV := uint64(0)
+		for _, ev := range initEvents {
+			currentRV, err := w.getResourceVersionAsInt(ev.Object)
+			if err != nil {
+				klog.Errorf("Could not determine init event RV for deduplication of buffered events: %v", err)
+				continue
+			}
+
+			if maxRV < currentRV {
+				maxRV = currentRV
+			}
+
+			if err := w.processEvent(eventWrapper{ev: ev}, true); err != nil {
+				klog.Errorf("Could not process event: %v", err)
+			}
+		}
+
+		// If we had no init events, simply rely on the passed RV
+		if maxRV == 0 {
+			maxRV = w.requestedRV
+		}
+
+		w.s.bufferedMutex.RLock()
+		for _, e := range w.s.buffered {
+			eventRV, err := w.getResourceVersionAsInt(e.ev.Object)
+			if err != nil {
+				klog.Errorf("Could not determine RV for deduplication of buffered events: %v", err)
+				continue
+			}
+
+			if maxRV >= eventRV {
+				continue
+			} else {
+				maxRV = eventRV
+			}
+
+			if err := w.processEvent(e, false); err != nil {
+				klog.Errorf("Could not process event: %v", err)
+			}
+		}
+		w.s.bufferedMutex.RUnlock()
+
+		for {
+			select {
+			case e, ok := <-w.updateCh:
+				if !ok {
+					close(w.outCh)
+					return
+				}
+
+				eventRV, err := w.getResourceVersionAsInt(e.ev.Object)
+				if err != nil {
+					klog.Errorf("Could not determine RV for deduplication of channel events: %v", err)
+					continue
+				}
+
+				if maxRV >= eventRV {
+					continue
+				} else {
+					maxRV = eventRV
+				}
+
+				if err := w.processEvent(e, false); err != nil {
+					klog.Errorf("Could not process event: %v", err)
+				}
+			case <-w.ctx.Done():
+				close(w.outCh)
+				return
+			}
+		}
+	}()
+}
+
+func (w *watchNode) Stop() {
+	w.s.mu.Lock()
+	defer w.s.mu.Unlock()
+	w.stop()
+}
+
+// Unprotected func: ensure mutex on the parent watch set is locked before calling
+func (w *watchNode) stop() {
+	if _, ok := w.s.nodes[w.id]; ok {
+		delete(w.s.nodes, w.id)
+		close(w.updateCh)
+	}
+}
+
+func (w *watchNode) ResultChan() <-chan watch.Event {
+	return w.outCh
+}
+
+func getResourceVersion(obj runtime.Object) (string, error) {
+	accessor, err := meta.Accessor(obj)
+	if err != nil {
+		klog.Error("Could not get accessor to object in event")
+		return "", err
+	}
+	return accessor.GetResourceVersion(), nil
+}
+
+func (w *watchNode) getResourceVersionAsInt(obj runtime.Object) (uint64, error) {
+	accessor, err := meta.Accessor(obj)
+	if err != nil {
+		klog.Error("Could not get accessor to object in event")
+		return 0, err
+	}
+
+	return w.versioner.ParseResourceVersion(accessor.GetResourceVersion())
+}
diff --git a/pkg/build/cmd/npm.go b/pkg/build/cmd/npm.go
index 13994fb4e19a4..ba35679f57a2b 100644
--- a/pkg/build/cmd/npm.go
+++ b/pkg/build/cmd/npm.go
@@ -3,7 +3,6 @@ package main
 import (
 	"fmt"
 	"os"
-	"os/exec"
 	"strings"
 
 	"github.com/urfave/cli/v2"
@@ -74,12 +73,6 @@ func NpmReleaseAction(c *cli.Context) error {
 		return fmt.Errorf("no tag version specified, exitting")
 	}
 
-	cmd := exec.Command("git", "checkout", ".")
-	if err := cmd.Run(); err != nil {
-		fmt.Println("command failed to run, err: ", err)
-		return err
-	}
-
 	err := npm.PublishNpmPackages(c.Context, tag)
 	if err != nil {
 		return err
diff --git a/pkg/build/cmd/publishstorybook.go b/pkg/build/cmd/publishstorybook.go
index b147d9a7b4029..e33366d8e4bdb 100644
--- a/pkg/build/cmd/publishstorybook.go
+++ b/pkg/build/cmd/publishstorybook.go
@@ -39,7 +39,7 @@ func PublishStorybookAction(c *cli.Context) error {
 		return err
 	}
 
-	if latest, err := isLatest(cfg); err != nil && latest {
+	if latest, err := isLatest(cfg); err == nil && latest {
 		log.Printf("Copying storybooks to latest...")
 		if err := gcs.CopyRemoteDir(c.Context, gcs.Bucket(cfg.srcBucket), fmt.Sprintf("artifacts/storybook/v%s", cfg.tag), bucket, "latest"); err != nil {
 			return err
diff --git a/pkg/build/config/version.go b/pkg/build/config/version.go
index 05b99cf46785c..2e93e0a6a228e 100644
--- a/pkg/build/config/version.go
+++ b/pkg/build/config/version.go
@@ -57,7 +57,7 @@ func (md *Metadata) GetReleaseMode() (ReleaseMode, error) {
 	return md.ReleaseMode, nil
 }
 
-// VersionMap is a map of versions. Each key of the Versions map is an event that uses the the config as the value for that key.
+// VersionMap is a map of versions. Each key of the Versions map is an event that uses the config as the value for that key.
 // For example, the 'pull_request' key will have data in it that might cause Grafana to be built differently in a pull request,
 // than the way it will be built in 'main'
 type VersionMap map[VersionMode]BuildConfig
diff --git a/pkg/build/config/versions.go b/pkg/build/config/versions.go
index ec28fe51b3541..d87c60d7ff021 100644
--- a/pkg/build/config/versions.go
+++ b/pkg/build/config/versions.go
@@ -7,9 +7,8 @@ var Versions = VersionMap{
 			VariantLinuxAmd64Musl,
 			VariantDarwinAmd64,
 			VariantWindowsAmd64,
-			// https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved
-			// VariantArm64,
-			// VariantArm64Musl,
+			VariantArm64,
+			VariantArm64Musl,
 		},
 		PluginSignature: PluginSignature{
 			Sign:      false,
@@ -28,10 +27,9 @@ var Versions = VersionMap{
 	},
 	MainMode: {
 		Variants: []Variant{
-			// https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved
-			// VariantArmV6,
-			// VariantArmV7,
-			// VariantArmV7Musl,
+			VariantArmV6,
+			VariantArmV7,
+			VariantArmV7Musl,
 			VariantArm64,
 			VariantArm64Musl,
 			VariantDarwinAmd64,
@@ -48,8 +46,7 @@ var Versions = VersionMap{
 			Architectures: []Architecture{
 				ArchAMD64,
 				ArchARM64,
-				// https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved
-				// ArchARMv7, // GOARCH=ARM is used for both armv6 and armv7. They are differentiated by the GOARM variable.
+				ArchARMv7, // GOARCH=ARM is used for both armv6 and armv7. They are differentiated by the GOARM variable.
 			},
 			Distribution: []Distribution{
 				Alpine,
@@ -65,10 +62,9 @@ var Versions = VersionMap{
 	},
 	DownstreamMode: {
 		Variants: []Variant{
-			// https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved
-			// VariantArmV6,
-			//VariantArmV7,
-			// VariantArmV7Musl,
+			VariantArmV6,
+			VariantArmV7,
+			VariantArmV7Musl,
 			VariantArm64,
 			VariantArm64Musl,
 			VariantDarwinAmd64,
@@ -85,8 +81,7 @@ var Versions = VersionMap{
 			Architectures: []Architecture{
 				ArchAMD64,
 				ArchARM64,
-				// https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved
-				// ArchARMv7, // GOARCH=ARM is used for both armv6 and armv7. They are differentiated by the GOARM variable.
+				ArchARMv7, // GOARCH=ARM is used for both armv6 and armv7. They are differentiated by the GOARM variable.
 			},
 			Distribution: []Distribution{
 				Alpine,
@@ -101,10 +96,9 @@ var Versions = VersionMap{
 	},
 	ReleaseBranchMode: {
 		Variants: []Variant{
-			// https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved
-			// VariantArmV6,
-			// VariantArmV7,
-			// VariantArmV7Musl,
+			VariantArmV6,
+			VariantArmV7,
+			VariantArmV7Musl,
 			VariantArm64,
 			VariantArm64Musl,
 			VariantDarwinAmd64,
@@ -137,10 +131,9 @@ var Versions = VersionMap{
 	},
 	TagMode: {
 		Variants: []Variant{
-			// https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved
-			// VariantArmV6,
-			// VariantArmV7,
-			// VariantArmV7Musl,
+			VariantArmV6,
+			VariantArmV7,
+			VariantArmV7Musl,
 			VariantArm64,
 			VariantArm64Musl,
 			VariantDarwinAmd64,
@@ -157,8 +150,7 @@ var Versions = VersionMap{
 			Architectures: []Architecture{
 				ArchAMD64,
 				ArchARM64,
-				// https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved
-				// ArchARMv7,
+				ArchARMv7,
 			},
 			Distribution: []Distribution{
 				Alpine,
@@ -177,10 +169,9 @@ var Versions = VersionMap{
 	},
 	Enterprise2Mode: {
 		Variants: []Variant{
-			// https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved
-			// VariantArmV6,
-			// VariantArmV7,
-			// VariantArmV7Musl,
+			VariantArmV6,
+			VariantArmV7,
+			VariantArmV7Musl,
 			VariantArm64,
 			VariantArm64Musl,
 			VariantDarwinAmd64,
@@ -197,8 +188,7 @@ var Versions = VersionMap{
 			Architectures: []Architecture{
 				ArchAMD64,
 				ArchARM64,
-				// https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved
-				// ArchARMv7,
+				ArchARMv7,
 			},
 			Distribution: []Distribution{
 				Alpine,
diff --git a/pkg/build/docker/build.go b/pkg/build/docker/build.go
index 29b2263e62bc3..8731ab7a247ca 100644
--- a/pkg/build/docker/build.go
+++ b/pkg/build/docker/build.go
@@ -70,7 +70,7 @@ func BuildImage(version string, arch config.Architecture, grafanaDir string, use
 	}
 
 	libc := "-musl"
-	baseImage := fmt.Sprintf("%salpine:3.18.3", baseArch)
+	baseImage := fmt.Sprintf("%salpine:3.18.5", baseArch)
 	tagSuffix := ""
 	if useUbuntu {
 		libc = ""
diff --git a/pkg/build/frontend/config_test.go b/pkg/build/frontend/config_test.go
index 21be441cc7a96..770df3be7a6b7 100644
--- a/pkg/build/frontend/config_test.go
+++ b/pkg/build/frontend/config_test.go
@@ -6,9 +6,10 @@ import (
 	"os"
 	"testing"
 
-	"github.com/grafana/grafana/pkg/build/config"
 	"github.com/stretchr/testify/require"
 	"github.com/urfave/cli/v2"
+
+	"github.com/grafana/grafana/pkg/build/config"
 )
 
 const (
diff --git a/pkg/build/wire/AUTHORS b/pkg/build/wire/AUTHORS
new file mode 100644
index 0000000000000..4d8d4b3197fd4
--- /dev/null
+++ b/pkg/build/wire/AUTHORS
@@ -0,0 +1,18 @@
+# This is the official list of Wire authors for copyright purposes.
+# This file is distinct from the CONTRIBUTORS files.
+# See the latter for an explanation.
+
+# Names should be added to this file as one of
+#     Organization's name
+#     Individual's name <submission email address>
+#     Individual's name <submission email address> <email2> <emailN>
+# See CONTRIBUTORS for the meaning of multiple email addresses.
+
+# Please keep the list sorted.
+
+Google LLC
+ktr <ktr@syfm.me>
+Kumbirai Tanekha <kumbirai.tanekha@gmail.com>
+Oleg Kovalov <iamolegkovalov@gmail.com>
+Yoichiro Shimizu <budougumi0617@gmail.com>
+Zachary Romero <zacromero3@gmail.com>
diff --git a/pkg/build/wire/CODE_OF_CONDUCT.md b/pkg/build/wire/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000000000..3a8545eccf627
--- /dev/null
+++ b/pkg/build/wire/CODE_OF_CONDUCT.md
@@ -0,0 +1,10 @@
+# Code of Conduct
+
+This project is covered under the [Go Code of Conduct][]. In summary:
+
+-   Treat everyone with respect and kindness.
+-   Be thoughtful in how you communicate.
+-   Don’t be destructive or inflammatory.
+-   If you encounter an issue, please mail conduct@golang.org.
+
+[Go Code of Conduct]: https://golang.org/conduct
diff --git a/pkg/build/wire/CONTRIBUTING.md b/pkg/build/wire/CONTRIBUTING.md
new file mode 100644
index 0000000000000..ee19499f4e5d5
--- /dev/null
+++ b/pkg/build/wire/CONTRIBUTING.md
@@ -0,0 +1,152 @@
+# How to Contribute
+
+We would love to accept your patches and contributions to this project. Here is
+how you can help.
+
+## Filing issues
+
+Filing issues is an important way you can contribute to the Wire Project. We
+want your feedback on things like bugs, desired API changes, or just anything
+that isn't working for you.
+
+### Bugs
+
+If your issue is a bug, open one
+[here](https://github.com/google/wire/issues/new). The easiest way to file an
+issue with all the right information is to run `go bug`. `go bug` will print out
+a handy template of questions and system information that will help us get to
+the root of the issue quicker.
+
+### Changes
+
+Unlike the core Go project, we do not have a formal proposal process for
+changes. If you have a change you would like to see in Wire, please file an
+issue with the necessary details.
+
+### Triaging
+
+The Go Cloud team triages issues at least every two weeks, but usually within
+two business days. Bugs or feature requests are either placed into a **Sprint**
+milestone which means the issue is intended to be worked on. Issues that we
+would like to address but do not have time for are placed into the [Unplanned][]
+milestone.
+
+[Unplanned]: https://github.com/google/wire/milestone/1
+
+## Contributing Code
+
+We love accepting contributions! If your change is minor, please feel free
+submit a [pull request](https://help.github.com/articles/about-pull-requests/).
+If your change is larger, or adds a feature, please file an issue beforehand so
+that we can discuss the change. You're welcome to file an implementation pull
+request immediately as well, although we generally lean towards discussing the
+change and then reviewing the implementation separately.
+
+### Finding something to work on
+
+If you want to write some code, but don't know where to start or what you might
+want to do, take a look at our [Unplanned][] milestone. This is where you can
+find issues we would like to address but can't currently find time for. See if
+any of the latest ones look interesting! If you need help before you can start
+work, you can comment on the issue and we will try to help as best we can.
+
+### Contributor License Agreement
+
+Contributions to this project can only be made by those who have signed Google's
+Contributor License Agreement. You (or your employer) retain the copyright to
+your contribution, this simply gives us permission to use and redistribute your
+contributions as part of the project. Head over to
+<https://cla.developers.google.com/> to see your current agreements on file or
+to sign a new one.
+
+As a personal contributor, you only need to sign the Google CLA once across all
+Google projects. If you've already signed the CLA, there is no need to do it
+again. If you are submitting code on behalf of your employer, there's
+[a separate corporate CLA that your employer manages for you](https://opensource.google.com/docs/cla/#external-contributors).
+
+## Making a pull request
+
+*   Follow the normal
+    [pull request flow](https://help.github.com/articles/creating-a-pull-request/)
+*   Build your changes using Go 1.11 with Go modules enabled. Wire's continuous
+    integration uses Go modules in order to ensure
+    [reproducible builds](https://research.swtch.com/vgo-repro).
+*   Test your changes using `go test ./...`. Please add tests that show the
+    change does what it says it does, even if there wasn't a test in the first
+    place.
+*   Feel free to make as many commits as you want; we will squash them all into
+    a single commit before merging your change.
+*   Check the diffs, write a useful description (including something like
+    `Fixes #123` if it's fixing a bug) and send the PR out.
+*   Github will run tests against the PR. This should
+    happen within 10 minutes or so. If a test fails, go back to the coding stage
+    and try to fix the test and push the same branch again. You won't need to
+    make a new pull request, the changes will be rolled directly into the PR you
+    already opened. Wait for the tests again. There is no need to assign a reviewer
+    to the PR, the project team will assign someone for review during the
+    standard [triage](#triaging) process.
+
+## Code review
+
+All submissions, including submissions by project members, require review. It is
+almost never the case that a pull request is accepted without some changes
+requested, so please do not be offended!
+
+When you have finished making requested changes to your pull request, please
+make a comment containing "PTAL" (Please Take Another Look) on your pull
+request. GitHub notifications can be noisy, and it is unfortunately easy for
+things to be lost in the shuffle.
+
+Once your PR is approved (hooray!) the reviewer will squash your commits into a
+single commit, and then merge the commit onto the Wire master branch. Thank you!
+
+## Github code review workflow conventions
+
+(For project members and frequent contributors.)
+
+As a contributor:
+
+-   Try hard to make each Pull Request as small and focused as possible. In
+    particular, this means that if a reviewer asks you to do something that is
+    beyond the scope of the Pull Request, the best practice is to file another
+    issue and reference it from the Pull Request rather than just adding more
+    commits to the existing PR.
+-   Adding someone as a Reviewer means "please feel free to look and comment";
+    the review is optional. Choose as many Reviewers as you'd like.
+-   Adding someone as an Assignee means that the Pull Request should not be
+    submitted until they approve. If you choose multiple Assignees, wait until
+    all of them approve. It is fine to ask someone if they are OK with being
+    removed as an Assignee.
+    -   Note that if you don't select any assignees, ContributeBot will turn all
+        of your Reviewers into Assignees.
+-   Make as many commits as you want locally, but try not to push them to Github
+    until you've addressed comments; this allows the email notification about
+    the push to be a signal to reviewers that the PR is ready to be looked at
+    again.
+-   When there may be confusion about what should happen next for a PR, be
+    explicit; add a "PTAL" comment if it is ready for review again, or a "Please
+    hold off on reviewing for now" if you are still working on addressing
+    comments.
+-   "Resolve" comments that you are sure you've addressed; let your reviewers
+    resolve ones that you're not sure about.
+-   Do not use `git push --force`; this can cause comments from your reviewers
+    that are associated with a specific commit to be lost. This implies that
+    once you've sent a Pull Request, you should use `git merge` instead of `git
+    rebase` to incorporate commits from the master branch.
+
+As a reviewer:
+
+-   Be timely in your review process, especially if you are an Assignee.
+-   Try to use `Start a Review` instead of single comments, to reduce email
+    spam.
+-   "Resolve" your own comments if they have been addressed.
+-   If you want your review to be blocking, and are not currently an Assignee,
+    add yourself as an Assignee.
+
+When squashing-and-merging:
+
+-   Ensure that **all** of the Assignees have approved.
+-   Do a final review of the one-line PR summary, ensuring that it accurately
+    describes the change.
+-   Delete the automatically added commit lines; these are generally not
+    interesting and make commit history harder to read.
diff --git a/pkg/build/wire/CONTRIBUTORS b/pkg/build/wire/CONTRIBUTORS
new file mode 100644
index 0000000000000..00a94f89caa1e
--- /dev/null
+++ b/pkg/build/wire/CONTRIBUTORS
@@ -0,0 +1,43 @@
+# This is the official list of people who can contribute
+# (and typically have contributed) code to the Wire repository.
+# The AUTHORS file lists the copyright holders; this file
+# lists people.  For example, Google employees are listed here
+# but not in AUTHORS, because Google holds the copyright.
+#
+# Names should be added to this file only after verifying that
+# the individual or the individual's organization has agreed to
+# the appropriate Contributor License Agreement, found here:
+#
+#     http://code.google.com/legal/individual-cla-v1.0.html
+#     http://code.google.com/legal/corporate-cla-v1.0.html
+#
+# The agreement for individuals can be filled out on the web.
+#
+# When adding J Random Contributor's name to this file,
+# either J's name or J's organization's name should be
+# added to the AUTHORS file, depending on whether the
+# individual or corporate CLA was used.
+
+# Names should be added to this file like so:
+#     Individual's name <submission email address>
+#     Individual's name <submission email address> <email2> <emailN>
+#
+# An entry with multiple email addresses specifies that the
+# first address should be used in the submit logs and
+# that the other addresses should be recognized as the
+# same person when interacting with Git.
+
+# Please keep the list sorted.
+
+Chris Lewis <cflewis@google.com> <cflewis@golang.org> <c@chris.to>
+Christina Austin <4240737+clausti@users.noreply.github.com>
+Eno Compton <enocom@google.com>
+Issac Trotts <issactrotts@google.com> <issac.trotts@gmail.com>
+ktr <ktr@syfm.me>
+Kumbirai Tanekha <kumbirai.tanekha@gmail.com>
+Oleg Kovalov <iamolegkovalov@gmail.com>
+Robert van Gent <rvangent@google.com> <vangent@gmail.com>
+Ross Light <light@google.com> <ross@zombiezen.com>
+Tuo Shan <shantuo@google.com> <sturbo89@gmail.com>
+Yoichiro Shimizu <budougumi0617@gmail.com>
+Zachary Romero <zacromero3@gmail.com>
diff --git a/pkg/build/wire/LICENSE b/pkg/build/wire/LICENSE
new file mode 100644
index 0000000000000..d645695673349
--- /dev/null
+++ b/pkg/build/wire/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/pkg/build/wire/README.md b/pkg/build/wire/README.md
new file mode 100644
index 0000000000000..ccafb0e27f220
--- /dev/null
+++ b/pkg/build/wire/README.md
@@ -0,0 +1,60 @@
+# Wire: Automated Initialization in Go
+
+[![Build Status](https://github.com/google/wire/actions/workflows/tests.yml/badge.svg?branch=main)](https://github.com/google/wire/actions)
+[![godoc](https://godoc.org/github.com/google/wire?status.svg)][godoc]
+[![Coverage](https://codecov.io/gh/google/wire/branch/master/graph/badge.svg)](https://codecov.io/gh/google/wire)
+
+
+Wire is a code generation tool that automates connecting components using
+[dependency injection][]. Dependencies between components are represented in
+Wire as function parameters, encouraging explicit initialization instead of
+global variables. Because Wire operates without runtime state or reflection,
+code written to be used with Wire is useful even for hand-written
+initialization.
+
+For an overview, see the [introductory blog post][].
+
+[dependency injection]: https://en.wikipedia.org/wiki/Dependency_injection
+[introductory blog post]: https://blog.golang.org/wire
+[godoc]: https://godoc.org/github.com/google/wire
+[travis]: https://travis-ci.com/google/wire
+
+## Installing
+
+Install Wire by running:
+
+```shell
+go install github.com/google/wire/cmd/wire@latest
+```
+
+and ensuring that `$GOPATH/bin` is added to your `$PATH`.
+
+## Documentation
+
+- [Tutorial][]
+- [User Guide][]
+- [Best Practices][]
+- [FAQ][]
+
+[Tutorial]: ./_tutorial/README.md
+[Best Practices]: ./docs/best-practices.md
+[FAQ]: ./docs/faq.md
+[User Guide]: ./docs/guide.md
+
+## Project status
+
+As of version v0.3.0, Wire is *beta* and is considered feature complete. It
+works well for the tasks it was designed to perform, and we prefer to keep it
+as simple as possible.
+
+We'll not be accepting new features at this time, but will gladly accept bug
+reports and fixes.
+
+## Community
+
+For questions, please use [GitHub Discussions](https://github.com/google/wire/discussions).
+
+This project is covered by the Go [Code of Conduct][].
+
+[Code of Conduct]: ./CODE_OF_CONDUCT.md
+[go-cloud mailing list]: https://groups.google.com/forum/#!forum/go-cloud
diff --git a/pkg/build/wire/_tutorial/README.md b/pkg/build/wire/_tutorial/README.md
new file mode 100644
index 0000000000000..f39fba2bb6e89
--- /dev/null
+++ b/pkg/build/wire/_tutorial/README.md
@@ -0,0 +1,419 @@
+# Wire Tutorial
+
+Let's learn to use Wire by example. The [Wire guide][guide] provides thorough
+documentation of the tool's usage. For readers eager to see Wire applied to a
+larger server, the [guestbook sample in Go Cloud][guestbook] uses Wire to
+initialize its components. Here we are going to build a small greeter program to
+understand how to use Wire. The finished product may be found in the same
+directory as this README.
+
+[guestbook]: https://github.com/google/go-cloud/tree/master/samples/guestbook
+[guide]:     https://github.com/google/wire/blob/master/docs/guide.md
+
+## A First Pass of Building the Greeter Program
+
+Let's create a small program that simulates an event with a greeter greeting
+guests with a particular message.
+
+To start, we will create three types: 1) a message for a greeter, 2) a greeter
+who conveys that message, and 3) an event that starts with the greeter greeting
+guests. In this design, we have three `struct` types:
+
+``` go
+type Message string
+
+type Greeter struct {
+    // ... TBD
+}
+
+type Event struct {
+    // ... TBD
+}
+```
+
+The `Message` type just wraps a string. For now, we will create a simple
+initializer that always returns a hard-coded message:
+
+``` go
+func NewMessage() Message {
+    return Message("Hi there!")
+}
+```
+
+Our `Greeter` will need reference to the `Message`. So let's create an
+initializer for our `Greeter` as well.
+
+``` go
+func NewGreeter(m Message) Greeter {
+    return Greeter{Message: m}
+}
+
+type Greeter struct {
+    Message Message // <- adding a Message field
+}
+```
+
+In the initializer we assign a `Message` field to `Greeter`. Now, we can use the
+`Message` when we create a `Greet` method on `Greeter`:
+
+``` go
+func (g Greeter) Greet() Message {
+    return g.Message
+}
+```
+
+Next, we need our `Event` to have a `Greeter`, so we will create an initializer
+for it as well.
+
+``` go
+func NewEvent(g Greeter) Event {
+    return Event{Greeter: g}
+}
+
+type Event struct {
+    Greeter Greeter // <- adding a Greeter field
+}
+```
+
+Then we add a method to start the `Event`:
+
+``` go
+func (e Event) Start() {
+    msg := e.Greeter.Greet()
+    fmt.Println(msg)
+}
+```
+
+The `Start` method holds the core of our small application: it tells the
+greeter to issue a greeting and then prints that message to the screen.
+
+Now that we have all the components of our application ready, let's see what it
+takes to initialize all the components without using Wire. Our main function
+would look like this:
+
+``` go
+func main() {
+    message := NewMessage()
+    greeter := NewGreeter(message)
+    event := NewEvent(greeter)
+
+    event.Start()
+}
+```
+
+First we create a message, then we create a greeter with that message, and
+finally we create an event with that greeter. With all the initialization done,
+we're ready to start our event.
+
+We are using the [dependency injection][di] design principle. In practice, that
+means we pass in whatever each component needs. This style of design lends
+itself to writing easily tested code and makes it easy to swap out one
+dependency with another.
+
+[di]: https://stackoverflow.com/questions/130794/what-is-dependency-injection
+
+## Using Wire to Generate Code
+
+One downside to dependency injection is the need for so many initialization
+steps. Let's see how we can use Wire to make the process of initializing our
+components smoother.
+
+Let's start by changing our `main` function to look like this:
+
+``` go
+func main() {
+    e := InitializeEvent()
+
+    e.Start()
+}
+```
+
+Next, in a separate file called `wire.go` we will define `InitializeEvent`.
+This is where things get interesting:
+
+``` go
+// wire.go
+
+func InitializeEvent() Event {
+    wire.Build(NewEvent, NewGreeter, NewMessage)
+    return Event{}
+}
+```
+
+Rather than go through the trouble of initializing each component in turn and
+passing it into the next one, we instead have a single call to `wire.Build`
+passing in the initializers we want to use. In Wire, initializers are known as
+"providers," functions which provide a particular type. We add a zero value for
+`Event` as a return value to satisfy the compiler. Note that even if we add
+values to `Event`, Wire will ignore them. In fact, the injector's purpose is to
+provide information about which providers to use to construct an `Event` and so
+we will exclude it from our final binary with a build constraint at the top of
+the file:
+
+``` go
+//+build wireinject
+
+```
+
+Note, a [build constraint][constraint] requires a blank, trailing line.
+
+In Wire parlance, `InitializeEvent` is an "injector." Now that we have our
+injector complete, we are ready to use the `wire` command line tool.
+
+Install the tool with:
+
+``` shell
+go install github.com/google/wire/cmd/wire@latest
+```
+
+Then in the same directory with the above code, simply run `wire`. Wire will
+find the `InitializeEvent` injector and generate a function whose body is
+filled out with all the necessary initialization steps. The result will be
+written to a file named `wire_gen.go`.
+
+Let's take a look at what Wire did for us:
+
+``` go
+// wire_gen.go
+
+func InitializeEvent() Event {
+    message := NewMessage()
+    greeter := NewGreeter(message)
+    event := NewEvent(greeter)
+    return event
+}
+```
+
+It looks just like what we wrote above! Now this is a simple example with just
+three components, so writing the initializer by hand isn't too painful. Imagine
+how useful Wire is for components that are much more complex. When working with
+Wire, we will commit both `wire.go` and `wire_gen.go` to source control.
+
+[constraint]: https://godoc.org/go/build#hdr-Build_Constraints
+
+## Making Changes with Wire
+
+To show a small part of how Wire handles more complex setups, let's refactor
+our initializer for `Event` to return an error and see what happens.
+
+``` go
+func NewEvent(g Greeter) (Event, error) {
+    if g.Grumpy {
+        return Event{}, errors.New("could not create event: event greeter is grumpy")
+    }
+    return Event{Greeter: g}, nil
+}
+```
+
+We'll say that sometimes a `Greeter` might be grumpy and so we cannot create
+an `Event`. The `NewGreeter` initializer now looks like this:
+
+``` go
+func NewGreeter(m Message) Greeter {
+    var grumpy bool
+    if time.Now().Unix()%2 == 0 {
+        grumpy = true
+    }
+    return Greeter{Message: m, Grumpy: grumpy}
+}
+```
+
+We have added a `Grumpy` field to `Greeter` struct and if the invocation time
+of the initializer is an even number of seconds since the Unix epoch, we will
+create a grumpy greeter instead of a friendly one.
+
+The `Greet` method then becomes:
+
+``` go
+func (g Greeter) Greet() Message {
+    if g.Grumpy {
+        return Message("Go away!")
+    }
+    return g.Message
+}
+```
+
+Now you see how a grumpy `Greeter` is no good for an `Event`. So `NewEvent` may
+fail. Our `main` must now take into account that `InitializeEvent` may in fact
+fail:
+
+``` go
+func main() {
+    e, err := InitializeEvent()
+    if err != nil {
+        fmt.Printf("failed to create event: %s\n", err)
+        os.Exit(2)
+    }
+    e.Start()
+}
+```
+
+We also need to update `InitializeEvent` to add an `error` type to the return value:
+
+``` go
+// wire.go
+
+func InitializeEvent() (Event, error) {
+    wire.Build(NewEvent, NewGreeter, NewMessage)
+    return Event{}, nil
+}
+```
+
+With the setup complete, we are ready to invoke the `wire` command again. Note,
+that after running `wire` once to produce a `wire_gen.go` file, we may also use
+`go generate`. Having run the command, our `wire_gen.go` file looks like
+this:
+
+``` go
+// wire_gen.go
+
+func InitializeEvent() (Event, error) {
+    message := NewMessage()
+    greeter := NewGreeter(message)
+    event, err := NewEvent(greeter)
+    if err != nil {
+        return Event{}, err
+    }
+    return event, nil
+}
+```
+
+Wire has detected that the `NewEvent` provider may fail and has done the right
+thing inside the generated code: it checks the error and returns early if one
+is present.
+
+## Changing the Injector Signature
+
+As another improvement, let's look at how Wire generates code based on the
+signature of the injector. Presently, we have hard-coded the message inside
+`NewMessage`. In practice, it's much nicer to allow callers to change that
+message however they see fit. So let's change `InitializeEvent` to look like
+this:
+
+``` go
+func InitializeEvent(phrase string) (Event, error) {
+    wire.Build(NewEvent, NewGreeter, NewMessage)
+    return Event{}, nil
+}
+```
+
+Now `InitializeEvent` allows callers to pass in the `phrase` for a `Greeter` to
+use. We also add a `phrase` argument to `NewMessage`:
+
+``` go
+func NewMessage(phrase string) Message {
+    return Message(phrase)
+}
+```
+
+After we run `wire` again, we will see that the tool has generated an
+initializer which passes the `phrase` value as a `Message` into `Greeter`.
+Neat!
+
+``` go
+// wire_gen.go
+
+func InitializeEvent(phrase string) (Event, error) {
+    message := NewMessage(phrase)
+    greeter := NewGreeter(message)
+    event, err := NewEvent(greeter)
+    if err != nil {
+        return Event{}, err
+    }
+    return event, nil
+}
+```
+
+Wire inspects the arguments to the injector, sees that we added a string to the
+list of arguments (e.g., `phrase`), and likewise sees that among all the
+providers, `NewMessage` takes a string, and so it passes `phrase` into
+`NewMessage`.
+
+## Catching Mistakes with Helpful Errors
+
+Let's also look at what happens when Wire detects mistakes in our code and see
+how Wire's error messages help us correct any problems.
+
+For example, when writing our injector `InitializeEvent`, let's say we forget
+to add a provider for `Greeter`. Let's see what happens:
+
+``` go
+func InitializeEvent(phrase string) (Event, error) {
+    wire.Build(NewEvent, NewMessage) // woops! We forgot to add a provider for Greeter
+    return Event{}, nil
+}
+```
+
+Running `wire`, we see the following:
+
+``` shell
+# wrapping the error across lines for readability
+$GOPATH/src/github.com/google/wire/_tutorial/wire.go:24:1:
+inject InitializeEvent: no provider found for github.com/google/wire/_tutorial.Greeter
+(required by provider of github.com/google/wire/_tutorial.Event)
+wire: generate failed
+```
+
+Wire is telling us some useful information: it cannot find a provider for
+`Greeter`. Note that the error message prints out the full path to the
+`Greeter` type. It's also telling us the line number and injector name where
+the problem occurred: line 24 inside `InitializeEvent`. In addition, the error
+message tells us which provider needs a `Greeter`. It's the `Event` type. Once
+we pass in a provider of `Greeter`, the problem will be solved.
+
+Alternatively, what happens if we provide one too many providers to `wire.Build`?
+
+``` go
+func NewEventNumber() int  {
+    return 1
+}
+
+func InitializeEvent(phrase string) (Event, error) {
+     // woops! NewEventNumber is unused.
+    wire.Build(NewEvent, NewGreeter, NewMessage, NewEventNumber)
+    return Event{}, nil
+}
+```
+
+Wire helpfully tells us that we have an unused provider:
+
+``` shell
+$GOPATH/src/github.com/google/wire/_tutorial/wire.go:24:1:
+inject InitializeEvent: unused provider "NewEventNumber"
+wire: generate failed
+```
+
+Deleting the unused provider from the call to `wire.Build` resolves the error.
+
+## Conclusion
+
+Let's summarize what we have done here. First, we wrote a number of components
+with corresponding initializers, or providers. Next, we created an injector
+function, specifying which arguments it receives and which types it returns.
+Then, we filled in the injector function with a call to `wire.Build` supplying
+all necessary providers. Finally, we ran the `wire` command to generate code
+that wires up all the different initializers. When we added an argument to the
+injector and an error return value, running `wire` again made all the necessary
+updates to our generated code.
+
+The example here is small, but it demonstrates some of the power of Wire, and
+how it takes much of the pain out of initializing code using dependency
+injection. Furthermore, using Wire produced code that looks much like what we
+would otherwise write. There are no bespoke types that commit a user to Wire.
+Instead it's just generated code. We may do with it what we will. Finally,
+another point worth considering is how easy it is to add new dependencies to
+our component initialization. As long as we tell Wire how to provide (i.e.,
+initialize) a component, we may add that component anywhere in the dependency
+graph and Wire will handle the rest.
+
+In closing, it is worth mentioning that Wire supports a number of additional
+features not discussed here. Providers may be grouped in [provider sets][sets].
+There is support for [binding interfaces][interfaces], [binding
+values][values], as well as support for [cleanup functions][cleanup]. See the
+[Advanced Features][advanced] section for more.
+
+[advanced]:   https://github.com/google/wire/blob/master/docs/guide.md#advanced-features
+[cleanup]:    https://github.com/google/wire/blob/master/docs/guide.md#cleanup-functions
+[interfaces]: https://github.com/google/wire/blob/master/docs/guide.md#binding-interfaces
+[sets]:       https://github.com/google/wire/blob/master/docs/guide.md#defining-providers
+[values]:     https://github.com/google/wire/blob/master/docs/guide.md#binding-values
diff --git a/pkg/build/wire/_tutorial/main.go b/pkg/build/wire/_tutorial/main.go
new file mode 100644
index 0000000000000..b00e5b8a40605
--- /dev/null
+++ b/pkg/build/wire/_tutorial/main.go
@@ -0,0 +1,83 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// The greeter binary simulates an event with greeters greeting guests.
+package main
+
+import (
+	"errors"
+	"fmt"
+	"os"
+	"time"
+)
+
+// Message is what greeters will use to greet guests.
+type Message string
+
+// NewMessage creates a default Message.
+func NewMessage(phrase string) Message {
+	return Message(phrase)
+}
+
+// NewGreeter initializes a Greeter. If the current epoch time is an even
+// number, NewGreeter will create a grumpy Greeter.
+func NewGreeter(m Message) Greeter {
+	var grumpy bool
+	if time.Now().Unix()%2 == 0 {
+		grumpy = true
+	}
+	return Greeter{Message: m, Grumpy: grumpy}
+}
+
+// Greeter is the type charged with greeting guests.
+type Greeter struct {
+	Grumpy  bool
+	Message Message
+}
+
+// Greet produces a greeting for guests.
+func (g Greeter) Greet() Message {
+	if g.Grumpy {
+		return Message("Go away!")
+	}
+	return g.Message
+}
+
+// NewEvent creates an event with the specified greeter.
+func NewEvent(g Greeter) (Event, error) {
+	if g.Grumpy {
+		return Event{}, errors.New("could not create event: event greeter is grumpy")
+	}
+	return Event{Greeter: g}, nil
+}
+
+// Event is a gathering with greeters.
+type Event struct {
+	Greeter Greeter
+}
+
+// Start ensures the event starts with greeting all guests.
+func (e Event) Start() {
+	msg := e.Greeter.Greet()
+	fmt.Println(msg)
+}
+
+func main() {
+	e, err := InitializeEvent("hi there!")
+	if err != nil {
+		fmt.Printf("failed to create event: %s\n", err)
+		os.Exit(2)
+	}
+	e.Start()
+}
diff --git a/pkg/build/wire/_tutorial/wire.go b/pkg/build/wire/_tutorial/wire.go
new file mode 100644
index 0000000000000..2b467dd679100
--- /dev/null
+++ b/pkg/build/wire/_tutorial/wire.go
@@ -0,0 +1,28 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build wireinject
+// +build wireinject
+
+// The build tag makes sure the stub is not built in the final build.
+package main
+
+import "github.com/grafana/grafana/pkg/build/wire"
+
+// InitializeEvent creates an Event. It will error if the Event is staffed with
+// a grumpy greeter.
+func InitializeEvent(phrase string) (Event, error) {
+	wire.Build(NewEvent, NewGreeter, NewMessage)
+	return Event{}, nil
+}
diff --git a/pkg/build/wire/_tutorial/wire_gen.go b/pkg/build/wire/_tutorial/wire_gen.go
new file mode 100644
index 0000000000000..fe54ab77917f7
--- /dev/null
+++ b/pkg/build/wire/_tutorial/wire_gen.go
@@ -0,0 +1,19 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func InitializeEvent(phrase string) (Event, error) {
+	message := NewMessage(phrase)
+	greeter := NewGreeter(message)
+	event, err := NewEvent(greeter)
+	if err != nil {
+		return Event{}, err
+	}
+	return event, nil
+}
diff --git a/pkg/build/wire/cmd/wire/main.go b/pkg/build/wire/cmd/wire/main.go
new file mode 100644
index 0000000000000..af79d29115ca8
--- /dev/null
+++ b/pkg/build/wire/cmd/wire/main.go
@@ -0,0 +1,609 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Wire is a compile-time dependency injection tool.
+//
+// For an overview, see https://github.com/google/wire/blob/master/README.md
+package main
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"go/token"
+	"go/types"
+	"io/ioutil"
+	"log"
+	"os"
+	"reflect"
+	"sort"
+	"strconv"
+	"strings"
+
+	"github.com/google/subcommands"
+	"github.com/grafana/grafana/pkg/build/wire/internal/wire"
+	"github.com/pmezard/go-difflib/difflib"
+	"golang.org/x/tools/go/types/typeutil"
+)
+
+func main() {
+	subcommands.Register(subcommands.CommandsCommand(), "")
+	subcommands.Register(subcommands.FlagsCommand(), "")
+	subcommands.Register(subcommands.HelpCommand(), "")
+	subcommands.Register(&checkCmd{}, "")
+	subcommands.Register(&diffCmd{}, "")
+	subcommands.Register(&genCmd{}, "")
+	subcommands.Register(&showCmd{}, "")
+	flag.Parse()
+
+	// Initialize the default logger to log to stderr.
+	log.SetFlags(0)
+	log.SetPrefix("wire: ")
+	log.SetOutput(os.Stderr)
+
+	// TODO(rvangent): Use subcommands's VisitCommands instead of hardcoded map,
+	// once there is a release that contains it:
+	// allCmds := map[string]bool{}
+	// subcommands.DefaultCommander.VisitCommands(func(_ *subcommands.CommandGroup, cmd subcommands.Command) { allCmds[cmd.Name()] = true })
+	allCmds := map[string]bool{
+		"commands": true, // builtin
+		"help":     true, // builtin
+		"flags":    true, // builtin
+		"check":    true,
+		"diff":     true,
+		"gen":      true,
+		"show":     true,
+	}
+	// Default to running the "gen" command.
+	if args := flag.Args(); len(args) == 0 || !allCmds[args[0]] {
+		genCmd := &genCmd{}
+		os.Exit(int(genCmd.Execute(context.Background(), flag.CommandLine)))
+	}
+	os.Exit(int(subcommands.Execute(context.Background())))
+}
+
+// packages returns the slice of packages to run wire over based on f.
+// It defaults to ".".
+func packages(f *flag.FlagSet) []string {
+	pkgs := f.Args()
+	if len(pkgs) == 0 {
+		pkgs = []string{"."}
+	}
+	return pkgs
+}
+
+// newGenerateOptions returns an initialized wire.GenerateOptions, possibly
+// with the Header option set.
+func newGenerateOptions(headerFile string) (*wire.GenerateOptions, error) {
+	opts := new(wire.GenerateOptions)
+	if headerFile != "" {
+		var err error
+		opts.Header, err = ioutil.ReadFile(headerFile)
+		if err != nil {
+			return nil, fmt.Errorf("failed to read header file %q: %v", headerFile, err)
+		}
+	}
+	return opts, nil
+}
+
+type genCmd struct {
+	headerFile     string
+	prefixFileName string
+	tags           string
+}
+
+func (*genCmd) Name() string { return "gen" }
+func (*genCmd) Synopsis() string {
+	return "generate the wire_gen.go file for each package"
+}
+func (*genCmd) Usage() string {
+	return `gen [packages]
+
+  Given one or more packages, gen creates the wire_gen.go file for each.
+
+  If no packages are listed, it defaults to ".".
+`
+}
+func (cmd *genCmd) SetFlags(f *flag.FlagSet) {
+	f.StringVar(&cmd.headerFile, "header_file", "", "path to file to insert as a header in wire_gen.go")
+	f.StringVar(&cmd.prefixFileName, "output_file_prefix", "", "string to prepend to output file names.")
+	f.StringVar(&cmd.tags, "tags", "", "append build tags to the default wirebuild")
+}
+
+func (cmd *genCmd) Execute(ctx context.Context, f *flag.FlagSet, args ...interface{}) subcommands.ExitStatus {
+	wd, err := os.Getwd()
+	if err != nil {
+		log.Println("failed to get working directory: ", err)
+		return subcommands.ExitFailure
+	}
+	opts, err := newGenerateOptions(cmd.headerFile)
+	if err != nil {
+		log.Println(err)
+		return subcommands.ExitFailure
+	}
+
+	opts.PrefixOutputFile = cmd.prefixFileName
+	opts.Tags = cmd.tags
+
+	outs, errs := wire.Generate(ctx, wd, os.Environ(), packages(f), opts)
+	if len(errs) > 0 {
+		logErrors(errs)
+		log.Println("generate failed")
+		return subcommands.ExitFailure
+	}
+	if len(outs) == 0 {
+		return subcommands.ExitSuccess
+	}
+	success := true
+	for _, out := range outs {
+		if len(out.Errs) > 0 {
+			logErrors(out.Errs)
+			log.Printf("%s: generate failed\n", out.PkgPath)
+			success = false
+		}
+		if len(out.Content) == 0 {
+			// No Wire output. Maybe errors, maybe no Wire directives.
+			continue
+		}
+		if err := out.Commit(); err == nil {
+			log.Printf("%s: wrote %s\n", out.PkgPath, out.OutputPath)
+		} else {
+			log.Printf("%s: failed to write %s: %v\n", out.PkgPath, out.OutputPath, err)
+			success = false
+		}
+	}
+	if !success {
+		log.Println("at least one generate failure")
+		return subcommands.ExitFailure
+	}
+	return subcommands.ExitSuccess
+}
+
+type diffCmd struct {
+	headerFile string
+	tags       string
+}
+
+func (*diffCmd) Name() string { return "diff" }
+func (*diffCmd) Synopsis() string {
+	return "output a diff between existing wire_gen.go files and what gen would generate"
+}
+func (*diffCmd) Usage() string {
+	return `diff [packages]
+
+  Given one or more packages, diff generates the content for their wire_gen.go
+  files and outputs the diff against the existing files.
+
+  If no packages are listed, it defaults to ".".
+
+  Similar to the diff command, it returns 0 if no diff, 1 if different, 2
+  plus an error if trouble.
+`
+}
+func (cmd *diffCmd) SetFlags(f *flag.FlagSet) {
+	f.StringVar(&cmd.headerFile, "header_file", "", "path to file to insert as a header in wire_gen.go")
+	f.StringVar(&cmd.tags, "tags", "", "append build tags to the default wirebuild")
+}
+func (cmd *diffCmd) Execute(ctx context.Context, f *flag.FlagSet, args ...interface{}) subcommands.ExitStatus {
+	const (
+		errReturn  = subcommands.ExitStatus(2)
+		diffReturn = subcommands.ExitStatus(1)
+	)
+	wd, err := os.Getwd()
+	if err != nil {
+		log.Println("failed to get working directory: ", err)
+		return errReturn
+	}
+	opts, err := newGenerateOptions(cmd.headerFile)
+	if err != nil {
+		log.Println(err)
+		return subcommands.ExitFailure
+	}
+
+	opts.Tags = cmd.tags
+
+	outs, errs := wire.Generate(ctx, wd, os.Environ(), packages(f), opts)
+	if len(errs) > 0 {
+		logErrors(errs)
+		log.Println("generate failed")
+		return errReturn
+	}
+	if len(outs) == 0 {
+		return subcommands.ExitSuccess
+	}
+	success := true
+	hadDiff := false
+	for _, out := range outs {
+		if len(out.Errs) > 0 {
+			logErrors(out.Errs)
+			log.Printf("%s: generate failed\n", out.PkgPath)
+			success = false
+		}
+		if len(out.Content) == 0 {
+			// No Wire output. Maybe errors, maybe no Wire directives.
+			continue
+		}
+		// Assumes the current file is empty if we can't read it.
+		cur, _ := ioutil.ReadFile(out.OutputPath)
+		if diff, err := difflib.GetUnifiedDiffString(difflib.UnifiedDiff{
+			A: difflib.SplitLines(string(cur)),
+			B: difflib.SplitLines(string(out.Content)),
+		}); err == nil {
+			if diff != "" {
+				// Print the actual diff to stdout, not stderr.
+				fmt.Printf("%s: diff from %s:\n%s\n", out.PkgPath, out.OutputPath, diff)
+				hadDiff = true
+			}
+		} else {
+			log.Printf("%s: failed to diff %s: %v\n", out.PkgPath, out.OutputPath, err)
+			success = false
+		}
+	}
+	if !success {
+		log.Println("at least one generate failure")
+		return errReturn
+	}
+	if hadDiff {
+		return diffReturn
+	}
+	return subcommands.ExitSuccess
+}
+
+type showCmd struct {
+	tags string
+}
+
+func (*showCmd) Name() string { return "show" }
+func (*showCmd) Synopsis() string {
+	return "describe all top-level provider sets"
+}
+func (*showCmd) Usage() string {
+	return `show [packages]
+
+  Given one or more packages, show finds all the provider sets declared as
+  top-level variables and prints what other provider sets they import and what
+  outputs they can produce, given possible inputs. It also lists any injector
+  functions defined in the package.
+
+  If no packages are listed, it defaults to ".".
+`
+}
+func (cmd *showCmd) SetFlags(f *flag.FlagSet) {
+	f.StringVar(&cmd.tags, "tags", "", "append build tags to the default wirebuild")
+}
+func (cmd *showCmd) Execute(ctx context.Context, f *flag.FlagSet, args ...interface{}) subcommands.ExitStatus {
+	wd, err := os.Getwd()
+	if err != nil {
+		log.Println("failed to get working directory: ", err)
+		return subcommands.ExitFailure
+	}
+	info, errs := wire.Load(ctx, wd, os.Environ(), cmd.tags, packages(f))
+	if info != nil {
+		keys := make([]wire.ProviderSetID, 0, len(info.Sets))
+		for k := range info.Sets {
+			keys = append(keys, k)
+		}
+		sort.Slice(keys, func(i, j int) bool {
+			if keys[i].ImportPath == keys[j].ImportPath {
+				return keys[i].VarName < keys[j].VarName
+			}
+			return keys[i].ImportPath < keys[j].ImportPath
+		})
+		for i, k := range keys {
+			if i > 0 {
+				fmt.Println()
+			}
+			outGroups, imports := gather(info, k)
+			fmt.Println(k)
+			for _, imp := range sortSet(imports) {
+				fmt.Printf("\t%s\n", imp)
+			}
+			for i := range outGroups {
+				fmt.Printf("\tOutputs given %s:\n", outGroups[i].name)
+				out := make(map[string]token.Pos, outGroups[i].outputs.Len())
+				outGroups[i].outputs.Iterate(func(t types.Type, v interface{}) {
+					switch v := v.(type) {
+					case *wire.Provider:
+						out[types.TypeString(t, nil)] = v.Pos
+					case *wire.Value:
+						out[types.TypeString(t, nil)] = v.Pos
+					case *wire.Field:
+						out[types.TypeString(t, nil)] = v.Pos
+					default:
+						panic("unreachable")
+					}
+				})
+				for _, t := range sortSet(out) {
+					fmt.Printf("\t\t%s\n", t)
+					fmt.Printf("\t\t\tat %v\n", info.Fset.Position(out[t]))
+				}
+			}
+		}
+		if len(info.Injectors) > 0 {
+			injectors := append([]*wire.Injector(nil), info.Injectors...)
+			sort.Slice(injectors, func(i, j int) bool {
+				if injectors[i].ImportPath == injectors[j].ImportPath {
+					return injectors[i].FuncName < injectors[j].FuncName
+				}
+				return injectors[i].ImportPath < injectors[j].ImportPath
+			})
+			fmt.Println("\nInjectors:")
+			for _, in := range injectors {
+				fmt.Printf("\t%v\n", in)
+			}
+		}
+	}
+	if len(errs) > 0 {
+		logErrors(errs)
+		log.Println("error loading packages")
+		return subcommands.ExitFailure
+	}
+	return subcommands.ExitSuccess
+}
+
+type checkCmd struct {
+	tags string
+}
+
+func (*checkCmd) Name() string { return "check" }
+func (*checkCmd) Synopsis() string {
+	return "print any Wire errors found"
+}
+func (*checkCmd) Usage() string {
+	return `check [-tags tag,list] [packages]
+
+  Given one or more packages, check prints any type-checking or Wire errors
+  found with top-level variable provider sets or injector functions.
+
+  If no packages are listed, it defaults to ".".
+`
+}
+func (cmd *checkCmd) SetFlags(f *flag.FlagSet) {
+	f.StringVar(&cmd.tags, "tags", "", "append build tags to the default wirebuild")
+}
+func (cmd *checkCmd) Execute(ctx context.Context, f *flag.FlagSet, args ...interface{}) subcommands.ExitStatus {
+	wd, err := os.Getwd()
+	if err != nil {
+		log.Println("failed to get working directory: ", err)
+		return subcommands.ExitFailure
+	}
+	_, errs := wire.Load(ctx, wd, os.Environ(), cmd.tags, packages(f))
+	if len(errs) > 0 {
+		logErrors(errs)
+		log.Println("error loading packages")
+		return subcommands.ExitFailure
+	}
+	return subcommands.ExitSuccess
+}
+
+type outGroup struct {
+	name    string
+	inputs  *typeutil.Map // values are not important
+	outputs *typeutil.Map // values are *wire.Provider, *wire.Value, or *wire.Field
+}
+
+// gather flattens a provider set into outputs grouped by the inputs
+// required to create them. As it flattens the provider set, it records
+// the visited named provider sets as imports.
+func gather(info *wire.Info, key wire.ProviderSetID) (_ []outGroup, imports map[string]struct{}) {
+	set := info.Sets[key]
+	hash := typeutil.MakeHasher()
+
+	// Find imports.
+	next := []*wire.ProviderSet{info.Sets[key]}
+	visited := make(map[*wire.ProviderSet]struct{})
+	imports = make(map[string]struct{})
+	for len(next) > 0 {
+		curr := next[len(next)-1]
+		next = next[:len(next)-1]
+		if _, found := visited[curr]; found {
+			continue
+		}
+		visited[curr] = struct{}{}
+		if curr.VarName != "" && !(curr.PkgPath == key.ImportPath && curr.VarName == key.VarName) {
+			imports[formatProviderSetName(curr.PkgPath, curr.VarName)] = struct{}{}
+		}
+		next = append(next, curr.Imports...)
+	}
+
+	// Depth-first search to build groups.
+	var groups []outGroup
+	inputVisited := new(typeutil.Map) // values are int, indices into groups or -1 for input.
+	inputVisited.SetHasher(hash)
+	var stk []types.Type
+	for _, k := range set.Outputs() {
+		// Start a DFS by picking a random unvisited node.
+		if inputVisited.At(k) == nil {
+			stk = append(stk, k)
+		}
+
+		// Run DFS
+	dfs:
+		for len(stk) > 0 {
+			curr := stk[len(stk)-1]
+			stk = stk[:len(stk)-1]
+			if inputVisited.At(curr) != nil {
+				continue
+			}
+			switch pv := set.For(curr); {
+			case pv.IsNil():
+				// This is an input.
+				inputVisited.Set(curr, -1)
+			case pv.IsArg():
+				// This is an injector argument.
+				inputVisited.Set(curr, -1)
+			case pv.IsProvider():
+				// Try to see if any args haven't been visited.
+				p := pv.Provider()
+				allPresent := true
+				for _, arg := range p.Args {
+					if inputVisited.At(arg.Type) == nil {
+						allPresent = false
+					}
+				}
+				if !allPresent {
+					stk = append(stk, curr)
+					for _, arg := range p.Args {
+						if inputVisited.At(arg.Type) == nil {
+							stk = append(stk, arg.Type)
+						}
+					}
+					continue dfs
+				}
+
+				// Build up set of input types, match to a group.
+				in := new(typeutil.Map)
+				in.SetHasher(hash)
+				for _, arg := range p.Args {
+					i := inputVisited.At(arg.Type).(int)
+					if i == -1 {
+						in.Set(arg.Type, true)
+					} else {
+						mergeTypeSets(in, groups[i].inputs)
+					}
+				}
+				for i := range groups {
+					if sameTypeKeys(groups[i].inputs, in) {
+						groups[i].outputs.Set(curr, p)
+						inputVisited.Set(curr, i)
+						continue dfs
+					}
+				}
+				out := new(typeutil.Map)
+				out.SetHasher(hash)
+				out.Set(curr, p)
+				inputVisited.Set(curr, len(groups))
+				groups = append(groups, outGroup{
+					inputs:  in,
+					outputs: out,
+				})
+			case pv.IsValue():
+				v := pv.Value()
+				for i := range groups {
+					if groups[i].inputs.Len() == 0 {
+						groups[i].outputs.Set(curr, v)
+						inputVisited.Set(curr, i)
+						continue dfs
+					}
+				}
+				in := new(typeutil.Map)
+				in.SetHasher(hash)
+				out := new(typeutil.Map)
+				out.SetHasher(hash)
+				out.Set(curr, v)
+				inputVisited.Set(curr, len(groups))
+				groups = append(groups, outGroup{
+					inputs:  in,
+					outputs: out,
+				})
+			case pv.IsField():
+				// Try to see if the parent struct hasn't been visited.
+				f := pv.Field()
+				if inputVisited.At(f.Parent) == nil {
+					stk = append(stk, curr, f.Parent)
+					continue
+				}
+				// Build the input map for the parent struct.
+				in := new(typeutil.Map)
+				in.SetHasher(hash)
+				i := inputVisited.At(f.Parent).(int)
+				if i == -1 {
+					in.Set(f.Parent, true)
+				} else {
+					mergeTypeSets(in, groups[i].inputs)
+				}
+				// Group all fields together under the same parent struct.
+				for i := range groups {
+					if sameTypeKeys(groups[i].inputs, in) {
+						groups[i].outputs.Set(curr, f)
+						inputVisited.Set(curr, i)
+						continue dfs
+					}
+				}
+				out := new(typeutil.Map)
+				out.SetHasher(hash)
+				out.Set(curr, f)
+				inputVisited.Set(curr, len(groups))
+				groups = append(groups, outGroup{
+					inputs:  in,
+					outputs: out,
+				})
+			default:
+				panic("unreachable")
+			}
+		}
+	}
+
+	// Name and sort groups.
+	for i := range groups {
+		if groups[i].inputs.Len() == 0 {
+			groups[i].name = "no inputs"
+			continue
+		}
+		instr := make([]string, 0, groups[i].inputs.Len())
+		groups[i].inputs.Iterate(func(k types.Type, _ interface{}) {
+			instr = append(instr, types.TypeString(k, nil))
+		})
+		sort.Strings(instr)
+		groups[i].name = strings.Join(instr, ", ")
+	}
+	sort.Slice(groups, func(i, j int) bool {
+		if groups[i].inputs.Len() == groups[j].inputs.Len() {
+			return groups[i].name < groups[j].name
+		}
+		return groups[i].inputs.Len() < groups[j].inputs.Len()
+	})
+	return groups, imports
+}
+
+func mergeTypeSets(dst, src *typeutil.Map) {
+	src.Iterate(func(k types.Type, _ interface{}) {
+		dst.Set(k, true)
+	})
+}
+
+func sameTypeKeys(a, b *typeutil.Map) bool {
+	if a.Len() != b.Len() {
+		return false
+	}
+	same := true
+	a.Iterate(func(k types.Type, _ interface{}) {
+		if b.At(k) == nil {
+			same = false
+		}
+	})
+	return same
+}
+
+func sortSet(set interface{}) []string {
+	rv := reflect.ValueOf(set)
+	a := make([]string, 0, rv.Len())
+	keys := rv.MapKeys()
+	for _, k := range keys {
+		a = append(a, k.String())
+	}
+	sort.Strings(a)
+	return a
+}
+
+func formatProviderSetName(importPath, varName string) string {
+	// Since varName is an identifier, it doesn't make sense to quote.
+	return strconv.Quote(importPath) + "." + varName
+}
+
+func logErrors(errs []error) {
+	for _, err := range errs {
+		log.Println(strings.Replace(err.Error(), "\n", "\n\t", -1))
+	}
+}
diff --git a/pkg/build/wire/cmd/wire/wire b/pkg/build/wire/cmd/wire/wire
new file mode 100755
index 0000000000000..f07aa2e08415f
Binary files /dev/null and b/pkg/build/wire/cmd/wire/wire differ
diff --git a/pkg/build/wire/docs/best-practices.md b/pkg/build/wire/docs/best-practices.md
new file mode 100644
index 0000000000000..470a4cd437512
--- /dev/null
+++ b/pkg/build/wire/docs/best-practices.md
@@ -0,0 +1,121 @@
+# Best Practices
+
+The following are practices we recommend for using Wire. This list will grow
+over time.
+
+## Distinguishing Types
+
+If you need to inject a common type like `string`, create a new string type to
+avoid conflicts with other providers. For example:
+
+```go
+type MySQLConnectionString string
+```
+
+## Options Structs
+
+A provider function that includes many dependencies can pair the function with
+an options struct.
+
+```go
+type Options struct {
+    // Messages is the set of recommended greetings.
+    Messages []Message
+    // Writer is the location to send greetings. nil goes to stdout.
+    Writer io.Writer
+}
+
+func NewGreeter(ctx context.Context, opts *Options) (*Greeter, error) {
+    // ...
+}
+
+var GreeterSet = wire.NewSet(wire.Struct(new(Options), "*"), NewGreeter)
+```
+
+## Provider Sets in Libraries
+
+When creating a provider set for use in a library, the only changes you can make
+without breaking compatibility are:
+
+-   Change which provider a provider set uses to provide a specific output, as
+    long as it does not introduce a new input to the provider set. It may remove
+    inputs. However, note that existing injectors will use the old provider
+    until they are regenerated.
+-   Introduce a new output type into the provider set, but only if the type
+    itself is newly added. If the type is not new, it is possible that some
+    injector already has the output type included, which would cause a conflict.
+
+All other changes are not safe. This includes:
+
+-   Requiring a new input in the provider set.
+-   Removing an output type from a provider set.
+-   Adding an existing output type into the provider set.
+
+Instead of making one of these breaking changes, consider adding a new provider
+set.
+
+As an example, if you have a provider set like this:
+
+```go
+var GreeterSet = wire.NewSet(NewStdoutGreeter)
+
+func DefaultGreeter(ctx context.Context) *Greeter {
+    // ...
+}
+
+func NewStdoutGreeter(ctx context.Context, msgs []Message) *Greeter {
+    // ...
+}
+
+func NewGreeter(ctx context.Context, w io.Writer, msgs []Message) (*Greeter, error) {
+    // ...
+}
+```
+
+You may:
+
+-   Use `DefaultGreeter` instead of `NewStdoutGreeter` in `GreeterSet`.
+-   Create a new type `T` and add a provider for `T` to `GreeterSet`, as long as
+    `T` is introduced in the same commit/release as the provider is added.
+
+You may not:
+
+-   Use `NewGreeter` instead of `NewStdoutGreeter` in `GreeterSet`. This both
+    adds an input type (`io.Writer`) and requires injectors to return an `error`
+    where the provider of `*Greeter` did not require this before.
+-   Remove `NewStdoutGreeter` from `GreeterSet`. Injectors depending on
+    `*Greeter` will be broken.
+-   Add a provider for `io.Writer` to `GreeterSet`. Injectors might already have
+    a provider for `io.Writer` which might conflict with this one.
+
+As such, you should pick the output types in a library provider set carefully.
+In general, prefer small provider sets in a library. For example, it is common
+for a library provider set to contain a single provider function along with a
+`wire.Bind` to the interface the return type implements. Avoiding larger
+provider sets reduces the likelihood that applications will encounter conflicts.
+To illustrate, imagine your library provides a client for a web service. While
+it may be tempting to bundle a provider for `*http.Client` in a provider set for
+your library's client, doing so would cause conflicts if every library did the
+same. Instead, the library's provider set should only include the provider for
+the API client, and let `*http.Client` be an input of the provider set.
+
+## Mocking
+
+There are two approaches for creating an injected app with mocked dependencies.
+Examples of both approaches are shown
+[here](https://github.com/google/wire/tree/master/internal/wire/testdata/ExampleWithMocks/foo).
+
+### Approach A: Pass mocks to the injector
+
+Create a test-only injector that takes all of the mocks as arguments; the
+argument types must be the interface types the mocks are mocking. `wire.Build`
+can't include providers for the mocked dependencies without creating conflicts,
+so if you're using provider set(s) you will need to define one that doesn't
+include the mocked types.
+
+### Approach B: Return the mocks from the injector
+
+Create a new struct that includes the app plus all of the dependencies you want
+to mock. Create a test-only injector that returns this struct, give it providers
+for the concrete mock types, and use `wire.Bind` to tell Wire that the concrete
+mock types should be used to fulfill the appropriate interface.
diff --git a/pkg/build/wire/docs/faq.md b/pkg/build/wire/docs/faq.md
new file mode 100644
index 0000000000000..28a45d595625d
--- /dev/null
+++ b/pkg/build/wire/docs/faq.md
@@ -0,0 +1,130 @@
+# Frequently Asked Questions
+
+## How does Wire relate to other Go dependency injection tools?
+
+Other dependency injection tools for Go like [dig][] or [facebookgo/inject][]
+are based on reflection. Wire runs as a code generator, which means that the
+injector works without making calls to a runtime library. This enables easier
+introspection of initialization and correct cross-references for tooling like
+[guru][].
+
+[dig]: https://github.com/uber-go/dig
+[facebookgo/inject]: https://github.com/facebookgo/inject
+[guru]: https://golang.org/s/using-guru
+
+## How does Wire relate to other non-Go dependency injection tools (like Dagger 2)?
+
+Wire's approach was inspired by [Dagger 2][]. However, it is not the aim of Wire
+to emulate dependency injection tools from other languages: the design space and
+requirements are quite different. For example, the Go compiler does not support
+anything like Java's annotation processing mechanisms. The difference in
+languages and their idioms necessarily requires different approaches in
+primitives and API.
+
+[Dagger 2]: https://google.github.io/dagger/
+
+## Why use pseudo-functions to create provider sets or injectors?
+
+In the early prototypes, Wire directives were specially formatted comments. This
+seemed appealing at first glance as this meant no compile-time or runtime
+impact. However, this unstructured approach becomes opaque to other tooling not
+written for Wire. Tools like [`gorename`][] or [guru][] would not be able to
+recognize references to the identifiers existing in comments without being
+specially modified to understand Wire's comment format. By moving the references
+into no-op function calls, Wire interoperates seamlessly with other Go tooling.
+
+[`gorename`]: https://godoc.org/golang.org/x/tools/cmd/gorename
+
+## What if my dependency graph has two dependencies of the same type?
+
+This most frequently appears with common types like `string`. An example of this
+problem would be:
+
+```go
+type Foo struct { /* ... */ }
+type Bar struct { /* ... */ }
+
+func newFoo1() *Foo { /* ... */ }
+func newFoo2() *Foo { /* ... */ }
+func newBar(foo1 *Foo, foo2 *Foo) *Bar { /* ... */ }
+
+func inject() *Bar {
+	// ERROR! Multiple providers for *Foo.
+	wire.Build(newFoo1, newFoo2, newBar)
+	return nil
+}
+```
+
+Wire does not allow multiple providers for one type to exist in the transitive
+closure of the providers presented to `wire.Build`, as this is usually a
+mistake. For legitimate cases where you need multiple dependencies of the same
+type, you need to invent a new type to call this other dependency. For example,
+you can name OAuth credentials after the service they connect to. Once you have
+a suitable different type, you can wrap and unwrap the type when plumbing it
+through Wire. Continuing our above example:
+
+```go
+type OtherFoo Foo
+
+func newOtherFoo() *OtherFoo {
+	// Call the original provider...
+	foo := newFoo2()
+	// ...then convert it to the new type.
+	return (*OtherFoo)(foo)
+}
+
+func provideBar(foo1 *Foo, otherFoo *OtherFoo) *Bar {
+	// Convert the new type into the unwrapped type...
+	foo2 := (*Foo)(otherFoo)
+	// ...then use it to call the original provider.
+	return newBar(foo1, foo2)
+}
+
+func inject() *Bar {
+	wire.Build(newFoo1, newOtherFoo, provideBar)
+	return nil
+}
+```
+
+## Why does Wire forbid including the same provider multiple times?
+
+Wire forbids this to remain consistent with the principle that specifying
+multiple providers for the same type is an error. On the surface, Wire could
+permit duplication, but this would introduce a few unintended consequences:
+
+-  Wire would have to specify what kinds of duplicates are permissible: are two
+   `wire.Value` calls ever considered to be the "same"?
+-  If a provider set changes the function it uses to provide a type, then this
+   could break an application, since it may introduce a new conflict between
+   another provider set that was specifying the "same" provider.
+
+As such, we decided that the simpler behavior would be for this case to be an
+error, knowing we can always relax this restriction later. The user can always
+create a new provider set that does not have the conflicting type. A [proposed
+subtract command][] would automate the toil in this process.
+
+[proposed subtract command]: https://github.com/google/wire/issues/8
+
+## Why does Wire require explicitly declare that a type provides an interface type?
+
+The reason the binding is explicit is to avoid scenarios where adding a new type
+to the provider graph that implements the same interface causes the graph to
+break, because that can be surprising. While this does result in more typing,
+the end-effect is that the developer's intent is more explicit in the code,
+which we felt was most consistent with the Go philosophy.
+
+There is an [open issue](https://github.com/google/wire/issues/242) to consider
+improving this.
+
+## Should I use Wire for small applications?
+
+Probably not. Wire is designed to automate more intricate setup code found in
+larger applications. For small applications, hand-wiring dependencies is
+simpler.
+
+## Who is using Wire?
+
+Wire is still fairly new and doesn't have a large user base yet. However, we
+have heard a lot of interest from Go users wanting to simplify their
+applications. If your project or company uses Wire, please let us know by either
+emailing us or sending a pull request amending this section.
diff --git a/pkg/build/wire/docs/guide.md b/pkg/build/wire/docs/guide.md
new file mode 100644
index 0000000000000..530650a110afa
--- /dev/null
+++ b/pkg/build/wire/docs/guide.md
@@ -0,0 +1,465 @@
+# Wire User Guide
+
+## Basics
+
+Wire has two core concepts: providers and injectors.
+
+### Defining Providers
+
+The primary mechanism in Wire is the **provider**: a function that can produce a
+value. These functions are ordinary Go code.
+
+```go
+package foobarbaz
+
+type Foo struct {
+    X int
+}
+
+// ProvideFoo returns a Foo.
+func ProvideFoo() Foo {
+    return Foo{X: 42}
+}
+```
+
+Provider functions must be exported in order to be used from other packages,
+just like ordinary functions.
+
+Providers can specify dependencies with parameters:
+
+```go
+package foobarbaz
+
+// ...
+
+type Bar struct {
+    X int
+}
+
+// ProvideBar returns a Bar: a negative Foo.
+func ProvideBar(foo Foo) Bar {
+    return Bar{X: -foo.X}
+}
+```
+
+Providers can also return errors:
+
+```go
+package foobarbaz
+
+import (
+    "context"
+    "errors"
+)
+
+// ...
+
+type Baz struct {
+    X int
+}
+
+// ProvideBaz returns a value if Bar is not zero.
+func ProvideBaz(ctx context.Context, bar Bar) (Baz, error) {
+    if bar.X == 0 {
+        return Baz{}, errors.New("cannot provide baz when bar is zero")
+    }
+    return Baz{X: bar.X}, nil
+}
+```
+
+Providers can be grouped into **provider sets**. This is useful if several
+providers will frequently be used together. To add these providers to a new set
+called `SuperSet`, use the `wire.NewSet` function:
+
+```go
+package foobarbaz
+
+import (
+    // ...
+    "github.com/google/wire"
+)
+
+// ...
+
+var SuperSet = wire.NewSet(ProvideFoo, ProvideBar, ProvideBaz)
+```
+
+You can also add other provider sets into a provider set.
+
+```go
+package foobarbaz
+
+import (
+    // ...
+    "example.com/some/other/pkg"
+)
+
+// ...
+
+var MegaSet = wire.NewSet(SuperSet, pkg.OtherSet)
+```
+
+### Injectors
+
+An application wires up these providers with an **injector**: a function that
+calls providers in dependency order. With Wire, you write the injector's
+signature, then Wire generates the function's body.
+
+An injector is declared by writing a function declaration whose body is a call
+to `wire.Build`. The return values don't matter as long as they are of the
+correct type. The values themselves will be ignored in the generated code. Let's
+say that the above providers were defined in a package called
+`example.com/foobarbaz`. The following would declare an injector to obtain a
+`Baz`:
+
+```go
+// +build wireinject
+// The build tag makes sure the stub is not built in the final build.
+
+package main
+
+import (
+    "context"
+
+    "github.com/google/wire"
+    "example.com/foobarbaz"
+)
+
+func initializeBaz(ctx context.Context) (foobarbaz.Baz, error) {
+    wire.Build(foobarbaz.MegaSet)
+    return foobarbaz.Baz{}, nil
+}
+```
+
+Like providers, injectors can be parameterized on inputs (which then get sent to
+providers) and can return errors. Arguments to `wire.Build` are the same as
+`wire.NewSet`: they form a provider set. This is the provider set that gets used
+during code generation for that injector.
+
+Any non-injector declarations found in a file with injectors will be copied into
+the generated file.
+
+You can generate the injector by invoking Wire in the package directory:
+
+```shell
+wire
+```
+
+Wire will produce an implementation of the injector in a file called
+`wire_gen.go` that looks something like this:
+
+```go
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//+build !wireinject
+
+package main
+
+import (
+    "example.com/foobarbaz"
+)
+
+func initializeBaz(ctx context.Context) (foobarbaz.Baz, error) {
+    foo := foobarbaz.ProvideFoo()
+    bar := foobarbaz.ProvideBar(foo)
+    baz, err := foobarbaz.ProvideBaz(ctx, bar)
+    if err != nil {
+        return foobarbaz.Baz{}, err
+    }
+    return baz, nil
+}
+```
+
+As you can see, the output is very close to what a developer would write
+themselves. Further, there is little dependency on Wire at runtime: all of the
+written code is just normal Go code, and can be used without Wire.
+
+Once `wire_gen.go` is created, you can regenerate it by running [`go generate`].
+
+[`go generate`]: https://blog.golang.org/generate
+
+## Advanced Features
+
+The following features all build on top of the concepts of providers and
+injectors.
+
+### Binding Interfaces
+
+Frequently, dependency injection is used to bind a concrete implementation for
+an interface. Wire matches inputs to outputs via [type identity][], so the
+inclination might be to create a provider that returns an interface type.
+However, this would not be idiomatic, since the Go best practice is to
+[return concrete types][]. Instead, you can declare an interface binding in a
+provider set:
+
+```go
+type Fooer interface {
+    Foo() string
+}
+
+type MyFooer string
+
+func (b *MyFooer) Foo() string {
+    return string(*b)
+}
+
+func provideMyFooer() *MyFooer {
+    b := new(MyFooer)
+    *b = "Hello, World!"
+    return b
+}
+
+type Bar string
+
+func provideBar(f Fooer) string {
+    // f will be a *MyFooer.
+    return f.Foo()
+}
+
+var Set = wire.NewSet(
+    provideMyFooer,
+    wire.Bind(new(Fooer), new(*MyFooer)),
+    provideBar)
+```
+
+The first argument to `wire.Bind` is a pointer to a value of the desired
+interface type and the second argument is a pointer to a value of the type that
+implements the interface. Any set that includes an interface binding must also
+have a provider in the same set that provides the concrete type.
+
+[type identity]: https://golang.org/ref/spec#Type_identity
+[return concrete types]: https://github.com/golang/go/wiki/CodeReviewComments#interfaces
+
+### Struct Providers
+
+Structs can be constructed using provided types. Use the `wire.Struct` function
+to construct a struct type and tell the injector which field(s) should be injected.
+The injector will fill in each field using the provider for the field's type.
+For the resulting struct type `S`, `wire.Struct` provides both `S` and `*S`. For
+example, given the following providers:
+
+```go
+type Foo int
+type Bar int
+
+func ProvideFoo() Foo {/* ... */}
+
+func ProvideBar() Bar {/* ... */}
+
+type FooBar struct {
+    MyFoo Foo
+    MyBar Bar
+}
+
+var Set = wire.NewSet(
+    ProvideFoo,
+    ProvideBar,
+    wire.Struct(new(FooBar), "MyFoo", "MyBar"))
+```
+
+A generated injector for `FooBar` would look like this:
+
+```go
+func injectFooBar() FooBar {
+    foo := ProvideFoo()
+    bar := ProvideBar()
+    fooBar := FooBar{
+        MyFoo: foo,
+        MyBar: bar,
+    }
+    return fooBar
+}
+```
+
+The first argument to `wire.Struct` is a pointer to the desired struct type and
+the subsequent arguments are the names of fields to be injected. A special
+string `"*"` can be used as a shortcut to tell the injector to inject all
+fields. So `wire.Struct(new(FooBar), "*")` produces the same result as above.
+
+For the above example, you can specify only injecting `"MyFoo"` by changing the
+`Set` to:
+
+```go
+var Set = wire.NewSet(
+    ProvideFoo,
+    wire.Struct(new(FooBar), "MyFoo"))
+```
+
+Then the generated injector for `FooBar` would look like this:
+
+```go
+func injectFooBar() FooBar {
+    foo := ProvideFoo()
+    fooBar := FooBar{
+        MyFoo: foo,
+    }
+    return fooBar
+}
+```
+
+If the injector returned a `*FooBar` instead of a `FooBar`, the generated injector
+would look like this:
+
+```go
+func injectFooBar() *FooBar {
+    foo := ProvideFoo()
+    fooBar := &FooBar{
+        MyFoo: foo,
+    }
+    return fooBar
+}
+```
+
+It is sometimes useful to prevent certain fields from being filled in by the
+injector, especially when passing `*` to `wire.Struct`. You can tag a field with
+`` `wire:"-"` `` to have Wire ignore such fields. For example:
+
+```go
+type Foo struct {
+    mu sync.Mutex `wire:"-"`
+    Bar Bar
+}
+```
+
+When you provide the `Foo` type using `wire.Struct(new(Foo), "*")`, Wire will
+automatically omit the `mu` field. Additionally, it is an error to explicitly
+specify a prevented field as in `wire.Struct(new(Foo), "mu")`.
+
+### Binding Values
+
+Occasionally, it is useful to bind a basic value (usually `nil`) to a type.
+Instead of having injectors depend on a throwaway provider function, you can add
+a value expression to a provider set.
+
+```go
+type Foo struct {
+    X int
+}
+
+func injectFoo() Foo {
+    wire.Build(wire.Value(Foo{X: 42}))
+    return Foo{}
+}
+```
+
+The generated injector would look like this:
+
+```go
+func injectFoo() Foo {
+    foo := _wireFooValue
+    return foo
+}
+
+var (
+    _wireFooValue = Foo{X: 42}
+)
+```
+
+It's important to note that the expression will be copied to the injector's
+package; references to variables will be evaluated during the injector package's
+initialization. Wire will emit an error if the expression calls any functions or
+receives from any channels.
+
+For interface values, use `InterfaceValue`:
+
+```go
+func injectReader() io.Reader {
+    wire.Build(wire.InterfaceValue(new(io.Reader), os.Stdin))
+    return nil
+}
+```
+
+### Use Fields of a Struct as Providers
+
+Sometimes the providers the user wants are some fields of a struct. If you find
+yourself writing a provider like `getS` in the example below to promote struct
+fields into provided types:
+
+```go
+type Foo struct {
+    S string
+    N int
+    F float64
+}
+
+func getS(foo Foo) string {
+    // Bad! Use wire.FieldsOf instead.
+    return foo.S
+}
+
+func provideFoo() Foo {
+    return Foo{ S: "Hello, World!", N: 1, F: 3.14 }
+}
+
+func injectedMessage() string {
+    wire.Build(
+        provideFoo,
+        getS)
+    return ""
+}
+```
+
+You can instead use `wire.FieldsOf` to use those fields directly without writing
+`getS`:
+
+```go
+func injectedMessage() string {
+    wire.Build(
+        provideFoo,
+        wire.FieldsOf(new(Foo), "S"))
+    return ""
+}
+```
+
+The generated injector would look like this:
+
+```go
+func injectedMessage() string {
+    foo := provideFoo()
+    string2 := foo.S
+    return string2
+}
+```
+
+You can add as many field names to a `wire.FieldsOf` function as you like.
+For a given field type `T`, `FieldsOf` provides at least `T`; if the struct
+argument is a pointer to a struct, then `FieldsOf` also provides `*T`.
+
+### Cleanup functions
+
+If a provider creates a value that needs to be cleaned up (e.g. closing a file),
+then it can return a closure to clean up the resource. The injector will use
+this to either return an aggregated cleanup function to the caller or to clean
+up the resource if a provider called later in the injector's implementation
+returns an error.
+
+```go
+func provideFile(log Logger, path Path) (*os.File, func(), error) {
+    f, err := os.Open(string(path))
+    if err != nil {
+        return nil, nil, err
+    }
+    cleanup := func() {
+        if err := f.Close(); err != nil {
+            log.Log(err)
+        }
+    }
+    return f, cleanup, nil
+}
+```
+
+A cleanup function is guaranteed to be called before the cleanup function of any
+of the provider's inputs and must have the signature `func()`.
+
+### Alternate Injector Syntax
+
+If you grow weary of writing `return foobarbaz.Foo{}, nil` at the end of your
+injector function declaration, you can instead write it more concisely with a
+`panic`:
+
+```go
+func injectFoo() Foo {
+    panic(wire.Build(/* ... */))
+}
+```
diff --git a/pkg/build/wire/go.mod b/pkg/build/wire/go.mod
new file mode 100644
index 0000000000000..0b2868ee9746e
--- /dev/null
+++ b/pkg/build/wire/go.mod
@@ -0,0 +1,10 @@
+module github.com/grafana/grafana/pkg/build/wire
+
+go 1.12
+
+require (
+	github.com/google/go-cmp v0.6.0
+	github.com/google/subcommands v1.2.0
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
+	golang.org/x/tools v0.17.0
+)
diff --git a/pkg/build/wire/go.sum b/pkg/build/wire/go.sum
new file mode 100644
index 0000000000000..d24a2f2fe0692
--- /dev/null
+++ b/pkg/build/wire/go.sum
@@ -0,0 +1,57 @@
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN9oE=
+github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
+golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
+golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/pkg/build/wire/internal/alldeps b/pkg/build/wire/internal/alldeps
new file mode 100644
index 0000000000000..41e98ac7c9691
--- /dev/null
+++ b/pkg/build/wire/internal/alldeps
@@ -0,0 +1,5 @@
+github.com/google/subcommands
+github.com/google/wire
+github.com/pmezard/go-difflib
+golang.org/x/mod
+golang.org/x/tools
diff --git a/pkg/build/wire/internal/check_api_change.sh b/pkg/build/wire/internal/check_api_change.sh
new file mode 100755
index 0000000000000..ad2f00c4d03a8
--- /dev/null
+++ b/pkg/build/wire/internal/check_api_change.sh
@@ -0,0 +1,89 @@
+#!/usr/bin/env bash
+# Copyright 2019 The Wire Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This script checks to see if there are any incompatible API changes on the
+# current branch relative to the upstream branch.
+# It fails if it finds any, unless there is a commit with BREAKING_CHANGE_OK
+# in the first line of the commit message.
+
+# This script expects:
+# a) to be run at the root of the repository
+# b) HEAD is pointing to a commit that merges between the pull request and the
+#    upstream branch (GITHUB_BASE_REF).
+
+set -euo pipefail
+
+UPSTREAM_BRANCH="${GITHUB_BASE_REF:-master}"
+echo "Checking for incompatible API changes relative to ${UPSTREAM_BRANCH}..."
+
+MASTER_CLONE_DIR="$(mktemp -d)"
+PKGINFO_BRANCH=$(mktemp)
+PKGINFO_MASTER=$(mktemp)
+
+function cleanup() {
+  rm -rf "$MASTER_CLONE_DIR"
+  rm -f "$PKGINFO_BRANCH"
+  rm -f "$PKGINFO_MASTER"
+}
+trap cleanup EXIT
+
+# Install apidiff.
+go install golang.org/x/exp/cmd/apidiff@latest
+
+git clone -b "$UPSTREAM_BRANCH" . "$MASTER_CLONE_DIR" &> /dev/null
+
+incompatible_change_pkgs=()
+PKGS=$(cd "$MASTER_CLONE_DIR"; go list ./... | grep -v test | grep -v internal)
+for pkg in $PKGS; do
+  echo "  Testing ${pkg}..."
+
+  # Compute export data for the current branch.
+  package_deleted=0
+  apidiff -w "$PKGINFO_BRANCH" "$pkg" || package_deleted=1
+  if [[ $package_deleted -eq 1 ]]; then
+    echo "  Package ${pkg} was deleted! Recording as an incompatible change.";
+    incompatible_change_pkgs+=(${pkg});
+    continue;
+  fi
+
+  # Compute export data for master@HEAD.
+  (cd "$MASTER_CLONE_DIR"; apidiff -w "$PKGINFO_MASTER" "$pkg")
+
+  # Print all changes for posterity.
+  apidiff "$PKGINFO_MASTER" "$PKGINFO_BRANCH"
+
+  # Note if there's an incompatible change.
+  ic=$(apidiff -incompatible "$PKGINFO_MASTER" "$PKGINFO_BRANCH")
+  if [ ! -z "$ic" ]; then
+    incompatible_change_pkgs+=("$pkg");
+  fi
+done
+
+if [ ${#incompatible_change_pkgs[@]} -eq 0 ]; then
+  # No incompatible changes, we are good.
+  echo "OK: No incompatible changes found."
+  exit 0;
+fi
+echo "Found breaking API change(s) in: ${incompatible_change_pkgs[*]}."
+
+# Found incompatible changes; see if they were declared as OK via a commit.
+if git cherry -v master | grep -q "BREAKING_CHANGE_OK"; then
+  echo "Allowing them due to a commit message with BREAKING_CHANGE_OK.";
+  exit 0;
+fi
+
+echo "FAIL. If this is expected and OK, you can pass this check by adding a commit with BREAKING_CHANGE_OK in the first line of the message."
+exit 1
+
diff --git a/pkg/build/wire/internal/listdeps.sh b/pkg/build/wire/internal/listdeps.sh
new file mode 100755
index 0000000000000..fc99ade9c6de7
--- /dev/null
+++ b/pkg/build/wire/internal/listdeps.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# Copyright 2019 The Wire Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -euo pipefail
+
+# To run this script manually to update alldeps:
+#
+# $ internal/listdeps.sh > internal/alldeps
+#
+# Important note: there are changes in module tooling behavior between go 1.11
+# and go 1.12; please make sure to use the same version of Go as used by Github
+# Actions (see .github/workflows/tests.yml) when updating the alldeps file.
+go list -deps -f '{{with .Module}}{{.Path}}{{end}}' ./... | sort | uniq
diff --git a/pkg/build/wire/internal/runtests.sh b/pkg/build/wire/internal/runtests.sh
new file mode 100755
index 0000000000000..dd5647329fc48
--- /dev/null
+++ b/pkg/build/wire/internal/runtests.sh
@@ -0,0 +1,80 @@
+#!/usr/bin/env bash
+# Copyright 2019 The Wire Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# https://coderwall.com/p/fkfaqq/safer-bash-scripts-with-set-euxo-pipefail
+set -euo pipefail
+
+if [[ $# -gt 0 ]]; then
+  echo "usage: runtests.sh" 1>&2
+  exit 64
+fi
+
+# Run Go tests. Only do coverage for the Linux build
+# because it is slow, and codecov will only save the last one anyway.
+result=0
+if [[ "${RUNNER_OS:-}" == "Linux" ]]; then
+  echo "Running Go tests (with coverage)..."
+  go test -mod=readonly -race -coverpkg=./... -coverprofile=coverage.out ./... || result=1
+  if [ -f coverage.out ] && [ $result -eq 0 ]; then
+    bash <(curl -s https://codecov.io/bash)
+  fi
+else
+  echo "Running Go tests..."
+  go test -mod=readonly -race ./... || result=1
+fi
+
+# No need to run other checks on OSs other than linux.
+# We default RUNNER_OS to "Linux" so that we don't abort here when run locally.
+if [[ "${RUNNER_OS:-Linux}" != "Linux" ]]; then
+  exit $result
+fi
+
+echo
+echo "Ensuring .go files are formatted with gofmt -s..."
+mapfile -t go_files < <(find . -name '*.go' -type f | grep -v testdata)
+DIFF="$(gofmt -s -d "${go_files[@]}")"
+if [ -n "$DIFF" ]; then
+  echo "FAIL: please run gofmt -s and commit the result"
+  echo "$DIFF";
+  result=1;
+else
+  echo "OK"
+fi;
+
+
+# Ensure that the code has no extra dependencies (including transitive
+# dependencies) that we're not already aware of by comparing with
+# ./internal/alldeps
+#
+# Whenever project dependencies change, rerun ./internal/listdeps.sh
+echo
+echo "Ensuring that there are no dependencies not listed in ./internal/alldeps..."
+(./internal/listdeps.sh | diff ./internal/alldeps - && echo "OK") || {
+  echo "FAIL: dependencies changed; run: internal/listdeps.sh > internal/alldeps"
+  # Module behavior may differ across versions.
+  echo "using the latest go version."
+  result=1
+}
+
+
+# For pull requests, check if there are undeclared incompatible API changes.
+# Skip this if we're already going to fail since it is expensive.
+# CURRENTLY BROKEN
+# if [[ ${result} -eq 0 ]] && [[ ! -z "${GITHUB_HEAD_REF:-x}" ]]; then
+  # echo
+  # ./internal/check_api_change.sh || result=1;
+# fi
+
+exit $result
diff --git a/pkg/build/wire/internal/wire/analyze.go b/pkg/build/wire/internal/wire/analyze.go
new file mode 100644
index 0000000000000..9650ef167289d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/analyze.go
@@ -0,0 +1,521 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package wire
+
+import (
+	"errors"
+	"fmt"
+	"go/ast"
+	"go/token"
+	"go/types"
+	"sort"
+	"strings"
+
+	"golang.org/x/tools/go/types/typeutil"
+)
+
+type callKind int
+
+const (
+	funcProviderCall callKind = iota
+	structProvider
+	valueExpr
+	selectorExpr
+)
+
+// A call represents a step of an injector function.  It may be either a
+// function call or a composite struct literal, depending on the value
+// of kind.
+type call struct {
+	// kind indicates the code pattern to use.
+	kind callKind
+
+	// out is the type this step produces.
+	out types.Type
+
+	// pkg and name identify one of the following:
+	// 1) the provider to call for kind == funcProviderCall;
+	// 2) the type to construct for kind == structProvider;
+	// 3) the name to select for kind == selectorExpr.
+	pkg  *types.Package
+	name string
+
+	// args is a list of arguments to call the provider with. Each element is:
+	// a) one of the givens (args[i] < len(given)),
+	// b) the result of a previous provider call (args[i] >= len(given))
+	//
+	// This will be nil for kind == valueExpr.
+	//
+	// If kind == selectorExpr, then the length of this slice will be 1 and the
+	// "argument" will be the value to access fields from.
+	args []int
+
+	// varargs is true if the provider function is variadic.
+	varargs bool
+
+	// fieldNames maps the arguments to struct field names.
+	// This will only be set if kind == structProvider.
+	fieldNames []string
+
+	// ins is the list of types this call receives as arguments.
+	// This will be nil for kind == valueExpr.
+	ins []types.Type
+
+	// The following are only set for kind == funcProviderCall:
+
+	// hasCleanup is true if the provider call returns a cleanup function.
+	hasCleanup bool
+	// hasErr is true if the provider call returns an error.
+	hasErr bool
+
+	// The following are only set for kind == valueExpr:
+
+	valueExpr     ast.Expr
+	valueTypeInfo *types.Info
+
+	// The following are only set for kind == selectorExpr:
+
+	ptrToField bool
+}
+
+// solve finds the sequence of calls required to produce an output type
+// with an optional set of provided inputs.
+func solve(fset *token.FileSet, out types.Type, given *types.Tuple, set *ProviderSet) ([]call, []error) {
+	ec := new(errorCollector)
+
+	// Start building the mapping of type to local variable of the given type.
+	// The first len(given) local variables are the given types.
+	index := new(typeutil.Map)
+	for i := 0; i < given.Len(); i++ {
+		index.Set(given.At(i).Type(), i)
+	}
+
+	// Topological sort of the directed graph defined by the providers
+	// using a depth-first search using a stack. Provider set graphs are
+	// guaranteed to be acyclic. An index value of errAbort indicates that
+	// the type was visited, but failed due to an error added to ec.
+	errAbort := errors.New("failed to visit")
+	var used []*providerSetSrc
+	var calls []call
+	type frame struct {
+		t    types.Type
+		from types.Type
+		up   *frame
+	}
+	stk := []frame{{t: out}}
+dfs:
+	for len(stk) > 0 {
+		curr := stk[len(stk)-1]
+		stk = stk[:len(stk)-1]
+		if index.At(curr.t) != nil {
+			continue
+		}
+
+		pv := set.For(curr.t)
+		if pv.IsNil() {
+			if curr.from == nil {
+				ec.add(fmt.Errorf("no provider found for %s, output of injector", types.TypeString(curr.t, nil)))
+				index.Set(curr.t, errAbort)
+				continue
+			}
+			sb := new(strings.Builder)
+			fmt.Fprintf(sb, "no provider found for %s", types.TypeString(curr.t, nil))
+			for f := curr.up; f != nil; f = f.up {
+				fmt.Fprintf(sb, "\nneeded by %s in %s", types.TypeString(f.t, nil), set.srcMap.At(f.t).(*providerSetSrc).description(fset, f.t))
+			}
+			ec.add(errors.New(sb.String()))
+			index.Set(curr.t, errAbort)
+			continue
+		}
+		src := set.srcMap.At(curr.t).(*providerSetSrc)
+		used = append(used, src)
+		if concrete := pv.Type(); !types.Identical(concrete, curr.t) {
+			// Interface binding does not create a call.
+			i := index.At(concrete)
+			if i == nil {
+				stk = append(stk, curr, frame{t: concrete, from: curr.t, up: &curr})
+				continue
+			}
+			index.Set(curr.t, i)
+			continue
+		}
+
+		switch pv := set.For(curr.t); {
+		case pv.IsArg():
+			// Continue, already added to stk.
+		case pv.IsProvider():
+			p := pv.Provider()
+			// Ensure that all argument types have been visited. If not, push them
+			// on the stack in reverse order so that calls are added in argument
+			// order.
+			visitedArgs := true
+			for i := len(p.Args) - 1; i >= 0; i-- {
+				a := p.Args[i]
+				if index.At(a.Type) == nil {
+					if visitedArgs {
+						// Make sure to re-visit this type after visiting all arguments.
+						stk = append(stk, curr)
+						visitedArgs = false
+					}
+					stk = append(stk, frame{t: a.Type, from: curr.t, up: &curr})
+				}
+			}
+			if !visitedArgs {
+				continue
+			}
+			args := make([]int, len(p.Args))
+			ins := make([]types.Type, len(p.Args))
+			for i := range p.Args {
+				ins[i] = p.Args[i].Type
+				v := index.At(p.Args[i].Type)
+				if v == errAbort {
+					index.Set(curr.t, errAbort)
+					continue dfs
+				}
+				args[i] = v.(int)
+			}
+			index.Set(curr.t, given.Len()+len(calls))
+			kind := funcProviderCall
+			fieldNames := []string(nil)
+			if p.IsStruct {
+				kind = structProvider
+				for _, arg := range p.Args {
+					fieldNames = append(fieldNames, arg.FieldName)
+				}
+			}
+			calls = append(calls, call{
+				kind:       kind,
+				pkg:        p.Pkg,
+				name:       p.Name,
+				args:       args,
+				varargs:    p.Varargs,
+				fieldNames: fieldNames,
+				ins:        ins,
+				out:        curr.t,
+				hasCleanup: p.HasCleanup,
+				hasErr:     p.HasErr,
+			})
+		case pv.IsValue():
+			v := pv.Value()
+			index.Set(curr.t, given.Len()+len(calls))
+			calls = append(calls, call{
+				kind:          valueExpr,
+				out:           curr.t,
+				valueExpr:     v.expr,
+				valueTypeInfo: v.info,
+			})
+		case pv.IsField():
+			f := pv.Field()
+			if index.At(f.Parent) == nil {
+				// Fields have one dependency which is the parent struct. Make
+				// sure to visit it first if it is not already visited.
+				stk = append(stk, curr, frame{t: f.Parent, from: curr.t, up: &curr})
+				continue
+			}
+			index.Set(curr.t, given.Len()+len(calls))
+			v := index.At(f.Parent)
+			if v == errAbort {
+				index.Set(curr.t, errAbort)
+				continue dfs
+			}
+			// Use args[0] to store the position of the parent struct.
+			args := []int{v.(int)}
+			// If f.Out has 2 elements and curr.t is the 2nd one, then the call must
+			// provide a pointer to the field.
+			ptrToField := len(f.Out) == 2 && types.Identical(curr.t, f.Out[1])
+			calls = append(calls, call{
+				kind:       selectorExpr,
+				pkg:        f.Pkg,
+				name:       f.Name,
+				out:        curr.t,
+				args:       args,
+				ptrToField: ptrToField,
+			})
+		default:
+			panic("unknown return value from ProviderSet.For")
+		}
+	}
+	if len(ec.errors) > 0 {
+		return nil, ec.errors
+	}
+	if errs := verifyArgsUsed(set, used); len(errs) > 0 {
+		return nil, errs
+	}
+	return calls, nil
+}
+
+// verifyArgsUsed ensures that all of the arguments in set were used during solve.
+func verifyArgsUsed(set *ProviderSet, used []*providerSetSrc) []error {
+	var errs []error
+	for _, imp := range set.Imports {
+		found := false
+		for _, u := range used {
+			if u.Import == imp {
+				found = true
+				break
+			}
+		}
+		if !found {
+			if imp.VarName == "" {
+				errs = append(errs, errors.New("unused provider set"))
+			} else {
+				errs = append(errs, fmt.Errorf("unused provider set %q", imp.VarName))
+			}
+		}
+	}
+	for _, p := range set.Providers {
+		found := false
+		for _, u := range used {
+			if u.Provider == p {
+				found = true
+				break
+			}
+		}
+		if !found {
+			errs = append(errs, fmt.Errorf("unused provider %q", p.Pkg.Name()+"."+p.Name))
+		}
+	}
+	for _, v := range set.Values {
+		found := false
+		for _, u := range used {
+			if u.Value == v {
+				found = true
+				break
+			}
+		}
+		if !found {
+			errs = append(errs, fmt.Errorf("unused value of type %s", types.TypeString(v.Out, nil)))
+		}
+	}
+	for _, b := range set.Bindings {
+		found := false
+		for _, u := range used {
+			if u.Binding == b {
+				found = true
+				break
+			}
+		}
+		if !found {
+			errs = append(errs, fmt.Errorf("unused interface binding to type %s", types.TypeString(b.Iface, nil)))
+		}
+	}
+	for _, f := range set.Fields {
+		found := false
+		for _, u := range used {
+			if u.Field == f {
+				found = true
+				break
+			}
+		}
+		if !found {
+			errs = append(errs, fmt.Errorf("unused field %q.%s", f.Parent, f.Name))
+		}
+	}
+	return errs
+}
+
+// buildProviderMap creates the providerMap and srcMap fields for a given
+// provider set. The given provider set's providerMap and srcMap fields are
+// ignored.
+func buildProviderMap(fset *token.FileSet, hasher typeutil.Hasher, set *ProviderSet) (*typeutil.Map, *typeutil.Map, []error) {
+	providerMap := new(typeutil.Map)
+	providerMap.SetHasher(hasher)
+	srcMap := new(typeutil.Map) // to *providerSetSrc
+	srcMap.SetHasher(hasher)
+
+	ec := new(errorCollector)
+	// Process injector arguments.
+	if set.InjectorArgs != nil {
+		givens := set.InjectorArgs.Tuple
+		for i := 0; i < givens.Len(); i++ {
+			typ := givens.At(i).Type()
+			arg := &InjectorArg{Args: set.InjectorArgs, Index: i}
+			src := &providerSetSrc{InjectorArg: arg}
+			if prevSrc := srcMap.At(typ); prevSrc != nil {
+				ec.add(bindingConflictError(fset, typ, set, src, prevSrc.(*providerSetSrc)))
+				continue
+			}
+			providerMap.Set(typ, &ProvidedType{t: typ, a: arg})
+			srcMap.Set(typ, src)
+		}
+	}
+	// Process imports, verifying that there are no conflicts between sets.
+	for _, imp := range set.Imports {
+		src := &providerSetSrc{Import: imp}
+		imp.providerMap.Iterate(func(k types.Type, v interface{}) {
+			if prevSrc := srcMap.At(k); prevSrc != nil {
+				ec.add(bindingConflictError(fset, k, set, src, prevSrc.(*providerSetSrc)))
+				return
+			}
+			providerMap.Set(k, v)
+			srcMap.Set(k, src)
+		})
+	}
+	if len(ec.errors) > 0 {
+		return nil, nil, ec.errors
+	}
+
+	// Process non-binding providers in new set.
+	for _, p := range set.Providers {
+		src := &providerSetSrc{Provider: p}
+		for _, typ := range p.Out {
+			if prevSrc := srcMap.At(typ); prevSrc != nil {
+				ec.add(bindingConflictError(fset, typ, set, src, prevSrc.(*providerSetSrc)))
+				continue
+			}
+			providerMap.Set(typ, &ProvidedType{t: typ, p: p})
+			srcMap.Set(typ, src)
+		}
+	}
+	for _, v := range set.Values {
+		src := &providerSetSrc{Value: v}
+		if prevSrc := srcMap.At(v.Out); prevSrc != nil {
+			ec.add(bindingConflictError(fset, v.Out, set, src, prevSrc.(*providerSetSrc)))
+			continue
+		}
+		providerMap.Set(v.Out, &ProvidedType{t: v.Out, v: v})
+		srcMap.Set(v.Out, src)
+	}
+	for _, f := range set.Fields {
+		src := &providerSetSrc{Field: f}
+		for _, typ := range f.Out {
+			if prevSrc := srcMap.At(typ); prevSrc != nil {
+				ec.add(bindingConflictError(fset, typ, set, src, prevSrc.(*providerSetSrc)))
+				continue
+			}
+			providerMap.Set(typ, &ProvidedType{t: typ, f: f})
+			srcMap.Set(typ, src)
+		}
+	}
+	if len(ec.errors) > 0 {
+		return nil, nil, ec.errors
+	}
+
+	// Process bindings in set. Must happen after the other providers to
+	// ensure the concrete type is being provided.
+	for _, b := range set.Bindings {
+		src := &providerSetSrc{Binding: b}
+		if prevSrc := srcMap.At(b.Iface); prevSrc != nil {
+			ec.add(bindingConflictError(fset, b.Iface, set, src, prevSrc.(*providerSetSrc)))
+			continue
+		}
+		concrete := providerMap.At(b.Provided)
+		if concrete == nil {
+			setName := set.VarName
+			if setName == "" {
+				setName = "provider set"
+			}
+			ec.add(notePosition(fset.Position(b.Pos), fmt.Errorf("wire.Bind of concrete type %q to interface %q, but %s does not include a provider for %q", b.Provided, b.Iface, setName, b.Provided)))
+			continue
+		}
+		providerMap.Set(b.Iface, concrete)
+		srcMap.Set(b.Iface, src)
+	}
+	if len(ec.errors) > 0 {
+		return nil, nil, ec.errors
+	}
+	return providerMap, srcMap, nil
+}
+
+func verifyAcyclic(providerMap *typeutil.Map, hasher typeutil.Hasher) []error {
+	// We must visit every provider type inside provider map, but we don't
+	// have a well-defined starting point and there may be several
+	// distinct graphs. Thus, we start a depth-first search at every
+	// provider, but keep a shared record of visited providers to avoid
+	// duplicating work.
+	visited := new(typeutil.Map) // to bool
+	visited.SetHasher(hasher)
+	ec := new(errorCollector)
+	// Sort output types so that errors about cycles are consistent.
+	outputs := providerMap.Keys()
+	sort.Slice(outputs, func(i, j int) bool { return types.TypeString(outputs[i], nil) < types.TypeString(outputs[j], nil) })
+	for _, root := range outputs {
+		// Depth-first search using a stack of trails through the provider map.
+		stk := [][]types.Type{{root}}
+		for len(stk) > 0 {
+			curr := stk[len(stk)-1]
+			stk = stk[:len(stk)-1]
+			head := curr[len(curr)-1]
+			if v, _ := visited.At(head).(bool); v {
+				continue
+			}
+			visited.Set(head, true)
+			x := providerMap.At(head)
+			if x == nil {
+				// Leaf: input.
+				continue
+			}
+			pt := x.(*ProvidedType)
+			switch {
+			case pt.IsValue():
+				// Leaf: values do not have dependencies.
+			case pt.IsArg():
+				// Injector arguments do not have dependencies.
+			case pt.IsProvider() || pt.IsField():
+				var args []types.Type
+				if pt.IsProvider() {
+					for _, arg := range pt.Provider().Args {
+						args = append(args, arg.Type)
+					}
+				} else {
+					args = append(args, pt.Field().Parent)
+				}
+				for _, a := range args {
+					hasCycle := false
+					for i, b := range curr {
+						if types.Identical(a, b) {
+							sb := new(strings.Builder)
+							fmt.Fprintf(sb, "cycle for %s:\n", types.TypeString(a, nil))
+							for j := i; j < len(curr); j++ {
+								t := providerMap.At(curr[j]).(*ProvidedType)
+								if t.IsProvider() {
+									p := t.Provider()
+									fmt.Fprintf(sb, "%s (%s.%s) ->\n", types.TypeString(curr[j], nil), p.Pkg.Path(), p.Name)
+								} else {
+									p := t.Field()
+									fmt.Fprintf(sb, "%s (%s.%s) ->\n", types.TypeString(curr[j], nil), p.Parent, p.Name)
+								}
+							}
+							fmt.Fprintf(sb, "%s", types.TypeString(a, nil))
+							ec.add(errors.New(sb.String()))
+							hasCycle = true
+							break
+						}
+					}
+					if !hasCycle {
+						next := append(append([]types.Type(nil), curr...), a)
+						stk = append(stk, next)
+					}
+				}
+			default:
+				panic("invalid provider map value")
+			}
+		}
+	}
+	return ec.errors
+}
+
+// bindingConflictError creates a new error describing multiple bindings
+// for the same output type.
+func bindingConflictError(fset *token.FileSet, typ types.Type, set *ProviderSet, cur, prev *providerSetSrc) error {
+	sb := new(strings.Builder)
+	if set.VarName != "" {
+		fmt.Fprintf(sb, "%s has ", set.VarName)
+	}
+	fmt.Fprintf(sb, "multiple bindings for %s\n", types.TypeString(typ, nil))
+	fmt.Fprintf(sb, "current:\n<- %s\n", strings.Join(cur.trace(fset, typ), "\n<- "))
+	fmt.Fprintf(sb, "previous:\n<- %s", strings.Join(prev.trace(fset, typ), "\n<- "))
+	return notePosition(fset.Position(set.Pos), errors.New(sb.String()))
+}
diff --git a/pkg/build/wire/internal/wire/copyast.go b/pkg/build/wire/internal/wire/copyast.go
new file mode 100644
index 0000000000000..179d1c64349ad
--- /dev/null
+++ b/pkg/build/wire/internal/wire/copyast.go
@@ -0,0 +1,493 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package wire
+
+import (
+	"fmt"
+	"go/ast"
+
+	"golang.org/x/tools/go/ast/astutil"
+)
+
+// copyAST performs a deep copy of an AST. *ast.Ident identity will be
+// preserved.
+//
+// This allows using astutil.Apply to rewrite an AST without modifying
+// the original AST.
+func copyAST(original ast.Node) ast.Node {
+	// This function is necessarily long. No utility function exists to do this
+	// clone, as most any attempt would need to have customization options, which
+	// would need to be as expressive as Apply. A possibility to shorten the code
+	// here would be to use reflection, but that trades clarity for shorter code.
+
+	m := make(map[ast.Node]ast.Node)
+	astutil.Apply(original, nil, func(c *astutil.Cursor) bool {
+		switch node := c.Node().(type) {
+		case nil:
+			// No-op.
+		case *ast.ArrayType:
+			m[node] = &ast.ArrayType{
+				Lbrack: node.Lbrack,
+				Len:    exprFromMap(m, node.Len),
+				Elt:    exprFromMap(m, node.Elt),
+			}
+		case *ast.AssignStmt:
+			m[node] = &ast.AssignStmt{
+				Lhs:    copyExprList(m, node.Lhs),
+				TokPos: node.TokPos,
+				Tok:    node.Tok,
+				Rhs:    copyExprList(m, node.Rhs),
+			}
+		case *ast.BadDecl:
+			m[node] = &ast.BadDecl{
+				From: node.From,
+				To:   node.To,
+			}
+		case *ast.BadExpr:
+			m[node] = &ast.BadExpr{
+				From: node.From,
+				To:   node.To,
+			}
+		case *ast.BadStmt:
+			m[node] = &ast.BadStmt{
+				From: node.From,
+				To:   node.To,
+			}
+		case *ast.BasicLit:
+			m[node] = &ast.BasicLit{
+				ValuePos: node.ValuePos,
+				Kind:     node.Kind,
+				Value:    node.Value,
+			}
+		case *ast.BinaryExpr:
+			m[node] = &ast.BinaryExpr{
+				X:     exprFromMap(m, node.X),
+				OpPos: node.OpPos,
+				Op:    node.Op,
+				Y:     exprFromMap(m, node.Y),
+			}
+		case *ast.BlockStmt:
+			m[node] = &ast.BlockStmt{
+				Lbrace: node.Lbrace,
+				List:   copyStmtList(m, node.List),
+				Rbrace: node.Rbrace,
+			}
+		case *ast.BranchStmt:
+			m[node] = &ast.BranchStmt{
+				TokPos: node.TokPos,
+				Tok:    node.Tok,
+				Label:  identFromMap(m, node.Label),
+			}
+		case *ast.CallExpr:
+			m[node] = &ast.CallExpr{
+				Fun:      exprFromMap(m, node.Fun),
+				Lparen:   node.Lparen,
+				Args:     copyExprList(m, node.Args),
+				Ellipsis: node.Ellipsis,
+				Rparen:   node.Rparen,
+			}
+		case *ast.CaseClause:
+			m[node] = &ast.CaseClause{
+				Case:  node.Case,
+				List:  copyExprList(m, node.List),
+				Colon: node.Colon,
+				Body:  copyStmtList(m, node.Body),
+			}
+		case *ast.ChanType:
+			m[node] = &ast.ChanType{
+				Begin: node.Begin,
+				Arrow: node.Arrow,
+				Dir:   node.Dir,
+				Value: exprFromMap(m, node.Value),
+			}
+		case *ast.CommClause:
+			m[node] = &ast.CommClause{
+				Case:  node.Case,
+				Comm:  stmtFromMap(m, node.Comm),
+				Colon: node.Colon,
+				Body:  copyStmtList(m, node.Body),
+			}
+		case *ast.Comment:
+			m[node] = &ast.Comment{
+				Slash: node.Slash,
+				Text:  node.Text,
+			}
+		case *ast.CommentGroup:
+			cg := new(ast.CommentGroup)
+			if node.List != nil {
+				cg.List = make([]*ast.Comment, len(node.List))
+				for i := range node.List {
+					cg.List[i] = m[node.List[i]].(*ast.Comment)
+				}
+			}
+			m[node] = cg
+		case *ast.CompositeLit:
+			m[node] = &ast.CompositeLit{
+				Type:   exprFromMap(m, node.Type),
+				Lbrace: node.Lbrace,
+				Elts:   copyExprList(m, node.Elts),
+				Rbrace: node.Rbrace,
+			}
+		case *ast.DeclStmt:
+			m[node] = &ast.DeclStmt{
+				Decl: m[node.Decl].(ast.Decl),
+			}
+		case *ast.DeferStmt:
+			m[node] = &ast.DeferStmt{
+				Defer: node.Defer,
+				Call:  callExprFromMap(m, node.Call),
+			}
+		case *ast.Ellipsis:
+			m[node] = &ast.Ellipsis{
+				Ellipsis: node.Ellipsis,
+				Elt:      exprFromMap(m, node.Elt),
+			}
+		case *ast.EmptyStmt:
+			m[node] = &ast.EmptyStmt{
+				Semicolon: node.Semicolon,
+				Implicit:  node.Implicit,
+			}
+		case *ast.ExprStmt:
+			m[node] = &ast.ExprStmt{
+				X: exprFromMap(m, node.X),
+			}
+		case *ast.Field:
+			m[node] = &ast.Field{
+				Doc:     commentGroupFromMap(m, node.Doc),
+				Names:   copyIdentList(m, node.Names),
+				Type:    exprFromMap(m, node.Type),
+				Tag:     basicLitFromMap(m, node.Tag),
+				Comment: commentGroupFromMap(m, node.Comment),
+			}
+		case *ast.FieldList:
+			fl := &ast.FieldList{
+				Opening: node.Opening,
+				Closing: node.Closing,
+			}
+			if node.List != nil {
+				fl.List = make([]*ast.Field, len(node.List))
+				for i := range node.List {
+					fl.List[i] = m[node.List[i]].(*ast.Field)
+				}
+			}
+			m[node] = fl
+		case *ast.ForStmt:
+			m[node] = &ast.ForStmt{
+				For:  node.For,
+				Init: stmtFromMap(m, node.Init),
+				Cond: exprFromMap(m, node.Cond),
+				Post: stmtFromMap(m, node.Post),
+				Body: blockStmtFromMap(m, node.Body),
+			}
+		case *ast.FuncDecl:
+			m[node] = &ast.FuncDecl{
+				Doc:  commentGroupFromMap(m, node.Doc),
+				Recv: fieldListFromMap(m, node.Recv),
+				Name: identFromMap(m, node.Name),
+				Type: funcTypeFromMap(m, node.Type),
+				Body: blockStmtFromMap(m, node.Body),
+			}
+		case *ast.FuncLit:
+			m[node] = &ast.FuncLit{
+				Type: funcTypeFromMap(m, node.Type),
+				Body: blockStmtFromMap(m, node.Body),
+			}
+		case *ast.FuncType:
+			m[node] = &ast.FuncType{
+				Func:    node.Func,
+				Params:  fieldListFromMap(m, node.Params),
+				Results: fieldListFromMap(m, node.Results),
+			}
+		case *ast.GenDecl:
+			decl := &ast.GenDecl{
+				Doc:    commentGroupFromMap(m, node.Doc),
+				TokPos: node.TokPos,
+				Tok:    node.Tok,
+				Lparen: node.Lparen,
+				Rparen: node.Rparen,
+			}
+			if node.Specs != nil {
+				decl.Specs = make([]ast.Spec, len(node.Specs))
+				for i := range node.Specs {
+					decl.Specs[i] = m[node.Specs[i]].(ast.Spec)
+				}
+			}
+			m[node] = decl
+		case *ast.GoStmt:
+			m[node] = &ast.GoStmt{
+				Go:   node.Go,
+				Call: callExprFromMap(m, node.Call),
+			}
+		case *ast.Ident:
+			// Keep identifiers the same identity so they can be conveniently
+			// used with the original *types.Info.
+			m[node] = node
+		case *ast.IfStmt:
+			m[node] = &ast.IfStmt{
+				If:   node.If,
+				Init: stmtFromMap(m, node.Init),
+				Cond: exprFromMap(m, node.Cond),
+				Body: blockStmtFromMap(m, node.Body),
+				Else: stmtFromMap(m, node.Else),
+			}
+		case *ast.ImportSpec:
+			m[node] = &ast.ImportSpec{
+				Doc:     commentGroupFromMap(m, node.Doc),
+				Name:    identFromMap(m, node.Name),
+				Path:    basicLitFromMap(m, node.Path),
+				Comment: commentGroupFromMap(m, node.Comment),
+				EndPos:  node.EndPos,
+			}
+		case *ast.IncDecStmt:
+			m[node] = &ast.IncDecStmt{
+				X:      exprFromMap(m, node.X),
+				TokPos: node.TokPos,
+				Tok:    node.Tok,
+			}
+		case *ast.IndexExpr:
+			m[node] = &ast.IndexExpr{
+				X:      exprFromMap(m, node.X),
+				Lbrack: node.Lbrack,
+				Index:  exprFromMap(m, node.Index),
+				Rbrack: node.Rbrack,
+			}
+		case *ast.InterfaceType:
+			m[node] = &ast.InterfaceType{
+				Interface:  node.Interface,
+				Methods:    fieldListFromMap(m, node.Methods),
+				Incomplete: node.Incomplete,
+			}
+		case *ast.KeyValueExpr:
+			m[node] = &ast.KeyValueExpr{
+				Key:   exprFromMap(m, node.Key),
+				Colon: node.Colon,
+				Value: exprFromMap(m, node.Value),
+			}
+		case *ast.LabeledStmt:
+			m[node] = &ast.LabeledStmt{
+				Label: identFromMap(m, node.Label),
+				Colon: node.Colon,
+				Stmt:  stmtFromMap(m, node.Stmt),
+			}
+		case *ast.MapType:
+			m[node] = &ast.MapType{
+				Map:   node.Map,
+				Key:   exprFromMap(m, node.Key),
+				Value: exprFromMap(m, node.Value),
+			}
+		case *ast.ParenExpr:
+			m[node] = &ast.ParenExpr{
+				Lparen: node.Lparen,
+				X:      exprFromMap(m, node.X),
+				Rparen: node.Rparen,
+			}
+		case *ast.RangeStmt:
+			m[node] = &ast.RangeStmt{
+				For:    node.For,
+				Key:    exprFromMap(m, node.Key),
+				Value:  exprFromMap(m, node.Value),
+				TokPos: node.TokPos,
+				Tok:    node.Tok,
+				X:      exprFromMap(m, node.X),
+				Body:   blockStmtFromMap(m, node.Body),
+			}
+		case *ast.ReturnStmt:
+			m[node] = &ast.ReturnStmt{
+				Return:  node.Return,
+				Results: copyExprList(m, node.Results),
+			}
+		case *ast.SelectStmt:
+			m[node] = &ast.SelectStmt{
+				Select: node.Select,
+				Body:   blockStmtFromMap(m, node.Body),
+			}
+		case *ast.SelectorExpr:
+			m[node] = &ast.SelectorExpr{
+				X:   exprFromMap(m, node.X),
+				Sel: identFromMap(m, node.Sel),
+			}
+		case *ast.SendStmt:
+			m[node] = &ast.SendStmt{
+				Chan:  exprFromMap(m, node.Chan),
+				Arrow: node.Arrow,
+				Value: exprFromMap(m, node.Value),
+			}
+		case *ast.SliceExpr:
+			m[node] = &ast.SliceExpr{
+				X:      exprFromMap(m, node.X),
+				Lbrack: node.Lbrack,
+				Low:    exprFromMap(m, node.Low),
+				High:   exprFromMap(m, node.High),
+				Max:    exprFromMap(m, node.Max),
+				Slice3: node.Slice3,
+				Rbrack: node.Rbrack,
+			}
+		case *ast.StarExpr:
+			m[node] = &ast.StarExpr{
+				Star: node.Star,
+				X:    exprFromMap(m, node.X),
+			}
+		case *ast.StructType:
+			m[node] = &ast.StructType{
+				Struct:     node.Struct,
+				Fields:     fieldListFromMap(m, node.Fields),
+				Incomplete: node.Incomplete,
+			}
+		case *ast.SwitchStmt:
+			m[node] = &ast.SwitchStmt{
+				Switch: node.Switch,
+				Init:   stmtFromMap(m, node.Init),
+				Tag:    exprFromMap(m, node.Tag),
+				Body:   blockStmtFromMap(m, node.Body),
+			}
+		case *ast.TypeAssertExpr:
+			m[node] = &ast.TypeAssertExpr{
+				X:      exprFromMap(m, node.X),
+				Lparen: node.Lparen,
+				Type:   exprFromMap(m, node.Type),
+				Rparen: node.Rparen,
+			}
+		case *ast.TypeSpec:
+			m[node] = &ast.TypeSpec{
+				Doc:     commentGroupFromMap(m, node.Doc),
+				Name:    identFromMap(m, node.Name),
+				Assign:  node.Assign,
+				Type:    exprFromMap(m, node.Type),
+				Comment: commentGroupFromMap(m, node.Comment),
+			}
+		case *ast.TypeSwitchStmt:
+			m[node] = &ast.TypeSwitchStmt{
+				Switch: node.Switch,
+				Init:   stmtFromMap(m, node.Init),
+				Assign: stmtFromMap(m, node.Assign),
+				Body:   blockStmtFromMap(m, node.Body),
+			}
+		case *ast.UnaryExpr:
+			m[node] = &ast.UnaryExpr{
+				OpPos: node.OpPos,
+				Op:    node.Op,
+				X:     exprFromMap(m, node.X),
+			}
+		case *ast.ValueSpec:
+			m[node] = &ast.ValueSpec{
+				Doc:     commentGroupFromMap(m, node.Doc),
+				Names:   copyIdentList(m, node.Names),
+				Type:    exprFromMap(m, node.Type),
+				Values:  copyExprList(m, node.Values),
+				Comment: commentGroupFromMap(m, node.Comment),
+			}
+		default:
+			panic(fmt.Sprintf("unhandled AST node: %T", node))
+		}
+		return true
+	})
+	return m[original]
+}
+
+func commentGroupFromMap(m map[ast.Node]ast.Node, key *ast.CommentGroup) *ast.CommentGroup {
+	if key == nil {
+		return nil
+	}
+	return m[key].(*ast.CommentGroup)
+}
+
+func exprFromMap(m map[ast.Node]ast.Node, key ast.Expr) ast.Expr {
+	if key == nil {
+		return nil
+	}
+	return m[key].(ast.Expr)
+}
+
+func stmtFromMap(m map[ast.Node]ast.Node, key ast.Stmt) ast.Stmt {
+	if key == nil {
+		return nil
+	}
+	return m[key].(ast.Stmt)
+}
+
+func identFromMap(m map[ast.Node]ast.Node, key *ast.Ident) *ast.Ident {
+	if key == nil {
+		return nil
+	}
+	return m[key].(*ast.Ident)
+}
+
+func blockStmtFromMap(m map[ast.Node]ast.Node, key *ast.BlockStmt) *ast.BlockStmt {
+	if key == nil {
+		return nil
+	}
+	return m[key].(*ast.BlockStmt)
+}
+
+func fieldListFromMap(m map[ast.Node]ast.Node, key *ast.FieldList) *ast.FieldList {
+	if key == nil {
+		return nil
+	}
+	return m[key].(*ast.FieldList)
+}
+
+func callExprFromMap(m map[ast.Node]ast.Node, key *ast.CallExpr) *ast.CallExpr {
+	if key == nil {
+		return nil
+	}
+	return m[key].(*ast.CallExpr)
+}
+
+func basicLitFromMap(m map[ast.Node]ast.Node, key *ast.BasicLit) *ast.BasicLit {
+	if key == nil {
+		return nil
+	}
+	return m[key].(*ast.BasicLit)
+}
+
+func funcTypeFromMap(m map[ast.Node]ast.Node, key *ast.FuncType) *ast.FuncType {
+	if key == nil {
+		return nil
+	}
+	return m[key].(*ast.FuncType)
+}
+
+func copyExprList(m map[ast.Node]ast.Node, exprs []ast.Expr) []ast.Expr {
+	if exprs == nil {
+		return nil
+	}
+	newExprs := make([]ast.Expr, len(exprs))
+	for i := range exprs {
+		newExprs[i] = m[exprs[i]].(ast.Expr)
+	}
+	return newExprs
+}
+
+func copyStmtList(m map[ast.Node]ast.Node, stmts []ast.Stmt) []ast.Stmt {
+	if stmts == nil {
+		return nil
+	}
+	newStmts := make([]ast.Stmt, len(stmts))
+	for i := range stmts {
+		newStmts[i] = m[stmts[i]].(ast.Stmt)
+	}
+	return newStmts
+}
+
+func copyIdentList(m map[ast.Node]ast.Node, idents []*ast.Ident) []*ast.Ident {
+	if idents == nil {
+		return nil
+	}
+	newIdents := make([]*ast.Ident, len(idents))
+	for i := range idents {
+		newIdents[i] = m[idents[i]].(*ast.Ident)
+	}
+	return newIdents
+}
diff --git a/pkg/build/wire/internal/wire/errors.go b/pkg/build/wire/internal/wire/errors.go
new file mode 100644
index 0000000000000..73c7d1f50e57e
--- /dev/null
+++ b/pkg/build/wire/internal/wire/errors.go
@@ -0,0 +1,84 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package wire
+
+import (
+	"go/token"
+)
+
+// errorCollector manages a list of errors. The zero value is an empty list.
+type errorCollector struct {
+	errors []error
+}
+
+// add appends any non-nil errors to the collector.
+func (ec *errorCollector) add(errs ...error) {
+	for _, e := range errs {
+		if e != nil {
+			ec.errors = append(ec.errors, e)
+		}
+	}
+}
+
+// mapErrors returns a new slice that wraps any errors using the given function.
+func mapErrors(errs []error, f func(error) error) []error {
+	if len(errs) == 0 {
+		return nil
+	}
+	newErrs := make([]error, len(errs))
+	for i := range errs {
+		newErrs[i] = f(errs[i])
+	}
+	return newErrs
+}
+
+// A wireErr is an error with an optional position.
+type wireErr struct {
+	error    error
+	position token.Position
+}
+
+// notePosition wraps an error with position information if it doesn't already
+// have it.
+//
+// notePosition is usually called multiple times as an error goes up the call
+// stack, so calling notePosition on an existing *wireErr will not modify the
+// position, as the assumption is that deeper calls have more precise position
+// information about the source of the error.
+func notePosition(p token.Position, e error) error {
+	switch e.(type) {
+	case nil:
+		return nil
+	case *wireErr:
+		return e
+	default:
+		return &wireErr{error: e, position: p}
+	}
+}
+
+// notePositionAll wraps a list of errors with the given position.
+func notePositionAll(p token.Position, errs []error) []error {
+	return mapErrors(errs, func(e error) error {
+		return notePosition(p, e)
+	})
+}
+
+// Error returns the error message prefixed by the position if valid.
+func (w *wireErr) Error() string {
+	if !w.position.IsValid() {
+		return w.error.Error()
+	}
+	return w.position.String() + ": " + w.error.Error()
+}
diff --git a/pkg/build/wire/internal/wire/parse.go b/pkg/build/wire/internal/wire/parse.go
new file mode 100644
index 0000000000000..3952e6fdaab44
--- /dev/null
+++ b/pkg/build/wire/internal/wire/parse.go
@@ -0,0 +1,1247 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package wire
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"go/ast"
+	"go/token"
+	"go/types"
+	"os"
+	"reflect"
+	"strconv"
+	"strings"
+
+	"golang.org/x/tools/go/ast/astutil"
+	"golang.org/x/tools/go/packages"
+	"golang.org/x/tools/go/types/typeutil"
+)
+
+// A providerSetSrc captures the source for a type provided by a ProviderSet.
+// Exactly one of the fields will be set.
+type providerSetSrc struct {
+	Provider    *Provider
+	Binding     *IfaceBinding
+	Value       *Value
+	Import      *ProviderSet
+	InjectorArg *InjectorArg
+	Field       *Field
+}
+
+// description returns a string describing the source of p, including line numbers.
+func (p *providerSetSrc) description(fset *token.FileSet, typ types.Type) string {
+	quoted := func(s string) string {
+		if s == "" {
+			return ""
+		}
+		return fmt.Sprintf("%q ", s)
+	}
+	switch {
+	case p.Provider != nil:
+		kind := "provider"
+		if p.Provider.IsStruct {
+			kind = "struct provider"
+		}
+		return fmt.Sprintf("%s %s(%s)", kind, quoted(p.Provider.Name), fset.Position(p.Provider.Pos))
+	case p.Binding != nil:
+		return fmt.Sprintf("wire.Bind (%s)", fset.Position(p.Binding.Pos))
+	case p.Value != nil:
+		return fmt.Sprintf("wire.Value (%s)", fset.Position(p.Value.Pos))
+	case p.Import != nil:
+		return fmt.Sprintf("provider set %s(%s)", quoted(p.Import.VarName), fset.Position(p.Import.Pos))
+	case p.InjectorArg != nil:
+		args := p.InjectorArg.Args
+		return fmt.Sprintf("argument %s to injector function %s (%s)", args.Tuple.At(p.InjectorArg.Index).Name(), args.Name, fset.Position(args.Pos))
+	case p.Field != nil:
+		return fmt.Sprintf("wire.FieldsOf (%s)", fset.Position(p.Field.Pos))
+	}
+	panic("providerSetSrc with no fields set")
+}
+
+// trace returns a slice of strings describing the (possibly recursive) source
+// of p, including line numbers.
+func (p *providerSetSrc) trace(fset *token.FileSet, typ types.Type) []string {
+	var retval []string
+	// Only Imports need recursion.
+	if p.Import != nil {
+		if parent := p.Import.srcMap.At(typ); parent != nil {
+			retval = append(retval, parent.(*providerSetSrc).trace(fset, typ)...)
+		}
+	}
+	retval = append(retval, p.description(fset, typ))
+	return retval
+}
+
+// A ProviderSet describes a set of providers.  The zero value is an empty
+// ProviderSet.
+type ProviderSet struct {
+	// Pos is the position of the call to wire.NewSet or wire.Build that
+	// created the set.
+	Pos token.Pos
+	// PkgPath is the import path of the package that declared this set.
+	PkgPath string
+	// VarName is the variable name of the set, if it came from a package
+	// variable.
+	VarName string
+
+	Providers []*Provider
+	Bindings  []*IfaceBinding
+	Values    []*Value
+	Fields    []*Field
+	Imports   []*ProviderSet
+	// InjectorArgs is only filled in for wire.Build.
+	InjectorArgs *InjectorArgs
+
+	// providerMap maps from provided type to a *ProvidedType.
+	// It includes all of the imported types.
+	providerMap *typeutil.Map
+
+	// srcMap maps from provided type to a *providerSetSrc capturing the
+	// Provider, Binding, Value, or Import that provided the type.
+	srcMap *typeutil.Map
+}
+
+// Outputs returns a new slice containing the set of possible types the
+// provider set can produce. The order is unspecified.
+func (set *ProviderSet) Outputs() []types.Type {
+	return set.providerMap.Keys()
+}
+
+// For returns a ProvidedType for the given type, or the zero ProvidedType.
+func (set *ProviderSet) For(t types.Type) ProvidedType {
+	pt := set.providerMap.At(t)
+	if pt == nil {
+		return ProvidedType{}
+	}
+	return *pt.(*ProvidedType)
+}
+
+// An IfaceBinding declares that a type should be used to satisfy inputs
+// of the given interface type.
+type IfaceBinding struct {
+	// Iface is the interface type, which is what can be injected.
+	Iface types.Type
+
+	// Provided is always a type that is assignable to Iface.
+	Provided types.Type
+
+	// Pos is the position where the binding was declared.
+	Pos token.Pos
+}
+
+// Provider records the signature of a provider. A provider is a
+// single Go object, either a function or a named struct type.
+type Provider struct {
+	// Pkg is the package that the Go object resides in.
+	Pkg *types.Package
+
+	// Name is the name of the Go object.
+	Name string
+
+	// Pos is the source position of the func keyword or type spec
+	// defining this provider.
+	Pos token.Pos
+
+	// Args is the list of data dependencies this provider has.
+	Args []ProviderInput
+
+	// Varargs is true if the provider function is variadic.
+	Varargs bool
+
+	// IsStruct is true if this provider is a named struct type.
+	// Otherwise it's a function.
+	IsStruct bool
+
+	// Out is the set of types this provider produces. It will always
+	// contain at least one type.
+	Out []types.Type
+
+	// HasCleanup reports whether the provider function returns a cleanup
+	// function.  (Always false for structs.)
+	HasCleanup bool
+
+	// HasErr reports whether the provider function can return an error.
+	// (Always false for structs.)
+	HasErr bool
+}
+
+// ProviderInput describes an incoming edge in the provider graph.
+type ProviderInput struct {
+	Type types.Type
+
+	// If the provider is a struct, FieldName will be the field name to set.
+	FieldName string
+}
+
+// Value describes a value expression.
+type Value struct {
+	// Pos is the source position of the expression defining this value.
+	Pos token.Pos
+
+	// Out is the type this value produces.
+	Out types.Type
+
+	// expr is the expression passed to wire.Value.
+	expr ast.Expr
+
+	// info is the type info for the expression.
+	info *types.Info
+}
+
+// InjectorArg describes a specific argument passed to an injector function.
+type InjectorArg struct {
+	// Args is the full set of arguments.
+	Args *InjectorArgs
+	// Index is the index into Args.Tuple for this argument.
+	Index int
+}
+
+// InjectorArgs describes the arguments passed to an injector function.
+type InjectorArgs struct {
+	// Name is the name of the injector function.
+	Name string
+	// Tuple represents the arguments.
+	Tuple *types.Tuple
+	// Pos is the source position of the injector function.
+	Pos token.Pos
+}
+
+// Field describes a specific field selected from a struct.
+type Field struct {
+	// Parent is the struct or pointer to the struct that the field belongs to.
+	Parent types.Type
+	// Name is the field name.
+	Name string
+	// Pkg is the package that the struct resides in.
+	Pkg *types.Package
+	// Pos is the source position of the field declaration.
+	// defining these fields.
+	Pos token.Pos
+	// Out is the field's provided types. The first element provides the
+	// field type. If the field is coming from a pointer to a struct,
+	// there will be a second element providing a pointer to the field.
+	Out []types.Type
+}
+
+// Load finds all the provider sets in the packages that match the given
+// patterns, as well as the provider sets' transitive dependencies. It
+// may return both errors and Info. The patterns are defined by the
+// underlying build system. For the go tool, this is described at
+// https://golang.org/cmd/go/#hdr-Package_lists_and_patterns
+//
+// wd is the working directory and env is the set of environment
+// variables to use when loading the packages specified by patterns. If
+// env is nil or empty, it is interpreted as an empty set of variables.
+// In case of duplicate environment variables, the last one in the list
+// takes precedence.
+func Load(ctx context.Context, wd string, env []string, tags string, patterns []string) (*Info, []error) {
+	pkgs, errs := load(ctx, wd, env, tags, patterns)
+	if len(errs) > 0 {
+		return nil, errs
+	}
+	if len(pkgs) == 0 {
+		return new(Info), nil
+	}
+	fset := pkgs[0].Fset
+	info := &Info{
+		Fset: fset,
+		Sets: make(map[ProviderSetID]*ProviderSet),
+	}
+	oc := newObjectCache(pkgs)
+	ec := new(errorCollector)
+	for _, pkg := range pkgs {
+		if isWireImport(pkg.PkgPath) {
+			// The marker function package confuses analysis.
+			continue
+		}
+		scope := pkg.Types.Scope()
+		for _, name := range scope.Names() {
+			obj := scope.Lookup(name)
+			if !isProviderSetType(obj.Type()) {
+				continue
+			}
+			item, errs := oc.get(obj)
+			if len(errs) > 0 {
+				ec.add(notePositionAll(fset.Position(obj.Pos()), errs)...)
+				continue
+			}
+			pset := item.(*ProviderSet)
+			// pset.Name may not equal name, since it could be an alias to
+			// another provider set.
+			id := ProviderSetID{ImportPath: pset.PkgPath, VarName: name}
+			info.Sets[id] = pset
+		}
+		for _, f := range pkg.Syntax {
+			for _, decl := range f.Decls {
+				fn, ok := decl.(*ast.FuncDecl)
+				if !ok {
+					continue
+				}
+				buildCall, err := findInjectorBuild(pkg.TypesInfo, fn)
+				if err != nil {
+					ec.add(notePosition(fset.Position(fn.Pos()), fmt.Errorf("inject %s: %v", fn.Name.Name, err)))
+					continue
+				}
+				if buildCall == nil {
+					continue
+				}
+				sig := pkg.TypesInfo.ObjectOf(fn.Name).Type().(*types.Signature)
+				ins, out, err := injectorFuncSignature(sig)
+				if err != nil {
+					if w, ok := err.(*wireErr); ok {
+						ec.add(notePosition(w.position, fmt.Errorf("inject %s: %v", fn.Name.Name, w.error)))
+					} else {
+						ec.add(notePosition(fset.Position(fn.Pos()), fmt.Errorf("inject %s: %v", fn.Name.Name, err)))
+					}
+					continue
+				}
+				injectorArgs := &InjectorArgs{
+					Name:  fn.Name.Name,
+					Tuple: ins,
+					Pos:   fn.Pos(),
+				}
+				set, errs := oc.processNewSet(pkg.TypesInfo, pkg.PkgPath, buildCall, injectorArgs, "")
+				if len(errs) > 0 {
+					ec.add(notePositionAll(fset.Position(fn.Pos()), errs)...)
+					continue
+				}
+				_, errs = solve(fset, out.out, ins, set)
+				if len(errs) > 0 {
+					ec.add(mapErrors(errs, func(e error) error {
+						if w, ok := e.(*wireErr); ok {
+							return notePosition(w.position, fmt.Errorf("inject %s: %v", fn.Name.Name, w.error))
+						}
+						return notePosition(fset.Position(fn.Pos()), fmt.Errorf("inject %s: %v", fn.Name.Name, e))
+					})...)
+					continue
+				}
+				info.Injectors = append(info.Injectors, &Injector{
+					ImportPath: pkg.PkgPath,
+					FuncName:   fn.Name.Name,
+				})
+			}
+		}
+	}
+	return info, ec.errors
+}
+
+// load typechecks the packages that match the given patterns and
+// includes source for all transitive dependencies. The patterns are
+// defined by the underlying build system. For the go tool, this is
+// described at https://golang.org/cmd/go/#hdr-Package_lists_and_patterns
+//
+// wd is the working directory and env is the set of environment
+// variables to use when loading the packages specified by patterns. If
+// env is nil or empty, it is interpreted as an empty set of variables.
+// In case of duplicate environment variables, the last one in the list
+// takes precedence.
+func load(ctx context.Context, wd string, env []string, tags string, patterns []string) ([]*packages.Package, []error) {
+	cfg := &packages.Config{
+		Context:    ctx,
+		Mode:       packages.LoadAllSyntax,
+		Dir:        wd,
+		Env:        env,
+		BuildFlags: []string{"-tags=wireinject"},
+		// TODO(light): Use ParseFile to skip function bodies and comments in indirect packages.
+	}
+	if len(tags) > 0 {
+		cfg.BuildFlags[0] += " " + tags
+	}
+	escaped := make([]string, len(patterns))
+	for i := range patterns {
+		escaped[i] = "pattern=" + patterns[i]
+	}
+	pkgs, err := packages.Load(cfg, escaped...)
+	if err != nil {
+		return nil, []error{err}
+	}
+	var errs []error
+	for _, p := range pkgs {
+		for _, e := range p.Errors {
+			errs = append(errs, e)
+		}
+	}
+	if len(errs) > 0 {
+		return nil, errs
+	}
+	return pkgs, nil
+}
+
+// Info holds the result of Load.
+type Info struct {
+	Fset *token.FileSet
+
+	// Sets contains all the provider sets in the initial packages.
+	Sets map[ProviderSetID]*ProviderSet
+
+	// Injectors contains all the injector functions in the initial packages.
+	// The order is undefined.
+	Injectors []*Injector
+}
+
+// A ProviderSetID identifies a named provider set.
+type ProviderSetID struct {
+	ImportPath string
+	VarName    string
+}
+
+// String returns the ID as ""path/to/pkg".Foo".
+func (id ProviderSetID) String() string {
+	return strconv.Quote(id.ImportPath) + "." + id.VarName
+}
+
+// An Injector describes an injector function.
+type Injector struct {
+	ImportPath string
+	FuncName   string
+}
+
+// String returns the injector name as ""path/to/pkg".Foo".
+func (in *Injector) String() string {
+	return strconv.Quote(in.ImportPath) + "." + in.FuncName
+}
+
+// objectCache is a lazily evaluated mapping of objects to Wire structures.
+type objectCache struct {
+	fset     *token.FileSet
+	packages map[string]*packages.Package
+	objects  map[objRef]objCacheEntry
+	hasher   typeutil.Hasher
+}
+
+type objRef struct {
+	importPath string
+	name       string
+}
+
+type objCacheEntry struct {
+	val  interface{} // *Provider, *ProviderSet, *IfaceBinding, or *Value
+	errs []error
+}
+
+func newObjectCache(pkgs []*packages.Package) *objectCache {
+	if len(pkgs) == 0 {
+		panic("object cache must have packages to draw from")
+	}
+	oc := &objectCache{
+		fset:     pkgs[0].Fset,
+		packages: make(map[string]*packages.Package),
+		objects:  make(map[objRef]objCacheEntry),
+		hasher:   typeutil.MakeHasher(),
+	}
+	// Depth-first search of all dependencies to gather import path to
+	// packages.Package mapping. go/packages guarantees that for a single
+	// call to packages.Load and an import path X, there will exist only
+	// one *packages.Package value with PkgPath X.
+	stk := append([]*packages.Package(nil), pkgs...)
+	for len(stk) > 0 {
+		p := stk[len(stk)-1]
+		stk = stk[:len(stk)-1]
+		if oc.packages[p.PkgPath] != nil {
+			continue
+		}
+		oc.packages[p.PkgPath] = p
+		for _, imp := range p.Imports {
+			stk = append(stk, imp)
+		}
+	}
+	return oc
+}
+
+// get converts a Go object into a Wire structure. It may return a *Provider, an
+// *IfaceBinding, a *ProviderSet, a *Value, or a []*Field.
+func (oc *objectCache) get(obj types.Object) (val interface{}, errs []error) {
+	ref := objRef{
+		importPath: obj.Pkg().Path(),
+		name:       obj.Name(),
+	}
+	if ent, cached := oc.objects[ref]; cached {
+		return ent.val, append([]error(nil), ent.errs...)
+	}
+	defer func() {
+		oc.objects[ref] = objCacheEntry{
+			val:  val,
+			errs: append([]error(nil), errs...),
+		}
+	}()
+	switch obj := obj.(type) {
+	case *types.Var:
+		spec := oc.varDecl(obj)
+		if spec == nil || len(spec.Values) == 0 {
+			return nil, []error{fmt.Errorf("%v is not a provider or a provider set", obj)}
+		}
+		var i int
+		for i = range spec.Names {
+			if spec.Names[i].Name == obj.Name() {
+				break
+			}
+		}
+		pkgPath := obj.Pkg().Path()
+		return oc.processExpr(oc.packages[pkgPath].TypesInfo, pkgPath, spec.Values[i], obj.Name())
+	case *types.Func:
+		return processFuncProvider(oc.fset, obj)
+	default:
+		return nil, []error{fmt.Errorf("%v is not a provider or a provider set", obj)}
+	}
+}
+
+// varDecl finds the declaration that defines the given variable.
+func (oc *objectCache) varDecl(obj *types.Var) *ast.ValueSpec {
+	// TODO(light): Walk files to build object -> declaration mapping, if more performant.
+	// Recommended by https://golang.org/s/types-tutorial
+	pkg := oc.packages[obj.Pkg().Path()]
+	pos := obj.Pos()
+	for _, f := range pkg.Syntax {
+		tokenFile := oc.fset.File(f.Pos())
+		if base := tokenFile.Base(); base <= int(pos) && int(pos) < base+tokenFile.Size() {
+			path, _ := astutil.PathEnclosingInterval(f, pos, pos)
+			for _, node := range path {
+				if spec, ok := node.(*ast.ValueSpec); ok {
+					return spec
+				}
+			}
+		}
+	}
+	return nil
+}
+
+// processExpr converts an expression into a Wire structure. It may return a
+// *Provider, an *IfaceBinding, a *ProviderSet, a *Value or a []*Field.
+func (oc *objectCache) processExpr(info *types.Info, pkgPath string, expr ast.Expr, varName string) (interface{}, []error) {
+	exprPos := oc.fset.Position(expr.Pos())
+	expr = astutil.Unparen(expr)
+	if obj := qualifiedIdentObject(info, expr); obj != nil {
+		item, errs := oc.get(obj)
+		return item, mapErrors(errs, func(err error) error {
+			return notePosition(exprPos, err)
+		})
+	}
+	if call, ok := expr.(*ast.CallExpr); ok {
+		fnObj := qualifiedIdentObject(info, call.Fun)
+		if fnObj == nil {
+			return nil, []error{notePosition(exprPos, errors.New("unknown pattern fnObj nil"))}
+		}
+		pkg := fnObj.Pkg()
+		if pkg == nil {
+			return nil, []error{notePosition(exprPos, fmt.Errorf("unknown pattern - pkg in fnObj is nil - %s", fnObj))}
+		}
+		if !isWireImport(pkg.Path()) {
+			return nil, []error{notePosition(exprPos, errors.New("unknown pattern"))}
+		}
+		switch fnObj.Name() {
+		case "NewSet":
+			pset, errs := oc.processNewSet(info, pkgPath, call, nil, varName)
+			return pset, notePositionAll(exprPos, errs)
+		case "Bind":
+			b, err := processBind(oc.fset, info, call)
+			if err != nil {
+				return nil, []error{notePosition(exprPos, err)}
+			}
+			return b, nil
+		case "Value":
+			v, err := processValue(oc.fset, info, call)
+			if err != nil {
+				return nil, []error{notePosition(exprPos, err)}
+			}
+			return v, nil
+		case "InterfaceValue":
+			v, err := processInterfaceValue(oc.fset, info, call)
+			if err != nil {
+				return nil, []error{notePosition(exprPos, err)}
+			}
+			return v, nil
+		case "Struct":
+			s, err := processStructProvider(oc.fset, info, call)
+			if err != nil {
+				return nil, []error{notePosition(exprPos, err)}
+			}
+			return s, nil
+		case "FieldsOf":
+			v, err := processFieldsOf(oc.fset, info, call)
+			if err != nil {
+				return nil, []error{notePosition(exprPos, err)}
+			}
+			return v, nil
+		default:
+			return nil, []error{notePosition(exprPos, errors.New("unknown pattern"))}
+		}
+	}
+	if tn := structArgType(info, expr); tn != nil {
+		p, errs := processStructLiteralProvider(oc.fset, tn)
+		if len(errs) > 0 {
+			return nil, notePositionAll(exprPos, errs)
+		}
+		return p, nil
+	}
+	return nil, []error{notePosition(exprPos, errors.New("unknown pattern"))}
+}
+
+func (oc *objectCache) processNewSet(info *types.Info, pkgPath string, call *ast.CallExpr, args *InjectorArgs, varName string) (*ProviderSet, []error) {
+	// Assumes that call.Fun is wire.NewSet or wire.Build.
+
+	pset := &ProviderSet{
+		Pos:          call.Pos(),
+		InjectorArgs: args,
+		PkgPath:      pkgPath,
+		VarName:      varName,
+	}
+	ec := new(errorCollector)
+	for _, arg := range call.Args {
+		item, errs := oc.processExpr(info, pkgPath, arg, "")
+		if len(errs) > 0 {
+			ec.add(errs...)
+			continue
+		}
+		switch item := item.(type) {
+		case *Provider:
+			pset.Providers = append(pset.Providers, item)
+		case *ProviderSet:
+			pset.Imports = append(pset.Imports, item)
+		case *IfaceBinding:
+			pset.Bindings = append(pset.Bindings, item)
+		case *Value:
+			pset.Values = append(pset.Values, item)
+		case []*Field:
+			pset.Fields = append(pset.Fields, item...)
+		default:
+			panic("unknown item type")
+		}
+	}
+	if len(ec.errors) > 0 {
+		return nil, ec.errors
+	}
+	var errs []error
+	pset.providerMap, pset.srcMap, errs = buildProviderMap(oc.fset, oc.hasher, pset)
+	if len(errs) > 0 {
+		return nil, errs
+	}
+	if errs := verifyAcyclic(pset.providerMap, oc.hasher); len(errs) > 0 {
+		return nil, errs
+	}
+	return pset, nil
+}
+
+// structArgType attempts to interpret an expression as a simple struct type.
+// It assumes any parentheses have been stripped.
+func structArgType(info *types.Info, expr ast.Expr) *types.TypeName {
+	lit, ok := expr.(*ast.CompositeLit)
+	if !ok {
+		return nil
+	}
+	tn, ok := qualifiedIdentObject(info, lit.Type).(*types.TypeName)
+	if !ok {
+		return nil
+	}
+	if _, isStruct := tn.Type().Underlying().(*types.Struct); !isStruct {
+		return nil
+	}
+	return tn
+}
+
+// qualifiedIdentObject finds the object for an identifier or a
+// qualified identifier, or nil if the object could not be found.
+func qualifiedIdentObject(info *types.Info, expr ast.Expr) types.Object {
+	switch expr := expr.(type) {
+	case *ast.Ident:
+		return info.ObjectOf(expr)
+	case *ast.SelectorExpr:
+		pkgName, ok := expr.X.(*ast.Ident)
+		if !ok {
+			return nil
+		}
+		if _, ok := info.ObjectOf(pkgName).(*types.PkgName); !ok {
+			return nil
+		}
+		return info.ObjectOf(expr.Sel)
+	default:
+		return nil
+	}
+}
+
+// processFuncProvider creates a provider for a function declaration.
+func processFuncProvider(fset *token.FileSet, fn *types.Func) (*Provider, []error) {
+	sig := fn.Type().(*types.Signature)
+	fpos := fn.Pos()
+	providerSig, err := funcOutput(sig)
+	if err != nil {
+		return nil, []error{notePosition(fset.Position(fpos), fmt.Errorf("wrong signature for provider %s: %v", fn.Name(), err))}
+	}
+	params := sig.Params()
+	provider := &Provider{
+		Pkg:        fn.Pkg(),
+		Name:       fn.Name(),
+		Pos:        fn.Pos(),
+		Args:       make([]ProviderInput, params.Len()),
+		Varargs:    sig.Variadic(),
+		Out:        []types.Type{providerSig.out},
+		HasCleanup: providerSig.cleanup,
+		HasErr:     providerSig.err,
+	}
+	for i := 0; i < params.Len(); i++ {
+		provider.Args[i] = ProviderInput{
+			Type: params.At(i).Type(),
+		}
+		for j := 0; j < i; j++ {
+			if types.Identical(provider.Args[i].Type, provider.Args[j].Type) {
+				return nil, []error{notePosition(fset.Position(fpos), fmt.Errorf("provider has multiple parameters of type %s", types.TypeString(provider.Args[j].Type, nil)))}
+			}
+		}
+	}
+	return provider, nil
+}
+
+func injectorFuncSignature(sig *types.Signature) (*types.Tuple, outputSignature, error) {
+	out, err := funcOutput(sig)
+	if err != nil {
+		return nil, outputSignature{}, err
+	}
+	return sig.Params(), out, nil
+}
+
+type outputSignature struct {
+	out     types.Type
+	cleanup bool
+	err     bool
+}
+
+// funcOutput validates an injector or provider function's return signature.
+func funcOutput(sig *types.Signature) (outputSignature, error) {
+	results := sig.Results()
+	switch results.Len() {
+	case 0:
+		return outputSignature{}, errors.New("no return values")
+	case 1:
+		return outputSignature{out: results.At(0).Type()}, nil
+	case 2:
+		out := results.At(0).Type()
+		switch t := results.At(1).Type(); {
+		case types.Identical(t, errorType):
+			return outputSignature{out: out, err: true}, nil
+		case types.Identical(t, cleanupType):
+			return outputSignature{out: out, cleanup: true}, nil
+		default:
+			return outputSignature{}, fmt.Errorf("second return type is %s; must be error or func()", types.TypeString(t, nil))
+		}
+	case 3:
+		if t := results.At(1).Type(); !types.Identical(t, cleanupType) {
+			return outputSignature{}, fmt.Errorf("second return type is %s; must be func()", types.TypeString(t, nil))
+		}
+		if t := results.At(2).Type(); !types.Identical(t, errorType) {
+			return outputSignature{}, fmt.Errorf("third return type is %s; must be error", types.TypeString(t, nil))
+		}
+		return outputSignature{
+			out:     results.At(0).Type(),
+			cleanup: true,
+			err:     true,
+		}, nil
+	default:
+		return outputSignature{}, errors.New("too many return values")
+	}
+}
+
+// processStructLiteralProvider creates a provider for a named struct type.
+// It produces pointer and non-pointer variants via two values in Out.
+//
+// This is a copy of the old processStructProvider, which is deprecated now.
+// It will not support any new feature introduced after v0.2. Please use the new
+// wire.Struct syntax for those.
+func processStructLiteralProvider(fset *token.FileSet, typeName *types.TypeName) (*Provider, []error) {
+	out := typeName.Type()
+	st, ok := out.Underlying().(*types.Struct)
+	if !ok {
+		return nil, []error{fmt.Errorf("%v does not name a struct", typeName)}
+	}
+
+	pos := typeName.Pos()
+	fmt.Fprintf(os.Stderr,
+		"Warning: %v, see https://godoc.org/github.com/google/wire#Struct for more information.\n",
+		notePosition(fset.Position(pos),
+			fmt.Errorf("using struct literal to inject %s is deprecated and will be removed in the next release; use wire.Struct instead",
+				typeName.Type())))
+	provider := &Provider{
+		Pkg:      typeName.Pkg(),
+		Name:     typeName.Name(),
+		Pos:      pos,
+		Args:     make([]ProviderInput, st.NumFields()),
+		IsStruct: true,
+		Out:      []types.Type{out, types.NewPointer(out)},
+	}
+	for i := 0; i < st.NumFields(); i++ {
+		f := st.Field(i)
+		provider.Args[i] = ProviderInput{
+			Type:      f.Type(),
+			FieldName: f.Name(),
+		}
+		for j := 0; j < i; j++ {
+			if types.Identical(provider.Args[i].Type, provider.Args[j].Type) {
+				return nil, []error{notePosition(fset.Position(pos), fmt.Errorf("provider struct has multiple fields of type %s", types.TypeString(provider.Args[j].Type, nil)))}
+			}
+		}
+	}
+	return provider, nil
+}
+
+// processStructProvider creates a provider for a named struct type.
+// It produces pointer and non-pointer variants via two values in Out.
+func processStructProvider(fset *token.FileSet, info *types.Info, call *ast.CallExpr) (*Provider, error) {
+	// Assumes that call.Fun is wire.Struct.
+
+	if len(call.Args) < 1 {
+		return nil, notePosition(fset.Position(call.Pos()),
+			errors.New("call to Struct must specify the struct to be injected"))
+	}
+	const firstArgReqFormat = "first argument to Struct must be a pointer to a named struct; found %s"
+	structType := info.TypeOf(call.Args[0])
+	structPtr, ok := structType.(*types.Pointer)
+	if !ok {
+		return nil, notePosition(fset.Position(call.Pos()),
+			fmt.Errorf(firstArgReqFormat, types.TypeString(structType, nil)))
+	}
+
+	st, ok := structPtr.Elem().Underlying().(*types.Struct)
+	if !ok {
+		return nil, notePosition(fset.Position(call.Pos()),
+			fmt.Errorf(firstArgReqFormat, types.TypeString(structPtr, nil)))
+	}
+
+	stExpr := call.Args[0].(*ast.CallExpr)
+	typeName := qualifiedIdentObject(info, stExpr.Args[0]) // should be either an identifier or selector
+	provider := &Provider{
+		Pkg:      typeName.Pkg(),
+		Name:     typeName.Name(),
+		Pos:      typeName.Pos(),
+		IsStruct: true,
+		Out:      []types.Type{structPtr.Elem(), structPtr},
+	}
+	if allFields(call) {
+		for i := 0; i < st.NumFields(); i++ {
+			if isPrevented(st.Tag(i)) {
+				continue
+			}
+			f := st.Field(i)
+			provider.Args = append(provider.Args, ProviderInput{
+				Type:      f.Type(),
+				FieldName: f.Name(),
+			})
+		}
+	} else {
+		provider.Args = make([]ProviderInput, len(call.Args)-1)
+		for i := 1; i < len(call.Args); i++ {
+			v, err := checkField(call.Args[i], st)
+			if err != nil {
+				return nil, notePosition(fset.Position(call.Pos()), err)
+			}
+			provider.Args[i-1] = ProviderInput{
+				Type:      v.Type(),
+				FieldName: v.Name(),
+			}
+		}
+	}
+	for i := 0; i < len(provider.Args); i++ {
+		for j := 0; j < i; j++ {
+			if types.Identical(provider.Args[i].Type, provider.Args[j].Type) {
+				f := st.Field(j)
+				return nil, notePosition(fset.Position(f.Pos()), fmt.Errorf("provider struct has multiple fields of type %s", types.TypeString(provider.Args[j].Type, nil)))
+			}
+		}
+	}
+	return provider, nil
+}
+
+func allFields(call *ast.CallExpr) bool {
+	if len(call.Args) != 2 {
+		return false
+	}
+	b, ok := call.Args[1].(*ast.BasicLit)
+	if !ok {
+		return false
+	}
+	return strings.EqualFold(strconv.Quote("*"), b.Value)
+}
+
+// isPrevented checks whether field i is prevented by tag "-".
+// Since this is the only tag used by wire, we can do string comparison
+// without using reflect.
+func isPrevented(tag string) bool {
+	return reflect.StructTag(tag).Get("wire") == "-"
+}
+
+// processBind creates an interface binding from a wire.Bind call.
+func processBind(fset *token.FileSet, info *types.Info, call *ast.CallExpr) (*IfaceBinding, error) {
+	// Assumes that call.Fun is wire.Bind.
+
+	if len(call.Args) != 2 {
+		return nil, notePosition(fset.Position(call.Pos()),
+			errors.New("call to Bind takes exactly two arguments"))
+	}
+	// TODO(light): Verify that arguments are simple expressions.
+	ifaceArgType := info.TypeOf(call.Args[0])
+	ifacePtr, ok := ifaceArgType.(*types.Pointer)
+	if !ok {
+		return nil, notePosition(fset.Position(call.Pos()),
+			fmt.Errorf("first argument to Bind must be a pointer to an interface type; found %s", types.TypeString(ifaceArgType, nil)))
+	}
+	iface := ifacePtr.Elem()
+	methodSet, ok := iface.Underlying().(*types.Interface)
+	if !ok {
+		return nil, notePosition(fset.Position(call.Pos()),
+			fmt.Errorf("first argument to Bind must be a pointer to an interface type; found %s", types.TypeString(ifaceArgType, nil)))
+	}
+
+	provided := info.TypeOf(call.Args[1])
+	if bindShouldUsePointer(info, call) {
+		providedPtr, ok := provided.(*types.Pointer)
+		if !ok {
+			return nil, notePosition(fset.Position(call.Args[0].Pos()),
+				fmt.Errorf("second argument to Bind must be a pointer or a pointer to a pointer; found %s", types.TypeString(provided, nil)))
+		}
+		provided = providedPtr.Elem()
+	}
+	if types.Identical(iface, provided) {
+		return nil, notePosition(fset.Position(call.Pos()),
+			errors.New("cannot bind interface to itself"))
+	}
+	if !types.Implements(provided, methodSet) {
+		return nil, notePosition(fset.Position(call.Pos()),
+			fmt.Errorf("%s does not implement %s", types.TypeString(provided, nil), types.TypeString(iface, nil)))
+	}
+	return &IfaceBinding{
+		Pos:      call.Pos(),
+		Iface:    iface,
+		Provided: provided,
+	}, nil
+}
+
+// processValue creates a value from a wire.Value call.
+func processValue(fset *token.FileSet, info *types.Info, call *ast.CallExpr) (*Value, error) {
+	// Assumes that call.Fun is wire.Value.
+
+	if len(call.Args) != 1 {
+		return nil, notePosition(fset.Position(call.Pos()), errors.New("call to Value takes exactly one argument"))
+	}
+	ok := true
+	ast.Inspect(call.Args[0], func(node ast.Node) bool {
+		switch expr := node.(type) {
+		case nil, *ast.ArrayType, *ast.BasicLit, *ast.BinaryExpr, *ast.ChanType, *ast.CompositeLit, *ast.FuncType, *ast.Ident, *ast.IndexExpr, *ast.InterfaceType, *ast.KeyValueExpr, *ast.MapType, *ast.ParenExpr, *ast.SelectorExpr, *ast.SliceExpr, *ast.StarExpr, *ast.StructType, *ast.TypeAssertExpr:
+			// Good!
+		case *ast.UnaryExpr:
+			if expr.Op == token.ARROW {
+				ok = false
+				return false
+			}
+		case *ast.CallExpr:
+			// Only acceptable if it's a type conversion.
+			if _, isFunc := info.TypeOf(expr.Fun).(*types.Signature); isFunc {
+				ok = false
+				return false
+			}
+		default:
+			ok = false
+			return false
+		}
+		return true
+	})
+	if !ok {
+		return nil, notePosition(fset.Position(call.Pos()), errors.New("argument to Value is too complex"))
+	}
+	// Result type can't be an interface type; use wire.InterfaceValue for that.
+	argType := info.TypeOf(call.Args[0])
+	if _, isInterfaceType := argType.Underlying().(*types.Interface); isInterfaceType {
+		return nil, notePosition(fset.Position(call.Pos()), fmt.Errorf("argument to Value may not be an interface value (found %s); use InterfaceValue instead", types.TypeString(argType, nil)))
+	}
+	return &Value{
+		Pos:  call.Args[0].Pos(),
+		Out:  info.TypeOf(call.Args[0]),
+		expr: call.Args[0],
+		info: info,
+	}, nil
+}
+
+// processInterfaceValue creates a value from a wire.InterfaceValue call.
+func processInterfaceValue(fset *token.FileSet, info *types.Info, call *ast.CallExpr) (*Value, error) {
+	// Assumes that call.Fun is wire.InterfaceValue.
+
+	if len(call.Args) != 2 {
+		return nil, notePosition(fset.Position(call.Pos()), errors.New("call to InterfaceValue takes exactly two arguments"))
+	}
+	ifaceArgType := info.TypeOf(call.Args[0])
+	ifacePtr, ok := ifaceArgType.(*types.Pointer)
+	if !ok {
+		return nil, notePosition(fset.Position(call.Pos()), fmt.Errorf("first argument to InterfaceValue must be a pointer to an interface type; found %s", types.TypeString(ifaceArgType, nil)))
+	}
+	iface := ifacePtr.Elem()
+	methodSet, ok := iface.Underlying().(*types.Interface)
+	if !ok {
+		return nil, notePosition(fset.Position(call.Pos()), fmt.Errorf("first argument to InterfaceValue must be a pointer to an interface type; found %s", types.TypeString(ifaceArgType, nil)))
+	}
+	provided := info.TypeOf(call.Args[1])
+	if !types.Implements(provided, methodSet) {
+		return nil, notePosition(fset.Position(call.Pos()), fmt.Errorf("%s does not implement %s", types.TypeString(provided, nil), types.TypeString(iface, nil)))
+	}
+	return &Value{
+		Pos:  call.Args[1].Pos(),
+		Out:  iface,
+		expr: call.Args[1],
+		info: info,
+	}, nil
+}
+
+// processFieldsOf creates a slice of fields from a wire.FieldsOf call.
+func processFieldsOf(fset *token.FileSet, info *types.Info, call *ast.CallExpr) ([]*Field, error) {
+	// Assumes that call.Fun is wire.FieldsOf.
+
+	if len(call.Args) < 2 {
+		return nil, notePosition(fset.Position(call.Pos()),
+			errors.New("call to FieldsOf must specify fields to be extracted"))
+	}
+	const firstArgReqFormat = "first argument to FieldsOf must be a pointer to a struct or a pointer to a pointer to a struct; found %s"
+	structType := info.TypeOf(call.Args[0])
+	structPtr, ok := structType.(*types.Pointer)
+	if !ok {
+		return nil, notePosition(fset.Position(call.Pos()),
+			fmt.Errorf(firstArgReqFormat, types.TypeString(structType, nil)))
+	}
+
+	var struc *types.Struct
+	isPtrToStruct := false
+	switch t := structPtr.Elem().Underlying().(type) {
+	case *types.Pointer:
+		struc, ok = t.Elem().Underlying().(*types.Struct)
+		if !ok {
+			return nil, notePosition(fset.Position(call.Pos()),
+				fmt.Errorf(firstArgReqFormat, types.TypeString(struc, nil)))
+		}
+		isPtrToStruct = true
+	case *types.Struct:
+		struc = t
+	default:
+		return nil, notePosition(fset.Position(call.Pos()),
+			fmt.Errorf(firstArgReqFormat, types.TypeString(t, nil)))
+	}
+	if struc.NumFields() < len(call.Args)-1 {
+		return nil, notePosition(fset.Position(call.Pos()),
+			fmt.Errorf("fields number exceeds the number available in the struct which has %d fields", struc.NumFields()))
+	}
+
+	fields := make([]*Field, 0, len(call.Args)-1)
+	for i := 1; i < len(call.Args); i++ {
+		v, err := checkField(call.Args[i], struc)
+		if err != nil {
+			return nil, notePosition(fset.Position(call.Pos()), err)
+		}
+		out := []types.Type{v.Type()}
+		if isPtrToStruct {
+			// If the field is from a pointer to a struct, then
+			// wire.Fields also provides a pointer to the field.
+			out = append(out, types.NewPointer(v.Type()))
+		}
+		fields = append(fields, &Field{
+			Parent: structPtr.Elem(),
+			Name:   v.Name(),
+			Pkg:    v.Pkg(),
+			Pos:    v.Pos(),
+			Out:    out,
+		})
+	}
+	return fields, nil
+}
+
+// checkField reports whether f is a field of st. f should be a string with the
+// field name.
+func checkField(f ast.Expr, st *types.Struct) (*types.Var, error) {
+	b, ok := f.(*ast.BasicLit)
+	if !ok {
+		return nil, fmt.Errorf("%v must be a string with the field name", f)
+	}
+	for i := 0; i < st.NumFields(); i++ {
+		if strings.EqualFold(strconv.Quote(st.Field(i).Name()), b.Value) {
+			if isPrevented(st.Tag(i)) {
+				return nil, fmt.Errorf("%s is prevented from injecting by wire", b.Value)
+			}
+			return st.Field(i), nil
+		}
+	}
+	return nil, fmt.Errorf("%s is not a field of %s", b.Value, st.String())
+}
+
+// findInjectorBuild returns the wire.Build call if fn is an injector template.
+// It returns nil if the function is not an injector template.
+func findInjectorBuild(info *types.Info, fn *ast.FuncDecl) (*ast.CallExpr, error) {
+	if fn.Body == nil {
+		return nil, nil
+	}
+	numStatements := 0
+	invalid := false
+	var wireBuildCall *ast.CallExpr
+	for _, stmt := range fn.Body.List {
+		switch stmt := stmt.(type) {
+		case *ast.ExprStmt:
+			numStatements++
+			if numStatements > 1 {
+				invalid = true
+			}
+			call, ok := stmt.X.(*ast.CallExpr)
+			if !ok {
+				continue
+			}
+			if qualifiedIdentObject(info, call.Fun) == types.Universe.Lookup("panic") {
+				if len(call.Args) != 1 {
+					continue
+				}
+				call, ok = call.Args[0].(*ast.CallExpr)
+				if !ok {
+					continue
+				}
+			}
+			buildObj := qualifiedIdentObject(info, call.Fun)
+			if buildObj == nil || buildObj.Pkg() == nil || !isWireImport(buildObj.Pkg().Path()) || buildObj.Name() != "Build" {
+				continue
+			}
+			wireBuildCall = call
+		case *ast.EmptyStmt:
+			// Do nothing.
+		case *ast.ReturnStmt:
+			// Allow the function to end in a return.
+			if numStatements == 0 {
+				return nil, nil
+			}
+		default:
+			invalid = true
+		}
+
+	}
+	if wireBuildCall == nil {
+		return nil, nil
+	}
+	if invalid {
+		return nil, errors.New("a call to wire.Build indicates that this function is an injector, but injectors must consist of only the wire.Build call and an optional return")
+	}
+	return wireBuildCall, nil
+}
+
+func isWireImport(path string) bool {
+	// TODO(light): This is depending on details of the current loader.
+	const vendorPart = "vendor/"
+	if i := strings.LastIndex(path, vendorPart); i != -1 && (i == 0 || path[i-1] == '/') {
+		path = path[i+len(vendorPart):]
+	}
+	return path == "github.com/grafana/grafana/pkg/build/wire" || path == "github.com/google/wire"
+}
+
+func isProviderSetType(t types.Type) bool {
+	n, ok := t.(*types.Named)
+	if !ok {
+		return false
+	}
+	obj := n.Obj()
+	return obj.Pkg() != nil && isWireImport(obj.Pkg().Path()) && obj.Name() == "ProviderSet"
+}
+
+// ProvidedType represents a type provided from a source. The source
+// can be a *Provider (a provider function), a *Value (wire.Value), or an
+// *InjectorArgs (arguments to the injector function). The zero value has
+// none of the above, and returns true for IsNil.
+type ProvidedType struct {
+	// t is the provided concrete type.
+	t types.Type
+	p *Provider
+	v *Value
+	a *InjectorArg
+	f *Field
+}
+
+// IsNil reports whether pt is the zero value.
+func (pt ProvidedType) IsNil() bool {
+	return pt.p == nil && pt.v == nil && pt.a == nil && pt.f == nil
+}
+
+// Type returns the output type.
+//
+//   - For a function provider, this is the first return value type.
+//   - For a struct provider, this is either the struct type or the pointer type
+//     whose element type is the struct type.
+//   - For a value, this is the type of the expression.
+//   - For an argument, this is the type of the argument.
+func (pt ProvidedType) Type() types.Type {
+	return pt.t
+}
+
+// IsProvider reports whether pt points to a Provider.
+func (pt ProvidedType) IsProvider() bool {
+	return pt.p != nil
+}
+
+// IsValue reports whether pt points to a Value.
+func (pt ProvidedType) IsValue() bool {
+	return pt.v != nil
+}
+
+// IsArg reports whether pt points to an injector argument.
+func (pt ProvidedType) IsArg() bool {
+	return pt.a != nil
+}
+
+// IsField reports whether pt points to a Fields.
+func (pt ProvidedType) IsField() bool {
+	return pt.f != nil
+}
+
+// Provider returns pt as a Provider pointer. It panics if pt does not point
+// to a Provider.
+func (pt ProvidedType) Provider() *Provider {
+	if pt.p == nil {
+		panic("ProvidedType does not hold a Provider")
+	}
+	return pt.p
+}
+
+// Value returns pt as a Value pointer. It panics if pt does not point
+// to a Value.
+func (pt ProvidedType) Value() *Value {
+	if pt.v == nil {
+		panic("ProvidedType does not hold a Value")
+	}
+	return pt.v
+}
+
+// Arg returns pt as an *InjectorArg representing an injector argument. It
+// panics if pt does not point to an arg.
+func (pt ProvidedType) Arg() *InjectorArg {
+	if pt.a == nil {
+		panic("ProvidedType does not hold an Arg")
+	}
+	return pt.a
+}
+
+// Field returns pt as a Field pointer. It panics if pt does not point to a
+// struct Field.
+func (pt ProvidedType) Field() *Field {
+	if pt.f == nil {
+		panic("ProvidedType does not hold a Field")
+	}
+	return pt.f
+}
+
+// bindShouldUsePointer loads the wire package the user is importing from their
+// injector. The call is a wire marker function call.
+func bindShouldUsePointer(info *types.Info, call *ast.CallExpr) bool {
+	// These type assertions should not fail, otherwise panic.
+	fun := call.Fun.(*ast.SelectorExpr)                 // wire.Bind
+	pkgName := fun.X.(*ast.Ident)                       // wire
+	wireName := info.ObjectOf(pkgName).(*types.PkgName) // wire package
+	return wireName.Imported().Scope().Lookup("bindToUsePointer") != nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/BindInjectorArg/foo/foo.go b/pkg/build/wire/internal/wire/testdata/BindInjectorArg/foo/foo.go
new file mode 100644
index 0000000000000..5e39698c6cf2a
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/BindInjectorArg/foo/foo.go
@@ -0,0 +1,43 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	fmt.Println(inject(Foo{"hello"}).Name)
+}
+
+type Fooer interface {
+	Foo() string
+}
+
+type Foo struct {
+	f string
+}
+
+func (f Foo) Foo() string {
+	return f.f
+}
+
+type Bar struct {
+	Name string
+}
+
+func NewBar(fooer Fooer) *Bar {
+	return &Bar{Name: fooer.Foo()}
+}
diff --git a/pkg/build/wire/internal/wire/testdata/BindInjectorArg/foo/wire.go b/pkg/build/wire/internal/wire/testdata/BindInjectorArg/foo/wire.go
new file mode 100644
index 0000000000000..bd7d773b79bdc
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/BindInjectorArg/foo/wire.go
@@ -0,0 +1,29 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func inject(foo Foo) *Bar {
+	wire.Build(
+		NewBar,
+		wire.Bind(new(Fooer), new(Foo)),
+	)
+	return nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/BindInjectorArg/pkg b/pkg/build/wire/internal/wire/testdata/BindInjectorArg/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/BindInjectorArg/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/BindInjectorArg/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/BindInjectorArg/want/program_out.txt
new file mode 100644
index 0000000000000..ce013625030ba
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/BindInjectorArg/want/program_out.txt
@@ -0,0 +1 @@
+hello
diff --git a/pkg/build/wire/internal/wire/testdata/BindInjectorArg/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/BindInjectorArg/want/wire_gen.go
new file mode 100644
index 0000000000000..5f5b21068ef19
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/BindInjectorArg/want/wire_gen.go
@@ -0,0 +1,14 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func inject(foo Foo) *Bar {
+	bar := NewBar(foo)
+	return bar
+}
diff --git a/pkg/build/wire/internal/wire/testdata/BindInjectorArgPointer/foo/foo.go b/pkg/build/wire/internal/wire/testdata/BindInjectorArgPointer/foo/foo.go
new file mode 100644
index 0000000000000..d8b1edd1c1cb7
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/BindInjectorArgPointer/foo/foo.go
@@ -0,0 +1,43 @@
+// Copyright 2019 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	fmt.Println(inject(&Foo{"hello"}).Name)
+}
+
+type Fooer interface {
+	Foo() string
+}
+
+type Foo struct {
+	f string
+}
+
+func (f *Foo) Foo() string {
+	return f.f
+}
+
+type Bar struct {
+	Name string
+}
+
+func NewBar(fooer Fooer) *Bar {
+	return &Bar{Name: fooer.Foo()}
+}
diff --git a/pkg/build/wire/internal/wire/testdata/BindInjectorArgPointer/foo/wire.go b/pkg/build/wire/internal/wire/testdata/BindInjectorArgPointer/foo/wire.go
new file mode 100644
index 0000000000000..3fc9ca3804606
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/BindInjectorArgPointer/foo/wire.go
@@ -0,0 +1,29 @@
+// Copyright 2019 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func inject(foo *Foo) *Bar {
+	wire.Build(
+		NewBar,
+		wire.Bind(new(Fooer), new(*Foo)),
+	)
+	return nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/BindInjectorArgPointer/pkg b/pkg/build/wire/internal/wire/testdata/BindInjectorArgPointer/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/BindInjectorArgPointer/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/BindInjectorArgPointer/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/BindInjectorArgPointer/want/program_out.txt
new file mode 100644
index 0000000000000..ce013625030ba
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/BindInjectorArgPointer/want/program_out.txt
@@ -0,0 +1 @@
+hello
diff --git a/pkg/build/wire/internal/wire/testdata/BindInjectorArgPointer/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/BindInjectorArgPointer/want/wire_gen.go
new file mode 100644
index 0000000000000..15d6f0e335b60
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/BindInjectorArgPointer/want/wire_gen.go
@@ -0,0 +1,14 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func inject(foo *Foo) *Bar {
+	bar := NewBar(foo)
+	return bar
+}
diff --git a/pkg/build/wire/internal/wire/testdata/BindInterfaceWithValue/foo/foo.go b/pkg/build/wire/internal/wire/testdata/BindInterfaceWithValue/foo/foo.go
new file mode 100644
index 0000000000000..82381664e5226
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/BindInterfaceWithValue/foo/foo.go
@@ -0,0 +1,20 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+func main() {
+	w := inject()
+	w.Write([]byte("Hello, World!"))
+}
diff --git a/pkg/build/wire/internal/wire/testdata/BindInterfaceWithValue/foo/wire.go b/pkg/build/wire/internal/wire/testdata/BindInterfaceWithValue/foo/wire.go
new file mode 100644
index 0000000000000..54c19ba97b052
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/BindInterfaceWithValue/foo/wire.go
@@ -0,0 +1,32 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//+build wireinject
+
+package main
+
+import (
+	"io"
+	"os"
+
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func inject() io.Writer {
+	wire.Build(
+		wire.Value(os.Stdout),
+		wire.Bind(new(io.Writer), new(*os.File)),
+	)
+	return nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/BindInterfaceWithValue/pkg b/pkg/build/wire/internal/wire/testdata/BindInterfaceWithValue/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/BindInterfaceWithValue/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/BindInterfaceWithValue/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/BindInterfaceWithValue/want/program_out.txt
new file mode 100644
index 0000000000000..b45ef6fec8951
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/BindInterfaceWithValue/want/program_out.txt
@@ -0,0 +1 @@
+Hello, World!
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/BindInterfaceWithValue/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/BindInterfaceWithValue/want/wire_gen.go
new file mode 100644
index 0000000000000..58d82bf4006b2
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/BindInterfaceWithValue/want/wire_gen.go
@@ -0,0 +1,23 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+import (
+	"io"
+	"os"
+)
+
+// Injectors from wire.go:
+
+func inject() io.Writer {
+	file := _wireFileValue
+	return file
+}
+
+var (
+	_wireFileValue = os.Stdout
+)
diff --git a/pkg/build/wire/internal/wire/testdata/BuildTagsAllPackages/bar/bar.go b/pkg/build/wire/internal/wire/testdata/BuildTagsAllPackages/bar/bar.go
new file mode 100644
index 0000000000000..97c2561ba9d0c
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/BuildTagsAllPackages/bar/bar.go
@@ -0,0 +1,23 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build !wireinject
+
+// Package bar includes both wireinject and non-wireinject variants.
+package bar
+
+import "github.com/grafana/grafana/pkg/build/wire"
+
+// Set provides an unfriendly user greeting.
+var Set = wire.NewSet(wire.Value("Bah humbug! This is the wrong variant!"))
diff --git a/pkg/build/wire/internal/wire/testdata/BuildTagsAllPackages/bar/bar_inject.go b/pkg/build/wire/internal/wire/testdata/BuildTagsAllPackages/bar/bar_inject.go
new file mode 100644
index 0000000000000..aa40270918ccd
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/BuildTagsAllPackages/bar/bar_inject.go
@@ -0,0 +1,22 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package bar
+
+import "github.com/grafana/grafana/pkg/build/wire"
+
+// Set provides a friendly user greeting.
+var Set = wire.NewSet(wire.Value("Hello, World!"))
diff --git a/pkg/build/wire/internal/wire/testdata/BuildTagsAllPackages/foo/foo.go b/pkg/build/wire/internal/wire/testdata/BuildTagsAllPackages/foo/foo.go
new file mode 100644
index 0000000000000..c2f2610654734
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/BuildTagsAllPackages/foo/foo.go
@@ -0,0 +1,21 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Println(injectedMessage())
+}
diff --git a/pkg/build/wire/internal/wire/testdata/BuildTagsAllPackages/foo/wire.go b/pkg/build/wire/internal/wire/testdata/BuildTagsAllPackages/foo/wire.go
new file mode 100644
index 0000000000000..32cc0f8074360
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/BuildTagsAllPackages/foo/wire.go
@@ -0,0 +1,27 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"example.com/bar"
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectedMessage() string {
+	wire.Build(bar.Set)
+	return ""
+}
diff --git a/pkg/build/wire/internal/wire/testdata/BuildTagsAllPackages/pkg b/pkg/build/wire/internal/wire/testdata/BuildTagsAllPackages/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/BuildTagsAllPackages/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/BuildTagsAllPackages/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/BuildTagsAllPackages/want/program_out.txt
new file mode 100644
index 0000000000000..8ab686eafeb1f
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/BuildTagsAllPackages/want/program_out.txt
@@ -0,0 +1 @@
+Hello, World!
diff --git a/pkg/build/wire/internal/wire/testdata/BuildTagsAllPackages/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/BuildTagsAllPackages/want/wire_gen.go
new file mode 100644
index 0000000000000..16c0df257c275
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/BuildTagsAllPackages/want/wire_gen.go
@@ -0,0 +1,18 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func injectedMessage() string {
+	string2 := _wireStringValue
+	return string2
+}
+
+var (
+	_wireStringValue = "Hello, World!"
+)
diff --git a/pkg/build/wire/internal/wire/testdata/Chain/foo/foo.go b/pkg/build/wire/internal/wire/testdata/Chain/foo/foo.go
new file mode 100644
index 0000000000000..16942364d6f34
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Chain/foo/foo.go
@@ -0,0 +1,40 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func main() {
+	fmt.Println(injectFooBar())
+}
+
+type Foo int
+type FooBar int
+
+var Set = wire.NewSet(
+	provideFoo,
+	provideFooBar)
+
+func provideFoo() Foo {
+	return 41
+}
+
+func provideFooBar(foo Foo) FooBar {
+	return FooBar(foo) + 1
+}
diff --git a/pkg/build/wire/internal/wire/testdata/Chain/foo/wire.go b/pkg/build/wire/internal/wire/testdata/Chain/foo/wire.go
new file mode 100644
index 0000000000000..4106dd8d91f82
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Chain/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectFooBar() FooBar {
+	wire.Build(Set)
+	return 0
+}
diff --git a/pkg/build/wire/internal/wire/testdata/Chain/pkg b/pkg/build/wire/internal/wire/testdata/Chain/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Chain/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/Chain/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/Chain/want/program_out.txt
new file mode 100644
index 0000000000000..d81cc0710eb6c
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Chain/want/program_out.txt
@@ -0,0 +1 @@
+42
diff --git a/pkg/build/wire/internal/wire/testdata/Chain/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/Chain/want/wire_gen.go
new file mode 100644
index 0000000000000..cf9e9eeaaea35
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Chain/want/wire_gen.go
@@ -0,0 +1,15 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func injectFooBar() FooBar {
+	foo := provideFoo()
+	fooBar := provideFooBar(foo)
+	return fooBar
+}
diff --git a/pkg/build/wire/internal/wire/testdata/Cleanup/foo/foo.go b/pkg/build/wire/internal/wire/testdata/Cleanup/foo/foo.go
new file mode 100644
index 0000000000000..56f021511611d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Cleanup/foo/foo.go
@@ -0,0 +1,46 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	bar, cleanup := injectBar()
+	fmt.Println(*bar)
+	cleanup()
+	fmt.Println(*bar)
+}
+
+type Foo int
+type Bar int
+
+func provideFoo() (*Foo, func()) {
+	foo := new(Foo)
+	*foo = 42
+	return foo, func() { *foo = 0 }
+}
+
+func provideBar(foo *Foo) (*Bar, func()) {
+	bar := new(Bar)
+	*bar = 77
+	return bar, func() {
+		if *foo == 0 {
+			panic("foo cleaned up before bar")
+		}
+		*bar = 0
+	}
+}
diff --git a/pkg/build/wire/internal/wire/testdata/Cleanup/foo/wire.go b/pkg/build/wire/internal/wire/testdata/Cleanup/foo/wire.go
new file mode 100644
index 0000000000000..49867e8c1b1f0
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Cleanup/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectBar() (*Bar, func()) {
+	wire.Build(provideFoo, provideBar)
+	return nil, nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/Cleanup/pkg b/pkg/build/wire/internal/wire/testdata/Cleanup/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Cleanup/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/Cleanup/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/Cleanup/want/program_out.txt
new file mode 100644
index 0000000000000..d77064277c003
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Cleanup/want/program_out.txt
@@ -0,0 +1,2 @@
+77
+0
diff --git a/pkg/build/wire/internal/wire/testdata/Cleanup/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/Cleanup/want/wire_gen.go
new file mode 100644
index 0000000000000..1519c104c524e
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Cleanup/want/wire_gen.go
@@ -0,0 +1,18 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func injectBar() (*Bar, func()) {
+	foo, cleanup := provideFoo()
+	bar, cleanup2 := provideBar(foo)
+	return bar, func() {
+		cleanup2()
+		cleanup()
+	}
+}
diff --git a/pkg/build/wire/internal/wire/testdata/CopyOtherDecls/foo/foo.go b/pkg/build/wire/internal/wire/testdata/CopyOtherDecls/foo/foo.go
new file mode 100644
index 0000000000000..e8045b254e86b
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/CopyOtherDecls/foo/foo.go
@@ -0,0 +1,40 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+// All of the declarations are in one file.
+// Wire should copy non-injectors over, preserving imports.
+
+package main
+
+import (
+	"fmt"
+
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func main() {
+	fmt.Println(injectedMessage())
+}
+
+// provideMessage provides a friendly user greeting.
+func provideMessage() string {
+	return "Hello, World!"
+}
+
+func injectedMessage() string {
+	wire.Build(provideMessage)
+	return ""
+}
diff --git a/pkg/build/wire/internal/wire/testdata/CopyOtherDecls/pkg b/pkg/build/wire/internal/wire/testdata/CopyOtherDecls/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/CopyOtherDecls/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/CopyOtherDecls/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/CopyOtherDecls/want/program_out.txt
new file mode 100644
index 0000000000000..8ab686eafeb1f
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/CopyOtherDecls/want/program_out.txt
@@ -0,0 +1 @@
+Hello, World!
diff --git a/pkg/build/wire/internal/wire/testdata/CopyOtherDecls/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/CopyOtherDecls/want/wire_gen.go
new file mode 100644
index 0000000000000..c654540b4ed6c
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/CopyOtherDecls/want/wire_gen.go
@@ -0,0 +1,29 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+import (
+	"fmt"
+)
+
+// Injectors from foo.go:
+
+func injectedMessage() string {
+	string2 := provideMessage()
+	return string2
+}
+
+// foo.go:
+
+func main() {
+	fmt.Println(injectedMessage())
+}
+
+// provideMessage provides a friendly user greeting.
+func provideMessage() string {
+	return "Hello, World!"
+}
diff --git a/pkg/build/wire/internal/wire/testdata/Cycle/foo/foo.go b/pkg/build/wire/internal/wire/testdata/Cycle/foo/foo.go
new file mode 100644
index 0000000000000..be718f78a762c
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Cycle/foo/foo.go
@@ -0,0 +1,37 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Println(injectedBaz())
+}
+
+type Foo int
+type Bar int
+type Baz int
+
+func provideFoo(_ Baz) Foo {
+	return 0
+}
+
+func provideBar(_ Foo) Bar {
+	return 0
+}
+
+func provideBaz(_ Bar) Baz {
+	return 0
+}
diff --git a/pkg/build/wire/internal/wire/testdata/Cycle/foo/wire.go b/pkg/build/wire/internal/wire/testdata/Cycle/foo/wire.go
new file mode 100644
index 0000000000000..b89cdff87d2b7
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Cycle/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectedBaz() Baz {
+	wire.Build(provideFoo, provideBar, provideBaz)
+	return 0
+}
diff --git a/pkg/build/wire/internal/wire/testdata/Cycle/pkg b/pkg/build/wire/internal/wire/testdata/Cycle/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Cycle/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/Cycle/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/Cycle/want/wire_errs.txt
new file mode 100644
index 0000000000000..eed476641c875
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Cycle/want/wire_errs.txt
@@ -0,0 +1,5 @@
+example.com/foo/wire.go:x:y: cycle for example.com/foo.Bar:
+example.com/foo.Bar (example.com/foo.provideBar) ->
+example.com/foo.Foo (example.com/foo.provideFoo) ->
+example.com/foo.Baz (example.com/foo.provideBaz) ->
+example.com/foo.Bar
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/DocComment/foo/foo.go b/pkg/build/wire/internal/wire/testdata/DocComment/foo/foo.go
new file mode 100644
index 0000000000000..c545d3fa41492
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/DocComment/foo/foo.go
@@ -0,0 +1,28 @@
+// Copyright 2020 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+)
+
+type (
+	Bar struct{}
+	Foo struct{}
+)
+
+func main() {
+	fmt.Println("Hello, World")
+}
diff --git a/pkg/build/wire/internal/wire/testdata/DocComment/foo/wire.go b/pkg/build/wire/internal/wire/testdata/DocComment/foo/wire.go
new file mode 100644
index 0000000000000..9a17664592d4b
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/DocComment/foo/wire.go
@@ -0,0 +1,31 @@
+// Copyright 2020 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+/* blockComment returns Foo and has a /*- style doc comment */
+func blockComment() *Foo {
+	panic(wire.Build(wire.Struct(new(Foo))))
+}
+
+// lineComment returns Bar and has a //- style doc comment
+func lineComment() *Bar {
+	panic(wire.Build(wire.Struct(new(Bar))))
+}
diff --git a/pkg/build/wire/internal/wire/testdata/DocComment/pkg b/pkg/build/wire/internal/wire/testdata/DocComment/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/DocComment/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/DocComment/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/DocComment/want/program_out.txt
new file mode 100644
index 0000000000000..3fa0d4b98289a
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/DocComment/want/program_out.txt
@@ -0,0 +1 @@
+Hello, World
diff --git a/pkg/build/wire/internal/wire/testdata/DocComment/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/DocComment/want/wire_gen.go
new file mode 100644
index 0000000000000..3efb22ac5de59
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/DocComment/want/wire_gen.go
@@ -0,0 +1,21 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+/* blockComment returns Foo and has a /*- style doc comment */
+func blockComment() *Foo {
+	foo := &Foo{}
+	return foo
+}
+
+// lineComment returns Bar and has a //- style doc comment
+func lineComment() *Bar {
+	bar := &Bar{}
+	return bar
+}
diff --git a/pkg/build/wire/internal/wire/testdata/EmptyVar/foo/foo.go b/pkg/build/wire/internal/wire/testdata/EmptyVar/foo/foo.go
new file mode 100644
index 0000000000000..24dae6475911d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/EmptyVar/foo/foo.go
@@ -0,0 +1,25 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	fmt.Println(injectedMessage())
+}
+
+var myFakeSet struct{}
diff --git a/pkg/build/wire/internal/wire/testdata/EmptyVar/foo/wire.go b/pkg/build/wire/internal/wire/testdata/EmptyVar/foo/wire.go
new file mode 100644
index 0000000000000..f1db1a4db8fa3
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/EmptyVar/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectedMessage() string {
+	wire.Build(myFakeSet)
+	return ""
+}
diff --git a/pkg/build/wire/internal/wire/testdata/EmptyVar/pkg b/pkg/build/wire/internal/wire/testdata/EmptyVar/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/EmptyVar/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/EmptyVar/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/EmptyVar/want/wire_errs.txt
new file mode 100644
index 0000000000000..d7e1d21dbeb16
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/EmptyVar/want/wire_errs.txt
@@ -0,0 +1 @@
+example.com/foo/wire.go:x:y: var example.com/foo.myFakeSet struct{} is not a provider or a provider set
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/ExampleWithMocks/foo/foo.go b/pkg/build/wire/internal/wire/testdata/ExampleWithMocks/foo/foo.go
new file mode 100644
index 0000000000000..555ef60c621d4
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ExampleWithMocks/foo/foo.go
@@ -0,0 +1,120 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// This test demonstrates how to use mocks with wire.
+
+package main
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func main() {
+	// Create a "real" greeter.
+	// Greet() will include the real current time, so elide it for repeatable
+	// tests.
+	fmt.Printf("Real time greeting: %s [current time elided]\n", initApp().Greet()[0:15])
+
+	// There are two approaches for creating an app with mocks.
+
+	// Approach A: create the mocks manually, and pass them to an injector.
+	// This approach is useful if you need to prime the mocks beforehand.
+	fmt.Println("Approach A")
+	mt := newMockTimer()
+	mockedApp := initMockedAppFromArgs(mt)
+	fmt.Println(mockedApp.Greet()) // prints greeting with time = zero time
+	mt.T = mt.T.AddDate(1999, 0, 0)
+	fmt.Println(mockedApp.Greet()) // prints greeting with time = year 2000
+
+	// Approach B: allow the injector to create the mocks, and return a struct
+	// that includes the resulting app plus the mocks.
+	fmt.Println("Approach B")
+	appWithMocks := initMockedApp()
+	fmt.Println(appWithMocks.app.Greet()) // prints greeting with time = zero time
+	appWithMocks.mt.T = appWithMocks.mt.T.AddDate(999, 0, 0)
+	fmt.Println(appWithMocks.app.Greet()) // prints greeting with time = year 1000
+}
+
+// appSet is a provider set for creating a real app.
+var appSet = wire.NewSet(
+	wire.Struct(new(app), "*"),
+	wire.Struct(new(greeter), "*"),
+	wire.InterfaceValue(new(timer), realTime{}),
+)
+
+// appSetWithoutMocks is a provider set for creating an app with mocked
+// dependencies. The mocked dependencies are omitted and must be provided as
+// arguments to the injector.
+// It is used for Approach A.
+var appSetWithoutMocks = wire.NewSet(
+	wire.Struct(new(app), "*"),
+	wire.Struct(new(greeter), "*"),
+)
+
+// mockAppSet is a provider set for creating a mocked app, including the mocked
+// dependencies.
+// It is used for Approach B.
+var mockAppSet = wire.NewSet(
+	wire.Struct(new(app), "*"),
+	wire.Struct(new(greeter), "*"),
+	wire.Struct(new(appWithMocks), "*"),
+	// For each mocked dependency, add a provider and use wire.Bind to bind
+	// the concrete type to the relevant interface.
+	newMockTimer,
+	wire.Bind(new(timer), new(*mockTimer)),
+)
+
+type timer interface {
+	Now() time.Time
+}
+
+// realTime implements timer with the real time.
+type realTime struct{}
+
+func (realTime) Now() time.Time { return time.Now() }
+
+// mockTimer implements timer using a mocked time.
+type mockTimer struct {
+	T time.Time
+}
+
+func newMockTimer() *mockTimer      { return &mockTimer{} }
+func (m *mockTimer) Now() time.Time { return m.T }
+
+// greeter issues greetings with the time provided by T.
+type greeter struct {
+	T timer
+}
+
+func (g greeter) Greet() string {
+	return fmt.Sprintf("Good day! It is %v", g.T.Now())
+}
+
+type app struct {
+	g greeter
+}
+
+func (a app) Greet() string {
+	return a.g.Greet()
+}
+
+// appWithMocks is used for Approach B, to return the app plus its mocked
+// dependencies.
+type appWithMocks struct {
+	app app
+	mt  *mockTimer
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ExampleWithMocks/foo/wire.go b/pkg/build/wire/internal/wire/testdata/ExampleWithMocks/foo/wire.go
new file mode 100644
index 0000000000000..bdec16a68067e
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ExampleWithMocks/foo/wire.go
@@ -0,0 +1,42 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+// initApp returns a real app.
+func initApp() *app {
+	wire.Build(appSet)
+	return nil
+}
+
+// initMockedAppFromArgs returns an app with mocked dependencies provided via
+// arguments (Approach A). Note that the argument's type is the interface
+// type (timer), but the concrete mock type should be passed.
+func initMockedAppFromArgs(mt timer) *app {
+	wire.Build(appSetWithoutMocks)
+	return nil
+}
+
+// initMockedApp returns an app with its mocked dependencies, created
+// via providers (Approach B).
+func initMockedApp() *appWithMocks {
+	wire.Build(mockAppSet)
+	return nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ExampleWithMocks/pkg b/pkg/build/wire/internal/wire/testdata/ExampleWithMocks/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ExampleWithMocks/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/ExampleWithMocks/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/ExampleWithMocks/want/program_out.txt
new file mode 100644
index 0000000000000..8f74a8e69bf51
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ExampleWithMocks/want/program_out.txt
@@ -0,0 +1,7 @@
+Real time greeting: Good day! It is [current time elided]
+Approach A
+Good day! It is 0001-01-01 00:00:00 +0000 UTC
+Good day! It is 2000-01-01 00:00:00 +0000 UTC
+Approach B
+Good day! It is 0001-01-01 00:00:00 +0000 UTC
+Good day! It is 1000-01-01 00:00:00 +0000 UTC
diff --git a/pkg/build/wire/internal/wire/testdata/ExampleWithMocks/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/ExampleWithMocks/want/wire_gen.go
new file mode 100644
index 0000000000000..9cb7b01cb1272
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ExampleWithMocks/want/wire_gen.go
@@ -0,0 +1,55 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+// initApp returns a real app.
+func initApp() *app {
+	mainTimer := _wireRealTimeValue
+	mainGreeter := greeter{
+		T: mainTimer,
+	}
+	mainApp := &app{
+		g: mainGreeter,
+	}
+	return mainApp
+}
+
+var (
+	_wireRealTimeValue = realTime{}
+)
+
+// initMockedAppFromArgs returns an app with mocked dependencies provided via
+// arguments (Approach A). Note that the argument's type is the interface
+// type (timer), but the concrete mock type should be passed.
+func initMockedAppFromArgs(mt timer) *app {
+	mainGreeter := greeter{
+		T: mt,
+	}
+	mainApp := &app{
+		g: mainGreeter,
+	}
+	return mainApp
+}
+
+// initMockedApp returns an app with its mocked dependencies, created
+// via providers (Approach B).
+func initMockedApp() *appWithMocks {
+	mainMockTimer := newMockTimer()
+	mainGreeter := greeter{
+		T: mainMockTimer,
+	}
+	mainApp := app{
+		g: mainGreeter,
+	}
+	mainAppWithMocks := &appWithMocks{
+		app: mainApp,
+		mt:  mainMockTimer,
+	}
+	return mainAppWithMocks
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ExportedValue/bar/bar.go b/pkg/build/wire/internal/wire/testdata/ExportedValue/bar/bar.go
new file mode 100644
index 0000000000000..c003b9d97a9c9
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ExportedValue/bar/bar.go
@@ -0,0 +1,21 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package bar
+
+import "github.com/grafana/grafana/pkg/build/wire"
+
+var Value = wire.Value(PublicMsg)
+
+var PublicMsg = "Hello, World!"
diff --git a/pkg/build/wire/internal/wire/testdata/ExportedValue/foo/foo.go b/pkg/build/wire/internal/wire/testdata/ExportedValue/foo/foo.go
new file mode 100644
index 0000000000000..c2f2610654734
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ExportedValue/foo/foo.go
@@ -0,0 +1,21 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Println(injectedMessage())
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ExportedValue/foo/wire.go b/pkg/build/wire/internal/wire/testdata/ExportedValue/foo/wire.go
new file mode 100644
index 0000000000000..46f7af5bf5ff7
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ExportedValue/foo/wire.go
@@ -0,0 +1,27 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"example.com/bar"
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectedMessage() string {
+	wire.Build(bar.Value)
+	return ""
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ExportedValue/pkg b/pkg/build/wire/internal/wire/testdata/ExportedValue/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ExportedValue/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/ExportedValue/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/ExportedValue/want/program_out.txt
new file mode 100644
index 0000000000000..8ab686eafeb1f
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ExportedValue/want/program_out.txt
@@ -0,0 +1 @@
+Hello, World!
diff --git a/pkg/build/wire/internal/wire/testdata/ExportedValue/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/ExportedValue/want/wire_gen.go
new file mode 100644
index 0000000000000..7563ca26af5ed
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ExportedValue/want/wire_gen.go
@@ -0,0 +1,22 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+import (
+	"example.com/bar"
+)
+
+// Injectors from wire.go:
+
+func injectedMessage() string {
+	string2 := _wireStringValue
+	return string2
+}
+
+var (
+	_wireStringValue = bar.PublicMsg
+)
diff --git a/pkg/build/wire/internal/wire/testdata/ExportedValueDifferentPackage/bar/bar.go b/pkg/build/wire/internal/wire/testdata/ExportedValueDifferentPackage/bar/bar.go
new file mode 100644
index 0000000000000..a2368e8b199d1
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ExportedValueDifferentPackage/bar/bar.go
@@ -0,0 +1,23 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package bar
+
+import (
+	"os"
+
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+var Value = wire.Value(os.Stdout)
diff --git a/pkg/build/wire/internal/wire/testdata/ExportedValueDifferentPackage/foo/foo.go b/pkg/build/wire/internal/wire/testdata/ExportedValueDifferentPackage/foo/foo.go
new file mode 100644
index 0000000000000..50f40a1872142
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ExportedValueDifferentPackage/foo/foo.go
@@ -0,0 +1,21 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Fprintln(injectedFile(), "Hello, World!")
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ExportedValueDifferentPackage/foo/wire.go b/pkg/build/wire/internal/wire/testdata/ExportedValueDifferentPackage/foo/wire.go
new file mode 100644
index 0000000000000..1da10a3455be7
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ExportedValueDifferentPackage/foo/wire.go
@@ -0,0 +1,29 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"os"
+
+	"example.com/bar"
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectedFile() *os.File {
+	wire.Build(bar.Value)
+	return nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ExportedValueDifferentPackage/pkg b/pkg/build/wire/internal/wire/testdata/ExportedValueDifferentPackage/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ExportedValueDifferentPackage/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/ExportedValueDifferentPackage/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/ExportedValueDifferentPackage/want/program_out.txt
new file mode 100644
index 0000000000000..8ab686eafeb1f
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ExportedValueDifferentPackage/want/program_out.txt
@@ -0,0 +1 @@
+Hello, World!
diff --git a/pkg/build/wire/internal/wire/testdata/ExportedValueDifferentPackage/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/ExportedValueDifferentPackage/want/wire_gen.go
new file mode 100644
index 0000000000000..d8c74d4cdb0b9
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ExportedValueDifferentPackage/want/wire_gen.go
@@ -0,0 +1,22 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+import (
+	"os"
+)
+
+// Injectors from wire.go:
+
+func injectedFile() *os.File {
+	file := _wireFileValue
+	return file
+}
+
+var (
+	_wireFileValue = os.Stdout
+)
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfCycle/foo/foo.go b/pkg/build/wire/internal/wire/testdata/FieldsOfCycle/foo/foo.go
new file mode 100644
index 0000000000000..2f4b61bb1b3f8
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfCycle/foo/foo.go
@@ -0,0 +1,38 @@
+// Copyright 2019 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	fmt.Println(injectedBaz())
+}
+
+type Foo int
+type Baz int
+
+type Bar struct {
+	Bz Baz
+}
+
+func provideFoo(_ Baz) Foo {
+	return 0
+}
+
+func provideBar(_ Foo) Bar {
+	return Bar{}
+}
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfCycle/foo/wire.go b/pkg/build/wire/internal/wire/testdata/FieldsOfCycle/foo/wire.go
new file mode 100644
index 0000000000000..b49dc720a422b
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfCycle/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2019 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectedBaz() Baz {
+	wire.Build(provideFoo, provideBar, wire.FieldsOf(new(Bar), "Bz"))
+	return 0
+}
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfCycle/pkg b/pkg/build/wire/internal/wire/testdata/FieldsOfCycle/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfCycle/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfCycle/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/FieldsOfCycle/want/wire_errs.txt
new file mode 100644
index 0000000000000..de95876859204
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfCycle/want/wire_errs.txt
@@ -0,0 +1,5 @@
+example.com/foo/wire.go:x:y: cycle for example.com/foo.Bar:
+example.com/foo.Bar (example.com/foo.provideBar) ->
+example.com/foo.Foo (example.com/foo.provideFoo) ->
+example.com/foo.Baz (example.com/foo.Bar.Bz) ->
+example.com/foo.Bar
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfImportedStruct/bar/bar.go b/pkg/build/wire/internal/wire/testdata/FieldsOfImportedStruct/bar/bar.go
new file mode 100644
index 0000000000000..c7cec395a6df6
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfImportedStruct/bar/bar.go
@@ -0,0 +1,32 @@
+// Copyright 2019 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package bar
+
+import (
+	"example.com/foo"
+)
+
+type Config struct {
+	V int
+}
+
+type Service struct {
+	Cfg *Config
+	F   *foo.Service
+}
+
+func New(cfg *Config, f *foo.Service) *Service {
+	return &Service{Cfg: cfg, F: f}
+}
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfImportedStruct/baz/baz.go b/pkg/build/wire/internal/wire/testdata/FieldsOfImportedStruct/baz/baz.go
new file mode 100644
index 0000000000000..c573fe95c97fb
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfImportedStruct/baz/baz.go
@@ -0,0 +1,36 @@
+// Copyright 2019 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package baz
+
+import (
+	"fmt"
+
+	"example.com/bar"
+	"example.com/foo"
+)
+
+type Config struct {
+	Foo *foo.Config
+	Bar *bar.Config
+}
+
+type Service struct {
+	Foo *foo.Service
+	Bar *bar.Service
+}
+
+func (m *Service) String() string {
+	return fmt.Sprintf("%d %d", m.Foo.Cfg.V, m.Bar.Cfg.V)
+}
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfImportedStruct/foo/foo.go b/pkg/build/wire/internal/wire/testdata/FieldsOfImportedStruct/foo/foo.go
new file mode 100644
index 0000000000000..73afd912c063c
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfImportedStruct/foo/foo.go
@@ -0,0 +1,27 @@
+// Copyright 2019 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package foo
+
+type Config struct {
+	V int
+}
+
+type Service struct {
+	Cfg *Config
+}
+
+func New(cfg *Config) *Service {
+	return &Service{Cfg: cfg}
+}
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfImportedStruct/main/wire.go b/pkg/build/wire/internal/wire/testdata/FieldsOfImportedStruct/main/wire.go
new file mode 100644
index 0000000000000..15646542ee269
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfImportedStruct/main/wire.go
@@ -0,0 +1,49 @@
+// Copyright 2019 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"fmt"
+
+	"example.com/bar"
+	"example.com/baz"
+	"example.com/foo"
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func newBazService(*baz.Config) *baz.Service {
+	wire.Build(
+		wire.Struct(new(baz.Service), "*"),
+		wire.FieldsOf(
+			new(*baz.Config),
+			"Foo",
+			"Bar",
+		),
+		foo.New,
+		bar.New,
+	)
+	return nil
+}
+
+func main() {
+	cfg := &baz.Config{
+		Foo: &foo.Config{1},
+		Bar: &bar.Config{2},
+	}
+	svc := newBazService(cfg)
+	fmt.Println(svc.String())
+}
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfImportedStruct/pkg b/pkg/build/wire/internal/wire/testdata/FieldsOfImportedStruct/pkg
new file mode 100644
index 0000000000000..b7badd92db3c3
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfImportedStruct/pkg
@@ -0,0 +1 @@
+example.com/main
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfImportedStruct/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/FieldsOfImportedStruct/want/program_out.txt
new file mode 100644
index 0000000000000..8d04f961a0371
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfImportedStruct/want/program_out.txt
@@ -0,0 +1 @@
+1 2
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfImportedStruct/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/FieldsOfImportedStruct/want/wire_gen.go
new file mode 100644
index 0000000000000..8467ee37d8905
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfImportedStruct/want/wire_gen.go
@@ -0,0 +1,39 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+import (
+	"example.com/bar"
+	"example.com/baz"
+	"example.com/foo"
+	"fmt"
+)
+
+// Injectors from wire.go:
+
+func newBazService(config *baz.Config) *baz.Service {
+	fooConfig := config.Foo
+	service := foo.New(fooConfig)
+	barConfig := config.Bar
+	barService := bar.New(barConfig, service)
+	bazService := &baz.Service{
+		Foo: service,
+		Bar: barService,
+	}
+	return bazService
+}
+
+// wire.go:
+
+func main() {
+	cfg := &baz.Config{
+		Foo: &foo.Config{1},
+		Bar: &bar.Config{2},
+	}
+	svc := newBazService(cfg)
+	fmt.Println(svc.String())
+}
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfStruct/foo/foo.go b/pkg/build/wire/internal/wire/testdata/FieldsOfStruct/foo/foo.go
new file mode 100644
index 0000000000000..09e0eb062f6b2
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfStruct/foo/foo.go
@@ -0,0 +1,29 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import "fmt"
+
+type S struct {
+	Foo string
+}
+
+func provideS() S {
+	return S{Foo: "Hello, World!"}
+}
+
+func main() {
+	fmt.Println(injectedMessage())
+}
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfStruct/foo/wire.go b/pkg/build/wire/internal/wire/testdata/FieldsOfStruct/foo/wire.go
new file mode 100644
index 0000000000000..7b35bd86b566c
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfStruct/foo/wire.go
@@ -0,0 +1,28 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectedMessage() string {
+	wire.Build(
+		provideS,
+		wire.FieldsOf(new(S), "Foo"))
+	return ""
+}
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfStruct/pkg b/pkg/build/wire/internal/wire/testdata/FieldsOfStruct/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfStruct/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfStruct/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/FieldsOfStruct/want/program_out.txt
new file mode 100644
index 0000000000000..8ab686eafeb1f
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfStruct/want/program_out.txt
@@ -0,0 +1 @@
+Hello, World!
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfStruct/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/FieldsOfStruct/want/wire_gen.go
new file mode 100644
index 0000000000000..5b8ca2f3c0799
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfStruct/want/wire_gen.go
@@ -0,0 +1,15 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func injectedMessage() string {
+	s := provideS()
+	string2 := s.Foo
+	return string2
+}
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfStructDoNotProvidePtrToField/foo/foo.go b/pkg/build/wire/internal/wire/testdata/FieldsOfStructDoNotProvidePtrToField/foo/foo.go
new file mode 100644
index 0000000000000..fee0f71a0ca42
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfStructDoNotProvidePtrToField/foo/foo.go
@@ -0,0 +1,29 @@
+// Copyright 2019 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import "fmt"
+
+type S struct {
+	Foo string
+}
+
+func provideS() S {
+	return S{Foo: "Hello, World!"}
+}
+
+func main() {
+	fmt.Println("pointer to " + *injectedMessagePtr())
+}
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfStructDoNotProvidePtrToField/foo/wire.go b/pkg/build/wire/internal/wire/testdata/FieldsOfStructDoNotProvidePtrToField/foo/wire.go
new file mode 100644
index 0000000000000..271ee817094fd
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfStructDoNotProvidePtrToField/foo/wire.go
@@ -0,0 +1,32 @@
+// Copyright 2019 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectedMessagePtr() *string {
+	// This shouldn't work; FieldsOf provides a pointer to the
+	// field only when the struct type is a pointer to a struct.
+	// See FieldsOfStructPointer for a working example using
+	// a pointer to a struct.
+	wire.Build(
+		provideS,
+		wire.FieldsOf(new(S), "Foo"))
+	return nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfStructDoNotProvidePtrToField/pkg b/pkg/build/wire/internal/wire/testdata/FieldsOfStructDoNotProvidePtrToField/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfStructDoNotProvidePtrToField/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfStructDoNotProvidePtrToField/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/FieldsOfStructDoNotProvidePtrToField/want/wire_errs.txt
new file mode 100644
index 0000000000000..deee37e9c9cfc
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfStructDoNotProvidePtrToField/want/wire_errs.txt
@@ -0,0 +1 @@
+example.com/foo/wire.go:x:y: inject injectedMessagePtr: no provider found for *string, output of injector
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfStructPointer/foo/foo.go b/pkg/build/wire/internal/wire/testdata/FieldsOfStructPointer/foo/foo.go
new file mode 100644
index 0000000000000..213d871fee6d7
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfStructPointer/foo/foo.go
@@ -0,0 +1,30 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import "fmt"
+
+type S struct {
+	Foo string
+}
+
+func provideS() *S {
+	return &S{Foo: "Hello, World!"}
+}
+
+func main() {
+	fmt.Println(injectedMessage())
+	fmt.Println("pointer to " + *injectedMessagePtr())
+}
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfStructPointer/foo/wire.go b/pkg/build/wire/internal/wire/testdata/FieldsOfStructPointer/foo/wire.go
new file mode 100644
index 0000000000000..04ebb253f103e
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfStructPointer/foo/wire.go
@@ -0,0 +1,35 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectedMessage() string {
+	wire.Build(
+		provideS,
+		wire.FieldsOf(new(*S), "Foo"))
+	return ""
+}
+
+func injectedMessagePtr() *string {
+	wire.Build(
+		provideS,
+		wire.FieldsOf(new(*S), "Foo"))
+	return nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfStructPointer/pkg b/pkg/build/wire/internal/wire/testdata/FieldsOfStructPointer/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfStructPointer/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfStructPointer/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/FieldsOfStructPointer/want/program_out.txt
new file mode 100644
index 0000000000000..82baaaf71abe1
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfStructPointer/want/program_out.txt
@@ -0,0 +1,2 @@
+Hello, World!
+pointer to Hello, World!
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfStructPointer/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/FieldsOfStructPointer/want/wire_gen.go
new file mode 100644
index 0000000000000..c9fe79554910b
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfStructPointer/want/wire_gen.go
@@ -0,0 +1,21 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func injectedMessage() string {
+	s := provideS()
+	string2 := s.Foo
+	return string2
+}
+
+func injectedMessagePtr() *string {
+	s := provideS()
+	string2 := &s.Foo
+	return string2
+}
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfValueStruct/bar/bar.go b/pkg/build/wire/internal/wire/testdata/FieldsOfValueStruct/bar/bar.go
new file mode 100644
index 0000000000000..c7cec395a6df6
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfValueStruct/bar/bar.go
@@ -0,0 +1,32 @@
+// Copyright 2019 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package bar
+
+import (
+	"example.com/foo"
+)
+
+type Config struct {
+	V int
+}
+
+type Service struct {
+	Cfg *Config
+	F   *foo.Service
+}
+
+func New(cfg *Config, f *foo.Service) *Service {
+	return &Service{Cfg: cfg, F: f}
+}
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfValueStruct/baz/baz.go b/pkg/build/wire/internal/wire/testdata/FieldsOfValueStruct/baz/baz.go
new file mode 100644
index 0000000000000..c573fe95c97fb
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfValueStruct/baz/baz.go
@@ -0,0 +1,36 @@
+// Copyright 2019 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package baz
+
+import (
+	"fmt"
+
+	"example.com/bar"
+	"example.com/foo"
+)
+
+type Config struct {
+	Foo *foo.Config
+	Bar *bar.Config
+}
+
+type Service struct {
+	Foo *foo.Service
+	Bar *bar.Service
+}
+
+func (m *Service) String() string {
+	return fmt.Sprintf("%d %d", m.Foo.Cfg.V, m.Bar.Cfg.V)
+}
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfValueStruct/foo/foo.go b/pkg/build/wire/internal/wire/testdata/FieldsOfValueStruct/foo/foo.go
new file mode 100644
index 0000000000000..73afd912c063c
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfValueStruct/foo/foo.go
@@ -0,0 +1,27 @@
+// Copyright 2019 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package foo
+
+type Config struct {
+	V int
+}
+
+type Service struct {
+	Cfg *Config
+}
+
+func New(cfg *Config) *Service {
+	return &Service{Cfg: cfg}
+}
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfValueStruct/main/wire.go b/pkg/build/wire/internal/wire/testdata/FieldsOfValueStruct/main/wire.go
new file mode 100644
index 0000000000000..d8ccb5caaeb61
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfValueStruct/main/wire.go
@@ -0,0 +1,49 @@
+// Copyright 2019 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"fmt"
+
+	"example.com/bar"
+	"example.com/baz"
+	"example.com/foo"
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func newBazService() *baz.Service {
+	wire.Build(
+		wire.Struct(new(baz.Service), "*"),
+		wire.Value(&baz.Config{
+			Foo: &foo.Config{1},
+			Bar: &bar.Config{2},
+		}),
+		wire.FieldsOf(
+			new(*baz.Config),
+			"Foo",
+			"Bar",
+		),
+		foo.New,
+		bar.New,
+	)
+	return nil
+}
+
+func main() {
+	svc := newBazService()
+	fmt.Println(svc.String())
+}
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfValueStruct/pkg b/pkg/build/wire/internal/wire/testdata/FieldsOfValueStruct/pkg
new file mode 100644
index 0000000000000..b7badd92db3c3
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfValueStruct/pkg
@@ -0,0 +1 @@
+example.com/main
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfValueStruct/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/FieldsOfValueStruct/want/program_out.txt
new file mode 100644
index 0000000000000..8d04f961a0371
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfValueStruct/want/program_out.txt
@@ -0,0 +1 @@
+1 2
diff --git a/pkg/build/wire/internal/wire/testdata/FieldsOfValueStruct/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/FieldsOfValueStruct/want/wire_gen.go
new file mode 100644
index 0000000000000..793c04d6b2176
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FieldsOfValueStruct/want/wire_gen.go
@@ -0,0 +1,43 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+import (
+	"example.com/bar"
+	"example.com/baz"
+	"example.com/foo"
+	"fmt"
+)
+
+// Injectors from wire.go:
+
+func newBazService() *baz.Service {
+	config := _wireConfigValue
+	fooConfig := config.Foo
+	service := foo.New(fooConfig)
+	barConfig := config.Bar
+	barService := bar.New(barConfig, service)
+	bazService := &baz.Service{
+		Foo: service,
+		Bar: barService,
+	}
+	return bazService
+}
+
+var (
+	_wireConfigValue = &baz.Config{
+		Foo: &foo.Config{1},
+		Bar: &bar.Config{2},
+	}
+)
+
+// wire.go:
+
+func main() {
+	svc := newBazService()
+	fmt.Println(svc.String())
+}
diff --git a/pkg/build/wire/internal/wire/testdata/FuncArgProvider/foo/foo.go b/pkg/build/wire/internal/wire/testdata/FuncArgProvider/foo/foo.go
new file mode 100644
index 0000000000000..c8af9b268a49f
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FuncArgProvider/foo/foo.go
@@ -0,0 +1,36 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	bar := injectBar(func() *Foo { return &Foo{42} })
+	fmt.Println(bar.Name)
+}
+
+type Foo struct {
+	Val int
+}
+
+type Bar struct {
+	Name string
+}
+
+func NewBar(f *Foo) *Bar {
+	return &Bar{Name: fmt.Sprintf("foo value %d", f.Val)}
+}
diff --git a/pkg/build/wire/internal/wire/testdata/FuncArgProvider/foo/wire.go b/pkg/build/wire/internal/wire/testdata/FuncArgProvider/foo/wire.go
new file mode 100644
index 0000000000000..ae1011bd26cc9
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FuncArgProvider/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectBar(fn func() *Foo) *Bar {
+	// fails because it doesn't identify fn as a Provider; see #723.
+	panic(wire.Build(fn, NewBar))
+}
diff --git a/pkg/build/wire/internal/wire/testdata/FuncArgProvider/pkg b/pkg/build/wire/internal/wire/testdata/FuncArgProvider/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FuncArgProvider/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/FuncArgProvider/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/FuncArgProvider/want/wire_errs.txt
new file mode 100644
index 0000000000000..7155e1426a0da
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/FuncArgProvider/want/wire_errs.txt
@@ -0,0 +1 @@
+example.com/foo/wire.go:x:y: var fn func() *example.com/foo.Foo is not a provider or a provider set
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/Header/foo/foo.go b/pkg/build/wire/internal/wire/testdata/Header/foo/foo.go
new file mode 100644
index 0000000000000..67bc8a3e332e2
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Header/foo/foo.go
@@ -0,0 +1,29 @@
+// Copyright 2019 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	fmt.Println(injectFoo())
+}
+
+type Foo int
+
+func provideFoo() Foo {
+	return 41
+}
diff --git a/pkg/build/wire/internal/wire/testdata/Header/foo/wire.go b/pkg/build/wire/internal/wire/testdata/Header/foo/wire.go
new file mode 100644
index 0000000000000..4ad2705fc5910
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Header/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2019 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectFoo() Foo {
+	wire.Build(provideFoo)
+	return Foo(0)
+}
diff --git a/pkg/build/wire/internal/wire/testdata/Header/header b/pkg/build/wire/internal/wire/testdata/Header/header
new file mode 100644
index 0000000000000..5ad71526f36bf
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Header/header
@@ -0,0 +1,2 @@
+// This is a sample header file.
+//
diff --git a/pkg/build/wire/internal/wire/testdata/Header/pkg b/pkg/build/wire/internal/wire/testdata/Header/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Header/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/Header/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/Header/want/program_out.txt
new file mode 100644
index 0000000000000..87523dd7a0632
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Header/want/program_out.txt
@@ -0,0 +1 @@
+41
diff --git a/pkg/build/wire/internal/wire/testdata/Header/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/Header/want/wire_gen.go
new file mode 100644
index 0000000000000..2f8c5c622f4a7
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Header/want/wire_gen.go
@@ -0,0 +1,16 @@
+// This is a sample header file.
+//
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func injectFoo() Foo {
+	foo := provideFoo()
+	return foo
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ImportedInterfaceBinding/bar/bar.go b/pkg/build/wire/internal/wire/testdata/ImportedInterfaceBinding/bar/bar.go
new file mode 100644
index 0000000000000..f2a04f2bc885c
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ImportedInterfaceBinding/bar/bar.go
@@ -0,0 +1,42 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+
+	"example.com/foo"
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func main() {
+	fmt.Println(injectFooer().Foo())
+}
+
+type Bar string
+
+func (b *Bar) Foo() string {
+	return string(*b)
+}
+
+func provideBar() *Bar {
+	b := new(Bar)
+	*b = "Hello, World!"
+	return b
+}
+
+var Set = wire.NewSet(
+	provideBar,
+	wire.Bind(new(foo.Fooer), new(*Bar)))
diff --git a/pkg/build/wire/internal/wire/testdata/ImportedInterfaceBinding/bar/wire.go b/pkg/build/wire/internal/wire/testdata/ImportedInterfaceBinding/bar/wire.go
new file mode 100644
index 0000000000000..952f0753b09d0
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ImportedInterfaceBinding/bar/wire.go
@@ -0,0 +1,27 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"example.com/foo"
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectFooer() foo.Fooer {
+	wire.Build(Set)
+	return nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ImportedInterfaceBinding/foo/foo.go b/pkg/build/wire/internal/wire/testdata/ImportedInterfaceBinding/foo/foo.go
new file mode 100644
index 0000000000000..c89835732c57b
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ImportedInterfaceBinding/foo/foo.go
@@ -0,0 +1,19 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package foo
+
+type Fooer interface {
+	Foo() string
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ImportedInterfaceBinding/pkg b/pkg/build/wire/internal/wire/testdata/ImportedInterfaceBinding/pkg
new file mode 100644
index 0000000000000..923cd077cc791
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ImportedInterfaceBinding/pkg
@@ -0,0 +1 @@
+example.com/bar
diff --git a/pkg/build/wire/internal/wire/testdata/ImportedInterfaceBinding/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/ImportedInterfaceBinding/want/program_out.txt
new file mode 100644
index 0000000000000..8ab686eafeb1f
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ImportedInterfaceBinding/want/program_out.txt
@@ -0,0 +1 @@
+Hello, World!
diff --git a/pkg/build/wire/internal/wire/testdata/ImportedInterfaceBinding/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/ImportedInterfaceBinding/want/wire_gen.go
new file mode 100644
index 0000000000000..b68a1dbf2b4cf
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ImportedInterfaceBinding/want/wire_gen.go
@@ -0,0 +1,18 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+import (
+	"example.com/foo"
+)
+
+// Injectors from wire.go:
+
+func injectFooer() foo.Fooer {
+	bar := provideBar()
+	return bar
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InjectInput/foo/foo.go b/pkg/build/wire/internal/wire/testdata/InjectInput/foo/foo.go
new file mode 100644
index 0000000000000..9d8116eeb6505
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InjectInput/foo/foo.go
@@ -0,0 +1,41 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func main() {
+	fmt.Println(injectFooBar(40))
+}
+
+type Foo int
+type Bar int
+type FooBar int
+
+var Set = wire.NewSet(
+	provideBar,
+	provideFooBar)
+
+func provideBar() Bar {
+	return 2
+}
+
+func provideFooBar(foo Foo, bar Bar) FooBar {
+	return FooBar(foo) + FooBar(bar)
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InjectInput/foo/wire.go b/pkg/build/wire/internal/wire/testdata/InjectInput/foo/wire.go
new file mode 100644
index 0000000000000..0c1bf839fdd61
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InjectInput/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectFooBar(foo Foo) FooBar {
+	wire.Build(Set)
+	return 0
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InjectInput/pkg b/pkg/build/wire/internal/wire/testdata/InjectInput/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InjectInput/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/InjectInput/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/InjectInput/want/program_out.txt
new file mode 100644
index 0000000000000..d81cc0710eb6c
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InjectInput/want/program_out.txt
@@ -0,0 +1 @@
+42
diff --git a/pkg/build/wire/internal/wire/testdata/InjectInput/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/InjectInput/want/wire_gen.go
new file mode 100644
index 0000000000000..9471cf6f381ca
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InjectInput/want/wire_gen.go
@@ -0,0 +1,15 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func injectFooBar(foo Foo) FooBar {
+	bar := provideBar()
+	fooBar := provideFooBar(foo, bar)
+	return fooBar
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InjectInputConflict/foo/foo.go b/pkg/build/wire/internal/wire/testdata/InjectInputConflict/foo/foo.go
new file mode 100644
index 0000000000000..7006505c7cfdf
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InjectInputConflict/foo/foo.go
@@ -0,0 +1,43 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func main() {
+	// I'm on the fence as to whether this should be an error (versus an
+	// override). For now, I will make it an error that can be relaxed
+	// later.
+	fmt.Println(injectBar(40))
+}
+
+type Foo int
+type Bar int
+
+var Set = wire.NewSet(
+	provideFoo,
+	provideBar)
+
+func provideFoo() Foo {
+	return -888
+}
+
+func provideBar(foo Foo) Bar {
+	return 2
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InjectInputConflict/foo/wire.go b/pkg/build/wire/internal/wire/testdata/InjectInputConflict/foo/wire.go
new file mode 100644
index 0000000000000..24308cb35b7d2
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InjectInputConflict/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectBar(foo Foo) Bar {
+	wire.Build(Set)
+	return 0
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InjectInputConflict/pkg b/pkg/build/wire/internal/wire/testdata/InjectInputConflict/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InjectInputConflict/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/InjectInputConflict/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/InjectInputConflict/want/wire_errs.txt
new file mode 100644
index 0000000000000..988de2f1f6bf4
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InjectInputConflict/want/wire_errs.txt
@@ -0,0 +1,6 @@
+example.com/foo/wire.go:x:y: multiple bindings for example.com/foo.Foo
+current:
+<- provider "provideFoo" (example.com/foo/foo.go:x:y)
+<- provider set "Set" (example.com/foo/foo.go:x:y)
+previous:
+<- argument foo to injector function injectBar (example.com/foo/wire.go:x:y)
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/InjectWithPanic/foo/foo.go b/pkg/build/wire/internal/wire/testdata/InjectWithPanic/foo/foo.go
new file mode 100644
index 0000000000000..e94ff6b91fffb
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InjectWithPanic/foo/foo.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Println(injectedMessage())
+}
+
+// provideMessage provides a friendly user greeting.
+func provideMessage() string {
+	return "Hello, World!"
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InjectWithPanic/foo/wire.go b/pkg/build/wire/internal/wire/testdata/InjectWithPanic/foo/wire.go
new file mode 100644
index 0000000000000..349b774690458
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InjectWithPanic/foo/wire.go
@@ -0,0 +1,25 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectedMessage() string {
+	panic(wire.Build(provideMessage))
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InjectWithPanic/pkg b/pkg/build/wire/internal/wire/testdata/InjectWithPanic/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InjectWithPanic/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/InjectWithPanic/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/InjectWithPanic/want/program_out.txt
new file mode 100644
index 0000000000000..8ab686eafeb1f
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InjectWithPanic/want/program_out.txt
@@ -0,0 +1 @@
+Hello, World!
diff --git a/pkg/build/wire/internal/wire/testdata/InjectWithPanic/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/InjectWithPanic/want/wire_gen.go
new file mode 100644
index 0000000000000..8b124e562d84b
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InjectWithPanic/want/wire_gen.go
@@ -0,0 +1,14 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func injectedMessage() string {
+	string2 := provideMessage()
+	return string2
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InjectorMissingCleanup/foo/foo.go b/pkg/build/wire/internal/wire/testdata/InjectorMissingCleanup/foo/foo.go
new file mode 100644
index 0000000000000..6166922f89dbc
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InjectorMissingCleanup/foo/foo.go
@@ -0,0 +1,30 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	foo := injectFoo()
+	fmt.Println(foo)
+}
+
+type Foo int
+
+func provideFoo() (Foo, func()) {
+	return Foo(42), func() {}
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InjectorMissingCleanup/foo/wire.go b/pkg/build/wire/internal/wire/testdata/InjectorMissingCleanup/foo/wire.go
new file mode 100644
index 0000000000000..932a9fa7914e4
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InjectorMissingCleanup/foo/wire.go
@@ -0,0 +1,27 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectFoo() Foo {
+	// provideFoo returns a cleanup, but injectFoo does not.
+	wire.Build(provideFoo)
+	return Foo(0)
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InjectorMissingCleanup/pkg b/pkg/build/wire/internal/wire/testdata/InjectorMissingCleanup/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InjectorMissingCleanup/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/InjectorMissingCleanup/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/InjectorMissingCleanup/want/wire_errs.txt
new file mode 100644
index 0000000000000..a72614a150102
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InjectorMissingCleanup/want/wire_errs.txt
@@ -0,0 +1 @@
+example.com/foo/wire.go:x:y: inject injectFoo: provider for example.com/foo.Foo returns cleanup but injection does not return cleanup function
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/InjectorMissingError/foo/foo.go b/pkg/build/wire/internal/wire/testdata/InjectorMissingError/foo/foo.go
new file mode 100644
index 0000000000000..977126bfbd304
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InjectorMissingError/foo/foo.go
@@ -0,0 +1,30 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	foo := injectFoo()
+	fmt.Println(foo)
+}
+
+type Foo int
+
+func provideFoo() (Foo, error) {
+	return Foo(42), nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InjectorMissingError/foo/wire.go b/pkg/build/wire/internal/wire/testdata/InjectorMissingError/foo/wire.go
new file mode 100644
index 0000000000000..2dced82e73103
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InjectorMissingError/foo/wire.go
@@ -0,0 +1,27 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectFoo() Foo {
+	// provideFoo returns an error, but injectFoo does not.
+	wire.Build(provideFoo)
+	return Foo(0)
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InjectorMissingError/pkg b/pkg/build/wire/internal/wire/testdata/InjectorMissingError/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InjectorMissingError/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/InjectorMissingError/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/InjectorMissingError/want/wire_errs.txt
new file mode 100644
index 0000000000000..7e2aad10b01f5
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InjectorMissingError/want/wire_errs.txt
@@ -0,0 +1 @@
+example.com/foo/wire.go:x:y: inject injectFoo: provider for example.com/foo.Foo returns error but injection not allowed to fail
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceBinding/foo/foo.go b/pkg/build/wire/internal/wire/testdata/InterfaceBinding/foo/foo.go
new file mode 100644
index 0000000000000..47f10493ba1d1
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceBinding/foo/foo.go
@@ -0,0 +1,45 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func main() {
+	fmt.Println(injectFooer().Foo())
+}
+
+type Fooer interface {
+	Foo() string
+}
+
+type Bar string
+
+func (b *Bar) Foo() string {
+	return string(*b)
+}
+
+func provideBar() *Bar {
+	b := new(Bar)
+	*b = "Hello, World!"
+	return b
+}
+
+var Set = wire.NewSet(
+	provideBar,
+	wire.Bind(new(Fooer), new(*Bar)))
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceBinding/foo/wire.go b/pkg/build/wire/internal/wire/testdata/InterfaceBinding/foo/wire.go
new file mode 100644
index 0000000000000..250d8adc18edd
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceBinding/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectFooer() Fooer {
+	wire.Build(Set)
+	return nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceBinding/pkg b/pkg/build/wire/internal/wire/testdata/InterfaceBinding/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceBinding/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceBinding/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/InterfaceBinding/want/program_out.txt
new file mode 100644
index 0000000000000..8ab686eafeb1f
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceBinding/want/program_out.txt
@@ -0,0 +1 @@
+Hello, World!
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceBinding/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/InterfaceBinding/want/wire_gen.go
new file mode 100644
index 0000000000000..2c1a67b261e0b
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceBinding/want/wire_gen.go
@@ -0,0 +1,14 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func injectFooer() Fooer {
+	bar := provideBar()
+	return bar
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceBindingDoesntImplement/foo/foo.go b/pkg/build/wire/internal/wire/testdata/InterfaceBindingDoesntImplement/foo/foo.go
new file mode 100644
index 0000000000000..ad9b9c281ef17
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceBindingDoesntImplement/foo/foo.go
@@ -0,0 +1,27 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	fmt.Println(injectFooer().Foo())
+}
+
+type Fooer interface {
+	Foo() string
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceBindingDoesntImplement/foo/wire.go b/pkg/build/wire/internal/wire/testdata/InterfaceBindingDoesntImplement/foo/wire.go
new file mode 100644
index 0000000000000..492e3c2a5b767
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceBindingDoesntImplement/foo/wire.go
@@ -0,0 +1,27 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectFooer() Fooer {
+	// wrong: string doesn't implement Fooer.
+	wire.Build(wire.Bind(new(Fooer), new(string)))
+	return nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceBindingDoesntImplement/pkg b/pkg/build/wire/internal/wire/testdata/InterfaceBindingDoesntImplement/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceBindingDoesntImplement/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceBindingDoesntImplement/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/InterfaceBindingDoesntImplement/want/wire_errs.txt
new file mode 100644
index 0000000000000..647d06feb3a41
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceBindingDoesntImplement/want/wire_errs.txt
@@ -0,0 +1 @@
+example.com/foo/wire.go:x:y: string does not implement example.com/foo.Fooer
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceBindingInvalidArg0/foo/foo.go b/pkg/build/wire/internal/wire/testdata/InterfaceBindingInvalidArg0/foo/foo.go
new file mode 100644
index 0000000000000..ad9b9c281ef17
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceBindingInvalidArg0/foo/foo.go
@@ -0,0 +1,27 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	fmt.Println(injectFooer().Foo())
+}
+
+type Fooer interface {
+	Foo() string
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceBindingInvalidArg0/foo/wire.go b/pkg/build/wire/internal/wire/testdata/InterfaceBindingInvalidArg0/foo/wire.go
new file mode 100644
index 0000000000000..97f6b77ffdda4
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceBindingInvalidArg0/foo/wire.go
@@ -0,0 +1,27 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectFooer() Fooer {
+	// wrong: arg0 must be a pointer to an interface.
+	wire.Build(wire.Bind("foo", "bar"))
+	return nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceBindingInvalidArg0/pkg b/pkg/build/wire/internal/wire/testdata/InterfaceBindingInvalidArg0/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceBindingInvalidArg0/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceBindingInvalidArg0/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/InterfaceBindingInvalidArg0/want/wire_errs.txt
new file mode 100644
index 0000000000000..4f3e78fb22b4e
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceBindingInvalidArg0/want/wire_errs.txt
@@ -0,0 +1 @@
+example.com/foo/wire.go:x:y: first argument to Bind must be a pointer to an interface type; found string
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceBindingNotEnoughArgs/foo/foo.go b/pkg/build/wire/internal/wire/testdata/InterfaceBindingNotEnoughArgs/foo/foo.go
new file mode 100644
index 0000000000000..ad9b9c281ef17
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceBindingNotEnoughArgs/foo/foo.go
@@ -0,0 +1,27 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	fmt.Println(injectFooer().Foo())
+}
+
+type Fooer interface {
+	Foo() string
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceBindingNotEnoughArgs/foo/wire.go b/pkg/build/wire/internal/wire/testdata/InterfaceBindingNotEnoughArgs/foo/wire.go
new file mode 100644
index 0000000000000..15a3322e5894f
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceBindingNotEnoughArgs/foo/wire.go
@@ -0,0 +1,27 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectFooer() Fooer {
+	// wrong: wire.Bind requires 2 args.
+	wire.Build(wire.Bind(new(Fooer)))
+	return nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceBindingNotEnoughArgs/pkg b/pkg/build/wire/internal/wire/testdata/InterfaceBindingNotEnoughArgs/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceBindingNotEnoughArgs/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceBindingNotEnoughArgs/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/InterfaceBindingNotEnoughArgs/want/wire_errs.txt
new file mode 100644
index 0000000000000..01a2f6ccdb0b1
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceBindingNotEnoughArgs/want/wire_errs.txt
@@ -0,0 +1,3 @@
+example.com/foo/wire.go:x:y: not enough arguments in call to wire.Bind
+	have (*Fooer)
+	want (interface{}, interface{})
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceBindingReuse/foo/foo.go b/pkg/build/wire/internal/wire/testdata/InterfaceBindingReuse/foo/foo.go
new file mode 100644
index 0000000000000..5d8e1b5c986bf
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceBindingReuse/foo/foo.go
@@ -0,0 +1,61 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// This test verifies that the concrete type is provided only once, even if an
+// interface additionally depends on it.
+
+package main
+
+import (
+	"fmt"
+	"sync"
+)
+
+func main() {
+	injectFooBar()
+	fmt.Println(provideBarCalls)
+}
+
+type Fooer interface {
+	Foo() string
+}
+
+type Bar string
+
+type FooBar struct {
+	Fooer Fooer
+	Bar   *Bar
+}
+
+func (b *Bar) Foo() string {
+	return string(*b)
+}
+
+func provideBar() *Bar {
+	mu.Lock()
+	provideBarCalls++
+	mu.Unlock()
+	b := new(Bar)
+	*b = "Hello, World!"
+	return b
+}
+
+var (
+	mu              sync.Mutex
+	provideBarCalls int
+)
+
+func provideFooBar(fooer Fooer, bar *Bar) FooBar {
+	return FooBar{fooer, bar}
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceBindingReuse/foo/wire.go b/pkg/build/wire/internal/wire/testdata/InterfaceBindingReuse/foo/wire.go
new file mode 100644
index 0000000000000..b342b3b6f164f
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceBindingReuse/foo/wire.go
@@ -0,0 +1,30 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectFooBar() FooBar {
+	wire.Build(
+		provideBar,
+		provideFooBar,
+		wire.Bind(new(Fooer), new(*Bar)),
+	)
+	return FooBar{}
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceBindingReuse/pkg b/pkg/build/wire/internal/wire/testdata/InterfaceBindingReuse/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceBindingReuse/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceBindingReuse/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/InterfaceBindingReuse/want/program_out.txt
new file mode 100644
index 0000000000000..d00491fd7e5bb
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceBindingReuse/want/program_out.txt
@@ -0,0 +1 @@
+1
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceBindingReuse/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/InterfaceBindingReuse/want/wire_gen.go
new file mode 100644
index 0000000000000..1c437713599a0
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceBindingReuse/want/wire_gen.go
@@ -0,0 +1,15 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func injectFooBar() FooBar {
+	bar := provideBar()
+	fooBar := provideFooBar(bar, bar)
+	return fooBar
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceValue/foo/foo.go b/pkg/build/wire/internal/wire/testdata/InterfaceValue/foo/foo.go
new file mode 100644
index 0000000000000..4e7edcdde6c2b
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceValue/foo/foo.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+)
+
+func main() {
+	r := injectedReader()
+	buf, _ := ioutil.ReadAll(r)
+	fmt.Println(string(buf))
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceValue/foo/wire.go b/pkg/build/wire/internal/wire/testdata/InterfaceValue/foo/wire.go
new file mode 100644
index 0000000000000..5ed782b930d92
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceValue/foo/wire.go
@@ -0,0 +1,29 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"io"
+	"strings"
+
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectedReader() io.Reader {
+	wire.Build(wire.InterfaceValue(new(io.Reader), strings.NewReader("hello world")))
+	return nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceValue/pkg b/pkg/build/wire/internal/wire/testdata/InterfaceValue/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceValue/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceValue/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/InterfaceValue/want/program_out.txt
new file mode 100644
index 0000000000000..3b18e512dba79
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceValue/want/program_out.txt
@@ -0,0 +1 @@
+hello world
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceValue/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/InterfaceValue/want/wire_gen.go
new file mode 100644
index 0000000000000..9868a9023f5c1
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceValue/want/wire_gen.go
@@ -0,0 +1,23 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+import (
+	"io"
+	"strings"
+)
+
+// Injectors from wire.go:
+
+func injectedReader() io.Reader {
+	reader := _wireReaderValue
+	return reader
+}
+
+var (
+	_wireReaderValue = strings.NewReader("hello world")
+)
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceValueDoesntImplement/foo/foo.go b/pkg/build/wire/internal/wire/testdata/InterfaceValueDoesntImplement/foo/foo.go
new file mode 100644
index 0000000000000..c2f2610654734
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceValueDoesntImplement/foo/foo.go
@@ -0,0 +1,21 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Println(injectedMessage())
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceValueDoesntImplement/foo/wire.go b/pkg/build/wire/internal/wire/testdata/InterfaceValueDoesntImplement/foo/wire.go
new file mode 100644
index 0000000000000..c9ce4a302fce8
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceValueDoesntImplement/foo/wire.go
@@ -0,0 +1,28 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+	"io"
+)
+
+func injectedMessage() string {
+	// wrong: string doesn't implement io.Reader.
+	wire.Build(wire.InterfaceValue(new(io.Reader), "bar"))
+	return ""
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceValueDoesntImplement/pkg b/pkg/build/wire/internal/wire/testdata/InterfaceValueDoesntImplement/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceValueDoesntImplement/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceValueDoesntImplement/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/InterfaceValueDoesntImplement/want/wire_errs.txt
new file mode 100644
index 0000000000000..5357ddfc5218f
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceValueDoesntImplement/want/wire_errs.txt
@@ -0,0 +1 @@
+example.com/foo/wire.go:x:y: string does not implement io.Reader
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceValueInvalidArg0/foo/foo.go b/pkg/build/wire/internal/wire/testdata/InterfaceValueInvalidArg0/foo/foo.go
new file mode 100644
index 0000000000000..c2f2610654734
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceValueInvalidArg0/foo/foo.go
@@ -0,0 +1,21 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Println(injectedMessage())
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceValueInvalidArg0/foo/wire.go b/pkg/build/wire/internal/wire/testdata/InterfaceValueInvalidArg0/foo/wire.go
new file mode 100644
index 0000000000000..69985206fb5fa
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceValueInvalidArg0/foo/wire.go
@@ -0,0 +1,27 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectedMessage() string {
+	// wrong: arg0 must be a pointer to an interface.
+	wire.Build(wire.InterfaceValue("foo", "bar"))
+	return ""
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceValueInvalidArg0/pkg b/pkg/build/wire/internal/wire/testdata/InterfaceValueInvalidArg0/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceValueInvalidArg0/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceValueInvalidArg0/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/InterfaceValueInvalidArg0/want/wire_errs.txt
new file mode 100644
index 0000000000000..89cc2e7e322f2
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceValueInvalidArg0/want/wire_errs.txt
@@ -0,0 +1 @@
+example.com/foo/wire.go:x:y: first argument to InterfaceValue must be a pointer to an interface type; found string
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceValueNotEnoughArgs/foo/foo.go b/pkg/build/wire/internal/wire/testdata/InterfaceValueNotEnoughArgs/foo/foo.go
new file mode 100644
index 0000000000000..c2f2610654734
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceValueNotEnoughArgs/foo/foo.go
@@ -0,0 +1,21 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Println(injectedMessage())
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceValueNotEnoughArgs/foo/wire.go b/pkg/build/wire/internal/wire/testdata/InterfaceValueNotEnoughArgs/foo/wire.go
new file mode 100644
index 0000000000000..8d7b884d4612e
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceValueNotEnoughArgs/foo/wire.go
@@ -0,0 +1,27 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectedMessage() string {
+	// wrong: InterfaceValue requires 2 args.
+	wire.Build(wire.InterfaceValue("foo"))
+	return ""
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceValueNotEnoughArgs/pkg b/pkg/build/wire/internal/wire/testdata/InterfaceValueNotEnoughArgs/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceValueNotEnoughArgs/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/InterfaceValueNotEnoughArgs/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/InterfaceValueNotEnoughArgs/want/wire_errs.txt
new file mode 100644
index 0000000000000..d11189ad5208a
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InterfaceValueNotEnoughArgs/want/wire_errs.txt
@@ -0,0 +1,3 @@
+example.com/foo/wire.go:x:y: not enough arguments in call to wire.InterfaceValue
+	have (string)
+	want (interface{}, interface{})
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/InvalidInjector/foo/foo.go b/pkg/build/wire/internal/wire/testdata/InvalidInjector/foo/foo.go
new file mode 100644
index 0000000000000..7406ee8980802
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InvalidInjector/foo/foo.go
@@ -0,0 +1,36 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	foo := injectFoo()
+	bar := injectBar()
+	fmt.Println(foo)
+	fmt.Println(bar)
+}
+
+type Foo int
+type Bar int
+
+func provideFoo() Foo {
+	return Foo(42)
+}
+func provideBar() Bar {
+	return Bar(99)
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InvalidInjector/foo/wire.go b/pkg/build/wire/internal/wire/testdata/InvalidInjector/foo/wire.go
new file mode 100644
index 0000000000000..8c67b41e08dd1
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InvalidInjector/foo/wire.go
@@ -0,0 +1,33 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectFoo() Foo {
+	// This non-call statement makes this an invalid injector.
+	_ = 42
+	panic(wire.Build(provideFoo))
+}
+
+func injectBar() Bar {
+	// Two call statements are also invalid.
+	panic(wire.Build(provideBar))
+	panic(wire.Build(provideBar))
+}
diff --git a/pkg/build/wire/internal/wire/testdata/InvalidInjector/pkg b/pkg/build/wire/internal/wire/testdata/InvalidInjector/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InvalidInjector/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/InvalidInjector/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/InvalidInjector/want/wire_errs.txt
new file mode 100644
index 0000000000000..aba63c0e9b05a
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/InvalidInjector/want/wire_errs.txt
@@ -0,0 +1,3 @@
+a call to wire.Build indicates that this function is an injector, but injectors must consist of only the wire.Build call and an optional return
+
+a call to wire.Build indicates that this function is an injector, but injectors must consist of only the wire.Build call and an optional return
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/MultipleArgsSameType/foo/foo.go b/pkg/build/wire/internal/wire/testdata/MultipleArgsSameType/foo/foo.go
new file mode 100644
index 0000000000000..a633b2d3115ba
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/MultipleArgsSameType/foo/foo.go
@@ -0,0 +1,31 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	fmt.Println(inject("foo", "bar").A)
+}
+
+type Foo struct {
+	A string
+}
+
+func provideFoo(a string) *Foo {
+	return &Foo{A: a}
+}
diff --git a/pkg/build/wire/internal/wire/testdata/MultipleArgsSameType/foo/wire.go b/pkg/build/wire/internal/wire/testdata/MultipleArgsSameType/foo/wire.go
new file mode 100644
index 0000000000000..22d939c7cd18c
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/MultipleArgsSameType/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func inject(a, b string) *Foo {
+	// fail: can't have two args of the same type.
+	panic(wire.Build(provideFoo))
+}
diff --git a/pkg/build/wire/internal/wire/testdata/MultipleArgsSameType/pkg b/pkg/build/wire/internal/wire/testdata/MultipleArgsSameType/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/MultipleArgsSameType/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/MultipleArgsSameType/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/MultipleArgsSameType/want/wire_errs.txt
new file mode 100644
index 0000000000000..f23405dcbdaaf
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/MultipleArgsSameType/want/wire_errs.txt
@@ -0,0 +1,5 @@
+example.com/foo/wire.go:x:y: multiple bindings for string
+current:
+<- argument b to injector function inject (example.com/foo/wire.go:x:y)
+previous:
+<- argument a to injector function inject (example.com/foo/wire.go:x:y)
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/MultipleBindings/foo/foo.go b/pkg/build/wire/internal/wire/testdata/MultipleBindings/foo/foo.go
new file mode 100644
index 0000000000000..3db08b89ff7d1
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/MultipleBindings/foo/foo.go
@@ -0,0 +1,45 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"io"
+	"strings"
+
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+type context struct{}
+
+func main() {}
+
+type Foo string
+type Bar io.Reader
+
+var Set = wire.NewSet(provideFoo)
+var SuperSet = wire.NewSet(Set)
+var SetWithDuplicateBindings = wire.NewSet(Set, SuperSet)
+
+func provideFoo() Foo {
+	return Foo("foo")
+}
+
+func provideFooAgain() Foo {
+	return Foo("foo foo")
+}
+
+func provideBar() Bar {
+	return io.Reader(strings.NewReader("hello"))
+}
diff --git a/pkg/build/wire/internal/wire/testdata/MultipleBindings/foo/wire.go b/pkg/build/wire/internal/wire/testdata/MultipleBindings/foo/wire.go
new file mode 100644
index 0000000000000..5bc1500b05d59
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/MultipleBindings/foo/wire.go
@@ -0,0 +1,53 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"strings"
+
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func inject() Foo {
+	// fail: provideFoo and provideFooAgain both provide Foo.
+	panic(wire.Build(provideFoo, provideFooAgain))
+}
+
+func injectFromSet() Foo {
+	// fail: provideFoo is also provided by Set.
+	panic(wire.Build(provideFoo, Set))
+}
+
+func injectFromNestedSet() Foo {
+	// fail: provideFoo is also provided by SuperSet, via Set.
+	panic(wire.Build(provideFoo, SuperSet))
+}
+
+func injectFromSetWithDuplicateBindings() Foo {
+	// fail: DuplicateBindingsSet has two providers for Foo.
+	panic(wire.Build(SetWithDuplicateBindings))
+}
+
+func injectDuplicateValues() Foo {
+	// fail: provideFoo and wire.Value both provide Foo.
+	panic(wire.Build(provideFoo, wire.Value(Foo("foo"))))
+}
+
+func injectDuplicateInterface() Bar {
+	// fail: provideBar and wire.Bind both provide Bar.
+	panic(wire.Build(provideBar, wire.Bind(new(Bar), new(*strings.Reader))))
+}
diff --git a/pkg/build/wire/internal/wire/testdata/MultipleBindings/pkg b/pkg/build/wire/internal/wire/testdata/MultipleBindings/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/MultipleBindings/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/MultipleBindings/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/MultipleBindings/want/wire_errs.txt
new file mode 100644
index 0000000000000..994400035047b
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/MultipleBindings/want/wire_errs.txt
@@ -0,0 +1,41 @@
+example.com/foo/wire.go:x:y: multiple bindings for example.com/foo.Foo
+current:
+<- provider "provideFooAgain" (example.com/foo/foo.go:x:y)
+previous:
+<- provider "provideFoo" (example.com/foo/foo.go:x:y)
+
+example.com/foo/wire.go:x:y: multiple bindings for example.com/foo.Foo
+current:
+<- provider "provideFoo" (example.com/foo/foo.go:x:y)
+previous:
+<- provider "provideFoo" (example.com/foo/foo.go:x:y)
+<- provider set "Set" (example.com/foo/foo.go:x:y)
+
+example.com/foo/wire.go:x:y: multiple bindings for example.com/foo.Foo
+current:
+<- provider "provideFoo" (example.com/foo/foo.go:x:y)
+previous:
+<- provider "provideFoo" (example.com/foo/foo.go:x:y)
+<- provider set "Set" (example.com/foo/foo.go:x:y)
+<- provider set "SuperSet" (example.com/foo/foo.go:x:y)
+
+example.com/foo/foo.go:x:y: SetWithDuplicateBindings has multiple bindings for example.com/foo.Foo
+current:
+<- provider "provideFoo" (example.com/foo/foo.go:x:y)
+<- provider set "Set" (example.com/foo/foo.go:x:y)
+<- provider set "SuperSet" (example.com/foo/foo.go:x:y)
+previous:
+<- provider "provideFoo" (example.com/foo/foo.go:x:y)
+<- provider set "Set" (example.com/foo/foo.go:x:y)
+
+example.com/foo/wire.go:x:y: multiple bindings for example.com/foo.Foo
+current:
+<- wire.Value (example.com/foo/wire.go:x:y)
+previous:
+<- provider "provideFoo" (example.com/foo/foo.go:x:y)
+
+example.com/foo/wire.go:x:y: multiple bindings for example.com/foo.Bar
+current:
+<- wire.Bind (example.com/foo/wire.go:x:y)
+previous:
+<- provider "provideBar" (example.com/foo/foo.go:x:y)
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/MultipleMissingInputs/foo/foo.go b/pkg/build/wire/internal/wire/testdata/MultipleMissingInputs/foo/foo.go
new file mode 100644
index 0000000000000..6a0ea8195bc7d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/MultipleMissingInputs/foo/foo.go
@@ -0,0 +1,47 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Println(injectMissingOutputType())
+	fmt.Println(injectMultipleMissingTypes())
+	fmt.Println(injectMissingRecursiveType())
+}
+
+type Foo int
+type Bar int
+type Baz int
+
+func provideBaz(foo Foo, bar Bar) Baz {
+	return 0
+}
+
+type Zip int
+type Zap int
+type Zop int
+
+func provideZip(foo Foo) Zip {
+	return 0
+}
+
+func provideZap(zip Zip) Zap {
+	return 0
+}
+
+func provideZop(zap Zap) Zop {
+	return 0
+}
diff --git a/pkg/build/wire/internal/wire/testdata/MultipleMissingInputs/foo/wire.go b/pkg/build/wire/internal/wire/testdata/MultipleMissingInputs/foo/wire.go
new file mode 100644
index 0000000000000..de8c23907a77b
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/MultipleMissingInputs/foo/wire.go
@@ -0,0 +1,42 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectMissingOutputType() Foo {
+	// Error: no provider for Foo.
+	wire.Build()
+	return Foo(0)
+}
+
+func injectMultipleMissingTypes() Baz {
+	// Error: provideBaz needs Foo and Bar, both missing.
+	wire.Build(provideBaz)
+	return Baz(0)
+}
+
+func injectMissingRecursiveType() Zop {
+	// Error:
+	// Zop  -> Zap -> Zip -> Foo
+	// provideZop needs Zap, provideZap needs Zip, provideZip needs Foo,
+	// which is missing.
+	wire.Build(provideZop, provideZap, provideZip)
+	return Zop(0)
+}
diff --git a/pkg/build/wire/internal/wire/testdata/MultipleMissingInputs/pkg b/pkg/build/wire/internal/wire/testdata/MultipleMissingInputs/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/MultipleMissingInputs/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/MultipleMissingInputs/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/MultipleMissingInputs/want/wire_errs.txt
new file mode 100644
index 0000000000000..f46d55c68a611
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/MultipleMissingInputs/want/wire_errs.txt
@@ -0,0 +1,12 @@
+example.com/foo/wire.go:x:y: inject injectMissingOutputType: no provider found for example.com/foo.Foo, output of injector
+
+example.com/foo/wire.go:x:y: inject injectMultipleMissingTypes: no provider found for example.com/foo.Foo
+needed by example.com/foo.Baz in provider "provideBaz" (example.com/foo/foo.go:x:y)
+
+example.com/foo/wire.go:x:y: inject injectMultipleMissingTypes: no provider found for example.com/foo.Bar
+needed by example.com/foo.Baz in provider "provideBaz" (example.com/foo/foo.go:x:y)
+
+example.com/foo/wire.go:x:y: inject injectMissingRecursiveType: no provider found for example.com/foo.Foo
+needed by example.com/foo.Zip in provider "provideZip" (example.com/foo/foo.go:x:y)
+needed by example.com/foo.Zap in provider "provideZap" (example.com/foo/foo.go:x:y)
+needed by example.com/foo.Zop in provider "provideZop" (example.com/foo/foo.go:x:y)
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/MultipleSimilarPackages/bar/bar.go b/pkg/build/wire/internal/wire/testdata/MultipleSimilarPackages/bar/bar.go
new file mode 100644
index 0000000000000..549f8fae4405c
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/MultipleSimilarPackages/bar/bar.go
@@ -0,0 +1,32 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package bar
+
+import (
+	"example.com/foo"
+)
+
+type Config struct {
+	V int
+}
+
+type Service struct {
+	Cfg *Config
+	F   *foo.Service
+}
+
+func New(cfg *Config, f *foo.Service) *Service {
+	return &Service{Cfg: cfg, F: f}
+}
diff --git a/pkg/build/wire/internal/wire/testdata/MultipleSimilarPackages/baz/baz.go b/pkg/build/wire/internal/wire/testdata/MultipleSimilarPackages/baz/baz.go
new file mode 100644
index 0000000000000..eb408527aa5f8
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/MultipleSimilarPackages/baz/baz.go
@@ -0,0 +1,32 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package baz
+
+import (
+	"example.com/bar"
+)
+
+type Config struct {
+	V int
+}
+
+type Service struct {
+	Cfg *Config
+	B   *bar.Service
+}
+
+func New(cfg *Config, b *bar.Service) *Service {
+	return &Service{Cfg: cfg, B: b}
+}
diff --git a/pkg/build/wire/internal/wire/testdata/MultipleSimilarPackages/foo/foo.go b/pkg/build/wire/internal/wire/testdata/MultipleSimilarPackages/foo/foo.go
new file mode 100644
index 0000000000000..9844ccb5499a4
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/MultipleSimilarPackages/foo/foo.go
@@ -0,0 +1,27 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package foo
+
+type Config struct {
+	V int
+}
+
+type Service struct {
+	Cfg *Config
+}
+
+func New(cfg *Config) *Service {
+	return &Service{Cfg: cfg}
+}
diff --git a/pkg/build/wire/internal/wire/testdata/MultipleSimilarPackages/main/wire.go b/pkg/build/wire/internal/wire/testdata/MultipleSimilarPackages/main/wire.go
new file mode 100644
index 0000000000000..fb501789ed4e6
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/MultipleSimilarPackages/main/wire.go
@@ -0,0 +1,68 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"fmt"
+
+	"example.com/bar"
+	"example.com/baz"
+	"example.com/foo"
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+type MainConfig struct {
+	Foo *foo.Config
+	Bar *bar.Config
+	baz *baz.Config
+}
+
+type MainService struct {
+	Foo *foo.Service
+	Bar *bar.Service
+	baz *baz.Service
+}
+
+func (m *MainService) String() string {
+	return fmt.Sprintf("%d %d %d", m.Foo.Cfg.V, m.Bar.Cfg.V, m.baz.Cfg.V)
+}
+
+func newMainService(MainConfig) *MainService {
+	wire.Build(
+		wire.Struct(new(MainService), "Foo", "Bar", "baz"),
+		wire.FieldsOf(
+			new(MainConfig),
+			"Foo",
+			"Bar",
+			"baz",
+		),
+		foo.New,
+		bar.New,
+		baz.New,
+	)
+	return nil
+}
+
+func main() {
+	cfg := MainConfig{
+		Foo: &foo.Config{1},
+		Bar: &bar.Config{2},
+		baz: &baz.Config{3},
+	}
+	svc := newMainService(cfg)
+	fmt.Println(svc.String())
+}
diff --git a/pkg/build/wire/internal/wire/testdata/MultipleSimilarPackages/pkg b/pkg/build/wire/internal/wire/testdata/MultipleSimilarPackages/pkg
new file mode 100644
index 0000000000000..b7badd92db3c3
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/MultipleSimilarPackages/pkg
@@ -0,0 +1 @@
+example.com/main
diff --git a/pkg/build/wire/internal/wire/testdata/MultipleSimilarPackages/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/MultipleSimilarPackages/want/program_out.txt
new file mode 100644
index 0000000000000..b85905ec0b994
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/MultipleSimilarPackages/want/program_out.txt
@@ -0,0 +1 @@
+1 2 3
diff --git a/pkg/build/wire/internal/wire/testdata/MultipleSimilarPackages/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/MultipleSimilarPackages/want/wire_gen.go
new file mode 100644
index 0000000000000..e40682057045a
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/MultipleSimilarPackages/want/wire_gen.go
@@ -0,0 +1,59 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+import (
+	"example.com/bar"
+	"example.com/baz"
+	"example.com/foo"
+	"fmt"
+)
+
+// Injectors from wire.go:
+
+func newMainService(mainConfig MainConfig) *MainService {
+	config := mainConfig.Foo
+	service := foo.New(config)
+	barConfig := mainConfig.Bar
+	barService := bar.New(barConfig, service)
+	bazConfig := mainConfig.baz
+	bazService := baz.New(bazConfig, barService)
+	mainService := &MainService{
+		Foo: service,
+		Bar: barService,
+		baz: bazService,
+	}
+	return mainService
+}
+
+// wire.go:
+
+type MainConfig struct {
+	Foo *foo.Config
+	Bar *bar.Config
+	baz *baz.Config
+}
+
+type MainService struct {
+	Foo *foo.Service
+	Bar *bar.Service
+	baz *baz.Service
+}
+
+func (m *MainService) String() string {
+	return fmt.Sprintf("%d %d %d", m.Foo.Cfg.V, m.Bar.Cfg.V, m.baz.Cfg.V)
+}
+
+func main() {
+	cfg := MainConfig{
+		Foo: &foo.Config{1},
+		Bar: &bar.Config{2},
+		baz: &baz.Config{3},
+	}
+	svc := newMainService(cfg)
+	fmt.Println(svc.String())
+}
diff --git a/pkg/build/wire/internal/wire/testdata/NamingWorstCase/foo/foo.go b/pkg/build/wire/internal/wire/testdata/NamingWorstCase/foo/foo.go
new file mode 100644
index 0000000000000..9952e48977d61
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NamingWorstCase/foo/foo.go
@@ -0,0 +1,36 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	stdcontext "context"
+	"fmt"
+	"os"
+)
+
+type context struct{}
+
+func main() {
+	c, err := inject(stdcontext.Background(), struct{}{})
+	if err != nil {
+		fmt.Println("ERROR:", err)
+		os.Exit(1)
+	}
+	fmt.Println(c)
+}
+
+func provide(ctx stdcontext.Context) (context, error) {
+	return context{}, nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/NamingWorstCase/foo/wire.go b/pkg/build/wire/internal/wire/testdata/NamingWorstCase/foo/wire.go
new file mode 100644
index 0000000000000..78cc79105f0b9
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NamingWorstCase/foo/wire.go
@@ -0,0 +1,27 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	stdcontext "context"
+
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func inject(context stdcontext.Context, err struct{}) (context, error) {
+	panic(wire.Build(provide))
+}
diff --git a/pkg/build/wire/internal/wire/testdata/NamingWorstCase/pkg b/pkg/build/wire/internal/wire/testdata/NamingWorstCase/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NamingWorstCase/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/NamingWorstCase/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/NamingWorstCase/want/program_out.txt
new file mode 100644
index 0000000000000..0967ef424bce6
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NamingWorstCase/want/program_out.txt
@@ -0,0 +1 @@
+{}
diff --git a/pkg/build/wire/internal/wire/testdata/NamingWorstCase/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/NamingWorstCase/want/wire_gen.go
new file mode 100644
index 0000000000000..e32329d325edf
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NamingWorstCase/want/wire_gen.go
@@ -0,0 +1,21 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+import (
+	context2 "context"
+)
+
+// Injectors from wire.go:
+
+func inject(context3 context2.Context, err2 struct{}) (context, error) {
+	mainContext, err := provide(context3)
+	if err != nil {
+		return context{}, err
+	}
+	return mainContext, nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/NamingWorstCaseAllInOne/foo/foo.go b/pkg/build/wire/internal/wire/testdata/NamingWorstCaseAllInOne/foo/foo.go
new file mode 100644
index 0000000000000..0c814f01befe9
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NamingWorstCaseAllInOne/foo/foo.go
@@ -0,0 +1,58 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+// This file is specifically designed to cause issues with copying the
+// AST, particularly with the identifier "context".
+
+package main
+
+import (
+	stdcontext "context"
+	"fmt"
+	"os"
+	"reflect"
+
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+type context struct{}
+
+func main() {
+	if _, ok := reflect.TypeOf(context{}).MethodByName("Provide"); !ok {
+		fmt.Println("ERROR: context.Provide renamed")
+		os.Exit(1)
+	}
+	c, err := inject(stdcontext.Background(), struct{}{})
+	if err != nil {
+		fmt.Println("ERROR:", err)
+		os.Exit(1)
+	}
+	fmt.Println(c)
+}
+
+func Provide(context2 stdcontext.Context) (context, error) {
+	var context3 = stdcontext.Background()
+	_ = context2
+	_ = context3
+	return context{}, nil
+}
+
+func inject(context stdcontext.Context, err struct{}) (context, error) {
+	panic(wire.Build(Provide))
+}
+
+func (context) Provide() {
+}
diff --git a/pkg/build/wire/internal/wire/testdata/NamingWorstCaseAllInOne/pkg b/pkg/build/wire/internal/wire/testdata/NamingWorstCaseAllInOne/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NamingWorstCaseAllInOne/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/NamingWorstCaseAllInOne/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/NamingWorstCaseAllInOne/want/program_out.txt
new file mode 100644
index 0000000000000..0967ef424bce6
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NamingWorstCaseAllInOne/want/program_out.txt
@@ -0,0 +1 @@
+{}
diff --git a/pkg/build/wire/internal/wire/testdata/NamingWorstCaseAllInOne/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/NamingWorstCaseAllInOne/want/wire_gen.go
new file mode 100644
index 0000000000000..c0815204bd129
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NamingWorstCaseAllInOne/want/wire_gen.go
@@ -0,0 +1,51 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+import (
+	context2 "context"
+	"fmt"
+	"os"
+	"reflect"
+)
+
+// Injectors from foo.go:
+
+func inject(context3 context2.Context, err2 struct{}) (context, error) {
+	mainContext, err := Provide(context3)
+	if err != nil {
+		return context{}, err
+	}
+	return mainContext, nil
+}
+
+// foo.go:
+
+type context struct{}
+
+func main() {
+	if _, ok := reflect.TypeOf(context{}).MethodByName("Provide"); !ok {
+		fmt.Println("ERROR: context.Provide renamed")
+		os.Exit(1)
+	}
+	c, err := inject(context2.Background(), struct{}{})
+	if err != nil {
+		fmt.Println("ERROR:", err)
+		os.Exit(1)
+	}
+	fmt.Println(c)
+}
+
+func Provide(context2_2 context2.Context) (context, error) {
+	var context3 = context2.Background()
+	_ = context2_2
+	_ = context3
+	return context{}, nil
+}
+
+func (context) Provide() {
+}
diff --git a/pkg/build/wire/internal/wire/testdata/NiladicIdentity/foo/foo.go b/pkg/build/wire/internal/wire/testdata/NiladicIdentity/foo/foo.go
new file mode 100644
index 0000000000000..e94ff6b91fffb
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NiladicIdentity/foo/foo.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Println(injectedMessage())
+}
+
+// provideMessage provides a friendly user greeting.
+func provideMessage() string {
+	return "Hello, World!"
+}
diff --git a/pkg/build/wire/internal/wire/testdata/NiladicIdentity/foo/wire.go b/pkg/build/wire/internal/wire/testdata/NiladicIdentity/foo/wire.go
new file mode 100644
index 0000000000000..0570bb2a3bdd2
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NiladicIdentity/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectedMessage() string {
+	wire.Build(provideMessage)
+	return ""
+}
diff --git a/pkg/build/wire/internal/wire/testdata/NiladicIdentity/pkg b/pkg/build/wire/internal/wire/testdata/NiladicIdentity/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NiladicIdentity/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/NiladicIdentity/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/NiladicIdentity/want/program_out.txt
new file mode 100644
index 0000000000000..8ab686eafeb1f
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NiladicIdentity/want/program_out.txt
@@ -0,0 +1 @@
+Hello, World!
diff --git a/pkg/build/wire/internal/wire/testdata/NiladicIdentity/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/NiladicIdentity/want/wire_gen.go
new file mode 100644
index 0000000000000..8b124e562d84b
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NiladicIdentity/want/wire_gen.go
@@ -0,0 +1,14 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func injectedMessage() string {
+	string2 := provideMessage()
+	return string2
+}
diff --git a/pkg/build/wire/internal/wire/testdata/NiladicValue/foo/foo.go b/pkg/build/wire/internal/wire/testdata/NiladicValue/foo/foo.go
new file mode 100644
index 0000000000000..c2f2610654734
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NiladicValue/foo/foo.go
@@ -0,0 +1,21 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Println(injectedMessage())
+}
diff --git a/pkg/build/wire/internal/wire/testdata/NiladicValue/foo/wire.go b/pkg/build/wire/internal/wire/testdata/NiladicValue/foo/wire.go
new file mode 100644
index 0000000000000..50e62af7d3f95
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NiladicValue/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectedMessage() string {
+	wire.Build(wire.Value("Hello, World!"))
+	return ""
+}
diff --git a/pkg/build/wire/internal/wire/testdata/NiladicValue/pkg b/pkg/build/wire/internal/wire/testdata/NiladicValue/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NiladicValue/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/NiladicValue/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/NiladicValue/want/program_out.txt
new file mode 100644
index 0000000000000..8ab686eafeb1f
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NiladicValue/want/program_out.txt
@@ -0,0 +1 @@
+Hello, World!
diff --git a/pkg/build/wire/internal/wire/testdata/NiladicValue/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/NiladicValue/want/wire_gen.go
new file mode 100644
index 0000000000000..16c0df257c275
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NiladicValue/want/wire_gen.go
@@ -0,0 +1,18 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func injectedMessage() string {
+	string2 := _wireStringValue
+	return string2
+}
+
+var (
+	_wireStringValue = "Hello, World!"
+)
diff --git a/pkg/build/wire/internal/wire/testdata/NoImplicitInterface/foo/foo.go b/pkg/build/wire/internal/wire/testdata/NoImplicitInterface/foo/foo.go
new file mode 100644
index 0000000000000..996347e291baa
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NoImplicitInterface/foo/foo.go
@@ -0,0 +1,35 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Println(injectFooer().Foo())
+}
+
+type Fooer interface {
+	Foo() string
+}
+
+type Bar string
+
+func (b Bar) Foo() string {
+	return string(b)
+}
+
+func provideBar() Bar {
+	return "Hello, World!"
+}
diff --git a/pkg/build/wire/internal/wire/testdata/NoImplicitInterface/foo/wire.go b/pkg/build/wire/internal/wire/testdata/NoImplicitInterface/foo/wire.go
new file mode 100644
index 0000000000000..f4cd412752d29
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NoImplicitInterface/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectFooer() Fooer {
+	wire.Build(provideBar)
+	return nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/NoImplicitInterface/pkg b/pkg/build/wire/internal/wire/testdata/NoImplicitInterface/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NoImplicitInterface/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/NoImplicitInterface/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/NoImplicitInterface/want/wire_errs.txt
new file mode 100644
index 0000000000000..23b30e014f904
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NoImplicitInterface/want/wire_errs.txt
@@ -0,0 +1 @@
+example.com/foo/wire.go:x:y: inject injectFooer: no provider found for example.com/foo.Fooer, output of injector
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/NoInjectParamNames/foo/foo.go b/pkg/build/wire/internal/wire/testdata/NoInjectParamNames/foo/foo.go
new file mode 100644
index 0000000000000..9952e48977d61
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NoInjectParamNames/foo/foo.go
@@ -0,0 +1,36 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	stdcontext "context"
+	"fmt"
+	"os"
+)
+
+type context struct{}
+
+func main() {
+	c, err := inject(stdcontext.Background(), struct{}{})
+	if err != nil {
+		fmt.Println("ERROR:", err)
+		os.Exit(1)
+	}
+	fmt.Println(c)
+}
+
+func provide(ctx stdcontext.Context) (context, error) {
+	return context{}, nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/NoInjectParamNames/foo/wire.go b/pkg/build/wire/internal/wire/testdata/NoInjectParamNames/foo/wire.go
new file mode 100644
index 0000000000000..758cb5fb093d1
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NoInjectParamNames/foo/wire.go
@@ -0,0 +1,31 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	stdcontext "context"
+
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+// The notable characteristic of this test is that there are no
+// parameter names on the inject stub.
+
+func inject(stdcontext.Context, struct{}) (context, error) {
+	wire.Build(provide)
+	return context{}, nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/NoInjectParamNames/pkg b/pkg/build/wire/internal/wire/testdata/NoInjectParamNames/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NoInjectParamNames/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/NoInjectParamNames/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/NoInjectParamNames/want/program_out.txt
new file mode 100644
index 0000000000000..0967ef424bce6
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NoInjectParamNames/want/program_out.txt
@@ -0,0 +1 @@
+{}
diff --git a/pkg/build/wire/internal/wire/testdata/NoInjectParamNames/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/NoInjectParamNames/want/wire_gen.go
new file mode 100644
index 0000000000000..b8760db4b813c
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NoInjectParamNames/want/wire_gen.go
@@ -0,0 +1,21 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+import (
+	context2 "context"
+)
+
+// Injectors from wire.go:
+
+func inject(contextContext context2.Context, arg struct{}) (context, error) {
+	mainContext, err := provide(contextContext)
+	if err != nil {
+		return context{}, err
+	}
+	return mainContext, nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/NoopBuild/foo/foo.go b/pkg/build/wire/internal/wire/testdata/NoopBuild/foo/foo.go
new file mode 100644
index 0000000000000..d149a4ad8600a
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NoopBuild/foo/foo.go
@@ -0,0 +1,21 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Println("Hello, World!")
+}
diff --git a/pkg/build/wire/internal/wire/testdata/NoopBuild/pkg b/pkg/build/wire/internal/wire/testdata/NoopBuild/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NoopBuild/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/NoopBuild/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/NoopBuild/want/program_out.txt
new file mode 100644
index 0000000000000..8ab686eafeb1f
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/NoopBuild/want/program_out.txt
@@ -0,0 +1 @@
+Hello, World!
diff --git a/pkg/services/provisioning/notifiers/testdata/test-configs/empty/empty.yaml b/pkg/build/wire/internal/wire/testdata/NoopBuild/want/wire_gen.go
similarity index 100%
rename from pkg/services/provisioning/notifiers/testdata/test-configs/empty/empty.yaml
rename to pkg/build/wire/internal/wire/testdata/NoopBuild/want/wire_gen.go
diff --git a/pkg/build/wire/internal/wire/testdata/PartialCleanup/foo/foo.go b/pkg/build/wire/internal/wire/testdata/PartialCleanup/foo/foo.go
new file mode 100644
index 0000000000000..4ed90e541f5f9
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/PartialCleanup/foo/foo.go
@@ -0,0 +1,62 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"errors"
+	"fmt"
+	"strings"
+)
+
+var (
+	cleanedFoo = false
+	cleanedBar = false
+)
+
+func main() {
+	_, cleanup, err := injectBaz()
+	if err == nil {
+		fmt.Println("<nil>")
+	} else {
+		fmt.Println(strings.Contains(err.Error(), "bork!"))
+	}
+	fmt.Println(cleanedFoo, cleanedBar, cleanup == nil)
+}
+
+type Foo int
+type Bar int
+type Baz int
+
+func provideFoo() (*Foo, func()) {
+	foo := new(Foo)
+	*foo = 42
+	return foo, func() { *foo = 0; cleanedFoo = true }
+}
+
+func provideBar(foo *Foo) (*Bar, func(), error) {
+	bar := new(Bar)
+	*bar = 77
+	return bar, func() {
+		if *foo == 0 {
+			panic("foo cleaned up before bar")
+		}
+		*bar = 0
+		cleanedBar = true
+	}, nil
+}
+
+func provideBaz(bar *Bar) (Baz, error) {
+	return 0, errors.New("bork!")
+}
diff --git a/pkg/build/wire/internal/wire/testdata/PartialCleanup/foo/wire.go b/pkg/build/wire/internal/wire/testdata/PartialCleanup/foo/wire.go
new file mode 100644
index 0000000000000..5d52e9243c768
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/PartialCleanup/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectBaz() (Baz, func(), error) {
+	wire.Build(provideFoo, provideBar, provideBaz)
+	return 0, nil, nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/PartialCleanup/pkg b/pkg/build/wire/internal/wire/testdata/PartialCleanup/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/PartialCleanup/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/PartialCleanup/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/PartialCleanup/want/program_out.txt
new file mode 100644
index 0000000000000..649cfc2cf861c
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/PartialCleanup/want/program_out.txt
@@ -0,0 +1,2 @@
+true
+true true true
diff --git a/pkg/build/wire/internal/wire/testdata/PartialCleanup/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/PartialCleanup/want/wire_gen.go
new file mode 100644
index 0000000000000..6cf2640186da9
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/PartialCleanup/want/wire_gen.go
@@ -0,0 +1,28 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func injectBaz() (Baz, func(), error) {
+	foo, cleanup := provideFoo()
+	bar, cleanup2, err := provideBar(foo)
+	if err != nil {
+		cleanup()
+		return 0, nil, err
+	}
+	baz, err := provideBaz(bar)
+	if err != nil {
+		cleanup2()
+		cleanup()
+		return 0, nil, err
+	}
+	return baz, func() {
+		cleanup2()
+		cleanup()
+	}, nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/PkgImport/anon1/anon1.go b/pkg/build/wire/internal/wire/testdata/PkgImport/anon1/anon1.go
new file mode 100644
index 0000000000000..5ee862ff03f02
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/PkgImport/anon1/anon1.go
@@ -0,0 +1,15 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package anon1
diff --git a/pkg/build/wire/internal/wire/testdata/PkgImport/anon2/anon2.go b/pkg/build/wire/internal/wire/testdata/PkgImport/anon2/anon2.go
new file mode 100644
index 0000000000000..79fd5e890b476
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/PkgImport/anon2/anon2.go
@@ -0,0 +1,15 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package anon2
diff --git a/pkg/build/wire/internal/wire/testdata/PkgImport/bar/bar.go b/pkg/build/wire/internal/wire/testdata/PkgImport/bar/bar.go
new file mode 100644
index 0000000000000..f65629da01531
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/PkgImport/bar/bar.go
@@ -0,0 +1,21 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package bar
+
+type Bar int
+
+func ProvideBar() Bar {
+	return 1
+}
diff --git a/pkg/build/wire/internal/wire/testdata/PkgImport/foo/foo.go b/pkg/build/wire/internal/wire/testdata/PkgImport/foo/foo.go
new file mode 100644
index 0000000000000..689251d435c60
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/PkgImport/foo/foo.go
@@ -0,0 +1,42 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+
+	"example.com/bar"
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func main() {
+	fmt.Println(injectFooBar())
+}
+
+type Foo int
+type FooBar int
+
+var Set = wire.NewSet(
+	provideFoo,
+	bar.ProvideBar,
+	provideFooBar)
+
+func provideFoo() Foo {
+	return 41
+}
+
+func provideFooBar(foo Foo, barVal bar.Bar) FooBar {
+	return FooBar(foo) + FooBar(barVal)
+}
diff --git a/pkg/build/wire/internal/wire/testdata/PkgImport/foo/wire.go b/pkg/build/wire/internal/wire/testdata/PkgImport/foo/wire.go
new file mode 100644
index 0000000000000..4f9c9d9a7ba97
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/PkgImport/foo/wire.go
@@ -0,0 +1,29 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	_ "example.com/anon1" // intentionally duplicated
+	_ "example.com/anon1" // intentionally duplicated
+	_ "example.com/anon2"
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectFooBar() FooBar {
+	wire.Build(Set)
+	return 0
+}
diff --git a/pkg/build/wire/internal/wire/testdata/PkgImport/pkg b/pkg/build/wire/internal/wire/testdata/PkgImport/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/PkgImport/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/PkgImport/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/PkgImport/want/program_out.txt
new file mode 100644
index 0000000000000..d81cc0710eb6c
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/PkgImport/want/program_out.txt
@@ -0,0 +1 @@
+42
diff --git a/pkg/build/wire/internal/wire/testdata/PkgImport/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/PkgImport/want/wire_gen.go
new file mode 100644
index 0000000000000..5f3e127faff92
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/PkgImport/want/wire_gen.go
@@ -0,0 +1,25 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+import (
+	"example.com/bar"
+)
+
+import (
+	_ "example.com/anon1"
+	_ "example.com/anon2"
+)
+
+// Injectors from wire.go:
+
+func injectFooBar() FooBar {
+	foo := provideFoo()
+	barBar := bar.ProvideBar()
+	fooBar := provideFooBar(foo, barBar)
+	return fooBar
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ProviderSetBindingMissingConcreteType/foo/foo.go b/pkg/build/wire/internal/wire/testdata/ProviderSetBindingMissingConcreteType/foo/foo.go
new file mode 100644
index 0000000000000..1fcc71620b421
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ProviderSetBindingMissingConcreteType/foo/foo.go
@@ -0,0 +1,49 @@
+// Copyright 2019 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func main() {
+	fmt.Println(injectFoo())
+}
+
+type fooer interface {
+	Do() string
+}
+
+type foo struct{}
+
+func (f *foo) Do() string {
+	return "did foo"
+}
+
+func newFoo() *foo {
+	return &foo{}
+}
+
+var (
+	setA = wire.NewSet(newFoo)
+	// This set is invalid because it has a wire.Bind but no matching provider.
+	// From the user guide:
+	// Any set that includes an interface binding must also have a provider in
+	// the same set that provides the concrete type.
+	setB = wire.NewSet(wire.Bind(new(fooer), new(*foo)))
+	setC = wire.NewSet(setA, setB)
+)
diff --git a/pkg/build/wire/internal/wire/testdata/ProviderSetBindingMissingConcreteType/foo/wire.go b/pkg/build/wire/internal/wire/testdata/ProviderSetBindingMissingConcreteType/foo/wire.go
new file mode 100644
index 0000000000000..2e7652054818b
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ProviderSetBindingMissingConcreteType/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2019 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectFoo() *foo {
+	wire.Build(setC)
+	return nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ProviderSetBindingMissingConcreteType/pkg b/pkg/build/wire/internal/wire/testdata/ProviderSetBindingMissingConcreteType/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ProviderSetBindingMissingConcreteType/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/ProviderSetBindingMissingConcreteType/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/ProviderSetBindingMissingConcreteType/want/wire_errs.txt
new file mode 100644
index 0000000000000..656cd94df7f58
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ProviderSetBindingMissingConcreteType/want/wire_errs.txt
@@ -0,0 +1 @@
+example.com/foo/foo.go:x:y: wire.Bind of concrete type "*example.com/foo.foo" to interface "example.com/foo.fooer", but setB does not include a provider for "*example.com/foo.foo"
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/RelativePkg/foo/foo.go b/pkg/build/wire/internal/wire/testdata/RelativePkg/foo/foo.go
new file mode 100644
index 0000000000000..e94ff6b91fffb
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/RelativePkg/foo/foo.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Println(injectedMessage())
+}
+
+// provideMessage provides a friendly user greeting.
+func provideMessage() string {
+	return "Hello, World!"
+}
diff --git a/pkg/build/wire/internal/wire/testdata/RelativePkg/foo/wire.go b/pkg/build/wire/internal/wire/testdata/RelativePkg/foo/wire.go
new file mode 100644
index 0000000000000..0570bb2a3bdd2
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/RelativePkg/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectedMessage() string {
+	wire.Build(provideMessage)
+	return ""
+}
diff --git a/pkg/build/wire/internal/wire/testdata/RelativePkg/pkg b/pkg/build/wire/internal/wire/testdata/RelativePkg/pkg
new file mode 100644
index 0000000000000..b10f96cf4778f
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/RelativePkg/pkg
@@ -0,0 +1 @@
+./foo
diff --git a/pkg/build/wire/internal/wire/testdata/RelativePkg/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/RelativePkg/want/program_out.txt
new file mode 100644
index 0000000000000..8ab686eafeb1f
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/RelativePkg/want/program_out.txt
@@ -0,0 +1 @@
+Hello, World!
diff --git a/pkg/build/wire/internal/wire/testdata/RelativePkg/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/RelativePkg/want/wire_gen.go
new file mode 100644
index 0000000000000..8b124e562d84b
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/RelativePkg/want/wire_gen.go
@@ -0,0 +1,14 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func injectedMessage() string {
+	string2 := provideMessage()
+	return string2
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ReservedKeywords/foo/foo.go b/pkg/build/wire/internal/wire/testdata/ReservedKeywords/foo/foo.go
new file mode 100644
index 0000000000000..a541be5204ed9
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ReservedKeywords/foo/foo.go
@@ -0,0 +1,35 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	i := injectInterface()
+	fmt.Println(i)
+}
+
+type Interface int
+type Select int
+
+func provideInterface(s Select) Interface {
+	return Interface(int(s) + 1)
+}
+
+func provideSelect() Select {
+	return Select(41)
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ReservedKeywords/foo/wire.go b/pkg/build/wire/internal/wire/testdata/ReservedKeywords/foo/wire.go
new file mode 100644
index 0000000000000..c375ee159f7f6
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ReservedKeywords/foo/wire.go
@@ -0,0 +1,32 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+// Wire tries to disambiguate the variable "select" by prepending
+// the package name; this package-scoped variable conflicts with that
+// and forces a different name.
+var mainSelect = 0
+
+func injectInterface() Interface {
+	// interface and select are Go reserved words, so
+	// Wire should avoid using them as variable names.
+	panic(wire.Build(provideInterface, provideSelect))
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ReservedKeywords/pkg b/pkg/build/wire/internal/wire/testdata/ReservedKeywords/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ReservedKeywords/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/ReservedKeywords/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/ReservedKeywords/want/program_out.txt
new file mode 100644
index 0000000000000..d81cc0710eb6c
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ReservedKeywords/want/program_out.txt
@@ -0,0 +1 @@
+42
diff --git a/pkg/build/wire/internal/wire/testdata/ReservedKeywords/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/ReservedKeywords/want/wire_gen.go
new file mode 100644
index 0000000000000..7ff3110419502
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ReservedKeywords/want/wire_gen.go
@@ -0,0 +1,22 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func injectInterface() Interface {
+	select2 := provideSelect()
+	mainInterface := provideInterface(select2)
+	return mainInterface
+}
+
+// wire.go:
+
+// Wire tries to disambiguate the variable "select" by prepending
+// the package name; this package-scoped variable conflicts with that
+// and forces a different name.
+var mainSelect = 0
diff --git a/pkg/build/wire/internal/wire/testdata/ReturnArgumentAsInterface/foo/foo.go b/pkg/build/wire/internal/wire/testdata/ReturnArgumentAsInterface/foo/foo.go
new file mode 100644
index 0000000000000..6af8eb87c8e9f
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ReturnArgumentAsInterface/foo/foo.go
@@ -0,0 +1,25 @@
+// Copyright 2019 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Println(injectStringer("Hello, World!"))
+}
+
+type MyString string
+
+func (s MyString) String() string { return string(s) }
diff --git a/pkg/build/wire/internal/wire/testdata/ReturnArgumentAsInterface/foo/wire.go b/pkg/build/wire/internal/wire/testdata/ReturnArgumentAsInterface/foo/wire.go
new file mode 100644
index 0000000000000..fb79f9ceb41ae
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ReturnArgumentAsInterface/foo/wire.go
@@ -0,0 +1,28 @@
+// Copyright 2019 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"fmt"
+
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectStringer(s MyString) fmt.Stringer {
+	wire.Build(wire.Bind(new(fmt.Stringer), new(MyString)))
+	return nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ReturnArgumentAsInterface/pkg b/pkg/build/wire/internal/wire/testdata/ReturnArgumentAsInterface/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ReturnArgumentAsInterface/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/ReturnArgumentAsInterface/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/ReturnArgumentAsInterface/want/program_out.txt
new file mode 100644
index 0000000000000..8ab686eafeb1f
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ReturnArgumentAsInterface/want/program_out.txt
@@ -0,0 +1 @@
+Hello, World!
diff --git a/pkg/build/wire/internal/wire/testdata/ReturnArgumentAsInterface/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/ReturnArgumentAsInterface/want/wire_gen.go
new file mode 100644
index 0000000000000..9d1a331d25868
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ReturnArgumentAsInterface/want/wire_gen.go
@@ -0,0 +1,17 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+import (
+	"fmt"
+)
+
+// Injectors from wire.go:
+
+func injectStringer(s MyString) fmt.Stringer {
+	return s
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ReturnError/foo/foo.go b/pkg/build/wire/internal/wire/testdata/ReturnError/foo/foo.go
new file mode 100644
index 0000000000000..e7ded242843c0
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ReturnError/foo/foo.go
@@ -0,0 +1,41 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"errors"
+	"fmt"
+	"strings"
+
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func main() {
+	foo, err := injectFoo()
+	fmt.Println(foo) // should be zero, the injector should ignore provideFoo's return value.
+	if err == nil {
+		fmt.Println("<nil>")
+	} else {
+		fmt.Println(strings.Contains(err.Error(), "there is no Foo"))
+	}
+}
+
+type Foo int
+
+func provideFoo() (Foo, error) {
+	return 42, errors.New("there is no Foo")
+}
+
+var Set = wire.NewSet(provideFoo)
diff --git a/pkg/build/wire/internal/wire/testdata/ReturnError/foo/wire.go b/pkg/build/wire/internal/wire/testdata/ReturnError/foo/wire.go
new file mode 100644
index 0000000000000..a729e8262738e
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ReturnError/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectFoo() (Foo, error) {
+	wire.Build(Set)
+	return 0, nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ReturnError/pkg b/pkg/build/wire/internal/wire/testdata/ReturnError/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ReturnError/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/ReturnError/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/ReturnError/want/program_out.txt
new file mode 100644
index 0000000000000..f9d60c07bb2e5
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ReturnError/want/program_out.txt
@@ -0,0 +1,2 @@
+0
+true
diff --git a/pkg/build/wire/internal/wire/testdata/ReturnError/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/ReturnError/want/wire_gen.go
new file mode 100644
index 0000000000000..5d9746675db05
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ReturnError/want/wire_gen.go
@@ -0,0 +1,17 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func injectFoo() (Foo, error) {
+	foo, err := provideFoo()
+	if err != nil {
+		return 0, err
+	}
+	return foo, nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/Struct/foo/foo.go b/pkg/build/wire/internal/wire/testdata/Struct/foo/foo.go
new file mode 100644
index 0000000000000..2236d15c483c0
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Struct/foo/foo.go
@@ -0,0 +1,56 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"sync"
+
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func main() {
+	fb := injectFooBar()
+	pfb := injectPartFooBar()
+	fmt.Println(fb.Foo, fb.Bar)
+	fmt.Println(pfb.Foo, pfb.Bar)
+}
+
+type Foo int
+type Bar int
+
+type FooBar struct {
+	mu  sync.Mutex `wire:"-"`
+	Foo Foo
+	Bar Bar
+}
+
+func provideFoo() Foo {
+	return 41
+}
+
+func provideBar() Bar {
+	return 1
+}
+
+var Set = wire.NewSet(
+	wire.Struct(new(FooBar), "*"),
+	provideFoo,
+	provideBar)
+
+var PartSet = wire.NewSet(
+	wire.Struct(new(FooBar), "Foo"),
+	provideFoo,
+)
diff --git a/pkg/build/wire/internal/wire/testdata/Struct/foo/wire.go b/pkg/build/wire/internal/wire/testdata/Struct/foo/wire.go
new file mode 100644
index 0000000000000..29ef937ddfc91
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Struct/foo/wire.go
@@ -0,0 +1,31 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectFooBar() FooBar {
+	wire.Build(Set)
+	return FooBar{}
+}
+
+func injectPartFooBar() FooBar {
+	wire.Build(PartSet)
+	return FooBar{}
+}
diff --git a/pkg/build/wire/internal/wire/testdata/Struct/pkg b/pkg/build/wire/internal/wire/testdata/Struct/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Struct/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/Struct/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/Struct/want/program_out.txt
new file mode 100644
index 0000000000000..3ea9a3a5fdc02
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Struct/want/program_out.txt
@@ -0,0 +1,2 @@
+41 1
+41 0
diff --git a/pkg/build/wire/internal/wire/testdata/Struct/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/Struct/want/wire_gen.go
new file mode 100644
index 0000000000000..e4bf0c727d1d3
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Struct/want/wire_gen.go
@@ -0,0 +1,27 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func injectFooBar() FooBar {
+	foo := provideFoo()
+	bar := provideBar()
+	fooBar := FooBar{
+		Foo: foo,
+		Bar: bar,
+	}
+	return fooBar
+}
+
+func injectPartFooBar() FooBar {
+	foo := provideFoo()
+	fooBar := FooBar{
+		Foo: foo,
+	}
+	return fooBar
+}
diff --git a/pkg/build/wire/internal/wire/testdata/StructNotAStruct/foo/foo.go b/pkg/build/wire/internal/wire/testdata/StructNotAStruct/foo/foo.go
new file mode 100644
index 0000000000000..b308ebadfbb25
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/StructNotAStruct/foo/foo.go
@@ -0,0 +1,27 @@
+// Copyright 2019 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	fmt.Println(inject(A{"Hello"}))
+}
+
+type A struct {
+	B string
+}
diff --git a/pkg/build/wire/internal/wire/testdata/StructNotAStruct/foo/wire.go b/pkg/build/wire/internal/wire/testdata/StructNotAStruct/foo/wire.go
new file mode 100644
index 0000000000000..7a84cdb9dcbc4
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/StructNotAStruct/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2019 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func inject(a A) string {
+	wire.Build(wire.Struct(new(*A), "*"))
+	return ""
+}
diff --git a/pkg/build/wire/internal/wire/testdata/StructNotAStruct/pkg b/pkg/build/wire/internal/wire/testdata/StructNotAStruct/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/StructNotAStruct/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/StructNotAStruct/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/StructNotAStruct/want/wire_errs.txt
new file mode 100644
index 0000000000000..e1ada68073fee
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/StructNotAStruct/want/wire_errs.txt
@@ -0,0 +1 @@
+example.com/foo/wire.go:x:y: first argument to Struct must be a pointer to a named struct; found **example.com/foo.A
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/StructPointer/foo/foo.go b/pkg/build/wire/internal/wire/testdata/StructPointer/foo/foo.go
new file mode 100644
index 0000000000000..dad7ec5cae0d9
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/StructPointer/foo/foo.go
@@ -0,0 +1,50 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func main() {
+	fb := injectFooBar()
+	e := injectEmptyStruct()
+	fmt.Printf("%d %d %v\n", fb.Foo, fb.Bar, e)
+}
+
+type Foo int
+type Bar int
+
+type FooBar struct {
+	Foo Foo
+	Bar Bar
+}
+
+type Empty struct{}
+
+func provideFoo() Foo {
+	return 41
+}
+
+func provideBar() Bar {
+	return 1
+}
+
+var Set = wire.NewSet(
+	wire.Struct(new(FooBar), "*"),
+	provideFoo,
+	provideBar)
diff --git a/pkg/build/wire/internal/wire/testdata/StructPointer/foo/wire.go b/pkg/build/wire/internal/wire/testdata/StructPointer/foo/wire.go
new file mode 100644
index 0000000000000..c08f942eb8b38
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/StructPointer/foo/wire.go
@@ -0,0 +1,31 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectFooBar() *FooBar {
+	wire.Build(Set)
+	return nil
+}
+
+func injectEmptyStruct() *Empty {
+	wire.Build(wire.Struct(new(Empty)))
+	return nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/StructPointer/pkg b/pkg/build/wire/internal/wire/testdata/StructPointer/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/StructPointer/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/StructPointer/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/StructPointer/want/program_out.txt
new file mode 100644
index 0000000000000..a0875ea91f57d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/StructPointer/want/program_out.txt
@@ -0,0 +1 @@
+41 1 &{}
diff --git a/pkg/build/wire/internal/wire/testdata/StructPointer/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/StructPointer/want/wire_gen.go
new file mode 100644
index 0000000000000..e96e8cdd60649
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/StructPointer/want/wire_gen.go
@@ -0,0 +1,24 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func injectFooBar() *FooBar {
+	foo := provideFoo()
+	bar := provideBar()
+	fooBar := &FooBar{
+		Foo: foo,
+		Bar: bar,
+	}
+	return fooBar
+}
+
+func injectEmptyStruct() *Empty {
+	empty := &Empty{}
+	return empty
+}
diff --git a/pkg/build/wire/internal/wire/testdata/StructWithPreventTag/foo/foo.go b/pkg/build/wire/internal/wire/testdata/StructWithPreventTag/foo/foo.go
new file mode 100644
index 0000000000000..fddb0fe21c3c8
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/StructWithPreventTag/foo/foo.go
@@ -0,0 +1,48 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"sync"
+
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func main() {
+	pfb := injectPartFooBar()
+	fmt.Println(pfb.Foo)
+}
+
+type Foo int
+
+type FooBar struct {
+	mu  sync.Mutex `wire:"-"`
+	Foo Foo
+}
+
+func provideFoo() Foo {
+	return 42
+}
+
+func provideMutex() sync.Mutex {
+	return sync.Mutex{}
+}
+
+var ProhibitSet = wire.NewSet(
+	wire.Struct(new(FooBar), "mu", "Foo"),
+	provideMutex,
+	provideFoo,
+)
diff --git a/pkg/build/wire/internal/wire/testdata/StructWithPreventTag/foo/wire.go b/pkg/build/wire/internal/wire/testdata/StructWithPreventTag/foo/wire.go
new file mode 100644
index 0000000000000..5e0d580085990
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/StructWithPreventTag/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectPartFooBar() FooBar {
+	wire.Build(ProhibitSet)
+	return FooBar{}
+}
diff --git a/pkg/build/wire/internal/wire/testdata/StructWithPreventTag/pkg b/pkg/build/wire/internal/wire/testdata/StructWithPreventTag/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/StructWithPreventTag/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/StructWithPreventTag/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/StructWithPreventTag/want/wire_errs.txt
new file mode 100644
index 0000000000000..2482bc580cf13
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/StructWithPreventTag/want/wire_errs.txt
@@ -0,0 +1 @@
+example.com/foo/foo.go:x:y: "mu" is prevented from injecting by wire
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/TwoDeps/foo/foo.go b/pkg/build/wire/internal/wire/testdata/TwoDeps/foo/foo.go
new file mode 100644
index 0000000000000..1ff42ba583835
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/TwoDeps/foo/foo.go
@@ -0,0 +1,46 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func main() {
+	fmt.Println(injectFooBar())
+}
+
+type Foo int
+type Bar int
+type FooBar int
+
+func provideFoo() Foo {
+	return 40
+}
+
+func provideBar() Bar {
+	return 2
+}
+
+func provideFooBar(foo Foo, bar Bar) FooBar {
+	return FooBar(foo) + FooBar(bar)
+}
+
+var Set = wire.NewSet(
+	provideFoo,
+	provideBar,
+	provideFooBar)
diff --git a/pkg/build/wire/internal/wire/testdata/TwoDeps/foo/wire.go b/pkg/build/wire/internal/wire/testdata/TwoDeps/foo/wire.go
new file mode 100644
index 0000000000000..4106dd8d91f82
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/TwoDeps/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectFooBar() FooBar {
+	wire.Build(Set)
+	return 0
+}
diff --git a/pkg/build/wire/internal/wire/testdata/TwoDeps/pkg b/pkg/build/wire/internal/wire/testdata/TwoDeps/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/TwoDeps/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/TwoDeps/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/TwoDeps/want/program_out.txt
new file mode 100644
index 0000000000000..d81cc0710eb6c
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/TwoDeps/want/program_out.txt
@@ -0,0 +1 @@
+42
diff --git a/pkg/build/wire/internal/wire/testdata/TwoDeps/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/TwoDeps/want/wire_gen.go
new file mode 100644
index 0000000000000..bfc52d7f24472
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/TwoDeps/want/wire_gen.go
@@ -0,0 +1,16 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func injectFooBar() FooBar {
+	foo := provideFoo()
+	bar := provideBar()
+	fooBar := provideFooBar(foo, bar)
+	return fooBar
+}
diff --git a/pkg/build/wire/internal/wire/testdata/UnexportedStruct/bar/bar.go b/pkg/build/wire/internal/wire/testdata/UnexportedStruct/bar/bar.go
new file mode 100644
index 0000000000000..7215742684081
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/UnexportedStruct/bar/bar.go
@@ -0,0 +1,19 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package bar
+
+var foo struct {
+	X int
+}
diff --git a/pkg/build/wire/internal/wire/testdata/UnexportedStruct/foo/foo.go b/pkg/build/wire/internal/wire/testdata/UnexportedStruct/foo/foo.go
new file mode 100644
index 0000000000000..d177addf8c5df
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/UnexportedStruct/foo/foo.go
@@ -0,0 +1,21 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Printf("%v\n", injectedBar())
+}
diff --git a/pkg/build/wire/internal/wire/testdata/UnexportedStruct/foo/wire.go b/pkg/build/wire/internal/wire/testdata/UnexportedStruct/foo/wire.go
new file mode 100644
index 0000000000000..e0b4618c31630
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/UnexportedStruct/foo/wire.go
@@ -0,0 +1,28 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"example.com/bar"
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectedBar() string {
+	// Fails because bar.foo is unexported.
+	wire.Build(bar.foo.X)
+	return ""
+}
diff --git a/pkg/build/wire/internal/wire/testdata/UnexportedStruct/pkg b/pkg/build/wire/internal/wire/testdata/UnexportedStruct/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/UnexportedStruct/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/UnexportedStruct/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/UnexportedStruct/want/wire_errs.txt
new file mode 100644
index 0000000000000..ae23f88c39175
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/UnexportedStruct/want/wire_errs.txt
@@ -0,0 +1 @@
+example.com/foo/wire.go:x:y: foo not exported by package bar
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/UnexportedValue/bar/bar.go b/pkg/build/wire/internal/wire/testdata/UnexportedValue/bar/bar.go
new file mode 100644
index 0000000000000..71d43c92215e3
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/UnexportedValue/bar/bar.go
@@ -0,0 +1,21 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package bar
+
+import "github.com/grafana/grafana/pkg/build/wire"
+
+var Value = wire.Value(privateMsg)
+
+var privateMsg = "Hello, World!"
diff --git a/pkg/build/wire/internal/wire/testdata/UnexportedValue/foo/foo.go b/pkg/build/wire/internal/wire/testdata/UnexportedValue/foo/foo.go
new file mode 100644
index 0000000000000..c2f2610654734
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/UnexportedValue/foo/foo.go
@@ -0,0 +1,21 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Println(injectedMessage())
+}
diff --git a/pkg/build/wire/internal/wire/testdata/UnexportedValue/foo/wire.go b/pkg/build/wire/internal/wire/testdata/UnexportedValue/foo/wire.go
new file mode 100644
index 0000000000000..a26cbf97b2540
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/UnexportedValue/foo/wire.go
@@ -0,0 +1,28 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"example.com/bar"
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectedMessage() string {
+	// Fails because bar.Value references unexported bar.privateMsg.
+	wire.Build(bar.Value)
+	return ""
+}
diff --git a/pkg/build/wire/internal/wire/testdata/UnexportedValue/pkg b/pkg/build/wire/internal/wire/testdata/UnexportedValue/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/UnexportedValue/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/UnexportedValue/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/UnexportedValue/want/wire_errs.txt
new file mode 100644
index 0000000000000..07b5c3421681e
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/UnexportedValue/want/wire_errs.txt
@@ -0,0 +1 @@
+example.com/foo/wire.go:x:y: inject injectedMessage: value string can't be used: uses unexported identifier privateMsg
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/UnusedProviders/foo/foo.go b/pkg/build/wire/internal/wire/testdata/UnusedProviders/foo/foo.go
new file mode 100644
index 0000000000000..fc22552d75dfd
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/UnusedProviders/foo/foo.go
@@ -0,0 +1,83 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func main() {
+	fmt.Println(injectFooBar())
+}
+
+type Foo int
+type Bar int
+type Unused int
+type UnusedInSet int
+type OneOfTwo int
+type TwoOfTwo int
+
+type FooBar struct {
+	MyFoo    *Foo
+	MyBar    Bar
+	MyUnused Unused
+}
+
+var (
+	unusedSet        = wire.NewSet(provideUnusedInSet)
+	partiallyUsedSet = wire.NewSet(provideOneOfTwo, provideTwoOfTwo)
+)
+
+type Fooer interface {
+	Foo() string
+}
+
+func (f *Foo) Foo() string {
+	return fmt.Sprintf("Hello World %d", f)
+}
+
+func provideFoo() *Foo {
+	f := new(Foo)
+	*f = 1
+	return f
+}
+
+func provideBar(foo *Foo, one OneOfTwo) Bar {
+	return Bar(int(*foo) + int(one))
+}
+
+func provideUnused() Unused {
+	return 1
+}
+
+func provideUnusedInSet() UnusedInSet {
+	return 1
+}
+
+func provideOneOfTwo() OneOfTwo {
+	return 1
+}
+
+func provideTwoOfTwo() TwoOfTwo {
+	return 1
+}
+
+type S struct {
+	Cfg Config
+}
+
+type Config int
diff --git a/pkg/build/wire/internal/wire/testdata/UnusedProviders/foo/wire.go b/pkg/build/wire/internal/wire/testdata/UnusedProviders/foo/wire.go
new file mode 100644
index 0000000000000..681b80d10ff3b
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/UnusedProviders/foo/wire.go
@@ -0,0 +1,36 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectFooBar() FooBar {
+	wire.Build(
+		provideFoo,                       // needed as input for provideBar
+		provideBar,                       // needed for FooBar
+		partiallyUsedSet,                 // 1/2 providers in the set are needed
+		provideUnused,                    // not needed -> error
+		wire.Value("unused"),             // not needed -> error
+		unusedSet,                        // nothing in set is needed -> error
+		wire.Bind(new(Fooer), new(*Foo)), // binding to Fooer is not needed -> error
+		wire.FieldsOf(new(S), "Cfg"),     // S.Cfg not needed -> error
+		wire.Struct(new(FooBar), "MyFoo", "MyBar"), // needed for FooBar
+	)
+	return FooBar{}
+}
diff --git a/pkg/build/wire/internal/wire/testdata/UnusedProviders/pkg b/pkg/build/wire/internal/wire/testdata/UnusedProviders/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/UnusedProviders/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/UnusedProviders/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/UnusedProviders/want/wire_errs.txt
new file mode 100644
index 0000000000000..54dd582a2df32
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/UnusedProviders/want/wire_errs.txt
@@ -0,0 +1,9 @@
+example.com/foo/wire.go:x:y: inject injectFooBar: unused provider set "unusedSet"
+
+example.com/foo/wire.go:x:y: inject injectFooBar: unused provider "main.provideUnused"
+
+example.com/foo/wire.go:x:y: inject injectFooBar: unused value of type string
+
+example.com/foo/wire.go:x:y: inject injectFooBar: unused interface binding to type example.com/foo.Fooer
+
+example.com/foo/wire.go:x:y: inject injectFooBar: unused field "example.com/foo.S".Cfg
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/ValueChain/foo/foo.go b/pkg/build/wire/internal/wire/testdata/ValueChain/foo/foo.go
new file mode 100644
index 0000000000000..bff5e895f4857
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ValueChain/foo/foo.go
@@ -0,0 +1,36 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func main() {
+	fmt.Println(injectFooBar())
+}
+
+type Foo int
+type FooBar int
+
+var Set = wire.NewSet(
+	wire.Value(Foo(41)),
+	provideFooBar)
+
+func provideFooBar(foo Foo) FooBar {
+	return FooBar(foo) + 1
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ValueChain/foo/wire.go b/pkg/build/wire/internal/wire/testdata/ValueChain/foo/wire.go
new file mode 100644
index 0000000000000..4106dd8d91f82
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ValueChain/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectFooBar() FooBar {
+	wire.Build(Set)
+	return 0
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ValueChain/pkg b/pkg/build/wire/internal/wire/testdata/ValueChain/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ValueChain/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/ValueChain/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/ValueChain/want/program_out.txt
new file mode 100644
index 0000000000000..d81cc0710eb6c
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ValueChain/want/program_out.txt
@@ -0,0 +1 @@
+42
diff --git a/pkg/build/wire/internal/wire/testdata/ValueChain/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/ValueChain/want/wire_gen.go
new file mode 100644
index 0000000000000..da2cccb3f0698
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ValueChain/want/wire_gen.go
@@ -0,0 +1,19 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func injectFooBar() FooBar {
+	foo := _wireFooValue
+	fooBar := provideFooBar(foo)
+	return fooBar
+}
+
+var (
+	_wireFooValue = Foo(41)
+)
diff --git a/pkg/build/wire/internal/wire/testdata/ValueConversion/foo/foo.go b/pkg/build/wire/internal/wire/testdata/ValueConversion/foo/foo.go
new file mode 100644
index 0000000000000..2c6c88b12b496
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ValueConversion/foo/foo.go
@@ -0,0 +1,23 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Println(injectedMessage())
+}
+
+type Foo string
diff --git a/pkg/build/wire/internal/wire/testdata/ValueConversion/foo/wire.go b/pkg/build/wire/internal/wire/testdata/ValueConversion/foo/wire.go
new file mode 100644
index 0000000000000..a389be1b6304b
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ValueConversion/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectedMessage() Foo {
+	wire.Build(wire.Value(Foo("Hello, World!")))
+	return ""
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ValueConversion/pkg b/pkg/build/wire/internal/wire/testdata/ValueConversion/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ValueConversion/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/ValueConversion/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/ValueConversion/want/program_out.txt
new file mode 100644
index 0000000000000..8ab686eafeb1f
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ValueConversion/want/program_out.txt
@@ -0,0 +1 @@
+Hello, World!
diff --git a/pkg/build/wire/internal/wire/testdata/ValueConversion/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/ValueConversion/want/wire_gen.go
new file mode 100644
index 0000000000000..b663861d9203b
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ValueConversion/want/wire_gen.go
@@ -0,0 +1,18 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func injectedMessage() Foo {
+	foo := _wireFooValue
+	return foo
+}
+
+var (
+	_wireFooValue = Foo("Hello, World!")
+)
diff --git a/pkg/build/wire/internal/wire/testdata/ValueFromFunctionScope/foo/foo.go b/pkg/build/wire/internal/wire/testdata/ValueFromFunctionScope/foo/foo.go
new file mode 100644
index 0000000000000..11267e7782acc
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ValueFromFunctionScope/foo/foo.go
@@ -0,0 +1,37 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+)
+
+type foo struct {
+	V int
+}
+
+type bar struct {
+	V int
+}
+
+func newBar(v int) *bar {
+	return &bar{V: v}
+}
+
+func main() {
+	f := &foo{V: 42}
+	b := injectBar(f)
+	fmt.Printf("%d\n", b.V)
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ValueFromFunctionScope/foo/wire.go b/pkg/build/wire/internal/wire/testdata/ValueFromFunctionScope/foo/wire.go
new file mode 100644
index 0000000000000..e2ca3f2f3e49f
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ValueFromFunctionScope/foo/wire.go
@@ -0,0 +1,29 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectBar(f *foo) *bar {
+	wire.Build(
+		newBar,
+		wire.Value(f.V), // fails because f.V is not from package scope
+	)
+	return nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ValueFromFunctionScope/pkg b/pkg/build/wire/internal/wire/testdata/ValueFromFunctionScope/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ValueFromFunctionScope/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/ValueFromFunctionScope/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/ValueFromFunctionScope/want/wire_errs.txt
new file mode 100644
index 0000000000000..ed7a45dcfa965
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ValueFromFunctionScope/want/wire_errs.txt
@@ -0,0 +1 @@
+example.com/foo/wire.go:x:y: inject injectBar: value int can't be used: f is not declared in package scope
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/ValueIsInterfaceValue/foo/foo.go b/pkg/build/wire/internal/wire/testdata/ValueIsInterfaceValue/foo/foo.go
new file mode 100644
index 0000000000000..4a412a48214d7
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ValueIsInterfaceValue/foo/foo.go
@@ -0,0 +1,27 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	"strings"
+)
+
+func main() {
+	r := injectedReader(strings.NewReader("hello world"))
+	buf, _ := ioutil.ReadAll(r)
+	fmt.Println(string(buf))
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ValueIsInterfaceValue/foo/wire.go b/pkg/build/wire/internal/wire/testdata/ValueIsInterfaceValue/foo/wire.go
new file mode 100644
index 0000000000000..eb548fa1f005d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ValueIsInterfaceValue/foo/wire.go
@@ -0,0 +1,29 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"io"
+	"strings"
+
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectedReader(r *strings.Reader) io.Reader {
+	wire.Build(wire.Value(io.Reader(r)))
+	return nil
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ValueIsInterfaceValue/pkg b/pkg/build/wire/internal/wire/testdata/ValueIsInterfaceValue/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ValueIsInterfaceValue/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/ValueIsInterfaceValue/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/ValueIsInterfaceValue/want/wire_errs.txt
new file mode 100644
index 0000000000000..19af8703fac41
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ValueIsInterfaceValue/want/wire_errs.txt
@@ -0,0 +1 @@
+example.com/foo/wire.go:x:y: argument to Value may not be an interface value (found io.Reader); use InterfaceValue instead
\ No newline at end of file
diff --git a/pkg/build/wire/internal/wire/testdata/ValueIsStruct/foo/foo.go b/pkg/build/wire/internal/wire/testdata/ValueIsStruct/foo/foo.go
new file mode 100644
index 0000000000000..d9aaa15598304
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ValueIsStruct/foo/foo.go
@@ -0,0 +1,28 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	f := injectFoo()
+	fmt.Printf("%d\n", f.X)
+}
+
+type Foo struct {
+	X int
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ValueIsStruct/foo/wire.go b/pkg/build/wire/internal/wire/testdata/ValueIsStruct/foo/wire.go
new file mode 100644
index 0000000000000..51633dd0626bc
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ValueIsStruct/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectFoo() Foo {
+	wire.Build(wire.Value(Foo{X: 42}))
+	return Foo{}
+}
diff --git a/pkg/build/wire/internal/wire/testdata/ValueIsStruct/pkg b/pkg/build/wire/internal/wire/testdata/ValueIsStruct/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ValueIsStruct/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/ValueIsStruct/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/ValueIsStruct/want/program_out.txt
new file mode 100644
index 0000000000000..d81cc0710eb6c
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ValueIsStruct/want/program_out.txt
@@ -0,0 +1 @@
+42
diff --git a/pkg/build/wire/internal/wire/testdata/ValueIsStruct/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/ValueIsStruct/want/wire_gen.go
new file mode 100644
index 0000000000000..f41ed12200fa7
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/ValueIsStruct/want/wire_gen.go
@@ -0,0 +1,18 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func injectFoo() Foo {
+	foo := _wireFooValue
+	return foo
+}
+
+var (
+	_wireFooValue = Foo{X: 42}
+)
diff --git a/pkg/build/wire/internal/wire/testdata/VarValue/foo/foo.go b/pkg/build/wire/internal/wire/testdata/VarValue/foo/foo.go
new file mode 100644
index 0000000000000..c8db0afddebce
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/VarValue/foo/foo.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import "fmt"
+
+func main() {
+	// Mutating value; value should have been stored at package initialization.
+	msg = "Hello, World!"
+
+	fmt.Println(injectedMessage())
+}
+
+var msg string = "Package init"
diff --git a/pkg/build/wire/internal/wire/testdata/VarValue/foo/wire.go b/pkg/build/wire/internal/wire/testdata/VarValue/foo/wire.go
new file mode 100644
index 0000000000000..e8a718a2e2601
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/VarValue/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectedMessage() string {
+	wire.Build(wire.Value(msg))
+	return ""
+}
diff --git a/pkg/build/wire/internal/wire/testdata/VarValue/pkg b/pkg/build/wire/internal/wire/testdata/VarValue/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/VarValue/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/VarValue/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/VarValue/want/program_out.txt
new file mode 100644
index 0000000000000..f4a93ef0c581d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/VarValue/want/program_out.txt
@@ -0,0 +1 @@
+Package init
diff --git a/pkg/build/wire/internal/wire/testdata/VarValue/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/VarValue/want/wire_gen.go
new file mode 100644
index 0000000000000..07e4f01993b21
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/VarValue/want/wire_gen.go
@@ -0,0 +1,18 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func injectedMessage() string {
+	string2 := _wireStringValue
+	return string2
+}
+
+var (
+	_wireStringValue = msg
+)
diff --git a/pkg/build/wire/internal/wire/testdata/Varargs/foo/foo.go b/pkg/build/wire/internal/wire/testdata/Varargs/foo/foo.go
new file mode 100644
index 0000000000000..d5a541402ee40
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Varargs/foo/foo.go
@@ -0,0 +1,31 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"strings"
+)
+
+func main() {
+	fmt.Println(injectedMessage("", "Hello,", "World!"))
+}
+
+type title string
+
+// provideMessage provides a friendly user greeting.
+func provideMessage(words ...string) string {
+	return strings.Join(words, " ")
+}
diff --git a/pkg/build/wire/internal/wire/testdata/Varargs/foo/wire.go b/pkg/build/wire/internal/wire/testdata/Varargs/foo/wire.go
new file mode 100644
index 0000000000000..33d7acc5f45a3
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Varargs/foo/wire.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build wireinject
+
+package main
+
+import (
+	"github.com/grafana/grafana/pkg/build/wire"
+)
+
+func injectedMessage(t title, lines ...string) string {
+	wire.Build(provideMessage)
+	return ""
+}
diff --git a/pkg/build/wire/internal/wire/testdata/Varargs/pkg b/pkg/build/wire/internal/wire/testdata/Varargs/pkg
new file mode 100644
index 0000000000000..f7a5c8cee310d
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Varargs/pkg
@@ -0,0 +1 @@
+example.com/foo
diff --git a/pkg/build/wire/internal/wire/testdata/Varargs/want/program_out.txt b/pkg/build/wire/internal/wire/testdata/Varargs/want/program_out.txt
new file mode 100644
index 0000000000000..8ab686eafeb1f
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Varargs/want/program_out.txt
@@ -0,0 +1 @@
+Hello, World!
diff --git a/pkg/build/wire/internal/wire/testdata/Varargs/want/wire_gen.go b/pkg/build/wire/internal/wire/testdata/Varargs/want/wire_gen.go
new file mode 100644
index 0000000000000..703a549132bc4
--- /dev/null
+++ b/pkg/build/wire/internal/wire/testdata/Varargs/want/wire_gen.go
@@ -0,0 +1,14 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package main
+
+// Injectors from wire.go:
+
+func injectedMessage(t title, lines ...string) string {
+	string2 := provideMessage(lines...)
+	return string2
+}
diff --git a/pkg/build/wire/internal/wire/wire.go b/pkg/build/wire/internal/wire/wire.go
new file mode 100644
index 0000000000000..5cedeb1ab3b14
--- /dev/null
+++ b/pkg/build/wire/internal/wire/wire.go
@@ -0,0 +1,960 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package wire provides compile-time dependency injection logic as a
+// Go library.
+package wire
+
+import (
+	"bytes"
+	"context"
+	"errors"
+	"fmt"
+	"go/ast"
+	"go/format"
+	"go/printer"
+	"go/token"
+	"go/types"
+	"io/ioutil"
+	"path/filepath"
+	"sort"
+	"strconv"
+	"strings"
+	"unicode"
+	"unicode/utf8"
+
+	"golang.org/x/tools/go/ast/astutil"
+	"golang.org/x/tools/go/packages"
+)
+
+// GenerateResult stores the result for a package from a call to Generate.
+type GenerateResult struct {
+	// PkgPath is the package's PkgPath.
+	PkgPath string
+	// OutputPath is the path where the generated output should be written.
+	// May be empty if there were errors.
+	OutputPath string
+	// Content is the gofmt'd source code that was generated. May be nil if
+	// there were errors during generation.
+	Content []byte
+	// Errs is a slice of errors identified during generation.
+	Errs []error
+}
+
+// Commit writes the generated file to disk.
+func (gen GenerateResult) Commit() error {
+	if len(gen.Content) == 0 {
+		return nil
+	}
+	return ioutil.WriteFile(gen.OutputPath, gen.Content, 0666)
+}
+
+// GenerateOptions holds options for Generate.
+type GenerateOptions struct {
+	// Header will be inserted at the start of each generated file.
+	Header           []byte
+	PrefixOutputFile string
+	Tags             string
+}
+
+// Generate performs dependency injection for the packages that match the given
+// patterns, return a GenerateResult for each package. The package pattern is
+// defined by the underlying build system. For the go tool, this is described at
+// https://golang.org/cmd/go/#hdr-Package_lists_and_patterns
+//
+// wd is the working directory and env is the set of environment
+// variables to use when loading the package specified by pkgPattern. If
+// env is nil or empty, it is interpreted as an empty set of variables.
+// In case of duplicate environment variables, the last one in the list
+// takes precedence.
+//
+// Generate may return one or more errors if it failed to load the packages.
+func Generate(ctx context.Context, wd string, env []string, patterns []string, opts *GenerateOptions) ([]GenerateResult, []error) {
+	if opts == nil {
+		opts = &GenerateOptions{}
+	}
+	pkgs, errs := load(ctx, wd, env, opts.Tags, patterns)
+	if len(errs) > 0 {
+		return nil, errs
+	}
+	generated := make([]GenerateResult, len(pkgs))
+	for i, pkg := range pkgs {
+		generated[i].PkgPath = pkg.PkgPath
+		outDir, err := detectOutputDir(pkg.GoFiles)
+		if err != nil {
+			generated[i].Errs = append(generated[i].Errs, err)
+			continue
+		}
+		generated[i].OutputPath = filepath.Join(outDir, opts.PrefixOutputFile+"wire_gen.go")
+		g := newGen(pkg)
+		injectorFiles, errs := generateInjectors(g, pkg)
+		if len(errs) > 0 {
+			generated[i].Errs = errs
+			continue
+		}
+		copyNonInjectorDecls(g, injectorFiles, pkg.TypesInfo)
+		goSrc := g.frame(opts.Tags)
+		if len(opts.Header) > 0 {
+			goSrc = append(opts.Header, goSrc...)
+		}
+		fmtSrc, err := format.Source(goSrc)
+		if err != nil {
+			// This is likely a bug from a poorly generated source file.
+			// Add an error but also the unformatted source.
+			generated[i].Errs = append(generated[i].Errs, err)
+		} else {
+			goSrc = fmtSrc
+		}
+		generated[i].Content = goSrc
+	}
+	return generated, nil
+}
+
+func detectOutputDir(paths []string) (string, error) {
+	if len(paths) == 0 {
+		return "", errors.New("no files to derive output directory from")
+	}
+	dir := filepath.Dir(paths[0])
+	for _, p := range paths[1:] {
+		if dir2 := filepath.Dir(p); dir2 != dir {
+			return "", fmt.Errorf("found conflicting directories %q and %q", dir, dir2)
+		}
+	}
+	return dir, nil
+}
+
+// generateInjectors generates the injectors for a given package.
+func generateInjectors(g *gen, pkg *packages.Package) (injectorFiles []*ast.File, _ []error) {
+	oc := newObjectCache([]*packages.Package{pkg})
+	injectorFiles = make([]*ast.File, 0, len(pkg.Syntax))
+	ec := new(errorCollector)
+	for _, f := range pkg.Syntax {
+		for _, decl := range f.Decls {
+			fn, ok := decl.(*ast.FuncDecl)
+			if !ok {
+				continue
+			}
+			buildCall, err := findInjectorBuild(pkg.TypesInfo, fn)
+			if err != nil {
+				ec.add(err)
+				continue
+			}
+			if buildCall == nil {
+				continue
+			}
+			if len(injectorFiles) == 0 || injectorFiles[len(injectorFiles)-1] != f {
+				// This is the first injector generated for this file.
+				// Write a file header.
+				name := filepath.Base(g.pkg.Fset.File(f.Pos()).Name())
+				g.p("// Injectors from %s:\n\n", name)
+				injectorFiles = append(injectorFiles, f)
+			}
+			sig := pkg.TypesInfo.ObjectOf(fn.Name).Type().(*types.Signature)
+			ins, _, err := injectorFuncSignature(sig)
+			if err != nil {
+				if w, ok := err.(*wireErr); ok {
+					ec.add(notePosition(w.position, fmt.Errorf("inject %s: %v", fn.Name.Name, w.error)))
+				} else {
+					ec.add(notePosition(g.pkg.Fset.Position(fn.Pos()), fmt.Errorf("inject %s: %v", fn.Name.Name, err)))
+				}
+				continue
+			}
+			injectorArgs := &InjectorArgs{
+				Name:  fn.Name.Name,
+				Tuple: ins,
+				Pos:   fn.Pos(),
+			}
+			set, errs := oc.processNewSet(pkg.TypesInfo, pkg.PkgPath, buildCall, injectorArgs, "")
+			if len(errs) > 0 {
+				ec.add(notePositionAll(g.pkg.Fset.Position(fn.Pos()), errs)...)
+				continue
+			}
+			if errs := g.inject(fn.Pos(), fn.Name.Name, sig, set, fn.Doc); len(errs) > 0 {
+				ec.add(errs...)
+				continue
+			}
+		}
+
+		for _, impt := range f.Imports {
+			if impt.Name != nil && impt.Name.Name == "_" {
+				g.anonImports[impt.Path.Value] = true
+			}
+		}
+	}
+	if len(ec.errors) > 0 {
+		return nil, ec.errors
+	}
+	return injectorFiles, nil
+}
+
+// copyNonInjectorDecls copies any non-injector declarations from the
+// given files into the generated output.
+func copyNonInjectorDecls(g *gen, files []*ast.File, info *types.Info) {
+	for _, f := range files {
+		name := filepath.Base(g.pkg.Fset.File(f.Pos()).Name())
+		first := true
+		for _, decl := range f.Decls {
+			switch decl := decl.(type) {
+			case *ast.FuncDecl:
+				// OK to ignore error, as any error cases should already have
+				// been filtered out.
+				if buildCall, _ := findInjectorBuild(info, decl); buildCall != nil {
+					continue
+				}
+			case *ast.GenDecl:
+				if decl.Tok == token.IMPORT {
+					continue
+				}
+			default:
+				continue
+			}
+			if first {
+				g.p("// %s:\n\n", name)
+				first = false
+			}
+			// TODO(light): Add line number at top of each declaration.
+			g.writeAST(info, decl)
+			g.p("\n\n")
+		}
+	}
+}
+
+// importInfo holds info about an import.
+type importInfo struct {
+	// name is the identifier that is used in the generated source.
+	name string
+	// differs is true if the import is given an identifier that does not
+	// match the package's identifier.
+	differs bool
+}
+
+// gen is the file-wide generator state.
+type gen struct {
+	pkg         *packages.Package
+	buf         bytes.Buffer
+	imports     map[string]importInfo
+	anonImports map[string]bool
+	values      map[ast.Expr]string
+}
+
+func newGen(pkg *packages.Package) *gen {
+	return &gen{
+		pkg:         pkg,
+		anonImports: make(map[string]bool),
+		imports:     make(map[string]importInfo),
+		values:      make(map[ast.Expr]string),
+	}
+}
+
+// frame bakes the built up source body into an unformatted Go source file.
+func (g *gen) frame(tags string) []byte {
+	if g.buf.Len() == 0 {
+		return nil
+	}
+	var buf bytes.Buffer
+	if len(tags) > 0 {
+		tags = fmt.Sprintf(" gen -tags \"%s\"", tags)
+	}
+	buf.WriteString("// Code generated by Wire. DO NOT EDIT.\n\n")
+	buf.WriteString("//go:generate go run -mod=mod github.com/google/wire/cmd/wire" + tags + "\n")
+	buf.WriteString("//+build !wireinject\n\n")
+	buf.WriteString("package ")
+	buf.WriteString(g.pkg.Name)
+	buf.WriteString("\n\n")
+	if len(g.imports) > 0 {
+		buf.WriteString("import (\n")
+		imps := make([]string, 0, len(g.imports))
+		for path := range g.imports {
+			imps = append(imps, path)
+		}
+		sort.Strings(imps)
+		for _, path := range imps {
+			// Omit the local package identifier if it matches the package name.
+			info := g.imports[path]
+			if info.differs {
+				fmt.Fprintf(&buf, "\t%s %q\n", info.name, path)
+			} else {
+				fmt.Fprintf(&buf, "\t%q\n", path)
+			}
+		}
+		buf.WriteString(")\n\n")
+	}
+	if len(g.anonImports) > 0 {
+		buf.WriteString("import (\n")
+		anonImps := make([]string, 0, len(g.anonImports))
+		for path := range g.anonImports {
+			anonImps = append(anonImps, path)
+		}
+		sort.Strings(anonImps)
+
+		for _, path := range anonImps {
+			fmt.Fprintf(&buf, "\t_ %s\n", path)
+		}
+		buf.WriteString(")\n\n")
+	}
+	buf.Write(g.buf.Bytes())
+	return buf.Bytes()
+}
+
+// inject emits the code for an injector.
+func (g *gen) inject(pos token.Pos, name string, sig *types.Signature, set *ProviderSet, doc *ast.CommentGroup) []error {
+	injectSig, err := funcOutput(sig)
+	if err != nil {
+		return []error{notePosition(g.pkg.Fset.Position(pos),
+			fmt.Errorf("inject %s: %v", name, err))}
+	}
+	params := sig.Params()
+	calls, errs := solve(g.pkg.Fset, injectSig.out, params, set)
+	if len(errs) > 0 {
+		return mapErrors(errs, func(e error) error {
+			if w, ok := e.(*wireErr); ok {
+				return notePosition(w.position, fmt.Errorf("inject %s: %v", name, w.error))
+			}
+			return notePosition(g.pkg.Fset.Position(pos), fmt.Errorf("inject %s: %v", name, e))
+		})
+	}
+	type pendingVar struct {
+		name     string
+		expr     ast.Expr
+		typeInfo *types.Info
+	}
+	var pendingVars []pendingVar
+	ec := new(errorCollector)
+	for i := range calls {
+		c := &calls[i]
+		if c.hasCleanup && !injectSig.cleanup {
+			ts := types.TypeString(c.out, nil)
+			ec.add(notePosition(
+				g.pkg.Fset.Position(pos),
+				fmt.Errorf("inject %s: provider for %s returns cleanup but injection does not return cleanup function", name, ts)))
+		}
+		if c.hasErr && !injectSig.err {
+			ts := types.TypeString(c.out, nil)
+			ec.add(notePosition(
+				g.pkg.Fset.Position(pos),
+				fmt.Errorf("inject %s: provider for %s returns error but injection not allowed to fail", name, ts)))
+		}
+		if c.kind == valueExpr {
+			if err := accessibleFrom(c.valueTypeInfo, c.valueExpr, g.pkg.PkgPath); err != nil {
+				// TODO(light): Display line number of value expression.
+				ts := types.TypeString(c.out, nil)
+				ec.add(notePosition(
+					g.pkg.Fset.Position(pos),
+					fmt.Errorf("inject %s: value %s can't be used: %v", name, ts, err)))
+			}
+			if g.values[c.valueExpr] == "" {
+				t := c.valueTypeInfo.TypeOf(c.valueExpr)
+
+				name := typeVariableName(t, "", func(name string) string { return "_wire" + export(name) + "Value" }, g.nameInFileScope)
+				g.values[c.valueExpr] = name
+				pendingVars = append(pendingVars, pendingVar{
+					name:     name,
+					expr:     c.valueExpr,
+					typeInfo: c.valueTypeInfo,
+				})
+			}
+		}
+	}
+	if len(ec.errors) > 0 {
+		return ec.errors
+	}
+
+	// Perform one pass to collect all imports, followed by the real pass.
+	injectPass(name, sig, calls, set, doc, &injectorGen{
+		g:       g,
+		errVar:  disambiguate("err", g.nameInFileScope),
+		discard: true,
+	})
+	injectPass(name, sig, calls, set, doc, &injectorGen{
+		g:       g,
+		errVar:  disambiguate("err", g.nameInFileScope),
+		discard: false,
+	})
+	if len(pendingVars) > 0 {
+		g.p("var (\n")
+		for _, pv := range pendingVars {
+			g.p("\t%s = ", pv.name)
+			g.writeAST(pv.typeInfo, pv.expr)
+			g.p("\n")
+		}
+		g.p(")\n\n")
+	}
+	return nil
+}
+
+// rewritePkgRefs rewrites any package references in an AST into references for the
+// generated package.
+func (g *gen) rewritePkgRefs(info *types.Info, node ast.Node) ast.Node {
+	start, end := node.Pos(), node.End()
+	node = copyAST(node)
+	// First, rewrite all package names. This lets us know all the
+	// potentially colliding identifiers.
+	node = astutil.Apply(node, func(c *astutil.Cursor) bool {
+		switch node := c.Node().(type) {
+		case *ast.Ident:
+			// This is an unqualified identifier (qualified identifiers are peeled off below).
+			obj := info.ObjectOf(node)
+			if obj == nil {
+				return false
+			}
+			if pkg := obj.Pkg(); pkg != nil && obj.Parent() == pkg.Scope() && pkg.Path() != g.pkg.PkgPath {
+				// An identifier from either a dot import or read from a different package.
+				newPkgID := g.qualifyImport(pkg.Name(), pkg.Path())
+				c.Replace(&ast.SelectorExpr{
+					X:   ast.NewIdent(newPkgID),
+					Sel: ast.NewIdent(node.Name),
+				})
+				return false
+			}
+			return true
+		case *ast.SelectorExpr:
+			pkgIdent, ok := node.X.(*ast.Ident)
+			if !ok {
+				return true
+			}
+			pkgName, ok := info.ObjectOf(pkgIdent).(*types.PkgName)
+			if !ok {
+				return true
+			}
+			// This is a qualified identifier. Rewrite and avoid visiting subexpressions.
+			imported := pkgName.Imported()
+			newPkgID := g.qualifyImport(imported.Name(), imported.Path())
+			c.Replace(&ast.SelectorExpr{
+				X:   ast.NewIdent(newPkgID),
+				Sel: ast.NewIdent(node.Sel.Name),
+			})
+			return false
+		default:
+			return true
+		}
+	}, nil)
+	// Now that we have all the identifiers, rename any variables declared
+	// in this scope to not collide.
+	newNames := make(map[types.Object]string)
+	inNewNames := func(n string) bool {
+		for _, other := range newNames {
+			if other == n {
+				return true
+			}
+		}
+		return false
+	}
+	var scopeStack []*types.Scope
+	pkgScope := g.pkg.Types.Scope()
+	node = astutil.Apply(node, func(c *astutil.Cursor) bool {
+		if scope := info.Scopes[c.Node()]; scope != nil {
+			scopeStack = append(scopeStack, scope)
+		}
+		id, ok := c.Node().(*ast.Ident)
+		if !ok {
+			return true
+		}
+		obj := info.ObjectOf(id)
+		if obj == nil {
+			// We rewrote this identifier earlier, so it does not need
+			// further rewriting.
+			return true
+		}
+		if n, ok := newNames[obj]; ok {
+			// We picked a new name for this symbol. Rewrite it.
+			c.Replace(ast.NewIdent(n))
+			return false
+		}
+		if par := obj.Parent(); par == nil || par == pkgScope {
+			// Don't rename methods, field names, or top-level identifiers.
+			return true
+		}
+
+		// Rename any symbols defined within rewritePkgRefs's node that conflict
+		// with any symbols in the generated file.
+		objName := obj.Name()
+		if pos := obj.Pos(); pos < start || end <= pos || !(g.nameInFileScope(objName) || inNewNames(objName)) {
+			return true
+		}
+		newName := disambiguate(objName, func(n string) bool {
+			if g.nameInFileScope(n) || inNewNames(n) {
+				return true
+			}
+			if len(scopeStack) > 0 {
+				// Avoid picking a name that conflicts with other names in the
+				// current scope.
+				_, obj := scopeStack[len(scopeStack)-1].LookupParent(n, token.NoPos)
+				if obj != nil {
+					return true
+				}
+			}
+			return false
+		})
+		newNames[obj] = newName
+		c.Replace(ast.NewIdent(newName))
+		return false
+	}, func(c *astutil.Cursor) bool {
+		if info.Scopes[c.Node()] != nil {
+			// Should be top of stack; pop it.
+			scopeStack = scopeStack[:len(scopeStack)-1]
+		}
+		return true
+	})
+	return node
+}
+
+// writeAST prints an AST node into the generated output, rewriting any
+// package references it encounters.
+func (g *gen) writeAST(info *types.Info, node ast.Node) {
+	node = g.rewritePkgRefs(info, node)
+	if err := printer.Fprint(&g.buf, g.pkg.Fset, node); err != nil {
+		panic(err)
+	}
+}
+
+func (g *gen) qualifiedID(pkgName, pkgPath, sym string) string {
+	name := g.qualifyImport(pkgName, pkgPath)
+	if name == "" {
+		return sym
+	}
+	return name + "." + sym
+}
+
+func (g *gen) qualifyImport(name, path string) string {
+	if path == g.pkg.PkgPath {
+		return ""
+	}
+	// TODO(light): This is depending on details of the current loader.
+	const vendorPart = "vendor/"
+	unvendored := path
+	if i := strings.LastIndex(path, vendorPart); i != -1 && (i == 0 || path[i-1] == '/') {
+		unvendored = path[i+len(vendorPart):]
+	}
+	if info, ok := g.imports[unvendored]; ok {
+		return info.name
+	}
+	// TODO(light): Use parts of import path to disambiguate.
+	newName := disambiguate(name, func(n string) bool {
+		// Don't let an import take the "err" name. That's annoying.
+		return n == "err" || g.nameInFileScope(n)
+	})
+	g.imports[unvendored] = importInfo{
+		name:    newName,
+		differs: newName != name,
+	}
+	return newName
+}
+
+func (g *gen) nameInFileScope(name string) bool {
+	for _, other := range g.imports {
+		if other.name == name {
+			return true
+		}
+	}
+	for _, other := range g.values {
+		if other == name {
+			return true
+		}
+	}
+	_, obj := g.pkg.Types.Scope().LookupParent(name, token.NoPos)
+	return obj != nil
+}
+
+func (g *gen) qualifyPkg(pkg *types.Package) string {
+	return g.qualifyImport(pkg.Name(), pkg.Path())
+}
+
+func (g *gen) p(format string, args ...interface{}) {
+	fmt.Fprintf(&g.buf, format, args...)
+}
+
+// injectorGen is the per-injector pass generator state.
+type injectorGen struct {
+	g *gen
+
+	paramNames   []string
+	localNames   []string
+	cleanupNames []string
+	errVar       string
+
+	// discard causes ig.p and ig.writeAST to no-op. Useful to run
+	// generation for side-effects like filling in g.imports.
+	discard bool
+}
+
+// injectPass generates an injector given the output from analysis.
+// The sig passed in should be verified.
+func injectPass(name string, sig *types.Signature, calls []call, set *ProviderSet, doc *ast.CommentGroup, ig *injectorGen) {
+	params := sig.Params()
+	injectSig, err := funcOutput(sig)
+	if err != nil {
+		// This should be checked by the caller already.
+		panic(err)
+	}
+	if doc != nil {
+		for _, c := range doc.List {
+			ig.p("%s\n", c.Text)
+		}
+	}
+	ig.p("func %s(", name)
+	for i := 0; i < params.Len(); i++ {
+		if i > 0 {
+			ig.p(", ")
+		}
+		pi := params.At(i)
+		a := pi.Name()
+		if a == "" || a == "_" {
+			a = typeVariableName(pi.Type(), "arg", unexport, ig.nameInInjector)
+		} else {
+			a = disambiguate(a, ig.nameInInjector)
+		}
+		ig.paramNames = append(ig.paramNames, a)
+		if sig.Variadic() && i == params.Len()-1 {
+			// Keep the varargs signature instead of a slice for the last argument if the
+			// injector is variadic.
+			ig.p("%s ...%s", ig.paramNames[i], types.TypeString(pi.Type().(*types.Slice).Elem(), ig.g.qualifyPkg))
+		} else {
+			ig.p("%s %s", ig.paramNames[i], types.TypeString(pi.Type(), ig.g.qualifyPkg))
+		}
+	}
+	outTypeString := types.TypeString(injectSig.out, ig.g.qualifyPkg)
+	switch {
+	case injectSig.cleanup && injectSig.err:
+		ig.p(") (%s, func(), error) {\n", outTypeString)
+	case injectSig.cleanup:
+		ig.p(") (%s, func()) {\n", outTypeString)
+	case injectSig.err:
+		ig.p(") (%s, error) {\n", outTypeString)
+	default:
+		ig.p(") %s {\n", outTypeString)
+	}
+	for i := range calls {
+		c := &calls[i]
+		lname := typeVariableName(c.out, "v", unexport, ig.nameInInjector)
+		ig.localNames = append(ig.localNames, lname)
+		switch c.kind {
+		case structProvider:
+			ig.structProviderCall(lname, c)
+		case funcProviderCall:
+			ig.funcProviderCall(lname, c, injectSig)
+		case valueExpr:
+			ig.valueExpr(lname, c)
+		case selectorExpr:
+			ig.fieldExpr(lname, c)
+		default:
+			panic("unknown kind")
+		}
+	}
+	if len(calls) == 0 {
+		ig.p("\treturn %s", ig.paramNames[set.For(injectSig.out).Arg().Index])
+	} else {
+		ig.p("\treturn %s", ig.localNames[len(calls)-1])
+	}
+	if injectSig.cleanup {
+		ig.p(", func() {\n")
+		for i := len(ig.cleanupNames) - 1; i >= 0; i-- {
+			ig.p("\t\t%s()\n", ig.cleanupNames[i])
+		}
+		ig.p("\t}")
+	}
+	if injectSig.err {
+		ig.p(", nil")
+	}
+	ig.p("\n}\n\n")
+}
+
+func (ig *injectorGen) funcProviderCall(lname string, c *call, injectSig outputSignature) {
+	ig.p("\t%s", lname)
+	prevCleanup := len(ig.cleanupNames)
+	if c.hasCleanup {
+		cname := disambiguate("cleanup", ig.nameInInjector)
+		ig.cleanupNames = append(ig.cleanupNames, cname)
+		ig.p(", %s", cname)
+	}
+	if c.hasErr {
+		ig.p(", %s", ig.errVar)
+	}
+	ig.p(" := ")
+	ig.p("%s(", ig.g.qualifiedID(c.pkg.Name(), c.pkg.Path(), c.name))
+	for i, a := range c.args {
+		if i > 0 {
+			ig.p(", ")
+		}
+		if a < len(ig.paramNames) {
+			ig.p("%s", ig.paramNames[a])
+		} else {
+			ig.p("%s", ig.localNames[a-len(ig.paramNames)])
+		}
+	}
+	if c.varargs {
+		ig.p("...")
+	}
+	ig.p(")\n")
+	if c.hasErr {
+		ig.p("\tif %s != nil {\n", ig.errVar)
+		for i := prevCleanup - 1; i >= 0; i-- {
+			ig.p("\t\t%s()\n", ig.cleanupNames[i])
+		}
+		ig.p("\t\treturn %s", zeroValue(injectSig.out, ig.g.qualifyPkg))
+		if injectSig.cleanup {
+			ig.p(", nil")
+		}
+		// TODO(light): Give information about failing provider.
+		ig.p(", err\n")
+		ig.p("\t}\n")
+	}
+}
+
+func (ig *injectorGen) structProviderCall(lname string, c *call) {
+	ig.p("\t%s", lname)
+	ig.p(" := ")
+	if _, ok := c.out.(*types.Pointer); ok {
+		ig.p("&")
+	}
+	ig.p("%s{\n", ig.g.qualifiedID(c.pkg.Name(), c.pkg.Path(), c.name))
+	for i, a := range c.args {
+		ig.p("\t\t%s: ", c.fieldNames[i])
+		if a < len(ig.paramNames) {
+			ig.p("%s", ig.paramNames[a])
+		} else {
+			ig.p("%s", ig.localNames[a-len(ig.paramNames)])
+		}
+		ig.p(",\n")
+	}
+	ig.p("\t}\n")
+}
+
+func (ig *injectorGen) valueExpr(lname string, c *call) {
+	ig.p("\t%s := %s\n", lname, ig.g.values[c.valueExpr])
+}
+
+func (ig *injectorGen) fieldExpr(lname string, c *call) {
+	a := c.args[0]
+	ig.p("\t%s := ", lname)
+	if c.ptrToField {
+		ig.p("&")
+	}
+	if a < len(ig.paramNames) {
+		ig.p("%s.%s\n", ig.paramNames[a], c.name)
+	} else {
+		ig.p("%s.%s\n", ig.localNames[a-len(ig.paramNames)], c.name)
+	}
+}
+
+// nameInInjector reports whether name collides with any other identifier
+// in the current injector.
+func (ig *injectorGen) nameInInjector(name string) bool {
+	if name == ig.errVar {
+		return true
+	}
+	for _, a := range ig.paramNames {
+		if a == name {
+			return true
+		}
+	}
+	for _, l := range ig.localNames {
+		if l == name {
+			return true
+		}
+	}
+	for _, l := range ig.cleanupNames {
+		if l == name {
+			return true
+		}
+	}
+	return ig.g.nameInFileScope(name)
+}
+
+func (ig *injectorGen) p(format string, args ...interface{}) {
+	if ig.discard {
+		return
+	}
+	ig.g.p(format, args...)
+}
+
+// zeroValue returns the shortest expression that evaluates to the zero
+// value for the given type.
+func zeroValue(t types.Type, qf types.Qualifier) string {
+	switch u := t.Underlying().(type) {
+	case *types.Array, *types.Struct:
+		return types.TypeString(t, qf) + "{}"
+	case *types.Basic:
+		info := u.Info()
+		switch {
+		case info&types.IsBoolean != 0:
+			return "false"
+		case info&(types.IsInteger|types.IsFloat|types.IsComplex) != 0:
+			return "0"
+		case info&types.IsString != 0:
+			return `""`
+		default:
+			panic("unreachable")
+		}
+	case *types.Chan, *types.Interface, *types.Map, *types.Pointer, *types.Signature, *types.Slice:
+		return "nil"
+	default:
+		panic("unreachable")
+	}
+}
+
+// typeVariableName invents a disambiguated variable name derived from the type name.
+// If no name can be derived from the type, defaultName is used.
+// transform is used to transform the derived name(s) (including defaultName);
+// commonly used functions include export and unexport.
+// collides is used to see if a name is ambiguous. If any one of the derived
+// names is unambiguous, it used; otherwise, the first derived name is
+// disambiguated using disambiguate().
+func typeVariableName(t types.Type, defaultName string, transform func(string) string, collides func(string) bool) string {
+	if p, ok := t.(*types.Pointer); ok {
+		t = p.Elem()
+	}
+	var names []string
+	switch t := t.(type) {
+	case *types.Basic:
+		if t.Name() != "" {
+			names = append(names, t.Name())
+		}
+	case *types.Named:
+		obj := t.Obj()
+		if name := obj.Name(); name != "" {
+			names = append(names, name)
+		}
+		// Provide an alternate name prefixed with the package name if possible.
+		// E.g., in case of collisions, we'll use "fooCfg" instead of "cfg2".
+		if pkg := obj.Pkg(); pkg != nil && pkg.Name() != "" {
+			names = append(names, fmt.Sprintf("%s%s", pkg.Name(), strings.Title(obj.Name())))
+		}
+	}
+
+	// If we were unable to derive a name, use defaultName.
+	if len(names) == 0 {
+		names = append(names, defaultName)
+	}
+
+	// Transform the name(s).
+	for i, name := range names {
+		names[i] = transform(name)
+	}
+
+	// See if there's an unambiguous name; if so, use it.
+	for _, name := range names {
+		if !token.Lookup(name).IsKeyword() && !collides(name) {
+			return name
+		}
+	}
+	// Otherwise, disambiguate the first name.
+	return disambiguate(names[0], collides)
+}
+
+// unexport converts a name that is potentially exported to an unexported name.
+func unexport(name string) string {
+	if name == "" {
+		return ""
+	}
+	r, sz := utf8.DecodeRuneInString(name)
+	if !unicode.IsUpper(r) {
+		// foo -> foo
+		return name
+	}
+	r2, sz2 := utf8.DecodeRuneInString(name[sz:])
+	if !unicode.IsUpper(r2) {
+		// Foo -> foo
+		return string(unicode.ToLower(r)) + name[sz:]
+	}
+	// UPPERWord -> upperWord
+	sbuf := new(strings.Builder)
+	sbuf.WriteRune(unicode.ToLower(r))
+	i := sz
+	r, sz = r2, sz2
+	for unicode.IsUpper(r) && sz > 0 {
+		r2, sz2 := utf8.DecodeRuneInString(name[i+sz:])
+		if sz2 > 0 && unicode.IsLower(r2) {
+			break
+		}
+		i += sz
+		sbuf.WriteRune(unicode.ToLower(r))
+		r, sz = r2, sz2
+	}
+	sbuf.WriteString(name[i:])
+	return sbuf.String()
+}
+
+// export converts a name that is potentially unexported to an exported name.
+func export(name string) string {
+	if name == "" {
+		return ""
+	}
+	r, sz := utf8.DecodeRuneInString(name)
+	if unicode.IsUpper(r) {
+		// Foo -> Foo
+		return name
+	}
+	// fooBar -> FooBar
+	sbuf := new(strings.Builder)
+	sbuf.WriteRune(unicode.ToUpper(r))
+	sbuf.WriteString(name[sz:])
+	return sbuf.String()
+}
+
+// disambiguate picks a unique name, preferring name if it is already unique.
+// It also disambiguates against Go's reserved keywords.
+func disambiguate(name string, collides func(string) bool) string {
+	if !token.Lookup(name).IsKeyword() && !collides(name) {
+		return name
+	}
+	buf := []byte(name)
+	if len(buf) > 0 && buf[len(buf)-1] >= '0' && buf[len(buf)-1] <= '9' {
+		buf = append(buf, '_')
+	}
+	base := len(buf)
+	for n := 2; ; n++ {
+		buf = strconv.AppendInt(buf[:base], int64(n), 10)
+		sbuf := string(buf)
+		if !token.Lookup(sbuf).IsKeyword() && !collides(sbuf) {
+			return sbuf
+		}
+	}
+}
+
+// accessibleFrom reports whether node can be copied to wantPkg without
+// violating Go visibility rules.
+func accessibleFrom(info *types.Info, node ast.Node, wantPkg string) error {
+	var unexportError error
+	ast.Inspect(node, func(node ast.Node) bool {
+		if unexportError != nil {
+			return false
+		}
+		ident, ok := node.(*ast.Ident)
+		if !ok {
+			return true
+		}
+		obj := info.ObjectOf(ident)
+		if _, ok := obj.(*types.PkgName); ok {
+			// Local package names are fine, since we can just reimport them.
+			return true
+		}
+		if pkg := obj.Pkg(); pkg != nil {
+			if !ast.IsExported(ident.Name) && pkg.Path() != wantPkg {
+				unexportError = fmt.Errorf("uses unexported identifier %s", obj.Name())
+				return false
+			}
+			if obj.Parent() != nil && obj.Parent() != pkg.Scope() {
+				unexportError = fmt.Errorf("%s is not declared in package scope", obj.Name())
+				return false
+			}
+		}
+		return true
+	})
+	return unexportError
+}
+
+var (
+	errorType   = types.Universe.Lookup("error").Type()
+	cleanupType = types.NewSignature(nil, nil, nil, false)
+)
diff --git a/pkg/build/wire/internal/wire/wire_test.go b/pkg/build/wire/internal/wire/wire_test.go
new file mode 100644
index 0000000000000..9b1493327e71a
--- /dev/null
+++ b/pkg/build/wire/internal/wire/wire_test.go
@@ -0,0 +1,559 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package wire
+
+import (
+	"bytes"
+	"context"
+	"flag"
+	"fmt"
+	"go/build"
+	"go/types"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"testing"
+	"unicode"
+	"unicode/utf8"
+
+	"github.com/google/go-cmp/cmp"
+)
+
+var record = flag.Bool("record", false, "whether to run tests against cloud resources and record the interactions")
+
+func TestWire(t *testing.T) {
+	const testRoot = "testdata"
+	testdataEnts, err := ioutil.ReadDir(testRoot) // ReadDir sorts by name.
+	if err != nil {
+		t.Fatal(err)
+	}
+	// The marker function package source is needed to have the test cases
+	// type check. loadTestCase places this file at the well-known import path.
+	wireGo, err := ioutil.ReadFile(filepath.Join("..", "..", "wire.go"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	tests := make([]*testCase, 0, len(testdataEnts))
+	for _, ent := range testdataEnts {
+		name := ent.Name()
+		if !ent.IsDir() || strings.HasPrefix(name, ".") || strings.HasPrefix(name, "_") {
+			continue
+		}
+		test, err := loadTestCase(filepath.Join(testRoot, name), wireGo)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+		tests = append(tests, test)
+	}
+
+	var goToolPath string
+	if *record {
+		goToolPath = filepath.Join(build.Default.GOROOT, "bin", "go")
+		if _, err := os.Stat(goToolPath); err != nil {
+			t.Fatal("go toolchain not available:", err)
+		}
+	}
+	ctx := context.Background()
+	for _, test := range tests {
+		test := test
+		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
+
+			// Materialize a temporary GOPATH directory.
+			gopath, err := ioutil.TempDir("", "wire_test")
+			if err != nil {
+				t.Fatal(err)
+			}
+			defer os.RemoveAll(gopath)
+			gopath, err = filepath.EvalSymlinks(gopath)
+			if err != nil {
+				t.Fatal(err)
+			}
+			if err := test.materialize(gopath); err != nil {
+				t.Fatal(err)
+			}
+			wd := filepath.Join(gopath, "src", "example.com")
+			gens, errs := Generate(ctx, wd, append(os.Environ(), "GOPATH="+gopath), []string{test.pkg}, &GenerateOptions{Header: test.header})
+			var gen GenerateResult
+			if len(gens) > 1 {
+				t.Fatalf("got %d generated files, want 0 or 1", len(gens))
+			}
+			if len(gens) == 1 {
+				gen = gens[0]
+				if len(gen.Errs) > 0 {
+					errs = append(errs, gen.Errs...)
+				}
+				if len(gen.Content) > 0 {
+					defer t.Logf("wire_gen.go:\n%s", gen.Content)
+				}
+			}
+			if len(errs) > 0 {
+				gotErrStrings := make([]string, len(errs))
+				for i, e := range errs {
+					t.Log(e.Error())
+					gotErrStrings[i] = scrubError(gopath, e.Error())
+				}
+				if !test.wantWireError {
+					t.Fatal("Did not expect errors. To -record an error, create want/wire_errs.txt.")
+				}
+				if *record {
+					wireErrsFile := filepath.Join(testRoot, test.name, "want", "wire_errs.txt")
+					if err := ioutil.WriteFile(wireErrsFile, []byte(strings.Join(gotErrStrings, "\n\n")), 0666); err != nil {
+						t.Fatalf("failed to write wire_errs.txt file: %v", err)
+					}
+				} else {
+					if diff := cmp.Diff(gotErrStrings, test.wantWireErrorStrings); diff != "" {
+						t.Errorf("Errors didn't match expected errors from wire_errors.txt:\n%s", diff)
+					}
+				}
+				return
+			}
+			if test.wantWireError {
+				t.Fatal("wire succeeded; want error")
+			}
+			outPathSane := true
+			if prefix := gopath + string(os.PathSeparator) + "src" + string(os.PathSeparator); !strings.HasPrefix(gen.OutputPath, prefix) {
+				outPathSane = false
+				t.Errorf("suggested output path = %q; want to start with %q", gen.OutputPath, prefix)
+			}
+
+			if *record {
+				// Record ==> Build the generated Wire code,
+				// check that the program's output matches the
+				// expected output, save wire output on
+				// success.
+				if !outPathSane {
+					return
+				}
+				if err := gen.Commit(); err != nil {
+					t.Fatalf("failed to write wire_gen.go to test GOPATH: %v", err)
+				}
+				if err := goBuildCheck(goToolPath, gopath, test); err != nil {
+					t.Fatalf("go build check failed: %v", err)
+				}
+				testdataWireGenPath := filepath.Join(testRoot, test.name, "want", "wire_gen.go")
+				if err := ioutil.WriteFile(testdataWireGenPath, gen.Content, 0666); err != nil {
+					t.Fatalf("failed to record wire_gen.go to testdata: %v", err)
+				}
+			} else {
+				// Replay ==> Load golden file and compare to
+				// generated result. This check is meant to
+				// detect non-deterministic behavior in the
+				// Generate function.
+				if !bytes.Equal(gen.Content, test.wantWireOutput) {
+					gotS, wantS := string(gen.Content), string(test.wantWireOutput)
+					diff := cmp.Diff(strings.Split(gotS, "\n"), strings.Split(wantS, "\n"))
+					t.Fatalf("wire output differs from golden file. If this change is expected, run with -record to update the wire_gen.go file.\n*** got:\n%s\n\n*** want:\n%s\n\n*** diff:\n%s", gotS, wantS, diff)
+				}
+			}
+		})
+	}
+}
+
+func goBuildCheck(goToolPath, gopath string, test *testCase) error {
+	// Run `go build`.
+	testExePath := filepath.Join(gopath, "bin", "testprog")
+	buildCmd := []string{"build", "-o", testExePath}
+	buildCmd = append(buildCmd, test.pkg)
+	cmd := exec.Command(goToolPath, buildCmd...)
+	cmd.Dir = filepath.Join(gopath, "src", "example.com")
+	cmd.Env = append(os.Environ(), "GOPATH="+gopath)
+	if buildOut, err := cmd.CombinedOutput(); err != nil {
+		if len(buildOut) > 0 {
+			return fmt.Errorf("build: %v; output:\n%s", err, buildOut)
+		}
+		return fmt.Errorf("build: %v", err)
+	}
+
+	// Run the resulting program and compare its output to the expected
+	// output.
+	out, err := exec.Command(testExePath).Output()
+	if err != nil {
+		return fmt.Errorf("run compiled program: %v", err)
+	}
+	if !bytes.Equal(out, test.wantProgramOutput) {
+		gotS, wantS := string(out), string(test.wantProgramOutput)
+		diff := cmp.Diff(strings.Split(gotS, "\n"), strings.Split(wantS, "\n"))
+		return fmt.Errorf("compiled program output doesn't match:\n*** got:\n%s\n\n*** want:\n%s\n\n*** diff:\n%s", gotS, wantS, diff)
+	}
+	return nil
+}
+
+func TestUnexport(t *testing.T) {
+	tests := []struct {
+		name string
+		want string
+	}{
+		{"", ""},
+		{"a", "a"},
+		{"ab", "ab"},
+		{"A", "a"},
+		{"AB", "ab"},
+		{"A_", "a_"},
+		{"ABc", "aBc"},
+		{"ABC", "abc"},
+		{"AB_", "ab_"},
+		{"foo", "foo"},
+		{"Foo", "foo"},
+		{"HTTPClient", "httpClient"},
+		{"IFace", "iFace"},
+		{"SNAKE_CASE", "snake_CASE"},
+		{"HTTP", "http"},
+	}
+	for _, test := range tests {
+		if got := unexport(test.name); got != test.want {
+			t.Errorf("unexport(%q) = %q; want %q", test.name, got, test.want)
+		}
+	}
+}
+
+func TestExport(t *testing.T) {
+	tests := []struct {
+		name string
+		want string
+	}{
+		{"", ""},
+		{"a", "A"},
+		{"ab", "Ab"},
+		{"A", "A"},
+		{"AB", "AB"},
+		{"A_", "A_"},
+		{"ABc", "ABc"},
+		{"ABC", "ABC"},
+		{"AB_", "AB_"},
+		{"foo", "Foo"},
+		{"Foo", "Foo"},
+		{"HTTPClient", "HTTPClient"},
+		{"httpClient", "HttpClient"},
+		{"IFace", "IFace"},
+		{"iFace", "IFace"},
+		{"SNAKE_CASE", "SNAKE_CASE"},
+		{"HTTP", "HTTP"},
+	}
+	for _, test := range tests {
+		if got := export(test.name); got != test.want {
+			t.Errorf("export(%q) = %q; want %q", test.name, got, test.want)
+		}
+	}
+}
+
+func TestTypeVariableName(t *testing.T) {
+	var (
+		boolT           = types.Typ[types.Bool]
+		stringT         = types.Typ[types.String]
+		fooVarT         = types.NewNamed(types.NewTypeName(0, nil, "foo", stringT), stringT, nil)
+		nonameVarT      = types.NewNamed(types.NewTypeName(0, nil, "", stringT), stringT, nil)
+		barVarInFooPkgT = types.NewNamed(types.NewTypeName(0, types.NewPackage("my.example/foo", "foo"), "bar", stringT), stringT, nil)
+	)
+	tests := []struct {
+		description     string
+		typ             types.Type
+		defaultName     string
+		transformAppend string
+		collides        map[string]bool
+		want            string
+	}{
+		{"basic type", boolT, "", "", map[string]bool{}, "bool"},
+		{"basic type with transform", boolT, "", "suffix", map[string]bool{}, "boolsuffix"},
+		{"basic type with collision", boolT, "", "", map[string]bool{"bool": true}, "bool2"},
+		{"basic type with transform and collision", boolT, "", "suffix", map[string]bool{"boolsuffix": true}, "boolsuffix2"},
+		{"a different basic type", stringT, "", "", map[string]bool{}, "string"},
+		{"named type", fooVarT, "", "", map[string]bool{}, "foo"},
+		{"named type with transform", fooVarT, "", "suffix", map[string]bool{}, "foosuffix"},
+		{"named type with collision", fooVarT, "", "", map[string]bool{"foo": true}, "foo2"},
+		{"named type with transform and collision", fooVarT, "", "suffix", map[string]bool{"foosuffix": true}, "foosuffix2"},
+		{"noname type", nonameVarT, "bar", "", map[string]bool{}, "bar"},
+		{"noname type with transform", nonameVarT, "bar", "s", map[string]bool{}, "bars"},
+		{"noname type with transform and collision", nonameVarT, "bar", "s", map[string]bool{"bars": true}, "bars2"},
+		{"var in pkg type", barVarInFooPkgT, "", "", map[string]bool{}, "bar"},
+		{"var in pkg type with collision", barVarInFooPkgT, "", "", map[string]bool{"bar": true}, "fooBar"},
+		{"var in pkg type with double collision", barVarInFooPkgT, "", "", map[string]bool{"bar": true, "fooBar": true}, "bar2"},
+	}
+	for _, test := range tests {
+		t.Run(fmt.Sprintf("%s: typeVariableName(%v, %q, %q, %v)", test.description, test.typ, test.defaultName, test.transformAppend, test.collides), func(t *testing.T) {
+			got := typeVariableName(test.typ, test.defaultName, func(name string) string { return name + test.transformAppend }, func(name string) bool { return test.collides[name] })
+			if !isIdent(got) {
+				t.Errorf("%q is not an identifier", got)
+			}
+			if got != test.want {
+				t.Errorf("got %q want %q", got, test.want)
+			}
+			if test.collides[got] {
+				t.Errorf("%q collides", got)
+			}
+		})
+	}
+}
+
+func TestDisambiguate(t *testing.T) {
+	tests := []struct {
+		name     string
+		want     string
+		collides map[string]bool
+	}{
+		{"foo", "foo", nil},
+		{"foo", "foo2", map[string]bool{"foo": true}},
+		{"foo", "foo3", map[string]bool{"foo": true, "foo1": true, "foo2": true}},
+		{"foo1", "foo1_2", map[string]bool{"foo": true, "foo1": true, "foo2": true}},
+		{"foo\u0661", "foo\u0661", map[string]bool{"foo": true, "foo1": true, "foo2": true}},
+		{"foo\u0661", "foo\u06612", map[string]bool{"foo": true, "foo1": true, "foo2": true, "foo\u0661": true}},
+		{"select", "select2", nil},
+		{"var", "var2", nil},
+	}
+	for _, test := range tests {
+		t.Run(fmt.Sprintf("disambiguate(%q, %v)", test.name, test.collides), func(t *testing.T) {
+			got := disambiguate(test.name, func(name string) bool { return test.collides[name] })
+			if !isIdent(got) {
+				t.Errorf("%q is not an identifier", got)
+			}
+			if got != test.want {
+				t.Errorf("got %q want %q", got, test.want)
+			}
+			if test.collides[got] {
+				t.Errorf("%q collides", got)
+			}
+		})
+	}
+}
+
+func isIdent(s string) bool {
+	if len(s) == 0 {
+		return false
+	}
+	r, i := utf8.DecodeRuneInString(s)
+	if !unicode.IsLetter(r) && r != '_' {
+		return false
+	}
+	for i < len(s) {
+		r, sz := utf8.DecodeRuneInString(s[i:])
+		if !unicode.IsLetter(r) && !unicode.IsDigit(r) && r != '_' {
+			return false
+		}
+		i += sz
+	}
+	return true
+}
+
+// scrubError rewrites the given string to remove occurrences of GOPATH/src,
+// rewrites OS-specific path separators to slashes, and any line/column
+// information to a fixed ":x:y". For example, if the gopath parameter is
+// "C:\GOPATH" and running on Windows, the string
+// "C:\GOPATH\src\foo\bar.go:15:4" would be rewritten to "foo/bar.go:x:y".
+func scrubError(gopath string, s string) string {
+	sb := new(strings.Builder)
+	query := gopath + string(os.PathSeparator) + "src" + string(os.PathSeparator)
+	for {
+		// Find next occurrence of source root. This indicates the next path to
+		// scrub.
+		start := strings.Index(s, query)
+		if start == -1 {
+			sb.WriteString(s)
+			break
+		}
+
+		// Find end of file name (extension ".go").
+		fileStart := start + len(query)
+		fileEnd := strings.Index(s[fileStart:], ".go")
+		if fileEnd == -1 {
+			// If no ".go" occurs to end of string, further searches will fail too.
+			// Break the loop.
+			sb.WriteString(s)
+			break
+		}
+		fileEnd += fileStart + 3 // Advance to end of extension.
+
+		// Write out file name and advance scrub position.
+		file := s[fileStart:fileEnd]
+		if os.PathSeparator != '/' {
+			file = strings.Replace(file, string(os.PathSeparator), "/", -1)
+		}
+		sb.WriteString(s[:start])
+		sb.WriteString(file)
+		s = s[fileEnd:]
+
+		// Peek past to see if there is line/column info.
+		linecol, linecolLen := scrubLineColumn(s)
+		sb.WriteString(linecol)
+		s = s[linecolLen:]
+	}
+	return sb.String()
+}
+
+func scrubLineColumn(s string) (replacement string, n int) {
+	if !strings.HasPrefix(s, ":") {
+		return "", 0
+	}
+	// Skip first colon and run of digits.
+	for n++; len(s) > n && '0' <= s[n] && s[n] <= '9'; {
+		n++
+	}
+	if n == 1 {
+		// No digits followed colon.
+		return "", 0
+	}
+
+	// Start on column part.
+	if !strings.HasPrefix(s[n:], ":") {
+		return ":x", n
+	}
+	lineEnd := n
+	// Skip second colon and run of digits.
+	for n++; len(s) > n && '0' <= s[n] && s[n] <= '9'; {
+		n++
+	}
+	if n == lineEnd+1 {
+		// No digits followed second colon.
+		return ":x", lineEnd
+	}
+	return ":x:y", n
+}
+
+type testCase struct {
+	name                 string
+	pkg                  string
+	header               []byte
+	goFiles              map[string][]byte
+	wantProgramOutput    []byte
+	wantWireOutput       []byte
+	wantWireError        bool
+	wantWireErrorStrings []string
+}
+
+// loadTestCase reads a test case from a directory.
+//
+// The directory structure is:
+//
+//	root/
+//
+//		pkg
+//			file containing the package name containing the inject function
+//			(must also be package main)
+//
+//		...
+//			any Go files found recursively placed under GOPATH/src/...
+//
+//		want/
+//
+//			wire_errs.txt
+//					Expected errors from the Wire Generate function,
+//					missing if no errors expected.
+//					Distinct errors are separated by a blank line,
+//					and line numbers and line positions are scrubbed
+//					(e.g. "$GOPATH/src/foo.go:52:8" --> "foo.go:x:y").
+//
+//			wire_gen.go
+//					verified output of wire from a test run with
+//					-record, missing if wire_errs.txt is present
+//
+//			program_out.txt
+//					expected output from the final compiled program,
+//					missing if wire_errs.txt is present
+func loadTestCase(root string, wireGoSrc []byte) (*testCase, error) {
+	name := filepath.Base(root)
+	pkg, err := ioutil.ReadFile(filepath.Join(root, "pkg"))
+	if err != nil {
+		return nil, fmt.Errorf("load test case %s: %v", name, err)
+	}
+	header, _ := ioutil.ReadFile(filepath.Join(root, "header"))
+	var wantProgramOutput []byte
+	var wantWireOutput []byte
+	wireErrb, err := ioutil.ReadFile(filepath.Join(root, "want", "wire_errs.txt"))
+	wantWireError := err == nil
+	var wantWireErrorStrings []string
+	if wantWireError {
+		wantWireErrorStrings = strings.Split(string(wireErrb), "\n\n")
+	} else {
+		if !*record {
+			wantWireOutput, err = ioutil.ReadFile(filepath.Join(root, "want", "wire_gen.go"))
+			if err != nil {
+				return nil, fmt.Errorf("load test case %s: %v, if this is a new testcase, run with -record to generate the wire_gen.go file", name, err)
+			}
+		}
+		wantProgramOutput, err = ioutil.ReadFile(filepath.Join(root, "want", "program_out.txt"))
+		if err != nil {
+			return nil, fmt.Errorf("load test case %s: %v", name, err)
+		}
+	}
+	goFiles := map[string][]byte{
+		"github.com/google/wire/wire.go":                    wireGoSrc,
+		"github.com/grafana/grafana/pkg/build/wire/wire.go": wireGoSrc,
+	}
+	err = filepath.Walk(root, func(src string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		rel, err := filepath.Rel(root, src)
+		if err != nil {
+			return err // unlikely
+		}
+		if info.Mode().IsDir() && rel == "want" {
+			// The "want" directory should not be included in goFiles.
+			return filepath.SkipDir
+		}
+		if !info.Mode().IsRegular() || filepath.Ext(src) != ".go" {
+			return nil
+		}
+		data, err := ioutil.ReadFile(src)
+		if err != nil {
+			return err
+		}
+		goFiles["example.com/"+filepath.ToSlash(rel)] = data
+		return nil
+	})
+	if err != nil {
+		return nil, fmt.Errorf("load test case %s: %v", name, err)
+	}
+	return &testCase{
+		name:                 name,
+		pkg:                  string(bytes.TrimSpace(pkg)),
+		header:               header,
+		goFiles:              goFiles,
+		wantWireOutput:       wantWireOutput,
+		wantProgramOutput:    wantProgramOutput,
+		wantWireError:        wantWireError,
+		wantWireErrorStrings: wantWireErrorStrings,
+	}, nil
+}
+
+// materialize creates a new GOPATH at the given directory, which may or
+// may not exist.
+func (test *testCase) materialize(gopath string) error {
+	for name, content := range test.goFiles {
+		dst := filepath.Join(gopath, "src", filepath.FromSlash(name))
+		if err := os.MkdirAll(filepath.Dir(dst), 0777); err != nil {
+			return fmt.Errorf("materialize GOPATH: %v", err)
+		}
+		if err := ioutil.WriteFile(dst, content, 0666); err != nil {
+			return fmt.Errorf("materialize GOPATH: %v", err)
+		}
+	}
+
+	// Add go.mod files to example.com and github.com/google/wire.
+	const importPath = "example.com"
+	const depPath = "github.com/grafana/grafana/pkg/build/wire"
+	depLoc := filepath.Join(gopath, "src", filepath.FromSlash(depPath))
+	example := fmt.Sprintf("module %s\n\nrequire %s v0.1.0\nreplace %s => %s\n", importPath, depPath, depPath, depLoc)
+	gomod := filepath.Join(gopath, "src", filepath.FromSlash(importPath), "go.mod")
+	if err := ioutil.WriteFile(gomod, []byte(example), 0666); err != nil {
+		return fmt.Errorf("generate go.mod for %s: %v", gomod, err)
+	}
+	if err := ioutil.WriteFile(filepath.Join(depLoc, "go.mod"), []byte("module "+depPath+"\n"), 0666); err != nil {
+		return fmt.Errorf("generate go.mod for %s: %v", depPath, err)
+	}
+	return nil
+}
diff --git a/pkg/build/wire/wire.go b/pkg/build/wire/wire.go
new file mode 100644
index 0000000000000..6af91dda6cf2d
--- /dev/null
+++ b/pkg/build/wire/wire.go
@@ -0,0 +1,196 @@
+// Copyright 2018 The Wire Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package wire contains directives for Wire code generation.
+// For an overview of working with Wire, see the user guide at
+// https://github.com/google/wire/blob/master/docs/guide.md
+//
+// The directives in this package are used as input to the Wire code generation
+// tool. The entry point of Wire's analysis are injector functions: function
+// templates denoted by only containing a call to Build. The arguments to Build
+// describes a set of providers and the Wire code generation tool builds a
+// directed acylic graph of the providers' output types. The generated code will
+// fill in the function template by using the providers from the provider set to
+// instantiate any needed types.
+package wire
+
+// ProviderSet is a marker type that collects a group of providers.
+type ProviderSet struct{}
+
+// NewSet creates a new provider set that includes the providers in its
+// arguments. Each argument is a function value, a provider set, a call to
+// Struct, a call to Bind, a call to Value, a call to InterfaceValue or a call
+// to FieldsOf.
+//
+// Passing a function value to NewSet declares that the function's first
+// return value type will be provided by calling the function. The arguments
+// to the function will come from the providers for their types. As such, all
+// the function's parameters must be of non-identical types. The function may
+// optionally return an error as its last return value and a cleanup function
+// as the second return value. A cleanup function must be of type func() and is
+// guaranteed to be called before the cleanup function of any of the
+// provider's inputs. If any provider returns an error, the injector function
+// will call all the appropriate cleanup functions and return the error from
+// the injector function.
+//
+// Passing a ProviderSet to NewSet is the same as if the set's contents
+// were passed as arguments to NewSet directly.
+//
+// The behavior of passing the result of a call to other functions in this
+// package are described in their respective doc comments.
+//
+// For compatibility with older versions of Wire, passing a struct value of type
+// S to NewSet declares that both S and *S will be provided by creating a new
+// value of the appropriate type by filling in each field of S using the
+// provider of the field's type. This form is deprecated and will be removed in
+// a future version of Wire: new providers sets should use wire.Struct.
+func NewSet(...interface{}) ProviderSet {
+	return ProviderSet{}
+}
+
+// Build is placed in the body of an injector function template to declare the
+// providers to use. The Wire code generation tool will fill in an
+// implementation of the function. The arguments to Build are interpreted the
+// same as NewSet: they determine the provider set presented to Wire's
+// dependency graph. Build returns an error message that can be sent to a call
+// to panic().
+//
+// The parameters of the injector function are used as inputs in the dependency
+// graph.
+//
+// Similar to provider functions passed into NewSet, the first return value is
+// the output of the injector function, the optional second return value is a
+// cleanup function, and the optional last return value is an error. If any of
+// the provider functions in the injector function's provider set return errors
+// or cleanup functions, the corresponding return value must be present in the
+// injector function template.
+//
+// Examples:
+//
+//	func injector(ctx context.Context) (*sql.DB, error) {
+//		wire.Build(otherpkg.FooSet, myProviderFunc)
+//		return nil, nil
+//	}
+//
+//	func injector(ctx context.Context) (*sql.DB, error) {
+//		panic(wire.Build(otherpkg.FooSet, myProviderFunc))
+//	}
+func Build(...interface{}) string {
+	return "implementation not generated, run wire"
+}
+
+// A Binding maps an interface to a concrete type.
+type Binding struct{}
+
+// Bind declares that a concrete type should be used to satisfy a dependency on
+// the type of iface. iface must be a pointer to an interface type, to must be a
+// pointer to a concrete type.
+//
+// Example:
+//
+//	type Fooer interface {
+//		Foo()
+//	}
+//
+//	type MyFoo struct{}
+//
+//	func (MyFoo) Foo() {}
+//
+//	var MySet = wire.NewSet(
+//		wire.Struct(new(MyFoo))
+//		wire.Bind(new(Fooer), new(MyFoo)))
+func Bind(iface, to interface{}) Binding {
+	return Binding{}
+}
+
+// bindToUsePointer is detected by the wire tool to indicate that Bind's second argument should take a pointer.
+// See https://github.com/google/wire/issues/120 for details.
+const bindToUsePointer = true
+
+// A ProvidedValue is an expression that is copied to the generated injector.
+type ProvidedValue struct{}
+
+// Value binds an expression to provide the type of the expression.
+// The expression may not be an interface value; use InterfaceValue for that.
+//
+// Example:
+//
+//	var MySet = wire.NewSet(wire.Value([]string(nil)))
+func Value(interface{}) ProvidedValue {
+	return ProvidedValue{}
+}
+
+// InterfaceValue binds an expression to provide a specific interface type.
+// The first argument is a pointer to the interface which user wants to provide.
+// The second argument is the actual variable value whose type implements the
+// interface.
+//
+// Example:
+//
+//	var MySet = wire.NewSet(wire.InterfaceValue(new(io.Reader), os.Stdin))
+func InterfaceValue(typ interface{}, x interface{}) ProvidedValue {
+	return ProvidedValue{}
+}
+
+// A StructProvider represents a named struct.
+type StructProvider struct{}
+
+// Struct specifies that the given struct type will be provided by filling in
+// the fields in the struct that have the names given.
+//
+// The first argument must be a pointer to the struct type. For a struct type
+// Foo, Wire will use field-filling to provide both Foo and *Foo. The remaining
+// arguments are field names to fill in. As a special case, if a single name "*"
+// is given, then all of the fields in the struct will be filled in.
+//
+// For example:
+//
+//	type S struct {
+//	  MyFoo *Foo
+//	  MyBar *Bar
+//	}
+//	var Set = wire.NewSet(wire.Struct(new(S), "MyFoo")) -> inject only S.MyFoo
+//	var Set = wire.NewSet(wire.Struct(new(S), "*")) -> inject all fields
+func Struct(structType interface{}, fieldNames ...string) StructProvider {
+	return StructProvider{}
+}
+
+// StructFields is a collection of the fields from a struct.
+type StructFields struct{}
+
+// FieldsOf declares that the fields named of the given struct type will be used
+// to provide the types of those fields. The structType argument must be a
+// pointer to the struct or a pointer to a pointer to the struct it wishes to reference.
+//
+// The following example would provide Foo and Bar using S.MyFoo and S.MyBar respectively:
+//
+//	type S struct {
+//		MyFoo Foo
+//		MyBar Bar
+//	}
+//
+//	func NewStruct() S { /* ... */ }
+//	var Set = wire.NewSet(wire.FieldsOf(new(S), "MyFoo", "MyBar"))
+//
+//	or
+//
+//	func NewStruct() *S { /* ... */ }
+//	var Set = wire.NewSet(wire.FieldsOf(new(*S), "MyFoo", "MyBar"))
+//
+//	If the structType argument is a pointer to a pointer to a struct, then FieldsOf
+//	additionally provides a pointer to each field type (e.g., *Foo and *Bar in the
+//	example above).
+func FieldsOf(structType interface{}, fieldNames ...string) StructFields {
+	return StructFields{}
+}
diff --git a/pkg/cmd/grafana-cli/commands/commands.go b/pkg/cmd/grafana-cli/commands/commands.go
index 30eacb2827c17..ab2293bc353c7 100644
--- a/pkg/cmd/grafana-cli/commands/commands.go
+++ b/pkg/cmd/grafana-cli/commands/commands.go
@@ -30,7 +30,7 @@ func runRunnerCommand(command func(commandLine utils.CommandLine, runner server.
 	}
 }
 
-func runDbCommand(command func(commandLine utils.CommandLine, sqlStore db.DB) error) func(context *cli.Context) error {
+func runDbCommand(command func(commandLine utils.CommandLine, cfg *setting.Cfg, sqlStore db.DB) error) func(context *cli.Context) error {
 	return func(context *cli.Context) error {
 		cmd := &utils.ContextCommandLine{Context: context}
 		runner, err := initializeRunner(cmd)
@@ -38,8 +38,9 @@ func runDbCommand(command func(commandLine utils.CommandLine, sqlStore db.DB) er
 			return fmt.Errorf("%v: %w", "failed to initialize runner", err)
 		}
 
+		cfg := runner.Cfg
 		sqlStore := runner.SQLStore
-		if err := command(cmd, sqlStore); err != nil {
+		if err := command(cmd, cfg, sqlStore); err != nil {
 			return err
 		}
 
diff --git a/pkg/cmd/grafana-cli/commands/conflict_user_command.go b/pkg/cmd/grafana-cli/commands/conflict_user_command.go
index b9243ddf1b386..b947f88f24bcf 100644
--- a/pkg/cmd/grafana-cli/commands/conflict_user_command.go
+++ b/pkg/cmd/grafana-cli/commands/conflict_user_command.go
@@ -33,7 +33,7 @@ import (
 	"github.com/grafana/grafana/pkg/setting"
 )
 
-func initConflictCfg(cmd *utils.ContextCommandLine) (*setting.Cfg, error) {
+func initConflictCfg(cmd *utils.ContextCommandLine) (*setting.Cfg, *featuremgmt.FeatureManager, error) {
 	configOptions := strings.Split(cmd.String("configOverrides"), " ")
 	configOptions = append(configOptions, cmd.Args().Slice()...)
 	cfg, err := setting.NewCfgFromArgs(setting.CommandLineArgs{
@@ -43,17 +43,19 @@ func initConflictCfg(cmd *utils.ContextCommandLine) (*setting.Cfg, error) {
 	})
 
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
-	return cfg, nil
+
+	features, err := featuremgmt.ProvideManagerService(cfg)
+	return cfg, features, err
 }
 
 func initializeConflictResolver(cmd *utils.ContextCommandLine, f Formatter, ctx *cli.Context) (*ConflictResolver, error) {
-	cfg, err := initConflictCfg(cmd)
+	cfg, features, err := initConflictCfg(cmd)
 	if err != nil {
 		return nil, fmt.Errorf("%v: %w", "failed to load configuration", err)
 	}
-	s, err := getSqlStore(cfg)
+	s, err := getSqlStore(cfg, features)
 	if err != nil {
 		return nil, fmt.Errorf("%v: %w", "failed to get to sql", err)
 	}
@@ -67,11 +69,7 @@ func initializeConflictResolver(cmd *utils.ContextCommandLine, f Formatter, ctx
 		return nil, fmt.Errorf("%v: %w", "failed to get user service", err)
 	}
 	routing := routing.ProvideRegister()
-	featMgmt, err := featuremgmt.ProvideManagerService(cfg, nil)
-	if err != nil {
-		return nil, fmt.Errorf("%v: %w", "failed to get feature management service", err)
-	}
-	acService, err := acimpl.ProvideService(cfg, s, routing, nil, nil, featMgmt)
+	acService, err := acimpl.ProvideService(cfg, s, routing, nil, nil, features)
 	if err != nil {
 		return nil, fmt.Errorf("%v: %w", "failed to get access control", err)
 	}
@@ -80,13 +78,18 @@ func initializeConflictResolver(cmd *utils.ContextCommandLine, f Formatter, ctx
 	return &resolver, nil
 }
 
-func getSqlStore(cfg *setting.Cfg) (*sqlstore.SQLStore, error) {
-	tracer, err := tracing.ProvideService(cfg)
+func getSqlStore(cfg *setting.Cfg, features featuremgmt.FeatureToggles) (*sqlstore.SQLStore, error) {
+	tracingCfg, err := tracing.ProvideTracingConfig(cfg)
+	if err != nil {
+		return nil, fmt.Errorf("%v: %w", "failed to initialize tracer config", err)
+	}
+
+	tracer, err := tracing.ProvideService(tracingCfg)
 	if err != nil {
 		return nil, fmt.Errorf("%v: %w", "failed to initialize tracer service", err)
 	}
 	bus := bus.ProvideBus(tracer)
-	return sqlstore.ProvideService(cfg, nil, &migrations.OSSMigrations{}, bus, tracer)
+	return sqlstore.ProvideService(cfg, features, &migrations.OSSMigrations{}, bus, tracer)
 }
 
 func runListConflictUsers() func(context *cli.Context) error {
diff --git a/pkg/cmd/grafana-cli/commands/conflict_user_command_test.go b/pkg/cmd/grafana-cli/commands/conflict_user_command_test.go
index d15eb50f49549..3d0f600dc887c 100644
--- a/pkg/cmd/grafana-cli/commands/conflict_user_command_test.go
+++ b/pkg/cmd/grafana-cli/commands/conflict_user_command_test.go
@@ -13,21 +13,23 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
-	"github.com/grafana/grafana/pkg/services/org/orgimpl"
-	"github.com/grafana/grafana/pkg/services/quota/quotatest"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
-	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
 	"github.com/grafana/grafana/pkg/services/team/teamimpl"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/user/userimpl"
 	"github.com/grafana/grafana/pkg/services/user/usertest"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
 // "Skipping conflicting users test for mysql as it does make unique constraint case insensitive by default
 const ignoredDatabase = migrator.MySQL
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestBuildConflictBlock(t *testing.T) {
 	type testBuildConflictBlock struct {
 		desc                string
@@ -563,24 +565,50 @@ func TestRunValidateConflictUserFile(t *testing.T) {
 	t.Run("should validate file thats gets created", func(t *testing.T) {
 		// Restore after destructive operation
 		sqlStore := db.InitTestDB(t)
-		usrSvc := setupTestUserService(t, sqlStore)
 
 		const testOrgID int64 = 1
 		if sqlStore.GetDialect().DriverName() != ignoredDatabase {
 			// add additional user with conflicting login where DOMAIN is upper case
-			dupUserLogincmd := user.CreateUserCommand{
-				Email: "userduplicatetest1@test.com",
-				Login: "user_duplicate_test_1_login",
-				OrgID: testOrgID,
-			}
-			_, err := usrSvc.Create(context.Background(), &dupUserLogincmd)
-			require.NoError(t, err)
-			dupUserEmailcmd := user.CreateUserCommand{
-				Email: "USERDUPLICATETEST1@TEST.COM",
-				Login: "USER_DUPLICATE_TEST_1_LOGIN",
-				OrgID: testOrgID,
-			}
-			_, err = usrSvc.Create(context.Background(), &dupUserEmailcmd)
+			err := sqlStore.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
+				// create a user
+				// add additional user with conflicting login where DOMAIN is upper case
+				dupUserLogincmd := user.CreateUserCommand{
+					Email: "userduplicatetest1@test.com",
+					Login: "user_duplicate_test_1_login",
+					OrgID: testOrgID,
+				}
+				rawSQL := fmt.Sprintf(
+					"INSERT INTO %s (email, login, org_id, version, is_admin, created, updated) VALUES (?,?,?,0,%s,\"2024-03-18T15:25:32\",\"2024-03-18T15:25:32\")",
+					sqlStore.Quote("user"),
+					sqlStore.Dialect.BooleanStr(false),
+				)
+				result, err := sess.Exec(rawSQL, dupUserLogincmd.Email, dupUserLogincmd.Login, dupUserLogincmd.OrgID)
+				if err != nil {
+					return err
+				}
+				n, err := result.RowsAffected()
+				if err != nil {
+					return err
+				} else if n == 0 {
+					return user.ErrUserNotFound
+				}
+				dupUserEmailcmd := user.CreateUserCommand{
+					Email: "USERDUPLICATETEST1@TEST.COM",
+					Login: "USER_DUPLICATE_TEST_1_LOGIN",
+					OrgID: testOrgID,
+				}
+				result, err = sess.Exec(rawSQL, dupUserEmailcmd.Email, dupUserEmailcmd.Login, dupUserEmailcmd.OrgID)
+				if err != nil {
+					return err
+				}
+				n, err = result.RowsAffected()
+				if err != nil {
+					return err
+				} else if n == 0 {
+					return user.ErrUserNotFound
+				}
+				return nil
+			})
 			require.NoError(t, err)
 
 			// get users
@@ -608,34 +636,82 @@ func TestIntegrationMergeUser(t *testing.T) {
 	t.Run("should be able to merge user", func(t *testing.T) {
 		// Restore after destructive operation
 		sqlStore := db.InitTestDB(t)
-		teamSvc := teamimpl.ProvideService(sqlStore, setting.NewCfg())
+		teamSvc, err := teamimpl.ProvideService(sqlStore, setting.NewCfg())
+		require.NoError(t, err)
 		team1, err := teamSvc.CreateTeam("team1 name", "", 1)
-		require.Nil(t, err)
-		usrSvc := setupTestUserService(t, sqlStore)
+		require.NoError(t, err)
 		const testOrgID int64 = 1
 
 		if sqlStore.GetDialect().DriverName() != ignoredDatabase {
 			// add additional user with conflicting login where DOMAIN is upper case
 
-			// the order of adding the conflict matters
-			dupUserLogincmd := user.CreateUserCommand{
-				Email: "userduplicatetest1@test.com",
-				Name:  "user name 1",
-				Login: "user_duplicate_test_1_login",
-				OrgID: testOrgID,
+			err = sqlStore.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
+				// the order of adding the conflict matters
+				cmd := user.User{
+					Email:   "userduplicatetest1@test.com",
+					Name:    "user name 1",
+					Login:   "user_duplicate_test_1_login",
+					OrgID:   testOrgID,
+					Created: time.Now(),
+					Updated: time.Now(),
+				}
+
+				// call user store instead of user service so as not to prevent conflicting users
+				rawSQL := fmt.Sprintf(
+					"INSERT INTO %s (email, login, org_id, version, is_admin, created, updated) VALUES (?,?,?,0,%s,?,?)",
+					sqlStore.Quote("user"),
+					sqlStore.Dialect.BooleanStr(false),
+				)
+				result, err := sess.Exec(rawSQL, cmd.Email, cmd.Login, cmd.OrgID, cmd.Created, cmd.Updated)
+				if err != nil {
+					return err
+				}
+				n, err := result.RowsAffected()
+				if err != nil {
+					return err
+				} else if n == 0 {
+					return user.ErrUserNotFound
+				}
+				require.NoError(t, err)
+				return nil
+			})
+			if err != nil {
+				t.Error(err)
 			}
-			_, err := usrSvc.Create(context.Background(), &dupUserLogincmd)
-			require.NoError(t, err)
-			dupUserEmailcmd := user.CreateUserCommand{
-				Email: "USERDUPLICATETEST1@TEST.COM",
-				Name:  "user name 1",
-				Login: "USER_DUPLICATE_TEST_1_LOGIN",
-				OrgID: testOrgID,
+
+			err = sqlStore.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
+				cmd := user.User{
+					Email:   "USERDUPLICATETEST1@TEST.COM",
+					Name:    "user name 1",
+					Login:   "USER_DUPLICATE_TEST_1_LOGIN",
+					OrgID:   testOrgID,
+					Created: time.Now(),
+					Updated: time.Now(),
+				}
+				// call user store instead of user service so as not to prevent conflicting users
+				rawSQL := fmt.Sprintf(
+					"INSERT INTO %s (email, login, org_id, version, is_admin, created, updated) VALUES (?,?,?,0,%s,?,?)",
+					sqlStore.Quote("user"),
+					sqlStore.Dialect.BooleanStr(false),
+				)
+				result, err := sess.Exec(rawSQL, cmd.Email, cmd.Login, cmd.OrgID, cmd.Created, cmd.Updated)
+				if err != nil {
+					return err
+				}
+				n, err := result.RowsAffected()
+				if err != nil {
+					return err
+				} else if n == 0 {
+					return user.ErrUserNotFound
+				}
+				require.NoError(t, err)
+				return nil
+			})
+			if err != nil {
+				t.Error(err)
 			}
-			userWithUpperCase, err := usrSvc.Create(context.Background(), &dupUserEmailcmd)
-			require.NoError(t, err)
 			// this is the user we want to update to another team
-			err = teamSvc.AddTeamMember(userWithUpperCase.ID, testOrgID, team1.ID, false, 0)
+			err = teamSvc.AddTeamMember(context.Background(), 1, testOrgID, team1.ID, false, 0)
 			require.NoError(t, err)
 
 			// get users
@@ -770,20 +846,40 @@ conflict: test2
 			// Restore after destructive operation
 			sqlStore := db.InitTestDB(t)
 			if sqlStore.GetDialect().DriverName() != ignoredDatabase {
-				userStore := userimpl.ProvideStore(sqlStore, sqlStore.Cfg)
-				for _, u := range tc.users {
-					cmd := user.User{
-						Email:   u.Email,
-						Name:    u.Name,
-						Login:   u.Login,
-						OrgID:   int64(testOrgID),
-						Created: time.Now(),
-						Updated: time.Now(),
+				err := sqlStore.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
+					for _, u := range tc.users {
+						cmd := user.User{
+							Email:   u.Email,
+							Name:    u.Name,
+							Login:   u.Login,
+							OrgID:   int64(testOrgID),
+							Created: time.Now(),
+							Updated: time.Now(),
+						}
+						// call user store instead of user service so as not to prevent conflicting users
+						rawSQL := fmt.Sprintf(
+							"INSERT INTO %s (email, login, org_id, version, is_admin, created, updated) VALUES (?,?,?,0,%s,?,?)",
+							sqlStore.Quote("user"),
+							sqlStore.Dialect.BooleanStr(false),
+						)
+						result, err := sess.Exec(rawSQL, cmd.Email, cmd.Login, cmd.OrgID, cmd.Created, cmd.Updated)
+						if err != nil {
+							return err
+						}
+						n, err := result.RowsAffected()
+						if err != nil {
+							return err
+						} else if n == 0 {
+							return user.ErrUserNotFound
+						}
+						require.NoError(t, err)
 					}
-					// call user store instead of user service so as not to prevent conflicting users
-					_, err := userStore.Insert(context.Background(), &cmd)
-					require.NoError(t, err)
+					return nil
+				})
+				if err != nil {
+					t.Fatal(err)
 				}
+
 				// add additional user with conflicting login where DOMAIN is upper case
 				conflictUsers, err := GetUsersWithConflictingEmailsOrLogins(&cli.Context{Context: context.Background()}, sqlStore)
 				require.NoError(t, err)
@@ -867,13 +963,3 @@ func TestMarshalConflictUser(t *testing.T) {
 		})
 	}
 }
-
-func setupTestUserService(t *testing.T, sqlStore *sqlstore.SQLStore) user.Service {
-	t.Helper()
-	orgSvc, err := orgimpl.ProvideService(sqlStore, sqlStore.Cfg, &quotatest.FakeQuotaService{})
-	require.NoError(t, err)
-	usrSvc, err := userimpl.ProvideService(sqlStore, orgSvc, sqlStore.Cfg, nil, nil, &quotatest.FakeQuotaService{}, supportbundlestest.NewFakeBundleService())
-	require.NoError(t, err)
-
-	return usrSvc
-}
diff --git a/pkg/cmd/grafana-cli/commands/datamigrations/encrypt_datasource_passwords.go b/pkg/cmd/grafana-cli/commands/datamigrations/encrypt_datasource_passwords.go
index 2b244d8beeea9..13519423f8c4b 100644
--- a/pkg/cmd/grafana-cli/commands/datamigrations/encrypt_datasource_passwords.go
+++ b/pkg/cmd/grafana-cli/commands/datamigrations/encrypt_datasource_passwords.go
@@ -27,14 +27,14 @@ var (
 
 // EncryptDatasourcePasswords migrates unencrypted secrets on datasources
 // to the secureJson Column.
-func EncryptDatasourcePasswords(c utils.CommandLine, sqlStore db.DB) error {
+func EncryptDatasourcePasswords(c utils.CommandLine, cfg *setting.Cfg, sqlStore db.DB) error {
 	return sqlStore.WithDbSession(context.Background(), func(session *db.Session) error {
-		passwordsUpdated, err := migrateColumn(session, "password")
+		passwordsUpdated, err := migrateColumn(cfg, session, "password")
 		if err != nil {
 			return err
 		}
 
-		basicAuthUpdated, err := migrateColumn(session, "basic_auth_password")
+		basicAuthUpdated, err := migrateColumn(cfg, session, "basic_auth_password")
 		if err != nil {
 			return err
 		}
@@ -61,7 +61,7 @@ func EncryptDatasourcePasswords(c utils.CommandLine, sqlStore db.DB) error {
 	})
 }
 
-func migrateColumn(session *db.Session, column string) (int, error) {
+func migrateColumn(cfg *setting.Cfg, session *db.Session, column string) (int, error) {
 	var rows []map[string][]byte
 
 	session.Cols("id", column, "secure_json_data")
@@ -74,18 +74,18 @@ func migrateColumn(session *db.Session, column string) (int, error) {
 		return 0, fmt.Errorf("failed to select column: %s: %w", column, err)
 	}
 
-	rowsUpdated, err := updateRows(session, rows, column)
+	rowsUpdated, err := updateRows(cfg, session, rows, column)
 	if err != nil {
 		return rowsUpdated, fmt.Errorf("failed to update column: %s: %w", column, err)
 	}
 	return rowsUpdated, err
 }
 
-func updateRows(session *db.Session, rows []map[string][]byte, passwordFieldName string) (int, error) {
+func updateRows(cfg *setting.Cfg, session *db.Session, rows []map[string][]byte, passwordFieldName string) (int, error) {
 	var rowsUpdated int
 
 	for _, row := range rows {
-		newSecureJSONData, err := getUpdatedSecureJSONData(row, passwordFieldName)
+		newSecureJSONData, err := getUpdatedSecureJSONData(cfg.SecretKey, row, passwordFieldName)
 		if err != nil {
 			return 0, err
 		}
@@ -111,8 +111,8 @@ func updateRows(session *db.Session, rows []map[string][]byte, passwordFieldName
 	return rowsUpdated, nil
 }
 
-func getUpdatedSecureJSONData(row map[string][]byte, passwordFieldName string) (map[string]any, error) {
-	encryptedPassword, err := util.Encrypt(row[passwordFieldName], setting.SecretKey)
+func getUpdatedSecureJSONData(secretKey string, row map[string][]byte, passwordFieldName string) (map[string]any, error) {
+	encryptedPassword, err := util.Encrypt(row[passwordFieldName], secretKey)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/cmd/grafana-cli/commands/datamigrations/encrypt_datasource_passwords_test.go b/pkg/cmd/grafana-cli/commands/datamigrations/encrypt_datasource_passwords_test.go
index 1ba6516cfc47f..d24e0782cabd7 100644
--- a/pkg/cmd/grafana-cli/commands/datamigrations/encrypt_datasource_passwords_test.go
+++ b/pkg/cmd/grafana-cli/commands/datamigrations/encrypt_datasource_passwords_test.go
@@ -12,9 +12,14 @@ import (
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 	"github.com/grafana/grafana/pkg/util"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestPasswordMigrationCommand(t *testing.T) {
 	// setup datasources with password, basic_auth and none
 	store := db.InitTestDB(t)
@@ -38,8 +43,10 @@ func passwordMigration(t *testing.T, session *db.Session, sqlstore db.DB) {
 		ds.Created = time.Now()
 		ds.Updated = time.Now()
 
+		cfg := setting.NewCfg()
+
 		if ds.Name == "elasticsearch" {
-			key, err := util.Encrypt([]byte("value"), setting.SecretKey)
+			key, err := util.Encrypt([]byte("value"), cfg.SecretKey)
 			require.NoError(t, err)
 
 			ds.SecureJsonData = map[string][]byte{"key": key}
@@ -58,7 +65,7 @@ func passwordMigration(t *testing.T, session *db.Session, sqlstore db.DB) {
 	// run migration
 	c, err := commandstest.NewCliContext(map[string]string{})
 	require.Nil(t, err)
-	err = EncryptDatasourcePasswords(c, sqlstore)
+	err = EncryptDatasourcePasswords(c, setting.NewCfg(), sqlstore)
 	require.NoError(t, err)
 
 	// verify that no datasources still have password or basic_auth
@@ -68,7 +75,8 @@ func passwordMigration(t *testing.T, session *db.Session, sqlstore db.DB) {
 	assert.Equal(t, len(dss), 4)
 
 	for _, ds := range dss {
-		sj, err := DecryptSecureJsonData(ds)
+		cfg := setting.NewCfg()
+		sj, err := DecryptSecureJsonData(cfg.SecretKey, ds)
 		require.NoError(t, err)
 
 		if ds.Name == "influxdb" {
@@ -101,10 +109,10 @@ func passwordMigration(t *testing.T, session *db.Session, sqlstore db.DB) {
 	}
 }
 
-func DecryptSecureJsonData(ds *datasources.DataSource) (map[string]string, error) {
+func DecryptSecureJsonData(secretKey string, ds *datasources.DataSource) (map[string]string, error) {
 	decrypted := make(map[string]string)
 	for key, data := range ds.SecureJsonData {
-		decryptedData, err := util.Decrypt(data, setting.SecretKey)
+		decryptedData, err := util.Decrypt(data, secretKey)
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/cmd/grafana-cli/commands/reset_password_command.go b/pkg/cmd/grafana-cli/commands/reset_password_command.go
index c63ef80d814a7..08c8b7edb5700 100644
--- a/pkg/cmd/grafana-cli/commands/reset_password_command.go
+++ b/pkg/cmd/grafana-cli/commands/reset_password_command.go
@@ -18,7 +18,7 @@ import (
 const DefaultAdminUserId = 1
 
 func resetPasswordCommand(c utils.CommandLine, runner server.Runner) error {
-	newPassword := ""
+	var newPassword user.Password
 	adminId := int64(c.Int("user-id"))
 
 	if c.Bool("password-from-stdin") {
@@ -31,9 +31,13 @@ func resetPasswordCommand(c utils.CommandLine, runner server.Runner) error {
 			}
 			return fmt.Errorf("can't read password from stdin")
 		}
-		newPassword = scanner.Text()
+		newPassword = user.Password(scanner.Text())
 	} else {
-		newPassword = c.Args().First()
+		newPassword = user.Password(c.Args().First())
+	}
+
+	if err := newPassword.Validate(runner.Cfg); err != nil {
+		return fmt.Errorf("the new password doesn't meet the password policy criteria")
 	}
 
 	err := resetPassword(adminId, newPassword, runner.UserService)
@@ -44,12 +48,7 @@ func resetPasswordCommand(c utils.CommandLine, runner server.Runner) error {
 	return err
 }
 
-func resetPassword(adminId int64, newPassword string, userSvc user.Service) error {
-	password := user.Password(newPassword)
-	if password.IsWeak() {
-		return fmt.Errorf("new password is too short")
-	}
-
+func resetPassword(adminId int64, newPassword user.Password, userSvc user.Service) error {
 	userQuery := user.GetUserByIDQuery{ID: adminId}
 	usr, err := userSvc.GetByID(context.Background(), &userQuery)
 	if err != nil {
@@ -59,14 +58,14 @@ func resetPassword(adminId int64, newPassword string, userSvc user.Service) erro
 		return ErrMustBeAdmin
 	}
 
-	passwordHashed, err := util.EncodePassword(newPassword, usr.Salt)
+	passwordHashed, err := util.EncodePassword(string(newPassword), usr.Salt)
 	if err != nil {
 		return err
 	}
 
 	cmd := user.ChangeUserPasswordCommand{
 		UserID:      adminId,
-		NewPassword: passwordHashed,
+		NewPassword: user.Password(passwordHashed),
 	}
 
 	if err := userSvc.ChangePassword(context.Background(), &cmd); err != nil {
diff --git a/pkg/cmd/grafana-cli/commands/upgrade_command.go b/pkg/cmd/grafana-cli/commands/upgrade_command.go
index a122f55b2fc42..a0a3ba4500e53 100644
--- a/pkg/cmd/grafana-cli/commands/upgrade_command.go
+++ b/pkg/cmd/grafana-cli/commands/upgrade_command.go
@@ -2,6 +2,7 @@ package commands
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"github.com/fatih/color"
@@ -15,6 +16,9 @@ func upgradeCommand(c utils.CommandLine) error {
 	ctx := context.Background()
 	pluginsDir := c.PluginDirectory()
 	pluginID := c.Args().First()
+	if pluginID == "" {
+		return errors.New("please specify plugin to update")
+	}
 
 	localPlugin, err := services.GetLocalPlugin(pluginsDir, pluginID)
 	if err != nil {
diff --git a/pkg/cmd/grafana-server/commands/buildinfo.go b/pkg/cmd/grafana-server/commands/buildinfo.go
index 96bf7185cdd2f..1051ca520bcce 100644
--- a/pkg/cmd/grafana-server/commands/buildinfo.go
+++ b/pkg/cmd/grafana-server/commands/buildinfo.go
@@ -5,22 +5,23 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/extensions"
-	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
-func setBuildInfo(opts ServerOptions) {
+func getBuildstamp(opts ServerOptions) int64 {
 	buildstampInt64, err := strconv.ParseInt(opts.BuildStamp, 10, 64)
 	if err != nil || buildstampInt64 == 0 {
 		buildstampInt64 = time.Now().Unix()
 	}
+	return buildstampInt64
+}
+
+func SetBuildInfo(opts ServerOptions) {
 	setting.BuildVersion = opts.Version
 	setting.BuildCommit = opts.Commit
 	setting.EnterpriseBuildCommit = opts.EnterpriseCommit
-	setting.BuildStamp = buildstampInt64
+	setting.BuildStamp = getBuildstamp(opts)
 	setting.BuildBranch = opts.BuildBranch
 	setting.IsEnterprise = extensions.IsEnterprise
 	setting.Packaging = validPackaging(Packaging)
-
-	metrics.SetBuildInformation(opts.Version, opts.Commit, opts.BuildBranch, buildstampInt64)
 }
diff --git a/pkg/cmd/grafana-server/commands/cli.go b/pkg/cmd/grafana-server/commands/cli.go
index 37ff71f7c7669..313991db61394 100644
--- a/pkg/cmd/grafana-server/commands/cli.go
+++ b/pkg/cmd/grafana-server/commands/cli.go
@@ -11,15 +11,16 @@ import (
 	"syscall"
 	"time"
 
+	_ "github.com/grafana/pyroscope-go/godeltaprof/http/pprof"
+
 	"github.com/urfave/cli/v2"
 
 	"github.com/grafana/grafana/pkg/api"
 	gcli "github.com/grafana/grafana/pkg/cmd/grafana-cli/commands"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/infra/process"
 	"github.com/grafana/grafana/pkg/server"
-	_ "github.com/grafana/grafana/pkg/services/alerting/conditions"
-	_ "github.com/grafana/grafana/pkg/services/alerting/notifiers"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
@@ -97,7 +98,7 @@ func RunServer(opts ServerOptions) error {
 		}
 	}()
 
-	setBuildInfo(opts)
+	SetBuildInfo(opts)
 	checkPrivileges()
 
 	configOptions := strings.Split(ConfigOverrides, " ")
@@ -111,6 +112,8 @@ func RunServer(opts ServerOptions) error {
 		return err
 	}
 
+	metrics.SetBuildInformation(metrics.ProvideRegisterer(), opts.Version, opts.Commit, opts.BuildBranch, getBuildstamp(opts))
+
 	s, err := server.Initialize(
 		cfg,
 		server.Options{
diff --git a/pkg/cmd/grafana-server/commands/target.go b/pkg/cmd/grafana-server/commands/target.go
index 5843927a4c1b3..6293eb78bcddd 100644
--- a/pkg/cmd/grafana-server/commands/target.go
+++ b/pkg/cmd/grafana-server/commands/target.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/api"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/server"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -74,7 +75,7 @@ func RunTargetServer(opts ServerOptions) error {
 		}
 	}()
 
-	setBuildInfo(opts)
+	SetBuildInfo(opts)
 	checkPrivileges()
 
 	configOptions := strings.Split(ConfigOverrides, " ")
@@ -88,6 +89,8 @@ func RunTargetServer(opts ServerOptions) error {
 		return err
 	}
 
+	metrics.SetBuildInformation(metrics.ProvideRegisterer(), opts.Version, opts.Commit, opts.BuildBranch, getBuildstamp(opts))
+
 	s, err := server.InitializeModuleServer(
 		cfg,
 		server.Options{
diff --git a/pkg/cmd/grafana/apiserver/apiserver.md b/pkg/cmd/grafana/apiserver/apiserver.md
new file mode 100644
index 0000000000000..41fe0362570ff
--- /dev/null
+++ b/pkg/cmd/grafana/apiserver/apiserver.md
@@ -0,0 +1,60 @@
+# grafana apiserver (standalone)
+
+The example-apiserver closely resembles the
+[sample-apiserver](https://github.com/kubernetes/sample-apiserver/tree/master) project in code and thus
+allows the same
+[CLI flags](https://kubernetes.io/docs/reference/command-line-tools-reference/kube-apiserver/) as kube-apiserver.
+It is currently used for testing our deployment pipelines for aggregated servers. You can optionally omit the
+aggregation path altogether and just run this example apiserver as a standalone process.
+
+## Standalone Mode
+
+### Usage
+
+For setting `--grafana.authn.signing-keys-url`, Grafana must be run with `idForwarding = true` while also ensuring
+you have logged in to the instance at least once.
+
+```shell
+go run ./pkg/cmd/grafana apiserver \
+  --runtime-config=example.grafana.app/v0alpha1=true \
+  --grafana-apiserver-dev-mode \
+  --grafana.authn.signing-keys-url="http://localhost:3000/api/signing-keys/keys" \
+  --verbosity 10 \
+  --secure-port 7443
+```
+
+### Verify that all works
+
+In dev mode, the standalone server's loopback kubeconfig is written to `./data/grafana-apiserver/apiserver.kubeconfig`.
+
+```shell
+export KUBECONFIG=./data/grafana-apiserver/apiserver.kubeconfig
+
+kubectl api-resources
+NAME      SHORTNAMES   APIVERSION                     NAMESPACED   KIND
+dummy                  example.grafana.app/v0alpha1   true         DummyResource
+runtime                example.grafana.app/v0alpha1   false        RuntimeInfo
+```
+
+### Observability
+
+Logs, metrics and traces are supported. See `--grafana.log.*`, `--grafana.metrics.*` and `--grafana.tracing.*` flags for details.
+
+```shell
+go run ./pkg/cmd/grafana apiserver \
+  --runtime-config=example.grafana.app/v0alpha1=true \
+  --help
+```
+
+For example, to enable debug logs, metrics and traces (using [self-instrumentation](../../../../devenv/docker/blocks/self-instrumentation/readme.md)) use the following:
+
+```shell
+go run ./pkg/cmd/grafana apiserver \
+  --runtime-config=example.grafana.app/v0alpha1=true \
+  --secure-port=7443 \
+  --grafana.log.level=debug \
+  --verbosity=10 \
+  --grafana.metrics.enable \
+  --grafana.tracing.jaeger.address=http://localhost:14268/api/traces \
+  --grafana.tracing.sampler-param=1
+```
diff --git a/pkg/cmd/grafana/apiserver/auth/tokenAuthenticator.go b/pkg/cmd/grafana/apiserver/auth/tokenAuthenticator.go
new file mode 100644
index 0000000000000..a4ad277ab607b
--- /dev/null
+++ b/pkg/cmd/grafana/apiserver/auth/tokenAuthenticator.go
@@ -0,0 +1,71 @@
+package auth
+
+import (
+	"net/http"
+	"strings"
+
+	"github.com/grafana/authlib/authn"
+	"k8s.io/apiserver/pkg/authentication/authenticator"
+	"k8s.io/apiserver/pkg/authentication/user"
+)
+
+const (
+	headerKeyAccessToken = "X-Access-Token"
+	headerKeyGrafanaID   = "X-Grafana-Id"
+
+	extraKeyAccessToken = "access-token"
+	extraKeyGrafanaID   = "id-token"
+	extraKeyGLSA        = "glsa"
+)
+
+func NewAccessTokenAuthenticator(config *authn.IDVerifierConfig) authenticator.RequestFunc {
+	verifier := authn.NewVerifier[CustomClaims](authn.IDVerifierConfig{
+		SigningKeysURL:   config.SigningKeysURL,
+		AllowedAudiences: config.AllowedAudiences,
+	})
+	return getAccessTokenAuthenticatorFunc(&TokenValidator{verifier})
+}
+
+func getAccessTokenAuthenticatorFunc(validator *TokenValidator) authenticator.RequestFunc {
+	return func(req *http.Request) (*authenticator.Response, bool, error) {
+		accessToken := req.Header.Get(headerKeyAccessToken)
+		if accessToken == "" {
+			return nil, false, nil
+		}
+
+		// While the authn token system is in development, we can temporarily use
+		// service account tokens.  Note this does not grant any real permissions/verification,
+		// it simply allows forwarding the token to the next request
+		if strings.HasPrefix(accessToken, "glsa_") {
+			return &authenticator.Response{
+				Audiences: authenticator.Audiences([]string{}),
+				User: &user.DefaultInfo{
+					Name:   "glsa-forwarding-request",
+					UID:    "",
+					Groups: []string{},
+					Extra: map[string][]string{
+						extraKeyGLSA: {accessToken},
+					},
+				},
+			}, true, nil
+		}
+
+		result, err := validator.Validate(req.Context(), accessToken)
+		if err != nil {
+			return nil, false, err
+		}
+
+		return &authenticator.Response{
+			Audiences: authenticator.Audiences(result.Claims.Audience),
+			User: &user.DefaultInfo{
+				Name:   result.Subject,
+				UID:    "",
+				Groups: []string{},
+				Extra: map[string][]string{
+					extraKeyAccessToken: {accessToken},
+					extraKeyGrafanaID:   {req.Header.Get("X-Grafana-Id")}, // this may exist if starting with a user
+				},
+			},
+		}, true, nil
+	}
+}
diff --git a/pkg/cmd/grafana/apiserver/auth/util.go b/pkg/cmd/grafana/apiserver/auth/util.go
new file mode 100644
index 0000000000000..a6c791c807a76
--- /dev/null
+++ b/pkg/cmd/grafana/apiserver/auth/util.go
@@ -0,0 +1,57 @@
+package auth
+
+import (
+	"context"
+	"fmt"
+
+	"k8s.io/apiserver/pkg/authentication/authenticator"
+	"k8s.io/apiserver/pkg/authentication/request/union"
+	"k8s.io/apiserver/pkg/endpoints/request"
+)
+
+func AppendToAuthenticators(newAuthenticator authenticator.RequestFunc, authRequestHandlers ...authenticator.Request) authenticator.Request {
+	handlers := append([]authenticator.Request{newAuthenticator}, authRequestHandlers...)
+	return union.New(handlers...)
+}
+
+// Get tokens that can be forwarded to the next service
+// In the future this will need to create new tokens with a new audience
+func GetIDForwardingAuthHeaders(ctx context.Context) (map[string]string, error) {
+	user, ok := request.UserFrom(ctx)
+	if !ok {
+		return nil, fmt.Errorf("missing user")
+	}
+
+	getter := func(key string) string {
+		vals, ok := user.GetExtra()[key]
+		if ok && len(vals) == 1 {
+			return vals[0]
+		}
+		return ""
+	}
+
+	token := getter(extraKeyGLSA)
+	if token != "" {
+		// Service account tokens get forwarded as auth tokens
+		// this lets us keep testing the workflows while the ID token system is in dev
+		return map[string]string{
+			"Authorization": "Bearer " + token,
+		}, nil
+	}
+
+	accessToken := getter(extraKeyAccessToken)
+	if accessToken == "" {
+		return nil, fmt.Errorf("missing access token in user info")
+	}
+
+	idToken := getter(extraKeyGrafanaID)
+	if idToken != "" {
+		return map[string]string{
+			headerKeyAccessToken: accessToken,
+			headerKeyGrafanaID:   idToken,
+		}, nil
+	}
+	return map[string]string{
+		headerKeyAccessToken: accessToken,
+	}, nil
+}
diff --git a/pkg/cmd/grafana/apiserver/auth/validator.go b/pkg/cmd/grafana/apiserver/auth/validator.go
new file mode 100644
index 0000000000000..394874b01c061
--- /dev/null
+++ b/pkg/cmd/grafana/apiserver/auth/validator.go
@@ -0,0 +1,24 @@
+package auth
+
+import (
+	"context"
+
+	"github.com/grafana/authlib/authn"
+)
+
+type CustomClaims struct {
+	// Nothing yet
+}
+
+type TokenValidator struct {
+	verifier authn.Verifier[CustomClaims]
+}
+
+func (v *TokenValidator) Validate(ctx context.Context, token string) (*authn.Claims[CustomClaims], error) {
+	customClaims, err := v.verifier.Verify(ctx, token)
+	if err != nil {
+		return nil, err
+	}
+
+	return customClaims, nil
+}
diff --git a/pkg/cmd/grafana/apiserver/cmd.go b/pkg/cmd/grafana/apiserver/cmd.go
new file mode 100644
index 0000000000000..cb3530b7c2cb2
--- /dev/null
+++ b/pkg/cmd/grafana/apiserver/cmd.go
@@ -0,0 +1,116 @@
+package apiserver
+
+import (
+	"os"
+
+	"github.com/spf13/cobra"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+	"k8s.io/component-base/cli"
+
+	"github.com/grafana/grafana/pkg/cmd/grafana-server/commands"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/server"
+	"github.com/grafana/grafana/pkg/services/apiserver/standalone"
+)
+
+func newCommandStartExampleAPIServer(o *APIServerOptions, stopCh <-chan struct{}) *cobra.Command {
+	devAcknowledgementNotice := "The apiserver command is in heavy development. The entire setup is subject to change without notice"
+	runtimeConfig := ""
+
+	factory, err := server.InitializeAPIServerFactory()
+	if err != nil {
+		return nil
+	}
+	o.factory = factory
+
+	cmd := &cobra.Command{
+		Use:   "apiserver [api group(s)]",
+		Short: "Run the grafana apiserver",
+		Long: "Run a standalone kubernetes based apiserver that can be aggregated by a root apiserver. " +
+			devAcknowledgementNotice,
+		Example: "grafana apiserver --runtime-config=example.grafana.app/v0alpha1=true",
+		RunE: func(c *cobra.Command, args []string) error {
+			if err := log.SetupConsoleLogger("debug"); err != nil {
+				return nil
+			}
+
+			if err := o.Validate(); err != nil {
+				return err
+			}
+
+			runtime, err := standalone.ReadRuntimeConfig(runtimeConfig)
+			if err != nil {
+				return err
+			}
+			apis, err := o.factory.GetEnabled(runtime)
+			if err != nil {
+				return err
+			}
+
+			// Currently TracingOptions.ApplyTo, which will configure/initialize tracing,
+			// happens after loadAPIGroupBuilders. Hack to workaround this for now to allow
+			// the tracer to be initialized at a later stage, when tracer is available.
+			// TODO: Fix so that TracingOptions.ApplyTo happens before or during loadAPIGroupBuilders.
+			tracer := newLateInitializedTracingService()
+
+			// Load each group from the args
+			if err := o.loadAPIGroupBuilders(tracer, apis); err != nil {
+				return err
+			}
+
+			// Finish the config (a noop for now)
+			if err := o.Complete(); err != nil {
+				return err
+			}
+
+			config, err := o.Config()
+			if err != nil {
+				return err
+			}
+
+			if o.Options.TracingOptions.TracingService != nil {
+				tracer.InitTracer(o.Options.TracingOptions.TracingService)
+			}
+
+			if err := o.RunAPIServer(config, stopCh); err != nil {
+				return err
+			}
+
+			return nil
+		},
+	}
+
+	cmd.Flags().StringVar(&runtimeConfig, "runtime-config", "", "A set of key=value pairs that enable or disable built-in APIs.")
+
+	o.AddFlags(cmd.Flags())
+
+	return cmd
+}
+
+func RunCLI(opts commands.ServerOptions) int {
+	stopCh := genericapiserver.SetupSignalHandler()
+
+	commands.SetBuildInfo(opts)
+
+	options := newAPIServerOptions(os.Stdout, os.Stderr)
+	cmd := newCommandStartExampleAPIServer(options, stopCh)
+
+	return cli.Run(cmd)
+}
+
+type lateInitializedTracingService struct {
+	tracing.Tracer
+}
+
+func newLateInitializedTracingService() *lateInitializedTracingService {
+	return &lateInitializedTracingService{
+		Tracer: tracing.InitializeTracerForTest(),
+	}
+}
+
+func (s *lateInitializedTracingService) InitTracer(tracer tracing.Tracer) {
+	s.Tracer = tracer
+}
+
+var _ tracing.Tracer = &lateInitializedTracingService{}
diff --git a/pkg/cmd/grafana/apiserver/deploy/aggregator-test/apiservice.yaml b/pkg/cmd/grafana/apiserver/deploy/aggregator-test/apiservice.yaml
new file mode 100644
index 0000000000000..65cc2a5884a59
--- /dev/null
+++ b/pkg/cmd/grafana/apiserver/deploy/aggregator-test/apiservice.yaml
@@ -0,0 +1,15 @@
+---
+apiVersion: apiregistration.k8s.io/v1
+kind: APIService
+metadata:
+  name: v0alpha1.example.grafana.app
+spec:
+  version: v0alpha1
+  insecureSkipTLSVerify: true
+  group: example.grafana.app
+  groupPriorityMinimum: 1000
+  versionPriority: 15
+  service:
+    name: example-apiserver
+    namespace: grafana
+    port: 7443
diff --git a/pkg/cmd/grafana/apiserver/deploy/aggregator-test/externalname.yaml b/pkg/cmd/grafana/apiserver/deploy/aggregator-test/externalname.yaml
new file mode 100644
index 0000000000000..75009779106e2
--- /dev/null
+++ b/pkg/cmd/grafana/apiserver/deploy/aggregator-test/externalname.yaml
@@ -0,0 +1,8 @@
+apiVersion: service.grafana.app/v0alpha1
+kind: ExternalName
+metadata:
+  name: example-apiserver
+  namespace: grafana
+spec:
+  host: localhost
+
diff --git a/pkg/cmd/grafana/apiserver/deploy/aggregator-test/kustomization.yaml b/pkg/cmd/grafana/apiserver/deploy/aggregator-test/kustomization.yaml
new file mode 100644
index 0000000000000..15829bf3c27b7
--- /dev/null
+++ b/pkg/cmd/grafana/apiserver/deploy/aggregator-test/kustomization.yaml
@@ -0,0 +1,3 @@
+resources:
+  - apiservice.yaml
+  - externalname.yaml
diff --git a/pkg/cmd/grafana/apiserver/server.go b/pkg/cmd/grafana/apiserver/server.go
new file mode 100644
index 0000000000000..4c0251a141c16
--- /dev/null
+++ b/pkg/cmd/grafana/apiserver/server.go
@@ -0,0 +1,182 @@
+package apiserver
+
+import (
+	"fmt"
+	"io"
+	"net"
+	"path"
+
+	"github.com/spf13/pflag"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+	"k8s.io/client-go/tools/clientcmd"
+	netutils "k8s.io/utils/net"
+
+	"github.com/grafana/grafana/pkg/apiserver/builder"
+	"github.com/grafana/grafana/pkg/cmd/grafana/apiserver/auth"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/tracing"
+	grafanaAPIServer "github.com/grafana/grafana/pkg/services/apiserver"
+	"github.com/grafana/grafana/pkg/services/apiserver/standalone"
+	standaloneoptions "github.com/grafana/grafana/pkg/services/apiserver/standalone/options"
+	"github.com/grafana/grafana/pkg/services/apiserver/utils"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+const (
+	dataPath = "data/grafana-apiserver" // same as grafana core
+)
+
+// APIServerOptions contains the state for the apiserver
+type APIServerOptions struct {
+	factory      standalone.APIServerFactory
+	builders     []builder.APIGroupBuilder
+	Options      *standaloneoptions.Options
+	AlternateDNS []string
+	logger       log.Logger
+
+	StdOut io.Writer
+	StdErr io.Writer
+}
+
+func newAPIServerOptions(out, errOut io.Writer) *APIServerOptions {
+	logger := log.New("grafana-apiserver")
+
+	return &APIServerOptions{
+		logger:  logger,
+		StdOut:  out,
+		StdErr:  errOut,
+		Options: standaloneoptions.New(logger, grafanaAPIServer.Codecs.LegacyCodec()),
+	}
+}
+
+func (o *APIServerOptions) loadAPIGroupBuilders(tracer tracing.Tracer, apis []schema.GroupVersion) error {
+	o.builders = []builder.APIGroupBuilder{}
+	for _, gv := range apis {
+		api, err := o.factory.MakeAPIServer(tracer, gv)
+		if err != nil {
+			return err
+		}
+		o.builders = append(o.builders, api)
+	}
+
+	if len(o.builders) < 1 {
+		return fmt.Errorf("no apis matched ")
+	}
+
+	// Install schemas
+	for _, b := range o.builders {
+		if err := b.InstallSchema(grafanaAPIServer.Scheme); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (o *APIServerOptions) Config() (*genericapiserver.RecommendedConfig, error) {
+	if err := o.Options.RecommendedOptions.SecureServing.MaybeDefaultWithSelfSignedCerts(
+		"localhost", o.AlternateDNS, []net.IP{netutils.ParseIPSloppy("127.0.0.1")},
+	); err != nil {
+		return nil, fmt.Errorf("error creating self-signed certificates: %v", err)
+	}
+
+	o.Options.RecommendedOptions.Authentication.RemoteKubeConfigFileOptional = true
+
+	// TODO: determine authorization, currently insecure because Authorization provided by recommended options doesn't work
+	// reason: an aggregated server won't be able to post subjectaccessreviews (Grafana doesn't have this kind)
+	// exact error: the server could not find the requested resource (post subjectaccessreviews.authorization.k8s.io)
+	o.Options.RecommendedOptions.Authorization = nil
+
+	o.Options.RecommendedOptions.Admission = nil
+	o.Options.RecommendedOptions.Etcd = nil
+
+	if o.Options.RecommendedOptions.CoreAPI.CoreAPIKubeconfigPath == "" {
+		o.Options.RecommendedOptions.CoreAPI = nil
+	}
+
+	serverConfig := genericapiserver.NewRecommendedConfig(grafanaAPIServer.Codecs)
+
+	if err := o.Options.ApplyTo(serverConfig); err != nil {
+		return nil, fmt.Errorf("failed to apply options to server config: %w", err)
+	}
+
+	// When the ID signing key exists, configure access-token support
+	if len(o.Options.AuthnOptions.IDVerifierConfig.SigningKeysURL) > 0 {
+		serverConfig.Authentication.Authenticator = auth.AppendToAuthenticators(
+			auth.NewAccessTokenAuthenticator(o.Options.AuthnOptions.IDVerifierConfig),
+			serverConfig.Authentication.Authenticator,
+		)
+	}
+
+	serverConfig.DisabledPostStartHooks = serverConfig.DisabledPostStartHooks.Insert("generic-apiserver-start-informers")
+	serverConfig.DisabledPostStartHooks = serverConfig.DisabledPostStartHooks.Insert("priority-and-fairness-config-consumer")
+
+	// Add OpenAPI specs for each group+version
+	err := builder.SetupConfig(
+		grafanaAPIServer.Scheme,
+		serverConfig,
+		o.builders,
+		setting.BuildStamp,
+		setting.BuildVersion,
+		setting.BuildCommit,
+		setting.BuildBranch,
+	)
+	return serverConfig, err
+}
+
+func (o *APIServerOptions) AddFlags(fs *pflag.FlagSet) {
+	o.Options.AddFlags(fs)
+
+	if factoryOptions := o.factory.GetOptions(); factoryOptions != nil {
+		factoryOptions.AddFlags(fs)
+	}
+}
+
+// Validate validates APIServerOptions
+func (o *APIServerOptions) Validate() error {
+	errors := make([]error, 0)
+
+	if factoryOptions := o.factory.GetOptions(); factoryOptions != nil {
+		errors = append(errors, factoryOptions.ValidateOptions()...)
+	}
+
+	if errs := o.Options.Validate(); len(errs) > 0 {
+		errors = append(errors, errors...)
+	}
+
+	return utilerrors.NewAggregate(errors)
+}
+
+// Complete fills in fields required to have valid data
+func (o *APIServerOptions) Complete() error {
+	return nil
+}
+
+func (o *APIServerOptions) RunAPIServer(config *genericapiserver.RecommendedConfig, stopCh <-chan struct{}) error {
+	delegationTarget := genericapiserver.NewEmptyDelegate()
+	completedConfig := config.Complete()
+
+	server, err := completedConfig.New("standalone-apiserver", delegationTarget)
+	if err != nil {
+		return err
+	}
+
+	// Install the API Group+version
+	err = builder.InstallAPIs(grafanaAPIServer.Scheme, grafanaAPIServer.Codecs, server, config.RESTOptionsGetter, o.builders, true)
+	if err != nil {
+		return err
+	}
+
+	// write the local config to disk
+	if o.Options.ExtraOptions.DevMode {
+		if err = clientcmd.WriteToFile(
+			utils.FormatKubeConfig(server.LoopbackClientConfig),
+			path.Join(dataPath, "apiserver.kubeconfig"),
+		); err != nil {
+			return err
+		}
+	}
+
+	return server.PrepareRun().Run(stopCh)
+}
diff --git a/pkg/cmd/grafana/main.go b/pkg/cmd/grafana/main.go
index 48ba9586f4f0e..e9003dd078a5a 100644
--- a/pkg/cmd/grafana/main.go
+++ b/pkg/cmd/grafana/main.go
@@ -9,6 +9,7 @@ import (
 
 	gcli "github.com/grafana/grafana/pkg/cmd/grafana-cli/commands"
 	gsrv "github.com/grafana/grafana/pkg/cmd/grafana-server/commands"
+	"github.com/grafana/grafana/pkg/cmd/grafana/apiserver"
 )
 
 // The following variables cannot be constants, since they can be overridden through the -X link flag
@@ -19,7 +20,18 @@ var buildBranch = "main"
 var buildstamp string
 
 func main() {
-	app := &cli.App{
+	app := MainApp()
+
+	if err := app.Run(os.Args); err != nil {
+		fmt.Printf("%s: %s %s\n", color.RedString("Error"), color.RedString("✗"), err)
+		os.Exit(1)
+	}
+
+	os.Exit(0)
+}
+
+func MainApp() *cli.App {
+	return &cli.App{
 		Name:  "grafana",
 		Usage: "Grafana server and command line interface",
 		Authors: []*cli.Author{
@@ -32,17 +44,29 @@ func main() {
 		Commands: []*cli.Command{
 			gcli.CLICommand(version),
 			gsrv.ServerCommand(version, commit, enterpriseCommit, buildBranch, buildstamp),
+			{
+				// The kubernetes standalone apiserver service runner
+				Name:  "apiserver",
+				Usage: "run a standalone api service (experimental)",
+				// Skip parsing flags because the command line is actually managed by cobra
+				SkipFlagParsing: true,
+				Action: func(context *cli.Context) error {
+					// exit here because apiserver handles its own error output
+					os.Exit(apiserver.RunCLI(gsrv.ServerOptions{
+						Version:          version,
+						Commit:           commit,
+						EnterpriseCommit: enterpriseCommit,
+						BuildBranch:      buildBranch,
+						BuildStamp:       buildstamp,
+						Context:          context,
+					}))
+					return nil
+				},
+			},
 		},
 		CommandNotFound:      cmdNotFound,
 		EnableBashCompletion: true,
 	}
-
-	if err := app.Run(os.Args); err != nil {
-		fmt.Printf("%s: %s %s\n", color.RedString("Error"), color.RedString("✗"), err)
-		os.Exit(1)
-	}
-
-	os.Exit(0)
 }
 
 func cmdNotFound(c *cli.Context, command string) {
diff --git a/pkg/cmd/grafana/main_test.go b/pkg/cmd/grafana/main_test.go
new file mode 100644
index 0000000000000..0ec0d98064359
--- /dev/null
+++ b/pkg/cmd/grafana/main_test.go
@@ -0,0 +1,16 @@
+package main
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestMainApp_NoDuplicateSubcommands(t *testing.T) {
+	app := MainApp()
+	found := map[string]bool{}
+	for _, cmd := range app.Commands {
+		require.False(t, found[cmd.Name], "command %q registered twice", cmd.Name)
+		found[cmd.Name] = true
+	}
+}
diff --git a/pkg/codegen/generators.go b/pkg/codegen/generators.go
index f4558c48ba7e2..35cee5de1cad5 100644
--- a/pkg/codegen/generators.go
+++ b/pkg/codegen/generators.go
@@ -5,28 +5,14 @@ import (
 	"fmt"
 	"path/filepath"
 
+	"cuelang.org/go/cue"
 	"github.com/grafana/codejen"
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema"
 )
 
-type OneToOne codejen.OneToOne[kindsys.Kind]
-type OneToMany codejen.OneToMany[kindsys.Kind]
-type ManyToOne codejen.ManyToOne[kindsys.Kind]
-type ManyToMany codejen.ManyToMany[kindsys.Kind]
-
-// ForLatestSchema returns a [SchemaForGen] for the latest schema in the
-// provided [kindsys.Kind]'s lineage.
-//
-// TODO this will be replaced by thema-native constructs
-func ForLatestSchema(k kindsys.Kind) SchemaForGen {
-	comm := k.Props().Common()
-	return SchemaForGen{
-		Name:    comm.Name,
-		Schema:  k.Lineage().Latest(),
-		IsGroup: comm.LineageIsGroup,
-	}
-}
+type OneToOne codejen.OneToOne[SchemaForGen]
+type OneToMany codejen.OneToMany[SchemaForGen]
+type ManyToOne codejen.ManyToOne[SchemaForGen]
+type ManyToMany codejen.ManyToMany[SchemaForGen]
 
 // SlashHeaderMapper produces a FileMapper that injects a comment header onto
 // a [codejen.File] indicating the main generator that produced it (via the provided
@@ -59,16 +45,10 @@ func SlashHeaderMapper(maingen string) codejen.FileMapper {
 	}
 }
 
-// SchemaForGen is an intermediate values type for jennies that holds both a thema.Schema,
-// and values relevant to generating the schema that should properly, eventually, be in
-// thema itself.
-//
-// TODO this will be replaced by thema-native constructs
 type SchemaForGen struct {
-	// The PascalCase name of the schematized type.
-	Name string
-	// The schema to be rendered for the type itself.
-	Schema thema.Schema
-	// Whether the schema is grouped. See https://github.com/grafana/thema/issues/62
-	IsGroup bool
+	Name       string
+	CueFile    cue.Value
+	FilePath   string
+	IsGroup    bool
+	OutputName string // Some TS output files are capitalised and others not.
 }
diff --git a/pkg/codegen/generators/decorators.go b/pkg/codegen/generators/decorators.go
new file mode 100644
index 0000000000000..5d9500f6a54c1
--- /dev/null
+++ b/pkg/codegen/generators/decorators.go
@@ -0,0 +1,282 @@
+package generators
+
+import (
+	"fmt"
+	"regexp"
+	"strings"
+	"unicode"
+
+	"github.com/dave/dst"
+	"github.com/dave/dst/dstutil"
+)
+
+// depointerizer returns an AST manipulator that removes redundant
+// pointer indirection from the defined types.
+func depointerizer() dstutil.ApplyFunc {
+	return func(c *dstutil.Cursor) bool {
+		switch x := c.Node().(type) {
+		case *dst.Field:
+			if s, is := x.Type.(*dst.StarExpr); is {
+				switch deref := depoint(s).(type) {
+				case *dst.ArrayType, *dst.MapType:
+					x.Type = deref
+				}
+			}
+		}
+		return true
+	}
+}
+
+func depoint(e dst.Expr) dst.Expr {
+	if star, is := e.(*dst.StarExpr); is {
+		return star.X
+	}
+	return e
+}
+
+func setStar(e dst.Expr) string {
+	if _, is := e.(*dst.StarExpr); is {
+		return "*"
+	}
+	return ""
+}
+
+func fixTODOComments() dstutil.ApplyFunc {
+	return func(cursor *dstutil.Cursor) bool {
+		switch f := cursor.Node().(type) {
+		case *dst.File:
+			for _, d := range f.Decls {
+				if isTypeSpec(d) {
+					removeGoFieldComment(d.Decorations().Start.All())
+				}
+				fixTODOComment(d.Decorations().Start.All())
+			}
+		case *dst.Field:
+			if len(f.Names) > 0 {
+				removeGoFieldComment(f.Decorations().Start.All())
+			}
+		}
+
+		return true
+	}
+}
+
+func fixTODOComment(comments []string) {
+	todoRegex := regexp.MustCompile("(//) (.*) (TODO.*)")
+	if len(comments) > 0 {
+		comments[0] = todoRegex.ReplaceAllString(comments[0], "$1 $3")
+	}
+}
+
+func removeGoFieldComment(comments []string) {
+	todoRegex := regexp.MustCompile("(//) ([A-Z].*?) ([A-Z]?.*?) (.*)")
+	if len(comments) > 0 {
+		matches := todoRegex.FindAllStringSubmatch(comments[0], -1)
+		if len(matches) > 0 {
+			if strings.EqualFold(matches[0][3], matches[0][2]) {
+				comments[0] = fmt.Sprintf("%s %s %s", matches[0][1], matches[0][3], matches[0][4])
+			} else {
+				r := []rune(matches[0][3])
+				if !unicode.IsLower(r[0]) {
+					comments[0] = fmt.Sprintf("%s %s %s", matches[0][1], matches[0][3], matches[0][4])
+				}
+			}
+		}
+	}
+}
+
+func isTypeSpec(d dst.Decl) bool {
+	gd, ok := d.(*dst.GenDecl)
+	if !ok {
+		return false
+	}
+
+	_, is := gd.Specs[0].(*dst.TypeSpec)
+	return is
+}
+
+// It fixes the "generic" fields. It happens when a value in cue could be different structs.
+// For Go it generates a struct with a json.RawMessage field inside and multiple functions to map it between the different possibilities.
+func fixRawData() dstutil.ApplyFunc {
+	return func(c *dstutil.Cursor) bool {
+		f, is := c.Node().(*dst.File)
+		if !is {
+			return false
+		}
+
+		rawFields := make(map[string]bool)
+		existingRawFields := make(map[string]bool)
+		for _, decl := range f.Decls {
+			switch x := decl.(type) {
+			// Find the structs that only contains one json.RawMessage inside
+			case *dst.GenDecl:
+				for _, t := range x.Specs {
+					if ts, ok := t.(*dst.TypeSpec); ok {
+						if tp, ok := ts.Type.(*dst.StructType); ok && len(tp.Fields.List) == 1 {
+							if fn, ok := tp.Fields.List[0].Type.(*dst.SelectorExpr); ok {
+								if fmt.Sprintf("%s.%s", fn.X, fn.Sel.Name) == "json.RawMessage" {
+									rawFields[ts.Name.Name] = true
+								}
+							}
+						}
+					}
+				}
+			// Find the functions of the previous structs to verify that are the ones that we are looking for.
+			case *dst.FuncDecl:
+				for _, recv := range x.Recv.List {
+					fnType := depoint(recv.Type).(*dst.Ident).Name
+					if rawFields[fnType] {
+						existingRawFields[fnType] = true
+					}
+				}
+			}
+		}
+
+		dstutil.Apply(f, func(c *dstutil.Cursor) bool {
+			switch x := c.Node().(type) {
+			// Delete the functions
+			case *dst.FuncDecl:
+				c.Delete()
+			case *dst.GenDecl:
+				// Deletes all "generics" generated for these json.RawMessage structs
+				comments := x.Decorations().Start.All()
+				if len(comments) > 0 {
+					if strings.HasSuffix(comments[0], "defines model for .") {
+						c.Delete()
+					}
+				}
+				for _, spec := range x.Specs {
+					if tp, ok := spec.(*dst.TypeSpec); ok {
+						// Delete structs with only json.RawMessage
+						if existingRawFields[tp.Name.Name] && tp.Name.Name != "MetricAggregation2" {
+							c.Delete()
+							continue
+						}
+						// Set types that was using these structs as interface{}
+						if st, ok := tp.Type.(*dst.StructType); ok {
+							iterateStruct(st, withoutRawData(existingRawFields))
+						}
+						if mt, ok := tp.Type.(*dst.MapType); ok {
+							iterateMap(mt, withoutRawData(existingRawFields))
+						}
+						if at, ok := tp.Type.(*dst.ArrayType); ok {
+							iterateArray(at, withoutRawData(existingRawFields))
+						}
+					}
+				}
+			}
+			return true
+		}, nil)
+
+		return true
+	}
+}
+
+// Fixes type name containing underscores in the generated Go files
+func fixUnderscoreInTypeName() dstutil.ApplyFunc {
+	return func(c *dstutil.Cursor) bool {
+		switch x := c.Node().(type) {
+		case *dst.GenDecl:
+			if specs, isType := x.Specs[0].(*dst.TypeSpec); isType {
+				if strings.Contains(specs.Name.Name, "_") {
+					oldName := specs.Name.Name
+					specs.Name.Name = strings.ReplaceAll(specs.Name.Name, "_", "")
+					x.Decs.Start[0] = strings.ReplaceAll(x.Decs.Start[0], oldName, specs.Name.Name)
+				}
+				if st, ok := specs.Type.(*dst.StructType); ok {
+					iterateStruct(st, withoutUnderscore)
+				}
+				if mt, ok := specs.Type.(*dst.MapType); ok {
+					iterateMap(mt, withoutUnderscore)
+				}
+				if at, ok := specs.Type.(*dst.ArrayType); ok {
+					iterateArray(at, withoutUnderscore)
+				}
+			}
+		case *dst.Field:
+			findFieldsWithUnderscores(x)
+		}
+		return true
+	}
+}
+
+func findFieldsWithUnderscores(x *dst.Field) {
+	switch t := x.Type.(type) {
+	case *dst.Ident:
+		withoutUnderscore(t)
+	case *dst.StarExpr:
+		if i, is := t.X.(*dst.Ident); is {
+			withoutUnderscore(i)
+		}
+	case *dst.ArrayType:
+		iterateArray(t, withoutUnderscore)
+	case *dst.MapType:
+		iterateMap(t, withoutUnderscore)
+	}
+}
+
+func withoutUnderscore(i *dst.Ident) {
+	if strings.Contains(i.Name, "_") {
+		i.Name = strings.ReplaceAll(i.Name, "_", "")
+	}
+}
+
+func withoutRawData(existingFields map[string]bool) func(ident *dst.Ident) {
+	return func(i *dst.Ident) {
+		if existingFields[i.Name] {
+			i.Name = setStar(i) + "any"
+		}
+	}
+}
+
+func iterateStruct(s *dst.StructType, fn func(i *dst.Ident)) {
+	for i, f := range s.Fields.List {
+		switch mx := depoint(f.Type).(type) {
+		case *dst.Ident:
+			fn(mx)
+		case *dst.ArrayType:
+			iterateArray(mx, fn)
+		case *dst.MapType:
+			iterateMap(mx, fn)
+		case *dst.StructType:
+			iterateStruct(mx, fn)
+		case *dst.InterfaceType:
+			s.Fields.List[i].Type = interfaceToAny(f.Type)
+		}
+	}
+}
+
+func iterateMap(s *dst.MapType, fn func(i *dst.Ident)) {
+	switch mx := s.Value.(type) {
+	case *dst.Ident:
+		fn(mx)
+	case *dst.ArrayType:
+		iterateArray(mx, fn)
+	case *dst.MapType:
+		iterateMap(mx, fn)
+	case *dst.InterfaceType:
+		s.Value = interfaceToAny(s.Value)
+	}
+}
+
+func iterateArray(a *dst.ArrayType, fn func(i *dst.Ident)) {
+	switch mx := a.Elt.(type) {
+	case *dst.Ident:
+		fn(mx)
+	case *dst.ArrayType:
+		iterateArray(mx, fn)
+	case *dst.StructType:
+		iterateStruct(mx, fn)
+	case *dst.InterfaceType:
+		a.Elt = interfaceToAny(a.Elt)
+	}
+}
+
+func interfaceToAny(i dst.Expr) dst.Expr {
+	star := ""
+	if _, is := i.(*dst.StarExpr); is {
+		star = "*"
+	}
+
+	return &dst.Ident{Name: star + "any"}
+}
diff --git a/pkg/codegen/generators/go_generator.go b/pkg/codegen/generators/go_generator.go
new file mode 100644
index 0000000000000..a3744803dff64
--- /dev/null
+++ b/pkg/codegen/generators/go_generator.go
@@ -0,0 +1,193 @@
+package generators
+
+import (
+	"bytes"
+	"fmt"
+	"go/parser"
+	"go/token"
+	"path/filepath"
+	"strings"
+
+	"cuelang.org/go/cue"
+	"cuelang.org/go/pkg/encoding/yaml"
+	"github.com/dave/dst/decorator"
+	"github.com/dave/dst/dstutil"
+	"github.com/deepmap/oapi-codegen/pkg/codegen"
+	"github.com/getkin/kin-openapi/openapi3"
+	"golang.org/x/tools/imports"
+)
+
+type GoConfig struct {
+	Config      *OpenApiConfig
+	PackageName string
+	ApplyFuncs  []dstutil.ApplyFunc
+}
+
+func GenerateTypesGo(v cue.Value, cfg *GoConfig) ([]byte, error) {
+	if cfg == nil {
+		return nil, fmt.Errorf("configuration cannot be nil")
+	}
+
+	applyFuncs := []dstutil.ApplyFunc{depointerizer(), fixRawData(), fixUnderscoreInTypeName(), fixTODOComments()}
+	applyFuncs = append(applyFuncs, cfg.ApplyFuncs...)
+
+	f, err := generateOpenAPI(v, cfg.Config)
+	if err != nil {
+		return nil, err
+	}
+
+	str, err := yaml.Marshal(v.Context().BuildFile(f))
+	if err != nil {
+		return nil, fmt.Errorf("cue-yaml marshaling failed: %w", err)
+	}
+
+	loader := openapi3.NewLoader()
+	oT, err := loader.LoadFromData([]byte(str))
+	if err != nil {
+		return nil, fmt.Errorf("loading generated openapi failed: %w", err)
+	}
+
+	schemaName, err := getSchemaName(v)
+	if err != nil {
+		return nil, err
+	}
+
+	if cfg.PackageName == "" {
+		cfg.PackageName = schemaName
+	}
+
+	// Hack to fix https://github.com/grafana/thema/pull/127 issue without importing
+	// to avoid to add the whole vendor in Grafana code
+	if cfg.PackageName == "dataquery" {
+		fixDataQuery(oT)
+	}
+
+	ccfg := codegen.Configuration{
+		PackageName: cfg.PackageName,
+		Compatibility: codegen.CompatibilityOptions{
+			AlwaysPrefixEnumValues: true,
+		},
+		Generate: codegen.GenerateOptions{
+			Models: true,
+		},
+		OutputOptions: codegen.OutputOptions{
+			SkipPrune: true,
+			UserTemplates: map[string]string{
+				"imports.tmpl": importstmpl,
+			},
+		},
+	}
+
+	gostr, err := codegen.Generate(oT, ccfg)
+	if err != nil {
+		return nil, fmt.Errorf("openapi generation failed: %w", err)
+	}
+
+	return postprocessGoFile(genGoFile{
+		path:     fmt.Sprintf("%s_type_gen.go", schemaName),
+		appliers: applyFuncs,
+		in:       []byte(gostr),
+	})
+}
+
+type genGoFile struct {
+	path     string
+	appliers []dstutil.ApplyFunc
+	in       []byte
+}
+
+func postprocessGoFile(cfg genGoFile) ([]byte, error) {
+	fname := sanitizeLabelString(filepath.Base(cfg.path))
+	buf := new(bytes.Buffer)
+	fset := token.NewFileSet()
+	gf, err := decorator.ParseFile(fset, fname, string(cfg.in), parser.ParseComments)
+	if err != nil {
+		return nil, fmt.Errorf("error parsing generated file: %w", err)
+	}
+
+	for _, af := range cfg.appliers {
+		dstutil.Apply(gf, af, nil)
+	}
+
+	err = decorator.Fprint(buf, gf)
+	if err != nil {
+		return nil, fmt.Errorf("error formatting generated file: %w", err)
+	}
+
+	byt, err := imports.Process(fname, buf.Bytes(), nil)
+	if err != nil {
+		return nil, fmt.Errorf("goimports processing of generated file failed: %w", err)
+	}
+
+	// Compare imports before and after; warn about performance if some were added
+	gfa, _ := parser.ParseFile(fset, fname, string(byt), parser.ParseComments)
+	imap := make(map[string]bool)
+	for _, im := range gf.Imports {
+		imap[im.Path.Value] = true
+	}
+	var added []string
+	for _, im := range gfa.Imports {
+		if !imap[im.Path.Value] {
+			added = append(added, im.Path.Value)
+		}
+	}
+
+	if len(added) != 0 {
+		// TODO improve the guidance in this error if/when we better abstract over imports to generate
+		return nil, fmt.Errorf("goimports added the following import statements to %s: \n\t%s\nRelying on goimports to find imports significantly slows down code generation. Either add these imports with an AST manipulation in cfg.ApplyFuncs, or set cfg.IgnoreDiscoveredImports to true", cfg.path, strings.Join(added, "\n\t"))
+	}
+	return byt, nil
+}
+
+// fixDataQuery extends the properties for the AllOf schemas when a DataQuery exists.
+// deep/oapi-codegen library ignores the properties of the models and only ones have references.
+// It doesn't apply this change https://github.com/grafana/thema/pull/154 since it modifies the
+// vendor implementation, and we don't import it.
+func fixDataQuery(spec *openapi3.T) *openapi3.T {
+	for _, sch := range spec.Components.Schemas {
+		if sch.Value != nil && len(sch.Value.AllOf) > 0 {
+			for _, allOf := range sch.Value.AllOf {
+				for n, p := range allOf.Value.Properties {
+					sch.Value.Properties[n] = p
+				}
+			}
+			sch.Value.AllOf = nil
+		}
+	}
+	return spec
+}
+
+// Almost all of the below imports are eliminated by dst transformers and calls
+// to goimports - but if they're not present in the template, then the internal
+// call to goimports that oapi-codegen makes will trigger a search for them,
+// which can slow down codegen by orders of magnitude.
+var importstmpl = `package {{ .PackageName }}
+
+import (
+	"bytes"
+	"compress/gzip"
+	"context"
+	"encoding/base64"
+	"encoding/json"
+	"encoding/xml"
+	"errors"
+	"fmt"
+	"gopkg.in/yaml.v2"
+	"io"
+	"io/ioutil"
+	"os"
+	"net/http"
+	"net/url"
+	"path"
+	"strings"
+	"time"
+
+	"github.com/deepmap/oapi-codegen/pkg/runtime"
+	openapi_types "github.com/deepmap/oapi-codegen/pkg/types"
+	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/go-chi/chi/v5"
+	"github.com/labstack/echo/v4"
+	"github.com/gin-gonic/gin"
+	"github.com/gorilla/mux"
+)
+`
diff --git a/pkg/codegen/generators/openapi_generator.go b/pkg/codegen/generators/openapi_generator.go
new file mode 100644
index 0000000000000..19e02aa5488c4
--- /dev/null
+++ b/pkg/codegen/generators/openapi_generator.go
@@ -0,0 +1,199 @@
+package generators
+
+import (
+	"fmt"
+	"strings"
+
+	"cuelang.org/go/cue"
+	"cuelang.org/go/cue/ast"
+	"cuelang.org/go/encoding/openapi"
+)
+
+type OpenApiConfig struct {
+	Config   *openapi.Config
+	IsGroup  bool
+	RootName string
+	SubPath  cue.Path
+}
+
+func generateOpenAPI(v cue.Value, cfg *OpenApiConfig) (*ast.File, error) {
+	if cfg == nil {
+		return nil, fmt.Errorf("missing openapi configuration")
+	}
+
+	if cfg.Config == nil {
+		cfg.Config = &openapi.Config{}
+	}
+
+	name, err := getSchemaName(v)
+	if err != nil {
+		return nil, err
+	}
+
+	gen := &oapiGen{
+		cfg:     cfg,
+		name:    name,
+		val:     v.LookupPath(cue.ParsePath("lineage.schemas[0].schema")),
+		subpath: cfg.SubPath,
+		bpath:   v.LookupPath(cue.ParsePath("lineage.schemas[0]")).Path(),
+	}
+
+	declFunc := genSchema
+	if cfg.IsGroup {
+		declFunc = genGroup
+	}
+
+	decls, err := declFunc(gen)
+
+	if err != nil {
+		return nil, err
+	}
+
+	// TODO recursively sort output to improve stability of output
+	return &ast.File{
+		Decls: []ast.Decl{
+			ast.NewStruct(
+				"openapi", ast.NewString("3.0.0"),
+				"paths", ast.NewStruct(),
+				"components", ast.NewStruct(
+					"schemas", &ast.StructLit{Elts: decls},
+				),
+			),
+		},
+	}, nil
+}
+
+type oapiGen struct {
+	cfg     *OpenApiConfig
+	val     cue.Value
+	subpath cue.Path
+
+	// overall name for the generated oapi doc
+	name string
+
+	// original NameFunc
+	onf func(cue.Value, cue.Path) string
+
+	// full prefix path that leads up to the #SchemaDef, e.g. lin._sortedSchemas[0]
+	bpath cue.Path
+}
+
+func genGroup(gen *oapiGen) ([]ast.Decl, error) {
+	ctx := gen.val.Context()
+	iter, err := gen.val.Fields(cue.Definitions(true), cue.Optional(true))
+	if err != nil {
+		panic(fmt.Errorf("unreachable - should always be able to get iter for struct kinds: %w", err))
+	}
+
+	var decls []ast.Decl
+	for iter.Next() {
+		val, sel := iter.Value(), iter.Selector()
+		name := strings.Trim(sel.String(), "?#")
+
+		v := ctx.CompileString(fmt.Sprintf("#%s: _", name))
+		defpath := cue.MakePath(cue.Def(name))
+		defsch := v.FillPath(defpath, val)
+
+		cfgi := *gen.cfg.Config
+		cfgi.NameFunc = func(val cue.Value, path cue.Path) string {
+			return gen.nfSingle(val, path, defpath, name)
+		}
+
+		part, err := openapi.Generate(defsch, &cfgi)
+		if err != nil {
+			return nil, fmt.Errorf("failed generation for grouped field %s: %w", sel, err)
+		}
+
+		decls = append(decls, getSchemas(part)...)
+	}
+
+	return decls, nil
+}
+
+func genSchema(gen *oapiGen) ([]ast.Decl, error) {
+	hasSubpath := len(gen.cfg.SubPath.Selectors()) > 0
+	name := sanitizeLabelString(gen.name)
+	if gen.cfg.RootName != "" {
+		name = gen.cfg.RootName
+	} else if hasSubpath {
+		sel := gen.cfg.SubPath.Selectors()
+		name = sel[len(sel)-1].String()
+	}
+
+	val := gen.val
+	if hasSubpath {
+		for i, sel := range gen.cfg.SubPath.Selectors() {
+			if !gen.val.Allows(sel) {
+				return nil, fmt.Errorf("subpath %q not present in schema", cue.MakePath(gen.cfg.SubPath.Selectors()[:i+1]...))
+			}
+		}
+		val = val.LookupPath(gen.cfg.SubPath)
+	}
+
+	v := gen.val.Context().CompileString(fmt.Sprintf("#%s: _", name))
+	defpath := cue.MakePath(cue.Def(name))
+	defsch := v.FillPath(defpath, val)
+
+	gen.cfg.Config.NameFunc = func(val cue.Value, path cue.Path) string {
+		return gen.nfSingle(val, path, defpath, name)
+	}
+
+	f, err := openapi.Generate(defsch.Eval(), gen.cfg.Config)
+	if err != nil {
+		return nil, err
+	}
+
+	return getSchemas(f), nil
+}
+
+// For generating a single, our NameFunc must:
+// - Eliminate any path prefixes on the element, both internal lineage and wrapping
+// - Replace the name "_#schema" with the desired name
+// - Call the user-provided NameFunc, if any
+// - Remove CUE markers like #, !, ?
+func (gen *oapiGen) nfSingle(val cue.Value, path, defpath cue.Path, name string) string {
+	tpath := trimPathPrefix(trimThemaPathPrefix(path, gen.bpath), defpath)
+
+	if path.String() == "" || tpath.String() == defpath.String() {
+		return name
+	}
+
+	if val == gen.val {
+		return ""
+	}
+
+	if gen.onf != nil {
+		return gen.onf(val, tpath)
+	}
+	return strings.Trim(tpath.String(), "?#")
+}
+
+func getSchemas(f *ast.File) []ast.Decl {
+	compos := orp(getFieldByLabel(f, "components"))
+	schemas := orp(getFieldByLabel(compos.Value, "schemas"))
+	return schemas.Value.(*ast.StructLit).Elts
+}
+
+func orp[T any](t T, err error) T {
+	if err != nil {
+		panic(err)
+	}
+	return t
+}
+
+func trimThemaPathPrefix(p, base cue.Path) cue.Path {
+	if !pathHasPrefix(p, base) {
+		return p
+	}
+
+	rest := p.Selectors()[len(base.Selectors()):]
+	if len(rest) == 0 {
+		return cue.Path{}
+	}
+	switch rest[0].String() {
+	case "schema", "_#schema", "_join", "joinSchema":
+		return cue.MakePath(rest[1:]...)
+	default:
+		return cue.MakePath(rest...)
+	}
+}
diff --git a/pkg/codegen/generators/ts_generator.go b/pkg/codegen/generators/ts_generator.go
new file mode 100644
index 0000000000000..33321652079fa
--- /dev/null
+++ b/pkg/codegen/generators/ts_generator.go
@@ -0,0 +1,56 @@
+package generators
+
+import (
+	"fmt"
+
+	"cuelang.org/go/cue"
+	"cuelang.org/go/cue/cuecontext"
+	"github.com/grafana/cuetsy"
+	"github.com/grafana/cuetsy/ts"
+	"github.com/grafana/cuetsy/ts/ast"
+)
+
+type TSConfig struct {
+	CuetsyConfig *cuetsy.Config
+	IsGroup      bool
+	RootName     string
+}
+
+// GenerateTypesTS generates native TypeScript types and defaults corresponding to
+// the provided Schema.
+func GenerateTypesTS(v cue.Value, cfg *TSConfig) (*ast.File, error) {
+	if cfg == nil {
+		return nil, fmt.Errorf("configuration cannot be empty")
+	}
+	if cfg.CuetsyConfig == nil {
+		cfg.CuetsyConfig = &cuetsy.Config{
+			Export: true,
+		}
+	}
+
+	// Thema #schema was a unification between the schema and cue.TopKind(_). For any reason, without this unification,
+	// cuetsy fails finding some enums ¯\_(ツ)_/¯.
+	oldSchema := cuecontext.New().CompileBytes([]byte("_"))
+	schdef := v.LookupPath(cue.ParsePath("lineage.schemas[0].schema")).Unify(oldSchema)
+	tf, err := cuetsy.GenerateAST(schdef, *cfg.CuetsyConfig)
+	if err != nil {
+		return nil, fmt.Errorf("generating TS for child elements of schema failed: %w", err)
+	}
+
+	file := &ts.File{
+		Nodes: tf.Nodes,
+	}
+
+	if !cfg.IsGroup {
+		top, err := cuetsy.GenerateSingleAST(cfg.RootName, schdef, cuetsy.TypeInterface)
+		if err != nil {
+			return nil, fmt.Errorf("generating TS for schema root failed: %w", err)
+		}
+		file.Nodes = append(file.Nodes, top.T)
+		if top.D != nil {
+			file.Nodes = append(file.Nodes, top.D)
+		}
+	}
+
+	return file, nil
+}
diff --git a/pkg/codegen/generators/utils.go b/pkg/codegen/generators/utils.go
new file mode 100644
index 0000000000000..382e9ed207806
--- /dev/null
+++ b/pkg/codegen/generators/utils.go
@@ -0,0 +1,130 @@
+package generators
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+
+	"cuelang.org/go/cue"
+	"cuelang.org/go/cue/ast"
+	"cuelang.org/go/cue/token"
+)
+
+// sanitizeLabelString strips characters from a string that are not allowed for
+// use in a CUE label.
+func sanitizeLabelString(s string) string {
+	return strings.Map(func(r rune) rune {
+		switch {
+		case r >= 'a' && r <= 'z':
+			fallthrough
+		case r >= 'A' && r <= 'Z':
+			fallthrough
+		case r >= '0' && r <= '9':
+			fallthrough
+		case r == '_':
+			return r
+		default:
+			return -1
+		}
+	}, s)
+}
+
+// trimPathPrefix strips the provided prefix from the provided path, if the
+// prefix exists.
+//
+// If path and prefix are equivalent, and there is at least one additional
+// selector in the provided path.
+func trimPathPrefix(path, prefix cue.Path) cue.Path {
+	sels, psels := path.Selectors(), prefix.Selectors()
+	if len(sels) == 1 {
+		return path
+	}
+	var i int
+	for ; i < len(psels) && i < len(sels); i++ {
+		if !selEq(psels[i], sels[i]) {
+			break
+		}
+	}
+	return cue.MakePath(sels[i:]...)
+}
+
+// selEq indicates whether two selectors are equivalent. Selectors are equivalent if
+// they are either exactly equal, or if they are equal ignoring path optionality.
+func selEq(s1, s2 cue.Selector) bool {
+	return s1 == s2 || s1.Optional() == s2.Optional()
+}
+
+// getFieldByLabel returns the ast.Field with a given label from a struct-ish input.
+func getFieldByLabel(n ast.Node, label string) (*ast.Field, error) {
+	var d []ast.Decl
+	switch x := n.(type) {
+	case *ast.File:
+		d = x.Decls
+	case *ast.StructLit:
+		d = x.Elts
+	default:
+		return nil, fmt.Errorf("not an *ast.File or *ast.StructLit")
+	}
+
+	for _, el := range d {
+		if isFieldWithLabel(el, label) {
+			return el.(*ast.Field), nil
+		}
+	}
+
+	return nil, fmt.Errorf("no field with label %q", label)
+}
+
+func isFieldWithLabel(n ast.Node, label string) bool {
+	if x, is := n.(*ast.Field); is {
+		if l, is := x.Label.(*ast.BasicLit); is {
+			return strEq(l, label)
+		}
+		if l, is := x.Label.(*ast.Ident); is {
+			return identStrEq(l, label)
+		}
+	}
+	return false
+}
+
+func strEq(lit *ast.BasicLit, str string) bool {
+	if lit.Kind != token.STRING {
+		return false
+	}
+	ls, _ := strconv.Unquote(lit.Value)
+	return str == ls || str == lit.Value
+}
+
+func identStrEq(id *ast.Ident, str string) bool {
+	if str == id.Name {
+		return true
+	}
+	ls, _ := strconv.Unquote(id.Name)
+	return str == ls
+}
+
+// pathHasPrefix tests whether the [cue.Path] p begins with prefix.
+func pathHasPrefix(p, prefix cue.Path) bool {
+	ps, pres := p.Selectors(), prefix.Selectors()
+	if len(pres) > len(ps) {
+		return false
+	}
+	return pathsAreEq(ps[:len(pres)], pres)
+}
+
+func pathsAreEq(p1s, p2s []cue.Selector) bool {
+	if len(p1s) != len(p2s) {
+		return false
+	}
+	for i := 0; i < len(p2s); i++ {
+		if !selEq(p2s[i], p1s[i]) {
+			return false
+		}
+	}
+	return true
+}
+
+func getSchemaName(v cue.Value) (string, error) {
+	nameValue := v.LookupPath(cue.ParsePath("name"))
+	return nameValue.String()
+}
diff --git a/pkg/codegen/jenny_basecorereg.go b/pkg/codegen/jenny_basecorereg.go
deleted file mode 100644
index 1a19a9aca8c8a..0000000000000
--- a/pkg/codegen/jenny_basecorereg.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package codegen
-
-import (
-	"bytes"
-	"fmt"
-	"path/filepath"
-
-	"github.com/grafana/codejen"
-	"github.com/grafana/kindsys"
-)
-
-// BaseCoreRegistryJenny generates a static registry for core kinds that
-// only initializes their [kindsys.Kind]. No slot kinds are composed.
-//
-// Path should be the relative path to the directory that will contain the
-// generated registry. kindrelroot should be the repo-root-relative path to the
-// parent directory to all directories that contain generated kind bindings
-// (e.g. pkg/kind).
-func BaseCoreRegistryJenny(path, kindrelroot string) ManyToOne {
-	return &genBaseRegistry{
-		path:        path,
-		kindrelroot: kindrelroot,
-	}
-}
-
-type genBaseRegistry struct {
-	path        string
-	kindrelroot string
-}
-
-func (gen *genBaseRegistry) JennyName() string {
-	return "BaseCoreRegistryJenny"
-}
-
-func (gen *genBaseRegistry) Generate(kinds ...kindsys.Kind) (*codejen.File, error) {
-	cores := make([]kindsys.Core, 0, len(kinds))
-	for _, d := range kinds {
-		if corekind, is := d.(kindsys.Core); is {
-			cores = append(cores, corekind)
-		}
-	}
-	if len(cores) == 0 {
-		return nil, nil
-	}
-
-	buf := new(bytes.Buffer)
-	if err := tmpls.Lookup("kind_registry.tmpl").Execute(buf, tvars_kind_registry{
-		PackageName:       filepath.Base(gen.path),
-		KindPackagePrefix: filepath.ToSlash(filepath.Join("github.com/grafana/grafana", gen.kindrelroot)),
-		Kinds:             cores,
-	}); err != nil {
-		return nil, fmt.Errorf("failed executing kind registry template: %w", err)
-	}
-
-	b, err := postprocessGoFile(genGoFile{
-		path: gen.path,
-		in:   buf.Bytes(),
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return codejen.NewFile(filepath.Join(gen.path, "base_gen.go"), b, gen), nil
-}
diff --git a/pkg/codegen/jenny_core_registry.go b/pkg/codegen/jenny_core_registry.go
new file mode 100644
index 0000000000000..c2f7779440638
--- /dev/null
+++ b/pkg/codegen/jenny_core_registry.go
@@ -0,0 +1,56 @@
+package codegen
+
+import (
+	"bytes"
+	"fmt"
+	"go/format"
+	"path/filepath"
+	"strings"
+
+	"github.com/grafana/codejen"
+)
+
+var registryPath = filepath.Join("pkg", "registry", "schemas")
+
+// CoreRegistryJenny generates a registry with all core kinds.
+type CoreRegistryJenny struct {
+}
+
+func (jenny *CoreRegistryJenny) JennyName() string {
+	return "CoreRegistryJenny"
+}
+
+func (jenny *CoreRegistryJenny) Generate(cueFiles ...SchemaForGen) (codejen.Files, error) {
+	schemas := make([]Schema, len(cueFiles))
+	for i, v := range cueFiles {
+		name, err := getSchemaName(v.Name)
+		if err != nil {
+			return nil, err
+		}
+
+		schemas[i] = Schema{
+			Name:     name,
+			FilePath: v.FilePath,
+		}
+	}
+
+	buf := new(bytes.Buffer)
+	if err := tmpls.Lookup("core_registry.tmpl").Execute(buf, tvars_registry{
+		Schemas: schemas,
+	}); err != nil {
+		return nil, fmt.Errorf("failed executing kind registry template: %w", err)
+	}
+
+	b, err := format.Source(buf.Bytes())
+	if err != nil {
+		return nil, err
+	}
+
+	file := codejen.NewFile(filepath.Join(registryPath, "core_kind.go"), b, jenny)
+	return codejen.Files{*file}, nil
+}
+
+func getSchemaName(pkg string) (string, error) {
+	pkg = strings.Replace(pkg, "-", "_", -1)
+	return strings.ToLower(pkg), nil
+}
diff --git a/pkg/codegen/jenny_corekind.go b/pkg/codegen/jenny_corekind.go
deleted file mode 100644
index b7deb36cfb501..0000000000000
--- a/pkg/codegen/jenny_corekind.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package codegen
-
-import (
-	"bytes"
-	"fmt"
-	"path/filepath"
-
-	"github.com/grafana/codejen"
-	"github.com/grafana/kindsys"
-)
-
-// CoreKindJenny generates the implementation of [kindsys.Core] for the provided
-// kind declaration.
-//
-// gokindsdir should be the relative path to the parent directory that contains
-// all generated kinds.
-//
-// This generator only has output for core structured kinds.
-func CoreKindJenny(gokindsdir string, cfg *CoreKindJennyConfig) OneToOne {
-	if cfg == nil {
-		cfg = new(CoreKindJennyConfig)
-	}
-	if cfg.GenDirName == nil {
-		cfg.GenDirName = func(def kindsys.Kind) string {
-			return def.Props().Common().MachineName
-		}
-	}
-
-	return &coreKindJenny{
-		gokindsdir: gokindsdir,
-		cfg:        cfg,
-	}
-}
-
-// CoreKindJennyConfig holds configuration options for [CoreKindJenny].
-type CoreKindJennyConfig struct {
-	// GenDirName returns the name of the directory in which the file should be
-	// generated. Defaults to DefForGen.Lineage().Name() if nil.
-	GenDirName func(kindsys.Kind) string
-}
-
-type coreKindJenny struct {
-	gokindsdir string
-	cfg        *CoreKindJennyConfig
-}
-
-var _ OneToOne = &coreKindJenny{}
-
-func (gen *coreKindJenny) JennyName() string {
-	return "CoreKindJenny"
-}
-
-func (gen *coreKindJenny) Generate(kind kindsys.Kind) (*codejen.File, error) {
-	if _, is := kind.(kindsys.Core); !is {
-		return nil, nil
-	}
-
-	path := filepath.Join(gen.gokindsdir, gen.cfg.GenDirName(kind), kind.Props().Common().MachineName+"_kind_gen.go")
-	buf := new(bytes.Buffer)
-	if err := tmpls.Lookup("kind_core.tmpl").Execute(buf, kind); err != nil {
-		return nil, fmt.Errorf("failed executing kind_core template for %s: %w", path, err)
-	}
-	b, err := postprocessGoFile(genGoFile{
-		path: path,
-		in:   buf.Bytes(),
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return codejen.NewFile(path, b, gen), nil
-}
diff --git a/pkg/codegen/jenny_docs.go b/pkg/codegen/jenny_docs.go
deleted file mode 100644
index 1883faff00b09..0000000000000
--- a/pkg/codegen/jenny_docs.go
+++ /dev/null
@@ -1,793 +0,0 @@
-package codegen
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"path"
-	"path/filepath"
-	"reflect"
-	"sort"
-	"strings"
-	"text/template"
-
-	"cuelang.org/go/cue/cuecontext"
-	"github.com/grafana/codejen"
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema/encoding/jsonschema"
-	"github.com/olekukonko/tablewriter"
-	"github.com/xeipuuv/gojsonpointer"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-)
-
-func DocsJenny(docsPath string) OneToOne {
-	return docsJenny{
-		docsPath: docsPath,
-	}
-}
-
-type docsJenny struct {
-	docsPath string
-}
-
-func (j docsJenny) JennyName() string {
-	return "DocsJenny"
-}
-
-func (j docsJenny) Generate(kind kindsys.Kind) (*codejen.File, error) {
-	// TODO remove this once codejen catches nils https://github.com/grafana/codejen/issues/5
-	if kind == nil {
-		return nil, nil
-	}
-
-	f, err := jsonschema.GenerateSchema(kind.Lineage().Latest())
-	if err != nil {
-		return nil, fmt.Errorf("failed to generate json representation for the schema: %v", err)
-	}
-	b, err := cuecontext.New().BuildFile(f).MarshalJSON()
-	if err != nil {
-		return nil, fmt.Errorf("failed to marshal schema value to json: %v", err)
-	}
-
-	// We don't need entire json obj, only the value of components.schemas path
-	var obj struct {
-		Info struct {
-			Title string
-		}
-		Components struct {
-			Schemas json.RawMessage
-		}
-	}
-	dec := json.NewDecoder(bytes.NewReader(b))
-	dec.UseNumber()
-	err = dec.Decode(&obj)
-	if err != nil {
-		return nil, fmt.Errorf("failed to unmarshal schema json: %v", err)
-	}
-
-	// fixes the references between the types within a json after making components.schema.<types> the root of the json
-	kindJsonStr := strings.Replace(string(obj.Components.Schemas), "#/components/schemas/", "#/", -1)
-
-	kindProps := kind.Props().Common()
-	data := templateData{
-		KindName:        kindProps.Name,
-		KindVersion:     kind.Lineage().Latest().Version().String(),
-		KindMaturity:    fmt.Sprintf("[%s](../../../maturity/#%[1]s)", kindProps.Maturity),
-		KindDescription: kindProps.Description,
-		Markdown:        "{{ .Markdown }}",
-	}
-
-	tmpl, err := makeTemplate(data, "docs.tmpl")
-	if err != nil {
-		return nil, err
-	}
-
-	doc, err := jsonToMarkdown([]byte(kindJsonStr), string(tmpl), obj.Info.Title)
-	if err != nil {
-		return nil, fmt.Errorf("failed to build markdown for kind %s: %v", kindProps.Name, err)
-	}
-
-	return codejen.NewFile(filepath.Join(j.docsPath, strings.ToLower(kindProps.Name), "schema-reference.md"), doc, j), nil
-}
-
-// makeTemplate pre-populates the template with the kind metadata
-func makeTemplate(data templateData, tmpl string) ([]byte, error) {
-	buf := new(bytes.Buffer)
-	if err := tmpls.Lookup(tmpl).Execute(buf, data); err != nil {
-		return []byte{}, fmt.Errorf("failed to populate docs template with the kind metadata")
-	}
-	return buf.Bytes(), nil
-}
-
-type templateData struct {
-	KindName        string
-	KindVersion     string
-	KindMaturity    string
-	KindDescription string
-	Markdown        string
-}
-
-// -------------------- JSON to Markdown conversion --------------------
-// Copied from https://github.com/marcusolsson/json-schema-docs and slightly changed to fit the DocsJenny
-type constraints struct {
-	Pattern          string      `json:"pattern"`
-	Maximum          json.Number `json:"maximum"`
-	ExclusiveMinimum bool        `json:"exclusiveMinimum"`
-	Minimum          json.Number `json:"minimum"`
-	ExclusiveMaximum bool        `json:"exclusiveMaximum"`
-	MinLength        uint        `json:"minLength"`
-	MaxLength        uint        `json:"maxLength"`
-}
-
-type schema struct {
-	constraints
-	ID                   string             `json:"$id,omitempty"`
-	Ref                  string             `json:"$ref,omitempty"`
-	Schema               string             `json:"$schema,omitempty"`
-	Title                string             `json:"title,omitempty"`
-	Description          string             `json:"description,omitempty"`
-	Required             []string           `json:"required,omitempty"`
-	Type                 PropertyTypes      `json:"type,omitempty"`
-	Properties           map[string]*schema `json:"properties,omitempty"`
-	Items                *schema            `json:"items,omitempty"`
-	Definitions          map[string]*schema `json:"definitions,omitempty"`
-	Enum                 []Any              `json:"enum"`
-	Default              any                `json:"default"`
-	AllOf                []*schema          `json:"allOf"`
-	OneOf                []*schema          `json:"oneOf"`
-	AdditionalProperties *schema            `json:"additionalProperties"`
-	extends              []string           `json:"-"`
-	inheritedFrom        string             `json:"-"`
-}
-
-func renderMapType(props *schema) string {
-	if props == nil {
-		return ""
-	}
-
-	if props.Type.HasType(PropertyTypeObject) {
-		name, anchor := propNameAndAnchor(props.Title, props.Title)
-		return fmt.Sprintf("[%s](#%s)", name, anchor)
-	}
-
-	if props.AdditionalProperties != nil {
-		return "map[string]" + renderMapType(props.AdditionalProperties)
-	}
-
-	if props.Items != nil {
-		return "[]" + renderMapType(props.Items)
-	}
-
-	var types []string
-	for _, t := range props.Type {
-		types = append(types, string(t))
-	}
-	return strings.Join(types, ", ")
-}
-
-func jsonToMarkdown(jsonData []byte, tpl string, kindName string) ([]byte, error) {
-	sch, err := newSchema(jsonData, kindName)
-	if err != nil {
-		return []byte{}, err
-	}
-
-	t, err := template.New("markdown").Parse(tpl)
-	if err != nil {
-		return []byte{}, err
-	}
-
-	buf := new(bytes.Buffer)
-	err = t.Execute(buf, sch)
-	if err != nil {
-		return []byte{}, err
-	}
-
-	return buf.Bytes(), nil
-}
-
-func newSchema(b []byte, kindName string) (*schema, error) {
-	var data map[string]*schema
-	if err := json.Unmarshal(b, &data); err != nil {
-		return nil, err
-	}
-
-	// Needed for resolving in-schema references.
-	root, err := simplejson.NewJson(b)
-	if err != nil {
-		return nil, err
-	}
-
-	return resolveSchema(data[kindName], root)
-}
-
-// resolveSchema recursively resolves schemas.
-func resolveSchema(schem *schema, root *simplejson.Json) (*schema, error) {
-	for _, prop := range schem.Properties {
-		if prop.Ref != "" {
-			tmp, err := resolveReference(prop.Ref, root)
-			if err != nil {
-				return nil, err
-			}
-			*prop = *tmp
-		}
-		foo, err := resolveSchema(prop, root)
-		if err != nil {
-			return nil, err
-		}
-		*prop = *foo
-	}
-
-	if schem.Items != nil {
-		if schem.Items.Ref != "" {
-			tmp, err := resolveReference(schem.Items.Ref, root)
-			if err != nil {
-				return nil, err
-			}
-			*schem.Items = *tmp
-		}
-		foo, err := resolveSchema(schem.Items, root)
-		if err != nil {
-			return nil, err
-		}
-		*schem.Items = *foo
-	}
-
-	if len(schem.AllOf) > 0 {
-		for idx, child := range schem.AllOf {
-			tmp, err := resolveSubSchema(schem, child, root)
-			if err != nil {
-				return nil, err
-			}
-			schem.AllOf[idx] = tmp
-
-			if len(tmp.Title) > 0 {
-				schem.extends = append(schem.extends, tmp.Title)
-			}
-		}
-	}
-
-	if len(schem.OneOf) > 0 {
-		for idx, child := range schem.OneOf {
-			tmp, err := resolveSubSchema(schem, child, root)
-			if err != nil {
-				return nil, err
-			}
-			schem.OneOf[idx] = tmp
-		}
-	}
-
-	if schem.AdditionalProperties != nil {
-		if schem.AdditionalProperties.Ref != "" {
-			tmp, err := resolveReference(schem.AdditionalProperties.Ref, root)
-			if err != nil {
-				return nil, err
-			}
-			*schem.AdditionalProperties = *tmp
-		}
-		foo, err := resolveSchema(schem.AdditionalProperties, root)
-		if err != nil {
-			return nil, err
-		}
-		*schem.AdditionalProperties = *foo
-	}
-
-	return schem, nil
-}
-
-func resolveSubSchema(parent, child *schema, root *simplejson.Json) (*schema, error) {
-	if child.Ref != "" {
-		tmp, err := resolveReference(child.Ref, root)
-		if err != nil {
-			return nil, err
-		}
-		*child = *tmp
-	}
-
-	if len(child.Required) > 0 {
-		parent.Required = append(parent.Required, child.Required...)
-	}
-
-	child, err := resolveSchema(child, root)
-	if err != nil {
-		return nil, err
-	}
-
-	if parent.Properties == nil {
-		parent.Properties = make(map[string]*schema)
-	}
-
-	for k, v := range child.Properties {
-		prop := *v
-		prop.inheritedFrom = child.Title
-		parent.Properties[k] = &prop
-	}
-
-	return child, err
-}
-
-// resolveReference loads a schema from a $ref.
-// If ref contains a hashtag (#), the part after represents a in-schema reference.
-func resolveReference(ref string, root *simplejson.Json) (*schema, error) {
-	i := strings.Index(ref, "#")
-
-	if i != 0 {
-		return nil, fmt.Errorf("not in-schema reference: %s", ref)
-	}
-	return resolveInSchemaReference(ref[i+1:], root)
-}
-
-func resolveInSchemaReference(ref string, root *simplejson.Json) (*schema, error) {
-	// in-schema reference
-	pointer, err := gojsonpointer.NewJsonPointer(ref)
-	if err != nil {
-		return nil, err
-	}
-
-	v, _, err := pointer.Get(root.MustMap())
-	if err != nil {
-		return nil, err
-	}
-
-	var sch schema
-	b, err := json.Marshal(v)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := json.Unmarshal(b, &sch); err != nil {
-		return nil, err
-	}
-
-	// Set the ref name as title
-	sch.Title = path.Base(ref)
-
-	return &sch, nil
-}
-
-type mdSection struct {
-	title       string
-	extends     string
-	description string
-	rows        [][]string
-}
-
-func (md mdSection) write(w io.Writer) {
-	if md.title != "" {
-		fmt.Fprintf(w, "### %s\n", strings.Title(md.title))
-		fmt.Fprintln(w)
-	}
-
-	if md.description != "" {
-		fmt.Fprintln(w, md.description)
-		fmt.Fprintln(w)
-	}
-
-	if md.extends != "" {
-		fmt.Fprintln(w, md.extends)
-		fmt.Fprintln(w)
-	}
-
-	table := tablewriter.NewWriter(w)
-	table.SetHeader([]string{"Property", "Type", "Required", "Default", "Description"})
-	table.SetBorders(tablewriter.Border{Left: true, Top: false, Right: true, Bottom: false})
-	table.SetCenterSeparator("|")
-	table.SetAutoFormatHeaders(false)
-	table.SetHeaderAlignment(tablewriter.ALIGN_LEFT)
-	table.SetAutoWrapText(false)
-	table.AppendBulk(md.rows)
-	table.Render()
-	fmt.Fprintln(w)
-}
-
-// Markdown returns the Markdown representation of the schema.
-//
-// The level argument can be used to offset the heading levels. This can be
-// useful if you want to add the schema under a subheading.
-func (s *schema) Markdown() string {
-	buf := new(bytes.Buffer)
-
-	for _, v := range s.sections() {
-		v.write(buf)
-	}
-
-	return buf.String()
-}
-
-func (s *schema) sections() []mdSection {
-	md := mdSection{}
-
-	if s.AdditionalProperties == nil {
-		md.title = s.Title
-	}
-	md.description = s.Description
-
-	if len(s.extends) > 0 {
-		md.extends = makeExtends(s.extends)
-	}
-	md.rows = makeRows(s)
-
-	sections := []mdSection{md}
-	for _, sch := range findDefinitions(s) {
-		for _, ss := range sch.sections() {
-			if !contains(sections, ss) {
-				sections = append(sections, ss)
-			}
-		}
-	}
-
-	return sections
-}
-
-func contains(sl []mdSection, elem mdSection) bool {
-	for _, s := range sl {
-		if reflect.DeepEqual(s, elem) {
-			return true
-		}
-	}
-	return false
-}
-
-func makeExtends(from []string) string {
-	fromLinks := make([]string, 0, len(from))
-	for _, f := range from {
-		fromLinks = append(fromLinks, fmt.Sprintf("[%s](#%s)", f, strings.ToLower(f)))
-	}
-
-	return fmt.Sprintf("It extends %s.", strings.Join(fromLinks, " and "))
-}
-
-func findDefinitions(s *schema) []*schema {
-	// Gather all properties of object type so that we can generate the
-	// properties for them recursively.
-	var objs []*schema
-
-	definition := func(k string, p *schema) {
-		if p.Type.HasType(PropertyTypeObject) && p.AdditionalProperties == nil {
-			// Use the identifier as the title.
-			if len(p.Title) == 0 {
-				p.Title = k
-			}
-			objs = append(objs, p)
-		}
-
-		// If the property is an array of objects, use the name of the array
-		// property as the title.
-		if p.Type.HasType(PropertyTypeArray) {
-			if p.Items != nil {
-				if p.Items.Type.HasType(PropertyTypeObject) {
-					if len(p.Items.Title) == 0 {
-						p.Items.Title = k
-					}
-					objs = append(objs, p.Items)
-				}
-			}
-		}
-	}
-
-	for k, p := range s.Properties {
-		// If a property has AdditionalProperties, then it's a map
-		if p.AdditionalProperties != nil {
-			definition(k, p.AdditionalProperties)
-		}
-
-		definition(k, p)
-	}
-
-	// This code could probably be unified with the one above
-	for _, child := range s.AllOf {
-		if child.Type.HasType(PropertyTypeObject) {
-			objs = append(objs, child)
-		}
-
-		if child.Type.HasType(PropertyTypeArray) {
-			if child.Items != nil {
-				if child.Items.Type.HasType(PropertyTypeObject) {
-					objs = append(objs, child.Items)
-				}
-			}
-		}
-	}
-
-	for _, child := range s.OneOf {
-		if child.Type.HasType(PropertyTypeObject) {
-			objs = append(objs, child)
-		}
-
-		if child.Type.HasType(PropertyTypeArray) {
-			if child.Items != nil {
-				if child.Items.Type.HasType(PropertyTypeObject) {
-					objs = append(objs, child.Items)
-				}
-			}
-		}
-	}
-
-	// Sort the object schemas.
-	sort.Slice(objs, func(i, j int) bool {
-		return objs[i].Title < objs[j].Title
-	})
-
-	return objs
-}
-
-func makeRows(s *schema) [][]string {
-	// Buffer all property rows so that we can sort them before printing them.
-	rows := make([][]string, 0, len(s.Properties))
-
-	var typeStr string
-	if len(s.OneOf) > 0 {
-		typeStr = enumStr(s)
-		rows = append(rows, []string{"`object`", typeStr, "", ""})
-		return rows
-	}
-
-	for key, p := range s.Properties {
-		alias := propTypeAlias(p)
-
-		if alias != "" {
-			typeStr = alias
-		} else {
-			typeStr = propTypeStr(key, p)
-		}
-
-		// Emphasize required properties.
-		var required string
-		if in(s.Required, key) {
-			required = "**Yes**"
-		} else {
-			required = "No"
-		}
-
-		var desc string
-		if p.inheritedFrom != "" {
-			desc = fmt.Sprintf("*(Inherited from [%s](#%s))*", p.inheritedFrom, strings.ToLower(p.inheritedFrom))
-		}
-
-		if p.Description != "" {
-			desc += "\n" + p.Description
-		}
-
-		if len(p.Enum) > 0 {
-			vals := make([]string, 0, len(p.Enum))
-			for _, e := range p.Enum {
-				vals = append(vals, e.String())
-			}
-			desc += "\nPossible values are: `" + strings.Join(vals, "`, `") + "`."
-		}
-
-		var defaultValue string
-		if p.Default != nil {
-			defaultValue = fmt.Sprintf("`%v`", p.Default)
-		}
-
-		// Render a constraint only if it's not a type alias https://cuelang.org/docs/references/spec/#predeclared-identifiers
-		if alias == "" {
-			desc += constraintDescr(p)
-		}
-		rows = append(rows, []string{fmt.Sprintf("`%s`", key), typeStr, required, defaultValue, formatForTable(desc)})
-	}
-
-	// Sort by the required column, then by the name column.
-	sort.Slice(rows, func(i, j int) bool {
-		if rows[i][2] < rows[j][2] {
-			return true
-		}
-		if rows[i][2] > rows[j][2] {
-			return false
-		}
-		return rows[i][0] < rows[j][0]
-	})
-	return rows
-}
-
-func propTypeAlias(prop *schema) string {
-	if prop.Minimum == "" || prop.Maximum == "" {
-		return ""
-	}
-
-	min := prop.Minimum
-	max := prop.Maximum
-
-	switch {
-	case min == "0" && max == "255":
-		return "uint8"
-	case min == "0" && max == "65535":
-		return "uint16"
-	case min == "0" && max == "4294967295":
-		return "uint32"
-	case min == "0" && max == "18446744073709551615":
-		return "uint64"
-	case min == "-128" && max == "127":
-		return "int8"
-	case min == "-32768" && max == "32767":
-		return "int16"
-	case min == "-2147483648" && max == "2147483647":
-		return "int32"
-	case min == "-9223372036854775808" && max == "9223372036854775807":
-		return "int64"
-	default:
-		return ""
-	}
-}
-
-func constraintDescr(prop *schema) string {
-	if prop.Minimum != "" && prop.Maximum != "" {
-		var left, right string
-		if prop.ExclusiveMinimum {
-			left = ">" + prop.Minimum.String()
-		} else {
-			left = ">=" + prop.Minimum.String()
-		}
-
-		if prop.ExclusiveMaximum {
-			right = "<" + prop.Maximum.String()
-		} else {
-			right = "<=" + prop.Maximum.String()
-		}
-		return fmt.Sprintf("\nConstraint: `%s & %s`.", left, right)
-	}
-
-	if prop.MinLength > 0 {
-		left := fmt.Sprintf(">=%v", prop.MinLength)
-		right := ""
-
-		if prop.MaxLength > 0 {
-			right = fmt.Sprintf(" && <=%v", prop.MaxLength)
-		}
-		return fmt.Sprintf("\nConstraint: `length %s`.", left+right)
-	}
-
-	if prop.Pattern != "" {
-		return fmt.Sprintf("\nConstraint: must match `%s`.", prop.Pattern)
-	}
-
-	return ""
-}
-
-func enumStr(propValue *schema) string {
-	var vals []string
-	for _, v := range propValue.OneOf {
-		vals = append(vals, fmt.Sprintf("[%s](#%s)", v.Title, strings.ToLower(v.Title)))
-	}
-	return "Possible types are: " + strings.Join(vals, ", ") + "."
-}
-
-func propTypeStr(propName string, propValue *schema) string {
-	// If the property has AdditionalProperties, it is most likely a map type
-	if propValue.AdditionalProperties != nil {
-		mapValue := renderMapType(propValue.AdditionalProperties)
-		return "map[string]" + mapValue
-	}
-
-	propType := make([]string, 0, len(propValue.Type))
-	// Generate relative links for objects and arrays of objects.
-	for _, pt := range propValue.Type {
-		switch pt {
-		case PropertyTypeObject:
-			name, anchor := propNameAndAnchor(propName, propValue.Title)
-			propType = append(propType, fmt.Sprintf("[%s](#%s)", name, anchor))
-		case PropertyTypeArray:
-			if propValue.Items != nil {
-				for _, pi := range propValue.Items.Type {
-					if pi == PropertyTypeObject {
-						name, anchor := propNameAndAnchor(propName, propValue.Items.Title)
-						propType = append(propType, fmt.Sprintf("[%s](#%s)[]", name, anchor))
-					} else {
-						propType = append(propType, fmt.Sprintf("%s[]", pi))
-					}
-				}
-			} else {
-				propType = append(propType, string(pt))
-			}
-		default:
-			propType = append(propType, string(pt))
-		}
-	}
-
-	if len(propType) == 0 {
-		return ""
-	}
-
-	if len(propType) == 1 {
-		return propType[0]
-	}
-
-	if len(propType) == 2 {
-		return strings.Join(propType, " or ")
-	}
-
-	return fmt.Sprintf("%s, or %s", strings.Join(propType[:len(propType)-1], ", "), propType[len(propType)-1])
-}
-
-func propNameAndAnchor(prop, title string) (string, string) {
-	if len(title) > 0 {
-		return title, strings.ToLower(title)
-	}
-	return string(PropertyTypeObject), strings.ToLower(prop)
-}
-
-// in returns true if a string slice contains a specific string.
-func in(strs []string, str string) bool {
-	for _, s := range strs {
-		if s == str {
-			return true
-		}
-	}
-	return false
-}
-
-// formatForTable returns string usable in a Markdown table.
-// It trims white spaces, replaces new lines and pipe characters.
-func formatForTable(in string) string {
-	s := strings.TrimSpace(in)
-	s = strings.ReplaceAll(s, "\n", "<br/>")
-	s = strings.ReplaceAll(s, "|", "&#124;")
-	return s
-}
-
-type PropertyTypes []PropertyType
-
-func (pts *PropertyTypes) HasType(pt PropertyType) bool {
-	for _, t := range *pts {
-		if t == pt {
-			return true
-		}
-	}
-	return false
-}
-
-func (pts *PropertyTypes) UnmarshalJSON(data []byte) error {
-	var value any
-	if err := json.Unmarshal(data, &value); err != nil {
-		return err
-	}
-
-	switch val := value.(type) {
-	case string:
-		*pts = []PropertyType{PropertyType(val)}
-		return nil
-	case []any:
-		var pt []PropertyType
-		for _, t := range val {
-			s, ok := t.(string)
-			if !ok {
-				return errors.New("unsupported property type")
-			}
-			pt = append(pt, PropertyType(s))
-		}
-		*pts = pt
-	default:
-		return errors.New("unsupported property type")
-	}
-
-	return nil
-}
-
-type PropertyType string
-
-const (
-	PropertyTypeString  PropertyType = "string"
-	PropertyTypeNumber  PropertyType = "number"
-	PropertyTypeBoolean PropertyType = "boolean"
-	PropertyTypeObject  PropertyType = "object"
-	PropertyTypeArray   PropertyType = "array"
-	PropertyTypeNull    PropertyType = "null"
-)
-
-type Any struct {
-	value any
-}
-
-func (u *Any) UnmarshalJSON(data []byte) error {
-	if err := json.Unmarshal(data, &u.value); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (u *Any) String() string {
-	return fmt.Sprintf("%v", u.value)
-}
diff --git a/pkg/codegen/jenny_eachmajor.go b/pkg/codegen/jenny_eachmajor.go
index 0bc3d1b8c216a..a0ba440b1f721 100644
--- a/pkg/codegen/jenny_eachmajor.go
+++ b/pkg/codegen/jenny_eachmajor.go
@@ -5,86 +5,83 @@ import (
 	"path/filepath"
 
 	"github.com/grafana/codejen"
-	"github.com/grafana/kindsys"
+	"github.com/grafana/cuetsy/ts"
+	"github.com/grafana/cuetsy/ts/ast"
 )
 
 // LatestMajorsOrXJenny returns a jenny that repeats the input for the latest in each major version.
-//
-// TODO remove forceGroup option, it's a temporary hack to accommodate core kinds
-func LatestMajorsOrXJenny(parentdir string, forceGroup bool, inner codejen.OneToOne[SchemaForGen]) OneToMany {
-	if inner == nil {
-		panic("inner jenny must not be nil")
-	}
-
+func LatestMajorsOrXJenny(parentdir string) OneToMany {
 	return &lmox{
-		parentdir:  parentdir,
-		inner:      inner,
-		forceGroup: forceGroup,
+		parentdir: parentdir,
+		inner:     TSTypesJenny{ApplyFuncs: []ApplyFunc{renameSpecNode}},
 	}
 }
 
 type lmox struct {
-	parentdir  string
-	inner      codejen.OneToOne[SchemaForGen]
-	forceGroup bool
+	parentdir string
+	inner     codejen.OneToOne[SchemaForGen]
 }
 
 func (j *lmox) JennyName() string {
 	return "LatestMajorsOrXJenny"
 }
 
-func (j *lmox) Generate(kind kindsys.Kind) (codejen.Files, error) {
-	// TODO remove this once codejen catches nils https://github.com/grafana/codejen/issues/5
-	if kind == nil {
-		return nil, nil
+func (j *lmox) Generate(sfg SchemaForGen) (codejen.Files, error) {
+	sfg.IsGroup = true
+	f, err := j.inner.Generate(sfg)
+	if err != nil {
+		return nil, fmt.Errorf("%s jenny failed for %s: %w", j.inner.JennyName(), sfg.Name, err)
 	}
-
-	comm := kind.Props().Common()
-	sfg := SchemaForGen{
-		Name:    comm.Name,
-		IsGroup: comm.LineageIsGroup,
+	if f == nil || !f.Exists() {
+		return nil, nil
 	}
 
-	if j.forceGroup {
-		sfg.IsGroup = true
-	}
+	f.RelativePath = filepath.Join(j.parentdir, sfg.OutputName, "x", f.RelativePath)
+	f.From = append(f.From, j)
+	return codejen.Files{*f}, nil
+}
 
-	do := func(sfg SchemaForGen, infix string) (codejen.Files, error) {
-		f, err := j.inner.Generate(sfg)
-		if err != nil {
-			return nil, fmt.Errorf("%s jenny failed on %s schema for %s: %w", j.inner.JennyName(), sfg.Schema.Version(), kind.Props().Common().Name, err)
-		}
-		if f == nil || !f.Exists() {
-			return nil, nil
+// renameSpecNode rename spec node from the TS file result
+func renameSpecNode(sfg SchemaForGen, tf *ast.File) {
+	specidx, specdefidx := -1, -1
+	for idx, def := range tf.Nodes {
+		// Peer through export keywords
+		if ex, is := def.(ast.ExportKeyword); is {
+			def = ex.Decl
 		}
 
-		f.RelativePath = filepath.Join(j.parentdir, comm.MachineName, infix, f.RelativePath)
-		f.From = append(f.From, j)
-		return codejen.Files{*f}, nil
+		switch x := def.(type) {
+		case ast.TypeDecl:
+			if x.Name.Name == "spec" {
+				specidx = idx
+				x.Name.Name = sfg.Name
+				tf.Nodes[idx] = x
+			}
+		case ast.VarDecl:
+			// Before:
+			//   export const defaultspec: Partial<spec> = {
+			// After:
+			// /  export const defaultPlaylist: Partial<Playlist> = {
+			if x.Names.Idents[0].Name == "defaultspec" {
+				specdefidx = idx
+				x.Names.Idents[0].Name = "default" + sfg.Name
+				tt := x.Type.(ast.TypeTransformExpr)
+				tt.Expr = ts.Ident(sfg.Name)
+				x.Type = tt
+				tf.Nodes[idx] = x
+			}
+		}
 	}
 
-	if comm.Maturity.Less(kindsys.MaturityStable) {
-		sfg.Schema = kind.Lineage().Latest()
-		return do(sfg, "x")
+	if specidx != -1 {
+		decl := tf.Nodes[specidx]
+		tf.Nodes = append(append(tf.Nodes[:specidx], tf.Nodes[specidx+1:]...), decl)
 	}
-
-	var fl codejen.Files
-	major := -1
-	for sch := kind.Lineage().First(); sch != nil; sch = sch.Successor() {
-		if int(sch.Version()[0]) == major {
-			continue
+	if specdefidx != -1 {
+		if specdefidx > specidx {
+			specdefidx--
 		}
-		major = int(sch.Version()[0])
-
-		sfg.Schema = sch.LatestInMajor()
-		files, err := do(sfg, fmt.Sprintf("v%v", sch.Version()[0]))
-		if err != nil {
-			return nil, err
-		}
-		fl = append(fl, files...)
-	}
-	if fl.Validate() != nil {
-		return nil, fl.Validate()
+		decl := tf.Nodes[specdefidx]
+		tf.Nodes = append(append(tf.Nodes[:specdefidx], tf.Nodes[specdefidx+1:]...), decl)
 	}
-	return fl, nil
 }
diff --git a/pkg/codegen/jenny_go_resources.go b/pkg/codegen/jenny_go_resources.go
deleted file mode 100644
index 72a3dfa5f6b96..0000000000000
--- a/pkg/codegen/jenny_go_resources.go
+++ /dev/null
@@ -1,128 +0,0 @@
-package codegen
-
-import (
-	"bytes"
-	"fmt"
-	"go/format"
-	"strings"
-
-	"cuelang.org/go/cue"
-	"github.com/dave/dst/dstutil"
-	"github.com/grafana/codejen"
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema/encoding/gocode"
-	"github.com/grafana/thema/encoding/openapi"
-)
-
-var schPath = cue.MakePath(cue.Hid("_#schema", "github.com/grafana/thema"))
-
-type ResourceGoTypesJenny struct {
-	ApplyFuncs       []dstutil.ApplyFunc
-	ExpandReferences bool
-}
-
-func (*ResourceGoTypesJenny) JennyName() string {
-	return "GoTypesJenny"
-}
-
-func (ag *ResourceGoTypesJenny) Generate(kind kindsys.Kind) (*codejen.File, error) {
-	comm := kind.Props().Common()
-	sfg := SchemaForGen{
-		Name:    comm.Name,
-		Schema:  kind.Lineage().Latest(),
-		IsGroup: comm.LineageIsGroup,
-	}
-	sch := sfg.Schema
-
-	iter, err := sch.Underlying().LookupPath(schPath).Fields()
-	if err != nil {
-		return nil, err
-	}
-
-	var subr []string
-	for iter.Next() {
-		subr = append(subr, typeNameFromKey(iter.Selector().String()))
-	}
-
-	buf := new(bytes.Buffer)
-	mname := kind.Props().Common().MachineName
-	if err := tmpls.Lookup("core_resource.tmpl").Execute(buf, tvars_resource{
-		PackageName:      mname,
-		KindName:         kind.Props().Common().Name,
-		Version:          strings.Replace(sfg.Schema.Version().String(), ".", "-", -1),
-		SubresourceNames: subr,
-	}); err != nil {
-		return nil, fmt.Errorf("failed executing core resource template: %w", err)
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	content, err := format.Source(buf.Bytes())
-	if err != nil {
-		return nil, err
-	}
-
-	return codejen.NewFile(fmt.Sprintf("pkg/kinds/%s/%s_gen.go", mname, mname), content, ag), nil
-}
-
-type SubresourceGoTypesJenny struct {
-	ApplyFuncs       []dstutil.ApplyFunc
-	ExpandReferences bool
-}
-
-func (*SubresourceGoTypesJenny) JennyName() string {
-	return "GoResourceTypes"
-}
-
-func (g *SubresourceGoTypesJenny) Generate(kind kindsys.Kind) (codejen.Files, error) {
-	comm := kind.Props().Common()
-	sfg := SchemaForGen{
-		Name:    comm.Name,
-		Schema:  kind.Lineage().Latest(),
-		IsGroup: comm.LineageIsGroup,
-	}
-	sch := sfg.Schema
-
-	// Iterate through all top-level fields and make go types for them
-	// (this should consist of "spec" and arbitrary subresources)
-	i, err := sch.Underlying().LookupPath(schPath).Fields()
-	if err != nil {
-		return nil, err
-	}
-	files := make(codejen.Files, 0)
-	for i.Next() {
-		str := i.Selector().String()
-
-		b, err := gocode.GenerateTypesOpenAPI(sch, &gocode.TypeConfigOpenAPI{
-			// TODO will need to account for sanitizing e.g. dashes here at some point
-			Config: &openapi.Config{
-				Group:    false, // TODO: better
-				RootName: typeNameFromKey(str),
-				Subpath:  cue.MakePath(cue.Str(str)),
-			},
-			PackageName: sfg.Schema.Lineage().Name(),
-			ApplyFuncs:  append(g.ApplyFuncs, PrefixDropper(sfg.Name)),
-		})
-		if err != nil {
-			return nil, err
-		}
-
-		name := sfg.Schema.Lineage().Name()
-		files = append(files, codejen.File{
-			RelativePath: fmt.Sprintf("pkg/kinds/%s/%s_%s_gen.go", name, name, strings.ToLower(str)),
-			Data:         b,
-			From:         []codejen.NamedJenny{g},
-		})
-	}
-
-	return files, nil
-}
-
-func typeNameFromKey(key string) string {
-	if len(key) > 0 {
-		return strings.ToUpper(key[:1]) + key[1:]
-	}
-	return strings.ToUpper(key)
-}
diff --git a/pkg/codegen/jenny_go_spec.go b/pkg/codegen/jenny_go_spec.go
new file mode 100644
index 0000000000000..caefbdbbe4d06
--- /dev/null
+++ b/pkg/codegen/jenny_go_spec.go
@@ -0,0 +1,45 @@
+package codegen
+
+import (
+	"fmt"
+	"strings"
+
+	"cuelang.org/go/cue"
+	"github.com/dave/dst/dstutil"
+	"github.com/grafana/codejen"
+	"github.com/grafana/grafana/pkg/codegen/generators"
+)
+
+type GoSpecJenny struct {
+	ApplyFuncs []dstutil.ApplyFunc
+}
+
+func (jenny *GoSpecJenny) JennyName() string {
+	return "GoResourceTypes"
+}
+
+func (jenny *GoSpecJenny) Generate(sfg ...SchemaForGen) (codejen.Files, error) {
+	files := make(codejen.Files, len(sfg))
+	for i, v := range sfg {
+		packageName := strings.ToLower(v.Name)
+		b, err := generators.GenerateTypesGo(v.CueFile,
+			&generators.GoConfig{
+				Config: &generators.OpenApiConfig{
+					IsGroup:  false,
+					RootName: "Spec",
+					SubPath:  cue.MakePath(cue.Str("spec")),
+				},
+				PackageName: packageName,
+				ApplyFuncs:  append(jenny.ApplyFuncs, PrefixDropper(v.Name)),
+			},
+		)
+
+		if err != nil {
+			return nil, err
+		}
+
+		files[i] = *codejen.NewFile(fmt.Sprintf("pkg/kinds/%s/%s_spec_gen.go", packageName, packageName), b, jenny)
+	}
+
+	return files, nil
+}
diff --git a/pkg/codegen/jenny_go_types.go b/pkg/codegen/jenny_go_types.go
deleted file mode 100644
index d1d83364a576a..0000000000000
--- a/pkg/codegen/jenny_go_types.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package codegen
-
-import (
-	copenapi "cuelang.org/go/encoding/openapi"
-	"github.com/dave/dst/dstutil"
-	"github.com/grafana/codejen"
-	"github.com/grafana/thema/encoding/gocode"
-	"github.com/grafana/thema/encoding/openapi"
-)
-
-// GoTypesJenny is a [OneToOne] that produces Go types for the provided
-// [thema.Schema].
-type GoTypesJenny struct {
-	ApplyFuncs       []dstutil.ApplyFunc
-	ExpandReferences bool
-}
-
-func (j GoTypesJenny) JennyName() string {
-	return "GoTypesJenny"
-}
-
-func (j GoTypesJenny) Generate(sfg SchemaForGen) (*codejen.File, error) {
-	// TODO allow using name instead of machine name in thema generator
-	b, err := gocode.GenerateTypesOpenAPI(sfg.Schema, &gocode.TypeConfigOpenAPI{
-		// TODO will need to account for sanitizing e.g. dashes here at some point
-		Config: &openapi.Config{
-			Group:    sfg.IsGroup,
-			RootName: sfg.Name,
-			Config: &copenapi.Config{
-				ExpandReferences: j.ExpandReferences,
-			},
-		},
-		PackageName: sfg.Schema.Lineage().Name(),
-		ApplyFuncs:  append(j.ApplyFuncs, PrefixDropper(sfg.Name)),
-	})
-
-	if err != nil {
-		return nil, err
-	}
-
-	return codejen.NewFile(sfg.Schema.Lineage().Name()+"_types_gen.go", b, j), nil
-}
diff --git a/pkg/codegen/jenny_k8_resources.go b/pkg/codegen/jenny_k8_resources.go
new file mode 100644
index 0000000000000..ccc84eeb4e550
--- /dev/null
+++ b/pkg/codegen/jenny_k8_resources.go
@@ -0,0 +1,116 @@
+package codegen
+
+import (
+	"bytes"
+	"fmt"
+	"go/format"
+	"strings"
+
+	"cuelang.org/go/cue"
+	"github.com/grafana/codejen"
+)
+
+// K8ResourcesJenny generates resource, metadata and status for each file.
+type K8ResourcesJenny struct {
+}
+
+func (jenny *K8ResourcesJenny) JennyName() string {
+	return "K8ResourcesJenny"
+}
+
+func (jenny *K8ResourcesJenny) Generate(cueFiles ...SchemaForGen) (codejen.Files, error) {
+	files := make(codejen.Files, 0)
+	for _, val := range cueFiles {
+		resource, err := jenny.genResource(val.Name, val.CueFile)
+		if err != nil {
+			return nil, err
+		}
+
+		metadata, err := jenny.genMetadata(val.Name)
+		if err != nil {
+			return nil, err
+		}
+
+		status, err := jenny.genStatus(val.Name)
+		if err != nil {
+			return nil, err
+		}
+
+		files = append(files, resource)
+		files = append(files, metadata)
+		files = append(files, status)
+	}
+
+	return files, nil
+}
+
+func (jenny *K8ResourcesJenny) genResource(pkg string, val cue.Value) (codejen.File, error) {
+	version, err := getVersion(val)
+	if err != nil {
+		return codejen.File{}, err
+	}
+
+	pkgName := strings.ToLower(pkg)
+
+	buf := new(bytes.Buffer)
+	if err := tmpls.Lookup("core_resource.tmpl").Execute(buf, tvars_resource{
+		PackageName: pkgName,
+		KindName:    pkg,
+		Version:     version,
+	}); err != nil {
+		return codejen.File{}, fmt.Errorf("failed executing core resource template: %w", err)
+	}
+
+	content, err := format.Source(buf.Bytes())
+	if err != nil {
+		return codejen.File{}, err
+	}
+
+	return *codejen.NewFile(fmt.Sprintf("pkg/kinds/%s/%s_gen.go", pkgName, pkgName), content, jenny), nil
+}
+
+func (jenny *K8ResourcesJenny) genMetadata(pkg string) (codejen.File, error) {
+	pkg = strings.ToLower(pkg)
+
+	buf := new(bytes.Buffer)
+	if err := tmpls.Lookup("core_metadata.tmpl").Execute(buf, tvars_metadata{
+		PackageName: pkg,
+	}); err != nil {
+		return codejen.File{}, fmt.Errorf("failed executing core resource template: %w", err)
+	}
+
+	return *codejen.NewFile(fmt.Sprintf("pkg/kinds/%s/%s_metadata_gen.go", pkg, pkg), buf.Bytes(), jenny), nil
+}
+
+func (jenny *K8ResourcesJenny) genStatus(pkg string) (codejen.File, error) {
+	pkg = strings.ToLower(pkg)
+
+	buf := new(bytes.Buffer)
+	if err := tmpls.Lookup("core_status.tmpl").Execute(buf, tvars_status{
+		PackageName: pkg,
+	}); err != nil {
+		return codejen.File{}, fmt.Errorf("failed executing core resource template: %w", err)
+	}
+
+	return *codejen.NewFile(fmt.Sprintf("pkg/kinds/%s/%s_status_gen.go", pkg, pkg), buf.Bytes(), jenny), nil
+}
+
+func getVersion(val cue.Value) (string, error) {
+	val = val.LookupPath(cue.ParsePath("lineage.schemas[0].version"))
+	versionValues, err := val.List()
+	if err != nil {
+		return "", fmt.Errorf("missing version in schema: %s", err)
+	}
+
+	version := make([]int64, 0)
+	for versionValues.Next() {
+		v, err := versionValues.Value().Int64()
+		if err != nil {
+			return "", fmt.Errorf("version should be a list of two elements: %s", err)
+		}
+
+		version = append(version, v)
+	}
+
+	return fmt.Sprintf("%d-%d", version[0], version[1]), nil
+}
diff --git a/pkg/codegen/jenny_ts_resources.go b/pkg/codegen/jenny_ts_resources.go
deleted file mode 100644
index 9e3391a6276b1..0000000000000
--- a/pkg/codegen/jenny_ts_resources.go
+++ /dev/null
@@ -1,85 +0,0 @@
-package codegen
-
-import (
-	"github.com/grafana/codejen"
-	"github.com/grafana/cuetsy"
-	"github.com/grafana/cuetsy/ts"
-	"github.com/grafana/cuetsy/ts/ast"
-	"github.com/grafana/grafana/pkg/cuectx"
-	"github.com/grafana/thema/encoding/typescript"
-)
-
-// TSResourceJenny is a [OneToOne] that produces TypeScript types and
-// defaults for a Thema schema.
-//
-// Thema's generic TS jenny will be able to replace this one once
-// https://github.com/grafana/thema/issues/89 is complete.
-type TSResourceJenny struct{}
-
-var _ codejen.OneToOne[SchemaForGen] = &TSResourceJenny{}
-
-func (j TSResourceJenny) JennyName() string {
-	return "TSResourceJenny"
-}
-
-func (j TSResourceJenny) Generate(sfg SchemaForGen) (*codejen.File, error) {
-	// TODO allow using name instead of machine name in thema generator
-	f, err := typescript.GenerateTypes(sfg.Schema, &typescript.TypeConfig{
-		RootName: sfg.Name,
-		Group:    sfg.IsGroup,
-		CuetsyConfig: &cuetsy.Config{
-			Export:       true,
-			ImportMapper: cuectx.MapCUEImportToTS,
-		},
-	})
-	if err != nil {
-		return nil, err
-	}
-	renameSpecNode(sfg.Name, f)
-
-	return codejen.NewFile(sfg.Schema.Lineage().Name()+"_types.gen.ts", []byte(f.String()), j), nil
-}
-
-func renameSpecNode(name string, tf *ast.File) {
-	specidx, specdefidx := -1, -1
-	for idx, def := range tf.Nodes {
-		// Peer through export keywords
-		if ex, is := def.(ast.ExportKeyword); is {
-			def = ex.Decl
-		}
-
-		switch x := def.(type) {
-		case ast.TypeDecl:
-			if x.Name.Name == "spec" {
-				specidx = idx
-				x.Name.Name = name
-				tf.Nodes[idx] = x
-			}
-		case ast.VarDecl:
-			// Before:
-			//   export const defaultspec: Partial<spec> = {
-			// After:
-			///  export const defaultPlaylist: Partial<Playlist> = {
-			if x.Names.Idents[0].Name == "defaultspec" {
-				specdefidx = idx
-				x.Names.Idents[0].Name = "default" + name
-				tt := x.Type.(ast.TypeTransformExpr)
-				tt.Expr = ts.Ident(name)
-				x.Type = tt
-				tf.Nodes[idx] = x
-			}
-		}
-	}
-
-	if specidx != -1 {
-		decl := tf.Nodes[specidx]
-		tf.Nodes = append(append(tf.Nodes[:specidx], tf.Nodes[specidx+1:]...), decl)
-	}
-	if specdefidx != -1 {
-		if specdefidx > specidx {
-			specdefidx--
-		}
-		decl := tf.Nodes[specdefidx]
-		tf.Nodes = append(append(tf.Nodes[:specdefidx], tf.Nodes[specdefidx+1:]...), decl)
-	}
-}
diff --git a/pkg/codegen/jenny_ts_types.go b/pkg/codegen/jenny_ts_types.go
index d16968a45cf20..913788c51bb30 100644
--- a/pkg/codegen/jenny_ts_types.go
+++ b/pkg/codegen/jenny_ts_types.go
@@ -3,16 +3,16 @@ package codegen
 import (
 	"github.com/grafana/codejen"
 	"github.com/grafana/cuetsy"
-	"github.com/grafana/grafana/pkg/cuectx"
-	"github.com/grafana/thema/encoding/typescript"
+	"github.com/grafana/cuetsy/ts/ast"
+	"github.com/grafana/grafana/pkg/codegen/generators"
 )
 
-// TSTypesJenny is a [OneToOne] that produces TypeScript types and
-// defaults for a Thema schema.
-//
-// Thema's generic TS jenny will be able to replace this one once
-// https://github.com/grafana/thema/issues/89 is complete.
-type TSTypesJenny struct{}
+type ApplyFunc func(sfg SchemaForGen, file *ast.File)
+
+// TSTypesJenny is a [OneToOne] that produces TypeScript types and defaults.
+type TSTypesJenny struct {
+	ApplyFuncs []ApplyFunc
+}
 
 var _ codejen.OneToOne[SchemaForGen] = &TSTypesJenny{}
 
@@ -21,18 +21,27 @@ func (j TSTypesJenny) JennyName() string {
 }
 
 func (j TSTypesJenny) Generate(sfg SchemaForGen) (*codejen.File, error) {
-	// TODO allow using name instead of machine name in thema generator
-	f, err := typescript.GenerateTypes(sfg.Schema, &typescript.TypeConfig{
+	f, err := generators.GenerateTypesTS(sfg.CueFile, &generators.TSConfig{
 		CuetsyConfig: &cuetsy.Config{
 			Export:       true,
-			ImportMapper: cuectx.MapCUEImportToTS,
+			ImportMapper: MapCUEImportToTS,
 		},
 		RootName: sfg.Name,
-		Group:    sfg.IsGroup,
+		IsGroup:  sfg.IsGroup,
 	})
+
+	for _, renameFunc := range j.ApplyFuncs {
+		renameFunc(sfg, f)
+	}
+
 	if err != nil {
 		return nil, err
 	}
 
-	return codejen.NewFile(sfg.Schema.Lineage().Name()+"_types.gen.ts", []byte(f.String()), j), nil
+	outputName := sfg.Name
+	if sfg.OutputName != "" {
+		outputName = sfg.OutputName
+	}
+
+	return codejen.NewFile(outputName+"_types.gen.ts", []byte(f.String()), j), nil
 }
diff --git a/pkg/codegen/jenny_tsveneerindex.go b/pkg/codegen/jenny_tsveneerindex.go
index 875301ec815a5..87bea1da7b118 100644
--- a/pkg/codegen/jenny_tsveneerindex.go
+++ b/pkg/codegen/jenny_tsveneerindex.go
@@ -12,10 +12,7 @@ import (
 	"github.com/grafana/cuetsy"
 	"github.com/grafana/cuetsy/ts"
 	"github.com/grafana/cuetsy/ts/ast"
-	"github.com/grafana/grafana/pkg/cuectx"
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema"
-	"github.com/grafana/thema/encoding/typescript"
+	"github.com/grafana/grafana/pkg/codegen/generators"
 )
 
 // TSVeneerIndexJenny generates an index.gen.ts file with references to all
@@ -41,19 +38,18 @@ func (gen *genTSVeneerIndex) JennyName() string {
 	return "TSVeneerIndexJenny"
 }
 
-func (gen *genTSVeneerIndex) Generate(kinds ...kindsys.Kind) (*codejen.File, error) {
+func (gen *genTSVeneerIndex) Generate(sfg ...SchemaForGen) (*codejen.File, error) {
 	tsf := new(ast.File)
-	for _, def := range kinds {
-		sch := def.Lineage().Latest()
-		f, err := typescript.GenerateTypes(sch, &typescript.TypeConfig{
+	for _, def := range sfg {
+		f, err := generators.GenerateTypesTS(def.CueFile, &generators.TSConfig{
 			CuetsyConfig: &cuetsy.Config{
-				ImportMapper: cuectx.MapCUEImportToTS,
+				ImportMapper: MapCUEImportToTS,
 			},
-			RootName: def.Props().Common().Name,
-			Group:    def.Props().Common().LineageIsGroup,
+			RootName: def.Name,
+			IsGroup:  def.IsGroup,
 		})
 		if err != nil {
-			return nil, fmt.Errorf("%s: %w", def.Props().Common().Name, err)
+			return nil, fmt.Errorf("%s: %w", def.Name, err)
 		}
 		// The obvious approach would be calling renameSpecNode() here, same as in the ts resource jenny,
 		// to rename the "spec" field to the name of the kind. But that was causing extra
@@ -64,7 +60,7 @@ func (gen *genTSVeneerIndex) Generate(kinds ...kindsys.Kind) (*codejen.File, err
 
 		elems, err := gen.extractTSIndexVeneerElements(def, f)
 		if err != nil {
-			return nil, fmt.Errorf("%s: %w", def.Props().Common().Name, err)
+			return nil, fmt.Errorf("%s: %w", def.Name, err)
 		}
 		tsf.Nodes = append(tsf.Nodes, elems...)
 	}
@@ -72,12 +68,9 @@ func (gen *genTSVeneerIndex) Generate(kinds ...kindsys.Kind) (*codejen.File, err
 	return codejen.NewFile(filepath.Join(gen.dir, "index.gen.ts"), []byte(tsf.String()), gen), nil
 }
 
-func (gen *genTSVeneerIndex) extractTSIndexVeneerElements(def kindsys.Kind, tf *ast.File) ([]ast.Decl, error) {
-	lin := def.Lineage()
-	comm := def.Props().Common()
-
+func (gen *genTSVeneerIndex) extractTSIndexVeneerElements(def SchemaForGen, tf *ast.File) ([]ast.Decl, error) {
 	// Check the root, then walk the tree
-	rootv := lin.Latest().Underlying().LookupPath(schPath)
+	rootv := def.CueFile.LookupPath(cue.ParsePath("lineage.schemas[0].schema"))
 
 	var raw, custom, rawD, customD ast.Idents
 
@@ -103,7 +96,7 @@ func (gen *genTSVeneerIndex) extractTSIndexVeneerElements(def kindsys.Kind, tf *
 			}
 
 			// Search the generated TS AST for the type and default def nodes
-			pair := findDeclNode(name, comm.Name, tf)
+			pair := findDeclNode(name, def.Name, tf)
 			if pair.T == nil {
 				// No generated type for this item, skip it
 				return false
@@ -150,29 +143,32 @@ func (gen *genTSVeneerIndex) extractTSIndexVeneerElements(def kindsys.Kind, tf *
 		return nil, terr
 	}
 
-	vpath := fmt.Sprintf("v%v", thema.Lineage.Latest(lin).Version())
-	if def.Props().Common().Maturity.Less(kindsys.MaturityStable) {
-		vpath = "x"
-	}
+	vpath := "x"
+	machineName := strings.ToLower(def.Name)
 
 	ret := make([]ast.Decl, 0)
 	if len(raw) > 0 {
 		ret = append(ret, ast.ExportSet{
-			CommentList: []ast.Comment{ts.CommentFromString(fmt.Sprintf("Raw generated types from %s kind.", comm.Name), 80, false)},
+			CommentList: []ast.Comment{ts.CommentFromString(fmt.Sprintf("Raw generated types from %s kind.", def.Name), 80, false)},
 			TypeOnly:    true,
 			Exports:     raw,
-			From:        ast.Str{Value: fmt.Sprintf("./raw/%s/%s/%s_types.gen", comm.MachineName, vpath, comm.MachineName)},
+			From:        ast.Str{Value: fmt.Sprintf("./raw/%s/%s/%s_types.gen", machineName, vpath, machineName)},
 		})
 	}
 	if len(rawD) > 0 {
 		ret = append(ret, ast.ExportSet{
-			CommentList: []ast.Comment{ts.CommentFromString(fmt.Sprintf("Raw generated enums and default consts from %s kind.", lin.Name()), 80, false)},
+			CommentList: []ast.Comment{ts.CommentFromString(fmt.Sprintf("Raw generated enums and default consts from %s kind.", machineName), 80, false)},
 			TypeOnly:    false,
 			Exports:     rawD,
-			From:        ast.Str{Value: fmt.Sprintf("./raw/%s/%s/%s_types.gen", comm.MachineName, vpath, comm.MachineName)},
+			From:        ast.Str{Value: fmt.Sprintf("./raw/%s/%s/%s_types.gen", machineName, vpath, machineName)},
 		})
 	}
-	vtfile := fmt.Sprintf("./veneer/%s.types", lin.Name())
+	vtfile := fmt.Sprintf("./veneer/%s.types", machineName)
+	version, err := getVersion(def.CueFile)
+	if err != nil {
+		return nil, err
+	}
+
 	customstr := fmt.Sprintf(`// The following exported declarations correspond to types in the %s@%s kind's
 // schema with attribute @grafana(TSVeneer="type").
 //
@@ -182,7 +178,7 @@ func (gen *genTSVeneerIndex) extractTSIndexVeneerElements(def kindsys.Kind, tf *
 // and exports all the symbols in the list.
 //
 // TODO generate code such that tsc enforces type compatibility between raw and veneer decls`,
-		lin.Name(), thema.Lineage.Latest(lin).Version(), filepath.ToSlash(filepath.Join(gen.dir, vtfile)))
+		machineName, strings.ReplaceAll(version, "-", "."), filepath.ToSlash(filepath.Join(gen.dir, vtfile)))
 
 	customComments := []ast.Comment{{Text: customstr}}
 	if len(custom) > 0 {
diff --git a/pkg/codegen/latest_jenny.go b/pkg/codegen/latest_jenny.go
deleted file mode 100644
index b8a0a618a0e27..0000000000000
--- a/pkg/codegen/latest_jenny.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package codegen
-
-import (
-	"fmt"
-	"path/filepath"
-
-	"github.com/grafana/codejen"
-	"github.com/grafana/kindsys"
-)
-
-// LatestJenny returns a jenny that runs another jenny for only the latest
-// schema in a DefForGen, and prefixes the resulting file with the provided
-// parentdir (e.g. "pkg/kinds/") and with a directory based on the kind's
-// machine name (e.g. "dashboard/").
-func LatestJenny(parentdir string, inner codejen.OneToOne[SchemaForGen]) OneToOne {
-	if inner == nil {
-		panic("inner jenny must not be nil")
-	}
-
-	return &latestj{
-		parentdir: parentdir,
-		inner:     inner,
-	}
-}
-
-type latestj struct {
-	parentdir string
-	inner     codejen.OneToOne[SchemaForGen]
-}
-
-func (j *latestj) JennyName() string {
-	return "LatestJenny"
-}
-
-func (j *latestj) Generate(kind kindsys.Kind) (*codejen.File, error) {
-	comm := kind.Props().Common()
-	sfg := SchemaForGen{
-		Name:    comm.Name,
-		Schema:  kind.Lineage().Latest(),
-		IsGroup: comm.LineageIsGroup,
-	}
-
-	f, err := j.inner.Generate(sfg)
-	if err != nil {
-		return nil, fmt.Errorf("%s jenny failed on %s schema for %s: %w", j.inner.JennyName(), sfg.Schema.Version(), kind.Props().Common().Name, err)
-	}
-	if f == nil || !f.Exists() {
-		return nil, nil
-	}
-
-	f.RelativePath = filepath.Join(j.parentdir, comm.MachineName, f.RelativePath)
-	f.From = append(f.From, j)
-	return f, nil
-}
diff --git a/pkg/codegen/tmpl.go b/pkg/codegen/tmpl.go
index 0abfdd4511eae..8f8a179cb3293 100644
--- a/pkg/codegen/tmpl.go
+++ b/pkg/codegen/tmpl.go
@@ -7,7 +7,6 @@ import (
 	"time"
 
 	"github.com/grafana/codejen"
-	"github.com/grafana/kindsys"
 )
 
 // All the parsed templates in the tmpl subdirectory
@@ -33,15 +32,27 @@ type (
 		From          string
 		Leader        string
 	}
-	tvars_kind_registry struct {
-		PackageName       string
-		KindPackagePrefix string
-		Kinds             []kindsys.Core
-	}
+
 	tvars_resource struct {
-		PackageName      string
-		KindName         string
-		Version          string
-		SubresourceNames []string
+		PackageName string
+		KindName    string
+		Version     string
+	}
+
+	tvars_metadata struct {
+		PackageName string
+	}
+
+	tvars_status struct {
+		PackageName string
+	}
+
+	tvars_registry struct {
+		Schemas []Schema
+	}
+
+	Schema struct {
+		Name     string
+		FilePath string
 	}
 )
diff --git a/pkg/codegen/tmpl/addenda.tmpl b/pkg/codegen/tmpl/addenda.tmpl
deleted file mode 100644
index dc7533b8ea73c..0000000000000
--- a/pkg/codegen/tmpl/addenda.tmpl
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-//go:embed coremodel.cue
-var cueFS embed.FS
-
-// The current version of the coremodel schema, as declared in coremodel.cue.
-// This version determines what schema version is returned from [Coremodel.CurrentSchema],
-// and which schema version is used for code generation within the grafana/grafana repository.
-//
-// The code generator ensures that this is always the latest Thema schema version.
-var currentVersion = thema.SV({{ .LatestSeqv }}, {{ .LatestSchv }})
-
-// Lineage returns the Thema lineage representing a Grafana {{ .Name }}.
-//
-// The lineage is the canonical specification of the current {{ .Name }} schema,
-// all prior schema versions, and the mappings that allow migration between
-// schema versions.
-{{- if .IsComposed }}//
-// This is the base variant of the schema. It does not include any composed
-// plugin schemas.{{ end }}
-func Lineage(rt *thema.Runtime, opts ...thema.BindOption) (thema.Lineage, error) {
-	return cuectx.LoadGrafanaInstancesWithThema(filepath.Join("pkg", "coremodel", "{{ .Name }}"), cueFS, rt, opts...)
-}
-
-var _ thema.LineageFactory = Lineage
-var _ coremodel.Interface = &Coremodel{}
-
-// Coremodel contains the foundational schema declaration for {{ .Name }}s.
-// It implements coremodel.Interface.
-type Coremodel struct {
-	lin thema.Lineage
-}
-
-// Lineage returns the canonical {{ .Name }} Lineage.
-func (c *Coremodel) Lineage() thema.Lineage {
-	return c.lin
-}
-
-// CurrentSchema returns the current (latest) {{ .Name }} Thema schema.
-func (c *Coremodel) CurrentSchema() thema.Schema {
-	return thema.SchemaP(c.lin, currentVersion)
-}
-
-// GoType returns a pointer to an empty Go struct that corresponds to
-// the current Thema schema.
-func (c *Coremodel) GoType() interface{} {
-	return &Model{}
-}
-
-// New returns a new instance of the {{ .Name }} coremodel.
-//
-// Note that this function does not cache, and initially loading a Thema lineage
-// can be expensive. As such, the Grafana backend should prefer to access this
-// coremodel through a registry (pkg/framework/coremodel/registry), which does cache.
-func New(rt *thema.Runtime) (*Coremodel, error) {
-	lin, err := Lineage(rt)
-	if err != nil {
-		return nil, err
-	}
-
-	return &Coremodel{
-		lin: lin,
-	}, nil
-}
diff --git a/pkg/codegen/tmpl/autogen_header.tmpl b/pkg/codegen/tmpl/autogen_header.tmpl
deleted file mode 100644
index c6af378dc5bb7..0000000000000
--- a/pkg/codegen/tmpl/autogen_header.tmpl
+++ /dev/null
@@ -1,28 +0,0 @@
-{{ if .GenLicense -}}
-// Copyright {{ now.Year }} Grafana Labs
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-{{ end -}}
-// This file is autogenerated. DO NOT EDIT.
-{{- if ne .GeneratorPath "" }}
-//
-// Generated by {{ .GeneratorPath }}
-{{- end }}
-{{- if ne .LineagePath "" }}
-//
-// Derived from the Thema lineage declared in {{ .LineagePath }}{{ if ne .LineageCUEPath "" }} at CUE path "{{ .LineageCUEPath }}"{{ end }}
-{{- end }}
-//
-// Run `make gen-cue` from repository root to regenerate.
-
diff --git a/pkg/codegen/tmpl/core_metadata.tmpl b/pkg/codegen/tmpl/core_metadata.tmpl
new file mode 100644
index 0000000000000..11bf70f342c64
--- /dev/null
+++ b/pkg/codegen/tmpl/core_metadata.tmpl
@@ -0,0 +1,33 @@
+package {{ .PackageName }}
+
+import (
+	"time"
+)
+
+// Metadata defines model for Metadata.
+type Metadata struct {
+	CreatedBy         string     `json:"createdBy"`
+	CreationTimestamp time.Time  `json:"creationTimestamp"`
+	DeletionTimestamp *time.Time `json:"deletionTimestamp,omitempty"`
+
+	// extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
+	ExtraFields     map[string]any    `json:"extraFields"`
+	Finalizers      []string          `json:"finalizers"`
+	Labels          map[string]string `json:"labels"`
+	ResourceVersion string            `json:"resourceVersion"`
+	Uid             string            `json:"uid"`
+	UpdateTimestamp time.Time         `json:"updateTimestamp"`
+	UpdatedBy       string            `json:"updatedBy"`
+}
+
+// _kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
+// It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
+// As it is also intended to be generic enough to function with any API Server.
+type KubeObjectMetadata struct {
+	CreationTimestamp time.Time         `json:"creationTimestamp"`
+	DeletionTimestamp *time.Time        `json:"deletionTimestamp,omitempty"`
+	Finalizers        []string          `json:"finalizers"`
+	Labels            map[string]string `json:"labels"`
+	ResourceVersion   string            `json:"resourceVersion"`
+	Uid               string            `json:"uid"`
+}
diff --git a/pkg/codegen/tmpl/core_registry.tmpl b/pkg/codegen/tmpl/core_registry.tmpl
new file mode 100644
index 0000000000000..8fc8bb9b0928e
--- /dev/null
+++ b/pkg/codegen/tmpl/core_registry.tmpl
@@ -0,0 +1,46 @@
+package schemas
+
+import (
+    "os"
+    "path/filepath"
+    "runtime"
+    
+    "cuelang.org/go/cue"
+    "cuelang.org/go/cue/cuecontext"
+)
+
+type CoreKind struct {
+    Name string
+    CueFile cue.Value
+}
+
+func GetCoreKinds() ([]CoreKind, error) {
+    ctx := cuecontext.New()
+    kinds := make([]CoreKind, 0)
+    
+    _, caller, _, _ := runtime.Caller(0)
+    root := filepath.Join(caller, "../../../..")
+    
+    {{- range .Schemas }}
+    
+    {{ .Name }}Cue, err := loadCueFile(ctx, filepath.Join(root, "{{ .FilePath }}"))
+    if err != nil {
+        return nil, err
+    }
+    kinds = append(kinds, CoreKind{
+        Name: "{{ .Name }}",
+        CueFile: {{ .Name }}Cue,
+    })
+    {{- end }}
+    
+    return kinds, nil
+}
+
+func loadCueFile(ctx *cue.Context, path string) (cue.Value, error) {
+    cueFile, err := os.ReadFile(path)
+    if err != nil {
+        return cue.Value{}, err
+    }
+    
+    return ctx.CompileBytes(cueFile), nil
+}
diff --git a/pkg/codegen/tmpl/core_resource.tmpl b/pkg/codegen/tmpl/core_resource.tmpl
index 0120753934816..d929505e4a757 100644
--- a/pkg/codegen/tmpl/core_resource.tmpl
+++ b/pkg/codegen/tmpl/core_resource.tmpl
@@ -1,6 +1,8 @@
 package {{ .PackageName }}
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	"github.com/grafana/grafana/pkg/kinds"
 )
 
@@ -10,10 +12,12 @@ type K8sResource = kinds.GrafanaResource[Spec, Status]
 // NewResource creates a new instance of the resource with a given name (UID)
 func NewK8sResource(name string, s *Spec) K8sResource {
 	return K8sResource{
-		Kind:       "{{ .KindName }}",
-		APIVersion: "v{{ .Version }}-alpha",
-		Metadata: kinds.GrafanaResourceMetadata{
-			Name:        name,
+		TypeMeta: v1.TypeMeta{
+			Kind:       "{{ .KindName }}",
+			APIVersion: "v{{ .Version }}-alpha",
+		},
+		ObjectMeta: v1.ObjectMeta{
+			Name: name,
 			Annotations: make(map[string]string),
 			Labels:      make(map[string]string),
 		},
@@ -24,6 +28,7 @@ func NewK8sResource(name string, s *Spec) K8sResource {
 // Resource is the wire representation of {{ .KindName }}.
 // It currently will soon be merged into the k8s flavor (TODO be better)
 type Resource struct {
-    {{- range .SubresourceNames }}
-	{{ . }} {{ . }} `json:"{{ . | ToLower }}"`{{end}}
+    Metadata Metadata `json:"metadata"`
+    Spec     Spec     `json:"spec"`
+    Status   Status   `json:"status"`
 }
diff --git a/pkg/codegen/tmpl/core_status.tmpl b/pkg/codegen/tmpl/core_status.tmpl
new file mode 100644
index 0000000000000..da2ceb99c8892
--- /dev/null
+++ b/pkg/codegen/tmpl/core_status.tmpl
@@ -0,0 +1,65 @@
+package {{ .PackageName }}
+
+// Defines values for OperatorStateState.
+const (
+	OperatorStateStateFailed     OperatorStateState = "failed"
+	OperatorStateStateInProgress OperatorStateState = "in_progress"
+	OperatorStateStateSuccess    OperatorStateState = "success"
+)
+
+// Defines values for StatusOperatorStateState.
+const (
+	StatusOperatorStateStateFailed     StatusOperatorStateState = "failed"
+	StatusOperatorStateStateInProgress StatusOperatorStateState = "in_progress"
+	StatusOperatorStateStateSuccess    StatusOperatorStateState = "success"
+)
+
+// OperatorState defines model for OperatorState.
+type OperatorState struct {
+	// descriptiveState is an optional more descriptive state field which has no requirements on format
+	DescriptiveState *string `json:"descriptiveState,omitempty"`
+
+	// details contains any extra information that is operator-specific
+	Details map[string]any `json:"details,omitempty"`
+
+	// lastEvaluation is the ResourceVersion last evaluated
+	LastEvaluation string `json:"lastEvaluation"`
+
+	// state describes the state of the lastEvaluation.
+	// It is limited to three possible states for machine evaluation.
+	State OperatorStateState `json:"state"`
+}
+
+// OperatorStateState state describes the state of the lastEvaluation.
+// It is limited to three possible states for machine evaluation.
+type OperatorStateState string
+
+// Status defines model for Status.
+type Status struct {
+	// additionalFields is reserved for future use
+	AdditionalFields map[string]any `json:"additionalFields,omitempty"`
+
+	// operatorStates is a map of operator ID to operator state evaluations.
+	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
+	OperatorStates map[string]StatusOperatorState `json:"operatorStates,omitempty"`
+}
+
+// StatusOperatorState defines model for status.#OperatorState.
+type StatusOperatorState struct {
+	// descriptiveState is an optional more descriptive state field which has no requirements on format
+	DescriptiveState *string `json:"descriptiveState,omitempty"`
+
+	// details contains any extra information that is operator-specific
+	Details map[string]any `json:"details,omitempty"`
+
+	// lastEvaluation is the ResourceVersion last evaluated
+	LastEvaluation string `json:"lastEvaluation"`
+
+	// state describes the state of the lastEvaluation.
+	// It is limited to three possible states for machine evaluation.
+	State StatusOperatorStateState `json:"state"`
+}
+
+// StatusOperatorStateState state describes the state of the lastEvaluation.
+// It is limited to three possible states for machine evaluation.
+type StatusOperatorStateState string
diff --git a/pkg/codegen/tmpl/coremodel_imports.tmpl b/pkg/codegen/tmpl/coremodel_imports.tmpl
deleted file mode 100644
index 40e4aa452110e..0000000000000
--- a/pkg/codegen/tmpl/coremodel_imports.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-package {{ .PackageName }}
-
-import (
-	"embed"
-	"path/filepath"
-
-	"github.com/grafana/grafana/pkg/cuectx"
-	"github.com/grafana/grafana/pkg/framework/coremodel"
-	"github.com/grafana/thema"
-)
diff --git a/pkg/codegen/tmpl/cuetsy_multi.tmpl b/pkg/codegen/tmpl/cuetsy_multi.tmpl
deleted file mode 100644
index 686a8e55509d7..0000000000000
--- a/pkg/codegen/tmpl/cuetsy_multi.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-{{ template "autogen_header.tmpl" .Header -}}
-{{ .Body }}
diff --git a/pkg/codegen/tmpl/docs.tmpl b/pkg/codegen/tmpl/docs.tmpl
deleted file mode 100644
index 4fa8df80021c2..0000000000000
--- a/pkg/codegen/tmpl/docs.tmpl
+++ /dev/null
@@ -1,21 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: {{ .KindName }} kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## {{ .KindName }}
-
-#### Maturity: {{ .KindMaturity }}
-#### Version: {{ .KindVersion }}
-
-{{ .KindDescription }}
-
-{{ .Markdown }}
diff --git a/pkg/codegen/tmpl/kind_core.tmpl b/pkg/codegen/tmpl/kind_core.tmpl
deleted file mode 100644
index a2db88dffaf84..0000000000000
--- a/pkg/codegen/tmpl/kind_core.tmpl
+++ /dev/null
@@ -1,70 +0,0 @@
-package {{ .Props.MachineName }}
-
-import (
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema"
-	"github.com/grafana/thema/vmux"
-
-	"github.com/grafana/grafana/pkg/cuectx"
-)
-
-// rootrel is the relative path from the grafana repository root to the
-// directory containing the .cue files in which this kind is defined. Necessary
-// for runtime errors related to the definition and/or lineage to provide
-// a real path to the correct .cue file.
-const rootrel string = "kinds/{{ .Props.MachineName }}"
-
-// TODO standard generated docs
-type Kind struct {
-  kindsys.Core
-	lin    thema.ConvergentLineage[*Resource]
-	jcodec vmux.Codec
-	valmux vmux.ValueMux[*Resource]
-}
-
-// type guard - ensure generated Kind type satisfies the kindsys.Core interface
-var _ kindsys.Core = &Kind{}
-
-// TODO standard generated docs
-func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
-	def, err := cuectx.LoadCoreKindDef(rootrel, rt.Context(), nil)
-	if err != nil {
-		return nil, err
-	}
-
-	k := &Kind{}
-	k.Core, err = kindsys.BindCore(rt, def, opts...)
-	if err != nil {
-	  return nil, err
-	}
-	// Get the thema.Schema that the meta says is in the current version (which
-	// codegen ensures is always the latest)
-	cursch := thema.SchemaP(k.Core.Lineage(), def.Properties.CurrentVersion)
-	tsch, err := thema.BindType(cursch, &Resource{})
-	if err != nil {
-		// Should be unreachable, modulo bugs in the Thema->Go code generator
-		return nil, err
-	}
-
-	k.jcodec = vmux.NewJSONCodec("{{ .Props.MachineName }}.json")
-	k.lin = tsch.ConvergentLineage()
-	k.valmux = vmux.NewValueMux(k.lin.TypedSchema(), k.jcodec)
-	return k, nil
-}
-
-// ConvergentLineage returns the same [thema.Lineage] as Lineage, but bound (see [thema.BindType])
-// to the the {{ .Props.Name }} [Resource] type generated from the current schema, v{{ .Props.CurrentVersion }}.
-func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*Resource] {
-	return k.lin
-}
-
-// JSONValueMux is a version multiplexer that maps a []byte containing JSON data
-// at any schematized dashboard version to an instance of {{ .Props.Name }} [Resource].
-//
-// Validation and translation errors emitted from this func will identify the
-// input bytes as "dashboard.json".
-//
-// This is a thin wrapper around Thema's [vmux.ValueMux].
-func (k *Kind) JSONValueMux(b []byte) (*Resource, thema.TranslationLacunas, error) {
-	return k.valmux(b)
-}
diff --git a/pkg/codegen/tmpl/kind_registry.tmpl b/pkg/codegen/tmpl/kind_registry.tmpl
deleted file mode 100644
index 59cf5fbc0aea3..0000000000000
--- a/pkg/codegen/tmpl/kind_registry.tmpl
+++ /dev/null
@@ -1,61 +0,0 @@
-package {{ .PackageName }}
-
-import (
-	"fmt"
-	"sync"
-
-	{{range .Kinds }}
-	"{{ $.KindPackagePrefix }}/{{ .Props.MachineName }}"{{end}}
-	"github.com/grafana/grafana/pkg/cuectx"
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema"
-)
-
-// Base is a registry of all Grafana core kinds. It is designed for use both inside
-// of Grafana itself, and for import by external Go programs wanting to work with Grafana's
-// kind system.
-//
-// The registry provides two modes for accessing core kinds:
-//  * Per-kind methods, which return the kind-specific type, e.g. Dashboard() returns [dashboard.Dashboard].
-//  * All(), which returns a slice of [kindsys.Core].
-//
-// Prefer the individual named methods for use cases where the particular kind(s) that
-// are needed are known to the caller. For example, a dashboard linter can know that it
-// specifically wants the dashboard kind.
-//
-// Prefer All() when performing operations generically across all kinds. For example,
-// a generic HTTP middleware for validating request bodies expected to contain some
-// kind-schematized type.
-type Base struct {
-	all []kindsys.Core
-	{{- range .Kinds }}
-	{{ .Props.MachineName }} *{{ .Props.MachineName }}.Kind{{end}}
-}
-
-// type guards
-var (
-{{- range .Kinds }}
-	_ kindsys.Core = &{{ .Props.MachineName }}.Kind{}{{end}}
-)
-
-{{range .Kinds }}
-// {{ .Props.Name }} returns the [kindsys.Interface] implementation for the {{ .Props.MachineName }} kind.
-func (b *Base) {{ .Props.Name }}() *{{ .Props.MachineName }}.Kind {
-	return b.{{ .Props.MachineName }}
-}
-{{end}}
-
-func doNewBase(rt *thema.Runtime) *Base {
-	var err error
-	reg := &Base{}
-
-{{range .Kinds }}
-	reg.{{ .Props.MachineName }}, err = {{ .Props.MachineName }}.NewKind(rt)
-	if err != nil {
-		panic(fmt.Sprintf("error while initializing the {{ .Props.MachineName }} Kind: %s", err))
-	}
-  reg.all = append(reg.all, reg.{{ .Props.MachineName }})
-{{end}}
-
-	return reg
-}
diff --git a/pkg/codegen/tmpl/plugin_lineage_binding.tmpl b/pkg/codegen/tmpl/plugin_lineage_binding.tmpl
deleted file mode 100644
index e3d66a9f1acab..0000000000000
--- a/pkg/codegen/tmpl/plugin_lineage_binding.tmpl
+++ /dev/null
@@ -1,12 +0,0 @@
-// The current version of the coremodel schema, as declared in coremodel.cue.
-// This version determines what schema version is returned from [Coremodel.CurrentSchema],
-// and which schema version is used for code generation within the grafana/grafana repository.
-//
-// The code generator ensures that this is always the latest Thema schema version.
-var currentVersion{{ .SlotName }} = thema.SV({{ .LatestSeqv }}, {{ .LatestSchv }})
-
-// {{ .SlotName }}Lineage returns the Thema lineage for the {{ .PluginID }} {{ .PluginType }} plugin's
-// {{ .SlotName }} ["github.com/grafana/grafana/pkg/framework/coremodel".Slot] implementation.
-func {{ .SlotName }}Lineage(rt *thema.Runtime, opts ...thema.BindOption) (thema.Lineage, error) {
-	return cuectx.LoadGrafanaInstancesWithThema(filepath.Join("public", "app", "{{ .Name }}"), cueFS, rt, opts...)
-}
diff --git a/pkg/codegen/tmpl/plugin_lineage_file.tmpl b/pkg/codegen/tmpl/plugin_lineage_file.tmpl
deleted file mode 100644
index a14f4c975be91..0000000000000
--- a/pkg/codegen/tmpl/plugin_lineage_file.tmpl
+++ /dev/null
@@ -1,59 +0,0 @@
-{{ template "autogen_header.tmpl" .Header -}}
-package {{ .PackageName }}
-
-import (
-	"embed"
-	"fmt"
-	"path/filepath"
-	"sync"
-
-	"github.com/grafana/thema"
-
-	"github.com/grafana/grafana/pkg/cuectx"
-	"github.com/grafana/grafana/pkg/plugins/pfs"
-)
-
-var parseOnce sync.Once
-var ptree *pfs.Tree
-
-//go:embed plugin.{{ if .RootCUE }}cue{{ else }}json{{ end }}{{ if .HasModels }} models.cue{{ end }}
-var plugFS embed.FS
-
-// PluginTree returns the plugin tree representing the statically analyzable contents of the {{ .PluginID }} plugin.
-func PluginTree(rt *thema.Runtime) *pfs.Tree {
-	var err error
-	if rt == nil || rt == cuectx.GrafanaThemaRuntime() {
-		parseOnce.Do(func() {
-			ptree, err = pfs.ParsePluginFS(plugFS, cuectx.GrafanaThemaRuntime())
-		})
-	} else {
-		ptree, err = pfs.ParsePluginFS(plugFS, rt)
-	}
-
-	if err != nil {
-		// Even the most rudimentary testing in CI ensures this is unreachable
-		panic(fmt.Errorf("error parsing plugin fs tree: %w", err))
-	}
-
-	return ptree
-}
-
-{{ $pluginfo := . }}{{ range $slot := .SlotImpls }}
-// {{ .SlotName }}Lineage returns the Thema lineage for the {{ $pluginfo.PluginID }} {{ $pluginfo.PluginType }} plugin's
-// {{ .SlotName }} ["github.com/grafana/grafana/pkg/framework/coremodel".Slot] implementation.
-func {{ .SlotName }}Lineage(rt *thema.Runtime, opts ...thema.BindOption) (thema.Lineage, error) {
-  t := PluginTree(rt)
-  lin, has := t.RootPlugin().SlotImplementations()["{{ .SlotName }}"]
-  if !has {
-    panic("unreachable: lineage for {{ .SlotName }} does not exist, but code is only generated for existing lineages")
-  }
-  return lin, nil
-}
-
-// The current schema version of the {{ .SlotName }} slot implementation.
-//
-// Code generation ensures that this is always the version number for the latest schema
-// in the {{ .SlotName }} Thema lineage.
-var currentVersion{{ .SlotName }} = thema.SV({{ .LatestMajv }}, {{ .LatestMinv }})
-
-{{ end }}
diff --git a/pkg/codegen/tmpl/plugin_registry_ref.tmpl b/pkg/codegen/tmpl/plugin_registry_ref.tmpl
deleted file mode 100644
index 68ef98cbdedee..0000000000000
--- a/pkg/codegen/tmpl/plugin_registry_ref.tmpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{ template "autogen_header.tmpl" .Header -}}
-package registry
-
-import (
-	"github.com/grafana/grafana/pkg/plugins/pfs"
-	"github.com/grafana/thema"
-  {{ range .Plugins }}
-  {{ if .NoAlias }}{{ .PkgName }} {{end}}"{{ .Path }}"{{ end }}
-)
-
-func coreTreeLoaders() []func(*thema.Runtime) *pfs.Tree{
-  return []func(*thema.Runtime) *pfs.Tree{
-    {{- range .Plugins }}
-    {{ .PkgName }}.PluginTree,{{ end }}
-  }
-}
diff --git a/pkg/codegen/util_go.go b/pkg/codegen/util_go.go
index 2cd172b5d66d0..54441c5dd31fd 100644
--- a/pkg/codegen/util_go.go
+++ b/pkg/codegen/util_go.go
@@ -1,74 +1,14 @@
 package codegen
 
 import (
-	"bytes"
 	"fmt"
-	"go/format"
-	"go/parser"
-	"go/token"
-	"os"
-	"path/filepath"
 	"regexp"
 	"strings"
 
 	"github.com/dave/dst"
-	"github.com/dave/dst/decorator"
 	"github.com/dave/dst/dstutil"
-	"golang.org/x/tools/imports"
 )
 
-type genGoFile struct {
-	path   string
-	walker dstutil.ApplyFunc
-	in     []byte
-}
-
-func postprocessGoFile(cfg genGoFile) ([]byte, error) {
-	fname := filepath.Base(cfg.path)
-	buf := new(bytes.Buffer)
-	fset := token.NewFileSet()
-	gf, err := decorator.ParseFile(fset, fname, string(cfg.in), parser.ParseComments)
-	if err != nil {
-		return nil, fmt.Errorf("error parsing generated file: %w", err)
-	}
-
-	if cfg.walker != nil {
-		dstutil.Apply(gf, cfg.walker, nil)
-
-		err = format.Node(buf, fset, gf)
-		if err != nil {
-			return nil, fmt.Errorf("error formatting Go AST: %w", err)
-		}
-	} else {
-		buf = bytes.NewBuffer(cfg.in)
-	}
-
-	byt, err := imports.Process(fname, buf.Bytes(), nil)
-	if err != nil {
-		return nil, fmt.Errorf("goimports processing failed: %w", err)
-	}
-
-	// Compare imports before and after; warn about performance if some were added
-	gfa, _ := parser.ParseFile(fset, fname, string(byt), parser.ParseComments)
-	imap := make(map[string]bool)
-	for _, im := range gf.Imports {
-		imap[im.Path.Value] = true
-	}
-	var added []string
-	for _, im := range gfa.Imports {
-		if !imap[im.Path.Value] {
-			added = append(added, im.Path.Value)
-		}
-	}
-
-	if len(added) != 0 {
-		// TODO improve the guidance in this error if/when we better abstract over imports to generate
-		fmt.Fprintf(os.Stderr, "The following imports were added by goimports while generating %s: \n\t%s\nRelying on goimports to find imports significantly slows down code generation. Consider adding these to the relevant template.\n", cfg.path, strings.Join(added, "\n\t"))
-	}
-
-	return byt, nil
-}
-
 type prefixmod struct {
 	prefix  string
 	replace string
@@ -87,21 +27,6 @@ func PrefixDropper(prefix string) dstutil.ApplyFunc {
 	}).applyfunc
 }
 
-// PrefixReplacer returns a dstutil.ApplyFunc that removes the provided prefix
-// string when it appears as a leading sequence in type names, var names, and
-// comments in a generated Go file.
-//
-// When an exact match for prefix is found, the provided replace string
-// is substituted.
-func PrefixReplacer(prefix, replace string) dstutil.ApplyFunc {
-	return (&prefixmod{
-		prefix:  prefix,
-		replace: replace,
-		rxpsuff: regexp.MustCompile(fmt.Sprintf(`%s([a-zA-Z_]+)`, prefix)),
-		rxp:     regexp.MustCompile(fmt.Sprintf(`%s([\s.,;-])`, prefix)),
-	}).applyfunc
-}
-
 func depoint(e dst.Expr) dst.Expr {
 	if star, is := e.(*dst.StarExpr); is {
 		return star.X
diff --git a/pkg/cuectx/util_ts.go b/pkg/codegen/util_ts.go
similarity index 92%
rename from pkg/cuectx/util_ts.go
rename to pkg/codegen/util_ts.go
index 4f3bb7a0d8803..01f1efad9206f 100644
--- a/pkg/cuectx/util_ts.go
+++ b/pkg/codegen/util_ts.go
@@ -1,4 +1,4 @@
-package cuectx
+package codegen
 
 import (
 	"fmt"
@@ -13,8 +13,6 @@ import (
 // indicates the import path should be dropped in the conversion to TS. Imports
 // not present in the list are not allowed, and code generation will fail.
 var importMap = map[string]string{
-	"github.com/grafana/thema":                                      "",
-	"github.com/grafana/kindsys":                                    "",
 	"github.com/grafana/grafana/pkg/plugins/pfs":                    "",
 	"github.com/grafana/grafana/packages/grafana-schema/src/common": "@grafana/schema",
 }
@@ -37,8 +35,6 @@ func init() {
 // Grafana kind definitions.
 func PermittedCUEImports() []string {
 	return []string{
-		"github.com/grafana/thema",
-		"github.com/grafana/kindsys",
 		"github.com/grafana/grafana/pkg/plugins/pfs",
 		"github.com/grafana/grafana/packages/grafana-schema/src/common",
 	}
diff --git a/pkg/components/imguploader/azureblobuploader_test.go b/pkg/components/imguploader/azureblobuploader_test.go
index ca7a663ab0ff2..01afb1755dfb9 100644
--- a/pkg/components/imguploader/azureblobuploader_test.go
+++ b/pkg/components/imguploader/azureblobuploader_test.go
@@ -18,7 +18,7 @@ func TestUploadToAzureBlob(t *testing.T) {
 		})
 		require.NoError(t, err)
 
-		uploader, _ := NewImageUploader()
+		uploader, _ := NewImageUploader(cfg)
 
 		path, err := uploader.Upload(context.Background(), "../../../public/img/logo_transparent_400x.png")
 
diff --git a/pkg/components/imguploader/imguploader.go b/pkg/components/imguploader/imguploader.go
index 7e0aee0028b6a..7d3999abfeba5 100644
--- a/pkg/components/imguploader/imguploader.go
+++ b/pkg/components/imguploader/imguploader.go
@@ -32,10 +32,10 @@ var (
 	logger = log.New("imguploader")
 )
 
-func NewImageUploader() (ImageUploader, error) {
-	switch setting.ImageUploadProvider {
+func NewImageUploader(cfg *setting.Cfg) (ImageUploader, error) {
+	switch cfg.ImageUploadProvider {
 	case "s3":
-		s3sec, err := setting.Raw.GetSection("external_image_storage.s3")
+		s3sec, err := cfg.Raw.GetSection("external_image_storage.s3")
 		if err != nil {
 			return nil, err
 		}
@@ -64,7 +64,7 @@ func NewImageUploader() (ImageUploader, error) {
 
 		return NewS3Uploader(endpoint, region, bucket, path, "public-read", accessKey, secretKey, pathStyleAccess), nil
 	case "webdav":
-		webdavSec, err := setting.Raw.GetSection("external_image_storage.webdav")
+		webdavSec, err := cfg.Raw.GetSection("external_image_storage.webdav")
 		if err != nil {
 			return nil, err
 		}
@@ -80,7 +80,7 @@ func NewImageUploader() (ImageUploader, error) {
 
 		return NewWebdavImageUploader(url, username, password, public_url)
 	case "gcs":
-		gcssec, err := setting.Raw.GetSection("external_image_storage.gcs")
+		gcssec, err := cfg.Raw.GetSection("external_image_storage.gcs")
 		if err != nil {
 			return nil, err
 		}
@@ -102,7 +102,7 @@ func NewImageUploader() (ImageUploader, error) {
 
 		return gcs.NewUploader(keyFile, bucketName, path, enableSignedURLs, suExp)
 	case "azure_blob":
-		azureBlobSec, err := setting.Raw.GetSection("external_image_storage.azure_blob")
+		azureBlobSec, err := cfg.Raw.GetSection("external_image_storage.azure_blob")
 		if err != nil {
 			return nil, err
 		}
@@ -118,8 +118,8 @@ func NewImageUploader() (ImageUploader, error) {
 		return NewLocalImageUploader()
 	}
 
-	if setting.ImageUploadProvider != "" {
-		logger.Error("The external image storage configuration is invalid", "unsupported provider", setting.ImageUploadProvider)
+	if cfg.ImageUploadProvider != "" {
+		logger.Error("The external image storage configuration is invalid", "unsupported provider", cfg.ImageUploadProvider)
 	}
 
 	return NopImageUploader{}, nil
diff --git a/pkg/components/imguploader/imguploader_test.go b/pkg/components/imguploader/imguploader_test.go
index a6acb346c342f..db0c277169b8d 100644
--- a/pkg/components/imguploader/imguploader_test.go
+++ b/pkg/components/imguploader/imguploader_test.go
@@ -17,10 +17,10 @@ func TestImageUploaderFactory(t *testing.T) {
 			})
 			require.NoError(t, err)
 
-			setting.ImageUploadProvider = "s3"
+			cfg.ImageUploadProvider = "s3"
 
 			t.Run("with bucket url https://foo.bar.baz.s3-us-east-2.amazonaws.com", func(t *testing.T) {
-				s3sec, err := setting.Raw.GetSection("external_image_storage.s3")
+				s3sec, err := cfg.Raw.GetSection("external_image_storage.s3")
 				require.NoError(t, err)
 				_, err = s3sec.NewKey("bucket_url", "https://foo.bar.baz.s3-us-east-2.amazonaws.com")
 				require.NoError(t, err)
@@ -29,7 +29,7 @@ func TestImageUploaderFactory(t *testing.T) {
 				_, err = s3sec.NewKey("secret_key", "secret_key")
 				require.NoError(t, err)
 
-				uploader, err := NewImageUploader()
+				uploader, err := NewImageUploader(cfg)
 				require.NoError(t, err)
 
 				original, ok := uploader.(*S3Uploader)
@@ -41,7 +41,7 @@ func TestImageUploaderFactory(t *testing.T) {
 			})
 
 			t.Run("with bucket url https://s3.amazonaws.com/mybucket", func(t *testing.T) {
-				s3sec, err := setting.Raw.GetSection("external_image_storage.s3")
+				s3sec, err := cfg.Raw.GetSection("external_image_storage.s3")
 				require.NoError(t, err)
 				_, err = s3sec.NewKey("bucket_url", "https://s3.amazonaws.com/my.bucket.com")
 				require.NoError(t, err)
@@ -50,7 +50,7 @@ func TestImageUploaderFactory(t *testing.T) {
 				_, err = s3sec.NewKey("secret_key", "secret_key")
 				require.NoError(t, err)
 
-				uploader, err := NewImageUploader()
+				uploader, err := NewImageUploader(cfg)
 				require.NoError(t, err)
 
 				original, ok := uploader.(*S3Uploader)
@@ -62,7 +62,7 @@ func TestImageUploaderFactory(t *testing.T) {
 			})
 
 			t.Run("with bucket url https://s3-us-west-2.amazonaws.com/mybucket", func(t *testing.T) {
-				s3sec, err := setting.Raw.GetSection("external_image_storage.s3")
+				s3sec, err := cfg.Raw.GetSection("external_image_storage.s3")
 				require.NoError(t, err)
 				_, err = s3sec.NewKey("bucket_url", "https://s3-us-west-2.amazonaws.com/my.bucket.com")
 				require.NoError(t, err)
@@ -71,7 +71,7 @@ func TestImageUploaderFactory(t *testing.T) {
 				_, err = s3sec.NewKey("secret_key", "secret_key")
 				require.NoError(t, err)
 
-				uploader, err := NewImageUploader()
+				uploader, err := NewImageUploader(cfg)
 				require.NoError(t, err)
 
 				original, ok := uploader.(*S3Uploader)
@@ -90,7 +90,7 @@ func TestImageUploaderFactory(t *testing.T) {
 			})
 			require.NoError(t, err)
 
-			setting.ImageUploadProvider = "webdav"
+			cfg.ImageUploadProvider = "webdav"
 
 			webdavSec, err := cfg.Raw.GetSection("external_image_storage.webdav")
 			require.NoError(t, err)
@@ -101,7 +101,7 @@ func TestImageUploaderFactory(t *testing.T) {
 			_, err = webdavSec.NewKey("password", "password")
 			require.NoError(t, err)
 
-			uploader, err := NewImageUploader()
+			uploader, err := NewImageUploader(cfg)
 			require.NoError(t, err)
 			original, ok := uploader.(*WebdavUploader)
 
@@ -118,7 +118,7 @@ func TestImageUploaderFactory(t *testing.T) {
 			})
 			require.NoError(t, err)
 
-			setting.ImageUploadProvider = "gcs"
+			cfg.ImageUploadProvider = "gcs"
 
 			gcpSec, err := cfg.Raw.GetSection("external_image_storage.gcs")
 			require.NoError(t, err)
@@ -127,7 +127,7 @@ func TestImageUploaderFactory(t *testing.T) {
 			_, err = gcpSec.NewKey("bucket", "project-grafana-east")
 			require.NoError(t, err)
 
-			uploader, err := NewImageUploader()
+			uploader, err := NewImageUploader(cfg)
 			require.NoError(t, err)
 
 			original, ok := uploader.(*gcs.Uploader)
@@ -143,7 +143,7 @@ func TestImageUploaderFactory(t *testing.T) {
 			})
 			require.NoError(t, err)
 
-			setting.ImageUploadProvider = "azure_blob"
+			cfg.ImageUploadProvider = "azure_blob"
 
 			t.Run("with container name", func(t *testing.T) {
 				azureBlobSec, err := cfg.Raw.GetSection("external_image_storage.azure_blob")
@@ -157,7 +157,7 @@ func TestImageUploaderFactory(t *testing.T) {
 				_, err = azureBlobSec.NewKey("sas_token_expiration_days", "sas_token_expiration_days")
 				require.NoError(t, err)
 
-				uploader, err := NewImageUploader()
+				uploader, err := NewImageUploader(cfg)
 				require.NoError(t, err)
 
 				original, ok := uploader.(*AzureBlobUploader)
@@ -176,9 +176,9 @@ func TestImageUploaderFactory(t *testing.T) {
 			})
 			require.NoError(t, err)
 
-			setting.ImageUploadProvider = "local"
+			cfg.ImageUploadProvider = "local"
 
-			uploader, err := NewImageUploader()
+			uploader, err := NewImageUploader(cfg)
 			require.NoError(t, err)
 
 			original, ok := uploader.(*LocalUploader)
diff --git a/pkg/components/imguploader/s3uploader_test.go b/pkg/components/imguploader/s3uploader_test.go
index 8d5bc4a64e7af..637e5ffe38626 100644
--- a/pkg/components/imguploader/s3uploader_test.go
+++ b/pkg/components/imguploader/s3uploader_test.go
@@ -17,7 +17,7 @@ func TestUploadToS3(t *testing.T) {
 		})
 		require.NoError(t, err)
 
-		s3Uploader, err := NewImageUploader()
+		s3Uploader, err := NewImageUploader(cfg)
 		require.NoError(t, err)
 
 		path, err := s3Uploader.Upload(context.Background(), "../../../public/img/logo_transparent_400x.png")
diff --git a/pkg/components/simplejson/simplejson.go b/pkg/components/simplejson/simplejson.go
index a24671d419f59..d7759ac3c2b3f 100644
--- a/pkg/components/simplejson/simplejson.go
+++ b/pkg/components/simplejson/simplejson.go
@@ -60,6 +60,24 @@ func (j *Json) Value() (driver.Value, error) {
 	return j.ToDB()
 }
 
+// DeepCopyInto creates a copy by serializing JSON
+func (j *Json) DeepCopyInto(out *Json) {
+	b, err := j.Encode()
+	if err == nil {
+		_ = out.UnmarshalJSON(b)
+	}
+}
+
+// DeepCopy will make a deep copy of the JSON object
+func (j *Json) DeepCopy() *Json {
+	if j == nil {
+		return nil
+	}
+	out := new(Json)
+	j.DeepCopyInto(out)
+	return out
+}
+
 // NewJson returns a pointer to a new `Json` object
 // after unmarshaling `body` bytes
 func NewJson(body []byte) (*Json, error) {
diff --git a/pkg/cuectx/ctx.go b/pkg/cuectx/ctx.go
deleted file mode 100644
index 3d6f654da8650..0000000000000
--- a/pkg/cuectx/ctx.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Package cuectx provides a single, central ["cuelang.org/go/cue".Context] and
-// ["github.com/grafana/thema".Runtime] that can be used uniformly across
-// Grafana, and related helper functions for loading Thema lineages.
-
-package cuectx
-
-import (
-	"path/filepath"
-
-	"cuelang.org/go/cue"
-	"cuelang.org/go/cue/cuecontext"
-	"github.com/grafana/thema"
-	"github.com/grafana/thema/vmux"
-)
-
-// CoreDefParentPath is the path, relative to the repository root, where
-// each child directory is expected to contain .cue files defining one
-// Core kind.
-var CoreDefParentPath = "kinds"
-
-// GoCoreKindParentPath is the path, relative to the repository root, to the directory
-// containing one directory per kind, full of generated Go kind output: types and bindings.
-var GoCoreKindParentPath = filepath.Join("pkg", "kinds")
-
-// TSCoreKindParentPath is the path, relative to the repository root, to the directory that
-// contains one directory per kind, full of generated TS kind output: types and default consts.
-var TSCoreKindParentPath = filepath.Join("packages", "grafana-schema", "src", "raw")
-
-var ctx = cuecontext.New()
-var rt = thema.NewRuntime(ctx)
-
-// GrafanaCUEContext returns Grafana's singleton instance of [cue.Context].
-//
-// All code within grafana/grafana that needs a *cue.Context should get it
-// from this function, when one was not otherwise provided.
-func GrafanaCUEContext() *cue.Context {
-	return ctx
-}
-
-// GrafanaThemaRuntime returns Grafana's singleton instance of [thema.Runtime].
-//
-// All code within grafana/grafana that needs a *thema.Runtime should get it
-// from this function, when one was not otherwise provided.
-func GrafanaThemaRuntime() *thema.Runtime {
-	return rt
-}
-
-// JSONtoCUE attempts to decode the given []byte into a cue.Value, relying on
-// the central Grafana cue.Context provided in this package.
-//
-// The provided path argument determines the name given to the input bytes if
-// later CUE operations (e.g. Thema validation) produce errors related to the
-// returned cue.Value.
-//
-// This is a convenience function for one-off JSON decoding. It's wasteful to
-// call it repeatedly. Most use cases should probably prefer making
-// their own Thema/CUE decoders.
-func JSONtoCUE(path string, b []byte) (cue.Value, error) {
-	return vmux.NewJSONCodec(path).Decode(ctx, b)
-}
diff --git a/pkg/cuectx/load.go b/pkg/cuectx/load.go
deleted file mode 100644
index e42af45c434e0..0000000000000
--- a/pkg/cuectx/load.go
+++ /dev/null
@@ -1,239 +0,0 @@
-package cuectx
-
-import (
-	"fmt"
-	"io/fs"
-	"path/filepath"
-	"testing/fstest"
-
-	"cuelang.org/go/cue"
-	"cuelang.org/go/cue/build"
-	"cuelang.org/go/cue/cuecontext"
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema"
-	"github.com/grafana/thema/load"
-	"github.com/yalue/merged_fs"
-
-	"github.com/grafana/grafana"
-)
-
-// LoadGrafanaInstancesWithThema loads CUE files containing a lineage
-// representing some Grafana core model schema. It is expected to be used when
-// implementing a thema.LineageFactory.
-//
-// This function primarily juggles paths to make CUE's loader happy. Provide the
-// path from the grafana root to the directory containing the lineage.cue. The
-// lineage.cue file must be the sole contents of the provided fs.FS.
-//
-// More details on underlying behavior can be found in the docs for github.com/grafana/thema/load.InstanceWithThema.
-//
-// TODO this approach is complicated and confusing, refactor to something understandable
-func LoadGrafanaInstancesWithThema(path string, cueFS fs.FS, rt *thema.Runtime, opts ...thema.BindOption) (thema.Lineage, error) {
-	prefix := filepath.FromSlash(path)
-	fs, err := prefixWithGrafanaCUE(prefix, cueFS)
-	if err != nil {
-		return nil, err
-	}
-	inst, err := load.InstanceWithThema(fs, prefix)
-
-	// Need to trick loading by creating the embedded file and
-	// making it look like a module in the root dir.
-	if err != nil {
-		return nil, err
-	}
-
-	val := rt.Context().BuildInstance(inst)
-
-	lin, err := thema.BindLineage(val, rt, opts...)
-	if err != nil {
-		return nil, err
-	}
-
-	return lin, nil
-}
-
-// prefixWithGrafanaCUE constructs an fs.FS that merges the provided fs.FS with
-// the embedded FS containing Grafana's core CUE files, [grafana.CueSchemaFS].
-// The provided prefix should be the relative path from the grafana repository
-// root to the directory root of the provided inputfs.
-//
-// The returned fs.FS is suitable for passing to a CUE loader, such as [load.InstanceWithThema].
-func prefixWithGrafanaCUE(prefix string, inputfs fs.FS) (fs.FS, error) {
-	m, err := prefixFS(prefix, inputfs)
-	if err != nil {
-		return nil, err
-	}
-	return merged_fs.NewMergedFS(m, grafana.CueSchemaFS), nil
-}
-
-// TODO such a waste, replace with stateless impl that just transforms paths on the fly
-func prefixFS(prefix string, fsys fs.FS) (fs.FS, error) {
-	m := make(fstest.MapFS)
-
-	prefix = filepath.FromSlash(prefix)
-	err := fs.WalkDir(fsys, ".", func(path string, d fs.DirEntry, err error) error {
-		if err != nil {
-			return err
-		}
-
-		if d.IsDir() {
-			return nil
-		}
-
-		b, err := fs.ReadFile(fsys, filepath.ToSlash(path))
-		if err != nil {
-			return err
-		}
-		// fstest can recognize only forward slashes.
-		m[filepath.ToSlash(filepath.Join(prefix, path))] = &fstest.MapFile{Data: b}
-		return nil
-	})
-	return m, err
-}
-
-// LoadGrafanaInstance wraps [load.InstanceWithThema] to load a
-// [*build.Instance] corresponding to a particular path within the
-// github.com/grafana/grafana CUE module.
-//
-// This allows resolution of imports within the grafana or thema CUE modules to
-// work correctly and consistently by relying on the embedded FS at
-// [grafana.CueSchemaFS] and [thema.CueFS].
-//
-// relpath should be a relative path path within [grafana.CueSchemaFS] to be
-// loaded. Optionally, the caller may provide an additional fs.FS via the
-// overlay parameter, which will be merged with [grafana.CueSchemaFS] at
-// relpath, and loaded.
-//
-// pkg, if non-empty, is set as the value of
-// ["cuelang.org/go/cue/load".Config.Package]. If the CUE package to be loaded
-// is the same as the parent directory name, it should be omitted.
-//
-// NOTE this function will be deprecated in favor of a more generic loader
-func LoadGrafanaInstance(relpath string, pkg string, overlay fs.FS) (*build.Instance, error) {
-	// notes about how this crap needs to work
-	//
-	// Within grafana/grafana, need:
-	// - pass in an fs.FS that, in its root, contains the .cue files to load
-	// - has no cue.mod
-	// - gets prefixed with the appropriate path within grafana/grafana
-	// - and merged with all the other .cue files from grafana/grafana
-	// notes about how this crap needs to work
-	//
-	// Need a prefixing instance loader that:
-	//  - can take multiple fs.FS, each one representing a CUE module (nesting?)
-	//  - reconcile at most one of the provided fs with cwd
-	//    - behavior must differ depending on whether cwd is in a cue module
-	//    - behavior should(?) be controllable depending on
-	relpath = filepath.ToSlash(relpath)
-
-	var f fs.FS = grafana.CueSchemaFS
-	// merge the kindsys filesystem with ours for the kind categories
-	f = merged_fs.NewMergedFS(kindsys.CueSchemaFS, f)
-
-	var err error
-	if overlay != nil {
-		f, err = prefixWithGrafanaCUE(relpath, overlay)
-		if err != nil {
-			return nil, err
-		}
-
-		// merge the kindsys filesystem with ours for the kind categories
-		f = merged_fs.NewMergedFS(kindsys.CueSchemaFS, f)
-	}
-
-	if pkg != "" {
-		return load.InstanceWithThema(f, relpath, load.Package(pkg))
-	}
-	return load.InstanceWithThema(f, relpath)
-}
-
-// BuildGrafanaInstance wraps [LoadGrafanaInstance], additionally building
-// the returned [*build.Instance] into a [cue.Value].
-//
-// An error is returned if:
-//   - The underlying call to [LoadGrafanaInstance] returns an error
-//   - The built [cue.Value] has an error ([cue.Value.Err] returns non-nil)
-//
-// NOTE this function will be deprecated in favor of a more generic builder
-func BuildGrafanaInstance(ctx *cue.Context, relpath string, pkg string, overlay fs.FS) (cue.Value, error) {
-	bi, err := LoadGrafanaInstance(relpath, pkg, overlay)
-	if err != nil {
-		return cue.Value{}, err
-	}
-
-	if ctx == nil {
-		ctx = GrafanaCUEContext()
-	}
-	v := ctx.BuildInstance(bi)
-	if v.Err() != nil {
-		return v, fmt.Errorf("%s not a valid CUE instance: %w", relpath, v.Err())
-	}
-	return v, nil
-}
-
-// LoadInstanceWithGrafana loads a [*build.Instance] from .cue files
-// in the provided modFS as ["cuelang.org/go/cue/load".Instances], but
-// fulfilling any imports of CUE packages under:
-//
-//   - github.com/grafana/grafana
-//   - github.com/grafana/thema
-//
-// This function is modeled after [load.InstanceWithThema]. It has the same
-// signature and expectations for the modFS.
-//
-// Attempting to use this func to load files within the
-// github.com/grafana/grafana CUE module will result in an error. Use
-// [LoadGrafanaInstance] instead.
-//
-// NOTE This function will be deprecated in favor of a more generic loader
-func LoadInstanceWithGrafana(fsys fs.FS, dir string, opts ...load.Option) (*build.Instance, error) {
-	if modf, err := fs.ReadFile(fsys, "cue.mod/module.cue"); err != nil {
-		// delegate error handling
-		return load.InstanceWithThema(fsys, dir, opts...)
-	} else if modname, err := cuecontext.New().CompileBytes(modf).LookupPath(cue.MakePath(cue.Str("module"))).String(); err != nil {
-		// delegate error handling
-		return load.InstanceWithThema(fsys, dir, opts...)
-	} else if modname == "github.com/grafana/grafana" {
-		return nil, fmt.Errorf("use cuectx.LoadGrafanaInstance to load .cue files within github.com/grafana/grafana CUE module")
-	}
-
-	// TODO wasteful, doing this every time - make that stateless prefixfs!
-	depFS, err := prefixFS("cue.mod/pkg/github.com/grafana/grafana", grafana.CueSchemaFS)
-	if err != nil {
-		panic(err)
-	}
-	// TODO wasteful, doing this every time - make that stateless prefixfs!
-	kindsysFS, err := prefixFS("cue.mod/pkg/github.com/grafana/kindsys", kindsys.CueSchemaFS)
-	if err != nil {
-		panic(err)
-	}
-
-	allTheFs := merged_fs.MergeMultiple(kindsysFS, depFS, fsys)
-
-	// FIXME remove grafana from cue.mod/pkg if it exists, otherwise external thing can inject files to be loaded
-	return load.InstanceWithThema(allTheFs, dir, opts...)
-}
-
-// LoadCoreKindDef loads and validates a core kind definition of the kind
-// category indicated by the type parameter. On success, it returns a [Def]
-// which contains the entire contents of the kind definition.
-//
-// defpath is the path to the directory containing the core kind definition,
-// relative to the root of the caller's repository. For example, under
-// dashboards are in "kinds/dashboard".
-func LoadCoreKindDef(defpath string, ctx *cue.Context, overlay fs.FS) (kindsys.Def[kindsys.CoreProperties], error) {
-	vk, err := BuildGrafanaInstance(ctx, defpath, "kind", overlay)
-	if err != nil {
-		return kindsys.Def[kindsys.CoreProperties]{}, err
-	}
-
-	props, err := kindsys.ToKindProps[kindsys.CoreProperties](vk)
-	if err != nil {
-		return kindsys.Def[kindsys.CoreProperties]{}, err
-	}
-
-	return kindsys.Def[kindsys.CoreProperties]{
-		V:          vk,
-		Properties: props,
-	}, nil
-}
diff --git a/pkg/expr/classic/classic.go b/pkg/expr/classic/classic.go
index 01288e0b01d47..edc31d47b37c4 100644
--- a/pkg/expr/classic/classic.go
+++ b/pkg/expr/classic/classic.go
@@ -54,7 +54,7 @@ type condition struct {
 	// Operator is the logical operator to use when there are two conditions in ConditionsCmd.
 	// If there are more than two conditions in ConditionsCmd then operator is used to compare
 	// the outcome of this condition with that of the condition before it.
-	Operator string
+	Operator ConditionOperatorType
 }
 
 // NeedsVars returns the variable names (refIds) that are dependencies
@@ -216,7 +216,11 @@ func (cmd *ConditionsCmd) executeCond(_ context.Context, _ time.Time, cond condi
 	return isCondFiring, isCondNoData, matches, nil
 }
 
-func compareWithOperator(b1, b2 bool, operator string) bool {
+func (cmd *ConditionsCmd) Type() string {
+	return "classic_condition"
+}
+
+func compareWithOperator(b1, b2 bool, operator ConditionOperatorType) bool {
 	if operator == "or" {
 		return b1 || b2
 	} else {
@@ -262,8 +266,17 @@ type ConditionEvalJSON struct {
 	Type   string    `json:"type"` // e.g. "gt"
 }
 
+// The reducer function
+// +enum
+type ConditionOperatorType string
+
+const (
+	ConditionOperatorAnd ConditionOperatorType = "and"
+	ConditionOperatorOr  ConditionOperatorType = "or"
+)
+
 type ConditionOperatorJSON struct {
-	Type string `json:"type"`
+	Type ConditionOperatorType `json:"type"`
 }
 
 type ConditionQueryJSON struct {
@@ -275,21 +288,12 @@ type ConditionReducerJSON struct {
 	// Params []any `json:"params"` (Unused)
 }
 
-// UnmarshalConditionsCmd creates a new ConditionsCmd.
-func UnmarshalConditionsCmd(rawQuery map[string]any, refID string) (*ConditionsCmd, error) {
-	jsonFromM, err := json.Marshal(rawQuery["conditions"])
-	if err != nil {
-		return nil, fmt.Errorf("failed to remarshal classic condition body: %w", err)
-	}
-	var ccj []ConditionJSON
-	if err = json.Unmarshal(jsonFromM, &ccj); err != nil {
-		return nil, fmt.Errorf("failed to unmarshal remarshaled classic condition body: %w", err)
-	}
-
+func NewConditionCmd(refID string, ccj []ConditionJSON) (*ConditionsCmd, error) {
 	c := &ConditionsCmd{
 		RefID: refID,
 	}
 
+	var err error
 	for i, cj := range ccj {
 		cond := condition{}
 
@@ -316,6 +320,18 @@ func UnmarshalConditionsCmd(rawQuery map[string]any, refID string) (*ConditionsC
 
 		c.Conditions = append(c.Conditions, cond)
 	}
-
 	return c, nil
 }
+
+// UnmarshalConditionsCmd creates a new ConditionsCmd.
+func UnmarshalConditionsCmd(rawQuery map[string]any, refID string) (*ConditionsCmd, error) {
+	jsonFromM, err := json.Marshal(rawQuery["conditions"])
+	if err != nil {
+		return nil, fmt.Errorf("failed to remarshal classic condition body: %w", err)
+	}
+	var ccj []ConditionJSON
+	if err = json.Unmarshal(jsonFromM, &ccj); err != nil {
+		return nil, fmt.Errorf("failed to unmarshal remarshaled classic condition body: %w", err)
+	}
+	return NewConditionCmd(refID, ccj)
+}
diff --git a/pkg/expr/commands.go b/pkg/expr/commands.go
index d68a6e6d16f19..cc8f1f9fda68f 100644
--- a/pkg/expr/commands.go
+++ b/pkg/expr/commands.go
@@ -19,6 +19,7 @@ import (
 type Command interface {
 	NeedsVars() []string
 	Execute(ctx context.Context, now time.Time, vars mathexp.Vars, tracer tracing.Tracer) (mathexp.Results, error)
+	Type() string
 }
 
 // MathCommand is a command for a math expression such as "1 + $GA / 2"
@@ -75,16 +76,20 @@ func (gm *MathCommand) Execute(ctx context.Context, _ time.Time, vars mathexp.Va
 	return gm.Expression.Execute(gm.refID, vars, tracer)
 }
 
+func (gm *MathCommand) Type() string {
+	return TypeMath.String()
+}
+
 // ReduceCommand is an expression command for reduction of a timeseries such as a min, mean, or max.
 type ReduceCommand struct {
-	Reducer      string
+	Reducer      mathexp.ReducerID
 	VarToReduce  string
 	refID        string
 	seriesMapper mathexp.ReduceMapper
 }
 
 // NewReduceCommand creates a new ReduceCMD.
-func NewReduceCommand(refID, reducer, varToReduce string, mapper mathexp.ReduceMapper) (*ReduceCommand, error) {
+func NewReduceCommand(refID string, reducer mathexp.ReducerID, varToReduce string, mapper mathexp.ReduceMapper) (*ReduceCommand, error) {
 	_, err := mathexp.GetReduceFunc(reducer)
 	if err != nil {
 		return nil, err
@@ -114,10 +119,11 @@ func UnmarshalReduceCommand(rn *rawNode) (*ReduceCommand, error) {
 	if !ok {
 		return nil, errors.New("no reducer specified")
 	}
-	redFunc, ok := rawReducer.(string)
+	redString, ok := rawReducer.(string)
 	if !ok {
 		return nil, fmt.Errorf("expected reducer to be a string, got %T", rawReducer)
 	}
+	redFunc := mathexp.ReducerID(strings.ToLower(redString))
 
 	var mapper mathexp.ReduceMapper = nil
 	settings, ok := rn.Query["settings"]
@@ -163,7 +169,7 @@ func (gr *ReduceCommand) Execute(ctx context.Context, _ time.Time, vars mathexp.
 	_, span := tracer.Start(ctx, "SSE.ExecuteReduce")
 	defer span.End()
 
-	span.SetAttributes(attribute.String("reducer", gr.Reducer))
+	span.SetAttributes(attribute.String("reducer", string(gr.Reducer)))
 
 	newRes := mathexp.Results{}
 	for i, val := range vars[gr.VarToReduce].Values {
@@ -200,18 +206,22 @@ func (gr *ReduceCommand) Execute(ctx context.Context, _ time.Time, vars mathexp.
 	return newRes, nil
 }
 
+func (gr *ReduceCommand) Type() string {
+	return TypeReduce.String()
+}
+
 // ResampleCommand is an expression command for resampling of a timeseries.
 type ResampleCommand struct {
 	Window        time.Duration
 	VarToResample string
-	Downsampler   string
-	Upsampler     string
+	Downsampler   mathexp.ReducerID
+	Upsampler     mathexp.Upsampler
 	TimeRange     TimeRange
 	refID         string
 }
 
 // NewResampleCommand creates a new ResampleCMD.
-func NewResampleCommand(refID, rawWindow, varToResample string, downsampler string, upsampler string, tr TimeRange) (*ResampleCommand, error) {
+func NewResampleCommand(refID, rawWindow, varToResample string, downsampler mathexp.ReducerID, upsampler mathexp.Upsampler, tr TimeRange) (*ResampleCommand, error) {
 	// TODO: validate reducer here, before execution
 	window, err := gtime.ParseDuration(rawWindow)
 	if err != nil {
@@ -270,7 +280,11 @@ func UnmarshalResampleCommand(rn *rawNode) (*ResampleCommand, error) {
 		return nil, fmt.Errorf("expected resample downsampler to be a string, got type %T", upsampler)
 	}
 
-	return NewResampleCommand(rn.RefID, window, varToResample, downsampler, upsampler, rn.TimeRange)
+	return NewResampleCommand(rn.RefID, window,
+		varToResample,
+		mathexp.ReducerID(downsampler),
+		mathexp.Upsampler(upsampler),
+		rn.TimeRange)
 }
 
 // NeedsVars returns the variable names (refIds) that are dependencies
@@ -307,6 +321,10 @@ func (gr *ResampleCommand) Execute(ctx context.Context, now time.Time, vars math
 	return newRes, nil
 }
 
+func (gr *ResampleCommand) Type() string {
+	return TypeResample.String()
+}
+
 // CommandType is the type of the expression command.
 type CommandType int
 
@@ -323,6 +341,8 @@ const (
 	TypeClassicConditions
 	// TypeThreshold is the CMDType for checking if a threshold has been crossed
 	TypeThreshold
+	// TypeSQL is the CMDType for running SQL expressions
+	TypeSQL
 )
 
 func (gt CommandType) String() string {
@@ -335,6 +355,10 @@ func (gt CommandType) String() string {
 		return "resample"
 	case TypeClassicConditions:
 		return "classic_conditions"
+	case TypeThreshold:
+		return "threshold"
+	case TypeSQL:
+		return "sql"
 	default:
 		return "unknown"
 	}
@@ -353,6 +377,8 @@ func ParseCommandType(s string) (CommandType, error) {
 		return TypeClassicConditions, nil
 	case "threshold":
 		return TypeThreshold, nil
+	case "sql":
+		return TypeSQL, nil
 	default:
 		return TypeUnknown, fmt.Errorf("'%v' is not a recognized expression type", s)
 	}
diff --git a/pkg/expr/commands_test.go b/pkg/expr/commands_test.go
index 6fa837eb48e5d..7fd5832917133 100644
--- a/pkg/expr/commands_test.go
+++ b/pkg/expr/commands_test.go
@@ -210,7 +210,7 @@ func TestReduceExecute(t *testing.T) {
 	})
 }
 
-func randomReduceFunc() string {
+func randomReduceFunc() mathexp.ReducerID {
 	res := mathexp.GetSupportedReduceFuncs()
 	return res[rand.Intn(len(res))]
 }
diff --git a/pkg/expr/converter.go b/pkg/expr/converter.go
new file mode 100644
index 0000000000000..3b080f42e59e8
--- /dev/null
+++ b/pkg/expr/converter.go
@@ -0,0 +1,361 @@
+package expr
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+
+	"github.com/grafana/grafana/pkg/expr/mathexp"
+	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+)
+
+type ResultConverter struct {
+	Features featuremgmt.FeatureToggles
+	Tracer   tracing.Tracer
+}
+
+func (c *ResultConverter) Convert(ctx context.Context,
+	datasourceType string,
+	frames data.Frames,
+	allowLongFrames bool,
+) (string, mathexp.Results, error) {
+	if len(frames) == 0 {
+		return "no-data", mathexp.Results{Values: mathexp.Values{mathexp.NewNoData()}}, nil
+	}
+
+	var dt data.FrameType
+	dt, useDataplane, _ := shouldUseDataplane(frames, logger, c.Features.IsEnabled(ctx, featuremgmt.FlagDisableSSEDataplane))
+	if useDataplane {
+		logger.Debug("Handling SSE data source query through dataplane", "datatype", dt)
+		result, err := handleDataplaneFrames(ctx, c.Tracer, dt, frames)
+		return fmt.Sprintf("dataplane-%s", dt), result, err
+	}
+
+	if isAllFrameVectors(datasourceType, frames) { // Prometheus Specific Handling
+		vals, err := framesToNumbers(frames)
+		if err != nil {
+			return "", mathexp.Results{}, fmt.Errorf("failed to read frames as numbers: %w", err)
+		}
+		return "vector", mathexp.Results{Values: vals}, nil
+	}
+
+	if len(frames) == 1 {
+		frame := frames[0]
+		// Handle Untyped NoData
+		if len(frame.Fields) == 0 {
+			return "no-data", mathexp.Results{Values: mathexp.Values{mathexp.NoData{Frame: frame}}}, nil
+		}
+
+		// Handle Numeric Table
+		if frame.TimeSeriesSchema().Type == data.TimeSeriesTypeNot && isNumberTable(frame) {
+			numberSet, err := extractNumberSet(frame)
+			if err != nil {
+				return "", mathexp.Results{}, err
+			}
+			vals := make([]mathexp.Value, 0, len(numberSet))
+			for _, n := range numberSet {
+				vals = append(vals, n)
+			}
+			return "number set", mathexp.Results{
+				Values: vals,
+			}, nil
+		}
+	}
+
+	filtered := make([]*data.Frame, 0, len(frames))
+	totalLen := 0
+	for _, frame := range frames {
+		schema := frame.TimeSeriesSchema()
+		// Check for TimeSeriesTypeNot in InfluxDB queries. A data frame of this type will cause
+		// the WideToMany() function to error out, which results in unhealthy alerts.
+		// This check should be removed once inconsistencies in data source responses are solved.
+		if schema.Type == data.TimeSeriesTypeNot && datasourceType == datasources.DS_INFLUXDB {
+			logger.Warn("Ignoring InfluxDB data frame due to missing numeric fields")
+			continue
+		}
+
+		if schema.Type != data.TimeSeriesTypeWide && !allowLongFrames {
+			return "", mathexp.Results{}, fmt.Errorf("input data must be a wide series but got type %s (input refid)", schema.Type)
+		}
+		filtered = append(filtered, frame)
+		totalLen += len(schema.ValueIndices)
+	}
+
+	if len(filtered) == 0 {
+		return "no data", mathexp.Results{Values: mathexp.Values{mathexp.NoData{Frame: frames[0]}}}, nil
+	}
+
+	maybeFixerFn := checkIfSeriesNeedToBeFixed(filtered, datasourceType)
+
+	dataType := "single frame series"
+	if len(filtered) > 1 {
+		dataType = "multi frame series"
+	}
+
+	vals := make([]mathexp.Value, 0, totalLen)
+	for _, frame := range filtered {
+		schema := frame.TimeSeriesSchema()
+		if schema.Type == data.TimeSeriesTypeWide {
+			series, err := WideToMany(frame, maybeFixerFn)
+			if err != nil {
+				return "", mathexp.Results{}, err
+			}
+			for _, ser := range series {
+				vals = append(vals, ser)
+			}
+		} else {
+			v := mathexp.TableData{Frame: frame}
+			vals = append(vals, v)
+			dataType = "single frame"
+		}
+	}
+
+	return dataType, mathexp.Results{
+		Values: vals,
+	}, nil
+}
+
+func getResponseFrame(resp *backend.QueryDataResponse, refID string) (data.Frames, error) {
+	response, ok := resp.Responses[refID]
+	if !ok {
+		// This indicates that the RefID of the request was not included to the response, i.e. some problem in the data source plugin
+		keys := make([]string, 0, len(resp.Responses))
+		for refID := range resp.Responses {
+			keys = append(keys, refID)
+		}
+		logger.Warn("Can't find response by refID. Return nodata", "responseRefIds", keys)
+		return nil, nil
+	}
+
+	if response.Error != nil {
+		return nil, response.Error
+	}
+	return response.Frames, nil
+}
+
+func isAllFrameVectors(datasourceType string, frames data.Frames) bool {
+	if datasourceType != datasources.DS_PROMETHEUS {
+		return false
+	}
+	allVector := false
+	for i, frame := range frames {
+		if frame.Meta != nil && frame.Meta.Custom != nil {
+			if sMap, ok := frame.Meta.Custom.(map[string]string); ok {
+				if sMap != nil {
+					if sMap["resultType"] == "vector" {
+						if i != 0 && !allVector {
+							break
+						}
+						allVector = true
+					}
+				}
+			}
+		}
+	}
+	return allVector
+}
+
+func framesToNumbers(frames data.Frames) ([]mathexp.Value, error) {
+	vals := make([]mathexp.Value, 0, len(frames))
+	for _, frame := range frames {
+		if frame == nil {
+			continue
+		}
+		if len(frame.Fields) == 2 && frame.Fields[0].Len() == 1 {
+			// Can there be zero Len Field results that are being skipped?
+			valueField := frame.Fields[1]
+			if valueField.Type().Numeric() { // should be []float64
+				val, err := valueField.FloatAt(0) // FloatAt should not err if numeric
+				if err != nil {
+					return nil, fmt.Errorf("failed to read value of frame [%v] (RefID %v) of type [%v] as float: %w", frame.Name, frame.RefID, valueField.Type(), err)
+				}
+				n := mathexp.NewNumber(frame.Name, valueField.Labels)
+				n.SetValue(&val)
+				vals = append(vals, n)
+			}
+		}
+	}
+	return vals, nil
+}
+
+func isNumberTable(frame *data.Frame) bool {
+	if frame == nil || frame.Fields == nil {
+		return false
+	}
+	numericCount := 0
+	stringCount := 0
+	otherCount := 0
+	for _, field := range frame.Fields {
+		fType := field.Type()
+		switch {
+		case fType.Numeric():
+			numericCount++
+		case fType == data.FieldTypeString || fType == data.FieldTypeNullableString:
+			stringCount++
+		default:
+			otherCount++
+		}
+	}
+	return numericCount == 1 && otherCount == 0
+}
+
+func extractNumberSet(frame *data.Frame) ([]mathexp.Number, error) {
+	numericField := 0
+	stringFieldIdxs := []int{}
+	stringFieldNames := []string{}
+	for i, field := range frame.Fields {
+		fType := field.Type()
+		switch {
+		case fType.Numeric():
+			numericField = i
+		case fType == data.FieldTypeString || fType == data.FieldTypeNullableString:
+			stringFieldIdxs = append(stringFieldIdxs, i)
+			stringFieldNames = append(stringFieldNames, field.Name)
+		}
+	}
+	numbers := make([]mathexp.Number, frame.Rows())
+
+	for rowIdx := 0; rowIdx < frame.Rows(); rowIdx++ {
+		val, _ := frame.FloatAt(numericField, rowIdx)
+		var labels data.Labels
+		for i := 0; i < len(stringFieldIdxs); i++ {
+			if i == 0 {
+				labels = make(data.Labels)
+			}
+			key := stringFieldNames[i] // TODO check for duplicate string column names
+			val, _ := frame.ConcreteAt(stringFieldIdxs[i], rowIdx)
+			labels[key] = val.(string) // TODO check assertion / return error
+		}
+
+		n := mathexp.NewNumber(frame.Fields[numericField].Name, labels)
+
+		// The new value fields' configs gets pointed to the one in the original frame
+		n.Frame.Fields[0].Config = frame.Fields[numericField].Config
+		n.SetValue(&val)
+
+		numbers[rowIdx] = n
+	}
+	return numbers, nil
+}
+
+// WideToMany converts a data package wide type Frame to one or multiple Series. A series
+// is created for each value type column of wide frame.
+//
+// This might not be a good idea long term, but works now as an adapter/shim.
+func WideToMany(frame *data.Frame, fixSeries func(series mathexp.Series, valueField *data.Field)) ([]mathexp.Series, error) {
+	tsSchema := frame.TimeSeriesSchema()
+	if tsSchema.Type != data.TimeSeriesTypeWide {
+		return nil, fmt.Errorf("input data must be a wide series but got type %s", tsSchema.Type)
+	}
+
+	if len(tsSchema.ValueIndices) == 1 {
+		s, err := mathexp.SeriesFromFrame(frame)
+		if err != nil {
+			return nil, err
+		}
+		if fixSeries != nil {
+			fixSeries(s, frame.Fields[tsSchema.ValueIndices[0]])
+		}
+		return []mathexp.Series{s}, nil
+	}
+
+	series := make([]mathexp.Series, 0, len(tsSchema.ValueIndices))
+	for _, valIdx := range tsSchema.ValueIndices {
+		l := frame.Rows()
+		f := data.NewFrameOfFieldTypes(frame.Name, l, frame.Fields[tsSchema.TimeIndex].Type(), frame.Fields[valIdx].Type())
+		f.Fields[0].Name = frame.Fields[tsSchema.TimeIndex].Name
+		f.Fields[1].Name = frame.Fields[valIdx].Name
+
+		// The new value fields' configs gets pointed to the one in the original frame
+		f.Fields[1].Config = frame.Fields[valIdx].Config
+
+		if frame.Fields[valIdx].Labels != nil {
+			f.Fields[1].Labels = frame.Fields[valIdx].Labels.Copy()
+		}
+		for i := 0; i < l; i++ {
+			f.SetRow(i, frame.Fields[tsSchema.TimeIndex].CopyAt(i), frame.Fields[valIdx].CopyAt(i))
+		}
+		s, err := mathexp.SeriesFromFrame(f)
+		if err != nil {
+			return nil, err
+		}
+		if fixSeries != nil {
+			fixSeries(s, frame.Fields[valIdx])
+		}
+		series = append(series, s)
+	}
+
+	return series, nil
+}
+
+// checkIfSeriesNeedToBeFixed scans all value fields of all provided frames and determines whether the resulting mathexp.Series
+// needs to be updated so each series could be identifiable by labels.
+// NOTE: applicable only to only datasources.DS_GRAPHITE and datasources.DS_TESTDATA data sources
+// returns a function that patches the mathexp.Series with information from data.Field from which it was created if the all series need to be fixed. Otherwise, returns nil
+func checkIfSeriesNeedToBeFixed(frames []*data.Frame, datasourceType string) func(series mathexp.Series, valueField *data.Field) {
+	if !(datasourceType == datasources.DS_GRAPHITE || datasourceType == datasources.DS_TESTDATA) {
+		return nil
+	}
+
+	// get all value fields
+	var valueFields []*data.Field
+	for _, frame := range frames {
+		tsSchema := frame.TimeSeriesSchema()
+		for _, index := range tsSchema.ValueIndices {
+			field := frame.Fields[index]
+			// if at least one value field contains labels, the result does not need to be fixed.
+			if len(field.Labels) > 0 {
+				return nil
+			}
+			if valueFields == nil {
+				valueFields = make([]*data.Field, 0, len(frames)*len(tsSchema.ValueIndices))
+			}
+			valueFields = append(valueFields, field)
+		}
+	}
+
+	// selectors are in precedence order.
+	nameSelectors := []func(f *data.Field) string{
+		func(f *data.Field) string {
+			if f == nil || f.Config == nil {
+				return ""
+			}
+			return f.Config.DisplayNameFromDS
+		},
+		func(f *data.Field) string {
+			if f == nil || f.Config == nil {
+				return ""
+			}
+			return f.Config.DisplayName
+		},
+		func(f *data.Field) string {
+			return f.Name
+		},
+	}
+
+	// now look for the first selector that would make all value fields be unique
+	for _, selector := range nameSelectors {
+		names := make(map[string]struct{}, len(valueFields))
+		good := true
+		for _, field := range valueFields {
+			name := selector(field)
+			if _, ok := names[name]; ok || name == "" {
+				good = false
+				break
+			}
+			names[name] = struct{}{}
+		}
+		if good {
+			return func(series mathexp.Series, valueField *data.Field) {
+				series.SetLabels(data.Labels{
+					nameLabelName: selector(valueField),
+				})
+			}
+		}
+	}
+	return nil
+}
diff --git a/pkg/expr/converter_test.go b/pkg/expr/converter_test.go
new file mode 100644
index 0000000000000..2a484ea96735e
--- /dev/null
+++ b/pkg/expr/converter_test.go
@@ -0,0 +1,121 @@
+package expr
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/expr/mathexp"
+	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+func TestConvertDataFramesToResults(t *testing.T) {
+	s := &Service{
+		cfg:      setting.NewCfg(),
+		features: &featuremgmt.FeatureManager{},
+		tracer:   tracing.InitializeTracerForTest(),
+		metrics:  newMetrics(nil),
+	}
+	converter := &ResultConverter{Features: s.features, Tracer: s.tracer}
+
+	t.Run("should add name label if no labels and specific data source", func(t *testing.T) {
+		supported := []string{datasources.DS_GRAPHITE, datasources.DS_TESTDATA}
+		t.Run("when only field name is specified", func(t *testing.T) {
+			t.Run("use value field names if one frame - many series", func(t *testing.T) {
+				supported := []string{datasources.DS_GRAPHITE, datasources.DS_TESTDATA}
+
+				frames := []*data.Frame{
+					data.NewFrame("test",
+						data.NewField("time", nil, []time.Time{time.Unix(1, 0)}),
+						data.NewField("test-value1", nil, []*float64{fp(2)}),
+						data.NewField("test-value2", nil, []*float64{fp(2)})),
+				}
+
+				for _, dtype := range supported {
+					t.Run(dtype, func(t *testing.T) {
+						resultType, res, err := converter.Convert(context.Background(), dtype, frames, s.allowLongFrames)
+						require.NoError(t, err)
+						assert.Equal(t, "single frame series", resultType)
+						require.Len(t, res.Values, 2)
+
+						var names []string
+						for _, value := range res.Values {
+							require.IsType(t, mathexp.Series{}, value)
+							lbls := value.GetLabels()
+							require.Contains(t, lbls, nameLabelName)
+							names = append(names, lbls[nameLabelName])
+						}
+						require.EqualValues(t, []string{"test-value1", "test-value2"}, names)
+					})
+				}
+			})
+			t.Run("should use frame name if one frame - one series", func(t *testing.T) {
+				frames := []*data.Frame{
+					data.NewFrame("test-frame1",
+						data.NewField("time", nil, []time.Time{time.Unix(1, 0)}),
+						data.NewField("test-value1", nil, []*float64{fp(2)})),
+					data.NewFrame("test-frame2",
+						data.NewField("time", nil, []time.Time{time.Unix(1, 0)}),
+						data.NewField("test-value2", nil, []*float64{fp(2)})),
+				}
+
+				for _, dtype := range supported {
+					t.Run(dtype, func(t *testing.T) {
+						resultType, res, err := converter.Convert(context.Background(), dtype, frames, s.allowLongFrames)
+						require.NoError(t, err)
+						assert.Equal(t, "multi frame series", resultType)
+						require.Len(t, res.Values, 2)
+
+						var names []string
+						for _, value := range res.Values {
+							require.IsType(t, mathexp.Series{}, value)
+							lbls := value.GetLabels()
+							require.Contains(t, lbls, nameLabelName)
+							names = append(names, lbls[nameLabelName])
+						}
+						require.EqualValues(t, []string{"test-frame1", "test-frame2"}, names)
+					})
+				}
+			})
+		})
+		t.Run("should use fields DisplayNameFromDS when it is unique", func(t *testing.T) {
+			f1 := data.NewField("test-value1", nil, []*float64{fp(2)})
+			f1.Config = &data.FieldConfig{DisplayNameFromDS: "test-value1"}
+			f2 := data.NewField("test-value2", nil, []*float64{fp(2)})
+			f2.Config = &data.FieldConfig{DisplayNameFromDS: "test-value2"}
+			frames := []*data.Frame{
+				data.NewFrame("test-frame1",
+					data.NewField("time", nil, []time.Time{time.Unix(1, 0)}),
+					f1),
+				data.NewFrame("test-frame2",
+					data.NewField("time", nil, []time.Time{time.Unix(1, 0)}),
+					f2),
+			}
+
+			for _, dtype := range supported {
+				t.Run(dtype, func(t *testing.T) {
+					resultType, res, err := converter.Convert(context.Background(), dtype, frames, s.allowLongFrames)
+					require.NoError(t, err)
+					assert.Equal(t, "multi frame series", resultType)
+					require.Len(t, res.Values, 2)
+
+					var names []string
+					for _, value := range res.Values {
+						require.IsType(t, mathexp.Series{}, value)
+						lbls := value.GetLabels()
+						require.Contains(t, lbls, nameLabelName)
+						names = append(names, lbls[nameLabelName])
+					}
+					require.EqualValues(t, []string{"test-value1", "test-value2"}, names)
+				})
+			}
+		})
+	})
+}
diff --git a/pkg/expr/dataplane_test.go b/pkg/expr/dataplane_test.go
index 762b2069396a5..674d4432f0a10 100644
--- a/pkg/expr/dataplane_test.go
+++ b/pkg/expr/dataplane_test.go
@@ -9,20 +9,20 @@ import (
 	"github.com/grafana/dataplane/examples"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/stretchr/testify/require"
+
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/plugins"
-	"github.com/grafana/grafana/pkg/plugins/config"
-	pluginFakes "github.com/grafana/grafana/pkg/plugins/manager/fakes"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	datafakes "github.com/grafana/grafana/pkg/services/datasources/fakes"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginconfig"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
-	"github.com/stretchr/testify/require"
 )
 
 func TestPassThroughDataplaneExamples(t *testing.T) {
@@ -50,19 +50,25 @@ func framesPassThroughService(t *testing.T, frames data.Frames) (data.Frames, er
 		map[string]backend.DataResponse{"A": {Frames: frames}},
 	}
 
+	features := featuremgmt.WithFeatures()
 	cfg := setting.NewCfg()
 
 	s := Service{
 		cfg:         cfg,
 		dataService: me,
-		features:    &featuremgmt.FeatureManager{},
+		features:    features,
 		pCtxProvider: plugincontext.ProvideService(cfg, nil, &pluginstore.FakePluginStore{
 			PluginList: []pluginstore.Plugin{
 				{JSONData: plugins.JSONData{ID: "test"}},
 			}},
-			&datafakes.FakeDataSourceService{}, nil, pluginFakes.NewFakeLicensingService(), &config.Cfg{}),
+			&datafakes.FakeCacheService{}, &datafakes.FakeDataSourceService{},
+			nil, pluginconfig.NewFakePluginRequestConfigProvider()),
 		tracer:  tracing.InitializeTracerForTest(),
 		metrics: newMetrics(nil),
+		converter: &ResultConverter{
+			Features: features,
+			Tracer:   tracing.InitializeTracerForTest(),
+		},
 	}
 	queries := []Query{{
 		RefID: "A",
diff --git a/pkg/expr/graph.go b/pkg/expr/graph.go
index 86668d2757969..d3d25e8e13acd 100644
--- a/pkg/expr/graph.go
+++ b/pkg/expr/graph.go
@@ -4,9 +4,11 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"slices"
 	"time"
 
 	"go.opentelemetry.io/otel/attribute"
+	"golang.org/x/exp/maps"
 	"gonum.org/v1/gonum/graph/simple"
 	"gonum.org/v1/gonum/graph/topo"
 
@@ -61,7 +63,7 @@ type DataPipeline []Node
 func (dp *DataPipeline) execute(c context.Context, now time.Time, s *Service) (mathexp.Vars, error) {
 	vars := make(mathexp.Vars)
 
-	groupByDSFlag := s.features.IsEnabled(featuremgmt.FlagSseGroupByDatasource)
+	groupByDSFlag := s.features.IsEnabled(c, featuremgmt.FlagSseGroupByDatasource)
 	// Execute datasource nodes first, and grouped by datasource.
 	if groupByDSFlag {
 		dsNodes := []*DSNode{}
@@ -75,6 +77,8 @@ func (dp *DataPipeline) execute(c context.Context, now time.Time, s *Service) (m
 		executeDSNodesGrouped(c, now, vars, s, dsNodes)
 	}
 
+	s.allowLongFrames = hasSqlExpression(*dp)
+
 	for _, node := range *dp {
 		if groupByDSFlag && node.NodeType() == TypeDatasourceNode {
 			continue // already executed via executeDSNodesGrouped
@@ -121,6 +125,56 @@ func (dp *DataPipeline) execute(c context.Context, now time.Time, s *Service) (m
 	return vars, nil
 }
 
+// GetDatasourceTypes returns an unique list of data source types used in the query. Machine learning node is encoded as `ml_<type>`, e.g. ml_outlier
+func (dp *DataPipeline) GetDatasourceTypes() []string {
+	if dp == nil {
+		return nil
+	}
+	m := make(map[string]struct{}, 2)
+	for _, node := range *dp {
+		name := ""
+		switch t := node.(type) {
+		case *DSNode:
+			if t.datasource != nil {
+				name = t.datasource.Type
+			}
+		case *MLNode:
+			name = fmt.Sprintf("ml_%s", t.command.Type())
+		}
+		if name == "" {
+			continue
+		}
+		m[name] = struct{}{}
+	}
+	result := maps.Keys(m)
+	slices.Sort(result)
+	return result
+}
+
+// GetCommandTypes returns a sorted unique list of all server-side expression commands used in the pipeline.
+func (dp *DataPipeline) GetCommandTypes() []string {
+	if dp == nil {
+		return nil
+	}
+	m := make(map[string]struct{}, 5) // 5 is big enough to cover most of the cases
+	for _, node := range *dp {
+		name := ""
+		switch t := node.(type) {
+		case *CMDNode:
+			if t.Command != nil {
+				name = t.Command.Type()
+			}
+		}
+		if name == "" {
+			continue
+		}
+		m[name] = struct{}{}
+	}
+	result := maps.Keys(m)
+	slices.Sort(result)
+	return result
+}
+
 // BuildPipeline builds a graph of the nodes, and returns the nodes in an
 // executable order.
 func (s *Service) buildPipeline(req *Request) (DataPipeline, error) {
@@ -227,7 +281,7 @@ func (s *Service) buildGraph(req *Request) (*simple.DirectedGraph, error) {
 		case TypeCMDNode:
 			node, err = buildCMDNode(rn, s.features)
 		case TypeMLNode:
-			if s.features.IsEnabled(featuremgmt.FlagMlExpressions) {
+			if s.features.IsEnabledGlobally(featuremgmt.FlagMlExpressions) {
 				node, err = s.buildMLNode(dp, rn, req)
 				if err != nil {
 					err = fmt.Errorf("fail to parse expression with refID %v: %w", rn.RefID, err)
@@ -266,6 +320,10 @@ func buildGraphEdges(dp *simple.DirectedGraph, registry map[string]Node) error {
 		for _, neededVar := range cmdNode.Command.NeedsVars() {
 			neededNode, ok := registry[neededVar]
 			if !ok {
+				_, ok := cmdNode.Command.(*SQLCommand)
+				if ok {
+					continue
+				}
 				return fmt.Errorf("unable to find dependent node '%v'", neededVar)
 			}
 
@@ -292,3 +350,57 @@ func buildGraphEdges(dp *simple.DirectedGraph, registry map[string]Node) error {
 	}
 	return nil
 }
+
+// GetCommandsFromPipeline traverses the pipeline and extracts all CMDNode commands that match the type
+func GetCommandsFromPipeline[T Command](pipeline DataPipeline) []T {
+	var results []T
+	for _, p := range pipeline {
+		if p.NodeType() != TypeCMDNode {
+			continue
+		}
+		switch cmd := p.(type) {
+		case *CMDNode:
+			switch r := cmd.Command.(type) {
+			case T:
+				results = append(results, r)
+			}
+		default:
+			continue
+		}
+	}
+	return results
+}
+
+func hasSqlExpression(dp DataPipeline) bool {
+	for _, node := range dp {
+		if node.NodeType() == TypeCMDNode {
+			cmdNode := node.(*CMDNode)
+			_, ok := cmdNode.Command.(*SQLCommand)
+			if ok {
+				return true
+			}
+		}
+	}
+	return false
+}
+
+// func graphHasSqlExpresssion(dp *simple.DirectedGraph) bool {
+// 	node := dp.Nodes()
+// 	for node.Next() {
+// 		if cmdNode, ok := node.Node().(*CMDNode); ok {
+// 			// res[dpNode.RefID()] = dpNode
+// 			_, ok := cmdNode.Command.(*SQLCommand)
+// 			if ok {
+// 				return true
+// 			}
+// 		}
+// 		// if node.NodeType() == TypeCMDNode {
+// 		// 	cmdNode := node.(*CMDNode)
+// 		// 	_, ok := cmdNode.Command.(*SQLCommand)
+// 		// 	if ok {
+// 		// 		return true
+// 		// 	}
+// 		// }
+// 	}
+// 	return false
+// }
diff --git a/pkg/expr/graph_test.go b/pkg/expr/graph_test.go
index 25dbc57eca84d..fafca8f68763c 100644
--- a/pkg/expr/graph_test.go
+++ b/pkg/expr/graph_test.go
@@ -7,6 +7,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 )
 
 func TestServicebuildPipeLine(t *testing.T) {
@@ -231,7 +232,9 @@ func TestServicebuildPipeLine(t *testing.T) {
 			expectedOrder: []string{"B", "A"},
 		},
 	}
-	s := Service{}
+	s := Service{
+		features: featuremgmt.WithFeatures(featuremgmt.FlagExpressionParser),
+	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			nodes, err := s.buildPipeline(tt.req)
@@ -246,6 +249,41 @@ func TestServicebuildPipeLine(t *testing.T) {
 	}
 }
 
+func TestGetCommandsFromPipeline(t *testing.T) {
+	pipeline := DataPipeline{
+		&MLNode{},
+		&DSNode{},
+		&CMDNode{
+			baseNode: baseNode{},
+			CMDType:  0,
+			Command:  &ReduceCommand{},
+		},
+		&CMDNode{
+			baseNode: baseNode{},
+			CMDType:  0,
+			Command:  &ReduceCommand{},
+		},
+		&CMDNode{
+			baseNode: baseNode{},
+			CMDType:  0,
+			Command:  &HysteresisCommand{},
+		},
+	}
+	t.Run("should find command that exists", func(t *testing.T) {
+		cmds := GetCommandsFromPipeline[*HysteresisCommand](pipeline)
+		require.Len(t, cmds, 1)
+		require.Equal(t, pipeline[4].(*CMDNode).Command, cmds[0])
+	})
+	t.Run("should find all commands that exist", func(t *testing.T) {
+		cmds := GetCommandsFromPipeline[*ReduceCommand](pipeline)
+		require.Len(t, cmds, 2)
+	})
+	t.Run("should not find all command that does not exist", func(t *testing.T) {
+		cmds := GetCommandsFromPipeline[*MathCommand](pipeline)
+		require.Len(t, cmds, 0)
+	})
+}
+
 func getRefIDOrder(nodes []Node) []string {
 	ids := make([]string, 0, len(nodes))
 	for _, n := range nodes {
diff --git a/pkg/expr/hysteresis.go b/pkg/expr/hysteresis.go
index 9526f835715c0..9f25653fca58c 100644
--- a/pkg/expr/hysteresis.go
+++ b/pkg/expr/hysteresis.go
@@ -77,6 +77,10 @@ func (h *HysteresisCommand) Execute(ctx context.Context, now time.Time, vars mat
 	return mathexp.Results{Values: append(loadingResults.Values, unloadingResults.Values...)}, nil
 }
 
+func (h HysteresisCommand) Type() string {
+	return "hysteresis"
+}
+
 func NewHysteresisCommand(refID string, referenceVar string, loadCondition ThresholdCommand, unloadCondition ThresholdCommand, l Fingerprints) (*HysteresisCommand, error) {
 	return &HysteresisCommand{
 		RefID:                  refID,
@@ -120,3 +124,17 @@ func FingerprintsFromFrame(frame *data.Frame) (Fingerprints, error) {
 	}
 	return result, nil
 }
+
+// FingerprintsToFrame converts Fingerprints to data.Frame.
+func FingerprintsToFrame(fingerprints Fingerprints) *data.Frame {
+	fp := make([]uint64, 0, len(fingerprints))
+	for fingerprint := range fingerprints {
+		fp = append(fp, uint64(fingerprint))
+	}
+	frame := data.NewFrame("", data.NewField("fingerprints", nil, fp))
+	frame.SetMeta(&data.FrameMeta{
+		Type:        "fingerprints",
+		TypeVersion: data.FrameTypeVersion{1, 0},
+	})
+	return frame
+}
diff --git a/pkg/expr/hysteresis_test.go b/pkg/expr/hysteresis_test.go
index 957e045174c5a..49d75ac7c66f3 100644
--- a/pkg/expr/hysteresis_test.go
+++ b/pkg/expr/hysteresis_test.go
@@ -186,3 +186,36 @@ func TestLoadedDimensionsFromFrame(t *testing.T) {
 		})
 	}
 }
+
+func TestFingerprintsToFrame(t *testing.T) {
+	testCases := []struct {
+		name          string
+		input         Fingerprints
+		expected      Fingerprints
+		expectedError bool
+	}{
+		{
+			name:     "when empty map",
+			input:    Fingerprints{},
+			expected: Fingerprints{},
+		},
+		{
+			name:     "when nil",
+			input:    nil,
+			expected: Fingerprints{},
+		},
+		{
+			name:     "when has values",
+			input:    Fingerprints{1: {}, 2: {}, 3: {}, 4: {}, 5: {}},
+			expected: Fingerprints{1: {}, 2: {}, 3: {}, 4: {}, 5: {}},
+		},
+	}
+	for _, testCase := range testCases {
+		t.Run(testCase.name, func(t *testing.T) {
+			frame := FingerprintsToFrame(testCase.input)
+			actual, err := FingerprintsFromFrame(frame)
+			require.NoError(t, err)
+			require.EqualValues(t, testCase.expected, actual)
+		})
+	}
+}
diff --git a/pkg/expr/mathexp/parse/node.go b/pkg/expr/mathexp/parse/node.go
index 41feeb702667e..02c297dde968e 100644
--- a/pkg/expr/mathexp/parse/node.go
+++ b/pkg/expr/mathexp/parse/node.go
@@ -405,6 +405,8 @@ const (
 	TypeVariantSet
 	// TypeNoData is a no data response without a known data type.
 	TypeNoData
+	// TypeTableData is a tabular data response.
+	TypeTableData
 )
 
 // String returns a string representation of the ReturnType.
@@ -422,6 +424,8 @@ func (f ReturnType) String() string {
 		return "variant"
 	case TypeNoData:
 		return "noData"
+	case TypeTableData:
+		return "tableData"
 	default:
 		return "unknown"
 	}
diff --git a/pkg/expr/mathexp/reduce.go b/pkg/expr/mathexp/reduce.go
index b4b6611eb85d7..76d74ca459fca 100644
--- a/pkg/expr/mathexp/reduce.go
+++ b/pkg/expr/mathexp/reduce.go
@@ -3,13 +3,30 @@ package mathexp
 import (
 	"fmt"
 	"math"
-	"strings"
 
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 )
 
 type ReducerFunc = func(fv *Float64Field) *float64
 
+// The reducer function
+// +enum
+type ReducerID string
+
+const (
+	ReducerSum   ReducerID = "sum"
+	ReducerMean  ReducerID = "mean"
+	ReducerMin   ReducerID = "min"
+	ReducerMax   ReducerID = "max"
+	ReducerCount ReducerID = "count"
+	ReducerLast  ReducerID = "last"
+)
+
+// GetSupportedReduceFuncs returns collection of supported function names
+func GetSupportedReduceFuncs() []ReducerID {
+	return []ReducerID{ReducerSum, ReducerMean, ReducerMin, ReducerMax, ReducerCount, ReducerLast}
+}
+
 func Sum(fv *Float64Field) *float64 {
 	var sum float64
 	for i := 0; i < fv.Len(); i++ {
@@ -81,34 +98,29 @@ func Last(fv *Float64Field) *float64 {
 	return fv.GetValue(fv.Len() - 1)
 }
 
-func GetReduceFunc(rFunc string) (ReducerFunc, error) {
-	switch strings.ToLower(rFunc) {
-	case "sum":
+func GetReduceFunc(rFunc ReducerID) (ReducerFunc, error) {
+	switch rFunc {
+	case ReducerSum:
 		return Sum, nil
-	case "mean":
+	case ReducerMean:
 		return Avg, nil
-	case "min":
+	case ReducerMin:
 		return Min, nil
-	case "max":
+	case ReducerMax:
 		return Max, nil
-	case "count":
+	case ReducerCount:
 		return Count, nil
-	case "last":
+	case ReducerLast:
 		return Last, nil
 	default:
 		return nil, fmt.Errorf("reduction %v not implemented", rFunc)
 	}
 }
 
-// GetSupportedReduceFuncs returns collection of supported function names
-func GetSupportedReduceFuncs() []string {
-	return []string{"sum", "mean", "min", "max", "count", "last"}
-}
-
 // Reduce turns the Series into a Number based on the given reduction function
 // if ReduceMapper is defined it applies it to the provided series and performs reduction of the resulting series.
 // Otherwise, the reduction operation is done against the original series.
-func (s Series) Reduce(refID, rFunc string, mapper ReduceMapper) (Number, error) {
+func (s Series) Reduce(refID string, rFunc ReducerID, mapper ReduceMapper) (Number, error) {
 	var l data.Labels
 	if s.GetLabels() != nil {
 		l = s.GetLabels().Copy()
diff --git a/pkg/expr/mathexp/reduce_test.go b/pkg/expr/mathexp/reduce_test.go
index 2f9c7a2a81f83..c4d786cad8f38 100644
--- a/pkg/expr/mathexp/reduce_test.go
+++ b/pkg/expr/mathexp/reduce_test.go
@@ -30,7 +30,7 @@ var seriesEmpty = Vars{
 func TestSeriesReduce(t *testing.T) {
 	var tests = []struct {
 		name        string
-		red         string
+		red         ReducerID
 		vars        Vars
 		varToReduce string
 		errIs       require.ErrorAssertionFunc
@@ -217,7 +217,7 @@ var seriesNonNumbers = Vars{
 func TestSeriesReduceDropNN(t *testing.T) {
 	var tests = []struct {
 		name        string
-		red         string
+		red         ReducerID
 		vars        Vars
 		varToReduce string
 		results     Results
@@ -304,7 +304,7 @@ func TestSeriesReduceReplaceNN(t *testing.T) {
 	replaceWith := rand.Float64()
 	var tests = []struct {
 		name        string
-		red         string
+		red         ReducerID
 		vars        Vars
 		varToReduce string
 		results     Results
diff --git a/pkg/expr/mathexp/resample.go b/pkg/expr/mathexp/resample.go
index f6239be59f9b8..69c9a3db548e6 100644
--- a/pkg/expr/mathexp/resample.go
+++ b/pkg/expr/mathexp/resample.go
@@ -7,8 +7,23 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 )
 
+// The upsample function
+// +enum
+type Upsampler string
+
+const (
+	// Use the last seen value
+	UpsamplerPad Upsampler = "pad"
+
+	// backfill
+	UpsamplerBackfill Upsampler = "backfilling"
+
+	// Do not fill values (nill)
+	UpsamplerFillNA Upsampler = "fillna"
+)
+
 // Resample turns the Series into a Number based on the given reduction function
-func (s Series) Resample(refID string, interval time.Duration, downsampler string, upsampler string, from, to time.Time) (Series, error) {
+func (s Series) Resample(refID string, interval time.Duration, downsampler ReducerID, upsampler Upsampler, from, to time.Time) (Series, error) {
 	newSeriesLength := int(float64(to.Sub(from).Nanoseconds()) / float64(interval.Nanoseconds()))
 	if newSeriesLength <= 0 {
 		return s, fmt.Errorf("the series cannot be sampled further; the time range is shorter than the interval")
@@ -37,19 +52,19 @@ func (s Series) Resample(refID string, interval time.Duration, downsampler strin
 		var value *float64
 		if len(vals) == 0 { // upsampling
 			switch upsampler {
-			case "pad":
+			case UpsamplerPad:
 				if lastSeen != nil {
 					value = lastSeen
 				} else {
 					value = nil
 				}
-			case "backfilling":
+			case UpsamplerBackfill:
 				if sIdx == s.Len() { // no vals left
 					value = nil
 				} else {
 					_, value = s.GetPoint(sIdx)
 				}
-			case "fillna":
+			case UpsamplerFillNA:
 				value = nil
 			default:
 				return s, fmt.Errorf("upsampling %v not implemented", upsampler)
@@ -61,15 +76,15 @@ func (s Series) Resample(refID string, interval time.Duration, downsampler strin
 			ff := Float64Field(*fVec)
 			var tmp *float64
 			switch downsampler {
-			case "sum":
+			case ReducerSum:
 				tmp = Sum(&ff)
-			case "mean":
+			case ReducerMean:
 				tmp = Avg(&ff)
-			case "min":
+			case ReducerMin:
 				tmp = Min(&ff)
-			case "max":
+			case ReducerMax:
 				tmp = Max(&ff)
-			case "last":
+			case ReducerLast:
 				tmp = Last(&ff)
 			default:
 				return s, fmt.Errorf("downsampling %v not implemented", downsampler)
diff --git a/pkg/expr/mathexp/resample_test.go b/pkg/expr/mathexp/resample_test.go
index a09ae962266e0..afee71428b4ef 100644
--- a/pkg/expr/mathexp/resample_test.go
+++ b/pkg/expr/mathexp/resample_test.go
@@ -13,8 +13,8 @@ func TestResampleSeries(t *testing.T) {
 	var tests = []struct {
 		name             string
 		interval         time.Duration
-		downsampler      string
-		upsampler        string
+		downsampler      ReducerID
+		upsampler        Upsampler
 		timeRange        backend.TimeRange
 		seriesToResample Series
 		series           Series
diff --git a/pkg/expr/mathexp/types.go b/pkg/expr/mathexp/types.go
index ca5069650b7b0..ba9115c7443a7 100644
--- a/pkg/expr/mathexp/types.go
+++ b/pkg/expr/mathexp/types.go
@@ -196,7 +196,7 @@ func (ff *Float64Field) GetValue(idx int) *float64 {
 	return &f
 }
 
-// Len returns the the length of the field.
+// Len returns the length of the field.
 func (ff *Float64Field) Len() int {
 	df := data.Field(*ff)
 	return df.Len()
@@ -246,3 +246,48 @@ func (s NoData) New() NoData {
 func NewNoData() NoData {
 	return NoData{data.NewFrame("no data")}
 }
+
+// TableData is an untyped no data response.
+type TableData struct{ Frame *data.Frame }
+
+// Type returns the Value type and allows it to fulfill the Value interface.
+func (s TableData) Type() parse.ReturnType { return parse.TypeTableData }
+
+// Value returns the actual value allows it to fulfill the Value interface.
+func (s TableData) Value() any { return s }
+
+func (s TableData) GetLabels() data.Labels { return nil }
+
+func (s TableData) SetLabels(ls data.Labels) {}
+
+func (s TableData) GetMeta() any {
+	return s.Frame.Meta.Custom
+}
+
+func (s TableData) SetMeta(v any) {
+	m := s.Frame.Meta
+	if m == nil {
+		m = &data.FrameMeta{}
+		s.Frame.SetMeta(m)
+	}
+	m.Custom = v
+}
+
+func (s TableData) AddNotice(notice data.Notice) {
+	m := s.Frame.Meta
+	if m == nil {
+		m = &data.FrameMeta{}
+		s.Frame.SetMeta(m)
+	}
+	m.Notices = append(m.Notices, notice)
+}
+
+func (s TableData) AsDataFrame() *data.Frame { return s.Frame }
+
+func (s TableData) New() TableData {
+	return NewTableData()
+}
+
+func NewTableData() TableData {
+	return TableData{data.NewFrame("")}
+}
diff --git a/pkg/expr/ml.go b/pkg/expr/ml.go
index 185b265474e6c..affdad77a955c 100644
--- a/pkg/expr/ml.go
+++ b/pkg/expr/ml.go
@@ -130,7 +130,7 @@ func (m *MLNode) Execute(ctx context.Context, now time.Time, _ mathexp.Vars, s *
 	}
 
 	// process the response the same way DSNode does. Use plugin ID as data source type. Semantically, they are the same.
-	responseType, result, err = convertDataFramesToResults(ctx, dataFrames, mlPluginID, s, logger)
+	responseType, result, err = s.converter.Convert(ctx, mlPluginID, dataFrames, s.allowLongFrames)
 	return result, err
 }
 
diff --git a/pkg/expr/ml/node.go b/pkg/expr/ml/node.go
index 771a19e46445c..790c9375ac3a2 100644
--- a/pkg/expr/ml/node.go
+++ b/pkg/expr/ml/node.go
@@ -31,6 +31,8 @@ type Command interface {
 	// Execute creates a payload send request to the ML API by calling the function argument sendRequest, and then parses response.
 	// Function sendRequest is supposed to abstract the client configuration such creating http request, adding authorization parameters, host etc.
 	Execute(from, to time.Time, sendRequest func(method string, path string, payload []byte) (response.Response, error)) (*backend.QueryDataResponse, error)
+
+	Type() string
 }
 
 // UnmarshalCommand parses a config parameters and creates a command. Requires key `type` to be specified.
diff --git a/pkg/expr/ml/outlier.go b/pkg/expr/ml/outlier.go
index 40a53446c2600..0cac000cc5581 100644
--- a/pkg/expr/ml/outlier.go
+++ b/pkg/expr/ml/outlier.go
@@ -19,6 +19,10 @@ type OutlierCommand struct {
 
 var _ Command = OutlierCommand{}
 
+func (c OutlierCommand) Type() string {
+	return "outlier"
+}
+
 func (c OutlierCommand) DatasourceUID() string {
 	return c.config.DatasourceUID
 }
diff --git a/pkg/expr/ml/outlier_test.go b/pkg/expr/ml/outlier_test.go
index c383b00e26281..9974b0acfcef8 100644
--- a/pkg/expr/ml/outlier_test.go
+++ b/pkg/expr/ml/outlier_test.go
@@ -4,13 +4,13 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"slices"
 	"testing"
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/slices"
 
 	"github.com/grafana/grafana/pkg/api/response"
 )
diff --git a/pkg/expr/ml/testing.go b/pkg/expr/ml/testing.go
index b10eeffe1a8ce..07c689b8ffb2c 100644
--- a/pkg/expr/ml/testing.go
+++ b/pkg/expr/ml/testing.go
@@ -42,3 +42,7 @@ func (f *FakeCommand) Execute(from, to time.Time, executor func(method string, p
 	}
 	return f.Response, f.Error
 }
+
+func (f *FakeCommand) Type() string {
+	return "fake"
+}
diff --git a/pkg/expr/nodes.go b/pkg/expr/nodes.go
index bb98c995f3bf3..2d0bbbf0d2ba7 100644
--- a/pkg/expr/nodes.go
+++ b/pkg/expr/nodes.go
@@ -3,12 +3,14 @@ package expr
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"strings"
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/grafana/grafana-plugin-sdk-go/data/utils/jsoniter"
+	data "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
 	"gonum.org/v1/gonum/graph/simple"
@@ -45,14 +47,22 @@ type rawNode struct {
 	idx int64
 }
 
-func (rn *rawNode) GetCommandType() (c CommandType, err error) {
-	rawType, ok := rn.Query["type"]
+func getExpressionCommandTypeString(rawQuery map[string]any) (string, error) {
+	rawType, ok := rawQuery["type"]
 	if !ok {
-		return c, fmt.Errorf("no expression command type in query for refId %v", rn.RefID)
+		return "", errors.New("no expression command type in query")
 	}
 	typeString, ok := rawType.(string)
 	if !ok {
-		return c, fmt.Errorf("expected expression command type to be a string, got type %T", rawType)
+		return "", fmt.Errorf("expected expression command type to be a string, got type %T", rawType)
+	}
+	return typeString, nil
+}
+
+func GetExpressionCommandType(rawQuery map[string]any) (c CommandType, err error) {
+	typeString, err := getExpressionCommandTypeString(rawQuery)
+	if err != nil {
+		return c, err
 	}
 	return ParseCommandType(typeString)
 }
@@ -97,7 +107,7 @@ func (gn *CMDNode) Execute(ctx context.Context, now time.Time, vars mathexp.Vars
 }
 
 func buildCMDNode(rn *rawNode, toggles featuremgmt.FeatureToggles) (*CMDNode, error) {
-	commandType, err := rn.GetCommandType()
+	commandType, err := GetExpressionCommandType(rn.Query)
 	if err != nil {
 		return nil, fmt.Errorf("invalid command type in expression '%v': %w", rn.RefID, err)
 	}
@@ -110,6 +120,31 @@ func buildCMDNode(rn *rawNode, toggles featuremgmt.FeatureToggles) (*CMDNode, er
 		CMDType: commandType,
 	}
 
+	if toggles.IsEnabledGlobally(featuremgmt.FlagExpressionParser) {
+		rn.QueryType, err = getExpressionCommandTypeString(rn.Query)
+		if err != nil {
+			return nil, err // should not happen because the command was parsed first thing
+		}
+
+		// NOTE: this structure of this is weird now, because it is targeting a structure
+		// where this is actually run in the root loop, however we want to verify the individual
+		// node parsing before changing the full tree parser
+		reader := NewExpressionQueryReader(toggles)
+		iter, err := jsoniter.ParseBytes(jsoniter.ConfigDefault, rn.QueryRaw)
+		if err != nil {
+			return nil, err
+		}
+		q, err := reader.ReadQuery(data.NewDataQuery(map[string]any{
+			"refId": rn.RefID,
+			"type":  rn.QueryType,
+		}), iter)
+		if err != nil {
+			return nil, err
+		}
+		node.Command = q.Command
+		return node, err
+	}
+
 	switch commandType {
 	case TypeMath:
 		node.Command, err = UnmarshalMathCommand(rn)
@@ -121,6 +156,8 @@ func buildCMDNode(rn *rawNode, toggles featuremgmt.FeatureToggles) (*CMDNode, er
 		node.Command, err = classic.UnmarshalConditionsCmd(rn.Query, rn.RefID)
 	case TypeThreshold:
 		node.Command, err = UnmarshalThresholdCommand(rn, toggles)
+	case TypeSQL:
+		node.Command, err = UnmarshalSQLCommand(rn)
 	default:
 		return nil, fmt.Errorf("expression command type '%v' in expression '%v' not implemented", commandType, rn.RefID)
 	}
@@ -150,6 +187,13 @@ type DSNode struct {
 	request    Request
 }
 
+func (dn *DSNode) String() string {
+	if dn.datasource == nil {
+		return "unknown"
+	}
+	return dn.datasource.Type
+}
+
 // NodeType returns the data pipeline node type.
 func (dn *DSNode) NodeType() NodeType {
 	return TypeDatasourceNode
@@ -289,7 +333,7 @@ func executeDSNodesGrouped(ctx context.Context, now time.Time, vars mathexp.Vars
 				}
 
 				var result mathexp.Results
-				responseType, result, err := convertDataFramesToResults(ctx, dataFrames, dn.datasource.Type, s, logger)
+				responseType, result, err := s.converter.Convert(ctx, dn.datasource.Type, dataFrames, s.allowLongFrames)
 				if err != nil {
 					result.Error = makeConversionError(dn.RefID(), err)
 				}
@@ -357,337 +401,9 @@ func (dn *DSNode) Execute(ctx context.Context, now time.Time, _ mathexp.Vars, s
 	}
 
 	var result mathexp.Results
-	responseType, result, err = convertDataFramesToResults(ctx, dataFrames, dn.datasource.Type, s, logger)
+	responseType, result, err = s.converter.Convert(ctx, dn.datasource.Type, dataFrames, s.allowLongFrames)
 	if err != nil {
 		err = makeConversionError(dn.refID, err)
 	}
 	return result, err
 }
-
-func getResponseFrame(resp *backend.QueryDataResponse, refID string) (data.Frames, error) {
-	response, ok := resp.Responses[refID]
-	if !ok {
-		// This indicates that the RefID of the request was not included to the response, i.e. some problem in the data source plugin
-		keys := make([]string, 0, len(resp.Responses))
-		for refID := range resp.Responses {
-			keys = append(keys, refID)
-		}
-		logger.Warn("Can't find response by refID. Return nodata", "responseRefIds", keys)
-		return nil, nil
-	}
-
-	if response.Error != nil {
-		return nil, response.Error
-	}
-	return response.Frames, nil
-}
-
-func convertDataFramesToResults(ctx context.Context, frames data.Frames, datasourceType string, s *Service, logger log.Logger) (string, mathexp.Results, error) {
-	if len(frames) == 0 {
-		return "no-data", mathexp.Results{Values: mathexp.Values{mathexp.NewNoData()}}, nil
-	}
-
-	var dt data.FrameType
-	dt, useDataplane, _ := shouldUseDataplane(frames, logger, s.features.IsEnabled(featuremgmt.FlagDisableSSEDataplane))
-	if useDataplane {
-		logger.Debug("Handling SSE data source query through dataplane", "datatype", dt)
-		result, err := handleDataplaneFrames(ctx, s.tracer, dt, frames)
-		return fmt.Sprintf("dataplane-%s", dt), result, err
-	}
-
-	if isAllFrameVectors(datasourceType, frames) { // Prometheus Specific Handling
-		vals, err := framesToNumbers(frames)
-		if err != nil {
-			return "", mathexp.Results{}, fmt.Errorf("failed to read frames as numbers: %w", err)
-		}
-		return "vector", mathexp.Results{Values: vals}, nil
-	}
-
-	if len(frames) == 1 {
-		frame := frames[0]
-		// Handle Untyped NoData
-		if len(frame.Fields) == 0 {
-			return "no-data", mathexp.Results{Values: mathexp.Values{mathexp.NoData{Frame: frame}}}, nil
-		}
-
-		// Handle Numeric Table
-		if frame.TimeSeriesSchema().Type == data.TimeSeriesTypeNot && isNumberTable(frame) {
-			numberSet, err := extractNumberSet(frame)
-			if err != nil {
-				return "", mathexp.Results{}, err
-			}
-			vals := make([]mathexp.Value, 0, len(numberSet))
-			for _, n := range numberSet {
-				vals = append(vals, n)
-			}
-			return "number set", mathexp.Results{
-				Values: vals,
-			}, nil
-		}
-	}
-
-	filtered := make([]*data.Frame, 0, len(frames))
-	totalLen := 0
-	for _, frame := range frames {
-		schema := frame.TimeSeriesSchema()
-		// Check for TimeSeriesTypeNot in InfluxDB queries. A data frame of this type will cause
-		// the WideToMany() function to error out, which results in unhealthy alerts.
-		// This check should be removed once inconsistencies in data source responses are solved.
-		if schema.Type == data.TimeSeriesTypeNot && datasourceType == datasources.DS_INFLUXDB {
-			logger.Warn("Ignoring InfluxDB data frame due to missing numeric fields")
-			continue
-		}
-		if schema.Type != data.TimeSeriesTypeWide {
-			return "", mathexp.Results{}, fmt.Errorf("input data must be a wide series but got type %s (input refid)", schema.Type)
-		}
-		filtered = append(filtered, frame)
-		totalLen += len(schema.ValueIndices)
-	}
-
-	if len(filtered) == 0 {
-		return "no data", mathexp.Results{Values: mathexp.Values{mathexp.NoData{Frame: frames[0]}}}, nil
-	}
-
-	maybeFixerFn := checkIfSeriesNeedToBeFixed(filtered, datasourceType)
-
-	vals := make([]mathexp.Value, 0, totalLen)
-	for _, frame := range filtered {
-		series, err := WideToMany(frame, maybeFixerFn)
-		if err != nil {
-			return "", mathexp.Results{}, err
-		}
-		for _, ser := range series {
-			vals = append(vals, ser)
-		}
-	}
-	dataType := "single frame series"
-	if len(filtered) > 1 {
-		dataType = "multi frame series"
-	}
-	return dataType, mathexp.Results{
-		Values: vals,
-	}, nil
-}
-
-func isAllFrameVectors(datasourceType string, frames data.Frames) bool {
-	if datasourceType != datasources.DS_PROMETHEUS {
-		return false
-	}
-	allVector := false
-	for i, frame := range frames {
-		if frame.Meta != nil && frame.Meta.Custom != nil {
-			if sMap, ok := frame.Meta.Custom.(map[string]string); ok {
-				if sMap != nil {
-					if sMap["resultType"] == "vector" {
-						if i != 0 && !allVector {
-							break
-						}
-						allVector = true
-					}
-				}
-			}
-		}
-	}
-	return allVector
-}
-
-func framesToNumbers(frames data.Frames) ([]mathexp.Value, error) {
-	vals := make([]mathexp.Value, 0, len(frames))
-	for _, frame := range frames {
-		if frame == nil {
-			continue
-		}
-		if len(frame.Fields) == 2 && frame.Fields[0].Len() == 1 {
-			// Can there be zero Len Field results that are being skipped?
-			valueField := frame.Fields[1]
-			if valueField.Type().Numeric() { // should be []float64
-				val, err := valueField.FloatAt(0) // FloatAt should not err if numeric
-				if err != nil {
-					return nil, fmt.Errorf("failed to read value of frame [%v] (RefID %v) of type [%v] as float: %w", frame.Name, frame.RefID, valueField.Type(), err)
-				}
-				n := mathexp.NewNumber(frame.Name, valueField.Labels)
-				n.SetValue(&val)
-				vals = append(vals, n)
-			}
-		}
-	}
-	return vals, nil
-}
-
-func isNumberTable(frame *data.Frame) bool {
-	if frame == nil || frame.Fields == nil {
-		return false
-	}
-	numericCount := 0
-	stringCount := 0
-	otherCount := 0
-	for _, field := range frame.Fields {
-		fType := field.Type()
-		switch {
-		case fType.Numeric():
-			numericCount++
-		case fType == data.FieldTypeString || fType == data.FieldTypeNullableString:
-			stringCount++
-		default:
-			otherCount++
-		}
-	}
-	return numericCount == 1 && otherCount == 0
-}
-
-func extractNumberSet(frame *data.Frame) ([]mathexp.Number, error) {
-	numericField := 0
-	stringFieldIdxs := []int{}
-	stringFieldNames := []string{}
-	for i, field := range frame.Fields {
-		fType := field.Type()
-		switch {
-		case fType.Numeric():
-			numericField = i
-		case fType == data.FieldTypeString || fType == data.FieldTypeNullableString:
-			stringFieldIdxs = append(stringFieldIdxs, i)
-			stringFieldNames = append(stringFieldNames, field.Name)
-		}
-	}
-	numbers := make([]mathexp.Number, frame.Rows())
-
-	for rowIdx := 0; rowIdx < frame.Rows(); rowIdx++ {
-		val, _ := frame.FloatAt(numericField, rowIdx)
-		var labels data.Labels
-		for i := 0; i < len(stringFieldIdxs); i++ {
-			if i == 0 {
-				labels = make(data.Labels)
-			}
-			key := stringFieldNames[i] // TODO check for duplicate string column names
-			val, _ := frame.ConcreteAt(stringFieldIdxs[i], rowIdx)
-			labels[key] = val.(string) // TODO check assertion / return error
-		}
-
-		n := mathexp.NewNumber(frame.Fields[numericField].Name, labels)
-
-		// The new value fields' configs gets pointed to the one in the original frame
-		n.Frame.Fields[0].Config = frame.Fields[numericField].Config
-		n.SetValue(&val)
-
-		numbers[rowIdx] = n
-	}
-	return numbers, nil
-}
-
-// WideToMany converts a data package wide type Frame to one or multiple Series. A series
-// is created for each value type column of wide frame.
-//
-// This might not be a good idea long term, but works now as an adapter/shim.
-func WideToMany(frame *data.Frame, fixSeries func(series mathexp.Series, valueField *data.Field)) ([]mathexp.Series, error) {
-	tsSchema := frame.TimeSeriesSchema()
-	if tsSchema.Type != data.TimeSeriesTypeWide {
-		return nil, fmt.Errorf("input data must be a wide series but got type %s", tsSchema.Type)
-	}
-
-	if len(tsSchema.ValueIndices) == 1 {
-		s, err := mathexp.SeriesFromFrame(frame)
-		if err != nil {
-			return nil, err
-		}
-		if fixSeries != nil {
-			fixSeries(s, frame.Fields[tsSchema.ValueIndices[0]])
-		}
-		return []mathexp.Series{s}, nil
-	}
-
-	series := make([]mathexp.Series, 0, len(tsSchema.ValueIndices))
-	for _, valIdx := range tsSchema.ValueIndices {
-		l := frame.Rows()
-		f := data.NewFrameOfFieldTypes(frame.Name, l, frame.Fields[tsSchema.TimeIndex].Type(), frame.Fields[valIdx].Type())
-		f.Fields[0].Name = frame.Fields[tsSchema.TimeIndex].Name
-		f.Fields[1].Name = frame.Fields[valIdx].Name
-
-		// The new value fields' configs gets pointed to the one in the original frame
-		f.Fields[1].Config = frame.Fields[valIdx].Config
-
-		if frame.Fields[valIdx].Labels != nil {
-			f.Fields[1].Labels = frame.Fields[valIdx].Labels.Copy()
-		}
-		for i := 0; i < l; i++ {
-			f.SetRow(i, frame.Fields[tsSchema.TimeIndex].CopyAt(i), frame.Fields[valIdx].CopyAt(i))
-		}
-		s, err := mathexp.SeriesFromFrame(f)
-		if err != nil {
-			return nil, err
-		}
-		if fixSeries != nil {
-			fixSeries(s, frame.Fields[valIdx])
-		}
-		series = append(series, s)
-	}
-
-	return series, nil
-}
-
-// checkIfSeriesNeedToBeFixed scans all value fields of all provided frames and determines whether the resulting mathexp.Series
-// needs to be updated so each series could be identifiable by labels.
-// NOTE: applicable only to only datasources.DS_GRAPHITE and datasources.DS_TESTDATA data sources
-// returns a function that patches the mathexp.Series with information from data.Field from which it was created if the all series need to be fixed. Otherwise, returns nil
-func checkIfSeriesNeedToBeFixed(frames []*data.Frame, datasourceType string) func(series mathexp.Series, valueField *data.Field) {
-	if !(datasourceType == datasources.DS_GRAPHITE || datasourceType == datasources.DS_TESTDATA) {
-		return nil
-	}
-
-	// get all value fields
-	var valueFields []*data.Field
-	for _, frame := range frames {
-		tsSchema := frame.TimeSeriesSchema()
-		for _, index := range tsSchema.ValueIndices {
-			field := frame.Fields[index]
-			// if at least one value field contains labels, the result does not need to be fixed.
-			if len(field.Labels) > 0 {
-				return nil
-			}
-			if valueFields == nil {
-				valueFields = make([]*data.Field, 0, len(frames)*len(tsSchema.ValueIndices))
-			}
-			valueFields = append(valueFields, field)
-		}
-	}
-
-	// selectors are in precedence order.
-	nameSelectors := []func(f *data.Field) string{
-		func(f *data.Field) string {
-			if f == nil || f.Config == nil {
-				return ""
-			}
-			return f.Config.DisplayNameFromDS
-		},
-		func(f *data.Field) string {
-			if f == nil || f.Config == nil {
-				return ""
-			}
-			return f.Config.DisplayName
-		},
-		func(f *data.Field) string {
-			return f.Name
-		},
-	}
-
-	// now look for the first selector that would make all value fields be unique
-	for _, selector := range nameSelectors {
-		names := make(map[string]struct{}, len(valueFields))
-		good := true
-		for _, field := range valueFields {
-			name := selector(field)
-			if _, ok := names[name]; ok || name == "" {
-				good = false
-				break
-			}
-			names[name] = struct{}{}
-		}
-		if good {
-			return func(series mathexp.Series, valueField *data.Field) {
-				series.SetLabels(data.Labels{
-					nameLabelName: selector(valueField),
-				})
-			}
-		}
-	}
-	return nil
-}
diff --git a/pkg/expr/nodes_test.go b/pkg/expr/nodes_test.go
index f889e817c2e25..ada215a8ad912 100644
--- a/pkg/expr/nodes_test.go
+++ b/pkg/expr/nodes_test.go
@@ -1,7 +1,6 @@
 package expr
 
 import (
-	"context"
 	"errors"
 	"fmt"
 	"testing"
@@ -12,11 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/expr/mathexp"
-	"github.com/grafana/grafana/pkg/infra/log/logtest"
-	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/services/datasources"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/setting"
 )
 
 type expectedError struct{}
@@ -169,106 +164,3 @@ func TestCheckIfSeriesNeedToBeFixed(t *testing.T) {
 		})
 	}
 }
-
-func TestConvertDataFramesToResults(t *testing.T) {
-	s := &Service{
-		cfg:      setting.NewCfg(),
-		features: &featuremgmt.FeatureManager{},
-		tracer:   tracing.InitializeTracerForTest(),
-		metrics:  newMetrics(nil),
-	}
-
-	t.Run("should add name label if no labels and specific data source", func(t *testing.T) {
-		supported := []string{datasources.DS_GRAPHITE, datasources.DS_TESTDATA}
-		t.Run("when only field name is specified", func(t *testing.T) {
-			t.Run("use value field names if one frame - many series", func(t *testing.T) {
-				supported := []string{datasources.DS_GRAPHITE, datasources.DS_TESTDATA}
-
-				frames := []*data.Frame{
-					data.NewFrame("test",
-						data.NewField("time", nil, []time.Time{time.Unix(1, 0)}),
-						data.NewField("test-value1", nil, []*float64{fp(2)}),
-						data.NewField("test-value2", nil, []*float64{fp(2)})),
-				}
-
-				for _, dtype := range supported {
-					t.Run(dtype, func(t *testing.T) {
-						resultType, res, err := convertDataFramesToResults(context.Background(), frames, dtype, s, &logtest.Fake{})
-						require.NoError(t, err)
-						assert.Equal(t, "single frame series", resultType)
-						require.Len(t, res.Values, 2)
-
-						var names []string
-						for _, value := range res.Values {
-							require.IsType(t, mathexp.Series{}, value)
-							lbls := value.GetLabels()
-							require.Contains(t, lbls, nameLabelName)
-							names = append(names, lbls[nameLabelName])
-						}
-						require.EqualValues(t, []string{"test-value1", "test-value2"}, names)
-					})
-				}
-			})
-			t.Run("should use frame name if one frame - one series", func(t *testing.T) {
-				frames := []*data.Frame{
-					data.NewFrame("test-frame1",
-						data.NewField("time", nil, []time.Time{time.Unix(1, 0)}),
-						data.NewField("test-value1", nil, []*float64{fp(2)})),
-					data.NewFrame("test-frame2",
-						data.NewField("time", nil, []time.Time{time.Unix(1, 0)}),
-						data.NewField("test-value2", nil, []*float64{fp(2)})),
-				}
-
-				for _, dtype := range supported {
-					t.Run(dtype, func(t *testing.T) {
-						resultType, res, err := convertDataFramesToResults(context.Background(), frames, dtype, s, &logtest.Fake{})
-						require.NoError(t, err)
-						assert.Equal(t, "multi frame series", resultType)
-						require.Len(t, res.Values, 2)
-
-						var names []string
-						for _, value := range res.Values {
-							require.IsType(t, mathexp.Series{}, value)
-							lbls := value.GetLabels()
-							require.Contains(t, lbls, nameLabelName)
-							names = append(names, lbls[nameLabelName])
-						}
-						require.EqualValues(t, []string{"test-frame1", "test-frame2"}, names)
-					})
-				}
-			})
-		})
-		t.Run("should use fields DisplayNameFromDS when it is unique", func(t *testing.T) {
-			f1 := data.NewField("test-value1", nil, []*float64{fp(2)})
-			f1.Config = &data.FieldConfig{DisplayNameFromDS: "test-value1"}
-			f2 := data.NewField("test-value2", nil, []*float64{fp(2)})
-			f2.Config = &data.FieldConfig{DisplayNameFromDS: "test-value2"}
-			frames := []*data.Frame{
-				data.NewFrame("test-frame1",
-					data.NewField("time", nil, []time.Time{time.Unix(1, 0)}),
-					f1),
-				data.NewFrame("test-frame2",
-					data.NewField("time", nil, []time.Time{time.Unix(1, 0)}),
-					f2),
-			}
-
-			for _, dtype := range supported {
-				t.Run(dtype, func(t *testing.T) {
-					resultType, res, err := convertDataFramesToResults(context.Background(), frames, dtype, s, &logtest.Fake{})
-					require.NoError(t, err)
-					assert.Equal(t, "multi frame series", resultType)
-					require.Len(t, res.Values, 2)
-
-					var names []string
-					for _, value := range res.Values {
-						require.IsType(t, mathexp.Series{}, value)
-						lbls := value.GetLabels()
-						require.Contains(t, lbls, nameLabelName)
-						names = append(names, lbls[nameLabelName])
-					}
-					require.EqualValues(t, []string{"test-value1", "test-value2"}, names)
-				})
-			}
-		})
-	})
-}
diff --git a/pkg/expr/query.go b/pkg/expr/query.go
new file mode 100644
index 0000000000000..6fffd7d116cfd
--- /dev/null
+++ b/pkg/expr/query.go
@@ -0,0 +1,102 @@
+package expr
+
+import (
+	"github.com/grafana/grafana/pkg/expr/classic"
+	"github.com/grafana/grafana/pkg/expr/mathexp"
+)
+
+// Supported expression types
+// +enum
+type QueryType string
+
+const (
+	// Apply a mathematical expression to results
+	QueryTypeMath QueryType = "math"
+
+	// Reduce query results
+	QueryTypeReduce QueryType = "reduce"
+
+	// Resample query results
+	QueryTypeResample QueryType = "resample"
+
+	// Classic query
+	QueryTypeClassic QueryType = "classic_conditions"
+
+	// Threshold
+	QueryTypeThreshold QueryType = "threshold"
+
+	// SQL query via DuckDB
+	QueryTypeSQL QueryType = "sql"
+)
+
+type MathQuery struct {
+	// General math expression
+	Expression string `json:"expression" jsonschema:"minLength=1,example=$A + 1,example=$A/$B"`
+}
+
+type ReduceQuery struct {
+	// Reference to single query result
+	Expression string `json:"expression" jsonschema:"minLength=1,example=$A"`
+
+	// The reducer
+	Reducer mathexp.ReducerID `json:"reducer"`
+
+	// Reducer Options
+	Settings *ReduceSettings `json:"settings,omitempty"`
+}
+
+// QueryType = resample
+type ResampleQuery struct {
+	// The math expression
+	Expression string `json:"expression" jsonschema:"minLength=1,example=$A + 1,example=$A"`
+
+	// The time duration
+	Window string `json:"window" jsonschema:"minLength=1,example=1d,example=10m"`
+
+	// The downsample function
+	Downsampler mathexp.ReducerID `json:"downsampler"`
+
+	// The upsample function
+	Upsampler mathexp.Upsampler `json:"upsampler"`
+}
+
+type ThresholdQuery struct {
+	// Reference to single query result
+	Expression string `json:"expression" jsonschema:"minLength=1,example=$A"`
+
+	// Threshold Conditions
+	Conditions []ThresholdConditionJSON `json:"conditions"`
+}
+
+type ClassicQuery struct {
+	Conditions []classic.ConditionJSON `json:"conditions"`
+}
+
+// SQLQuery requires the sqlExpression feature flag
+type SQLExpression struct {
+	Expression string `json:"expression" jsonschema:"minLength=1,example=SELECT * FROM A LIMIT 1"`
+}
+
+//-------------------------------
+// Non-query commands
+//-------------------------------
+
+type ReduceSettings struct {
+	// Non-number reduce behavior
+	Mode ReduceMode `json:"mode"`
+
+	// Only valid when mode is replace
+	ReplaceWithValue *float64 `json:"replaceWithValue,omitempty"`
+}
+
+// Non-Number behavior mode
+// +enum
+type ReduceMode string
+
+const (
+	// Drop non-numbers
+	ReduceModeDrop ReduceMode = "dropNN"
+
+	// Replace non-numbers
+	ReduceModeReplace ReduceMode = "replaceNN"
+)
diff --git a/pkg/expr/query.panel.example.json b/pkg/expr/query.panel.example.json
new file mode 100644
index 0000000000000..80aee84e789f0
--- /dev/null
+++ b/pkg/expr/query.panel.example.json
@@ -0,0 +1,162 @@
+{
+  "type": "table",
+  "targets": [
+    {
+      "refId": "A",
+      "datasource": {
+        "type": "__expr__",
+        "uid": "TheUID"
+      },
+      "expression": "$A + 10",
+      "type": "math"
+    },
+    {
+      "refId": "B",
+      "datasource": {
+        "type": "__expr__",
+        "uid": "TheUID"
+      },
+      "type": "math",
+      "expression": "$A - $B"
+    },
+    {
+      "refId": "C",
+      "datasource": {
+        "type": "__expr__",
+        "uid": "TheUID"
+      },
+      "type": "reduce",
+      "expression": "$A",
+      "reducer": "max",
+      "settings": {
+        "mode": "dropNN"
+      }
+    },
+    {
+      "refId": "D",
+      "datasource": {
+        "type": "__expr__",
+        "uid": "TheUID"
+      },
+      "expression": "$A",
+      "window": "1d",
+      "downsampler": "last",
+      "upsampler": "pad",
+      "type": "resample"
+    },
+    {
+      "refId": "E",
+      "datasource": {
+        "type": "__expr__",
+        "uid": "TheUID"
+      },
+      "conditions": [
+        {
+          "evaluator": {
+            "params": [
+              5
+            ],
+            "type": "gt"
+          },
+          "operator": {
+            "type": "and"
+          },
+          "query": {
+            "params": [
+              "A"
+            ]
+          },
+          "reducer": {
+            "type": "max"
+          }
+        }
+      ],
+      "type": "classic_conditions"
+    },
+    {
+      "refId": "F",
+      "datasource": {
+        "type": "__expr__",
+        "uid": "TheUID"
+      },
+      "expression": "A",
+      "conditions": [
+        {
+          "evaluator": {
+            "params": [
+              5
+            ],
+            "type": "gt"
+          }
+        }
+      ],
+      "type": "threshold"
+    },
+    {
+      "refId": "G",
+      "datasource": {
+        "type": "__expr__",
+        "uid": "TheUID"
+      },
+      "expression": "B",
+      "conditions": [
+        {
+          "evaluator": {
+            "params": [
+              100
+            ],
+            "type": "gt"
+          },
+          "loadedDimensions": {
+            "data": {
+              "values": [
+                [
+                  18446744073709552000,
+                  2,
+                  3,
+                  4,
+                  5
+                ]
+              ]
+            },
+            "schema": {
+              "fields": [
+                {
+                  "name": "fingerprints",
+                  "type": "number",
+                  "typeInfo": {
+                    "frame": "uint64"
+                  }
+                }
+              ],
+              "meta": {
+                "type": "fingerprints",
+                "typeVersion": [
+                  1,
+                  0
+                ]
+              },
+              "name": "test"
+            }
+          },
+          "unloadEvaluator": {
+            "params": [
+              31
+            ],
+            "type": "lt"
+          }
+        }
+      ],
+      "type": "threshold"
+    },
+    {
+      "refId": "H",
+      "datasource": {
+        "type": "__expr__",
+        "uid": "TheUID"
+      },
+      "expression": "SELECT * FROM A limit 1",
+      "type": "sql"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/expr/query.panel.schema.json b/pkg/expr/query.panel.schema.json
new file mode 100644
index 0000000000000..0b5a80ef1707a
--- /dev/null
+++ b/pkg/expr/query.panel.schema.json
@@ -0,0 +1,989 @@
+{
+  "type": "object",
+  "required": [
+    "targets",
+    "type"
+  ],
+  "properties": {
+    "targets": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "oneOf": [
+          {
+            "type": "object",
+            "required": [
+              "expression",
+              "type",
+              "refId"
+            ],
+            "properties": {
+              "datasource": {
+                "description": "The datasource",
+                "type": "object",
+                "required": [
+                  "type"
+                ],
+                "properties": {
+                  "type": {
+                    "description": "The datasource plugin type",
+                    "type": "string",
+                    "pattern": "^__expr__$"
+                  },
+                  "uid": {
+                    "description": "Datasource UID",
+                    "type": "string"
+                  }
+                },
+                "additionalProperties": false
+              },
+              "expression": {
+                "description": "General math expression",
+                "type": "string",
+                "minLength": 1,
+                "examples": [
+                  "$A + 1",
+                  "$A/$B"
+                ]
+              },
+              "hide": {
+                "description": "true if query is disabled (ie should not be returned to the dashboard)\nNOTE: this does not always imply that the query should not be executed since\nthe results from a hidden query may be used as the input to other queries (SSE etc)",
+                "type": "boolean"
+              },
+              "queryType": {
+                "description": "QueryType is an optional identifier for the type of query.\nIt can be used to distinguish different types of queries.",
+                "type": "string"
+              },
+              "refId": {
+                "description": "RefID is the unique identifier of the query, set by the frontend call.",
+                "type": "string"
+              },
+              "resultAssertions": {
+                "description": "Optionally define expected query result behavior",
+                "type": "object",
+                "required": [
+                  "typeVersion"
+                ],
+                "properties": {
+                  "maxFrames": {
+                    "description": "Maximum frame count",
+                    "type": "integer"
+                  },
+                  "type": {
+                    "description": "Type asserts that the frame matches a known type structure.\n\n\nPossible enum values:\n - `\"\"` \n - `\"timeseries-wide\"` \n - `\"timeseries-long\"` \n - `\"timeseries-many\"` \n - `\"timeseries-multi\"` \n - `\"directory-listing\"` \n - `\"table\"` \n - `\"numeric-wide\"` \n - `\"numeric-multi\"` \n - `\"numeric-long\"` \n - `\"log-lines\"` ",
+                    "type": "string",
+                    "enum": [
+                      "",
+                      "timeseries-wide",
+                      "timeseries-long",
+                      "timeseries-many",
+                      "timeseries-multi",
+                      "directory-listing",
+                      "table",
+                      "numeric-wide",
+                      "numeric-multi",
+                      "numeric-long",
+                      "log-lines"
+                    ],
+                    "x-enum-description": {}
+                  },
+                  "typeVersion": {
+                    "description": "TypeVersion is the version of the Type property. Versions greater than 0.0 correspond to the dataplane\ncontract documentation https://grafana.github.io/dataplane/contract/.",
+                    "type": "array",
+                    "maxItems": 2,
+                    "minItems": 2,
+                    "items": {
+                      "type": "integer"
+                    }
+                  }
+                },
+                "additionalProperties": false
+              },
+              "timeRange": {
+                "description": "TimeRange represents the query range\nNOTE: unlike generic /ds/query, we can now send explicit time values in each query\nNOTE: the values for timeRange are not saved in a dashboard, they are constructed on the fly",
+                "type": "object",
+                "required": [
+                  "from",
+                  "to"
+                ],
+                "properties": {
+                  "from": {
+                    "description": "From is the start time of the query.",
+                    "type": "string",
+                    "default": "now-6h",
+                    "examples": [
+                      "now-1h"
+                    ]
+                  },
+                  "to": {
+                    "description": "To is the end time of the query.",
+                    "type": "string",
+                    "default": "now",
+                    "examples": [
+                      "now"
+                    ]
+                  }
+                },
+                "additionalProperties": false
+              },
+              "type": {
+                "type": "string",
+                "pattern": "^math$"
+              }
+            },
+            "additionalProperties": false,
+            "$schema": "https://json-schema.org/draft-04/schema"
+          },
+          {
+            "type": "object",
+            "required": [
+              "expression",
+              "reducer",
+              "type",
+              "refId"
+            ],
+            "properties": {
+              "datasource": {
+                "description": "The datasource",
+                "type": "object",
+                "required": [
+                  "type"
+                ],
+                "properties": {
+                  "type": {
+                    "description": "The datasource plugin type",
+                    "type": "string",
+                    "pattern": "^__expr__$"
+                  },
+                  "uid": {
+                    "description": "Datasource UID",
+                    "type": "string"
+                  }
+                },
+                "additionalProperties": false
+              },
+              "expression": {
+                "description": "Reference to single query result",
+                "type": "string",
+                "minLength": 1,
+                "examples": [
+                  "$A"
+                ]
+              },
+              "hide": {
+                "description": "true if query is disabled (ie should not be returned to the dashboard)\nNOTE: this does not always imply that the query should not be executed since\nthe results from a hidden query may be used as the input to other queries (SSE etc)",
+                "type": "boolean"
+              },
+              "queryType": {
+                "description": "QueryType is an optional identifier for the type of query.\nIt can be used to distinguish different types of queries.",
+                "type": "string"
+              },
+              "reducer": {
+                "description": "The reducer\n\n\nPossible enum values:\n - `\"sum\"` \n - `\"mean\"` \n - `\"min\"` \n - `\"max\"` \n - `\"count\"` \n - `\"last\"` ",
+                "type": "string",
+                "enum": [
+                  "sum",
+                  "mean",
+                  "min",
+                  "max",
+                  "count",
+                  "last"
+                ],
+                "x-enum-description": {}
+              },
+              "refId": {
+                "description": "RefID is the unique identifier of the query, set by the frontend call.",
+                "type": "string"
+              },
+              "resultAssertions": {
+                "description": "Optionally define expected query result behavior",
+                "type": "object",
+                "required": [
+                  "typeVersion"
+                ],
+                "properties": {
+                  "maxFrames": {
+                    "description": "Maximum frame count",
+                    "type": "integer"
+                  },
+                  "type": {
+                    "description": "Type asserts that the frame matches a known type structure.\n\n\nPossible enum values:\n - `\"\"` \n - `\"timeseries-wide\"` \n - `\"timeseries-long\"` \n - `\"timeseries-many\"` \n - `\"timeseries-multi\"` \n - `\"directory-listing\"` \n - `\"table\"` \n - `\"numeric-wide\"` \n - `\"numeric-multi\"` \n - `\"numeric-long\"` \n - `\"log-lines\"` ",
+                    "type": "string",
+                    "enum": [
+                      "",
+                      "timeseries-wide",
+                      "timeseries-long",
+                      "timeseries-many",
+                      "timeseries-multi",
+                      "directory-listing",
+                      "table",
+                      "numeric-wide",
+                      "numeric-multi",
+                      "numeric-long",
+                      "log-lines"
+                    ],
+                    "x-enum-description": {}
+                  },
+                  "typeVersion": {
+                    "description": "TypeVersion is the version of the Type property. Versions greater than 0.0 correspond to the dataplane\ncontract documentation https://grafana.github.io/dataplane/contract/.",
+                    "type": "array",
+                    "maxItems": 2,
+                    "minItems": 2,
+                    "items": {
+                      "type": "integer"
+                    }
+                  }
+                },
+                "additionalProperties": false
+              },
+              "settings": {
+                "description": "Reducer Options",
+                "type": "object",
+                "required": [
+                  "mode"
+                ],
+                "properties": {
+                  "mode": {
+                    "description": "Non-number reduce behavior\n\n\nPossible enum values:\n - `\"dropNN\"` Drop non-numbers\n - `\"replaceNN\"` Replace non-numbers",
+                    "type": "string",
+                    "enum": [
+                      "dropNN",
+                      "replaceNN"
+                    ],
+                    "x-enum-description": {
+                      "dropNN": "Drop non-numbers",
+                      "replaceNN": "Replace non-numbers"
+                    }
+                  },
+                  "replaceWithValue": {
+                    "description": "Only valid when mode is replace",
+                    "type": "number"
+                  }
+                },
+                "additionalProperties": false
+              },
+              "timeRange": {
+                "description": "TimeRange represents the query range\nNOTE: unlike generic /ds/query, we can now send explicit time values in each query\nNOTE: the values for timeRange are not saved in a dashboard, they are constructed on the fly",
+                "type": "object",
+                "required": [
+                  "from",
+                  "to"
+                ],
+                "properties": {
+                  "from": {
+                    "description": "From is the start time of the query.",
+                    "type": "string",
+                    "default": "now-6h",
+                    "examples": [
+                      "now-1h"
+                    ]
+                  },
+                  "to": {
+                    "description": "To is the end time of the query.",
+                    "type": "string",
+                    "default": "now",
+                    "examples": [
+                      "now"
+                    ]
+                  }
+                },
+                "additionalProperties": false
+              },
+              "type": {
+                "type": "string",
+                "pattern": "^reduce$"
+              }
+            },
+            "additionalProperties": false,
+            "$schema": "https://json-schema.org/draft-04/schema"
+          },
+          {
+            "description": "QueryType = resample",
+            "type": "object",
+            "required": [
+              "expression",
+              "window",
+              "downsampler",
+              "upsampler",
+              "type",
+              "refId"
+            ],
+            "properties": {
+              "datasource": {
+                "description": "The datasource",
+                "type": "object",
+                "required": [
+                  "type"
+                ],
+                "properties": {
+                  "type": {
+                    "description": "The datasource plugin type",
+                    "type": "string",
+                    "pattern": "^__expr__$"
+                  },
+                  "uid": {
+                    "description": "Datasource UID",
+                    "type": "string"
+                  }
+                },
+                "additionalProperties": false
+              },
+              "downsampler": {
+                "description": "The downsample function\n\n\nPossible enum values:\n - `\"sum\"` \n - `\"mean\"` \n - `\"min\"` \n - `\"max\"` \n - `\"count\"` \n - `\"last\"` ",
+                "type": "string",
+                "enum": [
+                  "sum",
+                  "mean",
+                  "min",
+                  "max",
+                  "count",
+                  "last"
+                ],
+                "x-enum-description": {}
+              },
+              "expression": {
+                "description": "The math expression",
+                "type": "string",
+                "minLength": 1,
+                "examples": [
+                  "$A + 1",
+                  "$A"
+                ]
+              },
+              "hide": {
+                "description": "true if query is disabled (ie should not be returned to the dashboard)\nNOTE: this does not always imply that the query should not be executed since\nthe results from a hidden query may be used as the input to other queries (SSE etc)",
+                "type": "boolean"
+              },
+              "queryType": {
+                "description": "QueryType is an optional identifier for the type of query.\nIt can be used to distinguish different types of queries.",
+                "type": "string"
+              },
+              "refId": {
+                "description": "RefID is the unique identifier of the query, set by the frontend call.",
+                "type": "string"
+              },
+              "resultAssertions": {
+                "description": "Optionally define expected query result behavior",
+                "type": "object",
+                "required": [
+                  "typeVersion"
+                ],
+                "properties": {
+                  "maxFrames": {
+                    "description": "Maximum frame count",
+                    "type": "integer"
+                  },
+                  "type": {
+                    "description": "Type asserts that the frame matches a known type structure.\n\n\nPossible enum values:\n - `\"\"` \n - `\"timeseries-wide\"` \n - `\"timeseries-long\"` \n - `\"timeseries-many\"` \n - `\"timeseries-multi\"` \n - `\"directory-listing\"` \n - `\"table\"` \n - `\"numeric-wide\"` \n - `\"numeric-multi\"` \n - `\"numeric-long\"` \n - `\"log-lines\"` ",
+                    "type": "string",
+                    "enum": [
+                      "",
+                      "timeseries-wide",
+                      "timeseries-long",
+                      "timeseries-many",
+                      "timeseries-multi",
+                      "directory-listing",
+                      "table",
+                      "numeric-wide",
+                      "numeric-multi",
+                      "numeric-long",
+                      "log-lines"
+                    ],
+                    "x-enum-description": {}
+                  },
+                  "typeVersion": {
+                    "description": "TypeVersion is the version of the Type property. Versions greater than 0.0 correspond to the dataplane\ncontract documentation https://grafana.github.io/dataplane/contract/.",
+                    "type": "array",
+                    "maxItems": 2,
+                    "minItems": 2,
+                    "items": {
+                      "type": "integer"
+                    }
+                  }
+                },
+                "additionalProperties": false
+              },
+              "timeRange": {
+                "description": "TimeRange represents the query range\nNOTE: unlike generic /ds/query, we can now send explicit time values in each query\nNOTE: the values for timeRange are not saved in a dashboard, they are constructed on the fly",
+                "type": "object",
+                "required": [
+                  "from",
+                  "to"
+                ],
+                "properties": {
+                  "from": {
+                    "description": "From is the start time of the query.",
+                    "type": "string",
+                    "default": "now-6h",
+                    "examples": [
+                      "now-1h"
+                    ]
+                  },
+                  "to": {
+                    "description": "To is the end time of the query.",
+                    "type": "string",
+                    "default": "now",
+                    "examples": [
+                      "now"
+                    ]
+                  }
+                },
+                "additionalProperties": false
+              },
+              "type": {
+                "type": "string",
+                "pattern": "^resample$"
+              },
+              "upsampler": {
+                "description": "The upsample function\n\n\nPossible enum values:\n - `\"pad\"` Use the last seen value\n - `\"backfilling\"` backfill\n - `\"fillna\"` Do not fill values (nill)",
+                "type": "string",
+                "enum": [
+                  "pad",
+                  "backfilling",
+                  "fillna"
+                ],
+                "x-enum-description": {
+                  "backfilling": "backfill",
+                  "fillna": "Do not fill values (nill)",
+                  "pad": "Use the last seen value"
+                }
+              },
+              "window": {
+                "description": "The time duration",
+                "type": "string",
+                "minLength": 1,
+                "examples": [
+                  "1d",
+                  "10m"
+                ]
+              }
+            },
+            "additionalProperties": false,
+            "$schema": "https://json-schema.org/draft-04/schema"
+          },
+          {
+            "type": "object",
+            "required": [
+              "conditions",
+              "type",
+              "refId"
+            ],
+            "properties": {
+              "conditions": {
+                "type": "array",
+                "items": {
+                  "description": "ConditionJSON is the JSON model for a single condition in ConditionsCmd.",
+                  "type": "object",
+                  "required": [
+                    "evaluator",
+                    "operator",
+                    "query",
+                    "reducer"
+                  ],
+                  "properties": {
+                    "evaluator": {
+                      "type": "object",
+                      "required": [
+                        "params",
+                        "type"
+                      ],
+                      "properties": {
+                        "params": {
+                          "type": "array",
+                          "items": {
+                            "type": "number"
+                          }
+                        },
+                        "type": {
+                          "description": "e.g. \"gt\"",
+                          "type": "string"
+                        }
+                      },
+                      "additionalProperties": false
+                    },
+                    "operator": {
+                      "type": "object",
+                      "required": [
+                        "type"
+                      ],
+                      "properties": {
+                        "type": {
+                          "type": "string",
+                          "enum": [
+                            "and",
+                            "or"
+                          ],
+                          "x-enum-description": {}
+                        }
+                      },
+                      "additionalProperties": false
+                    },
+                    "query": {
+                      "type": "object",
+                      "required": [
+                        "params"
+                      ],
+                      "properties": {
+                        "params": {
+                          "type": "array",
+                          "items": {
+                            "type": "string"
+                          }
+                        }
+                      },
+                      "additionalProperties": false
+                    },
+                    "reducer": {
+                      "type": "object",
+                      "required": [
+                        "type"
+                      ],
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "additionalProperties": false
+                    }
+                  },
+                  "additionalProperties": false
+                }
+              },
+              "datasource": {
+                "description": "The datasource",
+                "type": "object",
+                "required": [
+                  "type"
+                ],
+                "properties": {
+                  "type": {
+                    "description": "The datasource plugin type",
+                    "type": "string",
+                    "pattern": "^__expr__$"
+                  },
+                  "uid": {
+                    "description": "Datasource UID",
+                    "type": "string"
+                  }
+                },
+                "additionalProperties": false
+              },
+              "hide": {
+                "description": "true if query is disabled (ie should not be returned to the dashboard)\nNOTE: this does not always imply that the query should not be executed since\nthe results from a hidden query may be used as the input to other queries (SSE etc)",
+                "type": "boolean"
+              },
+              "queryType": {
+                "description": "QueryType is an optional identifier for the type of query.\nIt can be used to distinguish different types of queries.",
+                "type": "string"
+              },
+              "refId": {
+                "description": "RefID is the unique identifier of the query, set by the frontend call.",
+                "type": "string"
+              },
+              "resultAssertions": {
+                "description": "Optionally define expected query result behavior",
+                "type": "object",
+                "required": [
+                  "typeVersion"
+                ],
+                "properties": {
+                  "maxFrames": {
+                    "description": "Maximum frame count",
+                    "type": "integer"
+                  },
+                  "type": {
+                    "description": "Type asserts that the frame matches a known type structure.\n\n\nPossible enum values:\n - `\"\"` \n - `\"timeseries-wide\"` \n - `\"timeseries-long\"` \n - `\"timeseries-many\"` \n - `\"timeseries-multi\"` \n - `\"directory-listing\"` \n - `\"table\"` \n - `\"numeric-wide\"` \n - `\"numeric-multi\"` \n - `\"numeric-long\"` \n - `\"log-lines\"` ",
+                    "type": "string",
+                    "enum": [
+                      "",
+                      "timeseries-wide",
+                      "timeseries-long",
+                      "timeseries-many",
+                      "timeseries-multi",
+                      "directory-listing",
+                      "table",
+                      "numeric-wide",
+                      "numeric-multi",
+                      "numeric-long",
+                      "log-lines"
+                    ],
+                    "x-enum-description": {}
+                  },
+                  "typeVersion": {
+                    "description": "TypeVersion is the version of the Type property. Versions greater than 0.0 correspond to the dataplane\ncontract documentation https://grafana.github.io/dataplane/contract/.",
+                    "type": "array",
+                    "maxItems": 2,
+                    "minItems": 2,
+                    "items": {
+                      "type": "integer"
+                    }
+                  }
+                },
+                "additionalProperties": false
+              },
+              "timeRange": {
+                "description": "TimeRange represents the query range\nNOTE: unlike generic /ds/query, we can now send explicit time values in each query\nNOTE: the values for timeRange are not saved in a dashboard, they are constructed on the fly",
+                "type": "object",
+                "required": [
+                  "from",
+                  "to"
+                ],
+                "properties": {
+                  "from": {
+                    "description": "From is the start time of the query.",
+                    "type": "string",
+                    "default": "now-6h",
+                    "examples": [
+                      "now-1h"
+                    ]
+                  },
+                  "to": {
+                    "description": "To is the end time of the query.",
+                    "type": "string",
+                    "default": "now",
+                    "examples": [
+                      "now"
+                    ]
+                  }
+                },
+                "additionalProperties": false
+              },
+              "type": {
+                "type": "string",
+                "pattern": "^classic_conditions$"
+              }
+            },
+            "additionalProperties": false,
+            "$schema": "https://json-schema.org/draft-04/schema"
+          },
+          {
+            "type": "object",
+            "required": [
+              "expression",
+              "conditions",
+              "type",
+              "refId"
+            ],
+            "properties": {
+              "conditions": {
+                "description": "Threshold Conditions",
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "required": [
+                    "evaluator"
+                  ],
+                  "properties": {
+                    "evaluator": {
+                      "type": "object",
+                      "required": [
+                        "params",
+                        "type"
+                      ],
+                      "properties": {
+                        "params": {
+                          "type": "array",
+                          "items": {
+                            "type": "number"
+                          }
+                        },
+                        "type": {
+                          "description": "e.g. \"gt\"",
+                          "type": "string",
+                          "enum": [
+                            "gt",
+                            "lt",
+                            "within_range",
+                            "outside_range"
+                          ],
+                          "x-enum-description": {}
+                        }
+                      },
+                      "additionalProperties": false
+                    },
+                    "loadedDimensions": {
+                      "type": "object",
+                      "additionalProperties": true,
+                      "x-grafana-type": "data.DataFrame"
+                    },
+                    "unloadEvaluator": {
+                      "type": "object",
+                      "required": [
+                        "params",
+                        "type"
+                      ],
+                      "properties": {
+                        "params": {
+                          "type": "array",
+                          "items": {
+                            "type": "number"
+                          }
+                        },
+                        "type": {
+                          "description": "e.g. \"gt\"",
+                          "type": "string",
+                          "enum": [
+                            "gt",
+                            "lt",
+                            "within_range",
+                            "outside_range"
+                          ],
+                          "x-enum-description": {}
+                        }
+                      },
+                      "additionalProperties": false
+                    }
+                  },
+                  "additionalProperties": false
+                }
+              },
+              "datasource": {
+                "description": "The datasource",
+                "type": "object",
+                "required": [
+                  "type"
+                ],
+                "properties": {
+                  "type": {
+                    "description": "The datasource plugin type",
+                    "type": "string",
+                    "pattern": "^__expr__$"
+                  },
+                  "uid": {
+                    "description": "Datasource UID",
+                    "type": "string"
+                  }
+                },
+                "additionalProperties": false
+              },
+              "expression": {
+                "description": "Reference to single query result",
+                "type": "string",
+                "minLength": 1,
+                "examples": [
+                  "$A"
+                ]
+              },
+              "hide": {
+                "description": "true if query is disabled (ie should not be returned to the dashboard)\nNOTE: this does not always imply that the query should not be executed since\nthe results from a hidden query may be used as the input to other queries (SSE etc)",
+                "type": "boolean"
+              },
+              "queryType": {
+                "description": "QueryType is an optional identifier for the type of query.\nIt can be used to distinguish different types of queries.",
+                "type": "string"
+              },
+              "refId": {
+                "description": "RefID is the unique identifier of the query, set by the frontend call.",
+                "type": "string"
+              },
+              "resultAssertions": {
+                "description": "Optionally define expected query result behavior",
+                "type": "object",
+                "required": [
+                  "typeVersion"
+                ],
+                "properties": {
+                  "maxFrames": {
+                    "description": "Maximum frame count",
+                    "type": "integer"
+                  },
+                  "type": {
+                    "description": "Type asserts that the frame matches a known type structure.\n\n\nPossible enum values:\n - `\"\"` \n - `\"timeseries-wide\"` \n - `\"timeseries-long\"` \n - `\"timeseries-many\"` \n - `\"timeseries-multi\"` \n - `\"directory-listing\"` \n - `\"table\"` \n - `\"numeric-wide\"` \n - `\"numeric-multi\"` \n - `\"numeric-long\"` \n - `\"log-lines\"` ",
+                    "type": "string",
+                    "enum": [
+                      "",
+                      "timeseries-wide",
+                      "timeseries-long",
+                      "timeseries-many",
+                      "timeseries-multi",
+                      "directory-listing",
+                      "table",
+                      "numeric-wide",
+                      "numeric-multi",
+                      "numeric-long",
+                      "log-lines"
+                    ],
+                    "x-enum-description": {}
+                  },
+                  "typeVersion": {
+                    "description": "TypeVersion is the version of the Type property. Versions greater than 0.0 correspond to the dataplane\ncontract documentation https://grafana.github.io/dataplane/contract/.",
+                    "type": "array",
+                    "maxItems": 2,
+                    "minItems": 2,
+                    "items": {
+                      "type": "integer"
+                    }
+                  }
+                },
+                "additionalProperties": false
+              },
+              "timeRange": {
+                "description": "TimeRange represents the query range\nNOTE: unlike generic /ds/query, we can now send explicit time values in each query\nNOTE: the values for timeRange are not saved in a dashboard, they are constructed on the fly",
+                "type": "object",
+                "required": [
+                  "from",
+                  "to"
+                ],
+                "properties": {
+                  "from": {
+                    "description": "From is the start time of the query.",
+                    "type": "string",
+                    "default": "now-6h",
+                    "examples": [
+                      "now-1h"
+                    ]
+                  },
+                  "to": {
+                    "description": "To is the end time of the query.",
+                    "type": "string",
+                    "default": "now",
+                    "examples": [
+                      "now"
+                    ]
+                  }
+                },
+                "additionalProperties": false
+              },
+              "type": {
+                "type": "string",
+                "pattern": "^threshold$"
+              }
+            },
+            "additionalProperties": false,
+            "$schema": "https://json-schema.org/draft-04/schema"
+          },
+          {
+            "description": "SQLQuery requires the sqlExpression feature flag",
+            "type": "object",
+            "required": [
+              "expression",
+              "type",
+              "refId"
+            ],
+            "properties": {
+              "datasource": {
+                "description": "The datasource",
+                "type": "object",
+                "required": [
+                  "type"
+                ],
+                "properties": {
+                  "type": {
+                    "description": "The datasource plugin type",
+                    "type": "string",
+                    "pattern": "^__expr__$"
+                  },
+                  "uid": {
+                    "description": "Datasource UID",
+                    "type": "string"
+                  }
+                },
+                "additionalProperties": false
+              },
+              "expression": {
+                "type": "string",
+                "minLength": 1,
+                "examples": [
+                  "SELECT * FROM A LIMIT 1"
+                ]
+              },
+              "hide": {
+                "description": "true if query is disabled (ie should not be returned to the dashboard)\nNOTE: this does not always imply that the query should not be executed since\nthe results from a hidden query may be used as the input to other queries (SSE etc)",
+                "type": "boolean"
+              },
+              "queryType": {
+                "description": "QueryType is an optional identifier for the type of query.\nIt can be used to distinguish different types of queries.",
+                "type": "string"
+              },
+              "refId": {
+                "description": "RefID is the unique identifier of the query, set by the frontend call.",
+                "type": "string"
+              },
+              "resultAssertions": {
+                "description": "Optionally define expected query result behavior",
+                "type": "object",
+                "required": [
+                  "typeVersion"
+                ],
+                "properties": {
+                  "maxFrames": {
+                    "description": "Maximum frame count",
+                    "type": "integer"
+                  },
+                  "type": {
+                    "description": "Type asserts that the frame matches a known type structure.\n\n\nPossible enum values:\n - `\"\"` \n - `\"timeseries-wide\"` \n - `\"timeseries-long\"` \n - `\"timeseries-many\"` \n - `\"timeseries-multi\"` \n - `\"directory-listing\"` \n - `\"table\"` \n - `\"numeric-wide\"` \n - `\"numeric-multi\"` \n - `\"numeric-long\"` \n - `\"log-lines\"` ",
+                    "type": "string",
+                    "enum": [
+                      "",
+                      "timeseries-wide",
+                      "timeseries-long",
+                      "timeseries-many",
+                      "timeseries-multi",
+                      "directory-listing",
+                      "table",
+                      "numeric-wide",
+                      "numeric-multi",
+                      "numeric-long",
+                      "log-lines"
+                    ],
+                    "x-enum-description": {}
+                  },
+                  "typeVersion": {
+                    "description": "TypeVersion is the version of the Type property. Versions greater than 0.0 correspond to the dataplane\ncontract documentation https://grafana.github.io/dataplane/contract/.",
+                    "type": "array",
+                    "maxItems": 2,
+                    "minItems": 2,
+                    "items": {
+                      "type": "integer"
+                    }
+                  }
+                },
+                "additionalProperties": false
+              },
+              "timeRange": {
+                "description": "TimeRange represents the query range\nNOTE: unlike generic /ds/query, we can now send explicit time values in each query\nNOTE: the values for timeRange are not saved in a dashboard, they are constructed on the fly",
+                "type": "object",
+                "required": [
+                  "from",
+                  "to"
+                ],
+                "properties": {
+                  "from": {
+                    "description": "From is the start time of the query.",
+                    "type": "string",
+                    "default": "now-6h",
+                    "examples": [
+                      "now-1h"
+                    ]
+                  },
+                  "to": {
+                    "description": "To is the end time of the query.",
+                    "type": "string",
+                    "default": "now",
+                    "examples": [
+                      "now"
+                    ]
+                  }
+                },
+                "additionalProperties": false
+              },
+              "type": {
+                "type": "string",
+                "pattern": "^sql$"
+              }
+            },
+            "additionalProperties": false,
+            "$schema": "https://json-schema.org/draft-04/schema"
+          }
+        ],
+        "$schema": "https://json-schema.org/draft-04/schema#"
+      }
+    },
+    "type": {
+      "description": "the panel type",
+      "type": "string"
+    }
+  },
+  "additionalProperties": true,
+  "$schema": "https://json-schema.org/draft-04/schema#"
+}
\ No newline at end of file
diff --git a/pkg/expr/query.request.example.json b/pkg/expr/query.request.example.json
new file mode 100644
index 0000000000000..31af7df76af5f
--- /dev/null
+++ b/pkg/expr/query.request.example.json
@@ -0,0 +1,147 @@
+{
+  "from": "now-1h",
+  "to": "now",
+  "queries": [
+    {
+      "refId": "A",
+      "maxDataPoints": 1000,
+      "intervalMs": 5,
+      "expression": "$A + 10",
+      "type": "math"
+    },
+    {
+      "refId": "B",
+      "maxDataPoints": 1000,
+      "intervalMs": 5,
+      "type": "math",
+      "expression": "$A - $B"
+    },
+    {
+      "refId": "C",
+      "maxDataPoints": 1000,
+      "intervalMs": 5,
+      "expression": "$A",
+      "reducer": "max",
+      "settings": {
+        "mode": "dropNN"
+      },
+      "type": "reduce"
+    },
+    {
+      "refId": "D",
+      "maxDataPoints": 1000,
+      "intervalMs": 5,
+      "upsampler": "pad",
+      "type": "resample",
+      "expression": "$A",
+      "window": "1d",
+      "downsampler": "last"
+    },
+    {
+      "refId": "E",
+      "maxDataPoints": 1000,
+      "intervalMs": 5,
+      "conditions": [
+        {
+          "evaluator": {
+            "params": [
+              5
+            ],
+            "type": "gt"
+          },
+          "operator": {
+            "type": "and"
+          },
+          "query": {
+            "params": [
+              "A"
+            ]
+          },
+          "reducer": {
+            "type": "max"
+          }
+        }
+      ],
+      "type": "classic_conditions"
+    },
+    {
+      "refId": "F",
+      "maxDataPoints": 1000,
+      "intervalMs": 5,
+      "expression": "A",
+      "conditions": [
+        {
+          "evaluator": {
+            "params": [
+              5
+            ],
+            "type": "gt"
+          }
+        }
+      ],
+      "type": "threshold"
+    },
+    {
+      "refId": "G",
+      "maxDataPoints": 1000,
+      "intervalMs": 5,
+      "expression": "B",
+      "conditions": [
+        {
+          "evaluator": {
+            "params": [
+              100
+            ],
+            "type": "gt"
+          },
+          "loadedDimensions": {
+            "data": {
+              "values": [
+                [
+                  18446744073709552000,
+                  2,
+                  3,
+                  4,
+                  5
+                ]
+              ]
+            },
+            "schema": {
+              "fields": [
+                {
+                  "name": "fingerprints",
+                  "type": "number",
+                  "typeInfo": {
+                    "frame": "uint64"
+                  }
+                }
+              ],
+              "meta": {
+                "type": "fingerprints",
+                "typeVersion": [
+                  1,
+                  0
+                ]
+              },
+              "name": "test"
+            }
+          },
+          "unloadEvaluator": {
+            "params": [
+              31
+            ],
+            "type": "lt"
+          }
+        }
+      ],
+      "type": "threshold"
+    },
+    {
+      "refId": "H",
+      "maxDataPoints": 1000,
+      "intervalMs": 5,
+      "expression": "SELECT * FROM A limit 1",
+      "type": "sql"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/expr/query.request.schema.json b/pkg/expr/query.request.schema.json
new file mode 100644
index 0000000000000..450467384d788
--- /dev/null
+++ b/pkg/expr/query.request.schema.json
@@ -0,0 +1,1047 @@
+{
+  "type": "object",
+  "required": [
+    "queries"
+  ],
+  "properties": {
+    "$schema": {
+      "description": "helper",
+      "type": "string"
+    },
+    "debug": {
+      "type": "boolean"
+    },
+    "from": {
+      "description": "From Start time in epoch timestamps in milliseconds or relative using Grafana time units.",
+      "type": "string"
+    },
+    "queries": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "oneOf": [
+          {
+            "type": "object",
+            "required": [
+              "expression",
+              "type",
+              "refId"
+            ],
+            "properties": {
+              "datasource": {
+                "description": "The datasource",
+                "type": "object",
+                "required": [
+                  "type"
+                ],
+                "properties": {
+                  "type": {
+                    "description": "The datasource plugin type",
+                    "type": "string",
+                    "pattern": "^__expr__$"
+                  },
+                  "uid": {
+                    "description": "Datasource UID",
+                    "type": "string"
+                  }
+                },
+                "additionalProperties": false
+              },
+              "expression": {
+                "description": "General math expression",
+                "type": "string",
+                "minLength": 1,
+                "examples": [
+                  "$A + 1",
+                  "$A/$B"
+                ]
+              },
+              "hide": {
+                "description": "true if query is disabled (ie should not be returned to the dashboard)\nNOTE: this does not always imply that the query should not be executed since\nthe results from a hidden query may be used as the input to other queries (SSE etc)",
+                "type": "boolean"
+              },
+              "intervalMs": {
+                "description": "Interval is the suggested duration between time points in a time series query.\nNOTE: the values for intervalMs is not saved in the query model.  It is typically calculated\nfrom the interval required to fill a pixels in the visualization",
+                "type": "number"
+              },
+              "maxDataPoints": {
+                "description": "MaxDataPoints is the maximum number of data points that should be returned from a time series query.\nNOTE: the values for maxDataPoints is not saved in the query model.  It is typically calculated\nfrom the number of pixels visible in a visualization",
+                "type": "integer"
+              },
+              "queryType": {
+                "description": "QueryType is an optional identifier for the type of query.\nIt can be used to distinguish different types of queries.",
+                "type": "string"
+              },
+              "refId": {
+                "description": "RefID is the unique identifier of the query, set by the frontend call.",
+                "type": "string"
+              },
+              "resultAssertions": {
+                "description": "Optionally define expected query result behavior",
+                "type": "object",
+                "required": [
+                  "typeVersion"
+                ],
+                "properties": {
+                  "maxFrames": {
+                    "description": "Maximum frame count",
+                    "type": "integer"
+                  },
+                  "type": {
+                    "description": "Type asserts that the frame matches a known type structure.\n\n\nPossible enum values:\n - `\"\"` \n - `\"timeseries-wide\"` \n - `\"timeseries-long\"` \n - `\"timeseries-many\"` \n - `\"timeseries-multi\"` \n - `\"directory-listing\"` \n - `\"table\"` \n - `\"numeric-wide\"` \n - `\"numeric-multi\"` \n - `\"numeric-long\"` \n - `\"log-lines\"` ",
+                    "type": "string",
+                    "enum": [
+                      "",
+                      "timeseries-wide",
+                      "timeseries-long",
+                      "timeseries-many",
+                      "timeseries-multi",
+                      "directory-listing",
+                      "table",
+                      "numeric-wide",
+                      "numeric-multi",
+                      "numeric-long",
+                      "log-lines"
+                    ],
+                    "x-enum-description": {}
+                  },
+                  "typeVersion": {
+                    "description": "TypeVersion is the version of the Type property. Versions greater than 0.0 correspond to the dataplane\ncontract documentation https://grafana.github.io/dataplane/contract/.",
+                    "type": "array",
+                    "maxItems": 2,
+                    "minItems": 2,
+                    "items": {
+                      "type": "integer"
+                    }
+                  }
+                },
+                "additionalProperties": false
+              },
+              "timeRange": {
+                "description": "TimeRange represents the query range\nNOTE: unlike generic /ds/query, we can now send explicit time values in each query\nNOTE: the values for timeRange are not saved in a dashboard, they are constructed on the fly",
+                "type": "object",
+                "required": [
+                  "from",
+                  "to"
+                ],
+                "properties": {
+                  "from": {
+                    "description": "From is the start time of the query.",
+                    "type": "string",
+                    "default": "now-6h",
+                    "examples": [
+                      "now-1h"
+                    ]
+                  },
+                  "to": {
+                    "description": "To is the end time of the query.",
+                    "type": "string",
+                    "default": "now",
+                    "examples": [
+                      "now"
+                    ]
+                  }
+                },
+                "additionalProperties": false
+              },
+              "type": {
+                "type": "string",
+                "pattern": "^math$"
+              }
+            },
+            "additionalProperties": false,
+            "$schema": "https://json-schema.org/draft-04/schema"
+          },
+          {
+            "type": "object",
+            "required": [
+              "expression",
+              "reducer",
+              "type",
+              "refId"
+            ],
+            "properties": {
+              "datasource": {
+                "description": "The datasource",
+                "type": "object",
+                "required": [
+                  "type"
+                ],
+                "properties": {
+                  "type": {
+                    "description": "The datasource plugin type",
+                    "type": "string",
+                    "pattern": "^__expr__$"
+                  },
+                  "uid": {
+                    "description": "Datasource UID",
+                    "type": "string"
+                  }
+                },
+                "additionalProperties": false
+              },
+              "expression": {
+                "description": "Reference to single query result",
+                "type": "string",
+                "minLength": 1,
+                "examples": [
+                  "$A"
+                ]
+              },
+              "hide": {
+                "description": "true if query is disabled (ie should not be returned to the dashboard)\nNOTE: this does not always imply that the query should not be executed since\nthe results from a hidden query may be used as the input to other queries (SSE etc)",
+                "type": "boolean"
+              },
+              "intervalMs": {
+                "description": "Interval is the suggested duration between time points in a time series query.\nNOTE: the values for intervalMs is not saved in the query model.  It is typically calculated\nfrom the interval required to fill a pixels in the visualization",
+                "type": "number"
+              },
+              "maxDataPoints": {
+                "description": "MaxDataPoints is the maximum number of data points that should be returned from a time series query.\nNOTE: the values for maxDataPoints is not saved in the query model.  It is typically calculated\nfrom the number of pixels visible in a visualization",
+                "type": "integer"
+              },
+              "queryType": {
+                "description": "QueryType is an optional identifier for the type of query.\nIt can be used to distinguish different types of queries.",
+                "type": "string"
+              },
+              "reducer": {
+                "description": "The reducer\n\n\nPossible enum values:\n - `\"sum\"` \n - `\"mean\"` \n - `\"min\"` \n - `\"max\"` \n - `\"count\"` \n - `\"last\"` ",
+                "type": "string",
+                "enum": [
+                  "sum",
+                  "mean",
+                  "min",
+                  "max",
+                  "count",
+                  "last"
+                ],
+                "x-enum-description": {}
+              },
+              "refId": {
+                "description": "RefID is the unique identifier of the query, set by the frontend call.",
+                "type": "string"
+              },
+              "resultAssertions": {
+                "description": "Optionally define expected query result behavior",
+                "type": "object",
+                "required": [
+                  "typeVersion"
+                ],
+                "properties": {
+                  "maxFrames": {
+                    "description": "Maximum frame count",
+                    "type": "integer"
+                  },
+                  "type": {
+                    "description": "Type asserts that the frame matches a known type structure.\n\n\nPossible enum values:\n - `\"\"` \n - `\"timeseries-wide\"` \n - `\"timeseries-long\"` \n - `\"timeseries-many\"` \n - `\"timeseries-multi\"` \n - `\"directory-listing\"` \n - `\"table\"` \n - `\"numeric-wide\"` \n - `\"numeric-multi\"` \n - `\"numeric-long\"` \n - `\"log-lines\"` ",
+                    "type": "string",
+                    "enum": [
+                      "",
+                      "timeseries-wide",
+                      "timeseries-long",
+                      "timeseries-many",
+                      "timeseries-multi",
+                      "directory-listing",
+                      "table",
+                      "numeric-wide",
+                      "numeric-multi",
+                      "numeric-long",
+                      "log-lines"
+                    ],
+                    "x-enum-description": {}
+                  },
+                  "typeVersion": {
+                    "description": "TypeVersion is the version of the Type property. Versions greater than 0.0 correspond to the dataplane\ncontract documentation https://grafana.github.io/dataplane/contract/.",
+                    "type": "array",
+                    "maxItems": 2,
+                    "minItems": 2,
+                    "items": {
+                      "type": "integer"
+                    }
+                  }
+                },
+                "additionalProperties": false
+              },
+              "settings": {
+                "description": "Reducer Options",
+                "type": "object",
+                "required": [
+                  "mode"
+                ],
+                "properties": {
+                  "mode": {
+                    "description": "Non-number reduce behavior\n\n\nPossible enum values:\n - `\"dropNN\"` Drop non-numbers\n - `\"replaceNN\"` Replace non-numbers",
+                    "type": "string",
+                    "enum": [
+                      "dropNN",
+                      "replaceNN"
+                    ],
+                    "x-enum-description": {
+                      "dropNN": "Drop non-numbers",
+                      "replaceNN": "Replace non-numbers"
+                    }
+                  },
+                  "replaceWithValue": {
+                    "description": "Only valid when mode is replace",
+                    "type": "number"
+                  }
+                },
+                "additionalProperties": false
+              },
+              "timeRange": {
+                "description": "TimeRange represents the query range\nNOTE: unlike generic /ds/query, we can now send explicit time values in each query\nNOTE: the values for timeRange are not saved in a dashboard, they are constructed on the fly",
+                "type": "object",
+                "required": [
+                  "from",
+                  "to"
+                ],
+                "properties": {
+                  "from": {
+                    "description": "From is the start time of the query.",
+                    "type": "string",
+                    "default": "now-6h",
+                    "examples": [
+                      "now-1h"
+                    ]
+                  },
+                  "to": {
+                    "description": "To is the end time of the query.",
+                    "type": "string",
+                    "default": "now",
+                    "examples": [
+                      "now"
+                    ]
+                  }
+                },
+                "additionalProperties": false
+              },
+              "type": {
+                "type": "string",
+                "pattern": "^reduce$"
+              }
+            },
+            "additionalProperties": false,
+            "$schema": "https://json-schema.org/draft-04/schema"
+          },
+          {
+            "description": "QueryType = resample",
+            "type": "object",
+            "required": [
+              "expression",
+              "window",
+              "downsampler",
+              "upsampler",
+              "type",
+              "refId"
+            ],
+            "properties": {
+              "datasource": {
+                "description": "The datasource",
+                "type": "object",
+                "required": [
+                  "type"
+                ],
+                "properties": {
+                  "type": {
+                    "description": "The datasource plugin type",
+                    "type": "string",
+                    "pattern": "^__expr__$"
+                  },
+                  "uid": {
+                    "description": "Datasource UID",
+                    "type": "string"
+                  }
+                },
+                "additionalProperties": false
+              },
+              "downsampler": {
+                "description": "The downsample function\n\n\nPossible enum values:\n - `\"sum\"` \n - `\"mean\"` \n - `\"min\"` \n - `\"max\"` \n - `\"count\"` \n - `\"last\"` ",
+                "type": "string",
+                "enum": [
+                  "sum",
+                  "mean",
+                  "min",
+                  "max",
+                  "count",
+                  "last"
+                ],
+                "x-enum-description": {}
+              },
+              "expression": {
+                "description": "The math expression",
+                "type": "string",
+                "minLength": 1,
+                "examples": [
+                  "$A + 1",
+                  "$A"
+                ]
+              },
+              "hide": {
+                "description": "true if query is disabled (ie should not be returned to the dashboard)\nNOTE: this does not always imply that the query should not be executed since\nthe results from a hidden query may be used as the input to other queries (SSE etc)",
+                "type": "boolean"
+              },
+              "intervalMs": {
+                "description": "Interval is the suggested duration between time points in a time series query.\nNOTE: the values for intervalMs is not saved in the query model.  It is typically calculated\nfrom the interval required to fill a pixels in the visualization",
+                "type": "number"
+              },
+              "maxDataPoints": {
+                "description": "MaxDataPoints is the maximum number of data points that should be returned from a time series query.\nNOTE: the values for maxDataPoints is not saved in the query model.  It is typically calculated\nfrom the number of pixels visible in a visualization",
+                "type": "integer"
+              },
+              "queryType": {
+                "description": "QueryType is an optional identifier for the type of query.\nIt can be used to distinguish different types of queries.",
+                "type": "string"
+              },
+              "refId": {
+                "description": "RefID is the unique identifier of the query, set by the frontend call.",
+                "type": "string"
+              },
+              "resultAssertions": {
+                "description": "Optionally define expected query result behavior",
+                "type": "object",
+                "required": [
+                  "typeVersion"
+                ],
+                "properties": {
+                  "maxFrames": {
+                    "description": "Maximum frame count",
+                    "type": "integer"
+                  },
+                  "type": {
+                    "description": "Type asserts that the frame matches a known type structure.\n\n\nPossible enum values:\n - `\"\"` \n - `\"timeseries-wide\"` \n - `\"timeseries-long\"` \n - `\"timeseries-many\"` \n - `\"timeseries-multi\"` \n - `\"directory-listing\"` \n - `\"table\"` \n - `\"numeric-wide\"` \n - `\"numeric-multi\"` \n - `\"numeric-long\"` \n - `\"log-lines\"` ",
+                    "type": "string",
+                    "enum": [
+                      "",
+                      "timeseries-wide",
+                      "timeseries-long",
+                      "timeseries-many",
+                      "timeseries-multi",
+                      "directory-listing",
+                      "table",
+                      "numeric-wide",
+                      "numeric-multi",
+                      "numeric-long",
+                      "log-lines"
+                    ],
+                    "x-enum-description": {}
+                  },
+                  "typeVersion": {
+                    "description": "TypeVersion is the version of the Type property. Versions greater than 0.0 correspond to the dataplane\ncontract documentation https://grafana.github.io/dataplane/contract/.",
+                    "type": "array",
+                    "maxItems": 2,
+                    "minItems": 2,
+                    "items": {
+                      "type": "integer"
+                    }
+                  }
+                },
+                "additionalProperties": false
+              },
+              "timeRange": {
+                "description": "TimeRange represents the query range\nNOTE: unlike generic /ds/query, we can now send explicit time values in each query\nNOTE: the values for timeRange are not saved in a dashboard, they are constructed on the fly",
+                "type": "object",
+                "required": [
+                  "from",
+                  "to"
+                ],
+                "properties": {
+                  "from": {
+                    "description": "From is the start time of the query.",
+                    "type": "string",
+                    "default": "now-6h",
+                    "examples": [
+                      "now-1h"
+                    ]
+                  },
+                  "to": {
+                    "description": "To is the end time of the query.",
+                    "type": "string",
+                    "default": "now",
+                    "examples": [
+                      "now"
+                    ]
+                  }
+                },
+                "additionalProperties": false
+              },
+              "type": {
+                "type": "string",
+                "pattern": "^resample$"
+              },
+              "upsampler": {
+                "description": "The upsample function\n\n\nPossible enum values:\n - `\"pad\"` Use the last seen value\n - `\"backfilling\"` backfill\n - `\"fillna\"` Do not fill values (nill)",
+                "type": "string",
+                "enum": [
+                  "pad",
+                  "backfilling",
+                  "fillna"
+                ],
+                "x-enum-description": {
+                  "backfilling": "backfill",
+                  "fillna": "Do not fill values (nill)",
+                  "pad": "Use the last seen value"
+                }
+              },
+              "window": {
+                "description": "The time duration",
+                "type": "string",
+                "minLength": 1,
+                "examples": [
+                  "1d",
+                  "10m"
+                ]
+              }
+            },
+            "additionalProperties": false,
+            "$schema": "https://json-schema.org/draft-04/schema"
+          },
+          {
+            "type": "object",
+            "required": [
+              "conditions",
+              "type",
+              "refId"
+            ],
+            "properties": {
+              "conditions": {
+                "type": "array",
+                "items": {
+                  "description": "ConditionJSON is the JSON model for a single condition in ConditionsCmd.",
+                  "type": "object",
+                  "required": [
+                    "evaluator",
+                    "operator",
+                    "query",
+                    "reducer"
+                  ],
+                  "properties": {
+                    "evaluator": {
+                      "type": "object",
+                      "required": [
+                        "params",
+                        "type"
+                      ],
+                      "properties": {
+                        "params": {
+                          "type": "array",
+                          "items": {
+                            "type": "number"
+                          }
+                        },
+                        "type": {
+                          "description": "e.g. \"gt\"",
+                          "type": "string"
+                        }
+                      },
+                      "additionalProperties": false
+                    },
+                    "operator": {
+                      "type": "object",
+                      "required": [
+                        "type"
+                      ],
+                      "properties": {
+                        "type": {
+                          "type": "string",
+                          "enum": [
+                            "and",
+                            "or"
+                          ],
+                          "x-enum-description": {}
+                        }
+                      },
+                      "additionalProperties": false
+                    },
+                    "query": {
+                      "type": "object",
+                      "required": [
+                        "params"
+                      ],
+                      "properties": {
+                        "params": {
+                          "type": "array",
+                          "items": {
+                            "type": "string"
+                          }
+                        }
+                      },
+                      "additionalProperties": false
+                    },
+                    "reducer": {
+                      "type": "object",
+                      "required": [
+                        "type"
+                      ],
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "additionalProperties": false
+                    }
+                  },
+                  "additionalProperties": false
+                }
+              },
+              "datasource": {
+                "description": "The datasource",
+                "type": "object",
+                "required": [
+                  "type"
+                ],
+                "properties": {
+                  "type": {
+                    "description": "The datasource plugin type",
+                    "type": "string",
+                    "pattern": "^__expr__$"
+                  },
+                  "uid": {
+                    "description": "Datasource UID",
+                    "type": "string"
+                  }
+                },
+                "additionalProperties": false
+              },
+              "hide": {
+                "description": "true if query is disabled (ie should not be returned to the dashboard)\nNOTE: this does not always imply that the query should not be executed since\nthe results from a hidden query may be used as the input to other queries (SSE etc)",
+                "type": "boolean"
+              },
+              "intervalMs": {
+                "description": "Interval is the suggested duration between time points in a time series query.\nNOTE: the values for intervalMs is not saved in the query model.  It is typically calculated\nfrom the interval required to fill a pixels in the visualization",
+                "type": "number"
+              },
+              "maxDataPoints": {
+                "description": "MaxDataPoints is the maximum number of data points that should be returned from a time series query.\nNOTE: the values for maxDataPoints is not saved in the query model.  It is typically calculated\nfrom the number of pixels visible in a visualization",
+                "type": "integer"
+              },
+              "queryType": {
+                "description": "QueryType is an optional identifier for the type of query.\nIt can be used to distinguish different types of queries.",
+                "type": "string"
+              },
+              "refId": {
+                "description": "RefID is the unique identifier of the query, set by the frontend call.",
+                "type": "string"
+              },
+              "resultAssertions": {
+                "description": "Optionally define expected query result behavior",
+                "type": "object",
+                "required": [
+                  "typeVersion"
+                ],
+                "properties": {
+                  "maxFrames": {
+                    "description": "Maximum frame count",
+                    "type": "integer"
+                  },
+                  "type": {
+                    "description": "Type asserts that the frame matches a known type structure.\n\n\nPossible enum values:\n - `\"\"` \n - `\"timeseries-wide\"` \n - `\"timeseries-long\"` \n - `\"timeseries-many\"` \n - `\"timeseries-multi\"` \n - `\"directory-listing\"` \n - `\"table\"` \n - `\"numeric-wide\"` \n - `\"numeric-multi\"` \n - `\"numeric-long\"` \n - `\"log-lines\"` ",
+                    "type": "string",
+                    "enum": [
+                      "",
+                      "timeseries-wide",
+                      "timeseries-long",
+                      "timeseries-many",
+                      "timeseries-multi",
+                      "directory-listing",
+                      "table",
+                      "numeric-wide",
+                      "numeric-multi",
+                      "numeric-long",
+                      "log-lines"
+                    ],
+                    "x-enum-description": {}
+                  },
+                  "typeVersion": {
+                    "description": "TypeVersion is the version of the Type property. Versions greater than 0.0 correspond to the dataplane\ncontract documentation https://grafana.github.io/dataplane/contract/.",
+                    "type": "array",
+                    "maxItems": 2,
+                    "minItems": 2,
+                    "items": {
+                      "type": "integer"
+                    }
+                  }
+                },
+                "additionalProperties": false
+              },
+              "timeRange": {
+                "description": "TimeRange represents the query range\nNOTE: unlike generic /ds/query, we can now send explicit time values in each query\nNOTE: the values for timeRange are not saved in a dashboard, they are constructed on the fly",
+                "type": "object",
+                "required": [
+                  "from",
+                  "to"
+                ],
+                "properties": {
+                  "from": {
+                    "description": "From is the start time of the query.",
+                    "type": "string",
+                    "default": "now-6h",
+                    "examples": [
+                      "now-1h"
+                    ]
+                  },
+                  "to": {
+                    "description": "To is the end time of the query.",
+                    "type": "string",
+                    "default": "now",
+                    "examples": [
+                      "now"
+                    ]
+                  }
+                },
+                "additionalProperties": false
+              },
+              "type": {
+                "type": "string",
+                "pattern": "^classic_conditions$"
+              }
+            },
+            "additionalProperties": false,
+            "$schema": "https://json-schema.org/draft-04/schema"
+          },
+          {
+            "type": "object",
+            "required": [
+              "expression",
+              "conditions",
+              "type",
+              "refId"
+            ],
+            "properties": {
+              "conditions": {
+                "description": "Threshold Conditions",
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "required": [
+                    "evaluator"
+                  ],
+                  "properties": {
+                    "evaluator": {
+                      "type": "object",
+                      "required": [
+                        "params",
+                        "type"
+                      ],
+                      "properties": {
+                        "params": {
+                          "type": "array",
+                          "items": {
+                            "type": "number"
+                          }
+                        },
+                        "type": {
+                          "description": "e.g. \"gt\"",
+                          "type": "string",
+                          "enum": [
+                            "gt",
+                            "lt",
+                            "within_range",
+                            "outside_range"
+                          ],
+                          "x-enum-description": {}
+                        }
+                      },
+                      "additionalProperties": false
+                    },
+                    "loadedDimensions": {
+                      "type": "object",
+                      "additionalProperties": true,
+                      "x-grafana-type": "data.DataFrame"
+                    },
+                    "unloadEvaluator": {
+                      "type": "object",
+                      "required": [
+                        "params",
+                        "type"
+                      ],
+                      "properties": {
+                        "params": {
+                          "type": "array",
+                          "items": {
+                            "type": "number"
+                          }
+                        },
+                        "type": {
+                          "description": "e.g. \"gt\"",
+                          "type": "string",
+                          "enum": [
+                            "gt",
+                            "lt",
+                            "within_range",
+                            "outside_range"
+                          ],
+                          "x-enum-description": {}
+                        }
+                      },
+                      "additionalProperties": false
+                    }
+                  },
+                  "additionalProperties": false
+                }
+              },
+              "datasource": {
+                "description": "The datasource",
+                "type": "object",
+                "required": [
+                  "type"
+                ],
+                "properties": {
+                  "type": {
+                    "description": "The datasource plugin type",
+                    "type": "string",
+                    "pattern": "^__expr__$"
+                  },
+                  "uid": {
+                    "description": "Datasource UID",
+                    "type": "string"
+                  }
+                },
+                "additionalProperties": false
+              },
+              "expression": {
+                "description": "Reference to single query result",
+                "type": "string",
+                "minLength": 1,
+                "examples": [
+                  "$A"
+                ]
+              },
+              "hide": {
+                "description": "true if query is disabled (ie should not be returned to the dashboard)\nNOTE: this does not always imply that the query should not be executed since\nthe results from a hidden query may be used as the input to other queries (SSE etc)",
+                "type": "boolean"
+              },
+              "intervalMs": {
+                "description": "Interval is the suggested duration between time points in a time series query.\nNOTE: the values for intervalMs is not saved in the query model.  It is typically calculated\nfrom the interval required to fill a pixels in the visualization",
+                "type": "number"
+              },
+              "maxDataPoints": {
+                "description": "MaxDataPoints is the maximum number of data points that should be returned from a time series query.\nNOTE: the values for maxDataPoints is not saved in the query model.  It is typically calculated\nfrom the number of pixels visible in a visualization",
+                "type": "integer"
+              },
+              "queryType": {
+                "description": "QueryType is an optional identifier for the type of query.\nIt can be used to distinguish different types of queries.",
+                "type": "string"
+              },
+              "refId": {
+                "description": "RefID is the unique identifier of the query, set by the frontend call.",
+                "type": "string"
+              },
+              "resultAssertions": {
+                "description": "Optionally define expected query result behavior",
+                "type": "object",
+                "required": [
+                  "typeVersion"
+                ],
+                "properties": {
+                  "maxFrames": {
+                    "description": "Maximum frame count",
+                    "type": "integer"
+                  },
+                  "type": {
+                    "description": "Type asserts that the frame matches a known type structure.\n\n\nPossible enum values:\n - `\"\"` \n - `\"timeseries-wide\"` \n - `\"timeseries-long\"` \n - `\"timeseries-many\"` \n - `\"timeseries-multi\"` \n - `\"directory-listing\"` \n - `\"table\"` \n - `\"numeric-wide\"` \n - `\"numeric-multi\"` \n - `\"numeric-long\"` \n - `\"log-lines\"` ",
+                    "type": "string",
+                    "enum": [
+                      "",
+                      "timeseries-wide",
+                      "timeseries-long",
+                      "timeseries-many",
+                      "timeseries-multi",
+                      "directory-listing",
+                      "table",
+                      "numeric-wide",
+                      "numeric-multi",
+                      "numeric-long",
+                      "log-lines"
+                    ],
+                    "x-enum-description": {}
+                  },
+                  "typeVersion": {
+                    "description": "TypeVersion is the version of the Type property. Versions greater than 0.0 correspond to the dataplane\ncontract documentation https://grafana.github.io/dataplane/contract/.",
+                    "type": "array",
+                    "maxItems": 2,
+                    "minItems": 2,
+                    "items": {
+                      "type": "integer"
+                    }
+                  }
+                },
+                "additionalProperties": false
+              },
+              "timeRange": {
+                "description": "TimeRange represents the query range\nNOTE: unlike generic /ds/query, we can now send explicit time values in each query\nNOTE: the values for timeRange are not saved in a dashboard, they are constructed on the fly",
+                "type": "object",
+                "required": [
+                  "from",
+                  "to"
+                ],
+                "properties": {
+                  "from": {
+                    "description": "From is the start time of the query.",
+                    "type": "string",
+                    "default": "now-6h",
+                    "examples": [
+                      "now-1h"
+                    ]
+                  },
+                  "to": {
+                    "description": "To is the end time of the query.",
+                    "type": "string",
+                    "default": "now",
+                    "examples": [
+                      "now"
+                    ]
+                  }
+                },
+                "additionalProperties": false
+              },
+              "type": {
+                "type": "string",
+                "pattern": "^threshold$"
+              }
+            },
+            "additionalProperties": false,
+            "$schema": "https://json-schema.org/draft-04/schema"
+          },
+          {
+            "description": "SQLQuery requires the sqlExpression feature flag",
+            "type": "object",
+            "required": [
+              "expression",
+              "type",
+              "refId"
+            ],
+            "properties": {
+              "datasource": {
+                "description": "The datasource",
+                "type": "object",
+                "required": [
+                  "type"
+                ],
+                "properties": {
+                  "type": {
+                    "description": "The datasource plugin type",
+                    "type": "string",
+                    "pattern": "^__expr__$"
+                  },
+                  "uid": {
+                    "description": "Datasource UID",
+                    "type": "string"
+                  }
+                },
+                "additionalProperties": false
+              },
+              "expression": {
+                "type": "string",
+                "minLength": 1,
+                "examples": [
+                  "SELECT * FROM A LIMIT 1"
+                ]
+              },
+              "hide": {
+                "description": "true if query is disabled (ie should not be returned to the dashboard)\nNOTE: this does not always imply that the query should not be executed since\nthe results from a hidden query may be used as the input to other queries (SSE etc)",
+                "type": "boolean"
+              },
+              "intervalMs": {
+                "description": "Interval is the suggested duration between time points in a time series query.\nNOTE: the values for intervalMs is not saved in the query model.  It is typically calculated\nfrom the interval required to fill a pixels in the visualization",
+                "type": "number"
+              },
+              "maxDataPoints": {
+                "description": "MaxDataPoints is the maximum number of data points that should be returned from a time series query.\nNOTE: the values for maxDataPoints is not saved in the query model.  It is typically calculated\nfrom the number of pixels visible in a visualization",
+                "type": "integer"
+              },
+              "queryType": {
+                "description": "QueryType is an optional identifier for the type of query.\nIt can be used to distinguish different types of queries.",
+                "type": "string"
+              },
+              "refId": {
+                "description": "RefID is the unique identifier of the query, set by the frontend call.",
+                "type": "string"
+              },
+              "resultAssertions": {
+                "description": "Optionally define expected query result behavior",
+                "type": "object",
+                "required": [
+                  "typeVersion"
+                ],
+                "properties": {
+                  "maxFrames": {
+                    "description": "Maximum frame count",
+                    "type": "integer"
+                  },
+                  "type": {
+                    "description": "Type asserts that the frame matches a known type structure.\n\n\nPossible enum values:\n - `\"\"` \n - `\"timeseries-wide\"` \n - `\"timeseries-long\"` \n - `\"timeseries-many\"` \n - `\"timeseries-multi\"` \n - `\"directory-listing\"` \n - `\"table\"` \n - `\"numeric-wide\"` \n - `\"numeric-multi\"` \n - `\"numeric-long\"` \n - `\"log-lines\"` ",
+                    "type": "string",
+                    "enum": [
+                      "",
+                      "timeseries-wide",
+                      "timeseries-long",
+                      "timeseries-many",
+                      "timeseries-multi",
+                      "directory-listing",
+                      "table",
+                      "numeric-wide",
+                      "numeric-multi",
+                      "numeric-long",
+                      "log-lines"
+                    ],
+                    "x-enum-description": {}
+                  },
+                  "typeVersion": {
+                    "description": "TypeVersion is the version of the Type property. Versions greater than 0.0 correspond to the dataplane\ncontract documentation https://grafana.github.io/dataplane/contract/.",
+                    "type": "array",
+                    "maxItems": 2,
+                    "minItems": 2,
+                    "items": {
+                      "type": "integer"
+                    }
+                  }
+                },
+                "additionalProperties": false
+              },
+              "timeRange": {
+                "description": "TimeRange represents the query range\nNOTE: unlike generic /ds/query, we can now send explicit time values in each query\nNOTE: the values for timeRange are not saved in a dashboard, they are constructed on the fly",
+                "type": "object",
+                "required": [
+                  "from",
+                  "to"
+                ],
+                "properties": {
+                  "from": {
+                    "description": "From is the start time of the query.",
+                    "type": "string",
+                    "default": "now-6h",
+                    "examples": [
+                      "now-1h"
+                    ]
+                  },
+                  "to": {
+                    "description": "To is the end time of the query.",
+                    "type": "string",
+                    "default": "now",
+                    "examples": [
+                      "now"
+                    ]
+                  }
+                },
+                "additionalProperties": false
+              },
+              "type": {
+                "type": "string",
+                "pattern": "^sql$"
+              }
+            },
+            "additionalProperties": false,
+            "$schema": "https://json-schema.org/draft-04/schema"
+          }
+        ],
+        "$schema": "https://json-schema.org/draft-04/schema#"
+      }
+    },
+    "to": {
+      "description": "To end time in epoch timestamps in milliseconds or relative using Grafana time units.",
+      "type": "string"
+    }
+  },
+  "additionalProperties": false,
+  "$schema": "https://json-schema.org/draft-04/schema#"
+}
\ No newline at end of file
diff --git a/pkg/expr/query.types.json b/pkg/expr/query.types.json
new file mode 100644
index 0000000000000..4cad6ad630e26
--- /dev/null
+++ b/pkg/expr/query.types.json
@@ -0,0 +1,579 @@
+{
+  "kind": "QueryTypeDefinitionList",
+  "apiVersion": "query.grafana.app/v0alpha1",
+  "metadata": {
+    "resourceVersion": "1709168280033"
+  },
+  "items": [
+    {
+      "metadata": {
+        "name": "math",
+        "resourceVersion": "1709915973363",
+        "creationTimestamp": "2024-02-21T22:09:26Z"
+      },
+      "spec": {
+        "discriminators": [
+          {
+            "field": "type",
+            "value": "math"
+          }
+        ],
+        "schema": {
+          "$schema": "https://json-schema.org/draft-04/schema",
+          "additionalProperties": false,
+          "properties": {
+            "expression": {
+              "description": "General math expression",
+              "examples": [
+                "$A + 1",
+                "$A/$B"
+              ],
+              "minLength": 1,
+              "type": "string"
+            }
+          },
+          "required": [
+            "expression"
+          ],
+          "type": "object"
+        },
+        "examples": [
+          {
+            "name": "constant addition",
+            "saveModel": {
+              "expression": "$A + 10"
+            }
+          },
+          {
+            "name": "math with two queries",
+            "saveModel": {
+              "expression": "$A - $B"
+            }
+          }
+        ]
+      }
+    },
+    {
+      "metadata": {
+        "name": "reduce",
+        "resourceVersion": "1709915979242",
+        "creationTimestamp": "2024-02-21T22:09:26Z"
+      },
+      "spec": {
+        "discriminators": [
+          {
+            "field": "type",
+            "value": "reduce"
+          }
+        ],
+        "schema": {
+          "$schema": "https://json-schema.org/draft-04/schema",
+          "additionalProperties": false,
+          "properties": {
+            "expression": {
+              "description": "Reference to single query result",
+              "examples": [
+                "$A"
+              ],
+              "minLength": 1,
+              "type": "string"
+            },
+            "reducer": {
+              "description": "The reducer\n\n\nPossible enum values:\n - `\"sum\"` \n - `\"mean\"` \n - `\"min\"` \n - `\"max\"` \n - `\"count\"` \n - `\"last\"` ",
+              "enum": [
+                "sum",
+                "mean",
+                "min",
+                "max",
+                "count",
+                "last"
+              ],
+              "type": "string",
+              "x-enum-description": {}
+            },
+            "settings": {
+              "additionalProperties": false,
+              "description": "Reducer Options",
+              "properties": {
+                "mode": {
+                  "description": "Non-number reduce behavior\n\n\nPossible enum values:\n - `\"dropNN\"` Drop non-numbers\n - `\"replaceNN\"` Replace non-numbers",
+                  "enum": [
+                    "dropNN",
+                    "replaceNN"
+                  ],
+                  "type": "string",
+                  "x-enum-description": {
+                    "dropNN": "Drop non-numbers",
+                    "replaceNN": "Replace non-numbers"
+                  }
+                },
+                "replaceWithValue": {
+                  "description": "Only valid when mode is replace",
+                  "type": "number"
+                }
+              },
+              "required": [
+                "mode"
+              ],
+              "type": "object"
+            }
+          },
+          "required": [
+            "expression",
+            "reducer"
+          ],
+          "type": "object"
+        },
+        "examples": [
+          {
+            "name": "get max value",
+            "saveModel": {
+              "expression": "$A",
+              "reducer": "max",
+              "settings": {
+                "mode": "dropNN"
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "metadata": {
+        "name": "resample",
+        "resourceVersion": "1709915973363",
+        "creationTimestamp": "2024-02-21T22:09:26Z"
+      },
+      "spec": {
+        "discriminators": [
+          {
+            "field": "type",
+            "value": "resample"
+          }
+        ],
+        "schema": {
+          "$schema": "https://json-schema.org/draft-04/schema",
+          "additionalProperties": false,
+          "description": "QueryType = resample",
+          "properties": {
+            "downsampler": {
+              "description": "The downsample function\n\n\nPossible enum values:\n - `\"sum\"` \n - `\"mean\"` \n - `\"min\"` \n - `\"max\"` \n - `\"count\"` \n - `\"last\"` ",
+              "enum": [
+                "sum",
+                "mean",
+                "min",
+                "max",
+                "count",
+                "last"
+              ],
+              "type": "string",
+              "x-enum-description": {}
+            },
+            "expression": {
+              "description": "The math expression",
+              "examples": [
+                "$A + 1",
+                "$A"
+              ],
+              "minLength": 1,
+              "type": "string"
+            },
+            "upsampler": {
+              "description": "The upsample function\n\n\nPossible enum values:\n - `\"pad\"` Use the last seen value\n - `\"backfilling\"` backfill\n - `\"fillna\"` Do not fill values (nill)",
+              "enum": [
+                "pad",
+                "backfilling",
+                "fillna"
+              ],
+              "type": "string",
+              "x-enum-description": {
+                "backfilling": "backfill",
+                "fillna": "Do not fill values (nill)",
+                "pad": "Use the last seen value"
+              }
+            },
+            "window": {
+              "description": "The time duration",
+              "examples": [
+                "1d",
+                "10m"
+              ],
+              "minLength": 1,
+              "type": "string"
+            }
+          },
+          "required": [
+            "expression",
+            "window",
+            "downsampler",
+            "upsampler"
+          ],
+          "type": "object"
+        },
+        "examples": [
+          {
+            "name": "resample at a every day",
+            "saveModel": {
+              "downsampler": "last",
+              "expression": "$A",
+              "upsampler": "pad",
+              "window": "1d"
+            }
+          }
+        ]
+      }
+    },
+    {
+      "metadata": {
+        "name": "classic_conditions",
+        "resourceVersion": "1709915973363",
+        "creationTimestamp": "2024-02-21T22:09:26Z"
+      },
+      "spec": {
+        "discriminators": [
+          {
+            "field": "type",
+            "value": "classic_conditions"
+          }
+        ],
+        "schema": {
+          "$schema": "https://json-schema.org/draft-04/schema",
+          "additionalProperties": false,
+          "properties": {
+            "conditions": {
+              "items": {
+                "additionalProperties": false,
+                "description": "ConditionJSON is the JSON model for a single condition in ConditionsCmd.",
+                "properties": {
+                  "evaluator": {
+                    "additionalProperties": false,
+                    "properties": {
+                      "params": {
+                        "items": {
+                          "type": "number"
+                        },
+                        "type": "array"
+                      },
+                      "type": {
+                        "description": "e.g. \"gt\"",
+                        "type": "string"
+                      }
+                    },
+                    "required": [
+                      "params",
+                      "type"
+                    ],
+                    "type": "object"
+                  },
+                  "operator": {
+                    "additionalProperties": false,
+                    "properties": {
+                      "type": {
+                        "enum": [
+                          "and",
+                          "or"
+                        ],
+                        "type": "string",
+                        "x-enum-description": {}
+                      }
+                    },
+                    "required": [
+                      "type"
+                    ],
+                    "type": "object"
+                  },
+                  "query": {
+                    "additionalProperties": false,
+                    "properties": {
+                      "params": {
+                        "items": {
+                          "type": "string"
+                        },
+                        "type": "array"
+                      }
+                    },
+                    "required": [
+                      "params"
+                    ],
+                    "type": "object"
+                  },
+                  "reducer": {
+                    "additionalProperties": false,
+                    "properties": {
+                      "type": {
+                        "type": "string"
+                      }
+                    },
+                    "required": [
+                      "type"
+                    ],
+                    "type": "object"
+                  }
+                },
+                "required": [
+                  "evaluator",
+                  "operator",
+                  "query",
+                  "reducer"
+                ],
+                "type": "object"
+              },
+              "type": "array"
+            }
+          },
+          "required": [
+            "conditions"
+          ],
+          "type": "object"
+        },
+        "examples": [
+          {
+            "name": "Where query A \u003e 5",
+            "saveModel": {
+              "conditions": [
+                {
+                  "evaluator": {
+                    "params": [
+                      5
+                    ],
+                    "type": "gt"
+                  },
+                  "operator": {
+                    "type": "and"
+                  },
+                  "query": {
+                    "params": [
+                      "A"
+                    ]
+                  },
+                  "reducer": {
+                    "type": "max"
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      }
+    },
+    {
+      "metadata": {
+        "name": "threshold",
+        "resourceVersion": "1709915973363",
+        "creationTimestamp": "2024-02-21T22:09:26Z"
+      },
+      "spec": {
+        "discriminators": [
+          {
+            "field": "type",
+            "value": "threshold"
+          }
+        ],
+        "schema": {
+          "$schema": "https://json-schema.org/draft-04/schema",
+          "additionalProperties": false,
+          "properties": {
+            "conditions": {
+              "description": "Threshold Conditions",
+              "items": {
+                "additionalProperties": false,
+                "properties": {
+                  "evaluator": {
+                    "additionalProperties": false,
+                    "properties": {
+                      "params": {
+                        "items": {
+                          "type": "number"
+                        },
+                        "type": "array"
+                      },
+                      "type": {
+                        "description": "e.g. \"gt\"",
+                        "enum": [
+                          "gt",
+                          "lt",
+                          "within_range",
+                          "outside_range"
+                        ],
+                        "type": "string",
+                        "x-enum-description": {}
+                      }
+                    },
+                    "required": [
+                      "params",
+                      "type"
+                    ],
+                    "type": "object"
+                  },
+                  "loadedDimensions": {
+                    "additionalProperties": true,
+                    "type": "object",
+                    "x-grafana-type": "data.DataFrame"
+                  },
+                  "unloadEvaluator": {
+                    "additionalProperties": false,
+                    "properties": {
+                      "params": {
+                        "items": {
+                          "type": "number"
+                        },
+                        "type": "array"
+                      },
+                      "type": {
+                        "description": "e.g. \"gt\"",
+                        "enum": [
+                          "gt",
+                          "lt",
+                          "within_range",
+                          "outside_range"
+                        ],
+                        "type": "string",
+                        "x-enum-description": {}
+                      }
+                    },
+                    "required": [
+                      "params",
+                      "type"
+                    ],
+                    "type": "object"
+                  }
+                },
+                "required": [
+                  "evaluator"
+                ],
+                "type": "object"
+              },
+              "type": "array"
+            },
+            "expression": {
+              "description": "Reference to single query result",
+              "examples": [
+                "$A"
+              ],
+              "minLength": 1,
+              "type": "string"
+            }
+          },
+          "required": [
+            "expression",
+            "conditions"
+          ],
+          "type": "object"
+        },
+        "examples": [
+          {
+            "name": "Where query A \u003e 5",
+            "saveModel": {
+              "conditions": [
+                {
+                  "evaluator": {
+                    "params": [
+                      5
+                    ],
+                    "type": "gt"
+                  }
+                }
+              ],
+              "expression": "A"
+            }
+          },
+          {
+            "name": "With loaded+unloaded evaluators",
+            "saveModel": {
+              "conditions": [
+                {
+                  "evaluator": {
+                    "params": [
+                      100
+                    ],
+                    "type": "gt"
+                  },
+                  "loadedDimensions": {
+                    "data": {
+                      "values": [
+                        [
+                          18446744073709552000,
+                          2,
+                          3,
+                          4,
+                          5
+                        ]
+                      ]
+                    },
+                    "schema": {
+                      "fields": [
+                        {
+                          "name": "fingerprints",
+                          "type": "number",
+                          "typeInfo": {
+                            "frame": "uint64"
+                          }
+                        }
+                      ],
+                      "meta": {
+                        "type": "fingerprints",
+                        "typeVersion": [
+                          1,
+                          0
+                        ]
+                      },
+                      "name": "test"
+                    }
+                  },
+                  "unloadEvaluator": {
+                    "params": [
+                      31
+                    ],
+                    "type": "lt"
+                  }
+                }
+              ],
+              "expression": "B"
+            }
+          }
+        ]
+      }
+    },
+    {
+      "metadata": {
+        "name": "sql",
+        "resourceVersion": "1709915973363",
+        "creationTimestamp": "2024-02-29T00:58:00Z"
+      },
+      "spec": {
+        "discriminators": [
+          {
+            "field": "type",
+            "value": "sql"
+          }
+        ],
+        "schema": {
+          "$schema": "https://json-schema.org/draft-04/schema",
+          "additionalProperties": false,
+          "description": "SQLQuery requires the sqlExpression feature flag",
+          "properties": {
+            "expression": {
+              "examples": [
+                "SELECT * FROM A LIMIT 1"
+              ],
+              "minLength": 1,
+              "type": "string"
+            }
+          },
+          "required": [
+            "expression"
+          ],
+          "type": "object"
+        },
+        "examples": [
+          {
+            "name": "Select the first row from A",
+            "saveModel": {
+              "expression": "SELECT * FROM A limit 1"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/expr/query_test.go b/pkg/expr/query_test.go
new file mode 100644
index 0000000000000..5c05d31758790
--- /dev/null
+++ b/pkg/expr/query_test.go
@@ -0,0 +1,174 @@
+package expr
+
+import (
+	"encoding/json"
+	"reflect"
+	"testing"
+
+	data "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+	"github.com/grafana/grafana-plugin-sdk-go/experimental/schemabuilder"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/expr/classic"
+	"github.com/grafana/grafana/pkg/expr/mathexp"
+)
+
+func TestQueryTypeDefinitions(t *testing.T) {
+	builder, err := schemabuilder.NewSchemaBuilder(
+		schemabuilder.BuilderOptions{
+			PluginID: []string{DatasourceType},
+			ScanCode: []schemabuilder.CodePaths{{
+				BasePackage: "github.com/grafana/grafana/pkg/expr",
+				CodePath:    "./",
+			}},
+			Enums: []reflect.Type{
+				reflect.TypeOf(mathexp.ReducerSum),   // pick an example value (not the root)
+				reflect.TypeOf(mathexp.UpsamplerPad), // pick an example value (not the root)
+				reflect.TypeOf(ReduceModeDrop),       // pick an example value (not the root)
+				reflect.TypeOf(ThresholdIsAbove),
+				reflect.TypeOf(classic.ConditionOperatorAnd),
+			},
+		})
+	require.NoError(t, err)
+	err = builder.AddQueries(
+		schemabuilder.QueryTypeInfo{
+			Discriminators: data.NewDiscriminators("type", QueryTypeMath),
+			GoType:         reflect.TypeOf(&MathQuery{}),
+			Examples: []data.QueryExample{
+				{
+					Name: "constant addition",
+					SaveModel: data.AsUnstructured(MathQuery{
+						Expression: "$A + 10",
+					}),
+				},
+				{
+					Name: "math with two queries",
+					SaveModel: data.AsUnstructured(MathQuery{
+						Expression: "$A - $B",
+					}),
+				},
+			},
+		},
+		schemabuilder.QueryTypeInfo{
+			Discriminators: data.NewDiscriminators("type", QueryTypeReduce),
+			GoType:         reflect.TypeOf(&ReduceQuery{}),
+			Examples: []data.QueryExample{
+				{
+					Name: "get max value",
+					SaveModel: data.AsUnstructured(ReduceQuery{
+						Expression: "$A",
+						Reducer:    mathexp.ReducerMax,
+						Settings: &ReduceSettings{
+							Mode: ReduceModeDrop,
+						},
+					}),
+				},
+			},
+		},
+		schemabuilder.QueryTypeInfo{
+			Discriminators: data.NewDiscriminators("type", QueryTypeResample),
+			GoType:         reflect.TypeOf(&ResampleQuery{}),
+			Examples: []data.QueryExample{
+				{
+					Name: "resample at a every day",
+					SaveModel: data.AsUnstructured(ResampleQuery{
+						Expression:  "$A",
+						Window:      "1d",
+						Downsampler: mathexp.ReducerLast,
+						Upsampler:   mathexp.UpsamplerPad,
+					}),
+				},
+			},
+		},
+		schemabuilder.QueryTypeInfo{
+			Discriminators: data.NewDiscriminators("type", QueryTypeSQL),
+			GoType:         reflect.TypeOf(&SQLExpression{}),
+			Examples: []data.QueryExample{
+				{
+					Name: "Select the first row from A",
+					SaveModel: data.AsUnstructured(SQLExpression{
+						Expression: "SELECT * FROM A limit 1",
+					}),
+				},
+			},
+		},
+		schemabuilder.QueryTypeInfo{
+			Discriminators: data.NewDiscriminators("type", QueryTypeClassic),
+			GoType:         reflect.TypeOf(&ClassicQuery{}),
+			Examples: []data.QueryExample{
+				{
+					Name: "Where query A > 5",
+					SaveModel: data.AsUnstructured(ClassicQuery{
+						Conditions: []classic.ConditionJSON{
+							{
+								Query: classic.ConditionQueryJSON{
+									Params: []string{"A"},
+								},
+								Reducer: classic.ConditionReducerJSON{
+									Type: "max",
+								},
+								Operator: classic.ConditionOperatorJSON{
+									Type: "and",
+								},
+								Evaluator: classic.ConditionEvalJSON{
+									Type:   "gt",
+									Params: []float64{5},
+								},
+							},
+						},
+					}),
+				},
+			},
+		},
+		schemabuilder.QueryTypeInfo{
+			Discriminators: data.NewDiscriminators("type", QueryTypeThreshold),
+			GoType:         reflect.TypeOf(&ThresholdQuery{}),
+			Examples: []data.QueryExample{
+				{
+					Name: "Where query A > 5",
+					SaveModel: data.AsUnstructured(ThresholdQuery{
+						Expression: "A",
+						Conditions: []ThresholdConditionJSON{{
+							Evaluator: ConditionEvalJSON{
+								Type:   ThresholdIsAbove,
+								Params: []float64{5},
+							},
+						}},
+					}),
+				},
+				{
+					Name: "With loaded+unloaded evaluators",
+					SaveModel: toUnstructured(`{
+						"expression": "B",
+						"conditions": [
+						  {
+							"evaluator": {
+							  "params": [
+								100
+							  ],
+							  "type": "gt"
+							},
+							"unloadEvaluator": {
+							  "params": [
+								31
+							  ],
+							  "type": "lt"
+							},
+							"loadedDimensions": {"schema":{"name":"test","meta":{"type":"fingerprints","typeVersion":[1,0]},"fields":[{"name":"fingerprints","type":"number","typeInfo":{"frame":"uint64"}}]},"data":{"values":[[18446744073709551615,2,3,4,5]]}}
+						  }
+						]
+					  }`),
+				},
+			},
+		},
+	)
+
+	require.NoError(t, err)
+	_ = builder.UpdateQueryDefinition(t, "./")
+}
+
+func toUnstructured(ex string) data.Unstructured {
+	v := data.Unstructured{}
+	_ = json.Unmarshal([]byte(ex), &v.Object)
+	return v
+}
diff --git a/pkg/expr/reader.go b/pkg/expr/reader.go
new file mode 100644
index 0000000000000..98f29ce3fa1e9
--- /dev/null
+++ b/pkg/expr/reader.go
@@ -0,0 +1,194 @@
+package expr
+
+import (
+	"embed"
+	"fmt"
+	"strings"
+
+	"github.com/grafana/grafana-plugin-sdk-go/data/utils/jsoniter"
+	data "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+
+	"github.com/grafana/grafana/pkg/expr/classic"
+	"github.com/grafana/grafana/pkg/expr/mathexp"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/tsdb/legacydata"
+)
+
+// Once we are comfortable with the parsing logic, this struct will
+// be merged/replace the existing Query struct in grafana/pkg/expr/transform.go
+type ExpressionQuery struct {
+	GraphID   int64     `json:"id,omitempty"`
+	RefID     string    `json:"refId"`
+	QueryType QueryType `json:"type"`
+
+	// The typed query parameters
+	Properties any `json:"properties"`
+
+	// Hidden in debug JSON
+	Command Command `json:"-"`
+}
+
+// ID is used to identify nodes in the directed graph
+func (q ExpressionQuery) ID() int64 {
+	return q.GraphID
+}
+
+type ExpressionQueryReader struct {
+	features featuremgmt.FeatureToggles
+}
+
+func NewExpressionQueryReader(features featuremgmt.FeatureToggles) *ExpressionQueryReader {
+	return &ExpressionQueryReader{
+		features: features,
+	}
+}
+
+// nolint:gocyclo
+func (h *ExpressionQueryReader) ReadQuery(
+	// Properties that have been parsed off the same node
+	common data.DataQuery,
+	// An iterator with context for the full node (include common values)
+	iter *jsoniter.Iterator,
+) (eq ExpressionQuery, err error) {
+	referenceVar := ""
+	eq.RefID = common.RefID
+	eq.QueryType = QueryType(common.GetString("type"))
+	if eq.QueryType == "" {
+		return eq, fmt.Errorf("missing type")
+	}
+	switch eq.QueryType {
+	case QueryTypeMath:
+		q := &MathQuery{}
+		err = iter.ReadVal(q)
+		if err == nil {
+			eq.Command, err = NewMathCommand(common.RefID, q.Expression)
+			eq.Properties = q
+		}
+
+	case QueryTypeReduce:
+		var mapper mathexp.ReduceMapper = nil
+		q := &ReduceQuery{}
+		err = iter.ReadVal(q)
+		if err == nil {
+			referenceVar, err = getReferenceVar(q.Expression, common.RefID)
+			eq.Properties = q
+		}
+		if err == nil && q.Settings != nil {
+			switch q.Settings.Mode {
+			case ReduceModeDrop:
+				mapper = mathexp.DropNonNumber{}
+			case ReduceModeReplace:
+				if q.Settings.ReplaceWithValue == nil {
+					err = fmt.Errorf("setting replaceWithValue must be specified when mode is '%s'", q.Settings.Mode)
+				}
+				mapper = mathexp.ReplaceNonNumberWithValue{Value: *q.Settings.ReplaceWithValue}
+			default:
+				err = fmt.Errorf("unsupported reduce mode")
+			}
+		}
+		if err == nil {
+			eq.Properties = q
+			eq.Command, err = NewReduceCommand(common.RefID,
+				q.Reducer, referenceVar, mapper)
+		}
+
+	case QueryTypeResample:
+		q := &ResampleQuery{}
+		err = iter.ReadVal(q)
+		if err == nil && common.TimeRange == nil {
+			err = fmt.Errorf("missing time range in query")
+		}
+		if err == nil {
+			referenceVar, err = getReferenceVar(q.Expression, common.RefID)
+		}
+		if err == nil {
+			tr := legacydata.NewDataTimeRange(common.TimeRange.From, common.TimeRange.To)
+			eq.Properties = q
+			eq.Command, err = NewResampleCommand(common.RefID,
+				q.Window,
+				referenceVar,
+				q.Downsampler,
+				q.Upsampler,
+				AbsoluteTimeRange{
+					From: tr.GetFromAsTimeUTC(),
+					To:   tr.GetToAsTimeUTC(),
+				},
+			)
+		}
+
+	case QueryTypeClassic:
+		q := &ClassicQuery{}
+		err = iter.ReadVal(q)
+		if err == nil {
+			eq.Properties = q
+			eq.Command, err = classic.NewConditionCmd(common.RefID, q.Conditions)
+		}
+
+	case QueryTypeSQL:
+		q := &SQLExpression{}
+		err = iter.ReadVal(q)
+		if err == nil {
+			eq.Properties = q
+			eq.Command, err = NewSQLCommand(common.RefID, q.Expression)
+		}
+
+	case QueryTypeThreshold:
+		q := &ThresholdQuery{}
+		err = iter.ReadVal(q)
+		if err == nil {
+			referenceVar, err = getReferenceVar(q.Expression, common.RefID)
+		}
+		if err == nil {
+			// we only support one condition for now, we might want to turn this in to "OR" expressions later
+			if len(q.Conditions) != 1 {
+				return eq, fmt.Errorf("threshold expression requires exactly one condition")
+			}
+			firstCondition := q.Conditions[0]
+
+			threshold, err := NewThresholdCommand(common.RefID, referenceVar, firstCondition.Evaluator.Type, firstCondition.Evaluator.Params)
+			if err != nil {
+				return eq, fmt.Errorf("invalid condition: %w", err)
+			}
+			eq.Command = threshold
+			eq.Properties = q
+
+			if firstCondition.UnloadEvaluator != nil && h.features.IsEnabledGlobally(featuremgmt.FlagRecoveryThreshold) {
+				unloading, err := NewThresholdCommand(common.RefID, referenceVar, firstCondition.UnloadEvaluator.Type, firstCondition.UnloadEvaluator.Params)
+				unloading.Invert = true
+				if err != nil {
+					return eq, fmt.Errorf("invalid unloadCondition: %w", err)
+				}
+				var d Fingerprints
+				if firstCondition.LoadedDimensions != nil {
+					d, err = FingerprintsFromFrame(firstCondition.LoadedDimensions)
+					if err != nil {
+						return eq, fmt.Errorf("failed to parse loaded dimensions: %w", err)
+					}
+				}
+				eq.Command, err = NewHysteresisCommand(common.RefID, referenceVar, *threshold, *unloading, d)
+				if err != nil {
+					return eq, err
+				}
+			}
+		}
+
+	default:
+		err = fmt.Errorf("unknown query type (%s)", common.QueryType)
+	}
+	return eq, err
+}
+
+//go:embed query.types.json
+var f embed.FS
+
+func (h *ExpressionQueryReader) QueryTypeDefinitionListJSON() ([]byte, error) {
+	return f.ReadFile("query.types.json")
+}
+
+func getReferenceVar(exp string, refId string) (string, error) {
+	exp = strings.TrimPrefix(exp, "$")
+	if exp == "" {
+		return "", fmt.Errorf("no variable specified to reference for refId %v", refId)
+	}
+	return exp, nil
+}
diff --git a/pkg/expr/service.go b/pkg/expr/service.go
index ffd7e3ffd667a..01c88be979b6e 100644
--- a/pkg/expr/service.go
+++ b/pkg/expr/service.go
@@ -60,11 +60,13 @@ type Service struct {
 	dataService  backend.QueryDataHandler
 	pCtxProvider pluginContextProvider
 	features     featuremgmt.FeatureToggles
+	converter    *ResultConverter
 
 	pluginsClient backend.CallResourceHandler
 
-	tracer  tracing.Tracer
-	metrics *metrics
+	tracer          tracing.Tracer
+	metrics         *metrics
+	allowLongFrames bool
 }
 
 type pluginContextProvider interface {
@@ -82,6 +84,10 @@ func ProvideService(cfg *setting.Cfg, pluginClient plugins.Client, pCtxProvider
 		tracer:        tracer,
 		metrics:       newMetrics(registerer),
 		pluginsClient: pluginClient,
+		converter: &ResultConverter{
+			Features: features,
+			Tracer:   tracer,
+		},
 	}
 }
 
diff --git a/pkg/expr/service_test.go b/pkg/expr/service_test.go
index 9b0c417a09e58..2ee7ff5d35757 100644
--- a/pkg/expr/service_test.go
+++ b/pkg/expr/service_test.go
@@ -15,11 +15,10 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/plugins"
-	"github.com/grafana/grafana/pkg/plugins/config"
-	"github.com/grafana/grafana/pkg/plugins/manager/fakes"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	datafakes "github.com/grafana/grafana/pkg/services/datasources/fakes"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginconfig"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 	"github.com/grafana/grafana/pkg/services/user"
@@ -42,15 +41,20 @@ func TestService(t *testing.T) {
 		PluginList: []pluginstore.Plugin{
 			{JSONData: plugins.JSONData{ID: "test"}},
 		},
-	}, &datafakes.FakeDataSourceService{}, nil, fakes.NewFakeLicensingService(), &config.Cfg{})
+	}, &datafakes.FakeCacheService{}, &datafakes.FakeDataSourceService{}, nil, pluginconfig.NewFakePluginRequestConfigProvider())
 
+	features := featuremgmt.WithFeatures()
 	s := Service{
 		cfg:          setting.NewCfg(),
 		dataService:  me,
 		pCtxProvider: pCtxProvider,
-		features:     &featuremgmt.FeatureManager{},
+		features:     features,
 		tracer:       tracing.InitializeTracerForTest(),
 		metrics:      newMetrics(nil),
+		converter: &ResultConverter{
+			Features: features,
+			Tracer:   tracing.InitializeTracerForTest(),
+		},
 	}
 
 	queries := []Query{
@@ -128,7 +132,7 @@ func TestDSQueryError(t *testing.T) {
 		PluginList: []pluginstore.Plugin{
 			{JSONData: plugins.JSONData{ID: "test"}},
 		},
-	}, &datafakes.FakeDataSourceService{}, nil, nil, &config.Cfg{})
+	}, &datafakes.FakeCacheService{}, &datafakes.FakeDataSourceService{}, nil, pluginconfig.NewFakePluginRequestConfigProvider())
 
 	s := Service{
 		cfg:          setting.NewCfg(),
diff --git a/pkg/expr/sql/parser.go b/pkg/expr/sql/parser.go
new file mode 100644
index 0000000000000..5aa3b07c57751
--- /dev/null
+++ b/pkg/expr/sql/parser.go
@@ -0,0 +1,219 @@
+package sql
+
+import (
+	"errors"
+	"strings"
+
+	parser "github.com/krasun/gosqlparser"
+	"github.com/xwb1989/sqlparser"
+)
+
+// TablesList returns a list of tables for the sql statement
+// TODO: should we just return all query refs instead of trying to parse them from the sql?
+func TablesList(rawSQL string) ([]string, error) {
+	stmt, err := sqlparser.Parse(rawSQL)
+	if err != nil {
+		tables, err := parse(rawSQL)
+		if err != nil {
+			return parseTables(rawSQL)
+		}
+		return tables, nil
+	}
+
+	tables := []string{}
+	switch kind := stmt.(type) {
+	case *sqlparser.Select:
+		for _, from := range kind.From {
+			tables = append(tables, getTables(from)...)
+		}
+	default:
+		return parseTables(rawSQL)
+	}
+	if len(tables) == 0 {
+		return parseTables(rawSQL)
+	}
+	return validateTables(tables), nil
+}
+
+func validateTables(tables []string) []string {
+	validTables := []string{}
+	for _, table := range tables {
+		if strings.ToUpper(table) != "DUAL" {
+			validTables = append(validTables, table)
+		}
+	}
+	return validTables
+}
+
+func joinTables(join *sqlparser.JoinTableExpr) []string {
+	t := getTables(join.LeftExpr)
+	t = append(t, getTables(join.RightExpr)...)
+	return t
+}
+
+func getTables(te sqlparser.TableExpr) []string {
+	tables := []string{}
+	switch v := te.(type) {
+	case *sqlparser.AliasedTableExpr:
+		tables = append(tables, nodeValue(v.Expr))
+		return tables
+	case *sqlparser.JoinTableExpr:
+		tables = append(tables, joinTables(v)...)
+		return tables
+	case *sqlparser.ParenTableExpr:
+		for _, e := range v.Exprs {
+			tables = getTables(e)
+		}
+	default:
+		tables = append(tables, unknownExpr(te)...)
+	}
+	return tables
+}
+
+func unknownExpr(te sqlparser.TableExpr) []string {
+	tables := []string{}
+	fromClause := nodeValue(te)
+	upperFromClause := strings.ToUpper(fromClause)
+	if strings.Contains(upperFromClause, "JOIN") {
+		return extractTablesFrom(fromClause)
+	}
+	if upperFromClause != "DUAL" && !strings.HasPrefix(fromClause, "(") {
+		if strings.Contains(upperFromClause, " AS") {
+			name := stripAlias(fromClause)
+			tables = append(tables, name)
+			return tables
+		}
+		tables = append(tables, fromClause)
+	}
+	return tables
+}
+
+func nodeValue(node sqlparser.SQLNode) string {
+	buf := sqlparser.NewTrackedBuffer(nil)
+	node.Format(buf)
+	return buf.String()
+}
+
+func extractTablesFrom(stmt string) []string {
+	// example: A join B on A.name = B.name
+	tables := []string{}
+	parts := strings.Split(stmt, " ")
+	for _, part := range parts {
+		part = strings.ToUpper(part)
+		if isJoin(part) {
+			continue
+		}
+		if strings.Contains(part, "ON") {
+			break
+		}
+		if part != "" {
+			if !existsInList(part, tables) {
+				tables = append(tables, part)
+			}
+		}
+	}
+	return tables
+}
+
+func stripAlias(table string) string {
+	tableParts := []string{}
+	for _, part := range strings.Split(table, " ") {
+		if strings.ToUpper(part) == "AS" {
+			break
+		}
+		tableParts = append(tableParts, part)
+	}
+	return strings.Join(tableParts, " ")
+}
+
+// uses a simple tokenizer
+func parse(rawSQL string) ([]string, error) {
+	query, err := parser.Parse(rawSQL)
+	if err != nil {
+		return nil, err
+	}
+	if query.GetType() == parser.StatementSelect {
+		sel, ok := query.(*parser.Select)
+		if ok {
+			return []string{sel.Table}, nil
+		}
+	}
+	return nil, err
+}
+
+// parseTables uses a simple tokenizer to parse tables from a SQL statement
+func parseTables(rawSQL string) ([]string, error) {
+	checkSql := strings.ToUpper(rawSQL)
+	rawSQL = strings.ReplaceAll(rawSQL, "\n", " ")
+	rawSQL = strings.ReplaceAll(rawSQL, "\r", " ")
+	if strings.HasPrefix(checkSql, "SELECT") || strings.HasPrefix(rawSQL, "WITH") {
+		tables := []string{}
+		tokens := strings.Split(rawSQL, " ")
+		checkNext := false
+		takeNext := false
+		for _, token := range tokens {
+			t := strings.ToUpper(token)
+			t = strings.TrimSpace(t)
+
+			if takeNext {
+				if !existsInList(token, tables) {
+					tables = append(tables, token)
+				}
+				checkNext = false
+				takeNext = false
+				continue
+			}
+			if checkNext {
+				if strings.Contains(t, "(") {
+					checkNext = false
+					continue
+				}
+				if strings.Contains(t, ",") {
+					values := strings.Split(token, ",")
+					for _, v := range values {
+						v := strings.TrimSpace(v)
+						if v != "" {
+							if !existsInList(token, tables) {
+								tables = append(tables, v)
+							}
+						} else {
+							takeNext = true
+							break
+						}
+					}
+					continue
+				}
+				if !existsInList(token, tables) {
+					tables = append(tables, token)
+				}
+				checkNext = false
+			}
+			if t == "FROM" {
+				checkNext = true
+			}
+		}
+		return tables, nil
+	}
+	return nil, errors.New("not a select statement")
+}
+
+func existsInList(table string, list []string) bool {
+	for _, t := range list {
+		if t == table {
+			return true
+		}
+	}
+	return false
+}
+
+var joins = []string{"JOIN", "INNER", "LEFT", "RIGHT", "FULL", "OUTER"}
+
+func isJoin(token string) bool {
+	token = strings.ToUpper(token)
+	for _, join := range joins {
+		if token == join {
+			return true
+		}
+	}
+	return false
+}
diff --git a/pkg/expr/sql/parser_test.go b/pkg/expr/sql/parser_test.go
new file mode 100644
index 0000000000000..ca3b685e34b14
--- /dev/null
+++ b/pkg/expr/sql/parser_test.go
@@ -0,0 +1,130 @@
+package sql
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestParse(t *testing.T) {
+	sql := "select * from foo"
+	tables, err := parseTables((sql))
+	assert.Nil(t, err)
+
+	assert.Equal(t, "foo", tables[0])
+}
+
+func TestParseWithComma(t *testing.T) {
+	sql := "select * from foo,bar"
+	tables, err := parseTables((sql))
+	assert.Nil(t, err)
+
+	assert.Equal(t, "foo", tables[0])
+	assert.Equal(t, "bar", tables[1])
+}
+
+func TestParseWithCommas(t *testing.T) {
+	sql := "select * from foo,bar,baz"
+	tables, err := parseTables((sql))
+	assert.Nil(t, err)
+
+	assert.Equal(t, "foo", tables[0])
+	assert.Equal(t, "bar", tables[1])
+	assert.Equal(t, "baz", tables[2])
+}
+
+func TestArray(t *testing.T) {
+	sql := "SELECT array_value(1, 2, 3)"
+	tables, err := TablesList((sql))
+	assert.Nil(t, err)
+
+	assert.Equal(t, 0, len(tables))
+}
+
+func TestArray2(t *testing.T) {
+	sql := "SELECT array_value(1, 2, 3)[2]"
+	tables, err := TablesList((sql))
+	assert.Nil(t, err)
+
+	assert.Equal(t, 0, len(tables))
+}
+
+func TestXxx(t *testing.T) {
+	sql := "SELECT [3, 2, 1]::INT[3];"
+	tables, err := TablesList((sql))
+	assert.Nil(t, err)
+
+	assert.Equal(t, 0, len(tables))
+}
+
+func TestParseSubquery(t *testing.T) {
+	sql := "select * from (select * from people limit 1)"
+	tables, err := TablesList((sql))
+	assert.Nil(t, err)
+
+	assert.Equal(t, 1, len(tables))
+	assert.Equal(t, "people", tables[0])
+}
+
+func TestJoin(t *testing.T) {
+	sql := `select * from A
+	JOIN B ON A.name = B.name
+	LIMIT 10`
+	tables, err := TablesList((sql))
+	assert.Nil(t, err)
+
+	assert.Equal(t, 2, len(tables))
+	assert.Equal(t, "A", tables[0])
+	assert.Equal(t, "B", tables[1])
+}
+
+func TestRightJoin(t *testing.T) {
+	sql := `select * from A
+	RIGHT JOIN B ON A.name = B.name
+	LIMIT 10`
+	tables, err := TablesList((sql))
+	assert.Nil(t, err)
+
+	assert.Equal(t, 2, len(tables))
+	assert.Equal(t, "A", tables[0])
+	assert.Equal(t, "B", tables[1])
+}
+
+func TestAliasWithJoin(t *testing.T) {
+	sql := `select * from A as X
+	RIGHT JOIN B ON A.name = X.name
+	LIMIT 10`
+	tables, err := TablesList((sql))
+	assert.Nil(t, err)
+
+	assert.Equal(t, 2, len(tables))
+	assert.Equal(t, "A", tables[0])
+	assert.Equal(t, "B", tables[1])
+}
+
+func TestAlias(t *testing.T) {
+	sql := `select * from A as X LIMIT 10`
+	tables, err := TablesList((sql))
+	assert.Nil(t, err)
+
+	assert.Equal(t, 1, len(tables))
+	assert.Equal(t, "A", tables[0])
+}
+
+func TestParens(t *testing.T) {
+	sql := `SELECT  t1.Col1,
+	t2.Col1,
+	t3.Col1
+	FROM    table1 AS t1
+	LEFT JOIN	(
+	table2 AS t2
+	INNER JOIN table3 AS t3 ON t3.Col1 = t2.Col1
+	) ON t2.Col1 = t1.Col1;`
+	tables, err := TablesList((sql))
+	assert.Nil(t, err)
+
+	assert.Equal(t, 3, len(tables))
+	assert.Equal(t, "table1", tables[0])
+	assert.Equal(t, "table2", tables[1])
+	assert.Equal(t, "table3", tables[2])
+}
diff --git a/pkg/expr/sql_command.go b/pkg/expr/sql_command.go
new file mode 100644
index 0000000000000..bbcb942467f6e
--- /dev/null
+++ b/pkg/expr/sql_command.go
@@ -0,0 +1,113 @@
+package expr
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/scottlepp/go-duck/duck"
+
+	"github.com/grafana/grafana/pkg/expr/mathexp"
+	"github.com/grafana/grafana/pkg/expr/sql"
+	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/util/errutil"
+)
+
+// SQLCommand is an expression to run SQL over results
+type SQLCommand struct {
+	query       string
+	varsToQuery []string
+	refID       string
+}
+
+// NewSQLCommand creates a new SQLCommand.
+func NewSQLCommand(refID, rawSQL string) (*SQLCommand, error) {
+	if rawSQL == "" {
+		return nil, errutil.BadRequest("sql-missing-query",
+			errutil.WithPublicMessage("missing SQL query"))
+	}
+	tables, err := sql.TablesList(rawSQL)
+	if err != nil {
+		logger.Warn("invalid sql query", "sql", rawSQL, "error", err)
+		return nil, errutil.BadRequest("sql-invalid-sql",
+			errutil.WithPublicMessage("error reading SQL command"),
+		)
+	}
+	return &SQLCommand{
+		query:       rawSQL,
+		varsToQuery: tables,
+		refID:       refID,
+	}, nil
+}
+
+// UnmarshalSQLCommand creates a SQLCommand from Grafana's frontend query.
+func UnmarshalSQLCommand(rn *rawNode) (*SQLCommand, error) {
+	if rn.TimeRange == nil {
+		return nil, fmt.Errorf("time range must be specified for refID %s", rn.RefID)
+	}
+
+	expressionRaw, ok := rn.Query["expression"]
+	if !ok {
+		return nil, errors.New("no expression in the query")
+	}
+	expression, ok := expressionRaw.(string)
+	if !ok {
+		return nil, fmt.Errorf("expected sql expression to be type string, but got type %T", expressionRaw)
+	}
+
+	return NewSQLCommand(rn.RefID, expression)
+}
+
+// NeedsVars returns the variable names (refIds) that are dependencies
+// to execute the command and allows the command to fulfill the Command interface.
+func (gr *SQLCommand) NeedsVars() []string {
+	return gr.varsToQuery
+}
+
+// Execute runs the command and returns the results or an error if the command
+// failed to execute.
+func (gr *SQLCommand) Execute(ctx context.Context, now time.Time, vars mathexp.Vars, tracer tracing.Tracer) (mathexp.Results, error) {
+	_, span := tracer.Start(ctx, "SSE.ExecuteSQL")
+	defer span.End()
+
+	allFrames := []*data.Frame{}
+	for _, ref := range gr.varsToQuery {
+		results, ok := vars[ref]
+		if !ok {
+			logger.Warn("no results found for", "ref", ref)
+			continue
+		}
+		frames := results.Values.AsDataFrames(ref)
+		allFrames = append(allFrames, frames...)
+	}
+
+	rsp := mathexp.Results{}
+
+	duckDB := duck.NewInMemoryDB()
+	var frame = &data.Frame{}
+	err := duckDB.QueryFramesInto(gr.refID, gr.query, allFrames, frame)
+	if err != nil {
+		rsp.Error = err
+		return rsp, nil
+	}
+
+	frame.RefID = gr.refID
+
+	if frame.Rows() == 0 {
+		rsp.Values = mathexp.Values{
+			mathexp.NoData{Frame: frame},
+		}
+	}
+
+	rsp.Values = mathexp.Values{
+		mathexp.TableData{Frame: frame},
+	}
+
+	return rsp, nil
+}
+
+func (gr *SQLCommand) Type() string {
+	return TypeSQL.String()
+}
diff --git a/pkg/expr/sql_command_test.go b/pkg/expr/sql_command_test.go
new file mode 100644
index 0000000000000..7bd9d3c06e20a
--- /dev/null
+++ b/pkg/expr/sql_command_test.go
@@ -0,0 +1,26 @@
+package expr
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestNewCommand(t *testing.T) {
+	cmd, err := NewSQLCommand("a", "select a from foo, bar")
+	if err != nil && strings.Contains(err.Error(), "feature is not enabled") {
+		return
+	}
+
+	if err != nil {
+		t.Fail()
+		return
+	}
+
+	for _, v := range cmd.varsToQuery {
+		if strings.Contains("foo bar", v) {
+			continue
+		}
+		t.Fail()
+		return
+	}
+}
diff --git a/pkg/expr/threshold.go b/pkg/expr/threshold.go
index f49eea59b5fed..b8991df2f9422 100644
--- a/pkg/expr/threshold.go
+++ b/pkg/expr/threshold.go
@@ -3,6 +3,7 @@ package expr
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"strings"
 	"time"
@@ -17,23 +18,31 @@ import (
 type ThresholdCommand struct {
 	ReferenceVar  string
 	RefID         string
-	ThresholdFunc string
+	ThresholdFunc ThresholdType
 	Conditions    []float64
 	Invert        bool
 }
 
+// +enum
+type ThresholdType string
+
 const (
-	ThresholdIsAbove        = "gt"
-	ThresholdIsBelow        = "lt"
-	ThresholdIsWithinRange  = "within_range"
-	ThresholdIsOutsideRange = "outside_range"
+	ThresholdIsAbove        ThresholdType = "gt"
+	ThresholdIsBelow        ThresholdType = "lt"
+	ThresholdIsWithinRange  ThresholdType = "within_range"
+	ThresholdIsOutsideRange ThresholdType = "outside_range"
 )
 
 var (
-	supportedThresholdFuncs = []string{ThresholdIsAbove, ThresholdIsBelow, ThresholdIsWithinRange, ThresholdIsOutsideRange}
+	supportedThresholdFuncs = []string{
+		string(ThresholdIsAbove),
+		string(ThresholdIsBelow),
+		string(ThresholdIsWithinRange),
+		string(ThresholdIsOutsideRange),
+	}
 )
 
-func NewThresholdCommand(refID, referenceVar, thresholdFunc string, conditions []float64) (*ThresholdCommand, error) {
+func NewThresholdCommand(refID, referenceVar string, thresholdFunc ThresholdType, conditions []float64) (*ThresholdCommand, error) {
 	switch thresholdFunc {
 	case ThresholdIsOutsideRange, ThresholdIsWithinRange:
 		if len(conditions) < 2 {
@@ -56,8 +65,8 @@ func NewThresholdCommand(refID, referenceVar, thresholdFunc string, conditions [
 }
 
 type ConditionEvalJSON struct {
-	Params []float64 `json:"params"`
-	Type   string    `json:"type"` // e.g. "gt"
+	Params []float64     `json:"params"`
+	Type   ThresholdType `json:"type"` // e.g. "gt"
 }
 
 // UnmarshalResampleCommand creates a ResampleCMD from Grafana's frontend query.
@@ -81,7 +90,7 @@ func UnmarshalThresholdCommand(rn *rawNode, features featuremgmt.FeatureToggles)
 	if err != nil {
 		return nil, fmt.Errorf("invalid condition: %w", err)
 	}
-	if firstCondition.UnloadEvaluator != nil && features.IsEnabled(featuremgmt.FlagRecoveryThreshold) {
+	if firstCondition.UnloadEvaluator != nil && features.IsEnabledGlobally(featuremgmt.FlagRecoveryThreshold) {
 		unloading, err := NewThresholdCommand(rn.RefID, referenceVar, firstCondition.UnloadEvaluator.Type, firstCondition.UnloadEvaluator.Params)
 		unloading.Invert = true
 		if err != nil {
@@ -119,8 +128,12 @@ func (tc *ThresholdCommand) Execute(ctx context.Context, now time.Time, vars mat
 	return mathCommand.Execute(ctx, now, vars, tracer)
 }
 
+func (tc *ThresholdCommand) Type() string {
+	return TypeThreshold.String()
+}
+
 // createMathExpression converts all the info we have about a "threshold" expression in to a Math expression
-func createMathExpression(referenceVar string, thresholdFunc string, args []float64, invert bool) (string, error) {
+func createMathExpression(referenceVar string, thresholdFunc ThresholdType, args []float64, invert bool) (string, error) {
 	var exp string
 	switch thresholdFunc {
 	case ThresholdIsAbove:
@@ -160,6 +173,67 @@ type ThresholdCommandConfig struct {
 
 type ThresholdConditionJSON struct {
 	Evaluator        ConditionEvalJSON  `json:"evaluator"`
-	UnloadEvaluator  *ConditionEvalJSON `json:"unloadEvaluator"`
-	LoadedDimensions *data.Frame        `json:"loadedDimensions"`
+	UnloadEvaluator  *ConditionEvalJSON `json:"unloadEvaluator,omitempty"`
+	LoadedDimensions *data.Frame        `json:"loadedDimensions,omitempty"`
+}
+
+// IsHysteresisExpression returns true if the raw model describes a hysteresis command:
+// - field 'type' has value "threshold",
+// - field 'conditions' is array of objects and has exactly one element
+// - field 'conditions[0].unloadEvaluator is not nil
+func IsHysteresisExpression(query map[string]any) bool {
+	c, err := getConditionForHysteresisCommand(query)
+	if err != nil {
+		return false
+	}
+	return c != nil
+}
+
+// SetLoadedDimensionsToHysteresisCommand mutates the input map and sets field "conditions[0].loadedMetrics" with the data frame created from the provided fingerprints.
+func SetLoadedDimensionsToHysteresisCommand(query map[string]any, fingerprints Fingerprints) error {
+	condition, err := getConditionForHysteresisCommand(query)
+	if err != nil {
+		return err
+	}
+	if condition == nil {
+		return errors.New("not a hysteresis command")
+	}
+	fr := FingerprintsToFrame(fingerprints)
+	condition["loadedDimensions"] = fr
+	return nil
+}
+
+func getConditionForHysteresisCommand(query map[string]any) (map[string]any, error) {
+	t, err := GetExpressionCommandType(query)
+	if err != nil {
+		return nil, err
+	}
+	if t != TypeThreshold {
+		return nil, errors.New("not a threshold command")
+	}
+
+	c, ok := query["conditions"]
+	if !ok {
+		return nil, errors.New("invalid threshold command: expected field \"condition\"")
+	}
+	var condition map[string]any
+	switch arr := c.(type) {
+	case []any:
+		if len(arr) != 1 {
+			return nil, errors.New("invalid threshold command: field \"condition\" expected to have exactly 1 field")
+		}
+		switch m := arr[0].(type) {
+		case map[string]any:
+			condition = m
+		default:
+			return nil, errors.New("invalid threshold command: value of the first element of field \"condition\" expected to be an object")
+		}
+	default:
+		return nil, errors.New("invalid threshold command: field \"condition\" expected to be an array of objects")
+	}
+	_, ok = condition["unloadEvaluator"]
+	if !ok {
+		return nil, nil
+	}
+	return condition, nil
 }
diff --git a/pkg/expr/threshold_test.go b/pkg/expr/threshold_test.go
index 5368ae33486a2..c7e1c1f2eb64d 100644
--- a/pkg/expr/threshold_test.go
+++ b/pkg/expr/threshold_test.go
@@ -3,6 +3,7 @@ package expr
 import (
 	"encoding/json"
 	"fmt"
+	"math"
 	"sort"
 	"testing"
 
@@ -13,7 +14,7 @@ import (
 
 func TestNewThresholdCommand(t *testing.T) {
 	type testCase struct {
-		fn            string
+		fn            ThresholdType
 		args          []float64
 		shouldError   bool
 		expectedError string
@@ -106,7 +107,7 @@ func TestUnmarshalThresholdCommand(t *testing.T) {
 				require.IsType(t, &ThresholdCommand{}, command)
 				cmd := command.(*ThresholdCommand)
 				require.Equal(t, []string{"A"}, cmd.NeedsVars())
-				require.Equal(t, "gt", cmd.ThresholdFunc)
+				require.Equal(t, ThresholdIsAbove, cmd.ThresholdFunc)
 				require.Equal(t, []float64{20.0, 80.0}, cmd.Conditions)
 			},
 		},
@@ -162,7 +163,7 @@ func TestUnmarshalThresholdCommand(t *testing.T) {
 				        ],
 				        "type": "lt"
 				      },
-				      "loadedDimensions": {"schema":{"name":"test","meta":{"type":"fingerprints","typeVersion":[1,0]},"fields":[{"name":"fingerprints","type":"number","typeInfo":{"frame":"uint64"}}]},"data":{"values":[[1,2,3,4,5]]}}
+				      "loadedDimensions": {"schema":{"name":"test","meta":{"type":"fingerprints","typeVersion":[1,0]},"fields":[{"name":"fingerprints","type":"number","typeInfo":{"frame":"uint64"}}]},"data":{"values":[[18446744073709551615,2,3,4,5]]}}
 				    }
 				  ]
 				}`,
@@ -171,10 +172,10 @@ func TestUnmarshalThresholdCommand(t *testing.T) {
 				cmd := c.(*HysteresisCommand)
 				require.Equal(t, []string{"B"}, cmd.NeedsVars())
 				require.Equal(t, []string{"B"}, cmd.LoadingThresholdFunc.NeedsVars())
-				require.Equal(t, "gt", cmd.LoadingThresholdFunc.ThresholdFunc)
+				require.Equal(t, ThresholdIsAbove, cmd.LoadingThresholdFunc.ThresholdFunc)
 				require.Equal(t, []float64{100.0}, cmd.LoadingThresholdFunc.Conditions)
 				require.Equal(t, []string{"B"}, cmd.UnloadingThresholdFunc.NeedsVars())
-				require.Equal(t, "lt", cmd.UnloadingThresholdFunc.ThresholdFunc)
+				require.Equal(t, ThresholdIsBelow, cmd.UnloadingThresholdFunc.ThresholdFunc)
 				require.Equal(t, []float64{31.0}, cmd.UnloadingThresholdFunc.Conditions)
 				require.True(t, cmd.UnloadingThresholdFunc.Invert)
 				require.NotNil(t, cmd.LoadedDimensions)
@@ -186,7 +187,7 @@ func TestUnmarshalThresholdCommand(t *testing.T) {
 					return actual[i] < actual[j]
 				})
 
-				require.EqualValues(t, []uint64{1, 2, 3, 4, 5}, actual)
+				require.EqualValues(t, []uint64{2, 3, 4, 5, 18446744073709551615}, actual)
 			},
 		},
 	}
@@ -232,7 +233,7 @@ func TestCreateMathExpression(t *testing.T) {
 		expected    string
 
 		ref      string
-		function string
+		function ThresholdType
 		params   []float64
 	}
 
@@ -296,7 +297,7 @@ func TestCreateMathExpression(t *testing.T) {
 
 func TestIsSupportedThresholdFunc(t *testing.T) {
 	type testCase struct {
-		function  string
+		function  ThresholdType
 		supported bool
 	}
 
@@ -324,9 +325,121 @@ func TestIsSupportedThresholdFunc(t *testing.T) {
 	}
 
 	for _, tc := range cases {
-		t.Run(tc.function, func(t *testing.T) {
-			supported := IsSupportedThresholdFunc(tc.function)
+		t.Run(string(tc.function), func(t *testing.T) {
+			supported := IsSupportedThresholdFunc(string(tc.function))
 			require.Equal(t, supported, tc.supported)
 		})
 	}
 }
+
+func TestIsHysteresisExpression(t *testing.T) {
+	cases := []struct {
+		name     string
+		input    json.RawMessage
+		expected bool
+	}{
+		{
+			name:     "false if it's empty",
+			input:    json.RawMessage(`{}`),
+			expected: false,
+		},
+		{
+			name:     "false if it is not threshold type",
+			input:    json.RawMessage(`{ "type": "reduce" }`),
+			expected: false,
+		},
+		{
+			name:     "false if no conditions",
+			input:    json.RawMessage(`{ "type": "threshold" }`),
+			expected: false,
+		},
+		{
+			name:     "false if many conditions",
+			input:    json.RawMessage(`{ "type": "threshold", "conditions": [{}, {}] }`),
+			expected: false,
+		},
+		{
+			name:     "false if condition is not an object",
+			input:    json.RawMessage(`{ "type": "threshold", "conditions": ["test"] }`),
+			expected: false,
+		},
+		{
+			name:     "false if condition is does not have unloadEvaluator",
+			input:    json.RawMessage(`{ "type": "threshold", "conditions": [{}] }`),
+			expected: false,
+		},
+		{
+			name:     "true type is threshold and a single condition has unloadEvaluator field",
+			input:    json.RawMessage(`{ "type": "threshold", "conditions": [{ "unloadEvaluator" : {}}] }`),
+			expected: true,
+		},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			query := map[string]any{}
+			require.NoError(t, json.Unmarshal(tc.input, &query))
+			require.Equal(t, tc.expected, IsHysteresisExpression(query))
+		})
+	}
+}
+
+func TestSetLoadedDimensionsToHysteresisCommand(t *testing.T) {
+	cases := []struct {
+		name  string
+		input json.RawMessage
+	}{
+		{
+			name:  "error if model is empty",
+			input: json.RawMessage(`{}`),
+		},
+		{
+			name:  "error if is not a threshold type",
+			input: json.RawMessage(`{ "type": "reduce" }`),
+		},
+		{
+			name:  "error if threshold but no conditions",
+			input: json.RawMessage(`{ "type": "threshold" }`),
+		},
+		{
+			name:  "error if threshold and many conditions",
+			input: json.RawMessage(`{ "type": "threshold", "conditions": [{}, {}] }`),
+		},
+		{
+			name:  "error if condition is not an object",
+			input: json.RawMessage(`{ "type": "threshold", "conditions": ["test"] }`),
+		},
+		{
+			name:  "error if condition does not have unloadEvaluator",
+			input: json.RawMessage(`{ "type": "threshold", "conditions": [{ "evaluator": { "params": [5], "type": "gt"}}], "expression": "A" }`),
+		},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			query := map[string]any{}
+			require.NoError(t, json.Unmarshal(tc.input, &query))
+			err := SetLoadedDimensionsToHysteresisCommand(query, Fingerprints{math.MaxUint64: {}, 2: {}, 3: {}})
+			require.Error(t, err)
+		})
+	}
+
+	t.Run("when unloadEvaluator is set, mutates query with loaded dimensions", func(t *testing.T) {
+		fingerprints := Fingerprints{math.MaxUint64: {}, 2: {}, 3: {}}
+		input := json.RawMessage(`{ "type": "threshold", "conditions": [{ "evaluator": { "params": [5], "type": "gt" }, "unloadEvaluator" : {"params": [2], "type": "lt"}}], "expression": "A" }`)
+		query := map[string]any{}
+		require.NoError(t, json.Unmarshal(input, &query))
+		require.NoError(t, SetLoadedDimensionsToHysteresisCommand(query, fingerprints))
+		raw, err := json.Marshal(query)
+		require.NoError(t, err)
+
+		// Assert the query is set by unmarshalling the query because it's the easiest way to assert Fingerprints
+		cmd, err := UnmarshalThresholdCommand(&rawNode{
+			RefID:    "B",
+			QueryRaw: raw,
+		}, featuremgmt.WithFeatures(featuremgmt.FlagRecoveryThreshold))
+		require.NoError(t, err)
+
+		require.Equal(t, fingerprints, cmd.(*HysteresisCommand).LoadedDimensions)
+	})
+}
diff --git a/pkg/generated/applyconfiguration/internal/internal.go b/pkg/generated/applyconfiguration/internal/internal.go
new file mode 100644
index 0000000000000..2329c80fe2dd3
--- /dev/null
+++ b/pkg/generated/applyconfiguration/internal/internal.go
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by applyconfiguration-gen. DO NOT EDIT.
+
+package internal
+
+import (
+	"fmt"
+	"sync"
+
+	typed "sigs.k8s.io/structured-merge-diff/v4/typed"
+)
+
+func Parser() *typed.Parser {
+	parserOnce.Do(func() {
+		var err error
+		parser, err = typed.NewParser(schemaYAML)
+		if err != nil {
+			panic(fmt.Sprintf("Failed to parse schema: %v", err))
+		}
+	})
+	return parser
+}
+
+var parserOnce sync.Once
+var parser *typed.Parser
+var schemaYAML = typed.YAMLObject(`types:
+- name: __untyped_atomic_
+  scalar: untyped
+  list:
+    elementType:
+      namedType: __untyped_atomic_
+    elementRelationship: atomic
+  map:
+    elementType:
+      namedType: __untyped_atomic_
+    elementRelationship: atomic
+- name: __untyped_deduced_
+  scalar: untyped
+  list:
+    elementType:
+      namedType: __untyped_atomic_
+    elementRelationship: atomic
+  map:
+    elementType:
+      namedType: __untyped_deduced_
+    elementRelationship: separable
+`)
diff --git a/pkg/generated/applyconfiguration/service/v0alpha1/externalname.go b/pkg/generated/applyconfiguration/service/v0alpha1/externalname.go
new file mode 100644
index 0000000000000..7bf2af7bcead4
--- /dev/null
+++ b/pkg/generated/applyconfiguration/service/v0alpha1/externalname.go
@@ -0,0 +1,196 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by applyconfiguration-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	types "k8s.io/apimachinery/pkg/types"
+	v1 "k8s.io/client-go/applyconfigurations/meta/v1"
+)
+
+// ExternalNameApplyConfiguration represents an declarative configuration of the ExternalName type for use
+// with apply.
+type ExternalNameApplyConfiguration struct {
+	v1.TypeMetaApplyConfiguration    `json:",inline"`
+	*v1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"`
+	Spec                             *ExternalNameSpecApplyConfiguration `json:"spec,omitempty"`
+}
+
+// ExternalName constructs an declarative configuration of the ExternalName type for use with
+// apply.
+func ExternalName(name, namespace string) *ExternalNameApplyConfiguration {
+	b := &ExternalNameApplyConfiguration{}
+	b.WithName(name)
+	b.WithNamespace(namespace)
+	b.WithKind("ExternalName")
+	b.WithAPIVersion("service.grafana.app/v0alpha1")
+	return b
+}
+
+// WithKind sets the Kind field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the Kind field is set to the value of the last call.
+func (b *ExternalNameApplyConfiguration) WithKind(value string) *ExternalNameApplyConfiguration {
+	b.Kind = &value
+	return b
+}
+
+// WithAPIVersion sets the APIVersion field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the APIVersion field is set to the value of the last call.
+func (b *ExternalNameApplyConfiguration) WithAPIVersion(value string) *ExternalNameApplyConfiguration {
+	b.APIVersion = &value
+	return b
+}
+
+// WithName sets the Name field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the Name field is set to the value of the last call.
+func (b *ExternalNameApplyConfiguration) WithName(value string) *ExternalNameApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	b.Name = &value
+	return b
+}
+
+// WithGenerateName sets the GenerateName field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the GenerateName field is set to the value of the last call.
+func (b *ExternalNameApplyConfiguration) WithGenerateName(value string) *ExternalNameApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	b.GenerateName = &value
+	return b
+}
+
+// WithNamespace sets the Namespace field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the Namespace field is set to the value of the last call.
+func (b *ExternalNameApplyConfiguration) WithNamespace(value string) *ExternalNameApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	b.Namespace = &value
+	return b
+}
+
+// WithUID sets the UID field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the UID field is set to the value of the last call.
+func (b *ExternalNameApplyConfiguration) WithUID(value types.UID) *ExternalNameApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	b.UID = &value
+	return b
+}
+
+// WithResourceVersion sets the ResourceVersion field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the ResourceVersion field is set to the value of the last call.
+func (b *ExternalNameApplyConfiguration) WithResourceVersion(value string) *ExternalNameApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	b.ResourceVersion = &value
+	return b
+}
+
+// WithGeneration sets the Generation field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the Generation field is set to the value of the last call.
+func (b *ExternalNameApplyConfiguration) WithGeneration(value int64) *ExternalNameApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	b.Generation = &value
+	return b
+}
+
+// WithCreationTimestamp sets the CreationTimestamp field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the CreationTimestamp field is set to the value of the last call.
+func (b *ExternalNameApplyConfiguration) WithCreationTimestamp(value metav1.Time) *ExternalNameApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	b.CreationTimestamp = &value
+	return b
+}
+
+// WithDeletionTimestamp sets the DeletionTimestamp field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the DeletionTimestamp field is set to the value of the last call.
+func (b *ExternalNameApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *ExternalNameApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	b.DeletionTimestamp = &value
+	return b
+}
+
+// WithDeletionGracePeriodSeconds sets the DeletionGracePeriodSeconds field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call.
+func (b *ExternalNameApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *ExternalNameApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	b.DeletionGracePeriodSeconds = &value
+	return b
+}
+
+// WithLabels puts the entries into the Labels field in the declarative configuration
+// and returns the receiver, so that objects can be build by chaining "With" function invocations.
+// If called multiple times, the entries provided by each call will be put on the Labels field,
+// overwriting an existing map entries in Labels field with the same key.
+func (b *ExternalNameApplyConfiguration) WithLabels(entries map[string]string) *ExternalNameApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	if b.Labels == nil && len(entries) > 0 {
+		b.Labels = make(map[string]string, len(entries))
+	}
+	for k, v := range entries {
+		b.Labels[k] = v
+	}
+	return b
+}
+
+// WithAnnotations puts the entries into the Annotations field in the declarative configuration
+// and returns the receiver, so that objects can be build by chaining "With" function invocations.
+// If called multiple times, the entries provided by each call will be put on the Annotations field,
+// overwriting an existing map entries in Annotations field with the same key.
+func (b *ExternalNameApplyConfiguration) WithAnnotations(entries map[string]string) *ExternalNameApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	if b.Annotations == nil && len(entries) > 0 {
+		b.Annotations = make(map[string]string, len(entries))
+	}
+	for k, v := range entries {
+		b.Annotations[k] = v
+	}
+	return b
+}
+
+// WithOwnerReferences adds the given value to the OwnerReferences field in the declarative configuration
+// and returns the receiver, so that objects can be build by chaining "With" function invocations.
+// If called multiple times, values provided by each call will be appended to the OwnerReferences field.
+func (b *ExternalNameApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerReferenceApplyConfiguration) *ExternalNameApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	for i := range values {
+		if values[i] == nil {
+			panic("nil value passed to WithOwnerReferences")
+		}
+		b.OwnerReferences = append(b.OwnerReferences, *values[i])
+	}
+	return b
+}
+
+// WithFinalizers adds the given value to the Finalizers field in the declarative configuration
+// and returns the receiver, so that objects can be build by chaining "With" function invocations.
+// If called multiple times, values provided by each call will be appended to the Finalizers field.
+func (b *ExternalNameApplyConfiguration) WithFinalizers(values ...string) *ExternalNameApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	for i := range values {
+		b.Finalizers = append(b.Finalizers, values[i])
+	}
+	return b
+}
+
+func (b *ExternalNameApplyConfiguration) ensureObjectMetaApplyConfigurationExists() {
+	if b.ObjectMetaApplyConfiguration == nil {
+		b.ObjectMetaApplyConfiguration = &v1.ObjectMetaApplyConfiguration{}
+	}
+}
+
+// WithSpec sets the Spec field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the Spec field is set to the value of the last call.
+func (b *ExternalNameApplyConfiguration) WithSpec(value *ExternalNameSpecApplyConfiguration) *ExternalNameApplyConfiguration {
+	b.Spec = value
+	return b
+}
diff --git a/pkg/generated/applyconfiguration/service/v0alpha1/externalnamespec.go b/pkg/generated/applyconfiguration/service/v0alpha1/externalnamespec.go
new file mode 100644
index 0000000000000..d172862ddb17f
--- /dev/null
+++ b/pkg/generated/applyconfiguration/service/v0alpha1/externalnamespec.go
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by applyconfiguration-gen. DO NOT EDIT.
+
+package v0alpha1
+
+// ExternalNameSpecApplyConfiguration represents an declarative configuration of the ExternalNameSpec type for use
+// with apply.
+type ExternalNameSpecApplyConfiguration struct {
+	Host *string `json:"host,omitempty"`
+}
+
+// ExternalNameSpecApplyConfiguration constructs an declarative configuration of the ExternalNameSpec type for use with
+// apply.
+func ExternalNameSpec() *ExternalNameSpecApplyConfiguration {
+	return &ExternalNameSpecApplyConfiguration{}
+}
+
+// WithHost sets the Host field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the Host field is set to the value of the last call.
+func (b *ExternalNameSpecApplyConfiguration) WithHost(value string) *ExternalNameSpecApplyConfiguration {
+	b.Host = &value
+	return b
+}
diff --git a/pkg/generated/applyconfiguration/utils.go b/pkg/generated/applyconfiguration/utils.go
new file mode 100644
index 0000000000000..93ca019455ce4
--- /dev/null
+++ b/pkg/generated/applyconfiguration/utils.go
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by applyconfiguration-gen. DO NOT EDIT.
+
+package applyconfiguration
+
+import (
+	v0alpha1 "github.com/grafana/grafana/pkg/apis/service/v0alpha1"
+	servicev0alpha1 "github.com/grafana/grafana/pkg/generated/applyconfiguration/service/v0alpha1"
+	schema "k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+// ForKind returns an apply configuration type for the given GroupVersionKind, or nil if no
+// apply configuration type exists for the given GroupVersionKind.
+func ForKind(kind schema.GroupVersionKind) interface{} {
+	switch kind {
+	// Group=service.grafana.app, Version=v0alpha1
+	case v0alpha1.SchemeGroupVersion.WithKind("ExternalName"):
+		return &servicev0alpha1.ExternalNameApplyConfiguration{}
+	case v0alpha1.SchemeGroupVersion.WithKind("ExternalNameSpec"):
+		return &servicev0alpha1.ExternalNameSpecApplyConfiguration{}
+
+	}
+	return nil
+}
diff --git a/pkg/generated/clientset/versioned/clientset.go b/pkg/generated/clientset/versioned/clientset.go
new file mode 100644
index 0000000000000..55fa581701aa1
--- /dev/null
+++ b/pkg/generated/clientset/versioned/clientset.go
@@ -0,0 +1,106 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by client-gen. DO NOT EDIT.
+
+package versioned
+
+import (
+	"fmt"
+	"net/http"
+
+	servicev0alpha1 "github.com/grafana/grafana/pkg/generated/clientset/versioned/typed/service/v0alpha1"
+	discovery "k8s.io/client-go/discovery"
+	rest "k8s.io/client-go/rest"
+	flowcontrol "k8s.io/client-go/util/flowcontrol"
+)
+
+type Interface interface {
+	Discovery() discovery.DiscoveryInterface
+	ServiceV0alpha1() servicev0alpha1.ServiceV0alpha1Interface
+}
+
+// Clientset contains the clients for groups.
+type Clientset struct {
+	*discovery.DiscoveryClient
+	serviceV0alpha1 *servicev0alpha1.ServiceV0alpha1Client
+}
+
+// ServiceV0alpha1 retrieves the ServiceV0alpha1Client
+func (c *Clientset) ServiceV0alpha1() servicev0alpha1.ServiceV0alpha1Interface {
+	return c.serviceV0alpha1
+}
+
+// Discovery retrieves the DiscoveryClient
+func (c *Clientset) Discovery() discovery.DiscoveryInterface {
+	if c == nil {
+		return nil
+	}
+	return c.DiscoveryClient
+}
+
+// NewForConfig creates a new Clientset for the given config.
+// If config's RateLimiter is not set and QPS and Burst are acceptable,
+// NewForConfig will generate a rate-limiter in configShallowCopy.
+// NewForConfig is equivalent to NewForConfigAndClient(c, httpClient),
+// where httpClient was generated with rest.HTTPClientFor(c).
+func NewForConfig(c *rest.Config) (*Clientset, error) {
+	configShallowCopy := *c
+
+	if configShallowCopy.UserAgent == "" {
+		configShallowCopy.UserAgent = rest.DefaultKubernetesUserAgent()
+	}
+
+	// share the transport between all clients
+	httpClient, err := rest.HTTPClientFor(&configShallowCopy)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewForConfigAndClient(&configShallowCopy, httpClient)
+}
+
+// NewForConfigAndClient creates a new Clientset for the given config and http client.
+// Note the http client provided takes precedence over the configured transport values.
+// If config's RateLimiter is not set and QPS and Burst are acceptable,
+// NewForConfigAndClient will generate a rate-limiter in configShallowCopy.
+func NewForConfigAndClient(c *rest.Config, httpClient *http.Client) (*Clientset, error) {
+	configShallowCopy := *c
+	if configShallowCopy.RateLimiter == nil && configShallowCopy.QPS > 0 {
+		if configShallowCopy.Burst <= 0 {
+			return nil, fmt.Errorf("burst is required to be greater than 0 when RateLimiter is not set and QPS is set to greater than 0")
+		}
+		configShallowCopy.RateLimiter = flowcontrol.NewTokenBucketRateLimiter(configShallowCopy.QPS, configShallowCopy.Burst)
+	}
+
+	var cs Clientset
+	var err error
+	cs.serviceV0alpha1, err = servicev0alpha1.NewForConfigAndClient(&configShallowCopy, httpClient)
+	if err != nil {
+		return nil, err
+	}
+
+	cs.DiscoveryClient, err = discovery.NewDiscoveryClientForConfigAndClient(&configShallowCopy, httpClient)
+	if err != nil {
+		return nil, err
+	}
+	return &cs, nil
+}
+
+// NewForConfigOrDie creates a new Clientset for the given config and
+// panics if there is an error in the config.
+func NewForConfigOrDie(c *rest.Config) *Clientset {
+	cs, err := NewForConfig(c)
+	if err != nil {
+		panic(err)
+	}
+	return cs
+}
+
+// New creates a new Clientset for the given RESTClient.
+func New(c rest.Interface) *Clientset {
+	var cs Clientset
+	cs.serviceV0alpha1 = servicev0alpha1.New(c)
+
+	cs.DiscoveryClient = discovery.NewDiscoveryClient(c)
+	return &cs
+}
diff --git a/pkg/generated/clientset/versioned/fake/clientset_generated.go b/pkg/generated/clientset/versioned/fake/clientset_generated.go
new file mode 100644
index 0000000000000..c7e19bcc91804
--- /dev/null
+++ b/pkg/generated/clientset/versioned/fake/clientset_generated.go
@@ -0,0 +1,71 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by client-gen. DO NOT EDIT.
+
+package fake
+
+import (
+	clientset "github.com/grafana/grafana/pkg/generated/clientset/versioned"
+	servicev0alpha1 "github.com/grafana/grafana/pkg/generated/clientset/versioned/typed/service/v0alpha1"
+	fakeservicev0alpha1 "github.com/grafana/grafana/pkg/generated/clientset/versioned/typed/service/v0alpha1/fake"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/watch"
+	"k8s.io/client-go/discovery"
+	fakediscovery "k8s.io/client-go/discovery/fake"
+	"k8s.io/client-go/testing"
+)
+
+// NewSimpleClientset returns a clientset that will respond with the provided objects.
+// It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
+// without applying any validations and/or defaults. It shouldn't be considered a replacement
+// for a real clientset and is mostly useful in simple unit tests.
+func NewSimpleClientset(objects ...runtime.Object) *Clientset {
+	o := testing.NewObjectTracker(scheme, codecs.UniversalDecoder())
+	for _, obj := range objects {
+		if err := o.Add(obj); err != nil {
+			panic(err)
+		}
+	}
+
+	cs := &Clientset{tracker: o}
+	cs.discovery = &fakediscovery.FakeDiscovery{Fake: &cs.Fake}
+	cs.AddReactor("*", "*", testing.ObjectReaction(o))
+	cs.AddWatchReactor("*", func(action testing.Action) (handled bool, ret watch.Interface, err error) {
+		gvr := action.GetResource()
+		ns := action.GetNamespace()
+		watch, err := o.Watch(gvr, ns)
+		if err != nil {
+			return false, nil, err
+		}
+		return true, watch, nil
+	})
+
+	return cs
+}
+
+// Clientset implements clientset.Interface. Meant to be embedded into a
+// struct to get a default implementation. This makes faking out just the method
+// you want to test easier.
+type Clientset struct {
+	testing.Fake
+	discovery *fakediscovery.FakeDiscovery
+	tracker   testing.ObjectTracker
+}
+
+func (c *Clientset) Discovery() discovery.DiscoveryInterface {
+	return c.discovery
+}
+
+func (c *Clientset) Tracker() testing.ObjectTracker {
+	return c.tracker
+}
+
+var (
+	_ clientset.Interface = &Clientset{}
+	_ testing.FakeClient  = &Clientset{}
+)
+
+// ServiceV0alpha1 retrieves the ServiceV0alpha1Client
+func (c *Clientset) ServiceV0alpha1() servicev0alpha1.ServiceV0alpha1Interface {
+	return &fakeservicev0alpha1.FakeServiceV0alpha1{Fake: &c.Fake}
+}
diff --git a/pkg/generated/clientset/versioned/fake/doc.go b/pkg/generated/clientset/versioned/fake/doc.go
new file mode 100644
index 0000000000000..bc6b017db1be6
--- /dev/null
+++ b/pkg/generated/clientset/versioned/fake/doc.go
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by client-gen. DO NOT EDIT.
+
+// This package has the automatically generated fake clientset.
+package fake
diff --git a/pkg/generated/clientset/versioned/fake/register.go b/pkg/generated/clientset/versioned/fake/register.go
new file mode 100644
index 0000000000000..bbf12658e7613
--- /dev/null
+++ b/pkg/generated/clientset/versioned/fake/register.go
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by client-gen. DO NOT EDIT.
+
+package fake
+
+import (
+	servicev0alpha1 "github.com/grafana/grafana/pkg/apis/service/v0alpha1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	runtime "k8s.io/apimachinery/pkg/runtime"
+	schema "k8s.io/apimachinery/pkg/runtime/schema"
+	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+)
+
+var scheme = runtime.NewScheme()
+var codecs = serializer.NewCodecFactory(scheme)
+
+var localSchemeBuilder = runtime.SchemeBuilder{
+	servicev0alpha1.AddToScheme,
+}
+
+// AddToScheme adds all types of this clientset into the given scheme. This allows composition
+// of clientsets, like in:
+//
+//	import (
+//	  "k8s.io/client-go/kubernetes"
+//	  clientsetscheme "k8s.io/client-go/kubernetes/scheme"
+//	  aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
+//	)
+//
+//	kclientset, _ := kubernetes.NewForConfig(c)
+//	_ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+//
+// After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
+// correctly.
+var AddToScheme = localSchemeBuilder.AddToScheme
+
+func init() {
+	v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"})
+	utilruntime.Must(AddToScheme(scheme))
+}
diff --git a/pkg/generated/clientset/versioned/scheme/doc.go b/pkg/generated/clientset/versioned/scheme/doc.go
new file mode 100644
index 0000000000000..b69e1aef90632
--- /dev/null
+++ b/pkg/generated/clientset/versioned/scheme/doc.go
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by client-gen. DO NOT EDIT.
+
+// This package contains the scheme of the automatically generated clientset.
+package scheme
diff --git a/pkg/generated/clientset/versioned/scheme/register.go b/pkg/generated/clientset/versioned/scheme/register.go
new file mode 100644
index 0000000000000..dd6e961916048
--- /dev/null
+++ b/pkg/generated/clientset/versioned/scheme/register.go
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by client-gen. DO NOT EDIT.
+
+package scheme
+
+import (
+	servicev0alpha1 "github.com/grafana/grafana/pkg/apis/service/v0alpha1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	runtime "k8s.io/apimachinery/pkg/runtime"
+	schema "k8s.io/apimachinery/pkg/runtime/schema"
+	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+)
+
+var Scheme = runtime.NewScheme()
+var Codecs = serializer.NewCodecFactory(Scheme)
+var ParameterCodec = runtime.NewParameterCodec(Scheme)
+var localSchemeBuilder = runtime.SchemeBuilder{
+	servicev0alpha1.AddToScheme,
+}
+
+// AddToScheme adds all types of this clientset into the given scheme. This allows composition
+// of clientsets, like in:
+//
+//	import (
+//	  "k8s.io/client-go/kubernetes"
+//	  clientsetscheme "k8s.io/client-go/kubernetes/scheme"
+//	  aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
+//	)
+//
+//	kclientset, _ := kubernetes.NewForConfig(c)
+//	_ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+//
+// After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
+// correctly.
+var AddToScheme = localSchemeBuilder.AddToScheme
+
+func init() {
+	v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"})
+	utilruntime.Must(AddToScheme(Scheme))
+}
diff --git a/pkg/generated/clientset/versioned/typed/service/v0alpha1/doc.go b/pkg/generated/clientset/versioned/typed/service/v0alpha1/doc.go
new file mode 100644
index 0000000000000..1c86744fecc98
--- /dev/null
+++ b/pkg/generated/clientset/versioned/typed/service/v0alpha1/doc.go
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by client-gen. DO NOT EDIT.
+
+// This package has the automatically generated typed clients.
+package v0alpha1
diff --git a/pkg/generated/clientset/versioned/typed/service/v0alpha1/externalname.go b/pkg/generated/clientset/versioned/typed/service/v0alpha1/externalname.go
new file mode 100644
index 0000000000000..04c348e53c1c9
--- /dev/null
+++ b/pkg/generated/clientset/versioned/typed/service/v0alpha1/externalname.go
@@ -0,0 +1,194 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by client-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	"context"
+	json "encoding/json"
+	"fmt"
+	"time"
+
+	v0alpha1 "github.com/grafana/grafana/pkg/apis/service/v0alpha1"
+	servicev0alpha1 "github.com/grafana/grafana/pkg/generated/applyconfiguration/service/v0alpha1"
+	scheme "github.com/grafana/grafana/pkg/generated/clientset/versioned/scheme"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	types "k8s.io/apimachinery/pkg/types"
+	watch "k8s.io/apimachinery/pkg/watch"
+	rest "k8s.io/client-go/rest"
+)
+
+// ExternalNamesGetter has a method to return a ExternalNameInterface.
+// A group's client should implement this interface.
+type ExternalNamesGetter interface {
+	ExternalNames(namespace string) ExternalNameInterface
+}
+
+// ExternalNameInterface has methods to work with ExternalName resources.
+type ExternalNameInterface interface {
+	Create(ctx context.Context, externalName *v0alpha1.ExternalName, opts v1.CreateOptions) (*v0alpha1.ExternalName, error)
+	Update(ctx context.Context, externalName *v0alpha1.ExternalName, opts v1.UpdateOptions) (*v0alpha1.ExternalName, error)
+	Delete(ctx context.Context, name string, opts v1.DeleteOptions) error
+	DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error
+	Get(ctx context.Context, name string, opts v1.GetOptions) (*v0alpha1.ExternalName, error)
+	List(ctx context.Context, opts v1.ListOptions) (*v0alpha1.ExternalNameList, error)
+	Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
+	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v0alpha1.ExternalName, err error)
+	Apply(ctx context.Context, externalName *servicev0alpha1.ExternalNameApplyConfiguration, opts v1.ApplyOptions) (result *v0alpha1.ExternalName, err error)
+	ExternalNameExpansion
+}
+
+// externalNames implements ExternalNameInterface
+type externalNames struct {
+	client rest.Interface
+	ns     string
+}
+
+// newExternalNames returns a ExternalNames
+func newExternalNames(c *ServiceV0alpha1Client, namespace string) *externalNames {
+	return &externalNames{
+		client: c.RESTClient(),
+		ns:     namespace,
+	}
+}
+
+// Get takes name of the externalName, and returns the corresponding externalName object, and an error if there is any.
+func (c *externalNames) Get(ctx context.Context, name string, options v1.GetOptions) (result *v0alpha1.ExternalName, err error) {
+	result = &v0alpha1.ExternalName{}
+	err = c.client.Get().
+		Namespace(c.ns).
+		Resource("externalnames").
+		Name(name).
+		VersionedParams(&options, scheme.ParameterCodec).
+		Do(ctx).
+		Into(result)
+	return
+}
+
+// List takes label and field selectors, and returns the list of ExternalNames that match those selectors.
+func (c *externalNames) List(ctx context.Context, opts v1.ListOptions) (result *v0alpha1.ExternalNameList, err error) {
+	var timeout time.Duration
+	if opts.TimeoutSeconds != nil {
+		timeout = time.Duration(*opts.TimeoutSeconds) * time.Second
+	}
+	result = &v0alpha1.ExternalNameList{}
+	err = c.client.Get().
+		Namespace(c.ns).
+		Resource("externalnames").
+		VersionedParams(&opts, scheme.ParameterCodec).
+		Timeout(timeout).
+		Do(ctx).
+		Into(result)
+	return
+}
+
+// Watch returns a watch.Interface that watches the requested externalNames.
+func (c *externalNames) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
+	var timeout time.Duration
+	if opts.TimeoutSeconds != nil {
+		timeout = time.Duration(*opts.TimeoutSeconds) * time.Second
+	}
+	opts.Watch = true
+	return c.client.Get().
+		Namespace(c.ns).
+		Resource("externalnames").
+		VersionedParams(&opts, scheme.ParameterCodec).
+		Timeout(timeout).
+		Watch(ctx)
+}
+
+// Create takes the representation of a externalName and creates it.  Returns the server's representation of the externalName, and an error, if there is any.
+func (c *externalNames) Create(ctx context.Context, externalName *v0alpha1.ExternalName, opts v1.CreateOptions) (result *v0alpha1.ExternalName, err error) {
+	result = &v0alpha1.ExternalName{}
+	err = c.client.Post().
+		Namespace(c.ns).
+		Resource("externalnames").
+		VersionedParams(&opts, scheme.ParameterCodec).
+		Body(externalName).
+		Do(ctx).
+		Into(result)
+	return
+}
+
+// Update takes the representation of a externalName and updates it. Returns the server's representation of the externalName, and an error, if there is any.
+func (c *externalNames) Update(ctx context.Context, externalName *v0alpha1.ExternalName, opts v1.UpdateOptions) (result *v0alpha1.ExternalName, err error) {
+	result = &v0alpha1.ExternalName{}
+	err = c.client.Put().
+		Namespace(c.ns).
+		Resource("externalnames").
+		Name(externalName.Name).
+		VersionedParams(&opts, scheme.ParameterCodec).
+		Body(externalName).
+		Do(ctx).
+		Into(result)
+	return
+}
+
+// Delete takes name of the externalName and deletes it. Returns an error if one occurs.
+func (c *externalNames) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
+	return c.client.Delete().
+		Namespace(c.ns).
+		Resource("externalnames").
+		Name(name).
+		Body(&opts).
+		Do(ctx).
+		Error()
+}
+
+// DeleteCollection deletes a collection of objects.
+func (c *externalNames) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
+	var timeout time.Duration
+	if listOpts.TimeoutSeconds != nil {
+		timeout = time.Duration(*listOpts.TimeoutSeconds) * time.Second
+	}
+	return c.client.Delete().
+		Namespace(c.ns).
+		Resource("externalnames").
+		VersionedParams(&listOpts, scheme.ParameterCodec).
+		Timeout(timeout).
+		Body(&opts).
+		Do(ctx).
+		Error()
+}
+
+// Patch applies the patch and returns the patched externalName.
+func (c *externalNames) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v0alpha1.ExternalName, err error) {
+	result = &v0alpha1.ExternalName{}
+	err = c.client.Patch(pt).
+		Namespace(c.ns).
+		Resource("externalnames").
+		Name(name).
+		SubResource(subresources...).
+		VersionedParams(&opts, scheme.ParameterCodec).
+		Body(data).
+		Do(ctx).
+		Into(result)
+	return
+}
+
+// Apply takes the given apply declarative configuration, applies it and returns the applied externalName.
+func (c *externalNames) Apply(ctx context.Context, externalName *servicev0alpha1.ExternalNameApplyConfiguration, opts v1.ApplyOptions) (result *v0alpha1.ExternalName, err error) {
+	if externalName == nil {
+		return nil, fmt.Errorf("externalName provided to Apply must not be nil")
+	}
+	patchOpts := opts.ToPatchOptions()
+	data, err := json.Marshal(externalName)
+	if err != nil {
+		return nil, err
+	}
+	name := externalName.Name
+	if name == nil {
+		return nil, fmt.Errorf("externalName.Name must be provided to Apply")
+	}
+	result = &v0alpha1.ExternalName{}
+	err = c.client.Patch(types.ApplyPatchType).
+		Namespace(c.ns).
+		Resource("externalnames").
+		Name(*name).
+		VersionedParams(&patchOpts, scheme.ParameterCodec).
+		Body(data).
+		Do(ctx).
+		Into(result)
+	return
+}
diff --git a/pkg/generated/clientset/versioned/typed/service/v0alpha1/fake/doc.go b/pkg/generated/clientset/versioned/typed/service/v0alpha1/fake/doc.go
new file mode 100644
index 0000000000000..d96b985b3eae1
--- /dev/null
+++ b/pkg/generated/clientset/versioned/typed/service/v0alpha1/fake/doc.go
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by client-gen. DO NOT EDIT.
+
+// Package fake has the automatically generated clients.
+package fake
diff --git a/pkg/generated/clientset/versioned/typed/service/v0alpha1/fake/fake_externalname.go b/pkg/generated/clientset/versioned/typed/service/v0alpha1/fake/fake_externalname.go
new file mode 100644
index 0000000000000..b3f0bacb493f0
--- /dev/null
+++ b/pkg/generated/clientset/versioned/typed/service/v0alpha1/fake/fake_externalname.go
@@ -0,0 +1,140 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by client-gen. DO NOT EDIT.
+
+package fake
+
+import (
+	"context"
+	json "encoding/json"
+	"fmt"
+
+	v0alpha1 "github.com/grafana/grafana/pkg/apis/service/v0alpha1"
+	servicev0alpha1 "github.com/grafana/grafana/pkg/generated/applyconfiguration/service/v0alpha1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	labels "k8s.io/apimachinery/pkg/labels"
+	types "k8s.io/apimachinery/pkg/types"
+	watch "k8s.io/apimachinery/pkg/watch"
+	testing "k8s.io/client-go/testing"
+)
+
+// FakeExternalNames implements ExternalNameInterface
+type FakeExternalNames struct {
+	Fake *FakeServiceV0alpha1
+	ns   string
+}
+
+var externalnamesResource = v0alpha1.SchemeGroupVersion.WithResource("externalnames")
+
+var externalnamesKind = v0alpha1.SchemeGroupVersion.WithKind("ExternalName")
+
+// Get takes name of the externalName, and returns the corresponding externalName object, and an error if there is any.
+func (c *FakeExternalNames) Get(ctx context.Context, name string, options v1.GetOptions) (result *v0alpha1.ExternalName, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewGetAction(externalnamesResource, c.ns, name), &v0alpha1.ExternalName{})
+
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*v0alpha1.ExternalName), err
+}
+
+// List takes label and field selectors, and returns the list of ExternalNames that match those selectors.
+func (c *FakeExternalNames) List(ctx context.Context, opts v1.ListOptions) (result *v0alpha1.ExternalNameList, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewListAction(externalnamesResource, externalnamesKind, c.ns, opts), &v0alpha1.ExternalNameList{})
+
+	if obj == nil {
+		return nil, err
+	}
+
+	label, _, _ := testing.ExtractFromListOptions(opts)
+	if label == nil {
+		label = labels.Everything()
+	}
+	list := &v0alpha1.ExternalNameList{ListMeta: obj.(*v0alpha1.ExternalNameList).ListMeta}
+	for _, item := range obj.(*v0alpha1.ExternalNameList).Items {
+		if label.Matches(labels.Set(item.Labels)) {
+			list.Items = append(list.Items, item)
+		}
+	}
+	return list, err
+}
+
+// Watch returns a watch.Interface that watches the requested externalNames.
+func (c *FakeExternalNames) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
+	return c.Fake.
+		InvokesWatch(testing.NewWatchAction(externalnamesResource, c.ns, opts))
+
+}
+
+// Create takes the representation of a externalName and creates it.  Returns the server's representation of the externalName, and an error, if there is any.
+func (c *FakeExternalNames) Create(ctx context.Context, externalName *v0alpha1.ExternalName, opts v1.CreateOptions) (result *v0alpha1.ExternalName, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewCreateAction(externalnamesResource, c.ns, externalName), &v0alpha1.ExternalName{})
+
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*v0alpha1.ExternalName), err
+}
+
+// Update takes the representation of a externalName and updates it. Returns the server's representation of the externalName, and an error, if there is any.
+func (c *FakeExternalNames) Update(ctx context.Context, externalName *v0alpha1.ExternalName, opts v1.UpdateOptions) (result *v0alpha1.ExternalName, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewUpdateAction(externalnamesResource, c.ns, externalName), &v0alpha1.ExternalName{})
+
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*v0alpha1.ExternalName), err
+}
+
+// Delete takes name of the externalName and deletes it. Returns an error if one occurs.
+func (c *FakeExternalNames) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
+	_, err := c.Fake.
+		Invokes(testing.NewDeleteActionWithOptions(externalnamesResource, c.ns, name, opts), &v0alpha1.ExternalName{})
+
+	return err
+}
+
+// DeleteCollection deletes a collection of objects.
+func (c *FakeExternalNames) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
+	action := testing.NewDeleteCollectionAction(externalnamesResource, c.ns, listOpts)
+
+	_, err := c.Fake.Invokes(action, &v0alpha1.ExternalNameList{})
+	return err
+}
+
+// Patch applies the patch and returns the patched externalName.
+func (c *FakeExternalNames) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v0alpha1.ExternalName, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewPatchSubresourceAction(externalnamesResource, c.ns, name, pt, data, subresources...), &v0alpha1.ExternalName{})
+
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*v0alpha1.ExternalName), err
+}
+
+// Apply takes the given apply declarative configuration, applies it and returns the applied externalName.
+func (c *FakeExternalNames) Apply(ctx context.Context, externalName *servicev0alpha1.ExternalNameApplyConfiguration, opts v1.ApplyOptions) (result *v0alpha1.ExternalName, err error) {
+	if externalName == nil {
+		return nil, fmt.Errorf("externalName provided to Apply must not be nil")
+	}
+	data, err := json.Marshal(externalName)
+	if err != nil {
+		return nil, err
+	}
+	name := externalName.Name
+	if name == nil {
+		return nil, fmt.Errorf("externalName.Name must be provided to Apply")
+	}
+	obj, err := c.Fake.
+		Invokes(testing.NewPatchSubresourceAction(externalnamesResource, c.ns, *name, types.ApplyPatchType, data), &v0alpha1.ExternalName{})
+
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*v0alpha1.ExternalName), err
+}
diff --git a/pkg/generated/clientset/versioned/typed/service/v0alpha1/fake/fake_service_client.go b/pkg/generated/clientset/versioned/typed/service/v0alpha1/fake/fake_service_client.go
new file mode 100644
index 0000000000000..00969d9eb17db
--- /dev/null
+++ b/pkg/generated/clientset/versioned/typed/service/v0alpha1/fake/fake_service_client.go
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by client-gen. DO NOT EDIT.
+
+package fake
+
+import (
+	v0alpha1 "github.com/grafana/grafana/pkg/generated/clientset/versioned/typed/service/v0alpha1"
+	rest "k8s.io/client-go/rest"
+	testing "k8s.io/client-go/testing"
+)
+
+type FakeServiceV0alpha1 struct {
+	*testing.Fake
+}
+
+func (c *FakeServiceV0alpha1) ExternalNames(namespace string) v0alpha1.ExternalNameInterface {
+	return &FakeExternalNames{c, namespace}
+}
+
+// RESTClient returns a RESTClient that is used to communicate
+// with API server by this client implementation.
+func (c *FakeServiceV0alpha1) RESTClient() rest.Interface {
+	var ret *rest.RESTClient
+	return ret
+}
diff --git a/pkg/generated/clientset/versioned/typed/service/v0alpha1/generated_expansion.go b/pkg/generated/clientset/versioned/typed/service/v0alpha1/generated_expansion.go
new file mode 100644
index 0000000000000..f0a8644fafa74
--- /dev/null
+++ b/pkg/generated/clientset/versioned/typed/service/v0alpha1/generated_expansion.go
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by client-gen. DO NOT EDIT.
+
+package v0alpha1
+
+type ExternalNameExpansion interface{}
diff --git a/pkg/generated/clientset/versioned/typed/service/v0alpha1/service_client.go b/pkg/generated/clientset/versioned/typed/service/v0alpha1/service_client.go
new file mode 100644
index 0000000000000..76683c7106aa3
--- /dev/null
+++ b/pkg/generated/clientset/versioned/typed/service/v0alpha1/service_client.go
@@ -0,0 +1,93 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by client-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	"net/http"
+
+	v0alpha1 "github.com/grafana/grafana/pkg/apis/service/v0alpha1"
+	"github.com/grafana/grafana/pkg/generated/clientset/versioned/scheme"
+	rest "k8s.io/client-go/rest"
+)
+
+type ServiceV0alpha1Interface interface {
+	RESTClient() rest.Interface
+	ExternalNamesGetter
+}
+
+// ServiceV0alpha1Client is used to interact with features provided by the service.grafana.app group.
+type ServiceV0alpha1Client struct {
+	restClient rest.Interface
+}
+
+func (c *ServiceV0alpha1Client) ExternalNames(namespace string) ExternalNameInterface {
+	return newExternalNames(c, namespace)
+}
+
+// NewForConfig creates a new ServiceV0alpha1Client for the given config.
+// NewForConfig is equivalent to NewForConfigAndClient(c, httpClient),
+// where httpClient was generated with rest.HTTPClientFor(c).
+func NewForConfig(c *rest.Config) (*ServiceV0alpha1Client, error) {
+	config := *c
+	if err := setConfigDefaults(&config); err != nil {
+		return nil, err
+	}
+	httpClient, err := rest.HTTPClientFor(&config)
+	if err != nil {
+		return nil, err
+	}
+	return NewForConfigAndClient(&config, httpClient)
+}
+
+// NewForConfigAndClient creates a new ServiceV0alpha1Client for the given config and http client.
+// Note the http client provided takes precedence over the configured transport values.
+func NewForConfigAndClient(c *rest.Config, h *http.Client) (*ServiceV0alpha1Client, error) {
+	config := *c
+	if err := setConfigDefaults(&config); err != nil {
+		return nil, err
+	}
+	client, err := rest.RESTClientForConfigAndClient(&config, h)
+	if err != nil {
+		return nil, err
+	}
+	return &ServiceV0alpha1Client{client}, nil
+}
+
+// NewForConfigOrDie creates a new ServiceV0alpha1Client for the given config and
+// panics if there is an error in the config.
+func NewForConfigOrDie(c *rest.Config) *ServiceV0alpha1Client {
+	client, err := NewForConfig(c)
+	if err != nil {
+		panic(err)
+	}
+	return client
+}
+
+// New creates a new ServiceV0alpha1Client for the given RESTClient.
+func New(c rest.Interface) *ServiceV0alpha1Client {
+	return &ServiceV0alpha1Client{c}
+}
+
+func setConfigDefaults(config *rest.Config) error {
+	gv := v0alpha1.SchemeGroupVersion
+	config.GroupVersion = &gv
+	config.APIPath = "/apis"
+	config.NegotiatedSerializer = scheme.Codecs.WithoutConversion()
+
+	if config.UserAgent == "" {
+		config.UserAgent = rest.DefaultKubernetesUserAgent()
+	}
+
+	return nil
+}
+
+// RESTClient returns a RESTClient that is used to communicate
+// with API server by this client implementation.
+func (c *ServiceV0alpha1Client) RESTClient() rest.Interface {
+	if c == nil {
+		return nil
+	}
+	return c.restClient
+}
diff --git a/pkg/generated/informers/externalversions/factory.go b/pkg/generated/informers/externalversions/factory.go
new file mode 100644
index 0000000000000..faca5c61edb49
--- /dev/null
+++ b/pkg/generated/informers/externalversions/factory.go
@@ -0,0 +1,247 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by informer-gen. DO NOT EDIT.
+
+package externalversions
+
+import (
+	reflect "reflect"
+	sync "sync"
+	time "time"
+
+	versioned "github.com/grafana/grafana/pkg/generated/clientset/versioned"
+	internalinterfaces "github.com/grafana/grafana/pkg/generated/informers/externalversions/internalinterfaces"
+	service "github.com/grafana/grafana/pkg/generated/informers/externalversions/service"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	runtime "k8s.io/apimachinery/pkg/runtime"
+	schema "k8s.io/apimachinery/pkg/runtime/schema"
+	cache "k8s.io/client-go/tools/cache"
+)
+
+// SharedInformerOption defines the functional option type for SharedInformerFactory.
+type SharedInformerOption func(*sharedInformerFactory) *sharedInformerFactory
+
+type sharedInformerFactory struct {
+	client           versioned.Interface
+	namespace        string
+	tweakListOptions internalinterfaces.TweakListOptionsFunc
+	lock             sync.Mutex
+	defaultResync    time.Duration
+	customResync     map[reflect.Type]time.Duration
+	transform        cache.TransformFunc
+
+	informers map[reflect.Type]cache.SharedIndexInformer
+	// startedInformers is used for tracking which informers have been started.
+	// This allows Start() to be called multiple times safely.
+	startedInformers map[reflect.Type]bool
+	// wg tracks how many goroutines were started.
+	wg sync.WaitGroup
+	// shuttingDown is true when Shutdown has been called. It may still be running
+	// because it needs to wait for goroutines.
+	shuttingDown bool
+}
+
+// WithCustomResyncConfig sets a custom resync period for the specified informer types.
+func WithCustomResyncConfig(resyncConfig map[v1.Object]time.Duration) SharedInformerOption {
+	return func(factory *sharedInformerFactory) *sharedInformerFactory {
+		for k, v := range resyncConfig {
+			factory.customResync[reflect.TypeOf(k)] = v
+		}
+		return factory
+	}
+}
+
+// WithTweakListOptions sets a custom filter on all listers of the configured SharedInformerFactory.
+func WithTweakListOptions(tweakListOptions internalinterfaces.TweakListOptionsFunc) SharedInformerOption {
+	return func(factory *sharedInformerFactory) *sharedInformerFactory {
+		factory.tweakListOptions = tweakListOptions
+		return factory
+	}
+}
+
+// WithNamespace limits the SharedInformerFactory to the specified namespace.
+func WithNamespace(namespace string) SharedInformerOption {
+	return func(factory *sharedInformerFactory) *sharedInformerFactory {
+		factory.namespace = namespace
+		return factory
+	}
+}
+
+// WithTransform sets a transform on all informers.
+func WithTransform(transform cache.TransformFunc) SharedInformerOption {
+	return func(factory *sharedInformerFactory) *sharedInformerFactory {
+		factory.transform = transform
+		return factory
+	}
+}
+
+// NewSharedInformerFactory constructs a new instance of sharedInformerFactory for all namespaces.
+func NewSharedInformerFactory(client versioned.Interface, defaultResync time.Duration) SharedInformerFactory {
+	return NewSharedInformerFactoryWithOptions(client, defaultResync)
+}
+
+// NewFilteredSharedInformerFactory constructs a new instance of sharedInformerFactory.
+// Listers obtained via this SharedInformerFactory will be subject to the same filters
+// as specified here.
+// Deprecated: Please use NewSharedInformerFactoryWithOptions instead
+func NewFilteredSharedInformerFactory(client versioned.Interface, defaultResync time.Duration, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) SharedInformerFactory {
+	return NewSharedInformerFactoryWithOptions(client, defaultResync, WithNamespace(namespace), WithTweakListOptions(tweakListOptions))
+}
+
+// NewSharedInformerFactoryWithOptions constructs a new instance of a SharedInformerFactory with additional options.
+func NewSharedInformerFactoryWithOptions(client versioned.Interface, defaultResync time.Duration, options ...SharedInformerOption) SharedInformerFactory {
+	factory := &sharedInformerFactory{
+		client:           client,
+		namespace:        v1.NamespaceAll,
+		defaultResync:    defaultResync,
+		informers:        make(map[reflect.Type]cache.SharedIndexInformer),
+		startedInformers: make(map[reflect.Type]bool),
+		customResync:     make(map[reflect.Type]time.Duration),
+	}
+
+	// Apply all options
+	for _, opt := range options {
+		factory = opt(factory)
+	}
+
+	return factory
+}
+
+func (f *sharedInformerFactory) Start(stopCh <-chan struct{}) {
+	f.lock.Lock()
+	defer f.lock.Unlock()
+
+	if f.shuttingDown {
+		return
+	}
+
+	for informerType, informer := range f.informers {
+		if !f.startedInformers[informerType] {
+			f.wg.Add(1)
+			// We need a new variable in each loop iteration,
+			// otherwise the goroutine would use the loop variable
+			// and that keeps changing.
+			informer := informer
+			go func() {
+				defer f.wg.Done()
+				informer.Run(stopCh)
+			}()
+			f.startedInformers[informerType] = true
+		}
+	}
+}
+
+func (f *sharedInformerFactory) Shutdown() {
+	f.lock.Lock()
+	f.shuttingDown = true
+	f.lock.Unlock()
+
+	// Will return immediately if there is nothing to wait for.
+	f.wg.Wait()
+}
+
+func (f *sharedInformerFactory) WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool {
+	informers := func() map[reflect.Type]cache.SharedIndexInformer {
+		f.lock.Lock()
+		defer f.lock.Unlock()
+
+		informers := map[reflect.Type]cache.SharedIndexInformer{}
+		for informerType, informer := range f.informers {
+			if f.startedInformers[informerType] {
+				informers[informerType] = informer
+			}
+		}
+		return informers
+	}()
+
+	res := map[reflect.Type]bool{}
+	for informType, informer := range informers {
+		res[informType] = cache.WaitForCacheSync(stopCh, informer.HasSynced)
+	}
+	return res
+}
+
+// InformerFor returns the SharedIndexInformer for obj using an internal
+// client.
+func (f *sharedInformerFactory) InformerFor(obj runtime.Object, newFunc internalinterfaces.NewInformerFunc) cache.SharedIndexInformer {
+	f.lock.Lock()
+	defer f.lock.Unlock()
+
+	informerType := reflect.TypeOf(obj)
+	informer, exists := f.informers[informerType]
+	if exists {
+		return informer
+	}
+
+	resyncPeriod, exists := f.customResync[informerType]
+	if !exists {
+		resyncPeriod = f.defaultResync
+	}
+
+	informer = newFunc(f.client, resyncPeriod)
+	informer.SetTransform(f.transform)
+	f.informers[informerType] = informer
+
+	return informer
+}
+
+// SharedInformerFactory provides shared informers for resources in all known
+// API group versions.
+//
+// It is typically used like this:
+//
+//	ctx, cancel := context.Background()
+//	defer cancel()
+//	factory := NewSharedInformerFactory(client, resyncPeriod)
+//	defer factory.WaitForStop()    // Returns immediately if nothing was started.
+//	genericInformer := factory.ForResource(resource)
+//	typedInformer := factory.SomeAPIGroup().V1().SomeType()
+//	factory.Start(ctx.Done())          // Start processing these informers.
+//	synced := factory.WaitForCacheSync(ctx.Done())
+//	for v, ok := range synced {
+//	    if !ok {
+//	        fmt.Fprintf(os.Stderr, "caches failed to sync: %v", v)
+//	        return
+//	    }
+//	}
+//
+//	// Creating informers can also be created after Start, but then
+//	// Start must be called again:
+//	anotherGenericInformer := factory.ForResource(resource)
+//	factory.Start(ctx.Done())
+type SharedInformerFactory interface {
+	internalinterfaces.SharedInformerFactory
+
+	// Start initializes all requested informers. They are handled in goroutines
+	// which run until the stop channel gets closed.
+	Start(stopCh <-chan struct{})
+
+	// Shutdown marks a factory as shutting down. At that point no new
+	// informers can be started anymore and Start will return without
+	// doing anything.
+	//
+	// In addition, Shutdown blocks until all goroutines have terminated. For that
+	// to happen, the close channel(s) that they were started with must be closed,
+	// either before Shutdown gets called or while it is waiting.
+	//
+	// Shutdown may be called multiple times, even concurrently. All such calls will
+	// block until all goroutines have terminated.
+	Shutdown()
+
+	// WaitForCacheSync blocks until all started informers' caches were synced
+	// or the stop channel gets closed.
+	WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool
+
+	// ForResource gives generic access to a shared informer of the matching type.
+	ForResource(resource schema.GroupVersionResource) (GenericInformer, error)
+
+	// InformerFor returns the SharedIndexInformer for obj using an internal
+	// client.
+	InformerFor(obj runtime.Object, newFunc internalinterfaces.NewInformerFunc) cache.SharedIndexInformer
+
+	Service() service.Interface
+}
+
+func (f *sharedInformerFactory) Service() service.Interface {
+	return service.New(f, f.namespace, f.tweakListOptions)
+}
diff --git a/pkg/generated/informers/externalversions/generic.go b/pkg/generated/informers/externalversions/generic.go
new file mode 100644
index 0000000000000..88cc30aa0f99a
--- /dev/null
+++ b/pkg/generated/informers/externalversions/generic.go
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by informer-gen. DO NOT EDIT.
+
+package externalversions
+
+import (
+	"fmt"
+
+	v0alpha1 "github.com/grafana/grafana/pkg/apis/service/v0alpha1"
+	schema "k8s.io/apimachinery/pkg/runtime/schema"
+	cache "k8s.io/client-go/tools/cache"
+)
+
+// GenericInformer is type of SharedIndexInformer which will locate and delegate to other
+// sharedInformers based on type
+type GenericInformer interface {
+	Informer() cache.SharedIndexInformer
+	Lister() cache.GenericLister
+}
+
+type genericInformer struct {
+	informer cache.SharedIndexInformer
+	resource schema.GroupResource
+}
+
+// Informer returns the SharedIndexInformer.
+func (f *genericInformer) Informer() cache.SharedIndexInformer {
+	return f.informer
+}
+
+// Lister returns the GenericLister.
+func (f *genericInformer) Lister() cache.GenericLister {
+	return cache.NewGenericLister(f.Informer().GetIndexer(), f.resource)
+}
+
+// ForResource gives generic access to a shared informer of the matching type
+// TODO extend this to unknown resources with a client pool
+func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) {
+	switch resource {
+	// Group=service.grafana.app, Version=v0alpha1
+	case v0alpha1.SchemeGroupVersion.WithResource("externalnames"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Service().V0alpha1().ExternalNames().Informer()}, nil
+
+	}
+
+	return nil, fmt.Errorf("no informer found for %v", resource)
+}
diff --git a/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go
new file mode 100644
index 0000000000000..1d8997bbea3d7
--- /dev/null
+++ b/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by informer-gen. DO NOT EDIT.
+
+package internalinterfaces
+
+import (
+	time "time"
+
+	versioned "github.com/grafana/grafana/pkg/generated/clientset/versioned"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	runtime "k8s.io/apimachinery/pkg/runtime"
+	cache "k8s.io/client-go/tools/cache"
+)
+
+// NewInformerFunc takes versioned.Interface and time.Duration to return a SharedIndexInformer.
+type NewInformerFunc func(versioned.Interface, time.Duration) cache.SharedIndexInformer
+
+// SharedInformerFactory a small interface to allow for adding an informer without an import cycle
+type SharedInformerFactory interface {
+	Start(stopCh <-chan struct{})
+	InformerFor(obj runtime.Object, newFunc NewInformerFunc) cache.SharedIndexInformer
+}
+
+// TweakListOptionsFunc is a function that transforms a v1.ListOptions.
+type TweakListOptionsFunc func(*v1.ListOptions)
diff --git a/pkg/generated/informers/externalversions/service/interface.go b/pkg/generated/informers/externalversions/service/interface.go
new file mode 100644
index 0000000000000..95b68423c3217
--- /dev/null
+++ b/pkg/generated/informers/externalversions/service/interface.go
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by informer-gen. DO NOT EDIT.
+
+package service
+
+import (
+	internalinterfaces "github.com/grafana/grafana/pkg/generated/informers/externalversions/internalinterfaces"
+	v0alpha1 "github.com/grafana/grafana/pkg/generated/informers/externalversions/service/v0alpha1"
+)
+
+// Interface provides access to each of this group's versions.
+type Interface interface {
+	// V0alpha1 provides access to shared informers for resources in V0alpha1.
+	V0alpha1() v0alpha1.Interface
+}
+
+type group struct {
+	factory          internalinterfaces.SharedInformerFactory
+	namespace        string
+	tweakListOptions internalinterfaces.TweakListOptionsFunc
+}
+
+// New returns a new Interface.
+func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface {
+	return &group{factory: f, namespace: namespace, tweakListOptions: tweakListOptions}
+}
+
+// V0alpha1 returns a new v0alpha1.Interface.
+func (g *group) V0alpha1() v0alpha1.Interface {
+	return v0alpha1.New(g.factory, g.namespace, g.tweakListOptions)
+}
diff --git a/pkg/generated/informers/externalversions/service/v0alpha1/externalname.go b/pkg/generated/informers/externalversions/service/v0alpha1/externalname.go
new file mode 100644
index 0000000000000..62a5a89d1cea8
--- /dev/null
+++ b/pkg/generated/informers/externalversions/service/v0alpha1/externalname.go
@@ -0,0 +1,76 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by informer-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	"context"
+	time "time"
+
+	servicev0alpha1 "github.com/grafana/grafana/pkg/apis/service/v0alpha1"
+	versioned "github.com/grafana/grafana/pkg/generated/clientset/versioned"
+	internalinterfaces "github.com/grafana/grafana/pkg/generated/informers/externalversions/internalinterfaces"
+	v0alpha1 "github.com/grafana/grafana/pkg/generated/listers/service/v0alpha1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	runtime "k8s.io/apimachinery/pkg/runtime"
+	watch "k8s.io/apimachinery/pkg/watch"
+	cache "k8s.io/client-go/tools/cache"
+)
+
+// ExternalNameInformer provides access to a shared informer and lister for
+// ExternalNames.
+type ExternalNameInformer interface {
+	Informer() cache.SharedIndexInformer
+	Lister() v0alpha1.ExternalNameLister
+}
+
+type externalNameInformer struct {
+	factory          internalinterfaces.SharedInformerFactory
+	tweakListOptions internalinterfaces.TweakListOptionsFunc
+	namespace        string
+}
+
+// NewExternalNameInformer constructs a new informer for ExternalName type.
+// Always prefer using an informer factory to get a shared informer instead of getting an independent
+// one. This reduces memory footprint and number of connections to the server.
+func NewExternalNameInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer {
+	return NewFilteredExternalNameInformer(client, namespace, resyncPeriod, indexers, nil)
+}
+
+// NewFilteredExternalNameInformer constructs a new informer for ExternalName type.
+// Always prefer using an informer factory to get a shared informer instead of getting an independent
+// one. This reduces memory footprint and number of connections to the server.
+func NewFilteredExternalNameInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
+	return cache.NewSharedIndexInformer(
+		&cache.ListWatch{
+			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
+				if tweakListOptions != nil {
+					tweakListOptions(&options)
+				}
+				return client.ServiceV0alpha1().ExternalNames(namespace).List(context.TODO(), options)
+			},
+			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
+				if tweakListOptions != nil {
+					tweakListOptions(&options)
+				}
+				return client.ServiceV0alpha1().ExternalNames(namespace).Watch(context.TODO(), options)
+			},
+		},
+		&servicev0alpha1.ExternalName{},
+		resyncPeriod,
+		indexers,
+	)
+}
+
+func (f *externalNameInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
+	return NewFilteredExternalNameInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions)
+}
+
+func (f *externalNameInformer) Informer() cache.SharedIndexInformer {
+	return f.factory.InformerFor(&servicev0alpha1.ExternalName{}, f.defaultInformer)
+}
+
+func (f *externalNameInformer) Lister() v0alpha1.ExternalNameLister {
+	return v0alpha1.NewExternalNameLister(f.Informer().GetIndexer())
+}
diff --git a/pkg/generated/informers/externalversions/service/v0alpha1/interface.go b/pkg/generated/informers/externalversions/service/v0alpha1/interface.go
new file mode 100644
index 0000000000000..c073cfb9eb9f4
--- /dev/null
+++ b/pkg/generated/informers/externalversions/service/v0alpha1/interface.go
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by informer-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	internalinterfaces "github.com/grafana/grafana/pkg/generated/informers/externalversions/internalinterfaces"
+)
+
+// Interface provides access to all the informers in this group version.
+type Interface interface {
+	// ExternalNames returns a ExternalNameInformer.
+	ExternalNames() ExternalNameInformer
+}
+
+type version struct {
+	factory          internalinterfaces.SharedInformerFactory
+	namespace        string
+	tweakListOptions internalinterfaces.TweakListOptionsFunc
+}
+
+// New returns a new Interface.
+func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface {
+	return &version{factory: f, namespace: namespace, tweakListOptions: tweakListOptions}
+}
+
+// ExternalNames returns a ExternalNameInformer.
+func (v *version) ExternalNames() ExternalNameInformer {
+	return &externalNameInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions}
+}
diff --git a/pkg/generated/listers/service/v0alpha1/expansion_generated.go b/pkg/generated/listers/service/v0alpha1/expansion_generated.go
new file mode 100644
index 0000000000000..78f522df55960
--- /dev/null
+++ b/pkg/generated/listers/service/v0alpha1/expansion_generated.go
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by lister-gen. DO NOT EDIT.
+
+package v0alpha1
+
+// ExternalNameListerExpansion allows custom methods to be added to
+// ExternalNameLister.
+type ExternalNameListerExpansion interface{}
+
+// ExternalNameNamespaceListerExpansion allows custom methods to be added to
+// ExternalNameNamespaceLister.
+type ExternalNameNamespaceListerExpansion interface{}
diff --git a/pkg/generated/listers/service/v0alpha1/externalname.go b/pkg/generated/listers/service/v0alpha1/externalname.go
new file mode 100644
index 0000000000000..89cc8e425f441
--- /dev/null
+++ b/pkg/generated/listers/service/v0alpha1/externalname.go
@@ -0,0 +1,85 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by lister-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	v0alpha1 "github.com/grafana/grafana/pkg/apis/service/v0alpha1"
+	"k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/client-go/tools/cache"
+)
+
+// ExternalNameLister helps list ExternalNames.
+// All objects returned here must be treated as read-only.
+type ExternalNameLister interface {
+	// List lists all ExternalNames in the indexer.
+	// Objects returned here must be treated as read-only.
+	List(selector labels.Selector) (ret []*v0alpha1.ExternalName, err error)
+	// ExternalNames returns an object that can list and get ExternalNames.
+	ExternalNames(namespace string) ExternalNameNamespaceLister
+	ExternalNameListerExpansion
+}
+
+// externalNameLister implements the ExternalNameLister interface.
+type externalNameLister struct {
+	indexer cache.Indexer
+}
+
+// NewExternalNameLister returns a new ExternalNameLister.
+func NewExternalNameLister(indexer cache.Indexer) ExternalNameLister {
+	return &externalNameLister{indexer: indexer}
+}
+
+// List lists all ExternalNames in the indexer.
+func (s *externalNameLister) List(selector labels.Selector) (ret []*v0alpha1.ExternalName, err error) {
+	err = cache.ListAll(s.indexer, selector, func(m interface{}) {
+		ret = append(ret, m.(*v0alpha1.ExternalName))
+	})
+	return ret, err
+}
+
+// ExternalNames returns an object that can list and get ExternalNames.
+func (s *externalNameLister) ExternalNames(namespace string) ExternalNameNamespaceLister {
+	return externalNameNamespaceLister{indexer: s.indexer, namespace: namespace}
+}
+
+// ExternalNameNamespaceLister helps list and get ExternalNames.
+// All objects returned here must be treated as read-only.
+type ExternalNameNamespaceLister interface {
+	// List lists all ExternalNames in the indexer for a given namespace.
+	// Objects returned here must be treated as read-only.
+	List(selector labels.Selector) (ret []*v0alpha1.ExternalName, err error)
+	// Get retrieves the ExternalName from the indexer for a given namespace and name.
+	// Objects returned here must be treated as read-only.
+	Get(name string) (*v0alpha1.ExternalName, error)
+	ExternalNameNamespaceListerExpansion
+}
+
+// externalNameNamespaceLister implements the ExternalNameNamespaceLister
+// interface.
+type externalNameNamespaceLister struct {
+	indexer   cache.Indexer
+	namespace string
+}
+
+// List lists all ExternalNames in the indexer for a given namespace.
+func (s externalNameNamespaceLister) List(selector labels.Selector) (ret []*v0alpha1.ExternalName, err error) {
+	err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) {
+		ret = append(ret, m.(*v0alpha1.ExternalName))
+	})
+	return ret, err
+}
+
+// Get retrieves the ExternalName from the indexer for a given namespace and name.
+func (s externalNameNamespaceLister) Get(name string) (*v0alpha1.ExternalName, error) {
+	obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name)
+	if err != nil {
+		return nil, err
+	}
+	if !exists {
+		return nil, errors.NewNotFound(v0alpha1.Resource("externalname"), name)
+	}
+	return obj.(*v0alpha1.ExternalName), nil
+}
diff --git a/pkg/infra/appcontext/user.go b/pkg/infra/appcontext/user.go
index d2bd57aa000f7..d68071006de01 100644
--- a/pkg/infra/appcontext/user.go
+++ b/pkg/infra/appcontext/user.go
@@ -4,8 +4,13 @@ import (
 	"context"
 	"fmt"
 
+	k8suser "k8s.io/apiserver/pkg/authentication/user"
+	"k8s.io/apiserver/pkg/endpoints/request"
+
+	"github.com/grafana/grafana/pkg/models/roletype"
 	"github.com/grafana/grafana/pkg/services/contexthandler/ctxkey"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 	grpccontext "github.com/grafana/grafana/pkg/services/grpcserver/context"
 	"github.com/grafana/grafana/pkg/services/user"
 )
@@ -38,6 +43,40 @@ func User(ctx context.Context) (*user.SignedInUser, error) {
 		return c.SignedInUser, nil
 	}
 
+	// Find the kubernetes user info
+	k8sUserInfo, ok := request.UserFrom(ctx)
+	if ok {
+		for _, group := range k8sUserInfo.GetGroups() {
+			switch group {
+			case k8suser.APIServerUser:
+				fallthrough
+			case k8suser.SystemPrivilegedGroup:
+				orgId := int64(1)
+				return &user.SignedInUser{
+					UserID:         1,
+					OrgID:          orgId,
+					Name:           k8sUserInfo.GetName(),
+					Login:          k8sUserInfo.GetName(),
+					OrgRole:        roletype.RoleAdmin,
+					IsGrafanaAdmin: true,
+					Permissions: map[int64]map[string][]string{
+						orgId: {
+							"*": {"*"}, // all resources, all scopes
+
+							// Dashboards do not support wildcard action
+							dashboards.ActionDashboardsRead:   {"*"},
+							dashboards.ActionDashboardsCreate: {"*"},
+							dashboards.ActionDashboardsWrite:  {"*"},
+							dashboards.ActionDashboardsDelete: {"*"},
+							dashboards.ActionFoldersCreate:    {"*"},
+							dashboards.ActionFoldersRead:      {dashboards.ScopeFoldersAll}, // access to read all folders
+						},
+					},
+				}, nil
+			}
+		}
+	}
+
 	return nil, fmt.Errorf("a SignedInUser was not found in the context")
 }
 
diff --git a/pkg/infra/db/db.go b/pkg/infra/db/db.go
index c921a6499c1a2..08cea4a761fb9 100644
--- a/pkg/infra/db/db.go
+++ b/pkg/infra/db/db.go
@@ -5,10 +5,13 @@ import (
 	"os"
 
 	"xorm.io/core"
+	"xorm.io/xorm"
 
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 	"github.com/grafana/grafana/pkg/services/sqlstore/session"
+	"github.com/grafana/grafana/pkg/services/sqlstore/sqlutil"
+	"github.com/grafana/grafana/pkg/setting"
 )
 
 type DB interface {
@@ -29,8 +32,13 @@ type DB interface {
 	GetDialect() migrator.Dialect
 	// GetDBType returns the name of the database type available to the runtime.
 	GetDBType() core.DbType
+	// GetEngine returns the underlying xorm engine.
+	GetEngine() *xorm.Engine
 	// GetSqlxSession is an experimental extension to use sqlx instead of xorm to
 	// communicate with the database.
+	// NOTE: when using this session with mysql, the connection will *not* have:
+	// the expected parameters: "&sql_mode='ANSI_QUOTES" and "&parseTime=true"
+	// The sqlx session is useful, but be careful not to expect automagic date parsing
 	GetSqlxSession() *session.SessionDB
 	// InTransaction creates a new SQL transaction that is placed on the context.
 	// Use together with [DB.WithDbSession] to run database operations.
@@ -45,10 +53,16 @@ type DB interface {
 type Session = sqlstore.DBSession
 type InitTestDBOpt = sqlstore.InitTestDBOpt
 
+var SetupTestDB = sqlstore.SetupTestDB
 var InitTestDB = sqlstore.InitTestDB
-var InitTestDBwithCfg = sqlstore.InitTestDBWithCfg
+var CleanupTestDB = sqlstore.CleanupTestDB
 var ProvideService = sqlstore.ProvideService
 
+func InitTestDBwithCfg(t sqlutil.ITestDB, opts ...InitTestDBOpt) (*sqlstore.SQLStore, *setting.Cfg) {
+	store := InitTestDB(t, opts...)
+	return store, store.Cfg
+}
+
 func IsTestDbSQLite() bool {
 	if db, present := os.LookupEnv("GRAFANA_TEST_DB"); !present || db == "sqlite" {
 		return true
diff --git a/pkg/infra/db/dbtest/dbtest.go b/pkg/infra/db/dbtest/dbtest.go
index d3c7afeb68490..7aa4c098b865c 100644
--- a/pkg/infra/db/dbtest/dbtest.go
+++ b/pkg/infra/db/dbtest/dbtest.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"xorm.io/core"
+	"xorm.io/xorm"
 
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
@@ -43,6 +44,10 @@ func (f *FakeDB) GetDialect() migrator.Dialect {
 	return nil
 }
 
+func (f *FakeDB) GetEngine() *xorm.Engine {
+	return nil
+}
+
 func (f *FakeDB) GetSqlxSession() *session.SessionDB {
 	return nil
 }
diff --git a/pkg/infra/db/sqlbuilder.go b/pkg/infra/db/sqlbuilder.go
index d3b3fd15ff9cb..b6d88a378796a 100644
--- a/pkg/infra/db/sqlbuilder.go
+++ b/pkg/infra/db/sqlbuilder.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 
 	"github.com/grafana/grafana/pkg/services/auth/identity"
-	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 	"github.com/grafana/grafana/pkg/services/sqlstore/permissions"
@@ -63,7 +63,7 @@ func (sb *SQLBuilder) AddParams(params ...any) {
 	sb.params = append(sb.params, params...)
 }
 
-func (sb *SQLBuilder) WriteDashboardPermissionFilter(user identity.Requester, permission dashboards.PermissionType, queryType string) {
+func (sb *SQLBuilder) WriteDashboardPermissionFilter(user identity.Requester, permission dashboardaccess.PermissionType, queryType string) {
 	var (
 		sql          string
 		params       []any
diff --git a/pkg/infra/filestorage/api.go b/pkg/infra/filestorage/api.go
index 184881a5b7df0..775e8686dd30e 100644
--- a/pkg/infra/filestorage/api.go
+++ b/pkg/infra/filestorage/api.go
@@ -93,8 +93,10 @@ type FileMetadata struct {
 }
 
 type Paging struct {
+	// The number of items to return
+	Limit int
+	// Starting after the key
 	After string
-	First int
 }
 
 type UpsertFileCommand struct {
diff --git a/pkg/infra/filestorage/cdk_blob_filestorage.go b/pkg/infra/filestorage/cdk_blob_filestorage.go
index b3c14bb5305a4..81c76c629be00 100644
--- a/pkg/infra/filestorage/cdk_blob_filestorage.go
+++ b/pkg/infra/filestorage/cdk_blob_filestorage.go
@@ -292,7 +292,7 @@ func (c cdkBlobStorage) list(ctx context.Context, folderPath string, paging *Pag
 	})}
 
 	recursive := options.Recursive
-	pageSize := paging.First
+	pageSize := paging.Limit
 
 	foundCursor := true
 	if paging.After != "" {
diff --git a/pkg/infra/filestorage/db_filestorage.go b/pkg/infra/filestorage/db_filestorage.go
index 50d0ffddde4fd..47cb64e427349 100644
--- a/pkg/infra/filestorage/db_filestorage.go
+++ b/pkg/infra/filestorage/db_filestorage.go
@@ -345,7 +345,7 @@ func (s dbFileStorage) List(ctx context.Context, folderPath string, paging *Pagi
 
 		sess.OrderBy("path")
 
-		pageSize := paging.First
+		pageSize := paging.Limit
 		sess.Limit(pageSize + 1)
 
 		if cursor != "" {
diff --git a/pkg/infra/filestorage/fs_integration_test.go b/pkg/infra/filestorage/fs_integration_test.go
index 6cecfe89a9df9..13d74b5de35df 100644
--- a/pkg/infra/filestorage/fs_integration_test.go
+++ b/pkg/infra/filestorage/fs_integration_test.go
@@ -12,12 +12,17 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
 const (
 	pngImageBase64 = "iVBORw0KGgoNAANSUhEUgAAAC4AAAAmCAYAAAC76qlaAAAABHNCSVQICAgIfAhkiAAAABl0RVh0U29mdHdhcmUAZ25vbWUtc2NyZWVuc2hvdO8Dvz4AAABFSURBVFiF7c5BDQAhEACx4/x7XjzwGELSKuiamfke9N8OnBKvidfEa+I18Zp4TbwmXhOvidfEa+I18Zp4TbwmXhOvidc2lcsESD1LGnUAAAAASUVORK5CYII="
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 type fsTestCase struct {
 	name  string
 	skip  *bool
@@ -467,7 +472,7 @@ func TestIntegrationFsStorage(t *testing.T) {
 						},
 					},
 					queryListFiles{
-						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true}, paging: &Paging{First: 2, After: ""}},
+						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true}, paging: &Paging{Limit: 2, After: ""}},
 						list:  checks(listSize(2), listHasMore(true), listLastPath("/folder1/b")),
 						files: [][]any{
 							checks(fPath("/folder1/a")),
@@ -475,7 +480,7 @@ func TestIntegrationFsStorage(t *testing.T) {
 						},
 					},
 					queryListFiles{
-						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true, WithFiles: true, WithFolders: true}, paging: &Paging{First: 2, After: ""}},
+						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true, WithFiles: true, WithFolders: true}, paging: &Paging{Limit: 2, After: ""}},
 						list:  checks(listSize(2), listHasMore(true), listLastPath("/folder1/a")),
 						files: [][]any{
 							checks(fPath("/folder1"), fMimeType(DirectoryMimeType)),
@@ -483,49 +488,49 @@ func TestIntegrationFsStorage(t *testing.T) {
 						},
 					},
 					queryListFiles{
-						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true, WithFiles: true, WithFolders: true}, paging: &Paging{First: 1, After: "/folder1"}},
+						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true, WithFiles: true, WithFolders: true}, paging: &Paging{Limit: 1, After: "/folder1"}},
 						list:  checks(listSize(1), listHasMore(true), listLastPath("/folder1/a")),
 						files: [][]any{
 							checks(fPath("/folder1/a")),
 						},
 					},
 					queryListFiles{
-						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true}, paging: &Paging{First: 1, After: "/folder1/a"}},
+						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true}, paging: &Paging{Limit: 1, After: "/folder1/a"}},
 						list:  checks(listSize(1), listHasMore(true), listLastPath("/folder1/b")),
 						files: [][]any{
 							checks(fPath("/folder1/b")),
 						},
 					},
 					queryListFiles{
-						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true, WithFiles: true, WithFolders: true}, paging: &Paging{First: 1, After: "/folder1/a"}},
+						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true, WithFiles: true, WithFolders: true}, paging: &Paging{Limit: 1, After: "/folder1/a"}},
 						list:  checks(listSize(1), listHasMore(true), listLastPath("/folder1/b")),
 						files: [][]any{
 							checks(fPath("/folder1/b")),
 						},
 					},
 					queryListFiles{
-						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true}, paging: &Paging{First: 1, After: "/folder1/b"}},
+						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true}, paging: &Paging{Limit: 1, After: "/folder1/b"}},
 						list:  checks(listSize(1), listHasMore(false), listLastPath("/folder2/c")),
 						files: [][]any{
 							checks(fPath("/folder2/c")),
 						},
 					},
 					queryListFiles{
-						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true, WithFiles: true, WithFolders: true}, paging: &Paging{First: 1, After: "/folder1/b"}},
+						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true, WithFiles: true, WithFolders: true}, paging: &Paging{Limit: 1, After: "/folder1/b"}},
 						list:  checks(listSize(1), listHasMore(true), listLastPath("/folder2")),
 						files: [][]any{
 							checks(fPath("/folder2"), fMimeType(DirectoryMimeType)),
 						},
 					},
 					queryListFiles{
-						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true, WithFiles: true, WithFolders: true}, paging: &Paging{First: 1, After: "/folder2"}},
+						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true, WithFiles: true, WithFolders: true}, paging: &Paging{Limit: 1, After: "/folder2"}},
 						list:  checks(listSize(1), listHasMore(false), listLastPath("/folder2/c")),
 						files: [][]any{
 							checks(fPath("/folder2/c")),
 						},
 					},
 					queryListFiles{
-						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true}, paging: &Paging{First: 5, After: ""}},
+						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true}, paging: &Paging{Limit: 5, After: ""}},
 						list:  checks(listSize(3), listHasMore(false), listLastPath("/folder2/c")),
 						files: [][]any{
 							checks(fPath("/folder1/a")),
@@ -534,7 +539,7 @@ func TestIntegrationFsStorage(t *testing.T) {
 						},
 					},
 					queryListFiles{
-						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true, WithFiles: true, WithFolders: true}, paging: &Paging{First: 5, After: ""}},
+						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true, WithFiles: true, WithFolders: true}, paging: &Paging{Limit: 5, After: ""}},
 						list:  checks(listSize(5), listHasMore(false), listLastPath("/folder2/c")),
 						files: [][]any{
 							checks(fPath("/folder1"), fMimeType(DirectoryMimeType)),
@@ -545,19 +550,19 @@ func TestIntegrationFsStorage(t *testing.T) {
 						},
 					},
 					queryListFiles{
-						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true}, paging: &Paging{First: 5, After: "/folder2"}},
+						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true}, paging: &Paging{Limit: 5, After: "/folder2"}},
 						list:  checks(listSize(1), listHasMore(false)),
 					},
 					queryListFiles{
-						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true, WithFiles: true, WithFolders: true}, paging: &Paging{First: 5, After: "/folder2"}},
+						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true, WithFiles: true, WithFolders: true}, paging: &Paging{Limit: 5, After: "/folder2"}},
 						list:  checks(listSize(1), listHasMore(false)),
 					},
 					queryListFiles{
-						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true}, paging: &Paging{First: 5, After: "/folder2/c"}},
+						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true}, paging: &Paging{Limit: 5, After: "/folder2/c"}},
 						list:  checks(listSize(0), listHasMore(false)),
 					},
 					queryListFiles{
-						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true, WithFiles: true, WithFolders: true}, paging: &Paging{First: 5, After: "/folder2/c"}},
+						input: queryListFilesInput{path: "/", options: &ListOptions{Recursive: true, WithFiles: true, WithFolders: true}, paging: &Paging{Limit: 5, After: "/folder2/c"}},
 						list:  checks(listSize(0), listHasMore(false)),
 					},
 				},
diff --git a/pkg/infra/filestorage/test_utils.go b/pkg/infra/filestorage/test_utils.go
index f63cba35caf13..0445807a094ae 100644
--- a/pkg/infra/filestorage/test_utils.go
+++ b/pkg/infra/filestorage/test_utils.go
@@ -321,7 +321,7 @@ func handleQuery(t *testing.T, ctx context.Context, query interface{}, queryName
 		}
 		resp, err := fs.List(ctx, inputPath, &Paging{
 			After: "",
-			First: 100000,
+			Limit: 100000,
 		}, opts)
 		require.NotNil(t, resp)
 		require.NoError(t, err, "%s: should be able to list folders in %s", queryName, inputPath)
diff --git a/pkg/infra/filestorage/wrapper.go b/pkg/infra/filestorage/wrapper.go
index 62ddef6c0fbf5..aa236d9cbe5a4 100644
--- a/pkg/infra/filestorage/wrapper.go
+++ b/pkg/infra/filestorage/wrapper.go
@@ -200,12 +200,12 @@ func (b wrapper) Upsert(ctx context.Context, file *UpsertFileCommand) error {
 func (b wrapper) pagingOptionsWithDefaults(paging *Paging) *Paging {
 	if paging == nil {
 		return &Paging{
-			First: 100,
+			Limit: 100,
 		}
 	}
 
-	if paging.First <= 0 {
-		paging.First = 100
+	if paging.Limit <= 0 {
+		paging.Limit = 100
 	}
 	if paging.After != "" {
 		paging.After = b.addRoot(paging.After)
@@ -381,7 +381,7 @@ func (b wrapper) List(ctx context.Context, folderPath string, paging *Paging, op
 }
 
 func (b wrapper) isFolderEmpty(ctx context.Context, path string) (bool, error) {
-	resp, err := b.List(ctx, path, &Paging{First: 1}, &ListOptions{Recursive: true, WithFolders: true, WithFiles: true})
+	resp, err := b.List(ctx, path, &Paging{Limit: 1}, &ListOptions{Recursive: true, WithFolders: true, WithFiles: true})
 	if err != nil {
 		return false, err
 	}
diff --git a/pkg/infra/grn/doc.go b/pkg/infra/grn/doc.go
deleted file mode 100644
index d6f6ef834e14f..0000000000000
--- a/pkg/infra/grn/doc.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// package GRN provides utilities for working with Grafana Resource Names
-// (GRNs).
-
-// A GRN is an identifier which encodes all data necessary to retrieve a given
-// resource from its respective service.
-
-// A GRN string is expressed in the format:
-//
-//	grn:${tenant_id}:${kind}/${id}
-//
-// The format of the final id is defined by the owning service and not
-// validated by the GRN parser. Prefer using UIDs where possible.
-package grn
diff --git a/pkg/infra/grn/errors.go b/pkg/infra/grn/errors.go
deleted file mode 100644
index 3fe17a7306c86..0000000000000
--- a/pkg/infra/grn/errors.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package grn
-
-import (
-	"github.com/grafana/grafana/pkg/util/errutil"
-)
-
-var (
-	ErrInvalidGRN = errutil.ValidationFailed("grn.InvalidGRN")
-)
diff --git a/pkg/infra/grn/generate.sh b/pkg/infra/grn/generate.sh
deleted file mode 100755
index 849ac461b54bc..0000000000000
--- a/pkg/infra/grn/generate.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-# To compile all protobuf files in this repository, run
-# "make protobuf" at the top-level.
-
-set -eu
-
-DST_DIR=./
-
-SOURCE="${BASH_SOURCE[0]}"
-while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
-DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-
-cd "$DIR"
-
-protoc \
-  -I ./ \
-  -I ../../../ \
-  --go_out=${DST_DIR} \
-  --go_opt=paths=source_relative \
-  --go-grpc_out=${DST_DIR} \
-  --go-grpc_opt=paths=source_relative \
-  --go-grpc_opt=require_unimplemented_servers=false \
-  *.proto
diff --git a/pkg/infra/grn/grn.go b/pkg/infra/grn/grn.go
deleted file mode 100644
index a2d2cfb8f6b41..0000000000000
--- a/pkg/infra/grn/grn.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package grn
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-)
-
-// ParseStr attempts to parse a string into a GRN. It returns an error if the
-// given string does not match the GRN format, but does not validate the values.
-func ParseStr(str string) (*GRN, error) {
-	ret := &GRN{}
-	parts := strings.Split(str, ":")
-
-	if len(parts) != 3 {
-		return ret, ErrInvalidGRN.Errorf("%q is not a complete GRN", str)
-	}
-
-	if parts[0] != "grn" {
-		return ret, ErrInvalidGRN.Errorf("%q does not look like a GRN", str)
-	}
-
-	// split the final segment into Kind and ID. This only splits after the
-	// first occurrence of "/"; a ResourceIdentifier may contain "/"
-	kind, id, found := strings.Cut(parts[2], "/")
-	if !found { // missing "/"
-		return ret, ErrInvalidGRN.Errorf("invalid resource identifier in GRN %q", str)
-	}
-	ret.ResourceIdentifier = id
-	ret.ResourceKind = kind
-
-	if parts[1] != "" {
-		tID, err := strconv.ParseInt(parts[1], 10, 64)
-		if err != nil {
-			return ret, ErrInvalidGRN.Errorf("ID segment cannot be converted to an integer")
-		} else {
-			ret.TenantID = tID
-		}
-	}
-
-	return ret, nil
-}
-
-// MustParseStr is a wrapper around ParseStr that panics if the given input is
-// not a valid GRN. This is intended for use in tests.
-func MustParseStr(str string) *GRN {
-	grn, err := ParseStr(str)
-	if err != nil {
-		panic("bad grn!")
-	}
-	return grn
-}
-
-// ToGRNString returns a string representation of a grn in the format
-// grn:tenantID:kind/resourceIdentifier
-func (g *GRN) ToGRNString() string {
-	return fmt.Sprintf("grn:%d:%s/%s", g.TenantID, g.ResourceKind, g.ResourceIdentifier)
-}
-
-// Check if the two GRNs reference to the same object
-// we can not use simple `*x == *b` because of the internal settings
-func (g *GRN) Equal(b *GRN) bool {
-	if b == nil {
-		return false
-	}
-	return g == b || (g.TenantID == b.TenantID &&
-		g.ResourceKind == b.ResourceKind &&
-		g.ResourceIdentifier == b.ResourceIdentifier)
-}
diff --git a/pkg/infra/grn/grn.pb.go b/pkg/infra/grn/grn.pb.go
deleted file mode 100644
index bc551198897e6..0000000000000
--- a/pkg/infra/grn/grn.pb.go
+++ /dev/null
@@ -1,172 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        v4.23.4
-// source: grn.proto
-
-package grn
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type GRN struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// TenantID contains the ID of the tenant (in hosted grafana) or
-	// organization (in other environments) the resource belongs to. This field
-	// may be omitted for global Grafana resources which are not associated with
-	// an organization.
-	TenantID int64 `protobuf:"varint,1,opt,name=TenantID,proto3" json:"TenantID,omitempty"`
-	// The kind of resource being identified, for e.g. "dashboard" or "user".
-	// The caller is responsible for validating the value.
-	ResourceKind string `protobuf:"bytes,3,opt,name=ResourceKind,proto3" json:"ResourceKind,omitempty"`
-	// ResourceIdentifier is used by the underlying service to identify the
-	// resource.
-	ResourceIdentifier string `protobuf:"bytes,4,opt,name=ResourceIdentifier,proto3" json:"ResourceIdentifier,omitempty"`
-}
-
-func (x *GRN) Reset() {
-	*x = GRN{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_grn_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GRN) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GRN) ProtoMessage() {}
-
-func (x *GRN) ProtoReflect() protoreflect.Message {
-	mi := &file_grn_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GRN.ProtoReflect.Descriptor instead.
-func (*GRN) Descriptor() ([]byte, []int) {
-	return file_grn_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *GRN) GetTenantID() int64 {
-	if x != nil {
-		return x.TenantID
-	}
-	return 0
-}
-
-func (x *GRN) GetResourceKind() string {
-	if x != nil {
-		return x.ResourceKind
-	}
-	return ""
-}
-
-func (x *GRN) GetResourceIdentifier() string {
-	if x != nil {
-		return x.ResourceIdentifier
-	}
-	return ""
-}
-
-var File_grn_proto protoreflect.FileDescriptor
-
-var file_grn_proto_rawDesc = []byte{
-	0x0a, 0x09, 0x67, 0x72, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, 0x67, 0x72, 0x6e,
-	0x22, 0x75, 0x0a, 0x03, 0x47, 0x52, 0x4e, 0x12, 0x1a, 0x0a, 0x08, 0x54, 0x65, 0x6e, 0x61, 0x6e,
-	0x74, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x54, 0x65, 0x6e, 0x61, 0x6e,
-	0x74, 0x49, 0x44, 0x12, 0x22, 0x0a, 0x0c, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4b,
-	0x69, 0x6e, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x52, 0x65, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x4b, 0x69, 0x6e, 0x64, 0x12, 0x2e, 0x0a, 0x12, 0x52, 0x65, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x12, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x65,
-	0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x42, 0x2a, 0x5a, 0x28, 0x67, 0x69, 0x74, 0x68, 0x75,
-	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x72, 0x61, 0x66, 0x61, 0x6e, 0x61, 0x2f, 0x67, 0x72,
-	0x61, 0x66, 0x61, 0x6e, 0x61, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x69, 0x6e, 0x66, 0x72, 0x61, 0x2f,
-	0x67, 0x72, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_grn_proto_rawDescOnce sync.Once
-	file_grn_proto_rawDescData = file_grn_proto_rawDesc
-)
-
-func file_grn_proto_rawDescGZIP() []byte {
-	file_grn_proto_rawDescOnce.Do(func() {
-		file_grn_proto_rawDescData = protoimpl.X.CompressGZIP(file_grn_proto_rawDescData)
-	})
-	return file_grn_proto_rawDescData
-}
-
-var file_grn_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_grn_proto_goTypes = []interface{}{
-	(*GRN)(nil), // 0: grn.GRN
-}
-var file_grn_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_grn_proto_init() }
-func file_grn_proto_init() {
-	if File_grn_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_grn_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GRN); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_grn_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_grn_proto_goTypes,
-		DependencyIndexes: file_grn_proto_depIdxs,
-		MessageInfos:      file_grn_proto_msgTypes,
-	}.Build()
-	File_grn_proto = out.File
-	file_grn_proto_rawDesc = nil
-	file_grn_proto_goTypes = nil
-	file_grn_proto_depIdxs = nil
-}
diff --git a/pkg/infra/grn/grn.proto b/pkg/infra/grn/grn.proto
deleted file mode 100644
index 45a8bce4ffc85..0000000000000
--- a/pkg/infra/grn/grn.proto
+++ /dev/null
@@ -1,20 +0,0 @@
-syntax = "proto3";
-package grn;
-
-option go_package = "github.com/grafana/grafana/pkg/infra/grn";
-
-message GRN {
-	// TenantID contains the ID of the tenant (in hosted grafana) or
-	// organization (in other environments) the resource belongs to. This field
-	// may be omitted for global Grafana resources which are not associated with
-	// an organization.
-	int64 TenantID = 1;
-
-	// The kind of resource being identified, for e.g. "dashboard" or "user".
-	// The caller is responsible for validating the value.
-	string ResourceKind = 3;
-
-	// ResourceIdentifier is used by the underlying service to identify the
-	// resource.
-	string ResourceIdentifier = 4;
-}
diff --git a/pkg/infra/grn/grn_test.go b/pkg/infra/grn/grn_test.go
deleted file mode 100644
index a9be304083d58..0000000000000
--- a/pkg/infra/grn/grn_test.go
+++ /dev/null
@@ -1,79 +0,0 @@
-package grn
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-)
-
-func TestParseGRNStr(t *testing.T) {
-	tests := []struct {
-		input     string
-		expect    *GRN
-		expectErr bool
-	}{
-		{ // empty
-			"",
-			&GRN{},
-			true,
-		},
-		{ // too few parts
-			"grn:dashboards",
-			&GRN{},
-			true,
-		},
-		{ // too many parts
-			"grn::dashboards:user:orgs:otherthings:hello:stillgoing",
-			&GRN{},
-			true,
-		},
-		{ // Does not look like a GRN
-			"hrn:grafana::123:dashboards/foo",
-			&GRN{},
-			true,
-		},
-		{ // Missing Kind
-			"grn::foo",
-			&GRN{},
-			true,
-		},
-		{ // good!
-			"grn::roles/Admin",
-			&GRN{TenantID: 0, ResourceKind: "roles", ResourceIdentifier: "Admin"},
-			false,
-		},
-		{ // good!
-			"grn::roles/Admin/with/some/slashes",
-			&GRN{TenantID: 0, ResourceKind: "roles", ResourceIdentifier: "Admin/with/some/slashes"},
-			false,
-		},
-		{ // good!
-			"grn:123456789:roles/Admin/with/some/slashes",
-			&GRN{TenantID: 123456789, ResourceKind: "roles", ResourceIdentifier: "Admin/with/some/slashes"},
-			false,
-		},
-		{ // Weird, but valid.
-			"grn::roles///Admin/with/leading/slashes",
-			&GRN{TenantID: 0, ResourceKind: "roles", ResourceIdentifier: "//Admin/with/leading/slashes"},
-			false,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(fmt.Sprintf("ParseStr(%q)", test.input), func(t *testing.T) {
-			got, err := ParseStr(test.input)
-			if test.expectErr && err == nil {
-				t.Fatal("wrong result. Expected error, got success")
-			}
-
-			if err != nil && !test.expectErr {
-				t.Fatalf("wrong result. Expected success, got error %s", err.Error())
-			}
-
-			if !cmp.Equal(test.expect, got) {
-				t.Fatalf("wrong result. Wanted %s, got %s\n", test.expect.String(), got.String())
-			}
-		})
-	}
-}
diff --git a/pkg/infra/httpclient/httpclientprovider/datasource_metrics_middleware.go b/pkg/infra/httpclient/httpclientprovider/datasource_metrics_middleware.go
index 3f8c95ac95605..012755732d695 100644
--- a/pkg/infra/httpclient/httpclientprovider/datasource_metrics_middleware.go
+++ b/pkg/infra/httpclient/httpclientprovider/datasource_metrics_middleware.go
@@ -2,6 +2,7 @@ package httpclientprovider
 
 import (
 	"net/http"
+	"strconv"
 
 	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/grafana/pkg/infra/httpclient"
@@ -18,7 +19,7 @@ var (
 			Name:      "datasource_request_total",
 			Help:      "A counter for outgoing requests for a data source",
 		},
-		[]string{"datasource", "datasource_type", "code", "method"},
+		[]string{"datasource", "datasource_type", "code", "method", "secure_socks_ds_proxy_enabled"},
 	)
 
 	datasourceRequestHistogram = promauto.NewHistogramVec(
@@ -27,7 +28,7 @@ var (
 			Name:      "datasource_request_duration_seconds",
 			Help:      "histogram of durations of outgoing data source requests sent from Grafana",
 			Buckets:   []float64{.005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10, 25, 50, 100},
-		}, []string{"datasource", "datasource_type", "code", "method"},
+		}, []string{"datasource", "datasource_type", "code", "method", "secure_socks_ds_proxy_enabled"},
 	)
 
 	datasourceResponseHistogram = promauto.NewHistogramVec(
@@ -36,7 +37,7 @@ var (
 			Name:      "datasource_response_size_bytes",
 			Help:      "histogram of data source response sizes returned to Grafana",
 			Buckets:   []float64{128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 65536, 131072, 262144, 524288, 1048576},
-		}, []string{"datasource", "datasource_type"},
+		}, []string{"datasource", "datasource_type", "secure_socks_ds_proxy_enabled"},
 	)
 
 	datasourceRequestsInFlight = promauto.NewGaugeVec(
@@ -45,7 +46,7 @@ var (
 			Name:      "datasource_request_in_flight",
 			Help:      "A gauge of outgoing data source requests currently being sent by Grafana",
 		},
-		[]string{"datasource", "datasource_type"},
+		[]string{"datasource", "datasource_type", "secure_socks_ds_proxy_enabled"},
 	)
 )
 
@@ -82,7 +83,11 @@ func DataSourceMetricsMiddleware() sdkhttpclient.Middleware {
 			return next
 		}
 
-		labels := prometheus.Labels{"datasource": datasourceLabelName, "datasource_type": datasourceLabelType}
+		labels := prometheus.Labels{
+			"datasource":                    datasourceLabelName,
+			"datasource_type":               datasourceLabelType,
+			"secure_socks_ds_proxy_enabled": strconv.FormatBool(opts.ProxyOptions != nil && opts.ProxyOptions.Enabled),
+		}
 
 		return executeMiddlewareFunc(next, labels)
 	})
diff --git a/pkg/infra/httpclient/httpclientprovider/datasource_metrics_middleware_test.go b/pkg/infra/httpclient/httpclientprovider/datasource_metrics_middleware_test.go
index 37afde4fd964d..28874be941f63 100644
--- a/pkg/infra/httpclient/httpclientprovider/datasource_metrics_middleware_test.go
+++ b/pkg/infra/httpclient/httpclientprovider/datasource_metrics_middleware_test.go
@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/proxy"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/require"
 )
@@ -103,29 +104,56 @@ func TestDataSourceMetricsMiddleware(t *testing.T) {
 			executeMiddlewareFunc = origExecuteMiddlewareFunc
 		})
 
-		ctx := &testContext{}
-		finalRoundTripper := ctx.createRoundTripper("finalrt")
-		mw := DataSourceMetricsMiddleware()
-		rt := mw.CreateMiddleware(httpclient.Options{Labels: map[string]string{"datasource_name": "My Data Source 123", "datasource_type": "prometheus"}}, finalRoundTripper)
-		require.NotNil(t, rt)
-		middlewareName, ok := mw.(httpclient.MiddlewareName)
-		require.True(t, ok)
-		require.Equal(t, DataSourceMetricsMiddlewareName, middlewareName.MiddlewareName())
+		testCases := []struct {
+			description                       string
+			httpClientOptions                 httpclient.Options
+			expectedSecureSocksDSProxyEnabled string
+		}{
+			{
+				description: "secure socks ds proxy is disabled",
+				httpClientOptions: httpclient.Options{
+					Labels: map[string]string{"datasource_name": "My Data Source 123", "datasource_type": "prometheus"},
+				},
+				expectedSecureSocksDSProxyEnabled: "false",
+			},
+			{
+				description: "secure socks ds proxy is enabled",
+				httpClientOptions: httpclient.Options{
+					Labels:       map[string]string{"datasource_name": "My Data Source 123", "datasource_type": "prometheus"},
+					ProxyOptions: &proxy.Options{Enabled: true},
+				},
+				expectedSecureSocksDSProxyEnabled: "true",
+			},
+		}
 
-		req, err := http.NewRequest(http.MethodGet, "http://", nil)
-		require.NoError(t, err)
-		res, err := rt.RoundTrip(req)
-		require.NoError(t, err)
-		require.NotNil(t, res)
-		if res.Body != nil {
-			require.NoError(t, res.Body.Close())
+		for _, tt := range testCases {
+			t.Run(tt.description, func(t *testing.T) {
+				ctx := &testContext{}
+				finalRoundTripper := ctx.createRoundTripper("finalrt")
+				mw := DataSourceMetricsMiddleware()
+				rt := mw.CreateMiddleware(tt.httpClientOptions, finalRoundTripper)
+				require.NotNil(t, rt)
+				middlewareName, ok := mw.(httpclient.MiddlewareName)
+				require.True(t, ok)
+				require.Equal(t, DataSourceMetricsMiddlewareName, middlewareName.MiddlewareName())
+
+				req, err := http.NewRequest(http.MethodGet, "http://", nil)
+				require.NoError(t, err)
+				res, err := rt.RoundTrip(req)
+				require.NoError(t, err)
+				require.NotNil(t, res)
+				if res.Body != nil {
+					require.NoError(t, res.Body.Close())
+				}
+				require.Len(t, ctx.callChain, 1)
+				require.ElementsMatch(t, []string{"finalrt"}, ctx.callChain)
+				require.True(t, executeMiddlewareCalled)
+				require.Len(t, labels, 3)
+				require.Equal(t, "My_Data_Source_123", labels["datasource"])
+				require.Equal(t, "prometheus", labels["datasource_type"])
+				require.Equal(t, tt.expectedSecureSocksDSProxyEnabled, labels["secure_socks_ds_proxy_enabled"])
+				require.True(t, middlewareCalled)
+			})
 		}
-		require.Len(t, ctx.callChain, 1)
-		require.ElementsMatch(t, []string{"finalrt"}, ctx.callChain)
-		require.True(t, executeMiddlewareCalled)
-		require.Len(t, labels, 2)
-		require.Equal(t, "My_Data_Source_123", labels["datasource"])
-		require.Equal(t, "prometheus", labels["datasource_type"])
-		require.True(t, middlewareCalled)
 	})
 }
diff --git a/pkg/infra/httpclient/httpclientprovider/grafana_request_id_header_middleware.go b/pkg/infra/httpclient/httpclientprovider/grafana_request_id_header_middleware.go
new file mode 100644
index 0000000000000..0075578ae8a52
--- /dev/null
+++ b/pkg/infra/httpclient/httpclientprovider/grafana_request_id_header_middleware.go
@@ -0,0 +1,34 @@
+package httpclientprovider
+
+import (
+	"net/http"
+
+	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/clientmiddleware"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+const GrafanaRequestIDHeaderMiddlewareName = "grafana-request-id-header-middleware"
+
+func GrafanaRequestIDHeaderMiddleware(cfg *setting.Cfg, logger log.Logger) sdkhttpclient.Middleware {
+	return sdkhttpclient.NamedMiddlewareFunc(GrafanaRequestIDHeaderMiddlewareName, func(opts sdkhttpclient.Options, next http.RoundTripper) http.RoundTripper {
+		return sdkhttpclient.RoundTripperFunc(func(req *http.Request) (*http.Response, error) {
+			if req.Header.Get(clientmiddleware.GrafanaRequestID) != "" {
+				logger.Debug("Request already has a Grafana request ID header", "request_id", req.Header.Get(clientmiddleware.GrafanaRequestID))
+				return next.RoundTrip(req)
+			}
+
+			if !clientmiddleware.IsRequestURLInAllowList(req.URL, cfg) {
+				logger.Debug("Data source URL not among the allow-listed URLs", "url", req.URL.String())
+				return next.RoundTrip(req)
+			}
+
+			for k, v := range clientmiddleware.GetGrafanaRequestIDHeaders(req, cfg, logger) {
+				req.Header.Set(k, v)
+			}
+
+			return next.RoundTrip(req)
+		})
+	})
+}
diff --git a/pkg/infra/httpclient/httpclientprovider/grafana_request_id_header_middleware_test.go b/pkg/infra/httpclient/httpclientprovider/grafana_request_id_header_middleware_test.go
new file mode 100644
index 0000000000000..92c995915b457
--- /dev/null
+++ b/pkg/infra/httpclient/httpclientprovider/grafana_request_id_header_middleware_test.go
@@ -0,0 +1,113 @@
+package httpclientprovider
+
+import (
+	"crypto/hmac"
+	"crypto/sha256"
+	"encoding/hex"
+	"net/http"
+	"net/url"
+	"testing"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/clientmiddleware"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/stretchr/testify/require"
+)
+
+func TestGrafanaRequestIDHeaderMiddleware(t *testing.T) {
+	testCases := []struct {
+		description                   string
+		allowedURLs                   []*url.URL
+		requestURL                    string
+		remoteAddress                 string
+		expectGrafanaRequestIDHeaders bool
+		expectPrivateRequestHeader    bool
+	}{
+		{
+			description: "With target URL in the allowed URL list and remote address specified, should add headers to the request but the request should not be marked as private",
+			allowedURLs: []*url.URL{{
+				Scheme: "https",
+				Host:   "grafana.com",
+			}},
+			requestURL:                    "https://grafana.com/api/some/path",
+			remoteAddress:                 "1.2.3.4",
+			expectGrafanaRequestIDHeaders: true,
+			expectPrivateRequestHeader:    false,
+		},
+		{
+			description: "With target URL in the allowed URL list and remote address not specified, should add headers to the request and the request should be marked as private",
+			allowedURLs: []*url.URL{{
+				Scheme: "https",
+				Host:   "grafana.com",
+			}},
+			requestURL:                    "https://grafana.com/api/some/path",
+			expectGrafanaRequestIDHeaders: true,
+			expectPrivateRequestHeader:    true,
+		},
+		{
+			description: "With target URL not in the allowed URL list, should not add headers to the request",
+			allowedURLs: []*url.URL{{
+				Scheme: "https",
+				Host:   "grafana.com",
+			}},
+			requestURL:                    "https://fake-grafana.com/api/some/path",
+			expectGrafanaRequestIDHeaders: false,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.description, func(t *testing.T) {
+			ctx := &testContext{}
+			finalRoundTripper := ctx.createRoundTripper("final")
+			cfg := setting.NewCfg()
+			cfg.IPRangeACEnabled = false
+			cfg.IPRangeACAllowedURLs = tc.allowedURLs
+			cfg.IPRangeACSecretKey = "secret"
+			mw := GrafanaRequestIDHeaderMiddleware(cfg, log.New("test"))
+			rt := mw.CreateMiddleware(httpclient.Options{}, finalRoundTripper)
+			require.NotNil(t, rt)
+			middlewareName, ok := mw.(httpclient.MiddlewareName)
+			require.True(t, ok)
+			require.Equal(t, GrafanaRequestIDHeaderMiddlewareName, middlewareName.MiddlewareName())
+
+			req, err := http.NewRequest(http.MethodGet, tc.requestURL, nil)
+			require.NoError(t, err)
+			req.RemoteAddr = tc.remoteAddress
+			res, err := rt.RoundTrip(req)
+			require.NoError(t, err)
+			require.NotNil(t, res)
+			if res.Body != nil {
+				require.NoError(t, res.Body.Close())
+			}
+			require.Len(t, ctx.callChain, 1)
+			require.ElementsMatch(t, []string{"final"}, ctx.callChain)
+
+			if !tc.expectGrafanaRequestIDHeaders {
+				require.Len(t, req.Header.Values(clientmiddleware.GrafanaRequestID), 0)
+				require.Len(t, req.Header.Values(clientmiddleware.GrafanaSignedRequestID), 0)
+			} else {
+				require.Len(t, req.Header.Values(clientmiddleware.GrafanaRequestID), 1)
+				require.Len(t, req.Header.Values(clientmiddleware.GrafanaSignedRequestID), 1)
+				requestID := req.Header.Get(clientmiddleware.GrafanaRequestID)
+
+				instance := hmac.New(sha256.New, []byte(cfg.IPRangeACSecretKey))
+				_, err = instance.Write([]byte(requestID))
+				require.NoError(t, err)
+				computed := hex.EncodeToString(instance.Sum(nil))
+
+				require.Equal(t, req.Header.Get(clientmiddleware.GrafanaSignedRequestID), computed)
+
+				if tc.remoteAddress == "" {
+					require.Equal(t, req.Header.Get(clientmiddleware.GrafanaInternalRequest), "true")
+				} else {
+					require.Len(t, req.Header.Values(clientmiddleware.XRealIPHeader), 1)
+					require.Equal(t, req.Header.Get(clientmiddleware.XRealIPHeader), tc.remoteAddress)
+
+					// Internal header should not be set
+					require.Len(t, req.Header.Values(clientmiddleware.GrafanaInternalRequest), 0)
+				}
+			}
+		})
+	}
+}
diff --git a/pkg/infra/httpclient/httpclientprovider/http_client_provider.go b/pkg/infra/httpclient/httpclientprovider/http_client_provider.go
index 16c7b197049ba..13ef9674c1c31 100644
--- a/pkg/infra/httpclient/httpclientprovider/http_client_provider.go
+++ b/pkg/infra/httpclient/httpclientprovider/http_client_provider.go
@@ -4,6 +4,7 @@ import (
 	"net/http"
 	"time"
 
+	awssdk "github.com/grafana/grafana-aws-sdk/pkg/sigv4"
 	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/mwitkow/go-conntrack"
 
@@ -27,18 +28,23 @@ func New(cfg *setting.Cfg, validator validations.PluginRequestValidator, tracer
 		SetUserAgentMiddleware(cfg.DataProxyUserAgent),
 		sdkhttpclient.BasicAuthenticationMiddleware(),
 		sdkhttpclient.CustomHeadersMiddleware(),
-		ResponseLimitMiddleware(cfg.ResponseLimit),
+		sdkhttpclient.ResponseLimitMiddleware(cfg.ResponseLimit),
 		RedirectLimitMiddleware(validator),
 	}
 
-	if cfg.SigV4AuthEnabled {
-		middlewares = append(middlewares, SigV4Middleware(cfg.SigV4VerboseLogging))
-	}
-
 	if httpLoggingEnabled(cfg.PluginSettings) {
 		middlewares = append(middlewares, HTTPLoggerMiddleware(cfg.PluginSettings))
 	}
 
+	if cfg.IPRangeACEnabled {
+		middlewares = append(middlewares, GrafanaRequestIDHeaderMiddleware(cfg, logger))
+	}
+
+	// SigV4 signing should be performed after all headers are added
+	if cfg.SigV4AuthEnabled {
+		middlewares = append(middlewares, awssdk.SigV4Middleware(cfg.SigV4VerboseLogging))
+	}
+
 	setDefaultTimeoutOptions(cfg)
 
 	return newProviderFunc(sdkhttpclient.ProviderOptions{
diff --git a/pkg/infra/httpclient/httpclientprovider/http_client_provider_test.go b/pkg/infra/httpclient/httpclientprovider/http_client_provider_test.go
index 208c51fff21e3..652372a0de410 100644
--- a/pkg/infra/httpclient/httpclientprovider/http_client_provider_test.go
+++ b/pkg/infra/httpclient/httpclientprovider/http_client_provider_test.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/services/validations"
 
+	awssdk "github.com/grafana/grafana-aws-sdk/pkg/sigv4"
 	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/setting"
@@ -33,7 +34,7 @@ func TestHTTPClientProvider(t *testing.T) {
 		require.Equal(t, SetUserAgentMiddlewareName, o.Middlewares[3].(sdkhttpclient.MiddlewareName).MiddlewareName())
 		require.Equal(t, sdkhttpclient.BasicAuthenticationMiddlewareName, o.Middlewares[4].(sdkhttpclient.MiddlewareName).MiddlewareName())
 		require.Equal(t, sdkhttpclient.CustomHeadersMiddlewareName, o.Middlewares[5].(sdkhttpclient.MiddlewareName).MiddlewareName())
-		require.Equal(t, ResponseLimitMiddlewareName, o.Middlewares[6].(sdkhttpclient.MiddlewareName).MiddlewareName())
+		require.Equal(t, sdkhttpclient.ResponseLimitMiddlewareName, o.Middlewares[6].(sdkhttpclient.MiddlewareName).MiddlewareName())
 	})
 
 	t.Run("When creating new provider and SigV4 is enabled should apply expected middleware", func(t *testing.T) {
@@ -57,8 +58,8 @@ func TestHTTPClientProvider(t *testing.T) {
 		require.Equal(t, SetUserAgentMiddlewareName, o.Middlewares[3].(sdkhttpclient.MiddlewareName).MiddlewareName())
 		require.Equal(t, sdkhttpclient.BasicAuthenticationMiddlewareName, o.Middlewares[4].(sdkhttpclient.MiddlewareName).MiddlewareName())
 		require.Equal(t, sdkhttpclient.CustomHeadersMiddlewareName, o.Middlewares[5].(sdkhttpclient.MiddlewareName).MiddlewareName())
-		require.Equal(t, ResponseLimitMiddlewareName, o.Middlewares[6].(sdkhttpclient.MiddlewareName).MiddlewareName())
-		require.Equal(t, SigV4MiddlewareName, o.Middlewares[8].(sdkhttpclient.MiddlewareName).MiddlewareName())
+		require.Equal(t, sdkhttpclient.ResponseLimitMiddlewareName, o.Middlewares[6].(sdkhttpclient.MiddlewareName).MiddlewareName())
+		require.Equal(t, awssdk.SigV4MiddlewareName, o.Middlewares[8].(sdkhttpclient.MiddlewareName).MiddlewareName())
 	})
 
 	t.Run("When creating new provider and http logging is enabled for one plugin, it should apply expected middleware", func(t *testing.T) {
@@ -82,7 +83,7 @@ func TestHTTPClientProvider(t *testing.T) {
 		require.Equal(t, SetUserAgentMiddlewareName, o.Middlewares[3].(sdkhttpclient.MiddlewareName).MiddlewareName())
 		require.Equal(t, sdkhttpclient.BasicAuthenticationMiddlewareName, o.Middlewares[4].(sdkhttpclient.MiddlewareName).MiddlewareName())
 		require.Equal(t, sdkhttpclient.CustomHeadersMiddlewareName, o.Middlewares[5].(sdkhttpclient.MiddlewareName).MiddlewareName())
-		require.Equal(t, ResponseLimitMiddlewareName, o.Middlewares[6].(sdkhttpclient.MiddlewareName).MiddlewareName())
+		require.Equal(t, sdkhttpclient.ResponseLimitMiddlewareName, o.Middlewares[6].(sdkhttpclient.MiddlewareName).MiddlewareName())
 		require.Equal(t, HostRedirectValidationMiddlewareName, o.Middlewares[7].(sdkhttpclient.MiddlewareName).MiddlewareName())
 		require.Equal(t, HTTPLoggerMiddlewareName, o.Middlewares[8].(sdkhttpclient.MiddlewareName).MiddlewareName())
 	})
diff --git a/pkg/infra/httpclient/httpclientprovider/http_logger_middleware_test.go b/pkg/infra/httpclient/httpclientprovider/http_logger_middleware_test.go
index 5f4362cd23e8a..006c87411e9bf 100644
--- a/pkg/infra/httpclient/httpclientprovider/http_logger_middleware_test.go
+++ b/pkg/infra/httpclient/httpclientprovider/http_logger_middleware_test.go
@@ -47,6 +47,8 @@ func TestHTTPLoggerMiddleware(t *testing.T) {
 		f, err := os.CreateTemp("", "example_*.har")
 		require.NoError(t, err)
 		defer func() {
+			err = f.Close()
+			require.NoError(t, err)
 			err := os.Remove(f.Name())
 			require.NoError(t, err)
 		}()
diff --git a/pkg/infra/httpclient/httpclientprovider/response_limit_middleware.go b/pkg/infra/httpclient/httpclientprovider/response_limit_middleware.go
deleted file mode 100644
index 97d8285d4cbe1..0000000000000
--- a/pkg/infra/httpclient/httpclientprovider/response_limit_middleware.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package httpclientprovider
-
-import (
-	"net/http"
-
-	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
-	"github.com/grafana/grafana/pkg/infra/httpclient"
-)
-
-// ResponseLimitMiddlewareName is the middleware name used by ResponseLimitMiddleware.
-const ResponseLimitMiddlewareName = "response-limit"
-
-func ResponseLimitMiddleware(limit int64) sdkhttpclient.Middleware {
-	return sdkhttpclient.NamedMiddlewareFunc(ResponseLimitMiddlewareName, func(opts sdkhttpclient.Options, next http.RoundTripper) http.RoundTripper {
-		if limit <= 0 {
-			return next
-		}
-		return sdkhttpclient.RoundTripperFunc(func(req *http.Request) (*http.Response, error) {
-			res, err := next.RoundTrip(req)
-			if err != nil {
-				return nil, err
-			}
-
-			if res != nil && res.StatusCode != http.StatusSwitchingProtocols {
-				res.Body = httpclient.MaxBytesReader(res.Body, limit)
-			}
-
-			return res, nil
-		})
-	})
-}
diff --git a/pkg/infra/httpclient/httpclientprovider/response_limit_middleware_test.go b/pkg/infra/httpclient/httpclientprovider/response_limit_middleware_test.go
deleted file mode 100644
index 88a0d572b86c7..0000000000000
--- a/pkg/infra/httpclient/httpclientprovider/response_limit_middleware_test.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package httpclientprovider
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
-	"github.com/stretchr/testify/require"
-)
-
-func TestResponseLimitMiddleware(t *testing.T) {
-	tcs := []struct {
-		limit      int64
-		bodyLength int
-		body       string
-		err        error
-	}{
-		{limit: 1, bodyLength: 1, body: "d", err: errors.New("error: http: response body too large, response limit is set to: 1")},
-		{limit: 1000000, bodyLength: 5, body: "dummy", err: nil},
-		{limit: 0, bodyLength: 5, body: "dummy", err: nil},
-	}
-	for _, tc := range tcs {
-		t.Run(fmt.Sprintf("Test ResponseLimitMiddleware with limit: %d", tc.limit), func(t *testing.T) {
-			finalRoundTripper := httpclient.RoundTripperFunc(func(req *http.Request) (*http.Response, error) {
-				return &http.Response{StatusCode: http.StatusOK, Request: req, Body: io.NopCloser(strings.NewReader("dummy"))}, nil
-			})
-
-			mw := ResponseLimitMiddleware(tc.limit)
-			rt := mw.CreateMiddleware(httpclient.Options{}, finalRoundTripper)
-			require.NotNil(t, rt)
-			middlewareName, ok := mw.(httpclient.MiddlewareName)
-			require.True(t, ok)
-			require.Equal(t, ResponseLimitMiddlewareName, middlewareName.MiddlewareName())
-
-			ctx := context.Background()
-			req, err := http.NewRequestWithContext(ctx, http.MethodGet, "http://test.com/query", nil)
-			require.NoError(t, err)
-			res, err := rt.RoundTrip(req)
-			require.NoError(t, err)
-			require.NotNil(t, res)
-			require.NotNil(t, res.Body)
-			require.NoError(t, res.Body.Close())
-
-			bodyBytes, err := io.ReadAll(res.Body)
-			if err != nil {
-				require.EqualError(t, tc.err, err.Error())
-			} else {
-				require.NoError(t, tc.err)
-			}
-
-			require.Len(t, bodyBytes, tc.bodyLength)
-			require.Equal(t, string(bodyBytes), tc.body)
-		})
-	}
-}
diff --git a/pkg/infra/httpclient/httpclientprovider/sigv4_middleware.go b/pkg/infra/httpclient/httpclientprovider/sigv4_middleware.go
deleted file mode 100644
index 0a5de35d08ad4..0000000000000
--- a/pkg/infra/httpclient/httpclientprovider/sigv4_middleware.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package httpclientprovider
-
-import (
-	"fmt"
-	"net/http"
-
-	"github.com/grafana/grafana-aws-sdk/pkg/sigv4"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
-)
-
-// SigV4MiddlewareName the middleware name used by SigV4Middleware.
-const SigV4MiddlewareName = "sigv4"
-
-var newSigV4Func = sigv4.New
-
-// SigV4Middleware applies AWS Signature Version 4 request signing for the outgoing request.
-func SigV4Middleware(verboseLogging bool) httpclient.Middleware {
-	return httpclient.NamedMiddlewareFunc(SigV4MiddlewareName, func(opts httpclient.Options, next http.RoundTripper) http.RoundTripper {
-		if opts.SigV4 == nil {
-			return next
-		}
-
-		conf := &sigv4.Config{
-			Service:       opts.SigV4.Service,
-			AccessKey:     opts.SigV4.AccessKey,
-			SecretKey:     opts.SigV4.SecretKey,
-			Region:        opts.SigV4.Region,
-			AssumeRoleARN: opts.SigV4.AssumeRoleARN,
-			AuthType:      opts.SigV4.AuthType,
-			ExternalID:    opts.SigV4.ExternalID,
-			Profile:       opts.SigV4.Profile,
-		}
-
-		rt, err := newSigV4Func(conf, next, sigv4.Opts{VerboseMode: verboseLogging})
-		if err != nil {
-			return invalidSigV4Config(err)
-		}
-
-		return rt
-	})
-}
-
-func invalidSigV4Config(err error) http.RoundTripper {
-	return httpclient.RoundTripperFunc(func(req *http.Request) (*http.Response, error) {
-		return nil, fmt.Errorf("invalid SigV4 configuration: %w", err)
-	})
-}
diff --git a/pkg/infra/httpclient/httpclientprovider/sigv4_middleware_test.go b/pkg/infra/httpclient/httpclientprovider/sigv4_middleware_test.go
deleted file mode 100644
index 1e021d42d7bba..0000000000000
--- a/pkg/infra/httpclient/httpclientprovider/sigv4_middleware_test.go
+++ /dev/null
@@ -1,118 +0,0 @@
-package httpclientprovider
-
-import (
-	"fmt"
-	"net/http"
-	"testing"
-
-	"github.com/grafana/grafana-aws-sdk/pkg/sigv4"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
-	"github.com/stretchr/testify/require"
-)
-
-func TestSigV4Middleware(t *testing.T) {
-	t.Run("Without sigv4 options set should return next http.RoundTripper", func(t *testing.T) {
-		origSigV4Func := newSigV4Func
-		newSigV4Called := false
-		middlewareCalled := false
-		newSigV4Func = func(config *sigv4.Config, next http.RoundTripper, opts ...sigv4.Opts) (http.RoundTripper, error) {
-			newSigV4Called = true
-			return httpclient.RoundTripperFunc(func(r *http.Request) (*http.Response, error) {
-				middlewareCalled = true
-				return next.RoundTrip(r)
-			}), nil
-		}
-		t.Cleanup(func() {
-			newSigV4Func = origSigV4Func
-		})
-
-		ctx := &testContext{}
-		finalRoundTripper := ctx.createRoundTripper("finalrt")
-		mw := SigV4Middleware(false)
-		rt := mw.CreateMiddleware(httpclient.Options{}, finalRoundTripper)
-		require.NotNil(t, rt)
-		middlewareName, ok := mw.(httpclient.MiddlewareName)
-		require.True(t, ok)
-		require.Equal(t, SigV4MiddlewareName, middlewareName.MiddlewareName())
-
-		req, err := http.NewRequest(http.MethodGet, "http://", nil)
-		require.NoError(t, err)
-		res, err := rt.RoundTrip(req)
-		require.NoError(t, err)
-		require.NotNil(t, res)
-		if res.Body != nil {
-			require.NoError(t, res.Body.Close())
-		}
-		require.Len(t, ctx.callChain, 1)
-		require.ElementsMatch(t, []string{"finalrt"}, ctx.callChain)
-		require.False(t, newSigV4Called)
-		require.False(t, middlewareCalled)
-	})
-
-	t.Run("With sigv4 options set should call sigv4 http.RoundTripper", func(t *testing.T) {
-		origSigV4Func := newSigV4Func
-		newSigV4Called := false
-		middlewareCalled := false
-		newSigV4Func = func(config *sigv4.Config, next http.RoundTripper, opts ...sigv4.Opts) (http.RoundTripper, error) {
-			newSigV4Called = true
-			return httpclient.RoundTripperFunc(func(r *http.Request) (*http.Response, error) {
-				middlewareCalled = true
-				return next.RoundTrip(r)
-			}), nil
-		}
-		t.Cleanup(func() {
-			newSigV4Func = origSigV4Func
-		})
-
-		ctx := &testContext{}
-		finalRoundTripper := ctx.createRoundTripper("final")
-		mw := SigV4Middleware(false)
-		rt := mw.CreateMiddleware(httpclient.Options{SigV4: &httpclient.SigV4Config{}}, finalRoundTripper)
-		require.NotNil(t, rt)
-		middlewareName, ok := mw.(httpclient.MiddlewareName)
-		require.True(t, ok)
-		require.Equal(t, SigV4MiddlewareName, middlewareName.MiddlewareName())
-
-		req, err := http.NewRequest(http.MethodGet, "http://", nil)
-		require.NoError(t, err)
-		res, err := rt.RoundTrip(req)
-		require.NoError(t, err)
-		require.NotNil(t, res)
-		if res.Body != nil {
-			require.NoError(t, res.Body.Close())
-		}
-		require.Len(t, ctx.callChain, 1)
-		require.ElementsMatch(t, []string{"final"}, ctx.callChain)
-
-		require.True(t, newSigV4Called)
-		require.True(t, middlewareCalled)
-	})
-
-	t.Run("With sigv4 error returned", func(t *testing.T) {
-		origSigV4Func := newSigV4Func
-		newSigV4Func = func(config *sigv4.Config, next http.RoundTripper, opts ...sigv4.Opts) (http.RoundTripper, error) {
-			return nil, fmt.Errorf("problem")
-		}
-		t.Cleanup(func() {
-			newSigV4Func = origSigV4Func
-		})
-
-		ctx := &testContext{}
-		finalRoundTripper := ctx.createRoundTripper("final")
-		mw := SigV4Middleware(false)
-		rt := mw.CreateMiddleware(httpclient.Options{SigV4: &httpclient.SigV4Config{}}, finalRoundTripper)
-		require.NotNil(t, rt)
-		middlewareName, ok := mw.(httpclient.MiddlewareName)
-		require.True(t, ok)
-		require.Equal(t, SigV4MiddlewareName, middlewareName.MiddlewareName())
-
-		req, err := http.NewRequest(http.MethodGet, "http://", nil)
-		require.NoError(t, err)
-		// response is nil
-		// nolint:bodyclose
-		res, err := rt.RoundTrip(req)
-		require.Error(t, err)
-		require.Nil(t, res)
-		require.Empty(t, ctx.callChain)
-	})
-}
diff --git a/pkg/infra/httpclient/max_bytes_reader.go b/pkg/infra/httpclient/max_bytes_reader.go
deleted file mode 100644
index 9bbdce1e3754f..0000000000000
--- a/pkg/infra/httpclient/max_bytes_reader.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package httpclient
-
-import (
-	"errors"
-	"fmt"
-	"io"
-)
-
-// Similar implementation to http/net MaxBytesReader
-// https://pkg.go.dev/net/http#MaxBytesReader
-// What's happening differently here, is that the field that
-// is limited is the response and not the request, thus
-// the error handling/message needed to be accurate.
-
-// ErrResponseBodyTooLarge indicates response body is too large
-var ErrResponseBodyTooLarge = errors.New("http: response body too large")
-
-// MaxBytesReader is similar to io.LimitReader but is intended for
-// limiting the size of incoming request bodies. In contrast to
-// io.LimitReader, MaxBytesReader's result is a ReadCloser, returns a
-// non-EOF error for a Read beyond the limit, and closes the
-// underlying reader when its Close method is called.
-//
-// MaxBytesReader prevents clients from accidentally or maliciously
-// sending a large request and wasting server resources.
-func MaxBytesReader(r io.ReadCloser, n int64) io.ReadCloser {
-	return &maxBytesReader{r: r, n: n}
-}
-
-type maxBytesReader struct {
-	r   io.ReadCloser // underlying reader
-	n   int64         // max bytes remaining
-	err error         // sticky error
-}
-
-func (l *maxBytesReader) Read(p []byte) (n int, err error) {
-	if l.err != nil {
-		return 0, l.err
-	}
-	if len(p) == 0 {
-		return 0, nil
-	}
-	// If they asked for a 32KB byte read but only 5 bytes are
-	// remaining, no need to read 32KB. 6 bytes will answer the
-	// question of the whether we hit the limit or go past it.
-	if int64(len(p)) > l.n+1 {
-		p = p[:l.n+1]
-	}
-	n, err = l.r.Read(p)
-
-	if int64(n) <= l.n {
-		l.n -= int64(n)
-		l.err = err
-		return n, err
-	}
-
-	n = int(l.n)
-	l.n = 0
-
-	l.err = fmt.Errorf("error: %w, response limit is set to: %d", ErrResponseBodyTooLarge, n)
-	return n, l.err
-}
-
-func (l *maxBytesReader) Close() error {
-	return l.r.Close()
-}
diff --git a/pkg/infra/httpclient/max_bytes_reader_test.go b/pkg/infra/httpclient/max_bytes_reader_test.go
deleted file mode 100644
index 1f48be0bbc5b2..0000000000000
--- a/pkg/infra/httpclient/max_bytes_reader_test.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package httpclient
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestMaxBytesReader(t *testing.T) {
-	tcs := []struct {
-		limit      int64
-		bodyLength int
-		body       string
-		err        error
-	}{
-		{limit: 1, bodyLength: 1, body: "d", err: errors.New("error: http: response body too large, response limit is set to: 1")},
-		{limit: 1000000, bodyLength: 5, body: "dummy", err: nil},
-		{limit: 0, bodyLength: 0, body: "", err: errors.New("error: http: response body too large, response limit is set to: 0")},
-	}
-	for _, tc := range tcs {
-		t.Run(fmt.Sprintf("Test MaxBytesReader with limit: %d", tc.limit), func(t *testing.T) {
-			body := io.NopCloser(strings.NewReader("dummy"))
-			readCloser := MaxBytesReader(body, tc.limit)
-
-			bodyBytes, err := io.ReadAll(readCloser)
-			if err != nil {
-				require.EqualError(t, tc.err, err.Error())
-			} else {
-				require.NoError(t, tc.err)
-			}
-
-			require.Len(t, bodyBytes, tc.bodyLength)
-			require.Equal(t, string(bodyBytes), tc.body)
-		})
-	}
-}
diff --git a/pkg/infra/kvstore/kvstore_test.go b/pkg/infra/kvstore/kvstore_test.go
index e3471285e26fa..f94fd7dc0d215 100644
--- a/pkg/infra/kvstore/kvstore_test.go
+++ b/pkg/infra/kvstore/kvstore_test.go
@@ -10,8 +10,13 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func createTestableKVStore(t *testing.T) KVStore {
 	t.Helper()
 
diff --git a/pkg/infra/log/log.go b/pkg/infra/log/log.go
index 53e80ca07c733..f9c741e1346a2 100644
--- a/pkg/infra/log/log.go
+++ b/pkg/infra/log/log.go
@@ -499,3 +499,34 @@ func ReadLoggingConfig(modes []string, logsPath string, cfg *ini.File) error {
 
 	return nil
 }
+
+// SetupConsoleLogger setup Grafana console logger with provided level.
+func SetupConsoleLogger(level string) error {
+	iniFile := ini.Empty()
+	sLog, err := iniFile.NewSection("log")
+	if err != nil {
+		return err
+	}
+
+	_, err = sLog.NewKey("level", level)
+	if err != nil {
+		return err
+	}
+
+	sLogConsole, err := iniFile.NewSection("log.console")
+	if err != nil {
+		return err
+	}
+
+	_, err = sLogConsole.NewKey("format", "console")
+	if err != nil {
+		return err
+	}
+
+	err = ReadLoggingConfig([]string{"console"}, "", iniFile)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/pkg/infra/metrics/frontendmetrics.go b/pkg/infra/metrics/frontendmetrics.go
index 399b084e0a4e9..00e4bff79395a 100644
--- a/pkg/infra/metrics/frontendmetrics.go
+++ b/pkg/infra/metrics/frontendmetrics.go
@@ -19,7 +19,7 @@ type FrontendMetricsRecorder func(event FrontendMetricEvent)
 // FrontendMetrics contains all the valid frontend metrics and a handler function for recording events
 var FrontendMetrics map[string]FrontendMetricsRecorder = map[string]FrontendMetricsRecorder{}
 
-func registerFrontendHistogram(name string, help string) {
+func registerFrontendHistogram(reg prometheus.Registerer, name string, help string) {
 	defBuckets := []float64{.1, .25, .5, 1, 1.5, 2, 5, 10, 20, 40}
 
 	histogram := prometheus.NewHistogram(prometheus.HistogramOpts{
@@ -33,14 +33,14 @@ func registerFrontendHistogram(name string, help string) {
 		histogram.Observe(event.Value)
 	}
 
-	prometheus.MustRegister(histogram)
+	reg.MustRegister(histogram)
 }
 
-func initFrontendMetrics() {
-	registerFrontendHistogram("frontend_boot_load_time_seconds", "Frontend boot time measurement")
-	registerFrontendHistogram("frontend_boot_first_paint_time_seconds", "Frontend boot first paint")
-	registerFrontendHistogram("frontend_boot_first_contentful_paint_time_seconds", "Frontend boot first contentful paint")
-	registerFrontendHistogram("frontend_boot_js_done_time_seconds", "Frontend boot initial js load")
-	registerFrontendHistogram("frontend_boot_css_time_seconds", "Frontend boot initial css load")
-	registerFrontendHistogram("frontend_plugins_preload_ms", "Frontend preload plugin time measurement")
+func initFrontendMetrics(r prometheus.Registerer) {
+	registerFrontendHistogram(r, "frontend_boot_load_time_seconds", "Frontend boot time measurement")
+	registerFrontendHistogram(r, "frontend_boot_first_paint_time_seconds", "Frontend boot first paint")
+	registerFrontendHistogram(r, "frontend_boot_first_contentful_paint_time_seconds", "Frontend boot first contentful paint")
+	registerFrontendHistogram(r, "frontend_boot_js_done_time_seconds", "Frontend boot initial js load")
+	registerFrontendHistogram(r, "frontend_boot_css_time_seconds", "Frontend boot initial css load")
+	registerFrontendHistogram(r, "frontend_plugins_preload_ms", "Frontend preload plugin time measurement")
 }
diff --git a/pkg/infra/metrics/metrics.go b/pkg/infra/metrics/metrics.go
index 3a092fe9367b1..8c44d8e466579 100644
--- a/pkg/infra/metrics/metrics.go
+++ b/pkg/infra/metrics/metrics.go
@@ -6,6 +6,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 
 	"github.com/grafana/grafana/pkg/infra/metrics/metricutil"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	pubdash "github.com/grafana/grafana/pkg/services/publicdashboards/models"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -80,15 +81,6 @@ var (
 	// MAlertingNotificationSent is a metric counter for how many alert notifications that failed
 	MAlertingNotificationFailed *prometheus.CounterVec
 
-	// MAwsCloudWatchGetMetricStatistics is a metric counter for getting metric statistics from aws
-	MAwsCloudWatchGetMetricStatistics prometheus.Counter
-
-	// MAwsCloudWatchListMetrics is a metric counter for getting list of metrics from aws
-	MAwsCloudWatchListMetrics prometheus.Counter
-
-	// MAwsCloudWatchGetMetricData is a metric counter for getting metric data time series from aws
-	MAwsCloudWatchGetMetricData prometheus.Counter
-
 	// MDBDataSourceQueryByID is a metric counter for getting datasource by id
 	MDBDataSourceQueryByID prometheus.Counter
 
@@ -104,11 +96,23 @@ var (
 	// MAccessEvaluationCount is a metric gauge for total number of evaluation requests
 	MAccessEvaluationCount prometheus.Counter
 
+	// MAccessPermissionsCacheUsage is a metric counter for cache usage
+	MAccessPermissionsCacheUsage *prometheus.CounterVec
+
+	// MAccessSearchUserPermissionsCacheUsage is a metric counter for cache usage
+	MAccessSearchUserPermissionsCacheUsage *prometheus.CounterVec
+
 	// MPublicDashboardRequestCount is a metric counter for public dashboards requests
 	MPublicDashboardRequestCount prometheus.Counter
 
 	// MPublicDashboardDatasourceQuerySuccess is a metric counter for successful queries labelled by datasource
 	MPublicDashboardDatasourceQuerySuccess *prometheus.CounterVec
+
+	// MFolderIDsAPICount is a metric counter for folder ids count in the api package
+	MFolderIDsAPICount *prometheus.CounterVec
+
+	// MFolderIDsServicesCount is a metric counter for folder ids count in the services package
+	MFolderIDsServiceCount *prometheus.CounterVec
 )
 
 // Timers
@@ -128,6 +132,9 @@ var (
 	// MAccessPermissionsSummary is a metric summary for loading permissions request duration when evaluating access
 	MAccessPermissionsSummary prometheus.Histogram
 
+	// MSearchPermissionsSummary is a metric summary for searching permissions request duration
+	MAccessSearchPermissionsSummary prometheus.Histogram
+
 	// MAccessEvaluationsSummary is a metric summary for loading permissions request duration when evaluating access
 	MAccessEvaluationsSummary prometheus.Histogram
 )
@@ -185,6 +192,9 @@ var (
 	// StatsTotalAlertRules is a metric of total number of alert rules stored in Grafana.
 	StatsTotalAlertRules prometheus.Gauge
 
+	// StatsTotalRuleGroups is a metric of total number of alert rule groups stored in Grafana.
+	StatsTotalRuleGroups prometheus.Gauge
+
 	// StatsTotalDashboardVersions is a metric of total number of dashboard versions stored in Grafana.
 	StatsTotalDashboardVersions prometheus.Gauge
 
@@ -206,9 +216,39 @@ var (
 	MStatTotalCorrelations prometheus.Gauge
 )
 
+const (
+	// FolderID API
+	GetAlerts                 string = "GetAlerts"
+	GetDashboard              string = "GetDashboard"
+	RestoreDashboardVersion   string = "RestoreDashboardVersion"
+	GetFolderByID             string = "GetFolderByID"
+	GetFolderDescendantCounts string = "GetFolderDescendantCounts"
+	SearchFolders             string = "searchFolders"
+	GetFolderPermissionList   string = "GetFolderPermissionList"
+	UpdateFolderPermissions   string = "UpdateFolderPermissions"
+	GetFolderACL              string = "getFolderACL"
+	Search                    string = "Search"
+	GetDashboardACL           string = "getDashboardACL"
+	NewToFolderDTO            string = "newToFolderDto"
+	GetFolders                string = "GetFolders"
+	// FolderID services
+	Folder           string = "folder"
+	Dashboard        string = "dashboards"
+	LibraryElements  string = "libraryelements"
+	LibraryPanels    string = "librarypanels"
+	NGAlerts         string = "ngalert"
+	Provisioning     string = "provisioning"
+	PublicDashboards string = "publicdashboards"
+	AccessControl    string = "accesscontrol"
+	Guardian         string = "guardian"
+	DashboardImport  string = "dashboardimport"
+)
+
 func init() {
 	httpStatusCodes := []string{"200", "404", "500", "unknown"}
 	objectiveMap := map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.99: 0.001}
+	apiFolderIDMethods := []string{GetAlerts, GetDashboard, RestoreDashboardVersion, GetFolderByID, GetFolderDescendantCounts, SearchFolders, GetFolderPermissionList, UpdateFolderPermissions, GetFolderACL, Search, GetDashboardACL, NewToFolderDTO, GetFolders}
+	folderIDServices := []string{Folder, Dashboard, LibraryElements, LibraryPanels, NGAlerts, Provisioning, PublicDashboards, AccessControl, Guardian, Search, DashboardImport}
 
 	MInstanceStart = prometheus.NewCounter(prometheus.CounterOpts{
 		Name:      "instance_start_total",
@@ -348,24 +388,6 @@ func init() {
 		Namespace: ExporterName,
 	}, []string{"type"})
 
-	MAwsCloudWatchGetMetricStatistics = metricutil.NewCounterStartingAtZero(prometheus.CounterOpts{
-		Name:      "aws_cloudwatch_get_metric_statistics_total",
-		Help:      "counter for getting metric statistics from aws",
-		Namespace: ExporterName,
-	})
-
-	MAwsCloudWatchListMetrics = metricutil.NewCounterStartingAtZero(prometheus.CounterOpts{
-		Name:      "aws_cloudwatch_list_metrics_total",
-		Help:      "counter for getting list of metrics from aws",
-		Namespace: ExporterName,
-	})
-
-	MAwsCloudWatchGetMetricData = metricutil.NewCounterStartingAtZero(prometheus.CounterOpts{
-		Name:      "aws_cloudwatch_get_metric_data_total",
-		Help:      "counter for getting metric data time series from aws",
-		Namespace: ExporterName,
-	})
-
 	MDBDataSourceQueryByID = metricutil.NewCounterStartingAtZero(prometheus.CounterOpts{
 		Name:      "db_datasource_query_by_id_total",
 		Help:      "counter for getting datasource by id",
@@ -446,6 +468,18 @@ func init() {
 		Namespace: ExporterName,
 	}, []string{"datasource", "status"}, map[string][]string{"status": pubdash.QueryResultStatuses})
 
+	MFolderIDsAPICount = metricutil.NewCounterVecStartingAtZero(prometheus.CounterOpts{
+		Name:      "folder_id_api_count",
+		Help:      "counter for folder id usage in api package",
+		Namespace: ExporterName,
+	}, []string{"method"}, map[string][]string{"method": apiFolderIDMethods})
+
+	MFolderIDsServiceCount = metricutil.NewCounterVecStartingAtZero(prometheus.CounterOpts{
+		Name:      "folder_id_service_count",
+		Help:      "counter for folder id usage in service package",
+		Namespace: ExporterName,
+	}, []string{"service"}, map[string][]string{"service": folderIDServices})
+
 	MStatTotalDashboards = prometheus.NewGauge(prometheus.GaugeOpts{
 		Name:      "stat_totals_dashboard",
 		Help:      "total amount of dashboards",
@@ -554,6 +588,12 @@ func init() {
 		Namespace: ExporterName,
 	})
 
+	StatsTotalRuleGroups = prometheus.NewGauge(prometheus.GaugeOpts{
+		Name:      "stat_totals_rule_groups",
+		Help:      "total amount of alert rule groups in the database",
+		Namespace: ExporterName,
+	})
+
 	MAccessPermissionsSummary = prometheus.NewHistogram(prometheus.HistogramOpts{
 		Name:    "access_permissions_duration",
 		Help:    "Histogram for the runtime of permissions check function.",
@@ -572,6 +612,24 @@ func init() {
 		Namespace: ExporterName,
 	})
 
+	MAccessSearchPermissionsSummary = prometheus.NewHistogram(prometheus.HistogramOpts{
+		Name:    "access_search_permissions_duration",
+		Help:    "Histogram for the runtime of permissions search function",
+		Buckets: prometheus.ExponentialBuckets(0.001, 10, 6),
+	})
+
+	MAccessPermissionsCacheUsage = metricutil.NewCounterVecStartingAtZero(prometheus.CounterOpts{
+		Name:      "access_permissions_cache_usage",
+		Help:      "access control permissions cache hit/miss",
+		Namespace: ExporterName,
+	}, []string{"status"}, map[string][]string{"status": accesscontrol.CacheUsageStatuses})
+
+	MAccessSearchUserPermissionsCacheUsage = metricutil.NewCounterVecStartingAtZero(prometheus.CounterOpts{
+		Name:      "access_search_user_permissions_cache_usage",
+		Help:      "access control search user permissions cache hit/miss",
+		Namespace: ExporterName,
+	}, []string{"status"}, map[string][]string{"status": accesscontrol.CacheUsageStatuses})
+
 	StatsTotalLibraryPanels = prometheus.NewGauge(prometheus.GaugeOpts{
 		Name:      "stat_totals_library_panels",
 		Help:      "total amount of library panels in the database",
@@ -604,7 +662,7 @@ func init() {
 }
 
 // SetBuildInformation sets the build information for this binary
-func SetBuildInformation(version, revision, branch string, buildTimestamp int64) {
+func SetBuildInformation(reg prometheus.Registerer, version, revision, branch string, buildTimestamp int64) {
 	edition := "oss"
 	if setting.IsEnterprise {
 		edition = "enterprise"
@@ -622,7 +680,7 @@ func SetBuildInformation(version, revision, branch string, buildTimestamp int64)
 		Namespace: ExporterName,
 	}, []string{"version", "revision", "branch", "goversion", "edition"})
 
-	prometheus.MustRegister(grafanaBuildVersion, grafanaBuildTimestamp)
+	reg.MustRegister(grafanaBuildVersion, grafanaBuildTimestamp)
 
 	grafanaBuildVersion.WithLabelValues(version, revision, branch, runtime.Version(), edition).Set(1)
 	grafanaBuildTimestamp.WithLabelValues(version, revision, branch, runtime.Version(), edition).Set(float64(buildTimestamp))
@@ -630,7 +688,7 @@ func SetBuildInformation(version, revision, branch string, buildTimestamp int64)
 
 // SetEnvironmentInformation exposes environment values provided by the operators as an `_info` metric.
 // If there are no environment metrics labels configured, this metric will not be exposed.
-func SetEnvironmentInformation(labels map[string]string) error {
+func SetEnvironmentInformation(reg prometheus.Registerer, labels map[string]string) error {
 	if len(labels) == 0 {
 		return nil
 	}
@@ -642,7 +700,7 @@ func SetEnvironmentInformation(labels map[string]string) error {
 		ConstLabels: labels,
 	})
 
-	prometheus.MustRegister(grafanaEnvironmentInfo)
+	reg.MustRegister(grafanaEnvironmentInfo)
 
 	grafanaEnvironmentInfo.Set(1)
 	return nil
@@ -652,8 +710,8 @@ func SetPluginBuildInformation(pluginID, pluginType, version, signatureStatus st
 	grafanaPluginBuildInfoDesc.WithLabelValues(pluginID, pluginType, version, signatureStatus).Set(1)
 }
 
-func initMetricVars() {
-	prometheus.MustRegister(
+func initMetricVars(reg prometheus.Registerer) {
+	reg.MustRegister(
 		MInstanceStart,
 		MPageStatus,
 		MApiStatus,
@@ -678,9 +736,6 @@ func initMetricVars() {
 		MAlertingResultState,
 		MAlertingNotificationSent,
 		MAlertingNotificationFailed,
-		MAwsCloudWatchGetMetricStatistics,
-		MAwsCloudWatchListMetrics,
-		MAwsCloudWatchGetMetricData,
 		MDBDataSourceQueryByID,
 		LDAPUsersSyncExecutionTime,
 		MRenderingRequestTotal,
@@ -689,6 +744,10 @@ func initMetricVars() {
 		MRenderingQueue,
 		MAccessPermissionsSummary,
 		MAccessEvaluationsSummary,
+		MAccessSearchPermissionsSummary,
+		MAccessEvaluationCount,
+		MAccessPermissionsCacheUsage,
+		MAccessSearchUserPermissionsCacheUsage,
 		MAlertingActiveAlerts,
 		MStatTotalDashboards,
 		MStatTotalFolders,
@@ -707,7 +766,8 @@ func initMetricVars() {
 		grafanaPluginBuildInfoDesc,
 		StatsTotalDashboardVersions,
 		StatsTotalAnnotations,
-		MAccessEvaluationCount,
+		StatsTotalAlertRules,
+		StatsTotalRuleGroups,
 		StatsTotalLibraryPanels,
 		StatsTotalLibraryVariables,
 		StatsTotalDataKeys,
@@ -715,5 +775,7 @@ func initMetricVars() {
 		MPublicDashboardRequestCount,
 		MPublicDashboardDatasourceQuerySuccess,
 		MStatTotalCorrelations,
+		MFolderIDsAPICount,
+		MFolderIDsServiceCount,
 	)
 }
diff --git a/pkg/infra/metrics/service.go b/pkg/infra/metrics/service.go
index 2b24c2a665d80..5a39501f82ff3 100644
--- a/pkg/infra/metrics/service.go
+++ b/pkg/infra/metrics/service.go
@@ -2,11 +2,17 @@ package metrics
 
 import (
 	"context"
+	"errors"
+	"regexp"
+	"sort"
+
+	"github.com/prometheus/client_golang/prometheus"
+	dto "github.com/prometheus/client_model/go"
+	"k8s.io/component-base/metrics/legacyregistry"
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/metrics/graphitebridge"
 	"github.com/grafana/grafana/pkg/setting"
-	"github.com/prometheus/client_golang/prometheus"
 )
 
 var metricsLogger log.Logger = log.New("metrics")
@@ -19,12 +25,10 @@ func (lw *logWrapper) Println(v ...any) {
 	lw.logger.Info("graphite metric bridge", v...)
 }
 
-func init() {
-	initMetricVars()
-	initFrontendMetrics()
-}
+func ProvideService(cfg *setting.Cfg, reg prometheus.Registerer) (*InternalMetricsService, error) {
+	initMetricVars(reg)
+	initFrontendMetrics(reg)
 
-func ProvideService(cfg *setting.Cfg) (*InternalMetricsService, error) {
 	s := &InternalMetricsService{
 		Cfg: cfg,
 	}
@@ -55,5 +59,98 @@ func (im *InternalMetricsService) Run(ctx context.Context) error {
 	return ctx.Err()
 }
 
-func ProvideRegisterer() prometheus.Registerer        { return prometheus.DefaultRegisterer }
-func ProvideRegistererForTest() prometheus.Registerer { return prometheus.NewRegistry() }
+func ProvideRegisterer() prometheus.Registerer {
+	return legacyregistry.Registerer()
+}
+
+func ProvideGatherer() prometheus.Gatherer {
+	k8sGatherer := newAddPrefixWrapper(legacyregistry.DefaultGatherer)
+	return newMultiRegistry(k8sGatherer, prometheus.DefaultGatherer)
+}
+
+func ProvideRegistererForTest() prometheus.Registerer {
+	return prometheus.NewRegistry()
+}
+
+func ProvideGathererForTest(reg prometheus.Registerer) prometheus.Gatherer {
+	// the registerer provided by ProvideRegistererForTest
+	// is a *prometheus.Registry, so it also implements prometheus.Gatherer
+	return reg.(*prometheus.Registry)
+}
+
+var _ prometheus.Gatherer = (*addPrefixWrapper)(nil)
+
+// addPrefixWrapper wraps a prometheus.Gatherer, and ensures that all metric names are prefixed with `grafana_`.
+// metrics with the prefix `grafana_` or `go_` are not modified.
+type addPrefixWrapper struct {
+	orig prometheus.Gatherer
+	reg  *regexp.Regexp
+}
+
+func newAddPrefixWrapper(orig prometheus.Gatherer) *addPrefixWrapper {
+	return &addPrefixWrapper{
+		orig: orig,
+		reg:  regexp.MustCompile("^((?:grafana_|go_).*)"),
+	}
+}
+
+func (g *addPrefixWrapper) Gather() ([]*dto.MetricFamily, error) {
+	mf, err := g.orig.Gather()
+	if err != nil {
+		return nil, err
+	}
+
+	names := make(map[string]struct{})
+
+	for i := 0; i < len(mf); i++ {
+		m := mf[i]
+		if m.Name != nil && !g.reg.MatchString(*m.Name) {
+			*m.Name = "grafana_" + *m.Name
+			// since we are modifying the name, we need to check for duplicates in the gatherer
+			if _, exists := names[*m.Name]; exists {
+				return nil, errors.New("duplicate metric name: " + *m.Name)
+			}
+		}
+		// keep track of names to detect duplicates
+		names[*m.Name] = struct{}{}
+	}
+
+	return mf, nil
+}
+
+var _ prometheus.Gatherer = (*multiRegistry)(nil)
+
+type multiRegistry struct {
+	gatherers []prometheus.Gatherer
+}
+
+func newMultiRegistry(gatherers ...prometheus.Gatherer) *multiRegistry {
+	return &multiRegistry{
+		gatherers: gatherers,
+	}
+}
+
+func (r *multiRegistry) Gather() (mfs []*dto.MetricFamily, err error) {
+	errs := prometheus.MultiError{}
+
+	names := make(map[string]struct{})
+	for _, g := range r.gatherers {
+		mf, err := g.Gather()
+		errs.Append(err)
+
+		for i := 0; i < len(mf); i++ {
+			m := mf[i]
+			// prevent duplicate metric names
+			if _, exists := names[*m.Name]; !exists {
+				names[*m.Name] = struct{}{}
+				mfs = append(mfs, m)
+			}
+		}
+	}
+
+	sort.Slice(mfs, func(i, j int) bool {
+		return *mfs[i].Name < *mfs[j].Name
+	})
+
+	return mfs, errs.MaybeUnwrap()
+}
diff --git a/pkg/infra/metrics/service_test.go b/pkg/infra/metrics/service_test.go
new file mode 100644
index 0000000000000..b5c9ea92f50f7
--- /dev/null
+++ b/pkg/infra/metrics/service_test.go
@@ -0,0 +1,61 @@
+package metrics
+
+import (
+	"testing"
+
+	dto "github.com/prometheus/client_model/go"
+	"github.com/stretchr/testify/require"
+)
+
+func TestK8sGathererWrapper_Gather(t *testing.T) {
+	orig := &mockGatherer{}
+	g := newAddPrefixWrapper(orig)
+
+	t.Run("metrics with grafana and go prefix are not modified", func(t *testing.T) {
+		originalMF := []*dto.MetricFamily{
+			{Name: strptr("grafana_metric1")},
+			{Name: strptr("metric2")},
+			{Name: strptr("go_metric1")},
+		}
+
+		orig.GatherFunc = func() ([]*dto.MetricFamily, error) {
+			return originalMF, nil
+		}
+
+		expectedMF := []*dto.MetricFamily{
+			{Name: strptr("grafana_metric1")},
+			{Name: strptr("grafana_metric2")},
+			{Name: strptr("go_metric1")},
+		}
+
+		mf, err := g.Gather()
+		require.NoError(t, err)
+		require.Equal(t, expectedMF, mf)
+	})
+
+	t.Run("duplicate metrics result in an error", func(t *testing.T) {
+		originalMF := []*dto.MetricFamily{
+			{Name: strptr("grafana_metric1")},
+			{Name: strptr("metric1")},
+		}
+
+		orig.GatherFunc = func() ([]*dto.MetricFamily, error) {
+			return originalMF, nil
+		}
+
+		_, err := g.Gather()
+		require.Error(t, err)
+	})
+}
+
+type mockGatherer struct {
+	GatherFunc func() ([]*dto.MetricFamily, error)
+}
+
+func (m *mockGatherer) Gather() ([]*dto.MetricFamily, error) {
+	return m.GatherFunc()
+}
+
+func strptr(s string) *string {
+	return &s
+}
diff --git a/pkg/infra/metrics/settings.go b/pkg/infra/metrics/settings.go
index e07f5533a0058..54715db249ecf 100644
--- a/pkg/infra/metrics/settings.go
+++ b/pkg/infra/metrics/settings.go
@@ -8,7 +8,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 
 	"github.com/grafana/grafana/pkg/infra/metrics/graphitebridge"
-	"github.com/grafana/grafana/pkg/setting"
 )
 
 func (im *InternalMetricsService) readSettings() error {
@@ -48,7 +47,7 @@ func (im *InternalMetricsService) parseGraphiteSettings() error {
 		ErrorHandling:   graphitebridge.ContinueOnError,
 	}
 
-	safeInstanceName := strings.ReplaceAll(setting.InstanceName, ".", "_")
+	safeInstanceName := strings.ReplaceAll(im.Cfg.InstanceName, ".", "_")
 	prefix := graphiteSection.Key("prefix").Value()
 
 	if prefix == "" {
diff --git a/pkg/infra/metrics/wireset.go b/pkg/infra/metrics/wireset.go
new file mode 100644
index 0000000000000..489c995badc71
--- /dev/null
+++ b/pkg/infra/metrics/wireset.go
@@ -0,0 +1,17 @@
+package metrics
+
+import (
+	"github.com/google/wire"
+)
+
+var WireSet = wire.NewSet(
+	ProvideService,
+	ProvideRegisterer,
+	ProvideGatherer,
+)
+
+var WireSetForTest = wire.NewSet(
+	ProvideService,
+	ProvideRegistererForTest,
+	ProvideGathererForTest,
+)
diff --git a/pkg/infra/remotecache/redis_storage.go b/pkg/infra/remotecache/redis_storage.go
index 1368453052561..e97679c04f65e 100644
--- a/pkg/infra/remotecache/redis_storage.go
+++ b/pkg/infra/remotecache/redis_storage.go
@@ -3,6 +3,7 @@ package remotecache
 import (
 	"context"
 	"crypto/tls"
+	"errors"
 	"fmt"
 	"strconv"
 	"strings"
@@ -93,7 +94,15 @@ func (s *redisStorage) Set(ctx context.Context, key string, data []byte, expires
 
 // GetByteArray returns the value as byte array
 func (s *redisStorage) Get(ctx context.Context, key string) ([]byte, error) {
-	return s.c.Get(ctx, key).Bytes()
+	item, err := s.c.Get(ctx, key).Bytes()
+	if err != nil {
+		if errors.Is(err, redis.Nil) {
+			return nil, ErrCacheItemNotFound
+		}
+		return nil, err
+	}
+
+	return item, nil
 }
 
 // Delete delete a key from session.
diff --git a/pkg/infra/remotecache/remotecache_test.go b/pkg/infra/remotecache/remotecache_test.go
index 0daf3202abcd9..a51a836fa6ce4 100644
--- a/pkg/infra/remotecache/remotecache_test.go
+++ b/pkg/infra/remotecache/remotecache_test.go
@@ -13,8 +13,13 @@ import (
 	"github.com/grafana/grafana/pkg/services/secrets"
 	"github.com/grafana/grafana/pkg/services/secrets/fakes"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func createTestClient(t *testing.T, opts *setting.RemoteCacheOptions, sqlstore db.DB) CacheStorage {
 	t.Helper()
 
diff --git a/pkg/infra/serverlock/serverlock.go b/pkg/infra/serverlock/serverlock.go
index ab69eaaf94139..4de9c3fe6bb85 100644
--- a/pkg/infra/serverlock/serverlock.go
+++ b/pkg/infra/serverlock/serverlock.go
@@ -2,13 +2,19 @@ package serverlock
 
 import (
 	"context"
+	"errors"
+	"fmt"
+	"math/rand"
 	"time"
 
 	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/codes"
 
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 )
 
 func ProvideService(sqlStore db.DB, tracer tracing.Tracer) *ServerLockService {
@@ -44,6 +50,7 @@ func (sl *ServerLockService) LockAndExecute(ctx context.Context, actionName stri
 	rowLock, err := sl.getOrCreate(ctx, actionName)
 	if err != nil {
 		span.RecordError(err)
+		span.SetStatus(codes.Error, fmt.Sprintf("failed to getOrCreate serverlock: %v", err))
 		return err
 	}
 
@@ -56,6 +63,7 @@ func (sl *ServerLockService) LockAndExecute(ctx context.Context, actionName stri
 	acquiredLock, err := sl.acquireLock(ctx, rowLock)
 	if err != nil {
 		span.RecordError(err)
+		span.SetStatus(codes.Error, fmt.Sprintf("failed to acquire serverlock: %v", err))
 		return err
 	}
 
@@ -79,9 +87,10 @@ func (sl *ServerLockService) acquireLock(ctx context.Context, serverLock *server
 			version = ?,
 			last_execution = ?
 		WHERE
-			id = ? AND version = ?`
+			operation_uid = ? AND version = ?`
 
-		res, err := dbSession.Exec(sql, newVersion, time.Now().Unix(), serverLock.Id, serverLock.Version)
+		res, err := dbSession.Exec(sql, newVersion, time.Now().Unix(),
+			serverLock.OperationUID, serverLock.Version)
 		if err != nil {
 			return err
 		}
@@ -100,16 +109,16 @@ func (sl *ServerLockService) getOrCreate(ctx context.Context, actionName string)
 	defer span.End()
 
 	var result *serverLock
-
 	err := sl.SQLStore.WithTransactionalDbSession(ctx, func(dbSession *db.Session) error {
-		lockRows := []*serverLock{}
-		err := dbSession.Where("operation_uid = ?", actionName).Find(&lockRows)
+		sqlRes := &serverLock{}
+		has, err := dbSession.SQL("SELECT * FROM server_lock WHERE operation_uid = ?",
+			actionName).Get(sqlRes)
 		if err != nil {
 			return err
 		}
 
-		if len(lockRows) > 0 {
-			result = lockRows[0]
+		if has {
+			result = sqlRes
 			return nil
 		}
 
@@ -117,14 +126,8 @@ func (sl *ServerLockService) getOrCreate(ctx context.Context, actionName string)
 			OperationUID:  actionName,
 			LastExecution: 0,
 		}
-
-		_, err = dbSession.Insert(lockRow)
-		if err != nil {
-			return err
-		}
-
-		result = lockRow
-		return nil
+		result, err = sl.createLock(ctx, lockRow, dbSession)
+		return err
 	})
 
 	return result, err
@@ -148,6 +151,7 @@ func (sl *ServerLockService) LockExecuteAndRelease(ctx context.Context, actionNa
 	// could not get the lock, returning
 	if err != nil {
 		span.RecordError(err)
+		span.SetStatus(codes.Error, fmt.Sprintf("failed to acquire serverlock: %v", err))
 		return err
 	}
 
@@ -156,6 +160,7 @@ func (sl *ServerLockService) LockExecuteAndRelease(ctx context.Context, actionNa
 	err = sl.releaseLock(ctx, actionName)
 	if err != nil {
 		span.RecordError(err)
+		span.SetStatus(codes.Error, fmt.Sprintf("failed to release serverlock: %v", err))
 		ctxLogger.Error("Failed to release the lock", "error", err)
 	}
 
@@ -164,6 +169,76 @@ func (sl *ServerLockService) LockExecuteAndRelease(ctx context.Context, actionNa
 	return nil
 }
 
+// RetryOpt is a callback function called after each failed lock acquisition try.
+// It gets the number of tries passed as an arg.
+type RetryOpt func(int) error
+
+type LockTimeConfig struct {
+	MaxInterval time.Duration // Duration after which we consider a lock to be dead and overtake it. Make sure this is big enough so that a server cannot acquire the lock while another server is processing.
+	MinWait     time.Duration // Minimum time to wait before retrying to acquire the lock.
+	MaxWait     time.Duration // Maximum time to wait before retrying to acquire the lock.
+}
+
+// LockExecuteAndReleaseWithRetries mimics LockExecuteAndRelease but waits for the lock to be released if it is already taken.
+func (sl *ServerLockService) LockExecuteAndReleaseWithRetries(ctx context.Context, actionName string, timeConfig LockTimeConfig, fn func(ctx context.Context), retryOpts ...RetryOpt) error {
+	start := time.Now()
+	ctx, span := sl.tracer.Start(ctx, "ServerLockService.LockExecuteAndReleaseWithRetries")
+	span.SetAttributes(attribute.String("serverlock.actionName", actionName))
+	defer span.End()
+
+	ctxLogger := sl.log.FromContext(ctx)
+	ctxLogger.Debug("Start LockExecuteAndReleaseWithRetries", "actionName", actionName)
+
+	lockChecks := 0
+
+	for {
+		lockChecks++
+		err := sl.acquireForRelease(ctx, actionName, timeConfig.MaxInterval)
+		// could not get the lock
+		if err != nil {
+			var lockedErr *ServerLockExistsError
+			if errors.As(err, &lockedErr) {
+				// if the lock is already taken, wait and try again
+				if lockChecks == 1 { // only warn on first lock check
+					ctxLogger.Warn("another instance has the lock, waiting for it to be released", "actionName", actionName)
+				}
+
+				for _, op := range retryOpts {
+					if err := op(lockChecks); err != nil {
+						return err
+					}
+				}
+
+				time.Sleep(lockWait(timeConfig.MinWait, timeConfig.MaxWait))
+				continue
+			}
+			span.RecordError(err)
+			span.SetStatus(codes.Error, fmt.Sprintf("failed to acquire serverlock: %v", err))
+			return err
+		}
+
+		// lock was acquired and released successfully
+		break
+	}
+
+	sl.executeFunc(ctx, actionName, fn)
+
+	if err := sl.releaseLock(ctx, actionName); err != nil {
+		span.RecordError(err)
+		span.SetStatus(codes.Error, fmt.Sprintf("failed to release serverlock: %v", err))
+		ctxLogger.Error("Failed to release the lock", "error", err)
+	}
+
+	ctxLogger.Debug("LockExecuteAndReleaseWithRetries finished", "actionName", actionName, "duration", time.Since(start))
+
+	return nil
+}
+
+// generate a random duration between minWait and maxWait to ensure instances unlock gradually
+func lockWait(minWait time.Duration, maxWait time.Duration) time.Duration {
+	return time.Duration(rand.Int63n(int64(maxWait-minWait)) + int64(minWait))
+}
+
 // acquireForRelease will check if the lock is already on the database, if it is, will check with maxInterval if it is
 // timeouted. Returns nil error if the lock was acquired correctly
 func (sl *ServerLockService) acquireForRelease(ctx context.Context, actionName string, maxInterval time.Duration) error {
@@ -173,50 +248,54 @@ func (sl *ServerLockService) acquireForRelease(ctx context.Context, actionName s
 	// getting the lock - as the action name has a Unique constraint, this will fail if the lock is already on the database
 	err := sl.SQLStore.WithTransactionalDbSession(ctx, func(dbSession *db.Session) error {
 		// we need to find if the lock is in the database
-		lockRows := []*serverLock{}
-		err := dbSession.Where("operation_uid = ?", actionName).Find(&lockRows)
+		result := &serverLock{}
+		sqlRaw := `SELECT * FROM server_lock WHERE operation_uid = ?`
+		if sl.SQLStore.GetDBType() == migrator.MySQL || sl.SQLStore.GetDBType() == migrator.Postgres {
+			sqlRaw += ` FOR UPDATE`
+		}
+
+		has, err := dbSession.SQL(
+			sqlRaw,
+			actionName).Get(result)
 		if err != nil {
 			return err
 		}
 
 		ctxLogger := sl.log.FromContext(ctx)
 
-		if len(lockRows) > 0 {
-			result := lockRows[0]
+		if has {
 			if sl.isLockWithinInterval(result, maxInterval) {
 				return &ServerLockExistsError{actionName: actionName}
-			} else {
-				// lock has timeouted, so we update the timestamp
-				result.LastExecution = time.Now().Unix()
-				cond := &serverLock{OperationUID: actionName}
-				affected, err := dbSession.Update(result, cond)
-				if err != nil {
-					return err
-				}
-				if affected != 1 {
-					ctxLogger.Error("Expected rows affected to be 1 if there was no error", "actionName", actionName, "rowsAffected", affected)
-				}
-				return nil
 			}
-		} else {
-			// lock not found, creating it
-			lockRow := &serverLock{
-				OperationUID:  actionName,
-				LastExecution: time.Now().Unix(),
+			// lock has timed out, so we update the timestamp
+			result.LastExecution = time.Now().Unix()
+			res, err := dbSession.Exec("UPDATE server_lock SET last_execution = ? WHERE operation_uid = ?",
+				result.LastExecution, actionName)
+			if err != nil {
+				return err
 			}
 
-			affected, err := dbSession.Insert(lockRow)
+			affected, err := res.RowsAffected()
 			if err != nil {
-				return err
+				ctxLogger.Error("Error getting rows affected", "actionName", actionName, "error", err)
 			}
 
 			if affected != 1 {
-				// this means that there was no error but there is something not working correctly
 				ctxLogger.Error("Expected rows affected to be 1 if there was no error", "actionName", actionName, "rowsAffected", affected)
 			}
+
+			return nil
 		}
-		return nil
+
+		// lock not found, creating it
+		lock := &serverLock{
+			OperationUID:  actionName,
+			LastExecution: time.Now().Unix(),
+		}
+		_, err = sl.createLock(ctx, lock, dbSession)
+		return err
 	})
+
 	return err
 }
 
@@ -234,10 +313,14 @@ func (sl *ServerLockService) releaseLock(ctx context.Context, actionName string)
 			return err
 		}
 		affected, err := res.RowsAffected()
+		if err != nil {
+			sl.log.FromContext(ctx).Debug("Error getting rows affected", "actionName", actionName, "error", err)
+		}
+
 		if affected != 1 {
 			sl.log.FromContext(ctx).Debug("Error releasing lock", "actionName", actionName, "rowsAffected", affected)
 		}
-		return err
+		return nil
 	})
 
 	return err
@@ -253,7 +336,7 @@ func (sl *ServerLockService) isLockWithinInterval(lock *serverLock, maxInterval
 	return false
 }
 
-func (sl ServerLockService) executeFunc(ctx context.Context, actionName string, fn func(ctx context.Context)) {
+func (sl *ServerLockService) executeFunc(ctx context.Context, actionName string, fn func(ctx context.Context)) {
 	start := time.Now()
 	ctx, span := sl.tracer.Start(ctx, "ServerLockService.executeFunc")
 	defer span.End()
@@ -265,3 +348,44 @@ func (sl ServerLockService) executeFunc(ctx context.Context, actionName string,
 
 	ctxLogger.Debug("Execution finished", "actionName", actionName, "duration", time.Since(start))
 }
+
+func (sl *ServerLockService) createLock(ctx context.Context,
+	lockRow *serverLock, dbSession *sqlstore.DBSession) (*serverLock, error) {
+	affected := int64(1)
+	rawSQL := `INSERT INTO server_lock (operation_uid, last_execution, version) VALUES (?, ?, ?)`
+	if sl.SQLStore.GetDBType() == migrator.Postgres {
+		rawSQL += ` RETURNING id`
+		var id int64
+		_, err := dbSession.SQL(rawSQL, lockRow.OperationUID, lockRow.LastExecution, 0).Get(&id)
+		if err != nil {
+			return nil, err
+		}
+		lockRow.Id = id
+	} else {
+		res, err := dbSession.Exec(
+			rawSQL,
+			lockRow.OperationUID, lockRow.LastExecution, 0)
+		if err != nil {
+			return nil, err
+		}
+		lastID, err := res.LastInsertId()
+		if err != nil {
+			sl.log.FromContext(ctx).Error("Error getting last insert id", "actionName", lockRow.OperationUID, "error", err)
+		}
+		lockRow.Id = lastID
+
+		affected, err = res.RowsAffected()
+		if err != nil {
+			sl.log.FromContext(ctx).Error("Error getting rows affected", "actionName", lockRow.OperationUID, "error", err)
+		}
+	}
+
+	if affected != 1 || lockRow.Id == 0 {
+		sl.log.FromContext(ctx).Error("Expected rows affected to be 1 if there was no error",
+			"actionName", lockRow.OperationUID,
+			"rowsAffected", affected,
+			"lockRow ID", lockRow.Id)
+	}
+
+	return lockRow, nil
+}
diff --git a/pkg/infra/serverlock/serverlock_integration_test.go b/pkg/infra/serverlock/serverlock_integration_test.go
index 0cfbba25a03b7..9e1d43d70c027 100644
--- a/pkg/infra/serverlock/serverlock_integration_test.go
+++ b/pkg/infra/serverlock/serverlock_integration_test.go
@@ -2,6 +2,7 @@ package serverlock
 
 import (
 	"context"
+	"sync"
 	"testing"
 	"time"
 
@@ -19,11 +20,11 @@ func TestIntegrationServerLock_LockAndExecute(t *testing.T) {
 	atInterval := time.Hour
 	ctx := context.Background()
 
-	//this time `fn` should be executed
+	// this time `fn` should be executed
 	require.Nil(t, sl.LockAndExecute(ctx, "test-operation", atInterval, fn))
 	require.Equal(t, 1, counter)
 
-	//this should not execute `fn`
+	// this should not execute `fn`
 	require.Nil(t, sl.LockAndExecute(ctx, "test-operation", atInterval, fn))
 	require.Nil(t, sl.LockAndExecute(ctx, "test-operation", atInterval, fn))
 	require.Equal(t, 1, counter)
@@ -62,3 +63,65 @@ func TestIntegrationServerLock_LockExecuteAndRelease(t *testing.T) {
 
 	require.Equal(t, 4, counter)
 }
+
+func TestIntegrationServerLock_LockExecuteAndReleaseWithRetries(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+	sl := createTestableServerLock(t)
+
+	retries := 0
+	expectedRetries := 10
+	funcRuns := 0
+	fn := func(context.Context) {
+		funcRuns++
+	}
+	lockTimeConfig := LockTimeConfig{
+		MaxInterval: time.Hour,
+		MinWait:     0 * time.Millisecond,
+		MaxWait:     1 * time.Millisecond,
+	}
+	ctx := context.Background()
+	actionName := "test-operation"
+
+	// Acquire lock so that when `LockExecuteAndReleaseWithRetries` runs, it is forced
+	// to retry
+	err := sl.acquireForRelease(ctx, actionName, lockTimeConfig.MaxInterval)
+	require.NoError(t, err)
+
+	wgRetries := sync.WaitGroup{}
+	wgRetries.Add(expectedRetries)
+	wgRelease := sync.WaitGroup{}
+	wgRelease.Add(1)
+	wgCompleted := sync.WaitGroup{}
+	wgCompleted.Add(1)
+
+	onRetryFn := func(int) error {
+		retries++
+		wgRetries.Done()
+		if retries == expectedRetries {
+			// When we reach `expectedRetries`, wait for the lock to be released
+			// to guarantee that next try will succeed
+			wgRelease.Wait()
+		}
+		return nil
+	}
+
+	go func() {
+		err := sl.LockExecuteAndReleaseWithRetries(ctx, actionName, lockTimeConfig, fn, onRetryFn)
+		require.NoError(t, err)
+		wgCompleted.Done()
+	}()
+
+	// Wait to release the lock until `LockExecuteAndReleaseWithRetries` has retried `expectedRetries` times.
+	wgRetries.Wait()
+	err = sl.releaseLock(ctx, actionName)
+	require.NoError(t, err)
+	wgRelease.Done()
+
+	// `LockExecuteAndReleaseWithRetries` has run completely.
+	// Check that it had to retry because the lock was already taken.
+	wgCompleted.Wait()
+	require.Equal(t, expectedRetries, retries)
+	require.Equal(t, 1, funcRuns)
+}
diff --git a/pkg/infra/serverlock/serverlock_test.go b/pkg/infra/serverlock/serverlock_test.go
index 79212a02c5767..3c060c0f22ecf 100644
--- a/pkg/infra/serverlock/serverlock_test.go
+++ b/pkg/infra/serverlock/serverlock_test.go
@@ -11,8 +11,13 @@ import (
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func createTestableServerLock(t *testing.T) *ServerLockService {
 	t.Helper()
 
diff --git a/pkg/infra/tracing/test_helper.go b/pkg/infra/tracing/test_helper.go
index b1d24abe67179..81d714bb7fbb6 100644
--- a/pkg/infra/tracing/test_helper.go
+++ b/pkg/infra/tracing/test_helper.go
@@ -16,7 +16,7 @@ func WithSpanProcessor(sp tracesdk.SpanProcessor) TracerForTestOption {
 
 func InitializeTracerForTest(opts ...TracerForTestOption) Tracer {
 	exp := tracetest.NewInMemoryExporter()
-	tp, _ := initTracerProvider(exp, "testing", tracesdk.AlwaysSample())
+	tp, _ := initTracerProvider(exp, "grafana", "testing", tracesdk.AlwaysSample())
 
 	for _, opt := range opts {
 		opt(tp)
@@ -24,7 +24,9 @@ func InitializeTracerForTest(opts ...TracerForTestOption) Tracer {
 
 	otel.SetTracerProvider(tp)
 
-	ots := &TracingService{Propagation: "jaeger,w3c", tracerProvider: tp}
+	cfg := NewEmptyTracingConfig()
+	cfg.Propagation = "jaeger,w3c"
+	ots := &TracingService{cfg: cfg, tracerProvider: tp}
 	_ = ots.initOpentelemetryTracer()
 	return ots
 }
diff --git a/pkg/infra/tracing/tracing.go b/pkg/infra/tracing/tracing.go
index 73140e1c7cbd6..233e8cbd60423 100644
--- a/pkg/infra/tracing/tracing.go
+++ b/pkg/infra/tracing/tracing.go
@@ -6,7 +6,6 @@ import (
 	"math"
 	"net"
 	"net/http"
-	"os"
 	"strings"
 	"sync"
 	"time"
@@ -23,11 +22,11 @@ import (
 	tracesdk "go.opentelemetry.io/otel/sdk/trace"
 	semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
 	trace "go.opentelemetry.io/otel/trace"
+	"go.opentelemetry.io/otel/trace/noop"
 
 	"github.com/go-kit/log/level"
 
 	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/setting"
 )
 
 const (
@@ -45,21 +44,11 @@ const (
 )
 
 type TracingService struct {
-	enabled       string
-	Address       string
-	Propagation   string
-	customAttribs []attribute.KeyValue
-
-	sampler          string
-	samplerParam     float64
-	samplerRemoteURL string
-
+	cfg *TracingConfig
 	log log.Logger
 
 	tracerProvider tracerProvider
 	trace.Tracer
-
-	Cfg *setting.Cfg
 }
 
 type tracerProvider interface {
@@ -83,10 +72,9 @@ type Tracer interface {
 	Inject(context.Context, http.Header, trace.Span)
 }
 
-func ProvideService(cfg *setting.Cfg) (*TracingService, error) {
-	ots, err := ParseSettings(cfg)
-	if err != nil {
-		return nil, err
+func ProvideService(tracingCfg *TracingConfig) (*TracingService, error) {
+	if tracingCfg == nil {
+		return nil, fmt.Errorf("tracingCfg cannot be nil")
 	}
 
 	log.RegisterContextualLogProvider(func(ctx context.Context) ([]any, bool) {
@@ -96,19 +84,16 @@ func ProvideService(cfg *setting.Cfg) (*TracingService, error) {
 
 		return nil, false
 	})
-	if err := ots.initOpentelemetryTracer(); err != nil {
-		return nil, err
-	}
-	return ots, nil
-}
 
-func ParseSettings(cfg *setting.Cfg) (*TracingService, error) {
 	ots := &TracingService{
-		Cfg: cfg,
+		cfg: tracingCfg,
 		log: log.New("tracing"),
 	}
-	err := ots.parseSettings()
-	return ots, err
+
+	if err := ots.initOpentelemetryTracer(); err != nil {
+		return nil, err
+	}
+	return ots, nil
 }
 
 func (ots *TracingService) GetTracerProvider() tracerProvider {
@@ -132,96 +117,17 @@ func (noopTracerProvider) Shutdown(ctx context.Context) error {
 	return nil
 }
 
-func (ots *TracingService) parseSettings() error {
-	legacyAddress, legacyTags := "", ""
-	if section, err := ots.Cfg.Raw.GetSection("tracing.jaeger"); err == nil {
-		legacyAddress = section.Key("address").MustString("")
-		if legacyAddress == "" {
-			host, port := os.Getenv(envJaegerAgentHost), os.Getenv(envJaegerAgentPort)
-			if host != "" || port != "" {
-				legacyAddress = fmt.Sprintf("%s:%s", host, port)
-			}
-		}
-		legacyTags = section.Key("always_included_tag").MustString("")
-		ots.sampler = section.Key("sampler_type").MustString("")
-		ots.samplerParam = section.Key("sampler_param").MustFloat64(1)
-		ots.samplerRemoteURL = section.Key("sampling_server_url").MustString("")
-	}
-	section := ots.Cfg.Raw.Section("tracing.opentelemetry")
-	var err error
-	// we default to legacy tag set (attributes) if the new config format is absent
-	ots.customAttribs, err = splitCustomAttribs(section.Key("custom_attributes").MustString(legacyTags))
-	if err != nil {
-		return err
-	}
-
-	// if sampler_type is set in tracing.opentelemetry, we ignore the config in tracing.jaeger
-	sampler := section.Key("sampler_type").MustString("")
-	if sampler != "" {
-		ots.sampler = sampler
-	}
-
-	samplerParam := section.Key("sampler_param").MustFloat64(0)
-	if samplerParam != 0 {
-		ots.samplerParam = samplerParam
-	}
-
-	samplerRemoteURL := section.Key("sampling_server_url").MustString("")
-	if samplerRemoteURL != "" {
-		ots.samplerRemoteURL = samplerRemoteURL
-	}
-
-	section = ots.Cfg.Raw.Section("tracing.opentelemetry.jaeger")
-	ots.enabled = noopExporter
-
-	// we default to legacy Jaeger agent address if the new config value is empty
-	ots.Address = section.Key("address").MustString(legacyAddress)
-	ots.Propagation = section.Key("propagation").MustString("")
-	if ots.Address != "" {
-		ots.enabled = jaegerExporter
-		return nil
-	}
-
-	section = ots.Cfg.Raw.Section("tracing.opentelemetry.otlp")
-	ots.Address = section.Key("address").MustString("")
-	if ots.Address != "" {
-		ots.enabled = otlpExporter
-	}
-	ots.Propagation = section.Key("propagation").MustString("")
-	return nil
-}
-
-func (ots *TracingService) OTelExporterEnabled() bool {
-	return ots.enabled == otlpExporter
-}
-
-func splitCustomAttribs(s string) ([]attribute.KeyValue, error) {
-	res := []attribute.KeyValue{}
-
-	attribs := strings.Split(s, ",")
-	for _, v := range attribs {
-		parts := strings.SplitN(v, ":", 2)
-		if len(parts) > 1 {
-			res = append(res, attribute.String(parts[0], parts[1]))
-		} else if v != "" {
-			return nil, fmt.Errorf("custom attribute malformed - must be in 'key:value' form: %q", v)
-		}
-	}
-
-	return res, nil
-}
-
 func (ots *TracingService) initJaegerTracerProvider() (*tracesdk.TracerProvider, error) {
 	var ep jaeger.EndpointOption
 	// Create the Jaeger exporter: address can be either agent address (host:port) or collector URL
-	if strings.HasPrefix(ots.Address, "http://") || strings.HasPrefix(ots.Address, "https://") {
-		ots.log.Debug("using jaeger collector", "address", ots.Address)
-		ep = jaeger.WithCollectorEndpoint(jaeger.WithEndpoint(ots.Address))
-	} else if host, port, err := net.SplitHostPort(ots.Address); err == nil {
+	if strings.HasPrefix(ots.cfg.Address, "http://") || strings.HasPrefix(ots.cfg.Address, "https://") {
+		ots.log.Debug("using jaeger collector", "address", ots.cfg.Address)
+		ep = jaeger.WithCollectorEndpoint(jaeger.WithEndpoint(ots.cfg.Address))
+	} else if host, port, err := net.SplitHostPort(ots.cfg.Address); err == nil {
 		ots.log.Debug("using jaeger agent", "host", host, "port", port)
 		ep = jaeger.WithAgentEndpoint(jaeger.WithAgentHost(host), jaeger.WithAgentPort(port), jaeger.WithMaxPacketSize(64000))
 	} else {
-		return nil, fmt.Errorf("invalid tracer address: %s", ots.Address)
+		return nil, fmt.Errorf("invalid tracer address: %s", ots.cfg.Address)
 	}
 	exp, err := jaeger.New(ep)
 	if err != nil {
@@ -233,10 +139,10 @@ func (ots *TracingService) initJaegerTracerProvider() (*tracesdk.TracerProvider,
 		resource.WithAttributes(
 			// TODO: why are these attributes different from ones added to the
 			// OTLP provider?
-			semconv.ServiceNameKey.String("grafana"),
+			semconv.ServiceNameKey.String(ots.cfg.ServiceName),
 			attribute.String("environment", "production"),
 		),
-		resource.WithAttributes(ots.customAttribs...),
+		resource.WithAttributes(ots.cfg.CustomAttribs...),
 	)
 	if err != nil {
 		return nil, err
@@ -257,7 +163,7 @@ func (ots *TracingService) initJaegerTracerProvider() (*tracesdk.TracerProvider,
 }
 
 func (ots *TracingService) initOTLPTracerProvider() (*tracesdk.TracerProvider, error) {
-	client := otlptracegrpc.NewClient(otlptracegrpc.WithEndpoint(ots.Address), otlptracegrpc.WithInsecure())
+	client := otlptracegrpc.NewClient(otlptracegrpc.WithEndpoint(ots.cfg.Address), otlptracegrpc.WithInsecure())
 	exp, err := otlptrace.New(context.Background(), client)
 	if err != nil {
 		return nil, err
@@ -268,39 +174,39 @@ func (ots *TracingService) initOTLPTracerProvider() (*tracesdk.TracerProvider, e
 		return nil, err
 	}
 
-	return initTracerProvider(exp, ots.Cfg.BuildVersion, sampler, ots.customAttribs...)
+	return initTracerProvider(exp, ots.cfg.ServiceName, ots.cfg.ServiceVersion, sampler, ots.cfg.CustomAttribs...)
 }
 
 func (ots *TracingService) initSampler() (tracesdk.Sampler, error) {
-	switch ots.sampler {
+	switch ots.cfg.Sampler {
 	case "const", "":
-		if ots.samplerParam >= 1 {
+		if ots.cfg.SamplerParam >= 1 {
 			return tracesdk.AlwaysSample(), nil
-		} else if ots.samplerParam <= 0 {
+		} else if ots.cfg.SamplerParam <= 0 {
 			return tracesdk.NeverSample(), nil
 		}
 
-		return nil, fmt.Errorf("invalid param for const sampler - must be 0 or 1: %f", ots.samplerParam)
+		return nil, fmt.Errorf("invalid param for const sampler - must be 0 or 1: %f", ots.cfg.SamplerParam)
 	case "probabilistic":
-		return tracesdk.TraceIDRatioBased(ots.samplerParam), nil
+		return tracesdk.TraceIDRatioBased(ots.cfg.SamplerParam), nil
 	case "rateLimiting":
-		return newRateLimiter(ots.samplerParam), nil
+		return newRateLimiter(ots.cfg.SamplerParam), nil
 	case "remote":
 		return jaegerremote.New("grafana",
-			jaegerremote.WithSamplingServerURL(ots.samplerRemoteURL),
-			jaegerremote.WithInitialSampler(tracesdk.TraceIDRatioBased(ots.samplerParam)),
+			jaegerremote.WithSamplingServerURL(ots.cfg.SamplerRemoteURL),
+			jaegerremote.WithInitialSampler(tracesdk.TraceIDRatioBased(ots.cfg.SamplerParam)),
 		), nil
 	default:
-		return nil, fmt.Errorf("invalid sampler type: %s", ots.sampler)
+		return nil, fmt.Errorf("invalid sampler type: %s", ots.cfg.Sampler)
 	}
 }
 
-func initTracerProvider(exp tracesdk.SpanExporter, version string, sampler tracesdk.Sampler, customAttribs ...attribute.KeyValue) (*tracesdk.TracerProvider, error) {
+func initTracerProvider(exp tracesdk.SpanExporter, serviceName string, serviceVersion string, sampler tracesdk.Sampler, customAttribs ...attribute.KeyValue) (*tracesdk.TracerProvider, error) {
 	res, err := resource.New(
 		context.Background(),
 		resource.WithAttributes(
-			semconv.ServiceNameKey.String("grafana"),
-			semconv.ServiceVersionKey.String(version),
+			semconv.ServiceNameKey.String(serviceName),
+			semconv.ServiceVersionKey.String(serviceVersion),
 		),
 		resource.WithAttributes(customAttribs...),
 		resource.WithProcessRuntimeDescription(),
@@ -319,13 +225,13 @@ func initTracerProvider(exp tracesdk.SpanExporter, version string, sampler trace
 }
 
 func (ots *TracingService) initNoopTracerProvider() (tracerProvider, error) {
-	return &noopTracerProvider{TracerProvider: trace.NewNoopTracerProvider()}, nil
+	return &noopTracerProvider{TracerProvider: noop.NewTracerProvider()}, nil
 }
 
 func (ots *TracingService) initOpentelemetryTracer() error {
 	var tp tracerProvider
 	var err error
-	switch ots.enabled {
+	switch ots.cfg.enabled {
 	case jaegerExporter:
 		tp, err = ots.initJaegerTracerProvider()
 		if err != nil {
@@ -346,12 +252,12 @@ func (ots *TracingService) initOpentelemetryTracer() error {
 	// Register our TracerProvider as the global so any imported
 	// instrumentation in the future will default to using it
 	// only if tracing is enabled
-	if ots.enabled != "" {
+	if ots.cfg.enabled != "" {
 		otel.SetTracerProvider(tp)
 	}
 
 	propagators := []propagation.TextMapPropagator{}
-	for _, p := range strings.Split(ots.Propagation, ",") {
+	for _, p := range strings.Split(ots.cfg.Propagation, ",") {
 		switch p {
 		case w3cPropagator:
 			propagators = append(propagators, propagation.TraceContext{}, propagation.Baggage{})
diff --git a/pkg/infra/tracing/tracing_config.go b/pkg/infra/tracing/tracing_config.go
new file mode 100644
index 0000000000000..14c878a2351ac
--- /dev/null
+++ b/pkg/infra/tracing/tracing_config.go
@@ -0,0 +1,144 @@
+package tracing
+
+import (
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/grafana/grafana/pkg/setting"
+	"go.opentelemetry.io/otel/attribute"
+)
+
+type TracingConfig struct {
+	enabled       string
+	Address       string
+	Propagation   string
+	CustomAttribs []attribute.KeyValue
+
+	Sampler          string
+	SamplerParam     float64
+	SamplerRemoteURL string
+
+	ServiceName    string
+	ServiceVersion string
+}
+
+func ProvideTracingConfig(cfg *setting.Cfg) (*TracingConfig, error) {
+	return ParseTracingConfig(cfg)
+}
+
+func NewEmptyTracingConfig() *TracingConfig {
+	return &TracingConfig{
+		CustomAttribs: []attribute.KeyValue{},
+	}
+}
+
+func NewJaegerTracingConfig(address string, propagation string) (*TracingConfig, error) {
+	if address == "" {
+		return nil, fmt.Errorf("address cannot be empty")
+	}
+
+	cfg := NewEmptyTracingConfig()
+	cfg.enabled = jaegerExporter
+	cfg.Address = address
+	cfg.Propagation = propagation
+	return cfg, nil
+}
+
+func NewOTLPTracingConfig(address string, propagation string) (*TracingConfig, error) {
+	if address == "" {
+		return nil, fmt.Errorf("address cannot be empty")
+	}
+
+	cfg := NewEmptyTracingConfig()
+	cfg.enabled = otlpExporter
+	cfg.Address = address
+	cfg.Propagation = propagation
+	return cfg, nil
+}
+
+func ParseTracingConfig(cfg *setting.Cfg) (*TracingConfig, error) {
+	if cfg == nil {
+		return nil, fmt.Errorf("cfg cannot be nil")
+	}
+	tc := NewEmptyTracingConfig()
+	tc.ServiceName = "grafana"
+	tc.ServiceVersion = cfg.BuildVersion
+
+	legacyAddress, legacyTags := "", ""
+	if section, err := cfg.Raw.GetSection("tracing.jaeger"); err == nil {
+		legacyAddress = section.Key("address").MustString("")
+		if legacyAddress == "" {
+			host, port := os.Getenv(envJaegerAgentHost), os.Getenv(envJaegerAgentPort)
+			if host != "" || port != "" {
+				legacyAddress = fmt.Sprintf("%s:%s", host, port)
+			}
+		}
+		legacyTags = section.Key("always_included_tag").MustString("")
+		tc.Sampler = section.Key("sampler_type").MustString("")
+		tc.SamplerParam = section.Key("sampler_param").MustFloat64(1)
+		tc.SamplerRemoteURL = section.Key("sampling_server_url").MustString("")
+	}
+	section := cfg.Raw.Section("tracing.opentelemetry")
+	var err error
+	// we default to legacy tag set (attributes) if the new config format is absent
+	tc.CustomAttribs, err = splitCustomAttribs(section.Key("custom_attributes").MustString(legacyTags))
+	if err != nil {
+		return nil, err
+	}
+
+	// if sampler_type is set in tracing.opentelemetry, we ignore the config in tracing.jaeger
+	sampler := section.Key("sampler_type").MustString("")
+	if sampler != "" {
+		tc.Sampler = sampler
+	}
+
+	samplerParam := section.Key("sampler_param").MustFloat64(0)
+	if samplerParam != 0 {
+		tc.SamplerParam = samplerParam
+	}
+
+	samplerRemoteURL := section.Key("sampling_server_url").MustString("")
+	if samplerRemoteURL != "" {
+		tc.SamplerRemoteURL = samplerRemoteURL
+	}
+
+	section = cfg.Raw.Section("tracing.opentelemetry.jaeger")
+	tc.enabled = noopExporter
+
+	// we default to legacy Jaeger agent address if the new config value is empty
+	tc.Address = section.Key("address").MustString(legacyAddress)
+	tc.Propagation = section.Key("propagation").MustString("")
+	if tc.Address != "" {
+		tc.enabled = jaegerExporter
+		return tc, nil
+	}
+
+	section = cfg.Raw.Section("tracing.opentelemetry.otlp")
+	tc.Address = section.Key("address").MustString("")
+	if tc.Address != "" {
+		tc.enabled = otlpExporter
+	}
+	tc.Propagation = section.Key("propagation").MustString("")
+	return tc, nil
+}
+
+func (tc TracingConfig) OTelExporterEnabled() bool {
+	return tc.enabled == otlpExporter
+}
+
+func splitCustomAttribs(s string) ([]attribute.KeyValue, error) {
+	res := []attribute.KeyValue{}
+
+	attribs := strings.Split(s, ",")
+	for _, v := range attribs {
+		parts := strings.SplitN(v, ":", 2)
+		if len(parts) > 1 {
+			res = append(res, attribute.String(parts[0], parts[1]))
+		} else if v != "" {
+			return nil, fmt.Errorf("custom attribute malformed - must be in 'key:value' form: %q", v)
+		}
+	}
+
+	return res, nil
+}
diff --git a/pkg/infra/tracing/tracing_config_test.go b/pkg/infra/tracing/tracing_config_test.go
new file mode 100644
index 0000000000000..e8d6be3e10944
--- /dev/null
+++ b/pkg/infra/tracing/tracing_config_test.go
@@ -0,0 +1,190 @@
+package tracing
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"go.opentelemetry.io/otel/attribute"
+
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+// TODO(zserge) Add proper tests for opentelemetry
+
+func TestSplitCustomAttribs(t *testing.T) {
+	tests := []struct {
+		input    string
+		expected []attribute.KeyValue
+	}{
+		{
+			input:    "key1:value:1",
+			expected: []attribute.KeyValue{attribute.String("key1", "value:1")},
+		},
+		{
+			input: "key1:value1,key2:value2",
+			expected: []attribute.KeyValue{
+				attribute.String("key1", "value1"),
+				attribute.String("key2", "value2"),
+			},
+		},
+		{
+			input:    "",
+			expected: []attribute.KeyValue{},
+		},
+	}
+
+	for _, test := range tests {
+		attribs, err := splitCustomAttribs(test.input)
+		assert.NoError(t, err)
+		assert.EqualValues(t, test.expected, attribs)
+	}
+}
+
+func TestSplitCustomAttribs_Malformed(t *testing.T) {
+	tests := []struct {
+		input string
+	}{
+		{input: "key1=value1"},
+		{input: "key1"},
+	}
+
+	for _, test := range tests {
+		_, err := splitCustomAttribs(test.input)
+		assert.Error(t, err)
+	}
+}
+
+func TestTracingConfig(t *testing.T) {
+	for _, test := range []struct {
+		Name               string
+		Cfg                string
+		Env                map[string]string
+		ExpectedExporter   string
+		ExpectedAddress    string
+		ExpectedPropagator string
+		ExpectedAttrs      []attribute.KeyValue
+
+		ExpectedSampler           string
+		ExpectedSamplerParam      float64
+		ExpectedSamplingServerURL string
+	}{
+		{
+			Name:             "default config uses noop exporter",
+			Cfg:              "",
+			ExpectedExporter: noopExporter,
+			ExpectedAttrs:    []attribute.KeyValue{},
+		},
+		{
+			Name: "custom attributes are parsed",
+			Cfg: `
+			[tracing.opentelemetry]
+			custom_attributes = key1:value1,key2:value2
+			`,
+			ExpectedExporter: noopExporter,
+			ExpectedAttrs:    []attribute.KeyValue{attribute.String("key1", "value1"), attribute.String("key2", "value2")},
+		},
+		{
+			Name: "jaeger address is parsed",
+			Cfg: `
+			[tracing.opentelemetry.jaeger]
+			address = jaeger.example.com:6831
+			`,
+			ExpectedExporter: jaegerExporter,
+			ExpectedAddress:  "jaeger.example.com:6831",
+			ExpectedAttrs:    []attribute.KeyValue{},
+		},
+		{
+			Name: "OTLP address is parsed",
+			Cfg: `
+			[tracing.opentelemetry.otlp]
+			address = otlp.example.com:4317
+			`,
+			ExpectedExporter: otlpExporter,
+			ExpectedAddress:  "otlp.example.com:4317",
+			ExpectedAttrs:    []attribute.KeyValue{},
+		},
+		{
+			Name: "legacy config format is supported",
+			Cfg: `
+			[tracing.jaeger]
+			address = jaeger.example.com:6831
+			`,
+			ExpectedExporter: jaegerExporter,
+			ExpectedAddress:  "jaeger.example.com:6831",
+			ExpectedAttrs:    []attribute.KeyValue{},
+		},
+		{
+			Name: "legacy env variables are supported",
+			Cfg:  `[tracing.jaeger]`,
+			Env: map[string]string{
+				"JAEGER_AGENT_HOST": "example.com",
+				"JAEGER_AGENT_PORT": "12345",
+			},
+			ExpectedExporter: jaegerExporter,
+			ExpectedAddress:  "example.com:12345",
+			ExpectedAttrs:    []attribute.KeyValue{},
+		},
+		{
+			Name: "opentelemetry config format is prioritised over legacy jaeger",
+			Cfg: `
+			[tracing.jaeger]
+			address = foo.com:6831
+			custom_tags = a:b
+			sampler_param = 0
+			[tracing.opentelemetry]
+			custom_attributes = c:d
+			sampler_param = 1
+			[tracing.opentelemetry.jaeger]
+			address = bar.com:6831
+			`,
+			ExpectedExporter:     jaegerExporter,
+			ExpectedAddress:      "bar.com:6831",
+			ExpectedAttrs:        []attribute.KeyValue{attribute.String("c", "d")},
+			ExpectedSamplerParam: 1.0,
+		},
+		{
+			Name: "remote sampler config is parsed from otel config",
+			Cfg: `
+			[tracing.opentelemetry]
+			sampler_type = remote
+			sampler_param = 0.5
+			sampling_server_url = http://example.com:5778/sampling
+			[tracing.opentelemetry.otlp]
+			address = otlp.example.com:4317
+			`,
+			ExpectedExporter:          otlpExporter,
+			ExpectedAddress:           "otlp.example.com:4317",
+			ExpectedAttrs:             []attribute.KeyValue{},
+			ExpectedSampler:           "remote",
+			ExpectedSamplerParam:      0.5,
+			ExpectedSamplingServerURL: "http://example.com:5778/sampling",
+		},
+	} {
+		t.Run(test.Name, func(t *testing.T) {
+			// export environment variables
+			if test.Env != nil {
+				for k, v := range test.Env {
+					t.Setenv(k, v)
+				}
+			}
+			// parse config sections
+			cfg := setting.NewCfg()
+			err := cfg.Raw.Append([]byte(test.Cfg))
+			assert.NoError(t, err)
+			// create tracingConfig
+			tracingConfig, err := ProvideTracingConfig(cfg)
+			assert.NoError(t, err)
+			// make sure tracker is properly configured
+			assert.Equal(t, test.ExpectedExporter, tracingConfig.enabled)
+			assert.Equal(t, test.ExpectedAddress, tracingConfig.Address)
+			assert.Equal(t, test.ExpectedPropagator, tracingConfig.Propagation)
+			assert.Equal(t, test.ExpectedAttrs, tracingConfig.CustomAttribs)
+
+			if test.ExpectedSampler != "" {
+				assert.Equal(t, test.ExpectedSampler, tracingConfig.Sampler)
+				assert.Equal(t, test.ExpectedSamplerParam, tracingConfig.SamplerParam)
+				assert.Equal(t, test.ExpectedSamplingServerURL, tracingConfig.SamplerRemoteURL)
+			}
+		})
+	}
+}
diff --git a/pkg/infra/tracing/tracing_test.go b/pkg/infra/tracing/tracing_test.go
index eeaf587d8f98e..b52b772d4242c 100644
--- a/pkg/infra/tracing/tracing_test.go
+++ b/pkg/infra/tracing/tracing_test.go
@@ -5,220 +5,38 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/otel/attribute"
-
-	"github.com/grafana/grafana/pkg/setting"
 )
 
-// TODO(zserge) Add proper tests for opentelemetry
-
-func TestSplitCustomAttribs(t *testing.T) {
-	tests := []struct {
-		input    string
-		expected []attribute.KeyValue
-	}{
-		{
-			input:    "key1:value:1",
-			expected: []attribute.KeyValue{attribute.String("key1", "value:1")},
-		},
-		{
-			input: "key1:value1,key2:value2",
-			expected: []attribute.KeyValue{
-				attribute.String("key1", "value1"),
-				attribute.String("key2", "value2"),
-			},
-		},
-		{
-			input:    "",
-			expected: []attribute.KeyValue{},
-		},
-	}
-
-	for _, test := range tests {
-		attribs, err := splitCustomAttribs(test.input)
-		assert.NoError(t, err)
-		assert.EqualValues(t, test.expected, attribs)
-	}
-}
-
-func TestSplitCustomAttribs_Malformed(t *testing.T) {
-	tests := []struct {
-		input string
-	}{
-		{input: "key1=value1"},
-		{input: "key1"},
-	}
-
-	for _, test := range tests {
-		_, err := splitCustomAttribs(test.input)
-		assert.Error(t, err)
-	}
-}
-
-func TestTracingConfig(t *testing.T) {
-	for _, test := range []struct {
-		Name               string
-		Cfg                string
-		Env                map[string]string
-		ExpectedExporter   string
-		ExpectedAddress    string
-		ExpectedPropagator string
-		ExpectedAttrs      []attribute.KeyValue
-
-		ExpectedSampler           string
-		ExpectedSamplerParam      float64
-		ExpectedSamplingServerURL string
-	}{
-		{
-			Name:             "default config uses noop exporter",
-			Cfg:              "",
-			ExpectedExporter: noopExporter,
-			ExpectedAttrs:    []attribute.KeyValue{},
-		},
-		{
-			Name: "custom attributes are parsed",
-			Cfg: `
-			[tracing.opentelemetry]
-			custom_attributes = key1:value1,key2:value2
-			`,
-			ExpectedExporter: noopExporter,
-			ExpectedAttrs:    []attribute.KeyValue{attribute.String("key1", "value1"), attribute.String("key2", "value2")},
-		},
-		{
-			Name: "jaeger address is parsed",
-			Cfg: `
-			[tracing.opentelemetry.jaeger]
-			address = jaeger.example.com:6831
-			`,
-			ExpectedExporter: jaegerExporter,
-			ExpectedAddress:  "jaeger.example.com:6831",
-			ExpectedAttrs:    []attribute.KeyValue{},
-		},
-		{
-			Name: "OTLP address is parsed",
-			Cfg: `
-			[tracing.opentelemetry.otlp]
-			address = otlp.example.com:4317
-			`,
-			ExpectedExporter: otlpExporter,
-			ExpectedAddress:  "otlp.example.com:4317",
-			ExpectedAttrs:    []attribute.KeyValue{},
-		},
-		{
-			Name: "legacy config format is supported",
-			Cfg: `
-			[tracing.jaeger]
-			address = jaeger.example.com:6831
-			`,
-			ExpectedExporter: jaegerExporter,
-			ExpectedAddress:  "jaeger.example.com:6831",
-			ExpectedAttrs:    []attribute.KeyValue{},
-		},
-		{
-			Name: "legacy env variables are supported",
-			Cfg:  `[tracing.jaeger]`,
-			Env: map[string]string{
-				"JAEGER_AGENT_HOST": "example.com",
-				"JAEGER_AGENT_PORT": "12345",
-			},
-			ExpectedExporter: jaegerExporter,
-			ExpectedAddress:  "example.com:12345",
-			ExpectedAttrs:    []attribute.KeyValue{},
-		},
-		{
-			Name: "opentelemetry config format is prioritised over legacy jaeger",
-			Cfg: `
-			[tracing.jaeger]
-			address = foo.com:6831
-			custom_tags = a:b
-			sampler_param = 0
-			[tracing.opentelemetry]
-			custom_attributes = c:d
-			sampler_param = 1
-			[tracing.opentelemetry.jaeger]
-			address = bar.com:6831
-			`,
-			ExpectedExporter:     jaegerExporter,
-			ExpectedAddress:      "bar.com:6831",
-			ExpectedAttrs:        []attribute.KeyValue{attribute.String("c", "d")},
-			ExpectedSamplerParam: 1.0,
-		},
-		{
-			Name: "remote sampler config is parsed from otel config",
-			Cfg: `
-			[tracing.opentelemetry]
-			sampler_type = remote
-			sampler_param = 0.5
-			sampling_server_url = http://example.com:5778/sampling
-			[tracing.opentelemetry.otlp]
-			address = otlp.example.com:4317
-			`,
-			ExpectedExporter:          otlpExporter,
-			ExpectedAddress:           "otlp.example.com:4317",
-			ExpectedAttrs:             []attribute.KeyValue{},
-			ExpectedSampler:           "remote",
-			ExpectedSamplerParam:      0.5,
-			ExpectedSamplingServerURL: "http://example.com:5778/sampling",
-		},
-	} {
-		t.Run(test.Name, func(t *testing.T) {
-			// export environment variables
-			if test.Env != nil {
-				for k, v := range test.Env {
-					t.Setenv(k, v)
-				}
-			}
-			// parse config sections
-			cfg := setting.NewCfg()
-			err := cfg.Raw.Append([]byte(test.Cfg))
-			assert.NoError(t, err)
-			// create tracer
-			tracer, err := ProvideService(cfg)
-			assert.NoError(t, err)
-			// make sure tracker is properly configured
-			assert.Equal(t, test.ExpectedExporter, tracer.enabled)
-			assert.Equal(t, test.ExpectedAddress, tracer.Address)
-			assert.Equal(t, test.ExpectedPropagator, tracer.Propagation)
-			assert.Equal(t, test.ExpectedAttrs, tracer.customAttribs)
-
-			if test.ExpectedSampler != "" {
-				assert.Equal(t, test.ExpectedSampler, tracer.sampler)
-				assert.Equal(t, test.ExpectedSamplerParam, tracer.samplerParam)
-				assert.Equal(t, test.ExpectedSamplingServerURL, tracer.samplerRemoteURL)
-			}
-		})
-	}
-}
-
 func TestInitSampler(t *testing.T) {
 	otel := &TracingService{}
+	otel.cfg = NewEmptyTracingConfig()
 	sampler, err := otel.initSampler()
 	require.NoError(t, err)
 	assert.Equal(t, "AlwaysOffSampler", sampler.Description())
 
-	otel.sampler = "bogus"
+	otel.cfg.Sampler = "bogus"
 	_, err = otel.initSampler()
 	require.Error(t, err)
 
-	otel.sampler = "const"
-	otel.samplerParam = 0.5
+	otel.cfg.Sampler = "const"
+	otel.cfg.SamplerParam = 0.5
 	_, err = otel.initSampler()
 	require.Error(t, err)
 
-	otel.sampler = "const"
-	otel.samplerParam = 1.0
+	otel.cfg.Sampler = "const"
+	otel.cfg.SamplerParam = 1.0
 	sampler, err = otel.initSampler()
 	require.NoError(t, err)
 	assert.Equal(t, "AlwaysOnSampler", sampler.Description())
 
-	otel.sampler = "probabilistic"
-	otel.samplerParam = 0.5
+	otel.cfg.Sampler = "probabilistic"
+	otel.cfg.SamplerParam = 0.5
 	sampler, err = otel.initSampler()
 	require.NoError(t, err)
 	assert.Equal(t, "TraceIDRatioBased{0.5}", sampler.Description())
 
-	otel.sampler = "rateLimiting"
-	otel.samplerParam = 100.25
+	otel.cfg.Sampler = "rateLimiting"
+	otel.cfg.SamplerParam = 100.25
 	sampler, err = otel.initSampler()
 	require.NoError(t, err)
 	assert.Equal(t, "RateLimitingSampler{100.25}", sampler.Description())
diff --git a/pkg/infra/usagestats/service/api.go b/pkg/infra/usagestats/service/api.go
index 5bbbb00ce107b..1217b639613a3 100644
--- a/pkg/infra/usagestats/service/api.go
+++ b/pkg/infra/usagestats/service/api.go
@@ -20,7 +20,10 @@ func (uss *UsageStats) registerAPIEndpoints() {
 }
 
 func (uss *UsageStats) getUsageReportPreview(ctx *contextmodel.ReqContext) response.Response {
-	usageReport, err := uss.GetUsageReport(ctx.Req.Context())
+	ctxTracer, span := uss.tracer.Start(ctx.Req.Context(), "usageStats.getUsageReportPreview")
+	defer span.End()
+
+	usageReport, err := uss.GetUsageReport(ctxTracer)
 	if err != nil {
 		return response.Error(http.StatusInternalServerError, "failed to get usage report", err)
 	}
diff --git a/pkg/infra/usagestats/service/api_test.go b/pkg/infra/usagestats/service/api_test.go
index 7f45b7ca97dd0..f2b749f5dff4b 100644
--- a/pkg/infra/usagestats/service/api_test.go
+++ b/pkg/infra/usagestats/service/api_test.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
-	"path"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -15,7 +14,6 @@ import (
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/stats"
 	"github.com/grafana/grafana/pkg/services/user"
-	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/web"
 )
 
@@ -80,7 +78,7 @@ func getUsageStats(t *testing.T, server *web.Mux) (*stats.SystemStats, *httptest
 
 func setupTestServer(t *testing.T, user *user.SignedInUser, service *UsageStats) *web.Mux {
 	server := web.New()
-	server.UseMiddleware(web.Renderer(path.Join(setting.StaticRootPath, "views"), "[[", "]]"))
+	server.UseMiddleware(web.Renderer("views", "[[", "]]"))
 	server.Use(contextProvider(&testContext{user}))
 	service.RouteRegister.Register(server)
 	return server
diff --git a/pkg/infra/usagestats/service/usage_stats.go b/pkg/infra/usagestats/service/usage_stats.go
index 5f40165e596da..88b2d788919af 100644
--- a/pkg/infra/usagestats/service/usage_stats.go
+++ b/pkg/infra/usagestats/service/usage_stats.go
@@ -9,6 +9,7 @@ import (
 	"reflect"
 	"runtime"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/google/uuid"
@@ -19,20 +20,25 @@ import (
 	"github.com/grafana/grafana/pkg/infra/usagestats"
 )
 
+const (
+	maxConcurrentCollectors  = 5
+	collectorTimeoutDuration = 5 * time.Minute
+)
+
 var usageStatsURL = "https://stats.grafana.org/grafana-usage-report"
 
 func (uss *UsageStats) GetUsageReport(ctx context.Context) (usagestats.Report, error) {
 	version := strings.ReplaceAll(uss.Cfg.BuildVersion, ".", "_")
-	metrics := map[string]any{}
+	metrics := sync.Map{}
 	start := time.Now()
 
 	edition := "oss"
 	if uss.Cfg.IsEnterprise {
 		edition = "enterprise"
 	}
+
 	report := usagestats.Report{
 		Version:      version,
-		Metrics:      metrics,
 		Os:           runtime.GOOS,
 		Arch:         runtime.GOARCH,
 		Edition:      edition,
@@ -40,37 +46,62 @@ func (uss *UsageStats) GetUsageReport(ctx context.Context) (usagestats.Report, e
 		UsageStatsId: uss.GetUsageStatsId(ctx),
 	}
 
-	uss.gatherMetrics(ctx, metrics)
+	uss.gatherMetrics(ctx, &metrics)
 
 	// must run after registration of external metrics
-	if v, ok := metrics["stats.valid_license.count"]; ok {
+	if v, ok := metrics.Load("stats.valid_license.count"); ok {
 		report.HasValidLicense = v == 1
 	} else {
-		metrics["stats.valid_license.count"] = 0
+		metrics.Store("stats.valid_license.count", 0)
 	}
 
-	uss.log.FromContext(ctx).Debug("Collected usage stats", "metricCount", len(metrics), "version", report.Version, "os", report.Os, "arch", report.Arch, "edition", report.Edition, "duration", time.Since(start))
+	report.Metrics = make(map[string]any)
+	metricCount := 0
+	metrics.Range(func(key, value any) bool {
+		report.Metrics[key.(string)] = value
+		metricCount++
+		return true
+	})
+
+	uss.log.FromContext(ctx).Debug("Collected usage stats", "metricCount", metricCount, "version", report.Version, "os", report.Os, "arch", report.Arch, "edition", report.Edition, "duration", time.Since(start))
 	return report, nil
 }
 
-func (uss *UsageStats) gatherMetrics(ctx context.Context, metrics map[string]any) {
-	ctx, span := uss.tracer.Start(ctx, "UsageStats.GatherLoop")
+func (uss *UsageStats) gatherMetrics(ctx context.Context, metrics *sync.Map) {
+	ctxTracer, span := uss.tracer.Start(ctx, "UsageStats.GatherLoop")
 	defer span.End()
 	totC, errC := 0, 0
+
+	sem := make(chan struct{}, maxConcurrentCollectors) // create a semaphore with a capacity of 5
+	var wg sync.WaitGroup
+
 	for _, fn := range uss.externalMetrics {
-		fnMetrics, err := uss.runMetricsFunc(ctx, fn)
-		totC++
-		if err != nil {
-			errC++
-			continue
-		}
-
-		for name, value := range fnMetrics {
-			metrics[name] = value
-		}
-	}
-	metrics["stats.usagestats.debug.collect.total.count"] = totC
-	metrics["stats.usagestats.debug.collect.error.count"] = errC
+		wg.Add(1)
+		go func(fn func(context.Context) (map[string]any, error)) {
+			defer wg.Done()
+
+			sem <- struct{}{}        // acquire a token
+			defer func() { <-sem }() // release the token when done
+
+			ctxWithTimeout, cancel := context.WithTimeout(ctxTracer, collectorTimeoutDuration)
+			defer cancel()
+
+			fnMetrics, err := uss.runMetricsFunc(ctxWithTimeout, fn)
+			totC++
+			if err != nil {
+				errC++
+				return
+			}
+
+			for name, value := range fnMetrics {
+				metrics.Store(name, value)
+			}
+		}(fn)
+	}
+
+	wg.Wait()
+	metrics.Store("stats.usagestats.debug.collect.total.count", totC)
+	metrics.Store("stats.usagestats.debug.collect.error.count", errC)
 }
 
 func (uss *UsageStats) runMetricsFunc(ctx context.Context, fn usagestats.MetricsFunc) (map[string]any, error) {
diff --git a/pkg/infra/usagestats/service/usage_stats_test.go b/pkg/infra/usagestats/service/usage_stats_test.go
index fceb924ad35a2..cd0d9a8370437 100644
--- a/pkg/infra/usagestats/service/usage_stats_test.go
+++ b/pkg/infra/usagestats/service/usage_stats_test.go
@@ -9,6 +9,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"runtime"
+	"sync"
 	"testing"
 	"time"
 
@@ -25,8 +26,13 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
 	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 // This is to ensure that the interface contract is held by the implementation
 func Test_InterfaceContractValidity(t *testing.T) {
 	newUsageStats := func() usagestats.Service {
@@ -80,7 +86,7 @@ func TestMetrics(t *testing.T) {
 			AnonymousEnabled:     true,
 			BasicAuthEnabled:     true,
 			LDAPAuthEnabled:      true,
-			AuthProxyEnabled:     true,
+			AuthProxy:            setting.AuthProxySettings{Enabled: true},
 			Packaging:            "deb",
 			ReportingDistributor: "hosted-grafana",
 		}
@@ -170,7 +176,9 @@ func TestRegisterMetrics(t *testing.T) {
 
 	sqlStore := dbtest.NewFakeDB()
 	uss := createService(t, sqlStore, false)
-	metrics := map[string]any{"stats.test_metric.count": 1, "stats.test_metric_second.count": 2}
+	metrics := sync.Map{}
+	metrics.Store("stats.test_metric.count", 1)
+	metrics.Store("stats.test_metric_second.count", 2)
 
 	uss.RegisterMetricsFunc(func(context.Context) (map[string]any, error) {
 		return map[string]any{goodMetricName: 1}, nil
@@ -182,9 +190,15 @@ func TestRegisterMetrics(t *testing.T) {
 		assert.Equal(t, map[string]any{goodMetricName: 1}, extMetrics)
 	}
 
-	uss.gatherMetrics(context.Background(), metrics)
-	assert.Equal(t, 1, metrics[goodMetricName])
-	metricsCount := len(metrics)
+	uss.gatherMetrics(context.Background(), &metrics)
+	v, ok := metrics.Load(goodMetricName)
+	assert.True(t, ok)
+	assert.Equal(t, 1, v)
+	metricsCountBefore := 0
+	metrics.Range(func(_, _ any) bool {
+		metricsCountBefore++
+		return true
+	})
 
 	t.Run("do not add metrics that return an error when fetched", func(t *testing.T) {
 		const badMetricName = "stats.test_external_metric_error.count"
@@ -192,15 +206,26 @@ func TestRegisterMetrics(t *testing.T) {
 		uss.RegisterMetricsFunc(func(context.Context) (map[string]any, error) {
 			return map[string]any{badMetricName: 1}, errors.New("some error")
 		})
-		uss.gatherMetrics(context.Background(), metrics)
+		uss.gatherMetrics(context.Background(), &metrics)
 
-		extErrorMetric := metrics[badMetricName]
-		extMetric := metrics[goodMetricName]
+		extErrorMetric, ok := metrics.Load(badMetricName)
+		assert.False(t, ok)
+		extMetric, ok := metrics.Load(goodMetricName)
+		assert.True(t, ok)
 
 		require.Nil(t, extErrorMetric, "Invalid metric should not be added")
 		assert.Equal(t, 1, extMetric)
-		assert.Len(t, metrics, metricsCount, "Expected same number of metrics before and after collecting bad metric")
-		assert.EqualValues(t, 1, metrics["stats.usagestats.debug.collect.error.count"])
+
+		metricsCountAfter := 0
+		metrics.Range(func(_, _ any) bool {
+			metricsCountAfter++
+			return true
+		})
+
+		assert.Equal(t, metricsCountAfter, metricsCountBefore, "Expected same number of metrics before and after collecting bad metric")
+		errCount, ok := metrics.Load("stats.usagestats.debug.collect.error.count")
+		assert.True(t, ok)
+		assert.EqualValues(t, 1, errCount)
 	})
 }
 
diff --git a/pkg/infra/usagestats/statscollector/concurrent_users_test.go b/pkg/infra/usagestats/statscollector/concurrent_users_test.go
index 15c006441bddc..33ffcb3244abd 100644
--- a/pkg/infra/usagestats/statscollector/concurrent_users_test.go
+++ b/pkg/infra/usagestats/statscollector/concurrent_users_test.go
@@ -14,9 +14,15 @@ import (
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/services/stats/statsimpl"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 	"github.com/grafana/grafana/pkg/util"
 )
 
+// run tests with cleanup
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestConcurrentUsersMetrics(t *testing.T) {
 	sqlStore, cfg := db.InitTestDBwithCfg(t)
 	statsService := statsimpl.ProvideService(&setting.Cfg{}, sqlStore)
diff --git a/pkg/infra/usagestats/statscollector/prometheus_flavor.go b/pkg/infra/usagestats/statscollector/prometheus_flavor.go
index 9bba50c17dab8..8cd2ed31318e3 100644
--- a/pkg/infra/usagestats/statscollector/prometheus_flavor.go
+++ b/pkg/infra/usagestats/statscollector/prometheus_flavor.go
@@ -5,8 +5,11 @@ import (
 	"encoding/json"
 	"io"
 	"net/http"
+	"sync"
 	"time"
 
+	"golang.org/x/sync/errgroup"
+
 	"github.com/grafana/grafana/pkg/services/datasources"
 )
 
@@ -44,21 +47,43 @@ func (s *Service) detectPrometheusVariants(ctx context.Context) (map[string]int6
 		return nil, err
 	}
 
-	variants := map[string]int64{}
+	g, ctx := errgroup.WithContext(ctx)
+	g.SetLimit(10)
+	flavors := sync.Map{}
+
 	for _, ds := range dataSources {
-		variant, err := s.detectPrometheusVariant(ctx, ds)
-		if err != nil {
-			return nil, err
+		ds := ds
+		g.Go(func() error {
+			variant, err := s.detectPrometheusVariant(ctx, ds)
+			if err != nil {
+				return err
+			}
+			flavors.Store(ds.UID, variant)
+			return nil
+		})
+	}
+	if err := g.Wait(); err != nil {
+		return nil, err
+	}
+
+	variants := map[string]int64{}
+
+	flavors.Range(func(_, value any) bool {
+		variant, ok := value.(string)
+		if !ok {
+			return true
 		}
+
 		if variant == "" {
-			continue
+			return true
 		}
 
 		if _, exists := variants[variant]; !exists {
 			variants[variant] = 0
 		}
 		variants[variant] += 1
-	}
+		return true
+	})
 
 	s.promFlavorCache.variants = variants
 	s.promFlavorCache.memoized = time.Now()
@@ -66,13 +91,16 @@ func (s *Service) detectPrometheusVariants(ctx context.Context) (map[string]int6
 }
 
 func (s *Service) detectPrometheusVariant(ctx context.Context, ds *datasources.DataSource) (string, error) {
+	// 5s timeout
+	ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
+	defer cancel()
+
 	type buildInfo struct {
 		Data struct {
 			Application *string        `json:"application"`
 			Features    map[string]any `json:"features"`
 		} `json:"data"`
 	}
-
 	c, err := s.datasources.GetHTTPTransport(ctx, ds, s.httpClientProvider)
 	if err != nil {
 		s.log.Error("Failed to get HTTP client for Prometheus data source", "error", err)
diff --git a/pkg/infra/usagestats/statscollector/prometheus_flavor_test.go b/pkg/infra/usagestats/statscollector/prometheus_flavor_test.go
index d0ad4c4d46bcf..ed64ecb731965 100644
--- a/pkg/infra/usagestats/statscollector/prometheus_flavor_test.go
+++ b/pkg/infra/usagestats/statscollector/prometheus_flavor_test.go
@@ -42,6 +42,7 @@ func TestDetectPrometheusVariant(t *testing.T) {
 		withDatasources(mockDatasourceService{datasources: []*datasources.DataSource{
 			{
 				ID:      1,
+				UID:     "vanilla",
 				OrgID:   1,
 				Version: 1,
 				Name:    "Vanilla",
@@ -51,6 +52,7 @@ func TestDetectPrometheusVariant(t *testing.T) {
 			},
 			{
 				ID:      2,
+				UID:     "mimir",
 				OrgID:   1,
 				Version: 1,
 				Name:    "Mimir",
@@ -60,6 +62,7 @@ func TestDetectPrometheusVariant(t *testing.T) {
 			},
 			{
 				ID:      3,
+				UID:     "another-mimir",
 				OrgID:   1,
 				Version: 1,
 				Name:    "Another Mimir",
@@ -69,6 +72,7 @@ func TestDetectPrometheusVariant(t *testing.T) {
 			},
 			{
 				ID:      4,
+				UID:     "cortex",
 				OrgID:   1,
 				Version: 1,
 				Name:    "Cortex",
diff --git a/pkg/infra/usagestats/statscollector/service.go b/pkg/infra/usagestats/statscollector/service.go
index bbef8db90f95c..20b0d186f9890 100644
--- a/pkg/infra/usagestats/statscollector/service.go
+++ b/pkg/infra/usagestats/statscollector/service.go
@@ -25,8 +25,8 @@ import (
 )
 
 const (
-	MIN_DELAY = 30
-	MAX_DELAY = 120
+	minDelay = 30
+	maxDelay = 120
 )
 
 type Service struct {
@@ -45,7 +45,6 @@ type Service struct {
 	startTime                time.Time
 	concurrentUserStatsCache memoConcurrentUserStats
 	promFlavorCache          memoPrometheusFlavor
-	usageStatProviders       []registry.ProvidesUsageStats
 }
 
 func ProvideService(
@@ -82,8 +81,8 @@ func ProvideService(
 		s.collectDatasourceAccess,
 		s.collectAlertNotifierStats,
 		s.collectPrometheusFlavors,
-		s.collectAdditionalMetrics,
 	}
+
 	for _, c := range collectors {
 		us.RegisterMetricsFunc(c)
 	}
@@ -94,12 +93,19 @@ func ProvideService(
 // RegisterProviders is called only once - during Grafana start up
 func (s *Service) RegisterProviders(usageStatProviders []registry.ProvidesUsageStats) {
 	s.log.Info("registering usage stat providers", "usageStatsProvidersLen", len(usageStatProviders))
-	s.usageStatProviders = usageStatProviders
+	for _, usageStatProvider := range usageStatProviders {
+		provider := usageStatProvider.GetUsageStats
+		collector := func(ctx context.Context) (map[string]interface{}, error) {
+			return provider(ctx), nil
+		}
+
+		s.usageStats.RegisterMetricsFunc(collector)
+	}
 }
 
 func (s *Service) Run(ctx context.Context) error {
 	sendInterval := time.Second * time.Duration(s.cfg.MetricsTotalStatsIntervalSeconds)
-	nextSendInterval := time.Duration(rand.Intn(MAX_DELAY-MIN_DELAY)+MIN_DELAY) * time.Second
+	nextSendInterval := time.Duration(rand.Intn(maxDelay-minDelay)+minDelay) * time.Second
 	s.log.Debug("usage stats collector started", "sendInterval", sendInterval, "nextSendInterval", nextSendInterval)
 	updateStatsTicker := time.NewTicker(nextSendInterval)
 	defer updateStatsTicker.Stop()
@@ -164,6 +170,7 @@ func (s *Service) collectSystemStats(ctx context.Context) (map[string]any, error
 	m["stats.dashboard_versions.count"] = statsResult.DashboardVersions
 	m["stats.annotations.count"] = statsResult.Annotations
 	m["stats.alert_rules.count"] = statsResult.AlertRules
+	m["stats.rule_groups.count"] = statsResult.RuleGroups
 	m["stats.library_panels.count"] = statsResult.LibraryPanels
 	m["stats.library_variables.count"] = statsResult.LibraryVariables
 	m["stats.dashboards_viewers_can_edit.count"] = statsResult.DashboardsViewersCanEdit
@@ -211,17 +218,6 @@ func (s *Service) collectSystemStats(ctx context.Context) (map[string]any, error
 	return m, nil
 }
 
-func (s *Service) collectAdditionalMetrics(ctx context.Context) (map[string]any, error) {
-	m := map[string]any{}
-	for _, usageStatProvider := range s.usageStatProviders {
-		stats := usageStatProvider.GetUsageStats(ctx)
-		for k, v := range stats {
-			m[k] = v
-		}
-	}
-	return m, nil
-}
-
 func (s *Service) collectAlertNotifierStats(ctx context.Context) (map[string]any, error) {
 	m := map[string]any{}
 	// get stats about alert notifier usage
@@ -328,6 +324,7 @@ func (s *Service) updateTotalStats(ctx context.Context) bool {
 	metrics.StatsTotalDashboardVersions.Set(float64(statsResult.DashboardVersions))
 	metrics.StatsTotalAnnotations.Set(float64(statsResult.Annotations))
 	metrics.StatsTotalAlertRules.Set(float64(statsResult.AlertRules))
+	metrics.StatsTotalRuleGroups.Set(float64(statsResult.RuleGroups))
 	metrics.StatsTotalLibraryPanels.Set(float64(statsResult.LibraryPanels))
 	metrics.StatsTotalLibraryVariables.Set(float64(statsResult.LibraryVariables))
 
diff --git a/pkg/infra/usagestats/statscollector/service_test.go b/pkg/infra/usagestats/statscollector/service_test.go
index 2f102ddc6cc73..600f39afac24d 100644
--- a/pkg/infra/usagestats/statscollector/service_test.go
+++ b/pkg/infra/usagestats/statscollector/service_test.go
@@ -93,22 +93,19 @@ func (d dummyUsageStatProvider) GetUsageStats(ctx context.Context) map[string]an
 }
 
 func TestUsageStatsProviders(t *testing.T) {
-	provider1 := &dummyUsageStatProvider{stats: map[string]any{"my_stat_1": "val1", "my_stat_2": "val2"}}
-	provider2 := &dummyUsageStatProvider{stats: map[string]any{"my_stat_x": "valx", "my_stat_z": "valz"}}
+	provider := &dummyUsageStatProvider{stats: map[string]any{"my_stat_x": "valx", "my_stat_z": "valz"}}
 
 	store := dbtest.NewFakeDB()
 	statsService := statstest.NewFakeService()
 	mockSystemStats(statsService)
 	s := createService(t, setting.NewCfg(), store, statsService)
-	s.RegisterProviders([]registry.ProvidesUsageStats{provider1, provider2})
+	s.RegisterProviders([]registry.ProvidesUsageStats{provider})
 
-	m, err := s.collectAdditionalMetrics(context.Background())
+	report, err := s.usageStats.GetUsageReport(context.Background())
 	require.NoError(t, err, "Expected no error")
 
-	assert.Equal(t, "val1", m["my_stat_1"])
-	assert.Equal(t, "val2", m["my_stat_2"])
-	assert.Equal(t, "valx", m["my_stat_x"])
-	assert.Equal(t, "valz", m["my_stat_z"])
+	assert.Equal(t, "valx", report.Metrics["my_stat_x"])
+	assert.Equal(t, "valz", report.Metrics["my_stat_z"])
 }
 
 func TestFeatureUsageStats(t *testing.T) {
@@ -145,7 +142,7 @@ func TestCollectingUsageStats(t *testing.T) {
 		AnonymousEnabled:     true,
 		BasicAuthEnabled:     true,
 		LDAPAuthEnabled:      true,
-		AuthProxyEnabled:     true,
+		AuthProxy:            setting.AuthProxySettings{Enabled: true},
 		Packaging:            "deb",
 		ReportingDistributor: "hosted-grafana",
 		RemoteCacheOptions: &setting.RemoteCacheOptions{
@@ -382,9 +379,9 @@ func createService(t testing.TB, cfg *setting.Cfg, store db.DB, statsService sta
 		store,
 		&mockSocial{},
 		&pluginstore.FakePluginStore{},
-		featuremgmt.WithFeatures("feature1", "feature2"),
+		featuremgmt.WithManager("feature1", "feature2"),
 		o.datasources,
-		httpclient.NewProvider(),
+		httpclient.NewProvider(sdkhttpclient.ProviderOptions{Middlewares: []sdkhttpclient.Middleware{}}),
 	)
 }
 
diff --git a/pkg/kinds/accesspolicy/accesspolicy_gen.go b/pkg/kinds/accesspolicy/accesspolicy_gen.go
index 2c84338278854..a528ab8ea36a7 100644
--- a/pkg/kinds/accesspolicy/accesspolicy_gen.go
+++ b/pkg/kinds/accesspolicy/accesspolicy_gen.go
@@ -3,13 +3,15 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoTypesJenny
+//     K8ResourcesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 package accesspolicy
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	"github.com/grafana/grafana/pkg/kinds"
 )
 
@@ -19,9 +21,11 @@ type K8sResource = kinds.GrafanaResource[Spec, Status]
 // NewResource creates a new instance of the resource with a given name (UID)
 func NewK8sResource(name string, s *Spec) K8sResource {
 	return K8sResource{
-		Kind:       "AccessPolicy",
-		APIVersion: "v0-0-alpha",
-		Metadata: kinds.GrafanaResourceMetadata{
+		TypeMeta: v1.TypeMeta{
+			Kind:       "AccessPolicy",
+			APIVersion: "v0-0-alpha",
+		},
+		ObjectMeta: v1.ObjectMeta{
 			Name:        name,
 			Annotations: make(map[string]string),
 			Labels:      make(map[string]string),
diff --git a/pkg/kinds/accesspolicy/accesspolicy_kind_gen.go b/pkg/kinds/accesspolicy/accesspolicy_kind_gen.go
deleted file mode 100644
index 200ad2653d061..0000000000000
--- a/pkg/kinds/accesspolicy/accesspolicy_kind_gen.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     CoreKindJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package accesspolicy
-
-import (
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema"
-	"github.com/grafana/thema/vmux"
-
-	"github.com/grafana/grafana/pkg/cuectx"
-)
-
-// rootrel is the relative path from the grafana repository root to the
-// directory containing the .cue files in which this kind is defined. Necessary
-// for runtime errors related to the definition and/or lineage to provide
-// a real path to the correct .cue file.
-const rootrel string = "kinds/accesspolicy"
-
-// TODO standard generated docs
-type Kind struct {
-	kindsys.Core
-	lin    thema.ConvergentLineage[*Resource]
-	jcodec vmux.Codec
-	valmux vmux.ValueMux[*Resource]
-}
-
-// type guard - ensure generated Kind type satisfies the kindsys.Core interface
-var _ kindsys.Core = &Kind{}
-
-// TODO standard generated docs
-func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
-	def, err := cuectx.LoadCoreKindDef(rootrel, rt.Context(), nil)
-	if err != nil {
-		return nil, err
-	}
-
-	k := &Kind{}
-	k.Core, err = kindsys.BindCore(rt, def, opts...)
-	if err != nil {
-		return nil, err
-	}
-	// Get the thema.Schema that the meta says is in the current version (which
-	// codegen ensures is always the latest)
-	cursch := thema.SchemaP(k.Core.Lineage(), def.Properties.CurrentVersion)
-	tsch, err := thema.BindType(cursch, &Resource{})
-	if err != nil {
-		// Should be unreachable, modulo bugs in the Thema->Go code generator
-		return nil, err
-	}
-
-	k.jcodec = vmux.NewJSONCodec("accesspolicy.json")
-	k.lin = tsch.ConvergentLineage()
-	k.valmux = vmux.NewValueMux(k.lin.TypedSchema(), k.jcodec)
-	return k, nil
-}
-
-// ConvergentLineage returns the same [thema.Lineage] as Lineage, but bound (see [thema.BindType])
-// to the the AccessPolicy [Resource] type generated from the current schema, v0.0.
-func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*Resource] {
-	return k.lin
-}
-
-// JSONValueMux is a version multiplexer that maps a []byte containing JSON data
-// at any schematized dashboard version to an instance of AccessPolicy [Resource].
-//
-// Validation and translation errors emitted from this func will identify the
-// input bytes as "dashboard.json".
-//
-// This is a thin wrapper around Thema's [vmux.ValueMux].
-func (k *Kind) JSONValueMux(b []byte) (*Resource, thema.TranslationLacunas, error) {
-	return k.valmux(b)
-}
diff --git a/pkg/kinds/accesspolicy/accesspolicy_metadata_gen.go b/pkg/kinds/accesspolicy/accesspolicy_metadata_gen.go
index 46bcec2632fe6..689f54c57d10d 100644
--- a/pkg/kinds/accesspolicy/accesspolicy_metadata_gen.go
+++ b/pkg/kinds/accesspolicy/accesspolicy_metadata_gen.go
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoResourceTypes
+//     K8ResourcesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/pkg/kinds/accesspolicy/accesspolicy_status_gen.go b/pkg/kinds/accesspolicy/accesspolicy_status_gen.go
index 8f4e90abab173..5101e4177411d 100644
--- a/pkg/kinds/accesspolicy/accesspolicy_status_gen.go
+++ b/pkg/kinds/accesspolicy/accesspolicy_status_gen.go
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoResourceTypes
+//     K8ResourcesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/pkg/kinds/dashboard/dashboard_gen.go b/pkg/kinds/dashboard/dashboard_gen.go
index 3022cd9365866..28ac37b0b7381 100644
--- a/pkg/kinds/dashboard/dashboard_gen.go
+++ b/pkg/kinds/dashboard/dashboard_gen.go
@@ -3,13 +3,15 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoTypesJenny
+//     K8ResourcesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 package dashboard
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	"github.com/grafana/grafana/pkg/kinds"
 )
 
@@ -19,9 +21,11 @@ type K8sResource = kinds.GrafanaResource[Spec, Status]
 // NewResource creates a new instance of the resource with a given name (UID)
 func NewK8sResource(name string, s *Spec) K8sResource {
 	return K8sResource{
-		Kind:       "Dashboard",
-		APIVersion: "v0-0-alpha",
-		Metadata: kinds.GrafanaResourceMetadata{
+		TypeMeta: v1.TypeMeta{
+			Kind:       "Dashboard",
+			APIVersion: "v0-0-alpha",
+		},
+		ObjectMeta: v1.ObjectMeta{
 			Name:        name,
 			Annotations: make(map[string]string),
 			Labels:      make(map[string]string),
diff --git a/pkg/kinds/dashboard/dashboard_kind_gen.go b/pkg/kinds/dashboard/dashboard_kind_gen.go
deleted file mode 100644
index 4fe311a23a49c..0000000000000
--- a/pkg/kinds/dashboard/dashboard_kind_gen.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     CoreKindJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package dashboard
-
-import (
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema"
-	"github.com/grafana/thema/vmux"
-
-	"github.com/grafana/grafana/pkg/cuectx"
-)
-
-// rootrel is the relative path from the grafana repository root to the
-// directory containing the .cue files in which this kind is defined. Necessary
-// for runtime errors related to the definition and/or lineage to provide
-// a real path to the correct .cue file.
-const rootrel string = "kinds/dashboard"
-
-// TODO standard generated docs
-type Kind struct {
-	kindsys.Core
-	lin    thema.ConvergentLineage[*Resource]
-	jcodec vmux.Codec
-	valmux vmux.ValueMux[*Resource]
-}
-
-// type guard - ensure generated Kind type satisfies the kindsys.Core interface
-var _ kindsys.Core = &Kind{}
-
-// TODO standard generated docs
-func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
-	def, err := cuectx.LoadCoreKindDef(rootrel, rt.Context(), nil)
-	if err != nil {
-		return nil, err
-	}
-
-	k := &Kind{}
-	k.Core, err = kindsys.BindCore(rt, def, opts...)
-	if err != nil {
-		return nil, err
-	}
-	// Get the thema.Schema that the meta says is in the current version (which
-	// codegen ensures is always the latest)
-	cursch := thema.SchemaP(k.Core.Lineage(), def.Properties.CurrentVersion)
-	tsch, err := thema.BindType(cursch, &Resource{})
-	if err != nil {
-		// Should be unreachable, modulo bugs in the Thema->Go code generator
-		return nil, err
-	}
-
-	k.jcodec = vmux.NewJSONCodec("dashboard.json")
-	k.lin = tsch.ConvergentLineage()
-	k.valmux = vmux.NewValueMux(k.lin.TypedSchema(), k.jcodec)
-	return k, nil
-}
-
-// ConvergentLineage returns the same [thema.Lineage] as Lineage, but bound (see [thema.BindType])
-// to the the Dashboard [Resource] type generated from the current schema, v0.0.
-func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*Resource] {
-	return k.lin
-}
-
-// JSONValueMux is a version multiplexer that maps a []byte containing JSON data
-// at any schematized dashboard version to an instance of Dashboard [Resource].
-//
-// Validation and translation errors emitted from this func will identify the
-// input bytes as "dashboard.json".
-//
-// This is a thin wrapper around Thema's [vmux.ValueMux].
-func (k *Kind) JSONValueMux(b []byte) (*Resource, thema.TranslationLacunas, error) {
-	return k.valmux(b)
-}
diff --git a/pkg/kinds/dashboard/dashboard_metadata_gen.go b/pkg/kinds/dashboard/dashboard_metadata_gen.go
index c628f6037d868..67047c56cc666 100644
--- a/pkg/kinds/dashboard/dashboard_metadata_gen.go
+++ b/pkg/kinds/dashboard/dashboard_metadata_gen.go
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoResourceTypes
+//     K8ResourcesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/pkg/kinds/dashboard/dashboard_spec_gen.go b/pkg/kinds/dashboard/dashboard_spec_gen.go
index e5be145cffabe..ab33a1771353c 100644
--- a/pkg/kinds/dashboard/dashboard_spec_gen.go
+++ b/pkg/kinds/dashboard/dashboard_spec_gen.go
@@ -26,6 +26,13 @@ const (
 	LinkTypeLink       LinkType = "link"
 )
 
+// Defines values for DataTransformerConfigTopic.
+const (
+	DataTransformerConfigTopicAlertStates DataTransformerConfigTopic = "alertStates"
+	DataTransformerConfigTopicAnnotations DataTransformerConfigTopic = "annotations"
+	DataTransformerConfigTopicSeries      DataTransformerConfigTopic = "series"
+)
+
 // Defines values for FieldColorModeId.
 const (
 	FieldColorModeIdContinuousBlPu       FieldColorModeId = "continuous-BlPu"
@@ -52,16 +59,6 @@ const (
 	FieldColorSeriesByModeMin  FieldColorSeriesByMode = "min"
 )
 
-// Defines values for GraphPanelType.
-const (
-	GraphPanelTypeGraph GraphPanelType = "graph"
-)
-
-// Defines values for HeatmapPanelType.
-const (
-	HeatmapPanelTypeHeatmap HeatmapPanelType = "heatmap"
-)
-
 // Defines values for MappingType.
 const (
 	MappingTypeRange   MappingType = "range"
@@ -152,6 +149,8 @@ const (
 	VariableSortN4 VariableSort = 4
 	VariableSortN5 VariableSort = 5
 	VariableSortN6 VariableSort = 6
+	VariableSortN7 VariableSort = 7
+	VariableSortN8 VariableSort = 8
 )
 
 // Defines values for VariableType.
@@ -160,6 +159,7 @@ const (
 	VariableTypeConstant   VariableType = "constant"
 	VariableTypeCustom     VariableType = "custom"
 	VariableTypeDatasource VariableType = "datasource"
+	VariableTypeGroupby    VariableType = "groupby"
 	VariableTypeInterval   VariableType = "interval"
 	VariableTypeQuery      VariableType = "query"
 	VariableTypeSystem     VariableType = "system"
@@ -270,7 +270,7 @@ type Link struct {
 	Type LinkType `json:"type"`
 
 	// Link URL. Only required/valid if the type is link
-	Url string `json:"url"`
+	Url *string `json:"url,omitempty"`
 }
 
 // Dashboard Link type. Accepted values are dashboards (to refer to another dashboard) and link (to refer to an external resource)
@@ -302,8 +302,14 @@ type DataTransformerConfig struct {
 	// Options to be passed to the transformer
 	// Valid options depend on the transformer id
 	Options any `json:"options"`
+
+	// Where to pull DataFrames from as input to transformation
+	Topic *DataTransformerConfigTopic `json:"topic,omitempty"`
 }
 
+// Where to pull DataFrames from as input to transformation
+type DataTransformerConfigTopic string
+
 // DynamicConfigValue defines model for DynamicConfigValue.
 type DynamicConfigValue struct {
 	Id    string `json:"id"`
@@ -451,21 +457,6 @@ type FieldConfigSource struct {
 	} `json:"overrides"`
 }
 
-// Support for legacy graph panel.
-// @deprecated this a deprecated panel type
-type GraphPanel struct {
-	// @deprecated this is part of deprecated graph panel
-	Legend *struct {
-		Show     bool    `json:"show"`
-		Sort     *string `json:"sort,omitempty"`
-		SortDesc *bool   `json:"sortDesc,omitempty"`
-	} `json:"legend,omitempty"`
-	Type GraphPanelType `json:"type"`
-}
-
-// GraphPanelType defines model for GraphPanel.Type.
-type GraphPanelType string
-
 // Position and dimensions of a panel in the grid
 type GridPos struct {
 	// Panel height. The height is the number of rows from the top edge of the panel.
@@ -484,15 +475,6 @@ type GridPos struct {
 	Y int `json:"y"`
 }
 
-// Support for legacy heatmap panel.
-// @deprecated this a deprecated panel type
-type HeatmapPanel struct {
-	Type HeatmapPanelType `json:"type"`
-}
-
-// HeatmapPanelType defines model for HeatmapPanel.Type.
-type HeatmapPanelType string
-
 // A library panel is a reusable panel that you can use in any dashboard.
 // When you make a change to a library panel, that change propagates to all instances of where the panel is used.
 // Library panels streamline reuse of panels across multiple dashboards.
@@ -523,6 +505,9 @@ type MatcherConfig struct {
 
 // Dashboard panels are the basic visualization building blocks.
 type Panel struct {
+	// Sets panel queries cache timeout.
+	CacheTimeout *string `json:"cacheTimeout,omitempty"`
+
 	// Ref to a DataSource instance
 	Datasource *DataSourceRef `json:"datasource,omitempty"`
 
@@ -570,6 +555,9 @@ type Panel struct {
 	// The version of the plugin that is used for this panel. This is used to find the plugin to display the panel and to migrate old panel configs.
 	PluginVersion *string `json:"pluginVersion,omitempty"`
 
+	// Overrides the data source configured time-to-live for a query cache item in milliseconds
+	QueryCachingTTL *float32 `json:"queryCachingTTL,omitempty"`
+
 	// Name of template variable to repeat for.
 	Repeat *string `json:"repeat,omitempty"`
 
@@ -577,9 +565,6 @@ type Panel struct {
 	// `h` for horizontal, `v` for vertical.
 	RepeatDirection *PanelRepeatDirection `json:"repeatDirection,omitempty"`
 
-	// Tags for the panel.
-	Tags []string `json:"tags,omitempty"`
-
 	// Depends on the panel plugin. See the plugin documentation for details.
 	Targets []Target `json:"targets,omitempty"`
 
@@ -670,7 +655,7 @@ type RowPanel struct {
 	Id int `json:"id"`
 
 	// List of panels in the row
-	Panels []any `json:"panels"`
+	Panels []Panel `json:"panels"`
 
 	// Name of template variable to repeat for.
 	Repeat *string `json:"repeat,omitempty"`
@@ -715,6 +700,9 @@ type Snapshot struct {
 	// OrgId org id of the snapshot
 	OrgId int `json:"orgId"`
 
+	// OriginalUrl original url, url of the dashboard that was snapshotted
+	OriginalUrl string `json:"originalUrl"`
+
 	// Updated last time when the snapshot was updated
 	Updated time.Time `json:"updated"`
 
@@ -766,7 +754,7 @@ type Spec struct {
 	Panels []any `json:"panels,omitempty"`
 
 	// Refresh rate of dashboard. Represented via interval string, e.g. "5s", "1m", "1h", "1d".
-	Refresh *any `json:"refresh,omitempty"`
+	Refresh *string `json:"refresh,omitempty"`
 
 	// This property should only be used in dashboards defined by plugins.  It is a quick check
 	// to see if the version has changed since the last time.
@@ -799,20 +787,9 @@ type Spec struct {
 		To   string `json:"to"`
 	} `json:"time,omitempty"`
 
-	// Configuration of the time picker shown at the top of a dashboard.
-	Timepicker *struct {
-		// Whether timepicker is collapsed or not. Has no effect on provisioned dashboard.
-		Collapse bool `json:"collapse"`
-
-		// Whether timepicker is visible or not.
-		Hidden bool `json:"hidden"`
-
-		// Interval options available in the refresh picker dropdown.
-		RefreshIntervals []string `json:"refresh_intervals"`
-
-		// Selectable options available in the time picker dropdown. Has no effect on provisioned dashboard.
-		TimeOptions []string `json:"time_options"`
-	} `json:"timepicker,omitempty"`
+	// Time picker configuration
+	// It defines the default config for the time picker and the refresh picker for the specific dashboard.
+	Timepicker *TimePickerConfig `json:"timepicker,omitempty"`
 
 	// Timezone of dashboard. Accepted values are IANA TZDB zone ID or "browser" or "utc".
 	Timezone *string `json:"timezone,omitempty"`
@@ -882,6 +859,22 @@ type ThresholdsConfig struct {
 // Thresholds can either be `absolute` (specific number) or `percentage` (relative to min or max, it will be values between 0 and 1).
 type ThresholdsMode string
 
+// Time picker configuration
+// It defines the default config for the time picker and the refresh picker for the specific dashboard.
+type TimePickerConfig struct {
+	// Whether timepicker is visible or not.
+	Hidden *bool `json:"hidden,omitempty"`
+
+	// Override the now time by entering a time delay. Use this option to accommodate known delays in data aggregation to avoid null values.
+	NowDelay *string `json:"nowDelay,omitempty"`
+
+	// Interval options available in the refresh picker dropdown.
+	RefreshIntervals []string `json:"refresh_intervals,omitempty"`
+
+	// Selectable options available in the time picker dropdown. Has no effect on provisioned dashboard.
+	TimeOptions []string `json:"time_options,omitempty"`
+}
+
 // Maps text values to a color or different display text and color.
 // For example, you can configure a value mapping so that all instances of the value 10 appear as Perfection! rather than the number.
 type ValueMap struct {
@@ -914,6 +907,9 @@ type VariableHide int
 
 // A variable is a placeholder for a value. You can use variables in metric queries and in panel titles.
 type VariableModel struct {
+	// Custom all value
+	AllValue *string `json:"allValue,omitempty"`
+
 	// Option to be selected in a variable.
 	Current *VariableOption `json:"current,omitempty"`
 
@@ -927,6 +923,9 @@ type VariableModel struct {
 	// Accepted values are 0 (show label and value), 1 (show value only), 2 (show nothing).
 	Hide *VariableHide `json:"hide,omitempty"`
 
+	// Whether all value option is available or not
+	IncludeAll *bool `json:"includeAll,omitempty"`
+
 	// Optional display name
 	Label *string `json:"label,omitempty"`
 
@@ -948,6 +947,10 @@ type VariableModel struct {
 	// `2`: Queries the data source when the dashboard time range changes.
 	Refresh *VariableRefresh `json:"refresh,omitempty"`
 
+	// Optional field, if you want to extract part of a series name or metric node segment.
+	// Named capture groups can be used to separate the display text and value.
+	Regex *string `json:"regex,omitempty"`
+
 	// Whether the variable value should be managed by URL query params or not
 	SkipUrlSync *bool `json:"skipUrlSync,omitempty"`
 
@@ -960,6 +963,8 @@ type VariableModel struct {
 	// `4`: Numerical DESC
 	// `5`: Alphabetical Case Insensitive ASC
 	// `6`: Alphabetical Case Insensitive DESC
+	// `7`: Natural ASC
+	// `8`: Natural DESC
 	Sort *VariableSort `json:"sort,omitempty"`
 
 	// Dashboard variable type
@@ -1001,6 +1006,8 @@ type VariableRefresh int
 // `4`: Numerical DESC
 // `5`: Alphabetical Case Insensitive ASC
 // `6`: Alphabetical Case Insensitive DESC
+// `7`: Natural ASC
+// `8`: Natural DESC
 type VariableSort int
 
 // Dashboard variable type
diff --git a/pkg/kinds/dashboard/dashboard_status_gen.go b/pkg/kinds/dashboard/dashboard_status_gen.go
index 49a6d55b912ce..82c114dff2bd4 100644
--- a/pkg/kinds/dashboard/dashboard_status_gen.go
+++ b/pkg/kinds/dashboard/dashboard_status_gen.go
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoResourceTypes
+//     K8ResourcesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/pkg/kinds/folder/folder_gen.go b/pkg/kinds/folder/folder_gen.go
deleted file mode 100644
index 7b5a4d2650032..0000000000000
--- a/pkg/kinds/folder/folder_gen.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     GoTypesJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package folder
-
-import (
-	"github.com/grafana/grafana/pkg/kinds"
-)
-
-// Resource is the kubernetes style representation of Folder. (TODO be better)
-type K8sResource = kinds.GrafanaResource[Spec, Status]
-
-// NewResource creates a new instance of the resource with a given name (UID)
-func NewK8sResource(name string, s *Spec) K8sResource {
-	return K8sResource{
-		Kind:       "Folder",
-		APIVersion: "v0-0-alpha",
-		Metadata: kinds.GrafanaResourceMetadata{
-			Name:        name,
-			Annotations: make(map[string]string),
-			Labels:      make(map[string]string),
-		},
-		Spec: s,
-	}
-}
-
-// Resource is the wire representation of Folder.
-// It currently will soon be merged into the k8s flavor (TODO be better)
-type Resource struct {
-	Metadata Metadata `json:"metadata"`
-	Spec     Spec     `json:"spec"`
-	Status   Status   `json:"status"`
-}
diff --git a/pkg/kinds/folder/folder_kind_gen.go b/pkg/kinds/folder/folder_kind_gen.go
deleted file mode 100644
index 41205e02c479a..0000000000000
--- a/pkg/kinds/folder/folder_kind_gen.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     CoreKindJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package folder
-
-import (
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema"
-	"github.com/grafana/thema/vmux"
-
-	"github.com/grafana/grafana/pkg/cuectx"
-)
-
-// rootrel is the relative path from the grafana repository root to the
-// directory containing the .cue files in which this kind is defined. Necessary
-// for runtime errors related to the definition and/or lineage to provide
-// a real path to the correct .cue file.
-const rootrel string = "kinds/folder"
-
-// TODO standard generated docs
-type Kind struct {
-	kindsys.Core
-	lin    thema.ConvergentLineage[*Resource]
-	jcodec vmux.Codec
-	valmux vmux.ValueMux[*Resource]
-}
-
-// type guard - ensure generated Kind type satisfies the kindsys.Core interface
-var _ kindsys.Core = &Kind{}
-
-// TODO standard generated docs
-func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
-	def, err := cuectx.LoadCoreKindDef(rootrel, rt.Context(), nil)
-	if err != nil {
-		return nil, err
-	}
-
-	k := &Kind{}
-	k.Core, err = kindsys.BindCore(rt, def, opts...)
-	if err != nil {
-		return nil, err
-	}
-	// Get the thema.Schema that the meta says is in the current version (which
-	// codegen ensures is always the latest)
-	cursch := thema.SchemaP(k.Core.Lineage(), def.Properties.CurrentVersion)
-	tsch, err := thema.BindType(cursch, &Resource{})
-	if err != nil {
-		// Should be unreachable, modulo bugs in the Thema->Go code generator
-		return nil, err
-	}
-
-	k.jcodec = vmux.NewJSONCodec("folder.json")
-	k.lin = tsch.ConvergentLineage()
-	k.valmux = vmux.NewValueMux(k.lin.TypedSchema(), k.jcodec)
-	return k, nil
-}
-
-// ConvergentLineage returns the same [thema.Lineage] as Lineage, but bound (see [thema.BindType])
-// to the the Folder [Resource] type generated from the current schema, v0.0.
-func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*Resource] {
-	return k.lin
-}
-
-// JSONValueMux is a version multiplexer that maps a []byte containing JSON data
-// at any schematized dashboard version to an instance of Folder [Resource].
-//
-// Validation and translation errors emitted from this func will identify the
-// input bytes as "dashboard.json".
-//
-// This is a thin wrapper around Thema's [vmux.ValueMux].
-func (k *Kind) JSONValueMux(b []byte) (*Resource, thema.TranslationLacunas, error) {
-	return k.valmux(b)
-}
diff --git a/pkg/kinds/folder/folder_metadata_gen.go b/pkg/kinds/folder/folder_metadata_gen.go
deleted file mode 100644
index 5d4fdfca1a435..0000000000000
--- a/pkg/kinds/folder/folder_metadata_gen.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     GoResourceTypes
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package folder
-
-import (
-	"time"
-)
-
-// Metadata defines model for Metadata.
-type Metadata struct {
-	CreatedBy         string     `json:"createdBy"`
-	CreationTimestamp time.Time  `json:"creationTimestamp"`
-	DeletionTimestamp *time.Time `json:"deletionTimestamp,omitempty"`
-
-	// extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
-	ExtraFields     map[string]any    `json:"extraFields"`
-	Finalizers      []string          `json:"finalizers"`
-	Labels          map[string]string `json:"labels"`
-	ResourceVersion string            `json:"resourceVersion"`
-	Uid             string            `json:"uid"`
-	UpdateTimestamp time.Time         `json:"updateTimestamp"`
-	UpdatedBy       string            `json:"updatedBy"`
-}
-
-// _kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
-// It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
-// As it is also intended to be generic enough to function with any API Server.
-type KubeObjectMetadata struct {
-	CreationTimestamp time.Time         `json:"creationTimestamp"`
-	DeletionTimestamp *time.Time        `json:"deletionTimestamp,omitempty"`
-	Finalizers        []string          `json:"finalizers"`
-	Labels            map[string]string `json:"labels"`
-	ResourceVersion   string            `json:"resourceVersion"`
-	Uid               string            `json:"uid"`
-}
diff --git a/pkg/kinds/folder/folder_spec_gen.go b/pkg/kinds/folder/folder_spec_gen.go
deleted file mode 100644
index ab32138ebf19c..0000000000000
--- a/pkg/kinds/folder/folder_spec_gen.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     GoResourceTypes
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package folder
-
-// TODO:
-// common metadata will soon support setting the parent folder in the metadata
-type Spec struct {
-	// Description of the folder.
-	Description *string `json:"description,omitempty"`
-
-	// Folder title
-	Title string `json:"title"`
-
-	// Unique folder id. (will be k8s name)
-	Uid string `json:"uid"`
-}
diff --git a/pkg/kinds/folder/folder_status_gen.go b/pkg/kinds/folder/folder_status_gen.go
deleted file mode 100644
index 9cdb2cab54a7d..0000000000000
--- a/pkg/kinds/folder/folder_status_gen.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     GoResourceTypes
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package folder
-
-// Defines values for OperatorStateState.
-const (
-	OperatorStateStateFailed     OperatorStateState = "failed"
-	OperatorStateStateInProgress OperatorStateState = "in_progress"
-	OperatorStateStateSuccess    OperatorStateState = "success"
-)
-
-// Defines values for StatusOperatorStateState.
-const (
-	StatusOperatorStateStateFailed     StatusOperatorStateState = "failed"
-	StatusOperatorStateStateInProgress StatusOperatorStateState = "in_progress"
-	StatusOperatorStateStateSuccess    StatusOperatorStateState = "success"
-)
-
-// OperatorState defines model for OperatorState.
-type OperatorState struct {
-	// descriptiveState is an optional more descriptive state field which has no requirements on format
-	DescriptiveState *string `json:"descriptiveState,omitempty"`
-
-	// details contains any extra information that is operator-specific
-	Details map[string]any `json:"details,omitempty"`
-
-	// lastEvaluation is the ResourceVersion last evaluated
-	LastEvaluation string `json:"lastEvaluation"`
-
-	// state describes the state of the lastEvaluation.
-	// It is limited to three possible states for machine evaluation.
-	State OperatorStateState `json:"state"`
-}
-
-// OperatorStateState state describes the state of the lastEvaluation.
-// It is limited to three possible states for machine evaluation.
-type OperatorStateState string
-
-// Status defines model for Status.
-type Status struct {
-	// additionalFields is reserved for future use
-	AdditionalFields map[string]any `json:"additionalFields,omitempty"`
-
-	// operatorStates is a map of operator ID to operator state evaluations.
-	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
-	OperatorStates map[string]StatusOperatorState `json:"operatorStates,omitempty"`
-}
-
-// StatusOperatorState defines model for status.#OperatorState.
-type StatusOperatorState struct {
-	// descriptiveState is an optional more descriptive state field which has no requirements on format
-	DescriptiveState *string `json:"descriptiveState,omitempty"`
-
-	// details contains any extra information that is operator-specific
-	Details map[string]any `json:"details,omitempty"`
-
-	// lastEvaluation is the ResourceVersion last evaluated
-	LastEvaluation string `json:"lastEvaluation"`
-
-	// state describes the state of the lastEvaluation.
-	// It is limited to three possible states for machine evaluation.
-	State StatusOperatorStateState `json:"state"`
-}
-
-// StatusOperatorStateState state describes the state of the lastEvaluation.
-// It is limited to three possible states for machine evaluation.
-type StatusOperatorStateState string
diff --git a/pkg/kinds/general.go b/pkg/kinds/general.go
index 74c7a7f6fb0a5..61c092036b7e5 100644
--- a/pkg/kinds/general.go
+++ b/pkg/kinds/general.go
@@ -1,150 +1,18 @@
 package kinds
 
 import (
-	"time"
-
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-// ResourceOriginInfo is saved in annotations.  This is used to identify where the resource came from
-// This object can model the same data as our existing provisioning table or a more general git sync
-type ResourceOriginInfo struct {
-	// Name of the origin/provisioning source
-	Name string `json:"name,omitempty"`
-
-	// The path within the named origin above (external_id in the existing dashboard provisioing)
-	Path string `json:"path,omitempty"`
-
-	// Verification/identification key (check_sum in existing dashboard provisioning)
-	Key string `json:"key,omitempty"`
-
-	// Origin modification timestamp when the resource was saved
-	// This will be before the resource updated time
-	Timestamp *time.Time `json:"time,omitempty"`
-
-	// Avoid extending
-	_ any
-}
-
-// GrafanaResourceMetadata is standard k8s object metadata with helper functions
-type GrafanaResourceMetadata v1.ObjectMeta
-
 // GrafanaResource is a generic kubernetes resource with a helper for the common grafana metadata
 // This is a temporary solution until this object (or similar) can be moved to the app-sdk or kindsys
 type GrafanaResource[Spec any, Status any] struct {
-	APIVersion string `json:"apiVersion"`
-	Kind       string `json:"kind"`
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Metadata GrafanaResourceMetadata `json:"metadata"`
-	Spec     *Spec                   `json:"spec,omitempty"`
-	Status   *Status                 `json:"status,omitempty"`
+	Spec   *Spec   `json:"spec,omitempty"`
+	Status *Status `json:"status,omitempty"`
 
 	// Avoid extending
-	_ any
-}
-
-// Annotation keys
-const annoKeyCreatedBy = "grafana.com/createdBy"
-const annoKeyUpdatedTimestamp = "grafana.com/updatedTimestamp"
-const annoKeyUpdatedBy = "grafana.com/updatedBy"
-
-// The folder identifier
-const annoKeyFolder = "grafana.com/folder"
-const annoKeySlug = "grafana.com/slug"
-
-// Identify where values came from
-const annoKeyOriginName = "grafana.com/originName"
-const annoKeyOriginPath = "grafana.com/originPath"
-const annoKeyOriginKey = "grafana.com/originKey"
-const annoKeyOriginTime = "grafana.com/originTime"
-
-func (m *GrafanaResourceMetadata) GetUpdatedTimestamp() *time.Time {
-	v, ok := m.Annotations[annoKeyUpdatedTimestamp]
-	if ok {
-		t, err := time.Parse(time.RFC3339, v)
-		if err != nil {
-			return &t
-		}
-	}
-	return nil
-}
-
-func (m *GrafanaResourceMetadata) SetUpdatedTimestamp(v *time.Time) {
-	if v == nil {
-		delete(m.Annotations, annoKeyUpdatedTimestamp)
-	} else {
-		m.Annotations[annoKeyUpdatedTimestamp] = v.Format(time.RFC3339)
-	}
-}
-
-func (m *GrafanaResourceMetadata) GetCreatedBy() string {
-	return m.Annotations[annoKeyCreatedBy]
-}
-
-func (m *GrafanaResourceMetadata) SetCreatedBy(user string) {
-	m.Annotations[annoKeyCreatedBy] = user // user GRN
-}
-
-func (m *GrafanaResourceMetadata) GetUpdatedBy() string {
-	return m.Annotations[annoKeyUpdatedBy]
-}
-
-func (m *GrafanaResourceMetadata) SetUpdatedBy(user string) {
-	m.Annotations[annoKeyUpdatedBy] = user // user GRN
-}
-
-func (m *GrafanaResourceMetadata) GetFolder() string {
-	return m.Annotations[annoKeyFolder]
-}
-
-func (m *GrafanaResourceMetadata) SetFolder(uid string) {
-	m.Annotations[annoKeyFolder] = uid
-}
-
-func (m *GrafanaResourceMetadata) GetSlug() string {
-	return m.Annotations[annoKeySlug]
-}
-
-func (m *GrafanaResourceMetadata) SetSlug(v string) {
-	m.Annotations[annoKeySlug] = v
-}
-
-func (m *GrafanaResourceMetadata) SetOriginInfo(info *ResourceOriginInfo) {
-	delete(m.Annotations, annoKeyOriginName)
-	delete(m.Annotations, annoKeyOriginPath)
-	delete(m.Annotations, annoKeyOriginKey)
-	delete(m.Annotations, annoKeyOriginTime)
-	if info != nil || info.Name != "" {
-		m.Annotations[annoKeyOriginName] = info.Name
-		if info.Path != "" {
-			m.Annotations[annoKeyOriginPath] = info.Path
-		}
-		if info.Key != "" {
-			m.Annotations[annoKeyOriginKey] = info.Key
-		}
-		if info.Timestamp != nil {
-			m.Annotations[annoKeyOriginTime] = info.Timestamp.Format(time.RFC3339)
-		}
-	}
-}
-
-// GetOriginInfo returns the origin info stored in k8s metadata annotations
-func (m *GrafanaResourceMetadata) GetOriginInfo() *ResourceOriginInfo {
-	v, ok := m.Annotations[annoKeyOriginName]
-	if !ok {
-		return nil
-	}
-	info := &ResourceOriginInfo{
-		Name: v,
-		Path: m.Annotations[annoKeyOriginPath],
-		Key:  m.Annotations[annoKeyOriginKey],
-	}
-	v, ok = m.Annotations[annoKeyOriginTime]
-	if ok {
-		t, err := time.Parse(time.RFC3339, v)
-		if err != nil {
-			info.Timestamp = &t
-		}
-	}
-	return info
+	_ any `json:"-"`
 }
diff --git a/pkg/kinds/librarypanel/librarypanel_gen.go b/pkg/kinds/librarypanel/librarypanel_gen.go
index 051a738b9f1f5..ea25be0ad4ffb 100644
--- a/pkg/kinds/librarypanel/librarypanel_gen.go
+++ b/pkg/kinds/librarypanel/librarypanel_gen.go
@@ -3,13 +3,15 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoTypesJenny
+//     K8ResourcesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 package librarypanel
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	"github.com/grafana/grafana/pkg/kinds"
 )
 
@@ -19,9 +21,11 @@ type K8sResource = kinds.GrafanaResource[Spec, Status]
 // NewResource creates a new instance of the resource with a given name (UID)
 func NewK8sResource(name string, s *Spec) K8sResource {
 	return K8sResource{
-		Kind:       "LibraryPanel",
-		APIVersion: "v0-0-alpha",
-		Metadata: kinds.GrafanaResourceMetadata{
+		TypeMeta: v1.TypeMeta{
+			Kind:       "LibraryPanel",
+			APIVersion: "v0-0-alpha",
+		},
+		ObjectMeta: v1.ObjectMeta{
 			Name:        name,
 			Annotations: make(map[string]string),
 			Labels:      make(map[string]string),
diff --git a/pkg/kinds/librarypanel/librarypanel_kind_gen.go b/pkg/kinds/librarypanel/librarypanel_kind_gen.go
deleted file mode 100644
index 246c8869bc1c7..0000000000000
--- a/pkg/kinds/librarypanel/librarypanel_kind_gen.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     CoreKindJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package librarypanel
-
-import (
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema"
-	"github.com/grafana/thema/vmux"
-
-	"github.com/grafana/grafana/pkg/cuectx"
-)
-
-// rootrel is the relative path from the grafana repository root to the
-// directory containing the .cue files in which this kind is defined. Necessary
-// for runtime errors related to the definition and/or lineage to provide
-// a real path to the correct .cue file.
-const rootrel string = "kinds/librarypanel"
-
-// TODO standard generated docs
-type Kind struct {
-	kindsys.Core
-	lin    thema.ConvergentLineage[*Resource]
-	jcodec vmux.Codec
-	valmux vmux.ValueMux[*Resource]
-}
-
-// type guard - ensure generated Kind type satisfies the kindsys.Core interface
-var _ kindsys.Core = &Kind{}
-
-// TODO standard generated docs
-func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
-	def, err := cuectx.LoadCoreKindDef(rootrel, rt.Context(), nil)
-	if err != nil {
-		return nil, err
-	}
-
-	k := &Kind{}
-	k.Core, err = kindsys.BindCore(rt, def, opts...)
-	if err != nil {
-		return nil, err
-	}
-	// Get the thema.Schema that the meta says is in the current version (which
-	// codegen ensures is always the latest)
-	cursch := thema.SchemaP(k.Core.Lineage(), def.Properties.CurrentVersion)
-	tsch, err := thema.BindType(cursch, &Resource{})
-	if err != nil {
-		// Should be unreachable, modulo bugs in the Thema->Go code generator
-		return nil, err
-	}
-
-	k.jcodec = vmux.NewJSONCodec("librarypanel.json")
-	k.lin = tsch.ConvergentLineage()
-	k.valmux = vmux.NewValueMux(k.lin.TypedSchema(), k.jcodec)
-	return k, nil
-}
-
-// ConvergentLineage returns the same [thema.Lineage] as Lineage, but bound (see [thema.BindType])
-// to the the LibraryPanel [Resource] type generated from the current schema, v0.0.
-func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*Resource] {
-	return k.lin
-}
-
-// JSONValueMux is a version multiplexer that maps a []byte containing JSON data
-// at any schematized dashboard version to an instance of LibraryPanel [Resource].
-//
-// Validation and translation errors emitted from this func will identify the
-// input bytes as "dashboard.json".
-//
-// This is a thin wrapper around Thema's [vmux.ValueMux].
-func (k *Kind) JSONValueMux(b []byte) (*Resource, thema.TranslationLacunas, error) {
-	return k.valmux(b)
-}
diff --git a/pkg/kinds/librarypanel/librarypanel_metadata_gen.go b/pkg/kinds/librarypanel/librarypanel_metadata_gen.go
index 49a44f5710cd5..e899f28b1ffec 100644
--- a/pkg/kinds/librarypanel/librarypanel_metadata_gen.go
+++ b/pkg/kinds/librarypanel/librarypanel_metadata_gen.go
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoResourceTypes
+//     K8ResourcesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/pkg/kinds/librarypanel/librarypanel_status_gen.go b/pkg/kinds/librarypanel/librarypanel_status_gen.go
index 8b04861837def..69072c08dff56 100644
--- a/pkg/kinds/librarypanel/librarypanel_status_gen.go
+++ b/pkg/kinds/librarypanel/librarypanel_status_gen.go
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoResourceTypes
+//     K8ResourcesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/pkg/kinds/preferences/preferences_gen.go b/pkg/kinds/preferences/preferences_gen.go
index aec2fc93fbdf0..4f6861b821544 100644
--- a/pkg/kinds/preferences/preferences_gen.go
+++ b/pkg/kinds/preferences/preferences_gen.go
@@ -3,13 +3,15 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoTypesJenny
+//     K8ResourcesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 package preferences
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	"github.com/grafana/grafana/pkg/kinds"
 )
 
@@ -19,9 +21,11 @@ type K8sResource = kinds.GrafanaResource[Spec, Status]
 // NewResource creates a new instance of the resource with a given name (UID)
 func NewK8sResource(name string, s *Spec) K8sResource {
 	return K8sResource{
-		Kind:       "Preferences",
-		APIVersion: "v0-0-alpha",
-		Metadata: kinds.GrafanaResourceMetadata{
+		TypeMeta: v1.TypeMeta{
+			Kind:       "Preferences",
+			APIVersion: "v0-0-alpha",
+		},
+		ObjectMeta: v1.ObjectMeta{
 			Name:        name,
 			Annotations: make(map[string]string),
 			Labels:      make(map[string]string),
diff --git a/pkg/kinds/preferences/preferences_kind_gen.go b/pkg/kinds/preferences/preferences_kind_gen.go
deleted file mode 100644
index 9efc26fba774e..0000000000000
--- a/pkg/kinds/preferences/preferences_kind_gen.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     CoreKindJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package preferences
-
-import (
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema"
-	"github.com/grafana/thema/vmux"
-
-	"github.com/grafana/grafana/pkg/cuectx"
-)
-
-// rootrel is the relative path from the grafana repository root to the
-// directory containing the .cue files in which this kind is defined. Necessary
-// for runtime errors related to the definition and/or lineage to provide
-// a real path to the correct .cue file.
-const rootrel string = "kinds/preferences"
-
-// TODO standard generated docs
-type Kind struct {
-	kindsys.Core
-	lin    thema.ConvergentLineage[*Resource]
-	jcodec vmux.Codec
-	valmux vmux.ValueMux[*Resource]
-}
-
-// type guard - ensure generated Kind type satisfies the kindsys.Core interface
-var _ kindsys.Core = &Kind{}
-
-// TODO standard generated docs
-func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
-	def, err := cuectx.LoadCoreKindDef(rootrel, rt.Context(), nil)
-	if err != nil {
-		return nil, err
-	}
-
-	k := &Kind{}
-	k.Core, err = kindsys.BindCore(rt, def, opts...)
-	if err != nil {
-		return nil, err
-	}
-	// Get the thema.Schema that the meta says is in the current version (which
-	// codegen ensures is always the latest)
-	cursch := thema.SchemaP(k.Core.Lineage(), def.Properties.CurrentVersion)
-	tsch, err := thema.BindType(cursch, &Resource{})
-	if err != nil {
-		// Should be unreachable, modulo bugs in the Thema->Go code generator
-		return nil, err
-	}
-
-	k.jcodec = vmux.NewJSONCodec("preferences.json")
-	k.lin = tsch.ConvergentLineage()
-	k.valmux = vmux.NewValueMux(k.lin.TypedSchema(), k.jcodec)
-	return k, nil
-}
-
-// ConvergentLineage returns the same [thema.Lineage] as Lineage, but bound (see [thema.BindType])
-// to the the Preferences [Resource] type generated from the current schema, v0.0.
-func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*Resource] {
-	return k.lin
-}
-
-// JSONValueMux is a version multiplexer that maps a []byte containing JSON data
-// at any schematized dashboard version to an instance of Preferences [Resource].
-//
-// Validation and translation errors emitted from this func will identify the
-// input bytes as "dashboard.json".
-//
-// This is a thin wrapper around Thema's [vmux.ValueMux].
-func (k *Kind) JSONValueMux(b []byte) (*Resource, thema.TranslationLacunas, error) {
-	return k.valmux(b)
-}
diff --git a/pkg/kinds/preferences/preferences_metadata_gen.go b/pkg/kinds/preferences/preferences_metadata_gen.go
index bd33d5d53a8ba..dacb200beb402 100644
--- a/pkg/kinds/preferences/preferences_metadata_gen.go
+++ b/pkg/kinds/preferences/preferences_metadata_gen.go
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoResourceTypes
+//     K8ResourcesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/pkg/kinds/preferences/preferences_spec_gen.go b/pkg/kinds/preferences/preferences_spec_gen.go
index 803e588e8c4ae..1c28568cfbc94 100644
--- a/pkg/kinds/preferences/preferences_spec_gen.go
+++ b/pkg/kinds/preferences/preferences_spec_gen.go
@@ -22,7 +22,8 @@ type QueryHistoryPreference struct {
 	HomeTab *string `json:"homeTab,omitempty"`
 }
 
-// Spec defines model for Spec.
+// Spec defines user, team or org Grafana preferences
+// swagger:model Preferences
 type Spec struct {
 	CookiePreferences *CookiePreferences `json:"cookiePreferences,omitempty"`
 
diff --git a/pkg/kinds/preferences/preferences_status_gen.go b/pkg/kinds/preferences/preferences_status_gen.go
index e9a7553380708..53fbb8a07c237 100644
--- a/pkg/kinds/preferences/preferences_status_gen.go
+++ b/pkg/kinds/preferences/preferences_status_gen.go
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoResourceTypes
+//     K8ResourcesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/pkg/kinds/publicdashboard/publicdashboard_gen.go b/pkg/kinds/publicdashboard/publicdashboard_gen.go
index 158fe87cf63d3..68239e64690d9 100644
--- a/pkg/kinds/publicdashboard/publicdashboard_gen.go
+++ b/pkg/kinds/publicdashboard/publicdashboard_gen.go
@@ -3,13 +3,15 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoTypesJenny
+//     K8ResourcesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 package publicdashboard
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	"github.com/grafana/grafana/pkg/kinds"
 )
 
@@ -19,9 +21,11 @@ type K8sResource = kinds.GrafanaResource[Spec, Status]
 // NewResource creates a new instance of the resource with a given name (UID)
 func NewK8sResource(name string, s *Spec) K8sResource {
 	return K8sResource{
-		Kind:       "PublicDashboard",
-		APIVersion: "v0-0-alpha",
-		Metadata: kinds.GrafanaResourceMetadata{
+		TypeMeta: v1.TypeMeta{
+			Kind:       "PublicDashboard",
+			APIVersion: "v0-0-alpha",
+		},
+		ObjectMeta: v1.ObjectMeta{
 			Name:        name,
 			Annotations: make(map[string]string),
 			Labels:      make(map[string]string),
diff --git a/pkg/kinds/publicdashboard/publicdashboard_kind_gen.go b/pkg/kinds/publicdashboard/publicdashboard_kind_gen.go
deleted file mode 100644
index f82475779e815..0000000000000
--- a/pkg/kinds/publicdashboard/publicdashboard_kind_gen.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     CoreKindJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package publicdashboard
-
-import (
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema"
-	"github.com/grafana/thema/vmux"
-
-	"github.com/grafana/grafana/pkg/cuectx"
-)
-
-// rootrel is the relative path from the grafana repository root to the
-// directory containing the .cue files in which this kind is defined. Necessary
-// for runtime errors related to the definition and/or lineage to provide
-// a real path to the correct .cue file.
-const rootrel string = "kinds/publicdashboard"
-
-// TODO standard generated docs
-type Kind struct {
-	kindsys.Core
-	lin    thema.ConvergentLineage[*Resource]
-	jcodec vmux.Codec
-	valmux vmux.ValueMux[*Resource]
-}
-
-// type guard - ensure generated Kind type satisfies the kindsys.Core interface
-var _ kindsys.Core = &Kind{}
-
-// TODO standard generated docs
-func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
-	def, err := cuectx.LoadCoreKindDef(rootrel, rt.Context(), nil)
-	if err != nil {
-		return nil, err
-	}
-
-	k := &Kind{}
-	k.Core, err = kindsys.BindCore(rt, def, opts...)
-	if err != nil {
-		return nil, err
-	}
-	// Get the thema.Schema that the meta says is in the current version (which
-	// codegen ensures is always the latest)
-	cursch := thema.SchemaP(k.Core.Lineage(), def.Properties.CurrentVersion)
-	tsch, err := thema.BindType(cursch, &Resource{})
-	if err != nil {
-		// Should be unreachable, modulo bugs in the Thema->Go code generator
-		return nil, err
-	}
-
-	k.jcodec = vmux.NewJSONCodec("publicdashboard.json")
-	k.lin = tsch.ConvergentLineage()
-	k.valmux = vmux.NewValueMux(k.lin.TypedSchema(), k.jcodec)
-	return k, nil
-}
-
-// ConvergentLineage returns the same [thema.Lineage] as Lineage, but bound (see [thema.BindType])
-// to the the PublicDashboard [Resource] type generated from the current schema, v0.0.
-func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*Resource] {
-	return k.lin
-}
-
-// JSONValueMux is a version multiplexer that maps a []byte containing JSON data
-// at any schematized dashboard version to an instance of PublicDashboard [Resource].
-//
-// Validation and translation errors emitted from this func will identify the
-// input bytes as "dashboard.json".
-//
-// This is a thin wrapper around Thema's [vmux.ValueMux].
-func (k *Kind) JSONValueMux(b []byte) (*Resource, thema.TranslationLacunas, error) {
-	return k.valmux(b)
-}
diff --git a/pkg/kinds/publicdashboard/publicdashboard_metadata_gen.go b/pkg/kinds/publicdashboard/publicdashboard_metadata_gen.go
index 0f0b0a878ac64..c5b84bf2700cc 100644
--- a/pkg/kinds/publicdashboard/publicdashboard_metadata_gen.go
+++ b/pkg/kinds/publicdashboard/publicdashboard_metadata_gen.go
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoResourceTypes
+//     K8ResourcesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/pkg/kinds/publicdashboard/publicdashboard_status_gen.go b/pkg/kinds/publicdashboard/publicdashboard_status_gen.go
index 100e34313879d..95de4433cfed4 100644
--- a/pkg/kinds/publicdashboard/publicdashboard_status_gen.go
+++ b/pkg/kinds/publicdashboard/publicdashboard_status_gen.go
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoResourceTypes
+//     K8ResourcesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/pkg/kinds/role/role_gen.go b/pkg/kinds/role/role_gen.go
index a3bfb86a5028b..c054e8c1773a5 100644
--- a/pkg/kinds/role/role_gen.go
+++ b/pkg/kinds/role/role_gen.go
@@ -3,13 +3,15 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoTypesJenny
+//     K8ResourcesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 package role
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	"github.com/grafana/grafana/pkg/kinds"
 )
 
@@ -19,9 +21,11 @@ type K8sResource = kinds.GrafanaResource[Spec, Status]
 // NewResource creates a new instance of the resource with a given name (UID)
 func NewK8sResource(name string, s *Spec) K8sResource {
 	return K8sResource{
-		Kind:       "Role",
-		APIVersion: "v0-0-alpha",
-		Metadata: kinds.GrafanaResourceMetadata{
+		TypeMeta: v1.TypeMeta{
+			Kind:       "Role",
+			APIVersion: "v0-0-alpha",
+		},
+		ObjectMeta: v1.ObjectMeta{
 			Name:        name,
 			Annotations: make(map[string]string),
 			Labels:      make(map[string]string),
diff --git a/pkg/kinds/role/role_kind_gen.go b/pkg/kinds/role/role_kind_gen.go
deleted file mode 100644
index cc297cb080731..0000000000000
--- a/pkg/kinds/role/role_kind_gen.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     CoreKindJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package role
-
-import (
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema"
-	"github.com/grafana/thema/vmux"
-
-	"github.com/grafana/grafana/pkg/cuectx"
-)
-
-// rootrel is the relative path from the grafana repository root to the
-// directory containing the .cue files in which this kind is defined. Necessary
-// for runtime errors related to the definition and/or lineage to provide
-// a real path to the correct .cue file.
-const rootrel string = "kinds/role"
-
-// TODO standard generated docs
-type Kind struct {
-	kindsys.Core
-	lin    thema.ConvergentLineage[*Resource]
-	jcodec vmux.Codec
-	valmux vmux.ValueMux[*Resource]
-}
-
-// type guard - ensure generated Kind type satisfies the kindsys.Core interface
-var _ kindsys.Core = &Kind{}
-
-// TODO standard generated docs
-func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
-	def, err := cuectx.LoadCoreKindDef(rootrel, rt.Context(), nil)
-	if err != nil {
-		return nil, err
-	}
-
-	k := &Kind{}
-	k.Core, err = kindsys.BindCore(rt, def, opts...)
-	if err != nil {
-		return nil, err
-	}
-	// Get the thema.Schema that the meta says is in the current version (which
-	// codegen ensures is always the latest)
-	cursch := thema.SchemaP(k.Core.Lineage(), def.Properties.CurrentVersion)
-	tsch, err := thema.BindType(cursch, &Resource{})
-	if err != nil {
-		// Should be unreachable, modulo bugs in the Thema->Go code generator
-		return nil, err
-	}
-
-	k.jcodec = vmux.NewJSONCodec("role.json")
-	k.lin = tsch.ConvergentLineage()
-	k.valmux = vmux.NewValueMux(k.lin.TypedSchema(), k.jcodec)
-	return k, nil
-}
-
-// ConvergentLineage returns the same [thema.Lineage] as Lineage, but bound (see [thema.BindType])
-// to the the Role [Resource] type generated from the current schema, v0.0.
-func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*Resource] {
-	return k.lin
-}
-
-// JSONValueMux is a version multiplexer that maps a []byte containing JSON data
-// at any schematized dashboard version to an instance of Role [Resource].
-//
-// Validation and translation errors emitted from this func will identify the
-// input bytes as "dashboard.json".
-//
-// This is a thin wrapper around Thema's [vmux.ValueMux].
-func (k *Kind) JSONValueMux(b []byte) (*Resource, thema.TranslationLacunas, error) {
-	return k.valmux(b)
-}
diff --git a/pkg/kinds/role/role_metadata_gen.go b/pkg/kinds/role/role_metadata_gen.go
index b64111b964448..21bd45d33623b 100644
--- a/pkg/kinds/role/role_metadata_gen.go
+++ b/pkg/kinds/role/role_metadata_gen.go
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoResourceTypes
+//     K8ResourcesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/pkg/kinds/role/role_status_gen.go b/pkg/kinds/role/role_status_gen.go
index f5088b2c2dec7..ff9f44bdc5e0d 100644
--- a/pkg/kinds/role/role_status_gen.go
+++ b/pkg/kinds/role/role_status_gen.go
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoResourceTypes
+//     K8ResourcesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/pkg/kinds/rolebinding/rolebinding_gen.go b/pkg/kinds/rolebinding/rolebinding_gen.go
index c5177cafb9aa8..216bd3a952508 100644
--- a/pkg/kinds/rolebinding/rolebinding_gen.go
+++ b/pkg/kinds/rolebinding/rolebinding_gen.go
@@ -3,13 +3,15 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoTypesJenny
+//     K8ResourcesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 package rolebinding
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	"github.com/grafana/grafana/pkg/kinds"
 )
 
@@ -19,9 +21,11 @@ type K8sResource = kinds.GrafanaResource[Spec, Status]
 // NewResource creates a new instance of the resource with a given name (UID)
 func NewK8sResource(name string, s *Spec) K8sResource {
 	return K8sResource{
-		Kind:       "RoleBinding",
-		APIVersion: "v0-0-alpha",
-		Metadata: kinds.GrafanaResourceMetadata{
+		TypeMeta: v1.TypeMeta{
+			Kind:       "RoleBinding",
+			APIVersion: "v0-0-alpha",
+		},
+		ObjectMeta: v1.ObjectMeta{
 			Name:        name,
 			Annotations: make(map[string]string),
 			Labels:      make(map[string]string),
diff --git a/pkg/kinds/rolebinding/rolebinding_kind_gen.go b/pkg/kinds/rolebinding/rolebinding_kind_gen.go
deleted file mode 100644
index 603b1d9674711..0000000000000
--- a/pkg/kinds/rolebinding/rolebinding_kind_gen.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     CoreKindJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package rolebinding
-
-import (
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema"
-	"github.com/grafana/thema/vmux"
-
-	"github.com/grafana/grafana/pkg/cuectx"
-)
-
-// rootrel is the relative path from the grafana repository root to the
-// directory containing the .cue files in which this kind is defined. Necessary
-// for runtime errors related to the definition and/or lineage to provide
-// a real path to the correct .cue file.
-const rootrel string = "kinds/rolebinding"
-
-// TODO standard generated docs
-type Kind struct {
-	kindsys.Core
-	lin    thema.ConvergentLineage[*Resource]
-	jcodec vmux.Codec
-	valmux vmux.ValueMux[*Resource]
-}
-
-// type guard - ensure generated Kind type satisfies the kindsys.Core interface
-var _ kindsys.Core = &Kind{}
-
-// TODO standard generated docs
-func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
-	def, err := cuectx.LoadCoreKindDef(rootrel, rt.Context(), nil)
-	if err != nil {
-		return nil, err
-	}
-
-	k := &Kind{}
-	k.Core, err = kindsys.BindCore(rt, def, opts...)
-	if err != nil {
-		return nil, err
-	}
-	// Get the thema.Schema that the meta says is in the current version (which
-	// codegen ensures is always the latest)
-	cursch := thema.SchemaP(k.Core.Lineage(), def.Properties.CurrentVersion)
-	tsch, err := thema.BindType(cursch, &Resource{})
-	if err != nil {
-		// Should be unreachable, modulo bugs in the Thema->Go code generator
-		return nil, err
-	}
-
-	k.jcodec = vmux.NewJSONCodec("rolebinding.json")
-	k.lin = tsch.ConvergentLineage()
-	k.valmux = vmux.NewValueMux(k.lin.TypedSchema(), k.jcodec)
-	return k, nil
-}
-
-// ConvergentLineage returns the same [thema.Lineage] as Lineage, but bound (see [thema.BindType])
-// to the the RoleBinding [Resource] type generated from the current schema, v0.0.
-func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*Resource] {
-	return k.lin
-}
-
-// JSONValueMux is a version multiplexer that maps a []byte containing JSON data
-// at any schematized dashboard version to an instance of RoleBinding [Resource].
-//
-// Validation and translation errors emitted from this func will identify the
-// input bytes as "dashboard.json".
-//
-// This is a thin wrapper around Thema's [vmux.ValueMux].
-func (k *Kind) JSONValueMux(b []byte) (*Resource, thema.TranslationLacunas, error) {
-	return k.valmux(b)
-}
diff --git a/pkg/kinds/rolebinding/rolebinding_metadata_gen.go b/pkg/kinds/rolebinding/rolebinding_metadata_gen.go
index 841dba676228f..2c2f4b28343ee 100644
--- a/pkg/kinds/rolebinding/rolebinding_metadata_gen.go
+++ b/pkg/kinds/rolebinding/rolebinding_metadata_gen.go
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoResourceTypes
+//     K8ResourcesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/pkg/kinds/rolebinding/rolebinding_status_gen.go b/pkg/kinds/rolebinding/rolebinding_status_gen.go
index 18430702595e9..1b4552df63d14 100644
--- a/pkg/kinds/rolebinding/rolebinding_status_gen.go
+++ b/pkg/kinds/rolebinding/rolebinding_status_gen.go
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoResourceTypes
+//     K8ResourcesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/pkg/kinds/team/team_gen.go b/pkg/kinds/team/team_gen.go
index c09d04fdf369d..155f91d0a5416 100644
--- a/pkg/kinds/team/team_gen.go
+++ b/pkg/kinds/team/team_gen.go
@@ -3,13 +3,15 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoTypesJenny
+//     K8ResourcesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 package team
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	"github.com/grafana/grafana/pkg/kinds"
 )
 
@@ -19,9 +21,11 @@ type K8sResource = kinds.GrafanaResource[Spec, Status]
 // NewResource creates a new instance of the resource with a given name (UID)
 func NewK8sResource(name string, s *Spec) K8sResource {
 	return K8sResource{
-		Kind:       "Team",
-		APIVersion: "v0-0-alpha",
-		Metadata: kinds.GrafanaResourceMetadata{
+		TypeMeta: v1.TypeMeta{
+			Kind:       "Team",
+			APIVersion: "v0-0-alpha",
+		},
+		ObjectMeta: v1.ObjectMeta{
 			Name:        name,
 			Annotations: make(map[string]string),
 			Labels:      make(map[string]string),
diff --git a/pkg/kinds/team/team_kind_gen.go b/pkg/kinds/team/team_kind_gen.go
deleted file mode 100644
index 8fc6e091565c9..0000000000000
--- a/pkg/kinds/team/team_kind_gen.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     CoreKindJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package team
-
-import (
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema"
-	"github.com/grafana/thema/vmux"
-
-	"github.com/grafana/grafana/pkg/cuectx"
-)
-
-// rootrel is the relative path from the grafana repository root to the
-// directory containing the .cue files in which this kind is defined. Necessary
-// for runtime errors related to the definition and/or lineage to provide
-// a real path to the correct .cue file.
-const rootrel string = "kinds/team"
-
-// TODO standard generated docs
-type Kind struct {
-	kindsys.Core
-	lin    thema.ConvergentLineage[*Resource]
-	jcodec vmux.Codec
-	valmux vmux.ValueMux[*Resource]
-}
-
-// type guard - ensure generated Kind type satisfies the kindsys.Core interface
-var _ kindsys.Core = &Kind{}
-
-// TODO standard generated docs
-func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
-	def, err := cuectx.LoadCoreKindDef(rootrel, rt.Context(), nil)
-	if err != nil {
-		return nil, err
-	}
-
-	k := &Kind{}
-	k.Core, err = kindsys.BindCore(rt, def, opts...)
-	if err != nil {
-		return nil, err
-	}
-	// Get the thema.Schema that the meta says is in the current version (which
-	// codegen ensures is always the latest)
-	cursch := thema.SchemaP(k.Core.Lineage(), def.Properties.CurrentVersion)
-	tsch, err := thema.BindType(cursch, &Resource{})
-	if err != nil {
-		// Should be unreachable, modulo bugs in the Thema->Go code generator
-		return nil, err
-	}
-
-	k.jcodec = vmux.NewJSONCodec("team.json")
-	k.lin = tsch.ConvergentLineage()
-	k.valmux = vmux.NewValueMux(k.lin.TypedSchema(), k.jcodec)
-	return k, nil
-}
-
-// ConvergentLineage returns the same [thema.Lineage] as Lineage, but bound (see [thema.BindType])
-// to the the Team [Resource] type generated from the current schema, v0.0.
-func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*Resource] {
-	return k.lin
-}
-
-// JSONValueMux is a version multiplexer that maps a []byte containing JSON data
-// at any schematized dashboard version to an instance of Team [Resource].
-//
-// Validation and translation errors emitted from this func will identify the
-// input bytes as "dashboard.json".
-//
-// This is a thin wrapper around Thema's [vmux.ValueMux].
-func (k *Kind) JSONValueMux(b []byte) (*Resource, thema.TranslationLacunas, error) {
-	return k.valmux(b)
-}
diff --git a/pkg/kinds/team/team_metadata_gen.go b/pkg/kinds/team/team_metadata_gen.go
index d4acb2f00d8f8..2709fc43743be 100644
--- a/pkg/kinds/team/team_metadata_gen.go
+++ b/pkg/kinds/team/team_metadata_gen.go
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoResourceTypes
+//     K8ResourcesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/pkg/kinds/team/team_status_gen.go b/pkg/kinds/team/team_status_gen.go
index 5983d8f260ff4..d9e9c6535fde0 100644
--- a/pkg/kinds/team/team_status_gen.go
+++ b/pkg/kinds/team/team_status_gen.go
@@ -3,7 +3,7 @@
 // Generated by:
 //     kinds/gen.go
 // Using jennies:
-//     GoResourceTypes
+//     K8ResourcesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/pkg/kindsysreport/attributes.go b/pkg/kindsysreport/attributes.go
deleted file mode 100644
index c51a4b3df740a..0000000000000
--- a/pkg/kindsysreport/attributes.go
+++ /dev/null
@@ -1,74 +0,0 @@
-package kindsysreport
-
-import (
-	"cuelang.org/go/cue"
-)
-
-type AttributeWalker struct {
-	seen  map[cue.Value]bool
-	count map[string]int
-}
-
-func (w *AttributeWalker) Count(sch cue.Value, attrs ...string) map[string]int {
-	w.seen = make(map[cue.Value]bool)
-	w.count = make(map[string]int)
-
-	for _, attr := range attrs {
-		w.count[attr] = 0
-	}
-
-	w.walk(cue.MakePath(), sch)
-	return w.count
-}
-
-func (w *AttributeWalker) walk(p cue.Path, v cue.Value) {
-	if w.seen[v] {
-		return
-	}
-
-	w.seen[v] = true
-
-	for attr := range w.count {
-		if found := v.Attribute(attr); found.Err() == nil {
-			w.count[attr]++
-		}
-	}
-
-	// nolint: exhaustive
-	switch v.Kind() {
-	case cue.StructKind:
-		// If current cue.Value is a reference to another
-		// definition, we don't want to traverse its fields
-		// individually, because we'll do so for the actual def.
-		if v != cue.Dereference(v) {
-			return
-		}
-
-		iter, err := v.Fields(cue.All())
-		if err != nil {
-			panic(err)
-		}
-
-		for iter.Next() {
-			w.walk(appendPath(p, iter.Selector()), iter.Value())
-		}
-		if lv := v.LookupPath(cue.MakePath(cue.AnyString)); lv.Exists() {
-			w.walk(appendPath(p, cue.AnyString), lv)
-		}
-	case cue.ListKind:
-		list, err := v.List()
-		if err != nil {
-			panic(err)
-		}
-		for i := 0; list.Next(); i++ {
-			w.walk(appendPath(p, cue.Index(i)), list.Value())
-		}
-		if lv := v.LookupPath(cue.MakePath(cue.AnyIndex)); lv.Exists() {
-			w.walk(appendPath(p, cue.AnyString), lv)
-		}
-	}
-}
-
-func appendPath(p cue.Path, sel cue.Selector) cue.Path {
-	return cue.MakePath(append(p.Selectors(), sel)...)
-}
diff --git a/pkg/kindsysreport/codegen/report.go b/pkg/kindsysreport/codegen/report.go
deleted file mode 100644
index 433c5d43c64db..0000000000000
--- a/pkg/kindsysreport/codegen/report.go
+++ /dev/null
@@ -1,391 +0,0 @@
-//go:build ignore
-// +build ignore
-
-//go:generate go run report.go
-
-package main
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"net/url"
-	"os"
-	"path/filepath"
-	"reflect"
-	"sort"
-	"strings"
-
-	"cuelang.org/go/cue"
-	"github.com/grafana/codejen"
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema"
-
-	"github.com/grafana/grafana/pkg/kindsysreport"
-	"github.com/grafana/grafana/pkg/plugins/pfs/corelist"
-	"github.com/grafana/grafana/pkg/plugins/plugindef"
-	"github.com/grafana/grafana/pkg/registry/corekind"
-)
-
-const (
-	// Program's output
-	reportFileName = "report.json"
-
-	// External references
-	repoBaseURL = "https://github.com/grafana/grafana/tree/main"
-	docsBaseURL = "https://grafana.com/docs/grafana/next/developers/kinds"
-
-	// Local references
-	coreTSPath  = "packages/grafana-schema/src/raw/%s/%s/%s_types.gen.ts"
-	coreGoPath  = "pkg/kinds/%s"
-	coreCUEPath = "kinds/%s/%s_kind.cue"
-
-	composableTSPath  = "public/app/plugins/%s/%s/%s.gen.ts"
-	composableGoPath  = "pkg/tsdb/%s/kinds/%s/types_%s_gen.go"
-	composableCUEPath = "public/app/plugins/%s/%s/%s.cue"
-)
-
-func main() {
-	report := buildKindStateReport()
-	reportJSON := elsedie(json.MarshalIndent(report, "", "  "))("error generating json output")
-
-	file := codejen.NewFile(reportFileName, reportJSON, reportJenny{})
-	filesystem := elsedie(file.ToFS())("error building in-memory file system")
-
-	if _, set := os.LookupEnv("CODEGEN_VERIFY"); set {
-		if err := filesystem.Verify(context.Background(), ""); err != nil {
-			die(fmt.Errorf("generated code is out of sync with inputs:\n%s\nrun `make gen-cue` to regenerate", err))
-		}
-	} else if err := filesystem.Write(context.Background(), ""); err != nil {
-		die(fmt.Errorf("error while writing generated code to disk:\n%s", err))
-	}
-}
-
-// static list of planned core kinds so that we can inject ones that
-// haven't been started on yet as "planned"
-var plannedCoreKinds = []string{
-	"Dashboard",
-	"Playlist",
-	"Team",
-	"User",
-	"Folder",
-	"DataSource",
-	"APIKey",
-	"ServiceAccount",
-	"Thumb",
-	"Query",
-	"QueryHistory",
-}
-
-type KindLinks struct {
-	Schema string
-	Go     string
-	Ts     string
-	Docs   string
-}
-
-type Kind struct {
-	kindsys.SomeKindProperties
-	Category             string
-	Links                KindLinks
-	GrafanaMaturityCount int
-	CodeOwners           []string
-}
-
-// MarshalJSON is overwritten to marshal
-// kindsys.SomeKindProperties at root level.
-func (k Kind) MarshalJSON() ([]byte, error) {
-	b, err := json.Marshal(k.SomeKindProperties)
-	if err != nil {
-		return nil, err
-	}
-
-	var m map[string]any
-	if err = json.Unmarshal(b, &m); err != nil {
-		return nil, err
-	}
-
-	m["category"] = k.Category
-	m["grafanaMaturityCount"] = k.GrafanaMaturityCount
-
-	if len(k.CodeOwners) == 0 {
-		m["codeowners"] = []string{}
-	} else {
-		m["codeowners"] = k.CodeOwners
-	}
-
-	m["links"] = map[string]string{}
-	for _, ref := range []string{"Schema", "Go", "Ts", "Docs"} {
-		refVal := reflect.ValueOf(k.Links).FieldByName(ref).String()
-		if len(refVal) > 0 {
-			m["links"].(map[string]string)[toCamelCase(ref)] = refVal
-		} else {
-			m["links"].(map[string]string)[toCamelCase(ref)] = "n/a"
-		}
-	}
-
-	return json.Marshal(m)
-}
-
-type KindStateReport struct {
-	Kinds      map[string]Kind      `json:"kinds"`
-	Dimensions map[string]Dimension `json:"dimensions"`
-}
-
-func (r *KindStateReport) add(k Kind) {
-	kName := k.Common().MachineName
-
-	r.Kinds[kName] = k
-	r.Dimensions["maturity"][k.Common().Maturity.String()].add(kName)
-	r.Dimensions["category"][k.Category].add(kName)
-}
-
-type Dimension map[string]*DimensionValue
-
-type DimensionValue struct {
-	Name  string   `json:"name"`
-	Items []string `json:"items"`
-	Count int      `json:"count"`
-}
-
-func (dv *DimensionValue) add(s string) {
-	dv.Count++
-	dv.Items = append(dv.Items, s)
-}
-
-// emptyKindStateReport is used to ensure certain
-// dimension values are present (even if empty) in
-// the final report.
-func emptyKindStateReport() *KindStateReport {
-	return &KindStateReport{
-		Kinds: make(map[string]Kind),
-		Dimensions: map[string]Dimension{
-			"maturity": {
-				"planned":      emptyDimensionValue("planned"),
-				"merged":       emptyDimensionValue("merged"),
-				"experimental": emptyDimensionValue("experimental"),
-				"stable":       emptyDimensionValue("stable"),
-				"mature":       emptyDimensionValue("mature"),
-			},
-			"category": {
-				"core":       emptyDimensionValue("core"),
-				"composable": emptyDimensionValue("composable"),
-			},
-		},
-	}
-}
-
-func emptyDimensionValue(name string) *DimensionValue {
-	return &DimensionValue{
-		Name:  name,
-		Items: make([]string, 0),
-		Count: 0,
-	}
-}
-
-func buildKindStateReport() *KindStateReport {
-	r := emptyKindStateReport()
-	b := corekind.NewBase(nil)
-
-	groot := filepath.Join(elsedie(os.Getwd())("cannot get cwd"), "..", "..", "..")
-	of := elsedie(kindsysreport.NewCodeOwnersFinder(groot))("cannot parse .github/codeowners")
-
-	seen := make(map[string]bool)
-	for _, k := range b.All() {
-		seen[k.Props().Common().Name] = true
-		lin := k.Lineage()
-		links := buildCoreLinks(lin, k.Def().Properties)
-		r.add(Kind{
-			SomeKindProperties:   k.Props(),
-			Category:             "core",
-			Links:                links,
-			GrafanaMaturityCount: grafanaMaturityAttrCount(lin.Latest().Underlying()),
-			CodeOwners:           findCodeOwners(of, links),
-		})
-	}
-
-	for _, kn := range plannedCoreKinds {
-		if seen[kn] {
-			continue
-		}
-
-		r.add(Kind{
-			SomeKindProperties: kindsys.CoreProperties{
-				CommonProperties: kindsys.CommonProperties{
-					Name:              kn,
-					PluralName:        kn + "s",
-					MachineName:       machinize(kn),
-					PluralMachineName: machinize(kn) + "s",
-					Maturity:          "planned",
-				},
-			},
-			Category: "core",
-		})
-	}
-
-	all := kindsys.SchemaInterfaces(nil)
-	for _, pp := range corelist.New(nil) {
-		for _, si := range all {
-			if ck, has := pp.ComposableKinds[si.Name()]; has {
-				links := buildComposableLinks(pp.Properties, ck.Def().Properties)
-				r.add(Kind{
-					SomeKindProperties:   ck.Props(),
-					Category:             "composable",
-					Links:                links,
-					GrafanaMaturityCount: grafanaMaturityAttrCount(ck.Lineage().Latest().Underlying()),
-					CodeOwners:           findCodeOwners(of, links),
-				})
-			} else if may := si.Should(string(pp.Properties.Type)); may {
-				n := plugindef.DerivePascalName(pp.Properties) + si.Name()
-				ck := kindsys.ComposableProperties{
-					SchemaInterface: si.Name(),
-					CommonProperties: kindsys.CommonProperties{
-						Name:              n,
-						PluralName:        n + "s",
-						MachineName:       machinize(n),
-						PluralMachineName: machinize(n) + "s",
-						LineageIsGroup:    si.IsGroup(),
-						Maturity:          "planned",
-					},
-				}
-				r.add(Kind{
-					SomeKindProperties: ck,
-					Category:           "composable",
-				})
-			}
-		}
-	}
-
-	for _, d := range r.Dimensions {
-		for _, dv := range d {
-			sort.Strings(dv.Items)
-		}
-	}
-
-	return r
-}
-
-func buildCoreLinks(lin thema.Lineage, cp kindsys.CoreProperties) KindLinks {
-	const category = "core"
-	vpath := fmt.Sprintf("v%v", lin.Latest().Version()[0])
-	if cp.Maturity.Less(kindsys.MaturityStable) {
-		vpath = "x"
-	}
-
-	return KindLinks{
-		Schema: elsedie(url.JoinPath(repoBaseURL, fmt.Sprintf(coreCUEPath, cp.MachineName, cp.MachineName)))("cannot build schema link"),
-		Go:     elsedie(url.JoinPath(repoBaseURL, fmt.Sprintf(coreGoPath, cp.MachineName)))("cannot build go link"),
-		Ts:     elsedie(url.JoinPath(repoBaseURL, fmt.Sprintf(coreTSPath, cp.MachineName, vpath, cp.MachineName)))("cannot build ts link"),
-		Docs:   elsedie(url.JoinPath(docsBaseURL, category, cp.MachineName, "schema-reference"))("cannot build docs link"),
-	}
-}
-
-// used to map names for those plugins that aren't following
-// naming conventions, like 'annonlist' which comes from "Annotations list".
-var irregularPluginNames = map[string]string{
-	// Panel
-	"alertgroups":     "alertGroups",
-	"annotationslist": "annolist",
-	"dashboardlist":   "dashlist",
-	"nodegraph":       "nodeGraph",
-	"statetimeline":   "state-timeline",
-	"statushistory":   "status-history",
-	"tableold":        "table-old",
-	// Datasource
-	"googlecloudmonitoring": "cloud-monitoring",
-	"azuremonitor":          "grafana-azure-monitor-datasource",
-	"microsoftsqlserver":    "mssql",
-	"postgresql":            "postgres",
-	"testdata":              "grafana-testdata-datasource",
-}
-
-func buildComposableLinks(pp plugindef.PluginDef, cp kindsys.ComposableProperties) KindLinks {
-	const category = "composable"
-	schemaInterface := strings.ToLower(cp.SchemaInterface)
-
-	pName := strings.Replace(cp.MachineName, schemaInterface, "", 1)
-	if irr, ok := irregularPluginNames[pName]; ok {
-		pName = irr
-	}
-
-	var goLink string
-	if pp.Backend != nil && *pp.Backend {
-		goLink = elsedie(url.JoinPath(repoBaseURL, fmt.Sprintf(composableGoPath, pName, schemaInterface, schemaInterface)))("cannot build go link")
-	}
-
-	return KindLinks{
-		Schema: elsedie(url.JoinPath(repoBaseURL, fmt.Sprintf(composableCUEPath, string(pp.Type), pName, schemaInterface)))("cannot build schema link"),
-		Go:     goLink,
-		Ts:     elsedie(url.JoinPath(repoBaseURL, fmt.Sprintf(composableTSPath, string(pp.Type), pName, schemaInterface)))("cannot build ts link"),
-		Docs:   elsedie(url.JoinPath(docsBaseURL, category, cp.MachineName, "schema-reference"))("cannot build docs link"),
-	}
-}
-
-func grafanaMaturityAttrCount(sch cue.Value) int {
-	const attr = "grafanamaturity"
-	aw := new(kindsysreport.AttributeWalker)
-	return aw.Count(sch, attr)[attr]
-}
-
-func findCodeOwners(of kindsysreport.CodeOwnersFinder, links KindLinks) []string {
-	owners := elsedie(of.FindFor([]string{
-		toLocalPath(links.Schema),
-		toLocalPath(links.Go),
-		toLocalPath(links.Ts),
-	}...))("cannot find code owners")
-
-	sort.Strings(owners)
-	return owners
-}
-
-func machinize(s string) string {
-	return strings.Map(func(r rune) rune {
-		switch {
-		case r >= 'a' && r <= 'z':
-			fallthrough
-		case r >= '0' && r <= '9':
-			fallthrough
-		case r == '_':
-			return r
-		case r >= 'A' && r <= 'Z':
-			return r + 32
-		case r == '-':
-			return '_'
-		default:
-			return -1
-		}
-	}, s)
-}
-
-func toCamelCase(s string) string {
-	return strings.ToLower(string(s[0])) + s[1:]
-}
-
-func toLocalPath(s string) string {
-	return strings.Replace(s, repoBaseURL+"/", "", 1)
-}
-
-type reportJenny struct{}
-
-func (reportJenny) JennyName() string {
-	return "ReportJenny"
-}
-
-func elsedie[T any](t T, err error) func(msg string) T {
-	if err != nil {
-		return func(msg string) T {
-			fmt.Fprintf(os.Stderr, "%s: %s\n", msg, err)
-			os.Exit(1)
-			return t
-		}
-	}
-
-	return func(msg string) T {
-		return t
-	}
-}
-
-func die(err error) {
-	fmt.Fprint(os.Stderr, err, "\n")
-	os.Exit(1)
-}
diff --git a/pkg/kindsysreport/codegen/report.json b/pkg/kindsysreport/codegen/report.json
deleted file mode 100644
index dca8c8bd03f92..0000000000000
--- a/pkg/kindsysreport/codegen/report.json
+++ /dev/null
@@ -1,2342 +0,0 @@
-{
-  "kinds": {
-    "accesspolicy": {
-      "category": "core",
-      "codeowners": [
-        "grafana/grafana-as-code",
-        "grafana/grafana-frontend-platform",
-        "grafana/plugins-platform-frontend"
-      ],
-      "crd": {
-        "dummySchema": false,
-        "group": "accesspolicy.core.grafana.com",
-        "scope": "Namespaced"
-      },
-      "currentVersion": [
-        0,
-        0
-      ],
-      "description": "Access rules for a scope+role.  NOTE there is a unique constraint on role+scope",
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/core/accesspolicy/schema-reference",
-        "go": "https://github.com/grafana/grafana/tree/main/pkg/kinds/accesspolicy",
-        "schema": "https://github.com/grafana/grafana/tree/main/kinds/accesspolicy/accesspolicy_kind.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/packages/grafana-schema/src/raw/accesspolicy/x/accesspolicy_types.gen.ts"
-      },
-      "machineName": "accesspolicy",
-      "maturity": "merged",
-      "name": "AccessPolicy",
-      "pluralMachineName": "accesspolicies",
-      "pluralName": "AccessPolicies"
-    },
-    "alertgroupspanelcfg": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/alerting-frontend"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/alertgroupspanelcfg/schema-reference",
-        "go": "n/a",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/alertGroups/panelcfg.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/alertGroups/panelcfg.gen.ts"
-      },
-      "machineName": "alertgroupspanelcfg",
-      "maturity": "merged",
-      "name": "AlertGroupsPanelCfg",
-      "pluralMachineName": "alertgroupspanelcfgs",
-      "pluralName": "AlertGroupsPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "alertlistpanelcfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "alertlistpanelcfg",
-      "maturity": "planned",
-      "name": "AlertListPanelCfg",
-      "pluralMachineName": "alertlistpanelcfgs",
-      "pluralName": "AlertListPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "alertmanagerdataquery": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "alertmanagerdataquery",
-      "maturity": "planned",
-      "name": "AlertmanagerDataQuery",
-      "pluralMachineName": "alertmanagerdataquerys",
-      "pluralName": "AlertmanagerDataQuerys",
-      "schemaInterface": "DataQuery"
-    },
-    "alertmanagerdatasourcecfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "alertmanagerdatasourcecfg",
-      "maturity": "planned",
-      "name": "AlertmanagerDataSourceCfg",
-      "pluralMachineName": "alertmanagerdatasourcecfgs",
-      "pluralName": "AlertmanagerDataSourceCfgs",
-      "schemaInterface": "DataSourceCfg"
-    },
-    "annotationslistpanelcfg": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/grafana-frontend-platform"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/annotationslistpanelcfg/schema-reference",
-        "go": "n/a",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/annolist/panelcfg.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/annolist/panelcfg.gen.ts"
-      },
-      "machineName": "annotationslistpanelcfg",
-      "maturity": "experimental",
-      "name": "AnnotationsListPanelCfg",
-      "pluralMachineName": "annotationslistpanelcfgs",
-      "pluralName": "AnnotationsListPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "apikey": {
-      "category": "core",
-      "codeowners": [],
-      "crd": {
-        "dummySchema": false,
-        "group": "",
-        "scope": ""
-      },
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "apikey",
-      "maturity": "planned",
-      "name": "APIKey",
-      "pluralMachineName": "apikeys",
-      "pluralName": "APIKeys"
-    },
-    "azuremonitordataquery": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/azuremonitordataquery/schema-reference",
-        "go": "https://github.com/grafana/grafana/tree/main/pkg/tsdb/grafana-azure-monitor-datasource/kinds/dataquery/types_dataquery_gen.go",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/grafana-azure-monitor-datasource/dataquery.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/grafana-azure-monitor-datasource/dataquery.gen.ts"
-      },
-      "machineName": "azuremonitordataquery",
-      "maturity": "merged",
-      "name": "AzureMonitorDataQuery",
-      "pluralMachineName": "azuremonitordataquerys",
-      "pluralName": "AzureMonitorDataQuerys",
-      "schemaInterface": "DataQuery"
-    },
-    "azuremonitordatasourcecfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "azuremonitordatasourcecfg",
-      "maturity": "planned",
-      "name": "AzureMonitorDataSourceCfg",
-      "pluralMachineName": "azuremonitordatasourcecfgs",
-      "pluralName": "AzureMonitorDataSourceCfgs",
-      "schemaInterface": "DataSourceCfg"
-    },
-    "barchartpanelcfg": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/dataviz-squad"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/barchartpanelcfg/schema-reference",
-        "go": "n/a",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/barchart/panelcfg.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/barchart/panelcfg.gen.ts"
-      },
-      "machineName": "barchartpanelcfg",
-      "maturity": "experimental",
-      "name": "BarChartPanelCfg",
-      "pluralMachineName": "barchartpanelcfgs",
-      "pluralName": "BarChartPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "bargaugepanelcfg": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/dataviz-squad"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/bargaugepanelcfg/schema-reference",
-        "go": "n/a",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/bargauge/panelcfg.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/bargauge/panelcfg.gen.ts"
-      },
-      "machineName": "bargaugepanelcfg",
-      "maturity": "experimental",
-      "name": "BarGaugePanelCfg",
-      "pluralMachineName": "bargaugepanelcfgs",
-      "pluralName": "BarGaugePanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "candlestickpanelcfg": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/dataviz-squad"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/candlestickpanelcfg/schema-reference",
-        "go": "n/a",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/candlestick/panelcfg.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/candlestick/panelcfg.gen.ts"
-      },
-      "machineName": "candlestickpanelcfg",
-      "maturity": "experimental",
-      "name": "CandlestickPanelCfg",
-      "pluralMachineName": "candlestickpanelcfgs",
-      "pluralName": "CandlestickPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "canvaspanelcfg": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/dataviz-squad"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/canvaspanelcfg/schema-reference",
-        "go": "n/a",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/canvas/panelcfg.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/canvas/panelcfg.gen.ts"
-      },
-      "machineName": "canvaspanelcfg",
-      "maturity": "experimental",
-      "name": "CanvasPanelCfg",
-      "pluralMachineName": "canvaspanelcfgs",
-      "pluralName": "CanvasPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "cloudwatchdataquery": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/aws-datasources"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/cloudwatchdataquery/schema-reference",
-        "go": "https://github.com/grafana/grafana/tree/main/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/cloudwatch/dataquery.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts"
-      },
-      "machineName": "cloudwatchdataquery",
-      "maturity": "experimental",
-      "name": "CloudWatchDataQuery",
-      "pluralMachineName": "cloudwatchdataquerys",
-      "pluralName": "CloudWatchDataQuerys",
-      "schemaInterface": "DataQuery"
-    },
-    "cloudwatchdatasourcecfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "cloudwatchdatasourcecfg",
-      "maturity": "planned",
-      "name": "CloudWatchDataSourceCfg",
-      "pluralMachineName": "cloudwatchdatasourcecfgs",
-      "pluralName": "CloudWatchDataSourceCfgs",
-      "schemaInterface": "DataSourceCfg"
-    },
-    "dashboard": {
-      "category": "core",
-      "codeowners": [
-        "grafana/grafana-as-code",
-        "grafana/grafana-frontend-platform",
-        "grafana/plugins-platform-frontend"
-      ],
-      "crd": {
-        "dummySchema": true,
-        "group": "dashboard.core.grafana.com",
-        "scope": "Namespaced"
-      },
-      "currentVersion": [
-        0,
-        0
-      ],
-      "description": "A Grafana dashboard.",
-      "grafanaMaturityCount": 103,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/core/dashboard/schema-reference",
-        "go": "https://github.com/grafana/grafana/tree/main/pkg/kinds/dashboard",
-        "schema": "https://github.com/grafana/grafana/tree/main/kinds/dashboard/dashboard_kind.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts"
-      },
-      "machineName": "dashboard",
-      "maturity": "experimental",
-      "name": "Dashboard",
-      "pluralMachineName": "dashboards",
-      "pluralName": "Dashboards"
-    },
-    "dashboarddataquery": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "dashboarddataquery",
-      "maturity": "planned",
-      "name": "DashboardDataQuery",
-      "pluralMachineName": "dashboarddataquerys",
-      "pluralName": "DashboardDataQuerys",
-      "schemaInterface": "DataQuery"
-    },
-    "dashboarddatasourcecfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "dashboarddatasourcecfg",
-      "maturity": "planned",
-      "name": "DashboardDataSourceCfg",
-      "pluralMachineName": "dashboarddatasourcecfgs",
-      "pluralName": "DashboardDataSourceCfgs",
-      "schemaInterface": "DataSourceCfg"
-    },
-    "dashboardlistpanelcfg": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/grafana-frontend-platform"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/dashboardlistpanelcfg/schema-reference",
-        "go": "n/a",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/dashlist/panelcfg.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/dashlist/panelcfg.gen.ts"
-      },
-      "machineName": "dashboardlistpanelcfg",
-      "maturity": "experimental",
-      "name": "DashboardListPanelCfg",
-      "pluralMachineName": "dashboardlistpanelcfgs",
-      "pluralName": "DashboardListPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "datagridpanelcfg": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/grafana-bi-squad"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/datagridpanelcfg/schema-reference",
-        "go": "n/a",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/datagrid/panelcfg.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/datagrid/panelcfg.gen.ts"
-      },
-      "machineName": "datagridpanelcfg",
-      "maturity": "experimental",
-      "name": "DatagridPanelCfg",
-      "pluralMachineName": "datagridpanelcfgs",
-      "pluralName": "DatagridPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "datasource": {
-      "category": "core",
-      "codeowners": [],
-      "crd": {
-        "dummySchema": false,
-        "group": "",
-        "scope": ""
-      },
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "datasource",
-      "maturity": "planned",
-      "name": "DataSource",
-      "pluralMachineName": "datasources",
-      "pluralName": "DataSources"
-    },
-    "debugpanelcfg": {
-      "category": "composable",
-      "codeowners": [
-        "ryantxu"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/debugpanelcfg/schema-reference",
-        "go": "n/a",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/debug/panelcfg.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/debug/panelcfg.gen.ts"
-      },
-      "machineName": "debugpanelcfg",
-      "maturity": "experimental",
-      "name": "DebugPanelCfg",
-      "pluralMachineName": "debugpanelcfgs",
-      "pluralName": "DebugPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "elasticsearchdataquery": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/observability-logs"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/elasticsearchdataquery/schema-reference",
-        "go": "https://github.com/grafana/grafana/tree/main/pkg/tsdb/elasticsearch/kinds/dataquery/types_dataquery_gen.go",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/elasticsearch/dataquery.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/elasticsearch/dataquery.gen.ts"
-      },
-      "machineName": "elasticsearchdataquery",
-      "maturity": "experimental",
-      "name": "ElasticsearchDataQuery",
-      "pluralMachineName": "elasticsearchdataquerys",
-      "pluralName": "ElasticsearchDataQuerys",
-      "schemaInterface": "DataQuery"
-    },
-    "elasticsearchdatasourcecfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "elasticsearchdatasourcecfg",
-      "maturity": "planned",
-      "name": "ElasticsearchDataSourceCfg",
-      "pluralMachineName": "elasticsearchdatasourcecfgs",
-      "pluralName": "ElasticsearchDataSourceCfgs",
-      "schemaInterface": "DataSourceCfg"
-    },
-    "flamegraphpanelcfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "flamegraphpanelcfg",
-      "maturity": "planned",
-      "name": "FlameGraphPanelCfg",
-      "pluralMachineName": "flamegraphpanelcfgs",
-      "pluralName": "FlameGraphPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "folder": {
-      "category": "core",
-      "codeowners": [
-        "grafana/grafana-as-code",
-        "grafana/grafana-frontend-platform",
-        "grafana/plugins-platform-frontend"
-      ],
-      "crd": {
-        "dummySchema": false,
-        "group": "folder.core.grafana.com",
-        "scope": "Namespaced"
-      },
-      "currentVersion": [
-        0,
-        0
-      ],
-      "description": "A folder is a collection of resources that are grouped together and can share permissions.",
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/core/folder/schema-reference",
-        "go": "https://github.com/grafana/grafana/tree/main/pkg/kinds/folder",
-        "schema": "https://github.com/grafana/grafana/tree/main/kinds/folder/folder_kind.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/packages/grafana-schema/src/raw/folder/x/folder_types.gen.ts"
-      },
-      "machineName": "folder",
-      "maturity": "merged",
-      "name": "Folder",
-      "pluralMachineName": "folders",
-      "pluralName": "Folders"
-    },
-    "gaugepanelcfg": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/dataviz-squad"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/gaugepanelcfg/schema-reference",
-        "go": "n/a",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/gauge/panelcfg.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/gauge/panelcfg.gen.ts"
-      },
-      "machineName": "gaugepanelcfg",
-      "maturity": "experimental",
-      "name": "GaugePanelCfg",
-      "pluralMachineName": "gaugepanelcfgs",
-      "pluralName": "GaugePanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "geomappanelcfg": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/dataviz-squad"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/geomappanelcfg/schema-reference",
-        "go": "n/a",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/geomap/panelcfg.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/geomap/panelcfg.gen.ts"
-      },
-      "machineName": "geomappanelcfg",
-      "maturity": "experimental",
-      "name": "GeomapPanelCfg",
-      "pluralMachineName": "geomappanelcfgs",
-      "pluralName": "GeomapPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "gettingstartedpanelcfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "gettingstartedpanelcfg",
-      "maturity": "planned",
-      "name": "GettingStartedPanelCfg",
-      "pluralMachineName": "gettingstartedpanelcfgs",
-      "pluralName": "GettingStartedPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "googlecloudmonitoringdataquery": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/partner-datasources"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/googlecloudmonitoringdataquery/schema-reference",
-        "go": "https://github.com/grafana/grafana/tree/main/pkg/tsdb/cloud-monitoring/kinds/dataquery/types_dataquery_gen.go",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/cloud-monitoring/dataquery.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/cloud-monitoring/dataquery.gen.ts"
-      },
-      "machineName": "googlecloudmonitoringdataquery",
-      "maturity": "merged",
-      "name": "GoogleCloudMonitoringDataQuery",
-      "pluralMachineName": "googlecloudmonitoringdataquerys",
-      "pluralName": "GoogleCloudMonitoringDataQuerys",
-      "schemaInterface": "DataQuery"
-    },
-    "googlecloudmonitoringdatasourcecfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "googlecloudmonitoringdatasourcecfg",
-      "maturity": "planned",
-      "name": "GoogleCloudMonitoringDataSourceCfg",
-      "pluralMachineName": "googlecloudmonitoringdatasourcecfgs",
-      "pluralName": "GoogleCloudMonitoringDataSourceCfgs",
-      "schemaInterface": "DataSourceCfg"
-    },
-    "grafanadataquery": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "grafanadataquery",
-      "maturity": "planned",
-      "name": "GrafanaDataQuery",
-      "pluralMachineName": "grafanadataquerys",
-      "pluralName": "GrafanaDataQuerys",
-      "schemaInterface": "DataQuery"
-    },
-    "grafanadatasourcecfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "grafanadatasourcecfg",
-      "maturity": "planned",
-      "name": "GrafanaDataSourceCfg",
-      "pluralMachineName": "grafanadatasourcecfgs",
-      "pluralName": "GrafanaDataSourceCfgs",
-      "schemaInterface": "DataSourceCfg"
-    },
-    "grafanapyroscopedataquery": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/grafanapyroscopedataquery/schema-reference",
-        "go": "https://github.com/grafana/grafana/tree/main/pkg/tsdb/grafanapyroscope/kinds/dataquery/types_dataquery_gen.go",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/grafanapyroscope/dataquery.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/grafanapyroscope/dataquery.gen.ts"
-      },
-      "machineName": "grafanapyroscopedataquery",
-      "maturity": "experimental",
-      "name": "GrafanaPyroscopeDataQuery",
-      "pluralMachineName": "grafanapyroscopedataquerys",
-      "pluralName": "GrafanaPyroscopeDataQuerys",
-      "schemaInterface": "DataQuery"
-    },
-    "grafanapyroscopedatasourcecfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "grafanapyroscopedatasourcecfg",
-      "maturity": "planned",
-      "name": "GrafanaPyroscopeDataSourceCfg",
-      "pluralMachineName": "grafanapyroscopedatasourcecfgs",
-      "pluralName": "GrafanaPyroscopeDataSourceCfgs",
-      "schemaInterface": "DataSourceCfg"
-    },
-    "graphitedataquery": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "graphitedataquery",
-      "maturity": "planned",
-      "name": "GraphiteDataQuery",
-      "pluralMachineName": "graphitedataquerys",
-      "pluralName": "GraphiteDataQuerys",
-      "schemaInterface": "DataQuery"
-    },
-    "graphitedatasourcecfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "graphitedatasourcecfg",
-      "maturity": "planned",
-      "name": "GraphiteDataSourceCfg",
-      "pluralMachineName": "graphitedatasourcecfgs",
-      "pluralName": "GraphiteDataSourceCfgs",
-      "schemaInterface": "DataSourceCfg"
-    },
-    "grapholdpanelcfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "grapholdpanelcfg",
-      "maturity": "planned",
-      "name": "GraphOldPanelCfg",
-      "pluralMachineName": "grapholdpanelcfgs",
-      "pluralName": "GraphOldPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "heatmappanelcfg": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/dataviz-squad"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/heatmappanelcfg/schema-reference",
-        "go": "n/a",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/heatmap/panelcfg.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/heatmap/panelcfg.gen.ts"
-      },
-      "machineName": "heatmappanelcfg",
-      "maturity": "merged",
-      "name": "HeatmapPanelCfg",
-      "pluralMachineName": "heatmappanelcfgs",
-      "pluralName": "HeatmapPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "histogrampanelcfg": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/dataviz-squad"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/histogrampanelcfg/schema-reference",
-        "go": "n/a",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/histogram/panelcfg.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/histogram/panelcfg.gen.ts"
-      },
-      "machineName": "histogrampanelcfg",
-      "maturity": "experimental",
-      "name": "HistogramPanelCfg",
-      "pluralMachineName": "histogrampanelcfgs",
-      "pluralName": "HistogramPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "jaegerdataquery": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "jaegerdataquery",
-      "maturity": "planned",
-      "name": "JaegerDataQuery",
-      "pluralMachineName": "jaegerdataquerys",
-      "pluralName": "JaegerDataQuerys",
-      "schemaInterface": "DataQuery"
-    },
-    "jaegerdatasourcecfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "jaegerdatasourcecfg",
-      "maturity": "planned",
-      "name": "JaegerDataSourceCfg",
-      "pluralMachineName": "jaegerdatasourcecfgs",
-      "pluralName": "JaegerDataSourceCfgs",
-      "schemaInterface": "DataSourceCfg"
-    },
-    "librarypanel": {
-      "category": "core",
-      "codeowners": [
-        "grafana/grafana-as-code",
-        "grafana/grafana-frontend-platform",
-        "grafana/plugins-platform-frontend"
-      ],
-      "crd": {
-        "dummySchema": false,
-        "group": "librarypanel.core.grafana.com",
-        "scope": "Namespaced"
-      },
-      "currentVersion": [
-        0,
-        0
-      ],
-      "description": "A standalone panel",
-      "grafanaMaturityCount": 19,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/core/librarypanel/schema-reference",
-        "go": "https://github.com/grafana/grafana/tree/main/pkg/kinds/librarypanel",
-        "schema": "https://github.com/grafana/grafana/tree/main/kinds/librarypanel/librarypanel_kind.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/packages/grafana-schema/src/raw/librarypanel/x/librarypanel_types.gen.ts"
-      },
-      "machineName": "librarypanel",
-      "maturity": "experimental",
-      "name": "LibraryPanel",
-      "pluralMachineName": "librarypanels",
-      "pluralName": "LibraryPanels"
-    },
-    "livepanelcfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "livepanelcfg",
-      "maturity": "planned",
-      "name": "LivePanelCfg",
-      "pluralMachineName": "livepanelcfgs",
-      "pluralName": "LivePanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "logspanelcfg": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/observability-logs"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/logspanelcfg/schema-reference",
-        "go": "n/a",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/logs/panelcfg.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/logs/panelcfg.gen.ts"
-      },
-      "machineName": "logspanelcfg",
-      "maturity": "experimental",
-      "name": "LogsPanelCfg",
-      "pluralMachineName": "logspanelcfgs",
-      "pluralName": "LogsPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "lokidataquery": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/observability-logs"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/lokidataquery/schema-reference",
-        "go": "https://github.com/grafana/grafana/tree/main/pkg/tsdb/loki/kinds/dataquery/types_dataquery_gen.go",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/loki/dataquery.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/loki/dataquery.gen.ts"
-      },
-      "machineName": "lokidataquery",
-      "maturity": "experimental",
-      "name": "LokiDataQuery",
-      "pluralMachineName": "lokidataquerys",
-      "pluralName": "LokiDataQuerys",
-      "schemaInterface": "DataQuery"
-    },
-    "lokidatasourcecfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "lokidatasourcecfg",
-      "maturity": "planned",
-      "name": "LokiDataSourceCfg",
-      "pluralMachineName": "lokidatasourcecfgs",
-      "pluralName": "LokiDataSourceCfgs",
-      "schemaInterface": "DataSourceCfg"
-    },
-    "microsoftsqlserverdataquery": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "microsoftsqlserverdataquery",
-      "maturity": "planned",
-      "name": "MicrosoftSQLServerDataQuery",
-      "pluralMachineName": "microsoftsqlserverdataquerys",
-      "pluralName": "MicrosoftSQLServerDataQuerys",
-      "schemaInterface": "DataQuery"
-    },
-    "microsoftsqlserverdatasourcecfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "microsoftsqlserverdatasourcecfg",
-      "maturity": "planned",
-      "name": "MicrosoftSQLServerDataSourceCfg",
-      "pluralMachineName": "microsoftsqlserverdatasourcecfgs",
-      "pluralName": "MicrosoftSQLServerDataSourceCfgs",
-      "schemaInterface": "DataSourceCfg"
-    },
-    "mysqldataquery": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "mysqldataquery",
-      "maturity": "planned",
-      "name": "MySQLDataQuery",
-      "pluralMachineName": "mysqldataquerys",
-      "pluralName": "MySQLDataQuerys",
-      "schemaInterface": "DataQuery"
-    },
-    "mysqldatasourcecfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "mysqldatasourcecfg",
-      "maturity": "planned",
-      "name": "MySQLDataSourceCfg",
-      "pluralMachineName": "mysqldatasourcecfgs",
-      "pluralName": "MySQLDataSourceCfgs",
-      "schemaInterface": "DataSourceCfg"
-    },
-    "newspanelcfg": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/grafana-frontend-platform"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/newspanelcfg/schema-reference",
-        "go": "n/a",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/news/panelcfg.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/news/panelcfg.gen.ts"
-      },
-      "machineName": "newspanelcfg",
-      "maturity": "experimental",
-      "name": "NewsPanelCfg",
-      "pluralMachineName": "newspanelcfgs",
-      "pluralName": "NewsPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "nodegraphpanelcfg": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/observability-traces-and-profiling"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/nodegraphpanelcfg/schema-reference",
-        "go": "n/a",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/nodeGraph/panelcfg.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/nodeGraph/panelcfg.gen.ts"
-      },
-      "machineName": "nodegraphpanelcfg",
-      "maturity": "experimental",
-      "name": "NodeGraphPanelCfg",
-      "pluralMachineName": "nodegraphpanelcfgs",
-      "pluralName": "NodeGraphPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "parcadataquery": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/observability-traces-and-profiling"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/parcadataquery/schema-reference",
-        "go": "https://github.com/grafana/grafana/tree/main/pkg/tsdb/parca/kinds/dataquery/types_dataquery_gen.go",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/parca/dataquery.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/parca/dataquery.gen.ts"
-      },
-      "machineName": "parcadataquery",
-      "maturity": "experimental",
-      "name": "ParcaDataQuery",
-      "pluralMachineName": "parcadataquerys",
-      "pluralName": "ParcaDataQuerys",
-      "schemaInterface": "DataQuery"
-    },
-    "parcadatasourcecfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "parcadatasourcecfg",
-      "maturity": "planned",
-      "name": "ParcaDataSourceCfg",
-      "pluralMachineName": "parcadatasourcecfgs",
-      "pluralName": "ParcaDataSourceCfgs",
-      "schemaInterface": "DataSourceCfg"
-    },
-    "piechartpanelcfg": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/dataviz-squad"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/piechartpanelcfg/schema-reference",
-        "go": "n/a",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/piechart/panelcfg.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/piechart/panelcfg.gen.ts"
-      },
-      "machineName": "piechartpanelcfg",
-      "maturity": "experimental",
-      "name": "PieChartPanelCfg",
-      "pluralMachineName": "piechartpanelcfgs",
-      "pluralName": "PieChartPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "playlist": {
-      "category": "core",
-      "codeowners": [],
-      "crd": {
-        "dummySchema": false,
-        "group": "",
-        "scope": ""
-      },
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "playlist",
-      "maturity": "planned",
-      "name": "Playlist",
-      "pluralMachineName": "playlists",
-      "pluralName": "Playlists"
-    },
-    "postgresqldataquery": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "postgresqldataquery",
-      "maturity": "planned",
-      "name": "PostgreSQLDataQuery",
-      "pluralMachineName": "postgresqldataquerys",
-      "pluralName": "PostgreSQLDataQuerys",
-      "schemaInterface": "DataQuery"
-    },
-    "postgresqldatasourcecfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "postgresqldatasourcecfg",
-      "maturity": "planned",
-      "name": "PostgreSQLDataSourceCfg",
-      "pluralMachineName": "postgresqldatasourcecfgs",
-      "pluralName": "PostgreSQLDataSourceCfgs",
-      "schemaInterface": "DataSourceCfg"
-    },
-    "preferences": {
-      "category": "core",
-      "codeowners": [
-        "grafana/grafana-as-code",
-        "grafana/grafana-frontend-platform",
-        "grafana/plugins-platform-frontend"
-      ],
-      "crd": {
-        "dummySchema": false,
-        "group": "preferences.core.grafana.com",
-        "scope": "Namespaced"
-      },
-      "currentVersion": [
-        0,
-        0
-      ],
-      "description": "The user or team frontend preferences",
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/core/preferences/schema-reference",
-        "go": "https://github.com/grafana/grafana/tree/main/pkg/kinds/preferences",
-        "schema": "https://github.com/grafana/grafana/tree/main/kinds/preferences/preferences_kind.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/packages/grafana-schema/src/raw/preferences/x/preferences_types.gen.ts"
-      },
-      "machineName": "preferences",
-      "maturity": "merged",
-      "name": "Preferences",
-      "pluralMachineName": "preferences",
-      "pluralName": "Preferences"
-    },
-    "prometheusdataquery": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/observability-metrics"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/prometheusdataquery/schema-reference",
-        "go": "https://github.com/grafana/grafana/tree/main/pkg/tsdb/prometheus/kinds/dataquery/types_dataquery_gen.go",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/prometheus/dataquery.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/prometheus/dataquery.gen.ts"
-      },
-      "machineName": "prometheusdataquery",
-      "maturity": "experimental",
-      "name": "PrometheusDataQuery",
-      "pluralMachineName": "prometheusdataquerys",
-      "pluralName": "PrometheusDataQuerys",
-      "schemaInterface": "DataQuery"
-    },
-    "prometheusdatasourcecfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "prometheusdatasourcecfg",
-      "maturity": "planned",
-      "name": "PrometheusDataSourceCfg",
-      "pluralMachineName": "prometheusdatasourcecfgs",
-      "pluralName": "PrometheusDataSourceCfgs",
-      "schemaInterface": "DataSourceCfg"
-    },
-    "publicdashboard": {
-      "category": "core",
-      "codeowners": [
-        "grafana/grafana-as-code",
-        "grafana/grafana-frontend-platform",
-        "grafana/plugins-platform-frontend"
-      ],
-      "crd": {
-        "dummySchema": false,
-        "group": "publicdashboard.core.grafana.com",
-        "scope": "Namespaced"
-      },
-      "currentVersion": [
-        0,
-        0
-      ],
-      "description": "Public dashboard configuration",
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/core/publicdashboard/schema-reference",
-        "go": "https://github.com/grafana/grafana/tree/main/pkg/kinds/publicdashboard",
-        "schema": "https://github.com/grafana/grafana/tree/main/kinds/publicdashboard/publicdashboard_kind.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/packages/grafana-schema/src/raw/publicdashboard/x/publicdashboard_types.gen.ts"
-      },
-      "machineName": "publicdashboard",
-      "maturity": "merged",
-      "name": "PublicDashboard",
-      "pluralMachineName": "publicdashboards",
-      "pluralName": "PublicDashboards"
-    },
-    "query": {
-      "category": "core",
-      "codeowners": [],
-      "crd": {
-        "dummySchema": false,
-        "group": "",
-        "scope": ""
-      },
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "query",
-      "maturity": "planned",
-      "name": "Query",
-      "pluralMachineName": "querys",
-      "pluralName": "Querys"
-    },
-    "queryhistory": {
-      "category": "core",
-      "codeowners": [],
-      "crd": {
-        "dummySchema": false,
-        "group": "",
-        "scope": ""
-      },
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "queryhistory",
-      "maturity": "planned",
-      "name": "QueryHistory",
-      "pluralMachineName": "queryhistorys",
-      "pluralName": "QueryHistorys"
-    },
-    "role": {
-      "category": "core",
-      "codeowners": [
-        "grafana/grafana-as-code",
-        "grafana/grafana-frontend-platform",
-        "grafana/plugins-platform-frontend"
-      ],
-      "crd": {
-        "dummySchema": false,
-        "group": "role.core.grafana.com",
-        "scope": "Namespaced"
-      },
-      "currentVersion": [
-        0,
-        0
-      ],
-      "description": "Roles represent a set of users+teams that should share similar access",
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/core/role/schema-reference",
-        "go": "https://github.com/grafana/grafana/tree/main/pkg/kinds/role",
-        "schema": "https://github.com/grafana/grafana/tree/main/kinds/role/role_kind.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/packages/grafana-schema/src/raw/role/x/role_types.gen.ts"
-      },
-      "machineName": "role",
-      "maturity": "merged",
-      "name": "Role",
-      "pluralMachineName": "roles",
-      "pluralName": "Roles"
-    },
-    "rolebinding": {
-      "category": "core",
-      "codeowners": [
-        "grafana/grafana-as-code",
-        "grafana/grafana-frontend-platform",
-        "grafana/plugins-platform-frontend"
-      ],
-      "crd": {
-        "dummySchema": false,
-        "group": "rolebinding.core.grafana.com",
-        "scope": "Namespaced"
-      },
-      "currentVersion": [
-        0,
-        0
-      ],
-      "description": "Role bindings links a user|team to a configured role",
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/core/rolebinding/schema-reference",
-        "go": "https://github.com/grafana/grafana/tree/main/pkg/kinds/rolebinding",
-        "schema": "https://github.com/grafana/grafana/tree/main/kinds/rolebinding/rolebinding_kind.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/packages/grafana-schema/src/raw/rolebinding/x/rolebinding_types.gen.ts"
-      },
-      "machineName": "rolebinding",
-      "maturity": "merged",
-      "name": "RoleBinding",
-      "pluralMachineName": "rolebindings",
-      "pluralName": "RoleBindings"
-    },
-    "serviceaccount": {
-      "category": "core",
-      "codeowners": [],
-      "crd": {
-        "dummySchema": false,
-        "group": "",
-        "scope": ""
-      },
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "serviceaccount",
-      "maturity": "planned",
-      "name": "ServiceAccount",
-      "pluralMachineName": "serviceaccounts",
-      "pluralName": "ServiceAccounts"
-    },
-    "statetimelinepanelcfg": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/dataviz-squad"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/statetimelinepanelcfg/schema-reference",
-        "go": "n/a",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/state-timeline/panelcfg.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/state-timeline/panelcfg.gen.ts"
-      },
-      "machineName": "statetimelinepanelcfg",
-      "maturity": "experimental",
-      "name": "StateTimelinePanelCfg",
-      "pluralMachineName": "statetimelinepanelcfgs",
-      "pluralName": "StateTimelinePanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "statpanelcfg": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/dataviz-squad"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/statpanelcfg/schema-reference",
-        "go": "n/a",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/stat/panelcfg.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/stat/panelcfg.gen.ts"
-      },
-      "machineName": "statpanelcfg",
-      "maturity": "experimental",
-      "name": "StatPanelCfg",
-      "pluralMachineName": "statpanelcfgs",
-      "pluralName": "StatPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "statushistorypanelcfg": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/dataviz-squad"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/statushistorypanelcfg/schema-reference",
-        "go": "n/a",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/status-history/panelcfg.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/status-history/panelcfg.gen.ts"
-      },
-      "machineName": "statushistorypanelcfg",
-      "maturity": "experimental",
-      "name": "StatusHistoryPanelCfg",
-      "pluralMachineName": "statushistorypanelcfgs",
-      "pluralName": "StatusHistoryPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "tableoldpanelcfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "tableoldpanelcfg",
-      "maturity": "planned",
-      "name": "TableOldPanelCfg",
-      "pluralMachineName": "tableoldpanelcfgs",
-      "pluralName": "TableOldPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "tablepanelcfg": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/grafana-bi-squad"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/tablepanelcfg/schema-reference",
-        "go": "n/a",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/table/panelcfg.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/table/panelcfg.gen.ts"
-      },
-      "machineName": "tablepanelcfg",
-      "maturity": "experimental",
-      "name": "TablePanelCfg",
-      "pluralMachineName": "tablepanelcfgs",
-      "pluralName": "TablePanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "team": {
-      "category": "core",
-      "codeowners": [
-        "grafana/grafana-as-code",
-        "grafana/grafana-frontend-platform",
-        "grafana/plugins-platform-frontend"
-      ],
-      "crd": {
-        "dummySchema": false,
-        "group": "team.core.grafana.com",
-        "scope": "Namespaced"
-      },
-      "currentVersion": [
-        0,
-        0
-      ],
-      "description": "A team is a named grouping of Grafana users to which access control rules may be assigned.",
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/core/team/schema-reference",
-        "go": "https://github.com/grafana/grafana/tree/main/pkg/kinds/team",
-        "schema": "https://github.com/grafana/grafana/tree/main/kinds/team/team_kind.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/packages/grafana-schema/src/raw/team/x/team_types.gen.ts"
-      },
-      "machineName": "team",
-      "maturity": "merged",
-      "name": "Team",
-      "pluralMachineName": "teams",
-      "pluralName": "Teams"
-    },
-    "tempodataquery": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/observability-traces-and-profiling"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/tempodataquery/schema-reference",
-        "go": "https://github.com/grafana/grafana/tree/main/pkg/tsdb/tempo/kinds/dataquery/types_dataquery_gen.go",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/tempo/dataquery.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/tempo/dataquery.gen.ts"
-      },
-      "machineName": "tempodataquery",
-      "maturity": "experimental",
-      "name": "TempoDataQuery",
-      "pluralMachineName": "tempodataquerys",
-      "pluralName": "TempoDataQuerys",
-      "schemaInterface": "DataQuery"
-    },
-    "tempodatasourcecfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "tempodatasourcecfg",
-      "maturity": "planned",
-      "name": "TempoDataSourceCfg",
-      "pluralMachineName": "tempodatasourcecfgs",
-      "pluralName": "TempoDataSourceCfgs",
-      "schemaInterface": "DataSourceCfg"
-    },
-    "testdatadataquery": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/plugins-platform-backend",
-        "grafana/plugins-platform-frontend"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/testdatadataquery/schema-reference",
-        "go": "https://github.com/grafana/grafana/tree/main/pkg/tsdb/grafana-testdata-datasource/kinds/dataquery/types_dataquery_gen.go",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/grafana-testdata-datasource/dataquery.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/grafana-testdata-datasource/dataquery.gen.ts"
-      },
-      "machineName": "testdatadataquery",
-      "maturity": "experimental",
-      "name": "TestDataDataQuery",
-      "pluralMachineName": "testdatadataquerys",
-      "pluralName": "TestDataDataQuerys",
-      "schemaInterface": "DataQuery"
-    },
-    "testdatadatasourcecfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "testdatadatasourcecfg",
-      "maturity": "planned",
-      "name": "TestDataDataSourceCfg",
-      "pluralMachineName": "testdatadatasourcecfgs",
-      "pluralName": "TestDataDataSourceCfgs",
-      "schemaInterface": "DataSourceCfg"
-    },
-    "textpanelcfg": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/grafana-frontend-platform"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/textpanelcfg/schema-reference",
-        "go": "n/a",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/text/panelcfg.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/text/panelcfg.gen.ts"
-      },
-      "machineName": "textpanelcfg",
-      "maturity": "experimental",
-      "name": "TextPanelCfg",
-      "pluralMachineName": "textpanelcfgs",
-      "pluralName": "TextPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "thumb": {
-      "category": "core",
-      "codeowners": [],
-      "crd": {
-        "dummySchema": false,
-        "group": "",
-        "scope": ""
-      },
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "thumb",
-      "maturity": "planned",
-      "name": "Thumb",
-      "pluralMachineName": "thumbs",
-      "pluralName": "Thumbs"
-    },
-    "timeseriespanelcfg": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/dataviz-squad"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/timeseriespanelcfg/schema-reference",
-        "go": "n/a",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/timeseries/panelcfg.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/timeseries/panelcfg.gen.ts"
-      },
-      "machineName": "timeseriespanelcfg",
-      "maturity": "merged",
-      "name": "TimeSeriesPanelCfg",
-      "pluralMachineName": "timeseriespanelcfgs",
-      "pluralName": "TimeSeriesPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "tracespanelcfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "tracespanelcfg",
-      "maturity": "planned",
-      "name": "TracesPanelCfg",
-      "pluralMachineName": "tracespanelcfgs",
-      "pluralName": "TracesPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "trendpanelcfg": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/dataviz-squad"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/trendpanelcfg/schema-reference",
-        "go": "n/a",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/trend/panelcfg.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/trend/panelcfg.gen.ts"
-      },
-      "machineName": "trendpanelcfg",
-      "maturity": "merged",
-      "name": "TrendPanelCfg",
-      "pluralMachineName": "trendpanelcfgs",
-      "pluralName": "TrendPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "user": {
-      "category": "core",
-      "codeowners": [],
-      "crd": {
-        "dummySchema": false,
-        "group": "",
-        "scope": ""
-      },
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "user",
-      "maturity": "planned",
-      "name": "User",
-      "pluralMachineName": "users",
-      "pluralName": "Users"
-    },
-    "welcomepanelcfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "welcomepanelcfg",
-      "maturity": "planned",
-      "name": "WelcomePanelCfg",
-      "pluralMachineName": "welcomepanelcfgs",
-      "pluralName": "WelcomePanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "xychartpanelcfg": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/dataviz-squad"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/xychartpanelcfg/schema-reference",
-        "go": "n/a",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/xychart/panelcfg.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/xychart/panelcfg.gen.ts"
-      },
-      "machineName": "xychartpanelcfg",
-      "maturity": "experimental",
-      "name": "XYChartPanelCfg",
-      "pluralMachineName": "xychartpanelcfgs",
-      "pluralName": "XYChartPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
-    "zipkindataquery": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "zipkindataquery",
-      "maturity": "planned",
-      "name": "ZipkinDataQuery",
-      "pluralMachineName": "zipkindataquerys",
-      "pluralName": "ZipkinDataQuerys",
-      "schemaInterface": "DataQuery"
-    },
-    "zipkindatasourcecfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "zipkindatasourcecfg",
-      "maturity": "planned",
-      "name": "ZipkinDataSourceCfg",
-      "pluralMachineName": "zipkindatasourcecfgs",
-      "pluralName": "ZipkinDataSourceCfgs",
-      "schemaInterface": "DataSourceCfg"
-    }
-  },
-  "dimensions": {
-    "category": {
-      "composable": {
-        "name": "composable",
-        "items": [
-          "alertgroupspanelcfg",
-          "alertlistpanelcfg",
-          "alertmanagerdataquery",
-          "alertmanagerdatasourcecfg",
-          "annotationslistpanelcfg",
-          "azuremonitordataquery",
-          "azuremonitordatasourcecfg",
-          "barchartpanelcfg",
-          "bargaugepanelcfg",
-          "candlestickpanelcfg",
-          "canvaspanelcfg",
-          "cloudwatchdataquery",
-          "cloudwatchdatasourcecfg",
-          "dashboarddataquery",
-          "dashboarddatasourcecfg",
-          "dashboardlistpanelcfg",
-          "datagridpanelcfg",
-          "debugpanelcfg",
-          "elasticsearchdataquery",
-          "elasticsearchdatasourcecfg",
-          "flamegraphpanelcfg",
-          "gaugepanelcfg",
-          "geomappanelcfg",
-          "gettingstartedpanelcfg",
-          "googlecloudmonitoringdataquery",
-          "googlecloudmonitoringdatasourcecfg",
-          "grafanadataquery",
-          "grafanadatasourcecfg",
-          "grafanapyroscopedataquery",
-          "grafanapyroscopedatasourcecfg",
-          "graphitedataquery",
-          "graphitedatasourcecfg",
-          "grapholdpanelcfg",
-          "heatmappanelcfg",
-          "histogrampanelcfg",
-          "jaegerdataquery",
-          "jaegerdatasourcecfg",
-          "livepanelcfg",
-          "logspanelcfg",
-          "lokidataquery",
-          "lokidatasourcecfg",
-          "microsoftsqlserverdataquery",
-          "microsoftsqlserverdatasourcecfg",
-          "mysqldataquery",
-          "mysqldatasourcecfg",
-          "newspanelcfg",
-          "nodegraphpanelcfg",
-          "parcadataquery",
-          "parcadatasourcecfg",
-          "piechartpanelcfg",
-          "postgresqldataquery",
-          "postgresqldatasourcecfg",
-          "prometheusdataquery",
-          "prometheusdatasourcecfg",
-          "statetimelinepanelcfg",
-          "statpanelcfg",
-          "statushistorypanelcfg",
-          "tableoldpanelcfg",
-          "tablepanelcfg",
-          "tempodataquery",
-          "tempodatasourcecfg",
-          "testdatadataquery",
-          "testdatadatasourcecfg",
-          "textpanelcfg",
-          "timeseriespanelcfg",
-          "tracespanelcfg",
-          "trendpanelcfg",
-          "welcomepanelcfg",
-          "xychartpanelcfg",
-          "zipkindataquery",
-          "zipkindatasourcecfg"
-        ],
-        "count": 71
-      },
-      "core": {
-        "name": "core",
-        "items": [
-          "accesspolicy",
-          "apikey",
-          "dashboard",
-          "datasource",
-          "folder",
-          "librarypanel",
-          "playlist",
-          "preferences",
-          "publicdashboard",
-          "query",
-          "queryhistory",
-          "role",
-          "rolebinding",
-          "serviceaccount",
-          "team",
-          "thumb",
-          "user"
-        ],
-        "count": 17
-      }
-    },
-    "maturity": {
-      "experimental": {
-        "name": "experimental",
-        "items": [
-          "annotationslistpanelcfg",
-          "barchartpanelcfg",
-          "bargaugepanelcfg",
-          "candlestickpanelcfg",
-          "canvaspanelcfg",
-          "cloudwatchdataquery",
-          "dashboard",
-          "dashboardlistpanelcfg",
-          "datagridpanelcfg",
-          "debugpanelcfg",
-          "elasticsearchdataquery",
-          "gaugepanelcfg",
-          "geomappanelcfg",
-          "grafanapyroscopedataquery",
-          "histogrampanelcfg",
-          "librarypanel",
-          "logspanelcfg",
-          "lokidataquery",
-          "newspanelcfg",
-          "nodegraphpanelcfg",
-          "parcadataquery",
-          "piechartpanelcfg",
-          "prometheusdataquery",
-          "statetimelinepanelcfg",
-          "statpanelcfg",
-          "statushistorypanelcfg",
-          "tablepanelcfg",
-          "tempodataquery",
-          "testdatadataquery",
-          "textpanelcfg",
-          "xychartpanelcfg"
-        ],
-        "count": 31
-      },
-      "mature": {
-        "name": "mature",
-        "items": [],
-        "count": 0
-      },
-      "merged": {
-        "name": "merged",
-        "items": [
-          "accesspolicy",
-          "alertgroupspanelcfg",
-          "azuremonitordataquery",
-          "folder",
-          "googlecloudmonitoringdataquery",
-          "heatmappanelcfg",
-          "preferences",
-          "publicdashboard",
-          "role",
-          "rolebinding",
-          "team",
-          "timeseriespanelcfg",
-          "trendpanelcfg"
-        ],
-        "count": 13
-      },
-      "planned": {
-        "name": "planned",
-        "items": [
-          "alertlistpanelcfg",
-          "alertmanagerdataquery",
-          "alertmanagerdatasourcecfg",
-          "apikey",
-          "azuremonitordatasourcecfg",
-          "cloudwatchdatasourcecfg",
-          "dashboarddataquery",
-          "dashboarddatasourcecfg",
-          "datasource",
-          "elasticsearchdatasourcecfg",
-          "flamegraphpanelcfg",
-          "gettingstartedpanelcfg",
-          "googlecloudmonitoringdatasourcecfg",
-          "grafanadataquery",
-          "grafanadatasourcecfg",
-          "grafanapyroscopedatasourcecfg",
-          "graphitedataquery",
-          "graphitedatasourcecfg",
-          "grapholdpanelcfg",
-          "jaegerdataquery",
-          "jaegerdatasourcecfg",
-          "livepanelcfg",
-          "lokidatasourcecfg",
-          "microsoftsqlserverdataquery",
-          "microsoftsqlserverdatasourcecfg",
-          "mysqldataquery",
-          "mysqldatasourcecfg",
-          "parcadatasourcecfg",
-          "playlist",
-          "postgresqldataquery",
-          "postgresqldatasourcecfg",
-          "prometheusdatasourcecfg",
-          "query",
-          "queryhistory",
-          "serviceaccount",
-          "tableoldpanelcfg",
-          "tempodatasourcecfg",
-          "testdatadatasourcecfg",
-          "thumb",
-          "tracespanelcfg",
-          "user",
-          "welcomepanelcfg",
-          "zipkindataquery",
-          "zipkindatasourcecfg"
-        ],
-        "count": 44
-      },
-      "stable": {
-        "name": "stable",
-        "items": [],
-        "count": 0
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/pkg/kindsysreport/codeowners.go b/pkg/kindsysreport/codeowners.go
deleted file mode 100644
index 5c1a3edcc7adb..0000000000000
--- a/pkg/kindsysreport/codeowners.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package kindsysreport
-
-import (
-	"os"
-	"path/filepath"
-
-	"github.com/hmarr/codeowners"
-)
-
-type CodeOwnersFinder struct {
-	ruleset codeowners.Ruleset
-}
-
-func NewCodeOwnersFinder(groot string) (CodeOwnersFinder, error) {
-	//nolint:gosec
-	file, err := os.Open(filepath.Join(groot, ".github", "CODEOWNERS"))
-	if err != nil {
-		return CodeOwnersFinder{}, err
-	}
-
-	ruleset, err := codeowners.ParseFile(file)
-	if err != nil {
-		return CodeOwnersFinder{}, err
-	}
-
-	return CodeOwnersFinder{
-		ruleset: ruleset,
-	}, nil
-}
-
-func (f CodeOwnersFinder) FindFor(pp ...string) ([]string, error) {
-	if len(f.ruleset) == 0 {
-		return nil, nil
-	}
-
-	// Set, to avoid duplicates
-	m := make(map[string]struct{})
-
-	for _, p := range pp {
-		r, err := f.ruleset.Match(p)
-		if err != nil {
-			return nil, err
-		}
-
-		// No rule found for path p
-		if r == nil {
-			continue
-		}
-
-		for _, o := range r.Owners {
-			m[o.Value] = struct{}{}
-		}
-	}
-
-	result := make([]string, 0, len(m))
-	for k := range m {
-		result = append(result, k)
-	}
-
-	return result, nil
-}
diff --git a/pkg/login/social/azuread_oauth.go b/pkg/login/social/azuread_oauth.go
deleted file mode 100644
index 640552e9aae01..0000000000000
--- a/pkg/login/social/azuread_oauth.go
+++ /dev/null
@@ -1,359 +0,0 @@
-package social
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"strings"
-	"time"
-
-	jose "github.com/go-jose/go-jose/v3"
-	"github.com/go-jose/go-jose/v3/jwt"
-	"golang.org/x/oauth2"
-
-	"github.com/grafana/grafana/pkg/infra/remotecache"
-	"github.com/grafana/grafana/pkg/models/roletype"
-	"github.com/grafana/grafana/pkg/services/org"
-)
-
-type SocialAzureAD struct {
-	*SocialBase
-	cache                remotecache.CacheStorage
-	allowedOrganizations []string
-	forceUseGraphAPI     bool
-	skipOrgRoleSync      bool
-}
-
-type azureClaims struct {
-	Audience          string                 `json:"aud"`
-	Email             string                 `json:"email"`
-	PreferredUsername string                 `json:"preferred_username"`
-	Roles             []string               `json:"roles"`
-	Groups            []string               `json:"groups"`
-	Name              string                 `json:"name"`
-	ID                string                 `json:"oid"`
-	ClaimNames        claimNames             `json:"_claim_names,omitempty"`
-	ClaimSources      map[string]claimSource `json:"_claim_sources,omitempty"`
-	TenantID          string                 `json:"tid,omitempty"`
-	OAuthVersion      string                 `json:"ver,omitempty"`
-}
-
-type claimNames struct {
-	Groups string `json:"groups"`
-}
-
-type claimSource struct {
-	Endpoint string `json:"endpoint"`
-}
-
-type azureAccessClaims struct {
-	TenantID string `json:"tid"`
-}
-
-type keySetJWKS struct {
-	jose.JSONWebKeySet
-}
-
-func (s *SocialAzureAD) UserInfo(ctx context.Context, client *http.Client, token *oauth2.Token) (*BasicUserInfo, error) {
-	idToken := token.Extra("id_token")
-	if idToken == nil {
-		return nil, ErrIDTokenNotFound
-	}
-
-	parsedToken, err := jwt.ParseSigned(idToken.(string))
-	if err != nil {
-		return nil, fmt.Errorf("error parsing id token: %w", err)
-	}
-
-	claims, err := s.validateClaims(ctx, client, parsedToken)
-	if err != nil {
-		return nil, err
-	}
-
-	email := claims.extractEmail()
-	if email == "" {
-		return nil, ErrEmailNotFound
-	}
-
-	// setting the role, grafanaAdmin to empty to reflect that we are not syncronizing with the external provider
-	var role roletype.RoleType
-	var grafanaAdmin bool
-	if !s.skipOrgRoleSync {
-		role, grafanaAdmin, err = s.extractRoleAndAdmin(claims)
-		if err != nil {
-			return nil, err
-		}
-
-		if !role.IsValid() {
-			return nil, errInvalidRole.Errorf("AzureAD OAuth: invalid role %q", role)
-		}
-	}
-	s.log.Debug("AzureAD OAuth: extracted role", "email", email, "role", role)
-
-	groups, err := s.extractGroups(ctx, client, claims, token)
-	if err != nil {
-		return nil, fmt.Errorf("failed to extract groups: %w", err)
-	}
-	s.log.Debug("AzureAD OAuth: extracted groups", "email", email, "groups", fmt.Sprintf("%v", groups))
-	if !s.isGroupMember(groups) {
-		return nil, errMissingGroupMembership
-	}
-
-	var isGrafanaAdmin *bool = nil
-	if s.allowAssignGrafanaAdmin {
-		isGrafanaAdmin = &grafanaAdmin
-	}
-
-	if s.allowAssignGrafanaAdmin && s.skipOrgRoleSync {
-		s.log.Debug("AllowAssignGrafanaAdmin and skipOrgRoleSync are both set, Grafana Admin role will not be synced, consider setting one or the other")
-	}
-
-	return &BasicUserInfo{
-		Id:             claims.ID,
-		Name:           claims.Name,
-		Email:          email,
-		Login:          email,
-		Role:           role,
-		IsGrafanaAdmin: isGrafanaAdmin,
-		Groups:         groups,
-	}, nil
-}
-
-func (s *SocialAzureAD) validateClaims(ctx context.Context, client *http.Client, parsedToken *jwt.JSONWebToken) (*azureClaims, error) {
-	claims, err := s.validateIDTokenSignature(ctx, client, parsedToken)
-	if err != nil {
-		return nil, fmt.Errorf("error getting claims from id token: %w", err)
-	}
-
-	if claims.OAuthVersion == "1.0" {
-		return nil, &Error{"AzureAD OAuth: version 1.0 is not supported. Please ensure the auth_url and token_url are set to the v2.0 endpoints."}
-	}
-
-	s.log.Debug("Validating audience", "audience", claims.Audience, "client_id", s.ClientID)
-	if claims.Audience != s.ClientID {
-		return nil, &Error{"AzureAD OAuth: audience mismatch"}
-	}
-
-	s.log.Debug("Validating tenant", "tenant", claims.TenantID, "allowed_tenants", s.allowedOrganizations)
-	if !s.isAllowedTenant(claims.TenantID) {
-		return nil, &Error{"AzureAD OAuth: tenant mismatch"}
-	}
-	return claims, nil
-}
-
-func (s *SocialAzureAD) validateIDTokenSignature(ctx context.Context, client *http.Client, parsedToken *jwt.JSONWebToken) (*azureClaims, error) {
-	var claims azureClaims
-
-	jwksFuncs := []func(ctx context.Context, client *http.Client, authURL string) (*keySetJWKS, time.Duration, error){
-		s.retrieveJWKSFromCache, s.retrieveSpecificJWKS, s.retrieveGeneralJWKS,
-	}
-
-	keyID := parsedToken.Headers[0].KeyID
-
-	for _, jwksFunc := range jwksFuncs {
-		keyset, expiry, err := jwksFunc(ctx, client, s.Endpoint.AuthURL)
-		if err != nil {
-			return nil, fmt.Errorf("error retrieving jwks: %w", err)
-		}
-		var errClaims error
-		keys := keyset.Key(keyID)
-		for _, key := range keys {
-			s.log.Debug("AzureAD OAuth: trying to parse token with key", "kid", key.KeyID)
-			if errClaims = parsedToken.Claims(key, &claims); errClaims == nil {
-				if expiry != 0 {
-					s.log.Debug("AzureAD OAuth: caching key set", "kid", key.KeyID, "expiry", expiry)
-					if err := s.cacheJWKS(ctx, keyset, expiry); err != nil {
-						s.log.Warn("Failed to set key set in cache", "err", err)
-					}
-				}
-				return &claims, nil
-			} else {
-				s.log.Warn("AzureAD OAuth: failed to parse token with key", "kid", key.KeyID, "err", errClaims)
-			}
-		}
-	}
-
-	s.log.Warn("AzureAD OAuth: signing key not found", "kid", keyID)
-
-	return nil, &Error{"AzureAD OAuth: signing key not found"}
-}
-
-func (claims *azureClaims) extractEmail() string {
-	if claims.Email == "" {
-		if claims.PreferredUsername != "" {
-			return claims.PreferredUsername
-		}
-	}
-
-	return claims.Email
-}
-
-// extractRoleAndAdmin extracts the role from the claims and returns the role and whether the user is a Grafana admin.
-func (s *SocialAzureAD) extractRoleAndAdmin(claims *azureClaims) (org.RoleType, bool, error) {
-	if len(claims.Roles) == 0 {
-		if s.roleAttributeStrict {
-			return "", false, errRoleAttributeStrictViolation.Errorf("AzureAD OAuth: unset role")
-		}
-		return s.defaultRole(), false, nil
-	}
-
-	roleOrder := []org.RoleType{RoleGrafanaAdmin, org.RoleAdmin, org.RoleEditor,
-		org.RoleViewer, org.RoleNone}
-	for _, role := range roleOrder {
-		if found := hasRole(claims.Roles, role); found {
-			if role == RoleGrafanaAdmin {
-				return org.RoleAdmin, true, nil
-			}
-
-			return role, false, nil
-		}
-	}
-
-	if s.roleAttributeStrict {
-		return "", false, errRoleAttributeStrictViolation.Errorf("AzureAD OAuth: idP did not return a valid role %q", claims.Roles)
-	}
-
-	return s.defaultRole(), false, nil
-}
-
-func hasRole(roles []string, role org.RoleType) bool {
-	for _, item := range roles {
-		if strings.EqualFold(item, string(role)) {
-			return true
-		}
-	}
-
-	return false
-}
-
-type getAzureGroupRequest struct {
-	SecurityEnabledOnly bool `json:"securityEnabledOnly"`
-}
-
-type getAzureGroupResponse struct {
-	Value []string `json:"value"`
-}
-
-// extractGroups retrieves groups from the claims.
-// Note: If user groups exceeds 200 no groups will be found in claims and URL to target the Graph API will be
-// given instead.
-// See https://docs.microsoft.com/en-us/azure/active-directory/develop/id-tokens#groups-overage-claim
-func (s *SocialAzureAD) extractGroups(ctx context.Context, client *http.Client, claims *azureClaims, token *oauth2.Token) ([]string, error) {
-	if !s.forceUseGraphAPI {
-		s.log.Debug("Checking the claim for groups")
-		if len(claims.Groups) > 0 {
-			return claims.Groups, nil
-		}
-
-		if claims.ClaimNames.Groups == "" {
-			return []string{}, nil
-		}
-	}
-
-	// Fallback to the Graph API
-	endpoint, errBuildGraphURI := s.groupsGraphAPIURL(claims, token)
-	if errBuildGraphURI != nil {
-		return nil, errBuildGraphURI
-	}
-
-	data, err := json.Marshal(&getAzureGroupRequest{SecurityEnabledOnly: false})
-	if err != nil {
-		return nil, err
-	}
-
-	req, err := http.NewRequestWithContext(ctx, http.MethodPost, endpoint, bytes.NewBuffer(data))
-	if err != nil {
-		return nil, err
-	}
-	req.Header.Set("Content-Type", "application/json")
-
-	res, err := client.Do(req)
-	if err != nil {
-		return nil, err
-	}
-
-	defer func() {
-		if err := res.Body.Close(); err != nil {
-			s.log.Warn("AzureAD OAuth: failed to close response body", "err", err)
-		}
-	}()
-
-	if res.StatusCode != http.StatusOK {
-		if res.StatusCode == http.StatusForbidden {
-			s.log.Warn("AzureAD OAuh: Token need GroupMember.Read.All permission to fetch all groups")
-		} else {
-			body, _ := io.ReadAll(res.Body)
-			s.log.Warn("AzureAD OAuh: could not fetch user groups", "code", res.StatusCode, "body", string(body))
-		}
-		return []string{}, nil
-	}
-
-	var body getAzureGroupResponse
-	if err := json.NewDecoder(res.Body).Decode(&body); err != nil {
-		return nil, err
-	}
-
-	return body.Value, nil
-}
-
-// groupsGraphAPIURL retrieves the Microsoft Graph API URL to fetch user groups from the _claim_sources if present
-// otherwise it generates an handcrafted URL.
-func (s *SocialAzureAD) groupsGraphAPIURL(claims *azureClaims, token *oauth2.Token) (string, error) {
-	var endpoint string
-	// First check if an endpoint was specified in the claims
-	if claims.ClaimNames.Groups != "" {
-		endpoint = claims.ClaimSources[claims.ClaimNames.Groups].Endpoint
-		s.log.Debug(fmt.Sprintf("endpoint to fetch groups specified in the claims: %s", endpoint))
-	}
-
-	// If no endpoint was specified or if the endpoints provided in _claim_source is pointing to the deprecated
-	// "graph.windows.net" api, use an handcrafted url to graph.microsoft.com
-	// See https://docs.microsoft.com/en-us/graph/migrate-azure-ad-graph-overview
-	if endpoint == "" || strings.Contains(endpoint, "graph.windows.net") {
-		tenantID := claims.TenantID
-		// If tenantID wasn't found in the id_token, parse access token
-		if tenantID == "" {
-			parsedToken, err := jwt.ParseSigned(token.AccessToken)
-			if err != nil {
-				return "", fmt.Errorf("error parsing access token: %w", err)
-			}
-
-			var accessClaims azureAccessClaims
-			if err := parsedToken.UnsafeClaimsWithoutVerification(&accessClaims); err != nil {
-				return "", fmt.Errorf("error getting claims from access token: %w", err)
-			}
-			tenantID = accessClaims.TenantID
-		}
-
-		endpoint = fmt.Sprintf("https://graph.microsoft.com/v1.0/%s/users/%s/getMemberObjects", tenantID, claims.ID)
-		s.log.Debug(fmt.Sprintf("handcrafted endpoint to fetch groups: %s", endpoint))
-	}
-	return endpoint, nil
-}
-
-func (s *SocialAzureAD) SupportBundleContent(bf *bytes.Buffer) error {
-	bf.WriteString("## AzureAD specific configuration\n\n")
-	bf.WriteString("```ini\n")
-	bf.WriteString(fmt.Sprintf("allowed_groups = %v\n", s.allowedGroups))
-	bf.WriteString(fmt.Sprintf("forceUseGraphAPI = %v\n", s.forceUseGraphAPI))
-	bf.WriteString("```\n\n")
-
-	return s.SocialBase.SupportBundleContent(bf)
-}
-
-func (s *SocialAzureAD) isAllowedTenant(tenantID string) bool {
-	if len(s.allowedOrganizations) == 0 {
-		s.log.Warn("No allowed organizations specified, all tenants are allowed. Configure allowed_organizations to restrict access")
-		return true
-	}
-
-	for _, t := range s.allowedOrganizations {
-		if t == tenantID {
-			return true
-		}
-	}
-	return false
-}
diff --git a/pkg/login/social/azuread_oauth_test.go b/pkg/login/social/azuread_oauth_test.go
deleted file mode 100644
index d8819629c4b06..0000000000000
--- a/pkg/login/social/azuread_oauth_test.go
+++ /dev/null
@@ -1,785 +0,0 @@
-package social
-
-import (
-	"context"
-	"crypto/rand"
-	"crypto/rsa"
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/go-jose/go-jose/v3"
-	"github.com/go-jose/go-jose/v3/jwt"
-	"github.com/stretchr/testify/require"
-	"golang.org/x/oauth2"
-
-	"github.com/grafana/grafana/pkg/infra/remotecache"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-)
-
-func trueBoolPtr() *bool {
-	b := true
-	return &b
-}
-
-func falseBoolPtr() *bool {
-	b := false
-	return &b
-}
-
-func TestSocialAzureAD_UserInfo(t *testing.T) {
-	type fields struct {
-		SocialBase           *SocialBase
-		allowedGroups        []string
-		allowedOrganizations []string
-		forceUseGraphAPI     bool
-		usGovURL             bool
-	}
-	type args struct {
-		client *http.Client
-	}
-
-	tests := []struct {
-		name                     string
-		fields                   fields
-		claims                   *azureClaims
-		args                     args
-		settingAutoAssignOrgRole string
-		want                     *BasicUserInfo
-		wantErr                  bool
-	}{
-		{
-			name: "Email in email claim",
-			claims: &azureClaims{
-				Email:             "me@example.com",
-				PreferredUsername: "",
-				Roles:             []string{},
-				Name:              "My Name",
-				ID:                "1234",
-			},
-			fields: fields{
-				SocialBase: newSocialBase("azuread", &oauth2.Config{ClientID: "client-id-example"}, &OAuthInfo{}, "Viewer", false, *featuremgmt.WithFeatures()),
-			},
-			want: &BasicUserInfo{
-				Id:     "1234",
-				Name:   "My Name",
-				Email:  "me@example.com",
-				Login:  "me@example.com",
-				Role:   "Viewer",
-				Groups: []string{},
-			},
-		},
-		{
-			name: "No email",
-			fields: fields{
-				SocialBase: newSocialBase("azuread", &oauth2.Config{ClientID: "client-id-example"}, &OAuthInfo{}, "Viewer", false, *featuremgmt.WithFeatures()),
-			},
-			claims: &azureClaims{
-				Email:             "",
-				PreferredUsername: "",
-				Roles:             []string{},
-				Name:              "My Name",
-				ID:                "1234",
-			},
-			want:    nil,
-			wantErr: true,
-		},
-		{
-			name:    "No id token",
-			claims:  nil,
-			want:    nil,
-			wantErr: true,
-		},
-		{
-			name: "US Government domain",
-			claims: &azureClaims{
-				Email:             "me@example.com",
-				PreferredUsername: "",
-				Roles:             []string{},
-				Name:              "My Name",
-				ID:                "1234",
-			},
-			fields: fields{
-				SocialBase: newSocialBase("azuread", &oauth2.Config{ClientID: "client-id-example"}, &OAuthInfo{}, "Viewer", false, *featuremgmt.WithFeatures()),
-				usGovURL:   true,
-			},
-			want: &BasicUserInfo{
-				Id:     "1234",
-				Name:   "My Name",
-				Email:  "me@example.com",
-				Login:  "me@example.com",
-				Role:   "Viewer",
-				Groups: []string{},
-			},
-		},
-		{
-			name: "Email in preferred_username claim",
-			claims: &azureClaims{
-				Email:             "",
-				PreferredUsername: "me@example.com",
-				Roles:             []string{},
-				Name:              "My Name",
-				ID:                "1234",
-			},
-			fields: fields{
-				SocialBase: newSocialBase("azuread", &oauth2.Config{ClientID: "client-id-example"}, &OAuthInfo{}, "Viewer", false, *featuremgmt.WithFeatures()),
-			},
-			want: &BasicUserInfo{
-				Id:     "1234",
-				Name:   "My Name",
-				Email:  "me@example.com",
-				Login:  "me@example.com",
-				Role:   "Viewer",
-				Groups: []string{},
-			},
-		},
-		{
-			name: "Admin role",
-			fields: fields{
-				SocialBase: newSocialBase("azuread", &oauth2.Config{ClientID: "client-id-example"}, &OAuthInfo{}, "Viewer", false, *featuremgmt.WithFeatures()),
-			},
-			claims: &azureClaims{
-				Email:             "me@example.com",
-				PreferredUsername: "",
-				Roles:             []string{"Admin"},
-				Name:              "My Name",
-				ID:                "1234",
-			},
-			want: &BasicUserInfo{
-				Id:     "1234",
-				Name:   "My Name",
-				Email:  "me@example.com",
-				Login:  "me@example.com",
-				Role:   "Admin",
-				Groups: []string{},
-			},
-		},
-		{
-			name: "Lowercase Admin role",
-			fields: fields{
-				SocialBase: newSocialBase("azuread", &oauth2.Config{ClientID: "client-id-example"}, &OAuthInfo{}, "Viewer", false, *featuremgmt.WithFeatures()),
-			},
-			claims: &azureClaims{
-				Email:             "me@example.com",
-				PreferredUsername: "",
-				Roles:             []string{"admin"},
-				Name:              "My Name",
-				ID:                "1234",
-			},
-			want: &BasicUserInfo{
-				Id:     "1234",
-				Name:   "My Name",
-				Email:  "me@example.com",
-				Login:  "me@example.com",
-				Role:   "Admin",
-				Groups: []string{},
-			},
-		},
-		{
-			name: "Only other roles",
-			fields: fields{
-				SocialBase: newSocialBase("azuread", &oauth2.Config{ClientID: "client-id-example"}, &OAuthInfo{}, "Viewer", false, *featuremgmt.WithFeatures()),
-			},
-			claims: &azureClaims{
-				Email:             "me@example.com",
-				PreferredUsername: "",
-				Roles:             []string{"AppAdmin"},
-				Name:              "My Name",
-				ID:                "1234",
-			},
-			want: &BasicUserInfo{
-				Id:     "1234",
-				Name:   "My Name",
-				Email:  "me@example.com",
-				Login:  "me@example.com",
-				Role:   "Viewer",
-				Groups: []string{},
-			},
-		},
-		{
-			name: "role from env variable",
-			claims: &azureClaims{
-				Email:             "me@example.com",
-				PreferredUsername: "",
-				Roles:             []string{},
-				Name:              "My Name",
-				ID:                "1234",
-			},
-			fields: fields{
-				SocialBase: newSocialBase("azuread", &oauth2.Config{ClientID: "client-id-example"}, &OAuthInfo{}, "Editor", false, *featuremgmt.WithFeatures()),
-			},
-			want: &BasicUserInfo{
-				Id:     "1234",
-				Name:   "My Name",
-				Email:  "me@example.com",
-				Login:  "me@example.com",
-				Role:   "Editor",
-				Groups: []string{},
-			},
-		},
-		{
-			name: "Editor role",
-			claims: &azureClaims{
-				Email:             "me@example.com",
-				PreferredUsername: "",
-				Roles:             []string{"Editor"},
-				Name:              "My Name",
-				ID:                "1234",
-			},
-			fields: fields{
-				SocialBase: newSocialBase("azuread", &oauth2.Config{ClientID: "client-id-example"}, &OAuthInfo{}, "Editor", false, *featuremgmt.WithFeatures()),
-			},
-			want: &BasicUserInfo{
-				Id:     "1234",
-				Name:   "My Name",
-				Email:  "me@example.com",
-				Login:  "me@example.com",
-				Role:   "Editor",
-				Groups: []string{},
-			},
-		},
-		{
-			name: "Admin and Editor roles in claim",
-			fields: fields{
-				SocialBase: newSocialBase("azuread", &oauth2.Config{ClientID: "client-id-example"}, &OAuthInfo{}, "Editor", false, *featuremgmt.WithFeatures()),
-			},
-			claims: &azureClaims{
-				Email:             "me@example.com",
-				PreferredUsername: "",
-				Roles:             []string{"Admin", "Editor"},
-				Name:              "My Name",
-				ID:                "1234",
-			},
-			want: &BasicUserInfo{
-				Id:     "1234",
-				Name:   "My Name",
-				Email:  "me@example.com",
-				Login:  "me@example.com",
-				Role:   "Admin",
-				Groups: []string{},
-			},
-		},
-		{
-			name:   "Grafana Admin but setting is disabled",
-			fields: fields{SocialBase: newSocialBase("azuread", &oauth2.Config{ClientID: "client-id-example"}, &OAuthInfo{AllowAssignGrafanaAdmin: false}, "Editor", false, *featuremgmt.WithFeatures())},
-			claims: &azureClaims{
-				Email:             "me@example.com",
-				PreferredUsername: "",
-				Roles:             []string{"GrafanaAdmin"},
-				Name:              "My Name",
-				ID:                "1234",
-			},
-			want: &BasicUserInfo{
-				Id:             "1234",
-				Name:           "My Name",
-				Email:          "me@example.com",
-				Login:          "me@example.com",
-				Role:           "Admin",
-				Groups:         []string{},
-				IsGrafanaAdmin: nil,
-			},
-		},
-		{
-			name: "Editor roles in claim and GrafanaAdminAssignment enabled",
-			fields: fields{
-				SocialBase: newSocialBase("azuread",
-					&oauth2.Config{ClientID: "client-id-example"}, &OAuthInfo{AllowAssignGrafanaAdmin: true}, "", false, *featuremgmt.WithFeatures()),
-			},
-			claims: &azureClaims{
-				Email:             "me@example.com",
-				PreferredUsername: "",
-				Roles:             []string{"Editor"},
-				Name:              "My Name",
-				ID:                "1234",
-			},
-			want: &BasicUserInfo{
-				Id:             "1234",
-				Name:           "My Name",
-				Email:          "me@example.com",
-				Login:          "me@example.com",
-				Role:           "Editor",
-				Groups:         []string{},
-				IsGrafanaAdmin: falseBoolPtr(),
-			},
-		},
-		{
-			name: "Grafana Admin and Editor roles in claim",
-			fields: fields{SocialBase: newSocialBase("azuread",
-				&oauth2.Config{ClientID: "client-id-example"}, &OAuthInfo{AllowAssignGrafanaAdmin: true}, "", false, *featuremgmt.WithFeatures())},
-			claims: &azureClaims{
-				Email:             "me@example.com",
-				PreferredUsername: "",
-				Roles:             []string{"GrafanaAdmin", "Editor"},
-				Name:              "My Name",
-				ID:                "1234",
-			},
-			want: &BasicUserInfo{
-				Id:             "1234",
-				Name:           "My Name",
-				Email:          "me@example.com",
-				Login:          "me@example.com",
-				Role:           "Admin",
-				Groups:         []string{},
-				IsGrafanaAdmin: trueBoolPtr(),
-			},
-		},
-		{
-			name: "Error if user is not a member of allowed_groups",
-			fields: fields{
-				SocialBase:    newSocialBase("azuread", &oauth2.Config{ClientID: "client-id-example"}, &OAuthInfo{AllowAssignGrafanaAdmin: false}, "Editor", false, *featuremgmt.WithFeatures()),
-				allowedGroups: []string{"dead-beef"},
-			},
-			claims: &azureClaims{
-				Email:             "me@example.com",
-				PreferredUsername: "",
-				Roles:             []string{},
-				Groups:            []string{"foo", "bar"},
-				Name:              "My Name",
-				ID:                "1234",
-			},
-			want:    nil,
-			wantErr: true,
-		},
-		{
-			name: "Error if user is not a member of allowed_organizations",
-			fields: fields{
-				SocialBase:           newSocialBase("azuread", &oauth2.Config{ClientID: "client-id-example"}, &OAuthInfo{AllowAssignGrafanaAdmin: false}, "Editor", false, *featuremgmt.WithFeatures()),
-				allowedOrganizations: []string{"uuid-1234"},
-			},
-			claims: &azureClaims{
-				Email:             "me@example.com",
-				TenantID:          "uuid-5678",
-				PreferredUsername: "",
-				Roles:             []string{},
-				Groups:            []string{"foo", "bar"},
-				Name:              "My Name",
-				ID:                "1234",
-			},
-			want:    nil,
-			wantErr: true,
-		}, {
-			name: "No error if user is a member of allowed_organizations",
-			fields: fields{
-				allowedOrganizations: []string{"uuid-1234", "uuid-5678"},
-			},
-			claims: &azureClaims{
-				Email:             "me@example.com",
-				TenantID:          "uuid-5678",
-				PreferredUsername: "",
-				Roles:             []string{},
-				Groups:            []string{"foo", "bar"},
-				Name:              "My Name",
-				ID:                "1234",
-			},
-			want: &BasicUserInfo{
-				Id:     "1234",
-				Name:   "My Name",
-				Email:  "me@example.com",
-				Login:  "me@example.com",
-				Role:   "Viewer",
-				Groups: []string{"foo", "bar"},
-			},
-			wantErr: false,
-		},
-		{
-			name: "No Error if user is a member of allowed_groups",
-			fields: fields{
-				allowedGroups: []string{"foo", "bar"},
-				SocialBase: newSocialBase("azuread",
-					&oauth2.Config{ClientID: "client-id-example"}, &OAuthInfo{AllowAssignGrafanaAdmin: false}, "Viewer", false, *featuremgmt.WithFeatures()),
-			},
-			claims: &azureClaims{
-				Email:             "me@example.com",
-				PreferredUsername: "",
-				Roles:             []string{},
-				Groups:            []string{"foo"},
-				Name:              "My Name",
-				ID:                "1234",
-			},
-			want: &BasicUserInfo{
-				Id:     "1234",
-				Name:   "My Name",
-				Email:  "me@example.com",
-				Login:  "me@example.com",
-				Role:   "Viewer",
-				Groups: []string{"foo"},
-			},
-		},
-		{
-			name: "Fetch groups when ClaimsNames and ClaimsSources is set",
-			fields: fields{
-				SocialBase: newSocialBase("azuread", &oauth2.Config{ClientID: "client-id-example"}, &OAuthInfo{}, "", false, *featuremgmt.WithFeatures()),
-			},
-			claims: &azureClaims{
-				ID:                "1",
-				Name:              "test",
-				PreferredUsername: "test",
-				Email:             "test@test.com",
-				Roles:             []string{"Viewer"},
-				ClaimNames:        claimNames{Groups: "src1"},
-				ClaimSources:      nil, // set by the test
-			},
-			settingAutoAssignOrgRole: "",
-			want: &BasicUserInfo{
-				Id:     "1",
-				Name:   "test",
-				Email:  "test@test.com",
-				Login:  "test@test.com",
-				Role:   "Viewer",
-				Groups: []string{"from_server"},
-			},
-			wantErr: false,
-		},
-		{
-			name: "Fetch groups when forceUseGraphAPI is set",
-			fields: fields{
-				SocialBase:       newSocialBase("azuread", &oauth2.Config{ClientID: "client-id-example"}, &OAuthInfo{}, "", false, *featuremgmt.WithFeatures()),
-				forceUseGraphAPI: true,
-			},
-			claims: &azureClaims{
-				ID:                "1",
-				Name:              "test",
-				PreferredUsername: "test",
-				Email:             "test@test.com",
-				Roles:             []string{"Viewer"},
-				ClaimNames:        claimNames{Groups: "src1"},
-				ClaimSources:      nil,                    // set by the test
-				Groups:            []string{"foo", "bar"}, // must be ignored
-			},
-			settingAutoAssignOrgRole: "",
-			want: &BasicUserInfo{
-				Id:     "1",
-				Name:   "test",
-				Email:  "test@test.com",
-				Login:  "test@test.com",
-				Role:   "Viewer",
-				Groups: []string{"from_server"},
-			},
-			wantErr: false,
-		},
-		{
-			name: "Fetch empty role when strict attribute role is true and no match",
-			fields: fields{
-				SocialBase: newSocialBase("azuread", &oauth2.Config{ClientID: "client-id-example"}, &OAuthInfo{RoleAttributeStrict: true}, "", false, *featuremgmt.WithFeatures()),
-			},
-			claims: &azureClaims{
-				Email:             "me@example.com",
-				PreferredUsername: "",
-				Roles:             []string{"foo"},
-				Groups:            []string{},
-				Name:              "My Name",
-				ID:                "1234",
-			},
-			want:    nil,
-			wantErr: true,
-		},
-		{
-			name: "Fetch empty role when strict attribute role is true and no role claims returned",
-			fields: fields{
-				SocialBase: newSocialBase("azuread", &oauth2.Config{ClientID: "client-id-example"}, &OAuthInfo{RoleAttributeStrict: true}, "", false, *featuremgmt.WithFeatures()),
-			},
-			claims: &azureClaims{
-				Email:             "me@example.com",
-				PreferredUsername: "",
-				Roles:             []string{},
-				Groups:            []string{},
-				Name:              "My Name",
-				ID:                "1234",
-			},
-			want:    nil,
-			wantErr: true,
-		},
-	}
-
-	privateKey, err := rsa.GenerateKey(rand.Reader, 2048)
-	require.NoError(t, err)
-
-	// Instantiate a signer using RSASSA-PSS (SHA256) with the given private key.
-	sig, err := jose.NewSigner(jose.SigningKey{Algorithm: jose.PS256, Key: privateKey}, (&jose.SignerOptions{
-		ExtraHeaders: map[jose.HeaderKey]any{"kid": "1"},
-	}).WithType("JWT"))
-	require.NoError(t, err)
-
-	// generate JWKS
-	jwks := &jose.JSONWebKeySet{
-		Keys: []jose.JSONWebKey{
-			{
-				Key:       privateKey.Public(),
-				KeyID:     "1",
-				Algorithm: "PS256",
-				Use:       "sig",
-			},
-		},
-	}
-
-	authURL := "https://login.microsoftonline.com/1234/oauth2/v2.0/authorize"
-	usGovAuthURL := "https://login.microsoftonline.us/1234/oauth2/v2.0/authorize"
-
-	cache := remotecache.NewFakeCacheStorage()
-	// put JWKS in cache
-	jwksDump, err := json.Marshal(jwks)
-	require.NoError(t, err)
-
-	err = cache.Set(context.Background(), azureCacheKeyPrefix+"client-id-example", jwksDump, 0)
-	require.NoError(t, err)
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			s := &SocialAzureAD{
-				SocialBase:           tt.fields.SocialBase,
-				allowedOrganizations: tt.fields.allowedOrganizations,
-				forceUseGraphAPI:     tt.fields.forceUseGraphAPI,
-				cache:                cache,
-			}
-
-			if tt.fields.SocialBase == nil {
-				s.SocialBase = newSocialBase("azuread", &oauth2.Config{ClientID: "client-id-example"}, &OAuthInfo{}, "", false, *featuremgmt.WithFeatures())
-			}
-
-			if tt.fields.allowedGroups != nil {
-				s.allowedGroups = tt.fields.allowedGroups
-			}
-
-			if tt.fields.usGovURL {
-				s.SocialBase.Endpoint.AuthURL = usGovAuthURL
-			} else {
-				s.SocialBase.Endpoint.AuthURL = authURL
-			}
-
-			cl := jwt.Claims{
-				Audience:  jwt.Audience{"client-id-example"},
-				Subject:   "subject",
-				Issuer:    "issuer",
-				NotBefore: jwt.NewNumericDate(time.Date(2016, 1, 1, 0, 0, 0, 0, time.UTC)),
-			}
-
-			var raw string
-			if tt.claims != nil {
-				tt.claims.Audience = "client-id-example"
-				if tt.claims.ClaimNames.Groups != "" {
-					server := httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
-						tokenParts := strings.Split(request.Header.Get("Authorization"), " ")
-						require.Len(t, tokenParts, 2)
-						require.Equal(t, "fake_token", tokenParts[1])
-
-						writer.WriteHeader(http.StatusOK)
-
-						type response struct {
-							Value []string
-						}
-						res := response{Value: []string{"from_server"}}
-						require.NoError(t, json.NewEncoder(writer).Encode(&res))
-					}))
-					// need to set the fake servers url as endpoint to capture request
-					tt.claims.ClaimSources = map[string]claimSource{
-						tt.claims.ClaimNames.Groups: {Endpoint: server.URL},
-					}
-				}
-				raw, err = jwt.Signed(sig).Claims(cl).Claims(tt.claims).CompactSerialize()
-				require.NoError(t, err)
-			} else {
-				raw, err = jwt.Signed(sig).Claims(cl).CompactSerialize()
-				require.NoError(t, err)
-			}
-
-			token := &oauth2.Token{
-				AccessToken: "fake_token",
-			}
-			if tt.claims != nil {
-				token = token.WithExtra(map[string]any{"id_token": raw})
-			}
-
-			if tt.fields.SocialBase != nil {
-				tt.args.client = s.Client(context.Background(), token)
-			}
-
-			got, err := s.UserInfo(context.Background(), tt.args.client, token)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("UserInfo() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-
-			require.EqualValues(t, tt.want, got)
-		})
-	}
-}
-
-func TestSocialAzureAD_SkipOrgRole(t *testing.T) {
-	type fields struct {
-		SocialBase       *SocialBase
-		allowedGroups    []string
-		forceUseGraphAPI bool
-		skipOrgRoleSync  bool
-	}
-	type args struct {
-		client *http.Client
-	}
-
-	tests := []struct {
-		name                     string
-		fields                   fields
-		claims                   *azureClaims
-		args                     args
-		settingAutoAssignOrgRole string
-		want                     *BasicUserInfo
-		wantErr                  bool
-	}{
-		{
-			name: "Grafana Admin and Editor roles in claim, skipOrgRoleSync disabled should get roles, skipOrgRoleSyncBase disabled",
-			fields: fields{
-				SocialBase: newSocialBase("azuread",
-					&oauth2.Config{ClientID: "client-id-example"},
-					&OAuthInfo{AllowAssignGrafanaAdmin: true}, "", false, *featuremgmt.WithFeatures()),
-				skipOrgRoleSync: false,
-			},
-			claims: &azureClaims{
-				Email:             "me@example.com",
-				PreferredUsername: "",
-				Roles:             []string{"GrafanaAdmin", "Editor"},
-				Name:              "My Name",
-				ID:                "1234",
-			},
-			want: &BasicUserInfo{
-				Id:             "1234",
-				Name:           "My Name",
-				Email:          "me@example.com",
-				Login:          "me@example.com",
-				Role:           "Admin",
-				IsGrafanaAdmin: trueBoolPtr(),
-				Groups:         []string{},
-			},
-		},
-		{
-			name: "Grafana Admin and Editor roles in claim, skipOrgRoleSync disabled should not get roles",
-			fields: fields{
-				SocialBase: newSocialBase("azuread",
-					&oauth2.Config{ClientID: "client-id-example"},
-					&OAuthInfo{AllowAssignGrafanaAdmin: true}, "", false, *featuremgmt.WithFeatures()),
-				skipOrgRoleSync: false,
-			},
-			claims: &azureClaims{
-				Email:             "me@example.com",
-				PreferredUsername: "",
-				Roles:             []string{"GrafanaAdmin", "Editor"},
-				Name:              "My Name",
-				ID:                "1234",
-			},
-			want: &BasicUserInfo{
-				Id:             "1234",
-				Name:           "My Name",
-				Email:          "me@example.com",
-				Login:          "me@example.com",
-				Role:           "Admin",
-				IsGrafanaAdmin: trueBoolPtr(),
-				Groups:         []string{},
-			},
-		},
-	}
-
-	privateKey, err := rsa.GenerateKey(rand.Reader, 2048)
-	require.NoError(t, err)
-
-	// Instantiate a signer using RSASSA-PSS (SHA256) with the given private key.
-	sig, err := jose.NewSigner(jose.SigningKey{Algorithm: jose.PS256, Key: privateKey}, (&jose.SignerOptions{
-		ExtraHeaders: map[jose.HeaderKey]any{"kid": "1"},
-	}).WithType("JWT"))
-	require.NoError(t, err)
-
-	// generate JWKS
-	jwks := &jose.JSONWebKeySet{
-		Keys: []jose.JSONWebKey{
-			{
-				Key:       privateKey.Public(),
-				KeyID:     "1",
-				Algorithm: string(jose.PS256),
-				Use:       "sig",
-			},
-		},
-	}
-
-	authURL := "https://login.microsoftonline.com/1234/oauth2/v2.0/authorize"
-	cache := remotecache.NewFakeCacheStorage()
-	// put JWKS in cache
-	jwksDump, err := json.Marshal(jwks)
-	require.NoError(t, err)
-
-	err = cache.Set(context.Background(), azureCacheKeyPrefix+"client-id-example", jwksDump, 0)
-	require.NoError(t, err)
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			s := &SocialAzureAD{
-				SocialBase:       tt.fields.SocialBase,
-				forceUseGraphAPI: tt.fields.forceUseGraphAPI,
-				skipOrgRoleSync:  tt.fields.skipOrgRoleSync,
-				cache:            cache,
-			}
-
-			if tt.fields.SocialBase == nil {
-				s.SocialBase = newSocialBase("azuread", &oauth2.Config{ClientID: "client-id-example"}, &OAuthInfo{
-					AllowedGroups: tt.fields.allowedGroups,
-				}, "", false, *featuremgmt.WithFeatures())
-			}
-
-			s.SocialBase.Endpoint.AuthURL = authURL
-
-			cl := jwt.Claims{
-				Subject:   "subject",
-				Issuer:    "issuer",
-				NotBefore: jwt.NewNumericDate(time.Date(2016, 1, 1, 0, 0, 0, 0, time.UTC)),
-				Audience:  jwt.Audience{"leela", "fry"},
-			}
-
-			var raw string
-			if tt.claims != nil {
-				tt.claims.Audience = "client-id-example"
-				if tt.claims.ClaimNames.Groups != "" {
-					server := httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
-						tokenParts := strings.Split(request.Header.Get("Authorization"), " ")
-						require.Len(t, tokenParts, 2)
-						require.Equal(t, "fake_token", tokenParts[1])
-
-						writer.WriteHeader(http.StatusOK)
-
-						type response struct {
-							Value []string
-						}
-						res := response{Value: []string{"from_server"}}
-						require.NoError(t, json.NewEncoder(writer).Encode(&res))
-					}))
-					// need to set the fake servers url as endpoint to capture request
-					tt.claims.ClaimSources = map[string]claimSource{
-						tt.claims.ClaimNames.Groups: {Endpoint: server.URL},
-					}
-				}
-				raw, err = jwt.Signed(sig).Claims(cl).Claims(tt.claims).CompactSerialize()
-				require.NoError(t, err)
-			} else {
-				raw, err = jwt.Signed(sig).Claims(cl).CompactSerialize()
-				require.NoError(t, err)
-			}
-
-			token := &oauth2.Token{
-				AccessToken: "fake_token",
-			}
-			if tt.claims != nil {
-				token = token.WithExtra(map[string]any{"id_token": raw})
-			}
-
-			if tt.fields.SocialBase != nil {
-				tt.args.client = s.Client(context.Background(), token)
-			}
-
-			got, err := s.UserInfo(context.Background(), tt.args.client, token)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("UserInfo() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-
-			require.EqualValues(t, tt.want, got)
-		})
-	}
-}
diff --git a/pkg/login/social/common.go b/pkg/login/social/common.go
deleted file mode 100644
index 24ad20c07289f..0000000000000
--- a/pkg/login/social/common.go
+++ /dev/null
@@ -1,134 +0,0 @@
-package social
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"strings"
-
-	"github.com/jmespath/go-jmespath"
-)
-
-var (
-	errMissingGroupMembership = &Error{"user not a member of one of the required groups"}
-)
-
-type httpGetResponse struct {
-	Body    []byte
-	Headers http.Header
-}
-
-func (s *SocialBase) IsEmailAllowed(email string) bool {
-	return isEmailAllowed(email, s.allowedDomains)
-}
-
-func (s *SocialBase) IsSignupAllowed() bool {
-	return s.allowSignup
-}
-
-func isEmailAllowed(email string, allowedDomains []string) bool {
-	if len(allowedDomains) == 0 {
-		return true
-	}
-
-	valid := false
-	for _, domain := range allowedDomains {
-		emailSuffix := fmt.Sprintf("@%s", domain)
-		valid = valid || strings.HasSuffix(strings.ToLower(email), strings.ToLower(emailSuffix))
-	}
-
-	return valid
-}
-
-func (s *SocialBase) httpGet(ctx context.Context, client *http.Client, url string) (*httpGetResponse, error) {
-	req, errReq := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
-	if errReq != nil {
-		return nil, errReq
-	}
-
-	r, errDo := client.Do(req)
-	if errDo != nil {
-		return nil, errDo
-	}
-
-	defer func() {
-		if err := r.Body.Close(); err != nil {
-			s.log.Warn("Failed to close response body", "err", err)
-		}
-	}()
-
-	body, errRead := io.ReadAll(r.Body)
-	if errRead != nil {
-		return nil, errRead
-	}
-
-	response := &httpGetResponse{body, r.Header}
-
-	if r.StatusCode >= 300 {
-		return nil, fmt.Errorf("unsuccessful response status code %d: %s", r.StatusCode, string(response.Body))
-	}
-
-	s.log.Debug("HTTP GET", "url", url, "status", r.Status, "response_body", string(response.Body))
-
-	return response, nil
-}
-
-func (s *SocialBase) searchJSONForAttr(attributePath string, data []byte) (any, error) {
-	if attributePath == "" {
-		return "", errors.New("no attribute path specified")
-	}
-
-	if len(data) == 0 {
-		return "", errors.New("empty user info JSON response provided")
-	}
-
-	var buf any
-	if err := json.Unmarshal(data, &buf); err != nil {
-		return "", fmt.Errorf("%v: %w", "failed to unmarshal user info JSON response", err)
-	}
-
-	val, err := jmespath.Search(attributePath, buf)
-	if err != nil {
-		return "", fmt.Errorf("failed to search user info JSON response with provided path: %q: %w", attributePath, err)
-	}
-
-	return val, nil
-}
-
-func (s *SocialBase) searchJSONForStringAttr(attributePath string, data []byte) (string, error) {
-	val, err := s.searchJSONForAttr(attributePath, data)
-	if err != nil {
-		return "", err
-	}
-
-	strVal, ok := val.(string)
-	if ok {
-		return strVal, nil
-	}
-
-	return "", nil
-}
-
-func (s *SocialBase) searchJSONForStringArrayAttr(attributePath string, data []byte) ([]string, error) {
-	val, err := s.searchJSONForAttr(attributePath, data)
-	if err != nil {
-		return []string{}, err
-	}
-
-	ifArr, ok := val.([]any)
-	if !ok {
-		return []string{}, nil
-	}
-
-	result := []string{}
-	for _, v := range ifArr {
-		if strVal, ok := v.(string); ok {
-			result = append(result, strVal)
-		}
-	}
-
-	return result, nil
-}
diff --git a/pkg/login/social/azuread_jwks.go b/pkg/login/social/connectors/azuread_jwks.go
similarity index 99%
rename from pkg/login/social/azuread_jwks.go
rename to pkg/login/social/connectors/azuread_jwks.go
index 74113a84271a0..b6d051b08cde0 100644
--- a/pkg/login/social/azuread_jwks.go
+++ b/pkg/login/social/connectors/azuread_jwks.go
@@ -1,4 +1,4 @@
-package social
+package connectors
 
 import (
 	"bytes"
diff --git a/pkg/login/social/connectors/azuread_oauth.go b/pkg/login/social/connectors/azuread_oauth.go
new file mode 100644
index 0000000000000..178cc9a837c40
--- /dev/null
+++ b/pkg/login/social/connectors/azuread_oauth.go
@@ -0,0 +1,461 @@
+package connectors
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"strings"
+	"time"
+
+	jose "github.com/go-jose/go-jose/v3"
+	"github.com/go-jose/go-jose/v3/jwt"
+	"github.com/google/uuid"
+	"golang.org/x/oauth2"
+
+	"github.com/grafana/grafana/pkg/infra/remotecache"
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/models/roletype"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	ssoModels "github.com/grafana/grafana/pkg/services/ssosettings/models"
+	"github.com/grafana/grafana/pkg/services/ssosettings/validation"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util"
+)
+
+const forceUseGraphAPIKey = "force_use_graph_api" // #nosec G101 not a hardcoded credential
+
+var (
+	ExtraAzureADSettingKeys = map[string]ExtraKeyInfo{
+		forceUseGraphAPIKey:     {Type: Bool, DefaultValue: false},
+		allowedOrganizationsKey: {Type: String},
+	}
+	errAzureADMissingGroups = &SocialError{"either the user does not have any group membership or the groups claim is missing from the token."}
+)
+
+var _ social.SocialConnector = (*SocialAzureAD)(nil)
+var _ ssosettings.Reloadable = (*SocialAzureAD)(nil)
+
+type SocialAzureAD struct {
+	*SocialBase
+	cache                remotecache.CacheStorage
+	allowedOrganizations []string
+	forceUseGraphAPI     bool
+}
+
+type azureClaims struct {
+	Audience          string                 `json:"aud"`
+	Email             string                 `json:"email"`
+	PreferredUsername string                 `json:"preferred_username"`
+	Roles             []string               `json:"roles"`
+	Groups            []string               `json:"groups"`
+	Name              string                 `json:"name"`
+	ID                string                 `json:"oid"`
+	ClaimNames        claimNames             `json:"_claim_names,omitempty"`
+	ClaimSources      map[string]claimSource `json:"_claim_sources,omitempty"`
+	TenantID          string                 `json:"tid,omitempty"`
+	OAuthVersion      string                 `json:"ver,omitempty"`
+}
+
+type claimNames struct {
+	Groups string `json:"groups"`
+}
+
+type claimSource struct {
+	Endpoint string `json:"endpoint"`
+}
+
+type azureAccessClaims struct {
+	TenantID string `json:"tid"`
+}
+
+type keySetJWKS struct {
+	jose.JSONWebKeySet
+}
+
+func NewAzureADProvider(info *social.OAuthInfo, cfg *setting.Cfg, ssoSettings ssosettings.Service, features featuremgmt.FeatureToggles, cache remotecache.CacheStorage) *SocialAzureAD {
+	provider := &SocialAzureAD{
+		SocialBase:           newSocialBase(social.AzureADProviderName, info, features, cfg),
+		cache:                cache,
+		allowedOrganizations: util.SplitString(info.Extra[allowedOrganizationsKey]),
+		forceUseGraphAPI:     MustBool(info.Extra[forceUseGraphAPIKey], ExtraAzureADSettingKeys[forceUseGraphAPIKey].DefaultValue.(bool)),
+	}
+
+	if info.UseRefreshToken {
+		appendUniqueScope(provider.Config, social.OfflineAccessScope)
+	}
+
+	if features.IsEnabledGlobally(featuremgmt.FlagSsoSettingsApi) {
+		ssoSettings.RegisterReloadable(social.AzureADProviderName, provider)
+	}
+
+	return provider
+}
+
+func (s *SocialAzureAD) UserInfo(ctx context.Context, client *http.Client, token *oauth2.Token) (*social.BasicUserInfo, error) {
+	s.reloadMutex.RLock()
+	defer s.reloadMutex.RUnlock()
+
+	idToken := token.Extra("id_token")
+	if idToken == nil {
+		return nil, ErrIDTokenNotFound
+	}
+
+	parsedToken, err := jwt.ParseSigned(idToken.(string))
+	if err != nil {
+		return nil, fmt.Errorf("error parsing id token: %w", err)
+	}
+
+	claims, err := s.validateClaims(ctx, client, parsedToken)
+	if err != nil {
+		return nil, err
+	}
+
+	email := claims.extractEmail()
+	if email == "" {
+		return nil, ErrEmailNotFound
+	}
+
+	// setting the role, grafanaAdmin to empty to reflect that we are not syncronizing with the external provider
+	var role roletype.RoleType
+	var grafanaAdmin bool
+	if !s.info.SkipOrgRoleSync {
+		role, grafanaAdmin, err = s.extractRoleAndAdmin(claims)
+		if err != nil {
+			return nil, err
+		}
+
+		if !role.IsValid() {
+			return nil, errInvalidRole.Errorf("AzureAD OAuth: invalid role %q", role)
+		}
+	}
+	s.log.Debug("AzureAD OAuth: extracted role", "email", email, "role", role)
+
+	groups, err := s.extractGroups(ctx, client, claims, token)
+	if err != nil {
+		return nil, fmt.Errorf("failed to extract groups: %w", err)
+	}
+	s.log.Debug("AzureAD OAuth: extracted groups", "email", email, "groups", fmt.Sprintf("%v", groups))
+	if !s.isGroupMember(groups) {
+		if len(groups) == 0 {
+			// either they do not have a group or misconfiguration
+			return nil, errAzureADMissingGroups
+		}
+		// user is not a member of any of the allowed groups
+		return nil, errMissingGroupMembership
+	}
+
+	var isGrafanaAdmin *bool = nil
+	if s.info.AllowAssignGrafanaAdmin {
+		isGrafanaAdmin = &grafanaAdmin
+	}
+
+	if s.info.AllowAssignGrafanaAdmin && s.info.SkipOrgRoleSync {
+		s.log.Debug("AllowAssignGrafanaAdmin and skipOrgRoleSync are both set, Grafana Admin role will not be synced, consider setting one or the other")
+	}
+
+	return &social.BasicUserInfo{
+		Id:             claims.ID,
+		Name:           claims.Name,
+		Email:          email,
+		Login:          email,
+		Role:           role,
+		IsGrafanaAdmin: isGrafanaAdmin,
+		Groups:         groups,
+	}, nil
+}
+
+func (s *SocialAzureAD) Reload(ctx context.Context, settings ssoModels.SSOSettings) error {
+	newInfo, err := CreateOAuthInfoFromKeyValues(settings.Settings)
+	if err != nil {
+		return ssosettings.ErrInvalidSettings.Errorf("SSO settings map cannot be converted to OAuthInfo: %v", err)
+	}
+
+	s.reloadMutex.Lock()
+	defer s.reloadMutex.Unlock()
+
+	s.updateInfo(social.AzureADProviderName, newInfo)
+
+	if newInfo.UseRefreshToken {
+		appendUniqueScope(s.Config, social.OfflineAccessScope)
+	}
+
+	s.allowedOrganizations = util.SplitString(newInfo.Extra[allowedOrganizationsKey])
+	s.forceUseGraphAPI = MustBool(newInfo.Extra[forceUseGraphAPIKey], false)
+
+	return nil
+}
+
+func (s *SocialAzureAD) Validate(ctx context.Context, settings ssoModels.SSOSettings, requester identity.Requester) error {
+	info, err := CreateOAuthInfoFromKeyValues(settings.Settings)
+	if err != nil {
+		return ssosettings.ErrInvalidSettings.Errorf("SSO settings map cannot be converted to OAuthInfo: %v", err)
+	}
+
+	err = validateInfo(info, requester)
+	if err != nil {
+		return err
+	}
+
+	return validation.Validate(info, requester,
+		validateAllowedGroups,
+		// FIXME: uncomment this after the Terraform provider is updated
+		//validation.MustBeEmptyValidator(info.ApiUrl, "API URL"),
+		validation.RequiredUrlValidator(info.AuthUrl, "Auth URL"),
+		validation.RequiredUrlValidator(info.TokenUrl, "Token URL"))
+}
+
+func validateAllowedGroups(info *social.OAuthInfo, requester identity.Requester) error {
+	for _, groupId := range info.AllowedGroups {
+		_, err := uuid.Parse(groupId)
+		if err != nil {
+			return ssosettings.ErrInvalidOAuthConfig("One or more of the Allowed groups are not in the correct format. Allowed groups should be a list of Object Ids.")
+		}
+	}
+	return nil
+}
+
+func (s *SocialAzureAD) validateClaims(ctx context.Context, client *http.Client, parsedToken *jwt.JSONWebToken) (*azureClaims, error) {
+	claims, err := s.validateIDTokenSignature(ctx, client, parsedToken)
+	if err != nil {
+		return nil, fmt.Errorf("error getting claims from id token: %w", err)
+	}
+
+	if claims.OAuthVersion == "1.0" {
+		return nil, &SocialError{"AzureAD OAuth: version 1.0 is not supported. Please ensure the auth_url and token_url are set to the v2.0 endpoints."}
+	}
+
+	s.log.Debug("Validating audience", "audience", claims.Audience, "client_id", s.ClientID)
+	if claims.Audience != s.ClientID {
+		return nil, &SocialError{"AzureAD OAuth: audience mismatch"}
+	}
+
+	s.log.Debug("Validating tenant", "tenant", claims.TenantID, "allowed_tenants", s.allowedOrganizations)
+	if !s.isAllowedTenant(claims.TenantID) {
+		return nil, &SocialError{"AzureAD OAuth: tenant mismatch"}
+	}
+	return claims, nil
+}
+
+func (s *SocialAzureAD) validateIDTokenSignature(ctx context.Context, client *http.Client, parsedToken *jwt.JSONWebToken) (*azureClaims, error) {
+	var claims azureClaims
+
+	jwksFuncs := []func(ctx context.Context, client *http.Client, authURL string) (*keySetJWKS, time.Duration, error){
+		s.retrieveJWKSFromCache, s.retrieveSpecificJWKS, s.retrieveGeneralJWKS,
+	}
+
+	keyID := parsedToken.Headers[0].KeyID
+
+	for _, jwksFunc := range jwksFuncs {
+		keyset, expiry, err := jwksFunc(ctx, client, s.Endpoint.AuthURL)
+		if err != nil {
+			return nil, fmt.Errorf("error retrieving jwks: %w", err)
+		}
+		var errClaims error
+		keys := keyset.Key(keyID)
+		for _, key := range keys {
+			s.log.Debug("AzureAD OAuth: trying to parse token with key", "kid", key.KeyID)
+			if errClaims = parsedToken.Claims(key, &claims); errClaims == nil {
+				if expiry != 0 {
+					s.log.Debug("AzureAD OAuth: caching key set", "kid", key.KeyID, "expiry", expiry)
+					if err := s.cacheJWKS(ctx, keyset, expiry); err != nil {
+						s.log.Warn("Failed to set key set in cache", "err", err)
+					}
+				}
+				return &claims, nil
+			} else {
+				s.log.Warn("AzureAD OAuth: failed to parse token with key", "kid", key.KeyID, "err", errClaims)
+			}
+		}
+	}
+
+	s.log.Warn("AzureAD OAuth: signing key not found", "kid", keyID)
+
+	return nil, &SocialError{"AzureAD OAuth: signing key not found"}
+}
+
+func (claims *azureClaims) extractEmail() string {
+	if claims.Email == "" {
+		if claims.PreferredUsername != "" {
+			return claims.PreferredUsername
+		}
+	}
+
+	return claims.Email
+}
+
+// extractRoleAndAdmin extracts the role from the claims and returns the role and whether the user is a Grafana admin.
+func (s *SocialAzureAD) extractRoleAndAdmin(claims *azureClaims) (org.RoleType, bool, error) {
+	if len(claims.Roles) == 0 {
+		if s.info.RoleAttributeStrict {
+			return "", false, errRoleAttributeStrictViolation.Errorf("AzureAD OAuth: unset role")
+		}
+		return s.defaultRole(), false, nil
+	}
+
+	roleOrder := []org.RoleType{social.RoleGrafanaAdmin, org.RoleAdmin, org.RoleEditor,
+		org.RoleViewer, org.RoleNone}
+	for _, role := range roleOrder {
+		if found := hasRole(claims.Roles, role); found {
+			if role == social.RoleGrafanaAdmin {
+				return org.RoleAdmin, true, nil
+			}
+
+			return role, false, nil
+		}
+	}
+
+	if s.info.RoleAttributeStrict {
+		return "", false, errRoleAttributeStrictViolation.Errorf("AzureAD OAuth: idP did not return a valid role %q", claims.Roles)
+	}
+
+	return s.defaultRole(), false, nil
+}
+
+func hasRole(roles []string, role org.RoleType) bool {
+	for _, item := range roles {
+		if strings.EqualFold(item, string(role)) {
+			return true
+		}
+	}
+
+	return false
+}
+
+type getAzureGroupRequest struct {
+	SecurityEnabledOnly bool `json:"securityEnabledOnly"`
+}
+
+type getAzureGroupResponse struct {
+	Value []string `json:"value"`
+}
+
+// extractGroups retrieves groups from the claims.
+// Note: If user groups exceeds 200 no groups will be found in claims and URL to target the Graph API will be
+// given instead.
+//
+// See https://docs.microsoft.com/en-us/azure/active-directory/develop/id-tokens#groups-overage-claim
+func (s *SocialAzureAD) extractGroups(ctx context.Context, client *http.Client, claims *azureClaims, token *oauth2.Token) ([]string, error) {
+	if !s.forceUseGraphAPI {
+		s.log.Debug("Checking the claim for groups")
+		if len(claims.Groups) > 0 {
+			return claims.Groups, nil
+		}
+
+		if claims.ClaimNames.Groups == "" {
+			return []string{}, nil
+		}
+	}
+
+	// Fallback to the Graph API
+	endpoint, errBuildGraphURI := s.groupsGraphAPIURL(claims, token)
+	if errBuildGraphURI != nil {
+		return nil, errBuildGraphURI
+	}
+
+	data, err := json.Marshal(&getAzureGroupRequest{SecurityEnabledOnly: false})
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := http.NewRequestWithContext(ctx, http.MethodPost, endpoint, bytes.NewBuffer(data))
+	if err != nil {
+		return nil, err
+	}
+	req.Header.Set("Content-Type", "application/json")
+
+	res, err := client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+
+	defer func() {
+		if err := res.Body.Close(); err != nil {
+			s.log.Warn("AzureAD OAuth: failed to close response body", "err", err)
+		}
+	}()
+
+	if res.StatusCode != http.StatusOK {
+		if res.StatusCode == http.StatusForbidden {
+			s.log.Warn("AzureAD OAuth: Token need GroupMember.Read.All permission to fetch all groups")
+		} else {
+			body, _ := io.ReadAll(res.Body)
+			s.log.Warn("AzureAD OAuth: could not fetch user groups", "code", res.StatusCode, "body", string(body))
+		}
+		return []string{}, nil
+	}
+
+	var body getAzureGroupResponse
+	if err := json.NewDecoder(res.Body).Decode(&body); err != nil {
+		return nil, err
+	}
+
+	return body.Value, nil
+}
+
+// groupsGraphAPIURL retrieves the Microsoft Graph API URL to fetch user groups from the _claim_sources if present
+// otherwise it generates an handcrafted URL.
+func (s *SocialAzureAD) groupsGraphAPIURL(claims *azureClaims, token *oauth2.Token) (string, error) {
+	var endpoint string
+	// First check if an endpoint was specified in the claims
+	if claims.ClaimNames.Groups != "" {
+		endpoint = claims.ClaimSources[claims.ClaimNames.Groups].Endpoint
+		s.log.Debug(fmt.Sprintf("endpoint to fetch groups specified in the claims: %s", endpoint))
+	}
+
+	// If no endpoint was specified or if the endpoints provided in _claim_source is pointing to the deprecated
+	// "graph.windows.net" api, use an handcrafted url to graph.microsoft.com
+	// See https://docs.microsoft.com/en-us/graph/migrate-azure-ad-graph-overview
+	if endpoint == "" || strings.Contains(endpoint, "graph.windows.net") {
+		tenantID := claims.TenantID
+		// If tenantID wasn't found in the id_token, parse access token
+		if tenantID == "" {
+			parsedToken, err := jwt.ParseSigned(token.AccessToken)
+			if err != nil {
+				return "", fmt.Errorf("error parsing access token: %w", err)
+			}
+
+			var accessClaims azureAccessClaims
+			if err := parsedToken.UnsafeClaimsWithoutVerification(&accessClaims); err != nil {
+				return "", fmt.Errorf("error getting claims from access token: %w", err)
+			}
+			tenantID = accessClaims.TenantID
+		}
+
+		endpoint = fmt.Sprintf("https://graph.microsoft.com/v1.0/%s/users/%s/getMemberObjects", tenantID, claims.ID)
+		s.log.Debug(fmt.Sprintf("handcrafted endpoint to fetch groups: %s", endpoint))
+	}
+	return endpoint, nil
+}
+
+func (s *SocialAzureAD) SupportBundleContent(bf *bytes.Buffer) error {
+	s.reloadMutex.RLock()
+	defer s.reloadMutex.RUnlock()
+
+	bf.WriteString("## AzureAD specific configuration\n\n")
+	bf.WriteString("```ini\n")
+	bf.WriteString(fmt.Sprintf("allowed_groups = %v\n", s.info.AllowedGroups))
+	bf.WriteString(fmt.Sprintf("forceUseGraphAPI = %v\n", s.forceUseGraphAPI))
+	bf.WriteString("```\n\n")
+
+	return s.SocialBase.getBaseSupportBundleContent(bf)
+}
+
+func (s *SocialAzureAD) isAllowedTenant(tenantID string) bool {
+	if len(s.allowedOrganizations) == 0 {
+		s.log.Warn("No allowed organizations specified, all tenants are allowed. Configure allowed_organizations to restrict access")
+		return true
+	}
+
+	for _, t := range s.allowedOrganizations {
+		if t == tenantID {
+			return true
+		}
+	}
+	return false
+}
diff --git a/pkg/login/social/connectors/azuread_oauth_test.go b/pkg/login/social/connectors/azuread_oauth_test.go
new file mode 100644
index 0000000000000..c1738b3baf844
--- /dev/null
+++ b/pkg/login/social/connectors/azuread_oauth_test.go
@@ -0,0 +1,1274 @@
+package connectors
+
+import (
+	"context"
+	"crypto/rand"
+	"crypto/rsa"
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/go-jose/go-jose/v3"
+	"github.com/go-jose/go-jose/v3/jwt"
+	"github.com/stretchr/testify/require"
+	"golang.org/x/oauth2"
+
+	"github.com/grafana/grafana/pkg/infra/remotecache"
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	ssoModels "github.com/grafana/grafana/pkg/services/ssosettings/models"
+	"github.com/grafana/grafana/pkg/services/ssosettings/ssosettingstests"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+func trueBoolPtr() *bool {
+	b := true
+	return &b
+}
+
+func falseBoolPtr() *bool {
+	b := false
+	return &b
+}
+
+func TestSocialAzureAD_UserInfo(t *testing.T) {
+	type fields struct {
+		providerCfg *social.OAuthInfo
+		cfg         *setting.Cfg
+		usGovURL    bool
+	}
+	type args struct {
+		client *http.Client
+	}
+
+	tests := []struct {
+		name                     string
+		fields                   fields
+		claims                   *azureClaims
+		args                     args
+		settingAutoAssignOrgRole string
+		want                     *social.BasicUserInfo
+		wantErr                  bool
+	}{
+		{
+			name: "Email in email claim",
+			claims: &azureClaims{
+				Email:             "me@example.com",
+				PreferredUsername: "",
+				Roles:             []string{},
+				Name:              "My Name",
+				ID:                "1234",
+			},
+			fields: fields{
+				providerCfg: &social.OAuthInfo{
+					Name:     "azuread",
+					ClientId: "client-id-example",
+				},
+				cfg: &setting.Cfg{
+					AutoAssignOrgRole: "Viewer",
+				},
+			},
+			want: &social.BasicUserInfo{
+				Id:     "1234",
+				Name:   "My Name",
+				Email:  "me@example.com",
+				Login:  "me@example.com",
+				Role:   "Viewer",
+				Groups: []string{},
+			},
+		},
+		{
+			name: "No email",
+			fields: fields{
+				providerCfg: &social.OAuthInfo{
+					Name:     "azuread",
+					ClientId: "client-id-example",
+				},
+				cfg: &setting.Cfg{
+					AutoAssignOrgRole: "Viewer",
+				},
+			},
+			claims: &azureClaims{
+				Email:             "",
+				PreferredUsername: "",
+				Roles:             []string{},
+				Name:              "My Name",
+				ID:                "1234",
+			},
+			want:    nil,
+			wantErr: true,
+		},
+		{
+			name:   "No id token",
+			claims: nil,
+			fields: fields{
+				providerCfg: &social.OAuthInfo{
+					Name:     "azuread",
+					ClientId: "client-id-example",
+				},
+				cfg: &setting.Cfg{
+					AutoAssignOrgRole: "Viewer",
+				},
+			},
+			want:    nil,
+			wantErr: true,
+		},
+		{
+			name: "US Government domain",
+			claims: &azureClaims{
+				Email:             "me@example.com",
+				PreferredUsername: "",
+				Roles:             []string{},
+				Name:              "My Name",
+				ID:                "1234",
+			},
+			fields: fields{
+				providerCfg: &social.OAuthInfo{
+					Name:     "azuread",
+					ClientId: "client-id-example",
+				},
+				cfg: &setting.Cfg{
+					AutoAssignOrgRole: "Viewer",
+				},
+				usGovURL: true,
+			},
+			want: &social.BasicUserInfo{
+				Id:     "1234",
+				Name:   "My Name",
+				Email:  "me@example.com",
+				Login:  "me@example.com",
+				Role:   "Viewer",
+				Groups: []string{},
+			},
+		},
+		{
+			name: "Email in preferred_username claim",
+			claims: &azureClaims{
+				Email:             "",
+				PreferredUsername: "me@example.com",
+				Roles:             []string{},
+				Name:              "My Name",
+				ID:                "1234",
+			},
+			fields: fields{
+				providerCfg: &social.OAuthInfo{
+					Name:     "azuread",
+					ClientId: "client-id-example",
+				},
+				cfg: &setting.Cfg{
+					AutoAssignOrgRole: "Viewer",
+				},
+			},
+			want: &social.BasicUserInfo{
+				Id:     "1234",
+				Name:   "My Name",
+				Email:  "me@example.com",
+				Login:  "me@example.com",
+				Role:   "Viewer",
+				Groups: []string{},
+			},
+		},
+		{
+			name: "Admin role",
+			fields: fields{
+				providerCfg: &social.OAuthInfo{
+					Name:     "azuread",
+					ClientId: "client-id-example",
+				},
+				cfg: &setting.Cfg{
+					AutoAssignOrgRole: "Viewer",
+				},
+			},
+			claims: &azureClaims{
+				Email:             "me@example.com",
+				PreferredUsername: "",
+				Roles:             []string{"Admin"},
+				Name:              "My Name",
+				ID:                "1234",
+			},
+			want: &social.BasicUserInfo{
+				Id:     "1234",
+				Name:   "My Name",
+				Email:  "me@example.com",
+				Login:  "me@example.com",
+				Role:   "Admin",
+				Groups: []string{},
+			},
+		},
+		{
+			name: "Lowercase Admin role",
+			fields: fields{
+				providerCfg: &social.OAuthInfo{
+					Name:     "azuread",
+					ClientId: "client-id-example",
+				},
+				cfg: &setting.Cfg{
+					AutoAssignOrgRole: "Viewer",
+				},
+			},
+			claims: &azureClaims{
+				Email:             "me@example.com",
+				PreferredUsername: "",
+				Roles:             []string{"admin"},
+				Name:              "My Name",
+				ID:                "1234",
+			},
+			want: &social.BasicUserInfo{
+				Id:     "1234",
+				Name:   "My Name",
+				Email:  "me@example.com",
+				Login:  "me@example.com",
+				Role:   "Admin",
+				Groups: []string{},
+			},
+		},
+		{
+			name: "Only other roles",
+			fields: fields{
+				providerCfg: &social.OAuthInfo{
+					Name:     "azuread",
+					ClientId: "client-id-example",
+				},
+				cfg: &setting.Cfg{
+					AutoAssignOrgRole: "Viewer",
+				},
+			},
+			claims: &azureClaims{
+				Email:             "me@example.com",
+				PreferredUsername: "",
+				Roles:             []string{"AppAdmin"},
+				Name:              "My Name",
+				ID:                "1234",
+			},
+			want: &social.BasicUserInfo{
+				Id:     "1234",
+				Name:   "My Name",
+				Email:  "me@example.com",
+				Login:  "me@example.com",
+				Role:   "Viewer",
+				Groups: []string{},
+			},
+		},
+		// TODO: @mgyongyosi check this test
+		{
+			name: "role from env variable",
+			claims: &azureClaims{
+				Email:             "me@example.com",
+				PreferredUsername: "",
+				Roles:             []string{},
+				Name:              "My Name",
+				ID:                "1234",
+			},
+			fields: fields{
+				providerCfg: &social.OAuthInfo{
+					Name:     "azuread",
+					ClientId: "client-id-example",
+				},
+				cfg: &setting.Cfg{
+					AutoAssignOrgRole: "Editor",
+				},
+			},
+			want: &social.BasicUserInfo{
+				Id:     "1234",
+				Name:   "My Name",
+				Email:  "me@example.com",
+				Login:  "me@example.com",
+				Role:   "Editor",
+				Groups: []string{},
+			},
+		},
+		{
+			name: "Editor role",
+			claims: &azureClaims{
+				Email:             "me@example.com",
+				PreferredUsername: "",
+				Roles:             []string{"Editor"},
+				Name:              "My Name",
+				ID:                "1234",
+			},
+			fields: fields{
+				providerCfg: &social.OAuthInfo{
+					Name:     "azuread",
+					ClientId: "client-id-example",
+				},
+				cfg: &setting.Cfg{
+					AutoAssignOrgRole: "Editor",
+				},
+			},
+			want: &social.BasicUserInfo{
+				Id:     "1234",
+				Name:   "My Name",
+				Email:  "me@example.com",
+				Login:  "me@example.com",
+				Role:   "Editor",
+				Groups: []string{},
+			},
+		},
+		{
+			name: "Admin and Editor roles in claim",
+			fields: fields{
+				providerCfg: &social.OAuthInfo{
+					Name:     "azuread",
+					ClientId: "client-id-example",
+				},
+				cfg: &setting.Cfg{
+					AutoAssignOrgRole: "Editor",
+				},
+			},
+			claims: &azureClaims{
+				Email:             "me@example.com",
+				PreferredUsername: "",
+				Roles:             []string{"Admin", "Editor"},
+				Name:              "My Name",
+				ID:                "1234",
+			},
+			want: &social.BasicUserInfo{
+				Id:     "1234",
+				Name:   "My Name",
+				Email:  "me@example.com",
+				Login:  "me@example.com",
+				Role:   "Admin",
+				Groups: []string{},
+			},
+		},
+		{
+			name: "Grafana Admin but setting is disabled",
+			fields: fields{
+				providerCfg: &social.OAuthInfo{
+					Name:                    "azuread",
+					ClientId:                "client-id-example",
+					AllowAssignGrafanaAdmin: false,
+				},
+				cfg: &setting.Cfg{
+					AutoAssignOrgRole: "Editor",
+				},
+			},
+
+			claims: &azureClaims{
+				Email:             "me@example.com",
+				PreferredUsername: "",
+				Roles:             []string{"GrafanaAdmin"},
+				Name:              "My Name",
+				ID:                "1234",
+			},
+			want: &social.BasicUserInfo{
+				Id:             "1234",
+				Name:           "My Name",
+				Email:          "me@example.com",
+				Login:          "me@example.com",
+				Role:           "Admin",
+				Groups:         []string{},
+				IsGrafanaAdmin: nil,
+			},
+		},
+		{
+			name: "Editor roles in claim and GrafanaAdminAssignment enabled",
+			fields: fields{
+				providerCfg: &social.OAuthInfo{
+					Name:                    "azuread",
+					ClientId:                "client-id-example",
+					AllowAssignGrafanaAdmin: true,
+				},
+				cfg: &setting.Cfg{
+					AutoAssignOrgRole: "",
+				},
+			},
+			claims: &azureClaims{
+				Email:             "me@example.com",
+				PreferredUsername: "",
+				Roles:             []string{"Editor"},
+				Name:              "My Name",
+				ID:                "1234",
+			},
+			want: &social.BasicUserInfo{
+				Id:             "1234",
+				Name:           "My Name",
+				Email:          "me@example.com",
+				Login:          "me@example.com",
+				Role:           "Editor",
+				Groups:         []string{},
+				IsGrafanaAdmin: falseBoolPtr(),
+			},
+		},
+		{
+			name: "Grafana Admin and Editor roles in claim",
+			fields: fields{
+				providerCfg: &social.OAuthInfo{
+					Name:                    "azuread",
+					ClientId:                "client-id-example",
+					AllowAssignGrafanaAdmin: true,
+				},
+				cfg: &setting.Cfg{
+					AutoAssignOrgRole: "",
+				},
+			},
+			claims: &azureClaims{
+				Email:             "me@example.com",
+				PreferredUsername: "",
+				Roles:             []string{"GrafanaAdmin", "Editor"},
+				Name:              "My Name",
+				ID:                "1234",
+			},
+			want: &social.BasicUserInfo{
+				Id:             "1234",
+				Name:           "My Name",
+				Email:          "me@example.com",
+				Login:          "me@example.com",
+				Role:           "Admin",
+				Groups:         []string{},
+				IsGrafanaAdmin: trueBoolPtr(),
+			},
+		},
+		{
+			name: "Error if user is not a member of allowed_groups",
+			fields: fields{
+				providerCfg: &social.OAuthInfo{
+					Name:                    "azuread",
+					ClientId:                "client-id-example",
+					AllowAssignGrafanaAdmin: false,
+					AllowedGroups:           []string{"dead-beef"},
+				},
+				cfg: &setting.Cfg{
+					AutoAssignOrgRole: "Editor",
+				},
+			},
+			claims: &azureClaims{
+				Email:             "me@example.com",
+				PreferredUsername: "",
+				Roles:             []string{},
+				Groups:            []string{"foo", "bar"},
+				Name:              "My Name",
+				ID:                "1234",
+			},
+			want:    nil,
+			wantErr: true,
+		},
+		{
+			name: "Error if user is not a member of allowed_organizations",
+			fields: fields{
+				providerCfg: &social.OAuthInfo{
+					Name:                    "azuread",
+					ClientId:                "client-id-example",
+					AllowAssignGrafanaAdmin: false,
+					Extra: map[string]string{
+						"allowed_organizations": "uuid-1234",
+					},
+				},
+				cfg: &setting.Cfg{
+					AutoAssignOrgRole: "Editor",
+				},
+			},
+			claims: &azureClaims{
+				Email:             "me@example.com",
+				TenantID:          "uuid-5678",
+				PreferredUsername: "",
+				Roles:             []string{},
+				Groups:            []string{"foo", "bar"},
+				Name:              "My Name",
+				ID:                "1234",
+			},
+			want:    nil,
+			wantErr: true,
+		},
+		{
+			name: "No error if user is a member of allowed_organizations",
+			fields: fields{
+				providerCfg: &social.OAuthInfo{
+					Name:     "azuread",
+					ClientId: "client-id-example",
+					Extra: map[string]string{
+						"allowed_organizations": "uuid-1234,uuid-5678",
+					},
+				},
+				cfg: &setting.Cfg{
+					AutoAssignOrgRole: "Viewer",
+				},
+			},
+			claims: &azureClaims{
+				Email:             "me@example.com",
+				TenantID:          "uuid-5678",
+				PreferredUsername: "",
+				Roles:             []string{},
+				Groups:            []string{"foo", "bar"},
+				Name:              "My Name",
+				ID:                "1234",
+			},
+			want: &social.BasicUserInfo{
+				Id:     "1234",
+				Name:   "My Name",
+				Email:  "me@example.com",
+				Login:  "me@example.com",
+				Role:   "Viewer",
+				Groups: []string{"foo", "bar"},
+			},
+			wantErr: false,
+		},
+		{
+			name: "No Error if user is a member of allowed_groups",
+			fields: fields{
+				providerCfg: &social.OAuthInfo{
+					Name:                    "azuread",
+					ClientId:                "client-id-example",
+					AllowAssignGrafanaAdmin: false,
+					AllowedGroups:           []string{"foo", "bar"},
+				},
+				cfg: &setting.Cfg{
+					AutoAssignOrgRole: "Viewer",
+				},
+			},
+			claims: &azureClaims{
+				Email:             "me@example.com",
+				PreferredUsername: "",
+				Roles:             []string{},
+				Groups:            []string{"foo"},
+				Name:              "My Name",
+				ID:                "1234",
+			},
+			want: &social.BasicUserInfo{
+				Id:     "1234",
+				Name:   "My Name",
+				Email:  "me@example.com",
+				Login:  "me@example.com",
+				Role:   "Viewer",
+				Groups: []string{"foo"},
+			},
+		},
+		{
+			name: "Error if user does not have groups but allowed groups",
+			fields: fields{
+				providerCfg: &social.OAuthInfo{
+					Name:                    "azuread",
+					ClientId:                "client-id-example",
+					AllowAssignGrafanaAdmin: false,
+					AllowedGroups:           []string{"foo", "bar"},
+				},
+				cfg: &setting.Cfg{
+					AutoAssignOrgRole: "Viewer",
+				},
+			},
+			claims: &azureClaims{
+				Email:             "me@example.com",
+				PreferredUsername: "",
+				Roles:             []string{},
+				Groups:            []string{""},
+				Name:              "My Name",
+				ID:                "1234",
+			},
+			want:    nil,
+			wantErr: true,
+		},
+		{
+			name: "Fetch groups when ClaimsNames and ClaimsSources is set",
+			fields: fields{
+				providerCfg: &social.OAuthInfo{
+					Name:     "azuread",
+					ClientId: "client-id-example",
+				},
+				cfg: &setting.Cfg{
+					AutoAssignOrgRole: "",
+				},
+			},
+			claims: &azureClaims{
+				ID:                "1",
+				Name:              "test",
+				PreferredUsername: "test",
+				Email:             "test@test.com",
+				Roles:             []string{"Viewer"},
+				ClaimNames:        claimNames{Groups: "src1"},
+				ClaimSources:      nil, // set by the test
+			},
+			settingAutoAssignOrgRole: "",
+			want: &social.BasicUserInfo{
+				Id:     "1",
+				Name:   "test",
+				Email:  "test@test.com",
+				Login:  "test@test.com",
+				Role:   "Viewer",
+				Groups: []string{"from_server"},
+			},
+			wantErr: false,
+		},
+		{
+			name: "Fetch groups when forceUseGraphAPI is set",
+			fields: fields{
+				providerCfg: &social.OAuthInfo{
+					Name:     "azuread",
+					ClientId: "client-id-example",
+					Extra: map[string]string{
+						"force_use_graph_api": "true",
+					},
+				},
+				cfg: &setting.Cfg{
+					AutoAssignOrgRole: "",
+				},
+			},
+			claims: &azureClaims{
+				ID:                "1",
+				Name:              "test",
+				PreferredUsername: "test",
+				Email:             "test@test.com",
+				Roles:             []string{"Viewer"},
+				ClaimNames:        claimNames{Groups: "src1"},
+				ClaimSources:      nil,                    // set by the test
+				Groups:            []string{"foo", "bar"}, // must be ignored
+			},
+			settingAutoAssignOrgRole: "",
+			want: &social.BasicUserInfo{
+				Id:     "1",
+				Name:   "test",
+				Email:  "test@test.com",
+				Login:  "test@test.com",
+				Role:   "Viewer",
+				Groups: []string{"from_server"},
+			},
+			wantErr: false,
+		},
+		{
+			name: "Fetch empty role when strict attribute role is true and no match",
+			fields: fields{
+				providerCfg: &social.OAuthInfo{
+					Name:                "azuread",
+					ClientId:            "client-id-example",
+					RoleAttributeStrict: true,
+				},
+				cfg: &setting.Cfg{
+					AutoAssignOrgRole: "",
+				},
+			},
+			claims: &azureClaims{
+				Email:             "me@example.com",
+				PreferredUsername: "",
+				Roles:             []string{"foo"},
+				Groups:            []string{},
+				Name:              "My Name",
+				ID:                "1234",
+			},
+			want:    nil,
+			wantErr: true,
+		},
+		{
+			name: "Fetch empty role when strict attribute role is true and no role claims returned",
+			fields: fields{
+				providerCfg: &social.OAuthInfo{
+					Name:                "azuread",
+					ClientId:            "client-id-example",
+					RoleAttributeStrict: true,
+				},
+				cfg: &setting.Cfg{
+					AutoAssignOrgRole: "",
+				},
+			},
+			claims: &azureClaims{
+				Email:             "me@example.com",
+				PreferredUsername: "",
+				Roles:             []string{},
+				Groups:            []string{},
+				Name:              "My Name",
+				ID:                "1234",
+			},
+			want:    nil,
+			wantErr: true,
+		},
+	}
+
+	privateKey, err := rsa.GenerateKey(rand.Reader, 2048)
+	require.NoError(t, err)
+
+	// Instantiate a signer using RSASSA-PSS (SHA256) with the given private key.
+	sig, err := jose.NewSigner(jose.SigningKey{Algorithm: jose.PS256, Key: privateKey}, (&jose.SignerOptions{
+		ExtraHeaders: map[jose.HeaderKey]any{"kid": "1"},
+	}).WithType("JWT"))
+	require.NoError(t, err)
+
+	// generate JWKS
+	jwks := &jose.JSONWebKeySet{
+		Keys: []jose.JSONWebKey{
+			{
+				Key:       privateKey.Public(),
+				KeyID:     "1",
+				Algorithm: "PS256",
+				Use:       "sig",
+			},
+		},
+	}
+
+	authURL := "https://login.microsoftonline.com/1234/oauth2/v2.0/authorize"
+	usGovAuthURL := "https://login.microsoftonline.us/1234/oauth2/v2.0/authorize"
+
+	cache := remotecache.NewFakeCacheStorage()
+	// put JWKS in cache
+	jwksDump, err := json.Marshal(jwks)
+	require.NoError(t, err)
+
+	err = cache.Set(context.Background(), azureCacheKeyPrefix+"client-id-example", jwksDump, 0)
+	require.NoError(t, err)
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			s := NewAzureADProvider(tt.fields.providerCfg, tt.fields.cfg, &ssosettingstests.MockService{}, featuremgmt.WithFeatures(), cache)
+
+			if tt.fields.usGovURL {
+				s.SocialBase.Endpoint.AuthURL = usGovAuthURL
+			} else {
+				s.SocialBase.Endpoint.AuthURL = authURL
+			}
+
+			cl := jwt.Claims{
+				Audience:  jwt.Audience{"client-id-example"},
+				Subject:   "subject",
+				Issuer:    "issuer",
+				NotBefore: jwt.NewNumericDate(time.Date(2016, 1, 1, 0, 0, 0, 0, time.UTC)),
+			}
+
+			var raw string
+			if tt.claims != nil {
+				tt.claims.Audience = "client-id-example"
+				if tt.claims.ClaimNames.Groups != "" {
+					server := httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
+						tokenParts := strings.Split(request.Header.Get("Authorization"), " ")
+						require.Len(t, tokenParts, 2)
+						require.Equal(t, "fake_token", tokenParts[1])
+
+						writer.WriteHeader(http.StatusOK)
+
+						type response struct {
+							Value []string
+						}
+						res := response{Value: []string{"from_server"}}
+						require.NoError(t, json.NewEncoder(writer).Encode(&res))
+					}))
+					// need to set the fake servers url as endpoint to capture request
+					tt.claims.ClaimSources = map[string]claimSource{
+						tt.claims.ClaimNames.Groups: {Endpoint: server.URL},
+					}
+				}
+				raw, err = jwt.Signed(sig).Claims(cl).Claims(tt.claims).CompactSerialize()
+				require.NoError(t, err)
+			} else {
+				raw, err = jwt.Signed(sig).Claims(cl).CompactSerialize()
+				require.NoError(t, err)
+			}
+
+			token := &oauth2.Token{
+				AccessToken: "fake_token",
+			}
+			if tt.claims != nil {
+				token = token.WithExtra(map[string]any{"id_token": raw})
+			}
+
+			tt.args.client = s.Client(context.Background(), token)
+
+			got, err := s.UserInfo(context.Background(), tt.args.client, token)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("UserInfo() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+
+			require.EqualValues(t, tt.want, got)
+		})
+	}
+}
+
+func TestSocialAzureAD_SkipOrgRole(t *testing.T) {
+	type fields struct {
+		SocialBase  *SocialBase
+		providerCfg *social.OAuthInfo
+		cfg         *setting.Cfg
+	}
+
+	tests := []struct {
+		name                     string
+		fields                   fields
+		claims                   *azureClaims
+		settingAutoAssignOrgRole string
+		want                     *social.BasicUserInfo
+		wantErr                  bool
+	}{
+		{
+			name: "Grafana Admin and Editor roles in claim, skipOrgRoleSync disabled should get roles, skipOrgRoleSyncBase disabled",
+			fields: fields{
+				providerCfg: &social.OAuthInfo{
+					Name:                    "azuread",
+					ClientId:                "client-id-example",
+					AllowAssignGrafanaAdmin: true,
+					SkipOrgRoleSync:         false,
+				},
+				cfg: &setting.Cfg{
+					AutoAssignOrgRole: "",
+				},
+			},
+			claims: &azureClaims{
+				Email:             "me@example.com",
+				PreferredUsername: "",
+				Roles:             []string{"GrafanaAdmin", "Editor"},
+				Name:              "My Name",
+				ID:                "1234",
+			},
+			want: &social.BasicUserInfo{
+				Id:             "1234",
+				Name:           "My Name",
+				Email:          "me@example.com",
+				Login:          "me@example.com",
+				Role:           "Admin",
+				IsGrafanaAdmin: trueBoolPtr(),
+				Groups:         []string{},
+			},
+		},
+		{
+			name: "Grafana Admin and Editor roles in claim, skipOrgRoleSync disabled should not get roles",
+			fields: fields{
+				providerCfg: &social.OAuthInfo{
+					Name:                    "azuread",
+					ClientId:                "client-id-example",
+					AllowAssignGrafanaAdmin: true,
+					SkipOrgRoleSync:         false,
+				},
+				cfg: &setting.Cfg{
+					AutoAssignOrgRole: "",
+				},
+			},
+			claims: &azureClaims{
+				Email:             "me@example.com",
+				PreferredUsername: "",
+				Roles:             []string{"GrafanaAdmin", "Editor"},
+				Name:              "My Name",
+				ID:                "1234",
+			},
+			want: &social.BasicUserInfo{
+				Id:             "1234",
+				Name:           "My Name",
+				Email:          "me@example.com",
+				Login:          "me@example.com",
+				Role:           "Admin",
+				IsGrafanaAdmin: trueBoolPtr(),
+				Groups:         []string{},
+			},
+		},
+	}
+
+	privateKey, err := rsa.GenerateKey(rand.Reader, 2048)
+	require.NoError(t, err)
+
+	// Instantiate a signer using RSASSA-PSS (SHA256) with the given private key.
+	sig, err := jose.NewSigner(jose.SigningKey{Algorithm: jose.PS256, Key: privateKey}, (&jose.SignerOptions{
+		ExtraHeaders: map[jose.HeaderKey]any{"kid": "1"},
+	}).WithType("JWT"))
+	require.NoError(t, err)
+
+	// generate JWKS
+	jwks := &jose.JSONWebKeySet{
+		Keys: []jose.JSONWebKey{
+			{
+				Key:       privateKey.Public(),
+				KeyID:     "1",
+				Algorithm: string(jose.PS256),
+				Use:       "sig",
+			},
+		},
+	}
+
+	authURL := "https://login.microsoftonline.com/1234/oauth2/v2.0/authorize"
+	cache := remotecache.NewFakeCacheStorage()
+	// put JWKS in cache
+	jwksDump, err := json.Marshal(jwks)
+	require.NoError(t, err)
+
+	err = cache.Set(context.Background(), azureCacheKeyPrefix+"client-id-example", jwksDump, 0)
+	require.NoError(t, err)
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			s := NewAzureADProvider(tt.fields.providerCfg, tt.fields.cfg, &ssosettingstests.MockService{}, featuremgmt.WithFeatures(), cache)
+
+			s.SocialBase.Endpoint.AuthURL = authURL
+
+			cl := jwt.Claims{
+				Subject:   "subject",
+				Issuer:    "issuer",
+				NotBefore: jwt.NewNumericDate(time.Date(2016, 1, 1, 0, 0, 0, 0, time.UTC)),
+				Audience:  jwt.Audience{"leela", "fry"},
+			}
+
+			var raw string
+			if tt.claims != nil {
+				tt.claims.Audience = "client-id-example"
+				if tt.claims.ClaimNames.Groups != "" {
+					server := httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
+						tokenParts := strings.Split(request.Header.Get("Authorization"), " ")
+						require.Len(t, tokenParts, 2)
+						require.Equal(t, "fake_token", tokenParts[1])
+
+						writer.WriteHeader(http.StatusOK)
+
+						type response struct {
+							Value []string
+						}
+						res := response{Value: []string{"from_server"}}
+						require.NoError(t, json.NewEncoder(writer).Encode(&res))
+					}))
+					// need to set the fake servers url as endpoint to capture request
+					tt.claims.ClaimSources = map[string]claimSource{
+						tt.claims.ClaimNames.Groups: {Endpoint: server.URL},
+					}
+				}
+				raw, err = jwt.Signed(sig).Claims(cl).Claims(tt.claims).CompactSerialize()
+				require.NoError(t, err)
+			} else {
+				raw, err = jwt.Signed(sig).Claims(cl).CompactSerialize()
+				require.NoError(t, err)
+			}
+
+			token := &oauth2.Token{
+				AccessToken: "fake_token",
+			}
+			if tt.claims != nil {
+				token = token.WithExtra(map[string]any{"id_token": raw})
+			}
+
+			provClient := s.Client(context.Background(), token)
+
+			got, err := s.UserInfo(context.Background(), provClient, token)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("UserInfo() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+
+			require.EqualValues(t, tt.want, got)
+		})
+	}
+}
+
+func TestSocialAzureAD_InitializeExtraFields(t *testing.T) {
+	type settingFields struct {
+		forceUseGraphAPI     bool
+		allowedOrganizations []string
+	}
+	testCases := []struct {
+		name     string
+		settings *social.OAuthInfo
+		want     settingFields
+	}{
+		{
+			name: "forceUseGraphAPI is set to true",
+			settings: &social.OAuthInfo{
+				Extra: map[string]string{
+					"force_use_graph_api": "true",
+				},
+			},
+			want: settingFields{
+				forceUseGraphAPI:     true,
+				allowedOrganizations: []string{},
+			},
+		},
+		{
+			name: "allowedOrganizations is set",
+			settings: &social.OAuthInfo{
+				Extra: map[string]string{
+					"allowed_organizations": "uuid-1234,uuid-5678",
+				},
+			},
+			want: settingFields{
+				forceUseGraphAPI:     false,
+				allowedOrganizations: []string{"uuid-1234", "uuid-5678"},
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := NewAzureADProvider(tc.settings, &setting.Cfg{}, &ssosettingstests.MockService{}, featuremgmt.WithFeatures(), nil)
+
+			require.Equal(t, tc.want.forceUseGraphAPI, s.forceUseGraphAPI)
+			require.Equal(t, tc.want.allowedOrganizations, s.allowedOrganizations)
+		})
+	}
+}
+
+func TestSocialAzureAD_Validate(t *testing.T) {
+	testCases := []struct {
+		name      string
+		settings  ssoModels.SSOSettings
+		requester identity.Requester
+		wantErr   error
+	}{
+		{
+			name: "SSOSettings is valid",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":                  "client-id",
+					"allowed_groups":             "0bb9c9cc-4945-418f-9b6a-c1d3b81141b0, 6034d328-0e6a-4240-8d03-cb9f2c1f16e4",
+					"allow_assign_grafana_admin": "true",
+					"auth_url":                   "https://example.com/auth",
+					"token_url":                  "https://example.com/token",
+				},
+			},
+			requester: &user.SignedInUser{IsGrafanaAdmin: true},
+		},
+		{
+			name: "fails if settings map contains an invalid field",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":     "client-id",
+					"invalid_field": []int{1, 2, 3},
+				},
+			},
+			wantErr: ssosettings.ErrInvalidSettings,
+		},
+		{
+			name: "fails if client id is empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if client id does not exist",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if allowed groups are not uuids",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":      "client-id",
+					"allowed_groups": "abc, def",
+					"auth_url":       "https://example.com/auth",
+					"token_url":      "https://example.com/token",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if both allow assign grafana admin and skip org role sync are enabled",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":                  "client-id",
+					"allow_assign_grafana_admin": "true",
+					"skip_org_role_sync":         "true",
+					"auth_url":                   "https://example.com/auth",
+					"token_url":                  "https://example.com/token",
+				},
+			},
+			requester: &user.SignedInUser{IsGrafanaAdmin: true},
+			wantErr:   ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if the user is not allowed to update allow assign grafana admin",
+			requester: &user.SignedInUser{
+				IsGrafanaAdmin: false,
+			},
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":                  "client-id",
+					"allow_assign_grafana_admin": "true",
+					"auth_url":                   "https://example.com/auth",
+					"token_url":                  "https://example.com/token",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if auth url is empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"auth_url":  "",
+					"token_url": "https://example.com/token",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if token url is empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"auth_url":  "https://example.com/auth",
+					"token_url": "",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if auth url is invalid",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"auth_url":  "invalid_url",
+					"token_url": "https://example.com/token",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if token url is invalid",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"auth_url":  "https://example.com/auth",
+					"token_url": "/path",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := NewAzureADProvider(&social.OAuthInfo{}, &setting.Cfg{}, &ssosettingstests.MockService{}, featuremgmt.WithFeatures(), nil)
+
+			if tc.requester == nil {
+				tc.requester = &user.SignedInUser{IsGrafanaAdmin: false}
+			}
+			err := s.Validate(context.Background(), tc.settings, tc.requester)
+			if tc.wantErr != nil {
+				require.ErrorIs(t, err, tc.wantErr)
+				return
+			}
+			require.NoError(t, err)
+		})
+	}
+}
+
+func TestSocialAzureAD_Reload(t *testing.T) {
+	testCases := []struct {
+		name           string
+		info           *social.OAuthInfo
+		settings       ssoModels.SSOSettings
+		expectError    bool
+		expectedInfo   *social.OAuthInfo
+		expectedConfig *oauth2.Config
+	}{
+		{
+			name: "SSO provider successfully updated",
+			info: &social.OAuthInfo{
+				ClientId:     "client-id",
+				ClientSecret: "client-secret",
+			},
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":     "new-client-id",
+					"client_secret": "new-client-secret",
+					"auth_url":      "some-new-url",
+				},
+			},
+			expectError: false,
+			expectedInfo: &social.OAuthInfo{
+				ClientId:     "new-client-id",
+				ClientSecret: "new-client-secret",
+				AuthUrl:      "some-new-url",
+			},
+			expectedConfig: &oauth2.Config{
+				ClientID:     "new-client-id",
+				ClientSecret: "new-client-secret",
+				Endpoint: oauth2.Endpoint{
+					AuthURL: "some-new-url",
+				},
+				RedirectURL: "/login/azuread",
+			},
+		},
+		{
+			name: "fails if settings contain invalid values",
+			info: &social.OAuthInfo{
+				ClientId:     "client-id",
+				ClientSecret: "client-secret",
+			},
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":     "new-client-id",
+					"client_secret": "new-client-secret",
+					"auth_url":      []string{"first", "second"},
+				},
+			},
+			expectError: true,
+			expectedInfo: &social.OAuthInfo{
+				ClientId:     "client-id",
+				ClientSecret: "client-secret",
+			},
+			expectedConfig: &oauth2.Config{
+				ClientID:     "client-id",
+				ClientSecret: "client-secret",
+				RedirectURL:  "/login/azuread",
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := NewAzureADProvider(tc.info, &setting.Cfg{}, &ssosettingstests.MockService{}, featuremgmt.WithFeatures(), nil)
+
+			err := s.Reload(context.Background(), tc.settings)
+			if tc.expectError {
+				require.Error(t, err)
+				return
+			}
+			require.NoError(t, err)
+
+			require.EqualValues(t, tc.expectedInfo, s.info)
+			require.EqualValues(t, tc.expectedConfig, s.Config)
+		})
+	}
+}
+
+func TestSocialAzureAD_Reload_ExtraFields(t *testing.T) {
+	testCases := []struct {
+		name                         string
+		settings                     ssoModels.SSOSettings
+		info                         *social.OAuthInfo
+		expectError                  bool
+		expectedInfo                 *social.OAuthInfo
+		expectedAllowedOrganizations []string
+		expectedForceUseGraphApi     bool
+	}{
+		{
+			name: "successfully reloads the settings",
+			info: &social.OAuthInfo{
+				ClientId:     "client-id",
+				ClientSecret: "client-secret",
+				Extra: map[string]string{
+					"allowed_organizations": "previous",
+					"force_use_graph_api":   "true",
+				},
+			},
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"allowed_organizations": "uuid-1234,uuid-5678",
+					"force_use_graph_api":   "false",
+				},
+			},
+			expectedInfo: &social.OAuthInfo{
+				ClientId:     "new-client-id",
+				ClientSecret: "new-client-secret",
+				Name:         "a-new-name",
+				Extra: map[string]string{
+					"allowed_organizations": "uuid-1234,uuid-5678",
+					"force_use_graph_api":   "false",
+				},
+			},
+			expectedAllowedOrganizations: []string{"uuid-1234", "uuid-5678"},
+			expectedForceUseGraphApi:     false,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := NewAzureADProvider(tc.info, setting.NewCfg(), &ssosettingstests.MockService{}, featuremgmt.WithFeatures(), remotecache.FakeCacheStorage{})
+
+			err := s.Reload(context.Background(), tc.settings)
+			require.NoError(t, err)
+
+			require.EqualValues(t, tc.expectedAllowedOrganizations, s.allowedOrganizations)
+			require.EqualValues(t, tc.expectedForceUseGraphApi, s.forceUseGraphAPI)
+		})
+	}
+}
diff --git a/pkg/login/social/connectors/common.go b/pkg/login/social/connectors/common.go
new file mode 100644
index 0000000000000..7e9d62a6c7696
--- /dev/null
+++ b/pkg/login/social/connectors/common.go
@@ -0,0 +1,203 @@
+package connectors
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"net/http"
+	"reflect"
+	"slices"
+	"strconv"
+	"strings"
+
+	"github.com/mitchellh/mapstructure"
+	"golang.org/x/oauth2"
+
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util"
+)
+
+type ExtraFieldType int
+
+const (
+	String ExtraFieldType = iota
+	Bool
+)
+
+type ExtraKeyInfo struct {
+	Type         ExtraFieldType
+	DefaultValue any
+}
+
+const (
+	// consider moving this to OAuthInfo
+	teamIdsKey = "team_ids"
+	// consider moving this to OAuthInfo
+	allowedOrganizationsKey = "allowed_organizations"
+)
+
+var (
+	errMissingGroupMembership = &SocialError{"user not a member of one of the required groups"}
+)
+
+type httpGetResponse struct {
+	Body    []byte
+	Headers http.Header
+}
+
+func (s *SocialBase) IsEmailAllowed(email string) bool {
+	s.reloadMutex.RLock()
+	defer s.reloadMutex.RUnlock()
+
+	return isEmailAllowed(email, s.info.AllowedDomains)
+}
+
+func (s *SocialBase) IsSignupAllowed() bool {
+	s.reloadMutex.RLock()
+	defer s.reloadMutex.RUnlock()
+
+	return s.info.AllowSignup
+}
+
+func isEmailAllowed(email string, allowedDomains []string) bool {
+	if len(allowedDomains) == 0 {
+		return true
+	}
+
+	valid := false
+	for _, domain := range allowedDomains {
+		emailSuffix := fmt.Sprintf("@%s", domain)
+		valid = valid || strings.HasSuffix(strings.ToLower(email), strings.ToLower(emailSuffix))
+	}
+
+	return valid
+}
+
+func (s *SocialBase) httpGet(ctx context.Context, client *http.Client, url string) (*httpGetResponse, error) {
+	req, errReq := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
+	if errReq != nil {
+		return nil, errReq
+	}
+
+	r, errDo := client.Do(req)
+	if errDo != nil {
+		return nil, errDo
+	}
+
+	defer func() {
+		if err := r.Body.Close(); err != nil {
+			s.log.Warn("Failed to close response body", "err", err)
+		}
+	}()
+
+	body, errRead := io.ReadAll(r.Body)
+	if errRead != nil {
+		return nil, errRead
+	}
+
+	response := &httpGetResponse{body, r.Header}
+
+	if r.StatusCode >= 300 {
+		return nil, fmt.Errorf("unsuccessful response status code %d: %s", r.StatusCode, string(response.Body))
+	}
+
+	s.log.Debug("HTTP GET", "url", url, "status", r.Status, "response_body", string(response.Body))
+
+	return response, nil
+}
+
+func createOAuthConfig(info *social.OAuthInfo, cfg *setting.Cfg, defaultName string) *oauth2.Config {
+	var authStyle oauth2.AuthStyle
+	switch strings.ToLower(info.AuthStyle) {
+	case "inparams":
+		authStyle = oauth2.AuthStyleInParams
+	case "inheader":
+		authStyle = oauth2.AuthStyleInHeader
+	default:
+		authStyle = oauth2.AuthStyleAutoDetect
+	}
+
+	config := oauth2.Config{
+		ClientID:     info.ClientId,
+		ClientSecret: info.ClientSecret,
+		Endpoint: oauth2.Endpoint{
+			AuthURL:   info.AuthUrl,
+			TokenURL:  info.TokenUrl,
+			AuthStyle: authStyle,
+		},
+		RedirectURL: strings.TrimSuffix(cfg.AppURL, "/") + social.SocialBaseUrl + defaultName,
+		Scopes:      info.Scopes,
+	}
+
+	return &config
+}
+
+func MustBool(value any, defaultValue bool) bool {
+	if value == nil {
+		return defaultValue
+	}
+
+	str, ok := value.(string)
+	if ok {
+		result, err := strconv.ParseBool(str)
+		if err != nil {
+			return defaultValue
+		}
+		return result
+	}
+
+	result, ok := value.(bool)
+	if !ok {
+		return defaultValue
+	}
+
+	return result
+}
+
+// CreateOAuthInfoFromKeyValues creates an OAuthInfo struct from a map[string]any using mapstructure
+// it puts all extra key values into OAuthInfo's Extra map
+func CreateOAuthInfoFromKeyValues(settingsKV map[string]any) (*social.OAuthInfo, error) {
+	emptyStrToSliceDecodeHook := func(from reflect.Type, to reflect.Type, data any) (any, error) {
+		if from.Kind() == reflect.String && to.Kind() == reflect.Slice {
+			strData, ok := data.(string)
+			if !ok {
+				return nil, fmt.Errorf("failed to convert %v to string", data)
+			}
+
+			if strData == "" {
+				return []string{}, nil
+			}
+			return util.SplitString(strData), nil
+		}
+		return data, nil
+	}
+
+	var oauthInfo social.OAuthInfo
+	decoder, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{
+		DecodeHook:       emptyStrToSliceDecodeHook,
+		Result:           &oauthInfo,
+		WeaklyTypedInput: true,
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	err = decoder.Decode(settingsKV)
+	if err != nil {
+		return nil, err
+	}
+
+	if oauthInfo.EmptyScopes {
+		oauthInfo.Scopes = []string{}
+	}
+
+	return &oauthInfo, err
+}
+
+func appendUniqueScope(config *oauth2.Config, scope string) {
+	if !slices.Contains(config.Scopes, scope) {
+		config.Scopes = append(config.Scopes, scope)
+	}
+}
diff --git a/pkg/login/social/connectors/errors.go b/pkg/login/social/connectors/errors.go
new file mode 100644
index 0000000000000..0673d0547de07
--- /dev/null
+++ b/pkg/login/social/connectors/errors.go
@@ -0,0 +1,30 @@
+package connectors
+
+import (
+	"errors"
+
+	"github.com/grafana/grafana/pkg/util/errutil"
+)
+
+var (
+	ErrIDTokenNotFound = errors.New("id_token not found")
+	ErrEmailNotFound   = errors.New("error getting user info: no email found in access token")
+
+	errRoleAttributePathNotSet = errutil.BadRequest("oauth.role_attribute_path_not_set",
+		errutil.WithPublicMessage("Instance role_attribute_path misconfigured, please contact your administrator"))
+
+	errRoleAttributeStrictViolation = errutil.BadRequest("oauth.role_attribute_strict_violation",
+		errutil.WithPublicMessage("IdP did not return a role attribute, please contact your administrator"))
+
+	errInvalidRole = errutil.BadRequest("oauth.invalid_role",
+		errutil.WithPublicMessage("IdP did not return a valid role attribute, please contact your administrator"))
+)
+
+// SocialError is a custom error type for social connectors to provide a public message when the connector expectaions are not met.
+type SocialError struct {
+	s string
+}
+
+func (e SocialError) Error() string {
+	return e.s
+}
diff --git a/pkg/login/social/connectors/generic_oauth.go b/pkg/login/social/connectors/generic_oauth.go
new file mode 100644
index 0000000000000..c76e64d8a0190
--- /dev/null
+++ b/pkg/login/social/connectors/generic_oauth.go
@@ -0,0 +1,620 @@
+package connectors
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net/http"
+	"net/mail"
+	"strconv"
+
+	"golang.org/x/oauth2"
+
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	ssoModels "github.com/grafana/grafana/pkg/services/ssosettings/models"
+	"github.com/grafana/grafana/pkg/services/ssosettings/validation"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util"
+)
+
+const (
+	nameAttributePathKey    = "name_attribute_path"
+	loginAttributePathKey   = "login_attribute_path"
+	idTokenAttributeNameKey = "id_token_attribute_name" // #nosec G101 not a hardcoded credential
+)
+
+var ExtraGenericOAuthSettingKeys = map[string]ExtraKeyInfo{
+	nameAttributePathKey:    {Type: String},
+	loginAttributePathKey:   {Type: String},
+	idTokenAttributeNameKey: {Type: String},
+	teamIdsKey:              {Type: String},
+	allowedOrganizationsKey: {Type: String},
+}
+
+var _ social.SocialConnector = (*SocialGenericOAuth)(nil)
+var _ ssosettings.Reloadable = (*SocialGenericOAuth)(nil)
+
+type SocialGenericOAuth struct {
+	*SocialBase
+	allowedOrganizations []string
+	teamsUrl             string
+	emailAttributeName   string
+	emailAttributePath   string
+	loginAttributePath   string
+	nameAttributePath    string
+	groupsAttributePath  string
+	idTokenAttributeName string
+	teamIdsAttributePath string
+	teamIds              []string
+}
+
+func NewGenericOAuthProvider(info *social.OAuthInfo, cfg *setting.Cfg, ssoSettings ssosettings.Service, features featuremgmt.FeatureToggles) *SocialGenericOAuth {
+	provider := &SocialGenericOAuth{
+		SocialBase:           newSocialBase(social.GenericOAuthProviderName, info, features, cfg),
+		teamsUrl:             info.TeamsUrl,
+		emailAttributeName:   info.EmailAttributeName,
+		emailAttributePath:   info.EmailAttributePath,
+		nameAttributePath:    info.Extra[nameAttributePathKey],
+		groupsAttributePath:  info.GroupsAttributePath,
+		loginAttributePath:   info.Extra[loginAttributePathKey],
+		idTokenAttributeName: info.Extra[idTokenAttributeNameKey],
+		teamIdsAttributePath: info.TeamIdsAttributePath,
+		teamIds:              util.SplitString(info.Extra[teamIdsKey]),
+		allowedOrganizations: util.SplitString(info.Extra[allowedOrganizationsKey]),
+	}
+
+	if features.IsEnabledGlobally(featuremgmt.FlagSsoSettingsApi) {
+		ssoSettings.RegisterReloadable(social.GenericOAuthProviderName, provider)
+	}
+
+	return provider
+}
+
+func (s *SocialGenericOAuth) Validate(ctx context.Context, settings ssoModels.SSOSettings, requester identity.Requester) error {
+	info, err := CreateOAuthInfoFromKeyValues(settings.Settings)
+	if err != nil {
+		return ssosettings.ErrInvalidSettings.Errorf("SSO settings map cannot be converted to OAuthInfo: %v", err)
+	}
+
+	err = validateInfo(info, requester)
+	if err != nil {
+		return err
+	}
+
+	err = validation.Validate(info, requester,
+		validation.UrlValidator(info.AuthUrl, "Auth URL"),
+		validation.UrlValidator(info.TokenUrl, "Token URL"),
+		validateTeamsUrlWhenNotEmpty)
+
+	if err != nil {
+		return err
+	}
+
+	if info.Extra[teamIdsKey] != "" && (info.TeamIdsAttributePath == "" || info.TeamsUrl == "") {
+		return ssosettings.ErrInvalidOAuthConfig("If Team Ids are configured then Team Ids attribute path and Teams URL must be configured.")
+	}
+
+	if info.AllowedGroups != nil && len(info.AllowedGroups) > 0 && info.GroupsAttributePath == "" {
+		return ssosettings.ErrInvalidOAuthConfig("If Allowed groups is configured then Groups attribute path must be configured.")
+	}
+
+	return nil
+}
+
+func validateTeamsUrlWhenNotEmpty(info *social.OAuthInfo, requester identity.Requester) error {
+	if info.TeamsUrl == "" {
+		return nil
+	}
+	return validation.UrlValidator(info.TeamsUrl, "Teams URL")(info, requester)
+}
+
+func (s *SocialGenericOAuth) Reload(ctx context.Context, settings ssoModels.SSOSettings) error {
+	newInfo, err := CreateOAuthInfoFromKeyValues(settings.Settings)
+	if err != nil {
+		return ssosettings.ErrInvalidSettings.Errorf("SSO settings map cannot be converted to OAuthInfo: %v", err)
+	}
+
+	s.reloadMutex.Lock()
+	defer s.reloadMutex.Unlock()
+
+	s.updateInfo(social.GenericOAuthProviderName, newInfo)
+
+	s.teamsUrl = newInfo.TeamsUrl
+	s.emailAttributeName = newInfo.EmailAttributeName
+	s.emailAttributePath = newInfo.EmailAttributePath
+	s.nameAttributePath = newInfo.Extra[nameAttributePathKey]
+	s.groupsAttributePath = newInfo.GroupsAttributePath
+	s.loginAttributePath = newInfo.Extra[loginAttributePathKey]
+	s.idTokenAttributeName = newInfo.Extra[idTokenAttributeNameKey]
+	s.teamIdsAttributePath = newInfo.TeamIdsAttributePath
+	s.teamIds = util.SplitString(newInfo.Extra[teamIdsKey])
+	s.allowedOrganizations = util.SplitString(newInfo.Extra[allowedOrganizationsKey])
+
+	return nil
+}
+
+// TODOD: remove this in the next PR and use the isGroupMember from social.go
+func (s *SocialGenericOAuth) isGroupMember(groups []string) bool {
+	if len(s.info.AllowedGroups) == 0 {
+		return true
+	}
+
+	for _, allowedGroup := range s.info.AllowedGroups {
+		for _, group := range groups {
+			if group == allowedGroup {
+				return true
+			}
+		}
+	}
+
+	return false
+}
+
+func (s *SocialGenericOAuth) isTeamMember(ctx context.Context, client *http.Client) bool {
+	if len(s.teamIds) == 0 {
+		return true
+	}
+
+	teamMemberships, err := s.fetchTeamMemberships(ctx, client)
+	if err != nil {
+		return false
+	}
+
+	for _, teamId := range s.teamIds {
+		for _, membershipId := range teamMemberships {
+			if teamId == membershipId {
+				return true
+			}
+		}
+	}
+
+	return false
+}
+
+func (s *SocialGenericOAuth) isOrganizationMember(ctx context.Context, client *http.Client) bool {
+	if len(s.allowedOrganizations) == 0 {
+		return true
+	}
+
+	organizations, ok := s.fetchOrganizations(ctx, client)
+	if !ok {
+		return false
+	}
+
+	for _, allowedOrganization := range s.allowedOrganizations {
+		for _, organization := range organizations {
+			if organization == allowedOrganization {
+				return true
+			}
+		}
+	}
+
+	return false
+}
+
+type UserInfoJson struct {
+	Sub         string              `json:"sub"`
+	Name        string              `json:"name"`
+	DisplayName string              `json:"display_name"`
+	Login       string              `json:"login"`
+	Username    string              `json:"username"`
+	Email       string              `json:"email"`
+	Upn         string              `json:"upn"`
+	Attributes  map[string][]string `json:"attributes"`
+	rawJSON     []byte
+	source      string
+}
+
+func (info *UserInfoJson) String() string {
+	return fmt.Sprintf(
+		"Name: %s, Displayname: %s, Login: %s, Username: %s, Email: %s, Upn: %s, Attributes: %v",
+		info.Name, info.DisplayName, info.Login, info.Username, info.Email, info.Upn, info.Attributes)
+}
+
+func (s *SocialGenericOAuth) UserInfo(ctx context.Context, client *http.Client, token *oauth2.Token) (*social.BasicUserInfo, error) {
+	s.reloadMutex.RLock()
+	defer s.reloadMutex.RUnlock()
+
+	s.log.Debug("Getting user info")
+	toCheck := make([]*UserInfoJson, 0, 2)
+
+	if tokenData := s.extractFromToken(token); tokenData != nil {
+		toCheck = append(toCheck, tokenData)
+	}
+	if apiData := s.extractFromAPI(ctx, client); apiData != nil {
+		toCheck = append(toCheck, apiData)
+	}
+
+	userInfo := &social.BasicUserInfo{}
+	for _, data := range toCheck {
+		s.log.Debug("Processing external user info", "source", data.source, "data", data)
+
+		if userInfo.Id == "" {
+			userInfo.Id = data.Sub
+		}
+
+		if userInfo.Name == "" {
+			userInfo.Name = s.extractUserName(data)
+		}
+
+		if userInfo.Login == "" {
+			userInfo.Login = s.extractLogin(data)
+		}
+
+		if userInfo.Email == "" {
+			userInfo.Email = s.extractEmail(data)
+			if userInfo.Email != "" {
+				s.log.Debug("Set user info email from extracted email", "email", userInfo.Email)
+			}
+		}
+
+		if userInfo.Role == "" && !s.info.SkipOrgRoleSync {
+			role, grafanaAdmin, err := s.extractRoleAndAdminOptional(data.rawJSON, []string{})
+			if err != nil {
+				s.log.Warn("Failed to extract role", "err", err)
+			} else {
+				userInfo.Role = role
+				if s.info.AllowAssignGrafanaAdmin {
+					userInfo.IsGrafanaAdmin = &grafanaAdmin
+				}
+			}
+		}
+
+		if len(userInfo.Groups) == 0 {
+			groups, err := s.extractGroups(data)
+			if err != nil {
+				s.log.Warn("Failed to extract groups", "err", err)
+			} else if len(groups) > 0 {
+				s.log.Debug("Setting user info groups from extracted groups")
+				userInfo.Groups = groups
+			}
+		}
+	}
+
+	if userInfo.Role == "" && !s.info.SkipOrgRoleSync {
+		if s.info.RoleAttributeStrict {
+			return nil, errRoleAttributeStrictViolation.Errorf("idP did not return a role attribute")
+		}
+		userInfo.Role = s.defaultRole()
+	}
+
+	if s.info.AllowAssignGrafanaAdmin && s.info.SkipOrgRoleSync {
+		s.log.Debug("AllowAssignGrafanaAdmin and skipOrgRoleSync are both set, Grafana Admin role will not be synced, consider setting one or the other")
+	}
+
+	if userInfo.Email == "" {
+		var err error
+		userInfo.Email, err = s.fetchPrivateEmail(ctx, client)
+		if err != nil {
+			return nil, err
+		}
+		s.log.Debug("Setting email from fetched private email", "email", userInfo.Email)
+	}
+
+	if userInfo.Login == "" {
+		s.log.Debug("Defaulting to using email for user info login", "email", userInfo.Email)
+		userInfo.Login = userInfo.Email
+	}
+
+	if !s.isTeamMember(ctx, client) {
+		return nil, errors.New("user not a member of one of the required teams")
+	}
+
+	if !s.isOrganizationMember(ctx, client) {
+		return nil, errors.New("user not a member of one of the required organizations")
+	}
+
+	if !s.isGroupMember(userInfo.Groups) {
+		return nil, errMissingGroupMembership
+	}
+
+	s.log.Debug("User info result", "result", userInfo)
+	return userInfo, nil
+}
+
+func (s *SocialGenericOAuth) extractFromToken(token *oauth2.Token) *UserInfoJson {
+	s.log.Debug("Extracting user info from OAuth token")
+
+	idTokenAttribute := "id_token"
+	if s.idTokenAttributeName != "" {
+		idTokenAttribute = s.idTokenAttributeName
+		s.log.Debug("Using custom id_token attribute name", "attribute_name", idTokenAttribute)
+	}
+
+	idToken := token.Extra(idTokenAttribute)
+	if idToken == nil {
+		s.log.Debug("No id_token found", "token", token)
+		return nil
+	}
+
+	rawJSON, err := s.retrieveRawIDToken(idToken)
+	if err != nil {
+		s.log.Warn("Error retrieving id_token", "error", err, "token", fmt.Sprintf("%+v", token))
+		return nil
+	}
+
+	var data UserInfoJson
+	if err := json.Unmarshal(rawJSON, &data); err != nil {
+		s.log.Error("Error decoding id_token JSON", "raw_json", string(rawJSON), "error", err)
+		return nil
+	}
+
+	data.rawJSON = rawJSON
+	data.source = "token"
+	s.log.Debug("Received id_token", "raw_json", string(data.rawJSON), "data", data.String())
+	return &data
+}
+
+func (s *SocialGenericOAuth) extractFromAPI(ctx context.Context, client *http.Client) *UserInfoJson {
+	s.log.Debug("Getting user info from API")
+	if s.info.ApiUrl == "" {
+		s.log.Debug("No api url configured")
+		return nil
+	}
+
+	rawUserInfoResponse, err := s.httpGet(ctx, client, s.info.ApiUrl)
+	if err != nil {
+		s.log.Debug("Error getting user info from API", "url", s.info.ApiUrl, "error", err)
+		return nil
+	}
+
+	rawJSON := rawUserInfoResponse.Body
+
+	var data UserInfoJson
+	if err := json.Unmarshal(rawJSON, &data); err != nil {
+		s.log.Error("Error decoding user info response", "raw_json", rawJSON, "error", err)
+		return nil
+	}
+
+	data.rawJSON = rawJSON
+	data.source = "API"
+	s.log.Debug("Received user info response from API", "raw_json", string(rawJSON), "data", data.String())
+	return &data
+}
+
+func (s *SocialGenericOAuth) extractEmail(data *UserInfoJson) string {
+	if data.Email != "" {
+		return data.Email
+	}
+
+	if s.emailAttributePath != "" {
+		email, err := util.SearchJSONForStringAttr(s.emailAttributePath, data.rawJSON)
+		if err != nil {
+			s.log.Error("Failed to search JSON for attribute", "error", err)
+		} else if email != "" {
+			return email
+		}
+	}
+
+	emails, ok := data.Attributes[s.emailAttributeName]
+	if ok && len(emails) != 0 {
+		return emails[0]
+	}
+
+	if data.Upn != "" {
+		emailAddr, emailErr := mail.ParseAddress(data.Upn)
+		if emailErr == nil {
+			return emailAddr.Address
+		}
+		s.log.Debug("Failed to parse e-mail address", "error", emailErr.Error())
+	}
+
+	return ""
+}
+
+func (s *SocialGenericOAuth) extractLogin(data *UserInfoJson) string {
+	if data.Login != "" {
+		s.log.Debug("Setting user info login from login field", "login", data.Login)
+		return data.Login
+	}
+
+	if s.loginAttributePath != "" {
+		s.log.Debug("Searching for login among JSON", "loginAttributePath", s.loginAttributePath)
+		login, err := util.SearchJSONForStringAttr(s.loginAttributePath, data.rawJSON)
+		if err != nil {
+			s.log.Error("Failed to search JSON for login attribute", "error", err)
+		}
+
+		if login != "" {
+			return login
+		}
+	}
+
+	if data.Username != "" {
+		s.log.Debug("Setting user info login from username field", "username", data.Username)
+		return data.Username
+	}
+
+	return ""
+}
+
+func (s *SocialGenericOAuth) extractUserName(data *UserInfoJson) string {
+	if s.nameAttributePath != "" {
+		name, err := util.SearchJSONForStringAttr(s.nameAttributePath, data.rawJSON)
+		if err != nil {
+			s.log.Error("Failed to search JSON for attribute", "error", err)
+		} else if name != "" {
+			s.log.Debug("Setting user info name from nameAttributePath", "nameAttributePath", s.nameAttributePath)
+			return name
+		}
+	}
+
+	if data.Name != "" {
+		s.log.Debug("Setting user info name from name field")
+		return data.Name
+	}
+
+	if data.DisplayName != "" {
+		s.log.Debug("Setting user info name from display name field")
+		return data.DisplayName
+	}
+
+	s.log.Debug("Unable to find user info name")
+	return ""
+}
+
+func (s *SocialGenericOAuth) extractGroups(data *UserInfoJson) ([]string, error) {
+	if s.groupsAttributePath == "" {
+		return []string{}, nil
+	}
+
+	return util.SearchJSONForStringSliceAttr(s.groupsAttributePath, data.rawJSON)
+}
+
+func (s *SocialGenericOAuth) fetchPrivateEmail(ctx context.Context, client *http.Client) (string, error) {
+	type Record struct {
+		Email       string `json:"email"`
+		Primary     bool   `json:"primary"`
+		IsPrimary   bool   `json:"is_primary"`
+		Verified    bool   `json:"verified"`
+		IsConfirmed bool   `json:"is_confirmed"`
+	}
+
+	response, err := s.httpGet(ctx, client, fmt.Sprintf(s.info.ApiUrl+"/emails"))
+	if err != nil {
+		s.log.Error("Error getting email address", "url", s.info.ApiUrl+"/emails", "error", err)
+		return "", fmt.Errorf("%v: %w", "Error getting email address", err)
+	}
+
+	var records []Record
+
+	err = json.Unmarshal(response.Body, &records)
+	if err != nil {
+		var data struct {
+			Values []Record `json:"values"`
+		}
+
+		err = json.Unmarshal(response.Body, &data)
+		if err != nil {
+			s.log.Error("Error decoding email addresses response", "raw_json", string(response.Body), "error", err)
+			return "", fmt.Errorf("%v: %w", "Error decoding email addresses response", err)
+		}
+
+		records = data.Values
+	}
+
+	s.log.Debug("Received email addresses", "emails", records)
+
+	var email = ""
+	for _, record := range records {
+		if record.Primary || record.IsPrimary {
+			email = record.Email
+			break
+		}
+	}
+
+	s.log.Debug("Using email address", "email", email)
+
+	return email, nil
+}
+
+func (s *SocialGenericOAuth) fetchTeamMemberships(ctx context.Context, client *http.Client) ([]string, error) {
+	var err error
+	var ids []string
+
+	if s.teamsUrl == "" {
+		ids, err = s.fetchTeamMembershipsFromDeprecatedTeamsUrl(ctx, client)
+	} else {
+		ids, err = s.fetchTeamMembershipsFromTeamsUrl(ctx, client)
+	}
+
+	if err == nil {
+		s.log.Debug("Received team memberships", "ids", ids)
+	}
+
+	return ids, err
+}
+
+func (s *SocialGenericOAuth) fetchTeamMembershipsFromDeprecatedTeamsUrl(ctx context.Context, client *http.Client) ([]string, error) {
+	var ids []string
+
+	type Record struct {
+		Id int `json:"id"`
+	}
+
+	response, err := s.httpGet(ctx, client, fmt.Sprintf(s.info.ApiUrl+"/teams"))
+	if err != nil {
+		s.log.Error("Error getting team memberships", "url", s.info.ApiUrl+"/teams", "error", err)
+		return []string{}, err
+	}
+
+	var records []Record
+
+	err = json.Unmarshal(response.Body, &records)
+	if err != nil {
+		s.log.Error("Error decoding team memberships response", "raw_json", string(response.Body), "error", err)
+		return []string{}, err
+	}
+
+	ids = make([]string, len(records))
+	for i, record := range records {
+		ids[i] = strconv.Itoa(record.Id)
+	}
+
+	return ids, nil
+}
+
+func (s *SocialGenericOAuth) fetchTeamMembershipsFromTeamsUrl(ctx context.Context, client *http.Client) ([]string, error) {
+	if s.teamIdsAttributePath == "" {
+		return []string{}, nil
+	}
+
+	response, err := s.httpGet(ctx, client, fmt.Sprintf(s.teamsUrl))
+	if err != nil {
+		s.log.Error("Error getting team memberships", "url", s.teamsUrl, "error", err)
+		return nil, err
+	}
+
+	return util.SearchJSONForStringSliceAttr(s.teamIdsAttributePath, response.Body)
+}
+
+func (s *SocialGenericOAuth) fetchOrganizations(ctx context.Context, client *http.Client) ([]string, bool) {
+	type Record struct {
+		Login string `json:"login"`
+	}
+
+	response, err := s.httpGet(ctx, client, fmt.Sprintf(s.info.ApiUrl+"/orgs"))
+	if err != nil {
+		s.log.Error("Error getting organizations", "url", s.info.ApiUrl+"/orgs", "error", err)
+		return nil, false
+	}
+
+	var records []Record
+
+	err = json.Unmarshal(response.Body, &records)
+	if err != nil {
+		s.log.Error("Error decoding organization response", "response", string(response.Body), "error", err)
+		return nil, false
+	}
+
+	var logins = make([]string, len(records))
+	for i, record := range records {
+		logins[i] = record.Login
+	}
+
+	s.log.Debug("Received organizations", "logins", logins)
+
+	return logins, true
+}
+
+func (s *SocialGenericOAuth) SupportBundleContent(bf *bytes.Buffer) error {
+	s.reloadMutex.RLock()
+	defer s.reloadMutex.RUnlock()
+
+	bf.WriteString("## GenericOAuth specific configuration\n\n")
+	bf.WriteString("```ini\n")
+	bf.WriteString(fmt.Sprintf("name_attribute_path = %s\n", s.nameAttributePath))
+	bf.WriteString(fmt.Sprintf("login_attribute_path = %s\n", s.loginAttributePath))
+	bf.WriteString(fmt.Sprintf("id_token_attribute_name = %s\n", s.idTokenAttributeName))
+	bf.WriteString(fmt.Sprintf("team_ids_attribute_path = %s\n", s.teamIdsAttributePath))
+	bf.WriteString(fmt.Sprintf("team_ids = %v\n", s.teamIds))
+	bf.WriteString(fmt.Sprintf("allowed_organizations = %v\n", s.allowedOrganizations))
+	bf.WriteString("```\n\n")
+
+	return s.SocialBase.getBaseSupportBundleContent(bf)
+}
diff --git a/pkg/login/social/connectors/generic_oauth_test.go b/pkg/login/social/connectors/generic_oauth_test.go
new file mode 100644
index 0000000000000..a7b64d7f20e66
--- /dev/null
+++ b/pkg/login/social/connectors/generic_oauth_test.go
@@ -0,0 +1,1070 @@
+package connectors
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"golang.org/x/oauth2"
+
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	ssoModels "github.com/grafana/grafana/pkg/services/ssosettings/models"
+	"github.com/grafana/grafana/pkg/services/ssosettings/ssosettingstests"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+func TestUserInfoSearchesForEmailAndRole(t *testing.T) {
+	provider := NewGenericOAuthProvider(&social.OAuthInfo{
+		EmailAttributePath: "email",
+	}, &setting.Cfg{},
+		&ssosettingstests.MockService{},
+		featuremgmt.WithFeatures())
+
+	tests := []struct {
+		Name                    string
+		SkipOrgRoleSync         bool
+		AllowAssignGrafanaAdmin bool
+		ResponseBody            any
+		OAuth2Extra             any
+		RoleAttributePath       string
+		ExpectedEmail           string
+		ExpectedRole            org.RoleType
+		ExpectedError           error
+		ExpectedGrafanaAdmin    *bool
+	}{
+		{
+			Name: "Given a valid id_token, a valid role path, no API response, use id_token",
+			OAuth2Extra: map[string]any{
+				// { "role": "Admin", "email": "john.doe@example.com" }
+				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiQWRtaW4iLCJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIn0.9PtHcCaXxZa2HDlASyKIaFGfOKlw2ILQo32xlvhvhRg",
+			},
+			RoleAttributePath: "role",
+			ExpectedEmail:     "john.doe@example.com",
+			ExpectedRole:      "Admin",
+		},
+		{
+			Name: "Given a valid id_token, no role path, no API response, use id_token",
+			OAuth2Extra: map[string]any{
+				// { "email": "john.doe@example.com" }
+				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIn0.k5GwPcZvGe2BE_jgwN0ntz0nz4KlYhEd0hRRLApkTJ4",
+			},
+			RoleAttributePath: "",
+			ExpectedEmail:     "john.doe@example.com",
+			ExpectedRole:      "Viewer",
+		},
+		{
+			Name: "Given a valid id_token, an invalid role path, no API response, use id_token",
+			OAuth2Extra: map[string]any{
+				// { "role": "Admin", "email": "john.doe@example.com" }
+				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiQWRtaW4iLCJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIn0.9PtHcCaXxZa2HDlASyKIaFGfOKlw2ILQo32xlvhvhRg",
+			},
+			RoleAttributePath: "invalid_path",
+			ExpectedEmail:     "john.doe@example.com",
+			ExpectedRole:      "Viewer",
+		},
+		{
+			Name: "Given no id_token, a valid role path, a valid API response, use API response",
+			ResponseBody: map[string]any{
+				"role":  "Admin",
+				"email": "john.doe@example.com",
+			},
+			RoleAttributePath: "role",
+			ExpectedEmail:     "john.doe@example.com",
+			ExpectedRole:      "Admin",
+		},
+		{
+			Name: "Given no id_token, no role path, a valid API response, use API response",
+			ResponseBody: map[string]any{
+				"email": "john.doe@example.com",
+			},
+			RoleAttributePath: "",
+			ExpectedEmail:     "john.doe@example.com",
+			ExpectedRole:      "Viewer",
+		},
+		{
+			Name: "Given no id_token, a role path, a valid API response without a role, use API response",
+			ResponseBody: map[string]any{
+				"email": "john.doe@example.com",
+			},
+			RoleAttributePath: "role",
+			ExpectedEmail:     "john.doe@example.com",
+			ExpectedRole:      "Viewer",
+		},
+		{
+			Name:              "Given no id_token, a valid role path, no API response, no data",
+			RoleAttributePath: "role",
+			ExpectedEmail:     "",
+			ExpectedRole:      "Viewer",
+		},
+		{
+			Name: "Given a valid id_token, a valid role path, a valid API response, prefer id_token",
+			OAuth2Extra: map[string]any{
+				// { "role": "Admin", "email": "john.doe@example.com" }
+				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiQWRtaW4iLCJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIn0.9PtHcCaXxZa2HDlASyKIaFGfOKlw2ILQo32xlvhvhRg",
+			},
+			ResponseBody: map[string]any{
+				"role":  "FromResponse",
+				"email": "from_response@example.com",
+			},
+			RoleAttributePath: "role",
+			ExpectedEmail:     "john.doe@example.com",
+			ExpectedRole:      "Admin",
+		},
+		{
+			Name:                    "Given a valid id_token and AssignGrafanaAdmin is unchecked, don't grant Server Admin",
+			AllowAssignGrafanaAdmin: false,
+			OAuth2Extra: map[string]any{
+				// { "role": "GrafanaAdmin", "email": "john.doe@example.com" }
+				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiR3JhZmFuYUFkbWluIiwiZW1haWwiOiJqb2huLmRvZUBleGFtcGxlLmNvbSJ9.cQqMJpVjwdtJ8qEZLOo9RKNbAFfpkQcpnRG0nopmWEI",
+			},
+			ResponseBody: map[string]any{
+				"role":  "FromResponse",
+				"email": "from_response@example.com",
+			},
+			RoleAttributePath:    "role",
+			ExpectedEmail:        "john.doe@example.com",
+			ExpectedRole:         "Admin",
+			ExpectedGrafanaAdmin: nil,
+		},
+		{
+			Name:                    "Given a valid id_token and AssignGrafanaAdmin is checked, grant Server Admin",
+			AllowAssignGrafanaAdmin: true,
+			OAuth2Extra: map[string]any{
+				// { "role": "GrafanaAdmin", "email": "john.doe@example.com" }
+				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiR3JhZmFuYUFkbWluIiwiZW1haWwiOiJqb2huLmRvZUBleGFtcGxlLmNvbSJ9.cQqMJpVjwdtJ8qEZLOo9RKNbAFfpkQcpnRG0nopmWEI",
+			},
+			ResponseBody: map[string]any{
+				"role":  "FromResponse",
+				"email": "from_response@example.com",
+			},
+			RoleAttributePath:    "role",
+			ExpectedEmail:        "john.doe@example.com",
+			ExpectedRole:         "Admin",
+			ExpectedGrafanaAdmin: trueBoolPtr(),
+		},
+		{
+			Name: "Given a valid id_token, an invalid role path, a valid API response, prefer id_token",
+			OAuth2Extra: map[string]any{
+				// { "role": "Admin", "email": "john.doe@example.com" }
+				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiQWRtaW4iLCJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIn0.9PtHcCaXxZa2HDlASyKIaFGfOKlw2ILQo32xlvhvhRg",
+			},
+			ResponseBody: map[string]any{
+				"role":  "FromResponse",
+				"email": "from_response@example.com",
+			},
+			RoleAttributePath: "invalid_path",
+			ExpectedEmail:     "john.doe@example.com",
+			ExpectedRole:      "Viewer",
+		},
+		{
+			Name: "Given a valid id_token with no email, a valid role path, a valid API response with no role, merge",
+			OAuth2Extra: map[string]any{
+				// { "role": "Admin" }
+				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiQWRtaW4ifQ.k5GwPcZvGe2BE_jgwN0ntz0nz4KlYhEd0hRRLApkTJ4",
+			},
+			ResponseBody: map[string]any{
+				"email": "from_response@example.com",
+			},
+			RoleAttributePath: "role",
+			ExpectedEmail:     "from_response@example.com",
+			ExpectedRole:      "Admin",
+		},
+		{
+			Name: "Given a valid id_token with no role, a valid role path, a valid API response with no email, merge",
+			OAuth2Extra: map[string]any{
+				// { "email": "john.doe@example.com" }
+				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIn0.k5GwPcZvGe2BE_jgwN0ntz0nz4KlYhEd0hRRLApkTJ4",
+			},
+			ResponseBody: map[string]any{
+				"role": "FromResponse",
+			},
+			RoleAttributePath: "role",
+			ExpectedEmail:     "john.doe@example.com",
+			ExpectedRole:      "Viewer",
+			ExpectedError:     nil,
+		},
+		{
+			Name: "Given a valid id_token, a valid advanced JMESPath role path, derive the role",
+			OAuth2Extra: map[string]any{
+				// { "email": "john.doe@example.com",
+				//   "info": { "roles": [ "dev", "engineering" ] }}
+				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIiwiaW5mbyI6eyJyb2xlcyI6WyJkZXYiLCJlbmdpbmVlcmluZyJdfX0.RmmQfv25eXb4p3wMrJsvXfGQ6EXhGtwRXo6SlCFHRNg",
+			},
+			RoleAttributePath: "contains(info.roles[*], 'dev') && 'Editor'",
+			ExpectedEmail:     "john.doe@example.com",
+			ExpectedRole:      "Editor",
+		},
+		{
+			Name: "Given a valid id_token without role info, a valid advanced JMESPath role path, a valid API response, derive the correct role using the userinfo API response (JMESPath warning on id_token)",
+			OAuth2Extra: map[string]any{
+				// { "email": "john.doe@example.com" }
+				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIn0.k5GwPcZvGe2BE_jgwN0ntz0nz4KlYhEd0hRRLApkTJ4",
+			},
+			ResponseBody: map[string]any{
+				"info": map[string]any{
+					"roles": []string{"engineering", "SRE"},
+				},
+			},
+			RoleAttributePath: "contains(info.roles[*], 'SRE') && 'Admin'",
+			ExpectedEmail:     "john.doe@example.com",
+			ExpectedRole:      "Admin",
+		},
+		{
+			Name: "Given a valid id_token, a valid advanced JMESPath role path, a valid API response, prefer ID token",
+			OAuth2Extra: map[string]any{
+				// { "email": "john.doe@example.com",
+				//   "info": { "roles": [ "dev", "engineering" ] }}
+				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIiwiaW5mbyI6eyJyb2xlcyI6WyJkZXYiLCJlbmdpbmVlcmluZyJdfX0.RmmQfv25eXb4p3wMrJsvXfGQ6EXhGtwRXo6SlCFHRNg",
+			},
+			ResponseBody: map[string]any{
+				"info": map[string]any{
+					"roles": []string{"engineering", "SRE"},
+				},
+			},
+			RoleAttributePath: "contains(info.roles[*], 'SRE') && 'Admin' || contains(info.roles[*], 'dev') && 'Editor' || 'Viewer'",
+			ExpectedEmail:     "john.doe@example.com",
+			ExpectedRole:      "Editor",
+		},
+		{
+			Name:            "Given skip org role sync set to true, with a valid id_token, a valid advanced JMESPath role path, a valid API response, no org role should be set",
+			SkipOrgRoleSync: true,
+			OAuth2Extra: map[string]any{
+				// { "email": "john.doe@example.com",
+				//   "info": { "roles": [ "dev", "engineering" ] }}
+				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIiwiaW5mbyI6eyJyb2xlcyI6WyJkZXYiLCJlbmdpbmVlcmluZyJdfX0.RmmQfv25eXb4p3wMrJsvXfGQ6EXhGtwRXo6SlCFHRNg",
+			},
+			ResponseBody: map[string]any{
+				"info": map[string]any{
+					"roles": []string{"engineering", "SRE"},
+				},
+			},
+			RoleAttributePath: "contains(info.roles[*], 'SRE') && 'Admin' || contains(info.roles[*], 'dev') && 'Editor' || 'Viewer'",
+			ExpectedEmail:     "john.doe@example.com",
+			ExpectedRole:      "",
+		},
+	}
+
+	for _, test := range tests {
+		provider.info.RoleAttributePath = test.RoleAttributePath
+		provider.info.AllowAssignGrafanaAdmin = test.AllowAssignGrafanaAdmin
+		provider.info.SkipOrgRoleSync = test.SkipOrgRoleSync
+
+		t.Run(test.Name, func(t *testing.T) {
+			body, err := json.Marshal(test.ResponseBody)
+			require.NoError(t, err)
+			ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusOK)
+				w.Header().Set("Content-Type", "application/json")
+				_, err = w.Write(body)
+				require.NoError(t, err)
+			}))
+			provider.info.ApiUrl = ts.URL
+			staticToken := oauth2.Token{
+				AccessToken:  "",
+				TokenType:    "",
+				RefreshToken: "",
+				Expiry:       time.Now(),
+			}
+
+			token := staticToken.WithExtra(test.OAuth2Extra)
+			actualResult, err := provider.UserInfo(context.Background(), ts.Client(), token)
+			if test.ExpectedError != nil {
+				require.ErrorIs(t, err, test.ExpectedError)
+				return
+			}
+			require.NoError(t, err)
+			require.Equal(t, test.ExpectedEmail, actualResult.Email)
+			require.Equal(t, test.ExpectedEmail, actualResult.Login)
+			require.Equal(t, test.ExpectedRole, actualResult.Role)
+			require.Equal(t, test.ExpectedGrafanaAdmin, actualResult.IsGrafanaAdmin)
+		})
+	}
+}
+
+func TestUserInfoSearchesForLogin(t *testing.T) {
+	t.Run("Given a generic OAuth provider", func(t *testing.T) {
+		provider := NewGenericOAuthProvider(&social.OAuthInfo{
+			Extra: map[string]string{
+				"login_attribute_path": "login",
+			},
+		}, &setting.Cfg{}, &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+
+		tests := []struct {
+			Name               string
+			ResponseBody       any
+			OAuth2Extra        any
+			LoginAttributePath string
+			ExpectedLogin      string
+		}{
+			{
+				Name: "Given a valid id_token, a valid login path, no API response, use id_token",
+				OAuth2Extra: map[string]any{
+					// { "login": "johndoe", "email": "john.doe@example.com" }
+					"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJsb2dpbiI6ImpvaG5kb2UiLCJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIn0.sg4sRJCNpax_76XMgr277fdxhjjtNSWXKIOFv4_GJN8",
+				},
+				LoginAttributePath: "role",
+				ExpectedLogin:      "johndoe",
+			},
+			{
+				Name: "Given a valid id_token, no login path, no API response, use id_token",
+				OAuth2Extra: map[string]any{
+					// { "login": "johndoe", "email": "john.doe@example.com" }
+					"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJsb2dpbiI6ImpvaG5kb2UiLCJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIn0.sg4sRJCNpax_76XMgr277fdxhjjtNSWXKIOFv4_GJN8",
+				},
+				LoginAttributePath: "",
+				ExpectedLogin:      "johndoe",
+			},
+			{
+				Name: "Given no id_token, a valid login path, a valid API response, use API response",
+				ResponseBody: map[string]any{
+					"user_uid": "johndoe",
+					"email":    "john.doe@example.com",
+				},
+				LoginAttributePath: "user_uid",
+				ExpectedLogin:      "johndoe",
+			},
+			{
+				Name: "Given no id_token, no login path, a valid API response, use API response",
+				ResponseBody: map[string]any{
+					"login": "johndoe",
+				},
+				LoginAttributePath: "",
+				ExpectedLogin:      "johndoe",
+			},
+			{
+				Name: "Given no id_token, a login path, a valid API response without a login, use API response",
+				ResponseBody: map[string]any{
+					"username": "john.doe",
+				},
+				LoginAttributePath: "login",
+				ExpectedLogin:      "john.doe",
+			},
+			{
+				Name:               "Given no id_token, a valid login path, no API response, no data",
+				LoginAttributePath: "login",
+				ExpectedLogin:      "",
+			},
+		}
+
+		for _, test := range tests {
+			provider.loginAttributePath = test.LoginAttributePath
+			t.Run(test.Name, func(t *testing.T) {
+				body, err := json.Marshal(test.ResponseBody)
+				require.NoError(t, err)
+				ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+					w.WriteHeader(http.StatusOK)
+					w.Header().Set("Content-Type", "application/json")
+					t.Log("Writing fake API response body", "body", test.ResponseBody)
+					_, err = w.Write(body)
+					require.NoError(t, err)
+				}))
+				provider.info.ApiUrl = ts.URL
+				staticToken := oauth2.Token{
+					AccessToken:  "",
+					TokenType:    "",
+					RefreshToken: "",
+					Expiry:       time.Now(),
+				}
+
+				token := staticToken.WithExtra(test.OAuth2Extra)
+				actualResult, err := provider.UserInfo(context.Background(), ts.Client(), token)
+				require.NoError(t, err)
+				require.Equal(t, test.ExpectedLogin, actualResult.Login)
+			})
+		}
+	})
+}
+
+func TestUserInfoSearchesForName(t *testing.T) {
+	t.Run("Given a generic OAuth provider", func(t *testing.T) {
+		provider := NewGenericOAuthProvider(&social.OAuthInfo{
+			Extra: map[string]string{
+				"name_attribute_path": "name",
+			},
+		}, &setting.Cfg{}, &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+
+		tests := []struct {
+			Name              string
+			ResponseBody      any
+			OAuth2Extra       any
+			NameAttributePath string
+			ExpectedName      string
+		}{
+			{
+				Name: "Given a valid id_token, a valid name path, no API response, use id_token",
+				OAuth2Extra: map[string]any{
+					// { "name": "John Doe", "login": "johndoe", "email": "john.doe@example.com" }
+					"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJsb2dpbiI6ImpvaG5kb2UiLCJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIiwibmFtZSI6IkpvaG4gRG9lIn0.oMsXH0mHxUSYMXh6FonZIWh8LgNIcYbKRLSO1bwnfSI",
+				},
+				NameAttributePath: "name",
+				ExpectedName:      "John Doe",
+			},
+			{
+				Name: "Given a valid id_token, no name path, no API response, use id_token",
+				OAuth2Extra: map[string]any{
+					// { "name": "John Doe", "login": "johndoe", "email": "john.doe@example.com" }
+					"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJsb2dpbiI6ImpvaG5kb2UiLCJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIiwibmFtZSI6IkpvaG4gRG9lIn0.oMsXH0mHxUSYMXh6FonZIWh8LgNIcYbKRLSO1bwnfSI",
+				},
+				NameAttributePath: "",
+				ExpectedName:      "John Doe",
+			},
+			{
+				Name: "Given no id_token, a valid name path, a valid API response, use API response",
+				ResponseBody: map[string]any{
+					"user_name": "John Doe",
+					"login":     "johndoe",
+					"email":     "john.doe@example.com",
+				},
+				NameAttributePath: "user_name",
+				ExpectedName:      "John Doe",
+			},
+			{
+				Name: "Given no id_token, no name path, a valid API response, use API response",
+				ResponseBody: map[string]any{
+					"display_name": "John Doe",
+					"login":        "johndoe",
+				},
+				NameAttributePath: "",
+				ExpectedName:      "John Doe",
+			},
+			{
+				Name: "Given no id_token, a name path, a valid API response without a name, use API response",
+				ResponseBody: map[string]any{
+					"display_name": "John Doe",
+					"username":     "john.doe",
+				},
+				NameAttributePath: "name",
+				ExpectedName:      "John Doe",
+			},
+			{
+				Name:              "Given no id_token, a valid name path, no API response, no data",
+				NameAttributePath: "name",
+				ExpectedName:      "",
+			},
+		}
+
+		for _, test := range tests {
+			provider.nameAttributePath = test.NameAttributePath
+			t.Run(test.Name, func(t *testing.T) {
+				body, err := json.Marshal(test.ResponseBody)
+				require.NoError(t, err)
+				ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+					w.WriteHeader(http.StatusOK)
+					w.Header().Set("Content-Type", "application/json")
+					t.Log("Writing fake API response body", "body", test.ResponseBody)
+					_, err = w.Write(body)
+					require.NoError(t, err)
+				}))
+				provider.info.ApiUrl = ts.URL
+				staticToken := oauth2.Token{
+					AccessToken:  "",
+					TokenType:    "",
+					RefreshToken: "",
+					Expiry:       time.Now(),
+				}
+
+				token := staticToken.WithExtra(test.OAuth2Extra)
+				actualResult, err := provider.UserInfo(context.Background(), ts.Client(), token)
+				require.NoError(t, err)
+				require.Equal(t, test.ExpectedName, actualResult.Name)
+			})
+		}
+	})
+}
+
+func TestUserInfoSearchesForGroup(t *testing.T) {
+	t.Run("Given a generic OAuth provider", func(t *testing.T) {
+		tests := []struct {
+			name                string
+			groupsAttributePath string
+			responseBody        any
+			expectedResult      []string
+		}{
+			{
+				name:                "If groups are not set, user groups are nil",
+				groupsAttributePath: "",
+				expectedResult:      nil,
+			},
+			{
+				name:                "If groups are empty, user groups are nil",
+				groupsAttributePath: "info.groups",
+				responseBody: map[string]any{
+					"info": map[string]any{
+						"groups": []string{},
+					},
+				},
+				expectedResult: nil,
+			},
+			{
+				name:                "If groups are set, user groups are set",
+				groupsAttributePath: "info.groups",
+				responseBody: map[string]any{
+					"info": map[string]any{
+						"groups": []string{"foo", "bar"},
+					},
+				},
+				expectedResult: []string{"foo", "bar"},
+			},
+		}
+
+		for _, test := range tests {
+			t.Run(test.name, func(t *testing.T) {
+				body, err := json.Marshal(test.responseBody)
+				require.NoError(t, err)
+				ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+					w.WriteHeader(http.StatusOK)
+					w.Header().Set("Content-Type", "application/json")
+					t.Log("Writing fake API response body", "body", test.responseBody)
+					_, err := w.Write(body)
+					require.NoError(t, err)
+				}))
+
+				provider := NewGenericOAuthProvider(&social.OAuthInfo{
+					GroupsAttributePath: test.groupsAttributePath,
+					ApiUrl:              ts.URL,
+				}, &setting.Cfg{}, &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+
+				token := &oauth2.Token{
+					AccessToken:  "",
+					TokenType:    "",
+					RefreshToken: "",
+					Expiry:       time.Now(),
+				}
+
+				userInfo, err := provider.UserInfo(context.Background(), ts.Client(), token)
+				assert.NoError(t, err)
+				assert.Equal(t, test.expectedResult, userInfo.Groups)
+			})
+		}
+	})
+}
+
+func TestPayloadCompression(t *testing.T) {
+	provider := NewGenericOAuthProvider(&social.OAuthInfo{
+		EmailAttributePath: "email",
+	}, &setting.Cfg{}, &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+
+	tests := []struct {
+		Name          string
+		OAuth2Extra   any
+		ExpectedEmail string
+	}{
+		{
+			Name: "Given a valid DEFLATE compressed id_token, return userInfo",
+			OAuth2Extra: map[string]any{
+				// { "role": "Admin", "email": "john.doe@example.com" }
+				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsInppcCI6IkRFRiJ9.eJyrVkrNTczMUbJSysrPyNNLyU91SK1IzC3ISdVLzs9V0lEqys9JBco6puRm5inVAgCFRw_6.XrV4ZKhw19dTcnviXanBD8lwjeALCYtDiESMmGzC-ho",
+			},
+			ExpectedEmail: "john.doe@example.com",
+		},
+		{
+			Name: "Given a valid DEFLATE compressed id_token with numeric header, return userInfo",
+			OAuth2Extra: map[string]any{
+				// Generated from https://token.dev/
+				"id_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiIsInZlciI6NH0.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWUsImlhdCI6MTY0MjUxNjYwNSwiZXhwIjoxNjQyNTIwMjA1LCJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIn0.ANndoPWIHNjKPG8na7UUq7nan1RgF8-ze8STU31RXcA",
+			},
+			ExpectedEmail: "john.doe@example.com",
+		},
+		{
+			Name: "Given an invalid DEFLATE compressed id_token, return nil",
+			OAuth2Extra: map[string]any{
+				// { "role": "Admin", "email": "john.doe@example.com" }
+				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsInppcCI6IkRFRiJ9.00eJyrVkrNTczMUbJSysrPyNNLyU91SK1IzC3ISdVLzs9V0lEqys9JBco6puRm5inVAgCFRw_6.XrV4ZKhw19dTcnviXanBD8lwjeALCYtDiESMmGzC-ho",
+			},
+			ExpectedEmail: "",
+		},
+		{
+			Name: "Given an unsupported GZIP compressed id_token, return nil",
+			OAuth2Extra: map[string]any{
+				// { "role": "Admin", "email": "john.doe@example.com" }
+				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsInppcCI6IkdaSVAifQ.H4sIAAAAAAAAAKtWSs1NzMxRslLKys_I00vJT3VIrUjMLchJ1UvOz1XSUSrKz0kFyjqm5GbmKdUCANotxTkvAAAA.85AXm3JOF5qflEA0goDFvlbZl2q3eFvqVcehz860W-o",
+			},
+			ExpectedEmail: "",
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.Name, func(t *testing.T) {
+			staticToken := oauth2.Token{
+				AccessToken:  "",
+				TokenType:    "",
+				RefreshToken: "",
+				Expiry:       time.Now(),
+			}
+
+			token := staticToken.WithExtra(test.OAuth2Extra)
+			userInfo := provider.extractFromToken(token)
+
+			if test.ExpectedEmail == "" {
+				require.Nil(t, userInfo, "Testing case %q", test.Name)
+			} else {
+				require.NotNil(t, userInfo, "Testing case %q", test.Name)
+				require.Equal(t, test.ExpectedEmail, userInfo.Email)
+			}
+		})
+	}
+}
+
+func TestSocialGenericOAuth_InitializeExtraFields(t *testing.T) {
+	type settingFields struct {
+		nameAttributePath    string
+		loginAttributePath   string
+		idTokenAttributeName string
+		teamIds              []string
+		allowedOrganizations []string
+	}
+	testCases := []struct {
+		name     string
+		settings *social.OAuthInfo
+		want     settingFields
+	}{
+		{
+			name: "nameAttributePath is set",
+			settings: &social.OAuthInfo{
+				Extra: map[string]string{
+					"name_attribute_path": "name",
+				},
+			},
+			want: settingFields{
+				nameAttributePath:    "name",
+				loginAttributePath:   "",
+				idTokenAttributeName: "",
+				teamIds:              []string{},
+				allowedOrganizations: []string{},
+			},
+		},
+		{
+			name: "loginAttributePath is set",
+			settings: &social.OAuthInfo{
+				Extra: map[string]string{
+					"login_attribute_path": "login",
+				},
+			},
+			want: settingFields{
+				nameAttributePath:    "",
+				loginAttributePath:   "login",
+				idTokenAttributeName: "",
+				teamIds:              []string{},
+				allowedOrganizations: []string{},
+			},
+		},
+		{
+			name: "idTokenAttributeName is set",
+			settings: &social.OAuthInfo{
+				Extra: map[string]string{
+					"id_token_attribute_name": "id_token",
+				},
+			},
+			want: settingFields{
+				nameAttributePath:    "",
+				loginAttributePath:   "",
+				idTokenAttributeName: "id_token",
+				teamIds:              []string{},
+				allowedOrganizations: []string{},
+			},
+		},
+		{
+			name: "teamIds is set",
+			settings: &social.OAuthInfo{
+				Extra: map[string]string{
+					"team_ids": "[\"team1\", \"team2\"]",
+				},
+			},
+			want: settingFields{
+				nameAttributePath:    "",
+				loginAttributePath:   "",
+				idTokenAttributeName: "",
+				teamIds:              []string{"team1", "team2"},
+				allowedOrganizations: []string{},
+			},
+		},
+		{
+			name: "allowedOrganizations is set",
+			settings: &social.OAuthInfo{
+				Extra: map[string]string{
+					"allowed_organizations": "org1, org2",
+				},
+			},
+			want: settingFields{
+				nameAttributePath:    "",
+				loginAttributePath:   "",
+				idTokenAttributeName: "",
+				teamIds:              []string{},
+				allowedOrganizations: []string{"org1", "org2"},
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := NewGenericOAuthProvider(tc.settings, &setting.Cfg{}, &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+
+			require.Equal(t, tc.want.nameAttributePath, s.nameAttributePath)
+			require.Equal(t, tc.want.loginAttributePath, s.loginAttributePath)
+			require.Equal(t, tc.want.idTokenAttributeName, s.idTokenAttributeName)
+			require.Equal(t, tc.want.teamIds, s.teamIds)
+			require.Equal(t, tc.want.allowedOrganizations, s.allowedOrganizations)
+		})
+	}
+}
+
+func TestSocialGenericOAuth_Validate(t *testing.T) {
+	testCases := []struct {
+		name      string
+		settings  ssoModels.SSOSettings
+		requester identity.Requester
+		wantErr   error
+	}{
+		{
+			name: "SSOSettings is valid",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":                  "client-id",
+					"allow_assign_grafana_admin": "true",
+					"teams_url":                  "https://example.com/teams",
+					"auth_url":                   "https://example.com/auth",
+					"token_url":                  "https://example.com/token",
+				},
+			},
+			requester: &user.SignedInUser{IsGrafanaAdmin: true},
+		},
+		{
+			name: "passes when team_url is empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"teams_url": "",
+					"auth_url":  "https://example.com/auth",
+					"token_url": "https://example.com/token",
+				},
+			},
+			wantErr: nil,
+		},
+		{
+			name: "fails if settings map contains an invalid field",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":     "client-id",
+					"invalid_field": []int{1, 2, 3},
+				},
+			},
+			wantErr: ssosettings.ErrInvalidSettings,
+		},
+		{
+			name: "fails if client id is empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if client id does not exist",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if both allow assign grafana admin and skip org role sync are enabled",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":                  "client-id",
+					"allow_assign_grafana_admin": "true",
+					"skip_org_role_sync":         "true",
+					"auth_url":                   "https://example.com/auth",
+					"token_url":                  "https://example.com/token",
+				},
+			},
+			requester: &user.SignedInUser{IsGrafanaAdmin: true},
+			wantErr:   ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if the user is not allowed to update allow assign grafana admin",
+			requester: &user.SignedInUser{
+				IsGrafanaAdmin: false,
+			},
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":                  "client-id",
+					"allow_assign_grafana_admin": "true",
+					"skip_org_role_sync":         "true",
+					"auth_url":                   "https://example.com/auth",
+					"token_url":                  "https://example.com/token",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if auth url is empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"teams_url": "https://example.com/teams",
+					"auth_url":  "",
+					"token_url": "https://example.com/token",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if token url is empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"teams_url": "https://example.com/teams",
+					"auth_url":  "https://example.com/auth",
+					"token_url": "",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if auth url is invalid",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"teams_url": "https://example.com/teams",
+					"auth_url":  "invalid_url",
+					"token_url": "https://example.com/token",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if token url is invalid",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"teams_url": "https://example.com/teams",
+					"auth_url":  "https://example.com/auth",
+					"token_url": "/path",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if teams url is invalid",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"teams_url": "file://teams",
+					"auth_url":  "https://example.com/auth",
+					"token_url": "https://example.com/token",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := NewGenericOAuthProvider(&social.OAuthInfo{}, &setting.Cfg{}, &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+
+			if tc.requester == nil {
+				tc.requester = &user.SignedInUser{IsGrafanaAdmin: false}
+			}
+			err := s.Validate(context.Background(), tc.settings, tc.requester)
+			if tc.wantErr != nil {
+				require.ErrorIs(t, err, tc.wantErr)
+				return
+			}
+			require.NoError(t, err)
+		})
+	}
+}
+
+func TestSocialGenericOAuth_Reload(t *testing.T) {
+	testCases := []struct {
+		name           string
+		info           *social.OAuthInfo
+		settings       ssoModels.SSOSettings
+		expectError    bool
+		expectedInfo   *social.OAuthInfo
+		expectedConfig *oauth2.Config
+	}{
+		{
+			name: "SSO provider successfully updated",
+			info: &social.OAuthInfo{
+				ClientId:     "client-id",
+				ClientSecret: "client-secret",
+			},
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":     "new-client-id",
+					"client_secret": "new-client-secret",
+					"auth_url":      "some-new-url",
+				},
+			},
+			expectError: false,
+			expectedInfo: &social.OAuthInfo{
+				ClientId:     "new-client-id",
+				ClientSecret: "new-client-secret",
+				AuthUrl:      "some-new-url",
+			},
+			expectedConfig: &oauth2.Config{
+				ClientID:     "new-client-id",
+				ClientSecret: "new-client-secret",
+				Endpoint: oauth2.Endpoint{
+					AuthURL: "some-new-url",
+				},
+				RedirectURL: "/login/generic_oauth",
+			},
+		},
+		{
+			name: "fails if settings contain invalid values",
+			info: &social.OAuthInfo{
+				ClientId:     "client-id",
+				ClientSecret: "client-secret",
+			},
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":     "new-client-id",
+					"client_secret": "new-client-secret",
+					"auth_url":      []string{"first", "second"},
+				},
+			},
+			expectError: true,
+			expectedInfo: &social.OAuthInfo{
+				ClientId:     "client-id",
+				ClientSecret: "client-secret",
+			},
+			expectedConfig: &oauth2.Config{
+				ClientID:     "client-id",
+				ClientSecret: "client-secret",
+				RedirectURL:  "/login/generic_oauth",
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := NewGenericOAuthProvider(tc.info, &setting.Cfg{}, &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+
+			err := s.Reload(context.Background(), tc.settings)
+			if tc.expectError {
+				require.Error(t, err)
+				return
+			}
+			require.NoError(t, err)
+
+			require.EqualValues(t, tc.expectedInfo, s.info)
+			require.EqualValues(t, tc.expectedConfig, s.Config)
+		})
+	}
+}
+
+func TestGenericOAuth_Reload_ExtraFields(t *testing.T) {
+	testCases := []struct {
+		name                         string
+		settings                     ssoModels.SSOSettings
+		info                         *social.OAuthInfo
+		expectError                  bool
+		expectedInfo                 *social.OAuthInfo
+		expectedTeamsUrl             string
+		expectedEmailAttributeName   string
+		expectedEmailAttributePath   string
+		expectedNameAttributePath    string
+		expectedGroupsAttributePath  string
+		expectedLoginAttributePath   string
+		expectedIdTokenAttributeName string
+		expectedTeamIdsAttributePath string
+		expectedTeamIds              []string
+		expectedAllowedOrganizations []string
+	}{
+		{
+			name: "successfully reloads the settings",
+			info: &social.OAuthInfo{
+				ClientId:             "client-id",
+				ClientSecret:         "client-secret",
+				TeamsUrl:             "https://host/users",
+				EmailAttributePath:   "email-attr-path",
+				EmailAttributeName:   "email-attr-name",
+				GroupsAttributePath:  "groups-attr-path",
+				TeamIdsAttributePath: "team-ids-attr-path",
+				Extra: map[string]string{
+					teamIdsKey:              "team1",
+					allowedOrganizationsKey: "org1",
+					loginAttributePathKey:   "login-attr-path",
+					idTokenAttributeNameKey: "id-token-attr-name",
+					nameAttributePathKey:    "name-attr-path",
+				},
+			},
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":               "new-client-id",
+					"client_secret":           "new-client-secret",
+					"teams_url":               "https://host/v2/users",
+					"email_attribute_path":    "new-email-attr-path",
+					"email_attribute_name":    "new-email-attr-name",
+					"groups_attribute_path":   "new-group-attr-path",
+					"team_ids_attribute_path": "new-team-ids-attr-path",
+					teamIdsKey:                "team1,team2",
+					allowedOrganizationsKey:   "org1,org2",
+					loginAttributePathKey:     "new-login-attr-path",
+					idTokenAttributeNameKey:   "new-id-token-attr-name",
+					nameAttributePathKey:      "new-name-attr-path",
+				},
+			},
+			expectedInfo: &social.OAuthInfo{
+				ClientId:             "new-client-id",
+				ClientSecret:         "new-client-secret",
+				TeamsUrl:             "https://host/v2/users",
+				EmailAttributePath:   "new-email-attr-path",
+				EmailAttributeName:   "new-email-attr-name",
+				GroupsAttributePath:  "new-group-attr-path",
+				TeamIdsAttributePath: "new-team-ids-attr-path",
+				Extra: map[string]string{
+					teamIdsKey:              "team1,team2",
+					allowedOrganizationsKey: "org1,org2",
+					loginAttributePathKey:   "new-login-attr-path",
+					idTokenAttributeNameKey: "new-id-token-attr-name",
+					nameAttributePathKey:    "new-name-attr-path",
+				},
+			},
+			expectedTeamsUrl:             "https://host/v2/users",
+			expectedEmailAttributeName:   "new-email-attr-name",
+			expectedEmailAttributePath:   "new-email-attr-path",
+			expectedGroupsAttributePath:  "new-group-attr-path",
+			expectedTeamIdsAttributePath: "new-team-ids-attr-path",
+			expectedTeamIds:              []string{"team1", "team2"},
+			expectedAllowedOrganizations: []string{"org1", "org2"},
+			expectedLoginAttributePath:   "new-login-attr-path",
+			expectedIdTokenAttributeName: "new-id-token-attr-name",
+			expectedNameAttributePath:    "new-name-attr-path",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := NewGenericOAuthProvider(tc.info, setting.NewCfg(), &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+
+			err := s.Reload(context.Background(), tc.settings)
+			require.NoError(t, err)
+
+			require.EqualValues(t, tc.expectedInfo, s.info)
+
+			require.EqualValues(t, tc.expectedTeamsUrl, s.teamsUrl)
+			require.EqualValues(t, tc.expectedEmailAttributeName, s.emailAttributeName)
+			require.EqualValues(t, tc.expectedEmailAttributePath, s.emailAttributePath)
+			require.EqualValues(t, tc.expectedGroupsAttributePath, s.groupsAttributePath)
+			require.EqualValues(t, tc.expectedTeamIdsAttributePath, s.teamIdsAttributePath)
+			require.EqualValues(t, tc.expectedTeamIds, s.teamIds)
+			require.EqualValues(t, tc.expectedAllowedOrganizations, s.allowedOrganizations)
+			require.EqualValues(t, tc.expectedLoginAttributePath, s.loginAttributePath)
+			require.EqualValues(t, tc.expectedIdTokenAttributeName, s.idTokenAttributeName)
+			require.EqualValues(t, tc.expectedNameAttributePath, s.nameAttributePath)
+		})
+	}
+}
diff --git a/pkg/login/social/connectors/github_oauth.go b/pkg/login/social/connectors/github_oauth.go
new file mode 100644
index 0000000000000..18e2175bcc1f6
--- /dev/null
+++ b/pkg/login/social/connectors/github_oauth.go
@@ -0,0 +1,397 @@
+package connectors
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net/http"
+	"regexp"
+	"strconv"
+	"strings"
+
+	"golang.org/x/oauth2"
+
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/models/roletype"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	ssoModels "github.com/grafana/grafana/pkg/services/ssosettings/models"
+	"github.com/grafana/grafana/pkg/services/ssosettings/validation"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util"
+	"github.com/grafana/grafana/pkg/util/errutil"
+)
+
+var ExtraGithubSettingKeys = map[string]ExtraKeyInfo{
+	allowedOrganizationsKey: {Type: String},
+	teamIdsKey:              {Type: String},
+}
+
+var _ social.SocialConnector = (*SocialGithub)(nil)
+var _ ssosettings.Reloadable = (*SocialGithub)(nil)
+
+type SocialGithub struct {
+	*SocialBase
+	allowedOrganizations []string
+	teamIds              []int
+}
+
+type GithubTeam struct {
+	Id           int    `json:"id"`
+	Slug         string `json:"slug"`
+	URL          string `json:"html_url"`
+	Organization struct {
+		Login string `json:"login"`
+	} `json:"organization"`
+}
+
+var (
+	ErrMissingTeamMembership = errutil.Unauthorized(
+		"auth.missing_team",
+		errutil.WithPublicMessage(
+			"User is not a member of one of the required teams. Please contact identity provider administrator."))
+	ErrMissingOrganizationMembership = errutil.Unauthorized(
+		"auth.missing_organization",
+		errutil.WithPublicMessage(
+			"User is not a member of one of the required organizations. Please contact identity provider administrator."))
+)
+
+func NewGitHubProvider(info *social.OAuthInfo, cfg *setting.Cfg, ssoSettings ssosettings.Service, features featuremgmt.FeatureToggles) *SocialGithub {
+	teamIdsSplitted := util.SplitString(info.Extra[teamIdsKey])
+	teamIds := mustInts(teamIdsSplitted)
+
+	provider := &SocialGithub{
+		SocialBase:           newSocialBase(social.GitHubProviderName, info, features, cfg),
+		teamIds:              teamIds,
+		allowedOrganizations: util.SplitString(info.Extra[allowedOrganizationsKey]),
+	}
+
+	if len(teamIdsSplitted) != len(teamIds) {
+		provider.log.Warn("Failed to parse team ids. Team ids must be a list of numbers.", "teamIds", teamIdsSplitted)
+	}
+
+	if features.IsEnabledGlobally(featuremgmt.FlagSsoSettingsApi) {
+		ssoSettings.RegisterReloadable(social.GitHubProviderName, provider)
+	}
+
+	return provider
+}
+
+func (s *SocialGithub) Validate(ctx context.Context, settings ssoModels.SSOSettings, requester identity.Requester) error {
+	info, err := CreateOAuthInfoFromKeyValues(settings.Settings)
+	if err != nil {
+		return ssosettings.ErrInvalidSettings.Errorf("SSO settings map cannot be converted to OAuthInfo: %v", err)
+	}
+
+	err = validateInfo(info, requester)
+	if err != nil {
+		return err
+	}
+
+	return validation.Validate(info, requester,
+		validation.MustBeEmptyValidator(info.AuthUrl, "Auth URL"),
+		validation.MustBeEmptyValidator(info.TokenUrl, "Token URL"),
+		validation.MustBeEmptyValidator(info.ApiUrl, "API URL"),
+		teamIdsNumbersValidator)
+}
+
+func teamIdsNumbersValidator(info *social.OAuthInfo, requester identity.Requester) error {
+	teamIdsSplitted := util.SplitString(info.Extra[teamIdsKey])
+	teamIds := mustInts(teamIdsSplitted)
+
+	if len(teamIdsSplitted) != len(teamIds) {
+		return ssosettings.ErrInvalidOAuthConfig("Failed to parse Team Ids. Team Ids must be a list of numbers.")
+	}
+
+	return nil
+}
+
+func (s *SocialGithub) Reload(ctx context.Context, settings ssoModels.SSOSettings) error {
+	newInfo, err := CreateOAuthInfoFromKeyValues(settings.Settings)
+	if err != nil {
+		return ssosettings.ErrInvalidSettings.Errorf("SSO settings map cannot be converted to OAuthInfo: %v", err)
+	}
+
+	teamIdsSplitted := util.SplitString(newInfo.Extra[teamIdsKey])
+	teamIds := mustInts(teamIdsSplitted)
+
+	if len(teamIdsSplitted) != len(teamIds) {
+		s.log.Warn("Failed to parse team ids. Team ids must be a list of numbers.", "teamIds", teamIdsSplitted)
+	}
+
+	s.reloadMutex.Lock()
+	defer s.reloadMutex.Unlock()
+
+	s.updateInfo(social.GitHubProviderName, newInfo)
+
+	s.teamIds = teamIds
+	s.allowedOrganizations = util.SplitString(newInfo.Extra[allowedOrganizationsKey])
+
+	return nil
+}
+
+func (s *SocialGithub) isTeamMember(ctx context.Context, client *http.Client) bool {
+	if len(s.teamIds) == 0 {
+		return true
+	}
+
+	teamMemberships, err := s.fetchTeamMemberships(ctx, client)
+	if err != nil {
+		return false
+	}
+
+	for _, teamId := range s.teamIds {
+		for _, membership := range teamMemberships {
+			if teamId == membership.Id {
+				return true
+			}
+		}
+	}
+
+	return false
+}
+
+func (s *SocialGithub) isOrganizationMember(ctx context.Context,
+	client *http.Client, organizationsUrl string) bool {
+	if len(s.allowedOrganizations) == 0 {
+		return true
+	}
+
+	organizations, err := s.fetchOrganizations(ctx, client, organizationsUrl)
+	if err != nil {
+		return false
+	}
+
+	for _, allowedOrganization := range s.allowedOrganizations {
+		for _, organization := range organizations {
+			if strings.EqualFold(organization, allowedOrganization) {
+				return true
+			}
+		}
+	}
+
+	return false
+}
+
+func (s *SocialGithub) fetchPrivateEmail(ctx context.Context, client *http.Client) (string, error) {
+	type Record struct {
+		Email    string `json:"email"`
+		Primary  bool   `json:"primary"`
+		Verified bool   `json:"verified"`
+	}
+
+	response, err := s.httpGet(ctx, client, fmt.Sprintf(s.info.ApiUrl+"/emails"))
+	if err != nil {
+		return "", fmt.Errorf("Error getting email address: %s", err)
+	}
+
+	var records []Record
+
+	err = json.Unmarshal(response.Body, &records)
+	if err != nil {
+		return "", fmt.Errorf("Error getting email address: %s", err)
+	}
+
+	var email = ""
+	for _, record := range records {
+		if record.Primary {
+			email = record.Email
+		}
+	}
+
+	return email, nil
+}
+
+func (s *SocialGithub) fetchTeamMemberships(ctx context.Context, client *http.Client) ([]GithubTeam, error) {
+	url := fmt.Sprintf(s.info.ApiUrl + "/teams?per_page=100")
+	hasMore := true
+	teams := make([]GithubTeam, 0)
+
+	for hasMore {
+		response, err := s.httpGet(ctx, client, url)
+		if err != nil {
+			return nil, fmt.Errorf("Error getting team memberships: %s", err)
+		}
+
+		var records []GithubTeam
+
+		err = json.Unmarshal(response.Body, &records)
+		if err != nil {
+			return nil, fmt.Errorf("Error getting team memberships: %s", err)
+		}
+
+		teams = append(teams, records...)
+
+		url, hasMore = s.hasMoreRecords(response.Headers)
+	}
+
+	return teams, nil
+}
+
+func (s *SocialGithub) hasMoreRecords(headers http.Header) (string, bool) {
+	value, exists := headers["Link"]
+	if !exists {
+		return "", false
+	}
+
+	pattern := regexp.MustCompile(`<([^>]+)>; rel="next"`)
+	matches := pattern.FindStringSubmatch(value[0])
+
+	if matches == nil {
+		return "", false
+	}
+
+	url := matches[1]
+
+	return url, true
+}
+
+func (s *SocialGithub) fetchOrganizations(ctx context.Context, client *http.Client, organizationsUrl string) ([]string, error) {
+	url := organizationsUrl
+	hasMore := true
+	logins := make([]string, 0)
+
+	type Record struct {
+		Login string `json:"login"`
+	}
+
+	for hasMore {
+		response, err := s.httpGet(ctx, client, url)
+		if err != nil {
+			return nil, fmt.Errorf("error getting organizations: %s", err)
+		}
+
+		var records []Record
+
+		err = json.Unmarshal(response.Body, &records)
+		if err != nil {
+			return nil, fmt.Errorf("error getting organizations: %s", err)
+		}
+
+		for _, record := range records {
+			logins = append(logins, record.Login)
+		}
+
+		url, hasMore = s.hasMoreRecords(response.Headers)
+	}
+	return logins, nil
+}
+
+func (s *SocialGithub) UserInfo(ctx context.Context, client *http.Client, token *oauth2.Token) (*social.BasicUserInfo, error) {
+	s.reloadMutex.RLock()
+	defer s.reloadMutex.RUnlock()
+
+	var data struct {
+		Id    int    `json:"id"`
+		Login string `json:"login"`
+		Email string `json:"email"`
+		Name  string `json:"name"`
+	}
+
+	response, err := s.httpGet(ctx, client, s.info.ApiUrl)
+	if err != nil {
+		return nil, fmt.Errorf("error getting user info: %s", err)
+	}
+
+	if err = json.Unmarshal(response.Body, &data); err != nil {
+		return nil, fmt.Errorf("error unmarshalling user info: %s", err)
+	}
+
+	teamMemberships, err := s.fetchTeamMemberships(ctx, client)
+	if err != nil {
+		return nil, fmt.Errorf("error getting user teams: %s", err)
+	}
+
+	teams := convertToGroupList(teamMemberships)
+
+	var role roletype.RoleType
+	var isGrafanaAdmin *bool = nil
+
+	if !s.info.SkipOrgRoleSync {
+		var grafanaAdmin bool
+		role, grafanaAdmin, err = s.extractRoleAndAdmin(response.Body, teams)
+		if err != nil {
+			return nil, err
+		}
+
+		if s.info.AllowAssignGrafanaAdmin {
+			isGrafanaAdmin = &grafanaAdmin
+		}
+	}
+
+	// we skip allowing assignment of GrafanaAdmin if skipOrgRoleSync is present
+	if s.info.AllowAssignGrafanaAdmin && s.info.SkipOrgRoleSync {
+		s.log.Debug("AllowAssignGrafanaAdmin and skipOrgRoleSync are both set, Grafana Admin role will not be synced, consider setting one or the other")
+	}
+
+	userInfo := &social.BasicUserInfo{
+		Name:           data.Login,
+		Login:          data.Login,
+		Id:             fmt.Sprintf("%d", data.Id),
+		Email:          data.Email,
+		Role:           role,
+		Groups:         teams,
+		IsGrafanaAdmin: isGrafanaAdmin,
+	}
+	if data.Name != "" {
+		userInfo.Name = data.Name
+	}
+
+	organizationsUrl := fmt.Sprintf(s.info.ApiUrl + "/orgs?per_page=100")
+
+	if !s.isTeamMember(ctx, client) {
+		return nil, ErrMissingTeamMembership.Errorf("User is not a member of any of the allowed teams: %v", s.teamIds)
+	}
+
+	if !s.isOrganizationMember(ctx, client, organizationsUrl) {
+		return nil, ErrMissingOrganizationMembership.Errorf(
+			"User is not a member of any of the allowed organizations: %v",
+			s.allowedOrganizations)
+	}
+
+	if userInfo.Email == "" {
+		userInfo.Email, err = s.fetchPrivateEmail(ctx, client)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return userInfo, nil
+}
+
+func (t *GithubTeam) GetShorthand() (string, error) {
+	if t.Organization.Login == "" || t.Slug == "" {
+		return "", errors.New("Error getting team shorthand")
+	}
+	return fmt.Sprintf("@%s/%s", t.Organization.Login, t.Slug), nil
+}
+
+func convertToGroupList(t []GithubTeam) []string {
+	groups := make([]string, 0)
+	for _, team := range t {
+		// Group shouldn't be empty string, otherwise team sync will not work properly
+		if team.URL != "" {
+			groups = append(groups, team.URL)
+		}
+		teamShorthand, _ := team.GetShorthand()
+		if teamShorthand != "" {
+			groups = append(groups, teamShorthand)
+		}
+	}
+
+	return groups
+}
+
+func mustInts(s []string) []int {
+	result := make([]int, 0, len(s))
+	for _, v := range s {
+		num, err := strconv.Atoi(v)
+		if err != nil {
+			return []int{}
+		}
+		result = append(result, num)
+	}
+	return result
+}
diff --git a/pkg/login/social/connectors/github_oauth_test.go b/pkg/login/social/connectors/github_oauth_test.go
new file mode 100644
index 0000000000000..e7c8edfa7e452
--- /dev/null
+++ b/pkg/login/social/connectors/github_oauth_test.go
@@ -0,0 +1,617 @@
+package connectors
+
+import (
+	"context"
+	"net/http"
+	"net/http/httptest"
+	"reflect"
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"golang.org/x/oauth2"
+
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	ssoModels "github.com/grafana/grafana/pkg/services/ssosettings/models"
+	"github.com/grafana/grafana/pkg/services/ssosettings/ssosettingstests"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+const testGHUserTeamsJSON = `[
+  {
+    "id": 1,
+    "node_id": "MDQ6VGVhbTE=",
+    "url": "https://api.github.com/teams/1",
+    "html_url": "https://github.com/orgs/github/teams/justice-league",
+    "name": "Justice League",
+    "slug": "justice-league",
+    "description": "A great team.",
+    "privacy": "closed",
+    "permission": "admin",
+    "members_url": "https://api.github.com/teams/1/members{/member}",
+    "repositories_url": "https://api.github.com/teams/1/repos",
+    "parent": null,
+    "members_count": 3,
+    "repos_count": 10,
+    "created_at": "2017-07-14T16:53:42Z",
+    "updated_at": "2017-08-17T12:37:15Z",
+    "organization": {
+      "login": "github",
+      "id": 1,
+      "node_id": "MDEyOk9yZ2FuaXphdGlvbjE=",
+      "url": "https://api.github.com/orgs/github",
+      "repos_url": "https://api.github.com/orgs/github/repos",
+      "events_url": "https://api.github.com/orgs/github/events",
+      "hooks_url": "https://api.github.com/orgs/github/hooks",
+      "issues_url": "https://api.github.com/orgs/github/issues",
+      "members_url": "https://api.github.com/orgs/github/members{/member}",
+      "public_members_url": "https://api.github.com/orgs/github/public_members{/member}",
+      "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+      "description": "A great organization",
+      "name": "github",
+      "company": "GitHub",
+      "blog": "https://github.com/blog",
+      "location": "San Francisco",
+      "email": "octocat@github.com",
+      "is_verified": true,
+      "has_organization_projects": true,
+      "has_repository_projects": true,
+      "public_repos": 2,
+      "public_gists": 1,
+      "followers": 20,
+      "following": 0,
+      "html_url": "https://github.com/octocat",
+      "created_at": "2008-01-14T04:33:35Z",
+      "updated_at": "2017-08-17T12:37:15Z",
+      "type": "Organization"
+    }
+  }
+]`
+
+const testGHUserJSON = `{
+  "login": "octocat",
+  "id": 1,
+  "node_id": "MDQ6VXNlcjE=",
+  "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+  "gravatar_id": "",
+  "url": "https://api.github.com/users/octocat",
+  "html_url": "https://github.com/octocat",
+  "followers_url": "https://api.github.com/users/octocat/followers",
+  "following_url": "https://api.github.com/users/octocat/following{/other_user}",
+  "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}",
+  "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}",
+  "subscriptions_url": "https://api.github.com/users/octocat/subscriptions",
+  "organizations_url": "https://api.github.com/users/octocat/orgs",
+  "repos_url": "https://api.github.com/users/octocat/repos",
+  "events_url": "https://api.github.com/users/octocat/events{/privacy}",
+  "received_events_url": "https://api.github.com/users/octocat/received_events",
+  "type": "User",
+  "site_admin": false,
+  "name": "monalisa octocat",
+  "company": "GitHub",
+  "blog": "https://github.com/blog",
+  "location": "San Francisco",
+  "email": "octocat@github.com",
+  "hireable": false,
+  "bio": "There once was...",
+  "twitter_username": "monatheoctocat",
+  "public_repos": 2,
+  "public_gists": 1,
+  "followers": 20,
+  "following": 0,
+  "created_at": "2008-01-14T04:33:35Z",
+  "updated_at": "2008-01-14T04:33:35Z",
+  "private_gists": 81,
+  "total_private_repos": 100,
+  "owned_private_repos": 100,
+  "disk_usage": 10000,
+  "collaborators": 8,
+  "two_factor_authentication": true,
+  "plan": {
+    "name": "Medium",
+    "space": 400,
+    "private_repos": 20,
+    "collaborators": 0
+  }
+}`
+
+func TestSocialGitHub_UserInfo(t *testing.T) {
+	var boolPointer *bool
+	tests := []struct {
+		name                     string
+		userRawJSON              string
+		userTeamsRawJSON         string
+		settingAutoAssignOrgRole string
+		settingAllowGrafanaAdmin bool
+		settingSkipOrgRoleSync   bool
+		roleAttributePath        string
+		autoAssignOrgRole        string
+		want                     *social.BasicUserInfo
+		wantErr                  bool
+	}{
+		{
+			name:              "Basic User info",
+			userRawJSON:       testGHUserJSON,
+			userTeamsRawJSON:  testGHUserTeamsJSON,
+			autoAssignOrgRole: "",
+			roleAttributePath: "",
+			want: &social.BasicUserInfo{
+				Id:     "1",
+				Name:   "monalisa octocat",
+				Email:  "octocat@github.com",
+				Login:  "octocat",
+				Role:   "Viewer",
+				Groups: []string{"https://github.com/orgs/github/teams/justice-league", "@github/justice-league"},
+			},
+		},
+		{
+			name:              "Admin mapping takes precedence over auto assign org role",
+			roleAttributePath: "[login==octocat] && 'Admin' || 'Viewer'",
+			userRawJSON:       testGHUserJSON,
+			autoAssignOrgRole: "Editor",
+			userTeamsRawJSON:  testGHUserTeamsJSON,
+			want: &social.BasicUserInfo{
+				Id:     "1",
+				Name:   "monalisa octocat",
+				Email:  "octocat@github.com",
+				Login:  "octocat",
+				Role:   "Admin",
+				Groups: []string{"https://github.com/orgs/github/teams/justice-league", "@github/justice-league"},
+			},
+		},
+		{
+			name:              "Editor mapping via groups",
+			roleAttributePath: "contains(groups[*], '@github/justice-league') && 'Editor' || 'Viewer'",
+			userRawJSON:       testGHUserJSON,
+			autoAssignOrgRole: "Editor",
+			userTeamsRawJSON:  testGHUserTeamsJSON,
+			want: &social.BasicUserInfo{
+				Id:     "1",
+				Name:   "monalisa octocat",
+				Email:  "octocat@github.com",
+				Login:  "octocat",
+				Role:   "Editor",
+				Groups: []string{"https://github.com/orgs/github/teams/justice-league", "@github/justice-league"},
+			},
+		},
+		{
+			name:                   "Should be empty role if setting skipOrgRoleSync is set to true",
+			roleAttributePath:      "contains(groups[*], '@github/justice-league') && 'Editor' || 'Viewer'",
+			settingSkipOrgRoleSync: true,
+			userRawJSON:            testGHUserJSON,
+			userTeamsRawJSON:       testGHUserTeamsJSON,
+			want: &social.BasicUserInfo{
+				Id:     "1",
+				Name:   "monalisa octocat",
+				Email:  "octocat@github.com",
+				Login:  "octocat",
+				Role:   "",
+				Groups: []string{"https://github.com/orgs/github/teams/justice-league", "@github/justice-league"},
+			},
+		},
+		{
+			name:                     "Should return nil pointer if allowGrafanaAdmin and skipOrgRoleSync setting is set to true",
+			roleAttributePath:        "contains(groups[*], '@github/justice-league') && 'Editor' || 'Viewer'",
+			settingSkipOrgRoleSync:   true,
+			settingAllowGrafanaAdmin: true,
+			userRawJSON:              testGHUserJSON,
+			userTeamsRawJSON:         testGHUserTeamsJSON,
+			want: &social.BasicUserInfo{
+				Id:             "1",
+				Name:           "monalisa octocat",
+				Email:          "octocat@github.com",
+				Login:          "octocat",
+				Role:           "",
+				Groups:         []string{"https://github.com/orgs/github/teams/justice-league", "@github/justice-league"},
+				IsGrafanaAdmin: boolPointer,
+			},
+		},
+		{
+			name:              "fallback to default org role",
+			roleAttributePath: "",
+			userRawJSON:       testGHUserJSON,
+			autoAssignOrgRole: "Editor",
+			userTeamsRawJSON:  testGHUserTeamsJSON,
+			want: &social.BasicUserInfo{
+				Id:     "1",
+				Name:   "monalisa octocat",
+				Email:  "octocat@github.com",
+				Login:  "octocat",
+				Role:   "Editor",
+				Groups: []string{"https://github.com/orgs/github/teams/justice-league", "@github/justice-league"},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			server := httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
+				writer.WriteHeader(http.StatusOK)
+				// return JSON if matches user endpoint
+				if strings.HasSuffix(request.URL.String(), "/user") {
+					writer.Header().Set("Content-Type", "application/json")
+					_, err := writer.Write([]byte(tt.userRawJSON))
+					require.NoError(t, err)
+				} else if strings.HasSuffix(request.URL.String(), "/user/teams?per_page=100") {
+					writer.Header().Set("Content-Type", "application/json")
+					_, err := writer.Write([]byte(tt.userTeamsRawJSON))
+					require.NoError(t, err)
+				} else {
+					writer.WriteHeader(http.StatusNotFound)
+				}
+			}))
+			defer server.Close()
+
+			s := NewGitHubProvider(
+				&social.OAuthInfo{
+					ApiUrl:            server.URL + "/user",
+					RoleAttributePath: tt.roleAttributePath,
+					SkipOrgRoleSync:   tt.settingSkipOrgRoleSync,
+					Extra: map[string]string{
+						"allowed_organizations": "",
+						"team_ids":              "",
+					},
+				}, &setting.Cfg{
+					AutoAssignOrgRole: tt.autoAssignOrgRole,
+				}, &ssosettingstests.MockService{},
+				featuremgmt.WithFeatures())
+
+			token := &oauth2.Token{
+				AccessToken: "fake_token",
+			}
+
+			got, err := s.UserInfo(context.Background(), server.Client(), token)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("UserInfo() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("UserInfo() got = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestSocialGitHub_InitializeExtraFields(t *testing.T) {
+	type settingFields struct {
+		teamIds              []int
+		allowedOrganizations []string
+	}
+	testCases := []struct {
+		name     string
+		settings *social.OAuthInfo
+		want     settingFields
+	}{
+		{
+			name: "teamIds is set",
+			settings: &social.OAuthInfo{
+				Extra: map[string]string{
+					"team_ids": "1234,5678",
+				},
+			},
+			want: settingFields{
+				teamIds:              []int{1234, 5678},
+				allowedOrganizations: []string{},
+			},
+		},
+		{
+			name: "allowedOrganizations is set",
+			settings: &social.OAuthInfo{
+				Extra: map[string]string{
+					"allowed_organizations": "uuid-1234,uuid-5678",
+				},
+			},
+			want: settingFields{
+				teamIds:              []int{},
+				allowedOrganizations: []string{"uuid-1234", "uuid-5678"},
+			},
+		},
+		{
+			name: "teamIds and allowedOrganizations are empty",
+			settings: &social.OAuthInfo{
+				Extra: map[string]string{
+					"team_ids":              "",
+					"allowed_organizations": "",
+				},
+			},
+			want: settingFields{
+				teamIds:              []int{},
+				allowedOrganizations: []string{},
+			},
+		},
+		{
+			name: "should not error when teamIds are not integers",
+			settings: &social.OAuthInfo{
+				Extra: map[string]string{
+					"team_ids": "abc1234,5678",
+				},
+			},
+			want: settingFields{
+				teamIds:              []int{},
+				allowedOrganizations: []string{},
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := NewGitHubProvider(tc.settings, &setting.Cfg{}, &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+
+			require.Equal(t, tc.want.teamIds, s.teamIds)
+			require.Equal(t, tc.want.allowedOrganizations, s.allowedOrganizations)
+		})
+	}
+}
+
+func TestSocialGitHub_Validate(t *testing.T) {
+	testCases := []struct {
+		name      string
+		settings  ssoModels.SSOSettings
+		requester identity.Requester
+		wantErr   error
+	}{
+		{
+			name: "SSOSettings is valid",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":                  "client-id",
+					"allow_assign_grafana_admin": "true",
+					"auth_url":                   "",
+					"token_url":                  "",
+					"api_url":                    "",
+				},
+			},
+			requester: &user.SignedInUser{IsGrafanaAdmin: true},
+		},
+		{
+			name: "fails if settings map contains an invalid field",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":     "client-id",
+					"invalid_field": []int{1, 2, 3},
+				},
+			},
+			wantErr: ssosettings.ErrInvalidSettings,
+		},
+		{
+			name: "fails if client id is empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if client id does not exist",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if team ids are not integers",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"team_ids":  "abc1234,5678,def",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if both allow assign grafana admin and skip org role sync are enabled",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":                  "client-id",
+					"allow_assign_grafana_admin": "true",
+					"skip_org_role_sync":         "true",
+				},
+			},
+			requester: &user.SignedInUser{IsGrafanaAdmin: true},
+			wantErr:   ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if the user is not allowed to update allow assign grafana admin",
+			requester: &user.SignedInUser{
+				IsGrafanaAdmin: false,
+			},
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":                  "client-id",
+					"allow_assign_grafana_admin": "true",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if token url is not empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"auth_url":  "",
+					"token_url": "https://example.com/token",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if auth url is not empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"auth_url":  "https://example.com/auth",
+					"token_url": "",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if api url is not empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"auth_url":  "",
+					"token_url": "",
+					"api_url":   "http://example.com/api",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := NewGitHubProvider(&social.OAuthInfo{}, &setting.Cfg{}, &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+
+			if tc.requester == nil {
+				tc.requester = &user.SignedInUser{IsGrafanaAdmin: false}
+			}
+
+			err := s.Validate(context.Background(), tc.settings, tc.requester)
+			if tc.wantErr != nil {
+				require.ErrorIs(t, err, tc.wantErr)
+				return
+			}
+			require.NoError(t, err)
+		})
+	}
+}
+
+func TestSocialGitHub_Reload(t *testing.T) {
+	testCases := []struct {
+		name           string
+		info           *social.OAuthInfo
+		settings       ssoModels.SSOSettings
+		expectError    bool
+		expectedInfo   *social.OAuthInfo
+		expectedConfig *oauth2.Config
+	}{
+		{
+			name: "SSO provider successfully updated",
+			info: &social.OAuthInfo{
+				ClientId:     "client-id",
+				ClientSecret: "client-secret",
+			},
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":     "new-client-id",
+					"client_secret": "new-client-secret",
+					"auth_url":      "some-new-url",
+				},
+			},
+			expectError: false,
+			expectedInfo: &social.OAuthInfo{
+				ClientId:     "new-client-id",
+				ClientSecret: "new-client-secret",
+				AuthUrl:      "some-new-url",
+			},
+			expectedConfig: &oauth2.Config{
+				ClientID:     "new-client-id",
+				ClientSecret: "new-client-secret",
+				Endpoint: oauth2.Endpoint{
+					AuthURL: "some-new-url",
+				},
+				RedirectURL: "/login/github",
+			},
+		},
+		{
+			name: "fails if settings contain invalid values",
+			info: &social.OAuthInfo{
+				ClientId:     "client-id",
+				ClientSecret: "client-secret",
+			},
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":     "new-client-id",
+					"client_secret": "new-client-secret",
+					"auth_url":      []string{"first", "second"},
+				},
+			},
+			expectError: true,
+			expectedInfo: &social.OAuthInfo{
+				ClientId:     "client-id",
+				ClientSecret: "client-secret",
+			},
+			expectedConfig: &oauth2.Config{
+				ClientID:     "client-id",
+				ClientSecret: "client-secret",
+				RedirectURL:  "/login/github",
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := NewGitHubProvider(tc.info, &setting.Cfg{}, &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+
+			err := s.Reload(context.Background(), tc.settings)
+			if tc.expectError {
+				require.Error(t, err)
+				return
+			}
+
+			require.NoError(t, err)
+
+			require.EqualValues(t, tc.expectedInfo, s.info)
+			require.EqualValues(t, tc.expectedConfig, s.Config)
+		})
+	}
+}
+
+func TestGitHub_Reload_ExtraFields(t *testing.T) {
+	testCases := []struct {
+		name                         string
+		settings                     ssoModels.SSOSettings
+		info                         *social.OAuthInfo
+		expectError                  bool
+		expectedInfo                 *social.OAuthInfo
+		expectedAllowedOrganizations []string
+		expectedTeamIds              []int
+	}{
+		{
+			name: "successfully reloads the settings",
+			info: &social.OAuthInfo{
+				ClientId:     "client-id",
+				ClientSecret: "client-secret",
+				Extra: map[string]string{
+					"allowed_organizations": "previous",
+					"team_ids":              "",
+				},
+			},
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"allowed_organizations": "uuid-1234,uuid-5678",
+					"team_ids":              "123,456",
+				},
+			},
+			expectedInfo: &social.OAuthInfo{
+				ClientId:     "new-client-id",
+				ClientSecret: "new-client-secret",
+				Name:         "a-new-name",
+				AuthStyle:    "inheader",
+				Extra: map[string]string{
+					"allowed_organizations": "uuid-1234,uuid-5678",
+					"force_use_graph_api":   "false",
+				},
+			},
+			expectedAllowedOrganizations: []string{"uuid-1234", "uuid-5678"},
+			expectedTeamIds:              []int{123, 456},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := NewGitHubProvider(tc.info, setting.NewCfg(), &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+
+			err := s.Reload(context.Background(), tc.settings)
+			require.NoError(t, err)
+
+			require.EqualValues(t, tc.expectedAllowedOrganizations, s.allowedOrganizations)
+			require.EqualValues(t, tc.expectedTeamIds, s.teamIds)
+		})
+	}
+}
diff --git a/pkg/login/social/gitlab_oauth.go b/pkg/login/social/connectors/gitlab_oauth.go
similarity index 75%
rename from pkg/login/social/gitlab_oauth.go
rename to pkg/login/social/connectors/gitlab_oauth.go
index 70d2eb23730fc..b588d2c2ebf0f 100644
--- a/pkg/login/social/gitlab_oauth.go
+++ b/pkg/login/social/connectors/gitlab_oauth.go
@@ -1,4 +1,4 @@
-package social
+package connectors
 
 import (
 	"context"
@@ -11,7 +11,13 @@ import (
 
 	"golang.org/x/oauth2"
 
+	"github.com/grafana/grafana/pkg/login/social"
 	"github.com/grafana/grafana/pkg/models/roletype"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	ssoModels "github.com/grafana/grafana/pkg/services/ssosettings/models"
+	"github.com/grafana/grafana/pkg/services/ssosettings/validation"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
@@ -20,10 +26,11 @@ const (
 	accessLevelGuest = "10"
 )
 
+var _ social.SocialConnector = (*SocialGitlab)(nil)
+var _ ssosettings.Reloadable = (*SocialGitlab)(nil)
+
 type SocialGitlab struct {
 	*SocialBase
-	apiUrl          string
-	skipOrgRoleSync bool
 }
 
 type apiData struct {
@@ -47,6 +54,49 @@ type userData struct {
 	IsGrafanaAdmin *bool             `json:"-"`
 }
 
+func NewGitLabProvider(info *social.OAuthInfo, cfg *setting.Cfg, ssoSettings ssosettings.Service, features featuremgmt.FeatureToggles) *SocialGitlab {
+	provider := &SocialGitlab{
+		SocialBase: newSocialBase(social.GitlabProviderName, info, features, cfg),
+	}
+
+	if features.IsEnabledGlobally(featuremgmt.FlagSsoSettingsApi) {
+		ssoSettings.RegisterReloadable(social.GitlabProviderName, provider)
+	}
+
+	return provider
+}
+
+func (s *SocialGitlab) Validate(ctx context.Context, settings ssoModels.SSOSettings, requester identity.Requester) error {
+	info, err := CreateOAuthInfoFromKeyValues(settings.Settings)
+	if err != nil {
+		return ssosettings.ErrInvalidSettings.Errorf("SSO settings map cannot be converted to OAuthInfo: %v", err)
+	}
+
+	err = validateInfo(info, requester)
+	if err != nil {
+		return err
+	}
+
+	return validation.Validate(info, requester,
+		validation.MustBeEmptyValidator(info.AuthUrl, "Auth URL"),
+		validation.MustBeEmptyValidator(info.TokenUrl, "Token URL"),
+		validation.MustBeEmptyValidator(info.ApiUrl, "API URL"))
+}
+
+func (s *SocialGitlab) Reload(ctx context.Context, settings ssoModels.SSOSettings) error {
+	newInfo, err := CreateOAuthInfoFromKeyValues(settings.Settings)
+	if err != nil {
+		return ssosettings.ErrInvalidSettings.Errorf("SSO settings map cannot be converted to OAuthInfo: %v", err)
+	}
+
+	s.reloadMutex.Lock()
+	defer s.reloadMutex.Unlock()
+
+	s.updateInfo(social.GitlabProviderName, newInfo)
+
+	return nil
+}
+
 func (s *SocialGitlab) getGroups(ctx context.Context, client *http.Client) []string {
 	groups := make([]string, 0)
 	nextPage := new(int)
@@ -66,7 +116,7 @@ func (s *SocialGitlab) getGroupsPage(ctx context.Context, client *http.Client, n
 		FullPath string `json:"full_path"`
 	}
 
-	groupURL, err := url.JoinPath(s.apiUrl, "/groups")
+	groupURL, err := url.JoinPath(s.info.ApiUrl, "/groups")
 	if err != nil {
 		s.log.Error("Error joining GitLab API URL", "err", err)
 		return nil, nil
@@ -126,7 +176,10 @@ func (s *SocialGitlab) getGroupsPage(ctx context.Context, client *http.Client, n
 	return fullPaths, next
 }
 
-func (s *SocialGitlab) UserInfo(ctx context.Context, client *http.Client, token *oauth2.Token) (*BasicUserInfo, error) {
+func (s *SocialGitlab) UserInfo(ctx context.Context, client *http.Client, token *oauth2.Token) (*social.BasicUserInfo, error) {
+	s.reloadMutex.RLock()
+	defer s.reloadMutex.RUnlock()
+
 	data, err := s.extractFromToken(ctx, client, token)
 	if err != nil {
 		return nil, err
@@ -141,7 +194,7 @@ func (s *SocialGitlab) UserInfo(ctx context.Context, client *http.Client, token
 		}
 	}
 
-	userInfo := &BasicUserInfo{
+	userInfo := &social.BasicUserInfo{
 		Id:             data.ID,
 		Name:           data.Name,
 		Login:          data.Login,
@@ -155,7 +208,7 @@ func (s *SocialGitlab) UserInfo(ctx context.Context, client *http.Client, token
 		return nil, errMissingGroupMembership
 	}
 
-	if s.allowAssignGrafanaAdmin && s.skipOrgRoleSync {
+	if s.info.AllowAssignGrafanaAdmin && s.info.SkipOrgRoleSync {
 		s.log.Debug("AllowAssignGrafanaAdmin and skipOrgRoleSync are both set, Grafana Admin role will not be synced, consider setting one or the other")
 	}
 
@@ -164,7 +217,7 @@ func (s *SocialGitlab) UserInfo(ctx context.Context, client *http.Client, token
 
 func (s *SocialGitlab) extractFromAPI(ctx context.Context, client *http.Client, token *oauth2.Token) (*userData, error) {
 	apiResp := &apiData{}
-	response, err := s.httpGet(ctx, client, s.apiUrl+"/user")
+	response, err := s.httpGet(ctx, client, s.info.ApiUrl+"/user")
 	if err != nil {
 		return nil, fmt.Errorf("Error getting user info: %w", err)
 	}
@@ -190,21 +243,21 @@ func (s *SocialGitlab) extractFromAPI(ctx context.Context, client *http.Client,
 		Groups: s.getGroups(ctx, client),
 	}
 
-	if !s.skipOrgRoleSync {
+	if !s.info.SkipOrgRoleSync {
 		var grafanaAdmin bool
 		role, grafanaAdmin, err := s.extractRoleAndAdmin(response.Body, idData.Groups)
 		if err != nil {
 			return nil, err
 		}
 
-		if s.allowAssignGrafanaAdmin {
+		if s.info.AllowAssignGrafanaAdmin {
 			idData.IsGrafanaAdmin = &grafanaAdmin
 		}
 
 		idData.Role = role
 	}
 
-	if setting.Env == setting.Dev {
+	if s.cfg.Env == setting.Dev {
 		s.log.Debug("Resolved ID", "data", fmt.Sprintf("%+v", idData))
 	}
 
@@ -247,13 +300,13 @@ func (s *SocialGitlab) extractFromToken(ctx context.Context, client *http.Client
 		data.Groups = userInfo.Groups
 	}
 
-	if !s.skipOrgRoleSync {
+	if !s.info.SkipOrgRoleSync {
 		role, grafanaAdmin, errRole := s.extractRoleAndAdmin(rawJSON, data.Groups)
 		if errRole != nil {
 			return nil, errRole
 		}
 
-		if s.allowAssignGrafanaAdmin {
+		if s.info.AllowAssignGrafanaAdmin {
 			data.IsGrafanaAdmin = &grafanaAdmin
 		}
 
diff --git a/pkg/login/social/connectors/gitlab_oauth_test.go b/pkg/login/social/connectors/gitlab_oauth_test.go
new file mode 100644
index 0000000000000..2564006660374
--- /dev/null
+++ b/pkg/login/social/connectors/gitlab_oauth_test.go
@@ -0,0 +1,673 @@
+package connectors
+
+import (
+	"context"
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"strconv"
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"golang.org/x/oauth2"
+
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	ssoModels "github.com/grafana/grafana/pkg/services/ssosettings/models"
+	"github.com/grafana/grafana/pkg/services/ssosettings/ssosettingstests"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+const (
+	apiURI    = "/api/v4"
+	userURI   = "/api/v4/user"
+	groupsURI = "/api/v4/groups?min_access_level=10&page=1&per_page=50"
+
+	gitlabAttrPath = `is_admin && 'GrafanaAdmin' || contains(groups[*], 'admins') && 'Admin' || contains(groups[*], 'editors') && 'Editor' || contains(groups[*], 'viewers') && 'Viewer'`
+
+	rootUserRespBody   = `{"id":1,"username":"root","name":"Administrator","state":"active","email":"root@example.org", "confirmed_at":"2022-09-13T19:38:04.891Z","is_admin":true,"namespace_id":1}`
+	editorUserRespBody = `{"id":3,"username":"gitlab-editor","name":"Gitlab Editor","state":"active","email":"gitlab-editor@example.org", "confirmed_at":"2022-09-13T19:38:04.891Z","is_admin":false,"namespace_id":1}`
+
+	adminGroup  = `{"id":4,"web_url":"http://grafana-gitlab.local/groups/admins","name":"Admins","path":"admins","project_creation_level":"developer","full_name":"Admins","full_path":"admins","created_at":"2022-09-13T19:38:04.891Z"}`
+	editorGroup = `{"id":5,"web_url":"http://grafana-gitlab.local/groups/editors","name":"Editors","path":"editors","project_creation_level":"developer","full_name":"Editors","full_path":"editors","created_at":"2022-09-13T19:38:15.074Z"}`
+	viewerGroup = `{"id":6,"web_url":"http://grafana-gitlab.local/groups/viewers","name":"Viewers","path":"viewers","project_creation_level":"developer","full_name":"Viewers","full_path":"viewers","created_at":"2022-09-13T19:38:25.777Z"}`
+	// serverAdminGroup = `{"id":7,"web_url":"http://grafana-gitlab.local/groups/serveradmins","name":"ServerAdmins","path":"serveradmins","project_creation_level":"developer","full_name":"ServerAdmins","full_path":"serveradmins","created_at":"2022-09-13T19:38:36.227Z"}`
+)
+
+func TestSocialGitlab_UserInfo(t *testing.T) {
+	var nilPointer *bool
+
+	provider := NewGitLabProvider(&social.OAuthInfo{SkipOrgRoleSync: false}, &setting.Cfg{}, &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+
+	type conf struct {
+		AllowAssignGrafanaAdmin bool
+		RoleAttributeStrict     bool
+		AutoAssignOrgRole       org.RoleType
+		SkipOrgRoleSync         bool
+	}
+
+	tests := []struct {
+		Name                 string
+		Cfg                  conf
+		UserRespBody         string
+		GroupsRespBody       string
+		GroupHeaders         map[string]string
+		RoleAttributePath    string
+		ExpectedLogin        string
+		ExpectedEmail        string
+		ExpectedRole         org.RoleType
+		ExpectedGrafanaAdmin *bool
+		ExpectedError        error
+	}{
+		{
+			Name:           "Server Admin Allowed",
+			Cfg:            conf{AllowAssignGrafanaAdmin: true},
+			UserRespBody:   rootUserRespBody,
+			GroupsRespBody: "[" + strings.Join([]string{adminGroup, editorGroup, viewerGroup}, ",") + "]",
+			GroupHeaders: map[string]string{
+				"X-Total-Pages": "1",
+				"X-Total":       "3",
+				"X-Page":        "1",
+				"X-Next-Page":   "",
+			},
+			RoleAttributePath:    gitlabAttrPath,
+			ExpectedLogin:        "root",
+			ExpectedEmail:        "root@example.org",
+			ExpectedRole:         "Admin",
+			ExpectedGrafanaAdmin: trueBoolPtr(),
+		},
+		{ // Edge case, user in Viewer Group, Server Admin disabled but attribute path contains a condition for Server Admin => User has the Admin role
+			Name:           "Server Admin Disabled",
+			Cfg:            conf{AllowAssignGrafanaAdmin: false},
+			UserRespBody:   rootUserRespBody,
+			GroupsRespBody: "[" + strings.Join([]string{adminGroup, editorGroup, viewerGroup}, ",") + "]",
+			GroupHeaders: map[string]string{
+				"X-Total-Pages": "1",
+				"X-Total":       "3",
+				"X-Page":        "1",
+				// Next page omitted to test that the provider does not make a second request
+			},
+			RoleAttributePath:    gitlabAttrPath,
+			ExpectedLogin:        "root",
+			ExpectedEmail:        "root@example.org",
+			ExpectedRole:         "Admin",
+			ExpectedGrafanaAdmin: nil,
+		},
+		{
+			Name:                 "Editor",
+			Cfg:                  conf{AllowAssignGrafanaAdmin: true},
+			UserRespBody:         editorUserRespBody,
+			GroupsRespBody:       "[" + strings.Join([]string{viewerGroup, editorGroup}, ",") + "]",
+			RoleAttributePath:    gitlabAttrPath,
+			ExpectedLogin:        "gitlab-editor",
+			ExpectedEmail:        "gitlab-editor@example.org",
+			ExpectedRole:         "Editor",
+			ExpectedGrafanaAdmin: falseBoolPtr(),
+			GroupHeaders:         map[string]string{
+				// All headers omitted to test that the provider does not make a second request
+			},
+		},
+		{
+			Name:                 "Should not sync role, return empty role and nil pointer for GrafanaAdmin for skip org role sync set to true",
+			Cfg:                  conf{SkipOrgRoleSync: true},
+			UserRespBody:         editorUserRespBody,
+			GroupsRespBody:       "[" + strings.Join([]string{viewerGroup, editorGroup}, ",") + "]",
+			RoleAttributePath:    gitlabAttrPath,
+			ExpectedLogin:        "gitlab-editor",
+			ExpectedEmail:        "gitlab-editor@example.org",
+			ExpectedRole:         "",
+			ExpectedGrafanaAdmin: nilPointer,
+		},
+		{ // Fallback to autoAssignOrgRole
+			Name:              "No fallback to default org role",
+			Cfg:               conf{AutoAssignOrgRole: org.RoleAdmin},
+			UserRespBody:      editorUserRespBody,
+			GroupsRespBody:    "[" + strings.Join([]string{}, ",") + "]",
+			RoleAttributePath: gitlabAttrPath,
+			ExpectedLogin:     "gitlab-editor",
+			ExpectedEmail:     "gitlab-editor@example.org",
+			ExpectedRole:      "Admin",
+		},
+		{
+			Name:              "Strict mode prevents fallback to default",
+			Cfg:               conf{RoleAttributeStrict: true, AutoAssignOrgRole: org.RoleAdmin},
+			UserRespBody:      editorUserRespBody,
+			GroupsRespBody:    "[" + strings.Join([]string{}, ",") + "]",
+			RoleAttributePath: gitlabAttrPath,
+			ExpectedError:     errRoleAttributeStrictViolation,
+		},
+		{ // Edge case, no match, no strict mode and no fallback => User has the Viewer role (hard coded)
+			Name:              "Fallback with no default will create a user with a default role",
+			Cfg:               conf{},
+			UserRespBody:      editorUserRespBody,
+			GroupsRespBody:    "[]",
+			RoleAttributePath: gitlabAttrPath,
+			ExpectedLogin:     "gitlab-editor",
+			ExpectedEmail:     "gitlab-editor@example.org",
+			ExpectedRole:      "Viewer",
+		},
+		{ // Edge case, no attribute path with strict mode => Error
+			Name:              "Strict mode with no attribute path",
+			Cfg:               conf{RoleAttributeStrict: true, AutoAssignOrgRole: org.RoleViewer},
+			UserRespBody:      editorUserRespBody,
+			GroupsRespBody:    "[" + strings.Join([]string{editorGroup}, ",") + "]",
+			RoleAttributePath: "",
+			ExpectedError:     errRoleAttributePathNotSet,
+		},
+	}
+
+	for _, test := range tests {
+		provider.info.RoleAttributePath = test.RoleAttributePath
+		provider.info.AllowAssignGrafanaAdmin = test.Cfg.AllowAssignGrafanaAdmin
+		provider.cfg.AutoAssignOrgRole = string(test.Cfg.AutoAssignOrgRole)
+		provider.info.RoleAttributeStrict = test.Cfg.RoleAttributeStrict
+		provider.info.SkipOrgRoleSync = test.Cfg.SkipOrgRoleSync
+
+		t.Run(test.Name, func(t *testing.T) {
+			ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusOK)
+				w.Header().Set("Content-Type", "application/json")
+				switch r.RequestURI {
+				case userURI:
+					w.WriteHeader(http.StatusOK)
+					_, err := w.Write([]byte(test.UserRespBody))
+					require.NoError(t, err)
+				case groupsURI:
+					w.WriteHeader(http.StatusOK)
+					for k, v := range test.GroupHeaders {
+						w.Header().Set(k, v)
+					}
+					_, err := w.Write([]byte(test.GroupsRespBody))
+					require.NoError(t, err)
+				default:
+					require.Fail(t, "unexpected request URI: "+r.RequestURI)
+				}
+			}))
+			provider.info.ApiUrl = ts.URL + apiURI
+			actualResult, err := provider.UserInfo(context.Background(), ts.Client(), &oauth2.Token{})
+			if test.ExpectedError != nil {
+				require.ErrorIs(t, err, test.ExpectedError)
+				return
+			}
+
+			require.NoError(t, err)
+			require.Equal(t, test.ExpectedEmail, actualResult.Email)
+			require.Equal(t, test.ExpectedLogin, actualResult.Login)
+			require.Equal(t, test.ExpectedRole, actualResult.Role)
+			require.Equal(t, test.ExpectedGrafanaAdmin, actualResult.IsGrafanaAdmin)
+		})
+	}
+}
+
+type testCase struct {
+	name           string
+	payload        string
+	config         *oauth2.Config
+	wantUser       *userData
+	wantErrMessage string
+}
+
+func TestSocialGitlab_extractFromToken(t *testing.T) {
+	// Create a test server that returns a dummy ID token and user info
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case "/oauth/token":
+			// Return a dummy access token
+			_ = json.NewEncoder(w).Encode(map[string]any{
+				"access_token": "dummy_access_token",
+				"token_type":   "Bearer",
+			})
+		case "/oauth/userinfo":
+			// Return a dummy user info
+			_ = json.NewEncoder(w).Encode(userInfoResponse{
+				Sub:           "12345678",
+				EmailVerified: true,
+				Groups:        []string{"admins", "editors", "viewers"},
+			})
+		default:
+			http.Error(w, "not found", http.StatusNotFound)
+		}
+	}))
+	defer ts.Close()
+
+	testCases := []testCase{
+		{
+			name: "successful extraction",
+			payload: `{
+                "iss": "https://gitlab.com",
+                "sub": "12345678",
+                "aud": "d77db857f4696c5c5ff6cee64f3ed26e709aac8f1c644dc4b9d5fd64f825d583",
+                "exp": 1686124040,
+                "iat": 1686123920,
+                "auth_time": 1686119303,
+                "sub_legacy": "b4359d63eaf90d4b1f3d71d291353b75a676bf73fdf734d4ff009eca5c69bb70",
+                "name": "John Doe",
+                "nickname": "johndoe",
+                "preferred_username": "johndoe",
+                "email": "johndoe@example.com",
+                "email_verified": true,
+                "profile": "https://gitlab.com/johndoe",
+                "picture": "https://gitlab.com/uploads/-/system/user/avatar/1234567/avatar.png",
+                "groups_direct": [
+                  "admins"
+                ]
+            }`,
+			config: &oauth2.Config{
+				Endpoint: oauth2.Endpoint{
+					AuthURL:  ts.URL + "/oauth/authorize",
+					TokenURL: ts.URL + "/oauth/token",
+				},
+			},
+			wantUser: &userData{
+				ID:             "12345678",
+				Login:          "johndoe",
+				Email:          "johndoe@example.com",
+				Name:           "John Doe",
+				Groups:         []string{"admins", "editors", "viewers"},
+				EmailVerified:  true,
+				Role:           "Viewer",
+				IsGrafanaAdmin: nil,
+			},
+		},
+		{
+			name: "unverified email",
+			payload: `{
+                "iss": "https://gitlab.com",
+                "sub": "12345678",
+                "aud": "d77db857f4696c5c5ff6cee64f3ed26e709aac8f1c644dc4b9d5fd64f825d583",
+                "exp": 1686124040,
+                "iat": 1686123920,
+                "auth_time": 1686119303,
+                "sub_legacy": "b4359d63eaf90d4b1f3d71d291353b75a676bf73fdf734d4ff009eca5c69bb70",
+                "name": "John Doe",
+                "nickname": "johndoe",
+                "preferred_username": "johndoe",
+                "email": "johndoe@example.com",
+                "email_verified": false,
+                "profile": "https://gitlab.com/johndoe",
+                "picture": "https://gitlab.com/uploads/-/system/user/avatar/1234567/avatar.png",
+                "groups_direct": [
+                  "admins"
+                ]
+            }`,
+			config: &oauth2.Config{
+				Endpoint: oauth2.Endpoint{
+					AuthURL:  ts.URL + "/oauth/authorize",
+					TokenURL: ts.URL + "/oauth/token",
+				},
+			},
+			wantErrMessage: "user johndoe's email is not confirmed",
+		},
+		{
+			name: "unable to reach userinfo endpoint",
+			payload: `{
+                "iss": "https://gitlab.com",
+                "sub": "12345678",
+                "aud": "d77db857f4696c5c5ff6cee64f3ed26e709aac8f1c644dc4b9d5fd64f825d583",
+                "exp": 1686124040,
+                "iat": 1686123920,
+                "auth_time": 1686119303,
+                "sub_legacy": "b4359d63eaf90d4b1f3d71d291353b75a676bf73fdf734d4ff009eca5c69bb70",
+                "name": "John Doe",
+                "nickname": "johndoe",
+                "preferred_username": "johndoe",
+                "email": "johndoe@example.com",
+                "email_verified": true,
+                "profile": "https://gitlab.com/johndoe",
+                "picture": "https://gitlab.com/uploads/-/system/user/avatar/1234567/avatar.png",
+                "groups_direct": [
+                  "admins"
+                ]
+            }`,
+			config: &oauth2.Config{
+				Endpoint: oauth2.Endpoint{
+					AuthURL:  "http://localhost:1234/oauth/authorize",
+					TokenURL: "http://localhost:1234/oauth/token",
+				},
+			},
+			wantUser: &userData{
+				ID:             "12345678",
+				Login:          "johndoe",
+				Email:          "johndoe@example.com",
+				Name:           "John Doe",
+				Groups:         []string{"admins"},
+				EmailVerified:  true,
+				Role:           "Viewer",
+				IsGrafanaAdmin: nil,
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			// Create a test client with a dummy token
+			client := oauth2.NewClient(context.Background(), &tokenSource{accessToken: "dummy_access_token"})
+
+			s := NewGitLabProvider(
+				&social.OAuthInfo{
+					AllowedDomains:      []string{},
+					AllowSignup:         false,
+					RoleAttributePath:   "",
+					RoleAttributeStrict: false,
+					SkipOrgRoleSync:     false,
+					AuthUrl:             tc.config.Endpoint.AuthURL,
+					TokenUrl:            tc.config.Endpoint.TokenURL,
+				},
+				&setting.Cfg{
+					AutoAssignOrgRole: "",
+				}, &ssosettingstests.MockService{},
+				featuremgmt.WithFeatures())
+
+			// Test case: successful extraction
+			token := &oauth2.Token{}
+			// build jwt
+			// header
+			header := map[string]any{
+				"alg": "RS256",
+				"typ": "JWT",
+				"kid": "dummy",
+			}
+			headerJSON, err := json.Marshal(header)
+			require.NoError(t, err)
+			headerEncoded := base64.RawURLEncoding.EncodeToString(headerJSON)
+			// payload
+			payloadEncoded := base64.RawURLEncoding.EncodeToString([]byte(tc.payload))
+			// signature
+			signatureEncoded := base64.RawURLEncoding.EncodeToString([]byte("dummy"))
+			// build token
+			idToken := fmt.Sprintf("%s.%s.%s", headerEncoded, payloadEncoded, signatureEncoded)
+
+			token = token.WithExtra(map[string]any{"id_token": idToken})
+			data, err := s.extractFromToken(context.Background(), client, token)
+			if tc.wantErrMessage != "" {
+				require.Error(t, err)
+				assert.Contains(t, err.Error(), tc.wantErrMessage)
+			} else {
+				require.NotNil(t, data)
+				require.NoError(t, err)
+				assert.Equal(t, tc.wantUser, data)
+			}
+		})
+	}
+}
+
+// tokenSource is a dummy oauth2.TokenSource that always returns a fixed access token
+type tokenSource struct {
+	accessToken string
+}
+
+func (t *tokenSource) Token() (*oauth2.Token, error) {
+	return &oauth2.Token{
+		AccessToken: t.accessToken,
+		TokenType:   "Bearer",
+	}, nil
+}
+
+func TestSocialGitlab_GetGroupsNextPage(t *testing.T) {
+	type Group struct {
+		FullPath string `json:"full_path"`
+	}
+
+	groups := []Group{
+		{FullPath: "admins"},
+		{FullPath: "editors"},
+		{FullPath: "viewers"},
+		{FullPath: "serveradmins"},
+	}
+
+	calls := 0
+	// Create a mock HTTP client and server
+	mockServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path == "/groups" {
+			// Return a paginated response with 2 groups per page
+			page, err := strconv.Atoi(r.URL.Query().Get("page"))
+			require.NoError(t, err)
+			perPage := 2
+			startIndex := (page - 1) * perPage
+			endIndex := startIndex + perPage
+			if endIndex > len(groups) {
+				endIndex = len(groups)
+			}
+			groupsPage := groups[startIndex:endIndex]
+			jsonBytes, err := json.Marshal(groupsPage)
+			require.NoError(t, err)
+
+			w.Header().Set("X-Total", strconv.Itoa(len(groups)))
+			if endIndex < len(groups) {
+				w.Header().Set("X-Next-Page", strconv.Itoa(page+1))
+			}
+			calls += 1
+			_, err = w.Write(jsonBytes)
+			require.NoError(t, err)
+		} else {
+			w.WriteHeader(http.StatusNotFound)
+		}
+	}))
+	defer mockServer.Close()
+
+	// Create a SocialGitlab instance with the mock server URL
+	s := NewGitLabProvider(&social.OAuthInfo{ApiUrl: mockServer.URL}, &setting.Cfg{}, &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+
+	// Call getGroups and verify that it returns all groups
+	expectedGroups := []string{"admins", "editors", "viewers", "serveradmins"}
+	actualGroups := s.getGroups(context.Background(), mockServer.Client())
+	assert.Equal(t, expectedGroups, actualGroups)
+	assert.Equal(t, 2, calls)
+}
+
+func TestSocialGitlab_Validate(t *testing.T) {
+	testCases := []struct {
+		name      string
+		settings  ssoModels.SSOSettings
+		requester identity.Requester
+		wantErr   error
+	}{
+		{
+			name: "SSOSettings is valid",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":                  "client-id",
+					"allow_assign_grafana_admin": "true",
+					"auth_url":                   "",
+					"token_url":                  "",
+					"api_url":                    "",
+				},
+			},
+			requester: &user.SignedInUser{IsGrafanaAdmin: true},
+		},
+		{
+			name: "fails if settings map contains an invalid field",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":     "client-id",
+					"invalid_field": []int{1, 2, 3},
+				},
+			},
+			wantErr: ssosettings.ErrInvalidSettings,
+		},
+		{
+			name: "fails if client id is empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if client id does not exist",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if both allow assign grafana admin and skip org role sync are enabled",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":                  "client-id",
+					"allow_assign_grafana_admin": "true",
+					"skip_org_role_sync":         "true",
+					"auth_url":                   "https://example.com/auth",
+					"token_url":                  "https://example.com/token",
+				},
+			},
+			requester: &user.SignedInUser{IsGrafanaAdmin: true},
+			wantErr:   ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if the user is not allowed to update allow assign grafana admin",
+			requester: &user.SignedInUser{
+				IsGrafanaAdmin: false,
+			},
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":                  "client-id",
+					"allow_assign_grafana_admin": "true",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if api url is  not empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"auth_url":  "",
+					"token_url": "",
+					"api_url":   "https://example.com/api",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if auth url is not empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"auth_url":  "https://example.com/auth",
+					"token_url": "",
+					"api_url":   "",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if token url is not empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"auth_url":  "",
+					"token_url": "https://example.com/token",
+					"api_url":   "",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := NewGitLabProvider(&social.OAuthInfo{}, &setting.Cfg{}, &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+
+			if tc.requester == nil {
+				tc.requester = &user.SignedInUser{IsGrafanaAdmin: false}
+			}
+
+			err := s.Validate(context.Background(), tc.settings, tc.requester)
+			if tc.wantErr != nil {
+				require.ErrorIs(t, err, tc.wantErr)
+				return
+			}
+			require.NoError(t, err)
+		})
+	}
+}
+
+func TestSocialGitlab_Reload(t *testing.T) {
+	testCases := []struct {
+		name           string
+		info           *social.OAuthInfo
+		settings       ssoModels.SSOSettings
+		expectError    bool
+		expectedInfo   *social.OAuthInfo
+		expectedConfig *oauth2.Config
+	}{
+		{
+			name: "SSO provider successfully updated",
+			info: &social.OAuthInfo{
+				ClientId:     "client-id",
+				ClientSecret: "client-secret",
+			},
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":     "new-client-id",
+					"client_secret": "new-client-secret",
+					"auth_url":      "some-new-url",
+				},
+			},
+			expectError: false,
+			expectedInfo: &social.OAuthInfo{
+				ClientId:     "new-client-id",
+				ClientSecret: "new-client-secret",
+				AuthUrl:      "some-new-url",
+			},
+			expectedConfig: &oauth2.Config{
+				ClientID:     "new-client-id",
+				ClientSecret: "new-client-secret",
+				Endpoint: oauth2.Endpoint{
+					AuthURL: "some-new-url",
+				},
+				RedirectURL: "/login/gitlab",
+			},
+		},
+		{
+			name: "fails if settings contain invalid values",
+			info: &social.OAuthInfo{
+				ClientId:     "client-id",
+				ClientSecret: "client-secret",
+			},
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":     "new-client-id",
+					"client_secret": "new-client-secret",
+					"auth_url":      []string{"first", "second"},
+				},
+			},
+			expectError: true,
+			expectedInfo: &social.OAuthInfo{
+				ClientId:     "client-id",
+				ClientSecret: "client-secret",
+			},
+			expectedConfig: &oauth2.Config{
+				ClientID:     "client-id",
+				ClientSecret: "client-secret",
+				RedirectURL:  "/login/gitlab",
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := NewGitLabProvider(tc.info, &setting.Cfg{}, &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+
+			err := s.Reload(context.Background(), tc.settings)
+			if tc.expectError {
+				require.Error(t, err)
+				return
+			}
+			require.NoError(t, err)
+
+			require.EqualValues(t, tc.expectedInfo, s.info)
+			require.EqualValues(t, tc.expectedConfig, s.Config)
+		})
+	}
+}
diff --git a/pkg/login/social/connectors/google_oauth.go b/pkg/login/social/connectors/google_oauth.go
new file mode 100644
index 0000000000000..0bda73cd62a80
--- /dev/null
+++ b/pkg/login/social/connectors/google_oauth.go
@@ -0,0 +1,326 @@
+package connectors
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"slices"
+	"strings"
+
+	"golang.org/x/oauth2"
+
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	ssoModels "github.com/grafana/grafana/pkg/services/ssosettings/models"
+	"github.com/grafana/grafana/pkg/services/ssosettings/validation"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util/errutil"
+)
+
+const (
+	legacyAPIURL            = "https://www.googleapis.com/oauth2/v1/userinfo"
+	googleIAMGroupsEndpoint = "https://content-cloudidentity.googleapis.com/v1/groups/-/memberships:searchDirectGroups"
+	googleIAMScope          = "https://www.googleapis.com/auth/cloud-identity.groups.readonly"
+	validateHDKey           = "validate_hd"
+)
+
+var ExtraGoogleSettingKeys = map[string]ExtraKeyInfo{
+	validateHDKey: {Type: Bool, DefaultValue: true},
+}
+
+var _ social.SocialConnector = (*SocialGoogle)(nil)
+var _ ssosettings.Reloadable = (*SocialGoogle)(nil)
+
+type SocialGoogle struct {
+	*SocialBase
+	validateHD bool
+}
+
+type googleUserData struct {
+	ID            string `json:"sub"`
+	Email         string `json:"email"`
+	Name          string `json:"name"`
+	EmailVerified bool   `json:"email_verified"`
+	HD            string `json:"hd"`
+	rawJSON       []byte `json:"-"`
+}
+
+func NewGoogleProvider(info *social.OAuthInfo, cfg *setting.Cfg, ssoSettings ssosettings.Service, features featuremgmt.FeatureToggles) *SocialGoogle {
+	provider := &SocialGoogle{
+		SocialBase: newSocialBase(social.GoogleProviderName, info, features, cfg),
+		validateHD: MustBool(info.Extra[validateHDKey], true),
+	}
+
+	if strings.HasPrefix(info.ApiUrl, legacyAPIURL) {
+		provider.log.Warn("Using legacy Google API URL, please update your configuration")
+	}
+
+	if features.IsEnabledGlobally(featuremgmt.FlagSsoSettingsApi) {
+		ssoSettings.RegisterReloadable(social.GoogleProviderName, provider)
+	}
+
+	return provider
+}
+
+func (s *SocialGoogle) Validate(ctx context.Context, settings ssoModels.SSOSettings, requester identity.Requester) error {
+	info, err := CreateOAuthInfoFromKeyValues(settings.Settings)
+	if err != nil {
+		return ssosettings.ErrInvalidSettings.Errorf("SSO settings map cannot be converted to OAuthInfo: %v", err)
+	}
+
+	err = validateInfo(info, requester)
+	if err != nil {
+		return err
+	}
+
+	return validation.Validate(info, requester,
+		validation.MustBeEmptyValidator(info.AuthUrl, "Auth URL"),
+		validation.MustBeEmptyValidator(info.TokenUrl, "Token URL"),
+		validation.MustBeEmptyValidator(info.ApiUrl, "API URL"))
+}
+
+func (s *SocialGoogle) Reload(ctx context.Context, settings ssoModels.SSOSettings) error {
+	newInfo, err := CreateOAuthInfoFromKeyValues(settings.Settings)
+	if err != nil {
+		return ssosettings.ErrInvalidSettings.Errorf("SSO settings map cannot be converted to OAuthInfo: %v", err)
+	}
+
+	if strings.HasPrefix(newInfo.ApiUrl, legacyAPIURL) {
+		s.log.Warn("Using legacy Google API URL, please update your configuration")
+	}
+
+	s.reloadMutex.Lock()
+	defer s.reloadMutex.Unlock()
+
+	s.updateInfo(social.GoogleProviderName, newInfo)
+	s.validateHD = MustBool(newInfo.Extra[validateHDKey], true)
+
+	return nil
+}
+
+func (s *SocialGoogle) UserInfo(ctx context.Context, client *http.Client, token *oauth2.Token) (*social.BasicUserInfo, error) {
+	s.reloadMutex.RLock()
+	defer s.reloadMutex.RUnlock()
+
+	data, errToken := s.extractFromToken(ctx, client, token)
+	if errToken != nil {
+		return nil, errToken
+	}
+
+	if data == nil {
+		var errAPI error
+		data, errAPI = s.extractFromAPI(ctx, client)
+		if errAPI != nil {
+			return nil, errAPI
+		}
+	}
+
+	if data.ID == "" {
+		return nil, fmt.Errorf("error getting user info: id is empty")
+	}
+
+	if !data.EmailVerified {
+		return nil, fmt.Errorf("user email is not verified")
+	}
+
+	if err := s.isHDAllowed(data.HD); err != nil {
+		return nil, err
+	}
+
+	groups, errPage := s.retrieveGroups(ctx, client, data)
+	if errPage != nil {
+		s.log.Warn("Error retrieving groups", "error", errPage)
+	}
+
+	if !s.isGroupMember(groups) {
+		return nil, errMissingGroupMembership
+	}
+
+	userInfo := &social.BasicUserInfo{
+		Id:             data.ID,
+		Name:           data.Name,
+		Email:          data.Email,
+		Login:          data.Email,
+		Role:           "",
+		IsGrafanaAdmin: nil,
+		Groups:         groups,
+	}
+
+	if !s.info.SkipOrgRoleSync {
+		role, grafanaAdmin, errRole := s.extractRoleAndAdmin(data.rawJSON, groups)
+		if errRole != nil {
+			return nil, errRole
+		}
+
+		if s.info.AllowAssignGrafanaAdmin {
+			userInfo.IsGrafanaAdmin = &grafanaAdmin
+		}
+
+		userInfo.Role = role
+	}
+
+	s.log.Debug("Resolved user info", "data", fmt.Sprintf("%+v", userInfo))
+
+	return userInfo, nil
+}
+
+type googleAPIData struct {
+	ID            string `json:"id"`
+	Name          string `json:"name"`
+	Email         string `json:"email"`
+	EmailVerified bool   `json:"verified_email"`
+	HD            string `json:"hd"`
+}
+
+func (s *SocialGoogle) extractFromAPI(ctx context.Context, client *http.Client) (*googleUserData, error) {
+	if strings.HasPrefix(s.info.ApiUrl, legacyAPIURL) {
+		data := googleAPIData{}
+		response, err := s.httpGet(ctx, client, s.info.ApiUrl)
+		if err != nil {
+			return nil, fmt.Errorf("error retrieving legacy user info: %s", err)
+		}
+
+		if err := json.Unmarshal(response.Body, &data); err != nil {
+			return nil, fmt.Errorf("error unmarshalling legacy user info: %s", err)
+		}
+
+		return &googleUserData{
+			ID:            data.ID,
+			Name:          data.Name,
+			Email:         data.Email,
+			EmailVerified: data.EmailVerified,
+			HD:            data.HD,
+			rawJSON:       response.Body,
+		}, nil
+	}
+
+	data := googleUserData{}
+	response, err := s.httpGet(ctx, client, s.info.ApiUrl)
+	if err != nil {
+		return nil, fmt.Errorf("error getting user info: %s", err)
+	}
+
+	if err := json.Unmarshal(response.Body, &data); err != nil {
+		return nil, fmt.Errorf("error unmarshalling user info: %s", err)
+	}
+
+	return &data, nil
+}
+
+func (s *SocialGoogle) AuthCodeURL(state string, opts ...oauth2.AuthCodeOption) string {
+	s.reloadMutex.RLock()
+	defer s.reloadMutex.RUnlock()
+
+	if s.info.UseRefreshToken {
+		opts = append(opts, oauth2.AccessTypeOffline, oauth2.ApprovalForce)
+	}
+	return s.SocialBase.Config.AuthCodeURL(state, opts...)
+}
+
+func (s *SocialGoogle) extractFromToken(ctx context.Context, client *http.Client, token *oauth2.Token) (*googleUserData, error) {
+	s.log.Debug("Extracting user info from OAuth token")
+
+	idToken := token.Extra("id_token")
+	if idToken == nil {
+		s.log.Debug("No id_token found, defaulting to API access", "token", token)
+		return nil, nil
+	}
+
+	rawJSON, err := s.retrieveRawIDToken(idToken)
+	if err != nil {
+		s.log.Warn("Error retrieving id_token", "error", err, "token", fmt.Sprintf("%+v", idToken))
+		return nil, nil
+	}
+
+	if s.cfg.Env == setting.Dev {
+		s.log.Debug("Received id_token", "raw_json", string(rawJSON))
+	}
+
+	var data googleUserData
+	if err := json.Unmarshal(rawJSON, &data); err != nil {
+		return nil, fmt.Errorf("Error getting user info: %s", err)
+	}
+
+	data.rawJSON = rawJSON
+
+	return &data, nil
+}
+
+type googleGroupResp struct {
+	Memberships []struct {
+		Group    string `json:"group"`
+		GroupKey struct {
+			ID string `json:"id"`
+		} `json:"groupKey"`
+		DisplayName string `json:"displayName"`
+	} `json:"memberships"`
+	NextPageToken string `json:"nextPageToken"`
+}
+
+func (s *SocialGoogle) retrieveGroups(ctx context.Context, client *http.Client, userData *googleUserData) ([]string, error) {
+	s.log.Debug("Retrieving groups", "scopes", s.Config.Scopes)
+	if !slices.Contains(s.Scopes, googleIAMScope) {
+		return nil, nil
+	}
+
+	groups := []string{}
+
+	url := fmt.Sprintf("%s?query=member_key_id=='%s'", googleIAMGroupsEndpoint, userData.Email)
+	nextPageToken := ""
+	for page, errPage := s.getGroupsPage(ctx, client, url, nextPageToken); ; page, errPage = s.getGroupsPage(ctx, client, url, nextPageToken) {
+		if errPage != nil {
+			return nil, errPage
+		}
+
+		for _, group := range page.Memberships {
+			groups = append(groups, group.GroupKey.ID)
+		}
+
+		nextPageToken = page.NextPageToken
+		if nextPageToken == "" {
+			break
+		}
+	}
+
+	return groups, nil
+}
+
+func (s *SocialGoogle) getGroupsPage(ctx context.Context, client *http.Client, url, nextPageToken string) (*googleGroupResp, error) {
+	if nextPageToken != "" {
+		url = fmt.Sprintf("%s&pageToken=%s", url, nextPageToken)
+	}
+
+	s.log.Debug("Retrieving groups", "url", url)
+	resp, err := s.httpGet(ctx, client, url)
+	if err != nil {
+		return nil, fmt.Errorf("error getting groups: %s", err)
+	}
+
+	var data googleGroupResp
+	if err := json.Unmarshal(resp.Body, &data); err != nil {
+		return nil, fmt.Errorf("error unmarshalling groups: %s", err)
+	}
+
+	return &data, nil
+}
+
+func (s *SocialGoogle) isHDAllowed(hd string) error {
+	if s.validateHD {
+		return nil
+	}
+
+	if len(s.info.AllowedDomains) == 0 {
+		return nil
+	}
+
+	for _, allowedDomain := range s.info.AllowedDomains {
+		if hd == allowedDomain {
+			return nil
+		}
+	}
+
+	return errutil.Forbidden("the hd claim found in the ID token is not present in the allowed domains", errutil.WithPublicMessage("Invalid domain"))
+}
diff --git a/pkg/login/social/connectors/google_oauth_test.go b/pkg/login/social/connectors/google_oauth_test.go
new file mode 100644
index 0000000000000..64b40f5913020
--- /dev/null
+++ b/pkg/login/social/connectors/google_oauth_test.go
@@ -0,0 +1,944 @@
+package connectors
+
+import (
+	"context"
+	"errors"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+	"time"
+
+	"github.com/go-jose/go-jose/v3"
+	"github.com/go-jose/go-jose/v3/jwt"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"golang.org/x/oauth2"
+
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/models/roletype"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	ssoModels "github.com/grafana/grafana/pkg/services/ssosettings/models"
+	"github.com/grafana/grafana/pkg/services/ssosettings/ssosettingstests"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+func TestSocialGoogle_retrieveGroups(t *testing.T) {
+	type fields struct {
+		Scopes []string
+	}
+	type args struct {
+		client   *http.Client
+		userData *googleUserData
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		args    args
+		want    []string
+		wantErr bool
+	}{
+		{
+			name: "No scope",
+			fields: fields{
+				Scopes: []string{},
+			},
+			args: args{
+				client: &http.Client{},
+				userData: &googleUserData{
+					Email: "test@example.com",
+				},
+			},
+			want:    nil,
+			wantErr: false,
+		},
+		{
+			name: "No groups",
+			fields: fields{
+				Scopes: []string{"https://www.googleapis.com/auth/cloud-identity.groups.readonly"},
+			},
+			args: args{
+				client: &http.Client{
+					Transport: &roundTripperFunc{
+						fn: func(req *http.Request) (*http.Response, error) {
+							resp := httptest.NewRecorder()
+							_, _ = resp.WriteString(`{
+                                "memberships": [
+                                ],
+                                "nextPageToken": ""
+                            }`)
+							return resp.Result(), nil
+						},
+					},
+				},
+				userData: &googleUserData{
+					Email: "test@example.com",
+				},
+			},
+			want:    []string{},
+			wantErr: false,
+		},
+		{
+			name: "error retrieving groups",
+			fields: fields{
+				Scopes: []string{"https://www.googleapis.com/auth/cloud-identity.groups.readonly"},
+			},
+			args: args{
+				client: &http.Client{
+					Transport: &roundTripperFunc{
+						fn: func(req *http.Request) (*http.Response, error) {
+							return nil, errors.New("error retrieving groups")
+						},
+					},
+				},
+				userData: &googleUserData{
+					Email: "test@example.com",
+				},
+			},
+			want:    nil,
+			wantErr: true,
+		},
+
+		{
+			name: "Has 2 pages to fetch",
+			fields: fields{
+				Scopes: []string{"https://www.googleapis.com/auth/cloud-identity.groups.readonly"},
+			},
+			args: args{
+				client: &http.Client{
+					Transport: &roundTripperFunc{
+						fn: func(req *http.Request) (*http.Response, error) {
+							resp := httptest.NewRecorder()
+							// First page
+							if req.URL.Query().Get("pageToken") == "" {
+								_, _ = resp.WriteString(`{
+                        "memberships": [
+                            {
+                                "group": "test-group",
+                                "groupKey": {
+                                    "id": "test-group@google.com"
+                                },
+                                "displayName": "Test Group"
+                            }
+                        ],
+                        "nextPageToken": "page-2"
+                    }`)
+							} else {
+								// Second page
+								_, _ = resp.WriteString(`{
+                        "memberships": [
+                            {
+                                "group": "test-group-2",
+                                "groupKey": {
+                                    "id": "test-group-2@google.com"
+                                },
+                                "displayName": "Test Group 2"
+                            }
+                        ],
+                        "nextPageToken": ""
+                    }`)
+							}
+							return resp.Result(), nil
+						},
+					},
+				},
+				userData: &googleUserData{
+					Email: "test@example.com",
+				},
+			},
+			want:    []string{"test-group@google.com", "test-group-2@google.com"},
+			wantErr: false,
+		},
+		{
+			name: "Has one page to fetch",
+			fields: fields{
+				Scopes: []string{"https://www.googleapis.com/auth/cloud-identity.groups.readonly"},
+			},
+			args: args{
+				client: &http.Client{
+					Transport: &roundTripperFunc{
+						fn: func(req *http.Request) (*http.Response, error) {
+							resp := httptest.NewRecorder()
+							_, _ = resp.WriteString(`{
+                                "memberships": [
+                                    {
+                                        "group": "test-group",
+                                        "groupKey": {
+                                            "id": "test-group@google.com"
+                                        },
+                                        "displayName": "Test Group"
+                                    }
+                                ],
+                                "nextPageToken": ""
+                            }`)
+							return resp.Result(), nil
+						},
+					},
+				},
+				userData: &googleUserData{
+					Email: "test@example.com",
+				},
+			},
+			want:    []string{"test-group@google.com"},
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			s := NewGoogleProvider(
+				&social.OAuthInfo{
+					ApiUrl:                  "",
+					Scopes:                  tt.fields.Scopes,
+					HostedDomain:            "",
+					AllowedDomains:          []string{},
+					AllowSignup:             false,
+					RoleAttributePath:       "",
+					RoleAttributeStrict:     false,
+					AllowAssignGrafanaAdmin: false,
+					SkipOrgRoleSync:         false,
+				},
+				&setting.Cfg{
+					AutoAssignOrgRole: "",
+				},
+				&ssosettingstests.MockService{},
+				featuremgmt.WithFeatures())
+
+			got, err := s.retrieveGroups(context.Background(), tt.args.client, tt.args.userData)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("SocialGoogle.retrieveGroups() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			require.Equal(t, tt.want, got)
+		})
+	}
+}
+
+type roundTripperFunc struct {
+	fn func(req *http.Request) (*http.Response, error)
+}
+
+func (f *roundTripperFunc) RoundTrip(req *http.Request) (*http.Response, error) {
+	return f.fn(req)
+}
+
+func TestSocialGoogle_UserInfo(t *testing.T) {
+	cl := jwt.Claims{
+		Subject:   "88888888888888",
+		Issuer:    "issuer",
+		NotBefore: jwt.NewNumericDate(time.Date(2016, 1, 1, 0, 0, 0, 0, time.UTC)),
+		Audience:  jwt.Audience{"823123"},
+	}
+
+	sig, err := jose.NewSigner(jose.SigningKey{Algorithm: jose.HS256, Key: []byte("secret")}, (&jose.SignerOptions{}).WithType("JWT"))
+	require.NoError(t, err)
+	idMap := map[string]any{
+		"email":          "test@example.com",
+		"name":           "Test User",
+		"hd":             "example.com",
+		"email_verified": true,
+	}
+
+	raw, err := jwt.Signed(sig).Claims(cl).Claims(idMap).CompactSerialize()
+	require.NoError(t, err)
+
+	tokenWithID := (&oauth2.Token{
+		AccessToken: "fake_token",
+	}).WithExtra(map[string]any{"id_token": raw})
+
+	tokenWithoutID := &oauth2.Token{}
+
+	type fields struct {
+		Scopes                  []string
+		apiURL                  string
+		allowedGroups           []string
+		roleAttributePath       string
+		roleAttributeStrict     bool
+		allowAssignGrafanaAdmin bool
+		skipOrgRoleSync         bool
+	}
+	type args struct {
+		client *http.Client
+		token  *oauth2.Token
+	}
+	tests := []struct {
+		name       string
+		fields     fields
+		args       args
+		wantData   *social.BasicUserInfo
+		wantErr    bool
+		wantErrMsg string
+	}{
+		{
+			name: "Success id_token",
+			fields: fields{
+				Scopes:          []string{},
+				skipOrgRoleSync: true,
+			},
+			args: args{
+				token: tokenWithID,
+			},
+			wantData: &social.BasicUserInfo{
+				Id:    "88888888888888",
+				Login: "test@example.com",
+				Email: "test@example.com",
+				Name:  "Test User",
+			},
+			wantErr: false,
+		},
+		{
+			name: "Success id_token - groups requested",
+			fields: fields{
+				Scopes:          []string{"https://www.googleapis.com/auth/cloud-identity.groups.readonly"},
+				skipOrgRoleSync: true,
+			},
+			args: args{
+				token: tokenWithID,
+				client: &http.Client{
+					Transport: &roundTripperFunc{
+						fn: func(req *http.Request) (*http.Response, error) {
+							resp := httptest.NewRecorder()
+							_, _ = resp.WriteString(`{
+                                "memberships": [
+                                    {
+                                        "group": "test-group",
+                                        "groupKey": {
+                                            "id": "test-group@google.com"
+                                        },
+                                        "displayName": "Test Group"
+                                    }
+                                ],
+                                "nextPageToken": ""
+                            }`)
+							return resp.Result(), nil
+						},
+					},
+				},
+			},
+			wantData: &social.BasicUserInfo{
+				Id:     "88888888888888",
+				Login:  "test@example.com",
+				Email:  "test@example.com",
+				Name:   "Test User",
+				Groups: []string{"test-group@google.com"},
+			},
+			wantErr: false,
+		},
+		{
+			name: "Legacy API URL",
+			fields: fields{
+				apiURL:          legacyAPIURL,
+				skipOrgRoleSync: true,
+			},
+			args: args{
+				token: tokenWithoutID,
+				client: &http.Client{
+					Transport: &roundTripperFunc{
+						fn: func(req *http.Request) (*http.Response, error) {
+							resp := httptest.NewRecorder()
+							_, _ = resp.WriteString(`{
+                                "id": "99999999999999",
+                                "name": "Test User",
+                                "email": "test@example.com",
+                                "verified_email": true
+                            }`)
+							return resp.Result(), nil
+						},
+					},
+				},
+			},
+			wantData: &social.BasicUserInfo{
+				Id:    "99999999999999",
+				Login: "test@example.com",
+				Email: "test@example.com",
+				Name:  "Test User",
+			},
+			wantErr: false,
+		},
+		{
+			name: "Legacy API URL - no id provided",
+			fields: fields{
+				apiURL:          legacyAPIURL,
+				skipOrgRoleSync: true,
+			},
+			args: args{
+				token: tokenWithoutID,
+				client: &http.Client{
+					Transport: &roundTripperFunc{
+						fn: func(req *http.Request) (*http.Response, error) {
+							resp := httptest.NewRecorder()
+							_, _ = resp.WriteString(`{
+                                "name": "Test User",
+                                "email": "test@example.com",
+                                "verified_email": true
+                            }`)
+							return resp.Result(), nil
+						},
+					},
+				},
+			},
+			wantData:   nil,
+			wantErr:    true,
+			wantErrMsg: "error getting user info: id is empty",
+		},
+		{
+			name: "Error unmarshalling legacy user info",
+			fields: fields{
+				apiURL: legacyAPIURL,
+			},
+			args: args{
+				token: tokenWithoutID,
+				client: &http.Client{
+					Transport: &roundTripperFunc{
+						fn: func(req *http.Request) (*http.Response, error) {
+							resp := httptest.NewRecorder()
+							_, _ = resp.WriteString(`invalid json`)
+							return resp.Result(), nil
+						},
+					},
+				},
+			},
+			wantData:   nil,
+			wantErr:    true,
+			wantErrMsg: "error unmarshalling legacy user info",
+		},
+		{
+			name: "Error getting user info",
+			fields: fields{
+				apiURL: "https://openidconnect.googleapis.com/v1/userinfo",
+			},
+			args: args{
+				token: tokenWithoutID,
+				client: &http.Client{
+					Transport: &roundTripperFunc{
+						fn: func(req *http.Request) (*http.Response, error) {
+							return nil, errors.New("error getting user info")
+						},
+					},
+				},
+			},
+			wantData:   nil,
+			wantErr:    true,
+			wantErrMsg: "error getting user info",
+		},
+		{
+			name: "Error unmarshalling user info",
+			fields: fields{
+				apiURL: "https://openidconnect.googleapis.com/v1/userinfo",
+			},
+			args: args{
+				token: tokenWithoutID,
+				client: &http.Client{
+					Transport: &roundTripperFunc{
+						fn: func(req *http.Request) (*http.Response, error) {
+							resp := httptest.NewRecorder()
+							_, _ = resp.WriteString(`invalid json`)
+							return resp.Result(), nil
+						},
+					},
+				},
+			},
+			wantData:   nil,
+			wantErr:    true,
+			wantErrMsg: "error unmarshalling user info",
+		},
+		{
+			name: "Success",
+			fields: fields{
+				apiURL:          "https://openidconnect.googleapis.com/v1/userinfo",
+				skipOrgRoleSync: true,
+			},
+			args: args{
+				token: tokenWithoutID,
+				client: &http.Client{
+					Transport: &roundTripperFunc{
+						fn: func(req *http.Request) (*http.Response, error) {
+							resp := httptest.NewRecorder()
+							_, _ = resp.WriteString(`{
+                                "sub": "92222222222222222",
+                                "name": "Test User",
+                                "email": "test@example.com",
+                                "email_verified": true
+                            }`)
+							return resp.Result(), nil
+						},
+					},
+				},
+			},
+			wantData: &social.BasicUserInfo{
+				Id:    "92222222222222222",
+				Name:  "Test User",
+				Email: "test@example.com",
+				Login: "test@example.com",
+			},
+			wantErr: false,
+		}, {
+			name: "Unverified Email userinfo",
+			fields: fields{
+				apiURL: "https://openidconnect.googleapis.com/v1/userinfo",
+			},
+			args: args{
+				token: tokenWithoutID,
+				client: &http.Client{
+					Transport: &roundTripperFunc{
+						fn: func(req *http.Request) (*http.Response, error) {
+							resp := httptest.NewRecorder()
+							_, _ = resp.WriteString(`{
+                                "sub": "92222222222222222",
+                                "name": "Test User",
+                                "email": "test@example.com",
+                                "email_verified": false
+                            }`)
+							return resp.Result(), nil
+						},
+					},
+				},
+			},
+			wantData:   nil,
+			wantErr:    true,
+			wantErrMsg: "email is not verified",
+		},
+		{
+			name: "not in allowed Groups",
+			fields: fields{
+				Scopes:        []string{"https://www.googleapis.com/auth/cloud-identity.groups.readonly"},
+				allowedGroups: []string{"not-that-one"},
+			},
+			args: args{
+				token: tokenWithID,
+				client: &http.Client{
+					Transport: &roundTripperFunc{
+						fn: func(req *http.Request) (*http.Response, error) {
+							resp := httptest.NewRecorder()
+							_, _ = resp.WriteString(`{
+                                "memberships": [
+                                    {
+                                        "group": "test-group",
+                                        "groupKey": {
+                                            "id": "test-group@google.com"
+                                        },
+                                        "displayName": "Test Group"
+                                    }
+                                ],
+                                "nextPageToken": ""
+                            }`)
+							return resp.Result(), nil
+						},
+					},
+				},
+			},
+			wantData: &social.BasicUserInfo{
+				Id:     "88888888888888",
+				Login:  "test@example.com",
+				Email:  "test@example.com",
+				Name:   "Test User",
+				Groups: []string{"test-group@google.com"},
+			},
+			wantErr:    true,
+			wantErrMsg: "user not a member of one of the required groups",
+		},
+		{
+			name: "Role mapping - strict",
+			fields: fields{
+				Scopes:              []string{},
+				allowedGroups:       []string{},
+				roleAttributePath:   "this",
+				roleAttributeStrict: true,
+			},
+			args: args{
+				token: tokenWithID,
+			},
+			wantData: &social.BasicUserInfo{
+				Id:     "88888888888888",
+				Login:  "test@example.com",
+				Email:  "test@example.com",
+				Name:   "Test User",
+				Groups: []string{"test-group@google.com"},
+			},
+			wantErr:    true,
+			wantErrMsg: "idP did not return a role attribute, but role_attribute_strict is set",
+		},
+		{
+			name: "role mapping from id_token - no allowed assign Grafana Admin",
+			fields: fields{
+				Scopes:                  []string{},
+				allowAssignGrafanaAdmin: false,
+				roleAttributePath:       "email_verified && 'GrafanaAdmin'",
+			},
+			args: args{
+				token: tokenWithID,
+			},
+			wantData: &social.BasicUserInfo{
+				Id:             "88888888888888",
+				Login:          "test@example.com",
+				Email:          "test@example.com",
+				Name:           "Test User",
+				Role:           roletype.RoleAdmin,
+				IsGrafanaAdmin: nil,
+			},
+			wantErr: false,
+		},
+		{
+			name: "role mapping from id_token - allowed assign Grafana Admin",
+			fields: fields{
+				Scopes:                  []string{},
+				allowAssignGrafanaAdmin: true,
+				roleAttributePath:       "email_verified && 'GrafanaAdmin'",
+			},
+			args: args{
+				token: tokenWithID,
+			},
+			wantData: &social.BasicUserInfo{
+				Id:             "88888888888888",
+				Login:          "test@example.com",
+				Email:          "test@example.com",
+				Name:           "Test User",
+				Role:           roletype.RoleAdmin,
+				IsGrafanaAdmin: trueBoolPtr(),
+			},
+			wantErr: false,
+		},
+		{
+			name: "mapping from groups",
+			fields: fields{
+				Scopes:            []string{"https://www.googleapis.com/auth/cloud-identity.groups.readonly"},
+				roleAttributePath: "contains(groups[*], 'test-group@google.com') && 'Editor'",
+			},
+			args: args{
+				token: tokenWithID,
+				client: &http.Client{
+					Transport: &roundTripperFunc{
+						fn: func(req *http.Request) (*http.Response, error) {
+							resp := httptest.NewRecorder()
+							_, _ = resp.WriteString(`{
+                                "memberships": [
+                                    {
+                                        "group": "test-group",
+                                        "groupKey": {
+                                            "id": "test-group@google.com"
+                                        },
+                                        "displayName": "Test Group"
+                                    }
+                                ],
+                                "nextPageToken": ""
+                            }`)
+							return resp.Result(), nil
+						},
+					},
+				},
+			},
+			wantData: &social.BasicUserInfo{
+				Id:     "88888888888888",
+				Login:  "test@example.com",
+				Email:  "test@example.com",
+				Name:   "Test User",
+				Role:   "Editor",
+				Groups: []string{"test-group@google.com"},
+			},
+			wantErr: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			s := NewGoogleProvider(
+				&social.OAuthInfo{
+					ApiUrl:                  tt.fields.apiURL,
+					Scopes:                  tt.fields.Scopes,
+					AllowedGroups:           tt.fields.allowedGroups,
+					AllowSignup:             false,
+					RoleAttributePath:       tt.fields.roleAttributePath,
+					RoleAttributeStrict:     tt.fields.roleAttributeStrict,
+					AllowAssignGrafanaAdmin: tt.fields.allowAssignGrafanaAdmin,
+					SkipOrgRoleSync:         tt.fields.skipOrgRoleSync,
+				},
+				&setting.Cfg{},
+				&ssosettingstests.MockService{},
+				featuremgmt.WithFeatures())
+
+			gotData, err := s.UserInfo(context.Background(), tt.args.client, tt.args.token)
+			if tt.wantErr {
+				require.Error(t, err)
+				assert.Contains(t, err.Error(), tt.wantErrMsg)
+			} else {
+				require.NoError(t, err)
+				assert.Equal(t, tt.wantData, gotData)
+			}
+		})
+	}
+}
+
+func TestSocialGoogle_Validate(t *testing.T) {
+	testCases := []struct {
+		name      string
+		settings  ssoModels.SSOSettings
+		requester identity.Requester
+		wantErr   error
+	}{
+		{
+			name: "SSOSettings is valid",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":                  "client-id",
+					"allow_assign_grafana_admin": "true",
+					"auth_url":                   "",
+					"token_url":                  "",
+					"api_url":                    "",
+				},
+			},
+			requester: &user.SignedInUser{IsGrafanaAdmin: true},
+		},
+		{
+			name: "fails if settings map contains an invalid field",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":     "client-id",
+					"invalid_field": []int{1, 2, 3},
+				},
+			},
+			wantErr: ssosettings.ErrInvalidSettings,
+		},
+		{
+			name: "fails if client id is empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if client id does not exist",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if both allow assign grafana admin and skip org role sync are enabled",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":                  "client-id",
+					"allow_assign_grafana_admin": "true",
+					"skip_org_role_sync":         "true",
+					"auth_url":                   "https://example.com/auth",
+					"token_url":                  "https://example.com/token",
+				},
+			},
+			requester: &user.SignedInUser{IsGrafanaAdmin: true},
+			wantErr:   ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if the user is not allowed to update allow assign grafana admin",
+			requester: &user.SignedInUser{
+				IsGrafanaAdmin: false,
+			},
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":                  "client-id",
+					"allow_assign_grafana_admin": "true",
+					"auth_url":                   "https://example.com/auth",
+					"token_url":                  "https://example.com/token",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if api url is not empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"auth_url":  "",
+					"token_url": "",
+					"api_url":   "https://example.com/api",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if token url is empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"auth_url":  "https://example.com/auth",
+					"token_url": "",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if auth url is not empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"auth_url":  "https://example.com/auth",
+					"token_url": "",
+					"api_url":   "",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if api token url is not empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"auth_url":  "",
+					"token_url": "https://example.com/token",
+					"api_url":   "",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := NewGoogleProvider(&social.OAuthInfo{}, &setting.Cfg{}, &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+
+			if tc.requester == nil {
+				tc.requester = &user.SignedInUser{IsGrafanaAdmin: false}
+			}
+
+			err := s.Validate(context.Background(), tc.settings, tc.requester)
+			if tc.wantErr != nil {
+				require.ErrorIs(t, err, tc.wantErr)
+				return
+			}
+			require.NoError(t, err)
+		})
+	}
+}
+
+func TestSocialGoogle_Reload(t *testing.T) {
+	testCases := []struct {
+		name           string
+		info           *social.OAuthInfo
+		settings       ssoModels.SSOSettings
+		expectError    bool
+		expectedInfo   *social.OAuthInfo
+		expectedConfig *oauth2.Config
+	}{
+		{
+			name: "SSO provider successfully updated",
+			info: &social.OAuthInfo{
+				ClientId:     "client-id",
+				ClientSecret: "client-secret",
+			},
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":     "new-client-id",
+					"client_secret": "new-client-secret",
+					"auth_url":      "some-new-url",
+				},
+			},
+			expectError: false,
+			expectedInfo: &social.OAuthInfo{
+				ClientId:     "new-client-id",
+				ClientSecret: "new-client-secret",
+				AuthUrl:      "some-new-url",
+			},
+			expectedConfig: &oauth2.Config{
+				ClientID:     "new-client-id",
+				ClientSecret: "new-client-secret",
+				Endpoint: oauth2.Endpoint{
+					AuthURL: "some-new-url",
+				},
+				RedirectURL: "/login/google",
+			},
+		},
+		{
+			name: "fails if settings contain invalid values",
+			info: &social.OAuthInfo{
+				ClientId:     "client-id",
+				ClientSecret: "client-secret",
+			},
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":     "new-client-id",
+					"client_secret": "new-client-secret",
+					"auth_url":      []string{"first", "second"},
+				},
+			},
+			expectError: true,
+			expectedInfo: &social.OAuthInfo{
+				ClientId:     "client-id",
+				ClientSecret: "client-secret",
+			},
+			expectedConfig: &oauth2.Config{
+				ClientID:     "client-id",
+				ClientSecret: "client-secret",
+				RedirectURL:  "/login/google",
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := NewGoogleProvider(tc.info, &setting.Cfg{}, &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+
+			err := s.Reload(context.Background(), tc.settings)
+			if tc.expectError {
+				require.Error(t, err)
+				return
+			}
+			require.NoError(t, err)
+
+			require.EqualValues(t, tc.expectedInfo, s.info)
+			require.EqualValues(t, tc.expectedConfig, s.Config)
+		})
+	}
+}
+
+func TestIsHDAllowed(t *testing.T) {
+	testCases := []struct {
+		name                 string
+		email                string
+		allowedDomains       []string
+		expectedErrorMessage string
+		validateHD           bool
+	}{
+		{
+			name:                 "should not fail if no allowed domains are set",
+			email:                "mycompany.com",
+			allowedDomains:       []string{},
+			expectedErrorMessage: "",
+		},
+		{
+			name:                 "should not fail if email is from allowed domain",
+			email:                "mycompany.com",
+			allowedDomains:       []string{"grafana.com", "mycompany.com", "example.com"},
+			expectedErrorMessage: "",
+		},
+		{
+			name:                 "should fail if email is not from allowed domain",
+			email:                "mycompany.com",
+			allowedDomains:       []string{"grafana.com", "example.com"},
+			expectedErrorMessage: "the hd claim found in the ID token is not present in the allowed domains",
+		},
+		{
+			name:           "should not fail if the HD validation is disabled and the email not being from an allowed domain",
+			email:          "mycompany.com",
+			allowedDomains: []string{"grafana.com", "example.com"},
+			validateHD:     true,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			info := &social.OAuthInfo{}
+			info.AllowedDomains = tc.allowedDomains
+			s := NewGoogleProvider(info, &setting.Cfg{}, &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+			s.validateHD = tc.validateHD
+			err := s.isHDAllowed(tc.email)
+
+			if tc.expectedErrorMessage != "" {
+				require.Error(t, err)
+				require.Contains(t, err.Error(), tc.expectedErrorMessage)
+			} else {
+				require.NoError(t, err)
+			}
+		})
+	}
+}
diff --git a/pkg/login/social/connectors/grafana_com_oauth.go b/pkg/login/social/connectors/grafana_com_oauth.go
new file mode 100644
index 0000000000000..c68ecb2d8e8bf
--- /dev/null
+++ b/pkg/login/social/connectors/grafana_com_oauth.go
@@ -0,0 +1,163 @@
+package connectors
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+
+	"golang.org/x/oauth2"
+
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/models/roletype"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	ssoModels "github.com/grafana/grafana/pkg/services/ssosettings/models"
+	"github.com/grafana/grafana/pkg/services/ssosettings/validation"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util"
+)
+
+var ExtraGrafanaComSettingKeys = map[string]ExtraKeyInfo{
+	allowedOrganizationsKey: {Type: String, DefaultValue: ""},
+}
+
+var _ social.SocialConnector = (*SocialGrafanaCom)(nil)
+var _ ssosettings.Reloadable = (*SocialGrafanaCom)(nil)
+
+type SocialGrafanaCom struct {
+	*SocialBase
+	url                  string
+	allowedOrganizations []string
+}
+
+type OrgRecord struct {
+	Login string `json:"login"`
+}
+
+func NewGrafanaComProvider(info *social.OAuthInfo, cfg *setting.Cfg, ssoSettings ssosettings.Service, features featuremgmt.FeatureToggles) *SocialGrafanaCom {
+	// Override necessary settings
+	info.AuthUrl = cfg.GrafanaComURL + "/oauth2/authorize"
+	info.TokenUrl = cfg.GrafanaComURL + "/api/oauth2/token"
+	info.AuthStyle = "inheader"
+
+	provider := &SocialGrafanaCom{
+		SocialBase:           newSocialBase(social.GrafanaComProviderName, info, features, cfg),
+		url:                  cfg.GrafanaComURL,
+		allowedOrganizations: util.SplitString(info.Extra[allowedOrganizationsKey]),
+	}
+
+	if features.IsEnabledGlobally(featuremgmt.FlagSsoSettingsApi) {
+		ssoSettings.RegisterReloadable(social.GrafanaComProviderName, provider)
+	}
+
+	return provider
+}
+
+func (s *SocialGrafanaCom) Validate(ctx context.Context, settings ssoModels.SSOSettings, requester identity.Requester) error {
+	info, err := CreateOAuthInfoFromKeyValues(settings.Settings)
+	if err != nil {
+		return ssosettings.ErrInvalidSettings.Errorf("SSO settings map cannot be converted to OAuthInfo: %v", err)
+	}
+
+	err = validateInfo(info, requester)
+	if err != nil {
+		return err
+	}
+
+	return validation.Validate(info, requester,
+		validation.MustBeEmptyValidator(info.AuthUrl, "Auth URL"),
+		validation.MustBeEmptyValidator(info.TokenUrl, "Token URL"),
+		validation.MustBeEmptyValidator(info.TeamsUrl, "Teams URL"))
+}
+
+func (s *SocialGrafanaCom) Reload(ctx context.Context, settings ssoModels.SSOSettings) error {
+	newInfo, err := CreateOAuthInfoFromKeyValues(settings.Settings)
+	if err != nil {
+		return ssosettings.ErrInvalidSettings.Errorf("SSO settings map cannot be converted to OAuthInfo: %v", err)
+	}
+
+	// Override necessary settings
+	newInfo.AuthUrl = s.cfg.GrafanaComURL + "/oauth2/authorize"
+	newInfo.TokenUrl = s.cfg.GrafanaComURL + "/api/oauth2/token"
+	newInfo.AuthStyle = "inheader"
+
+	s.reloadMutex.Lock()
+	defer s.reloadMutex.Unlock()
+
+	s.updateInfo(social.GrafanaComProviderName, newInfo)
+
+	s.url = s.cfg.GrafanaComURL
+	s.allowedOrganizations = util.SplitString(newInfo.Extra[allowedOrganizationsKey])
+
+	return nil
+}
+
+func (s *SocialGrafanaCom) IsEmailAllowed(email string) bool {
+	return true
+}
+
+func (s *SocialGrafanaCom) isOrganizationMember(organizations []OrgRecord) bool {
+	if len(s.allowedOrganizations) == 0 {
+		return true
+	}
+
+	for _, allowedOrganization := range s.allowedOrganizations {
+		for _, organization := range organizations {
+			if organization.Login == allowedOrganization {
+				return true
+			}
+		}
+	}
+
+	return false
+}
+
+// UserInfo is used for login credentials for the user
+func (s *SocialGrafanaCom) UserInfo(ctx context.Context, client *http.Client, _ *oauth2.Token) (*social.BasicUserInfo, error) {
+	s.reloadMutex.RLock()
+	defer s.reloadMutex.RUnlock()
+
+	var data struct {
+		Id    int         `json:"id"`
+		Name  string      `json:"name"`
+		Login string      `json:"username"`
+		Email string      `json:"email"`
+		Role  string      `json:"role"`
+		Orgs  []OrgRecord `json:"orgs"`
+	}
+
+	response, err := s.httpGet(ctx, client, s.url+"/api/oauth2/user")
+
+	if err != nil {
+		return nil, fmt.Errorf("Error getting user info: %s", err)
+	}
+
+	err = json.Unmarshal(response.Body, &data)
+	if err != nil {
+		return nil, fmt.Errorf("Error getting user info: %s", err)
+	}
+
+	// on login we do not want to display the role from the external provider
+	var role roletype.RoleType
+	if !s.info.SkipOrgRoleSync {
+		role = org.RoleType(data.Role)
+	}
+	userInfo := &social.BasicUserInfo{
+		Id:    fmt.Sprintf("%d", data.Id),
+		Name:  data.Name,
+		Login: data.Login,
+		Email: data.Email,
+		Role:  role,
+	}
+
+	if !s.isOrganizationMember(data.Orgs) {
+		return nil, ErrMissingOrganizationMembership.Errorf(
+			"User is not a member of any of the allowed organizations: %v. Returned Organizations: %v",
+			s.allowedOrganizations, data.Orgs)
+	}
+
+	return userInfo, nil
+}
diff --git a/pkg/login/social/connectors/grafana_com_oauth_test.go b/pkg/login/social/connectors/grafana_com_oauth_test.go
new file mode 100644
index 0000000000000..dc800775f897c
--- /dev/null
+++ b/pkg/login/social/connectors/grafana_com_oauth_test.go
@@ -0,0 +1,371 @@
+package connectors
+
+import (
+	"context"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"golang.org/x/oauth2"
+
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	ssoModels "github.com/grafana/grafana/pkg/services/ssosettings/models"
+	"github.com/grafana/grafana/pkg/services/ssosettings/ssosettingstests"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+const (
+	UserInfoURL  = "/api/oauth2/user"
+	userResponse = `{
+		"id": 123,
+		"name": "grafana name",
+		"login": "grafanalogin",
+		"username": "grafanalogin",
+		"email": "grafana@grafana.com",
+		"role": "Admin",
+		"orgs": [    {      "login": "grafana",      "role": "Admin"    } ]
+	}`
+)
+
+func TestSocialGrafanaCom_UserInfo(t *testing.T) {
+	provider := NewGrafanaComProvider(social.NewOAuthInfo(), &setting.Cfg{}, &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+
+	type conf struct {
+		skipOrgRoleSync bool
+	}
+
+	tests := []struct {
+		Name          string
+		Cfg           conf
+		userInfoResp  string
+		want          *social.BasicUserInfo
+		ExpectedError error
+	}{
+		{
+			Name:         "should return empty role as userInfo when Skip Org Role Sync Enabled",
+			userInfoResp: userResponse,
+			Cfg:          conf{skipOrgRoleSync: true},
+			want: &social.BasicUserInfo{
+				Id:    "1",
+				Name:  "Eric Leijonmarck",
+				Email: "octocat@github.com",
+				Login: "octocat",
+				Role:  "",
+			},
+		},
+		{
+			Name:         "should return role as userInfo when Skip Org Role Sync Enabled",
+			userInfoResp: userResponse,
+			Cfg:          conf{skipOrgRoleSync: false},
+			want: &social.BasicUserInfo{
+				Id:    "1",
+				Name:  "Eric Leijonmarck",
+				Email: "octocat@github.com",
+				Login: "octocat",
+				Role:  "Admin",
+			},
+		},
+	}
+
+	for _, test := range tests {
+		provider.info.SkipOrgRoleSync = test.Cfg.skipOrgRoleSync
+
+		t.Run(test.Name, func(t *testing.T) {
+			ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusOK)
+				w.Header().Set("Content-Type", "application/json")
+				switch r.RequestURI {
+				case UserInfoURL:
+					_, err := w.Write([]byte(test.userInfoResp))
+					require.NoError(t, err)
+				default:
+					w.WriteHeader(http.StatusNotFound)
+				}
+			}))
+			provider.url = ts.URL
+			actualResult, err := provider.UserInfo(context.Background(), ts.Client(), nil)
+			if test.ExpectedError != nil {
+				require.Equal(t, err, test.ExpectedError)
+				return
+			}
+
+			require.NoError(t, err)
+			require.Equal(t, test.want.Role, actualResult.Role)
+		})
+	}
+}
+
+func TestSocialGrafanaCom_InitializeExtraFields(t *testing.T) {
+	type settingFields struct {
+		allowedOrganizations []string
+	}
+	testCases := []struct {
+		name     string
+		settings *social.OAuthInfo
+		want     settingFields
+	}{
+		{
+			name:     "allowedOrganizations is not set",
+			settings: social.NewOAuthInfo(),
+			want: settingFields{
+				allowedOrganizations: []string{},
+			},
+		},
+		{
+			name: "allowedOrganizations is set",
+			settings: &social.OAuthInfo{
+				Extra: map[string]string{
+					"allowed_organizations": "uuid-1234,uuid-5678",
+				},
+			},
+			want: settingFields{
+				allowedOrganizations: []string{"uuid-1234", "uuid-5678"},
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := NewGrafanaComProvider(tc.settings, &setting.Cfg{}, &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+
+			require.Equal(t, tc.want.allowedOrganizations, s.allowedOrganizations)
+		})
+	}
+}
+
+func TestSocialGrafanaCom_Validate(t *testing.T) {
+	testCases := []struct {
+		name        string
+		settings    ssoModels.SSOSettings
+		requester   identity.Requester
+		expectError bool
+	}{
+		{
+			name: "SSOSettings is valid",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":                  "client-id",
+					"allow_assign_grafana_admin": "true",
+				},
+			},
+			requester:   &user.SignedInUser{IsGrafanaAdmin: true},
+			expectError: false,
+		},
+		{
+			name: "fails if settings map contains an invalid field",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":     "client-id",
+					"invalid_field": []int{1, 2, 3},
+				},
+			},
+			expectError: true,
+		},
+		{
+			name: "fails if client id is empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "",
+				},
+			},
+			expectError: true,
+		},
+		{
+			name: "fails if client id does not exist",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{},
+			},
+			expectError: true,
+		},
+		{
+			name: "fails if the user is not allowed to update allow assign grafana admin",
+			requester: &user.SignedInUser{
+				IsGrafanaAdmin: false,
+			},
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":                  "client-id",
+					"allow_assign_grafana_admin": "true",
+					"skip_org_role_sync":         "true",
+				},
+			},
+			expectError: true,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := NewGrafanaComProvider(&social.OAuthInfo{}, &setting.Cfg{}, &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+
+			if tc.requester == nil {
+				tc.requester = &user.SignedInUser{IsGrafanaAdmin: false}
+			}
+
+			err := s.Validate(context.Background(), tc.settings, tc.requester)
+			if tc.expectError {
+				require.Error(t, err)
+			} else {
+				require.NoError(t, err)
+			}
+		})
+	}
+}
+
+func TestSocialGrafanaCom_Reload(t *testing.T) {
+	const GrafanaComURL = "http://localhost:3000"
+
+	testCases := []struct {
+		name           string
+		info           *social.OAuthInfo
+		settings       ssoModels.SSOSettings
+		expectError    bool
+		expectedInfo   *social.OAuthInfo
+		expectedConfig *oauth2.Config
+	}{
+		{
+			name: "SSO provider successfully updated",
+			info: &social.OAuthInfo{
+				ClientId:     "client-id",
+				ClientSecret: "client-secret",
+			},
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":     "new-client-id",
+					"client_secret": "new-client-secret",
+					"name":          "a-new-name",
+				},
+			},
+			expectError: false,
+			expectedInfo: &social.OAuthInfo{
+				ClientId:     "new-client-id",
+				ClientSecret: "new-client-secret",
+				Name:         "a-new-name",
+				AuthUrl:      GrafanaComURL + "/oauth2/authorize",
+				TokenUrl:     GrafanaComURL + "/api/oauth2/token",
+				AuthStyle:    "inheader",
+			},
+			expectedConfig: &oauth2.Config{
+				ClientID:     "new-client-id",
+				ClientSecret: "new-client-secret",
+				Endpoint: oauth2.Endpoint{
+					AuthURL:   GrafanaComURL + "/oauth2/authorize",
+					TokenURL:  GrafanaComURL + "/api/oauth2/token",
+					AuthStyle: oauth2.AuthStyleInHeader,
+				},
+				RedirectURL: "/login/grafana_com",
+			},
+		},
+		{
+			name: "fails if settings contain invalid values",
+			info: &social.OAuthInfo{
+				ClientId:     "client-id",
+				ClientSecret: "client-secret",
+			},
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":     "new-client-id",
+					"client_secret": "new-client-secret",
+					"auth_url":      []string{"first", "second"},
+				},
+			},
+			expectError: true,
+			expectedInfo: &social.OAuthInfo{
+				ClientId:     "client-id",
+				ClientSecret: "client-secret",
+				// these are the overwrites from the constructor
+				AuthUrl:   GrafanaComURL + "/oauth2/authorize",
+				TokenUrl:  GrafanaComURL + "/api/oauth2/token",
+				AuthStyle: "inheader",
+			},
+			expectedConfig: &oauth2.Config{
+				ClientID:     "client-id",
+				ClientSecret: "client-secret",
+				Endpoint: oauth2.Endpoint{
+					AuthURL:   GrafanaComURL + "/oauth2/authorize",
+					TokenURL:  GrafanaComURL + "/api/oauth2/token",
+					AuthStyle: oauth2.AuthStyleInHeader,
+				},
+				RedirectURL: "/login/grafana_com",
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			cfg := &setting.Cfg{
+				GrafanaComURL: GrafanaComURL,
+			}
+			s := NewGrafanaComProvider(tc.info, cfg, &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+
+			err := s.Reload(context.Background(), tc.settings)
+			if tc.expectError {
+				require.Error(t, err)
+				return
+			}
+
+			require.NoError(t, err)
+
+			require.EqualValues(t, tc.expectedInfo, s.info)
+			require.EqualValues(t, tc.expectedConfig, s.Config)
+		})
+	}
+}
+
+func TestSocialGrafanaCom_Reload_ExtraFields(t *testing.T) {
+	const GrafanaComURL = "http://localhost:3000"
+
+	testCases := []struct {
+		name                         string
+		settings                     ssoModels.SSOSettings
+		info                         *social.OAuthInfo
+		expectError                  bool
+		expectedInfo                 *social.OAuthInfo
+		expectedAllowedOrganizations []string
+	}{
+		{
+			name: "successfully reloads the allowed organizations when they are set in the settings",
+			info: &social.OAuthInfo{
+				ClientId:     "client-id",
+				ClientSecret: "client-secret",
+				Extra: map[string]string{
+					"allowed_organizations": "previous",
+				},
+			},
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"allowed_organizations": "uuid-1234,uuid-5678",
+				},
+			},
+			expectedInfo: &social.OAuthInfo{
+				ClientId:     "new-client-id",
+				ClientSecret: "new-client-secret",
+				Name:         "a-new-name",
+				AuthUrl:      GrafanaComURL + "/oauth2/authorize",
+				TokenUrl:     GrafanaComURL + "/api/oauth2/token",
+				AuthStyle:    "inheader",
+				Extra: map[string]string{
+					"allowed_organizations": "uuid-1234,uuid-5678",
+				},
+			},
+			expectedAllowedOrganizations: []string{"uuid-1234", "uuid-5678"},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			cfg := &setting.Cfg{
+				GrafanaComURL: GrafanaComURL,
+			}
+			s := NewGrafanaComProvider(tc.info, cfg, &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+
+			err := s.Reload(context.Background(), tc.settings)
+			require.NoError(t, err)
+
+			require.EqualValues(t, tc.expectedAllowedOrganizations, s.allowedOrganizations)
+		})
+	}
+}
diff --git a/pkg/login/social/connectors/okta_oauth.go b/pkg/login/social/connectors/okta_oauth.go
new file mode 100644
index 0000000000000..d548827c83cf7
--- /dev/null
+++ b/pkg/login/social/connectors/okta_oauth.go
@@ -0,0 +1,212 @@
+package connectors
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net/http"
+
+	"github.com/go-jose/go-jose/v3/jwt"
+	"golang.org/x/oauth2"
+
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/models/roletype"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	ssoModels "github.com/grafana/grafana/pkg/services/ssosettings/models"
+	"github.com/grafana/grafana/pkg/services/ssosettings/validation"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+var _ social.SocialConnector = (*SocialOkta)(nil)
+var _ ssosettings.Reloadable = (*SocialOkta)(nil)
+
+type SocialOkta struct {
+	*SocialBase
+}
+
+type OktaUserInfoJson struct {
+	Name        string              `json:"name"`
+	DisplayName string              `json:"display_name"`
+	Login       string              `json:"login"`
+	Username    string              `json:"username"`
+	Email       string              `json:"email"`
+	Upn         string              `json:"upn"`
+	Attributes  map[string][]string `json:"attributes"`
+	Groups      []string            `json:"groups"`
+	rawJSON     []byte
+}
+
+type OktaClaims struct {
+	ID                string `json:"sub"`
+	Email             string `json:"email"`
+	PreferredUsername string `json:"preferred_username"`
+	Name              string `json:"name"`
+}
+
+func NewOktaProvider(info *social.OAuthInfo, cfg *setting.Cfg, ssoSettings ssosettings.Service, features featuremgmt.FeatureToggles) *SocialOkta {
+	provider := &SocialOkta{
+		SocialBase: newSocialBase(social.OktaProviderName, info, features, cfg),
+	}
+
+	if info.UseRefreshToken {
+		appendUniqueScope(provider.Config, social.OfflineAccessScope)
+	}
+
+	if features.IsEnabledGlobally(featuremgmt.FlagSsoSettingsApi) {
+		ssoSettings.RegisterReloadable(social.OktaProviderName, provider)
+	}
+
+	return provider
+}
+
+func (s *SocialOkta) Validate(ctx context.Context, settings ssoModels.SSOSettings, requester identity.Requester) error {
+	info, err := CreateOAuthInfoFromKeyValues(settings.Settings)
+	if err != nil {
+		return ssosettings.ErrInvalidSettings.Errorf("SSO settings map cannot be converted to OAuthInfo: %v", err)
+	}
+
+	err = validateInfo(info, requester)
+	if err != nil {
+		return err
+	}
+
+	return validation.Validate(info, requester,
+		validation.RequiredUrlValidator(info.AuthUrl, "Auth URL"),
+		validation.RequiredUrlValidator(info.TokenUrl, "Token URL"),
+		validation.RequiredUrlValidator(info.ApiUrl, "API URL"))
+}
+
+func (s *SocialOkta) Reload(ctx context.Context, settings ssoModels.SSOSettings) error {
+	newInfo, err := CreateOAuthInfoFromKeyValues(settings.Settings)
+	if err != nil {
+		return ssosettings.ErrInvalidSettings.Errorf("SSO settings map cannot be converted to OAuthInfo: %v", err)
+	}
+
+	s.reloadMutex.Lock()
+	defer s.reloadMutex.Unlock()
+
+	s.updateInfo(social.OktaProviderName, newInfo)
+	if newInfo.UseRefreshToken {
+		appendUniqueScope(s.Config, social.OfflineAccessScope)
+	}
+
+	return nil
+}
+
+func (claims *OktaClaims) extractEmail() string {
+	if claims.Email == "" && claims.PreferredUsername != "" {
+		return claims.PreferredUsername
+	}
+
+	return claims.Email
+}
+
+func (s *SocialOkta) UserInfo(ctx context.Context, client *http.Client, token *oauth2.Token) (*social.BasicUserInfo, error) {
+	s.reloadMutex.RLock()
+	defer s.reloadMutex.RUnlock()
+
+	idToken := token.Extra("id_token")
+	if idToken == nil {
+		return nil, fmt.Errorf("no id_token found")
+	}
+
+	parsedToken, err := jwt.ParseSigned(idToken.(string))
+	if err != nil {
+		return nil, fmt.Errorf("error parsing id token: %w", err)
+	}
+
+	var claims OktaClaims
+	if err := parsedToken.UnsafeClaimsWithoutVerification(&claims); err != nil {
+		return nil, fmt.Errorf("error getting claims from id token: %w", err)
+	}
+
+	email := claims.extractEmail()
+	if email == "" {
+		return nil, errors.New("error getting user info: no email found in access token")
+	}
+
+	var data OktaUserInfoJson
+	err = s.extractAPI(ctx, &data, client)
+	if err != nil {
+		return nil, err
+	}
+
+	groups := s.getGroups(&data)
+	if !s.isGroupMember(groups) {
+		return nil, errMissingGroupMembership
+	}
+
+	var role roletype.RoleType
+	var isGrafanaAdmin *bool
+	if !s.info.SkipOrgRoleSync {
+		var grafanaAdmin bool
+		role, grafanaAdmin, err = s.extractRoleAndAdmin(data.rawJSON, groups)
+		if err != nil {
+			return nil, err
+		}
+
+		if s.info.AllowAssignGrafanaAdmin {
+			isGrafanaAdmin = &grafanaAdmin
+		}
+	}
+	if s.info.AllowAssignGrafanaAdmin && s.info.SkipOrgRoleSync {
+		s.log.Debug("AllowAssignGrafanaAdmin and skipOrgRoleSync are both set, Grafana Admin role will not be synced, consider setting one or the other")
+	}
+
+	return &social.BasicUserInfo{
+		Id:             claims.ID,
+		Name:           claims.Name,
+		Email:          email,
+		Login:          email,
+		Role:           role,
+		IsGrafanaAdmin: isGrafanaAdmin,
+		Groups:         groups,
+	}, nil
+}
+
+func (s *SocialOkta) extractAPI(ctx context.Context, data *OktaUserInfoJson, client *http.Client) error {
+	rawUserInfoResponse, err := s.httpGet(ctx, client, s.info.ApiUrl)
+	if err != nil {
+		s.log.Debug("Error getting user info response", "url", s.info.ApiUrl, "error", err)
+		return fmt.Errorf("error getting user info response: %w", err)
+	}
+	data.rawJSON = rawUserInfoResponse.Body
+
+	err = json.Unmarshal(data.rawJSON, data)
+	if err != nil {
+		s.log.Debug("Error decoding user info response", "raw_json", data.rawJSON, "error", err)
+		data.rawJSON = []byte{}
+		return fmt.Errorf("error decoding user info response: %w", err)
+	}
+
+	s.log.Debug("Received user info response", "raw_json", string(data.rawJSON), "data", data)
+	return nil
+}
+
+func (s *SocialOkta) getGroups(data *OktaUserInfoJson) []string {
+	groups := make([]string, 0)
+	if len(data.Groups) > 0 {
+		groups = data.Groups
+	}
+	return groups
+}
+
+// TODO: remove this in a separate PR and use the isGroupMember from the social.go
+func (s *SocialOkta) isGroupMember(groups []string) bool {
+	if len(s.info.AllowedGroups) == 0 {
+		return true
+	}
+
+	for _, allowedGroup := range s.info.AllowedGroups {
+		for _, group := range groups {
+			if group == allowedGroup {
+				return true
+			}
+		}
+	}
+
+	return false
+}
diff --git a/pkg/login/social/connectors/okta_oauth_test.go b/pkg/login/social/connectors/okta_oauth_test.go
new file mode 100644
index 0000000000000..c60e7b2438247
--- /dev/null
+++ b/pkg/login/social/connectors/okta_oauth_test.go
@@ -0,0 +1,377 @@
+package connectors
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+	"golang.org/x/oauth2"
+
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/models/roletype"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	ssoModels "github.com/grafana/grafana/pkg/services/ssosettings/models"
+	"github.com/grafana/grafana/pkg/services/ssosettings/ssosettingstests"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+func TestSocialOkta_UserInfo(t *testing.T) {
+	var boolPointer *bool
+
+	tests := []struct {
+		name                    string
+		userRawJSON             string
+		OAuth2Extra             any
+		autoAssignOrgRole       string
+		settingSkipOrgRoleSync  bool
+		allowAssignGrafanaAdmin bool
+		RoleAttributePath       string
+		ExpectedEmail           string
+		ExpectedRole            roletype.RoleType
+		ExpectedGrafanaAdmin    *bool
+		ExpectedErr             error
+		wantErr                 bool
+	}{
+		{
+			name:              "Should give role from JSON and email from id token",
+			userRawJSON:       `{ "email": "okta-octopus@grafana.com", "role": "Admin" }`,
+			RoleAttributePath: "role",
+			OAuth2Extra: map[string]any{
+				// {
+				// "email": "okto.octopus@test.com"
+				// },
+				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiQWRtaW4iLCJlbWFpbCI6Im9rdG8ub2N0b3B1c0B0ZXN0LmNvbSJ9.yhg0nvYCpMVCVrRvwtmHzhF0RJqid_YFbjJ_xuBCyHs",
+			},
+			ExpectedEmail:        "okto.octopus@test.com",
+			ExpectedRole:         "Admin",
+			ExpectedGrafanaAdmin: boolPointer,
+			wantErr:              false,
+		},
+		{
+			name:                   "Should give empty role and nil pointer for GrafanaAdmin when skip org role sync enable",
+			userRawJSON:            `{ "email": "okta-octopus@grafana.com", "role": "Admin" }`,
+			RoleAttributePath:      "role",
+			settingSkipOrgRoleSync: true,
+			OAuth2Extra: map[string]any{
+				// {
+				// "email": "okto.octopus@test.com"
+				// },
+				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiQWRtaW4iLCJlbWFpbCI6Im9rdG8ub2N0b3B1c0B0ZXN0LmNvbSJ9.yhg0nvYCpMVCVrRvwtmHzhF0RJqid_YFbjJ_xuBCyHs",
+			},
+			ExpectedEmail:        "okto.octopus@test.com",
+			ExpectedRole:         "",
+			ExpectedGrafanaAdmin: boolPointer,
+			wantErr:              false,
+		},
+		{
+			name:                    "Should give grafanaAdmin role for specific GrafanaAdmin in the role assignement",
+			userRawJSON:             fmt.Sprintf(`{ "email": "okta-octopus@grafana.com", "role": "%s" }`, social.RoleGrafanaAdmin),
+			RoleAttributePath:       "role",
+			allowAssignGrafanaAdmin: true,
+			OAuth2Extra: map[string]any{
+				// {
+				// "email": "okto.octopus@test.com"
+				// },
+				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiQWRtaW4iLCJlbWFpbCI6Im9rdG8ub2N0b3B1c0B0ZXN0LmNvbSJ9.yhg0nvYCpMVCVrRvwtmHzhF0RJqid_YFbjJ_xuBCyHs",
+			},
+			ExpectedEmail:        "okto.octopus@test.com",
+			ExpectedRole:         "Admin",
+			ExpectedGrafanaAdmin: trueBoolPtr(),
+			wantErr:              false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			server := httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
+				writer.WriteHeader(http.StatusOK)
+				// return JSON if matches user endpoint
+				if strings.HasSuffix(request.URL.String(), "/user") {
+					writer.Header().Set("Content-Type", "application/json")
+					_, err := writer.Write([]byte(tt.userRawJSON))
+					require.NoError(t, err)
+				} else {
+					writer.WriteHeader(http.StatusNotFound)
+				}
+			}))
+			defer server.Close()
+
+			provider := NewOktaProvider(
+				&social.OAuthInfo{
+					ApiUrl:                  server.URL + "/user",
+					RoleAttributePath:       tt.RoleAttributePath,
+					AllowAssignGrafanaAdmin: tt.allowAssignGrafanaAdmin,
+					SkipOrgRoleSync:         tt.settingSkipOrgRoleSync,
+				},
+				&setting.Cfg{
+					AutoAssignOrgRole: tt.autoAssignOrgRole,
+				},
+				&ssosettingstests.MockService{},
+				featuremgmt.WithFeatures())
+
+			// create a oauth2 token with a id_token
+			staticToken := oauth2.Token{
+				AccessToken:  "",
+				TokenType:    "",
+				RefreshToken: "",
+				Expiry:       time.Now(),
+			}
+			token := staticToken.WithExtra(tt.OAuth2Extra)
+			got, err := provider.UserInfo(context.Background(), server.Client(), token)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("UserInfo() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			require.Equal(t, tt.ExpectedEmail, got.Email)
+			require.Equal(t, tt.ExpectedRole, got.Role)
+			require.Equal(t, tt.ExpectedGrafanaAdmin, got.IsGrafanaAdmin)
+		})
+	}
+}
+
+func TestSocialOkta_Validate(t *testing.T) {
+	testCases := []struct {
+		name      string
+		settings  ssoModels.SSOSettings
+		requester identity.Requester
+		wantErr   error
+	}{
+		{
+			name: "SSOSettings is valid",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":                  "client-id",
+					"allow_assign_grafana_admin": "true",
+					"auth_url":                   "https://example.com/auth",
+					"token_url":                  "https://example.com/token",
+					"api_url":                    "https://example.com/api",
+				},
+			},
+			requester: &user.SignedInUser{IsGrafanaAdmin: true},
+		},
+		{
+			name: "fails if settings map contains an invalid field",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":     "client-id",
+					"invalid_field": []int{1, 2, 3},
+				},
+			},
+			wantErr: ssosettings.ErrInvalidSettings,
+		},
+		{
+			name: "fails if client id is empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if client id does not exist",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if both allow assign grafana admin and skip org role sync are enabled",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":                  "client-id",
+					"allow_assign_grafana_admin": "true",
+					"skip_org_role_sync":         "true",
+				},
+			},
+			requester: &user.SignedInUser{IsGrafanaAdmin: true},
+			wantErr:   ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if the user is not allowed to update allow assign grafana admin",
+			requester: &user.SignedInUser{
+				IsGrafanaAdmin: false,
+			},
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":                  "client-id",
+					"allow_assign_grafana_admin": "true",
+					"auth_url":                   "https://example.com/auth",
+					"token_url":                  "https://example.com/token",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if auth url is empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"auth_url":  "",
+					"token_url": "https://example.com/token",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if token url is empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"auth_url":  "https://example.com/auth",
+					"token_url": "",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if auth url is invalid",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"auth_url":  "invalid_url",
+					"token_url": "https://example.com/token",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if token url is invalid",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"auth_url":  "https://example.com/auth",
+					"token_url": "/path",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if api url is empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"auth_url":  "https://example.com/auth",
+					"token_url": "https://example.com/token",
+					"api_url":   "",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "fails if api url is invalid",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id": "client-id",
+					"auth_url":  "https://example.com/auth",
+					"api_url":   "/api",
+					"token_url": "https://example.com/token",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := NewOktaProvider(&social.OAuthInfo{}, &setting.Cfg{}, &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+
+			if tc.requester == nil {
+				tc.requester = &user.SignedInUser{IsGrafanaAdmin: false}
+			}
+			err := s.Validate(context.Background(), tc.settings, tc.requester)
+			if tc.wantErr != nil {
+				require.ErrorIs(t, err, tc.wantErr)
+				return
+			}
+			require.NoError(t, err)
+		})
+	}
+}
+
+func TestSocialOkta_Reload(t *testing.T) {
+	testCases := []struct {
+		name           string
+		info           *social.OAuthInfo
+		settings       ssoModels.SSOSettings
+		expectError    bool
+		expectedInfo   *social.OAuthInfo
+		expectedConfig *oauth2.Config
+	}{
+		{
+			name: "SSO provider successfully updated",
+			info: &social.OAuthInfo{
+				ClientId:     "client-id",
+				ClientSecret: "client-secret",
+			},
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":     "new-client-id",
+					"client_secret": "new-client-secret",
+					"auth_url":      "some-new-url",
+				},
+			},
+			expectError: false,
+			expectedInfo: &social.OAuthInfo{
+				ClientId:     "new-client-id",
+				ClientSecret: "new-client-secret",
+				AuthUrl:      "some-new-url",
+			},
+			expectedConfig: &oauth2.Config{
+				ClientID:     "new-client-id",
+				ClientSecret: "new-client-secret",
+				Endpoint: oauth2.Endpoint{
+					AuthURL: "some-new-url",
+				},
+				RedirectURL: "/login/okta",
+			},
+		},
+		{
+			name: "fails if settings contain invalid values",
+			info: &social.OAuthInfo{
+				ClientId:     "client-id",
+				ClientSecret: "client-secret",
+			},
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":     "new-client-id",
+					"client_secret": "new-client-secret",
+					"auth_url":      []string{"first", "second"},
+				},
+			},
+			expectError: true,
+			expectedInfo: &social.OAuthInfo{
+				ClientId:     "client-id",
+				ClientSecret: "client-secret",
+			},
+			expectedConfig: &oauth2.Config{
+				ClientID:     "client-id",
+				ClientSecret: "client-secret",
+				RedirectURL:  "/login/okta",
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := NewOktaProvider(tc.info, &setting.Cfg{}, &ssosettingstests.MockService{}, featuremgmt.WithFeatures())
+
+			err := s.Reload(context.Background(), tc.settings)
+			if tc.expectError {
+				require.Error(t, err)
+				return
+			}
+			require.NoError(t, err)
+
+			require.EqualValues(t, tc.expectedInfo, s.info)
+			require.EqualValues(t, tc.expectedConfig, s.Config)
+		})
+	}
+}
diff --git a/pkg/login/social/connectors/social_base.go b/pkg/login/social/connectors/social_base.go
new file mode 100644
index 0000000000000..6e53c13e7698c
--- /dev/null
+++ b/pkg/login/social/connectors/social_base.go
@@ -0,0 +1,273 @@
+package connectors
+
+import (
+	"bytes"
+	"compress/zlib"
+	"context"
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"regexp"
+	"strings"
+	"sync"
+
+	"golang.org/x/oauth2"
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/services/ssosettings/validation"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util"
+)
+
+type SocialBase struct {
+	*oauth2.Config
+	info        *social.OAuthInfo
+	cfg         *setting.Cfg
+	reloadMutex sync.RWMutex
+	log         log.Logger
+	features    featuremgmt.FeatureToggles
+}
+
+func newSocialBase(name string,
+	info *social.OAuthInfo,
+	features featuremgmt.FeatureToggles,
+	cfg *setting.Cfg,
+) *SocialBase {
+	logger := log.New("oauth." + name)
+
+	return &SocialBase{
+		Config:   createOAuthConfig(info, cfg, name),
+		info:     info,
+		log:      logger,
+		features: features,
+		cfg:      cfg,
+	}
+}
+
+func (s *SocialBase) updateInfo(name string, info *social.OAuthInfo) {
+	s.Config = createOAuthConfig(info, s.cfg, name)
+	s.info = info
+}
+
+type groupStruct struct {
+	Groups []string `json:"groups"`
+}
+
+func (s *SocialBase) SupportBundleContent(bf *bytes.Buffer) error {
+	s.reloadMutex.RLock()
+	defer s.reloadMutex.RUnlock()
+
+	return s.getBaseSupportBundleContent(bf)
+}
+
+func (s *SocialBase) GetOAuthInfo() *social.OAuthInfo {
+	s.reloadMutex.RLock()
+	defer s.reloadMutex.RUnlock()
+
+	return s.info
+}
+
+func (s *SocialBase) AuthCodeURL(state string, opts ...oauth2.AuthCodeOption) string {
+	s.reloadMutex.RLock()
+	defer s.reloadMutex.RUnlock()
+
+	return s.Config.AuthCodeURL(state, opts...)
+}
+
+func (s *SocialBase) Exchange(ctx context.Context, code string, opts ...oauth2.AuthCodeOption) (*oauth2.Token, error) {
+	s.reloadMutex.RLock()
+	defer s.reloadMutex.RUnlock()
+
+	return s.Config.Exchange(ctx, code, opts...)
+}
+
+func (s *SocialBase) Client(ctx context.Context, t *oauth2.Token) *http.Client {
+	s.reloadMutex.RLock()
+	defer s.reloadMutex.RUnlock()
+
+	return s.Config.Client(ctx, t)
+}
+
+func (s *SocialBase) TokenSource(ctx context.Context, t *oauth2.Token) oauth2.TokenSource {
+	s.reloadMutex.RLock()
+	defer s.reloadMutex.RUnlock()
+
+	return s.Config.TokenSource(ctx, t)
+}
+
+func (s *SocialBase) getBaseSupportBundleContent(bf *bytes.Buffer) error {
+	bf.WriteString("## Client configuration\n\n")
+	bf.WriteString("```ini\n")
+	bf.WriteString(fmt.Sprintf("allow_assign_grafana_admin = %v\n", s.info.AllowAssignGrafanaAdmin))
+	bf.WriteString(fmt.Sprintf("allow_sign_up = %v\n", s.info.AllowSignup))
+	bf.WriteString(fmt.Sprintf("allowed_domains = %v\n", s.info.AllowedDomains))
+	bf.WriteString(fmt.Sprintf("auto_assign_org_role = %v\n", s.cfg.AutoAssignOrgRole))
+	bf.WriteString(fmt.Sprintf("role_attribute_path = %v\n", s.info.RoleAttributePath))
+	bf.WriteString(fmt.Sprintf("role_attribute_strict = %v\n", s.info.RoleAttributeStrict))
+	bf.WriteString(fmt.Sprintf("skip_org_role_sync = %v\n", s.info.SkipOrgRoleSync))
+	bf.WriteString(fmt.Sprintf("client_id = %v\n", s.Config.ClientID))
+	bf.WriteString(fmt.Sprintf("client_secret = %v ; issue if empty\n", strings.Repeat("*", len(s.Config.ClientSecret))))
+	bf.WriteString(fmt.Sprintf("auth_url = %v\n", s.Config.Endpoint.AuthURL))
+	bf.WriteString(fmt.Sprintf("token_url = %v\n", s.Config.Endpoint.TokenURL))
+	bf.WriteString(fmt.Sprintf("auth_style = %v\n", s.Config.Endpoint.AuthStyle))
+	bf.WriteString(fmt.Sprintf("redirect_url = %v\n", s.Config.RedirectURL))
+	bf.WriteString(fmt.Sprintf("scopes = %v\n", s.Config.Scopes))
+	bf.WriteString("```\n\n")
+
+	return nil
+}
+
+func (s *SocialBase) extractRoleAndAdminOptional(rawJSON []byte, groups []string) (org.RoleType, bool, error) {
+	if s.info.RoleAttributePath == "" {
+		if s.info.RoleAttributeStrict {
+			return "", false, errRoleAttributePathNotSet.Errorf("role_attribute_path not set and role_attribute_strict is set")
+		}
+		return "", false, nil
+	}
+
+	if role, gAdmin := s.searchRole(rawJSON, groups); role.IsValid() {
+		return role, gAdmin, nil
+	} else if role != "" {
+		return "", false, errInvalidRole.Errorf("invalid role: %s", role)
+	}
+
+	if s.info.RoleAttributeStrict {
+		return "", false, errRoleAttributeStrictViolation.Errorf("idP did not return a role attribute, but role_attribute_strict is set")
+	}
+
+	return "", false, nil
+}
+
+func (s *SocialBase) extractRoleAndAdmin(rawJSON []byte, groups []string) (org.RoleType, bool, error) {
+	role, gAdmin, err := s.extractRoleAndAdminOptional(rawJSON, groups)
+	if role == "" {
+		role = s.defaultRole()
+	}
+
+	return role, gAdmin, err
+}
+
+func (s *SocialBase) searchRole(rawJSON []byte, groups []string) (org.RoleType, bool) {
+	role, err := util.SearchJSONForStringAttr(s.info.RoleAttributePath, rawJSON)
+	if err == nil && role != "" {
+		return getRoleFromSearch(role)
+	}
+
+	if groupBytes, err := json.Marshal(groupStruct{groups}); err == nil {
+		role, err := util.SearchJSONForStringAttr(s.info.RoleAttributePath, groupBytes)
+		if err == nil && role != "" {
+			return getRoleFromSearch(role)
+		}
+	}
+
+	return "", false
+}
+
+// defaultRole returns the default role for the user based on the autoAssignOrgRole setting
+// if legacy is enabled "" is returned indicating the previous role assignment is used.
+func (s *SocialBase) defaultRole() org.RoleType {
+	if s.cfg.AutoAssignOrgRole != "" {
+		s.log.Debug("No role found, returning default.")
+		return org.RoleType(s.cfg.AutoAssignOrgRole)
+	}
+
+	// should never happen
+	return org.RoleViewer
+}
+
+func (s *SocialBase) isGroupMember(groups []string) bool {
+	if len(s.info.AllowedGroups) == 0 {
+		return true
+	}
+
+	for _, allowedGroup := range s.info.AllowedGroups {
+		for _, group := range groups {
+			if group == allowedGroup {
+				return true
+			}
+		}
+	}
+
+	return false
+}
+
+func (s *SocialBase) retrieveRawIDToken(idToken any) ([]byte, error) {
+	tokenString, ok := idToken.(string)
+	if !ok {
+		return nil, fmt.Errorf("id_token is not a string: %v", idToken)
+	}
+
+	jwtRegexp := regexp.MustCompile("^([-_a-zA-Z0-9=]+)[.]([-_a-zA-Z0-9=]+)[.]([-_a-zA-Z0-9=]+)$")
+	matched := jwtRegexp.FindStringSubmatch(tokenString)
+	if matched == nil {
+		return nil, fmt.Errorf("id_token is not in JWT format: %s", tokenString)
+	}
+
+	rawJSON, err := base64.RawURLEncoding.DecodeString(matched[2])
+	if err != nil {
+		return nil, fmt.Errorf("error base64 decoding id_token: %w", err)
+	}
+
+	headerBytes, err := base64.RawURLEncoding.DecodeString(matched[1])
+	if err != nil {
+		return nil, fmt.Errorf("error base64 decoding header: %w", err)
+	}
+
+	var header map[string]any
+	if err := json.Unmarshal(headerBytes, &header); err != nil {
+		return nil, fmt.Errorf("error deserializing header: %w", err)
+	}
+
+	if compressionVal, exists := header["zip"]; exists {
+		compression, ok := compressionVal.(string)
+		if !ok {
+			return nil, fmt.Errorf("unrecognized compression header: %v", compressionVal)
+		}
+
+		if compression != "DEF" {
+			return nil, fmt.Errorf("unknown compression algorithm: %s", compression)
+		}
+
+		fr, err := zlib.NewReader(bytes.NewReader(rawJSON))
+		if err != nil {
+			return nil, fmt.Errorf("error creating zlib reader: %w", err)
+		}
+		defer func() {
+			if err := fr.Close(); err != nil {
+				s.log.Warn("Failed closing zlib reader", "error", err)
+			}
+		}()
+
+		rawJSON, err = io.ReadAll(fr)
+		if err != nil {
+			return nil, fmt.Errorf("error decompressing payload: %w", err)
+		}
+	}
+
+	return rawJSON, nil
+}
+
+// match grafana admin role and translate to org role and bool.
+// treat the JSON search result to ensure correct casing.
+func getRoleFromSearch(role string) (org.RoleType, bool) {
+	if strings.EqualFold(role, social.RoleGrafanaAdmin) {
+		return org.RoleAdmin, true
+	}
+
+	return org.RoleType(cases.Title(language.Und).String(role)), false
+}
+
+func validateInfo(info *social.OAuthInfo, requester identity.Requester) error {
+	return validation.Validate(info, requester,
+		validation.RequiredValidator(info.ClientId, "Client Id"),
+		validation.AllowAssignGrafanaAdminValidator,
+		validation.SkipOrgRoleSyncAllowAssignGrafanaAdminValidator)
+}
diff --git a/pkg/login/social/errors.go b/pkg/login/social/errors.go
deleted file mode 100644
index 187c8ec8c807c..0000000000000
--- a/pkg/login/social/errors.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package social
-
-import (
-	"errors"
-
-	"github.com/grafana/grafana/pkg/util/errutil"
-)
-
-var (
-	ErrIDTokenNotFound = errors.New("id_token not found")
-	ErrEmailNotFound   = errors.New("error getting user info: no email found in access token")
-
-	errRoleAttributePathNotSet = errutil.BadRequest("oauth.role_attribute_path_not_set",
-		errutil.WithPublicMessage("Instance role_attribute_path misconfigured, please contact your administrator"))
-
-	errRoleAttributeStrictViolation = errutil.BadRequest("oauth.role_attribute_strict_violation",
-		errutil.WithPublicMessage("IdP did not return a role attribute, please contact your administrator"))
-
-	errInvalidRole = errutil.BadRequest("oauth.invalid_role",
-		errutil.WithPublicMessage("IdP did not return a valid role attribute, please contact your administrator"))
-)
diff --git a/pkg/login/social/generic_oauth.go b/pkg/login/social/generic_oauth.go
deleted file mode 100644
index 57cab0dee5792..0000000000000
--- a/pkg/login/social/generic_oauth.go
+++ /dev/null
@@ -1,505 +0,0 @@
-package social
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/http"
-	"net/mail"
-	"strconv"
-
-	"golang.org/x/oauth2"
-)
-
-type SocialGenericOAuth struct {
-	*SocialBase
-	allowedOrganizations []string
-	apiUrl               string
-	teamsUrl             string
-	emailAttributeName   string
-	emailAttributePath   string
-	loginAttributePath   string
-	nameAttributePath    string
-	groupsAttributePath  string
-	idTokenAttributeName string
-	teamIdsAttributePath string
-	teamIds              []string
-	allowedGroups        []string
-	skipOrgRoleSync      bool
-}
-
-func (s *SocialGenericOAuth) IsGroupMember(groups []string) bool {
-	if len(s.allowedGroups) == 0 {
-		return true
-	}
-
-	for _, allowedGroup := range s.allowedGroups {
-		for _, group := range groups {
-			if group == allowedGroup {
-				return true
-			}
-		}
-	}
-
-	return false
-}
-
-func (s *SocialGenericOAuth) IsTeamMember(ctx context.Context, client *http.Client) bool {
-	if len(s.teamIds) == 0 {
-		return true
-	}
-
-	teamMemberships, err := s.FetchTeamMemberships(ctx, client)
-	if err != nil {
-		return false
-	}
-
-	for _, teamId := range s.teamIds {
-		for _, membershipId := range teamMemberships {
-			if teamId == membershipId {
-				return true
-			}
-		}
-	}
-
-	return false
-}
-
-func (s *SocialGenericOAuth) IsOrganizationMember(ctx context.Context, client *http.Client) bool {
-	if len(s.allowedOrganizations) == 0 {
-		return true
-	}
-
-	organizations, ok := s.FetchOrganizations(ctx, client)
-	if !ok {
-		return false
-	}
-
-	for _, allowedOrganization := range s.allowedOrganizations {
-		for _, organization := range organizations {
-			if organization == allowedOrganization {
-				return true
-			}
-		}
-	}
-
-	return false
-}
-
-type UserInfoJson struct {
-	Sub         string              `json:"sub"`
-	Name        string              `json:"name"`
-	DisplayName string              `json:"display_name"`
-	Login       string              `json:"login"`
-	Username    string              `json:"username"`
-	Email       string              `json:"email"`
-	Upn         string              `json:"upn"`
-	Attributes  map[string][]string `json:"attributes"`
-	rawJSON     []byte
-	source      string
-}
-
-func (info *UserInfoJson) String() string {
-	return fmt.Sprintf(
-		"Name: %s, Displayname: %s, Login: %s, Username: %s, Email: %s, Upn: %s, Attributes: %v",
-		info.Name, info.DisplayName, info.Login, info.Username, info.Email, info.Upn, info.Attributes)
-}
-
-func (s *SocialGenericOAuth) UserInfo(ctx context.Context, client *http.Client, token *oauth2.Token) (*BasicUserInfo, error) {
-	s.log.Debug("Getting user info")
-	toCheck := make([]*UserInfoJson, 0, 2)
-
-	if tokenData := s.extractFromToken(token); tokenData != nil {
-		toCheck = append(toCheck, tokenData)
-	}
-	if apiData := s.extractFromAPI(ctx, client); apiData != nil {
-		toCheck = append(toCheck, apiData)
-	}
-
-	userInfo := &BasicUserInfo{}
-	for _, data := range toCheck {
-		s.log.Debug("Processing external user info", "source", data.source, "data", data)
-
-		if userInfo.Id == "" {
-			userInfo.Id = data.Sub
-		}
-
-		if userInfo.Name == "" {
-			userInfo.Name = s.extractUserName(data)
-		}
-
-		if userInfo.Login == "" {
-			userInfo.Login = s.extractLogin(data)
-		}
-
-		if userInfo.Email == "" {
-			userInfo.Email = s.extractEmail(data)
-			if userInfo.Email != "" {
-				s.log.Debug("Set user info email from extracted email", "email", userInfo.Email)
-			}
-		}
-
-		if userInfo.Role == "" && !s.skipOrgRoleSync {
-			role, grafanaAdmin, err := s.extractRoleAndAdminOptional(data.rawJSON, []string{})
-			if err != nil {
-				s.log.Warn("Failed to extract role", "err", err)
-			} else {
-				userInfo.Role = role
-				if s.allowAssignGrafanaAdmin {
-					userInfo.IsGrafanaAdmin = &grafanaAdmin
-				}
-			}
-		}
-
-		if len(userInfo.Groups) == 0 {
-			groups, err := s.extractGroups(data)
-			if err != nil {
-				s.log.Warn("Failed to extract groups", "err", err)
-			} else if len(groups) > 0 {
-				s.log.Debug("Setting user info groups from extracted groups")
-				userInfo.Groups = groups
-			}
-		}
-	}
-
-	if userInfo.Role == "" && !s.skipOrgRoleSync {
-		if s.roleAttributeStrict {
-			return nil, errRoleAttributeStrictViolation.Errorf("idP did not return a role attribute")
-		}
-		userInfo.Role = s.defaultRole()
-	}
-
-	if s.allowAssignGrafanaAdmin && s.skipOrgRoleSync {
-		s.log.Debug("AllowAssignGrafanaAdmin and skipOrgRoleSync are both set, Grafana Admin role will not be synced, consider setting one or the other")
-	}
-
-	if userInfo.Email == "" {
-		var err error
-		userInfo.Email, err = s.FetchPrivateEmail(ctx, client)
-		if err != nil {
-			return nil, err
-		}
-		s.log.Debug("Setting email from fetched private email", "email", userInfo.Email)
-	}
-
-	if userInfo.Login == "" {
-		s.log.Debug("Defaulting to using email for user info login", "email", userInfo.Email)
-		userInfo.Login = userInfo.Email
-	}
-
-	if !s.IsTeamMember(ctx, client) {
-		return nil, errors.New("user not a member of one of the required teams")
-	}
-
-	if !s.IsOrganizationMember(ctx, client) {
-		return nil, errors.New("user not a member of one of the required organizations")
-	}
-
-	if !s.IsGroupMember(userInfo.Groups) {
-		return nil, errMissingGroupMembership
-	}
-
-	s.log.Debug("User info result", "result", userInfo)
-	return userInfo, nil
-}
-
-func (s *SocialGenericOAuth) extractFromToken(token *oauth2.Token) *UserInfoJson {
-	s.log.Debug("Extracting user info from OAuth token")
-
-	idTokenAttribute := "id_token"
-	if s.idTokenAttributeName != "" {
-		idTokenAttribute = s.idTokenAttributeName
-		s.log.Debug("Using custom id_token attribute name", "attribute_name", idTokenAttribute)
-	}
-
-	idToken := token.Extra(idTokenAttribute)
-	if idToken == nil {
-		s.log.Debug("No id_token found", "token", token)
-		return nil
-	}
-
-	rawJSON, err := s.retrieveRawIDToken(idToken)
-	if err != nil {
-		s.log.Warn("Error retrieving id_token", "error", err, "token", fmt.Sprintf("%+v", token))
-		return nil
-	}
-
-	var data UserInfoJson
-	if err := json.Unmarshal(rawJSON, &data); err != nil {
-		s.log.Error("Error decoding id_token JSON", "raw_json", string(rawJSON), "error", err)
-		return nil
-	}
-
-	data.rawJSON = rawJSON
-	data.source = "token"
-	s.log.Debug("Received id_token", "raw_json", string(data.rawJSON), "data", data.String())
-	return &data
-}
-
-func (s *SocialGenericOAuth) extractFromAPI(ctx context.Context, client *http.Client) *UserInfoJson {
-	s.log.Debug("Getting user info from API")
-	if s.apiUrl == "" {
-		s.log.Debug("No api url configured")
-		return nil
-	}
-
-	rawUserInfoResponse, err := s.httpGet(ctx, client, s.apiUrl)
-	if err != nil {
-		s.log.Debug("Error getting user info from API", "url", s.apiUrl, "error", err)
-		return nil
-	}
-
-	rawJSON := rawUserInfoResponse.Body
-
-	var data UserInfoJson
-	if err := json.Unmarshal(rawJSON, &data); err != nil {
-		s.log.Error("Error decoding user info response", "raw_json", rawJSON, "error", err)
-		return nil
-	}
-
-	data.rawJSON = rawJSON
-	data.source = "API"
-	s.log.Debug("Received user info response from API", "raw_json", string(rawJSON), "data", data.String())
-	return &data
-}
-
-func (s *SocialGenericOAuth) extractEmail(data *UserInfoJson) string {
-	if data.Email != "" {
-		return data.Email
-	}
-
-	if s.emailAttributePath != "" {
-		email, err := s.searchJSONForStringAttr(s.emailAttributePath, data.rawJSON)
-		if err != nil {
-			s.log.Error("Failed to search JSON for attribute", "error", err)
-		} else if email != "" {
-			return email
-		}
-	}
-
-	emails, ok := data.Attributes[s.emailAttributeName]
-	if ok && len(emails) != 0 {
-		return emails[0]
-	}
-
-	if data.Upn != "" {
-		emailAddr, emailErr := mail.ParseAddress(data.Upn)
-		if emailErr == nil {
-			return emailAddr.Address
-		}
-		s.log.Debug("Failed to parse e-mail address", "error", emailErr.Error())
-	}
-
-	return ""
-}
-
-func (s *SocialGenericOAuth) extractLogin(data *UserInfoJson) string {
-	if data.Login != "" {
-		s.log.Debug("Setting user info login from login field", "login", data.Login)
-		return data.Login
-	}
-
-	if s.loginAttributePath != "" {
-		s.log.Debug("Searching for login among JSON", "loginAttributePath", s.loginAttributePath)
-		login, err := s.searchJSONForStringAttr(s.loginAttributePath, data.rawJSON)
-		if err != nil {
-			s.log.Error("Failed to search JSON for login attribute", "error", err)
-		}
-
-		if login != "" {
-			return login
-		}
-	}
-
-	if data.Username != "" {
-		s.log.Debug("Setting user info login from username field", "username", data.Username)
-		return data.Username
-	}
-
-	return ""
-}
-
-func (s *SocialGenericOAuth) extractUserName(data *UserInfoJson) string {
-	if s.nameAttributePath != "" {
-		name, err := s.searchJSONForStringAttr(s.nameAttributePath, data.rawJSON)
-		if err != nil {
-			s.log.Error("Failed to search JSON for attribute", "error", err)
-		} else if name != "" {
-			s.log.Debug("Setting user info name from nameAttributePath", "nameAttributePath", s.nameAttributePath)
-			return name
-		}
-	}
-
-	if data.Name != "" {
-		s.log.Debug("Setting user info name from name field")
-		return data.Name
-	}
-
-	if data.DisplayName != "" {
-		s.log.Debug("Setting user info name from display name field")
-		return data.DisplayName
-	}
-
-	s.log.Debug("Unable to find user info name")
-	return ""
-}
-
-func (s *SocialGenericOAuth) extractGroups(data *UserInfoJson) ([]string, error) {
-	if s.groupsAttributePath == "" {
-		return []string{}, nil
-	}
-
-	return s.searchJSONForStringArrayAttr(s.groupsAttributePath, data.rawJSON)
-}
-
-func (s *SocialGenericOAuth) FetchPrivateEmail(ctx context.Context, client *http.Client) (string, error) {
-	type Record struct {
-		Email       string `json:"email"`
-		Primary     bool   `json:"primary"`
-		IsPrimary   bool   `json:"is_primary"`
-		Verified    bool   `json:"verified"`
-		IsConfirmed bool   `json:"is_confirmed"`
-	}
-
-	response, err := s.httpGet(ctx, client, fmt.Sprintf(s.apiUrl+"/emails"))
-	if err != nil {
-		s.log.Error("Error getting email address", "url", s.apiUrl+"/emails", "error", err)
-		return "", fmt.Errorf("%v: %w", "Error getting email address", err)
-	}
-
-	var records []Record
-
-	err = json.Unmarshal(response.Body, &records)
-	if err != nil {
-		var data struct {
-			Values []Record `json:"values"`
-		}
-
-		err = json.Unmarshal(response.Body, &data)
-		if err != nil {
-			s.log.Error("Error decoding email addresses response", "raw_json", string(response.Body), "error", err)
-			return "", fmt.Errorf("%v: %w", "Error decoding email addresses response", err)
-		}
-
-		records = data.Values
-	}
-
-	s.log.Debug("Received email addresses", "emails", records)
-
-	var email = ""
-	for _, record := range records {
-		if record.Primary || record.IsPrimary {
-			email = record.Email
-			break
-		}
-	}
-
-	s.log.Debug("Using email address", "email", email)
-
-	return email, nil
-}
-
-func (s *SocialGenericOAuth) FetchTeamMemberships(ctx context.Context, client *http.Client) ([]string, error) {
-	var err error
-	var ids []string
-
-	if s.teamsUrl == "" {
-		ids, err = s.fetchTeamMembershipsFromDeprecatedTeamsUrl(ctx, client)
-	} else {
-		ids, err = s.fetchTeamMembershipsFromTeamsUrl(ctx, client)
-	}
-
-	if err == nil {
-		s.log.Debug("Received team memberships", "ids", ids)
-	}
-
-	return ids, err
-}
-
-func (s *SocialGenericOAuth) fetchTeamMembershipsFromDeprecatedTeamsUrl(ctx context.Context, client *http.Client) ([]string, error) {
-	var ids []string
-
-	type Record struct {
-		Id int `json:"id"`
-	}
-
-	response, err := s.httpGet(ctx, client, fmt.Sprintf(s.apiUrl+"/teams"))
-	if err != nil {
-		s.log.Error("Error getting team memberships", "url", s.apiUrl+"/teams", "error", err)
-		return []string{}, err
-	}
-
-	var records []Record
-
-	err = json.Unmarshal(response.Body, &records)
-	if err != nil {
-		s.log.Error("Error decoding team memberships response", "raw_json", string(response.Body), "error", err)
-		return []string{}, err
-	}
-
-	ids = make([]string, len(records))
-	for i, record := range records {
-		ids[i] = strconv.Itoa(record.Id)
-	}
-
-	return ids, nil
-}
-
-func (s *SocialGenericOAuth) fetchTeamMembershipsFromTeamsUrl(ctx context.Context, client *http.Client) ([]string, error) {
-	if s.teamIdsAttributePath == "" {
-		return []string{}, nil
-	}
-
-	response, err := s.httpGet(ctx, client, fmt.Sprintf(s.teamsUrl))
-	if err != nil {
-		s.log.Error("Error getting team memberships", "url", s.teamsUrl, "error", err)
-		return nil, err
-	}
-
-	return s.searchJSONForStringArrayAttr(s.teamIdsAttributePath, response.Body)
-}
-
-func (s *SocialGenericOAuth) FetchOrganizations(ctx context.Context, client *http.Client) ([]string, bool) {
-	type Record struct {
-		Login string `json:"login"`
-	}
-
-	response, err := s.httpGet(ctx, client, fmt.Sprintf(s.apiUrl+"/orgs"))
-	if err != nil {
-		s.log.Error("Error getting organizations", "url", s.apiUrl+"/orgs", "error", err)
-		return nil, false
-	}
-
-	var records []Record
-
-	err = json.Unmarshal(response.Body, &records)
-	if err != nil {
-		s.log.Error("Error decoding organization response", "response", string(response.Body), "error", err)
-		return nil, false
-	}
-
-	var logins = make([]string, len(records))
-	for i, record := range records {
-		logins[i] = record.Login
-	}
-
-	s.log.Debug("Received organizations", "logins", logins)
-
-	return logins, true
-}
-
-func (s *SocialGenericOAuth) SupportBundleContent(bf *bytes.Buffer) error {
-	bf.WriteString("## GenericOAuth specific configuration\n\n")
-	bf.WriteString("```ini\n")
-	bf.WriteString(fmt.Sprintf("name_attribute_path = %s\n", s.nameAttributePath))
-	bf.WriteString(fmt.Sprintf("login_attribute_path = %s\n", s.loginAttributePath))
-	bf.WriteString(fmt.Sprintf("id_token_attribute_name = %s\n", s.idTokenAttributeName))
-	bf.WriteString(fmt.Sprintf("team_ids_attribute_path = %s\n", s.teamIdsAttributePath))
-	bf.WriteString(fmt.Sprintf("team_ids = %v\n", s.teamIds))
-	bf.WriteString(fmt.Sprintf("allowed_organizations = %v\n", s.allowedOrganizations))
-	bf.WriteString("```\n\n")
-
-	return s.SocialBase.SupportBundleContent(bf)
-}
diff --git a/pkg/login/social/generic_oauth_test.go b/pkg/login/social/generic_oauth_test.go
deleted file mode 100644
index 9fc448a23e6b2..0000000000000
--- a/pkg/login/social/generic_oauth_test.go
+++ /dev/null
@@ -1,838 +0,0 @@
-package social
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-	"time"
-
-	"github.com/go-kit/log/level"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"golang.org/x/oauth2"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/org"
-)
-
-func newLogger(name string, lev string) log.Logger {
-	logger := log.New(name)
-	logger.Swap(level.NewFilter(logger.GetLogger(), level.AllowInfo()))
-	return logger
-}
-
-func TestSearchJSONForEmail(t *testing.T) {
-	t.Run("Given a generic OAuth provider", func(t *testing.T) {
-		provider := SocialGenericOAuth{
-			SocialBase: &SocialBase{
-				log: newLogger("generic_oauth_test", "debug"),
-			},
-		}
-
-		tests := []struct {
-			Name                 string
-			UserInfoJSONResponse []byte
-			EmailAttributePath   string
-			ExpectedResult       string
-			ExpectedError        string
-		}{
-			{
-				Name:                 "Given an invalid user info JSON response",
-				UserInfoJSONResponse: []byte("{"),
-				EmailAttributePath:   "attributes.email",
-				ExpectedResult:       "",
-				ExpectedError:        "failed to unmarshal user info JSON response: unexpected end of JSON input",
-			},
-			{
-				Name:                 "Given an empty user info JSON response and empty JMES path",
-				UserInfoJSONResponse: []byte{},
-				EmailAttributePath:   "",
-				ExpectedResult:       "",
-				ExpectedError:        "no attribute path specified",
-			},
-			{
-				Name:                 "Given an empty user info JSON response and valid JMES path",
-				UserInfoJSONResponse: []byte{},
-				EmailAttributePath:   "attributes.email",
-				ExpectedResult:       "",
-				ExpectedError:        "empty user info JSON response provided",
-			},
-			{
-				Name: "Given a simple user info JSON response and valid JMES path",
-				UserInfoJSONResponse: []byte(`{
-	"attributes": {
-		"email": "grafana@localhost"
-	}
-}`),
-				EmailAttributePath: "attributes.email",
-				ExpectedResult:     "grafana@localhost",
-			},
-			{
-				Name: "Given a user info JSON response with e-mails array and valid JMES path",
-				UserInfoJSONResponse: []byte(`{
-	"attributes": {
-		"emails": ["grafana@localhost", "admin@localhost"]
-	}
-}`),
-				EmailAttributePath: "attributes.emails[0]",
-				ExpectedResult:     "grafana@localhost",
-			},
-			{
-				Name: "Given a nested user info JSON response and valid JMES path",
-				UserInfoJSONResponse: []byte(`{
-	"identities": [
-		{
-			"userId": "grafana@localhost"
-		},
-		{
-			"userId": "admin@localhost"
-		}
-	]
-}`),
-				EmailAttributePath: "identities[0].userId",
-				ExpectedResult:     "grafana@localhost",
-			},
-		}
-
-		for _, test := range tests {
-			provider.emailAttributePath = test.EmailAttributePath
-			t.Run(test.Name, func(t *testing.T) {
-				actualResult, err := provider.searchJSONForStringAttr(test.EmailAttributePath, test.UserInfoJSONResponse)
-				if test.ExpectedError == "" {
-					require.NoError(t, err, "Testing case %q", test.Name)
-				} else {
-					require.EqualError(t, err, test.ExpectedError, "Testing case %q", test.Name)
-				}
-				require.Equal(t, test.ExpectedResult, actualResult)
-			})
-		}
-	})
-}
-
-func TestSearchJSONForGroups(t *testing.T) {
-	t.Run("Given a generic OAuth provider", func(t *testing.T) {
-		provider := SocialGenericOAuth{
-			SocialBase: &SocialBase{
-				log: newLogger("generic_oauth_test", "debug"),
-			},
-		}
-
-		tests := []struct {
-			Name                 string
-			UserInfoJSONResponse []byte
-			GroupsAttributePath  string
-			ExpectedResult       []string
-			ExpectedError        string
-		}{
-			{
-				Name:                 "Given an invalid user info JSON response",
-				UserInfoJSONResponse: []byte("{"),
-				GroupsAttributePath:  "attributes.groups",
-				ExpectedResult:       []string{},
-				ExpectedError:        "failed to unmarshal user info JSON response: unexpected end of JSON input",
-			},
-			{
-				Name:                 "Given an empty user info JSON response and empty JMES path",
-				UserInfoJSONResponse: []byte{},
-				GroupsAttributePath:  "",
-				ExpectedResult:       []string{},
-				ExpectedError:        "no attribute path specified",
-			},
-			{
-				Name:                 "Given an empty user info JSON response and valid JMES path",
-				UserInfoJSONResponse: []byte{},
-				GroupsAttributePath:  "attributes.groups",
-				ExpectedResult:       []string{},
-				ExpectedError:        "empty user info JSON response provided",
-			},
-			{
-				Name: "Given a simple user info JSON response and valid JMES path",
-				UserInfoJSONResponse: []byte(`{
-		"attributes": {
-			"groups": ["foo", "bar"]
-		}
-}`),
-				GroupsAttributePath: "attributes.groups[]",
-				ExpectedResult:      []string{"foo", "bar"},
-			},
-		}
-
-		for _, test := range tests {
-			provider.groupsAttributePath = test.GroupsAttributePath
-			t.Run(test.Name, func(t *testing.T) {
-				actualResult, err := provider.searchJSONForStringArrayAttr(test.GroupsAttributePath, test.UserInfoJSONResponse)
-				if test.ExpectedError == "" {
-					require.NoError(t, err, "Testing case %q", test.Name)
-				} else {
-					require.EqualError(t, err, test.ExpectedError, "Testing case %q", test.Name)
-				}
-				require.Equal(t, test.ExpectedResult, actualResult)
-			})
-		}
-	})
-}
-
-func TestSearchJSONForRole(t *testing.T) {
-	t.Run("Given a generic OAuth provider", func(t *testing.T) {
-		provider := SocialGenericOAuth{
-			SocialBase: &SocialBase{
-				log: newLogger("generic_oauth_test", "debug"),
-			},
-		}
-
-		tests := []struct {
-			Name                 string
-			UserInfoJSONResponse []byte
-			RoleAttributePath    string
-			ExpectedResult       string
-			ExpectedError        string
-		}{
-			{
-				Name:                 "Given an invalid user info JSON response",
-				UserInfoJSONResponse: []byte("{"),
-				RoleAttributePath:    "attributes.role",
-				ExpectedResult:       "",
-				ExpectedError:        "failed to unmarshal user info JSON response: unexpected end of JSON input",
-			},
-			{
-				Name:                 "Given an empty user info JSON response and empty JMES path",
-				UserInfoJSONResponse: []byte{},
-				RoleAttributePath:    "",
-				ExpectedResult:       "",
-				ExpectedError:        "no attribute path specified",
-			},
-			{
-				Name:                 "Given an empty user info JSON response and valid JMES path",
-				UserInfoJSONResponse: []byte{},
-				RoleAttributePath:    "attributes.role",
-				ExpectedResult:       "",
-				ExpectedError:        "empty user info JSON response provided",
-			},
-			{
-				Name: "Given a simple user info JSON response and valid JMES path",
-				UserInfoJSONResponse: []byte(`{
-	"attributes": {
-		"role": "admin"
-	}
-}`),
-				RoleAttributePath: "attributes.role",
-				ExpectedResult:    "admin",
-			},
-		}
-
-		for _, test := range tests {
-			provider.roleAttributePath = test.RoleAttributePath
-			t.Run(test.Name, func(t *testing.T) {
-				actualResult, err := provider.searchJSONForStringAttr(test.RoleAttributePath, test.UserInfoJSONResponse)
-				if test.ExpectedError == "" {
-					require.NoError(t, err, "Testing case %q", test.Name)
-				} else {
-					require.EqualError(t, err, test.ExpectedError, "Testing case %q", test.Name)
-				}
-				require.Equal(t, test.ExpectedResult, actualResult)
-			})
-		}
-	})
-}
-
-func TestUserInfoSearchesForEmailAndRole(t *testing.T) {
-	provider := SocialGenericOAuth{
-		SocialBase: &SocialBase{
-			log: newLogger("generic_oauth_test", "debug"),
-		},
-		emailAttributePath: "email",
-	}
-
-	tests := []struct {
-		Name                    string
-		SkipOrgRoleSync         bool
-		AllowAssignGrafanaAdmin bool
-		ResponseBody            any
-		OAuth2Extra             any
-		RoleAttributePath       string
-		ExpectedEmail           string
-		ExpectedRole            org.RoleType
-		ExpectedError           error
-		ExpectedGrafanaAdmin    *bool
-	}{
-		{
-			Name: "Given a valid id_token, a valid role path, no API response, use id_token",
-			OAuth2Extra: map[string]any{
-				// { "role": "Admin", "email": "john.doe@example.com" }
-				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiQWRtaW4iLCJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIn0.9PtHcCaXxZa2HDlASyKIaFGfOKlw2ILQo32xlvhvhRg",
-			},
-			RoleAttributePath: "role",
-			ExpectedEmail:     "john.doe@example.com",
-			ExpectedRole:      "Admin",
-		},
-		{
-			Name: "Given a valid id_token, no role path, no API response, use id_token",
-			OAuth2Extra: map[string]any{
-				// { "email": "john.doe@example.com" }
-				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIn0.k5GwPcZvGe2BE_jgwN0ntz0nz4KlYhEd0hRRLApkTJ4",
-			},
-			RoleAttributePath: "",
-			ExpectedEmail:     "john.doe@example.com",
-			ExpectedRole:      "Viewer",
-		},
-		{
-			Name: "Given a valid id_token, an invalid role path, no API response, use id_token",
-			OAuth2Extra: map[string]any{
-				// { "role": "Admin", "email": "john.doe@example.com" }
-				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiQWRtaW4iLCJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIn0.9PtHcCaXxZa2HDlASyKIaFGfOKlw2ILQo32xlvhvhRg",
-			},
-			RoleAttributePath: "invalid_path",
-			ExpectedEmail:     "john.doe@example.com",
-			ExpectedRole:      "Viewer",
-		},
-		{
-			Name: "Given no id_token, a valid role path, a valid API response, use API response",
-			ResponseBody: map[string]any{
-				"role":  "Admin",
-				"email": "john.doe@example.com",
-			},
-			RoleAttributePath: "role",
-			ExpectedEmail:     "john.doe@example.com",
-			ExpectedRole:      "Admin",
-		},
-		{
-			Name: "Given no id_token, no role path, a valid API response, use API response",
-			ResponseBody: map[string]any{
-				"email": "john.doe@example.com",
-			},
-			RoleAttributePath: "",
-			ExpectedEmail:     "john.doe@example.com",
-			ExpectedRole:      "Viewer",
-		},
-		{
-			Name: "Given no id_token, a role path, a valid API response without a role, use API response",
-			ResponseBody: map[string]any{
-				"email": "john.doe@example.com",
-			},
-			RoleAttributePath: "role",
-			ExpectedEmail:     "john.doe@example.com",
-			ExpectedRole:      "Viewer",
-		},
-		{
-			Name:              "Given no id_token, a valid role path, no API response, no data",
-			RoleAttributePath: "role",
-			ExpectedEmail:     "",
-			ExpectedRole:      "Viewer",
-		},
-		{
-			Name: "Given a valid id_token, a valid role path, a valid API response, prefer id_token",
-			OAuth2Extra: map[string]any{
-				// { "role": "Admin", "email": "john.doe@example.com" }
-				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiQWRtaW4iLCJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIn0.9PtHcCaXxZa2HDlASyKIaFGfOKlw2ILQo32xlvhvhRg",
-			},
-			ResponseBody: map[string]any{
-				"role":  "FromResponse",
-				"email": "from_response@example.com",
-			},
-			RoleAttributePath: "role",
-			ExpectedEmail:     "john.doe@example.com",
-			ExpectedRole:      "Admin",
-		},
-		{
-			Name:                    "Given a valid id_token and AssignGrafanaAdmin is unchecked, don't grant Server Admin",
-			AllowAssignGrafanaAdmin: false,
-			OAuth2Extra: map[string]any{
-				// { "role": "GrafanaAdmin", "email": "john.doe@example.com" }
-				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiR3JhZmFuYUFkbWluIiwiZW1haWwiOiJqb2huLmRvZUBleGFtcGxlLmNvbSJ9.cQqMJpVjwdtJ8qEZLOo9RKNbAFfpkQcpnRG0nopmWEI",
-			},
-			ResponseBody: map[string]any{
-				"role":  "FromResponse",
-				"email": "from_response@example.com",
-			},
-			RoleAttributePath:    "role",
-			ExpectedEmail:        "john.doe@example.com",
-			ExpectedRole:         "Admin",
-			ExpectedGrafanaAdmin: nil,
-		},
-		{
-			Name:                    "Given a valid id_token and AssignGrafanaAdmin is checked, grant Server Admin",
-			AllowAssignGrafanaAdmin: true,
-			OAuth2Extra: map[string]any{
-				// { "role": "GrafanaAdmin", "email": "john.doe@example.com" }
-				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiR3JhZmFuYUFkbWluIiwiZW1haWwiOiJqb2huLmRvZUBleGFtcGxlLmNvbSJ9.cQqMJpVjwdtJ8qEZLOo9RKNbAFfpkQcpnRG0nopmWEI",
-			},
-			ResponseBody: map[string]any{
-				"role":  "FromResponse",
-				"email": "from_response@example.com",
-			},
-			RoleAttributePath:    "role",
-			ExpectedEmail:        "john.doe@example.com",
-			ExpectedRole:         "Admin",
-			ExpectedGrafanaAdmin: trueBoolPtr(),
-		},
-		{
-			Name: "Given a valid id_token, an invalid role path, a valid API response, prefer id_token",
-			OAuth2Extra: map[string]any{
-				// { "role": "Admin", "email": "john.doe@example.com" }
-				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiQWRtaW4iLCJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIn0.9PtHcCaXxZa2HDlASyKIaFGfOKlw2ILQo32xlvhvhRg",
-			},
-			ResponseBody: map[string]any{
-				"role":  "FromResponse",
-				"email": "from_response@example.com",
-			},
-			RoleAttributePath: "invalid_path",
-			ExpectedEmail:     "john.doe@example.com",
-			ExpectedRole:      "Viewer",
-		},
-		{
-			Name: "Given a valid id_token with no email, a valid role path, a valid API response with no role, merge",
-			OAuth2Extra: map[string]any{
-				// { "role": "Admin" }
-				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiQWRtaW4ifQ.k5GwPcZvGe2BE_jgwN0ntz0nz4KlYhEd0hRRLApkTJ4",
-			},
-			ResponseBody: map[string]any{
-				"email": "from_response@example.com",
-			},
-			RoleAttributePath: "role",
-			ExpectedEmail:     "from_response@example.com",
-			ExpectedRole:      "Admin",
-		},
-		{
-			Name: "Given a valid id_token with no role, a valid role path, a valid API response with no email, merge",
-			OAuth2Extra: map[string]any{
-				// { "email": "john.doe@example.com" }
-				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIn0.k5GwPcZvGe2BE_jgwN0ntz0nz4KlYhEd0hRRLApkTJ4",
-			},
-			ResponseBody: map[string]any{
-				"role": "FromResponse",
-			},
-			RoleAttributePath: "role",
-			ExpectedEmail:     "john.doe@example.com",
-			ExpectedRole:      "Viewer",
-			ExpectedError:     nil,
-		},
-		{
-			Name: "Given a valid id_token, a valid advanced JMESPath role path, derive the role",
-			OAuth2Extra: map[string]any{
-				// { "email": "john.doe@example.com",
-				//   "info": { "roles": [ "dev", "engineering" ] }}
-				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIiwiaW5mbyI6eyJyb2xlcyI6WyJkZXYiLCJlbmdpbmVlcmluZyJdfX0.RmmQfv25eXb4p3wMrJsvXfGQ6EXhGtwRXo6SlCFHRNg",
-			},
-			RoleAttributePath: "contains(info.roles[*], 'dev') && 'Editor'",
-			ExpectedEmail:     "john.doe@example.com",
-			ExpectedRole:      "Editor",
-		},
-		{
-			Name: "Given a valid id_token without role info, a valid advanced JMESPath role path, a valid API response, derive the correct role using the userinfo API response (JMESPath warning on id_token)",
-			OAuth2Extra: map[string]any{
-				// { "email": "john.doe@example.com" }
-				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIn0.k5GwPcZvGe2BE_jgwN0ntz0nz4KlYhEd0hRRLApkTJ4",
-			},
-			ResponseBody: map[string]any{
-				"info": map[string]any{
-					"roles": []string{"engineering", "SRE"},
-				},
-			},
-			RoleAttributePath: "contains(info.roles[*], 'SRE') && 'Admin'",
-			ExpectedEmail:     "john.doe@example.com",
-			ExpectedRole:      "Admin",
-		},
-		{
-			Name: "Given a valid id_token, a valid advanced JMESPath role path, a valid API response, prefer ID token",
-			OAuth2Extra: map[string]any{
-				// { "email": "john.doe@example.com",
-				//   "info": { "roles": [ "dev", "engineering" ] }}
-				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIiwiaW5mbyI6eyJyb2xlcyI6WyJkZXYiLCJlbmdpbmVlcmluZyJdfX0.RmmQfv25eXb4p3wMrJsvXfGQ6EXhGtwRXo6SlCFHRNg",
-			},
-			ResponseBody: map[string]any{
-				"info": map[string]any{
-					"roles": []string{"engineering", "SRE"},
-				},
-			},
-			RoleAttributePath: "contains(info.roles[*], 'SRE') && 'Admin' || contains(info.roles[*], 'dev') && 'Editor' || 'Viewer'",
-			ExpectedEmail:     "john.doe@example.com",
-			ExpectedRole:      "Editor",
-		},
-		{
-			Name:            "Given skip org role sync set to true, with a valid id_token, a valid advanced JMESPath role path, a valid API response, no org role should be set",
-			SkipOrgRoleSync: true,
-			OAuth2Extra: map[string]any{
-				// { "email": "john.doe@example.com",
-				//   "info": { "roles": [ "dev", "engineering" ] }}
-				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIiwiaW5mbyI6eyJyb2xlcyI6WyJkZXYiLCJlbmdpbmVlcmluZyJdfX0.RmmQfv25eXb4p3wMrJsvXfGQ6EXhGtwRXo6SlCFHRNg",
-			},
-			ResponseBody: map[string]any{
-				"info": map[string]any{
-					"roles": []string{"engineering", "SRE"},
-				},
-			},
-			RoleAttributePath: "contains(info.roles[*], 'SRE') && 'Admin' || contains(info.roles[*], 'dev') && 'Editor' || 'Viewer'",
-			ExpectedEmail:     "john.doe@example.com",
-			ExpectedRole:      "",
-		},
-	}
-
-	for _, test := range tests {
-		provider.roleAttributePath = test.RoleAttributePath
-		provider.allowAssignGrafanaAdmin = test.AllowAssignGrafanaAdmin
-		provider.skipOrgRoleSync = test.SkipOrgRoleSync
-
-		t.Run(test.Name, func(t *testing.T) {
-			body, err := json.Marshal(test.ResponseBody)
-			require.NoError(t, err)
-			ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				w.WriteHeader(http.StatusOK)
-				w.Header().Set("Content-Type", "application/json")
-				_, err = w.Write(body)
-				require.NoError(t, err)
-			}))
-			provider.apiUrl = ts.URL
-			staticToken := oauth2.Token{
-				AccessToken:  "",
-				TokenType:    "",
-				RefreshToken: "",
-				Expiry:       time.Now(),
-			}
-
-			token := staticToken.WithExtra(test.OAuth2Extra)
-			actualResult, err := provider.UserInfo(context.Background(), ts.Client(), token)
-			if test.ExpectedError != nil {
-				require.ErrorIs(t, err, test.ExpectedError)
-				return
-			}
-			require.NoError(t, err)
-			require.Equal(t, test.ExpectedEmail, actualResult.Email)
-			require.Equal(t, test.ExpectedEmail, actualResult.Login)
-			require.Equal(t, test.ExpectedRole, actualResult.Role)
-			require.Equal(t, test.ExpectedGrafanaAdmin, actualResult.IsGrafanaAdmin)
-		})
-	}
-}
-
-func TestUserInfoSearchesForLogin(t *testing.T) {
-	t.Run("Given a generic OAuth provider", func(t *testing.T) {
-		provider := SocialGenericOAuth{
-			SocialBase: &SocialBase{
-				log: newLogger("generic_oauth_test", "debug"),
-			},
-			loginAttributePath: "login",
-		}
-
-		tests := []struct {
-			Name               string
-			ResponseBody       any
-			OAuth2Extra        any
-			LoginAttributePath string
-			ExpectedLogin      string
-		}{
-			{
-				Name: "Given a valid id_token, a valid login path, no API response, use id_token",
-				OAuth2Extra: map[string]any{
-					// { "login": "johndoe", "email": "john.doe@example.com" }
-					"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJsb2dpbiI6ImpvaG5kb2UiLCJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIn0.sg4sRJCNpax_76XMgr277fdxhjjtNSWXKIOFv4_GJN8",
-				},
-				LoginAttributePath: "role",
-				ExpectedLogin:      "johndoe",
-			},
-			{
-				Name: "Given a valid id_token, no login path, no API response, use id_token",
-				OAuth2Extra: map[string]any{
-					// { "login": "johndoe", "email": "john.doe@example.com" }
-					"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJsb2dpbiI6ImpvaG5kb2UiLCJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIn0.sg4sRJCNpax_76XMgr277fdxhjjtNSWXKIOFv4_GJN8",
-				},
-				LoginAttributePath: "",
-				ExpectedLogin:      "johndoe",
-			},
-			{
-				Name: "Given no id_token, a valid login path, a valid API response, use API response",
-				ResponseBody: map[string]any{
-					"user_uid": "johndoe",
-					"email":    "john.doe@example.com",
-				},
-				LoginAttributePath: "user_uid",
-				ExpectedLogin:      "johndoe",
-			},
-			{
-				Name: "Given no id_token, no login path, a valid API response, use API response",
-				ResponseBody: map[string]any{
-					"login": "johndoe",
-				},
-				LoginAttributePath: "",
-				ExpectedLogin:      "johndoe",
-			},
-			{
-				Name: "Given no id_token, a login path, a valid API response without a login, use API response",
-				ResponseBody: map[string]any{
-					"username": "john.doe",
-				},
-				LoginAttributePath: "login",
-				ExpectedLogin:      "john.doe",
-			},
-			{
-				Name:               "Given no id_token, a valid login path, no API response, no data",
-				LoginAttributePath: "login",
-				ExpectedLogin:      "",
-			},
-		}
-
-		for _, test := range tests {
-			provider.loginAttributePath = test.LoginAttributePath
-			t.Run(test.Name, func(t *testing.T) {
-				body, err := json.Marshal(test.ResponseBody)
-				require.NoError(t, err)
-				ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-					w.WriteHeader(http.StatusOK)
-					w.Header().Set("Content-Type", "application/json")
-					t.Log("Writing fake API response body", "body", test.ResponseBody)
-					_, err = w.Write(body)
-					require.NoError(t, err)
-				}))
-				provider.apiUrl = ts.URL
-				staticToken := oauth2.Token{
-					AccessToken:  "",
-					TokenType:    "",
-					RefreshToken: "",
-					Expiry:       time.Now(),
-				}
-
-				token := staticToken.WithExtra(test.OAuth2Extra)
-				actualResult, err := provider.UserInfo(context.Background(), ts.Client(), token)
-				require.NoError(t, err)
-				require.Equal(t, test.ExpectedLogin, actualResult.Login)
-			})
-		}
-	})
-}
-
-func TestUserInfoSearchesForName(t *testing.T) {
-	t.Run("Given a generic OAuth provider", func(t *testing.T) {
-		provider := SocialGenericOAuth{
-			SocialBase: &SocialBase{
-				log: newLogger("generic_oauth_test", "debug"),
-			},
-			nameAttributePath: "name",
-		}
-
-		tests := []struct {
-			Name              string
-			ResponseBody      any
-			OAuth2Extra       any
-			NameAttributePath string
-			ExpectedName      string
-		}{
-			{
-				Name: "Given a valid id_token, a valid name path, no API response, use id_token",
-				OAuth2Extra: map[string]any{
-					// { "name": "John Doe", "login": "johndoe", "email": "john.doe@example.com" }
-					"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJsb2dpbiI6ImpvaG5kb2UiLCJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIiwibmFtZSI6IkpvaG4gRG9lIn0.oMsXH0mHxUSYMXh6FonZIWh8LgNIcYbKRLSO1bwnfSI",
-				},
-				NameAttributePath: "name",
-				ExpectedName:      "John Doe",
-			},
-			{
-				Name: "Given a valid id_token, no name path, no API response, use id_token",
-				OAuth2Extra: map[string]any{
-					// { "name": "John Doe", "login": "johndoe", "email": "john.doe@example.com" }
-					"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJsb2dpbiI6ImpvaG5kb2UiLCJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIiwibmFtZSI6IkpvaG4gRG9lIn0.oMsXH0mHxUSYMXh6FonZIWh8LgNIcYbKRLSO1bwnfSI",
-				},
-				NameAttributePath: "",
-				ExpectedName:      "John Doe",
-			},
-			{
-				Name: "Given no id_token, a valid name path, a valid API response, use API response",
-				ResponseBody: map[string]any{
-					"user_name": "John Doe",
-					"login":     "johndoe",
-					"email":     "john.doe@example.com",
-				},
-				NameAttributePath: "user_name",
-				ExpectedName:      "John Doe",
-			},
-			{
-				Name: "Given no id_token, no name path, a valid API response, use API response",
-				ResponseBody: map[string]any{
-					"display_name": "John Doe",
-					"login":        "johndoe",
-				},
-				NameAttributePath: "",
-				ExpectedName:      "John Doe",
-			},
-			{
-				Name: "Given no id_token, a name path, a valid API response without a name, use API response",
-				ResponseBody: map[string]any{
-					"display_name": "John Doe",
-					"username":     "john.doe",
-				},
-				NameAttributePath: "name",
-				ExpectedName:      "John Doe",
-			},
-			{
-				Name:              "Given no id_token, a valid name path, no API response, no data",
-				NameAttributePath: "name",
-				ExpectedName:      "",
-			},
-		}
-
-		for _, test := range tests {
-			provider.nameAttributePath = test.NameAttributePath
-			t.Run(test.Name, func(t *testing.T) {
-				body, err := json.Marshal(test.ResponseBody)
-				require.NoError(t, err)
-				ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-					w.WriteHeader(http.StatusOK)
-					w.Header().Set("Content-Type", "application/json")
-					t.Log("Writing fake API response body", "body", test.ResponseBody)
-					_, err = w.Write(body)
-					require.NoError(t, err)
-				}))
-				provider.apiUrl = ts.URL
-				staticToken := oauth2.Token{
-					AccessToken:  "",
-					TokenType:    "",
-					RefreshToken: "",
-					Expiry:       time.Now(),
-				}
-
-				token := staticToken.WithExtra(test.OAuth2Extra)
-				actualResult, err := provider.UserInfo(context.Background(), ts.Client(), token)
-				require.NoError(t, err)
-				require.Equal(t, test.ExpectedName, actualResult.Name)
-			})
-		}
-	})
-}
-
-func TestUserInfoSearchesForGroup(t *testing.T) {
-	t.Run("Given a generic OAuth provider", func(t *testing.T) {
-		provider := SocialGenericOAuth{
-			SocialBase: &SocialBase{
-				log: newLogger("generic_oauth_test", "debug"),
-			},
-		}
-
-		tests := []struct {
-			name                string
-			groupsAttributePath string
-			responseBody        any
-			expectedResult      []string
-		}{
-			{
-				name:                "If groups are not set, user groups are nil",
-				groupsAttributePath: "",
-				expectedResult:      nil,
-			},
-			{
-				name:                "If groups are empty, user groups are nil",
-				groupsAttributePath: "info.groups",
-				responseBody: map[string]any{
-					"info": map[string]any{
-						"groups": []string{},
-					},
-				},
-				expectedResult: nil,
-			},
-			{
-				name:                "If groups are set, user groups are set",
-				groupsAttributePath: "info.groups",
-				responseBody: map[string]any{
-					"info": map[string]any{
-						"groups": []string{"foo", "bar"},
-					},
-				},
-				expectedResult: []string{"foo", "bar"},
-			},
-		}
-
-		for _, test := range tests {
-			t.Run(test.name, func(t *testing.T) {
-				provider.groupsAttributePath = test.groupsAttributePath
-				body, err := json.Marshal(test.responseBody)
-				require.NoError(t, err)
-				ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-					w.WriteHeader(http.StatusOK)
-					w.Header().Set("Content-Type", "application/json")
-					t.Log("Writing fake API response body", "body", test.responseBody)
-					_, err := w.Write(body)
-					require.NoError(t, err)
-				}))
-				provider.apiUrl = ts.URL
-				token := &oauth2.Token{
-					AccessToken:  "",
-					TokenType:    "",
-					RefreshToken: "",
-					Expiry:       time.Now(),
-				}
-
-				userInfo, err := provider.UserInfo(context.Background(), ts.Client(), token)
-				assert.NoError(t, err)
-				assert.Equal(t, test.expectedResult, userInfo.Groups)
-			})
-		}
-	})
-}
-
-func TestPayloadCompression(t *testing.T) {
-	provider := SocialGenericOAuth{
-		SocialBase: &SocialBase{
-			log: newLogger("generic_oauth_test", "debug"),
-		},
-		emailAttributePath: "email",
-	}
-
-	tests := []struct {
-		Name          string
-		OAuth2Extra   any
-		ExpectedEmail string
-	}{
-		{
-			Name: "Given a valid DEFLATE compressed id_token, return userInfo",
-			OAuth2Extra: map[string]any{
-				// { "role": "Admin", "email": "john.doe@example.com" }
-				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsInppcCI6IkRFRiJ9.eJyrVkrNTczMUbJSysrPyNNLyU91SK1IzC3ISdVLzs9V0lEqys9JBco6puRm5inVAgCFRw_6.XrV4ZKhw19dTcnviXanBD8lwjeALCYtDiESMmGzC-ho",
-			},
-			ExpectedEmail: "john.doe@example.com",
-		},
-		{
-			Name: "Given a valid DEFLATE compressed id_token with numeric header, return userInfo",
-			OAuth2Extra: map[string]any{
-				// Generated from https://token.dev/
-				"id_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiIsInZlciI6NH0.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWUsImlhdCI6MTY0MjUxNjYwNSwiZXhwIjoxNjQyNTIwMjA1LCJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIn0.ANndoPWIHNjKPG8na7UUq7nan1RgF8-ze8STU31RXcA",
-			},
-			ExpectedEmail: "john.doe@example.com",
-		},
-		{
-			Name: "Given an invalid DEFLATE compressed id_token, return nil",
-			OAuth2Extra: map[string]any{
-				// { "role": "Admin", "email": "john.doe@example.com" }
-				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsInppcCI6IkRFRiJ9.00eJyrVkrNTczMUbJSysrPyNNLyU91SK1IzC3ISdVLzs9V0lEqys9JBco6puRm5inVAgCFRw_6.XrV4ZKhw19dTcnviXanBD8lwjeALCYtDiESMmGzC-ho",
-			},
-			ExpectedEmail: "",
-		},
-		{
-			Name: "Given an unsupported GZIP compressed id_token, return nil",
-			OAuth2Extra: map[string]any{
-				// { "role": "Admin", "email": "john.doe@example.com" }
-				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsInppcCI6IkdaSVAifQ.H4sIAAAAAAAAAKtWSs1NzMxRslLKys_I00vJT3VIrUjMLchJ1UvOz1XSUSrKz0kFyjqm5GbmKdUCANotxTkvAAAA.85AXm3JOF5qflEA0goDFvlbZl2q3eFvqVcehz860W-o",
-			},
-			ExpectedEmail: "",
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.Name, func(t *testing.T) {
-			staticToken := oauth2.Token{
-				AccessToken:  "",
-				TokenType:    "",
-				RefreshToken: "",
-				Expiry:       time.Now(),
-			}
-
-			token := staticToken.WithExtra(test.OAuth2Extra)
-			userInfo := provider.extractFromToken(token)
-
-			if test.ExpectedEmail == "" {
-				require.Nil(t, userInfo, "Testing case %q", test.Name)
-			} else {
-				require.NotNil(t, userInfo, "Testing case %q", test.Name)
-				require.Equal(t, test.ExpectedEmail, userInfo.Email)
-			}
-		})
-	}
-}
diff --git a/pkg/login/social/github_oauth.go b/pkg/login/social/github_oauth.go
deleted file mode 100644
index 9c6985cf27e78..0000000000000
--- a/pkg/login/social/github_oauth.go
+++ /dev/null
@@ -1,293 +0,0 @@
-package social
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/http"
-	"regexp"
-	"strings"
-
-	"golang.org/x/oauth2"
-
-	"github.com/grafana/grafana/pkg/models/roletype"
-	"github.com/grafana/grafana/pkg/util/errutil"
-)
-
-type SocialGithub struct {
-	*SocialBase
-	allowedOrganizations []string
-	apiUrl               string
-	teamIds              []int
-	skipOrgRoleSync      bool
-}
-
-type GithubTeam struct {
-	Id           int    `json:"id"`
-	Slug         string `json:"slug"`
-	URL          string `json:"html_url"`
-	Organization struct {
-		Login string `json:"login"`
-	} `json:"organization"`
-}
-
-var (
-	ErrMissingTeamMembership = errutil.Unauthorized(
-		"auth.missing_team",
-		errutil.WithPublicMessage(
-			"User is not a member of one of the required teams. Please contact identity provider administrator."))
-	ErrMissingOrganizationMembership = errutil.Unauthorized(
-		"auth.missing_organization",
-		errutil.WithPublicMessage(
-			"User is not a member of one of the required organizations. Please contact identity provider administrator."))
-)
-
-func (s *SocialGithub) IsTeamMember(ctx context.Context, client *http.Client) bool {
-	if len(s.teamIds) == 0 {
-		return true
-	}
-
-	teamMemberships, err := s.FetchTeamMemberships(ctx, client)
-	if err != nil {
-		return false
-	}
-
-	for _, teamId := range s.teamIds {
-		for _, membership := range teamMemberships {
-			if teamId == membership.Id {
-				return true
-			}
-		}
-	}
-
-	return false
-}
-
-func (s *SocialGithub) IsOrganizationMember(ctx context.Context,
-	client *http.Client, organizationsUrl string) bool {
-	if len(s.allowedOrganizations) == 0 {
-		return true
-	}
-
-	organizations, err := s.FetchOrganizations(ctx, client, organizationsUrl)
-	if err != nil {
-		return false
-	}
-
-	for _, allowedOrganization := range s.allowedOrganizations {
-		for _, organization := range organizations {
-			if strings.EqualFold(organization, allowedOrganization) {
-				return true
-			}
-		}
-	}
-
-	return false
-}
-
-func (s *SocialGithub) FetchPrivateEmail(ctx context.Context, client *http.Client) (string, error) {
-	type Record struct {
-		Email    string `json:"email"`
-		Primary  bool   `json:"primary"`
-		Verified bool   `json:"verified"`
-	}
-
-	response, err := s.httpGet(ctx, client, fmt.Sprintf(s.apiUrl+"/emails"))
-	if err != nil {
-		return "", fmt.Errorf("Error getting email address: %s", err)
-	}
-
-	var records []Record
-
-	err = json.Unmarshal(response.Body, &records)
-	if err != nil {
-		return "", fmt.Errorf("Error getting email address: %s", err)
-	}
-
-	var email = ""
-	for _, record := range records {
-		if record.Primary {
-			email = record.Email
-		}
-	}
-
-	return email, nil
-}
-
-func (s *SocialGithub) FetchTeamMemberships(ctx context.Context, client *http.Client) ([]GithubTeam, error) {
-	url := fmt.Sprintf(s.apiUrl + "/teams?per_page=100")
-	hasMore := true
-	teams := make([]GithubTeam, 0)
-
-	for hasMore {
-		response, err := s.httpGet(ctx, client, url)
-		if err != nil {
-			return nil, fmt.Errorf("Error getting team memberships: %s", err)
-		}
-
-		var records []GithubTeam
-
-		err = json.Unmarshal(response.Body, &records)
-		if err != nil {
-			return nil, fmt.Errorf("Error getting team memberships: %s", err)
-		}
-
-		teams = append(teams, records...)
-
-		url, hasMore = s.HasMoreRecords(response.Headers)
-	}
-
-	return teams, nil
-}
-
-func (s *SocialGithub) HasMoreRecords(headers http.Header) (string, bool) {
-	value, exists := headers["Link"]
-	if !exists {
-		return "", false
-	}
-
-	pattern := regexp.MustCompile(`<([^>]+)>; rel="next"`)
-	matches := pattern.FindStringSubmatch(value[0])
-
-	if matches == nil {
-		return "", false
-	}
-
-	url := matches[1]
-
-	return url, true
-}
-
-func (s *SocialGithub) FetchOrganizations(ctx context.Context, client *http.Client, organizationsUrl string) ([]string, error) {
-	url := organizationsUrl
-	hasMore := true
-	logins := make([]string, 0)
-
-	type Record struct {
-		Login string `json:"login"`
-	}
-
-	for hasMore {
-		response, err := s.httpGet(ctx, client, url)
-		if err != nil {
-			return nil, fmt.Errorf("error getting organizations: %s", err)
-		}
-
-		var records []Record
-
-		err = json.Unmarshal(response.Body, &records)
-		if err != nil {
-			return nil, fmt.Errorf("error getting organizations: %s", err)
-		}
-
-		for _, record := range records {
-			logins = append(logins, record.Login)
-		}
-
-		url, hasMore = s.HasMoreRecords(response.Headers)
-	}
-	return logins, nil
-}
-
-func (s *SocialGithub) UserInfo(ctx context.Context, client *http.Client, token *oauth2.Token) (*BasicUserInfo, error) {
-	var data struct {
-		Id    int    `json:"id"`
-		Login string `json:"login"`
-		Email string `json:"email"`
-		Name  string `json:"name"`
-	}
-
-	response, err := s.httpGet(ctx, client, s.apiUrl)
-	if err != nil {
-		return nil, fmt.Errorf("error getting user info: %s", err)
-	}
-
-	if err = json.Unmarshal(response.Body, &data); err != nil {
-		return nil, fmt.Errorf("error unmarshalling user info: %s", err)
-	}
-
-	teamMemberships, err := s.FetchTeamMemberships(ctx, client)
-	if err != nil {
-		return nil, fmt.Errorf("error getting user teams: %s", err)
-	}
-
-	teams := convertToGroupList(teamMemberships)
-
-	var role roletype.RoleType
-	var isGrafanaAdmin *bool = nil
-
-	if !s.skipOrgRoleSync {
-		var grafanaAdmin bool
-		role, grafanaAdmin, err = s.extractRoleAndAdmin(response.Body, teams)
-		if err != nil {
-			return nil, err
-		}
-
-		if s.allowAssignGrafanaAdmin {
-			isGrafanaAdmin = &grafanaAdmin
-		}
-	}
-
-	// we skip allowing assignment of GrafanaAdmin if skipOrgRoleSync is present
-	if s.allowAssignGrafanaAdmin && s.skipOrgRoleSync {
-		s.log.Debug("AllowAssignGrafanaAdmin and skipOrgRoleSync are both set, Grafana Admin role will not be synced, consider setting one or the other")
-	}
-
-	userInfo := &BasicUserInfo{
-		Name:           data.Login,
-		Login:          data.Login,
-		Id:             fmt.Sprintf("%d", data.Id),
-		Email:          data.Email,
-		Role:           role,
-		Groups:         teams,
-		IsGrafanaAdmin: isGrafanaAdmin,
-	}
-	if data.Name != "" {
-		userInfo.Name = data.Name
-	}
-
-	organizationsUrl := fmt.Sprintf(s.apiUrl + "/orgs?per_page=100")
-
-	if !s.IsTeamMember(ctx, client) {
-		return nil, ErrMissingTeamMembership.Errorf("User is not a member of any of the allowed teams: %v", s.teamIds)
-	}
-
-	if !s.IsOrganizationMember(ctx, client, organizationsUrl) {
-		return nil, ErrMissingOrganizationMembership.Errorf(
-			"User is not a member of any of the allowed organizations: %v",
-			s.allowedOrganizations)
-	}
-
-	if userInfo.Email == "" {
-		userInfo.Email, err = s.FetchPrivateEmail(ctx, client)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return userInfo, nil
-}
-
-func (t *GithubTeam) GetShorthand() (string, error) {
-	if t.Organization.Login == "" || t.Slug == "" {
-		return "", errors.New("Error getting team shorthand")
-	}
-	return fmt.Sprintf("@%s/%s", t.Organization.Login, t.Slug), nil
-}
-
-func convertToGroupList(t []GithubTeam) []string {
-	groups := make([]string, 0)
-	for _, team := range t {
-		// Group shouldn't be empty string, otherwise team sync will not work properly
-		if team.URL != "" {
-			groups = append(groups, team.URL)
-		}
-		teamShorthand, _ := team.GetShorthand()
-		if teamShorthand != "" {
-			groups = append(groups, teamShorthand)
-		}
-	}
-
-	return groups
-}
diff --git a/pkg/login/social/github_oauth_test.go b/pkg/login/social/github_oauth_test.go
deleted file mode 100644
index df8771dfd4f86..0000000000000
--- a/pkg/login/social/github_oauth_test.go
+++ /dev/null
@@ -1,264 +0,0 @@
-package social
-
-import (
-	"context"
-	"net/http"
-	"net/http/httptest"
-	"reflect"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"golang.org/x/oauth2"
-
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-)
-
-const testGHUserTeamsJSON = `[
-  {
-    "id": 1,
-    "node_id": "MDQ6VGVhbTE=",
-    "url": "https://api.github.com/teams/1",
-    "html_url": "https://github.com/orgs/github/teams/justice-league",
-    "name": "Justice League",
-    "slug": "justice-league",
-    "description": "A great team.",
-    "privacy": "closed",
-    "permission": "admin",
-    "members_url": "https://api.github.com/teams/1/members{/member}",
-    "repositories_url": "https://api.github.com/teams/1/repos",
-    "parent": null,
-    "members_count": 3,
-    "repos_count": 10,
-    "created_at": "2017-07-14T16:53:42Z",
-    "updated_at": "2017-08-17T12:37:15Z",
-    "organization": {
-      "login": "github",
-      "id": 1,
-      "node_id": "MDEyOk9yZ2FuaXphdGlvbjE=",
-      "url": "https://api.github.com/orgs/github",
-      "repos_url": "https://api.github.com/orgs/github/repos",
-      "events_url": "https://api.github.com/orgs/github/events",
-      "hooks_url": "https://api.github.com/orgs/github/hooks",
-      "issues_url": "https://api.github.com/orgs/github/issues",
-      "members_url": "https://api.github.com/orgs/github/members{/member}",
-      "public_members_url": "https://api.github.com/orgs/github/public_members{/member}",
-      "avatar_url": "https://github.com/images/error/octocat_happy.gif",
-      "description": "A great organization",
-      "name": "github",
-      "company": "GitHub",
-      "blog": "https://github.com/blog",
-      "location": "San Francisco",
-      "email": "octocat@github.com",
-      "is_verified": true,
-      "has_organization_projects": true,
-      "has_repository_projects": true,
-      "public_repos": 2,
-      "public_gists": 1,
-      "followers": 20,
-      "following": 0,
-      "html_url": "https://github.com/octocat",
-      "created_at": "2008-01-14T04:33:35Z",
-      "updated_at": "2017-08-17T12:37:15Z",
-      "type": "Organization"
-    }
-  }
-]`
-
-const testGHUserJSON = `{
-  "login": "octocat",
-  "id": 1,
-  "node_id": "MDQ6VXNlcjE=",
-  "avatar_url": "https://github.com/images/error/octocat_happy.gif",
-  "gravatar_id": "",
-  "url": "https://api.github.com/users/octocat",
-  "html_url": "https://github.com/octocat",
-  "followers_url": "https://api.github.com/users/octocat/followers",
-  "following_url": "https://api.github.com/users/octocat/following{/other_user}",
-  "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}",
-  "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}",
-  "subscriptions_url": "https://api.github.com/users/octocat/subscriptions",
-  "organizations_url": "https://api.github.com/users/octocat/orgs",
-  "repos_url": "https://api.github.com/users/octocat/repos",
-  "events_url": "https://api.github.com/users/octocat/events{/privacy}",
-  "received_events_url": "https://api.github.com/users/octocat/received_events",
-  "type": "User",
-  "site_admin": false,
-  "name": "monalisa octocat",
-  "company": "GitHub",
-  "blog": "https://github.com/blog",
-  "location": "San Francisco",
-  "email": "octocat@github.com",
-  "hireable": false,
-  "bio": "There once was...",
-  "twitter_username": "monatheoctocat",
-  "public_repos": 2,
-  "public_gists": 1,
-  "followers": 20,
-  "following": 0,
-  "created_at": "2008-01-14T04:33:35Z",
-  "updated_at": "2008-01-14T04:33:35Z",
-  "private_gists": 81,
-  "total_private_repos": 100,
-  "owned_private_repos": 100,
-  "disk_usage": 10000,
-  "collaborators": 8,
-  "two_factor_authentication": true,
-  "plan": {
-    "name": "Medium",
-    "space": 400,
-    "private_repos": 20,
-    "collaborators": 0
-  }
-}`
-
-func TestSocialGitHub_UserInfo(t *testing.T) {
-	var boolPointer *bool
-	tests := []struct {
-		name                     string
-		userRawJSON              string
-		userTeamsRawJSON         string
-		settingAutoAssignOrgRole string
-		settingAllowGrafanaAdmin bool
-		settingSkipOrgRoleSync   bool
-		roleAttributePath        string
-		autoAssignOrgRole        string
-		want                     *BasicUserInfo
-		wantErr                  bool
-	}{
-		{
-			name:              "Basic User info",
-			userRawJSON:       testGHUserJSON,
-			userTeamsRawJSON:  testGHUserTeamsJSON,
-			autoAssignOrgRole: "",
-			roleAttributePath: "",
-			want: &BasicUserInfo{
-				Id:     "1",
-				Name:   "monalisa octocat",
-				Email:  "octocat@github.com",
-				Login:  "octocat",
-				Role:   "Viewer",
-				Groups: []string{"https://github.com/orgs/github/teams/justice-league", "@github/justice-league"},
-			},
-		},
-		{
-			name:              "Admin mapping takes precedence over auto assign org role",
-			roleAttributePath: "[login==octocat] && 'Admin' || 'Viewer'",
-			userRawJSON:       testGHUserJSON,
-			autoAssignOrgRole: "Editor",
-			userTeamsRawJSON:  testGHUserTeamsJSON,
-			want: &BasicUserInfo{
-				Id:     "1",
-				Name:   "monalisa octocat",
-				Email:  "octocat@github.com",
-				Login:  "octocat",
-				Role:   "Admin",
-				Groups: []string{"https://github.com/orgs/github/teams/justice-league", "@github/justice-league"},
-			},
-		},
-		{
-			name:              "Editor mapping via groups",
-			roleAttributePath: "contains(groups[*], '@github/justice-league') && 'Editor' || 'Viewer'",
-			userRawJSON:       testGHUserJSON,
-			autoAssignOrgRole: "Editor",
-			userTeamsRawJSON:  testGHUserTeamsJSON,
-			want: &BasicUserInfo{
-				Id:     "1",
-				Name:   "monalisa octocat",
-				Email:  "octocat@github.com",
-				Login:  "octocat",
-				Role:   "Editor",
-				Groups: []string{"https://github.com/orgs/github/teams/justice-league", "@github/justice-league"},
-			},
-		},
-		{
-			name:                   "Should be empty role if setting skipOrgRoleSync is set to true",
-			roleAttributePath:      "contains(groups[*], '@github/justice-league') && 'Editor' || 'Viewer'",
-			settingSkipOrgRoleSync: true,
-			userRawJSON:            testGHUserJSON,
-			userTeamsRawJSON:       testGHUserTeamsJSON,
-			want: &BasicUserInfo{
-				Id:     "1",
-				Name:   "monalisa octocat",
-				Email:  "octocat@github.com",
-				Login:  "octocat",
-				Role:   "",
-				Groups: []string{"https://github.com/orgs/github/teams/justice-league", "@github/justice-league"},
-			},
-		},
-		{
-			name:                     "Should return nil pointer if allowGrafanaAdmin and skipOrgRoleSync setting is set to true",
-			roleAttributePath:        "contains(groups[*], '@github/justice-league') && 'Editor' || 'Viewer'",
-			settingSkipOrgRoleSync:   true,
-			settingAllowGrafanaAdmin: true,
-			userRawJSON:              testGHUserJSON,
-			userTeamsRawJSON:         testGHUserTeamsJSON,
-			want: &BasicUserInfo{
-				Id:             "1",
-				Name:           "monalisa octocat",
-				Email:          "octocat@github.com",
-				Login:          "octocat",
-				Role:           "",
-				Groups:         []string{"https://github.com/orgs/github/teams/justice-league", "@github/justice-league"},
-				IsGrafanaAdmin: boolPointer,
-			},
-		},
-		{
-			name:              "fallback to default org role",
-			roleAttributePath: "",
-			userRawJSON:       testGHUserJSON,
-			autoAssignOrgRole: "Editor",
-			userTeamsRawJSON:  testGHUserTeamsJSON,
-			want: &BasicUserInfo{
-				Id:     "1",
-				Name:   "monalisa octocat",
-				Email:  "octocat@github.com",
-				Login:  "octocat",
-				Role:   "Editor",
-				Groups: []string{"https://github.com/orgs/github/teams/justice-league", "@github/justice-league"},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			server := httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
-				writer.WriteHeader(http.StatusOK)
-				// return JSON if matches user endpoint
-				if strings.HasSuffix(request.URL.String(), "/user") {
-					writer.Header().Set("Content-Type", "application/json")
-					_, err := writer.Write([]byte(tt.userRawJSON))
-					require.NoError(t, err)
-				} else if strings.HasSuffix(request.URL.String(), "/user/teams?per_page=100") {
-					writer.Header().Set("Content-Type", "application/json")
-					_, err := writer.Write([]byte(tt.userTeamsRawJSON))
-					require.NoError(t, err)
-				} else {
-					writer.WriteHeader(http.StatusNotFound)
-				}
-			}))
-			defer server.Close()
-
-			s := &SocialGithub{
-				SocialBase: newSocialBase("github", &oauth2.Config{},
-					&OAuthInfo{RoleAttributePath: tt.roleAttributePath}, tt.autoAssignOrgRole, false, *featuremgmt.WithFeatures()),
-				allowedOrganizations: []string{},
-				apiUrl:               server.URL + "/user",
-				teamIds:              []int{},
-				skipOrgRoleSync:      tt.settingSkipOrgRoleSync,
-			}
-
-			token := &oauth2.Token{
-				AccessToken: "fake_token",
-			}
-
-			got, err := s.UserInfo(context.Background(), server.Client(), token)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("UserInfo() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("UserInfo() got = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
diff --git a/pkg/login/social/gitlab_oauth_test.go b/pkg/login/social/gitlab_oauth_test.go
deleted file mode 100644
index a12c536d0cbfd..0000000000000
--- a/pkg/login/social/gitlab_oauth_test.go
+++ /dev/null
@@ -1,465 +0,0 @@
-package social
-
-import (
-	"context"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"strconv"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"golang.org/x/oauth2"
-
-	"github.com/grafana/grafana/pkg/services/org"
-)
-
-const (
-	apiURI    = "/api/v4"
-	userURI   = "/api/v4/user"
-	groupsURI = "/api/v4/groups?min_access_level=10&page=1&per_page=50"
-
-	gitlabAttrPath = `is_admin && 'GrafanaAdmin' || contains(groups[*], 'admins') && 'Admin' || contains(groups[*], 'editors') && 'Editor' || contains(groups[*], 'viewers') && 'Viewer'`
-
-	rootUserRespBody   = `{"id":1,"username":"root","name":"Administrator","state":"active","email":"root@example.org", "confirmed_at":"2022-09-13T19:38:04.891Z","is_admin":true,"namespace_id":1}`
-	editorUserRespBody = `{"id":3,"username":"gitlab-editor","name":"Gitlab Editor","state":"active","email":"gitlab-editor@example.org", "confirmed_at":"2022-09-13T19:38:04.891Z","is_admin":false,"namespace_id":1}`
-
-	adminGroup  = `{"id":4,"web_url":"http://grafana-gitlab.local/groups/admins","name":"Admins","path":"admins","project_creation_level":"developer","full_name":"Admins","full_path":"admins","created_at":"2022-09-13T19:38:04.891Z"}`
-	editorGroup = `{"id":5,"web_url":"http://grafana-gitlab.local/groups/editors","name":"Editors","path":"editors","project_creation_level":"developer","full_name":"Editors","full_path":"editors","created_at":"2022-09-13T19:38:15.074Z"}`
-	viewerGroup = `{"id":6,"web_url":"http://grafana-gitlab.local/groups/viewers","name":"Viewers","path":"viewers","project_creation_level":"developer","full_name":"Viewers","full_path":"viewers","created_at":"2022-09-13T19:38:25.777Z"}`
-	// serverAdminGroup = `{"id":7,"web_url":"http://grafana-gitlab.local/groups/serveradmins","name":"ServerAdmins","path":"serveradmins","project_creation_level":"developer","full_name":"ServerAdmins","full_path":"serveradmins","created_at":"2022-09-13T19:38:36.227Z"}`
-)
-
-func TestSocialGitlab_UserInfo(t *testing.T) {
-	var nilPointer *bool
-	provider := SocialGitlab{
-		SocialBase: &SocialBase{
-			log: newLogger("gitlab_oauth_test", "debug"),
-		},
-		skipOrgRoleSync: false,
-	}
-
-	type conf struct {
-		AllowAssignGrafanaAdmin bool
-		RoleAttributeStrict     bool
-		AutoAssignOrgRole       org.RoleType
-		SkipOrgRoleSync         bool
-	}
-
-	tests := []struct {
-		Name                 string
-		Cfg                  conf
-		UserRespBody         string
-		GroupsRespBody       string
-		GroupHeaders         map[string]string
-		RoleAttributePath    string
-		ExpectedLogin        string
-		ExpectedEmail        string
-		ExpectedRole         org.RoleType
-		ExpectedGrafanaAdmin *bool
-		ExpectedError        error
-	}{
-		{
-			Name:           "Server Admin Allowed",
-			Cfg:            conf{AllowAssignGrafanaAdmin: true},
-			UserRespBody:   rootUserRespBody,
-			GroupsRespBody: "[" + strings.Join([]string{adminGroup, editorGroup, viewerGroup}, ",") + "]",
-			GroupHeaders: map[string]string{
-				"X-Total-Pages": "1",
-				"X-Total":       "3",
-				"X-Page":        "1",
-				"X-Next-Page":   "",
-			},
-			RoleAttributePath:    gitlabAttrPath,
-			ExpectedLogin:        "root",
-			ExpectedEmail:        "root@example.org",
-			ExpectedRole:         "Admin",
-			ExpectedGrafanaAdmin: trueBoolPtr(),
-		},
-		{ // Edge case, user in Viewer Group, Server Admin disabled but attribute path contains a condition for Server Admin => User has the Admin role
-			Name:           "Server Admin Disabled",
-			Cfg:            conf{AllowAssignGrafanaAdmin: false},
-			UserRespBody:   rootUserRespBody,
-			GroupsRespBody: "[" + strings.Join([]string{adminGroup, editorGroup, viewerGroup}, ",") + "]",
-			GroupHeaders: map[string]string{
-				"X-Total-Pages": "1",
-				"X-Total":       "3",
-				"X-Page":        "1",
-				// Next page omitted to test that the provider does not make a second request
-			},
-			RoleAttributePath:    gitlabAttrPath,
-			ExpectedLogin:        "root",
-			ExpectedEmail:        "root@example.org",
-			ExpectedRole:         "Admin",
-			ExpectedGrafanaAdmin: nil,
-		},
-		{
-			Name:                 "Editor",
-			Cfg:                  conf{AllowAssignGrafanaAdmin: true},
-			UserRespBody:         editorUserRespBody,
-			GroupsRespBody:       "[" + strings.Join([]string{viewerGroup, editorGroup}, ",") + "]",
-			RoleAttributePath:    gitlabAttrPath,
-			ExpectedLogin:        "gitlab-editor",
-			ExpectedEmail:        "gitlab-editor@example.org",
-			ExpectedRole:         "Editor",
-			ExpectedGrafanaAdmin: falseBoolPtr(),
-			GroupHeaders:         map[string]string{
-				// All headers omitted to test that the provider does not make a second request
-			},
-		},
-		{
-			Name:                 "Should not sync role, return empty role and nil pointer for GrafanaAdmin for skip org role sync set to true",
-			Cfg:                  conf{SkipOrgRoleSync: true},
-			UserRespBody:         editorUserRespBody,
-			GroupsRespBody:       "[" + strings.Join([]string{viewerGroup, editorGroup}, ",") + "]",
-			RoleAttributePath:    gitlabAttrPath,
-			ExpectedLogin:        "gitlab-editor",
-			ExpectedEmail:        "gitlab-editor@example.org",
-			ExpectedRole:         "",
-			ExpectedGrafanaAdmin: nilPointer,
-		},
-		{ // Fallback to autoAssignOrgRole
-			Name:              "No fallback to default org role",
-			Cfg:               conf{AutoAssignOrgRole: org.RoleAdmin},
-			UserRespBody:      editorUserRespBody,
-			GroupsRespBody:    "[" + strings.Join([]string{}, ",") + "]",
-			RoleAttributePath: gitlabAttrPath,
-			ExpectedLogin:     "gitlab-editor",
-			ExpectedEmail:     "gitlab-editor@example.org",
-			ExpectedRole:      "Admin",
-		},
-		{
-			Name:              "Strict mode prevents fallback to default",
-			Cfg:               conf{RoleAttributeStrict: true, AutoAssignOrgRole: org.RoleAdmin},
-			UserRespBody:      editorUserRespBody,
-			GroupsRespBody:    "[" + strings.Join([]string{}, ",") + "]",
-			RoleAttributePath: gitlabAttrPath,
-			ExpectedError:     errRoleAttributeStrictViolation,
-		},
-		{ // Edge case, no match, no strict mode and no fallback => User has the Viewer role (hard coded)
-			Name:              "Fallback with no default will create a user with a default role",
-			Cfg:               conf{},
-			UserRespBody:      editorUserRespBody,
-			GroupsRespBody:    "[]",
-			RoleAttributePath: gitlabAttrPath,
-			ExpectedLogin:     "gitlab-editor",
-			ExpectedEmail:     "gitlab-editor@example.org",
-			ExpectedRole:      "Viewer",
-		},
-		{ // Edge case, no attribute path with strict mode => Error
-			Name:              "Strict mode with no attribute path",
-			Cfg:               conf{RoleAttributeStrict: true, AutoAssignOrgRole: org.RoleViewer},
-			UserRespBody:      editorUserRespBody,
-			GroupsRespBody:    "[" + strings.Join([]string{editorGroup}, ",") + "]",
-			RoleAttributePath: "",
-			ExpectedError:     errRoleAttributePathNotSet,
-		},
-	}
-
-	for _, test := range tests {
-		provider.roleAttributePath = test.RoleAttributePath
-		provider.allowAssignGrafanaAdmin = test.Cfg.AllowAssignGrafanaAdmin
-		provider.autoAssignOrgRole = string(test.Cfg.AutoAssignOrgRole)
-		provider.roleAttributeStrict = test.Cfg.RoleAttributeStrict
-		provider.skipOrgRoleSync = test.Cfg.SkipOrgRoleSync
-
-		t.Run(test.Name, func(t *testing.T) {
-			ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				w.WriteHeader(http.StatusOK)
-				w.Header().Set("Content-Type", "application/json")
-				switch r.RequestURI {
-				case userURI:
-					w.WriteHeader(http.StatusOK)
-					_, err := w.Write([]byte(test.UserRespBody))
-					require.NoError(t, err)
-				case groupsURI:
-					w.WriteHeader(http.StatusOK)
-					for k, v := range test.GroupHeaders {
-						w.Header().Set(k, v)
-					}
-					_, err := w.Write([]byte(test.GroupsRespBody))
-					require.NoError(t, err)
-				default:
-					require.Fail(t, "unexpected request URI: "+r.RequestURI)
-				}
-			}))
-			provider.apiUrl = ts.URL + apiURI
-			actualResult, err := provider.UserInfo(context.Background(), ts.Client(), &oauth2.Token{})
-			if test.ExpectedError != nil {
-				require.ErrorIs(t, err, test.ExpectedError)
-				return
-			}
-
-			require.NoError(t, err)
-			require.Equal(t, test.ExpectedEmail, actualResult.Email)
-			require.Equal(t, test.ExpectedLogin, actualResult.Login)
-			require.Equal(t, test.ExpectedRole, actualResult.Role)
-			require.Equal(t, test.ExpectedGrafanaAdmin, actualResult.IsGrafanaAdmin)
-		})
-	}
-}
-
-type testCase struct {
-	name           string
-	payload        string
-	config         *oauth2.Config
-	wantUser       *userData
-	wantErrMessage string
-}
-
-func TestSocialGitlab_extractFromToken(t *testing.T) {
-	// Create a test server that returns a dummy ID token and user info
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		switch r.URL.Path {
-		case "/oauth/token":
-			// Return a dummy access token
-			_ = json.NewEncoder(w).Encode(map[string]interface{}{
-				"access_token": "dummy_access_token",
-				"token_type":   "Bearer",
-			})
-		case "/oauth/userinfo":
-			// Return a dummy user info
-			_ = json.NewEncoder(w).Encode(userInfoResponse{
-				Sub:           "12345678",
-				EmailVerified: true,
-				Groups:        []string{"admins", "editors", "viewers"},
-			})
-		default:
-			http.Error(w, "not found", http.StatusNotFound)
-		}
-	}))
-	defer ts.Close()
-
-	testCases := []testCase{
-		{
-			name: "successful extraction",
-			payload: `{
-                "iss": "https://gitlab.com",
-                "sub": "12345678",
-                "aud": "d77db857f4696c5c5ff6cee64f3ed26e709aac8f1c644dc4b9d5fd64f825d583",
-                "exp": 1686124040,
-                "iat": 1686123920,
-                "auth_time": 1686119303,
-                "sub_legacy": "b4359d63eaf90d4b1f3d71d291353b75a676bf73fdf734d4ff009eca5c69bb70",
-                "name": "John Doe",
-                "nickname": "johndoe",
-                "preferred_username": "johndoe",
-                "email": "johndoe@example.com",
-                "email_verified": true,
-                "profile": "https://gitlab.com/johndoe",
-                "picture": "https://gitlab.com/uploads/-/system/user/avatar/1234567/avatar.png",
-                "groups_direct": [
-                  "admins"
-                ]
-            }`,
-			config: &oauth2.Config{
-				Endpoint: oauth2.Endpoint{
-					AuthURL:  ts.URL + "/oauth/authorize",
-					TokenURL: ts.URL + "/oauth/token",
-				},
-			},
-			wantUser: &userData{
-				ID:             "12345678",
-				Login:          "johndoe",
-				Email:          "johndoe@example.com",
-				Name:           "John Doe",
-				Groups:         []string{"admins", "editors", "viewers"},
-				EmailVerified:  true,
-				Role:           "Viewer",
-				IsGrafanaAdmin: nil,
-			},
-		},
-		{
-			name: "unverified email",
-			payload: `{
-                "iss": "https://gitlab.com",
-                "sub": "12345678",
-                "aud": "d77db857f4696c5c5ff6cee64f3ed26e709aac8f1c644dc4b9d5fd64f825d583",
-                "exp": 1686124040,
-                "iat": 1686123920,
-                "auth_time": 1686119303,
-                "sub_legacy": "b4359d63eaf90d4b1f3d71d291353b75a676bf73fdf734d4ff009eca5c69bb70",
-                "name": "John Doe",
-                "nickname": "johndoe",
-                "preferred_username": "johndoe",
-                "email": "johndoe@example.com",
-                "email_verified": false,
-                "profile": "https://gitlab.com/johndoe",
-                "picture": "https://gitlab.com/uploads/-/system/user/avatar/1234567/avatar.png",
-                "groups_direct": [
-                  "admins"
-                ]
-            }`,
-			config: &oauth2.Config{
-				Endpoint: oauth2.Endpoint{
-					AuthURL:  ts.URL + "/oauth/authorize",
-					TokenURL: ts.URL + "/oauth/token",
-				},
-			},
-			wantErrMessage: "user johndoe's email is not confirmed",
-		},
-		{
-			name: "unable to reach userinfo endpoint",
-			payload: `{
-                "iss": "https://gitlab.com",
-                "sub": "12345678",
-                "aud": "d77db857f4696c5c5ff6cee64f3ed26e709aac8f1c644dc4b9d5fd64f825d583",
-                "exp": 1686124040,
-                "iat": 1686123920,
-                "auth_time": 1686119303,
-                "sub_legacy": "b4359d63eaf90d4b1f3d71d291353b75a676bf73fdf734d4ff009eca5c69bb70",
-                "name": "John Doe",
-                "nickname": "johndoe",
-                "preferred_username": "johndoe",
-                "email": "johndoe@example.com",
-                "email_verified": true,
-                "profile": "https://gitlab.com/johndoe",
-                "picture": "https://gitlab.com/uploads/-/system/user/avatar/1234567/avatar.png",
-                "groups_direct": [
-                  "admins"
-                ]
-            }`,
-			config: &oauth2.Config{
-				Endpoint: oauth2.Endpoint{
-					AuthURL:  "http://localhost:1234/oauth/authorize",
-					TokenURL: "http://localhost:1234/oauth/token",
-				},
-			},
-			wantUser: &userData{
-				ID:             "12345678",
-				Login:          "johndoe",
-				Email:          "johndoe@example.com",
-				Name:           "John Doe",
-				Groups:         []string{"admins"},
-				EmailVerified:  true,
-				Role:           "Viewer",
-				IsGrafanaAdmin: nil,
-			},
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			// Create a test client with a dummy token
-			client := oauth2.NewClient(context.Background(), &tokenSource{accessToken: "dummy_access_token"})
-
-			// Create a test SocialGitlab instance
-			s := &SocialGitlab{
-				SocialBase: &SocialBase{
-					Config:              tc.config,
-					log:                 newLogger("test", "debug"),
-					allowSignup:         false,
-					allowedDomains:      []string{},
-					roleAttributePath:   "",
-					roleAttributeStrict: false,
-					autoAssignOrgRole:   "",
-					skipOrgRoleSync:     false,
-				},
-				skipOrgRoleSync: false,
-			}
-
-			// Test case: successful extraction
-			token := &oauth2.Token{}
-			// build jwt
-			// header
-			header := map[string]interface{}{
-				"alg": "RS256",
-				"typ": "JWT",
-				"kid": "dummy",
-			}
-			headerJSON, err := json.Marshal(header)
-			require.NoError(t, err)
-			headerEncoded := base64.RawURLEncoding.EncodeToString(headerJSON)
-			// payload
-			payloadEncoded := base64.RawURLEncoding.EncodeToString([]byte(tc.payload))
-			// signature
-			signatureEncoded := base64.RawURLEncoding.EncodeToString([]byte("dummy"))
-			// build token
-			idToken := fmt.Sprintf("%s.%s.%s", headerEncoded, payloadEncoded, signatureEncoded)
-
-			token = token.WithExtra(map[string]interface{}{"id_token": idToken})
-			data, err := s.extractFromToken(context.Background(), client, token)
-			if tc.wantErrMessage != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tc.wantErrMessage)
-			} else {
-				require.NotNil(t, data)
-				require.NoError(t, err)
-				assert.Equal(t, tc.wantUser, data)
-			}
-		})
-	}
-}
-
-// tokenSource is a dummy oauth2.TokenSource that always returns a fixed access token
-type tokenSource struct {
-	accessToken string
-}
-
-func (t *tokenSource) Token() (*oauth2.Token, error) {
-	return &oauth2.Token{
-		AccessToken: t.accessToken,
-		TokenType:   "Bearer",
-	}, nil
-}
-
-func TestSocialGitlab_GetGroupsNextPage(t *testing.T) {
-	type Group struct {
-		FullPath string `json:"full_path"`
-	}
-
-	groups := []Group{
-		{FullPath: "admins"},
-		{FullPath: "editors"},
-		{FullPath: "viewers"},
-		{FullPath: "serveradmins"},
-	}
-
-	calls := 0
-	// Create a mock HTTP client and server
-	mockServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.URL.Path == "/groups" {
-			// Return a paginated response with 2 groups per page
-			page, err := strconv.Atoi(r.URL.Query().Get("page"))
-			require.NoError(t, err)
-			perPage := 2
-			startIndex := (page - 1) * perPage
-			endIndex := startIndex + perPage
-			if endIndex > len(groups) {
-				endIndex = len(groups)
-			}
-			groupsPage := groups[startIndex:endIndex]
-			jsonBytes, err := json.Marshal(groupsPage)
-			require.NoError(t, err)
-
-			w.Header().Set("X-Total", strconv.Itoa(len(groups)))
-			if endIndex < len(groups) {
-				w.Header().Set("X-Next-Page", strconv.Itoa(page+1))
-			}
-			calls += 1
-			_, err = w.Write(jsonBytes)
-			require.NoError(t, err)
-		} else {
-			w.WriteHeader(http.StatusNotFound)
-		}
-	}))
-	defer mockServer.Close()
-
-	// Create a SocialGitlab instance with the mock server URL
-	s := &SocialGitlab{
-		apiUrl: mockServer.URL,
-		SocialBase: &SocialBase{
-			log: newLogger("test", "debug"),
-		},
-	}
-
-	// Call getGroups and verify that it returns all groups
-	expectedGroups := []string{"admins", "editors", "viewers", "serveradmins"}
-	actualGroups := s.getGroups(context.Background(), mockServer.Client())
-	assert.Equal(t, expectedGroups, actualGroups)
-	assert.Equal(t, 2, calls)
-}
diff --git a/pkg/login/social/google_oauth.go b/pkg/login/social/google_oauth.go
deleted file mode 100644
index f4957eb40964d..0000000000000
--- a/pkg/login/social/google_oauth.go
+++ /dev/null
@@ -1,228 +0,0 @@
-package social
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"strings"
-
-	"golang.org/x/exp/slices"
-	"golang.org/x/oauth2"
-
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-const legacyAPIURL = "https://www.googleapis.com/oauth2/v1/userinfo"
-const googleIAMGroupsEndpoint = "https://content-cloudidentity.googleapis.com/v1/groups/-/memberships:searchDirectGroups"
-const googleIAMScope = "https://www.googleapis.com/auth/cloud-identity.groups.readonly"
-
-type SocialGoogle struct {
-	*SocialBase
-	hostedDomain    string
-	apiUrl          string
-	skipOrgRoleSync bool
-}
-
-type googleUserData struct {
-	ID            string `json:"sub"`
-	Email         string `json:"email"`
-	Name          string `json:"name"`
-	EmailVerified bool   `json:"email_verified"`
-	rawJSON       []byte `json:"-"`
-}
-
-func (s *SocialGoogle) UserInfo(ctx context.Context, client *http.Client, token *oauth2.Token) (*BasicUserInfo, error) {
-	data, errToken := s.extractFromToken(ctx, client, token)
-	if errToken != nil {
-		return nil, errToken
-	}
-
-	if data == nil {
-		var errAPI error
-		data, errAPI = s.extractFromAPI(ctx, client)
-		if errAPI != nil {
-			return nil, errAPI
-		}
-	}
-
-	if data.ID == "" {
-		return nil, fmt.Errorf("error getting user info: id is empty")
-	}
-
-	if !data.EmailVerified {
-		return nil, fmt.Errorf("user email is not verified")
-	}
-
-	groups, errPage := s.retrieveGroups(ctx, client, data)
-	if errPage != nil {
-		s.log.Warn("Error retrieving groups", "error", errPage)
-	}
-
-	if !s.isGroupMember(groups) {
-		return nil, errMissingGroupMembership
-	}
-
-	userInfo := &BasicUserInfo{
-		Id:             data.ID,
-		Name:           data.Name,
-		Email:          data.Email,
-		Login:          data.Email,
-		Role:           "",
-		IsGrafanaAdmin: nil,
-		Groups:         groups,
-	}
-
-	if !s.skipOrgRoleSync {
-		role, grafanaAdmin, errRole := s.extractRoleAndAdmin(data.rawJSON, groups)
-		if errRole != nil {
-			return nil, errRole
-		}
-
-		if s.allowAssignGrafanaAdmin {
-			userInfo.IsGrafanaAdmin = &grafanaAdmin
-		}
-
-		userInfo.Role = role
-	}
-
-	s.log.Debug("Resolved user info", "data", fmt.Sprintf("%+v", userInfo))
-
-	return userInfo, nil
-}
-
-type googleAPIData struct {
-	ID            string `json:"id"`
-	Name          string `json:"name"`
-	Email         string `json:"email"`
-	EmailVerified bool   `json:"verified_email"`
-}
-
-func (s *SocialGoogle) extractFromAPI(ctx context.Context, client *http.Client) (*googleUserData, error) {
-	if strings.HasPrefix(s.apiUrl, legacyAPIURL) {
-		data := googleAPIData{}
-		response, err := s.httpGet(ctx, client, s.apiUrl)
-		if err != nil {
-			return nil, fmt.Errorf("error retrieving legacy user info: %s", err)
-		}
-
-		if err := json.Unmarshal(response.Body, &data); err != nil {
-			return nil, fmt.Errorf("error unmarshalling legacy user info: %s", err)
-		}
-
-		return &googleUserData{
-			ID:            data.ID,
-			Name:          data.Name,
-			Email:         data.Email,
-			EmailVerified: data.EmailVerified,
-			rawJSON:       response.Body,
-		}, nil
-	}
-
-	data := googleUserData{}
-	response, err := s.httpGet(ctx, client, s.apiUrl)
-	if err != nil {
-		return nil, fmt.Errorf("error getting user info: %s", err)
-	}
-
-	if err := json.Unmarshal(response.Body, &data); err != nil {
-		return nil, fmt.Errorf("error unmarshalling user info: %s", err)
-	}
-
-	return &data, nil
-}
-
-func (s *SocialGoogle) AuthCodeURL(state string, opts ...oauth2.AuthCodeOption) string {
-	if s.features.IsEnabled(featuremgmt.FlagAccessTokenExpirationCheck) && s.useRefreshToken {
-		opts = append(opts, oauth2.AccessTypeOffline, oauth2.ApprovalForce)
-	}
-	return s.SocialBase.AuthCodeURL(state, opts...)
-}
-
-func (s *SocialGoogle) extractFromToken(ctx context.Context, client *http.Client, token *oauth2.Token) (*googleUserData, error) {
-	s.log.Debug("Extracting user info from OAuth token")
-
-	idToken := token.Extra("id_token")
-	if idToken == nil {
-		s.log.Debug("No id_token found, defaulting to API access", "token", token)
-		return nil, nil
-	}
-
-	rawJSON, err := s.retrieveRawIDToken(idToken)
-	if err != nil {
-		s.log.Warn("Error retrieving id_token", "error", err, "token", fmt.Sprintf("%+v", idToken))
-		return nil, nil
-	}
-
-	if setting.Env == setting.Dev {
-		s.log.Debug("Received id_token", "raw_json", string(rawJSON))
-	}
-
-	var data googleUserData
-	if err := json.Unmarshal(rawJSON, &data); err != nil {
-		return nil, fmt.Errorf("Error getting user info: %s", err)
-	}
-
-	data.rawJSON = rawJSON
-
-	return &data, nil
-}
-
-type googleGroupResp struct {
-	Memberships []struct {
-		Group    string `json:"group"`
-		GroupKey struct {
-			ID string `json:"id"`
-		} `json:"groupKey"`
-		DisplayName string `json:"displayName"`
-	} `json:"memberships"`
-	NextPageToken string `json:"nextPageToken"`
-}
-
-func (s *SocialGoogle) retrieveGroups(ctx context.Context, client *http.Client, userData *googleUserData) ([]string, error) {
-	s.log.Debug("Retrieving groups", "scopes", s.SocialBase.Config.Scopes)
-	if !slices.Contains(s.Scopes, googleIAMScope) {
-		return nil, nil
-	}
-
-	groups := []string{}
-
-	url := fmt.Sprintf("%s?query=member_key_id=='%s'", googleIAMGroupsEndpoint, userData.Email)
-	nextPageToken := ""
-	for page, errPage := s.getGroupsPage(ctx, client, url, nextPageToken); ; page, errPage = s.getGroupsPage(ctx, client, url, nextPageToken) {
-		if errPage != nil {
-			return nil, errPage
-		}
-
-		for _, group := range page.Memberships {
-			groups = append(groups, group.GroupKey.ID)
-		}
-
-		nextPageToken = page.NextPageToken
-		if nextPageToken == "" {
-			break
-		}
-	}
-
-	return groups, nil
-}
-
-func (s *SocialGoogle) getGroupsPage(ctx context.Context, client *http.Client, url, nextPageToken string) (*googleGroupResp, error) {
-	if nextPageToken != "" {
-		url = fmt.Sprintf("%s&pageToken=%s", url, nextPageToken)
-	}
-
-	s.log.Debug("Retrieving groups", "url", url)
-	resp, err := s.httpGet(ctx, client, url)
-	if err != nil {
-		return nil, fmt.Errorf("error getting groups: %s", err)
-	}
-
-	var data googleGroupResp
-	if err := json.Unmarshal(resp.Body, &data); err != nil {
-		return nil, fmt.Errorf("error unmarshalling groups: %s", err)
-	}
-
-	return &data, nil
-}
diff --git a/pkg/login/social/google_oauth_test.go b/pkg/login/social/google_oauth_test.go
deleted file mode 100644
index 96aa302d490a8..0000000000000
--- a/pkg/login/social/google_oauth_test.go
+++ /dev/null
@@ -1,659 +0,0 @@
-package social
-
-import (
-	"context"
-	"errors"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-	"time"
-
-	"github.com/go-jose/go-jose/v3"
-	"github.com/go-jose/go-jose/v3/jwt"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"golang.org/x/oauth2"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/models/roletype"
-)
-
-func TestSocialGoogle_retrieveGroups(t *testing.T) {
-	type fields struct {
-		Scopes []string
-	}
-	type args struct {
-		client   *http.Client
-		userData *googleUserData
-	}
-	tests := []struct {
-		name    string
-		fields  fields
-		args    args
-		want    []string
-		wantErr bool
-	}{
-		{
-			name: "No scope",
-			fields: fields{
-				Scopes: []string{},
-			},
-			args: args{
-				client: &http.Client{},
-				userData: &googleUserData{
-					Email: "test@example.com",
-				},
-			},
-			want:    nil,
-			wantErr: false,
-		},
-		{
-			name: "No groups",
-			fields: fields{
-				Scopes: []string{"https://www.googleapis.com/auth/cloud-identity.groups.readonly"},
-			},
-			args: args{
-				client: &http.Client{
-					Transport: &roundTripperFunc{
-						fn: func(req *http.Request) (*http.Response, error) {
-							resp := httptest.NewRecorder()
-							_, _ = resp.WriteString(`{
-                                "memberships": [
-                                ],
-                                "nextPageToken": ""
-                            }`)
-							return resp.Result(), nil
-						},
-					},
-				},
-				userData: &googleUserData{
-					Email: "test@example.com",
-				},
-			},
-			want:    []string{},
-			wantErr: false,
-		},
-		{
-			name: "error retrieving groups",
-			fields: fields{
-				Scopes: []string{"https://www.googleapis.com/auth/cloud-identity.groups.readonly"},
-			},
-			args: args{
-				client: &http.Client{
-					Transport: &roundTripperFunc{
-						fn: func(req *http.Request) (*http.Response, error) {
-							return nil, errors.New("error retrieving groups")
-						},
-					},
-				},
-				userData: &googleUserData{
-					Email: "test@example.com",
-				},
-			},
-			want:    nil,
-			wantErr: true,
-		},
-
-		{
-			name: "Has 2 pages to fetch",
-			fields: fields{
-				Scopes: []string{"https://www.googleapis.com/auth/cloud-identity.groups.readonly"},
-			},
-			args: args{
-				client: &http.Client{
-					Transport: &roundTripperFunc{
-						fn: func(req *http.Request) (*http.Response, error) {
-							resp := httptest.NewRecorder()
-							// First page
-							if req.URL.Query().Get("pageToken") == "" {
-								_, _ = resp.WriteString(`{
-                        "memberships": [
-                            {
-                                "group": "test-group",
-                                "groupKey": {
-                                    "id": "test-group@google.com"
-                                },
-                                "displayName": "Test Group"
-                            }
-                        ],
-                        "nextPageToken": "page-2"
-                    }`)
-							} else {
-								// Second page
-								_, _ = resp.WriteString(`{
-                        "memberships": [
-                            {
-                                "group": "test-group-2",
-                                "groupKey": {
-                                    "id": "test-group-2@google.com"
-                                },
-                                "displayName": "Test Group 2"
-                            }
-                        ],
-                        "nextPageToken": ""
-                    }`)
-							}
-							return resp.Result(), nil
-						},
-					},
-				},
-				userData: &googleUserData{
-					Email: "test@example.com",
-				},
-			},
-			want:    []string{"test-group@google.com", "test-group-2@google.com"},
-			wantErr: false,
-		},
-		{
-			name: "Has one page to fetch",
-			fields: fields{
-				Scopes: []string{"https://www.googleapis.com/auth/cloud-identity.groups.readonly"},
-			},
-			args: args{
-				client: &http.Client{
-					Transport: &roundTripperFunc{
-						fn: func(req *http.Request) (*http.Response, error) {
-							resp := httptest.NewRecorder()
-							_, _ = resp.WriteString(`{
-                                "memberships": [
-                                    {
-                                        "group": "test-group",
-                                        "groupKey": {
-                                            "id": "test-group@google.com"
-                                        },
-                                        "displayName": "Test Group"
-                                    }
-                                ],
-                                "nextPageToken": ""
-                            }`)
-							return resp.Result(), nil
-						},
-					},
-				},
-				userData: &googleUserData{
-					Email: "test@example.com",
-				},
-			},
-			want:    []string{"test-group@google.com"},
-			wantErr: false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			s := &SocialGoogle{
-				SocialBase: &SocialBase{
-					Config:                  &oauth2.Config{Scopes: tt.fields.Scopes},
-					log:                     log.NewNopLogger(),
-					allowSignup:             false,
-					allowAssignGrafanaAdmin: false,
-					allowedDomains:          []string{},
-					roleAttributePath:       "",
-					roleAttributeStrict:     false,
-					autoAssignOrgRole:       "",
-					skipOrgRoleSync:         false,
-				},
-				hostedDomain: "",
-				apiUrl:       "",
-			}
-			got, err := s.retrieveGroups(context.Background(), tt.args.client, tt.args.userData)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("SocialGoogle.retrieveGroups() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			require.Equal(t, tt.want, got)
-		})
-	}
-}
-
-type roundTripperFunc struct {
-	fn func(req *http.Request) (*http.Response, error)
-}
-
-func (f *roundTripperFunc) RoundTrip(req *http.Request) (*http.Response, error) {
-	return f.fn(req)
-}
-
-func TestSocialGoogle_UserInfo(t *testing.T) {
-	cl := jwt.Claims{
-		Subject:   "88888888888888",
-		Issuer:    "issuer",
-		NotBefore: jwt.NewNumericDate(time.Date(2016, 1, 1, 0, 0, 0, 0, time.UTC)),
-		Audience:  jwt.Audience{"823123"},
-	}
-
-	sig, err := jose.NewSigner(jose.SigningKey{Algorithm: jose.HS256, Key: []byte("secret")}, (&jose.SignerOptions{}).WithType("JWT"))
-	require.NoError(t, err)
-	idMap := map[string]any{
-		"email":          "test@example.com",
-		"name":           "Test User",
-		"hd":             "example.com",
-		"email_verified": true,
-	}
-
-	raw, err := jwt.Signed(sig).Claims(cl).Claims(idMap).CompactSerialize()
-	require.NoError(t, err)
-
-	tokenWithID := (&oauth2.Token{
-		AccessToken: "fake_token",
-	}).WithExtra(map[string]any{"id_token": raw})
-
-	tokenWithoutID := &oauth2.Token{}
-
-	type fields struct {
-		Scopes                  []string
-		apiURL                  string
-		allowedGroups           []string
-		roleAttributePath       string
-		roleAttributeStrict     bool
-		allowAssignGrafanaAdmin bool
-		skipOrgRoleSync         bool
-	}
-	type args struct {
-		client *http.Client
-		token  *oauth2.Token
-	}
-	tests := []struct {
-		name       string
-		fields     fields
-		args       args
-		wantData   *BasicUserInfo
-		wantErr    bool
-		wantErrMsg string
-	}{
-		{
-			name: "Success id_token",
-			fields: fields{
-				Scopes:          []string{},
-				skipOrgRoleSync: true,
-			},
-			args: args{
-				token: tokenWithID,
-			},
-			wantData: &BasicUserInfo{
-				Id:    "88888888888888",
-				Login: "test@example.com",
-				Email: "test@example.com",
-				Name:  "Test User",
-			},
-			wantErr: false,
-		},
-		{
-			name: "Success id_token - groups requested",
-			fields: fields{
-				Scopes:          []string{"https://www.googleapis.com/auth/cloud-identity.groups.readonly"},
-				skipOrgRoleSync: true,
-			},
-			args: args{
-				token: tokenWithID,
-				client: &http.Client{
-					Transport: &roundTripperFunc{
-						fn: func(req *http.Request) (*http.Response, error) {
-							resp := httptest.NewRecorder()
-							_, _ = resp.WriteString(`{
-                                "memberships": [
-                                    {
-                                        "group": "test-group",
-                                        "groupKey": {
-                                            "id": "test-group@google.com"
-                                        },
-                                        "displayName": "Test Group"
-                                    }
-                                ],
-                                "nextPageToken": ""
-                            }`)
-							return resp.Result(), nil
-						},
-					},
-				},
-			},
-			wantData: &BasicUserInfo{
-				Id:     "88888888888888",
-				Login:  "test@example.com",
-				Email:  "test@example.com",
-				Name:   "Test User",
-				Groups: []string{"test-group@google.com"},
-			},
-			wantErr: false,
-		},
-		{
-			name: "Legacy API URL",
-			fields: fields{
-				apiURL:          legacyAPIURL,
-				skipOrgRoleSync: true,
-			},
-			args: args{
-				token: tokenWithoutID,
-				client: &http.Client{
-					Transport: &roundTripperFunc{
-						fn: func(req *http.Request) (*http.Response, error) {
-							resp := httptest.NewRecorder()
-							_, _ = resp.WriteString(`{
-                                "id": "99999999999999",
-                                "name": "Test User",
-                                "email": "test@example.com",
-                                "verified_email": true
-                            }`)
-							return resp.Result(), nil
-						},
-					},
-				},
-			},
-			wantData: &BasicUserInfo{
-				Id:    "99999999999999",
-				Login: "test@example.com",
-				Email: "test@example.com",
-				Name:  "Test User",
-			},
-			wantErr: false,
-		},
-		{
-			name: "Legacy API URL - no id provided",
-			fields: fields{
-				apiURL:          legacyAPIURL,
-				skipOrgRoleSync: true,
-			},
-			args: args{
-				token: tokenWithoutID,
-				client: &http.Client{
-					Transport: &roundTripperFunc{
-						fn: func(req *http.Request) (*http.Response, error) {
-							resp := httptest.NewRecorder()
-							_, _ = resp.WriteString(`{
-                                "name": "Test User",
-                                "email": "test@example.com",
-                                "verified_email": true
-                            }`)
-							return resp.Result(), nil
-						},
-					},
-				},
-			},
-			wantData:   nil,
-			wantErr:    true,
-			wantErrMsg: "error getting user info: id is empty",
-		},
-		{
-			name: "Error unmarshalling legacy user info",
-			fields: fields{
-				apiURL: legacyAPIURL,
-			},
-			args: args{
-				token: tokenWithoutID,
-				client: &http.Client{
-					Transport: &roundTripperFunc{
-						fn: func(req *http.Request) (*http.Response, error) {
-							resp := httptest.NewRecorder()
-							_, _ = resp.WriteString(`invalid json`)
-							return resp.Result(), nil
-						},
-					},
-				},
-			},
-			wantData:   nil,
-			wantErr:    true,
-			wantErrMsg: "error unmarshalling legacy user info",
-		},
-		{
-			name: "Error getting user info",
-			fields: fields{
-				apiURL: "https://openidconnect.googleapis.com/v1/userinfo",
-			},
-			args: args{
-				token: tokenWithoutID,
-				client: &http.Client{
-					Transport: &roundTripperFunc{
-						fn: func(req *http.Request) (*http.Response, error) {
-							return nil, errors.New("error getting user info")
-						},
-					},
-				},
-			},
-			wantData:   nil,
-			wantErr:    true,
-			wantErrMsg: "error getting user info",
-		},
-		{
-			name: "Error unmarshalling user info",
-			fields: fields{
-				apiURL: "https://openidconnect.googleapis.com/v1/userinfo",
-			},
-			args: args{
-				token: tokenWithoutID,
-				client: &http.Client{
-					Transport: &roundTripperFunc{
-						fn: func(req *http.Request) (*http.Response, error) {
-							resp := httptest.NewRecorder()
-							_, _ = resp.WriteString(`invalid json`)
-							return resp.Result(), nil
-						},
-					},
-				},
-			},
-			wantData:   nil,
-			wantErr:    true,
-			wantErrMsg: "error unmarshalling user info",
-		},
-		{
-			name: "Success",
-			fields: fields{
-				apiURL:          "https://openidconnect.googleapis.com/v1/userinfo",
-				skipOrgRoleSync: true,
-			},
-			args: args{
-				token: tokenWithoutID,
-				client: &http.Client{
-					Transport: &roundTripperFunc{
-						fn: func(req *http.Request) (*http.Response, error) {
-							resp := httptest.NewRecorder()
-							_, _ = resp.WriteString(`{
-                                "sub": "92222222222222222",
-                                "name": "Test User",
-                                "email": "test@example.com",
-                                "email_verified": true
-                            }`)
-							return resp.Result(), nil
-						},
-					},
-				},
-			},
-			wantData: &BasicUserInfo{
-				Id:    "92222222222222222",
-				Name:  "Test User",
-				Email: "test@example.com",
-				Login: "test@example.com",
-			},
-			wantErr: false,
-		}, {
-			name: "Unverified Email userinfo",
-			fields: fields{
-				apiURL: "https://openidconnect.googleapis.com/v1/userinfo",
-			},
-			args: args{
-				token: tokenWithoutID,
-				client: &http.Client{
-					Transport: &roundTripperFunc{
-						fn: func(req *http.Request) (*http.Response, error) {
-							resp := httptest.NewRecorder()
-							_, _ = resp.WriteString(`{
-                                "sub": "92222222222222222",
-                                "name": "Test User",
-                                "email": "test@example.com",
-                                "email_verified": false
-                            }`)
-							return resp.Result(), nil
-						},
-					},
-				},
-			},
-			wantData:   nil,
-			wantErr:    true,
-			wantErrMsg: "email is not verified",
-		},
-		{
-			name: "not in allowed Groups",
-			fields: fields{
-				Scopes:        []string{"https://www.googleapis.com/auth/cloud-identity.groups.readonly"},
-				allowedGroups: []string{"not-that-one"},
-			},
-			args: args{
-				token: tokenWithID,
-				client: &http.Client{
-					Transport: &roundTripperFunc{
-						fn: func(req *http.Request) (*http.Response, error) {
-							resp := httptest.NewRecorder()
-							_, _ = resp.WriteString(`{
-                                "memberships": [
-                                    {
-                                        "group": "test-group",
-                                        "groupKey": {
-                                            "id": "test-group@google.com"
-                                        },
-                                        "displayName": "Test Group"
-                                    }
-                                ],
-                                "nextPageToken": ""
-                            }`)
-							return resp.Result(), nil
-						},
-					},
-				},
-			},
-			wantData: &BasicUserInfo{
-				Id:     "88888888888888",
-				Login:  "test@example.com",
-				Email:  "test@example.com",
-				Name:   "Test User",
-				Groups: []string{"test-group@google.com"},
-			},
-			wantErr:    true,
-			wantErrMsg: "user not a member of one of the required groups",
-		},
-		{
-			name: "Role mapping - strict",
-			fields: fields{
-				Scopes:              []string{},
-				allowedGroups:       []string{},
-				roleAttributePath:   "this",
-				roleAttributeStrict: true,
-			},
-			args: args{
-				token: tokenWithID,
-			},
-			wantData: &BasicUserInfo{
-				Id:     "88888888888888",
-				Login:  "test@example.com",
-				Email:  "test@example.com",
-				Name:   "Test User",
-				Groups: []string{"test-group@google.com"},
-			},
-			wantErr:    true,
-			wantErrMsg: "idP did not return a role attribute, but role_attribute_strict is set",
-		},
-		{
-			name: "role mapping from id_token - no allowed assign Grafana Admin",
-			fields: fields{
-				Scopes:                  []string{},
-				allowAssignGrafanaAdmin: false,
-				roleAttributePath:       "email_verified && 'GrafanaAdmin'",
-			},
-			args: args{
-				token: tokenWithID,
-			},
-			wantData: &BasicUserInfo{
-				Id:             "88888888888888",
-				Login:          "test@example.com",
-				Email:          "test@example.com",
-				Name:           "Test User",
-				Role:           roletype.RoleAdmin,
-				IsGrafanaAdmin: nil,
-			},
-			wantErr: false,
-		},
-		{
-			name: "role mapping from id_token - allowed assign Grafana Admin",
-			fields: fields{
-				Scopes:                  []string{},
-				allowAssignGrafanaAdmin: true,
-				roleAttributePath:       "email_verified && 'GrafanaAdmin'",
-			},
-			args: args{
-				token: tokenWithID,
-			},
-			wantData: &BasicUserInfo{
-				Id:             "88888888888888",
-				Login:          "test@example.com",
-				Email:          "test@example.com",
-				Name:           "Test User",
-				Role:           roletype.RoleAdmin,
-				IsGrafanaAdmin: trueBoolPtr(),
-			},
-			wantErr: false,
-		},
-		{
-			name: "mapping from groups",
-			fields: fields{
-				Scopes:            []string{"https://www.googleapis.com/auth/cloud-identity.groups.readonly"},
-				roleAttributePath: "contains(groups[*], 'test-group@google.com') && 'Editor'",
-			},
-			args: args{
-				token: tokenWithID,
-				client: &http.Client{
-					Transport: &roundTripperFunc{
-						fn: func(req *http.Request) (*http.Response, error) {
-							resp := httptest.NewRecorder()
-							_, _ = resp.WriteString(`{
-                                "memberships": [
-                                    {
-                                        "group": "test-group",
-                                        "groupKey": {
-                                            "id": "test-group@google.com"
-                                        },
-                                        "displayName": "Test Group"
-                                    }
-                                ],
-                                "nextPageToken": ""
-                            }`)
-							return resp.Result(), nil
-						},
-					},
-				},
-			},
-			wantData: &BasicUserInfo{
-				Id:     "88888888888888",
-				Login:  "test@example.com",
-				Email:  "test@example.com",
-				Name:   "Test User",
-				Role:   "Editor",
-				Groups: []string{"test-group@google.com"},
-			},
-			wantErr: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			s := &SocialGoogle{
-				apiUrl: tt.fields.apiURL,
-				SocialBase: &SocialBase{
-					Config:                  &oauth2.Config{Scopes: tt.fields.Scopes},
-					log:                     log.NewNopLogger(),
-					allowSignup:             false,
-					allowedGroups:           tt.fields.allowedGroups,
-					roleAttributePath:       tt.fields.roleAttributePath,
-					roleAttributeStrict:     tt.fields.roleAttributeStrict,
-					allowAssignGrafanaAdmin: tt.fields.allowAssignGrafanaAdmin,
-				},
-				skipOrgRoleSync: tt.fields.skipOrgRoleSync,
-			}
-
-			gotData, err := s.UserInfo(context.Background(), tt.args.client, tt.args.token)
-			if tt.wantErr {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErrMsg)
-			} else {
-				require.NoError(t, err)
-				assert.Equal(t, tt.wantData, gotData)
-			}
-		})
-	}
-}
diff --git a/pkg/login/social/grafana_com_oauth.go b/pkg/login/social/grafana_com_oauth.go
deleted file mode 100644
index a4899b4e7458c..0000000000000
--- a/pkg/login/social/grafana_com_oauth.go
+++ /dev/null
@@ -1,88 +0,0 @@
-package social
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"net/http"
-
-	"golang.org/x/oauth2"
-
-	"github.com/grafana/grafana/pkg/models/roletype"
-	"github.com/grafana/grafana/pkg/services/org"
-)
-
-type SocialGrafanaCom struct {
-	*SocialBase
-	url                  string
-	allowedOrganizations []string
-	skipOrgRoleSync      bool
-}
-
-type OrgRecord struct {
-	Login string `json:"login"`
-}
-
-func (s *SocialGrafanaCom) IsEmailAllowed(email string) bool {
-	return true
-}
-
-func (s *SocialGrafanaCom) IsOrganizationMember(organizations []OrgRecord) bool {
-	if len(s.allowedOrganizations) == 0 {
-		return true
-	}
-
-	for _, allowedOrganization := range s.allowedOrganizations {
-		for _, organization := range organizations {
-			if organization.Login == allowedOrganization {
-				return true
-			}
-		}
-	}
-
-	return false
-}
-
-// UserInfo is used for login credentials for the user
-func (s *SocialGrafanaCom) UserInfo(ctx context.Context, client *http.Client, _ *oauth2.Token) (*BasicUserInfo, error) {
-	var data struct {
-		Id    int         `json:"id"`
-		Name  string      `json:"name"`
-		Login string      `json:"username"`
-		Email string      `json:"email"`
-		Role  string      `json:"role"`
-		Orgs  []OrgRecord `json:"orgs"`
-	}
-
-	response, err := s.httpGet(ctx, client, s.url+"/api/oauth2/user")
-
-	if err != nil {
-		return nil, fmt.Errorf("Error getting user info: %s", err)
-	}
-
-	err = json.Unmarshal(response.Body, &data)
-	if err != nil {
-		return nil, fmt.Errorf("Error getting user info: %s", err)
-	}
-
-	// on login we do not want to display the role from the external provider
-	var role roletype.RoleType
-	if !s.skipOrgRoleSync {
-		role = org.RoleType(data.Role)
-	}
-	userInfo := &BasicUserInfo{
-		Id:    fmt.Sprintf("%d", data.Id),
-		Name:  data.Name,
-		Login: data.Login,
-		Email: data.Email,
-		Role:  role,
-	}
-
-	if !s.IsOrganizationMember(data.Orgs) {
-		return nil, ErrMissingOrganizationMembership.Errorf(
-			"User is not a member of any of the allowed organizations: %v. Returned Organizations: %v",
-			s.allowedOrganizations, data.Orgs)
-	}
-
-	return userInfo, nil
-}
diff --git a/pkg/login/social/grafana_com_oauth_test.go b/pkg/login/social/grafana_com_oauth_test.go
deleted file mode 100644
index 3739ec38ad015..0000000000000
--- a/pkg/login/social/grafana_com_oauth_test.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package social
-
-import (
-	"context"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-const (
-	UserInfoURL  = "/api/oauth2/user"
-	userResponse = `{
-		"id": 123,
-		"name": "grafana name",
-		"login": "grafanalogin",
-		"username": "grafanalogin",
-		"email": "grafana@grafana.com",
-		"role": "Admin",
-		"orgs": [    {      "login": "grafana",      "role": "Admin"    } ]
-	}`
-)
-
-func TestSocialGrafanaCom_UserInfo(t *testing.T) {
-	provider := SocialGrafanaCom{
-		SocialBase: &SocialBase{
-			log: newLogger("grafana_com_oauth_test", "debug"),
-		},
-	}
-
-	type conf struct {
-		skipOrgRoleSync bool
-	}
-
-	tests := []struct {
-		Name          string
-		Cfg           conf
-		userInfoResp  string
-		want          *BasicUserInfo
-		ExpectedError error
-	}{
-		{
-			Name:         "should return empty role as userInfo when Skip Org Role Sync Enabled",
-			userInfoResp: userResponse,
-			Cfg:          conf{skipOrgRoleSync: true},
-			want: &BasicUserInfo{
-				Id:    "1",
-				Name:  "Eric Leijonmarck",
-				Email: "octocat@github.com",
-				Login: "octocat",
-				Role:  "",
-			},
-		},
-		{
-			Name:         "should return role as userInfo when Skip Org Role Sync Enabled",
-			userInfoResp: userResponse,
-			Cfg:          conf{skipOrgRoleSync: false},
-			want: &BasicUserInfo{
-				Id:    "1",
-				Name:  "Eric Leijonmarck",
-				Email: "octocat@github.com",
-				Login: "octocat",
-				Role:  "Admin",
-			},
-		},
-	}
-
-	for _, test := range tests {
-		provider.skipOrgRoleSync = test.Cfg.skipOrgRoleSync
-
-		t.Run(test.Name, func(t *testing.T) {
-			ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				w.WriteHeader(http.StatusOK)
-				w.Header().Set("Content-Type", "application/json")
-				switch r.RequestURI {
-				case UserInfoURL:
-					_, err := w.Write([]byte(test.userInfoResp))
-					require.NoError(t, err)
-				default:
-					w.WriteHeader(http.StatusNotFound)
-				}
-			}))
-			provider.url = ts.URL
-			actualResult, err := provider.UserInfo(context.Background(), ts.Client(), nil)
-			if test.ExpectedError != nil {
-				require.Equal(t, err, test.ExpectedError)
-				return
-			}
-
-			require.NoError(t, err)
-			require.Equal(t, test.want.Role, actualResult.Role)
-		})
-	}
-}
diff --git a/pkg/login/social/okta_oauth.go b/pkg/login/social/okta_oauth.go
deleted file mode 100644
index 7acb64dd08dde..0000000000000
--- a/pkg/login/social/okta_oauth.go
+++ /dev/null
@@ -1,151 +0,0 @@
-package social
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/http"
-
-	"github.com/go-jose/go-jose/v3/jwt"
-	"golang.org/x/oauth2"
-
-	"github.com/grafana/grafana/pkg/models/roletype"
-)
-
-type SocialOkta struct {
-	*SocialBase
-	apiUrl          string
-	allowedGroups   []string
-	skipOrgRoleSync bool
-}
-
-type OktaUserInfoJson struct {
-	Name        string              `json:"name"`
-	DisplayName string              `json:"display_name"`
-	Login       string              `json:"login"`
-	Username    string              `json:"username"`
-	Email       string              `json:"email"`
-	Upn         string              `json:"upn"`
-	Attributes  map[string][]string `json:"attributes"`
-	Groups      []string            `json:"groups"`
-	rawJSON     []byte
-}
-
-type OktaClaims struct {
-	ID                string `json:"sub"`
-	Email             string `json:"email"`
-	PreferredUsername string `json:"preferred_username"`
-	Name              string `json:"name"`
-}
-
-func (claims *OktaClaims) extractEmail() string {
-	if claims.Email == "" && claims.PreferredUsername != "" {
-		return claims.PreferredUsername
-	}
-
-	return claims.Email
-}
-
-func (s *SocialOkta) UserInfo(ctx context.Context, client *http.Client, token *oauth2.Token) (*BasicUserInfo, error) {
-	idToken := token.Extra("id_token")
-	if idToken == nil {
-		return nil, fmt.Errorf("no id_token found")
-	}
-
-	parsedToken, err := jwt.ParseSigned(idToken.(string))
-	if err != nil {
-		return nil, fmt.Errorf("error parsing id token: %w", err)
-	}
-
-	var claims OktaClaims
-	if err := parsedToken.UnsafeClaimsWithoutVerification(&claims); err != nil {
-		return nil, fmt.Errorf("error getting claims from id token: %w", err)
-	}
-
-	email := claims.extractEmail()
-	if email == "" {
-		return nil, errors.New("error getting user info: no email found in access token")
-	}
-
-	var data OktaUserInfoJson
-	err = s.extractAPI(ctx, &data, client)
-	if err != nil {
-		return nil, err
-	}
-
-	groups := s.GetGroups(&data)
-	if !s.IsGroupMember(groups) {
-		return nil, errMissingGroupMembership
-	}
-
-	var role roletype.RoleType
-	var isGrafanaAdmin *bool
-	if !s.skipOrgRoleSync {
-		var grafanaAdmin bool
-		role, grafanaAdmin, err = s.extractRoleAndAdmin(data.rawJSON, groups)
-		if err != nil {
-			return nil, err
-		}
-
-		if s.allowAssignGrafanaAdmin {
-			isGrafanaAdmin = &grafanaAdmin
-		}
-	}
-	if s.allowAssignGrafanaAdmin && s.skipOrgRoleSync {
-		s.log.Debug("AllowAssignGrafanaAdmin and skipOrgRoleSync are both set, Grafana Admin role will not be synced, consider setting one or the other")
-	}
-
-	return &BasicUserInfo{
-		Id:             claims.ID,
-		Name:           claims.Name,
-		Email:          email,
-		Login:          email,
-		Role:           role,
-		IsGrafanaAdmin: isGrafanaAdmin,
-		Groups:         groups,
-	}, nil
-}
-
-func (s *SocialOkta) extractAPI(ctx context.Context, data *OktaUserInfoJson, client *http.Client) error {
-	rawUserInfoResponse, err := s.httpGet(ctx, client, s.apiUrl)
-	if err != nil {
-		s.log.Debug("Error getting user info response", "url", s.apiUrl, "error", err)
-		return fmt.Errorf("error getting user info response: %w", err)
-	}
-	data.rawJSON = rawUserInfoResponse.Body
-
-	err = json.Unmarshal(data.rawJSON, data)
-	if err != nil {
-		s.log.Debug("Error decoding user info response", "raw_json", data.rawJSON, "error", err)
-		data.rawJSON = []byte{}
-		return fmt.Errorf("error decoding user info response: %w", err)
-	}
-
-	s.log.Debug("Received user info response", "raw_json", string(data.rawJSON), "data", data)
-	return nil
-}
-
-func (s *SocialOkta) GetGroups(data *OktaUserInfoJson) []string {
-	groups := make([]string, 0)
-	if len(data.Groups) > 0 {
-		groups = data.Groups
-	}
-	return groups
-}
-
-func (s *SocialOkta) IsGroupMember(groups []string) bool {
-	if len(s.allowedGroups) == 0 {
-		return true
-	}
-
-	for _, allowedGroup := range s.allowedGroups {
-		for _, group := range groups {
-			if group == allowedGroup {
-				return true
-			}
-		}
-	}
-
-	return false
-}
diff --git a/pkg/login/social/okta_oauth_test.go b/pkg/login/social/okta_oauth_test.go
deleted file mode 100644
index b6db81fd9bf26..0000000000000
--- a/pkg/login/social/okta_oauth_test.go
+++ /dev/null
@@ -1,124 +0,0 @@
-package social
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-	"golang.org/x/oauth2"
-
-	"github.com/grafana/grafana/pkg/models/roletype"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-)
-
-func TestSocialOkta_UserInfo(t *testing.T) {
-	var boolPointer *bool
-
-	tests := []struct {
-		name                    string
-		userRawJSON             string
-		OAuth2Extra             any
-		autoAssignOrgRole       string
-		settingSkipOrgRoleSync  bool
-		allowAssignGrafanaAdmin bool
-		RoleAttributePath       string
-		ExpectedEmail           string
-		ExpectedRole            roletype.RoleType
-		ExpectedGrafanaAdmin    *bool
-		ExpectedErr             error
-		wantErr                 bool
-	}{
-		{
-			name:              "Should give role from JSON and email from id token",
-			userRawJSON:       `{ "email": "okta-octopus@grafana.com", "role": "Admin" }`,
-			RoleAttributePath: "role",
-			OAuth2Extra: map[string]any{
-				// {
-				// "email": "okto.octopus@test.com"
-				// },
-				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiQWRtaW4iLCJlbWFpbCI6Im9rdG8ub2N0b3B1c0B0ZXN0LmNvbSJ9.yhg0nvYCpMVCVrRvwtmHzhF0RJqid_YFbjJ_xuBCyHs",
-			},
-			ExpectedEmail:        "okto.octopus@test.com",
-			ExpectedRole:         "Admin",
-			ExpectedGrafanaAdmin: boolPointer,
-			wantErr:              false,
-		},
-		{
-			name:                   "Should give empty role and nil pointer for GrafanaAdmin when skip org role sync enable",
-			userRawJSON:            `{ "email": "okta-octopus@grafana.com", "role": "Admin" }`,
-			RoleAttributePath:      "role",
-			settingSkipOrgRoleSync: true,
-			OAuth2Extra: map[string]any{
-				// {
-				// "email": "okto.octopus@test.com"
-				// },
-				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiQWRtaW4iLCJlbWFpbCI6Im9rdG8ub2N0b3B1c0B0ZXN0LmNvbSJ9.yhg0nvYCpMVCVrRvwtmHzhF0RJqid_YFbjJ_xuBCyHs",
-			},
-			ExpectedEmail:        "okto.octopus@test.com",
-			ExpectedRole:         "",
-			ExpectedGrafanaAdmin: boolPointer,
-			wantErr:              false,
-		},
-		{
-			name:                    "Should give grafanaAdmin role for specific GrafanaAdmin in the role assignement",
-			userRawJSON:             fmt.Sprintf(`{ "email": "okta-octopus@grafana.com", "role": "%s" }`, RoleGrafanaAdmin),
-			RoleAttributePath:       "role",
-			allowAssignGrafanaAdmin: true,
-			OAuth2Extra: map[string]any{
-				// {
-				// "email": "okto.octopus@test.com"
-				// },
-				"id_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiQWRtaW4iLCJlbWFpbCI6Im9rdG8ub2N0b3B1c0B0ZXN0LmNvbSJ9.yhg0nvYCpMVCVrRvwtmHzhF0RJqid_YFbjJ_xuBCyHs",
-			},
-			ExpectedEmail:        "okto.octopus@test.com",
-			ExpectedRole:         "Admin",
-			ExpectedGrafanaAdmin: trueBoolPtr(),
-			wantErr:              false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			server := httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
-				writer.WriteHeader(http.StatusOK)
-				// return JSON if matches user endpoint
-				if strings.HasSuffix(request.URL.String(), "/user") {
-					writer.Header().Set("Content-Type", "application/json")
-					_, err := writer.Write([]byte(tt.userRawJSON))
-					require.NoError(t, err)
-				} else {
-					writer.WriteHeader(http.StatusNotFound)
-				}
-			}))
-			defer server.Close()
-			provider := &SocialOkta{
-				SocialBase: newSocialBase("okta", &oauth2.Config{},
-					&OAuthInfo{RoleAttributePath: tt.RoleAttributePath}, tt.autoAssignOrgRole, false, *featuremgmt.WithFeatures()),
-				apiUrl:          server.URL + "/user",
-				skipOrgRoleSync: tt.settingSkipOrgRoleSync,
-			}
-			provider.allowAssignGrafanaAdmin = tt.allowAssignGrafanaAdmin
-			provider.roleAttributePath = tt.RoleAttributePath
-			// create a oauth2 token with a id_token
-			staticToken := oauth2.Token{
-				AccessToken:  "",
-				TokenType:    "",
-				RefreshToken: "",
-				Expiry:       time.Now(),
-			}
-			token := staticToken.WithExtra(tt.OAuth2Extra)
-			got, err := provider.UserInfo(context.Background(), server.Client(), token)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("UserInfo() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			require.Equal(t, tt.ExpectedEmail, got.Email)
-			require.Equal(t, tt.ExpectedRole, got.Role)
-			require.Equal(t, tt.ExpectedGrafanaAdmin, got.IsGrafanaAdmin)
-		})
-	}
-}
diff --git a/pkg/login/social/social.go b/pkg/login/social/social.go
index 2d81fd8a97c54..bf0077cf01e6a 100644
--- a/pkg/login/social/social.go
+++ b/pkg/login/social/social.go
@@ -2,273 +2,100 @@ package social
 
 import (
 	"bytes"
-	"compress/zlib"
 	"context"
-	"crypto/tls"
-	"crypto/x509"
-	"encoding/base64"
-	"encoding/json"
 	"fmt"
-	"io"
-	"net"
 	"net/http"
-	"os"
-	"regexp"
-	"strings"
-	"time"
 
-	"golang.org/x/exp/slices"
-	"golang.org/x/oauth2"
-	"golang.org/x/text/cases"
-	"golang.org/x/text/language"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/infra/remotecache"
-	"github.com/grafana/grafana/pkg/infra/usagestats"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/org"
-	"github.com/grafana/grafana/pkg/services/supportbundles"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/util"
+	"golang.org/x/oauth2"
 )
 
 const (
 	OfflineAccessScope = "offline_access"
+	RoleGrafanaAdmin   = "GrafanaAdmin" // For AzureAD for example this value cannot contain spaces
+
+	AzureADProviderName      = "azuread"
+	GenericOAuthProviderName = "generic_oauth"
+	GitHubProviderName       = "github"
+	GitlabProviderName       = "gitlab"
+	GoogleProviderName       = "google"
+	GrafanaComProviderName   = "grafana_com"
+	// legacy/old settings for the provider
+	GrafanaNetProviderName = "grafananet"
+	OktaProviderName       = "okta"
+	SAMLProviderName       = "saml"
 )
 
-type SocialService struct {
-	cfg *setting.Cfg
-
-	socialMap     map[string]SocialConnector
-	oAuthProvider map[string]*OAuthInfo
-	log           log.Logger
-}
+var (
+	SocialBaseUrl = "/login/"
+)
 
-type OAuthInfo struct {
-	ApiUrl                  string   `toml:"api_url"`
-	AuthUrl                 string   `toml:"auth_url"`
-	ClientId                string   `toml:"client_id"`
-	ClientSecret            string   `toml:"-"`
-	EmailAttributeName      string   `toml:"email_attribute_name"`
-	EmailAttributePath      string   `toml:"email_attribute_path"`
-	GroupsAttributePath     string   `toml:"groups_attribute_path"`
-	HostedDomain            string   `toml:"hosted_domain"`
-	Icon                    string   `toml:"icon"`
-	Name                    string   `toml:"name"`
-	RoleAttributePath       string   `toml:"role_attribute_path"`
-	TeamIdsAttributePath    string   `toml:"team_ids_attribute_path"`
-	TeamsUrl                string   `toml:"teams_url"`
-	TlsClientCa             string   `toml:"tls_client_ca"`
-	TlsClientCert           string   `toml:"tls_client_cert"`
-	TlsClientKey            string   `toml:"tls_client_key"`
-	TokenUrl                string   `toml:"token_url"`
-	AllowedDomains          []string `toml:"allowed_domains"`
-	AllowedGroups           []string `toml:"allowed_groups"`
-	Scopes                  []string `toml:"scopes"`
-	AllowAssignGrafanaAdmin bool     `toml:"allow_assign_grafana_admin"`
-	AllowSignup             bool     `toml:"allow_signup"`
-	AutoLogin               bool     `toml:"auto_login"`
-	Enabled                 bool     `toml:"enabled"`
-	RoleAttributeStrict     bool     `toml:"role_attribute_strict"`
-	TlsSkipVerify           bool     `toml:"tls_skip_verify"`
-	UsePKCE                 bool     `toml:"use_pkce"`
-	UseRefreshToken         bool     `toml:"use_refresh_token"`
+type Service interface {
+	GetOAuthProviders() map[string]bool
+	GetOAuthHttpClient(string) (*http.Client, error)
+	GetConnector(string) (SocialConnector, error)
+	GetOAuthInfoProvider(string) *OAuthInfo
+	GetOAuthInfoProviders() map[string]*OAuthInfo
 }
 
-func ProvideService(cfg *setting.Cfg,
-	features *featuremgmt.FeatureManager,
-	usageStats usagestats.Service,
-	bundleRegistry supportbundles.Service,
-	cache remotecache.CacheStorage,
-) *SocialService {
-	ss := &SocialService{
-		cfg:           cfg,
-		oAuthProvider: make(map[string]*OAuthInfo),
-		socialMap:     make(map[string]SocialConnector),
-		log:           log.New("login.social"),
-	}
-
-	usageStats.RegisterMetricsFunc(ss.getUsageStats)
-
-	for _, name := range allOauthes {
-		sec := cfg.Raw.Section("auth." + name)
-
-		info := &OAuthInfo{
-			ClientId:                sec.Key("client_id").String(),
-			ClientSecret:            sec.Key("client_secret").String(),
-			Scopes:                  util.SplitString(sec.Key("scopes").String()),
-			AuthUrl:                 sec.Key("auth_url").String(),
-			TokenUrl:                sec.Key("token_url").String(),
-			ApiUrl:                  sec.Key("api_url").String(),
-			TeamsUrl:                sec.Key("teams_url").String(),
-			Enabled:                 sec.Key("enabled").MustBool(),
-			EmailAttributeName:      sec.Key("email_attribute_name").String(),
-			EmailAttributePath:      sec.Key("email_attribute_path").String(),
-			RoleAttributePath:       sec.Key("role_attribute_path").String(),
-			RoleAttributeStrict:     sec.Key("role_attribute_strict").MustBool(),
-			GroupsAttributePath:     sec.Key("groups_attribute_path").String(),
-			TeamIdsAttributePath:    sec.Key("team_ids_attribute_path").String(),
-			AllowedDomains:          util.SplitString(sec.Key("allowed_domains").String()),
-			HostedDomain:            sec.Key("hosted_domain").String(),
-			AllowSignup:             sec.Key("allow_sign_up").MustBool(),
-			Name:                    sec.Key("name").MustString(name),
-			Icon:                    sec.Key("icon").String(),
-			TlsClientCert:           sec.Key("tls_client_cert").String(),
-			TlsClientKey:            sec.Key("tls_client_key").String(),
-			TlsClientCa:             sec.Key("tls_client_ca").String(),
-			TlsSkipVerify:           sec.Key("tls_skip_verify_insecure").MustBool(),
-			UsePKCE:                 sec.Key("use_pkce").MustBool(),
-			UseRefreshToken:         sec.Key("use_refresh_token").MustBool(false),
-			AllowAssignGrafanaAdmin: sec.Key("allow_assign_grafana_admin").MustBool(false),
-			AutoLogin:               sec.Key("auto_login").MustBool(false),
-			AllowedGroups:           util.SplitString(sec.Key("allowed_groups").String()),
-		}
-
-		// when empty_scopes parameter exists and is true, overwrite scope with empty value
-		if sec.Key("empty_scopes").MustBool() {
-			info.Scopes = []string{}
-		}
-
-		if !info.Enabled {
-			continue
-		}
-
-		if name == "grafananet" {
-			name = grafanaCom
-		}
-
-		ss.oAuthProvider[name] = info
-
-		var authStyle oauth2.AuthStyle
-		switch strings.ToLower(sec.Key("auth_style").String()) {
-		case "inparams":
-			authStyle = oauth2.AuthStyleInParams
-		case "inheader":
-			authStyle = oauth2.AuthStyleInHeader
-		case "autodetect", "":
-			authStyle = oauth2.AuthStyleAutoDetect
-		default:
-			ss.log.Warn("Invalid auth style specified, defaulting to auth style AutoDetect", "auth_style", sec.Key("auth_style").String())
-			authStyle = oauth2.AuthStyleAutoDetect
-		}
-
-		config := oauth2.Config{
-			ClientID:     info.ClientId,
-			ClientSecret: info.ClientSecret,
-			Endpoint: oauth2.Endpoint{
-				AuthURL:   info.AuthUrl,
-				TokenURL:  info.TokenUrl,
-				AuthStyle: authStyle,
-			},
-			RedirectURL: strings.TrimSuffix(cfg.AppURL, "/") + SocialBaseUrl + name,
-			Scopes:      info.Scopes,
-		}
-
-		// GitHub.
-		if name == "github" {
-			ss.socialMap["github"] = &SocialGithub{
-				SocialBase:           newSocialBase(name, &config, info, cfg.AutoAssignOrgRole, cfg.OAuthSkipOrgRoleUpdateSync, *features),
-				apiUrl:               info.ApiUrl,
-				teamIds:              sec.Key("team_ids").Ints(","),
-				allowedOrganizations: util.SplitString(sec.Key("allowed_organizations").String()),
-				skipOrgRoleSync:      cfg.GitHubSkipOrgRoleSync,
-			}
-		}
-
-		// GitLab.
-		if name == "gitlab" {
-			ss.socialMap["gitlab"] = &SocialGitlab{
-				SocialBase:      newSocialBase(name, &config, info, cfg.AutoAssignOrgRole, cfg.OAuthSkipOrgRoleUpdateSync, *features),
-				apiUrl:          info.ApiUrl,
-				skipOrgRoleSync: cfg.GitLabSkipOrgRoleSync,
-			}
-		}
-
-		// Google.
-		if name == "google" {
-			if strings.HasPrefix(info.ApiUrl, legacyAPIURL) {
-				ss.log.Warn("Using legacy Google API URL, please update your configuration")
-			}
-			ss.socialMap["google"] = &SocialGoogle{
-				SocialBase:      newSocialBase(name, &config, info, cfg.AutoAssignOrgRole, cfg.OAuthSkipOrgRoleUpdateSync, *features),
-				hostedDomain:    info.HostedDomain,
-				apiUrl:          info.ApiUrl,
-				skipOrgRoleSync: cfg.GoogleSkipOrgRoleSync,
-			}
-		}
-
-		// AzureAD.
-		if name == "azuread" {
-			ss.socialMap["azuread"] = &SocialAzureAD{
-				SocialBase:           newSocialBase(name, &config, info, cfg.AutoAssignOrgRole, cfg.OAuthSkipOrgRoleUpdateSync, *features),
-				cache:                cache,
-				allowedOrganizations: util.SplitString(sec.Key("allowed_organizations").String()),
-				forceUseGraphAPI:     sec.Key("force_use_graph_api").MustBool(false),
-				skipOrgRoleSync:      cfg.AzureADSkipOrgRoleSync,
-			}
-			if info.UseRefreshToken && features.IsEnabled(featuremgmt.FlagAccessTokenExpirationCheck) {
-				appendUniqueScope(&config, OfflineAccessScope)
-			}
-		}
-
-		// Okta
-		if name == "okta" {
-			ss.socialMap["okta"] = &SocialOkta{
-				SocialBase:      newSocialBase(name, &config, info, cfg.AutoAssignOrgRole, cfg.OAuthSkipOrgRoleUpdateSync, *features),
-				apiUrl:          info.ApiUrl,
-				allowedGroups:   util.SplitString(sec.Key("allowed_groups").String()),
-				skipOrgRoleSync: cfg.OktaSkipOrgRoleSync,
-			}
-			if info.UseRefreshToken && features.IsEnabled(featuremgmt.FlagAccessTokenExpirationCheck) {
-				appendUniqueScope(&config, OfflineAccessScope)
-			}
-		}
+//go:generate mockery --name SocialConnector --structname MockSocialConnector --outpkg socialtest --filename social_connector_mock.go --output ./socialtest/
+type SocialConnector interface {
+	UserInfo(ctx context.Context, client *http.Client, token *oauth2.Token) (*BasicUserInfo, error)
+	IsEmailAllowed(email string) bool
+	IsSignupAllowed() bool
 
-		// Generic - Uses the same scheme as GitHub.
-		if name == "generic_oauth" {
-			ss.socialMap["generic_oauth"] = &SocialGenericOAuth{
-				SocialBase:           newSocialBase(name, &config, info, cfg.AutoAssignOrgRole, cfg.OAuthSkipOrgRoleUpdateSync, *features),
-				apiUrl:               info.ApiUrl,
-				teamsUrl:             info.TeamsUrl,
-				emailAttributeName:   info.EmailAttributeName,
-				emailAttributePath:   info.EmailAttributePath,
-				nameAttributePath:    sec.Key("name_attribute_path").String(),
-				groupsAttributePath:  info.GroupsAttributePath,
-				loginAttributePath:   sec.Key("login_attribute_path").String(),
-				idTokenAttributeName: sec.Key("id_token_attribute_name").String(),
-				teamIdsAttributePath: sec.Key("team_ids_attribute_path").String(),
-				teamIds:              sec.Key("team_ids").Strings(","),
-				allowedOrganizations: util.SplitString(sec.Key("allowed_organizations").String()),
-				allowedGroups:        util.SplitString(sec.Key("allowed_groups").String()),
-				skipOrgRoleSync:      cfg.GenericOAuthSkipOrgRoleSync,
-			}
-		}
+	GetOAuthInfo() *OAuthInfo
 
-		if name == grafanaCom {
-			config = oauth2.Config{
-				ClientID:     info.ClientId,
-				ClientSecret: info.ClientSecret,
-				Endpoint: oauth2.Endpoint{
-					AuthURL:   cfg.GrafanaComURL + "/oauth2/authorize",
-					TokenURL:  cfg.GrafanaComURL + "/api/oauth2/token",
-					AuthStyle: oauth2.AuthStyleInHeader,
-				},
-				RedirectURL: strings.TrimSuffix(cfg.AppURL, "/") + SocialBaseUrl + name,
-				Scopes:      info.Scopes,
-			}
+	AuthCodeURL(state string, opts ...oauth2.AuthCodeOption) string
+	Exchange(ctx context.Context, code string, authOptions ...oauth2.AuthCodeOption) (*oauth2.Token, error)
+	Client(ctx context.Context, t *oauth2.Token) *http.Client
+	TokenSource(ctx context.Context, t *oauth2.Token) oauth2.TokenSource
+	SupportBundleContent(*bytes.Buffer) error
+}
 
-			ss.socialMap[grafanaCom] = &SocialGrafanaCom{
-				SocialBase:           newSocialBase(name, &config, info, cfg.AutoAssignOrgRole, cfg.OAuthSkipOrgRoleUpdateSync, *features),
-				url:                  cfg.GrafanaComURL,
-				allowedOrganizations: util.SplitString(sec.Key("allowed_organizations").String()),
-				skipOrgRoleSync:      cfg.GrafanaComSkipOrgRoleSync,
-			}
-		}
+type OAuthInfo struct {
+	AllowAssignGrafanaAdmin bool              `mapstructure:"allow_assign_grafana_admin" toml:"allow_assign_grafana_admin"`
+	AllowSignup             bool              `mapstructure:"allow_sign_up" toml:"allow_sign_up"`
+	AllowedDomains          []string          `mapstructure:"allowed_domains" toml:"allowed_domains"`
+	AllowedGroups           []string          `mapstructure:"allowed_groups" toml:"allowed_groups"`
+	ApiUrl                  string            `mapstructure:"api_url" toml:"api_url"`
+	AuthStyle               string            `mapstructure:"auth_style" toml:"auth_style"`
+	AuthUrl                 string            `mapstructure:"auth_url" toml:"auth_url"`
+	AutoLogin               bool              `mapstructure:"auto_login" toml:"auto_login"`
+	ClientId                string            `mapstructure:"client_id" toml:"client_id"`
+	ClientSecret            string            `mapstructure:"client_secret" toml:"-"`
+	EmailAttributeName      string            `mapstructure:"email_attribute_name" toml:"email_attribute_name"`
+	EmailAttributePath      string            `mapstructure:"email_attribute_path" toml:"email_attribute_path"`
+	EmptyScopes             bool              `mapstructure:"empty_scopes" toml:"empty_scopes"`
+	Enabled                 bool              `mapstructure:"enabled" toml:"enabled"`
+	GroupsAttributePath     string            `mapstructure:"groups_attribute_path" toml:"groups_attribute_path"`
+	HostedDomain            string            `mapstructure:"hosted_domain" toml:"hosted_domain"`
+	Icon                    string            `mapstructure:"icon" toml:"icon"`
+	Name                    string            `mapstructure:"name" toml:"name"`
+	RoleAttributePath       string            `mapstructure:"role_attribute_path" toml:"role_attribute_path"`
+	RoleAttributeStrict     bool              `mapstructure:"role_attribute_strict" toml:"role_attribute_strict"`
+	Scopes                  []string          `mapstructure:"scopes" toml:"scopes"`
+	SignoutRedirectUrl      string            `mapstructure:"signout_redirect_url" toml:"signout_redirect_url"`
+	SkipOrgRoleSync         bool              `mapstructure:"skip_org_role_sync" toml:"skip_org_role_sync"`
+	TeamIdsAttributePath    string            `mapstructure:"team_ids_attribute_path" toml:"team_ids_attribute_path"`
+	TeamsUrl                string            `mapstructure:"teams_url" toml:"teams_url"`
+	TlsClientCa             string            `mapstructure:"tls_client_ca" toml:"tls_client_ca"`
+	TlsClientCert           string            `mapstructure:"tls_client_cert" toml:"tls_client_cert"`
+	TlsClientKey            string            `mapstructure:"tls_client_key" toml:"tls_client_key"`
+	TlsSkipVerify           bool              `mapstructure:"tls_skip_verify_insecure" toml:"tls_skip_verify_insecure"`
+	TokenUrl                string            `mapstructure:"token_url" toml:"token_url"`
+	UsePKCE                 bool              `mapstructure:"use_pkce" toml:"use_pkce"`
+	UseRefreshToken         bool              `mapstructure:"use_refresh_token" toml:"use_refresh_token"`
+	Extra                   map[string]string `mapstructure:",remain" toml:"extra,omitempty"`
+}
+
+func NewOAuthInfo() *OAuthInfo {
+	return &OAuthInfo{
+		Scopes:         []string{},
+		AllowedDomains: []string{},
+		AllowedGroups:  []string{},
+		Extra:          map[string]string{},
 	}
-
-	ss.registerSupportBundleCollectors(bundleRegistry)
-
-	return ss
 }
 
 type BasicUserInfo struct {
@@ -285,368 +112,3 @@ func (b *BasicUserInfo) String() string {
 	return fmt.Sprintf("Id: %s, Name: %s, Email: %s, Login: %s, Role: %s, Groups: %v",
 		b.Id, b.Name, b.Email, b.Login, b.Role, b.Groups)
 }
-
-//go:generate mockery --name SocialConnector --structname MockSocialConnector --outpkg socialtest --filename social_connector_mock.go --output ../socialtest/
-type SocialConnector interface {
-	UserInfo(ctx context.Context, client *http.Client, token *oauth2.Token) (*BasicUserInfo, error)
-	IsEmailAllowed(email string) bool
-	IsSignupAllowed() bool
-
-	AuthCodeURL(state string, opts ...oauth2.AuthCodeOption) string
-	Exchange(ctx context.Context, code string, authOptions ...oauth2.AuthCodeOption) (*oauth2.Token, error)
-	Client(ctx context.Context, t *oauth2.Token) *http.Client
-	TokenSource(ctx context.Context, t *oauth2.Token) oauth2.TokenSource
-	SupportBundleContent(*bytes.Buffer) error
-}
-
-type SocialBase struct {
-	*oauth2.Config
-	log                     log.Logger
-	allowSignup             bool
-	allowAssignGrafanaAdmin bool
-	allowedDomains          []string
-	allowedGroups           []string
-
-	roleAttributePath   string
-	roleAttributeStrict bool
-	autoAssignOrgRole   string
-	skipOrgRoleSync     bool
-	features            featuremgmt.FeatureManager
-	useRefreshToken     bool
-}
-
-type Error struct {
-	s string
-}
-
-func (e Error) Error() string {
-	return e.s
-}
-
-const (
-	grafanaCom       = "grafana_com"
-	RoleGrafanaAdmin = "GrafanaAdmin" // For AzureAD for example this value cannot contain spaces
-)
-
-var (
-	SocialBaseUrl = "/login/"
-	SocialMap     = make(map[string]SocialConnector)
-	allOauthes    = []string{"github", "gitlab", "google", "generic_oauth", "grafananet", grafanaCom, "azuread", "okta"}
-)
-
-type Service interface {
-	GetOAuthProviders() map[string]bool
-	GetOAuthHttpClient(string) (*http.Client, error)
-	GetConnector(string) (SocialConnector, error)
-	GetOAuthInfoProvider(string) *OAuthInfo
-	GetOAuthInfoProviders() map[string]*OAuthInfo
-}
-
-func newSocialBase(name string,
-	config *oauth2.Config,
-	info *OAuthInfo,
-	autoAssignOrgRole string,
-	skipOrgRoleSync bool,
-	features featuremgmt.FeatureManager,
-) *SocialBase {
-	logger := log.New("oauth." + name)
-
-	return &SocialBase{
-		Config:                  config,
-		log:                     logger,
-		allowSignup:             info.AllowSignup,
-		allowAssignGrafanaAdmin: info.AllowAssignGrafanaAdmin,
-		allowedDomains:          info.AllowedDomains,
-		allowedGroups:           info.AllowedGroups,
-		roleAttributePath:       info.RoleAttributePath,
-		roleAttributeStrict:     info.RoleAttributeStrict,
-		autoAssignOrgRole:       autoAssignOrgRole,
-		skipOrgRoleSync:         skipOrgRoleSync,
-		features:                features,
-		useRefreshToken:         info.UseRefreshToken,
-	}
-}
-
-type groupStruct struct {
-	Groups []string `json:"groups"`
-}
-
-func (s *SocialBase) SupportBundleContent(bf *bytes.Buffer) error {
-	bf.WriteString("## Client configuration\n\n")
-	bf.WriteString("```ini\n")
-	bf.WriteString(fmt.Sprintf("allow_assign_grafana_admin = %v\n", s.allowAssignGrafanaAdmin))
-	bf.WriteString(fmt.Sprintf("allow_sign_up = %v\n", s.allowSignup))
-	bf.WriteString(fmt.Sprintf("allowed_domains = %v\n", s.allowedDomains))
-	bf.WriteString(fmt.Sprintf("auto_assign_org_role = %v\n", s.autoAssignOrgRole))
-	bf.WriteString(fmt.Sprintf("role_attribute_path = %v\n", s.roleAttributePath))
-	bf.WriteString(fmt.Sprintf("role_attribute_strict = %v\n", s.roleAttributeStrict))
-	bf.WriteString(fmt.Sprintf("skip_org_role_sync = %v\n", s.skipOrgRoleSync))
-	bf.WriteString(fmt.Sprintf("client_id = %v\n", s.Config.ClientID))
-	bf.WriteString(fmt.Sprintf("client_secret = %v ; issue if empty\n", strings.Repeat("*", len(s.Config.ClientSecret))))
-	bf.WriteString(fmt.Sprintf("auth_url = %v\n", s.Config.Endpoint.AuthURL))
-	bf.WriteString(fmt.Sprintf("token_url = %v\n", s.Config.Endpoint.TokenURL))
-	bf.WriteString(fmt.Sprintf("auth_style = %v\n", s.Config.Endpoint.AuthStyle))
-	bf.WriteString(fmt.Sprintf("redirect_url = %v\n", s.Config.RedirectURL))
-	bf.WriteString(fmt.Sprintf("scopes = %v\n", s.Config.Scopes))
-	bf.WriteString("```\n\n")
-	return nil
-}
-
-func (s *SocialBase) extractRoleAndAdminOptional(rawJSON []byte, groups []string) (org.RoleType, bool, error) {
-	if s.roleAttributePath == "" {
-		if s.roleAttributeStrict {
-			return "", false, errRoleAttributePathNotSet.Errorf("role_attribute_path not set and role_attribute_strict is set")
-		}
-		return "", false, nil
-	}
-
-	if role, gAdmin := s.searchRole(rawJSON, groups); role.IsValid() {
-		return role, gAdmin, nil
-	} else if role != "" {
-		return "", false, errInvalidRole.Errorf("invalid role: %s", role)
-	}
-
-	if s.roleAttributeStrict {
-		return "", false, errRoleAttributeStrictViolation.Errorf("idP did not return a role attribute, but role_attribute_strict is set")
-	}
-
-	return "", false, nil
-}
-
-func (s *SocialBase) extractRoleAndAdmin(rawJSON []byte, groups []string) (org.RoleType, bool, error) {
-	role, gAdmin, err := s.extractRoleAndAdminOptional(rawJSON, groups)
-	if role == "" {
-		role = s.defaultRole()
-	}
-
-	return role, gAdmin, err
-}
-
-func (s *SocialBase) searchRole(rawJSON []byte, groups []string) (org.RoleType, bool) {
-	role, err := s.searchJSONForStringAttr(s.roleAttributePath, rawJSON)
-	if err == nil && role != "" {
-		return getRoleFromSearch(role)
-	}
-
-	if groupBytes, err := json.Marshal(groupStruct{groups}); err == nil {
-		role, err := s.searchJSONForStringAttr(s.roleAttributePath, groupBytes)
-		if err == nil && role != "" {
-			return getRoleFromSearch(role)
-		}
-	}
-
-	return "", false
-}
-
-// defaultRole returns the default role for the user based on the autoAssignOrgRole setting
-// if legacy is enabled "" is returned indicating the previous role assignment is used.
-func (s *SocialBase) defaultRole() org.RoleType {
-	if s.autoAssignOrgRole != "" {
-		s.log.Debug("No role found, returning default.")
-		return org.RoleType(s.autoAssignOrgRole)
-	}
-
-	// should never happen
-	return org.RoleViewer
-}
-
-// match grafana admin role and translate to org role and bool.
-// treat the JSON search result to ensure correct casing.
-func getRoleFromSearch(role string) (org.RoleType, bool) {
-	if strings.EqualFold(role, RoleGrafanaAdmin) {
-		return org.RoleAdmin, true
-	}
-
-	return org.RoleType(cases.Title(language.Und).String(role)), false
-}
-
-// GetOAuthProviders returns available oauth providers and if they're enabled or not
-func (ss *SocialService) GetOAuthProviders() map[string]bool {
-	result := map[string]bool{}
-
-	if ss.cfg == nil || ss.cfg.Raw == nil {
-		return result
-	}
-
-	for _, name := range allOauthes {
-		if name == "grafananet" {
-			name = grafanaCom
-		}
-
-		sec := ss.cfg.Raw.Section("auth." + name)
-		if sec == nil {
-			continue
-		}
-		result[name] = sec.Key("enabled").MustBool()
-	}
-
-	return result
-}
-
-func (ss *SocialService) GetOAuthHttpClient(name string) (*http.Client, error) {
-	// The socialMap keys don't have "oauth_" prefix, but everywhere else in the system does
-	name = strings.TrimPrefix(name, "oauth_")
-	info, ok := ss.oAuthProvider[name]
-	if !ok {
-		return nil, fmt.Errorf("could not find %q in OAuth Settings", name)
-	}
-
-	// handle call back
-	tr := &http.Transport{
-		Proxy: http.ProxyFromEnvironment,
-		TLSClientConfig: &tls.Config{
-			InsecureSkipVerify: info.TlsSkipVerify,
-		},
-		DialContext: (&net.Dialer{
-			Timeout:   time.Second * 10,
-			KeepAlive: 30 * time.Second,
-		}).DialContext,
-		TLSHandshakeTimeout:   15 * time.Second,
-		ExpectContinueTimeout: 1 * time.Second,
-		MaxIdleConns:          100,
-		IdleConnTimeout:       90 * time.Second,
-	}
-
-	oauthClient := &http.Client{
-		Transport: tr,
-		Timeout:   time.Second * 15,
-	}
-
-	if info.TlsClientCert != "" || info.TlsClientKey != "" {
-		cert, err := tls.LoadX509KeyPair(info.TlsClientCert, info.TlsClientKey)
-		if err != nil {
-			ss.log.Error("Failed to setup TlsClientCert", "oauth", name, "error", err)
-			return nil, fmt.Errorf("failed to setup TlsClientCert: %w", err)
-		}
-
-		tr.TLSClientConfig.Certificates = append(tr.TLSClientConfig.Certificates, cert)
-	}
-
-	if info.TlsClientCa != "" {
-		caCert, err := os.ReadFile(info.TlsClientCa)
-		if err != nil {
-			ss.log.Error("Failed to setup TlsClientCa", "oauth", name, "error", err)
-			return nil, fmt.Errorf("failed to setup TlsClientCa: %w", err)
-		}
-		caCertPool := x509.NewCertPool()
-		caCertPool.AppendCertsFromPEM(caCert)
-		tr.TLSClientConfig.RootCAs = caCertPool
-	}
-	return oauthClient, nil
-}
-
-func (ss *SocialService) GetConnector(name string) (SocialConnector, error) {
-	// The socialMap keys don't have "oauth_" prefix, but everywhere else in the system does
-	provider := strings.TrimPrefix(name, "oauth_")
-	connector, ok := ss.socialMap[provider]
-	if !ok {
-		return nil, fmt.Errorf("failed to find oauth provider for %q", name)
-	}
-	return connector, nil
-}
-
-func (ss *SocialService) GetOAuthInfoProvider(name string) *OAuthInfo {
-	return ss.oAuthProvider[name]
-}
-
-func (ss *SocialService) GetOAuthInfoProviders() map[string]*OAuthInfo {
-	return ss.oAuthProvider
-}
-
-func (ss *SocialService) getUsageStats(ctx context.Context) (map[string]interface{}, error) {
-	m := map[string]interface{}{}
-
-	authTypes := map[string]bool{}
-	for provider, enabled := range ss.GetOAuthProviders() {
-		authTypes["oauth_"+provider] = enabled
-	}
-
-	for authType, enabled := range authTypes {
-		enabledValue := 0
-		if enabled {
-			enabledValue = 1
-		}
-
-		m["stats.auth_enabled."+authType+".count"] = enabledValue
-	}
-
-	return m, nil
-}
-
-func (s *SocialBase) isGroupMember(groups []string) bool {
-	if len(s.allowedGroups) == 0 {
-		return true
-	}
-
-	for _, allowedGroup := range s.allowedGroups {
-		for _, group := range groups {
-			if group == allowedGroup {
-				return true
-			}
-		}
-	}
-
-	return false
-}
-
-func (s *SocialBase) retrieveRawIDToken(idToken interface{}) ([]byte, error) {
-	tokenString, ok := idToken.(string)
-	if !ok {
-		return nil, fmt.Errorf("id_token is not a string: %v", idToken)
-	}
-
-	jwtRegexp := regexp.MustCompile("^([-_a-zA-Z0-9=]+)[.]([-_a-zA-Z0-9=]+)[.]([-_a-zA-Z0-9=]+)$")
-	matched := jwtRegexp.FindStringSubmatch(tokenString)
-	if matched == nil {
-		return nil, fmt.Errorf("id_token is not in JWT format: %s", tokenString)
-	}
-
-	rawJSON, err := base64.RawURLEncoding.DecodeString(matched[2])
-	if err != nil {
-		return nil, fmt.Errorf("error base64 decoding id_token: %w", err)
-	}
-
-	headerBytes, err := base64.RawURLEncoding.DecodeString(matched[1])
-	if err != nil {
-		return nil, fmt.Errorf("error base64 decoding header: %w", err)
-	}
-
-	var header map[string]interface{}
-	if err := json.Unmarshal(headerBytes, &header); err != nil {
-		return nil, fmt.Errorf("error deserializing header: %w", err)
-	}
-
-	if compressionVal, exists := header["zip"]; exists {
-		compression, ok := compressionVal.(string)
-		if !ok {
-			return nil, fmt.Errorf("unrecognized compression header: %v", compressionVal)
-		}
-
-		if compression != "DEF" {
-			return nil, fmt.Errorf("unknown compression algorithm: %s", compression)
-		}
-
-		fr, err := zlib.NewReader(bytes.NewReader(rawJSON))
-		if err != nil {
-			return nil, fmt.Errorf("error creating zlib reader: %w", err)
-		}
-		defer func() {
-			if err := fr.Close(); err != nil {
-				s.log.Warn("Failed closing zlib reader", "error", err)
-			}
-		}()
-
-		rawJSON, err = io.ReadAll(fr)
-		if err != nil {
-			return nil, fmt.Errorf("error decompressing payload: %w", err)
-		}
-	}
-
-	return rawJSON, nil
-}
-
-func appendUniqueScope(config *oauth2.Config, scope string) {
-	if !slices.Contains(config.Scopes, OfflineAccessScope) {
-		config.Scopes = append(config.Scopes, OfflineAccessScope)
-	}
-}
diff --git a/pkg/login/social/socialimpl/service.go b/pkg/login/social/socialimpl/service.go
new file mode 100644
index 0000000000000..3dc66ff819ef6
--- /dev/null
+++ b/pkg/login/social/socialimpl/service.go
@@ -0,0 +1,254 @@
+package socialimpl
+
+import (
+	"context"
+	"crypto/tls"
+	"crypto/x509"
+	"fmt"
+	"net"
+	"net/http"
+	"os"
+	"strings"
+	"time"
+
+	"gopkg.in/ini.v1"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/remotecache"
+	"github.com/grafana/grafana/pkg/infra/usagestats"
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/login/social/connectors"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	"github.com/grafana/grafana/pkg/services/supportbundles"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+var (
+	allOauthes = []string{social.GitHubProviderName, social.GitlabProviderName, social.GoogleProviderName, social.GenericOAuthProviderName, social.GrafanaNetProviderName,
+		social.GrafanaComProviderName, social.AzureADProviderName, social.OktaProviderName}
+)
+
+type SocialService struct {
+	cfg *setting.Cfg
+
+	socialMap map[string]social.SocialConnector
+	log       log.Logger
+}
+
+func ProvideService(cfg *setting.Cfg,
+	features featuremgmt.FeatureToggles,
+	usageStats usagestats.Service,
+	bundleRegistry supportbundles.Service,
+	cache remotecache.CacheStorage,
+	ssoSettings ssosettings.Service,
+) *SocialService {
+	ss := &SocialService{
+		cfg:       cfg,
+		socialMap: make(map[string]social.SocialConnector),
+		log:       log.New("login.social"),
+	}
+
+	usageStats.RegisterMetricsFunc(ss.getUsageStats)
+
+	if features.IsEnabledGlobally(featuremgmt.FlagSsoSettingsApi) {
+		allSettings, err := ssoSettings.List(context.Background())
+		if err != nil {
+			ss.log.Error("Failed to get SSO settings", "error", err)
+		}
+
+		for _, ssoSetting := range allSettings {
+			info, err := connectors.CreateOAuthInfoFromKeyValues(ssoSetting.Settings)
+			if err != nil {
+				ss.log.Error("Failed to create OAuthInfo for provider", "error", err, "provider", ssoSetting.Provider)
+				continue
+			}
+
+			conn, err := createOAuthConnector(ssoSetting.Provider, info, cfg, ssoSettings, features, cache)
+			if err != nil {
+				ss.log.Error("Failed to create OAuth provider", "error", err, "provider", ssoSetting.Provider)
+				continue
+			}
+
+			ss.socialMap[ssoSetting.Provider] = conn
+		}
+	} else {
+		for _, name := range allOauthes {
+			sec := cfg.Raw.Section("auth." + name)
+
+			settingsKVs := convertIniSectionToMap(sec)
+
+			info, err := connectors.CreateOAuthInfoFromKeyValues(settingsKVs)
+			if err != nil {
+				ss.log.Error("Failed to create OAuthInfo for provider", "error", err, "provider", name)
+				continue
+			}
+
+			if !info.Enabled {
+				continue
+			}
+
+			if name == social.GrafanaNetProviderName {
+				name = social.GrafanaComProviderName
+			}
+
+			conn, _ := createOAuthConnector(name, info, cfg, ssoSettings, features, cache)
+
+			ss.socialMap[name] = conn
+		}
+	}
+
+	ss.registerSupportBundleCollectors(bundleRegistry)
+
+	return ss
+}
+
+// GetOAuthProviders returns available oauth providers and if they're enabled or not
+func (ss *SocialService) GetOAuthProviders() map[string]bool {
+	result := map[string]bool{}
+
+	for name, conn := range ss.socialMap {
+		result[name] = conn.GetOAuthInfo().Enabled
+	}
+
+	return result
+}
+
+func (ss *SocialService) GetOAuthHttpClient(name string) (*http.Client, error) {
+	// The socialMap keys don't have "oauth_" prefix, but everywhere else in the system does
+	name = strings.TrimPrefix(name, "oauth_")
+	provider, ok := ss.socialMap[name]
+	if !ok {
+		return nil, fmt.Errorf("could not find %q in OAuth Settings", name)
+	}
+
+	info := provider.GetOAuthInfo()
+	if !info.Enabled {
+		return nil, fmt.Errorf("oauth provider %q is not enabled", name)
+	}
+
+	// handle call back
+	tr := &http.Transport{
+		Proxy: http.ProxyFromEnvironment,
+		TLSClientConfig: &tls.Config{
+			InsecureSkipVerify: info.TlsSkipVerify,
+		},
+		DialContext: (&net.Dialer{
+			Timeout:   time.Second * 10,
+			KeepAlive: 30 * time.Second,
+		}).DialContext,
+		TLSHandshakeTimeout:   15 * time.Second,
+		ExpectContinueTimeout: 1 * time.Second,
+		MaxIdleConns:          100,
+		IdleConnTimeout:       90 * time.Second,
+	}
+
+	oauthClient := &http.Client{
+		Transport: tr,
+		Timeout:   time.Second * 15,
+	}
+
+	if info.TlsClientCert != "" || info.TlsClientKey != "" {
+		cert, err := tls.LoadX509KeyPair(info.TlsClientCert, info.TlsClientKey)
+		if err != nil {
+			ss.log.Error("Failed to setup TlsClientCert", "oauth", name, "error", err)
+			return nil, fmt.Errorf("failed to setup TlsClientCert: %w", err)
+		}
+
+		tr.TLSClientConfig.Certificates = append(tr.TLSClientConfig.Certificates, cert)
+	}
+
+	if info.TlsClientCa != "" {
+		caCert, err := os.ReadFile(info.TlsClientCa)
+		if err != nil {
+			ss.log.Error("Failed to setup TlsClientCa", "oauth", name, "error", err)
+			return nil, fmt.Errorf("failed to setup TlsClientCa: %w", err)
+		}
+		caCertPool := x509.NewCertPool()
+		caCertPool.AppendCertsFromPEM(caCert)
+		tr.TLSClientConfig.RootCAs = caCertPool
+	}
+	return oauthClient, nil
+}
+
+func (ss *SocialService) GetConnector(name string) (social.SocialConnector, error) {
+	// The socialMap keys don't have "oauth_" prefix, but everywhere else in the system does
+	provider := strings.TrimPrefix(name, "oauth_")
+	connector, ok := ss.socialMap[provider]
+	if !ok {
+		return nil, fmt.Errorf("failed to find oauth provider for %q", name)
+	}
+	return connector, nil
+}
+
+func (ss *SocialService) GetOAuthInfoProvider(name string) *social.OAuthInfo {
+	// The socialMap keys don't have "oauth_" prefix, but everywhere else in the system does
+	provider := strings.TrimPrefix(name, "oauth_")
+	connector, ok := ss.socialMap[provider]
+	if !ok {
+		return nil
+	}
+	return connector.GetOAuthInfo()
+}
+
+// GetOAuthInfoProviders returns enabled OAuth providers
+func (ss *SocialService) GetOAuthInfoProviders() map[string]*social.OAuthInfo {
+	result := map[string]*social.OAuthInfo{}
+	for name, connector := range ss.socialMap {
+		info := connector.GetOAuthInfo()
+		if info.Enabled {
+			result[name] = info
+		}
+	}
+	return result
+}
+
+func (ss *SocialService) getUsageStats(ctx context.Context) (map[string]any, error) {
+	m := map[string]any{}
+
+	authTypes := map[string]bool{}
+	for provider, enabled := range ss.GetOAuthProviders() {
+		authTypes["oauth_"+provider] = enabled
+	}
+
+	for authType, enabled := range authTypes {
+		enabledValue := 0
+		if enabled {
+			enabledValue = 1
+		}
+
+		m["stats.auth_enabled."+authType+".count"] = enabledValue
+	}
+
+	return m, nil
+}
+
+func createOAuthConnector(name string, info *social.OAuthInfo, cfg *setting.Cfg, ssoSettings ssosettings.Service, features featuremgmt.FeatureToggles, cache remotecache.CacheStorage) (social.SocialConnector, error) {
+	switch name {
+	case social.AzureADProviderName:
+		return connectors.NewAzureADProvider(info, cfg, ssoSettings, features, cache), nil
+	case social.GenericOAuthProviderName:
+		return connectors.NewGenericOAuthProvider(info, cfg, ssoSettings, features), nil
+	case social.GitHubProviderName:
+		return connectors.NewGitHubProvider(info, cfg, ssoSettings, features), nil
+	case social.GitlabProviderName:
+		return connectors.NewGitLabProvider(info, cfg, ssoSettings, features), nil
+	case social.GoogleProviderName:
+		return connectors.NewGoogleProvider(info, cfg, ssoSettings, features), nil
+	case social.GrafanaComProviderName:
+		return connectors.NewGrafanaComProvider(info, cfg, ssoSettings, features), nil
+	case social.OktaProviderName:
+		return connectors.NewOktaProvider(info, cfg, ssoSettings, features), nil
+	default:
+		return nil, fmt.Errorf("unknown oauth provider: %s", name)
+	}
+}
+
+// convertIniSectionToMap converts key value pairs from an ini section to a map[string]any
+func convertIniSectionToMap(sec *ini.Section) map[string]any {
+	mappedSettings := make(map[string]any)
+	for k, v := range sec.KeysHash() {
+		mappedSettings[k] = v
+	}
+	return mappedSettings
+}
diff --git a/pkg/login/social/socialimpl/service_test.go b/pkg/login/social/socialimpl/service_test.go
new file mode 100644
index 0000000000000..e8c647c8c0af1
--- /dev/null
+++ b/pkg/login/social/socialimpl/service_test.go
@@ -0,0 +1,294 @@
+package socialimpl
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"gopkg.in/ini.v1"
+
+	"github.com/grafana/grafana/pkg/api/routing"
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/infra/remotecache"
+	"github.com/grafana/grafana/pkg/infra/usagestats"
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/login/social/connectors"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/licensing"
+	secretsfake "github.com/grafana/grafana/pkg/services/secrets/fakes"
+	"github.com/grafana/grafana/pkg/services/ssosettings/ssosettingsimpl"
+	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
+)
+
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
+func TestSocialService_ProvideService(t *testing.T) {
+	type testEnv struct {
+		features featuremgmt.FeatureToggles
+	}
+	testCases := []struct {
+		name                                string
+		setup                               func(t *testing.T, env *testEnv)
+		expectedSocialMapLength             int
+		expectedGenericOAuthSkipOrgRoleSync bool
+	}{
+		{
+			name:                                "should load only enabled social connectors when ssoSettingsApi is disabled",
+			setup:                               nil,
+			expectedSocialMapLength:             1,
+			expectedGenericOAuthSkipOrgRoleSync: false,
+		},
+		{
+			name: "should load all social connectors when ssoSettingsApi is enabled",
+			setup: func(t *testing.T, env *testEnv) {
+				env.features = featuremgmt.WithFeatures(featuremgmt.FlagSsoSettingsApi)
+			},
+			expectedSocialMapLength:             7,
+			expectedGenericOAuthSkipOrgRoleSync: false,
+		},
+	}
+	iniContent := `
+	[auth.azuread]
+	enabled = true
+	skip_org_role_sync = true
+
+	[auth.generic_oauth]
+	enabled = false
+	skip_org_role_sync = false
+	`
+	iniFile, err := ini.Load([]byte(iniContent))
+	require.NoError(t, err)
+
+	cfg := setting.NewCfg()
+	cfg.Raw = iniFile
+
+	secrets := secretsfake.NewMockService(t)
+	accessControl := acimpl.ProvideAccessControl(cfg)
+	sqlStore := db.InitTestDB(t)
+
+	ssoSettingsSvc := ssosettingsimpl.ProvideService(
+		cfg,
+		sqlStore,
+		accessControl,
+		routing.NewRouteRegister(),
+		featuremgmt.WithFeatures(),
+		secrets,
+		&usagestats.UsageStatsMock{},
+		nil,
+		&setting.OSSImpl{Cfg: cfg},
+		&licensing.OSSLicensingService{},
+	)
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			env := &testEnv{
+				features: featuremgmt.WithFeatures(),
+			}
+			if tc.setup != nil {
+				tc.setup(t, env)
+			}
+
+			socialService := ProvideService(cfg, env.features, &usagestats.UsageStatsMock{}, supportbundlestest.NewFakeBundleService(), remotecache.NewFakeStore(t), ssoSettingsSvc)
+			require.Equal(t, tc.expectedSocialMapLength, len(socialService.socialMap))
+
+			genericOAuthInfo := socialService.GetOAuthInfoProvider("generic_oauth")
+			if genericOAuthInfo != nil {
+				require.Equal(t, tc.expectedGenericOAuthSkipOrgRoleSync, genericOAuthInfo.SkipOrgRoleSync)
+			}
+		})
+	}
+}
+
+func TestSocialService_ProvideService_GrafanaComGrafanaNet(t *testing.T) {
+	testCases := []struct {
+		name                        string
+		rawIniContent               string
+		expectedGrafanaComOAuthInfo *social.OAuthInfo
+	}{
+		{
+			name: "should setup the connector using auth.grafana_com section if it is enabled",
+			rawIniContent: `
+			[auth.grafana_com]
+			enabled = true
+			client_id = grafanaComClientId
+			
+			[auth.grafananet]
+			enabled = false
+			client_id = grafanaNetClientId`,
+			expectedGrafanaComOAuthInfo: &social.OAuthInfo{
+				AuthStyle: "inheader",
+				AuthUrl:   "/oauth2/authorize",
+				TokenUrl:  "/api/oauth2/token",
+				Enabled:   true,
+				ClientId:  "grafanaComClientId",
+			},
+		},
+		{
+			name: "should setup the connector using auth.grafananet section if it is enabled",
+			rawIniContent: `
+			[auth.grafana_com]
+			enabled = false
+			client_id = grafanaComClientId
+			
+			[auth.grafananet]
+			enabled = true
+			client_id = grafanaNetClientId`,
+			expectedGrafanaComOAuthInfo: &social.OAuthInfo{
+				AuthStyle: "inheader",
+				AuthUrl:   "/oauth2/authorize",
+				TokenUrl:  "/api/oauth2/token",
+				Enabled:   true,
+				ClientId:  "grafanaNetClientId",
+			},
+		},
+		{
+			name: "should setup the connector using auth.grafana_com section if both are enabled",
+			rawIniContent: `
+			[auth.grafana_com]
+			enabled = true
+			client_id = grafanaComClientId
+			
+			[auth.grafananet]
+			enabled = true
+			client_id = grafanaNetClientId`,
+			expectedGrafanaComOAuthInfo: &social.OAuthInfo{
+				AuthStyle: "inheader",
+				AuthUrl:   "/oauth2/authorize",
+				TokenUrl:  "/api/oauth2/token",
+				Enabled:   true,
+				ClientId:  "grafanaComClientId",
+			},
+		},
+		{
+			name: "should not setup the connector when both are disabled",
+			rawIniContent: `
+			[auth.grafana_com]
+			enabled = false
+			client_id = grafanaComClientId
+			
+			[auth.grafananet]
+			enabled = false
+			client_id = grafanaNetClientId`,
+			expectedGrafanaComOAuthInfo: nil,
+		},
+	}
+
+	cfg := setting.NewCfg()
+	secrets := secretsfake.NewMockService(t)
+	accessControl := acimpl.ProvideAccessControl(cfg)
+	sqlStore := db.InitTestDB(t)
+
+	ssoSettingsSvc := ssosettingsimpl.ProvideService(cfg, sqlStore, accessControl, routing.NewRouteRegister(), featuremgmt.WithFeatures(), secrets, &usagestats.UsageStatsMock{}, nil, nil, &licensing.OSSLicensingService{})
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			iniFile, err := ini.Load([]byte(tc.rawIniContent))
+			require.NoError(t, err)
+
+			cfg := setting.NewCfg()
+			cfg.Raw = iniFile
+
+			socialService := ProvideService(cfg, featuremgmt.WithFeatures(), &usagestats.UsageStatsMock{}, supportbundlestest.NewFakeBundleService(), remotecache.NewFakeStore(t), ssoSettingsSvc)
+			require.EqualValues(t, tc.expectedGrafanaComOAuthInfo, socialService.GetOAuthInfoProvider("grafana_com"))
+		})
+	}
+}
+
+func TestMapping_IniSectionOAuthInfo(t *testing.T) {
+	iniContent := `
+[test]
+name = OAuth
+icon = signin
+enabled = true
+allow_sign_up = false
+auto_login = true
+client_id = test_client_id
+client_secret = test_client_secret
+scopes = ["openid", "profile", "email"]
+empty_scopes = false
+email_attribute_name = email:primary
+email_attribute_path = email
+login_attribute_path = login
+name_attribute_path = name
+role_attribute_path = role
+role_attribute_strict = true
+groups_attribute_path = groups
+id_token_attribute_name = id_token
+team_ids_attribute_path = team_ids
+auth_url = test_auth_url
+token_url = test_token_url
+api_url = test_api_url
+teams_url = test_teams_url
+allowed_domains = domain1.com
+allowed_groups =
+team_ids = first, second
+allowed_organizations = org1, org2
+tls_skip_verify_insecure = true
+tls_client_cert =
+tls_client_key =
+tls_client_ca =
+use_pkce = false
+auth_style =
+allow_assign_grafana_admin = true
+skip_org_role_sync = true
+use_refresh_token = true
+empty_scopes =
+hosted_domain = test_hosted_domain
+signout_redirect_url = https://oauth.com/signout?post_logout_redirect_uri=https://grafana.com
+`
+
+	iniFile, err := ini.Load([]byte(iniContent))
+	require.NoError(t, err)
+
+	expectedOAuthInfo := &social.OAuthInfo{
+		Name:                    "OAuth",
+		Icon:                    "signin",
+		Enabled:                 true,
+		AllowSignup:             false,
+		AutoLogin:               true,
+		ClientId:                "test_client_id",
+		ClientSecret:            "test_client_secret",
+		Scopes:                  []string{"openid", "profile", "email"},
+		EmptyScopes:             false,
+		EmailAttributeName:      "email:primary",
+		EmailAttributePath:      "email",
+		RoleAttributePath:       "role",
+		RoleAttributeStrict:     true,
+		GroupsAttributePath:     "groups",
+		TeamIdsAttributePath:    "team_ids",
+		AuthUrl:                 "test_auth_url",
+		TokenUrl:                "test_token_url",
+		ApiUrl:                  "test_api_url",
+		TeamsUrl:                "test_teams_url",
+		AllowedDomains:          []string{"domain1.com"},
+		AllowedGroups:           []string{},
+		TlsSkipVerify:           true,
+		TlsClientCert:           "",
+		TlsClientKey:            "",
+		TlsClientCa:             "",
+		UsePKCE:                 false,
+		AuthStyle:               "",
+		AllowAssignGrafanaAdmin: true,
+		UseRefreshToken:         true,
+		SkipOrgRoleSync:         true,
+		HostedDomain:            "test_hosted_domain",
+		SignoutRedirectUrl:      "https://oauth.com/signout?post_logout_redirect_uri=https://grafana.com",
+		Extra: map[string]string{
+			"allowed_organizations":   "org1, org2",
+			"id_token_attribute_name": "id_token",
+			"login_attribute_path":    "login",
+			"name_attribute_path":     "name",
+			"team_ids":                "first, second",
+		},
+	}
+
+	settingsKVs := convertIniSectionToMap(iniFile.Section("test"))
+	oauthInfo, err := connectors.CreateOAuthInfoFromKeyValues(settingsKVs)
+	require.NoError(t, err)
+
+	require.Equal(t, expectedOAuthInfo, oauthInfo)
+}
diff --git a/pkg/login/social/support_bundle.go b/pkg/login/social/socialimpl/support_bundle.go
similarity index 85%
rename from pkg/login/social/support_bundle.go
rename to pkg/login/social/socialimpl/support_bundle.go
index 87ee04dd5f405..09866a30b3e7f 100644
--- a/pkg/login/social/support_bundle.go
+++ b/pkg/login/social/socialimpl/support_bundle.go
@@ -1,4 +1,4 @@
-package social
+package socialimpl
 
 import (
 	"bytes"
@@ -9,23 +9,25 @@ import (
 
 	"github.com/BurntSushi/toml"
 
+	"github.com/grafana/grafana/pkg/login/social"
 	"github.com/grafana/grafana/pkg/services/supportbundles"
 )
 
 func (ss *SocialService) registerSupportBundleCollectors(bundleRegistry supportbundles.Service) {
-	for name := range ss.oAuthProvider {
+	for name, connector := range ss.socialMap {
 		bundleRegistry.RegisterSupportItemCollector(supportbundles.Collector{
 			UID:               "oauth-" + name,
 			DisplayName:       "OAuth " + strings.Title(strings.ReplaceAll(name, "_", " ")),
 			Description:       "OAuth configuration and healthchecks for " + name,
 			IncludedByDefault: false,
 			Default:           false,
-			Fn:                ss.supportBundleCollectorFn(name, ss.socialMap[name], ss.oAuthProvider[name]),
+			EnabledFn:         func() bool { return connector.GetOAuthInfo().Enabled },
+			Fn:                ss.supportBundleCollectorFn(name, connector),
 		})
 	}
 }
 
-func (ss *SocialService) supportBundleCollectorFn(name string, sc SocialConnector, oinfo *OAuthInfo) func(context.Context) (*supportbundles.SupportItem, error) {
+func (ss *SocialService) supportBundleCollectorFn(name string, sc social.SocialConnector) func(context.Context) (*supportbundles.SupportItem, error) {
 	return func(ctx context.Context) (*supportbundles.SupportItem, error) {
 		bWriter := bytes.NewBuffer(nil)
 
@@ -37,6 +39,8 @@ func (ss *SocialService) supportBundleCollectorFn(name string, sc SocialConnecto
 			return nil, err
 		}
 
+		oinfo := sc.GetOAuthInfo()
+
 		bWriter.WriteString("```toml\n")
 		errM := toml.NewEncoder(bWriter).Encode(oinfo)
 		if errM != nil {
@@ -58,7 +62,7 @@ func (ss *SocialService) supportBundleCollectorFn(name string, sc SocialConnecto
 	}
 }
 
-func (ss *SocialService) healthCheckSocialConnector(ctx context.Context, name string, oinfo *OAuthInfo, bWriter *bytes.Buffer) {
+func (ss *SocialService) healthCheckSocialConnector(ctx context.Context, name string, oinfo *social.OAuthInfo, bWriter *bytes.Buffer) {
 	bWriter.WriteString("## Health checks\n\n")
 	client, err := ss.GetOAuthHttpClient(name)
 	if err != nil {
diff --git a/pkg/login/socialtest/social_connector_mock.go b/pkg/login/social/socialtest/social_connector_mock.go
similarity index 91%
rename from pkg/login/socialtest/social_connector_mock.go
rename to pkg/login/social/socialtest/social_connector_mock.go
index 07c5030695341..17ed902bd01af 100644
--- a/pkg/login/socialtest/social_connector_mock.go
+++ b/pkg/login/social/socialtest/social_connector_mock.go
@@ -22,11 +22,11 @@ type MockSocialConnector struct {
 
 // AuthCodeURL provides a mock function with given fields: state, opts
 func (_m *MockSocialConnector) AuthCodeURL(state string, opts ...oauth2.AuthCodeOption) string {
-	_va := make([]any, len(opts))
+	_va := make([]interface{}, len(opts))
 	for _i := range opts {
 		_va[_i] = opts[_i]
 	}
-	var _ca []any
+	var _ca []interface{}
 	_ca = append(_ca, state)
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
@@ -59,11 +59,11 @@ func (_m *MockSocialConnector) Client(ctx context.Context, t *oauth2.Token) *htt
 
 // Exchange provides a mock function with given fields: ctx, code, authOptions
 func (_m *MockSocialConnector) Exchange(ctx context.Context, code string, authOptions ...oauth2.AuthCodeOption) (*oauth2.Token, error) {
-	_va := make([]any, len(authOptions))
+	_va := make([]interface{}, len(authOptions))
 	for _i := range authOptions {
 		_va[_i] = authOptions[_i]
 	}
-	var _ca []any
+	var _ca []interface{}
 	_ca = append(_ca, ctx, code)
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
@@ -90,6 +90,22 @@ func (_m *MockSocialConnector) Exchange(ctx context.Context, code string, authOp
 	return r0, r1
 }
 
+// GetOAuthInfo provides a mock function with given fields:
+func (_m *MockSocialConnector) GetOAuthInfo() *social.OAuthInfo {
+	ret := _m.Called()
+
+	var r0 *social.OAuthInfo
+	if rf, ok := ret.Get(0).(func() *social.OAuthInfo); ok {
+		r0 = rf()
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*social.OAuthInfo)
+		}
+	}
+
+	return r0
+}
+
 // IsEmailAllowed provides a mock function with given fields: email
 func (_m *MockSocialConnector) IsEmailAllowed(email string) bool {
 	ret := _m.Called(email)
diff --git a/pkg/login/socialtest/social_service_fake.go b/pkg/login/social/socialtest/social_service_fake.go
similarity index 91%
rename from pkg/login/socialtest/social_service_fake.go
rename to pkg/login/social/socialtest/social_service_fake.go
index e4f9a9270e1d7..c440fd7093dc5 100644
--- a/pkg/login/socialtest/social_service_fake.go
+++ b/pkg/login/social/socialtest/social_service_fake.go
@@ -8,12 +8,13 @@ import (
 
 type FakeSocialService struct {
 	ExpectedAuthInfoProvider *social.OAuthInfo
+	ExpectedOAuthProviders   map[string]bool
 	ExpectedConnector        social.SocialConnector
 	ExpectedHttpClient       *http.Client
 }
 
 func (fss *FakeSocialService) GetOAuthProviders() map[string]bool {
-	panic("not implemented")
+	return fss.ExpectedOAuthProviders
 }
 
 func (fss *FakeSocialService) GetOAuthHttpClient(string) (*http.Client, error) {
diff --git a/pkg/middleware/auth.go b/pkg/middleware/auth.go
index d0bbe9137133e..ef726a08c2e7a 100644
--- a/pkg/middleware/auth.go
+++ b/pkg/middleware/auth.go
@@ -4,17 +4,21 @@ import (
 	"errors"
 	"net/http"
 	"net/url"
+	"path/filepath"
 	"regexp"
 	"strconv"
 	"strings"
 
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/middleware/cookies"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/authn"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginaccesscontrol"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/web"
 )
@@ -52,7 +56,7 @@ func notAuthorized(c *contextmodel.ReqContext) {
 
 func tokenRevoked(c *contextmodel.ReqContext, err *auth.TokenRevokedError) {
 	if c.IsApiRequest() {
-		c.JSON(401, map[string]any{
+		c.JSON(http.StatusUnauthorized, map[string]any{
 			"message": "Token revoked",
 			"error": map[string]any{
 				"id":                    "ERR_TOKEN_REVOKED",
@@ -97,6 +101,54 @@ func CanAdminPlugins(cfg *setting.Cfg, accessControl ac.AccessControl) func(c *c
 	}
 }
 
+func RoleAppPluginAuth(accessControl ac.AccessControl, ps pluginstore.Store, features featuremgmt.FeatureToggles,
+	logger log.Logger) func(c *contextmodel.ReqContext) {
+	return func(c *contextmodel.ReqContext) {
+		pluginID := web.Params(c.Req)[":id"]
+		p, exists := ps.Plugin(c.Req.Context(), pluginID)
+		if !exists {
+			// The frontend will handle app not found appropriately
+			return
+		}
+
+		permitted := true
+		path := normalizeIncludePath(c.Req.URL.Path)
+		hasAccess := ac.HasAccess(accessControl, c)
+		for _, i := range p.Includes {
+			if i.Type != "page" {
+				continue
+			}
+
+			u, err := url.Parse(i.Path)
+			if err != nil {
+				logger.Error("failed to parse include path", "pluginId", pluginID, "include", i.Name, "err", err)
+				continue
+			}
+
+			if normalizeIncludePath(u.Path) == path {
+				useRBAC := features.IsEnabledGlobally(featuremgmt.FlagAccessControlOnCall) && i.RequiresRBACAction()
+				if useRBAC && !hasAccess(ac.EvalPermission(i.Action)) {
+					logger.Debug("Plugin include is covered by RBAC, user doesn't have access", "plugin", pluginID, "include", i.Name)
+					permitted = false
+					break
+				} else if !useRBAC && !c.HasUserRole(i.Role) {
+					permitted = false
+					break
+				}
+			}
+		}
+
+		if !permitted {
+			accessForbidden(c)
+			return
+		}
+	}
+}
+
+func normalizeIncludePath(p string) string {
+	return strings.TrimPrefix(filepath.Clean(p), "/")
+}
+
 func RoleAuth(roles ...org.RoleType) web.Handler {
 	return func(c *contextmodel.ReqContext) {
 		ok := false
diff --git a/pkg/middleware/auth_test.go b/pkg/middleware/auth_test.go
index 06b20884d7260..bc45f07ac9c73 100644
--- a/pkg/middleware/auth_test.go
+++ b/pkg/middleware/auth_test.go
@@ -10,12 +10,17 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/infra/log/logtest"
 	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
 	"github.com/grafana/grafana/pkg/services/authn"
 	"github.com/grafana/grafana/pkg/services/authn/authntest"
 	"github.com/grafana/grafana/pkg/services/contexthandler"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/web"
 )
@@ -150,6 +155,185 @@ func TestAuth_Middleware(t *testing.T) {
 	}
 }
 
+func TestRoleAppPluginAuth(t *testing.T) {
+	t.Run("Verify user's role when requesting app route which requires role", func(t *testing.T) {
+		appSubURL := setting.AppSubUrl
+		setting.AppSubUrl = "/grafana/"
+		t.Cleanup(func() {
+			setting.AppSubUrl = appSubURL
+		})
+
+		tcs := []struct {
+			roleRequired org.RoleType
+			role         org.RoleType
+			expStatus    int
+			expBody      string
+			expLocation  string
+		}{
+			{roleRequired: org.RoleViewer, role: org.RoleAdmin, expStatus: http.StatusOK, expBody: ""},
+			{roleRequired: org.RoleAdmin, role: org.RoleAdmin, expStatus: http.StatusOK, expBody: ""},
+			{roleRequired: org.RoleAdmin, role: org.RoleViewer, expStatus: http.StatusFound, expBody: "<a href=\"/grafana/\">Found</a>.\n\n", expLocation: "/grafana/"},
+			{roleRequired: "", role: org.RoleViewer, expStatus: http.StatusOK, expBody: ""},
+			{roleRequired: org.RoleEditor, role: "", expStatus: http.StatusFound, expBody: "<a href=\"/grafana/\">Found</a>.\n\n", expLocation: "/grafana/"},
+		}
+
+		const path = "/a/test-app/test"
+		for i, tc := range tcs {
+			t.Run(fmt.Sprintf("testcase %d", i), func(t *testing.T) {
+				ps := pluginstore.NewFakePluginStore(pluginstore.Plugin{
+					JSONData: plugins.JSONData{
+						ID: "test-app",
+						Includes: []*plugins.Includes{
+							{
+								Type: "page",
+								Role: tc.roleRequired,
+								Path: path,
+							},
+						},
+					},
+				})
+
+				middlewareScenario(t, t.Name(), func(t *testing.T, sc *scenarioContext) {
+					sc.withIdentity(&authn.Identity{
+						OrgRoles: map[int64]org.RoleType{
+							0: tc.role,
+						},
+					})
+					features := featuremgmt.WithFeatures()
+					logger := &logtest.Fake{}
+					ac := &actest.FakeAccessControl{}
+
+					sc.m.Get("/a/:id/*", RoleAppPluginAuth(ac, ps, features, logger), func(c *contextmodel.ReqContext) {
+						c.JSON(http.StatusOK, map[string]interface{}{})
+					})
+					sc.fakeReq("GET", path).exec()
+					assert.Equal(t, tc.expStatus, sc.resp.Code)
+					assert.Equal(t, tc.expBody, sc.resp.Body.String())
+					assert.Equal(t, tc.expLocation, sc.resp.Header().Get("Location"))
+				})
+			})
+		}
+	})
+
+	// We return success in this case because the frontend takes care of rendering the 404 page
+	middlewareScenario(t, "Plugin is not found returns success", func(t *testing.T, sc *scenarioContext) {
+		sc.withIdentity(&authn.Identity{
+			OrgRoles: map[int64]org.RoleType{
+				0: org.RoleViewer,
+			},
+		})
+		features := featuremgmt.WithFeatures()
+		logger := &logtest.Fake{}
+		ac := &actest.FakeAccessControl{}
+		sc.m.Get("/a/:id/*", RoleAppPluginAuth(ac, &pluginstore.FakePluginStore{}, features, logger), func(c *contextmodel.ReqContext) {
+			c.JSON(http.StatusOK, map[string]interface{}{})
+		})
+		sc.fakeReq("GET", "/a/test-app/test").exec()
+		assert.Equal(t, 200, sc.resp.Code)
+		assert.Equal(t, "", sc.resp.Body.String())
+	})
+
+	// We return success in this case because the frontend takes care of rendering the right page based on its router
+	middlewareScenario(t, "Plugin page not found returns success", func(t *testing.T, sc *scenarioContext) {
+		sc.withIdentity(&authn.Identity{
+			OrgRoles: map[int64]org.RoleType{
+				0: org.RoleViewer,
+			},
+		})
+		features := featuremgmt.WithFeatures()
+		logger := &logtest.Fake{}
+		ac := &actest.FakeAccessControl{}
+		sc.m.Get("/a/:id/*", RoleAppPluginAuth(ac, pluginstore.NewFakePluginStore(pluginstore.Plugin{
+			JSONData: plugins.JSONData{
+				ID: "test-app",
+				Includes: []*plugins.Includes{
+					{
+						Type: "page",
+						Role: org.RoleViewer,
+						Path: "/a/test-app/test",
+					},
+				},
+			},
+		}), features, logger), func(c *contextmodel.ReqContext) {
+			c.JSON(http.StatusOK, map[string]interface{}{})
+		})
+		sc.fakeReq("GET", "/a/test-app/notExistingPath").exec()
+		assert.Equal(t, 200, sc.resp.Code)
+		assert.Equal(t, "", sc.resp.Body.String())
+	})
+
+	t.Run("Plugin include with RBAC", func(t *testing.T) {
+		tcs := []struct {
+			name        string
+			evalResult  bool
+			evalErr     error
+			expStatus   int
+			expBody     string
+			expLocation string
+		}{
+			{
+				name:        "Unsuccessful RBAC eval will result in a redirect",
+				evalResult:  false,
+				expStatus:   302,
+				expBody:     "<a href=\"/\">Found</a>.\n\n",
+				expLocation: "/",
+			},
+			{
+				name:        "An RBAC eval error will result in a redirect",
+				evalErr:     errors.New("eval error"),
+				expStatus:   302,
+				expBody:     "<a href=\"/\">Found</a>.\n\n",
+				expLocation: "/",
+			},
+			{
+				name:        "Successful RBAC eval will result in a successful request",
+				evalResult:  true,
+				expStatus:   200,
+				expBody:     "",
+				expLocation: "",
+			},
+		}
+
+		for _, tc := range tcs {
+			middlewareScenario(t, "Plugin include with RBAC", func(t *testing.T, sc *scenarioContext) {
+				sc.withIdentity(&authn.Identity{
+					OrgRoles: map[int64]org.RoleType{
+						0: org.RoleViewer,
+					},
+				})
+				logger := &logtest.Fake{}
+				features := featuremgmt.WithFeatures(featuremgmt.FlagAccessControlOnCall)
+				ac := &actest.FakeAccessControl{
+					ExpectedEvaluate: tc.evalResult,
+					ExpectedErr:      tc.evalErr,
+				}
+				path := "/a/test-app/test"
+				ps := pluginstore.NewFakePluginStore(pluginstore.Plugin{
+					JSONData: plugins.JSONData{
+						ID: "test-app",
+						Includes: []*plugins.Includes{
+							{
+								Type:   "page",
+								Role:   org.RoleViewer,
+								Path:   path,
+								Action: "test-app.test:read",
+							},
+						},
+					},
+				})
+
+				sc.m.Get("/a/:id/*", RoleAppPluginAuth(ac, ps, features, logger), func(c *contextmodel.ReqContext) {
+					c.JSON(http.StatusOK, map[string]interface{}{})
+				})
+				sc.fakeReq("GET", path).exec()
+				assert.Equal(t, tc.expStatus, sc.resp.Code)
+				assert.Equal(t, tc.expBody, sc.resp.Body.String())
+				assert.Equal(t, tc.expLocation, sc.resp.Header().Get("Location"))
+			})
+		}
+	})
+}
+
 func TestRemoveForceLoginparams(t *testing.T) {
 	tcs := []struct {
 		inp string
diff --git a/pkg/middleware/loggermw/logger.go b/pkg/middleware/loggermw/logger.go
index 89254828442d3..34dcab5066e88 100644
--- a/pkg/middleware/loggermw/logger.go
+++ b/pkg/middleware/loggermw/logger.go
@@ -64,7 +64,7 @@ func (l *loggerImpl) Middleware() web.Middleware {
 			// put the start time on context so we can measure it later.
 			r = r.WithContext(log.InitstartTime(r.Context(), time.Now()))
 
-			if l.flags.IsEnabled(featuremgmt.FlagUnifiedRequestLog) {
+			if l.flags.IsEnabled(r.Context(), featuremgmt.FlagUnifiedRequestLog) {
 				r = r.WithContext(errutil.SetUnifiedLogging(r.Context()))
 			}
 
@@ -74,6 +74,7 @@ func (l *loggerImpl) Middleware() web.Middleware {
 			duration := time.Since(start)
 			timeTaken := duration / time.Millisecond
 			ctx := contexthandler.FromContext(r.Context())
+
 			if ctx != nil && ctx.PerfmonTimer != nil {
 				ctx.PerfmonTimer.Observe(float64(timeTaken))
 			}
@@ -128,10 +129,8 @@ func (l *loggerImpl) prepareLogParams(c *contextmodel.ReqContext, duration time.
 		logParams = append(logParams, "handler", handler)
 	}
 
-	if l.flags.IsEnabled(featuremgmt.FlagRequestInstrumentationStatusSource) {
-		rmd := requestmeta.GetRequestMetaData(c.Req.Context())
-		logParams = append(logParams, "status_source", rmd.StatusSource)
-	}
+	rmd := requestmeta.GetRequestMetaData(c.Req.Context())
+	logParams = append(logParams, "status_source", rmd.StatusSource)
 
 	logParams = append(logParams, errorLogParams(c.Error)...)
 
diff --git a/pkg/middleware/middleware.go b/pkg/middleware/middleware.go
index cc0bac28bd3fa..074139c493e90 100644
--- a/pkg/middleware/middleware.go
+++ b/pkg/middleware/middleware.go
@@ -48,7 +48,10 @@ func AddDefaultResponseHeaders(cfg *setting.Cfg) web.Handler {
 			_, _, resourceURLMatch := t.Match(c.Req.URL.Path)
 			resourceCachable := resourceURLMatch && allowCacheControl(c.Resp)
 			if !strings.HasPrefix(c.Req.URL.Path, "/public/plugins/") &&
-				!strings.HasPrefix(c.Req.URL.Path, "/api/datasources/proxy/") && !resourceCachable {
+				!strings.HasPrefix(c.Req.URL.Path, "/avatar/") &&
+				!strings.HasPrefix(c.Req.URL.Path, "/api/datasources/proxy/") &&
+				!strings.HasPrefix(c.Req.URL.Path, "/api/reports/render/") &&
+				!strings.HasPrefix(c.Req.URL.Path, "/render/d-solo/") && !resourceCachable {
 				addNoCacheHeaders(c.Resp)
 			}
 
diff --git a/pkg/middleware/middleware_test.go b/pkg/middleware/middleware_test.go
index 16f5445116f1e..722c9f093357c 100644
--- a/pkg/middleware/middleware_test.go
+++ b/pkg/middleware/middleware_test.go
@@ -149,9 +149,14 @@ func TestMiddlewareContext(t *testing.T) {
 				User:     &dtos.CurrentUser{},
 				Settings: &dtos.FrontendSettingsDTO{},
 				NavTree:  &navtree.NavTreeRoot{},
+				Assets: &dtos.EntryPointAssets{
+					JSFiles: []dtos.EntryPointAsset{},
+					Dark:    "dark.css",
+					Light:   "light.css",
+				},
 			}
 			t.Log("Calling HTML", "data", data)
-			c.HTML(http.StatusOK, "index-template", data)
+			c.HTML(http.StatusOK, "index", data)
 			t.Log("Returned HTML with code 200")
 		}
 		sc.fakeReq("GET", "/").exec()
@@ -185,6 +190,22 @@ func TestMiddlewareContext(t *testing.T) {
 			"X-Other-Header":  "other-test",
 		}
 	})
+
+	middlewareScenario(t, "middleware should not add Cache-Control header for requests to render pdf", func(
+		t *testing.T, sc *scenarioContext) {
+		sc.fakeReq("GET", "/api/reports/render/pdf/").exec()
+		assert.Empty(t, sc.resp.Header().Get("Cache-Control"))
+		assert.Empty(t, sc.resp.Header().Get("Pragma"))
+		assert.Empty(t, sc.resp.Header().Get("Expires"))
+	})
+
+	middlewareScenario(t, "middleware should not add Cache-Control header for requests to render panel as image", func(
+		t *testing.T, sc *scenarioContext) {
+		sc.fakeReq("GET", "/render/d-solo/").exec()
+		assert.Empty(t, sc.resp.Header().Get("Cache-Control"))
+		assert.Empty(t, sc.resp.Header().Get("Pragma"))
+		assert.Empty(t, sc.resp.Header().Get("Expires"))
+	})
 }
 
 func middlewareScenario(t *testing.T, desc string, fn scenarioFunc, cbs ...func(*setting.Cfg)) {
@@ -199,7 +220,7 @@ func middlewareScenario(t *testing.T, desc string, fn scenarioFunc, cbs ...func(
 		cfg.LoginCookieName = "grafana_session"
 		cfg.LoginMaxLifetime = loginMaxLifetime
 		// Required when rendering errors
-		cfg.ErrTemplateName = "error-template"
+		cfg.ErrTemplateName = "error"
 		for _, cb := range cbs {
 			cb(cfg)
 		}
diff --git a/pkg/middleware/recovery.go b/pkg/middleware/recovery.go
index 4fcfb30903d9c..01e07ee8e3869 100644
--- a/pkg/middleware/recovery.go
+++ b/pkg/middleware/recovery.go
@@ -23,8 +23,11 @@ import (
 	"os"
 	"runtime"
 
+	"github.com/grafana/grafana/pkg/api/dtos"
+	"github.com/grafana/grafana/pkg/api/webassets"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/contexthandler"
+	"github.com/grafana/grafana/pkg/services/licensing"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/web"
 )
@@ -102,7 +105,7 @@ func function(pc uintptr) []byte {
 
 // Recovery returns a middleware that recovers from any panics and writes a 500 if there was one.
 // While Martini is in development mode, Recovery will also output the panic as HTML.
-func Recovery(cfg *setting.Cfg) web.Middleware {
+func Recovery(cfg *setting.Cfg, license licensing.Licensing) web.Middleware {
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
 			c := web.FromContext(req.Context())
@@ -135,15 +138,21 @@ func Recovery(cfg *setting.Cfg) web.Middleware {
 						return
 					}
 
+					assets, _ := webassets.GetWebAssets(req.Context(), cfg, license)
+					if assets == nil {
+						assets = &dtos.EntryPointAssets{JSFiles: []dtos.EntryPointAsset{}}
+					}
+
 					data := struct {
 						Title     string
 						AppTitle  string
 						AppSubUrl string
-						Theme     string
+						ThemeType string
 						ErrorMsg  string
-					}{"Server Error", "Grafana", cfg.AppSubURL, cfg.DefaultTheme, ""}
+						Assets    *dtos.EntryPointAssets
+					}{"Server Error", "Grafana", cfg.AppSubURL, cfg.DefaultTheme, "", assets}
 
-					if setting.Env == setting.Dev {
+					if cfg.Env == setting.Dev {
 						if err, ok := r.(error); ok {
 							data.Title = err.Error()
 						}
@@ -161,9 +170,9 @@ func Recovery(cfg *setting.Cfg) web.Middleware {
 							resp["error"] = data.Title
 						}
 
-						ctx.JSON(500, resp)
+						ctx.JSON(http.StatusInternalServerError, resp)
 					} else {
-						ctx.HTML(500, cfg.ErrTemplateName, data)
+						ctx.HTML(http.StatusInternalServerError, cfg.ErrTemplateName, data)
 					}
 				}
 			}()
diff --git a/pkg/middleware/recovery_test.go b/pkg/middleware/recovery_test.go
index deb7f219f7c42..85df5feaed867 100644
--- a/pkg/middleware/recovery_test.go
+++ b/pkg/middleware/recovery_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/authn"
 	"github.com/grafana/grafana/pkg/services/authn/authntest"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/licensing"
 	"github.com/grafana/grafana/pkg/services/user/usertest"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/web"
@@ -50,7 +51,7 @@ func panicHandler(c *contextmodel.ReqContext) {
 func recoveryScenario(t *testing.T, desc string, url string, fn scenarioFunc) {
 	t.Run(desc, func(t *testing.T) {
 		cfg := setting.NewCfg()
-		cfg.ErrTemplateName = "error-template"
+		cfg.ErrTemplateName = "error"
 		cfg.UserFacingDefaultError = "test error"
 		sc := &scenarioContext{
 			t:   t,
@@ -62,7 +63,7 @@ func recoveryScenario(t *testing.T, desc string, url string, fn scenarioFunc) {
 		require.NoError(t, err)
 
 		sc.m = web.New()
-		sc.m.UseMiddleware(Recovery(cfg))
+		sc.m.UseMiddleware(Recovery(cfg, &licensing.OSSLicensingService{}))
 
 		sc.m.Use(AddDefaultResponseHeaders(cfg))
 		sc.m.UseMiddleware(web.Renderer(viewsPath, "[[", "]]"))
diff --git a/pkg/middleware/request_metrics.go b/pkg/middleware/request_metrics.go
index ad25e314be0b8..b109a52a56f1a 100644
--- a/pkg/middleware/request_metrics.go
+++ b/pkg/middleware/request_metrics.go
@@ -35,20 +35,12 @@ func RequestMetrics(features featuremgmt.FeatureToggles, cfg *setting.Cfg, promR
 		},
 	)
 
-	histogramLabels := []string{"handler", "status_code", "method"}
-
-	if features.IsEnabled(featuremgmt.FlagRequestInstrumentationStatusSource) {
-		histogramLabels = append(histogramLabels, "status_source")
-	}
+	histogramLabels := []string{"handler", "status_code", "method", "status_source", "slo_group"}
 
 	if cfg.MetricsIncludeTeamLabel {
 		histogramLabels = append(histogramLabels, "grafana_team")
 	}
 
-	if features.IsEnabled(featuremgmt.FlagHttpSLOLevels) {
-		histogramLabels = append(histogramLabels, "slo_group")
-	}
-
 	histogramOptions := prometheus.HistogramOpts{
 		Namespace: "grafana",
 		Name:      "http_request_duration_seconds",
@@ -56,7 +48,7 @@ func RequestMetrics(features featuremgmt.FeatureToggles, cfg *setting.Cfg, promR
 		Buckets:   defBuckets,
 	}
 
-	if features.IsEnabled(featuremgmt.FlagEnableNativeHTTPHistogram) {
+	if features.IsEnabledGlobally(featuremgmt.FlagEnableNativeHTTPHistogram) {
 		// the recommended default value from the prom_client
 		// https://github.com/prometheus/client_golang/blob/main/prometheus/histogram.go#L411
 		// Giving this variable an value means the client will expose the histograms as an
@@ -95,7 +87,7 @@ func RequestMetrics(features featuremgmt.FeatureToggles, cfg *setting.Cfg, promR
 					handler = "notfound"
 				} else {
 					// log requests where we could not identify handler so we can register them.
-					if features.IsEnabled(featuremgmt.FlagLogRequestsInstrumentedAsUnknown) {
+					if features.IsEnabled(r.Context(), featuremgmt.FlagLogRequestsInstrumentedAsUnknown) {
 						log.Warn("request instrumented as unknown", "path", r.URL.Path, "status_code", status)
 					}
 				}
@@ -104,18 +96,12 @@ func RequestMetrics(features featuremgmt.FeatureToggles, cfg *setting.Cfg, promR
 			labelValues := []string{handler, code, r.Method}
 			rmd := requestmeta.GetRequestMetaData(r.Context())
 
-			if features.IsEnabled(featuremgmt.FlagRequestInstrumentationStatusSource) {
-				labelValues = append(labelValues, string(rmd.StatusSource))
-			}
+			labelValues = append(labelValues, string(rmd.StatusSource), string(rmd.SLOGroup))
 
 			if cfg.MetricsIncludeTeamLabel {
 				labelValues = append(labelValues, rmd.Team)
 			}
 
-			if features.IsEnabled(featuremgmt.FlagHttpSLOLevels) {
-				labelValues = append(labelValues, string(rmd.SLOGroup))
-			}
-
 			// avoiding the sanitize functions for in the new instrumentation
 			// since they dont make much sense. We should remove them later.
 			histogram := httpRequestDurationHistogram.
diff --git a/pkg/middleware/request_test.go b/pkg/middleware/request_test.go
index 6e4c7526ccf11..ea9ea4fad662b 100644
--- a/pkg/middleware/request_test.go
+++ b/pkg/middleware/request_test.go
@@ -42,7 +42,7 @@ func TestCanGetRouteNameFromContext(t *testing.T) {
 func TestOperationNameCanOnlyBeSetOnce(t *testing.T) {
 	req, _ := http.NewRequestWithContext(context.Background(), http.MethodPost, "https://grafana.com", nil)
 
-	// set the the initial operation name
+	// set the initial operation name
 	req = addRouteNameToContext(req, "first")
 
 	// check that the operation name is set correctly
diff --git a/pkg/modules/dependencies.go b/pkg/modules/dependencies.go
index c11c3cf6dd8bd..066a3f595b864 100644
--- a/pkg/modules/dependencies.go
+++ b/pkg/modules/dependencies.go
@@ -6,10 +6,12 @@ const (
 
 	Core             string = "core"
 	GrafanaAPIServer string = "grafana-apiserver"
+	StorageServer    string = "storage-server"
 )
 
 var dependencyMap = map[string][]string{
 	GrafanaAPIServer: {},
+	StorageServer:    {},
 	Core:             {},
 	All:              {Core},
 }
diff --git a/pkg/modules/modules.go b/pkg/modules/modules.go
index 9a302e5158179..c36cc395f78ea 100644
--- a/pkg/modules/modules.go
+++ b/pkg/modules/modules.go
@@ -3,6 +3,7 @@ package modules
 import (
 	"context"
 	"errors"
+	"strings"
 
 	"github.com/grafana/dskit/modules"
 	"github.com/grafana/dskit/services"
@@ -92,7 +93,7 @@ func (m *service) Run(ctx context.Context) error {
 	listener := newServiceListener(m.log, m)
 	m.serviceManager.AddListener(listener)
 
-	m.log.Debug("Starting module service manager")
+	m.log.Debug("Starting module service manager", "targets", strings.Join(m.targets, ","))
 	// wait until a service fails or stop signal was received
 	err = m.serviceManager.StartAsync(ctx)
 	if err != nil {
@@ -135,7 +136,7 @@ func (m *service) RegisterModule(name string, fn initFn) {
 }
 
 // RegisterInvisibleModule registers an invisible module with the dskit module manager.
-// Invisible modules are not visible to the user, and are intendent to be used as dependencies.
+// Invisible modules are not visible to the user, and are intended to be used as dependencies.
 func (m *service) RegisterInvisibleModule(name string, fn initFn) {
 	m.moduleManager.RegisterModule(name, fn, modules.UserInvisibleModule)
 }
diff --git a/pkg/plugins/apiserver.go b/pkg/plugins/apiserver.go
new file mode 100644
index 0000000000000..e72355beb9e40
--- /dev/null
+++ b/pkg/plugins/apiserver.go
@@ -0,0 +1,27 @@
+package plugins
+
+import (
+	"fmt"
+	"strings"
+)
+
+// Get the default API group name for from a plugin ID
+// NOTE: this is a work in progress, and may change without notice
+func GetDatasourceGroupNameFromPluginID(pluginId string) (string, error) {
+	if pluginId == "" {
+		return "", fmt.Errorf("bad pluginID (empty)")
+	}
+	parts := strings.Split(pluginId, "-")
+	if len(parts) == 1 {
+		return fmt.Sprintf("%s.datasource.grafana.app", parts[0]), nil
+	}
+
+	last := parts[len(parts)-1]
+	if last != "datasource" {
+		return "", fmt.Errorf("bad pluginID (%s)", pluginId)
+	}
+	if parts[0] == "grafana" {
+		parts = parts[1:] // strip the first value
+	}
+	return fmt.Sprintf("%s.datasource.grafana.app", strings.Join(parts[:len(parts)-1], "-")), nil
+}
diff --git a/pkg/plugins/apiserver_test.go b/pkg/plugins/apiserver_test.go
new file mode 100644
index 0000000000000..24d7102a40e43
--- /dev/null
+++ b/pkg/plugins/apiserver_test.go
@@ -0,0 +1,32 @@
+package plugins
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestUtils(t *testing.T) {
+	// multiple flavors of the same idea
+	require.Equal(t, "tempo.datasource.grafana.app", getIDIgnoreError("tempo"))
+	require.Equal(t, "tempo.datasource.grafana.app", getIDIgnoreError("grafana-tempo-datasource"))
+	require.Equal(t, "tempo.datasource.grafana.app", getIDIgnoreError("tempo-datasource"))
+
+	// Multiple dashes in the name
+	require.Equal(t, "org-name.datasource.grafana.app", getIDIgnoreError("org-name-datasource"))
+	require.Equal(t, "org-name-more.datasource.grafana.app", getIDIgnoreError("org-name-more-datasource"))
+	require.Equal(t, "org-name-more-more.datasource.grafana.app", getIDIgnoreError("org-name-more-more-datasource"))
+
+	require.Error(t, getErrorIgnoreValue("graph-panel"))
+	require.Error(t, getErrorIgnoreValue("anything-notdatasource"))
+}
+
+func getIDIgnoreError(id string) string {
+	v, _ := GetDatasourceGroupNameFromPluginID(id)
+	return v
+}
+
+func getErrorIgnoreValue(id string) error {
+	_, err := GetDatasourceGroupNameFromPluginID(id)
+	return err
+}
diff --git a/pkg/plugins/auth/models.go b/pkg/plugins/auth/models.go
index 8c0f902203a83..93b97f0394c3b 100644
--- a/pkg/plugins/auth/models.go
+++ b/pkg/plugins/auth/models.go
@@ -3,7 +3,7 @@ package auth
 import (
 	"context"
 
-	"github.com/grafana/grafana/pkg/plugins/plugindef"
+	"github.com/grafana/grafana/pkg/plugins/pfs"
 )
 
 type ExternalService struct {
@@ -13,5 +13,7 @@ type ExternalService struct {
 }
 
 type ExternalServiceRegistry interface {
-	RegisterExternalService(ctx context.Context, name string, svc *plugindef.ExternalServiceRegistration) (*ExternalService, error)
+	HasExternalService(ctx context.Context, pluginID string) (bool, error)
+	RegisterExternalService(ctx context.Context, pluginID string, pType pfs.Type, svc *pfs.IAM) (*ExternalService, error)
+	RemoveExternalService(ctx context.Context, pluginID string) error
 }
diff --git a/pkg/plugins/backendplugin/coreplugin/registry.go b/pkg/plugins/backendplugin/coreplugin/registry.go
index 933ee377c2d94..6bdc87331d3df 100644
--- a/pkg/plugins/backendplugin/coreplugin/registry.go
+++ b/pkg/plugins/backendplugin/coreplugin/registry.go
@@ -2,19 +2,25 @@ package coreplugin
 
 import (
 	"context"
+	"errors"
+	"fmt"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	sdklog "github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	sdktracing "github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
 
+	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin"
 	"github.com/grafana/grafana/pkg/plugins/log"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor"
 	cloudmonitoring "github.com/grafana/grafana/pkg/tsdb/cloud-monitoring"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch"
 	"github.com/grafana/grafana/pkg/tsdb/elasticsearch"
+	postgres "github.com/grafana/grafana/pkg/tsdb/grafana-postgresql-datasource"
 	pyroscope "github.com/grafana/grafana/pkg/tsdb/grafana-pyroscope-datasource"
 	testdatasource "github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource"
 	"github.com/grafana/grafana/pkg/tsdb/grafanads"
@@ -25,7 +31,6 @@ import (
 	"github.com/grafana/grafana/pkg/tsdb/mysql"
 	"github.com/grafana/grafana/pkg/tsdb/opentsdb"
 	"github.com/grafana/grafana/pkg/tsdb/parca"
-	"github.com/grafana/grafana/pkg/tsdb/postgres"
 	"github.com/grafana/grafana/pkg/tsdb/prometheus"
 	"github.com/grafana/grafana/pkg/tsdb/tempo"
 )
@@ -42,7 +47,8 @@ const (
 	Prometheus      = "prometheus"
 	Tempo           = "tempo"
 	TestData        = "grafana-testdata-datasource"
-	PostgreSQL      = "postgres"
+	TestDataAlias   = "testdata"
+	PostgreSQL      = "grafana-postgresql-datasource"
 	MySQL           = "mysql"
 	MSSQL           = "mssql"
 	Grafana         = "grafana"
@@ -182,3 +188,73 @@ func (l *logWrapper) FromContext(ctx context.Context) sdklog.Logger {
 		logger: l.logger.FromContext(ctx),
 	}
 }
+
+var ErrCorePluginNotFound = errors.New("core plugin not found")
+
+// NewPlugin factory for creating and initializing a single core plugin.
+// Note: cfg only needed for mssql connection pooling defaults.
+func NewPlugin(pluginID string, cfg *setting.Cfg, httpClientProvider *httpclient.Provider, tracer tracing.Tracer, features featuremgmt.FeatureToggles) (*plugins.Plugin, error) {
+	jsonData := plugins.JSONData{
+		ID:       pluginID,
+		AliasIDs: []string{},
+	}
+	var svc any
+
+	switch pluginID {
+	case TestData, TestDataAlias:
+		jsonData.ID = TestData
+		jsonData.AliasIDs = append(jsonData.AliasIDs, TestDataAlias)
+		svc = testdatasource.ProvideService()
+	case CloudWatch:
+		svc = cloudwatch.ProvideService(httpClientProvider).Executor
+	case CloudMonitoring:
+		svc = cloudmonitoring.ProvideService(httpClientProvider)
+	case AzureMonitor:
+		svc = azuremonitor.ProvideService(httpClientProvider)
+	case Elasticsearch:
+		svc = elasticsearch.ProvideService(httpClientProvider, tracer)
+	case Graphite:
+		svc = graphite.ProvideService(httpClientProvider, tracer)
+	case InfluxDB:
+		svc = influxdb.ProvideService(httpClientProvider, features)
+	case Loki:
+		svc = loki.ProvideService(httpClientProvider, features, tracer)
+	case OpenTSDB:
+		svc = opentsdb.ProvideService(httpClientProvider)
+	case Prometheus:
+		svc = prometheus.ProvideService(httpClientProvider)
+	case Tempo:
+		svc = tempo.ProvideService(httpClientProvider)
+	case PostgreSQL:
+		svc = postgres.ProvideService(cfg)
+	case MySQL:
+		svc = mysql.ProvideService()
+	case MSSQL:
+		svc = mssql.ProvideService(cfg)
+	case Pyroscope:
+		svc = pyroscope.ProvideService(httpClientProvider)
+	case Parca:
+		svc = parca.ProvideService(httpClientProvider)
+	default:
+		return nil, ErrCorePluginNotFound
+	}
+
+	p := plugins.Plugin{
+		JSONData: jsonData,
+		Class:    plugins.ClassCore,
+	}
+
+	p.SetLogger(log.New(fmt.Sprintf("plugin.%s", p.ID)))
+
+	backendFactory := asBackendPlugin(svc)
+	if backendFactory == nil {
+		return nil, ErrCorePluginNotFound
+	}
+	bp, err := backendFactory(p.ID, p.Logger(), nil)
+	if err != nil {
+		return nil, err
+	}
+	p.RegisterClient(bp)
+
+	return &p, nil
+}
diff --git a/pkg/plugins/backendplugin/coreplugin/registry_test.go b/pkg/plugins/backendplugin/coreplugin/registry_test.go
new file mode 100644
index 0000000000000..31460f92964fd
--- /dev/null
+++ b/pkg/plugins/backendplugin/coreplugin/registry_test.go
@@ -0,0 +1,63 @@
+package coreplugin
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/stretchr/testify/require"
+)
+
+func TestNewPlugin(t *testing.T) {
+	tcs := []struct {
+		ID                  string
+		ExpectedID          string
+		ExpectedAlias       string
+		ExpectedNotFoundErr bool
+	}{
+		{ID: AzureMonitor},
+		{ID: CloudMonitoring},
+		{ID: CloudWatch},
+		{ID: Elasticsearch},
+		{ID: Grafana, ExpectedNotFoundErr: true},
+		{ID: Graphite},
+		{ID: InfluxDB},
+		{ID: Loki},
+		{ID: MSSQL},
+		{ID: MySQL},
+		{ID: OpenTSDB},
+		{ID: Parca},
+		{ID: PostgreSQL},
+		{ID: Prometheus},
+		{ID: Pyroscope},
+		{ID: Tempo},
+		{ID: TestData, ExpectedAlias: TestDataAlias},
+		{ID: TestDataAlias, ExpectedID: TestData, ExpectedAlias: TestDataAlias},
+	}
+
+	for _, tc := range tcs {
+		t.Run(tc.ID, func(t *testing.T) {
+			if tc.ExpectedID == "" {
+				tc.ExpectedID = tc.ID
+			}
+
+			p, err := NewPlugin(tc.ID, setting.NewCfg(), httpclient.NewProvider(), tracing.InitializeTracerForTest(), featuremgmt.WithFeatures())
+			if tc.ExpectedNotFoundErr {
+				require.ErrorIs(t, err, ErrCorePluginNotFound)
+				require.Nil(t, p)
+			} else {
+				require.NoError(t, err)
+				require.NotNil(t, p)
+				require.Equal(t, tc.ExpectedID, p.ID)
+				if tc.ExpectedAlias != "" {
+					require.Equal(t, tc.ExpectedAlias, p.AliasIDs[0])
+				}
+				c, exists := p.Client()
+				require.True(t, exists)
+				require.NotNil(t, c)
+			}
+		})
+	}
+}
diff --git a/pkg/plugins/backendplugin/grpcplugin/client.go b/pkg/plugins/backendplugin/grpcplugin/client.go
index 013dd2d041920..eacd1611e2ba6 100644
--- a/pkg/plugins/backendplugin/grpcplugin/client.go
+++ b/pkg/plugins/backendplugin/grpcplugin/client.go
@@ -27,7 +27,19 @@ var handshake = goplugin.HandshakeConfig{
 	MagicCookieValue: grpcplugin.MagicCookieValue,
 }
 
-func newClientConfig(executablePath string, args []string, env []string, logger log.Logger,
+// pluginSet is list of plugins supported on v2.
+var pluginSet = map[int]goplugin.PluginSet{
+	grpcplugin.ProtocolVersion: {
+		"diagnostics":    &grpcplugin.DiagnosticsGRPCPlugin{},
+		"resource":       &grpcplugin.ResourceGRPCPlugin{},
+		"data":           &grpcplugin.DataGRPCPlugin{},
+		"stream":         &grpcplugin.StreamGRPCPlugin{},
+		"renderer":       &pluginextensionv2.RendererGRPCPlugin{},
+		"secretsmanager": &secretsmanagerplugin.SecretsManagerGRPCPlugin{},
+	},
+}
+
+func newClientConfig(executablePath string, args []string, env []string, skipHostEnvVars bool, logger log.Logger,
 	versionedPlugins map[int]goplugin.PluginSet) *goplugin.ClientConfig {
 	// We can ignore gosec G201 here, since the dynamic part of executablePath comes from the plugin definition
 	// nolint:gosec
@@ -38,17 +50,17 @@ func newClientConfig(executablePath string, args []string, env []string, logger
 		Cmd:              cmd,
 		HandshakeConfig:  handshake,
 		VersionedPlugins: versionedPlugins,
+		SkipHostEnv:      skipHostEnvVars,
 		Logger:           logWrapper{Logger: logger},
 		AllowedProtocols: []goplugin.Protocol{goplugin.ProtocolGRPC},
 		GRPCDialOptions: []grpc.DialOption{
 			grpc.WithChainUnaryInterceptor(
-				otelgrpc.UnaryClientInterceptor(),
 				grpc_opentracing.UnaryClientInterceptor(),
 			),
 			grpc.WithChainStreamInterceptor(
-				otelgrpc.StreamClientInterceptor(),
 				grpc_opentracing.StreamClientInterceptor(),
 			),
+			grpc.WithStatsHandler(otelgrpc.NewClientHandler()),
 		},
 	}
 }
@@ -64,69 +76,53 @@ type PluginDescriptor struct {
 	pluginID              string
 	executablePath        string
 	executableArgs        []string
+	skipHostEnvVars       bool
 	managed               bool
 	versionedPlugins      map[int]goplugin.PluginSet
 	startRendererFn       StartRendererFunc
 	startSecretsManagerFn StartSecretsManagerFunc
 }
 
-// getV2PluginSet returns list of plugins supported on v2.
-func getV2PluginSet() goplugin.PluginSet {
-	return goplugin.PluginSet{
-		"diagnostics":    &grpcplugin.DiagnosticsGRPCPlugin{},
-		"resource":       &grpcplugin.ResourceGRPCPlugin{},
-		"data":           &grpcplugin.DataGRPCPlugin{},
-		"stream":         &grpcplugin.StreamGRPCPlugin{},
-		"renderer":       &pluginextensionv2.RendererGRPCPlugin{},
-		"secretsmanager": &secretsmanagerplugin.SecretsManagerGRPCPlugin{},
-	}
-}
-
 // NewBackendPlugin creates a new backend plugin factory used for registering a backend plugin.
-func NewBackendPlugin(pluginID, executablePath string, executableArgs ...string) backendplugin.PluginFactoryFunc {
-	return newBackendPlugin(pluginID, executablePath, true, executableArgs...)
+func NewBackendPlugin(pluginID, executablePath string, skipHostEnvVars bool, executableArgs ...string) backendplugin.PluginFactoryFunc {
+	return newBackendPlugin(pluginID, executablePath, true, skipHostEnvVars, executableArgs...)
 }
 
 // NewUnmanagedBackendPlugin creates a new backend plugin factory used for registering an unmanaged backend plugin.
-func NewUnmanagedBackendPlugin(pluginID, executablePath string, executableArgs ...string) backendplugin.PluginFactoryFunc {
-	return newBackendPlugin(pluginID, executablePath, false, executableArgs...)
+func NewUnmanagedBackendPlugin(pluginID, executablePath string, skipHostEnvVars bool, executableArgs ...string) backendplugin.PluginFactoryFunc {
+	return newBackendPlugin(pluginID, executablePath, false, skipHostEnvVars, executableArgs...)
 }
 
 // NewBackendPlugin creates a new backend plugin factory used for registering a backend plugin.
-func newBackendPlugin(pluginID, executablePath string, managed bool, executableArgs ...string) backendplugin.PluginFactoryFunc {
+func newBackendPlugin(pluginID, executablePath string, managed bool, skipHostEnvVars bool, executableArgs ...string) backendplugin.PluginFactoryFunc {
 	return newPlugin(PluginDescriptor{
-		pluginID:       pluginID,
-		executablePath: executablePath,
-		executableArgs: executableArgs,
-		managed:        managed,
-		versionedPlugins: map[int]goplugin.PluginSet{
-			grpcplugin.ProtocolVersion: getV2PluginSet(),
-		},
+		pluginID:         pluginID,
+		executablePath:   executablePath,
+		executableArgs:   executableArgs,
+		skipHostEnvVars:  skipHostEnvVars,
+		managed:          managed,
+		versionedPlugins: pluginSet,
 	})
 }
 
 // NewRendererPlugin creates a new renderer plugin factory used for registering a backend renderer plugin.
 func NewRendererPlugin(pluginID, executablePath string, startFn StartRendererFunc) backendplugin.PluginFactoryFunc {
 	return newPlugin(PluginDescriptor{
-		pluginID:       pluginID,
-		executablePath: executablePath,
-		managed:        false,
-		versionedPlugins: map[int]goplugin.PluginSet{
-			grpcplugin.ProtocolVersion: getV2PluginSet(),
-		},
-		startRendererFn: startFn,
+		pluginID:         pluginID,
+		executablePath:   executablePath,
+		managed:          false,
+		versionedPlugins: pluginSet,
+		startRendererFn:  startFn,
 	})
 }
 
 // NewSecretsManagerPlugin creates a new secrets manager plugin factory used for registering a backend secrets manager plugin.
 func NewSecretsManagerPlugin(pluginID, executablePath string, startFn StartSecretsManagerFunc) backendplugin.PluginFactoryFunc {
 	return newPlugin(PluginDescriptor{
-		pluginID:       pluginID,
-		executablePath: executablePath,
-		managed:        false,
-		versionedPlugins: map[int]goplugin.PluginSet{
-			grpcplugin.ProtocolVersion: getV2PluginSet(),
-		},
+		pluginID:              pluginID,
+		executablePath:        executablePath,
+		managed:               false,
+		versionedPlugins:      pluginSet,
 		startSecretsManagerFn: startFn,
 	})
 }
diff --git a/pkg/plugins/backendplugin/grpcplugin/client_proto.go b/pkg/plugins/backendplugin/grpcplugin/client_proto.go
new file mode 100644
index 0000000000000..7226c9e09a729
--- /dev/null
+++ b/pkg/plugins/backendplugin/grpcplugin/client_proto.go
@@ -0,0 +1,174 @@
+package grpcplugin
+
+import (
+	"context"
+	"errors"
+	"sync"
+
+	"google.golang.org/grpc"
+
+	"github.com/grafana/grafana-plugin-sdk-go/genproto/pluginv2"
+
+	"github.com/grafana/grafana/pkg/plugins/log"
+)
+
+var (
+	errClientNotStarted = errors.New("plugin client has not been started")
+)
+
+var _ ProtoClient = (*protoClient)(nil)
+
+type ProtoClient interface {
+	pluginv2.DataClient
+	pluginv2.ResourceClient
+	pluginv2.DiagnosticsClient
+	pluginv2.StreamClient
+
+	PID(context.Context) (string, error)
+	PluginID() string
+	PluginVersion() string
+	Logger() log.Logger
+	Start(context.Context) error
+	Stop(context.Context) error
+	Running(context.Context) bool
+}
+
+type protoClient struct {
+	plugin        *grpcPlugin
+	pluginVersion string
+
+	mu sync.RWMutex
+}
+
+type ProtoClientOpts struct {
+	PluginID       string
+	PluginVersion  string
+	ExecutablePath string
+	ExecutableArgs []string
+	Env            []string
+	Logger         log.Logger
+}
+
+func NewProtoClient(opts ProtoClientOpts) (ProtoClient, error) {
+	p := newGrpcPlugin(
+		PluginDescriptor{
+			pluginID:         opts.PluginID,
+			managed:          true,
+			executablePath:   opts.ExecutablePath,
+			executableArgs:   opts.ExecutableArgs,
+			versionedPlugins: pluginSet,
+		},
+		opts.Logger,
+		func() []string { return opts.Env },
+	)
+
+	return &protoClient{plugin: p, pluginVersion: opts.PluginVersion}, nil
+}
+
+func (r *protoClient) PID(ctx context.Context) (string, error) {
+	if _, exists := r.client(ctx); !exists {
+		return "", errClientNotStarted
+	}
+	return r.plugin.client.ID(), nil
+}
+
+func (r *protoClient) PluginID() string {
+	return r.plugin.descriptor.pluginID
+}
+
+func (r *protoClient) PluginVersion() string {
+	return r.pluginVersion
+}
+
+func (r *protoClient) Logger() log.Logger {
+	return r.plugin.logger
+}
+
+func (r *protoClient) Start(ctx context.Context) error {
+	r.mu.Lock()
+	defer r.mu.Unlock()
+	return r.plugin.Start(ctx)
+}
+
+func (r *protoClient) Stop(ctx context.Context) error {
+	r.mu.Lock()
+	defer r.mu.Unlock()
+	return r.plugin.Stop(ctx)
+}
+
+func (r *protoClient) Running(_ context.Context) bool {
+	r.mu.RLock()
+	defer r.mu.RUnlock()
+	return !r.plugin.Exited()
+}
+
+func (r *protoClient) client(ctx context.Context) (*ClientV2, bool) {
+	if !r.Running(ctx) {
+		return nil, false
+	}
+
+	r.mu.RLock()
+	if r.plugin.pluginClient == nil {
+		r.mu.RUnlock()
+		return nil, false
+	}
+	pc := r.plugin.pluginClient
+	r.mu.RUnlock()
+	return pc, true
+}
+
+func (r *protoClient) QueryData(ctx context.Context, in *pluginv2.QueryDataRequest, opts ...grpc.CallOption) (*pluginv2.QueryDataResponse, error) {
+	c, exists := r.client(ctx)
+	if !exists {
+		return nil, errClientNotStarted
+	}
+	return c.DataClient.QueryData(ctx, in, opts...)
+}
+
+func (r *protoClient) CallResource(ctx context.Context, in *pluginv2.CallResourceRequest, opts ...grpc.CallOption) (pluginv2.Resource_CallResourceClient, error) {
+	c, exists := r.client(ctx)
+	if !exists {
+		return nil, errClientNotStarted
+	}
+	return c.ResourceClient.CallResource(ctx, in, opts...)
+}
+
+func (r *protoClient) CheckHealth(ctx context.Context, in *pluginv2.CheckHealthRequest, opts ...grpc.CallOption) (*pluginv2.CheckHealthResponse, error) {
+	c, exists := r.client(ctx)
+	if !exists {
+		return nil, errClientNotStarted
+	}
+	return c.DiagnosticsClient.CheckHealth(ctx, in, opts...)
+}
+
+func (r *protoClient) CollectMetrics(ctx context.Context, in *pluginv2.CollectMetricsRequest, opts ...grpc.CallOption) (*pluginv2.CollectMetricsResponse, error) {
+	c, exists := r.client(ctx)
+	if !exists {
+		return nil, errClientNotStarted
+	}
+	return c.DiagnosticsClient.CollectMetrics(ctx, in, opts...)
+}
+
+func (r *protoClient) SubscribeStream(ctx context.Context, in *pluginv2.SubscribeStreamRequest, opts ...grpc.CallOption) (*pluginv2.SubscribeStreamResponse, error) {
+	c, exists := r.client(ctx)
+	if !exists {
+		return nil, errClientNotStarted
+	}
+	return c.StreamClient.SubscribeStream(ctx, in, opts...)
+}
+
+func (r *protoClient) RunStream(ctx context.Context, in *pluginv2.RunStreamRequest, opts ...grpc.CallOption) (pluginv2.Stream_RunStreamClient, error) {
+	c, exists := r.client(ctx)
+	if !exists {
+		return nil, errClientNotStarted
+	}
+	return c.StreamClient.RunStream(ctx, in, opts...)
+}
+
+func (r *protoClient) PublishStream(ctx context.Context, in *pluginv2.PublishStreamRequest, opts ...grpc.CallOption) (*pluginv2.PublishStreamResponse, error) {
+	c, exists := r.client(ctx)
+	if !exists {
+		return nil, errClientNotStarted
+	}
+	return c.StreamClient.PublishStream(ctx, in, opts...)
+}
diff --git a/pkg/plugins/backendplugin/grpcplugin/client_v2.go b/pkg/plugins/backendplugin/grpcplugin/client_v2.go
index b6334e9d904ed..804fc78f25ea4 100644
--- a/pkg/plugins/backendplugin/grpcplugin/client_v2.go
+++ b/pkg/plugins/backendplugin/grpcplugin/client_v2.go
@@ -28,7 +28,7 @@ type ClientV2 struct {
 	secretsmanagerplugin.SecretsManagerPlugin
 }
 
-func newClientV2(descriptor PluginDescriptor, logger log.Logger, rpcClient plugin.ClientProtocol) (pluginClient, error) {
+func newClientV2(descriptor PluginDescriptor, logger log.Logger, rpcClient plugin.ClientProtocol) (*ClientV2, error) {
 	rawDiagnostics, err := rpcClient.Dispense("diagnostics")
 	if err != nil {
 		return nil, err
@@ -59,7 +59,7 @@ func newClientV2(descriptor PluginDescriptor, logger log.Logger, rpcClient plugi
 		return nil, err
 	}
 
-	c := ClientV2{}
+	c := &ClientV2{}
 	if rawDiagnostics != nil {
 		if diagnosticsClient, ok := rawDiagnostics.(grpcplugin.DiagnosticsClient); ok {
 			c.DiagnosticsClient = diagnosticsClient
@@ -108,7 +108,7 @@ func newClientV2(descriptor PluginDescriptor, logger log.Logger, rpcClient plugi
 		}
 	}
 
-	return &c, nil
+	return c, nil
 }
 
 func (c *ClientV2) CollectMetrics(ctx context.Context, req *backend.CollectMetricsRequest) (*backend.CollectMetricsResult, error) {
diff --git a/pkg/plugins/backendplugin/grpcplugin/grpc_plugin.go b/pkg/plugins/backendplugin/grpcplugin/grpc_plugin.go
index 4a6c452bf5265..b25d601b65f23 100644
--- a/pkg/plugins/backendplugin/grpcplugin/grpc_plugin.go
+++ b/pkg/plugins/backendplugin/grpcplugin/grpc_plugin.go
@@ -26,7 +26,7 @@ type grpcPlugin struct {
 	descriptor     PluginDescriptor
 	clientFactory  func() *plugin.Client
 	client         *plugin.Client
-	pluginClient   pluginClient
+	pluginClient   *ClientV2
 	logger         log.Logger
 	mutex          sync.RWMutex
 	decommissioned bool
@@ -35,13 +35,17 @@ type grpcPlugin struct {
 // newPlugin allocates and returns a new gRPC (external) backendplugin.Plugin.
 func newPlugin(descriptor PluginDescriptor) backendplugin.PluginFactoryFunc {
 	return func(pluginID string, logger log.Logger, env func() []string) (backendplugin.Plugin, error) {
-		return &grpcPlugin{
-			descriptor: descriptor,
-			logger:     logger,
-			clientFactory: func() *plugin.Client {
-				return plugin.NewClient(newClientConfig(descriptor.executablePath, descriptor.executableArgs, env(), logger, descriptor.versionedPlugins))
-			},
-		}, nil
+		return newGrpcPlugin(descriptor, logger, env), nil
+	}
+}
+
+func newGrpcPlugin(descriptor PluginDescriptor, logger log.Logger, env func() []string) *grpcPlugin {
+	return &grpcPlugin{
+		descriptor: descriptor,
+		logger:     logger,
+		clientFactory: func() *plugin.Client {
+			return plugin.NewClient(newClientConfig(descriptor.executablePath, descriptor.executableArgs, env(), descriptor.skipHostEnvVars, logger, descriptor.versionedPlugins))
+		},
 	}
 }
 
diff --git a/pkg/plugins/backendplugin/pluginextensionv2/generate.sh b/pkg/plugins/backendplugin/pluginextensionv2/generate.sh
index c7e2379cf7994..063b2f3f64bb9 100755
--- a/pkg/plugins/backendplugin/pluginextensionv2/generate.sh
+++ b/pkg/plugins/backendplugin/pluginextensionv2/generate.sh
@@ -13,4 +13,4 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 cd "$DIR"
 
-protoc -I ./ *.proto --go_out=plugins=grpc:./
+protoc -I ./ *.proto --go_out=. --go-grpc_out=.
diff --git a/pkg/plugins/backendplugin/pluginextensionv2/rendererv2.pb.go b/pkg/plugins/backendplugin/pluginextensionv2/rendererv2.pb.go
index b2e563a112dd0..4f235a4f61dbb 100644
--- a/pkg/plugins/backendplugin/pluginextensionv2/rendererv2.pb.go
+++ b/pkg/plugins/backendplugin/pluginextensionv2/rendererv2.pb.go
@@ -1,16 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        v4.23.4
+// 	protoc-gen-go v1.32.0
+// 	protoc        v4.25.2
 // source: rendererv2.proto
 
 package pluginextensionv2
 
 import (
-	context "context"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
@@ -87,6 +83,7 @@ type RenderRequest struct {
 	Timezone          string                 `protobuf:"bytes,9,opt,name=timezone,proto3" json:"timezone,omitempty"`
 	Headers           map[string]*StringList `protobuf:"bytes,10,rep,name=headers,proto3" json:"headers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	AuthToken         string                 `protobuf:"bytes,11,opt,name=authToken,proto3" json:"authToken,omitempty"`
+	Encoding          string                 `protobuf:"bytes,12,opt,name=encoding,proto3" json:"encoding,omitempty"`
 }
 
 func (x *RenderRequest) Reset() {
@@ -198,6 +195,13 @@ func (x *RenderRequest) GetAuthToken() string {
 	return ""
 }
 
+func (x *RenderRequest) GetEncoding() string {
+	if x != nil {
+		return x.Encoding
+	}
+	return ""
+}
+
 type RenderResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -410,7 +414,7 @@ var file_rendererv2_proto_rawDesc = []byte{
 	0x74, 0x6f, 0x12, 0x11, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
 	0x69, 0x6f, 0x6e, 0x76, 0x32, 0x22, 0x24, 0x0a, 0x0a, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4c,
 	0x69, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x01, 0x20,
-	0x03, 0x28, 0x09, 0x52, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x22, 0xc7, 0x03, 0x0a, 0x0d,
+	0x03, 0x28, 0x09, 0x52, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x22, 0xe3, 0x03, 0x0a, 0x0d,
 	0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a,
 	0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12,
 	0x14, 0x0a, 0x05, 0x77, 0x69, 0x64, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
@@ -433,56 +437,58 @@ var file_rendererv2_proto_rawDesc = []byte{
 	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x45, 0x6e,
 	0x74, 0x72, 0x79, 0x52, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x1c, 0x0a, 0x09,
 	0x61, 0x75, 0x74, 0x68, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x09, 0x61, 0x75, 0x74, 0x68, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x1a, 0x59, 0x0a, 0x0c, 0x48, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
-	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x33, 0x0a, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x70, 0x6c,
-	0x75, 0x67, 0x69, 0x6e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x76, 0x32, 0x2e,
-	0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x26, 0x0a, 0x0e, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, 0xf1, 0x02,
-	0x0a, 0x10, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x53, 0x56, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x75, 0x72, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x50, 0x61, 0x74, 0x68,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x50, 0x61, 0x74, 0x68,
-	0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x12, 0x16,
-	0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
-	0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75,
-	0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74,
-	0x12, 0x1a, 0x0a, 0x08, 0x74, 0x69, 0x6d, 0x65, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x06, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x08, 0x74, 0x69, 0x6d, 0x65, 0x7a, 0x6f, 0x6e, 0x65, 0x12, 0x4a, 0x0a, 0x07,
-	0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e,
-	0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x76,
-	0x32, 0x2e, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x53, 0x56, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
-	0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x75, 0x74, 0x68,
-	0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x75, 0x74,
-	0x68, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x1a, 0x59, 0x0a, 0x0c, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x09, 0x61, 0x75, 0x74, 0x68, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x6e,
+	0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x6e,
+	0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x1a, 0x59, 0x0a, 0x0c, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
 	0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x33, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
 	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e,
 	0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x76, 0x32, 0x2e, 0x53, 0x74, 0x72, 0x69,
 	0x6e, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
-	0x01, 0x22, 0x45, 0x0a, 0x11, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x53, 0x56, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x1a, 0x0a, 0x08,
-	0x66, 0x69, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
-	0x66, 0x69, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x32, 0xb1, 0x01, 0x0a, 0x08, 0x52, 0x65, 0x6e,
-	0x64, 0x65, 0x72, 0x65, 0x72, 0x12, 0x4d, 0x0a, 0x06, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12,
-	0x20, 0x2e, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x76, 0x32, 0x2e, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x21, 0x2e, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x76, 0x32, 0x2e, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x56, 0x0a, 0x09, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x53,
-	0x56, 0x12, 0x23, 0x2e, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x76, 0x32, 0x2e, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x53, 0x56, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x65,
-	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x76, 0x32, 0x2e, 0x52, 0x65, 0x6e, 0x64, 0x65,
-	0x72, 0x43, 0x53, 0x56, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x16, 0x5a, 0x14,
-	0x2e, 0x2f, 0x3b, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
-	0x6f, 0x6e, 0x76, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x01, 0x22, 0x26, 0x0a, 0x0e, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, 0xf1, 0x02, 0x0a, 0x10, 0x52, 0x65,
+	0x6e, 0x64, 0x65, 0x72, 0x43, 0x53, 0x56, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10,
+	0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c,
+	0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x50, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x1c, 0x0a, 0x09,
+	0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x09, 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f,
+	0x6d, 0x61, 0x69, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61,
+	0x69, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x1a, 0x0a, 0x08,
+	0x74, 0x69, 0x6d, 0x65, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+	0x74, 0x69, 0x6d, 0x65, 0x7a, 0x6f, 0x6e, 0x65, 0x12, 0x4a, 0x0a, 0x07, 0x68, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x70, 0x6c, 0x75, 0x67,
+	0x69, 0x6e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x76, 0x32, 0x2e, 0x52, 0x65,
+	0x6e, 0x64, 0x65, 0x72, 0x43, 0x53, 0x56, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x48,
+	0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x68, 0x65, 0x61,
+	0x64, 0x65, 0x72, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x54, 0x6f, 0x6b, 0x65,
+	0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x75, 0x74, 0x68, 0x54, 0x6f, 0x6b,
+	0x65, 0x6e, 0x1a, 0x59, 0x0a, 0x0c, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74,
+	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x03, 0x6b, 0x65, 0x79, 0x12, 0x33, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x65, 0x78, 0x74, 0x65,
+	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x76, 0x32, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4c, 0x69,
+	0x73, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x45, 0x0a,
+	0x11, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x53, 0x56, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x6c, 0x65,
+	0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x69, 0x6c, 0x65,
+	0x4e, 0x61, 0x6d, 0x65, 0x32, 0xb1, 0x01, 0x0a, 0x08, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65,
+	0x72, 0x12, 0x4d, 0x0a, 0x06, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x20, 0x2e, 0x70, 0x6c,
+	0x75, 0x67, 0x69, 0x6e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x76, 0x32, 0x2e,
+	0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e,
+	0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x76,
+	0x32, 0x2e, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x12, 0x56, 0x0a, 0x09, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x53, 0x56, 0x12, 0x23, 0x2e,
+	0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x76,
+	0x32, 0x2e, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x53, 0x56, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x1a, 0x24, 0x2e, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x65, 0x78, 0x74, 0x65, 0x6e,
+	0x73, 0x69, 0x6f, 0x6e, 0x76, 0x32, 0x2e, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x53, 0x56,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x16, 0x5a, 0x14, 0x2e, 0x2f, 0x3b, 0x70,
+	0x6c, 0x75, 0x67, 0x69, 0x6e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x76, 0x32,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -609,119 +615,3 @@ func file_rendererv2_proto_init() {
 	file_rendererv2_proto_goTypes = nil
 	file_rendererv2_proto_depIdxs = nil
 }
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConnInterface
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion6
-
-// RendererClient is the client API for Renderer service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
-type RendererClient interface {
-	Render(ctx context.Context, in *RenderRequest, opts ...grpc.CallOption) (*RenderResponse, error)
-	RenderCSV(ctx context.Context, in *RenderCSVRequest, opts ...grpc.CallOption) (*RenderCSVResponse, error)
-}
-
-type rendererClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewRendererClient(cc grpc.ClientConnInterface) RendererClient {
-	return &rendererClient{cc}
-}
-
-func (c *rendererClient) Render(ctx context.Context, in *RenderRequest, opts ...grpc.CallOption) (*RenderResponse, error) {
-	out := new(RenderResponse)
-	err := c.cc.Invoke(ctx, "/pluginextensionv2.Renderer/Render", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *rendererClient) RenderCSV(ctx context.Context, in *RenderCSVRequest, opts ...grpc.CallOption) (*RenderCSVResponse, error) {
-	out := new(RenderCSVResponse)
-	err := c.cc.Invoke(ctx, "/pluginextensionv2.Renderer/RenderCSV", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// RendererServer is the server API for Renderer service.
-type RendererServer interface {
-	Render(context.Context, *RenderRequest) (*RenderResponse, error)
-	RenderCSV(context.Context, *RenderCSVRequest) (*RenderCSVResponse, error)
-}
-
-// UnimplementedRendererServer can be embedded to have forward compatible implementations.
-type UnimplementedRendererServer struct {
-}
-
-func (*UnimplementedRendererServer) Render(context.Context, *RenderRequest) (*RenderResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Render not implemented")
-}
-func (*UnimplementedRendererServer) RenderCSV(context.Context, *RenderCSVRequest) (*RenderCSVResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RenderCSV not implemented")
-}
-
-func RegisterRendererServer(s *grpc.Server, srv RendererServer) {
-	s.RegisterService(&_Renderer_serviceDesc, srv)
-}
-
-func _Renderer_Render_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(RenderRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(RendererServer).Render(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/pluginextensionv2.Renderer/Render",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(RendererServer).Render(ctx, req.(*RenderRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Renderer_RenderCSV_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(RenderCSVRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(RendererServer).RenderCSV(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/pluginextensionv2.Renderer/RenderCSV",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(RendererServer).RenderCSV(ctx, req.(*RenderCSVRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _Renderer_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "pluginextensionv2.Renderer",
-	HandlerType: (*RendererServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "Render",
-			Handler:    _Renderer_Render_Handler,
-		},
-		{
-			MethodName: "RenderCSV",
-			Handler:    _Renderer_RenderCSV_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "rendererv2.proto",
-}
diff --git a/pkg/plugins/backendplugin/pluginextensionv2/rendererv2.proto b/pkg/plugins/backendplugin/pluginextensionv2/rendererv2.proto
index 77a1fdce8a036..0d7a0f91ebfff 100644
--- a/pkg/plugins/backendplugin/pluginextensionv2/rendererv2.proto
+++ b/pkg/plugins/backendplugin/pluginextensionv2/rendererv2.proto
@@ -19,6 +19,7 @@ message RenderRequest {
   string timezone = 9;
   map<string, StringList> headers = 10;
   string authToken = 11;
+  string encoding = 12;
 }
 
 message RenderResponse {
diff --git a/pkg/plugins/backendplugin/pluginextensionv2/rendererv2_grpc.pb.go b/pkg/plugins/backendplugin/pluginextensionv2/rendererv2_grpc.pb.go
new file mode 100644
index 0000000000000..7625f9655e2ee
--- /dev/null
+++ b/pkg/plugins/backendplugin/pluginextensionv2/rendererv2_grpc.pb.go
@@ -0,0 +1,146 @@
+// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
+// versions:
+// - protoc-gen-go-grpc v1.3.0
+// - protoc             v4.25.2
+// source: rendererv2.proto
+
+package pluginextensionv2
+
+import (
+	context "context"
+	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
+)
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+// Requires gRPC-Go v1.32.0 or later.
+const _ = grpc.SupportPackageIsVersion7
+
+const (
+	Renderer_Render_FullMethodName    = "/pluginextensionv2.Renderer/Render"
+	Renderer_RenderCSV_FullMethodName = "/pluginextensionv2.Renderer/RenderCSV"
+)
+
+// RendererClient is the client API for Renderer service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
+type RendererClient interface {
+	Render(ctx context.Context, in *RenderRequest, opts ...grpc.CallOption) (*RenderResponse, error)
+	RenderCSV(ctx context.Context, in *RenderCSVRequest, opts ...grpc.CallOption) (*RenderCSVResponse, error)
+}
+
+type rendererClient struct {
+	cc grpc.ClientConnInterface
+}
+
+func NewRendererClient(cc grpc.ClientConnInterface) RendererClient {
+	return &rendererClient{cc}
+}
+
+func (c *rendererClient) Render(ctx context.Context, in *RenderRequest, opts ...grpc.CallOption) (*RenderResponse, error) {
+	out := new(RenderResponse)
+	err := c.cc.Invoke(ctx, Renderer_Render_FullMethodName, in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *rendererClient) RenderCSV(ctx context.Context, in *RenderCSVRequest, opts ...grpc.CallOption) (*RenderCSVResponse, error) {
+	out := new(RenderCSVResponse)
+	err := c.cc.Invoke(ctx, Renderer_RenderCSV_FullMethodName, in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// RendererServer is the server API for Renderer service.
+// All implementations must embed UnimplementedRendererServer
+// for forward compatibility
+type RendererServer interface {
+	Render(context.Context, *RenderRequest) (*RenderResponse, error)
+	RenderCSV(context.Context, *RenderCSVRequest) (*RenderCSVResponse, error)
+	mustEmbedUnimplementedRendererServer()
+}
+
+// UnimplementedRendererServer must be embedded to have forward compatible implementations.
+type UnimplementedRendererServer struct {
+}
+
+func (UnimplementedRendererServer) Render(context.Context, *RenderRequest) (*RenderResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Render not implemented")
+}
+func (UnimplementedRendererServer) RenderCSV(context.Context, *RenderCSVRequest) (*RenderCSVResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method RenderCSV not implemented")
+}
+func (UnimplementedRendererServer) mustEmbedUnimplementedRendererServer() {}
+
+// UnsafeRendererServer may be embedded to opt out of forward compatibility for this service.
+// Use of this interface is not recommended, as added methods to RendererServer will
+// result in compilation errors.
+type UnsafeRendererServer interface {
+	mustEmbedUnimplementedRendererServer()
+}
+
+func RegisterRendererServer(s grpc.ServiceRegistrar, srv RendererServer) {
+	s.RegisterService(&Renderer_ServiceDesc, srv)
+}
+
+func _Renderer_Render_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(RenderRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(RendererServer).Render(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: Renderer_Render_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(RendererServer).Render(ctx, req.(*RenderRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Renderer_RenderCSV_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(RenderCSVRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(RendererServer).RenderCSV(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: Renderer_RenderCSV_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(RendererServer).RenderCSV(ctx, req.(*RenderCSVRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+// Renderer_ServiceDesc is the grpc.ServiceDesc for Renderer service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var Renderer_ServiceDesc = grpc.ServiceDesc{
+	ServiceName: "pluginextensionv2.Renderer",
+	HandlerType: (*RendererServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "Render",
+			Handler:    _Renderer_Render_Handler,
+		},
+		{
+			MethodName: "RenderCSV",
+			Handler:    _Renderer_RenderCSV_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "rendererv2.proto",
+}
diff --git a/pkg/plugins/backendplugin/pluginextensionv2/sanitizer.pb.go b/pkg/plugins/backendplugin/pluginextensionv2/sanitizer.pb.go
index 8fceddd418910..a420647a68788 100644
--- a/pkg/plugins/backendplugin/pluginextensionv2/sanitizer.pb.go
+++ b/pkg/plugins/backendplugin/pluginextensionv2/sanitizer.pb.go
@@ -1,16 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        v4.23.4
+// 	protoc-gen-go v1.32.0
+// 	protoc        v4.25.2
 // source: sanitizer.proto
 
 package pluginextensionv2
 
 import (
-	context "context"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
@@ -255,83 +251,3 @@ func file_sanitizer_proto_init() {
 	file_sanitizer_proto_goTypes = nil
 	file_sanitizer_proto_depIdxs = nil
 }
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConnInterface
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion6
-
-// SanitizerClient is the client API for Sanitizer service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
-type SanitizerClient interface {
-	Sanitize(ctx context.Context, in *SanitizeRequest, opts ...grpc.CallOption) (*SanitizeResponse, error)
-}
-
-type sanitizerClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewSanitizerClient(cc grpc.ClientConnInterface) SanitizerClient {
-	return &sanitizerClient{cc}
-}
-
-func (c *sanitizerClient) Sanitize(ctx context.Context, in *SanitizeRequest, opts ...grpc.CallOption) (*SanitizeResponse, error) {
-	out := new(SanitizeResponse)
-	err := c.cc.Invoke(ctx, "/pluginextensionv2.Sanitizer/Sanitize", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// SanitizerServer is the server API for Sanitizer service.
-type SanitizerServer interface {
-	Sanitize(context.Context, *SanitizeRequest) (*SanitizeResponse, error)
-}
-
-// UnimplementedSanitizerServer can be embedded to have forward compatible implementations.
-type UnimplementedSanitizerServer struct {
-}
-
-func (*UnimplementedSanitizerServer) Sanitize(context.Context, *SanitizeRequest) (*SanitizeResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Sanitize not implemented")
-}
-
-func RegisterSanitizerServer(s *grpc.Server, srv SanitizerServer) {
-	s.RegisterService(&_Sanitizer_serviceDesc, srv)
-}
-
-func _Sanitizer_Sanitize_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SanitizeRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(SanitizerServer).Sanitize(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/pluginextensionv2.Sanitizer/Sanitize",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SanitizerServer).Sanitize(ctx, req.(*SanitizeRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _Sanitizer_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "pluginextensionv2.Sanitizer",
-	HandlerType: (*SanitizerServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "Sanitize",
-			Handler:    _Sanitizer_Sanitize_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "sanitizer.proto",
-}
diff --git a/pkg/plugins/backendplugin/pluginextensionv2/sanitizer_grpc.pb.go b/pkg/plugins/backendplugin/pluginextensionv2/sanitizer_grpc.pb.go
new file mode 100644
index 0000000000000..80a3f117df3dc
--- /dev/null
+++ b/pkg/plugins/backendplugin/pluginextensionv2/sanitizer_grpc.pb.go
@@ -0,0 +1,109 @@
+// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
+// versions:
+// - protoc-gen-go-grpc v1.3.0
+// - protoc             v4.25.2
+// source: sanitizer.proto
+
+package pluginextensionv2
+
+import (
+	context "context"
+	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
+)
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+// Requires gRPC-Go v1.32.0 or later.
+const _ = grpc.SupportPackageIsVersion7
+
+const (
+	Sanitizer_Sanitize_FullMethodName = "/pluginextensionv2.Sanitizer/Sanitize"
+)
+
+// SanitizerClient is the client API for Sanitizer service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
+type SanitizerClient interface {
+	Sanitize(ctx context.Context, in *SanitizeRequest, opts ...grpc.CallOption) (*SanitizeResponse, error)
+}
+
+type sanitizerClient struct {
+	cc grpc.ClientConnInterface
+}
+
+func NewSanitizerClient(cc grpc.ClientConnInterface) SanitizerClient {
+	return &sanitizerClient{cc}
+}
+
+func (c *sanitizerClient) Sanitize(ctx context.Context, in *SanitizeRequest, opts ...grpc.CallOption) (*SanitizeResponse, error) {
+	out := new(SanitizeResponse)
+	err := c.cc.Invoke(ctx, Sanitizer_Sanitize_FullMethodName, in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// SanitizerServer is the server API for Sanitizer service.
+// All implementations must embed UnimplementedSanitizerServer
+// for forward compatibility
+type SanitizerServer interface {
+	Sanitize(context.Context, *SanitizeRequest) (*SanitizeResponse, error)
+	mustEmbedUnimplementedSanitizerServer()
+}
+
+// UnimplementedSanitizerServer must be embedded to have forward compatible implementations.
+type UnimplementedSanitizerServer struct {
+}
+
+func (UnimplementedSanitizerServer) Sanitize(context.Context, *SanitizeRequest) (*SanitizeResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Sanitize not implemented")
+}
+func (UnimplementedSanitizerServer) mustEmbedUnimplementedSanitizerServer() {}
+
+// UnsafeSanitizerServer may be embedded to opt out of forward compatibility for this service.
+// Use of this interface is not recommended, as added methods to SanitizerServer will
+// result in compilation errors.
+type UnsafeSanitizerServer interface {
+	mustEmbedUnimplementedSanitizerServer()
+}
+
+func RegisterSanitizerServer(s grpc.ServiceRegistrar, srv SanitizerServer) {
+	s.RegisterService(&Sanitizer_ServiceDesc, srv)
+}
+
+func _Sanitizer_Sanitize_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SanitizeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(SanitizerServer).Sanitize(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: Sanitizer_Sanitize_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(SanitizerServer).Sanitize(ctx, req.(*SanitizeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+// Sanitizer_ServiceDesc is the grpc.ServiceDesc for Sanitizer service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var Sanitizer_ServiceDesc = grpc.ServiceDesc{
+	ServiceName: "pluginextensionv2.Sanitizer",
+	HandlerType: (*SanitizerServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "Sanitize",
+			Handler:    _Sanitizer_Sanitize_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "sanitizer.proto",
+}
diff --git a/pkg/plugins/backendplugin/provider/provider.go b/pkg/plugins/backendplugin/provider/provider.go
index 6afc432886141..685c06a2df419 100644
--- a/pkg/plugins/backendplugin/provider/provider.go
+++ b/pkg/plugins/backendplugin/provider/provider.go
@@ -21,7 +21,7 @@ type Service struct {
 
 func New(providers ...PluginBackendProvider) *Service {
 	if len(providers) == 0 {
-		return New(RendererProvider, SecretsManagerProvider, DefaultProvider)
+		return New(SecretsManagerProvider, DefaultProvider)
 	}
 	return &Service{
 		providerChain: providers,
@@ -29,7 +29,7 @@ func New(providers ...PluginBackendProvider) *Service {
 }
 
 func ProvideService(coreRegistry *coreplugin.Registry) *Service {
-	return New(coreRegistry.BackendFactoryProvider(), RendererProvider, SecretsManagerProvider, DefaultProvider)
+	return New(coreRegistry.BackendFactoryProvider(), SecretsManagerProvider, DefaultProvider)
 }
 
 func (s *Service) BackendFactory(ctx context.Context, p *plugins.Plugin) backendplugin.PluginFactoryFunc {
@@ -65,6 +65,6 @@ var SecretsManagerProvider PluginBackendProvider = func(_ context.Context, p *pl
 	)
 }
 
-var DefaultProvider PluginBackendProvider = func(_ context.Context, p *plugins.Plugin) backendplugin.PluginFactoryFunc {
-	return grpcplugin.NewBackendPlugin(p.ID, p.ExecutablePath())
-}
+var DefaultProvider = PluginBackendProvider(func(_ context.Context, p *plugins.Plugin) backendplugin.PluginFactoryFunc {
+	return grpcplugin.NewBackendPlugin(p.ID, p.ExecutablePath(), p.SkipHostEnvVars)
+})
diff --git a/pkg/plugins/backendplugin/secretsmanagerplugin/secretsmanager.pb.go b/pkg/plugins/backendplugin/secretsmanagerplugin/secretsmanager.pb.go
index 79834373e010c..777de3c42f24f 100644
--- a/pkg/plugins/backendplugin/secretsmanagerplugin/secretsmanager.pb.go
+++ b/pkg/plugins/backendplugin/secretsmanagerplugin/secretsmanager.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        v4.23.4
+// 	protoc-gen-go v1.32.0
+// 	protoc        v4.25.2
 // source: secretsmanager.proto
 
 package secretsmanagerplugin
diff --git a/pkg/plugins/backendplugin/secretsmanagerplugin/secretsmanager_grpc.pb.go b/pkg/plugins/backendplugin/secretsmanagerplugin/secretsmanager_grpc.pb.go
index 466b8f9b6a0ee..264020b216e8a 100644
--- a/pkg/plugins/backendplugin/secretsmanagerplugin/secretsmanager_grpc.pb.go
+++ b/pkg/plugins/backendplugin/secretsmanagerplugin/secretsmanager_grpc.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.3.0
-// - protoc             v4.23.4
+// - protoc             v4.25.2
 // source: secretsmanager.proto
 
 package secretsmanagerplugin
diff --git a/pkg/plugins/codegen/jenny_plugin_registry.go b/pkg/plugins/codegen/jenny_plugin_registry.go
new file mode 100644
index 0000000000000..ecd2712aa6e0f
--- /dev/null
+++ b/pkg/plugins/codegen/jenny_plugin_registry.go
@@ -0,0 +1,76 @@
+package codegen
+
+import (
+	"bytes"
+	"fmt"
+	"go/format"
+	"path/filepath"
+	"strings"
+
+	"github.com/grafana/codejen"
+	"github.com/grafana/grafana/pkg/plugins/pfs"
+)
+
+var registryPath = filepath.Join("pkg", "registry", "schemas")
+
+var renamedPlugins = map[string]string{
+	"cloud-monitoring":             "googlecloudmonitoring",
+	"grafana-pyroscope-datasource": "grafanapyroscope",
+	"annolist":                     "annotationslist",
+	"grafanatestdatadatasource":    "testdata",
+	"dashlist":                     "dashboardlist",
+}
+
+type PluginRegistryJenny struct {
+}
+
+func (jenny *PluginRegistryJenny) JennyName() string {
+	return "PluginRegistryJenny"
+}
+
+func (jenny *PluginRegistryJenny) Generate(decls ...*pfs.PluginDecl) (*codejen.File, error) {
+	if len(decls) == 0 {
+		return nil, nil
+	}
+	schemas := make([]Schema, len(decls))
+	for i, decl := range decls {
+		variant := fmt.Sprintf("%s.cue", strings.ToLower(decl.SchemaInterface.Name))
+		name, err := getSchemaName(decl.PluginPath)
+		if err != nil {
+			return nil, fmt.Errorf("unable to find schema name: %s", err)
+		}
+
+		schemas[i] = Schema{
+			Name:     name,
+			Filename: variant,
+			FilePath: "./" + filepath.Join("public", "app", "plugins", decl.PluginPath, variant),
+		}
+	}
+
+	buf := new(bytes.Buffer)
+	if err := tmpls.Lookup("composable_registry.tmpl").Execute(buf, tmpl_vars_plugin_registry{
+		Schemas: schemas,
+	}); err != nil {
+		return nil, fmt.Errorf("failed executing kind registry template: %w", err)
+	}
+
+	b, err := format.Source(buf.Bytes())
+	if err != nil {
+		return nil, err
+	}
+
+	return codejen.NewFile(filepath.Join(registryPath, "composable_kind.go"), b, jenny), nil
+}
+
+func getSchemaName(path string) (string, error) {
+	parts := strings.Split(path, "/")
+	if len(parts) < 2 {
+		return "", fmt.Errorf("path should contain more than 2 elements")
+	}
+	folderName := parts[len(parts)-1]
+	if renamed, ok := renamedPlugins[folderName]; ok {
+		folderName = renamed
+	}
+	folderName = strings.ReplaceAll(folderName, "-", "")
+	return strings.ToLower(folderName), nil
+}
diff --git a/pkg/plugins/codegen/jenny_plugingotypes.go b/pkg/plugins/codegen/jenny_plugingotypes.go
index 9547e2d09f043..5d756637e1628 100644
--- a/pkg/plugins/codegen/jenny_plugingotypes.go
+++ b/pkg/plugins/codegen/jenny_plugingotypes.go
@@ -6,12 +6,9 @@ import (
 	"strings"
 
 	copenapi "cuelang.org/go/encoding/openapi"
-	"github.com/dave/dst/dstutil"
 	"github.com/grafana/codejen"
-	corecodegen "github.com/grafana/grafana/pkg/codegen"
+	"github.com/grafana/grafana/pkg/codegen/generators"
 	"github.com/grafana/grafana/pkg/plugins/pfs"
-	"github.com/grafana/thema/encoding/gocode"
-	"github.com/grafana/thema/encoding/openapi"
 )
 
 // TODO this is duplicative of other Go type jennies. Remove it in favor of a better-abstracted version in thema itself
@@ -30,22 +27,22 @@ func (j *pgoJenny) JennyName() string {
 }
 
 func (j *pgoJenny) Generate(decl *pfs.PluginDecl) (*codejen.File, error) {
-	b := decl.PluginMeta.Backend
-	if b == nil || !*b || !decl.HasSchema() {
+	hasBackend := decl.PluginMeta.Backend
+	// We skip elasticsearch since we have problems with the generated file.
+	// This is temporal until we migrate to the new system.
+	if hasBackend == nil || !*hasBackend || decl.PluginMeta.Id == "elasticsearch" {
 		return nil, nil
 	}
 
-	slotname := strings.ToLower(decl.SchemaInterface.Name())
-	byt, err := gocode.GenerateTypesOpenAPI(decl.Lineage.Latest(), &gocode.TypeConfigOpenAPI{
-		Config: &openapi.Config{
-			Group: decl.SchemaInterface.IsGroup(),
+	slotname := strings.ToLower(decl.SchemaInterface.Name)
+	byt, err := generators.GenerateTypesGo(decl.CueFile, &generators.GoConfig{
+		Config: &generators.OpenApiConfig{
 			Config: &copenapi.Config{
 				MaxCycleDepth: 10,
 			},
-			SplitSchema: true,
+			IsGroup: decl.SchemaInterface.IsGroup,
 		},
 		PackageName: slotname,
-		ApplyFuncs:  []dstutil.ApplyFunc{corecodegen.PrefixDropper(decl.Lineage.Name())},
 	})
 	if err != nil {
 		return nil, err
diff --git a/pkg/plugins/codegen/jenny_pluginseachmajor.go b/pkg/plugins/codegen/jenny_pluginseachmajor.go
deleted file mode 100644
index 6d3e6d268219d..0000000000000
--- a/pkg/plugins/codegen/jenny_pluginseachmajor.go
+++ /dev/null
@@ -1,101 +0,0 @@
-package codegen
-
-import (
-	"fmt"
-	"os"
-	"path"
-	"path/filepath"
-
-	"github.com/grafana/codejen"
-	tsast "github.com/grafana/cuetsy/ts/ast"
-	"github.com/grafana/grafana/pkg/build"
-	corecodegen "github.com/grafana/grafana/pkg/codegen"
-	"github.com/grafana/grafana/pkg/cuectx"
-	"github.com/grafana/grafana/pkg/plugins/pfs"
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema"
-)
-
-func PluginTSEachMajor(rt *thema.Runtime) codejen.OneToMany[*pfs.PluginDecl] {
-	latestMajorsOrX := corecodegen.LatestMajorsOrXJenny(filepath.Join("packages", "grafana-schema", "src", "raw", "composable"), false, corecodegen.TSTypesJenny{})
-	return &pleJenny{
-		inner: kinds2pd(rt, latestMajorsOrX),
-	}
-}
-
-type pleJenny struct {
-	inner codejen.OneToMany[*pfs.PluginDecl]
-}
-
-func (*pleJenny) JennyName() string {
-	return "PluginEachMajorJenny"
-}
-
-func (j *pleJenny) Generate(decl *pfs.PluginDecl) (codejen.Files, error) {
-	if !decl.HasSchema() {
-		return nil, nil
-	}
-
-	jf, err := j.inner.Generate(decl)
-	if err != nil {
-		return nil, err
-	}
-
-	version := "export const pluginVersion = \"%s\";"
-	if decl.PluginMeta.Info.Version != nil {
-		version = fmt.Sprintf(version, *decl.PluginMeta.Info.Version)
-	} else {
-		version = fmt.Sprintf(version, getGrafanaVersion())
-	}
-
-	files := make(codejen.Files, len(jf))
-	for i, file := range jf {
-		tsf := &tsast.File{}
-		for _, im := range decl.Imports {
-			if tsim, err := cuectx.ConvertImport(im); err != nil {
-				return nil, err
-			} else if tsim.From.Value != "" {
-				tsf.Imports = append(tsf.Imports, tsim)
-			}
-		}
-
-		tsf.Nodes = append(tsf.Nodes, tsast.Raw{
-			Data: version,
-		})
-
-		tsf.Nodes = append(tsf.Nodes, tsast.Raw{
-			Data: string(file.Data),
-		})
-
-		data := []byte(tsf.String())
-		data = data[:len(data)-1] // remove the additional line break added by the inner jenny
-
-		files[i] = *codejen.NewFile(file.RelativePath, data, append(file.From, j)...)
-	}
-
-	return files, nil
-}
-
-func kinds2pd(rt *thema.Runtime, j codejen.OneToMany[kindsys.Kind]) codejen.OneToMany[*pfs.PluginDecl] {
-	return codejen.AdaptOneToMany(j, func(pd *pfs.PluginDecl) kindsys.Kind {
-		kd, err := kindsys.BindComposable(rt, pd.KindDecl)
-		if err != nil {
-			return nil
-		}
-		return kd
-	})
-}
-
-func getGrafanaVersion() string {
-	dir, err := os.Getwd()
-	if err != nil {
-		return ""
-	}
-
-	pkg, err := build.OpenPackageJSON(path.Join(dir, "../../../"))
-	if err != nil {
-		return ""
-	}
-
-	return pkg.Version
-}
diff --git a/pkg/plugins/codegen/jenny_plugintreelist.go b/pkg/plugins/codegen/jenny_plugintreelist.go
deleted file mode 100644
index fe737720434d1..0000000000000
--- a/pkg/plugins/codegen/jenny_plugintreelist.go
+++ /dev/null
@@ -1,100 +0,0 @@
-package codegen
-
-import (
-	"bytes"
-	"fmt"
-	"path"
-	"path/filepath"
-	"strings"
-
-	"github.com/grafana/codejen"
-	"github.com/grafana/grafana/pkg/plugins/pfs"
-)
-
-const prefix = "github.com/grafana/grafana/public/app/plugins"
-
-// PluginTreeListJenny creates a [codejen.ManyToOne] that produces Go code
-// for loading a [pfs.PluginList] given [*kindsys.PluginDecl] as inputs.
-func PluginTreeListJenny() codejen.ManyToOne[*pfs.PluginDecl] {
-	outputFile := filepath.Join("pkg", "plugins", "pfs", "corelist", "corelist_load_gen.go")
-
-	return &ptlJenny{
-		outputFile: outputFile,
-		plugins:    make(map[string]bool, 0),
-	}
-}
-
-type ptlJenny struct {
-	outputFile string
-	plugins    map[string]bool
-}
-
-func (j *ptlJenny) JennyName() string {
-	return "PluginTreeListJenny"
-}
-
-func (j *ptlJenny) Generate(decls ...*pfs.PluginDecl) (*codejen.File, error) {
-	buf := new(bytes.Buffer)
-	vars := templateVars_plugin_registry{
-		Plugins: make([]struct {
-			PkgName, Path, ImportPath string
-			NoAlias                   bool
-		}, 0, len(decls)),
-	}
-
-	type tpl struct {
-		PkgName, Path, ImportPath string
-		NoAlias                   bool
-	}
-
-	for _, decl := range decls {
-		meta := decl.PluginMeta
-
-		if _, exists := j.plugins[meta.Id]; exists {
-			continue
-		}
-
-		pluginId := j.sanitizePluginId(meta.Id)
-		vars.Plugins = append(vars.Plugins, tpl{
-			PkgName:    pluginId,
-			NoAlias:    pluginId != filepath.Base(decl.PluginPath),
-			ImportPath: filepath.ToSlash(filepath.Join(prefix, decl.PluginPath)),
-			Path:       path.Join(append(strings.Split(prefix, "/")[3:], decl.PluginPath)...),
-		})
-
-		j.plugins[meta.Id] = true
-	}
-
-	if err := tmpls.Lookup("plugin_registry.tmpl").Execute(buf, vars); err != nil {
-		return nil, fmt.Errorf("failed executing plugin registry template: %w", err)
-	}
-
-	byt, err := postprocessGoFile(genGoFile{
-		path: j.outputFile,
-		in:   buf.Bytes(),
-	})
-	if err != nil {
-		return nil, fmt.Errorf("error postprocessing plugin registry: %w", err)
-	}
-
-	return codejen.NewFile(j.outputFile, byt, j), nil
-}
-
-func (j *ptlJenny) sanitizePluginId(s string) string {
-	return strings.Map(func(r rune) rune {
-		switch {
-		case r >= 'a' && r <= 'z':
-			fallthrough
-		case r >= 'A' && r <= 'Z':
-			fallthrough
-		case r >= '0' && r <= '9':
-			fallthrough
-		case r == '_':
-			return r
-		case r == '-':
-			return '_'
-		default:
-			return -1
-		}
-	}, s)
-}
diff --git a/pkg/plugins/codegen/jenny_plugintstypes.go b/pkg/plugins/codegen/jenny_plugintstypes.go
index 1bedbaea727a4..6f84ebdb53d7c 100644
--- a/pkg/plugins/codegen/jenny_plugintstypes.go
+++ b/pkg/plugins/codegen/jenny_plugintstypes.go
@@ -2,19 +2,24 @@ package codegen
 
 import (
 	"fmt"
+	"os"
+	"path"
 	"path/filepath"
 	"strings"
 
 	"github.com/grafana/codejen"
 	tsast "github.com/grafana/cuetsy/ts/ast"
-	"github.com/grafana/grafana/pkg/cuectx"
+	"github.com/grafana/grafana/pkg/build"
+	"github.com/grafana/grafana/pkg/codegen"
 	"github.com/grafana/grafana/pkg/plugins/pfs"
 )
 
-func PluginTSTypesJenny(root string, inner codejen.OneToOne[*pfs.PluginDecl]) codejen.OneToOne[*pfs.PluginDecl] {
+var versionedPluginPath = filepath.Join("packages", "grafana-schema", "src", "raw", "composable")
+
+func PluginTSTypesJenny(root string) codejen.OneToMany[*pfs.PluginDecl] {
 	return &ptsJenny{
 		root:  root,
-		inner: inner,
+		inner: adaptToPipeline(codegen.TSTypesJenny{}),
 	}
 }
 
@@ -24,21 +29,19 @@ type ptsJenny struct {
 }
 
 func (j *ptsJenny) JennyName() string {
-	return "PluginTSTypesJenny"
+	return "PluginTsTypesJenny"
 }
 
-func (j *ptsJenny) Generate(decl *pfs.PluginDecl) (*codejen.File, error) {
-	if !decl.HasSchema() {
-		return nil, nil
-	}
-
-	tsf := &tsast.File{}
+func (j *ptsJenny) Generate(decl *pfs.PluginDecl) (codejen.Files, error) {
+	genFile := &tsast.File{}
+	versionedFile := &tsast.File{}
 
 	for _, im := range decl.Imports {
-		if tsim, err := cuectx.ConvertImport(im); err != nil {
+		if tsim, err := codegen.ConvertImport(im); err != nil {
 			return nil, err
 		} else if tsim.From.Value != "" {
-			tsf.Imports = append(tsf.Imports, tsim)
+			genFile.Imports = append(genFile.Imports, tsim)
+			versionedFile.Imports = append(versionedFile.Imports, tsim)
 		}
 	}
 
@@ -47,13 +50,95 @@ func (j *ptsJenny) Generate(decl *pfs.PluginDecl) (*codejen.File, error) {
 		return nil, err
 	}
 
-	tsf.Nodes = append(tsf.Nodes, tsast.Raw{
-		Data: string(jf.Data),
-	})
+	rawData := tsast.Raw{Data: string(jf.Data)}
+	rawVersion := tsast.Raw{
+		Data: getPluginVersion(decl.PluginMeta.Version),
+	}
+
+	genFile.Nodes = append(genFile.Nodes, rawData)
 
-	path := filepath.Join(j.root, decl.PluginPath, fmt.Sprintf("%s.gen.ts", strings.ToLower(decl.SchemaInterface.Name())))
-	data := []byte(tsf.String())
+	genPath := filepath.Join(j.root, decl.PluginPath, fmt.Sprintf("%s.gen.ts", strings.ToLower(decl.SchemaInterface.Name)))
+	data := []byte(genFile.String())
 	data = data[:len(data)-1] // remove the additional line break added by the inner jenny
 
-	return codejen.NewFile(path, data, append(jf.From, j)...), nil
+	files := make(codejen.Files, 2)
+	files[0] = *codejen.NewFile(genPath, data, append(jf.From, j)...)
+
+	versionedFile.Nodes = append(versionedFile.Nodes, rawVersion, rawData)
+
+	versionedData := []byte(versionedFile.String())
+	versionedData = versionedData[:len(versionedData)-1]
+
+	pluginFolder := strings.ReplaceAll(strings.ToLower(decl.PluginMeta.Name), " ", "")
+	versionedPath := filepath.Join(versionedPluginPath, pluginFolder, strings.ToLower(decl.SchemaInterface.Name), "x", jf.RelativePath)
+	files[1] = *codejen.NewFile(versionedPath, versionedData, append(jf.From, j)...)
+
+	return files, nil
+}
+
+func getPluginVersion(pluginVersion *string) string {
+	version := "export const pluginVersion = \"%s\";"
+	if pluginVersion != nil {
+		version = fmt.Sprintf(version, *pluginVersion)
+	} else {
+		version = fmt.Sprintf(version, getGrafanaVersion())
+	}
+
+	return version
+}
+
+func adaptToPipeline(j codejen.OneToOne[codegen.SchemaForGen]) codejen.OneToOne[*pfs.PluginDecl] {
+	return codejen.AdaptOneToOne(j, func(pd *pfs.PluginDecl) codegen.SchemaForGen {
+		return codegen.SchemaForGen{
+			Name:    derivePascalName(pd.PluginMeta.Id, pd.PluginMeta.Name) + pd.SchemaInterface.Name,
+			CueFile: pd.CueFile,
+			IsGroup: pd.SchemaInterface.IsGroup,
+		}
+	})
+}
+
+func derivePascalName(id string, name string) string {
+	sani := func(s string) string {
+		ret := strings.Title(strings.Map(func(r rune) rune {
+			switch {
+			case r >= 'a' && r <= 'z':
+				return r
+			case r >= 'A' && r <= 'Z':
+				return r
+			default:
+				return -1
+			}
+		}, strings.Title(strings.Map(func(r rune) rune {
+			switch r {
+			case '-', '_':
+				return ' '
+			default:
+				return r
+			}
+		}, s))))
+		if len(ret) > 63 {
+			return ret[:63]
+		}
+		return ret
+	}
+
+	fromname := sani(name)
+	if len(fromname) != 0 {
+		return fromname
+	}
+	return sani(strings.Split(id, "-")[1])
+}
+
+func getGrafanaVersion() string {
+	dir, err := os.Getwd()
+	if err != nil {
+		return ""
+	}
+
+	pkg, err := build.OpenPackageJSON(path.Join(dir, "../../../"))
+	if err != nil {
+		return ""
+	}
+
+	return pkg.Version
 }
diff --git a/pkg/plugins/codegen/tmpl.go b/pkg/plugins/codegen/tmpl.go
index 71bd93cc1b825..729072a440fbc 100644
--- a/pkg/plugins/codegen/tmpl.go
+++ b/pkg/plugins/codegen/tmpl.go
@@ -22,12 +22,13 @@ var tmplFS embed.FS
 // The following group of types, beginning with templateVars_*, all contain the set
 // of variables expected by the corresponding named template file under tmpl/
 type (
-	templateVars_plugin_registry struct {
-		Plugins []struct {
-			PkgName    string
-			Path       string
-			ImportPath string
-			NoAlias    bool
-		}
+	tmpl_vars_plugin_registry struct {
+		Schemas []Schema
+	}
+
+	Schema struct {
+		Name     string
+		Filename string
+		FilePath string
 	}
 )
diff --git a/pkg/plugins/codegen/tmpl/composable_registry.tmpl b/pkg/plugins/codegen/tmpl/composable_registry.tmpl
new file mode 100644
index 0000000000000..5ad6416a41a78
--- /dev/null
+++ b/pkg/plugins/codegen/tmpl/composable_registry.tmpl
@@ -0,0 +1,132 @@
+package schemas
+
+import (
+    "fmt"
+    "io"
+    "io/fs"
+    "os"
+    "path/filepath"
+    "runtime"
+    "testing/fstest"
+
+    "cuelang.org/go/cue"
+    "cuelang.org/go/cue/cuecontext"
+    "cuelang.org/go/cue/load"
+)
+
+var cueImportsPath = filepath.Join("packages", "grafana-schema", "src", "common")
+var importPath = "github.com/grafana/grafana/packages/grafana-schema/src/common"
+
+type ComposableKind struct {
+    Name string
+    Filename string
+    CueFile cue.Value
+}
+
+func GetComposableKinds() ([]ComposableKind, error) {
+    kinds := make([]ComposableKind, 0)
+    
+    _, caller, _, _ := runtime.Caller(0)
+    root := filepath.Join(caller, "../../../..")
+    
+    {{- range .Schemas }}
+    
+    {{ .Name }}Cue, err := loadCueFileWithCommon(root, filepath.Join(root, "{{ .FilePath }}"))
+    if err != nil {
+        return nil, err
+    }
+    kinds = append(kinds, ComposableKind{
+        Name: "{{ .Name }}",
+        Filename: "{{ .Filename }}",
+        CueFile: {{ .Name }}Cue,
+    })
+    {{- end }}
+    
+    return kinds, nil
+}
+
+func loadCueFileWithCommon(root string, entrypoint string) (cue.Value, error) {
+	commonFS, err := mockCommonFS(root)
+	if err != nil {
+		fmt.Printf("cannot load common cue files: %s\n", err)
+		return cue.Value{}, err
+	}
+
+	overlay, err := buildOverlay(commonFS)
+	if err != nil {
+		fmt.Printf("Cannot build overlay: %s\n", err)
+		return cue.Value{}, err
+	}
+
+	bis := load.Instances([]string{entrypoint}, &load.Config{
+		ModuleRoot: "/",
+		Overlay:    overlay,
+	})
+
+	values, err := cuecontext.New().BuildInstances(bis)
+	if err != nil {
+		fmt.Printf("Cannot build instance: %s\n", err)
+		return cue.Value{}, err
+	}
+
+	return values[0], nil
+}
+
+func mockCommonFS(root string) (fs.FS, error) {
+    path := filepath.Join(root, cueImportsPath)
+	dir, err := os.ReadDir(path)
+	if err != nil {
+		return nil, fmt.Errorf("cannot open common cue files directory: %s", err)
+	}
+
+	prefix := "cue.mod/pkg/" + importPath
+
+	commonFS := fstest.MapFS{}
+	for _, d := range dir {
+		if d.IsDir() {
+			continue
+		}
+
+		readPath := filepath.Join(path, d.Name())
+		b, err := os.ReadFile(filepath.Clean(readPath))
+		if err != nil {
+			return nil, err
+		}
+
+		commonFS[filepath.Join(prefix, d.Name())] = &fstest.MapFile{Data: b}
+	}
+
+	return commonFS, nil
+}
+
+// It loads common cue files into the schema to be able to make import works
+func buildOverlay(commonFS fs.FS) (map[string]load.Source, error) {
+	overlay := make(map[string]load.Source)
+
+	err := fs.WalkDir(commonFS, ".", func(path string, d fs.DirEntry, err error) error {
+		if err != nil {
+			return err
+		}
+
+		if d.IsDir() {
+			return nil
+		}
+
+		f, err := commonFS.Open(path)
+		if err != nil {
+			return err
+		}
+		defer func() { _ = f.Close() }()
+
+		b, err := io.ReadAll(f)
+		if err != nil {
+			return err
+		}
+
+		overlay[filepath.Join("/", path)] = load.FromBytes(b)
+
+		return nil
+	})
+
+	return overlay, err
+}
diff --git a/pkg/plugins/codegen/tmpl/plugin_registry.tmpl b/pkg/plugins/codegen/tmpl/plugin_registry.tmpl
deleted file mode 100644
index 26ef440e02b8f..0000000000000
--- a/pkg/plugins/codegen/tmpl/plugin_registry.tmpl
+++ /dev/null
@@ -1,30 +0,0 @@
-package corelist
-
-import (
-  "fmt"
-  "io/fs"
-  "sync"
-  "github.com/grafana/grafana"
-	"github.com/grafana/grafana/pkg/plugins/pfs"
-	"github.com/grafana/thema"
-)
-
-func parsePluginOrPanic(path string, pkgname string, rt *thema.Runtime) pfs.ParsedPlugin {
-  sub, err := fs.Sub(grafana.CueSchemaFS, path)
-  if err != nil {
-    panic("could not create fs sub to " + path)
-  }
-  pp, err := pfs.ParsePluginFS(sub, rt)
-  if err != nil {
-    panic(fmt.Sprintf("error parsing plugin metadata for %s: %s", pkgname, err))
-  }
-  return pp
-}
-
-func corePlugins(rt *thema.Runtime) []pfs.ParsedPlugin{
-  return []pfs.ParsedPlugin{
-    {{- range .Plugins }}
-    parsePluginOrPanic("{{ .Path }}", "{{ .PkgName }}", rt),
-    {{- end }}
-  }
-}
diff --git a/pkg/plugins/codegen/util_go.go b/pkg/plugins/codegen/util_go.go
deleted file mode 100644
index a9caf75ea2ab2..0000000000000
--- a/pkg/plugins/codegen/util_go.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package codegen
-
-import (
-	"bytes"
-	"fmt"
-	"go/format"
-	"go/parser"
-	"go/token"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/dave/dst/decorator"
-	"github.com/dave/dst/dstutil"
-	"golang.org/x/tools/imports"
-)
-
-type genGoFile struct {
-	path   string
-	walker dstutil.ApplyFunc
-	in     []byte
-}
-
-func postprocessGoFile(cfg genGoFile) ([]byte, error) {
-	fname := filepath.Base(cfg.path)
-	buf := new(bytes.Buffer)
-	fset := token.NewFileSet()
-	gf, err := decorator.ParseFile(fset, fname, string(cfg.in), parser.ParseComments)
-	if err != nil {
-		return nil, fmt.Errorf("error parsing generated file: %w", err)
-	}
-
-	if cfg.walker != nil {
-		dstutil.Apply(gf, cfg.walker, nil)
-
-		err = format.Node(buf, fset, gf)
-		if err != nil {
-			return nil, fmt.Errorf("error formatting Go AST: %w", err)
-		}
-	} else {
-		buf = bytes.NewBuffer(cfg.in)
-	}
-
-	byt, err := imports.Process(fname, buf.Bytes(), nil)
-	if err != nil {
-		return nil, fmt.Errorf("goimports processing failed: %w", err)
-	}
-
-	// Compare imports before and after; warn about performance if some were added
-	gfa, _ := parser.ParseFile(fset, fname, string(byt), parser.ParseComments)
-	imap := make(map[string]bool)
-	for _, im := range gf.Imports {
-		imap[im.Path.Value] = true
-	}
-	var added []string
-	for _, im := range gfa.Imports {
-		if !imap[im.Path.Value] {
-			added = append(added, im.Path.Value)
-		}
-	}
-
-	if len(added) != 0 {
-		// TODO improve the guidance in this error if/when we better abstract over imports to generate
-		fmt.Fprintf(os.Stderr, "The following imports were added by goimports while generating %s: \n\t%s\nRelying on goimports to find imports significantly slows down code generation. Consider adding these to the relevant template.\n", cfg.path, strings.Join(added, "\n\t"))
-	}
-
-	return byt, nil
-}
diff --git a/pkg/plugins/config/config.go b/pkg/plugins/config/config.go
index 905349bfb8159..9fcf3bba71ad4 100644
--- a/pkg/plugins/config/config.go
+++ b/pkg/plugins/config/config.go
@@ -1,16 +1,12 @@
 package config
 
 import (
-	"github.com/grafana/grafana-azure-sdk-go/azsettings"
-
-	"github.com/grafana/grafana/pkg/plugins"
-	"github.com/grafana/grafana/pkg/plugins/log"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
-type Cfg struct {
-	log log.Logger
-
+// PluginManagementCfg is the configuration for the plugin management system.
+// It includes settings which are used to configure different components of plugin management.
+type PluginManagementCfg struct {
 	DevMode bool
 
 	PluginsPath string
@@ -18,60 +14,43 @@ type Cfg struct {
 	PluginSettings       setting.PluginSettings
 	PluginsAllowUnsigned []string
 	DisablePlugins       []string
-
-	// AWS Plugin Auth
-	AWSAllowedAuthProviders []string
-	AWSAssumeRoleEnabled    bool
-	AWSExternalId           string
-
-	// Azure Cloud settings
-	Azure *azsettings.AzureSettings
-
-	// Proxy Settings
-	ProxySettings setting.SecureSocksDSProxySettings
-
-	BuildVersion string // TODO Remove
-
-	LogDatasourceRequests bool
+	ForwardHostEnvVars   []string
 
 	PluginsCDNURLTemplate string
 
-	Tracing Tracing
-
 	GrafanaComURL string
 
-	GrafanaAppURL    string
-	GrafanaAppSubURL string
+	GrafanaAppURL string
 
-	Features plugins.FeatureToggles
+	Features Features
+
+	AngularSupportEnabled  bool
+	HideAngularDeprecation []string
+}
 
-	AngularSupportEnabled bool
+// Features contains the feature toggles used for the plugin management system.
+type Features struct {
+	ExternalCorePluginsEnabled bool
+	SkipHostEnvVarsEnabled     bool
 }
 
-func NewCfg(devMode bool, pluginsPath string, pluginSettings setting.PluginSettings, pluginsAllowUnsigned []string,
-	awsAllowedAuthProviders []string, awsAssumeRoleEnabled bool, awsExternalId string, azure *azsettings.AzureSettings, secureSocksDSProxy setting.SecureSocksDSProxySettings,
-	grafanaVersion string, logDatasourceRequests bool, pluginsCDNURLTemplate string, appURL string, appSubURL string, tracing Tracing, features plugins.FeatureToggles, angularSupportEnabled bool,
-	grafanaComURL string, disablePlugins []string) *Cfg {
-	return &Cfg{
-		log:                     log.New("plugin.cfg"),
-		PluginsPath:             pluginsPath,
-		BuildVersion:            grafanaVersion,
-		DevMode:                 devMode,
-		PluginSettings:          pluginSettings,
-		PluginsAllowUnsigned:    pluginsAllowUnsigned,
-		DisablePlugins:          disablePlugins,
-		AWSAllowedAuthProviders: awsAllowedAuthProviders,
-		AWSAssumeRoleEnabled:    awsAssumeRoleEnabled,
-		AWSExternalId:           awsExternalId,
-		Azure:                   azure,
-		ProxySettings:           secureSocksDSProxy,
-		LogDatasourceRequests:   logDatasourceRequests,
-		PluginsCDNURLTemplate:   pluginsCDNURLTemplate,
-		Tracing:                 tracing,
-		GrafanaComURL:           grafanaComURL,
-		GrafanaAppURL:           appURL,
-		GrafanaAppSubURL:        appSubURL,
-		Features:                features,
-		AngularSupportEnabled:   angularSupportEnabled,
+// NewPluginManagementCfg returns a new PluginManagementCfg.
+func NewPluginManagementCfg(devMode bool, pluginsPath string, pluginSettings setting.PluginSettings, pluginsAllowUnsigned []string,
+	pluginsCDNURLTemplate string, appURL string, features Features, angularSupportEnabled bool,
+	grafanaComURL string, disablePlugins []string, hideAngularDeprecation []string, forwardHostEnvVars []string,
+) *PluginManagementCfg {
+	return &PluginManagementCfg{
+		PluginsPath:            pluginsPath,
+		DevMode:                devMode,
+		PluginSettings:         pluginSettings,
+		PluginsAllowUnsigned:   pluginsAllowUnsigned,
+		DisablePlugins:         disablePlugins,
+		PluginsCDNURLTemplate:  pluginsCDNURLTemplate,
+		GrafanaComURL:          grafanaComURL,
+		GrafanaAppURL:          appURL,
+		Features:               features,
+		AngularSupportEnabled:  angularSupportEnabled,
+		HideAngularDeprecation: hideAngularDeprecation,
+		ForwardHostEnvVars:     forwardHostEnvVars,
 	}
 }
diff --git a/pkg/plugins/config/tracing.go b/pkg/plugins/config/tracing.go
index 8ea7615d332e2..d59e1fdf23f0c 100644
--- a/pkg/plugins/config/tracing.go
+++ b/pkg/plugins/config/tracing.go
@@ -9,6 +9,10 @@ type Tracing struct {
 type OpenTelemetryCfg struct {
 	Address     string
 	Propagation string
+
+	Sampler          string
+	SamplerParam     float64
+	SamplerRemoteURL string
 }
 
 // IsEnabled returns true if OTLP tracing is enabled (address set)
diff --git a/pkg/plugins/envvars/envvars.go b/pkg/plugins/envvars/envvars.go
index 57259ca28db56..442a350d51260 100644
--- a/pkg/plugins/envvars/envvars.go
+++ b/pkg/plugins/envvars/envvars.go
@@ -2,259 +2,51 @@ package envvars
 
 import (
 	"context"
-	"fmt"
 	"os"
-	"sort"
-	"strconv"
-	"strings"
-
-	"github.com/grafana/grafana-aws-sdk/pkg/awsds"
-	"github.com/grafana/grafana-azure-sdk-go/azsettings"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/proxy"
-	"github.com/grafana/grafana-plugin-sdk-go/experimental/featuretoggles"
 
 	"github.com/grafana/grafana/pkg/plugins"
-	"github.com/grafana/grafana/pkg/plugins/auth"
-	"github.com/grafana/grafana/pkg/plugins/config"
-)
-
-const (
-	customConfigPrefix = "GF_PLUGIN"
 )
 
-type Provider interface {
-	Get(ctx context.Context, p *plugins.Plugin) []string
-}
-
-type Service struct {
-	cfg     *config.Cfg
-	license plugins.Licensing
-}
-
-func NewProvider(cfg *config.Cfg, license plugins.Licensing) *Service {
-	return &Service{
-		cfg:     cfg,
-		license: license,
-	}
-}
-
-func (s *Service) Get(ctx context.Context, p *plugins.Plugin) []string {
-	hostEnv := []string{
-		fmt.Sprintf("GF_VERSION=%s", s.cfg.BuildVersion),
-	}
-
-	if s.license != nil {
-		hostEnv = append(
-			hostEnv,
-			fmt.Sprintf("GF_EDITION=%s", s.license.Edition()),
-			fmt.Sprintf("GF_ENTERPRISE_LICENSE_PATH=%s", s.license.Path()),
-			fmt.Sprintf("GF_ENTERPRISE_APP_URL=%s", s.license.AppURL()),
-		)
-		hostEnv = append(hostEnv, s.license.Environment()...)
-	}
-
-	if p.ExternalService != nil {
-		hostEnv = append(
-			hostEnv,
-			fmt.Sprintf("GF_APP_URL=%s", s.cfg.GrafanaAppURL),
-			fmt.Sprintf("GF_PLUGIN_APP_CLIENT_ID=%s", p.ExternalService.ClientID),
-			fmt.Sprintf("GF_PLUGIN_APP_CLIENT_SECRET=%s", p.ExternalService.ClientSecret),
-		)
-		if p.ExternalService.PrivateKey != "" {
-			hostEnv = append(hostEnv, fmt.Sprintf("GF_PLUGIN_APP_PRIVATE_KEY=%s", p.ExternalService.PrivateKey))
-		}
-	}
-
-	hostEnv = append(hostEnv, s.featureToggleEnableVar(ctx)...)
-	hostEnv = append(hostEnv, s.awsEnvVars()...)
-	hostEnv = append(hostEnv, s.secureSocksProxyEnvVars()...)
-	hostEnv = append(hostEnv, azsettings.WriteToEnvStr(s.cfg.Azure)...)
-	hostEnv = append(hostEnv, s.tracingEnvVars(p)...)
-
-	ev := getPluginSettings(p.ID, s.cfg).asEnvVar(customConfigPrefix, hostEnv...)
-	return ev
-}
-
-// GetConfigMap returns a map of configuration that should be passed in a plugin request.
-func (s *Service) GetConfigMap(ctx context.Context, _ string, _ *auth.ExternalService) map[string]string {
-	m := make(map[string]string)
-
-	// TODO add support via plugin SDK
-	//if externalService != nil {
-	//	m[oauthtokenretriever.AppURL] = s.cfg.GrafanaAppURL
-	//	m[oauthtokenretriever.AppClientID] = externalService.ClientID
-	//	m[oauthtokenretriever.AppClientSecret] = externalService.ClientSecret
-	//	m[oauthtokenretriever.AppPrivateKey] = externalService.PrivateKey
-	//}
-
-	if s.cfg.Features != nil {
-		enabledFeatures := s.cfg.Features.GetEnabled(ctx)
-		if len(enabledFeatures) > 0 {
-			features := make([]string, 0, len(enabledFeatures))
-			for feat := range enabledFeatures {
-				features = append(features, feat)
-			}
-			sort.Strings(features)
-			m[featuretoggles.EnabledFeatures] = strings.Join(features, ",")
-		}
-	}
-	// TODO add support via plugin SDK
-	//if s.cfg.AWSAssumeRoleEnabled {
-	//	m[awsds.AssumeRoleEnabledEnvVarKeyName] = "true"
-	//}
-	//if len(s.cfg.AWSAllowedAuthProviders) > 0 {
-	//	m[awsds.AllowedAuthProvidersEnvVarKeyName] = strings.Join(s.cfg.AWSAllowedAuthProviders, ",")
-	//}
-	//if s.cfg.AWSExternalId != "" {
-	//	m[awsds.GrafanaAssumeRoleExternalIdKeyName] = s.cfg.AWSExternalId
-	//}
-
-	if s.cfg.ProxySettings.Enabled {
-		m[proxy.PluginSecureSocksProxyEnabled] = "true"
-		m[proxy.PluginSecureSocksProxyClientCert] = s.cfg.ProxySettings.ClientCert
-		m[proxy.PluginSecureSocksProxyClientKey] = s.cfg.ProxySettings.ClientKey
-		m[proxy.PluginSecureSocksProxyRootCACert] = s.cfg.ProxySettings.RootCA
-		m[proxy.PluginSecureSocksProxyProxyAddress] = s.cfg.ProxySettings.ProxyAddress
-		m[proxy.PluginSecureSocksProxyServerName] = s.cfg.ProxySettings.ServerName
-	}
-
-	// TODO add support via plugin SDK
-	//azureSettings := s.cfg.Azure
-	//if azureSettings != nil {
-	//	if azureSettings.Cloud != "" {
-	//		m[azsettings.AzureCloud] = azureSettings.Cloud
-	//	}
-	//
-	//	if azureSettings.ManagedIdentityEnabled {
-	//		m[azsettings.ManagedIdentityEnabled] = "true"
-	//
-	//		if azureSettings.ManagedIdentityClientId != "" {
-	//			m[azsettings.ManagedIdentityClientID] = azureSettings.ManagedIdentityClientId
-	//		}
-	//	}
-	//
-	//	if azureSettings.UserIdentityEnabled {
-	//		m[azsettings.UserIdentityEnabled] = "true"
-	//
-	//		if azureSettings.UserIdentityTokenEndpoint != nil {
-	//			if azureSettings.UserIdentityTokenEndpoint.TokenUrl != "" {
-	//				m[azsettings.UserIdentityTokenURL] = azureSettings.UserIdentityTokenEndpoint.TokenUrl
-	//			}
-	//			if azureSettings.UserIdentityTokenEndpoint.ClientId != "" {
-	//				m[azsettings.UserIdentityClientID] = azureSettings.UserIdentityTokenEndpoint.ClientId
-	//			}
-	//			if azureSettings.UserIdentityTokenEndpoint.ClientSecret != "" {
-	//				m[azsettings.UserIdentityClientSecret] = azureSettings.UserIdentityTokenEndpoint.ClientSecret
-	//			}
-	//			if azureSettings.UserIdentityTokenEndpoint.UsernameAssertion {
-	//				m[azsettings.UserIdentityAssertion] = "username"
-	//			}
-	//		}
-	//	}
-	//}
-
-	// TODO add support via plugin SDK
-	//ps := getPluginSettings(pluginID, s.cfg)
-	//for k, v := range ps {
-	//	m[fmt.Sprintf("%s_%s", customConfigPrefix, strings.ToUpper(k))] = v
-	//}
-
-	return m
-}
-
-func (s *Service) tracingEnvVars(plugin *plugins.Plugin) []string {
-	var pluginTracingEnabled bool
-	if v, exists := s.cfg.PluginSettings[plugin.ID]["tracing"]; exists {
-		pluginTracingEnabled = v == "true"
-	}
-	if !s.cfg.Tracing.IsEnabled() || !pluginTracingEnabled {
-		return nil
-	}
-
-	vars := []string{
-		fmt.Sprintf("GF_INSTANCE_OTLP_ADDRESS=%s", s.cfg.Tracing.OpenTelemetry.Address),
-		fmt.Sprintf("GF_INSTANCE_OTLP_PROPAGATION=%s", s.cfg.Tracing.OpenTelemetry.Propagation),
-	}
-	if plugin.Info.Version != "" {
-		vars = append(vars, fmt.Sprintf("GF_PLUGIN_VERSION=%s", plugin.Info.Version))
-	}
-	return vars
+// permittedHostEnvVarNames is the list of environment variables that can be passed from Grafana's process to the
+// plugin's process
+var permittedHostEnvVarNames = []string{
+	// Env vars used by net/http (Go stdlib) for http/https proxy
+	// https://github.com/golang/net/blob/fbaf41277f28102c36926d1368dafbe2b54b4c1d/http/httpproxy/proxy.go#L91-L93
+	"HTTP_PROXY",
+	"http_proxy",
+	"HTTPS_PROXY",
+	"https_proxy",
+	"NO_PROXY",
+	"no_proxy",
 }
 
-func (s *Service) featureToggleEnableVar(ctx context.Context) []string {
-	var variables []string // an array is used for consistency and keep the logic simpler for no features case
-
-	if s.cfg.Features == nil {
-		return variables
-	}
-
-	enabledFeatures := s.cfg.Features.GetEnabled(ctx)
-	if len(enabledFeatures) > 0 {
-		features := make([]string, 0, len(enabledFeatures))
-		for feat := range enabledFeatures {
-			features = append(features, feat)
-		}
-		variables = append(variables, fmt.Sprintf("GF_INSTANCE_FEATURE_TOGGLES_ENABLE=%s", strings.Join(features, ",")))
-	}
-
-	return variables
+type Provider interface {
+	PluginEnvVars(ctx context.Context, p *plugins.Plugin) []string
 }
 
-func (s *Service) awsEnvVars() []string {
-	var variables []string
-	if s.cfg.AWSAssumeRoleEnabled {
-		variables = append(variables, awsds.AssumeRoleEnabledEnvVarKeyName+"=true")
-	}
-	if len(s.cfg.AWSAllowedAuthProviders) > 0 {
-		variables = append(variables, awsds.AllowedAuthProvidersEnvVarKeyName+"="+strings.Join(s.cfg.AWSAllowedAuthProviders, ","))
-	}
-	if s.cfg.AWSExternalId != "" {
-		variables = append(variables, awsds.GrafanaAssumeRoleExternalIdKeyName+"="+s.cfg.AWSExternalId)
-	}
+type Service struct{}
 
-	return variables
+func DefaultProvider() *Service {
+	return &Service{}
 }
 
-func (s *Service) secureSocksProxyEnvVars() []string {
-	if s.cfg.ProxySettings.Enabled {
-		return []string{
-			proxy.PluginSecureSocksProxyClientCert + "=" + s.cfg.ProxySettings.ClientCert,
-			proxy.PluginSecureSocksProxyClientKey + "=" + s.cfg.ProxySettings.ClientKey,
-			proxy.PluginSecureSocksProxyRootCACert + "=" + s.cfg.ProxySettings.RootCA,
-			proxy.PluginSecureSocksProxyProxyAddress + "=" + s.cfg.ProxySettings.ProxyAddress,
-			proxy.PluginSecureSocksProxyServerName + "=" + s.cfg.ProxySettings.ServerName,
-			proxy.PluginSecureSocksProxyEnabled + "=" + strconv.FormatBool(s.cfg.ProxySettings.Enabled),
-		}
-	}
-	return nil
+func (s *Service) PluginEnvVars(_ context.Context, _ *plugins.Plugin) []string {
+	return PermittedHostEnvVars()
 }
 
-type pluginSettings map[string]string
-
-func getPluginSettings(pluginID string, cfg *config.Cfg) pluginSettings {
-	ps := pluginSettings{}
-	for k, v := range cfg.PluginSettings[pluginID] {
-		if k == "path" || strings.ToLower(k) == "id" {
-			continue
+// PermittedHostEnvVars returns the variables that can be passed from Grafana's process
+// (current process, also known as: "host") to the plugin process.
+// A string in format "k=v" is returned for each variable in PermittedHostEnvVarNames, if it's set.
+func PermittedHostEnvVars() []string {
+	var r []string
+	for _, envVarName := range PermittedHostEnvVarNames() {
+		if envVarValue, ok := os.LookupEnv(envVarName); ok {
+			r = append(r, envVarName+"="+envVarValue)
 		}
-		ps[k] = v
 	}
-
-	return ps
+	return r
 }
 
-func (ps pluginSettings) asEnvVar(prefix string, hostEnv ...string) []string {
-	env := make([]string, 0, len(ps))
-	for k, v := range ps {
-		key := fmt.Sprintf("%s_%s", prefix, strings.ToUpper(k))
-		if value := os.Getenv(key); value != "" {
-			v = value
-		}
-
-		env = append(env, fmt.Sprintf("%s=%s", key, v))
-	}
-
-	env = append(env, hostEnv...)
-
-	return env
+func PermittedHostEnvVarNames() []string {
+	return permittedHostEnvVarNames
 }
diff --git a/pkg/plugins/envvars/envvars_test.go b/pkg/plugins/envvars/envvars_test.go
deleted file mode 100644
index 46cc8b56e527d..0000000000000
--- a/pkg/plugins/envvars/envvars_test.go
+++ /dev/null
@@ -1,502 +0,0 @@
-package envvars
-
-import (
-	"context"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/plugins"
-	"github.com/grafana/grafana/pkg/plugins/auth"
-	"github.com/grafana/grafana/pkg/plugins/config"
-	"github.com/grafana/grafana/pkg/plugins/manager/fakes"
-	"github.com/grafana/grafana/pkg/plugins/plugindef"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func TestInitializer_envVars(t *testing.T) {
-	t.Run("backend datasource with license", func(t *testing.T) {
-		p := &plugins.Plugin{
-			JSONData: plugins.JSONData{
-				ID: "test",
-			},
-		}
-
-		licensing := &fakes.FakeLicensingService{
-			LicenseEdition: "test",
-			TokenRaw:       "token",
-			LicensePath:    "/path/to/ent/license",
-			LicenseAppURL:  "https://myorg.com/",
-		}
-
-		envVarsProvider := NewProvider(&config.Cfg{
-			PluginSettings: map[string]map[string]string{
-				"test": {
-					"custom_env_var": "customVal",
-				},
-			},
-		}, licensing)
-
-		envVars := envVarsProvider.Get(context.Background(), p)
-		assert.Len(t, envVars, 6)
-		assert.Equal(t, "GF_PLUGIN_CUSTOM_ENV_VAR=customVal", envVars[0])
-		assert.Equal(t, "GF_VERSION=", envVars[1])
-		assert.Equal(t, "GF_EDITION=test", envVars[2])
-		assert.Equal(t, "GF_ENTERPRISE_LICENSE_PATH=/path/to/ent/license", envVars[3])
-		assert.Equal(t, "GF_ENTERPRISE_APP_URL=https://myorg.com/", envVars[4])
-		assert.Equal(t, "GF_ENTERPRISE_LICENSE_TEXT=token", envVars[5])
-	})
-}
-
-func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
-	const pluginID = "plugin_id"
-
-	defaultPlugin := &plugins.Plugin{
-		JSONData: plugins.JSONData{
-			ID:   pluginID,
-			Info: plugins.Info{Version: "1.0.0"},
-		},
-	}
-	pluginWithoutVersion := &plugins.Plugin{
-		JSONData: plugins.JSONData{ID: pluginID},
-	}
-
-	defaultOTelCfg := config.OpenTelemetryCfg{
-		Address:     "127.0.0.1:4317",
-		Propagation: "",
-	}
-
-	expDefaultOtlp := func(t *testing.T, envVars []string) {
-		found := map[string]bool{
-			"address":        false,
-			"plugin_version": false,
-			"propagation":    false,
-		}
-		setFound := func(v string) {
-			require.False(t, found[v], "duplicate env var found")
-			found[v] = true
-		}
-		for _, v := range envVars {
-			switch v {
-			case "GF_PLUGIN_VERSION=1.0.0":
-				setFound("plugin_version")
-			case "GF_INSTANCE_OTLP_ADDRESS=127.0.0.1:4317":
-				setFound("address")
-			case "GF_INSTANCE_OTLP_PROPAGATION=":
-				setFound("propagation")
-			}
-		}
-		for k, f := range found {
-			require.Truef(t, f, "%q env var not found: %+v", k, envVars)
-		}
-	}
-	expNoTracing := func(t *testing.T, envVars []string) {
-		for _, v := range envVars {
-			assert.False(t, strings.HasPrefix(v, "GF_TRACING"), "should not have tracing env var")
-			assert.False(
-				t,
-				strings.HasPrefix(v, "GF_PLUGIN_VERSION"),
-				"GF_PLUGIN_VERSION is tracing-only and should not be present when tracing is disabled",
-			)
-		}
-	}
-	expGfPluginVersionNotPresent := func(t *testing.T, envVars []string) {
-		for _, e := range envVars {
-			assert.False(t, strings.HasPrefix("GF_PLUGIN_VERSION=", e), "GF_PLUGIN_VERSION shouldn't be present")
-		}
-	}
-	expGfPluginVersionPresent := func(t *testing.T, envVars []string) {
-		var found bool
-		for _, e := range envVars {
-			if e != "GF_PLUGIN_VERSION=1.0.0" {
-				continue
-			}
-			assert.False(t, found, "GF_PLUGIN_VERSION is present multiple times")
-			found = true
-		}
-		assert.Truef(t, found, "GF_PLUGIN_VERSION is not present: %+v", envVars)
-	}
-
-	for _, tc := range []struct {
-		name   string
-		cfg    *config.Cfg
-		plugin *plugins.Plugin
-		exp    func(t *testing.T, envVars []string)
-	}{
-		{
-			name: "otel not configured",
-			cfg: &config.Cfg{
-				Tracing: config.Tracing{},
-			},
-			plugin: defaultPlugin,
-			exp:    expNoTracing,
-		},
-		{
-			name: "otel not configured but plugin-tracing enabled",
-			cfg: &config.Cfg{
-				Tracing:        config.Tracing{},
-				PluginSettings: map[string]map[string]string{pluginID: {"tracing": "true"}},
-			},
-			plugin: defaultPlugin,
-			exp:    expNoTracing,
-		},
-		{
-			name: "otlp no propagation plugin enabled",
-			cfg: &config.Cfg{
-				Tracing: config.Tracing{
-					OpenTelemetry: defaultOTelCfg,
-				},
-				PluginSettings: map[string]map[string]string{
-					pluginID: {"tracing": "true"},
-				},
-			},
-			plugin: defaultPlugin,
-			exp:    expDefaultOtlp,
-		},
-		{
-			name: "otlp no propagation disabled by default",
-			cfg: &config.Cfg{
-				Tracing: config.Tracing{
-					OpenTelemetry: defaultOTelCfg,
-				},
-			},
-			plugin: defaultPlugin,
-			exp:    expNoTracing,
-		},
-		{
-			name: "otlp propagation plugin enabled",
-			cfg: &config.Cfg{
-				Tracing: config.Tracing{
-					OpenTelemetry: config.OpenTelemetryCfg{
-						Address:     "127.0.0.1:4317",
-						Propagation: "w3c",
-					},
-				},
-				PluginSettings: map[string]map[string]string{
-					pluginID: {"tracing": "true"},
-				},
-			},
-			plugin: defaultPlugin,
-			exp: func(t *testing.T, envVars []string) {
-				assert.Len(t, envVars, 5)
-				assert.Equal(t, "GF_PLUGIN_TRACING=true", envVars[0])
-				assert.Equal(t, "GF_VERSION=", envVars[1])
-				assert.Equal(t, "GF_INSTANCE_OTLP_ADDRESS=127.0.0.1:4317", envVars[2])
-				assert.Equal(t, "GF_INSTANCE_OTLP_PROPAGATION=w3c", envVars[3])
-				assert.Equal(t, "GF_PLUGIN_VERSION=1.0.0", envVars[4])
-			},
-		},
-		{
-			name: "otlp enabled composite propagation",
-			cfg: &config.Cfg{
-				Tracing: config.Tracing{
-					OpenTelemetry: config.OpenTelemetryCfg{
-						Address:     "127.0.0.1:4317",
-						Propagation: "w3c,jaeger",
-					},
-				},
-				PluginSettings: map[string]map[string]string{
-					pluginID: {"tracing": "true"},
-				},
-			},
-			plugin: defaultPlugin,
-			exp: func(t *testing.T, envVars []string) {
-				assert.Len(t, envVars, 5)
-				assert.Equal(t, "GF_PLUGIN_TRACING=true", envVars[0])
-				assert.Equal(t, "GF_VERSION=", envVars[1])
-				assert.Equal(t, "GF_INSTANCE_OTLP_ADDRESS=127.0.0.1:4317", envVars[2])
-				assert.Equal(t, "GF_INSTANCE_OTLP_PROPAGATION=w3c,jaeger", envVars[3])
-				assert.Equal(t, "GF_PLUGIN_VERSION=1.0.0", envVars[4])
-			},
-		},
-		{
-			name: "otlp no propagation disabled by default",
-			cfg: &config.Cfg{
-				Tracing: config.Tracing{
-					OpenTelemetry: config.OpenTelemetryCfg{
-						Address:     "127.0.0.1:4317",
-						Propagation: "w3c",
-					},
-				},
-			},
-			plugin: defaultPlugin,
-			exp:    expNoTracing,
-		},
-		{
-			name: "disabled on plugin",
-			cfg: &config.Cfg{
-				Tracing: config.Tracing{
-					OpenTelemetry: defaultOTelCfg,
-				},
-				PluginSettings: setting.PluginSettings{
-					pluginID: map[string]string{"tracing": "false"},
-				},
-			},
-			plugin: defaultPlugin,
-			exp:    expNoTracing,
-		},
-		{
-			name: "disabled on plugin with other plugin settings",
-			cfg: &config.Cfg{
-				Tracing: config.Tracing{
-					OpenTelemetry: defaultOTelCfg,
-				},
-				PluginSettings: map[string]map[string]string{
-					pluginID: {"some_other_option": "true"},
-				},
-			},
-			plugin: defaultPlugin,
-			exp:    expNoTracing,
-		},
-		{
-			name: "enabled on plugin with other plugin settings",
-			cfg: &config.Cfg{
-				Tracing: config.Tracing{
-					OpenTelemetry: defaultOTelCfg,
-				},
-				PluginSettings: map[string]map[string]string{
-					pluginID: {"some_other_option": "true", "tracing": "true"},
-				},
-			},
-			plugin: defaultPlugin,
-			exp:    expDefaultOtlp,
-		},
-		{
-			name: "GF_PLUGIN_VERSION is not present if tracing is disabled",
-			cfg: &config.Cfg{
-				Tracing: config.Tracing{
-					OpenTelemetry: config.OpenTelemetryCfg{},
-				},
-				PluginSettings: map[string]map[string]string{pluginID: {"tracing": "true"}},
-			},
-			plugin: defaultPlugin,
-			exp:    expGfPluginVersionNotPresent,
-		},
-		{
-			name: "GF_PLUGIN_VERSION is present if tracing is enabled and plugin has version",
-			cfg: &config.Cfg{
-				Tracing: config.Tracing{
-					OpenTelemetry: defaultOTelCfg,
-				},
-				PluginSettings: map[string]map[string]string{pluginID: {"tracing": "true"}},
-			},
-			plugin: defaultPlugin,
-			exp:    expGfPluginVersionPresent,
-		},
-		{
-			name: "GF_PLUGIN_VERSION is not present if tracing is enabled but plugin doesn't have a version",
-			cfg: &config.Cfg{
-				Tracing: config.Tracing{
-					OpenTelemetry: config.OpenTelemetryCfg{},
-				},
-				PluginSettings: map[string]map[string]string{pluginID: {"tracing": "true"}},
-			},
-			plugin: pluginWithoutVersion,
-			exp:    expGfPluginVersionNotPresent,
-		},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			envVarsProvider := NewProvider(tc.cfg, nil)
-			envVars := envVarsProvider.Get(context.Background(), tc.plugin)
-			tc.exp(t, envVars)
-		})
-	}
-}
-
-func TestInitializer_authEnvVars(t *testing.T) {
-	t.Run("backend datasource with auth registration", func(t *testing.T) {
-		p := &plugins.Plugin{
-			JSONData: plugins.JSONData{
-				ID:                          "test",
-				ExternalServiceRegistration: &plugindef.ExternalServiceRegistration{},
-			},
-			ExternalService: &auth.ExternalService{
-				ClientID:     "clientID",
-				ClientSecret: "clientSecret",
-				PrivateKey:   "privatePem",
-			},
-		}
-
-		envVarsProvider := NewProvider(&config.Cfg{
-			GrafanaAppURL: "https://myorg.com/",
-		}, nil)
-		envVars := envVarsProvider.Get(context.Background(), p)
-		assert.Equal(t, "GF_VERSION=", envVars[0])
-		assert.Equal(t, "GF_APP_URL=https://myorg.com/", envVars[1])
-		assert.Equal(t, "GF_PLUGIN_APP_CLIENT_ID=clientID", envVars[2])
-		assert.Equal(t, "GF_PLUGIN_APP_CLIENT_SECRET=clientSecret", envVars[3])
-		assert.Equal(t, "GF_PLUGIN_APP_PRIVATE_KEY=privatePem", envVars[4])
-	})
-}
-
-func TestInitalizer_awsEnvVars(t *testing.T) {
-	t.Run("backend datasource with aws settings", func(t *testing.T) {
-		p := &plugins.Plugin{}
-		envVarsProvider := NewProvider(&config.Cfg{
-			AWSAssumeRoleEnabled:    true,
-			AWSAllowedAuthProviders: []string{"grafana_assume_role", "keys"},
-			AWSExternalId:           "mock_external_id",
-		}, nil)
-		envVars := envVarsProvider.Get(context.Background(), p)
-		assert.ElementsMatch(t, []string{"GF_VERSION=", "AWS_AUTH_AssumeRoleEnabled=true", "AWS_AUTH_AllowedAuthProviders=grafana_assume_role,keys", "AWS_AUTH_EXTERNAL_ID=mock_external_id"}, envVars)
-	})
-}
-
-func TestInitializer_featureToggleEnvVar(t *testing.T) {
-	t.Run("backend datasource with feature toggle", func(t *testing.T) {
-		expectedFeatures := []string{"feat-1", "feat-2"}
-		featuresLookup := map[string]bool{
-			expectedFeatures[0]: true,
-			expectedFeatures[1]: true,
-		}
-
-		p := &plugins.Plugin{}
-		envVarsProvider := NewProvider(&config.Cfg{
-			Features: featuremgmt.WithFeatures(expectedFeatures[0], true, expectedFeatures[1], true),
-		}, nil)
-		envVars := envVarsProvider.Get(context.Background(), p)
-
-		assert.Equal(t, 2, len(envVars))
-
-		toggleExpression := strings.Split(envVars[1], "=")
-		assert.Equal(t, 2, len(toggleExpression))
-
-		assert.Equal(t, "GF_INSTANCE_FEATURE_TOGGLES_ENABLE", toggleExpression[0])
-
-		toggleArgs := toggleExpression[1]
-		features := strings.Split(toggleArgs, ",")
-
-		assert.Equal(t, len(expectedFeatures), len(features))
-
-		// this is necessary because the features are not returned in the order they are provided
-		for _, f := range features {
-			_, ok := featuresLookup[f]
-			assert.True(t, ok)
-		}
-	})
-}
-
-func TestService_GetConfigMap(t *testing.T) {
-	tcs := []struct {
-		name     string
-		cfg      *config.Cfg
-		expected map[string]string
-	}{
-		{
-			name: "Both features and proxy settings enabled",
-			cfg: &config.Cfg{
-				Features: featuremgmt.WithFeatures("feat-2", "feat-500", "feat-1"),
-				ProxySettings: setting.SecureSocksDSProxySettings{
-					Enabled:      true,
-					ShowUI:       true,
-					ClientCert:   "c3rt",
-					ClientKey:    "k3y",
-					RootCA:       "ca",
-					ProxyAddress: "https://proxy.grafana.com",
-					ServerName:   "secureProxy",
-				},
-			},
-			expected: map[string]string{
-				"GF_INSTANCE_FEATURE_TOGGLES_ENABLE":              "feat-1,feat-2,feat-500",
-				"GF_SECURE_SOCKS_DATASOURCE_PROXY_SERVER_ENABLED": "true",
-				"GF_SECURE_SOCKS_DATASOURCE_PROXY_CLIENT_CERT":    "c3rt",
-				"GF_SECURE_SOCKS_DATASOURCE_PROXY_CLIENT_KEY":     "k3y",
-				"GF_SECURE_SOCKS_DATASOURCE_PROXY_ROOT_CA_CERT":   "ca",
-				"GF_SECURE_SOCKS_DATASOURCE_PROXY_PROXY_ADDRESS":  "https://proxy.grafana.com",
-				"GF_SECURE_SOCKS_DATASOURCE_PROXY_SERVER_NAME":    "secureProxy",
-			},
-		},
-		{
-			name: "Features enabled but proxy settings disabled",
-			cfg: &config.Cfg{
-				Features: featuremgmt.WithFeatures("feat-2", "feat-500", "feat-1"),
-				ProxySettings: setting.SecureSocksDSProxySettings{
-					Enabled:      false,
-					ShowUI:       true,
-					ClientCert:   "c3rt",
-					ClientKey:    "k3y",
-					RootCA:       "ca",
-					ProxyAddress: "https://proxy.grafana.com",
-					ServerName:   "secureProxy",
-				},
-			},
-			expected: map[string]string{
-				"GF_INSTANCE_FEATURE_TOGGLES_ENABLE": "feat-1,feat-2,feat-500",
-			},
-		},
-		{
-			name: "Both features and proxy settings disabled",
-			cfg: &config.Cfg{
-				Features: featuremgmt.WithFeatures("feat-2", false),
-				ProxySettings: setting.SecureSocksDSProxySettings{
-					Enabled:      false,
-					ShowUI:       true,
-					ClientCert:   "c3rt",
-					ClientKey:    "k3y",
-					RootCA:       "ca",
-					ProxyAddress: "https://proxy.grafana.com",
-					ServerName:   "secureProxy",
-				},
-			},
-			expected: map[string]string{},
-		},
-		{
-			name: "Both features and proxy settings empty",
-			cfg: &config.Cfg{
-				Features:      nil,
-				ProxySettings: setting.SecureSocksDSProxySettings{},
-			},
-			expected: map[string]string{},
-		},
-	}
-	for _, tc := range tcs {
-		t.Run(tc.name, func(t *testing.T) {
-			s := &Service{
-				cfg: tc.cfg,
-			}
-			require.Equal(t, tc.expected, s.GetConfigMap(context.Background(), "", nil))
-		})
-	}
-}
-
-func TestService_GetConfigMap_featureToggles(t *testing.T) {
-	t.Run("Feature toggles list is deterministic", func(t *testing.T) {
-		tcs := []struct {
-			enabledFeatures []string
-			expectedConfig  map[string]string
-		}{
-			{
-				enabledFeatures: nil,
-				expectedConfig:  map[string]string{},
-			},
-			{
-				enabledFeatures: []string{},
-				expectedConfig:  map[string]string{},
-			},
-			{
-				enabledFeatures: []string{"A", "B", "C"},
-				expectedConfig:  map[string]string{"GF_INSTANCE_FEATURE_TOGGLES_ENABLE": "A,B,C"},
-			},
-			{
-				enabledFeatures: []string{"C", "B", "A"},
-				expectedConfig:  map[string]string{"GF_INSTANCE_FEATURE_TOGGLES_ENABLE": "A,B,C"},
-			},
-			{
-				enabledFeatures: []string{"b", "a", "c", "d"},
-				expectedConfig:  map[string]string{"GF_INSTANCE_FEATURE_TOGGLES_ENABLE": "a,b,c,d"},
-			},
-		}
-
-		for _, tc := range tcs {
-			s := &Service{
-				cfg: &config.Cfg{
-					Features: fakes.NewFakeFeatureToggles(tc.enabledFeatures...),
-				},
-			}
-			require.Equal(t, tc.expectedConfig, s.GetConfigMap(context.Background(), "", nil))
-		}
-	})
-}
diff --git a/pkg/plugins/ifaces.go b/pkg/plugins/ifaces.go
index 2ea6bf6dccbad..aa3dcd0180b40 100644
--- a/pkg/plugins/ifaces.go
+++ b/pkg/plugins/ifaces.go
@@ -14,7 +14,7 @@ type Installer interface {
 	// Add adds a new plugin.
 	Add(ctx context.Context, pluginID, version string, opts CompatOpts) error
 	// Remove removes an existing plugin.
-	Remove(ctx context.Context, pluginID string) error
+	Remove(ctx context.Context, pluginID, version string) error
 }
 
 type PluginSource interface {
@@ -25,7 +25,7 @@ type PluginSource interface {
 
 type FileStore interface {
 	// File retrieves a plugin file.
-	File(ctx context.Context, pluginID, filename string) (*File, error)
+	File(ctx context.Context, pluginID, pluginVersion, filename string) (*File, error)
 }
 
 type File struct {
@@ -99,11 +99,6 @@ type BackendFactoryProvider interface {
 	BackendFactory(ctx context.Context, p *Plugin) backendplugin.PluginFactoryFunc
 }
 
-type RendererManager interface {
-	// Renderer returns a renderer plugin.
-	Renderer(ctx context.Context) *Plugin
-}
-
 type SecretsPluginManager interface {
 	// SecretsManager returns a secretsmanager plugin
 	SecretsManager(ctx context.Context) *Plugin
@@ -154,11 +149,6 @@ func (fn ClientMiddlewareFunc) CreateClientMiddleware(next Client) Client {
 	return fn(next)
 }
 
-type FeatureToggles interface {
-	IsEnabled(flag string) bool
-	GetEnabled(ctx context.Context) map[string]bool
-}
-
 type SignatureCalculator interface {
 	Calculate(ctx context.Context, src PluginSource, plugin FoundPlugin) (Signature, error)
 }
diff --git a/pkg/plugins/log/fake.go b/pkg/plugins/log/fake.go
index 2a4f0163ac2af..94fe67bff9bd9 100644
--- a/pkg/plugins/log/fake.go
+++ b/pkg/plugins/log/fake.go
@@ -1,6 +1,9 @@
 package log
 
-import "context"
+import (
+	"context"
+	"sync"
+)
 
 var _ Logger = (*TestLogger)(nil)
 
@@ -20,27 +23,19 @@ func (f *TestLogger) New(_ ...any) Logger {
 }
 
 func (f *TestLogger) Info(msg string, ctx ...any) {
-	f.InfoLogs.Calls++
-	f.InfoLogs.Message = msg
-	f.InfoLogs.Ctx = ctx
+	f.InfoLogs.Call(msg, ctx)
 }
 
 func (f *TestLogger) Warn(msg string, ctx ...any) {
-	f.WarnLogs.Calls++
-	f.WarnLogs.Message = msg
-	f.WarnLogs.Ctx = ctx
+	f.WarnLogs.Call(msg, ctx)
 }
 
 func (f *TestLogger) Debug(msg string, ctx ...any) {
-	f.DebugLogs.Calls++
-	f.DebugLogs.Message = msg
-	f.DebugLogs.Ctx = ctx
+	f.DebugLogs.Call(msg, ctx)
 }
 
 func (f *TestLogger) Error(msg string, ctx ...any) {
-	f.ErrorLogs.Calls++
-	f.ErrorLogs.Message = msg
-	f.ErrorLogs.Ctx = ctx
+	f.ErrorLogs.Call(msg, ctx)
 }
 
 func (f *TestLogger) FromContext(_ context.Context) Logger {
@@ -51,6 +46,16 @@ type Logs struct {
 	Calls   int
 	Message string
 	Ctx     []any
+
+	mu sync.Mutex
+}
+
+func (l *Logs) Call(msg string, ctx ...any) {
+	l.mu.Lock()
+	defer l.mu.Unlock()
+	l.Calls++
+	l.Message = msg
+	l.Ctx = ctx
 }
 
 var _ PrettyLogger = (*TestPrettyLogger)(nil)
diff --git a/pkg/plugins/manager/client/client.go b/pkg/plugins/manager/client/client.go
index 9914b615f2ecf..aed1acd6e6514 100644
--- a/pkg/plugins/manager/client/client.go
+++ b/pkg/plugins/manager/client/client.go
@@ -10,7 +10,6 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 
 	"github.com/grafana/grafana/pkg/plugins"
-	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/manager/registry"
 )
 
@@ -29,13 +28,11 @@ var (
 
 type Service struct {
 	pluginRegistry registry.Service
-	cfg            *config.Cfg
 }
 
-func ProvideService(pluginRegistry registry.Service, cfg *config.Cfg) *Service {
+func ProvideService(pluginRegistry registry.Service) *Service {
 	return &Service{
 		pluginRegistry: pluginRegistry,
-		cfg:            cfg,
 	}
 }
 
@@ -44,7 +41,7 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest)
 		return nil, errNilRequest
 	}
 
-	p, exists := s.plugin(ctx, req.PluginContext.PluginID)
+	p, exists := s.plugin(ctx, req.PluginContext.PluginID, req.PluginContext.PluginVersion)
 	if !exists {
 		return nil, plugins.ErrPluginNotRegistered
 	}
@@ -87,7 +84,7 @@ func (s *Service) CallResource(ctx context.Context, req *backend.CallResourceReq
 		return errNilSender
 	}
 
-	p, exists := s.plugin(ctx, req.PluginContext.PluginID)
+	p, exists := s.plugin(ctx, req.PluginContext.PluginID, req.PluginContext.PluginVersion)
 	if !exists {
 		return plugins.ErrPluginNotRegistered
 	}
@@ -130,7 +127,7 @@ func (s *Service) CollectMetrics(ctx context.Context, req *backend.CollectMetric
 		return nil, errNilRequest
 	}
 
-	p, exists := s.plugin(ctx, req.PluginContext.PluginID)
+	p, exists := s.plugin(ctx, req.PluginContext.PluginID, req.PluginContext.PluginVersion)
 	if !exists {
 		return nil, plugins.ErrPluginNotRegistered
 	}
@@ -152,7 +149,7 @@ func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthReque
 		return nil, errNilRequest
 	}
 
-	p, exists := s.plugin(ctx, req.PluginContext.PluginID)
+	p, exists := s.plugin(ctx, req.PluginContext.PluginID, req.PluginContext.PluginVersion)
 	if !exists {
 		return nil, plugins.ErrPluginNotRegistered
 	}
@@ -182,7 +179,7 @@ func (s *Service) SubscribeStream(ctx context.Context, req *backend.SubscribeStr
 		return nil, errNilRequest
 	}
 
-	plugin, exists := s.plugin(ctx, req.PluginContext.PluginID)
+	plugin, exists := s.plugin(ctx, req.PluginContext.PluginID, req.PluginContext.PluginVersion)
 	if !exists {
 		return nil, plugins.ErrPluginNotRegistered
 	}
@@ -195,7 +192,7 @@ func (s *Service) PublishStream(ctx context.Context, req *backend.PublishStreamR
 		return nil, errNilRequest
 	}
 
-	plugin, exists := s.plugin(ctx, req.PluginContext.PluginID)
+	plugin, exists := s.plugin(ctx, req.PluginContext.PluginID, req.PluginContext.PluginVersion)
 	if !exists {
 		return nil, plugins.ErrPluginNotRegistered
 	}
@@ -212,7 +209,7 @@ func (s *Service) RunStream(ctx context.Context, req *backend.RunStreamRequest,
 		return errNilSender
 	}
 
-	plugin, exists := s.plugin(ctx, req.PluginContext.PluginID)
+	plugin, exists := s.plugin(ctx, req.PluginContext.PluginID, req.PluginContext.PluginVersion)
 	if !exists {
 		return plugins.ErrPluginNotRegistered
 	}
@@ -221,8 +218,8 @@ func (s *Service) RunStream(ctx context.Context, req *backend.RunStreamRequest,
 }
 
 // plugin finds a plugin with `pluginID` from the registry that is not decommissioned
-func (s *Service) plugin(ctx context.Context, pluginID string) (*plugins.Plugin, bool) {
-	p, exists := s.pluginRegistry.Plugin(ctx, pluginID)
+func (s *Service) plugin(ctx context.Context, pluginID, pluginVersion string) (*plugins.Plugin, bool) {
+	p, exists := s.pluginRegistry.Plugin(ctx, pluginID, pluginVersion)
 	if !exists {
 		return nil, false
 	}
diff --git a/pkg/plugins/manager/client/client_test.go b/pkg/plugins/manager/client/client_test.go
index 7c32f97526c12..c6649b2f9dd7e 100644
--- a/pkg/plugins/manager/client/client_test.go
+++ b/pkg/plugins/manager/client/client_test.go
@@ -10,7 +10,6 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin"
-	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/manager/fakes"
 	"github.com/stretchr/testify/require"
 )
@@ -18,7 +17,7 @@ import (
 func TestQueryData(t *testing.T) {
 	t.Run("Empty registry should return not registered error", func(t *testing.T) {
 		registry := fakes.NewFakePluginRegistry()
-		client := ProvideService(registry, &config.Cfg{})
+		client := ProvideService(registry)
 		_, err := client.QueryData(context.Background(), &backend.QueryDataRequest{})
 		require.Error(t, err)
 		require.ErrorIs(t, err, plugins.ErrPluginNotRegistered)
@@ -63,7 +62,7 @@ func TestQueryData(t *testing.T) {
 				err := registry.Add(context.Background(), p)
 				require.NoError(t, err)
 
-				client := ProvideService(registry, &config.Cfg{})
+				client := ProvideService(registry)
 				_, err = client.QueryData(context.Background(), &backend.QueryDataRequest{
 					PluginContext: backend.PluginContext{
 						PluginID: "grafana",
@@ -79,7 +78,7 @@ func TestQueryData(t *testing.T) {
 func TestCheckHealth(t *testing.T) {
 	t.Run("empty plugin registry should return plugin not registered error", func(t *testing.T) {
 		registry := fakes.NewFakePluginRegistry()
-		client := ProvideService(registry, &config.Cfg{})
+		client := ProvideService(registry)
 		_, err := client.CheckHealth(context.Background(), &backend.CheckHealthRequest{})
 		require.Error(t, err)
 		require.ErrorIs(t, err, plugins.ErrPluginNotRegistered)
@@ -125,7 +124,7 @@ func TestCheckHealth(t *testing.T) {
 				err := registry.Add(context.Background(), p)
 				require.NoError(t, err)
 
-				client := ProvideService(registry, &config.Cfg{})
+				client := ProvideService(registry)
 				_, err = client.CheckHealth(context.Background(), &backend.CheckHealthRequest{
 					PluginContext: backend.PluginContext{
 						PluginID: "grafana",
@@ -189,7 +188,7 @@ func TestCallResource(t *testing.T) {
 		err := registry.Add(context.Background(), p)
 		require.NoError(t, err)
 
-		client := ProvideService(registry, &config.Cfg{})
+		client := ProvideService(registry)
 
 		err = client.CallResource(context.Background(), req, sender)
 		require.NoError(t, err)
@@ -252,7 +251,7 @@ func TestCallResource(t *testing.T) {
 		err := registry.Add(context.Background(), p)
 		require.NoError(t, err)
 
-		client := ProvideService(registry, &config.Cfg{})
+		client := ProvideService(registry)
 
 		err = client.CallResource(context.Background(), req, sender)
 		require.NoError(t, err)
@@ -298,7 +297,7 @@ func TestCallResource(t *testing.T) {
 		err := registry.Add(context.Background(), p)
 		require.NoError(t, err)
 
-		client := ProvideService(registry, &config.Cfg{})
+		client := ProvideService(registry)
 
 		err = client.CallResource(context.Background(), req, sender)
 		require.NoError(t, err)
@@ -366,7 +365,7 @@ func TestCallResource(t *testing.T) {
 				err := registry.Add(context.Background(), p)
 				require.NoError(t, err)
 
-				client := ProvideService(registry, &config.Cfg{})
+				client := ProvideService(registry)
 
 				err = client.CallResource(context.Background(), req, sender)
 				require.NoError(t, err)
diff --git a/pkg/plugins/manager/fakes/fakes.go b/pkg/plugins/manager/fakes/fakes.go
index 908a3cfd5064a..361d2d90d237a 100644
--- a/pkg/plugins/manager/fakes/fakes.go
+++ b/pkg/plugins/manager/fakes/fakes.go
@@ -13,7 +13,7 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/auth"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin"
 	"github.com/grafana/grafana/pkg/plugins/log"
-	"github.com/grafana/grafana/pkg/plugins/plugindef"
+	"github.com/grafana/grafana/pkg/plugins/pfs"
 	"github.com/grafana/grafana/pkg/plugins/repo"
 	"github.com/grafana/grafana/pkg/plugins/storage"
 )
@@ -176,7 +176,7 @@ func NewFakePluginRegistry() *FakePluginRegistry {
 	}
 }
 
-func (f *FakePluginRegistry) Plugin(_ context.Context, id string) (*plugins.Plugin, bool) {
+func (f *FakePluginRegistry) Plugin(_ context.Context, id, _ string) (*plugins.Plugin, bool) {
 	p, exists := f.Store[id]
 	return p, exists
 }
@@ -195,7 +195,7 @@ func (f *FakePluginRegistry) Add(_ context.Context, p *plugins.Plugin) error {
 	return nil
 }
 
-func (f *FakePluginRegistry) Remove(_ context.Context, id string) error {
+func (f *FakePluginRegistry) Remove(_ context.Context, id, _ string) error {
 	delete(f.Store, id)
 	return nil
 }
@@ -255,6 +255,21 @@ func (s *FakePluginStorage) Extract(ctx context.Context, pluginID string, dirNam
 	return &storage.ExtractedPluginArchive{}, nil
 }
 
+type FakePluginEnvProvider struct {
+	PluginEnvVarsFunc func(ctx context.Context, plugin *plugins.Plugin) []string
+}
+
+func NewFakePluginEnvProvider() *FakePluginEnvProvider {
+	return &FakePluginEnvProvider{}
+}
+
+func (p *FakePluginEnvProvider) PluginEnvVars(ctx context.Context, plugin *plugins.Plugin) []string {
+	if p.PluginEnvVarsFunc != nil {
+		return p.PluginEnvVarsFunc(ctx, plugin)
+	}
+	return []string{}
+}
+
 type FakeProcessManager struct {
 	StartFunc func(_ context.Context, p *plugins.Plugin) error
 	StopFunc  func(_ context.Context, p *plugins.Plugin) error
@@ -423,12 +438,12 @@ func (s *FakePluginSource) DefaultSignature(ctx context.Context) (plugins.Signat
 }
 
 type FakePluginFileStore struct {
-	FileFunc func(ctx context.Context, pluginID, filename string) (*plugins.File, error)
+	FileFunc func(ctx context.Context, pluginID, pluginVersion, filename string) (*plugins.File, error)
 }
 
-func (f *FakePluginFileStore) File(ctx context.Context, pluginID, filename string) (*plugins.File, error) {
+func (f *FakePluginFileStore) File(ctx context.Context, pluginID, pluginVersion, filename string) (*plugins.File, error) {
 	if f.FileFunc != nil {
-		return f.FileFunc(ctx, pluginID, filename)
+		return f.FileFunc(ctx, pluginID, pluginVersion, filename)
 	}
 	return nil, nil
 }
@@ -437,10 +452,18 @@ type FakeAuthService struct {
 	Result *auth.ExternalService
 }
 
-func (f *FakeAuthService) RegisterExternalService(ctx context.Context, name string, svc *plugindef.ExternalServiceRegistration) (*auth.ExternalService, error) {
+func (f *FakeAuthService) HasExternalService(ctx context.Context, pluginID string) (bool, error) {
+	return f.Result != nil, nil
+}
+
+func (f *FakeAuthService) RegisterExternalService(ctx context.Context, pluginID string, pType pfs.Type, svc *pfs.IAM) (*auth.ExternalService, error) {
 	return f.Result, nil
 }
 
+func (f *FakeAuthService) RemoveExternalService(ctx context.Context, pluginID string) error {
+	return nil
+}
+
 type FakeDiscoverer struct {
 	DiscoverFunc func(ctx context.Context, src plugins.PluginSource) ([]*plugins.FoundBundle, error)
 }
@@ -566,26 +589,3 @@ func (p *FakeBackendPlugin) Kill() {
 	defer p.mutex.Unlock()
 	p.Running = false
 }
-
-type FakeFeatureToggles struct {
-	features map[string]bool
-}
-
-func NewFakeFeatureToggles(features ...string) *FakeFeatureToggles {
-	m := make(map[string]bool)
-	for _, f := range features {
-		m[f] = true
-	}
-
-	return &FakeFeatureToggles{
-		features: m,
-	}
-}
-
-func (f *FakeFeatureToggles) GetEnabled(_ context.Context) map[string]bool {
-	return f.features
-}
-
-func (f *FakeFeatureToggles) IsEnabled(feature string) bool {
-	return f.features[feature]
-}
diff --git a/pkg/plugins/manager/filestore/fs.go b/pkg/plugins/manager/filestore/fs.go
index 6d133d7bc6dd8..155880eb570f5 100644
--- a/pkg/plugins/manager/filestore/fs.go
+++ b/pkg/plugins/manager/filestore/fs.go
@@ -21,8 +21,8 @@ func ProvideService(pluginRegistry registry.Service) *Service {
 	}
 }
 
-func (s *Service) File(ctx context.Context, pluginID, filename string) (*plugins.File, error) {
-	if p, exists := s.pluginRegistry.Plugin(ctx, pluginID); exists {
+func (s *Service) File(ctx context.Context, pluginID, pluginVersion, filename string) (*plugins.File, error) {
+	if p, exists := s.pluginRegistry.Plugin(ctx, pluginID, pluginVersion); exists {
 		f, err := p.File(filename)
 		if err != nil {
 			return nil, err
diff --git a/pkg/plugins/manager/installer.go b/pkg/plugins/manager/installer.go
index 249b01b8a5b7b..02aafee67338b 100644
--- a/pkg/plugins/manager/installer.go
+++ b/pkg/plugins/manager/installer.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 
 	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/auth"
 	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/log"
 	"github.com/grafana/grafana/pkg/plugins/manager/loader"
@@ -24,16 +25,18 @@ type PluginInstaller struct {
 	pluginRegistry       registry.Service
 	pluginLoader         loader.Service
 	log                  log.Logger
+	serviceRegistry      auth.ExternalServiceRegistry
 }
 
-func ProvideInstaller(cfg *config.Cfg, pluginRegistry registry.Service, pluginLoader loader.Service,
-	pluginRepo repo.Service) *PluginInstaller {
+func ProvideInstaller(cfg *config.PluginManagementCfg, pluginRegistry registry.Service, pluginLoader loader.Service,
+	pluginRepo repo.Service, serviceRegistry auth.ExternalServiceRegistry) *PluginInstaller {
 	return New(pluginRegistry, pluginLoader, pluginRepo,
-		storage.FileSystem(log.NewPrettyLogger("installer.fs"), cfg.PluginsPath), storage.SimpleDirNameGeneratorFunc)
+		storage.FileSystem(log.NewPrettyLogger("installer.fs"), cfg.PluginsPath), storage.SimpleDirNameGeneratorFunc, serviceRegistry)
 }
 
 func New(pluginRegistry registry.Service, pluginLoader loader.Service, pluginRepo repo.Service,
-	pluginStorage storage.ZipExtractor, pluginStorageDirFunc storage.DirNameGeneratorFunc) *PluginInstaller {
+	pluginStorage storage.ZipExtractor, pluginStorageDirFunc storage.DirNameGeneratorFunc,
+	serviceRegistry auth.ExternalServiceRegistry) *PluginInstaller {
 	return &PluginInstaller{
 		pluginLoader:         pluginLoader,
 		pluginRegistry:       pluginRegistry,
@@ -41,6 +44,7 @@ func New(pluginRegistry registry.Service, pluginLoader loader.Service, pluginRep
 		pluginStorage:        pluginStorage,
 		pluginStorageDirFunc: pluginStorageDirFunc,
 		log:                  log.New("plugin.installer"),
+		serviceRegistry:      serviceRegistry,
 	}
 }
 
@@ -51,7 +55,7 @@ func (m *PluginInstaller) Add(ctx context.Context, pluginID, version string, opt
 	}
 
 	var pluginArchive *repo.PluginArchive
-	if plugin, exists := m.plugin(ctx, pluginID); exists {
+	if plugin, exists := m.plugin(ctx, pluginID, version); exists {
 		if plugin.IsCorePlugin() || plugin.IsBundledPlugin() {
 			return plugins.ErrInstallCorePlugin
 		}
@@ -80,7 +84,7 @@ func (m *PluginInstaller) Add(ctx context.Context, pluginID, version string, opt
 		}
 
 		// remove existing installation of plugin
-		err = m.Remove(ctx, plugin.ID)
+		err = m.Remove(ctx, plugin.ID, plugin.Info.Version)
 		if err != nil {
 			return err
 		}
@@ -135,8 +139,8 @@ func (m *PluginInstaller) Add(ctx context.Context, pluginID, version string, opt
 	return nil
 }
 
-func (m *PluginInstaller) Remove(ctx context.Context, pluginID string) error {
-	plugin, exists := m.plugin(ctx, pluginID)
+func (m *PluginInstaller) Remove(ctx context.Context, pluginID, version string) error {
+	plugin, exists := m.plugin(ctx, pluginID, version)
 	if !exists {
 		return plugins.ErrPluginNotInstalled
 	}
@@ -156,12 +160,16 @@ func (m *PluginInstaller) Remove(ctx context.Context, pluginID string) error {
 		}
 	}
 
-	return nil
+	has, err := m.serviceRegistry.HasExternalService(ctx, pluginID)
+	if err == nil && has {
+		return m.serviceRegistry.RemoveExternalService(ctx, pluginID)
+	}
+	return err
 }
 
 // plugin finds a plugin with `pluginID` from the store
-func (m *PluginInstaller) plugin(ctx context.Context, pluginID string) (*plugins.Plugin, bool) {
-	p, exists := m.pluginRegistry.Plugin(ctx, pluginID)
+func (m *PluginInstaller) plugin(ctx context.Context, pluginID, pluginVersion string) (*plugins.Plugin, bool) {
+	p, exists := m.pluginRegistry.Plugin(ctx, pluginID, pluginVersion)
 	if !exists {
 		return nil, false
 	}
diff --git a/pkg/plugins/manager/installer_test.go b/pkg/plugins/manager/installer_test.go
index 7ed606980be13..7bfadece3af9a 100644
--- a/pkg/plugins/manager/installer_test.go
+++ b/pkg/plugins/manager/installer_test.go
@@ -23,6 +23,8 @@ func TestPluginManager_Add_Remove(t *testing.T) {
 		const (
 			pluginID, v1 = "test-panel", "1.0.0"
 			zipNameV1    = "test-panel-1.0.0.zip"
+			v2           = "2.0.0"
+			zipNameV2    = "test-panel-2.0.0.zip"
 		)
 
 		// mock a plugin to be returned automatically by the plugin loader
@@ -65,7 +67,7 @@ func TestPluginManager_Add_Remove(t *testing.T) {
 			},
 		}
 
-		inst := New(fakes.NewFakePluginRegistry(), loader, pluginRepo, fs, storage.SimpleDirNameGeneratorFunc)
+		inst := New(fakes.NewFakePluginRegistry(), loader, pluginRepo, fs, storage.SimpleDirNameGeneratorFunc, &fakes.FakeAuthService{})
 		err := inst.Add(context.Background(), pluginID, v1, testCompatOpts())
 		require.NoError(t, err)
 
@@ -83,10 +85,6 @@ func TestPluginManager_Add_Remove(t *testing.T) {
 		})
 
 		t.Run("Update plugin to different version", func(t *testing.T) {
-			const (
-				v2        = "2.0.0"
-				zipNameV2 = "test-panel-2.0.0.zip"
-			)
 			// mock a plugin to be returned automatically by the plugin loader
 			pluginV2 := createPlugin(t, pluginID, plugins.ClassExternal, true, true, func(plugin *plugins.Plugin) {
 				plugin.Info.Version = v2
@@ -138,7 +136,7 @@ func TestPluginManager_Add_Remove(t *testing.T) {
 				},
 			}
 
-			err = inst.Remove(context.Background(), pluginID)
+			err = inst.Remove(context.Background(), pluginID, v2)
 			require.NoError(t, err)
 
 			require.Equal(t, []string{pluginID}, unloadedPlugins)
@@ -146,7 +144,7 @@ func TestPluginManager_Add_Remove(t *testing.T) {
 			t.Run("Won't remove if not exists", func(t *testing.T) {
 				inst.pluginRegistry = fakes.NewFakePluginRegistry()
 
-				err = inst.Remove(context.Background(), pluginID)
+				err = inst.Remove(context.Background(), pluginID, v2)
 				require.Equal(t, plugins.ErrPluginNotInstalled, err)
 			})
 		})
@@ -171,7 +169,7 @@ func TestPluginManager_Add_Remove(t *testing.T) {
 				},
 			}
 
-			pm := New(reg, &fakes.FakeLoader{}, &fakes.FakePluginRepo{}, &fakes.FakePluginStorage{}, storage.SimpleDirNameGeneratorFunc)
+			pm := New(reg, &fakes.FakeLoader{}, &fakes.FakePluginRepo{}, &fakes.FakePluginStorage{}, storage.SimpleDirNameGeneratorFunc, &fakes.FakeAuthService{})
 			err := pm.Add(context.Background(), p.ID, "3.2.0", testCompatOpts())
 			require.ErrorIs(t, err, plugins.ErrInstallCorePlugin)
 
@@ -179,7 +177,7 @@ func TestPluginManager_Add_Remove(t *testing.T) {
 			require.Equal(t, plugins.ErrInstallCorePlugin, err)
 
 			t.Run(fmt.Sprintf("Can't uninstall %s plugin", tc.class), func(t *testing.T) {
-				err = pm.Remove(context.Background(), p.ID)
+				err = pm.Remove(context.Background(), p.ID, p.Info.Version)
 				require.Equal(t, plugins.ErrUninstallCorePlugin, err)
 			})
 		}
diff --git a/pkg/plugins/manager/loader/assetpath/assetpath.go b/pkg/plugins/manager/loader/assetpath/assetpath.go
index 90ec28f87d960..eb24b0434a81f 100644
--- a/pkg/plugins/manager/loader/assetpath/assetpath.go
+++ b/pkg/plugins/manager/loader/assetpath/assetpath.go
@@ -10,7 +10,6 @@ import (
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/pluginscdn"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 )
 
 // Service provides methods for constructing asset paths for plugins.
@@ -18,10 +17,10 @@ import (
 // on the plugins CDN, and it will switch to the correct implementation depending on the plugin and the config.
 type Service struct {
 	cdn *pluginscdn.Service
-	cfg *config.Cfg
+	cfg *config.PluginManagementCfg
 }
 
-func ProvideService(cfg *config.Cfg, cdn *pluginscdn.Service) *Service {
+func ProvideService(cfg *config.PluginManagementCfg, cdn *pluginscdn.Service) *Service {
 	return &Service{cfg: cfg, cdn: cdn}
 }
 
@@ -39,7 +38,7 @@ func NewPluginInfo(pluginJSON plugins.JSONData, class plugins.Class, fs plugins.
 	}
 }
 
-func DefaultService(cfg *config.Cfg) *Service {
+func DefaultService(cfg *config.PluginManagementCfg) *Service {
 	return &Service{cfg: cfg, cdn: pluginscdn.ProvideService(cfg)}
 }
 
@@ -47,20 +46,18 @@ func DefaultService(cfg *config.Cfg) *Service {
 func (s *Service) Base(n PluginInfo) (string, error) {
 	if n.class == plugins.ClassCore {
 		baseDir := getBaseDir(n.dir)
-		return path.Join("/", s.cfg.GrafanaAppSubURL, "/public/app/plugins", string(n.pluginJSON.Type), baseDir), nil
+		return path.Join("public/app/plugins", string(n.pluginJSON.Type), baseDir), nil
 	}
 	if s.cdn.PluginSupported(n.pluginJSON.ID) {
 		return s.cdn.AssetURL(n.pluginJSON.ID, n.pluginJSON.Info.Version, "")
 	}
-	return path.Join("/", s.cfg.GrafanaAppSubURL, "/public/plugins", n.pluginJSON.ID), nil
+	return path.Join("public/plugins", n.pluginJSON.ID), nil
 }
 
 // Module returns the module.js path for the specified plugin.
 func (s *Service) Module(n PluginInfo) (string, error) {
 	if n.class == plugins.ClassCore {
-		if s.cfg.Features != nil &&
-			s.cfg.Features.IsEnabled(featuremgmt.FlagExternalCorePlugins) &&
-			filepath.Base(n.dir) == "dist" {
+		if filepath.Base(n.dir) == "dist" {
 			// The core plugin has been built externally, use the module from the dist folder
 		} else {
 			baseDir := getBaseDir(n.dir)
@@ -70,7 +67,7 @@ func (s *Service) Module(n PluginInfo) (string, error) {
 	if s.cdn.PluginSupported(n.pluginJSON.ID) {
 		return s.cdn.AssetURL(n.pluginJSON.ID, n.pluginJSON.Info.Version, "module.js")
 	}
-	return path.Join("/", s.cfg.GrafanaAppSubURL, "/public/plugins", n.pluginJSON.ID, "module.js"), nil
+	return path.Join("public/plugins", n.pluginJSON.ID, "module.js"), nil
 }
 
 // RelativeURL returns the relative URL for an arbitrary plugin asset.
@@ -101,7 +98,7 @@ func (s *Service) RelativeURL(n PluginInfo, pathStr string) (string, error) {
 
 // DefaultLogoPath returns the default logo path for the specified plugin type.
 func (s *Service) DefaultLogoPath(pluginType plugins.Type) string {
-	return path.Join("/", s.cfg.GrafanaAppSubURL, fmt.Sprintf("/public/img/icn-%s.svg", string(pluginType)))
+	return path.Join("public/img", fmt.Sprintf("icn-%s.svg", string(pluginType)))
 }
 
 func getBaseDir(pluginDir string) string {
diff --git a/pkg/plugins/manager/loader/assetpath/assetpath_test.go b/pkg/plugins/manager/loader/assetpath/assetpath_test.go
index 78d32ee75d61c..9802dcfe00b0b 100644
--- a/pkg/plugins/manager/loader/assetpath/assetpath_test.go
+++ b/pkg/plugins/manager/loader/assetpath/assetpath_test.go
@@ -36,7 +36,7 @@ func TestService(t *testing.T) {
 		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
-			cfg := &config.Cfg{
+			cfg := &config.PluginManagementCfg{
 				PluginsCDNURLTemplate: tc.cdnBaseURL,
 				PluginSettings: map[string]map[string]string{
 					"one": {"cdn": "true"},
@@ -69,11 +69,11 @@ func TestService(t *testing.T) {
 
 				base, err = svc.Base(NewPluginInfo(jsonData["two"], plugins.ClassExternal, extPath("two")))
 				require.NoError(t, err)
-				require.Equal(t, "/public/plugins/two", base)
+				require.Equal(t, "public/plugins/two", base)
 
 				base, err = svc.Base(NewPluginInfo(jsonData["table-old"], plugins.ClassCore, tableOldFS))
 				require.NoError(t, err)
-				require.Equal(t, "/public/app/plugins/table-old", base)
+				require.Equal(t, "public/app/plugins/table-old", base)
 			})
 
 			t.Run("Module", func(t *testing.T) {
@@ -86,7 +86,7 @@ func TestService(t *testing.T) {
 
 				module, err = svc.Module(NewPluginInfo(jsonData["two"], plugins.ClassExternal, extPath("two")))
 				require.NoError(t, err)
-				require.Equal(t, "/public/plugins/two/module.js", module)
+				require.Equal(t, "public/plugins/two/module.js", module)
 
 				module, err = svc.Module(NewPluginInfo(jsonData["table-old"], plugins.ClassCore, tableOldFS))
 				require.NoError(t, err)
@@ -116,54 +116,12 @@ func TestService(t *testing.T) {
 
 				u, err = svc.RelativeURL(NewPluginInfo(pluginsMap["two"].JSONData, plugins.ClassExternal, extPath("two")), "path/to/file.txt")
 				require.NoError(t, err)
-				require.Equal(t, "/public/plugins/two/path/to/file.txt", u)
+				require.Equal(t, "public/plugins/two/path/to/file.txt", u)
 
 				u, err = svc.RelativeURL(NewPluginInfo(pluginsMap["two"].JSONData, plugins.ClassExternal, extPath("two")), "default")
 				require.NoError(t, err)
-				require.Equal(t, "/public/plugins/two/default", u)
+				require.Equal(t, "public/plugins/two/default", u)
 			})
 		})
 	}
-
-	t.Run("With App Sub URL", func(t *testing.T) {
-		for _, tc := range []struct {
-			appSubURL string
-		}{
-			{
-				appSubURL: "grafana",
-			},
-			{
-				appSubURL: "/grafana",
-			},
-			{
-				appSubURL: "grafana/",
-			},
-			{
-				appSubURL: "/grafana/",
-			},
-		} {
-			cfg := &config.Cfg{GrafanaAppSubURL: tc.appSubURL}
-			svc := ProvideService(cfg, pluginscdn.ProvideService(cfg))
-
-			dir := "/plugins/test-datasource"
-			p := plugins.JSONData{ID: "test-datasource"}
-			fs := fakes.NewFakePluginFiles(dir)
-
-			base, err := svc.Base(NewPluginInfo(p, plugins.ClassExternal, fs))
-			require.NoError(t, err)
-			require.Equal(t, "/grafana/public/plugins/test-datasource", base)
-
-			mod, err := svc.Module(NewPluginInfo(p, plugins.ClassExternal, fs))
-			require.NoError(t, err)
-			require.Equal(t, "/grafana/public/plugins/test-datasource/module.js", mod)
-
-			base, err = svc.Base(NewPluginInfo(p, plugins.ClassCore, fs))
-			require.NoError(t, err)
-			require.Equal(t, "/grafana/public/app/plugins/test-datasource", base)
-
-			mod, err = svc.Module(NewPluginInfo(p, plugins.ClassCore, fs))
-			require.NoError(t, err)
-			require.Equal(t, "core:plugin/test-datasource", mod)
-		}
-	})
 }
diff --git a/pkg/plugins/manager/loader/finder/local.go b/pkg/plugins/manager/loader/finder/local.go
index a46ab30bc7023..29f3bacfed145 100644
--- a/pkg/plugins/manager/loader/finder/local.go
+++ b/pkg/plugins/manager/loader/finder/local.go
@@ -7,7 +7,6 @@ import (
 	"io"
 	"os"
 	"path/filepath"
-	"runtime"
 	"strings"
 
 	"github.com/grafana/grafana/pkg/infra/fs"
@@ -35,7 +34,7 @@ func NewLocalFinder(devMode bool) *Local {
 	}
 }
 
-func ProvideLocalFinder(cfg *config.Cfg) *Local {
+func ProvideLocalFinder(cfg *config.PluginManagementCfg) *Local {
 	return NewLocalFinder(cfg.DevMode)
 }
 
@@ -103,28 +102,34 @@ func (l *Local) Find(ctx context.Context, src plugins.PluginSource) ([]*plugins.
 		}
 	}
 
-	result := make([]*plugins.FoundBundle, 0, len(foundPlugins))
-	for dir := range foundPlugins {
-		ancestors := strings.Split(dir, string(filepath.Separator))
-		ancestors = ancestors[0 : len(ancestors)-1]
+	// Track child plugins and add them to their parent.
+	childPlugins := make(map[string]struct{})
+	for dir, p := range res {
+		// Check if this plugin is the parent of another plugin.
+		for dir2, p2 := range res {
+			if dir == dir2 {
+				continue
+			}
 
-		pluginPath := ""
-		if runtime.GOOS != "windows" && filepath.IsAbs(dir) {
-			pluginPath = "/"
-		}
-		add := true
-		for _, ancestor := range ancestors {
-			pluginPath = filepath.Join(pluginPath, ancestor)
-			if _, ok := foundPlugins[pluginPath]; ok {
-				if fp, exists := res[pluginPath]; exists {
-					fp.Children = append(fp.Children, &res[dir].Primary)
-					add = false
-					break
-				}
+			relPath, err := filepath.Rel(dir, dir2)
+			if err != nil {
+				l.log.Error("Cannot calculate relative path. Skipping", "pluginId", p2.Primary.JSONData.ID, "err", err)
+				continue
+			}
+			if !strings.Contains(relPath, "..") {
+				child := p2.Primary
+				l.log.Debug("Adding child", "parent", p.Primary.JSONData.ID, "child", child.JSONData.ID, "relPath", relPath)
+				p.Children = append(p.Children, &child)
+				childPlugins[dir2] = struct{}{}
 			}
 		}
-		if add {
-			result = append(result, res[dir])
+	}
+
+	// Remove child plugins from the result (they are already tracked via their parent).
+	result := make([]*plugins.FoundBundle, 0, len(res))
+	for k := range res {
+		if _, ok := childPlugins[k]; !ok {
+			result = append(result, res[k])
 		}
 	}
 
diff --git a/pkg/plugins/manager/loader/finder/local_test.go b/pkg/plugins/manager/loader/finder/local_test.go
index 42cefb50a1aa3..c7ccefbeeb9bd 100644
--- a/pkg/plugins/manager/loader/finder/local_test.go
+++ b/pkg/plugins/manager/loader/finder/local_test.go
@@ -25,6 +25,7 @@ func TestFinder_Find(t *testing.T) {
 	testCases := []struct {
 		name            string
 		pluginDirs      []string
+		pluginClass     plugins.Class
 		expectedBundles []*plugins.FoundBundle
 		err             error
 	}{
@@ -141,6 +142,7 @@ func TestFinder_Find(t *testing.T) {
 									{Name: "img1", Path: "img/screenshot1.png"},
 									{Name: "img2", Path: "img/screenshot2.png"},
 								},
+								Keywords: []string{"test"},
 							},
 							Dependencies: plugins.Dependencies{
 								GrafanaVersion: "3.x.x",
@@ -174,40 +176,19 @@ func TestFinder_Find(t *testing.T) {
 		{
 			name:       "Multiple plugin dirs",
 			pluginDirs: []string{"../../testdata/duplicate-plugins", "../../testdata/invalid-v1-signature"},
-			expectedBundles: []*plugins.FoundBundle{{
-				Primary: plugins.FoundPlugin{
-					JSONData: plugins.JSONData{
-						ID:   "test-app",
-						Type: plugins.TypeDataSource,
-						Name: "Parent",
-						Info: plugins.Info{
-							Author: plugins.InfoLink{
-								Name: "Grafana Labs",
-								URL:  "http://grafana.com",
-							},
-							Description: "Parent plugin",
-							Version:     "1.0.0",
-							Updated:     "2020-10-20",
-						},
-						Dependencies: plugins.Dependencies{
-							GrafanaVersion: "*",
-							Plugins:        []plugins.Dependency{},
-						},
-					},
-					FS: mustNewStaticFSForTests(t, filepath.Join(testData, "duplicate-plugins/nested")),
-				},
-				Children: []*plugins.FoundPlugin{
-					{
+			expectedBundles: []*plugins.FoundBundle{
+				{
+					Primary: plugins.FoundPlugin{
 						JSONData: plugins.JSONData{
 							ID:   "test-app",
 							Type: plugins.TypeDataSource,
-							Name: "Child",
+							Name: "Parent",
 							Info: plugins.Info{
 								Author: plugins.InfoLink{
 									Name: "Grafana Labs",
 									URL:  "http://grafana.com",
 								},
-								Description: "Child plugin",
+								Description: "Parent plugin",
 								Version:     "1.0.0",
 								Updated:     "2020-10-20",
 							},
@@ -216,10 +197,32 @@ func TestFinder_Find(t *testing.T) {
 								Plugins:        []plugins.Dependency{},
 							},
 						},
-						FS: mustNewStaticFSForTests(t, filepath.Join(testData, "duplicate-plugins/nested/nested")),
+						FS: mustNewStaticFSForTests(t, filepath.Join(testData, "duplicate-plugins/nested")),
+					},
+					Children: []*plugins.FoundPlugin{
+						{
+							JSONData: plugins.JSONData{
+								ID:   "test-app",
+								Type: plugins.TypeDataSource,
+								Name: "Child",
+								Info: plugins.Info{
+									Author: plugins.InfoLink{
+										Name: "Grafana Labs",
+										URL:  "http://grafana.com",
+									},
+									Description: "Child plugin",
+									Version:     "1.0.0",
+									Updated:     "2020-10-20",
+								},
+								Dependencies: plugins.Dependencies{
+									GrafanaVersion: "*",
+									Plugins:        []plugins.Dependency{},
+								},
+							},
+							FS: mustNewStaticFSForTests(t, filepath.Join(testData, "duplicate-plugins/nested/nested")),
+						},
 					},
 				},
-			},
 				{
 					Primary: plugins.FoundPlugin{
 						JSONData: plugins.JSONData{
@@ -245,11 +248,46 @@ func TestFinder_Find(t *testing.T) {
 				},
 			},
 		},
+		{
+			name:        "Plugin with dist folder (core class)",
+			pluginDirs:  []string{filepath.Join(testData, "plugin-with-dist")},
+			pluginClass: plugins.ClassCore,
+			expectedBundles: []*plugins.FoundBundle{
+				{
+					Primary: plugins.FoundPlugin{
+						JSONData: plugins.JSONData{
+							ID:   "test-datasource",
+							Type: plugins.TypeDataSource,
+							Name: "Test",
+							Info: plugins.Info{
+								Author: plugins.InfoLink{
+									Name: "Will Browne",
+									URL:  "https://willbrowne.com",
+								},
+								Description: "Test",
+								Version:     "1.0.0",
+							},
+							Dependencies: plugins.Dependencies{
+								GrafanaVersion: "*",
+								Plugins:        []plugins.Dependency{},
+							},
+							State:      plugins.ReleaseStateAlpha,
+							Backend:    true,
+							Executable: "test",
+						},
+						FS: mustNewStaticFSForTests(t, filepath.Join(testData, "plugin-with-dist/plugin/dist")),
+					},
+				},
+			},
+		},
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			f := NewLocalFinder(false)
 			pluginBundles, err := f.Find(context.Background(), &fakes.FakePluginSource{
+				PluginClassFunc: func(ctx context.Context) plugins.Class {
+					return tc.pluginClass
+				},
 				PluginURIsFunc: func(ctx context.Context) []string {
 					return tc.pluginDirs
 				},
diff --git a/pkg/plugins/manager/loader/loader.go b/pkg/plugins/manager/loader/loader.go
index c6b85bbb5f4ed..91b2175664e39 100644
--- a/pkg/plugins/manager/loader/loader.go
+++ b/pkg/plugins/manager/loader/loader.go
@@ -75,6 +75,10 @@ func (l *Loader) instrumentLoad(ctx context.Context, src plugins.PluginSource) f
 
 	return func(logger log.Logger, start time.Time) func([]*plugins.Plugin) {
 		return func(plugins []*plugins.Plugin) {
+			if len(plugins) == 0 {
+				logger.Debug("Plugin source loaded, though no plugins were found")
+				return
+			}
 			names := make([]string, len(plugins))
 			for i, p := range plugins {
 				names[i] = p.ID
diff --git a/pkg/plugins/manager/loader/loader_test.go b/pkg/plugins/manager/loader/loader_test.go
index 3cb3b18b32ca2..63471d8c53552 100644
--- a/pkg/plugins/manager/loader/loader_test.go
+++ b/pkg/plugins/manager/loader/loader_test.go
@@ -60,14 +60,14 @@ func TestLoader_Load(t *testing.T) {
 	tests := []struct {
 		name        string
 		class       plugins.Class
-		cfg         *config.Cfg
+		cfg         *config.PluginManagementCfg
 		pluginPaths []string
 		want        []*plugins.Plugin
 	}{
 		{
 			name:        "Load a Core plugin",
 			class:       plugins.ClassCore,
-			cfg:         &config.Cfg{},
+			cfg:         &config.PluginManagementCfg{},
 			pluginPaths: []string{filepath.Join(corePluginDir, "app/plugins/datasource/cloudwatch")},
 			want: []*plugins.Plugin{
 				{
@@ -82,8 +82,8 @@ func TestLoader_Load(t *testing.T) {
 							},
 							Description: "Data source for Amazon AWS monitoring service",
 							Logos: plugins.Logos{
-								Small: "/public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png",
-								Large: "/public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png",
+								Small: "public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png",
+								Large: "public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png",
 							},
 						},
 						Includes: []*plugins.Includes{
@@ -105,9 +105,8 @@ func TestLoader_Load(t *testing.T) {
 						Backend:      true,
 						QueryOptions: map[string]bool{"minInterval": true},
 					},
-					Module:  "core:plugin/cloudwatch",
-					BaseURL: "/public/app/plugins/datasource/cloudwatch",
-
+					Module:    "core:plugin/cloudwatch",
+					BaseURL:   "public/app/plugins/datasource/cloudwatch",
 					FS:        mustNewStaticFSForTests(t, filepath.Join(corePluginDir, "app/plugins/datasource/cloudwatch")),
 					Signature: plugins.SignatureStatusInternal,
 					Class:     plugins.ClassCore,
@@ -117,7 +116,7 @@ func TestLoader_Load(t *testing.T) {
 		{
 			name:        "Load a Bundled plugin",
 			class:       plugins.ClassBundled,
-			cfg:         &config.Cfg{},
+			cfg:         &config.PluginManagementCfg{},
 			pluginPaths: []string{"../testdata/valid-v2-signature"},
 			want: []*plugins.Plugin{
 				{
@@ -132,8 +131,8 @@ func TestLoader_Load(t *testing.T) {
 							},
 							Version: "1.0.0",
 							Logos: plugins.Logos{
-								Small: "/public/img/icn-datasource.svg",
-								Large: "/public/img/icn-datasource.svg",
+								Small: "public/img/icn-datasource.svg",
+								Large: "public/img/icn-datasource.svg",
 							},
 							Description: "Test",
 						},
@@ -145,8 +144,8 @@ func TestLoader_Load(t *testing.T) {
 						Backend:    true,
 						State:      "alpha",
 					},
-					Module:        "/public/plugins/test-datasource/module.js",
-					BaseURL:       "/public/plugins/test-datasource",
+					Module:        "public/plugins/test-datasource/module.js",
+					BaseURL:       "public/plugins/test-datasource",
 					FS:            mustNewStaticFSForTests(t, filepath.Join(parentDir, "testdata/valid-v2-signature/plugin/")),
 					Signature:     "valid",
 					SignatureType: plugins.SignatureTypeGrafana,
@@ -154,10 +153,11 @@ func TestLoader_Load(t *testing.T) {
 					Class:         plugins.ClassBundled,
 				},
 			},
-		}, {
+		},
+		{
 			name:        "Load plugin with symbolic links",
 			class:       plugins.ClassExternal,
-			cfg:         &config.Cfg{},
+			cfg:         &config.PluginManagementCfg{},
 			pluginPaths: []string{"../testdata/symbolic-plugin-dirs"},
 			want: []*plugins.Plugin{
 				{
@@ -171,8 +171,8 @@ func TestLoader_Load(t *testing.T) {
 								URL:  "http://test.com",
 							},
 							Logos: plugins.Logos{
-								Small: "/public/plugins/test-app/img/logo_small.png",
-								Large: "/public/plugins/test-app/img/logo_large.png",
+								Small: "public/plugins/test-app/img/logo_small.png",
+								Large: "public/plugins/test-app/img/logo_large.png",
 							},
 							Links: []plugins.InfoLink{
 								{Name: "Project site", URL: "http://project.com"},
@@ -180,11 +180,12 @@ func TestLoader_Load(t *testing.T) {
 							},
 							Description: "Official Grafana Test App & Dashboard bundle",
 							Screenshots: []plugins.Screenshots{
-								{Path: "/public/plugins/test-app/img/screenshot1.png", Name: "img1"},
-								{Path: "/public/plugins/test-app/img/screenshot2.png", Name: "img2"},
+								{Path: "public/plugins/test-app/img/screenshot1.png", Name: "img1"},
+								{Path: "public/plugins/test-app/img/screenshot2.png", Name: "img2"},
 							},
-							Version: "1.0.0",
-							Updated: "2015-02-10",
+							Version:  "1.0.0",
+							Updated:  "2015-02-10",
+							Keywords: []string{"test"},
 						},
 						Dependencies: plugins.Dependencies{
 							GrafanaVersion: "3.x.x",
@@ -212,7 +213,8 @@ func TestLoader_Load(t *testing.T) {
 								Name: "Nginx Panel",
 								Type: string(plugins.TypePanel),
 								Role: org.RoleViewer,
-								Slug: "nginx-panel"},
+								Slug: "nginx-panel",
+							},
 							{
 								Name: "Nginx Datasource",
 								Type: string(plugins.TypeDataSource),
@@ -222,18 +224,19 @@ func TestLoader_Load(t *testing.T) {
 						},
 					},
 					Class:         plugins.ClassExternal,
-					Module:        "/public/plugins/test-app/module.js",
-					BaseURL:       "/public/plugins/test-app",
+					Module:        "public/plugins/test-app/module.js",
+					BaseURL:       "public/plugins/test-app",
 					FS:            mustNewStaticFSForTests(t, filepath.Join(parentDir, "testdata/includes-symlinks")),
 					Signature:     "valid",
 					SignatureType: plugins.SignatureTypeGrafana,
 					SignatureOrg:  "Grafana Labs",
 				},
 			},
-		}, {
+		},
+		{
 			name:  "Load an unsigned plugin (development)",
 			class: plugins.ClassExternal,
-			cfg: &config.Cfg{
+			cfg: &config.PluginManagementCfg{
 				DevMode: true,
 			},
 			pluginPaths: []string{"../testdata/unsigned-datasource"},
@@ -249,8 +252,8 @@ func TestLoader_Load(t *testing.T) {
 								URL:  "https://grafana.com",
 							},
 							Logos: plugins.Logos{
-								Small: "/public/img/icn-datasource.svg",
-								Large: "/public/img/icn-datasource.svg",
+								Small: "public/img/icn-datasource.svg",
+								Large: "public/img/icn-datasource.svg",
 							},
 							Description: "Test",
 						},
@@ -262,8 +265,8 @@ func TestLoader_Load(t *testing.T) {
 						State:   plugins.ReleaseStateAlpha,
 					},
 					Class:     plugins.ClassExternal,
-					Module:    "/public/plugins/test-datasource/module.js",
-					BaseURL:   "/public/plugins/test-datasource",
+					Module:    "public/plugins/test-datasource/module.js",
+					BaseURL:   "public/plugins/test-datasource",
 					FS:        mustNewStaticFSForTests(t, filepath.Join(parentDir, "testdata/unsigned-datasource/plugin")),
 					Signature: "unsigned",
 				},
@@ -272,14 +275,14 @@ func TestLoader_Load(t *testing.T) {
 		{
 			name:        "Load an unsigned plugin (production)",
 			class:       plugins.ClassExternal,
-			cfg:         &config.Cfg{},
+			cfg:         &config.PluginManagementCfg{},
 			pluginPaths: []string{"../testdata/unsigned-datasource"},
 			want:        []*plugins.Plugin{},
 		},
 		{
 			name:  "Load an unsigned plugin using PluginsAllowUnsigned config (production)",
 			class: plugins.ClassExternal,
-			cfg: &config.Cfg{
+			cfg: &config.PluginManagementCfg{
 				PluginsAllowUnsigned: []string{"test-datasource"},
 			},
 			pluginPaths: []string{"../testdata/unsigned-datasource"},
@@ -295,8 +298,8 @@ func TestLoader_Load(t *testing.T) {
 								URL:  "https://grafana.com",
 							},
 							Logos: plugins.Logos{
-								Small: "/public/img/icn-datasource.svg",
-								Large: "/public/img/icn-datasource.svg",
+								Small: "public/img/icn-datasource.svg",
+								Large: "public/img/icn-datasource.svg",
 							},
 							Description: "Test",
 						},
@@ -308,8 +311,8 @@ func TestLoader_Load(t *testing.T) {
 						State:   plugins.ReleaseStateAlpha,
 					},
 					Class:     plugins.ClassExternal,
-					Module:    "/public/plugins/test-datasource/module.js",
-					BaseURL:   "/public/plugins/test-datasource",
+					Module:    "public/plugins/test-datasource/module.js",
+					BaseURL:   "public/plugins/test-datasource",
 					FS:        mustNewStaticFSForTests(t, filepath.Join(parentDir, "testdata/unsigned-datasource/plugin")),
 					Signature: plugins.SignatureStatusUnsigned,
 				},
@@ -318,14 +321,14 @@ func TestLoader_Load(t *testing.T) {
 		{
 			name:        "Load a plugin with v1 manifest should return signatureInvalid",
 			class:       plugins.ClassExternal,
-			cfg:         &config.Cfg{},
+			cfg:         &config.PluginManagementCfg{},
 			pluginPaths: []string{"../testdata/lacking-files"},
 			want:        []*plugins.Plugin{},
 		},
 		{
 			name:  "Load a plugin with v1 manifest using PluginsAllowUnsigned config (production) should return signatureInvali",
 			class: plugins.ClassExternal,
-			cfg: &config.Cfg{
+			cfg: &config.PluginManagementCfg{
 				PluginsAllowUnsigned: []string{"test-datasource"},
 			},
 			pluginPaths: []string{"../testdata/lacking-files"},
@@ -334,7 +337,7 @@ func TestLoader_Load(t *testing.T) {
 		{
 			name:  "Load a plugin with manifest which has a file not found in plugin folder",
 			class: plugins.ClassExternal,
-			cfg: &config.Cfg{
+			cfg: &config.PluginManagementCfg{
 				PluginsAllowUnsigned: []string{"test-datasource"},
 			},
 			pluginPaths: []string{"../testdata/invalid-v2-missing-file"},
@@ -343,7 +346,7 @@ func TestLoader_Load(t *testing.T) {
 		{
 			name:  "Load a plugin with file which is missing from the manifest",
 			class: plugins.ClassExternal,
-			cfg: &config.Cfg{
+			cfg: &config.PluginManagementCfg{
 				PluginsAllowUnsigned: []string{"test-datasource"},
 			},
 			pluginPaths: []string{"../testdata/invalid-v2-extra-file"},
@@ -352,7 +355,7 @@ func TestLoader_Load(t *testing.T) {
 		{
 			name:  "Load an app with includes",
 			class: plugins.ClassExternal,
-			cfg: &config.Cfg{
+			cfg: &config.PluginManagementCfg{
 				PluginsAllowUnsigned: []string{"test-app"},
 			},
 			pluginPaths: []string{"../testdata/test-app-with-includes"},
@@ -374,10 +377,11 @@ func TestLoader_Load(t *testing.T) {
 								{Name: "License & Terms", URL: "http://license.com"},
 							},
 							Logos: plugins.Logos{
-								Small: "/public/img/icn-app.svg",
-								Large: "/public/img/icn-app.svg",
+								Small: "public/img/icn-app.svg",
+								Large: "public/img/icn-app.svg",
 							},
-							Updated: "2015-02-10",
+							Updated:  "2015-02-10",
+							Keywords: []string{"test"},
 						},
 						Dependencies: plugins.Dependencies{
 							GrafanaDependency: ">=8.0.0",
@@ -394,48 +398,8 @@ func TestLoader_Load(t *testing.T) {
 					FS:            mustNewStaticFSForTests(t, filepath.Join(parentDir, "testdata/test-app-with-includes")),
 					Class:         plugins.ClassExternal,
 					Signature:     plugins.SignatureStatusUnsigned,
-					Module:        "/public/plugins/test-app/module.js",
-					BaseURL:       "/public/plugins/test-app",
-				},
-			},
-		},
-		{
-			name:  "Load a plugin with app sub url set",
-			class: plugins.ClassExternal,
-			cfg: &config.Cfg{
-				DevMode:          true,
-				GrafanaAppSubURL: "grafana",
-			},
-			pluginPaths: []string{"../testdata/unsigned-datasource"},
-			want: []*plugins.Plugin{
-				{
-					JSONData: plugins.JSONData{
-						ID:   "test-datasource",
-						Type: plugins.TypeDataSource,
-						Name: "Test",
-						Info: plugins.Info{
-							Author: plugins.InfoLink{
-								Name: "Grafana Labs",
-								URL:  "https://grafana.com",
-							},
-							Logos: plugins.Logos{
-								Small: "/grafana/public/img/icn-datasource.svg",
-								Large: "/grafana/public/img/icn-datasource.svg",
-							},
-							Description: "Test",
-						},
-						Dependencies: plugins.Dependencies{
-							GrafanaVersion: "*",
-							Plugins:        []plugins.Dependency{},
-						},
-						Backend: true,
-						State:   plugins.ReleaseStateAlpha,
-					},
-					Class:     plugins.ClassExternal,
-					Module:    "/grafana/public/plugins/test-datasource/module.js",
-					BaseURL:   "/grafana/public/plugins/test-datasource",
-					FS:        mustNewStaticFSForTests(t, filepath.Join(parentDir, "testdata/unsigned-datasource/plugin")),
-					Signature: plugins.SignatureStatusUnsigned,
+					Module:        "public/plugins/test-app/module.js",
+					BaseURL:       "public/plugins/test-app",
 				},
 			},
 		},
diff --git a/pkg/plugins/manager/pipeline/bootstrap/bootstrap.go b/pkg/plugins/manager/pipeline/bootstrap/bootstrap.go
index 19300c4e2474f..df9e16692b19a 100644
--- a/pkg/plugins/manager/pipeline/bootstrap/bootstrap.go
+++ b/pkg/plugins/manager/pipeline/bootstrap/bootstrap.go
@@ -42,7 +42,7 @@ type Opts struct {
 }
 
 // New returns a new Bootstrap stage.
-func New(cfg *config.Cfg, opts Opts) *Bootstrap {
+func New(cfg *config.PluginManagementCfg, opts Opts) *Bootstrap {
 	if opts.ConstructFunc == nil {
 		opts.ConstructFunc = DefaultConstructFunc(signature.DefaultCalculator(cfg), assetpath.DefaultService(cfg))
 	}
diff --git a/pkg/plugins/manager/pipeline/bootstrap/steps.go b/pkg/plugins/manager/pipeline/bootstrap/steps.go
index 9cfb92ea3cddd..9c14796830b3c 100644
--- a/pkg/plugins/manager/pipeline/bootstrap/steps.go
+++ b/pkg/plugins/manager/pipeline/bootstrap/steps.go
@@ -3,6 +3,7 @@ package bootstrap
 import (
 	"context"
 	"path"
+	"slices"
 	"strings"
 
 	"github.com/grafana/grafana/pkg/infra/slugify"
@@ -27,11 +28,12 @@ func DefaultConstructFunc(signatureCalculator plugins.SignatureCalculator, asset
 }
 
 // DefaultDecorateFuncs are the default DecorateFuncs used for the Decorate step of the Bootstrap stage.
-func DefaultDecorateFuncs(cfg *config.Cfg) []DecorateFunc {
+func DefaultDecorateFuncs(cfg *config.PluginManagementCfg) []DecorateFunc {
 	return []DecorateFunc{
 		AppDefaultNavURLDecorateFunc,
 		TemplateDecorateFunc,
-		AppChildDecorateFunc(cfg),
+		AppChildDecorateFunc(),
+		SkipHostEnvVarsDecorateFunc(cfg),
 	}
 }
 
@@ -130,26 +132,37 @@ func setDefaultNavURL(p *plugins.Plugin) {
 }
 
 // AppChildDecorateFunc is a DecorateFunc that configures child plugins of app plugins.
-func AppChildDecorateFunc(cfg *config.Cfg) DecorateFunc {
+func AppChildDecorateFunc() DecorateFunc {
 	return func(_ context.Context, p *plugins.Plugin) (*plugins.Plugin, error) {
 		if p.Parent != nil && p.Parent.IsApp() {
-			configureAppChildPlugin(cfg, p.Parent, p)
+			configureAppChildPlugin(p.Parent, p)
 		}
 		return p, nil
 	}
 }
 
-func configureAppChildPlugin(cfg *config.Cfg, parent *plugins.Plugin, child *plugins.Plugin) {
+func configureAppChildPlugin(parent *plugins.Plugin, child *plugins.Plugin) {
 	if !parent.IsApp() {
 		return
 	}
 	child.IncludedInAppID = parent.ID
 	child.BaseURL = parent.BaseURL
 
+	// TODO move this logic within assetpath package
 	appSubPath := strings.ReplaceAll(strings.Replace(child.FS.Base(), parent.FS.Base(), "", 1), "\\", "/")
 	if parent.IsCorePlugin() {
 		child.Module = path.Join("core:plugin", parent.ID, appSubPath)
 	} else {
-		child.Module = path.Join("/", cfg.GrafanaAppSubURL, "/public/plugins", parent.ID, appSubPath, "module.js")
+		child.Module = path.Join("public/plugins", parent.ID, appSubPath, "module.js")
+	}
+}
+
+// SkipHostEnvVarsDecorateFunc returns a DecorateFunc that configures the SkipHostEnvVars field of the plugin.
+// It will be set to true if the FlagPluginsSkipHostEnvVars feature flag is set, and the plugin is not present in the
+// ForwardHostEnvVars plugin ids list.
+func SkipHostEnvVarsDecorateFunc(cfg *config.PluginManagementCfg) DecorateFunc {
+	return func(_ context.Context, p *plugins.Plugin) (*plugins.Plugin, error) {
+		p.SkipHostEnvVars = cfg.Features.SkipHostEnvVarsEnabled && !slices.Contains(cfg.ForwardHostEnvVars, p.ID)
+		return p, nil
 	}
 }
diff --git a/pkg/plugins/manager/pipeline/bootstrap/steps_test.go b/pkg/plugins/manager/pipeline/bootstrap/steps_test.go
index 795d7f8a5a9fe..1fa03bac60e6a 100644
--- a/pkg/plugins/manager/pipeline/bootstrap/steps_test.go
+++ b/pkg/plugins/manager/pipeline/bootstrap/steps_test.go
@@ -107,25 +107,17 @@ func Test_configureAppChildPlugin(t *testing.T) {
 			},
 			Class:   plugins.ClassCore,
 			FS:      fakes.NewFakePluginFiles("c:\\grafana\\public\\app\\plugins\\app\\testdata-app"),
-			BaseURL: "/public/app/plugins/app/testdata-app",
+			BaseURL: "public/app/plugins/app/testdata-app",
 		}
 
-		configureAppChildPlugin(&config.Cfg{}, parent, child)
+		configureAppChildPlugin(parent, child)
 
 		require.Equal(t, "core:plugin/testdata-app/datasources/datasource", child.Module)
 		require.Equal(t, "testdata-app", child.IncludedInAppID)
-		require.Equal(t, "/public/app/plugins/app/testdata-app", child.BaseURL)
-
-		t.Run("App sub URL has no effect on Core plugins", func(t *testing.T) {
-			configureAppChildPlugin(&config.Cfg{GrafanaAppSubURL: "/grafana"}, parent, child)
-
-			require.Equal(t, "core:plugin/testdata-app/datasources/datasource", child.Module)
-			require.Equal(t, "testdata-app", child.IncludedInAppID)
-			require.Equal(t, "/public/app/plugins/app/testdata-app", child.BaseURL)
-		})
+		require.Equal(t, "public/app/plugins/app/testdata-app", child.BaseURL)
 	})
 
-	t.Run("When setting paths based on external plugin with app sub URL", func(t *testing.T) {
+	t.Run("When setting paths based on external plugin", func(t *testing.T) {
 		child := &plugins.Plugin{
 			FS: fakes.NewFakePluginFiles("/plugins/parent-app/child-panel"),
 		}
@@ -136,13 +128,78 @@ func Test_configureAppChildPlugin(t *testing.T) {
 			},
 			Class:   plugins.ClassExternal,
 			FS:      fakes.NewFakePluginFiles("/plugins/parent-app"),
-			BaseURL: "/grafana/plugins/parent-app",
+			BaseURL: "plugins/parent-app",
 		}
 
-		configureAppChildPlugin(&config.Cfg{GrafanaAppSubURL: "/grafana"}, parent, child)
+		configureAppChildPlugin(parent, child)
 
-		require.Equal(t, "/grafana/public/plugins/testdata-app/child-panel/module.js", child.Module)
+		require.Equal(t, "public/plugins/testdata-app/child-panel/module.js", child.Module)
 		require.Equal(t, "testdata-app", child.IncludedInAppID)
-		require.Equal(t, "/grafana/plugins/parent-app", child.BaseURL)
+		require.Equal(t, "plugins/parent-app", child.BaseURL)
+	})
+}
+
+func TestSkipEnvVarsDecorateFunc(t *testing.T) {
+	const pluginID = "plugin-id"
+
+	t.Run("config field is false", func(t *testing.T) {
+		f := SkipHostEnvVarsDecorateFunc(&config.PluginManagementCfg{
+			Features: config.Features{SkipHostEnvVarsEnabled: false},
+		})
+		p, err := f(context.Background(), &plugins.Plugin{JSONData: plugins.JSONData{ID: pluginID}})
+		require.NoError(t, err)
+		require.False(t, p.SkipHostEnvVars)
+	})
+
+	t.Run("config field is true", func(t *testing.T) {
+		t.Run("no plugin settings should set SkipHostEnvVars to true", func(t *testing.T) {
+			f := SkipHostEnvVarsDecorateFunc(&config.PluginManagementCfg{
+				Features: config.Features{SkipHostEnvVarsEnabled: true},
+			})
+			p, err := f(context.Background(), &plugins.Plugin{JSONData: plugins.JSONData{ID: pluginID}})
+			require.NoError(t, err)
+			require.True(t, p.SkipHostEnvVars)
+		})
+
+		t.Run("plugin setting", func(t *testing.T) {
+			for _, tc := range []struct {
+				name               string
+				forwardHostEnvVars []string
+				expSkipHostEnvVars bool
+			}{
+				{
+					name:               "plugin id not present in forwardHostEnvVars should set SkipHostEnvVars to true (empty)",
+					forwardHostEnvVars: []string{},
+					expSkipHostEnvVars: true,
+				},
+				{
+					name:               "plugin id not present in forwardHostEnvVars should set SkipHostEnvVars to true (other id)",
+					forwardHostEnvVars: []string{"other-id", "yet-another-id"},
+					expSkipHostEnvVars: true,
+				},
+				{
+					name:               "plugin id in forwardHostEnvVars should set SkipHostEnvVars to false (only)",
+					forwardHostEnvVars: []string{pluginID},
+					expSkipHostEnvVars: false,
+				},
+				{
+					name:               "plugin id in forwardHostEnvVars should set SkipHostEnvVars to false (with other)",
+					forwardHostEnvVars: []string{"a-plugin", pluginID, "other-id"},
+					expSkipHostEnvVars: false,
+				},
+			} {
+				t.Run(tc.name, func(t *testing.T) {
+					f := SkipHostEnvVarsDecorateFunc(&config.PluginManagementCfg{
+						Features: config.Features{
+							SkipHostEnvVarsEnabled: true,
+						},
+						ForwardHostEnvVars: tc.forwardHostEnvVars,
+					})
+					p, err := f(context.Background(), &plugins.Plugin{JSONData: plugins.JSONData{ID: pluginID}})
+					require.NoError(t, err)
+					require.Equal(t, tc.expSkipHostEnvVars, p.SkipHostEnvVars)
+				})
+			}
+		})
 	})
 }
diff --git a/pkg/plugins/manager/pipeline/discovery/discovery.go b/pkg/plugins/manager/pipeline/discovery/discovery.go
index 8d7c2b4f71c9e..f05f2582e2360 100644
--- a/pkg/plugins/manager/pipeline/discovery/discovery.go
+++ b/pkg/plugins/manager/pipeline/discovery/discovery.go
@@ -40,7 +40,7 @@ type Opts struct {
 }
 
 // New returns a new Discovery stage.
-func New(cfg *config.Cfg, opts Opts) *Discovery {
+func New(cfg *config.PluginManagementCfg, opts Opts) *Discovery {
 	if opts.FindFunc == nil {
 		opts.FindFunc = DefaultFindFunc(cfg)
 	}
diff --git a/pkg/plugins/manager/pipeline/discovery/steps.go b/pkg/plugins/manager/pipeline/discovery/steps.go
index 651d2f78d2905..6c5a1d0743715 100644
--- a/pkg/plugins/manager/pipeline/discovery/steps.go
+++ b/pkg/plugins/manager/pipeline/discovery/steps.go
@@ -2,54 +2,51 @@ package discovery
 
 import (
 	"context"
+	"slices"
 
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/config"
-	"github.com/grafana/grafana/pkg/plugins/log"
 	"github.com/grafana/grafana/pkg/plugins/manager/loader/finder"
-	"github.com/grafana/grafana/pkg/plugins/manager/registry"
 )
 
 // DefaultFindFunc is the default function used for the Find step of the Discovery stage. It will scan the local
 // filesystem for plugins.
-func DefaultFindFunc(cfg *config.Cfg) FindFunc {
+func DefaultFindFunc(cfg *config.PluginManagementCfg) FindFunc {
 	return finder.NewLocalFinder(cfg.DevMode).Find
 }
 
-// DuplicatePluginValidation is a filter step that will filter out any plugins that are already registered with the
-// registry. This includes both the primary plugin and any child plugins, which are matched using the plugin ID field.
-type DuplicatePluginValidation struct {
-	registry registry.Service
-	log      log.Logger
+// PermittedPluginTypesFilter is a filter step that will filter out any plugins that are not of a permitted type.
+type PermittedPluginTypesFilter struct {
+	permittedTypes []plugins.Type
 }
 
-// NewDuplicatePluginFilterStep returns a new DuplicatePluginValidation.
-func NewDuplicatePluginFilterStep(registry registry.Service) *DuplicatePluginValidation {
-	return &DuplicatePluginValidation{
-		registry: registry,
-		log:      log.New("plugins.dedupe"),
+// NewPermittedPluginTypesFilterStep returns a new FindFilterFunc for filtering out any plugins that are not of a
+// permitted type. This includes both the primary plugin and any child plugins.
+func NewPermittedPluginTypesFilterStep(permittedTypes []plugins.Type) FindFilterFunc {
+	f := &PermittedPluginTypesFilter{
+		permittedTypes: permittedTypes,
 	}
+	return f.Filter
 }
 
-// Filter will filter out any plugins that are already registered with the registry.
-func (d *DuplicatePluginValidation) Filter(ctx context.Context, bundles []*plugins.FoundBundle) ([]*plugins.FoundBundle, error) {
-	res := make([]*plugins.FoundBundle, 0, len(bundles))
+// Filter will filter out any plugins that are not of a permitted type.
+func (n *PermittedPluginTypesFilter) Filter(_ context.Context, _ plugins.Class, bundles []*plugins.FoundBundle) ([]*plugins.FoundBundle, error) {
+	var r []*plugins.FoundBundle
 	for _, b := range bundles {
-		_, exists := d.registry.Plugin(ctx, b.Primary.JSONData.ID)
-		if exists {
-			d.log.Warn("Skipping loading of plugin as it's a duplicate", "pluginId", b.Primary.JSONData.ID)
+		if !slices.Contains(n.permittedTypes, b.Primary.JSONData.Type) {
 			continue
 		}
 
+		prohibitedType := false
 		for _, child := range b.Children {
-			_, exists = d.registry.Plugin(ctx, child.JSONData.ID)
-			if exists {
-				d.log.Warn("Skipping loading of child plugin as it's a duplicate", "pluginId", child.JSONData.ID)
-				continue
+			if !slices.Contains(n.permittedTypes, child.JSONData.Type) {
+				prohibitedType = true
+				break
 			}
 		}
-		res = append(res, b)
+		if !prohibitedType {
+			r = append(r, b)
+		}
 	}
-
-	return res, nil
+	return r, nil
 }
diff --git a/pkg/plugins/manager/pipeline/initialization/initialization.go b/pkg/plugins/manager/pipeline/initialization/initialization.go
index f4ef2df8574af..03b7d9375b075 100644
--- a/pkg/plugins/manager/pipeline/initialization/initialization.go
+++ b/pkg/plugins/manager/pipeline/initialization/initialization.go
@@ -17,7 +17,7 @@ type Initializer interface {
 type InitializeFunc func(ctx context.Context, p *plugins.Plugin) (*plugins.Plugin, error)
 
 type Initialize struct {
-	cfg             *config.Cfg
+	cfg             *config.PluginManagementCfg
 	initializeSteps []InitializeFunc
 	log             log.Logger
 }
@@ -27,7 +27,7 @@ type Opts struct {
 }
 
 // New returns a new Initialization stage.
-func New(cfg *config.Cfg, opts Opts) *Initialize {
+func New(cfg *config.PluginManagementCfg, opts Opts) *Initialize {
 	if opts.InitializeFuncs == nil {
 		opts.InitializeFuncs = []InitializeFunc{}
 	}
diff --git a/pkg/plugins/manager/pipeline/initialization/steps.go b/pkg/plugins/manager/pipeline/initialization/steps.go
index db06e6f72ee27..c27cf667602d7 100644
--- a/pkg/plugins/manager/pipeline/initialization/steps.go
+++ b/pkg/plugins/manager/pipeline/initialization/steps.go
@@ -47,7 +47,7 @@ func (b *BackendClientInit) Initialize(ctx context.Context, p *plugins.Plugin) (
 		}
 
 		// this will ensure that the env variables are calculated every time a plugin is started
-		envFunc := func() []string { return b.envVarProvider.Get(ctx, p) }
+		envFunc := func() []string { return b.envVarProvider.PluginEnvVars(ctx, p) }
 
 		if backendClient, err := backendFactory(p.ID, p.Logger(), envFunc); err != nil {
 			return nil, err
diff --git a/pkg/plugins/manager/pipeline/initialization/steps_test.go b/pkg/plugins/manager/pipeline/initialization/steps_test.go
index fa387ec6f814b..b5e43195e7122 100644
--- a/pkg/plugins/manager/pipeline/initialization/steps_test.go
+++ b/pkg/plugins/manager/pipeline/initialization/steps_test.go
@@ -121,12 +121,12 @@ func (f *fakeBackendProvider) BackendFactory(_ context.Context, _ *plugins.Plugi
 }
 
 type fakeEnvVarsProvider struct {
-	GetFunc func(ctx context.Context, p *plugins.Plugin) []string
+	PluginEnvVarsFunc func(ctx context.Context, p *plugins.Plugin) []string
 }
 
-func (f *fakeEnvVarsProvider) Get(ctx context.Context, p *plugins.Plugin) []string {
-	if f.GetFunc != nil {
-		return f.GetFunc(ctx, p)
+func (f *fakeEnvVarsProvider) PluginEnvVars(ctx context.Context, p *plugins.Plugin) []string {
+	if f.PluginEnvVarsFunc != nil {
+		return f.PluginEnvVars(ctx, p)
 	}
 	return nil
 }
diff --git a/pkg/plugins/manager/pipeline/termination/steps.go b/pkg/plugins/manager/pipeline/termination/steps.go
index e2fdcc3bed85a..0d5e2144d401e 100644
--- a/pkg/plugins/manager/pipeline/termination/steps.go
+++ b/pkg/plugins/manager/pipeline/termination/steps.go
@@ -54,7 +54,7 @@ func newDeregister(pluginRegistry registry.Service) *Deregister {
 
 // Deregister removes a plugin from the plugin registry.
 func (d *Deregister) Deregister(ctx context.Context, p *plugins.Plugin) error {
-	if err := d.pluginRegistry.Remove(ctx, p.ID); err != nil {
+	if err := d.pluginRegistry.Remove(ctx, p.ID, p.Info.Version); err != nil {
 		return err
 	}
 	d.log.Debug("Plugin unregistered", "pluginId", p.ID)
diff --git a/pkg/plugins/manager/pipeline/termination/termination.go b/pkg/plugins/manager/pipeline/termination/termination.go
index 85c31de9100dd..66e76d8a54800 100644
--- a/pkg/plugins/manager/pipeline/termination/termination.go
+++ b/pkg/plugins/manager/pipeline/termination/termination.go
@@ -17,7 +17,7 @@ type Terminator interface {
 type TerminateFunc func(ctx context.Context, p *plugins.Plugin) error
 
 type Terminate struct {
-	cfg            *config.Cfg
+	cfg            *config.PluginManagementCfg
 	terminateSteps []TerminateFunc
 	log            log.Logger
 }
@@ -27,7 +27,7 @@ type Opts struct {
 }
 
 // New returns a new Termination stage.
-func New(cfg *config.Cfg, opts Opts) (*Terminate, error) {
+func New(cfg *config.PluginManagementCfg, opts Opts) (*Terminate, error) {
 	if opts.TerminateFuncs == nil {
 		opts.TerminateFuncs = []TerminateFunc{}
 	}
diff --git a/pkg/plugins/manager/pipeline/validation/steps.go b/pkg/plugins/manager/pipeline/validation/steps.go
index 3025ca60526e3..20dee23f7800e 100644
--- a/pkg/plugins/manager/pipeline/validation/steps.go
+++ b/pkg/plugins/manager/pipeline/validation/steps.go
@@ -3,6 +3,7 @@ package validation
 import (
 	"context"
 	"errors"
+	"slices"
 	"time"
 
 	"github.com/grafana/grafana/pkg/plugins"
@@ -13,7 +14,7 @@ import (
 )
 
 // DefaultValidateFuncs are the default ValidateFunc used for the Validate step of the Validation stage.
-func DefaultValidateFuncs(cfg *config.Cfg) []ValidateFunc {
+func DefaultValidateFuncs(cfg *config.PluginManagementCfg) []ValidateFunc {
 	return []ValidateFunc{
 		SignatureValidationStep(signature.NewValidator(signature.NewUnsignedAuthorizer(cfg))),
 		ModuleJSValidationStep(),
@@ -73,16 +74,16 @@ func (v *ModuleJSValidator) Validate(_ context.Context, p *plugins.Plugin) error
 }
 
 type AngularDetector struct {
-	cfg              *config.Cfg
+	cfg              *config.PluginManagementCfg
 	angularInspector angularinspector.Inspector
 	log              log.Logger
 }
 
-func AngularDetectionStep(cfg *config.Cfg, angularInspector angularinspector.Inspector) ValidateFunc {
+func AngularDetectionStep(cfg *config.PluginManagementCfg, angularInspector angularinspector.Inspector) ValidateFunc {
 	return newAngularDetector(cfg, angularInspector).Validate
 }
 
-func newAngularDetector(cfg *config.Cfg, angularInspector angularinspector.Inspector) *AngularDetector {
+func newAngularDetector(cfg *config.PluginManagementCfg, angularInspector angularinspector.Inspector) *AngularDetector {
 	return &AngularDetector{
 		cfg:              cfg,
 		angularInspector: angularInspector,
@@ -95,7 +96,7 @@ func (a *AngularDetector) Validate(ctx context.Context, p *plugins.Plugin) error
 		var err error
 
 		cctx, canc := context.WithTimeout(ctx, time.Second*10)
-		p.AngularDetected, err = a.angularInspector.Inspect(cctx, p)
+		p.Angular.Detected, err = a.angularInspector.Inspect(cctx, p)
 		canc()
 
 		if err != nil {
@@ -103,11 +104,11 @@ func (a *AngularDetector) Validate(ctx context.Context, p *plugins.Plugin) error
 		}
 
 		// Do not initialize plugins if they're using Angular and Angular support is disabled
-		if p.AngularDetected && !a.cfg.AngularSupportEnabled {
+		if p.Angular.Detected && !a.cfg.AngularSupportEnabled {
 			a.log.Error("Refusing to initialize plugin because it's using Angular, which has been disabled", "pluginId", p.ID)
 			return errors.New("angular plugins are not supported")
 		}
 	}
-
+	p.Angular.HideDeprecation = slices.Contains(a.cfg.HideAngularDeprecation, p.ID)
 	return nil
 }
diff --git a/pkg/plugins/manager/pipeline/validation/validation.go b/pkg/plugins/manager/pipeline/validation/validation.go
index 05c48f59f11a5..6c3ab23dc18a7 100644
--- a/pkg/plugins/manager/pipeline/validation/validation.go
+++ b/pkg/plugins/manager/pipeline/validation/validation.go
@@ -17,7 +17,7 @@ type Validator interface {
 type ValidateFunc func(ctx context.Context, p *plugins.Plugin) error
 
 type Validate struct {
-	cfg           *config.Cfg
+	cfg           *config.PluginManagementCfg
 	validateSteps []ValidateFunc
 	log           log.Logger
 }
@@ -27,7 +27,7 @@ type Opts struct {
 }
 
 // New returns a new Validation stage.
-func New(cfg *config.Cfg, opts Opts) *Validate {
+func New(cfg *config.PluginManagementCfg, opts Opts) *Validate {
 	if opts.ValidateFuncs == nil {
 		opts.ValidateFuncs = DefaultValidateFuncs(cfg)
 	}
diff --git a/pkg/plugins/manager/process/process.go b/pkg/plugins/manager/process/process.go
index a663690bc4d58..2219e5f2180f2 100644
--- a/pkg/plugins/manager/process/process.go
+++ b/pkg/plugins/manager/process/process.go
@@ -7,22 +7,24 @@ import (
 	"github.com/grafana/grafana/pkg/plugins"
 )
 
-var (
-	keepPluginAliveTickerDuration = time.Second * 1
-)
+const defaultKeepPluginAliveTickerDuration = time.Second
 
-type Service struct{}
+type Service struct {
+	keepPluginAliveTickerDuration time.Duration
+}
 
 func ProvideService() *Service {
-	return &Service{}
+	return &Service{
+		keepPluginAliveTickerDuration: defaultKeepPluginAliveTickerDuration,
+	}
 }
 
-func (*Service) Start(ctx context.Context, p *plugins.Plugin) error {
+func (s *Service) Start(ctx context.Context, p *plugins.Plugin) error {
 	if !p.IsManaged() || !p.Backend || p.SignatureError != nil {
 		return nil
 	}
 
-	if err := startPluginAndKeepItAlive(ctx, p); err != nil {
+	if err := s.startPluginAndKeepItAlive(ctx, p); err != nil {
 		return err
 	}
 
@@ -43,7 +45,7 @@ func (*Service) Stop(ctx context.Context, p *plugins.Plugin) error {
 	return nil
 }
 
-func startPluginAndKeepItAlive(ctx context.Context, p *plugins.Plugin) error {
+func (s *Service) startPluginAndKeepItAlive(ctx context.Context, p *plugins.Plugin) error {
 	if err := p.Start(ctx); err != nil {
 		return err
 	}
@@ -53,7 +55,7 @@ func startPluginAndKeepItAlive(ctx context.Context, p *plugins.Plugin) error {
 	}
 
 	go func(p *plugins.Plugin) {
-		if err := keepPluginAlive(p); err != nil {
+		if err := s.keepPluginAlive(p); err != nil {
 			p.Logger().Error("Attempt to restart killed plugin process failed", "error", err)
 		}
 	}(p)
@@ -62,8 +64,8 @@ func startPluginAndKeepItAlive(ctx context.Context, p *plugins.Plugin) error {
 }
 
 // keepPluginAlive will restart the plugin if the process is killed or exits
-func keepPluginAlive(p *plugins.Plugin) error {
-	ticker := time.NewTicker(keepPluginAliveTickerDuration)
+func (s *Service) keepPluginAlive(p *plugins.Plugin) error {
+	ticker := time.NewTicker(s.keepPluginAliveTickerDuration)
 
 	for {
 		<-ticker.C
diff --git a/pkg/plugins/manager/process/process_test.go b/pkg/plugins/manager/process/process_test.go
index db9641dcc25e3..4654832f65a35 100644
--- a/pkg/plugins/manager/process/process_test.go
+++ b/pkg/plugins/manager/process/process_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"sync"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/require"
 
@@ -15,7 +14,11 @@ import (
 )
 
 func TestProcessManager_Start(t *testing.T) {
+	t.Parallel()
+
 	t.Run("Plugin state determines process start", func(t *testing.T) {
+		t.Parallel()
+
 		tcs := []struct {
 			name               string
 			managed            bool
@@ -52,14 +55,20 @@ func TestProcessManager_Start(t *testing.T) {
 			},
 		}
 		for _, tc := range tcs {
+			// create a local copy of "tc" to allow concurrent access within tests to the different items of testCases,
+			// otherwise it would be like a moving pointer while tests run in parallel
+			tc := tc
+
 			t.Run(tc.name, func(t *testing.T) {
+				t.Parallel()
+
 				bp := fakes.NewFakeBackendPlugin(tc.managed)
 				p := createPlugin(t, bp, func(plugin *plugins.Plugin) {
 					plugin.Backend = tc.backend
 					plugin.SignatureError = tc.signatureError
 				})
 
-				m := &Service{}
+				m := ProvideService()
 				err := m.Start(context.Background(), p)
 				require.NoError(t, err)
 				require.Equal(t, tc.expectedStartCount, bp.StartCount)
@@ -74,18 +83,15 @@ func TestProcessManager_Start(t *testing.T) {
 	})
 
 	t.Run("Won't stop the plugin if the context is cancelled", func(t *testing.T) {
+		t.Parallel()
+
 		bp := fakes.NewFakeBackendPlugin(true)
 		p := createPlugin(t, bp, func(plugin *plugins.Plugin) {
 			plugin.Backend = true
 		})
 
-		tickerDuration := keepPluginAliveTickerDuration
-		keepPluginAliveTickerDuration = 1 * time.Millisecond
-		defer func() {
-			keepPluginAliveTickerDuration = tickerDuration
-		}()
-
-		m := &Service{}
+		m := ProvideService()
+		m.keepPluginAliveTickerDuration = 1
 		ctx := context.Background()
 		ctx, cancel := context.WithCancel(ctx)
 		err := m.Start(ctx, p)
@@ -100,7 +106,11 @@ func TestProcessManager_Start(t *testing.T) {
 }
 
 func TestProcessManager_Stop(t *testing.T) {
+	t.Parallel()
+
 	t.Run("Can stop a running plugin", func(t *testing.T) {
+		t.Parallel()
+
 		pluginID := "test-datasource"
 
 		bp := fakes.NewFakeBackendPlugin(true)
@@ -109,7 +119,7 @@ func TestProcessManager_Stop(t *testing.T) {
 			plugin.Backend = true
 		})
 
-		m := &Service{}
+		m := ProvideService()
 		err := m.Stop(context.Background(), p)
 		require.NoError(t, err)
 
@@ -120,18 +130,21 @@ func TestProcessManager_Stop(t *testing.T) {
 }
 
 func TestProcessManager_ManagedBackendPluginLifecycle(t *testing.T) {
-	bp := fakes.NewFakeBackendPlugin(true)
-	p := createPlugin(t, bp, func(plugin *plugins.Plugin) {
-		plugin.Backend = true
-	})
+	t.Parallel()
 
-	m := &Service{}
+	t.Run("When plugin process is killed, the process is restarted", func(t *testing.T) {
+		t.Parallel()
+		bp := fakes.NewFakeBackendPlugin(true)
+		p := createPlugin(t, bp, func(plugin *plugins.Plugin) {
+			plugin.Backend = true
+		})
 
-	err := m.Start(context.Background(), p)
-	require.NoError(t, err)
-	require.Equal(t, 1, bp.StartCount)
+		m := ProvideService()
+
+		err := m.Start(context.Background(), p)
+		require.NoError(t, err)
+		require.Equal(t, 1, bp.StartCount)
 
-	t.Run("When plugin process is killed, the process is restarted", func(t *testing.T) {
 		var wgKill sync.WaitGroup
 		wgKill.Add(1)
 		go func() {
diff --git a/pkg/plugins/manager/registry/ifaces.go b/pkg/plugins/manager/registry/ifaces.go
index 94c7696eac859..680dcdab5bfd2 100644
--- a/pkg/plugins/manager/registry/ifaces.go
+++ b/pkg/plugins/manager/registry/ifaces.go
@@ -8,12 +8,12 @@ import (
 
 // Service is responsible for the internal storing and retrieval of plugins.
 type Service interface {
-	// Plugin finds a plugin by its ID.
-	Plugin(ctx context.Context, id string) (*plugins.Plugin, bool)
+	// Plugin finds a plugin by its ID and version.
+	Plugin(ctx context.Context, id, version string) (*plugins.Plugin, bool)
 	// Plugins returns all plugins.
 	Plugins(ctx context.Context) []*plugins.Plugin
 	// Add adds the provided plugin to the registry.
 	Add(ctx context.Context, plugin *plugins.Plugin) error
 	// Remove deletes the requested plugin from the registry.
-	Remove(ctx context.Context, id string) error
+	Remove(ctx context.Context, id, version string) error
 }
diff --git a/pkg/plugins/manager/registry/in_memory.go b/pkg/plugins/manager/registry/in_memory.go
index 8b533b985d88a..af3652e5d6cd2 100644
--- a/pkg/plugins/manager/registry/in_memory.go
+++ b/pkg/plugins/manager/registry/in_memory.go
@@ -8,6 +8,7 @@ import (
 	"github.com/grafana/grafana/pkg/plugins"
 )
 
+// InMemory is a registry that only allows a single version of a plugin to be registered at a time.
 type InMemory struct {
 	store map[string]*plugins.Plugin
 	alias map[string]*plugins.Plugin
@@ -25,7 +26,7 @@ func NewInMemory() *InMemory {
 	}
 }
 
-func (i *InMemory) Plugin(_ context.Context, pluginID string) (*plugins.Plugin, bool) {
+func (i *InMemory) Plugin(_ context.Context, pluginID, _ string) (*plugins.Plugin, bool) {
 	return i.plugin(pluginID)
 }
 
@@ -56,7 +57,7 @@ func (i *InMemory) Add(_ context.Context, p *plugins.Plugin) error {
 	return nil
 }
 
-func (i *InMemory) Remove(_ context.Context, pluginID string) error {
+func (i *InMemory) Remove(_ context.Context, pluginID, _ string) error {
 	p, ok := i.plugin(pluginID)
 	if !ok {
 		return fmt.Errorf("plugin %s is not registered", pluginID)
diff --git a/pkg/plugins/manager/registry/in_memory_test.go b/pkg/plugins/manager/registry/in_memory_test.go
index 25d3f42342abf..31d6a21a2dfb2 100644
--- a/pkg/plugins/manager/registry/in_memory_test.go
+++ b/pkg/plugins/manager/registry/in_memory_test.go
@@ -11,29 +11,41 @@ import (
 	"github.com/grafana/grafana/pkg/plugins"
 )
 
-const pluginID = "test-ds"
+const (
+	pluginID = "test-ds"
+	v1       = "1.0.0"
+	v2       = "2.0.0"
+)
 
 func TestInMemory(t *testing.T) {
 	t.Run("Test mix of registry operations", func(t *testing.T) {
 		i := NewInMemory()
 		ctx := context.Background()
 
-		p, exists := i.Plugin(ctx, pluginID)
+		p, exists := i.Plugin(ctx, pluginID, v1)
 		require.False(t, exists)
 		require.Nil(t, p)
 
-		err := i.Remove(ctx, pluginID)
+		err := i.Remove(ctx, pluginID, v1)
 		require.EqualError(t, err, fmt.Errorf("plugin %s is not registered", pluginID).Error())
 
-		p = &plugins.Plugin{JSONData: plugins.JSONData{ID: pluginID}}
-		err = i.Add(ctx, p)
+		pv1 := &plugins.Plugin{JSONData: plugins.JSONData{ID: pluginID, Info: plugins.Info{Version: v1}}}
+		err = i.Add(ctx, pv1)
 		require.NoError(t, err)
 
-		existingP, exists := i.Plugin(ctx, pluginID)
+		pv2 := &plugins.Plugin{JSONData: plugins.JSONData{ID: pluginID, Info: plugins.Info{Version: v2}}}
+		err = i.Add(ctx, pv2)
+		require.Errorf(t, err, fmt.Sprintf("plugin %s is already registered", pluginID))
+
+		existingP, exists := i.Plugin(ctx, pluginID, v1)
 		require.True(t, exists)
-		require.Equal(t, p, existingP)
+		require.Equal(t, pv1, existingP)
+
+		p = &plugins.Plugin{JSONData: plugins.JSONData{ID: pluginID}}
+		err = i.Add(ctx, p)
+		require.Errorf(t, err, fmt.Sprintf("plugin %s is already registered", pluginID))
 
-		err = i.Remove(ctx, pluginID)
+		err = i.Remove(ctx, pluginID, v1)
 		require.NoError(t, err)
 
 		existingPlugins := i.Plugins(ctx)
@@ -87,6 +99,28 @@ func TestInMemory_Add(t *testing.T) {
 			},
 			err: fmt.Errorf("plugin %s is already registered", pluginID),
 		},
+		{
+			name: "Cannot add a plugin to the registry even if it has a different version",
+			mocks: mocks{
+				store: map[string]*plugins.Plugin{
+					pluginID: {
+						JSONData: plugins.JSONData{
+							ID:   pluginID,
+							Info: plugins.Info{Version: v1},
+						},
+					},
+				},
+			},
+			args: args{
+				p: &plugins.Plugin{
+					JSONData: plugins.JSONData{
+						ID:   pluginID,
+						Info: plugins.Info{Version: v2},
+					},
+				},
+			},
+			err: fmt.Errorf("plugin %s is already registered", pluginID),
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -151,7 +185,7 @@ func TestInMemory_Plugin(t *testing.T) {
 			i := &InMemory{
 				store: tt.mocks.store,
 			}
-			p, exists := i.Plugin(context.Background(), tt.args.pluginID)
+			p, exists := i.Plugin(context.Background(), tt.args.pluginID, "")
 			if exists != tt.exists {
 				t.Errorf("Plugin() got1 = %v, expected %v", exists, tt.exists)
 			}
@@ -265,7 +299,7 @@ func TestInMemory_Remove(t *testing.T) {
 			i := &InMemory{
 				store: tt.mocks.store,
 			}
-			err := i.Remove(context.Background(), tt.args.pluginID)
+			err := i.Remove(context.Background(), tt.args.pluginID, "")
 			require.Equal(t, tt.err, err)
 		})
 	}
@@ -280,7 +314,7 @@ func TestAliasSupport(t *testing.T) {
 		pluginIdOld := "plugin-old"
 		pluginIdOld2 := "plugin-old2"
 
-		p, exists := i.Plugin(ctx, pluginIdNew)
+		p, exists := i.Plugin(ctx, pluginIdNew, "")
 		require.False(t, exists)
 		require.Nil(t, p)
 
@@ -294,17 +328,17 @@ func TestAliasSupport(t *testing.T) {
 		require.NoError(t, err)
 
 		// Can lookup by the new ID
-		found, exists := i.Plugin(ctx, pluginIdNew)
+		found, exists := i.Plugin(ctx, pluginIdNew, "")
 		require.True(t, exists)
 		require.Equal(t, pluginNew, found)
 
 		// Can lookup by the old ID
-		found, exists = i.Plugin(ctx, pluginIdOld)
+		found, exists = i.Plugin(ctx, pluginIdOld, "")
 		require.True(t, exists)
 		require.Equal(t, pluginNew, found)
 
 		// Can lookup by the other old ID
-		found, exists = i.Plugin(ctx, pluginIdOld2)
+		found, exists = i.Plugin(ctx, pluginIdOld2, "")
 		require.True(t, exists)
 		require.Equal(t, pluginNew, found)
 
@@ -313,7 +347,7 @@ func TestAliasSupport(t *testing.T) {
 			ID: pluginIdOld,
 		}}
 		require.NoError(t, i.Add(ctx, pluginOld))
-		found, exists = i.Plugin(ctx, pluginIdOld)
+		found, exists = i.Plugin(ctx, pluginIdOld, "")
 		require.True(t, exists)
 		require.Equal(t, pluginOld, found)
 	})
diff --git a/pkg/plugins/manager/signature/authorizer.go b/pkg/plugins/manager/signature/authorizer.go
index a96aa6f16b943..5dc0f1845f5b9 100644
--- a/pkg/plugins/manager/signature/authorizer.go
+++ b/pkg/plugins/manager/signature/authorizer.go
@@ -5,18 +5,18 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/config"
 )
 
-func ProvideOSSAuthorizer(cfg *config.Cfg) *UnsignedPluginAuthorizer {
+func ProvideOSSAuthorizer(cfg *config.PluginManagementCfg) *UnsignedPluginAuthorizer {
 	return NewUnsignedAuthorizer(cfg)
 }
 
-func NewUnsignedAuthorizer(cfg *config.Cfg) *UnsignedPluginAuthorizer {
+func NewUnsignedAuthorizer(cfg *config.PluginManagementCfg) *UnsignedPluginAuthorizer {
 	return &UnsignedPluginAuthorizer{
 		cfg: cfg,
 	}
 }
 
 type UnsignedPluginAuthorizer struct {
-	cfg *config.Cfg
+	cfg *config.PluginManagementCfg
 }
 
 func (u *UnsignedPluginAuthorizer) CanLoadPlugin(p *plugins.Plugin) bool {
diff --git a/pkg/plugins/manager/signature/manifest.go b/pkg/plugins/manager/signature/manifest.go
index 5313d9c7e3343..f2c64917f3136 100644
--- a/pkg/plugins/manager/signature/manifest.go
+++ b/pkg/plugins/manager/signature/manifest.go
@@ -59,17 +59,17 @@ func (m *PluginManifest) isV2() bool {
 
 type Signature struct {
 	kr  plugins.KeyRetriever
-	cfg *config.Cfg
+	cfg *config.PluginManagementCfg
 	log log.Logger
 }
 
 var _ plugins.SignatureCalculator = &Signature{}
 
-func ProvideService(cfg *config.Cfg, kr plugins.KeyRetriever) *Signature {
+func ProvideService(cfg *config.PluginManagementCfg, kr plugins.KeyRetriever) *Signature {
 	return NewCalculator(cfg, kr)
 }
 
-func NewCalculator(cfg *config.Cfg, kr plugins.KeyRetriever) *Signature {
+func NewCalculator(cfg *config.PluginManagementCfg, kr plugins.KeyRetriever) *Signature {
 	return &Signature{
 		kr:  kr,
 		cfg: cfg,
@@ -77,7 +77,7 @@ func NewCalculator(cfg *config.Cfg, kr plugins.KeyRetriever) *Signature {
 	}
 }
 
-func DefaultCalculator(cfg *config.Cfg) *Signature {
+func DefaultCalculator(cfg *config.PluginManagementCfg) *Signature {
 	return &Signature{
 		kr:  statickey.New(),
 		cfg: cfg,
diff --git a/pkg/plugins/manager/signature/manifest_test.go b/pkg/plugins/manager/signature/manifest_test.go
index 4e74e70b28063..72425785889c3 100644
--- a/pkg/plugins/manager/signature/manifest_test.go
+++ b/pkg/plugins/manager/signature/manifest_test.go
@@ -52,7 +52,7 @@ NR7DnB0CCQHO+4FlSPtXFTzNepoc+CytQyDAeOLMLmf2Tqhk2YShk+G/YlVX
 -----END PGP SIGNATURE-----`
 
 	t.Run("valid manifest", func(t *testing.T) {
-		s := ProvideService(&config.Cfg{}, statickey.New())
+		s := ProvideService(&config.PluginManagementCfg{}, statickey.New())
 		manifest, err := s.readPluginManifest(context.Background(), []byte(txt))
 
 		require.NoError(t, err)
@@ -69,7 +69,7 @@ NR7DnB0CCQHO+4FlSPtXFTzNepoc+CytQyDAeOLMLmf2Tqhk2YShk+G/YlVX
 
 	t.Run("invalid manifest", func(t *testing.T) {
 		modified := strings.ReplaceAll(txt, "README.md", "xxxxxxxxxx")
-		s := ProvideService(&config.Cfg{}, statickey.New())
+		s := ProvideService(&config.PluginManagementCfg{}, statickey.New())
 		_, err := s.readPluginManifest(context.Background(), []byte(modified))
 		require.Error(t, err)
 	})
@@ -107,7 +107,7 @@ khdr/tZ1PDgRxMqB/u+Vtbpl0xSxgblnrDOYMSI=
 -----END PGP SIGNATURE-----`
 
 	t.Run("valid manifest", func(t *testing.T) {
-		s := ProvideService(&config.Cfg{}, statickey.New())
+		s := ProvideService(&config.PluginManagementCfg{}, statickey.New())
 		manifest, err := s.readPluginManifest(context.Background(), []byte(txt))
 
 		require.NoError(t, err)
@@ -155,7 +155,7 @@ func TestCalculate(t *testing.T) {
 
 		for _, tc := range tcs {
 			basePath := filepath.Join(parentDir, "testdata/non-pvt-with-root-url/plugin")
-			s := ProvideService(&config.Cfg{GrafanaAppURL: tc.appURL}, statickey.New())
+			s := ProvideService(&config.PluginManagementCfg{GrafanaAppURL: tc.appURL}, statickey.New())
 			sig, err := s.Calculate(context.Background(), &fakes.FakePluginSource{
 				PluginClassFunc: func(ctx context.Context) plugins.Class {
 					return plugins.ClassExternal
@@ -183,7 +183,7 @@ func TestCalculate(t *testing.T) {
 		basePath := "../testdata/renderer-added-file/plugin"
 
 		runningWindows = true
-		s := ProvideService(&config.Cfg{}, statickey.New())
+		s := ProvideService(&config.PluginManagementCfg{}, statickey.New())
 		sig, err := s.Calculate(context.Background(), &fakes.FakePluginSource{
 			PluginClassFunc: func(ctx context.Context) plugins.Class {
 				return plugins.ClassExternal
@@ -247,7 +247,7 @@ func TestCalculate(t *testing.T) {
 				toSlash = tc.platform.toSlashFunc()
 				fromSlash = tc.platform.fromSlashFunc()
 
-				s := ProvideService(&config.Cfg{}, statickey.New())
+				s := ProvideService(&config.PluginManagementCfg{}, statickey.New())
 				pfs, err := tc.fsFactory()
 				require.NoError(t, err)
 				pfs, err = newPathSeparatorOverrideFS(string(tc.platform.separator), pfs)
@@ -365,7 +365,7 @@ func TestFSPathSeparatorFiles(t *testing.T) {
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			pfs, err := newPathSeparatorOverrideFS(
-				"/", plugins.NewInMemoryFS(
+				tc.sep, plugins.NewInMemoryFS(
 					map[string][]byte{"a": nil, strings.Join([]string{"a", "b", "c"}, tc.sep): nil},
 				),
 			)
@@ -715,7 +715,7 @@ func Test_validateManifest(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.name, func(t *testing.T) {
-			s := ProvideService(&config.Cfg{}, statickey.New())
+			s := ProvideService(&config.PluginManagementCfg{}, statickey.New())
 			err := s.validateManifest(context.Background(), *tc.manifest, nil)
 			require.Errorf(t, err, tc.expectedErr)
 		})
@@ -811,7 +811,7 @@ pHo=
 }
 
 func Test_VerifyRevokedKey(t *testing.T) {
-	s := ProvideService(&config.Cfg{}, &revokedKeyProvider{})
+	s := ProvideService(&config.PluginManagementCfg{}, &revokedKeyProvider{})
 	m := createV2Manifest(t)
 	txt := `-----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
diff --git a/pkg/plugins/manager/sources/source_local_disk.go b/pkg/plugins/manager/sources/source_local_disk.go
index 07ab84d41c241..5f6ab1c3dd169 100644
--- a/pkg/plugins/manager/sources/source_local_disk.go
+++ b/pkg/plugins/manager/sources/source_local_disk.go
@@ -2,6 +2,10 @@ package sources
 
 import (
 	"context"
+	"errors"
+	"os"
+	"path/filepath"
+	"slices"
 
 	"github.com/grafana/grafana/pkg/plugins"
 )
@@ -36,3 +40,31 @@ func (s *LocalSource) DefaultSignature(_ context.Context) (plugins.Signature, bo
 		return plugins.Signature{}, false
 	}
 }
+
+func DirAsLocalSources(pluginsPath string, class plugins.Class) ([]*LocalSource, error) {
+	if pluginsPath == "" {
+		return []*LocalSource{}, errors.New("plugins path not configured")
+	}
+
+	// It's safe to ignore gosec warning G304 since the variable part of the file path comes from a configuration
+	// variable.
+	// nolint:gosec
+	d, err := os.ReadDir(pluginsPath)
+	if err != nil {
+		return []*LocalSource{}, errors.New("failed to open plugins path")
+	}
+
+	var pluginDirs []string
+	for _, dir := range d {
+		if dir.IsDir() || dir.Type()&os.ModeSymlink == os.ModeSymlink {
+			pluginDirs = append(pluginDirs, filepath.Join(pluginsPath, dir.Name()))
+		}
+	}
+	slices.Sort(pluginDirs)
+
+	var sources []*LocalSource
+	for _, dir := range pluginDirs {
+		sources = append(sources, NewLocalSource(class, []string{dir}))
+	}
+	return sources, nil
+}
diff --git a/pkg/plugins/manager/sources/source_local_disk_test.go b/pkg/plugins/manager/sources/source_local_disk_test.go
new file mode 100644
index 0000000000000..e380b5d5388cf
--- /dev/null
+++ b/pkg/plugins/manager/sources/source_local_disk_test.go
@@ -0,0 +1,71 @@
+package sources
+
+import (
+	"errors"
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/plugins"
+)
+
+func TestDirAsLocalSources(t *testing.T) {
+	testdataDir := "../testdata"
+
+	tests := []struct {
+		name        string
+		pluginsPath string
+		expected    []*LocalSource
+		err         error
+	}{
+		{
+			name:        "Empty path returns an error",
+			pluginsPath: "",
+			expected:    []*LocalSource{},
+			err:         errors.New("plugins path not configured"),
+		},
+		{
+			name:        "Directory with subdirectories",
+			pluginsPath: filepath.Join(testdataDir, "pluginRootWithDist"),
+			expected: []*LocalSource{
+				{
+					paths: []string{filepath.Join(testdataDir, "pluginRootWithDist", "datasource")},
+					class: plugins.ClassExternal,
+				},
+				{
+					paths: []string{filepath.Join(testdataDir, "pluginRootWithDist", "dist")},
+					class: plugins.ClassExternal,
+				},
+				{
+					paths: []string{filepath.Join(testdataDir, "pluginRootWithDist", "panel")},
+					class: plugins.ClassExternal,
+				},
+			},
+		},
+		{
+			name:        "Directory with no subdirectories",
+			pluginsPath: filepath.Join(testdataDir, "pluginRootWithDist", "datasource"),
+			expected:    nil,
+		},
+		{
+			name:        "Directory with a symlink to a directory",
+			pluginsPath: filepath.Join(testdataDir, "symbolic-plugin-dirs"),
+			expected: []*LocalSource{
+				{
+					paths: []string{filepath.Join(testdataDir, "symbolic-plugin-dirs", "plugin")},
+					class: plugins.ClassExternal,
+				},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := DirAsLocalSources(tt.pluginsPath, plugins.ClassExternal)
+			if tt.err != nil {
+				require.Errorf(t, err, tt.err.Error())
+			}
+			require.Equal(t, tt.expected, got)
+		})
+	}
+}
diff --git a/pkg/plugins/manager/sources/sources.go b/pkg/plugins/manager/sources/sources.go
index 4bf907cba2fa6..a3bfe1d4112f5 100644
--- a/pkg/plugins/manager/sources/sources.go
+++ b/pkg/plugins/manager/sources/sources.go
@@ -5,49 +5,61 @@ import (
 	"path/filepath"
 
 	"github.com/grafana/grafana/pkg/plugins"
-	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/log"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
 type Service struct {
-	gCfg *setting.Cfg
-	cfg  *config.Cfg
-	log  log.Logger
+	cfg *setting.Cfg
+	log log.Logger
 }
 
-func ProvideService(gCfg *setting.Cfg, cfg *config.Cfg) *Service {
+func ProvideService(cfg *setting.Cfg) *Service {
 	return &Service{
-		gCfg: gCfg,
-		cfg:  cfg,
-		log:  log.New("plugin.sources"),
+		cfg: cfg,
+		log: log.New("plugin.sources"),
 	}
 }
 
 func (s *Service) List(_ context.Context) []plugins.PluginSource {
-	return []plugins.PluginSource{
-		NewLocalSource(plugins.ClassCore, corePluginPaths(s.gCfg.StaticRootPath)),
-		NewLocalSource(plugins.ClassBundled, []string{s.gCfg.BundledPluginsPath}),
-		NewLocalSource(plugins.ClassExternal, append([]string{s.cfg.PluginsPath}, pluginFSPaths(s.cfg.PluginSettings)...)),
+	r := []plugins.PluginSource{
+		NewLocalSource(plugins.ClassCore, corePluginPaths(s.cfg.StaticRootPath)),
+		NewLocalSource(plugins.ClassBundled, []string{s.cfg.BundledPluginsPath}),
 	}
+	r = append(r, s.externalPluginSources()...)
+	r = append(r, s.pluginSettingSources()...)
+	return r
 }
 
-// corePluginPaths provides a list of the Core plugin file system paths
-func corePluginPaths(staticRootPath string) []string {
-	datasourcePaths := filepath.Join(staticRootPath, "app/plugins/datasource")
-	panelsPath := filepath.Join(staticRootPath, "app/plugins/panel")
-	return []string{datasourcePaths, panelsPath}
+func (s *Service) externalPluginSources() []plugins.PluginSource {
+	localSrcs, err := DirAsLocalSources(s.cfg.PluginsPath, plugins.ClassExternal)
+	if err != nil {
+		s.log.Error("Failed to load external plugins", "error", err)
+		return []plugins.PluginSource{}
+	}
+
+	var srcs []plugins.PluginSource
+	for _, src := range localSrcs {
+		srcs = append(srcs, src)
+	}
+	return srcs
 }
 
-// pluginSettingPaths provides plugin file system paths defined in cfg.PluginSettings
-func pluginFSPaths(ps map[string]map[string]string) []string {
-	var pluginSettingDirs []string
-	for _, s := range ps {
-		path, exists := s["path"]
+func (s *Service) pluginSettingSources() []plugins.PluginSource {
+	var sources []plugins.PluginSource
+	for _, ps := range s.cfg.PluginSettings {
+		path, exists := ps["path"]
 		if !exists || path == "" {
 			continue
 		}
-		pluginSettingDirs = append(pluginSettingDirs, path)
+		sources = append(sources, NewLocalSource(plugins.ClassExternal, []string{path}))
 	}
-	return pluginSettingDirs
+	return sources
+}
+
+// corePluginPaths provides a list of the Core plugin file system paths
+func corePluginPaths(staticRootPath string) []string {
+	datasourcePaths := filepath.Join(staticRootPath, "app/plugins/datasource")
+	panelsPath := filepath.Join(staticRootPath, "app/plugins/panel")
+	return []string{datasourcePaths, panelsPath}
 }
diff --git a/pkg/plugins/manager/sources/sources_test.go b/pkg/plugins/manager/sources/sources_test.go
index 6afb58063045c..f4a941ddf0b29 100644
--- a/pkg/plugins/manager/sources/sources_test.go
+++ b/pkg/plugins/manager/sources/sources_test.go
@@ -2,25 +2,27 @@ package sources
 
 import (
 	"context"
+	"path/filepath"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/plugins"
-	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
 func TestSources_List(t *testing.T) {
 	t.Run("Plugin sources are populated by default and listed in specific order", func(t *testing.T) {
+		testdata, err := filepath.Abs("../testdata")
+		require.NoError(t, err)
+
 		cfg := &setting.Cfg{
-			BundledPluginsPath: "path1",
-		}
-		pCfg := &config.Cfg{
-			PluginsPath: "path2",
+			StaticRootPath:     testdata,
+			PluginsPath:        filepath.Join(testdata, "pluginRootWithDist"),
+			BundledPluginsPath: filepath.Join(testdata, "unsigned-panel"),
 			PluginSettings: setting.PluginSettings{
 				"foo": map[string]string{
-					"path": "path3",
+					"path": filepath.Join(testdata, "test-app"),
 				},
 				"bar": map[string]string{
 					"url": "https://grafana.plugin",
@@ -28,15 +30,18 @@ func TestSources_List(t *testing.T) {
 			},
 		}
 
-		s := ProvideService(cfg, pCfg)
+		s := ProvideService(cfg)
 		srcs := s.List(context.Background())
 
 		ctx := context.Background()
 
-		require.Len(t, srcs, 3)
+		require.Len(t, srcs, 6)
 
 		require.Equal(t, srcs[0].PluginClass(ctx), plugins.ClassCore)
-		require.Equal(t, srcs[0].PluginURIs(ctx), []string{"app/plugins/datasource", "app/plugins/panel"})
+		require.Equal(t, srcs[0].PluginURIs(ctx), []string{
+			filepath.Join(testdata, "app", "plugins", "datasource"),
+			filepath.Join(testdata, "app", "plugins", "panel"),
+		})
 		sig, exists := srcs[0].DefaultSignature(ctx)
 		require.True(t, exists)
 		require.Equal(t, plugins.SignatureStatusInternal, sig.Status)
@@ -44,15 +49,70 @@ func TestSources_List(t *testing.T) {
 		require.Equal(t, "", sig.SigningOrg)
 
 		require.Equal(t, srcs[1].PluginClass(ctx), plugins.ClassBundled)
-		require.Equal(t, srcs[1].PluginURIs(ctx), []string{"path1"})
+		require.Equal(t, srcs[1].PluginURIs(ctx), []string{filepath.Join(testdata, "unsigned-panel")})
 		sig, exists = srcs[1].DefaultSignature(ctx)
 		require.False(t, exists)
 		require.Equal(t, plugins.Signature{}, sig)
 
 		require.Equal(t, srcs[2].PluginClass(ctx), plugins.ClassExternal)
-		require.Equal(t, srcs[2].PluginURIs(ctx), []string{"path2", "path3"})
+		require.Equal(t, srcs[2].PluginURIs(ctx), []string{
+			filepath.Join(testdata, "pluginRootWithDist", "datasource"),
+		})
 		sig, exists = srcs[2].DefaultSignature(ctx)
 		require.False(t, exists)
 		require.Equal(t, plugins.Signature{}, sig)
+
+		require.Equal(t, srcs[3].PluginClass(ctx), plugins.ClassExternal)
+		require.Equal(t, srcs[3].PluginURIs(ctx), []string{
+			filepath.Join(testdata, "pluginRootWithDist", "dist"),
+		})
+		sig, exists = srcs[3].DefaultSignature(ctx)
+		require.False(t, exists)
+		require.Equal(t, plugins.Signature{}, sig)
+
+		require.Equal(t, srcs[4].PluginClass(ctx), plugins.ClassExternal)
+		require.Equal(t, srcs[4].PluginURIs(ctx), []string{
+			filepath.Join(testdata, "pluginRootWithDist", "panel"),
+		})
+		sig, exists = srcs[4].DefaultSignature(ctx)
+		require.False(t, exists)
+		require.Equal(t, plugins.Signature{}, sig)
+	})
+
+	t.Run("Plugin sources are populated with symbolic links", func(t *testing.T) {
+		testdata, err := filepath.Abs("../testdata")
+		require.NoError(t, err)
+
+		cfg := &setting.Cfg{
+			StaticRootPath:     testdata,
+			PluginsPath:        filepath.Join(testdata, "symbolic-plugin-dirs"),
+			BundledPluginsPath: filepath.Join(testdata, "unsigned-panel"),
+		}
+		s := ProvideService(cfg)
+		ctx := context.Background()
+		srcs := s.List(ctx)
+		uris := map[plugins.Class]map[string]struct{}{}
+		for _, s := range srcs {
+			class := s.PluginClass(ctx)
+			if _, exists := uris[class]; !exists {
+				uris[class] = map[string]struct{}{}
+			}
+			for _, uri := range s.PluginURIs(ctx) {
+				uris[class][uri] = struct{}{}
+			}
+		}
+
+		require.Equal(t, uris[plugins.ClassCore], map[string]struct{}{
+			filepath.Join(testdata, "app", "plugins", "datasource"): {},
+			filepath.Join(testdata, "app", "plugins", "panel"):      {},
+		}, "should include core plugins")
+
+		require.Equal(t, uris[plugins.ClassBundled], map[string]struct{}{
+			filepath.Join(testdata, "unsigned-panel"): {},
+		}, "should include bundle plugin")
+
+		require.Equal(t, uris[plugins.ClassExternal], map[string]struct{}{
+			filepath.Join(testdata, "symbolic-plugin-dirs", "plugin"): {},
+		}, "should include external symlinked plugin")
 	})
 }
diff --git a/pkg/plugins/manager/testdata/external-registration/plugin.json b/pkg/plugins/manager/testdata/external-registration/plugin.json
index 7021001580378..4797eb003da0e 100644
--- a/pkg/plugins/manager/testdata/external-registration/plugin.json
+++ b/pkg/plugins/manager/testdata/external-registration/plugin.json
@@ -17,7 +17,7 @@
     "updated": "2023-08-03",
     "version": "1.0.0"
   },
-  "externalServiceRegistration": {
+  "iam": {
     "permissions" :  [
       {
         "action": "read",
diff --git a/pkg/plugins/manager/testdata/oauth-external-registration/plugin.json b/pkg/plugins/manager/testdata/oauth-external-registration/plugin.json
deleted file mode 100644
index c09e9ea5d0d52..0000000000000
--- a/pkg/plugins/manager/testdata/oauth-external-registration/plugin.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "id": "grafana-test-datasource",
-  "type": "datasource",
-  "name": "Test",
-  "backend": true,
-  "executable": "gpx_test_datasource",
-  "info": {
-    "author": {
-      "name": "Grafana Labs",
-      "url": "https://grafana.com"
-    },
-    "logos": {
-      "large": "img/ds.svg",
-      "small": "img/ds.svg"
-    },
-    "screenshots": [],
-    "updated": "2023-08-03",
-    "version": "1.0.0"
-  },
-  "externalServiceRegistration": {
-    "impersonation": {
-      "enabled" : true,
-      "groups" : true,
-      "permissions" :  [
-        {
-          "action": "read",
-          "scope": "datasource"
-        }
-      ]
-    },
-    "permissions" :  [
-      {
-        "action": "read",
-        "scope": "datasource"
-      }
-    ]
-  }
-}
diff --git a/pkg/plugins/manager/testdata/plugin-with-dist/plugin/dist/MANIFEST.txt b/pkg/plugins/manager/testdata/plugin-with-dist/plugin/dist/MANIFEST.txt
new file mode 100644
index 0000000000000..6bb05dbe46ac0
--- /dev/null
+++ b/pkg/plugins/manager/testdata/plugin-with-dist/plugin/dist/MANIFEST.txt
@@ -0,0 +1,28 @@
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+{
+  "manifestVersion": "2.0.0",
+  "signatureType": "grafana",
+  "signedByOrg": "grafana",
+  "signedByOrgName": "Grafana Labs",
+  "plugin": "test-datasource",
+  "version": "1.0.0",
+  "time": 1661171059101,
+  "keyId": "7e4d0c6a708866e7",
+  "files": {
+    "plugin.json": "203ef4a613c5693c437a665cd67f95e2756a0f71b336b2ffb265db7c180d0b19"
+  }
+}
+-----BEGIN PGP SIGNATURE-----
+Version: OpenPGP.js v4.10.10
+Comment: https://openpgpjs.org
+
+wrgEARMKAAYFAmMDdXMAIQkQfk0ManCIZucWIQTzOyW2kQdOhGNlcPN+TQxq
+cIhm54zLAgdfVimeut6Gw9MrIACBZUSH0ht9p9j+iG6MDjpmEFIpqVJrem6f
+8wBv0/kmYU3LV9MWyPuUeRfBdccjQKSjEXlfEAIJAVmut9LcSKIykhWuQA+7
+VMVvJPXzlPkeoYsGYvzAlxh8i2UomCU15UChe62Gzq5V5HgGYkX5layIb5XX
+y2Pio0lc
+=/TR0
+-----END PGP SIGNATURE-----
diff --git a/pkg/plugins/manager/testdata/plugin-with-dist/plugin/dist/plugin.json b/pkg/plugins/manager/testdata/plugin-with-dist/plugin/dist/plugin.json
new file mode 100644
index 0000000000000..71a9a05b58651
--- /dev/null
+++ b/pkg/plugins/manager/testdata/plugin-with-dist/plugin/dist/plugin.json
@@ -0,0 +1,16 @@
+{
+  "type": "datasource",
+  "name": "Test",
+  "id": "test-datasource",
+  "backend": true,
+  "executable": "test",
+  "state": "alpha",
+  "info": {
+    "version": "1.0.0",
+    "description": "Test",
+    "author": {
+      "name": "Will Browne",
+      "url": "https://willbrowne.com"
+    }
+  }
+}
diff --git a/pkg/plugins/manager/testdata/plugin-with-dist/plugin/plugin.json b/pkg/plugins/manager/testdata/plugin-with-dist/plugin/plugin.json
new file mode 100644
index 0000000000000..b959255ff160a
--- /dev/null
+++ b/pkg/plugins/manager/testdata/plugin-with-dist/plugin/plugin.json
@@ -0,0 +1,16 @@
+{
+  "type": "datasource",
+  "name": "Test",
+  "id": "test-datasource",
+  "backend": true,
+  "executable": "test",
+  "state": "alpha",
+  "info": {
+    "version": "2.0.0",
+    "description": "Test",
+    "author": {
+      "name": "Will Browne",
+      "url": "https://willbrowne.com"
+    }
+  }
+}
diff --git a/public/app/features/dashboard-scene/sharing/utils.ts b/pkg/plugins/manager/testdata/pluginRootWithDist/datasource/plugin.json
similarity index 100%
rename from public/app/features/dashboard-scene/sharing/utils.ts
rename to pkg/plugins/manager/testdata/pluginRootWithDist/datasource/plugin.json
diff --git a/pkg/plugins/manager/testdata/pluginRootWithDist/dist/plugin.json b/pkg/plugins/manager/testdata/pluginRootWithDist/dist/plugin.json
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/pkg/plugins/manager/testdata/pluginRootWithDist/panel/dist/plugin.json b/pkg/plugins/manager/testdata/pluginRootWithDist/panel/dist/plugin.json
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/pkg/plugins/manager/testdata/pluginRootWithDist/panel/src/plugin.json b/pkg/plugins/manager/testdata/pluginRootWithDist/panel/src/plugin.json
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/pkg/plugins/models.go b/pkg/plugins/models.go
index 8ccf777af7201..5553ad331a592 100644
--- a/pkg/plugins/models.go
+++ b/pkg/plugins/models.go
@@ -130,6 +130,7 @@ type Info struct {
 	Screenshots []Screenshots `json:"screenshots"`
 	Version     string        `json:"version"`
 	Updated     string        `json:"updated"`
+	Keywords    []string      `json:"keywords"`
 }
 
 type InfoLink struct {
@@ -208,22 +209,23 @@ type PluginMetaDTO struct {
 
 	Module  string `json:"module"`
 	BaseURL string `json:"baseUrl"`
+
+	Angular AngularMeta `json:"angular"`
 }
 
 type DataSourceDTO struct {
-	ID              int64          `json:"id,omitempty"`
-	UID             string         `json:"uid,omitempty"`
-	Type            string         `json:"type"`
-	Name            string         `json:"name"`
-	PluginMeta      *PluginMetaDTO `json:"meta"`
-	URL             string         `json:"url,omitempty"`
-	IsDefault       bool           `json:"isDefault"`
-	Access          string         `json:"access,omitempty"`
-	Preload         bool           `json:"preload"`
-	Module          string         `json:"module,omitempty"`
-	JSONData        map[string]any `json:"jsonData"`
-	ReadOnly        bool           `json:"readOnly"`
-	AngularDetected bool           `json:"angularDetected"`
+	ID         int64          `json:"id,omitempty"`
+	UID        string         `json:"uid,omitempty"`
+	Type       string         `json:"type"`
+	Name       string         `json:"name"`
+	PluginMeta *PluginMetaDTO `json:"meta"`
+	URL        string         `json:"url,omitempty"`
+	IsDefault  bool           `json:"isDefault"`
+	Access     string         `json:"access,omitempty"`
+	Preload    bool           `json:"preload"`
+	Module     string         `json:"module,omitempty"`
+	JSONData   map[string]any `json:"jsonData"`
+	ReadOnly   bool           `json:"readOnly"`
 
 	BasicAuth       string `json:"basicAuth,omitempty"`
 	WithCredentials bool   `json:"withCredentials,omitempty"`
@@ -243,26 +245,28 @@ type DataSourceDTO struct {
 }
 
 type PanelDTO struct {
-	ID              string   `json:"id"`
-	Name            string   `json:"name"`
-	AliasIDs        []string `json:"aliasIds,omitempty"`
-	Info            Info     `json:"info"`
-	HideFromList    bool     `json:"hideFromList"`
-	Sort            int      `json:"sort"`
-	SkipDataQuery   bool     `json:"skipDataQuery"`
-	ReleaseState    string   `json:"state"`
-	BaseURL         string   `json:"baseUrl"`
-	Signature       string   `json:"signature"`
-	Module          string   `json:"module"`
-	AngularDetected bool     `json:"angularDetected"`
+	ID            string   `json:"id"`
+	Name          string   `json:"name"`
+	AliasIDs      []string `json:"aliasIds,omitempty"`
+	Info          Info     `json:"info"`
+	HideFromList  bool     `json:"hideFromList"`
+	Sort          int      `json:"sort"`
+	SkipDataQuery bool     `json:"skipDataQuery"`
+	ReleaseState  string   `json:"state"`
+	BaseURL       string   `json:"baseUrl"`
+	Signature     string   `json:"signature"`
+	Module        string   `json:"module"`
+
+	Angular AngularMeta `json:"angular"`
 }
 
 type AppDTO struct {
-	ID              string `json:"id"`
-	Path            string `json:"path"`
-	Version         string `json:"version"`
-	Preload         bool   `json:"preload"`
-	AngularDetected bool   `json:"angularDetected"`
+	ID      string `json:"id"`
+	Path    string `json:"path"`
+	Version string `json:"version"`
+	Preload bool   `json:"preload"`
+
+	Angular AngularMeta `json:"angular"`
 }
 
 const (
diff --git a/pkg/plugins/pfs/corelist/corelist.go b/pkg/plugins/pfs/corelist/corelist.go
deleted file mode 100644
index 5113e3e63abe2..0000000000000
--- a/pkg/plugins/pfs/corelist/corelist.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package corelist
-
-import (
-	"sync"
-
-	"github.com/grafana/grafana/pkg/cuectx"
-	"github.com/grafana/grafana/pkg/plugins/pfs"
-	"github.com/grafana/thema"
-)
-
-var coreTrees []pfs.ParsedPlugin
-var coreOnce sync.Once
-
-// New returns a pfs.PluginList containing the plugin trees for all core plugins
-// in the current version of Grafana.
-//
-// Go code within the grafana codebase should only ever call this with nil.
-func New(rt *thema.Runtime) []pfs.ParsedPlugin {
-	var pl []pfs.ParsedPlugin
-	if rt == nil {
-		coreOnce.Do(func() {
-			coreTrees = corePlugins(cuectx.GrafanaThemaRuntime())
-		})
-		pl = make([]pfs.ParsedPlugin, len(coreTrees))
-		copy(pl, coreTrees)
-	} else {
-		return corePlugins(rt)
-	}
-	return pl
-}
diff --git a/pkg/plugins/pfs/corelist/corelist_load_gen.go b/pkg/plugins/pfs/corelist/corelist_load_gen.go
deleted file mode 100644
index de2a8fbff57c3..0000000000000
--- a/pkg/plugins/pfs/corelist/corelist_load_gen.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     public/app/plugins/gen.go
-// Using jennies:
-//     PluginTreeListJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package corelist
-
-import (
-	"fmt"
-	"io/fs"
-
-	"github.com/grafana/grafana"
-	"github.com/grafana/grafana/pkg/plugins/pfs"
-	"github.com/grafana/thema"
-)
-
-func parsePluginOrPanic(path string, pkgname string, rt *thema.Runtime) pfs.ParsedPlugin {
-	sub, err := fs.Sub(grafana.CueSchemaFS, path)
-	if err != nil {
-		panic("could not create fs sub to " + path)
-	}
-	pp, err := pfs.ParsePluginFS(sub, rt)
-	if err != nil {
-		panic(fmt.Sprintf("error parsing plugin metadata for %s: %s", pkgname, err))
-	}
-	return pp
-}
-
-func corePlugins(rt *thema.Runtime) []pfs.ParsedPlugin {
-	return []pfs.ParsedPlugin{
-		parsePluginOrPanic("public/app/plugins/datasource/alertmanager", "alertmanager", rt),
-		parsePluginOrPanic("public/app/plugins/datasource/azuremonitor", "grafana_azure_monitor_datasource", rt),
-		parsePluginOrPanic("public/app/plugins/datasource/cloud-monitoring", "stackdriver", rt),
-		parsePluginOrPanic("public/app/plugins/datasource/cloudwatch", "cloudwatch", rt),
-		parsePluginOrPanic("public/app/plugins/datasource/dashboard", "dashboard", rt),
-		parsePluginOrPanic("public/app/plugins/datasource/elasticsearch", "elasticsearch", rt),
-		parsePluginOrPanic("public/app/plugins/datasource/grafana", "grafana", rt),
-		parsePluginOrPanic("public/app/plugins/datasource/grafana-pyroscope-datasource", "grafana_pyroscope_datasource", rt),
-		parsePluginOrPanic("public/app/plugins/datasource/grafana-testdata-datasource", "grafana_testdata_datasource", rt),
-		parsePluginOrPanic("public/app/plugins/datasource/graphite", "graphite", rt),
-		parsePluginOrPanic("public/app/plugins/datasource/jaeger", "jaeger", rt),
-		parsePluginOrPanic("public/app/plugins/datasource/loki", "loki", rt),
-		parsePluginOrPanic("public/app/plugins/datasource/mssql", "mssql", rt),
-		parsePluginOrPanic("public/app/plugins/datasource/mysql", "mysql", rt),
-		parsePluginOrPanic("public/app/plugins/datasource/parca", "parca", rt),
-		parsePluginOrPanic("public/app/plugins/datasource/postgres", "postgres", rt),
-		parsePluginOrPanic("public/app/plugins/datasource/prometheus", "prometheus", rt),
-		parsePluginOrPanic("public/app/plugins/datasource/tempo", "tempo", rt),
-		parsePluginOrPanic("public/app/plugins/datasource/zipkin", "zipkin", rt),
-		parsePluginOrPanic("public/app/plugins/panel/alertGroups", "alertGroups", rt),
-		parsePluginOrPanic("public/app/plugins/panel/alertlist", "alertlist", rt),
-		parsePluginOrPanic("public/app/plugins/panel/annolist", "annolist", rt),
-		parsePluginOrPanic("public/app/plugins/panel/barchart", "barchart", rt),
-		parsePluginOrPanic("public/app/plugins/panel/bargauge", "bargauge", rt),
-		parsePluginOrPanic("public/app/plugins/panel/candlestick", "candlestick", rt),
-		parsePluginOrPanic("public/app/plugins/panel/canvas", "canvas", rt),
-		parsePluginOrPanic("public/app/plugins/panel/dashlist", "dashlist", rt),
-		parsePluginOrPanic("public/app/plugins/panel/datagrid", "datagrid", rt),
-		parsePluginOrPanic("public/app/plugins/panel/debug", "debug", rt),
-		parsePluginOrPanic("public/app/plugins/panel/flamegraph", "flamegraph", rt),
-		parsePluginOrPanic("public/app/plugins/panel/gauge", "gauge", rt),
-		parsePluginOrPanic("public/app/plugins/panel/geomap", "geomap", rt),
-		parsePluginOrPanic("public/app/plugins/panel/gettingstarted", "gettingstarted", rt),
-		parsePluginOrPanic("public/app/plugins/panel/graph", "graph", rt),
-		parsePluginOrPanic("public/app/plugins/panel/heatmap", "heatmap", rt),
-		parsePluginOrPanic("public/app/plugins/panel/histogram", "histogram", rt),
-		parsePluginOrPanic("public/app/plugins/panel/live", "live", rt),
-		parsePluginOrPanic("public/app/plugins/panel/logs", "logs", rt),
-		parsePluginOrPanic("public/app/plugins/panel/news", "news", rt),
-		parsePluginOrPanic("public/app/plugins/panel/nodeGraph", "nodeGraph", rt),
-		parsePluginOrPanic("public/app/plugins/panel/piechart", "piechart", rt),
-		parsePluginOrPanic("public/app/plugins/panel/stat", "stat", rt),
-		parsePluginOrPanic("public/app/plugins/panel/state-timeline", "state_timeline", rt),
-		parsePluginOrPanic("public/app/plugins/panel/status-history", "status_history", rt),
-		parsePluginOrPanic("public/app/plugins/panel/table", "table", rt),
-		parsePluginOrPanic("public/app/plugins/panel/table-old", "table_old", rt),
-		parsePluginOrPanic("public/app/plugins/panel/text", "text", rt),
-		parsePluginOrPanic("public/app/plugins/panel/timeseries", "timeseries", rt),
-		parsePluginOrPanic("public/app/plugins/panel/traces", "traces", rt),
-		parsePluginOrPanic("public/app/plugins/panel/trend", "trend", rt),
-		parsePluginOrPanic("public/app/plugins/panel/welcome", "welcome", rt),
-		parsePluginOrPanic("public/app/plugins/panel/xychart", "xychart", rt),
-	}
-}
diff --git a/pkg/plugins/pfs/decl.go b/pkg/plugins/pfs/decl.go
index 37a3916d9045d..0c24479467b3a 100644
--- a/pkg/plugins/pfs/decl.go
+++ b/pkg/plugins/pfs/decl.go
@@ -1,30 +1,26 @@
 package pfs
 
 import (
+	"cuelang.org/go/cue"
 	"cuelang.org/go/cue/ast"
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema"
-
-	"github.com/grafana/grafana/pkg/plugins/plugindef"
 )
 
 type PluginDecl struct {
-	SchemaInterface *kindsys.SchemaInterface
-	Lineage         thema.Lineage
+	SchemaInterface SchemaInterface
+	CueFile         cue.Value
 	Imports         []*ast.ImportSpec
 	PluginPath      string
-	PluginMeta      plugindef.PluginDef
-	KindDecl        kindsys.Def[kindsys.ComposableProperties]
+	PluginMeta      Metadata
 }
 
-func EmptyPluginDecl(path string, meta plugindef.PluginDef) *PluginDecl {
-	return &PluginDecl{
-		PluginPath: path,
-		PluginMeta: meta,
-		Imports:    make([]*ast.ImportSpec, 0),
-	}
+type SchemaInterface struct {
+	Name    string
+	IsGroup bool
 }
 
-func (decl *PluginDecl) HasSchema() bool {
-	return decl.Lineage != nil && decl.SchemaInterface != nil
+type Metadata struct {
+	Id      string
+	Name    string
+	Backend *bool
+	Version *string
 }
diff --git a/pkg/plugins/pfs/decl_parser.go b/pkg/plugins/pfs/decl_parser.go
index 04833a425d54f..374615c3737be 100644
--- a/pkg/plugins/pfs/decl_parser.go
+++ b/pkg/plugins/pfs/decl_parser.go
@@ -6,24 +6,22 @@ import (
 	"path/filepath"
 	"sort"
 
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema"
+	"cuelang.org/go/cue/cuecontext"
 )
 
-type declParser struct {
-	rt   *thema.Runtime
+type DeclParser struct {
 	skip map[string]bool
 }
 
-func NewDeclParser(rt *thema.Runtime, skip map[string]bool) *declParser {
-	return &declParser{
-		rt:   rt,
+func NewDeclParser(skip map[string]bool) *DeclParser {
+	return &DeclParser{
 		skip: skip,
 	}
 }
 
 // TODO convert this to be the new parser for Tree
-func (psr *declParser) Parse(root fs.FS) ([]*PluginDecl, error) {
+func (psr *DeclParser) Parse(root fs.FS) ([]*PluginDecl, error) {
+	ctx := cuecontext.New()
 	// TODO remove hardcoded tree structure assumption, work from root of provided fs
 	plugins, err := fs.Glob(root, "**/**/plugin.json")
 	if err != nil {
@@ -39,30 +37,22 @@ func (psr *declParser) Parse(root fs.FS) ([]*PluginDecl, error) {
 		}
 
 		dir, _ := fs.Sub(root, path)
-		pp, err := ParsePluginFS(dir, psr.rt)
+		pp, err := ParsePluginFS(ctx, dir, path)
 		if err != nil {
 			return nil, fmt.Errorf("parsing plugin failed for %s: %s", dir, err)
 		}
 
-		if len(pp.ComposableKinds) == 0 {
-			decls = append(decls, EmptyPluginDecl(path, pp.Properties))
+		if !pp.CueFile.Exists() {
 			continue
 		}
 
-		for slotName, kind := range pp.ComposableKinds {
-			slot, err := kindsys.FindSchemaInterface(slotName)
-			if err != nil {
-				return nil, fmt.Errorf("parsing plugin failed for %s: %s", dir, err)
-			}
-			decls = append(decls, &PluginDecl{
-				SchemaInterface: &slot,
-				Lineage:         kind.Lineage(),
-				Imports:         pp.CUEImports,
-				PluginMeta:      pp.Properties,
-				PluginPath:      path,
-				KindDecl:        kind.Def(),
-			})
-		}
+		decls = append(decls, &PluginDecl{
+			SchemaInterface: pp.Variant,
+			CueFile:         pp.CueFile,
+			Imports:         pp.CUEImports,
+			PluginMeta:      pp.Properties,
+			PluginPath:      path,
+		})
 	}
 
 	sort.Slice(decls, func(i, j int) bool {
diff --git a/pkg/plugins/pfs/errors.go b/pkg/plugins/pfs/errors.go
index a65c588a0d73e..6bbd1cc093cc6 100644
--- a/pkg/plugins/pfs/errors.go
+++ b/pkg/plugins/pfs/errors.go
@@ -11,16 +11,6 @@ var ErrNoRootFile = errors.New("no plugin.json at root of fs.fS")
 // ErrInvalidRootFile indicates that the root plugin.json file is invalid.
 var ErrInvalidRootFile = errors.New("plugin.json is invalid")
 
-// ErrComposableNotExpected indicates that a plugin has a composable kind for a
-// schema interface that is not expected, given the type of the plugin. (For
-// example, a datasource plugin has a panelcfg composable kind)
-var ErrComposableNotExpected = errors.New("plugin type should not produce composable kind for schema interface")
-
-// ErrExpectedComposable indicates that a plugin lacks a composable kind
-// implementation for a schema interface that is expected for that plugin's
-// type. (For example, a datasource plugin lacks a queries composable kind)
-var ErrExpectedComposable = errors.New("plugin type should produce composable kind for schema interface")
-
 // ErrInvalidGrafanaPluginInstance indicates a plugin's set of .cue
 // grafanaplugin package files are invalid with respect to the GrafanaPlugin
 // spec.
diff --git a/pkg/plugins/pfs/grafanaplugin.cue b/pkg/plugins/pfs/grafanaplugin.cue
deleted file mode 100644
index 6adb68555a1a2..0000000000000
--- a/pkg/plugins/pfs/grafanaplugin.cue
+++ /dev/null
@@ -1,31 +0,0 @@
-package pfs
-
-import (
-	"github.com/grafana/kindsys"
-)
-
-// GrafanaPlugin specifies what plugins may declare in .cue files in a
-// `grafanaplugin` CUE package in the plugin root directory (adjacent to plugin.json).
-GrafanaPlugin: {
-	// id and pascalName are injected from plugin.json. Plugin authors can write
-	// values for them in .cue files, but the only valid values will be the ones
-	// given in plugin.json.
-	id: string
-	pascalName: string
-
-	// A plugin defines its Composable kinds under this key.
-	//
-	// This struct is open for forwards compatibility - older versions of Grafana (or
-	// dependent tooling) should not break if new versions introduce additional schema interfaces.
-	composableKinds?: [Iface=string]: kindsys.Composable & {
-		name: pascalName + Iface
-		schemaInterface: Iface
-		lineage: name: pascalName + Iface
-	}
-
-	// A plugin defines its Custom kinds under this key.
-	customKinds?: [Name=string]: kindsys.Custom & {
-		name: Name
-	}
-	...
-}
diff --git a/pkg/plugins/pfs/pfs.go b/pkg/plugins/pfs/pfs.go
index 73cb4a3f33c64..a3dc8bd873538 100644
--- a/pkg/plugins/pfs/pfs.go
+++ b/pkg/plugins/pfs/pfs.go
@@ -1,59 +1,35 @@
 package pfs
 
 import (
+	"encoding/json"
 	"fmt"
 	"io/fs"
-	"path/filepath"
-	"sort"
 	"strings"
-	"sync"
-	"testing/fstest"
 
 	"cuelang.org/go/cue"
-	"cuelang.org/go/cue/build"
-	"cuelang.org/go/cue/cuecontext"
 	"cuelang.org/go/cue/errors"
-	"cuelang.org/go/cue/parser"
-	"cuelang.org/go/cue/token"
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema"
-	"github.com/grafana/thema/load"
-	"github.com/grafana/thema/vmux"
-	"github.com/yalue/merged_fs"
-
-	"github.com/grafana/grafana/pkg/cuectx"
-	"github.com/grafana/grafana/pkg/plugins/plugindef"
+	"cuelang.org/go/cue/load"
+	"github.com/grafana/grafana/pkg/codegen"
 )
 
 // PackageName is the name of the CUE package that Grafana will load when
 // looking for a Grafana plugin's kind declarations.
 const PackageName = "grafanaplugin"
 
-var onceGP sync.Once
-var defaultGP cue.Value
-
-func doLoadGP(ctx *cue.Context) cue.Value {
-	v, err := cuectx.BuildGrafanaInstance(ctx, filepath.Join("pkg", "plugins", "pfs"), "pfs", nil)
-	if err != nil {
-		// should be unreachable
-		panic(err)
-	}
-	return v.LookupPath(cue.MakePath(cue.Str("GrafanaPlugin")))
-}
-
-func loadGP(ctx *cue.Context) cue.Value {
-	if ctx == nil || ctx == cuectx.GrafanaCUEContext() {
-		onceGP.Do(func() {
-			defaultGP = doLoadGP(ctx)
-		})
-		return defaultGP
-	}
-	return doLoadGP(ctx)
+var schemaInterface = map[string]SchemaInterface{
+	"DataQuery": {
+		Name:    "DataQuery",
+		IsGroup: false,
+	},
+	"PanelCfg": {
+		Name:    "PanelCfg",
+		IsGroup: true,
+	},
 }
 
 // PermittedCUEImports returns the list of import paths that may be used in a
 // plugin's grafanaplugin cue package.
-var PermittedCUEImports = cuectx.PermittedCUEImports
+var PermittedCUEImports = codegen.PermittedCUEImports
 
 func importAllowed(path string) bool {
 	for _, p := range PermittedCUEImports() {
@@ -66,22 +42,12 @@ func importAllowed(path string) bool {
 
 var allowedImportsStr string
 
-var allsi []kindsys.SchemaInterface
-
 func init() {
 	all := make([]string, 0, len(PermittedCUEImports()))
 	for _, im := range PermittedCUEImports() {
 		all = append(all, fmt.Sprintf("\t%s", im))
 	}
 	allowedImportsStr = strings.Join(all, "\n")
-
-	for _, s := range kindsys.SchemaInterfaces(nil) {
-		allsi = append(allsi, s)
-	}
-
-	sort.Slice(allsi, func(i, j int) bool {
-		return allsi[i].Name() < allsi[j].Name()
-	})
 }
 
 // ParsePluginFS takes a virtual filesystem and checks that it contains a valid
@@ -96,76 +62,40 @@ func init() {
 // This function parses exactly one plugin. It does not descend into
 // subdirectories to search for additional plugin.json or .cue files.
 //
-// Calling this with a nil [thema.Runtime] (the singleton returned from
-// [cuectx.GrafanaThemaRuntime] is used) will memoize certain CUE operations.
-// Prefer passing nil unless a different thema.Runtime is specifically required.
-//
 // [GrafanaPlugin]: https://github.com/grafana/grafana/blob/main/pkg/plugins/pfs/grafanaplugin.cue
-func ParsePluginFS(fsys fs.FS, rt *thema.Runtime) (ParsedPlugin, error) {
+func ParsePluginFS(ctx *cue.Context, fsys fs.FS, dir string) (ParsedPlugin, error) {
 	if fsys == nil {
 		return ParsedPlugin{}, ErrEmptyFS
 	}
-	if rt == nil {
-		rt = cuectx.GrafanaThemaRuntime()
-	}
 
-	lin, err := plugindef.Lineage(rt)
+	cuefiles, err := fs.Glob(fsys, "*.cue")
 	if err != nil {
-		panic(fmt.Sprintf("plugindef lineage is invalid or broken, needs dev attention: %s", err))
+		return ParsedPlugin{}, fmt.Errorf("error globbing for cue files in fsys: %w", err)
+	} else if len(cuefiles) == 0 {
+		return ParsedPlugin{}, nil
 	}
-	ctx := rt.Context()
 
-	b, err := fs.ReadFile(fsys, "plugin.json")
+	metadata, err := getPluginMetadata(fsys)
 	if err != nil {
-		if errors.Is(err, fs.ErrNotExist) {
-			return ParsedPlugin{}, ErrNoRootFile
-		}
-		return ParsedPlugin{}, fmt.Errorf("error reading plugin.json: %w", err)
+		return ParsedPlugin{}, err
 	}
 
 	pp := ParsedPlugin{
-		ComposableKinds: make(map[string]kindsys.Composable),
-		// CustomKinds:     make(map[string]kindsys.Custom),
+		Properties: metadata,
 	}
 
-	// Pass the raw bytes into the muxer, get the populated PluginDef type out that we want.
-	// TODO stop ignoring second return. (for now, lacunas are a WIP and can't occur until there's >1 schema in the plugindef lineage)
-	pinst, _, err := vmux.NewTypedMux(lin.TypedSchema(), vmux.NewJSONCodec("plugin.json"))(b)
 	if err != nil {
-		return ParsedPlugin{}, errors.Wrap(errors.Promote(err, ""), ErrInvalidRootFile)
-	}
-	pp.Properties = *(pinst.ValueP())
-	// FIXME remove this once it's being correctly populated coming out of lineage
-	if pp.Properties.PascalName == "" {
-		pp.Properties.PascalName = plugindef.DerivePascalName(pp.Properties)
+		return ParsedPlugin{}, err
 	}
 
-	if cuefiles, err := fs.Glob(fsys, "*.cue"); err != nil {
-		return ParsedPlugin{}, fmt.Errorf("error globbing for cue files in fsys: %w", err)
-	} else if len(cuefiles) == 0 {
-		return pp, nil
+	bi := load.Instances(cuefiles, &load.Config{
+		Package: PackageName,
+		Dir:     dir,
+	})[0]
+	if bi.Err != nil {
+		return ParsedPlugin{}, bi.Err
 	}
 
-	gpv := loadGP(rt.Context())
-
-	fsys, err = ensureCueMod(fsys, pp.Properties)
-	if err != nil {
-		return ParsedPlugin{}, fmt.Errorf("%s has invalid cue.mod: %w", pp.Properties.Id, err)
-	}
-
-	bi, err := cuectx.LoadInstanceWithGrafana(fsys, "", load.Package(PackageName))
-	if err != nil || bi.Err != nil {
-		if err == nil {
-			err = bi.Err
-		}
-		return ParsedPlugin{}, errors.Wrap(errors.Newf(token.NoPos, "%s did not load", pp.Properties.Id), err)
-	}
-
-	f, _ := parser.ParseFile("plugin.json", fmt.Sprintf(`{
-		"id": %q,
-		"pascalName": %q
-	}`, pp.Properties.Id, pp.Properties.PascalName))
-
 	for _, f := range bi.Files {
 		for _, im := range f.Imports {
 			ip := strings.Trim(im.Path.Value, "\"")
@@ -187,99 +117,89 @@ func ParsePluginFS(fsys fs.FS, rt *thema.Runtime) (ParsedPlugin, error) {
 		panic("Refactor required - upstream CUE implementation changed, bi.Files is no longer populated")
 	}
 
-	// Inject the JSON directly into the build so it gets loaded together
-	bi.BuildFiles = append(bi.BuildFiles, &build.File{
-		Filename: "plugin.json",
-		Encoding: build.JSON,
-		Form:     build.Data,
-		Source:   b,
-	})
-	bi.Files = append(bi.Files, f)
-
-	gpi := ctx.BuildInstance(bi).Unify(gpv)
+	gpi := ctx.BuildInstance(bi)
 	if gpi.Err() != nil {
 		return ParsedPlugin{}, errors.Wrap(errors.Promote(ErrInvalidGrafanaPluginInstance, pp.Properties.Id), gpi.Err())
 	}
 
-	for _, si := range allsi {
-		iv := gpi.LookupPath(cue.MakePath(cue.Str("composableKinds"), cue.Str(si.Name())))
+	for name, si := range schemaInterface {
+		iv := gpi.LookupPath(cue.MakePath(cue.Str("composableKinds"), cue.Str(name)))
 		if !iv.Exists() {
 			continue
 		}
 
-		props, err := kindsys.ToKindProps[kindsys.ComposableProperties](iv)
-		if err != nil {
-			return ParsedPlugin{}, err
+		iv = iv.FillPath(cue.MakePath(cue.Str("schemaInterface")), name)
+		iv = iv.FillPath(cue.MakePath(cue.Str("name")), derivePascalName(pp.Properties.Id, pp.Properties.Name)+name)
+		lineageNamePath := iv.LookupPath(cue.MakePath(cue.Str("lineage"), cue.Str("name")))
+		if !lineageNamePath.Exists() {
+			iv = iv.FillPath(cue.MakePath(cue.Str("lineage"), cue.Str("name")), derivePascalName(pp.Properties.Id, pp.Properties.Name)+name)
 		}
 
-		compo, err := kindsys.BindComposable(rt, kindsys.Def[kindsys.ComposableProperties]{
-			Properties: props,
-			V:          iv,
-		})
-		if err != nil {
-			return ParsedPlugin{}, err
+		validSchema := iv.LookupPath(cue.ParsePath("lineage.schemas[0].schema"))
+		if !validSchema.Exists() {
+			return ParsedPlugin{}, errors.Wrap(errors.Promote(ErrInvalidGrafanaPluginInstance, pp.Properties.Id), validSchema.Err())
 		}
-		pp.ComposableKinds[si.Name()] = compo
+		pp.Variant = si
+		pp.CueFile = iv
 	}
 
-	// TODO custom kinds
 	return pp, nil
 }
 
-// LoadComposableKindDef loads and validates a composable kind definition.
-// On success, it returns a [Def] which contains the entire contents of the kind definition.
-//
-// defpath is the path to the directory containing the composable kind definition,
-// relative to the root of the caller's repository.
-//
-// NOTE This function will be deprecated in favor of a more generic loader when kind
-// providers will be implemented.
-func LoadComposableKindDef(fsys fs.FS, rt *thema.Runtime, defpath string) (kindsys.Def[kindsys.ComposableProperties], error) {
-	pp := ParsedPlugin{
-		ComposableKinds: make(map[string]kindsys.Composable),
-		Properties: plugindef.PluginDef{
-			Id: defpath,
-		},
-	}
-
-	fsys, err := ensureCueMod(fsys, pp.Properties)
-	if err != nil {
-		return kindsys.Def[kindsys.ComposableProperties]{}, fmt.Errorf("%s has invalid cue.mod: %w", pp.Properties.Id, err)
-	}
-
-	bi, err := cuectx.LoadInstanceWithGrafana(fsys, "", load.Package(PackageName))
+func getPluginMetadata(fsys fs.FS) (Metadata, error) {
+	b, err := fs.ReadFile(fsys, "plugin.json")
 	if err != nil {
-		return kindsys.Def[kindsys.ComposableProperties]{}, err
+		if errors.Is(err, fs.ErrNotExist) {
+			return Metadata{}, ErrNoRootFile
+		}
+		return Metadata{}, fmt.Errorf("error reading plugin.json: %w", err)
 	}
 
-	ctx := rt.Context()
-	v := ctx.BuildInstance(bi)
-	if v.Err() != nil {
-		return kindsys.Def[kindsys.ComposableProperties]{}, fmt.Errorf("%s not a valid CUE instance: %w", defpath, v.Err())
+	var metadata PluginDef
+	if err := json.Unmarshal(b, &metadata); err != nil {
+		return Metadata{}, fmt.Errorf("error unmarshalling plugin.json: %s", err)
 	}
 
-	props, err := kindsys.ToKindProps[kindsys.ComposableProperties](v)
-	if err != nil {
-		return kindsys.Def[kindsys.ComposableProperties]{}, err
+	if err := metadata.Validate(); err != nil {
+		return Metadata{}, err
 	}
 
-	return kindsys.Def[kindsys.ComposableProperties]{
-		V:          v,
-		Properties: props,
+	return Metadata{
+		Id:      metadata.Id,
+		Name:    metadata.Name,
+		Backend: metadata.Backend,
+		Version: metadata.Info.Version,
 	}, nil
 }
 
-func ensureCueMod(fsys fs.FS, pdef plugindef.PluginDef) (fs.FS, error) {
-	if modf, err := fs.ReadFile(fsys, "cue.mod/module.cue"); err != nil {
-		if !errors.Is(err, fs.ErrNotExist) {
-			return nil, err
+func derivePascalName(id string, name string) string {
+	sani := func(s string) string {
+		ret := strings.Title(strings.Map(func(r rune) rune {
+			switch {
+			case r >= 'a' && r <= 'z':
+				return r
+			case r >= 'A' && r <= 'Z':
+				return r
+			default:
+				return -1
+			}
+		}, strings.Title(strings.Map(func(r rune) rune {
+			switch r {
+			case '-', '_':
+				return ' '
+			default:
+				return r
+			}
+		}, s))))
+		if len(ret) > 63 {
+			return ret[:63]
 		}
-		return merged_fs.NewMergedFS(fsys, fstest.MapFS{
-			"cue.mod/module.cue": &fstest.MapFile{Data: []byte(fmt.Sprintf(`module: "grafana.com/grafana/plugins/%s"`, pdef.Id))},
-		}), nil
-	} else if _, err := cuecontext.New().CompileBytes(modf).LookupPath(cue.MakePath(cue.Str("module"))).String(); err != nil {
-		return nil, fmt.Errorf("error reading cue module name: %w", err)
+		return ret
 	}
 
-	return fsys, nil
+	fromname := sani(name)
+	if len(fromname) != 0 {
+		return fromname
+	}
+	return sani(strings.Split(id, "-")[1])
 }
diff --git a/pkg/plugins/pfs/pfs_test.go b/pkg/plugins/pfs/pfs_test.go
deleted file mode 100644
index 92d25d74b3b37..0000000000000
--- a/pkg/plugins/pfs/pfs_test.go
+++ /dev/null
@@ -1,292 +0,0 @@
-package pfs
-
-import (
-	"archive/zip"
-	"io/fs"
-	"os"
-	"path/filepath"
-	"sort"
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/grafana/grafana/pkg/cuectx"
-	"github.com/stretchr/testify/require"
-)
-
-func TestParsePluginTestdata(t *testing.T) {
-	type tt struct {
-		tfs fs.FS
-		// TODO could remove this by getting rid of inconsistent subdirs
-		subpath string
-		skip    string
-		err     error
-		// TODO could remove this by expecting that dirname == id
-		rootid string
-	}
-	tab := map[string]tt{
-		"app-with-child": {
-			rootid:  "myorgid-simple-app",
-			subpath: "dist",
-			skip:    "schema violation, weirdness in info.version field",
-		},
-		"duplicate-plugins": {
-			rootid:  "test-app",
-			subpath: "nested",
-			skip:    "schema violation, dependencies don't follow naming constraints",
-		},
-		"includes-symlinks": {
-			skip: "schema violation, dependencies don't follow naming constraints",
-		},
-		"installer": {
-			rootid:  "test-datasource",
-			subpath: "plugin",
-		},
-		"invalid-plugin-json": {
-			rootid: "test-app",
-			err:    ErrInvalidRootFile,
-		},
-		"invalid-v1-signature": {
-			rootid:  "test-datasource",
-			subpath: "plugin",
-		},
-		"invalid-v2-extra-file": {
-			rootid:  "test-datasource",
-			subpath: "plugin",
-		},
-		"invalid-v2-missing-file": {
-			rootid:  "test-datasource",
-			subpath: "plugin",
-		},
-		"lacking-files": {
-			rootid:  "test-datasource",
-			subpath: "plugin",
-		},
-		"nested-plugins": {
-			rootid:  "test-datasource",
-			subpath: "parent",
-		},
-		"non-pvt-with-root-url": {
-			rootid:  "test-datasource",
-			subpath: "plugin",
-		},
-		"renderer-added-file": {
-			rootid:  "test-renderer",
-			subpath: "plugin",
-		},
-		"symbolic-plugin-dirs": {
-			skip: "io/fs-based scanner will not traverse symlinks; caller of ParsePluginFS() must do it",
-		},
-		"test-app": {
-			skip:   "schema violation, dependencies don't follow naming constraints",
-			rootid: "test-app",
-		},
-		"test-app-with-includes": {
-			rootid: "test-app",
-			skip:   "has a 'page'-type include which isn't a known part of spec",
-		},
-		"test-app-with-roles": {
-			rootid: "test-app",
-		},
-		"unsigned-datasource": {
-			rootid:  "test-datasource",
-			subpath: "plugin",
-		},
-		"unsigned-panel": {
-			rootid:  "test-panel",
-			subpath: "plugin",
-		},
-		"valid-v2-pvt-signature": {
-			rootid:  "test-datasource",
-			subpath: "plugin",
-		},
-		"valid-v2-pvt-signature-root-url-uri": {
-			rootid:  "test-datasource",
-			subpath: "plugin",
-		},
-		"valid-v2-signature": {
-			rootid:  "test-datasource",
-			subpath: "plugin",
-		},
-		"no-rootfile": {
-			err: ErrNoRootFile,
-		},
-		"valid-model-panel":       {},
-		"valid-model-datasource":  {},
-		"missing-kind-datasource": {},
-		"panel-conflicting-joinschema": {
-			err:  ErrInvalidLineage,
-			skip: "TODO implement BindOption in thema, SatisfiesJoinSchema, then use it here",
-		},
-		"panel-does-not-follow-slot-joinschema": {
-			err:  ErrInvalidLineage,
-			skip: "TODO implement BindOption in thema, SatisfiesJoinSchema, then use it here",
-		},
-		"name-mismatch-panel": {
-			err: ErrInvalidGrafanaPluginInstance,
-		},
-		"disallowed-cue-import": {
-			err: ErrDisallowedCUEImport,
-		},
-		"cdn": {
-			rootid:  "grafana-worldmap-panel",
-			subpath: "plugin",
-		},
-		"external-registration": {
-			rootid: "grafana-test-datasource",
-		},
-		"oauth-external-registration": {
-			rootid: "grafana-test-datasource",
-		},
-	}
-
-	staticRootPath, err := filepath.Abs("../manager/testdata")
-	require.NoError(t, err)
-	dfs := os.DirFS(staticRootPath)
-	ents, err := fs.ReadDir(dfs, ".")
-	require.NoError(t, err)
-
-	// Ensure table test and dir list are ==
-	var dirs, tts []string
-	for k := range tab {
-		tts = append(tts, k)
-	}
-	for _, ent := range ents {
-		dirs = append(dirs, ent.Name())
-	}
-	sort.Strings(tts)
-	sort.Strings(dirs)
-	if !cmp.Equal(tts, dirs) {
-		t.Fatalf("table test map (-) and pkg/plugins/manager/testdata dirs (+) differ: %s", cmp.Diff(tts, dirs))
-	}
-
-	for _, ent := range ents {
-		tst := tab[ent.Name()]
-		tst.tfs, err = fs.Sub(dfs, filepath.Join(ent.Name(), tst.subpath))
-		require.NoError(t, err)
-		tab[ent.Name()] = tst
-	}
-
-	lib := cuectx.GrafanaThemaRuntime()
-	for name, otst := range tab {
-		tst := otst // otherwise var is shadowed within func by looping
-		t.Run(name, func(t *testing.T) {
-			if tst.skip != "" {
-				t.Skip(tst.skip)
-			}
-
-			pp, err := ParsePluginFS(tst.tfs, lib)
-			if tst.err == nil {
-				require.NoError(t, err, "unexpected error while parsing plugin tree")
-			} else {
-				require.Error(t, err)
-				t.Logf("%T %s", err, err)
-				require.ErrorIs(t, err, tst.err, "unexpected error type while parsing plugin tree")
-				return
-			}
-
-			if tst.rootid == "" {
-				tst.rootid = name
-			}
-
-			require.Equal(t, tst.rootid, pp.Properties.Id, "expected plugin id and actual plugin id differ")
-		})
-	}
-}
-
-func TestParseTreeZips(t *testing.T) {
-	type tt struct {
-		tfs fs.FS
-		// TODO could remove this by getting rid of inconsistent subdirs
-		subpath string
-		skip    string
-		err     error
-		// TODO could remove this by expecting that dirname == id
-		rootid string
-	}
-
-	tab := map[string]tt{
-		"grafana-simple-json-datasource-ec18fa4da8096a952608a7e4c7782b4260b41bcf.zip": {
-			skip: "binary plugin",
-		},
-		"plugin-with-absolute-member.zip": {
-			skip: "not actually a plugin, no plugin.json?",
-		},
-		"plugin-with-absolute-symlink-dir.zip": {
-			skip: "not actually a plugin, no plugin.json?",
-		},
-		"plugin-with-absolute-symlink.zip": {
-			skip: "not actually a plugin, no plugin.json?",
-		},
-		"plugin-with-parent-member.zip": {
-			skip: "not actually a plugin, no plugin.json?",
-		},
-		"plugin-with-symlink-dir.zip": {
-			skip: "not actually a plugin, no plugin.json?",
-		},
-		"plugin-with-symlink.zip": {
-			skip: "not actually a plugin, no plugin.json?",
-		},
-		"plugin-with-symlinks.zip": {
-			subpath: "test-app",
-			rootid:  "test-app",
-		},
-	}
-
-	staticRootPath, err := filepath.Abs("../storage/testdata")
-	require.NoError(t, err)
-	ents, err := os.ReadDir(staticRootPath)
-	require.NoError(t, err)
-
-	// Ensure table test and dir list are ==
-	var dirs, tts []string
-	for k := range tab {
-		tts = append(tts, k)
-	}
-	for _, ent := range ents {
-		dirs = append(dirs, ent.Name())
-	}
-	sort.Strings(tts)
-	sort.Strings(dirs)
-	if !cmp.Equal(tts, dirs) {
-		t.Fatalf("table test map (-) and pkg/plugins/installer/testdata dirs (+) differ: %s", cmp.Diff(tts, dirs))
-	}
-
-	for _, ent := range ents {
-		tst := tab[ent.Name()]
-		r, err := zip.OpenReader(filepath.Join(staticRootPath, ent.Name()))
-		require.NoError(t, err)
-		defer r.Close() //nolint:errcheck
-		if tst.subpath != "" {
-			tst.tfs, err = fs.Sub(r, tst.subpath)
-			require.NoError(t, err)
-		} else {
-			tst.tfs = r
-		}
-
-		tab[ent.Name()] = tst
-	}
-
-	lib := cuectx.GrafanaThemaRuntime()
-	for name, otst := range tab {
-		tst := otst // otherwise var is shadowed within func by looping
-		t.Run(name, func(t *testing.T) {
-			if tst.skip != "" {
-				t.Skip(tst.skip)
-			}
-
-			pp, err := ParsePluginFS(tst.tfs, lib)
-			if tst.err == nil {
-				require.NoError(t, err, "unexpected error while parsing plugin fs")
-			} else {
-				require.ErrorIs(t, err, tst.err, "unexpected error type while parsing plugin fs")
-				return
-			}
-
-			if tst.rootid == "" {
-				tst.rootid = name
-			}
-
-			require.Equal(t, tst.rootid, pp.Properties.Id, "expected plugin id and actual plugin id differ")
-		})
-	}
-}
diff --git a/pkg/plugins/pfs/plugin.go b/pkg/plugins/pfs/plugin.go
index e5b95dae3988d..66ed3912417c3 100644
--- a/pkg/plugins/pfs/plugin.go
+++ b/pkg/plugins/pfs/plugin.go
@@ -1,10 +1,8 @@
 package pfs
 
 import (
+	"cuelang.org/go/cue"
 	"cuelang.org/go/cue/ast"
-	"github.com/grafana/kindsys"
-
-	"github.com/grafana/grafana/pkg/plugins/plugindef"
 )
 
 // ParsedPlugin represents everything knowable about a single plugin from static
@@ -14,36 +12,11 @@ import (
 // struct returned from [ParsePluginFS].
 type ParsedPlugin struct {
 	// Properties contains the plugin's definition, as declared in plugin.json.
-	Properties plugindef.PluginDef
-
-	// ComposableKinds is a map of all the composable kinds declared in this plugin.
-	// Keys are the name of the [kindsys.SchemaInterface] implemented by the value.
-	//
-	// Composable kind defs are only populated in this map by [ParsePluginFS] if
-	// they are implementations of a known schema interface, or are for
-	// an unknown schema interface.
-	ComposableKinds map[string]kindsys.Composable
-
-	// CustomKinds is a map of all the custom kinds declared in this plugin.
-	// Keys are the machineName of the custom kind.
-	// CustomKinds map[string]kindsys.Custom
+	Properties Metadata
+	CueFile    cue.Value
+	Variant    SchemaInterface
 
 	// CUEImports lists the CUE import statements in the plugin's grafanaplugin CUE
 	// package, if any.
 	CUEImports []*ast.ImportSpec
 }
-
-// TODO is this static approach worth using, akin to core generated registries? instead of the ParsedPlugins.ComposableKinds map? in addition to it?
-// ComposableKinds represents all the possible composable kinds that may be
-// defined in a Grafana plugin.
-//
-// The value of each field, if non-nil, is a standard [kindsys.Def]
-// representing a CUE definition of a composable kind that implements the
-// schema interface corresponding to the field's name. (This invariant is
-// only enforced in [ComposableKinds] returned from [ParsePluginFS].)
-//
-// type ComposableKinds struct {
-// 	PanelCfg kindsys.Def[kindsys.ComposableProperties]
-// 	Queries  kindsys.Def[kindsys.ComposableProperties]
-// 	DSCfg    kindsys.Def[kindsys.ComposableProperties]
-// }
diff --git a/pkg/plugins/pfs/plugin_test.go b/pkg/plugins/pfs/plugin_test.go
deleted file mode 100644
index 99330b241f024..0000000000000
--- a/pkg/plugins/pfs/plugin_test.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package pfs
-
-import (
-	"sort"
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/grafana/kindsys"
-)
-
-// This is a brick-dumb test that just ensures known schema interfaces are being
-// loaded correctly from their declarations in .cue files.
-//
-// If this test fails, it's either because:
-// - They're not being loaded correctly - there's a bug in kindsys or pfs somewhere, fix it
-// - The set of schema interfaces has been modified - update the static list here
-func TestSchemaInterfacesAreLoaded(t *testing.T) {
-	knownSI := []string{"PanelCfg", "DataQuery", "DataSourceCfg"}
-	all := kindsys.SchemaInterfaces(nil)
-	var loadedSI []string
-	for k := range all {
-		loadedSI = append(loadedSI, k)
-	}
-
-	sort.Strings(knownSI)
-	sort.Strings(loadedSI)
-
-	if diff := cmp.Diff(knownSI, loadedSI); diff != "" {
-		t.Fatalf("kindsys cue-declared schema interfaces differ from ComposableKinds go struct:\n%s", diff)
-	}
-}
diff --git a/pkg/plugins/pfs/plugindef_types.go b/pkg/plugins/pfs/plugindef_types.go
new file mode 100644
index 0000000000000..841200428a0a2
--- /dev/null
+++ b/pkg/plugins/pfs/plugindef_types.go
@@ -0,0 +1,42 @@
+package pfs
+
+type Type string
+
+// Defines values for Type.
+const (
+	TypeApp            Type = "app"
+	TypeDatasource     Type = "datasource"
+	TypePanel          Type = "panel"
+	TypeRenderer       Type = "renderer"
+	TypeSecretsmanager Type = "secretsmanager"
+)
+
+type PluginDef struct {
+	Id      string
+	Name    string
+	Backend *bool
+	Type    Type
+	Info    Info
+	IAM     IAM
+}
+
+type Info struct {
+	Version *string
+}
+
+type IAM struct {
+	Permissions []Permission `json:"permissions,omitempty"`
+}
+
+type Permission struct {
+	Action string  `json:"action"`
+	Scope  *string `json:"scope,omitempty"`
+}
+
+func (pd PluginDef) Validate() error {
+	if pd.Id == "" || pd.Name == "" || pd.Type == "" {
+		return ErrInvalidRootFile
+	}
+
+	return nil
+}
diff --git a/pkg/plugins/plugindef/gen.go b/pkg/plugins/plugindef/gen.go
deleted file mode 100644
index 710a6734fa8f3..0000000000000
--- a/pkg/plugins/plugindef/gen.go
+++ /dev/null
@@ -1,130 +0,0 @@
-//go:build ignore
-// +build ignore
-
-package main
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"os"
-	"path/filepath"
-
-	"cuelang.org/go/cue/cuecontext"
-	"github.com/dave/dst"
-	"github.com/grafana/codejen"
-	"github.com/grafana/grafana/pkg/codegen"
-	"github.com/grafana/grafana/pkg/cuectx"
-	"github.com/grafana/thema"
-	"github.com/grafana/thema/encoding/gocode"
-	"github.com/grafana/thema/encoding/jsonschema"
-)
-
-var dirPlugindef = filepath.Join("pkg", "plugins", "plugindef")
-
-// main generator for plugindef. plugindef isn't a kind, so it has its own
-// one-off main generator.
-func main() {
-	v := elsedie(cuectx.BuildGrafanaInstance(nil, dirPlugindef, "", nil))("could not load plugindef cue package")
-
-	lin := elsedie(thema.BindLineage(v, cuectx.GrafanaThemaRuntime()))("plugindef lineage is invalid")
-
-	jl := &codejen.JennyList[thema.Lineage]{}
-	jl.AppendOneToOne(&jennytypego{}, &jennybindgo{})
-	jl.AddPostprocessors(codegen.SlashHeaderMapper(filepath.Join(dirPlugindef, "gen.go")))
-
-	cwd, err := os.Getwd()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "could not get working directory: %s", err)
-		os.Exit(1)
-	}
-
-	groot := filepath.Clean(filepath.Join(cwd, "../../.."))
-
-	jfs := elsedie(jl.GenerateFS(lin))("plugindef jenny pipeline failed")
-	if _, set := os.LookupEnv("CODEGEN_VERIFY"); set {
-		if err := jfs.Verify(context.Background(), groot); err != nil {
-			die(fmt.Errorf("generated code is out of sync with inputs:\n%s\nrun `make gen-cue` to regenerate", err))
-		}
-	} else if err := jfs.Write(context.Background(), groot); err != nil {
-		die(fmt.Errorf("error while writing generated code to disk:\n%s", err))
-	}
-}
-
-// one-off jenny for plugindef go types
-type jennytypego struct{}
-
-func (j *jennytypego) JennyName() string {
-	return "PluginGoTypes"
-}
-
-func (j *jennytypego) Generate(lin thema.Lineage) (*codejen.File, error) {
-	f, err := codegen.GoTypesJenny{}.Generate(codegen.SchemaForGen{
-		Name:    "PluginDef",
-		Schema:  lin.Latest(),
-		IsGroup: false,
-	})
-	if f != nil {
-		f.RelativePath = filepath.Join(dirPlugindef, f.RelativePath)
-	}
-	return f, err
-}
-
-// one-off jenny for plugindef go bindings
-type jennybindgo struct{}
-
-func (j *jennybindgo) JennyName() string {
-	return "PluginGoBindings"
-}
-
-func (j *jennybindgo) Generate(lin thema.Lineage) (*codejen.File, error) {
-	b, err := gocode.GenerateLineageBinding(lin, &gocode.BindingConfig{
-		TitleName:      "PluginDef",
-		Assignee:       dst.NewIdent("*PluginDef"),
-		PrivateFactory: true,
-	})
-	if err != nil {
-		return nil, err
-	}
-	return codejen.NewFile(filepath.Join(dirPlugindef, "plugindef_bindings_gen.go"), b, j), nil
-}
-
-// one-off jenny for plugindef json schema generator
-type jennyjschema struct{}
-
-func (j *jennyjschema) JennyName() string {
-	return "PluginJSONSchema"
-}
-
-func (j *jennyjschema) Generate(lin thema.Lineage) (*codejen.File, error) {
-	f, err := jsonschema.GenerateSchema(lin.Latest())
-	if err != nil {
-		return nil, err
-	}
-
-	b, _ := cuecontext.New().BuildFile(f).MarshalJSON()
-	nb := new(bytes.Buffer)
-	die(json.Indent(nb, b, "", "  "))
-	return codejen.NewFile(filepath.FromSlash("docs/sources/developers/plugins/plugin.schema.json"), nb.Bytes(), j), nil
-}
-
-func elsedie[T any](t T, err error) func(msg string) T {
-	if err != nil {
-		return func(msg string) T {
-			fmt.Fprintf(os.Stderr, "%s: %s\n", msg, err)
-			os.Exit(1)
-			return t
-		}
-	}
-	return func(msg string) T {
-		return t
-	}
-}
-
-func die(err error) {
-	if err != nil {
-		fmt.Fprint(os.Stderr, err, "\n")
-		os.Exit(1)
-	}
-}
diff --git a/pkg/plugins/plugindef/pascal_test.go b/pkg/plugins/plugindef/pascal_test.go
deleted file mode 100644
index 095384c5d03f6..0000000000000
--- a/pkg/plugins/plugindef/pascal_test.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package plugindef
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestDerivePascal(t *testing.T) {
-	table := []struct {
-		id, name, out string
-	}{
-		{
-			name: "-- Grafana --",
-			out:  "Grafana",
-		},
-		{
-			name: "A weird/Thing",
-			out:  "AWeirdThing",
-		},
-		{
-			name: "/",
-			out:  "Empty",
-		},
-		{
-			name: "some really Long thing WHY would38883 anyone do this i don't know but hey It seems like it this is just going on and",
-			out:  "SomeReallyLongThingWHYWouldAnyoneDoThisIDonTKnowButHeyItSeemsLi",
-		},
-	}
-
-	for _, row := range table {
-		if row.id == "" {
-			row.id = "default-empty-panel"
-		}
-
-		pd := PluginDef{
-			Id:   row.id,
-			Name: row.name,
-		}
-
-		require.Equal(t, row.out, DerivePascalName(pd))
-	}
-}
diff --git a/pkg/plugins/plugindef/plugindef.cue b/pkg/plugins/plugindef/plugindef.cue
deleted file mode 100644
index bd7026e6c93ab..0000000000000
--- a/pkg/plugins/plugindef/plugindef.cue
+++ /dev/null
@@ -1,441 +0,0 @@
-package plugindef
-
-import (
-	"regexp"
-	"strings"
-
-	"github.com/grafana/thema"
-)
-
-thema.#Lineage
-name: "plugindef"
-schemas: [{
-	version: [0, 0]
-	schema: {
-		// Unique name of the plugin. If the plugin is published on
-		// grafana.com, then the plugin `id` has to follow the naming
-		// conventions.
-		id: string & strings.MinRunes(1)
-		id: =~"^([0-9a-z]+\\-([0-9a-z]+\\-)?(\(strings.Join([ for t in _types {t}], "|"))))|(alertGroups|alertlist|annolist|barchart|bargauge|candlestick|canvas|dashlist|debug|datagrid|gauge|geomap|gettingstarted|graph|heatmap|histogram|icon|live|logs|news|nodeGraph|piechart|pluginlist|stat|state-timeline|status-history|table|table-old|text|timeseries|trend|traces|welcome|xychart|alertmanager|cloudwatch|dashboard|elasticsearch|grafana|grafana-azure-monitor-datasource|graphite|influxdb|jaeger|loki|mixed|mssql|mysql|opentsdb|postgres|prometheus|stackdriver|tempo|grafana-testdata-datasource|zipkin|phlare|parca)$"
-
-		// An alias is useful when migrating from one plugin id to another (rebranding etc)
-		// This should be used sparingly, and is currently only supported though a hardcoded checklist
-		aliasIDs?: [...string]
-		
-		// Human-readable name of the plugin that is shown to the user in
-		// the UI.
-		name: string
-
-		// The set of all plugin types. This hidden field exists solely
-		// so that the set can be string-interpolated into other fields.
-		_types: ["app", "datasource", "panel", "renderer", "secretsmanager"]
-
-		// type indicates which type of Grafana plugin this is, of the defined
-		// set of Grafana plugin types.
-		type: or(_types)
-
-		// IncludeType is a string identifier of a plugin include type, which is
-		// a superset of plugin types.
-		#IncludeType: type | "dashboard" | "page"
-
-		// Metadata about the plugin
-		info: #Info
-
-		// Metadata about a Grafana plugin. Some fields are used on the plugins
-		// page in Grafana and others on grafana.com, if the plugin is published.
-		#Info: {
-			// Information about the plugin author
-			author?: {
-				// Author's name
-				name?: string
-
-				// Author's name
-				email?: string
-
-				// Link to author's website
-				url?: string
-			}
-
-			// Build information
-			build?: #BuildInfo
-
-			// Description of plugin. Used on the plugins page in Grafana and
-			// for search on grafana.com.
-			description?: string
-
-			// Array of plugin keywords. Used for search on grafana.com.
-			keywords: [...string]
-			// should be this, but CUE to openapi converter screws this up
-			// by inserting a non-concrete default.
-			// keywords: [string, ...string]
-
-			// An array of link objects to be displayed on this plugin's
-			// project page in the form `{name: 'foo', url:
-			// 'http://example.com'}`
-			links?: [...{
-				name?: string
-				url?:  string
-			}]
-
-			// SVG images that are used as plugin icons
-			logos?: {
-				// Link to the "small" version of the plugin logo, which must be
-				// an SVG image. "Large" and "small" logos can be the same image.
-				small: string
-
-				// Link to the "large" version of the plugin logo, which must be
-				// an SVG image. "Large" and "small" logos can be the same image.
-				large: string
-			}
-
-			// An array of screenshot objects in the form `{name: 'bar', path:
-			// 'img/screenshot.png'}`
-			screenshots?: [...{
-				name?: string
-				path?: string
-			}]
-
-			// Date when this plugin was built
-			updated?: =~"^(\\d{4}-\\d{2}-\\d{2}|\\%TODAY\\%)$"
-
-			// Project version of this commit, e.g. `6.7.x`
-			version?: =~"^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)|(\\%VERSION\\%)$"
-		}
-
-		#BuildInfo: {
-			// Time when the plugin was built, as a Unix timestamp
-			time?: int64
-			repo?: string
-
-			// Git branch the plugin was built from
-			branch?: string
-
-			// Git hash of the commit the plugin was built from
-			hash?:   string
-			number?: int64
-
-			// GitHub pull request the plugin was built from
-			pr?: int32
-		}
-
-		// Dependency information related to Grafana and other plugins
-		dependencies: #Dependencies
-
-		#Dependencies: {
-			// (Deprecated) Required Grafana version for this plugin, e.g.
-			// `6.x.x 7.x.x` to denote plugin requires Grafana v6.x.x or
-			// v7.x.x.
-			grafanaVersion?: =~"^([0-9]+)(\\.[0-9x]+)?(\\.[0-9x])?$"
-
-			// Required Grafana version for this plugin. Validated using
-			// https://github.com/npm/node-semver.
-			grafanaDependency?: =~"^(<=|>=|<|>|=|~|\\^)?([0-9]+)(\\.[0-9x\\*]+)(\\.[0-9x\\*]+)?(\\s(<=|>=|<|=>)?([0-9]+)(\\.[0-9x]+)(\\.[0-9x]+))?$"
-
-			// An array of required plugins on which this plugin depends
-			plugins?: [...#Dependency]
-		}
-
-		// Dependency describes another plugin on which a plugin depends.
-		// The id refers to the plugin package identifier, as given on
-		// the grafana.com plugin marketplace.
-		#Dependency: {
-			id:      =~"^[0-9a-z]+\\-([0-9a-z]+\\-)?(app|panel|datasource)$"
-			type:    "app" | "datasource" | "panel"
-			name:    string
-			version: string
-			...
-		}
-
-		// Schema definition for the plugin.json file. Used primarily for schema validation.
-		$schema?: string
-
-		// For data source plugins, if the plugin supports alerting. Requires `backend` to be set to `true`.
-		alerting?: bool
-
-		// For data source plugins, if the plugin supports annotation
-		// queries.
-		annotations?: bool
-
-		// Set to true for app plugins that should be enabled and pinned to the navigation bar in all orgs.
-		autoEnabled?: bool
-
-		// If the plugin has a backend component.
-		backend?: bool
-
-		// [internal only] Indicates whether the plugin is developed and shipped as part
-		// of Grafana. Also known as a 'core plugin'.
-		builtIn: bool | *false
-
-		// Plugin category used on the Add data source page.
-		category?: "tsdb" | "logging" | "cloud" | "tracing" | "profiling" | "sql" | "enterprise" | "iot" | "other"
-
-		// Grafana Enterprise specific features.
-		enterpriseFeatures?: {
-			// Enable/Disable health diagnostics errors. Requires Grafana
-			// >=7.5.5.
-			healthDiagnosticsErrors?: bool | *false
-			...
-		}
-
-		// The first part of the file name of the backend component
-		// executable. There can be multiple executables built for
-		// different operating system and architecture. Grafana will
-		// check for executables named `<executable>_<$GOOS>_<lower case
-		// $GOARCH><.exe for Windows>`, e.g. `plugin_linux_amd64`.
-		// Combination of $GOOS and $GOARCH can be found here:
-		// https://golang.org/doc/install/source#environment.
-		executable?: string
-
-		// [internal only] Excludes the plugin from listings in Grafana's UI. Only
-		// allowed for `builtIn` plugins.
-		hideFromList: bool | *false
-
-		// Resources to include in plugin.
-		includes?: [...#Include]
-
-		// A resource to be included in a plugin.
-		#Include: {
-			// Unique identifier of the included resource
-			uid?:  string
-			type:  #IncludeType
-			name?: string
-
-			// (Legacy) The Angular component to use for a page.
-			component?: string
-
-			// The minimum role a user must have to see this page in the navigation menu.
-			role?: "Admin" | "Editor" | "Viewer"
-
-			// RBAC action the user must have to access the route
-			action?: string
-
-			// Used for app plugins.
-			path?: string
-
-			// Add the include to the navigation menu.
-			addToNav?: bool
-
-			// Page or dashboard when user clicks the icon in the side menu.
-			defaultNav?: bool
-
-			// Icon to use in the side menu. For information on available
-			// icon, refer to [Icons
-			// Overview](https://developers.grafana.com/ui/latest/index.html?path=/story/docs-overview-icon--icons-overview).
-			icon?: string
-			...
-		}
-
-		// For data source plugins, if the plugin supports logs. It may be used to filter logs only features.
-		logs?: bool
-
-		// For data source plugins, if the plugin supports metric queries.
-		// Used to enable the plugin in the panel editor.
-		metrics?: bool
-
-		// FIXME there appears to be a bug in thema that prevents this from working. Maybe it'd
-		// help to refer to it with an alias, but thema can't support using current list syntax.
-		// syntax (fixed by grafana/thema#82). Either way, for now, pascalName gets populated in Go.
-		let sani = (strings.ToTitle(regexp.ReplaceAllLiteral("[^a-zA-Z]+", name, "")))
-
-		// [internal only] The PascalCase name for the plugin. Used for creating machine-friendly
-		// identifiers, typically in code generation.
-		//
-		// If not provided, defaults to name, but title-cased and sanitized (only
-		// alphabetical characters allowed).
-		pascalName: string & =~"^([A-Z][a-zA-Z]{1,62})$" | *sani
-
-		// Initialize plugin on startup. By default, the plugin
-		// initializes on first use.
-		preload?: bool
-
-		// For data source plugins. There is a query options section in
-		// the plugin's query editor and these options can be turned on
-		// if needed.
-		queryOptions?: {
-			// For data source plugins. If the `max data points` option should
-			// be shown in the query options section in the query editor.
-			maxDataPoints?: bool
-
-			// For data source plugins. If the `min interval` option should be
-			// shown in the query options section in the query editor.
-			minInterval?: bool
-
-			// For data source plugins. If the `cache timeout` option should
-			// be shown in the query options section in the query editor.
-			cacheTimeout?: bool
-		}
-
-		// Routes is a list of proxy routes, if any. For datasource plugins only.
-		routes?: [...#Route]
-
-		// For panel plugins. Hides the query editor.
-		skipDataQuery?: bool
-
-		// Marks a plugin as a pre-release.
-		state?: #ReleaseState
-
-		// ReleaseState indicates release maturity state of a plugin.
-		#ReleaseState: "alpha" | "beta" | "deprecated" | *"stable"
-
-		// For data source plugins, if the plugin supports streaming. Used in Explore to start live streaming.
-		streaming?: bool
-
-		// For data source plugins, if the plugin supports tracing. Used for example to link logs (e.g. Loki logs) with tracing plugins.
-		tracing?: bool
-
-		// Optional list of RBAC RoleRegistrations.
-		// Describes and organizes the default permissions associated with any of the Grafana basic roles,
-		// which characterizes what viewers, editors, admins, or grafana admins can do on the plugin.
-		// The Admin basic role inherits its default permissions from the Editor basic role which in turn
-		// inherits them from the Viewer basic role.
-		roles?: [...#RoleRegistration]
-
-		// RoleRegistration describes an RBAC role and its assignments to basic roles.
-		// It organizes related RBAC permissions on the plugin into a role and defines which basic roles
-		// will get them by default.
-		// Example: the role 'Schedules Reader' bundles permissions to view all schedules of the plugin
-		// which will be granted to Admins by default.
-		#RoleRegistration: {
-			// RBAC role definition to bundle related RBAC permissions on the plugin.
-			role: #Role
-
-			// Default assignment of the role to Grafana basic roles (Viewer, Editor, Admin, Grafana Admin)
-			// The Admin basic role inherits its default permissions from the Editor basic role which in turn
-			// inherits them from the Viewer basic role.
-			grants: [...#BasicRole]
-		}
-
-		// Role describes an RBAC role which allows grouping multiple related permissions on the plugin,
-		// each of which has an action and an optional scope.
-		// Example: the role 'Schedules Reader' bundles permissions to view all schedules of the plugin.
-		#Role: {
-			name:        string
-			name:        =~"^([A-Z][0-9A-Za-z ]+)$"
-			description: string
-			permissions: [...#Permission]
-		}
-
-		// Permission describes an RBAC permission on the plugin. A permission has an action and an optional
-		// scope.
-		// Example: action: 'test-app.schedules:read', scope: 'test-app.schedules:*'
-		#Permission: {
-			action: string
-			scope?: string
-		}
-
-		// BasicRole is a Grafana basic role, which can be 'Viewer', 'Editor', 'Admin' or 'Grafana Admin'.
-		// With RBAC, the Admin basic role inherits its default permissions from the Editor basic role which
-		// in turn inherits them from the Viewer basic role.
-		#BasicRole: "Grafana Admin" | "Admin" | "Editor" | "Viewer"
-
-		// Header describes an HTTP header that is forwarded with a proxied request for
-		// a plugin route.
-		#Header: {
-			name:    string
-			content: string
-		}
-
-		// URLParam describes query string parameters for
-		// a url in a plugin route
-		#URLParam: {
-			name:    string
-			content: string
-		}
-
-		// A proxy route used in datasource plugins for plugin authentication
-		// and adding headers to HTTP requests made by the plugin.
-		// For more information, refer to [Authentication for data source
-		// plugins](https://grafana.com/developers/plugin-tools/create-a-plugin/extend-a-plugin/add-authentication-for-data-source-plugins).
-		#Route: {
-			// For data source plugins. The route path that is replaced by the
-			// route URL field when proxying the call.
-			path?: string
-
-			// For data source plugins. Route method matches the HTTP verb
-			// like GET or POST. Multiple methods can be provided as a
-			// comma-separated list.
-			method?: string
-
-			// For data source plugins. Route URL is where the request is
-			// proxied to.
-			url?: string
-
-			urlParams?: [...#URLParam]
-			reqSignedIn?: bool
-			reqRole?:     string
-
-			// For data source plugins. Route headers adds HTTP headers to the
-			// proxied request.
-			headers?: [...#Header]
-
-			// For data source plugins. Route headers set the body content and
-			// length to the proxied request.
-			body?: {
-				...
-			}
-
-			// For data source plugins. Token authentication section used with
-			// an OAuth API.
-			tokenAuth?: #TokenAuth
-
-			// For data source plugins. Token authentication section used with
-			// an JWT OAuth API.
-			jwtTokenAuth?: #JWTTokenAuth
-		}
-
-		// TODO docs
-		#TokenAuth: {
-			// URL to fetch the authentication token.
-			url?: string
-
-			// The list of scopes that your application should be granted
-			// access to.
-			scopes?: [...string]
-
-			// Parameters for the token authentication request.
-			params: [string]: string
-		}
-
-		// TODO docs
-		// TODO should this really be separate from TokenAuth?
-		#JWTTokenAuth: {
-			// URL to fetch the JWT token.
-			url: string
-
-			// The list of scopes that your application should be granted
-			// access to.
-			scopes: [...string]
-
-			// Parameters for the JWT token authentication request.
-			params: [string]: string
-		}
-
-		// External service registration information
-		externalServiceRegistration: #ExternalServiceRegistration
-
-		// ExternalServiceRegistration allows the service to get a service account token
-		// (or to use the client_credentials grant if the token provider is the OAuth2 Server)
-		#ExternalServiceRegistration: {
-			// Permissions are the permissions that the external service needs its associated service account to have.
-			permissions?: [...#Permission]
-
-			// Impersonation describes the permissions that the external service will have on behalf of the user
-			// This is only available with the OAuth2 Server
-			impersonation?: #Impersonation
-		}
-
-		#Impersonation: {
-			// Enabled allows the service to request access tokens to impersonate users using the jwtbearer grant
-			// Defaults to true.
-			enabled?: bool
-			// Groups allows the service to list the impersonated user's teams.
-			// Defaults to true.
-			groups?: bool
-			// Permissions are the permissions that the external service needs when impersonating a user.
-			// The intersection of this set with the impersonated user's permission guarantees that the client will not
-			// gain more privileges than the impersonated user has.
-			permissions?: [...#Permission]
-		}
-	}
-}]
-lenses: []
diff --git a/pkg/plugins/plugindef/plugindef.go b/pkg/plugins/plugindef/plugindef.go
deleted file mode 100644
index f49a73637cf55..0000000000000
--- a/pkg/plugins/plugindef/plugindef.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package plugindef
-
-import (
-	"strings"
-	"sync"
-
-	"cuelang.org/go/cue/build"
-	"github.com/grafana/grafana/pkg/cuectx"
-	"github.com/grafana/thema"
-)
-
-//go:generate go run gen.go
-
-func loadInstanceForplugindef() (*build.Instance, error) {
-	return cuectx.LoadGrafanaInstance("pkg/plugins/plugindef", "", nil)
-}
-
-var linonce sync.Once
-var pdlin thema.ConvergentLineage[*PluginDef]
-var pdlinerr error
-
-// Lineage returns the [thema.ConvergentLineage] for plugindef, the canonical
-// specification for Grafana plugin.json files.
-//
-// Unless a custom thema.Runtime is specifically needed, prefer calling this with
-// nil, as a cached lineage will be returned.
-func Lineage(rt *thema.Runtime, opts ...thema.BindOption) (thema.ConvergentLineage[*PluginDef], error) {
-	if len(opts) == 0 && (rt == nil || rt == cuectx.GrafanaThemaRuntime()) {
-		linonce.Do(func() {
-			pdlin, pdlinerr = doLineage(rt)
-		})
-		return pdlin, pdlinerr
-	}
-	return doLineage(rt, opts...)
-}
-
-// DerivePascalName derives a PascalCase name from a PluginDef.
-//
-// This function does not mutate the input PluginDef; as such, it ignores
-// whether there exists any value for PluginDef.PascalName.
-//
-// FIXME this should be removable once CUE logic for it works/unmarshals correctly.
-func DerivePascalName(pd PluginDef) string {
-	sani := func(s string) string {
-		ret := strings.Title(strings.Map(func(r rune) rune {
-			switch {
-			case r >= 'a' && r <= 'z':
-				return r
-			case r >= 'A' && r <= 'Z':
-				return r
-			default:
-				return -1
-			}
-		}, strings.Title(strings.Map(func(r rune) rune {
-			switch r {
-			case '-', '_':
-				return ' '
-			default:
-				return r
-			}
-		}, s))))
-		if len(ret) > 63 {
-			return ret[:63]
-		}
-		return ret
-	}
-
-	fromname := sani(pd.Name)
-	if len(fromname) != 0 {
-		return fromname
-	}
-	return sani(strings.Split(pd.Id, "-")[1])
-}
diff --git a/pkg/plugins/plugindef/plugindef_bindings_gen.go b/pkg/plugins/plugindef/plugindef_bindings_gen.go
deleted file mode 100644
index 3438f6896a33d..0000000000000
--- a/pkg/plugins/plugindef/plugindef_bindings_gen.go
+++ /dev/null
@@ -1,84 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     pkg/plugins/plugindef/gen.go
-// Using jennies:
-//     PluginGoBindings
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package plugindef
-
-import (
-	"cuelang.org/go/cue/build"
-	"github.com/grafana/thema"
-)
-
-// doLineage returns a [thema.ConvergentLineage] for the 'plugindef' Thema lineage.
-//
-// The lineage is the canonical specification of plugindef. It contains all
-// schema versions that have ever existed for plugindef, and the lenses that
-// allow valid instances of one schema in the lineage to be translated to
-// another schema in the lineage.
-//
-// As a [thema.ConvergentLineage], the returned lineage has one primary schema, 0.0,
-// which is [thema.AssignableTo] [*PluginDef], the lineage's parameterized type.
-//
-// This function will return an error if the [Thema invariants] are not met by
-// the underlying lineage declaration in CUE, or if [*PluginDef] is not
-// [thema.AssignableTo] the 0.0 schema.
-//
-// [Thema's general invariants]: https://github.com/grafana/thema/blob/main/docs/invariants.md
-func doLineage(rt *thema.Runtime, opts ...thema.BindOption) (thema.ConvergentLineage[*PluginDef], error) {
-	lin, err := baseLineage(rt, opts...)
-	if err != nil {
-		return nil, err
-	}
-
-	sch := thema.SchemaP(lin, thema.SV(0, 0))
-	typ := new(PluginDef)
-	tsch, err := thema.BindType(sch, typ)
-	if err != nil {
-		// This will error out if the 0.0 schema isn't assignable to
-		// *PluginDef. If Thema also generates that type, this should be unreachable,
-		// barring a critical bug in Thema's Go generator.
-		return nil, err
-	}
-	return tsch.ConvergentLineage(), nil
-}
-func baseLineage(rt *thema.Runtime, opts ...thema.BindOption) (thema.Lineage, error) {
-	// First, we must get the bytes of the .cue file(s) in which the "plugindef" lineage
-	// is declared, and load them into a
-	// "cuelang.org/go/cue/build".Instance.
-	//
-	// For most Thema-based development workflows, these bytes should come from an embed.FS.
-	// This ensures Go is always compiled with the current state of the .cue files.
-	var inst *build.Instance
-	var err error
-
-	// loadInstanceForplugindef must be manually implemented in another file in this
-	// Go package.
-	inst, err = loadInstanceForplugindef()
-	if err != nil {
-		// Errors at this point indicate a problem with basic loading of .cue file bytes,
-		// which typically means the code generator was misconfigured and a path input
-		// is incorrect.
-		return nil, err
-	}
-
-	raw := rt.Context().BuildInstance(inst)
-
-	// An error returned from thema.BindLineage indicates one of the following:
-	//   - The parsed path does not exist in the loaded CUE file (["github.com/grafana/thema/errors".ErrValueNotExist])
-	//   - The value at the parsed path exists, but does not appear to be a Thema
-	//     lineage (["github.com/grafana/thema/errors".ErrValueNotALineage])
-	//   - The value at the parsed path exists and is a lineage (["github.com/grafana/thema/errors".ErrInvalidLineage]),
-	//     but is invalid due to the violation of some general Thema invariant -
-	//     for example, declared schemas don't follow backwards compatibility rules,
-	//     lenses are incomplete.
-	return thema.BindLineage(raw, rt, opts...)
-}
-
-// type guards
-var _ thema.ConvergentLineageFactory[*PluginDef] = doLineage
-var _ thema.LineageFactory = baseLineage
diff --git a/pkg/plugins/plugindef/plugindef_types_gen.go b/pkg/plugins/plugindef/plugindef_types_gen.go
deleted file mode 100644
index 20b04cebbf6fe..0000000000000
--- a/pkg/plugins/plugindef/plugindef_types_gen.go
+++ /dev/null
@@ -1,499 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     pkg/plugins/plugindef/gen.go
-// Using jennies:
-//     GoTypesJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package plugindef
-
-// Defines values for BasicRole.
-const (
-	BasicRoleAdmin        BasicRole = "Admin"
-	BasicRoleEditor       BasicRole = "Editor"
-	BasicRoleGrafanaAdmin BasicRole = "Grafana Admin"
-	BasicRoleViewer       BasicRole = "Viewer"
-)
-
-// Defines values for DependencyType.
-const (
-	DependencyTypeApp        DependencyType = "app"
-	DependencyTypeDatasource DependencyType = "datasource"
-	DependencyTypePanel      DependencyType = "panel"
-)
-
-// Defines values for IncludeRole.
-const (
-	IncludeRoleAdmin  IncludeRole = "Admin"
-	IncludeRoleEditor IncludeRole = "Editor"
-	IncludeRoleViewer IncludeRole = "Viewer"
-)
-
-// Defines values for IncludeType.
-const (
-	IncludeTypeApp            IncludeType = "app"
-	IncludeTypeDashboard      IncludeType = "dashboard"
-	IncludeTypeDatasource     IncludeType = "datasource"
-	IncludeTypePage           IncludeType = "page"
-	IncludeTypePanel          IncludeType = "panel"
-	IncludeTypeRenderer       IncludeType = "renderer"
-	IncludeTypeSecretsmanager IncludeType = "secretsmanager"
-)
-
-// Defines values for Category.
-const (
-	CategoryCloud      Category = "cloud"
-	CategoryEnterprise Category = "enterprise"
-	CategoryIot        Category = "iot"
-	CategoryLogging    Category = "logging"
-	CategoryOther      Category = "other"
-	CategoryProfiling  Category = "profiling"
-	CategorySql        Category = "sql"
-	CategoryTracing    Category = "tracing"
-	CategoryTsdb       Category = "tsdb"
-)
-
-// Defines values for Type.
-const (
-	TypeApp            Type = "app"
-	TypeDatasource     Type = "datasource"
-	TypePanel          Type = "panel"
-	TypeRenderer       Type = "renderer"
-	TypeSecretsmanager Type = "secretsmanager"
-)
-
-// Defines values for ReleaseState.
-const (
-	ReleaseStateAlpha      ReleaseState = "alpha"
-	ReleaseStateBeta       ReleaseState = "beta"
-	ReleaseStateDeprecated ReleaseState = "deprecated"
-	ReleaseStateStable     ReleaseState = "stable"
-)
-
-// BasicRole is a Grafana basic role, which can be 'Viewer', 'Editor', 'Admin' or 'Grafana Admin'.
-// With RBAC, the Admin basic role inherits its default permissions from the Editor basic role which
-// in turn inherits them from the Viewer basic role.
-type BasicRole string
-
-// BuildInfo defines model for BuildInfo.
-type BuildInfo struct {
-	// Git branch the plugin was built from
-	Branch *string `json:"branch,omitempty"`
-
-	// Git hash of the commit the plugin was built from
-	Hash   *string `json:"hash,omitempty"`
-	Number *int64  `json:"number,omitempty"`
-
-	// GitHub pull request the plugin was built from
-	Pr   *int32  `json:"pr,omitempty"`
-	Repo *string `json:"repo,omitempty"`
-
-	// Time when the plugin was built, as a Unix timestamp
-	Time *int64 `json:"time,omitempty"`
-}
-
-// Dependencies defines model for Dependencies.
-type Dependencies struct {
-	// Required Grafana version for this plugin. Validated using
-	// https://github.com/npm/node-semver.
-	GrafanaDependency *string `json:"grafanaDependency,omitempty"`
-
-	// (Deprecated) Required Grafana version for this plugin, e.g.
-	// `6.x.x 7.x.x` to denote plugin requires Grafana v6.x.x or
-	// v7.x.x.
-	GrafanaVersion *string `json:"grafanaVersion,omitempty"`
-
-	// An array of required plugins on which this plugin depends
-	Plugins []Dependency `json:"plugins,omitempty"`
-}
-
-// Dependency describes another plugin on which a plugin depends.
-// The id refers to the plugin package identifier, as given on
-// the grafana.com plugin marketplace.
-type Dependency struct {
-	Id      string         `json:"id"`
-	Name    string         `json:"name"`
-	Type    DependencyType `json:"type"`
-	Version string         `json:"version"`
-}
-
-// DependencyType defines model for Dependency.Type.
-type DependencyType string
-
-// ExternalServiceRegistration allows the service to get a service account token
-// (or to use the client_credentials grant if the token provider is the OAuth2 Server)
-type ExternalServiceRegistration struct {
-	Impersonation *Impersonation `json:"impersonation,omitempty"`
-
-	// Permissions are the permissions that the external service needs its associated service account to have.
-	Permissions []Permission `json:"permissions,omitempty"`
-}
-
-// Header describes an HTTP header that is forwarded with a proxied request for
-// a plugin route.
-type Header struct {
-	Content string `json:"content"`
-	Name    string `json:"name"`
-}
-
-// Impersonation defines model for Impersonation.
-type Impersonation struct {
-	// Enabled allows the service to request access tokens to impersonate users using the jwtbearer grant
-	// Defaults to true.
-	Enabled *bool `json:"enabled,omitempty"`
-
-	// Groups allows the service to list the impersonated user's teams.
-	// Defaults to true.
-	Groups *bool `json:"groups,omitempty"`
-
-	// Permissions are the permissions that the external service needs when impersonating a user.
-	// The intersection of this set with the impersonated user's permission guarantees that the client will not
-	// gain more privileges than the impersonated user has.
-	Permissions []Permission `json:"permissions,omitempty"`
-}
-
-// A resource to be included in a plugin.
-type Include struct {
-	// RBAC action the user must have to access the route
-	Action *string `json:"action,omitempty"`
-
-	// Add the include to the navigation menu.
-	AddToNav *bool `json:"addToNav,omitempty"`
-
-	// (Legacy) The Angular component to use for a page.
-	Component *string `json:"component,omitempty"`
-
-	// Page or dashboard when user clicks the icon in the side menu.
-	DefaultNav *bool `json:"defaultNav,omitempty"`
-
-	// Icon to use in the side menu. For information on available
-	// icon, refer to [Icons
-	// Overview](https://developers.grafana.com/ui/latest/index.html?path=/story/docs-overview-icon--icons-overview).
-	Icon *string `json:"icon,omitempty"`
-	Name *string `json:"name,omitempty"`
-
-	// Used for app plugins.
-	Path *string `json:"path,omitempty"`
-
-	// The minimum role a user must have to see this page in the navigation menu.
-	Role *IncludeRole `json:"role,omitempty"`
-
-	// IncludeType is a string identifier of a plugin include type, which is
-	// a superset of plugin types.
-	Type IncludeType `json:"type"`
-
-	// Unique identifier of the included resource
-	Uid *string `json:"uid,omitempty"`
-}
-
-// The minimum role a user must have to see this page in the navigation menu.
-type IncludeRole string
-
-// IncludeType is a string identifier of a plugin include type, which is
-// a superset of plugin types.
-type IncludeType string
-
-// Metadata about a Grafana plugin. Some fields are used on the plugins
-// page in Grafana and others on grafana.com, if the plugin is published.
-type Info struct {
-	// Information about the plugin author
-	Author *struct {
-		// Author's name
-		Email *string `json:"email,omitempty"`
-
-		// Author's name
-		Name *string `json:"name,omitempty"`
-
-		// Link to author's website
-		Url *string `json:"url,omitempty"`
-	} `json:"author,omitempty"`
-	Build *BuildInfo `json:"build,omitempty"`
-
-	// Description of plugin. Used on the plugins page in Grafana and
-	// for search on grafana.com.
-	Description *string `json:"description,omitempty"`
-
-	// Array of plugin keywords. Used for search on grafana.com.
-	Keywords []string `json:"keywords"`
-
-	// An array of link objects to be displayed on this plugin's
-	// project page in the form `{name: 'foo', url:
-	// 'http://example.com'}`
-	Links []struct {
-		Name *string `json:"name,omitempty"`
-		Url  *string `json:"url,omitempty"`
-	} `json:"links,omitempty"`
-
-	// SVG images that are used as plugin icons
-	Logos *struct {
-		// Link to the "large" version of the plugin logo, which must be
-		// an SVG image. "Large" and "small" logos can be the same image.
-		Large string `json:"large"`
-
-		// Link to the "small" version of the plugin logo, which must be
-		// an SVG image. "Large" and "small" logos can be the same image.
-		Small string `json:"small"`
-	} `json:"logos,omitempty"`
-
-	// An array of screenshot objects in the form `{name: 'bar', path:
-	// 'img/screenshot.png'}`
-	Screenshots []struct {
-		Name *string `json:"name,omitempty"`
-		Path *string `json:"path,omitempty"`
-	} `json:"screenshots,omitempty"`
-
-	// Date when this plugin was built
-	Updated *string `json:"updated,omitempty"`
-
-	// Project version of this commit, e.g. `6.7.x`
-	Version *string `json:"version,omitempty"`
-}
-
-// TODO docs
-// TODO should this really be separate from TokenAuth?
-type JWTTokenAuth struct {
-	// Parameters for the JWT token authentication request.
-	Params map[string]string `json:"params"`
-
-	// The list of scopes that your application should be granted
-	// access to.
-	Scopes []string `json:"scopes"`
-
-	// URL to fetch the JWT token.
-	Url string `json:"url"`
-}
-
-// Permission describes an RBAC permission on the plugin. A permission has an action and an optional
-// scope.
-// Example: action: 'test-app.schedules:read', scope: 'test-app.schedules:*'
-type Permission struct {
-	Action string  `json:"action"`
-	Scope  *string `json:"scope,omitempty"`
-}
-
-// PluginDef defines model for PluginDef.
-type PluginDef struct {
-	// Schema definition for the plugin.json file. Used primarily for schema validation.
-	Schema *string `json:"$schema,omitempty"`
-
-	// For data source plugins, if the plugin supports alerting. Requires `backend` to be set to `true`.
-	Alerting *bool `json:"alerting,omitempty"`
-
-	// An alias is useful when migrating from one plugin id to another (rebranding etc)
-	// This should be used sparingly, and is currently only supported though a hardcoded checklist
-	AliasIDs []string `json:"aliasIDs,omitempty"`
-
-	// For data source plugins, if the plugin supports annotation
-	// queries.
-	Annotations *bool `json:"annotations,omitempty"`
-
-	// Set to true for app plugins that should be enabled and pinned to the navigation bar in all orgs.
-	AutoEnabled *bool `json:"autoEnabled,omitempty"`
-
-	// If the plugin has a backend component.
-	Backend *bool `json:"backend,omitempty"`
-
-	// [internal only] Indicates whether the plugin is developed and shipped as part
-	// of Grafana. Also known as a 'core plugin'.
-	BuiltIn bool `json:"builtIn"`
-
-	// Plugin category used on the Add data source page.
-	Category     *Category    `json:"category,omitempty"`
-	Dependencies Dependencies `json:"dependencies"`
-
-	// Grafana Enterprise specific features.
-	EnterpriseFeatures *struct {
-		// Enable/Disable health diagnostics errors. Requires Grafana
-		// >=7.5.5.
-		HealthDiagnosticsErrors *bool `json:"healthDiagnosticsErrors,omitempty"`
-	} `json:"enterpriseFeatures,omitempty"`
-
-	// The first part of the file name of the backend component
-	// executable. There can be multiple executables built for
-	// different operating system and architecture. Grafana will
-	// check for executables named `<executable>_<$GOOS>_<lower case
-	// $GOARCH><.exe for Windows>`, e.g. `plugin_linux_amd64`.
-	// Combination of $GOOS and $GOARCH can be found here:
-	// https://golang.org/doc/install/source#environment.
-	Executable *string `json:"executable,omitempty"`
-
-	// ExternalServiceRegistration allows the service to get a service account token
-	// (or to use the client_credentials grant if the token provider is the OAuth2 Server)
-	ExternalServiceRegistration ExternalServiceRegistration `json:"externalServiceRegistration"`
-
-	// [internal only] Excludes the plugin from listings in Grafana's UI. Only
-	// allowed for `builtIn` plugins.
-	HideFromList bool `json:"hideFromList"`
-
-	// Unique name of the plugin. If the plugin is published on
-	// grafana.com, then the plugin `id` has to follow the naming
-	// conventions.
-	Id string `json:"id"`
-
-	// Resources to include in plugin.
-	Includes []Include `json:"includes,omitempty"`
-
-	// Metadata about a Grafana plugin. Some fields are used on the plugins
-	// page in Grafana and others on grafana.com, if the plugin is published.
-	Info Info `json:"info"`
-
-	// For data source plugins, if the plugin supports logs. It may be used to filter logs only features.
-	Logs *bool `json:"logs,omitempty"`
-
-	// For data source plugins, if the plugin supports metric queries.
-	// Used to enable the plugin in the panel editor.
-	Metrics *bool `json:"metrics,omitempty"`
-
-	// Human-readable name of the plugin that is shown to the user in
-	// the UI.
-	Name string `json:"name"`
-
-	// [internal only] The PascalCase name for the plugin. Used for creating machine-friendly
-	// identifiers, typically in code generation.
-	//
-	// If not provided, defaults to name, but title-cased and sanitized (only
-	// alphabetical characters allowed).
-	PascalName string `json:"pascalName"`
-
-	// Initialize plugin on startup. By default, the plugin
-	// initializes on first use.
-	Preload *bool `json:"preload,omitempty"`
-
-	// For data source plugins. There is a query options section in
-	// the plugin's query editor and these options can be turned on
-	// if needed.
-	QueryOptions *struct {
-		// For data source plugins. If the `cache timeout` option should
-		// be shown in the query options section in the query editor.
-		CacheTimeout *bool `json:"cacheTimeout,omitempty"`
-
-		// For data source plugins. If the `max data points` option should
-		// be shown in the query options section in the query editor.
-		MaxDataPoints *bool `json:"maxDataPoints,omitempty"`
-
-		// For data source plugins. If the `min interval` option should be
-		// shown in the query options section in the query editor.
-		MinInterval *bool `json:"minInterval,omitempty"`
-	} `json:"queryOptions,omitempty"`
-
-	// Optional list of RBAC RoleRegistrations.
-	// Describes and organizes the default permissions associated with any of the Grafana basic roles,
-	// which characterizes what viewers, editors, admins, or grafana admins can do on the plugin.
-	// The Admin basic role inherits its default permissions from the Editor basic role which in turn
-	// inherits them from the Viewer basic role.
-	Roles []RoleRegistration `json:"roles,omitempty"`
-
-	// Routes is a list of proxy routes, if any. For datasource plugins only.
-	Routes []Route `json:"routes,omitempty"`
-
-	// For panel plugins. Hides the query editor.
-	SkipDataQuery *bool `json:"skipDataQuery,omitempty"`
-
-	// ReleaseState indicates release maturity state of a plugin.
-	State *ReleaseState `json:"state,omitempty"`
-
-	// For data source plugins, if the plugin supports streaming. Used in Explore to start live streaming.
-	Streaming *bool `json:"streaming,omitempty"`
-
-	// For data source plugins, if the plugin supports tracing. Used for example to link logs (e.g. Loki logs) with tracing plugins.
-	Tracing *bool `json:"tracing,omitempty"`
-
-	// type indicates which type of Grafana plugin this is, of the defined
-	// set of Grafana plugin types.
-	Type Type `json:"type"`
-}
-
-// Plugin category used on the Add data source page.
-type Category string
-
-// Type type indicates which type of Grafana plugin this is, of the defined
-// set of Grafana plugin types.
-type Type string
-
-// ReleaseState indicates release maturity state of a plugin.
-type ReleaseState string
-
-// Role describes an RBAC role which allows grouping multiple related permissions on the plugin,
-// each of which has an action and an optional scope.
-// Example: the role 'Schedules Reader' bundles permissions to view all schedules of the plugin.
-type Role struct {
-	Description string       `json:"description"`
-	Name        string       `json:"name"`
-	Permissions []Permission `json:"permissions"`
-}
-
-// RoleRegistration describes an RBAC role and its assignments to basic roles.
-// It organizes related RBAC permissions on the plugin into a role and defines which basic roles
-// will get them by default.
-// Example: the role 'Schedules Reader' bundles permissions to view all schedules of the plugin
-// which will be granted to Admins by default.
-type RoleRegistration struct {
-	// Default assignment of the role to Grafana basic roles (Viewer, Editor, Admin, Grafana Admin)
-	// The Admin basic role inherits its default permissions from the Editor basic role which in turn
-	// inherits them from the Viewer basic role.
-	Grants []BasicRole `json:"grants"`
-
-	// Role describes an RBAC role which allows grouping multiple related permissions on the plugin,
-	// each of which has an action and an optional scope.
-	// Example: the role 'Schedules Reader' bundles permissions to view all schedules of the plugin.
-	Role Role `json:"role"`
-}
-
-// A proxy route used in datasource plugins for plugin authentication
-// and adding headers to HTTP requests made by the plugin.
-// For more information, refer to [Authentication for data source
-// plugins](https://grafana.com/developers/plugin-tools/create-a-plugin/extend-a-plugin/add-authentication-for-data-source-plugins).
-type Route struct {
-	// For data source plugins. Route headers set the body content and
-	// length to the proxied request.
-	Body map[string]any `json:"body,omitempty"`
-
-	// For data source plugins. Route headers adds HTTP headers to the
-	// proxied request.
-	Headers []Header `json:"headers,omitempty"`
-
-	// TODO docs
-	// TODO should this really be separate from TokenAuth?
-	JwtTokenAuth *JWTTokenAuth `json:"jwtTokenAuth,omitempty"`
-
-	// For data source plugins. Route method matches the HTTP verb
-	// like GET or POST. Multiple methods can be provided as a
-	// comma-separated list.
-	Method *string `json:"method,omitempty"`
-
-	// For data source plugins. The route path that is replaced by the
-	// route URL field when proxying the call.
-	Path        *string `json:"path,omitempty"`
-	ReqRole     *string `json:"reqRole,omitempty"`
-	ReqSignedIn *bool   `json:"reqSignedIn,omitempty"`
-
-	// TODO docs
-	TokenAuth *TokenAuth `json:"tokenAuth,omitempty"`
-
-	// For data source plugins. Route URL is where the request is
-	// proxied to.
-	Url       *string    `json:"url,omitempty"`
-	UrlParams []URLParam `json:"urlParams,omitempty"`
-}
-
-// TODO docs
-type TokenAuth struct {
-	// Parameters for the token authentication request.
-	Params map[string]string `json:"params"`
-
-	// The list of scopes that your application should be granted
-	// access to.
-	Scopes []string `json:"scopes,omitempty"`
-
-	// URL to fetch the authentication token.
-	Url *string `json:"url,omitempty"`
-}
-
-// URLParam describes query string parameters for
-// a url in a plugin route
-type URLParam struct {
-	Content string `json:"content"`
-	Name    string `json:"name"`
-}
diff --git a/pkg/plugins/pluginrequestmeta/plugin_request_meta.go b/pkg/plugins/pluginrequestmeta/plugin_request_meta.go
index cc3f414379096..1a189bf33fb4a 100644
--- a/pkg/plugins/pluginrequestmeta/plugin_request_meta.go
+++ b/pkg/plugins/pluginrequestmeta/plugin_request_meta.go
@@ -3,6 +3,8 @@ package pluginrequestmeta
 import (
 	"context"
 	"errors"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
 )
 
 // StatusSource is an enum-like string value representing the source of a
@@ -14,16 +16,19 @@ const (
 	StatusSourceDownstream StatusSource = "downstream"
 )
 
+// DefaultStatusSource is the default StatusSource that should be used when it is not explicitly set by the plugin.
+const DefaultStatusSource StatusSource = StatusSourcePlugin
+
 type statusSourceCtxKey struct{}
 
 // StatusSourceFromContext returns the plugin request status source stored in the context.
-// If no plugin request status source is stored in the context, [StatusSourcePlugin] is returned.
+// If no plugin request status source is stored in the context, [DefaultStatusSource] is returned.
 func StatusSourceFromContext(ctx context.Context) StatusSource {
 	value, ok := ctx.Value(statusSourceCtxKey{}).(*StatusSource)
 	if ok {
 		return *value
 	}
-	return StatusSourcePlugin
+	return DefaultStatusSource
 }
 
 // WithStatusSource sets the plugin request status source for the context.
@@ -42,3 +47,13 @@ func WithDownstreamStatusSource(ctx context.Context) error {
 	*v = StatusSourceDownstream
 	return nil
 }
+
+// StatusSourceFromPluginErrorSource takes an error source returned by a plugin and returns the corresponding
+// StatusSource. If the provided value is a zero-value (i.e.: the plugin did not set it), the function returns
+// DefaultStatusSource.
+func StatusSourceFromPluginErrorSource(pluginErrorSource backend.ErrorSource) StatusSource {
+	if pluginErrorSource == "" {
+		return DefaultStatusSource
+	}
+	return StatusSource(pluginErrorSource)
+}
diff --git a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go
index d8c95a8799d52..15e43ad07d9e2 100644
--- a/pkg/plugins/plugins.go
+++ b/pkg/plugins/plugins.go
@@ -19,7 +19,7 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/backendplugin/pluginextensionv2"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin/secretsmanagerplugin"
 	"github.com/grafana/grafana/pkg/plugins/log"
-	"github.com/grafana/grafana/pkg/plugins/plugindef"
+	"github.com/grafana/grafana/pkg/plugins/pfs"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/util"
 )
@@ -55,7 +55,7 @@ type Plugin struct {
 	Module  string
 	BaseURL string
 
-	AngularDetected bool
+	Angular AngularMeta
 
 	ExternalService *auth.ExternalService
 
@@ -64,9 +64,16 @@ type Plugin struct {
 	client         backendplugin.Plugin
 	log            log.Logger
 
+	SkipHostEnvVars bool
+
 	mu sync.Mutex
 }
 
+type AngularMeta struct {
+	Detected        bool `json:"detected"`
+	HideDeprecation bool `json:"hideDeprecation"`
+}
+
 // JSONData represents the plugin's plugin.json
 type JSONData struct {
 	// Common settings
@@ -111,7 +118,7 @@ type JSONData struct {
 	Executable string `json:"executable,omitempty"`
 
 	// App Service Auth Registration
-	ExternalServiceRegistration *plugindef.ExternalServiceRegistration `json:"externalServiceRegistration,omitempty"`
+	IAM *pfs.IAM `json:"iam,omitempty"`
 }
 
 func ReadPluginJSON(reader io.Reader) (JSONData, error) {
@@ -132,6 +139,8 @@ func ReadPluginJSON(reader io.Reader) (JSONData, error) {
 		fallthrough
 	case "grafana-testdata-datasource":
 		fallthrough
+	case "grafana-postgresql-datasource":
+		fallthrough
 	case "annolist":
 		fallthrough
 	case "debug":
@@ -185,6 +194,7 @@ type Route struct {
 	Path         string          `json:"path"`
 	Method       string          `json:"method"`
 	ReqRole      org.RoleType    `json:"reqRole"`
+	ReqAction    string          `json:"reqAction"`
 	URL          string          `json:"url"`
 	URLParams    []URLParam      `json:"urlParams"`
 	Headers      []Header        `json:"headers"`
@@ -194,6 +204,10 @@ type Route struct {
 	Body         json.RawMessage `json:"body"`
 }
 
+func (r *Route) RequiresRBACAction() bool {
+	return r.ReqAction != ""
+}
+
 // Header describes an HTTP header that is forwarded with
 // the proxied request for a plugin route
 type Header struct {
diff --git a/pkg/plugins/plugins_test.go b/pkg/plugins/plugins_test.go
index 96eef9f0b593d..5554c86d1846f 100644
--- a/pkg/plugins/plugins_test.go
+++ b/pkg/plugins/plugins_test.go
@@ -49,7 +49,8 @@ func Test_ReadPluginJSON(t *testing.T) {
 						{Path: "img/screenshot1.png", Name: "img1"},
 						{Path: "img/screenshot2.png", Name: "img2"},
 					},
-					Updated: "2015-02-10",
+					Updated:  "2015-02-10",
+					Keywords: []string{"test"},
 				},
 				Dependencies: Dependencies{
 					GrafanaVersion: "3.x.x",
@@ -107,7 +108,7 @@ func Test_ReadPluginJSON(t *testing.T) {
 			pluginJSON: func(t *testing.T) io.ReadCloser {
 				pJSON := `{
 					"id": "grafana-pyroscope-datasource",
-					"type": "datasource",					
+					"type": "datasource",
 					"aliasIDs": ["phlare"]
 				}`
 				return io.NopCloser(strings.NewReader(pJSON))
diff --git a/pkg/plugins/pluginscdn/pluginscdn.go b/pkg/plugins/pluginscdn/pluginscdn.go
index 5f93f4825987b..44445d449fde4 100644
--- a/pkg/plugins/pluginscdn/pluginscdn.go
+++ b/pkg/plugins/pluginscdn/pluginscdn.go
@@ -16,10 +16,10 @@ var ErrPluginNotCDN = errors.New("plugin is not a cdn plugin")
 
 // Service provides methods for the plugins CDN.
 type Service struct {
-	cfg *config.Cfg
+	cfg *config.PluginManagementCfg
 }
 
-func ProvideService(cfg *config.Cfg) *Service {
+func ProvideService(cfg *config.PluginManagementCfg) *Service {
 	return &Service{cfg: cfg}
 }
 
diff --git a/pkg/plugins/pluginscdn/pluginscdn_test.go b/pkg/plugins/pluginscdn/pluginscdn_test.go
index 08cae194aae69..f18285b0d68de 100644
--- a/pkg/plugins/pluginscdn/pluginscdn_test.go
+++ b/pkg/plugins/pluginscdn/pluginscdn_test.go
@@ -8,7 +8,7 @@ import (
 )
 
 func TestService(t *testing.T) {
-	svc := ProvideService(&config.Cfg{
+	svc := ProvideService(&config.PluginManagementCfg{
 		PluginsCDNURLTemplate: "https://cdn.example.com",
 		PluginSettings: map[string]map[string]string{
 			"one": {"cdn": "true"},
@@ -40,7 +40,7 @@ func TestService(t *testing.T) {
 			},
 		} {
 			t.Run(c.name, func(t *testing.T) {
-				u, err := ProvideService(&config.Cfg{PluginsCDNURLTemplate: c.cfgURL}).BaseURL()
+				u, err := ProvideService(&config.PluginManagementCfg{PluginsCDNURLTemplate: c.cfgURL}).BaseURL()
 				require.NoError(t, err)
 				require.Equal(t, c.expBaseURL, u)
 			})
diff --git a/pkg/plugins/repo/client.go b/pkg/plugins/repo/client.go
index 661b752b7f22d..c34979d0f9a27 100644
--- a/pkg/plugins/repo/client.go
+++ b/pkg/plugins/repo/client.go
@@ -164,7 +164,7 @@ func (c *Client) downloadFile(tmpFile *os.File, pluginURL, checksum string, comp
 		return fmt.Errorf("failed to write to %q: %w", tmpFile.Name(), err)
 	}
 	if len(checksum) > 0 && checksum != fmt.Sprintf("%x", h.Sum(nil)) {
-		return ErrChecksumMismatch{archiveURL: pluginURL}
+		return ErrChecksumMismatch(pluginURL)
 	}
 	return nil
 }
diff --git a/pkg/plugins/repo/errors.go b/pkg/plugins/repo/errors.go
index d8a402dd09c36..e6a873bc8f31e 100644
--- a/pkg/plugins/repo/errors.go
+++ b/pkg/plugins/repo/errors.go
@@ -1,6 +1,10 @@
 package repo
 
-import "fmt"
+import (
+	"fmt"
+
+	"github.com/grafana/grafana/pkg/util/errutil"
+)
 
 type ErrResponse4xx struct {
 	message           string
@@ -43,39 +47,44 @@ func (e ErrResponse4xx) Error() string {
 	return fmt.Sprintf("%d", e.statusCode)
 }
 
-type ErrVersionUnsupported struct {
-	pluginID         string
-	requestedVersion string
-	systemInfo       string
-}
+var (
+	ErrVersionUnsupportedMsg  = "{{.Public.PluginID}} v{{.Public.Version}} is not supported on your system {{.Public.SysInfo}}"
+	ErrVersionUnsupportedBase = errutil.Conflict("plugin.unsupportedVersion").
+					MustTemplate(ErrVersionUnsupportedMsg, errutil.WithPublic(ErrVersionUnsupportedMsg))
 
-func (e ErrVersionUnsupported) Error() string {
-	return fmt.Sprintf("%s v%s is not supported on your system (%s)", e.pluginID, e.requestedVersion, e.systemInfo)
-}
+	ErrVersionNotFoundMsg  = "{{.Public.PluginID}} v{{.Public.Version}} either does not exist or is not supported on your system {{.Public.SysInfo}}"
+	ErrVersionNotFoundBase = errutil.NotFound("plugin.versionNotFound").
+				MustTemplate(ErrVersionNotFoundMsg, errutil.WithPublic(ErrVersionNotFoundMsg))
 
-type ErrVersionNotFound struct {
-	pluginID         string
-	requestedVersion string
-	systemInfo       string
-}
+	ErrArcNotFoundMsg  = "{{.Public.PluginID}} is not compatible with your system architecture: {{.Public.SysInfo}}"
+	ErrArcNotFoundBase = errutil.NotFound("plugin.archNotFound").
+				MustTemplate(ErrArcNotFoundMsg, errutil.WithPublic(ErrArcNotFoundMsg))
+
+	ErrChecksumMismatchMsg  = "expected SHA256 checksum does not match the downloaded archive ({{.Public.ArchiveURL}}) - please contact security@grafana.com"
+	ErrChecksumMismatchBase = errutil.UnprocessableEntity("plugin.checksumMismatch").
+				MustTemplate(ErrChecksumMismatchMsg, errutil.WithPublic(ErrChecksumMismatchMsg))
+
+	ErrCorePluginMsg  = "plugin {{.Public.PluginID}} is a core plugin and cannot be installed separately"
+	ErrCorePluginBase = errutil.Forbidden("plugin.forbiddenCorePluginInstall").
+				MustTemplate(ErrCorePluginMsg, errutil.WithPublic(ErrCorePluginMsg))
+)
 
-func (e ErrVersionNotFound) Error() string {
-	return fmt.Sprintf("%s v%s either does not exist or is not supported on your system (%s)", e.pluginID, e.requestedVersion, e.systemInfo)
+func ErrVersionUnsupported(pluginID, requestedVersion, systemInfo string) error {
+	return ErrVersionUnsupportedBase.Build(errutil.TemplateData{Public: map[string]any{"PluginID": pluginID, "Version": requestedVersion, "SysInfo": systemInfo}})
 }
 
-type ErrArcNotFound struct {
-	pluginID   string
-	systemInfo string
+func ErrVersionNotFound(pluginID, requestedVersion, systemInfo string) error {
+	return ErrVersionNotFoundBase.Build(errutil.TemplateData{Public: map[string]any{"PluginID": pluginID, "Version": requestedVersion, "SysInfo": systemInfo}})
 }
 
-func (e ErrArcNotFound) Error() string {
-	return fmt.Sprintf("%s is not compatible with your system architecture: %s", e.pluginID, e.systemInfo)
+func ErrArcNotFound(pluginID, systemInfo string) error {
+	return ErrArcNotFoundBase.Build(errutil.TemplateData{Public: map[string]any{"PluginID": pluginID, "SysInfo": systemInfo}})
 }
 
-type ErrChecksumMismatch struct {
-	archiveURL string
+func ErrChecksumMismatch(archiveURL string) error {
+	return ErrChecksumMismatchBase.Build(errutil.TemplateData{Public: map[string]any{"ArchiveURL": archiveURL}})
 }
 
-func (e ErrChecksumMismatch) Error() string {
-	return fmt.Sprintf("expected SHA256 checksum does not match the downloaded archive (%s) - please contact security@grafana.com", e.archiveURL)
+func ErrCorePlugin(pluginID string) error {
+	return ErrCorePluginBase.Build(errutil.TemplateData{Public: map[string]any{"PluginID": pluginID}})
 }
diff --git a/pkg/plugins/repo/errors_test.go b/pkg/plugins/repo/errors_test.go
index d7870e534e0b4..a20298cee23aa 100644
--- a/pkg/plugins/repo/errors_test.go
+++ b/pkg/plugins/repo/errors_test.go
@@ -1,9 +1,11 @@
 package repo
 
 import (
+	"errors"
 	"net/http"
 	"testing"
 
+	"github.com/grafana/grafana/pkg/util/errutil"
 	"github.com/stretchr/testify/require"
 )
 
@@ -24,3 +26,37 @@ func TestErrResponse4xx(t *testing.T) {
 		require.Equal(t, compatInfo, err.compatibilityInfo)
 	})
 }
+
+func TestErrorTemplates(t *testing.T) {
+	base := &errutil.Error{}
+
+	err := ErrVersionUnsupported("grafana-test-app", "1.0.0", "darwin-amd64")
+	require.True(t, errors.As(err, base))
+	require.Equal(t, http.StatusConflict, base.Public().StatusCode)
+	require.Equal(t, "plugin.unsupportedVersion", base.Public().MessageID)
+	require.Equal(t, "grafana-test-app v1.0.0 is not supported on your system darwin-amd64", base.Public().Message)
+
+	err = ErrVersionNotFound("grafana-test-app", "1.0.0", "darwin-amd64")
+	require.True(t, errors.As(err, base))
+	require.Equal(t, http.StatusNotFound, base.Public().StatusCode)
+	require.Equal(t, "plugin.versionNotFound", base.Public().MessageID)
+	require.Equal(t, "grafana-test-app v1.0.0 either does not exist or is not supported on your system darwin-amd64", base.Public().Message)
+
+	err = ErrArcNotFound("grafana-test-app", "darwin-amd64")
+	require.True(t, errors.As(err, base))
+	require.Equal(t, http.StatusNotFound, base.Public().StatusCode)
+	require.Equal(t, "plugin.archNotFound", base.Public().MessageID)
+	require.Equal(t, "grafana-test-app is not compatible with your system architecture: darwin-amd64", base.Public().Message)
+
+	err = ErrChecksumMismatch("http://localhost:6481/grafana-test-app/versions/1.0.0/download")
+	require.True(t, errors.As(err, base))
+	require.Equal(t, http.StatusUnprocessableEntity, base.Public().StatusCode)
+	require.Equal(t, "plugin.checksumMismatch", base.Public().MessageID)
+	require.Equal(t, "expected SHA256 checksum does not match the downloaded archive (http://localhost:6481/grafana-test-app/versions/1.0.0/download) - please contact security@grafana.com", base.Public().Message)
+
+	err = ErrCorePlugin("grafana-test-app")
+	require.True(t, errors.As(err, base))
+	require.Equal(t, http.StatusForbidden, base.Public().StatusCode)
+	require.Equal(t, "plugin.forbiddenCorePluginInstall", base.Public().MessageID)
+	require.Equal(t, "plugin grafana-test-app is a core plugin and cannot be installed separately", base.Public().Message)
+}
diff --git a/pkg/plugins/repo/models.go b/pkg/plugins/repo/models.go
index 4816bdaf30f11..85c1519b5c8fc 100644
--- a/pkg/plugins/repo/models.go
+++ b/pkg/plugins/repo/models.go
@@ -12,14 +12,15 @@ type PluginArchiveInfo struct {
 	Checksum string
 }
 
-// PluginRepo is (a subset of) the JSON response from /api/plugins/repo/$pluginID
-type PluginRepo struct {
-	Versions []Version `json:"versions"`
+// PluginVersions is the JSON response from /api/plugins/$pluginID/versions
+type PluginVersions struct {
+	Versions []Version `json:"items"`
 }
 
 type Version struct {
 	Version string              `json:"version"`
-	Arch    map[string]ArchMeta `json:"arch"`
+	Arch    map[string]ArchMeta `json:"packages"`
+	URL     string              `json:"url"`
 }
 
 type ArchMeta struct {
diff --git a/pkg/plugins/repo/service.go b/pkg/plugins/repo/service.go
index 0bd1b7a7e6b64..704411e2bb41e 100644
--- a/pkg/plugins/repo/service.go
+++ b/pkg/plugins/repo/service.go
@@ -5,8 +5,10 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net/http"
 	"net/url"
 	"path"
+	"strings"
 
 	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/log"
@@ -19,7 +21,7 @@ type Manager struct {
 	log log.PrettyLogger
 }
 
-func ProvideService(cfg *config.Cfg) (*Manager, error) {
+func ProvideService(cfg *config.PluginManagementCfg) (*Manager, error) {
 	baseURL, err := url.JoinPath(cfg.GrafanaComURL, "/api/plugins")
 	if err != nil {
 		return nil, err
@@ -87,34 +89,51 @@ func (m *Manager) PluginVersion(pluginID, version string, compatOpts CompatOpts)
 		return VersionData{}, errors.New("no system compatibility requirements set")
 	}
 
-	return SelectSystemCompatibleVersion(m.log, versions, pluginID, version, sysCompatOpts)
+	compatibleVer, err := SelectSystemCompatibleVersion(m.log, versions, pluginID, version, sysCompatOpts)
+	if err != nil {
+		return VersionData{}, err
+	}
+
+	isGrafanaCorePlugin := strings.HasPrefix(compatibleVer.URL, "https://github.com/grafana/grafana/tree/main/public/app/plugins/")
+	_, hasAnyArch := compatibleVer.Arch["any"]
+	if isGrafanaCorePlugin && hasAnyArch {
+		// Trying to install a coupled core plugin
+		return VersionData{}, ErrCorePlugin(pluginID)
+	}
+
+	return compatibleVer, nil
 }
 
 func (m *Manager) downloadURL(pluginID, version string) string {
 	return fmt.Sprintf("%s/%s/versions/%s/download", m.baseURL, pluginID, version)
 }
 
-// grafanaCompatiblePluginVersions will get version info from /api/plugins/repo/$pluginID based on
-// the provided compatibility information (sent via HTTP headers)
+// grafanaCompatiblePluginVersions will get version info from /api/plugins/$pluginID/versions
 func (m *Manager) grafanaCompatiblePluginVersions(pluginID string, compatOpts CompatOpts) ([]Version, error) {
 	u, err := url.Parse(m.baseURL)
 	if err != nil {
 		return nil, err
 	}
 
-	u.Path = path.Join(u.Path, "repo", pluginID)
+	u.Path = path.Join(u.Path, pluginID, "versions")
 
 	body, err := m.client.SendReq(u, compatOpts)
 	if err != nil {
 		return nil, err
 	}
 
-	var v PluginRepo
+	var v PluginVersions
 	err = json.Unmarshal(body, &v)
 	if err != nil {
 		m.log.Error("Failed to unmarshal plugin repo response", err)
 		return nil, err
 	}
 
+	if len(v.Versions) == 0 {
+		// /plugins/{pluginId}/versions returns 200 even if the plugin doesn't exists
+		// but the response is empty. In this case we return 404.
+		return nil, newErrResponse4xx(http.StatusNotFound).withMessage("Plugin not found")
+	}
+
 	return v.Versions, nil
 }
diff --git a/pkg/plugins/repo/service_test.go b/pkg/plugins/repo/service_test.go
index 1536b032deb29..c2c0833e7ea78 100644
--- a/pkg/plugins/repo/service_test.go
+++ b/pkg/plugins/repo/service_test.go
@@ -21,9 +21,12 @@ const (
 
 func TestGetPluginArchive(t *testing.T) {
 	tcs := []struct {
-		name string
-		sha  string
-		err  error
+		name     string
+		sha      string
+		apiOpSys string
+		apiArch  string
+		apiUrl   string
+		err      error
 	}{
 		{
 			name: "Happy path",
@@ -32,7 +35,19 @@ func TestGetPluginArchive(t *testing.T) {
 		{
 			name: "Incorrect SHA returns error",
 			sha:  "1a2b3c",
-			err:  &ErrChecksumMismatch{},
+			err:  ErrChecksumMismatchBase,
+		},
+		{
+			name:     "Core plugin",
+			sha:      "69f698961b6ea651211a187874434821c4727cc22de022e3a7059116d21c75b1",
+			apiOpSys: "any",
+			apiUrl:   "https://github.com/grafana/grafana/tree/main/public/app/plugins/test",
+			err:      ErrCorePluginBase,
+		},
+		{
+			name:   "Decoupled core plugin",
+			sha:    "69f698961b6ea651211a187874434821c4727cc22de022e3a7059116d21c75b1",
+			apiUrl: "https://github.com/grafana/grafana/tree/main/public/app/plugins/test",
 		},
 	}
 
@@ -57,17 +72,23 @@ func TestGetPluginArchive(t *testing.T) {
 				grafanaVersion = "10.0.0"
 			)
 
-			srv := mockPluginRepoAPI(t,
-				srvData{
-					pluginID:       pluginID,
-					version:        version,
-					opSys:          opSys,
-					arch:           arch,
-					grafanaVersion: grafanaVersion,
-					sha:            tc.sha,
-					archive:        d,
-				},
-			)
+			srvd := srvData{
+				pluginID:       pluginID,
+				version:        version,
+				opSys:          tc.apiOpSys,
+				arch:           tc.apiArch,
+				url:            tc.apiUrl,
+				grafanaVersion: grafanaVersion,
+				sha:            tc.sha,
+				archive:        d,
+			}
+			if srvd.opSys == "" {
+				srvd.opSys = opSys
+			}
+			if srvd.arch == "" && srvd.opSys != "any" {
+				srvd.arch = arch
+			}
+			srv := mockPluginVersionsAPI(t, srvd)
 			t.Cleanup(srv.Close)
 
 			m := NewManager(ManagerCfg{
@@ -78,7 +99,7 @@ func TestGetPluginArchive(t *testing.T) {
 			co := NewCompatOpts(grafanaVersion, opSys, arch)
 			archive, err := m.GetPluginArchive(context.Background(), pluginID, version, co)
 			if tc.err != nil {
-				require.ErrorAs(t, err, tc.err)
+				require.ErrorIs(t, err, tc.err)
 				return
 			}
 			require.NoError(t, err)
@@ -125,34 +146,38 @@ type srvData struct {
 	sha            string
 	grafanaVersion string
 	archive        []byte
+	url            string
 }
 
-func mockPluginRepoAPI(t *testing.T, data srvData) *httptest.Server {
+func mockPluginVersionsAPI(t *testing.T, data srvData) *httptest.Server {
 	t.Helper()
 
 	mux := http.NewServeMux()
 	// mock plugin version data
-	mux.HandleFunc(fmt.Sprintf("/repo/%s", data.pluginID), func(w http.ResponseWriter, r *http.Request) {
+	mux.HandleFunc(fmt.Sprintf("/%s/versions", data.pluginID), func(w http.ResponseWriter, r *http.Request) {
 		require.Equal(t, data.grafanaVersion, r.Header.Get("grafana-version"))
-		require.Equal(t, data.opSys, r.Header.Get("grafana-os"))
-		require.Equal(t, data.arch, r.Header.Get("grafana-arch"))
 		require.NotNil(t, fmt.Sprintf("grafana %s", data.grafanaVersion), r.Header.Get("User-Agent"))
 
 		w.WriteHeader(http.StatusOK)
 		w.Header().Set("Content-Type", "application/json")
 
+		platform := data.opSys
+		if data.arch != "" {
+			platform += "-" + data.arch
+		}
 		_, _ = w.Write([]byte(fmt.Sprintf(`
 				{
-					"versions": [{
+					"items": [{
 						"version": "%s",
-						"arch": {
-							"%s-%s": {
+						"packages": {
+							"%s": {
 								"sha256": "%s"
 							}
-						}
+						},
+						"url": "%s"
 					}]
 				}
-			`, data.version, data.opSys, data.arch, data.sha),
+			`, data.version, platform, data.sha, data.url),
 		))
 	})
 
diff --git a/pkg/plugins/repo/version.go b/pkg/plugins/repo/version.go
index 44489eff9a6fd..ad3716d1c2f10 100644
--- a/pkg/plugins/repo/version.go
+++ b/pkg/plugins/repo/version.go
@@ -9,6 +9,8 @@ import (
 type VersionData struct {
 	Version  string
 	Checksum string
+	Arch     map[string]ArchMeta
+	URL      string
 }
 
 // SelectSystemCompatibleVersion selects the most appropriate plugin version based on os + architecture
@@ -23,16 +25,15 @@ func SelectSystemCompatibleVersion(log log.PrettyLogger, versions []Version, plu
 	var ver Version
 	latestForArch, exists := latestSupportedVersion(versions, compatOpts)
 	if !exists {
-		return VersionData{}, ErrArcNotFound{
-			pluginID:   pluginID,
-			systemInfo: compatOpts.OSAndArch(),
-		}
+		return VersionData{}, ErrArcNotFound(pluginID, compatOpts.OSAndArch())
 	}
 
 	if version == "" {
 		return VersionData{
 			Version:  latestForArch.Version,
 			Checksum: checksum(latestForArch, compatOpts),
+			Arch:     latestForArch.Arch,
+			URL:      latestForArch.URL,
 		}, nil
 	}
 	for _, v := range versions {
@@ -45,26 +46,20 @@ func SelectSystemCompatibleVersion(log log.PrettyLogger, versions []Version, plu
 	if len(ver.Version) == 0 {
 		log.Debugf("Requested plugin version %s v%s not found but potential fallback version '%s' was found",
 			pluginID, version, latestForArch.Version)
-		return VersionData{}, ErrVersionNotFound{
-			pluginID:         pluginID,
-			requestedVersion: version,
-			systemInfo:       compatOpts.OSAndArch(),
-		}
+		return VersionData{}, ErrVersionNotFound(pluginID, version, compatOpts.OSAndArch())
 	}
 
 	if !supportsCurrentArch(ver, compatOpts) {
 		log.Debugf("Requested plugin version %s v%s is not supported on your system but potential fallback version '%s' was found",
 			pluginID, version, latestForArch.Version)
-		return VersionData{}, ErrVersionUnsupported{
-			pluginID:         pluginID,
-			requestedVersion: version,
-			systemInfo:       compatOpts.OSAndArch(),
-		}
+		return VersionData{}, ErrVersionUnsupported(pluginID, version, compatOpts.OSAndArch())
 	}
 
 	return VersionData{
 		Version:  ver.Version,
 		Checksum: checksum(ver, compatOpts),
+		Arch:     ver.Arch,
+		URL:      ver.URL,
 	}, nil
 }
 
diff --git a/pkg/plugins/storage/fs_test.go b/pkg/plugins/storage/fs_test.go
index fa504248dd140..9086a9111dee5 100644
--- a/pkg/plugins/storage/fs_test.go
+++ b/pkg/plugins/storage/fs_test.go
@@ -119,7 +119,7 @@ func TestExtractFiles(t *testing.T) {
 		skipWindows(t)
 
 		pluginID := "plugin-with-absolute-symlink"
-		path, err := i.extractFiles(context.Background(), zipFile(t, "testdata/plugin-with-absolute-symlink.zip"), pluginID, SimpleDirNameGeneratorFunc)
+		path, err := i.extractFiles(context.Background(), zipFile(t, filepath.Join("testdata", "plugin-with-absolute-symlink.zip")), pluginID, SimpleDirNameGeneratorFunc)
 		require.Equal(t, filepath.Join(pluginsDir, pluginID), path)
 		require.NoError(t, err)
 
@@ -131,7 +131,7 @@ func TestExtractFiles(t *testing.T) {
 		skipWindows(t)
 
 		pluginID := "plugin-with-absolute-symlink-dir"
-		path, err := i.extractFiles(context.Background(), zipFile(t, "testdata/plugin-with-absolute-symlink-dir.zip"), pluginID, SimpleDirNameGeneratorFunc)
+		path, err := i.extractFiles(context.Background(), zipFile(t, filepath.Join("testdata", "plugin-with-absolute-symlink-dir.zip")), pluginID, SimpleDirNameGeneratorFunc)
 		require.Equal(t, filepath.Join(pluginsDir, pluginID), path)
 		require.NoError(t, err)
 
@@ -140,7 +140,7 @@ func TestExtractFiles(t *testing.T) {
 	})
 
 	t.Run("Should detect if archive members point outside of the destination directory", func(t *testing.T) {
-		path, err := i.extractFiles(context.Background(), zipFile(t, "testdata/plugin-with-parent-member.zip"), "plugin-with-parent-member", SimpleDirNameGeneratorFunc)
+		path, err := i.extractFiles(context.Background(), zipFile(t, filepath.Join("testdata", "plugin-with-parent-member.zip")), "plugin-with-parent-member", SimpleDirNameGeneratorFunc)
 		require.Empty(t, path)
 		require.EqualError(t, err, fmt.Sprintf(
 			`archive member "../member.txt" tries to write outside of plugin directory: %q, this can be a security risk`,
@@ -149,7 +149,7 @@ func TestExtractFiles(t *testing.T) {
 	})
 
 	t.Run("Should detect if archive members are absolute", func(t *testing.T) {
-		path, err := i.extractFiles(context.Background(), zipFile(t, "testdata/plugin-with-absolute-member.zip"), "plugin-with-absolute-member", SimpleDirNameGeneratorFunc)
+		path, err := i.extractFiles(context.Background(), zipFile(t, filepath.Join("testdata", "plugin-with-absolute-member.zip")), "plugin-with-absolute-member", SimpleDirNameGeneratorFunc)
 		require.Empty(t, path)
 		require.EqualError(t, err, fmt.Sprintf(
 			`archive member "/member.txt" tries to write outside of plugin directory: %q, this can be a security risk`,
diff --git a/pkg/promlib/README.md b/pkg/promlib/README.md
new file mode 100644
index 0000000000000..253ed878b7484
--- /dev/null
+++ b/pkg/promlib/README.md
@@ -0,0 +1,15 @@
+# promlib
+
+Prometheus Library (a.k.a. promlib) is the foundation of the Grafana Prometheus data source backend.
+
+### How to tag/version?
+
+- Checkout the commit you want to tag (`git checkout <COMMIT_SHA>`)
+- Run `git tag pkg/promlib/<VERSION>` (For example `git tag pkg/promlib/v0.0.12`)
+  - NOTE: We're using Lightweight Tags, so no other options are required
+- Run `git push origin pkg/promlib/<VERSION>`
+- Verify that the tag was created successfully [here](https://github.com/grafana/grafana/tags)
+- DO NOT RELEASE anything! Tagging is enough.
+- After tagging and waiting 5-10 minutes for go module registry to catch up just bump the `promlib` version on `grafana/grafana`
+  - Bumping the version on `grafana/grafana` is not necessary as `grafana/grafana` is using the local version of it always.
+  - **But it is a good practice to do it.** 
diff --git a/pkg/promlib/client/client.go b/pkg/promlib/client/client.go
new file mode 100644
index 0000000000000..b23196b6f5ba0
--- /dev/null
+++ b/pkg/promlib/client/client.go
@@ -0,0 +1,172 @@
+package client
+
+import (
+	"bytes"
+	"context"
+	"io"
+	"net/http"
+	"net/url"
+	"path"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+
+	"github.com/grafana/grafana/pkg/promlib/models"
+)
+
+type doer interface {
+	Do(req *http.Request) (*http.Response, error)
+}
+
+// Client is a custom Prometheus client. Reason for this is that Prom Go client serializes response into its own
+// objects, we have to go through them and then serialize again into DataFrame which isn't very efficient. Using custom
+// client we can parse response directly into DataFrame.
+type Client struct {
+	doer    doer
+	method  string
+	baseUrl string
+}
+
+func NewClient(d doer, method, baseUrl string) *Client {
+	return &Client{doer: d, method: method, baseUrl: baseUrl}
+}
+
+func (c *Client) QueryRange(ctx context.Context, q *models.Query) (*http.Response, error) {
+	tr := q.TimeRange()
+	qv := map[string]string{
+		"query": q.Expr,
+		"start": formatTime(tr.Start),
+		"end":   formatTime(tr.End),
+		"step":  strconv.FormatFloat(tr.Step.Seconds(), 'f', -1, 64),
+	}
+
+	req, err := c.createQueryRequest(ctx, "api/v1/query_range", qv)
+	if err != nil {
+		return nil, err
+	}
+
+	return c.doer.Do(req)
+}
+
+func (c *Client) QueryInstant(ctx context.Context, q *models.Query) (*http.Response, error) {
+	// We do not need a time range here.
+	// Instant query evaluates at a single point in time.
+	// Using q.TimeRange is aligning the query range to step.
+	// Which causes a misleading time point.
+	// Instead of aligning we use time point directly.
+	// https://prometheus.io/docs/prometheus/latest/querying/api/#instant-queries
+	qv := map[string]string{"query": q.Expr, "time": formatTime(q.End)}
+	req, err := c.createQueryRequest(ctx, "api/v1/query", qv)
+	if err != nil {
+		return nil, err
+	}
+
+	return c.doer.Do(req)
+}
+
+func (c *Client) QueryExemplars(ctx context.Context, q *models.Query) (*http.Response, error) {
+	tr := q.TimeRange()
+	qv := map[string]string{
+		"query": q.Expr,
+		"start": formatTime(tr.Start),
+		"end":   formatTime(tr.End),
+	}
+
+	req, err := c.createQueryRequest(ctx, "api/v1/query_exemplars", qv)
+	if err != nil {
+		return nil, err
+	}
+
+	return c.doer.Do(req)
+}
+
+func (c *Client) QueryResource(ctx context.Context, req *backend.CallResourceRequest) (*http.Response, error) {
+	// The way URL is represented in CallResourceRequest and what we need for the fetch function is different
+	// so here we have to do a bit of parsing, so we can then compose it with the base url in correct way.
+	reqUrlParsed, err := url.Parse(req.URL)
+	if err != nil {
+		return nil, err
+	}
+	u, err := c.createUrl(req.Path, nil)
+	if err != nil {
+		return nil, err
+	}
+	u.RawQuery = reqUrlParsed.RawQuery
+
+	// We use method from the request, as for resources front end may do a fallback to GET if POST does not work
+	// nad we want to respect that.
+	httpRequest, err := createRequest(ctx, req.Method, u, bytes.NewReader(req.Body))
+	if err != nil {
+		return nil, err
+	}
+
+	return c.doer.Do(httpRequest)
+}
+
+func (c *Client) createQueryRequest(ctx context.Context, endpoint string, qv map[string]string) (*http.Request, error) {
+	if strings.ToUpper(c.method) == http.MethodPost {
+		u, err := c.createUrl(endpoint, nil)
+		if err != nil {
+			return nil, err
+		}
+
+		v := make(url.Values)
+		for key, val := range qv {
+			v.Set(key, val)
+		}
+
+		return createRequest(ctx, c.method, u, strings.NewReader(v.Encode()))
+	}
+
+	u, err := c.createUrl(endpoint, qv)
+	if err != nil {
+		return nil, err
+	}
+
+	return createRequest(ctx, c.method, u, http.NoBody)
+}
+
+func (c *Client) createUrl(endpoint string, qs map[string]string) (*url.URL, error) {
+	finalUrl, err := url.ParseRequestURI(c.baseUrl)
+	if err != nil {
+		return nil, err
+	}
+
+	finalUrl.Path = path.Join(finalUrl.Path, endpoint)
+
+	// don't re-encode the Query if not needed
+	if len(qs) != 0 {
+		urlQuery := finalUrl.Query()
+
+		for key, val := range qs {
+			urlQuery.Set(key, val)
+		}
+
+		finalUrl.RawQuery = urlQuery.Encode()
+	}
+
+	return finalUrl, nil
+}
+
+func createRequest(ctx context.Context, method string, u *url.URL, bodyReader io.Reader) (*http.Request, error) {
+	request, err := http.NewRequestWithContext(ctx, method, u.String(), bodyReader)
+	if err != nil {
+		return nil, err
+	}
+
+	if strings.ToUpper(method) == http.MethodPost {
+		// This may not be true but right now we don't have more information here and seems like we send just this type
+		// of encoding right now if it is a POST
+		request.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+		// This allows transport to retry request. See https://github.com/prometheus/client_golang/pull/1022
+		// It's set to nil so it is not actually sent over the wire, just used in Go http lib to retry requests.
+		request.Header["Idempotency-Key"] = nil
+	}
+	return request, nil
+}
+
+func formatTime(t time.Time) string {
+	return strconv.FormatFloat(float64(t.Unix())+float64(t.Nanosecond())/1e9, 'f', -1, 64)
+}
diff --git a/pkg/promlib/client/client_test.go b/pkg/promlib/client/client_test.go
new file mode 100644
index 0000000000000..16dc76fb27063
--- /dev/null
+++ b/pkg/promlib/client/client_test.go
@@ -0,0 +1,141 @@
+package client
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"net/http"
+	"testing"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/promlib/models"
+)
+
+type MockDoer struct {
+	Req *http.Request
+}
+
+func (doer *MockDoer) Do(req *http.Request) (*http.Response, error) {
+	doer.Req = req
+	return &http.Response{
+		StatusCode: http.StatusOK,
+		Status:     "200 OK",
+	}, nil
+}
+
+func TestClient(t *testing.T) {
+	t.Run("QueryResource", func(t *testing.T) {
+		doer := &MockDoer{}
+		// The method here does not really matter for resource calls
+		client := NewClient(doer, http.MethodGet, "http://localhost:9090")
+
+		t.Run("sends correct POST request", func(t *testing.T) {
+			req := &backend.CallResourceRequest{
+				PluginContext: backend.PluginContext{},
+				Path:          "/api/v1/series",
+				Method:        http.MethodPost,
+				URL:           "/api/v1/series",
+				Body:          []byte("match%5B%5D: ALERTS\nstart: 1655271408\nend: 1655293008"),
+			}
+			res, err := client.QueryResource(context.Background(), req)
+			defer func() {
+				if res != nil && res.Body != nil {
+					if err := res.Body.Close(); err != nil {
+						fmt.Println("Error", "err", err)
+					}
+				}
+			}()
+			require.NoError(t, err)
+			require.NotNil(t, doer.Req)
+			require.Equal(t, http.MethodPost, doer.Req.Method)
+			body, err := io.ReadAll(doer.Req.Body)
+			require.NoError(t, err)
+			require.Equal(t, []byte("match%5B%5D: ALERTS\nstart: 1655271408\nend: 1655293008"), body)
+			require.Equal(t, "http://localhost:9090/api/v1/series", doer.Req.URL.String())
+		})
+
+		t.Run("sends correct GET request", func(t *testing.T) {
+			req := &backend.CallResourceRequest{
+				PluginContext: backend.PluginContext{},
+				Path:          "/api/v1/series",
+				Method:        http.MethodGet,
+				URL:           "api/v1/series?match%5B%5D=ALERTS&start=1655272558&end=1655294158",
+			}
+			res, err := client.QueryResource(context.Background(), req)
+			defer func() {
+				if res != nil && res.Body != nil {
+					if err := res.Body.Close(); err != nil {
+						fmt.Println("Error", "err", err)
+					}
+				}
+			}()
+			require.NoError(t, err)
+			require.NotNil(t, doer.Req)
+			require.Equal(t, http.MethodGet, doer.Req.Method)
+			body, err := io.ReadAll(doer.Req.Body)
+			require.NoError(t, err)
+			require.Equal(t, []byte{}, body)
+			require.Equal(t, "http://localhost:9090/api/v1/series?match%5B%5D=ALERTS&start=1655272558&end=1655294158", doer.Req.URL.String())
+		})
+	})
+
+	t.Run("QueryRange", func(t *testing.T) {
+		doer := &MockDoer{}
+
+		t.Run("sends correct POST query", func(t *testing.T) {
+			client := NewClient(doer, http.MethodPost, "http://localhost:9090")
+			req := &models.Query{
+				Expr:       "rate(ALERTS{job=\"test\" [$__rate_interval]})",
+				Start:      time.Unix(0, 0),
+				End:        time.Unix(1234, 0),
+				RangeQuery: true,
+				Step:       1 * time.Second,
+			}
+			res, err := client.QueryRange(context.Background(), req)
+			defer func() {
+				if res != nil && res.Body != nil {
+					if err := res.Body.Close(); err != nil {
+						fmt.Println("Error", "err", err)
+					}
+				}
+			}()
+			require.NoError(t, err)
+			require.NotNil(t, doer.Req)
+			require.Equal(t, http.MethodPost, doer.Req.Method)
+			require.Equal(t, "application/x-www-form-urlencoded", doer.Req.Header.Get("Content-Type"))
+			body, err := io.ReadAll(doer.Req.Body)
+			require.NoError(t, err)
+			require.Equal(t, []byte("end=1234&query=rate%28ALERTS%7Bjob%3D%22test%22+%5B%24__rate_interval%5D%7D%29&start=0&step=1"), body)
+			require.Equal(t, "http://localhost:9090/api/v1/query_range", doer.Req.URL.String())
+		})
+
+		t.Run("sends correct GET query", func(t *testing.T) {
+			client := NewClient(doer, http.MethodGet, "http://localhost:9090")
+			req := &models.Query{
+				Expr:       "rate(ALERTS{job=\"test\" [$__rate_interval]})",
+				Start:      time.Unix(0, 0),
+				End:        time.Unix(1234, 0),
+				RangeQuery: true,
+				Step:       1 * time.Second,
+			}
+			res, err := client.QueryRange(context.Background(), req)
+			defer func() {
+				if res != nil && res.Body != nil {
+					if err := res.Body.Close(); err != nil {
+						fmt.Println("Error", "err", err)
+					}
+				}
+			}()
+			require.NoError(t, err)
+			require.NotNil(t, doer.Req)
+			require.Equal(t, http.MethodGet, doer.Req.Method)
+			body, err := io.ReadAll(doer.Req.Body)
+			require.NoError(t, err)
+			require.Equal(t, []byte{}, body)
+			require.Equal(t, "http://localhost:9090/api/v1/query_range?end=1234&query=rate%28ALERTS%7Bjob%3D%22test%22+%5B%24__rate_interval%5D%7D%29&start=0&step=1", doer.Req.URL.String())
+		})
+	})
+}
diff --git a/pkg/promlib/client/transport.go b/pkg/promlib/client/transport.go
new file mode 100644
index 0000000000000..0a4e2dccfd7d5
--- /dev/null
+++ b/pkg/promlib/client/transport.go
@@ -0,0 +1,48 @@
+package client
+
+import (
+	"context"
+	"fmt"
+	"strings"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+	"github.com/grafana/grafana-plugin-sdk-go/data/utils/maputil"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
+
+	"github.com/grafana/grafana/pkg/promlib/middleware"
+	"github.com/grafana/grafana/pkg/promlib/utils"
+)
+
+// CreateTransportOptions creates options for the http client.
+func CreateTransportOptions(ctx context.Context, settings backend.DataSourceInstanceSettings, logger log.Logger) (*sdkhttpclient.Options, error) {
+	opts, err := settings.HTTPClientOptions(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("error getting HTTP options: %w", err)
+	}
+
+	jsonData, err := utils.GetJsonData(settings)
+	if err != nil {
+		return nil, fmt.Errorf("error reading settings: %w", err)
+	}
+	httpMethod, _ := maputil.GetStringOptional(jsonData, "httpMethod")
+
+	opts.Middlewares = middlewares(logger, httpMethod)
+
+	return &opts, nil
+}
+
+func middlewares(logger log.Logger, httpMethod string) []sdkhttpclient.Middleware {
+	middlewares := []sdkhttpclient.Middleware{
+		// TODO: probably isn't needed anymore and should by done by http infra code
+		middleware.CustomQueryParameters(logger),
+	}
+
+	// Needed to control GET vs POST method of the requests
+	if strings.ToLower(httpMethod) == "get" {
+		middlewares = append(middlewares, middleware.ForceHttpGet(logger))
+	}
+
+	return middlewares
+}
diff --git a/pkg/promlib/client/transport_test.go b/pkg/promlib/client/transport_test.go
new file mode 100644
index 0000000000000..fcf3b11546890
--- /dev/null
+++ b/pkg/promlib/client/transport_test.go
@@ -0,0 +1,27 @@
+package client
+
+import (
+	"context"
+	"net/http"
+	"testing"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/stretchr/testify/require"
+)
+
+func TestCreateTransportOptions(t *testing.T) {
+	t.Run("creates correct options object", func(t *testing.T) {
+		settings := backend.DataSourceInstanceSettings{
+			BasicAuthEnabled: false,
+			BasicAuthUser:    "",
+			JSONData:         []byte(`{"httpHeaderName1": "foo"}`),
+			DecryptedSecureJSONData: map[string]string{
+				"httpHeaderValue1": "bar",
+			},
+		}
+		opts, err := CreateTransportOptions(context.Background(), settings, backend.NewLoggerWith("logger", "test"))
+		require.NoError(t, err)
+		require.Equal(t, http.Header{"Foo": []string{"bar"}}, opts.Header)
+		require.Equal(t, 1, len(opts.Middlewares))
+	})
+}
diff --git a/pkg/promlib/converter/prom.go b/pkg/promlib/converter/prom.go
new file mode 100644
index 0000000000000..7b5cd6b95f61f
--- /dev/null
+++ b/pkg/promlib/converter/prom.go
@@ -0,0 +1,1175 @@
+package converter
+
+import (
+	"encoding/json"
+	"fmt"
+	"strconv"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	sdkjsoniter "github.com/grafana/grafana-plugin-sdk-go/data/utils/jsoniter"
+	jsoniter "github.com/json-iterator/go"
+
+	"golang.org/x/exp/slices"
+)
+
+// helpful while debugging all the options that may appear
+func logf(format string, a ...any) {
+	// fmt.Printf(format, a...)
+}
+
+type Options struct {
+	Dataplane bool
+}
+
+func rspErr(e error) backend.DataResponse {
+	return backend.DataResponse{Error: e}
+}
+
+// ReadPrometheusStyleResult will read results from a prometheus or loki server and return data frames
+func ReadPrometheusStyleResult(jIter *jsoniter.Iterator, opt Options) backend.DataResponse {
+	iter := sdkjsoniter.NewIterator(jIter)
+	var rsp backend.DataResponse
+	status := "unknown"
+	errorType := ""
+	promErrString := ""
+	warnings := []data.Notice{}
+
+l1Fields:
+	for l1Field, err := iter.ReadObject(); ; l1Field, err = iter.ReadObject() {
+		if err != nil {
+			return rspErr(err)
+		}
+		switch l1Field {
+		case "status":
+			if status, err = iter.ReadString(); err != nil {
+				return rspErr(err)
+			}
+
+		case "data":
+			rsp = readPrometheusData(iter, opt)
+			if rsp.Error != nil {
+				return rsp
+			}
+
+		case "error":
+			if promErrString, err = iter.ReadString(); err != nil {
+				return rspErr(err)
+			}
+
+		case "errorType":
+			if errorType, err = iter.ReadString(); err != nil {
+				return rspErr(err)
+			}
+
+		case "warnings":
+			if warnings, err = readWarnings(iter); err != nil {
+				return rspErr(err)
+			}
+
+		case "":
+			if err != nil {
+				return rspErr(err)
+			}
+			break l1Fields
+
+		default:
+			v, err := iter.Read()
+			if err != nil {
+				rsp.Error = err
+				return rsp
+			}
+			logf("[ROOT] TODO, support key: %s / %v\n", l1Field, v)
+		}
+	}
+
+	if status == "error" {
+		return backend.DataResponse{
+			Error: fmt.Errorf("%s: %s", errorType, promErrString),
+		}
+	}
+
+	if len(warnings) > 0 {
+		for _, frame := range rsp.Frames {
+			if frame.Meta == nil {
+				frame.Meta = &data.FrameMeta{}
+			}
+			frame.Meta.Notices = warnings
+		}
+	}
+
+	return rsp
+}
+
+func readWarnings(iter *sdkjsoniter.Iterator) ([]data.Notice, error) {
+	warnings := []data.Notice{}
+	next, err := iter.WhatIsNext()
+	if err != nil {
+		return nil, err
+	}
+
+	if next != sdkjsoniter.ArrayValue {
+		return warnings, nil
+	}
+
+	for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+		if err != nil {
+			return nil, err
+		}
+		next, err := iter.WhatIsNext()
+		if err != nil {
+			return nil, err
+		}
+		if next == sdkjsoniter.StringValue {
+			s, err := iter.ReadString()
+			if err != nil {
+				return nil, err
+			}
+			notice := data.Notice{
+				Severity: data.NoticeSeverityWarning,
+				Text:     s,
+			}
+			warnings = append(warnings, notice)
+		}
+	}
+
+	return warnings, nil
+}
+
+func readPrometheusData(iter *sdkjsoniter.Iterator, opt Options) backend.DataResponse {
+	var rsp backend.DataResponse
+	t, err := iter.WhatIsNext()
+	if err != nil {
+		return rspErr(err)
+	}
+
+	if t == sdkjsoniter.ArrayValue {
+		return readArrayData(iter)
+	}
+
+	if t != sdkjsoniter.ObjectValue {
+		return backend.DataResponse{
+			Error: fmt.Errorf("expected object type"),
+		}
+	}
+
+	resultType := ""
+	resultTypeFound := false
+	var resultBytes []byte
+
+	encodingFlags := make([]string, 0)
+
+l1Fields:
+	for l1Field, err := iter.ReadObject(); ; l1Field, err = iter.ReadObject() {
+		if err != nil {
+			return rspErr(err)
+		}
+		switch l1Field {
+		case "encodingFlags":
+			for ok, err := iter.ReadArray(); ok; ok, err = iter.ReadArray() {
+				if err != nil {
+					return rspErr(err)
+				}
+				encodingFlag, err := iter.ReadString()
+				if err != nil {
+					return rspErr(err)
+				}
+				encodingFlags = append(encodingFlags, encodingFlag)
+			}
+			if err != nil {
+				return rspErr(err)
+			}
+		case "resultType":
+			resultType, err = iter.ReadString()
+			if err != nil {
+				return rspErr(err)
+			}
+			resultTypeFound = true
+
+			// if we have saved resultBytes we will parse them here
+			// we saved them because when we had them we don't know the resultType
+			if len(resultBytes) > 0 {
+				ji := sdkjsoniter.NewIterator(jsoniter.ParseBytes(sdkjsoniter.ConfigDefault, resultBytes))
+				rsp = readResult(resultType, rsp, ji, opt, encodingFlags)
+			}
+		case "result":
+			// for some rare cases resultType is coming after the result.
+			// when that happens we save the bytes and parse them after reading resultType
+			// see: https://github.com/grafana/grafana/issues/64693
+			if resultTypeFound {
+				rsp = readResult(resultType, rsp, iter, opt, encodingFlags)
+			} else {
+				resultBytes, _ = iter.SkipAndReturnBytes()
+			}
+
+		case "stats":
+			v, err := iter.Read()
+			if err != nil {
+				rspErr(err)
+			}
+			if len(rsp.Frames) > 0 {
+				meta := rsp.Frames[0].Meta
+				if meta == nil {
+					meta = &data.FrameMeta{}
+					rsp.Frames[0].Meta = meta
+				}
+				meta.Custom = map[string]any{
+					"stats": v,
+				}
+			}
+
+		case "":
+			if err != nil {
+				return rspErr(err)
+			}
+			if !resultTypeFound {
+				return rspErr(fmt.Errorf("no resultType found"))
+			}
+			break l1Fields
+
+		default:
+			v, err := iter.Read()
+			if err != nil {
+				return rspErr(err)
+			}
+			logf("[data] TODO, support key: %s / %v\n", l1Field, v)
+		}
+	}
+
+	return rsp
+}
+
+// will read the result object based on the resultType and return a DataResponse
+func readResult(resultType string, rsp backend.DataResponse, iter *sdkjsoniter.Iterator, opt Options, encodingFlags []string) backend.DataResponse {
+	switch resultType {
+	case "matrix", "vector":
+		rsp = readMatrixOrVectorMulti(iter, resultType, opt)
+		if rsp.Error != nil {
+			return rsp
+		}
+	case "streams":
+		if slices.Contains(encodingFlags, "categorize-labels") {
+			rsp = readCategorizedStream(iter)
+		} else {
+			rsp = readStream(iter)
+		}
+		if rsp.Error != nil {
+			return rsp
+		}
+	case "string":
+		rsp = readString(iter)
+		if rsp.Error != nil {
+			return rsp
+		}
+	case "scalar":
+		rsp = readScalar(iter, opt.Dataplane)
+		if rsp.Error != nil {
+			return rsp
+		}
+	default:
+		if err := iter.Skip(); err != nil {
+			return rspErr(err)
+		}
+		rsp = backend.DataResponse{
+			Error: fmt.Errorf("unknown result type: %s", resultType),
+		}
+	}
+	return rsp
+}
+
+// will return strings or exemplars
+func readArrayData(iter *sdkjsoniter.Iterator) backend.DataResponse {
+	lookup := make(map[string]*data.Field)
+
+	var labelFrame *data.Frame
+	rsp := backend.DataResponse{}
+
+	stringField := data.NewFieldFromFieldType(data.FieldTypeString, 0)
+	stringField.Name = "Value"
+	for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+		if err != nil {
+			rspErr(err)
+		}
+
+		next, err := iter.WhatIsNext()
+		if err != nil {
+			return rspErr(err)
+		}
+
+		switch next {
+		case sdkjsoniter.StringValue:
+			s, err := iter.ReadString()
+			if err != nil {
+				return rspErr(err)
+			}
+			stringField.Append(s)
+
+		// Either label or exemplars
+		case sdkjsoniter.ObjectValue:
+			exemplar, labelPairs, err := readLabelsOrExemplars(iter)
+			if err != nil {
+				rspErr(err)
+			}
+			if exemplar != nil {
+				rsp.Frames = append(rsp.Frames, exemplar)
+			} else if labelPairs != nil {
+				max := 0
+				for _, pair := range labelPairs {
+					k := pair[0]
+					v := pair[1]
+					f, ok := lookup[k]
+					if !ok {
+						f = data.NewFieldFromFieldType(data.FieldTypeString, 0)
+						f.Name = k
+						lookup[k] = f
+
+						if labelFrame == nil {
+							labelFrame = data.NewFrame("")
+							rsp.Frames = append(rsp.Frames, labelFrame)
+						}
+						labelFrame.Fields = append(labelFrame.Fields, f)
+					}
+					f.Append(fmt.Sprintf("%v", v))
+					if f.Len() > max {
+						max = f.Len()
+					}
+				}
+
+				// Make sure all fields have equal length
+				for _, f := range lookup {
+					diff := max - f.Len()
+					if diff > 0 {
+						f.Extend(diff)
+					}
+				}
+			}
+
+		default:
+			{
+				ext, err := iter.ReadAny()
+				if err != nil {
+					rspErr(err)
+				}
+				v := fmt.Sprintf("%v", ext)
+				stringField.Append(v)
+			}
+		}
+	}
+
+	if stringField.Len() > 0 {
+		rsp.Frames = append(rsp.Frames, data.NewFrame("", stringField))
+	}
+
+	return rsp
+}
+
+// For consistent ordering read values to an array not a map
+func readLabelsAsPairs(iter *sdkjsoniter.Iterator) ([][2]string, error) {
+	pairs := make([][2]string, 0, 10)
+	for k, err := iter.ReadObject(); k != ""; k, err = iter.ReadObject() {
+		if err != nil {
+			return nil, err
+		}
+		v, err := iter.ReadString()
+		if err != nil {
+			return nil, err
+		}
+		pairs = append(pairs, [2]string{k, v})
+	}
+	return pairs, nil
+}
+
+func readLabelsOrExemplars(iter *sdkjsoniter.Iterator) (*data.Frame, [][2]string, error) {
+	pairs := make([][2]string, 0, 10)
+	labels := data.Labels{}
+	var frame *data.Frame
+
+l1Fields:
+	for l1Field, err := iter.ReadObject(); ; l1Field, err = iter.ReadObject() {
+		if err != nil {
+			return nil, nil, err
+		}
+		switch l1Field {
+		case "seriesLabels":
+			err = iter.ReadVal(&labels)
+			if err != nil {
+				return nil, nil, err
+			}
+
+		case "exemplars":
+			lookup := make(map[string]*data.Field)
+			timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
+			timeField.Name = data.TimeSeriesTimeFieldName
+			valueField := data.NewFieldFromFieldType(data.FieldTypeFloat64, 0)
+			valueField.Name = data.TimeSeriesValueFieldName
+			valueField.Labels = labels
+			frame = data.NewFrame("", timeField, valueField)
+			frame.Meta = &data.FrameMeta{
+				Custom: resultTypeToCustomMeta("exemplar"),
+			}
+			exCount := 0
+			for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+				if err != nil {
+					return nil, nil, err
+				}
+				for l2Field, err := iter.ReadObject(); l2Field != ""; l2Field, err = iter.ReadObject() {
+					if err != nil {
+						return nil, nil, err
+					}
+					switch l2Field {
+					// nolint:goconst
+					case "value":
+						s, err := iter.ReadString()
+						if err != nil {
+							return nil, nil, err
+						}
+						v, err := strconv.ParseFloat(s, 64)
+						if err != nil {
+							return nil, nil, err
+						}
+						valueField.Append(v)
+
+					case "timestamp":
+						f, err := iter.ReadFloat64()
+						if err != nil {
+							return nil, nil, err
+						}
+						ts := timeFromFloat(f)
+						timeField.Append(ts)
+
+					case "labels":
+						pairs, err := readLabelsAsPairs(iter)
+						if err != nil {
+							return nil, nil, err
+						}
+						for _, pair := range pairs {
+							k := pair[0]
+							v := pair[1]
+							f, ok := lookup[k]
+							if !ok {
+								f = data.NewFieldFromFieldType(data.FieldTypeString, exCount)
+								f.Name = k
+								lookup[k] = f
+								frame.Fields = append(frame.Fields, f)
+							}
+							f.Append(v)
+						}
+
+						// Make sure all fields have equal length
+						for _, f := range lookup {
+							diff := exCount + 1 - f.Len()
+							if diff > 0 {
+								f.Extend(diff)
+							}
+						}
+
+					default:
+						if err = iter.Skip(); err != nil {
+							return nil, nil, err
+						}
+
+						frame.AppendNotices(data.Notice{
+							Severity: data.NoticeSeverityError,
+							Text:     fmt.Sprintf("unable to parse key: %s in response body", l2Field),
+						})
+					}
+				}
+				exCount++
+			}
+		case "":
+			if err != nil {
+				return nil, nil, err
+			}
+			break l1Fields
+
+		default:
+			iV, err := iter.Read()
+			if err != nil {
+				return nil, nil, err
+			}
+			v := fmt.Sprintf("%v", iV)
+			pairs = append(pairs, [2]string{l1Field, v})
+		}
+	}
+
+	return frame, pairs, nil
+}
+
+func readString(iter *sdkjsoniter.Iterator) backend.DataResponse {
+	timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
+	timeField.Name = data.TimeSeriesTimeFieldName
+	valueField := data.NewFieldFromFieldType(data.FieldTypeString, 0)
+	valueField.Name = data.TimeSeriesValueFieldName
+	valueField.Labels = data.Labels{}
+
+	_, err := iter.ReadArray()
+	if err != nil {
+		return rspErr(err)
+	}
+
+	var t float64
+	if t, err = iter.ReadFloat64(); err != nil {
+		return rspErr(err)
+	}
+
+	if _, err = iter.ReadArray(); err != nil {
+		return rspErr(err)
+	}
+
+	var v string
+	if v, err = iter.ReadString(); err != nil {
+		return rspErr(err)
+	}
+
+	if _, err = iter.ReadArray(); err != nil {
+		return rspErr(err)
+	}
+
+	tt := timeFromFloat(t)
+	timeField.Append(tt)
+	valueField.Append(v)
+
+	frame := data.NewFrame("", timeField, valueField)
+	frame.Meta = &data.FrameMeta{
+		Type:   data.FrameTypeTimeSeriesMulti,
+		Custom: resultTypeToCustomMeta("string"),
+	}
+
+	return backend.DataResponse{
+		Frames: []*data.Frame{frame},
+	}
+}
+
+func readScalar(iter *sdkjsoniter.Iterator, dataPlane bool) backend.DataResponse {
+	rsp := backend.DataResponse{}
+
+	timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
+	timeField.Name = data.TimeSeriesTimeFieldName
+	valueField := data.NewFieldFromFieldType(data.FieldTypeFloat64, 0)
+	valueField.Name = data.TimeSeriesValueFieldName
+	valueField.Labels = data.Labels{}
+
+	t, v, err := readTimeValuePair(iter)
+	if err != nil {
+		rsp.Error = err
+		return rsp
+	}
+	timeField.Append(t)
+	valueField.Append(v)
+
+	frame := data.NewFrame("", timeField, valueField)
+	frame.Meta = &data.FrameMeta{
+		Type:   data.FrameTypeNumericMulti,
+		Custom: resultTypeToCustomMeta("scalar"),
+	}
+
+	if dataPlane {
+		frame.Meta.TypeVersion = data.FrameTypeVersion{0, 1}
+	}
+
+	return backend.DataResponse{
+		Frames: []*data.Frame{frame},
+	}
+}
+
+func readMatrixOrVectorMulti(iter *sdkjsoniter.Iterator, resultType string, opt Options) backend.DataResponse {
+	rsp := backend.DataResponse{}
+
+	for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+		if err != nil {
+			return rspErr(err)
+		}
+		timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
+		timeField.Name = data.TimeSeriesTimeFieldName
+		valueField := data.NewFieldFromFieldType(data.FieldTypeFloat64, 0)
+		valueField.Name = data.TimeSeriesValueFieldName
+		valueField.Labels = data.Labels{}
+
+		var histogram *histogramInfo
+
+		for l1Field, err := iter.ReadObject(); l1Field != ""; l1Field, err = iter.ReadObject() {
+			if err != nil {
+				return rspErr(err)
+			}
+			switch l1Field {
+			case "metric":
+				if err = iter.ReadVal(&valueField.Labels); err != nil {
+					return rspErr(err)
+				}
+
+			case "value":
+				t, v, err := readTimeValuePair(iter)
+				if err != nil {
+					return rspErr(err)
+				}
+				timeField.Append(t)
+				valueField.Append(v)
+
+			// nolint:goconst
+			case "values":
+				for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+					if err != nil {
+						return rspErr(err)
+					}
+					t, v, err := readTimeValuePair(iter)
+					if err != nil {
+						return rspErr(err)
+					}
+					timeField.Append(t)
+					valueField.Append(v)
+				}
+
+			case "histogram":
+				if histogram == nil {
+					histogram = newHistogramInfo()
+				}
+				err = readHistogram(iter, histogram)
+				if err != nil {
+					return rspErr(err)
+				}
+
+			case "histograms":
+				if histogram == nil {
+					histogram = newHistogramInfo()
+				}
+				for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+					if err != nil {
+						return rspErr(err)
+					}
+					if err = readHistogram(iter, histogram); err != nil {
+						return rspErr(err)
+					}
+				}
+
+			default:
+				if err = iter.Skip(); err != nil {
+					return rspErr(err)
+				}
+				logf("readMatrixOrVector: %s\n", l1Field)
+			}
+		}
+
+		if histogram != nil {
+			histogram.yMin.Labels = valueField.Labels
+			frame := data.NewFrame(valueField.Name, histogram.time, histogram.yMin, histogram.yMax, histogram.count, histogram.yLayout)
+			frame.Meta = &data.FrameMeta{
+				Type: "heatmap-cells",
+			}
+			if frame.Name == data.TimeSeriesValueFieldName {
+				frame.Name = "" // only set the name if useful
+			}
+			rsp.Frames = append(rsp.Frames, frame)
+		} else {
+			frame := data.NewFrame("", timeField, valueField)
+			frame.Meta = &data.FrameMeta{
+				Type:   data.FrameTypeTimeSeriesMulti,
+				Custom: resultTypeToCustomMeta(resultType),
+			}
+			if opt.Dataplane && resultType == "vector" {
+				frame.Meta.Type = data.FrameTypeNumericMulti
+			}
+			if opt.Dataplane {
+				frame.Meta.TypeVersion = data.FrameTypeVersion{0, 1}
+			}
+			rsp.Frames = append(rsp.Frames, frame)
+		}
+	}
+
+	return rsp
+}
+
+func readTimeValuePair(iter *sdkjsoniter.Iterator) (time.Time, float64, error) {
+	if _, err := iter.ReadArray(); err != nil {
+		return time.Time{}, 0, err
+	}
+
+	t, err := iter.ReadFloat64()
+	if err != nil {
+		return time.Time{}, 0, err
+	}
+
+	if _, err = iter.ReadArray(); err != nil {
+		return time.Time{}, 0, err
+	}
+
+	var v string
+	if v, err = iter.ReadString(); err != nil {
+		return time.Time{}, 0, err
+	}
+
+	if _, err = iter.ReadArray(); err != nil {
+		return time.Time{}, 0, err
+	}
+
+	tt := timeFromFloat(t)
+	fv, err := strconv.ParseFloat(v, 64)
+	return tt, fv, err
+}
+
+type histogramInfo struct {
+	// XMax (time)	YMin	Ymax	Count	YLayout
+	time    *data.Field
+	yMin    *data.Field // will have labels?
+	yMax    *data.Field
+	count   *data.Field
+	yLayout *data.Field
+}
+
+func newHistogramInfo() *histogramInfo {
+	hist := &histogramInfo{
+		time:    data.NewFieldFromFieldType(data.FieldTypeTime, 0),
+		yMin:    data.NewFieldFromFieldType(data.FieldTypeFloat64, 0),
+		yMax:    data.NewFieldFromFieldType(data.FieldTypeFloat64, 0),
+		count:   data.NewFieldFromFieldType(data.FieldTypeFloat64, 0),
+		yLayout: data.NewFieldFromFieldType(data.FieldTypeInt8, 0),
+	}
+	hist.time.Name = "xMax"
+	hist.yMin.Name = "yMin"
+	hist.yMax.Name = "yMax"
+	hist.count.Name = "count"
+	hist.yLayout.Name = "yLayout"
+	return hist
+}
+
+// This will read a single sparse histogram
+// [ time, { count, sum, buckets: [...] }]
+func readHistogram(iter *sdkjsoniter.Iterator, hist *histogramInfo) error {
+	// first element
+	if _, err := iter.ReadArray(); err != nil {
+		return err
+	}
+
+	f, err := iter.ReadFloat64()
+	if err != nil {
+		return err
+	}
+	t := timeFromFloat(f)
+
+	// next object element
+	if _, err := iter.ReadArray(); err != nil {
+		return err
+	}
+
+	for l1Field, err := iter.ReadObject(); l1Field != ""; l1Field, err = iter.ReadObject() {
+		if err != nil {
+			return err
+		}
+		switch l1Field {
+		case "count":
+			if err = iter.Skip(); err != nil {
+				return err
+			}
+		case "sum":
+			if err = iter.Skip(); err != nil {
+				return err
+			}
+
+		case "buckets":
+			for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+				if err != nil {
+					return err
+				}
+				hist.time.Append(t)
+
+				if _, err := iter.ReadArray(); err != nil {
+					return err
+				}
+
+				v, err := iter.ReadInt8()
+				if err != nil {
+					return err
+				}
+				hist.yLayout.Append(v)
+
+				if _, err := iter.ReadArray(); err != nil {
+					return err
+				}
+
+				if err = appendValueFromString(iter, hist.yMin); err != nil {
+					return err
+				}
+
+				if _, err := iter.ReadArray(); err != nil {
+					return err
+				}
+
+				err = appendValueFromString(iter, hist.yMax)
+				if err != nil {
+					return err
+				}
+
+				if _, err := iter.ReadArray(); err != nil {
+					return err
+				}
+
+				err = appendValueFromString(iter, hist.count)
+				if err != nil {
+					return err
+				}
+
+				for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+					if err != nil {
+						return err
+					}
+					return fmt.Errorf("expected close array")
+				}
+			}
+
+		default:
+			if err = iter.Skip(); err != nil {
+				return err
+			}
+			logf("[SKIP]readHistogram: %s\n", l1Field)
+		}
+	}
+
+	if more, err := iter.ReadArray(); more || err != nil {
+		if err != nil {
+			return err
+		}
+		return fmt.Errorf("expected to be done")
+	}
+
+	return nil
+}
+
+func appendValueFromString(iter *sdkjsoniter.Iterator, field *data.Field) error {
+	var err error
+	var s string
+	if s, err = iter.ReadString(); err != nil {
+		return err
+	}
+
+	var v float64
+	if v, err = strconv.ParseFloat(s, 64); err != nil {
+		return err
+	}
+
+	field.Append(v)
+	return nil
+}
+
+func readStream(iter *sdkjsoniter.Iterator) backend.DataResponse {
+	rsp := backend.DataResponse{}
+
+	labelsField := data.NewFieldFromFieldType(data.FieldTypeJSON, 0)
+	labelsField.Name = "__labels" // avoid automatically spreading this by labels
+
+	timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
+	timeField.Name = "Time"
+
+	lineField := data.NewFieldFromFieldType(data.FieldTypeString, 0)
+	lineField.Name = "Line"
+
+	// Nanoseconds time field
+	tsField := data.NewFieldFromFieldType(data.FieldTypeString, 0)
+	tsField.Name = "TS"
+
+	labels := data.Labels{}
+	labelJson, err := labelsToRawJson(labels)
+	if err != nil {
+		return backend.DataResponse{Error: err}
+	}
+
+	for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+		if err != nil {
+			rspErr(err)
+		}
+
+	l1Fields:
+		for l1Field, err := iter.ReadObject(); ; l1Field, err = iter.ReadObject() {
+			if err != nil {
+				return rspErr(err)
+			}
+			switch l1Field {
+			case "stream":
+				// we need to clear `labels`, because `iter.ReadVal`
+				// only appends to it
+				labels := data.Labels{}
+				if err = iter.ReadVal(&labels); err != nil {
+					return rspErr(err)
+				}
+
+				if labelJson, err = labelsToRawJson(labels); err != nil {
+					return rspErr(err)
+				}
+
+			case "values":
+				for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+					if err != nil {
+						rsp.Error = err
+						return rsp
+					}
+
+					if _, err = iter.ReadArray(); err != nil {
+						return rspErr(err)
+					}
+
+					ts, err := iter.ReadString()
+					if err != nil {
+						return rspErr(err)
+					}
+
+					if _, err = iter.ReadArray(); err != nil {
+						return rspErr(err)
+					}
+
+					line, err := iter.ReadString()
+					if err != nil {
+						return rspErr(err)
+					}
+
+					if _, err = iter.ReadArray(); err != nil {
+						return rspErr(err)
+					}
+
+					t, err := timeFromLokiString(ts)
+					if err != nil {
+						return rspErr(err)
+					}
+
+					labelsField.Append(labelJson)
+					timeField.Append(t)
+					lineField.Append(line)
+					tsField.Append(ts)
+				}
+			case "":
+				if err != nil {
+					return rspErr(err)
+				}
+				break l1Fields
+			}
+		}
+	}
+
+	frame := data.NewFrame("", labelsField, timeField, lineField, tsField)
+	frame.Meta = &data.FrameMeta{}
+	rsp.Frames = append(rsp.Frames, frame)
+
+	return rsp
+}
+
+func readCategorizedStream(iter *sdkjsoniter.Iterator) backend.DataResponse {
+	rsp := backend.DataResponse{}
+
+	labelsField := data.NewFieldFromFieldType(data.FieldTypeJSON, 0)
+	labelsField.Name = "__labels" // avoid automatically spreading this by labels
+
+	labelTypesField := data.NewFieldFromFieldType(data.FieldTypeJSON, 0)
+	labelTypesField.Name = "__labelTypes" // avoid automatically spreading this by labels
+
+	timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
+	timeField.Name = "Time"
+
+	lineField := data.NewFieldFromFieldType(data.FieldTypeString, 0)
+	lineField.Name = "Line"
+
+	// Nanoseconds time field
+	tsField := data.NewFieldFromFieldType(data.FieldTypeString, 0)
+	tsField.Name = "TS"
+
+	indexedLabels := data.Labels{}
+
+	for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+		if err != nil {
+			rspErr(err)
+		}
+
+	l1Fields:
+		for l1Field, err := iter.ReadObject(); ; l1Field, err = iter.ReadObject() {
+			if err != nil {
+				return rspErr(err)
+			}
+			switch l1Field {
+			case "stream":
+				// we need to clear `labels`, because `iter.ReadVal`
+				// only appends to it
+				indexedLabels = data.Labels{}
+				if err = iter.ReadVal(&indexedLabels); err != nil {
+					return rspErr(err)
+				}
+
+			case "values":
+				for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+					if err != nil {
+						rsp.Error = err
+						return rsp
+					}
+
+					if _, err = iter.ReadArray(); err != nil {
+						return rspErr(err)
+					}
+
+					ts, err := iter.ReadString()
+					if err != nil {
+						return rspErr(err)
+					}
+
+					if _, err = iter.ReadArray(); err != nil {
+						return rspErr(err)
+					}
+
+					line, err := iter.ReadString()
+					if err != nil {
+						return rspErr(err)
+					}
+
+					if _, err = iter.ReadArray(); err != nil {
+						return rspErr(err)
+					}
+
+					parsedLabelsMap, structuredMetadataMap, err := readCategorizedStreamField(iter)
+					if err != nil {
+						return rspErr(err)
+					}
+
+					if _, err = iter.ReadArray(); err != nil {
+						return rspErr(err)
+					}
+
+					t, err := timeFromLokiString(ts)
+					if err != nil {
+						return rspErr(err)
+					}
+
+					typeMap := data.Labels{}
+					clonedLabels := data.Labels{}
+
+					for k := range indexedLabels {
+						typeMap[k] = "I"
+						clonedLabels[k] = indexedLabels[k]
+					}
+
+					// merge all labels (indexed, parsed, structuredMetadata) into one dataframe field
+					for k, v := range structuredMetadataMap {
+						clonedLabels[k] = fmt.Sprintf("%s", v)
+						typeMap[k] = "S"
+					}
+
+					for k, v := range parsedLabelsMap {
+						clonedLabels[k] = fmt.Sprintf("%s", v)
+						typeMap[k] = "P"
+					}
+
+					labelJson, err := labelsToRawJson(clonedLabels)
+					if err != nil {
+						return rspErr(err)
+					}
+
+					labelTypesJson, err := labelsToRawJson(typeMap)
+					if err != nil {
+						return rspErr(err)
+					}
+
+					labelsField.Append(labelJson)
+					labelTypesField.Append(labelTypesJson)
+					timeField.Append(t)
+					lineField.Append(line)
+					tsField.Append(ts)
+				}
+			case "":
+				if err != nil {
+					return rspErr(err)
+				}
+				break l1Fields
+			}
+		}
+	}
+
+	frame := data.NewFrame("", labelsField, timeField, lineField, tsField, labelTypesField)
+	frame.Meta = &data.FrameMeta{}
+	rsp.Frames = append(rsp.Frames, frame)
+
+	return rsp
+}
+
+func readCategorizedStreamField(iter *sdkjsoniter.Iterator) (map[string]interface{}, map[string]interface{}, error) {
+	parsedLabels := data.Labels{}
+	structuredMetadata := data.Labels{}
+	var parsedLabelsMap map[string]interface{}
+	var structuredMetadataMap map[string]interface{}
+streamField:
+	for streamField, err := iter.ReadObject(); ; streamField, err = iter.ReadObject() {
+		if err != nil {
+			return nil, nil, err
+		}
+		switch streamField {
+		case "parsed":
+			if err = iter.ReadVal(&parsedLabels); err != nil {
+				return nil, nil, err
+			}
+		case "structuredMetadata":
+			if err = iter.ReadVal(&structuredMetadata); err != nil {
+				return nil, nil, err
+			}
+		case "":
+			if err != nil {
+				return nil, nil, err
+			}
+			if parsedLabelsMap, err = labelsToMap(parsedLabels); err != nil {
+				return nil, nil, err
+			}
+			if structuredMetadataMap, err = labelsToMap(structuredMetadata); err != nil {
+				return nil, nil, err
+			}
+			break streamField
+		}
+	}
+	return parsedLabelsMap, structuredMetadataMap, nil
+}
+
+func resultTypeToCustomMeta(resultType string) map[string]string {
+	return map[string]string{"resultType": resultType}
+}
+
+func timeFromFloat(fv float64) time.Time {
+	return time.UnixMilli(int64(fv * 1000.0)).UTC()
+}
+
+func timeFromLokiString(str string) (time.Time, error) {
+	// normal time values look like: 1645030246277587968
+	// and are less than: math.MaxInt65=9223372036854775807
+	// This will do a fast path for any date before 2033
+	s := len(str)
+	if s < 19 || (s == 19 && str[0] == '1') {
+		ns, err := strconv.ParseInt(str, 10, 64)
+		if err == nil {
+			return time.Unix(0, ns).UTC(), nil
+		}
+	}
+
+	if s < 10 {
+		return time.Time{}, fmt.Errorf("unexpected time format '%v' in response. response may have been truncated", str)
+	}
+
+	ss, _ := strconv.ParseInt(str[0:10], 10, 64)
+	ns, _ := strconv.ParseInt(str[10:], 10, 64)
+	return time.Unix(ss, ns).UTC(), nil
+}
+
+func labelsToRawJson(labels data.Labels) (json.RawMessage, error) {
+	// data.Labels when converted to JSON keep the fields sorted
+	bytes, err := jsoniter.Marshal(labels)
+	if err != nil {
+		return nil, err
+	}
+
+	return json.RawMessage(bytes), nil
+}
+
+func labelsToMap(labels data.Labels) (map[string]interface{}, error) {
+	// data.Labels when converted to JSON keep the fields sorted
+	labelJson, err := labelsToRawJson(labels)
+	if err != nil {
+		return nil, err
+	}
+
+	var labelMap map[string]interface{}
+	err = jsoniter.Unmarshal(labelJson, &labelMap)
+	if err != nil {
+		return nil, err
+	}
+
+	return labelMap, nil
+}
diff --git a/pkg/promlib/converter/prom_test.go b/pkg/promlib/converter/prom_test.go
new file mode 100644
index 0000000000000..76dd73a2be35b
--- /dev/null
+++ b/pkg/promlib/converter/prom_test.go
@@ -0,0 +1,86 @@
+package converter
+
+import (
+	"os"
+	"path"
+	"strings"
+	"testing"
+	"time"
+
+	sdkjsoniter "github.com/grafana/grafana-plugin-sdk-go/data/utils/jsoniter"
+	"github.com/grafana/grafana-plugin-sdk-go/experimental"
+	jsoniter "github.com/json-iterator/go"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+const update = false
+
+var files = []string{
+	"prom-labels",
+	"prom-matrix",
+	"prom-matrix-with-nans",
+	"prom-matrix-histogram-no-labels",
+	"prom-matrix-histogram-partitioned",
+	"prom-vector-histogram-no-labels",
+	"prom-vector",
+	"prom-string",
+	"prom-scalar",
+	"prom-series",
+	"prom-warnings",
+	"prom-error",
+	"prom-exemplars-a",
+	"prom-exemplars-b",
+	"prom-exemplars-diff-labels",
+	"loki-streams-a",
+	"loki-streams-b",
+	"loki-streams-c",
+}
+
+func TestReadPromFrames(t *testing.T) {
+	for _, name := range files {
+		t.Run(name, runScenario(name, Options{}))
+	}
+}
+
+func runScenario(name string, opts Options) func(t *testing.T) {
+	return func(t *testing.T) {
+		// Safe to disable, this is a test.
+		// nolint:gosec
+		f, err := os.Open(path.Join("testdata", name+".json"))
+		require.NoError(t, err)
+
+		iter := jsoniter.Parse(sdkjsoniter.ConfigDefault, f, 1024)
+		rsp := ReadPrometheusStyleResult(iter, opts)
+
+		if strings.Contains(name, "error") {
+			require.Error(t, rsp.Error)
+			return
+		}
+		require.NoError(t, rsp.Error)
+
+		fname := name + "-frame"
+		experimental.CheckGoldenJSONResponse(t, "testdata", fname, &rsp, update)
+	}
+}
+
+func TestTimeConversions(t *testing.T) {
+	// include millisecond precision
+	assert.Equal(t,
+		time.Date(2020, time.September, 14, 15, 22, 25, 479000000, time.UTC),
+		timeFromFloat(1600096945.479))
+
+	ti, err := timeFromLokiString("1645030246277587968")
+	require.NoError(t, err)
+	// Loki date parsing
+	assert.Equal(t,
+		time.Date(2022, time.February, 16, 16, 50, 46, 277587968, time.UTC),
+		ti)
+
+	ti, err = timeFromLokiString("2000000000000000000")
+	require.NoError(t, err)
+
+	assert.Equal(t,
+		time.Date(2033, time.May, 18, 3, 33, 20, 0, time.UTC),
+		ti)
+}
diff --git a/pkg/util/converter/testdata/loki-streams-a-frame.jsonc b/pkg/promlib/converter/testdata/loki-streams-a-frame.jsonc
similarity index 100%
rename from pkg/util/converter/testdata/loki-streams-a-frame.jsonc
rename to pkg/promlib/converter/testdata/loki-streams-a-frame.jsonc
diff --git a/pkg/util/converter/testdata/loki-streams-a.json b/pkg/promlib/converter/testdata/loki-streams-a.json
similarity index 100%
rename from pkg/util/converter/testdata/loki-streams-a.json
rename to pkg/promlib/converter/testdata/loki-streams-a.json
diff --git a/pkg/util/converter/testdata/loki-streams-b-frame.jsonc b/pkg/promlib/converter/testdata/loki-streams-b-frame.jsonc
similarity index 100%
rename from pkg/util/converter/testdata/loki-streams-b-frame.jsonc
rename to pkg/promlib/converter/testdata/loki-streams-b-frame.jsonc
diff --git a/pkg/util/converter/testdata/loki-streams-b.json b/pkg/promlib/converter/testdata/loki-streams-b.json
similarity index 100%
rename from pkg/util/converter/testdata/loki-streams-b.json
rename to pkg/promlib/converter/testdata/loki-streams-b.json
diff --git a/pkg/util/converter/testdata/loki-streams-c-frame.jsonc b/pkg/promlib/converter/testdata/loki-streams-c-frame.jsonc
similarity index 100%
rename from pkg/util/converter/testdata/loki-streams-c-frame.jsonc
rename to pkg/promlib/converter/testdata/loki-streams-c-frame.jsonc
diff --git a/pkg/util/converter/testdata/loki-streams-c.json b/pkg/promlib/converter/testdata/loki-streams-c.json
similarity index 100%
rename from pkg/util/converter/testdata/loki-streams-c.json
rename to pkg/promlib/converter/testdata/loki-streams-c.json
diff --git a/pkg/promlib/converter/testdata/loki-streams-structured-metadata-frame.jsonc b/pkg/promlib/converter/testdata/loki-streams-structured-metadata-frame.jsonc
new file mode 100644
index 0000000000000..157801992626f
--- /dev/null
+++ b/pkg/promlib/converter/testdata/loki-streams-structured-metadata-frame.jsonc
@@ -0,0 +1,97 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ]
+//  }
+//  Name: 
+//  Dimensions: 5 Fields by 1 Rows
+//  +----------------------------------------+-----------------------------------+----------------+---------------------+--------------------------------+
+//  | Name: __labels                         | Name: Time                        | Name: Line     | Name: TS            | Name: __labelTypes             |
+//  | Labels:                                | Labels:                           | Labels:        | Labels:             | Labels:                        |
+//  | Type: []json.RawMessage                | Type: []time.Time                 | Type: []string | Type: []string      | Type: []json.RawMessage        |
+//  +----------------------------------------+-----------------------------------+----------------+---------------------+--------------------------------+
+//  | {"label":"value","nonIndexed":"value"} | 2023-10-11 11:55:10.236 +0000 UTC | text           | 1697025310236000000 | {"nonIndexed":"S","label":"I"} |
+//  +----------------------------------------+-----------------------------------+----------------+---------------------+--------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ]
+        },
+        "fields": [
+          {
+            "name": "__labels",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage"
+            }
+          },
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Line",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "TS",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "__labelTypes",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            {
+              "label": "value",
+              "nonIndexed": "value"
+            }
+          ],
+          [
+            1697025310236
+          ],
+          [
+            "text"
+          ],
+          [
+            "1697025310236000000"
+          ],
+          [
+            {
+              "nonIndexed": "S",
+              "label": "I"
+            }
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/promlib/converter/testdata/loki-streams-structured-metadata.json b/pkg/promlib/converter/testdata/loki-streams-structured-metadata.json
new file mode 100644
index 0000000000000..88401d4cb5e13
--- /dev/null
+++ b/pkg/promlib/converter/testdata/loki-streams-structured-metadata.json
@@ -0,0 +1,27 @@
+{
+  "status": "success",
+  "data": {
+    "encodingFlags": [
+      "categorize-labels"
+    ],
+    "resultType": "streams",
+    "result": [
+      {
+        "stream": {
+          "label": "value"
+        },
+        "values": [
+          [
+            "1697025310236000000",
+            "text",
+            {
+              "structuredMetadata": {
+                "nonIndexed": "value"
+              }
+            }
+          ]
+        ]
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/pkg/util/converter/testdata/prom-error-frame.jsonc b/pkg/promlib/converter/testdata/prom-error-frame.jsonc
similarity index 100%
rename from pkg/util/converter/testdata/prom-error-frame.jsonc
rename to pkg/promlib/converter/testdata/prom-error-frame.jsonc
diff --git a/pkg/util/converter/testdata/prom-error.json b/pkg/promlib/converter/testdata/prom-error.json
similarity index 100%
rename from pkg/util/converter/testdata/prom-error.json
rename to pkg/promlib/converter/testdata/prom-error.json
diff --git a/pkg/util/converter/testdata/prom-exemplars-a-frame.json b/pkg/promlib/converter/testdata/prom-exemplars-a-frame.json
similarity index 100%
rename from pkg/util/converter/testdata/prom-exemplars-a-frame.json
rename to pkg/promlib/converter/testdata/prom-exemplars-a-frame.json
diff --git a/pkg/util/converter/testdata/prom-exemplars-a-frame.jsonc b/pkg/promlib/converter/testdata/prom-exemplars-a-frame.jsonc
similarity index 100%
rename from pkg/util/converter/testdata/prom-exemplars-a-frame.jsonc
rename to pkg/promlib/converter/testdata/prom-exemplars-a-frame.jsonc
diff --git a/pkg/util/converter/testdata/prom-exemplars-a-golden.txt b/pkg/promlib/converter/testdata/prom-exemplars-a-golden.txt
similarity index 100%
rename from pkg/util/converter/testdata/prom-exemplars-a-golden.txt
rename to pkg/promlib/converter/testdata/prom-exemplars-a-golden.txt
diff --git a/pkg/util/converter/testdata/prom-exemplars-a.json b/pkg/promlib/converter/testdata/prom-exemplars-a.json
similarity index 100%
rename from pkg/util/converter/testdata/prom-exemplars-a.json
rename to pkg/promlib/converter/testdata/prom-exemplars-a.json
diff --git a/pkg/util/converter/testdata/prom-exemplars-b-frame.json b/pkg/promlib/converter/testdata/prom-exemplars-b-frame.json
similarity index 100%
rename from pkg/util/converter/testdata/prom-exemplars-b-frame.json
rename to pkg/promlib/converter/testdata/prom-exemplars-b-frame.json
diff --git a/pkg/util/converter/testdata/prom-exemplars-b-frame.jsonc b/pkg/promlib/converter/testdata/prom-exemplars-b-frame.jsonc
similarity index 100%
rename from pkg/util/converter/testdata/prom-exemplars-b-frame.jsonc
rename to pkg/promlib/converter/testdata/prom-exemplars-b-frame.jsonc
diff --git a/pkg/util/converter/testdata/prom-exemplars-b-golden.txt b/pkg/promlib/converter/testdata/prom-exemplars-b-golden.txt
similarity index 100%
rename from pkg/util/converter/testdata/prom-exemplars-b-golden.txt
rename to pkg/promlib/converter/testdata/prom-exemplars-b-golden.txt
diff --git a/pkg/util/converter/testdata/prom-exemplars-b.json b/pkg/promlib/converter/testdata/prom-exemplars-b.json
similarity index 100%
rename from pkg/util/converter/testdata/prom-exemplars-b.json
rename to pkg/promlib/converter/testdata/prom-exemplars-b.json
diff --git a/pkg/util/converter/testdata/prom-exemplars-diff-labels-frame.jsonc b/pkg/promlib/converter/testdata/prom-exemplars-diff-labels-frame.jsonc
similarity index 100%
rename from pkg/util/converter/testdata/prom-exemplars-diff-labels-frame.jsonc
rename to pkg/promlib/converter/testdata/prom-exemplars-diff-labels-frame.jsonc
diff --git a/pkg/util/converter/testdata/prom-exemplars-diff-labels.json b/pkg/promlib/converter/testdata/prom-exemplars-diff-labels.json
similarity index 100%
rename from pkg/util/converter/testdata/prom-exemplars-diff-labels.json
rename to pkg/promlib/converter/testdata/prom-exemplars-diff-labels.json
diff --git a/pkg/util/converter/testdata/prom-exemplars-frame.jsonc b/pkg/promlib/converter/testdata/prom-exemplars-frame.jsonc
similarity index 100%
rename from pkg/util/converter/testdata/prom-exemplars-frame.jsonc
rename to pkg/promlib/converter/testdata/prom-exemplars-frame.jsonc
diff --git a/pkg/util/converter/testdata/prom-exemplars.json b/pkg/promlib/converter/testdata/prom-exemplars.json
similarity index 100%
rename from pkg/util/converter/testdata/prom-exemplars.json
rename to pkg/promlib/converter/testdata/prom-exemplars.json
diff --git a/pkg/util/converter/testdata/prom-labels-frame.jsonc b/pkg/promlib/converter/testdata/prom-labels-frame.jsonc
similarity index 100%
rename from pkg/util/converter/testdata/prom-labels-frame.jsonc
rename to pkg/promlib/converter/testdata/prom-labels-frame.jsonc
diff --git a/pkg/util/converter/testdata/prom-labels.json b/pkg/promlib/converter/testdata/prom-labels.json
similarity index 100%
rename from pkg/util/converter/testdata/prom-labels.json
rename to pkg/promlib/converter/testdata/prom-labels.json
diff --git a/pkg/util/converter/testdata/prom-matrix-frame.jsonc b/pkg/promlib/converter/testdata/prom-matrix-frame.jsonc
similarity index 100%
rename from pkg/util/converter/testdata/prom-matrix-frame.jsonc
rename to pkg/promlib/converter/testdata/prom-matrix-frame.jsonc
diff --git a/pkg/util/converter/testdata/prom-matrix-histogram-no-labels-frame.jsonc b/pkg/promlib/converter/testdata/prom-matrix-histogram-no-labels-frame.jsonc
similarity index 100%
rename from pkg/util/converter/testdata/prom-matrix-histogram-no-labels-frame.jsonc
rename to pkg/promlib/converter/testdata/prom-matrix-histogram-no-labels-frame.jsonc
diff --git a/pkg/util/converter/testdata/prom-matrix-histogram-no-labels.json b/pkg/promlib/converter/testdata/prom-matrix-histogram-no-labels.json
similarity index 100%
rename from pkg/util/converter/testdata/prom-matrix-histogram-no-labels.json
rename to pkg/promlib/converter/testdata/prom-matrix-histogram-no-labels.json
diff --git a/pkg/util/converter/testdata/prom-matrix-histogram-partitioned-frame.jsonc b/pkg/promlib/converter/testdata/prom-matrix-histogram-partitioned-frame.jsonc
similarity index 100%
rename from pkg/util/converter/testdata/prom-matrix-histogram-partitioned-frame.jsonc
rename to pkg/promlib/converter/testdata/prom-matrix-histogram-partitioned-frame.jsonc
diff --git a/pkg/util/converter/testdata/prom-matrix-histogram-partitioned.json b/pkg/promlib/converter/testdata/prom-matrix-histogram-partitioned.json
similarity index 100%
rename from pkg/util/converter/testdata/prom-matrix-histogram-partitioned.json
rename to pkg/promlib/converter/testdata/prom-matrix-histogram-partitioned.json
diff --git a/pkg/util/converter/testdata/prom-matrix-with-nans-frame.jsonc b/pkg/promlib/converter/testdata/prom-matrix-with-nans-frame.jsonc
similarity index 100%
rename from pkg/util/converter/testdata/prom-matrix-with-nans-frame.jsonc
rename to pkg/promlib/converter/testdata/prom-matrix-with-nans-frame.jsonc
diff --git a/pkg/util/converter/testdata/prom-matrix-with-nans.json b/pkg/promlib/converter/testdata/prom-matrix-with-nans.json
similarity index 100%
rename from pkg/util/converter/testdata/prom-matrix-with-nans.json
rename to pkg/promlib/converter/testdata/prom-matrix-with-nans.json
diff --git a/pkg/util/converter/testdata/prom-matrix.json b/pkg/promlib/converter/testdata/prom-matrix.json
similarity index 100%
rename from pkg/util/converter/testdata/prom-matrix.json
rename to pkg/promlib/converter/testdata/prom-matrix.json
diff --git a/pkg/util/converter/testdata/prom-scalar-frame.jsonc b/pkg/promlib/converter/testdata/prom-scalar-frame.jsonc
similarity index 100%
rename from pkg/util/converter/testdata/prom-scalar-frame.jsonc
rename to pkg/promlib/converter/testdata/prom-scalar-frame.jsonc
diff --git a/pkg/util/converter/testdata/prom-scalar.json b/pkg/promlib/converter/testdata/prom-scalar.json
similarity index 100%
rename from pkg/util/converter/testdata/prom-scalar.json
rename to pkg/promlib/converter/testdata/prom-scalar.json
diff --git a/pkg/util/converter/testdata/prom-series-frame.jsonc b/pkg/promlib/converter/testdata/prom-series-frame.jsonc
similarity index 100%
rename from pkg/util/converter/testdata/prom-series-frame.jsonc
rename to pkg/promlib/converter/testdata/prom-series-frame.jsonc
diff --git a/pkg/util/converter/testdata/prom-series.json b/pkg/promlib/converter/testdata/prom-series.json
similarity index 100%
rename from pkg/util/converter/testdata/prom-series.json
rename to pkg/promlib/converter/testdata/prom-series.json
diff --git a/pkg/util/converter/testdata/prom-string-frame.jsonc b/pkg/promlib/converter/testdata/prom-string-frame.jsonc
similarity index 100%
rename from pkg/util/converter/testdata/prom-string-frame.jsonc
rename to pkg/promlib/converter/testdata/prom-string-frame.jsonc
diff --git a/pkg/util/converter/testdata/prom-string.json b/pkg/promlib/converter/testdata/prom-string.json
similarity index 100%
rename from pkg/util/converter/testdata/prom-string.json
rename to pkg/promlib/converter/testdata/prom-string.json
diff --git a/pkg/util/converter/testdata/prom-vector-frame.jsonc b/pkg/promlib/converter/testdata/prom-vector-frame.jsonc
similarity index 100%
rename from pkg/util/converter/testdata/prom-vector-frame.jsonc
rename to pkg/promlib/converter/testdata/prom-vector-frame.jsonc
diff --git a/pkg/util/converter/testdata/prom-vector-histogram-no-labels-frame.jsonc b/pkg/promlib/converter/testdata/prom-vector-histogram-no-labels-frame.jsonc
similarity index 100%
rename from pkg/util/converter/testdata/prom-vector-histogram-no-labels-frame.jsonc
rename to pkg/promlib/converter/testdata/prom-vector-histogram-no-labels-frame.jsonc
diff --git a/pkg/util/converter/testdata/prom-vector-histogram-no-labels.json b/pkg/promlib/converter/testdata/prom-vector-histogram-no-labels.json
similarity index 100%
rename from pkg/util/converter/testdata/prom-vector-histogram-no-labels.json
rename to pkg/promlib/converter/testdata/prom-vector-histogram-no-labels.json
diff --git a/pkg/util/converter/testdata/prom-vector.json b/pkg/promlib/converter/testdata/prom-vector.json
similarity index 100%
rename from pkg/util/converter/testdata/prom-vector.json
rename to pkg/promlib/converter/testdata/prom-vector.json
diff --git a/pkg/util/converter/testdata/prom-warnings-frame.jsonc b/pkg/promlib/converter/testdata/prom-warnings-frame.jsonc
similarity index 100%
rename from pkg/util/converter/testdata/prom-warnings-frame.jsonc
rename to pkg/promlib/converter/testdata/prom-warnings-frame.jsonc
diff --git a/pkg/util/converter/testdata/prom-warnings.json b/pkg/promlib/converter/testdata/prom-warnings.json
similarity index 100%
rename from pkg/util/converter/testdata/prom-warnings.json
rename to pkg/promlib/converter/testdata/prom-warnings.json
diff --git a/pkg/promlib/go.mod b/pkg/promlib/go.mod
new file mode 100644
index 0000000000000..061b231bc0aba
--- /dev/null
+++ b/pkg/promlib/go.mod
@@ -0,0 +1,110 @@
+module github.com/grafana/grafana/pkg/promlib
+
+go 1.21.10
+
+require (
+	github.com/grafana/grafana-plugin-sdk-go v0.222.0
+	github.com/json-iterator/go v1.1.12
+	github.com/patrickmn/go-cache v2.1.0+incompatible
+	github.com/prometheus/client_golang v1.18.0
+	github.com/prometheus/common v0.46.0
+	github.com/prometheus/prometheus v1.8.2-0.20221021121301-51a44e6657c3
+	github.com/stretchr/testify v1.9.0
+	go.opentelemetry.io/otel v1.24.0
+	go.opentelemetry.io/otel/trace v1.24.0
+	golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb
+)
+
+require (
+	github.com/BurntSushi/toml v1.3.2 // indirect
+	github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect
+	github.com/apache/arrow/go/v15 v15.0.2 // indirect
+	github.com/aws/aws-sdk-go v1.50.8 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cheekybits/genny v1.0.0 // indirect
+	github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/dennwc/varint v1.0.0 // indirect
+	github.com/elazarl/goproxy v0.0.0-20230731152917-f99041a5c027 // indirect
+	github.com/fatih/color v1.15.0 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/getkin/kin-openapi v0.120.0 // indirect
+	github.com/go-kit/log v0.2.1 // indirect
+	github.com/go-logfmt/logfmt v0.6.0 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-openapi/jsonpointer v0.20.2 // indirect
+	github.com/go-openapi/swag v0.22.9 // indirect
+	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/google/flatbuffers v23.5.26+incompatible // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/gorilla/mux v1.8.1 // indirect
+	github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
+	github.com/hashicorp/go-hclog v1.6.2 // indirect
+	github.com/hashicorp/go-plugin v1.6.0 // indirect
+	github.com/hashicorp/yamux v0.1.1 // indirect
+	github.com/invopop/yaml v0.2.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/klauspost/compress v1.17.4 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
+	github.com/magefile/mage v1.15.0 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattetti/filebuffer v1.0.1 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
+	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
+	github.com/oklog/run v1.1.0 // indirect
+	github.com/olekukonko/tablewriter v0.0.5 // indirect
+	github.com/perimeterx/marshmallow v1.1.5 // indirect
+	github.com/pierrec/lz4/v4 v4.1.18 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
+	github.com/rivo/uniseg v0.3.4 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/smartystreets/goconvey v1.6.4 // indirect
+	github.com/ugorji/go/codec v1.2.11 // indirect
+	github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 // indirect
+	github.com/unknwon/com v1.0.1 // indirect
+	github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3 // indirect
+	github.com/urfave/cli v1.22.14 // indirect
+	github.com/zeebo/xxh3 v1.0.2 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.49.0 // indirect
+	go.opentelemetry.io/contrib/propagators/jaeger v1.22.0 // indirect
+	go.opentelemetry.io/contrib/samplers/jaegerremote v0.18.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 // indirect
+	go.opentelemetry.io/otel/metric v1.24.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.24.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.1.0 // indirect
+	go.uber.org/atomic v1.11.0 // indirect
+	go.uber.org/goleak v1.3.0 // indirect
+	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/net v0.22.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/tools v0.17.0 // indirect
+	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
+	google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
+	google.golang.org/grpc v1.62.1 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
+	gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)
diff --git a/pkg/promlib/go.sum b/pkg/promlib/go.sum
new file mode 100644
index 0000000000000..ebcf691cdc5de
--- /dev/null
+++ b/pkg/promlib/go.sum
@@ -0,0 +1,131 @@
+github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
+github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 h1:ez/4by2iGztzR4L0zgAOR8lTQK9VlyBVVd7G4omaOQs=
+github.com/apache/arrow/go/v15 v15.0.2 h1:60IliRbiyTWCWjERBCkO1W4Qun9svcYoZrSLcyOsMLE=
+github.com/aws/aws-sdk-go v1.50.8 h1:gY0WoOW+/Wz6XmYSgDH9ge3wnAevYDSQWPxxJvqAkP4=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA=
+github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
+github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
+github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE=
+github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89 h1:aPflPkRFkVwbW6dmcVqfgwp1i+UWGFH6VgR1Jim5Ygc=
+github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/dennwc/varint v1.0.0 h1:kGNFFSSw8ToIy3obO/kKr8U9GZYUAxQEVuix4zfDWzE=
+github.com/elazarl/goproxy v0.0.0-20230731152917-f99041a5c027 h1:1L0aalTpPz7YlMxETKpmQoWMBkeiuorElZIXoNmgiPE=
+github.com/elazarl/goproxy/ext v0.0.0-20220115173737-adb46da277ac h1:9yrT5tmn9Zc0ytWPASlaPwQfQMQYnRf0RSDe1XvHw0Q=
+github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
+github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
+github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/getkin/kin-openapi v0.120.0 h1:MqJcNJFrMDFNc07iwE8iFC5eT2k/NPUFDIpNeiZv8Jg=
+github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
+github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
+github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
+github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
+github.com/go-openapi/jsonpointer v0.20.2 h1:mQc3nmndL8ZBzStEo3JYF8wzmeWffDH4VbXz58sAx6Q=
+github.com/go-openapi/swag v0.22.9 h1:XX2DssF+mQKM2DHsbgZK74y/zj4mo9I99+89xUmuZCE=
+github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM=
+github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
+github.com/google/flatbuffers v23.5.26+incompatible h1:M9dgRyhJemaM4Sw8+66GHBu8ioaQmyPLg1b8VwK5WJg=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg=
+github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
+github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
+github.com/grafana/grafana-plugin-sdk-go v0.222.0 h1:bWK35de9Kl9+lRGyh+41zW2X8MkQ4959aqUsi08/8ig=
+github.com/grafana/grafana-plugin-sdk-go v0.222.0/go.mod h1:0lYONo3rJrjIoJNOQP0h2NXmOaF5rFIuH/rwSVSeIrQ=
+github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db h1:7aN5cccjIqCLTzedH7MZzRZt5/lsAHch6Z3L2ZGn5FA=
+github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340 h1:uGoIog/wiQHI9GAxXO5TJbT0wWKH3O9HhOJW1F9c3fY=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 h1:Wqo399gCIufwto+VfwCSvsnfGpF/w5E9CNxSwbpD6No=
+github.com/hashicorp/go-hclog v1.6.2 h1:NOtoftovWkDheyUM/8JW3QMiXyxJK3uHRK7wV04nD2I=
+github.com/hashicorp/go-hclog v1.6.2/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
+github.com/hashicorp/go-plugin v1.6.0 h1:wgd4KxHJTVGGqWBq4QPB1i5BZNEx9BR8+OFmHDmTk8A=
+github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
+github.com/invopop/yaml v0.2.0 h1:7zky/qH+O0DwAyoobXUqvVBwgBFRxKoQ/3FjcVpjTMY=
+github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
+github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
+github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
+github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
+github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
+github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg=
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
+github.com/mattetti/filebuffer v1.0.1 h1:gG7pyfnSIZCxdoKq+cPa8T0hhYtD9NxCdI4D7PTjRLM=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
+github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
+github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU=
+github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
+github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
+github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA=
+github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
+github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
+github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
+github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s=
+github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
+github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
+github.com/prometheus/common v0.46.0 h1:doXzt5ybi1HBKpsZOL0sSkaNHJJqkyfEWZGGqqScV0Y=
+github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4=
+github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
+github.com/prometheus/prometheus v1.8.2-0.20221021121301-51a44e6657c3 h1:etRZv4bJf9YAuyPWbyFufjkijfeoPSmyA5xNcd4DoyI=
+github.com/prometheus/prometheus v1.8.2-0.20221021121301-51a44e6657c3/go.mod h1:plwr4+63Q1xL8oIdBDeU854um7Cct0Av8dhP44lutMw=
+github.com/rivo/uniseg v0.3.4 h1:3Z3Eu6FGHZWSfNKJTOUiPatWwfc7DzJRU04jFUqJODw=
+github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
+github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
+github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 h1:Jpy1PXuP99tXNrhbq2BaPz9B+jNAvH1JPQQpG/9GCXY=
+github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
+github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 h1:aVGB3YnaS/JNfOW3tiHIlmNmTDg618va+eT0mVomgyI=
+github.com/unknwon/com v1.0.1 h1:3d1LTxD+Lnf3soQiD4Cp/0BRB+Rsa/+RTvz8GMMzIXs=
+github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3 h1:4EYQaWAatQokdji3zqZloVIW/Ke1RQjYw2zHULyrHJg=
+github.com/urfave/cli v1.22.14 h1:ebbhrRiGK2i4naQJr+1Xj92HXZCrK7MsyTS/ob3HnAk=
+github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
+github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg=
+go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.49.0 h1:RtcvQ4iw3w9NBB5yRwgA4sSa82rfId7n4atVpvKx3bY=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk=
+go.opentelemetry.io/contrib/propagators/jaeger v1.22.0 h1:bAHX+zN/inu+Rbqk51REmC8oXLl+Dw6pp9ldQf/onaY=
+go.opentelemetry.io/contrib/samplers/jaegerremote v0.18.0 h1:Q9PrD94WoMolBx44ef5UWWvufpVSME0MiSymXZfedso=
+go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 h1:t6wl9SPayj+c7lEIFgm4ooDBZVb01IhLB4InpomhRw8=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 h1:Mw5xcxMwlqoJd97vwPxA8isEaIoxsta9/Q51+TTJLGE=
+go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI=
+go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw=
+go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI=
+go.opentelemetry.io/proto/otlp v1.1.0 h1:2Di21piLrCqJ3U3eXGCTPHE9R8Nh+0uglSnOyxikMeI=
+go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb h1:c0vyKkb6yr3KR7jEfJaOSv4lG7xPkbN6r52aJz1d8a8=
+golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
+golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
+golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI=
+golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
+golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
+gonum.org/v1/gonum v0.12.0 h1:xKuo6hzt+gMav00meVPUlXwSdoEJP46BR+wdxQEFK2o=
+google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
+google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ=
+google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 h1:Lj5rbfG876hIAYFjqiJnPHfhXbv+nzTWfm04Fg/XSVU=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM=
+google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/fsnotify/fsnotify.v1 v1.4.7 h1:XNNYLJHt73EyYiCZi6+xjupS9CpvmiDgjPTAjrBlQbo=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
diff --git a/pkg/promlib/healthcheck.go b/pkg/promlib/healthcheck.go
new file mode 100644
index 0000000000000..c38a929743135
--- /dev/null
+++ b/pkg/promlib/healthcheck.go
@@ -0,0 +1,108 @@
+package promlib
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	sdkapi "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+
+	"github.com/grafana/grafana/pkg/promlib/models"
+)
+
+const (
+	refID = "__healthcheck__"
+)
+
+func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult,
+	error) {
+	ds, err := s.getInstance(ctx, req.PluginContext)
+
+	// check that the datasource exists
+	if err != nil {
+		return getHealthCheckMessage("error getting datasource info", err)
+	}
+
+	if ds == nil {
+		return getHealthCheckMessage("", errors.New("invalid datasource info received"))
+	}
+
+	logger := s.logger.FromContext(ctx)
+
+	hc, err := healthcheck(ctx, req, ds)
+	if err != nil {
+		logger.Warn("Error performing prometheus healthcheck", "err", err.Error())
+		return nil, err
+	}
+
+	heuristics, err := getHeuristics(ctx, ds, logger)
+	if err != nil {
+		logger.Warn("Failed to get prometheus heuristics", "err", err.Error())
+	} else {
+		jsonDetails, err := json.Marshal(heuristics)
+		if err != nil {
+			logger.Warn("Failed to marshal heuristics", "err", err)
+		} else {
+			hc.JSONDetails = jsonDetails
+		}
+	}
+
+	return hc, nil
+}
+
+func healthcheck(ctx context.Context, req *backend.CheckHealthRequest, i *instance) (*backend.CheckHealthResult, error) {
+	qm := models.QueryModel{
+		UtcOffsetSec: 0,
+		CommonQueryProperties: sdkapi.CommonQueryProperties{
+			RefID: refID,
+		},
+		PrometheusQueryProperties: models.PrometheusQueryProperties{
+			Expr:    "1+1",
+			Instant: true,
+		},
+	}
+	b, _ := json.Marshal(&qm)
+
+	query := backend.DataQuery{
+		RefID: refID,
+		TimeRange: backend.TimeRange{
+			From: time.Unix(1, 0).UTC(),
+			To:   time.Unix(4, 0).UTC(),
+		},
+		JSON: b,
+	}
+	resp, err := i.queryData.Execute(ctx, &backend.QueryDataRequest{
+		PluginContext: req.PluginContext,
+		Queries:       []backend.DataQuery{query},
+	})
+
+	if err != nil {
+		return getHealthCheckMessage("There was an error returned querying the Prometheus API.", err)
+	}
+
+	if resp.Responses[refID].Error != nil {
+		return getHealthCheckMessage("There was an error returned querying the Prometheus API.",
+			errors.New(resp.Responses[refID].Error.Error()))
+	}
+
+	return getHealthCheckMessage("Successfully queried the Prometheus API.", nil)
+}
+
+func getHealthCheckMessage(message string, err error) (*backend.CheckHealthResult, error) {
+	if err == nil {
+		return &backend.CheckHealthResult{
+			Status:  backend.HealthStatusOk,
+			Message: message,
+		}, nil
+	}
+
+	errorMessage := fmt.Sprintf("%s - %s", err.Error(), message)
+
+	return &backend.CheckHealthResult{
+		Status:  backend.HealthStatusError,
+		Message: errorMessage,
+	}, nil
+}
diff --git a/pkg/promlib/healthcheck_test.go b/pkg/promlib/healthcheck_test.go
new file mode 100644
index 0000000000000..bb8746f5a0af7
--- /dev/null
+++ b/pkg/promlib/healthcheck_test.go
@@ -0,0 +1,144 @@
+package promlib
+
+import (
+	"context"
+	"io"
+	"net/http"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
+	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+	"github.com/stretchr/testify/assert"
+)
+
+type healthCheckProvider[T http.RoundTripper] struct {
+	sdkhttpclient.Provider
+	RoundTripper *T
+}
+
+type healthCheckSuccessRoundTripper struct {
+}
+
+type healthCheckFailRoundTripper struct {
+}
+
+func (rt *healthCheckSuccessRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
+	return &http.Response{
+		Status:     "200",
+		StatusCode: 200,
+		Header:     nil,
+		Body: io.NopCloser(strings.NewReader(`{
+			"status": "success",
+			"data": {
+				"resultType": "scalar",
+				"result": [
+					1692969348.331,
+					"3"
+				]
+			}
+		}`)),
+		ContentLength: 0,
+		Request:       req,
+	}, nil
+}
+
+func (rt *healthCheckFailRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
+	return &http.Response{
+		Status:        "400",
+		StatusCode:    400,
+		Header:        nil,
+		Body:          nil,
+		ContentLength: 0,
+		Request:       req,
+	}, nil
+}
+
+func (provider *healthCheckProvider[T]) New(opts ...sdkhttpclient.Options) (*http.Client, error) {
+	client := &http.Client{}
+	provider.RoundTripper = new(T)
+	client.Transport = *provider.RoundTripper
+	return client, nil
+}
+
+func (provider *healthCheckProvider[T]) GetTransport(opts ...sdkhttpclient.Options) (http.RoundTripper, error) {
+	return *new(T), nil
+}
+
+func getMockProvider[T http.RoundTripper]() *sdkhttpclient.Provider {
+	p := &healthCheckProvider[T]{
+		RoundTripper: new(T),
+	}
+	anotherFN := func(o sdkhttpclient.Options, next http.RoundTripper) http.RoundTripper {
+		return *p.RoundTripper
+	}
+	fn := sdkhttpclient.MiddlewareFunc(anotherFN)
+	mid := sdkhttpclient.NamedMiddlewareFunc("mock", fn)
+	return sdkhttpclient.NewProvider(sdkhttpclient.ProviderOptions{Middlewares: []sdkhttpclient.Middleware{mid}})
+}
+
+func Test_healthcheck(t *testing.T) {
+	t.Run("should do a successful health check", func(t *testing.T) {
+		httpProvider := getMockProvider[*healthCheckSuccessRoundTripper]()
+		logger := backend.NewLoggerWith("logger", "test")
+		s := &Service{
+			im:     datasource.NewInstanceManager(newInstanceSettings(httpProvider, logger, mockExtendClientOpts)),
+			logger: logger,
+		}
+
+		req := &backend.CheckHealthRequest{
+			PluginContext: getPluginContext(),
+			Headers:       nil,
+		}
+
+		res, err := s.CheckHealth(context.Background(), req)
+		assert.NoError(t, err)
+		assert.Equal(t, backend.HealthStatusOk, res.Status)
+	})
+
+	t.Run("should return an error for an unsuccessful health check", func(t *testing.T) {
+		httpProvider := getMockProvider[*healthCheckFailRoundTripper]()
+		logger := backend.NewLoggerWith("logger", "test")
+		s := &Service{
+			im:     datasource.NewInstanceManager(newInstanceSettings(httpProvider, logger, mockExtendClientOpts)),
+			logger: logger,
+		}
+
+		req := &backend.CheckHealthRequest{
+			PluginContext: getPluginContext(),
+			Headers:       nil,
+		}
+
+		res, err := s.CheckHealth(context.Background(), req)
+		assert.NoError(t, err)
+		assert.Equal(t, backend.HealthStatusError, res.Status)
+	})
+}
+
+func getPluginContext() backend.PluginContext {
+	return backend.PluginContext{
+		OrgID:                      0,
+		PluginID:                   "prometheus",
+		User:                       nil,
+		AppInstanceSettings:        nil,
+		DataSourceInstanceSettings: getPromInstanceSettings(),
+	}
+}
+func getPromInstanceSettings() *backend.DataSourceInstanceSettings {
+	return &backend.DataSourceInstanceSettings{
+		ID:                      0,
+		UID:                     "",
+		Type:                    "prometheus",
+		Name:                    "test-prometheus",
+		URL:                     "http://promurl:9090",
+		User:                    "",
+		Database:                "",
+		BasicAuthEnabled:        true,
+		BasicAuthUser:           "admin",
+		JSONData:                []byte("{}"),
+		DecryptedSecureJSONData: map[string]string{},
+		Updated:                 time.Time{},
+	}
+}
diff --git a/pkg/tsdb/prometheus/heuristics.go b/pkg/promlib/heuristics.go
similarity index 91%
rename from pkg/tsdb/prometheus/heuristics.go
rename to pkg/promlib/heuristics.go
index 78e38c027eea3..e97a1cd7e5d10 100644
--- a/pkg/tsdb/prometheus/heuristics.go
+++ b/pkg/promlib/heuristics.go
@@ -1,4 +1,4 @@
-package prometheus
+package promlib
 
 import (
 	"context"
@@ -8,6 +8,7 @@ import (
 	"net/http"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 )
 
 const (
@@ -85,10 +86,11 @@ func (s *Service) GetHeuristics(ctx context.Context, req HeuristicsRequest) (*He
 	if err != nil {
 		return nil, err
 	}
-	return getHeuristics(ctx, ds)
+	logger := s.logger.FromContext(ctx)
+	return getHeuristics(ctx, ds, logger)
 }
 
-func getHeuristics(ctx context.Context, i *instance) (*Heuristics, error) {
+func getHeuristics(ctx context.Context, i *instance, logger log.Logger) (*Heuristics, error) {
 	heuristics := Heuristics{
 		Application: "unknown",
 		Features: Features{
diff --git a/pkg/promlib/heuristics_test.go b/pkg/promlib/heuristics_test.go
new file mode 100644
index 0000000000000..48b6f380ad8c3
--- /dev/null
+++ b/pkg/promlib/heuristics_test.go
@@ -0,0 +1,92 @@
+package promlib
+
+import (
+	"context"
+	"io"
+	"net/http"
+	"strconv"
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
+	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+)
+
+type heuristicsSuccessRoundTripper struct {
+	res    io.ReadCloser
+	status int
+}
+
+func (rt *heuristicsSuccessRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
+	return &http.Response{
+		Status:        strconv.Itoa(rt.status),
+		StatusCode:    rt.status,
+		Header:        nil,
+		Body:          rt.res,
+		ContentLength: 0,
+		Request:       req,
+	}, nil
+}
+
+func newHeuristicsSDKProvider(hrt heuristicsSuccessRoundTripper) *sdkhttpclient.Provider {
+	anotherFN := func(o sdkhttpclient.Options, next http.RoundTripper) http.RoundTripper {
+		return &hrt
+	}
+	fn := sdkhttpclient.MiddlewareFunc(anotherFN)
+	mid := sdkhttpclient.NamedMiddlewareFunc("mock", fn)
+	return sdkhttpclient.NewProvider(sdkhttpclient.ProviderOptions{Middlewares: []sdkhttpclient.Middleware{mid}})
+}
+
+func mockExtendClientOpts(ctx context.Context, settings backend.DataSourceInstanceSettings, clientOpts *sdkhttpclient.Options) error {
+	return nil
+}
+
+func Test_GetHeuristics(t *testing.T) {
+	t.Run("should return Prometheus", func(t *testing.T) {
+		rt := heuristicsSuccessRoundTripper{
+			res:    io.NopCloser(strings.NewReader("{\"status\":\"success\",\"data\":{\"version\":\"1.0\"}}")),
+			status: http.StatusOK,
+		}
+		httpProvider := newHeuristicsSDKProvider(rt)
+		logger := backend.NewLoggerWith("logger", "test")
+		s := &Service{
+			im:     datasource.NewInstanceManager(newInstanceSettings(httpProvider, logger, mockExtendClientOpts)),
+			logger: logger,
+		}
+
+		req := HeuristicsRequest{
+			PluginContext: getPluginContext(),
+		}
+		res, err := s.GetHeuristics(context.Background(), req)
+		assert.NoError(t, err)
+		require.NotNil(t, res)
+		assert.Equal(t, KindPrometheus, res.Application)
+		assert.Equal(t, Features{RulerApiEnabled: false}, res.Features)
+	})
+
+	t.Run("should return Mimir", func(t *testing.T) {
+		rt := heuristicsSuccessRoundTripper{
+			res:    io.NopCloser(strings.NewReader("{\"status\":\"success\",\"data\":{\"features\":{\"foo\":\"bar\"},\"version\":\"1.0\"}}")),
+			status: http.StatusOK,
+		}
+		httpProvider := newHeuristicsSDKProvider(rt)
+		logger := backend.NewLoggerWith("logger", "test")
+		s := &Service{
+			im:     datasource.NewInstanceManager(newInstanceSettings(httpProvider, logger, mockExtendClientOpts)),
+			logger: logger,
+		}
+
+		req := HeuristicsRequest{
+			PluginContext: getPluginContext(),
+		}
+		res, err := s.GetHeuristics(context.Background(), req)
+		assert.NoError(t, err)
+		require.NotNil(t, res)
+		assert.Equal(t, KindMimir, res.Application)
+		assert.Equal(t, Features{RulerApiEnabled: true}, res.Features)
+	})
+}
diff --git a/pkg/tsdb/prometheus/instrumentation/instrumentation.go b/pkg/promlib/instrumentation/instrumentation.go
similarity index 100%
rename from pkg/tsdb/prometheus/instrumentation/instrumentation.go
rename to pkg/promlib/instrumentation/instrumentation.go
diff --git a/pkg/tsdb/prometheus/instrumentation/instrumentation_test.go b/pkg/promlib/instrumentation/instrumentation_test.go
similarity index 100%
rename from pkg/tsdb/prometheus/instrumentation/instrumentation_test.go
rename to pkg/promlib/instrumentation/instrumentation_test.go
diff --git a/pkg/promlib/intervalv2/intervalv2.go b/pkg/promlib/intervalv2/intervalv2.go
new file mode 100644
index 0000000000000..cf1d943cbd765
--- /dev/null
+++ b/pkg/promlib/intervalv2/intervalv2.go
@@ -0,0 +1,74 @@
+// Package intervalv2 partially copied from https://github.com/grafana/grafana/blob/main/pkg/tsdb/intervalv2/intervalv2.go
+package intervalv2
+
+import (
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
+)
+
+var (
+	DefaultRes         int64 = 1500
+	defaultMinInterval       = time.Millisecond * 1
+)
+
+type Interval struct {
+	Text  string
+	Value time.Duration
+}
+
+type intervalCalculator struct {
+	minInterval time.Duration
+}
+
+type Calculator interface {
+	Calculate(timerange backend.TimeRange, minInterval time.Duration, maxDataPoints int64) Interval
+	CalculateSafeInterval(timerange backend.TimeRange, resolution int64) Interval
+}
+
+type CalculatorOptions struct {
+	MinInterval time.Duration
+}
+
+func NewCalculator(opts ...CalculatorOptions) *intervalCalculator {
+	calc := &intervalCalculator{}
+
+	for _, o := range opts {
+		if o.MinInterval == 0 {
+			calc.minInterval = defaultMinInterval
+		} else {
+			calc.minInterval = o.MinInterval
+		}
+	}
+
+	return calc
+}
+
+func (ic *intervalCalculator) Calculate(timerange backend.TimeRange, minInterval time.Duration, maxDataPoints int64) Interval {
+	to := timerange.To.UnixNano()
+	from := timerange.From.UnixNano()
+	resolution := maxDataPoints
+	if resolution == 0 {
+		resolution = DefaultRes
+	}
+
+	calculatedInterval := time.Duration((to - from) / resolution)
+
+	if calculatedInterval < minInterval {
+		return Interval{Text: gtime.FormatInterval(minInterval), Value: minInterval}
+	}
+
+	rounded := gtime.RoundInterval(calculatedInterval)
+
+	return Interval{Text: gtime.FormatInterval(rounded), Value: rounded}
+}
+
+func (ic *intervalCalculator) CalculateSafeInterval(timerange backend.TimeRange, safeRes int64) Interval {
+	to := timerange.To.UnixNano()
+	from := timerange.From.UnixNano()
+	safeInterval := time.Duration((to - from) / safeRes)
+
+	rounded := gtime.RoundInterval(safeInterval)
+	return Interval{Text: gtime.FormatInterval(rounded), Value: rounded}
+}
diff --git a/pkg/promlib/intervalv2/intervalv2_test.go b/pkg/promlib/intervalv2/intervalv2_test.go
new file mode 100644
index 0000000000000..8e604f168f117
--- /dev/null
+++ b/pkg/promlib/intervalv2/intervalv2_test.go
@@ -0,0 +1,63 @@
+package intervalv2
+
+import (
+	"testing"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestIntervalCalculator_Calculate(t *testing.T) {
+	calculator := NewCalculator(CalculatorOptions{})
+
+	timeNow := time.Now()
+
+	testCases := []struct {
+		name       string
+		timeRange  backend.TimeRange
+		resolution int64
+		expected   string
+	}{
+		{"from 5m to now and default resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(5 * time.Minute)}, 0, "200ms"},
+		{"from 5m to now and 500 resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(5 * time.Minute)}, 500, "500ms"},
+		{"from 15m to now and default resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(15 * time.Minute)}, 0, "500ms"},
+		{"from 15m to now and 100 resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(15 * time.Minute)}, 100, "10s"},
+		{"from 30m to now and default resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(30 * time.Minute)}, 0, "1s"},
+		{"from 30m to now and 3000 resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(30 * time.Minute)}, 3000, "500ms"},
+		{"from 1h to now and default resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(time.Hour)}, 0, "2s"},
+		{"from 1h to now and 1000 resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(time.Hour)}, 1000, "5s"},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			interval := calculator.Calculate(tc.timeRange, time.Millisecond*1, tc.resolution)
+			assert.Equal(t, tc.expected, interval.Text)
+		})
+	}
+}
+
+func TestIntervalCalculator_CalculateSafeInterval(t *testing.T) {
+	calculator := NewCalculator(CalculatorOptions{})
+
+	timeNow := time.Now()
+
+	testCases := []struct {
+		name           string
+		timeRange      backend.TimeRange
+		safeResolution int64
+		expected       string
+	}{
+		{"from 5m to now", backend.TimeRange{From: timeNow, To: timeNow.Add(5 * time.Minute)}, 11000, "20ms"},
+		{"from 15m to now", backend.TimeRange{From: timeNow, To: timeNow.Add(15 * time.Minute)}, 11000, "100ms"},
+		{"from 30m to now", backend.TimeRange{From: timeNow, To: timeNow.Add(30 * time.Minute)}, 11000, "200ms"},
+		{"from 24h to now", backend.TimeRange{From: timeNow, To: timeNow.Add(1440 * time.Minute)}, 11000, "10s"},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			interval := calculator.CalculateSafeInterval(tc.timeRange, tc.safeResolution)
+			assert.Equal(t, tc.expected, interval.Text)
+		})
+	}
+}
diff --git a/pkg/promlib/library.go b/pkg/promlib/library.go
new file mode 100644
index 0000000000000..1a441e9305ee9
--- /dev/null
+++ b/pkg/promlib/library.go
@@ -0,0 +1,156 @@
+package promlib
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
+	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
+	"github.com/patrickmn/go-cache"
+	apiv1 "github.com/prometheus/client_golang/api/prometheus/v1"
+
+	"github.com/grafana/grafana/pkg/promlib/client"
+	"github.com/grafana/grafana/pkg/promlib/instrumentation"
+	"github.com/grafana/grafana/pkg/promlib/querydata"
+	"github.com/grafana/grafana/pkg/promlib/resource"
+)
+
+type Service struct {
+	im     instancemgmt.InstanceManager
+	logger log.Logger
+}
+
+type instance struct {
+	queryData    *querydata.QueryData
+	resource     *resource.Resource
+	versionCache *cache.Cache
+}
+
+type ExtendOptions func(ctx context.Context, settings backend.DataSourceInstanceSettings, clientOpts *sdkhttpclient.Options) error
+
+func NewService(httpClientProvider *sdkhttpclient.Provider, plog log.Logger, extendOptions ExtendOptions) *Service {
+	if httpClientProvider == nil {
+		httpClientProvider = sdkhttpclient.NewProvider()
+	}
+	return &Service{
+		im:     datasource.NewInstanceManager(newInstanceSettings(httpClientProvider, plog, extendOptions)),
+		logger: plog,
+	}
+}
+
+func newInstanceSettings(httpClientProvider *sdkhttpclient.Provider, log log.Logger, extendOptions ExtendOptions) datasource.InstanceFactoryFunc {
+	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+		// Creates a http roundTripper.
+		opts, err := client.CreateTransportOptions(ctx, settings, log)
+		if err != nil {
+			return nil, fmt.Errorf("error creating transport options: %v", err)
+		}
+
+		if extendOptions != nil {
+			err = extendOptions(ctx, settings, opts)
+			if err != nil {
+				return nil, fmt.Errorf("error extending transport options: %v", err)
+			}
+		}
+
+		httpClient, err := httpClientProvider.New(*opts)
+		if err != nil {
+			return nil, fmt.Errorf("error creating http client: %v", err)
+		}
+
+		// New version using custom client and better response parsing
+		qd, err := querydata.New(httpClient, settings, log)
+		if err != nil {
+			return nil, err
+		}
+
+		// Resource call management using new custom client same as querydata
+		r, err := resource.New(httpClient, settings, log)
+		if err != nil {
+			return nil, err
+		}
+
+		return instance{
+			queryData:    qd,
+			resource:     r,
+			versionCache: cache.New(time.Minute*1, time.Minute*5),
+		}, nil
+	}
+}
+
+func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+	if len(req.Queries) == 0 {
+		err := fmt.Errorf("query contains no queries")
+		instrumentation.UpdateQueryDataMetrics(err, nil)
+		return &backend.QueryDataResponse{}, err
+	}
+
+	i, err := s.getInstance(ctx, req.PluginContext)
+	if err != nil {
+		instrumentation.UpdateQueryDataMetrics(err, nil)
+		return nil, err
+	}
+
+	qd, err := i.queryData.Execute(ctx, req)
+	instrumentation.UpdateQueryDataMetrics(err, qd)
+
+	return qd, err
+}
+
+func (s *Service) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	i, err := s.getInstance(ctx, req.PluginContext)
+	if err != nil {
+		return err
+	}
+
+	if strings.EqualFold(req.Path, "version-detect") {
+		versionObj, found := i.versionCache.Get("version")
+		if found {
+			return sender.Send(versionObj.(*backend.CallResourceResponse))
+		}
+
+		vResp, err := i.resource.DetectVersion(ctx, req)
+		if err != nil {
+			return err
+		}
+		i.versionCache.Set("version", vResp, cache.DefaultExpiration)
+		return sender.Send(vResp)
+	}
+
+	resp, err := i.resource.Execute(ctx, req)
+	if err != nil {
+		return err
+	}
+
+	return sender.Send(resp)
+}
+
+func (s *Service) getInstance(ctx context.Context, pluginCtx backend.PluginContext) (*instance, error) {
+	i, err := s.im.Get(ctx, pluginCtx)
+	if err != nil {
+		return nil, err
+	}
+	in := i.(instance)
+	return &in, nil
+}
+
+// IsAPIError returns whether err is or wraps a Prometheus error.
+func IsAPIError(err error) bool {
+	// Check if the right error type is in err's chain.
+	var e *apiv1.Error
+	return errors.As(err, &e)
+}
+
+func ConvertAPIError(err error) error {
+	var e *apiv1.Error
+	if errors.As(err, &e) {
+		return fmt.Errorf("%s: %s", e.Msg, e.Detail)
+	}
+	return err
+}
diff --git a/pkg/promlib/library_test.go b/pkg/promlib/library_test.go
new file mode 100644
index 0000000000000..04529d608d0b2
--- /dev/null
+++ b/pkg/promlib/library_test.go
@@ -0,0 +1,147 @@
+package promlib
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"net/http"
+	"testing"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+	"github.com/stretchr/testify/require"
+)
+
+type fakeSender struct{}
+
+func (sender *fakeSender) Send(resp *backend.CallResourceResponse) error {
+	return nil
+}
+
+type fakeRoundtripper struct {
+	Req *http.Request
+}
+
+func (rt *fakeRoundtripper) RoundTrip(req *http.Request) (*http.Response, error) {
+	rt.Req = req
+	return &http.Response{
+		Status:        "200",
+		StatusCode:    200,
+		Header:        nil,
+		Body:          nil,
+		ContentLength: 0,
+	}, nil
+}
+
+type fakeHTTPClientProvider struct {
+	sdkhttpclient.Provider
+	Roundtripper *fakeRoundtripper
+}
+
+func (provider *fakeHTTPClientProvider) New(opts ...sdkhttpclient.Options) (*http.Client, error) {
+	client := &http.Client{}
+	provider.Roundtripper = &fakeRoundtripper{}
+	client.Transport = provider.Roundtripper
+	return client, nil
+}
+
+func (provider *fakeHTTPClientProvider) GetTransport(opts ...sdkhttpclient.Options) (http.RoundTripper, error) {
+	return &fakeRoundtripper{}, nil
+}
+
+func getMockPromTestSDKProvider(f *fakeHTTPClientProvider) *sdkhttpclient.Provider {
+	anotherFN := func(o sdkhttpclient.Options, next http.RoundTripper) http.RoundTripper {
+		_, _ = f.New()
+		return f.Roundtripper
+	}
+	fn := sdkhttpclient.MiddlewareFunc(anotherFN)
+	mid := sdkhttpclient.NamedMiddlewareFunc("mock", fn)
+	return sdkhttpclient.NewProvider(sdkhttpclient.ProviderOptions{Middlewares: []sdkhttpclient.Middleware{mid}})
+}
+
+func mockExtendTransportOptions(ctx context.Context, settings backend.DataSourceInstanceSettings, clientOpts *sdkhttpclient.Options) error {
+	return nil
+}
+
+func TestService(t *testing.T) {
+	t.Run("Service", func(t *testing.T) {
+		t.Run("CallResource", func(t *testing.T) {
+			t.Run("creates correct request", func(t *testing.T) {
+				f := &fakeHTTPClientProvider{}
+				httpProvider := getMockPromTestSDKProvider(f)
+				service := NewService(httpProvider, backend.NewLoggerWith("logger", "test"), mockExtendTransportOptions)
+
+				req := mockRequest()
+				sender := &fakeSender{}
+				err := service.CallResource(context.Background(), req, sender)
+				require.NoError(t, err)
+				require.Equal(
+					t,
+					http.Header{
+						"Content-Type":    {"application/x-www-form-urlencoded"},
+						"Idempotency-Key": []string(nil),
+					},
+					f.Roundtripper.Req.Header)
+				require.Equal(t, http.MethodPost, f.Roundtripper.Req.Method)
+				body, err := io.ReadAll(f.Roundtripper.Req.Body)
+				require.NoError(t, err)
+				require.Equal(t, []byte("match%5B%5D: ALERTS\nstart: 1655271408\nend: 1655293008"), body)
+				require.Equal(t, "http://localhost:9090/api/v1/series", f.Roundtripper.Req.URL.String())
+			})
+		})
+	})
+
+	t.Run("no extendOptions function provided", func(t *testing.T) {
+		f := &fakeHTTPClientProvider{}
+		httpProvider := getMockPromTestSDKProvider(f)
+		service := NewService(httpProvider, backend.NewLoggerWith("logger", "test"), nil)
+		require.NotNil(t, service)
+		require.NotNil(t, service.im)
+	})
+
+	t.Run("extendOptions function provided", func(t *testing.T) {
+		f := &fakeHTTPClientProvider{}
+		httpProvider := getMockPromTestSDKProvider(f)
+		service := NewService(httpProvider, backend.NewLoggerWith("logger", "test"), func(ctx context.Context, settings backend.DataSourceInstanceSettings, clientOpts *sdkhttpclient.Options) error {
+			fmt.Println(ctx, settings, clientOpts)
+			require.NotNil(t, ctx)
+			require.NotNil(t, settings)
+			require.Equal(t, "test-prom", settings.Name)
+			return nil
+		})
+
+		req := mockRequest()
+		sender := &fakeSender{}
+		err := service.CallResource(context.Background(), req, sender)
+		require.NoError(t, err)
+	})
+}
+
+func mockRequest() *backend.CallResourceRequest {
+	return &backend.CallResourceRequest{
+		PluginContext: backend.PluginContext{
+			OrgID:               0,
+			PluginID:            "prometheus",
+			User:                nil,
+			AppInstanceSettings: nil,
+			DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{
+				ID:               0,
+				UID:              "",
+				Type:             "prometheus",
+				Name:             "test-prom",
+				URL:              "http://localhost:9090",
+				User:             "",
+				Database:         "",
+				BasicAuthEnabled: true,
+				BasicAuthUser:    "admin",
+				Updated:          time.Time{},
+				JSONData:         []byte("{}"),
+			},
+		},
+		Path:   "/api/v1/series",
+		Method: http.MethodPost,
+		URL:    "/api/v1/series",
+		Body:   []byte("match%5B%5D: ALERTS\nstart: 1655271408\nend: 1655293008"),
+	}
+}
diff --git a/pkg/tsdb/prometheus/middleware/custom_query_params.go b/pkg/promlib/middleware/custom_query_params.go
similarity index 100%
rename from pkg/tsdb/prometheus/middleware/custom_query_params.go
rename to pkg/promlib/middleware/custom_query_params.go
diff --git a/pkg/tsdb/prometheus/middleware/custom_query_params_test.go b/pkg/promlib/middleware/custom_query_params_test.go
similarity index 100%
rename from pkg/tsdb/prometheus/middleware/custom_query_params_test.go
rename to pkg/promlib/middleware/custom_query_params_test.go
diff --git a/pkg/tsdb/prometheus/middleware/force_http_get.go b/pkg/promlib/middleware/force_http_get.go
similarity index 100%
rename from pkg/tsdb/prometheus/middleware/force_http_get.go
rename to pkg/promlib/middleware/force_http_get.go
diff --git a/pkg/tsdb/prometheus/middleware/force_http_get_test.go b/pkg/promlib/middleware/force_http_get_test.go
similarity index 100%
rename from pkg/tsdb/prometheus/middleware/force_http_get_test.go
rename to pkg/promlib/middleware/force_http_get_test.go
diff --git a/pkg/promlib/models/query.go b/pkg/promlib/models/query.go
new file mode 100644
index 0000000000000..bb6c996cbab75
--- /dev/null
+++ b/pkg/promlib/models/query.go
@@ -0,0 +1,384 @@
+package models
+
+import (
+	"embed"
+	"encoding/json"
+	"math"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
+	sdkapi "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+	"github.com/prometheus/prometheus/model/labels"
+
+	"github.com/grafana/grafana/pkg/promlib/intervalv2"
+)
+
+// PromQueryFormat defines model for PromQueryFormat.
+// +enum
+type PromQueryFormat string
+
+const (
+	PromQueryFormatTimeSeries PromQueryFormat = "time_series"
+	PromQueryFormatTable      PromQueryFormat = "table"
+	PromQueryFormatHeatmap    PromQueryFormat = "heatmap"
+)
+
+// QueryEditorMode defines model for QueryEditorMode.
+// +enum
+type QueryEditorMode string
+
+const (
+	QueryEditorModeBuilder QueryEditorMode = "builder"
+	QueryEditorModeCode    QueryEditorMode = "code"
+)
+
+// PrometheusQueryProperties defines the specific properties used for prometheus
+type PrometheusQueryProperties struct {
+	// The response format
+	Format PromQueryFormat `json:"format,omitempty"`
+
+	// The actual expression/query that will be evaluated by Prometheus
+	Expr string `json:"expr"`
+
+	// Returns a Range vector, comprised of a set of time series containing a range of data points over time for each time series
+	Range bool `json:"range,omitempty"`
+
+	// Returns only the latest value that Prometheus has scraped for the requested time series
+	Instant bool `json:"instant,omitempty"`
+
+	// Execute an additional query to identify interesting raw samples relevant for the given expr
+	Exemplar bool `json:"exemplar,omitempty"`
+
+	// what we should show in the editor
+	EditorMode QueryEditorMode `json:"editorMode,omitempty"`
+
+	// Used to specify how many times to divide max data points by. We use max data points under query options
+	// See https://github.com/grafana/grafana/issues/48081
+	// Deprecated: use interval
+	IntervalFactor int64 `json:"intervalFactor,omitempty"`
+
+	// Series name override or template. Ex. {{hostname}} will be replaced with label value for hostname
+	LegendFormat string `json:"legendFormat,omitempty"`
+
+	// ???
+	Scope *ScopeSpec `json:"scope,omitempty"`
+}
+
+// ScopeSpec is a hand copy of the ScopeSpec struct from pkg/apis/scope/v0alpha1/types.go
+// to avoid import (temp fix)
+type ScopeSpec struct {
+	Title       string        `json:"title"`
+	Type        string        `json:"type"`
+	Description string        `json:"description"`
+	Category    string        `json:"category"`
+	Filters     []ScopeFilter `json:"filters"`
+}
+
+// ScopeFilter is a hand copy of the ScopeFilter struct from pkg/apis/scope/v0alpha1/types.go
+// to avoid import (temp fix)
+type ScopeFilter struct {
+	Key      string         `json:"key"`
+	Value    string         `json:"value"`
+	Operator FilterOperator `json:"operator"`
+}
+
+// FilterOperator is a hand copy of the ScopeFilter struct from pkg/apis/scope/v0alpha1/types.go
+type FilterOperator string
+
+// Hand copy of enum from pkg/apis/scope/v0alpha1/types.go
+const (
+	FilterOperatorEquals        FilterOperator = "equals"
+	FilterOperatorNotEquals     FilterOperator = "not-equals"
+	FilterOperatorRegexMatch    FilterOperator = "regex-match"
+	FilterOperatorRegexNotMatch FilterOperator = "regex-not-match"
+)
+
+// Internal interval and range variables
+const (
+	varInterval       = "$__interval"
+	varIntervalMs     = "$__interval_ms"
+	varRange          = "$__range"
+	varRangeS         = "$__range_s"
+	varRangeMs        = "$__range_ms"
+	varRateInterval   = "$__rate_interval"
+	varRateIntervalMs = "$__rate_interval_ms"
+)
+
+// Internal interval and range variables with {} syntax
+// Repetitive code, we should have functionality to unify these
+const (
+	varIntervalAlt       = "${__interval}"
+	varIntervalMsAlt     = "${__interval_ms}"
+	varRangeAlt          = "${__range}"
+	varRangeSAlt         = "${__range_s}"
+	varRangeMsAlt        = "${__range_ms}"
+	varRateIntervalAlt   = "${__rate_interval}"
+	varRateIntervalMsAlt = "${__rate_interval_ms}"
+)
+
+type TimeSeriesQueryType string
+
+const (
+	RangeQueryType    TimeSeriesQueryType = "range"
+	InstantQueryType  TimeSeriesQueryType = "instant"
+	ExemplarQueryType TimeSeriesQueryType = "exemplar"
+	UnknownQueryType  TimeSeriesQueryType = "unknown"
+)
+
+var safeResolution = 11000
+
+// QueryModel includes both the common and specific values
+type QueryModel struct {
+	PrometheusQueryProperties    `json:",inline"`
+	sdkapi.CommonQueryProperties `json:",inline"`
+
+	// The following properties may be part of the request payload, however they are not saved in panel JSON
+	// Timezone offset to align start & end time on backend
+	UtcOffsetSec int64  `json:"utcOffsetSec,omitempty"`
+	Interval     string `json:"interval,omitempty"`
+}
+
+type TimeRange struct {
+	Start time.Time
+	End   time.Time
+	Step  time.Duration
+}
+
+// The internal query object
+type Query struct {
+	Expr          string
+	Step          time.Duration
+	LegendFormat  string
+	Start         time.Time
+	End           time.Time
+	RefId         string
+	InstantQuery  bool
+	RangeQuery    bool
+	ExemplarQuery bool
+	UtcOffsetSec  int64
+	Scope         *ScopeSpec
+}
+
+type Scope struct {
+	Matchers []*labels.Matcher
+}
+
+func Parse(query backend.DataQuery, dsScrapeInterval string, intervalCalculator intervalv2.Calculator, fromAlert bool, enableScope bool) (*Query, error) {
+	model := &QueryModel{}
+	if err := json.Unmarshal(query.JSON, model); err != nil {
+		return nil, err
+	}
+
+	// Final step value for prometheus
+	calculatedStep, err := calculatePrometheusInterval(model.Interval, dsScrapeInterval, int64(model.IntervalMS), model.IntervalFactor, query, intervalCalculator)
+	if err != nil {
+		return nil, err
+	}
+
+	// Interpolate variables in expr
+	timeRange := query.TimeRange.To.Sub(query.TimeRange.From)
+	expr := interpolateVariables(
+		model.Expr,
+		query.Interval,
+		calculatedStep,
+		model.Interval,
+		dsScrapeInterval,
+		timeRange,
+	)
+	if enableScope && model.Scope != nil && len(model.Scope.Filters) > 0 {
+		expr, err = ApplyQueryScope(expr, *model.Scope)
+		if err != nil {
+			return nil, err
+		}
+	}
+	if !model.Instant && !model.Range {
+		// In older dashboards, we were not setting range query param and !range && !instant was run as range query
+		model.Range = true
+	}
+
+	// We never want to run exemplar query for alerting
+	if fromAlert {
+		model.Exemplar = false
+	}
+
+	return &Query{
+		Expr:          expr,
+		Step:          calculatedStep,
+		LegendFormat:  model.LegendFormat,
+		Start:         query.TimeRange.From,
+		End:           query.TimeRange.To,
+		RefId:         query.RefID,
+		InstantQuery:  model.Instant,
+		RangeQuery:    model.Range,
+		ExemplarQuery: model.Exemplar,
+		UtcOffsetSec:  model.UtcOffsetSec,
+	}, nil
+}
+
+func (query *Query) Type() TimeSeriesQueryType {
+	if query.InstantQuery {
+		return InstantQueryType
+	}
+	if query.RangeQuery {
+		return RangeQueryType
+	}
+	if query.ExemplarQuery {
+		return ExemplarQueryType
+	}
+	return UnknownQueryType
+}
+
+func (query *Query) TimeRange() TimeRange {
+	return TimeRange{
+		Step: query.Step,
+		// Align query range to step. It rounds start and end down to a multiple of step.
+		Start: AlignTimeRange(query.Start, query.Step, query.UtcOffsetSec),
+		End:   AlignTimeRange(query.End, query.Step, query.UtcOffsetSec),
+	}
+}
+
+func calculatePrometheusInterval(
+	queryInterval, dsScrapeInterval string,
+	intervalMs, intervalFactor int64,
+	query backend.DataQuery,
+	intervalCalculator intervalv2.Calculator,
+) (time.Duration, error) {
+	// we need to compare the original query model after it is overwritten below to variables so that we can
+	// calculate the rateInterval if it is equal to $__rate_interval or ${__rate_interval}
+	originalQueryInterval := queryInterval
+
+	// If we are using variable for interval/step, we will replace it with calculated interval
+	if isVariableInterval(queryInterval) {
+		queryInterval = ""
+	}
+
+	minInterval, err := gtime.GetIntervalFrom(dsScrapeInterval, queryInterval, intervalMs, 15*time.Second)
+	if err != nil {
+		return time.Duration(0), err
+	}
+	calculatedInterval := intervalCalculator.Calculate(query.TimeRange, minInterval, query.MaxDataPoints)
+	safeInterval := intervalCalculator.CalculateSafeInterval(query.TimeRange, int64(safeResolution))
+
+	adjustedInterval := safeInterval.Value
+	if calculatedInterval.Value > safeInterval.Value {
+		adjustedInterval = calculatedInterval.Value
+	}
+
+	// here is where we compare for $__rate_interval or ${__rate_interval}
+	if originalQueryInterval == varRateInterval || originalQueryInterval == varRateIntervalAlt {
+		// Rate interval is final and is not affected by resolution
+		return calculateRateInterval(adjustedInterval, dsScrapeInterval), nil
+	} else {
+		queryIntervalFactor := intervalFactor
+		if queryIntervalFactor == 0 {
+			queryIntervalFactor = 1
+		}
+		return time.Duration(int64(adjustedInterval) * queryIntervalFactor), nil
+	}
+}
+
+// calculateRateInterval calculates the $__rate_interval value
+// queryInterval is the value calculated range / maxDataPoints on the frontend
+// queryInterval is shown on the Query Options Panel above the query editor
+// requestedMinStep is the data source scrape interval (default 15s)
+// requestedMinStep can be changed by setting "Min Step" value in Options panel below the code editor
+func calculateRateInterval(
+	queryInterval time.Duration,
+	requestedMinStep string,
+) time.Duration {
+	scrape := requestedMinStep
+	if scrape == "" {
+		scrape = "15s"
+	}
+
+	scrapeIntervalDuration, err := gtime.ParseIntervalStringToTimeDuration(scrape)
+	if err != nil {
+		return time.Duration(0)
+	}
+
+	rateInterval := time.Duration(int64(math.Max(float64(queryInterval+scrapeIntervalDuration), float64(4)*float64(scrapeIntervalDuration))))
+	return rateInterval
+}
+
+// interpolateVariables interpolates built-in variables
+// expr                         PromQL query
+// queryInterval                Requested interval in milliseconds. This value may be overridden by MinStep in query options
+// calculatedStep               Calculated final step value. It was calculated in calculatePrometheusInterval
+// requestedMinStep             Requested minimum step value. QueryModel.interval
+// dsScrapeInterval             Data source scrape interval in the config
+// timeRange                    Requested time range for query
+func interpolateVariables(
+	expr string,
+	queryInterval time.Duration,
+	calculatedStep time.Duration,
+	requestedMinStep string,
+	dsScrapeInterval string,
+	timeRange time.Duration,
+) string {
+	rangeMs := timeRange.Milliseconds()
+	rangeSRounded := int64(math.Round(float64(rangeMs) / 1000.0))
+
+	var rateInterval time.Duration
+	if requestedMinStep == varRateInterval || requestedMinStep == varRateIntervalAlt {
+		rateInterval = calculatedStep
+	} else {
+		if requestedMinStep == varInterval || requestedMinStep == varIntervalAlt {
+			requestedMinStep = calculatedStep.String()
+		}
+		if requestedMinStep == "" {
+			requestedMinStep = dsScrapeInterval
+		}
+		rateInterval = calculateRateInterval(queryInterval, requestedMinStep)
+	}
+
+	expr = strings.ReplaceAll(expr, varIntervalMs, strconv.FormatInt(int64(calculatedStep/time.Millisecond), 10))
+	expr = strings.ReplaceAll(expr, varInterval, gtime.FormatInterval(calculatedStep))
+	expr = strings.ReplaceAll(expr, varRangeMs, strconv.FormatInt(rangeMs, 10))
+	expr = strings.ReplaceAll(expr, varRangeS, strconv.FormatInt(rangeSRounded, 10))
+	expr = strings.ReplaceAll(expr, varRange, strconv.FormatInt(rangeSRounded, 10)+"s")
+	expr = strings.ReplaceAll(expr, varRateIntervalMs, strconv.FormatInt(int64(rateInterval/time.Millisecond), 10))
+	expr = strings.ReplaceAll(expr, varRateInterval, rateInterval.String())
+
+	// Repetitive code, we should have functionality to unify these
+	expr = strings.ReplaceAll(expr, varIntervalMsAlt, strconv.FormatInt(int64(calculatedStep/time.Millisecond), 10))
+	expr = strings.ReplaceAll(expr, varIntervalAlt, gtime.FormatInterval(calculatedStep))
+	expr = strings.ReplaceAll(expr, varRangeMsAlt, strconv.FormatInt(rangeMs, 10))
+	expr = strings.ReplaceAll(expr, varRangeSAlt, strconv.FormatInt(rangeSRounded, 10))
+	expr = strings.ReplaceAll(expr, varRangeAlt, strconv.FormatInt(rangeSRounded, 10)+"s")
+	expr = strings.ReplaceAll(expr, varRateIntervalMsAlt, strconv.FormatInt(int64(rateInterval/time.Millisecond), 10))
+	expr = strings.ReplaceAll(expr, varRateIntervalAlt, rateInterval.String())
+	return expr
+}
+
+func isVariableInterval(interval string) bool {
+	if interval == varInterval || interval == varIntervalMs || interval == varRateInterval || interval == varRateIntervalMs {
+		return true
+	}
+	// Repetitive code, we should have functionality to unify these
+	if interval == varIntervalAlt || interval == varIntervalMsAlt || interval == varRateIntervalAlt || interval == varRateIntervalMsAlt {
+		return true
+	}
+	return false
+}
+
+// AlignTimeRange aligns query range to step and handles the time offset.
+// It rounds start and end down to a multiple of step.
+// Prometheus caching is dependent on the range being aligned with the step.
+// Rounding to the step can significantly change the start and end of the range for larger steps, i.e. a week.
+// In rounding the range to a 1w step the range will always start on a Thursday.
+func AlignTimeRange(t time.Time, step time.Duration, offset int64) time.Time {
+	offsetNano := float64(offset * 1e9)
+	stepNano := float64(step.Nanoseconds())
+	return time.Unix(0, int64(math.Floor((float64(t.UnixNano())+offsetNano)/stepNano)*stepNano-offsetNano)).UTC()
+}
+
+//go:embed query.types.json
+var f embed.FS
+
+// QueryTypeDefinitionsJSON returns the query type definitions
+func QueryTypeDefinitionsJSON() (json.RawMessage, error) {
+	return f.ReadFile("query.types.json")
+}
diff --git a/pkg/promlib/models/query.panel.example.json b/pkg/promlib/models/query.panel.example.json
new file mode 100644
index 0000000000000..bf2157c2a4236
--- /dev/null
+++ b/pkg/promlib/models/query.panel.example.json
@@ -0,0 +1,13 @@
+{
+  "type": "table",
+  "targets": [
+    {
+      "refId": "A",
+      "datasource": {
+        "type": "prometheus",
+        "uid": "TheUID"
+      },
+      "expr": "1+1"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/promlib/models/query.panel.schema.json b/pkg/promlib/models/query.panel.schema.json
new file mode 100644
index 0000000000000..ffd2328f1de20
--- /dev/null
+++ b/pkg/promlib/models/query.panel.schema.json
@@ -0,0 +1,229 @@
+{
+  "type": "object",
+  "required": [
+    "targets",
+    "type"
+  ],
+  "properties": {
+    "targets": {
+      "type": "array",
+      "items": {
+        "description": "PrometheusQueryProperties defines the specific properties used for prometheus",
+        "type": "object",
+        "required": [
+          "expr"
+        ],
+        "properties": {
+          "datasource": {
+            "description": "The datasource",
+            "type": "object",
+            "required": [
+              "type"
+            ],
+            "properties": {
+              "type": {
+                "description": "The datasource plugin type",
+                "type": "string",
+                "pattern": "^prometheus$"
+              },
+              "uid": {
+                "description": "Datasource UID",
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          },
+          "editorMode": {
+            "description": "what we should show in the editor\n\n\nPossible enum values:\n - `\"builder\"` \n - `\"code\"` ",
+            "type": "string",
+            "enum": [
+              "builder",
+              "code"
+            ],
+            "x-enum-description": {}
+          },
+          "exemplar": {
+            "description": "Execute an additional query to identify interesting raw samples relevant for the given expr",
+            "type": "boolean"
+          },
+          "expr": {
+            "description": "The actual expression/query that will be evaluated by Prometheus",
+            "type": "string"
+          },
+          "format": {
+            "description": "The response format\n\n\nPossible enum values:\n - `\"time_series\"` \n - `\"table\"` \n - `\"heatmap\"` ",
+            "type": "string",
+            "enum": [
+              "time_series",
+              "table",
+              "heatmap"
+            ],
+            "x-enum-description": {}
+          },
+          "hide": {
+            "description": "true if query is disabled (ie should not be returned to the dashboard)\nNOTE: this does not always imply that the query should not be executed since\nthe results from a hidden query may be used as the input to other queries (SSE etc)",
+            "type": "boolean"
+          },
+          "instant": {
+            "description": "Returns only the latest value that Prometheus has scraped for the requested time series",
+            "type": "boolean"
+          },
+          "intervalFactor": {
+            "description": "Used to specify how many times to divide max data points by. We use max data points under query options\nSee https://github.com/grafana/grafana/issues/48081\nDeprecated: use interval",
+            "type": "integer"
+          },
+          "intervalMs": {
+            "description": "Interval is the suggested duration between time points in a time series query.\nNOTE: the values for intervalMs is not saved in the query model.  It is typically calculated\nfrom the interval required to fill a pixels in the visualization",
+            "type": "number"
+          },
+          "legendFormat": {
+            "description": "Series name override or template. Ex. {{hostname}} will be replaced with label value for hostname",
+            "type": "string"
+          },
+          "maxDataPoints": {
+            "description": "MaxDataPoints is the maximum number of data points that should be returned from a time series query.\nNOTE: the values for maxDataPoints is not saved in the query model.  It is typically calculated\nfrom the number of pixels visible in a visualization",
+            "type": "integer"
+          },
+          "queryType": {
+            "description": "QueryType is an optional identifier for the type of query.\nIt can be used to distinguish different types of queries.",
+            "type": "string"
+          },
+          "range": {
+            "description": "Returns a Range vector, comprised of a set of time series containing a range of data points over time for each time series",
+            "type": "boolean"
+          },
+          "refId": {
+            "description": "RefID is the unique identifier of the query, set by the frontend call.",
+            "type": "string"
+          },
+          "resultAssertions": {
+            "description": "Optionally define expected query result behavior",
+            "type": "object",
+            "required": [
+              "typeVersion"
+            ],
+            "properties": {
+              "maxFrames": {
+                "description": "Maximum frame count",
+                "type": "integer"
+              },
+              "type": {
+                "description": "Type asserts that the frame matches a known type structure.\n\n\nPossible enum values:\n - `\"\"` \n - `\"timeseries-wide\"` \n - `\"timeseries-long\"` \n - `\"timeseries-many\"` \n - `\"timeseries-multi\"` \n - `\"directory-listing\"` \n - `\"table\"` \n - `\"numeric-wide\"` \n - `\"numeric-multi\"` \n - `\"numeric-long\"` \n - `\"log-lines\"` ",
+                "type": "string",
+                "enum": [
+                  "",
+                  "timeseries-wide",
+                  "timeseries-long",
+                  "timeseries-many",
+                  "timeseries-multi",
+                  "directory-listing",
+                  "table",
+                  "numeric-wide",
+                  "numeric-multi",
+                  "numeric-long",
+                  "log-lines"
+                ],
+                "x-enum-description": {}
+              },
+              "typeVersion": {
+                "description": "TypeVersion is the version of the Type property. Versions greater than 0.0 correspond to the dataplane\ncontract documentation https://grafana.github.io/dataplane/contract/.",
+                "type": "array",
+                "maxItems": 2,
+                "minItems": 2,
+                "items": {
+                  "type": "integer"
+                }
+              }
+            },
+            "additionalProperties": false
+          },
+          "scope": {
+            "description": "???",
+            "type": "object",
+            "required": [
+              "title",
+              "type",
+              "description",
+              "category",
+              "filters"
+            ],
+            "properties": {
+              "category": {
+                "type": "string"
+              },
+              "description": {
+                "type": "string"
+              },
+              "filters": {
+                "type": "array",
+                "items": {
+                  "description": "ScopeFilter is a hand copy of the ScopeFilter struct from pkg/apis/scope/v0alpha1/types.go to avoid import (temp fix)",
+                  "type": "object",
+                  "required": [
+                    "key",
+                    "value",
+                    "operator"
+                  ],
+                  "properties": {
+                    "key": {
+                      "type": "string"
+                    },
+                    "operator": {
+                      "type": "string"
+                    },
+                    "value": {
+                      "type": "string"
+                    }
+                  },
+                  "additionalProperties": false
+                }
+              },
+              "title": {
+                "type": "string"
+              },
+              "type": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          },
+          "timeRange": {
+            "description": "TimeRange represents the query range\nNOTE: unlike generic /ds/query, we can now send explicit time values in each query\nNOTE: the values for timeRange are not saved in a dashboard, they are constructed on the fly",
+            "type": "object",
+            "required": [
+              "from",
+              "to"
+            ],
+            "properties": {
+              "from": {
+                "description": "From is the start time of the query.",
+                "type": "string",
+                "default": "now-6h",
+                "examples": [
+                  "now-1h"
+                ]
+              },
+              "to": {
+                "description": "To is the end time of the query.",
+                "type": "string",
+                "default": "now",
+                "examples": [
+                  "now"
+                ]
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false,
+        "$schema": "https://json-schema.org/draft-04/schema#"
+      }
+    },
+    "type": {
+      "description": "the panel type",
+      "type": "string"
+    }
+  },
+  "additionalProperties": true,
+  "$schema": "https://json-schema.org/draft-04/schema#"
+}
\ No newline at end of file
diff --git a/pkg/promlib/models/query.request.example.json b/pkg/promlib/models/query.request.example.json
new file mode 100644
index 0000000000000..85946db6aef8a
--- /dev/null
+++ b/pkg/promlib/models/query.request.example.json
@@ -0,0 +1,12 @@
+{
+  "from": "now-1h",
+  "to": "now",
+  "queries": [
+    {
+      "refId": "A",
+      "maxDataPoints": 1000,
+      "intervalMs": 5,
+      "expr": "1+1"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/promlib/models/query.request.schema.json b/pkg/promlib/models/query.request.schema.json
new file mode 100644
index 0000000000000..c8e797d1f381a
--- /dev/null
+++ b/pkg/promlib/models/query.request.schema.json
@@ -0,0 +1,239 @@
+{
+  "type": "object",
+  "required": [
+    "queries"
+  ],
+  "properties": {
+    "$schema": {
+      "description": "helper",
+      "type": "string"
+    },
+    "debug": {
+      "type": "boolean"
+    },
+    "from": {
+      "description": "From Start time in epoch timestamps in milliseconds or relative using Grafana time units.",
+      "type": "string"
+    },
+    "queries": {
+      "type": "array",
+      "items": {
+        "description": "PrometheusQueryProperties defines the specific properties used for prometheus",
+        "type": "object",
+        "required": [
+          "expr"
+        ],
+        "properties": {
+          "datasource": {
+            "description": "The datasource",
+            "type": "object",
+            "required": [
+              "type"
+            ],
+            "properties": {
+              "type": {
+                "description": "The datasource plugin type",
+                "type": "string",
+                "pattern": "^prometheus$"
+              },
+              "uid": {
+                "description": "Datasource UID",
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          },
+          "editorMode": {
+            "description": "what we should show in the editor\n\n\nPossible enum values:\n - `\"builder\"` \n - `\"code\"` ",
+            "type": "string",
+            "enum": [
+              "builder",
+              "code"
+            ],
+            "x-enum-description": {}
+          },
+          "exemplar": {
+            "description": "Execute an additional query to identify interesting raw samples relevant for the given expr",
+            "type": "boolean"
+          },
+          "expr": {
+            "description": "The actual expression/query that will be evaluated by Prometheus",
+            "type": "string"
+          },
+          "format": {
+            "description": "The response format\n\n\nPossible enum values:\n - `\"time_series\"` \n - `\"table\"` \n - `\"heatmap\"` ",
+            "type": "string",
+            "enum": [
+              "time_series",
+              "table",
+              "heatmap"
+            ],
+            "x-enum-description": {}
+          },
+          "hide": {
+            "description": "true if query is disabled (ie should not be returned to the dashboard)\nNOTE: this does not always imply that the query should not be executed since\nthe results from a hidden query may be used as the input to other queries (SSE etc)",
+            "type": "boolean"
+          },
+          "instant": {
+            "description": "Returns only the latest value that Prometheus has scraped for the requested time series",
+            "type": "boolean"
+          },
+          "intervalFactor": {
+            "description": "Used to specify how many times to divide max data points by. We use max data points under query options\nSee https://github.com/grafana/grafana/issues/48081\nDeprecated: use interval",
+            "type": "integer"
+          },
+          "intervalMs": {
+            "description": "Interval is the suggested duration between time points in a time series query.\nNOTE: the values for intervalMs is not saved in the query model.  It is typically calculated\nfrom the interval required to fill a pixels in the visualization",
+            "type": "number"
+          },
+          "legendFormat": {
+            "description": "Series name override or template. Ex. {{hostname}} will be replaced with label value for hostname",
+            "type": "string"
+          },
+          "maxDataPoints": {
+            "description": "MaxDataPoints is the maximum number of data points that should be returned from a time series query.\nNOTE: the values for maxDataPoints is not saved in the query model.  It is typically calculated\nfrom the number of pixels visible in a visualization",
+            "type": "integer"
+          },
+          "queryType": {
+            "description": "QueryType is an optional identifier for the type of query.\nIt can be used to distinguish different types of queries.",
+            "type": "string"
+          },
+          "range": {
+            "description": "Returns a Range vector, comprised of a set of time series containing a range of data points over time for each time series",
+            "type": "boolean"
+          },
+          "refId": {
+            "description": "RefID is the unique identifier of the query, set by the frontend call.",
+            "type": "string"
+          },
+          "resultAssertions": {
+            "description": "Optionally define expected query result behavior",
+            "type": "object",
+            "required": [
+              "typeVersion"
+            ],
+            "properties": {
+              "maxFrames": {
+                "description": "Maximum frame count",
+                "type": "integer"
+              },
+              "type": {
+                "description": "Type asserts that the frame matches a known type structure.\n\n\nPossible enum values:\n - `\"\"` \n - `\"timeseries-wide\"` \n - `\"timeseries-long\"` \n - `\"timeseries-many\"` \n - `\"timeseries-multi\"` \n - `\"directory-listing\"` \n - `\"table\"` \n - `\"numeric-wide\"` \n - `\"numeric-multi\"` \n - `\"numeric-long\"` \n - `\"log-lines\"` ",
+                "type": "string",
+                "enum": [
+                  "",
+                  "timeseries-wide",
+                  "timeseries-long",
+                  "timeseries-many",
+                  "timeseries-multi",
+                  "directory-listing",
+                  "table",
+                  "numeric-wide",
+                  "numeric-multi",
+                  "numeric-long",
+                  "log-lines"
+                ],
+                "x-enum-description": {}
+              },
+              "typeVersion": {
+                "description": "TypeVersion is the version of the Type property. Versions greater than 0.0 correspond to the dataplane\ncontract documentation https://grafana.github.io/dataplane/contract/.",
+                "type": "array",
+                "maxItems": 2,
+                "minItems": 2,
+                "items": {
+                  "type": "integer"
+                }
+              }
+            },
+            "additionalProperties": false
+          },
+          "scope": {
+            "description": "???",
+            "type": "object",
+            "required": [
+              "title",
+              "type",
+              "description",
+              "category",
+              "filters"
+            ],
+            "properties": {
+              "category": {
+                "type": "string"
+              },
+              "description": {
+                "type": "string"
+              },
+              "filters": {
+                "type": "array",
+                "items": {
+                  "description": "ScopeFilter is a hand copy of the ScopeFilter struct from pkg/apis/scope/v0alpha1/types.go to avoid import (temp fix)",
+                  "type": "object",
+                  "required": [
+                    "key",
+                    "value",
+                    "operator"
+                  ],
+                  "properties": {
+                    "key": {
+                      "type": "string"
+                    },
+                    "operator": {
+                      "type": "string"
+                    },
+                    "value": {
+                      "type": "string"
+                    }
+                  },
+                  "additionalProperties": false
+                }
+              },
+              "title": {
+                "type": "string"
+              },
+              "type": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          },
+          "timeRange": {
+            "description": "TimeRange represents the query range\nNOTE: unlike generic /ds/query, we can now send explicit time values in each query\nNOTE: the values for timeRange are not saved in a dashboard, they are constructed on the fly",
+            "type": "object",
+            "required": [
+              "from",
+              "to"
+            ],
+            "properties": {
+              "from": {
+                "description": "From is the start time of the query.",
+                "type": "string",
+                "default": "now-6h",
+                "examples": [
+                  "now-1h"
+                ]
+              },
+              "to": {
+                "description": "To is the end time of the query.",
+                "type": "string",
+                "default": "now",
+                "examples": [
+                  "now"
+                ]
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false,
+        "$schema": "https://json-schema.org/draft-04/schema#"
+      }
+    },
+    "to": {
+      "description": "To end time in epoch timestamps in milliseconds or relative using Grafana time units.",
+      "type": "string"
+    }
+  },
+  "additionalProperties": false,
+  "$schema": "https://json-schema.org/draft-04/schema#"
+}
\ No newline at end of file
diff --git a/pkg/promlib/models/query.types.json b/pkg/promlib/models/query.types.json
new file mode 100644
index 0000000000000..7ae0e10374e2b
--- /dev/null
+++ b/pkg/promlib/models/query.types.json
@@ -0,0 +1,130 @@
+{
+  "kind": "QueryTypeDefinitionList",
+  "apiVersion": "query.grafana.app/v0alpha1",
+  "metadata": {
+    "resourceVersion": "1711372744903"
+  },
+  "items": [
+    {
+      "metadata": {
+        "name": "default",
+        "resourceVersion": "1711374012365",
+        "creationTimestamp": "2024-03-25T13:19:04Z"
+      },
+      "spec": {
+        "schema": {
+          "$schema": "https://json-schema.org/draft-04/schema",
+          "additionalProperties": false,
+          "description": "PrometheusQueryProperties defines the specific properties used for prometheus",
+          "properties": {
+            "editorMode": {
+              "description": "what we should show in the editor\n\n\nPossible enum values:\n - `\"builder\"` \n - `\"code\"` ",
+              "enum": [
+                "builder",
+                "code"
+              ],
+              "type": "string",
+              "x-enum-description": {}
+            },
+            "exemplar": {
+              "description": "Execute an additional query to identify interesting raw samples relevant for the given expr",
+              "type": "boolean"
+            },
+            "expr": {
+              "description": "The actual expression/query that will be evaluated by Prometheus",
+              "type": "string"
+            },
+            "format": {
+              "description": "The response format\n\n\nPossible enum values:\n - `\"time_series\"` \n - `\"table\"` \n - `\"heatmap\"` ",
+              "enum": [
+                "time_series",
+                "table",
+                "heatmap"
+              ],
+              "type": "string",
+              "x-enum-description": {}
+            },
+            "instant": {
+              "description": "Returns only the latest value that Prometheus has scraped for the requested time series",
+              "type": "boolean"
+            },
+            "intervalFactor": {
+              "description": "Used to specify how many times to divide max data points by. We use max data points under query options\nSee https://github.com/grafana/grafana/issues/48081\nDeprecated: use interval",
+              "type": "integer"
+            },
+            "legendFormat": {
+              "description": "Series name override or template. Ex. {{hostname}} will be replaced with label value for hostname",
+              "type": "string"
+            },
+            "range": {
+              "description": "Returns a Range vector, comprised of a set of time series containing a range of data points over time for each time series",
+              "type": "boolean"
+            },
+            "scope": {
+              "additionalProperties": false,
+              "description": "???",
+              "properties": {
+                "category": {
+                  "type": "string"
+                },
+                "description": {
+                  "type": "string"
+                },
+                "filters": {
+                  "items": {
+                    "additionalProperties": false,
+                    "description": "ScopeFilter is a hand copy of the ScopeFilter struct from pkg/apis/scope/v0alpha1/types.go to avoid import (temp fix)",
+                    "properties": {
+                      "key": {
+                        "type": "string"
+                      },
+                      "operator": {
+                        "type": "string"
+                      },
+                      "value": {
+                        "type": "string"
+                      }
+                    },
+                    "required": [
+                      "key",
+                      "value",
+                      "operator"
+                    ],
+                    "type": "object"
+                  },
+                  "type": "array"
+                },
+                "title": {
+                  "type": "string"
+                },
+                "type": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "title",
+                "type",
+                "description",
+                "category",
+                "filters"
+              ],
+              "type": "object"
+            }
+          },
+          "required": [
+            "expr"
+          ],
+          "type": "object"
+        },
+        "examples": [
+          {
+            "name": "simple health check",
+            "saveModel": {
+              "expr": "1+1"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/promlib/models/query_test.go b/pkg/promlib/models/query_test.go
new file mode 100644
index 0000000000000..3bba6eb78d9f0
--- /dev/null
+++ b/pkg/promlib/models/query_test.go
@@ -0,0 +1,821 @@
+package models_test
+
+import (
+	"fmt"
+	"reflect"
+	"testing"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	sdkapi "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+	"github.com/grafana/grafana-plugin-sdk-go/experimental/schemabuilder"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/promlib/intervalv2"
+	"github.com/grafana/grafana/pkg/promlib/models"
+)
+
+var (
+	now                = time.Now()
+	intervalCalculator = intervalv2.NewCalculator()
+)
+
+func TestParse(t *testing.T) {
+	t.Run("parsing query from unified alerting", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(12 * time.Hour),
+		}
+
+		queryJson := `{
+			"expr": "go_goroutines",
+			"refId": "A",
+			"exemplar": true
+		}`
+
+		q := backend.DataQuery{
+			JSON:      []byte(queryJson),
+			TimeRange: timeRange,
+			RefID:     "A",
+		}
+
+		res, err := models.Parse(q, "15s", intervalCalculator, true, false)
+		require.NoError(t, err)
+		require.Equal(t, false, res.ExemplarQuery)
+	})
+
+	t.Run("parsing query model with step", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(12 * time.Hour),
+		}
+
+		q := queryContext(`{
+			"expr": "go_goroutines",
+			"format": "time_series",
+			"refId": "A"
+		}`, timeRange, time.Duration(1)*time.Minute)
+
+		res, err := models.Parse(q, "15s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, time.Second*30, res.Step)
+	})
+
+	t.Run("parsing query model without step parameter", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(1 * time.Hour),
+		}
+
+		q := queryContext(`{
+			"expr": "go_goroutines",
+			"format": "time_series",
+			"intervalFactor": 1,
+			"refId": "A"
+		}`, timeRange, time.Duration(1)*time.Minute)
+
+		res, err := models.Parse(q, "15s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, time.Second*15, res.Step)
+	})
+
+	t.Run("parsing query model with high intervalFactor", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(48 * time.Hour),
+		}
+
+		q := queryContext(`{
+			"expr": "go_goroutines",
+			"format": "time_series",
+			"intervalFactor": 10,
+			"refId": "A"
+		}`, timeRange, time.Duration(1)*time.Minute)
+
+		res, err := models.Parse(q, "15s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, time.Minute*20, res.Step)
+	})
+
+	t.Run("parsing query model with low intervalFactor", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(48 * time.Hour),
+		}
+
+		q := queryContext(`{
+			"expr": "go_goroutines",
+			"format": "time_series",
+			"intervalFactor": 1,
+			"refId": "A"
+		}`, timeRange, time.Duration(1)*time.Minute)
+
+		res, err := models.Parse(q, "15s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, time.Minute*2, res.Step)
+	})
+
+	t.Run("parsing query model specified scrape-interval in the data source", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(48 * time.Hour),
+		}
+
+		q := queryContext(`{
+			"expr": "go_goroutines",
+			"format": "time_series",
+			"intervalFactor": 1,
+			"refId": "A"
+		}`, timeRange, time.Duration(1)*time.Minute)
+
+		res, err := models.Parse(q, "240s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, time.Minute*4, res.Step)
+	})
+
+	t.Run("parsing query model with $__interval variable", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(48 * time.Hour),
+		}
+
+		q := queryContext(`{
+			"expr": "rate(ALERTS{job=\"test\" [$__interval]})",
+			"format": "time_series",
+			"intervalFactor": 1,
+			"intervalMs": 60000,
+			"refId": "A"
+		}`, timeRange, time.Duration(1)*time.Minute)
+
+		res, err := models.Parse(q, "15s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, "rate(ALERTS{job=\"test\" [2m]})", res.Expr)
+		require.Equal(t, 120*time.Second, res.Step)
+	})
+
+	t.Run("parsing query model with ${__interval} variable", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(48 * time.Hour),
+		}
+
+		q := queryContext(`{
+			"expr": "rate(ALERTS{job=\"test\" [${__interval}]})",
+			"format": "time_series",
+			"intervalFactor": 1,
+			"interval": "1m",
+			"intervalMs": 60000,
+			"refId": "A"
+		}`, timeRange, time.Duration(1)*time.Minute)
+
+		res, err := models.Parse(q, "15s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, "rate(ALERTS{job=\"test\" [2m]})", res.Expr)
+	})
+
+	t.Run("parsing query model with $__interval_ms variable", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(48 * time.Hour),
+		}
+
+		q := queryContext(`{
+			"expr": "rate(ALERTS{job=\"test\" [$__interval_ms]})",
+			"format": "time_series",
+			"intervalFactor": 1,
+			"intervalMs": 60000,
+			"refId": "A"
+		}`, timeRange, time.Duration(1)*time.Minute)
+
+		res, err := models.Parse(q, "15s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, "rate(ALERTS{job=\"test\" [120000]})", res.Expr)
+	})
+
+	t.Run("parsing query model with $__interval_ms and $__interval variable", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(48 * time.Hour),
+		}
+
+		q := queryContext(`{
+			"expr": "rate(ALERTS{job=\"test\" [$__interval_ms]}) + rate(ALERTS{job=\"test\" [$__interval]})",
+			"format": "time_series",
+			"intervalFactor": 1,
+			"intervalMs": 60000,
+			"refId": "A"
+		}`, timeRange, time.Duration(1)*time.Minute)
+
+		res, err := models.Parse(q, "15s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, "rate(ALERTS{job=\"test\" [120000]}) + rate(ALERTS{job=\"test\" [2m]})", res.Expr)
+	})
+
+	t.Run("parsing query model with ${__interval_ms} and ${__interval} variable", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(48 * time.Hour),
+		}
+
+		q := queryContext(`{
+			"expr": "rate(ALERTS{job=\"test\" [${__interval_ms}]}) + rate(ALERTS{job=\"test\" [${__interval}]})",
+			"format": "time_series",
+			"intervalFactor": 1,
+			"intervalMs": 60000,
+			"refId": "A"
+		}`, timeRange, time.Duration(1)*time.Minute)
+
+		res, err := models.Parse(q, "15s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, "rate(ALERTS{job=\"test\" [120000]}) + rate(ALERTS{job=\"test\" [2m]})", res.Expr)
+	})
+
+	t.Run("parsing query model with $__range variable", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(48 * time.Hour),
+		}
+
+		q := queryContext(`{
+			"expr": "rate(ALERTS{job=\"test\" [$__range]})",
+			"format": "time_series",
+			"intervalFactor": 1,
+			"refId": "A"
+		}`, timeRange, time.Duration(1)*time.Minute)
+
+		res, err := models.Parse(q, "15s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, "rate(ALERTS{job=\"test\" [172800s]})", res.Expr)
+	})
+
+	t.Run("parsing query model with $__range_s variable", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(48 * time.Hour),
+		}
+
+		q := queryContext(`{
+			"expr": "rate(ALERTS{job=\"test\" [$__range_s]})",
+			"format": "time_series",
+			"intervalFactor": 1,
+			"refId": "A"
+		}`, timeRange, time.Duration(1)*time.Minute)
+
+		res, err := models.Parse(q, "15s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, "rate(ALERTS{job=\"test\" [172800]})", res.Expr)
+	})
+
+	t.Run("parsing query model with ${__range_s} variable", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(48 * time.Hour),
+		}
+
+		q := queryContext(`{
+			"expr": "rate(ALERTS{job=\"test\" [${__range_s}s]})",
+			"format": "time_series",
+			"intervalFactor": 1,
+			"refId": "A"
+		}`, timeRange, time.Duration(1)*time.Minute)
+
+		res, err := models.Parse(q, "15s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, "rate(ALERTS{job=\"test\" [172800s]})", res.Expr)
+	})
+
+	t.Run("parsing query model with $__range_s variable below 0.5s", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(40 * time.Millisecond),
+		}
+
+		q := queryContext(`{
+			"expr": "rate(ALERTS{job=\"test\" [$__range_s]})",
+			"format": "time_series",
+			"intervalFactor": 1,
+			"refId": "A"
+		}`, timeRange, time.Duration(1)*time.Minute)
+
+		res, err := models.Parse(q, "15s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, "rate(ALERTS{job=\"test\" [0]})", res.Expr)
+	})
+
+	t.Run("parsing query model with $__range_s variable between 1-0.5s", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(800 * time.Millisecond),
+		}
+
+		q := queryContext(`{
+			"expr": "rate(ALERTS{job=\"test\" [$__range_s]})",
+			"format": "time_series",
+			"intervalFactor": 1,
+			"refId": "A"
+		}`, timeRange, time.Duration(1)*time.Minute)
+
+		res, err := models.Parse(q, "15s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, "rate(ALERTS{job=\"test\" [1]})", res.Expr)
+	})
+
+	t.Run("parsing query model with $__range_ms variable", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(48 * time.Hour),
+		}
+
+		q := queryContext(`{
+			"expr": "rate(ALERTS{job=\"test\" [$__range_ms]})",
+			"format": "time_series",
+			"intervalFactor": 1,
+			"refId": "A"
+		}`, timeRange, time.Duration(1)*time.Minute)
+
+		res, err := models.Parse(q, "15s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, "rate(ALERTS{job=\"test\" [172800000]})", res.Expr)
+	})
+
+	t.Run("parsing query model with $__range_ms variable below 1s", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(20 * time.Millisecond),
+		}
+
+		q := queryContext(`{
+			"expr": "rate(ALERTS{job=\"test\" [$__range_ms]})",
+			"format": "time_series",
+			"intervalFactor": 1,
+			"refId": "A"
+		}`, timeRange, time.Duration(1)*time.Minute)
+
+		res, err := models.Parse(q, "15s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, "rate(ALERTS{job=\"test\" [20]})", res.Expr)
+	})
+
+	t.Run("parsing query model with $__rate_interval variable", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(5 * time.Minute),
+		}
+
+		q := queryContext(`{
+			"expr": "rate(ALERTS{job=\"test\" [$__rate_interval]})",
+			"format": "time_series",
+			"intervalFactor": 1,
+			"interval": "5m",
+			"refId": "A"
+		}`, timeRange, time.Duration(1)*time.Minute)
+
+		res, err := models.Parse(q, "15s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, "rate(ALERTS{job=\"test\" [20m0s]})", res.Expr)
+	})
+
+	t.Run("parsing query model with $__rate_interval variable in expr and interval", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(5 * time.Minute),
+		}
+
+		q := queryContext(`{
+			"expr": "rate(ALERTS{job=\"test\" [$__rate_interval]})",
+			"format": "time_series",
+			"intervalFactor": 1,
+			"interval": "$__rate_interval",
+			"refId": "A"
+		}`, timeRange, 1*time.Minute)
+
+		res, err := models.Parse(q, "15s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, "rate(ALERTS{job=\"test\" [1m0s]})", res.Expr)
+		require.Equal(t, 1*time.Minute, res.Step)
+	})
+
+	t.Run("parsing query model with $__rate_interval_ms variable", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(48 * time.Hour),
+		}
+
+		q := queryContext(`{
+			"expr": "rate(ALERTS{job=\"test\" [$__rate_interval_ms]})",
+			"format": "time_series",
+			"intervalFactor": 1,
+			"refId": "A"
+		}`, timeRange, 2*time.Minute)
+
+		res, err := models.Parse(q, "15s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, "rate(ALERTS{job=\"test\" [135000]})", res.Expr)
+	})
+
+	t.Run("parsing query model with $__rate_interval_ms and $__rate_interval variable", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(48 * time.Hour),
+		}
+
+		q := queryContext(`{
+			"expr": "rate(ALERTS{job=\"test\" [$__rate_interval_ms]}) + rate(ALERTS{job=\"test\" [$__rate_interval]})",
+			"format": "time_series",
+			"intervalFactor": 1,
+			"refId": "A"
+		}`, timeRange, 2*time.Minute)
+
+		res, err := models.Parse(q, "15s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, "rate(ALERTS{job=\"test\" [135000]}) + rate(ALERTS{job=\"test\" [2m15s]})", res.Expr)
+	})
+
+	t.Run("parsing query model with ${__rate_interval_ms} and ${__rate_interval} variable", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(48 * time.Hour),
+		}
+
+		q := queryContext(`{
+			"expr": "rate(ALERTS{job=\"test\" [${__rate_interval_ms}]}) + rate(ALERTS{job=\"test\" [${__rate_interval}]})",
+			"format": "time_series",
+			"intervalFactor": 1,
+			"refId": "A"
+		}`, timeRange, 2*time.Minute)
+
+		res, err := models.Parse(q, "15s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, "rate(ALERTS{job=\"test\" [135000]}) + rate(ALERTS{job=\"test\" [2m15s]})", res.Expr)
+	})
+
+	t.Run("parsing query model of range query", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(48 * time.Hour),
+		}
+
+		q := queryContext(`{
+			"expr": "go_goroutines",
+			"format": "time_series",
+			"intervalFactor": 1,
+			"refId": "A",
+			"range": true
+		}`, timeRange, time.Duration(1)*time.Minute)
+
+		res, err := models.Parse(q, "15s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, true, res.RangeQuery)
+	})
+
+	t.Run("parsing query model of range and instant query", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(48 * time.Hour),
+		}
+
+		q := queryContext(`{
+			"expr": "go_goroutines",
+			"format": "time_series",
+			"intervalFactor": 1,
+			"refId": "A",
+			"range": true,
+			"instant": true
+		}`, timeRange, time.Duration(1)*time.Minute)
+
+		res, err := models.Parse(q, "15s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, true, res.RangeQuery)
+		require.Equal(t, true, res.InstantQuery)
+	})
+
+	t.Run("parsing query model of with no query type", func(t *testing.T) {
+		timeRange := backend.TimeRange{
+			From: now,
+			To:   now.Add(48 * time.Hour),
+		}
+
+		q := queryContext(`{
+			"expr": "go_goroutines",
+			"format": "time_series",
+			"intervalFactor": 1,
+			"refId": "A"
+		}`, timeRange, time.Duration(1)*time.Minute)
+
+		res, err := models.Parse(q, "15s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, true, res.RangeQuery)
+	})
+}
+
+func TestRateInterval(t *testing.T) {
+	type args struct {
+		expr             string
+		interval         string
+		intervalMs       int64
+		dsScrapeInterval string
+		timeRange        *backend.TimeRange
+	}
+	tests := []struct {
+		name string
+		args args
+		want *models.Query
+	}{
+		{
+			name: "intervalMs 100s, minStep override 150s and scrape interval 30s",
+			args: args{
+				expr:             "rate(rpc_durations_seconds_count[$__rate_interval])",
+				interval:         "150s",
+				intervalMs:       100000,
+				dsScrapeInterval: "30s",
+			},
+			want: &models.Query{
+				Expr: "rate(rpc_durations_seconds_count[10m0s])",
+				Step: time.Second * 150,
+			},
+		},
+		{
+			name: "intervalMs 120s, minStep override 150s and ds scrape interval 30s",
+			args: args{
+				expr:             "rate(rpc_durations_seconds_count[$__rate_interval])",
+				interval:         "150s",
+				intervalMs:       120000,
+				dsScrapeInterval: "30s",
+			},
+			want: &models.Query{
+				Expr: "rate(rpc_durations_seconds_count[10m0s])",
+				Step: time.Second * 150,
+			},
+		},
+		{
+			name: "intervalMs 120s, minStep auto (interval not overridden) and ds scrape interval 30s",
+			args: args{
+				expr:             "rate(rpc_durations_seconds_count[$__rate_interval])",
+				interval:         "120s",
+				intervalMs:       120000,
+				dsScrapeInterval: "30s",
+			},
+			want: &models.Query{
+				Expr: "rate(rpc_durations_seconds_count[8m0s])",
+				Step: time.Second * 120,
+			},
+		},
+		{
+			name: "interval and minStep are automatically calculated and ds scrape interval 30s and time range 1 hour",
+			args: args{
+				expr:             "rate(rpc_durations_seconds_count[$__rate_interval])",
+				interval:         "30s",
+				intervalMs:       30000,
+				dsScrapeInterval: "30s",
+				timeRange: &backend.TimeRange{
+					From: now,
+					To:   now.Add(1 * time.Hour),
+				},
+			},
+			want: &models.Query{
+				Expr: "rate(rpc_durations_seconds_count[2m0s])",
+				Step: time.Second * 30,
+			},
+		},
+		{
+			name: "minStep is $__rate_interval and ds scrape interval 30s and time range 1 hour",
+			args: args{
+				expr:             "rate(rpc_durations_seconds_count[$__rate_interval])",
+				interval:         "$__rate_interval",
+				intervalMs:       30000,
+				dsScrapeInterval: "30s",
+				timeRange: &backend.TimeRange{
+					From: now,
+					To:   now.Add(1 * time.Hour),
+				},
+			},
+			want: &models.Query{
+				Expr: "rate(rpc_durations_seconds_count[2m0s])",
+				Step: time.Minute * 2,
+			},
+		},
+		{
+			name: "minStep is $__rate_interval and ds scrape interval 30s and time range 2 days",
+			args: args{
+				expr:             "rate(rpc_durations_seconds_count[$__rate_interval])",
+				interval:         "$__rate_interval",
+				intervalMs:       120000,
+				dsScrapeInterval: "30s",
+				timeRange: &backend.TimeRange{
+					From: now,
+					To:   now.Add(2 * 24 * time.Hour),
+				},
+			},
+			want: &models.Query{
+				Expr: "rate(rpc_durations_seconds_count[2m30s])",
+				Step: time.Second * 150,
+			},
+		},
+		{
+			name: "minStep is $__rate_interval and ds scrape interval 15s and time range 2 days",
+			args: args{
+				expr:             "rate(rpc_durations_seconds_count[$__rate_interval])",
+				interval:         "$__interval",
+				intervalMs:       120000,
+				dsScrapeInterval: "15s",
+				timeRange: &backend.TimeRange{
+					From: now,
+					To:   now.Add(2 * 24 * time.Hour),
+				},
+			},
+			want: &models.Query{
+				Expr: "rate(rpc_durations_seconds_count[8m0s])",
+				Step: time.Second * 120,
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			q := mockQuery(tt.args.expr, tt.args.interval, tt.args.intervalMs, tt.args.timeRange)
+			q.MaxDataPoints = 12384
+			res, err := models.Parse(q, tt.args.dsScrapeInterval, intervalCalculator, false, false)
+			require.NoError(t, err)
+			require.Equal(t, tt.want.Expr, res.Expr)
+			require.Equal(t, tt.want.Step, res.Step)
+		})
+	}
+
+	t.Run("minStep is auto and ds scrape interval 30s and time range 1 hour", func(t *testing.T) {
+		query := backend.DataQuery{
+			RefID:         "G",
+			QueryType:     "",
+			MaxDataPoints: 1613,
+			Interval:      30 * time.Second,
+			TimeRange: backend.TimeRange{
+				From: now,
+				To:   now.Add(1 * time.Hour),
+			},
+			JSON: []byte(`{
+			"datasource":{"type":"prometheus","uid":"zxS5e5W4k"},
+			"datasourceId":38,
+			"editorMode":"code",
+			"exemplar":false,
+			"expr":"sum(rate(process_cpu_seconds_total[$__rate_interval]))",
+			"instant":false,
+			"interval":"",
+			"intervalMs":30000,
+			"key":"Q-f96b6729-c47a-4ea8-8f71-a79774cf9bd5-0",
+			"legendFormat":"__auto",
+			"maxDataPoints":1613,
+			"range":true,
+			"refId":"G",
+			"requestId":"1G",
+			"utcOffsetSec":3600
+		}`),
+		}
+		res, err := models.Parse(query, "30s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, "sum(rate(process_cpu_seconds_total[2m0s]))", res.Expr)
+		require.Equal(t, 30*time.Second, res.Step)
+	})
+
+	t.Run("minStep is auto and ds scrape interval 15s and time range 5 minutes", func(t *testing.T) {
+		query := backend.DataQuery{
+			RefID:         "A",
+			QueryType:     "",
+			MaxDataPoints: 1055,
+			Interval:      15 * time.Second,
+			TimeRange: backend.TimeRange{
+				From: now,
+				To:   now.Add(5 * time.Minute),
+			},
+			JSON: []byte(`{
+			"datasource": {
+		        "type": "prometheus",
+		        "uid": "2z9d6ElGk"
+		    },
+		    "editorMode": "code",
+		    "expr": "sum(rate(cache_requests_total[$__rate_interval]))",
+		    "legendFormat": "__auto",
+		    "range": true,
+		    "refId": "A",
+		    "exemplar": false,
+		    "requestId": "1A",
+		    "utcOffsetSec": 0,
+		    "interval": "",
+		    "datasourceId": 508,
+		    "intervalMs": 15000,
+		    "maxDataPoints": 1055
+		}`),
+		}
+		res, err := models.Parse(query, "15s", intervalCalculator, false, false)
+		require.NoError(t, err)
+		require.Equal(t, "sum(rate(cache_requests_total[1m0s]))", res.Expr)
+		require.Equal(t, 15*time.Second, res.Step)
+	})
+}
+
+func mockQuery(expr string, interval string, intervalMs int64, timeRange *backend.TimeRange) backend.DataQuery {
+	if timeRange == nil {
+		timeRange = &backend.TimeRange{
+			From: now,
+			To:   now.Add(1 * time.Hour),
+		}
+	}
+	return backend.DataQuery{
+		Interval: time.Duration(intervalMs) * time.Millisecond,
+		JSON: []byte(fmt.Sprintf(`{
+			"expr": "%s",
+			"format": "time_series",
+			"interval": "%s",
+			"intervalMs": %v,
+			"intervalFactor": 1,
+			"refId": "A"
+		}`, expr, interval, intervalMs)),
+		TimeRange: *timeRange,
+		RefID:     "A",
+	}
+}
+
+func queryContext(json string, timeRange backend.TimeRange, queryInterval time.Duration) backend.DataQuery {
+	return backend.DataQuery{
+		Interval:  queryInterval,
+		JSON:      []byte(json),
+		TimeRange: timeRange,
+		RefID:     "A",
+	}
+}
+
+// AlignTimeRange aligns query range to step and handles the time offset.
+// It rounds start and end down to a multiple of step.
+// Prometheus caching is dependent on the range being aligned with the step.
+// Rounding to the step can significantly change the start and end of the range for larger steps, i.e. a week.
+// In rounding the range to a 1w step the range will always start on a Thursday.
+func TestAlignTimeRange(t *testing.T) {
+	type args struct {
+		t      time.Time
+		step   time.Duration
+		offset int64
+	}
+
+	var monday int64 = 1704672000
+	var thursday int64 = 1704326400
+	var one_week_min_step = 604800 * time.Second
+
+	tests := []struct {
+		name string
+		args args
+		want time.Time
+	}{
+		{
+			name: "second step",
+			args: args{t: time.Unix(1664816826, 0), step: 10 * time.Second, offset: 0},
+			want: time.Unix(1664816820, 0).UTC(),
+		},
+		{name: "millisecond step", args: args{t: time.Unix(1664816825, 5*int64(time.Millisecond)), step: 10 * time.Millisecond, offset: 0}, want: time.Unix(1664816825, 0).UTC()},
+		{name: "second step with offset", args: args{t: time.Unix(1664816825, 5*int64(time.Millisecond)), step: 2 * time.Second, offset: -3}, want: time.Unix(1664816825, 0).UTC()},
+		// we may not want this functionality in the future but if we change this we break Prometheus caching.
+		{
+			name: "1w step with range date of Monday that changes the range to a Thursday.",
+			args: args{t: time.Unix(monday, 0), step: one_week_min_step, offset: 0},
+			want: time.Unix(thursday, 0).UTC(),
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := models.AlignTimeRange(tt.args.t, tt.args.step, tt.args.offset); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("AlignTimeRange() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestQueryTypeDefinitions(t *testing.T) {
+	builder, err := schemabuilder.NewSchemaBuilder(
+		schemabuilder.BuilderOptions{
+			PluginID: []string{"prometheus"},
+			ScanCode: []schemabuilder.CodePaths{{
+				BasePackage: "github.com/grafana/grafana/pkg/promlib/models",
+				CodePath:    "./",
+			}},
+			Enums: []reflect.Type{
+				reflect.TypeOf(models.PromQueryFormatTimeSeries), // pick an example value (not the root)
+				reflect.TypeOf(models.QueryEditorModeBuilder),
+			},
+		})
+	require.NoError(t, err)
+	err = builder.AddQueries(
+		schemabuilder.QueryTypeInfo{
+			Name:   "default",
+			GoType: reflect.TypeOf(&models.PrometheusQueryProperties{}),
+			Examples: []sdkapi.QueryExample{
+				{
+					Name: "simple health check",
+					SaveModel: sdkapi.AsUnstructured(
+						models.PrometheusQueryProperties{
+							Expr: "1+1",
+						},
+					),
+				},
+			},
+		},
+	)
+
+	require.NoError(t, err)
+	builder.UpdateQueryDefinition(t, "./")
+}
diff --git a/pkg/tsdb/prometheus/models/result.go b/pkg/promlib/models/result.go
similarity index 99%
rename from pkg/tsdb/prometheus/models/result.go
rename to pkg/promlib/models/result.go
index ea5e5c8934fc7..3cefc7fb3d6bd 100644
--- a/pkg/tsdb/prometheus/models/result.go
+++ b/pkg/promlib/models/result.go
@@ -6,6 +6,7 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 )
 
+// +enum
 type ResultType string
 
 const (
diff --git a/pkg/promlib/models/scope.go b/pkg/promlib/models/scope.go
new file mode 100644
index 0000000000000..9207aa747a8ad
--- /dev/null
+++ b/pkg/promlib/models/scope.go
@@ -0,0 +1,84 @@
+package models
+
+import (
+	"fmt"
+
+	"github.com/prometheus/prometheus/model/labels"
+	"github.com/prometheus/prometheus/promql/parser"
+)
+
+func ApplyQueryScope(rawExpr string, scope ScopeSpec) (string, error) {
+	expr, err := parser.ParseExpr(rawExpr)
+	if err != nil {
+		return "", err
+	}
+
+	matchers, err := scopeFiltersToMatchers(scope.Filters)
+	if err != nil {
+		return "", err
+	}
+
+	matcherNamesToIdx := make(map[string]int, len(matchers))
+	for i, matcher := range matchers {
+		if matcher == nil {
+			continue
+		}
+		matcherNamesToIdx[matcher.Name] = i
+	}
+
+	parser.Inspect(expr, func(node parser.Node, nodes []parser.Node) error {
+		switch v := node.(type) {
+		case *parser.VectorSelector:
+			found := make([]bool, len(matchers))
+			for _, matcher := range v.LabelMatchers {
+				if matcher == nil || matcher.Name == "__name__" { // const prob
+					continue
+				}
+				if _, ok := matcherNamesToIdx[matcher.Name]; ok {
+					found[matcherNamesToIdx[matcher.Name]] = true
+					newM := matchers[matcherNamesToIdx[matcher.Name]]
+					matcher.Name = newM.Name
+					matcher.Type = newM.Type
+					matcher.Value = newM.Value
+				}
+			}
+			for i, f := range found {
+				if f {
+					continue
+				}
+				v.LabelMatchers = append(v.LabelMatchers, matchers[i])
+			}
+
+			return nil
+
+		default:
+			return nil
+		}
+	})
+	return expr.String(), nil
+}
+
+func scopeFiltersToMatchers(filters []ScopeFilter) ([]*labels.Matcher, error) {
+	matchers := make([]*labels.Matcher, 0, len(filters))
+	for _, f := range filters {
+		var mt labels.MatchType
+		switch f.Operator {
+		case FilterOperatorEquals:
+			mt = labels.MatchEqual
+		case FilterOperatorNotEquals:
+			mt = labels.MatchNotEqual
+		case FilterOperatorRegexMatch:
+			mt = labels.MatchRegexp
+		case FilterOperatorRegexNotMatch:
+			mt = labels.MatchNotRegexp
+		default:
+			return nil, fmt.Errorf("unknown operator %q", f.Operator)
+		}
+		m, err := labels.NewMatcher(mt, f.Key, f.Value)
+		if err != nil {
+			return nil, err
+		}
+		matchers = append(matchers, m)
+	}
+	return matchers, nil
+}
diff --git a/pkg/tsdb/prometheus/querydata/exemplar/framer.go b/pkg/promlib/querydata/exemplar/framer.go
similarity index 100%
rename from pkg/tsdb/prometheus/querydata/exemplar/framer.go
rename to pkg/promlib/querydata/exemplar/framer.go
diff --git a/pkg/tsdb/prometheus/querydata/exemplar/labels.go b/pkg/promlib/querydata/exemplar/labels.go
similarity index 100%
rename from pkg/tsdb/prometheus/querydata/exemplar/labels.go
rename to pkg/promlib/querydata/exemplar/labels.go
diff --git a/pkg/tsdb/prometheus/querydata/exemplar/sampler.go b/pkg/promlib/querydata/exemplar/sampler.go
similarity index 93%
rename from pkg/tsdb/prometheus/querydata/exemplar/sampler.go
rename to pkg/promlib/querydata/exemplar/sampler.go
index be7f518cb898d..f0b3e0eed3aae 100644
--- a/pkg/tsdb/prometheus/querydata/exemplar/sampler.go
+++ b/pkg/promlib/querydata/exemplar/sampler.go
@@ -4,7 +4,7 @@ import (
 	"sort"
 	"time"
 
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/models"
+	"github.com/grafana/grafana/pkg/promlib/models"
 )
 
 type Sampler interface {
diff --git a/pkg/tsdb/prometheus/querydata/exemplar/sampler_stddev.go b/pkg/promlib/querydata/exemplar/sampler_stddev.go
similarity index 97%
rename from pkg/tsdb/prometheus/querydata/exemplar/sampler_stddev.go
rename to pkg/promlib/querydata/exemplar/sampler_stddev.go
index 9028e22cff594..92ebf0ef510c0 100644
--- a/pkg/tsdb/prometheus/querydata/exemplar/sampler_stddev.go
+++ b/pkg/promlib/querydata/exemplar/sampler_stddev.go
@@ -5,7 +5,7 @@ import (
 	"sort"
 	"time"
 
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/models"
+	"github.com/grafana/grafana/pkg/promlib/models"
 )
 
 type StandardDeviationSampler struct {
diff --git a/pkg/tsdb/prometheus/querydata/exemplar/sampler_stddev_test.go b/pkg/promlib/querydata/exemplar/sampler_stddev_test.go
similarity index 84%
rename from pkg/tsdb/prometheus/querydata/exemplar/sampler_stddev_test.go
rename to pkg/promlib/querydata/exemplar/sampler_stddev_test.go
index b96f6d63b285e..c7a4ff0aa7a3f 100644
--- a/pkg/tsdb/prometheus/querydata/exemplar/sampler_stddev_test.go
+++ b/pkg/promlib/querydata/exemplar/sampler_stddev_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/experimental"
 
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/models"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/querydata/exemplar"
+	"github.com/grafana/grafana/pkg/promlib/models"
+	"github.com/grafana/grafana/pkg/promlib/querydata/exemplar"
 )
 
 func TestStdDevSampler(t *testing.T) {
diff --git a/pkg/tsdb/prometheus/querydata/exemplar/sampler_test.go b/pkg/promlib/querydata/exemplar/sampler_test.go
similarity index 88%
rename from pkg/tsdb/prometheus/querydata/exemplar/sampler_test.go
rename to pkg/promlib/querydata/exemplar/sampler_test.go
index f071f1b902549..26cdc5c2a8d5d 100644
--- a/pkg/tsdb/prometheus/querydata/exemplar/sampler_test.go
+++ b/pkg/promlib/querydata/exemplar/sampler_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/experimental"
 
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/models"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/querydata/exemplar"
+	"github.com/grafana/grafana/pkg/promlib/models"
+	"github.com/grafana/grafana/pkg/promlib/querydata/exemplar"
 )
 
 const update = true
diff --git a/pkg/tsdb/prometheus/querydata/exemplar/testdata/noop_sampler.jsonc b/pkg/promlib/querydata/exemplar/testdata/noop_sampler.jsonc
similarity index 100%
rename from pkg/tsdb/prometheus/querydata/exemplar/testdata/noop_sampler.jsonc
rename to pkg/promlib/querydata/exemplar/testdata/noop_sampler.jsonc
diff --git a/pkg/tsdb/prometheus/querydata/exemplar/testdata/stddev_sampler.jsonc b/pkg/promlib/querydata/exemplar/testdata/stddev_sampler.jsonc
similarity index 100%
rename from pkg/tsdb/prometheus/querydata/exemplar/testdata/stddev_sampler.jsonc
rename to pkg/promlib/querydata/exemplar/testdata/stddev_sampler.jsonc
diff --git a/pkg/tsdb/prometheus/querydata/framing_bench_test.go b/pkg/promlib/querydata/framing_bench_test.go
similarity index 90%
rename from pkg/tsdb/prometheus/querydata/framing_bench_test.go
rename to pkg/promlib/querydata/framing_bench_test.go
index 295810ed9f607..b769df2b47d13 100644
--- a/pkg/tsdb/prometheus/querydata/framing_bench_test.go
+++ b/pkg/promlib/querydata/framing_bench_test.go
@@ -15,16 +15,13 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/kindsys"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/kinds/dataquery"
-
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/models"
+	"github.com/grafana/grafana/pkg/promlib/models"
 )
 
 // when memory-profiling this benchmark, these commands are recommended:
-// - go test -benchmem -run=^$ -bench ^BenchmarkExemplarJson$ github.com/grafana/grafana/pkg/tsdb/prometheus/querydata -memprofile memprofile.out -count 6 | tee old.txt
+// - go test -benchmem -run=^$ -bench ^BenchmarkExemplarJson$ github.com/grafana/grafana/pkg/promlib/querydata -memprofile memprofile.out -count 6 | tee old.txt
 // - go tool pprof -http=localhost:6061 memprofile.out
 func BenchmarkExemplarJson(b *testing.B) {
 	queryFileName := filepath.Join("../testdata", "exemplar.query.json")
@@ -58,7 +55,7 @@ func BenchmarkExemplarJson(b *testing.B) {
 var resp *backend.QueryDataResponse
 
 // when memory-profiling this benchmark, these commands are recommended:
-// - go test -benchmem -run=^$ -bench ^BenchmarkRangeJson$ github.com/grafana/grafana/pkg/tsdb/prometheus/querydata -memprofile memprofile.out -count 6 | tee old.txt
+// - go test -benchmem -run=^$ -bench ^BenchmarkRangeJson$ github.com/grafana/grafana/pkg/promlib/querydata -memprofile memprofile.out -count 6 | tee old.txt
 // - go tool pprof -http=localhost:6061 memprofile.out
 // - benchstat old.txt new.txt
 func BenchmarkRangeJson(b *testing.B) {
@@ -127,8 +124,8 @@ func createJsonTestData(start int64, step int64, timestampCount int, seriesCount
 	bytes := []byte(fmt.Sprintf(`{"status":"success","data":{"resultType":"matrix","result":[%v]}}`, strings.Join(allSeries, ",")))
 
 	qm := models.QueryModel{
-		PrometheusDataQuery: dataquery.PrometheusDataQuery{
-			Range: kindsys.Ptr(true),
+		PrometheusQueryProperties: models.PrometheusQueryProperties{
+			Range: true,
 			Expr:  "test",
 		},
 	}
diff --git a/pkg/tsdb/prometheus/querydata/framing_test.go b/pkg/promlib/querydata/framing_test.go
similarity index 89%
rename from pkg/tsdb/prometheus/querydata/framing_test.go
rename to pkg/promlib/querydata/framing_test.go
index feadc406619fb..3668438ded481 100644
--- a/pkg/tsdb/prometheus/querydata/framing_test.go
+++ b/pkg/promlib/querydata/framing_test.go
@@ -14,10 +14,10 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/experimental"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/kinds/dataquery"
+	sdkapi "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/models"
+	"github.com/grafana/grafana/pkg/promlib/models"
 )
 
 var update = true
@@ -108,14 +108,16 @@ func loadStoredQuery(fileName string) (*backend.QueryDataRequest, error) {
 	}
 
 	qm := models.QueryModel{
-		PrometheusDataQuery: dataquery.PrometheusDataQuery{
-			Range:    &sq.RangeQuery,
-			Exemplar: &sq.ExemplarQuery,
-			Expr:     sq.Expr,
+		PrometheusQueryProperties: models.PrometheusQueryProperties{
+			Range:        sq.RangeQuery,
+			Exemplar:     sq.ExemplarQuery,
+			Expr:         sq.Expr,
+			LegendFormat: sq.LegendFormat,
 		},
-		Interval:     fmt.Sprintf("%ds", sq.Step),
-		IntervalMs:   sq.Step * 1000,
-		LegendFormat: sq.LegendFormat,
+		CommonQueryProperties: sdkapi.CommonQueryProperties{
+			IntervalMS: float64(sq.Step * 1000),
+		},
+		Interval: fmt.Sprintf("%ds", sq.Step),
 	}
 
 	data, err := json.Marshal(&qm)
diff --git a/pkg/promlib/querydata/request.go b/pkg/promlib/querydata/request.go
new file mode 100644
index 0000000000000..aabd347b9ae73
--- /dev/null
+++ b/pkg/promlib/querydata/request.go
@@ -0,0 +1,228 @@
+package querydata
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"regexp"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/grafana/grafana-plugin-sdk-go/data/utils/maputil"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/trace"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
+
+	"github.com/grafana/grafana/pkg/promlib/client"
+	"github.com/grafana/grafana/pkg/promlib/intervalv2"
+	"github.com/grafana/grafana/pkg/promlib/models"
+	"github.com/grafana/grafana/pkg/promlib/querydata/exemplar"
+	"github.com/grafana/grafana/pkg/promlib/utils"
+)
+
+const legendFormatAuto = "__auto"
+
+var legendFormatRegexp = regexp.MustCompile(`\{\{\s*(.+?)\s*\}\}`)
+
+type ExemplarEvent struct {
+	Time   time.Time
+	Value  float64
+	Labels map[string]string
+}
+
+// QueryData handles querying but different from buffered package uses a custom client instead of default Go Prom
+// client.
+type QueryData struct {
+	intervalCalculator intervalv2.Calculator
+	tracer             trace.Tracer
+	client             *client.Client
+	log                log.Logger
+	ID                 int64
+	URL                string
+	TimeInterval       string
+	exemplarSampler    func() exemplar.Sampler
+}
+
+func New(
+	httpClient *http.Client,
+	settings backend.DataSourceInstanceSettings,
+	plog log.Logger,
+) (*QueryData, error) {
+	jsonData, err := utils.GetJsonData(settings)
+	if err != nil {
+		return nil, err
+	}
+	httpMethod, _ := maputil.GetStringOptional(jsonData, "httpMethod")
+
+	timeInterval, err := maputil.GetStringOptional(jsonData, "timeInterval")
+	if err != nil {
+		return nil, err
+	}
+
+	if httpMethod == "" {
+		httpMethod = http.MethodPost
+	}
+
+	promClient := client.NewClient(httpClient, httpMethod, settings.URL)
+
+	// standard deviation sampler is the default for backwards compatibility
+	exemplarSampler := exemplar.NewStandardDeviationSampler
+
+	return &QueryData{
+		intervalCalculator: intervalv2.NewCalculator(),
+		tracer:             tracing.DefaultTracer(),
+		log:                plog,
+		client:             promClient,
+		TimeInterval:       timeInterval,
+		ID:                 settings.ID,
+		URL:                settings.URL,
+		exemplarSampler:    exemplarSampler,
+	}, nil
+}
+
+func (s *QueryData) Execute(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+	fromAlert := req.Headers["FromAlert"] == "true"
+	result := backend.QueryDataResponse{
+		Responses: backend.Responses{},
+	}
+
+	cfg := backend.GrafanaConfigFromContext(ctx)
+	hasPromQLScopeFeatureFlag := cfg.FeatureToggles().IsEnabled("promQLScope")
+	hasPrometheusDataplaneFeatureFlag := cfg.FeatureToggles().IsEnabled("prometheusDataplane")
+
+	for _, q := range req.Queries {
+		query, err := models.Parse(q, s.TimeInterval, s.intervalCalculator, fromAlert, hasPromQLScopeFeatureFlag)
+		if err != nil {
+			return &result, err
+		}
+
+		r := s.fetch(ctx, s.client, query, hasPrometheusDataplaneFeatureFlag)
+		if r == nil {
+			s.log.FromContext(ctx).Debug("Received nil response from runQuery", "query", query.Expr)
+			continue
+		}
+		result.Responses[q.RefID] = *r
+	}
+
+	return &result, nil
+}
+
+func (s *QueryData) fetch(ctx context.Context, client *client.Client, q *models.Query, enablePrometheusDataplane bool) *backend.DataResponse {
+	traceCtx, end := s.trace(ctx, q)
+	defer end()
+
+	logger := s.log.FromContext(traceCtx)
+	logger.Debug("Sending query", "start", q.Start, "end", q.End, "step", q.Step, "query", q.Expr)
+
+	dr := &backend.DataResponse{
+		Frames: data.Frames{},
+		Error:  nil,
+	}
+
+	if q.InstantQuery {
+		res := s.instantQuery(traceCtx, client, q, enablePrometheusDataplane)
+		dr.Error = res.Error
+		dr.Frames = res.Frames
+		dr.Status = res.Status
+	}
+
+	if q.RangeQuery {
+		res := s.rangeQuery(traceCtx, client, q, enablePrometheusDataplane)
+		if res.Error != nil {
+			if dr.Error == nil {
+				dr.Error = res.Error
+			} else {
+				dr.Error = fmt.Errorf("%v %w", dr.Error, res.Error)
+			}
+			// When both instant and range are true, we may overwrite the status code.
+			// To fix this (and other things) they should come in separate http requests.
+			dr.Status = res.Status
+		}
+		dr.Frames = append(dr.Frames, res.Frames...)
+	}
+
+	if q.ExemplarQuery {
+		res := s.exemplarQuery(traceCtx, client, q, enablePrometheusDataplane)
+		if res.Error != nil {
+			// If exemplar query returns error, we want to only log it and
+			// continue with other results processing
+			logger.Error("Exemplar query failed", "query", q.Expr, "err", res.Error)
+		}
+		dr.Frames = append(dr.Frames, res.Frames...)
+	}
+
+	return dr
+}
+
+func (s *QueryData) rangeQuery(ctx context.Context, c *client.Client, q *models.Query, enablePrometheusDataplaneFlag bool) backend.DataResponse {
+	res, err := c.QueryRange(ctx, q)
+	if err != nil {
+		return backend.DataResponse{
+			Error:  err,
+			Status: backend.StatusBadGateway,
+		}
+	}
+
+	defer func() {
+		err := res.Body.Close()
+		if err != nil {
+			s.log.Warn("Failed to close query range response body", "error", err)
+		}
+	}()
+
+	return s.parseResponse(ctx, q, res, enablePrometheusDataplaneFlag)
+}
+
+func (s *QueryData) instantQuery(ctx context.Context, c *client.Client, q *models.Query, enablePrometheusDataplaneFlag bool) backend.DataResponse {
+	res, err := c.QueryInstant(ctx, q)
+	if err != nil {
+		return backend.DataResponse{
+			Error:  err,
+			Status: backend.StatusBadGateway,
+		}
+	}
+
+	// This is only for health check fall back scenario
+	if res.StatusCode != 200 && q.RefId == "__healthcheck__" {
+		return backend.DataResponse{
+			Error: fmt.Errorf(res.Status),
+		}
+	}
+
+	defer func() {
+		err := res.Body.Close()
+		if err != nil {
+			s.log.Warn("Failed to close response body", "error", err)
+		}
+	}()
+
+	return s.parseResponse(ctx, q, res, enablePrometheusDataplaneFlag)
+}
+
+func (s *QueryData) exemplarQuery(ctx context.Context, c *client.Client, q *models.Query, enablePrometheusDataplaneFlag bool) backend.DataResponse {
+	res, err := c.QueryExemplars(ctx, q)
+	if err != nil {
+		return backend.DataResponse{
+			Error: err,
+		}
+	}
+
+	defer func() {
+		err := res.Body.Close()
+		if err != nil {
+			s.log.Warn("Failed to close response body", "error", err)
+		}
+	}()
+	return s.parseResponse(ctx, q, res, enablePrometheusDataplaneFlag)
+}
+
+func (s *QueryData) trace(ctx context.Context, q *models.Query) (context.Context, func()) {
+	return utils.StartTrace(ctx, s.tracer, "datasource.prometheus",
+		attribute.String("expr", q.Expr),
+		attribute.Int64("start_unixnano", q.Start.UnixNano()),
+		attribute.Int64("stop_unixnano", q.End.UnixNano()),
+	)
+}
diff --git a/pkg/promlib/querydata/request_test.go b/pkg/promlib/querydata/request_test.go
new file mode 100644
index 0000000000000..3a1ac8986f953
--- /dev/null
+++ b/pkg/promlib/querydata/request_test.go
@@ -0,0 +1,486 @@
+package querydata_test
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"math"
+	"net/http"
+	"testing"
+	"time"
+
+	apiv1 "github.com/prometheus/client_golang/api/prometheus/v1"
+	p "github.com/prometheus/common/model"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+
+	"github.com/grafana/grafana/pkg/promlib/client"
+	"github.com/grafana/grafana/pkg/promlib/models"
+	"github.com/grafana/grafana/pkg/promlib/querydata"
+)
+
+func TestPrometheus_parseTimeSeriesResponse(t *testing.T) {
+	t.Run("exemplars response should be sampled and parsed normally", func(t *testing.T) {
+		t.Skip()
+		exemplars := []apiv1.ExemplarQueryResult{
+			{
+				SeriesLabels: p.LabelSet{
+					"__name__": "tns_request_duration_seconds_bucket",
+					"instance": "app:80",
+					"job":      "tns/app",
+				},
+				Exemplars: []apiv1.Exemplar{
+					{
+						Labels:    p.LabelSet{"traceID": "test1"},
+						Value:     0.003535405,
+						Timestamp: p.TimeFromUnixNano(time.Now().Add(-2 * time.Minute).UnixNano()),
+					},
+					{
+						Labels:    p.LabelSet{"traceID": "test2"},
+						Value:     0.005555605,
+						Timestamp: p.TimeFromUnixNano(time.Now().Add(-4 * time.Minute).UnixNano()),
+					},
+					{
+						Labels:    p.LabelSet{"traceID": "test3"},
+						Value:     0.007545445,
+						Timestamp: p.TimeFromUnixNano(time.Now().Add(-6 * time.Minute).UnixNano()),
+					},
+					{
+						Labels:    p.LabelSet{"traceID": "test4"},
+						Value:     0.009545445,
+						Timestamp: p.TimeFromUnixNano(time.Now().Add(-7 * time.Minute).UnixNano()),
+					},
+				},
+			},
+		}
+
+		tctx, err := setup()
+		require.NoError(t, err)
+
+		qm := models.QueryModel{
+			UtcOffsetSec: 0,
+			PrometheusQueryProperties: models.PrometheusQueryProperties{
+				LegendFormat: "legend {{app}}",
+				Exemplar:     true,
+			},
+		}
+		b, err := json.Marshal(&qm)
+		require.NoError(t, err)
+		query := backend.DataQuery{
+			RefID: "A",
+			JSON:  b,
+		}
+		res, err := execute(tctx, query, exemplars)
+		require.NoError(t, err)
+
+		// Test fields
+		require.Len(t, res, 1)
+		//		require.Equal(t, res[0].Name, "exemplar")
+		require.Equal(t, res[0].Fields[0].Name, "Time")
+		require.Equal(t, res[0].Fields[1].Name, "Value")
+		require.Len(t, res[0].Fields, 6)
+
+		// Test correct values (sampled to 2)
+		require.Equal(t, res[0].Fields[1].Len(), 2)
+		require.Equal(t, res[0].Fields[1].At(0), 0.009545445)
+		require.Equal(t, res[0].Fields[1].At(1), 0.003535405)
+	})
+
+	t.Run("matrix response should be parsed normally", func(t *testing.T) {
+		values := []p.SamplePair{
+			{Value: 1, Timestamp: 1000},
+			{Value: 2, Timestamp: 2000},
+			{Value: 3, Timestamp: 3000},
+			{Value: 4, Timestamp: 4000},
+			{Value: 5, Timestamp: 5000},
+		}
+		result := queryResult{
+			Type: p.ValMatrix,
+			Result: p.Matrix{
+				&p.SampleStream{
+					Metric: p.Metric{"app": "Application", "tag2": "tag2"},
+					Values: values,
+				},
+			},
+		}
+
+		qm := models.QueryModel{
+			UtcOffsetSec: 0,
+			PrometheusQueryProperties: models.PrometheusQueryProperties{
+				Range:        true,
+				LegendFormat: "legend {{app}}",
+			},
+		}
+		b, err := json.Marshal(&qm)
+		require.NoError(t, err)
+		query := backend.DataQuery{
+			TimeRange: backend.TimeRange{
+				From: time.Unix(1, 0).UTC(),
+				To:   time.Unix(5, 0).UTC(),
+			},
+			JSON: b,
+		}
+		tctx, err := setup()
+		require.NoError(t, err)
+		res, err := execute(tctx, query, result)
+		require.NoError(t, err)
+
+		require.Len(t, res, 1)
+		require.Len(t, res[0].Fields, 2)
+		require.Len(t, res[0].Fields[0].Labels, 0)
+		require.Equal(t, "Time", res[0].Fields[0].Name)
+		require.Len(t, res[0].Fields[1].Labels, 2)
+		require.Equal(t, "app=Application, tag2=tag2", res[0].Fields[1].Labels.String())
+		require.Equal(t, "legend Application", res[0].Name)
+
+		// Ensure the timestamps are UTC zoned
+		testValue := res[0].Fields[0].At(0)
+		require.Equal(t, "UTC", testValue.(time.Time).Location().String())
+	})
+
+	t.Run("matrix response with missed data points should be parsed correctly", func(t *testing.T) {
+		values := []p.SamplePair{
+			{Value: 1, Timestamp: 1000},
+			{Value: 4, Timestamp: 4000},
+		}
+		result := queryResult{
+			Type: p.ValMatrix,
+			Result: p.Matrix{
+				&p.SampleStream{
+					Metric: p.Metric{"app": "Application", "tag2": "tag2"},
+					Values: values,
+				},
+			},
+		}
+
+		qm := models.QueryModel{
+			UtcOffsetSec: 0,
+			PrometheusQueryProperties: models.PrometheusQueryProperties{
+				Range:        true,
+				LegendFormat: "",
+			},
+		}
+		b, err := json.Marshal(&qm)
+		require.NoError(t, err)
+		query := backend.DataQuery{
+			TimeRange: backend.TimeRange{
+				From: time.Unix(1, 0).UTC(),
+				To:   time.Unix(4, 0).UTC(),
+			},
+			JSON: b,
+		}
+		tctx, err := setup()
+		require.NoError(t, err)
+		res, err := execute(tctx, query, result)
+
+		require.NoError(t, err)
+		require.Len(t, res, 1)
+		require.Equal(t, res[0].Fields[0].Len(), 2)
+		require.Equal(t, time.Unix(1, 0).UTC(), res[0].Fields[0].At(0))
+		require.Equal(t, time.Unix(4, 0).UTC(), res[0].Fields[0].At(1))
+		require.Equal(t, res[0].Fields[1].Len(), 2)
+		require.Equal(t, float64(1), res[0].Fields[1].At(0).(float64))
+		require.Equal(t, float64(4), res[0].Fields[1].At(1).(float64))
+	})
+
+	t.Run("matrix response with from alerting missed data points should be parsed correctly", func(t *testing.T) {
+		values := []p.SamplePair{
+			{Value: 1, Timestamp: 1000},
+			{Value: 4, Timestamp: 4000},
+		}
+		result := queryResult{
+			Type: p.ValMatrix,
+			Result: p.Matrix{
+				&p.SampleStream{
+					Metric: p.Metric{"app": "Application", "tag2": "tag2"},
+					Values: values,
+				},
+			},
+		}
+
+		qm := models.QueryModel{
+			UtcOffsetSec: 0,
+			PrometheusQueryProperties: models.PrometheusQueryProperties{
+				Range:        true,
+				LegendFormat: "",
+			},
+		}
+		b, err := json.Marshal(&qm)
+		require.NoError(t, err)
+		query := backend.DataQuery{
+			TimeRange: backend.TimeRange{
+				From: time.Unix(1, 0).UTC(),
+				To:   time.Unix(4, 0).UTC(),
+			},
+			JSON: b,
+		}
+		tctx, err := setup()
+		require.NoError(t, err)
+		res, err := execute(tctx, query, result)
+
+		require.NoError(t, err)
+		require.Len(t, res, 1)
+		require.Len(t, res[0].Fields, 2)
+		require.Len(t, res[0].Fields[0].Labels, 0)
+		require.Equal(t, res[0].Fields[0].Name, "Time")
+		require.Len(t, res[0].Fields[1].Labels, 2)
+		require.Equal(t, res[0].Fields[1].Labels.String(), "app=Application, tag2=tag2")
+		require.Equal(t, "{app=\"Application\", tag2=\"tag2\"}", res[0].Name)
+	})
+
+	t.Run("matrix response with NaN value should be changed to null", func(t *testing.T) {
+		result := queryResult{
+			Type: p.ValMatrix,
+			Result: p.Matrix{
+				&p.SampleStream{
+					Metric: p.Metric{"app": "Application"},
+					Values: []p.SamplePair{
+						{Value: p.SampleValue(math.NaN()), Timestamp: 1000},
+					},
+				},
+			},
+		}
+
+		qm := models.QueryModel{
+			UtcOffsetSec: 0,
+			PrometheusQueryProperties: models.PrometheusQueryProperties{
+				Range:        true,
+				LegendFormat: "",
+			},
+		}
+		b, err := json.Marshal(&qm)
+		require.NoError(t, err)
+		query := backend.DataQuery{
+			TimeRange: backend.TimeRange{
+				From: time.Unix(1, 0).UTC(),
+				To:   time.Unix(4, 0).UTC(),
+			},
+			JSON: b,
+		}
+
+		tctx, err := setup()
+		require.NoError(t, err)
+		res, err := execute(tctx, query, result)
+		require.NoError(t, err)
+
+		require.Equal(t, "{app=\"Application\"}", res[0].Name)
+		require.True(t, math.IsNaN(res[0].Fields[1].At(0).(float64)))
+	})
+
+	t.Run("vector response should be parsed normally", func(t *testing.T) {
+		qr := queryResult{
+			Type: p.ValVector,
+			Result: p.Vector{
+				&p.Sample{
+					Metric:    p.Metric{"app": "Application", "tag2": "tag2"},
+					Value:     1,
+					Timestamp: 123,
+				},
+			},
+		}
+		qm := models.QueryModel{
+			UtcOffsetSec: 0,
+			PrometheusQueryProperties: models.PrometheusQueryProperties{
+				Instant:      true,
+				LegendFormat: "legend {{app}}",
+			},
+		}
+		b, err := json.Marshal(&qm)
+		require.NoError(t, err)
+		query := backend.DataQuery{
+			JSON: b,
+		}
+		tctx, err := setup()
+		require.NoError(t, err)
+		res, err := execute(tctx, query, qr)
+		require.NoError(t, err)
+
+		require.Len(t, res, 1)
+		require.Len(t, res[0].Fields, 2)
+		require.Len(t, res[0].Fields[0].Labels, 0)
+		require.Equal(t, res[0].Fields[0].Name, "Time")
+		require.Equal(t, res[0].Fields[0].Name, "Time")
+		require.Len(t, res[0].Fields[1].Labels, 2)
+		require.Equal(t, res[0].Fields[1].Labels.String(), "app=Application, tag2=tag2")
+		require.Equal(t, "legend Application", res[0].Name)
+
+		// Ensure the timestamps are UTC zoned
+		testValue := res[0].Fields[0].At(0)
+		require.Equal(t, "UTC", testValue.(time.Time).Location().String())
+		require.Equal(t, int64(123), testValue.(time.Time).UnixMilli())
+	})
+
+	t.Run("scalar response should be parsed normally", func(t *testing.T) {
+		t.Skip("TODO: implement scalar responses")
+		qr := queryResult{
+			Type: p.ValScalar,
+			Result: &p.Scalar{
+				Value:     1,
+				Timestamp: 123,
+			},
+		}
+		qm := models.QueryModel{
+			UtcOffsetSec: 0,
+			PrometheusQueryProperties: models.PrometheusQueryProperties{
+				Instant:      true,
+				LegendFormat: "",
+			},
+		}
+		b, err := json.Marshal(&qm)
+		require.NoError(t, err)
+		query := backend.DataQuery{
+			JSON: b,
+		}
+		tctx, err := setup()
+		require.NoError(t, err)
+		res, err := execute(tctx, query, qr)
+		require.NoError(t, err)
+
+		require.Len(t, res, 1)
+		require.Len(t, res[0].Fields, 2)
+		require.Len(t, res[0].Fields[0].Labels, 0)
+		require.Equal(t, res[0].Fields[0].Name, "Time")
+		require.Equal(t, "1", res[0].Fields[1].Name)
+
+		// Ensure the timestamps are UTC zoned
+		testValue := res[0].Fields[0].At(0)
+		require.Equal(t, "UTC", testValue.(time.Time).Location().String())
+		require.Equal(t, int64(123), testValue.(time.Time).UnixMilli())
+	})
+}
+
+type queryResult struct {
+	Type   p.ValueType `json:"resultType"`
+	Result any         `json:"result"`
+}
+
+func executeWithHeaders(tctx *testContext, query backend.DataQuery, qr any, headers map[string]string) (data.Frames, error) {
+	req := backend.QueryDataRequest{
+		Queries: []backend.DataQuery{query},
+		Headers: headers,
+	}
+
+	promRes, err := toAPIResponse(qr)
+	defer func() {
+		if err := promRes.Body.Close(); err != nil {
+			fmt.Println(fmt.Errorf("response body close error: %v", err))
+		}
+	}()
+	if err != nil {
+		return nil, err
+	}
+	tctx.httpProvider.setResponse(promRes)
+
+	res, err := tctx.queryData.Execute(context.Background(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res.Responses[req.Queries[0].RefID].Frames, nil
+}
+
+func execute(tctx *testContext, query backend.DataQuery, qr any) (data.Frames, error) {
+	return executeWithHeaders(tctx, query, qr, map[string]string{})
+}
+
+type apiResponse struct {
+	Status string          `json:"status"`
+	Data   json.RawMessage `json:"data"`
+}
+
+func toAPIResponse(d any) (*http.Response, error) {
+	b, err := json.Marshal(d)
+	if err != nil {
+		return nil, err
+	}
+
+	res := apiResponse{
+		Status: "success",
+		Data:   json.RawMessage(b),
+	}
+
+	raw, err := json.Marshal(&res)
+	if err != nil {
+		return nil, err
+	}
+
+	return &http.Response{
+		StatusCode: 200,
+		Body:       io.NopCloser(bytes.NewReader(raw)),
+	}, nil
+}
+
+type testContext struct {
+	httpProvider *fakeHttpClientProvider
+	queryData    *querydata.QueryData
+}
+
+func setup() (*testContext, error) {
+	httpProvider := &fakeHttpClientProvider{
+		opts: httpclient.Options{
+			Timeouts: &httpclient.DefaultTimeoutOptions,
+		},
+		res: &http.Response{
+			StatusCode: 200,
+			Body:       io.NopCloser(bytes.NewReader([]byte(`{}`))),
+		},
+	}
+	settings := backend.DataSourceInstanceSettings{
+		URL:      "http://localhost:9090",
+		JSONData: json.RawMessage(`{"timeInterval": "15s"}`),
+	}
+
+	opts, err := client.CreateTransportOptions(context.Background(), settings, log.New())
+	if err != nil {
+		return nil, err
+	}
+
+	httpClient, err := httpProvider.New(*opts)
+	if err != nil {
+		return nil, err
+	}
+
+	queryData, _ := querydata.New(httpClient, settings, log.New())
+
+	return &testContext{
+		httpProvider: httpProvider,
+		queryData:    queryData,
+	}, nil
+}
+
+type fakeHttpClientProvider struct {
+	httpclient.Provider
+	opts httpclient.Options
+	req  *http.Request
+	res  *http.Response
+}
+
+func (p *fakeHttpClientProvider) New(opts ...httpclient.Options) (*http.Client, error) {
+	p.opts = opts[0]
+	c, err := httpclient.New(opts[0])
+	if err != nil {
+		return nil, err
+	}
+	c.Transport = p
+	return c, nil
+}
+
+func (p *fakeHttpClientProvider) GetTransport(opts ...httpclient.Options) (http.RoundTripper, error) {
+	p.opts = opts[0]
+	return http.DefaultTransport, nil
+}
+
+func (p *fakeHttpClientProvider) setResponse(res *http.Response) {
+	p.res = res
+}
+
+func (p *fakeHttpClientProvider) RoundTrip(req *http.Request) (*http.Response, error) {
+	p.req = req
+	return p.res, nil
+}
diff --git a/pkg/tsdb/prometheus/querydata/response.go b/pkg/promlib/querydata/response.go
similarity index 91%
rename from pkg/tsdb/prometheus/querydata/response.go
rename to pkg/promlib/querydata/response.go
index 18b0890b04747..7181400df1680 100644
--- a/pkg/tsdb/prometheus/querydata/response.go
+++ b/pkg/promlib/querydata/response.go
@@ -12,13 +12,13 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	jsoniter "github.com/json-iterator/go"
 
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/models"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/querydata/exemplar"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/utils"
-	"github.com/grafana/grafana/pkg/util/converter"
+	"github.com/grafana/grafana/pkg/promlib/converter"
+	"github.com/grafana/grafana/pkg/promlib/models"
+	"github.com/grafana/grafana/pkg/promlib/querydata/exemplar"
+	"github.com/grafana/grafana/pkg/promlib/utils"
 )
 
-func (s *QueryData) parseResponse(ctx context.Context, q *models.Query, res *http.Response) backend.DataResponse {
+func (s *QueryData) parseResponse(ctx context.Context, q *models.Query, res *http.Response, enablePrometheusDataplaneFlag bool) backend.DataResponse {
 	defer func() {
 		if err := res.Body.Close(); err != nil {
 			s.log.FromContext(ctx).Error("Failed to close response body", "err", err)
@@ -30,8 +30,9 @@ func (s *QueryData) parseResponse(ctx context.Context, q *models.Query, res *htt
 
 	iter := jsoniter.Parse(jsoniter.ConfigDefault, res.Body, 1024)
 	r := converter.ReadPrometheusStyleResult(iter, converter.Options{
-		Dataplane: s.enableDataplane,
+		Dataplane: enablePrometheusDataplaneFlag,
 	})
+	r.Status = backend.Status(res.StatusCode)
 
 	// Add frame to attach metadata
 	if len(r.Frames) == 0 && !q.ExemplarQuery {
@@ -40,7 +41,7 @@ func (s *QueryData) parseResponse(ctx context.Context, q *models.Query, res *htt
 
 	// The ExecutedQueryString can be viewed in QueryInspector in UI
 	for i, frame := range r.Frames {
-		addMetadataToMultiFrame(q, frame, s.enableDataplane)
+		addMetadataToMultiFrame(q, frame, enablePrometheusDataplaneFlag)
 		if i == 0 {
 			frame.Meta.ExecutedQueryString = executedQueryString(q)
 		}
diff --git a/pkg/tsdb/prometheus/querydata/response_test.go b/pkg/promlib/querydata/response_test.go
similarity index 94%
rename from pkg/tsdb/prometheus/querydata/response_test.go
rename to pkg/promlib/querydata/response_test.go
index e449f3610d8d1..8cec7ba460aab 100644
--- a/pkg/tsdb/prometheus/querydata/response_test.go
+++ b/pkg/promlib/querydata/response_test.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/models"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/querydata/exemplar"
+	"github.com/grafana/grafana/pkg/promlib/models"
+	"github.com/grafana/grafana/pkg/promlib/querydata/exemplar"
 )
 
 func TestQueryData_parseResponse(t *testing.T) {
@@ -19,7 +19,7 @@ func TestQueryData_parseResponse(t *testing.T) {
 	t.Run("resultType is before result the field must parsed normally", func(t *testing.T) {
 		resBody := `{"data":{"resultType":"vector", "result":[{"metric":{"__name__":"some_name","environment":"some_env","id":"some_id","instance":"some_instance:1234","job":"some_job","name":"another_name","region":"some_region"},"value":[1.1,"2"]}]},"status":"success"}`
 		res := &http.Response{Body: io.NopCloser(bytes.NewBufferString(resBody))}
-		result := qd.parseResponse(context.Background(), &models.Query{}, res)
+		result := qd.parseResponse(context.Background(), &models.Query{}, res, false)
 		assert.Nil(t, result.Error)
 		assert.Len(t, result.Frames, 1)
 	})
@@ -27,7 +27,7 @@ func TestQueryData_parseResponse(t *testing.T) {
 	t.Run("resultType is after the result field must parsed normally", func(t *testing.T) {
 		resBody := `{"data":{"result":[{"metric":{"__name__":"some_name","environment":"some_env","id":"some_id","instance":"some_instance:1234","job":"some_job","name":"another_name","region":"some_region"},"value":[1.1,"2"]}],"resultType":"vector"},"status":"success"}`
 		res := &http.Response{Body: io.NopCloser(bytes.NewBufferString(resBody))}
-		result := qd.parseResponse(context.Background(), &models.Query{}, res)
+		result := qd.parseResponse(context.Background(), &models.Query{}, res, false)
 		assert.Nil(t, result.Error)
 		assert.Len(t, result.Frames, 1)
 	})
@@ -35,7 +35,7 @@ func TestQueryData_parseResponse(t *testing.T) {
 	t.Run("no resultType is existed in the data", func(t *testing.T) {
 		resBody := `{"data":{"result":[{"metric":{"__name__":"some_name","environment":"some_env","id":"some_id","instance":"some_instance:1234","job":"some_job","name":"another_name","region":"some_region"},"value":[1.1,"2"]}]},"status":"success"}`
 		res := &http.Response{Body: io.NopCloser(bytes.NewBufferString(resBody))}
-		result := qd.parseResponse(context.Background(), &models.Query{}, res)
+		result := qd.parseResponse(context.Background(), &models.Query{}, res, false)
 		assert.Error(t, result.Error)
 		assert.Equal(t, result.Error.Error(), "no resultType found")
 	})
@@ -43,7 +43,7 @@ func TestQueryData_parseResponse(t *testing.T) {
 	t.Run("resultType is set as empty string before result", func(t *testing.T) {
 		resBody := `{"data":{"resultType":"", "result":[{"metric":{"__name__":"some_name","environment":"some_env","id":"some_id","instance":"some_instance:1234","job":"some_job","name":"another_name","region":"some_region"},"value":[1.1,"2"]}]},"status":"success"}`
 		res := &http.Response{Body: io.NopCloser(bytes.NewBufferString(resBody))}
-		result := qd.parseResponse(context.Background(), &models.Query{}, res)
+		result := qd.parseResponse(context.Background(), &models.Query{}, res, false)
 		assert.Error(t, result.Error)
 		assert.Equal(t, result.Error.Error(), "unknown result type: ")
 	})
@@ -51,7 +51,7 @@ func TestQueryData_parseResponse(t *testing.T) {
 	t.Run("resultType is set as empty string after result", func(t *testing.T) {
 		resBody := `{"data":{"result":[{"metric":{"__name__":"some_name","environment":"some_env","id":"some_id","instance":"some_instance:1234","job":"some_job","name":"another_name","region":"some_region"},"value":[1.1,"2"]}],"resultType":""},"status":"success"}`
 		res := &http.Response{Body: io.NopCloser(bytes.NewBufferString(resBody))}
-		result := qd.parseResponse(context.Background(), &models.Query{}, res)
+		result := qd.parseResponse(context.Background(), &models.Query{}, res, false)
 		assert.Error(t, result.Error)
 		assert.Equal(t, result.Error.Error(), "unknown result type: ")
 	})
diff --git a/pkg/promlib/resource/resource.go b/pkg/promlib/resource/resource.go
new file mode 100644
index 0000000000000..888267d413834
--- /dev/null
+++ b/pkg/promlib/resource/resource.go
@@ -0,0 +1,86 @@
+package resource
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"net/http"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
+	"github.com/grafana/grafana-plugin-sdk-go/data/utils/maputil"
+
+	"github.com/grafana/grafana/pkg/promlib/client"
+	"github.com/grafana/grafana/pkg/promlib/utils"
+)
+
+type Resource struct {
+	promClient *client.Client
+	log        log.Logger
+}
+
+func New(
+	httpClient *http.Client,
+	settings backend.DataSourceInstanceSettings,
+	plog log.Logger,
+) (*Resource, error) {
+	jsonData, err := utils.GetJsonData(settings)
+	if err != nil {
+		return nil, err
+	}
+	httpMethod, _ := maputil.GetStringOptional(jsonData, "httpMethod")
+
+	if httpMethod == "" {
+		httpMethod = http.MethodPost
+	}
+
+	return &Resource{
+		log:        plog,
+		promClient: client.NewClient(httpClient, httpMethod, settings.URL),
+	}, nil
+}
+
+func (r *Resource) Execute(ctx context.Context, req *backend.CallResourceRequest) (*backend.CallResourceResponse, error) {
+	r.log.FromContext(ctx).Debug("Sending resource query", "URL", req.URL)
+	resp, err := r.promClient.QueryResource(ctx, req)
+	if err != nil {
+		return nil, fmt.Errorf("error querying resource: %v", err)
+	}
+
+	// frontend sets the X-Grafana-Cache with the desired response cache control value
+	if len(req.GetHTTPHeaders().Get("X-Grafana-Cache")) > 0 {
+		resp.Header.Set("X-Grafana-Cache", "y")
+		resp.Header.Set("Cache-Control", req.GetHTTPHeaders().Get("X-Grafana-Cache"))
+	}
+
+	defer func() {
+		tmpErr := resp.Body.Close()
+		if tmpErr != nil && err == nil {
+			err = tmpErr
+		}
+	}()
+
+	var buf bytes.Buffer
+	// Should be more efficient than ReadAll. See https://github.com/prometheus/client_golang/pull/976
+	_, err = buf.ReadFrom(resp.Body)
+	body := buf.Bytes()
+	if err != nil {
+		return nil, err
+	}
+	callResponse := &backend.CallResourceResponse{
+		Status:  resp.StatusCode,
+		Headers: resp.Header,
+		Body:    body,
+	}
+
+	return callResponse, err
+}
+
+func (r *Resource) DetectVersion(ctx context.Context, req *backend.CallResourceRequest) (*backend.CallResourceResponse, error) {
+	newReq := &backend.CallResourceRequest{
+		PluginContext: req.PluginContext,
+		Path:          "/api/v1/status/buildinfo",
+	}
+
+	return r.Execute(ctx, newReq)
+}
diff --git a/pkg/tsdb/prometheus/testdata/exemplar.query.json b/pkg/promlib/testdata/exemplar.query.json
similarity index 100%
rename from pkg/tsdb/prometheus/testdata/exemplar.query.json
rename to pkg/promlib/testdata/exemplar.query.json
diff --git a/pkg/tsdb/prometheus/testdata/exemplar.result.golden.jsonc b/pkg/promlib/testdata/exemplar.result.golden.jsonc
similarity index 100%
rename from pkg/tsdb/prometheus/testdata/exemplar.result.golden.jsonc
rename to pkg/promlib/testdata/exemplar.result.golden.jsonc
diff --git a/pkg/tsdb/prometheus/testdata/exemplar.result.json b/pkg/promlib/testdata/exemplar.result.json
similarity index 100%
rename from pkg/tsdb/prometheus/testdata/exemplar.result.json
rename to pkg/promlib/testdata/exemplar.result.json
diff --git a/pkg/tsdb/prometheus/testdata/range_auto.query.json b/pkg/promlib/testdata/range_auto.query.json
similarity index 100%
rename from pkg/tsdb/prometheus/testdata/range_auto.query.json
rename to pkg/promlib/testdata/range_auto.query.json
diff --git a/pkg/tsdb/prometheus/testdata/range_auto.result.golden.jsonc b/pkg/promlib/testdata/range_auto.result.golden.jsonc
similarity index 98%
rename from pkg/tsdb/prometheus/testdata/range_auto.result.golden.jsonc
rename to pkg/promlib/testdata/range_auto.result.golden.jsonc
index 6aaba0bdfd135..13bc995348af2 100644
--- a/pkg/tsdb/prometheus/testdata/range_auto.result.golden.jsonc
+++ b/pkg/promlib/testdata/range_auto.result.golden.jsonc
@@ -9,9 +9,9 @@
 //      "custom": {
 //          "resultType": "matrix"
 //      },
-//      "executedQueryString": "Expr: histogram_quantile(0.95, sum(rate(tns_request_duration_seconds_bucket[1m0s])) by (le))\nStep: 1s"
+//      "executedQueryString": "Expr: histogram_quantile(0.95, sum(rate(tns_request_duration_seconds_bucket[4s])) by (le))\nStep: 1s"
 //  }
-//  Name: histogram_quantile(0.95, sum(rate(tns_request_duration_seconds_bucket[1m0s])) by (le))
+//  Name: histogram_quantile(0.95, sum(rate(tns_request_duration_seconds_bucket[4s])) by (le))
 //  Dimensions: 2 Fields by 301 Rows
 //  +-----------------------------------+----------------------+
 //  | Name: Time                        | Name: Value          |
@@ -37,7 +37,7 @@
   "frames": [
     {
       "schema": {
-        "name": "histogram_quantile(0.95, sum(rate(tns_request_duration_seconds_bucket[1m0s])) by (le))",
+        "name": "histogram_quantile(0.95, sum(rate(tns_request_duration_seconds_bucket[4s])) by (le))",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -47,7 +47,7 @@
           "custom": {
             "resultType": "matrix"
           },
-          "executedQueryString": "Expr: histogram_quantile(0.95, sum(rate(tns_request_duration_seconds_bucket[1m0s])) by (le))\nStep: 1s"
+          "executedQueryString": "Expr: histogram_quantile(0.95, sum(rate(tns_request_duration_seconds_bucket[4s])) by (le))\nStep: 1s"
         },
         "fields": [
           {
@@ -68,7 +68,7 @@
             },
             "labels": {},
             "config": {
-              "displayNameFromDS": "histogram_quantile(0.95, sum(rate(tns_request_duration_seconds_bucket[1m0s])) by (le))"
+              "displayNameFromDS": "histogram_quantile(0.95, sum(rate(tns_request_duration_seconds_bucket[4s])) by (le))"
             }
           }
         ]
diff --git a/pkg/tsdb/prometheus/testdata/range_auto.result.json b/pkg/promlib/testdata/range_auto.result.json
similarity index 100%
rename from pkg/tsdb/prometheus/testdata/range_auto.result.json
rename to pkg/promlib/testdata/range_auto.result.json
diff --git a/pkg/tsdb/prometheus/testdata/range_infinity.query.json b/pkg/promlib/testdata/range_infinity.query.json
similarity index 100%
rename from pkg/tsdb/prometheus/testdata/range_infinity.query.json
rename to pkg/promlib/testdata/range_infinity.query.json
diff --git a/pkg/tsdb/prometheus/testdata/range_infinity.result.golden.jsonc b/pkg/promlib/testdata/range_infinity.result.golden.jsonc
similarity index 100%
rename from pkg/tsdb/prometheus/testdata/range_infinity.result.golden.jsonc
rename to pkg/promlib/testdata/range_infinity.result.golden.jsonc
diff --git a/pkg/tsdb/prometheus/testdata/range_infinity.result.json b/pkg/promlib/testdata/range_infinity.result.json
similarity index 100%
rename from pkg/tsdb/prometheus/testdata/range_infinity.result.json
rename to pkg/promlib/testdata/range_infinity.result.json
diff --git a/pkg/tsdb/prometheus/testdata/range_missing.query.json b/pkg/promlib/testdata/range_missing.query.json
similarity index 100%
rename from pkg/tsdb/prometheus/testdata/range_missing.query.json
rename to pkg/promlib/testdata/range_missing.query.json
diff --git a/pkg/tsdb/prometheus/testdata/range_missing.result.golden.jsonc b/pkg/promlib/testdata/range_missing.result.golden.jsonc
similarity index 100%
rename from pkg/tsdb/prometheus/testdata/range_missing.result.golden.jsonc
rename to pkg/promlib/testdata/range_missing.result.golden.jsonc
diff --git a/pkg/tsdb/prometheus/testdata/range_missing.result.json b/pkg/promlib/testdata/range_missing.result.json
similarity index 100%
rename from pkg/tsdb/prometheus/testdata/range_missing.result.json
rename to pkg/promlib/testdata/range_missing.result.json
diff --git a/pkg/tsdb/prometheus/testdata/range_nan.query.json b/pkg/promlib/testdata/range_nan.query.json
similarity index 100%
rename from pkg/tsdb/prometheus/testdata/range_nan.query.json
rename to pkg/promlib/testdata/range_nan.query.json
diff --git a/pkg/tsdb/prometheus/testdata/range_nan.result.golden.jsonc b/pkg/promlib/testdata/range_nan.result.golden.jsonc
similarity index 100%
rename from pkg/tsdb/prometheus/testdata/range_nan.result.golden.jsonc
rename to pkg/promlib/testdata/range_nan.result.golden.jsonc
diff --git a/pkg/tsdb/prometheus/testdata/range_nan.result.json b/pkg/promlib/testdata/range_nan.result.json
similarity index 100%
rename from pkg/tsdb/prometheus/testdata/range_nan.result.json
rename to pkg/promlib/testdata/range_nan.result.json
diff --git a/pkg/tsdb/prometheus/testdata/range_simple.query.json b/pkg/promlib/testdata/range_simple.query.json
similarity index 100%
rename from pkg/tsdb/prometheus/testdata/range_simple.query.json
rename to pkg/promlib/testdata/range_simple.query.json
diff --git a/pkg/tsdb/prometheus/testdata/range_simple.result.golden.jsonc b/pkg/promlib/testdata/range_simple.result.golden.jsonc
similarity index 100%
rename from pkg/tsdb/prometheus/testdata/range_simple.result.golden.jsonc
rename to pkg/promlib/testdata/range_simple.result.golden.jsonc
diff --git a/pkg/tsdb/prometheus/testdata/range_simple.result.json b/pkg/promlib/testdata/range_simple.result.json
similarity index 100%
rename from pkg/tsdb/prometheus/testdata/range_simple.result.json
rename to pkg/promlib/testdata/range_simple.result.json
diff --git a/pkg/tsdb/prometheus/utils/utils.go b/pkg/promlib/utils/utils.go
similarity index 100%
rename from pkg/tsdb/prometheus/utils/utils.go
rename to pkg/promlib/utils/utils.go
diff --git a/pkg/registry/apis/apis.go b/pkg/registry/apis/apis.go
index 546b75f5fa8b7..90b7de087550b 100644
--- a/pkg/registry/apis/apis.go
+++ b/pkg/registry/apis/apis.go
@@ -3,9 +3,17 @@ package apiregistry
 import (
 	"context"
 
-	examplev0alpha1 "github.com/grafana/grafana/pkg/apis/example/v0alpha1"
-	playlistsv0alpha1 "github.com/grafana/grafana/pkg/apis/playlist/v0alpha1"
 	"github.com/grafana/grafana/pkg/registry"
+	"github.com/grafana/grafana/pkg/registry/apis/dashboard"
+	"github.com/grafana/grafana/pkg/registry/apis/dashboardsnapshot"
+	"github.com/grafana/grafana/pkg/registry/apis/datasource"
+	"github.com/grafana/grafana/pkg/registry/apis/example"
+	"github.com/grafana/grafana/pkg/registry/apis/featuretoggle"
+	"github.com/grafana/grafana/pkg/registry/apis/folders"
+	"github.com/grafana/grafana/pkg/registry/apis/peakq"
+	"github.com/grafana/grafana/pkg/registry/apis/playlist"
+	"github.com/grafana/grafana/pkg/registry/apis/query"
+	"github.com/grafana/grafana/pkg/registry/apis/scope"
 )
 
 var (
@@ -14,11 +22,19 @@ var (
 
 type Service struct{}
 
-// ProvideService is an entry point for each service that will force initialization
+// ProvideRegistryServiceSink is an entry point for each service that will force initialization
 // and give each builder the chance to register itself with the main server
-func ProvideService(
-	_ *playlistsv0alpha1.PlaylistAPIBuilder,
-	_ *examplev0alpha1.TestingAPIBuilder,
+func ProvideRegistryServiceSink(
+	_ *dashboard.DashboardsAPIBuilder,
+	_ *playlist.PlaylistAPIBuilder,
+	_ *example.TestingAPIBuilder,
+	_ *dashboardsnapshot.SnapshotsAPIBuilder,
+	_ *featuretoggle.FeatureFlagAPIBuilder,
+	_ *datasource.DataSourceAPIBuilder,
+	_ *folders.FolderAPIBuilder,
+	_ *peakq.PeakQAPIBuilder,
+	_ *scope.ScopeAPIBuilder,
+	_ *query.QueryAPIBuilder,
 ) *Service {
 	return &Service{}
 }
diff --git a/pkg/registry/apis/dashboard/access/sql_dashboards.go b/pkg/registry/apis/dashboard/access/sql_dashboards.go
new file mode 100644
index 0000000000000..a7dc2698706fb
--- /dev/null
+++ b/pkg/registry/apis/dashboard/access/sql_dashboards.go
@@ -0,0 +1,428 @@
+package access
+
+import (
+	"context"
+	"database/sql"
+	"fmt"
+	"path/filepath"
+	"time"
+
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	dashboardsV0 "github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1"
+	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/infra/appcontext"
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+	"github.com/grafana/grafana/pkg/services/apiserver/utils"
+	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/provisioning"
+	"github.com/grafana/grafana/pkg/services/sqlstore/session"
+)
+
+var (
+	_ DashboardAccess = (*dashboardSqlAccess)(nil)
+)
+
+type dashboardRow struct {
+	// Dashboard resource
+	Dash *dashboardsV0.Dashboard
+
+	// Title -- this may come from saved metadata rather than the body
+	Title string
+
+	// The folder UID (needed for access control checks)
+	FolderUID string
+
+	// Needed for fast summary access
+	Tags []string
+
+	// Size (in bytes) of the dashboard payload
+	Bytes int
+
+	// The token we can use that will start a new connection that includes
+	// this same dashboard
+	token *continueToken
+}
+
+type dashboardSqlAccess struct {
+	sql          db.DB
+	sess         *session.SessionDB
+	namespacer   request.NamespaceMapper
+	dashStore    dashboards.Store
+	provisioning provisioning.ProvisioningService
+}
+
+func NewDashboardAccess(sql db.DB, namespacer request.NamespaceMapper, dashStore dashboards.Store, provisioning provisioning.ProvisioningService) DashboardAccess {
+	return &dashboardSqlAccess{
+		sql:          sql,
+		sess:         sql.GetSqlxSession(),
+		namespacer:   namespacer,
+		dashStore:    dashStore,
+		provisioning: provisioning,
+	}
+}
+
+const selector = `SELECT
+	dashboard.org_id, dashboard.id,
+	dashboard.uid,slug,
+	dashboard.folder_uid,
+	dashboard.created,dashboard.created_by,CreatedUSER.login,
+	dashboard.updated,dashboard.updated_by,UpdatedUSER.login,
+	plugin_id,
+	dashboard_provisioning.name as origin_name,
+	dashboard_provisioning.external_id as origin_path,
+	dashboard_provisioning.check_sum as origin_key,
+	dashboard_provisioning.updated as origin_ts,
+	dashboard.version,
+	title,
+	dashboard.data
+  FROM dashboard
+  LEFT OUTER JOIN dashboard_provisioning ON dashboard.id = dashboard_provisioning.dashboard_id
+  LEFT OUTER JOIN user AS CreatedUSER ON dashboard.created_by = CreatedUSER.id
+  LEFT OUTER JOIN user AS UpdatedUSER ON dashboard.created_by = UpdatedUSER.id
+  WHERE is_folder = false`
+
+// GetDashboards implements DashboardAccess.
+func (a *dashboardSqlAccess) GetDashboards(ctx context.Context, query *DashboardQuery) (*dashboardsV0.DashboardList, error) {
+	token, err := readContinueToken(query)
+	if err != nil {
+		return nil, err
+	}
+
+	limit := query.Limit
+	if limit < 1 {
+		limit = 15 //
+	}
+
+	rows, err := a.doQuery(ctx, selector+`
+		AND dashboard.org_id=$1
+		AND dashboard.id>=$2
+		ORDER BY dashboard.id asc
+		LIMIT $3
+	`, query.OrgID, token.id, (limit + 2))
+	if err != nil {
+		return nil, err
+	}
+	defer func() { _ = rows.Close() }()
+
+	totalSize := 0
+	list := &dashboardsV0.DashboardList{}
+	if err != nil {
+		return nil, err
+	}
+	for {
+		row, err := rows.Next()
+		if err != nil || row == nil {
+			return list, err
+		}
+
+		totalSize += row.Bytes
+		if len(list.Items) > 0 && (totalSize > query.MaxBytes || len(list.Items) >= limit) {
+			row.token.folder = query.FolderUID
+			list.Continue = row.token.String() // will skip this one but start here next time
+			return list, err
+		}
+		list.Items = append(list.Items, *row.Dash)
+	}
+}
+
+func (a *dashboardSqlAccess) GetDashboard(ctx context.Context, orgId int64, uid string) (*dashboardsV0.Dashboard, error) {
+	r, err := a.GetDashboards(ctx, &DashboardQuery{
+		OrgID: orgId,
+		UID:   uid,
+	})
+	if err != nil {
+		return nil, err
+	}
+	if len(r.Items) > 0 {
+		return &r.Items[0], nil
+	}
+	return nil, fmt.Errorf("not found")
+}
+
+// GetDashboards implements DashboardAccess.
+func (a *dashboardSqlAccess) GetDashboardSummaries(ctx context.Context, query *DashboardQuery) (*dashboardsV0.DashboardSummaryList, error) {
+	token, err := readContinueToken(query)
+	if err != nil {
+		return nil, err
+	}
+	limit := query.Limit
+	if limit < 1 {
+		limit = 15 //
+	}
+	rows, err := a.doQuery(ctx, selector+`
+		AND dashboard.org_id=$1
+		AND dashboard.id>=$2
+		ORDER BY dashboard.id asc
+		LIMIT $3
+	`, query.OrgID, token.id, (limit + 2))
+	if err != nil {
+		return nil, err
+	}
+	defer func() { _ = rows.Close() }()
+
+	totalSize := 0
+	list := &dashboardsV0.DashboardSummaryList{}
+	if err != nil {
+		return nil, err
+	}
+	for {
+		row, err := rows.Next()
+		if err != nil || row == nil {
+			return list, err
+		}
+
+		totalSize += row.Bytes
+		if len(list.Items) > 0 && (totalSize > query.MaxBytes || len(list.Items) >= limit) {
+			row.token.folder = query.FolderUID
+			list.Continue = row.token.String() // will skip this one but start here next time
+			return list, err
+		}
+		list.Items = append(list.Items, toSummary(row))
+	}
+}
+
+func (a *dashboardSqlAccess) GetDashboardSummary(ctx context.Context, orgId int64, uid string) (*dashboardsV0.DashboardSummary, error) {
+	r, err := a.GetDashboardSummaries(ctx, &DashboardQuery{
+		OrgID: orgId,
+		UID:   uid,
+	})
+	if err != nil {
+		return nil, err
+	}
+	if len(r.Items) > 0 {
+		return &r.Items[0], nil
+	}
+	return nil, fmt.Errorf("not found")
+}
+
+func toSummary(row *dashboardRow) dashboardsV0.DashboardSummary {
+	return dashboardsV0.DashboardSummary{
+		ObjectMeta: row.Dash.ObjectMeta,
+		Spec: dashboardsV0.DashboardSummarySpec{
+			Title: row.Title,
+			Tags:  row.Tags,
+		},
+	}
+}
+
+func (a *dashboardSqlAccess) doQuery(ctx context.Context, query string, args ...any) (*rowsWrapper, error) {
+	user, err := appcontext.User(ctx)
+	if err != nil {
+		return nil, err
+	}
+	rows, err := a.sess.Query(ctx, query, args...)
+	return &rowsWrapper{
+		rows: rows,
+		a:    a,
+		// This looks up rules from the permissions on a user
+		canReadDashboard: accesscontrol.Checker(user, dashboards.ActionDashboardsRead),
+	}, err
+}
+
+type rowsWrapper struct {
+	a     *dashboardSqlAccess
+	rows  *sql.Rows
+	idx   int
+	total int64
+
+	canReadDashboard func(scopes ...string) bool
+}
+
+func (r *rowsWrapper) Close() error {
+	return r.rows.Close()
+}
+
+func (r *rowsWrapper) Next() (*dashboardRow, error) {
+	// breaks after first readable value
+	for r.rows.Next() {
+		r.idx++
+		d, err := r.a.scanRow(r.rows)
+		if d != nil {
+			// Access control checker
+			scopes := []string{dashboards.ScopeDashboardsProvider.GetResourceScopeUID(d.Dash.Name)}
+			if d.FolderUID != "" { // Copied from searchV2... not sure the logic is right
+				scopes = append(scopes, dashboards.ScopeFoldersProvider.GetResourceScopeUID(d.FolderUID))
+			}
+			if !r.canReadDashboard(scopes...) {
+				continue
+			}
+			d.token.size = r.total // size before next!
+			r.total += int64(d.Bytes)
+		}
+
+		// returns the first folder it can
+		return d, err
+	}
+	return nil, nil
+}
+
+func (a *dashboardSqlAccess) scanRow(rows *sql.Rows) (*dashboardRow, error) {
+	dash := &dashboardsV0.Dashboard{
+		TypeMeta:   dashboardsV0.DashboardResourceInfo.TypeMeta(),
+		ObjectMeta: v1.ObjectMeta{Annotations: make(map[string]string)},
+	}
+	row := &dashboardRow{Dash: dash}
+
+	var dashboard_id int64
+	var orgId int64
+	var slug string
+	var folder_uid sql.NullString
+	var updated time.Time
+	var updatedByID int64
+	var updatedByName sql.NullString
+
+	var created time.Time
+	var createdByID int64
+	var createdByName sql.NullString
+
+	var plugin_id string
+	var origin_name sql.NullString
+	var origin_path sql.NullString
+	var origin_ts sql.NullInt64
+	var origin_key sql.NullString
+	var data []byte // the dashboard JSON
+	var version int64
+
+	err := rows.Scan(&orgId, &dashboard_id, &dash.Name,
+		&slug, &folder_uid,
+		&created, &createdByID, &createdByName,
+		&updated, &updatedByID, &updatedByName,
+		&plugin_id,
+		&origin_name, &origin_path, &origin_key, &origin_ts,
+		&version,
+		&row.Title, &data,
+	)
+
+	row.token = &continueToken{orgId: orgId, id: dashboard_id}
+	if err == nil {
+		dash.ResourceVersion = fmt.Sprintf("%d", created.UnixMilli())
+		dash.Namespace = a.namespacer(orgId)
+		dash.UID = utils.CalculateClusterWideUID(dash)
+		dash.SetCreationTimestamp(v1.NewTime(created))
+		meta, err := utils.MetaAccessor(dash)
+		if err != nil {
+			return nil, err
+		}
+		meta.SetUpdatedTimestamp(&updated)
+		meta.SetSlug(slug)
+		if createdByID > 0 {
+			meta.SetCreatedBy(fmt.Sprintf("user:%d/%s", createdByID, createdByName.String))
+		}
+		if updatedByID > 0 {
+			meta.SetUpdatedBy(fmt.Sprintf("user:%d/%s", updatedByID, updatedByName.String))
+		}
+		if folder_uid.Valid {
+			meta.SetFolder(folder_uid.String)
+			row.FolderUID = folder_uid.String
+		}
+
+		if origin_name.Valid {
+			ts := time.Unix(origin_ts.Int64, 0)
+
+			resolvedPath := a.provisioning.GetDashboardProvisionerResolvedPath(origin_name.String)
+			originPath, err := filepath.Rel(
+				resolvedPath,
+				origin_path.String,
+			)
+			if err != nil {
+				return nil, err
+			}
+
+			meta.SetOriginInfo(&utils.ResourceOriginInfo{
+				Name:      origin_name.String,
+				Path:      originPath,
+				Key:       origin_key.String,
+				Timestamp: &ts,
+			})
+		} else if plugin_id != "" {
+			meta.SetOriginInfo(&utils.ResourceOriginInfo{
+				Name: "plugin",
+				Path: plugin_id,
+			})
+		}
+
+		row.Bytes = len(data)
+		if row.Bytes > 0 {
+			err = dash.Spec.UnmarshalJSON(data)
+			if err != nil {
+				return row, err
+			}
+			dash.Spec.Set("id", dashboard_id) // add it so we can get it from the body later
+			row.Title = dash.Spec.GetNestedString("title")
+			row.Tags = dash.Spec.GetNestedStringSlice("tags")
+		}
+	}
+	return row, err
+}
+
+// DeleteDashboard implements DashboardAccess.
+func (a *dashboardSqlAccess) DeleteDashboard(ctx context.Context, orgId int64, uid string) (*dashboardsV0.Dashboard, bool, error) {
+	dash, err := a.GetDashboard(ctx, orgId, uid)
+	if err != nil {
+		return nil, false, err
+	}
+
+	id := dash.Spec.GetNestedInt64("id")
+	if id == 0 {
+		return nil, false, fmt.Errorf("could not find id in saved body")
+	}
+
+	err = a.dashStore.DeleteDashboard(ctx, &dashboards.DeleteDashboardCommand{
+		OrgID: orgId,
+		ID:    id,
+	})
+	if err != nil {
+		return nil, false, err
+	}
+	return dash, true, nil
+}
+
+// SaveDashboard implements DashboardAccess.
+func (a *dashboardSqlAccess) SaveDashboard(ctx context.Context, orgId int64, dash *dashboardsV0.Dashboard) (*dashboardsV0.Dashboard, bool, error) {
+	created := false
+	user, err := appcontext.User(ctx)
+	if err != nil {
+		return nil, created, err
+	}
+	if dash.Name != "" {
+		dash.Spec.Set("uid", dash.Name)
+
+		// Get the previous version to set the internal ID
+		old, _ := a.dashStore.GetDashboard(ctx, &dashboards.GetDashboardQuery{
+			OrgID: orgId,
+			UID:   dash.Name,
+		})
+		if old != nil {
+			dash.Spec.Set("id", old.ID)
+		} else {
+			dash.Spec.Remove("id") // existing of "id" makes it an update
+			created = true
+		}
+	} else {
+		dash.Spec.Remove("id")
+		dash.Spec.Remove("uid")
+	}
+
+	meta, err := utils.MetaAccessor(dash)
+	if err != nil {
+		return nil, false, err
+	}
+	out, err := a.dashStore.SaveDashboard(ctx, dashboards.SaveDashboardCommand{
+		OrgID:     orgId,
+		Dashboard: simplejson.NewFromAny(dash.Spec.UnstructuredContent()),
+		FolderUID: meta.GetFolder(),
+		Overwrite: true, // already passed the revisionVersion checks!
+		UserID:    user.UserID,
+	})
+	if err != nil {
+		return nil, false, err
+	}
+	if out != nil {
+		created = (out.Created.Unix() == out.Updated.Unix()) // and now?
+	}
+	dash, err = a.GetDashboard(ctx, orgId, out.UID)
+	return dash, created, err
+}
diff --git a/pkg/registry/apis/dashboard/access/token.go b/pkg/registry/apis/dashboard/access/token.go
new file mode 100644
index 0000000000000..0805adb89132a
--- /dev/null
+++ b/pkg/registry/apis/dashboard/access/token.go
@@ -0,0 +1,63 @@
+package access
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+
+	"github.com/grafana/grafana/pkg/util"
+)
+
+type continueToken struct {
+	orgId  int64
+	id     int64  // the internal id (sort by!)
+	folder string // from the query
+	size   int64
+}
+
+func readContinueToken(q *DashboardQuery) (continueToken, error) {
+	var err error
+	token := continueToken{}
+	if q.ContinueToken == "" {
+		return token, nil
+	}
+	parts := strings.Split(q.ContinueToken, "/")
+	if len(parts) < 3 {
+		return token, fmt.Errorf("invalid continue token (too few parts)")
+	}
+	sub := strings.Split(parts[0], ":")
+	if sub[0] != "org" {
+		return token, fmt.Errorf("expected org in first slug")
+	}
+	token.orgId, err = strconv.ParseInt(sub[1], 10, 64)
+	if err != nil {
+		return token, fmt.Errorf("error parsing orgid")
+	}
+
+	sub = strings.Split(parts[1], ":")
+	if sub[0] != "start" {
+		return token, fmt.Errorf("expected internal ID in second slug")
+	}
+	token.id, err = strconv.ParseInt(sub[1], 10, 64)
+	if err != nil {
+		return token, fmt.Errorf("error parsing updated")
+	}
+
+	sub = strings.Split(parts[2], ":")
+	if sub[0] != "folder" {
+		return token, fmt.Errorf("expected folder UID in third slug")
+	}
+	token.folder = sub[1]
+
+	// Check if the folder filter is the same from the previous query
+	if token.folder != q.FolderUID {
+		return token, fmt.Errorf("invalid token, the folder must match previous query")
+	}
+
+	return token, err
+}
+
+func (r *continueToken) String() string {
+	return fmt.Sprintf("org:%d/start:%d/folder:%s/%s",
+		r.orgId, r.id, r.folder, util.ByteCountSI(r.size))
+}
diff --git a/pkg/registry/apis/dashboard/access/types.go b/pkg/registry/apis/dashboard/access/types.go
new file mode 100644
index 0000000000000..1df421caf6d7b
--- /dev/null
+++ b/pkg/registry/apis/dashboard/access/types.go
@@ -0,0 +1,31 @@
+package access
+
+import (
+	"context"
+
+	dashboardsV0 "github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1"
+)
+
+// This does not check if you have permissions!
+
+type DashboardQuery struct {
+	OrgID     int64
+	UID       string // to select a single dashboard
+	FolderUID string
+	Limit     int
+	MaxBytes  int
+
+	// The token from previous query
+	ContinueToken string
+}
+
+type DashboardAccess interface {
+	GetDashboard(ctx context.Context, orgId int64, uid string) (*dashboardsV0.Dashboard, error)
+	GetDashboards(ctx context.Context, query *DashboardQuery) (*dashboardsV0.DashboardList, error)
+
+	GetDashboardSummary(ctx context.Context, orgId int64, uid string) (*dashboardsV0.DashboardSummary, error)
+	GetDashboardSummaries(ctx context.Context, query *DashboardQuery) (*dashboardsV0.DashboardSummaryList, error)
+
+	SaveDashboard(ctx context.Context, orgId int64, dash *dashboardsV0.Dashboard) (*dashboardsV0.Dashboard, bool, error)
+	DeleteDashboard(ctx context.Context, orgId int64, uid string) (*dashboardsV0.Dashboard, bool, error)
+}
diff --git a/pkg/registry/apis/dashboard/authorizer.go b/pkg/registry/apis/dashboard/authorizer.go
new file mode 100644
index 0000000000000..54a772591d5f1
--- /dev/null
+++ b/pkg/registry/apis/dashboard/authorizer.go
@@ -0,0 +1,95 @@
+package dashboard
+
+import (
+	"context"
+
+	"k8s.io/apiserver/pkg/authorization/authorizer"
+
+	"github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1"
+	"github.com/grafana/grafana/pkg/infra/appcontext"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/guardian"
+)
+
+func (b *DashboardsAPIBuilder) GetAuthorizer() authorizer.Authorizer {
+	return authorizer.AuthorizerFunc(
+		func(ctx context.Context, attr authorizer.Attributes) (authorized authorizer.Decision, reason string, err error) {
+			if !attr.IsResourceRequest() {
+				return authorizer.DecisionNoOpinion, "", nil
+			}
+
+			user, err := appcontext.User(ctx)
+			if err != nil {
+				return authorizer.DecisionDeny, "", err
+			}
+
+			if attr.GetName() == "" {
+				// Discourage use of the "list" command for non super admin users
+				if attr.GetVerb() == "list" && attr.GetResource() == v0alpha1.DashboardResourceInfo.GroupResource().Resource {
+					if !user.IsGrafanaAdmin {
+						return authorizer.DecisionDeny, "list summary objects (or connect as GrafanaAdmin)", err
+					}
+				}
+				return authorizer.DecisionNoOpinion, "", nil
+			}
+
+			ns := attr.GetNamespace()
+			if ns == "" {
+				return authorizer.DecisionDeny, "expected namespace", nil
+			}
+
+			info, err := request.ParseNamespace(attr.GetNamespace())
+			if err != nil {
+				return authorizer.DecisionDeny, "error reading org from namespace", err
+			}
+
+			// expensive path to lookup permissions for a single dashboard
+			dto, err := b.dashboardService.GetDashboard(ctx, &dashboards.GetDashboardQuery{
+				UID:   attr.GetName(),
+				OrgID: info.OrgID,
+			})
+			if err != nil {
+				return authorizer.DecisionDeny, "error loading dashboard", err
+			}
+
+			ok := false
+			guardian, err := guardian.NewByDashboard(ctx, dto, info.OrgID, user)
+			if err != nil {
+				return authorizer.DecisionDeny, "", err
+			}
+
+			switch attr.GetVerb() {
+			case "get":
+				ok, err = guardian.CanView()
+				if !ok || err != nil {
+					return authorizer.DecisionDeny, "can not view dashboard", err
+				}
+			case "create":
+				fallthrough
+			case "post":
+				ok, err = guardian.CanSave() // vs Edit?
+				if !ok || err != nil {
+					return authorizer.DecisionDeny, "can not save dashboard", err
+				}
+			case "update":
+				fallthrough
+			case "patch":
+				fallthrough
+			case "put":
+				ok, err = guardian.CanEdit() // vs Save
+				if !ok || err != nil {
+					return authorizer.DecisionDeny, "can not edit dashboard", err
+				}
+			case "delete":
+				ok, err = guardian.CanDelete()
+				if !ok || err != nil {
+					return authorizer.DecisionDeny, "can not delete dashboard", err
+				}
+			default:
+				b.log.Info("unknown verb", "verb", attr.GetVerb())
+				return authorizer.DecisionNoOpinion, "unsupported verb", nil // Unknown verb
+			}
+			return authorizer.DecisionAllow, "", nil
+		})
+}
diff --git a/pkg/registry/apis/dashboard/legacy_storage.go b/pkg/registry/apis/dashboard/legacy_storage.go
new file mode 100644
index 0000000000000..20e5193b240a3
--- /dev/null
+++ b/pkg/registry/apis/dashboard/legacy_storage.go
@@ -0,0 +1,155 @@
+package dashboard
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"time"
+
+	"k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+	"github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1"
+	"github.com/grafana/grafana/pkg/registry/apis/dashboard/access"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+)
+
+var (
+	_ rest.Storage              = (*dashboardStorage)(nil)
+	_ rest.Scoper               = (*dashboardStorage)(nil)
+	_ rest.SingularNameProvider = (*dashboardStorage)(nil)
+	_ rest.Getter               = (*dashboardStorage)(nil)
+	_ rest.Lister               = (*dashboardStorage)(nil)
+	_ rest.Creater              = (*dashboardStorage)(nil)
+	_ rest.Updater              = (*dashboardStorage)(nil)
+	_ rest.GracefulDeleter      = (*dashboardStorage)(nil)
+)
+
+type dashboardStorage struct {
+	resource       common.ResourceInfo
+	access         access.DashboardAccess
+	tableConverter rest.TableConvertor
+}
+
+func (s *dashboardStorage) New() runtime.Object {
+	return s.resource.NewFunc()
+}
+
+func (s *dashboardStorage) Destroy() {}
+
+func (s *dashboardStorage) NamespaceScoped() bool {
+	return true
+}
+
+func (s *dashboardStorage) GetSingularName() string {
+	return s.resource.GetSingularName()
+}
+
+func (s *dashboardStorage) NewList() runtime.Object {
+	return s.resource.NewListFunc()
+}
+
+func (s *dashboardStorage) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) {
+	return s.tableConverter.ConvertToTable(ctx, object, tableOptions)
+}
+
+func (s *dashboardStorage) Create(ctx context.Context,
+	obj runtime.Object,
+	createValidation rest.ValidateObjectFunc,
+	options *metav1.CreateOptions,
+) (runtime.Object, error) {
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, err
+	}
+
+	p, ok := obj.(*v0alpha1.Dashboard)
+	if !ok {
+		return nil, fmt.Errorf("expected dashboard?")
+	}
+
+	// HACK to simplify unique name testing from kubectl
+	t := p.Spec.GetNestedString("title")
+	if strings.Contains(t, "${NOW}") {
+		t = strings.ReplaceAll(t, "${NOW}", fmt.Sprintf("%d", time.Now().Unix()))
+		p.Spec.Set("title", t)
+	}
+
+	dash, _, err := s.access.SaveDashboard(ctx, info.OrgID, p)
+	return dash, err
+}
+
+func (s *dashboardStorage) Update(ctx context.Context,
+	name string,
+	objInfo rest.UpdatedObjectInfo,
+	createValidation rest.ValidateObjectFunc,
+	updateValidation rest.ValidateObjectUpdateFunc,
+	forceAllowCreate bool,
+	options *metav1.UpdateOptions,
+) (runtime.Object, bool, error) {
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, false, err
+	}
+
+	created := false
+	old, err := s.Get(ctx, name, nil)
+	if err != nil {
+		return old, created, err
+	}
+
+	obj, err := objInfo.UpdatedObject(ctx, old)
+	if err != nil {
+		return old, created, err
+	}
+	p, ok := obj.(*v0alpha1.Dashboard)
+	if !ok {
+		return nil, created, fmt.Errorf("expected dashboard after update")
+	}
+
+	_, created, err = s.access.SaveDashboard(ctx, info.OrgID, p)
+	if err == nil {
+		r, err := s.Get(ctx, name, nil)
+		return r, created, err
+	}
+	return nil, created, err
+}
+
+// GracefulDeleter
+func (s *dashboardStorage) Delete(ctx context.Context, name string, deleteValidation rest.ValidateObjectFunc, options *metav1.DeleteOptions) (runtime.Object, bool, error) {
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, false, err
+	}
+
+	return s.access.DeleteDashboard(ctx, info.OrgID, name)
+}
+
+func (s *dashboardStorage) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) {
+	orgId, err := request.OrgIDForList(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	// fmt.Printf("LIST: %s\n", options.Continue)
+
+	query := &access.DashboardQuery{
+		OrgID:         orgId,
+		Limit:         int(options.Limit),
+		MaxBytes:      2 * 1024 * 1024, // 2MB,
+		ContinueToken: options.Continue,
+	}
+	return s.access.GetDashboards(ctx, query)
+}
+
+func (s *dashboardStorage) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) {
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, err
+	}
+
+	return s.access.GetDashboard(ctx, info.OrgID, name)
+}
diff --git a/pkg/registry/apis/dashboard/register.go b/pkg/registry/apis/dashboard/register.go
new file mode 100644
index 0000000000000..98b928a560f31
--- /dev/null
+++ b/pkg/registry/apis/dashboard/register.go
@@ -0,0 +1,222 @@
+package dashboard
+
+import (
+	"fmt"
+	"time"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
+	"k8s.io/apiserver/pkg/registry/generic"
+	genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"
+	"k8s.io/apiserver/pkg/registry/rest"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+	common "k8s.io/kube-openapi/pkg/common"
+	"k8s.io/kube-openapi/pkg/spec3"
+
+	"github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1"
+	"github.com/grafana/grafana/pkg/apiserver/builder"
+	grafanaregistry "github.com/grafana/grafana/pkg/apiserver/registry/generic"
+	grafanarest "github.com/grafana/grafana/pkg/apiserver/rest"
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/registry/apis/dashboard/access"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+	"github.com/grafana/grafana/pkg/services/apiserver/utils"
+	"github.com/grafana/grafana/pkg/services/dashboards"
+	dashver "github.com/grafana/grafana/pkg/services/dashboardversion"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/provisioning"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+var _ builder.APIGroupBuilder = (*DashboardsAPIBuilder)(nil)
+
+// This is used just so wire has something unique to return
+type DashboardsAPIBuilder struct {
+	dashboardService dashboards.DashboardService
+
+	dashboardVersionService dashver.Service
+	accessControl           accesscontrol.AccessControl
+	namespacer              request.NamespaceMapper
+	access                  access.DashboardAccess
+	dashStore               dashboards.Store
+
+	log log.Logger
+}
+
+func RegisterAPIService(cfg *setting.Cfg, features featuremgmt.FeatureToggles,
+	apiregistration builder.APIRegistrar,
+	dashboardService dashboards.DashboardService,
+	dashboardVersionService dashver.Service,
+	accessControl accesscontrol.AccessControl,
+	provisioning provisioning.ProvisioningService,
+	dashStore dashboards.Store,
+	sql db.DB,
+) *DashboardsAPIBuilder {
+	if !features.IsEnabledGlobally(featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs) {
+		return nil // skip registration unless opting into experimental apis
+	}
+
+	namespacer := request.GetNamespaceMapper(cfg)
+	builder := &DashboardsAPIBuilder{
+		dashboardService:        dashboardService,
+		dashboardVersionService: dashboardVersionService,
+		dashStore:               dashStore,
+		accessControl:           accessControl,
+		namespacer:              namespacer,
+		access:                  access.NewDashboardAccess(sql, namespacer, dashStore, provisioning),
+		log:                     log.New("grafana-apiserver.dashboards"),
+	}
+	apiregistration.RegisterAPI(builder)
+	return builder
+}
+
+func (b *DashboardsAPIBuilder) GetGroupVersion() schema.GroupVersion {
+	return v0alpha1.DashboardResourceInfo.GroupVersion()
+}
+
+func addKnownTypes(scheme *runtime.Scheme, gv schema.GroupVersion) {
+	scheme.AddKnownTypes(gv,
+		&v0alpha1.Dashboard{},
+		&v0alpha1.DashboardList{},
+		&v0alpha1.DashboardAccessInfo{},
+		&v0alpha1.DashboardVersionList{},
+		&v0alpha1.DashboardSummary{},
+		&v0alpha1.DashboardSummaryList{},
+		&v0alpha1.VersionsQueryOptions{},
+	)
+}
+
+func (b *DashboardsAPIBuilder) InstallSchema(scheme *runtime.Scheme) error {
+	resourceInfo := v0alpha1.DashboardResourceInfo
+	addKnownTypes(scheme, resourceInfo.GroupVersion())
+
+	// Link this version to the internal representation.
+	// This is used for server-side-apply (PATCH), and avoids the error:
+	//   "no kind is registered for the type"
+	addKnownTypes(scheme, schema.GroupVersion{
+		Group:   resourceInfo.GroupVersion().Group,
+		Version: runtime.APIVersionInternal,
+	})
+
+	// If multiple versions exist, then register conversions from zz_generated.conversion.go
+	// if err := playlist.RegisterConversions(scheme); err != nil {
+	//   return err
+	// }
+	metav1.AddToGroupVersion(scheme, resourceInfo.GroupVersion())
+	return scheme.SetVersionPriority(resourceInfo.GroupVersion())
+}
+
+func (b *DashboardsAPIBuilder) GetAPIGroupInfo(
+	scheme *runtime.Scheme,
+	codecs serializer.CodecFactory, // pointer?
+	optsGetter generic.RESTOptionsGetter,
+	dualWrite bool,
+) (*genericapiserver.APIGroupInfo, error) {
+	apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(v0alpha1.GROUP, scheme, metav1.ParameterCodec, codecs)
+
+	resourceInfo := v0alpha1.DashboardResourceInfo
+	strategy := grafanaregistry.NewStrategy(scheme)
+	store := &genericregistry.Store{
+		NewFunc:                   resourceInfo.NewFunc,
+		NewListFunc:               resourceInfo.NewListFunc,
+		PredicateFunc:             grafanaregistry.Matcher,
+		DefaultQualifiedResource:  resourceInfo.GroupResource(),
+		SingularQualifiedResource: resourceInfo.SingularGroupResource(),
+		CreateStrategy:            strategy,
+		UpdateStrategy:            strategy,
+		DeleteStrategy:            strategy,
+	}
+	store.TableConvertor = utils.NewTableConverter(
+		store.DefaultQualifiedResource,
+		[]metav1.TableColumnDefinition{
+			{Name: "Name", Type: "string", Format: "name"},
+			{Name: "Title", Type: "string", Format: "string", Description: "The dashboard name"},
+			{Name: "Created At", Type: "date"},
+		},
+		func(obj any) ([]interface{}, error) {
+			dash, ok := obj.(*v0alpha1.Dashboard)
+			if ok {
+				return []interface{}{
+					dash.Name,
+					dash.Spec.GetNestedString("title"),
+					dash.CreationTimestamp.UTC().Format(time.RFC3339),
+				}, nil
+			}
+			summary, ok := obj.(*v0alpha1.DashboardSummary)
+			if ok {
+				return []interface{}{
+					dash.Name,
+					summary.Spec.Title,
+					dash.CreationTimestamp.UTC().Format(time.RFC3339),
+				}, nil
+			}
+			return nil, fmt.Errorf("expected dashboard or summary")
+		})
+
+	legacyStore := &dashboardStorage{
+		resource:       resourceInfo,
+		access:         b.access,
+		tableConverter: store.TableConvertor,
+	}
+
+	storage := map[string]rest.Storage{}
+	storage[resourceInfo.StoragePath()] = legacyStore
+	storage[resourceInfo.StoragePath("access")] = &AccessREST{
+		builder: b,
+	}
+	storage[resourceInfo.StoragePath("versions")] = &VersionsREST{
+		builder: b,
+	}
+
+	// Dual writes if a RESTOptionsGetter is provided
+	if dualWrite && optsGetter != nil {
+		options := &generic.StoreOptions{RESTOptions: optsGetter, AttrFunc: grafanaregistry.GetAttrs}
+		if err := store.CompleteWithOptions(options); err != nil {
+			return nil, err
+		}
+		storage[resourceInfo.StoragePath()] = grafanarest.NewDualWriter(legacyStore, store)
+	}
+
+	// Summary
+	resourceInfo2 := v0alpha1.DashboardSummaryResourceInfo
+	storage[resourceInfo2.StoragePath()] = &summaryStorage{
+		resource:       resourceInfo2,
+		access:         b.access,
+		tableConverter: store.TableConvertor,
+	}
+
+	apiGroupInfo.VersionedResourcesStorageMap[v0alpha1.VERSION] = storage
+	return &apiGroupInfo, nil
+}
+
+func (b *DashboardsAPIBuilder) GetOpenAPIDefinitions() common.GetOpenAPIDefinitions {
+	return v0alpha1.GetOpenAPIDefinitions
+}
+
+func (b *DashboardsAPIBuilder) PostProcessOpenAPI(oas *spec3.OpenAPI) (*spec3.OpenAPI, error) {
+	// The plugin description
+	oas.Info.Description = "Grafana dashboards as resources"
+
+	// The root api URL
+	root := "/apis/" + b.GetGroupVersion().String() + "/"
+
+	// Hide the ability to list or watch across all tenants
+	delete(oas.Paths.Paths, root+v0alpha1.DashboardResourceInfo.GroupResource().Resource)
+	delete(oas.Paths.Paths, root+"watch/"+v0alpha1.DashboardResourceInfo.GroupResource().Resource)
+	delete(oas.Paths.Paths, root+v0alpha1.DashboardSummaryResourceInfo.GroupResource().Resource)
+
+	// The root API discovery list
+	sub := oas.Paths.Paths[root]
+	if sub != nil && sub.Get != nil {
+		sub.Get.Tags = []string{"API Discovery"} // sorts first in the list
+	}
+	return oas, nil
+}
+
+func (b *DashboardsAPIBuilder) GetAPIRoutes() *builder.APIRoutes {
+	return nil // no custom API routes
+}
diff --git a/pkg/registry/apis/dashboard/sub_access.go b/pkg/registry/apis/dashboard/sub_access.go
new file mode 100644
index 0000000000000..3436a3f1fc802
--- /dev/null
+++ b/pkg/registry/apis/dashboard/sub_access.go
@@ -0,0 +1,114 @@
+package dashboard
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	dashboard "github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1"
+	"github.com/grafana/grafana/pkg/infra/appcontext"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	dashboardssvc "github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/guardian"
+)
+
+type AccessREST struct {
+	builder *DashboardsAPIBuilder
+}
+
+var _ = rest.Connecter(&AccessREST{})
+var _ = rest.StorageMetadata(&AccessREST{})
+
+func (r *AccessREST) New() runtime.Object {
+	return &dashboard.DashboardAccessInfo{}
+}
+
+func (r *AccessREST) Destroy() {
+}
+
+func (r *AccessREST) ConnectMethods() []string {
+	return []string{"GET"}
+}
+
+func (r *AccessREST) NewConnectOptions() (runtime.Object, bool, string) {
+	return &dashboard.VersionsQueryOptions{}, false, ""
+}
+
+func (r *AccessREST) ProducesMIMETypes(verb string) []string {
+	return nil
+}
+
+func (r *AccessREST) ProducesObject(verb string) interface{} {
+	return &dashboard.DashboardAccessInfo{}
+}
+
+func (r *AccessREST) Connect(ctx context.Context, name string, opts runtime.Object, responder rest.Responder) (http.Handler, error) {
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, err
+	}
+
+	user, err := appcontext.User(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	dto, err := r.builder.dashboardService.GetDashboard(ctx, &dashboardssvc.GetDashboardQuery{
+		UID:   name,
+		OrgID: info.OrgID,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	guardian, err := guardian.NewByDashboard(ctx, dto, info.OrgID, user)
+	if err != nil {
+		return nil, err
+	}
+	canView, err := guardian.CanView()
+	if err != nil || !canView {
+		return nil, fmt.Errorf("not allowed to view")
+	}
+
+	access := &dashboard.DashboardAccessInfo{}
+	access.CanEdit, _ = guardian.CanEdit()
+	access.CanSave, _ = guardian.CanSave()
+	access.CanAdmin, _ = guardian.CanAdmin()
+	access.CanDelete, _ = guardian.CanDelete()
+	access.CanStar = user.IsRealUser() && !user.IsAnonymous
+
+	access.AnnotationsPermissions = &dashboard.AnnotationPermission{}
+	r.getAnnotationPermissionsByScope(ctx, user, &access.AnnotationsPermissions.Dashboard, accesscontrol.ScopeAnnotationsTypeDashboard)
+	r.getAnnotationPermissionsByScope(ctx, user, &access.AnnotationsPermissions.Organization, accesscontrol.ScopeAnnotationsTypeOrganization)
+
+	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		responder.Object(http.StatusOK, access)
+	}), nil
+}
+
+func (r *AccessREST) getAnnotationPermissionsByScope(ctx context.Context, user identity.Requester, actions *dashboard.AnnotationActions, scope string) {
+	var err error
+
+	evaluate := accesscontrol.EvalPermission(accesscontrol.ActionAnnotationsCreate, scope)
+	actions.CanAdd, err = r.builder.accessControl.Evaluate(ctx, user, evaluate)
+	if err != nil {
+		r.builder.log.Warn("Failed to evaluate permission", "err", err, "action", accesscontrol.ActionAnnotationsCreate, "scope", scope)
+	}
+
+	evaluate = accesscontrol.EvalPermission(accesscontrol.ActionAnnotationsDelete, scope)
+	actions.CanDelete, err = r.builder.accessControl.Evaluate(ctx, user, evaluate)
+	if err != nil {
+		r.builder.log.Warn("Failed to evaluate permission", "err", err, "action", accesscontrol.ActionAnnotationsDelete, "scope", scope)
+	}
+
+	evaluate = accesscontrol.EvalPermission(accesscontrol.ActionAnnotationsWrite, scope)
+	actions.CanEdit, err = r.builder.accessControl.Evaluate(ctx, user, evaluate)
+	if err != nil {
+		r.builder.log.Warn("Failed to evaluate permission", "err", err, "action", accesscontrol.ActionAnnotationsWrite, "scope", scope)
+	}
+}
diff --git a/pkg/registry/apis/dashboard/sub_versions.go b/pkg/registry/apis/dashboard/sub_versions.go
new file mode 100644
index 0000000000000..4787c5387df9f
--- /dev/null
+++ b/pkg/registry/apis/dashboard/sub_versions.go
@@ -0,0 +1,117 @@
+package dashboard
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"strconv"
+	"strings"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+	dashboard "github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+	dashver "github.com/grafana/grafana/pkg/services/dashboardversion"
+)
+
+type VersionsREST struct {
+	builder *DashboardsAPIBuilder
+}
+
+var _ = rest.Connecter(&VersionsREST{})
+var _ = rest.StorageMetadata(&VersionsREST{})
+
+func (r *VersionsREST) New() runtime.Object {
+	return &dashboard.DashboardVersionList{}
+}
+
+func (r *VersionsREST) Destroy() {
+}
+
+func (r *VersionsREST) ConnectMethods() []string {
+	return []string{"GET"}
+}
+
+func (r *VersionsREST) ProducesMIMETypes(verb string) []string {
+	return nil
+}
+
+func (r *VersionsREST) ProducesObject(verb string) interface{} {
+	return &dashboard.DashboardVersionList{}
+}
+
+func (r *VersionsREST) NewConnectOptions() (runtime.Object, bool, string) {
+	return nil, true, ""
+}
+
+func (r *VersionsREST) Connect(ctx context.Context, uid string, opts runtime.Object, responder rest.Responder) (http.Handler, error) {
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, err
+	}
+
+	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		path := req.URL.Path
+		idx := strings.LastIndex(path, "/versions/")
+		if idx > 0 {
+			key := path[strings.LastIndex(path, "/")+1:]
+			version, err := strconv.Atoi(key)
+			if err != nil {
+				responder.Error(err)
+				return
+			}
+
+			dto, err := r.builder.dashboardVersionService.Get(ctx, &dashver.GetDashboardVersionQuery{
+				DashboardUID: uid,
+				OrgID:        info.OrgID,
+				Version:      version,
+			})
+			if err != nil {
+				responder.Error(err)
+				return
+			}
+
+			data, _ := dto.Data.Map()
+
+			// Convert the version to a regular dashboard
+			dash := &dashboard.Dashboard{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:              uid,
+					CreationTimestamp: metav1.NewTime(dto.Created),
+				},
+				Spec: common.Unstructured{Object: data},
+			}
+			responder.Object(100, dash)
+			return
+		}
+
+		// Or list versions
+		rsp, err := r.builder.dashboardVersionService.List(ctx, &dashver.ListDashboardVersionsQuery{
+			DashboardUID: uid,
+			OrgID:        info.OrgID,
+		})
+		if err != nil {
+			responder.Error(err)
+			return
+		}
+		versions := &dashboard.DashboardVersionList{}
+		for _, v := range rsp {
+			info := dashboard.DashboardVersionInfo{
+				Version: v.Version,
+				Created: v.Created.UnixMilli(),
+				Message: v.Message,
+			}
+			if v.ParentVersion != v.Version {
+				info.ParentVersion = v.ParentVersion
+			}
+			if v.CreatedBy > 0 {
+				info.CreatedBy = fmt.Sprintf("%d", v.CreatedBy)
+			}
+			versions.Items = append(versions.Items, info)
+		}
+		responder.Object(http.StatusOK, versions)
+	}), nil
+}
diff --git a/pkg/registry/apis/dashboard/summary_storage.go b/pkg/registry/apis/dashboard/summary_storage.go
new file mode 100644
index 0000000000000..9f8966e012eff
--- /dev/null
+++ b/pkg/registry/apis/dashboard/summary_storage.go
@@ -0,0 +1,74 @@
+package dashboard
+
+import (
+	"context"
+
+	"k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+	"github.com/grafana/grafana/pkg/registry/apis/dashboard/access"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+)
+
+var (
+	_ rest.Storage              = (*summaryStorage)(nil)
+	_ rest.Scoper               = (*summaryStorage)(nil)
+	_ rest.SingularNameProvider = (*summaryStorage)(nil)
+	_ rest.Getter               = (*summaryStorage)(nil)
+	_ rest.Lister               = (*summaryStorage)(nil)
+)
+
+type summaryStorage struct {
+	resource       common.ResourceInfo
+	access         access.DashboardAccess
+	tableConverter rest.TableConvertor
+}
+
+func (s *summaryStorage) New() runtime.Object {
+	return s.resource.NewFunc()
+}
+
+func (s *summaryStorage) Destroy() {}
+
+func (s *summaryStorage) NamespaceScoped() bool {
+	return true
+}
+
+func (s *summaryStorage) GetSingularName() string {
+	return s.resource.GetSingularName()
+}
+
+func (s *summaryStorage) NewList() runtime.Object {
+	return s.resource.NewListFunc()
+}
+
+func (s *summaryStorage) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) {
+	return s.tableConverter.ConvertToTable(ctx, object, tableOptions)
+}
+
+func (s *summaryStorage) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) {
+	orgId, err := request.OrgIDForList(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	query := &access.DashboardQuery{
+		OrgID:         orgId,
+		Limit:         int(options.Limit),
+		MaxBytes:      2 * 1024 * 1024, // 2MB,
+		ContinueToken: options.Continue,
+	}
+	return s.access.GetDashboardSummaries(ctx, query)
+}
+
+func (s *summaryStorage) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) {
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, err
+	}
+
+	return s.access.GetDashboardSummary(ctx, info.OrgID, name)
+}
diff --git a/pkg/registry/apis/dashboardsnapshot/conversions.go b/pkg/registry/apis/dashboardsnapshot/conversions.go
new file mode 100644
index 0000000000000..8071799de5afa
--- /dev/null
+++ b/pkg/registry/apis/dashboardsnapshot/conversions.go
@@ -0,0 +1,71 @@
+package dashboardsnapshot
+
+import (
+	"fmt"
+	"time"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	dashboardsnapshot "github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+	"github.com/grafana/grafana/pkg/services/apiserver/utils"
+	"github.com/grafana/grafana/pkg/services/dashboardsnapshots"
+)
+
+func convertDTOToSnapshot(v *dashboardsnapshots.DashboardSnapshotDTO, namespacer request.NamespaceMapper) *dashboardsnapshot.DashboardSnapshot {
+	expires := v.Expires.UnixMilli()
+	if v.Expires.After(time.Date(2070, time.January, 0, 0, 0, 0, 0, time.UTC)) {
+		expires = 0 // ignore things expiring long into the future
+	}
+	snap := &dashboardsnapshot.DashboardSnapshot{
+		TypeMeta: resourceInfo.TypeMeta(),
+		ObjectMeta: metav1.ObjectMeta{
+			Name:              v.Key,
+			ResourceVersion:   fmt.Sprintf("%d", v.Updated.UnixMilli()),
+			CreationTimestamp: metav1.NewTime(v.Created),
+			Namespace:         namespacer(v.OrgID),
+		},
+		Spec: dashboardsnapshot.SnapshotInfo{
+			Title:       v.Name,
+			ExternalURL: v.ExternalURL,
+			Expires:     expires,
+		},
+	}
+	if v.Updated != v.Created {
+		meta, _ := utils.MetaAccessor(snap)
+		meta.SetUpdatedTimestamp(&v.Updated)
+	}
+	return snap
+}
+
+func convertSnapshotToK8sResource(v *dashboardsnapshots.DashboardSnapshot, namespacer request.NamespaceMapper) *dashboardsnapshot.DashboardSnapshot {
+	expires := v.Expires.UnixMilli()
+	if v.Expires.After(time.Date(2070, time.January, 0, 0, 0, 0, 0, time.UTC)) {
+		expires = 0 // ignore things expiring long into the future
+	}
+
+	info := dashboardsnapshot.SnapshotInfo{
+		Title:       v.Name,
+		ExternalURL: v.ExternalURL,
+		Expires:     expires,
+	}
+	s := v.Dashboard.Get("snapshot")
+	if s != nil {
+		info.OriginalUrl, _ = s.Get("originalUrl").String()
+		info.Timestamp, _ = s.Get("timestamp").String()
+	}
+	snap := &dashboardsnapshot.DashboardSnapshot{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:              v.Key,
+			ResourceVersion:   fmt.Sprintf("%d", v.Updated.UnixMilli()),
+			CreationTimestamp: metav1.NewTime(v.Created),
+			Namespace:         namespacer(v.OrgID),
+		},
+		Spec: info,
+	}
+	if v.Updated != v.Created {
+		meta, _ := utils.MetaAccessor(snap)
+		meta.SetUpdatedTimestamp(&v.Updated)
+	}
+	return snap
+}
diff --git a/pkg/registry/apis/dashboardsnapshot/exporter.go b/pkg/registry/apis/dashboardsnapshot/exporter.go
new file mode 100644
index 0000000000000..18dbd203eaf3b
--- /dev/null
+++ b/pkg/registry/apis/dashboardsnapshot/exporter.go
@@ -0,0 +1,130 @@
+package dashboardsnapshot
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"time"
+
+	"gocloud.dev/blob"
+	"k8s.io/kube-openapi/pkg/spec3"
+
+	"github.com/grafana/grafana/pkg/apiserver/builder"
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/services/dashboardsnapshots"
+)
+
+type dashExportStatus struct {
+	Count    int
+	Index    int
+	Started  int64
+	Updated  int64
+	Finished int64
+	Error    string
+}
+
+type dashExporter struct {
+	status dashExportStatus
+
+	service dashboardsnapshots.Service
+	sql     db.DB
+}
+
+func (d *dashExporter) getAPIRouteHandler() builder.APIRouteHandler {
+	return builder.APIRouteHandler{
+		Path: "admin/export",
+		Spec: &spec3.PathProps{
+			Summary:     "an example at the root level",
+			Description: "longer description here?",
+			Post: &spec3.Operation{
+				OperationProps: spec3.OperationProps{
+					Tags: []string{"export"},
+					Responses: &spec3.Responses{
+						ResponsesProps: spec3.ResponsesProps{
+							StatusCodeResponses: map[int]*spec3.Response{
+								200: {
+									ResponseProps: spec3.ResponseProps{
+										Content: map[string]*spec3.MediaType{
+											"application/json": {},
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Handler: func(w http.ResponseWriter, r *http.Request) {
+			// Only let it start once
+			if d.status.Started == 0 {
+				go d.doExport()
+			}
+			time.Sleep(time.Second)
+			_ = json.NewEncoder(w).Encode(d.status)
+		},
+	}
+}
+
+// NO way to stop!!!!!!
+func (d *dashExporter) doExport() {
+	defer func() {
+		d.status.Finished = time.Now().UnixMilli()
+	}()
+	d.status = dashExportStatus{
+		Started: time.Now().UnixMilli(),
+	}
+	if d.sql == nil {
+		d.status.Error = "missing dependencies"
+		return
+	}
+
+	ctx := context.Background()
+	keys := []string{}
+	err := d.sql.GetSqlxSession().Select(ctx,
+		&keys, "SELECT key FROM dashboard_snapshot ORDER BY id asc")
+	if err != nil {
+		d.status.Error = err.Error()
+		return
+	}
+	d.status.Count = len(keys)
+
+	bucket, err := blob.OpenBucket(ctx, "mem://?key=foo.txt&prefix=a/subfolder/")
+	if err != nil {
+		d.status.Error = err.Error()
+		return
+	}
+	defer func() {
+		_ = bucket.Close()
+	}()
+
+	for idx, key := range keys {
+		d.status.Index = idx
+		snap, err := d.service.GetDashboardSnapshot(ctx, &dashboardsnapshots.GetDashboardSnapshotQuery{
+			Key: key,
+		})
+		if err != nil {
+			d.status.Error = err.Error()
+			return
+		}
+
+		dash, err := snap.Dashboard.ToDB()
+		if err != nil {
+			d.status.Error = err.Error()
+			return
+		}
+
+		fmt.Printf("TODO, export: %s (len: %d)\n", snap.Key, len(dash))
+
+		// w, err := bucket.NewWriter(ctx, "foo.txt", nil)
+		// if err != nil {
+		// 	d.status.Error = err.Error()
+		// 	return
+		// }
+
+		time.Sleep(time.Second * 1)
+		d.status.Updated = time.Now().UnixMilli()
+	}
+	fmt.Printf("done!\n")
+}
diff --git a/pkg/registry/apis/dashboardsnapshot/options_storage.go b/pkg/registry/apis/dashboardsnapshot/options_storage.go
new file mode 100644
index 0000000000000..571010b9f5c02
--- /dev/null
+++ b/pkg/registry/apis/dashboardsnapshot/options_storage.go
@@ -0,0 +1,91 @@
+package dashboardsnapshot
+
+import (
+	"context"
+	"fmt"
+
+	"k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	dashboardsnapshot "github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+var (
+	_ rest.Scoper               = (*optionsStorage)(nil)
+	_ rest.SingularNameProvider = (*optionsStorage)(nil)
+	_ rest.Getter               = (*optionsStorage)(nil)
+	_ rest.Lister               = (*optionsStorage)(nil)
+	_ rest.Storage              = (*optionsStorage)(nil)
+)
+
+type sharingOptionsGetter = func(namespace string) (*dashboardsnapshot.SharingOptions, error)
+
+func newSharingOptionsGetter(cfg *setting.Cfg) sharingOptionsGetter {
+	s := &dashboardsnapshot.SharingOptions{
+		ObjectMeta: metav1.ObjectMeta{
+			CreationTimestamp: metav1.Now(),
+		},
+		Spec: dashboardsnapshot.SnapshotSharingOptions{
+			SnapshotsEnabled:     cfg.SnapshotEnabled,
+			ExternalSnapshotURL:  cfg.ExternalSnapshotUrl,
+			ExternalSnapshotName: cfg.ExternalSnapshotName,
+			ExternalEnabled:      cfg.ExternalEnabled,
+		},
+	}
+	return func(namespace string) (*dashboardsnapshot.SharingOptions, error) {
+		return s, nil
+	}
+}
+
+type optionsStorage struct {
+	getter         sharingOptionsGetter
+	tableConverter rest.TableConvertor
+}
+
+func (s *optionsStorage) New() runtime.Object {
+	return &dashboardsnapshot.SharingOptions{}
+}
+
+func (s *optionsStorage) Destroy() {}
+
+func (s *optionsStorage) NamespaceScoped() bool {
+	return true
+}
+
+func (s *optionsStorage) GetSingularName() string {
+	return "options"
+}
+
+func (s *optionsStorage) NewList() runtime.Object {
+	return &dashboardsnapshot.SharingOptionsList{}
+}
+
+func (s *optionsStorage) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) {
+	return s.tableConverter.ConvertToTable(ctx, object, tableOptions)
+}
+
+func (s *optionsStorage) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) {
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, err
+	}
+	if info.OrgID < 0 {
+		return nil, fmt.Errorf("missing namespace")
+	}
+	v, err := s.getter(info.Value)
+	if err != nil {
+		return nil, err
+	}
+	list := &dashboardsnapshot.SharingOptionsList{
+		Items: []dashboardsnapshot.SharingOptions{*v},
+	}
+	return list, nil
+}
+
+func (s *optionsStorage) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) {
+	return s.getter(name)
+}
diff --git a/pkg/registry/apis/dashboardsnapshot/register.go b/pkg/registry/apis/dashboardsnapshot/register.go
new file mode 100644
index 0000000000000..4f74c4f5fba8b
--- /dev/null
+++ b/pkg/registry/apis/dashboardsnapshot/register.go
@@ -0,0 +1,384 @@
+package dashboardsnapshot
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"time"
+
+	"github.com/gorilla/mux"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
+	"k8s.io/apiserver/pkg/authorization/authorizer"
+	"k8s.io/apiserver/pkg/registry/generic"
+	"k8s.io/apiserver/pkg/registry/rest"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+	common "k8s.io/kube-openapi/pkg/common"
+	"k8s.io/kube-openapi/pkg/spec3"
+	"k8s.io/kube-openapi/pkg/validation/spec"
+
+	dashboardsnapshot "github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1"
+	"github.com/grafana/grafana/pkg/apiserver/builder"
+	"github.com/grafana/grafana/pkg/infra/appcontext"
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+	"github.com/grafana/grafana/pkg/services/apiserver/utils"
+	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/dashboardsnapshots"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util"
+	"github.com/grafana/grafana/pkg/util/errutil/errhttp"
+	"github.com/grafana/grafana/pkg/web"
+)
+
+var _ builder.APIGroupBuilder = (*SnapshotsAPIBuilder)(nil)
+var _ builder.OpenAPIPostProcessor = (*SnapshotsAPIBuilder)(nil)
+
+var resourceInfo = dashboardsnapshot.DashboardSnapshotResourceInfo
+
+// This is used just so wire has something unique to return
+type SnapshotsAPIBuilder struct {
+	service    dashboardsnapshots.Service
+	namespacer request.NamespaceMapper
+	options    sharingOptionsGetter
+	exporter   *dashExporter
+	logger     log.Logger
+}
+
+func NewSnapshotsAPIBuilder(
+	p dashboardsnapshots.Service,
+	cfg *setting.Cfg,
+	exporter *dashExporter,
+) *SnapshotsAPIBuilder {
+	return &SnapshotsAPIBuilder{
+		service:    p,
+		options:    newSharingOptionsGetter(cfg),
+		namespacer: request.GetNamespaceMapper(cfg),
+		exporter:   exporter,
+		logger:     log.New("snapshots::RawHandlers"),
+	}
+}
+
+func RegisterAPIService(
+	service dashboardsnapshots.Service,
+	apiregistration builder.APIRegistrar,
+	cfg *setting.Cfg,
+	features featuremgmt.FeatureToggles,
+	sql db.DB,
+) *SnapshotsAPIBuilder {
+	if !features.IsEnabledGlobally(featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs) {
+		return nil // skip registration unless opting into experimental apis
+	}
+	builder := NewSnapshotsAPIBuilder(service, cfg, &dashExporter{
+		service: service,
+		sql:     sql,
+	})
+	apiregistration.RegisterAPI(builder)
+	return builder
+}
+
+func (b *SnapshotsAPIBuilder) GetGroupVersion() schema.GroupVersion {
+	return resourceInfo.GroupVersion()
+}
+
+func addKnownTypes(scheme *runtime.Scheme, gv schema.GroupVersion) {
+	scheme.AddKnownTypes(gv,
+		&dashboardsnapshot.DashboardSnapshot{},
+		&dashboardsnapshot.DashboardSnapshotList{},
+		&dashboardsnapshot.SharingOptions{},
+		&dashboardsnapshot.SharingOptionsList{},
+		&dashboardsnapshot.FullDashboardSnapshot{},
+		&dashboardsnapshot.DashboardSnapshotWithDeleteKey{},
+		&metav1.Status{},
+	)
+}
+
+func (b *SnapshotsAPIBuilder) InstallSchema(scheme *runtime.Scheme) error {
+	gv := resourceInfo.GroupVersion()
+	addKnownTypes(scheme, gv)
+
+	// Link this version to the internal representation.
+	// This is used for server-side-apply (PATCH), and avoids the error:
+	//   "no kind is registered for the type"
+	addKnownTypes(scheme, schema.GroupVersion{
+		Group:   gv.Group,
+		Version: runtime.APIVersionInternal,
+	})
+
+	// If multiple versions exist, then register conversions from zz_generated.conversion.go
+	// if err := playlist.RegisterConversions(scheme); err != nil {
+	//   return err
+	// }
+	metav1.AddToGroupVersion(scheme, gv)
+	return scheme.SetVersionPriority(gv)
+}
+
+func (b *SnapshotsAPIBuilder) GetAPIGroupInfo(
+	scheme *runtime.Scheme,
+	codecs serializer.CodecFactory, // pointer?
+	optsGetter generic.RESTOptionsGetter,
+	dualWrite bool,
+) (*genericapiserver.APIGroupInfo, error) {
+	apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(dashboardsnapshot.GROUP, scheme, metav1.ParameterCodec, codecs)
+	storage := map[string]rest.Storage{}
+
+	legacyStore := &legacyStorage{
+		service:    b.service,
+		namespacer: b.namespacer,
+		options:    b.options,
+	}
+	legacyStore.tableConverter = utils.NewTableConverter(
+		resourceInfo.GroupResource(),
+		[]metav1.TableColumnDefinition{
+			{Name: "Name", Type: "string", Format: "name"},
+			{Name: "Title", Type: "string", Format: "string", Description: "The snapshot name"},
+			{Name: "Created At", Type: "date"},
+		},
+		func(obj any) ([]interface{}, error) {
+			m, ok := obj.(*dashboardsnapshot.DashboardSnapshot)
+			if ok {
+				return []interface{}{
+					m.Name,
+					m.Spec.Title,
+					m.CreationTimestamp.UTC().Format(time.RFC3339),
+				}, nil
+			}
+			return nil, fmt.Errorf("expected snapshot")
+		},
+	)
+	storage[resourceInfo.StoragePath()] = legacyStore
+	storage[resourceInfo.StoragePath("body")] = &subBodyREST{
+		service:    b.service,
+		namespacer: b.namespacer,
+	}
+
+	storage["options"] = &optionsStorage{
+		getter:         b.options,
+		tableConverter: legacyStore.tableConverter,
+	}
+
+	apiGroupInfo.VersionedResourcesStorageMap[dashboardsnapshot.VERSION] = storage
+	return &apiGroupInfo, nil
+}
+
+func (b *SnapshotsAPIBuilder) GetOpenAPIDefinitions() common.GetOpenAPIDefinitions {
+	return dashboardsnapshot.GetOpenAPIDefinitions
+}
+
+// Register additional routes with the server
+func (b *SnapshotsAPIBuilder) GetAPIRoutes() *builder.APIRoutes {
+	prefix := dashboardsnapshot.DashboardSnapshotResourceInfo.GroupResource().Resource
+	defs := dashboardsnapshot.GetOpenAPIDefinitions(func(path string) spec.Ref { return spec.Ref{} })
+	createCmd := defs["github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1.DashboardCreateCommand"].Schema
+	createExample := `{"dashboard":{"annotations":{"list":[{"name":"Annotations & Alerts","enable":true,"iconColor":"rgba(0, 211, 255, 1)","snapshotData":[],"type":"dashboard","builtIn":1,"hide":true}]},"editable":true,"fiscalYearStartMonth":0,"graphTooltip":0,"id":203,"links":[],"liveNow":false,"panels":[{"datasource":null,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisBorderShow":false,"axisCenteredZero":false,"axisColorMode":"text","axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":43,"gradientMode":"opacity","hideFrom":{"legend":false,"tooltip":false,"viz":false},"insertNulls":false,"lineInterpolation":"smooth","lineWidth":1,"pointSize":5,"scaleDistribution":{"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{"group":"A","mode":"none"},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[{"color":"green","value":null},{"color":"red","value":80}]},"unitScale":true},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"id":1,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom","showLegend":true},"tooltip":{"mode":"single","sort":"none"}},"pluginVersion":"10.4.0-pre","snapshotData":[{"fields":[{"config":{"color":{"mode":"palette-classic"},"custom":{"axisBorderShow":false,"axisCenteredZero":false,"axisColorMode":"text","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":43,"gradientMode":"opacity","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"smooth","lineWidth":1,"pointSize":5,"showPoints":"auto","thresholdsStyle":{"mode":"off"}},"thresholds":{"mode":"absolute","steps":[{"color":"green","value":null},{"color":"red","value":80}]},"unitScale":true},"name":"time","type":"time","values":[1706030536378,1706034856378,1706039176378,1706043496378,1706047816378,1706052136378]},{"config":{"color":{"mode":"palette-classic"},"custom":{"axisBorderShow":false,"axisCenteredZero":false,"axisColorMode":"text","axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":43,"gradientMode":"opacity","hideFrom":{"legend":false,"tooltip":false,"viz":false},"insertNulls":false,"lineInterpolation":"smooth","lineWidth":1,"pointSize":5,"scaleDistribution":{"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{"group":"A","mode":"none"},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[{"color":"green","value":null},{"color":"red","value":80}]},"unitScale":true},"name":"A-series","type":"number","values":[1,20,90,30,50,0]}],"refId":"A"}],"targets":[],"title":"Simple example","type":"timeseries","links":[]}],"refresh":"","schemaVersion":39,"snapshot":{"timestamp":"2024-01-23T23:22:16.377Z"},"tags":[],"templating":{"list":[]},"time":{"from":"2024-01-23T17:22:20.380Z","to":"2024-01-23T23:22:20.380Z","raw":{"from":"now-6h","to":"now"}},"timepicker":{},"timezone":"","title":"simple and small","uid":"b22ec8db-399b-403b-b6c7-b0fb30ccb2a5","version":1,"weekStart":""},"name":"simple and small","expires":86400}`
+	createRsp := defs["github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1.DashboardCreateResponse"].Schema
+
+	tags := []string{dashboardsnapshot.DashboardSnapshotResourceInfo.GroupVersionKind().Kind}
+	routes := &builder.APIRoutes{
+		Namespace: []builder.APIRouteHandler{
+			{
+				Path: prefix + "/create",
+				Spec: &spec3.PathProps{
+					Post: &spec3.Operation{
+						VendorExtensible: spec.VendorExtensible{
+							Extensions: map[string]any{
+								"x-grafana-action": "create",
+								"x-kubernetes-group-version-kind": metav1.GroupVersionKind{
+									Group:   dashboardsnapshot.GROUP,
+									Version: dashboardsnapshot.VERSION,
+									Kind:    "DashboardCreateResponse",
+								},
+							},
+						},
+						OperationProps: spec3.OperationProps{
+							Tags:        tags,
+							Summary:     "Full dashboard",
+							Description: "longer description here?",
+							Parameters: []*spec3.Parameter{
+								{
+									ParameterProps: spec3.ParameterProps{
+										Name:        "namespace",
+										In:          "path",
+										Required:    true,
+										Example:     "default",
+										Description: "workspace",
+										Schema:      spec.StringProperty(),
+									},
+								},
+							},
+							RequestBody: &spec3.RequestBody{
+								RequestBodyProps: spec3.RequestBodyProps{
+									Content: map[string]*spec3.MediaType{
+										"application/json": {
+											MediaTypeProps: spec3.MediaTypeProps{
+												Schema:  &createCmd,
+												Example: createExample, // raw JSON body
+											},
+										},
+									},
+								},
+							},
+							Responses: &spec3.Responses{
+								ResponsesProps: spec3.ResponsesProps{
+									StatusCodeResponses: map[int]*spec3.Response{
+										200: {
+											ResponseProps: spec3.ResponseProps{
+												Content: map[string]*spec3.MediaType{
+													"application/json": {
+														MediaTypeProps: spec3.MediaTypeProps{
+															Schema: &createRsp,
+														},
+													},
+												},
+											},
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+				Handler: func(w http.ResponseWriter, r *http.Request) {
+					user, err := appcontext.User(r.Context())
+					if err != nil {
+						errhttp.Write(r.Context(), err, w)
+						return
+					}
+					wrap := &contextmodel.ReqContext{
+						Logger: b.logger,
+						Context: &web.Context{
+							Req:  r,
+							Resp: web.NewResponseWriter(r.Method, w),
+						},
+						SignedInUser: user,
+					}
+
+					vars := mux.Vars(r)
+					info, err := request.ParseNamespace(vars["namespace"])
+					if err != nil {
+						wrap.JsonApiErr(http.StatusBadRequest, "expected namespace", nil)
+						return
+					}
+					if info.OrgID != user.OrgID {
+						wrap.JsonApiErr(http.StatusBadRequest,
+							fmt.Sprintf("user orgId does not match namespace (%d != %d)", info.OrgID, user.OrgID), nil)
+						return
+					}
+
+					cmd := dashboardsnapshots.CreateDashboardSnapshotCommand{}
+					if err := web.Bind(wrap.Req, &cmd); err != nil {
+						wrap.JsonApiErr(http.StatusBadRequest, "bad request data", err)
+						return
+					}
+
+					opts, err := b.options(info.Value)
+					if err != nil {
+						wrap.JsonApiErr(http.StatusBadRequest, "error getting options", err)
+						return
+					}
+
+					// Use the existing snapshot service
+					dashboardsnapshots.CreateDashboardSnapshot(wrap, opts.Spec, cmd, b.service)
+				},
+			},
+			{
+				Path: prefix + "/delete/{deleteKey}",
+				Spec: &spec3.PathProps{
+					Summary:     "an example at the root level",
+					Description: "longer description here?",
+					Delete: &spec3.Operation{
+						OperationProps: spec3.OperationProps{
+							Tags: tags,
+							Parameters: []*spec3.Parameter{
+								{
+									ParameterProps: spec3.ParameterProps{
+										Name:        "deleteKey",
+										In:          "path",
+										Required:    true,
+										Description: "unique key returned in create",
+										Schema:      spec.StringProperty(),
+									},
+								},
+							},
+						},
+					},
+				},
+				Handler: func(w http.ResponseWriter, r *http.Request) {
+					ctx := r.Context()
+					vars := mux.Vars(r)
+					key := vars["deleteKey"]
+
+					err := dashboardsnapshots.DeleteWithKey(ctx, key, b.service)
+					if err != nil {
+						errhttp.Write(ctx, fmt.Errorf("failed to delete external dashboard (%w)", err), w)
+						return
+					}
+					_ = json.NewEncoder(w).Encode(&util.DynMap{
+						"message": "Snapshot deleted. It might take an hour before it's cleared from any CDN caches.",
+					})
+				},
+			},
+		},
+	}
+
+	// dev environment to export all snapshots to a blob store
+	if b.exporter != nil && false {
+		routes.Root = append(routes.Root, b.exporter.getAPIRouteHandler())
+	}
+	return routes
+}
+
+func (b *SnapshotsAPIBuilder) GetAuthorizer() authorizer.Authorizer {
+	// TODO: this behavior must match the existing logic (it is currently more restrictive)
+	//
+	// https://github.com/grafana/grafana/blob/f63e43c113ac0cf8f78ed96ee2953874139bd2dc/pkg/middleware/auth.go#L203
+	// func SnapshotPublicModeOrSignedIn(cfg *setting.Cfg) web.Handler {
+	// 	return func(c *contextmodel.ReqContext) {
+	// 		if cfg.SnapshotPublicMode {
+	// 			return
+	// 		}
+
+	// 		if !c.IsSignedIn {
+	// 			notAuthorized(c)
+	// 			return
+	// 		}
+	// 	}
+	// }
+
+	return authorizer.AuthorizerFunc(
+		func(ctx context.Context, attr authorizer.Attributes) (authorized authorizer.Decision, reason string, err error) {
+			// Everyone can view dashsnaps
+			if attr.GetVerb() == "get" && attr.GetResource() == dashboardsnapshot.DashboardSnapshotResourceInfo.GroupResource().Resource {
+				return authorizer.DecisionAllow, "", err
+			}
+
+			// Fallback to the default behaviors (namespace matches org)
+			return authorizer.DecisionNoOpinion, "", err
+		})
+}
+
+func (b *SnapshotsAPIBuilder) PostProcessOpenAPI(oas *spec3.OpenAPI) (*spec3.OpenAPI, error) {
+	oas.Info.Description = "A dashboard snapshot shares an interactive dashboard publicly."
+
+	// Set a description on the
+	sub := oas.Paths.Paths["/apis/dashboardsnapshot.grafana.app/v0alpha1/namespaces/{namespace}/dashboardsnapshots/{name}/body"]
+	if sub != nil && sub.Get != nil {
+		sub.Get.Summary = "Full dashboard"
+		sub.Get.Description = "Read the full dashboard body"
+	}
+
+	// Hide the invalid endpoint to list all snapshots for all orgs
+	delete(oas.Paths.Paths, "/apis/dashboardsnapshot.grafana.app/v0alpha1/dashboardsnapshots")
+
+	// The root API discovery list
+	sub = oas.Paths.Paths["/apis/dashboardsnapshot.grafana.app/v0alpha1/"]
+	if sub != nil && sub.Get != nil {
+		sub.Get.Tags = []string{"API Discovery"} // sorts first in the list
+	}
+	return oas, nil
+}
diff --git a/pkg/registry/apis/dashboardsnapshot/sql_storage.go b/pkg/registry/apis/dashboardsnapshot/sql_storage.go
new file mode 100644
index 0000000000000..b21231a861362
--- /dev/null
+++ b/pkg/registry/apis/dashboardsnapshot/sql_storage.go
@@ -0,0 +1,147 @@
+package dashboardsnapshot
+
+import (
+	"context"
+	"fmt"
+
+	"k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	dashboardsnapshot "github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1"
+	"github.com/grafana/grafana/pkg/infra/appcontext"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+	"github.com/grafana/grafana/pkg/services/dashboardsnapshots"
+)
+
+var (
+	_ rest.Scoper               = (*legacyStorage)(nil)
+	_ rest.SingularNameProvider = (*legacyStorage)(nil)
+	_ rest.Getter               = (*legacyStorage)(nil)
+	_ rest.Lister               = (*legacyStorage)(nil)
+	_ rest.Storage              = (*legacyStorage)(nil)
+	_ rest.GracefulDeleter      = (*legacyStorage)(nil)
+)
+
+type legacyStorage struct {
+	service        dashboardsnapshots.Service
+	namespacer     request.NamespaceMapper
+	tableConverter rest.TableConvertor
+	options        sharingOptionsGetter
+}
+
+func (s *legacyStorage) New() runtime.Object {
+	return resourceInfo.NewFunc()
+}
+
+func (s *legacyStorage) Destroy() {}
+
+func (s *legacyStorage) NamespaceScoped() bool {
+	return true // namespace == org
+}
+
+func (s *legacyStorage) GetSingularName() string {
+	return resourceInfo.GetSingularName()
+}
+
+func (s *legacyStorage) NewList() runtime.Object {
+	return resourceInfo.NewListFunc()
+}
+
+func (s *legacyStorage) checkEnabled(ns string) error {
+	opts, err := s.options(ns)
+	if err != nil {
+		return err
+	}
+	if !opts.Spec.SnapshotsEnabled {
+		return fmt.Errorf("snapshots not enabled")
+	}
+	return nil
+}
+
+func (s *legacyStorage) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) {
+	return s.tableConverter.ConvertToTable(ctx, object, tableOptions)
+}
+
+func (s *legacyStorage) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) {
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err == nil {
+		err = s.checkEnabled(info.Value)
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	user, err := appcontext.User(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	limit := 5000
+	if options.Limit > 0 {
+		limit = int(options.Limit)
+	}
+	res, err := s.service.SearchDashboardSnapshots(ctx, &dashboardsnapshots.GetDashboardSnapshotsQuery{
+		OrgID:        info.OrgID,
+		SignedInUser: user,
+		Limit:        limit,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	list := &dashboardsnapshot.DashboardSnapshotList{}
+	for _, v := range res {
+		list.Items = append(list.Items, *convertDTOToSnapshot(v, s.namespacer))
+	}
+	return list, nil
+}
+
+func (s *legacyStorage) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) {
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err == nil {
+		err = s.checkEnabled(info.Value)
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	v, err := s.service.GetDashboardSnapshot(ctx, &dashboardsnapshots.GetDashboardSnapshotQuery{
+		Key: name,
+	})
+	if err != nil || v == nil {
+		// if errors.Is(err, playlistsvc.ErrPlaylistNotFound) || err == nil {
+		// 	err = k8serrors.NewNotFound(s.SingularQualifiedResource, name)
+		// }
+		return nil, err
+	}
+
+	return convertSnapshotToK8sResource(v, s.namespacer), nil
+}
+
+// GracefulDeleter
+func (s *legacyStorage) Delete(ctx context.Context, name string, deleteValidation rest.ValidateObjectFunc, options *metav1.DeleteOptions) (runtime.Object, bool, error) {
+	snap, err := s.service.GetDashboardSnapshot(ctx, &dashboardsnapshots.GetDashboardSnapshotQuery{
+		Key: name,
+	})
+	if err != nil || snap == nil {
+		return nil, false, err
+	}
+
+	// Delete the external one first
+	if snap.ExternalDeleteURL != "" {
+		err := dashboardsnapshots.DeleteExternalDashboardSnapshot(snap.ExternalDeleteURL)
+		if err != nil {
+			return nil, false, err
+		}
+	}
+
+	err = s.service.DeleteDashboardSnapshot(ctx, &dashboardsnapshots.DeleteDashboardSnapshotCommand{
+		DeleteKey: snap.DeleteKey,
+	})
+	if err != nil {
+		return nil, false, err
+	}
+	return nil, true, nil
+}
diff --git a/pkg/registry/apis/dashboardsnapshot/sub_body.go b/pkg/registry/apis/dashboardsnapshot/sub_body.go
new file mode 100644
index 0000000000000..9d0a7349e4388
--- /dev/null
+++ b/pkg/registry/apis/dashboardsnapshot/sub_body.go
@@ -0,0 +1,60 @@
+package dashboardsnapshot
+
+import (
+	"context"
+	"net/http"
+
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+	dashboardsnapshot "github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+	"github.com/grafana/grafana/pkg/services/dashboardsnapshots"
+)
+
+type subBodyREST struct {
+	service    dashboardsnapshots.Service
+	namespacer request.NamespaceMapper
+}
+
+var _ = rest.Connecter(&subBodyREST{})
+
+func (r *subBodyREST) New() runtime.Object {
+	return &dashboardsnapshot.FullDashboardSnapshot{}
+}
+
+func (r *subBodyREST) Destroy() {}
+
+func (r *subBodyREST) ConnectMethods() []string {
+	return []string{"GET"}
+}
+
+func (r *subBodyREST) NewConnectOptions() (runtime.Object, bool, string) {
+	return nil, false, ""
+}
+
+func (r *subBodyREST) Connect(ctx context.Context, name string, opts runtime.Object, responder rest.Responder) (http.Handler, error) {
+	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		snap, err := r.service.GetDashboardSnapshot(ctx, &dashboardsnapshots.GetDashboardSnapshotQuery{
+			Key: name,
+		})
+		if err != nil {
+			responder.Error(err)
+			return
+		}
+
+		data, err := snap.Dashboard.Map()
+		if err != nil {
+			responder.Error(err)
+			return
+		}
+
+		r := convertSnapshotToK8sResource(snap, r.namespacer)
+		responder.Object(200, &dashboardsnapshot.FullDashboardSnapshot{
+			ObjectMeta: r.ObjectMeta,
+			Info:       r.Spec,
+			Dashboard:  common.Unstructured{Object: data},
+		})
+	}), nil
+}
diff --git a/pkg/registry/apis/datasource/README.md b/pkg/registry/apis/datasource/README.md
new file mode 100644
index 0000000000000..2e08c86215a01
--- /dev/null
+++ b/pkg/registry/apis/datasource/README.md
@@ -0,0 +1,8 @@
+Experimental!
+
+This is exploring how to expose any datasource as a k8s aggregated API server.
+
+Unlike the other services, this will register datasources as:
+
+> {plugin}.datasource.grafana.app
+
diff --git a/pkg/registry/apis/datasource/authorizer.go b/pkg/registry/apis/datasource/authorizer.go
new file mode 100644
index 0000000000000..354325a65b1f4
--- /dev/null
+++ b/pkg/registry/apis/datasource/authorizer.go
@@ -0,0 +1,82 @@
+package datasource
+
+import (
+	"context"
+	"fmt"
+
+	"k8s.io/apiserver/pkg/authorization/authorizer"
+
+	"github.com/grafana/grafana/pkg/infra/appcontext"
+	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/datasources"
+)
+
+func (b *DataSourceAPIBuilder) GetAuthorizer() authorizer.Authorizer {
+	return authorizer.AuthorizerFunc(
+		func(ctx context.Context, attr authorizer.Attributes) (authorized authorizer.Decision, reason string, err error) {
+			if !attr.IsResourceRequest() {
+				return authorizer.DecisionNoOpinion, "", nil
+			}
+			user, err := appcontext.User(ctx)
+			if err != nil {
+				return authorizer.DecisionDeny, "valid user is required", err
+			}
+
+			uidScope := datasources.ScopeProvider.GetResourceScopeUID(attr.GetName())
+
+			// Must have query access to see a connection
+			if attr.GetResource() == b.connectionResourceInfo.GroupResource().Resource {
+				scopes := []string{}
+				if attr.GetName() != "" {
+					scopes = []string{uidScope}
+				}
+				ok, err := b.accessControl.Evaluate(ctx, user, ac.EvalPermission(datasources.ActionQuery, scopes...))
+				if !ok || err != nil {
+					return authorizer.DecisionDeny, "unable to query", err
+				}
+
+				if attr.GetSubresource() == "proxy" {
+					return authorizer.DecisionDeny, "TODO: map the plugin settings to access rules", err
+				}
+
+				return authorizer.DecisionAllow, "", nil
+			}
+
+			// Must have query access to see a connection
+			action := "" // invalid
+
+			switch attr.GetVerb() {
+			case "list":
+				ok, err := b.accessControl.Evaluate(ctx, user,
+					ac.EvalPermission(datasources.ActionRead)) // Can see any datasource values
+				if !ok || err != nil {
+					return authorizer.DecisionDeny, "unable to read", err
+				}
+				return authorizer.DecisionAllow, "", nil
+
+			case "get":
+				action = datasources.ActionRead
+			case "create":
+				action = datasources.ActionWrite
+			case "post":
+				fallthrough
+			case "update":
+				fallthrough
+			case "patch":
+				fallthrough
+			case "put":
+				action = datasources.ActionWrite
+			case "delete":
+				action = datasources.ActionDelete
+			default:
+				//b.log.Info("unknown verb", "verb", attr.GetVerb())
+				return authorizer.DecisionDeny, "unsupported verb", nil // Unknown verb
+			}
+			ok, err := b.accessControl.Evaluate(ctx, user,
+				ac.EvalPermission(action, uidScope))
+			if !ok || err != nil {
+				return authorizer.DecisionDeny, fmt.Sprintf("unable to %s", action), nil
+			}
+			return authorizer.DecisionAllow, "", nil
+		})
+}
diff --git a/pkg/registry/apis/datasource/connections.go b/pkg/registry/apis/datasource/connections.go
new file mode 100644
index 0000000000000..cd88059632861
--- /dev/null
+++ b/pkg/registry/apis/datasource/connections.go
@@ -0,0 +1,60 @@
+package datasource
+
+import (
+	"context"
+
+	"k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+)
+
+var (
+	_ rest.Scoper               = (*connectionAccess)(nil)
+	_ rest.SingularNameProvider = (*connectionAccess)(nil)
+	_ rest.Getter               = (*connectionAccess)(nil)
+	_ rest.Lister               = (*connectionAccess)(nil)
+	_ rest.Storage              = (*connectionAccess)(nil)
+)
+
+type connectionAccess struct {
+	resourceInfo   common.ResourceInfo
+	tableConverter rest.TableConvertor
+	datasources    PluginDatasourceProvider
+}
+
+func (s *connectionAccess) New() runtime.Object {
+	return s.resourceInfo.NewFunc()
+}
+
+func (s *connectionAccess) Destroy() {}
+
+func (s *connectionAccess) NamespaceScoped() bool {
+	return true
+}
+
+func (s *connectionAccess) GetSingularName() string {
+	return s.resourceInfo.GetSingularName()
+}
+
+func (s *connectionAccess) ShortNames() []string {
+	return s.resourceInfo.GetShortNames()
+}
+
+func (s *connectionAccess) NewList() runtime.Object {
+	return s.resourceInfo.NewListFunc()
+}
+
+func (s *connectionAccess) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) {
+	return s.tableConverter.ConvertToTable(ctx, object, tableOptions)
+}
+
+func (s *connectionAccess) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) {
+	return s.datasources.Get(ctx, name)
+}
+
+func (s *connectionAccess) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) {
+	return s.datasources.List(ctx)
+}
diff --git a/pkg/registry/apis/datasource/middleware.go b/pkg/registry/apis/datasource/middleware.go
new file mode 100644
index 0000000000000..95d8082320ae3
--- /dev/null
+++ b/pkg/registry/apis/datasource/middleware.go
@@ -0,0 +1,23 @@
+package datasource
+
+import (
+	"context"
+
+	"github.com/grafana/grafana-aws-sdk/pkg/awsds"
+	"github.com/grafana/grafana-aws-sdk/pkg/sigv4"
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+)
+
+func contextualMiddlewares(ctx context.Context) context.Context {
+	cfg := backend.GrafanaConfigFromContext(ctx)
+	responseLimitMiddleware := httpclient.ResponseLimitMiddleware(cfg.ResponseLimit())
+	ctx = httpclient.WithContextualMiddleware(ctx, responseLimitMiddleware)
+
+	sigv4Settings := awsds.ReadSigV4Settings(ctx)
+	if sigv4Settings.Enabled {
+		ctx = httpclient.WithContextualMiddleware(ctx, sigv4.SigV4Middleware(sigv4Settings.VerboseLogging))
+	}
+
+	return ctx
+}
diff --git a/pkg/registry/apis/datasource/plugincontext.go b/pkg/registry/apis/datasource/plugincontext.go
new file mode 100644
index 0000000000000..2c0a58aca12c2
--- /dev/null
+++ b/pkg/registry/apis/datasource/plugincontext.go
@@ -0,0 +1,144 @@
+package datasource
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/grafana/grafana/pkg/apis/datasource/v0alpha1"
+	"github.com/grafana/grafana/pkg/infra/appcontext"
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+	"github.com/grafana/grafana/pkg/services/apiserver/utils"
+	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
+)
+
+// This provides access to settings saved in the database.
+// Authorization checks will happen within each function, and the user in ctx will
+// limit which namespace/tenant/org we are talking to
+type PluginDatasourceProvider interface {
+	// Get gets a specific datasource (that the user in context can see)
+	Get(ctx context.Context, uid string) (*v0alpha1.DataSourceConnection, error)
+
+	// List lists all data sources the user in context can see
+	List(ctx context.Context) (*v0alpha1.DataSourceConnectionList, error)
+
+	// Return settings (decrypted!) for a specific plugin
+	// This will require "query" permission for the user in context
+	GetInstanceSettings(ctx context.Context, uid string) (*backend.DataSourceInstanceSettings, error)
+}
+
+type ScopedPluginDatasourceProvider interface {
+	GetDatasourceProvider(pluginJson plugins.JSONData) PluginDatasourceProvider
+}
+
+// PluginContext requires adding system settings (feature flags, etc) to the datasource config
+type PluginContextWrapper interface {
+	PluginContextForDataSource(ctx context.Context, datasourceSettings *backend.DataSourceInstanceSettings) (backend.PluginContext, error)
+}
+
+func ProvideDefaultPluginConfigs(
+	dsService datasources.DataSourceService,
+	dsCache datasources.CacheService,
+	contextProvider *plugincontext.Provider) ScopedPluginDatasourceProvider {
+	return &cachingDatasourceProvider{
+		dsService:       dsService,
+		dsCache:         dsCache,
+		contextProvider: contextProvider,
+	}
+}
+
+type cachingDatasourceProvider struct {
+	dsService       datasources.DataSourceService
+	dsCache         datasources.CacheService
+	contextProvider *plugincontext.Provider
+}
+
+func (q *cachingDatasourceProvider) GetDatasourceProvider(pluginJson plugins.JSONData) PluginDatasourceProvider {
+	return &scopedDatasourceProvider{
+		plugin:          pluginJson,
+		dsService:       q.dsService,
+		dsCache:         q.dsCache,
+		contextProvider: q.contextProvider,
+	}
+}
+
+type scopedDatasourceProvider struct {
+	plugin          plugins.JSONData
+	dsService       datasources.DataSourceService
+	dsCache         datasources.CacheService
+	contextProvider *plugincontext.Provider
+}
+
+var (
+	_ PluginDatasourceProvider       = (*scopedDatasourceProvider)(nil)
+	_ ScopedPluginDatasourceProvider = (*cachingDatasourceProvider)(nil)
+)
+
+func (q *scopedDatasourceProvider) Get(ctx context.Context, uid string) (*v0alpha1.DataSourceConnection, error) {
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, err
+	}
+	user, err := appcontext.User(ctx)
+	if err != nil {
+		return nil, err
+	}
+	ds, err := q.dsCache.GetDatasourceByUID(ctx, uid, user, false)
+	if err != nil {
+		return nil, err
+	}
+	return asConnection(ds, info.Value)
+}
+
+func (q *scopedDatasourceProvider) List(ctx context.Context) (*v0alpha1.DataSourceConnectionList, error) {
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, err
+	}
+
+	dss, err := q.dsService.GetDataSourcesByType(ctx, &datasources.GetDataSourcesByTypeQuery{
+		OrgID:    info.OrgID,
+		Type:     q.plugin.ID,
+		AliasIDs: q.plugin.AliasIDs,
+	})
+	if err != nil {
+		return nil, err
+	}
+	result := &v0alpha1.DataSourceConnectionList{
+		Items: []v0alpha1.DataSourceConnection{},
+	}
+	for _, ds := range dss {
+		v, _ := asConnection(ds, info.Value)
+		result.Items = append(result.Items, *v)
+	}
+	return result, nil
+}
+
+func (q *scopedDatasourceProvider) GetInstanceSettings(ctx context.Context, uid string) (*backend.DataSourceInstanceSettings, error) {
+	if q.contextProvider == nil {
+		return nil, fmt.Errorf("missing contextProvider")
+	}
+	return q.contextProvider.GetDataSourceInstanceSettings(ctx, uid)
+}
+
+func asConnection(ds *datasources.DataSource, ns string) (*v0alpha1.DataSourceConnection, error) {
+	v := &v0alpha1.DataSourceConnection{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:              ds.UID,
+			Namespace:         ns,
+			CreationTimestamp: metav1.NewTime(ds.Created),
+			ResourceVersion:   fmt.Sprintf("%d", ds.Updated.UnixMilli()),
+		},
+		Title: ds.Name,
+	}
+	v.UID = utils.CalculateClusterWideUID(v) // indicates if the value changed on the server
+	meta, err := utils.MetaAccessor(v)
+	if err != nil {
+		meta.SetUpdatedTimestamp(&ds.Updated)
+	}
+	return v, err
+}
diff --git a/pkg/registry/apis/datasource/querier.go b/pkg/registry/apis/datasource/querier.go
new file mode 100644
index 0000000000000..5811dbb8378eb
--- /dev/null
+++ b/pkg/registry/apis/datasource/querier.go
@@ -0,0 +1,148 @@
+package datasource
+
+import (
+	"context"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+	"github.com/grafana/grafana/pkg/apis/datasource/v0alpha1"
+	"github.com/grafana/grafana/pkg/infra/appcontext"
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+	"github.com/grafana/grafana/pkg/services/datasources"
+)
+
+type QuerierFactoryFunc func(ctx context.Context, ri common.ResourceInfo, pj plugins.JSONData) (Querier, error)
+
+type QuerierProvider interface {
+	Querier(ctx context.Context, ri common.ResourceInfo, pj plugins.JSONData) (Querier, error)
+}
+
+type DefaultQuerierProvider struct {
+	factory QuerierFactoryFunc
+}
+
+func ProvideDefaultQuerierProvider(pluginClient plugins.Client, dsService datasources.DataSourceService,
+	dsCache datasources.CacheService) *DefaultQuerierProvider {
+	return NewQuerierProvider(func(ctx context.Context, ri common.ResourceInfo, pj plugins.JSONData) (Querier, error) {
+		return NewDefaultQuerier(ri, pj, pluginClient, dsService, dsCache), nil
+	})
+}
+
+func NewQuerierProvider(factory QuerierFactoryFunc) *DefaultQuerierProvider {
+	return &DefaultQuerierProvider{
+		factory: factory,
+	}
+}
+
+func (p *DefaultQuerierProvider) Querier(ctx context.Context, ri common.ResourceInfo, pj plugins.JSONData) (Querier, error) {
+	return p.factory(ctx, ri, pj)
+}
+
+// Querier is the interface that wraps the Query method.
+type Querier interface {
+	// Query runs the query on behalf of the user in context.
+	Query(ctx context.Context, query *backend.QueryDataRequest) (*backend.QueryDataResponse, error)
+	// Health checks the health of the plugin.
+	Health(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error)
+	// Resource gets a resource plugin.
+	Resource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error
+	// Datasource gets all data source plugins (with elevated permissions).
+	Datasource(ctx context.Context, name string) (*v0alpha1.DataSourceConnection, error)
+	// Datasources lists all data sources (with elevated permissions).
+	Datasources(ctx context.Context) (*v0alpha1.DataSourceConnectionList, error)
+}
+
+type DefaultQuerier struct {
+	connectionResourceInfo common.ResourceInfo
+	pluginJSON             plugins.JSONData
+	pluginClient           plugins.Client
+	dsService              datasources.DataSourceService
+	dsCache                datasources.CacheService
+}
+
+func NewDefaultQuerier(
+	connectionResourceInfo common.ResourceInfo,
+	pluginJSON plugins.JSONData,
+	pluginClient plugins.Client,
+	dsService datasources.DataSourceService,
+	dsCache datasources.CacheService,
+) *DefaultQuerier {
+	return &DefaultQuerier{
+		connectionResourceInfo: connectionResourceInfo,
+		pluginJSON:             pluginJSON,
+		pluginClient:           pluginClient,
+		dsService:              dsService,
+		dsCache:                dsCache,
+	}
+}
+
+func (q *DefaultQuerier) Query(ctx context.Context, query *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+	_, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, err
+	}
+	return q.pluginClient.QueryData(ctx, query)
+}
+
+func (q *DefaultQuerier) Resource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	_, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return err
+	}
+	return q.pluginClient.CallResource(ctx, req, sender)
+}
+
+func (q *DefaultQuerier) Health(ctx context.Context, query *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
+	_, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, err
+	}
+	return q.pluginClient.CheckHealth(ctx, query)
+}
+
+func (q *DefaultQuerier) Datasource(ctx context.Context, name string) (*v0alpha1.DataSourceConnection, error) {
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, err
+	}
+	user, err := appcontext.User(ctx)
+	if err != nil {
+		return nil, err
+	}
+	ds, err := q.dsCache.GetDatasourceByUID(ctx, name, user, false)
+	if err != nil {
+		return nil, err
+	}
+	return asConnection(ds, info.Value)
+}
+
+func (q *DefaultQuerier) Datasources(ctx context.Context) (*v0alpha1.DataSourceConnectionList, error) {
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, err
+	}
+
+	ds, err := q.dsService.GetDataSourcesByType(ctx, &datasources.GetDataSourcesByTypeQuery{
+		OrgID: info.OrgID,
+		Type:  q.pluginJSON.ID,
+	})
+	if err != nil {
+		return nil, err
+	}
+	return asConnectionList(q.connectionResourceInfo.TypeMeta(), ds, info.Value)
+}
+
+func asConnectionList(typeMeta metav1.TypeMeta, dss []*datasources.DataSource, ns string) (*v0alpha1.DataSourceConnectionList, error) {
+	result := &v0alpha1.DataSourceConnectionList{
+		Items: []v0alpha1.DataSourceConnection{},
+	}
+	for _, ds := range dss {
+		v, _ := asConnection(ds, ns)
+		result.Items = append(result.Items, *v)
+	}
+
+	return result, nil
+}
diff --git a/pkg/registry/apis/datasource/register.go b/pkg/registry/apis/datasource/register.go
new file mode 100644
index 0000000000000..f54eabab17a6c
--- /dev/null
+++ b/pkg/registry/apis/datasource/register.go
@@ -0,0 +1,354 @@
+package datasource
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	data "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+	"github.com/grafana/grafana-plugin-sdk-go/experimental/schemabuilder"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
+	"k8s.io/apiserver/pkg/registry/generic"
+	"k8s.io/apiserver/pkg/registry/rest"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+	openapi "k8s.io/kube-openapi/pkg/common"
+	"k8s.io/kube-openapi/pkg/spec3"
+	"k8s.io/kube-openapi/pkg/validation/spec"
+	"k8s.io/utils/strings/slices"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+	datasource "github.com/grafana/grafana/pkg/apis/datasource/v0alpha1"
+	query "github.com/grafana/grafana/pkg/apis/query/v0alpha1"
+	"github.com/grafana/grafana/pkg/apiserver/builder"
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/apiserver/utils"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
+)
+
+const QueryRequestSchemaKey = "QueryRequestSchema"
+const QueryPayloadSchemaKey = "QueryPayloadSchema"
+
+var _ builder.APIGroupBuilder = (*DataSourceAPIBuilder)(nil)
+
+// DataSourceAPIBuilder is used just so wire has something unique to return
+type DataSourceAPIBuilder struct {
+	connectionResourceInfo common.ResourceInfo
+
+	pluginJSON      plugins.JSONData
+	client          PluginClient // will only ever be called with the same pluginid!
+	datasources     PluginDatasourceProvider
+	contextProvider PluginContextWrapper
+	accessControl   accesscontrol.AccessControl
+	queryTypes      *query.QueryTypeDefinitionList
+}
+
+func RegisterAPIService(
+	features featuremgmt.FeatureToggles,
+	apiRegistrar builder.APIRegistrar,
+	pluginClient plugins.Client, // access to everything
+	datasources ScopedPluginDatasourceProvider,
+	contextProvider PluginContextWrapper,
+	pluginStore pluginstore.Store,
+	accessControl accesscontrol.AccessControl,
+) (*DataSourceAPIBuilder, error) {
+	// This requires devmode!
+	if !features.IsEnabledGlobally(featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs) {
+		return nil, nil // skip registration unless opting into experimental apis
+	}
+
+	var err error
+	var builder *DataSourceAPIBuilder
+	all := pluginStore.Plugins(context.Background(), plugins.TypeDataSource)
+	ids := []string{
+		"grafana-testdata-datasource",
+		"prometheus",
+		"graphite",
+	}
+
+	for _, ds := range all {
+		if !slices.Contains(ids, ds.ID) {
+			continue // skip this one
+		}
+
+		builder, err = NewDataSourceAPIBuilder(ds.JSONData,
+			pluginClient,
+			datasources.GetDatasourceProvider(ds.JSONData),
+			contextProvider,
+			accessControl,
+		)
+		if err != nil {
+			return nil, err
+		}
+		apiRegistrar.RegisterAPI(builder)
+	}
+	return builder, nil // only used for wire
+}
+
+// PluginClient is a subset of the plugins.Client interface with only the
+// functions supported (yet) by the datasource API
+type PluginClient interface {
+	backend.QueryDataHandler
+	backend.CheckHealthHandler
+	backend.CallResourceHandler
+}
+
+func NewDataSourceAPIBuilder(
+	plugin plugins.JSONData,
+	client PluginClient,
+	datasources PluginDatasourceProvider,
+	contextProvider PluginContextWrapper,
+	accessControl accesscontrol.AccessControl) (*DataSourceAPIBuilder, error) {
+	ri, err := resourceFromPluginID(plugin.ID)
+	if err != nil {
+		return nil, err
+	}
+
+	return &DataSourceAPIBuilder{
+		connectionResourceInfo: ri,
+		pluginJSON:             plugin,
+		client:                 client,
+		datasources:            datasources,
+		contextProvider:        contextProvider,
+		accessControl:          accessControl,
+	}, nil
+}
+
+func (b *DataSourceAPIBuilder) GetGroupVersion() schema.GroupVersion {
+	return b.connectionResourceInfo.GroupVersion()
+}
+
+func addKnownTypes(scheme *runtime.Scheme, gv schema.GroupVersion) {
+	scheme.AddKnownTypes(gv,
+		&datasource.DataSourceConnection{},
+		&datasource.DataSourceConnectionList{},
+		&datasource.HealthCheckResult{},
+		&unstructured.Unstructured{},
+		// Query handler
+		&query.QueryDataRequest{},
+		&query.QueryDataResponse{},
+		&metav1.Status{},
+	)
+}
+
+func (b *DataSourceAPIBuilder) InstallSchema(scheme *runtime.Scheme) error {
+	gv := b.connectionResourceInfo.GroupVersion()
+	addKnownTypes(scheme, gv)
+
+	// Link this version to the internal representation.
+	// This is used for server-side-apply (PATCH), and avoids the error:
+	//   "no kind is registered for the type"
+	addKnownTypes(scheme, schema.GroupVersion{
+		Group:   gv.Group,
+		Version: runtime.APIVersionInternal,
+	})
+
+	// If multiple versions exist, then register conversions from zz_generated.conversion.go
+	// if err := playlist.RegisterConversions(scheme); err != nil {
+	//   return err
+	// }
+	metav1.AddToGroupVersion(scheme, gv)
+	return scheme.SetVersionPriority(gv)
+}
+
+func resourceFromPluginID(pluginID string) (common.ResourceInfo, error) {
+	group, err := plugins.GetDatasourceGroupNameFromPluginID(pluginID)
+	if err != nil {
+		return common.ResourceInfo{}, err
+	}
+	return datasource.GenericConnectionResourceInfo.WithGroupAndShortName(group, pluginID+"-connection"), nil
+}
+
+func (b *DataSourceAPIBuilder) GetAPIGroupInfo(
+	scheme *runtime.Scheme,
+	codecs serializer.CodecFactory, // pointer?
+	_ generic.RESTOptionsGetter,
+	_ bool,
+) (*genericapiserver.APIGroupInfo, error) {
+	storage := map[string]rest.Storage{}
+
+	conn := b.connectionResourceInfo
+	storage[conn.StoragePath()] = &connectionAccess{
+		datasources:  b.datasources,
+		resourceInfo: conn,
+		tableConverter: utils.NewTableConverter(
+			conn.GroupResource(),
+			[]metav1.TableColumnDefinition{
+				{Name: "Name", Type: "string", Format: "name"},
+				{Name: "Title", Type: "string", Format: "string", Description: "The datasource title"},
+				{Name: "APIVersion", Type: "string", Format: "string", Description: "API Version"},
+				{Name: "Created At", Type: "date"},
+			},
+			func(obj any) ([]interface{}, error) {
+				m, ok := obj.(*datasource.DataSourceConnection)
+				if !ok {
+					return nil, fmt.Errorf("expected connection")
+				}
+				return []interface{}{
+					m.Name,
+					m.Title,
+					m.APIVersion,
+					m.CreationTimestamp.UTC().Format(time.RFC3339),
+				}, nil
+			},
+		),
+	}
+	storage[conn.StoragePath("query")] = &subQueryREST{builder: b}
+	storage[conn.StoragePath("health")] = &subHealthREST{builder: b}
+
+	// TODO! only setup this endpoint if it is implemented
+	storage[conn.StoragePath("resource")] = &subResourceREST{builder: b}
+
+	// Frontend proxy
+	if len(b.pluginJSON.Routes) > 0 {
+		storage[conn.StoragePath("proxy")] = &subProxyREST{pluginJSON: b.pluginJSON}
+	}
+
+	apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(
+		conn.GroupResource().Group, scheme,
+		metav1.ParameterCodec, codecs)
+
+	apiGroupInfo.VersionedResourcesStorageMap[conn.GroupVersion().Version] = storage
+	return &apiGroupInfo, nil
+}
+
+func (b *DataSourceAPIBuilder) getPluginContext(ctx context.Context, uid string) (backend.PluginContext, error) {
+	instance, err := b.datasources.GetInstanceSettings(ctx, uid)
+	if err != nil {
+		return backend.PluginContext{}, err
+	}
+	return b.contextProvider.PluginContextForDataSource(ctx, instance)
+}
+
+func (b *DataSourceAPIBuilder) GetOpenAPIDefinitions() openapi.GetOpenAPIDefinitions {
+	return func(ref openapi.ReferenceCallback) map[string]openapi.OpenAPIDefinition {
+		defs := query.GetOpenAPIDefinitions(ref) // required when running standalone
+		for k, v := range datasource.GetOpenAPIDefinitions(ref) {
+			defs[k] = v
+		}
+		return defs
+	}
+}
+
+func (b *DataSourceAPIBuilder) PostProcessOpenAPI(oas *spec3.OpenAPI) (*spec3.OpenAPI, error) {
+	// The plugin description
+	oas.Info.Description = b.pluginJSON.Info.Description
+
+	// The root api URL
+	root := "/apis/" + b.connectionResourceInfo.GroupVersion().String() + "/"
+
+	// Hide the ability to list all connections across tenants
+	delete(oas.Paths.Paths, root+b.connectionResourceInfo.GroupResource().Resource)
+
+	var err error
+	opts := schemabuilder.QuerySchemaOptions{
+		PluginID:   []string{b.pluginJSON.ID},
+		QueryTypes: []data.QueryTypeDefinition{},
+		Mode:       schemabuilder.SchemaTypeQueryPayload,
+	}
+	if b.pluginJSON.AliasIDs != nil {
+		opts.PluginID = append(opts.PluginID, b.pluginJSON.AliasIDs...)
+	}
+	if b.queryTypes != nil {
+		for _, qt := range b.queryTypes.Items {
+			// The SDK type and api type are not the same so we recreate it here
+			opts.QueryTypes = append(opts.QueryTypes, data.QueryTypeDefinition{
+				ObjectMeta: data.ObjectMeta{
+					Name: qt.Name,
+				},
+				Spec: qt.Spec,
+			})
+		}
+	}
+	oas.Components.Schemas[QueryPayloadSchemaKey], err = schemabuilder.GetQuerySchema(opts)
+	if err != nil {
+		return oas, err
+	}
+	opts.Mode = schemabuilder.SchemaTypeQueryRequest
+	oas.Components.Schemas[QueryRequestSchemaKey], err = schemabuilder.GetQuerySchema(opts)
+	if err != nil {
+		return oas, err
+	}
+
+	// Update the request object
+	sub := oas.Paths.Paths[root+"namespaces/{namespace}/connections/{name}/query"]
+	if sub != nil && sub.Post != nil {
+		sub.Post.Description = "Execute queries"
+		sub.Post.RequestBody = &spec3.RequestBody{
+			RequestBodyProps: spec3.RequestBodyProps{
+				Required: true,
+				Content: map[string]*spec3.MediaType{
+					"application/json": {
+						MediaTypeProps: spec3.MediaTypeProps{
+							Schema:   spec.RefSchema("#/components/schemas/" + QueryRequestSchemaKey),
+							Examples: getExamples(b.queryTypes),
+						},
+					},
+				},
+			},
+		}
+		okrsp, ok := sub.Post.Responses.StatusCodeResponses[200]
+		if ok {
+			sub.Post.Responses.StatusCodeResponses[http.StatusMultiStatus] = &spec3.Response{
+				ResponseProps: spec3.ResponseProps{
+					Description: "Query executed, but errors may exist in the datasource.  See the payload for more details.",
+					Content:     okrsp.Content,
+				},
+			}
+		}
+	}
+
+	// The root API discovery list
+	sub = oas.Paths.Paths[root]
+	if sub != nil && sub.Get != nil {
+		sub.Get.Tags = []string{"API Discovery"} // sorts first in the list
+	}
+	return oas, err
+}
+
+// Register additional routes with the server
+func (b *DataSourceAPIBuilder) GetAPIRoutes() *builder.APIRoutes {
+	return nil
+}
+
+func getExamples(queryTypes *query.QueryTypeDefinitionList) map[string]*spec3.Example {
+	if queryTypes == nil {
+		return nil
+	}
+
+	tr := data.TimeRange{From: "now-1h", To: "now"}
+	examples := map[string]*spec3.Example{}
+	for _, queryType := range queryTypes.Items {
+		for idx, example := range queryType.Spec.Examples {
+			q := data.NewDataQuery(example.SaveModel.Object)
+			q.RefID = "A"
+			for _, dis := range queryType.Spec.Discriminators {
+				_ = q.Set(dis.Field, dis.Value)
+			}
+			if q.MaxDataPoints < 1 {
+				q.MaxDataPoints = 1000
+			}
+			if q.IntervalMS < 1 {
+				q.IntervalMS = 5000 // 5s
+			}
+			examples[fmt.Sprintf("%s-%d", example.Name, idx)] = &spec3.Example{
+				ExampleProps: spec3.ExampleProps{
+					Summary:     example.Name,
+					Description: example.Description,
+					Value: data.QueryDataRequest{
+						TimeRange: tr,
+						Queries:   []data.DataQuery{q},
+					},
+				},
+			}
+		}
+	}
+	return examples
+}
diff --git a/pkg/registry/apis/datasource/sub_health.go b/pkg/registry/apis/datasource/sub_health.go
new file mode 100644
index 0000000000000..01a8ea82d9e3a
--- /dev/null
+++ b/pkg/registry/apis/datasource/sub_health.go
@@ -0,0 +1,82 @@
+package datasource
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	datasource "github.com/grafana/grafana/pkg/apis/datasource/v0alpha1"
+)
+
+type subHealthREST struct {
+	builder *DataSourceAPIBuilder
+}
+
+var (
+	_ = rest.Connecter(&subHealthREST{})
+	_ = rest.StorageMetadata(&subHealthREST{})
+)
+
+func (r *subHealthREST) New() runtime.Object {
+	return &datasource.HealthCheckResult{}
+}
+
+func (r *subHealthREST) Destroy() {
+}
+
+func (r *subHealthREST) ConnectMethods() []string {
+	return []string{"GET"}
+}
+
+func (r *subHealthREST) ProducesMIMETypes(verb string) []string {
+	return nil
+}
+
+func (r *subHealthREST) ProducesObject(verb string) interface{} {
+	return &datasource.HealthCheckResult{}
+}
+
+func (r *subHealthREST) NewConnectOptions() (runtime.Object, bool, string) {
+	return nil, false, ""
+}
+
+func (r *subHealthREST) Connect(ctx context.Context, name string, opts runtime.Object, responder rest.Responder) (http.Handler, error) {
+	pluginCtx, err := r.builder.getPluginContext(ctx, name)
+	if err != nil {
+		return nil, err
+	}
+	ctx = backend.WithGrafanaConfig(ctx, pluginCtx.GrafanaConfig)
+	ctx = contextualMiddlewares(ctx)
+
+	healthResponse, err := r.builder.client.CheckHealth(ctx, &backend.CheckHealthRequest{
+		PluginContext: pluginCtx,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		rsp := &datasource.HealthCheckResult{}
+		rsp.Code = int(healthResponse.Status)
+		rsp.Status = healthResponse.Status.String()
+		rsp.Message = healthResponse.Message
+
+		if len(healthResponse.JSONDetails) > 0 {
+			err = json.Unmarshal(healthResponse.JSONDetails, &rsp.Details)
+			if err != nil {
+				responder.Error(err)
+				return
+			}
+		}
+
+		statusCode := http.StatusOK
+		if healthResponse.Status != backend.HealthStatusOk {
+			statusCode = http.StatusBadRequest
+		}
+		responder.Object(statusCode, rsp)
+	}), nil
+}
diff --git a/pkg/registry/apis/datasource/sub_proxy.go b/pkg/registry/apis/datasource/sub_proxy.go
new file mode 100644
index 0000000000000..5c082fc4a92c5
--- /dev/null
+++ b/pkg/registry/apis/datasource/sub_proxy.go
@@ -0,0 +1,48 @@
+package datasource
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	"github.com/grafana/grafana/pkg/plugins"
+)
+
+type subProxyREST struct {
+	pluginJSON plugins.JSONData
+}
+
+var _ = rest.Connecter(&subProxyREST{})
+
+func (r *subProxyREST) New() runtime.Object {
+	return &metav1.Status{}
+}
+
+func (r *subProxyREST) Destroy() {}
+
+func (r *subProxyREST) ConnectMethods() []string {
+	unique := map[string]bool{}
+	methods := []string{}
+	for _, r := range r.pluginJSON.Routes {
+		if unique[r.Method] {
+			continue
+		}
+		unique[r.Method] = true
+		methods = append(methods, r.Method)
+	}
+	return methods
+}
+
+func (r *subProxyREST) NewConnectOptions() (runtime.Object, bool, string) {
+	return nil, true, ""
+}
+
+func (r *subProxyREST) Connect(ctx context.Context, name string, opts runtime.Object, responder rest.Responder) (http.Handler, error) {
+	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		responder.Error(fmt.Errorf("TODO, proxy: " + r.pluginJSON.ID))
+	}), nil
+}
diff --git a/pkg/registry/apis/datasource/sub_query.go b/pkg/registry/apis/datasource/sub_query.go
new file mode 100644
index 0000000000000..cc6d0edc22ac3
--- /dev/null
+++ b/pkg/registry/apis/datasource/sub_query.go
@@ -0,0 +1,89 @@
+package datasource
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	data "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	query "github.com/grafana/grafana/pkg/apis/query/v0alpha1"
+	"github.com/grafana/grafana/pkg/tsdb/legacydata"
+	"github.com/grafana/grafana/pkg/web"
+)
+
+type subQueryREST struct {
+	builder *DataSourceAPIBuilder
+}
+
+var (
+	_ rest.Storage         = (*subQueryREST)(nil)
+	_ rest.Connecter       = (*subQueryREST)(nil)
+	_ rest.StorageMetadata = (*subQueryREST)(nil)
+)
+
+func (r *subQueryREST) New() runtime.Object {
+	// This is added as the "ResponseType" regarless what ProducesObject() says :)
+	return &query.QueryDataResponse{}
+}
+
+func (r *subQueryREST) Destroy() {}
+
+func (r *subQueryREST) ProducesMIMETypes(verb string) []string {
+	return []string{"application/json"} // and parquet!
+}
+
+func (r *subQueryREST) ProducesObject(verb string) interface{} {
+	return &query.QueryDataResponse{}
+}
+
+func (r *subQueryREST) ConnectMethods() []string {
+	return []string{"POST"}
+}
+
+func (r *subQueryREST) NewConnectOptions() (runtime.Object, bool, string) {
+	return nil, false, "" // true means you can use the trailing path as a variable
+}
+
+func (r *subQueryREST) Connect(ctx context.Context, name string, opts runtime.Object, responder rest.Responder) (http.Handler, error) {
+	pluginCtx, err := r.builder.getPluginContext(ctx, name)
+	if err != nil {
+		return nil, err
+	}
+
+	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		dqr := data.QueryDataRequest{}
+		err := web.Bind(req, &dqr)
+		if err != nil {
+			responder.Error(err)
+			return
+		}
+
+		queries, dsRef, err := legacydata.ToDataSourceQueries(dqr)
+		if err != nil {
+			responder.Error(err)
+			return
+		}
+		if dsRef != nil && dsRef.UID != name {
+			responder.Error(fmt.Errorf("expected query body datasource and request to match"))
+			return
+		}
+
+		ctx = backend.WithGrafanaConfig(ctx, pluginCtx.GrafanaConfig)
+		ctx = contextualMiddlewares(ctx)
+		rsp, err := r.builder.client.QueryData(ctx, &backend.QueryDataRequest{
+			Queries:       queries,
+			PluginContext: pluginCtx,
+		})
+		if err != nil {
+			responder.Error(err)
+			return
+		}
+		responder.Object(query.GetResponseCode(rsp),
+			&query.QueryDataResponse{QueryDataResponse: *rsp},
+		)
+	}), nil
+}
diff --git a/pkg/registry/apis/datasource/sub_resource.go b/pkg/registry/apis/datasource/sub_resource.go
new file mode 100644
index 0000000000000..a9b1e259a7bdf
--- /dev/null
+++ b/pkg/registry/apis/datasource/sub_resource.go
@@ -0,0 +1,91 @@
+package datasource
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strings"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	"github.com/grafana/grafana/pkg/plugins/httpresponsesender"
+)
+
+type subResourceREST struct {
+	builder *DataSourceAPIBuilder
+}
+
+var _ = rest.Connecter(&subResourceREST{})
+
+func (r *subResourceREST) New() runtime.Object {
+	return &metav1.Status{}
+}
+
+func (r *subResourceREST) Destroy() {
+}
+
+func (r *subResourceREST) ConnectMethods() []string {
+	// All for now??? ideally we have a schema for resource and limit this
+	return []string{
+		http.MethodGet,
+		http.MethodHead,
+		http.MethodPost,
+		http.MethodPut,
+		http.MethodPatch,
+		http.MethodDelete,
+		http.MethodOptions,
+	}
+}
+
+func (r *subResourceREST) NewConnectOptions() (runtime.Object, bool, string) {
+	return nil, true, ""
+}
+
+func (r *subResourceREST) Connect(ctx context.Context, name string, opts runtime.Object, responder rest.Responder) (http.Handler, error) {
+	pluginCtx, err := r.builder.getPluginContext(ctx, name)
+	if err != nil {
+		return nil, err
+	}
+	ctx = backend.WithGrafanaConfig(ctx, pluginCtx.GrafanaConfig)
+	ctx = contextualMiddlewares(ctx)
+
+	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		body, err := io.ReadAll(req.Body)
+		if err != nil {
+			responder.Error(err)
+			return
+		}
+
+		idx := strings.LastIndex(req.URL.Path, "/resource")
+		if idx < 0 {
+			responder.Error(fmt.Errorf("expected resource path")) // 400?
+			return
+		}
+
+		clonedReq := req.Clone(req.Context())
+		rawURL := req.URL.Path[idx+len("/resource"):]
+
+		clonedReq.URL = &url.URL{
+			Path:     rawURL,
+			RawQuery: clonedReq.URL.RawQuery,
+		}
+
+		err = r.builder.client.CallResource(ctx, &backend.CallResourceRequest{
+			PluginContext: pluginCtx,
+			Path:          clonedReq.URL.Path,
+			Method:        req.Method,
+			URL:           req.URL.String(),
+			Body:          body,
+			Headers:       req.Header,
+		}, httpresponsesender.New(w))
+
+		if err != nil {
+			responder.Error(err)
+		}
+	}), nil
+}
diff --git a/pkg/registry/apis/example/dummy_storage.go b/pkg/registry/apis/example/dummy_storage.go
new file mode 100644
index 0000000000000..574a87dd527c2
--- /dev/null
+++ b/pkg/registry/apis/example/dummy_storage.go
@@ -0,0 +1,128 @@
+package example
+
+import (
+	"context"
+	"fmt"
+	"slices"
+
+	"k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+	example "github.com/grafana/grafana/pkg/apis/example/v0alpha1"
+	grafanaregistry "github.com/grafana/grafana/pkg/apiserver/registry/generic"
+	grafanarequest "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+)
+
+var (
+	_ rest.Storage              = (*dummyStorage)(nil)
+	_ rest.Scoper               = (*dummyStorage)(nil)
+	_ rest.SingularNameProvider = (*dummyStorage)(nil)
+	_ rest.Getter               = (*dummyStorage)(nil)
+	_ rest.Lister               = (*dummyStorage)(nil)
+)
+
+type dummyStorage struct {
+	store             *genericregistry.Store
+	names             []string
+	creationTimestamp metav1.Time
+}
+
+func newDummyStorage(gv schema.GroupVersion, scheme *runtime.Scheme, names ...string) *dummyStorage {
+	var resourceInfo = example.DummyResourceInfo
+	strategy := grafanaregistry.NewStrategy(scheme)
+	store := &genericregistry.Store{
+		NewFunc:                   resourceInfo.NewFunc,
+		NewListFunc:               resourceInfo.NewListFunc,
+		PredicateFunc:             grafanaregistry.Matcher,
+		DefaultQualifiedResource:  resourceInfo.GroupResource(),
+		SingularQualifiedResource: resourceInfo.SingularGroupResource(),
+		TableConvertor:            rest.NewDefaultTableConvertor(resourceInfo.GroupResource()),
+		CreateStrategy:            strategy,
+		UpdateStrategy:            strategy,
+		DeleteStrategy:            strategy,
+	}
+
+	return &dummyStorage{
+		store:             store,
+		names:             names,
+		creationTimestamp: metav1.Now(),
+	}
+}
+
+func (s *dummyStorage) New() runtime.Object {
+	return s.store.New()
+}
+
+func (s *dummyStorage) Destroy() {}
+
+func (s *dummyStorage) NamespaceScoped() bool {
+	return true
+}
+
+func (s *dummyStorage) GetSingularName() string {
+	return example.DummyResourceInfo.GetSingularName()
+}
+
+func (s *dummyStorage) NewList() runtime.Object {
+	return s.store.NewListFunc()
+}
+
+func (s *dummyStorage) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) {
+	return s.store.TableConvertor.ConvertToTable(ctx, object, tableOptions)
+}
+
+func (s *dummyStorage) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) {
+	info, err := grafanarequest.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, err
+	}
+
+	idx := slices.Index(s.names, name)
+	if idx < 0 {
+		return nil, fmt.Errorf("dummy not found")
+	}
+
+	return &example.DummyResource{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:              name,
+			Namespace:         info.Value,
+			CreationTimestamp: s.creationTimestamp,
+			ResourceVersion:   "1",
+		},
+		Spec: common.Unstructured{
+			Object: map[string]any{
+				"Dummy": name,
+			},
+		},
+	}, nil
+}
+
+func (s *dummyStorage) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) {
+	info, err := grafanarequest.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, err
+	}
+
+	res := &example.DummyResourceList{}
+	for _, name := range s.names {
+		res.Items = append(res.Items, example.DummyResource{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:              name,
+				Namespace:         info.Value,
+				CreationTimestamp: s.creationTimestamp,
+				ResourceVersion:   "1",
+			},
+			Spec: common.Unstructured{
+				Object: map[string]any{
+					"Dummy": name,
+				},
+			},
+		})
+	}
+	return res, nil
+}
diff --git a/pkg/registry/apis/example/register.go b/pkg/registry/apis/example/register.go
new file mode 100644
index 0000000000000..c18d5d4c4e096
--- /dev/null
+++ b/pkg/registry/apis/example/register.go
@@ -0,0 +1,218 @@
+package example
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
+	"k8s.io/apiserver/pkg/authorization/authorizer"
+	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
+	"k8s.io/apiserver/pkg/endpoints/request"
+	"k8s.io/apiserver/pkg/registry/generic"
+	"k8s.io/apiserver/pkg/registry/rest"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+	common "k8s.io/kube-openapi/pkg/common"
+	"k8s.io/kube-openapi/pkg/spec3"
+	"k8s.io/kube-openapi/pkg/validation/spec"
+
+	example "github.com/grafana/grafana/pkg/apis/example/v0alpha1"
+	"github.com/grafana/grafana/pkg/apiserver/builder"
+	"github.com/grafana/grafana/pkg/infra/appcontext"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+)
+
+var _ builder.APIGroupBuilder = (*TestingAPIBuilder)(nil)
+
+// This is used just so wire has something unique to return
+type TestingAPIBuilder struct {
+	codecs serializer.CodecFactory
+	gv     schema.GroupVersion
+}
+
+func NewTestingAPIBuilder() *TestingAPIBuilder {
+	return &TestingAPIBuilder{
+		gv: schema.GroupVersion{Group: example.GROUP, Version: example.VERSION},
+	}
+}
+
+func RegisterAPIService(features featuremgmt.FeatureToggles, apiregistration builder.APIRegistrar) *TestingAPIBuilder {
+	if !features.IsEnabledGlobally(featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs) {
+		return nil // skip registration unless opting into experimental apis
+	}
+	builder := NewTestingAPIBuilder()
+	apiregistration.RegisterAPI(builder)
+	return builder
+}
+
+func (b *TestingAPIBuilder) GetGroupVersion() schema.GroupVersion {
+	return b.gv
+}
+
+func addKnownTypes(scheme *runtime.Scheme, gv schema.GroupVersion) {
+	scheme.AddKnownTypes(gv,
+		&example.RuntimeInfo{},
+		&example.DummyResource{},
+		&example.DummyResourceList{},
+		&example.DummySubresource{},
+	)
+}
+
+func (b *TestingAPIBuilder) InstallSchema(scheme *runtime.Scheme) error {
+	addKnownTypes(scheme, b.gv)
+
+	// Link this version to the internal representation.
+	// This is used for server-side-apply (PATCH), and avoids the error:
+	//   "no kind is registered for the type"
+	addKnownTypes(scheme, schema.GroupVersion{
+		Group:   b.gv.Group,
+		Version: runtime.APIVersionInternal,
+	})
+
+	// If multiple versions exist, then register conversions from zz_generated.conversion.go
+	// if err := playlist.RegisterConversions(scheme); err != nil {
+	//   return err
+	// }
+	metav1.AddToGroupVersion(scheme, b.gv)
+	return scheme.SetVersionPriority(b.gv)
+}
+
+func (b *TestingAPIBuilder) GetAPIGroupInfo(
+	scheme *runtime.Scheme,
+	codecs serializer.CodecFactory, // pointer?
+	_ generic.RESTOptionsGetter,
+	_ bool,
+) (*genericapiserver.APIGroupInfo, error) {
+	b.codecs = codecs
+	apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(b.gv.Group, scheme, metav1.ParameterCodec, codecs)
+
+	storage := map[string]rest.Storage{}
+	storage[example.RuntimeResourceInfo.StoragePath()] = newDeploymentInfoStorage(b.gv, scheme)
+	storage[example.DummyResourceInfo.StoragePath()] = newDummyStorage(b.gv, scheme, "test1", "test2", "test3")
+	storage[example.DummyResourceInfo.StoragePath("sub")] = &dummySubresourceREST{}
+	apiGroupInfo.VersionedResourcesStorageMap[b.gv.Version] = storage
+	return &apiGroupInfo, nil
+}
+
+func (b *TestingAPIBuilder) GetOpenAPIDefinitions() common.GetOpenAPIDefinitions {
+	return example.GetOpenAPIDefinitions
+}
+
+// Register additional routes with the server
+func (b *TestingAPIBuilder) GetAPIRoutes() *builder.APIRoutes {
+	return &builder.APIRoutes{
+		Root: []builder.APIRouteHandler{
+			{
+				Path: "aaa",
+				Spec: &spec3.PathProps{
+					Summary:     "an example at the root level",
+					Description: "longer description here?",
+					Get: &spec3.Operation{
+						OperationProps: spec3.OperationProps{
+							Parameters: []*spec3.Parameter{
+								{ParameterProps: spec3.ParameterProps{
+									Name: "a",
+								}},
+							},
+							Responses: &spec3.Responses{
+								ResponsesProps: spec3.ResponsesProps{
+									StatusCodeResponses: map[int]*spec3.Response{
+										200: {
+											ResponseProps: spec3.ResponseProps{
+												Description: "OK",
+												Content: map[string]*spec3.MediaType{
+													"text/plain": {
+														MediaTypeProps: spec3.MediaTypeProps{
+															Schema: &spec.Schema{
+																SchemaProps: spec.SchemaProps{
+																	Type: []string{"string"},
+																},
+															},
+														},
+													},
+												},
+											},
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+				Handler: func(w http.ResponseWriter, r *http.Request) {
+					_, _ = w.Write([]byte("Root level handler (aaa)"))
+				},
+			},
+			{
+				Path: "bbb",
+				Spec: &spec3.PathProps{
+					Summary:     "an example at the root level",
+					Description: "longer description here?",
+					Get: &spec3.Operation{
+						OperationProps: spec3.OperationProps{
+							Parameters: []*spec3.Parameter{
+								{ParameterProps: spec3.ParameterProps{
+									Name: "b",
+								}},
+							},
+						},
+					},
+				},
+				Handler: func(w http.ResponseWriter, r *http.Request) {
+					_, _ = w.Write([]byte("Root level handler (bbb)"))
+				},
+			},
+		},
+		Namespace: []builder.APIRouteHandler{
+			{
+				Path: "ccc",
+				Spec: &spec3.PathProps{
+					Summary:     "an example at the root level",
+					Description: "longer description here?",
+					Get: &spec3.Operation{
+						OperationProps: spec3.OperationProps{
+							Parameters: []*spec3.Parameter{
+								{ParameterProps: spec3.ParameterProps{
+									Name: "a",
+								}},
+							},
+						},
+					},
+				},
+				Handler: func(w http.ResponseWriter, r *http.Request) {
+					info, ok := request.RequestInfoFrom(r.Context())
+					if !ok {
+						responsewriters.ErrorNegotiated(
+							apierrors.NewInternalError(fmt.Errorf("no RequestInfo found in the context")),
+							b.codecs, schema.GroupVersion{}, w, r,
+						)
+						return
+					}
+
+					_, _ = w.Write([]byte("Custom namespace route ccc: " + info.Namespace))
+				},
+			},
+		},
+	}
+}
+
+func (b *TestingAPIBuilder) GetAuthorizer() authorizer.Authorizer {
+	return authorizer.AuthorizerFunc(
+		func(ctx context.Context, attr authorizer.Attributes) (authorized authorizer.Decision, reason string, err error) {
+			if !attr.IsResourceRequest() {
+				return authorizer.DecisionNoOpinion, "", nil
+			}
+
+			// require a user
+			_, err = appcontext.User(ctx)
+			if err != nil {
+				return authorizer.DecisionDeny, "valid user is required", err
+			}
+
+			return authorizer.DecisionNoOpinion, "", err // fallback to org/role logic
+		})
+}
diff --git a/pkg/registry/apis/example/storage.go b/pkg/registry/apis/example/storage.go
new file mode 100644
index 0000000000000..4e2c1858837f8
--- /dev/null
+++ b/pkg/registry/apis/example/storage.go
@@ -0,0 +1,86 @@
+package example
+
+import (
+	"context"
+	"time"
+
+	"k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	example "github.com/grafana/grafana/pkg/apis/example/v0alpha1"
+	grafanaregistry "github.com/grafana/grafana/pkg/apiserver/registry/generic"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+var (
+	_ rest.Storage              = (*staticStorage)(nil)
+	_ rest.Scoper               = (*staticStorage)(nil)
+	_ rest.SingularNameProvider = (*staticStorage)(nil)
+	_ rest.Lister               = (*staticStorage)(nil)
+)
+
+type staticStorage struct {
+	Store *genericregistry.Store
+	info  example.RuntimeInfo
+}
+
+func newDeploymentInfoStorage(gv schema.GroupVersion, scheme *runtime.Scheme) *staticStorage {
+	var resourceInfo = example.RuntimeResourceInfo
+	strategy := grafanaregistry.NewStrategy(scheme)
+	store := &genericregistry.Store{
+		NewFunc:                   resourceInfo.NewFunc,
+		NewListFunc:               resourceInfo.NewListFunc,
+		PredicateFunc:             grafanaregistry.Matcher,
+		DefaultQualifiedResource:  resourceInfo.GroupResource(),
+		SingularQualifiedResource: resourceInfo.SingularGroupResource(),
+		TableConvertor:            rest.NewDefaultTableConvertor(resourceInfo.GroupResource()),
+		CreateStrategy:            strategy,
+		UpdateStrategy:            strategy,
+		DeleteStrategy:            strategy,
+	}
+
+	return &staticStorage{
+		Store: store,
+		info: example.RuntimeInfo{
+			TypeMeta:              example.RuntimeResourceInfo.TypeMeta(),
+			BuildVersion:          setting.BuildVersion,
+			BuildCommit:           setting.BuildCommit,
+			BuildBranch:           setting.BuildBranch,
+			EnterpriseBuildCommit: setting.EnterpriseBuildCommit,
+			BuildStamp:            setting.BuildStamp,
+			IsEnterprise:          setting.IsEnterprise,
+			Packaging:             setting.Packaging,
+			StartupTime:           time.Now().UnixMilli(),
+		},
+	}
+}
+
+func (s *staticStorage) New() runtime.Object {
+	return s.Store.New()
+}
+
+func (s *staticStorage) Destroy() {}
+
+func (s *staticStorage) NamespaceScoped() bool {
+	return false
+}
+
+func (s *staticStorage) GetSingularName() string {
+	return example.RuntimeResourceInfo.GetSingularName()
+}
+
+func (s *staticStorage) NewList() runtime.Object {
+	return s.Store.NewListFunc()
+}
+
+func (s *staticStorage) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) {
+	return s.Store.TableConvertor.ConvertToTable(ctx, object, tableOptions)
+}
+
+func (s *staticStorage) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) {
+	return &s.info, nil
+}
diff --git a/pkg/registry/apis/example/subresource.go b/pkg/registry/apis/example/subresource.go
new file mode 100644
index 0000000000000..63fdcab5f02d4
--- /dev/null
+++ b/pkg/registry/apis/example/subresource.go
@@ -0,0 +1,54 @@
+package example
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	example "github.com/grafana/grafana/pkg/apis/example/v0alpha1"
+	"github.com/grafana/grafana/pkg/infra/appcontext"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+)
+
+type dummySubresourceREST struct{}
+
+var _ = rest.Connecter(&dummySubresourceREST{})
+
+func (r *dummySubresourceREST) New() runtime.Object {
+	return &example.DummySubresource{}
+}
+
+func (r *dummySubresourceREST) Destroy() {
+}
+
+func (r *dummySubresourceREST) ConnectMethods() []string {
+	return []string{"GET"}
+}
+
+func (r *dummySubresourceREST) NewConnectOptions() (runtime.Object, bool, string) {
+	return nil, false, "" // true means you can use the trailing path as a variable
+}
+
+func (r *dummySubresourceREST) Connect(ctx context.Context, name string, opts runtime.Object, responder rest.Responder) (http.Handler, error) {
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, err
+	}
+
+	user, err := appcontext.User(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	// This response object format is negotiated by k8s
+	dummy := &example.DummySubresource{
+		Info: fmt.Sprintf("%s/%s", info.Value, user.Login),
+	}
+
+	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		responder.Object(http.StatusOK, dummy)
+	}), nil
+}
diff --git a/pkg/registry/apis/featuretoggle/README.md b/pkg/registry/apis/featuretoggle/README.md
new file mode 100644
index 0000000000000..7267e2e281951
--- /dev/null
+++ b/pkg/registry/apis/featuretoggle/README.md
@@ -0,0 +1,5 @@
+This package supports the [Feature toggle admin page](https://grafana.com/docs/grafana/latest/administration/feature-toggles/) feature. 
+
+In order to update feature toggles through the app, the PATCH handler calls a webhook that should update Grafana's configuration and restarts the instance. 
+
+For local development, set the app mode to `development` by adding `app_mode = development` to the top level of your Grafana .ini file.
\ No newline at end of file
diff --git a/pkg/registry/apis/featuretoggle/current.go b/pkg/registry/apis/featuretoggle/current.go
new file mode 100644
index 0000000000000..97d59a76a1e3a
--- /dev/null
+++ b/pkg/registry/apis/featuretoggle/current.go
@@ -0,0 +1,238 @@
+package featuretoggle
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"strconv"
+
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+	"github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1"
+	"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
+	"github.com/grafana/grafana/pkg/infra/appcontext"
+	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util/errutil"
+	"github.com/grafana/grafana/pkg/util/errutil/errhttp"
+	"github.com/grafana/grafana/pkg/web"
+)
+
+func (b *FeatureFlagAPIBuilder) getResolvedToggleState(ctx context.Context) v0alpha1.ResolvedToggleState {
+	state := v0alpha1.ResolvedToggleState{
+		TypeMeta: v1.TypeMeta{
+			APIVersion: v0alpha1.APIVERSION,
+			Kind:       "ResolvedToggleState",
+		},
+		Enabled:         b.features.GetEnabled(ctx),
+		RestartRequired: b.features.IsRestartRequired(),
+	}
+
+	// Reference to the object that defined the values
+	startupRef := &common.ObjectReference{
+		Namespace: "system",
+		Name:      "startup",
+	}
+
+	startup := b.features.GetStartupFlags()
+	warnings := b.features.GetWarning()
+	for _, f := range b.features.GetFlags() {
+		name := f.Name
+		if b.features.IsHiddenFromAdminPage(name, false) {
+			continue
+		}
+
+		toggle := v0alpha1.ToggleStatus{
+			Name:        name,
+			Description: f.Description, // simplify the UI changes
+			Stage:       f.Stage.String(),
+			Enabled:     state.Enabled[name],
+			Writeable:   b.features.IsEditableFromAdminPage(name),
+			Source:      startupRef,
+			Warning:     warnings[name],
+		}
+		if f.Expression == "true" && toggle.Enabled {
+			toggle.Source = nil
+		}
+		_, inStartup := startup[name]
+		if toggle.Enabled || toggle.Writeable || toggle.Warning != "" || inStartup {
+			state.Toggles = append(state.Toggles, toggle)
+		}
+
+		if toggle.Writeable {
+			state.AllowEditing = true
+		}
+	}
+
+	// Make sure the user can actually write values
+	if state.AllowEditing {
+		state.AllowEditing = b.features.IsFeatureEditingAllowed() && b.userCanWrite(ctx, nil)
+	}
+	return state
+}
+
+func (b *FeatureFlagAPIBuilder) userCanRead(ctx context.Context, u *user.SignedInUser) bool {
+	if u == nil {
+		u, _ = appcontext.User(ctx)
+		if u == nil {
+			return false
+		}
+	}
+	ok, err := b.accessControl.Evaluate(ctx, u, ac.EvalPermission(ac.ActionFeatureManagementRead))
+	return ok && err == nil
+}
+
+func (b *FeatureFlagAPIBuilder) userCanWrite(ctx context.Context, u *user.SignedInUser) bool {
+	if u == nil {
+		u, _ = appcontext.User(ctx)
+		if u == nil {
+			return false
+		}
+	}
+	ok, err := b.accessControl.Evaluate(ctx, u, ac.EvalPermission(ac.ActionFeatureManagementWrite))
+	return ok && err == nil
+}
+
+func (b *FeatureFlagAPIBuilder) handleCurrentStatus(w http.ResponseWriter, r *http.Request) {
+	if r.Method == http.MethodPatch {
+		b.handlePatchCurrent(w, r)
+		return
+	}
+
+	// Check if the user can access toggle info
+	ctx := r.Context()
+	user, err := appcontext.User(ctx)
+	if err != nil {
+		errhttp.Write(ctx, err, w)
+		return
+	}
+
+	if !b.userCanRead(ctx, user) {
+		err = errutil.Unauthorized("featuretoggle.canNotRead",
+			errutil.WithPublicMessage("missing read permission")).Errorf("user %s does not have read permissions", user.Login)
+		errhttp.Write(ctx, err, w)
+		return
+	}
+
+	// Write the state to the response body
+	state := b.getResolvedToggleState(r.Context())
+	w.WriteHeader(http.StatusOK)
+	_ = json.NewEncoder(w).Encode(state)
+}
+
+// NOTE: authz is already handled by the authorizer
+func (b *FeatureFlagAPIBuilder) handlePatchCurrent(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	if !b.features.IsFeatureEditingAllowed() {
+		err := errutil.Forbidden("featuretoggle.disabled",
+			errutil.WithPublicMessage("feature toggles are read-only")).Errorf("feature toggles are not writeable due to missing configuration")
+		errhttp.Write(ctx, err, w)
+		return
+	}
+
+	user, err := appcontext.User(ctx)
+	if err != nil {
+		errhttp.Write(ctx, err, w)
+		return
+	}
+
+	if !b.userCanWrite(ctx, user) {
+		err = errutil.Unauthorized("featuretoggle.canNotWrite",
+			errutil.WithPublicMessage("missing write permission")).Errorf("user %s does not have write permissions", user.Login)
+		errhttp.Write(ctx, err, w)
+		return
+	}
+
+	request := v0alpha1.ResolvedToggleState{}
+	err = web.Bind(r, &request)
+	if err != nil {
+		errhttp.Write(ctx, err, w)
+		return
+	}
+
+	if len(request.Toggles) > 0 {
+		err = errutil.BadRequest("featuretoggle.badRequest",
+			errutil.WithPublicMessage("can only patch the enabled section")).Errorf("request payload included properties in the read-only Toggles section")
+		errhttp.Write(ctx, err, w)
+		return
+	}
+
+	changes := map[string]string{} // TODO would be nice to have this be a bool on the HG side
+	for k, v := range request.Enabled {
+		current := b.features.IsEnabled(ctx, k)
+		if current != v {
+			if !b.features.IsEditableFromAdminPage(k) {
+				err = errutil.BadRequest("featuretoggle.badRequest",
+					errutil.WithPublicMessage("invalid toggle passed in")).Errorf("can not edit toggle %s", k)
+				errhttp.Write(ctx, err, w)
+				w.WriteHeader(http.StatusBadRequest)
+				return
+			}
+			changes[k] = strconv.FormatBool(v)
+		}
+	}
+
+	if len(changes) == 0 {
+		w.WriteHeader(http.StatusNotModified)
+		return
+	}
+
+	payload := featuremgmt.FeatureToggleWebhookPayload{
+		FeatureToggles: changes,
+		User:           user.Email,
+	}
+
+	err = sendWebhookUpdate(b.features.Settings, payload)
+	if err != nil && b.cfg.Env != setting.Dev {
+		err = errutil.Internal("featuretoggle.webhookFailure", errutil.WithPublicMessage("an error occurred while updating feeature toggles")).Errorf("webhook error: %w", err)
+		errhttp.Write(ctx, err, w)
+		return
+	}
+
+	b.features.SetRestartRequired()
+
+	w.WriteHeader(http.StatusOK)
+	_, _ = w.Write([]byte("feature toggles updated successfully"))
+}
+
+func sendWebhookUpdate(cfg setting.FeatureMgmtSettings, payload featuremgmt.FeatureToggleWebhookPayload) error {
+	data, err := json.Marshal(payload)
+	if err != nil {
+		return err
+	}
+
+	req, err := http.NewRequest(http.MethodPost, cfg.UpdateWebhook, bytes.NewBuffer(data))
+	if err != nil {
+		return err
+	}
+
+	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("Authorization", "Bearer "+cfg.UpdateWebhookToken)
+
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		if err := resp.Body.Close(); err != nil {
+			logger.Warn("Failed to close response body", "err", err)
+		}
+	}()
+
+	if resp.StatusCode >= http.StatusBadRequest {
+		if body, err := io.ReadAll(resp.Body); err != nil {
+			return fmt.Errorf("SendWebhookUpdate failed with status=%d, error: %s", resp.StatusCode, string(body))
+		} else {
+			return fmt.Errorf("SendWebhookUpdate failed with status=%d, error: %w", resp.StatusCode, err)
+		}
+	}
+
+	return nil
+}
diff --git a/pkg/registry/apis/featuretoggle/current_test.go b/pkg/registry/apis/featuretoggle/current_test.go
new file mode 100644
index 0000000000000..7b1b24c52bb6b
--- /dev/null
+++ b/pkg/registry/apis/featuretoggle/current_test.go
@@ -0,0 +1,460 @@
+package featuretoggle
+
+import (
+	"bytes"
+	"encoding/json"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/api/response"
+	"github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1"
+	"github.com/grafana/grafana/pkg/infra/appcontext"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+func TestGetFeatureToggles(t *testing.T) {
+	t.Run("fails without adequate permissions", func(t *testing.T) {
+		features := featuremgmt.WithFeatureManager(setting.FeatureMgmtSettings{}, []*featuremgmt.FeatureFlag{{
+			// Add this here to ensure the feature works as expected during tests
+			Name:  featuremgmt.FlagFeatureToggleAdminPage,
+			Stage: featuremgmt.FeatureStageGeneralAvailability,
+		}})
+
+		b := NewFeatureFlagAPIBuilder(features, actest.FakeAccessControl{ExpectedEvaluate: false}, &setting.Cfg{})
+
+		callGetWith(t, b, http.StatusUnauthorized)
+	})
+
+	t.Run("should be able to get feature toggles", func(t *testing.T) {
+		features := []*featuremgmt.FeatureFlag{
+			{
+				Name:  "toggle1",
+				Stage: featuremgmt.FeatureStageGeneralAvailability,
+			}, {
+				Name:  "toggle2",
+				Stage: featuremgmt.FeatureStageGeneralAvailability,
+			},
+		}
+		disabled := []string{"toggle2"}
+
+		b := newTestAPIBuilder(t, features, disabled, setting.FeatureMgmtSettings{})
+		result := callGetWith(t, b, http.StatusOK)
+		assert.Len(t, result.Toggles, 2)
+		t1, _ := findResult(t, result, "toggle1")
+		assert.True(t, t1.Enabled)
+		t2, _ := findResult(t, result, "toggle2")
+		assert.False(t, t2.Enabled)
+	})
+
+	t.Run("toggles hidden by config are not present in the response", func(t *testing.T) {
+		features := []*featuremgmt.FeatureFlag{
+			{
+				Name:  "toggle1",
+				Stage: featuremgmt.FeatureStageGeneralAvailability,
+			}, {
+				Name:  "toggle2",
+				Stage: featuremgmt.FeatureStageGeneralAvailability,
+			},
+		}
+		settings := setting.FeatureMgmtSettings{
+			HiddenToggles: map[string]struct{}{"toggle1": {}},
+		}
+
+		b := newTestAPIBuilder(t, features, []string{}, settings)
+		result := callGetWith(t, b, http.StatusOK)
+
+		assert.Len(t, result.Toggles, 1)
+		assert.Equal(t, "toggle2", result.Toggles[0].Name)
+	})
+
+	t.Run("toggles that are read-only by config have the readOnly field set", func(t *testing.T) {
+		features := []*featuremgmt.FeatureFlag{
+			{
+				Name:  "toggle1",
+				Stage: featuremgmt.FeatureStageGeneralAvailability,
+			}, {
+				Name:  "toggle2",
+				Stage: featuremgmt.FeatureStageGeneralAvailability,
+			},
+		}
+		disabled := []string{"toggle2"}
+		settings := setting.FeatureMgmtSettings{
+			HiddenToggles:   map[string]struct{}{"toggle1": {}},
+			ReadOnlyToggles: map[string]struct{}{"toggle2": {}},
+			AllowEditing:    true,
+			UpdateWebhook:   "bogus",
+		}
+
+		b := newTestAPIBuilder(t, features, disabled, settings)
+		result := callGetWith(t, b, http.StatusOK)
+
+		assert.Len(t, result.Toggles, 1)
+		assert.Equal(t, "toggle2", result.Toggles[0].Name)
+		assert.False(t, result.Toggles[0].Writeable)
+	})
+
+	t.Run("feature toggle defailts", func(t *testing.T) {
+		features := []*featuremgmt.FeatureFlag{
+			{
+				Name:  "toggle1",
+				Stage: featuremgmt.FeatureStageUnknown,
+			}, {
+				Name:  "toggle2",
+				Stage: featuremgmt.FeatureStageExperimental,
+			}, {
+				Name:  "toggle3",
+				Stage: featuremgmt.FeatureStagePrivatePreview,
+			}, {
+				Name:           "toggle4",
+				Stage:          featuremgmt.FeatureStagePublicPreview,
+				AllowSelfServe: true,
+			}, {
+				Name:           "toggle5",
+				Stage:          featuremgmt.FeatureStageGeneralAvailability,
+				AllowSelfServe: true,
+			}, {
+				Name:           "toggle6",
+				Stage:          featuremgmt.FeatureStageDeprecated,
+				AllowSelfServe: true,
+			}, {
+				Name:           "toggle7",
+				Stage:          featuremgmt.FeatureStageGeneralAvailability,
+				AllowSelfServe: false,
+			},
+		}
+
+		t.Run("unknown, experimental, and private preview toggles are hidden by default", func(t *testing.T) {
+			b := newTestAPIBuilder(t, features, []string{}, setting.FeatureMgmtSettings{})
+			result := callGetWith(t, b, http.StatusOK)
+
+			assert.Len(t, result.Toggles, 4)
+
+			_, ok := findResult(t, result, "toggle1")
+			assert.False(t, ok)
+			_, ok = findResult(t, result, "toggle2")
+			assert.False(t, ok)
+			_, ok = findResult(t, result, "toggle3")
+			assert.False(t, ok)
+		})
+
+		t.Run("only public preview and GA with AllowSelfServe are writeable", func(t *testing.T) {
+			settings := setting.FeatureMgmtSettings{
+				AllowEditing:  true,
+				UpdateWebhook: "bogus",
+			}
+
+			b := newTestAPIBuilder(t, features, []string{}, settings)
+			result := callGetWith(t, b, http.StatusOK)
+
+			t4, ok := findResult(t, result, "toggle4")
+			assert.True(t, ok)
+			assert.True(t, t4.Writeable)
+			t5, ok := findResult(t, result, "toggle5")
+			assert.True(t, ok)
+			assert.True(t, t5.Writeable)
+			t6, ok := findResult(t, result, "toggle6")
+			assert.True(t, ok)
+			assert.True(t, t6.Writeable)
+		})
+
+		t.Run("all toggles are read-only when server is misconfigured", func(t *testing.T) {
+			settings := setting.FeatureMgmtSettings{
+				AllowEditing:  false,
+				UpdateWebhook: "",
+			}
+			b := newTestAPIBuilder(t, features, []string{}, settings)
+			result := callGetWith(t, b, http.StatusOK)
+
+			assert.Len(t, result.Toggles, 4)
+
+			t4, ok := findResult(t, result, "toggle4")
+			assert.True(t, ok)
+			assert.False(t, t4.Writeable)
+			t5, ok := findResult(t, result, "toggle5")
+			assert.True(t, ok)
+			assert.False(t, t5.Writeable)
+			t6, ok := findResult(t, result, "toggle6")
+			assert.True(t, ok)
+			assert.False(t, t6.Writeable)
+		})
+	})
+}
+
+func TestSetFeatureToggles(t *testing.T) {
+	t.Run("fails when the user doesn't have write permissions", func(t *testing.T) {
+		s := setting.FeatureMgmtSettings{
+			AllowEditing:  true,
+			UpdateWebhook: "random",
+		}
+		features := featuremgmt.WithFeatureManager(s, []*featuremgmt.FeatureFlag{{
+			// Add this here to ensure the feature works as expected during tests
+			Name:  featuremgmt.FlagFeatureToggleAdminPage,
+			Stage: featuremgmt.FeatureStageGeneralAvailability,
+		}})
+
+		b := NewFeatureFlagAPIBuilder(features, actest.FakeAccessControl{ExpectedEvaluate: false}, &setting.Cfg{})
+		msg := callPatchWith(t, b, v0alpha1.ResolvedToggleState{}, http.StatusUnauthorized)
+		assert.Equal(t, "missing write permission", msg)
+	})
+
+	t.Run("fails when update toggle url is not set", func(t *testing.T) {
+		s := setting.FeatureMgmtSettings{
+			AllowEditing: true,
+		}
+		b := newTestAPIBuilder(t, nil, []string{}, s)
+		msg := callPatchWith(t, b, v0alpha1.ResolvedToggleState{}, http.StatusForbidden)
+		assert.Equal(t, "feature toggles are read-only", msg)
+	})
+
+	t.Run("fails with non-existent toggle", func(t *testing.T) {
+		features := []*featuremgmt.FeatureFlag{
+			{
+				Name:  "toggle1",
+				Stage: featuremgmt.FeatureStageGeneralAvailability,
+			}, {
+				Name:  "toggle2",
+				Stage: featuremgmt.FeatureStageGeneralAvailability,
+			},
+		}
+		disabled := []string{"toggle2"}
+		update := v0alpha1.ResolvedToggleState{
+			Enabled: map[string]bool{
+				"toggle3": true,
+			},
+		}
+
+		s := setting.FeatureMgmtSettings{
+			AllowEditing:  true,
+			UpdateWebhook: "random",
+		}
+		b := newTestAPIBuilder(t, features, disabled, s)
+		msg := callPatchWith(t, b, update, http.StatusBadRequest)
+		assert.Equal(t, "invalid toggle passed in", msg)
+	})
+
+	t.Run("fails with read-only toggles", func(t *testing.T) {
+		features := []*featuremgmt.FeatureFlag{
+			{
+				Name:  featuremgmt.FlagFeatureToggleAdminPage,
+				Stage: featuremgmt.FeatureStageGeneralAvailability,
+			}, {
+				Name:  "toggle2",
+				Stage: featuremgmt.FeatureStagePublicPreview,
+			}, {
+				Name:  "toggle3",
+				Stage: featuremgmt.FeatureStageGeneralAvailability,
+			},
+		}
+		disabled := []string{"toggle2", "toggle3"}
+
+		s := setting.FeatureMgmtSettings{
+			AllowEditing:  true,
+			UpdateWebhook: "random",
+			ReadOnlyToggles: map[string]struct{}{
+				"toggle3": {},
+			},
+		}
+
+		t.Run("because it is the feature toggle admin page toggle", func(t *testing.T) {
+			update := v0alpha1.ResolvedToggleState{
+				Enabled: map[string]bool{
+					featuremgmt.FlagFeatureToggleAdminPage: true,
+				},
+			}
+			b := newTestAPIBuilder(t, features, disabled, s)
+			callPatchWith(t, b, update, http.StatusNotModified)
+		})
+
+		t.Run("because it is not GA or Deprecated", func(t *testing.T) {
+			update := v0alpha1.ResolvedToggleState{
+				Enabled: map[string]bool{
+					"toggle2": true,
+				},
+			}
+			b := newTestAPIBuilder(t, features, disabled, s)
+			msg := callPatchWith(t, b, update, http.StatusBadRequest)
+			assert.Equal(t, "invalid toggle passed in", msg)
+		})
+
+		t.Run("because it is configured to be read-only", func(t *testing.T) {
+			update := v0alpha1.ResolvedToggleState{
+				Enabled: map[string]bool{
+					"toggle2": true,
+				},
+			}
+			b := newTestAPIBuilder(t, features, disabled, s)
+			msg := callPatchWith(t, b, update, http.StatusBadRequest)
+			assert.Equal(t, "invalid toggle passed in", msg)
+		})
+	})
+
+	t.Run("when all conditions met", func(t *testing.T) {
+		features := []*featuremgmt.FeatureFlag{
+			{
+				Name:  featuremgmt.FlagFeatureToggleAdminPage,
+				Stage: featuremgmt.FeatureStageGeneralAvailability,
+			}, {
+				Name:  "toggle2",
+				Stage: featuremgmt.FeatureStagePublicPreview,
+			}, {
+				Name:  "toggle3",
+				Stage: featuremgmt.FeatureStageGeneralAvailability,
+			}, {
+				Name:           "toggle4",
+				Stage:          featuremgmt.FeatureStageGeneralAvailability,
+				AllowSelfServe: true,
+			}, {
+				Name:           "toggle5",
+				Stage:          featuremgmt.FeatureStageDeprecated,
+				AllowSelfServe: true,
+			},
+		}
+		disabled := []string{"toggle2", "toggle3", "toggle4"}
+
+		s := setting.FeatureMgmtSettings{
+			AllowEditing:       true,
+			UpdateWebhook:      "random",
+			UpdateWebhookToken: "token",
+			ReadOnlyToggles: map[string]struct{}{
+				"toggle3": {},
+			},
+		}
+
+		update := v0alpha1.ResolvedToggleState{
+			Enabled: map[string]bool{
+				"toggle4": true,
+				"toggle5": false,
+			},
+		}
+		t.Run("fail when webhook request is not successful", func(t *testing.T) {
+			webhookServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusBadRequest)
+			}))
+			defer webhookServer.Close()
+			s.UpdateWebhook = webhookServer.URL
+
+			b := newTestAPIBuilder(t, features, disabled, s)
+			msg := callPatchWith(t, b, update, http.StatusInternalServerError)
+			assert.Equal(t, "an error occurred while updating feeature toggles", msg)
+		})
+
+		t.Run("succeed when webhook request is not successful but app is in dev mode", func(t *testing.T) {
+			webhookServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusBadRequest)
+			}))
+			defer webhookServer.Close()
+			s.UpdateWebhook = webhookServer.URL
+
+			b := newTestAPIBuilder(t, features, disabled, s)
+			b.cfg.Env = setting.Dev
+			callPatchWith(t, b, update, http.StatusOK)
+		})
+
+		t.Run("succeed when webhook request is successful", func(t *testing.T) {
+			webhookServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				assert.Equal(t, "Bearer "+s.UpdateWebhookToken, r.Header.Get("Authorization"))
+
+				var req featuremgmt.FeatureToggleWebhookPayload
+				require.NoError(t, json.NewDecoder(r.Body).Decode(&req))
+
+				assert.Equal(t, "true", req.FeatureToggles["toggle4"])
+				assert.Equal(t, "false", req.FeatureToggles["toggle5"])
+				w.WriteHeader(http.StatusOK)
+			}))
+			defer webhookServer.Close()
+			s.UpdateWebhook = webhookServer.URL
+
+			b := newTestAPIBuilder(t, features, disabled, s)
+			msg := callPatchWith(t, b, update, http.StatusOK)
+			assert.Equal(t, "feature toggles updated successfully", msg)
+		})
+	})
+}
+
+func findResult(t *testing.T, result v0alpha1.ResolvedToggleState, name string) (v0alpha1.ToggleStatus, bool) {
+	t.Helper()
+
+	for _, t := range result.Toggles {
+		if t.Name == name {
+			return t, true
+		}
+	}
+	return v0alpha1.ToggleStatus{}, false
+}
+
+func callGetWith(t *testing.T, b *FeatureFlagAPIBuilder, expectedCode int) v0alpha1.ResolvedToggleState {
+	w := response.CreateNormalResponse(http.Header{}, []byte{}, 0)
+	req := &http.Request{
+		Method: "GET",
+		Header: http.Header{},
+	}
+	req.Header.Add("content-type", "application/json")
+	req = req.WithContext(appcontext.WithUser(req.Context(), &user.SignedInUser{}))
+	b.handleCurrentStatus(w, req)
+
+	rts := v0alpha1.ResolvedToggleState{}
+	require.NoError(t, json.Unmarshal(w.Body(), &rts))
+	require.Equal(t, expectedCode, w.Status())
+
+	// Tests don't expect the feature toggle admin page feature to be present, so remove them from the resolved toggle state
+	for i, t := range rts.Toggles {
+		if t.Name == "featureToggleAdminPage" {
+			rts.Toggles = append(rts.Toggles[0:i], rts.Toggles[i+1:]...)
+		}
+	}
+
+	return rts
+}
+
+func callPatchWith(t *testing.T, b *FeatureFlagAPIBuilder, update v0alpha1.ResolvedToggleState, expectedCode int) string {
+	w := response.CreateNormalResponse(http.Header{}, []byte{}, 0)
+
+	body, err := json.Marshal(update)
+	require.NoError(t, err)
+
+	req := &http.Request{
+		Method: "PATCH",
+		Body:   io.NopCloser(bytes.NewReader(body)),
+		Header: http.Header{},
+	}
+	req.Header.Add("content-type", "application/json")
+	req = req.WithContext(appcontext.WithUser(req.Context(), &user.SignedInUser{}))
+	b.handleCurrentStatus(w, req)
+
+	require.NotNil(t, w.Body())
+	require.Equal(t, expectedCode, w.Status())
+
+	// Extract the public facing message if this is an error
+	if w.Status() > 399 {
+		res := map[string]any{}
+		require.NoError(t, json.Unmarshal(w.Body(), &res))
+
+		return res["message"].(string)
+	}
+
+	return string(w.Body())
+}
+
+func newTestAPIBuilder(
+	t *testing.T,
+	serverFeatures []*featuremgmt.FeatureFlag,
+	disabled []string, // the flags that are disabled
+	settings setting.FeatureMgmtSettings,
+) *FeatureFlagAPIBuilder {
+	t.Helper()
+	features := featuremgmt.WithFeatureManager(settings, append([]*featuremgmt.FeatureFlag{{
+		// Add this here to ensure the feature works as expected during tests
+		Name:  featuremgmt.FlagFeatureToggleAdminPage,
+		Stage: featuremgmt.FeatureStageGeneralAvailability,
+	}}, serverFeatures...), disabled...)
+
+	return NewFeatureFlagAPIBuilder(features, actest.FakeAccessControl{ExpectedEvaluate: true}, &setting.Cfg{})
+}
diff --git a/pkg/registry/apis/featuretoggle/features.go b/pkg/registry/apis/featuretoggle/features.go
new file mode 100644
index 0000000000000..6902d8bb3c8ed
--- /dev/null
+++ b/pkg/registry/apis/featuretoggle/features.go
@@ -0,0 +1,114 @@
+package featuretoggle
+
+import (
+	"context"
+	"fmt"
+	"sync"
+
+	"k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+	"github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1"
+	"github.com/grafana/grafana/pkg/services/apiserver/utils"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+)
+
+var (
+	_ rest.Storage              = (*featuresStorage)(nil)
+	_ rest.Scoper               = (*featuresStorage)(nil)
+	_ rest.SingularNameProvider = (*featuresStorage)(nil)
+	_ rest.Lister               = (*featuresStorage)(nil)
+	_ rest.Getter               = (*featuresStorage)(nil)
+)
+
+type featuresStorage struct {
+	resource       *common.ResourceInfo
+	tableConverter rest.TableConvertor
+	features       *v0alpha1.FeatureList
+	featuresOnce   sync.Once
+}
+
+// NOTE! this does not depend on config or any system state!
+// In the future, the existence of features (and their properties) can be defined dynamically
+func NewFeaturesStorage() *featuresStorage {
+	resourceInfo := v0alpha1.FeatureResourceInfo
+	return &featuresStorage{
+		resource: &resourceInfo,
+		tableConverter: utils.NewTableConverter(
+			resourceInfo.GroupResource(),
+			[]metav1.TableColumnDefinition{
+				{Name: "Name", Type: "string", Format: "name"},
+				{Name: "Stage", Type: "string", Format: "string", Description: "Where is the flag in the dev cycle"},
+				{Name: "Owner", Type: "string", Format: "string", Description: "Which team owns the feature"},
+			},
+			func(obj any) ([]interface{}, error) {
+				r, ok := obj.(*v0alpha1.Feature)
+				if ok {
+					return []interface{}{
+						r.Name,
+						r.Spec.Stage,
+						r.Spec.Owner,
+					}, nil
+				}
+				return nil, fmt.Errorf("expected resource or info")
+			}),
+	}
+}
+
+func (s *featuresStorage) New() runtime.Object {
+	return s.resource.NewFunc()
+}
+
+func (s *featuresStorage) Destroy() {}
+
+func (s *featuresStorage) NamespaceScoped() bool {
+	return false
+}
+
+func (s *featuresStorage) GetSingularName() string {
+	return s.resource.GetSingularName()
+}
+
+func (s *featuresStorage) NewList() runtime.Object {
+	return s.resource.NewListFunc()
+}
+
+func (s *featuresStorage) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) {
+	return s.tableConverter.ConvertToTable(ctx, object, tableOptions)
+}
+
+func (s *featuresStorage) init() {
+	s.featuresOnce.Do(func() {
+		rv := "1"
+		features, _ := featuremgmt.GetEmbeddedFeatureList()
+		for _, feature := range features.Items {
+			if feature.ResourceVersion > rv {
+				rv = feature.ResourceVersion
+			}
+		}
+		features.ResourceVersion = rv
+		s.features = &features
+	})
+}
+
+func (s *featuresStorage) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) {
+	s.init()
+	if s.features == nil {
+		return nil, fmt.Errorf("error loading embedded features")
+	}
+	return s.features, nil
+}
+
+func (s *featuresStorage) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) {
+	s.init()
+
+	for idx, flag := range s.features.Items {
+		if flag.Name == name {
+			return &s.features.Items[idx], nil
+		}
+	}
+	return nil, fmt.Errorf("not found")
+}
diff --git a/pkg/registry/apis/featuretoggle/register.go b/pkg/registry/apis/featuretoggle/register.go
new file mode 100644
index 0000000000000..e93b396d55a4e
--- /dev/null
+++ b/pkg/registry/apis/featuretoggle/register.go
@@ -0,0 +1,213 @@
+package featuretoggle
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
+	"k8s.io/apiserver/pkg/authorization/authorizer"
+	"k8s.io/apiserver/pkg/registry/generic"
+	"k8s.io/apiserver/pkg/registry/rest"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+	common "k8s.io/kube-openapi/pkg/common"
+	"k8s.io/kube-openapi/pkg/spec3"
+	"k8s.io/kube-openapi/pkg/validation/spec"
+
+	"github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1"
+	"github.com/grafana/grafana/pkg/apiserver/builder"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+var _ builder.APIGroupBuilder = (*FeatureFlagAPIBuilder)(nil)
+
+var gv = v0alpha1.SchemeGroupVersion
+
+// This is used just so wire has something unique to return
+type FeatureFlagAPIBuilder struct {
+	features      *featuremgmt.FeatureManager
+	accessControl accesscontrol.AccessControl
+	cfg           *setting.Cfg
+}
+
+func NewFeatureFlagAPIBuilder(features *featuremgmt.FeatureManager, accessControl accesscontrol.AccessControl, cfg *setting.Cfg) *FeatureFlagAPIBuilder {
+	return &FeatureFlagAPIBuilder{features, accessControl, cfg}
+}
+
+func RegisterAPIService(features *featuremgmt.FeatureManager,
+	accessControl accesscontrol.AccessControl,
+	apiregistration builder.APIRegistrar,
+	cfg *setting.Cfg,
+) *FeatureFlagAPIBuilder {
+	builder := NewFeatureFlagAPIBuilder(features, accessControl, cfg)
+	apiregistration.RegisterAPI(builder)
+	return builder
+}
+
+func (b *FeatureFlagAPIBuilder) GetGroupVersion() schema.GroupVersion {
+	return gv
+}
+
+func addKnownTypes(scheme *runtime.Scheme, gv schema.GroupVersion) {
+	scheme.AddKnownTypes(gv,
+		&v0alpha1.Feature{},
+		&v0alpha1.FeatureList{},
+		&v0alpha1.FeatureToggles{},
+		&v0alpha1.FeatureTogglesList{},
+		&v0alpha1.ResolvedToggleState{},
+	)
+}
+
+func (b *FeatureFlagAPIBuilder) InstallSchema(scheme *runtime.Scheme) error {
+	addKnownTypes(scheme, gv)
+
+	// Link this version to the internal representation.
+	// This is used for server-side-apply (PATCH), and avoids the error:
+	//   "no kind is registered for the type"
+	addKnownTypes(scheme, schema.GroupVersion{
+		Group:   gv.Group,
+		Version: runtime.APIVersionInternal,
+	})
+
+	// If multiple versions exist, then register conversions from zz_generated.conversion.go
+	// if err := playlist.RegisterConversions(scheme); err != nil {
+	//   return err
+	// }
+	metav1.AddToGroupVersion(scheme, gv)
+	return scheme.SetVersionPriority(gv)
+}
+
+func (b *FeatureFlagAPIBuilder) GetAPIGroupInfo(
+	scheme *runtime.Scheme,
+	codecs serializer.CodecFactory, // pointer?
+	_ generic.RESTOptionsGetter,
+	_ bool,
+) (*genericapiserver.APIGroupInfo, error) {
+	apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(v0alpha1.GROUP, scheme, metav1.ParameterCodec, codecs)
+
+	featureStore := NewFeaturesStorage()
+	toggleStore := NewTogglesStorage(b.features)
+
+	storage := map[string]rest.Storage{}
+	storage[featureStore.resource.StoragePath()] = featureStore
+	storage[toggleStore.resource.StoragePath()] = toggleStore
+
+	apiGroupInfo.VersionedResourcesStorageMap[v0alpha1.VERSION] = storage
+	return &apiGroupInfo, nil
+}
+
+func (b *FeatureFlagAPIBuilder) GetOpenAPIDefinitions() common.GetOpenAPIDefinitions {
+	return v0alpha1.GetOpenAPIDefinitions
+}
+
+func (b *FeatureFlagAPIBuilder) GetAuthorizer() authorizer.Authorizer {
+	return nil // default authorizer is fine
+}
+
+// Register additional routes with the server
+func (b *FeatureFlagAPIBuilder) GetAPIRoutes() *builder.APIRoutes {
+	defs := v0alpha1.GetOpenAPIDefinitions(func(path string) spec.Ref { return spec.Ref{} })
+	stateSchema := defs["github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1.ResolvedToggleState"].Schema
+
+	tags := []string{"Editor"}
+	return &builder.APIRoutes{
+		Root: []builder.APIRouteHandler{
+			{
+				Path: "current",
+				Spec: &spec3.PathProps{
+					Get: &spec3.Operation{
+						OperationProps: spec3.OperationProps{
+							Tags:        tags,
+							Summary:     "Current configuration with details",
+							Description: "Show details about the current flags and where they come from",
+							Responses: &spec3.Responses{
+								ResponsesProps: spec3.ResponsesProps{
+									StatusCodeResponses: map[int]*spec3.Response{
+										200: {
+											ResponseProps: spec3.ResponseProps{
+												Content: map[string]*spec3.MediaType{
+													"application/json": {
+														MediaTypeProps: spec3.MediaTypeProps{
+															Schema: &stateSchema,
+														},
+													},
+												},
+												Description: "OK",
+											},
+										},
+									},
+								},
+							},
+						},
+					},
+					Patch: &spec3.Operation{
+						OperationProps: spec3.OperationProps{
+							Tags:        tags,
+							Summary:     "Update individual toggles",
+							Description: "Patch some of the toggles (keyed by the toggle name)",
+							RequestBody: &spec3.RequestBody{
+								RequestBodyProps: spec3.RequestBodyProps{
+									Required:    true,
+									Description: "flags to change",
+									Content: map[string]*spec3.MediaType{
+										"application/json": {
+											MediaTypeProps: spec3.MediaTypeProps{
+												Schema: &stateSchema,
+												Example: &v0alpha1.ResolvedToggleState{
+													Enabled: map[string]bool{
+														featuremgmt.FlagAutoMigrateOldPanels: true,
+														featuremgmt.FlagAngularDeprecationUI: false,
+													},
+												},
+												Examples: map[string]*spec3.Example{
+													"enable-auto-migrate": {
+														ExampleProps: spec3.ExampleProps{
+															Summary:     "enable auto-migrate panels",
+															Description: "enable description",
+															Value: &v0alpha1.ResolvedToggleState{
+																Enabled: map[string]bool{
+																	featuremgmt.FlagAutoMigrateOldPanels: true,
+																},
+															},
+														},
+													},
+													"disable-auto-migrate": {
+														ExampleProps: spec3.ExampleProps{
+															Summary:     "disable auto-migrate panels",
+															Description: "disable description",
+															Value: &v0alpha1.ResolvedToggleState{
+																Enabled: map[string]bool{
+																	featuremgmt.FlagAutoMigrateOldPanels: false,
+																},
+															},
+														},
+													},
+												},
+											},
+										},
+									},
+								},
+							},
+							Responses: &spec3.Responses{
+								ResponsesProps: spec3.ResponsesProps{
+									StatusCodeResponses: map[int]*spec3.Response{
+										200: {
+											ResponseProps: spec3.ResponseProps{
+												Content: map[string]*spec3.MediaType{
+													"application/json": {},
+												},
+												Description: "OK",
+											},
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+				Handler: b.handleCurrentStatus,
+			},
+		},
+	}
+}
diff --git a/pkg/registry/apis/featuretoggle/toggles.go b/pkg/registry/apis/featuretoggle/toggles.go
new file mode 100644
index 0000000000000..9c920c5a0ba93
--- /dev/null
+++ b/pkg/registry/apis/featuretoggle/toggles.go
@@ -0,0 +1,92 @@
+package featuretoggle
+
+import (
+	"context"
+	"fmt"
+
+	"k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+	"github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+)
+
+var (
+	_ rest.Storage              = (*togglesStorage)(nil)
+	_ rest.Scoper               = (*togglesStorage)(nil)
+	_ rest.SingularNameProvider = (*togglesStorage)(nil)
+	_ rest.Lister               = (*togglesStorage)(nil)
+	_ rest.Getter               = (*togglesStorage)(nil)
+)
+
+type togglesStorage struct {
+	resource       *common.ResourceInfo
+	tableConverter rest.TableConvertor
+
+	// The startup toggles
+	startup *v0alpha1.FeatureToggles
+}
+
+func NewTogglesStorage(features *featuremgmt.FeatureManager) *togglesStorage {
+	resourceInfo := v0alpha1.TogglesResourceInfo
+	return &togglesStorage{
+		resource: &resourceInfo,
+		startup: &v0alpha1.FeatureToggles{
+			TypeMeta: resourceInfo.TypeMeta(),
+			ObjectMeta: metav1.ObjectMeta{
+				Name:              "startup",
+				Namespace:         "system",
+				CreationTimestamp: metav1.Now(),
+			},
+			Spec: features.GetStartupFlags(),
+		},
+		tableConverter: rest.NewDefaultTableConvertor(resourceInfo.GroupResource()),
+	}
+}
+
+func (s *togglesStorage) New() runtime.Object {
+	return s.resource.NewFunc()
+}
+
+func (s *togglesStorage) Destroy() {}
+
+func (s *togglesStorage) NamespaceScoped() bool {
+	return true
+}
+
+func (s *togglesStorage) GetSingularName() string {
+	return s.resource.GetSingularName()
+}
+
+func (s *togglesStorage) NewList() runtime.Object {
+	return s.resource.NewListFunc()
+}
+
+func (s *togglesStorage) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) {
+	return s.tableConverter.ConvertToTable(ctx, object, tableOptions)
+}
+
+func (s *togglesStorage) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) {
+	flags := &v0alpha1.FeatureTogglesList{
+		Items: []v0alpha1.FeatureToggles{*s.startup},
+	}
+	return flags, nil
+}
+
+func (s *togglesStorage) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) {
+	info, err := request.NamespaceInfoFrom(ctx, false) // allow system
+	if err != nil {
+		return nil, err
+	}
+	if info.Value != "" && info.Value != "system" {
+		return nil, fmt.Errorf("only system namespace is currently supported")
+	}
+	if name != "startup" {
+		return nil, fmt.Errorf("only system/startup is currently supported")
+	}
+	return s.startup, nil
+}
diff --git a/pkg/registry/apis/folders/continue.go b/pkg/registry/apis/folders/continue.go
new file mode 100644
index 0000000000000..8ff86b627eaee
--- /dev/null
+++ b/pkg/registry/apis/folders/continue.go
@@ -0,0 +1,53 @@
+package folders
+
+import (
+	"encoding/base64"
+	"fmt"
+	"strconv"
+	"strings"
+
+	"k8s.io/apimachinery/pkg/apis/meta/internalversion"
+)
+
+type continueToken struct {
+	page  int64
+	limit int64
+}
+
+func readContinueToken(options *internalversion.ListOptions) (*continueToken, error) {
+	t := &continueToken{
+		limit: 100, // default page size
+	}
+	if options.Continue == "" {
+		if options.Limit > 0 {
+			t.limit = options.Limit
+		}
+	} else {
+		continueVal, err := base64.StdEncoding.DecodeString(options.Continue)
+		if err != nil {
+			return nil, fmt.Errorf("error decoding continue token")
+		}
+		parts := strings.Split(string(continueVal), "|")
+		if len(parts) != 2 {
+			return nil, fmt.Errorf("error decoding continue token (expected two parts)")
+		}
+
+		t.page, err = strconv.ParseInt(parts[1], 10, 64)
+		if err != nil {
+			return nil, err
+		}
+		t.limit, err = strconv.ParseInt(parts[0], 10, 64)
+		if err != nil {
+			return nil, err
+		}
+		if options.Limit > 0 && options.Limit != t.limit {
+			return nil, fmt.Errorf("limit does not match continue token")
+		}
+	}
+
+	return t, nil
+}
+
+func (t *continueToken) GetNextPageToken() string {
+	return base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("%d|%d", t.limit, t.page+1)))
+}
diff --git a/pkg/registry/apis/folders/continue_test.go b/pkg/registry/apis/folders/continue_test.go
new file mode 100644
index 0000000000000..2763c3522c677
--- /dev/null
+++ b/pkg/registry/apis/folders/continue_test.go
@@ -0,0 +1,26 @@
+package folders
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"k8s.io/apimachinery/pkg/apis/meta/internalversion"
+)
+
+func TestContinueToken(t *testing.T) {
+	token, err := readContinueToken(&internalversion.ListOptions{})
+	require.NoError(t, err)
+	require.Equal(t, int64(100), token.limit)
+	require.Equal(t, int64(0), token.page)
+
+	next := token.GetNextPageToken()
+	require.Equal(t, "MTAwfDE=", next)
+	token, err = readContinueToken(&internalversion.ListOptions{Continue: next})
+	require.NoError(t, err)
+	require.Equal(t, int64(100), token.limit)
+	require.Equal(t, int64(1), token.page) // <<< +1
+
+	// Error if the limit has changed
+	_, err = readContinueToken(&internalversion.ListOptions{Continue: next, Limit: 50})
+	require.Error(t, err)
+}
diff --git a/pkg/registry/apis/folders/conversions.go b/pkg/registry/apis/folders/conversions.go
new file mode 100644
index 0000000000000..9c9678a490906
--- /dev/null
+++ b/pkg/registry/apis/folders/conversions.go
@@ -0,0 +1,50 @@
+package folders
+
+import (
+	"fmt"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/grafana/grafana/pkg/apis/folder/v0alpha1"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+	"github.com/grafana/grafana/pkg/services/apiserver/utils"
+	"github.com/grafana/grafana/pkg/services/folder"
+)
+
+func convertToK8sResource(v *folder.Folder, namespacer request.NamespaceMapper) *v0alpha1.Folder {
+	f := &v0alpha1.Folder{
+		TypeMeta: v0alpha1.FolderResourceInfo.TypeMeta(),
+		ObjectMeta: metav1.ObjectMeta{
+			Name:              v.UID,
+			ResourceVersion:   fmt.Sprintf("%d", v.Updated.UnixMilli()),
+			CreationTimestamp: metav1.NewTime(v.Created),
+			Namespace:         namespacer(v.OrgID),
+		},
+		Spec: v0alpha1.Spec{
+			Title:       v.Title,
+			Description: v.Description,
+		},
+	}
+
+	meta, err := utils.MetaAccessor(f)
+	if err == nil {
+		meta.SetUpdatedTimestamp(&v.Updated)
+		if v.ID > 0 { // nolint:staticcheck
+			meta.SetOriginInfo(&utils.ResourceOriginInfo{
+				Name: "SQL",
+				Key:  fmt.Sprintf("%d", v.ID), // nolint:staticcheck
+			})
+		}
+		if v.CreatedBy > 0 {
+			meta.SetCreatedBy(fmt.Sprintf("user:%d", v.CreatedBy))
+		}
+		if v.UpdatedBy > 0 {
+			meta.SetUpdatedBy(fmt.Sprintf("user:%d", v.UpdatedBy))
+		}
+	}
+	if v.ParentUID != "" {
+		meta.SetFolder(v.ParentUID)
+	}
+	f.UID = utils.CalculateClusterWideUID(f)
+	return f
+}
diff --git a/pkg/registry/apis/folders/legacy_storage.go b/pkg/registry/apis/folders/legacy_storage.go
new file mode 100644
index 0000000000000..82a4f097a3297
--- /dev/null
+++ b/pkg/registry/apis/folders/legacy_storage.go
@@ -0,0 +1,291 @@
+package folders
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"strings"
+
+	"k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	"github.com/grafana/grafana/pkg/apis/folder/v0alpha1"
+	"github.com/grafana/grafana/pkg/infra/appcontext"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+	"github.com/grafana/grafana/pkg/services/apiserver/storage/entity"
+	"github.com/grafana/grafana/pkg/services/apiserver/utils"
+	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/folder"
+	"github.com/grafana/grafana/pkg/util"
+)
+
+var (
+	_ rest.Scoper               = (*legacyStorage)(nil)
+	_ rest.SingularNameProvider = (*legacyStorage)(nil)
+	_ rest.Getter               = (*legacyStorage)(nil)
+	_ rest.Lister               = (*legacyStorage)(nil)
+	_ rest.Storage              = (*legacyStorage)(nil)
+	_ rest.Creater              = (*legacyStorage)(nil)
+	_ rest.Updater              = (*legacyStorage)(nil)
+	_ rest.GracefulDeleter      = (*legacyStorage)(nil)
+)
+
+type legacyStorage struct {
+	service        folder.Service
+	namespacer     request.NamespaceMapper
+	tableConverter rest.TableConvertor
+}
+
+func (s *legacyStorage) New() runtime.Object {
+	return resourceInfo.NewFunc()
+}
+
+func (s *legacyStorage) Destroy() {}
+
+func (s *legacyStorage) NamespaceScoped() bool {
+	return true // namespace == org
+}
+
+func (s *legacyStorage) GetSingularName() string {
+	return resourceInfo.GetSingularName()
+}
+
+func (s *legacyStorage) NewList() runtime.Object {
+	return resourceInfo.NewListFunc()
+}
+
+func (s *legacyStorage) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) {
+	return s.tableConverter.ConvertToTable(ctx, object, tableOptions)
+}
+
+func (s *legacyStorage) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) {
+	orgId, err := request.OrgIDForList(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	parentUID := ""
+	// translate grafana.app/* label selectors into field requirements
+	requirements, newSelector, err := entity.ReadLabelSelectors(options.LabelSelector)
+	if err != nil {
+		return nil, err
+	}
+	if requirements.Folder != nil {
+		parentUID = *requirements.Folder
+	}
+	// Update the selector to remove the unneeded requirements
+	options.LabelSelector = newSelector
+
+	paging, err := readContinueToken(options)
+	if err != nil {
+		return nil, err
+	}
+
+	user, err := appcontext.User(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	// When nested folders are not enabled, all folders are root folders
+	hits, err := s.service.GetChildren(ctx, &folder.GetChildrenQuery{
+		UID:          parentUID, // NOTE!  we should do a different query when nested folders are enabled!
+		SignedInUser: user,
+		Limit:        paging.page,
+		OrgID:        orgId,
+		Page:         paging.limit,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	list := &v0alpha1.FolderList{}
+	for _, v := range hits {
+		list.Items = append(list.Items, *convertToK8sResource(v, s.namespacer))
+	}
+	if len(list.Items) >= int(paging.limit) {
+		list.Continue = paging.GetNextPageToken()
+	}
+	return list, nil
+}
+
+func (s *legacyStorage) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) {
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, err
+	}
+
+	user, err := appcontext.User(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	dto, err := s.service.Get(ctx, &folder.GetFolderQuery{
+		SignedInUser: user,
+		UID:          &name,
+		OrgID:        info.OrgID,
+	})
+	if err != nil || dto == nil {
+		if errors.Is(err, dashboards.ErrFolderNotFound) || err == nil {
+			err = resourceInfo.NewNotFound(name)
+		}
+		return nil, err
+	}
+
+	return convertToK8sResource(dto, s.namespacer), nil
+}
+
+func (s *legacyStorage) Create(ctx context.Context,
+	obj runtime.Object,
+	createValidation rest.ValidateObjectFunc,
+	options *metav1.CreateOptions,
+) (runtime.Object, error) {
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, err
+	}
+
+	user, err := appcontext.User(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	p, ok := obj.(*v0alpha1.Folder)
+	if !ok {
+		return nil, fmt.Errorf("expected folder?")
+	}
+
+	// Simplify creating unique folder names with
+	if p.GenerateName != "" && strings.Contains(p.Spec.Title, "${RAND}") {
+		rand, _ := util.GetRandomString(10)
+		p.Spec.Title = strings.ReplaceAll(p.Spec.Title, "${RAND}", rand)
+	}
+
+	accessor, err := utils.MetaAccessor(p)
+	if err != nil {
+		return nil, err
+	}
+	parent := accessor.GetFolder()
+
+	out, err := s.service.Create(ctx, &folder.CreateFolderCommand{
+		SignedInUser: user,
+		UID:          p.Name,
+		Title:        p.Spec.Title,
+		Description:  p.Spec.Description,
+		OrgID:        info.OrgID,
+		ParentUID:    parent,
+	})
+	if err != nil {
+		return nil, err
+	}
+	return s.Get(ctx, out.UID, nil)
+}
+
+func (s *legacyStorage) Update(ctx context.Context,
+	name string,
+	objInfo rest.UpdatedObjectInfo,
+	createValidation rest.ValidateObjectFunc,
+	updateValidation rest.ValidateObjectUpdateFunc,
+	forceAllowCreate bool,
+	options *metav1.UpdateOptions,
+) (runtime.Object, bool, error) {
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, false, err
+	}
+
+	user, err := appcontext.User(ctx)
+	if err != nil {
+		return nil, false, err
+	}
+
+	created := false
+	oldObj, err := s.Get(ctx, name, nil)
+	if err != nil {
+		return oldObj, created, err
+	}
+
+	obj, err := objInfo.UpdatedObject(ctx, oldObj)
+	if err != nil {
+		return oldObj, created, err
+	}
+	f, ok := obj.(*v0alpha1.Folder)
+	if !ok {
+		return nil, created, fmt.Errorf("expected folder after update")
+	}
+	old, ok := oldObj.(*v0alpha1.Folder)
+	if !ok {
+		return nil, created, fmt.Errorf("expected old object to be a folder also")
+	}
+
+	mOld, _ := utils.MetaAccessor(old)
+	mNew, _ := utils.MetaAccessor(f)
+	oldParent := mOld.GetFolder()
+	newParent := mNew.GetFolder()
+	if oldParent != newParent {
+		_, err = s.service.Move(ctx, &folder.MoveFolderCommand{
+			SignedInUser: user,
+			UID:          name,
+			OrgID:        info.OrgID,
+			NewParentUID: newParent,
+		})
+		if err != nil {
+			return nil, created, fmt.Errorf("error changing parent folder spec")
+		}
+	}
+
+	changed := false
+	cmd := &folder.UpdateFolderCommand{
+		SignedInUser: user,
+		UID:          name,
+		OrgID:        info.OrgID,
+		Overwrite:    true,
+	}
+	if f.Spec.Title != old.Spec.Title {
+		cmd.NewTitle = &f.Spec.Title
+		changed = true
+	}
+	if f.Spec.Description != old.Spec.Description {
+		cmd.NewDescription = &f.Spec.Description
+		changed = true
+	}
+	if changed {
+		_, err = s.service.Update(ctx, cmd)
+		if err != nil {
+			return nil, false, err
+		}
+	}
+
+	r, err := s.Get(ctx, name, nil)
+	return r, created, err
+}
+
+// GracefulDeleter
+func (s *legacyStorage) Delete(ctx context.Context, name string, deleteValidation rest.ValidateObjectFunc, options *metav1.DeleteOptions) (runtime.Object, bool, error) {
+	v, err := s.Get(ctx, name, &metav1.GetOptions{})
+	if err != nil {
+		return v, false, err // includes the not-found error
+	}
+	user, err := appcontext.User(ctx)
+	if err != nil {
+		return nil, false, err
+	}
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, false, err
+	}
+	p, ok := v.(*v0alpha1.Folder)
+	if !ok {
+		return v, false, fmt.Errorf("expected a folder response from Get")
+	}
+	err = s.service.Delete(ctx, &folder.DeleteFolderCommand{
+		UID:          name,
+		OrgID:        info.OrgID,
+		SignedInUser: user,
+
+		// This would cascade delete into alert rules
+		ForceDeleteRules: false,
+	})
+	return p, true, err // true is instant delete
+}
diff --git a/pkg/registry/apis/folders/register.go b/pkg/registry/apis/folders/register.go
new file mode 100644
index 0000000000000..19cb2d71f48d5
--- /dev/null
+++ b/pkg/registry/apis/folders/register.go
@@ -0,0 +1,212 @@
+package folders
+
+import (
+	"context"
+	"fmt"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
+	"k8s.io/apiserver/pkg/authorization/authorizer"
+	"k8s.io/apiserver/pkg/registry/generic"
+	"k8s.io/apiserver/pkg/registry/rest"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+	common "k8s.io/kube-openapi/pkg/common"
+	"k8s.io/kube-openapi/pkg/spec3"
+
+	"github.com/grafana/grafana/pkg/apis/folder/v0alpha1"
+	"github.com/grafana/grafana/pkg/apiserver/builder"
+	grafanarest "github.com/grafana/grafana/pkg/apiserver/rest"
+	"github.com/grafana/grafana/pkg/infra/appcontext"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+	"github.com/grafana/grafana/pkg/services/apiserver/utils"
+	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/folder"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+var _ builder.APIGroupBuilder = (*FolderAPIBuilder)(nil)
+
+var resourceInfo = v0alpha1.FolderResourceInfo
+
+// This is used just so wire has something unique to return
+type FolderAPIBuilder struct {
+	gv            schema.GroupVersion
+	features      *featuremgmt.FeatureManager
+	namespacer    request.NamespaceMapper
+	folderSvc     folder.Service
+	accessControl accesscontrol.AccessControl
+}
+
+func RegisterAPIService(cfg *setting.Cfg,
+	features *featuremgmt.FeatureManager,
+	apiregistration builder.APIRegistrar,
+	folderSvc folder.Service,
+	accessControl accesscontrol.AccessControl,
+) *FolderAPIBuilder {
+	if !features.IsEnabledGlobally(featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs) {
+		return nil // skip registration unless opting into experimental apis
+	}
+
+	builder := &FolderAPIBuilder{
+		gv:            resourceInfo.GroupVersion(),
+		features:      features,
+		namespacer:    request.GetNamespaceMapper(cfg),
+		folderSvc:     folderSvc,
+		accessControl: accessControl,
+	}
+	apiregistration.RegisterAPI(builder)
+	return builder
+}
+
+func (b *FolderAPIBuilder) GetGroupVersion() schema.GroupVersion {
+	return b.gv
+}
+
+func addKnownTypes(scheme *runtime.Scheme, gv schema.GroupVersion) {
+	scheme.AddKnownTypes(gv,
+		&v0alpha1.Folder{},
+		&v0alpha1.FolderList{},
+		&v0alpha1.FolderInfoList{},
+		&v0alpha1.DescendantCounts{},
+		&v0alpha1.FolderAccessInfo{},
+	)
+}
+
+func (b *FolderAPIBuilder) InstallSchema(scheme *runtime.Scheme) error {
+	addKnownTypes(scheme, b.gv)
+
+	// Link this version to the internal representation.
+	// This is used for server-side-apply (PATCH), and avoids the error:
+	//   "no kind is registered for the type"
+	addKnownTypes(scheme, schema.GroupVersion{
+		Group:   b.gv.Group,
+		Version: runtime.APIVersionInternal,
+	})
+
+	// If multiple versions exist, then register conversions from zz_generated.conversion.go
+	// if err := playlist.RegisterConversions(scheme); err != nil {
+	//   return err
+	// }
+	metav1.AddToGroupVersion(scheme, b.gv)
+	return scheme.SetVersionPriority(b.gv)
+}
+
+func (b *FolderAPIBuilder) GetAPIGroupInfo(
+	scheme *runtime.Scheme,
+	codecs serializer.CodecFactory, // pointer?
+	optsGetter generic.RESTOptionsGetter,
+	dualWrite bool,
+) (*genericapiserver.APIGroupInfo, error) {
+	apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(v0alpha1.GROUP, scheme, metav1.ParameterCodec, codecs)
+
+	legacyStore := &legacyStorage{
+		service:    b.folderSvc,
+		namespacer: b.namespacer,
+		tableConverter: utils.NewTableConverter(
+			resourceInfo.GroupResource(),
+			[]metav1.TableColumnDefinition{
+				{Name: "Name", Type: "string", Format: "name"},
+				{Name: "Title", Type: "string", Format: "string", Description: "The display name"},
+				{Name: "Parent", Type: "string", Format: "string", Description: "Parent folder UID"},
+			},
+			func(obj any) ([]interface{}, error) {
+				r, ok := obj.(*v0alpha1.Folder)
+				if ok {
+					accessor, _ := utils.MetaAccessor(r)
+					return []interface{}{
+						r.Name,
+						r.Spec.Title,
+						accessor.GetFolder(),
+					}, nil
+				}
+				return nil, fmt.Errorf("expected resource or info")
+			}),
+	}
+
+	storage := map[string]rest.Storage{}
+	storage[resourceInfo.StoragePath()] = legacyStore
+	storage[resourceInfo.StoragePath("parents")] = &subParentsREST{b.folderSvc}
+	storage[resourceInfo.StoragePath("count")] = &subCountREST{b.folderSvc}
+	storage[resourceInfo.StoragePath("access")] = &subAccessREST{b.folderSvc}
+
+	// enable dual writes if a RESTOptionsGetter is provided
+	if dualWrite && optsGetter != nil {
+		store, err := newStorage(scheme, optsGetter, legacyStore)
+		if err != nil {
+			return nil, err
+		}
+		storage[resourceInfo.StoragePath()] = grafanarest.NewDualWriter(legacyStore, store)
+	}
+
+	apiGroupInfo.VersionedResourcesStorageMap[v0alpha1.VERSION] = storage
+	return &apiGroupInfo, nil
+}
+
+func (b *FolderAPIBuilder) GetOpenAPIDefinitions() common.GetOpenAPIDefinitions {
+	return v0alpha1.GetOpenAPIDefinitions
+}
+
+func (b *FolderAPIBuilder) GetAPIRoutes() *builder.APIRoutes {
+	return nil // no custom API routes
+}
+
+func (b *FolderAPIBuilder) PostProcessOpenAPI(oas *spec3.OpenAPI) (*spec3.OpenAPI, error) {
+	// The plugin description
+	oas.Info.Description = "Grafana folders"
+
+	// The root api URL
+	root := "/apis/" + b.GetGroupVersion().String() + "/"
+
+	// Hide the ability to list or watch across all tenants
+	delete(oas.Paths.Paths, root+v0alpha1.FolderResourceInfo.GroupResource().Resource)
+	delete(oas.Paths.Paths, root+"watch/"+v0alpha1.FolderResourceInfo.GroupResource().Resource)
+
+	// The root API discovery list
+	sub := oas.Paths.Paths[root]
+	if sub != nil && sub.Get != nil {
+		sub.Get.Tags = []string{"API Discovery"} // sorts first in the list
+	}
+	return oas, nil
+}
+
+func (b *FolderAPIBuilder) GetAuthorizer() authorizer.Authorizer {
+	return authorizer.AuthorizerFunc(
+		func(ctx context.Context, attr authorizer.Attributes) (authorized authorizer.Decision, reason string, err error) {
+			if !attr.IsResourceRequest() || attr.GetName() == "" {
+				return authorizer.DecisionNoOpinion, "", nil
+			}
+
+			// require a user
+			user, err := appcontext.User(ctx)
+			if err != nil {
+				return authorizer.DecisionDeny, "valid user is required", err
+			}
+
+			action := dashboards.ActionFoldersRead
+			scope := dashboards.ScopeFoldersProvider.GetResourceScopeUID(attr.GetName())
+
+			// "get" is used for sub-resources with GET http (parents, access, count)
+			switch attr.GetVerb() {
+			case "patch":
+				fallthrough
+			case "create":
+				fallthrough
+			case "update":
+				action = dashboards.ActionFoldersWrite
+			case "deletecollection":
+				fallthrough
+			case "delete":
+				action = dashboards.ActionFoldersDelete
+			}
+
+			ok, err := b.accessControl.Evaluate(ctx, user, accesscontrol.EvalPermission(action, scope))
+			if ok {
+				return authorizer.DecisionAllow, "", nil
+			}
+			return authorizer.DecisionDeny, "folder", err
+		})
+}
diff --git a/pkg/registry/apis/folders/storage.go b/pkg/registry/apis/folders/storage.go
new file mode 100644
index 0000000000000..1466a703f5d8d
--- /dev/null
+++ b/pkg/registry/apis/folders/storage.go
@@ -0,0 +1,40 @@
+package folders
+
+import (
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/generic"
+	genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"
+
+	"github.com/grafana/grafana/pkg/apis/folder/v0alpha1"
+	grafanaregistry "github.com/grafana/grafana/pkg/apiserver/registry/generic"
+	grafanarest "github.com/grafana/grafana/pkg/apiserver/rest"
+)
+
+var _ grafanarest.Storage = (*storage)(nil)
+
+type storage struct {
+	*genericregistry.Store
+}
+
+func newStorage(scheme *runtime.Scheme, optsGetter generic.RESTOptionsGetter, legacy *legacyStorage) (*storage, error) {
+	strategy := grafanaregistry.NewStrategy(scheme)
+
+	resource := v0alpha1.FolderResourceInfo
+	store := &genericregistry.Store{
+		NewFunc:                   resource.NewFunc,
+		NewListFunc:               resource.NewListFunc,
+		PredicateFunc:             grafanaregistry.Matcher,
+		DefaultQualifiedResource:  resource.GroupResource(),
+		SingularQualifiedResource: resourceInfo.SingularGroupResource(),
+		TableConvertor:            legacy.tableConverter,
+
+		CreateStrategy: strategy,
+		UpdateStrategy: strategy,
+		DeleteStrategy: strategy,
+	}
+	options := &generic.StoreOptions{RESTOptions: optsGetter, AttrFunc: grafanaregistry.GetAttrs}
+	if err := store.CompleteWithOptions(options); err != nil {
+		return nil, err
+	}
+	return &storage{Store: store}, nil
+}
diff --git a/pkg/registry/apis/folders/sub_access.go b/pkg/registry/apis/folders/sub_access.go
new file mode 100644
index 0000000000000..be506be9ece08
--- /dev/null
+++ b/pkg/registry/apis/folders/sub_access.go
@@ -0,0 +1,78 @@
+package folders
+
+import (
+	"context"
+	"net/http"
+
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	"github.com/grafana/grafana/pkg/apis/folder/v0alpha1"
+	"github.com/grafana/grafana/pkg/infra/appcontext"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+	"github.com/grafana/grafana/pkg/services/folder"
+	"github.com/grafana/grafana/pkg/services/guardian"
+)
+
+type subAccessREST struct {
+	service folder.Service
+}
+
+var _ = rest.Connecter(&subAccessREST{})
+var _ = rest.StorageMetadata(&subAccessREST{})
+
+func (r *subAccessREST) New() runtime.Object {
+	return &v0alpha1.FolderAccessInfo{}
+}
+
+func (r *subAccessREST) Destroy() {
+}
+
+func (r *subAccessREST) ConnectMethods() []string {
+	return []string{"GET"}
+}
+
+func (r *subAccessREST) ProducesMIMETypes(verb string) []string {
+	return nil
+}
+
+func (r *subAccessREST) ProducesObject(verb string) interface{} {
+	return &v0alpha1.FolderAccessInfo{}
+}
+
+func (r *subAccessREST) NewConnectOptions() (runtime.Object, bool, string) {
+	return nil, false, "" // true means you can use the trailing path as a variable
+}
+
+func (r *subAccessREST) Connect(ctx context.Context, name string, opts runtime.Object, responder rest.Responder) (http.Handler, error) {
+	ns, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, err
+	}
+	user, err := appcontext.User(ctx)
+	if err != nil {
+		return nil, err
+	}
+	// Can view is managed here (and in the Authorizer)
+	f, err := r.service.Get(ctx, &folder.GetFolderQuery{
+		UID:          &name,
+		OrgID:        ns.OrgID,
+		SignedInUser: user,
+	})
+	if err != nil {
+		return nil, err
+	}
+	guardian, err := guardian.NewByFolder(ctx, f, ns.OrgID, user)
+	if err != nil {
+		return nil, err
+	}
+
+	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		access := &v0alpha1.FolderAccessInfo{}
+		access.CanEdit, _ = guardian.CanEdit()
+		access.CanSave, _ = guardian.CanSave()
+		access.CanAdmin, _ = guardian.CanAdmin()
+		access.CanDelete, _ = guardian.CanDelete()
+		responder.Object(http.StatusOK, access)
+	}), nil
+}
diff --git a/pkg/registry/apis/folders/sub_count.go b/pkg/registry/apis/folders/sub_count.go
new file mode 100644
index 0000000000000..f3b7d7e61b1b1
--- /dev/null
+++ b/pkg/registry/apis/folders/sub_count.go
@@ -0,0 +1,75 @@
+package folders
+
+import (
+	"context"
+	"net/http"
+
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	"github.com/grafana/grafana/pkg/apis/folder/v0alpha1"
+	"github.com/grafana/grafana/pkg/infra/appcontext"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+	"github.com/grafana/grafana/pkg/services/folder"
+)
+
+type subCountREST struct {
+	service folder.Service
+}
+
+var (
+	_ = rest.Connecter(&subCountREST{})
+	_ = rest.StorageMetadata(&subCountREST{})
+)
+
+func (r *subCountREST) New() runtime.Object {
+	return &v0alpha1.DescendantCounts{}
+}
+
+func (r *subCountREST) Destroy() {
+}
+
+func (r *subCountREST) ConnectMethods() []string {
+	return []string{"GET"}
+}
+
+func (r *subCountREST) ProducesMIMETypes(verb string) []string {
+	return nil
+}
+
+func (r *subCountREST) ProducesObject(verb string) interface{} {
+	return &v0alpha1.DescendantCounts{}
+}
+
+func (r *subCountREST) NewConnectOptions() (runtime.Object, bool, string) {
+	return nil, false, "" // true means you can use the trailing path as a variable
+}
+
+func (r *subCountREST) Connect(ctx context.Context, name string, opts runtime.Object, responder rest.Responder) (http.Handler, error) {
+	user, err := appcontext.User(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		ns, err := request.NamespaceInfoFrom(ctx, true)
+		if err != nil {
+			responder.Error(err)
+			return
+		}
+
+		counts, err := r.service.GetDescendantCounts(ctx, &folder.GetDescendantCountsQuery{
+			UID:          &name,
+			OrgID:        ns.OrgID,
+			SignedInUser: user,
+		})
+		if err != nil {
+			responder.Error(err)
+			return
+		}
+
+		responder.Object(http.StatusOK, &v0alpha1.DescendantCounts{
+			Counts: counts,
+		})
+	}), nil
+}
diff --git a/pkg/registry/apis/folders/sub_parents.go b/pkg/registry/apis/folders/sub_parents.go
new file mode 100644
index 0000000000000..f7761d075b1e6
--- /dev/null
+++ b/pkg/registry/apis/folders/sub_parents.go
@@ -0,0 +1,74 @@
+package folders
+
+import (
+	"context"
+	"net/http"
+
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	"github.com/grafana/grafana/pkg/apis/folder/v0alpha1"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+	"github.com/grafana/grafana/pkg/services/folder"
+)
+
+type subParentsREST struct {
+	service folder.Service
+}
+
+var _ = rest.Connecter(&subParentsREST{})
+var _ = rest.StorageMetadata(&subParentsREST{})
+
+func (r *subParentsREST) New() runtime.Object {
+	return &v0alpha1.FolderInfoList{}
+}
+
+func (r *subParentsREST) Destroy() {
+}
+
+func (r *subParentsREST) ConnectMethods() []string {
+	return []string{"GET"}
+}
+
+func (r *subParentsREST) ProducesMIMETypes(verb string) []string {
+	return nil
+}
+
+func (r *subParentsREST) ProducesObject(verb string) interface{} {
+	return &v0alpha1.FolderInfoList{}
+}
+
+func (r *subParentsREST) NewConnectOptions() (runtime.Object, bool, string) {
+	return nil, false, "" // true means you can use the trailing path as a variable
+}
+
+func (r *subParentsREST) Connect(ctx context.Context, name string, opts runtime.Object, responder rest.Responder) (http.Handler, error) {
+	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		ns, err := request.NamespaceInfoFrom(ctx, true)
+		if err != nil {
+			responder.Error(err)
+			return
+		}
+
+		parents, err := r.service.GetParents(ctx, folder.GetParentsQuery{
+			UID:   name,
+			OrgID: ns.OrgID,
+		})
+		if err != nil {
+			responder.Error(err)
+			return
+		}
+
+		info := &v0alpha1.FolderInfoList{
+			Items: make([]v0alpha1.FolderInfo, 0),
+		}
+		for _, parent := range parents {
+			info.Items = append(info.Items, v0alpha1.FolderInfo{
+				UID:    parent.UID,
+				Title:  parent.Title,
+				Parent: parent.ParentUID,
+			})
+		}
+		responder.Object(http.StatusOK, info)
+	}), nil
+}
diff --git a/pkg/registry/apis/peakq/register.go b/pkg/registry/apis/peakq/register.go
new file mode 100644
index 0000000000000..076b3b427a0fc
--- /dev/null
+++ b/pkg/registry/apis/peakq/register.go
@@ -0,0 +1,177 @@
+package peakq
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
+	"k8s.io/apiserver/pkg/authorization/authorizer"
+	"k8s.io/apiserver/pkg/registry/generic"
+	"k8s.io/apiserver/pkg/registry/rest"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+	"k8s.io/kube-openapi/pkg/common"
+	"k8s.io/kube-openapi/pkg/spec3"
+	"k8s.io/kube-openapi/pkg/validation/spec"
+
+	peakq "github.com/grafana/grafana/pkg/apis/peakq/v0alpha1"
+	"github.com/grafana/grafana/pkg/apiserver/builder"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+)
+
+var _ builder.APIGroupBuilder = (*PeakQAPIBuilder)(nil)
+
+// This is used just so wire has something unique to return
+type PeakQAPIBuilder struct{}
+
+func NewPeakQAPIBuilder() *PeakQAPIBuilder {
+	return &PeakQAPIBuilder{}
+}
+
+func RegisterAPIService(features featuremgmt.FeatureToggles, apiregistration builder.APIRegistrar) *PeakQAPIBuilder {
+	if !features.IsEnabledGlobally(featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs) {
+		return nil // skip registration unless opting into experimental apis
+	}
+	builder := NewPeakQAPIBuilder()
+	apiregistration.RegisterAPI(NewPeakQAPIBuilder())
+	return builder
+}
+
+func (b *PeakQAPIBuilder) GetAuthorizer() authorizer.Authorizer {
+	return nil // default authorizer is fine
+}
+
+func (b *PeakQAPIBuilder) GetGroupVersion() schema.GroupVersion {
+	return peakq.SchemeGroupVersion
+}
+
+func (b *PeakQAPIBuilder) InstallSchema(scheme *runtime.Scheme) error {
+	gv := peakq.SchemeGroupVersion
+	err := peakq.AddToScheme(scheme)
+	if err != nil {
+		return err
+	}
+
+	// Link this version to the internal representation.
+	// This is used for server-side-apply (PATCH), and avoids the error:
+	//   "no kind is registered for the type"
+	// addKnownTypes(scheme, schema.GroupVersion{
+	// 	Group:   peakq.GROUP,
+	// 	Version: runtime.APIVersionInternal,
+	// })
+	metav1.AddToGroupVersion(scheme, gv)
+	return scheme.SetVersionPriority(gv)
+}
+
+func (b *PeakQAPIBuilder) GetAPIGroupInfo(
+	scheme *runtime.Scheme,
+	codecs serializer.CodecFactory,
+	optsGetter generic.RESTOptionsGetter,
+	_ bool, // dual write (not relevant)
+) (*genericapiserver.APIGroupInfo, error) {
+	apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(peakq.GROUP, scheme, metav1.ParameterCodec, codecs)
+
+	resourceInfo := peakq.QueryTemplateResourceInfo
+	storage := map[string]rest.Storage{}
+	peakqStorage, err := newStorage(scheme, optsGetter)
+	if err != nil {
+		return nil, err
+	}
+	storage[resourceInfo.StoragePath()] = peakqStorage
+	storage[resourceInfo.StoragePath("render")] = &renderREST{
+		getter: peakqStorage,
+	}
+
+	apiGroupInfo.VersionedResourcesStorageMap[peakq.VERSION] = storage
+	return &apiGroupInfo, nil
+}
+
+func (b *PeakQAPIBuilder) GetOpenAPIDefinitions() common.GetOpenAPIDefinitions {
+	return peakq.GetOpenAPIDefinitions
+}
+
+// NOT A GREAT APPROACH... BUT will make a UI for statically defined
+func (b *PeakQAPIBuilder) GetAPIRoutes() *builder.APIRoutes {
+	defs := peakq.GetOpenAPIDefinitions(func(path string) spec.Ref { return spec.Ref{} })
+	renderedQuerySchema := defs["github.com/grafana/grafana/pkg/apis/peakq/v0alpha1.RenderedQuery"].Schema
+	queryTemplateSpecSchema := defs["github.com/grafana/grafana/pkg/apis/peakq/v0alpha1.QueryTemplateSpec"].Schema
+
+	params := []*spec3.Parameter{
+		{
+			ParameterProps: spec3.ParameterProps{
+				// Arbitrary name. It won't appear in the request URL,
+				// but will be used in code generated from this OAS spec
+				Name:        "variables",
+				In:          "query",
+				Schema:      spec.MapProperty(spec.ArrayProperty(spec.StringProperty())),
+				Style:       "form",
+				Explode:     true,
+				Description: "Each variable is prefixed with var-{variable}={value}",
+				Example: map[string][]string{
+					"var-metricName": {"up"},
+					"var-another":    {"first", "second"},
+				},
+			},
+		},
+	}
+	return &builder.APIRoutes{
+		Root: []builder.APIRouteHandler{
+			{
+				Path: "render",
+				Spec: &spec3.PathProps{
+					Summary:     "an example at the root level",
+					Description: "longer description here?",
+					Post: &spec3.Operation{
+						OperationProps: spec3.OperationProps{
+							Parameters: params,
+							RequestBody: &spec3.RequestBody{
+								RequestBodyProps: spec3.RequestBodyProps{
+									Content: map[string]*spec3.MediaType{
+										"application/json": {
+											MediaTypeProps: spec3.MediaTypeProps{
+												Schema: &queryTemplateSpecSchema,
+												//	Example: basicTemplateSpec,
+												Examples: map[string]*spec3.Example{
+													"test": {
+														ExampleProps: spec3.ExampleProps{
+															Summary: "hello",
+															Value:   basicTemplateSpec,
+														},
+													},
+													"test2": {
+														ExampleProps: spec3.ExampleProps{
+															Summary: "hello2",
+															Value:   basicTemplateSpec,
+														},
+													},
+												},
+											},
+										},
+									},
+								},
+							},
+							Responses: &spec3.Responses{
+								ResponsesProps: spec3.ResponsesProps{
+									StatusCodeResponses: map[int]*spec3.Response{
+										200: {
+											ResponseProps: spec3.ResponseProps{
+												Description: "OK",
+												Content: map[string]*spec3.MediaType{
+													"application/json": {
+														MediaTypeProps: spec3.MediaTypeProps{
+															Schema: &renderedQuerySchema,
+														},
+													},
+												},
+											},
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+				Handler: renderPOSTHandler,
+			},
+		},
+	}
+}
diff --git a/pkg/registry/apis/peakq/render.go b/pkg/registry/apis/peakq/render.go
new file mode 100644
index 0000000000000..fd0791b49057e
--- /dev/null
+++ b/pkg/registry/apis/peakq/render.go
@@ -0,0 +1,107 @@
+package peakq
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"net/url"
+	"strings"
+
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	peakq "github.com/grafana/grafana/pkg/apis/peakq/v0alpha1"
+	"github.com/grafana/grafana/pkg/apis/query/v0alpha1/template"
+)
+
+type renderREST struct {
+	getter rest.Getter
+}
+
+var _ = rest.Connecter(&renderREST{})
+
+func (r *renderREST) New() runtime.Object {
+	return &peakq.RenderedQuery{}
+}
+
+func (r *renderREST) Destroy() {
+}
+
+func (r *renderREST) ConnectMethods() []string {
+	return []string{"GET"}
+}
+
+func (r *renderREST) NewConnectOptions() (runtime.Object, bool, string) {
+	return nil, false, "" // true means you can use the trailing path as a variable
+}
+
+func (r *renderREST) Connect(ctx context.Context, name string, opts runtime.Object, responder rest.Responder) (http.Handler, error) {
+	obj, err := r.getter.Get(ctx, name, &v1.GetOptions{})
+	if err != nil {
+		return nil, err
+	}
+	t, ok := obj.(*peakq.QueryTemplate)
+	if !ok {
+		return nil, fmt.Errorf("expected template")
+	}
+
+	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		input, err := makeVarMapFromParams(req.URL.Query())
+		if err != nil {
+			responder.Error(err)
+			return
+		}
+		out, err := template.RenderTemplate(t.Spec, input)
+		if err != nil {
+			responder.Error(fmt.Errorf("failed to render: %w", err))
+			return
+		}
+		responder.Object(http.StatusOK, &peakq.RenderedQuery{
+			Targets: out,
+		})
+	}), nil
+}
+
+func renderPOSTHandler(w http.ResponseWriter, req *http.Request) {
+	input, err := makeVarMapFromParams(req.URL.Query())
+	if err != nil {
+		_, _ = w.Write([]byte("ERROR: " + err.Error()))
+		w.WriteHeader(500)
+		return
+	}
+
+	var qT peakq.QueryTemplate
+	err = json.NewDecoder(req.Body).Decode(&qT.Spec)
+	if err != nil {
+		_, _ = w.Write([]byte("ERROR: " + err.Error()))
+		w.WriteHeader(500)
+		return
+	}
+	results, err := template.RenderTemplate(qT.Spec, input)
+	if err != nil {
+		_, _ = w.Write([]byte("ERROR: " + err.Error()))
+		w.WriteHeader(500)
+		return
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(http.StatusOK)
+	_ = json.NewEncoder(w).Encode(peakq.RenderedQuery{
+		Targets: results,
+	})
+}
+
+// Replicate the grafana dashboard URL syntax
+// &var-abc=1&var=abc=2&var-xyz=3...
+func makeVarMapFromParams(v url.Values) (map[string][]string, error) {
+	input := make(map[string][]string, len(v))
+	for key, vals := range v {
+		if !strings.HasPrefix(key, "var-") {
+			continue
+		}
+		input[key[4:]] = vals
+	}
+	return input, nil
+}
diff --git a/pkg/registry/apis/peakq/render_examples.go b/pkg/registry/apis/peakq/render_examples.go
new file mode 100644
index 0000000000000..0d78ec007eb55
--- /dev/null
+++ b/pkg/registry/apis/peakq/render_examples.go
@@ -0,0 +1,74 @@
+package peakq
+
+import (
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	apidata "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+
+	"github.com/grafana/grafana/pkg/apis/query/v0alpha1/template"
+)
+
+var basicTemplateSpec = template.QueryTemplate{
+	Title: "Test",
+	Variables: []template.TemplateVariable{
+		{
+			Key:           "metricName",
+			DefaultValues: []string{`down`},
+		},
+	},
+	Targets: []template.Target{
+		{
+			DataType: data.FrameTypeUnknown,
+			//DataTypeVersion: data.FrameTypeVersion{0, 0},
+			Variables: map[string][]template.VariableReplacement{
+				"metricName": {
+					{
+						Path: "$.expr",
+						Position: &template.Position{
+							Start: 0,
+							End:   10,
+						},
+					},
+					{
+						Path: "$.expr",
+						Position: &template.Position{
+							Start: 13,
+							End:   23,
+						},
+					},
+				},
+			},
+
+			Properties: apidata.NewDataQuery(map[string]any{
+				"refId": "A", // TODO: Set when Where?
+				"datasource": map[string]any{
+					"type": "prometheus",
+					"uid":  "foo", // TODO: Probably a default templating thing to set this.
+				},
+				"editorMode": "builder",
+				"expr":       "metricName + metricName + 42",
+				"instant":    true,
+				"range":      false,
+				"exemplar":   false,
+			}),
+		},
+	},
+}
+
+var basicTemplateRenderedTargets = []template.Target{
+	{
+		DataType: data.FrameTypeUnknown,
+		//DataTypeVersion: data.FrameTypeVersion{0, 0},
+		Properties: apidata.NewDataQuery(map[string]any{
+			"refId": "A", // TODO: Set when Where?
+			"datasource": map[string]any{
+				"type": "prometheus",
+				"uid":  "foo", // TODO: Probably a default templating thing to set this.
+			},
+			"editorMode": "builder",
+			"expr":       "up + up + 42",
+			"instant":    true,
+			"range":      false,
+			"exemplar":   false,
+		}),
+	},
+}
diff --git a/pkg/registry/apis/peakq/render_examples_test.go b/pkg/registry/apis/peakq/render_examples_test.go
new file mode 100644
index 0000000000000..1b4b2d53a8f9f
--- /dev/null
+++ b/pkg/registry/apis/peakq/render_examples_test.go
@@ -0,0 +1,21 @@
+package peakq
+
+import (
+	"encoding/json"
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/apis/query/v0alpha1/template"
+)
+
+func TestRender(t *testing.T) {
+	rT, err := template.RenderTemplate(basicTemplateSpec, map[string][]string{"metricName": {"up"}})
+	require.NoError(t, err)
+	require.Equal(t,
+		basicTemplateRenderedTargets[0].Properties.GetString("expr"),
+		rT[0].Properties.GetString("expr"))
+	b, _ := json.MarshalIndent(basicTemplateSpec, "", " ")
+	fmt.Println(string(b))
+}
diff --git a/pkg/registry/apis/peakq/storage.go b/pkg/registry/apis/peakq/storage.go
new file mode 100644
index 0000000000000..c3bd23aac3678
--- /dev/null
+++ b/pkg/registry/apis/peakq/storage.go
@@ -0,0 +1,62 @@
+package peakq
+
+import (
+	"fmt"
+	"time"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/generic"
+	genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"
+
+	peakq "github.com/grafana/grafana/pkg/apis/peakq/v0alpha1"
+	grafanaregistry "github.com/grafana/grafana/pkg/apiserver/registry/generic"
+	grafanarest "github.com/grafana/grafana/pkg/apiserver/rest"
+	"github.com/grafana/grafana/pkg/services/apiserver/utils"
+)
+
+var _ grafanarest.Storage = (*storage)(nil)
+
+type storage struct {
+	*genericregistry.Store
+}
+
+func newStorage(scheme *runtime.Scheme, optsGetter generic.RESTOptionsGetter) (*storage, error) {
+	strategy := grafanaregistry.NewStrategy(scheme)
+
+	resourceInfo := peakq.QueryTemplateResourceInfo
+	store := &genericregistry.Store{
+		NewFunc:                   resourceInfo.NewFunc,
+		NewListFunc:               resourceInfo.NewListFunc,
+		PredicateFunc:             grafanaregistry.Matcher,
+		DefaultQualifiedResource:  resourceInfo.GroupResource(),
+		SingularQualifiedResource: resourceInfo.SingularGroupResource(),
+		TableConvertor: utils.NewTableConverter(
+			resourceInfo.GroupResource(),
+			[]metav1.TableColumnDefinition{
+				{Name: "Name", Type: "string", Format: "name"},
+				{Name: "Title", Type: "string"},
+				{Name: "Created At", Type: "date"},
+			},
+			func(obj any) ([]interface{}, error) {
+				m, ok := obj.(*peakq.QueryTemplate)
+				if !ok {
+					return nil, fmt.Errorf("expected query template")
+				}
+				return []interface{}{
+					m.Name,
+					m.Spec.Title,
+					m.CreationTimestamp.UTC().Format(time.RFC3339),
+				}, nil
+			},
+		),
+		CreateStrategy: strategy,
+		UpdateStrategy: strategy,
+		DeleteStrategy: strategy,
+	}
+	options := &generic.StoreOptions{RESTOptions: optsGetter, AttrFunc: grafanaregistry.GetAttrs}
+	if err := store.CompleteWithOptions(options); err != nil {
+		return nil, err
+	}
+	return &storage{Store: store}, nil
+}
diff --git a/pkg/registry/apis/playlist/conversions.go b/pkg/registry/apis/playlist/conversions.go
new file mode 100644
index 0000000000000..c301cf9c04f21
--- /dev/null
+++ b/pkg/registry/apis/playlist/conversions.go
@@ -0,0 +1,139 @@
+package playlist
+
+import (
+	"encoding/json"
+	"fmt"
+	"strconv"
+	"time"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/types"
+
+	playlist "github.com/grafana/grafana/pkg/apis/playlist/v0alpha1"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+	"github.com/grafana/grafana/pkg/services/apiserver/utils"
+	playlistsvc "github.com/grafana/grafana/pkg/services/playlist"
+)
+
+func LegacyUpdateCommandToUnstructured(cmd playlistsvc.UpdatePlaylistCommand) unstructured.Unstructured {
+	items := []map[string]string{}
+	for _, item := range cmd.Items {
+		items = append(items, map[string]string{
+			"type":  item.Type,
+			"value": item.Value,
+		})
+	}
+	obj := unstructured.Unstructured{
+		Object: map[string]interface{}{
+			"spec": map[string]interface{}{
+				"title":    cmd.Name,
+				"interval": cmd.Interval,
+				"items":    items,
+			},
+		},
+	}
+	obj.SetName(cmd.UID)
+	return obj
+}
+
+func UnstructuredToLegacyPlaylist(item unstructured.Unstructured) *playlistsvc.Playlist {
+	spec := item.Object["spec"].(map[string]any)
+	return &playlistsvc.Playlist{
+		UID:      item.GetName(),
+		Name:     spec["title"].(string),
+		Interval: spec["interval"].(string),
+		Id:       getLegacyID(&item),
+	}
+}
+
+func UnstructuredToLegacyPlaylistDTO(item unstructured.Unstructured) *playlistsvc.PlaylistDTO {
+	spec := item.Object["spec"].(map[string]any)
+	dto := &playlistsvc.PlaylistDTO{
+		Uid:      item.GetName(),
+		Name:     spec["title"].(string),
+		Interval: spec["interval"].(string),
+		Id:       getLegacyID(&item),
+	}
+	items := spec["items"]
+	if items != nil {
+		b, err := json.Marshal(items)
+		if err == nil {
+			_ = json.Unmarshal(b, &dto.Items)
+		}
+	}
+	return dto
+}
+
+func convertToK8sResource(v *playlistsvc.PlaylistDTO, namespacer request.NamespaceMapper) *playlist.Playlist {
+	spec := playlist.Spec{
+		Title:    v.Name,
+		Interval: v.Interval,
+	}
+	for _, item := range v.Items {
+		spec.Items = append(spec.Items, playlist.Item{
+			Type:  playlist.ItemType(item.Type),
+			Value: item.Value,
+		})
+	}
+
+	p := &playlist.Playlist{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:              v.Uid,
+			UID:               types.UID(v.Uid),
+			ResourceVersion:   fmt.Sprintf("%d", v.UpdatedAt),
+			CreationTimestamp: metav1.NewTime(time.UnixMilli(v.CreatedAt)),
+			Namespace:         namespacer(v.OrgID),
+		},
+		Spec: spec,
+	}
+	meta, err := utils.MetaAccessor(p)
+	if err == nil {
+		meta.SetUpdatedTimestampMillis(v.UpdatedAt)
+		if v.Id > 0 {
+			meta.SetOriginInfo(&utils.ResourceOriginInfo{
+				Name: "SQL",
+				Key:  fmt.Sprintf("%d", v.Id),
+			})
+		}
+	}
+
+	p.UID = utils.CalculateClusterWideUID(p)
+	return p
+}
+
+func convertToLegacyUpdateCommand(p *playlist.Playlist, orgId int64) (*playlistsvc.UpdatePlaylistCommand, error) {
+	spec := p.Spec
+	cmd := &playlistsvc.UpdatePlaylistCommand{
+		UID:      p.Name,
+		Name:     spec.Title,
+		Interval: spec.Interval,
+		OrgId:    orgId,
+	}
+	for _, item := range spec.Items {
+		if item.Type == playlist.ItemTypeDashboardById {
+			return nil, fmt.Errorf("unsupported item type: %s", item.Type)
+		}
+		cmd.Items = append(cmd.Items, playlistsvc.PlaylistItem{
+			Type:  string(item.Type),
+			Value: item.Value,
+		})
+	}
+	return cmd, nil
+}
+
+// Read legacy ID from metadata annotations
+func getLegacyID(item *unstructured.Unstructured) int64 {
+	meta, err := utils.MetaAccessor(item)
+	if err != nil {
+		return 0
+	}
+	info, _ := meta.GetOriginInfo()
+	if info != nil && info.Name == "SQL" {
+		i, err := strconv.ParseInt(info.Key, 10, 64)
+		if err == nil {
+			return i
+		}
+	}
+	return 0
+}
diff --git a/pkg/apis/playlist/v0alpha1/conversions_test.go b/pkg/registry/apis/playlist/conversions_test.go
similarity index 75%
rename from pkg/apis/playlist/v0alpha1/conversions_test.go
rename to pkg/registry/apis/playlist/conversions_test.go
index ce13fdd2ea0d7..831885720309f 100644
--- a/pkg/apis/playlist/v0alpha1/conversions_test.go
+++ b/pkg/registry/apis/playlist/conversions_test.go
@@ -1,4 +1,4 @@
-package v0alpha1
+package playlist
 
 import (
 	"encoding/json"
@@ -6,12 +6,13 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/grafana/pkg/services/grafana-apiserver/endpoints/request"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
 	"github.com/grafana/grafana/pkg/services/playlist"
 )
 
 func TestPlaylistConversion(t *testing.T) {
 	src := &playlist.PlaylistDTO{
+		Id:        123,
 		OrgID:     3,
 		Uid:       "abc",         // becomes k8s name
 		Name:      "MyPlaylists", // becomes title
@@ -32,14 +33,19 @@ func TestPlaylistConversion(t *testing.T) {
 
 	out, err := json.MarshalIndent(dst, "", "  ")
 	require.NoError(t, err)
-	//fmt.Printf("%s", string(out))
+	// fmt.Printf("%s", string(out))
 	require.JSONEq(t, `{
 		"metadata": {
 		  "name": "abc",
 		  "namespace": "org-3",
-		  "uid": "abc",
+		  "uid": "f0zxjm7ApxOafsn6DLQZ4Ezp78WRUsZqSc4taOSHq1gX",
 		  "resourceVersion": "54321",
-		  "creationTimestamp": "1970-01-01T00:00:12Z"
+		  "creationTimestamp": "1970-01-01T00:00:12Z",
+		  "annotations": {
+			"grafana.app/originKey": "123",
+			"grafana.app/originName": "SQL",
+			"grafana.app/updatedTimestamp": "1970-01-01T00:00:54Z"
+		  }
 		},
 		"spec": {
 		  "title": "MyPlaylists",
diff --git a/pkg/registry/apis/playlist/legacy_storage.go b/pkg/registry/apis/playlist/legacy_storage.go
new file mode 100644
index 0000000000000..316c0f5246296
--- /dev/null
+++ b/pkg/registry/apis/playlist/legacy_storage.go
@@ -0,0 +1,188 @@
+package playlist
+
+import (
+	"context"
+	"errors"
+	"fmt"
+
+	"k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	playlist "github.com/grafana/grafana/pkg/apis/playlist/v0alpha1"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+	playlistsvc "github.com/grafana/grafana/pkg/services/playlist"
+)
+
+var (
+	_ rest.Scoper               = (*legacyStorage)(nil)
+	_ rest.SingularNameProvider = (*legacyStorage)(nil)
+	_ rest.Getter               = (*legacyStorage)(nil)
+	_ rest.Lister               = (*legacyStorage)(nil)
+	_ rest.Storage              = (*legacyStorage)(nil)
+	_ rest.Creater              = (*legacyStorage)(nil)
+	_ rest.Updater              = (*legacyStorage)(nil)
+	_ rest.GracefulDeleter      = (*legacyStorage)(nil)
+)
+
+var resourceInfo = playlist.PlaylistResourceInfo
+
+type legacyStorage struct {
+	service        playlistsvc.Service
+	namespacer     request.NamespaceMapper
+	tableConverter rest.TableConvertor
+}
+
+func (s *legacyStorage) New() runtime.Object {
+	return resourceInfo.NewFunc()
+}
+
+func (s *legacyStorage) Destroy() {}
+
+func (s *legacyStorage) NamespaceScoped() bool {
+	return true // namespace == org
+}
+
+func (s *legacyStorage) GetSingularName() string {
+	return resourceInfo.GetSingularName()
+}
+
+func (s *legacyStorage) NewList() runtime.Object {
+	return resourceInfo.NewListFunc()
+}
+
+func (s *legacyStorage) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) {
+	return s.tableConverter.ConvertToTable(ctx, object, tableOptions)
+}
+
+func (s *legacyStorage) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) {
+	orgId, err := request.OrgIDForList(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	res, err := s.service.List(ctx, orgId)
+	if err != nil {
+		return nil, err
+	}
+
+	list := &playlist.PlaylistList{}
+	for idx := range res {
+		list.Items = append(list.Items, *convertToK8sResource(&res[idx], s.namespacer))
+	}
+	return list, nil
+}
+
+func (s *legacyStorage) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) {
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, err
+	}
+
+	dto, err := s.service.Get(ctx, &playlistsvc.GetPlaylistByUidQuery{
+		UID:   name,
+		OrgId: info.OrgID,
+	})
+	if err != nil || dto == nil {
+		if errors.Is(err, playlistsvc.ErrPlaylistNotFound) || err == nil {
+			err = resourceInfo.NewNotFound(name)
+		}
+		return nil, err
+	}
+
+	return convertToK8sResource(dto, s.namespacer), nil
+}
+
+func (s *legacyStorage) Create(ctx context.Context,
+	obj runtime.Object,
+	createValidation rest.ValidateObjectFunc,
+	options *metav1.CreateOptions,
+) (runtime.Object, error) {
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, err
+	}
+
+	p, ok := obj.(*playlist.Playlist)
+	if !ok {
+		return nil, fmt.Errorf("expected playlist?")
+	}
+	cmd, err := convertToLegacyUpdateCommand(p, info.OrgID)
+	if err != nil {
+		return nil, err
+	}
+	out, err := s.service.Create(ctx, &playlistsvc.CreatePlaylistCommand{
+		UID:      p.Name,
+		Name:     cmd.Name,
+		Interval: cmd.Interval,
+		Items:    cmd.Items,
+		OrgId:    cmd.OrgId,
+	})
+	if err != nil {
+		return nil, err
+	}
+	return s.Get(ctx, out.UID, nil)
+}
+
+func (s *legacyStorage) Update(ctx context.Context,
+	name string,
+	objInfo rest.UpdatedObjectInfo,
+	createValidation rest.ValidateObjectFunc,
+	updateValidation rest.ValidateObjectUpdateFunc,
+	forceAllowCreate bool,
+	options *metav1.UpdateOptions,
+) (runtime.Object, bool, error) {
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, false, err
+	}
+
+	created := false
+	old, err := s.Get(ctx, name, nil)
+	if err != nil {
+		return old, created, err
+	}
+
+	obj, err := objInfo.UpdatedObject(ctx, old)
+	if err != nil {
+		return old, created, err
+	}
+	p, ok := obj.(*playlist.Playlist)
+	if !ok {
+		return nil, created, fmt.Errorf("expected playlist after update")
+	}
+
+	cmd, err := convertToLegacyUpdateCommand(p, info.OrgID)
+	if err != nil {
+		return old, created, err
+	}
+	_, err = s.service.Update(ctx, cmd)
+	if err != nil {
+		return nil, false, err
+	}
+
+	r, err := s.Get(ctx, name, nil)
+	return r, created, err
+}
+
+// GracefulDeleter
+func (s *legacyStorage) Delete(ctx context.Context, name string, deleteValidation rest.ValidateObjectFunc, options *metav1.DeleteOptions) (runtime.Object, bool, error) {
+	v, err := s.Get(ctx, name, &metav1.GetOptions{})
+	if err != nil {
+		return v, false, err // includes the not-found error
+	}
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, false, err
+	}
+	p, ok := v.(*playlist.Playlist)
+	if !ok {
+		return v, false, fmt.Errorf("expected a playlist response from Get")
+	}
+	err = s.service.Delete(ctx, &playlistsvc.DeletePlaylistCommand{
+		UID:   name,
+		OrgId: info.OrgID,
+	})
+	return p, true, err // true is instant delete
+}
diff --git a/pkg/registry/apis/playlist/register.go b/pkg/registry/apis/playlist/register.go
new file mode 100644
index 0000000000000..59b10b2ccae52
--- /dev/null
+++ b/pkg/registry/apis/playlist/register.go
@@ -0,0 +1,138 @@
+package playlist
+
+import (
+	"fmt"
+	"time"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
+	"k8s.io/apiserver/pkg/authorization/authorizer"
+	"k8s.io/apiserver/pkg/registry/generic"
+	"k8s.io/apiserver/pkg/registry/rest"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+	common "k8s.io/kube-openapi/pkg/common"
+
+	playlist "github.com/grafana/grafana/pkg/apis/playlist/v0alpha1"
+	"github.com/grafana/grafana/pkg/apiserver/builder"
+	grafanarest "github.com/grafana/grafana/pkg/apiserver/rest"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+	"github.com/grafana/grafana/pkg/services/apiserver/utils"
+	playlistsvc "github.com/grafana/grafana/pkg/services/playlist"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+var _ builder.APIGroupBuilder = (*PlaylistAPIBuilder)(nil)
+
+// This is used just so wire has something unique to return
+type PlaylistAPIBuilder struct {
+	service    playlistsvc.Service
+	namespacer request.NamespaceMapper
+	gv         schema.GroupVersion
+}
+
+func RegisterAPIService(p playlistsvc.Service,
+	apiregistration builder.APIRegistrar,
+	cfg *setting.Cfg,
+) *PlaylistAPIBuilder {
+	builder := &PlaylistAPIBuilder{
+		service:    p,
+		namespacer: request.GetNamespaceMapper(cfg),
+		gv:         playlist.PlaylistResourceInfo.GroupVersion(),
+	}
+	apiregistration.RegisterAPI(builder)
+	return builder
+}
+
+func (b *PlaylistAPIBuilder) GetGroupVersion() schema.GroupVersion {
+	return b.gv
+}
+
+func addKnownTypes(scheme *runtime.Scheme, gv schema.GroupVersion) {
+	scheme.AddKnownTypes(gv,
+		&playlist.Playlist{},
+		&playlist.PlaylistList{},
+	)
+}
+
+func (b *PlaylistAPIBuilder) InstallSchema(scheme *runtime.Scheme) error {
+	addKnownTypes(scheme, b.gv)
+
+	// Link this version to the internal representation.
+	// This is used for server-side-apply (PATCH), and avoids the error:
+	//   "no kind is registered for the type"
+	addKnownTypes(scheme, schema.GroupVersion{
+		Group:   b.gv.Group,
+		Version: runtime.APIVersionInternal,
+	})
+
+	// If multiple versions exist, then register conversions from zz_generated.conversion.go
+	// if err := playlist.RegisterConversions(scheme); err != nil {
+	//   return err
+	// }
+	metav1.AddToGroupVersion(scheme, b.gv)
+	return scheme.SetVersionPriority(b.gv)
+}
+
+func (b *PlaylistAPIBuilder) GetAPIGroupInfo(
+	scheme *runtime.Scheme,
+	codecs serializer.CodecFactory, // pointer?
+	optsGetter generic.RESTOptionsGetter,
+	dualWrite bool,
+) (*genericapiserver.APIGroupInfo, error) {
+	apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(playlist.GROUP, scheme, metav1.ParameterCodec, codecs)
+	storage := map[string]rest.Storage{}
+
+	resource := playlist.PlaylistResourceInfo
+	legacyStore := &legacyStorage{
+		service:    b.service,
+		namespacer: b.namespacer,
+	}
+	legacyStore.tableConverter = utils.NewTableConverter(
+		resource.GroupResource(),
+		[]metav1.TableColumnDefinition{
+			{Name: "Name", Type: "string", Format: "name"},
+			{Name: "Title", Type: "string", Format: "string", Description: "The playlist name"},
+			{Name: "Interval", Type: "string", Format: "string", Description: "How often the playlist will update"},
+			{Name: "Created At", Type: "date"},
+		},
+		func(obj any) ([]interface{}, error) {
+			m, ok := obj.(*playlist.Playlist)
+			if !ok {
+				return nil, fmt.Errorf("expected playlist")
+			}
+			return []interface{}{
+				m.Name,
+				m.Spec.Title,
+				m.Spec.Interval,
+				m.CreationTimestamp.UTC().Format(time.RFC3339),
+			}, nil
+		},
+	)
+	storage[resource.StoragePath()] = legacyStore
+
+	// enable dual writes if a RESTOptionsGetter is provided
+	if optsGetter != nil && dualWrite {
+		store, err := newStorage(scheme, optsGetter, legacyStore)
+		if err != nil {
+			return nil, err
+		}
+		storage[resource.StoragePath()] = grafanarest.NewDualWriter(legacyStore, store)
+	}
+
+	apiGroupInfo.VersionedResourcesStorageMap[playlist.VERSION] = storage
+	return &apiGroupInfo, nil
+}
+
+func (b *PlaylistAPIBuilder) GetOpenAPIDefinitions() common.GetOpenAPIDefinitions {
+	return playlist.GetOpenAPIDefinitions
+}
+
+func (b *PlaylistAPIBuilder) GetAPIRoutes() *builder.APIRoutes {
+	return nil // no custom API routes
+}
+
+func (b *PlaylistAPIBuilder) GetAuthorizer() authorizer.Authorizer {
+	return nil // default authorizer is fine
+}
diff --git a/pkg/registry/apis/playlist/storage.go b/pkg/registry/apis/playlist/storage.go
new file mode 100644
index 0000000000000..0c537e3127062
--- /dev/null
+++ b/pkg/registry/apis/playlist/storage.go
@@ -0,0 +1,40 @@
+package playlist
+
+import (
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/generic"
+	genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"
+
+	playlist "github.com/grafana/grafana/pkg/apis/playlist/v0alpha1"
+	grafanaregistry "github.com/grafana/grafana/pkg/apiserver/registry/generic"
+	grafanarest "github.com/grafana/grafana/pkg/apiserver/rest"
+)
+
+var _ grafanarest.Storage = (*storage)(nil)
+
+type storage struct {
+	*genericregistry.Store
+}
+
+func newStorage(scheme *runtime.Scheme, optsGetter generic.RESTOptionsGetter, legacy *legacyStorage) (*storage, error) {
+	strategy := grafanaregistry.NewStrategy(scheme)
+
+	resource := playlist.PlaylistResourceInfo
+	store := &genericregistry.Store{
+		NewFunc:                   resource.NewFunc,
+		NewListFunc:               resource.NewListFunc,
+		PredicateFunc:             grafanaregistry.Matcher,
+		DefaultQualifiedResource:  resource.GroupResource(),
+		SingularQualifiedResource: resourceInfo.SingularGroupResource(),
+		TableConvertor:            legacy.tableConverter,
+
+		CreateStrategy: strategy,
+		UpdateStrategy: strategy,
+		DeleteStrategy: strategy,
+	}
+	options := &generic.StoreOptions{RESTOptions: optsGetter, AttrFunc: grafanaregistry.GetAttrs}
+	if err := store.CompleteWithOptions(options); err != nil {
+		return nil, err
+	}
+	return &storage{Store: store}, nil
+}
diff --git a/pkg/registry/apis/query/client.go b/pkg/registry/apis/query/client.go
new file mode 100644
index 0000000000000..50f7a16434a17
--- /dev/null
+++ b/pkg/registry/apis/query/client.go
@@ -0,0 +1,22 @@
+package query
+
+import (
+	"context"
+
+	data "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+)
+
+// The query runner interface
+type DataSourceClientSupplier interface {
+	// Get a client for a given datasource
+	// NOTE: authorization headers are not yet added and the client may be shared across multiple users
+	GetDataSourceClient(ctx context.Context, ref data.DataSourceRef) (data.QueryDataClient, error)
+}
+
+type CommonDataSourceClientSupplier struct {
+	Client data.QueryDataClient
+}
+
+func (s *CommonDataSourceClientSupplier) GetDataSourceClient(ctx context.Context, ref data.DataSourceRef) (data.QueryDataClient, error) {
+	return s.Client, nil
+}
diff --git a/pkg/registry/apis/query/client/plugin.go b/pkg/registry/apis/query/client/plugin.go
new file mode 100644
index 0000000000000..a5354e35ecf12
--- /dev/null
+++ b/pkg/registry/apis/query/client/plugin.go
@@ -0,0 +1,179 @@
+package client
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"sync"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	data "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	query "github.com/grafana/grafana/pkg/apis/query/v0alpha1"
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tsdb/legacydata"
+)
+
+type pluginClient struct {
+	pluginClient plugins.Client
+	pCtxProvider *plugincontext.Provider
+}
+
+type pluginRegistry struct {
+	pluginsMu     sync.Mutex
+	plugins       *query.DataSourceApiServerList
+	apis          map[string]schema.GroupVersion
+	groupToPlugin map[string]string
+	pluginStore   pluginstore.Store
+
+	// called on demand
+	dataSourcesService datasources.DataSourceService
+}
+
+var _ data.QueryDataClient = (*pluginClient)(nil)
+var _ query.DataSourceApiServerRegistry = (*pluginRegistry)(nil)
+
+// NewDummyTestRunner creates a runner that only works with testdata
+func NewQueryClientForPluginClient(p plugins.Client, ctx *plugincontext.Provider) data.QueryDataClient {
+	return &pluginClient{
+		pluginClient: p,
+		pCtxProvider: ctx,
+	}
+}
+
+func NewDataSourceRegistryFromStore(pluginStore pluginstore.Store,
+	dataSourcesService datasources.DataSourceService,
+) query.DataSourceApiServerRegistry {
+	return &pluginRegistry{
+		pluginStore:        pluginStore,
+		dataSourcesService: dataSourcesService,
+	}
+}
+
+// ExecuteQueryData implements QueryHelper.
+func (d *pluginClient) QueryData(ctx context.Context, req data.QueryDataRequest) (int, *backend.QueryDataResponse, error) {
+	queries, dsRef, err := legacydata.ToDataSourceQueries(req)
+	if err != nil {
+		return http.StatusBadRequest, nil, err
+	}
+	if dsRef == nil {
+		return http.StatusBadRequest, nil, fmt.Errorf("expected single datasource request")
+	}
+
+	// NOTE: this depends on uid unique across datasources
+	settings, err := d.pCtxProvider.GetDataSourceInstanceSettings(ctx, dsRef.UID)
+	if err != nil {
+		return http.StatusBadRequest, nil, err
+	}
+
+	qdr := &backend.QueryDataRequest{
+		Queries: queries,
+	}
+	qdr.PluginContext, err = d.pCtxProvider.PluginContextForDataSource(ctx, settings)
+	if err != nil {
+		return http.StatusBadRequest, nil, err
+	}
+
+	code := http.StatusOK
+	rsp, err := d.pluginClient.QueryData(ctx, qdr)
+	if err == nil {
+		for _, v := range rsp.Responses {
+			if v.Error != nil {
+				code = http.StatusMultiStatus
+				break
+			}
+		}
+	} else {
+		code = http.StatusInternalServerError
+	}
+	return code, rsp, err
+}
+
+// GetDatasourceAPI implements DataSourceRegistry.
+func (d *pluginRegistry) GetDatasourceGroupVersion(pluginId string) (schema.GroupVersion, error) {
+	d.pluginsMu.Lock()
+	defer d.pluginsMu.Unlock()
+
+	if d.plugins == nil {
+		err := d.updatePlugins()
+		if err != nil {
+			return schema.GroupVersion{}, err
+		}
+	}
+
+	var err error
+	gv, ok := d.apis[pluginId]
+	if !ok {
+		err = fmt.Errorf("no API found for id: " + pluginId)
+	}
+	return gv, err
+}
+
+// GetDatasourcePlugins no namespace? everything that is available
+func (d *pluginRegistry) GetDatasourceApiServers(ctx context.Context) (*query.DataSourceApiServerList, error) {
+	d.pluginsMu.Lock()
+	defer d.pluginsMu.Unlock()
+
+	if d.plugins == nil {
+		err := d.updatePlugins()
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return d.plugins, nil
+}
+
+// This should be called when plugins change
+func (d *pluginRegistry) updatePlugins() error {
+	groupToPlugin := map[string]string{}
+	apis := map[string]schema.GroupVersion{}
+	result := &query.DataSourceApiServerList{
+		ListMeta: metav1.ListMeta{
+			ResourceVersion: fmt.Sprintf("%d", time.Now().UnixMilli()),
+		},
+	}
+
+	// TODO? only backend plugins
+	for _, dsp := range d.pluginStore.Plugins(context.Background(), plugins.TypeDataSource) {
+		ts := setting.BuildStamp * 1000
+		if dsp.Info.Build.Time > 0 {
+			ts = dsp.Info.Build.Time
+		}
+
+		group, err := plugins.GetDatasourceGroupNameFromPluginID(dsp.ID)
+		if err != nil {
+			return err
+		}
+		gv := schema.GroupVersion{Group: group, Version: "v0alpha1"} // default version
+		apis[dsp.ID] = gv
+		for _, alias := range dsp.AliasIDs {
+			apis[alias] = gv
+		}
+		groupToPlugin[group] = dsp.ID
+
+		ds := query.DataSourceApiServer{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:              dsp.ID,
+				CreationTimestamp: metav1.NewTime(time.UnixMilli(ts)),
+			},
+			Title:        dsp.Name,
+			AliasIDs:     dsp.AliasIDs,
+			GroupVersion: gv.String(),
+			Description:  dsp.Info.Description,
+		}
+		result.Items = append(result.Items, ds)
+	}
+
+	d.plugins = result
+	d.apis = apis
+	d.groupToPlugin = groupToPlugin
+	return nil
+}
diff --git a/pkg/registry/apis/query/client/testdata.go b/pkg/registry/apis/query/client/testdata.go
new file mode 100644
index 0000000000000..b64169e4e074c
--- /dev/null
+++ b/pkg/registry/apis/query/client/testdata.go
@@ -0,0 +1,75 @@
+package client
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	data "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	query "github.com/grafana/grafana/pkg/apis/query/v0alpha1"
+	testdata "github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource"
+	"github.com/grafana/grafana/pkg/tsdb/legacydata"
+)
+
+type testdataDummy struct{}
+
+var _ data.QueryDataClient = (*testdataDummy)(nil)
+var _ query.DataSourceApiServerRegistry = (*testdataDummy)(nil)
+
+// NewTestDataClient creates a runner that only works with testdata
+func NewTestDataClient() data.QueryDataClient {
+	return &testdataDummy{}
+}
+
+// NewTestDataRegistry returns a registry that only knows about testdata
+func NewTestDataRegistry() query.DataSourceApiServerRegistry {
+	return &testdataDummy{}
+}
+
+// ExecuteQueryData implements QueryHelper.
+func (d *testdataDummy) QueryData(ctx context.Context, req data.QueryDataRequest) (int, *backend.QueryDataResponse, error) {
+	queries, _, err := legacydata.ToDataSourceQueries(req)
+	if err != nil {
+		return http.StatusBadRequest, nil, err
+	}
+
+	qdr := &backend.QueryDataRequest{Queries: queries}
+	rsp, err := testdata.ProvideService().QueryData(ctx, qdr)
+	return query.GetResponseCode(rsp), rsp, err
+}
+
+// GetDatasourceAPI implements DataSourceRegistry.
+func (*testdataDummy) GetDatasourceGroupVersion(pluginId string) (schema.GroupVersion, error) {
+	if pluginId == "testdata" || pluginId == "grafana-testdata-datasource" {
+		return schema.GroupVersion{
+			Group:   "testdata.datasource.grafana.app",
+			Version: "v0alpha1",
+		}, nil
+	}
+	return schema.GroupVersion{}, fmt.Errorf("unsupported plugin (only testdata for now)")
+}
+
+// GetDatasourcePlugins implements QueryHelper.
+func (d *testdataDummy) GetDatasourceApiServers(ctx context.Context) (*query.DataSourceApiServerList, error) {
+	return &query.DataSourceApiServerList{
+		ListMeta: metav1.ListMeta{
+			ResourceVersion: fmt.Sprintf("%d", time.Now().UnixMilli()),
+		},
+		Items: []query.DataSourceApiServer{
+			{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:              "grafana-testdata-datasource",
+					CreationTimestamp: metav1.Now(),
+				},
+				Title:        "Test Data",
+				GroupVersion: "testdata.datasource.grafana.app/v0alpha1",
+				AliasIDs:     []string{"testdata"},
+			},
+		},
+	}, nil
+}
diff --git a/pkg/registry/apis/query/errors.go b/pkg/registry/apis/query/errors.go
new file mode 100644
index 0000000000000..7fc7036c3248f
--- /dev/null
+++ b/pkg/registry/apis/query/errors.go
@@ -0,0 +1,79 @@
+package query
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/grafana/grafana/pkg/util/errutil"
+)
+
+var QueryError = errutil.BadRequest("query.error").MustTemplate(
+	"failed to execute query [{{ .Public.refId }}]: {{ .Error }}",
+	errutil.WithPublic(
+		"failed to execute query [{{ .Public.refId }}]: {{ .Public.error }}",
+	))
+
+func MakeQueryError(refID, err error) error {
+	var pErr error
+	var utilErr errutil.Error
+	// See if this is grafana error, if so, grab public message
+	if errors.As(err, &utilErr) {
+		pErr = utilErr.Public()
+	} else {
+		pErr = err
+	}
+
+	data := errutil.TemplateData{
+		Public: map[string]any{
+			"refId": refID,
+			"error": pErr.Error(),
+		},
+		Error: err,
+	}
+
+	return QueryError.Build(data)
+}
+
+func MakePublicQueryError(refID, err string) error {
+	data := errutil.TemplateData{
+		Public: map[string]any{
+			"refId": refID,
+			"error": err,
+		},
+	}
+	return QueryError.Build(data)
+}
+
+var depErrStr = "did not execute expression [{{ .Public.refId }}] due to a failure to of the dependent expression or query [{{.Public.depRefId}}]"
+
+var dependencyError = errutil.BadRequest("sse.dependencyError").MustTemplate(
+	depErrStr,
+	errutil.WithPublic(depErrStr))
+
+func makeDependencyError(refID, depRefID string) error {
+	data := errutil.TemplateData{
+		Public: map[string]interface{}{
+			"refId":    refID,
+			"depRefId": depRefID,
+		},
+		Error: fmt.Errorf("did not execute expression %v due to a failure to of the dependent expression or query %v", refID, depRefID),
+	}
+
+	return dependencyError.Build(data)
+}
+
+var cyclicErrStr = "cyclic reference in expression [{{ .Public.refId }}]"
+
+var cyclicErr = errutil.BadRequest("sse.cyclic").MustTemplate(
+	cyclicErrStr,
+	errutil.WithPublic(cyclicErrStr))
+
+func makeCyclicError(refID string) error {
+	data := errutil.TemplateData{
+		Public: map[string]interface{}{
+			"refId": refID,
+		},
+		Error: fmt.Errorf("cyclic reference in %s", refID),
+	}
+	return cyclicErr.Build(data)
+}
diff --git a/pkg/registry/apis/query/errors_test.go b/pkg/registry/apis/query/errors_test.go
new file mode 100644
index 0000000000000..f44c601b41cae
--- /dev/null
+++ b/pkg/registry/apis/query/errors_test.go
@@ -0,0 +1,21 @@
+package query_test
+
+import (
+	"errors"
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/expr"
+	"github.com/grafana/grafana/pkg/util/errutil"
+)
+
+func TestQueryErrorType(t *testing.T) {
+	qet := expr.QueryError
+	utilError := errutil.Error{}
+	qe := expr.MakeQueryError("A", "", fmt.Errorf("not work"))
+
+	require.True(t, errors.Is(qe, qet))
+	require.True(t, errors.As(qe, &utilError))
+}
diff --git a/pkg/registry/apis/query/metrics.go b/pkg/registry/apis/query/metrics.go
new file mode 100644
index 0000000000000..e13525917e2d6
--- /dev/null
+++ b/pkg/registry/apis/query/metrics.go
@@ -0,0 +1,48 @@
+package query
+
+import (
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+const (
+	metricsSubSystem = "queryservice"
+	metricsNamespace = "grafana"
+)
+
+type metrics struct {
+	dsRequests *prometheus.CounterVec
+
+	// older metric
+	expressionsQuerySummary *prometheus.SummaryVec
+}
+
+func newMetrics(reg prometheus.Registerer) *metrics {
+	m := &metrics{
+		dsRequests: prometheus.NewCounterVec(prometheus.CounterOpts{
+			Namespace: metricsNamespace,
+			Subsystem: metricsSubSystem,
+			Name:      "ds_queries_total",
+			Help:      "Number of datasource queries made from the query service",
+		}, []string{"error", "dataplane", "datasource_type"}),
+
+		expressionsQuerySummary: prometheus.NewSummaryVec(
+			prometheus.SummaryOpts{
+				Namespace:  metricsNamespace,
+				Subsystem:  metricsSubSystem,
+				Name:       "expressions_queries_duration_milliseconds",
+				Help:       "Expressions query summary",
+				Objectives: map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.99: 0.001},
+			},
+			[]string{"status"},
+		),
+	}
+
+	if reg != nil {
+		reg.MustRegister(
+			m.dsRequests,
+			m.expressionsQuerySummary,
+		)
+	}
+
+	return m
+}
diff --git a/pkg/registry/apis/query/parser.go b/pkg/registry/apis/query/parser.go
new file mode 100644
index 0000000000000..45feaf71afddf
--- /dev/null
+++ b/pkg/registry/apis/query/parser.go
@@ -0,0 +1,216 @@
+package query
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+
+	"github.com/grafana/grafana-plugin-sdk-go/data/utils/jsoniter"
+	data "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+	"gonum.org/v1/gonum/graph/simple"
+	"gonum.org/v1/gonum/graph/topo"
+
+	query "github.com/grafana/grafana/pkg/apis/query/v0alpha1"
+	"github.com/grafana/grafana/pkg/expr"
+	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/services/datasources/service"
+)
+
+type datasourceRequest struct {
+	// The type
+	PluginId string `json:"pluginId"`
+
+	// The UID
+	UID string `json:"uid"`
+
+	// Optionally show the additional query properties
+	Request *data.QueryDataRequest `json:"request"`
+
+	// Headers that should be forwarded to the next request
+	Headers map[string]string `json:"headers,omitempty"`
+}
+
+type parsedRequestInfo struct {
+	// Datasource queries, one for each datasource
+	Requests []datasourceRequest `json:"requests,omitempty"`
+
+	// Expressions in required execution order
+	Expressions []expr.ExpressionQuery `json:"expressions,omitempty"`
+
+	// Expressions include explicit hacks for influx+prometheus
+	RefIDTypes map[string]string `json:"types,omitempty"`
+
+	// Hidden queries used as dependencies
+	HideBeforeReturn []string `json:"hide,omitempty"`
+}
+
+type queryParser struct {
+	legacy service.LegacyDataSourceLookup
+	reader *expr.ExpressionQueryReader
+	tracer tracing.Tracer
+}
+
+func newQueryParser(reader *expr.ExpressionQueryReader, legacy service.LegacyDataSourceLookup, tracer tracing.Tracer) *queryParser {
+	return &queryParser{
+		reader: reader,
+		legacy: legacy,
+		tracer: tracer,
+	}
+}
+
+// Split the main query into multiple
+func (p *queryParser) parseRequest(ctx context.Context, input *query.QueryDataRequest) (parsedRequestInfo, error) {
+	ctx, span := p.tracer.Start(ctx, "QueryService.parseRequest")
+	defer span.End()
+
+	queryRefIDs := make(map[string]*data.DataQuery, len(input.Queries))
+	expressions := make(map[string]*expr.ExpressionQuery)
+	index := make(map[string]int) // index lookup
+	rsp := parsedRequestInfo{
+		RefIDTypes: make(map[string]string, len(input.Queries)),
+	}
+
+	// Ensure a valid time range
+	if input.From == "" {
+		input.From = "now-6h"
+	}
+	if input.To == "" {
+		input.To = "now"
+	}
+
+	for _, q := range input.Queries {
+		_, found := queryRefIDs[q.RefID]
+		if found {
+			return rsp, MakePublicQueryError(q.RefID, "multiple queries with same refId")
+		}
+		_, found = expressions[q.RefID]
+		if found {
+			return rsp, MakePublicQueryError(q.RefID, "multiple queries with same refId")
+		}
+
+		ds, err := p.getValidDataSourceRef(ctx, q.Datasource, q.DatasourceID)
+		if err != nil {
+			return rsp, err
+		}
+
+		// Process each query
+		if expr.IsDataSource(ds.UID) {
+			// In order to process the query as a typed expression query, we
+			// are writing it back to JSON and parsing again.  Alternatively we
+			// could construct it from the untyped map[string]any additional properties
+			// but this approach lets us focus on well typed behavior first
+			raw, err := json.Marshal(q)
+			if err != nil {
+				return rsp, err
+			}
+			iter, err := jsoniter.ParseBytes(jsoniter.ConfigDefault, raw)
+			if err != nil {
+				return rsp, err
+			}
+			exp, err := p.reader.ReadQuery(q, iter)
+			if err != nil {
+				return rsp, err
+			}
+			exp.GraphID = int64(len(expressions) + 1)
+			expressions[q.RefID] = &exp
+		} else {
+			key := fmt.Sprintf("%s/%s", ds.Type, ds.UID)
+			idx, ok := index[key]
+			if !ok {
+				idx = len(index)
+				index[key] = idx
+				rsp.Requests = append(rsp.Requests, datasourceRequest{
+					PluginId: ds.Type,
+					UID:      ds.UID,
+					Request: &data.QueryDataRequest{
+						TimeRange: input.TimeRange,
+						Debug:     input.Debug,
+						// no queries
+					},
+				})
+			}
+
+			req := rsp.Requests[idx].Request
+			req.Queries = append(req.Queries, q)
+			queryRefIDs[q.RefID] = &req.Queries[len(req.Queries)-1]
+		}
+
+		// Mark all the queries that should be hidden ()
+		if q.Hide {
+			rsp.HideBeforeReturn = append(rsp.HideBeforeReturn, q.RefID)
+		}
+	}
+
+	// Make sure all referenced variables exist and the expression order is stable
+	if len(expressions) > 0 {
+		queryNode := &expr.ExpressionQuery{
+			GraphID: -1,
+		}
+
+		// Build the graph for a request
+		dg := simple.NewDirectedGraph()
+		dg.AddNode(queryNode)
+		for _, exp := range expressions {
+			dg.AddNode(exp)
+		}
+		for _, exp := range expressions {
+			vars := exp.Command.NeedsVars()
+			for _, refId := range vars {
+				target := queryNode
+				q, ok := queryRefIDs[refId]
+				if !ok {
+					target, ok = expressions[refId]
+					if !ok {
+						return rsp, makeDependencyError(exp.RefID, refId)
+					}
+				}
+				// Do not hide queries used in variables
+				if q != nil && q.Hide {
+					q.Hide = false
+				}
+				if target.ID() == exp.ID() {
+					return rsp, makeCyclicError(refId)
+				}
+				dg.SetEdge(dg.NewEdge(target, exp))
+			}
+		}
+
+		// Add the sorted expressions
+		sortedNodes, err := topo.SortStabilized(dg, nil)
+		if err != nil {
+			return rsp, makeCyclicError("")
+		}
+		for _, v := range sortedNodes {
+			if v.ID() > 0 {
+				rsp.Expressions = append(rsp.Expressions, *v.(*expr.ExpressionQuery))
+			}
+		}
+	}
+
+	return rsp, nil
+}
+
+func (p *queryParser) getValidDataSourceRef(ctx context.Context, ds *data.DataSourceRef, id int64) (*data.DataSourceRef, error) {
+	if ds == nil {
+		if id == 0 {
+			return nil, fmt.Errorf("missing datasource reference or id")
+		}
+		if p.legacy == nil {
+			return nil, fmt.Errorf("legacy datasource lookup unsupported (id:%d)", id)
+		}
+		return p.legacy.GetDataSourceFromDeprecatedFields(ctx, "", id)
+	}
+	if ds.Type == "" {
+		if ds.UID == "" {
+			return nil, fmt.Errorf("missing name/uid in data source reference")
+		}
+		if ds.UID == expr.DatasourceType {
+			return ds, nil
+		}
+		if p.legacy == nil {
+			return nil, fmt.Errorf("legacy datasource lookup unsupported (name:%s)", ds.UID)
+		}
+		return p.legacy.GetDataSourceFromDeprecatedFields(ctx, ds.UID, 0)
+	}
+	return ds, nil
+}
diff --git a/pkg/registry/apis/query/parser_test.go b/pkg/registry/apis/query/parser_test.go
new file mode 100644
index 0000000000000..d172c13788aad
--- /dev/null
+++ b/pkg/registry/apis/query/parser_test.go
@@ -0,0 +1,133 @@
+package query
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"os"
+	"path"
+	"strings"
+	"testing"
+
+	data "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	query "github.com/grafana/grafana/pkg/apis/query/v0alpha1"
+	"github.com/grafana/grafana/pkg/expr"
+	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+)
+
+type parserTestObject struct {
+	Description string                 `json:"description,omitempty"`
+	Request     query.QueryDataRequest `json:"input"`
+	Expect      parsedRequestInfo      `json:"expect"`
+	Error       string                 `json:"error,omitempty"`
+}
+
+func TestQuerySplitting(t *testing.T) {
+	ctx := context.Background()
+	parser := newQueryParser(expr.NewExpressionQueryReader(featuremgmt.WithFeatures()),
+		&legacyDataSourceRetriever{}, tracing.InitializeTracerForTest())
+
+	t.Run("missing datasource flavors", func(t *testing.T) {
+		split, err := parser.parseRequest(ctx, &query.QueryDataRequest{
+			QueryDataRequest: data.QueryDataRequest{
+				Queries: []data.DataQuery{{
+					CommonQueryProperties: data.CommonQueryProperties{
+						RefID: "A",
+					},
+				}},
+			},
+		})
+		require.Error(t, err) // Missing datasource
+		require.Empty(t, split.Requests)
+	})
+
+	t.Run("applies default time range", func(t *testing.T) {
+		split, err := parser.parseRequest(ctx, &query.QueryDataRequest{
+			QueryDataRequest: data.QueryDataRequest{
+				TimeRange: data.TimeRange{}, // missing
+				Queries: []data.DataQuery{{
+					CommonQueryProperties: data.CommonQueryProperties{
+						RefID: "A",
+						Datasource: &data.DataSourceRef{
+							Type: "x",
+							UID:  "abc",
+						},
+					},
+				}},
+			},
+		})
+		require.NoError(t, err)
+		require.Len(t, split.Requests, 1)
+		require.Equal(t, "now-6h", split.Requests[0].Request.From)
+		require.Equal(t, "now", split.Requests[0].Request.To)
+	})
+
+	t.Run("verify tests", func(t *testing.T) {
+		files, err := os.ReadDir("testdata")
+		require.NoError(t, err)
+
+		for _, file := range files {
+			if !strings.HasSuffix(file.Name(), ".json") {
+				continue
+			}
+
+			t.Run(file.Name(), func(t *testing.T) {
+				fpath := path.Join("testdata", file.Name())
+				// nolint:gosec
+				body, err := os.ReadFile(fpath)
+				require.NoError(t, err)
+				harness := &parserTestObject{}
+				err = json.Unmarshal(body, harness)
+				require.NoError(t, err)
+
+				changed := false
+				parsed, err := parser.parseRequest(ctx, &harness.Request)
+				if err != nil {
+					if !assert.Equal(t, harness.Error, err.Error(), "File %s", file) {
+						changed = true
+					}
+				} else {
+					x, _ := json.Marshal(parsed)
+					y, _ := json.Marshal(harness.Expect)
+					if !assert.JSONEq(t, string(y), string(x), "File %s", file) {
+						changed = true
+					}
+				}
+
+				if changed {
+					harness.Error = ""
+					harness.Expect = parsed
+					if err != nil {
+						harness.Error = err.Error()
+					}
+					jj, err := json.MarshalIndent(harness, "", "  ")
+					require.NoError(t, err)
+					err = os.WriteFile(fpath, jj, 0600)
+					require.NoError(t, err)
+				}
+			})
+		}
+	})
+}
+
+type legacyDataSourceRetriever struct{}
+
+func (s *legacyDataSourceRetriever) GetDataSourceFromDeprecatedFields(ctx context.Context, name string, id int64) (*data.DataSourceRef, error) {
+	if id == 100 {
+		return &data.DataSourceRef{
+			Type: "plugin-aaaa",
+			UID:  "AAA",
+		}, nil
+	}
+	if name != "" {
+		return &data.DataSourceRef{
+			Type: "plugin-bbb",
+			UID:  name,
+		}, nil
+	}
+	return nil, fmt.Errorf("missing parameter")
+}
diff --git a/pkg/registry/apis/query/plugins.go b/pkg/registry/apis/query/plugins.go
new file mode 100644
index 0000000000000..1836602d4de51
--- /dev/null
+++ b/pkg/registry/apis/query/plugins.go
@@ -0,0 +1,62 @@
+package query
+
+import (
+	"context"
+
+	"k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+	example "github.com/grafana/grafana/pkg/apis/example/v0alpha1"
+	query "github.com/grafana/grafana/pkg/apis/query/v0alpha1"
+)
+
+var (
+	_ rest.Storage              = (*pluginsStorage)(nil)
+	_ rest.Scoper               = (*pluginsStorage)(nil)
+	_ rest.SingularNameProvider = (*pluginsStorage)(nil)
+	_ rest.Lister               = (*pluginsStorage)(nil)
+)
+
+type pluginsStorage struct {
+	resourceInfo   *common.ResourceInfo
+	tableConverter rest.TableConvertor
+	registry       query.DataSourceApiServerRegistry
+}
+
+func newPluginsStorage(reg query.DataSourceApiServerRegistry) *pluginsStorage {
+	var resourceInfo = query.DataSourceApiServerResourceInfo
+	return &pluginsStorage{
+		resourceInfo:   &resourceInfo,
+		tableConverter: rest.NewDefaultTableConvertor(resourceInfo.GroupResource()),
+		registry:       reg,
+	}
+}
+
+func (s *pluginsStorage) New() runtime.Object {
+	return s.resourceInfo.NewFunc()
+}
+
+func (s *pluginsStorage) Destroy() {}
+
+func (s *pluginsStorage) NamespaceScoped() bool {
+	return false
+}
+
+func (s *pluginsStorage) GetSingularName() string {
+	return example.DummyResourceInfo.GetSingularName()
+}
+
+func (s *pluginsStorage) NewList() runtime.Object {
+	return s.resourceInfo.NewListFunc()
+}
+
+func (s *pluginsStorage) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) {
+	return s.tableConverter.ConvertToTable(ctx, object, tableOptions)
+}
+
+func (s *pluginsStorage) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) {
+	return s.registry.GetDatasourceApiServers(ctx)
+}
diff --git a/pkg/registry/apis/query/query.go b/pkg/registry/apis/query/query.go
new file mode 100644
index 0000000000000..ff5829e00aec8
--- /dev/null
+++ b/pkg/registry/apis/query/query.go
@@ -0,0 +1,283 @@
+package query
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net/http"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+	"go.opentelemetry.io/otel/attribute"
+	"golang.org/x/sync/errgroup"
+
+	query "github.com/grafana/grafana/pkg/apis/query/v0alpha1"
+	"github.com/grafana/grafana/pkg/expr/mathexp"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/util/errutil"
+	"github.com/grafana/grafana/pkg/util/errutil/errhttp"
+	"github.com/grafana/grafana/pkg/web"
+)
+
+// The query method (not really a create)
+func (b *QueryAPIBuilder) doQuery(w http.ResponseWriter, r *http.Request) {
+	ctx, span := b.tracer.Start(r.Context(), "QueryService.Query")
+	defer span.End()
+
+	raw := &query.QueryDataRequest{}
+	err := web.Bind(r, raw)
+	if err != nil {
+		errhttp.Write(ctx, errutil.BadRequest(
+			"query.bind",
+			errutil.WithPublicMessage("Error reading query")).
+			Errorf("error reading: %w", err), w)
+		return
+	}
+
+	// Parses the request and splits it into multiple sub queries (if necessary)
+	req, err := b.parser.parseRequest(ctx, raw)
+	if err != nil {
+		if errors.Is(err, datasources.ErrDataSourceNotFound) {
+			errhttp.Write(ctx, errutil.BadRequest(
+				"query.datasource.notfound",
+				errutil.WithPublicMessage(err.Error())), w)
+			return
+		}
+		errhttp.Write(ctx, err, w)
+		return
+	}
+
+	// Actually run the query
+	rsp, err := b.execute(ctx, req)
+	if err != nil {
+		errhttp.Write(ctx, errutil.Internal(
+			"query.execution",
+			errutil.WithPublicMessage("Error executing query")).
+			Errorf("execution error: %w", err), w)
+		return
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(query.GetResponseCode(rsp))
+	_ = json.NewEncoder(w).Encode(rsp)
+}
+
+func (b *QueryAPIBuilder) execute(ctx context.Context, req parsedRequestInfo) (qdr *backend.QueryDataResponse, err error) {
+	switch len(req.Requests) {
+	case 0:
+		break // nothing to do
+	case 1:
+		qdr, err = b.handleQuerySingleDatasource(ctx, req.Requests[0])
+	default:
+		qdr, err = b.executeConcurrentQueries(ctx, req.Requests)
+	}
+
+	if len(req.Expressions) > 0 {
+		qdr, err = b.handleExpressions(ctx, req, qdr)
+	}
+
+	// Remove hidden results
+	for _, refId := range req.HideBeforeReturn {
+		r, ok := qdr.Responses[refId]
+		if ok && r.Error == nil {
+			delete(qdr.Responses, refId)
+		}
+	}
+	return
+}
+
+// Process a single request
+// See: https://github.com/grafana/grafana/blob/v10.2.3/pkg/services/query/query.go#L242
+func (b *QueryAPIBuilder) handleQuerySingleDatasource(ctx context.Context, req datasourceRequest) (*backend.QueryDataResponse, error) {
+	ctx, span := b.tracer.Start(ctx, "Query.handleQuerySingleDatasource")
+	defer span.End()
+	span.SetAttributes(
+		attribute.String("datasource.type", req.PluginId),
+		attribute.String("datasource.uid", req.UID),
+	)
+
+	allHidden := true
+	for idx := range req.Request.Queries {
+		if !req.Request.Queries[idx].Hide {
+			allHidden = false
+			break
+		}
+	}
+	if allHidden {
+		return &backend.QueryDataResponse{}, nil
+	}
+
+	// Add user headers... here or in client.QueryData
+	client, err := b.client.GetDataSourceClient(ctx, v0alpha1.DataSourceRef{
+		Type: req.PluginId,
+		UID:  req.UID,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	code, rsp, err := client.QueryData(ctx, *req.Request)
+	if err == nil && rsp != nil {
+		for _, q := range req.Request.Queries {
+			if q.ResultAssertions != nil {
+				result, ok := rsp.Responses[q.RefID]
+				if ok && result.Error == nil {
+					err = q.ResultAssertions.Validate(result.Frames)
+					if err != nil {
+						result.Error = err
+						result.ErrorSource = backend.ErrorSourceDownstream
+						rsp.Responses[q.RefID] = result
+					}
+				}
+			}
+		}
+	}
+
+	// Create a response object with the error when missing (happens for client errors like 404)
+	if rsp == nil && err != nil {
+		rsp = &backend.QueryDataResponse{Responses: make(backend.Responses)}
+		for _, q := range req.Request.Queries {
+			rsp.Responses[q.RefID] = backend.DataResponse{
+				Status: backend.Status(code),
+				Error:  err,
+			}
+		}
+	}
+	return rsp, err
+}
+
+// buildErrorResponses applies the provided error to each query response in the list. These queries should all belong to the same datasource.
+func buildErrorResponse(err error, req datasourceRequest) *backend.QueryDataResponse {
+	rsp := backend.NewQueryDataResponse()
+	for _, query := range req.Request.Queries {
+		rsp.Responses[query.RefID] = backend.DataResponse{
+			Error: err,
+		}
+	}
+	return rsp
+}
+
+// executeConcurrentQueries executes queries to multiple datasources concurrently and returns the aggregate result.
+func (b *QueryAPIBuilder) executeConcurrentQueries(ctx context.Context, requests []datasourceRequest) (*backend.QueryDataResponse, error) {
+	ctx, span := b.tracer.Start(ctx, "Query.executeConcurrentQueries")
+	defer span.End()
+
+	g, ctx := errgroup.WithContext(ctx)
+	g.SetLimit(b.concurrentQueryLimit) // prevent too many concurrent requests
+	rchan := make(chan *backend.QueryDataResponse, len(requests))
+
+	// Create panic recovery function for loop below
+	recoveryFn := func(req datasourceRequest) {
+		if r := recover(); r != nil {
+			var err error
+			b.log.Error("query datasource panic", "error", r, "stack", log.Stack(1))
+			if theErr, ok := r.(error); ok {
+				err = theErr
+			} else if theErrString, ok := r.(string); ok {
+				err = fmt.Errorf(theErrString)
+			} else {
+				err = fmt.Errorf("unexpected error - %s", b.userFacingDefaultError)
+			}
+			// Due to the panic, there is no valid response for any query for this datasource. Append an error for each one.
+			rchan <- buildErrorResponse(err, req)
+		}
+	}
+
+	// Query each datasource concurrently
+	for idx := range requests {
+		req := requests[idx]
+		g.Go(func() error {
+			defer recoveryFn(req)
+
+			dqr, err := b.handleQuerySingleDatasource(ctx, req)
+			if err == nil {
+				rchan <- dqr
+			} else {
+				rchan <- buildErrorResponse(err, req)
+			}
+			return nil
+		})
+	}
+
+	if err := g.Wait(); err != nil {
+		return nil, err
+	}
+	close(rchan)
+
+	// Merge the results from each response
+	resp := backend.NewQueryDataResponse()
+	for result := range rchan {
+		for refId, dataResponse := range result.Responses {
+			resp.Responses[refId] = dataResponse
+		}
+	}
+
+	return resp, nil
+}
+
+// Unlike the implementation in expr/node.go, all datasource queries have been processed first
+func (b *QueryAPIBuilder) handleExpressions(ctx context.Context, req parsedRequestInfo, data *backend.QueryDataResponse) (qdr *backend.QueryDataResponse, err error) {
+	start := time.Now()
+	ctx, span := b.tracer.Start(ctx, "SSE.handleExpressions")
+	defer func() {
+		var respStatus string
+		switch {
+		case err == nil:
+			respStatus = "success"
+		default:
+			respStatus = "failure"
+		}
+		duration := float64(time.Since(start).Nanoseconds()) / float64(time.Millisecond)
+		b.metrics.expressionsQuerySummary.WithLabelValues(respStatus).Observe(duration)
+
+		span.End()
+	}()
+
+	qdr = data
+	if qdr == nil {
+		qdr = &backend.QueryDataResponse{}
+	}
+	if qdr.Responses == nil {
+		qdr.Responses = make(backend.Responses) // avoid NPE for lookup
+	}
+	now := start // <<< this should come from the original query parser
+	vars := make(mathexp.Vars)
+	for _, expression := range req.Expressions {
+		// Setup the variables
+		for _, refId := range expression.Command.NeedsVars() {
+			_, ok := vars[refId]
+			if !ok {
+				dr, ok := qdr.Responses[refId]
+				if ok {
+					allowLongFrames := false // TODO -- depends on input type and only if SQL?
+					_, res, err := b.converter.Convert(ctx, req.RefIDTypes[refId], dr.Frames, allowLongFrames)
+					if err != nil {
+						res.Error = err
+					}
+					vars[refId] = res
+				} else {
+					// This should error in the parsing phase
+					err := fmt.Errorf("missing variable %s for %s", refId, expression.RefID)
+					qdr.Responses[refId] = backend.DataResponse{
+						Error: err,
+					}
+					return qdr, err
+				}
+			}
+		}
+
+		refId := expression.RefID
+		results, err := expression.Command.Execute(ctx, now, vars, b.tracer)
+		if err != nil {
+			results.Error = err
+		}
+		qdr.Responses[refId] = backend.DataResponse{
+			Error:  results.Error,
+			Frames: results.Values.AsDataFrames(refId),
+		}
+	}
+	return qdr, nil
+}
diff --git a/pkg/registry/apis/query/register.go b/pkg/registry/apis/query/register.go
new file mode 100644
index 0000000000000..1b6460df3e8f4
--- /dev/null
+++ b/pkg/registry/apis/query/register.go
@@ -0,0 +1,304 @@
+package query
+
+import (
+	data "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+	"github.com/grafana/grafana-plugin-sdk-go/experimental/schemabuilder"
+	"github.com/prometheus/client_golang/prometheus"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
+	"k8s.io/apiserver/pkg/authorization/authorizer"
+	"k8s.io/apiserver/pkg/registry/generic"
+	"k8s.io/apiserver/pkg/registry/rest"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+	common "k8s.io/kube-openapi/pkg/common"
+	"k8s.io/kube-openapi/pkg/spec3"
+	"k8s.io/kube-openapi/pkg/validation/spec"
+
+	example "github.com/grafana/grafana/pkg/apis/example/v0alpha1"
+	"github.com/grafana/grafana/pkg/apis/query/v0alpha1"
+	"github.com/grafana/grafana/pkg/apiserver/builder"
+	"github.com/grafana/grafana/pkg/expr"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/registry/apis/query/client"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/datasources/service"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
+)
+
+var _ builder.APIGroupBuilder = (*QueryAPIBuilder)(nil)
+
+type QueryAPIBuilder struct {
+	log                    log.Logger
+	concurrentQueryLimit   int
+	userFacingDefaultError string
+	returnMultiStatus      bool // from feature toggle
+	features               featuremgmt.FeatureToggles
+
+	tracer    tracing.Tracer
+	metrics   *metrics
+	parser    *queryParser
+	client    DataSourceClientSupplier
+	registry  v0alpha1.DataSourceApiServerRegistry
+	converter *expr.ResultConverter
+}
+
+func NewQueryAPIBuilder(features featuremgmt.FeatureToggles,
+	client DataSourceClientSupplier,
+	registry v0alpha1.DataSourceApiServerRegistry,
+	legacy service.LegacyDataSourceLookup,
+	registerer prometheus.Registerer,
+	tracer tracing.Tracer,
+) (*QueryAPIBuilder, error) {
+	reader := expr.NewExpressionQueryReader(features)
+	return &QueryAPIBuilder{
+		concurrentQueryLimit: 4,
+		log:                  log.New("query_apiserver"),
+		returnMultiStatus:    features.IsEnabledGlobally(featuremgmt.FlagDatasourceQueryMultiStatus),
+		client:               client,
+		registry:             registry,
+		parser:               newQueryParser(reader, legacy, tracer),
+		metrics:              newMetrics(registerer),
+		tracer:               tracer,
+		features:             features,
+		converter: &expr.ResultConverter{
+			Features: features,
+			Tracer:   tracer,
+		},
+	}, nil
+}
+
+func RegisterAPIService(features featuremgmt.FeatureToggles,
+	apiregistration builder.APIRegistrar,
+	dataSourcesService datasources.DataSourceService,
+	pluginStore pluginstore.Store,
+	accessControl accesscontrol.AccessControl,
+	pluginClient plugins.Client,
+	pCtxProvider *plugincontext.Provider,
+	registerer prometheus.Registerer,
+	tracer tracing.Tracer,
+	legacy service.LegacyDataSourceLookup,
+) (*QueryAPIBuilder, error) {
+	if !features.IsEnabledGlobally(featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs) {
+		return nil, nil // skip registration unless opting into experimental apis
+	}
+
+	builder, err := NewQueryAPIBuilder(
+		features,
+		&CommonDataSourceClientSupplier{
+			Client: client.NewQueryClientForPluginClient(pluginClient, pCtxProvider),
+		},
+		client.NewDataSourceRegistryFromStore(pluginStore, dataSourcesService),
+		legacy, registerer, tracer,
+	)
+	apiregistration.RegisterAPI(builder)
+	return builder, err
+}
+
+func (b *QueryAPIBuilder) GetGroupVersion() schema.GroupVersion {
+	return v0alpha1.SchemeGroupVersion
+}
+
+func addKnownTypes(scheme *runtime.Scheme, gv schema.GroupVersion) {
+	scheme.AddKnownTypes(gv,
+		&v0alpha1.DataSourceApiServer{},
+		&v0alpha1.DataSourceApiServerList{},
+		&v0alpha1.QueryDataRequest{},
+		&v0alpha1.QueryDataResponse{},
+		&v0alpha1.QueryTypeDefinition{},
+		&v0alpha1.QueryTypeDefinitionList{},
+		&example.DummySubresource{},
+	)
+}
+
+func (b *QueryAPIBuilder) InstallSchema(scheme *runtime.Scheme) error {
+	addKnownTypes(scheme, v0alpha1.SchemeGroupVersion)
+	metav1.AddToGroupVersion(scheme, v0alpha1.SchemeGroupVersion)
+	return scheme.SetVersionPriority(v0alpha1.SchemeGroupVersion)
+}
+
+func (b *QueryAPIBuilder) GetAPIGroupInfo(
+	scheme *runtime.Scheme,
+	codecs serializer.CodecFactory, // pointer?
+	optsGetter generic.RESTOptionsGetter,
+	_ bool,
+) (*genericapiserver.APIGroupInfo, error) {
+	gv := v0alpha1.SchemeGroupVersion
+	apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(gv.Group, scheme, metav1.ParameterCodec, codecs)
+
+	plugins := newPluginsStorage(b.registry)
+
+	storage := map[string]rest.Storage{}
+	storage[plugins.resourceInfo.StoragePath()] = plugins
+
+	apiGroupInfo.VersionedResourcesStorageMap[gv.Version] = storage
+	return &apiGroupInfo, nil
+}
+
+func (b *QueryAPIBuilder) GetOpenAPIDefinitions() common.GetOpenAPIDefinitions {
+	return v0alpha1.GetOpenAPIDefinitions
+}
+
+// Register additional routes with the server
+func (b *QueryAPIBuilder) GetAPIRoutes() *builder.APIRoutes {
+	routes := &builder.APIRoutes{
+		Namespace: []builder.APIRouteHandler{
+			{
+				Path: "query",
+				Spec: &spec3.PathProps{
+					Post: &spec3.Operation{
+						OperationProps: spec3.OperationProps{
+							Tags:        []string{"query"},
+							Summary:     "Query",
+							Description: "longer description here?",
+							Parameters: []*spec3.Parameter{
+								{
+									ParameterProps: spec3.ParameterProps{
+										Name:        "namespace",
+										In:          "path",
+										Required:    true,
+										Example:     "default",
+										Description: "workspace",
+										Schema:      spec.StringProperty(),
+									},
+								},
+							},
+							RequestBody: &spec3.RequestBody{
+								RequestBodyProps: spec3.RequestBodyProps{
+									Content: map[string]*spec3.MediaType{
+										"application/json": {
+											MediaTypeProps: spec3.MediaTypeProps{
+												Schema: spec.RefSchema("#/components/schemas/" + QueryRequestSchemaKey),
+												Examples: map[string]*spec3.Example{
+													"A": {
+														ExampleProps: spec3.ExampleProps{
+															Summary:     "Random walk (testdata)",
+															Description: "Use testdata to execute a random walk query",
+															Value: `{
+																"queries": [
+																	{
+																		"refId": "A",
+																		"scenarioId": "random_walk_table",
+																		"seriesCount": 1,
+																		"datasource": {
+																		"type": "grafana-testdata-datasource",
+																		"uid": "PD8C576611E62080A"
+																		},
+																		"intervalMs": 60000,
+																		"maxDataPoints": 20
+																	}
+																],
+																"from": "now-6h",
+																"to": "now"
+															}`,
+														},
+													},
+													"B": {
+														ExampleProps: spec3.ExampleProps{
+															Summary:     "With deprecated datasource name",
+															Description: "Includes an old style string for datasource reference",
+															Value: `{
+																"queries": [
+																	{
+																		"refId": "A",
+																		"datasource": {
+																			"type": "grafana-googlesheets-datasource",
+																			"uid": "b1808c48-9fc9-4045-82d7-081781f8a553"
+																		},
+																		"cacheDurationSeconds": 300,
+																		"spreadsheet": "spreadsheetID",
+																		"datasourceId": 4,
+																		"intervalMs": 30000,
+																		"maxDataPoints": 794
+																	},
+																	{
+																		"refId": "Z",
+																		"datasource": "old",
+																		"maxDataPoints": 10,
+																		"timeRange": {
+																			"from": "100",
+																			"to": "200"
+																		}
+																	}
+																],
+																"from": "now-6h",
+																"to": "now"
+															}`,
+														},
+													},
+												},
+											},
+										},
+									},
+								},
+							},
+							Responses: &spec3.Responses{
+								ResponsesProps: spec3.ResponsesProps{
+									StatusCodeResponses: map[int]*spec3.Response{
+										200: {
+											ResponseProps: spec3.ResponseProps{
+												Content: map[string]*spec3.MediaType{
+													"application/json": {
+														MediaTypeProps: spec3.MediaTypeProps{
+															Schema: spec.StringProperty(), // TODO!!!
+														},
+													},
+												},
+											},
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+				Handler: b.doQuery,
+			},
+		},
+	}
+	return routes
+}
+
+func (b *QueryAPIBuilder) GetAuthorizer() authorizer.Authorizer {
+	return nil // default is OK
+}
+
+const QueryRequestSchemaKey = "QueryRequestSchema"
+const QueryPayloadSchemaKey = "QueryPayloadSchema"
+
+func (b *QueryAPIBuilder) PostProcessOpenAPI(oas *spec3.OpenAPI) (*spec3.OpenAPI, error) {
+	// The plugin description
+	oas.Info.Description = "Query service"
+
+	// The root api URL
+	root := "/apis/" + b.GetGroupVersion().String() + "/"
+
+	var err error
+	opts := schemabuilder.QuerySchemaOptions{
+		PluginID:   []string{""},
+		QueryTypes: []data.QueryTypeDefinition{},
+		Mode:       schemabuilder.SchemaTypeQueryPayload,
+	}
+	oas.Components.Schemas[QueryPayloadSchemaKey], err = schemabuilder.GetQuerySchema(opts)
+	if err != nil {
+		return oas, err
+	}
+	opts.Mode = schemabuilder.SchemaTypeQueryRequest
+	oas.Components.Schemas[QueryRequestSchemaKey], err = schemabuilder.GetQuerySchema(opts)
+	if err != nil {
+		return oas, err
+	}
+
+	// The root API discovery list
+	sub := oas.Paths.Paths[root]
+	if sub != nil && sub.Get != nil {
+		sub.Get.Tags = []string{"API Discovery"} // sorts first in the list
+	}
+	return oas, nil
+}
diff --git a/pkg/registry/apis/query/testdata/cyclic-references.json b/pkg/registry/apis/query/testdata/cyclic-references.json
new file mode 100644
index 0000000000000..b181f6b04688d
--- /dev/null
+++ b/pkg/registry/apis/query/testdata/cyclic-references.json
@@ -0,0 +1,29 @@
+{
+  "description": "self dependencies",
+  "input": {
+    "from": "now-6",
+    "to": "now",
+    "queries": [
+      {
+        "refId": "A",
+        "datasource": {
+          "type": "",
+          "uid": "__expr__"
+        },
+        "expression": "$B",
+        "type": "math"
+      },
+      {
+        "refId": "B",
+        "datasource": {
+          "type": "",
+          "uid": "__expr__"
+        },
+        "type": "math",
+        "expression": "$A"
+      }
+    ]
+  },
+  "expect": {},
+  "error": "[sse.cyclic] cyclic reference in expression []"
+}
\ No newline at end of file
diff --git a/pkg/registry/apis/query/testdata/multiple-uids-same-plugin.json b/pkg/registry/apis/query/testdata/multiple-uids-same-plugin.json
new file mode 100644
index 0000000000000..68a6705f094ae
--- /dev/null
+++ b/pkg/registry/apis/query/testdata/multiple-uids-same-plugin.json
@@ -0,0 +1,60 @@
+{
+  "input": {
+    "from": "now-6",
+    "to": "now",
+    "queries": [
+      {
+        "refId": "A",
+        "datasource": {
+          "type": "plugin-x",
+          "uid": "123"
+        }
+      },
+      {
+        "refId": "B",
+        "datasource": {
+          "type": "plugin-x",
+          "uid": "456"
+        }
+      }
+    ]
+  },
+  "expect": {
+    "requests": [
+      {
+        "pluginId": "plugin-x",
+        "uid": "123",
+        "request": {
+          "from": "now-6",
+          "to": "now",
+          "queries": [
+            {
+              "refId": "A",
+              "datasource": {
+                "type": "plugin-x",
+                "uid": "123"
+              }
+            }
+          ]
+        }
+      },
+      {
+        "pluginId": "plugin-x",
+        "uid": "456",
+        "request": {
+          "from": "now-6",
+          "to": "now",
+          "queries": [
+            {
+              "refId": "B",
+              "datasource": {
+                "type": "plugin-x",
+                "uid": "456"
+              }
+            }
+          ]
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/pkg/registry/apis/query/testdata/self-reference.json b/pkg/registry/apis/query/testdata/self-reference.json
new file mode 100644
index 0000000000000..05d709992f979
--- /dev/null
+++ b/pkg/registry/apis/query/testdata/self-reference.json
@@ -0,0 +1,20 @@
+{
+  "description": "self dependencies",
+  "input": {
+    "from": "now-6",
+    "to": "now",
+    "queries": [
+      {
+        "refId": "A",
+        "datasource": {
+          "type": "",
+          "uid": "__expr__"
+        },
+        "type": "math",
+        "expression": "$A"
+      }
+    ]
+  },
+  "expect": {},
+  "error": "[sse.cyclic] cyclic reference in expression [A]"
+}
\ No newline at end of file
diff --git a/pkg/registry/apis/query/testdata/with-expressions.json b/pkg/registry/apis/query/testdata/with-expressions.json
new file mode 100644
index 0000000000000..a1cbca89994ac
--- /dev/null
+++ b/pkg/registry/apis/query/testdata/with-expressions.json
@@ -0,0 +1,79 @@
+{
+  "description": "one hidden query with two expressions that start out-of-order",
+  "input": {
+    "from": "now-6",
+    "to": "now",
+    "queries": [
+      {
+        "refId": "C",
+        "datasource": {
+          "type": "",
+          "uid": "__expr__"
+        },
+        "type": "reduce",
+        "expression": "$B",
+        "reducer": "last"
+      },
+      {
+        "refId": "A",
+        "datasource": {
+          "type": "sql",
+          "uid": "123"
+        },
+        "hide": true
+      },
+      {
+        "refId": "B",
+        "datasource": {
+          "type": "",
+          "uid": "-100"
+        },
+        "type": "math",
+        "expression": "$A + 10"
+      }
+    ]
+  },
+  "expect": {
+    "requests": [
+      {
+        "pluginId": "sql",
+        "uid": "123",
+        "request": {
+          "from": "now-6",
+          "to": "now",
+          "queries": [
+            {
+              "refId": "A",
+              "datasource": {
+                "type": "sql",
+                "uid": "123"
+              }
+            }
+          ]
+        }
+      }
+    ],
+    "expressions": [
+      {
+        "id": 2,
+        "refId": "B",
+        "type": "math",
+        "properties": {
+          "expression": "$A + 10"
+        }
+      },
+      {
+        "id": 1,
+        "refId": "C",
+        "type": "reduce",
+        "properties": {
+          "expression": "$B",
+          "reducer": "last"
+        }
+      }
+    ],
+    "hide": [
+      "A"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/pkg/registry/apis/scope/register.go b/pkg/registry/apis/scope/register.go
new file mode 100644
index 0000000000000..71699b5f9ef90
--- /dev/null
+++ b/pkg/registry/apis/scope/register.go
@@ -0,0 +1,131 @@
+package scope
+
+import (
+	"fmt"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
+	"k8s.io/apiserver/pkg/authorization/authorizer"
+	"k8s.io/apiserver/pkg/registry/generic"
+	"k8s.io/apiserver/pkg/registry/rest"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+	"k8s.io/kube-openapi/pkg/common"
+
+	scope "github.com/grafana/grafana/pkg/apis/scope/v0alpha1"
+	"github.com/grafana/grafana/pkg/apiserver/builder"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+)
+
+var _ builder.APIGroupBuilder = (*ScopeAPIBuilder)(nil)
+
+// This is used just so wire has something unique to return
+type ScopeAPIBuilder struct{}
+
+func NewScopeAPIBuilder() *ScopeAPIBuilder {
+	return &ScopeAPIBuilder{}
+}
+
+func RegisterAPIService(features featuremgmt.FeatureToggles, apiregistration builder.APIRegistrar) *ScopeAPIBuilder {
+	if !features.IsEnabledGlobally(featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs) {
+		return nil // skip registration unless opting into experimental apis
+	}
+	builder := NewScopeAPIBuilder()
+	apiregistration.RegisterAPI(builder)
+	return builder
+}
+
+func (b *ScopeAPIBuilder) GetAuthorizer() authorizer.Authorizer {
+	return nil // default authorizer is fine
+}
+
+func (b *ScopeAPIBuilder) GetGroupVersion() schema.GroupVersion {
+	return scope.SchemeGroupVersion
+}
+
+func (b *ScopeAPIBuilder) InstallSchema(scheme *runtime.Scheme) error {
+	err := scope.AddToScheme(scheme)
+	if err != nil {
+		return err
+	}
+
+	err = scheme.AddFieldLabelConversionFunc(
+		scope.ScopeResourceInfo.GroupVersionKind(),
+		func(label, value string) (string, string, error) {
+			fieldSet := SelectableScopeFields(&scope.Scope{})
+			for key := range fieldSet {
+				if label == key {
+					return label, value, nil
+				}
+			}
+			return "", "", fmt.Errorf("field label not supported for %s: %s", scope.ScopeResourceInfo.GroupVersionKind(), label)
+		},
+	)
+	if err != nil {
+		return err
+	}
+
+	err = scheme.AddFieldLabelConversionFunc(
+		scope.ScopeDashboardBindingResourceInfo.GroupVersionKind(),
+		func(label, value string) (string, string, error) {
+			fieldSet := SelectableScopeDashboardBindingFields(&scope.ScopeDashboardBinding{})
+			for key := range fieldSet {
+				if label == key {
+					return label, value, nil
+				}
+			}
+			return "", "", fmt.Errorf("field label not supported for %s: %s", scope.ScopeDashboardBindingResourceInfo.GroupVersionKind(), label)
+		},
+	)
+	if err != nil {
+		return err
+	}
+
+	// This is required for --server-side apply
+	err = scope.AddKnownTypes(scope.InternalGroupVersion, scheme)
+	if err != nil {
+		return err
+	}
+
+	// Only one version right now
+	return scheme.SetVersionPriority(scope.SchemeGroupVersion)
+}
+
+func (b *ScopeAPIBuilder) GetAPIGroupInfo(
+	scheme *runtime.Scheme,
+	codecs serializer.CodecFactory,
+	optsGetter generic.RESTOptionsGetter,
+	_ bool, // dual write (not relevant)
+) (*genericapiserver.APIGroupInfo, error) {
+	apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(scope.GROUP, scheme, metav1.ParameterCodec, codecs)
+
+	scopeResourceInfo := scope.ScopeResourceInfo
+	scopeDashboardResourceInfo := scope.ScopeDashboardBindingResourceInfo
+
+	storage := map[string]rest.Storage{}
+
+	scopeStorage, err := newScopeStorage(scheme, optsGetter)
+	if err != nil {
+		return nil, err
+	}
+	storage[scopeResourceInfo.StoragePath()] = scopeStorage
+
+	scopeDashboardStorage, err := newScopeDashboardBindingStorage(scheme, optsGetter)
+	if err != nil {
+		return nil, err
+	}
+	storage[scopeDashboardResourceInfo.StoragePath()] = scopeDashboardStorage
+
+	apiGroupInfo.VersionedResourcesStorageMap[scope.VERSION] = storage
+	return &apiGroupInfo, nil
+}
+
+func (b *ScopeAPIBuilder) GetOpenAPIDefinitions() common.GetOpenAPIDefinitions {
+	return scope.GetOpenAPIDefinitions
+}
+
+// Register additional routes with the server
+func (b *ScopeAPIBuilder) GetAPIRoutes() *builder.APIRoutes {
+	return nil
+}
diff --git a/pkg/registry/apis/scope/storage.go b/pkg/registry/apis/scope/storage.go
new file mode 100644
index 0000000000000..1a2a7bdeb464d
--- /dev/null
+++ b/pkg/registry/apis/scope/storage.go
@@ -0,0 +1,133 @@
+package scope
+
+import (
+	"fmt"
+	"time"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/fields"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/generic"
+	genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"
+
+	scope "github.com/grafana/grafana/pkg/apis/scope/v0alpha1"
+	grafanaregistry "github.com/grafana/grafana/pkg/apiserver/registry/generic"
+	grafanarest "github.com/grafana/grafana/pkg/apiserver/rest"
+	"github.com/grafana/grafana/pkg/services/apiserver/utils"
+	apistore "k8s.io/apiserver/pkg/storage"
+)
+
+var _ grafanarest.Storage = (*storage)(nil)
+
+type storage struct {
+	*genericregistry.Store
+}
+
+func newScopeStorage(scheme *runtime.Scheme, optsGetter generic.RESTOptionsGetter) (*storage, error) {
+	strategy := grafanaregistry.NewStrategy(scheme)
+
+	resourceInfo := scope.ScopeResourceInfo
+	store := &genericregistry.Store{
+		NewFunc:                   resourceInfo.NewFunc,
+		NewListFunc:               resourceInfo.NewListFunc,
+		PredicateFunc:             Matcher,
+		DefaultQualifiedResource:  resourceInfo.GroupResource(),
+		SingularQualifiedResource: resourceInfo.SingularGroupResource(),
+		TableConvertor: utils.NewTableConverter(
+			resourceInfo.GroupResource(),
+			[]metav1.TableColumnDefinition{
+				{Name: "Name", Type: "string", Format: "name"},
+				{Name: "Created At", Type: "date"},
+			},
+			func(obj any) ([]interface{}, error) {
+				m, ok := obj.(*scope.Scope)
+				if !ok {
+					return nil, fmt.Errorf("expected scope")
+				}
+				return []interface{}{
+					m.Name,
+					m.CreationTimestamp.UTC().Format(time.RFC3339),
+				}, nil
+			},
+		),
+		CreateStrategy: strategy,
+		UpdateStrategy: strategy,
+		DeleteStrategy: strategy,
+	}
+	options := &generic.StoreOptions{RESTOptions: optsGetter, AttrFunc: GetAttrs}
+	if err := store.CompleteWithOptions(options); err != nil {
+		return nil, err
+	}
+	return &storage{Store: store}, nil
+}
+
+func newScopeDashboardBindingStorage(scheme *runtime.Scheme, optsGetter generic.RESTOptionsGetter) (*storage, error) {
+	strategy := grafanaregistry.NewStrategy(scheme)
+
+	resourceInfo := scope.ScopeDashboardBindingResourceInfo
+	store := &genericregistry.Store{
+		NewFunc:                   resourceInfo.NewFunc,
+		NewListFunc:               resourceInfo.NewListFunc,
+		PredicateFunc:             Matcher,
+		DefaultQualifiedResource:  resourceInfo.GroupResource(),
+		SingularQualifiedResource: resourceInfo.SingularGroupResource(),
+		TableConvertor: utils.NewTableConverter(
+			resourceInfo.GroupResource(),
+			[]metav1.TableColumnDefinition{
+				{Name: "Name", Type: "string", Format: "name"},
+				{Name: "Created At", Type: "date"},
+			},
+			func(obj any) ([]interface{}, error) {
+				m, ok := obj.(*scope.Scope)
+				if !ok {
+					return nil, fmt.Errorf("expected scope")
+				}
+				return []interface{}{
+					m.Name,
+					m.CreationTimestamp.UTC().Format(time.RFC3339),
+				}, nil
+			},
+		),
+		CreateStrategy: strategy,
+		UpdateStrategy: strategy,
+		DeleteStrategy: strategy,
+	}
+	options := &generic.StoreOptions{RESTOptions: optsGetter, AttrFunc: GetAttrs}
+	if err := store.CompleteWithOptions(options); err != nil {
+		return nil, err
+	}
+	return &storage{Store: store}, nil
+}
+
+func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, error) {
+	if s, ok := obj.(*scope.Scope); ok {
+		return labels.Set(s.Labels), SelectableScopeFields(s), nil
+	}
+	if s, ok := obj.(*scope.ScopeDashboardBinding); ok {
+		return labels.Set(s.Labels), SelectableScopeDashboardBindingFields(s), nil
+	}
+	return nil, nil, fmt.Errorf("not a scope or ScopeDashboardBinding object")
+}
+
+// Matcher returns a generic.SelectionPredicate that matches on label and field selectors.
+func Matcher(label labels.Selector, field fields.Selector) apistore.SelectionPredicate {
+	return apistore.SelectionPredicate{
+		Label:    label,
+		Field:    field,
+		GetAttrs: GetAttrs,
+	}
+}
+
+func SelectableScopeFields(obj *scope.Scope) fields.Set {
+	return generic.MergeFieldsSets(generic.ObjectMetaFieldsSet(&obj.ObjectMeta, false), fields.Set{
+		"spec.type":     obj.Spec.Type,
+		"spec.category": obj.Spec.Category,
+	})
+}
+
+func SelectableScopeDashboardBindingFields(obj *scope.ScopeDashboardBinding) fields.Set {
+	return generic.MergeFieldsSets(generic.ObjectMetaFieldsSet(&obj.ObjectMeta, false), fields.Set{
+		"spec.scope": obj.Spec.Scope,
+	})
+}
diff --git a/pkg/registry/apis/service/register.go b/pkg/registry/apis/service/register.go
new file mode 100644
index 0000000000000..17dbc3b07aa37
--- /dev/null
+++ b/pkg/registry/apis/service/register.go
@@ -0,0 +1,97 @@
+package service
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
+	"k8s.io/apiserver/pkg/authorization/authorizer"
+	"k8s.io/apiserver/pkg/registry/generic"
+	"k8s.io/apiserver/pkg/registry/rest"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+	"k8s.io/kube-openapi/pkg/common"
+
+	service "github.com/grafana/grafana/pkg/apis/service/v0alpha1"
+	"github.com/grafana/grafana/pkg/apiserver/builder"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+)
+
+var _ builder.APIGroupBuilder = (*ServiceAPIBuilder)(nil)
+
+// This is used just so wire has something unique to return
+type ServiceAPIBuilder struct{}
+
+func NewServiceAPIBuilder() *ServiceAPIBuilder {
+	return &ServiceAPIBuilder{}
+}
+
+func RegisterAPIService(features featuremgmt.FeatureToggles, apiregistration builder.APIRegistrar) *ServiceAPIBuilder {
+	if !features.IsEnabledGlobally(featuremgmt.FlagKubernetesAggregator) {
+		return nil // skip registration unless opting into aggregator mode
+	}
+
+	builder := NewServiceAPIBuilder()
+	apiregistration.RegisterAPI(NewServiceAPIBuilder())
+	return builder
+}
+
+func (b *ServiceAPIBuilder) GetAuthorizer() authorizer.Authorizer {
+	return nil // default authorizer is fine
+}
+
+func (b *ServiceAPIBuilder) GetGroupVersion() schema.GroupVersion {
+	return service.SchemeGroupVersion
+}
+
+func addKnownTypes(scheme *runtime.Scheme, gv schema.GroupVersion) {
+	scheme.AddKnownTypes(gv,
+		&service.ExternalName{},
+		&service.ExternalNameList{},
+	)
+}
+
+func (b *ServiceAPIBuilder) InstallSchema(scheme *runtime.Scheme) error {
+	gv := service.SchemeGroupVersion
+	err := service.AddToScheme(scheme)
+	if err != nil {
+		return err
+	}
+
+	// Link this version to the internal representation.
+	// This is used for server-side-apply (PATCH), and avoids the error:
+	//   "no kind is registered for the type"
+	addKnownTypes(scheme, schema.GroupVersion{
+		Group:   service.GROUP,
+		Version: runtime.APIVersionInternal,
+	})
+	metav1.AddToGroupVersion(scheme, gv)
+	return scheme.SetVersionPriority(gv)
+}
+
+func (b *ServiceAPIBuilder) GetAPIGroupInfo(
+	scheme *runtime.Scheme,
+	codecs serializer.CodecFactory,
+	optsGetter generic.RESTOptionsGetter,
+	_ bool,
+) (*genericapiserver.APIGroupInfo, error) {
+	apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(service.GROUP, scheme, metav1.ParameterCodec, codecs)
+
+	resourceInfo := service.ExternalNameResourceInfo
+	storage := map[string]rest.Storage{}
+	serviceStorage, err := newStorage(scheme, optsGetter)
+	if err != nil {
+		return nil, err
+	}
+	storage[resourceInfo.StoragePath()] = serviceStorage
+	apiGroupInfo.VersionedResourcesStorageMap[service.VERSION] = storage
+	return &apiGroupInfo, nil
+}
+
+func (b *ServiceAPIBuilder) GetOpenAPIDefinitions() common.GetOpenAPIDefinitions {
+	return service.GetOpenAPIDefinitions
+}
+
+// Register additional routes with the server
+func (b *ServiceAPIBuilder) GetAPIRoutes() *builder.APIRoutes {
+	return nil
+}
diff --git a/pkg/registry/apis/service/storage.go b/pkg/registry/apis/service/storage.go
new file mode 100644
index 0000000000000..a21023996dcb6
--- /dev/null
+++ b/pkg/registry/apis/service/storage.go
@@ -0,0 +1,62 @@
+package service
+
+import (
+	"fmt"
+	"time"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/generic"
+	genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"
+
+	service "github.com/grafana/grafana/pkg/apis/service/v0alpha1"
+	grafanaregistry "github.com/grafana/grafana/pkg/apiserver/registry/generic"
+	grafanarest "github.com/grafana/grafana/pkg/apiserver/rest"
+	"github.com/grafana/grafana/pkg/services/apiserver/utils"
+)
+
+var _ grafanarest.Storage = (*storage)(nil)
+
+type storage struct {
+	*genericregistry.Store
+}
+
+func newStorage(scheme *runtime.Scheme, optsGetter generic.RESTOptionsGetter) (*storage, error) {
+	strategy := grafanaregistry.NewStrategy(scheme)
+
+	resourceInfo := service.ExternalNameResourceInfo
+	store := &genericregistry.Store{
+		NewFunc:                   resourceInfo.NewFunc,
+		NewListFunc:               resourceInfo.NewListFunc,
+		PredicateFunc:             grafanaregistry.Matcher,
+		DefaultQualifiedResource:  resourceInfo.GroupResource(),
+		SingularQualifiedResource: resourceInfo.SingularGroupResource(),
+		TableConvertor: utils.NewTableConverter(
+			resourceInfo.GroupResource(),
+			[]metav1.TableColumnDefinition{
+				{Name: "Name", Type: "string", Format: "name"},
+				{Name: "Host", Type: "string", Format: "string", Description: "The service host"},
+				{Name: "Created At", Type: "date"},
+			},
+			func(obj any) ([]interface{}, error) {
+				m, ok := obj.(*service.ExternalName)
+				if !ok {
+					return nil, fmt.Errorf("expected playlist")
+				}
+				return []interface{}{
+					m.Name,
+					m.Spec.Host,
+					m.CreationTimestamp.UTC().Format(time.RFC3339),
+				}, nil
+			},
+		),
+		CreateStrategy: strategy,
+		UpdateStrategy: strategy,
+		DeleteStrategy: strategy,
+	}
+	options := &generic.StoreOptions{RESTOptions: optsGetter, AttrFunc: grafanaregistry.GetAttrs}
+	if err := store.CompleteWithOptions(options); err != nil {
+		return nil, err
+	}
+	return &storage{Store: store}, nil
+}
diff --git a/pkg/registry/apis/wireset.go b/pkg/registry/apis/wireset.go
index d96125ebc429d..e2bd94e9e7c25 100644
--- a/pkg/registry/apis/wireset.go
+++ b/pkg/registry/apis/wireset.go
@@ -3,10 +3,38 @@ package apiregistry
 import (
 	"github.com/google/wire"
 
-	"github.com/grafana/grafana/pkg/apis"
+	"github.com/grafana/grafana/pkg/registry/apis/dashboard"
+	"github.com/grafana/grafana/pkg/registry/apis/dashboardsnapshot"
+	"github.com/grafana/grafana/pkg/registry/apis/datasource"
+	"github.com/grafana/grafana/pkg/registry/apis/example"
+	"github.com/grafana/grafana/pkg/registry/apis/featuretoggle"
+	"github.com/grafana/grafana/pkg/registry/apis/folders"
+	"github.com/grafana/grafana/pkg/registry/apis/peakq"
+	"github.com/grafana/grafana/pkg/registry/apis/playlist"
+	"github.com/grafana/grafana/pkg/registry/apis/query"
+	"github.com/grafana/grafana/pkg/registry/apis/scope"
+	"github.com/grafana/grafana/pkg/registry/apis/service"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
 )
 
 var WireSet = wire.NewSet(
-	ProvideService,
-	apis.WireSet,
+	ProvideRegistryServiceSink, // dummy background service that forces registration
+
+	// read-only datasource abstractions
+	plugincontext.ProvideService,
+	wire.Bind(new(datasource.PluginContextWrapper), new(*plugincontext.Provider)),
+	datasource.ProvideDefaultPluginConfigs,
+
+	// Each must be added here *and* in the ServiceSink above
+	playlist.RegisterAPIService,
+	dashboard.RegisterAPIService,
+	example.RegisterAPIService,
+	dashboardsnapshot.RegisterAPIService,
+	featuretoggle.RegisterAPIService,
+	datasource.RegisterAPIService,
+	folders.RegisterAPIService,
+	peakq.RegisterAPIService,
+	service.RegisterAPIService,
+	query.RegisterAPIService,
+	scope.RegisterAPIService,
 )
diff --git a/pkg/registry/backgroundsvcs/background_services.go b/pkg/registry/backgroundsvcs/background_services.go
index 8e316697aa44f..43dd35bcd25ba 100644
--- a/pkg/registry/backgroundsvcs/background_services.go
+++ b/pkg/registry/backgroundsvcs/background_services.go
@@ -9,24 +9,24 @@ import (
 	"github.com/grafana/grafana/pkg/infra/usagestats/statscollector"
 	"github.com/grafana/grafana/pkg/registry"
 	apiregistry "github.com/grafana/grafana/pkg/registry/apis"
-	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/services/anonymous/anonimpl"
+	grafanaapiserver "github.com/grafana/grafana/pkg/services/apiserver"
 	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/cleanup"
+	"github.com/grafana/grafana/pkg/services/cloudmigration"
 	"github.com/grafana/grafana/pkg/services/dashboardsnapshots"
-	grafanaapiserver "github.com/grafana/grafana/pkg/services/grafana-apiserver"
 	"github.com/grafana/grafana/pkg/services/grpcserver"
 	"github.com/grafana/grafana/pkg/services/guardian"
 	ldapapi "github.com/grafana/grafana/pkg/services/ldap/api"
 	"github.com/grafana/grafana/pkg/services/live"
 	"github.com/grafana/grafana/pkg/services/live/pushhttp"
-	"github.com/grafana/grafana/pkg/services/login/authinfoservice"
 	"github.com/grafana/grafana/pkg/services/loginattempt/loginattemptimpl"
 	"github.com/grafana/grafana/pkg/services/ngalert"
 	"github.com/grafana/grafana/pkg/services/notifications"
 	plugindashboardsservice "github.com/grafana/grafana/pkg/services/plugindashboards/service"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/angulardetectorsprovider"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/keyretriever/dynamic"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginexternal"
 	pluginStore "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 	"github.com/grafana/grafana/pkg/services/provisioning"
 	publicdashboardsmetric "github.com/grafana/grafana/pkg/services/publicdashboards/metric"
@@ -36,6 +36,8 @@ import (
 	secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts"
 	samanager "github.com/grafana/grafana/pkg/services/serviceaccounts/manager"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	"github.com/grafana/grafana/pkg/services/ssosettings/ssosettingsimpl"
 	"github.com/grafana/grafana/pkg/services/store"
 	"github.com/grafana/grafana/pkg/services/store/entity"
 	"github.com/grafana/grafana/pkg/services/store/sanitizer"
@@ -48,22 +50,25 @@ func ProvideBackgroundServiceRegistry(
 	httpServer *api.HTTPServer, ng *ngalert.AlertNG, cleanup *cleanup.CleanUpService, live *live.GrafanaLive,
 	pushGateway *pushhttp.Gateway, notifications *notifications.NotificationService, pluginStore *pluginStore.Service,
 	rendering *rendering.RenderingService, tokenService auth.UserTokenBackgroundService, tracing *tracing.TracingService,
-	provisioning *provisioning.ProvisioningServiceImpl, alerting *alerting.AlertEngine, usageStats *uss.UsageStats,
+	provisioning *provisioning.ProvisioningServiceImpl, usageStats *uss.UsageStats,
 	statsCollector *statscollector.Service, grafanaUpdateChecker *updatechecker.GrafanaService,
 	pluginsUpdateChecker *updatechecker.PluginsService, metrics *metrics.InternalMetricsService,
 	secretsService *secretsManager.SecretsService, remoteCache *remotecache.RemoteCache, StorageService store.StorageService, searchService searchV2.SearchService, entityEventsService store.EntityEventsService,
-	saService *samanager.ServiceAccountsService, authInfoService *authinfoservice.Implementation,
-	grpcServerProvider grpcserver.Provider, secretMigrationProvider secretsMigrations.SecretMigrationProvider, loginAttemptService *loginattemptimpl.Service,
+	saService *samanager.ServiceAccountsService, grpcServerProvider grpcserver.Provider,
+	secretMigrationProvider secretsMigrations.SecretMigrationProvider, loginAttemptService *loginattemptimpl.Service,
 	bundleService *supportbundlesimpl.Service, publicDashboardsMetric *publicdashboardsmetric.Service,
 	keyRetriever *dynamic.KeyRetriever, dynamicAngularDetectorsProvider *angulardetectorsprovider.Dynamic,
 	grafanaAPIServer grafanaapiserver.Service,
 	anon *anonimpl.AnonDeviceService,
+	ssoSettings *ssosettingsimpl.Service,
+	pluginExternal *pluginexternal.Service,
 	// Need to make sure these are initialized, is there a better place to put them?
-	_ dashboardsnapshots.Service, _ *alerting.AlertNotificationService,
+	_ dashboardsnapshots.Service,
 	_ serviceaccounts.Service, _ *guardian.Provider,
 	_ *plugindashboardsservice.DashboardUpdater, _ *sanitizer.Provider,
 	_ *grpcserver.HealthService, _ entity.EntityStoreServer, _ *grpcserver.ReflectionService, _ *ldapapi.Service,
-	_ *apiregistry.Service, _ auth.IDService, _ *teamapi.TeamAPI,
+	_ *apiregistry.Service, _ auth.IDService, _ *teamapi.TeamAPI, _ ssosettings.Service,
+	_ cloudmigration.Service,
 ) *BackgroundServiceRegistry {
 	return NewBackgroundServiceRegistry(
 		httpServer,
@@ -75,7 +80,6 @@ func ProvideBackgroundServiceRegistry(
 		rendering,
 		tokenService,
 		provisioning,
-		alerting,
 		grafanaUpdateChecker,
 		pluginsUpdateChecker,
 		metrics,
@@ -89,7 +93,6 @@ func ProvideBackgroundServiceRegistry(
 		entityEventsService,
 		grpcServerProvider,
 		saService,
-		authInfoService,
 		pluginStore,
 		secretMigrationProvider,
 		loginAttemptService,
@@ -99,6 +102,8 @@ func ProvideBackgroundServiceRegistry(
 		dynamicAngularDetectorsProvider,
 		grafanaAPIServer,
 		anon,
+		ssoSettings,
+		pluginExternal,
 	)
 }
 
diff --git a/pkg/registry/corekind/base.go b/pkg/registry/corekind/base.go
deleted file mode 100644
index 3da8ee5a1c5f2..0000000000000
--- a/pkg/registry/corekind/base.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package corekind
-
-import (
-	"sync"
-
-	"github.com/google/wire"
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema"
-
-	"github.com/grafana/grafana/pkg/cuectx"
-)
-
-// KindSet contains all of the wire-style providers related to kinds.
-var KindSet = wire.NewSet(
-	NewBase,
-)
-
-var (
-	baseOnce    sync.Once
-	defaultBase *Base
-)
-
-// NewBase provides a registry of all core raw and structured kinds, without any
-// composition of slot kinds.
-//
-// All calling code within grafana/grafana is expected to use Grafana's
-// singleton [thema.Runtime], returned from [cuectx.GrafanaThemaRuntime]. If nil
-// is passed, the singleton will be used.
-func NewBase(rt *thema.Runtime) *Base {
-	allrt := cuectx.GrafanaThemaRuntime()
-	if rt == nil || rt == allrt {
-		baseOnce.Do(func() {
-			defaultBase = doNewBase(allrt)
-		})
-		return defaultBase
-	}
-
-	return doNewBase(rt)
-}
-
-// All returns a slice of [kindsys.Core] containing all core Grafana kinds.
-//
-// The returned slice is sorted lexicographically by kind machine name.
-func (b *Base) All() []kindsys.Core {
-	ret := make([]kindsys.Core, len(b.all))
-	copy(ret, b.all)
-	return ret
-}
diff --git a/pkg/registry/corekind/base_gen.go b/pkg/registry/corekind/base_gen.go
deleted file mode 100644
index 5f72862b04a0e..0000000000000
--- a/pkg/registry/corekind/base_gen.go
+++ /dev/null
@@ -1,173 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     BaseCoreRegistryJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package corekind
-
-import (
-	"fmt"
-
-	"github.com/grafana/grafana/pkg/kinds/accesspolicy"
-	"github.com/grafana/grafana/pkg/kinds/dashboard"
-	"github.com/grafana/grafana/pkg/kinds/folder"
-	"github.com/grafana/grafana/pkg/kinds/librarypanel"
-	"github.com/grafana/grafana/pkg/kinds/preferences"
-	"github.com/grafana/grafana/pkg/kinds/publicdashboard"
-	"github.com/grafana/grafana/pkg/kinds/role"
-	"github.com/grafana/grafana/pkg/kinds/rolebinding"
-	"github.com/grafana/grafana/pkg/kinds/team"
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema"
-)
-
-// Base is a registry of all Grafana core kinds. It is designed for use both inside
-// of Grafana itself, and for import by external Go programs wanting to work with Grafana's
-// kind system.
-//
-// The registry provides two modes for accessing core kinds:
-//   - Per-kind methods, which return the kind-specific type, e.g. Dashboard() returns [dashboard.Dashboard].
-//   - All(), which returns a slice of [kindsys.Core].
-//
-// Prefer the individual named methods for use cases where the particular kind(s) that
-// are needed are known to the caller. For example, a dashboard linter can know that it
-// specifically wants the dashboard kind.
-//
-// Prefer All() when performing operations generically across all kinds. For example,
-// a generic HTTP middleware for validating request bodies expected to contain some
-// kind-schematized type.
-type Base struct {
-	all             []kindsys.Core
-	accesspolicy    *accesspolicy.Kind
-	dashboard       *dashboard.Kind
-	folder          *folder.Kind
-	librarypanel    *librarypanel.Kind
-	preferences     *preferences.Kind
-	publicdashboard *publicdashboard.Kind
-	role            *role.Kind
-	rolebinding     *rolebinding.Kind
-	team            *team.Kind
-}
-
-// type guards
-var (
-	_ kindsys.Core = &accesspolicy.Kind{}
-	_ kindsys.Core = &dashboard.Kind{}
-	_ kindsys.Core = &folder.Kind{}
-	_ kindsys.Core = &librarypanel.Kind{}
-	_ kindsys.Core = &preferences.Kind{}
-	_ kindsys.Core = &publicdashboard.Kind{}
-	_ kindsys.Core = &role.Kind{}
-	_ kindsys.Core = &rolebinding.Kind{}
-	_ kindsys.Core = &team.Kind{}
-)
-
-// AccessPolicy returns the [kindsys.Interface] implementation for the accesspolicy kind.
-func (b *Base) AccessPolicy() *accesspolicy.Kind {
-	return b.accesspolicy
-}
-
-// Dashboard returns the [kindsys.Interface] implementation for the dashboard kind.
-func (b *Base) Dashboard() *dashboard.Kind {
-	return b.dashboard
-}
-
-// Folder returns the [kindsys.Interface] implementation for the folder kind.
-func (b *Base) Folder() *folder.Kind {
-	return b.folder
-}
-
-// LibraryPanel returns the [kindsys.Interface] implementation for the librarypanel kind.
-func (b *Base) LibraryPanel() *librarypanel.Kind {
-	return b.librarypanel
-}
-
-// Preferences returns the [kindsys.Interface] implementation for the preferences kind.
-func (b *Base) Preferences() *preferences.Kind {
-	return b.preferences
-}
-
-// PublicDashboard returns the [kindsys.Interface] implementation for the publicdashboard kind.
-func (b *Base) PublicDashboard() *publicdashboard.Kind {
-	return b.publicdashboard
-}
-
-// Role returns the [kindsys.Interface] implementation for the role kind.
-func (b *Base) Role() *role.Kind {
-	return b.role
-}
-
-// RoleBinding returns the [kindsys.Interface] implementation for the rolebinding kind.
-func (b *Base) RoleBinding() *rolebinding.Kind {
-	return b.rolebinding
-}
-
-// Team returns the [kindsys.Interface] implementation for the team kind.
-func (b *Base) Team() *team.Kind {
-	return b.team
-}
-
-func doNewBase(rt *thema.Runtime) *Base {
-	var err error
-	reg := &Base{}
-
-	reg.accesspolicy, err = accesspolicy.NewKind(rt)
-	if err != nil {
-		panic(fmt.Sprintf("error while initializing the accesspolicy Kind: %s", err))
-	}
-	reg.all = append(reg.all, reg.accesspolicy)
-
-	reg.dashboard, err = dashboard.NewKind(rt)
-	if err != nil {
-		panic(fmt.Sprintf("error while initializing the dashboard Kind: %s", err))
-	}
-	reg.all = append(reg.all, reg.dashboard)
-
-	reg.folder, err = folder.NewKind(rt)
-	if err != nil {
-		panic(fmt.Sprintf("error while initializing the folder Kind: %s", err))
-	}
-	reg.all = append(reg.all, reg.folder)
-
-	reg.librarypanel, err = librarypanel.NewKind(rt)
-	if err != nil {
-		panic(fmt.Sprintf("error while initializing the librarypanel Kind: %s", err))
-	}
-	reg.all = append(reg.all, reg.librarypanel)
-
-	reg.preferences, err = preferences.NewKind(rt)
-	if err != nil {
-		panic(fmt.Sprintf("error while initializing the preferences Kind: %s", err))
-	}
-	reg.all = append(reg.all, reg.preferences)
-
-	reg.publicdashboard, err = publicdashboard.NewKind(rt)
-	if err != nil {
-		panic(fmt.Sprintf("error while initializing the publicdashboard Kind: %s", err))
-	}
-	reg.all = append(reg.all, reg.publicdashboard)
-
-	reg.role, err = role.NewKind(rt)
-	if err != nil {
-		panic(fmt.Sprintf("error while initializing the role Kind: %s", err))
-	}
-	reg.all = append(reg.all, reg.role)
-
-	reg.rolebinding, err = rolebinding.NewKind(rt)
-	if err != nil {
-		panic(fmt.Sprintf("error while initializing the rolebinding Kind: %s", err))
-	}
-	reg.all = append(reg.all, reg.rolebinding)
-
-	reg.team, err = team.NewKind(rt)
-	if err != nil {
-		panic(fmt.Sprintf("error while initializing the team Kind: %s", err))
-	}
-	reg.all = append(reg.all, reg.team)
-
-	return reg
-}
diff --git a/pkg/registry/schemas/composable_kind.go b/pkg/registry/schemas/composable_kind.go
new file mode 100644
index 0000000000000..e17a71e15a924
--- /dev/null
+++ b/pkg/registry/schemas/composable_kind.go
@@ -0,0 +1,448 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     public/app/plugins/gen.go
+// Using jennies:
+//     PluginRegistryJenny
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package schemas
+
+import (
+	"fmt"
+	"io"
+	"io/fs"
+	"os"
+	"path/filepath"
+	"runtime"
+	"testing/fstest"
+
+	"cuelang.org/go/cue"
+	"cuelang.org/go/cue/cuecontext"
+	"cuelang.org/go/cue/load"
+)
+
+var cueImportsPath = filepath.Join("packages", "grafana-schema", "src", "common")
+var importPath = "github.com/grafana/grafana/packages/grafana-schema/src/common"
+
+type ComposableKind struct {
+	Name     string
+	Filename string
+	CueFile  cue.Value
+}
+
+func GetComposableKinds() ([]ComposableKind, error) {
+	kinds := make([]ComposableKind, 0)
+
+	_, caller, _, _ := runtime.Caller(0)
+	root := filepath.Join(caller, "../../../..")
+
+	azuremonitorCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/datasource/azuremonitor/dataquery.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "azuremonitor",
+		Filename: "dataquery.cue",
+		CueFile:  azuremonitorCue,
+	})
+
+	googlecloudmonitoringCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/datasource/cloud-monitoring/dataquery.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "googlecloudmonitoring",
+		Filename: "dataquery.cue",
+		CueFile:  googlecloudmonitoringCue,
+	})
+
+	cloudwatchCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/datasource/cloudwatch/dataquery.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "cloudwatch",
+		Filename: "dataquery.cue",
+		CueFile:  cloudwatchCue,
+	})
+
+	elasticsearchCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/datasource/elasticsearch/dataquery.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "elasticsearch",
+		Filename: "dataquery.cue",
+		CueFile:  elasticsearchCue,
+	})
+
+	grafanapyroscopeCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/datasource/grafana-pyroscope-datasource/dataquery.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "grafanapyroscope",
+		Filename: "dataquery.cue",
+		CueFile:  grafanapyroscopeCue,
+	})
+
+	lokiCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/datasource/loki/dataquery.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "loki",
+		Filename: "dataquery.cue",
+		CueFile:  lokiCue,
+	})
+
+	parcaCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/datasource/parca/dataquery.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "parca",
+		Filename: "dataquery.cue",
+		CueFile:  parcaCue,
+	})
+
+	tempoCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/datasource/tempo/dataquery.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "tempo",
+		Filename: "dataquery.cue",
+		CueFile:  tempoCue,
+	})
+
+	annotationslistCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/panel/annolist/panelcfg.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "annotationslist",
+		Filename: "panelcfg.cue",
+		CueFile:  annotationslistCue,
+	})
+
+	barchartCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/panel/barchart/panelcfg.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "barchart",
+		Filename: "panelcfg.cue",
+		CueFile:  barchartCue,
+	})
+
+	bargaugeCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/panel/bargauge/panelcfg.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "bargauge",
+		Filename: "panelcfg.cue",
+		CueFile:  bargaugeCue,
+	})
+
+	candlestickCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/panel/candlestick/panelcfg.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "candlestick",
+		Filename: "panelcfg.cue",
+		CueFile:  candlestickCue,
+	})
+
+	canvasCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/panel/canvas/panelcfg.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "canvas",
+		Filename: "panelcfg.cue",
+		CueFile:  canvasCue,
+	})
+
+	dashboardlistCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/panel/dashlist/panelcfg.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "dashboardlist",
+		Filename: "panelcfg.cue",
+		CueFile:  dashboardlistCue,
+	})
+
+	datagridCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/panel/datagrid/panelcfg.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "datagrid",
+		Filename: "panelcfg.cue",
+		CueFile:  datagridCue,
+	})
+
+	debugCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/panel/debug/panelcfg.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "debug",
+		Filename: "panelcfg.cue",
+		CueFile:  debugCue,
+	})
+
+	gaugeCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/panel/gauge/panelcfg.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "gauge",
+		Filename: "panelcfg.cue",
+		CueFile:  gaugeCue,
+	})
+
+	geomapCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/panel/geomap/panelcfg.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "geomap",
+		Filename: "panelcfg.cue",
+		CueFile:  geomapCue,
+	})
+
+	heatmapCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/panel/heatmap/panelcfg.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "heatmap",
+		Filename: "panelcfg.cue",
+		CueFile:  heatmapCue,
+	})
+
+	histogramCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/panel/histogram/panelcfg.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "histogram",
+		Filename: "panelcfg.cue",
+		CueFile:  histogramCue,
+	})
+
+	logsCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/panel/logs/panelcfg.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "logs",
+		Filename: "panelcfg.cue",
+		CueFile:  logsCue,
+	})
+
+	newsCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/panel/news/panelcfg.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "news",
+		Filename: "panelcfg.cue",
+		CueFile:  newsCue,
+	})
+
+	nodegraphCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/panel/nodeGraph/panelcfg.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "nodegraph",
+		Filename: "panelcfg.cue",
+		CueFile:  nodegraphCue,
+	})
+
+	piechartCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/panel/piechart/panelcfg.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "piechart",
+		Filename: "panelcfg.cue",
+		CueFile:  piechartCue,
+	})
+
+	statCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/panel/stat/panelcfg.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "stat",
+		Filename: "panelcfg.cue",
+		CueFile:  statCue,
+	})
+
+	statetimelineCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/panel/state-timeline/panelcfg.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "statetimeline",
+		Filename: "panelcfg.cue",
+		CueFile:  statetimelineCue,
+	})
+
+	statushistoryCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/panel/status-history/panelcfg.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "statushistory",
+		Filename: "panelcfg.cue",
+		CueFile:  statushistoryCue,
+	})
+
+	tableCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/panel/table/panelcfg.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "table",
+		Filename: "panelcfg.cue",
+		CueFile:  tableCue,
+	})
+
+	textCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/panel/text/panelcfg.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "text",
+		Filename: "panelcfg.cue",
+		CueFile:  textCue,
+	})
+
+	timeseriesCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/panel/timeseries/panelcfg.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "timeseries",
+		Filename: "panelcfg.cue",
+		CueFile:  timeseriesCue,
+	})
+
+	trendCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/panel/trend/panelcfg.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "trend",
+		Filename: "panelcfg.cue",
+		CueFile:  trendCue,
+	})
+
+	xychartCue, err := loadCueFileWithCommon(root, filepath.Join(root, "./public/app/plugins/panel/xychart/panelcfg.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, ComposableKind{
+		Name:     "xychart",
+		Filename: "panelcfg.cue",
+		CueFile:  xychartCue,
+	})
+
+	return kinds, nil
+}
+
+func loadCueFileWithCommon(root string, entrypoint string) (cue.Value, error) {
+	commonFS, err := mockCommonFS(root)
+	if err != nil {
+		fmt.Printf("cannot load common cue files: %s\n", err)
+		return cue.Value{}, err
+	}
+
+	overlay, err := buildOverlay(commonFS)
+	if err != nil {
+		fmt.Printf("Cannot build overlay: %s\n", err)
+		return cue.Value{}, err
+	}
+
+	bis := load.Instances([]string{entrypoint}, &load.Config{
+		ModuleRoot: "/",
+		Overlay:    overlay,
+	})
+
+	values, err := cuecontext.New().BuildInstances(bis)
+	if err != nil {
+		fmt.Printf("Cannot build instance: %s\n", err)
+		return cue.Value{}, err
+	}
+
+	return values[0], nil
+}
+
+func mockCommonFS(root string) (fs.FS, error) {
+	path := filepath.Join(root, cueImportsPath)
+	dir, err := os.ReadDir(path)
+	if err != nil {
+		return nil, fmt.Errorf("cannot open common cue files directory: %s", err)
+	}
+
+	prefix := "cue.mod/pkg/" + importPath
+
+	commonFS := fstest.MapFS{}
+	for _, d := range dir {
+		if d.IsDir() {
+			continue
+		}
+
+		readPath := filepath.Join(path, d.Name())
+		b, err := os.ReadFile(filepath.Clean(readPath))
+		if err != nil {
+			return nil, err
+		}
+
+		commonFS[filepath.Join(prefix, d.Name())] = &fstest.MapFile{Data: b}
+	}
+
+	return commonFS, nil
+}
+
+// It loads common cue files into the schema to be able to make import works
+func buildOverlay(commonFS fs.FS) (map[string]load.Source, error) {
+	overlay := make(map[string]load.Source)
+
+	err := fs.WalkDir(commonFS, ".", func(path string, d fs.DirEntry, err error) error {
+		if err != nil {
+			return err
+		}
+
+		if d.IsDir() {
+			return nil
+		}
+
+		f, err := commonFS.Open(path)
+		if err != nil {
+			return err
+		}
+		defer func() { _ = f.Close() }()
+
+		b, err := io.ReadAll(f)
+		if err != nil {
+			return err
+		}
+
+		overlay[filepath.Join("/", path)] = load.FromBytes(b)
+
+		return nil
+	})
+
+	return overlay, err
+}
diff --git a/pkg/registry/schemas/core_kind.go b/pkg/registry/schemas/core_kind.go
new file mode 100644
index 0000000000000..596eeedf04330
--- /dev/null
+++ b/pkg/registry/schemas/core_kind.go
@@ -0,0 +1,115 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     kinds/gen.go
+// Using jennies:
+//     CoreRegistryJenny
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+package schemas
+
+import (
+	"os"
+	"path/filepath"
+	"runtime"
+
+	"cuelang.org/go/cue"
+	"cuelang.org/go/cue/cuecontext"
+)
+
+type CoreKind struct {
+	Name    string
+	CueFile cue.Value
+}
+
+func GetCoreKinds() ([]CoreKind, error) {
+	ctx := cuecontext.New()
+	kinds := make([]CoreKind, 0)
+
+	_, caller, _, _ := runtime.Caller(0)
+	root := filepath.Join(caller, "../../../..")
+
+	accesspolicyCue, err := loadCueFile(ctx, filepath.Join(root, "./kinds/accesspolicy/access_policy_kind.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, CoreKind{
+		Name:    "accesspolicy",
+		CueFile: accesspolicyCue,
+	})
+
+	dashboardCue, err := loadCueFile(ctx, filepath.Join(root, "./kinds/dashboard/dashboard_kind.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, CoreKind{
+		Name:    "dashboard",
+		CueFile: dashboardCue,
+	})
+
+	librarypanelCue, err := loadCueFile(ctx, filepath.Join(root, "./kinds/librarypanel/librarypanel_kind.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, CoreKind{
+		Name:    "librarypanel",
+		CueFile: librarypanelCue,
+	})
+
+	preferencesCue, err := loadCueFile(ctx, filepath.Join(root, "./kinds/preferences/preferences_kind.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, CoreKind{
+		Name:    "preferences",
+		CueFile: preferencesCue,
+	})
+
+	publicdashboardCue, err := loadCueFile(ctx, filepath.Join(root, "./kinds/publicdashboard/public_dashboard_kind.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, CoreKind{
+		Name:    "publicdashboard",
+		CueFile: publicdashboardCue,
+	})
+
+	roleCue, err := loadCueFile(ctx, filepath.Join(root, "./kinds/role/role_kind.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, CoreKind{
+		Name:    "role",
+		CueFile: roleCue,
+	})
+
+	rolebindingCue, err := loadCueFile(ctx, filepath.Join(root, "./kinds/rolebinding/role_binding_kind.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, CoreKind{
+		Name:    "rolebinding",
+		CueFile: rolebindingCue,
+	})
+
+	teamCue, err := loadCueFile(ctx, filepath.Join(root, "./kinds/team/team_kind.cue"))
+	if err != nil {
+		return nil, err
+	}
+	kinds = append(kinds, CoreKind{
+		Name:    "team",
+		CueFile: teamCue,
+	})
+
+	return kinds, nil
+}
+
+func loadCueFile(ctx *cue.Context, path string) (cue.Value, error) {
+	cueFile, err := os.ReadFile(path)
+	if err != nil {
+		return cue.Value{}, err
+	}
+
+	return ctx.CompileBytes(cueFile), nil
+}
diff --git a/pkg/server/module_server.go b/pkg/server/module_server.go
index 8031a50567b31..af3f4d9e8d6ca 100644
--- a/pkg/server/module_server.go
+++ b/pkg/server/module_server.go
@@ -15,6 +15,7 @@ import (
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/modules"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	storageServer "github.com/grafana/grafana/pkg/services/store/entity/server"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
@@ -129,6 +130,10 @@ func (s *ModuleServer) Run() error {
 	//	s.log.Debug("apiserver feature is disabled")
 	//}
 
+	m.RegisterModule(modules.StorageServer, func() (services.Service, error) {
+		return storageServer.ProvideService(s.cfg, s.features)
+	})
+
 	m.RegisterModule(modules.All, nil)
 
 	return m.Run(s.context)
diff --git a/pkg/server/server.go b/pkg/server/server.go
index a9de82ef90297..ca1263d9e4db3 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -13,6 +13,8 @@ import (
 
 	"golang.org/x/sync/errgroup"
 
+	"github.com/prometheus/client_golang/prometheus"
+
 	"github.com/grafana/grafana/pkg/api"
 	_ "github.com/grafana/grafana/pkg/extensions"
 	"github.com/grafana/grafana/pkg/infra/log"
@@ -38,9 +40,10 @@ type Options struct {
 func New(opts Options, cfg *setting.Cfg, httpServer *api.HTTPServer, roleRegistry accesscontrol.RoleRegistry,
 	provisioningService provisioning.ProvisioningService, backgroundServiceProvider registry.BackgroundServiceRegistry,
 	usageStatsProvidersRegistry registry.UsageStatsProvidersRegistry, statsCollectorService *statscollector.Service,
+	promReg prometheus.Registerer,
 ) (*Server, error) {
 	statsCollectorService.RegisterProviders(usageStatsProvidersRegistry.GetServices())
-	s, err := newServer(opts, cfg, httpServer, roleRegistry, provisioningService, backgroundServiceProvider)
+	s, err := newServer(opts, cfg, httpServer, roleRegistry, provisioningService, backgroundServiceProvider, promReg)
 	if err != nil {
 		return nil, err
 	}
@@ -54,11 +57,13 @@ func New(opts Options, cfg *setting.Cfg, httpServer *api.HTTPServer, roleRegistr
 
 func newServer(opts Options, cfg *setting.Cfg, httpServer *api.HTTPServer, roleRegistry accesscontrol.RoleRegistry,
 	provisioningService provisioning.ProvisioningService, backgroundServiceProvider registry.BackgroundServiceRegistry,
+	promReg prometheus.Registerer,
 ) (*Server, error) {
 	rootCtx, shutdownFn := context.WithCancel(context.Background())
 	childRoutines, childCtx := errgroup.WithContext(rootCtx)
 
 	s := &Server{
+		promReg:             promReg,
 		context:             childCtx,
 		childRoutines:       childRoutines,
 		HTTPServer:          httpServer,
@@ -101,6 +106,7 @@ type Server struct {
 	HTTPServer          *api.HTTPServer
 	roleRegistry        accesscontrol.RoleRegistry
 	provisioningService provisioning.ProvisioningService
+	promReg             prometheus.Registerer
 }
 
 // Init initializes the server and its services.
@@ -117,7 +123,7 @@ func (s *Server) Init() error {
 		return err
 	}
 
-	if err := metrics.SetEnvironmentInformation(s.cfg.MetricsGrafanaEnvironmentInfo); err != nil {
+	if err := metrics.SetEnvironmentInformation(s.promReg, s.cfg.MetricsGrafanaEnvironmentInfo); err != nil {
 		return err
 	}
 
diff --git a/pkg/server/server_test.go b/pkg/server/server_test.go
index 1c45a5a82f220..5e1d57b2fa3b2 100644
--- a/pkg/server/server_test.go
+++ b/pkg/server/server_test.go
@@ -7,6 +7,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/registry"
@@ -48,7 +49,7 @@ func (s *testService) IsDisabled() bool {
 
 func testServer(t *testing.T, services ...registry.BackgroundService) *Server {
 	t.Helper()
-	s, err := newServer(Options{}, setting.NewCfg(), nil, &acimpl.Service{}, nil, backgroundsvcs.NewBackgroundServiceRegistry(services...))
+	s, err := newServer(Options{}, setting.NewCfg(), nil, &acimpl.Service{}, nil, backgroundsvcs.NewBackgroundServiceRegistry(services...), prometheus.NewRegistry())
 	require.NoError(t, err)
 	// Required to skip configuration initialization that causes
 	// DI errors in this test.
diff --git a/pkg/server/test_env.go b/pkg/server/test_env.go
index 2d54760fd5a90..6420fd63bb08a 100644
--- a/pkg/server/test_env.go
+++ b/pkg/server/test_env.go
@@ -3,6 +3,7 @@ package server
 import (
 	"github.com/grafana/grafana/pkg/infra/httpclient"
 	"github.com/grafana/grafana/pkg/plugins/manager/registry"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/grpcserver"
 	"github.com/grafana/grafana/pkg/services/notifications"
 	"github.com/grafana/grafana/pkg/services/oauthtoken/oauthtokentest"
@@ -18,6 +19,7 @@ func ProvideTestEnv(
 	pluginRegistry registry.Service,
 	httpClientProvider httpclient.Provider,
 	oAuthTokenService *oauthtokentest.Service,
+	featureMgmt featuremgmt.FeatureToggles,
 ) (*TestEnv, error) {
 	return &TestEnv{
 		Server:              server,
@@ -27,6 +29,7 @@ func ProvideTestEnv(
 		PluginRegistry:      pluginRegistry,
 		HTTPClientProvider:  httpClientProvider,
 		OAuthTokenService:   oAuthTokenService,
+		FeatureToggles:      featureMgmt,
 	}, nil
 }
 
@@ -39,4 +42,5 @@ type TestEnv struct {
 	HTTPClientProvider  httpclient.Provider
 	OAuthTokenService   *oauthtokentest.Service
 	RequestMiddleware   web.Middleware
+	FeatureToggles      featuremgmt.FeatureToggles
 }
diff --git a/pkg/server/wire.go b/pkg/server/wire.go
index 24231f93fbe97..64d94f62d6862 100644
--- a/pkg/server/wire.go
+++ b/pkg/server/wire.go
@@ -15,7 +15,6 @@ import (
 	"github.com/grafana/grafana/pkg/api/avatar"
 	"github.com/grafana/grafana/pkg/api/routing"
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/cuectx"
 	"github.com/grafana/grafana/pkg/expr"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/httpclient"
@@ -31,23 +30,25 @@ import (
 	"github.com/grafana/grafana/pkg/infra/usagestats/statscollector"
 	"github.com/grafana/grafana/pkg/infra/usagestats/validator"
 	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/login/social/socialimpl"
 	"github.com/grafana/grafana/pkg/middleware/csrf"
 	"github.com/grafana/grafana/pkg/middleware/loggermw"
 	apiregistry "github.com/grafana/grafana/pkg/registry/apis"
-	"github.com/grafana/grafana/pkg/registry/corekind"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/ossaccesscontrol"
-	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/services/annotations"
 	"github.com/grafana/grafana/pkg/services/annotations/annotationsimpl"
 	"github.com/grafana/grafana/pkg/services/anonymous/anonimpl/anonstore"
 	"github.com/grafana/grafana/pkg/services/apikey/apikeyimpl"
+	grafanaapiserver "github.com/grafana/grafana/pkg/services/apiserver"
+	"github.com/grafana/grafana/pkg/services/apiserver/standalone"
 	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/auth/idimpl"
 	"github.com/grafana/grafana/pkg/services/auth/jwt"
 	"github.com/grafana/grafana/pkg/services/authn/authnimpl"
 	"github.com/grafana/grafana/pkg/services/cleanup"
+	"github.com/grafana/grafana/pkg/services/cloudmigration/cloudmigrationimpl"
 	"github.com/grafana/grafana/pkg/services/contexthandler"
 	"github.com/grafana/grafana/pkg/services/correlations"
 	"github.com/grafana/grafana/pkg/services/dashboardimport"
@@ -64,13 +65,10 @@ import (
 	"github.com/grafana/grafana/pkg/services/encryption"
 	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
 	"github.com/grafana/grafana/pkg/services/extsvcauth"
-	"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver"
-	"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver/oasimpl"
 	extsvcreg "github.com/grafana/grafana/pkg/services/extsvcauth/registry"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/folder/folderimpl"
-	grafanaapiserver "github.com/grafana/grafana/pkg/services/grafana-apiserver"
 	"github.com/grafana/grafana/pkg/services/grpcserver"
 	grpccontext "github.com/grafana/grafana/pkg/services/grpcserver/context"
 	"github.com/grafana/grafana/pkg/services/grpcserver/interceptors"
@@ -83,16 +81,13 @@ import (
 	"github.com/grafana/grafana/pkg/services/live"
 	"github.com/grafana/grafana/pkg/services/live/pushhttp"
 	"github.com/grafana/grafana/pkg/services/login"
-	"github.com/grafana/grafana/pkg/services/login/authinfoservice"
-	authinfodatabase "github.com/grafana/grafana/pkg/services/login/authinfoservice/database"
+	"github.com/grafana/grafana/pkg/services/login/authinfoimpl"
 	"github.com/grafana/grafana/pkg/services/loginattempt"
 	"github.com/grafana/grafana/pkg/services/loginattempt/loginattemptimpl"
 	"github.com/grafana/grafana/pkg/services/navtree/navtreeimpl"
 	"github.com/grafana/grafana/pkg/services/ngalert"
 	ngimage "github.com/grafana/grafana/pkg/services/ngalert/image"
 	ngmetrics "github.com/grafana/grafana/pkg/services/ngalert/metrics"
-	ngmigration "github.com/grafana/grafana/pkg/services/ngalert/migration"
-	migrationStore "github.com/grafana/grafana/pkg/services/ngalert/migration/store"
 	ngstore "github.com/grafana/grafana/pkg/services/ngalert/store"
 	"github.com/grafana/grafana/pkg/services/notifications"
 	"github.com/grafana/grafana/pkg/services/oauthtoken"
@@ -123,19 +118,23 @@ import (
 	"github.com/grafana/grafana/pkg/services/serviceaccounts"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts/extsvcaccounts"
 	serviceaccountsmanager "github.com/grafana/grafana/pkg/services/serviceaccounts/manager"
+	serviceaccountsproxy "github.com/grafana/grafana/pkg/services/serviceaccounts/proxy"
 	serviceaccountsretriever "github.com/grafana/grafana/pkg/services/serviceaccounts/retriever"
 	"github.com/grafana/grafana/pkg/services/shorturls"
 	"github.com/grafana/grafana/pkg/services/shorturls/shorturlimpl"
 	"github.com/grafana/grafana/pkg/services/signingkeys"
 	"github.com/grafana/grafana/pkg/services/signingkeys/signingkeysimpl"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/services/sqlstore/sqlutil"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	ssoSettingsImpl "github.com/grafana/grafana/pkg/services/ssosettings/ssosettingsimpl"
 	starApi "github.com/grafana/grafana/pkg/services/star/api"
 	"github.com/grafana/grafana/pkg/services/star/starimpl"
 	"github.com/grafana/grafana/pkg/services/stats/statsimpl"
 	"github.com/grafana/grafana/pkg/services/store"
-	"github.com/grafana/grafana/pkg/services/store/entity/httpentitystore"
+	entityDB "github.com/grafana/grafana/pkg/services/store/entity/db"
+	"github.com/grafana/grafana/pkg/services/store/entity/db/dbimpl"
 	"github.com/grafana/grafana/pkg/services/store/entity/sqlstash"
-	"github.com/grafana/grafana/pkg/services/store/kind"
 	"github.com/grafana/grafana/pkg/services/store/resolver"
 	"github.com/grafana/grafana/pkg/services/store/sanitizer"
 	"github.com/grafana/grafana/pkg/services/supportbundles"
@@ -148,12 +147,14 @@ import (
 	tempuser "github.com/grafana/grafana/pkg/services/temp_user"
 	"github.com/grafana/grafana/pkg/services/temp_user/tempuserimpl"
 	"github.com/grafana/grafana/pkg/services/updatechecker"
+	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/user/userimpl"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor"
 	cloudmonitoring "github.com/grafana/grafana/pkg/tsdb/cloud-monitoring"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch"
 	"github.com/grafana/grafana/pkg/tsdb/elasticsearch"
+	postgres "github.com/grafana/grafana/pkg/tsdb/grafana-postgresql-datasource"
 	pyroscope "github.com/grafana/grafana/pkg/tsdb/grafana-pyroscope-datasource"
 	testdatasource "github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource"
 	"github.com/grafana/grafana/pkg/tsdb/grafanads"
@@ -166,7 +167,6 @@ import (
 	"github.com/grafana/grafana/pkg/tsdb/mysql"
 	"github.com/grafana/grafana/pkg/tsdb/opentsdb"
 	"github.com/grafana/grafana/pkg/tsdb/parca"
-	"github.com/grafana/grafana/pkg/tsdb/postgres"
 	"github.com/grafana/grafana/pkg/tsdb/prometheus"
 	"github.com/grafana/grafana/pkg/tsdb/tempo"
 )
@@ -176,9 +176,6 @@ var wireBasicSet = wire.NewSet(
 	wire.Bind(new(legacydata.RequestHandler), new(*legacydataservice.Service)),
 	annotationsimpl.ProvideService,
 	wire.Bind(new(annotations.Repository), new(*annotationsimpl.RepositoryImpl)),
-	alerting.ProvideAlertStore,
-	alerting.ProvideAlertEngine,
-	wire.Bind(new(alerting.UsageStatsQuerier), new(*alerting.AlertEngine)),
 	New,
 	api.ProvideHTTPServer,
 	query.ProvideService,
@@ -224,9 +221,9 @@ var wireBasicSet = wire.NewSet(
 	quotaimpl.ProvideService,
 	remotecache.ProvideService,
 	wire.Bind(new(remotecache.CacheStorage), new(*remotecache.RemoteCache)),
-	authinfoservice.ProvideAuthInfoService,
-	wire.Bind(new(login.AuthInfoService), new(*authinfoservice.Implementation)),
-	authinfodatabase.ProvideAuthInfoStore,
+	authinfoimpl.ProvideService,
+	wire.Bind(new(login.AuthInfoService), new(*authinfoimpl.Service)),
+	authinfoimpl.ProvideStore,
 	datasourceproxy.ProvideService,
 	search.ProvideService,
 	searchV2.ProvideService,
@@ -242,8 +239,6 @@ var wireBasicSet = wire.NewSet(
 	wire.Bind(new(jwt.JWTService), new(*jwt.AuthService)),
 	ngstore.ProvideDBStore,
 	ngimage.ProvideDeleteExpiredService,
-	ngmigration.ProvideService,
-	migrationStore.ProvideMigrationStore,
 	ngalert.ProvideService,
 	librarypanels.ProvideService,
 	wire.Bind(new(librarypanels.Service), new(*librarypanels.LibraryPanelService)),
@@ -252,14 +247,14 @@ var wireBasicSet = wire.NewSet(
 	notifications.ProvideService,
 	notifications.ProvideSmtpService,
 	tracing.ProvideService,
+	tracing.ProvideTracingConfig,
 	wire.Bind(new(tracing.Tracer), new(*tracing.TracingService)),
-	metrics.ProvideService,
 	testdatasource.ProvideService,
 	ldapapi.ProvideService,
 	opentsdb.ProvideService,
-	social.ProvideService,
+	socialimpl.ProvideService,
 	influxdb.ProvideService,
-	wire.Bind(new(social.Service), new(*social.SocialService)),
+	wire.Bind(new(social.Service), new(*socialimpl.SocialService)),
 	tempo.ProvideService,
 	loki.ProvideService,
 	graphite.ProvideService,
@@ -282,13 +277,14 @@ var wireBasicSet = wire.NewSet(
 	dashsnapsvc.ProvideService,
 	datasourceservice.ProvideService,
 	wire.Bind(new(datasources.DataSourceService), new(*datasourceservice.Service)),
-	alerting.ProvideService,
+	datasourceservice.ProvideLegacyDataSourceLookup,
 	serviceaccountsretriever.ProvideService,
 	wire.Bind(new(serviceaccountsretriever.ServiceAccountRetriever), new(*serviceaccountsretriever.Service)),
 	ossaccesscontrol.ProvideServiceAccountPermissions,
 	wire.Bind(new(accesscontrol.ServiceAccountPermissionsService), new(*ossaccesscontrol.ServiceAccountPermissionsService)),
 	serviceaccountsmanager.ProvideServiceAccountsService,
-	wire.Bind(new(serviceaccounts.Service), new(*serviceaccountsmanager.ServiceAccountsService)),
+	serviceaccountsproxy.ProvideServiceAccountsProxy,
+	wire.Bind(new(serviceaccounts.Service), new(*serviceaccountsproxy.ServiceAccountsProxy)),
 	expr.ProvideService,
 	featuremgmt.ProvideManagerService,
 	featuremgmt.ProvideToggles,
@@ -305,16 +301,11 @@ var wireBasicSet = wire.NewSet(
 	plugindashboardsservice.ProvideService,
 	wire.Bind(new(plugindashboards.Service), new(*plugindashboardsservice.Service)),
 	plugindashboardsservice.ProvideDashboardUpdater,
-	alerting.ProvideDashAlertExtractorService,
-	wire.Bind(new(alerting.DashAlertExtractor), new(*alerting.DashAlertExtractorService)),
 	guardian.ProvideService,
 	sanitizer.ProvideService,
 	secretsStore.ProvideService,
 	avatar.ProvideAvatarCacheServer,
 	statscollector.ProvideService,
-	corekind.KindSet,
-	cuectx.GrafanaCUEContext,
-	cuectx.GrafanaThemaRuntime,
 	csrf.ProvideCSRFFilter,
 	wire.Bind(new(csrf.Service), new(*csrf.CSRF)),
 	ossaccesscontrol.ProvideTeamPermissions,
@@ -342,10 +333,10 @@ var wireBasicSet = wire.NewSet(
 	grpcserver.ProvideHealthService,
 	grpcserver.ProvideReflectionService,
 	interceptors.ProvideAuthenticator,
-	kind.ProvideService, // The registry of known kinds
+	dbimpl.ProvideEntityDB,
+	wire.Bind(new(entityDB.EntityDBInterface), new(*dbimpl.EntityDB)),
 	sqlstash.ProvideSQLEntityServer,
 	resolver.ProvideEntityReferenceResolver,
-	httpentitystore.ProvideHTTPEntityStore,
 	teamimpl.ProvideService,
 	teamapi.ProvideTeamAPI,
 	tempuserimpl.ProvideService,
@@ -368,8 +359,6 @@ var wireBasicSet = wire.NewSet(
 	supportbundlesimpl.ProvideService,
 	extsvcaccounts.ProvideExtSvcAccountsService,
 	wire.Bind(new(serviceaccounts.ExtSvcAccountsService), new(*extsvcaccounts.ExtSvcAccountsService)),
-	oasimpl.ProvideService,
-	wire.Bind(new(oauthserver.OAuth2Server), new(*oasimpl.OAuth2ServiceImpl)),
 	extsvcreg.ProvideExtSvcRegistry,
 	wire.Bind(new(extsvcauth.ExternalServiceRegistry), new(*extsvcreg.Registry)),
 	anonstore.ProvideAnonDBStore,
@@ -377,15 +366,21 @@ var wireBasicSet = wire.NewSet(
 	loggermw.Provide,
 	signingkeysimpl.ProvideEmbeddedSigningKeysService,
 	wire.Bind(new(signingkeys.Service), new(*signingkeysimpl.Service)),
+	ssoSettingsImpl.ProvideService,
+	wire.Bind(new(ssosettings.Service), new(*ssoSettingsImpl.Service)),
 	idimpl.ProvideService,
 	wire.Bind(new(auth.IDService), new(*idimpl.Service)),
+	cloudmigrationimpl.ProvideService,
+	userimpl.ProvideVerifier,
+	wire.Bind(new(user.Verifier), new(*userimpl.Verifier)),
+	// Kubernetes API server
 	grafanaapiserver.WireSet,
 	apiregistry.WireSet,
 )
 
 var wireSet = wire.NewSet(
 	wireBasicSet,
-	metrics.ProvideRegisterer,
+	metrics.WireSet,
 	sqlstore.ProvideService,
 	ngmetrics.ProvideService,
 	wire.Bind(new(notifications.Service), new(*notifications.NotificationService)),
@@ -400,6 +395,7 @@ var wireSet = wire.NewSet(
 var wireCLISet = wire.NewSet(
 	NewRunner,
 	wireBasicSet,
+	metrics.WireSet,
 	sqlstore.ProvideService,
 	ngmetrics.ProvideService,
 	wire.Bind(new(notifications.Service), new(*notifications.NotificationService)),
@@ -414,7 +410,7 @@ var wireCLISet = wire.NewSet(
 var wireTestSet = wire.NewSet(
 	wireBasicSet,
 	ProvideTestEnv,
-	metrics.ProvideRegistererForTest,
+	metrics.WireSetForTest,
 	sqlstore.ProvideServiceForTests,
 	ngmetrics.ProvideServiceForTest,
 	notifications.MockNotificationService,
@@ -433,7 +429,7 @@ func Initialize(cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*Ser
 	return &Server{}, nil
 }
 
-func InitializeForTest(cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*TestEnv, error) {
+func InitializeForTest(t sqlutil.ITestDB, cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*TestEnv, error) {
 	wire.Build(wireExtsTestSet)
 	return &TestEnv{Server: &Server{}, SQLStore: &sqlstore.SQLStore{}}, nil
 }
@@ -456,3 +452,9 @@ func InitializeModuleServer(cfg *setting.Cfg, opts Options, apiOpts api.ServerOp
 	wire.Build(wireExtsModuleServerSet)
 	return &ModuleServer{}, nil
 }
+
+// Initialize the standalone APIServer factory
+func InitializeAPIServerFactory() (standalone.APIServerFactory, error) {
+	wire.Build(wireExtsStandaloneAPIServerSet)
+	return &standalone.DummyAPIFactory{}, nil // Wire will replace this with a real interface
+}
diff --git a/pkg/server/wireexts_oss.go b/pkg/server/wireexts_oss.go
index 0c4082fa52065..6b9cb1407b125 100644
--- a/pkg/server/wireexts_oss.go
+++ b/pkg/server/wireexts_oss.go
@@ -7,6 +7,7 @@ package server
 import (
 	"github.com/google/wire"
 
+	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/manager"
 	"github.com/grafana/grafana/pkg/registry"
@@ -17,6 +18,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol/ossaccesscontrol"
 	"github.com/grafana/grafana/pkg/services/anonymous"
 	"github.com/grafana/grafana/pkg/services/anonymous/anonimpl"
+	"github.com/grafana/grafana/pkg/services/apiserver/standalone"
 	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/auth/authimpl"
 	"github.com/grafana/grafana/pkg/services/auth/idimpl"
@@ -31,10 +33,11 @@ import (
 	"github.com/grafana/grafana/pkg/services/ldap"
 	"github.com/grafana/grafana/pkg/services/licensing"
 	"github.com/grafana/grafana/pkg/services/login"
-	"github.com/grafana/grafana/pkg/services/login/authinfoservice"
+	"github.com/grafana/grafana/pkg/services/login/authinfoimpl"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration"
 	"github.com/grafana/grafana/pkg/services/provisioning"
 	"github.com/grafana/grafana/pkg/services/publicdashboards"
+	publicdashboardsApi "github.com/grafana/grafana/pkg/services/publicdashboards/api"
 	publicdashboardsService "github.com/grafana/grafana/pkg/services/publicdashboards/service"
 	"github.com/grafana/grafana/pkg/services/searchusers"
 	"github.com/grafana/grafana/pkg/services/searchusers/filters"
@@ -68,8 +71,8 @@ var wireExtsBasicSet = wire.NewSet(
 	wire.Bind(new(registry.BackgroundServiceRegistry), new(*backgroundsvcs.BackgroundServiceRegistry)),
 	migrations.ProvideOSSMigrations,
 	wire.Bind(new(registry.DatabaseMigrator), new(*migrations.OSSMigrations)),
-	authinfoservice.ProvideOSSUserProtectionService,
-	wire.Bind(new(login.UserProtectionService), new(*authinfoservice.OSSUserProtectionImpl)),
+	authinfoimpl.ProvideOSSUserProtectionService,
+	wire.Bind(new(login.UserProtectionService), new(*authinfoimpl.OSSUserProtectionImpl)),
 	encryptionprovider.ProvideEncryptionProvider,
 	wire.Bind(new(encryption.Provider), new(encryptionprovider.Provider)),
 	filters.ProvideOSSSearchUserFilter,
@@ -87,6 +90,8 @@ var wireExtsBasicSet = wire.NewSet(
 	ossaccesscontrol.ProvideDatasourcePermissionsService,
 	wire.Bind(new(accesscontrol.DatasourcePermissionsService), new(*ossaccesscontrol.DatasourcePermissionsService)),
 	pluginsintegration.WireExtensionSet,
+	publicdashboardsApi.ProvideMiddleware,
+	wire.Bind(new(publicdashboards.Middleware), new(*publicdashboardsApi.Middleware)),
 	publicdashboardsService.ProvideServiceWrapper,
 	wire.Bind(new(publicdashboards.ServiceWrapper), new(*publicdashboardsService.PublicDashboardServiceWrapperImpl)),
 	caching.ProvideCachingService,
@@ -120,6 +125,7 @@ var wireExtsTestSet = wire.NewSet(
 var wireExtsBaseCLISet = wire.NewSet(
 	NewModuleRunner,
 
+	metrics.WireSet,
 	featuremgmt.ProvideManagerService,
 	featuremgmt.ProvideToggles,
 	hooks.ProvideService,
@@ -132,3 +138,7 @@ var wireExtsModuleServerSet = wire.NewSet(
 	NewModule,
 	wireExtsBaseCLISet,
 )
+
+var wireExtsStandaloneAPIServerSet = wire.NewSet(
+	standalone.GetDummyAPIFactory,
+)
diff --git a/pkg/services/accesscontrol/accesscontrol.go b/pkg/services/accesscontrol/accesscontrol.go
index 6434663080a8d..616d876a205ee 100644
--- a/pkg/services/accesscontrol/accesscontrol.go
+++ b/pkg/services/accesscontrol/accesscontrol.go
@@ -2,7 +2,9 @@ package accesscontrol
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"strconv"
 	"strings"
 
 	"github.com/grafana/grafana/pkg/registry"
@@ -24,6 +26,8 @@ type Service interface {
 	registry.ProvidesUsageStats
 	// GetUserPermissions returns user permissions with only action and scope fields set.
 	GetUserPermissions(ctx context.Context, user identity.Requester, options Options) ([]Permission, error)
+	// GetUserPermissionsInOrg return user permission in a specific organization
+	GetUserPermissionsInOrg(ctx context.Context, user identity.Requester, orgID int64) ([]Permission, error)
 	// SearchUsersPermissions returns all users' permissions filtered by an action prefix
 	SearchUsersPermissions(ctx context.Context, user identity.Requester, options SearchOptions) (map[int64][]Permission, error)
 	// ClearUserPermissionCache removes the permission cache entry for the given user
@@ -33,6 +37,9 @@ type Service interface {
 	// DeleteUserPermissions removes all permissions user has in org and all permission to that user
 	// If orgID is set to 0 remove permissions from all orgs
 	DeleteUserPermissions(ctx context.Context, orgID, userID int64) error
+	// DeleteTeamPermissions removes all role assignments and permissions granted to a team
+	// and removes permissions scoped to the team.
+	DeleteTeamPermissions(ctx context.Context, orgID, teamID int64) error
 	// DeclareFixedRoles allows the caller to declare, to the service, fixed roles and their
 	// assignments to organization roles ("Viewer", "Editor", "Admin") or "Grafana Admin"
 	DeclareFixedRoles(registrations ...RoleRegistration) error
@@ -40,6 +47,19 @@ type Service interface {
 	SaveExternalServiceRole(ctx context.Context, cmd SaveExternalServiceRoleCommand) error
 	// DeleteExternalServiceRole removes an external service's role and its assignment.
 	DeleteExternalServiceRole(ctx context.Context, externalServiceID string) error
+	// SyncUserRoles adds provided roles to user
+	SyncUserRoles(ctx context.Context, orgID int64, cmd SyncUserRolesCommand) error
+}
+
+//go:generate  mockery --name Store --structname MockStore --outpkg actest --filename store_mock.go --output ./actest/
+type Store interface {
+	GetUserPermissions(ctx context.Context, query GetUserPermissionsQuery) ([]Permission, error)
+	SearchUsersPermissions(ctx context.Context, orgID int64, options SearchOptions) (map[int64][]Permission, error)
+	GetUsersBasicRoles(ctx context.Context, userFilter []int64, orgID int64) (map[int64][]string, error)
+	DeleteUserPermissions(ctx context.Context, orgID, userID int64) error
+	DeleteTeamPermissions(ctx context.Context, orgID, teamID int64) error
+	SaveExternalServiceRole(ctx context.Context, cmd SaveExternalServiceRoleCommand) error
+	DeleteExternalServiceRole(ctx context.Context, externalServiceID string) error
 }
 
 type RoleRegistry interface {
@@ -55,7 +75,54 @@ type SearchOptions struct {
 	ActionPrefix string // Needed for the PoC v1, it's probably going to be removed.
 	Action       string
 	Scope        string
-	UserID       int64 // ID for the user for which to return information, if none is specified information is returned for all users.
+	NamespacedID string    // ID of the identity (ex: user:3, service-account:4)
+	wildcards    Wildcards // private field computed based on the Scope
+	RolePrefixes []string
+}
+
+// Wildcards computes the wildcard scopes that include the scope
+func (s *SearchOptions) Wildcards() []string {
+	if s.wildcards != nil {
+		return s.wildcards
+	}
+
+	if s.Scope == "" {
+		s.wildcards = []string{}
+		return s.wildcards
+	}
+
+	s.wildcards = WildcardsFromPrefix(ScopePrefix(s.Scope))
+	return s.wildcards
+}
+
+func (s *SearchOptions) ComputeUserID() (int64, error) {
+	if s.NamespacedID == "" {
+		return 0, errors.New("namespacedID must be set")
+	}
+	// Split namespaceID into namespace and ID
+	parts := strings.Split(s.NamespacedID, ":")
+	// Validate namespace ID format
+	if len(parts) != 2 {
+		return 0, fmt.Errorf("invalid namespaced ID: %s", s.NamespacedID)
+	}
+	// Validate namespace type is user or service account
+	if parts[0] != identity.NamespaceUser && parts[0] != identity.NamespaceServiceAccount {
+		return 0, fmt.Errorf("invalid namespace: %s", parts[0])
+	}
+	// Validate namespace ID is a number
+	id, err := strconv.ParseInt(parts[1], 10, 64)
+	if err != nil {
+		return 0, fmt.Errorf("invalid namespaced ID: %s", s.NamespacedID)
+	}
+	return id, nil
+}
+
+type SyncUserRolesCommand struct {
+	UserID int64
+	// name of roles the user should have
+	RolesToAdd []string
+	// name of roles the user should not have
+	RolesToRemove []string
 }
 
 type TeamPermissionsService interface {
@@ -104,26 +171,20 @@ type User struct {
 // HasGlobalAccess checks user access with globally assigned permissions only
 func HasGlobalAccess(ac AccessControl, service Service, c *contextmodel.ReqContext) func(evaluator Evaluator) bool {
 	return func(evaluator Evaluator) bool {
-		userCopy := *c.SignedInUser
-		userCopy.OrgID = GlobalOrgID
-		userCopy.OrgRole = ""
-		userCopy.OrgName = ""
-		if userCopy.Permissions[GlobalOrgID] == nil {
-			permissions, err := service.GetUserPermissions(c.Req.Context(), &userCopy, Options{})
-			if err != nil {
-				c.Logger.Error("Failed fetching permissions for user", "userID", userCopy.UserID, "error", err)
-			}
-			userCopy.Permissions[GlobalOrgID] = GroupScopesByAction(permissions)
+		var targetOrgID int64 = GlobalOrgID
+		tmpUser, err := makeTmpUser(c.Req.Context(), service, nil, nil, c.SignedInUser, targetOrgID)
+		if err != nil {
+			deny(c, nil, fmt.Errorf("failed to authenticate user in target org: %w", err))
 		}
 
-		hasAccess, err := ac.Evaluate(c.Req.Context(), &userCopy, evaluator)
+		hasAccess, err := ac.Evaluate(c.Req.Context(), tmpUser, evaluator)
 		if err != nil {
 			c.Logger.Error("Error from access control system", "error", err)
 			return false
 		}
 
 		// set on user so we don't fetch global permissions every time this is called
-		c.SignedInUser.Permissions[GlobalOrgID] = userCopy.Permissions[GlobalOrgID]
+		c.SignedInUser.Permissions[tmpUser.GetOrgID()] = tmpUser.GetPermissions()
 
 		return hasAccess
 	}
@@ -238,110 +299,6 @@ func Reduce(ps []Permission) map[string][]string {
 	return reduced
 }
 
-// intersectScopes computes the minimal list of scopes common to two slices.
-func intersectScopes(s1, s2 []string) []string {
-	if len(s1) == 0 || len(s2) == 0 {
-		return []string{}
-	}
-
-	// helpers
-	splitScopes := func(s []string) (map[string]bool, map[string]bool) {
-		scopes := make(map[string]bool)
-		wildcards := make(map[string]bool)
-		for _, s := range s {
-			if isWildcard(s) {
-				wildcards[s] = true
-			} else {
-				scopes[s] = true
-			}
-		}
-		return scopes, wildcards
-	}
-	includes := func(wildcardsSet map[string]bool, scope string) bool {
-		for wildcard := range wildcardsSet {
-			if wildcard == "*" || strings.HasPrefix(scope, wildcard[:len(wildcard)-1]) {
-				return true
-			}
-		}
-		return false
-	}
-
-	res := make([]string, 0)
-
-	// split input into scopes and wildcards
-	s1Scopes, s1Wildcards := splitScopes(s1)
-	s2Scopes, s2Wildcards := splitScopes(s2)
-
-	// intersect wildcards
-	wildcards := make(map[string]bool)
-	for s := range s1Wildcards {
-		// if s1 wildcard is included in s2 wildcards
-		// then it is included in the intersection
-		if includes(s2Wildcards, s) {
-			wildcards[s] = true
-			continue
-		}
-	}
-	for s := range s2Wildcards {
-		// if s2 wildcard is included in s1 wildcards
-		// then it is included in the intersection
-		if includes(s1Wildcards, s) {
-			wildcards[s] = true
-		}
-	}
-
-	// intersect scopes
-	scopes := make(map[string]bool)
-	for s := range s1Scopes {
-		// if s1 scope is included in s2 wilcards or s2 scopes
-		// then it is included in the intersection
-		if includes(s2Wildcards, s) || s2Scopes[s] {
-			scopes[s] = true
-		}
-	}
-	for s := range s2Scopes {
-		// if s2 scope is included in s1 wilcards
-		// then it is included in the intersection
-		if includes(s1Wildcards, s) {
-			scopes[s] = true
-		}
-	}
-
-	// merge wildcards and scopes
-	for w := range wildcards {
-		res = append(res, w)
-	}
-	for s := range scopes {
-		res = append(res, s)
-	}
-
-	return res
-}
-
-// Intersect returns the intersection of two slices of permissions, grouping scopes by action.
-func Intersect(p1, p2 []Permission) map[string][]string {
-	if len(p1) == 0 || len(p2) == 0 {
-		return map[string][]string{}
-	}
-
-	res := make(map[string][]string)
-	p1m := Reduce(p1)
-	p2m := Reduce(p2)
-
-	// Loop over the smallest map
-	if len(p1m) > len(p2m) {
-		p1m, p2m = p2m, p1m
-	}
-
-	for a1, s1 := range p1m {
-		if s2, ok := p2m[a1]; ok {
-			res[a1] = intersectScopes(s1, s2)
-		}
-	}
-
-	return res
-}
-
 func ValidateScope(scope string) bool {
 	prefix, last := scope[:len(scope)-1], scope[len(scope)-1]
 	// verify that last char is either ':' or '/' if last character of scope is '*'
@@ -371,6 +328,10 @@ func GetOrgRoles(user identity.Requester) []string {
 	roles := []string{string(user.GetOrgRole())}
 
 	if user.GetIsGrafanaAdmin() {
+		if user.GetOrgID() == GlobalOrgID {
+			// A server admin is the admin of the global organization
+			return []string{RoleGrafanaAdmin, string(org.RoleAdmin)}
+		}
 		roles = append(roles, RoleGrafanaAdmin)
 	}
 
diff --git a/pkg/services/accesscontrol/accesscontrol_test.go b/pkg/services/accesscontrol/accesscontrol_test.go
index 1b13136cb78a9..b39ca3b8a8042 100644
--- a/pkg/services/accesscontrol/accesscontrol_test.go
+++ b/pkg/services/accesscontrol/accesscontrol_test.go
@@ -1,7 +1,6 @@
 package accesscontrol
 
 import (
-	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -126,210 +125,3 @@ func TestReduce(t *testing.T) {
 		})
 	}
 }
-
-func TestIntersect(t *testing.T) {
-	tests := []struct {
-		name string
-		p1   []Permission
-		p2   []Permission
-		want map[string][]string
-	}{
-		{
-			name: "no permission",
-			p1:   []Permission{},
-			p2:   []Permission{},
-			want: map[string][]string{},
-		},
-		{
-			name: "no intersection",
-			p1:   []Permission{{Action: "orgs:read"}},
-			p2:   []Permission{{Action: "orgs:write"}},
-			want: map[string][]string{},
-		},
-		{
-			name: "intersection no scopes",
-			p1:   []Permission{{Action: "orgs:read"}},
-			p2:   []Permission{{Action: "orgs:read"}},
-			want: map[string][]string{"orgs:read": {}},
-		},
-		{
-			name: "unbalanced intersection",
-			p1:   []Permission{{Action: "teams:read", Scope: "teams:id:1"}},
-			p2:   []Permission{{Action: "teams:read"}},
-			want: map[string][]string{"teams:read": {}},
-		},
-		{
-			name: "intersection",
-			p1: []Permission{
-				{Action: "teams:read", Scope: "teams:id:1"},
-				{Action: "teams:read", Scope: "teams:id:2"},
-				{Action: "teams:write", Scope: "teams:id:1"},
-			},
-			p2: []Permission{
-				{Action: "teams:read", Scope: "teams:id:1"},
-				{Action: "teams:read", Scope: "teams:id:3"},
-				{Action: "teams:write", Scope: "teams:id:1"},
-			},
-			want: map[string][]string{
-				"teams:read":  {"teams:id:1"},
-				"teams:write": {"teams:id:1"},
-			},
-		},
-		{
-			name: "intersection with wildcards",
-			p1: []Permission{
-				{Action: "teams:read", Scope: "teams:id:1"},
-				{Action: "teams:read", Scope: "teams:id:2"},
-				{Action: "teams:write", Scope: "teams:id:1"},
-			},
-			p2: []Permission{
-				{Action: "teams:read", Scope: "*"},
-				{Action: "teams:write", Scope: "*"},
-			},
-			want: map[string][]string{
-				"teams:read":  {"teams:id:1", "teams:id:2"},
-				"teams:write": {"teams:id:1"},
-			},
-		},
-		{
-			name: "intersection with wildcards on both sides",
-			p1: []Permission{
-				{Action: "dashboards:read", Scope: "dashboards:uid:1"},
-				{Action: "dashboards:read", Scope: "folders:uid:1"},
-				{Action: "dashboards:read", Scope: "dashboards:uid:*"},
-				{Action: "folders:read", Scope: "folders:uid:1"},
-			},
-			p2: []Permission{
-				{Action: "dashboards:read", Scope: "folders:uid:*"},
-				{Action: "dashboards:read", Scope: "dashboards:uid:*"},
-				{Action: "folders:read", Scope: "folders:uid:*"},
-			},
-			want: map[string][]string{
-				"dashboards:read": {"dashboards:uid:*", "folders:uid:1"},
-				"folders:read":    {"folders:uid:1"},
-			},
-		},
-		{
-			name: "intersection with wildcards of different sizes",
-			p1: []Permission{
-				{Action: "dashboards:read", Scope: "folders:uid:1"},
-				{Action: "dashboards:read", Scope: "dashboards:*"},
-				{Action: "folders:read", Scope: "folders:*"},
-				{Action: "teams:read", Scope: "teams:id:1"},
-			},
-			p2: []Permission{
-				{Action: "dashboards:read", Scope: "folders:uid:*"},
-				{Action: "dashboards:read", Scope: "dashboards:uid:*"},
-				{Action: "folders:read", Scope: "folders:uid:*"},
-				{Action: "teams:read", Scope: "*"},
-			},
-			want: map[string][]string{
-				"dashboards:read": {"dashboards:uid:*", "folders:uid:1"},
-				"folders:read":    {"folders:uid:*"},
-				"teams:read":      {"teams:id:1"},
-			},
-		},
-	}
-	check := func(t *testing.T, want map[string][]string, p1, p2 []Permission) {
-		intersect := Intersect(p1, p2)
-		for action, scopes := range intersect {
-			want, ok := want[action]
-			require.True(t, ok)
-			require.ElementsMatch(t, scopes, want, fmt.Sprintf("scopes for %v differs from expected", action))
-		}
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Intersect is commutative
-			check(t, tt.want, tt.p1, tt.p2)
-			check(t, tt.want, tt.p2, tt.p1)
-		})
-	}
-}
-
-func Test_intersectScopes(t *testing.T) {
-	tests := []struct {
-		name string
-		s1   []string
-		s2   []string
-		want []string
-	}{
-		{
-			name: "no values",
-			s1:   []string{},
-			s2:   []string{},
-			want: []string{},
-		},
-		{
-			name: "no values on one side",
-			s1:   []string{},
-			s2:   []string{"teams:id:1"},
-			want: []string{},
-		},
-		{
-			name: "empty values on one side",
-			s1:   []string{""},
-			s2:   []string{"team:id:1"},
-			want: []string{},
-		},
-		{
-			name: "no intersection",
-			s1:   []string{"teams:id:1"},
-			s2:   []string{"teams:id:2"},
-			want: []string{},
-		},
-		{
-			name: "intersection",
-			s1:   []string{"teams:id:1"},
-			s2:   []string{"teams:id:1"},
-			want: []string{"teams:id:1"},
-		},
-		{
-			name: "intersection with wildcard",
-			s1:   []string{"teams:id:1", "teams:id:2"},
-			s2:   []string{"teams:id:*"},
-			want: []string{"teams:id:1", "teams:id:2"},
-		},
-		{
-			name: "intersection of wildcards",
-			s1:   []string{"teams:id:*"},
-			s2:   []string{"teams:id:*"},
-			want: []string{"teams:id:*"},
-		},
-		{
-			name: "intersection with a bigger wildcards",
-			s1:   []string{"teams:id:*"},
-			s2:   []string{"teams:*"},
-			want: []string{"teams:id:*"},
-		},
-		{
-			name: "intersection of different wildcards with a bigger one",
-			s1:   []string{"dashboards:uid:*", "folders:uid:*"},
-			s2:   []string{"*"},
-			want: []string{"dashboards:uid:*", "folders:uid:*"},
-		},
-		{
-			name: "intersection with wildcards and scopes on both sides",
-			s1:   []string{"dashboards:uid:*", "folders:uid:1"},
-			s2:   []string{"folders:uid:*", "dashboards:uid:1"},
-			want: []string{"dashboards:uid:1", "folders:uid:1"},
-		},
-		{
-			name: "intersection of non reduced list of scopes",
-			s1:   []string{"dashboards:uid:*", "dashboards:*", "dashboards:uid:1"},
-			s2:   []string{"dashboards:uid:*", "dashboards:*", "dashboards:uid:2"},
-			want: []string{"dashboards:uid:*", "dashboards:*", "dashboards:uid:1", "dashboards:uid:2"},
-		},
-	}
-	check := func(t *testing.T, want []string, s1, s2 []string) {
-		intersect := intersectScopes(s1, s2)
-		require.ElementsMatch(t, want, intersect)
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Intersect is commutative
-			check(t, tt.want, tt.s1, tt.s2)
-			check(t, tt.want, tt.s2, tt.s1)
-		})
-	}
-}
diff --git a/pkg/services/accesscontrol/acimpl/accesscontrol.go b/pkg/services/accesscontrol/acimpl/accesscontrol.go
index f99e4edbe8284..b26900ca0b94f 100644
--- a/pkg/services/accesscontrol/acimpl/accesscontrol.go
+++ b/pkg/services/accesscontrol/acimpl/accesscontrol.go
@@ -38,14 +38,19 @@ func (a *AccessControl) Evaluate(ctx context.Context, user identity.Requester, e
 		return false, nil
 	}
 
-	namespace, identifier := user.GetNamespacedID()
-	if len(user.GetPermissions()) == 0 {
-		a.log.Debug("No permissions set for entity", "namespace", namespace, "id", identifier, "orgID", user.GetOrgID(), "login", user.GetLogin())
+	// If the user is in no organization, then the evaluation must happen based on the user's global permissions
+	permissions := user.GetPermissions()
+	if user.GetOrgID() == accesscontrol.NoOrgID {
+		permissions = user.GetGlobalPermissions()
+	}
+	if len(permissions) == 0 {
+		a.debug(ctx, user, "No permissions set", evaluator)
 		return false, nil
 	}
 
+	a.debug(ctx, user, "Evaluating permissions", evaluator)
 	// Test evaluation without scope resolver first, this will prevent 403 for wildcard scopes when resource does not exist
-	if evaluator.Evaluate(user.GetPermissions()) {
+	if evaluator.Evaluate(permissions) {
 		return true, nil
 	}
 
@@ -57,9 +62,15 @@ func (a *AccessControl) Evaluate(ctx context.Context, user identity.Requester, e
 		return false, err
 	}
 
-	return resolvedEvaluator.Evaluate(user.GetPermissions()), nil
+	a.debug(ctx, user, "Evaluating resolved permissions", resolvedEvaluator)
+	return resolvedEvaluator.Evaluate(permissions), nil
 }
 
 func (a *AccessControl) RegisterScopeAttributeResolver(prefix string, resolver accesscontrol.ScopeAttributeResolver) {
 	a.resolvers.AddScopeAttributeResolver(prefix, resolver)
 }
+
+func (a *AccessControl) debug(ctx context.Context, ident identity.Requester, msg string, eval accesscontrol.Evaluator) {
+	namespace, id := ident.GetNamespacedID()
+	a.log.FromContext(ctx).Debug(msg, "namespace", namespace, "id", id, "orgID", ident.GetOrgID(), "permissions", eval.GoString())
+}
diff --git a/pkg/services/accesscontrol/acimpl/service.go b/pkg/services/accesscontrol/acimpl/service.go
index 9a649d60bf781..5cd05fd094175 100644
--- a/pkg/services/accesscontrol/acimpl/service.go
+++ b/pkg/services/accesscontrol/acimpl/service.go
@@ -3,6 +3,7 @@ package acimpl
 import (
 	"context"
 	"fmt"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
@@ -23,7 +24,9 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol/pluginutils"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/authn"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -34,8 +37,15 @@ const (
 	cacheTTL = 10 * time.Second
 )
 
+var SharedWithMeFolderPermission = accesscontrol.Permission{
+	Action: dashboards.ActionFoldersRead,
+	Scope:  dashboards.ScopeFoldersProvider.GetResourceScopeUID(folder.SharedWithMeFolderUID),
+}
+
+var OSSRolesPrefixes = []string{accesscontrol.ManagedRolePrefix, accesscontrol.ExternalServiceRolePrefix}
+
 func ProvideService(cfg *setting.Cfg, db db.DB, routeRegister routing.RouteRegister, cache *localcache.CacheService,
-	accessControl accesscontrol.AccessControl, features *featuremgmt.FeatureManager) (*Service, error) {
+	accessControl accesscontrol.AccessControl, features featuremgmt.FeatureToggles) (*Service, error) {
 	service := ProvideOSSService(cfg, database.ProvideService(db), cache, features)
 
 	api.NewAccessControlAPI(routeRegister, accessControl, service, features).RegisterAPIEndpoints()
@@ -43,51 +53,39 @@ func ProvideService(cfg *setting.Cfg, db db.DB, routeRegister routing.RouteRegis
 		return nil, err
 	}
 
-	if cfg.IsFeatureToggleEnabled(featuremgmt.FlagSplitScopes) {
-		// Migrating scopes that haven't been split yet to have kind, attribute and identifier in the DB
-		// This will be removed once we've:
-		// 1) removed the feature toggle and
-		// 2) have released enough versions not to support a version without split scopes
-		if err := migrator.MigrateScopeSplit(db, service.log); err != nil {
-			return nil, err
-		}
+	// Migrating scopes that haven't been split yet to have kind, attribute and identifier in the DB
+	// This will be removed once we've:
+	// 1) removed the feature toggle and
+	// 2) have released enough versions not to support a version without split scopes
+	if err := migrator.MigrateScopeSplit(db, service.log); err != nil {
+		return nil, err
 	}
 
 	return service, nil
 }
 
-func ProvideOSSService(cfg *setting.Cfg, store store, cache *localcache.CacheService, features *featuremgmt.FeatureManager) *Service {
+func ProvideOSSService(cfg *setting.Cfg, store accesscontrol.Store, cache *localcache.CacheService, features featuremgmt.FeatureToggles) *Service {
 	s := &Service{
+		cache:    cache,
 		cfg:      cfg,
-		store:    store,
+		features: features,
 		log:      log.New("accesscontrol.service"),
-		cache:    cache,
 		roles:    accesscontrol.BuildBasicRoleDefinitions(),
-		features: features,
+		store:    store,
 	}
 
 	return s
 }
 
-//go:generate  mockery --name store --structname MockStore --outpkg actest --filename store_mock.go --output ../actest/
-type store interface {
-	GetUserPermissions(ctx context.Context, query accesscontrol.GetUserPermissionsQuery) ([]accesscontrol.Permission, error)
-	SearchUsersPermissions(ctx context.Context, orgID int64, options accesscontrol.SearchOptions) (map[int64][]accesscontrol.Permission, error)
-	GetUsersBasicRoles(ctx context.Context, userFilter []int64, orgID int64) (map[int64][]string, error)
-	DeleteUserPermissions(ctx context.Context, orgID, userID int64) error
-	SaveExternalServiceRole(ctx context.Context, cmd accesscontrol.SaveExternalServiceRoleCommand) error
-	DeleteExternalServiceRole(ctx context.Context, externalServiceID string) error
-}
-
 // Service is the service implementing role based access control.
 type Service struct {
-	log           log.Logger
-	cfg           *setting.Cfg
-	store         store
 	cache         *localcache.CacheService
+	cfg           *setting.Cfg
+	features      featuremgmt.FeatureToggles
+	log           log.Logger
 	registrations accesscontrol.RegistrationList
 	roles         map[string]*accesscontrol.RoleDTO
-	features      *featuremgmt.FeatureManager
+	store         accesscontrol.Store
 }
 
 func (s *Service) GetUsageStats(_ context.Context) map[string]any {
@@ -116,16 +114,13 @@ func (s *Service) getUserPermissions(ctx context.Context, user identity.Requeste
 		}
 	}
 
-	namespace, identifier := user.GetNamespacedID()
+	if s.features.IsEnabled(ctx, featuremgmt.FlagNestedFolders) {
+		permissions = append(permissions, SharedWithMeFolderPermission)
+	}
 
-	var userID int64
-	switch namespace {
-	case authn.NamespaceUser, authn.NamespaceServiceAccount:
-		var err error
-		userID, err = strconv.ParseInt(identifier, 10, 64)
-		if err != nil {
-			return nil, err
-		}
+	userID, err := identity.UserIdentifier(user.GetNamespacedID())
+	if err != nil {
+		return nil, err
 	}
 
 	dbPermissions, err := s.store.GetUserPermissions(ctx, accesscontrol.GetUserPermissionsQuery{
@@ -133,7 +128,7 @@ func (s *Service) getUserPermissions(ctx context.Context, user identity.Requeste
 		UserID:       userID,
 		Roles:        accesscontrol.GetOrgRoles(user),
 		TeamIDs:      user.GetTeams(),
-		RolePrefixes: []string{accesscontrol.ManagedRolePrefix, accesscontrol.ExternalServiceRolePrefix},
+		RolePrefixes: OSSRolesPrefixes,
 	})
 	if err != nil {
 		return nil, err
@@ -147,11 +142,13 @@ func (s *Service) getCachedUserPermissions(ctx context.Context, user identity.Re
 	if !options.ReloadCache {
 		permissions, ok := s.cache.Get(key)
 		if ok {
+			metrics.MAccessPermissionsCacheUsage.WithLabelValues(accesscontrol.CacheHit).Inc()
 			s.log.Debug("Using cached permissions", "key", key)
 			return permissions.([]accesscontrol.Permission), nil
 		}
 	}
 
+	metrics.MAccessPermissionsCacheUsage.WithLabelValues(accesscontrol.CacheMiss).Inc()
 	s.log.Debug("Fetch permissions from store", "key", key)
 	permissions, err := s.getUserPermissions(ctx, user, options)
 	if err != nil {
@@ -164,6 +161,48 @@ func (s *Service) getCachedUserPermissions(ctx context.Context, user identity.Re
 	return permissions, nil
 }
 
+func (s *Service) GetUserPermissionsInOrg(ctx context.Context, user identity.Requester, orgID int64) ([]accesscontrol.Permission, error) {
+	permissions := make([]accesscontrol.Permission, 0)
+
+	if s.features.IsEnabled(ctx, featuremgmt.FlagNestedFolders) {
+		permissions = append(permissions, SharedWithMeFolderPermission)
+	}
+
+	namespace, id := user.GetNamespacedID()
+	userID, err := identity.UserIdentifier(namespace, id)
+	if err != nil {
+		return nil, err
+	}
+
+	// Get permissions for user's basic roles from RAM
+	roleList, err := s.store.GetUsersBasicRoles(ctx, []int64{userID}, orgID)
+	if err != nil {
+		return nil, fmt.Errorf("could not fetch basic roles for the user: %w", err)
+	}
+	var roles []string
+	var ok bool
+	if roles, ok = roleList[userID]; !ok {
+		return nil, fmt.Errorf("found no basic roles for user %d in organisation %d", userID, orgID)
+	}
+	for _, builtin := range roles {
+		if basicRole, ok := s.roles[builtin]; ok {
+			permissions = append(permissions, basicRole.Permissions...)
+		}
+	}
+
+	dbPermissions, err := s.store.SearchUsersPermissions(ctx, orgID, accesscontrol.SearchOptions{
+		NamespacedID: authn.NamespacedID(namespace, userID),
+		// Query only basic, managed and plugin roles in OSS
+		RolePrefixes: OSSRolesPrefixes,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	userPermissions := dbPermissions[userID]
+	return append(permissions, userPermissions...), nil
+}
+
 func (s *Service) ClearUserPermissionCache(user identity.Requester) {
 	s.cache.Delete(permissionCacheKey(user))
 }
@@ -172,6 +211,10 @@ func (s *Service) DeleteUserPermissions(ctx context.Context, orgID int64, userID
 	return s.store.DeleteUserPermissions(ctx, orgID, userID)
 }
 
+func (s *Service) DeleteTeamPermissions(ctx context.Context, orgID int64, teamID int64) error {
+	return s.store.DeleteTeamPermissions(ctx, orgID, teamID)
+}
+
 // DeclareFixedRoles allow the caller to declare, to the service, fixed roles and their assignments
 // to organization roles ("Viewer", "Editor", "Admin") or "Grafana Admin"
 func (s *Service) DeclareFixedRoles(registrations ...accesscontrol.RoleRegistration) error {
@@ -213,9 +256,9 @@ func permissionCacheKey(user identity.Requester) string {
 
 // DeclarePluginRoles allow the caller to declare, to the service, plugin roles and their assignments
 // to organization roles ("Viewer", "Editor", "Admin") or "Grafana Admin"
-func (s *Service) DeclarePluginRoles(_ context.Context, ID, name string, regs []plugins.RoleRegistration) error {
+func (s *Service) DeclarePluginRoles(ctx context.Context, ID, name string, regs []plugins.RoleRegistration) error {
 	// Protect behind feature toggle
-	if !s.features.IsEnabled(featuremgmt.FlagAccessControlOnCall) {
+	if !s.features.IsEnabled(ctx, featuremgmt.FlagAccessControlOnCall) {
 		return nil
 	}
 
@@ -237,32 +280,53 @@ func (s *Service) DeclarePluginRoles(_ context.Context, ID, name string, regs []
 }
 
 // SearchUsersPermissions returns all users' permissions filtered by action prefixes
-func (s *Service) SearchUsersPermissions(ctx context.Context, user identity.Requester,
+func (s *Service) SearchUsersPermissions(ctx context.Context, usr identity.Requester,
 	options accesscontrol.SearchOptions) (map[int64][]accesscontrol.Permission, error) {
+	// Limit roles to available in OSS
+	options.RolePrefixes = OSSRolesPrefixes
+	if options.NamespacedID != "" {
+		userID, err := options.ComputeUserID()
+		if err != nil {
+			s.log.Error("Failed to resolve user ID", "error", err)
+			return nil, err
+		}
+
+		// Reroute to the user specific implementation of search permissions
+		// because it leverages the user permission cache.
+		userPerms, err := s.SearchUserPermissions(ctx, usr.GetOrgID(), options)
+		if err != nil {
+			return nil, err
+		}
+		return map[int64][]accesscontrol.Permission{userID: userPerms}, nil
+	}
+
+	timer := prometheus.NewTimer(metrics.MAccessSearchPermissionsSummary)
+	defer timer.ObserveDuration()
+
 	// Filter ram permissions
 	basicPermissions := map[string][]accesscontrol.Permission{}
 	for role, basicRole := range s.roles {
 		for i := range basicRole.Permissions {
-			if PermissionMatchesSearchOptions(basicRole.Permissions[i], options) {
+			if PermissionMatchesSearchOptions(basicRole.Permissions[i], &options) {
 				basicPermissions[role] = append(basicPermissions[role], basicRole.Permissions[i])
 			}
 		}
 	}
 
-	usersRoles, err := s.store.GetUsersBasicRoles(ctx, nil, user.GetOrgID())
+	usersRoles, err := s.store.GetUsersBasicRoles(ctx, nil, usr.GetOrgID())
 	if err != nil {
 		return nil, err
 	}
 
 	// Get managed permissions (DB)
-	usersPermissions, err := s.store.SearchUsersPermissions(ctx, user.GetOrgID(), options)
+	usersPermissions, err := s.store.SearchUsersPermissions(ctx, usr.GetOrgID(), options)
 	if err != nil {
 		return nil, err
 	}
 
 	// helper to filter out permissions the signed in users cannot see
 	canView := func() func(userID int64) bool {
-		siuPermissions := user.GetPermissions()
+		siuPermissions := usr.GetPermissions()
 		if len(siuPermissions) == 0 {
 			return func(_ int64) bool { return false }
 		}
@@ -320,8 +384,8 @@ func (s *Service) SearchUserPermissions(ctx context.Context, orgID int64, search
 	timer := prometheus.NewTimer(metrics.MAccessPermissionsSummary)
 	defer timer.ObserveDuration()
 
-	if searchOptions.UserID == 0 {
-		return nil, fmt.Errorf("expected user ID to be specified")
+	if searchOptions.NamespacedID == "" {
+		return nil, fmt.Errorf("expected namespaced ID to be specified")
 	}
 
 	if permissions, success := s.searchUserPermissionsFromCache(orgID, searchOptions); success {
@@ -331,21 +395,26 @@ func (s *Service) SearchUserPermissions(ctx context.Context, orgID int64, search
 }
 
 func (s *Service) searchUserPermissions(ctx context.Context, orgID int64, searchOptions accesscontrol.SearchOptions) ([]accesscontrol.Permission, error) {
+	userID, err := searchOptions.ComputeUserID()
+	if err != nil {
+		return nil, err
+	}
+
 	// Get permissions for user's basic roles from RAM
-	roleList, err := s.store.GetUsersBasicRoles(ctx, []int64{searchOptions.UserID}, orgID)
+	roleList, err := s.store.GetUsersBasicRoles(ctx, []int64{userID}, orgID)
 	if err != nil {
 		return nil, fmt.Errorf("could not fetch basic roles for the user: %w", err)
 	}
 	var roles []string
 	var ok bool
-	if roles, ok = roleList[searchOptions.UserID]; !ok {
-		return nil, fmt.Errorf("found no basic roles for user %d in organisation %d", searchOptions.UserID, orgID)
+	if roles, ok = roleList[userID]; !ok {
+		return nil, fmt.Errorf("found no basic roles for user %d in organisation %d", userID, orgID)
 	}
 	permissions := make([]accesscontrol.Permission, 0)
 	for _, builtin := range roles {
 		if basicRole, ok := s.roles[builtin]; ok {
 			for _, permission := range basicRole.Permissions {
-				if PermissionMatchesSearchOptions(permission, searchOptions) {
+				if PermissionMatchesSearchOptions(permission, &searchOptions) {
 					permissions = append(permissions, permission)
 				}
 			}
@@ -357,28 +426,36 @@ func (s *Service) searchUserPermissions(ctx context.Context, orgID int64, search
 	if err != nil {
 		return nil, err
 	}
-	permissions = append(permissions, dbPermissions[searchOptions.UserID]...)
+	permissions = append(permissions, dbPermissions[userID]...)
 
 	return permissions, nil
 }
 
 func (s *Service) searchUserPermissionsFromCache(orgID int64, searchOptions accesscontrol.SearchOptions) ([]accesscontrol.Permission, bool) {
+	userID, err := searchOptions.ComputeUserID()
+	if err != nil {
+		return nil, false
+	}
+
 	// Create a temp signed in user object to retrieve cache key
 	tempUser := &user.SignedInUser{
-		UserID: searchOptions.UserID,
+		UserID: userID,
 		OrgID:  orgID,
 	}
 
 	key := permissionCacheKey(tempUser)
 	permissions, ok := s.cache.Get((key))
 	if !ok {
+		metrics.MAccessSearchUserPermissionsCacheUsage.WithLabelValues(accesscontrol.CacheMiss).Inc()
 		return nil, false
 	}
 
+	metrics.MAccessSearchUserPermissionsCacheUsage.WithLabelValues(accesscontrol.CacheHit).Inc()
+
 	s.log.Debug("Using cached permissions", "key", key)
 	filteredPermissions := make([]accesscontrol.Permission, 0)
 	for _, permission := range permissions.([]accesscontrol.Permission) {
-		if PermissionMatchesSearchOptions(permission, searchOptions) {
+		if PermissionMatchesSearchOptions(permission, &searchOptions) {
 			filteredPermissions = append(filteredPermissions, permission)
 		}
 	}
@@ -386,9 +463,13 @@ func (s *Service) searchUserPermissionsFromCache(orgID int64, searchOptions acce
 	return filteredPermissions, true
 }
 
-func PermissionMatchesSearchOptions(permission accesscontrol.Permission, searchOptions accesscontrol.SearchOptions) bool {
-	if searchOptions.Scope != "" && permission.Scope != searchOptions.Scope {
-		return false
+func PermissionMatchesSearchOptions(permission accesscontrol.Permission, searchOptions *accesscontrol.SearchOptions) bool {
+	if searchOptions.Scope != "" {
+		// Permissions including the scope should also match
+		scopes := append(searchOptions.Wildcards(), searchOptions.Scope)
+		if !slices.Contains[[]string, string](scopes, permission.Scope) {
+			return false
+		}
 	}
 	if searchOptions.Action != "" {
 		return permission.Action == searchOptions.Action
@@ -397,7 +478,7 @@ func PermissionMatchesSearchOptions(permission accesscontrol.Permission, searchO
 }
 
 func (s *Service) SaveExternalServiceRole(ctx context.Context, cmd accesscontrol.SaveExternalServiceRoleCommand) error {
-	if !(s.features.IsEnabled(featuremgmt.FlagExternalServiceAuth) || s.features.IsEnabled(featuremgmt.FlagExternalServiceAccounts)) {
+	if !s.features.IsEnabled(ctx, featuremgmt.FlagExternalServiceAccounts) {
 		s.log.Debug("Registering an external service role is behind a feature flag, enable it to use this feature.")
 		return nil
 	}
@@ -410,7 +491,7 @@ func (s *Service) SaveExternalServiceRole(ctx context.Context, cmd accesscontrol
 }
 
 func (s *Service) DeleteExternalServiceRole(ctx context.Context, externalServiceID string) error {
-	if !(s.features.IsEnabled(featuremgmt.FlagExternalServiceAuth) || s.features.IsEnabled(featuremgmt.FlagExternalServiceAccounts)) {
+	if !s.features.IsEnabled(ctx, featuremgmt.FlagExternalServiceAccounts) {
 		s.log.Debug("Deleting an external service role is behind a feature flag, enable it to use this feature.")
 		return nil
 	}
@@ -419,3 +500,7 @@ func (s *Service) DeleteExternalServiceRole(ctx context.Context, externalService
 
 	return s.store.DeleteExternalServiceRole(ctx, slug)
 }
+
+func (*Service) SyncUserRoles(ctx context.Context, orgID int64, cmd accesscontrol.SyncUserRolesCommand) error {
+	return nil
+}
diff --git a/pkg/services/accesscontrol/acimpl/service_bench_test.go b/pkg/services/accesscontrol/acimpl/service_bench_test.go
index 37e83cfb2e979..c3b1a103b847d 100644
--- a/pkg/services/accesscontrol/acimpl/service_bench_test.go
+++ b/pkg/services/accesscontrol/acimpl/service_bench_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/infra/localcache"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
@@ -32,6 +33,7 @@ func setupBenchEnv(b *testing.B, usersCount, resourceCount int) (accesscontrol.S
 		registrations: accesscontrol.RegistrationList{},
 		store:         store,
 		roles:         accesscontrol.BuildBasicRoleDefinitions(),
+		cache:         localcache.New(1*time.Second, 1*time.Second),
 	}
 
 	// Prepare default permissions
@@ -54,6 +56,7 @@ func setupBenchEnv(b *testing.B, usersCount, resourceCount int) (accesscontrol.S
 		for u := start + 1; u < end+1; u++ {
 			users = append(users, user.User{
 				ID:      int64(u),
+				UID:     fmt.Sprintf("user%v", u),
 				Name:    fmt.Sprintf("user%v", u),
 				Login:   fmt.Sprintf("user%v", u),
 				Email:   fmt.Sprintf("user%v@example.org", u),
@@ -136,7 +139,7 @@ func setupBenchEnv(b *testing.B, usersCount, resourceCount int) (accesscontrol.S
 	return acService, &user.SignedInUser{OrgID: 1, Permissions: map[int64]map[string][]string{1: userPermissions}}
 }
 
-func benchSearchUsersPermissions(b *testing.B, usersCount, resourceCount int) {
+func benchSearchUsersWithActionPrefix(b *testing.B, usersCount, resourceCount int) {
 	acService, siu := setupBenchEnv(b, usersCount, resourceCount)
 	b.ResetTimer()
 
@@ -152,49 +155,62 @@ func benchSearchUsersPermissions(b *testing.B, usersCount, resourceCount int) {
 }
 
 // Lots of resources
-func BenchmarkSearchUsersPermissions_10_1K(b *testing.B)  { benchSearchUsersPermissions(b, 10, 1000) }  // ~0.047s/op
-func BenchmarkSearchUsersPermissions_10_10K(b *testing.B) { benchSearchUsersPermissions(b, 10, 10000) } // ~0.5s/op
-func BenchmarkSearchUsersPermissions_10_100K(b *testing.B) {
+func BenchmarkSearchUsersWithActionPrefix_10_1K(b *testing.B) {
+	benchSearchUsersWithActionPrefix(b, 10, 1000)
+} // ~0.047s/op
+func BenchmarkSearchUsersWithActionPrefix_10_10K(b *testing.B) {
+	benchSearchUsersWithActionPrefix(b, 10, 10000)
+} // ~0.5s/op
+func BenchmarkSearchUsersWithActionPrefix_10_100K(b *testing.B) {
 	if testing.Short() {
 		b.Skip("Skipping benchmark in short mode")
 	}
-	benchSearchUsersPermissions(b, 10, 100000)
+	benchSearchUsersWithActionPrefix(b, 10, 100000)
 } // ~4.6s/op
-func BenchmarkSearchUsersPermissions_10_1M(b *testing.B) {
+func BenchmarkSearchUsersWithActionPrefix_10_1M(b *testing.B) {
 	if testing.Short() {
 		b.Skip("Skipping benchmark in short mode")
 	}
-	benchSearchUsersPermissions(b, 10, 1000000)
+	benchSearchUsersWithActionPrefix(b, 10, 1000000)
 } // ~55.36s/op
 
 // Lots of users (most probable case)
-func BenchmarkSearchUsersPermissions_1K_10(b *testing.B)  { benchSearchUsersPermissions(b, 1000, 10) }  // ~0.056s/op
-func BenchmarkSearchUsersPermissions_10K_10(b *testing.B) { benchSearchUsersPermissions(b, 10000, 10) } // ~0.58s/op
-func BenchmarkSearchUsersPermissions_100K_10(b *testing.B) {
+func BenchmarkSearchUsersWithActionPrefix_1K_10(b *testing.B) {
+	benchSearchUsersWithActionPrefix(b, 1000, 10)
+} // ~0.056s/op
+func BenchmarkSearchUsersWithActionPrefix_10K_10(b *testing.B) {
+	benchSearchUsersWithActionPrefix(b, 10000, 10)
+} // ~0.58s/op
+func BenchmarkSearchUsersWithActionPrefix_100K_10(b *testing.B) {
 	if testing.Short() {
 		b.Skip("Skipping benchmark in short mode")
 	}
-	benchSearchUsersPermissions(b, 100000, 10)
+	benchSearchUsersWithActionPrefix(b, 100000, 10)
 } // ~6.21s/op
-func BenchmarkSearchUsersPermissions_1M_10(b *testing.B) {
+func BenchmarkSearchUsersWithActionPrefix_1M_10(b *testing.B) {
 	if testing.Short() {
 		b.Skip("Skipping benchmark in short mode")
 	}
-	benchSearchUsersPermissions(b, 1000000, 10)
+	benchSearchUsersWithActionPrefix(b, 1000000, 10)
 } // ~57s/op
 
 // Lots of both
-func BenchmarkSearchUsersPermissions_10K_100(b *testing.B) {
+
+func BenchmarkSearchUsersWithActionPrefix_1K_1K(b *testing.B) {
+	benchSearchUsersWithActionPrefix(b, 1000, 1000)
+}
+
+func BenchmarkSearchUsersWithActionPrefix_10K_100(b *testing.B) {
 	if testing.Short() {
 		b.Skip("Skipping benchmark in short mode")
 	}
-	benchSearchUsersPermissions(b, 10000, 100)
+	benchSearchUsersWithActionPrefix(b, 10000, 100)
 } // ~1.45s/op
-func BenchmarkSearchUsersPermissions_10K_1K(b *testing.B) {
+func BenchmarkSearchUsersWithActionPrefix_10K_1K(b *testing.B) {
 	if testing.Short() {
 		b.Skip("Skipping benchmark in short mode")
 	}
-	benchSearchUsersPermissions(b, 10000, 1000)
+	benchSearchUsersWithActionPrefix(b, 10000, 1000)
 } // ~50s/op
 
 // Benchmarking search when we specify Action and Scope
@@ -234,3 +250,24 @@ func BenchmarkSearchUsersWithPerm_20K_10K(b *testing.B) { benchSearchUsersWithPe
 
 func BenchmarkSearchUsersWithPerm_100K_10(b *testing.B)  { benchSearchUsersWithPerm(b, 100000, 10) }  // ~0.88s/op
 func BenchmarkSearchUsersWithPerm_100K_100(b *testing.B) { benchSearchUsersWithPerm(b, 100000, 100) } // ~0.72s/op
+
+// Benchmarking search when we specify Action and Scope
+func benchSearchUserWithAction(b *testing.B, usersCount, resourceCount int) {
+	if testing.Short() {
+		b.Skip("Skipping benchmark in short mode")
+	}
+	acService, siu := setupBenchEnv(b, usersCount, resourceCount)
+	b.ResetTimer()
+
+	for n := 0; n < b.N; n++ {
+		usersPermissions, err := acService.SearchUsersPermissions(context.Background(), siu,
+			accesscontrol.SearchOptions{Action: "resources:action2", NamespacedID: "user:14"})
+		require.NoError(b, err)
+		require.Len(b, usersPermissions, 1)
+		for _, permissions := range usersPermissions {
+			require.Len(b, permissions, resourceCount)
+		}
+	}
+}
+
+func BenchmarkSearchUserWithAction_1K_1k(b *testing.B) { benchSearchUserWithAction(b, 1000, 1000) } // ~0.6s/op (mysql)
diff --git a/pkg/services/accesscontrol/acimpl/service_test.go b/pkg/services/accesscontrol/acimpl/service_test.go
index 14c61d6015d6a..88ea293cf7268 100644
--- a/pkg/services/accesscontrol/acimpl/service_test.go
+++ b/pkg/services/accesscontrol/acimpl/service_test.go
@@ -15,24 +15,31 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/database"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/licensing"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func setupTestEnv(t testing.TB) *Service {
 	t.Helper()
 	cfg := setting.NewCfg()
 
 	ac := &Service{
+		cache:         localcache.ProvideService(),
 		cfg:           cfg,
+		features:      featuremgmt.WithFeatures(),
 		log:           log.New("accesscontrol"),
 		registrations: accesscontrol.RegistrationList{},
-		store:         database.ProvideService(db.InitTestDB(t)),
 		roles:         accesscontrol.BuildBasicRoleDefinitions(),
-		features:      featuremgmt.WithFeatures(),
+		store:         database.ProvideService(db.InitTestDB(t)),
 	}
 	require.NoError(t, ac.RegisterFixedRoles(context.Background()))
 	return ac
@@ -448,6 +455,23 @@ func TestService_SearchUsersPermissions(t *testing.T) {
 					{Action: accesscontrol.ActionTeamsPermissionsRead, Scope: "teams:*"}},
 			},
 		},
+		{
+			name:           "ram only search on scope",
+			siuPermissions: listAllPerms,
+			searchOption:   accesscontrol.SearchOptions{Scope: "teams:id:2"},
+			ramRoles: map[string]*accesscontrol.RoleDTO{
+				string(roletype.RoleAdmin): {Permissions: []accesscontrol.Permission{
+					{Action: accesscontrol.ActionTeamsRead, Scope: "teams:*"},
+				}},
+			},
+			storedRoles: map[int64][]string{
+				1: {string(roletype.RoleEditor)},
+				2: {string(roletype.RoleAdmin), accesscontrol.RoleGrafanaAdmin},
+			},
+			want: map[int64][]accesscontrol.Permission{
+				2: {{Action: accesscontrol.ActionTeamsRead, Scope: "teams:*"}},
+			},
+		},
 		{
 			name:           "view permission on subset of users only",
 			siuPermissions: listSomePerms,
@@ -508,6 +532,36 @@ func TestService_SearchUsersPermissions(t *testing.T) {
 				},
 			},
 		},
+		{
+			// This test is not exactly representative as normally the store would return
+			// only the user's basic roles and the user's stored permissions
+			name:           "check namespacedId filter works correctly",
+			siuPermissions: listAllPerms,
+			searchOption:   accesscontrol.SearchOptions{NamespacedID: identity.NamespaceServiceAccount + ":1"},
+			ramRoles: map[string]*accesscontrol.RoleDTO{
+				string(roletype.RoleEditor): {Permissions: []accesscontrol.Permission{
+					{Action: accesscontrol.ActionTeamsRead, Scope: "teams:*"},
+				}},
+				string(roletype.RoleAdmin): {Permissions: []accesscontrol.Permission{
+					{Action: accesscontrol.ActionTeamsWrite, Scope: "teams:*"},
+				}},
+				accesscontrol.RoleGrafanaAdmin: {Permissions: []accesscontrol.Permission{
+					{Action: accesscontrol.ActionTeamsPermissionsRead, Scope: "teams:*"},
+				}},
+			},
+			storedPerms: map[int64][]accesscontrol.Permission{
+				1: {{Action: accesscontrol.ActionTeamsRead, Scope: "teams:id:1"}},
+				2: {{Action: accesscontrol.ActionTeamsRead, Scope: "teams:id:1"},
+					{Action: accesscontrol.ActionTeamsPermissionsRead, Scope: "teams:id:1"}},
+			},
+			storedRoles: map[int64][]string{
+				1: {string(roletype.RoleEditor)},
+				2: {string(roletype.RoleAdmin), accesscontrol.RoleGrafanaAdmin},
+			},
+			want: map[int64][]accesscontrol.Permission{
+				1: {{Action: accesscontrol.ActionTeamsRead, Scope: "teams:id:1"}, {Action: accesscontrol.ActionTeamsRead, Scope: "teams:*"}},
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -553,7 +607,7 @@ func TestService_SearchUserPermissions(t *testing.T) {
 			name: "ram only",
 			searchOption: accesscontrol.SearchOptions{
 				ActionPrefix: "teams",
-				UserID:       2,
+				NamespacedID: identity.NamespaceUser + ":2",
 			},
 			ramRoles: map[string]*accesscontrol.RoleDTO{
 				string(roletype.RoleEditor): {Permissions: []accesscontrol.Permission{
@@ -578,7 +632,7 @@ func TestService_SearchUserPermissions(t *testing.T) {
 			name: "stored only",
 			searchOption: accesscontrol.SearchOptions{
 				ActionPrefix: "teams",
-				UserID:       2,
+				NamespacedID: identity.NamespaceUser + ":2",
 			},
 			storedPerms: map[int64][]accesscontrol.Permission{
 				1: {{Action: accesscontrol.ActionTeamsRead, Scope: "teams:id:1"}},
@@ -598,7 +652,7 @@ func TestService_SearchUserPermissions(t *testing.T) {
 			name: "ram and stored",
 			searchOption: accesscontrol.SearchOptions{
 				ActionPrefix: "teams",
-				UserID:       2,
+				NamespacedID: identity.NamespaceUser + ":2",
 			},
 			ramRoles: map[string]*accesscontrol.RoleDTO{
 				string(roletype.RoleAdmin): {Permissions: []accesscontrol.Permission{
@@ -628,7 +682,7 @@ func TestService_SearchUserPermissions(t *testing.T) {
 			name: "check action prefix filter works correctly",
 			searchOption: accesscontrol.SearchOptions{
 				ActionPrefix: "teams",
-				UserID:       1,
+				NamespacedID: identity.NamespaceUser + ":1",
 			},
 			ramRoles: map[string]*accesscontrol.RoleDTO{
 				string(roletype.RoleEditor): {Permissions: []accesscontrol.Permission{
@@ -649,8 +703,8 @@ func TestService_SearchUserPermissions(t *testing.T) {
 		{
 			name: "check action filter works correctly",
 			searchOption: accesscontrol.SearchOptions{
-				Action: accesscontrol.ActionTeamsRead,
-				UserID: 1,
+				Action:       accesscontrol.ActionTeamsRead,
+				NamespacedID: identity.NamespaceUser + ":1",
 			},
 			ramRoles: map[string]*accesscontrol.RoleDTO{
 				string(roletype.RoleEditor): {Permissions: []accesscontrol.Permission{
@@ -762,7 +816,7 @@ func TestService_SaveExternalServiceRole(t *testing.T) {
 			runs: []run{
 				{
 					cmd: accesscontrol.SaveExternalServiceRoleCommand{
-						OrgID:             2,
+						AssignmentOrgID:   2,
 						ServiceAccountID:  2,
 						ExternalServiceID: "App 1",
 						Permissions:       []accesscontrol.Permission{{Action: "users:read", Scope: "users:id:1"}},
@@ -776,7 +830,7 @@ func TestService_SaveExternalServiceRole(t *testing.T) {
 			runs: []run{
 				{
 					cmd: accesscontrol.SaveExternalServiceRoleCommand{
-						Global:            true,
+						AssignmentOrgID:   1,
 						ServiceAccountID:  2,
 						ExternalServiceID: "App 1",
 						Permissions:       []accesscontrol.Permission{{Action: "users:read", Scope: "users:id:1"}},
@@ -785,7 +839,7 @@ func TestService_SaveExternalServiceRole(t *testing.T) {
 				},
 				{
 					cmd: accesscontrol.SaveExternalServiceRoleCommand{
-						Global:            true,
+						AssignmentOrgID:   1,
 						ServiceAccountID:  2,
 						ExternalServiceID: "App 1",
 						Permissions: []accesscontrol.Permission{
@@ -802,7 +856,7 @@ func TestService_SaveExternalServiceRole(t *testing.T) {
 			runs: []run{
 				{
 					cmd: accesscontrol.SaveExternalServiceRoleCommand{
-						OrgID:             2,
+						AssignmentOrgID:   2,
 						ExternalServiceID: "App 1",
 						Permissions:       []accesscontrol.Permission{{Action: "users:read", Scope: "users:id:1"}},
 					},
@@ -815,7 +869,7 @@ func TestService_SaveExternalServiceRole(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			ctx := context.Background()
 			ac := setupTestEnv(t)
-			ac.features = featuremgmt.WithFeatures(featuremgmt.FlagExternalServiceAuth, featuremgmt.FlagExternalServiceAccounts)
+			ac.features = featuremgmt.WithFeatures(featuremgmt.FlagExternalServiceAccounts)
 			for _, r := range tt.runs {
 				err := ac.SaveExternalServiceRole(ctx, r.cmd)
 				if r.wantErr {
@@ -825,7 +879,7 @@ func TestService_SaveExternalServiceRole(t *testing.T) {
 				require.NoError(t, err)
 
 				// Check that the permissions and assignment are stored correctly
-				perms, errGetPerms := ac.getUserPermissions(ctx, &user.SignedInUser{OrgID: r.cmd.OrgID, UserID: 2}, accesscontrol.Options{})
+				perms, errGetPerms := ac.getUserPermissions(ctx, &user.SignedInUser{OrgID: r.cmd.AssignmentOrgID, UserID: 2}, accesscontrol.Options{})
 				require.NoError(t, errGetPerms)
 				assert.ElementsMatch(t, r.cmd.Permissions, perms)
 			}
@@ -848,7 +902,7 @@ func TestService_DeleteExternalServiceRole(t *testing.T) {
 		{
 			name: "handles deleting role that exists",
 			initCmd: &accesscontrol.SaveExternalServiceRoleCommand{
-				Global:            true,
+				AssignmentOrgID:   1,
 				ServiceAccountID:  2,
 				ExternalServiceID: "App 1",
 				Permissions:       []accesscontrol.Permission{{Action: "users:read", Scope: "users:id:1"}},
@@ -861,7 +915,7 @@ func TestService_DeleteExternalServiceRole(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			ctx := context.Background()
 			ac := setupTestEnv(t)
-			ac.features = featuremgmt.WithFeatures(featuremgmt.FlagExternalServiceAuth, featuremgmt.FlagExternalServiceAccounts)
+			ac.features = featuremgmt.WithFeatures(featuremgmt.FlagExternalServiceAccounts)
 
 			if tt.initCmd != nil {
 				err := ac.SaveExternalServiceRole(ctx, *tt.initCmd)
@@ -877,10 +931,66 @@ func TestService_DeleteExternalServiceRole(t *testing.T) {
 
 			if tt.initCmd != nil {
 				// Check that the permissions and assignment are removed correctly
-				perms, errGetPerms := ac.getUserPermissions(ctx, &user.SignedInUser{OrgID: tt.initCmd.OrgID, UserID: 2}, accesscontrol.Options{})
+				perms, errGetPerms := ac.getUserPermissions(ctx, &user.SignedInUser{OrgID: tt.initCmd.AssignmentOrgID, UserID: 2}, accesscontrol.Options{})
 				require.NoError(t, errGetPerms)
 				assert.Empty(t, perms)
 			}
 		})
 	}
 }
+
+func TestService_GetUserPermissionsInOrg(t *testing.T) {
+	tests := []struct {
+		name        string
+		orgID       int64
+		ramRoles    map[string]*accesscontrol.RoleDTO    // BasicRole => RBAC BasicRole
+		storedPerms map[int64][]accesscontrol.Permission // UserID => Permissions
+		storedRoles map[int64][]string                   // UserID => Roles
+		want        []accesscontrol.Permission
+	}{
+		{
+			name:  "should get correct permissions from another org",
+			orgID: 2,
+			ramRoles: map[string]*accesscontrol.RoleDTO{
+				string(roletype.RoleEditor): {Permissions: []accesscontrol.Permission{}},
+				string(roletype.RoleAdmin): {Permissions: []accesscontrol.Permission{
+					{Action: accesscontrol.ActionTeamsRead, Scope: "teams:*"},
+				}},
+			},
+			storedPerms: map[int64][]accesscontrol.Permission{
+				1: {
+					{Action: accesscontrol.ActionTeamsRead, Scope: "teams:id:1"},
+					{Action: accesscontrol.ActionTeamsPermissionsRead, Scope: "teams:id:1"},
+				},
+				2: {
+					{Action: accesscontrol.ActionTeamsRead, Scope: "teams:id:2"},
+				},
+			},
+			storedRoles: map[int64][]string{
+				1: {string(roletype.RoleAdmin)},
+				2: {string(roletype.RoleEditor)},
+			},
+			want: []accesscontrol.Permission{
+				{Action: accesscontrol.ActionTeamsRead, Scope: "teams:id:2"},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ctx := context.Background()
+			ac := setupTestEnv(t)
+
+			ac.roles = tt.ramRoles
+			ac.store = actest.FakeStore{
+				ExpectedUsersPermissions: tt.storedPerms,
+				ExpectedUsersRoles:       tt.storedRoles,
+			}
+			user := &user.SignedInUser{OrgID: 1, UserID: 2}
+
+			got, err := ac.GetUserPermissionsInOrg(ctx, user, 2)
+			require.Nil(t, err)
+
+			assert.ElementsMatch(t, got, tt.want)
+		})
+	}
+}
diff --git a/pkg/services/accesscontrol/actest/common.go b/pkg/services/accesscontrol/actest/common.go
index 6be44a6911968..c5c95462f5187 100644
--- a/pkg/services/accesscontrol/actest/common.go
+++ b/pkg/services/accesscontrol/actest/common.go
@@ -116,7 +116,7 @@ func AddUserPermissionToDB(t testing.TB, db db.DB, user *user.SignedInUser) {
 				p := accesscontrol.Permission{
 					RoleID: role.ID, Action: action, Scope: scope, Created: time.Now(), Updated: time.Now(),
 				}
-				//p.Kind, p.Attribute, p.Identifier = p.SplitScope()
+				p.Kind, p.Attribute, p.Identifier = p.SplitScope()
 
 				permissions = append(permissions, p)
 			}
diff --git a/pkg/services/accesscontrol/actest/fake.go b/pkg/services/accesscontrol/actest/fake.go
index 87113fb6e3fe0..21698bd410a68 100644
--- a/pkg/services/accesscontrol/actest/fake.go
+++ b/pkg/services/accesscontrol/actest/fake.go
@@ -11,6 +11,7 @@ var _ accesscontrol.Service = new(FakeService)
 var _ accesscontrol.RoleRegistry = new(FakeService)
 
 type FakeService struct {
+	accesscontrol.Service
 	ExpectedErr                     error
 	ExpectedCachedPermissions       bool
 	ExpectedPermissions             []accesscontrol.Permission
@@ -26,6 +27,10 @@ func (f FakeService) GetUserPermissions(ctx context.Context, user identity.Reque
 	return f.ExpectedPermissions, f.ExpectedErr
 }
 
+func (f FakeService) GetUserPermissionsInOrg(ctx context.Context, user identity.Requester, orgID int64) ([]accesscontrol.Permission, error) {
+	return f.ExpectedPermissions, f.ExpectedErr
+}
+
 func (f FakeService) SearchUsersPermissions(ctx context.Context, user identity.Requester, options accesscontrol.SearchOptions) (map[int64][]accesscontrol.Permission, error) {
 	return f.ExpectedUsersPermissions, f.ExpectedErr
 }
@@ -40,6 +45,10 @@ func (f FakeService) DeleteUserPermissions(ctx context.Context, orgID, userID in
 	return f.ExpectedErr
 }
 
+func (f FakeService) DeleteTeamPermissions(ctx context.Context, orgID, teamID int64) error {
+	return f.ExpectedErr
+}
+
 func (f FakeService) DeclareFixedRoles(registrations ...accesscontrol.RoleRegistration) error {
 	return f.ExpectedErr
 }
@@ -93,6 +102,10 @@ func (f FakeStore) DeleteUserPermissions(ctx context.Context, orgID, userID int6
 	return f.ExpectedErr
 }
 
+func (f FakeStore) DeleteTeamPermissions(ctx context.Context, orgID, teamID int64) error {
+	return f.ExpectedErr
+}
+
 func (f FakeStore) SaveExternalServiceRole(ctx context.Context, cmd accesscontrol.SaveExternalServiceRoleCommand) error {
 	return f.ExpectedErr
 }
diff --git a/pkg/services/accesscontrol/actest/store_mock.go b/pkg/services/accesscontrol/actest/store_mock.go
index 6f38eea198a1d..70509a8842bf8 100644
--- a/pkg/services/accesscontrol/actest/store_mock.go
+++ b/pkg/services/accesscontrol/actest/store_mock.go
@@ -1,16 +1,16 @@
-// Code generated by mockery v2.20.0. DO NOT EDIT.
+// Code generated by mockery v2.42.0. DO NOT EDIT.
 
 package actest
 
 import (
-	accesscontrol "github.com/grafana/grafana/pkg/services/accesscontrol"
-
 	context "context"
 
+	accesscontrol "github.com/grafana/grafana/pkg/services/accesscontrol"
+
 	mock "github.com/stretchr/testify/mock"
 )
 
-// MockStore is an autogenerated mock type for the store type
+// MockStore is an autogenerated mock type for the Store type
 type MockStore struct {
 	mock.Mock
 }
@@ -19,6 +19,10 @@ type MockStore struct {
 func (_m *MockStore) DeleteExternalServiceRole(ctx context.Context, externalServiceID string) error {
 	ret := _m.Called(ctx, externalServiceID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteExternalServiceRole")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, string) error); ok {
 		r0 = rf(ctx, externalServiceID)
@@ -33,6 +37,10 @@ func (_m *MockStore) DeleteExternalServiceRole(ctx context.Context, externalServ
 func (_m *MockStore) DeleteUserPermissions(ctx context.Context, orgID int64, userID int64) error {
 	ret := _m.Called(ctx, orgID, userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteUserPermissions")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, int64) error); ok {
 		r0 = rf(ctx, orgID, userID)
@@ -43,10 +51,32 @@ func (_m *MockStore) DeleteUserPermissions(ctx context.Context, orgID int64, use
 	return r0
 }
 
+// DeleteTeamPermissions provides a mock function with given fields: ctx, orgID, teamID
+func (_m *MockStore) DeleteTeamPermissions(ctx context.Context, orgID int64, teamID int64) error {
+	ret := _m.Called(ctx, orgID, teamID)
+
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteTeamPermissions")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, int64, int64) error); ok {
+		r0 = rf(ctx, orgID, teamID)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
 // GetUserPermissions provides a mock function with given fields: ctx, query
 func (_m *MockStore) GetUserPermissions(ctx context.Context, query accesscontrol.GetUserPermissionsQuery) ([]accesscontrol.Permission, error) {
 	ret := _m.Called(ctx, query)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUserPermissions")
+	}
+
 	var r0 []accesscontrol.Permission
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, accesscontrol.GetUserPermissionsQuery) ([]accesscontrol.Permission, error)); ok {
@@ -73,6 +103,10 @@ func (_m *MockStore) GetUserPermissions(ctx context.Context, query accesscontrol
 func (_m *MockStore) GetUsersBasicRoles(ctx context.Context, userFilter []int64, orgID int64) (map[int64][]string, error) {
 	ret := _m.Called(ctx, userFilter, orgID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUsersBasicRoles")
+	}
+
 	var r0 map[int64][]string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, []int64, int64) (map[int64][]string, error)); ok {
@@ -99,6 +133,10 @@ func (_m *MockStore) GetUsersBasicRoles(ctx context.Context, userFilter []int64,
 func (_m *MockStore) SaveExternalServiceRole(ctx context.Context, cmd accesscontrol.SaveExternalServiceRoleCommand) error {
 	ret := _m.Called(ctx, cmd)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveExternalServiceRole")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, accesscontrol.SaveExternalServiceRoleCommand) error); ok {
 		r0 = rf(ctx, cmd)
@@ -113,6 +151,10 @@ func (_m *MockStore) SaveExternalServiceRole(ctx context.Context, cmd accesscont
 func (_m *MockStore) SearchUsersPermissions(ctx context.Context, orgID int64, options accesscontrol.SearchOptions) (map[int64][]accesscontrol.Permission, error) {
 	ret := _m.Called(ctx, orgID, options)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SearchUsersPermissions")
+	}
+
 	var r0 map[int64][]accesscontrol.Permission
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, accesscontrol.SearchOptions) (map[int64][]accesscontrol.Permission, error)); ok {
@@ -135,13 +177,12 @@ func (_m *MockStore) SearchUsersPermissions(ctx context.Context, orgID int64, op
 	return r0, r1
 }
 
-type mockConstructorTestingTNewMockStore interface {
+// NewMockStore creates a new instance of MockStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewMockStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewMockStore creates a new instance of MockStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewMockStore(t mockConstructorTestingTNewMockStore) *MockStore {
+}) *MockStore {
 	mock := &MockStore{}
 	mock.Mock.Test(t)
 
diff --git a/pkg/services/accesscontrol/api/api.go b/pkg/services/accesscontrol/api/api.go
index 5b6bd3d4f0f72..67e7951267b22 100644
--- a/pkg/services/accesscontrol/api/api.go
+++ b/pkg/services/accesscontrol/api/api.go
@@ -2,7 +2,6 @@ package api
 
 import (
 	"net/http"
-	"strconv"
 
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/api/routing"
@@ -11,11 +10,10 @@ import (
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/web"
 )
 
 func NewAccessControlAPI(router routing.RouteRegister, accesscontrol ac.AccessControl, service ac.Service,
-	features *featuremgmt.FeatureManager) *AccessControlAPI {
+	features featuremgmt.FeatureToggles) *AccessControlAPI {
 	return &AccessControlAPI{
 		RouteRegister: router,
 		Service:       service,
@@ -28,7 +26,7 @@ type AccessControlAPI struct {
 	Service       ac.Service
 	AccessControl ac.AccessControl
 	RouteRegister routing.RouteRegister
-	features      *featuremgmt.FeatureManager
+	features      featuremgmt.FeatureToggles
 }
 
 func (api *AccessControlAPI) RegisterAPIEndpoints() {
@@ -37,10 +35,8 @@ func (api *AccessControlAPI) RegisterAPIEndpoints() {
 	api.RouteRegister.Group("/api/access-control", func(rr routing.RouteRegister) {
 		rr.Get("/user/actions", middleware.ReqSignedIn, routing.Wrap(api.getUserActions))
 		rr.Get("/user/permissions", middleware.ReqSignedIn, routing.Wrap(api.getUserPermissions))
-		if api.features.IsEnabled(featuremgmt.FlagAccessControlOnCall) {
-			userIDScope := ac.Scope("users", "id", ac.Parameter(":userID"))
+		if api.features.IsEnabledGlobally(featuremgmt.FlagAccessControlOnCall) {
 			rr.Get("/users/permissions/search", authorize(ac.EvalPermission(ac.ActionUsersPermissionsRead)), routing.Wrap(api.searchUsersPermissions))
-			rr.Get("/user/:userID/permissions/search", authorize(ac.EvalPermission(ac.ActionUsersPermissionsRead, userIDScope)), routing.Wrap(api.searchUserPermissions))
 		}
 	}, requestmeta.SetOwner(requestmeta.TeamAuth))
 }
@@ -51,7 +47,7 @@ func (api *AccessControlAPI) getUserActions(c *contextmodel.ReqContext) response
 	permissions, err := api.Service.GetUserPermissions(c.Req.Context(),
 		c.SignedInUser, ac.Options{ReloadCache: reloadCache})
 	if err != nil {
-		response.JSON(http.StatusInternalServerError, err)
+		return response.JSON(http.StatusInternalServerError, err)
 	}
 
 	return response.JSON(http.StatusOK, ac.BuildPermissionsMap(permissions))
@@ -63,23 +59,27 @@ func (api *AccessControlAPI) getUserPermissions(c *contextmodel.ReqContext) resp
 	permissions, err := api.Service.GetUserPermissions(c.Req.Context(),
 		c.SignedInUser, ac.Options{ReloadCache: reloadCache})
 	if err != nil {
-		response.JSON(http.StatusInternalServerError, err)
+		return response.JSON(http.StatusInternalServerError, err)
 	}
 
 	return response.JSON(http.StatusOK, ac.GroupScopesByAction(permissions))
 }
 
-// GET /api/access-control/users/permissions
+// GET /api/access-control/users/permissions/search
 func (api *AccessControlAPI) searchUsersPermissions(c *contextmodel.ReqContext) response.Response {
 	searchOptions := ac.SearchOptions{
 		ActionPrefix: c.Query("actionPrefix"),
 		Action:       c.Query("action"),
 		Scope:        c.Query("scope"),
+		NamespacedID: c.Query("namespacedId"),
 	}
 
 	// Validate inputs
-	if (searchOptions.ActionPrefix != "") == (searchOptions.Action != "") {
-		return response.JSON(http.StatusBadRequest, "provide one of 'action' or 'actionPrefix'")
+	if searchOptions.ActionPrefix != "" && searchOptions.Action != "" {
+		return response.JSON(http.StatusBadRequest, "'action' and 'actionPrefix' are mutually exclusive")
+	}
+	if searchOptions.NamespacedID == "" && searchOptions.ActionPrefix == "" && searchOptions.Action == "" {
+		return response.JSON(http.StatusBadRequest, "at least one search option must be provided")
 	}
 
 	// Compute metadata
@@ -95,31 +95,3 @@ func (api *AccessControlAPI) searchUsersPermissions(c *contextmodel.ReqContext)
 
 	return response.JSON(http.StatusOK, permsByAction)
 }
-
-// GET /api/access-control/user/:userID/permissions/search
-func (api *AccessControlAPI) searchUserPermissions(c *contextmodel.ReqContext) response.Response {
-	userIDString := web.Params(c.Req)[":userID"]
-	userID, err := strconv.ParseInt(userIDString, 10, 64)
-	if err != nil {
-		response.Error(http.StatusBadRequest, "user ID is invalid", err)
-	}
-
-	searchOptions := ac.SearchOptions{
-		ActionPrefix: c.Query("actionPrefix"),
-		Action:       c.Query("action"),
-		Scope:        c.Query("scope"),
-		UserID:       userID,
-	}
-	// Validate inputs
-	if (searchOptions.ActionPrefix != "") == (searchOptions.Action != "") {
-		return response.JSON(http.StatusBadRequest, "provide one of 'action' or 'actionPrefix'")
-	}
-
-	permissions, err := api.Service.SearchUserPermissions(c.Req.Context(),
-		c.SignedInUser.GetOrgID(), searchOptions)
-	if err != nil {
-		response.Error(http.StatusInternalServerError, "could not search user permissions", err)
-	}
-
-	return response.JSON(http.StatusOK, ac.Reduce(permissions))
-}
diff --git a/pkg/services/accesscontrol/api/api_test.go b/pkg/services/accesscontrol/api/api_test.go
index 602602bab0204..0502504a373b0 100644
--- a/pkg/services/accesscontrol/api/api_test.go
+++ b/pkg/services/accesscontrol/api/api_test.go
@@ -118,3 +118,80 @@ func TestAPI_getUserPermissions(t *testing.T) {
 		})
 	}
 }
+
+func TestAccessControlAPI_searchUsersPermissions(t *testing.T) {
+	type testCase struct {
+		desc           string
+		permissions    map[int64][]ac.Permission
+		filters        string
+		expectedOutput map[int64]map[string][]string
+		expectedCode   int
+	}
+
+	tests := []testCase{
+		{
+			desc:         "Should reject if no filter is provided",
+			expectedCode: http.StatusBadRequest,
+		},
+		{
+			desc:         "Should reject if conflicting action filters are provided",
+			filters:      "?actionPrefix=grafana-test-app&action=grafana-test-app.projects:read",
+			expectedCode: http.StatusBadRequest,
+		},
+		{
+			desc:           "Should work with valid namespacedId filter provided",
+			filters:        "?namespacedId=service-account:2",
+			permissions:    map[int64][]ac.Permission{2: {{Action: "users:read", Scope: "users:*"}}},
+			expectedCode:   http.StatusOK,
+			expectedOutput: map[int64]map[string][]string{2: {"users:read": {"users:*"}}},
+		},
+		{
+			desc:           "Should reduce permissions",
+			filters:        "?namespacedId=service-account:2",
+			permissions:    map[int64][]ac.Permission{2: {{Action: "users:read", Scope: "users:id:1"}, {Action: "users:read", Scope: "users:*"}}},
+			expectedCode:   http.StatusOK,
+			expectedOutput: map[int64]map[string][]string{2: {"users:read": {"users:*"}}},
+		},
+		{
+			desc:    "Should work with valid action prefix filter",
+			filters: "?actionPrefix=users:",
+			permissions: map[int64][]ac.Permission{
+				1: {{Action: "users:write", Scope: "users:id:1"}},
+				2: {{Action: "users:read", Scope: "users:id:2"}},
+			},
+			expectedCode: http.StatusOK,
+			expectedOutput: map[int64]map[string][]string{
+				1: {"users:write": {"users:id:1"}},
+				2: {"users:read": {"users:id:2"}},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.desc, func(t *testing.T) {
+			acSvc := actest.FakeService{ExpectedUsersPermissions: tt.permissions}
+			accessControl := actest.FakeAccessControl{ExpectedEvaluate: true} // Always allow access to the endpoint
+			api := NewAccessControlAPI(routing.NewRouteRegister(), accessControl, acSvc, featuremgmt.WithFeatures(featuremgmt.FlagAccessControlOnCall))
+			api.RegisterAPIEndpoints()
+
+			server := webtest.NewServer(t, api.RouteRegister)
+			url := "/api/access-control/users/permissions/search" + tt.filters
+
+			req := server.NewGetRequest(url)
+			webtest.RequestWithSignedInUser(req, &user.SignedInUser{
+				OrgID:       1,
+				Permissions: map[int64]map[string][]string{},
+			})
+			res, err := server.Send(req)
+			defer func() { require.NoError(t, res.Body.Close()) }()
+			require.NoError(t, err)
+			require.Equal(t, tt.expectedCode, res.StatusCode)
+
+			if tt.expectedCode == http.StatusOK {
+				var output map[int64]map[string][]string
+				err := json.NewDecoder(res.Body).Decode(&output)
+				require.NoError(t, err)
+				require.Equal(t, tt.expectedOutput, output)
+			}
+		})
+	}
+}
diff --git a/pkg/services/accesscontrol/authorize_in_org_test.go b/pkg/services/accesscontrol/authorize_in_org_test.go
index 0af24186f16ff..8a9f6d2b814c5 100644
--- a/pkg/services/accesscontrol/authorize_in_org_test.go
+++ b/pkg/services/accesscontrol/authorize_in_org_test.go
@@ -13,6 +13,8 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/team"
+	"github.com/grafana/grafana/pkg/services/team/teamtest"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/user/usertest"
 	"github.com/grafana/grafana/pkg/setting"
@@ -32,6 +34,7 @@ func TestAuthorizeInOrgMiddleware(t *testing.T) {
 		acService       accesscontrol.Service
 		userCache       user.Service
 		ctxSignedInUser *user.SignedInUser
+		teamService     team.Service
 		expectedStatus  int
 	}{
 		{
@@ -46,6 +49,7 @@ func TestAuthorizeInOrgMiddleware(t *testing.T) {
 			acService: &actest.FakeService{
 				ExpectedPermissions: []accesscontrol.Permission{{Action: "users:read", Scope: "users:*"}},
 			},
+			teamService:    &teamtest.FakeService{},
 			expectedStatus: http.StatusOK,
 		},
 		{
@@ -58,6 +62,7 @@ func TestAuthorizeInOrgMiddleware(t *testing.T) {
 			acService:       &actest.FakeService{},
 			userCache:       &usertest.FakeUserService{},
 			ctxSignedInUser: &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{1: {"users:read": {"users:*"}}}},
+			teamService:     &teamtest.FakeService{},
 			expectedStatus:  http.StatusOK,
 		},
 		{
@@ -69,6 +74,7 @@ func TestAuthorizeInOrgMiddleware(t *testing.T) {
 			accessControl:   ac,
 			userCache:       &usertest.FakeUserService{},
 			ctxSignedInUser: &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{}},
+			teamService:     &teamtest.FakeService{},
 			acService:       &actest.FakeService{},
 			expectedStatus:  http.StatusForbidden,
 		},
@@ -80,9 +86,12 @@ func TestAuthorizeInOrgMiddleware(t *testing.T) {
 			evaluator:       accesscontrol.EvalPermission("users:read", "users:*"),
 			accessControl:   ac,
 			userCache:       &usertest.FakeUserService{},
-			ctxSignedInUser: &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{accesscontrol.GlobalOrgID: {"users:read": {"users:*"}}}},
-			acService:       &actest.FakeService{},
-			expectedStatus:  http.StatusOK,
+			ctxSignedInUser: &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{1: {"users:read": {"users:*"}}}},
+			teamService:     &teamtest.FakeService{},
+			acService: &actest.FakeService{
+				ExpectedPermissions: []accesscontrol.Permission{{Action: "users:read", Scope: "users:*"}},
+			},
+			expectedStatus: http.StatusOK,
 		},
 		{
 			name: "should return 403 when user has no permissions for a global org",
@@ -93,6 +102,7 @@ func TestAuthorizeInOrgMiddleware(t *testing.T) {
 			accessControl:   ac,
 			userCache:       &usertest.FakeUserService{},
 			ctxSignedInUser: &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{1: {"users:read": {"users:*"}}}},
+			teamService:     &teamtest.FakeService{},
 			acService:       &actest.FakeService{},
 			expectedStatus:  http.StatusForbidden,
 		},
@@ -106,6 +116,20 @@ func TestAuthorizeInOrgMiddleware(t *testing.T) {
 			userCache:       &usertest.FakeUserService{ExpectedError: fmt.Errorf("user not found")},
 			acService:       &actest.FakeService{},
 			ctxSignedInUser: &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{1: {"users:read": {"users:*"}}}},
+			teamService:     &teamtest.FakeService{},
+			expectedStatus:  http.StatusForbidden,
+		},
+		{
+			name: "should return 403 early when api key org ID doesn't match",
+			orgIDGetter: func(c *contextmodel.ReqContext) (int64, error) {
+				return 2, nil
+			},
+			evaluator:       accesscontrol.EvalPermission("users:read", "users:*"),
+			accessControl:   ac,
+			userCache:       &usertest.FakeUserService{},
+			acService:       &actest.FakeService{},
+			ctxSignedInUser: &user.SignedInUser{ApiKeyID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{1: {"users:read": {"users:*"}}}},
+			teamService:     &teamtest.FakeService{},
 			expectedStatus:  http.StatusForbidden,
 		},
 		{
@@ -118,6 +142,7 @@ func TestAuthorizeInOrgMiddleware(t *testing.T) {
 			acService: &actest.FakeService{
 				ExpectedPermissions: []accesscontrol.Permission{{Action: "users:read", Scope: "users:*"}},
 			},
+			teamService: &teamtest.FakeService{},
 			userCache: &usertest.FakeUserService{
 				GetSignedInUserFn: func(ctx context.Context, query *user.GetSignedInUserQuery) (*user.SignedInUser, error) {
 					return &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: nil}, nil
@@ -133,6 +158,7 @@ func TestAuthorizeInOrgMiddleware(t *testing.T) {
 			},
 			evaluator:     accesscontrol.EvalPermission("users:read", "users:*"),
 			accessControl: ac,
+			teamService:   &teamtest.FakeService{},
 			acService: &actest.FakeService{
 				ExpectedPermissions: []accesscontrol.Permission{{Action: "users:read", Scope: "users:*"}},
 			},
@@ -151,6 +177,7 @@ func TestAuthorizeInOrgMiddleware(t *testing.T) {
 			},
 			evaluator:     accesscontrol.EvalPermission("users:read", "users:*"),
 			accessControl: ac,
+			teamService:   &teamtest.FakeService{},
 			acService: &actest.FakeService{
 				ExpectedErr: fmt.Errorf("failed to get user permissions"),
 			},
@@ -172,8 +199,27 @@ func TestAuthorizeInOrgMiddleware(t *testing.T) {
 			acService:       &actest.FakeService{},
 			userCache:       &usertest.FakeUserService{},
 			ctxSignedInUser: &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{1: {"users:read": {"users:*"}}}},
+			teamService:     &teamtest.FakeService{},
 			expectedStatus:  http.StatusForbidden,
 		},
+		{
+			name: "should fetch global user permissions when user is not a member of the target org",
+			orgIDGetter: func(c *contextmodel.ReqContext) (int64, error) {
+				return 2, nil
+			},
+			evaluator:     accesscontrol.EvalPermission("users:read", "users:*"),
+			accessControl: ac,
+			acService: &actest.FakeService{
+				ExpectedPermissions: []accesscontrol.Permission{{Action: "users:read", Scope: "users:*"}},
+			},
+			userCache: &usertest.FakeUserService{
+				GetSignedInUserFn: func(ctx context.Context, query *user.GetSignedInUserQuery) (*user.SignedInUser, error) {
+					return &user.SignedInUser{UserID: 1, OrgID: -1, Permissions: map[int64]map[string][]string{}}, nil
+				},
+			},
+			ctxSignedInUser: &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{1: {"users:write": {"users:*"}}}},
+			expectedStatus:  http.StatusOK,
+		},
 	}
 
 	// Run test cases
@@ -189,6 +235,7 @@ func TestAuthorizeInOrgMiddleware(t *testing.T) {
 				tc.accessControl,
 				service,
 				tc.userCache,
+				tc.teamService,
 			)(tc.orgIDGetter, tc.evaluator)
 
 			// Create test server
diff --git a/pkg/services/accesscontrol/database/database.go b/pkg/services/accesscontrol/database/database.go
index 0f6ca5c0bfcd2..9d6187cd67076 100644
--- a/pkg/services/accesscontrol/database/database.go
+++ b/pkg/services/accesscontrol/database/database.go
@@ -2,6 +2,7 @@ package database
 
 import (
 	"context"
+	"fmt"
 	"strconv"
 	"strings"
 
@@ -9,6 +10,32 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 )
 
+const (
+	// userAssignsSQL is a query to select all users assignments.
+	userAssignsSQL = `SELECT ur.user_id, ur.org_id, ur.role_id
+	FROM user_role AS ur`
+
+	// teamAssignsSQL is a query to select all users' team assignments.
+	teamAssignsSQL = `SELECT tm.user_id, tr.org_id, tr.role_id
+	FROM team_role AS tr 
+	INNER JOIN team_member AS tm ON tm.team_id = tr.team_id`
+
+	// basicRoleAssignsSQL is a query to select all users basic role (Admin, Editor, Viewer, None) assignments.
+	basicRoleAssignsSQL = `SELECT ou.user_id, ou.org_id, br.role_id
+	FROM builtin_role AS br
+	INNER JOIN org_user AS ou ON ou.role = br.role`
+
+	// grafanaAdminAssignsSQL is a query to select all grafana admin users.
+	// it has to be formatted with the quoted user table.
+	grafanaAdminAssignsSQL = `SELECT sa.user_id, br.org_id, br.role_id
+	FROM builtin_role AS br
+	INNER JOIN (
+		SELECT u.id AS user_id
+	    FROM %s AS u WHERE u.is_admin
+	) AS sa ON 1 = 1
+	WHERE br.role = ?`
+)
+
 func ProvideService(sql db.DB) *AccessControlStore {
 	return &AccessControlStore{sql}
 }
@@ -36,8 +63,8 @@ func (s *AccessControlStore) GetUserPermissions(ctx context.Context, query acces
 		` + filter
 
 		if len(query.RolePrefixes) > 0 {
-			q += " WHERE ( " + strings.Repeat("role.name LIKE ? OR ", len(query.RolePrefixes))
-			q = q[:len(q)-4] + " )" // remove last " OR "
+			q += " WHERE ( " + strings.Repeat("role.name LIKE ? OR ", len(query.RolePrefixes)-1)
+			q += "role.name LIKE ? )"
 			for i := range query.RolePrefixes {
 				params = append(params, query.RolePrefixes[i]+"%")
 			}
@@ -53,7 +80,7 @@ func (s *AccessControlStore) GetUserPermissions(ctx context.Context, query acces
 	return result, err
 }
 
-// SearchUsersPermissions returns the list of user permissions indexed by UserID
+// SearchUsersPermissions returns the list of user permissions in specific organization indexed by UserID
 func (s *AccessControlStore) SearchUsersPermissions(ctx context.Context, orgID int64, options accesscontrol.SearchOptions) (map[int64][]accesscontrol.Permission, error) {
 	type UserRBACPermission struct {
 		UserID int64  `xorm:"user_id"`
@@ -61,62 +88,94 @@ func (s *AccessControlStore) SearchUsersPermissions(ctx context.Context, orgID i
 		Scope  string `xorm:"scope"`
 	}
 	dbPerms := make([]UserRBACPermission, 0)
+
+	var userID int64
+	if options.NamespacedID != "" {
+		var err error
+		userID, err = options.ComputeUserID()
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	if err := s.sql.WithDbSession(ctx, func(sess *db.Session) error {
+		roleNameFilterJoin := ""
+		if len(options.RolePrefixes) > 0 {
+			roleNameFilterJoin = "INNER JOIN role AS r ON up.role_id = r.id"
+		}
+
+		params := []any{}
+
+		direct := userAssignsSQL
+		if options.NamespacedID != "" {
+			direct += " WHERE ur.user_id = ?"
+			params = append(params, userID)
+		}
+
+		team := teamAssignsSQL
+		if options.NamespacedID != "" {
+			team += " WHERE tm.user_id = ?"
+			params = append(params, userID)
+		}
+
+		basic := basicRoleAssignsSQL
+		if options.NamespacedID != "" {
+			basic += " WHERE ou.user_id = ?"
+			params = append(params, userID)
+		}
+
+		grafanaAdmin := fmt.Sprintf(grafanaAdminAssignsSQL, s.sql.Quote("user"))
+		params = append(params, accesscontrol.RoleGrafanaAdmin)
+		if options.NamespacedID != "" {
+			grafanaAdmin += " AND sa.user_id = ?"
+			params = append(params, userID)
+		}
+
 		// Find permissions
 		q := `
 		SELECT
 			user_id,
-			action,
-			scope
+			p.action,
+			p.scope
 		FROM (
-			SELECT ur.user_id, ur.org_id, p.action, p.scope
-				FROM permission AS p
-				INNER JOIN user_role AS ur on ur.role_id = p.role_id
+			` + direct + `
 			UNION ALL
-				SELECT tm.user_id, tr.org_id, p.action, p.scope
-					FROM permission AS p
-					INNER JOIN team_role AS tr ON tr.role_id = p.role_id
-					INNER JOIN team_member AS tm ON tm.team_id = tr.team_id
+			` + team + `
 			UNION ALL
-				SELECT ou.user_id, ou.org_id, p.action, p.scope
-					FROM permission AS p
-					INNER JOIN builtin_role AS br ON br.role_id = p.role_id
-					INNER JOIN org_user AS ou ON ou.role = br.role
+			` + basic + `
 			UNION ALL
-				SELECT sa.user_id, br.org_id, p.action, p.scope
-					FROM permission AS p
-					INNER JOIN builtin_role AS br ON br.role_id = p.role_id
-					INNER JOIN (
-						SELECT u.id AS user_id
-						FROM ` + s.sql.GetDialect().Quote("user") + ` AS u WHERE u.is_admin
-					) AS sa ON 1 = 1
-					WHERE br.role = ?
-		) AS up
-		WHERE (org_id = ? OR org_id = ?)
+			` + grafanaAdmin + `
+		) AS up ` + roleNameFilterJoin + `
+		INNER JOIN permission AS p ON up.role_id = p.role_id
+		WHERE (up.org_id = ? OR up.org_id = ?)
 		`
-
-		params := []any{accesscontrol.RoleGrafanaAdmin, accesscontrol.GlobalOrgID, orgID}
+		params = append(params, orgID, accesscontrol.GlobalOrgID)
 
 		if options.ActionPrefix != "" {
-			q += ` AND action LIKE ?`
+			q += ` AND p.action LIKE ?`
 			params = append(params, options.ActionPrefix+"%")
 		}
 		if options.Action != "" {
-			q += ` AND action = ?`
+			q += ` AND p.action = ?`
 			params = append(params, options.Action)
 		}
 		if options.Scope != "" {
-			q += ` AND scope = ?`
-			params = append(params, options.Scope)
+			// Search for scope and wildcard that include the scope
+			scopes := append(options.Wildcards(), options.Scope)
+			q += ` AND p.scope IN ( ? ` + strings.Repeat(", ?", len(scopes)-1) + ")"
+			for i := range scopes {
+				params = append(params, scopes[i])
+			}
 		}
-
-		if options.UserID != 0 {
-			q += ` AND user_id = ?`
-			params = append(params, options.UserID)
+		if len(options.RolePrefixes) > 0 {
+			q += " AND ( " + strings.Repeat("r.name LIKE ? OR ", len(options.RolePrefixes)-1)
+			q += "r.name LIKE ? )"
+			for _, prefix := range options.RolePrefixes {
+				params = append(params, prefix+"%")
+			}
 		}
 
-		return sess.SQL(q, params...).
-			Find(&dbPerms)
+		return sess.SQL(q, params...).Find(&dbPerms)
 	}); err != nil {
 		return nil, err
 	}
@@ -234,3 +293,58 @@ func (s *AccessControlStore) DeleteUserPermissions(ctx context.Context, orgID, u
 	})
 	return err
 }
+
+func (s *AccessControlStore) DeleteTeamPermissions(ctx context.Context, orgID, teamID int64) error {
+	err := s.sql.WithDbSession(ctx, func(sess *db.Session) error {
+		roleDeleteQuery := "DELETE FROM team_role WHERE team_id = ? AND org_id = ?"
+		roleDeleteParams := []any{roleDeleteQuery, teamID, orgID}
+
+		// Delete team role assignments
+		if _, err := sess.Exec(roleDeleteParams...); err != nil {
+			return err
+		}
+
+		// Delete permissions that are scoped to the team
+		if _, err := sess.Exec("DELETE FROM permission WHERE scope = ?", accesscontrol.Scope("teams", "id", strconv.FormatInt(teamID, 10))); err != nil {
+			return err
+		}
+
+		// Delete the team managed role
+		roleQuery := "SELECT id FROM role WHERE name = ? AND org_id = ?"
+		roleParams := []any{accesscontrol.ManagedTeamRoleName(teamID), orgID}
+
+		var roleIDs []int64
+		if err := sess.SQL(roleQuery, roleParams...).Find(&roleIDs); err != nil {
+			return err
+		}
+
+		if len(roleIDs) == 0 {
+			return nil
+		}
+
+		permissionDeleteQuery := "DELETE FROM permission WHERE role_id IN(? " + strings.Repeat(",?", len(roleIDs)-1) + ")"
+		permissionDeleteParams := make([]any, 0, len(roleIDs)+1)
+		permissionDeleteParams = append(permissionDeleteParams, permissionDeleteQuery)
+		for _, id := range roleIDs {
+			permissionDeleteParams = append(permissionDeleteParams, id)
+		}
+
+		// Delete managed team permissions
+		if _, err := sess.Exec(permissionDeleteParams...); err != nil {
+			return err
+		}
+
+		managedRoleDeleteQuery := "DELETE FROM role WHERE id IN(? " + strings.Repeat(",?", len(roleIDs)-1) + ")"
+		managedRoleDeleteParams := []any{managedRoleDeleteQuery}
+		for _, id := range roleIDs {
+			managedRoleDeleteParams = append(managedRoleDeleteParams, id)
+		}
+		// Delete managed team role
+		if _, err := sess.Exec(managedRoleDeleteParams...); err != nil {
+			return err
+		}
+
+		return nil
+	})
+	return err
+}
diff --git a/pkg/services/accesscontrol/database/database_test.go b/pkg/services/accesscontrol/database/database_test.go
index 567f13ea7b6f5..5cbfae4633d4d 100644
--- a/pkg/services/accesscontrol/database/database_test.go
+++ b/pkg/services/accesscontrol/database/database_test.go
@@ -13,7 +13,8 @@ import (
 	"github.com/grafana/grafana/pkg/infra/localcache"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	rs "github.com/grafana/grafana/pkg/services/accesscontrol/resourcepermissions"
-	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/org/orgimpl"
@@ -23,8 +24,14 @@ import (
 	"github.com/grafana/grafana/pkg/services/team/teamimpl"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/user/userimpl"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+// run tests with cleanup
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 type getUserPermissionsTestCase struct {
 	desc               string
 	anonymousUser      bool
@@ -236,6 +243,77 @@ func TestAccessControlStore_DeleteUserPermissions(t *testing.T) {
 	})
 }
 
+func TestAccessControlStore_DeleteTeamPermissions(t *testing.T) {
+	t.Run("expect permissions related to team to be deleted", func(t *testing.T) {
+		store, permissionsStore, sql, teamSvc, _ := setupTestEnv(t)
+		user, team := createUserAndTeam(t, sql, teamSvc, 1)
+
+		// grant permission to the team
+		_, err := permissionsStore.SetTeamResourcePermission(context.Background(), 1, team.ID, rs.SetResourcePermissionCommand{
+			Actions:           []string{"dashboards:write"},
+			Resource:          "dashboards",
+			ResourceAttribute: "uid",
+			ResourceID:        "xxYYzz",
+		}, nil)
+		require.NoError(t, err)
+
+		// generate permissions scoped to the team
+		_, err = permissionsStore.SetUserResourcePermission(context.Background(), 1, accesscontrol.User{ID: user.ID}, rs.SetResourcePermissionCommand{
+			Actions:           []string{"team:read"},
+			Resource:          "teams",
+			ResourceAttribute: "id",
+			ResourceID:        fmt.Sprintf("%d", team.ID),
+		}, nil)
+		require.NoError(t, err)
+
+		err = store.DeleteTeamPermissions(context.Background(), 1, team.ID)
+		require.NoError(t, err)
+
+		permissions, err := store.GetUserPermissions(context.Background(), accesscontrol.GetUserPermissionsQuery{
+			OrgID:   1,
+			UserID:  user.ID,
+			Roles:   []string{"Admin"},
+			TeamIDs: []int64{team.ID},
+		})
+		require.NoError(t, err)
+		assert.Len(t, permissions, 0)
+	})
+	t.Run("expect permissions not related to team to be kept", func(t *testing.T) {
+		store, permissionsStore, sql, teamSvc, _ := setupTestEnv(t)
+		user, team := createUserAndTeam(t, sql, teamSvc, 1)
+
+		// grant permission to the team
+		_, err := permissionsStore.SetTeamResourcePermission(context.Background(), 1, team.ID, rs.SetResourcePermissionCommand{
+			Actions:           []string{"dashboards:write"},
+			Resource:          "dashboards",
+			ResourceAttribute: "uid",
+			ResourceID:        "xxYYzz",
+		}, nil)
+		require.NoError(t, err)
+
+		// generate permissions scoped to another team
+		_, err = permissionsStore.SetUserResourcePermission(context.Background(), 1, accesscontrol.User{ID: user.ID}, rs.SetResourcePermissionCommand{
+			Actions:           []string{"team:read"},
+			Resource:          "teams",
+			ResourceAttribute: "id",
+			ResourceID:        fmt.Sprintf("%d", team.ID+1),
+		}, nil)
+		require.NoError(t, err)
+
+		err = store.DeleteTeamPermissions(context.Background(), 1, team.ID)
+		require.NoError(t, err)
+
+		permissions, err := store.GetUserPermissions(context.Background(), accesscontrol.GetUserPermissionsQuery{
+			OrgID:   1,
+			UserID:  user.ID,
+			Roles:   []string{"Admin"},
+			TeamIDs: []int64{team.ID},
+		})
+		require.NoError(t, err)
+		assert.Len(t, permissions, 1)
+	})
+}
+
 func createUserAndTeam(t *testing.T, userSrv user.Service, teamSvc team.Service, orgID int64) (*user.User, team.Team) {
 	t.Helper()
 
@@ -248,7 +326,7 @@ func createUserAndTeam(t *testing.T, userSrv user.Service, teamSvc team.Service,
 	team, err := teamSvc.CreateTeam("team", "", orgID)
 	require.NoError(t, err)
 
-	err = teamSvc.AddTeamMember(user.ID, orgID, team.ID, false, dashboards.PERMISSION_VIEW)
+	err = teamSvc.AddTeamMember(context.Background(), user.ID, orgID, team.ID, false, dashboardaccess.PERMISSION_VIEW)
 	require.NoError(t, err)
 
 	return user, team
@@ -296,7 +374,7 @@ func createUsersAndTeams(t *testing.T, svcs helperServices, orgID int64, users [
 		team, err := svcs.teamSvc.CreateTeam(fmt.Sprintf("team%v", i+1), "", orgID)
 		require.NoError(t, err)
 
-		err = svcs.teamSvc.AddTeamMember(user.ID, orgID, team.ID, false, dashboards.PERMISSION_VIEW)
+		err = svcs.teamSvc.AddTeamMember(context.Background(), user.ID, orgID, team.ID, false, dashboardaccess.PERMISSION_VIEW)
 		require.NoError(t, err)
 
 		err = svcs.orgSvc.UpdateOrgUser(context.Background(),
@@ -316,7 +394,8 @@ func setupTestEnv(t testing.TB) (*AccessControlStore, rs.Store, user.Service, te
 	cfg.AutoAssignOrgId = 1
 	acstore := ProvideService(sql)
 	permissionStore := rs.NewStore(sql, featuremgmt.WithFeatures())
-	teamService := teamimpl.ProvideService(sql, cfg)
+	teamService, err := teamimpl.ProvideService(sql, cfg)
+	require.NoError(t, err)
 	orgService, err := orgimpl.ProvideService(sql, cfg, quotatest.New(false, nil))
 	require.NoError(t, err)
 
@@ -461,7 +540,7 @@ func TestIntegrationAccessControlStore_SearchUsersPermissions(t *testing.T) {
 			},
 			options: accesscontrol.SearchOptions{
 				ActionPrefix: "teams:",
-				UserID:       1,
+				NamespacedID: identity.NamespaceUser + ":1",
 			},
 			wantPerm: map[int64][]accesscontrol.Permission{
 				1: {{Action: "teams:read", Scope: "teams:id:1"}, {Action: "teams:read", Scope: "teams:id:10"},
@@ -526,6 +605,20 @@ func TestIntegrationAccessControlStore_SearchUsersPermissions(t *testing.T) {
 				{Action: "teams:write", Scope: "teams:id:1"},
 			}},
 		},
+		{
+			name:  "user assignment by scope",
+			users: []testUser{{orgRole: org.RoleAdmin, isAdmin: false}},
+			permCmds: []rs.SetResourcePermissionsCommand{
+				{User: accesscontrol.User{ID: 1, IsExternal: false}, SetResourcePermissionCommand: readTeamPerm("*")}, // hack to have a global permission
+				{User: accesscontrol.User{ID: 1, IsExternal: false}, SetResourcePermissionCommand: writeTeamPerm("1")},
+			},
+			options: accesscontrol.SearchOptions{Scope: "teams:id:1"},
+			wantPerm: map[int64][]accesscontrol.Permission{1: {
+				{Action: "teams:read", Scope: "teams:id:*"},
+				{Action: "teams:read", Scope: "teams:id:1"},
+				{Action: "teams:write", Scope: "teams:id:1"},
+			}},
+		},
 		{
 			name:  "user assignment by action and scope",
 			users: []testUser{{orgRole: org.RoleAdmin, isAdmin: false}},
@@ -536,6 +629,24 @@ func TestIntegrationAccessControlStore_SearchUsersPermissions(t *testing.T) {
 			options:  accesscontrol.SearchOptions{Action: "teams:read", Scope: "teams:id:1"},
 			wantPerm: map[int64][]accesscontrol.Permission{1: {{Action: "teams:read", Scope: "teams:id:1"}}},
 		},
+		{
+			name:  "user assignment by role prefixes",
+			users: []testUser{{orgRole: org.RoleAdmin, isAdmin: false}},
+			permCmds: []rs.SetResourcePermissionsCommand{
+				{User: accesscontrol.User{ID: 1, IsExternal: false}, SetResourcePermissionCommand: readTeamPerm("1")},
+			},
+			options:  accesscontrol.SearchOptions{RolePrefixes: []string{accesscontrol.ManagedRolePrefix}},
+			wantPerm: map[int64][]accesscontrol.Permission{1: {{Action: "teams:read", Scope: "teams:id:1"}}},
+		},
+		{
+			name:  "filter out permissions by role prefix",
+			users: []testUser{{orgRole: org.RoleAdmin, isAdmin: false}},
+			permCmds: []rs.SetResourcePermissionsCommand{
+				{User: accesscontrol.User{ID: 1, IsExternal: false}, SetResourcePermissionCommand: readTeamPerm("1")},
+			},
+			options:  accesscontrol.SearchOptions{RolePrefixes: []string{accesscontrol.BasicRolePrefix}},
+			wantPerm: map[int64][]accesscontrol.Permission{},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
diff --git a/pkg/services/accesscontrol/database/externalservices.go b/pkg/services/accesscontrol/database/externalservices.go
index 4335b57334894..ea69ff79fc564 100644
--- a/pkg/services/accesscontrol/database/externalservices.go
+++ b/pkg/services/accesscontrol/database/externalservices.go
@@ -79,7 +79,7 @@ func (s *AccessControlStore) SaveExternalServiceRole(ctx context.Context, cmd ac
 func genExternalServiceRole(cmd accesscontrol.SaveExternalServiceRoleCommand) accesscontrol.Role {
 	name := extServiceRoleName(cmd.ExternalServiceID)
 	role := accesscontrol.Role{
-		OrgID:       cmd.OrgID,
+		OrgID:       accesscontrol.GlobalOrgID, // External Service Roles are global
 		Version:     1,
 		Name:        name,
 		UID:         accesscontrol.PrefixedRoleUID(name),
@@ -90,21 +90,15 @@ func genExternalServiceRole(cmd accesscontrol.SaveExternalServiceRoleCommand) ac
 		Created:     time.Now(),
 		Updated:     time.Now(),
 	}
-	if cmd.Global {
-		role.OrgID = accesscontrol.GlobalOrgID
-	}
 	return role
 }
 
 func genExternalServiceAssignment(cmd accesscontrol.SaveExternalServiceRoleCommand) accesscontrol.UserRole {
 	assignment := accesscontrol.UserRole{
-		OrgID:   cmd.OrgID,
+		OrgID:   cmd.AssignmentOrgID,
 		UserID:  cmd.ServiceAccountID,
 		Created: time.Now(),
 	}
-	if cmd.Global {
-		assignment.OrgID = accesscontrol.GlobalOrgID
-	}
 	return assignment
 }
 
diff --git a/pkg/services/accesscontrol/database/externalservices_test.go b/pkg/services/accesscontrol/database/externalservices_test.go
index b782e791ff829..21bbbda171a0d 100644
--- a/pkg/services/accesscontrol/database/externalservices_test.go
+++ b/pkg/services/accesscontrol/database/externalservices_test.go
@@ -27,7 +27,7 @@ func TestAccessControlStore_SaveExternalServiceRole(t *testing.T) {
 				{
 					cmd: accesscontrol.SaveExternalServiceRoleCommand{
 						ExternalServiceID: "app1",
-						Global:            true,
+						AssignmentOrgID:   1,
 						ServiceAccountID:  1,
 						Permissions: []accesscontrol.Permission{
 							{Action: "users:read", Scope: "users:id:1"},
@@ -44,7 +44,7 @@ func TestAccessControlStore_SaveExternalServiceRole(t *testing.T) {
 				{
 					cmd: accesscontrol.SaveExternalServiceRoleCommand{
 						ExternalServiceID: "app1",
-						Global:            true,
+						AssignmentOrgID:   1,
 						ServiceAccountID:  1,
 						Permissions: []accesscontrol.Permission{
 							{Action: "users:read", Scope: "users:id:1"},
@@ -55,7 +55,7 @@ func TestAccessControlStore_SaveExternalServiceRole(t *testing.T) {
 				{
 					cmd: accesscontrol.SaveExternalServiceRoleCommand{
 						ExternalServiceID: "app1",
-						Global:            true,
+						AssignmentOrgID:   1,
 						ServiceAccountID:  1,
 						Permissions: []accesscontrol.Permission{
 							{Action: "users:write", Scope: "users:id:1"},
@@ -65,51 +65,13 @@ func TestAccessControlStore_SaveExternalServiceRole(t *testing.T) {
 				},
 			},
 		},
-		{
-			name: "allow switching role from local to global and back",
-			runs: []run{
-				{
-					cmd: accesscontrol.SaveExternalServiceRoleCommand{
-						ExternalServiceID: "app1",
-						OrgID:             1,
-						ServiceAccountID:  1,
-						Permissions: []accesscontrol.Permission{
-							{Action: "users:read", Scope: "users:id:1"},
-							{Action: "users:read", Scope: "users:id:2"},
-						},
-					},
-				},
-				{
-					cmd: accesscontrol.SaveExternalServiceRoleCommand{
-						ExternalServiceID: "app1",
-						Global:            true,
-						ServiceAccountID:  1,
-						Permissions: []accesscontrol.Permission{
-							{Action: "users:read", Scope: "users:id:1"},
-							{Action: "users:read", Scope: "users:id:2"},
-						},
-					},
-				},
-				{
-					cmd: accesscontrol.SaveExternalServiceRoleCommand{
-						ExternalServiceID: "app1",
-						OrgID:             1,
-						ServiceAccountID:  1,
-						Permissions: []accesscontrol.Permission{
-							{Action: "users:read", Scope: "users:id:1"},
-							{Action: "users:read", Scope: "users:id:2"},
-						},
-					},
-				},
-			},
-		},
 		{
 			name: "edge case - remove all permissions",
 			runs: []run{
 				{
 					cmd: accesscontrol.SaveExternalServiceRoleCommand{
 						ExternalServiceID: "app1",
-						Global:            true,
+						AssignmentOrgID:   1,
 						ServiceAccountID:  1,
 						Permissions: []accesscontrol.Permission{
 							{Action: "users:read", Scope: "users:id:1"},
@@ -120,7 +82,7 @@ func TestAccessControlStore_SaveExternalServiceRole(t *testing.T) {
 				{
 					cmd: accesscontrol.SaveExternalServiceRoleCommand{
 						ExternalServiceID: "app1",
-						Global:            true,
+						AssignmentOrgID:   1,
 						ServiceAccountID:  1,
 						Permissions:       []accesscontrol.Permission{},
 					},
@@ -133,14 +95,14 @@ func TestAccessControlStore_SaveExternalServiceRole(t *testing.T) {
 				{
 					cmd: accesscontrol.SaveExternalServiceRoleCommand{
 						ExternalServiceID: "app1",
-						Global:            true,
+						AssignmentOrgID:   1,
 						ServiceAccountID:  1,
 					},
 				},
 				{
 					cmd: accesscontrol.SaveExternalServiceRoleCommand{
 						ExternalServiceID: "app1",
-						Global:            true,
+						AssignmentOrgID:   1,
 						ServiceAccountID:  2,
 					},
 					wantErr: true,
@@ -167,8 +129,7 @@ func TestAccessControlStore_SaveExternalServiceRole(t *testing.T) {
 					storedRole, err := getRoleByUID(ctx, sess, accesscontrol.PrefixedRoleUID(extServiceRoleName(tt.runs[i].cmd.ExternalServiceID)))
 					require.NoError(t, err)
 					require.NotNil(t, storedRole)
-					require.Equal(t, tt.runs[i].cmd.Global, storedRole.Global(), "Incorrect global state of the role")
-					require.Equal(t, tt.runs[i].cmd.OrgID, storedRole.OrgID, "Incorrect OrgID of the role")
+					require.True(t, storedRole.Global(), "Incorrect global state of the role")
 
 					storedPerm, err := getRolePermissions(ctx, sess, storedRole.ID)
 					require.NoError(t, err)
@@ -181,8 +142,7 @@ func TestAccessControlStore_SaveExternalServiceRole(t *testing.T) {
 					has, err := sess.Where("role_id = ? AND user_id = ?", storedRole.ID, tt.runs[i].cmd.ServiceAccountID).Get(&assignment)
 					require.NoError(t, err)
 					require.True(t, has)
-					require.Equal(t, tt.runs[i].cmd.Global, assignment.OrgID == accesscontrol.GlobalOrgID, "Incorrect global state of the assignment")
-					require.Equal(t, tt.runs[i].cmd.OrgID, assignment.OrgID, "Incorrect OrgID for the role assignment")
+					require.Equal(t, tt.runs[i].cmd.AssignmentOrgID, assignment.OrgID, "Incorrect OrgID for the role assignment")
 
 					return nil
 				})
@@ -206,27 +166,10 @@ func TestAccessControlStore_DeleteExternalServiceRole(t *testing.T) {
 			wantErr: false,
 		},
 		{
-			name: "delete local role",
-			init: func(t *testing.T, ctx context.Context, s *AccessControlStore) {
-				errSave := s.SaveExternalServiceRole(ctx, accesscontrol.SaveExternalServiceRoleCommand{
-					OrgID:             2,
-					ExternalServiceID: extID,
-					ServiceAccountID:  3,
-					Permissions: []accesscontrol.Permission{
-						{Action: "users:read", Scope: "users:id:1"},
-						{Action: "users:write", Scope: "users:id:1"},
-					},
-				})
-				require.NoError(t, errSave)
-			},
-			id:      extID,
-			wantErr: false,
-		},
-		{
-			name: "delete global role",
+			name: "delete role",
 			init: func(t *testing.T, ctx context.Context, s *AccessControlStore) {
 				errSave := s.SaveExternalServiceRole(ctx, accesscontrol.SaveExternalServiceRoleCommand{
-					Global:            true,
+					AssignmentOrgID:   2,
 					ExternalServiceID: extID,
 					ServiceAccountID:  3,
 					Permissions: []accesscontrol.Permission{
diff --git a/pkg/services/accesscontrol/errors.go b/pkg/services/accesscontrol/errors.go
index 73394a67f51e2..175f501532931 100644
--- a/pkg/services/accesscontrol/errors.go
+++ b/pkg/services/accesscontrol/errors.go
@@ -21,6 +21,16 @@ func (e *ErrorInvalidRole) Error() string {
 	return "role is invalid"
 }
 
+type ErrorRoleNameMissing struct{}
+
+func (e *ErrorRoleNameMissing) Error() string {
+	return "role has been defined without a name"
+}
+
+func (e *ErrorRoleNameMissing) Unwrap() error {
+	return &ErrorInvalidRole{}
+}
+
 type ErrorRolePrefixMissing struct {
 	Role     string
 	Prefixes []string
diff --git a/pkg/services/accesscontrol/evaluator.go b/pkg/services/accesscontrol/evaluator.go
index c8421ebd17b41..4b082e267d488 100644
--- a/pkg/services/accesscontrol/evaluator.go
+++ b/pkg/services/accesscontrol/evaluator.go
@@ -2,6 +2,7 @@ package accesscontrol
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"strings"
 
@@ -84,14 +85,25 @@ func (p permissionEvaluator) MutateScopes(ctx context.Context, mutate ScopeAttri
 		return EvalPermission(p.Action), nil
 	}
 
+	resolved := false
 	scopes := make([]string, 0, len(p.Scopes))
 	for _, scope := range p.Scopes {
 		mutated, err := mutate(ctx, scope)
 		if err != nil {
+			if errors.Is(err, ErrResolverNotFound) {
+				scopes = append(scopes, mutated...)
+				continue
+			}
 			return nil, err
 		}
+		resolved = true
 		scopes = append(scopes, mutated...)
 	}
+
+	if !resolved {
+		return nil, ErrResolverNotFound
+	}
+
 	return EvalPermission(p.Action, scopes...), nil
 }
 
@@ -124,14 +136,24 @@ func (a allEvaluator) Evaluate(permissions map[string][]string) bool {
 }
 
 func (a allEvaluator) MutateScopes(ctx context.Context, mutate ScopeAttributeMutator) (Evaluator, error) {
+	resolved := false
 	modified := make([]Evaluator, 0, len(a.allOf))
 	for _, e := range a.allOf {
 		i, err := e.MutateScopes(ctx, mutate)
 		if err != nil {
+			if errors.Is(err, ErrResolverNotFound) {
+				modified = append(modified, e)
+				continue
+			}
 			return nil, err
 		}
+		resolved = true
 		modified = append(modified, i)
 	}
+
+	if !resolved {
+		return nil, ErrResolverNotFound
+	}
 	return EvalAll(modified...), nil
 }
 
@@ -174,14 +196,25 @@ func (a anyEvaluator) Evaluate(permissions map[string][]string) bool {
 }
 
 func (a anyEvaluator) MutateScopes(ctx context.Context, mutate ScopeAttributeMutator) (Evaluator, error) {
+	resolved := false
 	modified := make([]Evaluator, 0, len(a.anyOf))
 	for _, e := range a.anyOf {
 		i, err := e.MutateScopes(ctx, mutate)
 		if err != nil {
+			if errors.Is(err, ErrResolverNotFound) {
+				modified = append(modified, e)
+				continue
+			}
 			return nil, err
 		}
+		resolved = true
 		modified = append(modified, i)
 	}
+
+	if !resolved {
+		return nil, ErrResolverNotFound
+	}
+
 	return EvalAny(modified...), nil
 }
 
diff --git a/pkg/services/accesscontrol/evaluator_test.go b/pkg/services/accesscontrol/evaluator_test.go
index 8d36eba492db4..2cd9a21af4ce1 100644
--- a/pkg/services/accesscontrol/evaluator_test.go
+++ b/pkg/services/accesscontrol/evaluator_test.go
@@ -410,3 +410,49 @@ func TestEval(t *testing.T) {
 		})
 	}
 }
+
+func TestEval_MutateScopes(t *testing.T) {
+	t.Run("should return error if none of the scopes was a resolved", func(t *testing.T) {
+		eval := EvalAll(
+			EvalPermission("action:1", "scope:uid:1"),
+			EvalPermission("action:2", "scope:id:1"),
+		)
+
+		calls := 0
+		_, err := eval.MutateScopes(context.Background(), func(ctx context.Context, s string) ([]string, error) {
+			calls += 1
+			return nil, ErrResolverNotFound
+		})
+
+		assert.Equal(t, 2, calls)
+		assert.ErrorIs(t, err, ErrResolverNotFound)
+	})
+
+	t.Run("should return if at least one scope was resolved", func(t *testing.T) {
+		eval := EvalAll(
+			EvalPermission("action:1", "scope:uid:1"),
+			EvalPermission("action:2", "scope:id:1"),
+		)
+
+		calls := 0
+		resolved := 0
+		eval, err := eval.MutateScopes(context.Background(), func(ctx context.Context, s string) ([]string, error) {
+			calls += 1
+			if s == "scope:id:1" {
+				resolved += 1
+				return []string{"scope:uid:2"}, nil
+			}
+			return nil, ErrResolverNotFound
+		})
+
+		assert.NoError(t, err)
+		assert.Equal(t, 2, calls)
+		assert.Equal(t, 1, resolved)
+
+		hasAccess := eval.Evaluate(map[string][]string{
+			"action:1": {"scope:uid:1"},
+			"action:2": {"scope:uid:2"},
+		})
+		assert.True(t, hasAccess)
+	})
+}
diff --git a/pkg/services/accesscontrol/filter_test.go b/pkg/services/accesscontrol/filter_test.go
index a68d2a6b4f7a5..480bee31345ee 100644
--- a/pkg/services/accesscontrol/filter_test.go
+++ b/pkg/services/accesscontrol/filter_test.go
@@ -14,6 +14,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/datasources"
 	dsService "github.com/grafana/grafana/pkg/services/datasources/service"
 	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
 type filterDatasourcesTestCase struct {
@@ -27,6 +28,10 @@ type filterDatasourcesTestCase struct {
 	expectErr           bool
 }
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestFilter_Datasources(t *testing.T) {
 	tests := []filterDatasourcesTestCase{
 		{
diff --git a/pkg/services/accesscontrol/middleware.go b/pkg/services/accesscontrol/middleware.go
index 9902f0146ea17..bcc588fb4ae5f 100644
--- a/pkg/services/accesscontrol/middleware.go
+++ b/pkg/services/accesscontrol/middleware.go
@@ -5,6 +5,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"io"
 	"net/http"
 	"net/url"
 	"regexp"
@@ -19,6 +20,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/authn"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/services/team"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
@@ -36,7 +38,7 @@ func Middleware(ac AccessControl) func(Evaluator) web.Handler {
 				}
 
 				if !c.IsSignedIn && forceLogin {
-					unauthorized(c, nil)
+					unauthorized(c)
 					return
 				}
 			}
@@ -48,7 +50,7 @@ func Middleware(ac AccessControl) func(Evaluator) web.Handler {
 					return
 				}
 
-				unauthorized(c, c.LookupTokenErr)
+				unauthorized(c)
 				return
 			}
 
@@ -112,7 +114,7 @@ func deny(c *contextmodel.ReqContext, evaluator Evaluator, err error) {
 	})
 }
 
-func unauthorized(c *contextmodel.ReqContext, err error) {
+func unauthorized(c *contextmodel.ReqContext) {
 	if c.IsApiRequest() {
 		c.WriteErrOrFallback(http.StatusUnauthorized, http.StatusText(http.StatusUnauthorized), c.LookupTokenErr)
 		return
@@ -179,60 +181,117 @@ type userCache interface {
 	GetSignedInUserWithCacheCtx(ctx context.Context, query *user.GetSignedInUserQuery) (*user.SignedInUser, error)
 }
 
-func AuthorizeInOrgMiddleware(ac AccessControl, service Service, cache userCache) func(OrgIDGetter, Evaluator) web.Handler {
+type teamService interface {
+	GetTeamIDsByUser(ctx context.Context, query *team.GetTeamIDsByUserQuery) ([]int64, error)
+}
+
+func AuthorizeInOrgMiddleware(ac AccessControl, service Service, userService userCache, teamService teamService) func(OrgIDGetter, Evaluator) web.Handler {
 	return func(getTargetOrg OrgIDGetter, evaluator Evaluator) web.Handler {
 		return func(c *contextmodel.ReqContext) {
-			// We need to copy the user here because we're going to mutate it
-			userCopy := *(c.SignedInUser)
 			targetOrgID, err := getTargetOrg(c)
 			if err != nil {
 				deny(c, nil, fmt.Errorf("failed to get target org: %w", err))
 				return
 			}
 
-			if userCopy.OrgID != targetOrgID {
-				switch targetOrgID {
-				case GlobalOrgID:
-					userCopy.OrgID = GlobalOrgID
-					userCopy.OrgRole = org.RoleNone
-					userCopy.OrgName = ""
-				default:
-					query := user.GetSignedInUserQuery{UserID: c.UserID, OrgID: targetOrgID}
-					queryResult, err := cache.GetSignedInUserWithCacheCtx(c.Req.Context(), &query)
-					if err != nil {
-						deny(c, nil, fmt.Errorf("failed to authenticate user in target org: %w", err))
-						return
-					}
-					userCopy.OrgID = queryResult.OrgID
-					userCopy.OrgName = queryResult.OrgName
-					userCopy.OrgRole = queryResult.OrgRole
-				}
-			}
-
-			if userCopy.Permissions[targetOrgID] == nil {
-				permissions, err := service.GetUserPermissions(c.Req.Context(), &userCopy, Options{})
-				if err != nil {
-					deny(c, nil, fmt.Errorf("failed to authenticate user in target org: %w", err))
-				}
-
-				// guard against nil map
-				if userCopy.Permissions == nil {
-					userCopy.Permissions = make(map[int64]map[string][]string)
-				}
-				userCopy.Permissions[targetOrgID] = GroupScopesByAction(permissions)
+			tmpUser, err := makeTmpUser(c.Req.Context(), service, userService, teamService, c.SignedInUser, targetOrgID)
+			if err != nil {
+				deny(c, nil, fmt.Errorf("failed to authenticate user in target org: %w", err))
+				return
 			}
 
-			authorize(c, ac, &userCopy, evaluator)
+			authorize(c, ac, tmpUser, evaluator)
 
 			// guard against nil map
 			if c.SignedInUser.Permissions == nil {
 				c.SignedInUser.Permissions = make(map[int64]map[string][]string)
 			}
-			c.SignedInUser.Permissions[targetOrgID] = userCopy.Permissions[targetOrgID]
+			c.SignedInUser.Permissions[tmpUser.GetOrgID()] = tmpUser.GetPermissions()
 		}
 	}
 }
 
+// makeTmpUser creates a temporary user that can be used to evaluate access across orgs.
+func makeTmpUser(ctx context.Context, service Service, cache userCache,
+	teamService teamService, reqUser identity.Requester, targetOrgID int64) (identity.Requester, error) {
+	tmpUser := &user.SignedInUser{
+		OrgID:          reqUser.GetOrgID(),
+		OrgName:        reqUser.GetOrgName(),
+		OrgRole:        reqUser.GetOrgRole(),
+		IsGrafanaAdmin: reqUser.GetIsGrafanaAdmin(),
+		Login:          reqUser.GetLogin(),
+		Teams:          reqUser.GetTeams(),
+		Permissions: map[int64]map[string][]string{
+			reqUser.GetOrgID(): reqUser.GetPermissions(),
+		},
+	}
+
+	namespace, identifier := reqUser.GetNamespacedID()
+	id, _ := identity.IntIdentifier(namespace, identifier)
+	switch namespace {
+	case identity.NamespaceUser:
+		tmpUser.UserID = id
+	case identity.NamespaceAPIKey:
+		tmpUser.ApiKeyID = id
+		if tmpUser.OrgID != targetOrgID {
+			return nil, errors.New("API key does not belong to target org")
+		}
+	case identity.NamespaceServiceAccount:
+		tmpUser.UserID = id
+		tmpUser.IsServiceAccount = true
+	}
+
+	if tmpUser.OrgID != targetOrgID {
+		switch targetOrgID {
+		case GlobalOrgID:
+			tmpUser.OrgID = GlobalOrgID
+			tmpUser.OrgRole = org.RoleNone
+			tmpUser.OrgName = ""
+			tmpUser.Teams = []int64{}
+		default:
+			if cache == nil {
+				return nil, errors.New("user cache is nil")
+			}
+			query := user.GetSignedInUserQuery{UserID: tmpUser.UserID, OrgID: targetOrgID}
+			queryResult, err := cache.GetSignedInUserWithCacheCtx(ctx, &query)
+			if err != nil {
+				return nil, err
+			}
+			tmpUser.OrgID = queryResult.OrgID
+			tmpUser.OrgName = queryResult.OrgName
+			tmpUser.OrgRole = queryResult.OrgRole
+
+			// Only fetch the team membership is the user is a member of the organization
+			if queryResult.OrgID == targetOrgID {
+				if teamService != nil {
+					teamIDs, err := teamService.GetTeamIDsByUser(ctx, &team.GetTeamIDsByUserQuery{OrgID: targetOrgID, UserID: tmpUser.UserID})
+					if err != nil {
+						return nil, err
+					}
+					tmpUser.Teams = teamIDs
+				}
+			}
+		}
+	}
+
+	// If the user is not a member of the organization
+	// evaluation must happen based on global permissions.
+	evaluationOrg := targetOrgID
+	if tmpUser.OrgID == NoOrgID {
+		evaluationOrg = GlobalOrgID
+	}
+	if tmpUser.Permissions[evaluationOrg] == nil || len(tmpUser.Permissions[evaluationOrg]) == 0 {
+		permissions, err := service.GetUserPermissions(ctx, tmpUser, Options{})
+		if err != nil {
+			return nil, err
+		}
+
+		tmpUser.Permissions[evaluationOrg] = GroupScopesByAction(permissions)
+	}
+
+	return tmpUser, nil
+}
+
 func UseOrgFromContextParams(c *contextmodel.ReqContext) (int64, error) {
 	orgID, err := strconv.ParseInt(web.Params(c.Req)[":orgId"], 10, 64)
 
@@ -252,6 +311,107 @@ func UseGlobalOrg(c *contextmodel.ReqContext) (int64, error) {
 	return GlobalOrgID, nil
 }
 
+// UseGlobalOrSingleOrg returns the global organization or the current organization in a single organization setup
+func UseGlobalOrSingleOrg(cfg *setting.Cfg) OrgIDGetter {
+	return func(c *contextmodel.ReqContext) (int64, error) {
+		if cfg.RBACSingleOrganization {
+			return c.GetOrgID(), nil
+		}
+		return GlobalOrgID, nil
+	}
+}
+
+// UseOrgFromRequestData returns the organization from the request data.
+// If no org is specified, then the org where user is logged in is returned.
+func UseOrgFromRequestData(c *contextmodel.ReqContext) (int64, error) {
+	query, err := getOrgQueryFromRequest(c)
+	if err != nil {
+		// Special case of macaron handling invalid params
+		return NoOrgID, org.ErrOrgNotFound.Errorf("failed to get organization from context: %w", err)
+	}
+
+	if query.OrgId == nil {
+		return c.SignedInUser.GetOrgID(), nil
+	}
+
+	return *query.OrgId, nil
+}
+
+// UseGlobalOrgFromRequestData returns global org if `global` flag is set or the org where user is logged in.
+// If RBACSingleOrganization is set, the org where user is logged in is returned - this is intended only for cloud workflows, where instances are limited to a single organization.
+func UseGlobalOrgFromRequestData(cfg *setting.Cfg) func(*contextmodel.ReqContext) (int64, error) {
+	return func(c *contextmodel.ReqContext) (int64, error) {
+		query, err := getOrgQueryFromRequest(c)
+		if err != nil {
+			// Special case of macaron handling invalid params
+			return NoOrgID, org.ErrOrgNotFound.Errorf("failed to get organization from context: %w", err)
+		}
+
+		// We only check permissions in the global organization if we are not running a SingleOrganization setup
+		// That allows Organization Admins to modify global roles and make global assignments.
+		if query.Global && !cfg.RBACSingleOrganization {
+			return GlobalOrgID, nil
+		}
+
+		return c.SignedInUser.GetOrgID(), nil
+	}
+}
+
+// UseGlobalOrgFromRequestParams returns global org if `global` flag is set or the org where user is logged in.
+func UseGlobalOrgFromRequestParams(c *contextmodel.ReqContext) (int64, error) {
+	if c.QueryBool("global") {
+		return GlobalOrgID, nil
+	}
+
+	return c.SignedInUser.GetOrgID(), nil
+}
+
+func getOrgQueryFromRequest(c *contextmodel.ReqContext) (*QueryWithOrg, error) {
+	query := &QueryWithOrg{}
+
+	req, err := CloneRequest(c.Req)
+	if err != nil {
+		return nil, err
+	}
+
+	if err := web.Bind(req, query); err != nil {
+		// Special case of macaron handling invalid params
+		return nil, err
+	}
+
+	return query, nil
+}
+
+// CloneRequest creates request copy including request body
+func CloneRequest(req *http.Request) (*http.Request, error) {
+	// Get copy of body to prevent error when reading closed body in request handler
+	bodyCopy, err := CopyRequestBody(req)
+	if err != nil {
+		return nil, err
+	}
+	reqCopy := req.Clone(req.Context())
+	reqCopy.Body = bodyCopy
+	return reqCopy, nil
+}
+
+// CopyRequestBody returns copy of request body and keeps the original one to prevent error when reading closed body
+func CopyRequestBody(req *http.Request) (io.ReadCloser, error) {
+	if req.Body == nil {
+		return nil, nil
+	}
+
+	body := req.Body
+	var buf bytes.Buffer
+	if _, err := buf.ReadFrom(body); err != nil {
+		return nil, err
+	}
+	if err := body.Close(); err != nil {
+		return nil, err
+	}
+	req.Body = io.NopCloser(&buf)
+	return io.NopCloser(bytes.NewReader(buf.Bytes())), nil
+}
+
 // scopeParams holds the parameters used to fill in scope templates
 type scopeParams struct {
 	OrgID     int64
diff --git a/pkg/services/accesscontrol/migrator/migrator.go b/pkg/services/accesscontrol/migrator/migrator.go
index 0baaf2dc945cb..8ecc20ad5531f 100644
--- a/pkg/services/accesscontrol/migrator/migrator.go
+++ b/pkg/services/accesscontrol/migrator/migrator.go
@@ -15,6 +15,10 @@ var (
 	batchSize = 1000
 )
 
+const (
+	maxLen = 40
+)
+
 func MigrateScopeSplit(db db.DB, log log.Logger) error {
 	t := time.Now()
 	ctx := context.Background()
@@ -49,6 +53,12 @@ func MigrateScopeSplit(db db.DB, log log.Logger) error {
 		for i := start; i < end; i++ {
 			kind, attribute, identifier := permissions[i].SplitScope()
 
+			// Trim to max length to avoid bootloop.
+			// too long scopes will be truncated and the permission will become invalid.
+			kind = trimToMaxLen(kind, maxLen)
+			attribute = trimToMaxLen(attribute, maxLen)
+			identifier = trimToMaxLen(identifier, maxLen)
+
 			delQuery += "?,"
 			delArgs = append(delArgs, permissions[i].ID)
 
@@ -109,3 +119,10 @@ func batch(count, batchSize int, eachFn func(start, end int) error) error {
 
 	return nil
 }
+
+func trimToMaxLen(s string, maxLen int) string {
+	if len(s) > maxLen {
+		return s[:maxLen]
+	}
+	return s
+}
diff --git a/pkg/services/accesscontrol/migrator/migrator_test.go b/pkg/services/accesscontrol/migrator/migrator_test.go
index d09962e7709ec..bfa35f17efcff 100644
--- a/pkg/services/accesscontrol/migrator/migrator_test.go
+++ b/pkg/services/accesscontrol/migrator/migrator_test.go
@@ -3,16 +3,24 @@ package migrator
 import (
 	"context"
 	"fmt"
+	"strings"
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
-	"github.com/stretchr/testify/require"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func batchInsertPermissions(cnt int, sqlStore db.DB) error {
 	now := time.Now()
 
@@ -35,27 +43,45 @@ func batchInsertPermissions(cnt int, sqlStore db.DB) error {
 	})
 }
 
-func TestMigrateScopeSplit(t *testing.T) {
+// TestIntegrationMigrateScopeSplit tests the scope split migration
+// also tests the scope split truncation logic
+func TestIntegrationMigrateScopeSplitTruncation(t *testing.T) {
 	sqlStore := db.InitTestDB(t)
 	logger := log.New("accesscontrol.migrator.test")
 
+	batchSize = 20
 	// Populate permissions
 	require.NoError(t, batchInsertPermissions(3*batchSize, sqlStore), "could not insert permissions")
 
+	// Insert a permission with a scope longer than 240 characters
+	longScope := strings.Repeat("a", 60) + ":" + strings.Repeat("b", 60) + ":" + strings.Repeat("c", 60)
+	permission := ac.Permission{
+		RoleID:  1,
+		Action:  "action",
+		Scope:   longScope,
+		Created: time.Now(),
+		Updated: time.Now(),
+	}
+	require.NoError(t, sqlStore.WithDbSession(context.Background(), func(sess *db.Session) error {
+		_, err := sess.Insert(permission)
+		return err
+	}), "could not insert permission with long scope")
+
 	// Migrate
 	require.NoError(t, MigrateScopeSplit(sqlStore, logger))
 
 	// Check migration result
-	permissions := make([]ac.Permission, 0, 3*batchSize)
+	permissions := make([]ac.Permission, 0, 3*batchSize+1)
 	errFind := sqlStore.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
 		return sess.Find(&permissions)
 	})
 	require.NoError(t, errFind, "could not find permissions in store")
 
 	for i := range permissions {
-		require.Equal(t, fmt.Sprintf("resource:uid:%v", i+1), permissions[i].Scope, "scope should have been preserved")
-		require.Equal(t, "resource", permissions[i].Kind)
-		require.Equal(t, "uid", permissions[i].Attribute)
-		require.Equal(t, fmt.Sprintf("%v", i+1), permissions[i].Identifier)
+		if permissions[i].Scope == longScope {
+			assert.Equal(t, strings.Repeat("a", 40), permissions[i].Kind)
+			assert.Equal(t, strings.Repeat("b", 40), permissions[i].Attribute)
+			assert.Equal(t, strings.Repeat("c", 40), permissions[i].Identifier)
+		}
 	}
 }
diff --git a/pkg/services/accesscontrol/mock/mock.go b/pkg/services/accesscontrol/mock/mock.go
index 90a9cda8bfe64..48fd43fc992aa 100644
--- a/pkg/services/accesscontrol/mock/mock.go
+++ b/pkg/services/accesscontrol/mock/mock.go
@@ -21,6 +21,7 @@ type fullAccessControl interface {
 type Calls struct {
 	Evaluate                       []interface{}
 	GetUserPermissions             []interface{}
+	GetUserPermissionsInOrg        []interface{}
 	ClearUserPermissionCache       []interface{}
 	DeclareFixedRoles              []interface{}
 	DeclarePluginRoles             []interface{}
@@ -28,6 +29,7 @@ type Calls struct {
 	RegisterFixedRoles             []interface{}
 	RegisterAttributeScopeResolver []interface{}
 	DeleteUserPermissions          []interface{}
+	DeleteTeamPermissions          []interface{}
 	SearchUsersPermissions         []interface{}
 	SearchUserPermissions          []interface{}
 	SaveExternalServiceRole        []interface{}
@@ -46,6 +48,7 @@ type Mock struct {
 	// Override functions
 	EvaluateFunc                       func(context.Context, identity.Requester, accesscontrol.Evaluator) (bool, error)
 	GetUserPermissionsFunc             func(context.Context, identity.Requester, accesscontrol.Options) ([]accesscontrol.Permission, error)
+	GetUserPermissionsInOrgFunc        func(context.Context, identity.Requester, int64) ([]accesscontrol.Permission, error)
 	ClearUserPermissionCacheFunc       func(identity.Requester)
 	DeclareFixedRolesFunc              func(...accesscontrol.RoleRegistration) error
 	DeclarePluginRolesFunc             func(context.Context, string, string, []plugins.RoleRegistration) error
@@ -53,10 +56,12 @@ type Mock struct {
 	RegisterFixedRolesFunc             func() error
 	RegisterScopeAttributeResolverFunc func(string, accesscontrol.ScopeAttributeResolver)
 	DeleteUserPermissionsFunc          func(context.Context, int64) error
+	DeleteTeamPermissionsFunc          func(context.Context, int64) error
 	SearchUsersPermissionsFunc         func(context.Context, identity.Requester, int64, accesscontrol.SearchOptions) (map[int64][]accesscontrol.Permission, error)
 	SearchUserPermissionsFunc          func(ctx context.Context, orgID int64, searchOptions accesscontrol.SearchOptions) ([]accesscontrol.Permission, error)
 	SaveExternalServiceRoleFunc        func(ctx context.Context, cmd accesscontrol.SaveExternalServiceRoleCommand) error
 	DeleteExternalServiceRoleFunc      func(ctx context.Context, externalServiceID string) error
+	SyncUserRolesFunc                  func(ctx context.Context, orgID int64, cmd accesscontrol.SyncUserRolesCommand) error
 
 	scopeResolvers accesscontrol.Resolvers
 }
@@ -137,6 +142,16 @@ func (m *Mock) GetUserPermissions(ctx context.Context, user identity.Requester,
 	return m.permissions, nil
 }
 
+func (m *Mock) GetUserPermissionsInOrg(ctx context.Context, user identity.Requester, orgID int64) ([]accesscontrol.Permission, error) {
+	m.Calls.GetUserPermissionsInOrg = append(m.Calls.GetUserPermissionsInOrg, []interface{}{ctx, user, orgID})
+	// Use override if provided
+	if m.GetUserPermissionsInOrgFunc != nil {
+		return m.GetUserPermissionsInOrgFunc(ctx, user, orgID)
+	}
+	// Otherwise return the Permissions list
+	return m.permissions, nil
+}
+
 func (m *Mock) ClearUserPermissionCache(user identity.Requester) {
 	m.Calls.ClearUserPermissionCache = append(m.Calls.ClearUserPermissionCache, []interface{}{user})
 	// Use override if provided
@@ -198,6 +213,15 @@ func (m *Mock) DeleteUserPermissions(ctx context.Context, orgID, userID int64) e
 	return nil
 }
 
+func (m *Mock) DeleteTeamPermissions(ctx context.Context, orgID, teamID int64) error {
+	m.Calls.DeleteTeamPermissions = append(m.Calls.DeleteTeamPermissions, []interface{}{ctx, orgID, teamID})
+	// Use override if provided
+	if m.DeleteTeamPermissionsFunc != nil {
+		return m.DeleteTeamPermissionsFunc(ctx, teamID)
+	}
+	return nil
+}
+
 // SearchUsersPermissions returns all users' permissions filtered by an action prefix
 func (m *Mock) SearchUsersPermissions(ctx context.Context, usr identity.Requester, options accesscontrol.SearchOptions) (map[int64][]accesscontrol.Permission, error) {
 	user := usr.(*user.SignedInUser)
@@ -235,3 +259,10 @@ func (m *Mock) DeleteExternalServiceRole(ctx context.Context, externalServiceID
 	}
 	return nil
 }
+
+func (m *Mock) SyncUserRoles(ctx context.Context, orgID int64, cmd accesscontrol.SyncUserRolesCommand) error {
+	if m.SyncUserRolesFunc != nil {
+		return m.SyncUserRolesFunc(ctx, orgID, cmd)
+	}
+	return nil
+}
diff --git a/pkg/services/accesscontrol/models.go b/pkg/services/accesscontrol/models.go
index 6dc73b6015839..e942621fe1a4e 100644
--- a/pkg/services/accesscontrol/models.go
+++ b/pkg/services/accesscontrol/models.go
@@ -13,7 +13,15 @@ import (
 	"github.com/grafana/grafana/pkg/util/errutil"
 )
 
-var ErrInternal = errutil.Internal("accesscontrol.internal")
+const (
+	CacheHit  = "hit"
+	CacheMiss = "miss"
+)
+
+var (
+	ErrInternal        = errutil.Internal("accesscontrol.internal")
+	CacheUsageStatuses = []string{CacheHit, CacheMiss}
+)
 
 // RoleRegistration stores a role and its assignments to built-in roles
 // (Viewer, Editor, Admin, Grafana Admin)
@@ -62,6 +70,7 @@ func (r Role) MarshalJSON() ([]byte, error) {
 	})
 }
 
+// swagger:ignore
 type RoleDTO struct {
 	Version     int64        `json:"version"`
 	UID         string       `xorm:"uid" json:"uid"`
@@ -135,6 +144,12 @@ func (r *RoleDTO) IsExternalService() bool {
 	return strings.HasPrefix(r.Name, ExternalServiceRolePrefix) || strings.HasPrefix(r.UID, ExternalServiceRoleUIDPrefix)
 }
 
+// swagger:model RoleDTO
+type RoleDTOStatic struct {
+	RoleDTO
+	Global bool `json:"global" xorm:"-"`
+}
+
 func (r RoleDTO) MarshalJSON() ([]byte, error) {
 	type Alias RoleDTO
 
@@ -274,8 +289,7 @@ type SetResourcePermissionCommand struct {
 }
 
 type SaveExternalServiceRoleCommand struct {
-	OrgID             int64
-	Global            bool
+	AssignmentOrgID   int64
 	ExternalServiceID string
 	ServiceAccountID  int64
 	Permissions       []Permission
@@ -289,10 +303,6 @@ func (cmd *SaveExternalServiceRoleCommand) Validate() error {
 	// slugify the external service id ID for the role to have correct name and uid
 	cmd.ExternalServiceID = slugify.Slugify(cmd.ExternalServiceID)
 
-	if (cmd.OrgID == GlobalOrgID) != cmd.Global {
-		return fmt.Errorf("invalid org id %d for global role %t", cmd.OrgID, cmd.Global)
-	}
-
 	// Check and deduplicate permissions
 	if cmd.Permissions == nil || len(cmd.Permissions) == 0 {
 		return errors.New("no permissions provided")
@@ -320,6 +330,7 @@ func (cmd *SaveExternalServiceRoleCommand) Validate() error {
 
 const (
 	GlobalOrgID      = 0
+	NoOrgID          = int64(-1)
 	GeneralFolderUID = "general"
 	RoleGrafanaAdmin = "Grafana Admin"
 
@@ -330,9 +341,8 @@ const (
 	ActionAPIKeyDelete = "apikeys:delete"
 
 	// Users actions
-	ActionUsersRead        = "users:read"
-	ActionUsersWrite       = "users:write"
-	ActionUsersImpersonate = "users:impersonate"
+	ActionUsersRead  = "users:read"
+	ActionUsersWrite = "users:write"
 
 	// We can ignore gosec G101 since this does not contain any credentials.
 	// nolint:gosec
@@ -396,7 +406,6 @@ const (
 
 	// Settings scope
 	ScopeSettingsAll  = "settings:*"
-	ScopeSettingsAuth = "settings:auth:*"
 	ScopeSettingsSAML = "settings:auth.saml:*"
 
 	// Team related actions
@@ -435,6 +444,15 @@ const (
 	ActionAlertingNotificationsRead  = "alert.notifications:read"
 	ActionAlertingNotificationsWrite = "alert.notifications:write"
 
+	// Alerting notifications time interval actions
+	ActionAlertingNotificationsTimeIntervalsRead  = "alert.notifications.time-intervals:read"
+	ActionAlertingNotificationsTimeIntervalsWrite = "alert.notifications.time-intervals:write"
+
+	// Alerting receiver actions
+	ActionAlertingReceiversList        = "alert.notifications.receivers:list"
+	ActionAlertingReceiversRead        = "alert.notifications.receivers:read"
+	ActionAlertingReceiversReadSecrets = "alert.notifications.receivers.secrets:read"
+
 	// External alerting rule actions. We can only narrow it down to writes or reads, as we don't control the atomicity in the external system.
 	ActionAlertingRuleExternalWrite = "alert.rules.external:write"
 	ActionAlertingRuleExternalRead  = "alert.rules.external:read"
@@ -448,9 +466,16 @@ const (
 	ActionAlertingNotificationsExternalRead  = "alert.notifications.external:read"
 
 	// Alerting provisioning actions
-	ActionAlertingProvisioningRead        = "alert.provisioning:read"
-	ActionAlertingProvisioningReadSecrets = "alert.provisioning.secrets:read"
-	ActionAlertingProvisioningWrite       = "alert.provisioning:write"
+	ActionAlertingProvisioningRead               = "alert.provisioning:read"
+	ActionAlertingProvisioningReadSecrets        = "alert.provisioning.secrets:read"
+	ActionAlertingProvisioningWrite              = "alert.provisioning:write"
+	ActionAlertingRulesProvisioningRead          = "alert.rules.provisioning:read"
+	ActionAlertingRulesProvisioningWrite         = "alert.rules.provisioning:write"
+	ActionAlertingNotificationsProvisioningRead  = "alert.notifications.provisioning:read"
+	ActionAlertingNotificationsProvisioningWrite = "alert.notifications.provisioning:write"
+
+	// ActionAlertingProvisioningSetStatus Gives access to set provisioning status to alerting resources. Cannot be used alone. Only in conjunction with other permissions.
+	ActionAlertingProvisioningSetStatus = "alert.provisioning.provenance:write"
 
 	// Feature Management actions
 	ActionFeatureManagementRead  = "featuremgmt.read"
@@ -467,6 +492,10 @@ var (
 	// Team scope
 	ScopeTeamsID = Scope("teams", "id", Parameter(":teamId"))
 
+	ScopeSettingsOAuth = func(provider string) string {
+		return Scope("settings", "auth."+provider, "*")
+	}
+
 	// Annotation scopes
 	ScopeAnnotationsRoot             = "annotations"
 	ScopeAnnotationsProvider         = NewScopeProvider(ScopeAnnotationsRoot)
@@ -502,6 +531,7 @@ var TeamsAccessEvaluator = EvalAny(
 		EvalAny(
 			EvalPermission(ActionTeamsWrite),
 			EvalPermission(ActionTeamsPermissionsWrite),
+			EvalPermission(ActionTeamsPermissionsRead),
 		),
 	),
 )
@@ -540,3 +570,8 @@ var OrgsCreateAccessEvaluator = EvalAll(
 
 // ApiKeyAccessEvaluator is used to protect the "Configuration > API keys" page access
 var ApiKeyAccessEvaluator = EvalPermission(ActionAPIKeyRead)
+
+type QueryWithOrg struct {
+	OrgId  *int64 `json:"orgId"`
+	Global bool   `json:"global"`
+}
diff --git a/pkg/services/accesscontrol/models_test.go b/pkg/services/accesscontrol/models_test.go
index 64595f0ffb80b..c46dd45500be9 100644
--- a/pkg/services/accesscontrol/models_test.go
+++ b/pkg/services/accesscontrol/models_test.go
@@ -15,21 +15,10 @@ func TestSaveExternalServiceRoleCommand_Validate(t *testing.T) {
 		wantPermissions []Permission
 		wantErr         bool
 	}{
-		{
-			name: "invalid global statement",
-			cmd: SaveExternalServiceRoleCommand{
-				OrgID:             1,
-				Global:            true,
-				ExternalServiceID: "app 1",
-				ServiceAccountID:  2,
-				Permissions:       []Permission{{Action: "users:read", Scope: "users:id:1"}},
-			},
-			wantErr: true,
-		},
 		{
 			name: "invalid no permissions",
 			cmd: SaveExternalServiceRoleCommand{
-				OrgID:             1,
+				AssignmentOrgID:   1,
 				ExternalServiceID: "app 1",
 				ServiceAccountID:  2,
 				Permissions:       []Permission{},
@@ -39,7 +28,7 @@ func TestSaveExternalServiceRoleCommand_Validate(t *testing.T) {
 		{
 			name: "invalid service account id",
 			cmd: SaveExternalServiceRoleCommand{
-				OrgID:             1,
+				AssignmentOrgID:   1,
 				ExternalServiceID: "app 1",
 				ServiceAccountID:  -1,
 				Permissions:       []Permission{{Action: "users:read", Scope: "users:id:1"}},
@@ -49,7 +38,7 @@ func TestSaveExternalServiceRoleCommand_Validate(t *testing.T) {
 		{
 			name: "invalid no Ext Service ID",
 			cmd: SaveExternalServiceRoleCommand{
-				OrgID:            1,
+				AssignmentOrgID:  1,
 				ServiceAccountID: 2,
 				Permissions:      []Permission{{Action: "users:read", Scope: "users:id:1"}},
 			},
@@ -59,7 +48,7 @@ func TestSaveExternalServiceRoleCommand_Validate(t *testing.T) {
 			name: "slugify the external service ID correctly",
 			cmd: SaveExternalServiceRoleCommand{
 				ExternalServiceID: "ThisIs a Very Strange ___ App Name?",
-				Global:            true,
+				AssignmentOrgID:   1,
 				ServiceAccountID:  2,
 				Permissions:       []Permission{{Action: "users:read", Scope: "users:id:1"}},
 			},
@@ -69,7 +58,7 @@ func TestSaveExternalServiceRoleCommand_Validate(t *testing.T) {
 		{
 			name: "invalid empty Action",
 			cmd: SaveExternalServiceRoleCommand{
-				OrgID:             1,
+				AssignmentOrgID:   1,
 				ExternalServiceID: "app 1",
 				ServiceAccountID:  2,
 				Permissions:       []Permission{{Action: "", Scope: "users:id:1"}},
@@ -80,7 +69,7 @@ func TestSaveExternalServiceRoleCommand_Validate(t *testing.T) {
 		{
 			name: "permission deduplication",
 			cmd: SaveExternalServiceRoleCommand{
-				OrgID:             1,
+				AssignmentOrgID:   1,
 				ExternalServiceID: "app 1",
 				ServiceAccountID:  2,
 				Permissions: []Permission{
diff --git a/pkg/services/accesscontrol/ossaccesscontrol/permissions_services.go b/pkg/services/accesscontrol/ossaccesscontrol/permissions_services.go
index feb864e6d9185..ad25da579b467 100644
--- a/pkg/services/accesscontrol/ossaccesscontrol/permissions_services.go
+++ b/pkg/services/accesscontrol/ossaccesscontrol/permissions_services.go
@@ -8,10 +8,13 @@ import (
 
 	"github.com/grafana/grafana/pkg/api/routing"
 	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/resourcepermissions"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
+	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/libraryelements"
@@ -21,6 +24,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/team"
 	"github.com/grafana/grafana/pkg/services/team/teamimpl"
 	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
 )
 
 type TeamPermissionsService struct {
@@ -42,7 +46,7 @@ var (
 )
 
 func ProvideTeamPermissions(
-	features featuremgmt.FeatureToggles, router routing.RouteRegister, sql db.DB,
+	cfg *setting.Cfg, features featuremgmt.FeatureToggles, router routing.RouteRegister, sql db.DB,
 	ac accesscontrol.AccessControl, license licensing.Licensing, service accesscontrol.Service,
 	teamService team.Service, userService user.Service,
 ) (*TeamPermissionsService, error) {
@@ -87,7 +91,7 @@ func ProvideTeamPermissions(
 			case "Member":
 				return teamimpl.AddOrUpdateTeamMemberHook(session, user.ID, orgID, teamId, user.IsExternal, 0)
 			case "Admin":
-				return teamimpl.AddOrUpdateTeamMemberHook(session, user.ID, orgID, teamId, user.IsExternal, dashboards.PERMISSION_ADMIN)
+				return teamimpl.AddOrUpdateTeamMemberHook(session, user.ID, orgID, teamId, user.IsExternal, dashboardaccess.PERMISSION_ADMIN)
 			case "":
 				return teamimpl.RemoveTeamMemberHook(session, &team.RemoveTeamMemberCommand{
 					OrgID:  orgID,
@@ -100,7 +104,7 @@ func ProvideTeamPermissions(
 		},
 	}
 
-	srv, err := resourcepermissions.New(options, features, router, license, ac, service, sql, teamService, userService)
+	srv, err := resourcepermissions.New(cfg, options, features, router, license, ac, service, sql, teamService, userService)
 	if err != nil {
 		return nil, err
 	}
@@ -115,8 +119,29 @@ var DashboardViewActions = []string{dashboards.ActionDashboardsRead}
 var DashboardEditActions = append(DashboardViewActions, []string{dashboards.ActionDashboardsWrite, dashboards.ActionDashboardsDelete}...)
 var DashboardAdminActions = append(DashboardEditActions, []string{dashboards.ActionDashboardsPermissionsRead, dashboards.ActionDashboardsPermissionsWrite}...)
 
+func getDashboardViewActions(features featuremgmt.FeatureToggles) []string {
+	if features.IsEnabled(context.Background(), featuremgmt.FlagAnnotationPermissionUpdate) {
+		return append(DashboardViewActions, accesscontrol.ActionAnnotationsRead)
+	}
+	return DashboardViewActions
+}
+
+func getDashboardEditActions(features featuremgmt.FeatureToggles) []string {
+	if features.IsEnabled(context.Background(), featuremgmt.FlagAnnotationPermissionUpdate) {
+		return append(DashboardEditActions, []string{accesscontrol.ActionAnnotationsRead, accesscontrol.ActionAnnotationsWrite, accesscontrol.ActionAnnotationsDelete, accesscontrol.ActionAnnotationsCreate}...)
+	}
+	return DashboardEditActions
+}
+
+func getDashboardAdminActions(features featuremgmt.FeatureToggles) []string {
+	if features.IsEnabled(context.Background(), featuremgmt.FlagAnnotationPermissionUpdate) {
+		return append(DashboardAdminActions, []string{accesscontrol.ActionAnnotationsRead, accesscontrol.ActionAnnotationsWrite, accesscontrol.ActionAnnotationsDelete, accesscontrol.ActionAnnotationsCreate}...)
+	}
+	return DashboardAdminActions
+}
+
 func ProvideDashboardPermissions(
-	features featuremgmt.FeatureToggles, router routing.RouteRegister, sql db.DB, ac accesscontrol.AccessControl,
+	cfg *setting.Cfg, features featuremgmt.FeatureToggles, router routing.RouteRegister, sql db.DB, ac accesscontrol.AccessControl,
 	license licensing.Licensing, dashboardStore dashboards.Store, folderService folder.Service, service accesscontrol.Service,
 	teamService team.Service, userService user.Service,
 ) (*DashboardPermissionsService, error) {
@@ -149,6 +174,8 @@ func ProvideDashboardPermissions(
 			if err != nil {
 				return nil, err
 			}
+			metrics.MFolderIDsServiceCount.WithLabelValues(metrics.AccessControl).Inc()
+			// nolint:staticcheck
 			if dashboard.FolderID > 0 {
 				query := &dashboards.GetDashboardQuery{ID: dashboard.FolderID, OrgID: orgID}
 				queryResult, err := dashboardStore.GetDashboard(ctx, query)
@@ -172,16 +199,16 @@ func ProvideDashboardPermissions(
 			ServiceAccounts: true,
 		},
 		PermissionsToActions: map[string][]string{
-			"View":  DashboardViewActions,
-			"Edit":  DashboardEditActions,
-			"Admin": DashboardAdminActions,
+			"View":  getDashboardViewActions(features),
+			"Edit":  getDashboardEditActions(features),
+			"Admin": getDashboardAdminActions(features),
 		},
 		ReaderRoleName: "Dashboard permission reader",
 		WriterRoleName: "Dashboard permission writer",
 		RoleGroup:      "Dashboards",
 	}
 
-	srv, err := resourcepermissions.New(options, features, router, license, ac, service, sql, teamService, userService)
+	srv, err := resourcepermissions.New(cfg, options, features, router, license, ac, service, sql, teamService, userService)
 	if err != nil {
 		return nil, err
 	}
@@ -207,7 +234,7 @@ var FolderEditActions = append(FolderViewActions, []string{
 var FolderAdminActions = append(FolderEditActions, []string{dashboards.ActionFoldersPermissionsRead, dashboards.ActionFoldersPermissionsWrite}...)
 
 func ProvideFolderPermissions(
-	features featuremgmt.FeatureToggles, router routing.RouteRegister, sql db.DB, accesscontrol accesscontrol.AccessControl,
+	cfg *setting.Cfg, features featuremgmt.FeatureToggles, router routing.RouteRegister, sql db.DB, accesscontrol accesscontrol.AccessControl,
 	license licensing.Licensing, dashboardStore dashboards.Store, folderService folder.Service, service accesscontrol.Service,
 	teamService team.Service, userService user.Service,
 ) (*FolderPermissionsService, error) {
@@ -237,28 +264,39 @@ func ProvideFolderPermissions(
 			ServiceAccounts: true,
 		},
 		PermissionsToActions: map[string][]string{
-			"View":  append(DashboardViewActions, FolderViewActions...),
-			"Edit":  append(DashboardEditActions, FolderEditActions...),
-			"Admin": append(DashboardAdminActions, FolderAdminActions...),
+			"View":  append(getDashboardViewActions(features), FolderViewActions...),
+			"Edit":  append(getDashboardEditActions(features), FolderEditActions...),
+			"Admin": append(getDashboardAdminActions(features), FolderAdminActions...),
 		},
 		ReaderRoleName: "Folder permission reader",
 		WriterRoleName: "Folder permission writer",
 		RoleGroup:      "Folders",
 	}
-	srv, err := resourcepermissions.New(options, features, router, license, accesscontrol, service, sql, teamService, userService)
+	srv, err := resourcepermissions.New(cfg, options, features, router, license, accesscontrol, service, sql, teamService, userService)
 	if err != nil {
 		return nil, err
 	}
 	return &FolderPermissionsService{srv}, nil
 }
 
-func ProvideDatasourcePermissionsService() *DatasourcePermissionsService {
-	return &DatasourcePermissionsService{}
+// DatasourceQueryActions contains permissions to read information
+// about a data source and submit arbitrary queries to it.
+var DatasourceQueryActions = []string{
+	datasources.ActionRead,
+	datasources.ActionQuery,
+}
+
+func ProvideDatasourcePermissionsService(features featuremgmt.FeatureToggles, db db.DB) *DatasourcePermissionsService {
+	return &DatasourcePermissionsService{
+		store: resourcepermissions.NewStore(db, features),
+	}
 }
 
 var _ accesscontrol.DatasourcePermissionsService = new(DatasourcePermissionsService)
 
-type DatasourcePermissionsService struct{}
+type DatasourcePermissionsService struct {
+	store resourcepermissions.Store
+}
 
 func (e DatasourcePermissionsService) GetPermissions(ctx context.Context, user identity.Requester, resourceID string) ([]accesscontrol.ResourcePermission, error) {
 	return nil, nil
@@ -276,13 +314,39 @@ func (e DatasourcePermissionsService) SetBuiltInRolePermission(ctx context.Conte
 	return nil, nil
 }
 
+// SetPermissions sets managed permissions for a datasource in OSS. This ensures that Viewers and Editors maintain query access to a data source
+// if an OSS/unlicensed instance is upgraded to Enterprise/licensed.
+// https://github.com/grafana/identity-access-team/issues/672
 func (e DatasourcePermissionsService) SetPermissions(ctx context.Context, orgID int64, resourceID string, commands ...accesscontrol.SetResourcePermissionCommand) ([]accesscontrol.ResourcePermission, error) {
-	return nil, nil
+	var dbCommands []resourcepermissions.SetResourcePermissionsCommand
+	for _, cmd := range commands {
+		// Only set query permissions for built-in roles; do not set permissions for data sources with * as UID, as this would grant wildcard permissions
+		if cmd.Permission != "Query" || cmd.BuiltinRole == "" || resourceID == "*" {
+			continue
+		}
+		actions := DatasourceQueryActions
+
+		dbCommands = append(dbCommands, resourcepermissions.SetResourcePermissionsCommand{
+			BuiltinRole: cmd.BuiltinRole,
+			SetResourcePermissionCommand: resourcepermissions.SetResourcePermissionCommand{
+				Actions:           actions,
+				Resource:          datasources.ScopeRoot,
+				ResourceID:        resourceID,
+				ResourceAttribute: "uid",
+				Permission:        cmd.Permission,
+			},
+		})
+	}
+
+	return e.store.SetResourcePermissions(ctx, orgID, dbCommands, resourcepermissions.ResourceHooks{})
 }
 
 func (e DatasourcePermissionsService) DeleteResourcePermissions(ctx context.Context, orgID int64, resourceID string) error {
-	// TODO: implement
-	return nil
+	return e.store.DeleteResourcePermissions(ctx, orgID, &resourcepermissions.DeleteResourcePermissionsCmd{
+		Resource:          datasources.ScopeRoot,
+		ResourceAttribute: "uid",
+		ResourceID:        resourceID,
+	})
 }
 
 func (e DatasourcePermissionsService) MapActions(permission accesscontrol.ResourcePermission) string {
@@ -308,7 +372,7 @@ type ServiceAccountPermissionsService struct {
 }
 
 func ProvideServiceAccountPermissions(
-	features featuremgmt.FeatureToggles, router routing.RouteRegister, sql db.DB, ac accesscontrol.AccessControl,
+	cfg *setting.Cfg, features featuremgmt.FeatureToggles, router routing.RouteRegister, sql db.DB, ac accesscontrol.AccessControl,
 	license licensing.Licensing, serviceAccountRetrieverService *retriever.Service, service accesscontrol.Service,
 	teamService team.Service, userService user.Service,
 ) (*ServiceAccountPermissionsService, error) {
@@ -337,7 +401,7 @@ func ProvideServiceAccountPermissions(
 		RoleGroup:      "Service accounts",
 	}
 
-	srv, err := resourcepermissions.New(options, features, router, license, ac, service, sql, teamService, userService)
+	srv, err := resourcepermissions.New(cfg, options, features, router, license, ac, service, sql, teamService, userService)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/services/accesscontrol/pluginutils/utils.go b/pkg/services/accesscontrol/pluginutils/utils.go
index 118902177481d..ffbde39295f08 100644
--- a/pkg/services/accesscontrol/pluginutils/utils.go
+++ b/pkg/services/accesscontrol/pluginutils/utils.go
@@ -34,6 +34,9 @@ func ValidatePluginRole(pluginID string, role ac.RoleDTO) error {
 	if pluginID == "" {
 		return ac.ErrPluginIDRequired
 	}
+	if role.DisplayName == "" {
+		return &ac.ErrorRoleNameMissing{}
+	}
 	if !strings.HasPrefix(role.Name, ac.PluginRolePrefix+pluginID+":") {
 		return &ac.ErrorRolePrefixMissing{Role: role.Name, Prefixes: []string{ac.PluginRolePrefix + pluginID + ":"}}
 	}
@@ -60,6 +63,22 @@ func ToRegistrations(pluginID, pluginName string, regs []plugins.RoleRegistratio
 	return res
 }
 
+// PluginIDFromName extracts the plugin ID from the role name
+func PluginIDFromName(roleName string) string {
+	if !strings.HasPrefix(roleName, ac.PluginRolePrefix) {
+		return ""
+	}
+
+	pluginID := strings.Builder{}
+	for _, c := range roleName[len(ac.PluginRolePrefix):] {
+		if c == ':' {
+			break
+		}
+		pluginID.WriteRune(c)
+	}
+	return pluginID.String()
+}
+
 func roleName(pluginID, roleName string) string {
 	return fmt.Sprintf("%v%v:%v", ac.PluginRolePrefix, pluginID, strings.Replace(strings.ToLower(roleName), " ", "-", -1))
 }
diff --git a/pkg/services/accesscontrol/pluginutils/utils_test.go b/pkg/services/accesscontrol/pluginutils/utils_test.go
index c6432a355ab25..38ae6f4765c5b 100644
--- a/pkg/services/accesscontrol/pluginutils/utils_test.go
+++ b/pkg/services/accesscontrol/pluginutils/utils_test.go
@@ -85,34 +85,41 @@ func TestValidatePluginRole(t *testing.T) {
 		role     ac.RoleDTO
 		wantErr  error
 	}{
+		{
+			name:     "empty display name",
+			pluginID: "test-app",
+			role:     ac.RoleDTO{DisplayName: ""},
+			wantErr:  &ac.ErrorInvalidRole{},
+		},
 		{
 			name:     "empty",
 			pluginID: "",
-			role:     ac.RoleDTO{Name: "plugins::"},
+			role:     ac.RoleDTO{Name: "plugins::reader", DisplayName: "Reader"},
 			wantErr:  ac.ErrPluginIDRequired,
 		},
 		{
 			name:     "invalid name",
 			pluginID: "test-app",
-			role:     ac.RoleDTO{Name: "test-app:reader"},
+			role:     ac.RoleDTO{Name: "test-app:reader", DisplayName: "Reader"},
 			wantErr:  &ac.ErrorInvalidRole{},
 		},
 		{
 			name:     "invalid id in name",
 			pluginID: "test-app",
-			role:     ac.RoleDTO{Name: "plugins:test-app2:reader"},
+			role:     ac.RoleDTO{Name: "plugins:test-app2:reader", DisplayName: "Reader"},
 			wantErr:  &ac.ErrorInvalidRole{},
 		},
 		{
 			name:     "valid name",
 			pluginID: "test-app",
-			role:     ac.RoleDTO{Name: "plugins:test-app:reader"},
+			role:     ac.RoleDTO{Name: "plugins:test-app:reader", DisplayName: "Reader"},
 		},
 		{
 			name:     "invalid permission",
 			pluginID: "test-app",
 			role: ac.RoleDTO{
 				Name:        "plugins:test-app:reader",
+				DisplayName: "Reader",
 				Permissions: []ac.Permission{{Action: "invalidtest-app:read"}},
 			},
 			wantErr: &ac.ErrorInvalidRole{},
@@ -121,7 +128,8 @@ func TestValidatePluginRole(t *testing.T) {
 			name:     "valid permissions",
 			pluginID: "test-app",
 			role: ac.RoleDTO{
-				Name: "plugins:test-app:reader",
+				Name:        "plugins:test-app:reader",
+				DisplayName: "Reader",
 				Permissions: []ac.Permission{
 					{Action: "plugins.app:access", Scope: "plugins:id:test-app"},
 					{Action: "test-app:read"},
@@ -133,7 +141,8 @@ func TestValidatePluginRole(t *testing.T) {
 			name:     "invalid permission targets other plugin",
 			pluginID: "test-app",
 			role: ac.RoleDTO{
-				Name: "plugins:test-app:reader",
+				Name:        "plugins:test-app:reader",
+				DisplayName: "Reader",
 				Permissions: []ac.Permission{
 					{Action: "plugins.app:access", Scope: "plugins:id:other-app"},
 				},
diff --git a/pkg/services/accesscontrol/resourcepermissions/api.go b/pkg/services/accesscontrol/resourcepermissions/api.go
index 9ab6cf9f1c416..95db0372e8a44 100644
--- a/pkg/services/accesscontrol/resourcepermissions/api.go
+++ b/pkg/services/accesscontrol/resourcepermissions/api.go
@@ -11,23 +11,25 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/web"
 )
 
 type api struct {
+	cfg         *setting.Cfg
 	ac          accesscontrol.AccessControl
 	router      routing.RouteRegister
 	service     *Service
 	permissions []string
 }
 
-func newApi(ac accesscontrol.AccessControl, router routing.RouteRegister, manager *Service) *api {
+func newApi(cfg *setting.Cfg, ac accesscontrol.AccessControl, router routing.RouteRegister, manager *Service) *api {
 	permissions := make([]string, 0, len(manager.permissions))
 	// reverse the permissions order for display
 	for i := len(manager.permissions) - 1; i >= 0; i-- {
 		permissions = append(permissions, manager.permissions[i])
 	}
-	return &api{ac, router, manager, permissions}
+	return &api{cfg, ac, router, manager, permissions}
 }
 
 func (a *api) registerEndpoints() {
@@ -63,11 +65,33 @@ type Assignments struct {
 	BuiltInRoles    bool `json:"builtInRoles"`
 }
 
+// swagger:parameters getResourceDescription
+type GetResourceDescriptionParams struct {
+	// in:path
+	// required:true
+	Resource string `json:"resource"`
+}
+
+// swagger:response resourcePermissionsDescription
+type DescriptionResponse struct {
+	// in:body
+	// required:true
+	Body Description `json:"body"`
+}
+
 type Description struct {
 	Assignments Assignments `json:"assignments"`
 	Permissions []string    `json:"permissions"`
 }
 
+// swagger:route GET /access-control/{resource}/description access_control getResourceDescription
+//
+// Get a description of a resource's access control properties.
+//
+// Responses:
+// 200: resourcePermissionsDescription
+// 403: forbiddenError
+// 500: internalServerError
 func (a *api) getDescription(c *contextmodel.ReqContext) response.Response {
 	return response.JSON(http.StatusOK, &Description{
 		Permissions: a.permissions,
@@ -92,12 +116,35 @@ type resourcePermissionDTO struct {
 	Permission       string   `json:"permission"`
 }
 
+// swagger:parameters getResourcePermissions
+type GetResourcePermissionsParams struct {
+	// in:path
+	// required:true
+	Resource string `json:"resource"`
+
+	// in:path
+	// required:true
+	ResourceID string `json:"resourceID"`
+}
+
+// swagger:response getResourcePermissionsResponse
+type getResourcePermissionsResponse []resourcePermissionDTO
+
+// swagger:route GET /access-control/{resource}/{resourceID} access_control getResourcePermissions
+//
+// Get permissions for a resource.
+//
+// Responses:
+// 200: getResourcePermissionsResponse
+// 403: forbiddenError
+// 404: notFoundError
+// 500: internalServerError
 func (a *api) getPermissions(c *contextmodel.ReqContext) response.Response {
 	resourceID := web.Params(c.Req)[":resourceID"]
 
 	permissions, err := a.service.GetPermissions(c.Req.Context(), c.SignedInUser, resourceID)
 	if err != nil {
-		return response.Error(http.StatusInternalServerError, "failed to get permissions", err)
+		return response.ErrOrFallback(http.StatusInternalServerError, "failed to get permissions", err)
 	}
 
 	if a.service.options.Assignments.BuiltInRoles && !a.service.license.FeatureEnabled("accesscontrol.enforcement") {
@@ -108,12 +155,12 @@ func (a *api) getPermissions(c *contextmodel.ReqContext) response.Response {
 		})
 	}
 
-	dto := make([]resourcePermissionDTO, 0, len(permissions))
+	dto := make(getResourcePermissionsResponse, 0, len(permissions))
 	for _, p := range permissions {
 		if permission := a.service.MapActions(p); permission != "" {
 			teamAvatarUrl := ""
 			if p.TeamId != 0 {
-				teamAvatarUrl = dtos.GetGravatarUrlWithDefault(p.TeamEmail, p.Team)
+				teamAvatarUrl = dtos.GetGravatarUrlWithDefault(a.cfg, p.TeamEmail, p.Team)
 			}
 
 			dto = append(dto, resourcePermissionDTO{
@@ -121,7 +168,7 @@ func (a *api) getPermissions(c *contextmodel.ReqContext) response.Response {
 				RoleName:         p.RoleName,
 				UserID:           p.UserId,
 				UserLogin:        p.UserLogin,
-				UserAvatarUrl:    dtos.GetGravatarUrl(p.UserEmail),
+				UserAvatarUrl:    dtos.GetGravatarUrl(a.cfg, p.UserEmail),
 				Team:             p.Team,
 				TeamID:           p.TeamId,
 				TeamAvatarUrl:    teamAvatarUrl,
@@ -146,6 +193,39 @@ type setPermissionsCommand struct {
 	Permissions []accesscontrol.SetResourcePermissionCommand `json:"permissions"`
 }
 
+// swagger:parameters setResourcePermissionsForUser
+type SetResourcePermissionsForUserParams struct {
+	// in:path
+	// required:true
+	Resource string `json:"resource"`
+
+	// in:path
+	// required:true
+	ResourceID string `json:"resourceID"`
+
+	// in:path
+	// required:true
+	UserID int64 `json:"userID"`
+
+	// in:body
+	// required:true
+	Body setPermissionCommand
+}
+
+// swagger:route POST /access-control/{resource}/{resourceID}/users/{userID} access_control setResourcePermissionsForUser
+//
+// Set resource permissions for a user.
+//
+// Assigns permissions for a resource by a given type (`:resource`) and `:resourceID` to a user or a service account.
+// Allowed resources are `datasources`, `teams`, `dashboards`, `folders`, and `serviceaccounts`.
+// Refer to the `/access-control/{resource}/description` endpoint for allowed Permissions.
+//
+// Responses:
+// 200: okResponse
+// 400: badRequestError
+// 403: forbiddenError
+// 404: notFoundError
+// 500: internalServerError
 func (a *api) setUserPermission(c *contextmodel.ReqContext) response.Response {
 	userID, err := strconv.ParseInt(web.Params(c.Req)[":userID"], 10, 64)
 	if err != nil {
@@ -160,12 +240,45 @@ func (a *api) setUserPermission(c *contextmodel.ReqContext) response.Response {
 
 	_, err = a.service.SetUserPermission(c.Req.Context(), c.SignedInUser.GetOrgID(), accesscontrol.User{ID: userID}, resourceID, cmd.Permission)
 	if err != nil {
-		return response.Error(http.StatusBadRequest, "failed to set user permission", err)
+		return response.ErrOrFallback(http.StatusBadRequest, "failed to set user permission", err)
 	}
 
 	return permissionSetResponse(cmd)
 }
 
+// swagger:parameters setResourcePermissionsForTeam
+type SetResourcePermissionsForTeamParams struct {
+	// in:path
+	// required:true
+	Resource string `json:"resource"`
+
+	// in:path
+	// required:true
+	ResourceID string `json:"resourceID"`
+
+	// in:path
+	// required:true
+	TeamID int64 `json:"teamID"`
+
+	// in:body
+	// required:true
+	Body setPermissionCommand
+}
+
+// swagger:route POST /access-control/{resource}/{resourceID}/teams/{teamID} access_control setResourcePermissionsForTeam
+//
+// Set resource permissions for a team.
+//
+// Assigns permissions for a resource by a given type (`:resource`) and `:resourceID` to a team.
+// Allowed resources are `datasources`, `teams`, `dashboards`, `folders`, and `serviceaccounts`.
+// Refer to the `/access-control/{resource}/description` endpoint for allowed Permissions.
+//
+// Responses:
+// 200: okResponse
+// 400: badRequestError
+// 403: forbiddenError
+// 404: notFoundError
+// 500: internalServerError
 func (a *api) setTeamPermission(c *contextmodel.ReqContext) response.Response {
 	teamID, err := strconv.ParseInt(web.Params(c.Req)[":teamID"], 10, 64)
 	if err != nil {
@@ -180,12 +293,45 @@ func (a *api) setTeamPermission(c *contextmodel.ReqContext) response.Response {
 
 	_, err = a.service.SetTeamPermission(c.Req.Context(), c.SignedInUser.GetOrgID(), teamID, resourceID, cmd.Permission)
 	if err != nil {
-		return response.Error(http.StatusBadRequest, "failed to set team permission", err)
+		return response.ErrOrFallback(http.StatusBadRequest, "failed to set team permission", err)
 	}
 
 	return permissionSetResponse(cmd)
 }
 
+// swagger:parameters setResourcePermissionsForBuiltInRole
+type SetResourcePermissionsForBuiltInRoleParams struct {
+	// in:path
+	// required:true
+	Resource string `json:"resource"`
+
+	// in:path
+	// required:true
+	ResourceID string `json:"resourceID"`
+
+	// in:path
+	// required:true
+	BuiltInRole string `json:"builtInRole"`
+
+	// in:body
+	// required:true
+	Body setPermissionCommand
+}
+
+// swagger:route POST /access-control/{resource}/{resourceID}/builtInRoles/{builtInRole} access_control setResourcePermissionsForBuiltInRole
+//
+// Set resource permissions for a built-in role.
+//
+// Assigns permissions for a resource by a given type (`:resource`) and `:resourceID` to a built-in role.
+// Allowed resources are `datasources`, `teams`, `dashboards`, `folders`, and `serviceaccounts`.
+// Refer to the `/access-control/{resource}/description` endpoint for allowed Permissions.
+//
+// Responses:
+// 200: okResponse
+// 400: badRequestError
+// 403: forbiddenError
+// 404: notFoundError
+// 500: internalServerError
 func (a *api) setBuiltinRolePermission(c *contextmodel.ReqContext) response.Response {
 	builtInRole := web.Params(c.Req)[":builtInRole"]
 	resourceID := web.Params(c.Req)[":resourceID"]
@@ -197,12 +343,41 @@ func (a *api) setBuiltinRolePermission(c *contextmodel.ReqContext) response.Resp
 
 	_, err := a.service.SetBuiltInRolePermission(c.Req.Context(), c.SignedInUser.GetOrgID(), builtInRole, resourceID, cmd.Permission)
 	if err != nil {
-		return response.Error(http.StatusBadRequest, "failed to set role permission", err)
+		return response.ErrOrFallback(http.StatusBadRequest, "failed to set role permission", err)
 	}
 
 	return permissionSetResponse(cmd)
 }
 
+// swagger:parameters setResourcePermissions
+type SetResourcePermissionsParams struct {
+	// in:path
+	// required:true
+	Resource string `json:"resource"`
+
+	// in:path
+	// required:true
+	ResourceID string `json:"resourceID"`
+
+	// in:body
+	// required:true
+	Body setPermissionsCommand
+}
+
+// swagger:route POST /access-control/{resource}/{resourceID} access_control setResourcePermissions
+//
+// Set resource permissions.
+//
+// Assigns permissions for a resource by a given type (`:resource`) and `:resourceID` to one or many
+// assignment types. Allowed resources are `datasources`, `teams`, `dashboards`, `folders`, and `serviceaccounts`.
+// Refer to the `/access-control/{resource}/description` endpoint for allowed Permissions.
+//
+// Responses:
+// 200: okResponse
+// 400: badRequestError
+// 403: forbiddenError
+// 404: notFoundError
+// 500: internalServerError
 func (a *api) setPermissions(c *contextmodel.ReqContext) response.Response {
 	resourceID := web.Params(c.Req)[":resourceID"]
 
@@ -213,7 +388,7 @@ func (a *api) setPermissions(c *contextmodel.ReqContext) response.Response {
 
 	_, err := a.service.SetPermissions(c.Req.Context(), c.SignedInUser.GetOrgID(), resourceID, cmd.Permissions...)
 	if err != nil {
-		return response.Error(http.StatusBadRequest, "failed to set permissions", err)
+		return response.ErrOrFallback(http.StatusBadRequest, "failed to set permission", err)
 	}
 
 	return response.Success("Permissions updated")
diff --git a/pkg/services/accesscontrol/resourcepermissions/api_test.go b/pkg/services/accesscontrol/resourcepermissions/api_test.go
index 797e51de7379b..5e1b9032f49d6 100644
--- a/pkg/services/accesscontrol/resourcepermissions/api_test.go
+++ b/pkg/services/accesscontrol/resourcepermissions/api_test.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"net/http"
 	"net/http/httptest"
-	"path"
 	"strconv"
 	"strings"
 	"testing"
@@ -25,7 +24,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/team/teamimpl"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/user/userimpl"
-	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/web"
 )
 
@@ -432,7 +430,7 @@ func TestApi_setUserPermission(t *testing.T) {
 
 func setupTestServer(t *testing.T, user *user.SignedInUser, service *Service) *web.Mux {
 	server := web.New()
-	server.UseMiddleware(web.Renderer(path.Join(setting.StaticRootPath, "views"), "[[", "]]"))
+	server.UseMiddleware(web.Renderer("views", "[[", "]]"))
 	server.Use(contextProvider(&testContext{user}))
 	service.api.router.Register(server)
 	return server
@@ -510,7 +508,8 @@ func checkSeededPermissions(t *testing.T, permissions []resourcePermissionDTO) {
 func seedPermissions(t *testing.T, resourceID string, sql *sqlstore.SQLStore, service *Service) {
 	t.Helper()
 	// seed team 1 with "Edit" permission on dashboard 1
-	teamSvc := teamimpl.ProvideService(sql, sql.Cfg)
+	teamSvc, err := teamimpl.ProvideService(sql, sql.Cfg)
+	require.NoError(t, err)
 	team, err := teamSvc.CreateTeam("test", "test@test.com", 1)
 	require.NoError(t, err)
 	_, err = service.SetTeamPermission(context.Background(), team.OrgID, team.ID, resourceID, "Edit")
diff --git a/pkg/services/accesscontrol/resourcepermissions/service.go b/pkg/services/accesscontrol/resourcepermissions/service.go
index 235e2240dd02d..cf2e638275f26 100644
--- a/pkg/services/accesscontrol/resourcepermissions/service.go
+++ b/pkg/services/accesscontrol/resourcepermissions/service.go
@@ -14,6 +14,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/team"
 	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
 )
 
 type Store interface {
@@ -52,7 +53,7 @@ type Store interface {
 	DeleteResourcePermissions(ctx context.Context, orgID int64, cmd *DeleteResourcePermissionsCmd) error
 }
 
-func New(
+func New(cfg *setting.Cfg,
 	options Options, features featuremgmt.FeatureToggles, router routing.RouteRegister, license licensing.Licensing,
 	ac accesscontrol.AccessControl, service accesscontrol.Service, sqlStore db.DB,
 	teamService team.Service, userService user.Service,
@@ -89,7 +90,7 @@ func New(
 		userService: userService,
 	}
 
-	s.api = newApi(ac, router, s)
+	s.api = newApi(cfg, ac, router, s)
 
 	if err := s.declareFixedRoles(); err != nil {
 		return nil, err
diff --git a/pkg/services/accesscontrol/resourcepermissions/service_test.go b/pkg/services/accesscontrol/resourcepermissions/service_test.go
index dbf040b4cb65b..95287de0404f9 100644
--- a/pkg/services/accesscontrol/resourcepermissions/service_test.go
+++ b/pkg/services/accesscontrol/resourcepermissions/service_test.go
@@ -237,15 +237,16 @@ func setupTestEnvironment(t *testing.T, ops Options) (*Service, *sqlstore.SQLSto
 
 	sql := db.InitTestDB(t)
 	cfg := setting.NewCfg()
-	teamSvc := teamimpl.ProvideService(sql, cfg)
-	userSvc, err := userimpl.ProvideService(sql, nil, cfg, teamimpl.ProvideService(sql, cfg), nil, quotatest.New(false, nil), supportbundlestest.NewFakeBundleService())
+	teamSvc, err := teamimpl.ProvideService(sql, cfg)
+	require.NoError(t, err)
+	userSvc, err := userimpl.ProvideService(sql, nil, cfg, teamSvc, nil, quotatest.New(false, nil), supportbundlestest.NewFakeBundleService())
 	require.NoError(t, err)
 	license := licensingtest.NewFakeLicensing()
 	license.On("FeatureEnabled", "accesscontrol.enforcement").Return(true).Maybe()
 	ac := acimpl.ProvideAccessControl(cfg)
 	acService := &actest.FakeService{}
 	service, err := New(
-		ops, featuremgmt.WithFeatures(), routing.NewRouteRegister(), license,
+		cfg, ops, featuremgmt.WithFeatures(), routing.NewRouteRegister(), license,
 		ac, acService, sql, teamSvc, userSvc,
 	)
 	require.NoError(t, err)
diff --git a/pkg/services/accesscontrol/resourcepermissions/store.go b/pkg/services/accesscontrol/resourcepermissions/store.go
index 00fb263564913..33359fdfa4b78 100644
--- a/pkg/services/accesscontrol/resourcepermissions/store.go
+++ b/pkg/services/accesscontrol/resourcepermissions/store.go
@@ -10,6 +10,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/services/serviceaccounts"
 	"github.com/grafana/grafana/pkg/services/team"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/util"
@@ -391,8 +392,19 @@ func (s *store) getResourcePermissions(sess *db.Session, orgID int64, query GetR
 		if err != nil {
 			return nil, err
 		}
-		userQuery += " AND " + userFilter.Where
+
+		filter := "((" + userFilter.Where + " AND NOT u.is_service_account)"
+
+		saFilter, err := accesscontrol.Filter(query.User, "u.id", "serviceaccounts:id:", serviceaccounts.ActionRead)
+		if err != nil {
+			return nil, err
+		}
+
+		filter += " OR (" + saFilter.Where + " AND u.is_service_account))"
+
+		userQuery += " AND " + filter
 		args = append(args, userFilter.Args...)
+		args = append(args, saFilter.Args...)
 	}
 
 	teamFilter, err := accesscontrol.Filter(query.User, "t.id", "teams:id:", accesscontrol.ActionTeamsRead)
@@ -655,9 +667,7 @@ func (s *store) createPermissions(sess *db.Session, roleID int64, resource, reso
 		p.RoleID = roleID
 		p.Created = time.Now()
 		p.Updated = time.Now()
-		if s.features.IsEnabled(featuremgmt.FlagSplitScopes) {
-			p.Kind, p.Attribute, p.Identifier = p.SplitScope()
-		}
+		p.Kind, p.Attribute, p.Identifier = p.SplitScope()
 		permissions = append(permissions, p)
 	}
 
diff --git a/pkg/services/accesscontrol/resourcepermissions/store_bench_test.go b/pkg/services/accesscontrol/resourcepermissions/store_bench_test.go
index a1a7e4c11d42d..f85a457573f66 100644
--- a/pkg/services/accesscontrol/resourcepermissions/store_bench_test.go
+++ b/pkg/services/accesscontrol/resourcepermissions/store_bench_test.go
@@ -138,7 +138,8 @@ func GenerateDatasourcePermissions(b *testing.B, db *sqlstore.SQLStore, ac *stor
 }
 
 func generateTeamsAndUsers(b *testing.B, db *sqlstore.SQLStore, users int) ([]int64, []int64) {
-	teamSvc := teamimpl.ProvideService(db, db.Cfg)
+	teamSvc, err := teamimpl.ProvideService(db, db.Cfg)
+	require.NoError(b, err)
 	numberOfTeams := int(math.Ceil(float64(users) / UsersPerTeam))
 	globalUserId := 0
 	qs := quotatest.New(false, nil)
@@ -169,7 +170,7 @@ func generateTeamsAndUsers(b *testing.B, db *sqlstore.SQLStore, users int) ([]in
 			globalUserId++
 			userIds = append(userIds, userId)
 
-			err = teamSvc.AddTeamMember(userId, 1, teamId, false, 1)
+			err = teamSvc.AddTeamMember(context.Background(), userId, 1, teamId, false, 1)
 			require.NoError(b, err)
 		}
 	}
diff --git a/pkg/services/accesscontrol/resourcepermissions/store_test.go b/pkg/services/accesscontrol/resourcepermissions/store_test.go
index 50ed2015c6d03..1af01485939ca 100644
--- a/pkg/services/accesscontrol/resourcepermissions/store_test.go
+++ b/pkg/services/accesscontrol/resourcepermissions/store_test.go
@@ -16,10 +16,12 @@ import (
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/org/orgimpl"
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
+	"github.com/grafana/grafana/pkg/services/serviceaccounts"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/user/userimpl"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
 type setUserResourcePermissionTest struct {
@@ -33,6 +35,10 @@ type setUserResourcePermissionTest struct {
 	seeds             []SetResourcePermissionCommand
 }
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationStore_SetUserResourcePermission(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
@@ -355,11 +361,12 @@ func TestIntegrationStore_SetResourcePermissions(t *testing.T) {
 }
 
 type getResourcePermissionsTest struct {
-	desc        string
-	user        *user.SignedInUser
-	numUsers    int
-	query       GetResourcePermissionsQuery
-	expectedLen int
+	desc               string
+	user               *user.SignedInUser
+	numUsers           int
+	numServiceAccounts int
+	query              GetResourcePermissionsQuery
+	expectedLen        int
 }
 
 func TestIntegrationStore_GetResourcePermissions(t *testing.T) {
@@ -420,6 +427,28 @@ func TestIntegrationStore_GetResourcePermissions(t *testing.T) {
 			},
 			expectedLen: 2,
 		},
+		{
+			desc: "should return users and service accounts caller can read",
+			user: &user.SignedInUser{
+				OrgID: 1,
+				Permissions: map[int64]map[string][]string{
+					1: {
+						accesscontrol.ActionOrgUsersRead: {"users:id:1", "users:id:2", "users:id:3"},
+						serviceaccounts.ActionRead:       {"serviceaccounts:id:5"},
+					},
+				}},
+			numUsers:           3,
+			numServiceAccounts: 3,
+			query: GetResourcePermissionsQuery{
+				Actions:              []string{"datasources:query"},
+				Resource:             "datasources",
+				ResourceID:           "1",
+				ResourceAttribute:    "uid",
+				OnlyManaged:          true,
+				EnforceAccessControl: true,
+			},
+			expectedLen: 4,
+		},
 		{
 			desc: "should return permissions for all users when access control is not enforces",
 			user: &user.SignedInUser{
@@ -479,7 +508,7 @@ func TestIntegrationStore_GetResourcePermissions(t *testing.T) {
 			})
 			require.NoError(t, err)
 
-			seedResourcePermissions(t, store, sql, orgService, tt.query.Actions, tt.query.Resource, tt.query.ResourceID, tt.query.ResourceAttribute, tt.numUsers)
+			seedResourcePermissions(t, store, sql, orgService, tt.query.Actions, tt.query.Resource, tt.query.ResourceID, tt.query.ResourceAttribute, tt.numUsers, tt.numServiceAccounts)
 
 			tt.query.User = tt.user
 			permissions, err := store.GetResourcePermissions(context.Background(), tt.user.OrgID, tt.query)
@@ -489,27 +518,28 @@ func TestIntegrationStore_GetResourcePermissions(t *testing.T) {
 	}
 }
 
-func seedResourcePermissions(t *testing.T, store *store, sql *sqlstore.SQLStore, orgService org.Service, actions []string, resource, resourceID, resourceAttribute string, numUsers int) {
+func seedResourcePermissions(
+	t *testing.T, store *store, sql *sqlstore.SQLStore, orgService org.Service,
+	actions []string, resource, resourceID, resourceAttribute string, numUsers, numServiceAccounts int,
+) {
 	t.Helper()
-	var orgModel *org.Org
-	usrSvc, err := userimpl.ProvideService(sql, orgService, sql.Cfg, nil, nil, quotatest.New(false, nil), supportbundlestest.NewFakeBundleService())
+
+	orgID, err := orgService.GetOrCreate(context.Background(), "test")
 	require.NoError(t, err)
 
-	for i := 0; i < numUsers; i++ {
-		if orgModel == nil {
-			cmd := &org.CreateOrgCommand{Name: "test", UserID: int64(i)}
-			addedOrg, err := orgService.CreateWithMember(context.Background(), cmd)
-			require.NoError(t, err)
-			orgModel = addedOrg
-		}
+	usrSvc, err := userimpl.ProvideService(sql, orgService, sql.Cfg, nil, nil, quotatest.New(false, nil), supportbundlestest.NewFakeBundleService())
+	require.NoError(t, err)
 
+	create := func(login string, isServiceAccount bool) {
 		u, err := usrSvc.Create(context.Background(), &user.CreateUserCommand{
-			Login: fmt.Sprintf("user:%s%d", resourceID, i),
-			OrgID: orgModel.ID,
+			Login:            login,
+			IsServiceAccount: isServiceAccount,
+			OrgID:            orgID,
 		})
+
 		require.NoError(t, err)
 
-		_, err = store.SetUserResourcePermission(context.Background(), 1, accesscontrol.User{ID: u.ID}, SetResourcePermissionCommand{
+		_, err = store.SetUserResourcePermission(context.Background(), orgID, accesscontrol.User{ID: u.ID}, SetResourcePermissionCommand{
 			Actions:           actions,
 			Resource:          resource,
 			ResourceID:        resourceID,
@@ -517,6 +547,14 @@ func seedResourcePermissions(t *testing.T, store *store, sql *sqlstore.SQLStore,
 		}, nil)
 		require.NoError(t, err)
 	}
+
+	for i := 0; i < numUsers; i++ {
+		create(fmt.Sprintf("user:%s:%d", resourceID, i), false)
+	}
+
+	for i := 0; i < numServiceAccounts; i++ {
+		create(fmt.Sprintf("sa:%s:%d", resourceID, i), true)
+	}
 }
 
 func setupTestEnv(t testing.TB) (*store, *sqlstore.SQLStore) {
diff --git a/pkg/services/accesscontrol/roles.go b/pkg/services/accesscontrol/roles.go
index e4fc58ce2430d..5c82eefb8f400 100644
--- a/pkg/services/accesscontrol/roles.go
+++ b/pkg/services/accesscontrol/roles.go
@@ -28,6 +28,11 @@ const (
 
 	BasicRoleNoneUID  = "basic_none"
 	BasicRoleNoneName = "basic:none"
+
+	FixedCloudRolePrefix = "fixed:cloud:"
+	FixedCloudViewerRole = "fixed:cloud:viewer"
+	FixedCloudEditorRole = "fixed:cloud:editor"
+	FixedCloudAdminRole  = "fixed:cloud:admin"
 )
 
 // Roles definition
@@ -208,6 +213,71 @@ var (
 				Action: ActionSettingsWrite,
 				Scope:  ScopeSettingsSAML,
 			},
+			{
+				Action: ActionSettingsRead,
+				Scope:  ScopeSettingsOAuth("azuread"),
+			},
+			{
+				Action: ActionSettingsWrite,
+				Scope:  ScopeSettingsOAuth("azuread"),
+			},
+			{
+				Action: ActionSettingsRead,
+				Scope:  ScopeSettingsOAuth("okta"),
+			},
+			{
+				Action: ActionSettingsWrite,
+				Scope:  ScopeSettingsOAuth("okta"),
+			},
+			{
+				Action: ActionSettingsRead,
+				Scope:  ScopeSettingsOAuth("github"),
+			},
+			{
+				Action: ActionSettingsWrite,
+				Scope:  ScopeSettingsOAuth("github"),
+			},
+			{
+				Action: ActionSettingsRead,
+				Scope:  ScopeSettingsOAuth("gitlab"),
+			},
+			{
+				Action: ActionSettingsWrite,
+				Scope:  ScopeSettingsOAuth("gitlab"),
+			},
+			{
+				Action: ActionSettingsRead,
+				Scope:  ScopeSettingsOAuth("google"),
+			},
+			{
+				Action: ActionSettingsWrite,
+				Scope:  ScopeSettingsOAuth("google"),
+			},
+			{
+				Action: ActionSettingsRead,
+				Scope:  ScopeSettingsOAuth("generic_oauth"),
+			},
+			{
+				Action: ActionSettingsWrite,
+				Scope:  ScopeSettingsOAuth("generic_oauth"),
+			},
+		},
+	}
+
+	generalAuthConfigWriterRole = RoleDTO{
+		Name:        "fixed:general.auth.config:writer",
+		DisplayName: "General authentication config writer",
+		Description: "Read and update the Grafana instance's general authentication configuration.",
+		Group:       "Settings",
+		Permissions: []Permission{
+			{
+				Action: ActionSettingsRead,
+				Scope:  "settings:auth:oauth_allow_insecure_email_lookup",
+			},
+			{
+				Action: ActionSettingsWrite,
+				Scope:  "settings:auth:oauth_allow_insecure_email_lookup",
+			},
 		},
 	}
 )
@@ -246,6 +316,10 @@ func DeclareFixedRoles(service Service, cfg *setting.Cfg) error {
 		Role:   usersWriterRole,
 		Grants: []string{RoleGrafanaAdmin},
 	}
+	generalAuthConfigWriter := RoleRegistration{
+		Role:   generalAuthConfigWriterRole,
+		Grants: []string{RoleGrafanaAdmin},
+	}
 
 	// TODO: Move to own service when implemented
 	authenticationConfigWriter := RoleRegistration{
@@ -258,7 +332,7 @@ func DeclareFixedRoles(service Service, cfg *setting.Cfg) error {
 	}
 
 	return service.DeclareFixedRoles(ldapReader, ldapWriter, orgUsersReader, orgUsersWriter,
-		settingsReader, statsReader, usersReader, usersWriter, authenticationConfigWriter)
+		settingsReader, statsReader, usersReader, usersWriter, authenticationConfigWriter, generalAuthConfigWriter)
 }
 
 func ConcatPermissions(permissions ...[]Permission) []Permission {
@@ -328,6 +402,14 @@ func (m *RegistrationList) Range(f func(registration RoleRegistration) bool) {
 	}
 }
 
+func (m *RegistrationList) Slice() []RoleRegistration {
+	m.mx.RLock()
+	defer m.mx.RUnlock()
+	out := make([]RoleRegistration, len(m.registrations))
+	copy(out, m.registrations)
+	return out
+}
+
 func BuildBasicRoleDefinitions() map[string]*RoleDTO {
 	return map[string]*RoleDTO{
 		string(org.RoleAdmin): {
diff --git a/pkg/services/accesscontrol/ssoutils/utils.go b/pkg/services/accesscontrol/ssoutils/utils.go
new file mode 100644
index 0000000000000..857a2532af943
--- /dev/null
+++ b/pkg/services/accesscontrol/ssoutils/utils.go
@@ -0,0 +1,24 @@
+package ssoutils
+
+import (
+	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+func EvalAuthenticationSettings(cfg *setting.Cfg) ac.Evaluator {
+	return ac.EvalAny(
+		ac.EvalAll(
+			ac.EvalPermission(ac.ActionSettingsWrite, ac.ScopeSettingsSAML),
+			ac.EvalPermission(ac.ActionSettingsRead, ac.ScopeSettingsSAML),
+		),
+		ac.EvalPermission(ac.ActionLDAPStatusRead))
+}
+
+func OauthSettingsEvaluator(cfg *setting.Cfg) ac.Evaluator {
+	result := make([]ac.Evaluator, 0, len(cfg.SSOSettingsConfigurableProviders))
+	for provider := range cfg.SSOSettingsConfigurableProviders {
+		result = append(result, ac.EvalPermission(ac.ActionSettingsRead, ac.ScopeSettingsOAuth(provider)))
+		result = append(result, ac.EvalPermission(ac.ActionSettingsWrite, ac.ScopeSettingsOAuth(provider)))
+	}
+	return ac.EvalAny(result...)
+}
diff --git a/pkg/services/alerting/alerting_usage.go b/pkg/services/alerting/alerting_usage.go
deleted file mode 100644
index 71f0c2fb1eb4c..0000000000000
--- a/pkg/services/alerting/alerting_usage.go
+++ /dev/null
@@ -1,114 +0,0 @@
-package alerting
-
-import (
-	"context"
-	"encoding/json"
-
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/datasources"
-)
-
-// DatasourceAlertUsage is a hash where the key represents the
-// Datasource type and the value represents how many alerts
-// that use the datasources.
-type DatasourceAlertUsage map[string]int
-
-// UsageStats contains stats about alert rules configured in
-// Grafana.
-type UsageStats struct {
-	DatasourceUsage DatasourceAlertUsage
-}
-
-// UsageStatsQuerier returns usage stats about alert rules
-// configured in Grafana.
-type UsageStatsQuerier interface {
-	QueryUsageStats(context.Context) (*UsageStats, error)
-}
-
-// QueryUsageStats returns usage stats about alert rules
-// configured in Grafana.
-func (e *AlertEngine) QueryUsageStats(ctx context.Context) (*UsageStats, error) {
-	cmd := &models.GetAllAlertsQuery{}
-	res, err := e.AlertStore.GetAllAlertQueryHandler(ctx, cmd)
-	if err != nil {
-		return nil, err
-	}
-
-	dsUsage, err := e.mapRulesToUsageStats(ctx, res)
-	if err != nil {
-		return nil, err
-	}
-
-	return &UsageStats{
-		DatasourceUsage: dsUsage,
-	}, nil
-}
-
-func (e *AlertEngine) mapRulesToUsageStats(ctx context.Context, rules []*models.Alert) (DatasourceAlertUsage, error) {
-	// map of datasourceId type and frequency
-	typeCount := map[int64]int{}
-	for _, a := range rules {
-		dss, err := e.parseAlertRuleModel(a.Settings)
-		if err != nil {
-			e.log.Debug("Could not parse settings for alert rule", "id", a.ID)
-			continue
-		}
-
-		for _, d := range dss {
-			// aggregated datasource usage based on datasource id
-			typeCount[d]++
-		}
-	}
-
-	// map of datsource types and frequency
-	result := map[string]int{}
-	for k, v := range typeCount {
-		query := &datasources.GetDataSourceQuery{ID: k}
-		dataSource, err := e.datasourceService.GetDataSource(ctx, query)
-		if err != nil {
-			return map[string]int{}, nil
-		}
-
-		// aggregate datasource usages based on datasource type
-		result[dataSource.Type] += v
-	}
-
-	return result, nil
-}
-
-func (e *AlertEngine) parseAlertRuleModel(settings json.Marshaler) ([]int64, error) {
-	datasourceIDs := []int64{}
-	model := alertJSONModel{}
-
-	if settings == nil {
-		return datasourceIDs, nil
-	}
-
-	bytes, err := settings.MarshalJSON()
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal(bytes, &model)
-	if err != nil {
-		return datasourceIDs, err
-	}
-
-	for _, condition := range model.Conditions {
-		datasourceIDs = append(datasourceIDs, condition.Query.DatasourceID)
-	}
-
-	return datasourceIDs, nil
-}
-
-type alertCondition struct {
-	Query *conditionQuery `json:"query"`
-}
-
-type conditionQuery struct {
-	DatasourceID int64 `json:"datasourceId"`
-}
-
-type alertJSONModel struct {
-	Conditions []*alertCondition `json:"conditions"`
-}
diff --git a/pkg/services/alerting/alerting_usage_test.go b/pkg/services/alerting/alerting_usage_test.go
deleted file mode 100644
index 04b821ac961f1..0000000000000
--- a/pkg/services/alerting/alerting_usage_test.go
+++ /dev/null
@@ -1,122 +0,0 @@
-package alerting
-
-import (
-	"context"
-	"encoding/json"
-	"os"
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/datasources"
-	fd "github.com/grafana/grafana/pkg/services/datasources/fakes"
-)
-
-func TestAlertingUsageStats(t *testing.T) {
-	store := &AlertStoreMock{}
-	dsMock := &fd.FakeDataSourceService{
-		DataSources: []*datasources.DataSource{
-			{ID: 1, Type: datasources.DS_INFLUXDB},
-			{ID: 2, Type: datasources.DS_GRAPHITE},
-			{ID: 3, Type: datasources.DS_PROMETHEUS},
-			{ID: 4, Type: datasources.DS_PROMETHEUS},
-		},
-	}
-	ae := &AlertEngine{
-		AlertStore:        store,
-		datasourceService: dsMock,
-	}
-
-	store.getAllAlerts = func(ctx context.Context, query *models.GetAllAlertsQuery) (res []*models.Alert, err error) {
-		var createFake = func(file string) *simplejson.Json {
-			// Ignore gosec warning G304 since it's a test
-			// nolint:gosec
-			content, err := os.ReadFile(file)
-			require.NoError(t, err, "expected to be able to read file")
-
-			j, err := simplejson.NewJson(content)
-			require.NoError(t, err)
-			return j
-		}
-
-		return []*models.Alert{
-			{ID: 1, Settings: createFake("testdata/settings/one_condition.json")},
-			{ID: 2, Settings: createFake("testdata/settings/two_conditions.json")},
-			{ID: 2, Settings: createFake("testdata/settings/three_conditions.json")},
-			{ID: 3, Settings: createFake("testdata/settings/empty.json")},
-		}, nil
-	}
-
-	result, err := ae.QueryUsageStats(context.Background())
-	require.NoError(t, err, "getAlertingUsage should not return error")
-
-	expected := map[string]int{
-		"prometheus": 4,
-		"graphite":   2,
-	}
-
-	for k := range expected {
-		if expected[k] != result.DatasourceUsage[k] {
-			t.Errorf("result mismatch for %s. got %v expected %v", k, result.DatasourceUsage[k], expected[k])
-		}
-	}
-}
-
-func TestParsingAlertRuleSettings(t *testing.T) {
-	tcs := []struct {
-		name      string
-		file      string
-		expected  []int64
-		shouldErr require.ErrorAssertionFunc
-	}{
-		{
-			name:      "can parse single condition",
-			file:      "testdata/settings/one_condition.json",
-			expected:  []int64{3},
-			shouldErr: require.NoError,
-		},
-		{
-			name:      "can parse multiple conditions",
-			file:      "testdata/settings/two_conditions.json",
-			expected:  []int64{3, 2},
-			shouldErr: require.NoError,
-		},
-		{
-			name:      "can parse empty json",
-			file:      "testdata/settings/empty.json",
-			expected:  []int64{},
-			shouldErr: require.NoError,
-		},
-		{
-			name:      "can handle nil content",
-			expected:  []int64{},
-			shouldErr: require.NoError,
-		},
-	}
-
-	ae := &AlertEngine{}
-
-	for _, tc := range tcs {
-		t.Run(tc.name, func(t *testing.T) {
-			var settings json.Marshaler
-			if tc.file != "" {
-				content, err := os.ReadFile(tc.file)
-				require.NoError(t, err, "expected to be able to read file")
-
-				settings, err = simplejson.NewJson(content)
-				require.NoError(t, err)
-			}
-
-			result, err := ae.parseAlertRuleModel(settings)
-
-			tc.shouldErr(t, err)
-			diff := cmp.Diff(tc.expected, result)
-			if diff != "" {
-				t.Errorf("result mismatch (-want +got) %s\n", diff)
-			}
-		})
-	}
-}
diff --git a/pkg/services/alerting/conditions/evaluator.go b/pkg/services/alerting/conditions/evaluator.go
deleted file mode 100644
index 76afe8919fbe3..0000000000000
--- a/pkg/services/alerting/conditions/evaluator.go
+++ /dev/null
@@ -1,157 +0,0 @@
-package conditions
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/grafana/grafana/pkg/components/null"
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/alerting"
-)
-
-var (
-	defaultTypes = []string{"gt", "lt"}
-	rangedTypes  = []string{"within_range", "outside_range"}
-)
-
-// AlertEvaluator evaluates the reduced value of a timeseries.
-// Returning true if a timeseries is violating the condition
-// ex: ThresholdEvaluator, NoValueEvaluator, RangeEvaluator
-type AlertEvaluator interface {
-	Eval(reducedValue null.Float) bool
-}
-
-type noValueEvaluator struct{}
-
-func (e *noValueEvaluator) Eval(reducedValue null.Float) bool {
-	return !reducedValue.Valid
-}
-
-type thresholdEvaluator struct {
-	Type      string
-	Threshold float64
-}
-
-func newThresholdEvaluator(typ string, model *simplejson.Json) (*thresholdEvaluator, error) {
-	params := model.Get("params").MustArray()
-	if len(params) == 0 || params[0] == nil {
-		return nil, fmt.Errorf("evaluator '%v' is missing the threshold parameter", HumanThresholdType(typ))
-	}
-
-	firstParam, ok := params[0].(json.Number)
-	if !ok {
-		return nil, fmt.Errorf("evaluator has invalid parameter")
-	}
-
-	defaultEval := &thresholdEvaluator{Type: typ}
-	defaultEval.Threshold, _ = firstParam.Float64()
-	return defaultEval, nil
-}
-
-func (e *thresholdEvaluator) Eval(reducedValue null.Float) bool {
-	if !reducedValue.Valid {
-		return false
-	}
-
-	switch e.Type {
-	case "gt":
-		return reducedValue.Float64 > e.Threshold
-	case "lt":
-		return reducedValue.Float64 < e.Threshold
-	}
-
-	return false
-}
-
-type rangedEvaluator struct {
-	Type  string
-	Lower float64
-	Upper float64
-}
-
-func newRangedEvaluator(typ string, model *simplejson.Json) (*rangedEvaluator, error) {
-	params := model.Get("params").MustArray()
-	if len(params) == 0 {
-		return nil, alerting.ValidationError{Reason: "Evaluator missing threshold parameter"}
-	}
-
-	firstParam, ok := params[0].(json.Number)
-	if !ok {
-		return nil, alerting.ValidationError{Reason: "Evaluator has invalid parameter"}
-	}
-
-	secondParam, ok := params[1].(json.Number)
-	if !ok {
-		return nil, alerting.ValidationError{Reason: "Evaluator has invalid second parameter"}
-	}
-
-	rangedEval := &rangedEvaluator{Type: typ}
-	rangedEval.Lower, _ = firstParam.Float64()
-	rangedEval.Upper, _ = secondParam.Float64()
-	return rangedEval, nil
-}
-
-func (e *rangedEvaluator) Eval(reducedValue null.Float) bool {
-	if !reducedValue.Valid {
-		return false
-	}
-
-	floatValue := reducedValue.Float64
-
-	switch e.Type {
-	case "within_range":
-		return (e.Lower < floatValue && e.Upper > floatValue) || (e.Upper < floatValue && e.Lower > floatValue)
-	case "outside_range":
-		return (e.Upper < floatValue && e.Lower < floatValue) || (e.Upper > floatValue && e.Lower > floatValue)
-	}
-
-	return false
-}
-
-// NewAlertEvaluator is a factory function for returning
-// an `AlertEvaluator` depending on the json model.
-func NewAlertEvaluator(model *simplejson.Json) (AlertEvaluator, error) {
-	typ := model.Get("type").MustString()
-	if typ == "" {
-		return nil, fmt.Errorf("evaluator missing type property")
-	}
-
-	if inSlice(typ, defaultTypes) {
-		return newThresholdEvaluator(typ, model)
-	}
-
-	if inSlice(typ, rangedTypes) {
-		return newRangedEvaluator(typ, model)
-	}
-
-	if typ == "no_value" {
-		return &noValueEvaluator{}, nil
-	}
-
-	return nil, fmt.Errorf("evaluator invalid evaluator type: %s", typ)
-}
-
-func inSlice(a string, list []string) bool {
-	for _, b := range list {
-		if b == a {
-			return true
-		}
-	}
-	return false
-}
-
-// HumanThresholdType converts a threshold "type" string to a string that matches the UI
-// so errors are less confusing.
-func HumanThresholdType(typ string) string {
-	switch typ {
-	case "gt":
-		return "IS ABOVE"
-	case "lt":
-		return "IS BELOW"
-	case "within_range":
-		return "IS WITHIN RANGE"
-	case "outside_range":
-		return "IS OUTSIDE RANGE"
-	}
-	return ""
-}
diff --git a/pkg/services/alerting/conditions/evaluator_test.go b/pkg/services/alerting/conditions/evaluator_test.go
deleted file mode 100644
index 937c052752547..0000000000000
--- a/pkg/services/alerting/conditions/evaluator_test.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package conditions
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/null"
-	"github.com/grafana/grafana/pkg/components/simplejson"
-)
-
-func evaluatorScenario(t *testing.T, json string, reducedValue float64, datapoints ...float64) bool {
-	jsonModel, err := simplejson.NewJson([]byte(json))
-	require.NoError(t, err)
-
-	evaluator, err := NewAlertEvaluator(jsonModel)
-	require.NoError(t, err)
-
-	return evaluator.Eval(null.FloatFrom(reducedValue))
-}
-
-func TestEvaluators(t *testing.T) {
-	t.Run("greater then", func(t *testing.T) {
-		require.True(t, evaluatorScenario(t, `{"type": "gt", "params": [1] }`, 3))
-		require.False(t, evaluatorScenario(t, `{"type": "gt", "params": [3] }`, 1))
-	})
-
-	t.Run("less then", func(t *testing.T) {
-		require.False(t, evaluatorScenario(t, `{"type": "lt", "params": [1] }`, 3))
-		require.True(t, evaluatorScenario(t, `{"type": "lt", "params": [3] }`, 1))
-	})
-
-	t.Run("within_range", func(t *testing.T) {
-		require.True(t, evaluatorScenario(t, `{"type": "within_range", "params": [1, 100] }`, 3))
-		require.False(t, evaluatorScenario(t, `{"type": "within_range", "params": [1, 100] }`, 300))
-		require.True(t, evaluatorScenario(t, `{"type": "within_range", "params": [100, 1] }`, 3))
-		require.False(t, evaluatorScenario(t, `{"type": "within_range", "params": [100, 1] }`, 300))
-	})
-
-	t.Run("outside_range", func(t *testing.T) {
-		require.True(t, evaluatorScenario(t, `{"type": "outside_range", "params": [1, 100] }`, 1000))
-		require.False(t, evaluatorScenario(t, `{"type": "outside_range", "params": [1, 100] }`, 50))
-		require.True(t, evaluatorScenario(t, `{"type": "outside_range", "params": [100, 1] }`, 1000))
-		require.False(t, evaluatorScenario(t, `{"type": "outside_range", "params": [100, 1] }`, 50))
-	})
-
-	t.Run("no_value", func(t *testing.T) {
-		t.Run("should be false if series have values", func(t *testing.T) {
-			require.False(t, evaluatorScenario(t, `{"type": "no_value", "params": [] }`, 50))
-		})
-
-		t.Run("should be true when the series have no value", func(t *testing.T) {
-			jsonModel, err := simplejson.NewJson([]byte(`{"type": "no_value", "params": [] }`))
-			require.NoError(t, err)
-
-			evaluator, err := NewAlertEvaluator(jsonModel)
-			require.NoError(t, err)
-
-			require.True(t, evaluator.Eval(null.FloatFromPtr(nil)))
-		})
-	})
-}
diff --git a/pkg/services/alerting/conditions/query.go b/pkg/services/alerting/conditions/query.go
deleted file mode 100644
index ea090f1403d0e..0000000000000
--- a/pkg/services/alerting/conditions/query.go
+++ /dev/null
@@ -1,430 +0,0 @@
-package conditions
-
-import (
-	gocontext "context"
-	"errors"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/grafana/grafana-plugin-sdk-go/data"
-
-	"github.com/grafana/grafana/pkg/components/null"
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/datasources"
-	ngalertmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
-	"github.com/grafana/grafana/pkg/tsdb/legacydata"
-	"github.com/grafana/grafana/pkg/tsdb/legacydata/interval"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus"
-)
-
-func init() {
-	alerting.RegisterCondition("query", func(model *simplejson.Json, index int) (alerting.Condition, error) {
-		return newQueryCondition(model, index)
-	})
-}
-
-// QueryCondition is responsible for issue and query, reduce the
-// timeseries into single values and evaluate if they are firing or not.
-type QueryCondition struct {
-	Index     int
-	Query     AlertQuery
-	Reducer   *queryReducer
-	Evaluator AlertEvaluator
-	Operator  string
-}
-
-// AlertQuery contains information about what datasource a query
-// should be sent to and the query object.
-type AlertQuery struct {
-	Model        *simplejson.Json
-	DatasourceID int64
-	From         string
-	To           string
-}
-
-// Eval evaluates the `QueryCondition`.
-func (c *QueryCondition) Eval(context *alerting.EvalContext, requestHandler legacydata.RequestHandler) (*alerting.ConditionResult, error) {
-	timeRange := legacydata.NewDataTimeRange(c.Query.From, c.Query.To)
-
-	seriesList, err := c.executeQuery(context, timeRange, requestHandler)
-	if err != nil {
-		return nil, err
-	}
-
-	emptySeriesCount := 0
-	evalMatchCount := 0
-
-	// matches represents all the series that violate the alert condition
-	var matches []*alerting.EvalMatch
-	// allMatches capture all evaluation matches irregardless on whether the condition is met or not
-	allMatches := make([]*alerting.EvalMatch, 0, len(seriesList))
-
-	for _, series := range seriesList {
-		reducedValue := c.Reducer.Reduce(series)
-		evalMatch := c.Evaluator.Eval(reducedValue)
-
-		if !reducedValue.Valid {
-			emptySeriesCount++
-		}
-
-		if context.IsTestRun {
-			context.Logs = append(context.Logs, &alerting.ResultLogEntry{
-				Message: fmt.Sprintf("Condition[%d]: Eval: %v, Metric: %s, Value: %s", c.Index, evalMatch, series.Name, reducedValue),
-			})
-		}
-
-		em := alerting.EvalMatch{
-			Metric: series.Name,
-			Value:  reducedValue,
-			Tags:   series.Tags,
-		}
-
-		allMatches = append(allMatches, &em)
-
-		if evalMatch {
-			evalMatchCount++
-			matches = append(matches, &em)
-		}
-	}
-
-	// handle no series special case
-	if len(seriesList) == 0 {
-		// eval condition for null value
-		evalMatch := c.Evaluator.Eval(null.FloatFromPtr(nil))
-
-		if context.IsTestRun {
-			context.Logs = append(context.Logs, &alerting.ResultLogEntry{
-				Message: fmt.Sprintf("Condition: Eval: %v, Query Returned No Series (reduced to null/no value)", evalMatch),
-			})
-		}
-
-		if evalMatch {
-			evalMatchCount++
-			matches = append(matches, &alerting.EvalMatch{Metric: "NoData", Value: null.FloatFromPtr(nil)})
-		}
-	}
-
-	return &alerting.ConditionResult{
-		Firing:      evalMatchCount > 0,
-		NoDataFound: emptySeriesCount == len(seriesList),
-		Operator:    c.Operator,
-		EvalMatches: matches,
-		AllMatches:  allMatches,
-	}, nil
-}
-
-func calculateInterval(timeRange legacydata.DataTimeRange, model *simplejson.Json, dsInfo *datasources.DataSource) (time.Duration, error) {
-	// if there is no min-interval specified in the datasource or in the dashboard-panel,
-	// the value of 1ms is used (this is how it is done in the dashboard-interval-calculation too,
-	// see https://github.com/grafana/grafana/blob/9a0040c0aeaae8357c650cec2ee644a571dddf3d/packages/grafana-data/src/datetime/rangeutil.ts#L264)
-	defaultMinInterval := time.Millisecond * 1
-
-	// interval.GetIntervalFrom has two problems (but they do not affect us here):
-	// - it returns the min-interval, so it should be called interval.GetMinIntervalFrom
-	// - it falls back to model.intervalMs. it should not, because that one is the real final
-	//   interval-value calculated by the browser. but, in this specific case (old-alert),
-	//   that value is not set, so the fallback never happens.
-	minInterval, err := interval.GetIntervalFrom(dsInfo, model, defaultMinInterval)
-
-	if err != nil {
-		return time.Duration(0), err
-	}
-
-	calc := interval.NewCalculator()
-
-	interval := calc.Calculate(timeRange, minInterval)
-
-	return interval.Value, nil
-}
-
-func (c *QueryCondition) executeQuery(context *alerting.EvalContext, timeRange legacydata.DataTimeRange,
-	requestHandler legacydata.RequestHandler) (legacydata.DataTimeSeriesSlice, error) {
-	getDsInfo := &datasources.GetDataSourceQuery{
-		ID:    c.Query.DatasourceID,
-		OrgID: context.Rule.OrgID,
-	}
-
-	dataSource, err := context.GetDataSource(context.Ctx, getDsInfo)
-	if err != nil {
-		return nil, fmt.Errorf("could not find datasource: %w", err)
-	}
-
-	err = context.RequestValidator.Validate(dataSource.URL, nil)
-	if err != nil {
-		return nil, fmt.Errorf("access denied: %w", err)
-	}
-
-	req, err := c.getRequestForAlertRule(dataSource, timeRange, context.IsDebug)
-	if err != nil {
-		return nil, fmt.Errorf("interval calculation failed: %w", err)
-	}
-	result := make(legacydata.DataTimeSeriesSlice, 0)
-
-	if context.IsDebug {
-		data := simplejson.New()
-		if req.TimeRange != nil {
-			data.Set("from", req.TimeRange.GetFromAsMsEpoch())
-			data.Set("to", req.TimeRange.GetToAsMsEpoch())
-		}
-
-		type queryDto struct {
-			RefID         string           `json:"refId"`
-			Model         *simplejson.Json `json:"model"`
-			Datasource    *simplejson.Json `json:"datasource"`
-			MaxDataPoints int64            `json:"maxDataPoints"`
-			IntervalMS    int64            `json:"intervalMs"`
-		}
-
-		queries := []*queryDto{}
-		for _, q := range req.Queries {
-			queries = append(queries, &queryDto{
-				RefID: q.RefID,
-				Model: q.Model,
-				Datasource: simplejson.NewFromAny(map[string]any{
-					"id":   q.DataSource.ID,
-					"name": q.DataSource.Name,
-				}),
-				MaxDataPoints: q.MaxDataPoints,
-				IntervalMS:    q.IntervalMS,
-			})
-		}
-
-		data.Set("queries", queries)
-
-		context.Logs = append(context.Logs, &alerting.ResultLogEntry{
-			Message: fmt.Sprintf("Condition[%d]: Query", c.Index),
-			Data:    data,
-		})
-	}
-
-	resp, err := requestHandler.HandleRequest(context.Ctx, dataSource, req)
-	if err != nil {
-		return nil, toCustomError(err)
-	}
-
-	for _, v := range resp.Results {
-		if v.Error != nil {
-			return nil, fmt.Errorf("request handler response error %v", v)
-		}
-
-		// If there are dataframes but no series on the result
-		useDataframes := v.Dataframes != nil && (v.Series == nil || len(v.Series) == 0)
-
-		if useDataframes { // convert the dataframes to plugins.DataTimeSeries
-			frames, err := v.Dataframes.Decoded()
-			if err != nil {
-				return nil, fmt.Errorf("%v: %w", "request handler failed to unmarshal arrow dataframes from bytes", err)
-			}
-
-			for _, frame := range frames {
-				ss, err := FrameToSeriesSlice(frame)
-				if err != nil {
-					return nil, fmt.Errorf(
-						`request handler failed to convert dataframe "%v" to plugins.DataTimeSeriesSlice: %w`, frame.Name, err)
-				}
-				result = append(result, ss...)
-			}
-		} else {
-			result = append(result, v.Series...)
-		}
-
-		queryResultData := map[string]any{}
-
-		if context.IsTestRun {
-			queryResultData["series"] = result
-		}
-
-		if context.IsDebug && v.Meta != nil {
-			queryResultData["meta"] = v.Meta
-		}
-
-		if context.IsTestRun || context.IsDebug {
-			if useDataframes {
-				queryResultData["fromDataframe"] = true
-			}
-			context.Logs = append(context.Logs, &alerting.ResultLogEntry{
-				Message: fmt.Sprintf("Condition[%d]: Query Result", c.Index),
-				Data:    simplejson.NewFromAny(queryResultData),
-			})
-		}
-	}
-
-	return result, nil
-}
-
-func (c *QueryCondition) getRequestForAlertRule(datasource *datasources.DataSource, timeRange legacydata.DataTimeRange,
-	debug bool) (legacydata.DataQuery, error) {
-	queryModel := c.Query.Model
-
-	calculatedInterval, err := calculateInterval(timeRange, queryModel, datasource)
-	if err != nil {
-		return legacydata.DataQuery{}, err
-	}
-
-	req := legacydata.DataQuery{
-		TimeRange: &timeRange,
-		Queries: []legacydata.DataSubQuery{
-			{
-				RefID:         "A",
-				Model:         queryModel,
-				DataSource:    datasource,
-				QueryType:     queryModel.Get("queryType").MustString(""),
-				MaxDataPoints: interval.DefaultRes,
-				IntervalMS:    calculatedInterval.Milliseconds(),
-			},
-		},
-		Headers: map[string]string{
-			ngalertmodels.FromAlertHeaderName: "true",
-			ngalertmodels.CacheSkipHeaderName: "true",
-		},
-		Debug: debug,
-	}
-
-	return req, nil
-}
-
-func newQueryCondition(model *simplejson.Json, index int) (*QueryCondition, error) {
-	condition := QueryCondition{}
-	condition.Index = index
-
-	queryJSON := model.Get("query")
-
-	condition.Query.Model = queryJSON.Get("model")
-	condition.Query.From = queryJSON.Get("params").MustArray()[1].(string)
-	condition.Query.To = queryJSON.Get("params").MustArray()[2].(string)
-
-	if err := validateFromValue(condition.Query.From); err != nil {
-		return nil, err
-	}
-
-	if err := validateToValue(condition.Query.To); err != nil {
-		return nil, err
-	}
-
-	condition.Query.DatasourceID = queryJSON.Get("datasourceId").MustInt64()
-
-	reducerJSON := model.Get("reducer")
-	condition.Reducer = newSimpleReducer(reducerJSON.Get("type").MustString())
-
-	evaluatorJSON := model.Get("evaluator")
-	evaluator, err := NewAlertEvaluator(evaluatorJSON)
-	if err != nil {
-		return nil, fmt.Errorf("error in condition %v: %v", index, err)
-	}
-	condition.Evaluator = evaluator
-
-	operatorJSON := model.Get("operator")
-	operator := operatorJSON.Get("type").MustString("and")
-	condition.Operator = operator
-
-	return &condition, nil
-}
-
-func validateFromValue(from string) error {
-	fromRaw := strings.Replace(from, "now-", "", 1)
-
-	_, err := time.ParseDuration("-" + fromRaw)
-	return err
-}
-
-func validateToValue(to string) error {
-	if to == "now" {
-		return nil
-	} else if strings.HasPrefix(to, "now-") {
-		withoutNow := strings.Replace(to, "now-", "", 1)
-
-		_, err := time.ParseDuration("-" + withoutNow)
-		if err == nil {
-			return nil
-		}
-	}
-
-	_, err := time.ParseDuration(to)
-	return err
-}
-
-// FrameToSeriesSlice converts a frame that is a valid time series as per data.TimeSeriesSchema()
-// to a DataTimeSeriesSlice.
-func FrameToSeriesSlice(frame *data.Frame) (legacydata.DataTimeSeriesSlice, error) {
-	tsSchema := frame.TimeSeriesSchema()
-	if tsSchema.Type == data.TimeSeriesTypeNot {
-		// If no fields, or only a time field, create an empty plugins.DataTimeSeriesSlice with a single
-		// time series in order to trigger "no data" in alerting.
-		if frame.Rows() == 0 || (len(frame.Fields) == 1 && frame.Fields[0].Type().Time()) {
-			return legacydata.DataTimeSeriesSlice{{
-				Name:   frame.Name,
-				Points: make(legacydata.DataTimeSeriesPoints, 0),
-			}}, nil
-		}
-		return nil, fmt.Errorf("input frame is not recognized as a time series")
-	}
-	seriesCount := len(tsSchema.ValueIndices)
-	seriesSlice := make(legacydata.DataTimeSeriesSlice, 0, seriesCount)
-	timeField := frame.Fields[tsSchema.TimeIndex]
-	timeNullFloatSlice := make([]null.Float, timeField.Len())
-
-	for i := 0; i < timeField.Len(); i++ { // built slice of time as epoch ms in null floats
-		tStamp, err := timeField.FloatAt(i)
-		if err != nil {
-			return nil, err
-		}
-		timeNullFloatSlice[i] = null.FloatFrom(tStamp)
-	}
-
-	for _, fieldIdx := range tsSchema.ValueIndices { // create a TimeSeries for each value Field
-		field := frame.Fields[fieldIdx]
-		ts := legacydata.DataTimeSeries{
-			Points: make(legacydata.DataTimeSeriesPoints, field.Len()),
-		}
-
-		if len(field.Labels) > 0 {
-			ts.Tags = field.Labels.Copy()
-		}
-
-		switch {
-		case field.Config != nil && field.Config.DisplayName != "":
-			ts.Name = field.Config.DisplayName
-		case field.Config != nil && field.Config.DisplayNameFromDS != "":
-			ts.Name = field.Config.DisplayNameFromDS
-		case len(field.Labels) > 0:
-			// Tags are appended to the name so they are eventually included in EvalMatch's Metric property
-			// for display in notifications.
-			ts.Name = fmt.Sprintf("%v {%v}", field.Name, field.Labels.String())
-		default:
-			ts.Name = field.Name
-		}
-
-		for rowIdx := 0; rowIdx < field.Len(); rowIdx++ { // for each value in the field, make a TimePoint
-			val, err := field.FloatAt(rowIdx)
-			if err != nil {
-				return nil, fmt.Errorf(
-					"failed to convert frame to DataTimeSeriesSlice, can not convert value %v to float: %w", field.At(rowIdx), err)
-			}
-			ts.Points[rowIdx] = legacydata.DataTimePoint{
-				null.FloatFrom(val),
-				timeNullFloatSlice[rowIdx],
-			}
-		}
-
-		seriesSlice = append(seriesSlice, ts)
-	}
-
-	return seriesSlice, nil
-}
-
-func toCustomError(err error) error {
-	// is context timeout
-	if errors.Is(err, gocontext.DeadlineExceeded) {
-		return fmt.Errorf("alert execution exceeded the timeout")
-	}
-
-	// is Prometheus error
-	if prometheus.IsAPIError(err) {
-		return prometheus.ConvertAPIError(err)
-	}
-
-	// generic fallback
-	return fmt.Errorf("request handler error: %w", err)
-}
diff --git a/pkg/services/alerting/conditions/query_interval_test.go b/pkg/services/alerting/conditions/query_interval_test.go
deleted file mode 100644
index 443b0f74d83f2..0000000000000
--- a/pkg/services/alerting/conditions/query_interval_test.go
+++ /dev/null
@@ -1,191 +0,0 @@
-package conditions
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/db/dbtest"
-	"github.com/grafana/grafana/pkg/infra/localcache"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/datasources"
-	fd "github.com/grafana/grafana/pkg/services/datasources/fakes"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/services/validations"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/tsdb/intervalv2"
-	"github.com/grafana/grafana/pkg/tsdb/legacydata"
-)
-
-func TestQueryInterval(t *testing.T) {
-	t.Run("When evaluating query condition, regarding the interval value", func(t *testing.T) {
-		t.Run("Can handle interval-calculation with no panel-min-interval and no datasource-min-interval", func(t *testing.T) {
-			// no panel-min-interval in the queryModel
-			queryModel := `{"target": "aliasByNode(statsd.fakesite.counters.session_start.mobile.count, 4)"}`
-
-			// no datasource-min-interval
-			var dataSourceJson *simplejson.Json = nil
-
-			timeRange := "5m"
-
-			verifier := func(query legacydata.DataSubQuery) {
-				// 5minutes timerange = 300000milliseconds; default-resolution is 1500pixels,
-				// so we should have 300000/1500 = 200milliseconds here
-				require.Equal(t, int64(200), query.IntervalMS)
-				require.Equal(t, intervalv2.DefaultRes, query.MaxDataPoints)
-			}
-
-			applyScenario(t, timeRange, dataSourceJson, queryModel, verifier)
-		})
-		t.Run("Can handle interval-calculation with panel-min-interval and no datasource-min-interval", func(t *testing.T) {
-			// panel-min-interval in the queryModel
-			queryModel := `{"interval":"123s", "target": "aliasByNode(statsd.fakesite.counters.session_start.mobile.count, 4)"}`
-
-			// no datasource-min-interval
-			var dataSourceJson *simplejson.Json = nil
-
-			timeRange := "5m"
-
-			verifier := func(query legacydata.DataSubQuery) {
-				require.Equal(t, int64(123000), query.IntervalMS)
-				require.Equal(t, intervalv2.DefaultRes, query.MaxDataPoints)
-			}
-
-			applyScenario(t, timeRange, dataSourceJson, queryModel, verifier)
-		})
-		t.Run("Can handle interval-calculation with no panel-min-interval and datasource-min-interval", func(t *testing.T) {
-			// no panel-min-interval in the queryModel
-			queryModel := `{"target": "aliasByNode(statsd.fakesite.counters.session_start.mobile.count, 4)"}`
-
-			// min-interval in datasource-json
-			dataSourceJson, err := simplejson.NewJson([]byte(`{
-			"timeInterval": "71s"
-		}`))
-			require.Nil(t, err)
-
-			timeRange := "5m"
-
-			verifier := func(query legacydata.DataSubQuery) {
-				require.Equal(t, int64(71000), query.IntervalMS)
-				require.Equal(t, intervalv2.DefaultRes, query.MaxDataPoints)
-			}
-
-			applyScenario(t, timeRange, dataSourceJson, queryModel, verifier)
-		})
-		t.Run("Can handle interval-calculation with both panel-min-interval and datasource-min-interval", func(t *testing.T) {
-			// panel-min-interval in the queryModel
-			queryModel := `{"interval":"19s", "target": "aliasByNode(statsd.fakesite.counters.session_start.mobile.count, 4)"}`
-
-			// min-interval in datasource-json
-			dataSourceJson, err := simplejson.NewJson([]byte(`{
-			"timeInterval": "71s"
-		}`))
-			require.Nil(t, err)
-
-			timeRange := "5m"
-
-			verifier := func(query legacydata.DataSubQuery) {
-				// when both panel-min-interval and datasource-min-interval exists,
-				// panel-min-interval is used
-				require.Equal(t, int64(19000), query.IntervalMS)
-				require.Equal(t, intervalv2.DefaultRes, query.MaxDataPoints)
-			}
-
-			applyScenario(t, timeRange, dataSourceJson, queryModel, verifier)
-		})
-
-		t.Run("Can handle no min-interval, and very small time-ranges, where the default-min-interval=1ms applies", func(t *testing.T) {
-			// no panel-min-interval in the queryModel
-			queryModel := `{"target": "aliasByNode(statsd.fakesite.counters.session_start.mobile.count, 4)"}`
-
-			// no datasource-min-interval
-			var dataSourceJson *simplejson.Json = nil
-
-			timeRange := "1s"
-
-			verifier := func(query legacydata.DataSubQuery) {
-				// no min-interval exists, the default-min-interval will be used,
-				// and for such a short time-range this will cause the value to be 1millisecond.
-				require.Equal(t, int64(1), query.IntervalMS)
-				require.Equal(t, intervalv2.DefaultRes, query.MaxDataPoints)
-			}
-
-			applyScenario(t, timeRange, dataSourceJson, queryModel, verifier)
-		})
-	})
-}
-
-type queryIntervalTestContext struct {
-	result    *alerting.EvalContext
-	condition *QueryCondition
-}
-
-type queryIntervalVerifier func(query legacydata.DataSubQuery)
-
-type fakeIntervalTestReqHandler struct {
-	//nolint: staticcheck // legacydata.DataResponse deprecated
-	response legacydata.DataResponse
-	verifier queryIntervalVerifier
-}
-
-//nolint:staticcheck // legacydata.DataResponse deprecated
-func (rh fakeIntervalTestReqHandler) HandleRequest(ctx context.Context, dsInfo *datasources.DataSource, query legacydata.DataQuery) (
-	legacydata.DataResponse, error) {
-	q := query.Queries[0]
-	rh.verifier(q)
-	return rh.response, nil
-}
-
-//nolint:staticcheck // legacydata.DataResponse deprecated
-func applyScenario(t *testing.T, timeRange string, dataSourceJsonData *simplejson.Json, queryModel string, verifier func(query legacydata.DataSubQuery)) {
-	t.Run("desc", func(t *testing.T) {
-		db := dbtest.NewFakeDB()
-		store := alerting.ProvideAlertStore(db, localcache.ProvideService(), &setting.Cfg{}, nil, featuremgmt.WithFeatures())
-
-		ctx := &queryIntervalTestContext{}
-		ctx.result = &alerting.EvalContext{
-			Ctx:              context.Background(),
-			Rule:             &alerting.Rule{},
-			RequestValidator: &validations.OSSPluginRequestValidator{},
-			Store:            store,
-			DatasourceService: &fd.FakeDataSourceService{
-				DataSources: []*datasources.DataSource{
-					{ID: 1, Type: datasources.DS_GRAPHITE, JsonData: dataSourceJsonData},
-				},
-			},
-		}
-
-		jsonModel, err := simplejson.NewJson([]byte(`{
-            "type": "query",
-            "query":  {
-              "params": ["A", "` + timeRange + `", "now"],
-              "datasourceId": 1,
-              "model": ` + queryModel + `
-            },
-            "reducer":{"type": "avg"},
-					"evaluator":{"type": "gt", "params": [100]}
-          }`))
-		require.Nil(t, err)
-
-		condition, err := newQueryCondition(jsonModel, 0)
-		require.Nil(t, err)
-
-		ctx.condition = condition
-
-		qr := legacydata.DataQueryResult{}
-
-		reqHandler := fakeIntervalTestReqHandler{
-			response: legacydata.DataResponse{
-				Results: map[string]legacydata.DataQueryResult{
-					"A": qr,
-				},
-			},
-			verifier: verifier,
-		}
-		_, err = condition.Eval(ctx.result, reqHandler)
-
-		require.Nil(t, err)
-	})
-}
diff --git a/pkg/services/alerting/conditions/query_test.go b/pkg/services/alerting/conditions/query_test.go
deleted file mode 100644
index 11e98da1acac4..0000000000000
--- a/pkg/services/alerting/conditions/query_test.go
+++ /dev/null
@@ -1,386 +0,0 @@
-package conditions
-
-import (
-	"context"
-	"math"
-	"testing"
-	"time"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/grafana/grafana-plugin-sdk-go/data"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/null"
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/db/dbtest"
-	"github.com/grafana/grafana/pkg/infra/localcache"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/datasources"
-	fd "github.com/grafana/grafana/pkg/services/datasources/fakes"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/services/validations"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/tsdb/legacydata"
-	"github.com/grafana/grafana/pkg/util"
-)
-
-func newTimeSeriesPointsFromArgs(values ...float64) legacydata.DataTimeSeriesPoints {
-	points := make(legacydata.DataTimeSeriesPoints, 0)
-
-	for i := 0; i < len(values); i += 2 {
-		points = append(points, legacydata.DataTimePoint{null.FloatFrom(values[i]), null.FloatFrom(values[i+1])})
-	}
-
-	return points
-}
-
-func TestQueryCondition(t *testing.T) {
-	setup := func() *queryConditionTestContext {
-		ctx := &queryConditionTestContext{}
-		db := dbtest.NewFakeDB()
-		store := alerting.ProvideAlertStore(db, localcache.ProvideService(), &setting.Cfg{}, nil, featuremgmt.WithFeatures())
-		ctx.reducer = `{"type":"avg"}`
-		ctx.evaluator = `{"type":"gt","params":[100]}`
-		ctx.result = &alerting.EvalContext{
-			Ctx:              context.Background(),
-			Rule:             &alerting.Rule{},
-			RequestValidator: &validations.OSSPluginRequestValidator{},
-			Store:            store,
-			DatasourceService: &fd.FakeDataSourceService{
-				DataSources: []*datasources.DataSource{
-					{ID: 1, Type: datasources.DS_GRAPHITE},
-				},
-			},
-		}
-		return ctx
-	}
-
-	t.Run("Can read query condition from json model", func(t *testing.T) {
-		ctx := setup()
-		_, err := ctx.exec(t)
-		require.Nil(t, err)
-
-		require.Equal(t, "5m", ctx.condition.Query.From)
-		require.Equal(t, "now", ctx.condition.Query.To)
-		require.Equal(t, int64(1), ctx.condition.Query.DatasourceID)
-
-		t.Run("Can read query reducer", func(t *testing.T) {
-			reducer := ctx.condition.Reducer
-			require.Equal(t, "avg", reducer.Type)
-		})
-
-		t.Run("Can read evaluator", func(t *testing.T) {
-			evaluator, ok := ctx.condition.Evaluator.(*thresholdEvaluator)
-			require.True(t, ok)
-			require.Equal(t, "gt", evaluator.Type)
-		})
-	})
-
-	t.Run("should fire when avg is above 100", func(t *testing.T) {
-		ctx := setup()
-		points := newTimeSeriesPointsFromArgs(120, 0)
-		ctx.series = legacydata.DataTimeSeriesSlice{legacydata.DataTimeSeries{Name: "test1", Points: points}}
-		cr, err := ctx.exec(t)
-
-		require.Nil(t, err)
-		require.True(t, cr.Firing)
-	})
-
-	t.Run("should fire when avg is above 100 on dataframe", func(t *testing.T) {
-		ctx := setup()
-		ctx.frame = data.NewFrame("",
-			data.NewField("time", nil, []time.Time{time.Now(), time.Now()}),
-			data.NewField("val", nil, []int64{120, 150}),
-		)
-		cr, err := ctx.exec(t)
-
-		require.Nil(t, err)
-		require.True(t, cr.Firing)
-	})
-
-	t.Run("Should not fire when avg is below 100", func(t *testing.T) {
-		ctx := setup()
-		points := newTimeSeriesPointsFromArgs(90, 0)
-		ctx.series = legacydata.DataTimeSeriesSlice{legacydata.DataTimeSeries{Name: "test1", Points: points}}
-		cr, err := ctx.exec(t)
-
-		require.Nil(t, err)
-		require.False(t, cr.Firing)
-	})
-
-	t.Run("Should not fire when avg is below 100 on dataframe", func(t *testing.T) {
-		ctx := setup()
-		ctx.frame = data.NewFrame("",
-			data.NewField("time", nil, []time.Time{time.Now(), time.Now()}),
-			data.NewField("val", nil, []int64{12, 47}),
-		)
-		cr, err := ctx.exec(t)
-
-		require.Nil(t, err)
-		require.False(t, cr.Firing)
-	})
-
-	t.Run("Should fire if only first series matches", func(t *testing.T) {
-		ctx := setup()
-		ctx.series = legacydata.DataTimeSeriesSlice{
-			legacydata.DataTimeSeries{Name: "test1", Points: newTimeSeriesPointsFromArgs(120, 0)},
-			legacydata.DataTimeSeries{Name: "test2", Points: newTimeSeriesPointsFromArgs(0, 0)},
-		}
-		cr, err := ctx.exec(t)
-
-		require.Nil(t, err)
-		require.True(t, cr.Firing)
-	})
-
-	t.Run("No series", func(t *testing.T) {
-		ctx := setup()
-		t.Run("Should set NoDataFound when condition is gt", func(t *testing.T) {
-			ctx.series = legacydata.DataTimeSeriesSlice{}
-			cr, err := ctx.exec(t)
-
-			require.Nil(t, err)
-			require.False(t, cr.Firing)
-			require.True(t, cr.NoDataFound)
-		})
-
-		t.Run("Should be firing when condition is no_value", func(t *testing.T) {
-			ctx.evaluator = `{"type": "no_value", "params": []}`
-			ctx.series = legacydata.DataTimeSeriesSlice{}
-			cr, err := ctx.exec(t)
-
-			require.Nil(t, err)
-			require.True(t, cr.Firing)
-		})
-	})
-
-	t.Run("Empty series", func(t *testing.T) {
-		ctx := setup()
-		t.Run("Should set Firing if eval match", func(t *testing.T) {
-			ctx.evaluator = `{"type": "no_value", "params": []}`
-			ctx.series = legacydata.DataTimeSeriesSlice{
-				legacydata.DataTimeSeries{Name: "test1", Points: newTimeSeriesPointsFromArgs()},
-			}
-			cr, err := ctx.exec(t)
-
-			require.Nil(t, err)
-			require.True(t, cr.Firing)
-		})
-
-		t.Run("Should set NoDataFound both series are empty", func(t *testing.T) {
-			ctx.series = legacydata.DataTimeSeriesSlice{
-				legacydata.DataTimeSeries{Name: "test1", Points: newTimeSeriesPointsFromArgs()},
-				legacydata.DataTimeSeries{Name: "test2", Points: newTimeSeriesPointsFromArgs()},
-			}
-			cr, err := ctx.exec(t)
-
-			require.Nil(t, err)
-			require.True(t, cr.NoDataFound)
-		})
-
-		t.Run("Should set NoDataFound both series contains null", func(t *testing.T) {
-			ctx.series = legacydata.DataTimeSeriesSlice{
-				legacydata.DataTimeSeries{Name: "test1", Points: legacydata.DataTimeSeriesPoints{legacydata.DataTimePoint{null.FloatFromPtr(nil), null.FloatFrom(0)}}},
-				legacydata.DataTimeSeries{Name: "test2", Points: legacydata.DataTimeSeriesPoints{legacydata.DataTimePoint{null.FloatFromPtr(nil), null.FloatFrom(0)}}},
-			}
-			cr, err := ctx.exec(t)
-
-			require.Nil(t, err)
-			require.True(t, cr.NoDataFound)
-		})
-
-		t.Run("Should not set NoDataFound if one series is empty", func(t *testing.T) {
-			ctx.series = legacydata.DataTimeSeriesSlice{
-				legacydata.DataTimeSeries{Name: "test1", Points: newTimeSeriesPointsFromArgs()},
-				legacydata.DataTimeSeries{Name: "test2", Points: newTimeSeriesPointsFromArgs(120, 0)},
-			}
-			cr, err := ctx.exec(t)
-
-			require.Nil(t, err)
-			require.False(t, cr.NoDataFound)
-		})
-	})
-}
-
-type queryConditionTestContext struct {
-	reducer   string
-	evaluator string
-	series    legacydata.DataTimeSeriesSlice
-	frame     *data.Frame
-	result    *alerting.EvalContext
-	condition *QueryCondition
-}
-
-//nolint:staticcheck // legacydata.DataPlugin deprecated
-func (ctx *queryConditionTestContext) exec(t *testing.T) (*alerting.ConditionResult, error) {
-	jsonModel, err := simplejson.NewJson([]byte(`{
-            "type": "query",
-            "query":  {
-              "params": ["A", "5m", "now"],
-              "datasourceId": 1,
-              "model": {"target": "aliasByNode(statsd.fakesite.counters.session_start.mobile.count, 4)"}
-            },
-            "reducer":` + ctx.reducer + `,
-            "evaluator":` + ctx.evaluator + `
-          }`))
-	require.Nil(t, err)
-
-	condition, err := newQueryCondition(jsonModel, 0)
-	require.Nil(t, err)
-
-	ctx.condition = condition
-
-	qr := legacydata.DataQueryResult{
-		Series: ctx.series,
-	}
-
-	if ctx.frame != nil {
-		qr = legacydata.DataQueryResult{
-			Dataframes: legacydata.NewDecodedDataFrames(data.Frames{ctx.frame}),
-		}
-	}
-	reqHandler := fakeReqHandler{
-		response: legacydata.DataResponse{
-			Results: map[string]legacydata.DataQueryResult{
-				"A": qr,
-			},
-		},
-	}
-
-	return condition.Eval(ctx.result, reqHandler)
-}
-
-type fakeReqHandler struct {
-	//nolint: staticcheck // legacydata.DataPlugin deprecated
-	response legacydata.DataResponse
-}
-
-//nolint:staticcheck // legacydata.DataPlugin deprecated
-func (rh fakeReqHandler) HandleRequest(context.Context, *datasources.DataSource, legacydata.DataQuery) (
-	legacydata.DataResponse, error) {
-	return rh.response, nil
-}
-
-func TestFrameToSeriesSlice(t *testing.T) {
-	tests := []struct {
-		name        string
-		frame       *data.Frame
-		seriesSlice legacydata.DataTimeSeriesSlice
-		Err         require.ErrorAssertionFunc
-	}{
-		{
-			name: "a wide series",
-			frame: data.NewFrame("",
-				data.NewField("Time", nil, []time.Time{
-					time.Date(2020, 1, 2, 3, 4, 0, 0, time.UTC),
-					time.Date(2020, 1, 2, 3, 4, 30, 0, time.UTC),
-				}),
-				data.NewField(`Values Int64s`, data.Labels{"Animal Factor": "cat"}, []*int64{
-					nil,
-					util.Pointer(int64(3)),
-				}),
-				data.NewField(`Values Floats`, data.Labels{"Animal Factor": "sloth"}, []float64{
-					2.0,
-					4.0,
-				})),
-
-			seriesSlice: legacydata.DataTimeSeriesSlice{
-				legacydata.DataTimeSeries{
-					Name: "Values Int64s {Animal Factor=cat}",
-					Tags: map[string]string{"Animal Factor": "cat"},
-					Points: legacydata.DataTimeSeriesPoints{
-						legacydata.DataTimePoint{null.FloatFrom(math.NaN()), null.FloatFrom(1577934240000)},
-						legacydata.DataTimePoint{null.FloatFrom(3), null.FloatFrom(1577934270000)},
-					},
-				},
-				legacydata.DataTimeSeries{
-					Name: "Values Floats {Animal Factor=sloth}",
-					Tags: map[string]string{"Animal Factor": "sloth"},
-					Points: legacydata.DataTimeSeriesPoints{
-						legacydata.DataTimePoint{null.FloatFrom(2), null.FloatFrom(1577934240000)},
-						legacydata.DataTimePoint{null.FloatFrom(4), null.FloatFrom(1577934270000)},
-					},
-				},
-			},
-			Err: require.NoError,
-		},
-		{
-			name: "empty wide series",
-			frame: data.NewFrame("",
-				data.NewField("Time", nil, []time.Time{}),
-				data.NewField(`Values Int64s`, data.Labels{"Animal Factor": "cat"}, []*int64{}),
-				data.NewField(`Values Floats`, data.Labels{"Animal Factor": "sloth"}, []float64{})),
-
-			seriesSlice: legacydata.DataTimeSeriesSlice{
-				legacydata.DataTimeSeries{
-					Name:   "Values Int64s {Animal Factor=cat}",
-					Tags:   map[string]string{"Animal Factor": "cat"},
-					Points: legacydata.DataTimeSeriesPoints{},
-				},
-				legacydata.DataTimeSeries{
-					Name:   "Values Floats {Animal Factor=sloth}",
-					Tags:   map[string]string{"Animal Factor": "sloth"},
-					Points: legacydata.DataTimeSeriesPoints{},
-				},
-			},
-			Err: require.NoError,
-		},
-		{
-			name: "empty labels",
-			frame: data.NewFrame("",
-				data.NewField("Time", data.Labels{}, []time.Time{}),
-				data.NewField(`Values`, data.Labels{}, []float64{})),
-
-			seriesSlice: legacydata.DataTimeSeriesSlice{
-				legacydata.DataTimeSeries{
-					Name:   "Values",
-					Points: legacydata.DataTimeSeriesPoints{},
-				},
-			},
-			Err: require.NoError,
-		},
-		{
-			name: "display name from data source",
-			frame: data.NewFrame("",
-				data.NewField("Time", data.Labels{}, []time.Time{}),
-				data.NewField(`Values`, data.Labels{"Rating": "10"}, []*int64{}).SetConfig(&data.FieldConfig{
-					DisplayNameFromDS: "sloth",
-				})),
-
-			seriesSlice: legacydata.DataTimeSeriesSlice{
-				legacydata.DataTimeSeries{
-					Name:   "sloth",
-					Points: legacydata.DataTimeSeriesPoints{},
-					Tags:   map[string]string{"Rating": "10"},
-				},
-			},
-			Err: require.NoError,
-		},
-		{
-			name: "prefer display name over data source display name",
-			frame: data.NewFrame("",
-				data.NewField("Time", data.Labels{}, []time.Time{}),
-				data.NewField(`Values`, data.Labels{}, []*int64{}).SetConfig(&data.FieldConfig{
-					DisplayName:       "sloth #1",
-					DisplayNameFromDS: "sloth #2",
-				})),
-
-			seriesSlice: legacydata.DataTimeSeriesSlice{
-				legacydata.DataTimeSeries{
-					Name:   "sloth #1",
-					Points: legacydata.DataTimeSeriesPoints{},
-				},
-			},
-			Err: require.NoError,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			seriesSlice, err := FrameToSeriesSlice(tt.frame)
-			tt.Err(t, err)
-			if diff := cmp.Diff(tt.seriesSlice, seriesSlice, cmpopts.EquateNaNs()); diff != "" {
-				t.Errorf("Result mismatch (-want +got):\n%s", diff)
-			}
-		})
-	}
-}
diff --git a/pkg/services/alerting/conditions/reducer.go b/pkg/services/alerting/conditions/reducer.go
deleted file mode 100644
index 6fb986cb5aa3a..0000000000000
--- a/pkg/services/alerting/conditions/reducer.go
+++ /dev/null
@@ -1,174 +0,0 @@
-package conditions
-
-import (
-	"math"
-	"sort"
-
-	"github.com/grafana/grafana/pkg/components/null"
-	"github.com/grafana/grafana/pkg/tsdb/legacydata"
-)
-
-// queryReducer reduces a timeseries to a nullable float
-type queryReducer struct {
-
-	// Type is how the timeseries should be reduced.
-	// Ex avg, sum, max, min, count
-	Type string
-}
-
-//nolint:gocyclo
-func (s *queryReducer) Reduce(series legacydata.DataTimeSeries) null.Float {
-	if len(series.Points) == 0 {
-		return null.FloatFromPtr(nil)
-	}
-
-	value := float64(0)
-	allNull := true
-
-	switch s.Type {
-	case "avg":
-		validPointsCount := 0
-		for _, point := range series.Points {
-			if isValid(point[0]) {
-				value += point[0].Float64
-				validPointsCount++
-				allNull = false
-			}
-		}
-		if validPointsCount > 0 {
-			value /= float64(validPointsCount)
-		}
-	case "sum":
-		for _, point := range series.Points {
-			if isValid(point[0]) {
-				value += point[0].Float64
-				allNull = false
-			}
-		}
-	case "min":
-		value = math.MaxFloat64
-		for _, point := range series.Points {
-			if isValid(point[0]) {
-				allNull = false
-				if value > point[0].Float64 {
-					value = point[0].Float64
-				}
-			}
-		}
-	case "max":
-		value = -math.MaxFloat64
-		for _, point := range series.Points {
-			if isValid(point[0]) {
-				allNull = false
-				if value < point[0].Float64 {
-					value = point[0].Float64
-				}
-			}
-		}
-	case "count":
-		value = float64(len(series.Points))
-		allNull = false
-	case "last":
-		points := series.Points
-		for i := len(points) - 1; i >= 0; i-- {
-			if isValid(points[i][0]) {
-				value = points[i][0].Float64
-				allNull = false
-				break
-			}
-		}
-	case "median":
-		var values []float64
-		for _, v := range series.Points {
-			if isValid(v[0]) {
-				allNull = false
-				values = append(values, v[0].Float64)
-			}
-		}
-		if len(values) >= 1 {
-			sort.Float64s(values)
-			length := len(values)
-			if length%2 == 1 {
-				value = values[(length-1)/2]
-			} else {
-				value = (values[(length/2)-1] + values[length/2]) / 2
-			}
-		}
-	case "diff":
-		allNull, value = calculateDiff(series, allNull, value, diff)
-	case "diff_abs":
-		allNull, value = calculateDiff(series, allNull, value, diffAbs)
-	case "percent_diff":
-		allNull, value = calculateDiff(series, allNull, value, percentDiff)
-	case "percent_diff_abs":
-		allNull, value = calculateDiff(series, allNull, value, percentDiffAbs)
-	case "count_non_null":
-		for _, v := range series.Points {
-			if isValid(v[0]) {
-				value++
-			}
-		}
-
-		if value > 0 {
-			allNull = false
-		}
-	}
-
-	if allNull {
-		return null.FloatFromPtr(nil)
-	}
-
-	return null.FloatFrom(value)
-}
-
-func newSimpleReducer(t string) *queryReducer {
-	return &queryReducer{Type: t}
-}
-
-func calculateDiff(series legacydata.DataTimeSeries, allNull bool, value float64, fn func(float64, float64) float64) (bool, float64) {
-	var (
-		points = series.Points
-		first  float64
-		i      int
-	)
-	// get the newest point
-	for i = len(points) - 1; i >= 0; i-- {
-		if isValid(points[i][0]) {
-			allNull = false
-			first = points[i][0].Float64
-			break
-		}
-	}
-	if i >= 1 {
-		// get the oldest point
-		points = points[0:i]
-		for i := 0; i < len(points); i++ {
-			if isValid(points[i][0]) {
-				allNull = false
-				value = fn(first, points[i][0].Float64)
-				break
-			}
-		}
-	}
-	return allNull, value
-}
-
-func isValid(f null.Float) bool {
-	return f.Valid && !math.IsNaN(f.Float64)
-}
-
-var diff = func(newest, oldest float64) float64 {
-	return newest - oldest
-}
-
-var diffAbs = func(newest, oldest float64) float64 {
-	return math.Abs(newest - oldest)
-}
-
-var percentDiff = func(newest, oldest float64) float64 {
-	return (newest - oldest) / math.Abs(oldest) * 100
-}
-
-var percentDiffAbs = func(newest, oldest float64) float64 {
-	return math.Abs((newest - oldest) / oldest * 100)
-}
diff --git a/pkg/services/alerting/conditions/reducer_test.go b/pkg/services/alerting/conditions/reducer_test.go
deleted file mode 100644
index c357a2e9c4bf9..0000000000000
--- a/pkg/services/alerting/conditions/reducer_test.go
+++ /dev/null
@@ -1,409 +0,0 @@
-package conditions
-
-import (
-	"math"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/null"
-	"github.com/grafana/grafana/pkg/tsdb/legacydata"
-)
-
-func TestSimpleReducer(t *testing.T) {
-	t.Run("sum", func(t *testing.T) {
-		result := testReducer("sum", 1, 2, 3)
-		require.Equal(t, float64(6), result)
-	})
-
-	t.Run("min", func(t *testing.T) {
-		result := testReducer("min", 3, 2, 1)
-		require.Equal(t, float64(1), result)
-	})
-
-	t.Run("max", func(t *testing.T) {
-		result := testReducer("max", 1, 2, 3)
-		require.Equal(t, float64(3), result)
-	})
-
-	t.Run("count", func(t *testing.T) {
-		result := testReducer("count", 1, 2, 3000)
-		require.Equal(t, float64(3), result)
-	})
-
-	t.Run("last", func(t *testing.T) {
-		result := testReducer("last", 1, 2, 3000)
-		require.Equal(t, float64(3000), result)
-	})
-
-	t.Run("median odd amount of numbers", func(t *testing.T) {
-		result := testReducer("median", 1, 2, 3000)
-		require.Equal(t, float64(2), result)
-	})
-
-	t.Run("median even amount of numbers", func(t *testing.T) {
-		result := testReducer("median", 1, 2, 4, 3000)
-		require.Equal(t, float64(3), result)
-	})
-
-	t.Run("median with one values", func(t *testing.T) {
-		result := testReducer("median", 1)
-		require.Equal(t, float64(1), result)
-	})
-
-	t.Run("median should ignore null values", func(t *testing.T) {
-		reducer := newSimpleReducer("median")
-		series := legacydata.DataTimeSeries{
-			Name: "test time series",
-		}
-
-		series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFromPtr(nil), null.FloatFrom(1)})
-		series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFromPtr(nil), null.FloatFrom(2)})
-		series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFromPtr(nil), null.FloatFrom(3)})
-		series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFrom(float64(1)), null.FloatFrom(4)})
-		series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFrom(float64(2)), null.FloatFrom(5)})
-		series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFrom(float64(3)), null.FloatFrom(6)})
-
-		result := reducer.Reduce(series)
-		require.Equal(t, true, result.Valid)
-		require.Equal(t, float64(2), result.Float64)
-	})
-
-	t.Run("avg", func(t *testing.T) {
-		result := testReducer("avg", 1, 2, 3)
-		require.Equal(t, float64(2), result)
-	})
-
-	t.Run("avg with only nulls", func(t *testing.T) {
-		reducer := newSimpleReducer("avg")
-		series := legacydata.DataTimeSeries{
-			Name: "test time series",
-		}
-
-		series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFromPtr(nil), null.FloatFrom(1)})
-		require.Equal(t, false, reducer.Reduce(series).Valid)
-	})
-
-	t.Run("count_non_null", func(t *testing.T) {
-		t.Run("with null values and real values", func(t *testing.T) {
-			reducer := newSimpleReducer("count_non_null")
-			series := legacydata.DataTimeSeries{
-				Name: "test time series",
-			}
-
-			series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFromPtr(nil), null.FloatFrom(1)})
-			series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFromPtr(nil), null.FloatFrom(2)})
-			series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFrom(3), null.FloatFrom(3)})
-			series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFrom(3), null.FloatFrom(4)})
-
-			require.Equal(t, true, reducer.Reduce(series).Valid)
-			require.Equal(t, 2.0, reducer.Reduce(series).Float64)
-		})
-
-		t.Run("with null values", func(t *testing.T) {
-			reducer := newSimpleReducer("count_non_null")
-			series := legacydata.DataTimeSeries{
-				Name: "test time series",
-			}
-
-			series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFromPtr(nil), null.FloatFrom(1)})
-			series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFromPtr(nil), null.FloatFrom(2)})
-
-			require.Equal(t, false, reducer.Reduce(series).Valid)
-		})
-	})
-
-	t.Run("avg of number values and null values should ignore nulls", func(t *testing.T) {
-		reducer := newSimpleReducer("avg")
-		series := legacydata.DataTimeSeries{
-			Name: "test time series",
-		}
-
-		series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFrom(3), null.FloatFrom(1)})
-		series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFromPtr(nil), null.FloatFrom(2)})
-		series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFromPtr(nil), null.FloatFrom(3)})
-		series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFrom(3), null.FloatFrom(4)})
-
-		require.Equal(t, float64(3), reducer.Reduce(series).Float64)
-	})
-
-	// diff function Test Suite
-	t.Run("diff of one positive point", func(t *testing.T) {
-		result := testReducer("diff", 30)
-		require.Equal(t, float64(0), result)
-	})
-
-	t.Run("diff of one negative point", func(t *testing.T) {
-		result := testReducer("diff", -30)
-		require.Equal(t, float64(0), result)
-	})
-
-	t.Run("diff of two positive points[1]", func(t *testing.T) {
-		result := testReducer("diff", 30, 40)
-		require.Equal(t, float64(10), result)
-	})
-
-	t.Run("diff of two positive points[2]", func(t *testing.T) {
-		result := testReducer("diff", 30, 20)
-		require.Equal(t, float64(-10), result)
-	})
-
-	t.Run("diff of two negative points[1]", func(t *testing.T) {
-		result := testReducer("diff", -30, -40)
-		require.Equal(t, float64(-10), result)
-	})
-
-	t.Run("diff of two negative points[2]", func(t *testing.T) {
-		result := testReducer("diff", -30, -10)
-		require.Equal(t, float64(20), result)
-	})
-
-	t.Run("diff of one positive and one negative point", func(t *testing.T) {
-		result := testReducer("diff", 30, -40)
-		require.Equal(t, float64(-70), result)
-	})
-
-	t.Run("diff of one negative and one positive point", func(t *testing.T) {
-		result := testReducer("diff", -30, 40)
-		require.Equal(t, float64(70), result)
-	})
-
-	t.Run("diff of three positive points", func(t *testing.T) {
-		result := testReducer("diff", 30, 40, 50)
-		require.Equal(t, float64(20), result)
-	})
-
-	t.Run("diff of three negative points", func(t *testing.T) {
-		result := testReducer("diff", -30, -40, -50)
-		require.Equal(t, float64(-20), result)
-	})
-
-	t.Run("diff with only nulls", func(t *testing.T) {
-		reducer := newSimpleReducer("diff")
-		series := legacydata.DataTimeSeries{
-			Name: "test time series",
-		}
-
-		series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFromPtr(nil), null.FloatFrom(1)})
-		series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFromPtr(nil), null.FloatFrom(2)})
-
-		require.Equal(t, false, reducer.Reduce(series).Valid)
-	})
-
-	// diff_abs function Test Suite
-	t.Run("diff_abs of one positive point", func(t *testing.T) {
-		result := testReducer("diff_abs", 30)
-		require.Equal(t, float64(0), result)
-	})
-
-	t.Run("diff_abs of one negative point", func(t *testing.T) {
-		result := testReducer("diff_abs", -30)
-		require.Equal(t, float64(0), result)
-	})
-
-	t.Run("diff_abs of two positive points[1]", func(t *testing.T) {
-		result := testReducer("diff_abs", 30, 40)
-		require.Equal(t, float64(10), result)
-	})
-
-	t.Run("diff_abs of two positive points[2]", func(t *testing.T) {
-		result := testReducer("diff_abs", 30, 20)
-		require.Equal(t, float64(10), result)
-	})
-
-	t.Run("diff_abs of two negative points[1]", func(t *testing.T) {
-		result := testReducer("diff_abs", -30, -40)
-		require.Equal(t, float64(10), result)
-	})
-
-	t.Run("diff_abs of two negative points[2]", func(t *testing.T) {
-		result := testReducer("diff_abs", -30, -10)
-		require.Equal(t, float64(20), result)
-	})
-
-	t.Run("diff_abs of one positive and one negative point", func(t *testing.T) {
-		result := testReducer("diff_abs", 30, -40)
-		require.Equal(t, float64(70), result)
-	})
-
-	t.Run("diff_abs of one negative and one positive point", func(t *testing.T) {
-		result := testReducer("diff_abs", -30, 40)
-		require.Equal(t, float64(70), result)
-	})
-
-	t.Run("diff_abs of three positive points", func(t *testing.T) {
-		result := testReducer("diff_abs", 30, 40, 50)
-		require.Equal(t, float64(20), result)
-	})
-
-	t.Run("diff_abs of three negative points", func(t *testing.T) {
-		result := testReducer("diff_abs", -30, -40, -50)
-		require.Equal(t, float64(20), result)
-	})
-
-	t.Run("diff_abs with only nulls", func(t *testing.T) {
-		reducer := newSimpleReducer("diff_abs")
-		series := legacydata.DataTimeSeries{
-			Name: "test time series",
-		}
-
-		series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFromPtr(nil), null.FloatFrom(1)})
-		series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFromPtr(nil), null.FloatFrom(2)})
-
-		require.Equal(t, false, reducer.Reduce(series).Valid)
-	})
-
-	// percent_diff function Test Suite
-	t.Run("percent_diff of one positive point", func(t *testing.T) {
-		result := testReducer("percent_diff", 30)
-		require.Equal(t, float64(0), result)
-	})
-
-	t.Run("percent_diff of one negative point", func(t *testing.T) {
-		result := testReducer("percent_diff", -30)
-		require.Equal(t, float64(0), result)
-	})
-
-	t.Run("percent_diff of two positive points[1]", func(t *testing.T) {
-		result := testReducer("percent_diff", 30, 40)
-		require.Equal(t, float64(33.33333333333333), result)
-	})
-
-	t.Run("percent_diff of two positive points[2]", func(t *testing.T) {
-		result := testReducer("percent_diff", 30, 20)
-		require.Equal(t, float64(-33.33333333333333), result)
-	})
-
-	t.Run("percent_diff of two negative points[1]", func(t *testing.T) {
-		result := testReducer("percent_diff", -30, -40)
-		require.Equal(t, float64(-33.33333333333333), result)
-	})
-
-	t.Run("percent_diff of two negative points[2]", func(t *testing.T) {
-		result := testReducer("percent_diff", -30, -10)
-		require.Equal(t, float64(66.66666666666666), result)
-	})
-
-	t.Run("percent_diff of one positive and one negative point", func(t *testing.T) {
-		result := testReducer("percent_diff", 30, -40)
-		require.Equal(t, float64(-233.33333333333334), result)
-	})
-
-	t.Run("percent_diff of one negative and one positive point", func(t *testing.T) {
-		result := testReducer("percent_diff", -30, 40)
-		require.Equal(t, float64(233.33333333333334), result)
-	})
-
-	t.Run("percent_diff of three positive points", func(t *testing.T) {
-		result := testReducer("percent_diff", 30, 40, 50)
-		require.Equal(t, float64(66.66666666666666), result)
-	})
-
-	t.Run("percent_diff of three negative points", func(t *testing.T) {
-		result := testReducer("percent_diff", -30, -40, -50)
-		require.Equal(t, float64(-66.66666666666666), result)
-	})
-
-	t.Run("percent_diff with only nulls", func(t *testing.T) {
-		reducer := newSimpleReducer("percent_diff")
-		series := legacydata.DataTimeSeries{
-			Name: "test time series",
-		}
-
-		series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFromPtr(nil), null.FloatFrom(1)})
-		series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFromPtr(nil), null.FloatFrom(2)})
-
-		require.Equal(t, false, reducer.Reduce(series).Valid)
-	})
-
-	// percent_diff_abs function Test Suite
-	t.Run("percent_diff_abs_abs of one positive point", func(t *testing.T) {
-		result := testReducer("percent_diff_abs", 30)
-		require.Equal(t, float64(0), result)
-	})
-
-	t.Run("percent_diff_abs of one negative point", func(t *testing.T) {
-		result := testReducer("percent_diff_abs", -30)
-		require.Equal(t, float64(0), result)
-	})
-
-	t.Run("percent_diff_abs of two positive points[1]", func(t *testing.T) {
-		result := testReducer("percent_diff_abs", 30, 40)
-		require.Equal(t, float64(33.33333333333333), result)
-	})
-
-	t.Run("percent_diff_abs of two positive points[2]", func(t *testing.T) {
-		result := testReducer("percent_diff_abs", 30, 20)
-		require.Equal(t, float64(33.33333333333333), result)
-	})
-
-	t.Run("percent_diff_abs of two negative points[1]", func(t *testing.T) {
-		result := testReducer("percent_diff_abs", -30, -40)
-		require.Equal(t, float64(33.33333333333333), result)
-	})
-
-	t.Run("percent_diff_abs of two negative points[2]", func(t *testing.T) {
-		result := testReducer("percent_diff_abs", -30, -10)
-		require.Equal(t, float64(66.66666666666666), result)
-	})
-
-	t.Run("percent_diff_abs of one positive and one negative point", func(t *testing.T) {
-		result := testReducer("percent_diff_abs", 30, -40)
-		require.Equal(t, float64(233.33333333333334), result)
-	})
-
-	t.Run("percent_diff_abs of one negative and one positive point", func(t *testing.T) {
-		result := testReducer("percent_diff_abs", -30, 40)
-		require.Equal(t, float64(233.33333333333334), result)
-	})
-
-	t.Run("percent_diff_abs of three positive points", func(t *testing.T) {
-		result := testReducer("percent_diff_abs", 30, 40, 50)
-		require.Equal(t, float64(66.66666666666666), result)
-	})
-
-	t.Run("percent_diff_abs of three negative points", func(t *testing.T) {
-		result := testReducer("percent_diff_abs", -30, -40, -50)
-		require.Equal(t, float64(66.66666666666666), result)
-	})
-
-	t.Run("percent_diff_abs with only nulls", func(t *testing.T) {
-		reducer := newSimpleReducer("percent_diff_abs")
-		series := legacydata.DataTimeSeries{
-			Name: "test time series",
-		}
-
-		series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFromPtr(nil), null.FloatFrom(1)})
-		series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFromPtr(nil), null.FloatFrom(2)})
-
-		require.Equal(t, false, reducer.Reduce(series).Valid)
-	})
-
-	t.Run("min should work with NaNs", func(t *testing.T) {
-		result := testReducer("min", math.NaN(), math.NaN(), math.NaN())
-		require.Equal(t, float64(0), result)
-	})
-
-	t.Run("isValid should treat NaN as invalid", func(t *testing.T) {
-		result := isValid(null.FloatFrom(math.NaN()))
-		require.False(t, result)
-	})
-
-	t.Run("isValid should treat invalid null.Float as invalid", func(t *testing.T) {
-		result := isValid(null.FloatFromPtr(nil))
-		require.False(t, result)
-	})
-}
-
-func testReducer(reducerType string, datapoints ...float64) float64 {
-	reducer := newSimpleReducer(reducerType)
-	series := legacydata.DataTimeSeries{
-		Name: "test time series",
-	}
-
-	for idx := range datapoints {
-		series.Points = append(series.Points, legacydata.DataTimePoint{null.FloatFrom(datapoints[idx]), null.FloatFrom(1234134)})
-	}
-
-	return reducer.Reduce(series).Float64
-}
diff --git a/pkg/services/alerting/engine.go b/pkg/services/alerting/engine.go
deleted file mode 100644
index e81e7fadf1d71..0000000000000
--- a/pkg/services/alerting/engine.go
+++ /dev/null
@@ -1,288 +0,0 @@
-package alerting
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"time"
-
-	"github.com/benbjohnson/clock"
-	"github.com/prometheus/client_golang/prometheus"
-	"go.opentelemetry.io/otel/attribute"
-	"go.opentelemetry.io/otel/codes"
-	"golang.org/x/sync/errgroup"
-
-	"github.com/grafana/grafana/pkg/infra/localcache"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/infra/tracing"
-	"github.com/grafana/grafana/pkg/infra/usagestats"
-	"github.com/grafana/grafana/pkg/infra/usagestats/validator"
-	"github.com/grafana/grafana/pkg/services/annotations"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/datasources"
-	"github.com/grafana/grafana/pkg/services/encryption"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/services/rendering"
-	"github.com/grafana/grafana/pkg/services/validations"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/tsdb/legacydata"
-	"github.com/grafana/grafana/pkg/util/ticker"
-)
-
-// AlertEngine is the background process that
-// schedules alert evaluations and makes sure notifications
-// are sent.
-type AlertEngine struct {
-	RenderService    rendering.Service
-	RequestValidator validations.PluginRequestValidator
-	DataService      legacydata.RequestHandler
-	Cfg              *setting.Cfg
-
-	execQueue          chan *Job
-	ticker             *ticker.T
-	scheduler          scheduler
-	evalHandler        evalHandler
-	ruleReader         ruleReader
-	log                log.Logger
-	resultHandler      resultHandler
-	usageStatsService  usagestats.Service
-	validator          validator.Service
-	tracer             tracing.Tracer
-	AlertStore         AlertStore
-	dashAlertExtractor DashAlertExtractor
-	dashboardService   dashboards.DashboardService
-	datasourceService  datasources.DataSourceService
-	annotationsRepo    annotations.Repository
-}
-
-// IsDisabled returns true if the alerting service is disabled for this instance.
-func (e *AlertEngine) IsDisabled() bool {
-	return setting.AlertingEnabled == nil || !*setting.AlertingEnabled || !setting.ExecuteAlerts || e.Cfg.UnifiedAlerting.IsEnabled()
-}
-
-// ProvideAlertEngine returns a new AlertEngine.
-func ProvideAlertEngine(renderer rendering.Service, requestValidator validations.PluginRequestValidator,
-	dataService legacydata.RequestHandler, usageStatsService usagestats.Service, validator validator.Service, encryptionService encryption.Internal,
-	notificationService *notifications.NotificationService, tracer tracing.Tracer, store AlertStore, cfg *setting.Cfg,
-	dashAlertExtractor DashAlertExtractor, dashboardService dashboards.DashboardService, cacheService *localcache.CacheService, dsService datasources.DataSourceService, annotationsRepo annotations.Repository) *AlertEngine {
-	e := &AlertEngine{
-		Cfg:                cfg,
-		RenderService:      renderer,
-		RequestValidator:   requestValidator,
-		DataService:        dataService,
-		usageStatsService:  usageStatsService,
-		validator:          validator,
-		tracer:             tracer,
-		AlertStore:         store,
-		dashAlertExtractor: dashAlertExtractor,
-		dashboardService:   dashboardService,
-		datasourceService:  dsService,
-		annotationsRepo:    annotationsRepo,
-	}
-	e.execQueue = make(chan *Job, 1000)
-	e.scheduler = newScheduler()
-	e.evalHandler = NewEvalHandler(e.DataService)
-	e.ruleReader = newRuleReader(store)
-	e.log = log.New("alerting.engine")
-	e.resultHandler = newResultHandler(e.RenderService, store, notificationService, encryptionService.GetDecryptedValue)
-
-	e.registerUsageMetrics()
-
-	return e
-}
-
-// Run starts the alerting service background process.
-func (e *AlertEngine) Run(ctx context.Context) error {
-	reg := prometheus.WrapRegistererWithPrefix("legacy_", prometheus.DefaultRegisterer)
-	e.ticker = ticker.New(clock.New(), 1*time.Second, ticker.NewMetrics(reg, "alerting"))
-	defer e.ticker.Stop()
-	alertGroup, ctx := errgroup.WithContext(ctx)
-	alertGroup.Go(func() error { return e.alertingTicker(ctx) })
-	alertGroup.Go(func() error { return e.runJobDispatcher(ctx) })
-
-	err := alertGroup.Wait()
-	return err
-}
-
-func (e *AlertEngine) alertingTicker(grafanaCtx context.Context) error {
-	defer func() {
-		if err := recover(); err != nil {
-			e.log.Error("Scheduler Panic: stopping alertingTicker", "error", err, "stack", log.Stack(1))
-		}
-	}()
-
-	tickIndex := 0
-
-	for {
-		select {
-		case <-grafanaCtx.Done():
-			return grafanaCtx.Err()
-		case tick := <-e.ticker.C:
-			// TEMP SOLUTION update rules ever tenth tick
-			if tickIndex%10 == 0 {
-				e.scheduler.Update(e.ruleReader.fetch(grafanaCtx))
-			}
-
-			e.scheduler.Tick(tick, e.execQueue)
-			tickIndex++
-		}
-	}
-}
-
-func (e *AlertEngine) runJobDispatcher(grafanaCtx context.Context) error {
-	dispatcherGroup, alertCtx := errgroup.WithContext(grafanaCtx)
-
-	for {
-		select {
-		case <-grafanaCtx.Done():
-			return dispatcherGroup.Wait()
-		case job := <-e.execQueue:
-			dispatcherGroup.Go(func() error { return e.processJobWithRetry(alertCtx, job) })
-		}
-	}
-}
-
-var (
-	unfinishedWorkTimeout = time.Second * 5
-)
-
-func (e *AlertEngine) processJobWithRetry(grafanaCtx context.Context, job *Job) error {
-	defer func() {
-		if err := recover(); err != nil {
-			e.log.Error("Alert Panic", "error", err, "stack", log.Stack(1))
-		}
-	}()
-
-	cancelChan := make(chan context.CancelFunc, setting.AlertingMaxAttempts*2)
-	attemptChan := make(chan int, 1)
-
-	// Initialize with first attemptID=1
-	attemptChan <- 1
-	job.SetRunning(true)
-
-	for {
-		select {
-		case <-grafanaCtx.Done():
-			// In case grafana server context is cancel, let a chance to job processing
-			// to finish gracefully - by waiting a timeout duration - before forcing its end.
-			unfinishedWorkTimer := time.NewTimer(unfinishedWorkTimeout)
-			select {
-			case <-unfinishedWorkTimer.C:
-				return e.endJob(grafanaCtx.Err(), cancelChan, job)
-			case <-attemptChan:
-				return e.endJob(nil, cancelChan, job)
-			}
-		case attemptID, more := <-attemptChan:
-			if !more {
-				return e.endJob(nil, cancelChan, job)
-			}
-			go e.processJob(attemptID, attemptChan, cancelChan, job)
-		}
-	}
-}
-
-func (e *AlertEngine) endJob(err error, cancelChan chan context.CancelFunc, job *Job) error {
-	job.SetRunning(false)
-	close(cancelChan)
-	for cancelFn := range cancelChan {
-		cancelFn()
-	}
-	return err
-}
-
-func (e *AlertEngine) processJob(attemptID int, attemptChan chan int, cancelChan chan context.CancelFunc, job *Job) {
-	defer func() {
-		if err := recover(); err != nil {
-			e.log.Error("Alert Panic", "error", err, "stack", log.Stack(1))
-		}
-	}()
-
-	alertCtx, cancelFn := context.WithTimeout(context.Background(), setting.AlertingEvaluationTimeout)
-	cancelChan <- cancelFn
-	alertCtx, span := e.tracer.Start(alertCtx, "alert execution")
-	evalContext := NewEvalContext(alertCtx, job.Rule, e.RequestValidator, e.AlertStore, e.dashboardService, e.datasourceService, e.annotationsRepo)
-	evalContext.Ctx = alertCtx
-
-	go func() {
-		defer func() {
-			if err := recover(); err != nil {
-				e.log.Error("Alert Panic", "error", err, "stack", log.Stack(1))
-				span.SetStatus(codes.Error, "failed to execute alert rule. panic was recovered.")
-				span.RecordError(fmt.Errorf("%v", err))
-				span.End()
-				close(attemptChan)
-			}
-		}()
-
-		e.evalHandler.Eval(evalContext)
-
-		span.SetAttributes(
-			attribute.Int64("alertId", evalContext.Rule.ID),
-			attribute.Int64("dashboardId", evalContext.Rule.DashboardID),
-			attribute.Bool("firing", evalContext.Firing),
-			attribute.Bool("nodatapoints", evalContext.NoDataFound),
-			attribute.Int("attemptID", attemptID),
-		)
-
-		if evalContext.Error != nil {
-			span.SetStatus(codes.Error, "alerting execution attempt failed")
-			span.RecordError(evalContext.Error)
-
-			if attemptID < setting.AlertingMaxAttempts {
-				span.End()
-				e.log.Debug("Job Execution attempt triggered retry", "timeMs", evalContext.GetDurationMs(), "alertId", evalContext.Rule.ID, "name", evalContext.Rule.Name, "firing", evalContext.Firing, "attemptID", attemptID)
-				attemptChan <- (attemptID + 1)
-				return
-			}
-		}
-
-		// create new context with timeout for notifications
-		resultHandleCtx, resultHandleCancelFn := context.WithTimeout(context.Background(), setting.AlertingNotificationTimeout)
-		cancelChan <- resultHandleCancelFn
-
-		// override the context used for evaluation with a new context for notifications.
-		// This makes it possible for notifiers to execute when datasources
-		// don't respond within the timeout limit. We should rewrite this so notifications
-		// don't reuse the evalContext and get its own context.
-		evalContext.Ctx = resultHandleCtx
-		evalContext.Rule.State = evalContext.GetNewState()
-		if err := e.resultHandler.handle(evalContext); err != nil {
-			switch {
-			case errors.Is(err, context.Canceled):
-				e.log.Debug("Result handler returned context.Canceled")
-			case errors.Is(err, context.DeadlineExceeded):
-				e.log.Debug("Result handler returned context.DeadlineExceeded")
-			default:
-				e.log.Error("Failed to handle result", "err", err)
-			}
-		}
-
-		span.End()
-		e.log.Debug("Job Execution completed", "timeMs", evalContext.GetDurationMs(), "alertId", evalContext.Rule.ID, "name", evalContext.Rule.Name, "firing", evalContext.Firing, "attemptID", attemptID)
-		close(attemptChan)
-	}()
-}
-
-func (e *AlertEngine) registerUsageMetrics() {
-	e.usageStatsService.RegisterMetricsFunc(func(ctx context.Context) (map[string]interface{}, error) {
-		alertingUsageStats, err := e.QueryUsageStats(ctx)
-		if err != nil {
-			return nil, err
-		}
-
-		alertingOtherCount := 0
-		metrics := map[string]interface{}{}
-
-		for dsType, usageCount := range alertingUsageStats.DatasourceUsage {
-			if e.validator.ShouldBeReported(ctx, dsType) {
-				metrics[fmt.Sprintf("stats.alerting.ds.%s.count", dsType)] = usageCount
-			} else {
-				alertingOtherCount += usageCount
-			}
-		}
-
-		metrics["stats.alerting.ds.other.count"] = alertingOtherCount
-
-		return metrics, nil
-	})
-}
diff --git a/pkg/services/alerting/engine_integration_test.go b/pkg/services/alerting/engine_integration_test.go
deleted file mode 100644
index bc114528e7b36..0000000000000
--- a/pkg/services/alerting/engine_integration_test.go
+++ /dev/null
@@ -1,178 +0,0 @@
-package alerting
-
-import (
-	"context"
-	"errors"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/infra/localcache"
-	"github.com/grafana/grafana/pkg/infra/tracing"
-	"github.com/grafana/grafana/pkg/infra/usagestats"
-	"github.com/grafana/grafana/pkg/infra/usagestats/validator"
-	"github.com/grafana/grafana/pkg/services/annotations/annotationstest"
-	datasources "github.com/grafana/grafana/pkg/services/datasources/fakes"
-	encryptionprovider "github.com/grafana/grafana/pkg/services/encryption/provider"
-	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func TestIntegrationEngineTimeouts(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-
-	usMock := &usagestats.UsageStatsMock{T: t}
-	usValidatorMock := &validator.FakeUsageStatsValidator{}
-
-	encProvider := encryptionprovider.ProvideEncryptionProvider()
-	encService, err := encryptionservice.ProvideEncryptionService(encProvider, usMock, setting.NewCfg())
-	require.NoError(t, err)
-
-	tracer := tracing.InitializeTracerForTest()
-	dsMock := &datasources.FakeDataSourceService{}
-	annotationsRepo := annotationstest.NewFakeAnnotationsRepo()
-	engine := ProvideAlertEngine(nil, nil, nil, usMock, usValidatorMock, encService, nil, tracer, nil, setting.NewCfg(), nil, nil, localcache.New(time.Minute, time.Minute), dsMock, annotationsRepo)
-	setting.AlertingNotificationTimeout = 30 * time.Second
-	setting.AlertingMaxAttempts = 3
-	engine.resultHandler = &FakeResultHandler{}
-	job := &Job{running: true, Rule: &Rule{}}
-
-	t.Run("Should trigger as many retries as needed", func(t *testing.T) {
-		t.Run("pended alert for datasource -> result handler should be worked", func(t *testing.T) {
-			// reduce alert timeout to test quickly
-			setting.AlertingEvaluationTimeout = 30 * time.Second
-			transportTimeoutInterval := 2 * time.Second
-			serverBusySleepDuration := 1 * time.Second
-
-			evalHandler := NewFakeCommonTimeoutHandler(transportTimeoutInterval, serverBusySleepDuration)
-			resultHandler := NewFakeCommonTimeoutHandler(transportTimeoutInterval, serverBusySleepDuration)
-			engine.evalHandler = evalHandler
-			engine.resultHandler = resultHandler
-
-			err := engine.processJobWithRetry(context.Background(), job)
-			require.Nil(t, err)
-
-			require.Equal(t, true, evalHandler.EvalSucceed)
-			require.Equal(t, true, resultHandler.ResultHandleSucceed)
-
-			// initialize for other tests.
-			setting.AlertingEvaluationTimeout = 2 * time.Second
-			engine.resultHandler = &FakeResultHandler{}
-		})
-	})
-}
-
-type FakeCommonTimeoutHandler struct {
-	TransportTimeoutDuration time.Duration
-	ServerBusySleepDuration  time.Duration
-	EvalSucceed              bool
-	ResultHandleSucceed      bool
-}
-
-func NewFakeCommonTimeoutHandler(transportTimeoutDuration time.Duration, serverBusySleepDuration time.Duration) *FakeCommonTimeoutHandler {
-	return &FakeCommonTimeoutHandler{
-		TransportTimeoutDuration: transportTimeoutDuration,
-		ServerBusySleepDuration:  serverBusySleepDuration,
-		EvalSucceed:              false,
-		ResultHandleSucceed:      false,
-	}
-}
-
-func (handler *FakeCommonTimeoutHandler) Eval(evalContext *EvalContext) {
-	// 1. prepare mock server
-	path := "/evaltimeout"
-	srv := runBusyServer(path, handler.ServerBusySleepDuration)
-	defer srv.Close()
-
-	// 2. send requests
-	url := srv.URL + path
-	res, err := sendRequest(evalContext.Ctx, url, handler.TransportTimeoutDuration)
-	if res != nil {
-		defer func() {
-			if err := res.Body.Close(); err != nil {
-				logger.Warn("Error", "err", err)
-			}
-		}()
-	}
-
-	if err != nil {
-		evalContext.Error = errors.New("Fake evaluation timeout test failure")
-		return
-	}
-
-	if res.StatusCode == 200 {
-		handler.EvalSucceed = true
-	}
-
-	evalContext.Error = errors.New("Fake evaluation timeout test failure; wrong response")
-}
-
-func (handler *FakeCommonTimeoutHandler) handle(evalContext *EvalContext) error {
-	// 1. prepare mock server
-	path := "/resulthandle"
-	srv := runBusyServer(path, handler.ServerBusySleepDuration)
-	defer srv.Close()
-
-	// 2. send requests
-	url := srv.URL + path
-	res, err := sendRequest(evalContext.Ctx, url, handler.TransportTimeoutDuration)
-	if res != nil {
-		defer func() {
-			if err := res.Body.Close(); err != nil {
-				logger.Warn("Error", "err", err)
-			}
-		}()
-	}
-
-	if err != nil {
-		evalContext.Error = errors.New("Fake result handle timeout test failure")
-		return evalContext.Error
-	}
-
-	if res.StatusCode == 200 {
-		handler.ResultHandleSucceed = true
-		return nil
-	}
-
-	evalContext.Error = errors.New("Fake result handle timeout test failure; wrong response")
-
-	return evalContext.Error
-}
-
-func runBusyServer(path string, serverBusySleepDuration time.Duration) *httptest.Server {
-	mux := http.NewServeMux()
-	server := httptest.NewServer(mux)
-
-	mux.HandleFunc(path, func(w http.ResponseWriter, r *http.Request) {
-		time.Sleep(serverBusySleepDuration)
-	})
-
-	return server
-}
-
-func sendRequest(context context.Context, url string, transportTimeoutInterval time.Duration) (resp *http.Response, err error) {
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	req = req.WithContext(context)
-
-	transport := http.Transport{
-		Dial: (&net.Dialer{
-			Timeout:   transportTimeoutInterval,
-			KeepAlive: transportTimeoutInterval,
-		}).Dial,
-	}
-	client := http.Client{
-		Transport: &transport,
-	}
-
-	return client.Do(req)
-}
diff --git a/pkg/services/alerting/engine_test.go b/pkg/services/alerting/engine_test.go
deleted file mode 100644
index bcdd30ed15791..0000000000000
--- a/pkg/services/alerting/engine_test.go
+++ /dev/null
@@ -1,231 +0,0 @@
-package alerting
-
-import (
-	"context"
-	"errors"
-	"math"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/localcache"
-	"github.com/grafana/grafana/pkg/infra/tracing"
-	"github.com/grafana/grafana/pkg/infra/usagestats"
-	"github.com/grafana/grafana/pkg/infra/usagestats/validator"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/annotations/annotationstest"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/datasources"
-	fd "github.com/grafana/grafana/pkg/services/datasources/fakes"
-	encryptionprovider "github.com/grafana/grafana/pkg/services/encryption/provider"
-	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-type FakeEvalHandler struct {
-	SuccessCallID int // 0 means never success
-	CallNb        int
-}
-
-func NewFakeEvalHandler(successCallID int) *FakeEvalHandler {
-	return &FakeEvalHandler{
-		SuccessCallID: successCallID,
-		CallNb:        0,
-	}
-}
-
-func (handler *FakeEvalHandler) Eval(evalContext *EvalContext) {
-	handler.CallNb++
-	if handler.CallNb != handler.SuccessCallID {
-		evalContext.Error = errors.New("Fake evaluation failure")
-	}
-}
-
-type FakeResultHandler struct{}
-
-func (handler *FakeResultHandler) handle(evalContext *EvalContext) error {
-	return nil
-}
-
-// A mock implementation of the AlertStore interface, allowing to override certain methods individually
-type AlertStoreMock struct {
-	getAllAlerts                       func(context.Context, *models.GetAllAlertsQuery) ([]*models.Alert, error)
-	getAlertNotificationsWithUidToSend func(ctx context.Context, query *models.GetAlertNotificationsWithUidToSendQuery) ([]*models.AlertNotification, error)
-	getOrCreateNotificationState       func(ctx context.Context, query *models.GetOrCreateNotificationStateQuery) (*models.AlertNotificationState, error)
-}
-
-func (a *AlertStoreMock) GetAlertById(c context.Context, cmd *models.GetAlertByIdQuery) (res *models.Alert, err error) {
-	return nil, nil
-}
-
-func (a *AlertStoreMock) GetAllAlertQueryHandler(c context.Context, cmd *models.GetAllAlertsQuery) (res []*models.Alert, err error) {
-	if a.getAllAlerts != nil {
-		return a.getAllAlerts(c, cmd)
-	}
-	return nil, nil
-}
-
-func (a *AlertStoreMock) GetAlertNotificationUidWithId(c context.Context, query *models.GetAlertNotificationUidQuery) (res string, err error) {
-	return "", nil
-}
-
-func (a *AlertStoreMock) GetAlertNotificationsWithUidToSend(c context.Context, cmd *models.GetAlertNotificationsWithUidToSendQuery) (res []*models.AlertNotification, err error) {
-	if a.getAlertNotificationsWithUidToSend != nil {
-		return a.getAlertNotificationsWithUidToSend(c, cmd)
-	}
-	return nil, nil
-}
-
-func (a *AlertStoreMock) GetOrCreateAlertNotificationState(c context.Context, cmd *models.GetOrCreateNotificationStateQuery) (res *models.AlertNotificationState, err error) {
-	if a.getOrCreateNotificationState != nil {
-		return a.getOrCreateNotificationState(c, cmd)
-	}
-	return nil, nil
-}
-
-func (a *AlertStoreMock) GetDashboardUIDById(_ context.Context, _ *dashboards.GetDashboardRefByIDQuery) error {
-	return nil
-}
-
-func (a *AlertStoreMock) SetAlertNotificationStateToCompleteCommand(_ context.Context, _ *models.SetAlertNotificationStateToCompleteCommand) error {
-	return nil
-}
-
-func (a *AlertStoreMock) SetAlertNotificationStateToPendingCommand(_ context.Context, _ *models.SetAlertNotificationStateToPendingCommand) error {
-	return nil
-}
-
-func (a *AlertStoreMock) SetAlertState(_ context.Context, _ *models.SetAlertStateCommand) (res models.Alert, err error) {
-	return models.Alert{}, nil
-}
-
-func (a *AlertStoreMock) GetAlertStatesForDashboard(_ context.Context, _ *models.GetAlertStatesForDashboardQuery) (res []*models.AlertStateInfoDTO, err error) {
-	return nil, nil
-}
-
-func (a *AlertStoreMock) HandleAlertsQuery(context.Context, *models.GetAlertsQuery) (res []*models.AlertListItemDTO, err error) {
-	return nil, nil
-}
-
-func (a *AlertStoreMock) PauseAlert(context.Context, *models.PauseAlertCommand) error {
-	return nil
-}
-
-func (a *AlertStoreMock) PauseAllAlerts(context.Context, *models.PauseAllAlertCommand) error {
-	return nil
-}
-
-func TestEngineProcessJob(t *testing.T) {
-	usMock := &usagestats.UsageStatsMock{T: t}
-	usValidatorMock := &validator.FakeUsageStatsValidator{}
-
-	encProvider := encryptionprovider.ProvideEncryptionProvider()
-	encService, err := encryptionservice.ProvideEncryptionService(encProvider, usMock, setting.NewCfg())
-	require.NoError(t, err)
-	tracer := tracing.InitializeTracerForTest()
-
-	store := &AlertStoreMock{}
-	dsMock := &fd.FakeDataSourceService{
-		DataSources: []*datasources.DataSource{{ID: 1, Type: datasources.DS_PROMETHEUS}},
-	}
-	engine := ProvideAlertEngine(nil, nil, nil, usMock, usValidatorMock, encService, nil, tracer, store, setting.NewCfg(), nil, nil, localcache.New(time.Minute, time.Minute), dsMock, annotationstest.NewFakeAnnotationsRepo())
-	setting.AlertingEvaluationTimeout = 30 * time.Second
-	setting.AlertingNotificationTimeout = 30 * time.Second
-	setting.AlertingMaxAttempts = 3
-	engine.resultHandler = &FakeResultHandler{}
-	job := &Job{running: true, Rule: &Rule{}}
-
-	t.Run("Should register usage metrics func", func(t *testing.T) {
-		store.getAllAlerts = func(ctx context.Context, q *models.GetAllAlertsQuery) (res []*models.Alert, err error) {
-			settings, err := simplejson.NewJson([]byte(`{"conditions": [{"query": { "datasourceId": 1}}]}`))
-			if err != nil {
-				return nil, err
-			}
-			return []*models.Alert{{Settings: settings}}, nil
-		}
-
-		report, err := usMock.GetUsageReport(context.Background())
-		require.Nil(t, err)
-
-		require.Equal(t, 1, report.Metrics["stats.alerting.ds.prometheus.count"])
-		require.Equal(t, 0, report.Metrics["stats.alerting.ds.other.count"])
-	})
-
-	t.Run("Should trigger retry if needed", func(t *testing.T) {
-		t.Run("error + not last attempt -> retry", func(t *testing.T) {
-			engine.evalHandler = NewFakeEvalHandler(0)
-
-			for i := 1; i < setting.AlertingMaxAttempts; i++ {
-				attemptChan := make(chan int, 1)
-				cancelChan := make(chan context.CancelFunc, setting.AlertingMaxAttempts)
-
-				engine.processJob(i, attemptChan, cancelChan, job)
-				nextAttemptID, more := <-attemptChan
-
-				require.Equal(t, i+1, nextAttemptID)
-				require.Equal(t, true, more)
-				require.NotNil(t, <-cancelChan)
-			}
-		})
-
-		t.Run("error + last attempt -> no retry", func(t *testing.T) {
-			engine.evalHandler = NewFakeEvalHandler(0)
-			attemptChan := make(chan int, 1)
-			cancelChan := make(chan context.CancelFunc, setting.AlertingMaxAttempts)
-
-			engine.processJob(setting.AlertingMaxAttempts, attemptChan, cancelChan, job)
-			nextAttemptID, more := <-attemptChan
-
-			require.Equal(t, 0, nextAttemptID)
-			require.Equal(t, false, more)
-			require.NotNil(t, <-cancelChan)
-		})
-
-		t.Run("no error -> no retry", func(t *testing.T) {
-			engine.evalHandler = NewFakeEvalHandler(1)
-			attemptChan := make(chan int, 1)
-			cancelChan := make(chan context.CancelFunc, setting.AlertingMaxAttempts)
-
-			engine.processJob(1, attemptChan, cancelChan, job)
-			nextAttemptID, more := <-attemptChan
-
-			require.Equal(t, 0, nextAttemptID)
-			require.Equal(t, false, more)
-			require.NotNil(t, <-cancelChan)
-		})
-	})
-
-	t.Run("Should trigger as many retries as needed", func(t *testing.T) {
-		t.Run("never success -> max retries number", func(t *testing.T) {
-			expectedAttempts := setting.AlertingMaxAttempts
-			evalHandler := NewFakeEvalHandler(0)
-			engine.evalHandler = evalHandler
-
-			err := engine.processJobWithRetry(context.Background(), job)
-			require.Nil(t, err)
-			require.Equal(t, expectedAttempts, evalHandler.CallNb)
-		})
-
-		t.Run("always success -> never retry", func(t *testing.T) {
-			expectedAttempts := 1
-			evalHandler := NewFakeEvalHandler(1)
-			engine.evalHandler = evalHandler
-
-			err := engine.processJobWithRetry(context.Background(), job)
-			require.Nil(t, err)
-			require.Equal(t, expectedAttempts, evalHandler.CallNb)
-		})
-
-		t.Run("some errors before success -> some retries", func(t *testing.T) {
-			expectedAttempts := int(math.Ceil(float64(setting.AlertingMaxAttempts) / 2))
-			evalHandler := NewFakeEvalHandler(expectedAttempts)
-			engine.evalHandler = evalHandler
-
-			err := engine.processJobWithRetry(context.Background(), job)
-			require.Nil(t, err)
-			require.Equal(t, expectedAttempts, evalHandler.CallNb)
-		})
-	})
-}
diff --git a/pkg/services/alerting/eval_context.go b/pkg/services/alerting/eval_context.go
deleted file mode 100644
index 452a1e0eb3861..0000000000000
--- a/pkg/services/alerting/eval_context.go
+++ /dev/null
@@ -1,281 +0,0 @@
-package alerting
-
-import (
-	"context"
-	"fmt"
-	"regexp"
-	"time"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	alertmodels "github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/annotations"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/datasources"
-	"github.com/grafana/grafana/pkg/services/validations"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-// EvalContext is the context object for an alert evaluation.
-type EvalContext struct {
-	Firing         bool
-	IsTestRun      bool
-	IsDebug        bool
-	EvalMatches    []*EvalMatch
-	AllMatches     []*EvalMatch
-	Logs           []*ResultLogEntry
-	Error          error
-	ConditionEvals string
-	StartTime      time.Time
-	EndTime        time.Time
-	Rule           *Rule
-	Log            log.Logger
-
-	dashboardRef *dashboards.DashboardRef
-
-	ImagePublicURL  string
-	ImageOnDiskPath string
-	NoDataFound     bool
-	PrevAlertState  alertmodels.AlertStateType
-
-	RequestValidator validations.PluginRequestValidator
-
-	Ctx context.Context
-
-	Store             AlertStore
-	dashboardService  dashboards.DashboardService
-	DatasourceService datasources.DataSourceService
-	annotationRepo    annotations.Repository
-}
-
-// NewEvalContext is the EvalContext constructor.
-func NewEvalContext(alertCtx context.Context, rule *Rule, requestValidator validations.PluginRequestValidator,
-	alertStore AlertStore, dashboardService dashboards.DashboardService, dsService datasources.DataSourceService, annotationRepo annotations.Repository) *EvalContext {
-	return &EvalContext{
-		Ctx:               alertCtx,
-		StartTime:         time.Now(),
-		Rule:              rule,
-		Logs:              make([]*ResultLogEntry, 0),
-		EvalMatches:       make([]*EvalMatch, 0),
-		AllMatches:        make([]*EvalMatch, 0),
-		Log:               log.New("alerting.evalContext"),
-		PrevAlertState:    rule.State,
-		RequestValidator:  requestValidator,
-		Store:             alertStore,
-		dashboardService:  dashboardService,
-		DatasourceService: dsService,
-		annotationRepo:    annotationRepo,
-	}
-}
-
-// StateDescription contains visual information about the alert state.
-type StateDescription struct {
-	Color string
-	Text  string
-	Data  string
-}
-
-// GetStateModel returns the `StateDescription` based on current state.
-func (c *EvalContext) GetStateModel() *StateDescription {
-	switch c.Rule.State {
-	case alertmodels.AlertStateOK:
-		return &StateDescription{
-			Color: "#36a64f",
-			Text:  "OK",
-		}
-	case alertmodels.AlertStateNoData:
-		return &StateDescription{
-			Color: "#888888",
-			Text:  "No Data",
-		}
-	case alertmodels.AlertStateAlerting:
-		return &StateDescription{
-			Color: "#D63232",
-			Text:  "Alerting",
-		}
-	case alertmodels.AlertStateUnknown:
-		return &StateDescription{
-			Color: "#888888",
-			Text:  "Unknown",
-		}
-	default:
-		panic("Unknown rule state for alert " + c.Rule.State)
-	}
-}
-
-func (c *EvalContext) shouldUpdateAlertState() bool {
-	return c.Rule.State != c.PrevAlertState
-}
-
-// GetDurationMs returns the duration of the alert evaluation.
-func (c *EvalContext) GetDurationMs() float64 {
-	return float64(c.EndTime.Sub(c.StartTime).Nanoseconds()) / float64(time.Millisecond)
-}
-
-// GetNotificationTitle returns the title of the alert rule including alert state.
-func (c *EvalContext) GetNotificationTitle() string {
-	return "[" + c.GetStateModel().Text + "] " + c.Rule.Name
-}
-
-// GetDashboardUID returns the dashboard uid for the alert rule.
-func (c *EvalContext) GetDashboardUID() (*dashboards.DashboardRef, error) {
-	if c.dashboardRef != nil {
-		return c.dashboardRef, nil
-	}
-
-	uidQuery := &dashboards.GetDashboardRefByIDQuery{ID: c.Rule.DashboardID}
-	uidQueryResult, err := c.dashboardService.GetDashboardUIDByID(c.Ctx, uidQuery)
-	if err != nil {
-		return nil, err
-	}
-
-	c.dashboardRef = uidQueryResult
-	return c.dashboardRef, nil
-}
-
-const urlFormat = "%s?tab=alert&viewPanel=%d&orgId=%d"
-
-// GetRuleURL returns the url to the dashboard containing the alert.
-func (c *EvalContext) GetRuleURL() (string, error) {
-	if c.IsTestRun {
-		return setting.AppUrl, nil
-	}
-
-	ref, err := c.GetDashboardUID()
-	if err != nil {
-		return "", err
-	}
-	return fmt.Sprintf(urlFormat, dashboards.GetFullDashboardURL(ref.UID, ref.Slug), c.Rule.PanelID, c.Rule.OrgID), nil
-}
-
-// GetNewState returns the new state from the alert rule evaluation.
-func (c *EvalContext) GetNewState() alertmodels.AlertStateType {
-	ns := getNewStateInternal(c)
-	if ns != alertmodels.AlertStateAlerting || c.Rule.For == 0 {
-		return ns
-	}
-
-	since := time.Since(c.Rule.LastStateChange)
-	if c.PrevAlertState == alertmodels.AlertStatePending && since > c.Rule.For {
-		return alertmodels.AlertStateAlerting
-	}
-
-	if c.PrevAlertState == alertmodels.AlertStateAlerting {
-		return alertmodels.AlertStateAlerting
-	}
-
-	return alertmodels.AlertStatePending
-}
-
-func getNewStateInternal(c *EvalContext) alertmodels.AlertStateType {
-	if c.Error != nil {
-		c.Log.Error("Alert Rule Result Error",
-			"ruleId", c.Rule.ID,
-			"name", c.Rule.Name,
-			"error", c.Error,
-			"changing state to", c.Rule.ExecutionErrorState.ToAlertState())
-
-		if c.Rule.ExecutionErrorState == alertmodels.ExecutionErrorKeepState {
-			return c.PrevAlertState
-		}
-		return c.Rule.ExecutionErrorState.ToAlertState()
-	}
-
-	if c.Firing {
-		return alertmodels.AlertStateAlerting
-	}
-
-	if c.NoDataFound {
-		c.Log.Info("Alert Rule returned no data",
-			"ruleId", c.Rule.ID,
-			"name", c.Rule.Name,
-			"changing state to", c.Rule.NoDataState.ToAlertState())
-
-		if c.Rule.NoDataState == alertmodels.NoDataKeepState {
-			return c.PrevAlertState
-		}
-		return c.Rule.NoDataState.ToAlertState()
-	}
-
-	return alertmodels.AlertStateOK
-}
-
-// evaluateNotificationTemplateFields will treat the alert evaluation rule's name and message fields as
-// templates, and evaluate the templates using data from the alert evaluation's tags
-func (c *EvalContext) evaluateNotificationTemplateFields() error {
-	matches := c.getTemplateMatches()
-	if len(matches) < 1 {
-		// if there are no series to parse the templates with, return
-		return nil
-	}
-
-	templateDataMap, err := buildTemplateDataMap(matches)
-	if err != nil {
-		return err
-	}
-
-	ruleMsg, err := evaluateTemplate(c.Rule.Message, templateDataMap)
-	if err != nil {
-		return err
-	}
-	c.Rule.Message = ruleMsg
-
-	ruleName, err := evaluateTemplate(c.Rule.Name, templateDataMap)
-	if err != nil {
-		return err
-	}
-	c.Rule.Name = ruleName
-
-	return nil
-}
-
-func (c *EvalContext) GetDataSource(ctx context.Context, q *datasources.GetDataSourceQuery) (*datasources.DataSource, error) {
-	return c.DatasourceService.GetDataSource(ctx, q)
-}
-
-// getTemplateMatches returns the values we should use to parse the templates
-func (c *EvalContext) getTemplateMatches() []*EvalMatch {
-	// EvalMatches represent series violating the rule threshold,
-	// if we have any, this means the alert is firing and we should use this data to parse the templates.
-	if len(c.EvalMatches) > 0 {
-		return c.EvalMatches
-	}
-
-	// If we don't have any alerting values, use all values to parse the templates.
-	return c.AllMatches
-}
-
-func evaluateTemplate(s string, m map[string]string) (string, error) {
-	for k, v := range m {
-		re, err := regexp.Compile(fmt.Sprintf(`\${%s}`, regexp.QuoteMeta(k)))
-		if err != nil {
-			return "", err
-		}
-		s = re.ReplaceAllString(s, v)
-	}
-
-	return s, nil
-}
-
-// buildTemplateDataMap builds a map of alert evaluation tag names to a set of associated values (comma separated)
-func buildTemplateDataMap(evalMatches []*EvalMatch) (map[string]string, error) {
-	var result = map[string]string{}
-	for _, match := range evalMatches {
-		for tagName, tagValue := range match.Tags {
-			// skip duplicate values
-			rVal, err := regexp.Compile(fmt.Sprintf(`\b%s\b`, regexp.QuoteMeta(tagValue)))
-			if err != nil {
-				return nil, err
-			}
-			rMatch := rVal.FindString(result[tagName])
-			if len(rMatch) > 0 {
-				continue
-			}
-			if _, exists := result[tagName]; exists {
-				result[tagName] = fmt.Sprintf("%s, %s", result[tagName], tagValue)
-			} else {
-				result[tagName] = tagValue
-			}
-		}
-	}
-	return result, nil
-}
diff --git a/pkg/services/alerting/eval_context_test.go b/pkg/services/alerting/eval_context_test.go
deleted file mode 100644
index d717dc5c4b4da..0000000000000
--- a/pkg/services/alerting/eval_context_test.go
+++ /dev/null
@@ -1,421 +0,0 @@
-package alerting
-
-import (
-	"context"
-	"errors"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/annotations/annotationstest"
-	"github.com/grafana/grafana/pkg/services/validations"
-)
-
-func TestStateIsUpdatedWhenNeeded(t *testing.T) {
-	ctx := NewEvalContext(context.Background(), &Rule{Conditions: []Condition{&conditionStub{firing: true}}}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-
-	t.Run("ok -> alerting", func(t *testing.T) {
-		ctx.PrevAlertState = models.AlertStateOK
-		ctx.Rule.State = models.AlertStateAlerting
-
-		if !ctx.shouldUpdateAlertState() {
-			t.Fatalf("expected should updated to be true")
-		}
-	})
-
-	t.Run("ok -> ok", func(t *testing.T) {
-		ctx.PrevAlertState = models.AlertStateOK
-		ctx.Rule.State = models.AlertStateOK
-
-		if ctx.shouldUpdateAlertState() {
-			t.Fatalf("expected should updated to be false")
-		}
-	})
-}
-
-func TestGetStateFromEvalContext(t *testing.T) {
-	tcs := []struct {
-		name     string
-		expected models.AlertStateType
-		applyFn  func(ec *EvalContext)
-	}{
-		{
-			name:     "ok -> alerting",
-			expected: models.AlertStateAlerting,
-			applyFn: func(ec *EvalContext) {
-				ec.Firing = true
-				ec.PrevAlertState = models.AlertStateOK
-			},
-		},
-		{
-			name:     "ok -> error(alerting)",
-			expected: models.AlertStateAlerting,
-			applyFn: func(ec *EvalContext) {
-				ec.PrevAlertState = models.AlertStateOK
-				ec.Error = errors.New("test error")
-				ec.Rule.ExecutionErrorState = models.ExecutionErrorSetAlerting
-			},
-		},
-		{
-			name:     "ok -> pending. since its been firing for less than FOR",
-			expected: models.AlertStatePending,
-			applyFn: func(ec *EvalContext) {
-				ec.PrevAlertState = models.AlertStateOK
-				ec.Firing = true
-				ec.Rule.LastStateChange = time.Now().Add(-time.Minute * 2)
-				ec.Rule.For = time.Minute * 5
-			},
-		},
-		{
-			name:     "ok -> pending. since it has to be pending longer than FOR and prev state is ok",
-			expected: models.AlertStatePending,
-			applyFn: func(ec *EvalContext) {
-				ec.PrevAlertState = models.AlertStateOK
-				ec.Firing = true
-				ec.Rule.LastStateChange = time.Now().Add(-(time.Hour * 5))
-				ec.Rule.For = time.Minute * 2
-			},
-		},
-		{
-			name:     "pending -> alerting. since its been firing for more than FOR and prev state is pending",
-			expected: models.AlertStateAlerting,
-			applyFn: func(ec *EvalContext) {
-				ec.PrevAlertState = models.AlertStatePending
-				ec.Firing = true
-				ec.Rule.LastStateChange = time.Now().Add(-(time.Hour * 5))
-				ec.Rule.For = time.Minute * 2
-			},
-		},
-		{
-			name:     "alerting -> alerting. should not update regardless of FOR",
-			expected: models.AlertStateAlerting,
-			applyFn: func(ec *EvalContext) {
-				ec.PrevAlertState = models.AlertStatePending
-				ec.Firing = true
-				ec.Rule.LastStateChange = time.Now().Add(-time.Minute * 5)
-				ec.Rule.For = time.Minute * 2
-			},
-		},
-		{
-			name:     "ok -> ok. should not update regardless of FOR",
-			expected: models.AlertStateOK,
-			applyFn: func(ec *EvalContext) {
-				ec.PrevAlertState = models.AlertStateOK
-				ec.Rule.LastStateChange = time.Now().Add(-time.Minute * 5)
-				ec.Rule.For = time.Minute * 2
-			},
-		},
-		{
-			name:     "ok -> error(keep_last)",
-			expected: models.AlertStateOK,
-			applyFn: func(ec *EvalContext) {
-				ec.PrevAlertState = models.AlertStateOK
-				ec.Error = errors.New("test error")
-				ec.Rule.ExecutionErrorState = models.ExecutionErrorKeepState
-			},
-		},
-		{
-			name:     "pending -> error(keep_last)",
-			expected: models.AlertStatePending,
-			applyFn: func(ec *EvalContext) {
-				ec.PrevAlertState = models.AlertStatePending
-				ec.Error = errors.New("test error")
-				ec.Rule.ExecutionErrorState = models.ExecutionErrorKeepState
-			},
-		},
-		{
-			name:     "ok -> no_data(alerting)",
-			expected: models.AlertStateAlerting,
-			applyFn: func(ec *EvalContext) {
-				ec.PrevAlertState = models.AlertStateOK
-				ec.Rule.NoDataState = models.NoDataSetAlerting
-				ec.NoDataFound = true
-			},
-		},
-		{
-			name:     "ok -> no_data(keep_last)",
-			expected: models.AlertStateOK,
-			applyFn: func(ec *EvalContext) {
-				ec.PrevAlertState = models.AlertStateOK
-				ec.Rule.NoDataState = models.NoDataKeepState
-				ec.NoDataFound = true
-			},
-		},
-		{
-			name:     "pending -> no_data(keep_last)",
-			expected: models.AlertStatePending,
-			applyFn: func(ec *EvalContext) {
-				ec.PrevAlertState = models.AlertStatePending
-				ec.Rule.NoDataState = models.NoDataKeepState
-				ec.NoDataFound = true
-			},
-		},
-		{
-			name:     "pending -> no_data(alerting) with for duration have not passed",
-			expected: models.AlertStatePending,
-			applyFn: func(ec *EvalContext) {
-				ec.PrevAlertState = models.AlertStatePending
-				ec.Rule.NoDataState = models.NoDataSetAlerting
-				ec.NoDataFound = true
-				ec.Rule.For = time.Minute * 5
-				ec.Rule.LastStateChange = time.Now().Add(-time.Minute * 2)
-			},
-		},
-		{
-			name:     "pending -> no_data(alerting) should set alerting since time passed FOR",
-			expected: models.AlertStateAlerting,
-			applyFn: func(ec *EvalContext) {
-				ec.PrevAlertState = models.AlertStatePending
-				ec.Rule.NoDataState = models.NoDataSetAlerting
-				ec.NoDataFound = true
-				ec.Rule.For = time.Minute * 2
-				ec.Rule.LastStateChange = time.Now().Add(-time.Minute * 5)
-			},
-		},
-		{
-			name:     "pending -> error(alerting) with for duration have not passed ",
-			expected: models.AlertStatePending,
-			applyFn: func(ec *EvalContext) {
-				ec.PrevAlertState = models.AlertStatePending
-				ec.Rule.ExecutionErrorState = models.ExecutionErrorSetAlerting
-				ec.Error = errors.New("test error")
-				ec.Rule.For = time.Minute * 5
-				ec.Rule.LastStateChange = time.Now().Add(-time.Minute * 2)
-			},
-		},
-		{
-			name:     "pending -> error(alerting) should set alerting since time passed FOR",
-			expected: models.AlertStateAlerting,
-			applyFn: func(ec *EvalContext) {
-				ec.PrevAlertState = models.AlertStatePending
-				ec.Rule.ExecutionErrorState = models.ExecutionErrorSetAlerting
-				ec.Error = errors.New("test error")
-				ec.Rule.For = time.Minute * 2
-				ec.Rule.LastStateChange = time.Now().Add(-time.Minute * 5)
-			},
-		},
-	}
-
-	for _, tc := range tcs {
-		evalContext := NewEvalContext(context.Background(), &Rule{Conditions: []Condition{&conditionStub{firing: true}}}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-
-		tc.applyFn(evalContext)
-		newState := evalContext.GetNewState()
-		assert.Equal(t, tc.expected, newState, "failed: %s \n expected '%s' have '%s'\n", tc.name, tc.expected, string(newState))
-	}
-}
-
-func TestBuildTemplateDataMap(t *testing.T) {
-	tcs := []struct {
-		name     string
-		matches  []*EvalMatch
-		expected map[string]string
-	}{
-		{
-			name: "single match",
-			matches: []*EvalMatch{
-				{
-					Tags: map[string]string{
-						"InstanceId": "i-123456789",
-						"Percentile": "0.999",
-					},
-				},
-			},
-			expected: map[string]string{
-				"InstanceId": "i-123456789",
-				"Percentile": "0.999",
-			},
-		},
-		{
-			name: "matches with duplicate keys",
-			matches: []*EvalMatch{
-				{
-					Tags: map[string]string{
-						"InstanceId": "i-123456789",
-					},
-				},
-				{
-					Tags: map[string]string{
-						"InstanceId": "i-987654321",
-						"Percentile": "0.999",
-					},
-				},
-			},
-			expected: map[string]string{
-				"InstanceId": "i-123456789, i-987654321",
-				"Percentile": "0.999",
-			},
-		},
-		{
-			name: "matches with duplicate keys and values",
-			matches: []*EvalMatch{
-				{
-					Tags: map[string]string{
-						"InstanceId": "i-123456789",
-						"Percentile": "0.999",
-					},
-				},
-				{
-					Tags: map[string]string{
-						"InstanceId": "i-987654321",
-						"Percentile": "0.995",
-					},
-				},
-				{
-					Tags: map[string]string{
-						"InstanceId": "i-987654321",
-						"Percentile": "0.999",
-					},
-				},
-			},
-			expected: map[string]string{
-				"InstanceId": "i-123456789, i-987654321",
-				"Percentile": "0.999, 0.995",
-			},
-		},
-		{
-			name: "a value and its substring for same key",
-			matches: []*EvalMatch{
-				{
-					Tags: map[string]string{
-						"Percentile": "0.9990",
-					},
-				},
-				{
-					Tags: map[string]string{
-						"Percentile": "0.999",
-					},
-				},
-			},
-			expected: map[string]string{
-				"Percentile": "0.9990, 0.999",
-			},
-		},
-	}
-
-	for _, tc := range tcs {
-		t.Run(tc.name, func(t *testing.T) {
-			result, err := buildTemplateDataMap(tc.matches)
-			require.NoError(t, err)
-			assert.Equal(t, tc.expected, result, "failed: %s \n expected '%s' have '%s'\n", tc.name, tc.expected, result)
-		})
-	}
-}
-
-func TestEvaluateTemplate(t *testing.T) {
-	tcs := []struct {
-		name     string
-		message  string
-		data     map[string]string
-		expected string
-	}{
-		{
-			name:    "matching terms",
-			message: "Degraded ${percentile} latency on ${instance}",
-			data: map[string]string{
-				"instance":   "i-123456789",
-				"percentile": "0.95",
-			},
-			expected: "Degraded 0.95 latency on i-123456789",
-		},
-		{
-			name:    "non-matching terms",
-			message: "Degraded $percentile latency for endpoint ${ endpoint } on ${instance}",
-			data: map[string]string{
-				"INSTANCE":   "i-123456789",
-				"percentile": "0.95",
-				"endpoint":   "/api/dashboard/123",
-			},
-			expected: "Degraded $percentile latency for endpoint ${ endpoint } on ${instance}",
-		},
-	}
-	for _, tc := range tcs {
-		t.Run(tc.name, func(t *testing.T) {
-			result, err := evaluateTemplate(tc.message, tc.data)
-			require.NoError(t, err)
-			assert.Equal(t, tc.expected, result, "failed: %s \n expected '%s' have '%s'\n", tc.name, tc.expected, result)
-		})
-	}
-}
-
-func TestEvaluateNotificationTemplateFields(t *testing.T) {
-	tests := []struct {
-		name            string
-		evalMatches     []*EvalMatch
-		allMatches      []*EvalMatch
-		expectedName    string
-		expectedMessage string
-	}{
-		{
-			"with evaluation matches",
-			[]*EvalMatch{{
-				Tags: map[string]string{"value1": "test1", "value2": "test2"},
-			}},
-			[]*EvalMatch{{
-				Tags: map[string]string{"value1": "test1", "value2": "test2"},
-			}},
-			"Rule name: test1",
-			"Rule message: test2",
-		},
-		{
-			"missing key",
-			[]*EvalMatch{{
-				Tags: map[string]string{"value1": "test1", "value3": "test2"},
-			}},
-			[]*EvalMatch{{
-				Tags: map[string]string{"value1": "test1", "value3": "test2"},
-			}},
-			"Rule name: test1",
-			"Rule message: ${value2}",
-		},
-		{
-			"no evaluation matches, with series",
-			[]*EvalMatch{},
-			[]*EvalMatch{{
-				Tags: map[string]string{"value1": "test1", "value2": "test2"},
-			}},
-			"Rule name: test1",
-			"Rule message: test2",
-		},
-		{
-			"no evaluation matches, no series",
-			[]*EvalMatch{},
-			[]*EvalMatch{},
-			"Rule name: ${value1}",
-			"Rule message: ${value2}",
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(tt *testing.T) {
-			evalContext := NewEvalContext(context.Background(), &Rule{Name: "Rule name: ${value1}", Message: "Rule message: ${value2}",
-				Conditions: []Condition{&conditionStub{firing: true}}}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-			evalContext.EvalMatches = test.evalMatches
-			evalContext.AllMatches = test.allMatches
-
-			err := evalContext.evaluateNotificationTemplateFields()
-
-			require.NoError(tt, err)
-			require.Equal(tt, test.expectedName, evalContext.Rule.Name)
-			require.Equal(tt, test.expectedMessage, evalContext.Rule.Message)
-		})
-	}
-}
-
-func TestGetDurationFromEvalContext(t *testing.T) {
-	startTime, err := time.Parse("2006-01-02 15:04:05.999999999 -0700 MST", "2022-10-03 11:33:14.438803 +0200 CEST")
-	require.NoError(t, err)
-
-	endTime, err := time.Parse("2006-01-02 15:04:05.999999999 -0700 MST", "2022-10-03 11:33:15.291075 +0200 CEST")
-	require.NoError(t, err)
-
-	evalContext := EvalContext{
-		StartTime: startTime,
-		EndTime:   endTime,
-	}
-
-	assert.Equal(t, float64(852.272), evalContext.GetDurationMs())
-}
diff --git a/pkg/services/alerting/eval_handler.go b/pkg/services/alerting/eval_handler.go
deleted file mode 100644
index f516d0718e67e..0000000000000
--- a/pkg/services/alerting/eval_handler.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package alerting
-
-import (
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/infra/metrics"
-	"github.com/grafana/grafana/pkg/tsdb/legacydata"
-)
-
-// DefaultEvalHandler is responsible for evaluating the alert rule.
-type DefaultEvalHandler struct {
-	log             log.Logger
-	alertJobTimeout time.Duration
-	requestHandler  legacydata.RequestHandler
-}
-
-// NewEvalHandler is the `DefaultEvalHandler` constructor.
-func NewEvalHandler(requestHandler legacydata.RequestHandler) *DefaultEvalHandler {
-	return &DefaultEvalHandler{
-		log:             log.New("alerting.evalHandler"),
-		alertJobTimeout: time.Second * 5,
-		requestHandler:  requestHandler,
-	}
-}
-
-// Eval evaluated the alert rule.
-func (e *DefaultEvalHandler) Eval(context *EvalContext) {
-	firing := true
-	noDataFound := true
-	conditionEvals := ""
-
-	for i := 0; i < len(context.Rule.Conditions); i++ {
-		condition := context.Rule.Conditions[i]
-		cr, err := condition.Eval(context, e.requestHandler)
-		if err != nil {
-			context.Error = err
-		}
-
-		// break if condition could not be evaluated
-		if context.Error != nil {
-			break
-		}
-
-		if i == 0 {
-			firing = cr.Firing
-			noDataFound = cr.NoDataFound
-		}
-
-		// calculating Firing based on operator
-		if cr.Operator == "or" {
-			firing = firing || cr.Firing
-		} else {
-			firing = firing && cr.Firing
-		}
-
-		// We cannot evaluate the expression when one or more conditions are missing data
-		// and so noDataFound should be true if at least one condition returns no data,
-		// irrespective of the operator.
-		noDataFound = noDataFound || cr.NoDataFound
-
-		if i > 0 {
-			conditionEvals = "[" + conditionEvals + " " + strings.ToUpper(cr.Operator) + " " + strconv.FormatBool(cr.Firing) + "]"
-		} else {
-			conditionEvals = strconv.FormatBool(firing)
-		}
-
-		context.EvalMatches = append(context.EvalMatches, cr.EvalMatches...)
-		context.AllMatches = append(context.AllMatches, cr.AllMatches...)
-	}
-
-	context.ConditionEvals = conditionEvals + " = " + strconv.FormatBool(firing)
-	context.Firing = firing
-	context.NoDataFound = noDataFound
-	context.EndTime = time.Now()
-
-	elapsedTime := context.EndTime.Sub(context.StartTime).Nanoseconds() / int64(time.Millisecond)
-	metrics.MAlertingExecutionTime.Observe(float64(elapsedTime))
-}
diff --git a/pkg/services/alerting/eval_handler_test.go b/pkg/services/alerting/eval_handler_test.go
deleted file mode 100644
index df12cd335e291..0000000000000
--- a/pkg/services/alerting/eval_handler_test.go
+++ /dev/null
@@ -1,208 +0,0 @@
-package alerting
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/services/annotations/annotationstest"
-	"github.com/grafana/grafana/pkg/services/validations"
-	"github.com/grafana/grafana/pkg/tsdb/legacydata"
-)
-
-type conditionStub struct {
-	firing   bool
-	operator string
-	matches  []*EvalMatch
-	noData   bool
-}
-
-func (c *conditionStub) Eval(context *EvalContext, reqHandler legacydata.RequestHandler) (*ConditionResult, error) {
-	return &ConditionResult{Firing: c.firing, EvalMatches: c.matches, Operator: c.operator, NoDataFound: c.noData}, nil
-}
-
-func TestAlertingEvaluationHandler(t *testing.T) {
-	handler := NewEvalHandler(nil)
-
-	t.Run("Show return triggered with single passing condition", func(t *testing.T) {
-		context := NewEvalContext(context.Background(), &Rule{
-			Conditions: []Condition{&conditionStub{
-				firing: true,
-			}},
-		}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-
-		handler.Eval(context)
-		require.Equal(t, true, context.Firing)
-		require.Equal(t, "true = true", context.ConditionEvals)
-	})
-
-	t.Run("Show return triggered with single passing condition2", func(t *testing.T) {
-		context := NewEvalContext(context.Background(), &Rule{
-			Conditions: []Condition{&conditionStub{firing: true, operator: "and"}},
-		}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-
-		handler.Eval(context)
-		require.Equal(t, true, context.Firing)
-		require.Equal(t, "true = true", context.ConditionEvals)
-	})
-
-	t.Run("Show return false with not passing asdf", func(t *testing.T) {
-		context := NewEvalContext(context.Background(), &Rule{
-			Conditions: []Condition{
-				&conditionStub{firing: true, operator: "and", matches: []*EvalMatch{{}, {}}},
-				&conditionStub{firing: false, operator: "and"},
-			},
-		}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-
-		handler.Eval(context)
-		require.Equal(t, false, context.Firing)
-		require.Equal(t, "[true AND false] = false", context.ConditionEvals)
-	})
-
-	t.Run("Show return true if any of the condition is passing with OR operator", func(t *testing.T) {
-		context := NewEvalContext(context.Background(), &Rule{
-			Conditions: []Condition{
-				&conditionStub{firing: true, operator: "and"},
-				&conditionStub{firing: false, operator: "or"},
-			},
-		}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-
-		handler.Eval(context)
-		require.Equal(t, true, context.Firing)
-		require.Equal(t, "[true OR false] = true", context.ConditionEvals)
-	})
-
-	t.Run("Show return false if any of the condition is failing with AND operator", func(t *testing.T) {
-		context := NewEvalContext(context.Background(), &Rule{
-			Conditions: []Condition{
-				&conditionStub{firing: true, operator: "and"},
-				&conditionStub{firing: false, operator: "and"},
-			},
-		}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-
-		handler.Eval(context)
-		require.Equal(t, false, context.Firing)
-		require.Equal(t, "[true AND false] = false", context.ConditionEvals)
-	})
-
-	t.Run("Show return true if one condition is failing with nested OR operator", func(t *testing.T) {
-		context := NewEvalContext(context.Background(), &Rule{
-			Conditions: []Condition{
-				&conditionStub{firing: true, operator: "and"},
-				&conditionStub{firing: true, operator: "and"},
-				&conditionStub{firing: false, operator: "or"},
-			},
-		}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-
-		handler.Eval(context)
-		require.Equal(t, true, context.Firing)
-		require.Equal(t, "[[true AND true] OR false] = true", context.ConditionEvals)
-	})
-
-	t.Run("Show return false if one condition is passing with nested OR operator", func(t *testing.T) {
-		context := NewEvalContext(context.Background(), &Rule{
-			Conditions: []Condition{
-				&conditionStub{firing: true, operator: "and"},
-				&conditionStub{firing: false, operator: "and"},
-				&conditionStub{firing: false, operator: "or"},
-			},
-		}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-
-		handler.Eval(context)
-		require.Equal(t, false, context.Firing)
-		require.Equal(t, "[[true AND false] OR false] = false", context.ConditionEvals)
-	})
-
-	t.Run("Show return false if a condition is failing with nested AND operator", func(t *testing.T) {
-		context := NewEvalContext(context.Background(), &Rule{
-			Conditions: []Condition{
-				&conditionStub{firing: true, operator: "and"},
-				&conditionStub{firing: false, operator: "and"},
-				&conditionStub{firing: true, operator: "and"},
-			},
-		}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-
-		handler.Eval(context)
-		require.Equal(t, false, context.Firing)
-		require.Equal(t, "[[true AND false] AND true] = false", context.ConditionEvals)
-	})
-
-	t.Run("Show return true if a condition is passing with nested OR operator", func(t *testing.T) {
-		context := NewEvalContext(context.Background(), &Rule{
-			Conditions: []Condition{
-				&conditionStub{firing: true, operator: "and"},
-				&conditionStub{firing: false, operator: "or"},
-				&conditionStub{firing: true, operator: "or"},
-			},
-		}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-
-		handler.Eval(context)
-		require.Equal(t, true, context.Firing)
-		require.Equal(t, "[[true OR false] OR true] = true", context.ConditionEvals)
-	})
-
-	t.Run("Should return false if no condition is firing using OR operator", func(t *testing.T) {
-		context := NewEvalContext(context.Background(), &Rule{
-			Conditions: []Condition{
-				&conditionStub{firing: false, operator: "or"},
-				&conditionStub{firing: false, operator: "or"},
-				&conditionStub{firing: false, operator: "or"},
-			},
-		}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-
-		handler.Eval(context)
-		require.Equal(t, false, context.Firing)
-		require.Equal(t, "[[false OR false] OR false] = false", context.ConditionEvals)
-	})
-
-	// FIXME: What should the actual test case name be here?
-	t.Run("Should not return NoDataFound if all conditions have data and using OR", func(t *testing.T) {
-		context := NewEvalContext(context.Background(), &Rule{
-			Conditions: []Condition{
-				&conditionStub{operator: "or", noData: false},
-				&conditionStub{operator: "or", noData: false},
-				&conditionStub{operator: "or", noData: false},
-			},
-		}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-
-		handler.Eval(context)
-		require.False(t, context.NoDataFound)
-	})
-
-	t.Run("Should return NoDataFound if one condition has no data", func(t *testing.T) {
-		context := NewEvalContext(context.Background(), &Rule{
-			Conditions: []Condition{
-				&conditionStub{operator: "and", noData: true},
-			},
-		}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-
-		handler.Eval(context)
-		require.Equal(t, false, context.Firing)
-		require.True(t, context.NoDataFound)
-	})
-
-	t.Run("Should return no data if at least one condition has no data and using AND", func(t *testing.T) {
-		context := NewEvalContext(context.Background(), &Rule{
-			Conditions: []Condition{
-				&conditionStub{operator: "and", noData: true},
-				&conditionStub{operator: "and", noData: false},
-			},
-		}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-
-		handler.Eval(context)
-		require.True(t, context.NoDataFound)
-	})
-
-	t.Run("Should return no data if at least one condition has no data and using OR", func(t *testing.T) {
-		context := NewEvalContext(context.Background(), &Rule{
-			Conditions: []Condition{
-				&conditionStub{operator: "or", noData: true},
-				&conditionStub{operator: "or", noData: false},
-			},
-		}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-
-		handler.Eval(context)
-		require.True(t, context.NoDataFound)
-	})
-}
diff --git a/pkg/services/alerting/extractor.go b/pkg/services/alerting/extractor.go
deleted file mode 100644
index a5e4510a29a95..0000000000000
--- a/pkg/services/alerting/extractor.go
+++ /dev/null
@@ -1,306 +0,0 @@
-package alerting
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/datasources"
-	"github.com/grafana/grafana/pkg/services/datasources/guardian"
-)
-
-type DashAlertExtractor interface {
-	GetAlerts(ctx context.Context, dashAlertInfo DashAlertInfo) ([]*models.Alert, error)
-	ValidateAlerts(ctx context.Context, dashAlertInfo DashAlertInfo) error
-}
-
-// DashAlertExtractorService extracts alerts from the dashboard json.
-type DashAlertExtractorService struct {
-	dsGuardian        guardian.DatasourceGuardianProvider
-	datasourceService datasources.DataSourceService
-	alertStore        AlertStore
-	log               log.Logger
-}
-
-func ProvideDashAlertExtractorService(dsGuardian guardian.DatasourceGuardianProvider, datasourceService datasources.DataSourceService, store AlertStore) *DashAlertExtractorService {
-	return &DashAlertExtractorService{
-		dsGuardian:        dsGuardian,
-		datasourceService: datasourceService,
-		alertStore:        store,
-		log:               log.New("alerting.extractor"),
-	}
-}
-
-func (e *DashAlertExtractorService) lookupQueryDataSource(ctx context.Context, panel *simplejson.Json, panelQuery *simplejson.Json, orgID int64) (*datasources.DataSource, error) {
-	dsName := ""
-	dsUid := ""
-
-	ds, ok := panelQuery.CheckGet("datasource")
-
-	if !ok {
-		ds = panel.Get("datasource")
-	}
-
-	if name, err := ds.String(); err == nil {
-		dsName = name
-	} else if uid, ok := ds.CheckGet("uid"); ok {
-		dsUid = uid.MustString()
-	}
-
-	if dsName == "" && dsUid == "" {
-		query := &datasources.GetDefaultDataSourceQuery{OrgID: orgID}
-		dataSource, err := e.datasourceService.GetDefaultDataSource(ctx, query)
-		if err != nil {
-			return nil, err
-		}
-		return dataSource, nil
-	}
-
-	query := &datasources.GetDataSourceQuery{Name: dsName, UID: dsUid, OrgID: orgID}
-	dataSource, err := e.datasourceService.GetDataSource(ctx, query)
-	if err != nil {
-		return nil, err
-	}
-
-	return dataSource, nil
-}
-
-func findPanelQueryByRefID(panel *simplejson.Json, refID string) *simplejson.Json {
-	for _, targetsObj := range panel.Get("targets").MustArray() {
-		target := simplejson.NewFromAny(targetsObj)
-
-		if target.Get("refId").MustString() == refID {
-			return target
-		}
-	}
-	return nil
-}
-
-func copyJSON(in json.Marshaler) (*simplejson.Json, error) {
-	rawJSON, err := in.MarshalJSON()
-	if err != nil {
-		return nil, fmt.Errorf("JSON marshaling failed: %w", err)
-	}
-
-	return simplejson.NewJson(rawJSON)
-}
-
-// UAEnabled takes a context and returns true if Unified Alerting is enabled
-// and false if it is disabled or the setting is not present in the context
-type uaEnabledKeyType string
-
-const uaEnabledKey uaEnabledKeyType = "unified_alerting_enabled"
-
-func WithUAEnabled(ctx context.Context, enabled bool) context.Context {
-	retCtx := context.WithValue(ctx, uaEnabledKey, enabled)
-	return retCtx
-}
-
-func UAEnabled(ctx context.Context) bool {
-	enabled, ok := ctx.Value(uaEnabledKey).(bool)
-	if !ok {
-		return false
-	}
-	return enabled
-}
-
-func (e *DashAlertExtractorService) getAlertFromPanels(ctx context.Context, jsonWithPanels *simplejson.Json, validateAlertFunc func(*models.Alert) error, logTranslationFailures bool, dashAlertInfo DashAlertInfo) ([]*models.Alert, error) {
-	ret := make([]*models.Alert, 0)
-
-	for _, panelObj := range jsonWithPanels.Get("panels").MustArray() {
-		panel := simplejson.NewFromAny(panelObj)
-
-		collapsedJSON, collapsed := panel.CheckGet("collapsed")
-		// check if the panel is collapsed
-		if collapsed && collapsedJSON.MustBool() {
-			// extract alerts from sub panels for collapsed panels
-			alertSlice, err := e.getAlertFromPanels(ctx, panel, validateAlertFunc, logTranslationFailures, dashAlertInfo)
-			if err != nil {
-				return nil, err
-			}
-
-			ret = append(ret, alertSlice...)
-			continue
-		}
-
-		jsonAlert, hasAlert := panel.CheckGet("alert")
-
-		if !hasAlert {
-			continue
-		}
-
-		panelID, err := panel.Get("id").Int64()
-		if err != nil {
-			return nil, ValidationError{Reason: "A numeric panel id property is missing"}
-		}
-
-		addIdentifiersToValidationError := func(err error) error {
-			if err == nil {
-				return nil
-			}
-
-			var validationErr ValidationError
-			if ok := errors.As(err, &validationErr); ok {
-				ve := ValidationError{
-					Reason:  validationErr.Reason,
-					Err:     validationErr.Err,
-					PanelID: panelID,
-				}
-				if dashAlertInfo.Dash != nil {
-					ve.DashboardID = dashAlertInfo.Dash.ID
-				}
-				return ve
-			}
-			return err
-		}
-
-		// backward compatibility check, can be removed later
-		enabled, hasEnabled := jsonAlert.CheckGet("enabled")
-		if hasEnabled && !enabled.MustBool() {
-			continue
-		}
-
-		frequency, err := getTimeDurationStringToSeconds(jsonAlert.Get("frequency").MustString())
-		if err != nil {
-			return nil, addIdentifiersToValidationError(ValidationError{Reason: err.Error()})
-		}
-
-		rawFor := jsonAlert.Get("for").MustString()
-
-		forValue, err := getForValue(rawFor)
-		if err != nil {
-			return nil, addIdentifiersToValidationError(err)
-		}
-
-		alert := &models.Alert{
-			DashboardID: dashAlertInfo.Dash.ID,
-			OrgID:       dashAlertInfo.OrgID,
-			PanelID:     panelID,
-			ID:          jsonAlert.Get("id").MustInt64(),
-			Name:        jsonAlert.Get("name").MustString(),
-			Handler:     jsonAlert.Get("handler").MustInt64(),
-			Message:     jsonAlert.Get("message").MustString(),
-			Frequency:   frequency,
-			For:         forValue,
-		}
-
-		for _, condition := range jsonAlert.Get("conditions").MustArray() {
-			jsonCondition := simplejson.NewFromAny(condition)
-
-			jsonQuery := jsonCondition.Get("query")
-			queryRefID := jsonQuery.Get("params").MustArray()[0].(string)
-			panelQuery := findPanelQueryByRefID(panel, queryRefID)
-
-			if panelQuery == nil {
-				var reason string
-				if UAEnabled(ctx) {
-					reason = fmt.Sprintf("Alert on PanelId: %v refers to query(%s) that cannot be found. Legacy alerting queries are not able to be removed at this time in order to preserve the ability to rollback to previous versions of Grafana", alert.PanelID, queryRefID)
-				} else {
-					reason = fmt.Sprintf("Alert on PanelId: %v refers to query(%s) that cannot be found", alert.PanelID, queryRefID)
-				}
-				return nil, ValidationError{Reason: reason}
-			}
-
-			datasource, err := e.lookupQueryDataSource(ctx, panel, panelQuery, dashAlertInfo.OrgID)
-			if err != nil {
-				return nil, err
-			}
-
-			canQuery, err := e.dsGuardian.New(dashAlertInfo.OrgID, dashAlertInfo.User, *datasource).CanQuery(datasource.ID)
-			if err != nil {
-				return nil, err
-			} else if !canQuery {
-				return nil, datasources.ErrDataSourceAccessDenied
-			}
-
-			jsonQuery.SetPath([]string{"datasourceId"}, datasource.ID)
-
-			if interval, err := panel.Get("interval").String(); err == nil {
-				panelQuery.Set("interval", interval)
-			}
-
-			jsonQuery.Set("model", panelQuery.Interface())
-		}
-
-		alert.Settings = jsonAlert
-
-		// validate
-		_, err = NewRuleFromDBAlert(ctx, e.alertStore, alert, logTranslationFailures)
-		if err != nil {
-			return nil, err
-		}
-
-		if err := validateAlertFunc(alert); err != nil {
-			return nil, err
-		}
-
-		ret = append(ret, alert)
-	}
-
-	return ret, nil
-}
-
-func validateAlertRule(alert *models.Alert) error {
-	if !alert.ValidDashboardPanel() {
-		return ValidationError{Reason: fmt.Sprintf("Panel id is not correct, alertName=%v, panelId=%v", alert.Name, alert.PanelID)}
-	}
-	if !alert.ValidTags() {
-		return ValidationError{Reason: "Invalid tags, must be less than 100 characters"}
-	}
-	return nil
-}
-
-// GetAlerts extracts alerts from the dashboard json and does full validation on the alert json data.
-func (e *DashAlertExtractorService) GetAlerts(ctx context.Context, dashAlertInfo DashAlertInfo) ([]*models.Alert, error) {
-	return e.extractAlerts(ctx, validateAlertRule, true, dashAlertInfo)
-}
-
-func (e *DashAlertExtractorService) extractAlerts(ctx context.Context, validateFunc func(alert *models.Alert) error, logTranslationFailures bool, dashAlertInfo DashAlertInfo) ([]*models.Alert, error) {
-	dashboardJSON, err := copyJSON(dashAlertInfo.Dash.Data)
-	if err != nil {
-		return nil, err
-	}
-
-	alerts := make([]*models.Alert, 0)
-
-	// We extract alerts from rows to be backwards compatible
-	// with the old dashboard json model.
-	rows := dashboardJSON.Get("rows").MustArray()
-	if len(rows) > 0 {
-		for _, rowObj := range rows {
-			row := simplejson.NewFromAny(rowObj)
-			a, err := e.getAlertFromPanels(ctx, row, validateFunc, logTranslationFailures, dashAlertInfo)
-			if err != nil {
-				return nil, err
-			}
-
-			alerts = append(alerts, a...)
-		}
-	} else {
-		a, err := e.getAlertFromPanels(ctx, dashboardJSON, validateFunc, logTranslationFailures, dashAlertInfo)
-		if err != nil {
-			return nil, err
-		}
-
-		alerts = append(alerts, a...)
-	}
-
-	e.log.Debug("Extracted alerts from dashboard", "alertCount", len(alerts))
-	return alerts, nil
-}
-
-// ValidateAlerts validates alerts in the dashboard json but does not require a valid dashboard id
-// in the first validation pass.
-func (e *DashAlertExtractorService) ValidateAlerts(ctx context.Context, dashAlertInfo DashAlertInfo) error {
-	_, err := e.extractAlerts(ctx, func(alert *models.Alert) error {
-		if alert.OrgID == 0 || alert.PanelID == 0 {
-			return errors.New("missing OrgId, PanelId or both")
-		}
-		return nil
-	}, false, dashAlertInfo)
-	return err
-}
diff --git a/pkg/services/alerting/extractor_test.go b/pkg/services/alerting/extractor_test.go
deleted file mode 100644
index df1f5489aae34..0000000000000
--- a/pkg/services/alerting/extractor_test.go
+++ /dev/null
@@ -1,313 +0,0 @@
-package alerting
-
-import (
-	"context"
-	"os"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/db/dbtest"
-	"github.com/grafana/grafana/pkg/infra/localcache"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/datasources"
-	"github.com/grafana/grafana/pkg/services/datasources/guardian"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/services/sqlstore"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func TestAlertRuleExtraction(t *testing.T) {
-	RegisterCondition("query", func(model *simplejson.Json, index int) (Condition, error) {
-		return &FakeCondition{}, nil
-	})
-
-	// mock data
-	defaultDs := &datasources.DataSource{ID: 12, OrgID: 1, Name: "I am default", IsDefault: true, UID: "def-uid"}
-	graphite2Ds := &datasources.DataSource{ID: 15, OrgID: 1, Name: "graphite2", UID: "graphite2-uid"}
-
-	json, err := os.ReadFile("./testdata/graphite-alert.json")
-	require.Nil(t, err)
-
-	dsGuardian := guardian.ProvideGuardian()
-
-	dsService := &fakeDatasourceService{ExpectedDatasource: defaultDs}
-	db := dbtest.NewFakeDB()
-	cfg := &setting.Cfg{}
-	store := ProvideAlertStore(db, localcache.ProvideService(), cfg, nil, featuremgmt.WithFeatures())
-	extractor := ProvideDashAlertExtractorService(dsGuardian, dsService, store)
-
-	t.Run("Parsing alert rules from dashboard json", func(t *testing.T) {
-		dashJSON, err := simplejson.NewJson(json)
-		require.Nil(t, err)
-
-		getTarget := func(j *simplejson.Json) string {
-			rowObj := j.Get("rows").MustArray()[0]
-			row := simplejson.NewFromAny(rowObj)
-			panelObj := row.Get("panels").MustArray()[0]
-			panel := simplejson.NewFromAny(panelObj)
-			conditionObj := panel.Get("alert").Get("conditions").MustArray()[0]
-			condition := simplejson.NewFromAny(conditionObj)
-			return condition.Get("query").Get("model").Get("target").MustString()
-		}
-
-		require.Equal(t, getTarget(dashJSON), "")
-
-		_, _ = extractor.GetAlerts(context.Background(), DashAlertInfo{
-			User:  nil,
-			Dash:  dashboards.NewDashboardFromJson(dashJSON),
-			OrgID: 1,
-		})
-
-		require.Equal(t, getTarget(dashJSON), "")
-	})
-
-	t.Run("Parsing and validating dashboard containing graphite alerts", func(t *testing.T) {
-		dashJSON, err := simplejson.NewJson(json)
-		require.Nil(t, err)
-
-		dsService.ExpectedDatasource = &datasources.DataSource{ID: 12}
-		alerts, err := extractor.GetAlerts(context.Background(), DashAlertInfo{
-			User:  nil,
-			Dash:  dashboards.NewDashboardFromJson(dashJSON),
-			OrgID: 1,
-		})
-
-		require.Nil(t, err)
-
-		require.Len(t, alerts, 2)
-
-		for _, v := range alerts {
-			require.EqualValues(t, v.DashboardID, 57)
-			require.NotEmpty(t, v.Name)
-			require.NotEmpty(t, v.Message)
-
-			settings := simplejson.NewFromAny(v.Settings)
-			require.Equal(t, settings.Get("interval").MustString(""), "")
-		}
-
-		require.EqualValues(t, alerts[0].Handler, 1)
-		require.EqualValues(t, alerts[1].Handler, 0)
-
-		require.EqualValues(t, alerts[0].Frequency, 60)
-		require.EqualValues(t, alerts[1].Frequency, 60)
-
-		require.EqualValues(t, alerts[0].PanelID, 3)
-		require.EqualValues(t, alerts[1].PanelID, 4)
-
-		require.Equal(t, alerts[0].For, time.Minute*2)
-		require.Equal(t, alerts[1].For, time.Duration(0))
-
-		require.Equal(t, alerts[0].Name, "name1")
-		require.Equal(t, alerts[0].Message, "desc1")
-		require.Equal(t, alerts[1].Name, "name2")
-		require.Equal(t, alerts[1].Message, "desc2")
-
-		condition := simplejson.NewFromAny(alerts[0].Settings.Get("conditions").MustArray()[0])
-		query := condition.Get("query")
-		require.EqualValues(t, query.Get("datasourceId").MustInt64(), 12)
-
-		condition = simplejson.NewFromAny(alerts[0].Settings.Get("conditions").MustArray()[0])
-		model := condition.Get("query").Get("model")
-		require.Equal(t, model.Get("target").MustString(), "aliasByNode(statsd.fakesite.counters.session_start.desktop.count, 4)")
-	})
-
-	t.Run("Panels missing id should return error", func(t *testing.T) {
-		panelWithoutID, err := os.ReadFile("./testdata/panels-missing-id.json")
-		require.Nil(t, err)
-
-		dashJSON, err := simplejson.NewJson(panelWithoutID)
-		require.Nil(t, err)
-
-		_, err = extractor.GetAlerts(context.Background(), DashAlertInfo{
-			User:  nil,
-			Dash:  dashboards.NewDashboardFromJson(dashJSON),
-			OrgID: 1,
-		})
-
-		require.NotNil(t, err)
-	})
-
-	t.Run("Panels missing id should return error", func(t *testing.T) {
-		panelWithIDZero, err := os.ReadFile("./testdata/panel-with-id-0.json")
-		require.Nil(t, err)
-
-		dashJSON, err := simplejson.NewJson(panelWithIDZero)
-		require.Nil(t, err)
-
-		_, err = extractor.GetAlerts(context.Background(), DashAlertInfo{
-			User:  nil,
-			Dash:  dashboards.NewDashboardFromJson(dashJSON),
-			OrgID: 1,
-		})
-
-		require.NotNil(t, err)
-	})
-
-	t.Run("Cannot save panel with query that is referenced by legacy alerting", func(t *testing.T) {
-		panelWithQuery, err := os.ReadFile("./testdata/panel-with-bad-query-id.json")
-		require.Nil(t, err)
-		dashJSON, err := simplejson.NewJson(panelWithQuery)
-		require.Nil(t, err)
-
-		_, err = extractor.GetAlerts(WithUAEnabled(context.Background(), true), DashAlertInfo{
-			User:  nil,
-			Dash:  dashboards.NewDashboardFromJson(dashJSON),
-			OrgID: 1,
-		})
-		require.Equal(t, "alert validation error: Alert on PanelId: 2 refers to query(B) that cannot be found. Legacy alerting queries are not able to be removed at this time in order to preserve the ability to rollback to previous versions of Grafana", err.Error())
-	})
-
-	t.Run("Panel does not have datasource configured, use the default datasource", func(t *testing.T) {
-		panelWithoutSpecifiedDatasource, err := os.ReadFile("./testdata/panel-without-specified-datasource.json")
-		require.Nil(t, err)
-
-		dashJSON, err := simplejson.NewJson(panelWithoutSpecifiedDatasource)
-		require.Nil(t, err)
-
-		dsService.ExpectedDatasource = &datasources.DataSource{ID: 12}
-		alerts, err := extractor.GetAlerts(context.Background(), DashAlertInfo{
-			User:  nil,
-			Dash:  dashboards.NewDashboardFromJson(dashJSON),
-			OrgID: 1,
-		})
-		require.Nil(t, err)
-
-		condition := simplejson.NewFromAny(alerts[0].Settings.Get("conditions").MustArray()[0])
-		query := condition.Get("query")
-		require.EqualValues(t, query.Get("datasourceId").MustInt64(), 12)
-	})
-
-	t.Run("Parse alerts from dashboard without rows", func(t *testing.T) {
-		json, err := os.ReadFile("./testdata/v5-dashboard.json")
-		require.Nil(t, err)
-
-		dashJSON, err := simplejson.NewJson(json)
-		require.Nil(t, err)
-
-		alerts, err := extractor.GetAlerts(context.Background(), DashAlertInfo{
-			User:  nil,
-			Dash:  dashboards.NewDashboardFromJson(dashJSON),
-			OrgID: 1,
-		})
-		require.Nil(t, err)
-
-		require.Len(t, alerts, 2)
-	})
-
-	t.Run("Alert notifications are in DB", func(t *testing.T) {
-		sqlStore := sqlStore{db: sqlstore.InitTestDB(t)}
-
-		firstNotification := models.CreateAlertNotificationCommand{UID: "notifier1", OrgID: 1, Name: "1"}
-		_, err = sqlStore.CreateAlertNotificationCommand(context.Background(), &firstNotification)
-		require.Nil(t, err)
-
-		secondNotification := models.CreateAlertNotificationCommand{UID: "notifier2", OrgID: 1, Name: "2"}
-		_, err = sqlStore.CreateAlertNotificationCommand(context.Background(), &secondNotification)
-		require.Nil(t, err)
-
-		json, err := os.ReadFile("./testdata/influxdb-alert.json")
-		require.Nil(t, err)
-
-		dashJSON, err := simplejson.NewJson(json)
-		require.Nil(t, err)
-
-		alerts, err := extractor.GetAlerts(context.Background(), DashAlertInfo{
-			User:  nil,
-			Dash:  dashboards.NewDashboardFromJson(dashJSON),
-			OrgID: 1,
-		})
-		require.Nil(t, err)
-
-		require.Len(t, alerts, 1)
-
-		for _, alert := range alerts {
-			require.EqualValues(t, alert.DashboardID, 4)
-
-			conditions := alert.Settings.Get("conditions").MustArray()
-			cond := simplejson.NewFromAny(conditions[0])
-
-			require.Equal(t, cond.Get("query").Get("model").Get("interval").MustString(), ">10s")
-		}
-	})
-
-	t.Run("Should be able to extract collapsed panels", func(t *testing.T) {
-		json, err := os.ReadFile("./testdata/collapsed-panels.json")
-		require.Nil(t, err)
-
-		dashJSON, err := simplejson.NewJson(json)
-		require.Nil(t, err)
-
-		dash := dashboards.NewDashboardFromJson(dashJSON)
-
-		alerts, err := extractor.GetAlerts(context.Background(), DashAlertInfo{
-			User:  nil,
-			Dash:  dash,
-			OrgID: 1,
-		})
-		require.Nil(t, err)
-
-		require.Len(t, alerts, 4)
-	})
-
-	t.Run("Parse and validate dashboard without id and containing an alert", func(t *testing.T) {
-		json, err := os.ReadFile("./testdata/dash-without-id.json")
-		require.Nil(t, err)
-
-		dashJSON, err := simplejson.NewJson(json)
-		require.Nil(t, err)
-
-		dashAlertInfo := DashAlertInfo{
-			User:  nil,
-			Dash:  dashboards.NewDashboardFromJson(dashJSON),
-			OrgID: 1,
-		}
-
-		err = extractor.ValidateAlerts(context.Background(), dashAlertInfo)
-		require.Nil(t, err)
-
-		_, err = extractor.GetAlerts(context.Background(), dashAlertInfo)
-		require.Equal(t, err.Error(), "alert validation error: Panel id is not correct, alertName=Influxdb, panelId=1")
-	})
-
-	t.Run("Extract data source given new DataSourceRef object model", func(t *testing.T) {
-		json, err := os.ReadFile("./testdata/panel-with-datasource-ref.json")
-		require.Nil(t, err)
-
-		dashJSON, err := simplejson.NewJson(json)
-		require.Nil(t, err)
-
-		dsService.ExpectedDatasource = graphite2Ds
-		dashAlertInfo := DashAlertInfo{
-			User:  nil,
-			Dash:  dashboards.NewDashboardFromJson(dashJSON),
-			OrgID: 1,
-		}
-
-		err = extractor.ValidateAlerts(context.Background(), dashAlertInfo)
-		require.Nil(t, err)
-
-		alerts, err := extractor.GetAlerts(context.Background(), dashAlertInfo)
-		require.Nil(t, err)
-
-		condition := simplejson.NewFromAny(alerts[0].Settings.Get("conditions").MustArray()[0])
-		query := condition.Get("query")
-		require.EqualValues(t, 15, query.Get("datasourceId").MustInt64())
-	})
-}
-
-type fakeDatasourceService struct {
-	ExpectedDatasource *datasources.DataSource
-	datasources.DataSourceService
-}
-
-func (f *fakeDatasourceService) GetDefaultDataSource(ctx context.Context, query *datasources.GetDefaultDataSourceQuery) (*datasources.DataSource, error) {
-	return f.ExpectedDatasource, nil
-}
-
-func (f *fakeDatasourceService) GetDataSource(ctx context.Context, query *datasources.GetDataSourceQuery) (*datasources.DataSource, error) {
-	return f.ExpectedDatasource, nil
-}
diff --git a/pkg/services/alerting/interfaces.go b/pkg/services/alerting/interfaces.go
deleted file mode 100644
index 5aeb5077cd85b..0000000000000
--- a/pkg/services/alerting/interfaces.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package alerting
-
-import (
-	"context"
-	"time"
-
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/tsdb/legacydata"
-)
-
-type evalHandler interface {
-	Eval(evalContext *EvalContext)
-}
-
-type scheduler interface {
-	Tick(time time.Time, execQueue chan *Job)
-	Update(rules []*Rule)
-}
-
-// Notifier is responsible for sending alert notifications.
-type Notifier interface {
-	Notify(evalContext *EvalContext) error
-	GetType() string
-	NeedsImage() bool
-
-	// ShouldNotify checks this evaluation should send an alert notification
-	ShouldNotify(ctx context.Context, evalContext *EvalContext, notificationState *models.AlertNotificationState) bool
-
-	GetNotifierUID() string
-	GetIsDefault() bool
-	GetSendReminder() bool
-	GetDisableResolveMessage() bool
-	GetFrequency() time.Duration
-}
-
-type notifierState struct {
-	notifier Notifier
-	state    *models.AlertNotificationState
-}
-
-type notifierStateSlice []*notifierState
-
-func (notifiers notifierStateSlice) ShouldUploadImage() bool {
-	for _, ns := range notifiers {
-		if ns.notifier.NeedsImage() {
-			return true
-		}
-	}
-
-	return false
-}
-
-// ConditionResult is the result of a condition evaluation.
-type ConditionResult struct {
-	Firing      bool
-	NoDataFound bool
-	Operator    string
-	EvalMatches []*EvalMatch
-	AllMatches  []*EvalMatch
-}
-
-// Condition is responsible for evaluating an alert condition.
-type Condition interface {
-	Eval(result *EvalContext, requestHandler legacydata.RequestHandler) (*ConditionResult, error)
-}
diff --git a/pkg/services/alerting/models.go b/pkg/services/alerting/models.go
deleted file mode 100644
index 391ca1f9e4b3f..0000000000000
--- a/pkg/services/alerting/models.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package alerting
-
-import (
-	"sync"
-
-	"github.com/grafana/grafana/pkg/components/null"
-	"github.com/grafana/grafana/pkg/services/auth/identity"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-)
-
-// Job holds state about when the alert rule should be evaluated.
-type Job struct {
-	Offset      int64
-	OffsetWait  bool
-	Delay       bool
-	running     bool
-	Rule        *Rule
-	runningLock sync.Mutex // Lock for running property which is used in the Scheduler and AlertEngine execution
-}
-
-// GetRunning returns true if the job is running. A lock is taken and released on the Job to ensure atomicity.
-func (j *Job) GetRunning() bool {
-	defer j.runningLock.Unlock()
-	j.runningLock.Lock()
-	return j.running
-}
-
-// SetRunning sets the running property on the Job. A lock is taken and released on the Job to ensure atomicity.
-func (j *Job) SetRunning(b bool) {
-	j.runningLock.Lock()
-	j.running = b
-	j.runningLock.Unlock()
-}
-
-// ResultLogEntry represents log data for the alert evaluation.
-type ResultLogEntry struct {
-	Message string
-	Data    any
-}
-
-// EvalMatch represents the series violating the threshold.
-type EvalMatch struct {
-	Value  null.Float        `json:"value"`
-	Metric string            `json:"metric"`
-	Tags   map[string]string `json:"tags"`
-}
-
-type DashAlertInfo struct {
-	User  identity.Requester
-	Dash  *dashboards.Dashboard
-	OrgID int64
-}
diff --git a/pkg/services/alerting/models/alert.go b/pkg/services/alerting/models/alert.go
deleted file mode 100644
index 7ea358f4bc086..0000000000000
--- a/pkg/services/alerting/models/alert.go
+++ /dev/null
@@ -1,206 +0,0 @@
-package models
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/tag"
-	"github.com/grafana/grafana/pkg/services/user"
-)
-
-type AlertStateType string
-type NoDataOption string
-type ExecutionErrorOption string
-
-const (
-	AlertStateNoData   AlertStateType = "no_data"
-	AlertStatePaused   AlertStateType = "paused"
-	AlertStateAlerting AlertStateType = "alerting"
-	AlertStateOK       AlertStateType = "ok"
-	AlertStatePending  AlertStateType = "pending"
-	AlertStateUnknown  AlertStateType = "unknown"
-)
-
-const (
-	NoDataSetOK       NoDataOption = "ok"
-	NoDataSetNoData   NoDataOption = "no_data"
-	NoDataKeepState   NoDataOption = "keep_state"
-	NoDataSetAlerting NoDataOption = "alerting"
-)
-
-const (
-	ExecutionErrorSetOk       ExecutionErrorOption = "ok"
-	ExecutionErrorSetAlerting ExecutionErrorOption = "alerting"
-	ExecutionErrorKeepState   ExecutionErrorOption = "keep_state"
-)
-
-var (
-	ErrCannotChangeStateOnPausedAlert = fmt.Errorf("cannot change state on pause alert")
-	ErrRequiresNewState               = fmt.Errorf("update alert state requires a new state")
-)
-
-func (s AlertStateType) IsValid() bool {
-	return s == AlertStateOK ||
-		s == AlertStateNoData ||
-		s == AlertStatePaused ||
-		s == AlertStatePending ||
-		s == AlertStateAlerting ||
-		s == AlertStateUnknown
-}
-
-func (s NoDataOption) IsValid() bool {
-	return s == NoDataSetNoData || s == NoDataSetAlerting || s == NoDataKeepState || s == NoDataSetOK
-}
-
-func (s NoDataOption) ToAlertState() AlertStateType {
-	return AlertStateType(s)
-}
-
-func (s ExecutionErrorOption) IsValid() bool {
-	return s == ExecutionErrorSetAlerting || s == ExecutionErrorKeepState || s == ExecutionErrorSetOk
-}
-
-func (s ExecutionErrorOption) ToAlertState() AlertStateType {
-	return AlertStateType(s)
-}
-
-// swagger:model LegacyAlert
-type Alert struct {
-	ID             int64 `xorm:"pk autoincr 'id'"`
-	Version        int64
-	OrgID          int64 `xorm:"org_id"`
-	DashboardID    int64 `xorm:"dashboard_id"`
-	PanelID        int64 `xorm:"panel_id"`
-	Name           string
-	Message        string
-	Severity       string // Unused
-	State          AlertStateType
-	Handler        int64 // Unused
-	Silenced       bool
-	ExecutionError string
-	Frequency      int64
-	For            time.Duration
-
-	EvalData     *simplejson.Json
-	NewStateDate time.Time
-	StateChanges int64
-
-	Created time.Time
-	Updated time.Time
-
-	Settings *simplejson.Json
-}
-
-func (a *Alert) ValidDashboardPanel() bool {
-	return a.OrgID != 0 && a.DashboardID != 0 && a.PanelID != 0
-}
-
-func (a *Alert) ValidTags() bool {
-	for _, tag := range a.GetTagsFromSettings() {
-		if len(tag.Key) > 100 || len(tag.Value) > 100 {
-			return false
-		}
-	}
-	return true
-}
-
-func (a *Alert) ContainsUpdates(other *Alert) bool {
-	result := false
-	result = result || a.Name != other.Name
-	result = result || a.Message != other.Message
-
-	if a.Settings != nil && other.Settings != nil {
-		json1, err1 := a.Settings.Encode()
-		json2, err2 := other.Settings.Encode()
-
-		if err1 != nil || err2 != nil {
-			return false
-		}
-
-		result = result || string(json1) != string(json2)
-	}
-
-	// don't compare .State! That would be insane.
-	return result
-}
-
-func (a *Alert) GetTagsFromSettings() []*tag.Tag {
-	tags := []*tag.Tag{}
-	if a.Settings != nil {
-		if data, ok := a.Settings.CheckGet("alertRuleTags"); ok {
-			for tagNameString, tagValue := range data.MustMap() {
-				// MustMap() already guarantees the return of a `map[string]any`.
-				// Therefore we only need to verify that tagValue is a String.
-				tagValueString := simplejson.NewFromAny(tagValue).MustString()
-				tags = append(tags, &tag.Tag{Key: tagNameString, Value: tagValueString})
-			}
-		}
-	}
-	return tags
-}
-
-type PauseAlertCommand struct {
-	OrgID       int64   `xorm:"org_id"`
-	AlertIDs    []int64 `xorm:"alert_ids"`
-	ResultCount int64
-	Paused      bool
-}
-
-type PauseAllAlertCommand struct {
-	ResultCount int64
-	Paused      bool
-}
-
-type SetAlertStateCommand struct {
-	AlertID  int64 `xorm:"alert_id"`
-	OrgID    int64 `xorm:"org_id"`
-	State    AlertStateType
-	Error    string
-	EvalData *simplejson.Json
-}
-
-// Queries
-type GetAlertsQuery struct {
-	OrgID        int64 `xorm:"org_id"`
-	State        []string
-	DashboardIDs []int64 `xorm:"dashboard_ids"`
-	PanelID      int64   `xorm:"panel_id"`
-	Limit        int64
-	Query        string
-	User         *user.SignedInUser
-}
-
-type GetAllAlertsQuery struct{}
-
-type GetAlertByIdQuery struct {
-	ID int64 `xorm:"id"`
-}
-
-type GetAlertStatesForDashboardQuery struct {
-	OrgID       int64 `xorm:"org_id"`
-	DashboardID int64 `xorm:"dashboard_id"`
-}
-
-type AlertListItemDTO struct {
-	ID             int64            `json:"id" xorm:"id"`
-	DashboardID    int64            `json:"dashboardId" xorm:"dashboard_id"`
-	DashboardUID   string           `json:"dashboardUid" xorm:"dashboard_uid"`
-	DashboardSlug  string           `json:"dashboardSlug"`
-	PanelID        int64            `json:"panelId" xorm:"panel_id"`
-	Name           string           `json:"name"`
-	State          AlertStateType   `json:"state"`
-	NewStateDate   time.Time        `json:"newStateDate"`
-	EvalDate       time.Time        `json:"evalDate"`
-	EvalData       *simplejson.Json `json:"evalData"`
-	ExecutionError string           `json:"executionError"`
-	URL            string           `json:"url" xorm:"url"`
-}
-
-type AlertStateInfoDTO struct {
-	ID           int64          `json:"id" xorm:"id"`
-	DashboardID  int64          `json:"dashboardId" xorm:"dashboard_id"`
-	PanelID      int64          `json:"panelId" xorm:"panel_id"`
-	State        AlertStateType `json:"state"`
-	NewStateDate time.Time      `json:"newStateDate"`
-}
diff --git a/pkg/services/alerting/models/alert_notification.go b/pkg/services/alerting/models/alert_notification.go
deleted file mode 100644
index 57f165238df16..0000000000000
--- a/pkg/services/alerting/models/alert_notification.go
+++ /dev/null
@@ -1,154 +0,0 @@
-package models
-
-import (
-	"errors"
-	"time"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-)
-
-var (
-	ErrAlertNotificationNotFound                = errors.New("alert notification not found")
-	ErrNotificationFrequencyNotFound            = errors.New("notification frequency not specified")
-	ErrAlertNotificationStateVersionConflict    = errors.New("alert notification state update version conflict")
-	ErrAlertNotificationFailedGenerateUniqueUid = errors.New("failed to generate unique alert notification uid")
-	ErrAlertNotificationFailedTranslateUniqueID = errors.New("failed to translate Notification Id to Uid")
-	ErrAlertNotificationWithSameNameExists      = errors.New("alert notification with same name already exists")
-	ErrAlertNotificationWithSameUIDExists       = errors.New("alert notification with same uid already exists")
-)
-
-type AlertNotificationStateType string
-
-var (
-	AlertNotificationStatePending   = AlertNotificationStateType("pending")
-	AlertNotificationStateCompleted = AlertNotificationStateType("completed")
-	AlertNotificationStateUnknown   = AlertNotificationStateType("unknown")
-)
-
-type AlertNotification struct {
-	ID                    int64             `json:"id" xorm:"pk autoincr 'id'"`
-	UID                   string            `json:"-" xorm:"uid"`
-	OrgID                 int64             `json:"-" xorm:"org_id"`
-	Name                  string            `json:"name"`
-	Type                  string            `json:"type"`
-	SendReminder          bool              `json:"sendReminder"`
-	DisableResolveMessage bool              `json:"disableResolveMessage"`
-	Frequency             time.Duration     `json:"frequency"`
-	IsDefault             bool              `json:"isDefault"`
-	Settings              *simplejson.Json  `json:"settings"`
-	SecureSettings        map[string][]byte `json:"secureSettings"`
-	Created               time.Time         `json:"created"`
-	Updated               time.Time         `json:"updated"`
-}
-
-type CreateAlertNotificationCommand struct {
-	UID                   string            `json:"uid"`
-	Name                  string            `json:"name"  binding:"Required"`
-	Type                  string            `json:"type"  binding:"Required"`
-	SendReminder          bool              `json:"sendReminder"`
-	DisableResolveMessage bool              `json:"disableResolveMessage"`
-	Frequency             string            `json:"frequency"`
-	IsDefault             bool              `json:"isDefault"`
-	Settings              *simplejson.Json  `json:"settings"`
-	SecureSettings        map[string]string `json:"secureSettings"`
-
-	OrgID                   int64             `json:"-"`
-	EncryptedSecureSettings map[string][]byte `json:"-"`
-}
-
-type UpdateAlertNotificationCommand struct {
-	ID                    int64             `json:"id"  binding:"Required"`
-	UID                   string            `json:"uid"`
-	Name                  string            `json:"name"  binding:"Required"`
-	Type                  string            `json:"type"  binding:"Required"`
-	SendReminder          bool              `json:"sendReminder"`
-	DisableResolveMessage bool              `json:"disableResolveMessage"`
-	Frequency             string            `json:"frequency"`
-	IsDefault             bool              `json:"isDefault"`
-	Settings              *simplejson.Json  `json:"settings"  binding:"Required"`
-	SecureSettings        map[string]string `json:"secureSettings"`
-
-	OrgID                   int64             `json:"-"`
-	EncryptedSecureSettings map[string][]byte `json:"-"`
-}
-
-type UpdateAlertNotificationWithUidCommand struct {
-	UID                   string            `json:"-"`
-	NewUID                string            `json:"uid"`
-	Name                  string            `json:"name"  binding:"Required"`
-	Type                  string            `json:"type"  binding:"Required"`
-	SendReminder          bool              `json:"sendReminder"`
-	DisableResolveMessage bool              `json:"disableResolveMessage"`
-	Frequency             string            `json:"frequency"`
-	IsDefault             bool              `json:"isDefault"`
-	Settings              *simplejson.Json  `json:"settings"  binding:"Required"`
-	SecureSettings        map[string]string `json:"secureSettings"`
-
-	OrgID int64 `json:"-"`
-}
-
-type DeleteAlertNotificationCommand struct {
-	ID    int64
-	OrgID int64
-}
-type DeleteAlertNotificationWithUidCommand struct {
-	UID   string
-	OrgID int64
-
-	DeletedAlertNotificationID int64
-}
-
-type GetAlertNotificationUidQuery struct {
-	ID    int64
-	OrgID int64
-}
-
-type GetAlertNotificationsQuery struct {
-	Name  string
-	ID    int64
-	OrgID int64
-}
-
-type GetAlertNotificationsWithUidQuery struct {
-	UID   string
-	OrgID int64
-}
-
-type GetAlertNotificationsWithUidToSendQuery struct {
-	UIDs  []string
-	OrgID int64
-}
-
-type GetAllAlertNotificationsQuery struct {
-	OrgID int64
-}
-
-type AlertNotificationState struct {
-	ID                           int64 `xorm:"pk autoincr 'id'"`
-	OrgID                        int64 `xorm:"org_id"`
-	AlertID                      int64 `xorm:"alert_id"`
-	NotifierID                   int64 `xorm:"notifier_id"`
-	State                        AlertNotificationStateType
-	Version                      int64
-	UpdatedAt                    int64
-	AlertRuleStateUpdatedVersion int64
-}
-
-type SetAlertNotificationStateToPendingCommand struct {
-	ID                           int64
-	AlertRuleStateUpdatedVersion int64
-	Version                      int64
-
-	ResultVersion int64
-}
-
-type SetAlertNotificationStateToCompleteCommand struct {
-	ID      int64
-	Version int64
-}
-
-type GetOrCreateNotificationStateQuery struct {
-	OrgID      int64
-	AlertID    int64
-	NotifierID int64
-}
diff --git a/pkg/services/alerting/models/alert_test.go b/pkg/services/alerting/models/alert_test.go
deleted file mode 100644
index cceac2296f443..0000000000000
--- a/pkg/services/alerting/models/alert_test.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package models
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/tag"
-)
-
-func TestAlert_ContainsUpdates(t *testing.T) {
-	settings, err := simplejson.NewJson([]byte(`{ "field": "value" }`))
-	require.NoError(t, err)
-
-	alert1 := &Alert{
-		Settings: settings,
-		Name:     "Name",
-		Message:  "Message",
-	}
-
-	alert2 := &Alert{
-		Settings: settings,
-		Name:     "Name",
-		Message:  "Message",
-	}
-
-	assert.False(t, alert1.ContainsUpdates(alert2))
-
-	settingsUpdated, err := simplejson.NewJson([]byte(`{ "field": "newValue" }`))
-	require.NoError(t, err)
-
-	alert2.Settings = settingsUpdated
-
-	assert.True(t, alert1.ContainsUpdates(alert2))
-}
-
-func TestAlert_GetTagsFromSettings(t *testing.T) {
-	settings, err := simplejson.NewJson([]byte(`{
-		"field": "value",
-		"alertRuleTags": {
-			"foo": "bar",
-			"waldo": "fred",
-			"tagMap": { "mapValue": "value" }
-		}
-	}`))
-	require.NoError(t, err)
-
-	alert := &Alert{
-		Settings: settings,
-		Name:     "Name",
-		Message:  "Message",
-	}
-
-	expectedTags := []*tag.Tag{
-		{Id: 0, Key: "foo", Value: "bar"},
-		{Id: 0, Key: "waldo", Value: "fred"},
-		{Id: 0, Key: "tagMap", Value: ""},
-	}
-	actualTags := alert.GetTagsFromSettings()
-
-	assert.ElementsMatch(t, actualTags, expectedTags)
-}
diff --git a/pkg/services/alerting/notifier.go b/pkg/services/alerting/notifier.go
deleted file mode 100644
index 593d4610512c4..0000000000000
--- a/pkg/services/alerting/notifier.go
+++ /dev/null
@@ -1,331 +0,0 @@
-package alerting
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"time"
-
-	"github.com/grafana/grafana/pkg/components/imguploader"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/infra/metrics"
-	"github.com/grafana/grafana/pkg/models"
-	alertmodels "github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/services/org"
-	"github.com/grafana/grafana/pkg/services/rendering"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-// for stubbing in tests
-//
-//nolint:gocritic
-var newImageUploaderProvider = func() (imguploader.ImageUploader, error) {
-	return imguploader.NewImageUploader()
-}
-
-// NotifierPlugin holds meta information about a notifier.
-type NotifierPlugin struct {
-	Type        string           `json:"type"`
-	Name        string           `json:"name"`
-	Heading     string           `json:"heading"`
-	Description string           `json:"description"`
-	Info        string           `json:"info"`
-	Factory     NotifierFactory  `json:"-"`
-	Options     []NotifierOption `json:"options"`
-}
-
-// NotifierOption holds information about options specific for the NotifierPlugin.
-type NotifierOption struct {
-	Element        ElementType    `json:"element"`
-	InputType      InputType      `json:"inputType"`
-	Label          string         `json:"label"`
-	Description    string         `json:"description"`
-	Placeholder    string         `json:"placeholder"`
-	PropertyName   string         `json:"propertyName"`
-	SelectOptions  []SelectOption `json:"selectOptions"`
-	ShowWhen       ShowWhen       `json:"showWhen"`
-	Required       bool           `json:"required"`
-	ValidationRule string         `json:"validationRule"`
-	Secure         bool           `json:"secure"`
-	DependsOn      string         `json:"dependsOn"`
-}
-
-// InputType is the type of input that can be rendered in the frontend.
-type InputType string
-
-const (
-	// InputTypeText will render a text field in the frontend
-	InputTypeText = "text"
-	// InputTypePassword will render a password field in the frontend
-	InputTypePassword = "password"
-)
-
-// ElementType is the type of element that can be rendered in the frontend.
-type ElementType string
-
-const (
-	// ElementTypeInput will render an input
-	ElementTypeInput = "input"
-	// ElementTypeSelect will render a select
-	ElementTypeSelect = "select"
-	// ElementTypeCheckbox will render a checkbox
-	ElementTypeCheckbox = "checkbox"
-	// ElementTypeTextArea will render a textarea
-	ElementTypeTextArea = "textarea"
-)
-
-// SelectOption is a simple type for Options that have dropdown options. Should be used when Element is ElementTypeSelect.
-type SelectOption struct {
-	Value string `json:"value"`
-	Label string `json:"label"`
-}
-
-// ShowWhen holds information about when options are dependant on other options.
-type ShowWhen struct {
-	Field string `json:"field"`
-	Is    string `json:"is"`
-}
-
-func newNotificationService(renderService rendering.Service, sqlStore AlertStore, notificationSvc *notifications.NotificationService, decryptFn GetDecryptedValueFn) *notificationService {
-	return &notificationService{
-		log:                 log.New("alerting.notifier"),
-		renderService:       renderService,
-		sqlStore:            sqlStore,
-		notificationService: notificationSvc,
-		decryptFn:           decryptFn,
-	}
-}
-
-type notificationService struct {
-	log                 log.Logger
-	renderService       rendering.Service
-	sqlStore            AlertStore
-	notificationService *notifications.NotificationService
-	decryptFn           GetDecryptedValueFn
-}
-
-func (n *notificationService) SendIfNeeded(evalCtx *EvalContext) error {
-	notifierStates, err := n.getNeededNotifiers(evalCtx.Rule.OrgID, evalCtx.Rule.Notifications, evalCtx)
-	if err != nil {
-		n.log.Error("Failed to get alert notifiers", "error", err)
-		return err
-	}
-
-	if len(notifierStates) == 0 {
-		return nil
-	}
-
-	if notifierStates.ShouldUploadImage() {
-		// Create a copy of EvalContext and give it a new, shorter, timeout context to upload the image
-		uploadEvalCtx := *evalCtx
-		timeout := setting.AlertingNotificationTimeout / 2
-		var uploadCtxCancel func()
-		uploadEvalCtx.Ctx, uploadCtxCancel = context.WithTimeout(evalCtx.Ctx, timeout)
-
-		// Try to upload the image without consuming all the time allocated for EvalContext
-		if err = n.renderAndUploadImage(&uploadEvalCtx, timeout); err != nil {
-			n.log.Error("Failed to render and upload alert panel image.", "ruleId", uploadEvalCtx.Rule.ID, "error", err)
-		}
-		uploadCtxCancel()
-		evalCtx.ImageOnDiskPath = uploadEvalCtx.ImageOnDiskPath
-		evalCtx.ImagePublicURL = uploadEvalCtx.ImagePublicURL
-	}
-
-	return n.sendNotifications(evalCtx, notifierStates)
-}
-
-func (n *notificationService) sendAndMarkAsComplete(evalContext *EvalContext, notifierState *notifierState) error {
-	notifier := notifierState.notifier
-
-	n.log.Debug("Sending notification", "type", notifier.GetType(), "uid", notifier.GetNotifierUID(), "isDefault", notifier.GetIsDefault())
-	metrics.MAlertingNotificationSent.WithLabelValues(notifier.GetType()).Inc()
-
-	if err := evalContext.evaluateNotificationTemplateFields(); err != nil {
-		n.log.Error("Failed trying to evaluate notification template fields", "uid", notifier.GetNotifierUID(), "error", err)
-	}
-
-	if err := notifier.Notify(evalContext); err != nil {
-		n.log.Error("Failed to send notification", "uid", notifier.GetNotifierUID(), "error", err)
-		metrics.MAlertingNotificationFailed.WithLabelValues(notifier.GetType()).Inc()
-		return err
-	}
-
-	if evalContext.IsTestRun {
-		return nil
-	}
-
-	cmd := &alertmodels.SetAlertNotificationStateToCompleteCommand{
-		ID:      notifierState.state.ID,
-		Version: notifierState.state.Version,
-	}
-
-	return n.sqlStore.SetAlertNotificationStateToCompleteCommand(evalContext.Ctx, cmd)
-}
-
-func (n *notificationService) sendNotification(evalContext *EvalContext, notifierState *notifierState) error {
-	if !evalContext.IsTestRun {
-		setPendingCmd := &alertmodels.SetAlertNotificationStateToPendingCommand{
-			ID:                           notifierState.state.ID,
-			Version:                      notifierState.state.Version,
-			AlertRuleStateUpdatedVersion: evalContext.Rule.StateChanges,
-		}
-
-		err := n.sqlStore.SetAlertNotificationStateToPendingCommand(evalContext.Ctx, setPendingCmd)
-		if err != nil {
-			if errors.Is(err, alertmodels.ErrAlertNotificationStateVersionConflict) {
-				return nil
-			}
-
-			return err
-		}
-
-		// We need to update state version to be able to log
-		// unexpected version conflicts when marking notifications as ok
-		notifierState.state.Version = setPendingCmd.ResultVersion
-	}
-
-	return n.sendAndMarkAsComplete(evalContext, notifierState)
-}
-
-func (n *notificationService) sendNotifications(evalContext *EvalContext, notifierStates notifierStateSlice) error {
-	for _, notifierState := range notifierStates {
-		err := n.sendNotification(evalContext, notifierState)
-		if err != nil {
-			n.log.Error("Failed to send notification", "uid", notifierState.notifier.GetNotifierUID(), "error", err)
-			if evalContext.IsTestRun {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func (n *notificationService) renderAndUploadImage(evalCtx *EvalContext, timeout time.Duration) (err error) {
-	uploader, err := newImageUploaderProvider()
-	if err != nil {
-		return err
-	}
-
-	renderOpts := rendering.Opts{
-		TimeoutOpts: rendering.TimeoutOpts{
-			Timeout: timeout,
-		},
-		AuthOpts: rendering.AuthOpts{
-			OrgID:   evalCtx.Rule.OrgID,
-			OrgRole: org.RoleAdmin,
-		},
-		Width:           1000,
-		Height:          500,
-		ConcurrentLimit: setting.AlertingRenderLimit,
-		Theme:           models.ThemeDark,
-	}
-
-	ref, err := evalCtx.GetDashboardUID()
-	if err != nil {
-		return err
-	}
-
-	renderOpts.Path = fmt.Sprintf("d-solo/%s/%s?orgId=%d&panelId=%d", ref.UID, ref.Slug, evalCtx.Rule.OrgID, evalCtx.Rule.PanelID)
-
-	n.log.Debug("Rendering alert panel image", "ruleId", evalCtx.Rule.ID, "urlPath", renderOpts.Path)
-	start := time.Now()
-	result, err := n.renderService.Render(evalCtx.Ctx, renderOpts, nil)
-	if err != nil {
-		return err
-	}
-	took := time.Since(start)
-
-	n.log.Debug("Rendered alert panel image", "ruleId", evalCtx.Rule.ID, "path", result.FilePath, "took", took)
-
-	evalCtx.ImageOnDiskPath = result.FilePath
-
-	n.log.Debug("Uploading alert panel image to external image store", "ruleId", evalCtx.Rule.ID, "path", evalCtx.ImageOnDiskPath)
-
-	start = time.Now()
-	evalCtx.ImagePublicURL, err = uploader.Upload(evalCtx.Ctx, evalCtx.ImageOnDiskPath)
-	if err != nil {
-		return err
-	}
-	took = time.Since(start)
-
-	if evalCtx.ImagePublicURL != "" {
-		n.log.Debug("Uploaded alert panel image to external image store", "ruleId", evalCtx.Rule.ID, "url", evalCtx.ImagePublicURL, "took", took)
-	}
-
-	return nil
-}
-
-func (n *notificationService) getNeededNotifiers(orgID int64, notificationUids []string, evalContext *EvalContext) (notifierStateSlice, error) {
-	query := &alertmodels.GetAlertNotificationsWithUidToSendQuery{OrgID: orgID, UIDs: notificationUids}
-
-	res, err := n.sqlStore.GetAlertNotificationsWithUidToSend(evalContext.Ctx, query)
-	if err != nil {
-		return nil, err
-	}
-
-	var result notifierStateSlice
-	for _, notification := range res {
-		not, err := InitNotifier(notification, n.decryptFn, n.notificationService)
-		if err != nil {
-			n.log.Error("Could not create notifier", "notifier", notification.UID, "error", err)
-			continue
-		}
-
-		query := &alertmodels.GetOrCreateNotificationStateQuery{
-			NotifierID: notification.ID,
-			AlertID:    evalContext.Rule.ID,
-			OrgID:      evalContext.Rule.OrgID,
-		}
-
-		state, err := n.sqlStore.GetOrCreateAlertNotificationState(evalContext.Ctx, query)
-		if err != nil {
-			n.log.Error("Could not get notification state.", "notifier", notification.ID, "error", err)
-			continue
-		}
-
-		if not.ShouldNotify(evalContext.Ctx, evalContext, state) {
-			result = append(result, &notifierState{
-				notifier: not,
-				state:    state,
-			})
-		}
-	}
-
-	return result, nil
-}
-
-// InitNotifier instantiate a new notifier based on the model.
-func InitNotifier(model *alertmodels.AlertNotification, fn GetDecryptedValueFn, notificationService *notifications.NotificationService) (Notifier, error) {
-	notifierPlugin, found := notifierFactories[model.Type]
-	if !found {
-		return nil, fmt.Errorf("unsupported notification type %q", model.Type)
-	}
-
-	return notifierPlugin.Factory(model, fn, notificationService)
-}
-
-// GetDecryptedValueFn is a function that returns the decrypted value of
-// the given key. If the key is not present, then it returns the fallback value.
-type GetDecryptedValueFn func(ctx context.Context, sjd map[string][]byte, key string, fallback string, secret string) string
-
-// NotifierFactory is a signature for creating notifiers.
-type NotifierFactory func(*alertmodels.AlertNotification, GetDecryptedValueFn, notifications.Service) (Notifier, error)
-
-var notifierFactories = make(map[string]*NotifierPlugin)
-
-// RegisterNotifier registers a notifier.
-func RegisterNotifier(plugin *NotifierPlugin) {
-	notifierFactories[plugin.Type] = plugin
-}
-
-// GetNotifiers returns a list of metadata about available notifiers.
-func GetNotifiers() []*NotifierPlugin {
-	list := make([]*NotifierPlugin, 0)
-
-	for _, value := range notifierFactories {
-		list = append(list, value)
-	}
-
-	return list
-}
diff --git a/pkg/services/alerting/notifier_test.go b/pkg/services/alerting/notifier_test.go
deleted file mode 100644
index 93342526f51cc..0000000000000
--- a/pkg/services/alerting/notifier_test.go
+++ /dev/null
@@ -1,405 +0,0 @@
-package alerting
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/imguploader"
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/models"
-	alertmodels "github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/annotations/annotationstest"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/services/rendering"
-	"github.com/grafana/grafana/pkg/services/validations"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func TestNotificationService(t *testing.T) {
-	testRule := &Rule{Name: "Test", Message: "Something is bad"}
-	store := &AlertStoreMock{}
-	evalCtx := NewEvalContext(context.Background(), testRule, &validations.OSSPluginRequestValidator{}, store, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-
-	testRuleTemplated := &Rule{Name: "Test latency ${quantile}", Message: "Something is bad on instance ${instance}"}
-
-	evalCtxWithMatch := NewEvalContext(context.Background(), testRuleTemplated, &validations.OSSPluginRequestValidator{}, store, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-	evalCtxWithMatch.EvalMatches = []*EvalMatch{{
-		Tags: map[string]string{
-			"instance": "localhost:3000",
-			"quantile": "0.99",
-		},
-	}}
-	evalCtxWithoutMatch := NewEvalContext(context.Background(), testRuleTemplated, &validations.OSSPluginRequestValidator{}, store, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-
-	notificationServiceScenario(t, "Given alert rule with upload image enabled should render and upload image and send notification",
-		evalCtx, true, func(sc *scenarioContext) {
-			err := sc.notificationService.SendIfNeeded(evalCtx)
-			require.NoError(sc.t, err)
-
-			require.Equalf(sc.t, 1, sc.renderCount, "expected render to be called, but wasn't")
-			require.Equalf(sc.t, 1, sc.imageUploadCount, "expected image to be uploaded, but wasn't")
-			require.Truef(sc.t, evalCtx.Ctx.Value(notificationSent{}).(bool), "expected notification to be sent, but wasn't")
-		})
-
-	notificationServiceScenario(t,
-		"Given alert rule with upload image enabled but no renderer available should render and upload unavailable image and send notification",
-		evalCtx, true, func(sc *scenarioContext) {
-			sc.rendererAvailable = false
-			err := sc.notificationService.SendIfNeeded(evalCtx)
-			require.NoError(sc.t, err)
-
-			require.Equalf(sc.t, 1, sc.renderCount, "expected render to be called, but it wasn't")
-			require.Equalf(sc.t, 1, sc.imageUploadCount, "expected image to be uploaded, but it wasn't")
-			require.Truef(sc.t, evalCtx.Ctx.Value(notificationSent{}).(bool), "expected notification to be sent, but wasn't")
-		})
-
-	notificationServiceScenario(
-		t, "Given alert rule with upload image disabled should not render and upload image, but send notification",
-		evalCtx, false, func(sc *scenarioContext) {
-			err := sc.notificationService.SendIfNeeded(evalCtx)
-			require.NoError(t, err)
-
-			require.Equalf(sc.t, 0, sc.renderCount, "expected render not to be called, but it was")
-			require.Equalf(sc.t, 0, sc.imageUploadCount, "expected image not to be uploaded, but it was")
-			require.Truef(sc.t, evalCtx.Ctx.Value(notificationSent{}).(bool), "expected notification to be sent, but wasn't")
-		})
-
-	notificationServiceScenario(t, "Given alert rule with upload image enabled and render times out should send notification",
-		evalCtx, true, func(sc *scenarioContext) {
-			setting.AlertingNotificationTimeout = 200 * time.Millisecond
-			sc.renderProvider = func(ctx context.Context, opts rendering.Opts) (*rendering.RenderResult, error) {
-				wait := make(chan bool)
-
-				go func() {
-					time.Sleep(1 * time.Second)
-					wait <- true
-				}()
-
-				select {
-				case <-ctx.Done():
-					if err := ctx.Err(); err != nil {
-						return nil, err
-					}
-					break
-				case <-wait:
-				}
-
-				return nil, nil
-			}
-			err := sc.notificationService.SendIfNeeded(evalCtx)
-			require.NoError(sc.t, err)
-
-			require.Equalf(sc.t, 0, sc.renderCount, "expected render not to be called, but it was")
-			require.Equalf(sc.t, 0, sc.imageUploadCount, "expected image not to be uploaded, but it was")
-			require.Truef(sc.t, evalCtx.Ctx.Value(notificationSent{}).(bool), "expected notification to be sent, but wasn't")
-		})
-
-	notificationServiceScenario(t, "Given alert rule with upload image enabled and upload times out should send notification",
-		evalCtx, true, func(sc *scenarioContext) {
-			setting.AlertingNotificationTimeout = 200 * time.Millisecond
-			sc.uploadProvider = func(ctx context.Context, path string) (string, error) {
-				wait := make(chan bool)
-
-				go func() {
-					time.Sleep(1 * time.Second)
-					wait <- true
-				}()
-
-				select {
-				case <-ctx.Done():
-					if err := ctx.Err(); err != nil {
-						return "", err
-					}
-					break
-				case <-wait:
-				}
-
-				return "", nil
-			}
-			err := sc.notificationService.SendIfNeeded(evalCtx)
-			require.NoError(sc.t, err)
-
-			require.Equalf(sc.t, 1, sc.renderCount, "expected render to be called, but wasn't")
-			require.Equalf(sc.t, 0, sc.imageUploadCount, "expected image not to be uploaded, but it was")
-			require.Truef(sc.t, evalCtx.Ctx.Value(notificationSent{}).(bool), "expected notification to be sent, but wasn't")
-		})
-
-	notificationServiceScenario(t, "Given matched alert rule with templated notification fields",
-		evalCtxWithMatch, true, func(sc *scenarioContext) {
-			err := sc.notificationService.SendIfNeeded(evalCtxWithMatch)
-			require.NoError(sc.t, err)
-
-			ctx := evalCtxWithMatch
-			require.Equalf(sc.t, 1, sc.renderCount, "expected render to be called, but wasn't")
-			require.Equalf(sc.t, 1, sc.imageUploadCount, "expected image to be uploaded, but wasn't")
-			require.Truef(sc.t, ctx.Ctx.Value(notificationSent{}).(bool), "expected notification to be sent, but wasn't")
-			assert.Equal(t, "Test latency 0.99", ctx.Rule.Name)
-			assert.Equal(t, "Something is bad on instance localhost:3000", ctx.Rule.Message)
-		})
-
-	notificationServiceScenario(t, "Given unmatched alert rule with templated notification fields",
-		evalCtxWithoutMatch, true, func(sc *scenarioContext) {
-			err := sc.notificationService.SendIfNeeded(evalCtxWithMatch)
-			require.NoError(sc.t, err)
-
-			ctx := evalCtxWithMatch
-			require.Equalf(sc.t, 1, sc.renderCount, "expected render to be called, but wasn't")
-			require.Equalf(sc.t, 1, sc.imageUploadCount, "expected image to be uploaded, but wasn't")
-			require.Truef(sc.t, ctx.Ctx.Value(notificationSent{}).(bool), "expected notification to be sent, but wasn't")
-			assert.Equal(t, evalCtxWithoutMatch.Rule.Name, ctx.Rule.Name)
-			assert.Equal(t, evalCtxWithoutMatch.Rule.Message, ctx.Rule.Message)
-		})
-}
-
-type scenarioContext struct {
-	t                   *testing.T
-	evalCtx             *EvalContext
-	notificationService *notificationService
-	imageUploadCount    int
-	renderCount         int
-	uploadProvider      func(ctx context.Context, path string) (string, error)
-	renderProvider      func(ctx context.Context, opts rendering.Opts) (*rendering.RenderResult, error)
-	rendererAvailable   bool
-}
-
-type scenarioFunc func(c *scenarioContext)
-
-func notificationServiceScenario(t *testing.T, name string, evalCtx *EvalContext, uploadImage bool, fn scenarioFunc) {
-	t.Run(name, func(t *testing.T) {
-		RegisterNotifier(&NotifierPlugin{
-			Type:        "test",
-			Name:        "Test",
-			Description: "Test notifier",
-			Factory:     newTestNotifier,
-		})
-
-		evalCtx.dashboardRef = &dashboards.DashboardRef{UID: "db-uid"}
-
-		store := evalCtx.Store.(*AlertStoreMock)
-
-		store.getAlertNotificationsWithUidToSend = func(ctx context.Context, query *alertmodels.GetAlertNotificationsWithUidToSendQuery) (res []*alertmodels.AlertNotification, err error) {
-			return []*alertmodels.AlertNotification{
-				{
-					ID:   1,
-					Type: "test",
-					Settings: simplejson.NewFromAny(map[string]any{
-						"uploadImage": uploadImage,
-					}),
-				},
-			}, nil
-		}
-
-		store.getOrCreateNotificationState = func(ctx context.Context, query *alertmodels.GetOrCreateNotificationStateQuery) (res *alertmodels.AlertNotificationState, err error) {
-			return &alertmodels.AlertNotificationState{
-				AlertID:                      evalCtx.Rule.ID,
-				AlertRuleStateUpdatedVersion: 1,
-				ID:                           1,
-				OrgID:                        evalCtx.Rule.OrgID,
-				State:                        alertmodels.AlertNotificationStateUnknown,
-			}, nil
-		}
-
-		setting.AlertingNotificationTimeout = 30 * time.Second
-
-		scenarioCtx := &scenarioContext{
-			t:       t,
-			evalCtx: evalCtx,
-		}
-
-		uploadProvider := func(ctx context.Context, path string) (string, error) {
-			scenarioCtx.imageUploadCount++
-			return "", nil
-		}
-
-		imageUploader := &testImageUploader{
-			uploadProvider: func(ctx context.Context, path string) (string, error) {
-				if scenarioCtx.uploadProvider != nil {
-					if _, err := scenarioCtx.uploadProvider(ctx, path); err != nil {
-						return "", err
-					}
-				}
-
-				return uploadProvider(ctx, path)
-			},
-		}
-
-		origNewImageUploaderProvider := newImageUploaderProvider
-		newImageUploaderProvider = func() (imguploader.ImageUploader, error) {
-			return imageUploader, nil
-		}
-		defer func() {
-			newImageUploaderProvider = origNewImageUploaderProvider
-		}()
-
-		renderProvider := func(ctx context.Context, opts rendering.Opts) (*rendering.RenderResult, error) {
-			scenarioCtx.renderCount++
-			return &rendering.RenderResult{FilePath: "image.png"}, nil
-		}
-
-		scenarioCtx.rendererAvailable = true
-
-		renderService := &testRenderService{
-			isAvailableProvider: func(ctx context.Context) bool {
-				return scenarioCtx.rendererAvailable
-			},
-			renderProvider: func(ctx context.Context, opts rendering.Opts) (*rendering.RenderResult, error) {
-				if scenarioCtx.renderProvider != nil {
-					if _, err := scenarioCtx.renderProvider(ctx, opts); err != nil {
-						return nil, err
-					}
-				}
-
-				return renderProvider(ctx, opts)
-			},
-		}
-
-		scenarioCtx.notificationService = newNotificationService(renderService, store, nil, nil)
-		fn(scenarioCtx)
-	})
-}
-
-type testNotifier struct {
-	Name                  string
-	Type                  string
-	UID                   string
-	IsDefault             bool
-	UploadImage           bool
-	SendReminder          bool
-	DisableResolveMessage bool
-	Frequency             time.Duration
-}
-
-func newTestNotifier(model *alertmodels.AlertNotification, _ GetDecryptedValueFn, ns notifications.Service) (Notifier, error) {
-	uploadImage := true
-	value, exist := model.Settings.CheckGet("uploadImage")
-	if exist {
-		uploadImage = value.MustBool()
-	}
-
-	return &testNotifier{
-		UID:                   model.UID,
-		Name:                  model.Name,
-		IsDefault:             model.IsDefault,
-		Type:                  model.Type,
-		UploadImage:           uploadImage,
-		SendReminder:          model.SendReminder,
-		DisableResolveMessage: model.DisableResolveMessage,
-		Frequency:             model.Frequency,
-	}, nil
-}
-
-type notificationSent struct{}
-
-func (n *testNotifier) Notify(evalCtx *EvalContext) error {
-	evalCtx.Ctx = context.WithValue(evalCtx.Ctx, notificationSent{}, true)
-	return nil
-}
-
-func (n *testNotifier) ShouldNotify(ctx context.Context, evalCtx *EvalContext, notifierState *alertmodels.AlertNotificationState) bool {
-	return true
-}
-
-func (n *testNotifier) GetType() string {
-	return n.Type
-}
-
-func (n *testNotifier) NeedsImage() bool {
-	return n.UploadImage
-}
-
-func (n *testNotifier) GetNotifierUID() string {
-	return n.UID
-}
-
-func (n *testNotifier) GetIsDefault() bool {
-	return n.IsDefault
-}
-
-func (n *testNotifier) GetSendReminder() bool {
-	return n.SendReminder
-}
-
-func (n *testNotifier) GetDisableResolveMessage() bool {
-	return n.DisableResolveMessage
-}
-
-func (n *testNotifier) GetFrequency() time.Duration {
-	return n.Frequency
-}
-
-var _ Notifier = &testNotifier{}
-
-type testRenderService struct {
-	isAvailableProvider      func(ctx context.Context) bool
-	renderProvider           func(ctx context.Context, opts rendering.Opts) (*rendering.RenderResult, error)
-	renderErrorImageProvider func(error error) (*rendering.RenderResult, error)
-}
-
-func (s *testRenderService) SanitizeSVG(ctx context.Context, req *rendering.SanitizeSVGRequest) (*rendering.SanitizeSVGResponse, error) {
-	return &rendering.SanitizeSVGResponse{Sanitized: req.Content}, nil
-}
-
-func (s *testRenderService) HasCapability(_ context.Context, feature rendering.CapabilityName) (rendering.CapabilitySupportRequestResult, error) {
-	return rendering.CapabilitySupportRequestResult{}, nil
-}
-
-func (s *testRenderService) IsAvailable(ctx context.Context) bool {
-	if s.isAvailableProvider != nil {
-		return s.isAvailableProvider(ctx)
-	}
-
-	return true
-}
-
-func (s *testRenderService) Render(ctx context.Context, opts rendering.Opts, session rendering.Session) (*rendering.RenderResult, error) {
-	if s.renderProvider != nil {
-		return s.renderProvider(ctx, opts)
-	}
-
-	return &rendering.RenderResult{FilePath: "image.png"}, nil
-}
-
-func (s *testRenderService) RenderCSV(ctx context.Context, opts rendering.CSVOpts, session rendering.Session) (*rendering.RenderCSVResult, error) {
-	return nil, nil
-}
-
-func (s *testRenderService) RenderErrorImage(theme models.Theme, err error) (*rendering.RenderResult, error) {
-	if s.renderErrorImageProvider != nil {
-		return s.renderErrorImageProvider(err)
-	}
-
-	return &rendering.RenderResult{FilePath: "image.png"}, nil
-}
-
-func (s *testRenderService) GetRenderUser(ctx context.Context, key string) (*rendering.RenderUser, bool) {
-	return nil, false
-}
-
-func (s *testRenderService) Version() string {
-	return ""
-}
-
-func (s *testRenderService) CreateRenderingSession(ctx context.Context, authOpts rendering.AuthOpts, sessionOpts rendering.SessionOpts) (rendering.Session, error) {
-	return nil, nil
-}
-
-var _ rendering.Service = &testRenderService{}
-
-type testImageUploader struct {
-	uploadProvider func(ctx context.Context, path string) (string, error)
-}
-
-func (u *testImageUploader) Upload(ctx context.Context, path string) (string, error) {
-	if u.uploadProvider != nil {
-		return u.uploadProvider(ctx, path)
-	}
-
-	return "", nil
-}
-
-var _ imguploader.ImageUploader = &testImageUploader{}
diff --git a/pkg/services/alerting/notifiers/alertmanager.go b/pkg/services/alerting/notifiers/alertmanager.go
deleted file mode 100644
index 4936dee2cdb2d..0000000000000
--- a/pkg/services/alerting/notifiers/alertmanager.go
+++ /dev/null
@@ -1,206 +0,0 @@
-package notifiers
-
-import (
-	"context"
-	"fmt"
-	"regexp"
-	"strings"
-	"time"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func init() {
-	alerting.RegisterNotifier(&alerting.NotifierPlugin{
-		Type:        "prometheus-alertmanager",
-		Name:        "Prometheus Alertmanager",
-		Description: "Sends alert to Prometheus Alertmanager",
-		Heading:     "Alertmanager settings",
-		Factory:     NewAlertmanagerNotifier,
-		Options: []alerting.NotifierOption{
-			{
-				Label:        "Url",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Description:  "As specified in Alertmanager documentation, do not specify a load balancer here. Enter all your Alertmanager URLs comma-separated.",
-				Placeholder:  "http://localhost:9093",
-				PropertyName: "url",
-				Required:     true,
-			},
-			{
-				Label:        "Basic Auth User",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				PropertyName: "basicAuthUser",
-			},
-			{
-				Label:        "Basic Auth Password",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypePassword,
-				PropertyName: "basicAuthPassword",
-				Secure:       true,
-			},
-		},
-	})
-}
-
-// NewAlertmanagerNotifier returns a new Alertmanager notifier
-func NewAlertmanagerNotifier(model *models.AlertNotification, fn alerting.GetDecryptedValueFn, ns notifications.Service) (alerting.Notifier, error) {
-	urlString := model.Settings.Get("url").MustString()
-	if urlString == "" {
-		return nil, alerting.ValidationError{Reason: "Could not find url property in settings"}
-	}
-
-	var url []string
-	for _, u := range strings.Split(urlString, ",") {
-		u = strings.TrimSpace(u)
-		if u != "" {
-			url = append(url, u)
-		}
-	}
-	basicAuthUser := model.Settings.Get("basicAuthUser").MustString()
-	basicAuthPassword := fn(context.Background(), model.SecureSettings, "basicAuthPassword", model.Settings.Get("basicAuthPassword").MustString(), setting.SecretKey)
-
-	return &AlertmanagerNotifier{
-		NotifierBase:      NewNotifierBase(model, ns),
-		URL:               url,
-		BasicAuthUser:     basicAuthUser,
-		BasicAuthPassword: basicAuthPassword,
-		log:               log.New("alerting.notifier.prometheus-alertmanager"),
-	}, nil
-}
-
-// AlertmanagerNotifier sends alert notifications to the alert manager
-type AlertmanagerNotifier struct {
-	NotifierBase
-	URL               []string
-	BasicAuthUser     string
-	BasicAuthPassword string
-	log               log.Logger
-}
-
-// ShouldNotify returns true if the notifiers should be used depending on state
-func (am *AlertmanagerNotifier) ShouldNotify(ctx context.Context, evalContext *alerting.EvalContext, notificationState *models.AlertNotificationState) bool {
-	am.log.Debug("Should notify", "ruleId", evalContext.Rule.ID, "state", evalContext.Rule.State, "previousState", evalContext.PrevAlertState)
-
-	// Do not notify when we become OK for the first time.
-	if (evalContext.PrevAlertState == models.AlertStatePending) && (evalContext.Rule.State == models.AlertStateOK) {
-		return false
-	}
-
-	// Notify on Alerting -> OK to resolve before alertmanager timeout.models.AlertStateOK
-	if (evalContext.PrevAlertState == models.AlertStateAlerting) && (evalContext.Rule.State == models.AlertStateOK) {
-		return true
-	}
-
-	return evalContext.Rule.State == models.AlertStateAlerting
-}
-
-func (am *AlertmanagerNotifier) createAlert(evalContext *alerting.EvalContext, match *alerting.EvalMatch, ruleURL string) *simplejson.Json {
-	alertJSON := simplejson.New()
-	alertJSON.Set("startsAt", evalContext.StartTime.UTC().Format(time.RFC3339))
-	if evalContext.Rule.State == models.AlertStateOK {
-		alertJSON.Set("endsAt", time.Now().UTC().Format(time.RFC3339))
-	}
-	alertJSON.Set("generatorURL", ruleURL)
-
-	// Annotations (summary and description are very commonly used).
-	alertJSON.SetPath([]string{"annotations", "summary"}, evalContext.Rule.Name)
-	description := ""
-	if evalContext.Rule.Message != "" {
-		description += evalContext.Rule.Message
-	}
-	if evalContext.Error != nil {
-		if description != "" {
-			description += "\n"
-		}
-		description += "Error: " + evalContext.Error.Error()
-	}
-	if description != "" {
-		alertJSON.SetPath([]string{"annotations", "description"}, description)
-	}
-	if evalContext.ImagePublicURL != "" {
-		alertJSON.SetPath([]string{"annotations", "image"}, evalContext.ImagePublicURL)
-	}
-
-	// Labels (from metrics tags + AlertRuleTags + mandatory alertname).
-	tags := make(map[string]string)
-	if match != nil {
-		if len(match.Tags) == 0 {
-			tags["metric"] = match.Metric
-		} else {
-			for k, v := range match.Tags {
-				tags[replaceIllegalCharsInLabelname(k)] = v
-			}
-		}
-	}
-	for _, tag := range evalContext.Rule.AlertRuleTags {
-		tags[tag.Key] = tag.Value
-	}
-	tags["alertname"] = evalContext.Rule.Name
-	alertJSON.Set("labels", tags)
-	return alertJSON
-}
-
-// Notify sends alert notifications to the alert manager
-func (am *AlertmanagerNotifier) Notify(evalContext *alerting.EvalContext) error {
-	am.log.Info("Sending Alertmanager alert", "ruleId", evalContext.Rule.ID, "notification", am.Name)
-
-	ruleURL, err := evalContext.GetRuleURL()
-	if err != nil {
-		am.log.Error("Failed get rule link", "error", err)
-		return err
-	}
-
-	// Send one alert per matching series.
-	alerts := make([]any, 0)
-	for _, match := range evalContext.EvalMatches {
-		alert := am.createAlert(evalContext, match, ruleURL)
-		alerts = append(alerts, alert)
-	}
-
-	// This happens on ExecutionError or NoData
-	if len(alerts) == 0 {
-		alert := am.createAlert(evalContext, nil, ruleURL)
-		alerts = append(alerts, alert)
-	}
-
-	bodyJSON := simplejson.NewFromAny(alerts)
-	body, _ := bodyJSON.MarshalJSON()
-	errCnt := 0
-
-	for _, url := range am.URL {
-		cmd := &notifications.SendWebhookSync{
-			Url:        strings.TrimSuffix(url, "/") + "/api/v1/alerts",
-			User:       am.BasicAuthUser,
-			Password:   am.BasicAuthPassword,
-			HttpMethod: "POST",
-			Body:       string(body),
-		}
-
-		if err := am.NotificationService.SendWebhookSync(evalContext.Ctx, cmd); err != nil {
-			am.log.Error("Failed to send alertmanager", "error", err, "alertmanager", am.Name, "url", url)
-			errCnt++
-		}
-	}
-
-	// This happens when every dispatch return error
-	if errCnt == len(am.URL) {
-		return fmt.Errorf("failed to send alert to alertmanager")
-	}
-
-	return nil
-}
-
-// regexp that matches all none valid label name characters
-// https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels
-var labelNamePattern = regexp.MustCompile(`[^a-zA-Z0-9_]`)
-
-func replaceIllegalCharsInLabelname(input string) string {
-	return labelNamePattern.ReplaceAllString(input, "_")
-}
diff --git a/pkg/services/alerting/notifiers/alertmanager_test.go b/pkg/services/alerting/notifiers/alertmanager_test.go
deleted file mode 100644
index 4f3b8e762bdf0..0000000000000
--- a/pkg/services/alerting/notifiers/alertmanager_test.go
+++ /dev/null
@@ -1,138 +0,0 @@
-package notifiers
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/annotations/annotationstest"
-	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
-	"github.com/grafana/grafana/pkg/services/validations"
-)
-
-func TestReplaceIllegalCharswithUnderscore(t *testing.T) {
-	cases := []struct {
-		input    string
-		expected string
-	}{
-		{
-			input:    "foobar",
-			expected: "foobar",
-		},
-		{
-			input:    `foo.,\][!?#="~*^&+|<>\'bar09_09`,
-			expected: "foo____________________bar09_09",
-		},
-	}
-
-	for _, c := range cases {
-		assert.Equal(t, replaceIllegalCharsInLabelname(c.input), c.expected)
-	}
-}
-
-func TestWhenAlertManagerShouldNotify(t *testing.T) {
-	tcs := []struct {
-		prevState models.AlertStateType
-		newState  models.AlertStateType
-
-		expect bool
-	}{
-		{
-			prevState: models.AlertStatePending,
-			newState:  models.AlertStateOK,
-			expect:    false,
-		},
-		{
-			prevState: models.AlertStateAlerting,
-			newState:  models.AlertStateOK,
-			expect:    true,
-		},
-		{
-			prevState: models.AlertStateOK,
-			newState:  models.AlertStatePending,
-			expect:    false,
-		},
-		{
-			prevState: models.AlertStateUnknown,
-			newState:  models.AlertStatePending,
-			expect:    false,
-		},
-	}
-
-	for _, tc := range tcs {
-		am := &AlertmanagerNotifier{log: log.New("test.logger")}
-		evalContext := alerting.NewEvalContext(context.Background(), &alerting.Rule{
-			State: tc.prevState,
-		}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-
-		evalContext.Rule.State = tc.newState
-
-		res := am.ShouldNotify(context.Background(), evalContext, &models.AlertNotificationState{})
-		if res != tc.expect {
-			t.Errorf("got %v expected %v", res, tc.expect)
-		}
-	}
-}
-
-//nolint:goconst
-func TestAlertmanagerNotifier(t *testing.T) {
-	encryptionService := encryptionservice.SetupTestService(t)
-
-	t.Run("Parsing alert notification from settings", func(t *testing.T) {
-		t.Run("empty settings should return error", func(t *testing.T) {
-			json := `{ }`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "alertmanager",
-				Type:     "alertmanager",
-				Settings: settingsJSON,
-			}
-
-			_, err := NewAlertmanagerNotifier(model, encryptionService.GetDecryptedValue, nil)
-			require.Error(t, err)
-		})
-
-		t.Run("from settings", func(t *testing.T) {
-			json := `{ "url": "http://127.0.0.1:9093/", "basicAuthUser": "user", "basicAuthPassword": "password" }`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "alertmanager",
-				Type:     "alertmanager",
-				Settings: settingsJSON,
-			}
-
-			not, err := NewAlertmanagerNotifier(model, encryptionService.GetDecryptedValue, nil)
-			alertmanagerNotifier := not.(*AlertmanagerNotifier)
-
-			require.NoError(t, err)
-			require.Equal(t, alertmanagerNotifier.BasicAuthUser, "user")
-			require.Equal(t, alertmanagerNotifier.BasicAuthPassword, "password")
-			require.Equal(t, alertmanagerNotifier.URL, []string{"http://127.0.0.1:9093/"})
-		})
-
-		t.Run("from settings with multiple alertmanager", func(t *testing.T) {
-			json := `{ "url": "http://alertmanager1:9093,http://alertmanager2:9093" }`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "alertmanager",
-				Type:     "alertmanager",
-				Settings: settingsJSON,
-			}
-
-			not, err := NewAlertmanagerNotifier(model, encryptionService.GetDecryptedValue, nil)
-			alertmanagerNotifier := not.(*AlertmanagerNotifier)
-
-			require.NoError(t, err)
-			require.Equal(t, alertmanagerNotifier.URL, []string{"http://alertmanager1:9093", "http://alertmanager2:9093"})
-		})
-	})
-}
diff --git a/pkg/services/alerting/notifiers/base.go b/pkg/services/alerting/notifiers/base.go
deleted file mode 100644
index c4730cbac8082..0000000000000
--- a/pkg/services/alerting/notifiers/base.go
+++ /dev/null
@@ -1,151 +0,0 @@
-package notifiers
-
-import (
-	"context"
-	"time"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/notifications"
-)
-
-const (
-	triggMetrString = "Triggered metrics:\n\n"
-)
-
-// NotifierBase is the base implementation of a notifier.
-type NotifierBase struct {
-	Name                  string
-	Type                  string
-	UID                   string
-	IsDefault             bool
-	UploadImage           bool
-	SendReminder          bool
-	DisableResolveMessage bool
-	Frequency             time.Duration
-
-	NotificationService notifications.Service
-
-	log log.Logger
-}
-
-// NewNotifierBase returns a new `NotifierBase`.
-func NewNotifierBase(model *models.AlertNotification, notificationService notifications.Service) NotifierBase {
-	uploadImage := true
-	if value, exists := model.Settings.CheckGet("uploadImage"); exists {
-		uploadImage = value.MustBool()
-	}
-
-	return NotifierBase{
-		UID:                   model.UID,
-		Name:                  model.Name,
-		IsDefault:             model.IsDefault,
-		Type:                  model.Type,
-		UploadImage:           uploadImage,
-		SendReminder:          model.SendReminder,
-		DisableResolveMessage: model.DisableResolveMessage,
-		Frequency:             model.Frequency,
-		NotificationService:   notificationService,
-		log:                   log.New("alerting.notifier." + model.Name),
-	}
-}
-
-// ShouldNotify checks this evaluation should send an alert notification
-func (n *NotifierBase) ShouldNotify(ctx context.Context, context *alerting.EvalContext, notifierState *models.AlertNotificationState) bool {
-	prevState := context.PrevAlertState
-	newState := context.Rule.State
-
-	// Only notify on state change.
-	if prevState == newState && !n.SendReminder {
-		return false
-	}
-
-	if prevState == newState && n.SendReminder {
-		// Do not notify if interval has not elapsed
-		lastNotify := time.Unix(notifierState.UpdatedAt, 0)
-		if notifierState.UpdatedAt != 0 && lastNotify.Add(n.Frequency).After(time.Now()) {
-			return false
-		}
-
-		// Do not notify if alert state is OK or pending even on repeated notify
-		if newState == models.AlertStateOK || newState == models.AlertStatePending {
-			return false
-		}
-	}
-
-	okOrPending := newState == models.AlertStatePending || newState == models.AlertStateOK
-
-	// Do not notify when new state is ok/pending when previous is unknown
-	if prevState == models.AlertStateUnknown && okOrPending {
-		return false
-	}
-
-	// Do not notify when we become Pending for the first
-	if prevState == models.AlertStateNoData && newState == models.AlertStatePending {
-		return false
-	}
-
-	// Do not notify when we become OK from pending
-	if prevState == models.AlertStatePending && newState == models.AlertStateOK {
-		return false
-	}
-
-	// Do not notify when we OK -> Pending
-	if prevState == models.AlertStateOK && newState == models.AlertStatePending {
-		return false
-	}
-
-	// Do not notify if state pending and it have been updated last minute
-	if notifierState.State == models.AlertNotificationStatePending {
-		lastUpdated := time.Unix(notifierState.UpdatedAt, 0)
-		if lastUpdated.Add(1 * time.Minute).After(time.Now()) {
-			return false
-		}
-	}
-
-	// Do not notify when state is OK if DisableResolveMessage is set to true
-	if newState == models.AlertStateOK && n.DisableResolveMessage {
-		return false
-	}
-
-	return true
-}
-
-// GetType returns the notifier type.
-func (n *NotifierBase) GetType() string {
-	return n.Type
-}
-
-// NeedsImage returns true if an image is expected in the notification.
-func (n *NotifierBase) NeedsImage() bool {
-	return n.UploadImage
-}
-
-// GetNotifierUID returns the notifier `uid`.
-func (n *NotifierBase) GetNotifierUID() string {
-	return n.UID
-}
-
-// GetIsDefault returns true if the notifiers should
-// be used for all alerts.
-func (n *NotifierBase) GetIsDefault() bool {
-	return n.IsDefault
-}
-
-// GetSendReminder returns true if reminders should be sent.
-func (n *NotifierBase) GetSendReminder() bool {
-	return n.SendReminder
-}
-
-// GetDisableResolveMessage returns true if ok alert notifications
-// should be skipped.
-func (n *NotifierBase) GetDisableResolveMessage() bool {
-	return n.DisableResolveMessage
-}
-
-// GetFrequency returns the frequency for how often
-// alerts should be evaluated.
-func (n *NotifierBase) GetFrequency() time.Duration {
-	return n.Frequency
-}
diff --git a/pkg/services/alerting/notifiers/base_test.go b/pkg/services/alerting/notifiers/base_test.go
deleted file mode 100644
index e95fca0652a1f..0000000000000
--- a/pkg/services/alerting/notifiers/base_test.go
+++ /dev/null
@@ -1,221 +0,0 @@
-package notifiers
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/annotations/annotationstest"
-	"github.com/grafana/grafana/pkg/services/validations"
-)
-
-func TestShouldSendAlertNotification(t *testing.T) {
-	tnow := time.Now()
-
-	tcs := []struct {
-		name         string
-		prevState    models.AlertStateType
-		newState     models.AlertStateType
-		sendReminder bool
-		frequency    time.Duration
-		state        *models.AlertNotificationState
-
-		expect bool
-	}{
-		{
-			name:         "pending -> ok should not trigger an notification",
-			newState:     models.AlertStateOK,
-			prevState:    models.AlertStatePending,
-			sendReminder: false,
-
-			expect: false,
-		},
-		{
-			name:         "ok -> alerting should trigger an notification",
-			newState:     models.AlertStateAlerting,
-			prevState:    models.AlertStateOK,
-			sendReminder: false,
-
-			expect: true,
-		},
-		{
-			name:         "ok -> pending should not trigger an notification",
-			newState:     models.AlertStatePending,
-			prevState:    models.AlertStateOK,
-			sendReminder: false,
-
-			expect: false,
-		},
-		{
-			name:         "ok -> ok should not trigger an notification",
-			newState:     models.AlertStateOK,
-			prevState:    models.AlertStateOK,
-			sendReminder: false,
-
-			expect: false,
-		},
-		{
-			name:         "ok -> ok with reminder should not trigger an notification",
-			newState:     models.AlertStateOK,
-			prevState:    models.AlertStateOK,
-			sendReminder: true,
-
-			expect: false,
-		},
-		{
-			name:         "alerting -> ok should trigger an notification",
-			newState:     models.AlertStateOK,
-			prevState:    models.AlertStateAlerting,
-			sendReminder: false,
-
-			expect: true,
-		},
-		{
-			name:         "alerting -> ok should trigger an notification when reminders enabled",
-			newState:     models.AlertStateOK,
-			prevState:    models.AlertStateAlerting,
-			frequency:    time.Minute * 10,
-			sendReminder: true,
-			state:        &models.AlertNotificationState{UpdatedAt: tnow.Add(-time.Minute).Unix()},
-
-			expect: true,
-		},
-		{
-			name:         "alerting -> alerting with reminder and no state should trigger",
-			newState:     models.AlertStateAlerting,
-			prevState:    models.AlertStateAlerting,
-			frequency:    time.Minute * 10,
-			sendReminder: true,
-
-			expect: true,
-		},
-		{
-			name:         "alerting -> alerting with reminder and last notification sent 1 minute ago should not trigger",
-			newState:     models.AlertStateAlerting,
-			prevState:    models.AlertStateAlerting,
-			frequency:    time.Minute * 10,
-			sendReminder: true,
-			state:        &models.AlertNotificationState{UpdatedAt: tnow.Add(-time.Minute).Unix()},
-
-			expect: false,
-		},
-		{
-			name:         "alerting -> alerting with reminder and last notification sent 11 minutes ago should trigger",
-			newState:     models.AlertStateAlerting,
-			prevState:    models.AlertStateAlerting,
-			frequency:    time.Minute * 10,
-			sendReminder: true,
-			state:        &models.AlertNotificationState{UpdatedAt: tnow.Add(-11 * time.Minute).Unix()},
-
-			expect: true,
-		},
-		{
-			name:      "OK -> alerting with notification state pending and updated 30 seconds ago should not trigger",
-			newState:  models.AlertStateAlerting,
-			prevState: models.AlertStateOK,
-			state:     &models.AlertNotificationState{State: models.AlertNotificationStatePending, UpdatedAt: tnow.Add(-30 * time.Second).Unix()},
-
-			expect: false,
-		},
-		{
-			name:      "OK -> alerting with notification state pending and updated 2 minutes ago should trigger",
-			newState:  models.AlertStateAlerting,
-			prevState: models.AlertStateOK,
-			state:     &models.AlertNotificationState{State: models.AlertNotificationStatePending, UpdatedAt: tnow.Add(-2 * time.Minute).Unix()},
-
-			expect: true,
-		},
-		{
-			name:      "unknown -> ok",
-			prevState: models.AlertStateUnknown,
-			newState:  models.AlertStateOK,
-
-			expect: false,
-		},
-		{
-			name:      "unknown -> pending",
-			prevState: models.AlertStateUnknown,
-			newState:  models.AlertStatePending,
-
-			expect: false,
-		},
-		{
-			name:      "unknown -> alerting",
-			prevState: models.AlertStateUnknown,
-			newState:  models.AlertStateAlerting,
-
-			expect: true,
-		},
-		{
-			name:      "no_data -> pending",
-			prevState: models.AlertStateNoData,
-			newState:  models.AlertStatePending,
-
-			expect: false,
-		},
-		{
-			name:      "no_data -> ok",
-			prevState: models.AlertStateNoData,
-			newState:  models.AlertStateOK,
-
-			expect: true,
-		},
-	}
-
-	for _, tc := range tcs {
-		evalContext := alerting.NewEvalContext(context.Background(), &alerting.Rule{
-			State: tc.prevState,
-		}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-
-		if tc.state == nil {
-			tc.state = &models.AlertNotificationState{}
-		}
-
-		evalContext.Rule.State = tc.newState
-		nb := &NotifierBase{SendReminder: tc.sendReminder, Frequency: tc.frequency}
-
-		r := nb.ShouldNotify(evalContext.Ctx, evalContext, tc.state)
-		assert.Equal(t, r, tc.expect, "failed test %s. expected %+v to return: %v", tc.name, tc, tc.expect)
-	}
-}
-
-func TestBaseNotifier(t *testing.T) {
-	bJSON := simplejson.New()
-
-	model := &models.AlertNotification{
-		UID:      "1",
-		Name:     "name",
-		Type:     "email",
-		Settings: bJSON,
-	}
-
-	t.Run("can parse false value", func(t *testing.T) {
-		bJSON.Set("uploadImage", false)
-
-		base := NewNotifierBase(model, nil)
-		require.False(t, base.UploadImage)
-	})
-
-	t.Run("can parse true value", func(t *testing.T) {
-		bJSON.Set("uploadImage", true)
-
-		base := NewNotifierBase(model, nil)
-		require.True(t, base.UploadImage)
-	})
-
-	t.Run("default value should be true for backwards compatibility", func(t *testing.T) {
-		base := NewNotifierBase(model, nil)
-		require.True(t, base.UploadImage)
-	})
-
-	t.Run("default value should be false for backwards compatibility", func(t *testing.T) {
-		base := NewNotifierBase(model, nil)
-		require.False(t, base.DisableResolveMessage)
-	})
-}
diff --git a/pkg/services/alerting/notifiers/dingding.go b/pkg/services/alerting/notifiers/dingding.go
deleted file mode 100644
index ab4f452e988aa..0000000000000
--- a/pkg/services/alerting/notifiers/dingding.go
+++ /dev/null
@@ -1,158 +0,0 @@
-package notifiers
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/url"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/notifications"
-)
-
-const defaultDingdingMsgType = "link"
-
-func init() {
-	alerting.RegisterNotifier(&alerting.NotifierPlugin{
-		Type:        "dingding",
-		Name:        "DingDing",
-		Description: "Sends HTTP POST request to DingDing",
-		Heading:     "DingDing settings",
-		Factory:     newDingDingNotifier,
-		Options: []alerting.NotifierOption{
-			{
-				Label:        "Url",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Placeholder:  "https://oapi.dingtalk.com/robot/send?access_token=xxxxxxxxx",
-				PropertyName: "url",
-				Required:     true,
-			},
-			{
-				Label:        "Message Type",
-				Element:      alerting.ElementTypeSelect,
-				PropertyName: "msgType",
-				SelectOptions: []alerting.SelectOption{
-					{
-						Value: "link",
-						Label: "Link"},
-					{
-						Value: "actionCard",
-						Label: "ActionCard",
-					},
-				},
-			},
-		},
-	})
-}
-
-func newDingDingNotifier(model *models.AlertNotification, _ alerting.GetDecryptedValueFn, ns notifications.Service) (alerting.Notifier, error) {
-	url := model.Settings.Get("url").MustString()
-	if url == "" {
-		return nil, alerting.ValidationError{Reason: "Could not find url property in settings"}
-	}
-
-	msgType := model.Settings.Get("msgType").MustString(defaultDingdingMsgType)
-
-	return &DingDingNotifier{
-		NotifierBase: NewNotifierBase(model, ns),
-		MsgType:      msgType,
-		URL:          url,
-		log:          log.New("alerting.notifier.dingding"),
-	}, nil
-}
-
-// DingDingNotifier is responsible for sending alert notifications to ding ding.
-type DingDingNotifier struct {
-	NotifierBase
-	MsgType string
-	URL     string
-	log     log.Logger
-}
-
-// Notify sends the alert notification to dingding.
-func (dd *DingDingNotifier) Notify(evalContext *alerting.EvalContext) error {
-	dd.log.Info("Sending dingding")
-
-	messageURL, err := evalContext.GetRuleURL()
-	if err != nil {
-		dd.log.Error("Failed to get messageUrl", "error", err, "dingding", dd.Name)
-		messageURL = ""
-	}
-
-	body, err := dd.genBody(evalContext, messageURL)
-	if err != nil {
-		return err
-	}
-
-	cmd := &notifications.SendWebhookSync{
-		Url:  dd.URL,
-		Body: string(body),
-	}
-
-	if err := dd.NotificationService.SendWebhookSync(evalContext.Ctx, cmd); err != nil {
-		dd.log.Error("Failed to send DingDing", "error", err, "dingding", dd.Name)
-		return err
-	}
-
-	return nil
-}
-
-func (dd *DingDingNotifier) genBody(evalContext *alerting.EvalContext, messageURL string) ([]byte, error) {
-	q := url.Values{
-		"pc_slide": {"false"},
-		"url":      {messageURL},
-	}
-
-	// Use special link to auto open the message url outside of Dingding
-	// Refer: https://open-doc.dingtalk.com/docs/doc.htm?treeId=385&articleId=104972&docType=1#s9
-	messageURL = "dingtalk://dingtalkclient/page/link?" + q.Encode()
-
-	dd.log.Info("MessageUrl:" + messageURL)
-
-	message := evalContext.Rule.Message
-	picURL := evalContext.ImagePublicURL
-	title := evalContext.GetNotificationTitle()
-	if message == "" {
-		message = title
-	}
-
-	for i, match := range evalContext.EvalMatches {
-		message += fmt.Sprintf("\n%2d. %s: %s", i+1, match.Metric, match.Value)
-	}
-
-	var bodyMsg map[string]any
-	if dd.MsgType == "actionCard" {
-		// Embed the pic into the markdown directly because actionCard doesn't have a picUrl field
-		if dd.NeedsImage() && picURL != "" {
-			message = "![](" + picURL + ")\n\n" + message
-		}
-
-		bodyMsg = map[string]any{
-			"msgtype": "actionCard",
-			"actionCard": map[string]string{
-				"text":        message,
-				"title":       title,
-				"singleTitle": "More",
-				"singleURL":   messageURL,
-			},
-		}
-	} else {
-		link := map[string]string{
-			"text":       message,
-			"title":      title,
-			"messageUrl": messageURL,
-		}
-
-		if dd.NeedsImage() {
-			link["picUrl"] = picURL
-		}
-
-		bodyMsg = map[string]any{
-			"msgtype": "link",
-			"link":    link,
-		}
-	}
-	return json.Marshal(bodyMsg)
-}
diff --git a/pkg/services/alerting/notifiers/dingding_test.go b/pkg/services/alerting/notifiers/dingding_test.go
deleted file mode 100644
index 0ff465837c1e3..0000000000000
--- a/pkg/services/alerting/notifiers/dingding_test.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package notifiers
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/annotations/annotationstest"
-	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
-	"github.com/grafana/grafana/pkg/services/validations"
-)
-
-func TestDingDingNotifier(t *testing.T) {
-	encryptionService := encryptionservice.SetupTestService(t)
-
-	t.Run("empty settings should return error", func(t *testing.T) {
-		json := `{ }`
-
-		settingsJSON, _ := simplejson.NewJson([]byte(json))
-		model := &models.AlertNotification{
-			Name:     "dingding_testing",
-			Type:     "dingding",
-			Settings: settingsJSON,
-		}
-
-		_, err := newDingDingNotifier(model, encryptionService.GetDecryptedValue, nil)
-		require.Error(t, err)
-	})
-	t.Run("settings should trigger incident", func(t *testing.T) {
-		json := `{ "url": "https://www.google.com" }`
-
-		settingsJSON, _ := simplejson.NewJson([]byte(json))
-		model := &models.AlertNotification{
-			Name:     "dingding_testing",
-			Type:     "dingding",
-			Settings: settingsJSON,
-		}
-
-		not, err := newDingDingNotifier(model, encryptionService.GetDecryptedValue, nil)
-		notifier := not.(*DingDingNotifier)
-
-		require.Nil(t, err)
-		require.Equal(t, "dingding_testing", notifier.Name)
-		require.Equal(t, "dingding", notifier.Type)
-		require.Equal(t, "https://www.google.com", notifier.URL)
-
-		t.Run("genBody should not panic", func(t *testing.T) {
-			evalContext := alerting.NewEvalContext(context.Background(),
-				&alerting.Rule{
-					State:   models.AlertStateAlerting,
-					Message: `{host="localhost"}`,
-				}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-			_, err = notifier.genBody(evalContext, "")
-			require.Nil(t, err)
-		})
-	})
-}
diff --git a/pkg/services/alerting/notifiers/discord.go b/pkg/services/alerting/notifiers/discord.go
deleted file mode 100644
index b27336c3fa6e7..0000000000000
--- a/pkg/services/alerting/notifiers/discord.go
+++ /dev/null
@@ -1,250 +0,0 @@
-package notifiers
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"mime/multipart"
-	"os"
-	"strconv"
-	"strings"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func init() {
-	alerting.RegisterNotifier(&alerting.NotifierPlugin{
-		Type:        "discord",
-		Name:        "Discord",
-		Description: "Sends notifications to Discord",
-		Factory:     newDiscordNotifier,
-		Heading:     "Discord settings",
-		Options: []alerting.NotifierOption{
-			{
-				Label:        "Avatar URL",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Description:  "Provide a URL to an image to use as the avatar for the bot's message",
-				PropertyName: "avatar_url",
-			},
-			{
-				Label:        "Message Content",
-				Description:  "Mention a group using <@&ID> or a user using <@ID> when notifying in a channel",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				PropertyName: "content",
-			},
-			{
-				Label:        "Webhook URL",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Placeholder:  "Discord webhook URL",
-				PropertyName: "url",
-				Required:     true,
-			},
-			{
-				Label:        "Use Discord's Webhook Username",
-				Description:  "Use the username configured in Discord's webhook settings. Otherwise, the username will be 'Grafana'",
-				Element:      alerting.ElementTypeCheckbox,
-				PropertyName: "use_discord_username",
-			},
-		},
-	})
-}
-
-func newDiscordNotifier(model *models.AlertNotification, _ alerting.GetDecryptedValueFn, ns notifications.Service) (alerting.Notifier, error) {
-	avatar := model.Settings.Get("avatar_url").MustString()
-	content := model.Settings.Get("content").MustString()
-	url := model.Settings.Get("url").MustString()
-	if url == "" {
-		return nil, alerting.ValidationError{Reason: "Could not find webhook url property in settings"}
-	}
-	useDiscordUsername := model.Settings.Get("use_discord_username").MustBool(false)
-
-	return &DiscordNotifier{
-		NotifierBase:       NewNotifierBase(model, ns),
-		Content:            content,
-		AvatarURL:          avatar,
-		WebhookURL:         url,
-		log:                log.New("alerting.notifier.discord"),
-		UseDiscordUsername: useDiscordUsername,
-	}, nil
-}
-
-// DiscordNotifier is responsible for sending alert
-// notifications to discord.
-type DiscordNotifier struct {
-	NotifierBase
-	Content            string
-	AvatarURL          string
-	WebhookURL         string
-	log                log.Logger
-	UseDiscordUsername bool
-}
-
-// Notify send an alert notification to Discord.
-func (dn *DiscordNotifier) Notify(evalContext *alerting.EvalContext) error {
-	dn.log.Info("Sending alert notification to", "webhook_url", dn.WebhookURL)
-
-	ruleURL, err := evalContext.GetRuleURL()
-	if err != nil {
-		dn.log.Error("Failed get rule link", "error", err)
-		return err
-	}
-
-	bodyJSON := simplejson.New()
-	if !dn.UseDiscordUsername {
-		bodyJSON.Set("username", "Grafana")
-	}
-
-	if dn.Content != "" {
-		bodyJSON.Set("content", dn.Content)
-	}
-
-	if dn.AvatarURL != "" {
-		bodyJSON.Set("avatar_url", dn.AvatarURL)
-	}
-
-	fields := make([]map[string]any, 0)
-
-	for _, evt := range evalContext.EvalMatches {
-		fields = append(fields, map[string]any{
-			// Discord uniquely does not send the alert if the metric field is empty,
-			// which it can be in some cases
-			"name":   notEmpty(evt.Metric),
-			"value":  evt.Value.FullString(),
-			"inline": true,
-		})
-	}
-
-	footer := map[string]any{
-		"text":     "Grafana v" + setting.BuildVersion,
-		"icon_url": "https://grafana.com/static/assets/img/fav32.png",
-	}
-
-	color, _ := strconv.ParseInt(strings.TrimLeft(evalContext.GetStateModel().Color, "#"), 16, 0)
-
-	embed := simplejson.New()
-	embed.Set("title", evalContext.GetNotificationTitle())
-	// Discord takes integer for color
-	embed.Set("color", color)
-	embed.Set("url", ruleURL)
-	embed.Set("description", evalContext.Rule.Message)
-	embed.Set("type", "rich")
-	embed.Set("fields", fields)
-	embed.Set("footer", footer)
-
-	var image map[string]any
-	var embeddedImage = false
-
-	if dn.NeedsImage() {
-		if evalContext.ImagePublicURL != "" {
-			image = map[string]any{
-				"url": evalContext.ImagePublicURL,
-			}
-			embed.Set("image", image)
-		} else {
-			image = map[string]any{
-				"url": "attachment://graph.png",
-			}
-			embed.Set("image", image)
-			embeddedImage = true
-		}
-	}
-
-	bodyJSON.Set("embeds", []any{embed})
-
-	json, _ := bodyJSON.MarshalJSON()
-
-	cmd := &notifications.SendWebhookSync{
-		Url:         dn.WebhookURL,
-		HttpMethod:  "POST",
-		ContentType: "application/json",
-	}
-
-	if !embeddedImage {
-		cmd.Body = string(json)
-	} else {
-		err := dn.embedImage(cmd, evalContext.ImageOnDiskPath, json)
-		if err != nil {
-			dn.log.Error("Failed to embed image", "error", err)
-			return err
-		}
-	}
-
-	if err := dn.NotificationService.SendWebhookSync(evalContext.Ctx, cmd); err != nil {
-		dn.log.Error("Failed to send notification to Discord", "error", err)
-		return err
-	}
-
-	return nil
-}
-
-func (dn *DiscordNotifier) embedImage(cmd *notifications.SendWebhookSync, imagePath string, existingJSONBody []byte) error {
-	// nolint:gosec
-	// We can ignore the gosec G304 warning on this one because `imagePath` comes
-	// from the alert `evalContext` that generates the images.
-	f, err := os.Open(imagePath)
-	if err != nil {
-		if os.IsNotExist(err) {
-			cmd.Body = string(existingJSONBody)
-			return nil
-		}
-		if !os.IsNotExist(err) {
-			return err
-		}
-	}
-	defer func() {
-		if err := f.Close(); err != nil {
-			dn.log.Warn("Failed to close file", "path", imagePath, "err", err)
-		}
-	}()
-
-	var b bytes.Buffer
-	w := multipart.NewWriter(&b)
-	defer func() {
-		if err := w.Close(); err != nil {
-			// Should be OK since we already close it on non-error path
-			dn.log.Warn("Failed to close multipart writer", "err", err)
-		}
-	}()
-	fw, err := w.CreateFormField("payload_json")
-	if err != nil {
-		return err
-	}
-
-	if _, err = fw.Write([]byte(string(existingJSONBody))); err != nil {
-		return err
-	}
-
-	fw, err = w.CreateFormFile("file", "graph.png")
-	if err != nil {
-		return err
-	}
-
-	if _, err = io.Copy(fw, f); err != nil {
-		return err
-	}
-
-	if err := w.Close(); err != nil {
-		return fmt.Errorf("failed to close multipart writer: %w", err)
-	}
-
-	cmd.Body = b.String()
-	cmd.ContentType = w.FormDataContentType()
-
-	return nil
-}
-
-func notEmpty(metric string) string {
-	if metric == "" {
-		return "<NO_METRIC_NAME>"
-	}
-
-	return metric
-}
diff --git a/pkg/services/alerting/notifiers/discord_test.go b/pkg/services/alerting/notifiers/discord_test.go
deleted file mode 100644
index d173a85d21581..0000000000000
--- a/pkg/services/alerting/notifiers/discord_test.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package notifiers
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
-)
-
-func TestDiscordNotifier(t *testing.T) {
-	encryptionService := encryptionservice.SetupTestService(t)
-
-	t.Run("Parsing alert notification from settings", func(t *testing.T) {
-		t.Run("empty settings should return error", func(t *testing.T) {
-			json := `{ }`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "discord_testing",
-				Type:     "discord",
-				Settings: settingsJSON,
-			}
-
-			_, err := newDiscordNotifier(model, encryptionService.GetDecryptedValue, nil)
-			require.Error(t, err)
-		})
-
-		t.Run("settings should trigger incident", func(t *testing.T) {
-			json := `
-				{
-					"avatar_url": "https://grafana.com/img/fav32.png",
-					"content": "@everyone Please check this notification",
-					"url": "https://web.hook/"
-				}`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "discord_testing",
-				Type:     "discord",
-				Settings: settingsJSON,
-			}
-
-			not, err := newDiscordNotifier(model, encryptionService.GetDecryptedValue, nil)
-			discordNotifier := not.(*DiscordNotifier)
-
-			require.Nil(t, err)
-			require.Equal(t, "discord_testing", discordNotifier.Name)
-			require.Equal(t, "discord", discordNotifier.Type)
-			require.Equal(t, "https://grafana.com/img/fav32.png", discordNotifier.AvatarURL)
-			require.Equal(t, "@everyone Please check this notification", discordNotifier.Content)
-			require.Equal(t, "https://web.hook/", discordNotifier.WebhookURL)
-		})
-	})
-}
diff --git a/pkg/services/alerting/notifiers/email.go b/pkg/services/alerting/notifiers/email.go
deleted file mode 100644
index 08bfe23871973..0000000000000
--- a/pkg/services/alerting/notifiers/email.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package notifiers
-
-import (
-	"os"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/util"
-)
-
-func init() {
-	alerting.RegisterNotifier(&alerting.NotifierPlugin{
-		Type:        "email",
-		Name:        "Email",
-		Description: "Sends notifications using Grafana server configured SMTP settings",
-		Factory:     NewEmailNotifier,
-		Heading:     "Email settings",
-		Options: []alerting.NotifierOption{
-			{
-				Label:        "Single email",
-				Description:  "Send a single email to all recipients",
-				Element:      alerting.ElementTypeCheckbox,
-				PropertyName: "singleEmail",
-			},
-			{
-				Label:        "Addresses",
-				Description:  "You can enter multiple email addresses using a \";\" separator",
-				Element:      alerting.ElementTypeTextArea,
-				PropertyName: "addresses",
-				Required:     true,
-			},
-		},
-	})
-}
-
-// EmailNotifier is responsible for sending
-// alert notifications over email.
-type EmailNotifier struct {
-	NotifierBase
-	Addresses   []string
-	SingleEmail bool
-	log         log.Logger
-}
-
-// NewEmailNotifier is the constructor function
-// for the EmailNotifier.
-func NewEmailNotifier(model *models.AlertNotification, _ alerting.GetDecryptedValueFn, ns notifications.Service) (alerting.Notifier, error) {
-	addressesString := model.Settings.Get("addresses").MustString()
-	singleEmail := model.Settings.Get("singleEmail").MustBool(false)
-
-	if addressesString == "" {
-		return nil, alerting.ValidationError{Reason: "Could not find addresses in settings"}
-	}
-
-	// split addresses with a few different ways
-	addresses := util.SplitEmails(addressesString)
-
-	return &EmailNotifier{
-		NotifierBase: NewNotifierBase(model, ns),
-		Addresses:    addresses,
-		SingleEmail:  singleEmail,
-		log:          log.New("alerting.notifier.email"),
-	}, nil
-}
-
-// Notify sends the alert notification.
-func (en *EmailNotifier) Notify(evalContext *alerting.EvalContext) error {
-	en.log.Info("Sending alert notification to", "addresses", en.Addresses, "singleEmail", en.SingleEmail)
-
-	ruleURL, err := evalContext.GetRuleURL()
-	if err != nil {
-		en.log.Error("Failed get rule link", "error", err)
-		return err
-	}
-
-	error := ""
-	if evalContext.Error != nil {
-		error = evalContext.Error.Error()
-	}
-
-	cmd := &notifications.SendEmailCommandSync{
-		SendEmailCommand: notifications.SendEmailCommand{
-			Subject: evalContext.GetNotificationTitle(),
-			Data: map[string]any{
-				"Title":         evalContext.GetNotificationTitle(),
-				"State":         evalContext.Rule.State,
-				"Name":          evalContext.Rule.Name,
-				"StateModel":    evalContext.GetStateModel(),
-				"Message":       evalContext.Rule.Message,
-				"Error":         error,
-				"RuleUrl":       ruleURL,
-				"ImageLink":     "",
-				"EmbeddedImage": "",
-				"AlertPageUrl":  setting.AppUrl + "alerting",
-				"EvalMatches":   evalContext.EvalMatches,
-			},
-			To:            en.Addresses,
-			SingleEmail:   en.SingleEmail,
-			Template:      "alert_notification",
-			EmbeddedFiles: []string{},
-		},
-	}
-
-	if en.NeedsImage() {
-		if evalContext.ImagePublicURL != "" {
-			cmd.Data["ImageLink"] = evalContext.ImagePublicURL
-		} else {
-			file, err := os.Stat(evalContext.ImageOnDiskPath)
-			if err == nil {
-				cmd.EmbeddedFiles = []string{evalContext.ImageOnDiskPath}
-				cmd.Data["EmbeddedImage"] = file.Name()
-			}
-		}
-	}
-
-	if err := en.NotificationService.SendEmailCommandHandlerSync(evalContext.Ctx, cmd); err != nil {
-		en.log.Error("Failed to send alert notification email", "error", err)
-		return err
-	}
-
-	return nil
-}
diff --git a/pkg/services/alerting/notifiers/email_test.go b/pkg/services/alerting/notifiers/email_test.go
deleted file mode 100644
index 69ca1bffd21a7..0000000000000
--- a/pkg/services/alerting/notifiers/email_test.go
+++ /dev/null
@@ -1,80 +0,0 @@
-package notifiers
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
-)
-
-func TestEmailNotifier(t *testing.T) {
-	encryptionService := encryptionservice.SetupTestService(t)
-
-	t.Run("Parsing alert notification from settings", func(t *testing.T) {
-		t.Run("empty settings should return error", func(t *testing.T) {
-			json := `{ }`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "ops",
-				Type:     "email",
-				Settings: settingsJSON,
-			}
-
-			_, err := NewEmailNotifier(model, encryptionService.GetDecryptedValue, nil)
-			require.Error(t, err)
-		})
-
-		t.Run("from settings", func(t *testing.T) {
-			json := `
-				{
-					"addresses": "ops@grafana.org"
-				}`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "ops",
-				Type:     "email",
-				Settings: settingsJSON,
-			}
-
-			not, err := NewEmailNotifier(model, encryptionService.GetDecryptedValue, nil)
-			emailNotifier := not.(*EmailNotifier)
-
-			require.Nil(t, err)
-			require.Equal(t, "ops", emailNotifier.Name)
-			require.Equal(t, "email", emailNotifier.Type)
-			require.Equal(t, "ops@grafana.org", emailNotifier.Addresses[0])
-		})
-
-		t.Run("from settings with two emails", func(t *testing.T) {
-			json := `
-				{
-					"addresses": "ops@grafana.org;dev@grafana.org"
-				}`
-
-			settingsJSON, err := simplejson.NewJson([]byte(json))
-			require.Nil(t, err)
-
-			model := &models.AlertNotification{
-				Name:     "ops",
-				Type:     "email",
-				Settings: settingsJSON,
-			}
-
-			not, err := NewEmailNotifier(model, encryptionService.GetDecryptedValue, nil)
-			emailNotifier := not.(*EmailNotifier)
-
-			require.Nil(t, err)
-			require.Equal(t, "ops", emailNotifier.Name)
-			require.Equal(t, "email", emailNotifier.Type)
-			require.Equal(t, 2, len(emailNotifier.Addresses))
-
-			require.Equal(t, "ops@grafana.org", emailNotifier.Addresses[0])
-			require.Equal(t, "dev@grafana.org", emailNotifier.Addresses[1])
-		})
-	})
-}
diff --git a/pkg/services/alerting/notifiers/googlechat.go b/pkg/services/alerting/notifiers/googlechat.go
deleted file mode 100644
index 7af742e64037b..0000000000000
--- a/pkg/services/alerting/notifiers/googlechat.go
+++ /dev/null
@@ -1,246 +0,0 @@
-package notifiers
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/url"
-	"time"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func init() {
-	alerting.RegisterNotifier(&alerting.NotifierPlugin{
-		Type:        "googlechat",
-		Name:        "Google Hangouts Chat",
-		Description: "Sends notifications to Google Hangouts Chat via webhooks based on the official JSON message format",
-		Factory:     newGoogleChatNotifier,
-		Heading:     "Google Hangouts Chat settings",
-		Options: []alerting.NotifierOption{
-			{
-				Label:        "Url",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Placeholder:  "Google Hangouts Chat incoming webhook url",
-				PropertyName: "url",
-				Required:     true,
-			},
-		},
-	})
-}
-
-func newGoogleChatNotifier(model *models.AlertNotification, _ alerting.GetDecryptedValueFn, ns notifications.Service) (alerting.Notifier, error) {
-	url := model.Settings.Get("url").MustString()
-	if url == "" {
-		return nil, alerting.ValidationError{Reason: "Could not find url property in settings"}
-	}
-
-	return &GoogleChatNotifier{
-		NotifierBase: NewNotifierBase(model, ns),
-		URL:          url,
-		log:          log.New("alerting.notifier.googlechat"),
-	}, nil
-}
-
-// GoogleChatNotifier is responsible for sending
-// alert notifications to Google chat.
-type GoogleChatNotifier struct {
-	NotifierBase
-	URL string
-	log log.Logger
-}
-
-/*
-*
-Structs used to build a custom Google Hangouts Chat message card.
-See: https://developers.google.com/hangouts/chat/reference/message-formats/cards
-*/
-type outerStruct struct {
-	PreviewText  string `json:"previewText"`
-	FallbackText string `json:"fallbackText"`
-	Cards        []card `json:"cards"`
-}
-
-type card struct {
-	Header   header    `json:"header"`
-	Sections []section `json:"sections"`
-}
-
-type header struct {
-	Title string `json:"title"`
-}
-
-type section struct {
-	Widgets []widget `json:"widgets"`
-}
-
-// "generic" widget used to add different types of widgets (buttonWidget, textParagraphWidget, imageWidget)
-type widget interface {
-}
-
-type buttonWidget struct {
-	Buttons []button `json:"buttons"`
-}
-
-type textParagraphWidget struct {
-	Text text `json:"textParagraph"`
-}
-
-type text struct {
-	Text string `json:"text"`
-}
-
-type imageWidget struct {
-	Image image `json:"image"`
-}
-
-type image struct {
-	ImageURL string `json:"imageUrl"`
-}
-
-type button struct {
-	TextButton textButton `json:"textButton"`
-}
-
-type textButton struct {
-	Text    string  `json:"text"`
-	OnClick onClick `json:"onClick"`
-}
-
-type onClick struct {
-	OpenLink openLink `json:"openLink"`
-}
-
-type openLink struct {
-	URL string `json:"url"`
-}
-
-// Notify send an alert notification to Google Chat.
-func (gcn *GoogleChatNotifier) Notify(evalContext *alerting.EvalContext) error {
-	gcn.log.Info("Executing Google Chat notification")
-
-	headers := map[string]string{
-		"Content-Type": "application/json; charset=UTF-8",
-	}
-
-	ruleURL, err := evalContext.GetRuleURL()
-	if err != nil {
-		gcn.log.Error("EvalContext returned an invalid rule URL")
-	}
-
-	widgets := []widget{}
-	if len(evalContext.Rule.Message) > 0 {
-		// add a text paragraph widget for the message if there is a message
-		// Google Chat API doesn't accept an empty text property
-		widgets = append(widgets, textParagraphWidget{
-			Text: text{
-				Text: evalContext.Rule.Message,
-			},
-		})
-	}
-
-	// add a text paragraph widget for the fields
-	//nolint:prealloc // break block
-	var fields []textParagraphWidget
-	fieldLimitCount := 4
-	for index, evt := range evalContext.EvalMatches {
-		fields = append(fields,
-			textParagraphWidget{
-				Text: text{
-					Text: "<i>" + evt.Metric + ": " + fmt.Sprint(evt.Value) + "</i>",
-				},
-			},
-		)
-		if index > fieldLimitCount {
-			break
-		}
-	}
-	widgets = append(widgets, fields)
-
-	if gcn.NeedsImage() {
-		// if an image exists, add it as an image widget
-		if evalContext.ImagePublicURL != "" {
-			widgets = append(widgets, imageWidget{
-				Image: image{
-					ImageURL: evalContext.ImagePublicURL,
-				},
-			})
-		} else {
-			gcn.log.Info("Could not retrieve a public image URL.")
-		}
-	}
-
-	if gcn.isUrlAbsolute(ruleURL) {
-		// add a button widget (link to Grafana)
-		widgets = append(widgets, buttonWidget{
-			Buttons: []button{
-				{
-					TextButton: textButton{
-						Text: "OPEN IN GRAFANA",
-						OnClick: onClick{
-							OpenLink: openLink{
-								URL: ruleURL,
-							},
-						},
-					},
-				},
-			},
-		})
-	} else {
-		gcn.log.Warn("Grafana External URL setting is missing or invalid. Skipping 'open in grafana' button to prevent google from displaying empty alerts.", "ruleURL", ruleURL)
-	}
-
-	// add text paragraph widget for the build version and timestamp
-	widgets = append(widgets, textParagraphWidget{
-		Text: text{
-			Text: "Grafana v" + setting.BuildVersion + " | " + (time.Now()).Format(time.RFC822),
-		},
-	})
-
-	// nest the required structs
-	res1D := &outerStruct{
-		PreviewText:  evalContext.GetNotificationTitle(),
-		FallbackText: evalContext.GetNotificationTitle(),
-		Cards: []card{
-			{
-				Header: header{
-					Title: evalContext.GetNotificationTitle(),
-				},
-				Sections: []section{
-					{
-						Widgets: widgets,
-					},
-				},
-			},
-		},
-	}
-	body, _ := json.Marshal(res1D)
-
-	cmd := &notifications.SendWebhookSync{
-		Url:        gcn.URL,
-		HttpMethod: "POST",
-		HttpHeader: headers,
-		Body:       string(body),
-	}
-
-	if err := gcn.NotificationService.SendWebhookSync(evalContext.Ctx, cmd); err != nil {
-		gcn.log.Error("Failed to send Google Hangouts Chat alert", "error", err, "webhook", gcn.Name)
-		return err
-	}
-
-	return nil
-}
-
-func (gcn *GoogleChatNotifier) isUrlAbsolute(urlToCheck string) bool {
-	parsed, err := url.Parse(urlToCheck)
-	if err != nil {
-		gcn.log.Warn("Could not parse URL", "urlToCheck", urlToCheck)
-		return false
-	}
-
-	return parsed.IsAbs()
-}
diff --git a/pkg/services/alerting/notifiers/googlechat_test.go b/pkg/services/alerting/notifiers/googlechat_test.go
deleted file mode 100644
index 48c102a1fe7f8..0000000000000
--- a/pkg/services/alerting/notifiers/googlechat_test.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package notifiers
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
-)
-
-func TestGoogleChatNotifier(t *testing.T) {
-	encryptionService := encryptionservice.SetupTestService(t)
-
-	t.Run("Parsing alert notification from settings", func(t *testing.T) {
-		t.Run("empty settings should return error", func(t *testing.T) {
-			json := `{ }`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "ops",
-				Type:     "googlechat",
-				Settings: settingsJSON,
-			}
-
-			_, err := newGoogleChatNotifier(model, encryptionService.GetDecryptedValue, nil)
-			require.Error(t, err)
-		})
-
-		t.Run("from settings", func(t *testing.T) {
-			json := `
-				{
-          			"url": "http://google.com"
-				}`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "ops",
-				Type:     "googlechat",
-				Settings: settingsJSON,
-			}
-
-			not, err := newGoogleChatNotifier(model, encryptionService.GetDecryptedValue, nil)
-			webhookNotifier := not.(*GoogleChatNotifier)
-
-			require.Nil(t, err)
-			require.Equal(t, "ops", webhookNotifier.Name)
-			require.Equal(t, "googlechat", webhookNotifier.Type)
-			require.Equal(t, "http://google.com", webhookNotifier.URL)
-		})
-	})
-}
diff --git a/pkg/services/alerting/notifiers/hipchat.go b/pkg/services/alerting/notifiers/hipchat.go
deleted file mode 100644
index 8581773107769..0000000000000
--- a/pkg/services/alerting/notifiers/hipchat.go
+++ /dev/null
@@ -1,183 +0,0 @@
-package notifiers
-
-import (
-	"encoding/json"
-	"fmt"
-	"strconv"
-	"strings"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/notifications"
-)
-
-func init() {
-	alerting.RegisterNotifier(&alerting.NotifierPlugin{
-		Type:        "hipchat",
-		Name:        "HipChat",
-		Description: "Sends notifications uto a HipChat Room",
-		Heading:     "HipChat settings",
-		Factory:     NewHipChatNotifier,
-		Options: []alerting.NotifierOption{
-			{
-				Label:        "Hip Chat Url",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Placeholder:  "HipChat URL (ex https://grafana.hipchat.com)",
-				PropertyName: "url",
-				Required:     true,
-			},
-			{
-				Label:        "API Key",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Placeholder:  "HipChat API Key",
-				PropertyName: "apiKey",
-				Required:     true,
-			},
-			{
-				Label:        "Room ID",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				PropertyName: "roomid",
-			},
-		},
-	})
-}
-
-const (
-	maxFieldCount int = 4
-)
-
-// NewHipChatNotifier is the constructor functions
-// for the HipChatNotifier
-func NewHipChatNotifier(model *models.AlertNotification, _ alerting.GetDecryptedValueFn, ns notifications.Service) (alerting.Notifier, error) {
-	url := model.Settings.Get("url").MustString()
-	url = strings.TrimSuffix(url, "/")
-	if url == "" {
-		return nil, alerting.ValidationError{Reason: "Could not find url property in settings"}
-	}
-
-	apikey := model.Settings.Get("apikey").MustString()
-	roomID := model.Settings.Get("roomid").MustString()
-
-	return &HipChatNotifier{
-		NotifierBase: NewNotifierBase(model, ns),
-		URL:          url,
-		APIKey:       apikey,
-		RoomID:       roomID,
-		log:          log.New("alerting.notifier.hipchat"),
-	}, nil
-}
-
-// HipChatNotifier is responsible for sending
-// alert notifications to Hipchat.
-type HipChatNotifier struct {
-	NotifierBase
-	URL    string
-	APIKey string
-	RoomID string
-	log    log.Logger
-}
-
-// Notify sends an alert notification to HipChat
-func (hc *HipChatNotifier) Notify(evalContext *alerting.EvalContext) error {
-	hc.log.Info("Executing hipchat notification", "ruleId", evalContext.Rule.ID, "notification", hc.Name)
-
-	ruleURL, err := evalContext.GetRuleURL()
-	if err != nil {
-		hc.log.Error("Failed get rule link", "error", err)
-		return err
-	}
-
-	attributes := make([]map[string]any, 0)
-	for index, evt := range evalContext.EvalMatches {
-		metricName := evt.Metric
-		if len(metricName) > 50 {
-			metricName = metricName[:50]
-		}
-		attributes = append(attributes, map[string]any{
-			"label": metricName,
-			"value": map[string]any{
-				"label": strconv.FormatFloat(evt.Value.Float64, 'f', -1, 64),
-			},
-		})
-		if index > maxFieldCount {
-			break
-		}
-	}
-
-	if evalContext.Error != nil {
-		attributes = append(attributes, map[string]any{
-			"label": "Error message",
-			"value": map[string]any{
-				"label": evalContext.Error.Error(),
-			},
-		})
-	}
-
-	message := ""
-	if evalContext.Rule.State != models.AlertStateOK { // don't add message when going back to alert state ok.
-		message += " " + evalContext.Rule.Message
-	}
-
-	if message == "" {
-		message = evalContext.GetNotificationTitle() + " in state " + evalContext.GetStateModel().Text
-	}
-
-	// HipChat has a set list of colors
-	var color string
-	switch evalContext.Rule.State {
-	case models.AlertStateOK:
-		color = "green"
-	case models.AlertStateNoData:
-		color = "gray"
-	case models.AlertStateAlerting:
-		color = "red"
-	default:
-		// Handle other cases?
-	}
-
-	// Add a card with link to the dashboard
-	card := map[string]any{
-		"style":       "application",
-		"url":         ruleURL,
-		"id":          "1",
-		"title":       evalContext.GetNotificationTitle(),
-		"description": message,
-		"icon": map[string]any{
-			"url": "https://grafana.com/static/assets/img/fav32.png",
-		},
-		"date":       evalContext.EndTime.Unix(),
-		"attributes": attributes,
-	}
-	if hc.NeedsImage() && evalContext.ImagePublicURL != "" {
-		card["thumbnail"] = map[string]any{
-			"url":    evalContext.ImagePublicURL,
-			"url@2x": evalContext.ImagePublicURL,
-			"width":  1193,
-			"height": 564,
-		}
-	}
-
-	body := map[string]any{
-		"message":        message,
-		"notify":         "true",
-		"message_format": "html",
-		"color":          color,
-		"card":           card,
-	}
-
-	hipURL := fmt.Sprintf("%s/v2/room/%s/notification?auth_token=%s", hc.URL, hc.RoomID, hc.APIKey)
-	data, _ := json.Marshal(&body)
-	hc.log.Info("Request payload", "json", string(data))
-	cmd := &notifications.SendWebhookSync{Url: hipURL, Body: string(data)}
-
-	if err := hc.NotificationService.SendWebhookSync(evalContext.Ctx, cmd); err != nil {
-		hc.log.Error("Failed to send hipchat notification", "error", err, "webhook", hc.Name)
-		return err
-	}
-
-	return nil
-}
diff --git a/pkg/services/alerting/notifiers/hipchat_test.go b/pkg/services/alerting/notifiers/hipchat_test.go
deleted file mode 100644
index 625eb14da8c1f..0000000000000
--- a/pkg/services/alerting/notifiers/hipchat_test.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package notifiers
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
-)
-
-//nolint:goconst
-func TestHipChatNotifier(t *testing.T) {
-	encryptionService := encryptionservice.SetupTestService(t)
-
-	t.Run("Parsing alert notification from settings", func(t *testing.T) {
-		t.Run("empty settings should return error", func(t *testing.T) {
-			json := `{ }`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "ops",
-				Type:     "hipchat",
-				Settings: settingsJSON,
-			}
-
-			_, err := NewHipChatNotifier(model, encryptionService.GetDecryptedValue, nil)
-			require.Error(t, err)
-		})
-
-		t.Run("from settings", func(t *testing.T) {
-			json := `
-				{
-          			"url": "http://google.com"
-				}`
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "ops",
-				Type:     "hipchat",
-				Settings: settingsJSON,
-			}
-
-			not, err := NewHipChatNotifier(model, encryptionService.GetDecryptedValue, nil)
-			hipchatNotifier := not.(*HipChatNotifier)
-
-			require.Nil(t, err)
-			require.Equal(t, "ops", hipchatNotifier.Name)
-			require.Equal(t, "hipchat", hipchatNotifier.Type)
-			require.Equal(t, "http://google.com", hipchatNotifier.URL)
-			require.Equal(t, "", hipchatNotifier.APIKey)
-			require.Equal(t, "", hipchatNotifier.RoomID)
-		})
-
-		t.Run("from settings with Recipient and Mention", func(t *testing.T) {
-			json := `
-				{
-          "url": "http://www.hipchat.com",
-          "apikey": "1234",
-          "roomid": "1234"
-				}`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "ops",
-				Type:     "hipchat",
-				Settings: settingsJSON,
-			}
-
-			not, err := NewHipChatNotifier(model, encryptionService.GetDecryptedValue, nil)
-			hipchatNotifier := not.(*HipChatNotifier)
-
-			require.Nil(t, err)
-			require.Equal(t, "ops", hipchatNotifier.Name)
-			require.Equal(t, "hipchat", hipchatNotifier.Type)
-			require.Equal(t, "http://www.hipchat.com", hipchatNotifier.URL)
-			require.Equal(t, "1234", hipchatNotifier.APIKey)
-			require.Equal(t, "1234", hipchatNotifier.RoomID)
-		})
-	})
-}
diff --git a/pkg/services/alerting/notifiers/kafka.go b/pkg/services/alerting/notifiers/kafka.go
deleted file mode 100644
index 601e64351ca7f..0000000000000
--- a/pkg/services/alerting/notifiers/kafka.go
+++ /dev/null
@@ -1,132 +0,0 @@
-package notifiers
-
-import (
-	"fmt"
-	"strconv"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/notifications"
-)
-
-func init() {
-	alerting.RegisterNotifier(&alerting.NotifierPlugin{
-		Type:        "kafka",
-		Name:        "Kafka REST Proxy",
-		Description: "Sends notifications to Kafka Rest Proxy",
-		Heading:     "Kafka settings",
-		Factory:     NewKafkaNotifier,
-		Options: []alerting.NotifierOption{
-			{
-				Label:        "Kafka REST Proxy",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Placeholder:  "http://localhost:8082",
-				PropertyName: "kafkaRestProxy",
-				Required:     true,
-			},
-			{
-				Label:        "Topic",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Placeholder:  "topic1",
-				PropertyName: "kafkaTopic",
-				Required:     true,
-			},
-		},
-	})
-}
-
-// NewKafkaNotifier is the constructor function for the Kafka notifier.
-func NewKafkaNotifier(model *models.AlertNotification, _ alerting.GetDecryptedValueFn, ns notifications.Service) (alerting.Notifier, error) {
-	endpoint := model.Settings.Get("kafkaRestProxy").MustString()
-	if endpoint == "" {
-		return nil, alerting.ValidationError{Reason: "Could not find kafka rest proxy endpoint property in settings"}
-	}
-	topic := model.Settings.Get("kafkaTopic").MustString()
-	if topic == "" {
-		return nil, alerting.ValidationError{Reason: "Could not find kafka topic property in settings"}
-	}
-
-	return &KafkaNotifier{
-		NotifierBase: NewNotifierBase(model, ns),
-		Endpoint:     endpoint,
-		Topic:        topic,
-		log:          log.New("alerting.notifier.kafka"),
-	}, nil
-}
-
-// KafkaNotifier is responsible for sending
-// alert notifications to Kafka.
-type KafkaNotifier struct {
-	NotifierBase
-	Endpoint string
-	Topic    string
-	log      log.Logger
-}
-
-// Notify sends the alert notification.
-func (kn *KafkaNotifier) Notify(evalContext *alerting.EvalContext) error {
-	state := evalContext.Rule.State
-
-	customData := triggMetrString
-	for _, evt := range evalContext.EvalMatches {
-		customData += fmt.Sprintf("%s: %v\n", evt.Metric, evt.Value)
-	}
-
-	kn.log.Info("Notifying Kafka", "alert_state", state)
-
-	recordJSON := simplejson.New()
-	records := make([]any, 1)
-
-	bodyJSON := simplejson.New()
-	// get alert state in the kafka output issue #11401
-	bodyJSON.Set("alert_state", state)
-	bodyJSON.Set("description", evalContext.Rule.Name+" - "+evalContext.Rule.Message)
-	bodyJSON.Set("client", "Grafana")
-	bodyJSON.Set("details", customData)
-	bodyJSON.Set("incident_key", "alertId-"+strconv.FormatInt(evalContext.Rule.ID, 10))
-
-	ruleURL, err := evalContext.GetRuleURL()
-	if err != nil {
-		kn.log.Error("Failed get rule link", "error", err)
-		return err
-	}
-	bodyJSON.Set("client_url", ruleURL)
-
-	if kn.NeedsImage() && evalContext.ImagePublicURL != "" {
-		contexts := make([]any, 1)
-		imageJSON := simplejson.New()
-		imageJSON.Set("type", "image")
-		imageJSON.Set("src", evalContext.ImagePublicURL)
-		contexts[0] = imageJSON
-		bodyJSON.Set("contexts", contexts)
-	}
-
-	valueJSON := simplejson.New()
-	valueJSON.Set("value", bodyJSON)
-	records[0] = valueJSON
-	recordJSON.Set("records", records)
-	body, _ := recordJSON.MarshalJSON()
-
-	topicURL := kn.Endpoint + "/topics/" + kn.Topic
-
-	cmd := &notifications.SendWebhookSync{
-		Url:        topicURL,
-		Body:       string(body),
-		HttpMethod: "POST",
-		HttpHeader: map[string]string{
-			"Content-Type": "application/vnd.kafka.json.v2+json",
-			"Accept":       "application/vnd.kafka.v2+json",
-		},
-	}
-
-	if err := kn.NotificationService.SendWebhookSync(evalContext.Ctx, cmd); err != nil {
-		kn.log.Error("Failed to send notification to Kafka", "error", err, "body", string(body))
-		return err
-	}
-
-	return nil
-}
diff --git a/pkg/services/alerting/notifiers/kafka_test.go b/pkg/services/alerting/notifiers/kafka_test.go
deleted file mode 100644
index 95dbaedf57d1d..0000000000000
--- a/pkg/services/alerting/notifiers/kafka_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package notifiers
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
-)
-
-func TestKafkaNotifier(t *testing.T) {
-	encryptionService := encryptionservice.SetupTestService(t)
-
-	t.Run("Parsing alert notification from settings", func(t *testing.T) {
-		t.Run("empty settings should return error", func(t *testing.T) {
-			json := `{ }`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "kafka_testing",
-				Type:     "kafka",
-				Settings: settingsJSON,
-			}
-
-			_, err := NewKafkaNotifier(model, encryptionService.GetDecryptedValue, nil)
-			require.Error(t, err)
-		})
-
-		t.Run("settings should send an event to kafka", func(t *testing.T) {
-			json := `
-				{
-					"kafkaRestProxy": "http://localhost:8082",
-					"kafkaTopic": "topic1"
-				}`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "kafka_testing",
-				Type:     "kafka",
-				Settings: settingsJSON,
-			}
-
-			not, err := NewKafkaNotifier(model, encryptionService.GetDecryptedValue, nil)
-			kafkaNotifier := not.(*KafkaNotifier)
-
-			require.Nil(t, err)
-			require.Equal(t, "kafka_testing", kafkaNotifier.Name)
-			require.Equal(t, "kafka", kafkaNotifier.Type)
-			require.Equal(t, "http://localhost:8082", kafkaNotifier.Endpoint)
-			require.Equal(t, "topic1", kafkaNotifier.Topic)
-		})
-	})
-}
diff --git a/pkg/services/alerting/notifiers/line.go b/pkg/services/alerting/notifiers/line.go
deleted file mode 100644
index 3bf4d09831ed6..0000000000000
--- a/pkg/services/alerting/notifiers/line.go
+++ /dev/null
@@ -1,101 +0,0 @@
-package notifiers
-
-import (
-	"context"
-	"fmt"
-	"net/url"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func init() {
-	alerting.RegisterNotifier(&alerting.NotifierPlugin{
-		Type:        "LINE",
-		Name:        "LINE",
-		Description: "Send notifications to LINE notify",
-		Heading:     "LINE notify settings",
-		Factory:     NewLINENotifier,
-		Options: []alerting.NotifierOption{
-			{
-				Label:        "Token",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Placeholder:  "LINE notify token key",
-				PropertyName: "token",
-				Required:     true,
-				Secure:       true,
-			}},
-	})
-}
-
-const (
-	lineNotifyURL string = "https://notify-api.line.me/api/notify"
-)
-
-// NewLINENotifier is the constructor for the LINE notifier
-func NewLINENotifier(model *models.AlertNotification, fn alerting.GetDecryptedValueFn, ns notifications.Service) (alerting.Notifier, error) {
-	token := fn(context.Background(), model.SecureSettings, "token", model.Settings.Get("token").MustString(), setting.SecretKey)
-	if token == "" {
-		return nil, alerting.ValidationError{Reason: "Could not find token in settings"}
-	}
-
-	return &LineNotifier{
-		NotifierBase: NewNotifierBase(model, ns),
-		Token:        token,
-		log:          log.New("alerting.notifier.line"),
-	}, nil
-}
-
-// LineNotifier is responsible for sending
-// alert notifications to LINE.
-type LineNotifier struct {
-	NotifierBase
-	Token string
-	log   log.Logger
-}
-
-// Notify send an alert notification to LINE
-func (ln *LineNotifier) Notify(evalContext *alerting.EvalContext) error {
-	ln.log.Info("Executing line notification", "ruleId", evalContext.Rule.ID, "notification", ln.Name)
-
-	return ln.createAlert(evalContext)
-}
-
-func (ln *LineNotifier) createAlert(evalContext *alerting.EvalContext) error {
-	ln.log.Info("Creating Line notify", "ruleId", evalContext.Rule.ID, "notification", ln.Name)
-	ruleURL, err := evalContext.GetRuleURL()
-	if err != nil {
-		ln.log.Error("Failed get rule link", "error", err)
-		return err
-	}
-
-	form := url.Values{}
-	body := fmt.Sprintf("%s - %s\n%s", evalContext.GetNotificationTitle(), ruleURL, evalContext.Rule.Message)
-	form.Add("message", body)
-
-	if ln.NeedsImage() && evalContext.ImagePublicURL != "" {
-		form.Add("imageThumbnail", evalContext.ImagePublicURL)
-		form.Add("imageFullsize", evalContext.ImagePublicURL)
-	}
-
-	cmd := &notifications.SendWebhookSync{
-		Url:        lineNotifyURL,
-		HttpMethod: "POST",
-		HttpHeader: map[string]string{
-			"Authorization": fmt.Sprintf("Bearer %s", ln.Token),
-			"Content-Type":  "application/x-www-form-urlencoded;charset=UTF-8",
-		},
-		Body: form.Encode(),
-	}
-
-	if err := ln.NotificationService.SendWebhookSync(evalContext.Ctx, cmd); err != nil {
-		ln.log.Error("Failed to send notification to LINE", "error", err, "body", body)
-		return err
-	}
-
-	return nil
-}
diff --git a/pkg/services/alerting/notifiers/line_test.go b/pkg/services/alerting/notifiers/line_test.go
deleted file mode 100644
index c6086e09c3b61..0000000000000
--- a/pkg/services/alerting/notifiers/line_test.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package notifiers
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
-)
-
-func TestLineNotifier(t *testing.T) {
-	encryptionService := encryptionservice.SetupTestService(t)
-
-	t.Run("empty settings should return error", func(t *testing.T) {
-		json := `{ }`
-
-		settingsJSON, _ := simplejson.NewJson([]byte(json))
-		model := &models.AlertNotification{
-			Name:     "line_testing",
-			Type:     "line",
-			Settings: settingsJSON,
-		}
-
-		_, err := NewLINENotifier(model, encryptionService.GetDecryptedValue, nil)
-		require.Error(t, err)
-	})
-	t.Run("settings should trigger incident", func(t *testing.T) {
-		json := `
-			{
-  "token": "abcdefgh0123456789"
-			}`
-		settingsJSON, _ := simplejson.NewJson([]byte(json))
-		model := &models.AlertNotification{
-			Name:     "line_testing",
-			Type:     "line",
-			Settings: settingsJSON,
-		}
-
-		not, err := NewLINENotifier(model, encryptionService.GetDecryptedValue, nil)
-		lineNotifier := not.(*LineNotifier)
-
-		require.Nil(t, err)
-		require.Equal(t, "line_testing", lineNotifier.Name)
-		require.Equal(t, "line", lineNotifier.Type)
-		require.Equal(t, "abcdefgh0123456789", lineNotifier.Token)
-	})
-}
diff --git a/pkg/services/alerting/notifiers/opsgenie.go b/pkg/services/alerting/notifiers/opsgenie.go
deleted file mode 100644
index dcf6b7b35ee63..0000000000000
--- a/pkg/services/alerting/notifiers/opsgenie.go
+++ /dev/null
@@ -1,246 +0,0 @@
-package notifiers
-
-import (
-	"context"
-	"fmt"
-	"strconv"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-const (
-	sendTags    = "tags"
-	sendDetails = "details"
-	sendBoth    = "both"
-)
-
-func init() {
-	alerting.RegisterNotifier(&alerting.NotifierPlugin{
-		Type:        "opsgenie",
-		Name:        "OpsGenie",
-		Description: "Sends notifications to OpsGenie",
-		Heading:     "OpsGenie settings",
-		Factory:     NewOpsGenieNotifier,
-		Options: []alerting.NotifierOption{
-			{
-				Label:        "API Key",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Placeholder:  "OpsGenie API Key",
-				PropertyName: "apiKey",
-				Required:     true,
-				Secure:       true,
-			},
-			{
-				Label:        "Alert API Url",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Placeholder:  "https://api.opsgenie.com/v2/alerts",
-				PropertyName: "apiUrl",
-				Required:     true,
-			},
-			{
-				Label:        "Auto close incidents",
-				Element:      alerting.ElementTypeCheckbox,
-				Description:  "Automatically close alerts in OpsGenie once the alert goes back to ok.",
-				PropertyName: "autoClose",
-			}, {
-				Label:        "Override priority",
-				Element:      alerting.ElementTypeCheckbox,
-				Description:  "Allow the alert priority to be set using the og_priority tag",
-				PropertyName: "overridePriority",
-			},
-			{
-				Label:   "Send notification tags as",
-				Element: alerting.ElementTypeSelect,
-				SelectOptions: []alerting.SelectOption{
-					{
-						Value: sendTags,
-						Label: "Tags",
-					},
-					{
-						Value: sendDetails,
-						Label: "Extra Properties",
-					},
-					{
-						Value: sendBoth,
-						Label: "Tags & Extra Properties",
-					},
-				},
-				Description:  "Send the notification tags to Opsgenie as either Extra Properties, Tags or both",
-				PropertyName: "sendTagsAs",
-			},
-		},
-	})
-}
-
-const (
-	opsgenieAlertURL = "https://api.opsgenie.com/v2/alerts"
-)
-
-// NewOpsGenieNotifier is the constructor for OpsGenie.
-func NewOpsGenieNotifier(model *models.AlertNotification, fn alerting.GetDecryptedValueFn, ns notifications.Service) (alerting.Notifier, error) {
-	autoClose := model.Settings.Get("autoClose").MustBool(true)
-	overridePriority := model.Settings.Get("overridePriority").MustBool(true)
-	apiKey := fn(context.Background(), model.SecureSettings, "apiKey", model.Settings.Get("apiKey").MustString(), setting.SecretKey)
-	apiURL := model.Settings.Get("apiUrl").MustString()
-	if apiKey == "" {
-		return nil, alerting.ValidationError{Reason: "Could not find api key property in settings"}
-	}
-	if apiURL == "" {
-		apiURL = opsgenieAlertURL
-	}
-
-	sendTagsAs := model.Settings.Get("sendTagsAs").MustString(sendTags)
-	if sendTagsAs != sendTags && sendTagsAs != sendDetails && sendTagsAs != sendBoth {
-		return nil, alerting.ValidationError{
-			Reason: fmt.Sprintf("Invalid value for sendTagsAs: %q", sendTagsAs),
-		}
-	}
-
-	return &OpsGenieNotifier{
-		NotifierBase:     NewNotifierBase(model, ns),
-		APIKey:           apiKey,
-		APIUrl:           apiURL,
-		AutoClose:        autoClose,
-		OverridePriority: overridePriority,
-		SendTagsAs:       sendTagsAs,
-		log:              log.New("alerting.notifier.opsgenie"),
-	}, nil
-}
-
-// OpsGenieNotifier is responsible for sending
-// alert notifications to OpsGenie
-type OpsGenieNotifier struct {
-	NotifierBase
-	APIKey           string
-	APIUrl           string
-	AutoClose        bool
-	OverridePriority bool
-	SendTagsAs       string
-	log              log.Logger
-}
-
-// Notify sends an alert notification to OpsGenie.
-func (on *OpsGenieNotifier) Notify(evalContext *alerting.EvalContext) error {
-	var err error
-	switch evalContext.Rule.State {
-	case models.AlertStateOK:
-		if on.AutoClose {
-			err = on.closeAlert(evalContext)
-		}
-	case models.AlertStateAlerting:
-		err = on.createAlert(evalContext)
-	default:
-		// Handle other cases?
-	}
-	return err
-}
-
-func (on *OpsGenieNotifier) createAlert(evalContext *alerting.EvalContext) error {
-	on.log.Info("Creating OpsGenie alert", "ruleId", evalContext.Rule.ID, "notification", on.Name)
-
-	ruleURL, err := evalContext.GetRuleURL()
-	if err != nil {
-		on.log.Error("Failed get rule link", "error", err)
-		return err
-	}
-
-	customData := triggMetrString
-	for _, evt := range evalContext.EvalMatches {
-		customData += fmt.Sprintf("%s: %v\n", evt.Metric, evt.Value)
-	}
-
-	bodyJSON := simplejson.New()
-	bodyJSON.Set("message", evalContext.Rule.Name)
-	bodyJSON.Set("source", "Grafana")
-	bodyJSON.Set("alias", "alertId-"+strconv.FormatInt(evalContext.Rule.ID, 10))
-	bodyJSON.Set("description", fmt.Sprintf("%s - %s\n%s\n%s", evalContext.Rule.Name, ruleURL, evalContext.Rule.Message, customData))
-
-	details := simplejson.New()
-	details.Set("url", ruleURL)
-	if on.NeedsImage() && evalContext.ImagePublicURL != "" {
-		details.Set("image", evalContext.ImagePublicURL)
-	}
-
-	tags := make([]string, 0)
-	for _, tag := range evalContext.Rule.AlertRuleTags {
-		if on.sendDetails() {
-			details.Set(tag.Key, tag.Value)
-		}
-
-		if on.sendTags() {
-			if len(tag.Value) > 0 {
-				tags = append(tags, fmt.Sprintf("%s:%s", tag.Key, tag.Value))
-			} else {
-				tags = append(tags, tag.Key)
-			}
-		}
-		if tag.Key == "og_priority" {
-			if on.OverridePriority {
-				validPriorities := map[string]bool{"P1": true, "P2": true, "P3": true, "P4": true, "P5": true}
-				if validPriorities[tag.Value] {
-					bodyJSON.Set("priority", tag.Value)
-				}
-			}
-		}
-	}
-	bodyJSON.Set("tags", tags)
-	bodyJSON.Set("details", details)
-
-	body, _ := bodyJSON.MarshalJSON()
-
-	cmd := &notifications.SendWebhookSync{
-		Url:        on.APIUrl,
-		Body:       string(body),
-		HttpMethod: "POST",
-		HttpHeader: map[string]string{
-			"Content-Type":  "application/json",
-			"Authorization": fmt.Sprintf("GenieKey %s", on.APIKey),
-		},
-	}
-
-	if err := on.NotificationService.SendWebhookSync(evalContext.Ctx, cmd); err != nil {
-		on.log.Error("Failed to send notification to OpsGenie", "error", err, "body", string(body))
-	}
-
-	return nil
-}
-
-func (on *OpsGenieNotifier) closeAlert(evalContext *alerting.EvalContext) error {
-	on.log.Info("Closing OpsGenie alert", "ruleId", evalContext.Rule.ID, "notification", on.Name)
-
-	bodyJSON := simplejson.New()
-	bodyJSON.Set("source", "Grafana")
-	body, _ := bodyJSON.MarshalJSON()
-
-	cmd := &notifications.SendWebhookSync{
-		Url:        fmt.Sprintf("%s/alertId-%d/close?identifierType=alias", on.APIUrl, evalContext.Rule.ID),
-		Body:       string(body),
-		HttpMethod: "POST",
-		HttpHeader: map[string]string{
-			"Content-Type":  "application/json",
-			"Authorization": fmt.Sprintf("GenieKey %s", on.APIKey),
-		},
-	}
-
-	if err := on.NotificationService.SendWebhookSync(evalContext.Ctx, cmd); err != nil {
-		on.log.Error("Failed to send notification to OpsGenie", "error", err, "body", string(body))
-		return err
-	}
-
-	return nil
-}
-
-func (on *OpsGenieNotifier) sendDetails() bool {
-	return on.SendTagsAs == sendDetails || on.SendTagsAs == sendBoth
-}
-
-func (on *OpsGenieNotifier) sendTags() bool {
-	return on.SendTagsAs == sendTags || on.SendTagsAs == sendBoth
-}
diff --git a/pkg/services/alerting/notifiers/opsgenie_test.go b/pkg/services/alerting/notifiers/opsgenie_test.go
deleted file mode 100644
index 1ff97eef0745a..0000000000000
--- a/pkg/services/alerting/notifiers/opsgenie_test.go
+++ /dev/null
@@ -1,228 +0,0 @@
-package notifiers
-
-import (
-	"context"
-	"reflect"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/annotations/annotationstest"
-	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/services/tag"
-	"github.com/grafana/grafana/pkg/services/validations"
-)
-
-func TestOpsGenieNotifier(t *testing.T) {
-	encryptionService := encryptionservice.SetupTestService(t)
-
-	t.Run("Parsing alert notification from settings", func(t *testing.T) {
-		t.Run("empty settings should return error", func(t *testing.T) {
-			json := `{ }`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "opsgenie_testing",
-				Type:     "opsgenie",
-				Settings: settingsJSON,
-			}
-
-			_, err := NewOpsGenieNotifier(model, encryptionService.GetDecryptedValue, nil)
-			require.Error(t, err)
-		})
-
-		t.Run("settings should trigger incident", func(t *testing.T) {
-			json := `
-				{
-          "apiKey": "abcdefgh0123456789"
-				}`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "opsgenie_testing",
-				Type:     "opsgenie",
-				Settings: settingsJSON,
-			}
-
-			not, err := NewOpsGenieNotifier(model, encryptionService.GetDecryptedValue, nil)
-			opsgenieNotifier := not.(*OpsGenieNotifier)
-
-			require.Nil(t, err)
-			require.Equal(t, "opsgenie_testing", opsgenieNotifier.Name)
-			require.Equal(t, "opsgenie", opsgenieNotifier.Type)
-			require.Equal(t, "abcdefgh0123456789", opsgenieNotifier.APIKey)
-		})
-	})
-
-	t.Run("Handling notification tags", func(t *testing.T) {
-		t.Run("invalid sendTagsAs value should return error", func(t *testing.T) {
-			json := `{
-          "apiKey": "abcdefgh0123456789",
-          "sendTagsAs": "not_a_valid_value"
-                                }`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "opsgenie_testing",
-				Type:     "opsgenie",
-				Settings: settingsJSON,
-			}
-
-			_, err := NewOpsGenieNotifier(model, encryptionService.GetDecryptedValue, nil)
-			require.Error(t, err)
-			require.Equal(t, reflect.TypeOf(err), reflect.TypeOf(alerting.ValidationError{}))
-			require.True(t, strings.HasSuffix(err.Error(), "Invalid value for sendTagsAs: \"not_a_valid_value\""))
-		})
-
-		t.Run("alert payload should include tag pairs only as an array in the tags key when sendAsTags is not set", func(t *testing.T) {
-			json := `{
-          "apiKey": "abcdefgh0123456789"
-				}`
-
-			tagPairs := []*tag.Tag{
-				{Key: "keyOnly"},
-				{Key: "aKey", Value: "aValue"},
-			}
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "opsgenie_testing",
-				Type:     "opsgenie",
-				Settings: settingsJSON,
-			}
-
-			notificationService := notifications.MockNotificationService()
-			notifier, notifierErr := NewOpsGenieNotifier(model, encryptionService.GetDecryptedValue, notificationService) // unhandled error
-
-			opsgenieNotifier := notifier.(*OpsGenieNotifier)
-
-			evalContext := alerting.NewEvalContext(context.Background(), &alerting.Rule{
-				ID:            0,
-				Name:          "someRule",
-				Message:       "someMessage",
-				State:         models.AlertStateAlerting,
-				AlertRuleTags: tagPairs,
-			}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-			evalContext.IsTestRun = true
-
-			tags := make([]string, 0)
-			details := make(map[string]any)
-
-			alertErr := opsgenieNotifier.createAlert(evalContext)
-
-			bodyJSON, err := simplejson.NewJson([]byte(notificationService.Webhook.Body))
-			if err == nil {
-				tags = bodyJSON.Get("tags").MustStringArray([]string{})
-				details = bodyJSON.Get("details").MustMap(map[string]any{})
-			}
-
-			require.Nil(t, notifierErr)
-			require.Nil(t, alertErr)
-			require.Equal(t, tags, []string{"keyOnly", "aKey:aValue"})
-			require.Equal(t, details, map[string]any{"url": ""})
-		})
-
-		t.Run("alert payload should include tag pairs only as a map in the details key when sendAsTags=details", func(t *testing.T) {
-			json := `{
-          "apiKey": "abcdefgh0123456789",
-          "sendTagsAs": "details"
-				}`
-
-			tagPairs := []*tag.Tag{
-				{Key: "keyOnly"},
-				{Key: "aKey", Value: "aValue"},
-			}
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "opsgenie_testing",
-				Type:     "opsgenie",
-				Settings: settingsJSON,
-			}
-
-			notificationService := notifications.MockNotificationService()
-			notifier, notifierErr := NewOpsGenieNotifier(model, encryptionService.GetDecryptedValue, notificationService) // unhandled error
-
-			opsgenieNotifier := notifier.(*OpsGenieNotifier)
-
-			evalContext := alerting.NewEvalContext(context.Background(), &alerting.Rule{
-				ID:            0,
-				Name:          "someRule",
-				Message:       "someMessage",
-				State:         models.AlertStateAlerting,
-				AlertRuleTags: tagPairs,
-			}, nil, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-			evalContext.IsTestRun = true
-
-			tags := make([]string, 0)
-			details := make(map[string]any)
-
-			alertErr := opsgenieNotifier.createAlert(evalContext)
-
-			bodyJSON, err := simplejson.NewJson([]byte(notificationService.Webhook.Body))
-			if err == nil {
-				tags = bodyJSON.Get("tags").MustStringArray([]string{})
-				details = bodyJSON.Get("details").MustMap(map[string]any{})
-			}
-
-			require.Nil(t, notifierErr)
-			require.Nil(t, alertErr)
-			require.Equal(t, tags, []string{})
-			require.Equal(t, details, map[string]any{"keyOnly": "", "aKey": "aValue", "url": ""})
-		})
-
-		t.Run("alert payload should include tag pairs as both a map in the details key and an array in the tags key when sendAsTags=both", func(t *testing.T) {
-			json := `{
-          "apiKey": "abcdefgh0123456789",
-          "sendTagsAs": "both"
-				}`
-
-			tagPairs := []*tag.Tag{
-				{Key: "keyOnly"},
-				{Key: "aKey", Value: "aValue"},
-			}
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "opsgenie_testing",
-				Type:     "opsgenie",
-				Settings: settingsJSON,
-			}
-
-			notificationService := notifications.MockNotificationService()
-			notifier, notifierErr := NewOpsGenieNotifier(model, encryptionService.GetDecryptedValue, notificationService) // unhandled error
-
-			opsgenieNotifier := notifier.(*OpsGenieNotifier)
-
-			evalContext := alerting.NewEvalContext(context.Background(), &alerting.Rule{
-				ID:            0,
-				Name:          "someRule",
-				Message:       "someMessage",
-				State:         models.AlertStateAlerting,
-				AlertRuleTags: tagPairs,
-			}, nil, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-			evalContext.IsTestRun = true
-
-			tags := make([]string, 0)
-			details := make(map[string]any)
-
-			alertErr := opsgenieNotifier.createAlert(evalContext)
-
-			bodyJSON, err := simplejson.NewJson([]byte(notificationService.Webhook.Body))
-			if err == nil {
-				tags = bodyJSON.Get("tags").MustStringArray([]string{})
-				details = bodyJSON.Get("details").MustMap(map[string]any{})
-			}
-
-			require.Nil(t, notifierErr)
-			require.Nil(t, alertErr)
-			require.Equal(t, tags, []string{"keyOnly", "aKey:aValue"})
-			require.Equal(t, details, map[string]any{"keyOnly": "", "aKey": "aValue", "url": ""})
-		})
-	})
-}
diff --git a/pkg/services/alerting/notifiers/pagerduty.go b/pkg/services/alerting/notifiers/pagerduty.go
deleted file mode 100644
index 2ecf083328556..0000000000000
--- a/pkg/services/alerting/notifiers/pagerduty.go
+++ /dev/null
@@ -1,248 +0,0 @@
-package notifiers
-
-import (
-	"context"
-	"os"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func init() {
-	alerting.RegisterNotifier(&alerting.NotifierPlugin{
-		Type:        "pagerduty",
-		Name:        "PagerDuty",
-		Description: "Sends notifications to PagerDuty",
-		Heading:     "PagerDuty settings",
-		Factory:     NewPagerdutyNotifier,
-		Options: []alerting.NotifierOption{
-			{
-				Label:        "Integration Key",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Placeholder:  "Pagerduty Integration Key",
-				PropertyName: "integrationKey",
-				Required:     true,
-				Secure:       true,
-			},
-			{
-				Label:   "Severity",
-				Element: alerting.ElementTypeSelect,
-				SelectOptions: []alerting.SelectOption{
-					{
-						Value: "critical",
-						Label: "Critical",
-					},
-					{
-						Value: "error",
-						Label: "Error",
-					},
-					{
-						Value: "warning",
-						Label: "Warning",
-					},
-					{
-						Value: "info",
-						Label: "Info",
-					},
-				},
-				PropertyName: "severity",
-			},
-			{
-				Label:        "Auto resolve incidents",
-				Element:      alerting.ElementTypeCheckbox,
-				Description:  "Resolve incidents in pagerduty once the alert goes back to ok.",
-				PropertyName: "autoResolve",
-			},
-			{
-				Label:        "Include message in details",
-				Element:      alerting.ElementTypeCheckbox,
-				Description:  "Move the alert message from the PD summary into the custom details. This changes the custom details object and may break event rules you have configured",
-				PropertyName: "messageInDetails",
-			},
-		},
-	})
-}
-
-var (
-	pagerdutyEventAPIURL = "https://events.pagerduty.com/v2/enqueue"
-)
-
-// NewPagerdutyNotifier is the constructor for the PagerDuty notifier
-func NewPagerdutyNotifier(model *models.AlertNotification, fn alerting.GetDecryptedValueFn, ns notifications.Service) (alerting.Notifier, error) {
-	severity := model.Settings.Get("severity").MustString("critical")
-	autoResolve := model.Settings.Get("autoResolve").MustBool(false)
-	key := fn(context.Background(), model.SecureSettings, "integrationKey", model.Settings.Get("integrationKey").MustString(), setting.SecretKey)
-	messageInDetails := model.Settings.Get("messageInDetails").MustBool(false)
-	if key == "" {
-		return nil, alerting.ValidationError{Reason: "Could not find integration key property in settings"}
-	}
-
-	return &PagerdutyNotifier{
-		NotifierBase:     NewNotifierBase(model, ns),
-		Key:              key,
-		Severity:         severity,
-		AutoResolve:      autoResolve,
-		MessageInDetails: messageInDetails,
-		log:              log.New("alerting.notifier.pagerduty"),
-	}, nil
-}
-
-// PagerdutyNotifier is responsible for sending
-// alert notifications to pagerduty
-type PagerdutyNotifier struct {
-	NotifierBase
-	Key              string
-	Severity         string
-	AutoResolve      bool
-	MessageInDetails bool
-	log              log.Logger
-}
-
-// buildEventPayload is responsible for building the event payload body for sending to Pagerduty v2 API
-func (pn *PagerdutyNotifier) buildEventPayload(evalContext *alerting.EvalContext) ([]byte, error) {
-	eventType := "trigger"
-	if evalContext.Rule.State == models.AlertStateOK {
-		eventType = "resolve"
-	}
-	customData := simplejson.New()
-	customData.Set("state", evalContext.Rule.State)
-	if pn.MessageInDetails {
-		queries := make(map[string]interface{})
-		for _, evt := range evalContext.EvalMatches {
-			queries[evt.Metric] = evt.Value
-		}
-		customData.Set("queries", queries)
-		customData.Set("message", evalContext.Rule.Message)
-	} else {
-		for _, evt := range evalContext.EvalMatches {
-			customData.Set(evt.Metric, evt.Value)
-		}
-	}
-
-	pn.log.Info("Notifying Pagerduty", "event_type", eventType)
-
-	payloadJSON := simplejson.New()
-
-	// set default, override in following case switch if defined
-	payloadJSON.Set("component", "Grafana")
-	payloadJSON.Set("severity", pn.Severity)
-	dedupKey := "alertId-" + strconv.FormatInt(evalContext.Rule.ID, 10)
-
-	for _, tag := range evalContext.Rule.AlertRuleTags {
-		// Override tags appropriately if they are in the PagerDuty v2 API
-		switch strings.ToLower(tag.Key) {
-		case "group":
-			payloadJSON.Set("group", tag.Value)
-		case "class":
-			payloadJSON.Set("class", tag.Value)
-		case "component":
-			payloadJSON.Set("component", tag.Value)
-		case "dedup_key":
-			if len(tag.Value) > 254 {
-				tag.Value = tag.Value[0:254]
-			}
-			dedupKey = tag.Value
-		case "severity":
-			// Only set severity if it's one of the PD supported enum values
-			// Info, Warning, Error, or Critical (case insensitive)
-			switch sev := strings.ToLower(tag.Value); sev {
-			case "info":
-				fallthrough
-			case "warning":
-				fallthrough
-			case "error":
-				fallthrough
-			case "critical":
-				payloadJSON.Set("severity", sev)
-			default:
-				pn.log.Warn("Ignoring invalid severity tag", "severity", sev)
-			}
-		}
-		customData.Set(tag.Key, tag.Value)
-	}
-
-	var summary string
-	if pn.MessageInDetails || evalContext.Rule.Message == "" {
-		summary = evalContext.Rule.Name
-	} else {
-		summary = evalContext.Rule.Name + " - " + evalContext.Rule.Message
-	}
-	if len(summary) > 1024 {
-		summary = summary[0:1024]
-	}
-	payloadJSON.Set("summary", summary)
-
-	if hostname, err := os.Hostname(); err == nil {
-		payloadJSON.Set("source", hostname)
-	}
-	payloadJSON.Set("timestamp", time.Now())
-	payloadJSON.Set("custom_details", customData)
-	bodyJSON := simplejson.New()
-	bodyJSON.Set("routing_key", pn.Key)
-	bodyJSON.Set("event_action", eventType)
-	bodyJSON.Set("dedup_key", dedupKey)
-	bodyJSON.Set("payload", payloadJSON)
-
-	ruleURL, err := evalContext.GetRuleURL()
-	if err != nil {
-		pn.log.Error("Failed get rule link", "error", err)
-		return []byte{}, err
-	}
-	links := make([]interface{}, 1)
-	linkJSON := simplejson.New()
-	linkJSON.Set("href", ruleURL)
-	bodyJSON.Set("client_url", ruleURL)
-	bodyJSON.Set("client", "Grafana")
-
-	links[0] = linkJSON
-	bodyJSON.Set("links", links)
-
-	if pn.NeedsImage() && evalContext.ImagePublicURL != "" {
-		contexts := make([]interface{}, 1)
-		imageJSON := simplejson.New()
-		imageJSON.Set("src", evalContext.ImagePublicURL)
-		contexts[0] = imageJSON
-		bodyJSON.Set("images", contexts)
-	}
-
-	body, _ := bodyJSON.MarshalJSON()
-
-	return body, nil
-}
-
-// Notify sends an alert notification to PagerDuty
-func (pn *PagerdutyNotifier) Notify(evalContext *alerting.EvalContext) error {
-	if evalContext.Rule.State == models.AlertStateOK && !pn.AutoResolve {
-		pn.log.Info("Not sending a trigger to Pagerduty", "state", evalContext.Rule.State, "auto resolve", pn.AutoResolve)
-		return nil
-	}
-
-	body, err := pn.buildEventPayload(evalContext)
-	if err != nil {
-		pn.log.Error("Unable to build PagerDuty event payload", "error", err)
-		return err
-	}
-
-	cmd := &notifications.SendWebhookSync{
-		Url:        pagerdutyEventAPIURL,
-		Body:       string(body),
-		HttpMethod: "POST",
-		HttpHeader: map[string]string{
-			"Content-Type": "application/json",
-		},
-	}
-
-	if err := pn.NotificationService.SendWebhookSync(evalContext.Ctx, cmd); err != nil {
-		pn.log.Error("Failed to send notification to Pagerduty", "error", err, "body", string(body))
-		return err
-	}
-	return nil
-}
diff --git a/pkg/services/alerting/notifiers/pagerduty_test.go b/pkg/services/alerting/notifiers/pagerduty_test.go
deleted file mode 100644
index c2b200ff69c06..0000000000000
--- a/pkg/services/alerting/notifiers/pagerduty_test.go
+++ /dev/null
@@ -1,542 +0,0 @@
-package notifiers
-
-import (
-	"context"
-	"strings"
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/null"
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/annotations/annotationstest"
-	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
-	"github.com/grafana/grafana/pkg/services/tag"
-	"github.com/grafana/grafana/pkg/services/validations"
-)
-
-func presenceComparer(a, b string) bool {
-	if a == "<<PRESENCE>>" {
-		return b != ""
-	}
-	if b == "<<PRESENCE>>" {
-		return a != ""
-	}
-	return a == b
-}
-
-func TestPagerdutyNotifier(t *testing.T) {
-	encryptionService := encryptionservice.SetupTestService(t)
-
-	t.Run("empty settings should return error", func(t *testing.T) {
-		json := `{ }`
-
-		settingsJSON, err := simplejson.NewJson([]byte(json))
-		require.Nil(t, err)
-
-		model := &models.AlertNotification{
-			Name:     "pageduty_testing",
-			Type:     "pagerduty",
-			Settings: settingsJSON,
-		}
-
-		_, err = NewPagerdutyNotifier(model, encryptionService.GetDecryptedValue, nil)
-		require.Error(t, err)
-	})
-
-	t.Run("severity should override default", func(t *testing.T) {
-		json := `{ "integrationKey": "abcdefgh0123456789", "severity": "info", "tags": ["foo"]}`
-
-		settingsJSON, err := simplejson.NewJson([]byte(json))
-		require.Nil(t, err)
-
-		model := &models.AlertNotification{
-			Name:     "pagerduty_testing",
-			Type:     "pagerduty",
-			Settings: settingsJSON,
-		}
-
-		not, err := NewPagerdutyNotifier(model, encryptionService.GetDecryptedValue, nil)
-		pagerdutyNotifier := not.(*PagerdutyNotifier)
-
-		require.Nil(t, err)
-		require.Equal(t, "pagerduty_testing", pagerdutyNotifier.Name)
-		require.Equal(t, "pagerduty", pagerdutyNotifier.Type)
-		require.Equal(t, "abcdefgh0123456789", pagerdutyNotifier.Key)
-		require.Equal(t, "info", pagerdutyNotifier.Severity)
-		require.False(t, pagerdutyNotifier.AutoResolve)
-	})
-
-	t.Run("auto resolve and severity should have expected defaults", func(t *testing.T) {
-		json := `{ "integrationKey": "abcdefgh0123456789" }`
-
-		settingsJSON, err := simplejson.NewJson([]byte(json))
-		require.Nil(t, err)
-
-		model := &models.AlertNotification{
-			Name:     "pagerduty_testing",
-			Type:     "pagerduty",
-			Settings: settingsJSON,
-		}
-
-		not, err := NewPagerdutyNotifier(model, encryptionService.GetDecryptedValue, nil)
-		pagerdutyNotifier := not.(*PagerdutyNotifier)
-
-		require.Nil(t, err)
-		require.Equal(t, "pagerduty_testing", pagerdutyNotifier.Name)
-		require.Equal(t, "pagerduty", pagerdutyNotifier.Type)
-		require.Equal(t, "abcdefgh0123456789", pagerdutyNotifier.Key)
-		require.Equal(t, "critical", pagerdutyNotifier.Severity)
-		require.False(t, pagerdutyNotifier.AutoResolve)
-	})
-
-	t.Run("settings should trigger incident", func(t *testing.T) {
-		json := `
-				{
-		  			"integrationKey": "abcdefgh0123456789",
-					"autoResolve": false
-				}`
-
-		settingsJSON, err := simplejson.NewJson([]byte(json))
-		require.Nil(t, err)
-
-		model := &models.AlertNotification{
-			Name:     "pagerduty_testing",
-			Type:     "pagerduty",
-			Settings: settingsJSON,
-		}
-
-		not, err := NewPagerdutyNotifier(model, encryptionService.GetDecryptedValue, nil)
-		pagerdutyNotifier := not.(*PagerdutyNotifier)
-
-		require.Nil(t, err)
-		require.Equal(t, "pagerduty_testing", pagerdutyNotifier.Name)
-		require.Equal(t, "pagerduty", pagerdutyNotifier.Type)
-		require.Equal(t, "abcdefgh0123456789", pagerdutyNotifier.Key)
-		require.False(t, pagerdutyNotifier.AutoResolve)
-	})
-
-	t.Run("should return properly formatted default v2 event payload", func(t *testing.T) {
-		json := `{
-					"integrationKey": "abcdefgh0123456789",
-					"autoResolve": false
-				}`
-
-		settingsJSON, err := simplejson.NewJson([]byte(json))
-		require.Nil(t, err)
-
-		model := &models.AlertNotification{
-			Name:     "pagerduty_testing",
-			Type:     "pagerduty",
-			Settings: settingsJSON,
-		}
-
-		not, err := NewPagerdutyNotifier(model, encryptionService.GetDecryptedValue, nil)
-		require.Nil(t, err)
-
-		pagerdutyNotifier := not.(*PagerdutyNotifier)
-		evalContext := alerting.NewEvalContext(context.Background(), &alerting.Rule{
-			ID:      0,
-			Name:    "someRule",
-			Message: "someMessage",
-			State:   models.AlertStateAlerting,
-		}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-		evalContext.IsTestRun = true
-
-		payloadJSON, err := pagerdutyNotifier.buildEventPayload(evalContext)
-		require.Nil(t, err)
-		payload, err := simplejson.NewJson(payloadJSON)
-		require.Nil(t, err)
-
-		diff := cmp.Diff(map[string]any{
-			"client":       "Grafana",
-			"client_url":   "",
-			"dedup_key":    "alertId-0",
-			"event_action": "trigger",
-			"links": []any{
-				map[string]any{
-					"href": "",
-				},
-			},
-			"payload": map[string]any{
-				"component": "Grafana",
-				"source":    "<<PRESENCE>>",
-				"custom_details": map[string]any{
-					"state": "alerting",
-				},
-				"severity":  "critical",
-				"summary":   "someRule - someMessage",
-				"timestamp": "<<PRESENCE>>",
-			},
-			"routing_key": "abcdefgh0123456789",
-		}, payload.Interface(), cmp.Comparer(presenceComparer))
-		require.Empty(t, diff)
-	})
-
-	t.Run("should return properly formatted default v2 event payload with empty message", func(t *testing.T) {
-		json := `{
-					"integrationKey": "abcdefgh0123456789",
-					"autoResolve": false
-				}`
-
-		settingsJSON, err := simplejson.NewJson([]byte(json))
-		require.Nil(t, err)
-
-		model := &models.AlertNotification{
-			Name:     "pagerduty_testing",
-			Type:     "pagerduty",
-			Settings: settingsJSON,
-		}
-
-		not, err := NewPagerdutyNotifier(model, encryptionService.GetDecryptedValue, nil)
-		require.Nil(t, err)
-
-		pagerdutyNotifier := not.(*PagerdutyNotifier)
-		evalContext := alerting.NewEvalContext(context.Background(), &alerting.Rule{
-			ID:    0,
-			Name:  "someRule",
-			State: models.AlertStateAlerting,
-		}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-		evalContext.IsTestRun = true
-
-		payloadJSON, err := pagerdutyNotifier.buildEventPayload(evalContext)
-		require.Nil(t, err)
-		payload, err := simplejson.NewJson(payloadJSON)
-		require.Nil(t, err)
-
-		diff := cmp.Diff(map[string]any{
-			"client":       "Grafana",
-			"client_url":   "",
-			"dedup_key":    "alertId-0",
-			"event_action": "trigger",
-			"links": []any{
-				map[string]any{
-					"href": "",
-				},
-			},
-			"payload": map[string]any{
-				"component": "Grafana",
-				"source":    "<<PRESENCE>>",
-				"custom_details": map[string]any{
-					"state": "alerting",
-				},
-				"severity":  "critical",
-				"summary":   "someRule",
-				"timestamp": "<<PRESENCE>>",
-			},
-			"routing_key": "abcdefgh0123456789",
-		}, payload.Interface(), cmp.Comparer(presenceComparer))
-		require.Empty(t, diff)
-	})
-
-	t.Run("should return properly formatted payload with message moved to details", func(t *testing.T) {
-		json := `{
-					"integrationKey": "abcdefgh0123456789",
-					"autoResolve": false,
-					"messageInDetails": true
-				}`
-
-		settingsJSON, err := simplejson.NewJson([]byte(json))
-		require.Nil(t, err)
-
-		model := &models.AlertNotification{
-			Name:     "pagerduty_testing",
-			Type:     "pagerduty",
-			Settings: settingsJSON,
-		}
-
-		not, err := NewPagerdutyNotifier(model, encryptionService.GetDecryptedValue, nil)
-		require.Nil(t, err)
-
-		pagerdutyNotifier := not.(*PagerdutyNotifier)
-		evalContext := alerting.NewEvalContext(context.Background(), &alerting.Rule{
-			ID:      0,
-			Name:    "someRule",
-			Message: "someMessage",
-			State:   models.AlertStateAlerting,
-		}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-		evalContext.IsTestRun = true
-		evalContext.EvalMatches = []*alerting.EvalMatch{
-			{
-				// nil is a terrible value to test with, but the cmp.Diff doesn't
-				// like comparing actual floats. So this is roughly the equivalent
-				// of <<PRESENCE>>
-				Value:  null.FloatFromPtr(nil),
-				Metric: "someMetric",
-			},
-		}
-
-		payloadJSON, err := pagerdutyNotifier.buildEventPayload(evalContext)
-		require.NoError(t, err)
-		payload, err := simplejson.NewJson(payloadJSON)
-		require.NoError(t, err)
-
-		diff := cmp.Diff(map[string]any{
-			"client":       "Grafana",
-			"client_url":   "",
-			"dedup_key":    "alertId-0",
-			"event_action": "trigger",
-			"links": []any{
-				map[string]any{
-					"href": "",
-				},
-			},
-			"payload": map[string]any{
-				"component": "Grafana",
-				"source":    "<<PRESENCE>>",
-				"custom_details": map[string]any{
-					"message": "someMessage",
-					"queries": map[string]any{
-						"someMetric": nil,
-					},
-					"state": "alerting",
-				},
-				"severity":  "critical",
-				"summary":   "someRule",
-				"timestamp": "<<PRESENCE>>",
-			},
-			"routing_key": "abcdefgh0123456789",
-		}, payload.Interface(), cmp.Comparer(presenceComparer))
-		require.Empty(t, diff)
-	})
-
-	t.Run("should return properly formatted v2 event payload when using override tags", func(t *testing.T) {
-		json := `{
-					"integrationKey": "abcdefgh0123456789",
-					"autoResolve": false
-				}`
-
-		settingsJSON, err := simplejson.NewJson([]byte(json))
-		require.NoError(t, err)
-
-		model := &models.AlertNotification{
-			Name:     "pagerduty_testing",
-			Type:     "pagerduty",
-			Settings: settingsJSON,
-		}
-
-		not, err := NewPagerdutyNotifier(model, encryptionService.GetDecryptedValue, nil)
-		require.NoError(t, err)
-
-		pagerdutyNotifier := not.(*PagerdutyNotifier)
-
-		evalContext := alerting.NewEvalContext(context.Background(), &alerting.Rule{
-			ID:      0,
-			Name:    "someRule",
-			Message: "someMessage",
-			State:   models.AlertStateAlerting,
-			AlertRuleTags: []*tag.Tag{
-				{Key: "keyOnly"},
-				{Key: "group", Value: "aGroup"},
-				{Key: "class", Value: "aClass"},
-				{Key: "component", Value: "aComponent"},
-				{Key: "severity", Value: "warning"},
-				{Key: "dedup_key", Value: "key-" + strings.Repeat("x", 260)},
-			},
-		}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-		evalContext.ImagePublicURL = "http://somewhere.com/omg_dont_panic.png"
-		evalContext.IsTestRun = true
-
-		payloadJSON, err := pagerdutyNotifier.buildEventPayload(evalContext)
-		require.NoError(t, err)
-		payload, err := simplejson.NewJson(payloadJSON)
-		require.NoError(t, err)
-
-		diff := cmp.Diff(map[string]any{
-			"client":       "Grafana",
-			"client_url":   "",
-			"dedup_key":    "key-" + strings.Repeat("x", 250),
-			"event_action": "trigger",
-			"links": []any{
-				map[string]any{
-					"href": "",
-				},
-			},
-			"payload": map[string]any{
-				"source":    "<<PRESENCE>>",
-				"component": "aComponent",
-				"custom_details": map[string]any{
-					"group":     "aGroup",
-					"class":     "aClass",
-					"component": "aComponent",
-					"severity":  "warning",
-					"dedup_key": "key-" + strings.Repeat("x", 250),
-					"keyOnly":   "",
-					"state":     "alerting",
-				},
-				"severity":  "warning",
-				"summary":   "someRule - someMessage",
-				"timestamp": "<<PRESENCE>>",
-				"class":     "aClass",
-				"group":     "aGroup",
-			},
-			"images": []any{
-				map[string]any{
-					"src": "http://somewhere.com/omg_dont_panic.png",
-				},
-			},
-			"routing_key": "abcdefgh0123456789",
-		}, payload.Interface(), cmp.Comparer(presenceComparer))
-		require.Empty(t, diff)
-	})
-
-	t.Run("should support multiple levels of severity", func(t *testing.T) {
-		json := `{
-					"integrationKey": "abcdefgh0123456789",
-					"autoResolve": false
-				}`
-
-		settingsJSON, err := simplejson.NewJson([]byte(json))
-		require.NoError(t, err)
-
-		model := &models.AlertNotification{
-			Name:     "pagerduty_testing",
-			Type:     "pagerduty",
-			Settings: settingsJSON,
-		}
-
-		not, err := NewPagerdutyNotifier(model, encryptionService.GetDecryptedValue, nil)
-		require.NoError(t, err)
-
-		pagerdutyNotifier := not.(*PagerdutyNotifier)
-
-		evalContext := alerting.NewEvalContext(context.Background(), &alerting.Rule{
-			ID:      0,
-			Name:    "someRule",
-			Message: "someMessage",
-			State:   models.AlertStateAlerting,
-			AlertRuleTags: []*tag.Tag{
-				{Key: "keyOnly"},
-				{Key: "group", Value: "aGroup"},
-				{Key: "class", Value: "aClass"},
-				{Key: "component", Value: "aComponent"},
-				{Key: "severity", Value: "info"},
-			},
-		}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-		evalContext.ImagePublicURL = "http://somewhere.com/omg_dont_panic.png"
-		evalContext.IsTestRun = true
-
-		payloadJSON, err := pagerdutyNotifier.buildEventPayload(evalContext)
-		require.NoError(t, err)
-		payload, err := simplejson.NewJson(payloadJSON)
-		require.NoError(t, err)
-
-		diff := cmp.Diff(map[string]any{
-			"client":       "Grafana",
-			"client_url":   "",
-			"dedup_key":    "alertId-0",
-			"event_action": "trigger",
-			"links": []any{
-				map[string]any{
-					"href": "",
-				},
-			},
-			"payload": map[string]any{
-				"source":    "<<PRESENCE>>",
-				"component": "aComponent",
-				"custom_details": map[string]any{
-					"group":     "aGroup",
-					"class":     "aClass",
-					"component": "aComponent",
-					"severity":  "info",
-					"keyOnly":   "",
-					"state":     "alerting",
-				},
-				"severity":  "info",
-				"summary":   "someRule - someMessage",
-				"timestamp": "<<PRESENCE>>",
-				"class":     "aClass",
-				"group":     "aGroup",
-			},
-			"images": []any{
-				map[string]any{
-					"src": "http://somewhere.com/omg_dont_panic.png",
-				},
-			},
-			"routing_key": "abcdefgh0123456789",
-		}, payload.Interface(), cmp.Comparer(presenceComparer))
-		require.Empty(t, diff)
-	})
-
-	t.Run("should ignore invalid severity for PD but keep the tag", func(t *testing.T) {
-		json := `{
-					"integrationKey": "abcdefgh0123456789",
-					"autoResolve": false,
-					"severity": "critical"
-				}`
-
-		settingsJSON, err := simplejson.NewJson([]byte(json))
-		require.NoError(t, err)
-
-		model := &models.AlertNotification{
-			Name:     "pagerduty_testing",
-			Type:     "pagerduty",
-			Settings: settingsJSON,
-		}
-
-		not, err := NewPagerdutyNotifier(model, encryptionService.GetDecryptedValue, nil)
-		require.NoError(t, err)
-
-		pagerdutyNotifier := not.(*PagerdutyNotifier)
-
-		evalContext := alerting.NewEvalContext(context.Background(), &alerting.Rule{
-			ID:      0,
-			Name:    "someRule",
-			Message: "someMessage",
-			State:   models.AlertStateAlerting,
-			AlertRuleTags: []*tag.Tag{
-				{Key: "keyOnly"},
-				{Key: "group", Value: "aGroup"},
-				{Key: "class", Value: "aClass"},
-				{Key: "component", Value: "aComponent"},
-				{Key: "severity", Value: "llama"},
-			},
-		}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-		evalContext.ImagePublicURL = "http://somewhere.com/omg_dont_panic.png"
-		evalContext.IsTestRun = true
-
-		payloadJSON, err := pagerdutyNotifier.buildEventPayload(evalContext)
-		require.NoError(t, err)
-		payload, err := simplejson.NewJson(payloadJSON)
-		require.NoError(t, err)
-
-		diff := cmp.Diff(map[string]any{
-			"client":       "Grafana",
-			"client_url":   "",
-			"dedup_key":    "alertId-0",
-			"event_action": "trigger",
-			"links": []any{
-				map[string]any{
-					"href": "",
-				},
-			},
-			"payload": map[string]any{
-				"source":    "<<PRESENCE>>",
-				"component": "aComponent",
-				"custom_details": map[string]any{
-					"group":     "aGroup",
-					"class":     "aClass",
-					"component": "aComponent",
-					"severity":  "llama",
-					"keyOnly":   "",
-					"state":     "alerting",
-				},
-				"severity":  "critical",
-				"summary":   "someRule - someMessage",
-				"timestamp": "<<PRESENCE>>",
-				"class":     "aClass",
-				"group":     "aGroup",
-			},
-			"images": []any{
-				map[string]any{
-					"src": "http://somewhere.com/omg_dont_panic.png",
-				},
-			},
-			"routing_key": "abcdefgh0123456789",
-		}, payload.Interface(), cmp.Comparer(presenceComparer))
-		require.Empty(t, diff)
-	})
-}
diff --git a/pkg/services/alerting/notifiers/pushover.go b/pkg/services/alerting/notifiers/pushover.go
deleted file mode 100644
index dcfd187d6834e..0000000000000
--- a/pkg/services/alerting/notifiers/pushover.go
+++ /dev/null
@@ -1,415 +0,0 @@
-package notifiers
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"io"
-	"mime/multipart"
-	"os"
-	"strconv"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-const pushoverEndpoint = "https://api.pushover.net/1/messages.json"
-
-func init() {
-	soundOptions := []alerting.SelectOption{
-		{
-			Value: "default",
-			Label: "Default",
-		},
-		{
-			Value: "pushover",
-			Label: "Pushover",
-		}, {
-			Value: "bike",
-			Label: "Bike",
-		}, {
-			Value: "bugle",
-			Label: "Bugle",
-		}, {
-			Value: "cashregister",
-			Label: "Cashregister",
-		}, {
-			Value: "classical",
-			Label: "Classical",
-		}, {
-			Value: "cosmic",
-			Label: "Cosmic",
-		}, {
-			Value: "falling",
-			Label: "Falling",
-		}, {
-			Value: "gamelan",
-			Label: "Gamelan",
-		}, {
-			Value: "incoming",
-			Label: "Incoming",
-		}, {
-			Value: "intermission",
-			Label: "Intermission",
-		}, {
-			Value: "magic",
-			Label: "Magic",
-		}, {
-			Value: "mechanical",
-			Label: "Mechanical",
-		}, {
-			Value: "pianobar",
-			Label: "Pianobar",
-		}, {
-			Value: "siren",
-			Label: "Siren",
-		}, {
-			Value: "spacealarm",
-			Label: "Spacealarm",
-		}, {
-			Value: "tugboat",
-			Label: "Tugboat",
-		}, {
-			Value: "alien",
-			Label: "Alien",
-		}, {
-			Value: "climb",
-			Label: "Climb",
-		}, {
-			Value: "persistent",
-			Label: "Persistent",
-		}, {
-			Value: "echo",
-			Label: "Echo",
-		}, {
-			Value: "updown",
-			Label: "Updown",
-		}, {
-			Value: "none",
-			Label: "None",
-		},
-	}
-
-	priorityOptions := []alerting.SelectOption{
-		{
-			Value: "2",
-			Label: "Emergency",
-		},
-		{
-			Value: "1",
-			Label: "High",
-		},
-		{
-			Value: "0",
-			Label: "Normal",
-		},
-		{
-			Value: "-1",
-			Label: "Low",
-		},
-		{
-			Value: "-2",
-			Label: "Lowest",
-		},
-	}
-
-	alerting.RegisterNotifier(&alerting.NotifierPlugin{
-		Type:        "pushover",
-		Name:        "Pushover",
-		Description: "Sends HTTP POST request to the Pushover API",
-		Heading:     "Pushover settings",
-		Factory:     NewPushoverNotifier,
-		Options: []alerting.NotifierOption{
-			{
-				Label:        "API Token",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Placeholder:  "Application token",
-				PropertyName: "apiToken",
-				Required:     true,
-				Secure:       true,
-			},
-			{
-				Label:        "User key(s)",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Placeholder:  "comma-separated list",
-				PropertyName: "userKey",
-				Required:     true,
-				Secure:       true,
-			},
-			{
-				Label:        "Device(s) (optional)",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Placeholder:  "comma-separated list; leave empty to send to all devices",
-				PropertyName: "device",
-			},
-			{
-				Label:         "Alerting priority",
-				Element:       alerting.ElementTypeSelect,
-				SelectOptions: priorityOptions,
-				PropertyName:  "priority",
-			},
-			{
-				Label:         "OK priority",
-				Element:       alerting.ElementTypeSelect,
-				SelectOptions: priorityOptions,
-				PropertyName:  "okPriority",
-			},
-			{
-				Description:  "How often (in seconds) the Pushover servers will send the same alerting or OK notification to the user.",
-				Label:        "Retry (Only used for Emergency Priority)",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Placeholder:  "minimum 30 seconds",
-				PropertyName: "retry",
-			},
-			{
-				Description:  "How many seconds the alerting or OK notification will continue to be retried.",
-				Label:        "Expire (Only used for Emergency Priority)",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Placeholder:  "maximum 86400 seconds",
-				PropertyName: "expire",
-			},
-			{
-				Label:         "Alerting sound",
-				Element:       alerting.ElementTypeSelect,
-				SelectOptions: soundOptions,
-				PropertyName:  "sound",
-			},
-			{
-				Label:         "OK sound",
-				Element:       alerting.ElementTypeSelect,
-				SelectOptions: soundOptions,
-				PropertyName:  "okSound",
-			},
-		},
-	})
-}
-
-// NewPushoverNotifier is the constructor for the Pushover Notifier
-func NewPushoverNotifier(model *models.AlertNotification, fn alerting.GetDecryptedValueFn, ns notifications.Service) (alerting.Notifier, error) {
-	userKey := fn(context.Background(), model.SecureSettings, "userKey", model.Settings.Get("userKey").MustString(), setting.SecretKey)
-	APIToken := fn(context.Background(), model.SecureSettings, "apiToken", model.Settings.Get("apiToken").MustString(), setting.SecretKey)
-	device := model.Settings.Get("device").MustString()
-	alertingPriority, err := strconv.Atoi(model.Settings.Get("priority").MustString("0")) // default Normal
-	if err != nil {
-		return nil, fmt.Errorf("failed to convert alerting priority to integer: %w", err)
-	}
-	okPriority, err := strconv.Atoi(model.Settings.Get("okPriority").MustString("0")) // default Normal
-	if err != nil {
-		return nil, fmt.Errorf("failed to convert OK priority to integer: %w", err)
-	}
-	retry, _ := strconv.Atoi(model.Settings.Get("retry").MustString())
-	expire, _ := strconv.Atoi(model.Settings.Get("expire").MustString())
-	alertingSound := model.Settings.Get("sound").MustString()
-	okSound := model.Settings.Get("okSound").MustString()
-	uploadImage := model.Settings.Get("uploadImage").MustBool(true)
-
-	if userKey == "" {
-		return nil, alerting.ValidationError{Reason: "User key not given"}
-	}
-	if APIToken == "" {
-		return nil, alerting.ValidationError{Reason: "API token not given"}
-	}
-	return &PushoverNotifier{
-		NotifierBase:     NewNotifierBase(model, ns),
-		UserKey:          userKey,
-		APIToken:         APIToken,
-		AlertingPriority: alertingPriority,
-		OKPriority:       okPriority,
-		Retry:            retry,
-		Expire:           expire,
-		Device:           device,
-		AlertingSound:    alertingSound,
-		OKSound:          okSound,
-		Upload:           uploadImage,
-		log:              log.New("alerting.notifier.pushover"),
-	}, nil
-}
-
-// PushoverNotifier is responsible for sending
-// alert notifications to Pushover
-type PushoverNotifier struct {
-	NotifierBase
-	UserKey          string
-	APIToken         string
-	AlertingPriority int
-	OKPriority       int
-	Retry            int
-	Expire           int
-	Device           string
-	AlertingSound    string
-	OKSound          string
-	Upload           bool
-	log              log.Logger
-}
-
-// Notify sends a alert notification to Pushover
-func (pn *PushoverNotifier) Notify(evalContext *alerting.EvalContext) error {
-	ruleURL, err := evalContext.GetRuleURL()
-	if err != nil {
-		pn.log.Error("Failed get rule link", "error", err)
-		return err
-	}
-
-	message := evalContext.Rule.Message
-	for idx, evt := range evalContext.EvalMatches {
-		message += fmt.Sprintf("\n<b>%s</b>: %v", evt.Metric, evt.Value)
-		if idx > 4 {
-			break
-		}
-	}
-	if evalContext.Error != nil {
-		message += fmt.Sprintf("\n<b>Error message:</b> %s", evalContext.Error.Error())
-	}
-
-	if message == "" {
-		message = "Notification message missing (Set a notification message to replace this text.)"
-	}
-
-	headers, uploadBody, err := pn.genPushoverBody(evalContext, message, ruleURL)
-	if err != nil {
-		pn.log.Error("Failed to generate body for pushover", "error", err)
-		return err
-	}
-
-	cmd := &notifications.SendWebhookSync{
-		Url:        pushoverEndpoint,
-		HttpMethod: "POST",
-		HttpHeader: headers,
-		Body:       uploadBody.String(),
-	}
-
-	if err := pn.NotificationService.SendWebhookSync(evalContext.Ctx, cmd); err != nil {
-		pn.log.Error("Failed to send pushover notification", "error", err, "webhook", pn.Name)
-		return err
-	}
-
-	return nil
-}
-
-func (pn *PushoverNotifier) genPushoverBody(evalContext *alerting.EvalContext, message string, ruleURL string) (map[string]string, bytes.Buffer, error) {
-	var b bytes.Buffer
-	var err error
-	w := multipart.NewWriter(&b)
-
-	// Add image only if requested and available
-	if pn.Upload && evalContext.ImageOnDiskPath != "" {
-		f, err := os.Open(evalContext.ImageOnDiskPath)
-		if err != nil {
-			return nil, b, err
-		}
-		defer func() {
-			if err := f.Close(); err != nil {
-				pn.log.Warn("Failed to close file", "path", evalContext.ImageOnDiskPath, "err", err)
-			}
-		}()
-
-		fw, err := w.CreateFormFile("attachment", evalContext.ImageOnDiskPath)
-		if err != nil {
-			return nil, b, err
-		}
-
-		_, err = io.Copy(fw, f)
-		if err != nil {
-			return nil, b, err
-		}
-	}
-
-	// Add the user token
-	err = w.WriteField("user", pn.UserKey)
-	if err != nil {
-		return nil, b, err
-	}
-
-	// Add the api token
-	err = w.WriteField("token", pn.APIToken)
-	if err != nil {
-		return nil, b, err
-	}
-
-	// Add priority
-	priority := pn.AlertingPriority
-	if evalContext.Rule.State == models.AlertStateOK {
-		priority = pn.OKPriority
-	}
-	err = w.WriteField("priority", strconv.Itoa(priority))
-	if err != nil {
-		return nil, b, err
-	}
-
-	if priority == 2 {
-		err = w.WriteField("retry", strconv.Itoa(pn.Retry))
-		if err != nil {
-			return nil, b, err
-		}
-
-		err = w.WriteField("expire", strconv.Itoa(pn.Expire))
-		if err != nil {
-			return nil, b, err
-		}
-	}
-
-	// Add device
-	if pn.Device != "" {
-		err = w.WriteField("device", pn.Device)
-		if err != nil {
-			return nil, b, err
-		}
-	}
-
-	// Add sound
-	sound := pn.AlertingSound
-	if evalContext.Rule.State == models.AlertStateOK {
-		sound = pn.OKSound
-	}
-	if sound != "default" {
-		err = w.WriteField("sound", sound)
-		if err != nil {
-			return nil, b, err
-		}
-	}
-
-	// Add title
-	err = w.WriteField("title", evalContext.GetNotificationTitle())
-	if err != nil {
-		return nil, b, err
-	}
-
-	// Add URL
-	err = w.WriteField("url", ruleURL)
-	if err != nil {
-		return nil, b, err
-	}
-	// Add URL title
-	err = w.WriteField("url_title", "Show dashboard with alert")
-	if err != nil {
-		return nil, b, err
-	}
-
-	// Add message
-	err = w.WriteField("message", message)
-	if err != nil {
-		return nil, b, err
-	}
-
-	// Mark as html message
-	err = w.WriteField("html", "1")
-	if err != nil {
-		return nil, b, err
-	}
-	if err := w.Close(); err != nil {
-		return nil, b, err
-	}
-
-	headers := map[string]string{
-		"Content-Type": w.FormDataContentType(),
-	}
-	return headers, b, nil
-}
diff --git a/pkg/services/alerting/notifiers/pushover_test.go b/pkg/services/alerting/notifiers/pushover_test.go
deleted file mode 100644
index 371e78fcd7147..0000000000000
--- a/pkg/services/alerting/notifiers/pushover_test.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package notifiers
-
-import (
-	"context"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/annotations/annotationstest"
-	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
-	"github.com/grafana/grafana/pkg/services/validations"
-)
-
-func TestPushoverNotifier(t *testing.T) {
-	encryptionService := encryptionservice.SetupTestService(t)
-
-	t.Run("Parsing alert notification from settings", func(t *testing.T) {
-		t.Run("empty settings should return error", func(t *testing.T) {
-			json := `{ }`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "Pushover",
-				Type:     "pushover",
-				Settings: settingsJSON,
-			}
-
-			_, err := NewPushoverNotifier(model, encryptionService.GetDecryptedValue, nil)
-			require.Error(t, err)
-		})
-
-		t.Run("from settings", func(t *testing.T) {
-			json := `
-				{
-					"apiToken": "4SrUFQL4A5V5TQ1z5Pg9nxHXPXSTve",
-					"userKey": "tzNZYf36y0ohWwXo4XoUrB61rz1A4o",
-					"priority": "1",
-					"okPriority": "2",
-					"sound": "pushover",
-					"okSound": "magic"
-				}`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "Pushover",
-				Type:     "pushover",
-				Settings: settingsJSON,
-			}
-
-			not, err := NewPushoverNotifier(model, encryptionService.GetDecryptedValue, nil)
-			pushoverNotifier := not.(*PushoverNotifier)
-
-			require.Nil(t, err)
-			require.Equal(t, "Pushover", pushoverNotifier.Name)
-			require.Equal(t, "pushover", pushoverNotifier.Type)
-			require.Equal(t, "4SrUFQL4A5V5TQ1z5Pg9nxHXPXSTve", pushoverNotifier.APIToken)
-			require.Equal(t, "tzNZYf36y0ohWwXo4XoUrB61rz1A4o", pushoverNotifier.UserKey)
-			require.Equal(t, 1, pushoverNotifier.AlertingPriority)
-			require.Equal(t, 2, pushoverNotifier.OKPriority)
-			require.Equal(t, "pushover", pushoverNotifier.AlertingSound)
-			require.Equal(t, "magic", pushoverNotifier.OKSound)
-		})
-	})
-}
-
-func TestGenPushoverBody(t *testing.T) {
-	t.Run("Given common sounds", func(t *testing.T) {
-		sirenSound := "siren_sound_tst"
-		successSound := "success_sound_tst"
-		notifier := &PushoverNotifier{AlertingSound: sirenSound, OKSound: successSound}
-
-		t.Run("When alert is firing - should use siren sound", func(t *testing.T) {
-			evalContext := alerting.NewEvalContext(context.Background(),
-				&alerting.Rule{
-					State: models.AlertStateAlerting,
-				}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-			_, pushoverBody, err := notifier.genPushoverBody(evalContext, "", "")
-
-			require.Nil(t, err)
-			require.True(t, strings.Contains(pushoverBody.String(), sirenSound))
-		})
-
-		t.Run("When alert is ok - should use success sound", func(t *testing.T) {
-			evalContext := alerting.NewEvalContext(context.Background(),
-				&alerting.Rule{
-					State: models.AlertStateOK,
-				}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-			_, pushoverBody, err := notifier.genPushoverBody(evalContext, "", "")
-
-			require.Nil(t, err)
-			require.True(t, strings.Contains(pushoverBody.String(), successSound))
-		})
-	})
-}
diff --git a/pkg/services/alerting/notifiers/sensu.go b/pkg/services/alerting/notifiers/sensu.go
deleted file mode 100644
index c00dad176dcaf..0000000000000
--- a/pkg/services/alerting/notifiers/sensu.go
+++ /dev/null
@@ -1,155 +0,0 @@
-package notifiers
-
-import (
-	"context"
-	"strconv"
-	"strings"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func init() {
-	alerting.RegisterNotifier(&alerting.NotifierPlugin{
-		Type:        "sensu",
-		Name:        "Sensu",
-		Description: "Sends HTTP POST request to a Sensu API",
-		Heading:     "Sensu settings",
-		Factory:     NewSensuNotifier,
-		Options: []alerting.NotifierOption{
-			{
-				Label:        "Url",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Placeholder:  "http://sensu-api.local:4567/results",
-				PropertyName: "url",
-				Required:     true,
-			},
-			{
-				Label:        "Source",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Description:  "If empty rule id will be used",
-				PropertyName: "source",
-			},
-			{
-				Label:        "Handler",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Placeholder:  "default",
-				PropertyName: "handler",
-			},
-			{
-				Label:        "Username",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				PropertyName: "username",
-			},
-			{
-				Label:        "Password",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypePassword,
-				PropertyName: "passsword ",
-				Secure:       true,
-			},
-		},
-	})
-}
-
-// NewSensuNotifier is the constructor for the Sensu Notifier.
-func NewSensuNotifier(model *models.AlertNotification, fn alerting.GetDecryptedValueFn, ns notifications.Service) (alerting.Notifier, error) {
-	url := model.Settings.Get("url").MustString()
-	if url == "" {
-		return nil, alerting.ValidationError{Reason: "Could not find url property in settings"}
-	}
-
-	return &SensuNotifier{
-		NotifierBase: NewNotifierBase(model, ns),
-		URL:          url,
-		User:         model.Settings.Get("username").MustString(),
-		Source:       model.Settings.Get("source").MustString(),
-		Password:     fn(context.Background(), model.SecureSettings, "password", model.Settings.Get("password").MustString(), setting.SecretKey),
-		Handler:      model.Settings.Get("handler").MustString(),
-		log:          log.New("alerting.notifier.sensu"),
-	}, nil
-}
-
-// SensuNotifier is responsible for sending
-// alert notifications to Sensu.
-type SensuNotifier struct {
-	NotifierBase
-	URL      string
-	Source   string
-	User     string
-	Password string
-	Handler  string
-	log      log.Logger
-}
-
-// Notify send alert notification to Sensu
-func (sn *SensuNotifier) Notify(evalContext *alerting.EvalContext) error {
-	sn.log.Info("Sending sensu result")
-
-	bodyJSON := simplejson.New()
-	bodyJSON.Set("ruleId", evalContext.Rule.ID)
-	// Sensu alerts cannot have spaces in them
-	bodyJSON.Set("name", strings.ReplaceAll(evalContext.Rule.Name, " ", "_"))
-	// Sensu alerts require a source. We set it to the user-specified value (optional),
-	// else we fallback and use the grafana ruleID.
-	if sn.Source != "" {
-		bodyJSON.Set("source", sn.Source)
-	} else {
-		bodyJSON.Set("source", "grafana_rule_"+strconv.FormatInt(evalContext.Rule.ID, 10))
-	}
-	// Finally, sensu expects an output
-	// We set it to a default output
-	bodyJSON.Set("output", "Grafana Metric Condition Met")
-	bodyJSON.Set("evalMatches", evalContext.EvalMatches)
-
-	switch evalContext.Rule.State {
-	case "alerting":
-		bodyJSON.Set("status", 2)
-	case "no_data":
-		bodyJSON.Set("status", 1)
-	default:
-		bodyJSON.Set("status", 0)
-	}
-
-	if sn.Handler != "" {
-		bodyJSON.Set("handler", sn.Handler)
-	}
-
-	ruleURL, err := evalContext.GetRuleURL()
-	if err == nil {
-		bodyJSON.Set("ruleUrl", ruleURL)
-	}
-
-	if sn.NeedsImage() && evalContext.ImagePublicURL != "" {
-		bodyJSON.Set("imageUrl", evalContext.ImagePublicURL)
-	}
-
-	if evalContext.Rule.Message != "" {
-		bodyJSON.Set("output", evalContext.Rule.Message)
-	}
-
-	body, _ := bodyJSON.MarshalJSON()
-
-	cmd := &notifications.SendWebhookSync{
-		Url:        sn.URL,
-		User:       sn.User,
-		Password:   sn.Password,
-		Body:       string(body),
-		HttpMethod: "POST",
-	}
-
-	if err := sn.NotificationService.SendWebhookSync(evalContext.Ctx, cmd); err != nil {
-		sn.log.Error("Failed to send sensu event", "error", err, "sensu", sn.Name)
-		return err
-	}
-
-	return nil
-}
diff --git a/pkg/services/alerting/notifiers/sensu_test.go b/pkg/services/alerting/notifiers/sensu_test.go
deleted file mode 100644
index 5b6503f798fb1..0000000000000
--- a/pkg/services/alerting/notifiers/sensu_test.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package notifiers
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
-)
-
-func TestSensuNotifier(t *testing.T) {
-	encryptionService := encryptionservice.SetupTestService(t)
-
-	t.Run("Parsing alert notification from settings", func(t *testing.T) {
-		t.Run("empty settings should return error", func(t *testing.T) {
-			json := `{ }`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "sensu",
-				Type:     "sensu",
-				Settings: settingsJSON,
-			}
-
-			_, err := NewSensuNotifier(model, encryptionService.GetDecryptedValue, nil)
-			require.Error(t, err)
-		})
-
-		t.Run("from settings", func(t *testing.T) {
-			json := `
-				{
-					"url": "http://sensu-api.example.com:4567/results",
-					"source": "grafana_instance_01",
-					"handler": "myhandler"
-				}`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "sensu",
-				Type:     "sensu",
-				Settings: settingsJSON,
-			}
-
-			not, err := NewSensuNotifier(model, encryptionService.GetDecryptedValue, nil)
-			sensuNotifier := not.(*SensuNotifier)
-
-			require.Nil(t, err)
-			require.Equal(t, "sensu", sensuNotifier.Name)
-			require.Equal(t, "sensu", sensuNotifier.Type)
-			require.Equal(t, "http://sensu-api.example.com:4567/results", sensuNotifier.URL)
-			require.Equal(t, "grafana_instance_01", sensuNotifier.Source)
-			require.Equal(t, "myhandler", sensuNotifier.Handler)
-		})
-	})
-}
diff --git a/pkg/services/alerting/notifiers/sensugo.go b/pkg/services/alerting/notifiers/sensugo.go
deleted file mode 100644
index d5f6a4dbfaf75..0000000000000
--- a/pkg/services/alerting/notifiers/sensugo.go
+++ /dev/null
@@ -1,206 +0,0 @@
-package notifiers
-
-import (
-	"context"
-	"fmt"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func init() {
-	alerting.RegisterNotifier(&alerting.NotifierPlugin{
-		Type:        "sensugo",
-		Name:        "Sensu Go",
-		Description: "Sends HTTP POST request to a Sensu Go API",
-		Heading:     "Sensu Go Settings",
-		Factory:     NewSensuGoNotifier,
-		Options: []alerting.NotifierOption{
-			{
-				Label:        "Backend URL",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Placeholder:  "http://sensu-api.local:8080",
-				PropertyName: "url",
-				Required:     true,
-			},
-			{
-				Label:        "API Key",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypePassword,
-				Description:  "API Key to auth to Sensu Go backend",
-				PropertyName: "apikey",
-				Required:     true,
-				Secure:       true,
-			},
-			{
-				Label:        "Proxy entity name",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Description:  "If empty, rule name will be used",
-				PropertyName: "entity",
-			},
-			{
-				Label:        "Check name",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Description:  "If empty, rule id will be used",
-				PropertyName: "check",
-			},
-			{
-				Label:        "Handler",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				PropertyName: "handler",
-			},
-			{
-				Label:        "Namespace",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Placeholder:  "default",
-				PropertyName: "namespace",
-			},
-		},
-	})
-}
-
-// NewSensuGoNotifier is the constructor for the Sensu Go Notifier.
-func NewSensuGoNotifier(model *models.AlertNotification, fn alerting.GetDecryptedValueFn, ns notifications.Service) (alerting.Notifier, error) {
-	url := model.Settings.Get("url").MustString()
-	apikey := fn(context.Background(), model.SecureSettings, "apikey", model.Settings.Get("apikey").MustString(), setting.SecretKey)
-
-	if url == "" {
-		return nil, alerting.ValidationError{Reason: "Could not find URL property in settings"}
-	}
-	if apikey == "" {
-		return nil, alerting.ValidationError{Reason: "Could not find the API Key property in settings"}
-	}
-
-	return &SensuGoNotifier{
-		NotifierBase: NewNotifierBase(model, ns),
-		URL:          url,
-		Entity:       model.Settings.Get("entity").MustString(),
-		Check:        model.Settings.Get("check").MustString(),
-		Namespace:    model.Settings.Get("namespace").MustString(),
-		Handler:      model.Settings.Get("handler").MustString(),
-		APIKey:       apikey,
-		log:          log.New("alerting.notifier.sensugo"),
-	}, nil
-}
-
-// SensuGoNotifier is responsible for sending
-// alert notifications to Sensu Go.
-type SensuGoNotifier struct {
-	NotifierBase
-	URL       string
-	Entity    string
-	Check     string
-	Namespace string
-	Handler   string
-	APIKey    string
-	log       log.Logger
-}
-
-// Notify send alert notification to Sensu Go
-func (sn *SensuGoNotifier) Notify(evalContext *alerting.EvalContext) error {
-	sn.log.Info("Sending Sensu Go result")
-
-	var namespace string
-
-	customData := triggMetrString
-	for _, evt := range evalContext.EvalMatches {
-		customData += fmt.Sprintf("%s: %v\n", evt.Metric, evt.Value)
-	}
-
-	bodyJSON := simplejson.New()
-	// Sensu Go alerts require an entity and a check. We set it to the user-specified
-	// value (optional), else we fallback and use the grafana rule anme  and ruleID.
-	if sn.Entity != "" {
-		bodyJSON.SetPath([]string{"entity", "metadata", "name"}, sn.Entity)
-	} else {
-		// Sensu Go alerts cannot have spaces in them
-		bodyJSON.SetPath([]string{"entity", "metadata", "name"}, strings.ReplaceAll(evalContext.Rule.Name, " ", "_"))
-	}
-	if sn.Check != "" {
-		bodyJSON.SetPath([]string{"check", "metadata", "name"}, sn.Check)
-	} else {
-		bodyJSON.SetPath([]string{"check", "metadata", "name"}, "grafana_rule_"+strconv.FormatInt(evalContext.Rule.ID, 10))
-	}
-	// Sensu Go requires the entity in an event specify its namespace.  We set it to
-	// the user-specified value (optional), else we fallback and use default
-	if sn.Namespace != "" {
-		bodyJSON.SetPath([]string{"entity", "metadata", "namespace"}, sn.Namespace)
-		namespace = sn.Namespace
-	} else {
-		bodyJSON.SetPath([]string{"entity", "metadata", "namespace"}, "default")
-		namespace = "default"
-	}
-	// Sensu Go needs check output, triggered metrics as default value
-	if evalContext.Rule.Message != "" {
-		bodyJSON.SetPath([]string{"check", "output"}, evalContext.Rule.Message)
-	} else {
-		bodyJSON.SetPath([]string{"check", "output"}, customData)
-	}
-	// Add timestamp detail in event
-	bodyJSON.SetPath([]string{"check", "issued"}, time.Now().Unix())
-	// Sensu GO requires that the check portion of the event have an interval
-	bodyJSON.SetPath([]string{"check", "interval"}, 86400)
-
-	switch evalContext.Rule.State {
-	case "alerting":
-		bodyJSON.SetPath([]string{"check", "status"}, 2)
-	case "no_data":
-		bodyJSON.SetPath([]string{"check", "status"}, 1)
-	default:
-		bodyJSON.SetPath([]string{"check", "status"}, 0)
-	}
-
-	if sn.Handler != "" {
-		bodyJSON.SetPath([]string{"check", "handlers"}, []string{sn.Handler})
-	}
-
-	ruleURL, err := evalContext.GetRuleURL()
-	if err == nil {
-		bodyJSON.Set("ruleUrl", ruleURL)
-	}
-
-	labels := map[string]string{
-		"ruleName": evalContext.Rule.Name,
-		"ruleId":   strconv.FormatInt(evalContext.Rule.ID, 10),
-		"ruleURL":  ruleURL,
-	}
-
-	if sn.NeedsImage() && evalContext.ImagePublicURL != "" {
-		labels["imageUrl"] = evalContext.ImagePublicURL
-	}
-
-	bodyJSON.SetPath([]string{"check", "metadata", "labels"}, labels)
-
-	body, err := bodyJSON.MarshalJSON()
-	if err != nil {
-		return err
-	}
-
-	cmd := &notifications.SendWebhookSync{
-		Url:        fmt.Sprintf("%s/api/core/v2/namespaces/%s/events", strings.TrimSuffix(sn.URL, "/"), namespace),
-		Body:       string(body),
-		HttpMethod: "POST",
-		HttpHeader: map[string]string{
-			"Content-Type":  "application/json",
-			"Authorization": fmt.Sprintf("Key %s", sn.APIKey),
-		},
-	}
-	if err := sn.NotificationService.SendWebhookSync(evalContext.Ctx, cmd); err != nil {
-		sn.log.Error("Failed to send Sensu Go event", "error", err, "sensugo", sn.Name)
-		return err
-	}
-
-	return nil
-}
diff --git a/pkg/services/alerting/notifiers/sensugo_test.go b/pkg/services/alerting/notifiers/sensugo_test.go
deleted file mode 100644
index 73d30ecf73bcd..0000000000000
--- a/pkg/services/alerting/notifiers/sensugo_test.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package notifiers
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
-)
-
-func TestSensuGoNotifier(t *testing.T) {
-	json := `{ }`
-
-	settingsJSON, err := simplejson.NewJson([]byte(json))
-	require.NoError(t, err)
-	model := &models.AlertNotification{
-		Name:     "Sensu Go",
-		Type:     "sensugo",
-		Settings: settingsJSON,
-	}
-
-	encryptionService := encryptionservice.SetupTestService(t)
-
-	_, err = NewSensuGoNotifier(model, encryptionService.GetDecryptedValue, nil)
-	require.Error(t, err)
-
-	json = `
-	{
-		"url": "http://sensu-api.example.com:8080",
-		"entity": "grafana_instance_01",
-		"check": "grafana_rule_0",
-		"namespace": "default",
-		"handler": "myhandler",
-		"apikey": "abcdef0123456789abcdef"
-	}`
-
-	settingsJSON, err = simplejson.NewJson([]byte(json))
-	require.NoError(t, err)
-	model = &models.AlertNotification{
-		Name:     "Sensu Go",
-		Type:     "sensugo",
-		Settings: settingsJSON,
-	}
-
-	not, err := NewSensuGoNotifier(model, encryptionService.GetDecryptedValue, nil)
-	require.NoError(t, err)
-	sensuGoNotifier := not.(*SensuGoNotifier)
-
-	assert.Equal(t, "Sensu Go", sensuGoNotifier.Name)
-	assert.Equal(t, "sensugo", sensuGoNotifier.Type)
-	assert.Equal(t, "http://sensu-api.example.com:8080", sensuGoNotifier.URL)
-	assert.Equal(t, "grafana_instance_01", sensuGoNotifier.Entity)
-	assert.Equal(t, "grafana_rule_0", sensuGoNotifier.Check)
-	assert.Equal(t, "default", sensuGoNotifier.Namespace)
-	assert.Equal(t, "myhandler", sensuGoNotifier.Handler)
-	assert.Equal(t, "abcdef0123456789abcdef", sensuGoNotifier.APIKey)
-}
diff --git a/pkg/services/alerting/notifiers/slack.go b/pkg/services/alerting/notifiers/slack.go
deleted file mode 100644
index 7a673b99dd22d..0000000000000
--- a/pkg/services/alerting/notifiers/slack.go
+++ /dev/null
@@ -1,478 +0,0 @@
-package notifiers
-
-import (
-	"bytes"
-	"context"
-	"crypto/tls"
-	"encoding/json"
-	"fmt"
-	"io"
-	"mime/multipart"
-	"net"
-	"net/http"
-	"net/url"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func init() {
-	alerting.RegisterNotifier(&alerting.NotifierPlugin{
-		Type:        "slack",
-		Name:        "Slack",
-		Description: "Sends notifications to Slack",
-		Heading:     "Slack settings",
-		Factory:     NewSlackNotifier,
-		Options: []alerting.NotifierOption{
-			{
-				Label:        "Recipient",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Description:  "Specify channel, private group, or IM channel (can be an encoded ID or a name) - required unless you provide a webhook",
-				PropertyName: "recipient",
-			},
-			// Logically, this field should be required when not using a webhook, since the Slack API needs a token.
-			// However, since the UI doesn't allow to say that a field is required or not depending on another field,
-			// we've gone with the compromise of making this field optional and instead return a validation error
-			// if it's necessary and missing.
-			{
-				Label:        "Token",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Description:  "Provide a Slack API token (starts with \"xoxb\") - required unless you provide a webhook",
-				PropertyName: "token",
-				Secure:       true,
-			},
-			{
-				Label:        "Username",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Description:  "Set the username for the bot's message",
-				PropertyName: "username",
-			},
-			{
-				Label:        "Icon emoji",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Description:  "Provide an emoji to use as the icon for the bot's message. Overrides the icon URL.",
-				PropertyName: "icon_emoji",
-			},
-			{
-				Label:        "Icon URL",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Description:  "Provide a URL to an image to use as the icon for the bot's message",
-				PropertyName: "icon_url",
-			},
-			{
-				Label:        "Mention Users",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Description:  "Mention one or more users (comma separated) when notifying in a channel, by ID (you can copy this from the user's Slack profile)",
-				PropertyName: "mentionUsers",
-			},
-			{
-				Label:        "Mention Groups",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Description:  "Mention one or more groups (comma separated) when notifying in a channel (you can copy this from the group's Slack profile URL)",
-				PropertyName: "mentionGroups",
-			},
-			{
-				Label:   "Mention Channel",
-				Element: alerting.ElementTypeSelect,
-				SelectOptions: []alerting.SelectOption{
-					{
-						Value: "",
-						Label: "Disabled",
-					},
-					{
-						Value: "here",
-						Label: "Every active channel member",
-					},
-					{
-						Value: "channel",
-						Label: "Every channel member",
-					},
-				},
-				Description:  "Mention whole channel or just active members when notifying",
-				PropertyName: "mentionChannel",
-			},
-			{
-				Label:        "Webhook URL",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Description:  "Optionally provide a Slack incoming webhook URL for sending messages, in this case the token isn't necessary",
-				Placeholder:  "Slack incoming webhook URL",
-				PropertyName: "url",
-				Secure:       true,
-			},
-		},
-	})
-}
-
-const slackAPIEndpoint = "https://slack.com/api/chat.postMessage"
-
-// NewSlackNotifier is the constructor for the Slack notifier.
-func NewSlackNotifier(model *models.AlertNotification, fn alerting.GetDecryptedValueFn, ns notifications.Service) (alerting.Notifier, error) {
-	urlStr := fn(context.Background(), model.SecureSettings, "url", model.Settings.Get("url").MustString(), setting.SecretKey)
-	if urlStr == "" {
-		urlStr = slackAPIEndpoint
-	}
-	apiURL, err := url.Parse(urlStr)
-	if err != nil {
-		return nil, fmt.Errorf("invalid URL %q: %w", urlStr, err)
-	}
-
-	recipient := strings.TrimSpace(model.Settings.Get("recipient").MustString())
-	if recipient == "" && apiURL.String() == slackAPIEndpoint {
-		return nil, alerting.ValidationError{
-			Reason: "recipient must be specified when using the Slack chat API",
-		}
-	}
-	username := model.Settings.Get("username").MustString()
-	iconEmoji := model.Settings.Get("icon_emoji").MustString()
-	iconURL := model.Settings.Get("icon_url").MustString()
-	mentionUsersStr := model.Settings.Get("mentionUsers").MustString()
-	mentionGroupsStr := model.Settings.Get("mentionGroups").MustString()
-	mentionChannel := model.Settings.Get("mentionChannel").MustString()
-	token := fn(context.Background(), model.SecureSettings, "token", model.Settings.Get("token").MustString(), setting.SecretKey)
-	if token == "" && apiURL.String() == slackAPIEndpoint {
-		return nil, alerting.ValidationError{
-			Reason: "token must be specified when using the Slack chat API",
-		}
-	}
-
-	uploadImage := model.Settings.Get("uploadImage").MustBool(true)
-
-	if mentionChannel != "" && mentionChannel != "here" && mentionChannel != "channel" {
-		return nil, alerting.ValidationError{
-			Reason: fmt.Sprintf("Invalid value for mentionChannel: %q", mentionChannel),
-		}
-	}
-	mentionUsers := []string{}
-	for _, u := range strings.Split(mentionUsersStr, ",") {
-		u = strings.TrimSpace(u)
-		if u != "" {
-			mentionUsers = append(mentionUsers, u)
-		}
-	}
-	mentionGroups := []string{}
-	for _, g := range strings.Split(mentionGroupsStr, ",") {
-		g = strings.TrimSpace(g)
-		if g != "" {
-			mentionGroups = append(mentionGroups, g)
-		}
-	}
-
-	return &SlackNotifier{
-		url:            apiURL,
-		NotifierBase:   NewNotifierBase(model, ns),
-		recipient:      recipient,
-		username:       username,
-		iconEmoji:      iconEmoji,
-		iconURL:        iconURL,
-		mentionUsers:   mentionUsers,
-		mentionGroups:  mentionGroups,
-		mentionChannel: mentionChannel,
-		token:          token,
-		upload:         uploadImage,
-		log:            log.New("alerting.notifier.slack"),
-	}, nil
-}
-
-// SlackNotifier is responsible for sending
-// alert notification to Slack.
-type SlackNotifier struct {
-	NotifierBase
-	url            *url.URL
-	recipient      string
-	username       string
-	iconEmoji      string
-	iconURL        string
-	mentionUsers   []string
-	mentionGroups  []string
-	mentionChannel string
-	token          string
-	upload         bool
-	log            log.Logger
-}
-
-// Notify sends an alert notification to Slack.
-func (sn *SlackNotifier) Notify(evalContext *alerting.EvalContext) error {
-	sn.log.Info("Executing slack notification", "ruleId", evalContext.Rule.ID, "notification", sn.Name)
-
-	ruleURL, err := evalContext.GetRuleURL()
-	if err != nil {
-		sn.log.Error("Failed to get rule link", "error", err)
-		return err
-	}
-
-	fields := make([]map[string]interface{}, 0)
-	for _, evt := range evalContext.EvalMatches {
-		fields = append(fields, map[string]interface{}{
-			"title": evt.Metric,
-			"value": evt.Value,
-			"short": true,
-		})
-	}
-
-	if evalContext.Error != nil {
-		fields = append(fields, map[string]interface{}{
-			"title": "Error message",
-			"value": evalContext.Error.Error(),
-			"short": false,
-		})
-	}
-
-	mentionsBuilder := strings.Builder{}
-	appendSpace := func() {
-		if mentionsBuilder.Len() > 0 {
-			mentionsBuilder.WriteString(" ")
-		}
-	}
-	mentionChannel := strings.TrimSpace(sn.mentionChannel)
-	if mentionChannel != "" {
-		mentionsBuilder.WriteString(fmt.Sprintf("<!%s|%s>", mentionChannel, mentionChannel))
-	}
-	if len(sn.mentionGroups) > 0 {
-		appendSpace()
-		for _, g := range sn.mentionGroups {
-			mentionsBuilder.WriteString(fmt.Sprintf("<!subteam^%s>", g))
-		}
-	}
-	if len(sn.mentionUsers) > 0 {
-		appendSpace()
-		for _, u := range sn.mentionUsers {
-			mentionsBuilder.WriteString(fmt.Sprintf("<@%s>", u))
-		}
-	}
-	msg := ""
-	if evalContext.Rule.State != models.AlertStateOK { // don't add message when going back to alert state ok.
-		msg = evalContext.Rule.Message
-	}
-	imageURL := ""
-	// default to file.upload API method if a token is provided
-	if sn.token == "" {
-		imageURL = evalContext.ImagePublicURL
-	}
-
-	var blocks []map[string]interface{}
-	if mentionsBuilder.Len() > 0 {
-		blocks = []map[string]interface{}{
-			{
-				"type": "section",
-				"text": map[string]interface{}{
-					"type": "mrkdwn",
-					"text": mentionsBuilder.String(),
-				},
-			},
-		}
-	}
-	attachment := map[string]interface{}{
-		"color":       evalContext.GetStateModel().Color,
-		"title":       evalContext.GetNotificationTitle(),
-		"title_link":  ruleURL,
-		"text":        msg,
-		"fallback":    evalContext.GetNotificationTitle(),
-		"fields":      fields,
-		"footer":      "Grafana v" + setting.BuildVersion,
-		"footer_icon": "https://grafana.com/static/assets/img/fav32.png",
-		"ts":          time.Now().Unix(),
-	}
-	if sn.NeedsImage() && imageURL != "" {
-		attachment["image_url"] = imageURL
-	}
-	body := map[string]interface{}{
-		"channel": sn.recipient,
-		"attachments": []map[string]interface{}{
-			attachment,
-		},
-	}
-	if len(blocks) > 0 {
-		body["blocks"] = blocks
-	}
-
-	if sn.username != "" {
-		body["username"] = sn.username
-	}
-	if sn.iconEmoji != "" {
-		body["icon_emoji"] = sn.iconEmoji
-	}
-	if sn.iconURL != "" {
-		body["icon_url"] = sn.iconURL
-	}
-	data, err := json.Marshal(&body)
-	if err != nil {
-		return err
-	}
-
-	if err := sn.sendRequest(evalContext.Ctx, data); err != nil {
-		return err
-	}
-
-	if sn.token != "" && sn.UploadImage {
-		err := sn.slackFileUpload(evalContext, sn.log, sn.recipient, sn.token)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (sn *SlackNotifier) sendRequest(ctx context.Context, data []byte) error {
-	sn.log.Debug("Sending Slack API request", "url", sn.url.String(), "data", string(data))
-	request, err := http.NewRequestWithContext(ctx, http.MethodPost, sn.url.String(), bytes.NewReader(data))
-	if err != nil {
-		return fmt.Errorf("failed to create HTTP request: %w", err)
-	}
-
-	request.Header.Set("Content-Type", "application/json")
-	request.Header.Set("User-Agent", "Grafana")
-	if sn.token == "" {
-		if sn.url.String() == slackAPIEndpoint {
-			panic("Token should be set when using the Slack chat API")
-		}
-	} else {
-		sn.log.Debug("Adding authorization header to HTTP request")
-		request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", sn.token))
-	}
-
-	netTransport := &http.Transport{
-		TLSClientConfig: &tls.Config{
-			Renegotiation: tls.RenegotiateFreelyAsClient,
-		},
-		Proxy: http.ProxyFromEnvironment,
-		DialContext: (&net.Dialer{
-			Timeout: 30 * time.Second,
-		}).DialContext,
-		TLSHandshakeTimeout: 5 * time.Second,
-	}
-	netClient := &http.Client{
-		Timeout:   time.Second * 30,
-		Transport: netTransport,
-	}
-	resp, err := netClient.Do(request)
-	if err != nil {
-		return err
-	}
-	defer func() {
-		if err := resp.Body.Close(); err != nil {
-			sn.log.Warn("Failed to close response body", "err", err)
-		}
-	}()
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return fmt.Errorf("failed to read response body: %w", err)
-	}
-
-	if resp.StatusCode >= 200 && resp.StatusCode < 300 {
-		// Slack responds to some requests with a JSON document, that might contain an error.
-		rslt := struct {
-			Ok  bool   `json:"ok"`
-			Err string `json:"error"`
-		}{}
-
-		// Marshaling can fail if Slack's response body is plain text (e.g. "ok").
-		if err := json.Unmarshal(body, &rslt); err != nil && json.Valid(body) {
-			sn.log.Error("Failed to unmarshal Slack API response", "url", sn.url.String(), "statusCode", resp.Status,
-				"err", err)
-			return fmt.Errorf("failed to unmarshal Slack API response with status code %d: %s", resp.StatusCode, err)
-		}
-
-		if !rslt.Ok && rslt.Err != "" {
-			sn.log.Error("Sending Slack API request failed", "url", sn.url.String(), "statusCode", resp.Status,
-				"err", rslt.Err)
-			return fmt.Errorf("failed to make Slack API request: %s", rslt.Err)
-		}
-
-		sn.log.Debug("Sending Slack API request succeeded", "url", sn.url.String(), "statusCode", resp.Status)
-
-		return nil
-	}
-
-	sn.log.Error("Slack API request failed", "url", sn.url.String(), "statusCode", resp.Status, "body", string(body))
-	return fmt.Errorf("request to Slack API failed with status code %d", resp.StatusCode)
-}
-
-func (sn *SlackNotifier) slackFileUpload(evalContext *alerting.EvalContext, log log.Logger, recipient, token string) error {
-	if evalContext.ImageOnDiskPath == "" {
-		// nolint:gosec
-		// We can ignore the gosec G304 warning on this one because `setting.HomePath` comes from Grafana's configuration file.
-		evalContext.ImageOnDiskPath = filepath.Join(setting.HomePath, "public/img/mixed_styles.png")
-	}
-	log.Info("Uploading to slack via file.upload API")
-	headers, uploadBody, err := sn.generateSlackBody(evalContext.ImageOnDiskPath, token, recipient)
-	if err != nil {
-		return err
-	}
-	cmd := &notifications.SendWebhookSync{
-		Url: "https://slack.com/api/files.upload", Body: uploadBody.String(), HttpHeader: headers, HttpMethod: "POST",
-	}
-	if err := sn.NotificationService.SendWebhookSync(evalContext.Ctx, cmd); err != nil {
-		log.Error("Failed to upload slack image", "error", err, "webhook", "file.upload")
-		return err
-	}
-	return nil
-}
-
-func (sn *SlackNotifier) generateSlackBody(path string, token string, recipient string) (map[string]string, bytes.Buffer, error) {
-	// Slack requires all POSTs to files.upload to present
-	// an "application/x-www-form-urlencoded" encoded querystring
-	// See https://api.slack.com/methods/files.upload
-	var b bytes.Buffer
-	w := multipart.NewWriter(&b)
-	defer func() {
-		if err := w.Close(); err != nil {
-			// Shouldn't matter since we already close w explicitly on the non-error path
-			sn.log.Warn("Failed to close multipart writer", "err", err)
-		}
-	}()
-
-	// Add the generated image file
-	// We can ignore the gosec G304 warning on this one because `imagePath` comes
-	// from the alert `evalContext` that generates the images. `evalContext` in turn derives the root of the file
-	// path from configuration variables.
-	// nolint:gosec
-	f, err := os.Open(path)
-	if err != nil {
-		return nil, b, err
-	}
-	defer func() {
-		if err := f.Close(); err != nil {
-			sn.log.Warn("Failed to close file", "path", path, "err", err)
-		}
-	}()
-	fw, err := w.CreateFormFile("file", path)
-	if err != nil {
-		return nil, b, err
-	}
-	if _, err := io.Copy(fw, f); err != nil {
-		return nil, b, err
-	}
-	// Add the authorization token
-	if err := w.WriteField("token", token); err != nil {
-		return nil, b, err
-	}
-	// Add the channel(s) to POST to
-	if err := w.WriteField("channels", recipient); err != nil {
-		return nil, b, err
-	}
-	if err := w.Close(); err != nil {
-		return nil, b, fmt.Errorf("failed to close multipart writer: %w", err)
-	}
-	headers := map[string]string{
-		"Content-Type":  w.FormDataContentType(),
-		"Authorization": "auth_token=\"" + token + "\"",
-	}
-	return headers, b, nil
-}
diff --git a/pkg/services/alerting/notifiers/slack_test.go b/pkg/services/alerting/notifiers/slack_test.go
deleted file mode 100644
index 909257c741a25..0000000000000
--- a/pkg/services/alerting/notifiers/slack_test.go
+++ /dev/null
@@ -1,273 +0,0 @@
-package notifiers
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func TestSlackNotifier(t *testing.T) {
-	encryptionService := encryptionservice.SetupTestService(t)
-
-	t.Run("empty settings should return error", func(t *testing.T) {
-		json := `{ }`
-
-		settingsJSON, err := simplejson.NewJson([]byte(json))
-		require.NoError(t, err)
-		model := &models.AlertNotification{
-			Name:     "ops",
-			Type:     "slack",
-			Settings: settingsJSON,
-		}
-
-		_, err = NewSlackNotifier(model, encryptionService.GetDecryptedValue, nil)
-		assert.EqualError(t, err, "alert validation error: recipient must be specified when using the Slack chat API")
-	})
-
-	t.Run("from settings", func(t *testing.T) {
-		json := `
-				{
-          "url": "http://google.com"
-				}`
-
-		settingsJSON, err := simplejson.NewJson([]byte(json))
-		require.NoError(t, err)
-		model := &models.AlertNotification{
-			Name:     "ops",
-			Type:     "slack",
-			Settings: settingsJSON,
-		}
-
-		not, err := NewSlackNotifier(model, encryptionService.GetDecryptedValue, nil)
-		require.NoError(t, err)
-		slackNotifier := not.(*SlackNotifier)
-		assert.Equal(t, "ops", slackNotifier.Name)
-		assert.Equal(t, "slack", slackNotifier.Type)
-		assert.Equal(t, "http://google.com", slackNotifier.url.String())
-		assert.Empty(t, slackNotifier.recipient)
-		assert.Empty(t, slackNotifier.username)
-		assert.Empty(t, slackNotifier.iconEmoji)
-		assert.Empty(t, slackNotifier.iconURL)
-		assert.Empty(t, slackNotifier.mentionUsers)
-		assert.Empty(t, slackNotifier.mentionGroups)
-		assert.Empty(t, slackNotifier.mentionChannel)
-		assert.Empty(t, slackNotifier.token)
-	})
-
-	t.Run("from settings with Recipient, Username, IconEmoji, IconUrl, MentionUsers, MentionGroups, MentionChannel, and Token", func(t *testing.T) {
-		json := `
-                    {
-                      "url": "http://google.com",
-                      "recipient": "#ds-opentsdb",
-                      "username": "Grafana Alerts",
-                      "icon_emoji": ":smile:",
-                      "icon_url": "https://grafana.com/img/fav32.png",
-                      "mentionUsers": "user1, user2",
-                      "mentionGroups": "group1, group2",
-                      "mentionChannel": "here",
-                      "token": "xoxb-XXXXXXXX-XXXXXXXX-XXXXXXXXXX"
-                    }`
-
-		settingsJSON, err := simplejson.NewJson([]byte(json))
-		require.NoError(t, err)
-		model := &models.AlertNotification{
-			Name:     "ops",
-			Type:     "slack",
-			Settings: settingsJSON,
-		}
-
-		not, err := NewSlackNotifier(model, encryptionService.GetDecryptedValue, nil)
-		require.NoError(t, err)
-		slackNotifier := not.(*SlackNotifier)
-		assert.Equal(t, "ops", slackNotifier.Name)
-		assert.Equal(t, "slack", slackNotifier.Type)
-		assert.Equal(t, "http://google.com", slackNotifier.url.String())
-		assert.Equal(t, "#ds-opentsdb", slackNotifier.recipient)
-		assert.Equal(t, "Grafana Alerts", slackNotifier.username)
-		assert.Equal(t, ":smile:", slackNotifier.iconEmoji)
-		assert.Equal(t, "https://grafana.com/img/fav32.png", slackNotifier.iconURL)
-		assert.Equal(t, []string{"user1", "user2"}, slackNotifier.mentionUsers)
-		assert.Equal(t, []string{"group1", "group2"}, slackNotifier.mentionGroups)
-		assert.Equal(t, "here", slackNotifier.mentionChannel)
-		assert.Equal(t, "xoxb-XXXXXXXX-XXXXXXXX-XXXXXXXXXX", slackNotifier.token)
-	})
-
-	t.Run("from settings with Recipient, Username, IconEmoji, IconUrl, MentionUsers, MentionGroups, MentionChannel, and Secured Token", func(t *testing.T) {
-		json := `
-                    {
-                      "url": "http://google.com",
-                      "recipient": "#ds-opentsdb",
-                      "username": "Grafana Alerts",
-                      "icon_emoji": ":smile:",
-                      "icon_url": "https://grafana.com/img/fav32.png",
-                      "mentionUsers": "user1, user2",
-                      "mentionGroups": "group1, group2",
-                      "mentionChannel": "here",
-                      "token": "uenc-XXXXXXXX-XXXXXXXX-XXXXXXXXXX"
-                    }`
-
-		settingsJSON, err := simplejson.NewJson([]byte(json))
-		require.NoError(t, err)
-
-		encryptionService := encryptionService
-		securedSettingsJSON, err := encryptionService.EncryptJsonData(
-			context.Background(),
-			map[string]string{
-				"token": "xenc-XXXXXXXX-XXXXXXXX-XXXXXXXXXX",
-			}, setting.SecretKey)
-		require.NoError(t, err)
-
-		model := &models.AlertNotification{
-			Name:           "ops",
-			Type:           "slack",
-			Settings:       settingsJSON,
-			SecureSettings: securedSettingsJSON,
-		}
-
-		not, err := NewSlackNotifier(model, encryptionService.GetDecryptedValue, nil)
-		require.NoError(t, err)
-		slackNotifier := not.(*SlackNotifier)
-		assert.Equal(t, "ops", slackNotifier.Name)
-		assert.Equal(t, "slack", slackNotifier.Type)
-		assert.Equal(t, "http://google.com", slackNotifier.url.String())
-		assert.Equal(t, "#ds-opentsdb", slackNotifier.recipient)
-		assert.Equal(t, "Grafana Alerts", slackNotifier.username)
-		assert.Equal(t, ":smile:", slackNotifier.iconEmoji)
-		assert.Equal(t, "https://grafana.com/img/fav32.png", slackNotifier.iconURL)
-		assert.Equal(t, []string{"user1", "user2"}, slackNotifier.mentionUsers)
-		assert.Equal(t, []string{"group1", "group2"}, slackNotifier.mentionGroups)
-		assert.Equal(t, "here", slackNotifier.mentionChannel)
-		assert.Equal(t, "xenc-XXXXXXXX-XXXXXXXX-XXXXXXXXXX", slackNotifier.token)
-	})
-
-	t.Run("with Slack ID for recipient should work", func(t *testing.T) {
-		json := `
-                    {
-                      "url": "http://google.com",
-                      "recipient": "1ABCDE"
-                    }`
-
-		settingsJSON, err := simplejson.NewJson([]byte(json))
-		require.NoError(t, err)
-		model := &models.AlertNotification{
-			Name:     "ops",
-			Type:     "slack",
-			Settings: settingsJSON,
-		}
-
-		not, err := NewSlackNotifier(model, encryptionService.GetDecryptedValue, nil)
-		require.NoError(t, err)
-		slackNotifier := not.(*SlackNotifier)
-		assert.Equal(t, "1ABCDE", slackNotifier.recipient)
-	})
-}
-
-func TestSendSlackRequest(t *testing.T) {
-	tests := []struct {
-		name          string
-		slackResponse string
-		statusCode    int
-		expectError   bool
-	}{
-		{
-			name: "Example error",
-			slackResponse: `{
-					"ok": false,
-					"error": "too_many_attachments"
-				}`,
-			statusCode:  http.StatusBadRequest,
-			expectError: true,
-		},
-		{
-			name:        "Non 200 status code, no response body",
-			statusCode:  http.StatusMovedPermanently,
-			expectError: true,
-		},
-		{
-			name: "Success case, normal response body",
-			slackResponse: `{
-				"ok": true,
-				"channel": "C1H9RESGL",
-				"ts": "1503435956.000247",
-				"message": {
-					"text": "Here's a message for you",
-					"username": "ecto1",
-					"bot_id": "B19LU7CSY",
-					"attachments": [
-						{
-							"text": "This is an attachment",
-							"id": 1,
-							"fallback": "This is an attachment's fallback"
-						}
-					],
-					"type": "message",
-					"subtype": "bot_message",
-					"ts": "1503435956.000247"
-				}
-			}`,
-			statusCode:  http.StatusOK,
-			expectError: false,
-		},
-		{
-			name:       "No response body",
-			statusCode: http.StatusOK,
-		},
-		{
-			name:          "Success case, unexpected response body",
-			statusCode:    http.StatusOK,
-			slackResponse: `{"test": true}`,
-			expectError:   false,
-		},
-		{
-			name:          "Success case, ok: true",
-			statusCode:    http.StatusOK,
-			slackResponse: `{"ok": true}`,
-			expectError:   false,
-		},
-		{
-			name:          "200 status code, error in body",
-			statusCode:    http.StatusOK,
-			slackResponse: `{"ok": false, "error": "test error"}`,
-			expectError:   true,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(tt *testing.T) {
-			server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				w.WriteHeader(test.statusCode)
-				_, err := w.Write([]byte(test.slackResponse))
-				require.NoError(tt, err)
-			}))
-
-			settingsJSON, err := simplejson.NewJson([]byte(fmt.Sprintf(`{"url": %q}`, server.URL)))
-			require.NoError(t, err)
-			model := &models.AlertNotification{
-				Settings: settingsJSON,
-			}
-
-			encryptionService := encryptionservice.SetupTestService(t)
-
-			not, err := NewSlackNotifier(model, encryptionService.GetDecryptedValue, nil)
-			require.NoError(t, err)
-			slackNotifier := not.(*SlackNotifier)
-
-			err = slackNotifier.sendRequest(context.Background(), []byte("test"))
-			if !test.expectError {
-				require.NoError(tt, err)
-			} else {
-				require.Error(tt, err)
-			}
-		})
-	}
-}
diff --git a/pkg/services/alerting/notifiers/teams.go b/pkg/services/alerting/notifiers/teams.go
deleted file mode 100644
index a2a10a706c5ce..0000000000000
--- a/pkg/services/alerting/notifiers/teams.go
+++ /dev/null
@@ -1,144 +0,0 @@
-package notifiers
-
-import (
-	"encoding/json"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/notifications"
-)
-
-func init() {
-	alerting.RegisterNotifier(&alerting.NotifierPlugin{
-		Type:        "teams",
-		Name:        "Microsoft Teams",
-		Description: "Sends notifications using Incoming Webhook connector to Microsoft Teams",
-		Heading:     "Teams settings",
-		Factory:     NewTeamsNotifier,
-		Options: []alerting.NotifierOption{
-			{
-				Label:        "URL",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Placeholder:  "Teams incoming webhook url",
-				PropertyName: "url",
-				Required:     true,
-			},
-		},
-	})
-}
-
-// NewTeamsNotifier is the constructor for Teams notifier.
-func NewTeamsNotifier(model *models.AlertNotification, _ alerting.GetDecryptedValueFn, ns notifications.Service) (alerting.Notifier, error) {
-	url := model.Settings.Get("url").MustString()
-	if url == "" {
-		return nil, alerting.ValidationError{Reason: "Could not find url property in settings"}
-	}
-
-	return &TeamsNotifier{
-		NotifierBase: NewNotifierBase(model, ns),
-		URL:          url,
-		log:          log.New("alerting.notifier.teams"),
-	}, nil
-}
-
-// TeamsNotifier is responsible for sending
-// alert notifications to Microsoft teams.
-type TeamsNotifier struct {
-	NotifierBase
-	URL string
-	log log.Logger
-}
-
-// Notify send an alert notification to Microsoft teams.
-func (tn *TeamsNotifier) Notify(evalContext *alerting.EvalContext) error {
-	tn.log.Info("Executing teams notification", "ruleId", evalContext.Rule.ID, "notification", tn.Name)
-
-	ruleURL, err := evalContext.GetRuleURL()
-	if err != nil {
-		tn.log.Error("Failed get rule link", "error", err)
-		return err
-	}
-
-	fields := make([]map[string]any, 0)
-	fieldLimitCount := 4
-	for index, evt := range evalContext.EvalMatches {
-		fields = append(fields, map[string]any{
-			"name":  evt.Metric,
-			"value": evt.Value,
-		})
-		if index > fieldLimitCount {
-			break
-		}
-	}
-
-	if evalContext.Error != nil {
-		fields = append(fields, map[string]any{
-			"name":  "Error message",
-			"value": evalContext.Error.Error(),
-		})
-	}
-
-	message := ""
-	if evalContext.Rule.State != models.AlertStateOK { // don't add message when going back to alert state ok.
-		message = evalContext.Rule.Message
-	}
-
-	images := make([]map[string]any, 0)
-	if tn.NeedsImage() && evalContext.ImagePublicURL != "" {
-		images = append(images, map[string]any{
-			"image": evalContext.ImagePublicURL,
-		})
-	}
-
-	body := map[string]any{
-		"@type":    "MessageCard",
-		"@context": "http://schema.org/extensions",
-		// summary MUST not be empty or the webhook request fails
-		// summary SHOULD contain some meaningful information, since it is used for mobile notifications
-		"summary":    evalContext.GetNotificationTitle(),
-		"title":      evalContext.GetNotificationTitle(),
-		"themeColor": evalContext.GetStateModel().Color,
-		"sections": []map[string]any{
-			{
-				"title":  "Details",
-				"facts":  fields,
-				"images": images,
-				"text":   message,
-			},
-		},
-		"potentialAction": []map[string]any{
-			{
-				"@context": "http://schema.org",
-				"@type":    "OpenUri",
-				"name":     "View Rule",
-				"targets": []map[string]any{
-					{
-						"os": "default", "uri": ruleURL,
-					},
-				},
-			},
-			{
-				"@context": "http://schema.org",
-				"@type":    "OpenUri",
-				"name":     "View Graph",
-				"targets": []map[string]any{
-					{
-						"os": "default", "uri": evalContext.ImagePublicURL,
-					},
-				},
-			},
-		},
-	}
-
-	data, _ := json.Marshal(&body)
-	cmd := &notifications.SendWebhookSync{Url: tn.URL, Body: string(data)}
-
-	if err := tn.NotificationService.SendWebhookSync(evalContext.Ctx, cmd); err != nil {
-		tn.log.Error("Failed to send teams notification", "error", err, "webhook", tn.Name)
-		return err
-	}
-
-	return nil
-}
diff --git a/pkg/services/alerting/notifiers/teams_test.go b/pkg/services/alerting/notifiers/teams_test.go
deleted file mode 100644
index ce10015888290..0000000000000
--- a/pkg/services/alerting/notifiers/teams_test.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package notifiers
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
-)
-
-func TestTeamsNotifier(t *testing.T) {
-	encryptionService := encryptionservice.SetupTestService(t)
-
-	t.Run("Parsing alert notification from settings", func(t *testing.T) {
-		t.Run("empty settings should return error", func(t *testing.T) {
-			json := `{ }`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "ops",
-				Type:     "teams",
-				Settings: settingsJSON,
-			}
-
-			_, err := NewTeamsNotifier(model, encryptionService.GetDecryptedValue, nil)
-			require.Error(t, err)
-		})
-
-		t.Run("from settings", func(t *testing.T) {
-			json := `
-				{
-          "url": "http://google.com"
-				}`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "ops",
-				Type:     "teams",
-				Settings: settingsJSON,
-			}
-
-			not, err := NewTeamsNotifier(model, encryptionService.GetDecryptedValue, nil)
-			teamsNotifier := not.(*TeamsNotifier)
-
-			require.Nil(t, err)
-			require.Equal(t, "ops", teamsNotifier.Name)
-			require.Equal(t, "teams", teamsNotifier.Type)
-			require.Equal(t, "http://google.com", teamsNotifier.URL)
-		})
-
-		t.Run("from settings with Recipient and Mention", func(t *testing.T) {
-			json := `
-				{
-          "url": "http://google.com"
-				}`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "ops",
-				Type:     "teams",
-				Settings: settingsJSON,
-			}
-
-			not, err := NewTeamsNotifier(model, encryptionService.GetDecryptedValue, nil)
-			teamsNotifier := not.(*TeamsNotifier)
-
-			require.Nil(t, err)
-			require.Equal(t, "ops", teamsNotifier.Name)
-			require.Equal(t, "teams", teamsNotifier.Type)
-			require.Equal(t, "http://google.com", teamsNotifier.URL)
-		})
-	})
-}
diff --git a/pkg/services/alerting/notifiers/telegram.go b/pkg/services/alerting/notifiers/telegram.go
deleted file mode 100644
index 0dcf34afb67b6..0000000000000
--- a/pkg/services/alerting/notifiers/telegram.go
+++ /dev/null
@@ -1,280 +0,0 @@
-package notifiers
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"io"
-	"mime/multipart"
-	"os"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-const (
-	captionLengthLimit = 1024
-)
-
-var (
-	telegramAPIURL = "https://api.telegram.org/bot%s/%s"
-)
-
-func init() {
-	alerting.RegisterNotifier(&alerting.NotifierPlugin{
-		Type:        "telegram",
-		Name:        "Telegram",
-		Description: "Sends notifications to Telegram",
-		Heading:     "Telegram API settings",
-		Factory:     NewTelegramNotifier,
-		Options: []alerting.NotifierOption{
-			{
-				Label:        "BOT API Token",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Placeholder:  "Telegram BOT API Token",
-				PropertyName: "bottoken",
-				Required:     true,
-				Secure:       true,
-			},
-			{
-				Label:        "Chat ID",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Description:  "Integer Telegram Chat Identifier",
-				PropertyName: "chatid",
-				Required:     true,
-			},
-		},
-	})
-}
-
-// TelegramNotifier is responsible for sending
-// alert notifications to Telegram.
-type TelegramNotifier struct {
-	NotifierBase
-	BotToken    string
-	ChatID      string
-	UploadImage bool
-	log         log.Logger
-}
-
-// NewTelegramNotifier is the constructor for the Telegram notifier
-func NewTelegramNotifier(model *models.AlertNotification, fn alerting.GetDecryptedValueFn, ns notifications.Service) (alerting.Notifier, error) {
-	if model.Settings == nil {
-		return nil, alerting.ValidationError{Reason: "No Settings Supplied"}
-	}
-
-	botToken := fn(context.Background(), model.SecureSettings, "bottoken", model.Settings.Get("bottoken").MustString(), setting.SecretKey)
-	chatID := model.Settings.Get("chatid").MustString()
-	uploadImage := model.Settings.Get("uploadImage").MustBool()
-
-	if botToken == "" {
-		return nil, alerting.ValidationError{Reason: "Could not find Bot Token in settings"}
-	}
-
-	if chatID == "" {
-		return nil, alerting.ValidationError{Reason: "Could not find Chat Id in settings"}
-	}
-
-	return &TelegramNotifier{
-		NotifierBase: NewNotifierBase(model, ns),
-		BotToken:     botToken,
-		ChatID:       chatID,
-		UploadImage:  uploadImage,
-		log:          log.New("alerting.notifier.telegram"),
-	}, nil
-}
-
-func (tn *TelegramNotifier) buildMessage(evalContext *alerting.EvalContext, sendImageInline bool) (*notifications.SendWebhookSync, error) {
-	if sendImageInline {
-		cmd, err := tn.buildMessageInlineImage(evalContext)
-		if err == nil {
-			return cmd, nil
-		}
-
-		tn.log.Error("Could not generate Telegram message with inline image.", "err", err)
-	}
-
-	return tn.buildMessageLinkedImage(evalContext)
-}
-
-func (tn *TelegramNotifier) buildMessageLinkedImage(evalContext *alerting.EvalContext) (*notifications.SendWebhookSync, error) {
-	message := fmt.Sprintf("<b>%s</b>\nState: %s\nMessage: %s\n", evalContext.GetNotificationTitle(), evalContext.Rule.Name, evalContext.Rule.Message)
-
-	ruleURL, err := evalContext.GetRuleURL()
-	if err == nil {
-		message += fmt.Sprintf("URL: %s\n", ruleURL)
-	}
-
-	if evalContext.ImagePublicURL != "" {
-		message += fmt.Sprintf("Image: %s\n", evalContext.ImagePublicURL)
-	}
-
-	metrics := generateMetricsMessage(evalContext)
-	if metrics != "" {
-		message += fmt.Sprintf("\n<i>Metrics:</i>%s", metrics)
-	}
-
-	return tn.generateTelegramCmd(message, "text", "sendMessage", func(w *multipart.Writer) {
-		fw, err := w.CreateFormField("parse_mode")
-		if err != nil {
-			tn.log.Error("Failed to create form file", "err", err)
-			return
-		}
-
-		if _, err := fw.Write([]byte("html")); err != nil {
-			tn.log.Error("Failed to write to form field", "err", err)
-		}
-	})
-}
-
-func (tn *TelegramNotifier) buildMessageInlineImage(evalContext *alerting.EvalContext) (*notifications.SendWebhookSync, error) {
-	var imageFile *os.File
-	var err error
-
-	imageFile, err = os.Open(evalContext.ImageOnDiskPath)
-	if err != nil {
-		return nil, err
-	}
-
-	defer func() {
-		err := imageFile.Close()
-		if err != nil {
-			tn.log.Error("Could not close Telegram inline image.", "err", err)
-		}
-	}()
-
-	ruleURL, err := evalContext.GetRuleURL()
-	if err != nil {
-		return nil, err
-	}
-
-	metrics := generateMetricsMessage(evalContext)
-	message := generateImageCaption(evalContext, ruleURL, metrics)
-
-	return tn.generateTelegramCmd(message, "caption", "sendPhoto", func(w *multipart.Writer) {
-		fw, err := w.CreateFormFile("photo", evalContext.ImageOnDiskPath)
-		if err != nil {
-			tn.log.Error("Failed to create form file", "err", err)
-			return
-		}
-
-		if _, err := io.Copy(fw, imageFile); err != nil {
-			tn.log.Error("Failed to write to form file", "err", err)
-		}
-	})
-}
-
-func (tn *TelegramNotifier) generateTelegramCmd(message string, messageField string, apiAction string, extraConf func(writer *multipart.Writer)) (*notifications.SendWebhookSync, error) {
-	var body bytes.Buffer
-	w := multipart.NewWriter(&body)
-	defer func() {
-		if err := w.Close(); err != nil {
-			tn.log.Warn("Failed to close writer", "err", err)
-		}
-	}()
-
-	fw, err := w.CreateFormField("chat_id")
-	if err != nil {
-		return nil, err
-	}
-	if _, err := fw.Write([]byte(tn.ChatID)); err != nil {
-		return nil, err
-	}
-
-	fw, err = w.CreateFormField(messageField)
-	if err != nil {
-		return nil, err
-	}
-	if _, err := fw.Write([]byte(message)); err != nil {
-		return nil, err
-	}
-
-	extraConf(w)
-
-	if err := w.Close(); err != nil {
-		return nil, err
-	}
-
-	tn.log.Info("Sending telegram notification", "chat_id", tn.ChatID, "bot_token", tn.BotToken, "apiAction", apiAction)
-	url := fmt.Sprintf(telegramAPIURL, tn.BotToken, apiAction)
-
-	cmd := &notifications.SendWebhookSync{
-		Url:        url,
-		Body:       body.String(),
-		HttpMethod: "POST",
-		HttpHeader: map[string]string{
-			"Content-Type": w.FormDataContentType(),
-		},
-	}
-	return cmd, nil
-}
-
-func generateMetricsMessage(evalContext *alerting.EvalContext) string {
-	metrics := ""
-	fieldLimitCount := 4
-	for index, evt := range evalContext.EvalMatches {
-		metrics += fmt.Sprintf("\n%s: %s", evt.Metric, evt.Value)
-		if index > fieldLimitCount {
-			break
-		}
-	}
-	return metrics
-}
-
-func generateImageCaption(evalContext *alerting.EvalContext, ruleURL string, metrics string) string {
-	message := evalContext.GetNotificationTitle()
-
-	if len(evalContext.Rule.Message) > 0 {
-		message = fmt.Sprintf("%s\nMessage: %s", message, evalContext.Rule.Message)
-	}
-
-	if len(message) > captionLengthLimit {
-		message = message[0:captionLengthLimit]
-	}
-
-	if len(ruleURL) > 0 {
-		urlLine := fmt.Sprintf("\nURL: %s", ruleURL)
-		message = appendIfPossible(evalContext.Log, message, urlLine, captionLengthLimit)
-	}
-
-	if metrics != "" {
-		metricsLines := fmt.Sprintf("\n\nMetrics:%s", metrics)
-		message = appendIfPossible(evalContext.Log, message, metricsLines, captionLengthLimit)
-	}
-
-	return message
-}
-
-func appendIfPossible(tlog log.Logger, message string, extra string, sizeLimit int) string {
-	if len(extra)+len(message) <= sizeLimit {
-		return message + extra
-	}
-	tlog.Debug("Line too long for image caption.", "value", extra)
-	return message
-}
-
-// Notify send an alert notification to Telegram.
-func (tn *TelegramNotifier) Notify(evalContext *alerting.EvalContext) error {
-	var cmd *notifications.SendWebhookSync
-	var err error
-	if evalContext.ImagePublicURL == "" && tn.UploadImage {
-		cmd, err = tn.buildMessage(evalContext, true)
-	} else {
-		cmd, err = tn.buildMessage(evalContext, false)
-	}
-	if err != nil {
-		return err
-	}
-
-	if err := tn.NotificationService.SendWebhookSync(evalContext.Ctx, cmd); err != nil {
-		tn.log.Error("Failed to send webhook", "error", err, "webhook", tn.Name)
-		return err
-	}
-
-	return nil
-}
diff --git a/pkg/services/alerting/notifiers/telegram_test.go b/pkg/services/alerting/notifiers/telegram_test.go
deleted file mode 100644
index f9c1650edb443..0000000000000
--- a/pkg/services/alerting/notifiers/telegram_test.go
+++ /dev/null
@@ -1,128 +0,0 @@
-package notifiers
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/annotations/annotationstest"
-	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
-	"github.com/grafana/grafana/pkg/services/validations"
-)
-
-func TestTelegramNotifier(t *testing.T) {
-	encryptionService := encryptionservice.SetupTestService(t)
-
-	t.Run("Parsing alert notification from settings", func(t *testing.T) {
-		t.Run("empty settings should return error", func(t *testing.T) {
-			json := `{ }`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "telegram_testing",
-				Type:     "telegram",
-				Settings: settingsJSON,
-			}
-
-			_, err := NewTelegramNotifier(model, encryptionService.GetDecryptedValue, nil)
-			require.Error(t, err)
-		})
-
-		t.Run("settings should trigger incident", func(t *testing.T) {
-			json := `
-				{
-          "bottoken": "abcdefgh0123456789",
-					"chatid": "-1234567890"
-				}`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "telegram_testing",
-				Type:     "telegram",
-				Settings: settingsJSON,
-			}
-
-			not, err := NewTelegramNotifier(model, encryptionService.GetDecryptedValue, nil)
-			telegramNotifier := not.(*TelegramNotifier)
-
-			require.Nil(t, err)
-			require.Equal(t, "telegram_testing", telegramNotifier.Name)
-			require.Equal(t, "telegram", telegramNotifier.Type)
-			require.Equal(t, "abcdefgh0123456789", telegramNotifier.BotToken)
-			require.Equal(t, "-1234567890", telegramNotifier.ChatID)
-		})
-
-		t.Run("generateCaption should generate a message with all pertinent details", func(t *testing.T) {
-			evalContext := alerting.NewEvalContext(context.Background(),
-				&alerting.Rule{
-					Name:    "This is an alarm",
-					Message: "Some kind of message.",
-					State:   models.AlertStateOK,
-				}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-
-			caption := generateImageCaption(evalContext, "http://grafa.url/abcdef", "")
-			require.LessOrEqual(t, len(caption), 1024)
-			require.Contains(t, caption, "Some kind of message.")
-			require.Contains(t, caption, "[OK] This is an alarm")
-			require.Contains(t, caption, "http://grafa.url/abcdef")
-		})
-
-		t.Run("When generating a message", func(t *testing.T) {
-			t.Run("URL should be skipped if it's too long", func(t *testing.T) {
-				evalContext := alerting.NewEvalContext(context.Background(),
-					&alerting.Rule{
-						Name:    "This is an alarm",
-						Message: "Some kind of message.",
-						State:   models.AlertStateOK,
-					}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-
-				caption := generateImageCaption(evalContext,
-					"http://grafa.url/abcdefaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-					"foo bar")
-				require.LessOrEqual(t, len(caption), 1024)
-				require.Contains(t, caption, "Some kind of message.")
-				require.Contains(t, caption, "[OK] This is an alarm")
-				require.Contains(t, caption, "foo bar")
-				require.NotContains(t, caption, "http")
-			})
-
-			t.Run("Message should be trimmed if it's too long", func(t *testing.T) {
-				evalContext := alerting.NewEvalContext(context.Background(),
-					&alerting.Rule{
-						Name:    "This is an alarm",
-						Message: "Some kind of message that is too long for appending to our pretty little message, this line is actually exactly 197 chars long and I will get there in the end I promise I will. Yes siree that's it. But suddenly Telegram increased the length so now we need some lorem ipsum to fix this test. Here we go: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus consectetur molestie cursus. Donec suscipit egestas nisi. Proin ut efficitur ex. Mauris mi augue, volutpat a nisi vel, euismod dictum arcu. Sed quis tempor eros, sed malesuada dolor. Ut orci augue, viverra sit amet blandit quis, faucibus sit amet ex. Duis condimentum efficitur lectus, id dignissim quam tempor id. Morbi sollicitudin rhoncus diam, id tincidunt lectus scelerisque vitae. Etiam imperdiet semper sem, vel eleifend ligula mollis eget. Etiam ultrices fringilla lacus, sit amet pharetra ex blandit quis. Suspendisse in egestas neque, et posuere lectus. Vestibulum eu ex dui. Sed molestie nulla a lobortis scelerisque. Nulla ipsum ex, iaculis vitae vehicula sit amet, fermentum eu eros.",
-						State:   models.AlertStateOK,
-					}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-
-				caption := generateImageCaption(evalContext,
-					"http://grafa.url/foo",
-					"")
-				require.LessOrEqual(t, len(caption), 1024)
-				require.Contains(t, caption, "[OK] This is an alarm")
-				require.NotContains(t, caption, "http")
-				require.Contains(t, caption, "Some kind of message that is too long for appending to our pretty little message, this line is actually exactly 197 chars long and I will get there in the end I promise I will. Yes siree that's it. But suddenly Telegram increased the length so now we need some lorem ipsum to fix this test. Here we go: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus consectetur molestie cursus. Donec suscipit egestas nisi. Proin ut efficitur ex. Mauris mi augue, volutpat a nisi vel, euismod dictum arcu. Sed quis tempor eros, sed malesuada dolor. Ut orci augue, viverra sit amet blandit quis, faucibus sit amet ex. Duis condimentum efficitur lectus, id dignissim quam tempor id. Morbi sollicitudin rhoncus diam, id tincidunt lectus scelerisque vitae. Etiam imperdiet semper sem, vel eleifend ligula mollis eget. Etiam ultrices fringilla lacus, sit amet pharetra ex blandit quis. Suspendisse in egestas neque, et posuere lectus. Vestibulum eu ex dui. Sed molestie nulla a lobortis sceleri")
-			})
-
-			t.Run("Metrics should be skipped if they don't fit", func(t *testing.T) {
-				evalContext := alerting.NewEvalContext(context.Background(),
-					&alerting.Rule{
-						Name:    "This is an alarm",
-						Message: "Some kind of message that is too long for appending to our pretty little message, this line is actually exactly 197 chars long and I will get there in the end I promise I will. Yes siree that's it. But suddenly Telegram increased the length so now we need some lorem ipsum to fix this test. Here we go: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus consectetur molestie cursus. Donec suscipit egestas nisi. Proin ut efficitur ex. Mauris mi augue, volutpat a nisi vel, euismod dictum arcu. Sed quis tempor eros, sed malesuada dolor. Ut orci augue, viverra sit amet blandit quis, faucibus sit amet ex. Duis condimentum efficitur lectus, id dignissim quam tempor id. Morbi sollicitudin rhoncus diam, id tincidunt lectus scelerisque vitae. Etiam imperdiet semper sem, vel eleifend ligula mollis eget. Etiam ultrices fringilla lacus, sit amet pharetra ex blandit quis. Suspendisse in egestas neque, et posuere lectus. Vestibulum eu ex dui. Sed molestie nulla a lobortis sceleri",
-						State:   models.AlertStateOK,
-					}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-
-				caption := generateImageCaption(evalContext,
-					"http://grafa.url/foo",
-					"foo bar long song")
-				require.LessOrEqual(t, len(caption), 1024)
-				require.Contains(t, caption, "[OK] This is an alarm")
-				require.NotContains(t, caption, "http")
-				require.NotContains(t, caption, "foo bar")
-			})
-		})
-	})
-}
diff --git a/pkg/services/alerting/notifiers/threema.go b/pkg/services/alerting/notifiers/threema.go
deleted file mode 100644
index 6fc3589e099e1..0000000000000
--- a/pkg/services/alerting/notifiers/threema.go
+++ /dev/null
@@ -1,167 +0,0 @@
-package notifiers
-
-import (
-	"context"
-	"fmt"
-	"net/url"
-	"strings"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-var (
-	threemaGwBaseURL = "https://msgapi.threema.ch/%s"
-)
-
-func init() {
-	alerting.RegisterNotifier(&alerting.NotifierPlugin{
-		Type:        "threema",
-		Name:        "Threema Gateway",
-		Description: "Sends notifications to Threema using Threema Gateway (Basic IDs)",
-		Heading:     "Threema Gateway settings",
-		Info: "Notifications can be configured for any Threema Gateway ID of type \"Basic\". End-to-End IDs are not currently supported." +
-			"The Threema Gateway ID can be set up at https://gateway.threema.ch/.",
-		Factory: NewThreemaNotifier,
-		Options: []alerting.NotifierOption{
-			{
-				Label:          "Gateway ID",
-				Element:        alerting.ElementTypeInput,
-				InputType:      alerting.InputTypeText,
-				Placeholder:    "*3MAGWID",
-				Description:    "Your 8 character Threema Gateway Basic ID (starting with a *).",
-				PropertyName:   "gateway_id",
-				Required:       true,
-				ValidationRule: "\\*[0-9A-Z]{7}",
-			},
-			{
-				Label:          "Recipient ID",
-				Element:        alerting.ElementTypeInput,
-				InputType:      alerting.InputTypeText,
-				Placeholder:    "YOUR3MID",
-				Description:    "The 8 character Threema ID that should receive the alerts.",
-				PropertyName:   "recipient_id",
-				Required:       true,
-				ValidationRule: "[0-9A-Z]{8}",
-			},
-			{
-				Label:        "API Secret",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Description:  "Your Threema Gateway API secret.",
-				PropertyName: "api_secret",
-				Required:     true,
-				Secure:       true,
-			},
-		},
-	})
-}
-
-// ThreemaNotifier is responsible for sending
-// alert notifications to Threema.
-type ThreemaNotifier struct {
-	NotifierBase
-	GatewayID   string
-	RecipientID string
-	APISecret   string
-	log         log.Logger
-}
-
-// NewThreemaNotifier is the constructor for the Threema notifier
-func NewThreemaNotifier(model *models.AlertNotification, fn alerting.GetDecryptedValueFn, ns notifications.Service) (alerting.Notifier, error) {
-	if model.Settings == nil {
-		return nil, alerting.ValidationError{Reason: "No Settings Supplied"}
-	}
-
-	gatewayID := model.Settings.Get("gateway_id").MustString()
-	recipientID := model.Settings.Get("recipient_id").MustString()
-	apiSecret := fn(context.Background(), model.SecureSettings, "api_secret", model.Settings.Get("api_secret").MustString(), setting.SecretKey)
-
-	// Validation
-	if gatewayID == "" {
-		return nil, alerting.ValidationError{Reason: "Could not find Threema Gateway ID in settings"}
-	}
-	if !strings.HasPrefix(gatewayID, "*") {
-		return nil, alerting.ValidationError{Reason: "Invalid Threema Gateway ID: Must start with a *"}
-	}
-	if len(gatewayID) != 8 {
-		return nil, alerting.ValidationError{Reason: "Invalid Threema Gateway ID: Must be 8 characters long"}
-	}
-	if recipientID == "" {
-		return nil, alerting.ValidationError{Reason: "Could not find Threema Recipient ID in settings"}
-	}
-	if len(recipientID) != 8 {
-		return nil, alerting.ValidationError{Reason: "Invalid Threema Recipient ID: Must be 8 characters long"}
-	}
-	if apiSecret == "" {
-		return nil, alerting.ValidationError{Reason: "Could not find Threema API secret in settings"}
-	}
-
-	return &ThreemaNotifier{
-		NotifierBase: NewNotifierBase(model, ns),
-		GatewayID:    gatewayID,
-		RecipientID:  recipientID,
-		APISecret:    apiSecret,
-		log:          log.New("alerting.notifier.threema"),
-	}, nil
-}
-
-// Notify send an alert notification to Threema
-func (notifier *ThreemaNotifier) Notify(evalContext *alerting.EvalContext) error {
-	notifier.log.Info("Sending alert notification from", "threema_id", notifier.GatewayID)
-	notifier.log.Info("Sending alert notification to", "threema_id", notifier.RecipientID)
-
-	// Set up basic API request data
-	data := url.Values{}
-	data.Set("from", notifier.GatewayID)
-	data.Set("to", notifier.RecipientID)
-	data.Set("secret", notifier.APISecret)
-
-	// Determine emoji
-	stateEmoji := ""
-	switch evalContext.Rule.State {
-	case models.AlertStateOK:
-		stateEmoji = "\u2705 " // Check Mark Button
-	case models.AlertStateNoData:
-		stateEmoji = "\u2753\uFE0F " // Question Mark
-	case models.AlertStateAlerting:
-		stateEmoji = "\u26A0\uFE0F " // Warning sign
-	default:
-		// Handle other cases?
-	}
-
-	// Build message
-	message := fmt.Sprintf("%s%s\n\n*State:* %s\n*Message:* %s\n",
-		stateEmoji, evalContext.GetNotificationTitle(),
-		evalContext.Rule.Name, evalContext.Rule.Message)
-	ruleURL, err := evalContext.GetRuleURL()
-	if err == nil {
-		message += fmt.Sprintf("*URL:* %s\n", ruleURL)
-	}
-	if notifier.NeedsImage() && evalContext.ImagePublicURL != "" {
-		message += fmt.Sprintf("*Image:* %s\n", evalContext.ImagePublicURL)
-	}
-	data.Set("text", message)
-
-	// Prepare and send request
-	url := fmt.Sprintf(threemaGwBaseURL, "send_simple")
-	body := data.Encode()
-	headers := map[string]string{
-		"Content-Type": "application/x-www-form-urlencoded",
-	}
-	cmd := &notifications.SendWebhookSync{
-		Url:        url,
-		Body:       body,
-		HttpMethod: "POST",
-		HttpHeader: headers,
-	}
-	if err := notifier.NotificationService.SendWebhookSync(evalContext.Ctx, cmd); err != nil {
-		notifier.log.Error("Failed to send webhook", "error", err, "webhook", notifier.Name)
-		return err
-	}
-
-	return nil
-}
diff --git a/pkg/services/alerting/notifiers/threema_test.go b/pkg/services/alerting/notifiers/threema_test.go
deleted file mode 100644
index 42b1aea6c8f5c..0000000000000
--- a/pkg/services/alerting/notifiers/threema_test.go
+++ /dev/null
@@ -1,126 +0,0 @@
-package notifiers
-
-import (
-	"errors"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
-)
-
-func TestThreemaNotifier(t *testing.T) {
-	encryptionService := encryptionservice.SetupTestService(t)
-
-	t.Run("Parsing alert notification from settings", func(t *testing.T) {
-		t.Run("empty settings should return error", func(t *testing.T) {
-			json := `{ }`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "threema_testing",
-				Type:     "threema",
-				Settings: settingsJSON,
-			}
-
-			_, err := NewThreemaNotifier(model, encryptionService.GetDecryptedValue, nil)
-			require.Error(t, err)
-		})
-
-		t.Run("valid settings should be parsed successfully", func(t *testing.T) {
-			json := `
-				{
-					"gateway_id": "*3MAGWID",
-					"recipient_id": "ECHOECHO",
-					"api_secret": "1234"
-				}`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "threema_testing",
-				Type:     "threema",
-				Settings: settingsJSON,
-			}
-
-			not, err := NewThreemaNotifier(model, encryptionService.GetDecryptedValue, nil)
-			require.Nil(t, err)
-			threemaNotifier := not.(*ThreemaNotifier)
-
-			require.Nil(t, err)
-			require.Equal(t, "threema_testing", threemaNotifier.Name)
-			require.Equal(t, "threema", threemaNotifier.Type)
-			require.Equal(t, "*3MAGWID", threemaNotifier.GatewayID)
-			require.Equal(t, "ECHOECHO", threemaNotifier.RecipientID)
-			require.Equal(t, "1234", threemaNotifier.APISecret)
-		})
-
-		t.Run("invalid Threema Gateway IDs should be rejected (prefix)", func(t *testing.T) {
-			json := `
-				{
-					"gateway_id": "ECHOECHO",
-					"recipient_id": "ECHOECHO",
-					"api_secret": "1234"
-				}`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "threema_testing",
-				Type:     "threema",
-				Settings: settingsJSON,
-			}
-
-			not, err := NewThreemaNotifier(model, encryptionService.GetDecryptedValue, nil)
-			require.Nil(t, not)
-			var valErr alerting.ValidationError
-			require.True(t, errors.As(err, &valErr))
-			require.Equal(t, "Invalid Threema Gateway ID: Must start with a *", valErr.Reason)
-		})
-
-		t.Run("invalid Threema Gateway IDs should be rejected (length)", func(t *testing.T) {
-			json := `
-				{
-					"gateway_id": "*ECHOECHO",
-					"recipient_id": "ECHOECHO",
-					"api_secret": "1234"
-				}`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "threema_testing",
-				Type:     "threema",
-				Settings: settingsJSON,
-			}
-
-			not, err := NewThreemaNotifier(model, encryptionService.GetDecryptedValue, nil)
-			require.Nil(t, not)
-			var valErr alerting.ValidationError
-			require.True(t, errors.As(err, &valErr))
-			require.Equal(t, "Invalid Threema Gateway ID: Must be 8 characters long", valErr.Reason)
-		})
-
-		t.Run("invalid Threema Recipient IDs should be rejected (length)", func(t *testing.T) {
-			json := `
-				{
-					"gateway_id": "*3MAGWID",
-					"recipient_id": "ECHOECH",
-					"api_secret": "1234"
-				}`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "threema_testing",
-				Type:     "threema",
-				Settings: settingsJSON,
-			}
-
-			not, err := NewThreemaNotifier(model, encryptionService.GetDecryptedValue, nil)
-			require.Nil(t, not)
-			var valErr alerting.ValidationError
-			require.True(t, errors.As(err, &valErr))
-			require.Equal(t, "Invalid Threema Recipient ID: Must be 8 characters long", valErr.Reason)
-		})
-	})
-}
diff --git a/pkg/services/alerting/notifiers/victorops.go b/pkg/services/alerting/notifiers/victorops.go
deleted file mode 100644
index 4da542562d785..0000000000000
--- a/pkg/services/alerting/notifiers/victorops.go
+++ /dev/null
@@ -1,165 +0,0 @@
-package notifiers
-
-import (
-	"strings"
-	"time"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-// AlertStateCritical - Victorops uses "CRITICAL" string to indicate "Alerting" state
-const AlertStateCritical = "CRITICAL"
-
-// AlertStateWarning - VictorOps "WARNING" message type
-const AlertStateWarning = "WARNING"
-const alertStateRecovery = "RECOVERY"
-
-func init() {
-	alerting.RegisterNotifier(&alerting.NotifierPlugin{
-		Type:        "victorops",
-		Name:        "VictorOps",
-		Description: "Sends notifications to VictorOps",
-		Heading:     "VictorOps settings",
-		Factory:     NewVictoropsNotifier,
-		Options: []alerting.NotifierOption{
-			{
-				Label:        "Url",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				Placeholder:  "VictorOps url",
-				PropertyName: "url",
-				Required:     true,
-			},
-			{
-				Label:        "Auto resolve incidents",
-				Description:  "Resolve incidents in VictorOps once the alert goes back to ok.",
-				Element:      alerting.ElementTypeCheckbox,
-				PropertyName: "autoResolve",
-			},
-		},
-	})
-}
-
-// NewVictoropsNotifier creates an instance of VictoropsNotifier that
-// handles posting notifications to Victorops REST API
-func NewVictoropsNotifier(model *models.AlertNotification, _ alerting.GetDecryptedValueFn, ns notifications.Service) (alerting.Notifier, error) {
-	autoResolve := model.Settings.Get("autoResolve").MustBool(true)
-	url := model.Settings.Get("url").MustString()
-	if url == "" {
-		return nil, alerting.ValidationError{Reason: "Could not find victorops url property in settings"}
-	}
-	noDataAlertType := model.Settings.Get("noDataAlertType").MustString(AlertStateWarning)
-
-	return &VictoropsNotifier{
-		NotifierBase:    NewNotifierBase(model, ns),
-		URL:             url,
-		NoDataAlertType: noDataAlertType,
-		AutoResolve:     autoResolve,
-		log:             log.New("alerting.notifier.victorops"),
-	}, nil
-}
-
-// VictoropsNotifier defines URL property for Victorops REST API
-// and handles notification process by formatting POST body according to
-// Victorops specifications (http://victorops.force.com/knowledgebase/articles/Integration/Alert-Ingestion-API-Documentation/)
-type VictoropsNotifier struct {
-	NotifierBase
-	URL             string
-	NoDataAlertType string
-	AutoResolve     bool
-	log             log.Logger
-}
-
-func (vn *VictoropsNotifier) buildEventPayload(evalContext *alerting.EvalContext) (*simplejson.Json, error) {
-	ruleURL, err := evalContext.GetRuleURL()
-	if err != nil {
-		vn.log.Error("Failed get rule link", "error", err)
-		return nil, err
-	}
-
-	if evalContext.Rule.State == models.AlertStateOK && !vn.AutoResolve {
-		vn.log.Info("Not alerting VictorOps", "state", evalContext.Rule.State, "auto resolve", vn.AutoResolve)
-		return nil, nil
-	}
-
-	messageType := AlertStateCritical // Default to alerting and change based on state checks (Ensures string type)
-	for _, tag := range evalContext.Rule.AlertRuleTags {
-		if strings.ToLower(tag.Key) == "severity" {
-			// Only set severity if it's one of the PD supported enum values
-			// Info, Warning, Error, or Critical (case insensitive)
-			switch sev := strings.ToUpper(tag.Value); sev {
-			case "INFO":
-				fallthrough
-			case "WARNING":
-				fallthrough
-			case "CRITICAL":
-				messageType = sev
-			default:
-				vn.log.Warn("Ignoring invalid severity tag", "severity", sev)
-			}
-		}
-	}
-
-	if evalContext.Rule.State == models.AlertStateNoData { // translate 'NODATA' to set alert
-		messageType = vn.NoDataAlertType
-	}
-
-	if evalContext.Rule.State == models.AlertStateOK {
-		messageType = alertStateRecovery
-	}
-
-	fields := make(map[string]any)
-	fieldLimitCount := 4
-	for index, evt := range evalContext.EvalMatches {
-		fields[evt.Metric] = evt.Value
-		if index > fieldLimitCount {
-			break
-		}
-	}
-
-	bodyJSON := simplejson.New()
-	bodyJSON.Set("message_type", messageType)
-	bodyJSON.Set("entity_id", evalContext.Rule.Name)
-	bodyJSON.Set("entity_display_name", evalContext.GetNotificationTitle())
-	bodyJSON.Set("timestamp", time.Now().Unix())
-	bodyJSON.Set("state_start_time", evalContext.StartTime.Unix())
-	bodyJSON.Set("state_message", evalContext.Rule.Message)
-	bodyJSON.Set("monitoring_tool", "Grafana v"+setting.BuildVersion)
-	bodyJSON.Set("alert_url", ruleURL)
-	bodyJSON.Set("metrics", fields)
-
-	if evalContext.Error != nil {
-		bodyJSON.Set("error_message", evalContext.Error.Error())
-	}
-
-	if vn.NeedsImage() && evalContext.ImagePublicURL != "" {
-		bodyJSON.Set("image_url", evalContext.ImagePublicURL)
-	}
-
-	return bodyJSON, nil
-}
-
-// Notify sends notification to Victorops via POST to URL endpoint
-func (vn *VictoropsNotifier) Notify(evalContext *alerting.EvalContext) error {
-	vn.log.Info("Executing victorops notification", "ruleId", evalContext.Rule.ID, "notification", vn.Name)
-
-	bodyJSON, err := vn.buildEventPayload(evalContext)
-	if err != nil {
-		return err
-	}
-
-	data, _ := bodyJSON.MarshalJSON()
-	cmd := &notifications.SendWebhookSync{Url: vn.URL, Body: string(data)}
-
-	if err := vn.NotificationService.SendWebhookSync(evalContext.Ctx, cmd); err != nil {
-		vn.log.Error("Failed to send Victorops notification", "error", err, "webhook", vn.Name)
-		return err
-	}
-
-	return nil
-}
diff --git a/pkg/services/alerting/notifiers/victorops_test.go b/pkg/services/alerting/notifiers/victorops_test.go
deleted file mode 100644
index 39134ab2c0c5e..0000000000000
--- a/pkg/services/alerting/notifiers/victorops_test.go
+++ /dev/null
@@ -1,165 +0,0 @@
-package notifiers
-
-import (
-	"context"
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/annotations/annotationstest"
-	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
-	"github.com/grafana/grafana/pkg/services/tag"
-	"github.com/grafana/grafana/pkg/services/validations"
-)
-
-func presenceComparerInt(a, b int64) bool {
-	if a == -1 {
-		return b != 0
-	}
-	if b == -1 {
-		return a != 0
-	}
-	return a == b
-}
-func TestVictoropsNotifier(t *testing.T) {
-	encryptionService := encryptionservice.SetupTestService(t)
-
-	t.Run("Parsing alert notification from settings", func(t *testing.T) {
-		t.Run("empty settings should return error", func(t *testing.T) {
-			json := `{ }`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "victorops_testing",
-				Type:     "victorops",
-				Settings: settingsJSON,
-			}
-
-			_, err := NewVictoropsNotifier(model, encryptionService.GetDecryptedValue, nil)
-			require.Error(t, err)
-		})
-
-		t.Run("from settings", func(t *testing.T) {
-			json := `
-				{
-          "url": "http://google.com"
-				}`
-
-			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &models.AlertNotification{
-				Name:     "victorops_testing",
-				Type:     "victorops",
-				Settings: settingsJSON,
-			}
-
-			not, err := NewVictoropsNotifier(model, encryptionService.GetDecryptedValue, nil)
-			victoropsNotifier := not.(*VictoropsNotifier)
-
-			require.Nil(t, err)
-			require.Equal(t, "victorops_testing", victoropsNotifier.Name)
-			require.Equal(t, "victorops", victoropsNotifier.Type)
-			require.Equal(t, "http://google.com", victoropsNotifier.URL)
-		})
-
-		t.Run("should return properly formatted event payload when using severity override tag", func(t *testing.T) {
-			json := `
-				{
-					"url": "http://google.com"
-				}`
-
-			settingsJSON, err := simplejson.NewJson([]byte(json))
-			require.Nil(t, err)
-
-			model := &models.AlertNotification{
-				Name:     "victorops_testing",
-				Type:     "victorops",
-				Settings: settingsJSON,
-			}
-
-			not, err := NewVictoropsNotifier(model, encryptionService.GetDecryptedValue, nil)
-			require.Nil(t, err)
-
-			victoropsNotifier := not.(*VictoropsNotifier)
-
-			evalContext := alerting.NewEvalContext(context.Background(), &alerting.Rule{
-				ID:      0,
-				Name:    "someRule",
-				Message: "someMessage",
-				State:   models.AlertStateAlerting,
-				AlertRuleTags: []*tag.Tag{
-					{Key: "keyOnly"},
-					{Key: "severity", Value: "warning"},
-				},
-			}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-			evalContext.IsTestRun = true
-
-			payload, err := victoropsNotifier.buildEventPayload(evalContext)
-			require.Nil(t, err)
-
-			diff := cmp.Diff(map[string]any{
-				"alert_url":           "",
-				"entity_display_name": "[Alerting] someRule",
-				"entity_id":           "someRule",
-				"message_type":        "WARNING",
-				"metrics":             map[string]any{},
-				"monitoring_tool":     "Grafana v",
-				"state_message":       "someMessage",
-				"state_start_time":    int64(-1),
-				"timestamp":           int64(-1),
-			}, payload.Interface(), cmp.Comparer(presenceComparerInt))
-			require.Empty(t, diff)
-		})
-		t.Run("resolving with severity works properly", func(t *testing.T) {
-			json := `
-				{
-					"url": "http://google.com"
-				}`
-
-			settingsJSON, err := simplejson.NewJson([]byte(json))
-			require.Nil(t, err)
-
-			model := &models.AlertNotification{
-				Name:     "victorops_testing",
-				Type:     "victorops",
-				Settings: settingsJSON,
-			}
-
-			not, err := NewVictoropsNotifier(model, encryptionService.GetDecryptedValue, nil)
-			require.Nil(t, err)
-
-			victoropsNotifier := not.(*VictoropsNotifier)
-
-			evalContext := alerting.NewEvalContext(context.Background(), &alerting.Rule{
-				ID:      0,
-				Name:    "someRule",
-				Message: "someMessage",
-				State:   models.AlertStateOK,
-				AlertRuleTags: []*tag.Tag{
-					{Key: "keyOnly"},
-					{Key: "severity", Value: "warning"},
-				},
-			}, &validations.OSSPluginRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-			evalContext.IsTestRun = true
-
-			payload, err := victoropsNotifier.buildEventPayload(evalContext)
-			require.Nil(t, err)
-
-			diff := cmp.Diff(map[string]any{
-				"alert_url":           "",
-				"entity_display_name": "[OK] someRule",
-				"entity_id":           "someRule",
-				"message_type":        "RECOVERY",
-				"metrics":             map[string]any{},
-				"monitoring_tool":     "Grafana v",
-				"state_message":       "someMessage",
-				"state_start_time":    int64(-1),
-				"timestamp":           int64(-1),
-			}, payload.Interface(), cmp.Comparer(presenceComparerInt))
-			require.Empty(t, diff)
-		})
-	})
-}
diff --git a/pkg/services/alerting/notifiers/webhook.go b/pkg/services/alerting/notifiers/webhook.go
deleted file mode 100644
index 4342ee46b2a4c..0000000000000
--- a/pkg/services/alerting/notifiers/webhook.go
+++ /dev/null
@@ -1,162 +0,0 @@
-package notifiers
-
-import (
-	"context"
-	"encoding/json"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func init() {
-	alerting.RegisterNotifier(&alerting.NotifierPlugin{
-		Type:        "webhook",
-		Name:        "webhook",
-		Description: "Sends HTTP POST request to a URL",
-		Heading:     "Webhook settings",
-		Factory:     NewWebHookNotifier,
-		Options: []alerting.NotifierOption{
-			{
-				Label:        "Url",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				PropertyName: "url",
-				Required:     true,
-			},
-			{
-				Label:   "Http Method",
-				Element: alerting.ElementTypeSelect,
-				SelectOptions: []alerting.SelectOption{
-					{
-						Value: "POST",
-						Label: "POST",
-					},
-					{
-						Value: "PUT",
-						Label: "PUT",
-					},
-				},
-				PropertyName: "httpMethod",
-			},
-			{
-				Label:        "Username",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypeText,
-				PropertyName: "username",
-			},
-			{
-				Label:        "Password",
-				Element:      alerting.ElementTypeInput,
-				InputType:    alerting.InputTypePassword,
-				PropertyName: "password",
-				Secure:       true,
-			},
-		},
-	})
-}
-
-// NewWebHookNotifier is the constructor for
-// the WebHook notifier.
-func NewWebHookNotifier(model *models.AlertNotification, fn alerting.GetDecryptedValueFn, ns notifications.Service) (alerting.Notifier, error) {
-	url := model.Settings.Get("url").MustString()
-	if url == "" {
-		return nil, alerting.ValidationError{Reason: "Could not find url property in settings"}
-	}
-
-	password := fn(context.Background(), model.SecureSettings, "password", model.Settings.Get("password").MustString(), setting.SecretKey)
-
-	return &WebhookNotifier{
-		NotifierBase: NewNotifierBase(model, ns),
-		URL:          url,
-		User:         model.Settings.Get("username").MustString(),
-		Password:     password,
-		HTTPMethod:   model.Settings.Get("httpMethod").MustString("POST"),
-		log:          log.New("alerting.notifier.webhook"),
-	}, nil
-}
-
-// WebhookNotifier is responsible for sending
-// alert notifications as webhooks.
-type WebhookNotifier struct {
-	NotifierBase
-	URL        string
-	User       string
-	Password   string
-	HTTPMethod string
-	log        log.Logger
-}
-
-// WebhookNotifierBody is the body of webhook
-// notification channel
-type WebhookNotifierBody struct {
-	Title       string                `json:"title"`
-	RuleID      int64                 `json:"ruleId"`
-	RuleName    string                `json:"ruleName"`
-	State       models.AlertStateType `json:"state"`
-	EvalMatches []*alerting.EvalMatch `json:"evalMatches"`
-	OrgID       int64                 `json:"orgId"`
-	DashboardID int64                 `json:"dashboardId"`
-	PanelID     int64                 `json:"panelId"`
-	Tags        map[string]string     `json:"tags"`
-	RuleURL     string                `json:"ruleUrl,omitempty"`
-	ImageURL    string                `json:"imageUrl,omitempty"`
-	Message     string                `json:"message,omitempty"`
-}
-
-// Notify send alert notifications as
-// webhook as http requests.
-func (wn *WebhookNotifier) Notify(evalContext *alerting.EvalContext) error {
-	wn.log.Info("Sending webhook")
-
-	body := WebhookNotifierBody{
-		Title:       evalContext.GetNotificationTitle(),
-		RuleID:      evalContext.Rule.ID,
-		RuleName:    evalContext.Rule.Name,
-		State:       evalContext.Rule.State,
-		EvalMatches: evalContext.EvalMatches,
-		OrgID:       evalContext.Rule.OrgID,
-		DashboardID: evalContext.Rule.DashboardID,
-		PanelID:     evalContext.Rule.PanelID,
-	}
-
-	tags := make(map[string]string)
-
-	for _, tag := range evalContext.Rule.AlertRuleTags {
-		tags[tag.Key] = tag.Value
-	}
-
-	body.Tags = tags
-
-	ruleURL, err := evalContext.GetRuleURL()
-	if err == nil {
-		body.RuleURL = ruleURL
-	}
-
-	if wn.NeedsImage() && evalContext.ImagePublicURL != "" {
-		body.ImageURL = evalContext.ImagePublicURL
-	}
-
-	if evalContext.Rule.Message != "" {
-		body.Message = evalContext.Rule.Message
-	}
-
-	bodyJSON, _ := json.Marshal(body)
-
-	cmd := &notifications.SendWebhookSync{
-		Url:        wn.URL,
-		User:       wn.User,
-		Password:   wn.Password,
-		Body:       string(bodyJSON),
-		HttpMethod: wn.HTTPMethod,
-	}
-
-	if err := wn.NotificationService.SendWebhookSync(evalContext.Ctx, cmd); err != nil {
-		wn.log.Error("Failed to send webhook", "error", err, "webhook", wn.Name)
-		return err
-	}
-
-	return nil
-}
diff --git a/pkg/services/alerting/notifiers/webhook_test.go b/pkg/services/alerting/notifiers/webhook_test.go
deleted file mode 100644
index 05c489f61ecd0..0000000000000
--- a/pkg/services/alerting/notifiers/webhook_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package notifiers
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
-)
-
-func TestWebhookNotifier_parsingFromSettings(t *testing.T) {
-	encryptionService := encryptionservice.SetupTestService(t)
-
-	t.Run("Empty settings should cause error", func(t *testing.T) {
-		const json = `{}`
-
-		settingsJSON, err := simplejson.NewJson([]byte(json))
-		require.NoError(t, err)
-		model := &models.AlertNotification{
-			Name:     "ops",
-			Type:     "webhook",
-			Settings: settingsJSON,
-		}
-
-		_, err = NewWebHookNotifier(model, encryptionService.GetDecryptedValue, nil)
-		require.Error(t, err)
-	})
-
-	t.Run("Valid settings should result in a valid notifier", func(t *testing.T) {
-		const json = `{"url": "http://google.com"}`
-
-		settingsJSON, err := simplejson.NewJson([]byte(json))
-		require.NoError(t, err)
-		model := &models.AlertNotification{
-			Name:     "ops",
-			Type:     "webhook",
-			Settings: settingsJSON,
-		}
-
-		not, err := NewWebHookNotifier(model, encryptionService.GetDecryptedValue, nil)
-		require.NoError(t, err)
-		webhookNotifier := not.(*WebhookNotifier)
-
-		assert.Equal(t, "ops", webhookNotifier.Name)
-		assert.Equal(t, "webhook", webhookNotifier.Type)
-		assert.Equal(t, "http://google.com", webhookNotifier.URL)
-	})
-}
diff --git a/pkg/services/alerting/reader.go b/pkg/services/alerting/reader.go
deleted file mode 100644
index eaf84b15b94ce..0000000000000
--- a/pkg/services/alerting/reader.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package alerting
-
-import (
-	"context"
-	"sync"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/infra/metrics"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-)
-
-type ruleReader interface {
-	fetch(context.Context) []*Rule
-}
-
-type defaultRuleReader struct {
-	sync.RWMutex
-	sqlStore AlertStore
-	log      log.Logger
-}
-
-func newRuleReader(sqlStore AlertStore) *defaultRuleReader {
-	ruleReader := &defaultRuleReader{
-		sqlStore: sqlStore,
-		log:      log.New("alerting.ruleReader"),
-	}
-
-	return ruleReader
-}
-
-func (arr *defaultRuleReader) fetch(ctx context.Context) []*Rule {
-	cmd := &models.GetAllAlertsQuery{}
-
-	alerts, err := arr.sqlStore.GetAllAlertQueryHandler(ctx, cmd)
-	if err != nil {
-		arr.log.Error("Could not load alerts", "error", err)
-		return []*Rule{}
-	}
-
-	res := make([]*Rule, 0)
-	for _, ruleDef := range alerts {
-		if model, err := NewRuleFromDBAlert(ctx, arr.sqlStore, ruleDef, false); err != nil {
-			arr.log.Error("Could not build alert model for rule", "ruleId", ruleDef.ID, "error", err)
-		} else {
-			res = append(res, model)
-		}
-	}
-
-	metrics.MAlertingActiveAlerts.Set(float64(len(res)))
-	return res
-}
diff --git a/pkg/services/alerting/result_handler.go b/pkg/services/alerting/result_handler.go
deleted file mode 100644
index c6c3d2c507f4a..0000000000000
--- a/pkg/services/alerting/result_handler.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package alerting
-
-import (
-	"context"
-	"errors"
-	"time"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/infra/metrics"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/annotations"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/services/rendering"
-)
-
-type resultHandler interface {
-	handle(evalContext *EvalContext) error
-}
-
-type defaultResultHandler struct {
-	notifier *notificationService
-	sqlStore AlertStore
-	log      log.Logger
-}
-
-func newResultHandler(renderService rendering.Service, sqlStore AlertStore, notificationService *notifications.NotificationService, decryptFn GetDecryptedValueFn) *defaultResultHandler {
-	return &defaultResultHandler{
-		log:      log.New("alerting.resultHandler"),
-		sqlStore: sqlStore,
-		notifier: newNotificationService(renderService, sqlStore, notificationService, decryptFn),
-	}
-}
-
-func (handler *defaultResultHandler) handle(evalContext *EvalContext) error {
-	executionError := ""
-	annotationData := simplejson.New()
-
-	if len(evalContext.EvalMatches) > 0 {
-		annotationData.Set("evalMatches", simplejson.NewFromAny(evalContext.EvalMatches))
-	}
-
-	if evalContext.Error != nil {
-		executionError = evalContext.Error.Error()
-		annotationData.Set("error", executionError)
-	} else if evalContext.NoDataFound {
-		annotationData.Set("noData", true)
-	}
-
-	metrics.MAlertingResultState.WithLabelValues(string(evalContext.Rule.State)).Inc()
-	if evalContext.shouldUpdateAlertState() {
-		handler.log.Info("New state change", "ruleId", evalContext.Rule.ID, "newState", evalContext.Rule.State, "prev state", evalContext.PrevAlertState)
-
-		cmd := &models.SetAlertStateCommand{
-			AlertID:  evalContext.Rule.ID,
-			OrgID:    evalContext.Rule.OrgID,
-			State:    evalContext.Rule.State,
-			Error:    executionError,
-			EvalData: annotationData,
-		}
-
-		alert, err := handler.sqlStore.SetAlertState(evalContext.Ctx, cmd)
-		if err != nil {
-			if errors.Is(err, models.ErrCannotChangeStateOnPausedAlert) {
-				handler.log.Error("Cannot change state on alert that's paused", "error", err)
-				return err
-			}
-
-			if errors.Is(err, models.ErrRequiresNewState) {
-				handler.log.Info("Alert already updated")
-				return nil
-			}
-
-			handler.log.Error("Failed to save state", "error", err)
-		} else {
-			// StateChanges is used for de duping alert notifications
-			// when two servers are raising. This makes sure that the server
-			// with the last state change always sends a notification.
-			evalContext.Rule.StateChanges = alert.StateChanges
-
-			// Update the last state change of the alert rule in memory
-			evalContext.Rule.LastStateChange = time.Now()
-		}
-
-		// save annotation
-		item := annotations.Item{
-			OrgID:       evalContext.Rule.OrgID,
-			DashboardID: evalContext.Rule.DashboardID,
-			PanelID:     evalContext.Rule.PanelID,
-			AlertID:     evalContext.Rule.ID,
-			Text:        "",
-			NewState:    string(evalContext.Rule.State),
-			PrevState:   string(evalContext.PrevAlertState),
-			Epoch:       time.Now().UnixNano() / int64(time.Millisecond),
-			Data:        annotationData,
-		}
-
-		if err := evalContext.annotationRepo.Save(evalContext.Ctx, &item); err != nil {
-			handler.log.Error("Failed to save annotation for new alert state", "error", err)
-		}
-	}
-
-	if err := handler.notifier.SendIfNeeded(evalContext); err != nil {
-		switch {
-		case errors.Is(err, context.Canceled):
-			handler.log.Debug("Handler.notifier.SendIfNeeded returned context.Canceled")
-		case errors.Is(err, context.DeadlineExceeded):
-			handler.log.Debug("Handler.notifier.SendIfNeeded returned context.DeadlineExceeded")
-		default:
-			handler.log.Error("Handler.notifier.SendIfNeeded failed", "err", err)
-		}
-	}
-
-	return nil
-}
diff --git a/pkg/services/alerting/rule.go b/pkg/services/alerting/rule.go
deleted file mode 100644
index 301274c560130..0000000000000
--- a/pkg/services/alerting/rule.go
+++ /dev/null
@@ -1,245 +0,0 @@
-package alerting
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"reflect"
-	"regexp"
-	"strconv"
-	"time"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/tag"
-)
-
-var unitMultiplier = map[string]int{
-	"s": 1,
-	"m": 60,
-	"h": 3600,
-	"d": 86400,
-}
-
-var (
-	valueFormatRegex = regexp.MustCompile(`^\d+`)
-	isDigitRegex     = regexp.MustCompile(`^[0-9]+$`)
-	unitFormatRegex  = regexp.MustCompile(`[a-z]+`)
-)
-
-var (
-	// ErrFrequencyCannotBeZeroOrLess frequency cannot be below zero
-	ErrFrequencyCannotBeZeroOrLess = errors.New(`"evaluate every" cannot be zero or below`)
-
-	// ErrFrequencyCouldNotBeParsed frequency cannot be parsed
-	ErrFrequencyCouldNotBeParsed = errors.New(`"evaluate every" field could not be parsed`)
-
-	// ErrWrongUnitFormat wrong unit format
-	ErrWrongUnitFormat = fmt.Errorf(`time unit not supported. supported units: %s`, reflect.ValueOf(unitMultiplier).MapKeys())
-)
-
-// Rule is the in-memory version of an alert rule.
-type Rule struct {
-	ID                  int64
-	OrgID               int64
-	DashboardID         int64
-	PanelID             int64
-	Frequency           int64
-	Name                string
-	Message             string
-	LastStateChange     time.Time
-	For                 time.Duration
-	NoDataState         models.NoDataOption
-	ExecutionErrorState models.ExecutionErrorOption
-	State               models.AlertStateType
-	Conditions          []Condition
-	Notifications       []string
-	AlertRuleTags       []*tag.Tag
-
-	StateChanges int64
-}
-
-// ValidationError is a typed error with meta data
-// about the validation error.
-type ValidationError struct {
-	Reason      string
-	Err         error
-	AlertID     int64
-	DashboardID int64
-	PanelID     int64
-}
-
-func (e ValidationError) Error() string {
-	extraInfo := e.Reason
-	if e.AlertID != 0 {
-		extraInfo = fmt.Sprintf("%s AlertId: %v", extraInfo, e.AlertID)
-	}
-
-	if e.PanelID != 0 {
-		extraInfo = fmt.Sprintf("%s PanelId: %v", extraInfo, e.PanelID)
-	}
-
-	if e.DashboardID != 0 {
-		extraInfo = fmt.Sprintf("%s DashboardId: %v", extraInfo, e.DashboardID)
-	}
-
-	if e.Err != nil {
-		return fmt.Sprintf("alert validation error: %s%s", e.Err.Error(), extraInfo)
-	}
-
-	return fmt.Sprintf("alert validation error: %s", extraInfo)
-}
-
-func getTimeDurationStringToSeconds(str string) (int64, error) {
-	// Check if frequency lacks unit
-	if isDigitRegex.MatchString(str) || str == "" {
-		return 0, ErrFrequencyCouldNotBeParsed
-	}
-
-	unit := unitFormatRegex.FindAllString(str, 1)[0]
-	if _, ok := unitMultiplier[unit]; !ok {
-		return 0, ErrWrongUnitFormat
-	}
-
-	multiplier := unitMultiplier[unit]
-
-	matches := valueFormatRegex.FindAllString(str, 1)
-
-	if len(matches) == 0 {
-		return 0, ErrFrequencyCouldNotBeParsed
-	}
-
-	value, err := strconv.Atoi(matches[0])
-	if err != nil {
-		return 0, err
-	}
-
-	if value == 0 {
-		return 0, ErrFrequencyCannotBeZeroOrLess
-	}
-
-	return int64(value * multiplier), nil
-}
-
-func getForValue(rawFor string) (time.Duration, error) {
-	var forValue time.Duration
-	var err error
-
-	if rawFor != "" {
-		if rawFor != "0" {
-			strings := unitFormatRegex.FindAllString(rawFor, 1)
-			if strings == nil {
-				return 0, ValidationError{Reason: fmt.Sprintf("no specified unit, error: %s", ErrWrongUnitFormat.Error())}
-			}
-			if _, ok := unitMultiplier[strings[0]]; !ok {
-				return 0, ValidationError{Reason: fmt.Sprintf("could not parse for field, error: %s", ErrWrongUnitFormat.Error())}
-			}
-		}
-		forValue, err = time.ParseDuration(rawFor)
-		if err != nil {
-			return 0, ValidationError{Reason: "Could not parse for field"}
-		}
-	}
-	return forValue, nil
-}
-
-// NewRuleFromDBAlert maps a db version of
-// alert to an in-memory version.
-func NewRuleFromDBAlert(ctx context.Context, store AlertStore, ruleDef *models.Alert, logTranslationFailures bool) (*Rule, error) {
-	model := &Rule{}
-	model.ID = ruleDef.ID
-	model.OrgID = ruleDef.OrgID
-	model.DashboardID = ruleDef.DashboardID
-	model.PanelID = ruleDef.PanelID
-	model.Name = ruleDef.Name
-	model.Message = ruleDef.Message
-	model.State = ruleDef.State
-	model.LastStateChange = ruleDef.NewStateDate
-	model.For = ruleDef.For
-	model.NoDataState = models.NoDataOption(ruleDef.Settings.Get("noDataState").MustString("no_data"))
-	model.ExecutionErrorState = models.ExecutionErrorOption(ruleDef.Settings.Get("executionErrorState").MustString("alerting"))
-	model.StateChanges = ruleDef.StateChanges
-
-	model.Frequency = ruleDef.Frequency
-	// frequency cannot be zero since that would not execute the alert rule.
-	// so we fallback to 60 seconds if `Frequency` is missing
-	if model.Frequency == 0 {
-		model.Frequency = 60
-	}
-
-	for _, v := range ruleDef.Settings.Get("notifications").MustArray() {
-		jsonModel := simplejson.NewFromAny(v)
-		if id, err := jsonModel.Get("id").Int64(); err == nil {
-			uid, err := translateNotificationIDToUID(ctx, store, id, ruleDef.OrgID)
-			if err != nil {
-				if !errors.Is(err, models.ErrAlertNotificationFailedTranslateUniqueID) {
-					logger.Error("Failed to translate notification id to uid", "error", err.Error(), "dashboardId", model.DashboardID, "alert", model.Name, "panelId", model.PanelID, "notificationId", id)
-				}
-
-				if logTranslationFailures {
-					logger.Warn("Unable to translate notification id to uid", "dashboardId", model.DashboardID, "alert", model.Name, "panelId", model.PanelID, "notificationId", id)
-				}
-			} else {
-				model.Notifications = append(model.Notifications, uid)
-			}
-		} else if uid, err := jsonModel.Get("uid").String(); err == nil {
-			model.Notifications = append(model.Notifications, uid)
-		} else {
-			return nil, ValidationError{Reason: "Neither id nor uid is specified in 'notifications' block, " + err.Error(), DashboardID: model.DashboardID, AlertID: model.ID, PanelID: model.PanelID}
-		}
-	}
-	model.AlertRuleTags = ruleDef.GetTagsFromSettings()
-
-	for index, condition := range ruleDef.Settings.Get("conditions").MustArray() {
-		conditionModel := simplejson.NewFromAny(condition)
-		conditionType := conditionModel.Get("type").MustString()
-		factory, exist := conditionFactories[conditionType]
-		if !exist {
-			return nil, ValidationError{Reason: "Unknown alert condition: " + conditionType, DashboardID: model.DashboardID, AlertID: model.ID, PanelID: model.PanelID}
-		}
-		queryCondition, err := factory(conditionModel, index)
-		if err != nil {
-			return nil, ValidationError{Err: err, DashboardID: model.DashboardID, AlertID: model.ID, PanelID: model.PanelID}
-		}
-		model.Conditions = append(model.Conditions, queryCondition)
-	}
-
-	if len(model.Conditions) == 0 {
-		return nil, ValidationError{Reason: "Alert is missing conditions"}
-	}
-
-	return model, nil
-}
-
-func translateNotificationIDToUID(ctx context.Context, store AlertStore, id int64, orgID int64) (string, error) {
-	notificationUID, err := getAlertNotificationUIDByIDAndOrgID(ctx, store, id, orgID)
-	if err != nil {
-		return "", err
-	}
-
-	return notificationUID, nil
-}
-
-func getAlertNotificationUIDByIDAndOrgID(ctx context.Context, store AlertStore, notificationID int64, orgID int64) (string, error) {
-	query := &models.GetAlertNotificationUidQuery{
-		OrgID: orgID,
-		ID:    notificationID,
-	}
-
-	uid, err := store.GetAlertNotificationUidWithId(ctx, query)
-	if err != nil {
-		return "", err
-	}
-
-	return uid, nil
-}
-
-// ConditionFactory is the function signature for creating `Conditions`.
-type ConditionFactory func(model *simplejson.Json, index int) (Condition, error)
-
-var conditionFactories = make(map[string]ConditionFactory)
-
-// RegisterCondition adds support for alerting conditions.
-func RegisterCondition(typeName string, factory ConditionFactory) {
-	conditionFactories[typeName] = factory
-}
diff --git a/pkg/services/alerting/rule_test.go b/pkg/services/alerting/rule_test.go
deleted file mode 100644
index 5f4987c7b3bac..0000000000000
--- a/pkg/services/alerting/rule_test.go
+++ /dev/null
@@ -1,247 +0,0 @@
-package alerting
-
-import (
-	"context"
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/infra/localcache"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/tsdb/legacydata"
-)
-
-type FakeCondition struct{}
-
-func (f *FakeCondition) Eval(context *EvalContext, reqHandler legacydata.RequestHandler) (*ConditionResult, error) {
-	return &ConditionResult{}, nil
-}
-
-func TestAlertRuleFrequencyParsing(t *testing.T) {
-	tcs := []struct {
-		input  string
-		err    error
-		result int64
-	}{
-		{input: "10s", result: 10},
-		{input: "10m", result: 600},
-		{input: "1h", result: 3600},
-		{input: "1d", result: 86400},
-		{input: "1o", err: ErrWrongUnitFormat},
-		{input: "0s", err: ErrFrequencyCannotBeZeroOrLess},
-		{input: "0m", err: ErrFrequencyCannotBeZeroOrLess},
-		{input: "0h", err: ErrFrequencyCannotBeZeroOrLess},
-		{input: "0", err: ErrFrequencyCouldNotBeParsed},
-		{input: "", err: ErrFrequencyCouldNotBeParsed},
-		{input: "-1s", err: ErrFrequencyCouldNotBeParsed},
-	}
-
-	for _, tc := range tcs {
-		t.Run(tc.input, func(t *testing.T) {
-			r, err := getTimeDurationStringToSeconds(tc.input)
-			if tc.err == nil {
-				require.NoError(t, err)
-			} else {
-				require.EqualError(t, err, tc.err.Error())
-			}
-			assert.Equal(t, tc.result, r)
-		})
-	}
-}
-
-func TestAlertRuleForParsing(t *testing.T) {
-	tcs := []struct {
-		input  string
-		err    error
-		result time.Duration
-	}{
-		{input: "10s", result: time.Duration(10000000000)},
-		{input: "10m", result: time.Duration(600000000000)},
-		{input: "1h", result: time.Duration(3600000000000)},
-		{input: "1o", err: fmt.Errorf("alert validation error: could not parse for field, error: %s", ErrWrongUnitFormat)},
-		{input: "1", err: fmt.Errorf("alert validation error: no specified unit, error: %s", ErrWrongUnitFormat)},
-		{input: "0s", result: time.Duration(0)},
-		{input: "0m", result: time.Duration(0)},
-		{input: "0h", result: time.Duration(0)},
-		{input: "0", result: time.Duration(0)},
-		{input: "", result: time.Duration(0)},
-	}
-
-	for _, tc := range tcs {
-		t.Run(tc.input, func(t *testing.T) {
-			r, err := getForValue(tc.input)
-			if tc.err == nil {
-				require.NoError(t, err)
-			} else {
-				require.EqualError(t, err, tc.err.Error())
-			}
-			assert.Equal(t, tc.result, r)
-		})
-	}
-}
-
-func TestAlertRuleModel(t *testing.T) {
-	sqlStore := &sqlStore{db: db.InitTestDB(t), cache: localcache.New(time.Minute, time.Minute)}
-	RegisterCondition("test", func(model *simplejson.Json, index int) (Condition, error) {
-		return &FakeCondition{}, nil
-	})
-
-	firstNotification := models.CreateAlertNotificationCommand{UID: "notifier1", OrgID: 1, Name: "1"}
-	_, err := sqlStore.CreateAlertNotificationCommand(context.Background(), &firstNotification)
-	require.Nil(t, err)
-	secondNotification := models.CreateAlertNotificationCommand{UID: "notifier2", OrgID: 1, Name: "2"}
-	_, err = sqlStore.CreateAlertNotificationCommand(context.Background(), &secondNotification)
-	require.Nil(t, err)
-
-	t.Run("Testing alert rule with notification id and uid", func(t *testing.T) {
-		json := `
-				{
-					"name": "name2",
-					"description": "desc2",
-					"handler": 0,
-					"noDataMode": "critical",
-					"enabled": true,
-					"frequency": "60s",
-					"conditions": [
-						{
-							"type": "test",
-							"prop": 123
-						}
-					],
-					"notifications": [
-						{"id": 1},
-						{"uid": "notifier2"}
-					]
-				}
-				`
-
-		alertJSON, jsonErr := simplejson.NewJson([]byte(json))
-		require.Nil(t, jsonErr)
-
-		alert := &models.Alert{
-			ID:          1,
-			OrgID:       1,
-			DashboardID: 1,
-			PanelID:     1,
-
-			Settings: alertJSON,
-		}
-
-		alertRule, err := NewRuleFromDBAlert(context.Background(), sqlStore, alert, false)
-		require.Nil(t, err)
-
-		require.Len(t, alertRule.Conditions, 1)
-		require.Len(t, alertRule.Notifications, 2)
-
-		require.Contains(t, alertRule.Notifications, "notifier2")
-		require.Contains(t, alertRule.Notifications, "notifier1")
-	})
-
-	t.Run("Testing alert rule with non existing notification id", func(t *testing.T) {
-		json := `
-				{
-					"name": "name3",
-					"description": "desc3",
-					"handler": 0,
-					"noDataMode": "critical",
-					"enabled": true,
-					"frequency": "60s",
-					"conditions": [{"type": "test", "prop": 123 }],
-					"notifications": [
-						{"id": 999},
-						{"uid": "notifier2"}
-					]
-				}
-				`
-
-		alertJSON, jsonErr := simplejson.NewJson([]byte(json))
-		require.Nil(t, jsonErr)
-
-		alert := &models.Alert{
-			ID:          1,
-			OrgID:       1,
-			DashboardID: 1,
-			PanelID:     1,
-
-			Settings: alertJSON,
-		}
-
-		alertRule, err := NewRuleFromDBAlert(context.Background(), sqlStore, alert, false)
-		require.Nil(t, err)
-		require.NotContains(t, alertRule.Notifications, "999")
-		require.Contains(t, alertRule.Notifications, "notifier2")
-	})
-
-	t.Run("Testing alert rule which can construct alert rule model with invalid frequency", func(t *testing.T) {
-		json := `
-			{
-				"name": "name2",
-				"description": "desc2",
-				"noDataMode": "critical",
-				"enabled": true,
-				"frequency": "0s",
-				"conditions": [ { "type": "test", "prop": 123 } ],
-				"notifications": []
-			}`
-
-		alertJSON, jsonErr := simplejson.NewJson([]byte(json))
-		require.Nil(t, jsonErr)
-
-		alert := &models.Alert{
-			ID:          1,
-			OrgID:       1,
-			DashboardID: 1,
-			PanelID:     1,
-			Frequency:   0,
-
-			Settings: alertJSON,
-		}
-
-		alertRule, err := NewRuleFromDBAlert(context.Background(), sqlStore, alert, false)
-		require.Nil(t, err)
-		require.EqualValues(t, alertRule.Frequency, 60)
-	})
-
-	t.Run("Testing alert rule which will raise error in case of missing notification id and uid", func(t *testing.T) {
-		json := `
-			{
-				"name": "name2",
-				"description": "desc2",
-				"noDataMode": "critical",
-				"enabled": true,
-				"frequency": "60s",
-				"conditions": [
-					{
-						"type": "test",
-						"prop": 123
-					}
-				],
-				"notifications": [
-					{"not_id_uid": "1134"}
-				]
-			}
-			`
-
-		alertJSON, jsonErr := simplejson.NewJson([]byte(json))
-		require.Nil(t, jsonErr)
-
-		alert := &models.Alert{
-			ID:          1,
-			OrgID:       1,
-			DashboardID: 1,
-			PanelID:     1,
-			Frequency:   0,
-
-			Settings: alertJSON,
-		}
-
-		_, err := NewRuleFromDBAlert(context.Background(), sqlStore, alert, false)
-		require.NotNil(t, err)
-		require.EqualValues(t, err.Error(), "alert validation error: Neither id nor uid is specified in 'notifications' block, type assertion to string failed AlertId: 1 PanelId: 1 DashboardId: 1")
-	})
-}
diff --git a/pkg/services/alerting/scheduler.go b/pkg/services/alerting/scheduler.go
deleted file mode 100644
index 4e9286c04bd7c..0000000000000
--- a/pkg/services/alerting/scheduler.go
+++ /dev/null
@@ -1,84 +0,0 @@
-package alerting
-
-import (
-	"math"
-	"time"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-type schedulerImpl struct {
-	jobs map[int64]*Job
-	log  log.Logger
-}
-
-func newScheduler() scheduler {
-	return &schedulerImpl{
-		jobs: make(map[int64]*Job),
-		log:  log.New("alerting.scheduler"),
-	}
-}
-
-func (s *schedulerImpl) Update(rules []*Rule) {
-	s.log.Debug("Scheduling update", "ruleCount", len(rules))
-
-	jobs := make(map[int64]*Job)
-
-	for i, rule := range rules {
-		var job *Job
-		if s.jobs[rule.ID] != nil {
-			job = s.jobs[rule.ID]
-		} else {
-			job = &Job{}
-			job.SetRunning(false)
-		}
-
-		job.Rule = rule
-
-		offset := ((rule.Frequency * 1000) / int64(len(rules))) * int64(i)
-		job.Offset = int64(math.Floor(float64(offset) / 1000))
-		if job.Offset == 0 { // zero offset causes division with 0 panics.
-			job.Offset = 1
-		}
-		jobs[rule.ID] = job
-	}
-
-	s.jobs = jobs
-}
-
-func (s *schedulerImpl) Tick(tickTime time.Time, execQueue chan *Job) {
-	now := tickTime.Unix()
-
-	for _, job := range s.jobs {
-		if job.GetRunning() || job.Rule.State == models.AlertStatePaused {
-			continue
-		}
-
-		if job.OffsetWait && now%job.Offset == 0 {
-			job.OffsetWait = false
-			s.enqueue(job, execQueue)
-			continue
-		}
-
-		// Check the job frequency against the minimum interval required
-		interval := job.Rule.Frequency
-		if interval < setting.AlertingMinInterval {
-			interval = setting.AlertingMinInterval
-		}
-
-		if now%interval == 0 {
-			if job.Offset > 0 {
-				job.OffsetWait = true
-			} else {
-				s.enqueue(job, execQueue)
-			}
-		}
-	}
-}
-
-func (s *schedulerImpl) enqueue(job *Job, execQueue chan *Job) {
-	s.log.Debug("Scheduler: Putting job on to exec queue", "name", job.Rule.Name, "id", job.Rule.ID)
-	execQueue <- job
-}
diff --git a/pkg/services/alerting/service.go b/pkg/services/alerting/service.go
deleted file mode 100644
index df8730820e1a4..0000000000000
--- a/pkg/services/alerting/service.go
+++ /dev/null
@@ -1,172 +0,0 @@
-package alerting
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/encryption"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/util"
-)
-
-type AlertNotificationService struct {
-	SQLStore            AlertNotificationStore
-	EncryptionService   encryption.Internal
-	NotificationService *notifications.NotificationService
-}
-
-func ProvideService(store db.DB, encryptionService encryption.Internal,
-	notificationService *notifications.NotificationService) *AlertNotificationService {
-	s := &AlertNotificationService{
-		SQLStore:            &sqlStore{db: store},
-		EncryptionService:   encryptionService,
-		NotificationService: notificationService,
-	}
-
-	return s
-}
-
-func (s *AlertNotificationService) GetAlertNotifications(ctx context.Context, query *models.GetAlertNotificationsQuery) (res *models.AlertNotification, err error) {
-	return s.SQLStore.GetAlertNotifications(ctx, query)
-}
-
-func (s *AlertNotificationService) CreateAlertNotificationCommand(ctx context.Context, cmd *models.CreateAlertNotificationCommand) (res *models.AlertNotification, err error) {
-	if util.IsShortUIDTooLong(cmd.UID) {
-		return nil, ValidationError{Reason: "Invalid UID: Must be 40 characters or less"}
-	}
-
-	cmd.EncryptedSecureSettings, err = s.EncryptionService.EncryptJsonData(ctx, cmd.SecureSettings, setting.SecretKey)
-	if err != nil {
-		return nil, err
-	}
-
-	model := models.AlertNotification{
-		Name:     cmd.Name,
-		Type:     cmd.Type,
-		Settings: cmd.Settings,
-	}
-
-	if err := s.validateAlertNotification(ctx, &model, cmd.SecureSettings); err != nil {
-		return nil, err
-	}
-
-	return s.SQLStore.CreateAlertNotificationCommand(ctx, cmd)
-}
-
-func (s *AlertNotificationService) UpdateAlertNotification(ctx context.Context, cmd *models.UpdateAlertNotificationCommand) (res *models.AlertNotification, err error) {
-	if util.IsShortUIDTooLong(cmd.UID) {
-		return nil, ValidationError{Reason: "Invalid UID: Must be 40 characters or less"}
-	}
-
-	cmd.EncryptedSecureSettings, err = s.EncryptionService.EncryptJsonData(ctx, cmd.SecureSettings, setting.SecretKey)
-	if err != nil {
-		return nil, err
-	}
-
-	model := models.AlertNotification{
-		ID:       cmd.ID,
-		OrgID:    cmd.OrgID,
-		Name:     cmd.Name,
-		Type:     cmd.Type,
-		Settings: cmd.Settings,
-	}
-
-	if err := s.validateAlertNotification(ctx, &model, cmd.SecureSettings); err != nil {
-		return nil, err
-	}
-
-	return s.SQLStore.UpdateAlertNotification(ctx, cmd)
-}
-
-func (s *AlertNotificationService) DeleteAlertNotification(ctx context.Context, cmd *models.DeleteAlertNotificationCommand) error {
-	return s.SQLStore.DeleteAlertNotification(ctx, cmd)
-}
-
-func (s *AlertNotificationService) GetAllAlertNotifications(ctx context.Context, query *models.GetAllAlertNotificationsQuery) (res []*models.AlertNotification, err error) {
-	return s.SQLStore.GetAllAlertNotifications(ctx, query)
-}
-
-func (s *AlertNotificationService) GetOrCreateAlertNotificationState(ctx context.Context, cmd *models.GetOrCreateNotificationStateQuery) (res *models.AlertNotificationState, err error) {
-	return s.SQLStore.GetOrCreateAlertNotificationState(ctx, cmd)
-}
-
-func (s *AlertNotificationService) SetAlertNotificationStateToCompleteCommand(ctx context.Context, cmd *models.SetAlertNotificationStateToCompleteCommand) error {
-	return s.SQLStore.SetAlertNotificationStateToCompleteCommand(ctx, cmd)
-}
-
-func (s *AlertNotificationService) SetAlertNotificationStateToPendingCommand(ctx context.Context, cmd *models.SetAlertNotificationStateToPendingCommand) error {
-	return s.SQLStore.SetAlertNotificationStateToPendingCommand(ctx, cmd)
-}
-
-func (s *AlertNotificationService) GetAlertNotificationsWithUid(ctx context.Context, query *models.GetAlertNotificationsWithUidQuery) (res *models.AlertNotification, err error) {
-	return s.SQLStore.GetAlertNotificationsWithUid(ctx, query)
-}
-
-func (s *AlertNotificationService) UpdateAlertNotificationWithUid(ctx context.Context, cmd *models.UpdateAlertNotificationWithUidCommand) (res *models.AlertNotification, err error) {
-	if util.IsShortUIDTooLong(cmd.UID) || util.IsShortUIDTooLong(cmd.NewUID) {
-		return nil, ValidationError{Reason: "Invalid UID: Must be 40 characters or less"}
-	}
-
-	return s.SQLStore.UpdateAlertNotificationWithUid(ctx, cmd)
-}
-
-func (s *AlertNotificationService) DeleteAlertNotificationWithUid(ctx context.Context, cmd *models.DeleteAlertNotificationWithUidCommand) error {
-	return s.SQLStore.DeleteAlertNotificationWithUid(ctx, cmd)
-}
-
-func (s *AlertNotificationService) GetAlertNotificationsWithUidToSend(ctx context.Context, query *models.GetAlertNotificationsWithUidToSendQuery) (res []*models.AlertNotification, err error) {
-	return s.SQLStore.GetAlertNotificationsWithUidToSend(ctx, query)
-}
-
-func (s *AlertNotificationService) createNotifier(ctx context.Context, model *models.AlertNotification, secureSettings map[string]string) (Notifier, error) {
-	secureSettingsMap := map[string]string{}
-
-	if model.ID > 0 {
-		query := &models.GetAlertNotificationsQuery{
-			OrgID: model.OrgID,
-			ID:    model.ID,
-		}
-		res, err := s.SQLStore.GetAlertNotifications(ctx, query)
-		if err != nil {
-			return nil, err
-		}
-
-		if res == nil {
-			return nil, fmt.Errorf("unable to find the alert notification")
-		}
-
-		if res.SecureSettings != nil {
-			var err error
-			secureSettingsMap, err = s.EncryptionService.DecryptJsonData(ctx, res.SecureSettings, setting.SecretKey)
-			if err != nil {
-				return nil, err
-			}
-		}
-	}
-
-	for k, v := range secureSettings {
-		secureSettingsMap[k] = v
-	}
-
-	var err error
-	model.SecureSettings, err = s.EncryptionService.EncryptJsonData(ctx, secureSettingsMap, setting.SecretKey)
-	if err != nil {
-		return nil, err
-	}
-
-	notifier, err := InitNotifier(model, s.EncryptionService.GetDecryptedValue, s.NotificationService)
-	if err != nil {
-		logger.Error("Failed to create notifier", "error", err.Error())
-		return nil, err
-	}
-
-	return notifier, nil
-}
-
-func (s *AlertNotificationService) validateAlertNotification(ctx context.Context, model *models.AlertNotification, secureSettings map[string]string) error {
-	_, err := s.createNotifier(ctx, model, secureSettings)
-	return err
-}
diff --git a/pkg/services/alerting/service_test.go b/pkg/services/alerting/service_test.go
deleted file mode 100644
index 0cea01be6d391..0000000000000
--- a/pkg/services/alerting/service_test.go
+++ /dev/null
@@ -1,160 +0,0 @@
-package alerting
-
-import (
-	"context"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/infra/localcache"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/infra/usagestats"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	encryptionprovider "github.com/grafana/grafana/pkg/services/encryption/provider"
-	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func TestService(t *testing.T) {
-	sqlStore := &sqlStore{
-		db:    db.InitTestDB(t),
-		log:   &log.ConcreteLogger{},
-		cache: localcache.New(time.Minute, time.Minute),
-	}
-
-	nType := "test"
-	registerTestNotifier(nType)
-
-	usMock := &usagestats.UsageStatsMock{T: t}
-
-	encProvider := encryptionprovider.ProvideEncryptionProvider()
-	encService, err := encryptionservice.ProvideEncryptionService(encProvider, usMock, setting.NewCfg())
-	require.NoError(t, err)
-
-	s := ProvideService(sqlStore.db, encService, nil)
-
-	origSecret := setting.SecretKey
-	setting.SecretKey = "alert_notification_service_test"
-
-	t.Cleanup(func() {
-		setting.SecretKey = origSecret
-	})
-
-	t.Run("create alert notification should reject an invalid command", func(t *testing.T) {
-		ctx := context.Background()
-
-		ss := map[string]string{"password": "12345"}
-		cmd := models.CreateAlertNotificationCommand{SecureSettings: ss}
-
-		_, err := s.CreateAlertNotificationCommand(ctx, &cmd)
-		require.Error(t, err)
-	})
-
-	t.Run("create alert notification should encrypt the secure json data", func(t *testing.T) {
-		ctx := context.Background()
-
-		ss := map[string]string{"password": "12345"}
-		cmd := models.CreateAlertNotificationCommand{SecureSettings: ss, Type: nType}
-
-		an, err := s.CreateAlertNotificationCommand(ctx, &cmd)
-		require.NoError(t, err)
-
-		decrypted, err := s.EncryptionService.DecryptJsonData(ctx, an.SecureSettings, setting.SecretKey)
-		require.NoError(t, err)
-		require.Equal(t, ss, decrypted)
-
-		// Delete the created alert notification
-		delCmd := models.DeleteAlertNotificationCommand{
-			ID:    an.ID,
-			OrgID: an.OrgID,
-		}
-		err = s.DeleteAlertNotification(context.Background(), &delCmd)
-		require.NoError(t, err)
-	})
-
-	t.Run("update alert notification should reject an invalid command", func(t *testing.T) {
-		ctx := context.Background()
-
-		// Save test notification.
-		ss := map[string]string{"password": "12345"}
-		createCmd := models.CreateAlertNotificationCommand{SecureSettings: ss, Type: nType}
-
-		n, err := s.CreateAlertNotificationCommand(ctx, &createCmd)
-		require.NoError(t, err)
-
-		// Try to update it with an invalid type.
-		updateCmd := models.UpdateAlertNotificationCommand{ID: n.ID, Settings: simplejson.New(), SecureSettings: ss, Type: "invalid"}
-		_, err = s.UpdateAlertNotification(ctx, &updateCmd)
-		require.Error(t, err)
-
-		// Delete the created alert notification.
-		delCmd := models.DeleteAlertNotificationCommand{
-			ID:    n.ID,
-			OrgID: n.OrgID,
-		}
-		err = s.DeleteAlertNotification(context.Background(), &delCmd)
-		require.NoError(t, err)
-	})
-
-	t.Run("update alert notification should encrypt the secure json data", func(t *testing.T) {
-		ctx := context.Background()
-
-		// Save test notification.
-		ss := map[string]string{"password": "12345"}
-		createCmd := models.CreateAlertNotificationCommand{SecureSettings: ss, Type: nType}
-
-		n, err := s.CreateAlertNotificationCommand(ctx, &createCmd)
-		require.NoError(t, err)
-
-		// Update test notification.
-		updateCmd := models.UpdateAlertNotificationCommand{ID: n.ID, Settings: simplejson.New(), SecureSettings: ss, Type: nType}
-		n2, err := s.UpdateAlertNotification(ctx, &updateCmd)
-		require.NoError(t, err)
-
-		decrypted, err := s.EncryptionService.DecryptJsonData(ctx, n2.SecureSettings, setting.SecretKey)
-		require.NoError(t, err)
-		require.Equal(t, ss, decrypted)
-
-		// Delete the created alert notification.
-		delCmd := models.DeleteAlertNotificationCommand{
-			ID:    n.ID,
-			OrgID: n.OrgID,
-		}
-		err = s.DeleteAlertNotification(context.Background(), &delCmd)
-		require.NoError(t, err)
-	})
-
-	t.Run("create alert notification should reject an invalid command", func(t *testing.T) {
-		uid := strings.Repeat("A", 41)
-
-		_, err := s.CreateAlertNotificationCommand(context.Background(), &models.CreateAlertNotificationCommand{UID: uid})
-		require.ErrorIs(t, err, ValidationError{Reason: "Invalid UID: Must be 40 characters or less"})
-	})
-
-	t.Run("update alert notification should reject an invalid command", func(t *testing.T) {
-		ctx := context.Background()
-
-		uid := strings.Repeat("A", 41)
-		expectedErr := ValidationError{Reason: "Invalid UID: Must be 40 characters or less"}
-
-		_, err := s.UpdateAlertNotification(ctx, &models.UpdateAlertNotificationCommand{UID: uid})
-		require.ErrorIs(t, err, expectedErr)
-
-		_, err = s.UpdateAlertNotificationWithUid(ctx, &models.UpdateAlertNotificationWithUidCommand{NewUID: uid})
-		require.ErrorIs(t, err, expectedErr)
-	})
-}
-
-func registerTestNotifier(notifierType string) {
-	RegisterNotifier(&NotifierPlugin{
-		Type: notifierType,
-		Factory: func(*models.AlertNotification, GetDecryptedValueFn, notifications.Service) (Notifier, error) {
-			return nil, nil
-		},
-	})
-}
diff --git a/pkg/services/alerting/store.go b/pkg/services/alerting/store.go
deleted file mode 100644
index 40e80ab903dba..0000000000000
--- a/pkg/services/alerting/store.go
+++ /dev/null
@@ -1,415 +0,0 @@
-package alerting
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"strings"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/infra/localcache"
-	"github.com/grafana/grafana/pkg/infra/log"
-	alertmodels "github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/services/tag"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-// AlertStore is a subset of SQLStore API to satisfy the needs of the alerting service.
-// A subset is needed to make it easier to mock during the tests.
-type AlertStore interface {
-	GetAlertById(context.Context, *alertmodels.GetAlertByIdQuery) (*alertmodels.Alert, error)
-	GetAllAlertQueryHandler(context.Context, *alertmodels.GetAllAlertsQuery) ([]*alertmodels.Alert, error)
-	GetAlertStatesForDashboard(context.Context, *alertmodels.GetAlertStatesForDashboardQuery) ([]*alertmodels.AlertStateInfoDTO, error)
-	HandleAlertsQuery(context.Context, *alertmodels.GetAlertsQuery) ([]*alertmodels.AlertListItemDTO, error)
-	SetAlertNotificationStateToCompleteCommand(context.Context, *alertmodels.SetAlertNotificationStateToCompleteCommand) error
-	SetAlertNotificationStateToPendingCommand(context.Context, *alertmodels.SetAlertNotificationStateToPendingCommand) error
-	GetAlertNotificationUidWithId(context.Context, *alertmodels.GetAlertNotificationUidQuery) (string, error)
-	GetAlertNotificationsWithUidToSend(context.Context, *alertmodels.GetAlertNotificationsWithUidToSendQuery) ([]*alertmodels.AlertNotification, error)
-	GetOrCreateAlertNotificationState(context.Context, *alertmodels.GetOrCreateNotificationStateQuery) (*alertmodels.AlertNotificationState, error)
-	SetAlertState(context.Context, *alertmodels.SetAlertStateCommand) (alertmodels.Alert, error)
-	PauseAlert(context.Context, *alertmodels.PauseAlertCommand) error
-	PauseAllAlerts(context.Context, *alertmodels.PauseAllAlertCommand) error
-}
-
-type sqlStore struct {
-	db         db.DB
-	cache      *localcache.CacheService
-	log        *log.ConcreteLogger
-	cfg        *setting.Cfg
-	tagService tag.Service
-	features   featuremgmt.FeatureToggles
-}
-
-func ProvideAlertStore(
-	db db.DB,
-	cacheService *localcache.CacheService, cfg *setting.Cfg, tagService tag.Service, features featuremgmt.FeatureToggles) AlertStore {
-	return &sqlStore{
-		db:         db,
-		cache:      cacheService,
-		log:        log.New("alerting.store"),
-		cfg:        cfg,
-		tagService: tagService,
-		features:   features,
-	}
-}
-
-func (ss *sqlStore) GetAlertById(ctx context.Context, query *alertmodels.GetAlertByIdQuery) (res *alertmodels.Alert, err error) {
-	err = ss.db.WithDbSession(ctx, func(sess *db.Session) error {
-		alert := alertmodels.Alert{}
-		has, err := sess.ID(query.ID).Get(&alert)
-		if !has {
-			return fmt.Errorf("could not find alert")
-		}
-		if err != nil {
-			return err
-		}
-
-		res = &alert
-		return nil
-	})
-	return res, err
-}
-
-func (ss *sqlStore) GetAllAlertQueryHandler(ctx context.Context, query *alertmodels.GetAllAlertsQuery) (res []*alertmodels.Alert, err error) {
-	err = ss.db.WithDbSession(ctx, func(sess *db.Session) error {
-		var alerts []*alertmodels.Alert
-		err := sess.SQL("select * from alert").Find(&alerts)
-		if err != nil {
-			return err
-		}
-
-		res = alerts
-		return nil
-	})
-	return res, err
-}
-
-func deleteAlertByIdInternal(alertId int64, reason string, sess *db.Session, log *log.ConcreteLogger) error {
-	log.Debug("Deleting alert", "id", alertId, "reason", reason)
-
-	if _, err := sess.Exec("DELETE FROM alert WHERE id = ?", alertId); err != nil {
-		return err
-	}
-
-	if _, err := sess.Exec("DELETE FROM annotation WHERE alert_id = ?", alertId); err != nil {
-		return err
-	}
-
-	if _, err := sess.Exec("DELETE FROM alert_notification_state WHERE alert_id = ?", alertId); err != nil {
-		return err
-	}
-
-	if _, err := sess.Exec("DELETE FROM alert_rule_tag WHERE alert_id = ?", alertId); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (ss *sqlStore) HandleAlertsQuery(ctx context.Context, query *alertmodels.GetAlertsQuery) (res []*alertmodels.AlertListItemDTO, err error) {
-	recursiveQueriesAreSupported, err := ss.db.RecursiveQueriesAreSupported()
-	if err != nil {
-		return res, err
-	}
-
-	err = ss.db.WithDbSession(ctx, func(sess *db.Session) error {
-		builder := db.NewSqlBuilder(ss.cfg, ss.features, ss.db.GetDialect(), recursiveQueriesAreSupported)
-
-		builder.Write(`SELECT
-		alert.id,
-		alert.dashboard_id,
-		alert.panel_id,
-		alert.name,
-		alert.state,
-		alert.new_state_date,
-		alert.eval_data,
-		alert.eval_date,
-		alert.execution_error,
-		dashboard.uid as dashboard_uid,
-		dashboard.slug as dashboard_slug
-		FROM alert
-		INNER JOIN dashboard on dashboard.id = alert.dashboard_id `)
-
-		builder.Write(`WHERE alert.org_id = ?`, query.OrgID)
-
-		if len(strings.TrimSpace(query.Query)) > 0 {
-			builder.Write(" AND alert.name "+ss.db.GetDialect().LikeStr()+" ?", "%"+query.Query+"%")
-		}
-
-		if len(query.DashboardIDs) > 0 {
-			builder.Write(` AND alert.dashboard_id IN (?` + strings.Repeat(",?", len(query.DashboardIDs)-1) + `) `)
-
-			for _, dbID := range query.DashboardIDs {
-				builder.AddParams(dbID)
-			}
-		}
-
-		if query.PanelID != 0 {
-			builder.Write(` AND alert.panel_id = ?`, query.PanelID)
-		}
-
-		if len(query.State) > 0 && query.State[0] != "all" {
-			builder.Write(` AND (`)
-			for i, v := range query.State {
-				if i > 0 {
-					builder.Write(" OR ")
-				}
-				if strings.HasPrefix(v, "not_") {
-					builder.Write("state <> ? ")
-					v = strings.TrimPrefix(v, "not_")
-				} else {
-					builder.Write("state = ? ")
-				}
-				builder.AddParams(v)
-			}
-			builder.Write(")")
-		}
-
-		builder.WriteDashboardPermissionFilter(query.User, dashboards.PERMISSION_VIEW, "")
-
-		builder.Write(" ORDER BY name ASC")
-
-		if query.Limit != 0 {
-			builder.Write(ss.db.GetDialect().Limit(query.Limit))
-		}
-
-		alerts := make([]*alertmodels.AlertListItemDTO, 0)
-		if err := sess.SQL(builder.GetSQLString(), builder.GetParams()...).Find(&alerts); err != nil {
-			return err
-		}
-
-		for i := range alerts {
-			if alerts[i].ExecutionError == " " {
-				alerts[i].ExecutionError = ""
-			}
-		}
-
-		res = alerts
-		return nil
-	})
-	return res, err
-}
-
-func (ss *sqlStore) SaveAlerts(ctx context.Context, dashID int64, alerts []*alertmodels.Alert) error {
-	return ss.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		existingAlerts, err := GetAlertsByDashboardId2(dashID, sess)
-		if err != nil {
-			return err
-		}
-
-		if err := ss.UpdateAlerts(ctx, existingAlerts, alerts, sess, ss.log); err != nil {
-			return err
-		}
-
-		if err := deleteMissingAlerts(existingAlerts, alerts, sess, ss.log); err != nil {
-			return err
-		}
-
-		return nil
-	})
-}
-
-func (ss *sqlStore) UpdateAlerts(ctx context.Context, existingAlerts []*alertmodels.Alert, alerts []*alertmodels.Alert, sess *db.Session, log *log.ConcreteLogger) error {
-	for _, alert := range alerts {
-		update := false
-		var alertToUpdate *alertmodels.Alert
-
-		for _, k := range existingAlerts {
-			if alert.PanelID == k.PanelID {
-				update = true
-				alert.ID = k.ID
-				alertToUpdate = k
-				break
-			}
-		}
-
-		if update {
-			if alertToUpdate.ContainsUpdates(alert) {
-				alert.Updated = timeNow()
-				alert.State = alertToUpdate.State
-				sess.MustCols("message", "for")
-
-				_, err := sess.ID(alert.ID).Update(alert)
-				if err != nil {
-					return err
-				}
-
-				log.Debug("Alert updated", "name", alert.Name, "id", alert.ID)
-			}
-		} else {
-			alert.Updated = timeNow()
-			alert.Created = timeNow()
-			alert.State = alertmodels.AlertStateUnknown
-			alert.NewStateDate = timeNow()
-
-			_, err := sess.Insert(alert)
-			if err != nil {
-				return err
-			}
-
-			log.Debug("Alert inserted", "name", alert.Name, "id", alert.ID)
-		}
-		tags := alert.GetTagsFromSettings()
-		if _, err := sess.Exec("DELETE FROM alert_rule_tag WHERE alert_id = ?", alert.ID); err != nil {
-			return err
-		}
-		if tags != nil {
-			tags, err := ss.tagService.EnsureTagsExist(ctx, tags)
-			if err != nil {
-				return err
-			}
-			for _, tag := range tags {
-				if _, err := sess.Exec("INSERT INTO alert_rule_tag (alert_id, tag_id) VALUES(?,?)", alert.ID, tag.Id); err != nil {
-					return err
-				}
-			}
-		}
-	}
-
-	return nil
-}
-
-func deleteMissingAlerts(alerts []*alertmodels.Alert, existingAlerts []*alertmodels.Alert, sess *db.Session, log *log.ConcreteLogger) error {
-	for _, missingAlert := range alerts {
-		missing := true
-
-		for _, k := range existingAlerts {
-			if missingAlert.PanelID == k.PanelID {
-				missing = false
-				break
-			}
-		}
-
-		if missing {
-			if err := deleteAlertByIdInternal(missingAlert.ID, "Removed from dashboard", sess, log); err != nil {
-				// No use trying to delete more, since we're in a transaction and it will be
-				// rolled back on error.
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-func GetAlertsByDashboardId2(dashboardId int64, sess *db.Session) ([]*alertmodels.Alert, error) {
-	alerts := make([]*alertmodels.Alert, 0)
-	err := sess.Where("dashboard_id = ?", dashboardId).Find(&alerts)
-
-	if err != nil {
-		return []*alertmodels.Alert{}, err
-	}
-
-	return alerts, nil
-}
-
-func (ss *sqlStore) SetAlertState(ctx context.Context, cmd *alertmodels.SetAlertStateCommand) (res alertmodels.Alert, err error) {
-	err = ss.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		alert := alertmodels.Alert{}
-
-		if has, err := sess.ID(cmd.AlertID).Get(&alert); err != nil {
-			return err
-		} else if !has {
-			return fmt.Errorf("could not find alert")
-		}
-
-		if alert.State == alertmodels.AlertStatePaused {
-			return alertmodels.ErrCannotChangeStateOnPausedAlert
-		}
-
-		if alert.State == cmd.State {
-			return alertmodels.ErrRequiresNewState
-		}
-
-		alert.State = cmd.State
-		alert.StateChanges++
-		alert.NewStateDate = timeNow()
-		alert.EvalData = cmd.EvalData
-
-		if cmd.Error == "" {
-			alert.ExecutionError = " " // without this space, xorm skips updating this field
-		} else {
-			alert.ExecutionError = cmd.Error
-		}
-
-		_, err := sess.ID(alert.ID).Update(&alert)
-		if err != nil {
-			return err
-		}
-
-		res = alert
-		return nil
-	})
-	return res, err
-}
-
-func (ss *sqlStore) PauseAlert(ctx context.Context, cmd *alertmodels.PauseAlertCommand) error {
-	return ss.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		if len(cmd.AlertIDs) == 0 {
-			return fmt.Errorf("command contains no alertids")
-		}
-
-		var buffer bytes.Buffer
-		params := make([]any, 0)
-
-		buffer.WriteString(`UPDATE alert SET state = ?, new_state_date = ?`)
-		if cmd.Paused {
-			params = append(params, string(alertmodels.AlertStatePaused))
-			params = append(params, timeNow().UTC())
-		} else {
-			params = append(params, string(alertmodels.AlertStateUnknown))
-			params = append(params, timeNow().UTC())
-		}
-
-		buffer.WriteString(` WHERE id IN (?` + strings.Repeat(",?", len(cmd.AlertIDs)-1) + `)`)
-		for _, v := range cmd.AlertIDs {
-			params = append(params, v)
-		}
-
-		sqlOrArgs := append([]any{buffer.String()}, params...)
-
-		res, err := sess.Exec(sqlOrArgs...)
-		if err != nil {
-			return err
-		}
-		cmd.ResultCount, _ = res.RowsAffected()
-		return nil
-	})
-}
-
-func (ss *sqlStore) PauseAllAlerts(ctx context.Context, cmd *alertmodels.PauseAllAlertCommand) error {
-	return ss.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		var newState string
-		if cmd.Paused {
-			newState = string(alertmodels.AlertStatePaused)
-		} else {
-			newState = string(alertmodels.AlertStateUnknown)
-		}
-
-		res, err := sess.Exec(`UPDATE alert SET state = ?, new_state_date = ?`, newState, timeNow().UTC())
-		if err != nil {
-			return err
-		}
-		cmd.ResultCount, _ = res.RowsAffected()
-		return nil
-	})
-}
-
-func (ss *sqlStore) GetAlertStatesForDashboard(ctx context.Context, query *alertmodels.GetAlertStatesForDashboardQuery) (res []*alertmodels.AlertStateInfoDTO, err error) {
-	err = ss.db.WithDbSession(ctx, func(sess *db.Session) error {
-		var rawSQL = `SELECT
-	                id,
-	                dashboard_id,
-	                panel_id,
-	                state,
-	                new_state_date
-	                FROM alert
-	                WHERE org_id = ? AND dashboard_id = ?`
-
-		res = make([]*alertmodels.AlertStateInfoDTO, 0)
-		return sess.SQL(rawSQL, query.OrgID, query.DashboardID).Find(&res)
-	})
-	return res, err
-}
diff --git a/pkg/services/alerting/store_notification.go b/pkg/services/alerting/store_notification.go
deleted file mode 100644
index 09d07a8530edc..0000000000000
--- a/pkg/services/alerting/store_notification.go
+++ /dev/null
@@ -1,594 +0,0 @@
-package alerting
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/util"
-)
-
-type AlertNotificationStore interface {
-	DeleteAlertNotification(ctx context.Context, cmd *models.DeleteAlertNotificationCommand) error
-	DeleteAlertNotificationWithUid(ctx context.Context, cmd *models.DeleteAlertNotificationWithUidCommand) error
-	GetAlertNotifications(ctx context.Context, query *models.GetAlertNotificationsQuery) (*models.AlertNotification, error)
-	GetAlertNotificationUidWithId(ctx context.Context, query *models.GetAlertNotificationUidQuery) (string, error)
-	GetAlertNotificationsWithUid(ctx context.Context, query *models.GetAlertNotificationsWithUidQuery) (*models.AlertNotification, error)
-	GetAllAlertNotifications(ctx context.Context, query *models.GetAllAlertNotificationsQuery) ([]*models.AlertNotification, error)
-	GetAlertNotificationsWithUidToSend(ctx context.Context, query *models.GetAlertNotificationsWithUidToSendQuery) ([]*models.AlertNotification, error)
-	CreateAlertNotificationCommand(ctx context.Context, cmd *models.CreateAlertNotificationCommand) (*models.AlertNotification, error)
-	UpdateAlertNotification(ctx context.Context, cmd *models.UpdateAlertNotificationCommand) (*models.AlertNotification, error)
-	UpdateAlertNotificationWithUid(ctx context.Context, cmd *models.UpdateAlertNotificationWithUidCommand) (*models.AlertNotification, error)
-	SetAlertNotificationStateToCompleteCommand(ctx context.Context, cmd *models.SetAlertNotificationStateToCompleteCommand) error
-	SetAlertNotificationStateToPendingCommand(ctx context.Context, cmd *models.SetAlertNotificationStateToPendingCommand) error
-	GetOrCreateAlertNotificationState(ctx context.Context, cmd *models.GetOrCreateNotificationStateQuery) (*models.AlertNotificationState, error)
-}
-
-// timeNow makes it possible to test usage of time
-var timeNow = time.Now
-
-func (ss *sqlStore) DeleteAlertNotification(ctx context.Context, cmd *models.DeleteAlertNotificationCommand) error {
-	return ss.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		sql := "DELETE FROM alert_notification WHERE alert_notification.org_id = ? AND alert_notification.id = ?"
-		res, err := sess.Exec(sql, cmd.OrgID, cmd.ID)
-		if err != nil {
-			return err
-		}
-		rowsAffected, err := res.RowsAffected()
-		if err != nil {
-			return err
-		}
-
-		if rowsAffected == 0 {
-			return models.ErrAlertNotificationNotFound
-		}
-
-		if _, err := sess.Exec("DELETE FROM alert_notification_state WHERE alert_notification_state.org_id = ? AND alert_notification_state.notifier_id = ?", cmd.OrgID, cmd.ID); err != nil {
-			return err
-		}
-
-		return nil
-	})
-}
-
-func (ss *sqlStore) DeleteAlertNotificationWithUid(ctx context.Context, cmd *models.DeleteAlertNotificationWithUidCommand) (err error) {
-	var res *models.AlertNotification
-	if err = ss.db.WithDbSession(ctx, func(sess *db.Session) error {
-		existingNotification := &models.GetAlertNotificationsWithUidQuery{OrgID: cmd.OrgID, UID: cmd.UID}
-		res, err = getAlertNotificationWithUidInternal(ctx, existingNotification, sess)
-		return err
-	}); err != nil {
-		return err
-	}
-
-	if res == nil {
-		return models.ErrAlertNotificationNotFound
-	}
-
-	cmd.DeletedAlertNotificationID = res.ID
-	deleteCommand := &models.DeleteAlertNotificationCommand{
-		ID:    res.ID,
-		OrgID: res.OrgID,
-	}
-	return ss.DeleteAlertNotification(ctx, deleteCommand)
-}
-
-func (ss *sqlStore) GetAlertNotifications(ctx context.Context, query *models.GetAlertNotificationsQuery) (res *models.AlertNotification, err error) {
-	err = ss.db.WithDbSession(ctx, func(sess *db.Session) error {
-		res, err = getAlertNotificationInternal(ctx, query, sess)
-		return err
-	})
-	return res, err
-}
-
-func (ss *sqlStore) GetAlertNotificationUidWithId(ctx context.Context, query *models.GetAlertNotificationUidQuery) (res string, err error) {
-	cacheKey := newAlertNotificationUidCacheKey(query.OrgID, query.ID)
-
-	if cached, found := ss.cache.Get(cacheKey); found {
-		return cached.(string), nil
-	}
-
-	if err := ss.db.WithDbSession(ctx, func(sess *db.Session) error {
-		res, err = getAlertNotificationUidInternal(ctx, query, sess)
-		return err
-	}); err != nil {
-		return "", err
-	}
-
-	ss.cache.Set(cacheKey, res, -1) // Infinite, never changes
-	return res, nil
-}
-
-func newAlertNotificationUidCacheKey(orgID, notificationId int64) string {
-	return fmt.Sprintf("notification-uid-by-org-%d-and-id-%d", orgID, notificationId)
-}
-
-func (ss *sqlStore) GetAlertNotificationsWithUid(ctx context.Context, query *models.GetAlertNotificationsWithUidQuery) (res *models.AlertNotification, err error) {
-	err = ss.db.WithDbSession(ctx, func(sess *db.Session) error {
-		res, err = getAlertNotificationWithUidInternal(ctx, query, sess)
-		return err
-	})
-	return res, err
-}
-
-func (ss *sqlStore) GetAllAlertNotifications(ctx context.Context, query *models.GetAllAlertNotificationsQuery) (res []*models.AlertNotification, err error) {
-	res = make([]*models.AlertNotification, 0)
-	err = ss.db.WithDbSession(ctx, func(sess *db.Session) error {
-		if err := sess.Where("org_id = ?", query.OrgID).Asc("name").Find(&res); err != nil {
-			return err
-		}
-		return nil
-	})
-	return res, err
-}
-
-func (ss *sqlStore) GetAlertNotificationsWithUidToSend(ctx context.Context, query *models.GetAlertNotificationsWithUidToSendQuery) (res []*models.AlertNotification, err error) {
-	res = make([]*models.AlertNotification, 0)
-	err = ss.db.WithDbSession(ctx, func(sess *db.Session) error {
-		var sql bytes.Buffer
-		params := make([]any, 0)
-
-		sql.WriteString(`SELECT
-										alert_notification.id,
-										alert_notification.uid,
-										alert_notification.org_id,
-										alert_notification.name,
-										alert_notification.type,
-										alert_notification.created,
-										alert_notification.updated,
-										alert_notification.settings,
-										alert_notification.secure_settings,
-										alert_notification.is_default,
-										alert_notification.disable_resolve_message,
-										alert_notification.send_reminder,
-										alert_notification.frequency
-										FROM alert_notification
-	  							`)
-
-		sql.WriteString(` WHERE alert_notification.org_id = ?`)
-		params = append(params, query.OrgID)
-
-		sql.WriteString(` AND ((alert_notification.is_default = ?)`)
-		params = append(params, ss.db.GetDialect().BooleanStr(true))
-
-		if len(query.UIDs) > 0 {
-			sql.WriteString(` OR alert_notification.uid IN (?` + strings.Repeat(",?", len(query.UIDs)-1) + ")")
-			for _, v := range query.UIDs {
-				params = append(params, v)
-			}
-		}
-		sql.WriteString(`)`)
-
-		return sess.SQL(sql.String(), params...).Find(&res)
-	})
-	return res, err
-}
-
-func getAlertNotificationUidInternal(ctx context.Context, query *models.GetAlertNotificationUidQuery, sess *db.Session) (res string, err error) {
-	var sql bytes.Buffer
-	params := make([]any, 0)
-
-	sql.WriteString(`SELECT
-										alert_notification.uid
-										FROM alert_notification
-	  							`)
-
-	sql.WriteString(` WHERE alert_notification.org_id = ?`)
-	params = append(params, query.OrgID)
-
-	sql.WriteString(` AND alert_notification.id = ?`)
-	params = append(params, query.ID)
-
-	results := make([]string, 0)
-	if err := sess.SQL(sql.String(), params...).Find(&results); err != nil {
-		return "", err
-	}
-
-	if len(results) == 0 {
-		return "", models.ErrAlertNotificationFailedTranslateUniqueID
-	}
-
-	res = results[0]
-	return res, nil
-}
-
-func getAlertNotificationInternal(ctx context.Context, query *models.GetAlertNotificationsQuery, sess *db.Session) (res *models.AlertNotification, err error) {
-	var sql bytes.Buffer
-	params := make([]any, 0)
-
-	sql.WriteString(`SELECT
-										alert_notification.id,
-										alert_notification.uid,
-										alert_notification.org_id,
-										alert_notification.name,
-										alert_notification.type,
-										alert_notification.created,
-										alert_notification.updated,
-										alert_notification.settings,
-										alert_notification.secure_settings,
-										alert_notification.is_default,
-										alert_notification.disable_resolve_message,
-										alert_notification.send_reminder,
-										alert_notification.frequency
-										FROM alert_notification
-	  							`)
-
-	sql.WriteString(` WHERE alert_notification.org_id = ?`)
-	params = append(params, query.OrgID)
-
-	if query.Name != "" || query.ID != 0 {
-		if query.Name != "" {
-			sql.WriteString(` AND alert_notification.name = ?`)
-			params = append(params, query.Name)
-		}
-
-		if query.ID != 0 {
-			sql.WriteString(` AND alert_notification.id = ?`)
-			params = append(params, query.ID)
-		}
-	}
-
-	results := make([]*models.AlertNotification, 0)
-	if err := sess.SQL(sql.String(), params...).Find(&results); err != nil {
-		return nil, err
-	}
-
-	if len(results) == 0 {
-		return nil, nil
-	}
-	return results[0], nil
-}
-
-func getAlertNotificationWithUidInternal(ctx context.Context, query *models.GetAlertNotificationsWithUidQuery, sess *db.Session) (res *models.AlertNotification, err error) {
-	var sql bytes.Buffer
-	params := make([]any, 0)
-
-	sql.WriteString(`SELECT
-										alert_notification.id,
-										alert_notification.uid,
-										alert_notification.org_id,
-										alert_notification.name,
-										alert_notification.type,
-										alert_notification.created,
-										alert_notification.updated,
-										alert_notification.settings,
-										alert_notification.secure_settings,
-										alert_notification.is_default,
-										alert_notification.disable_resolve_message,
-										alert_notification.send_reminder,
-										alert_notification.frequency
-										FROM alert_notification
-	  							`)
-
-	sql.WriteString(` WHERE alert_notification.org_id = ? AND alert_notification.uid = ?`)
-	params = append(params, query.OrgID, query.UID)
-
-	results := make([]*models.AlertNotification, 0)
-	if err := sess.SQL(sql.String(), params...).Find(&results); err != nil {
-		return nil, err
-	}
-
-	if len(results) == 0 {
-		return nil, nil
-	}
-	return results[0], nil
-}
-
-func (ss *sqlStore) CreateAlertNotificationCommand(ctx context.Context, cmd *models.CreateAlertNotificationCommand) (res *models.AlertNotification, err error) {
-	err = ss.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		if cmd.UID == "" {
-			uid, uidGenerationErr := generateNewAlertNotificationUid(ctx, sess, cmd.OrgID)
-			if uidGenerationErr != nil {
-				return uidGenerationErr
-			}
-
-			cmd.UID = uid
-		}
-		existingQuery := &models.GetAlertNotificationsWithUidQuery{OrgID: cmd.OrgID, UID: cmd.UID}
-		if notification, err := getAlertNotificationWithUidInternal(ctx, existingQuery, sess); err != nil {
-			return err
-		} else if notification != nil {
-			return models.ErrAlertNotificationWithSameUIDExists
-		}
-
-		// check if name exists
-		sameNameQuery := &models.GetAlertNotificationsQuery{OrgID: cmd.OrgID, Name: cmd.Name}
-		if notification, err := getAlertNotificationInternal(ctx, sameNameQuery, sess); err != nil {
-			return err
-		} else if notification != nil {
-			return models.ErrAlertNotificationWithSameNameExists
-		}
-
-		var frequency time.Duration
-		if cmd.SendReminder {
-			if cmd.Frequency == "" {
-				return models.ErrNotificationFrequencyNotFound
-			}
-
-			frequency, err = time.ParseDuration(cmd.Frequency)
-			if err != nil {
-				return err
-			}
-		}
-
-		// delete empty keys
-		for k, v := range cmd.SecureSettings {
-			if v == "" {
-				delete(cmd.SecureSettings, k)
-			}
-		}
-
-		alertNotification := &models.AlertNotification{
-			UID:                   cmd.UID,
-			OrgID:                 cmd.OrgID,
-			Name:                  cmd.Name,
-			Type:                  cmd.Type,
-			Settings:              cmd.Settings,
-			SecureSettings:        cmd.EncryptedSecureSettings,
-			SendReminder:          cmd.SendReminder,
-			DisableResolveMessage: cmd.DisableResolveMessage,
-			Frequency:             frequency,
-			Created:               time.Now(),
-			Updated:               time.Now(),
-			IsDefault:             cmd.IsDefault,
-		}
-
-		if _, err = sess.MustCols("send_reminder").Insert(alertNotification); err != nil {
-			return err
-		}
-
-		res = alertNotification
-		return nil
-	})
-	return res, err
-}
-
-func generateNewAlertNotificationUid(ctx context.Context, sess *db.Session, orgId int64) (string, error) {
-	for i := 0; i < 3; i++ {
-		uid := util.GenerateShortUID()
-		exists, err := sess.Where("org_id=? AND uid=?", orgId, uid).Get(&models.AlertNotification{})
-		if err != nil {
-			return "", err
-		}
-
-		if !exists {
-			return uid, nil
-		}
-	}
-
-	return "", models.ErrAlertNotificationFailedGenerateUniqueUid
-}
-
-func (ss *sqlStore) UpdateAlertNotification(ctx context.Context, cmd *models.UpdateAlertNotificationCommand) (res *models.AlertNotification, err error) {
-	err = ss.db.WithTransactionalDbSession(ctx, func(sess *db.Session) (err error) {
-		current := models.AlertNotification{}
-
-		if _, err = sess.ID(cmd.ID).Get(&current); err != nil {
-			return err
-		}
-
-		if current.ID == 0 {
-			return models.ErrAlertNotificationNotFound
-		}
-
-		// check if name exists
-		sameNameQuery := &models.GetAlertNotificationsQuery{OrgID: cmd.OrgID, Name: cmd.Name}
-		notification, err := getAlertNotificationInternal(ctx, sameNameQuery, sess)
-		if err != nil {
-			return err
-		}
-
-		if notification != nil && notification.ID != current.ID {
-			return fmt.Errorf("alert notification name %q already exists", cmd.Name)
-		}
-
-		// delete empty keys
-		for k, v := range cmd.SecureSettings {
-			if v == "" {
-				delete(cmd.SecureSettings, k)
-			}
-		}
-
-		current.Updated = time.Now()
-		current.Settings = cmd.Settings
-		current.SecureSettings = cmd.EncryptedSecureSettings
-		current.Name = cmd.Name
-		current.Type = cmd.Type
-		current.IsDefault = cmd.IsDefault
-		current.SendReminder = cmd.SendReminder
-		current.DisableResolveMessage = cmd.DisableResolveMessage
-
-		if cmd.UID != "" {
-			current.UID = cmd.UID
-		}
-
-		if current.SendReminder {
-			if cmd.Frequency == "" {
-				return models.ErrNotificationFrequencyNotFound
-			}
-
-			frequency, err := time.ParseDuration(cmd.Frequency)
-			if err != nil {
-				return err
-			}
-
-			current.Frequency = frequency
-		}
-
-		sess.UseBool("is_default", "send_reminder", "disable_resolve_message")
-
-		if affected, err := sess.ID(cmd.ID).Update(current); err != nil {
-			return err
-		} else if affected == 0 {
-			return fmt.Errorf("could not update alert notification")
-		}
-
-		res = &current
-		return nil
-	})
-	return res, err
-}
-
-func (ss *sqlStore) UpdateAlertNotificationWithUid(ctx context.Context, cmd *models.UpdateAlertNotificationWithUidCommand) (res *models.AlertNotification, err error) {
-	getAlertNotificationWithUidQuery := &models.GetAlertNotificationsWithUidQuery{OrgID: cmd.OrgID, UID: cmd.UID}
-
-	if err := ss.db.WithDbSession(ctx, func(sess *db.Session) error {
-		res, err = getAlertNotificationWithUidInternal(ctx, getAlertNotificationWithUidQuery, sess)
-		return err
-	}); err != nil {
-		return nil, err
-	}
-
-	current := res
-	if current == nil {
-		return nil, models.ErrAlertNotificationNotFound
-	}
-
-	if cmd.NewUID == "" {
-		cmd.NewUID = cmd.UID
-	}
-
-	updateNotification := &models.UpdateAlertNotificationCommand{
-		ID:                    current.ID,
-		UID:                   cmd.NewUID,
-		Name:                  cmd.Name,
-		Type:                  cmd.Type,
-		SendReminder:          cmd.SendReminder,
-		DisableResolveMessage: cmd.DisableResolveMessage,
-		Frequency:             cmd.Frequency,
-		IsDefault:             cmd.IsDefault,
-		Settings:              cmd.Settings,
-		SecureSettings:        cmd.SecureSettings,
-
-		OrgID: cmd.OrgID,
-	}
-
-	return ss.UpdateAlertNotification(ctx, updateNotification)
-}
-
-func (ss *sqlStore) SetAlertNotificationStateToCompleteCommand(ctx context.Context, cmd *models.SetAlertNotificationStateToCompleteCommand) error {
-	return ss.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		version := cmd.Version
-		var current models.AlertNotificationState
-		if _, err := sess.ID(cmd.ID).Get(&current); err != nil {
-			return err
-		}
-
-		newVersion := cmd.Version + 1
-		sql := `UPDATE alert_notification_state SET
-			state = ?,
-			version = ?,
-			updated_at = ?
-		WHERE
-			id = ?`
-
-		_, err := sess.Exec(sql, models.AlertNotificationStateCompleted, newVersion, timeNow().Unix(), cmd.ID)
-		if err != nil {
-			return err
-		}
-
-		if current.Version != version {
-			ss.log.Error("Notification state out of sync. the notification is marked as complete but has been modified between set as pending and completion.", "notifierId", current.NotifierID)
-		}
-
-		return nil
-	})
-}
-
-func (ss *sqlStore) SetAlertNotificationStateToPendingCommand(ctx context.Context, cmd *models.SetAlertNotificationStateToPendingCommand) error {
-	return ss.db.WithDbSession(ctx, func(sess *db.Session) error {
-		newVersion := cmd.Version + 1
-		sql := `UPDATE alert_notification_state SET
-			state = ?,
-			version = ?,
-			updated_at = ?,
-			alert_rule_state_updated_version = ?
-		WHERE
-			id = ? AND
-			(version = ? OR alert_rule_state_updated_version < ?)`
-
-		res, err := sess.Exec(sql,
-			models.AlertNotificationStatePending,
-			newVersion,
-			timeNow().Unix(),
-			cmd.AlertRuleStateUpdatedVersion,
-			cmd.ID,
-			cmd.Version,
-			cmd.AlertRuleStateUpdatedVersion)
-
-		if err != nil {
-			return err
-		}
-
-		affected, _ := res.RowsAffected()
-		if affected == 0 {
-			return models.ErrAlertNotificationStateVersionConflict
-		}
-
-		cmd.ResultVersion = newVersion
-
-		return nil
-	})
-}
-
-func (ss *sqlStore) GetOrCreateAlertNotificationState(ctx context.Context, cmd *models.GetOrCreateNotificationStateQuery) (res *models.AlertNotificationState, err error) {
-	err = ss.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		nj := &models.AlertNotificationState{}
-
-		exist, err := getAlertNotificationState(ctx, sess, cmd, nj)
-
-		// if exists, return it, otherwise create it with default values
-		if err != nil {
-			return err
-		}
-
-		if exist {
-			res = nj
-			return nil
-		}
-
-		notificationState := &models.AlertNotificationState{
-			OrgID:      cmd.OrgID,
-			AlertID:    cmd.AlertID,
-			NotifierID: cmd.NotifierID,
-			State:      models.AlertNotificationStateUnknown,
-			UpdatedAt:  timeNow().Unix(),
-		}
-
-		if _, err := sess.Insert(notificationState); err != nil {
-			if ss.db.GetDialect().IsUniqueConstraintViolation(err) {
-				exist, err = getAlertNotificationState(ctx, sess, cmd, nj)
-
-				if err != nil {
-					return err
-				}
-
-				if !exist {
-					return errors.New("should not happen")
-				}
-
-				res = nj
-				return nil
-			}
-
-			return err
-		}
-
-		res = notificationState
-		return nil
-	})
-	return res, err
-}
-
-func getAlertNotificationState(ctx context.Context, sess *db.Session, cmd *models.GetOrCreateNotificationStateQuery, nj *models.AlertNotificationState) (bool, error) {
-	return sess.
-		Where("alert_notification_state.org_id = ?", cmd.OrgID).
-		Where("alert_notification_state.alert_id = ?", cmd.AlertID).
-		Where("alert_notification_state.notifier_id = ?", cmd.NotifierID).
-		Get(nj)
-}
diff --git a/pkg/services/alerting/store_notification_test.go b/pkg/services/alerting/store_notification_test.go
deleted file mode 100644
index 3050db3605d4d..0000000000000
--- a/pkg/services/alerting/store_notification_test.go
+++ /dev/null
@@ -1,504 +0,0 @@
-package alerting
-
-import (
-	"context"
-	"errors"
-	"regexp"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/infra/localcache"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-)
-
-func TestIntegrationAlertNotificationSQLAccess(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	var store *sqlStore
-	setup := func() {
-		store = &sqlStore{
-			db:    db.InitTestDB(t),
-			log:   log.New(),
-			cache: localcache.New(time.Minute, time.Minute)}
-	}
-
-	t.Run("Alert notification state", func(t *testing.T) {
-		setup()
-		var alertID int64 = 7
-		var orgID int64 = 5
-		var notifierID int64 = 10
-		oldTimeNow := timeNow
-		now := time.Date(2018, 9, 30, 0, 0, 0, 0, time.UTC)
-		timeNow = func() time.Time { return now }
-
-		defer func() { timeNow = oldTimeNow }()
-
-		t.Run("Get no existing state should create a new state", func(t *testing.T) {
-			query := &models.GetOrCreateNotificationStateQuery{AlertID: alertID, OrgID: orgID, NotifierID: notifierID}
-			res, err := store.GetOrCreateAlertNotificationState(context.Background(), query)
-			require.Nil(t, err)
-			require.NotNil(t, res)
-			require.Equal(t, models.AlertNotificationStateUnknown, res.State)
-			require.Equal(t, int64(0), res.Version)
-			require.Equal(t, now.Unix(), res.UpdatedAt)
-
-			t.Run("Get existing state should not create a new state", func(t *testing.T) {
-				query2 := &models.GetOrCreateNotificationStateQuery{AlertID: alertID, OrgID: orgID, NotifierID: notifierID}
-				res2, err := store.GetOrCreateAlertNotificationState(context.Background(), query2)
-				require.Nil(t, err)
-				require.NotNil(t, res2)
-				require.Equal(t, res.ID, res2.ID)
-				require.Equal(t, now.Unix(), res2.UpdatedAt)
-			})
-
-			t.Run("Update existing state to pending with correct version should update database", func(t *testing.T) {
-				s := *res
-
-				cmd := models.SetAlertNotificationStateToPendingCommand{
-					ID:                           s.ID,
-					Version:                      s.Version,
-					AlertRuleStateUpdatedVersion: s.AlertRuleStateUpdatedVersion,
-				}
-
-				err := store.SetAlertNotificationStateToPendingCommand(context.Background(), &cmd)
-				require.Nil(t, err)
-				require.Equal(t, int64(1), cmd.ResultVersion)
-
-				query2 := &models.GetOrCreateNotificationStateQuery{AlertID: alertID, OrgID: orgID, NotifierID: notifierID}
-				res2, err := store.GetOrCreateAlertNotificationState(context.Background(), query2)
-				require.Nil(t, err)
-				require.Equal(t, int64(1), res2.Version)
-				require.Equal(t, models.AlertNotificationStatePending, res2.State)
-				require.Equal(t, now.Unix(), res2.UpdatedAt)
-
-				t.Run("Update existing state to completed should update database", func(t *testing.T) {
-					s := *res
-					setStateCmd := models.SetAlertNotificationStateToCompleteCommand{
-						ID:      s.ID,
-						Version: cmd.ResultVersion,
-					}
-					err := store.SetAlertNotificationStateToCompleteCommand(context.Background(), &setStateCmd)
-					require.Nil(t, err)
-
-					query3 := &models.GetOrCreateNotificationStateQuery{AlertID: alertID, OrgID: orgID, NotifierID: notifierID}
-					res3, err := store.GetOrCreateAlertNotificationState(context.Background(), query3)
-					require.Nil(t, err)
-					require.Equal(t, int64(2), res3.Version)
-					require.Equal(t, models.AlertNotificationStateCompleted, res3.State)
-					require.Equal(t, now.Unix(), res3.UpdatedAt)
-				})
-
-				t.Run("Update existing state to completed should update database. regardless of version", func(t *testing.T) {
-					s := *res
-					unknownVersion := int64(1000)
-					cmd := models.SetAlertNotificationStateToCompleteCommand{
-						ID:      s.ID,
-						Version: unknownVersion,
-					}
-					err := store.SetAlertNotificationStateToCompleteCommand(context.Background(), &cmd)
-					require.Nil(t, err)
-
-					query3 := &models.GetOrCreateNotificationStateQuery{AlertID: alertID, OrgID: orgID, NotifierID: notifierID}
-					res3, err := store.GetOrCreateAlertNotificationState(context.Background(), query3)
-					require.Nil(t, err)
-					require.Equal(t, unknownVersion+1, res3.Version)
-					require.Equal(t, models.AlertNotificationStateCompleted, res3.State)
-					require.Equal(t, now.Unix(), res3.UpdatedAt)
-				})
-			})
-
-			t.Run("Update existing state to pending with incorrect version should return version mismatch error", func(t *testing.T) {
-				s := *res
-				s.Version = 1000
-				cmd := models.SetAlertNotificationStateToPendingCommand{
-					ID:                           s.NotifierID,
-					Version:                      s.Version,
-					AlertRuleStateUpdatedVersion: s.AlertRuleStateUpdatedVersion,
-				}
-				err := store.SetAlertNotificationStateToPendingCommand(context.Background(), &cmd)
-				require.Equal(t, models.ErrAlertNotificationStateVersionConflict, err)
-			})
-
-			t.Run("Updating existing state to pending with incorrect version since alert rule state update version is higher", func(t *testing.T) {
-				s := *res
-				cmd := models.SetAlertNotificationStateToPendingCommand{
-					ID:                           s.ID,
-					Version:                      s.Version,
-					AlertRuleStateUpdatedVersion: 1000,
-				}
-				err := store.SetAlertNotificationStateToPendingCommand(context.Background(), &cmd)
-				require.Nil(t, err)
-
-				require.Equal(t, int64(1), cmd.ResultVersion)
-			})
-
-			t.Run("different version and same alert state change version should return error", func(t *testing.T) {
-				s := *res
-				s.Version = 1000
-				cmd := models.SetAlertNotificationStateToPendingCommand{
-					ID:                           s.ID,
-					Version:                      s.Version,
-					AlertRuleStateUpdatedVersion: s.AlertRuleStateUpdatedVersion,
-				}
-				err := store.SetAlertNotificationStateToPendingCommand(context.Background(), &cmd)
-				require.Error(t, err)
-			})
-		})
-	})
-
-	t.Run("Alert notifications should be empty", func(t *testing.T) {
-		setup()
-		cmd := &models.GetAlertNotificationsQuery{
-			OrgID: 2,
-			Name:  "email",
-		}
-
-		res, err := store.GetAlertNotifications(context.Background(), cmd)
-		require.Nil(t, err)
-		require.Nil(t, res)
-	})
-
-	t.Run("Cannot save alert notifier with send reminder = true", func(t *testing.T) {
-		setup()
-		cmd := &models.CreateAlertNotificationCommand{
-			Name:         "ops",
-			Type:         "email",
-			OrgID:        1,
-			SendReminder: true,
-			Settings:     simplejson.New(),
-		}
-
-		t.Run("and missing frequency", func(t *testing.T) {
-			_, err := store.CreateAlertNotificationCommand(context.Background(), cmd)
-			require.Equal(t, models.ErrNotificationFrequencyNotFound, err)
-		})
-
-		t.Run("invalid frequency", func(t *testing.T) {
-			cmd.Frequency = "invalid duration"
-			_, err := store.CreateAlertNotificationCommand(context.Background(), cmd)
-			require.True(t, regexp.MustCompile(`^time: invalid duration "?invalid duration"?$`).MatchString(
-				err.Error()))
-		})
-	})
-
-	t.Run("Cannot update alert notifier with send reminder = false", func(t *testing.T) {
-		setup()
-		cmd := &models.CreateAlertNotificationCommand{
-			Name:         "ops update",
-			Type:         "email",
-			OrgID:        1,
-			SendReminder: false,
-			Settings:     simplejson.New(),
-		}
-
-		res, err := store.CreateAlertNotificationCommand(context.Background(), cmd)
-		require.Nil(t, err)
-
-		updateCmd := &models.UpdateAlertNotificationCommand{
-			ID:           res.ID,
-			SendReminder: true,
-		}
-
-		t.Run("and missing frequency", func(t *testing.T) {
-			_, err := store.UpdateAlertNotification(context.Background(), updateCmd)
-			require.Equal(t, models.ErrNotificationFrequencyNotFound, err)
-		})
-
-		t.Run("invalid frequency", func(t *testing.T) {
-			updateCmd.Frequency = "invalid duration"
-
-			_, err := store.UpdateAlertNotification(context.Background(), updateCmd)
-			require.Error(t, err)
-			require.True(t, regexp.MustCompile(`^time: invalid duration "?invalid duration"?$`).MatchString(
-				err.Error()))
-		})
-	})
-
-	t.Run("Can save Alert Notification", func(t *testing.T) {
-		setup()
-		cmd := &models.CreateAlertNotificationCommand{
-			Name:         "ops",
-			Type:         "email",
-			OrgID:        1,
-			SendReminder: true,
-			Frequency:    "10s",
-			Settings:     simplejson.New(),
-		}
-
-		res, err := store.CreateAlertNotificationCommand(context.Background(), cmd)
-		require.Nil(t, err)
-		require.NotEqual(t, 0, res.ID)
-		require.NotEqual(t, 0, res.OrgID)
-		require.Equal(t, "email", res.Type)
-		require.Equal(t, 10*time.Second, res.Frequency)
-		require.False(t, res.DisableResolveMessage)
-		require.NotEmpty(t, res.UID)
-
-		t.Run("Cannot save Alert Notification with the same name", func(t *testing.T) {
-			_, err = store.CreateAlertNotificationCommand(context.Background(), cmd)
-			require.Error(t, err)
-		})
-		t.Run("Cannot save Alert Notification with the same name and another uid", func(t *testing.T) {
-			anotherUidCmd := &models.CreateAlertNotificationCommand{
-				Name:         cmd.Name,
-				Type:         cmd.Type,
-				OrgID:        1,
-				SendReminder: cmd.SendReminder,
-				Frequency:    cmd.Frequency,
-				Settings:     cmd.Settings,
-				UID:          "notifier1",
-			}
-			_, err = store.CreateAlertNotificationCommand(context.Background(), anotherUidCmd)
-			require.Error(t, err)
-		})
-		t.Run("Can save Alert Notification with another name and another uid", func(t *testing.T) {
-			anotherUidCmd := &models.CreateAlertNotificationCommand{
-				Name:         "another ops",
-				Type:         cmd.Type,
-				OrgID:        1,
-				SendReminder: cmd.SendReminder,
-				Frequency:    cmd.Frequency,
-				Settings:     cmd.Settings,
-				UID:          "notifier2",
-			}
-			_, err = store.CreateAlertNotificationCommand(context.Background(), anotherUidCmd)
-			require.Nil(t, err)
-		})
-
-		t.Run("Can update alert notification", func(t *testing.T) {
-			newCmd := &models.UpdateAlertNotificationCommand{
-				Name:                  "NewName",
-				Type:                  "webhook",
-				OrgID:                 res.OrgID,
-				SendReminder:          true,
-				DisableResolveMessage: true,
-				Frequency:             "60s",
-				Settings:              simplejson.New(),
-				ID:                    res.ID,
-			}
-			newres, err := store.UpdateAlertNotification(context.Background(), newCmd)
-			require.Nil(t, err)
-			require.Equal(t, "NewName", newres.Name)
-			require.Equal(t, time.Minute, newres.Frequency)
-			require.True(t, newres.DisableResolveMessage)
-		})
-
-		t.Run("Can update alert notification to disable sending of reminders", func(t *testing.T) {
-			newCmd := &models.UpdateAlertNotificationCommand{
-				Name:         "NewName",
-				Type:         "webhook",
-				OrgID:        res.OrgID,
-				SendReminder: false,
-				Settings:     simplejson.New(),
-				ID:           res.ID,
-			}
-			newres, err := store.UpdateAlertNotification(context.Background(), newCmd)
-			require.Nil(t, err)
-			require.False(t, newres.SendReminder)
-		})
-	})
-
-	t.Run("Can search using an array of ids", func(t *testing.T) {
-		setup()
-		cmd1 := models.CreateAlertNotificationCommand{Name: "nagios", Type: "webhook", OrgID: 1, SendReminder: true, Frequency: "10s", Settings: simplejson.New()}
-		cmd2 := models.CreateAlertNotificationCommand{Name: "slack", Type: "webhook", OrgID: 1, SendReminder: true, Frequency: "10s", Settings: simplejson.New()}
-		cmd3 := models.CreateAlertNotificationCommand{Name: "ops2", Type: "email", OrgID: 1, SendReminder: true, Frequency: "10s", Settings: simplejson.New()}
-		cmd4 := models.CreateAlertNotificationCommand{IsDefault: true, Name: "default", Type: "email", OrgID: 1, SendReminder: true, Frequency: "10s", Settings: simplejson.New()}
-
-		otherOrg := models.CreateAlertNotificationCommand{Name: "default", Type: "email", OrgID: 2, SendReminder: true, Frequency: "10s", Settings: simplejson.New()}
-
-		res1, err := store.CreateAlertNotificationCommand(context.Background(), &cmd1)
-		require.NoError(t, err)
-		res2, err := store.CreateAlertNotificationCommand(context.Background(), &cmd2)
-		require.NoError(t, err)
-		_, err = store.CreateAlertNotificationCommand(context.Background(), &cmd3)
-		require.NoError(t, err)
-		_, err = store.CreateAlertNotificationCommand(context.Background(), &cmd4)
-		require.NoError(t, err)
-		_, err = store.CreateAlertNotificationCommand(context.Background(), &otherOrg)
-		require.NoError(t, err)
-
-		t.Run("search", func(t *testing.T) {
-			query := &models.GetAlertNotificationsWithUidToSendQuery{
-				UIDs:  []string{res1.UID, res2.UID, "112341231"},
-				OrgID: 1,
-			}
-
-			res, err := store.GetAlertNotificationsWithUidToSend(context.Background(), query)
-			require.Nil(t, err)
-			require.Equal(t, 3, len(res))
-		})
-
-		t.Run("all", func(t *testing.T) {
-			query := &models.GetAllAlertNotificationsQuery{
-				OrgID: 1,
-			}
-
-			res, err := store.GetAllAlertNotifications(context.Background(), query)
-			require.Nil(t, err)
-			require.Equal(t, 4, len(res))
-			require.Equal(t, cmd4.Name, res[0].Name)
-			require.Equal(t, cmd1.Name, res[1].Name)
-			require.Equal(t, cmd3.Name, res[2].Name)
-			require.Equal(t, cmd2.Name, res[3].Name)
-		})
-	})
-
-	t.Run("Notification UID by ID Caching", func(t *testing.T) {
-		setup()
-
-		notification := &models.CreateAlertNotificationCommand{UID: "aNotificationUid", OrgID: 1, Name: "aNotificationUid"}
-		_, err := store.CreateAlertNotificationCommand(context.Background(), notification)
-		require.Nil(t, err)
-
-		byUidQuery := &models.GetAlertNotificationsWithUidQuery{
-			UID:   notification.UID,
-			OrgID: notification.OrgID,
-		}
-
-		res, notificationByUidErr := store.GetAlertNotificationsWithUid(context.Background(), byUidQuery)
-		require.Nil(t, notificationByUidErr)
-
-		t.Run("Can cache notification UID", func(t *testing.T) {
-			byIdQuery := &models.GetAlertNotificationUidQuery{
-				ID:    res.ID,
-				OrgID: res.OrgID,
-			}
-
-			cacheKey := newAlertNotificationUidCacheKey(byIdQuery.OrgID, byIdQuery.ID)
-
-			resultBeforeCaching, foundBeforeCaching := store.cache.Get(cacheKey)
-			require.False(t, foundBeforeCaching)
-			require.Nil(t, resultBeforeCaching)
-
-			_, notificationByIdErr := store.GetAlertNotificationUidWithId(context.Background(), byIdQuery)
-			require.Nil(t, notificationByIdErr)
-
-			resultAfterCaching, foundAfterCaching := store.cache.Get(cacheKey)
-			require.True(t, foundAfterCaching)
-			require.Equal(t, notification.UID, resultAfterCaching)
-		})
-
-		t.Run("Retrieves from cache when exists", func(t *testing.T) {
-			query := &models.GetAlertNotificationUidQuery{
-				ID:    999,
-				OrgID: 100,
-			}
-			cacheKey := newAlertNotificationUidCacheKey(query.OrgID, query.ID)
-			store.cache.Set(cacheKey, "a-cached-uid", -1)
-
-			res, err := store.GetAlertNotificationUidWithId(context.Background(), query)
-			require.Nil(t, err)
-			require.Equal(t, "a-cached-uid", res)
-		})
-
-		t.Run("Returns an error without populating cache when the notification doesn't exist in the database", func(t *testing.T) {
-			query := &models.GetAlertNotificationUidQuery{
-				ID:    -1,
-				OrgID: 100,
-			}
-
-			res, err := store.GetAlertNotificationUidWithId(context.Background(), query)
-			require.Equal(t, "", res)
-			require.Error(t, err)
-			require.True(t, errors.Is(err, models.ErrAlertNotificationFailedTranslateUniqueID))
-
-			cacheKey := newAlertNotificationUidCacheKey(query.OrgID, query.ID)
-			result, found := store.cache.Get(cacheKey)
-			require.False(t, found)
-			require.Nil(t, result)
-		})
-	})
-
-	t.Run("Cannot update non-existing Alert Notification", func(t *testing.T) {
-		setup()
-		updateCmd := &models.UpdateAlertNotificationCommand{
-			Name:                  "NewName",
-			Type:                  "webhook",
-			OrgID:                 1,
-			SendReminder:          true,
-			DisableResolveMessage: true,
-			Frequency:             "60s",
-			Settings:              simplejson.New(),
-			ID:                    1,
-		}
-		_, err := store.UpdateAlertNotification(context.Background(), updateCmd)
-		require.Equal(t, models.ErrAlertNotificationNotFound, err)
-
-		t.Run("using UID", func(t *testing.T) {
-			updateWithUidCmd := &models.UpdateAlertNotificationWithUidCommand{
-				Name:                  "NewName",
-				Type:                  "webhook",
-				OrgID:                 1,
-				SendReminder:          true,
-				DisableResolveMessage: true,
-				Frequency:             "60s",
-				Settings:              simplejson.New(),
-				UID:                   "uid",
-				NewUID:                "newUid",
-			}
-			_, err := store.UpdateAlertNotificationWithUid(context.Background(), updateWithUidCmd)
-			require.Equal(t, models.ErrAlertNotificationNotFound, err)
-		})
-	})
-
-	t.Run("Can delete Alert Notification", func(t *testing.T) {
-		setup()
-		cmd := &models.CreateAlertNotificationCommand{
-			Name:         "ops update",
-			Type:         "email",
-			OrgID:        1,
-			SendReminder: false,
-			Settings:     simplejson.New(),
-		}
-
-		res, err := store.CreateAlertNotificationCommand(context.Background(), cmd)
-		require.Nil(t, err)
-
-		deleteCmd := &models.DeleteAlertNotificationCommand{
-			ID:    res.ID,
-			OrgID: 1,
-		}
-		err = store.DeleteAlertNotification(context.Background(), deleteCmd)
-		require.Nil(t, err)
-
-		t.Run("using UID", func(t *testing.T) {
-			res, err := store.CreateAlertNotificationCommand(context.Background(), cmd)
-			require.Nil(t, err)
-
-			deleteWithUidCmd := &models.DeleteAlertNotificationWithUidCommand{
-				UID:   res.UID,
-				OrgID: 1,
-			}
-
-			err = store.DeleteAlertNotificationWithUid(context.Background(), deleteWithUidCmd)
-			require.Nil(t, err)
-			require.Equal(t, res.ID, deleteWithUidCmd.DeletedAlertNotificationID)
-		})
-	})
-
-	t.Run("Cannot delete non-existing Alert Notification", func(t *testing.T) {
-		setup()
-		deleteCmd := &models.DeleteAlertNotificationCommand{
-			ID:    1,
-			OrgID: 1,
-		}
-		err := store.DeleteAlertNotification(context.Background(), deleteCmd)
-		require.Equal(t, models.ErrAlertNotificationNotFound, err)
-
-		t.Run("using UID", func(t *testing.T) {
-			deleteWithUidCmd := &models.DeleteAlertNotificationWithUidCommand{
-				UID:   "uid",
-				OrgID: 1,
-			}
-			err = store.DeleteAlertNotificationWithUid(context.Background(), deleteWithUidCmd)
-			require.Equal(t, models.ErrAlertNotificationNotFound, err)
-		})
-	})
-}
diff --git a/pkg/services/alerting/store_test.go b/pkg/services/alerting/store_test.go
deleted file mode 100644
index 9124125414e97..0000000000000
--- a/pkg/services/alerting/store_test.go
+++ /dev/null
@@ -1,492 +0,0 @@
-package alerting
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	dashver "github.com/grafana/grafana/pkg/services/dashboardversion"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/services/org"
-	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
-	"github.com/grafana/grafana/pkg/services/user"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/util"
-)
-
-func mockTimeNow() {
-	var timeSeed int64
-	timeNow = func() time.Time {
-		loc := time.FixedZone("MockZoneUTC-5", -5*60*60)
-		fakeNow := time.Unix(timeSeed, 0).In(loc)
-		timeSeed++
-		return fakeNow
-	}
-}
-
-func resetTimeNow() {
-	timeNow = time.Now
-}
-
-func TestIntegrationAlertingDataAccess(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	mockTimeNow()
-	defer resetTimeNow()
-
-	var store *sqlStore
-	var testDash *dashboards.Dashboard
-	var items []*models.Alert
-
-	setup := func(t *testing.T) {
-		ss := db.InitTestDB(t)
-		tagService := tagimpl.ProvideService(ss, ss.Cfg)
-		cfg := setting.NewCfg()
-		store = &sqlStore{
-			db:         ss,
-			log:        log.New(),
-			cfg:        cfg,
-			tagService: tagService,
-			features:   featuremgmt.WithFeatures(),
-		}
-
-		testDash = insertTestDashboard(t, store.db, "dashboard with alerts", 1, 0, "", false, "alert")
-		evalData, err := simplejson.NewJson([]byte(`{"test": "test"}`))
-		require.Nil(t, err)
-		items = []*models.Alert{
-			{
-				PanelID:     1,
-				DashboardID: testDash.ID,
-				OrgID:       testDash.OrgID,
-				Name:        "Alerting title",
-				Message:     "Alerting message",
-				Settings:    simplejson.New(),
-				Frequency:   1,
-				EvalData:    evalData,
-			},
-		}
-
-		err = store.SaveAlerts(context.Background(), testDash.ID, items)
-		require.Nil(t, err)
-	}
-
-	t.Run("Can set new states", func(t *testing.T) {
-		setup(t)
-
-		// Get alert so we can use its ID in tests
-		signedInUser := &user.SignedInUser{
-			OrgRole: org.RoleAdmin,
-			OrgID:   1,
-			Permissions: map[int64]map[string][]string{
-				1: {
-					dashboards.ActionFoldersRead:    {dashboards.ScopeDashboardsAll, dashboards.ScopeFoldersAll},
-					dashboards.ActionDashboardsRead: {dashboards.ScopeDashboardsAll, dashboards.ScopeFoldersAll},
-				},
-			},
-		}
-		alertQuery := models.GetAlertsQuery{DashboardIDs: []int64{testDash.ID}, PanelID: 1, OrgID: 1, User: signedInUser}
-		result, err2 := store.HandleAlertsQuery(context.Background(), &alertQuery)
-		require.Nil(t, err2)
-
-		insertedAlert := result[0]
-
-		t.Run("new state ok", func(t *testing.T) {
-			cmd := &models.SetAlertStateCommand{
-				AlertID: insertedAlert.ID,
-				State:   models.AlertStateOK,
-			}
-
-			_, err := store.SetAlertState(context.Background(), cmd)
-			require.Nil(t, err)
-		})
-
-		alert, _ := getAlertById(t, insertedAlert.ID, store)
-		stateDateBeforePause := alert.NewStateDate
-
-		t.Run("can pause all alerts", func(t *testing.T) {
-			err := store.pauseAllAlerts(t, true)
-			require.Nil(t, err)
-
-			t.Run("cannot updated paused alert", func(t *testing.T) {
-				cmd := &models.SetAlertStateCommand{
-					AlertID: insertedAlert.ID,
-					State:   models.AlertStateOK,
-				}
-
-				_, err = store.SetAlertState(context.Background(), cmd)
-				require.Error(t, err)
-			})
-
-			t.Run("alert is paused", func(t *testing.T) {
-				alert, _ = getAlertById(t, insertedAlert.ID, store)
-				currentState := alert.State
-				require.Equal(t, models.AlertStatePaused, currentState)
-			})
-
-			t.Run("pausing alerts should update their NewStateDate", func(t *testing.T) {
-				alert, _ = getAlertById(t, insertedAlert.ID, store)
-				stateDateAfterPause := alert.NewStateDate
-				require.True(t, stateDateBeforePause.Before(stateDateAfterPause))
-			})
-
-			t.Run("unpausing alerts should update their NewStateDate again", func(t *testing.T) {
-				err := store.pauseAllAlerts(t, false)
-				require.Nil(t, err)
-				alert, _ = getAlertById(t, insertedAlert.ID, store)
-				stateDateAfterUnpause := alert.NewStateDate
-				require.True(t, stateDateBeforePause.Before(stateDateAfterUnpause))
-			})
-		})
-	})
-
-	t.Run("Can read properties", func(t *testing.T) {
-		setup(t)
-		signedInUser := &user.SignedInUser{
-			OrgRole: org.RoleAdmin,
-			OrgID:   1,
-			Permissions: map[int64]map[string][]string{
-				1: {
-					dashboards.ActionFoldersRead:    {dashboards.ScopeDashboardsAll, dashboards.ScopeFoldersAll},
-					dashboards.ActionDashboardsRead: {dashboards.ScopeDashboardsAll, dashboards.ScopeFoldersAll},
-				},
-			}}
-		alertQuery := models.GetAlertsQuery{DashboardIDs: []int64{testDash.ID}, PanelID: 1, OrgID: 1, User: signedInUser}
-		result, err2 := store.HandleAlertsQuery(context.Background(), &alertQuery)
-
-		alert := result[0]
-		require.Nil(t, err2)
-		require.Greater(t, alert.ID, int64(0))
-		require.Equal(t, testDash.ID, alert.DashboardID)
-		require.Equal(t, int64(1), alert.PanelID)
-		require.Equal(t, "Alerting title", alert.Name)
-		require.Equal(t, models.AlertStateUnknown, alert.State)
-		require.NotNil(t, alert.NewStateDate)
-		require.NotNil(t, alert.EvalData)
-		require.Equal(t, "test", alert.EvalData.Get("test").MustString())
-		require.NotNil(t, alert.EvalDate)
-		require.Equal(t, "", alert.ExecutionError)
-		require.NotNil(t, alert.DashboardUID)
-		require.Equal(t, "dashboard-with-alerts", alert.DashboardSlug)
-	})
-
-	t.Run("Viewer can read alerts", func(t *testing.T) {
-		setup(t)
-		viewerUser := &user.SignedInUser{
-			OrgRole: org.RoleViewer,
-			OrgID:   1,
-			Permissions: map[int64]map[string][]string{
-				1: {dashboards.ActionFoldersRead: {dashboards.ScopeFoldersAll}, dashboards.ActionDashboardsRead: {dashboards.ScopeDashboardsAll}},
-			},
-		}
-		alertQuery := models.GetAlertsQuery{DashboardIDs: []int64{testDash.ID}, PanelID: 1, OrgID: 1, User: viewerUser}
-		res, err2 := store.HandleAlertsQuery(context.Background(), &alertQuery)
-
-		require.Nil(t, err2)
-		require.Equal(t, 1, len(res))
-	})
-
-	t.Run("Alerts with same dashboard id and panel id should update", func(t *testing.T) {
-		setup(t)
-		modifiedItems := items
-		modifiedItems[0].Name = "Name"
-
-		err := store.SaveAlerts(context.Background(), testDash.ID, items)
-
-		t.Run("Can save alerts with same dashboard and panel id", func(t *testing.T) {
-			require.Nil(t, err)
-		})
-
-		t.Run("Alerts should be updated", func(t *testing.T) {
-			signedInUser := &user.SignedInUser{
-				OrgRole: org.RoleAdmin,
-				OrgID:   1,
-				Permissions: map[int64]map[string][]string{
-					1: {
-						dashboards.ActionFoldersRead:    {dashboards.ScopeDashboardsAll, dashboards.ScopeFoldersAll},
-						dashboards.ActionDashboardsRead: {dashboards.ScopeDashboardsAll, dashboards.ScopeFoldersAll},
-					},
-				}}
-			query := models.GetAlertsQuery{DashboardIDs: []int64{testDash.ID}, OrgID: 1, User: signedInUser}
-			res, err2 := store.HandleAlertsQuery(context.Background(), &query)
-
-			require.Nil(t, err2)
-			require.Equal(t, 1, len(res))
-			require.Equal(t, "Name", res[0].Name)
-
-			t.Run("Alert state should not be updated", func(t *testing.T) {
-				require.Equal(t, models.AlertStateUnknown, res[0].State)
-			})
-		})
-
-		t.Run("Updates without changes should be ignored", func(t *testing.T) {
-			err3 := store.SaveAlerts(context.Background(), testDash.ID, items)
-			require.Nil(t, err3)
-		})
-	})
-
-	t.Run("Multiple alerts per dashboard", func(t *testing.T) {
-		setup(t)
-		signedInUser := &user.SignedInUser{
-			OrgRole: org.RoleAdmin,
-			OrgID:   1,
-			Permissions: map[int64]map[string][]string{
-				1: {
-					dashboards.ActionFoldersRead:    {dashboards.ScopeDashboardsAll, dashboards.ScopeFoldersAll},
-					dashboards.ActionDashboardsRead: {dashboards.ScopeDashboardsAll, dashboards.ScopeFoldersAll},
-				},
-			},
-		}
-		multipleItems := []*models.Alert{
-			{
-				DashboardID: testDash.ID,
-				PanelID:     1,
-				Name:        "1",
-				OrgID:       1,
-				Settings:    simplejson.New(),
-			},
-			{
-				DashboardID: testDash.ID,
-				PanelID:     2,
-				Name:        "2",
-				OrgID:       1,
-				Settings:    simplejson.New(),
-			},
-			{
-				DashboardID: testDash.ID,
-				PanelID:     3,
-				Name:        "3",
-				OrgID:       1,
-				Settings:    simplejson.New(),
-			},
-		}
-
-		err := store.SaveAlerts(context.Background(), testDash.ID, multipleItems)
-
-		t.Run("Should save 3 dashboards", func(t *testing.T) {
-			require.Nil(t, err)
-
-			queryForDashboard := models.GetAlertsQuery{DashboardIDs: []int64{testDash.ID}, OrgID: 1, User: signedInUser}
-			res, err2 := store.HandleAlertsQuery(context.Background(), &queryForDashboard)
-
-			require.Nil(t, err2)
-			require.Equal(t, 3, len(res))
-		})
-
-		t.Run("should updated two dashboards and delete one", func(t *testing.T) {
-			missingOneAlert := multipleItems[:2]
-
-			err = store.SaveAlerts(context.Background(), testDash.ID, missingOneAlert)
-
-			t.Run("should delete the missing alert", func(t *testing.T) {
-				query := models.GetAlertsQuery{DashboardIDs: []int64{testDash.ID}, OrgID: 1, User: signedInUser}
-				res, err2 := store.HandleAlertsQuery(context.Background(), &query)
-				require.Nil(t, err2)
-				require.Equal(t, 2, len(res))
-			})
-		})
-	})
-
-	t.Run("When dashboard is removed", func(t *testing.T) {
-		setup(t)
-		items := []*models.Alert{
-			{
-				PanelID:     1,
-				DashboardID: testDash.ID,
-				Name:        "Alerting title",
-				Message:     "Alerting message",
-			},
-		}
-
-		err := store.SaveAlerts(context.Background(), testDash.ID, items)
-		require.Nil(t, err)
-
-		err = store.db.WithDbSession(context.Background(), func(sess *db.Session) error {
-			dash := dashboards.Dashboard{ID: testDash.ID, OrgID: 1}
-			_, err := sess.Delete(dash)
-			return err
-		})
-		require.Nil(t, err)
-
-		t.Run("Alerts should be removed", func(t *testing.T) {
-			query := models.GetAlertsQuery{DashboardIDs: []int64{testDash.ID}, OrgID: 1, User: &user.SignedInUser{OrgRole: org.RoleAdmin}}
-			res, err2 := store.HandleAlertsQuery(context.Background(), &query)
-
-			require.Nil(t, err2)
-			require.Equal(t, 0, len(res))
-		})
-	})
-}
-
-func TestIntegrationPausingAlerts(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	mockTimeNow()
-	defer resetTimeNow()
-
-	t.Run("Given an alert", func(t *testing.T) {
-		ss := db.InitTestDB(t)
-		cfg := setting.NewCfg()
-		sqlStore := sqlStore{db: ss, cfg: cfg, log: log.New(), tagService: tagimpl.ProvideService(ss, ss.Cfg), features: featuremgmt.WithFeatures()}
-
-		testDash := insertTestDashboard(t, sqlStore.db, "dashboard with alerts", 1, 0, "", false, "alert")
-		alert, err := insertTestAlert("Alerting title", "Alerting message", testDash.OrgID, testDash.ID, simplejson.New(), sqlStore)
-		require.Nil(t, err)
-
-		stateDateBeforePause := alert.NewStateDate
-		stateDateAfterPause := stateDateBeforePause
-		signedInUser := &user.SignedInUser{
-			OrgRole: org.RoleAdmin,
-			OrgID:   testDash.OrgID,
-			Permissions: map[int64]map[string][]string{
-				testDash.OrgID: {
-					dashboards.ActionFoldersRead:    {dashboards.ScopeDashboardsAll, dashboards.ScopeFoldersAll},
-					dashboards.ActionDashboardsRead: {dashboards.ScopeDashboardsAll, dashboards.ScopeFoldersAll},
-				},
-			},
-		}
-		// Get alert so we can use its ID in tests
-		alertQuery := models.GetAlertsQuery{DashboardIDs: []int64{testDash.ID}, PanelID: 1, OrgID: 1, User: signedInUser}
-		res, err2 := sqlStore.HandleAlertsQuery(context.Background(), &alertQuery)
-		require.Nil(t, err2)
-
-		insertedAlert := res[0]
-
-		t.Run("when paused", func(t *testing.T) {
-			_, err := sqlStore.pauseAlert(t, testDash.OrgID, insertedAlert.ID, true)
-			require.Nil(t, err)
-
-			t.Run("the NewStateDate should be updated", func(t *testing.T) {
-				alert, err := getAlertById(t, insertedAlert.ID, &sqlStore)
-				require.Nil(t, err)
-
-				stateDateAfterPause = alert.NewStateDate
-				require.True(t, stateDateBeforePause.Before(stateDateAfterPause))
-			})
-		})
-
-		t.Run("when unpaused", func(t *testing.T) {
-			_, err := sqlStore.pauseAlert(t, testDash.OrgID, insertedAlert.ID, false)
-			require.Nil(t, err)
-
-			t.Run("the NewStateDate should be updated again", func(t *testing.T) {
-				alert, err := getAlertById(t, insertedAlert.ID, &sqlStore)
-				require.Nil(t, err)
-
-				stateDateAfterUnpause := alert.NewStateDate
-				require.True(t, stateDateAfterPause.Before(stateDateAfterUnpause))
-			})
-		})
-	})
-}
-
-func (ss *sqlStore) pauseAlert(t *testing.T, orgId int64, alertId int64, pauseState bool) (int64, error) {
-	cmd := &models.PauseAlertCommand{
-		OrgID:    orgId,
-		AlertIDs: []int64{alertId},
-		Paused:   pauseState,
-	}
-	err := ss.PauseAlert(context.Background(), cmd)
-	require.Nil(t, err)
-	return cmd.ResultCount, err
-}
-
-func insertTestAlert(title string, message string, orgId int64, dashId int64, settings *simplejson.Json, ss sqlStore) (*models.Alert, error) {
-	items := []*models.Alert{
-		{
-			PanelID:     1,
-			DashboardID: dashId,
-			OrgID:       orgId,
-			Name:        title,
-			Message:     message,
-			Settings:    settings,
-			Frequency:   1,
-		},
-	}
-
-	err := ss.SaveAlerts(context.Background(), dashId, items)
-	return items[0], err
-}
-
-func getAlertById(t *testing.T, id int64, ss *sqlStore) (*models.Alert, error) {
-	q := &models.GetAlertByIdQuery{
-		ID: id,
-	}
-	res, err := ss.GetAlertById(context.Background(), q)
-	require.Nil(t, err)
-	return res, err
-}
-
-func (ss *sqlStore) pauseAllAlerts(t *testing.T, pauseState bool) error {
-	cmd := &models.PauseAllAlertCommand{
-		Paused: pauseState,
-	}
-	err := ss.PauseAllAlerts(context.Background(), cmd)
-	require.Nil(t, err)
-	return err
-}
-
-func insertTestDashboard(t *testing.T, store db.DB, title string, orgId int64,
-	folderId int64, folderUID string, isFolder bool, tags ...any) *dashboards.Dashboard {
-	t.Helper()
-	cmd := dashboards.SaveDashboardCommand{
-		OrgID:     orgId,
-		FolderID:  folderId,
-		FolderUID: folderUID,
-		IsFolder:  isFolder,
-		Dashboard: simplejson.NewFromAny(map[string]any{
-			"id":    nil,
-			"title": title,
-			"tags":  tags,
-		}),
-	}
-
-	var dash *dashboards.Dashboard
-	err := store.WithDbSession(context.Background(), func(sess *db.Session) error {
-		dash = cmd.GetDashboardModel()
-		dash.SetVersion(1)
-		dash.Created = time.Now()
-		dash.Updated = time.Now()
-		dash.UID = util.GenerateShortUID()
-		_, err := sess.Insert(dash)
-		return err
-	})
-
-	require.NoError(t, err)
-	require.NotNil(t, dash)
-	dash.Data.Set("id", dash.ID)
-	dash.Data.Set("uid", dash.UID)
-
-	err = store.WithDbSession(context.Background(), func(sess *db.Session) error {
-		dashVersion := &dashver.DashboardVersion{
-			DashboardID:   dash.ID,
-			ParentVersion: dash.Version,
-			RestoredFrom:  cmd.RestoredFrom,
-			Version:       dash.Version,
-			Created:       time.Now(),
-			CreatedBy:     dash.UpdatedBy,
-			Message:       cmd.Message,
-			Data:          dash.Data,
-		}
-		require.NoError(t, err)
-
-		if affectedRows, err := sess.Insert(dashVersion); err != nil {
-			return err
-		} else if affectedRows == 0 {
-			return dashboards.ErrDashboardNotFound
-		}
-
-		return nil
-	})
-	require.NoError(t, err)
-
-	return dash
-}
diff --git a/pkg/services/alerting/test_notification.go b/pkg/services/alerting/test_notification.go
deleted file mode 100644
index e844b2d1a57d6..0000000000000
--- a/pkg/services/alerting/test_notification.go
+++ /dev/null
@@ -1,92 +0,0 @@
-package alerting
-
-import (
-	"context"
-	"fmt"
-	"math/rand"
-	"net/http"
-
-	"github.com/grafana/grafana/pkg/components/null"
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/annotations/annotationstest"
-)
-
-// NotificationTestCommand initiates an test
-// execution of an alert notification.
-type NotificationTestCommand struct {
-	OrgID          int64
-	ID             int64
-	State          models.AlertStateType
-	Name           string
-	Type           string
-	Settings       *simplejson.Json
-	SecureSettings map[string]string
-}
-
-var (
-	logger = log.New("alerting.testnotification")
-)
-
-func (s *AlertNotificationService) HandleNotificationTestCommand(ctx context.Context, cmd *NotificationTestCommand) error {
-	notificationSvc := newNotificationService(nil, nil, nil, nil)
-
-	model := models.AlertNotification{
-		ID:       cmd.ID,
-		OrgID:    cmd.OrgID,
-		Name:     cmd.Name,
-		Type:     cmd.Type,
-		Settings: cmd.Settings,
-	}
-
-	notifier, err := s.createNotifier(ctx, &model, cmd.SecureSettings)
-	if err != nil {
-		return err
-	}
-
-	return notificationSvc.sendNotifications(createTestEvalContext(cmd), notifierStateSlice{{notifier: notifier}})
-}
-
-func createTestEvalContext(cmd *NotificationTestCommand) *EvalContext {
-	testRule := &Rule{
-		DashboardID: 1,
-		PanelID:     1,
-		Name:        "Test notification",
-		Message:     "Someone is testing the alert notification within Grafana.",
-		State:       models.AlertStateAlerting,
-		ID:          rand.Int63(),
-	}
-
-	ctx := NewEvalContext(context.Background(), testRule, fakeRequestValidator{}, nil, nil, nil, annotationstest.NewFakeAnnotationsRepo())
-	if cmd.Settings.Get("uploadImage").MustBool(true) {
-		ctx.ImagePublicURL = "https://grafana.com/static/assets/img/blog/mixed_styles.png"
-	}
-	ctx.IsTestRun = true
-	ctx.Firing = true
-	ctx.Error = fmt.Errorf("this is only a test")
-	ctx.EvalMatches = evalMatchesBasedOnState()
-
-	return ctx
-}
-
-func evalMatchesBasedOnState() []*EvalMatch {
-	matches := make([]*EvalMatch, 0)
-	matches = append(matches, &EvalMatch{
-		Metric: "High value",
-		Value:  null.FloatFrom(100),
-	})
-
-	matches = append(matches, &EvalMatch{
-		Metric: "Higher Value",
-		Value:  null.FloatFrom(200),
-	})
-
-	return matches
-}
-
-type fakeRequestValidator struct{}
-
-func (fakeRequestValidator) Validate(_ string, _ *http.Request) error {
-	return nil
-}
diff --git a/pkg/services/alerting/test_rule.go b/pkg/services/alerting/test_rule.go
deleted file mode 100644
index c73f9d7b39742..0000000000000
--- a/pkg/services/alerting/test_rule.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package alerting
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/annotations/annotationstest"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/user"
-)
-
-// AlertTest makes a test alert.
-func (e *AlertEngine) AlertTest(orgID int64, dashboard *simplejson.Json, panelID int64, user *user.SignedInUser) (*EvalContext, error) {
-	dash := dashboards.NewDashboardFromJson(dashboard)
-	dashInfo := DashAlertInfo{
-		User:  user,
-		Dash:  dash,
-		OrgID: orgID,
-	}
-	alerts, err := e.dashAlertExtractor.GetAlerts(context.Background(), dashInfo)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, alert := range alerts {
-		if alert.PanelID != panelID {
-			continue
-		}
-		rule, err := NewRuleFromDBAlert(context.Background(), e.AlertStore, alert, true)
-		if err != nil {
-			return nil, err
-		}
-
-		handler := NewEvalHandler(e.DataService)
-
-		context := NewEvalContext(context.Background(), rule, fakeRequestValidator{}, e.AlertStore, nil, e.datasourceService, annotationstest.NewFakeAnnotationsRepo())
-		context.IsTestRun = true
-		context.IsDebug = true
-
-		handler.Eval(context)
-		context.Rule.State = context.GetNewState()
-		return context, nil
-	}
-
-	return nil, fmt.Errorf("could not find alert with panel ID %d", panelID)
-}
diff --git a/pkg/services/alerting/testdata/collapsed-panels.json b/pkg/services/alerting/testdata/collapsed-panels.json
deleted file mode 100644
index cf0df1f04979e..0000000000000
--- a/pkg/services/alerting/testdata/collapsed-panels.json
+++ /dev/null
@@ -1,596 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "id": 127,
-  "links": [],
-  "panels": [
-    {
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "id": 9,
-      "title": "Row title",
-      "type": "row"
-    },
-    {
-      "alert": {
-        "conditions": [
-          {
-            "evaluator": {
-              "params": [
-                200
-              ],
-              "type": "gt"
-            },
-            "operator": {
-              "type": "and"
-            },
-            "query": {
-              "params": [
-                "A",
-                "5m",
-                "now"
-              ]
-            },
-            "reducer": {
-              "params": [],
-              "type": "avg"
-            },
-            "type": "query"
-          }
-        ],
-        "executionErrorState": "alerting",
-        "frequency": "10s",
-        "handler": 1,
-        "name": "Panel Title alert",
-        "noDataState": "no_data",
-        "notifications": []
-      },
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "Prometheus",
-      "fill": 1,
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 0,
-        "y": 1
-      },
-      "id": 10,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "go_goroutines",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "{{job}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [
-        {
-          "colorMode": "critical",
-          "fill": true,
-          "line": true,
-          "op": "gt",
-          "value": 200
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel Title",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ]
-    },
-    {
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 12,
-        "y": 1
-      },
-      "id": 14,
-      "limit": 10,
-      "links": [],
-      "onlyAlertsOnDashboard": true,
-      "show": "current",
-      "sortOrder": 1,
-      "stateFilter": [],
-      "title": "Panel Title",
-      "type": "alertlist"
-    },
-    {
-      "collapsed": true,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 10
-      },
-      "id": 6,
-      "panels": [
-        {
-          "alert": {
-            "conditions": [
-              {
-                "evaluator": {
-                  "params": [
-                    200
-                  ],
-                  "type": "gt"
-                },
-                "operator": {
-                  "type": "and"
-                },
-                "query": {
-                  "params": [
-                    "A",
-                    "5m",
-                    "now"
-                  ]
-                },
-                "reducer": {
-                  "params": [],
-                  "type": "avg"
-                },
-                "type": "query"
-              }
-            ],
-            "executionErrorState": "alerting",
-            "frequency": "10s",
-            "handler": 1,
-            "name": "Panel 2 alert",
-            "noDataState": "no_data",
-            "notifications": []
-          },
-          "aliasColors": {},
-          "bars": false,
-          "dashLength": 10,
-          "dashes": false,
-          "datasource": "Prometheus",
-          "fill": 1,
-          "gridPos": {
-            "h": 9,
-            "w": 12,
-            "x": 0,
-            "y": 11
-          },
-          "id": 11,
-          "legend": {
-            "avg": false,
-            "current": false,
-            "max": false,
-            "min": false,
-            "show": true,
-            "total": false,
-            "values": false
-          },
-          "lines": true,
-          "linewidth": 1,
-          "links": [],
-          "nullPointMode": "null",
-          "percentage": false,
-          "pointradius": 5,
-          "points": false,
-          "renderer": "flot",
-          "seriesOverrides": [],
-          "spaceLength": 10,
-          "stack": false,
-          "steppedLine": false,
-          "targets": [
-            {
-              "expr": "go_goroutines",
-              "format": "time_series",
-              "intervalFactor": 1,
-              "legendFormat": "{{job}}",
-              "refId": "A"
-            }
-          ],
-          "thresholds": [
-            {
-              "colorMode": "critical",
-              "fill": true,
-              "line": true,
-              "op": "gt",
-              "value": 200
-            }
-          ],
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "Panel 2",
-          "tooltip": {
-            "shared": true,
-            "sort": 0,
-            "value_type": "individual"
-          },
-          "type": "graph",
-          "xaxis": {
-            "buckets": null,
-            "mode": "time",
-            "name": null,
-            "show": true,
-            "values": []
-          },
-          "yaxes": [
-            {
-              "format": "short",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
-            },
-            {
-              "format": "short",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
-            }
-          ]
-        },
-        {
-          "alert": {
-            "conditions": [
-              {
-                "evaluator": {
-                  "params": [
-                    200
-                  ],
-                  "type": "gt"
-                },
-                "operator": {
-                  "type": "and"
-                },
-                "query": {
-                  "params": [
-                    "A",
-                    "5m",
-                    "now"
-                  ]
-                },
-                "reducer": {
-                  "params": [],
-                  "type": "avg"
-                },
-                "type": "query"
-              }
-            ],
-            "executionErrorState": "alerting",
-            "frequency": "10s",
-            "handler": 1,
-            "name": "Panel 4 alert",
-            "noDataState": "no_data",
-            "notifications": []
-          },
-          "aliasColors": {},
-          "bars": false,
-          "dashLength": 10,
-          "dashes": false,
-          "datasource": "Prometheus",
-          "fill": 1,
-          "gridPos": {
-            "h": 9,
-            "w": 12,
-            "x": 12,
-            "y": 11
-          },
-          "id": 15,
-          "legend": {
-            "avg": false,
-            "current": false,
-            "max": false,
-            "min": false,
-            "show": true,
-            "total": false,
-            "values": false
-          },
-          "lines": true,
-          "linewidth": 1,
-          "links": [],
-          "nullPointMode": "null",
-          "percentage": false,
-          "pointradius": 5,
-          "points": false,
-          "renderer": "flot",
-          "seriesOverrides": [],
-          "spaceLength": 10,
-          "stack": false,
-          "steppedLine": false,
-          "targets": [
-            {
-              "expr": "go_goroutines",
-              "format": "time_series",
-              "intervalFactor": 1,
-              "legendFormat": "{{job}}",
-              "refId": "A"
-            }
-          ],
-          "thresholds": [
-            {
-              "colorMode": "critical",
-              "fill": true,
-              "line": true,
-              "op": "gt",
-              "value": 200
-            }
-          ],
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "Panel 4",
-          "tooltip": {
-            "shared": true,
-            "sort": 0,
-            "value_type": "individual"
-          },
-          "type": "graph",
-          "xaxis": {
-            "buckets": null,
-            "mode": "time",
-            "name": null,
-            "show": true,
-            "values": []
-          },
-          "yaxes": [
-            {
-              "format": "short",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
-            },
-            {
-              "format": "short",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
-            }
-          ]
-        }
-      ],
-      "title": "Row title",
-      "type": "row"
-    },
-    {
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 11
-      },
-      "id": 4,
-      "title": "Row title",
-      "type": "row"
-    },
-    {
-      "alert": {
-        "conditions": [
-          {
-            "evaluator": {
-              "params": [
-                200
-              ],
-              "type": "gt"
-            },
-            "operator": {
-              "type": "and"
-            },
-            "query": {
-              "params": [
-                "A",
-                "5m",
-                "now"
-              ]
-            },
-            "reducer": {
-              "params": [],
-              "type": "avg"
-            },
-            "type": "query"
-          }
-        ],
-        "executionErrorState": "alerting",
-        "frequency": "10s",
-        "handler": 1,
-        "name": "Panel 3 alert",
-        "noDataState": "no_data",
-        "notifications": []
-      },
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "Prometheus",
-      "fill": 1,
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 0,
-        "y": 12
-      },
-      "id": 12,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "go_goroutines",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "{{job}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [
-        {
-          "colorMode": "critical",
-          "fill": true,
-          "line": true,
-          "op": "gt",
-          "value": 200
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel 3",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ]
-    }
-  ],
-  "schemaVersion": 16,
-  "tags": [],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-6h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": [
-      "5s",
-      "10s",
-      "30s",
-      "1m",
-      "5m",
-      "15m",
-      "30m",
-      "1h",
-      "2h",
-      "1d"
-    ],
-    "time_options": [
-      "5m",
-      "15m",
-      "1h",
-      "6h",
-      "12h",
-      "24h",
-      "2d",
-      "7d",
-      "30d"
-    ]
-  },
-  "timezone": "",
-  "title": "New dashboard Copy",
-  "uid": "6v5pg36zk",
-  "version": 17
-}
diff --git a/pkg/services/alerting/testdata/dash-without-id.json b/pkg/services/alerting/testdata/dash-without-id.json
deleted file mode 100644
index afea526b7afb5..0000000000000
--- a/pkg/services/alerting/testdata/dash-without-id.json
+++ /dev/null
@@ -1,282 +0,0 @@
-{
-    "title": "Influxdb",
-    "tags": [
-      "apa"
-    ],
-      "timezone": "browser",
-    "editable": true,
-    "sharedCrosshair": false,
-    "rows": [
-      {
-        "collapse": false,
-        "editable": true,
-        "height": "450px",
-        "panels": [
-          {
-            "alert": {
-              "conditions": [
-                {
-                  "evaluator": {
-                    "params": [
-                      10
-                    ],
-                    "type": "gt"
-                  },
-                  "query": {
-                    "params": [
-                      "B",
-                      "5m",
-                      "now"
-                    ]
-                  },
-                  "reducer": {
-                    "params": [],
-                    "type": "avg"
-                  },
-                  "type": "query"
-                }
-              ],
-              "frequency": "3s",
-              "handler": 1,
-              "name": "Influxdb",
-              "noDataState": "no_data",
-              "notifications": [
-                {
-                  "uid": "notifier1"
-                },
-                {
-                  "id": 2
-                }
-              ]
-            },
-            "alerting": {},
-            "aliasColors": {
-              "logins.count.count": "#890F02"
-            },
-            "bars": false,
-            "datasource": "InfluxDB",
-            "editable": true,
-            "error": false,
-            "fill": 1,
-            "grid": {},
-            "id": 1,
-            "interval": ">10s",
-            "isNew": true,
-            "legend": {
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 2,
-            "links": [],
-            "nullPointMode": "connected",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "span": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "groupBy": [
-                  {
-                    "params": [
-                      "$interval"
-                    ],
-                    "type": "time"
-                  },
-                  {
-                    "params": [
-                      "datacenter"
-                    ],
-                    "type": "tag"
-                  },
-                  {
-                    "params": [
-                      "none"
-                    ],
-                    "type": "fill"
-                  }
-                ],
-                "hide": false,
-                "measurement": "logins.count",
-                "policy": "default",
-                "query": "SELECT 8 * count(\"value\") FROM \"logins.count\" WHERE $timeFilter GROUP BY time($interval), \"datacenter\" fill(none)",
-                "rawQuery": true,
-                "refId": "B",
-                "resultFormat": "time_series",
-                "select": [
-                  [
-                    {
-                      "params": [
-                        "value"
-                      ],
-                      "type": "field"
-                    },
-                    {
-                      "params": [],
-                      "type": "count"
-                    }
-                  ]
-                ],
-                "tags": []
-              },
-              {
-                "groupBy": [
-                  {
-                    "params": [
-                      "$interval"
-                    ],
-                    "type": "time"
-                  },
-                  {
-                    "params": [
-                      "null"
-                    ],
-                    "type": "fill"
-                  }
-                ],
-                "hide": true,
-                "measurement": "cpu",
-                "policy": "default",
-                "refId": "A",
-                "resultFormat": "time_series",
-                "select": [
-                  [
-                    {
-                      "params": [
-                        "value"
-                      ],
-                      "type": "field"
-                    },
-                    {
-                      "params": [],
-                      "type": "mean"
-                    }
-                  ],
-                  [
-                    {
-                      "params": [
-                        "value"
-                      ],
-                      "type": "field"
-                    },
-                    {
-                      "params": [],
-                      "type": "sum"
-                    }
-                  ]
-                ],
-                "tags": []
-              }
-            ],
-            "thresholds": [
-              {
-                "colorMode": "critical",
-                "fill": true,
-                "line": true,
-                "op": "gt",
-                "value": 10
-              }
-            ],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Panel Title",
-            "tooltip": {
-              "msResolution": false,
-              "ordering": "alphabetical",
-              "shared": true,
-              "sort": 0,
-              "value_type": "cumulative"
-            },
-            "type": "graph",
-            "xaxis": {
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              }
-            ]
-          },
-          {
-            "editable": true,
-            "error": false,
-            "id": 2,
-            "isNew": true,
-            "limit": 10,
-            "links": [],
-            "show": "current",
-            "span": 2,
-            "stateFilter": [
-              "alerting"
-            ],
-            "title": "Alert status",
-            "type": "alertlist"
-          }
-        ],
-        "title": "Row"
-      }
-    ],
-    "time": {
-      "from": "now-5m",
-      "to": "now"
-    },
-    "timepicker": {
-      "now": true,
-      "refresh_intervals": [
-        "5s",
-        "10s",
-        "30s",
-        "1m",
-        "5m",
-        "15m",
-        "30m",
-        "1h",
-        "2h",
-        "1d"
-      ],
-      "time_options": [
-        "5m",
-        "15m",
-        "1h",
-        "6h",
-        "12h",
-        "24h",
-        "2d",
-        "7d",
-        "30d"
-      ]
-    },
-    "templating": {
-      "list": []
-    },
-    "annotations": {
-      "list": []
-    },
-    "schemaVersion": 13,
-    "version": 120,
-    "links": [],
-    "gnetId": null
-  }
diff --git a/pkg/services/alerting/testdata/graphite-alert.json b/pkg/services/alerting/testdata/graphite-alert.json
deleted file mode 100644
index 3cb4ae1dd2236..0000000000000
--- a/pkg/services/alerting/testdata/graphite-alert.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-    "id": 57,
-    "title": "Graphite 4",
-    "originalTitle": "Graphite 4",
-    "tags": ["graphite"],
-    "rows": [
-    {
-      "panels": [
-      {
-        "title": "Active desktop users",
-        "editable": true,
-        "type": "graph",
-        "id": 3,
-        "targets": [
-        {
-          "refId": "A",
-          "target": "aliasByNode(statsd.fakesite.counters.session_start.desktop.count, 4)"
-        }
-        ],
-        "datasource": null,
-        "alert": {
-          "name": "name1",
-          "message": "desc1",
-          "handler": 1,
-          "frequency": "60s",
-          "for": "2m",
-          "conditions": [
-          {
-            "type": "query",
-            "query": {"params": ["A", "5m", "now"]},
-            "reducer": {"type": "avg", "params": []},
-            "evaluator": {"type": ">", "params": [100]}
-          }
-          ]
-        }
-      },
-      {
-        "title": "Active mobile users",
-        "id": 4,
-        "targets": [
-          {"refId": "A", "target": ""},
-          {"refId": "B", "target": "aliasByNode(statsd.fakesite.counters.session_start.mobile.count, 4)"}
-        ],
-        "datasource": "graphite2",
-        "alert": {
-          "name": "name2",
-          "message": "desc2",
-          "handler": 0,
-          "frequency": "60s",
-          "severity": "warning",
-          "conditions": [
-          {
-            "type": "query",
-            "query":  {"params": ["B", "5m", "now"]},
-            "reducer": {"type": "avg", "params": []},
-            "evaluator": {"type": ">", "params": [100]}
-          }
-          ]
-        }
-      }
-      ]
-    }
-  ]
-  }
\ No newline at end of file
diff --git a/pkg/services/alerting/testdata/influxdb-alert.json b/pkg/services/alerting/testdata/influxdb-alert.json
deleted file mode 100644
index f835778ab47df..0000000000000
--- a/pkg/services/alerting/testdata/influxdb-alert.json
+++ /dev/null
@@ -1,283 +0,0 @@
-{
-    "id": 4,
-    "title": "Influxdb",
-    "tags": [
-      "apa"
-    ],
-      "timezone": "browser",
-    "editable": true,
-    "sharedCrosshair": false,
-    "rows": [
-      {
-        "collapse": false,
-        "editable": true,
-        "height": "450px",
-        "panels": [
-          {
-            "alert": {
-              "conditions": [
-                {
-                  "evaluator": {
-                    "params": [
-                      10
-                    ],
-                    "type": "gt"
-                  },
-                  "query": {
-                    "params": [
-                      "B",
-                      "5m",
-                      "now"
-                    ]
-                  },
-                  "reducer": {
-                    "params": [],
-                    "type": "avg"
-                  },
-                  "type": "query"
-                }
-              ],
-              "frequency": "3s",
-              "handler": 1,
-              "name": "Influxdb",
-              "noDataState": "no_data",
-              "notifications": [
-                {
-                  "id": 1
-                },
-                {
-                  "uid": "notifier2"
-                }
-              ]
-            },
-            "alerting": {},
-            "aliasColors": {
-              "logins.count.count": "#890F02"
-            },
-            "bars": false,
-            "datasource": "InfluxDB",
-            "editable": true,
-            "error": false,
-            "fill": 1,
-            "grid": {},
-            "id": 1,
-            "interval": ">10s",
-            "isNew": true,
-            "legend": {
-              "avg": false,
-              "current": false,
-              "max": false,
-              "min": false,
-              "show": true,
-              "total": false,
-              "values": false
-            },
-            "lines": true,
-            "linewidth": 2,
-            "links": [],
-            "nullPointMode": "connected",
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "span": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "groupBy": [
-                  {
-                    "params": [
-                      "$interval"
-                    ],
-                    "type": "time"
-                  },
-                  {
-                    "params": [
-                      "datacenter"
-                    ],
-                    "type": "tag"
-                  },
-                  {
-                    "params": [
-                      "none"
-                    ],
-                    "type": "fill"
-                  }
-                ],
-                "hide": false,
-                "measurement": "logins.count",
-                "policy": "default",
-                "query": "SELECT 8 * count(\"value\") FROM \"logins.count\" WHERE $timeFilter GROUP BY time($interval), \"datacenter\" fill(none)",
-                "rawQuery": true,
-                "refId": "B",
-                "resultFormat": "time_series",
-                "select": [
-                  [
-                    {
-                      "params": [
-                        "value"
-                      ],
-                      "type": "field"
-                    },
-                    {
-                      "params": [],
-                      "type": "count"
-                    }
-                  ]
-                ],
-                "tags": []
-              },
-              {
-                "groupBy": [
-                  {
-                    "params": [
-                      "$interval"
-                    ],
-                    "type": "time"
-                  },
-                  {
-                    "params": [
-                      "null"
-                    ],
-                    "type": "fill"
-                  }
-                ],
-                "hide": true,
-                "measurement": "cpu",
-                "policy": "default",
-                "refId": "A",
-                "resultFormat": "time_series",
-                "select": [
-                  [
-                    {
-                      "params": [
-                        "value"
-                      ],
-                      "type": "field"
-                    },
-                    {
-                      "params": [],
-                      "type": "mean"
-                    }
-                  ],
-                  [
-                    {
-                      "params": [
-                        "value"
-                      ],
-                      "type": "field"
-                    },
-                    {
-                      "params": [],
-                      "type": "sum"
-                    }
-                  ]
-                ],
-                "tags": []
-              }
-            ],
-            "thresholds": [
-              {
-                "colorMode": "critical",
-                "fill": true,
-                "line": true,
-                "op": "gt",
-                "value": 10
-              }
-            ],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Panel Title",
-            "tooltip": {
-              "msResolution": false,
-              "ordering": "alphabetical",
-              "shared": true,
-              "sort": 0,
-              "value_type": "cumulative"
-            },
-            "type": "graph",
-            "xaxis": {
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              }
-            ]
-          },
-          {
-            "editable": true,
-            "error": false,
-            "id": 2,
-            "isNew": true,
-            "limit": 10,
-            "links": [],
-            "show": "current",
-            "span": 2,
-            "stateFilter": [
-              "alerting"
-            ],
-            "title": "Alert status",
-            "type": "alertlist"
-          }
-        ],
-        "title": "Row"
-      }
-    ],
-    "time": {
-      "from": "now-5m",
-      "to": "now"
-    },
-    "timepicker": {
-      "now": true,
-      "refresh_intervals": [
-        "5s",
-        "10s",
-        "30s",
-        "1m",
-        "5m",
-        "15m",
-        "30m",
-        "1h",
-        "2h",
-        "1d"
-      ],
-      "time_options": [
-        "5m",
-        "15m",
-        "1h",
-        "6h",
-        "12h",
-        "24h",
-        "2d",
-        "7d",
-        "30d"
-      ]
-    },
-    "templating": {
-      "list": []
-    },
-    "annotations": {
-      "list": []
-    },
-    "schemaVersion": 13,
-    "version": 120,
-    "links": [],
-    "gnetId": null
-  }
diff --git a/pkg/services/alerting/testdata/panel-with-bad-query-id.json b/pkg/services/alerting/testdata/panel-with-bad-query-id.json
deleted file mode 100644
index 2907ed4d94acf..0000000000000
--- a/pkg/services/alerting/testdata/panel-with-bad-query-id.json
+++ /dev/null
@@ -1,184 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "id": 436,
-  "links": [],
-  "panels": [
-    {
-      "alert": {
-        "alertRuleTags": {},
-        "conditions": [
-          {
-            "evaluator": {
-              "params": [
-                3
-              ],
-              "type": "gt"
-            },
-            "operator": {
-              "type": "and"
-            },
-            "query": {
-              "params": [
-                "B",
-                "15s",
-                "now"
-              ]
-            },
-            "reducer": {
-              "params": [],
-              "type": "last"
-            },
-            "type": "query"
-          }
-        ],
-        "executionErrorState": "alerting",
-        "for": "0m",
-        "frequency": "10s",
-        "handler": 1,
-        "message": "A message",
-        "name": "Ok / Alerting Cycle test default datasource",
-        "noDataState": "no_data",
-        "notifications": []
-      },
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "links": []
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 2,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "7.4.0-pre",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "pulseWave": {
-            "offCount": 6,
-            "offValue": "2",
-            "onCount": 6,
-            "onValue": "4",
-            "timeStep": 10
-          },
-          "refId": "A",
-          "scenarioId": "predictable_pulse",
-          "stringInput": ""
-        }
-      ],
-      "thresholds": [
-        {
-          "colorMode": "critical",
-          "fill": true,
-          "line": true,
-          "op": "gt",
-          "value": 3
-        }
-      ],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Alerting / Ok",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "$$hashKey": "object:536",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "$$hashKey": "object:537",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    }
-  ],
-  "schemaVersion": 27,
-  "tags": [],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-6h",
-    "to": "now"
-  },
-  "timepicker": {},
-  "timezone": "",
-  "title": "extractor test default datasource",
-  "uid": "bqQguKaMz",
-  "version": 7
-}
diff --git a/pkg/services/alerting/testdata/panel-with-datasource-ref.json b/pkg/services/alerting/testdata/panel-with-datasource-ref.json
deleted file mode 100644
index 225f60b0fa0fe..0000000000000
--- a/pkg/services/alerting/testdata/panel-with-datasource-ref.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "id": 57,
-  "title": "Graphite 4",
-  "originalTitle": "Graphite 4",
-  "tags": ["graphite"],
-  "panels": [
-    {
-      "title": "Active desktop users",
-      "id": 2,
-      "editable": true,
-      "type": "graph",
-      "targets": [
-        {
-          "refId": "A",
-          "target": "aliasByNode(statsd.fakesite.counters.session_start.desktop.count, 4)"
-        }
-      ],
-      "datasource": {
-        "uid": "graphite2-uid",
-        "type": "graphite"
-      },
-      "alert": {
-        "name": "name1",
-        "message": "desc1",
-        "handler": 1,
-        "frequency": "60s",
-        "conditions": [
-          {
-            "type": "query",
-            "query": { "params": ["A", "5m", "now"] },
-            "reducer": { "type": "avg", "params": [] },
-            "evaluator": { "type": ">", "params": [100] }
-          }
-        ]
-      }
-    }
-  ]
-}
diff --git a/pkg/services/alerting/testdata/panel-with-id-0.json b/pkg/services/alerting/testdata/panel-with-id-0.json
deleted file mode 100644
index d1f314a4f559b..0000000000000
--- a/pkg/services/alerting/testdata/panel-with-id-0.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  "id": 57,
-  "title": "Graphite 4",
-  "originalTitle": "Graphite 4",
-  "tags": ["graphite"],
-  "rows": [
-  {
-    "panels": [
-    {
-      "title": "Active desktop users",
-      "id": 0,
-      "editable": true,
-      "type": "graph",
-      "targets": [
-      {
-        "refId": "A",
-        "target": "aliasByNode(statsd.fakesite.counters.session_start.desktop.count, 4)"
-      }
-      ],
-      "datasource": null,
-      "alert": {
-        "name": "name1",
-        "message": "desc1",
-        "handler": 1,
-        "frequency": "60s",
-        "conditions": [
-        {
-          "type": "query",
-          "query": {"params": ["A", "5m", "now"]},
-          "reducer": {"type": "avg", "params": []},
-          "evaluator": {"type": ">", "params": [100]}
-        }
-        ]
-      }
-    },
-    {
-      "title": "Active mobile users",
-      "id": 4,
-      "targets": [
-        {"refId": "A", "target": ""},
-        {"refId": "B", "target": "aliasByNode(statsd.fakesite.counters.session_start.mobile.count, 4)"}
-      ],
-      "datasource": "graphite2",
-      "alert": {
-        "name": "name2",
-        "message": "desc2",
-        "handler": 0,
-        "frequency": "60s",
-        "severity": "warning",
-        "conditions": [
-        {
-          "type": "query",
-          "query":  {"params": ["B", "5m", "now"]},
-          "reducer": {"type": "avg", "params": []},
-          "evaluator": {"type": ">", "params": [100]}
-        }
-        ]
-      }
-    }
-    ]
-  }
-]
-      }
diff --git a/pkg/services/alerting/testdata/panel-without-specified-datasource.json b/pkg/services/alerting/testdata/panel-without-specified-datasource.json
deleted file mode 100644
index dfd814d20ee79..0000000000000
--- a/pkg/services/alerting/testdata/panel-without-specified-datasource.json
+++ /dev/null
@@ -1,184 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "id": 436,
-  "links": [],
-  "panels": [
-    {
-      "alert": {
-        "alertRuleTags": {},
-        "conditions": [
-          {
-            "evaluator": {
-              "params": [
-                3
-              ],
-              "type": "gt"
-            },
-            "operator": {
-              "type": "and"
-            },
-            "query": {
-              "params": [
-                "A",
-                "15s",
-                "now"
-              ]
-            },
-            "reducer": {
-              "params": [],
-              "type": "last"
-            },
-            "type": "query"
-          }
-        ],
-        "executionErrorState": "alerting",
-        "for": "0m",
-        "frequency": "10s",
-        "handler": 1,
-        "message": "A message",
-        "name": "Ok / Alerting Cycle test default datasource",
-        "noDataState": "no_data",
-        "notifications": []
-      },
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "links": []
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 2,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "7.4.0-pre",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "pulseWave": {
-            "offCount": 6,
-            "offValue": "2",
-            "onCount": 6,
-            "onValue": "4",
-            "timeStep": 10
-          },
-          "refId": "A",
-          "scenarioId": "predictable_pulse",
-          "stringInput": ""
-        }
-      ],
-      "thresholds": [
-        {
-          "colorMode": "critical",
-          "fill": true,
-          "line": true,
-          "op": "gt",
-          "value": 3
-        }
-      ],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Alerting / Ok",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "$$hashKey": "object:536",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "$$hashKey": "object:537",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    }
-  ],
-  "schemaVersion": 27,
-  "tags": [],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-6h",
-    "to": "now"
-  },
-  "timepicker": {},
-  "timezone": "",
-  "title": "extractor test default datasource",
-  "uid": "bqQguKaMz",
-  "version": 7
-}
\ No newline at end of file
diff --git a/pkg/services/alerting/testdata/panels-missing-id.json b/pkg/services/alerting/testdata/panels-missing-id.json
deleted file mode 100644
index dad96a18dc135..0000000000000
--- a/pkg/services/alerting/testdata/panels-missing-id.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "id": 57,
-    "title": "Graphite 4",
-    "originalTitle": "Graphite 4",
-    "tags": ["graphite"],
-    "rows": [
-    {
-      "panels": [
-      {
-        "title": "Active desktop users",
-        "editable": true,
-        "type": "graph",
-        "targets": [
-        {
-          "refId": "A",
-          "target": "aliasByNode(statsd.fakesite.counters.session_start.desktop.count, 4)"
-        }
-        ],
-        "datasource": null,
-        "alert": {
-          "name": "name1",
-          "message": "desc1",
-          "handler": 1,
-          "frequency": "60s",
-          "conditions": [
-          {
-            "type": "query",
-            "query": {"params": ["A", "5m", "now"]},
-            "reducer": {"type": "avg", "params": []},
-            "evaluator": {"type": ">", "params": [100]}
-          }
-          ]
-        }
-      },
-      {
-        "title": "Active mobile users",
-        "id": 4,
-        "targets": [
-          {"refId": "A", "target": ""},
-          {"refId": "B", "target": "aliasByNode(statsd.fakesite.counters.session_start.mobile.count, 4)"}
-        ],
-        "datasource": "graphite2",
-        "alert": {
-          "name": "name2",
-          "message": "desc2",
-          "handler": 0,
-          "frequency": "60s",
-          "severity": "warning",
-          "conditions": [
-          {
-            "type": "query",
-            "query":  {"params": ["B", "5m", "now"]},
-            "reducer": {"type": "avg", "params": []},
-            "evaluator": {"type": ">", "params": [100]}
-          }
-          ]
-        }
-      }
-      ]
-    }
-  ]
-        }
\ No newline at end of file
diff --git a/pkg/services/alerting/testdata/settings/empty.json b/pkg/services/alerting/testdata/settings/empty.json
deleted file mode 100644
index 9e26dfeeb6e64..0000000000000
--- a/pkg/services/alerting/testdata/settings/empty.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/pkg/services/alerting/testdata/settings/one_condition.json b/pkg/services/alerting/testdata/settings/one_condition.json
deleted file mode 100644
index 04c2d9b3da4fc..0000000000000
--- a/pkg/services/alerting/testdata/settings/one_condition.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "conditions": [
-        {
-            "evaluator": {
-                "params": [
-                    60
-                ],
-                "type": "gt"
-            },
-            "query": {
-                "datasourceId": 3,
-                "model": {
-                    "refId": "A",
-                    "scenario": "random_walk",
-                    "scenarioId": "csv_metric_values",
-                    "stringInput": "1,20,90,30,5,0",
-                    "target": ""
-                },
-                "params": [
-                    "A",
-                    "5m",
-                    "now"
-                ]
-            },
-            "reducer": {
-                "params": [],
-                "type": "avg"
-            },
-            "type": "query"
-        }
-    ],
-    "enabled": true,
-    "frequency": "60s",
-    "handler": 1,
-    "name": "TestData - Always OK",
-    "noDataState": "no_data",
-    "notifications": []
-}
\ No newline at end of file
diff --git a/pkg/services/alerting/testdata/settings/three_conditions.json b/pkg/services/alerting/testdata/settings/three_conditions.json
deleted file mode 100644
index a10f27ce1dd66..0000000000000
--- a/pkg/services/alerting/testdata/settings/three_conditions.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-    "conditions": [
-        {
-            "evaluator": {
-                "params": [
-                    60
-                ],
-                "type": "gt"
-            },
-            "query": {
-                "datasourceId": 3,
-                "model": {
-                    "refId": "A",
-                    "scenario": "random_walk",
-                    "scenarioId": "csv_metric_values",
-                    "stringInput": "1,20,90,30,5,0",
-                    "target": ""
-                },
-                "params": [
-                    "A",
-                    "5m",
-                    "now"
-                ]
-            },
-            "reducer": {
-                "params": [],
-                "type": "avg"
-            },
-            "type": "query"
-        },
-        {
-            "evaluator": {
-                "params": [
-                    60
-                ],
-                "type": "gt"
-            },
-            "query": {
-                "datasourceId": 2,
-                "model": {
-                    "refId": "A",
-                    "scenario": "random_walk",
-                    "scenarioId": "csv_metric_values",
-                    "stringInput": "1,20,90,30,5,0",
-                    "target": ""
-                },
-                "params": [
-                    "A",
-                    "5m",
-                    "now"
-                ]
-            },
-            "reducer": {
-                "params": [],
-                "type": "avg"
-            },
-            "type": "query"
-        },
-        {
-            "evaluator": {
-                "params": [
-                    60
-                ],
-                "type": "gt"
-            },
-            "query": {
-                "datasourceId": 4,
-                "model": {
-                    "refId": "A",
-                    "scenario": "random_walk",
-                    "scenarioId": "csv_metric_values",
-                    "stringInput": "1,20,90,30,5,0",
-                    "target": ""
-                },
-                "params": [
-                    "A",
-                    "5m",
-                    "now"
-                ]
-            },
-            "reducer": {
-                "params": [],
-                "type": "avg"
-            },
-            "type": "query"
-        }
-    ],
-    "enabled": true,
-    "frequency": "60s",
-    "handler": 1,
-    "name": "TestData - Always OK",
-    "noDataState": "no_data",
-    "notifications": []
-}
\ No newline at end of file
diff --git a/pkg/services/alerting/testdata/settings/two_conditions.json b/pkg/services/alerting/testdata/settings/two_conditions.json
deleted file mode 100644
index 54ae3952be373..0000000000000
--- a/pkg/services/alerting/testdata/settings/two_conditions.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "conditions": [
-        {
-            "evaluator": {
-                "params": [
-                    60
-                ],
-                "type": "gt"
-            },
-            "query": {
-                "datasourceId": 3,
-                "model": {
-                    "refId": "A",
-                    "scenario": "random_walk",
-                    "scenarioId": "csv_metric_values",
-                    "stringInput": "1,20,90,30,5,0",
-                    "target": ""
-                },
-                "params": [
-                    "A",
-                    "5m",
-                    "now"
-                ]
-            },
-            "reducer": {
-                "params": [],
-                "type": "avg"
-            },
-            "type": "query"
-        },
-        {
-            "evaluator": {
-                "params": [
-                    60
-                ],
-                "type": "gt"
-            },
-            "query": {
-                "datasourceId": 2,
-                "model": {
-                    "refId": "A",
-                    "scenario": "random_walk",
-                    "scenarioId": "csv_metric_values",
-                    "stringInput": "1,20,90,30,5,0",
-                    "target": ""
-                },
-                "params": [
-                    "A",
-                    "5m",
-                    "now"
-                ]
-            },
-            "reducer": {
-                "params": [],
-                "type": "avg"
-            },
-            "type": "query"
-        }
-    ],
-    "enabled": true,
-    "frequency": "60s",
-    "handler": 1,
-    "name": "TestData - Always OK",
-    "noDataState": "no_data",
-    "notifications": []
-}
\ No newline at end of file
diff --git a/pkg/services/alerting/testdata/v5-dashboard.json b/pkg/services/alerting/testdata/v5-dashboard.json
deleted file mode 100644
index da7bbd8d04856..0000000000000
--- a/pkg/services/alerting/testdata/v5-dashboard.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    "id": 57,
-    "title": "Graphite 4",
-    "originalTitle": "Graphite 4",
-    "tags": ["graphite"],
-      "panels": [
-      {
-        "title": "Active desktop users",
-        "editable": true,
-        "type": "graph",
-        "id": 3,
-        "targets": [
-        {
-          "refId": "A",
-          "target": "aliasByNode(statsd.fakesite.counters.session_start.desktop.count, 4)"
-        }
-        ],
-        "datasource": null,
-        "alert": {
-          "name": "name1",
-          "message": "desc1",
-          "handler": 1,
-          "frequency": "60s",
-          "conditions": [
-          {
-            "type": "query",
-            "query": {"params": ["A", "5m", "now"]},
-            "reducer": {"type": "avg", "params": []},
-            "evaluator": {"type": ">", "params": [100]}
-          }
-          ]
-        }
-      },
-      {
-        "title": "Active mobile users",
-        "id": 4,
-        "targets": [
-          {"refId": "A", "target": ""},
-          {"refId": "B", "target": "aliasByNode(statsd.fakesite.counters.session_start.mobile.count, 4)"}
-        ],
-        "datasource": "graphite2",
-        "alert": {
-          "name": "name2",
-          "message": "desc2",
-          "handler": 0,
-          "frequency": "60s",
-          "severity": "warning",
-          "conditions": [
-          {
-            "type": "query",
-            "query":  {"params": ["B", "5m", "now"]},
-            "reducer": {"type": "avg", "params": []},
-            "evaluator": {"type": ">", "params": [100]}
-          }
-          ]
-        }
-
-    }
-  ]
-  }
\ No newline at end of file
diff --git a/pkg/services/annotations/accesscontrol/accesscontrol.go b/pkg/services/annotations/accesscontrol/accesscontrol.go
new file mode 100644
index 0000000000000..d0d22703414cf
--- /dev/null
+++ b/pkg/services/annotations/accesscontrol/accesscontrol.go
@@ -0,0 +1,180 @@
+package accesscontrol
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/infra/db"
+	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/annotations"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/sqlstore/permissions"
+	"github.com/grafana/grafana/pkg/services/sqlstore/searchstore"
+	"github.com/grafana/grafana/pkg/util/errutil"
+)
+
+var (
+	ErrReadForbidden = errutil.NewBase(
+		errutil.StatusForbidden,
+		"annotations.accesscontrol.read",
+		errutil.WithPublicMessage("User missing permissions"),
+	)
+	ErrAccessControlInternal = errutil.NewBase(
+		errutil.StatusInternal,
+		"annotations.accesscontrol.internal",
+		errutil.WithPublicMessage("Internal error while checking permissions"),
+	)
+)
+
+type AuthService struct {
+	db       db.DB
+	features featuremgmt.FeatureToggles
+}
+
+func NewAuthService(db db.DB, features featuremgmt.FeatureToggles) *AuthService {
+	return &AuthService{
+		db:       db,
+		features: features,
+	}
+}
+
+// Authorize checks if the user has permission to read annotations, then returns a struct containing dashboards and scope types that the user has access to.
+func (authz *AuthService) Authorize(ctx context.Context, orgID int64, query *annotations.ItemQuery) (*AccessResources, error) {
+	user := query.SignedInUser
+	if user == nil || user.IsNil() {
+		return nil, ErrReadForbidden.Errorf("missing user")
+	}
+
+	scopes, has := user.GetPermissions()[ac.ActionAnnotationsRead]
+	if !has {
+		return nil, ErrReadForbidden.Errorf("user does not have permission to read annotations")
+	}
+	scopeTypes := annotationScopeTypes(scopes)
+	_, canAccessOrgAnnotations := scopeTypes[annotations.Organization.String()]
+	_, canAccessDashAnnotations := scopeTypes[annotations.Dashboard.String()]
+	if authz.features.IsEnabled(ctx, featuremgmt.FlagAnnotationPermissionUpdate) {
+		canAccessDashAnnotations = true
+	}
+
+	var visibleDashboards map[string]int64
+	var err error
+	if canAccessDashAnnotations {
+		if query.AnnotationID != 0 {
+			annotationDashboardID, err := authz.getAnnotationDashboard(ctx, query, orgID)
+			if err != nil {
+				return nil, ErrAccessControlInternal.Errorf("failed to fetch annotations: %w", err)
+			}
+			query.DashboardID = annotationDashboardID
+		}
+
+		visibleDashboards, err = authz.dashboardsWithVisibleAnnotations(ctx, query, orgID)
+		if err != nil {
+			return nil, ErrAccessControlInternal.Errorf("failed to fetch dashboards: %w", err)
+		}
+	}
+
+	return &AccessResources{
+		Dashboards:               visibleDashboards,
+		CanAccessDashAnnotations: canAccessDashAnnotations,
+		CanAccessOrgAnnotations:  canAccessOrgAnnotations,
+	}, nil
+}
+
+func (authz *AuthService) getAnnotationDashboard(ctx context.Context, query *annotations.ItemQuery, orgID int64) (int64, error) {
+	var items []annotations.Item
+	params := make([]any, 0)
+	err := authz.db.WithDbSession(ctx, func(sess *db.Session) error {
+		sql := `
+			SELECT
+				a.id,
+				a.org_id,
+				a.dashboard_id
+			FROM annotation as a
+			WHERE a.org_id = ? AND a.id = ?
+			`
+		params = append(params, orgID, query.AnnotationID)
+
+		return sess.SQL(sql, params...).Find(&items)
+	})
+	if err != nil {
+		return 0, err
+	}
+	if len(items) == 0 {
+		return 0, ErrAccessControlInternal.Errorf("annotation not found")
+	}
+
+	return items[0].DashboardID, nil
+}
+
+func (authz *AuthService) dashboardsWithVisibleAnnotations(ctx context.Context, query *annotations.ItemQuery, orgID int64) (map[string]int64, error) {
+	recursiveQueriesSupported, err := authz.db.RecursiveQueriesAreSupported()
+	if err != nil {
+		return nil, err
+	}
+
+	filterType := searchstore.TypeDashboard
+	if authz.features.IsEnabled(ctx, featuremgmt.FlagAnnotationPermissionUpdate) {
+		filterType = searchstore.TypeAnnotation
+	}
+
+	filters := []any{
+		permissions.NewAccessControlDashboardPermissionFilter(query.SignedInUser, dashboardaccess.PERMISSION_VIEW, filterType, authz.features, recursiveQueriesSupported),
+		searchstore.OrgFilter{OrgId: orgID},
+	}
+
+	if query.DashboardUID != "" {
+		filters = append(filters, searchstore.DashboardFilter{
+			UIDs: []string{query.DashboardUID},
+		})
+	}
+	if query.DashboardID != 0 {
+		filters = append(filters, searchstore.DashboardIDFilter{
+			IDs: []int64{query.DashboardID},
+		})
+	}
+
+	sb := &searchstore.Builder{Dialect: authz.db.GetDialect(), Filters: filters, Features: authz.features}
+
+	visibleDashboards := make(map[string]int64)
+
+	var page int64 = 1
+	var limit int64 = 1000
+	for {
+		var res []dashboardProjection
+		sql, params := sb.ToSQL(limit, page)
+
+		err = authz.db.WithDbSession(ctx, func(sess *db.Session) error {
+			return sess.SQL(sql, params...).Find(&res)
+		})
+		if err != nil {
+			return nil, err
+		}
+
+		for _, p := range res {
+			visibleDashboards[p.UID] = p.ID
+		}
+
+		// if the result is less than the limit, we have reached the end
+		if len(res) < int(limit) {
+			break
+		}
+
+		page++
+	}
+
+	return visibleDashboards, nil
+}
+
+func annotationScopeTypes(scopes []string) map[any]struct{} {
+	allScopeTypes := map[any]struct{}{
+		annotations.Dashboard.String():    {},
+		annotations.Organization.String(): {},
+	}
+
+	types, hasWildcardScope := ac.ParseScopes(ac.ScopeAnnotationsProvider.GetResourceScopeType(""), scopes)
+	if hasWildcardScope {
+		types = allScopeTypes
+	}
+
+	return types
+}
diff --git a/pkg/services/annotations/accesscontrol/accesscontrol_test.go b/pkg/services/annotations/accesscontrol/accesscontrol_test.go
new file mode 100644
index 0000000000000..02674e42b2468
--- /dev/null
+++ b/pkg/services/annotations/accesscontrol/accesscontrol_test.go
@@ -0,0 +1,194 @@
+package accesscontrol
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/annotations"
+	"github.com/grafana/grafana/pkg/services/annotations/testutil"
+	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
+)
+
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
+func TestIntegrationAuthorize(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	sql := db.InitTestDB(t)
+
+	dash1 := testutil.CreateDashboard(t, sql, featuremgmt.WithFeatures(), dashboards.SaveDashboardCommand{
+		UserID: 1,
+		OrgID:  1,
+		Dashboard: simplejson.NewFromAny(map[string]any{
+			"title": "Dashboard 1",
+		}),
+	})
+
+	dash2 := testutil.CreateDashboard(t, sql, featuremgmt.WithFeatures(), dashboards.SaveDashboardCommand{
+		UserID: 1,
+		OrgID:  1,
+		Dashboard: simplejson.NewFromAny(map[string]any{
+			"title": "Dashboard 2",
+		}),
+	})
+
+	u := &user.SignedInUser{
+		UserID: 1,
+		OrgID:  1,
+	}
+	role := testutil.SetupRBACRole(t, sql, u)
+
+	type testCase struct {
+		name              string
+		permissions       map[string][]string
+		featureToggle     string
+		expectedResources *AccessResources
+		expectedErr       error
+	}
+
+	testCases := []testCase{
+		{
+			name: "should have both scopes and all dashboards",
+			permissions: map[string][]string{
+				accesscontrol.ActionAnnotationsRead: {accesscontrol.ScopeAnnotationsAll},
+				dashboards.ActionDashboardsRead:     {dashboards.ScopeDashboardsAll},
+			},
+			expectedResources: &AccessResources{
+				Dashboards:               map[string]int64{dash1.UID: dash1.ID, dash2.UID: dash2.ID},
+				CanAccessOrgAnnotations:  true,
+				CanAccessDashAnnotations: true,
+			},
+		},
+		{
+			name: "should have no dashboards if missing annotation read permission on dashboards and FlagAnnotationPermissionUpdate is enabled",
+			permissions: map[string][]string{
+				accesscontrol.ActionAnnotationsRead: {accesscontrol.ScopeAnnotationsAll},
+				dashboards.ActionDashboardsRead:     {dashboards.ScopeDashboardsAll},
+			},
+			featureToggle: featuremgmt.FlagAnnotationPermissionUpdate,
+			expectedResources: &AccessResources{
+				Dashboards:               nil,
+				CanAccessOrgAnnotations:  true,
+				CanAccessDashAnnotations: true,
+			},
+		},
+		{
+			name: "should have dashboard and organization scope and all dashboards if FlagAnnotationPermissionUpdate is enabled",
+			permissions: map[string][]string{
+				accesscontrol.ActionAnnotationsRead: {accesscontrol.ScopeAnnotationsTypeOrganization, dashboards.ScopeDashboardsAll},
+			},
+			featureToggle: featuremgmt.FlagAnnotationPermissionUpdate,
+			expectedResources: &AccessResources{
+				Dashboards:               map[string]int64{dash1.UID: dash1.ID, dash2.UID: dash2.ID},
+				CanAccessOrgAnnotations:  true,
+				CanAccessDashAnnotations: true,
+			},
+		},
+		{
+			name: "should have dashboard and organization scope and all dashboards if FlagAnnotationPermissionUpdate is enabled and folder based scope is used",
+			permissions: map[string][]string{
+				accesscontrol.ActionAnnotationsRead: {accesscontrol.ScopeAnnotationsTypeOrganization, dashboards.ScopeFoldersAll},
+			},
+			featureToggle: featuremgmt.FlagAnnotationPermissionUpdate,
+			expectedResources: &AccessResources{
+				Dashboards:               map[string]int64{dash1.UID: dash1.ID, dash2.UID: dash2.ID},
+				CanAccessOrgAnnotations:  true,
+				CanAccessDashAnnotations: true,
+			},
+		},
+		{
+			name: "should have only organization scope and no dashboards",
+			permissions: map[string][]string{
+				accesscontrol.ActionAnnotationsRead: {accesscontrol.ScopeAnnotationsTypeOrganization},
+				dashboards.ActionDashboardsRead:     {dashboards.ScopeDashboardsAll},
+			},
+			expectedResources: &AccessResources{
+				Dashboards:              nil,
+				CanAccessOrgAnnotations: true,
+			},
+		},
+		{
+			name: "should have only dashboard scope and all dashboards",
+			permissions: map[string][]string{
+				accesscontrol.ActionAnnotationsRead: {accesscontrol.ScopeAnnotationsTypeDashboard},
+				dashboards.ActionDashboardsRead:     {dashboards.ScopeDashboardsAll},
+			},
+			expectedResources: &AccessResources{
+				Dashboards:               map[string]int64{dash1.UID: dash1.ID, dash2.UID: dash2.ID},
+				CanAccessDashAnnotations: true,
+			},
+		},
+		{
+			name: "should have only dashboard scope and all dashboards if FlagAnnotationPermissionUpdate is enabled",
+			permissions: map[string][]string{
+				accesscontrol.ActionAnnotationsRead: {dashboards.ScopeDashboardsAll},
+			},
+			featureToggle: featuremgmt.FlagAnnotationPermissionUpdate,
+			expectedResources: &AccessResources{
+				Dashboards:               map[string]int64{dash1.UID: dash1.ID, dash2.UID: dash2.ID},
+				CanAccessOrgAnnotations:  false,
+				CanAccessDashAnnotations: true,
+			},
+		},
+		{
+			name: "should have only dashboard scope and only dashboard 1",
+			permissions: map[string][]string{
+				accesscontrol.ActionAnnotationsRead: {accesscontrol.ScopeAnnotationsTypeDashboard},
+				dashboards.ActionDashboardsRead:     {fmt.Sprintf("dashboards:uid:%s", dash1.UID)},
+			},
+			expectedResources: &AccessResources{
+				Dashboards:               map[string]int64{dash1.UID: dash1.ID},
+				CanAccessDashAnnotations: true,
+			},
+		},
+		{
+			name: "should have only dashboard scope and only dashboard 1 if FlagAnnotationPermissionUpdate is enabled",
+			permissions: map[string][]string{
+				accesscontrol.ActionAnnotationsRead: {dashboards.ScopeDashboardsProvider.GetResourceScopeUID(dash1.UID)},
+			},
+			featureToggle: featuremgmt.FlagAnnotationPermissionUpdate,
+			expectedResources: &AccessResources{
+				Dashboards:               map[string]int64{dash1.UID: dash1.ID},
+				CanAccessOrgAnnotations:  false,
+				CanAccessDashAnnotations: true,
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			u.Permissions = map[int64]map[string][]string{1: tc.permissions}
+			testutil.SetupRBACPermission(t, sql, role, u)
+
+			authz := NewAuthService(sql, featuremgmt.WithFeatures(tc.featureToggle))
+
+			query := &annotations.ItemQuery{SignedInUser: u}
+			resources, err := authz.Authorize(context.Background(), 1, query)
+			require.NoError(t, err)
+
+			if tc.expectedResources.Dashboards != nil {
+				require.Equal(t, tc.expectedResources.Dashboards, resources.Dashboards)
+			}
+
+			require.Equal(t, tc.expectedResources.CanAccessDashAnnotations, resources.CanAccessDashAnnotations)
+			require.Equal(t, tc.expectedResources.CanAccessOrgAnnotations, resources.CanAccessOrgAnnotations)
+
+			if tc.expectedErr != nil {
+				require.Equal(t, tc.expectedErr, err)
+			}
+		})
+	}
+}
diff --git a/pkg/services/annotations/accesscontrol/models.go b/pkg/services/annotations/accesscontrol/models.go
new file mode 100644
index 0000000000000..7b74de929d8e0
--- /dev/null
+++ b/pkg/services/annotations/accesscontrol/models.go
@@ -0,0 +1,16 @@
+package accesscontrol
+
+// AccessResources contains resources that are used to filter annotations based on RBAC.
+type AccessResources struct {
+	// Dashboards is a map of dashboard UIDs to IDs
+	Dashboards map[string]int64
+	// CanAccessDashAnnotations true if the user is allowed to access some dashboard annotations
+	CanAccessDashAnnotations bool
+	// CanAccessOrgAnnotations true if the user is allowed to access organization annotations
+	CanAccessOrgAnnotations bool
+}
+
+type dashboardProjection struct {
+	ID  int64  `xorm:"id"`
+	UID string `xorm:"uid"`
+}
diff --git a/pkg/services/annotations/annotationsimpl/annotations.go b/pkg/services/annotations/annotationsimpl/annotations.go
index 9929984db1f54..3cf88288d270b 100644
--- a/pkg/services/annotations/annotationsimpl/annotations.go
+++ b/pkg/services/annotations/annotationsimpl/annotations.go
@@ -3,6 +3,9 @@ package annotationsimpl
 import (
 	"context"
 
+	"github.com/grafana/grafana/pkg/services/annotations/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/annotations/annotationsimpl/loki"
+
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/annotations"
@@ -12,44 +15,71 @@ import (
 )
 
 type RepositoryImpl struct {
-	store store
+	db       db.DB
+	authZ    *accesscontrol.AuthService
+	features featuremgmt.FeatureToggles
+	reader   readStore
+	writer   writeStore
 }
 
-func ProvideService(db db.DB, cfg *setting.Cfg, features featuremgmt.FeatureToggles, tagService tag.Service) *RepositoryImpl {
+func ProvideService(
+	db db.DB,
+	cfg *setting.Cfg,
+	features featuremgmt.FeatureToggles,
+	tagService tag.Service,
+) *RepositoryImpl {
+	l := log.New("annotations")
+	l.Debug("Initializing annotations service")
+
+	xormStore := NewXormStore(cfg, log.New("annotations.sql"), db, tagService)
+	write := xormStore
+
+	var read readStore
+	historianStore := loki.NewLokiHistorianStore(cfg.UnifiedAlerting.StateHistory, features, db, log.New("annotations.loki"))
+	if historianStore != nil {
+		l.Debug("Using composite read store")
+		read = NewCompositeStore(log.New("annotations.composite"), xormStore, historianStore)
+	} else {
+		l.Debug("Using xorm read store")
+		read = write
+	}
+
 	return &RepositoryImpl{
-		store: &xormRepositoryImpl{
-			cfg:               cfg,
-			features:          features,
-			db:                db,
-			log:               log.New("annotations"),
-			tagService:        tagService,
-			maximumTagsLength: cfg.AnnotationMaximumTagsLength,
-		},
+		db:       db,
+		features: features,
+		authZ:    accesscontrol.NewAuthService(db, features),
+		reader:   read,
+		writer:   write,
 	}
 }
 
 func (r *RepositoryImpl) Save(ctx context.Context, item *annotations.Item) error {
-	return r.store.Add(ctx, item)
+	return r.writer.Add(ctx, item)
 }
 
 // SaveMany inserts multiple annotations at once.
 // It does not return IDs associated with created annotations. If you need this functionality, use the single-item Save instead.
 func (r *RepositoryImpl) SaveMany(ctx context.Context, items []annotations.Item) error {
-	return r.store.AddMany(ctx, items)
+	return r.writer.AddMany(ctx, items)
 }
 
 func (r *RepositoryImpl) Update(ctx context.Context, item *annotations.Item) error {
-	return r.store.Update(ctx, item)
+	return r.writer.Update(ctx, item)
 }
 
 func (r *RepositoryImpl) Find(ctx context.Context, query *annotations.ItemQuery) ([]*annotations.ItemDTO, error) {
-	return r.store.Get(ctx, query)
+	resources, err := r.authZ.Authorize(ctx, query.OrgID, query)
+	if err != nil {
+		return make([]*annotations.ItemDTO, 0), err
+	}
+
+	return r.reader.Get(ctx, query, resources)
 }
 
 func (r *RepositoryImpl) Delete(ctx context.Context, params *annotations.DeleteParams) error {
-	return r.store.Delete(ctx, params)
+	return r.writer.Delete(ctx, params)
 }
 
 func (r *RepositoryImpl) FindTags(ctx context.Context, query *annotations.TagsQuery) (annotations.FindTagsResult, error) {
-	return r.store.GetTags(ctx, query)
+	return r.reader.GetTags(ctx, query)
 }
diff --git a/pkg/services/annotations/annotationsimpl/annotations_test.go b/pkg/services/annotations/annotationsimpl/annotations_test.go
new file mode 100644
index 0000000000000..a3053d5d12ced
--- /dev/null
+++ b/pkg/services/annotations/annotationsimpl/annotations_test.go
@@ -0,0 +1,342 @@
+package annotationsimpl
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
+	"github.com/grafana/grafana/pkg/services/annotations"
+	"github.com/grafana/grafana/pkg/services/annotations/testutil"
+	"github.com/grafana/grafana/pkg/services/dashboards"
+	dashboardstore "github.com/grafana/grafana/pkg/services/dashboards/database"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/folder"
+	"github.com/grafana/grafana/pkg/services/folder/folderimpl"
+	"github.com/grafana/grafana/pkg/services/guardian"
+	"github.com/grafana/grafana/pkg/services/quota/quotatest"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
+	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
+)
+
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
+func TestIntegrationAnnotationListingWithRBAC(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+	sql := db.InitTestDB(t)
+
+	cfg := setting.NewCfg()
+	cfg.AnnotationMaximumTagsLength = 60
+
+	features := featuremgmt.WithFeatures()
+	tagService := tagimpl.ProvideService(sql)
+
+	repo := ProvideService(sql, cfg, features, tagService)
+
+	dashboard1 := testutil.CreateDashboard(t, sql, features, dashboards.SaveDashboardCommand{
+		UserID:   1,
+		OrgID:    1,
+		IsFolder: false,
+		Dashboard: simplejson.NewFromAny(map[string]any{
+			"title": "Dashboard 1",
+		}),
+	})
+
+	_ = testutil.CreateDashboard(t, sql, features, dashboards.SaveDashboardCommand{
+		UserID:   1,
+		OrgID:    1,
+		IsFolder: false,
+		Dashboard: simplejson.NewFromAny(map[string]any{
+			"title": "Dashboard 2",
+		}),
+	})
+
+	var err error
+
+	dash1Annotation := &annotations.Item{
+		OrgID:       1,
+		DashboardID: 1,
+		Epoch:       10,
+	}
+	err = repo.Save(context.Background(), dash1Annotation)
+	require.NoError(t, err)
+
+	dash2Annotation := &annotations.Item{
+		OrgID:       1,
+		DashboardID: 2,
+		Epoch:       10,
+		Tags:        []string{"foo:bar"},
+	}
+	err = repo.Save(context.Background(), dash2Annotation)
+	require.NoError(t, err)
+
+	organizationAnnotation := &annotations.Item{
+		OrgID: 1,
+		Epoch: 10,
+	}
+	err = repo.Save(context.Background(), organizationAnnotation)
+	require.NoError(t, err)
+
+	u := &user.SignedInUser{
+		UserID: 1,
+		OrgID:  1,
+	}
+	role := testutil.SetupRBACRole(t, sql, u)
+
+	type testStruct struct {
+		description           string
+		permissions           map[string][]string
+		expectedAnnotationIds []int64
+		expectedError         bool
+	}
+
+	testCases := []testStruct{
+		{
+			description: "Should find all annotations when has permissions to list all annotations and read all dashboards",
+			permissions: map[string][]string{
+				accesscontrol.ActionAnnotationsRead: {accesscontrol.ScopeAnnotationsAll},
+				dashboards.ActionDashboardsRead:     {dashboards.ScopeDashboardsAll},
+			},
+			expectedAnnotationIds: []int64{dash1Annotation.ID, dash2Annotation.ID, organizationAnnotation.ID},
+		},
+		{
+			description: "Should find all dashboard annotations",
+			permissions: map[string][]string{
+				accesscontrol.ActionAnnotationsRead: {accesscontrol.ScopeAnnotationsTypeDashboard},
+				dashboards.ActionDashboardsRead:     {dashboards.ScopeDashboardsAll},
+			},
+			expectedAnnotationIds: []int64{dash1Annotation.ID, dash2Annotation.ID},
+		},
+		{
+			description: "Should find only annotations from dashboards that user can read",
+			permissions: map[string][]string{
+				accesscontrol.ActionAnnotationsRead: {accesscontrol.ScopeAnnotationsTypeDashboard},
+				dashboards.ActionDashboardsRead:     {fmt.Sprintf("dashboards:uid:%s", dashboard1.UID)},
+			},
+			expectedAnnotationIds: []int64{dash1Annotation.ID},
+		},
+		{
+			description: "Should find no annotations if user can't view dashboards or organization annotations",
+			permissions: map[string][]string{
+				accesscontrol.ActionAnnotationsRead: {accesscontrol.ScopeAnnotationsTypeDashboard},
+			},
+			expectedAnnotationIds: []int64{},
+		},
+		{
+			description: "Should find only organization annotations",
+			permissions: map[string][]string{
+				accesscontrol.ActionAnnotationsRead: {accesscontrol.ScopeAnnotationsTypeOrganization},
+				dashboards.ActionDashboardsRead:     {dashboards.ScopeDashboardsAll},
+			},
+			expectedAnnotationIds: []int64{organizationAnnotation.ID},
+		},
+		{
+			description: "Should error if user doesn't have annotation read permissions",
+			permissions: map[string][]string{
+				dashboards.ActionDashboardsRead: {dashboards.ScopeDashboardsAll},
+			},
+			expectedError: true,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.description, func(t *testing.T) {
+			u.Permissions = map[int64]map[string][]string{1: tc.permissions}
+			testutil.SetupRBACPermission(t, sql, role, u)
+
+			results, err := repo.Find(context.Background(), &annotations.ItemQuery{
+				OrgID:        1,
+				SignedInUser: u,
+			})
+			if tc.expectedError {
+				require.Error(t, err)
+				return
+			}
+			require.NoError(t, err)
+			assert.Len(t, results, len(tc.expectedAnnotationIds))
+			for _, r := range results {
+				assert.Contains(t, tc.expectedAnnotationIds, r.ID)
+			}
+		})
+	}
+}
+
+func TestIntegrationAnnotationListingWithInheritedRBAC(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	orgID := int64(1)
+	permissions := []accesscontrol.Permission{
+		{
+			Action: dashboards.ActionFoldersCreate,
+		}, {
+			Action: dashboards.ActionFoldersWrite,
+			Scope:  dashboards.ScopeFoldersAll,
+		},
+	}
+	usr := &user.SignedInUser{
+		UserID:      1,
+		OrgID:       orgID,
+		Permissions: map[int64]map[string][]string{orgID: accesscontrol.GroupScopesByAction(permissions)},
+	}
+
+	var role *accesscontrol.Role
+
+	type dashInfo struct {
+		UID string
+		ID  int64
+	}
+
+	allDashboards := make([]dashInfo, 0, folder.MaxNestedFolderDepth+1)
+	annotationsTexts := make([]string, 0, folder.MaxNestedFolderDepth+1)
+
+	setupFolderStructure := func() *sqlstore.SQLStore {
+		sql := db.InitTestDB(t)
+
+		// enable nested folders so that the folder table is populated for all the tests
+		features := featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)
+
+		tagService := tagimpl.ProvideService(sql)
+
+		dashStore, err := dashboardstore.ProvideDashboardStore(sql, sql.Cfg, features, tagService, quotatest.New(false, nil))
+		require.NoError(t, err)
+
+		origNewGuardian := guardian.New
+		guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanViewValue: true, CanSaveValue: true})
+		t.Cleanup(func() {
+			guardian.New = origNewGuardian
+		})
+
+		ac := acimpl.ProvideAccessControl(sql.Cfg)
+		folderSvc := folderimpl.ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), sql.Cfg, dashStore, folderimpl.ProvideDashboardFolderStore(sql), sql, features, supportbundlestest.NewFakeBundleService(), nil)
+
+		cfg := setting.NewCfg()
+		cfg.AnnotationMaximumTagsLength = 60
+
+		store := NewXormStore(cfg, log.New("annotation.test"), sql, tagService)
+
+		parentUID := ""
+		for i := 0; ; i++ {
+			uid := fmt.Sprintf("f%d", i)
+			f, err := folderSvc.Create(context.Background(), &folder.CreateFolderCommand{
+				UID:          uid,
+				OrgID:        orgID,
+				Title:        uid,
+				SignedInUser: usr,
+				ParentUID:    parentUID,
+			})
+			if err != nil {
+				if errors.Is(err, folder.ErrMaximumDepthReached) {
+					break
+				}
+
+				t.Log("unexpected error", "error", err)
+				t.Fail()
+			}
+
+			dashboard := testutil.CreateDashboard(t, sql, features, dashboards.SaveDashboardCommand{
+				UserID:   usr.UserID,
+				OrgID:    orgID,
+				IsFolder: false,
+				Dashboard: simplejson.NewFromAny(map[string]any{
+					"title": fmt.Sprintf("Dashboard under %s", f.UID),
+				}),
+				FolderID:  f.ID, // nolint:staticcheck
+				FolderUID: f.UID,
+			})
+
+			allDashboards = append(allDashboards, dashInfo{UID: dashboard.UID, ID: dashboard.ID})
+
+			parentUID = f.UID
+
+			annotationTxt := fmt.Sprintf("annotation %d", i)
+			dash1Annotation := &annotations.Item{
+				OrgID:       orgID,
+				DashboardID: dashboard.ID,
+				Epoch:       10,
+				Text:        annotationTxt,
+			}
+			err = store.Add(context.Background(), dash1Annotation)
+			require.NoError(t, err)
+
+			annotationsTexts = append(annotationsTexts, annotationTxt)
+		}
+
+		role = testutil.SetupRBACRole(t, sql, usr)
+		return sql
+	}
+
+	sql := setupFolderStructure()
+
+	testCases := []struct {
+		desc                   string
+		features               featuremgmt.FeatureToggles
+		permissions            map[string][]string
+		expectedAnnotationText []string
+		expectedError          bool
+	}{
+		{
+			desc:     "Should find only annotations from dashboards under folders that user can read",
+			features: featuremgmt.WithFeatures(),
+			permissions: map[string][]string{
+				accesscontrol.ActionAnnotationsRead: {accesscontrol.ScopeAnnotationsTypeDashboard},
+				dashboards.ActionDashboardsRead:     {"folders:uid:f0"},
+			},
+			expectedAnnotationText: annotationsTexts[:1],
+		},
+		{
+			desc:     "Should find only annotations from dashboards under inherited folders if nested folder are enabled",
+			features: featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders),
+			permissions: map[string][]string{
+				accesscontrol.ActionAnnotationsRead: {accesscontrol.ScopeAnnotationsTypeDashboard},
+				dashboards.ActionDashboardsRead:     {"folders:uid:f0"},
+			},
+			expectedAnnotationText: annotationsTexts[:],
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.desc, func(t *testing.T) {
+			cfg := setting.NewCfg()
+			cfg.AnnotationMaximumTagsLength = 60
+
+			repo := ProvideService(sql, cfg, tc.features, tagimpl.ProvideService(sql))
+
+			usr.Permissions = map[int64]map[string][]string{1: tc.permissions}
+			testutil.SetupRBACPermission(t, sql, role, usr)
+
+			results, err := repo.Find(context.Background(), &annotations.ItemQuery{
+				OrgID:        1,
+				SignedInUser: usr,
+			})
+			if tc.expectedError {
+				require.Error(t, err)
+				return
+			}
+			require.NoError(t, err)
+			require.Len(t, results, len(tc.expectedAnnotationText))
+			for _, r := range results {
+				assert.Contains(t, tc.expectedAnnotationText, r.Text)
+			}
+		})
+	}
+}
diff --git a/pkg/services/annotations/annotationsimpl/cleanup.go b/pkg/services/annotations/annotationsimpl/cleanup.go
index a3380d9b4df1a..b81597122f0d3 100644
--- a/pkg/services/annotations/annotationsimpl/cleanup.go
+++ b/pkg/services/annotations/annotationsimpl/cleanup.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
@@ -14,14 +13,9 @@ type CleanupServiceImpl struct {
 	store store
 }
 
-func ProvideCleanupService(db db.DB, cfg *setting.Cfg, features featuremgmt.FeatureToggles) *CleanupServiceImpl {
+func ProvideCleanupService(db db.DB, cfg *setting.Cfg) *CleanupServiceImpl {
 	return &CleanupServiceImpl{
-		store: &xormRepositoryImpl{
-			cfg:      cfg,
-			features: features,
-			db:       db,
-			log:      log.New("annotations"),
-		},
+		store: NewXormStore(cfg, log.New("annotations"), db, nil),
 	}
 }
 
diff --git a/pkg/services/annotations/annotationsimpl/cleanup_test.go b/pkg/services/annotations/annotationsimpl/cleanup_test.go
index b072224d44644..278bb48e365ec 100644
--- a/pkg/services/annotations/annotationsimpl/cleanup_test.go
+++ b/pkg/services/annotations/annotationsimpl/cleanup_test.go
@@ -2,6 +2,7 @@ package annotationsimpl
 
 import (
 	"context"
+	"errors"
 	"testing"
 	"time"
 
@@ -11,35 +12,33 @@ import (
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/annotations"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
-func TestAnnotationCleanUp(t *testing.T) {
-	fakeSQL := db.InitTestDB(t)
-
-	t.Cleanup(func() {
-		err := fakeSQL.WithDbSession(context.Background(), func(session *db.Session) error {
-			_, err := session.Exec("DELETE FROM annotation")
-			return err
-		})
-		assert.NoError(t, err)
-	})
+func TestIntegrationAnnotationCleanUp(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test")
+	}
 
-	createTestAnnotations(t, fakeSQL, 21, 6)
-	assertAnnotationCount(t, fakeSQL, "", 21)
-	assertAnnotationTagCount(t, fakeSQL, 42)
+	fakeSQL := db.InitTestDB(t)
 
 	tests := []struct {
-		name                     string
-		cfg                      *setting.Cfg
-		alertAnnotationCount     int64
-		dashboardAnnotationCount int64
-		APIAnnotationCount       int64
-		affectedAnnotations      int64
+		name                    string
+		createAnnotationsNum    int
+		createOldAnnotationsNum int
+
+		cfg                           *setting.Cfg
+		alertAnnotationCount          int64
+		annotationCleanupJobBatchSize int
+		dashboardAnnotationCount      int64
+		APIAnnotationCount            int64
+		affectedAnnotations           int64
 	}{
 		{
-			name: "default settings should not delete any annotations",
+			name:                          "default settings should not delete any annotations",
+			createAnnotationsNum:          21,
+			createOldAnnotationsNum:       6,
+			annotationCleanupJobBatchSize: 1,
 			cfg: &setting.Cfg{
 				AlertingAnnotationCleanupSetting:   settingsFn(0, 0),
 				DashboardAnnotationCleanupSettings: settingsFn(0, 0),
@@ -51,7 +50,10 @@ func TestAnnotationCleanUp(t *testing.T) {
 			affectedAnnotations:      0,
 		},
 		{
-			name: "should remove annotations created before cut off point",
+			name:                          "should remove annotations created before cut off point",
+			createAnnotationsNum:          21,
+			createOldAnnotationsNum:       6,
+			annotationCleanupJobBatchSize: 1,
 			cfg: &setting.Cfg{
 				AlertingAnnotationCleanupSetting:   settingsFn(time.Hour*48, 0),
 				DashboardAnnotationCleanupSettings: settingsFn(time.Hour*48, 0),
@@ -63,7 +65,10 @@ func TestAnnotationCleanUp(t *testing.T) {
 			affectedAnnotations:      6,
 		},
 		{
-			name: "should only keep three annotations",
+			name:                          "should only keep three annotations",
+			createAnnotationsNum:          15,
+			createOldAnnotationsNum:       6,
+			annotationCleanupJobBatchSize: 1,
 			cfg: &setting.Cfg{
 				AlertingAnnotationCleanupSetting:   settingsFn(0, 3),
 				DashboardAnnotationCleanupSettings: settingsFn(0, 3),
@@ -75,7 +80,10 @@ func TestAnnotationCleanUp(t *testing.T) {
 			affectedAnnotations:      6,
 		},
 		{
-			name: "running the max count delete again should not remove any annotations",
+			name:                          "running the max count delete again should not remove any annotations",
+			createAnnotationsNum:          9,
+			createOldAnnotationsNum:       6,
+			annotationCleanupJobBatchSize: 1,
 			cfg: &setting.Cfg{
 				AlertingAnnotationCleanupSetting:   settingsFn(0, 3),
 				DashboardAnnotationCleanupSettings: settingsFn(0, 3),
@@ -86,13 +94,41 @@ func TestAnnotationCleanUp(t *testing.T) {
 			APIAnnotationCount:       3,
 			affectedAnnotations:      0,
 		},
+		{
+			name:                          "should not fail if batch size is larger than SQLITE_MAX_VARIABLE_NUMBER for SQLite >= 3.32.0",
+			createAnnotationsNum:          40003,
+			createOldAnnotationsNum:       0,
+			annotationCleanupJobBatchSize: 32767,
+			cfg: &setting.Cfg{
+				AlertingAnnotationCleanupSetting:   settingsFn(0, 1),
+				DashboardAnnotationCleanupSettings: settingsFn(0, 1),
+				APIAnnotationCleanupSettings:       settingsFn(0, 1),
+			},
+			alertAnnotationCount:     1,
+			dashboardAnnotationCount: 1,
+			APIAnnotationCount:       1,
+			affectedAnnotations:      40000,
+		},
 	}
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
+			createTestAnnotations(t, fakeSQL, test.createAnnotationsNum, test.createOldAnnotationsNum)
+			assertAnnotationCount(t, fakeSQL, "", int64(test.createAnnotationsNum))
+			assertAnnotationTagCount(t, fakeSQL, 2*int64(test.createAnnotationsNum))
+
+			t.Cleanup(func() {
+				err := fakeSQL.WithDbSession(context.Background(), func(session *db.Session) error {
+					_, deleteAnnotationErr := session.Exec("DELETE FROM annotation")
+					_, deleteAnnotationTagErr := session.Exec("DELETE FROM annotation_tag")
+					return errors.Join(deleteAnnotationErr, deleteAnnotationTagErr)
+				})
+				assert.NoError(t, err)
+			})
+
 			cfg := setting.NewCfg()
-			cfg.AnnotationCleanupJobBatchSize = 1
-			cleaner := ProvideCleanupService(fakeSQL, cfg, featuremgmt.WithFeatures())
+			cfg.AnnotationCleanupJobBatchSize = int64(test.annotationCleanupJobBatchSize)
+			cleaner := ProvideCleanupService(fakeSQL, cfg)
 			affectedAnnotations, affectedAnnotationTags, err := cleaner.Run(context.Background(), test.cfg)
 			require.NoError(t, err)
 
@@ -112,7 +148,11 @@ func TestAnnotationCleanUp(t *testing.T) {
 	}
 }
 
-func TestOldAnnotationsAreDeletedFirst(t *testing.T) {
+func TestIntegrationOldAnnotationsAreDeletedFirst(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test")
+	}
+
 	fakeSQL := db.InitTestDB(t)
 
 	t.Cleanup(func() {
@@ -147,7 +187,7 @@ func TestOldAnnotationsAreDeletedFirst(t *testing.T) {
 		// run the clean up task to keep one annotation.
 		cfg := setting.NewCfg()
 		cfg.AnnotationCleanupJobBatchSize = 1
-		cleaner := &xormRepositoryImpl{cfg: cfg, log: log.New("test-logger"), db: fakeSQL, features: featuremgmt.WithFeatures()}
+		cleaner := NewXormStore(cfg, log.New("annotation.test"), fakeSQL, nil)
 		_, err = cleaner.CleanAnnotations(context.Background(), setting.AnnotationCleanupSettings{MaxCount: 1}, alertAnnotationType)
 		require.NoError(t, err)
 
@@ -194,8 +234,11 @@ func createTestAnnotations(t *testing.T, store db.DB, expectedCount int, oldAnno
 
 	cutoffDate := time.Now()
 
+	newAnnotations := make([]*annotations.Item, 0, expectedCount)
+	newAnnotationTags := make([]*annotationTag, 0, 2*expectedCount)
 	for i := 0; i < expectedCount; i++ {
 		a := &annotations.Item{
+			ID:          int64(i + 1),
 			DashboardID: 1,
 			OrgID:       1,
 			UserID:      1,
@@ -223,20 +266,29 @@ func createTestAnnotations(t *testing.T, store db.DB, expectedCount int, oldAnno
 			a.Created = cutoffDate.AddDate(-10, 0, -10).UnixNano() / int64(time.Millisecond)
 		}
 
-		err := store.WithDbSession(context.Background(), func(sess *db.Session) error {
-			_, err := sess.Insert(a)
-			require.NoError(t, err, "should be able to save annotation", err)
-
-			// mimick the SQL annotation Save logic by writing records to the annotation_tag table
-			// we need to ensure they get deleted when we clean up annotations
-			for tagID := range []int{1, 2} {
-				_, err = sess.Exec("INSERT INTO annotation_tag (annotation_id, tag_id) VALUES(?,?)", a.ID, tagID)
-				require.NoError(t, err, "should be able to save annotation tag ID", err)
-			}
-			return err
-		})
-		require.NoError(t, err)
+		newAnnotations = append(newAnnotations, a)
+		newAnnotationTags = append(newAnnotationTags, &annotationTag{AnnotationID: a.ID, TagID: 1}, &annotationTag{AnnotationID: a.ID, TagID: 2})
 	}
+
+	err := store.WithDbSession(context.Background(), func(sess *db.Session) error {
+		batchsize := 500
+		for i := 0; i < len(newAnnotations); i += batchsize {
+			_, err := sess.InsertMulti(newAnnotations[i:min(i+batchsize, len(newAnnotations))])
+			require.NoError(t, err)
+		}
+		return nil
+	})
+	require.NoError(t, err)
+
+	err = store.WithDbSession(context.Background(), func(sess *db.Session) error {
+		batchsize := 500
+		for i := 0; i < len(newAnnotationTags); i += batchsize {
+			_, err := sess.InsertMulti(newAnnotationTags[i:min(i+batchsize, len(newAnnotationTags))])
+			require.NoError(t, err)
+		}
+		return nil
+	})
+	require.NoError(t, err)
 }
 
 func settingsFn(maxAge time.Duration, maxCount int64) setting.AnnotationCleanupSettings {
diff --git a/pkg/services/annotations/annotationsimpl/composite_store.go b/pkg/services/annotations/annotationsimpl/composite_store.go
new file mode 100644
index 0000000000000..3bcf0724b52d5
--- /dev/null
+++ b/pkg/services/annotations/annotationsimpl/composite_store.go
@@ -0,0 +1,98 @@
+package annotationsimpl
+
+import (
+	"context"
+	"fmt"
+	"sort"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+
+	"github.com/grafana/dskit/concurrency"
+	"github.com/grafana/grafana/pkg/services/annotations"
+	"github.com/grafana/grafana/pkg/services/annotations/accesscontrol"
+)
+
+// CompositeStore is a read store that combines two or more read stores, and queries all stores in parallel.
+type CompositeStore struct {
+	logger  log.Logger
+	readers []readStore
+}
+
+func NewCompositeStore(logger log.Logger, readers ...readStore) *CompositeStore {
+	return &CompositeStore{
+		logger:  logger,
+		readers: readers,
+	}
+}
+
+// Satisfy the commonStore interface, in practice this is not used.
+func (c *CompositeStore) Type() string {
+	return "composite"
+}
+
+// Get returns annotations from all stores, and combines the results.
+func (c *CompositeStore) Get(ctx context.Context, query *annotations.ItemQuery, accessResources *accesscontrol.AccessResources) ([]*annotations.ItemDTO, error) {
+	itemCh := make(chan []*annotations.ItemDTO, len(c.readers))
+
+	err := concurrency.ForEachJob(ctx, len(c.readers), len(c.readers), func(ctx context.Context, i int) (err error) {
+		defer handleJobPanic(c.logger, c.readers[i].Type(), &err)
+
+		items, err := c.readers[i].Get(ctx, query, accessResources)
+		itemCh <- items
+		return err
+	})
+	if err != nil {
+		return make([]*annotations.ItemDTO, 0), err
+	}
+
+	close(itemCh)
+	res := make([]*annotations.ItemDTO, 0)
+	for items := range itemCh {
+		res = append(res, items...)
+	}
+	sort.Sort(annotations.SortedItems(res))
+
+	return res, nil
+}
+
+// GetTags returns tags from all stores, and combines the results.
+func (c *CompositeStore) GetTags(ctx context.Context, query *annotations.TagsQuery) (annotations.FindTagsResult, error) {
+	resCh := make(chan annotations.FindTagsResult, len(c.readers))
+
+	err := concurrency.ForEachJob(ctx, len(c.readers), len(c.readers), func(ctx context.Context, i int) (err error) {
+		defer handleJobPanic(c.logger, c.readers[i].Type(), &err)
+
+		res, err := c.readers[i].GetTags(ctx, query)
+		resCh <- res
+		return err
+	})
+	if err != nil {
+		return annotations.FindTagsResult{}, err
+	}
+
+	close(resCh)
+	res := make([]*annotations.TagsDTO, 0)
+	for r := range resCh {
+		res = append(res, r.Tags...)
+	}
+	sort.Sort(annotations.SortedTags(res))
+
+	return annotations.FindTagsResult{Tags: res}, nil
+}
+
+// handleJobPanic is a helper function that recovers from a panic in a concurrent job.,
+// It will log the error and set the job error if it is not nil.
+func handleJobPanic(logger log.Logger, storeType string, jobErr *error) {
+	if r := recover(); r != nil {
+		logger.Error("Annotation store panic", "error", r, "store", storeType, "stack", log.Stack(1))
+		errMsg := "concurrent job panic"
+
+		if jobErr != nil {
+			err := fmt.Errorf(errMsg)
+			if panicErr, ok := r.(error); ok {
+				err = fmt.Errorf("%s: %w", errMsg, panicErr)
+			}
+			*jobErr = err
+		}
+	}
+}
diff --git a/pkg/services/annotations/annotationsimpl/composite_store_test.go b/pkg/services/annotations/annotationsimpl/composite_store_test.go
new file mode 100644
index 0000000000000..b5aa1d22d8c21
--- /dev/null
+++ b/pkg/services/annotations/annotationsimpl/composite_store_test.go
@@ -0,0 +1,213 @@
+package annotationsimpl
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/annotations"
+	"github.com/grafana/grafana/pkg/services/annotations/accesscontrol"
+	"github.com/stretchr/testify/require"
+)
+
+var (
+	errGet     = errors.New("get error")
+	errGetTags = errors.New("get tags error")
+)
+
+func TestCompositeStore(t *testing.T) {
+	t.Run("should handle panic", func(t *testing.T) {
+		r1 := newFakeReader()
+		getPanic := func(context.Context, *annotations.ItemQuery, *accesscontrol.AccessResources) ([]*annotations.ItemDTO, error) {
+			panic("ohno")
+		}
+		r2 := newFakeReader(withGetFn(getPanic))
+		store := &CompositeStore{
+			log.NewNopLogger(),
+			[]readStore{r1, r2},
+		}
+
+		_, err := store.Get(context.Background(), nil, nil)
+		require.Error(t, err)
+		require.Contains(t, err.Error(), "concurrent job panic")
+	})
+
+	t.Run("should return first error", func(t *testing.T) {
+		err1 := errors.New("error 1")
+		r1 := newFakeReader(withError(err1))
+		err2 := errors.New("error 2")
+		r2 := newFakeReader(withError(err2), withWait(10*time.Millisecond))
+
+		store := &CompositeStore{
+			log.NewNopLogger(),
+			[]readStore{r1, r2},
+		}
+
+		tc := []struct {
+			f   func() (any, error)
+			err error
+		}{
+			{
+				f:   func() (any, error) { return store.Get(context.Background(), nil, nil) },
+				err: errGet,
+			},
+			{
+				f:   func() (any, error) { return store.GetTags(context.Background(), nil) },
+				err: errGetTags,
+			},
+		}
+
+		for _, tt := range tc {
+			_, err := tt.f()
+			require.Error(t, err)
+			require.ErrorIs(t, err, err1)
+			require.NotErrorIs(t, err, err2)
+		}
+	})
+
+	t.Run("should combine and sort results from Get", func(t *testing.T) {
+		items1 := []*annotations.ItemDTO{
+			{TimeEnd: 1, Time: 2},
+			{TimeEnd: 2, Time: 1},
+		}
+		r1 := newFakeReader(withItems(items1))
+
+		items2 := []*annotations.ItemDTO{
+			{TimeEnd: 1, Time: 1},
+			{TimeEnd: 1, Time: 3},
+		}
+		r2 := newFakeReader(withItems(items2))
+
+		store := &CompositeStore{
+			log.NewNopLogger(),
+			[]readStore{r1, r2},
+		}
+
+		expected := []*annotations.ItemDTO{
+			{TimeEnd: 2, Time: 1},
+			{TimeEnd: 1, Time: 3},
+			{TimeEnd: 1, Time: 2},
+			{TimeEnd: 1, Time: 1},
+		}
+
+		items, _ := store.Get(context.Background(), nil, nil)
+		require.Equal(t, expected, items)
+	})
+
+	t.Run("should combine and sort results from GetTags", func(t *testing.T) {
+		tags1 := []*annotations.TagsDTO{
+			{Tag: "key1:val1"},
+			{Tag: "key2:val1"},
+		}
+		r1 := newFakeReader(withTags(tags1))
+
+		tags2 := []*annotations.TagsDTO{
+			{Tag: "key1:val2"},
+			{Tag: "key2:val2"},
+		}
+		r2 := newFakeReader(withTags(tags2))
+
+		store := &CompositeStore{
+			log.NewNopLogger(),
+			[]readStore{r1, r2},
+		}
+
+		expected := []*annotations.TagsDTO{
+			{Tag: "key1:val1"},
+			{Tag: "key1:val2"},
+			{Tag: "key2:val1"},
+			{Tag: "key2:val2"},
+		}
+
+		res, _ := store.GetTags(context.Background(), nil)
+		require.Equal(t, expected, res.Tags)
+	})
+}
+
+type fakeReader struct {
+	items    []*annotations.ItemDTO
+	tagRes   annotations.FindTagsResult
+	getFn    func(context.Context, *annotations.ItemQuery, *accesscontrol.AccessResources) ([]*annotations.ItemDTO, error)
+	getTagFn func(context.Context, *annotations.TagsQuery) (annotations.FindTagsResult, error)
+	wait     time.Duration
+	err      error
+}
+
+func (f *fakeReader) Type() string {
+	return "fake"
+}
+
+func (f *fakeReader) Get(ctx context.Context, query *annotations.ItemQuery, accessResources *accesscontrol.AccessResources) ([]*annotations.ItemDTO, error) {
+	if f.getFn != nil {
+		return f.getFn(ctx, query, accessResources)
+	}
+
+	if f.wait > 0 {
+		time.Sleep(f.wait)
+	}
+
+	if f.err != nil {
+		err := fmt.Errorf("%w: %w", errGet, f.err)
+		return nil, err
+	}
+
+	return f.items, nil
+}
+
+func (f *fakeReader) GetTags(ctx context.Context, query *annotations.TagsQuery) (annotations.FindTagsResult, error) {
+	if f.getTagFn != nil {
+		return f.getTagFn(ctx, query)
+	}
+
+	if f.wait > 0 {
+		time.Sleep(f.wait)
+	}
+
+	if f.err != nil {
+		err := fmt.Errorf("%w: %w", errGetTags, f.err)
+		return annotations.FindTagsResult{}, err
+	}
+
+	return f.tagRes, nil
+}
+
+func withWait(wait time.Duration) func(*fakeReader) {
+	return func(f *fakeReader) {
+		f.wait = wait
+	}
+}
+
+func withError(err error) func(*fakeReader) {
+	return func(f *fakeReader) {
+		f.err = err
+	}
+}
+
+func withItems(items []*annotations.ItemDTO) func(*fakeReader) {
+	return func(f *fakeReader) {
+		f.items = items
+	}
+}
+
+func withTags(tags []*annotations.TagsDTO) func(*fakeReader) {
+	return func(f *fakeReader) {
+		f.tagRes = annotations.FindTagsResult{Tags: tags}
+	}
+}
+
+func withGetFn(fn func(context.Context, *annotations.ItemQuery, *accesscontrol.AccessResources) ([]*annotations.ItemDTO, error)) func(*fakeReader) {
+	return func(f *fakeReader) {
+		f.getFn = fn
+	}
+}
+
+func newFakeReader(opts ...func(*fakeReader)) *fakeReader {
+	f := &fakeReader{}
+	for _, opt := range opts {
+		opt(f)
+	}
+	return f
+}
diff --git a/pkg/services/annotations/annotationsimpl/loki/historian_store.go b/pkg/services/annotations/annotationsimpl/loki/historian_store.go
new file mode 100644
index 0000000000000..3d12623bd025c
--- /dev/null
+++ b/pkg/services/annotations/annotationsimpl/loki/historian_store.go
@@ -0,0 +1,309 @@
+package loki
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"sort"
+	"time"
+
+	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/services/annotations/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/ngalert"
+	"golang.org/x/exp/constraints"
+
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/infra/log"
+	ngmetrics "github.com/grafana/grafana/pkg/services/ngalert/metrics"
+	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/state"
+	"github.com/grafana/grafana/pkg/services/ngalert/state/historian"
+	historymodel "github.com/grafana/grafana/pkg/services/ngalert/state/historian/model"
+
+	"github.com/prometheus/client_golang/prometheus"
+
+	"github.com/grafana/grafana/pkg/services/annotations"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util/errutil"
+)
+
+const (
+	subsystem         = "annotations"
+	defaultQueryRange = 6 * time.Hour // from grafana/pkg/services/ngalert/state/historian/loki.go
+)
+
+var (
+	ErrLokiStoreInternal = errutil.Internal("annotations.loki.internal")
+	ErrLokiStoreNotFound = errutil.NotFound("annotations.loki.notFound")
+
+	errMissingRule = errors.New("rule not found")
+)
+
+type lokiQueryClient interface {
+	RangeQuery(ctx context.Context, query string, start, end, limit int64) (historian.QueryRes, error)
+}
+
+// LokiHistorianStore is a read store that queries Loki for alert state history.
+type LokiHistorianStore struct {
+	client lokiQueryClient
+	db     db.DB
+	log    log.Logger
+}
+
+func NewLokiHistorianStore(cfg setting.UnifiedAlertingStateHistorySettings, ft featuremgmt.FeatureToggles, db db.DB, log log.Logger) *LokiHistorianStore {
+	if !useStore(cfg, ft) {
+		return nil
+	}
+	lokiCfg, err := historian.NewLokiConfig(cfg)
+	if err != nil {
+		// this config error is already handled elsewhere
+		return nil
+	}
+
+	return &LokiHistorianStore{
+		client: historian.NewLokiClient(lokiCfg, historian.NewRequester(), ngmetrics.NewHistorianMetrics(prometheus.DefaultRegisterer, subsystem), log),
+		db:     db,
+		log:    log,
+	}
+}
+
+func (r *LokiHistorianStore) Type() string {
+	return "loki"
+}
+
+func (r *LokiHistorianStore) Get(ctx context.Context, query *annotations.ItemQuery, accessResources *accesscontrol.AccessResources) ([]*annotations.ItemDTO, error) {
+	if query.Type == "annotation" {
+		return make([]*annotations.ItemDTO, 0), nil
+	}
+
+	rule := &ngmodels.AlertRule{}
+	if query.AlertID != 0 {
+		var err error
+		rule, err = getRule(ctx, r.db, query.OrgID, query.AlertID)
+		if err != nil {
+			if errors.Is(err, errMissingRule) {
+				return make([]*annotations.ItemDTO, 0), ErrLokiStoreNotFound.Errorf("rule with ID %d does not exist", query.AlertID)
+			}
+			return make([]*annotations.ItemDTO, 0), ErrLokiStoreInternal.Errorf("failed to query rule: %w", err)
+		}
+	}
+
+	logQL, err := historian.BuildLogQuery(buildHistoryQuery(query, accessResources.Dashboards, rule.UID))
+	if err != nil {
+		return make([]*annotations.ItemDTO, 0), ErrLokiStoreInternal.Errorf("failed to build loki query: %w", err)
+	}
+
+	now := time.Now().UTC()
+	if query.To == 0 {
+		query.To = now.UnixMilli()
+	}
+	if query.From == 0 {
+		query.From = now.Add(-defaultQueryRange).UnixMilli()
+	}
+
+	// query.From and query.To are always in milliseconds, convert them to nanoseconds for loki
+	from := query.From * 1e6
+	to := query.To * 1e6
+
+	res, err := r.client.RangeQuery(ctx, logQL, from, to, query.Limit)
+	if err != nil {
+		return make([]*annotations.ItemDTO, 0), ErrLokiStoreInternal.Errorf("failed to query loki: %w", err)
+	}
+
+	items := make([]*annotations.ItemDTO, 0)
+	for _, stream := range res.Data.Result {
+		items = append(items, r.annotationsFromStream(stream, *accessResources)...)
+	}
+	sort.Sort(annotations.SortedItems(items))
+
+	return items, err
+}
+
+func (r *LokiHistorianStore) annotationsFromStream(stream historian.Stream, ac accesscontrol.AccessResources) []*annotations.ItemDTO {
+	items := make([]*annotations.ItemDTO, 0, len(stream.Values))
+	for _, sample := range stream.Values {
+		entry := historian.LokiEntry{}
+		err := json.Unmarshal([]byte(sample.V), &entry)
+		if err != nil {
+			// bad data, skip
+			r.log.Debug("failed to unmarshal loki entry", "error", err, "entry", sample.V)
+			continue
+		}
+
+		if !hasAccess(entry, ac) {
+			// no access to this annotation, skip
+			continue
+		}
+
+		transition, err := buildTransition(entry)
+		if err != nil {
+			// bad data, skip
+			r.log.Debug("failed to build transition", "error", err, "entry", entry)
+			continue
+		}
+
+		if !historian.ShouldRecordAnnotation(*transition) {
+			// skip non-annotation transition
+			continue
+		}
+
+		annotationText, annotationData := historian.BuildAnnotationTextAndData(
+			historymodel.RuleMeta{
+				Title: entry.RuleTitle,
+			},
+			transition.State,
+		)
+
+		items = append(items, &annotations.ItemDTO{
+			AlertID:      entry.RuleID,
+			DashboardID:  ac.Dashboards[entry.DashboardUID],
+			DashboardUID: &entry.DashboardUID,
+			PanelID:      entry.PanelID,
+			NewState:     entry.Current,
+			PrevState:    entry.Previous,
+			Time:         sample.T.UnixMilli(),
+			Text:         annotationText,
+			Data:         annotationData,
+		})
+	}
+
+	return items
+}
+
+func (r *LokiHistorianStore) GetTags(ctx context.Context, query *annotations.TagsQuery) (annotations.FindTagsResult, error) {
+	return annotations.FindTagsResult{}, nil
+}
+
+// util
+
+func getRule(ctx context.Context, sql db.DB, orgID int64, ruleID int64) (*ngmodels.AlertRule, error) {
+	rule := &ngmodels.AlertRule{OrgID: orgID, ID: ruleID}
+	err := sql.WithDbSession(ctx, func(sess *db.Session) error {
+		exists, err := sess.Get(rule)
+		if err != nil {
+			return err
+		}
+		if !exists {
+			return errMissingRule
+		}
+		return nil
+	})
+
+	return rule, err
+}
+
+func hasAccess(entry historian.LokiEntry, resources accesscontrol.AccessResources) bool {
+	orgFilter := resources.CanAccessOrgAnnotations && entry.DashboardUID == ""
+	dashFilter := func() bool {
+		if !resources.CanAccessDashAnnotations {
+			return false
+		}
+		_, canAccess := resources.Dashboards[entry.DashboardUID]
+		return canAccess
+	}
+
+	return orgFilter || dashFilter()
+}
+
+type number interface {
+	constraints.Integer | constraints.Float
+}
+
+// numericMap converts a simplejson map[string]any to a map[string]N, where N is numeric (int or float).
+func numericMap[N number](j *simplejson.Json) (map[string]N, error) {
+	if j == nil {
+		return nil, fmt.Errorf("unexpected nil value")
+	}
+
+	m, err := j.Map()
+	if err != nil {
+		return nil, err
+	}
+
+	values := make(map[string]N)
+	for k, v := range m {
+		a, ok := (v).(json.Number)
+		if !ok {
+			return nil, fmt.Errorf("unexpected value type %T", v)
+		}
+
+		f, err := a.Float64()
+		if err != nil {
+			return nil, err
+		}
+
+		values[k] = N(f)
+	}
+
+	return values, nil
+}
+
+func buildTransition(entry historian.LokiEntry) (*state.StateTransition, error) {
+	curState, curStateReason, err := state.ParseFormattedState(entry.Current)
+	if err != nil {
+		return nil, fmt.Errorf("parsing current state: %w", err)
+	}
+
+	prevState, prevReason, err := state.ParseFormattedState(entry.Previous)
+	if err != nil {
+		return nil, fmt.Errorf("parsing previous state: %w", err)
+	}
+
+	v, err := numericMap[float64](entry.Values)
+	if err != nil {
+		return nil, fmt.Errorf("parsing entry values: %w", err)
+	}
+
+	return &state.StateTransition{
+		State: &state.State{
+			State:       curState,
+			StateReason: curStateReason,
+			Values:      v,
+			Labels:      entry.InstanceLabels,
+		},
+		PreviousState:       prevState,
+		PreviousStateReason: prevReason,
+	}, nil
+}
+
+func buildHistoryQuery(query *annotations.ItemQuery, dashboards map[string]int64, ruleUID string) ngmodels.HistoryQuery {
+	historyQuery := ngmodels.HistoryQuery{
+		OrgID:        query.OrgID,
+		DashboardUID: query.DashboardUID,
+		PanelID:      query.PanelID,
+		RuleUID:      ruleUID,
+	}
+
+	if historyQuery.DashboardUID == "" && query.DashboardID != 0 {
+		for uid, id := range dashboards {
+			if query.DashboardID == id {
+				historyQuery.DashboardUID = uid
+				break
+			}
+		}
+	}
+
+	return historyQuery
+}
+
+func useStore(cfg setting.UnifiedAlertingStateHistorySettings, ft featuremgmt.FeatureToggles) bool {
+	if !cfg.Enabled {
+		return false
+	}
+
+	// Override config based on feature toggles.
+	// We pass in a no-op logger here since this function is also called during ngalert init,
+	// and we don't want to log the same info twice.
+	ngalert.ApplyStateHistoryFeatureToggles(&cfg, ft, log.NewNopLogger())
+
+	backend, err := historian.ParseBackendType(cfg.Backend)
+	if err != nil {
+		return false
+	}
+
+	// We should only query Loki if annotations do not exist in the database.
+	// To be doubly sure, ensure that the feature toggle to only use Loki is enabled.
+	return backend == historian.BackendTypeLoki && ft.IsEnabledGlobally(featuremgmt.FlagAlertStateHistoryLokiOnly)
+}
diff --git a/pkg/services/annotations/annotationsimpl/loki/historian_store_test.go b/pkg/services/annotations/annotationsimpl/loki/historian_store_test.go
new file mode 100644
index 0000000000000..56b999da54f0c
--- /dev/null
+++ b/pkg/services/annotations/annotationsimpl/loki/historian_store_test.go
@@ -0,0 +1,893 @@
+package loki
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"math/rand"
+	"net/url"
+	"strconv"
+	"sync"
+	"testing"
+	"time"
+
+	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/annotations"
+	annotation_ac "github.com/grafana/grafana/pkg/services/annotations/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/annotations/testutil"
+	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/ngalert/client"
+	"github.com/grafana/grafana/pkg/services/ngalert/eval"
+	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
+	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/state"
+	"github.com/grafana/grafana/pkg/services/ngalert/state/historian"
+	historymodel "github.com/grafana/grafana/pkg/services/ngalert/state/historian/model"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
+	"github.com/prometheus/client_golang/prometheus"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
+func TestIntegrationAlertStateHistoryStore(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	sql := db.InitTestDB(t)
+
+	dashboard1 := testutil.CreateDashboard(t, sql, featuremgmt.WithFeatures(), dashboards.SaveDashboardCommand{
+		UserID: 1,
+		OrgID:  1,
+		Dashboard: simplejson.NewFromAny(map[string]any{
+			"title": "Dashboard 1",
+		}),
+	})
+
+	dashboard2 := testutil.CreateDashboard(t, sql, featuremgmt.WithFeatures(), dashboards.SaveDashboardCommand{
+		UserID: 1,
+		OrgID:  1,
+		Dashboard: simplejson.NewFromAny(map[string]any{
+			"title": "Dashboard 2",
+		}),
+	})
+
+	knownUIDs := &sync.Map{}
+	generator := ngmodels.AlertRuleGen(
+		ngmodels.WithUniqueUID(knownUIDs),
+		ngmodels.WithUniqueID(),
+		ngmodels.WithOrgID(1),
+	)
+
+	dashboardRules := map[string][]*ngmodels.AlertRule{
+		dashboard1.UID: {
+			createAlertRuleFromDashboard(t, sql, "Test Rule 1", *dashboard1, generator),
+			createAlertRuleFromDashboard(t, sql, "Test Rule 2", *dashboard1, generator),
+		},
+		dashboard2.UID: {
+			createAlertRuleFromDashboard(t, sql, "Test Rule 3", *dashboard2, generator),
+		},
+	}
+
+	t.Run("Testing Loki state history read", func(t *testing.T) {
+		start := time.Now()
+		numTransitions := 2
+		transitions := genStateTransitions(t, numTransitions, start)
+
+		fakeLokiClient := NewFakeLokiClient()
+		store := createTestLokiStore(t, sql, fakeLokiClient)
+
+		t.Run("can query history by alert id", func(t *testing.T) {
+			rule := dashboardRules[dashboard1.UID][0]
+
+			fakeLokiClient.rangeQueryRes = []historian.Stream{
+				historian.StatesToStream(ruleMetaFromRule(t, rule), transitions, map[string]string{}, log.NewNopLogger()),
+			}
+
+			query := annotations.ItemQuery{
+				OrgID:   1,
+				AlertID: rule.ID,
+				From:    start.UnixMilli(),
+				To:      start.Add(time.Second * time.Duration(numTransitions+1)).UnixMilli(),
+			}
+			res, err := store.Get(
+				context.Background(),
+				&query,
+				&annotation_ac.AccessResources{
+					Dashboards: map[string]int64{
+						dashboard1.UID: dashboard1.ID,
+					},
+					CanAccessDashAnnotations: true,
+				},
+			)
+			require.NoError(t, err)
+			require.Len(t, res, numTransitions)
+		})
+
+		t.Run("can query history by dashboard id", func(t *testing.T) {
+			fakeLokiClient.rangeQueryRes = []historian.Stream{
+				historian.StatesToStream(ruleMetaFromRule(t, dashboardRules[dashboard1.UID][0]), transitions, map[string]string{}, log.NewNopLogger()),
+				historian.StatesToStream(ruleMetaFromRule(t, dashboardRules[dashboard1.UID][1]), transitions, map[string]string{}, log.NewNopLogger()),
+			}
+
+			query := annotations.ItemQuery{
+				OrgID:       1,
+				DashboardID: dashboard1.ID,
+				From:        start.UnixMilli(),
+				To:          start.Add(time.Second * time.Duration(numTransitions+1)).UnixMilli(),
+			}
+			res, err := store.Get(
+				context.Background(),
+				&query,
+				&annotation_ac.AccessResources{
+					Dashboards: map[string]int64{
+						dashboard1.UID: dashboard1.ID,
+					},
+					CanAccessDashAnnotations: true,
+				},
+			)
+			require.NoError(t, err)
+			require.Len(t, res, 2*numTransitions)
+		})
+
+		t.Run("should return empty results when type is annotation", func(t *testing.T) {
+			fakeLokiClient.rangeQueryRes = []historian.Stream{
+				historian.StatesToStream(ruleMetaFromRule(t, dashboardRules[dashboard1.UID][0]), transitions, map[string]string{}, log.NewNopLogger()),
+				historian.StatesToStream(ruleMetaFromRule(t, dashboardRules[dashboard1.UID][1]), transitions, map[string]string{}, log.NewNopLogger()),
+			}
+
+			query := annotations.ItemQuery{
+				OrgID: 1,
+				Type:  "annotation",
+			}
+			res, err := store.Get(
+				context.Background(),
+				&query,
+				&annotation_ac.AccessResources{
+					Dashboards: map[string]int64{
+						dashboard1.UID: dashboard1.ID,
+					},
+					CanAccessDashAnnotations: true,
+				},
+			)
+			require.NoError(t, err)
+			require.Empty(t, res)
+		})
+
+		t.Run("should return empty results when history is outside time range", func(t *testing.T) {
+			fakeLokiClient.rangeQueryRes = []historian.Stream{
+				historian.StatesToStream(ruleMetaFromRule(t, dashboardRules[dashboard1.UID][0]), transitions, map[string]string{}, log.NewNopLogger()),
+				historian.StatesToStream(ruleMetaFromRule(t, dashboardRules[dashboard1.UID][1]), transitions, map[string]string{}, log.NewNopLogger()),
+			}
+
+			query := annotations.ItemQuery{
+				OrgID:       1,
+				DashboardID: dashboard1.ID,
+				From:        start.Add(-2 * time.Second).UnixMilli(),
+				To:          start.Add(-1 * time.Second).UnixMilli(),
+			}
+			res, err := store.Get(
+				context.Background(),
+				&query,
+				&annotation_ac.AccessResources{
+					Dashboards: map[string]int64{
+						dashboard1.UID: dashboard1.ID,
+					},
+					CanAccessDashAnnotations: true,
+				},
+			)
+			require.NoError(t, err)
+			require.Len(t, res, 0)
+		})
+
+		t.Run("should return partial results when history is partly outside clamped time range", func(t *testing.T) {
+			fakeLokiClient.rangeQueryRes = []historian.Stream{
+				historian.StatesToStream(ruleMetaFromRule(t, dashboardRules[dashboard1.UID][0]), transitions, map[string]string{}, log.NewNopLogger()),
+				historian.StatesToStream(ruleMetaFromRule(t, dashboardRules[dashboard1.UID][1]), transitions, map[string]string{}, log.NewNopLogger()),
+			}
+
+			// clamp time range to 1 second
+			oldMax := fakeLokiClient.cfg.MaxQueryLength
+			fakeLokiClient.cfg.MaxQueryLength = 1 * time.Second
+
+			query := annotations.ItemQuery{
+				OrgID:       1,
+				DashboardID: dashboard1.ID,
+				From:        start.Add(-1 * time.Second).UnixMilli(), // should clamp to start
+				To:          start.Add(1 * time.Second).UnixMilli(),
+			}
+			res, err := store.Get(
+				context.Background(),
+				&query,
+				&annotation_ac.AccessResources{
+					Dashboards: map[string]int64{
+						dashboard1.UID: dashboard1.ID,
+					},
+					CanAccessDashAnnotations: true,
+				},
+			)
+			require.NoError(t, err)
+			require.Len(t, res, 2)
+
+			// restore original max query length
+			fakeLokiClient.cfg.MaxQueryLength = oldMax
+		})
+
+		t.Run("should sort history by time", func(t *testing.T) {
+			fakeLokiClient.rangeQueryRes = []historian.Stream{
+				historian.StatesToStream(ruleMetaFromRule(t, dashboardRules[dashboard1.UID][0]), transitions, map[string]string{}, log.NewNopLogger()),
+				historian.StatesToStream(ruleMetaFromRule(t, dashboardRules[dashboard1.UID][1]), transitions, map[string]string{}, log.NewNopLogger()),
+			}
+
+			query := annotations.ItemQuery{
+				OrgID:       1,
+				DashboardID: dashboard1.ID,
+				From:        start.UnixMilli(),
+				To:          start.Add(time.Second * time.Duration(numTransitions+1)).UnixMilli(),
+			}
+			res, err := store.Get(
+				context.Background(),
+				&query,
+				&annotation_ac.AccessResources{
+					Dashboards: map[string]int64{
+						dashboard1.UID: dashboard1.ID,
+					},
+					CanAccessDashAnnotations: true,
+				},
+			)
+			require.NoError(t, err)
+			require.Len(t, res, 2*numTransitions)
+
+			var lastTime int64
+			for _, item := range res {
+				if lastTime != 0 {
+					require.True(t, item.Time <= lastTime)
+				}
+				lastTime = item.Time
+			}
+		})
+	})
+
+	t.Run("Testing items from Loki stream", func(t *testing.T) {
+		fakeLokiClient := NewFakeLokiClient()
+		store := createTestLokiStore(t, sql, fakeLokiClient)
+
+		t.Run("should return empty list when no streams", func(t *testing.T) {
+			items := store.annotationsFromStream(historian.Stream{}, annotation_ac.AccessResources{})
+			require.Empty(t, items)
+		})
+
+		t.Run("should return empty list when no entries", func(t *testing.T) {
+			items := store.annotationsFromStream(historian.Stream{
+				Values: []historian.Sample{},
+			}, annotation_ac.AccessResources{})
+			require.Empty(t, items)
+		})
+
+		t.Run("should return one annotation per sample", func(t *testing.T) {
+			rule := dashboardRules[dashboard1.UID][0]
+			start := time.Now()
+			numTransitions := 2
+			transitions := genStateTransitions(t, numTransitions, start)
+
+			stream := historian.StatesToStream(ruleMetaFromRule(t, rule), transitions, map[string]string{}, log.NewNopLogger())
+
+			items := store.annotationsFromStream(stream, annotation_ac.AccessResources{
+				Dashboards: map[string]int64{
+					dashboard1.UID: dashboard1.ID,
+				},
+				CanAccessDashAnnotations: true,
+			})
+			require.Len(t, items, numTransitions)
+
+			for i := 0; i < numTransitions; i++ {
+				item := items[i]
+				transition := transitions[i]
+
+				expected := &annotations.ItemDTO{
+					AlertID:      rule.ID,
+					DashboardID:  dashboard1.ID,
+					DashboardUID: &dashboard1.UID,
+					PanelID:      *rule.PanelID,
+					Time:         transition.State.LastEvaluationTime.UnixMilli(),
+					NewState:     transition.Formatted(),
+				}
+				if i > 0 {
+					prevTransition := transitions[i-1]
+					expected.PrevState = prevTransition.Formatted()
+				}
+
+				compareAnnotationItem(t, expected, item)
+			}
+		})
+
+		t.Run("should filter out annotations from dashboards not in scope", func(t *testing.T) {
+			start := time.Now()
+			numTransitions := 2
+			transitions := genStateTransitions(t, numTransitions, start)
+
+			rule := dashboardRules[dashboard1.UID][0]
+			stream1 := historian.StatesToStream(ruleMetaFromRule(t, rule), transitions, map[string]string{}, log.NewNopLogger())
+
+			rule = createAlertRule(t, sql, "Test rule", generator)
+			stream2 := historian.StatesToStream(ruleMetaFromRule(t, rule), transitions, map[string]string{}, log.NewNopLogger())
+
+			stream := historian.Stream{
+				Values: append(stream1.Values, stream2.Values...),
+				Stream: stream1.Stream,
+			}
+
+			items := store.annotationsFromStream(stream, annotation_ac.AccessResources{
+				Dashboards: map[string]int64{
+					dashboard1.UID: dashboard1.ID,
+				},
+				CanAccessDashAnnotations: true,
+			})
+			require.Len(t, items, numTransitions)
+
+			for _, item := range items {
+				require.Equal(t, dashboard1.ID, item.DashboardID)
+				require.Equal(t, dashboard1.UID, *item.DashboardUID)
+			}
+		})
+
+		t.Run("should include only annotations without linked dashboard on org scope", func(t *testing.T) {
+			start := time.Now()
+			numTransitions := 2
+			transitions := genStateTransitions(t, numTransitions, start)
+
+			rule := dashboardRules[dashboard1.UID][0]
+			stream1 := historian.StatesToStream(ruleMetaFromRule(t, rule), transitions, map[string]string{}, log.NewNopLogger())
+
+			rule.DashboardUID = nil
+			stream2 := historian.StatesToStream(ruleMetaFromRule(t, rule), transitions, map[string]string{}, log.NewNopLogger())
+
+			stream := historian.Stream{
+				Values: append(stream1.Values, stream2.Values...),
+				Stream: stream1.Stream,
+			}
+
+			items := store.annotationsFromStream(stream, annotation_ac.AccessResources{
+				Dashboards: map[string]int64{
+					dashboard1.UID: dashboard1.ID,
+				},
+				CanAccessOrgAnnotations: true,
+			})
+			require.Len(t, items, numTransitions)
+
+			for _, item := range items {
+				require.Zero(t, *item.DashboardUID)
+				require.Zero(t, item.DashboardID)
+			}
+		})
+	})
+}
+
+func TestHasAccess(t *testing.T) {
+	entry := historian.LokiEntry{
+		DashboardUID: "dashboard-uid",
+	}
+
+	t.Run("should return false when scope is organization and entry has dashboard UID", func(t *testing.T) {
+		require.False(t, hasAccess(entry, annotation_ac.AccessResources{
+			CanAccessOrgAnnotations: true,
+		}))
+	})
+
+	t.Run("should return false when scope is dashboard and dashboard UID is not in resources", func(t *testing.T) {
+		require.False(t, hasAccess(entry, annotation_ac.AccessResources{
+			CanAccessDashAnnotations: true,
+			Dashboards: map[string]int64{
+				"other-dashboard-uid": 1,
+			},
+		}))
+	})
+
+	t.Run("should return true when scope is organization and entry has no dashboard UID", func(t *testing.T) {
+		require.True(t, hasAccess(historian.LokiEntry{}, annotation_ac.AccessResources{
+			CanAccessOrgAnnotations: true,
+		}))
+	})
+
+	t.Run("should return true when scope is dashboard and dashboard UID is in resources", func(t *testing.T) {
+		require.True(t, hasAccess(entry, annotation_ac.AccessResources{
+			CanAccessDashAnnotations: true,
+			Dashboards: map[string]int64{
+				"dashboard-uid": 1,
+			},
+		}))
+	})
+}
+
+func TestNumericMap(t *testing.T) {
+	t.Run("should return error for nil value", func(t *testing.T) {
+		var jsonMap *simplejson.Json
+		_, err := numericMap[float64](jsonMap)
+		require.Error(t, err)
+		require.Contains(t, err.Error(), "unexpected nil value")
+	})
+
+	t.Run("should return error for nil interface value", func(t *testing.T) {
+		jsonMap := simplejson.NewFromAny(map[string]any{
+			"key1": nil,
+		})
+		_, err := numericMap[float64](jsonMap)
+		require.Error(t, err)
+		require.Contains(t, err.Error(), "unexpected value type")
+	})
+
+	t.Run(`should convert json string:float kv to Golang map[string]float64`, func(t *testing.T) {
+		jsonMap := simplejson.NewFromAny(map[string]any{
+			"key1": json.Number("1.0"),
+			"key2": json.Number("2.0"),
+		})
+
+		golangMap, err := numericMap[float64](jsonMap)
+		require.NoError(t, err)
+
+		require.Equal(t, map[string]float64{
+			"key1": 1.0,
+			"key2": 2.0,
+		}, golangMap)
+	})
+
+	t.Run("should return error when json map contains non-float values", func(t *testing.T) {
+		jsonMap := simplejson.NewFromAny(map[string]any{
+			"key1": json.Number("1.0"),
+			"key2": "not a float",
+		})
+
+		_, err := numericMap[float64](jsonMap)
+		require.Error(t, err)
+	})
+}
+
+func TestBuildHistoryQuery(t *testing.T) {
+	t.Run("should set dashboard UID from dashboard ID if query does not contain UID", func(t *testing.T) {
+		query := buildHistoryQuery(
+			&annotations.ItemQuery{
+				DashboardID: 1,
+			},
+			map[string]int64{
+				"dashboard-uid": 1,
+			},
+			"rule-uid",
+		)
+		require.Equal(t, "dashboard-uid", query.DashboardUID)
+	})
+
+	t.Run("should skip dashboard UID if missing from query and dashboard map", func(t *testing.T) {
+		query := buildHistoryQuery(
+			&annotations.ItemQuery{
+				DashboardID: 1,
+			},
+			map[string]int64{
+				"other-dashboard-uid": 2,
+			},
+			"rule-uid",
+		)
+		require.Zero(t, query.DashboardUID)
+	})
+
+	t.Run("should skip dashboard UID when not in query", func(t *testing.T) {
+		query := buildHistoryQuery(
+			&annotations.ItemQuery{},
+			map[string]int64{
+				"dashboard-uid": 1,
+			},
+			"rule-uid",
+		)
+		require.Zero(t, query.DashboardUID)
+	})
+}
+
+func TestBuildTransition(t *testing.T) {
+	t.Run("should return error when entry contains invalid state strings", func(t *testing.T) {
+		_, err := buildTransition(historian.LokiEntry{
+			Current: "Invalid",
+		})
+		require.Error(t, err)
+
+		_, err = buildTransition(historian.LokiEntry{
+			Current:  "Normal",
+			Previous: "Invalid",
+		})
+		require.Error(t, err)
+	})
+
+	t.Run("should return error when values are not numbers", func(t *testing.T) {
+		_, err := buildTransition(historian.LokiEntry{
+			Current: "Normal",
+			Values:  simplejson.NewFromAny(map[string]any{"key1": "not a float"}),
+		})
+		require.Error(t, err)
+	})
+
+	t.Run("should build transition correctly", func(t *testing.T) {
+		values := map[string]float64{
+			"key1": 1.0,
+			"key2": 2.0,
+		}
+
+		labels := map[string]string{
+			"key1": "value1",
+			"key2": "value2",
+		}
+
+		jsonValues := simplejson.New()
+		for k, v := range values {
+			jsonValues.Set(k, json.Number(strconv.FormatFloat(v, 'f', -1, 64)))
+		}
+
+		entry := historian.LokiEntry{
+			Current:        "Normal",
+			Previous:       "Error (NoData)",
+			Values:         jsonValues,
+			InstanceLabels: labels,
+		}
+
+		expected := &state.StateTransition{
+			State: &state.State{
+				State:              eval.Normal,
+				StateReason:        "",
+				LastEvaluationTime: time.Time{},
+				Values:             values,
+				Labels:             labels,
+			},
+			PreviousState:       eval.Error,
+			PreviousStateReason: eval.NoData.String(),
+		}
+
+		stub, err := buildTransition(entry)
+
+		require.NoError(t, err)
+		require.Equal(t, expected, stub)
+	})
+}
+
+func createTestLokiStore(t *testing.T, sql db.DB, client lokiQueryClient) *LokiHistorianStore {
+	t.Helper()
+
+	return &LokiHistorianStore{
+		client: client,
+		db:     sql,
+		log:    log.NewNopLogger(),
+	}
+}
+
+// createAlertRule creates an alert rule in the database and returns it.
+// If a generator is not specified, uniqueness of primary key is not guaranteed.
+func createAlertRule(t *testing.T, sql db.DB, title string, generator func() *ngmodels.AlertRule) *ngmodels.AlertRule {
+	t.Helper()
+
+	if generator == nil {
+		generator = ngmodels.AlertRuleGen(ngmodels.WithTitle(title), withDashboardUID(nil), withPanelID(nil), ngmodels.WithOrgID(1))
+	}
+
+	rule := generator()
+	// ensure rule has correct values
+	if rule.Title != title {
+		rule.Title = title
+	}
+	// rule should not have linked dashboard or panel
+	rule.DashboardUID = nil
+	rule.PanelID = nil
+
+	err := sql.WithDbSession(context.Background(), func(sess *db.Session) error {
+		_, err := sess.Table(ngmodels.AlertRule{}).InsertOne(rule)
+		if err != nil {
+			return err
+		}
+
+		dbRule := &ngmodels.AlertRule{}
+		exist, err := sess.Table(ngmodels.AlertRule{}).ID(rule.ID).Get(dbRule)
+		if err != nil {
+			return err
+		}
+		if !exist {
+			return errors.New("cannot read inserted record")
+		}
+		rule = dbRule
+
+		return nil
+	})
+	require.NoError(t, err)
+
+	return rule
+}
+
+// createAlertRuleFromDashboard creates an alert rule with a linked dashboard and panel in the database and returns it.
+// If a generator is not specified, uniqueness of primary key is not guaranteed.
+func createAlertRuleFromDashboard(t *testing.T, sql db.DB, title string, dashboard dashboards.Dashboard, generator func() *ngmodels.AlertRule) *ngmodels.AlertRule {
+	t.Helper()
+
+	panelID := new(int64)
+	*panelID = 123
+
+	if generator == nil {
+		generator = ngmodels.AlertRuleGen(ngmodels.WithTitle(title), ngmodels.WithOrgID(1), withDashboardUID(&dashboard.UID), withPanelID(panelID))
+	}
+
+	rule := generator()
+	// ensure rule has correct values
+	if rule.Title != title {
+		rule.Title = title
+	}
+	if rule.DashboardUID == nil || (rule.DashboardUID != nil && *rule.DashboardUID != dashboard.UID) {
+		rule.DashboardUID = &dashboard.UID
+	}
+	if rule.PanelID == nil || (rule.PanelID != nil && *rule.PanelID != *panelID) {
+		rule.PanelID = panelID
+	}
+
+	err := sql.WithDbSession(context.Background(), func(sess *db.Session) error {
+		_, err := sess.Table(ngmodels.AlertRule{}).InsertOne(rule)
+		if err != nil {
+			return err
+		}
+
+		dbRule := &ngmodels.AlertRule{}
+		exist, err := sess.Table(ngmodels.AlertRule{}).ID(rule.ID).Get(dbRule)
+		if err != nil {
+			return err
+		}
+		if !exist {
+			return errors.New("cannot read inserted record")
+		}
+		rule = dbRule
+
+		return nil
+	})
+	require.NoError(t, err)
+
+	return rule
+}
+
+func ruleMetaFromRule(t *testing.T, rule *ngmodels.AlertRule) historymodel.RuleMeta {
+	t.Helper()
+
+	meta := historymodel.RuleMeta{
+		OrgID: rule.OrgID,
+		UID:   rule.UID,
+		ID:    rule.ID,
+	}
+
+	if rule.DashboardUID != nil {
+		meta.DashboardUID = *rule.DashboardUID
+	}
+
+	if rule.PanelID != nil {
+		meta.PanelID = *rule.PanelID
+	}
+
+	return meta
+}
+
+func genStateTransitions(t *testing.T, num int, start time.Time) []state.StateTransition {
+	t.Helper()
+
+	transitions := make([]state.StateTransition, 0, num)
+	lastState := state.State{
+		State:              eval.Normal,
+		StateReason:        "",
+		LastEvaluationTime: start,
+		Values: map[string]float64{
+			"key1": 1.0,
+			"key2": 2.0,
+		},
+		Labels: map[string]string{
+			"key1": "value1",
+			"key2": "value2",
+		},
+	}
+
+	for i := 0; i < num; i++ {
+		stateVal := rand.Intn(4)
+		if stateVal == int(lastState.State) {
+			stateVal = (stateVal + 1) % 4
+		}
+
+		newState := state.State{
+			State:              eval.State(stateVal),
+			StateReason:        "",
+			LastEvaluationTime: lastState.LastEvaluationTime.Add(time.Second * time.Duration(i)),
+			Values:             lastState.Values,
+			Labels:             lastState.Labels,
+		}
+
+		transitions = append(transitions, state.StateTransition{
+			PreviousState:       lastState.State,
+			PreviousStateReason: lastState.StateReason,
+			State:               &newState,
+		})
+
+		lastState = newState
+	}
+
+	return transitions
+}
+
+func withDashboardUID(dashboardUID *string) ngmodels.AlertRuleMutator {
+	return func(rule *ngmodels.AlertRule) {
+		rule.DashboardUID = dashboardUID
+	}
+}
+
+func withPanelID(panelID *int64) ngmodels.AlertRuleMutator {
+	return func(rule *ngmodels.AlertRule) {
+		rule.PanelID = panelID
+	}
+}
+
+func compareAnnotationItem(t *testing.T, expected, actual *annotations.ItemDTO) {
+	require.Equal(t, expected.AlertID, actual.AlertID)
+	require.Equal(t, expected.AlertName, actual.AlertName)
+	if expected.PanelID != 0 {
+		require.Equal(t, expected.PanelID, actual.PanelID)
+	}
+	if expected.DashboardUID != nil {
+		require.Equal(t, expected.DashboardID, actual.DashboardID)
+		require.Equal(t, *expected.DashboardUID, *actual.DashboardUID)
+	}
+	require.Equal(t, expected.NewState, actual.NewState)
+	if expected.PrevState != "" {
+		require.Equal(t, expected.PrevState, actual.PrevState)
+	}
+	require.Equal(t, expected.Time, actual.Time)
+	if expected.Text != "" && expected.Data != nil {
+		require.Equal(t, expected.Text, actual.Text)
+		require.Equal(t, expected.Data, actual.Data)
+	}
+}
+
+type FakeLokiClient struct {
+	client        client.Requester
+	cfg           historian.LokiConfig
+	metrics       *metrics.Historian
+	log           log.Logger
+	rangeQueryRes []historian.Stream
+}
+
+func NewFakeLokiClient() *FakeLokiClient {
+	url, _ := url.Parse("http://some.url")
+	req := historian.NewFakeRequester()
+	metrics := metrics.NewHistorianMetrics(prometheus.NewRegistry(), "annotations_test")
+
+	return &FakeLokiClient{
+		client: client.NewTimedClient(req, metrics.WriteDuration),
+		cfg: historian.LokiConfig{
+			WritePathURL:   url,
+			ReadPathURL:    url,
+			Encoder:        historian.JsonEncoder{},
+			MaxQueryLength: 721 * time.Hour,
+		},
+		metrics: metrics,
+		log:     log.New("ngalert.state.historian", "backend", "loki"),
+	}
+}
+
+func (c *FakeLokiClient) RangeQuery(ctx context.Context, query string, from, to, limit int64) (historian.QueryRes, error) {
+	streams := make([]historian.Stream, len(c.rangeQueryRes))
+
+	// clamp time range using logic from historian
+	from, to = historian.ClampRange(from, to, c.cfg.MaxQueryLength.Nanoseconds())
+
+	for n, stream := range c.rangeQueryRes {
+		streams[n].Stream = stream.Stream
+		streams[n].Values = []historian.Sample{}
+		for _, sample := range stream.Values {
+			if sample.T.UnixNano() < from || sample.T.UnixNano() >= to { // matches Loki behavior
+				continue
+			}
+			streams[n].Values = append(streams[n].Values, sample)
+		}
+	}
+
+	res := historian.QueryRes{
+		Data: historian.QueryData{
+			Result: streams,
+		},
+	}
+
+	// reset expected streams on read
+	c.rangeQueryRes = []historian.Stream{}
+	return res, nil
+}
+
+func TestUseStore(t *testing.T) {
+	t.Run("false if state history disabled", func(t *testing.T) {
+		cfg := setting.UnifiedAlertingStateHistorySettings{
+			Enabled: false,
+		}
+		use := useStore(cfg, featuremgmt.WithFeatures())
+		require.False(t, use)
+	})
+
+	t.Run("false if any invalid backend", func(t *testing.T) {
+		t.Run("single", func(t *testing.T) {
+			cfg := setting.UnifiedAlertingStateHistorySettings{
+				Enabled: true,
+				Backend: "invalid-backend",
+			}
+			use := useStore(cfg, featuremgmt.WithFeatures())
+			require.False(t, use)
+		})
+
+		t.Run("primary", func(t *testing.T) {
+			cfg := setting.UnifiedAlertingStateHistorySettings{
+				Enabled:      true,
+				Backend:      "multiple",
+				MultiPrimary: "invalid-backend",
+			}
+			use := useStore(cfg, featuremgmt.WithFeatures())
+			require.False(t, use)
+		})
+
+		t.Run("secondary", func(t *testing.T) {
+			cfg := setting.UnifiedAlertingStateHistorySettings{
+				Enabled:          true,
+				Backend:          "multiple",
+				MultiPrimary:     "annotations",
+				MultiSecondaries: []string{"annotations", "invalid-backend"},
+			}
+			use := useStore(cfg, featuremgmt.WithFeatures())
+			require.False(t, use)
+		})
+	})
+
+	t.Run("false if no backend is Loki", func(t *testing.T) {
+		cfg := setting.UnifiedAlertingStateHistorySettings{
+			Enabled: true,
+			Backend: "annotations",
+		}
+		use := useStore(cfg, featuremgmt.WithFeatures())
+		require.False(t, use)
+	})
+
+	t.Run("false if Loki is part of multi backend", func(t *testing.T) {
+		t.Run("primary", func(t *testing.T) {
+			cfg := setting.UnifiedAlertingStateHistorySettings{
+				Enabled:      true,
+				Backend:      "multiple",
+				MultiPrimary: "loki",
+			}
+			use := useStore(cfg, featuremgmt.WithFeatures())
+			require.False(t, use)
+		})
+
+		t.Run("secondary", func(t *testing.T) {
+			cfg := setting.UnifiedAlertingStateHistorySettings{
+				Enabled:          true,
+				Backend:          "multiple",
+				MultiPrimary:     "annotations",
+				MultiSecondaries: []string{"loki"},
+			}
+			use := useStore(cfg, featuremgmt.WithFeatures())
+			require.False(t, use)
+		})
+	})
+
+	t.Run("true if only backend is Loki", func(t *testing.T) {
+		t.Run("only", func(t *testing.T) {
+			cfg := setting.UnifiedAlertingStateHistorySettings{
+				Enabled: true,
+				Backend: "loki",
+			}
+			features := featuremgmt.WithFeatures(
+				featuremgmt.FlagAlertStateHistoryLokiOnly,
+				featuremgmt.FlagAlertStateHistoryLokiPrimary,
+				featuremgmt.FlagAlertStateHistoryLokiSecondary,
+			)
+			use := useStore(cfg, features)
+			require.True(t, use)
+		})
+	})
+}
diff --git a/pkg/services/annotations/annotationsimpl/store.go b/pkg/services/annotations/annotationsimpl/store.go
index 935afa85bd9a0..b1c3643a9c35d 100644
--- a/pkg/services/annotations/annotationsimpl/store.go
+++ b/pkg/services/annotations/annotationsimpl/store.go
@@ -3,17 +3,33 @@ package annotationsimpl
 import (
 	"context"
 
+	"github.com/grafana/grafana/pkg/services/annotations/accesscontrol"
+
 	"github.com/grafana/grafana/pkg/services/annotations"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
 type store interface {
+	readStore
+	writeStore
+}
+
+type commonStore interface {
+	Type() string
+}
+
+type readStore interface {
+	commonStore
+	Get(ctx context.Context, query *annotations.ItemQuery, accessResources *accesscontrol.AccessResources) ([]*annotations.ItemDTO, error)
+	GetTags(ctx context.Context, query *annotations.TagsQuery) (annotations.FindTagsResult, error)
+}
+
+type writeStore interface {
+	commonStore
 	Add(ctx context.Context, items *annotations.Item) error
 	AddMany(ctx context.Context, items []annotations.Item) error
 	Update(ctx context.Context, item *annotations.Item) error
-	Get(ctx context.Context, query *annotations.ItemQuery) ([]*annotations.ItemDTO, error)
 	Delete(ctx context.Context, params *annotations.DeleteParams) error
-	GetTags(ctx context.Context, query *annotations.TagsQuery) (annotations.FindTagsResult, error)
 	CleanAnnotations(ctx context.Context, cfg setting.AnnotationCleanupSettings, annotationType string) (int64, error)
 	CleanOrphanedAnnotationTags(ctx context.Context) (int64, error)
 }
diff --git a/pkg/services/annotations/annotationsimpl/time.go b/pkg/services/annotations/annotationsimpl/time.go
new file mode 100644
index 0000000000000..e47449d0c8fee
--- /dev/null
+++ b/pkg/services/annotations/annotationsimpl/time.go
@@ -0,0 +1,8 @@
+package annotationsimpl
+
+import "time"
+
+var (
+	// timeNow is an equivalent time.Now() that can be replaced in tests
+	timeNow = time.Now
+)
diff --git a/pkg/services/annotations/annotationsimpl/xorm_store.go b/pkg/services/annotations/annotationsimpl/xorm_store.go
index 76bb9281386c5..6ae9ddc3ce1bd 100644
--- a/pkg/services/annotations/annotationsimpl/xorm_store.go
+++ b/pkg/services/annotations/annotationsimpl/xorm_store.go
@@ -5,25 +5,22 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"strconv"
 	"strings"
 	"time"
 
+	"github.com/grafana/grafana/pkg/services/annotations/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
-	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/annotations"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
-	"github.com/grafana/grafana/pkg/services/sqlstore/permissions"
-	"github.com/grafana/grafana/pkg/services/sqlstore/searchstore"
 	"github.com/grafana/grafana/pkg/services/tag"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
-var timeNow = time.Now
-
 // Update the item so that EpochEnd >= Epoch
 func validateTimeRange(item *annotations.Item) error {
 	if item.EpochEnd == 0 {
@@ -42,12 +39,23 @@ func validateTimeRange(item *annotations.Item) error {
 }
 
 type xormRepositoryImpl struct {
-	cfg               *setting.Cfg
-	features          featuremgmt.FeatureToggles
-	db                db.DB
-	log               log.Logger
-	maximumTagsLength int64
-	tagService        tag.Service
+	cfg        *setting.Cfg
+	db         db.DB
+	log        log.Logger
+	tagService tag.Service
+}
+
+func NewXormStore(cfg *setting.Cfg, l log.Logger, db db.DB, tagService tag.Service) *xormRepositoryImpl {
+	return &xormRepositoryImpl{
+		cfg:        cfg,
+		db:         db,
+		log:        l,
+		tagService: tagService,
+	}
+}
+
+func (r *xormRepositoryImpl) Type() string {
+	return "sql"
 }
 
 func (r *xormRepositoryImpl) Add(ctx context.Context, item *annotations.Item) error {
@@ -237,7 +245,7 @@ func tagSet[T any](fn func(T) int64, list []T) map[int64]struct{} {
 	return set
 }
 
-func (r *xormRepositoryImpl) Get(ctx context.Context, query *annotations.ItemQuery) ([]*annotations.ItemDTO, error) {
+func (r *xormRepositoryImpl) Get(ctx context.Context, query *annotations.ItemQuery, accessResources *accesscontrol.AccessResources) ([]*annotations.ItemDTO, error) {
 	var sql bytes.Buffer
 	params := make([]interface{}, 0)
 	items := make([]*annotations.ItemDTO, 0)
@@ -339,12 +347,11 @@ func (r *xormRepositoryImpl) Get(ctx context.Context, query *annotations.ItemQue
 			}
 		}
 
-		acFilter, err := r.getAccessControlFilter(query.SignedInUser)
+		acFilter, err := r.getAccessControlFilter(query.SignedInUser, accessResources)
 		if err != nil {
 			return err
 		}
-		sql.WriteString(fmt.Sprintf(" AND (%s)", acFilter.where))
-		params = append(params, acFilter.whereParams...)
+		sql.WriteString(fmt.Sprintf(" AND (%s)", acFilter))
 
 		if query.Limit == 0 {
 			query.Limit = 100
@@ -352,13 +359,6 @@ func (r *xormRepositoryImpl) Get(ctx context.Context, query *annotations.ItemQue
 
 		// order of ORDER BY arguments match the order of a sql index for performance
 		sql.WriteString(" ORDER BY a.org_id, a.epoch_end DESC, a.epoch DESC" + r.db.GetDialect().Limit(query.Limit) + " ) dt on dt.id = annotation.id")
-		if acFilter.recQueries != "" {
-			var sb bytes.Buffer
-			sb.WriteString(acFilter.recQueries)
-			sb.WriteString(sql.String())
-			sql = sb
-			params = append(acFilter.recParams, params...)
-		}
 
 		if err := sess.SQL(sql.String(), params...).Find(&items); err != nil {
 			items = nil
@@ -371,64 +371,37 @@ func (r *xormRepositoryImpl) Get(ctx context.Context, query *annotations.ItemQue
 	return items, err
 }
 
-type acFilter struct {
-	where       string
-	whereParams []interface{}
-	recQueries  string
-	recParams   []interface{}
-}
-
-func (r *xormRepositoryImpl) getAccessControlFilter(user identity.Requester) (acFilter, error) {
-	var recQueries string
-	var recQueriesParams []interface{}
+func (r *xormRepositoryImpl) getAccessControlFilter(user identity.Requester, accessResources *accesscontrol.AccessResources) (string, error) {
+	var filters []string
 
-	if user == nil || user.IsNil() {
-		return acFilter{}, errors.New("missing permissions")
+	if accessResources.CanAccessOrgAnnotations {
+		filters = append(filters, "a.dashboard_id = 0")
 	}
 
-	scopes, has := user.GetPermissions()[ac.ActionAnnotationsRead]
-	if !has {
-		return acFilter{}, errors.New("missing permissions")
-	}
-	types, hasWildcardScope := ac.ParseScopes(ac.ScopeAnnotationsProvider.GetResourceScopeType(""), scopes)
-	if hasWildcardScope {
-		types = map[interface{}]struct{}{annotations.Dashboard.String(): {}, annotations.Organization.String(): {}}
-	}
+	if accessResources.CanAccessDashAnnotations {
+		var dashboardIDs []int64
+		for _, id := range accessResources.Dashboards {
+			dashboardIDs = append(dashboardIDs, id)
+		}
 
-	var filters []string
-	var params []interface{}
-	for t := range types {
-		// annotation read permission with scope annotations:type:organization allows listing annotations that are not associated with a dashboard
-		if t == annotations.Organization.String() {
-			filters = append(filters, "a.dashboard_id = 0")
-		}
-		// annotation read permission with scope annotations:type:dashboard allows listing annotations from dashboards which the user can view
-		if t == annotations.Dashboard.String() {
-			recursiveQueriesAreSupported, err := r.db.RecursiveQueriesAreSupported()
-			if err != nil {
-				return acFilter{}, err
-			}
+		var inClause string
+		if len(dashboardIDs) == 0 {
+			inClause = "SELECT * FROM (SELECT 0 LIMIT 0) tt" // empty set
+		} else {
+			b := make([]byte, 0, 3*len(dashboardIDs))
 
-			filterRBAC := permissions.NewAccessControlDashboardPermissionFilter(user, dashboards.PERMISSION_VIEW, searchstore.TypeDashboard, r.features, recursiveQueriesAreSupported)
-			dashboardFilter, dashboardParams := filterRBAC.Where()
-			recQueries, recQueriesParams = filterRBAC.With()
-			leftJoin := filterRBAC.LeftJoin()
-			filter := fmt.Sprintf("a.dashboard_id IN(SELECT id FROM dashboard WHERE %s)", dashboardFilter)
-			if leftJoin != "" {
-				filter = fmt.Sprintf("a.dashboard_id IN(SELECT dashboard.id FROM dashboard LEFT OUTER JOIN %s WHERE %s)", leftJoin, dashboardFilter)
+			b = strconv.AppendInt(b, dashboardIDs[0], 10)
+			for _, num := range dashboardIDs[1:] {
+				b = append(b, ',')
+				b = strconv.AppendInt(b, num, 10)
 			}
-			filters = append(filters, filter)
-			params = dashboardParams
+
+			inClause = string(b)
 		}
+		filters = append(filters, fmt.Sprintf("a.dashboard_id IN (%s)", inClause))
 	}
 
-	f := acFilter{
-		where:       strings.Join(filters, " OR "),
-		whereParams: params,
-		recQueries:  recQueries,
-		recParams:   recQueriesParams,
-	}
-	return f, nil
+	return strings.Join(filters, " OR "), nil
 }
 
 func (r *xormRepositoryImpl) Delete(ctx context.Context, params *annotations.DeleteParams) error {
@@ -541,8 +514,8 @@ func (r *xormRepositoryImpl) validateTagsLength(item *annotations.Item) error {
 		}
 	}
 	estimatedTagsLength += 1 // trailing: ]
-	if estimatedTagsLength > int(r.maximumTagsLength) {
-		return annotations.ErrBaseTagLimitExceeded.Errorf("tags length (%d) exceeds the maximum allowed (%d): modify the configuration to increase it", estimatedTagsLength, r.maximumTagsLength)
+	if estimatedTagsLength > int(r.cfg.AnnotationMaximumTagsLength) {
+		return annotations.ErrBaseTagLimitExceeded.Errorf("tags length (%d) exceeds the maximum allowed (%d): modify the configuration to increase it", estimatedTagsLength, r.cfg.AnnotationMaximumTagsLength)
 	}
 	return nil
 }
@@ -550,11 +523,21 @@ func (r *xormRepositoryImpl) validateTagsLength(item *annotations.Item) error {
 func (r *xormRepositoryImpl) CleanAnnotations(ctx context.Context, cfg setting.AnnotationCleanupSettings, annotationType string) (int64, error) {
 	var totalAffected int64
 	if cfg.MaxAge > 0 {
-		cutoffDate := time.Now().Add(-cfg.MaxAge).UnixNano() / int64(time.Millisecond)
-		deleteQuery := `DELETE FROM annotation WHERE id IN (SELECT id FROM (SELECT id FROM annotation WHERE %s AND created < %v ORDER BY id DESC %s) a)`
-		sql := fmt.Sprintf(deleteQuery, annotationType, cutoffDate, r.db.GetDialect().Limit(r.cfg.AnnotationCleanupJobBatchSize))
+		cutoffDate := timeNow().Add(-cfg.MaxAge).UnixNano() / int64(time.Millisecond)
+		// Single-statement approaches, specifically ones using batched sub-queries, seem to deadlock with concurrent inserts on MySQL.
+		// We have a bounded batch size, so work around this by first loading the IDs into memory and allowing any locks to flush inside each batch.
+		// This may under-delete when concurrent inserts happen, but any such annotations will simply be cleaned on the next cycle.
+		//
+		// We execute the following batched operation repeatedly until either we run out of objects, the context is cancelled, or there is an error.
+		affected, err := untilDoneOrCancelled(ctx, func() (int64, error) {
+			cond := fmt.Sprintf(`%s AND created < %v ORDER BY id DESC %s`, annotationType, cutoffDate, r.db.GetDialect().Limit(r.cfg.AnnotationCleanupJobBatchSize))
+			ids, err := r.fetchIDs(ctx, "annotation", cond)
+			if err != nil {
+				return 0, err
+			}
 
-		affected, err := r.executeUntilDoneOrCancelled(ctx, sql)
+			return r.deleteByIDs(ctx, "annotation", ids)
+		})
 		totalAffected += affected
 		if err != nil {
 			return totalAffected, err
@@ -562,41 +545,105 @@ func (r *xormRepositoryImpl) CleanAnnotations(ctx context.Context, cfg setting.A
 	}
 
 	if cfg.MaxCount > 0 {
-		deleteQuery := `DELETE FROM annotation WHERE id IN (SELECT id FROM (SELECT id FROM annotation WHERE %s ORDER BY id DESC %s) a)`
-		sql := fmt.Sprintf(deleteQuery, annotationType, r.db.GetDialect().LimitOffset(r.cfg.AnnotationCleanupJobBatchSize, cfg.MaxCount))
-		affected, err := r.executeUntilDoneOrCancelled(ctx, sql)
+		// Similar strategy as the above cleanup process, to avoid deadlocks.
+		affected, err := untilDoneOrCancelled(ctx, func() (int64, error) {
+			cond := fmt.Sprintf(`%s ORDER BY id DESC %s`, annotationType, r.db.GetDialect().LimitOffset(r.cfg.AnnotationCleanupJobBatchSize, cfg.MaxCount))
+			ids, err := r.fetchIDs(ctx, "annotation", cond)
+			if err != nil {
+				return 0, err
+			}
+
+			return r.deleteByIDs(ctx, "annotation", ids)
+		})
 		totalAffected += affected
-		return totalAffected, err
+		if err != nil {
+			return totalAffected, err
+		}
 	}
 
 	return totalAffected, nil
 }
 
 func (r *xormRepositoryImpl) CleanOrphanedAnnotationTags(ctx context.Context) (int64, error) {
-	deleteQuery := `DELETE FROM annotation_tag WHERE id IN ( SELECT id FROM (SELECT id FROM annotation_tag WHERE NOT EXISTS (SELECT 1 FROM annotation a WHERE annotation_id = a.id) %s) a)`
-	sql := fmt.Sprintf(deleteQuery, r.db.GetDialect().Limit(r.cfg.AnnotationCleanupJobBatchSize))
-	return r.executeUntilDoneOrCancelled(ctx, sql)
+	return untilDoneOrCancelled(ctx, func() (int64, error) {
+		cond := fmt.Sprintf(`NOT EXISTS (SELECT 1 FROM annotation a WHERE annotation_id = a.id) %s`, r.db.GetDialect().Limit(r.cfg.AnnotationCleanupJobBatchSize))
+		ids, err := r.fetchIDs(ctx, "annotation_tag", cond)
+		if err != nil {
+			return 0, err
+		}
+
+		return r.deleteByIDs(ctx, "annotation_tag", ids)
+	})
+}
+
+func (r *xormRepositoryImpl) fetchIDs(ctx context.Context, table, condition string) ([]int64, error) {
+	sql := fmt.Sprintf(`SELECT id FROM %s`, table)
+	if condition == "" {
+		return nil, fmt.Errorf("condition must be supplied; cannot fetch IDs from entire table")
+	}
+	sql += fmt.Sprintf(` WHERE %s`, condition)
+	ids := make([]int64, 0)
+	err := r.db.WithDbSession(ctx, func(session *db.Session) error {
+		return session.SQL(sql).Find(&ids)
+	})
+	return ids, err
+}
+
+func (r *xormRepositoryImpl) deleteByIDs(ctx context.Context, table string, ids []int64) (int64, error) {
+	if len(ids) == 0 {
+		return 0, nil
+	}
+
+	sql := ""
+	args := make([]any, 0)
+
+	// SQLite has a parameter limit of 999.
+	// If the batch size is bigger than that, and we're on SQLite, we have to put the IDs directly into the statement.
+	const sqliteParameterLimit = 999
+	if r.db.GetDBType() == migrator.SQLite && r.cfg.AnnotationCleanupJobBatchSize > sqliteParameterLimit {
+		values := fmt.Sprint(ids[0])
+		for _, v := range ids[1:] {
+			values = fmt.Sprintf("%s, %d", values, v)
+		}
+		sql = fmt.Sprintf(`DELETE FROM %s WHERE id IN (%s)`, table, values)
+	} else {
+		placeholders := "?" + strings.Repeat(",?", len(ids)-1)
+		sql = fmt.Sprintf(`DELETE FROM %s WHERE id IN (%s)`, table, placeholders)
+		args = asAny(ids)
+	}
+
+	var affected int64
+	err := r.db.WithDbSession(ctx, func(session *db.Session) error {
+		res, err := session.Exec(append([]any{sql}, args...)...)
+		if err != nil {
+			return err
+		}
+		affected, err = res.RowsAffected()
+		return err
+	})
+	return affected, err
 }
 
-func (r *xormRepositoryImpl) executeUntilDoneOrCancelled(ctx context.Context, sql string) (int64, error) {
+func asAny(vs []int64) []any {
+	r := make([]any, len(vs))
+	for i, v := range vs {
+		r[i] = v
+	}
+	return r
+}
+
+// untilDoneOrCancelled repeatedly executes batched work until that work is either done (i.e., returns zero affected objects),
+// a batch produces an error, or the provided context is cancelled.
+// The work to be done is given as a callback that returns the number of affected objects for each batch, plus that batch's errors.
+func untilDoneOrCancelled(ctx context.Context, batchWork func() (int64, error)) (int64, error) {
 	var totalAffected int64
 	for {
 		select {
 		case <-ctx.Done():
 			return totalAffected, ctx.Err()
 		default:
-			var affected int64
-			err := r.db.WithDbSession(ctx, func(session *db.Session) error {
-				res, err := session.Exec(sql)
-				if err != nil {
-					return err
-				}
-
-				affected, err = res.RowsAffected()
-				totalAffected += affected
-
-				return err
-			})
+			affected, err := batchWork()
+			totalAffected += affected
 			if err != nil {
 				return totalAffected, err
 			}
diff --git a/pkg/services/annotations/annotationsimpl/xorm_store_test.go b/pkg/services/annotations/annotationsimpl/xorm_store_test.go
index 10cf86e8774dd..92b27405ac357 100644
--- a/pkg/services/annotations/annotationsimpl/xorm_store_test.go
+++ b/pkg/services/annotations/annotationsimpl/xorm_store_test.go
@@ -2,30 +2,22 @@ package annotationsimpl
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"strings"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/accesscontrol/mock"
 	"github.com/grafana/grafana/pkg/services/annotations"
+	annotation_ac "github.com/grafana/grafana/pkg/services/annotations/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/annotations/testutil"
 	"github.com/grafana/grafana/pkg/services/dashboards"
-	dashboardstore "github.com/grafana/grafana/pkg/services/dashboards/database"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/services/folder"
-	"github.com/grafana/grafana/pkg/services/folder/folderimpl"
-	"github.com/grafana/grafana/pkg/services/guardian"
-	"github.com/grafana/grafana/pkg/services/quota/quotatest"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/services/tag"
 	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
@@ -38,10 +30,11 @@ func TestIntegrationAnnotations(t *testing.T) {
 		t.Skip("skipping integration test")
 	}
 	sql := db.InitTestDB(t)
-	var maximumTagsLength int64 = 60
-	repo := xormRepositoryImpl{db: sql, cfg: setting.NewCfg(), log: log.New("annotation.test"), tagService: tagimpl.ProvideService(sql, sql.Cfg), maximumTagsLength: maximumTagsLength,
-		features: featuremgmt.WithFeatures(),
-	}
+
+	cfg := setting.NewCfg()
+	cfg.AnnotationMaximumTagsLength = 60
+
+	store := NewXormStore(cfg, log.New("annotation.test"), sql, tagimpl.ProvideService(sql))
 
 	testUser := &user.SignedInUser{
 		OrgID: 1,
@@ -66,30 +59,23 @@ func TestIntegrationAnnotations(t *testing.T) {
 			assert.NoError(t, err)
 		})
 
-		quotaService := quotatest.New(false, nil)
-		dashboardStore, err := dashboardstore.ProvideDashboardStore(sql, sql.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sql, sql.Cfg), quotaService)
-		require.NoError(t, err)
-
-		testDashboard1 := dashboards.SaveDashboardCommand{
+		dashboard := testutil.CreateDashboard(t, sql, featuremgmt.WithFeatures(), dashboards.SaveDashboardCommand{
 			UserID: 1,
 			OrgID:  1,
 			Dashboard: simplejson.NewFromAny(map[string]any{
 				"title": "Dashboard 1",
 			}),
-		}
-
-		dashboard, err := dashboardStore.SaveDashboard(context.Background(), testDashboard1)
-		require.NoError(t, err)
+		})
 
-		testDashboard2 := dashboards.SaveDashboardCommand{
+		dashboard2 := testutil.CreateDashboard(t, sql, featuremgmt.WithFeatures(), dashboards.SaveDashboardCommand{
 			UserID: 1,
 			OrgID:  1,
 			Dashboard: simplejson.NewFromAny(map[string]any{
 				"title": "Dashboard 2",
 			}),
-		}
-		dashboard2, err := dashboardStore.SaveDashboard(context.Background(), testDashboard2)
-		require.NoError(t, err)
+		})
+
+		var err error
 
 		annotation := &annotations.Item{
 			OrgID:       1,
@@ -101,7 +87,7 @@ func TestIntegrationAnnotations(t *testing.T) {
 			Tags:        []string{"outage", "error", "type:outage", "server:server-1"},
 			Data:        simplejson.NewFromAny(map[string]any{"data1": "I am a cool data", "data2": "I am another cool data"}),
 		}
-		err = repo.Add(context.Background(), annotation)
+		err = store.Add(context.Background(), annotation)
 		require.NoError(t, err)
 		assert.Greater(t, annotation.ID, int64(0))
 		assert.Equal(t, annotation.Epoch, annotation.EpochEnd)
@@ -116,7 +102,7 @@ func TestIntegrationAnnotations(t *testing.T) {
 			EpochEnd:    20,
 			Tags:        []string{"outage", "type:outage", "server:server-1", "error"},
 		}
-		err = repo.Add(context.Background(), annotation2)
+		err = store.Add(context.Background(), annotation2)
 		require.NoError(t, err)
 		assert.Greater(t, annotation2.ID, int64(0))
 		assert.Equal(t, int64(20), annotation2.Epoch)
@@ -130,11 +116,11 @@ func TestIntegrationAnnotations(t *testing.T) {
 			Epoch:  15,
 			Tags:   []string{"deploy"},
 		}
-		err = repo.Add(context.Background(), organizationAnnotation1)
+		err = store.Add(context.Background(), organizationAnnotation1)
 		require.NoError(t, err)
 		assert.Greater(t, organizationAnnotation1.ID, int64(0))
 
-		globalAnnotation2 := &annotations.Item{
+		organizationAnnotation2 := &annotations.Item{
 			OrgID:  1,
 			UserID: 1,
 			Text:   "rollback",
@@ -142,16 +128,22 @@ func TestIntegrationAnnotations(t *testing.T) {
 			Epoch:  17,
 			Tags:   []string{"rollback"},
 		}
-		err = repo.Add(context.Background(), globalAnnotation2)
+		err = store.Add(context.Background(), organizationAnnotation2)
 		require.NoError(t, err)
-		assert.Greater(t, globalAnnotation2.ID, int64(0))
+		assert.Greater(t, organizationAnnotation2.ID, int64(0))
+
 		t.Run("Can query for annotation by dashboard id", func(t *testing.T) {
-			items, err := repo.Get(context.Background(), &annotations.ItemQuery{
+			items, err := store.Get(context.Background(), &annotations.ItemQuery{
 				OrgID:        1,
 				DashboardID:  dashboard.ID,
 				From:         0,
 				To:           15,
 				SignedInUser: testUser,
+			}, &annotation_ac.AccessResources{
+				Dashboards: map[string]int64{
+					dashboard.UID: dashboard.ID,
+				},
+				CanAccessDashAnnotations: true,
 			})
 
 			require.NoError(t, err)
@@ -170,9 +162,9 @@ func TestIntegrationAnnotations(t *testing.T) {
 			Text:   "rollback",
 			Type:   "",
 			Epoch:  17,
-			Tags:   []string{strings.Repeat("a", int(maximumTagsLength+1))},
+			Tags:   []string{strings.Repeat("a", int(cfg.AnnotationMaximumTagsLength+1))},
 		}
-		err = repo.Add(context.Background(), badAnnotation)
+		err = store.Add(context.Background(), badAnnotation)
 		require.Error(t, err)
 		require.ErrorIs(t, err, annotations.ErrBaseTagLimitExceeded)
 
@@ -187,11 +179,12 @@ func TestIntegrationAnnotations(t *testing.T) {
 				}
 			}
 
-			err := repo.AddMany(context.Background(), items)
+			err := store.AddMany(context.Background(), items)
 
 			require.NoError(t, err)
 			query := &annotations.ItemQuery{OrgID: 100, SignedInUser: testUser}
-			inserted, err := repo.Get(context.Background(), query)
+			accRes := &annotation_ac.AccessResources{CanAccessOrgAnnotations: true}
+			inserted, err := store.Get(context.Background(), query, accRes)
 			require.NoError(t, err)
 			assert.Len(t, inserted, count)
 			for _, ins := range inserted {
@@ -213,20 +206,26 @@ func TestIntegrationAnnotations(t *testing.T) {
 			}
 			items[0].Tags = []string{"type:test"}
 
-			err := repo.AddMany(context.Background(), items)
+			err := store.AddMany(context.Background(), items)
 
 			require.NoError(t, err)
 			query := &annotations.ItemQuery{OrgID: 101, SignedInUser: testUser}
-			inserted, err := repo.Get(context.Background(), query)
+			accRes := &annotation_ac.AccessResources{CanAccessOrgAnnotations: true}
+			inserted, err := store.Get(context.Background(), query, accRes)
 			require.NoError(t, err)
 			assert.Len(t, inserted, count)
 		})
 
 		t.Run("Can query for annotation by id", func(t *testing.T) {
-			items, err := repo.Get(context.Background(), &annotations.ItemQuery{
+			items, err := store.Get(context.Background(), &annotations.ItemQuery{
 				OrgID:        1,
 				AnnotationID: annotation2.ID,
 				SignedInUser: testUser,
+			}, &annotation_ac.AccessResources{
+				Dashboards: map[string]int64{
+					dashboard2.UID: dashboard2.ID,
+				},
+				CanAccessDashAnnotations: true,
 			})
 			require.NoError(t, err)
 			assert.Len(t, items, 1)
@@ -234,78 +233,99 @@ func TestIntegrationAnnotations(t *testing.T) {
 		})
 
 		t.Run("Should not find any when item is outside time range", func(t *testing.T) {
-			items, err := repo.Get(context.Background(), &annotations.ItemQuery{
+			accRes := &annotation_ac.AccessResources{
+				Dashboards:               map[string]int64{"foo": 1},
+				CanAccessDashAnnotations: true,
+			}
+			items, err := store.Get(context.Background(), &annotations.ItemQuery{
 				OrgID:        1,
 				DashboardID:  1,
 				From:         12,
 				To:           15,
 				SignedInUser: testUser,
-			})
+			}, accRes)
 			require.NoError(t, err)
 			assert.Empty(t, items)
 		})
 
 		t.Run("Should not find one when tag filter does not match", func(t *testing.T) {
-			items, err := repo.Get(context.Background(), &annotations.ItemQuery{
+			accRes := &annotation_ac.AccessResources{
+				Dashboards:               map[string]int64{"foo": 1},
+				CanAccessDashAnnotations: true,
+			}
+			items, err := store.Get(context.Background(), &annotations.ItemQuery{
 				OrgID:        1,
 				DashboardID:  1,
 				From:         1,
 				To:           15,
 				Tags:         []string{"asd"},
 				SignedInUser: testUser,
-			})
+			}, accRes)
 			require.NoError(t, err)
 			assert.Empty(t, items)
 		})
 
 		t.Run("Should not find one when type filter does not match", func(t *testing.T) {
-			items, err := repo.Get(context.Background(), &annotations.ItemQuery{
+			accRes := &annotation_ac.AccessResources{
+				Dashboards:               map[string]int64{"foo": 1},
+				CanAccessDashAnnotations: true,
+			}
+			items, err := store.Get(context.Background(), &annotations.ItemQuery{
 				OrgID:        1,
 				DashboardID:  1,
 				From:         1,
 				To:           15,
 				Type:         "alert",
 				SignedInUser: testUser,
-			})
+			}, accRes)
 			require.NoError(t, err)
 			assert.Empty(t, items)
 		})
 
 		t.Run("Should find one when all tag filters does match", func(t *testing.T) {
-			items, err := repo.Get(context.Background(), &annotations.ItemQuery{
+			accRes := &annotation_ac.AccessResources{
+				Dashboards:               map[string]int64{"foo": 1},
+				CanAccessDashAnnotations: true,
+			}
+			items, err := store.Get(context.Background(), &annotations.ItemQuery{
 				OrgID:        1,
 				DashboardID:  1,
 				From:         1,
 				To:           15, // this will exclude the second test annotation
 				Tags:         []string{"outage", "error"},
 				SignedInUser: testUser,
-			})
+			}, accRes)
 			require.NoError(t, err)
 			assert.Len(t, items, 1)
 		})
 
 		t.Run("Should find two annotations using partial match", func(t *testing.T) {
-			items, err := repo.Get(context.Background(), &annotations.ItemQuery{
+			accRes := &annotation_ac.AccessResources{CanAccessOrgAnnotations: true}
+			items, err := store.Get(context.Background(), &annotations.ItemQuery{
 				OrgID:        1,
 				From:         1,
 				To:           25,
 				MatchAny:     true,
 				Tags:         []string{"rollback", "deploy"},
 				SignedInUser: testUser,
-			})
+			}, accRes)
 			require.NoError(t, err)
 			assert.Len(t, items, 2)
 		})
 
 		t.Run("Should find one when all key value tag filters does match", func(t *testing.T) {
-			items, err := repo.Get(context.Background(), &annotations.ItemQuery{
+			accRes := &annotation_ac.AccessResources{
+				Dashboards:               map[string]int64{"foo": 1},
+				CanAccessDashAnnotations: true,
+			}
+			items, err := store.Get(context.Background(), &annotations.ItemQuery{
 				OrgID:        1,
 				DashboardID:  1,
 				From:         1,
 				To:           15,
 				Tags:         []string{"type:outage", "server:server-1"},
 				SignedInUser: testUser,
-			})
+			}, accRes)
 			require.NoError(t, err)
 			assert.Len(t, items, 1)
 		})
@@ -318,11 +338,15 @@ func TestIntegrationAnnotations(t *testing.T) {
 				To:           15,
 				SignedInUser: testUser,
 			}
-			items, err := repo.Get(context.Background(), query)
+			accRes := &annotation_ac.AccessResources{
+				Dashboards:               map[string]int64{"foo": 1},
+				CanAccessDashAnnotations: true,
+			}
+			items, err := store.Get(context.Background(), query, accRes)
 			require.NoError(t, err)
 
 			annotationId := items[0].ID
-			err = repo.Update(context.Background(), &annotations.Item{
+			err = store.Update(context.Background(), &annotations.Item{
 				ID:    annotationId,
 				OrgID: 1,
 				Text:  "something new",
@@ -330,7 +354,7 @@ func TestIntegrationAnnotations(t *testing.T) {
 			})
 			require.NoError(t, err)
 
-			items, err = repo.Get(context.Background(), query)
+			items, err = store.Get(context.Background(), query, accRes)
 			require.NoError(t, err)
 
 			assert.Equal(t, annotationId, items[0].ID)
@@ -349,11 +373,15 @@ func TestIntegrationAnnotations(t *testing.T) {
 				To:           15,
 				SignedInUser: testUser,
 			}
-			items, err := repo.Get(context.Background(), query)
+			accRes := &annotation_ac.AccessResources{
+				Dashboards:               map[string]int64{"foo": 1},
+				CanAccessDashAnnotations: true,
+			}
+			items, err := store.Get(context.Background(), query, accRes)
 			require.NoError(t, err)
 
 			annotationId := items[0].ID
-			err = repo.Update(context.Background(), &annotations.Item{
+			err = store.Update(context.Background(), &annotations.Item{
 				ID:    annotationId,
 				OrgID: 1,
 				Text:  "something new",
@@ -361,7 +389,7 @@ func TestIntegrationAnnotations(t *testing.T) {
 			})
 			require.NoError(t, err)
 
-			items, err = repo.Get(context.Background(), query)
+			items, err = store.Get(context.Background(), query, accRes)
 			require.NoError(t, err)
 
 			assert.Equal(t, annotationId, items[0].ID)
@@ -378,11 +406,15 @@ func TestIntegrationAnnotations(t *testing.T) {
 				To:           15,
 				SignedInUser: testUser,
 			}
-			items, err := repo.Get(context.Background(), query)
+			accRes := &annotation_ac.AccessResources{
+				Dashboards:               map[string]int64{"foo": 1},
+				CanAccessDashAnnotations: true,
+			}
+			items, err := store.Get(context.Background(), query, accRes)
 			require.NoError(t, err)
 
 			annotationId := items[0].ID
-			err = repo.Update(context.Background(), &annotations.Item{
+			err = store.Update(context.Background(), &annotations.Item{
 				ID:    annotationId,
 				OrgID: 1,
 				Text:  "something new",
@@ -390,7 +422,7 @@ func TestIntegrationAnnotations(t *testing.T) {
 			})
 			require.NoError(t, err)
 
-			items, err = repo.Get(context.Background(), query)
+			items, err = store.Get(context.Background(), query, accRes)
 			require.NoError(t, err)
 
 			assert.Equal(t, annotationId, items[0].ID)
@@ -407,12 +439,16 @@ func TestIntegrationAnnotations(t *testing.T) {
 				To:           15,
 				SignedInUser: testUser,
 			}
-			items, err := repo.Get(context.Background(), query)
+			accRes := &annotation_ac.AccessResources{
+				Dashboards:               map[string]int64{"foo": 1},
+				CanAccessDashAnnotations: true,
+			}
+			items, err := store.Get(context.Background(), query, accRes)
 			require.NoError(t, err)
 
 			annotationId := items[0].ID
 			data := simplejson.NewFromAny(map[string]any{"data": "I am a data", "data2": "I am also a data"})
-			err = repo.Update(context.Background(), &annotations.Item{
+			err = store.Update(context.Background(), &annotations.Item{
 				ID:    annotationId,
 				OrgID: 1,
 				Text:  "something new",
@@ -421,7 +457,7 @@ func TestIntegrationAnnotations(t *testing.T) {
 			})
 			require.NoError(t, err)
 
-			items, err = repo.Get(context.Background(), query)
+			items, err = store.Get(context.Background(), query, accRes)
 			require.NoError(t, err)
 
 			assert.Equal(t, annotationId, items[0].ID)
@@ -439,14 +475,18 @@ func TestIntegrationAnnotations(t *testing.T) {
 				To:           15,
 				SignedInUser: testUser,
 			}
-			items, err := repo.Get(context.Background(), query)
+			accRes := &annotation_ac.AccessResources{
+				Dashboards:               map[string]int64{"foo": 1},
+				CanAccessDashAnnotations: true,
+			}
+			items, err := store.Get(context.Background(), query, accRes)
 			require.NoError(t, err)
 
 			annotationId := items[0].ID
-			err = repo.Delete(context.Background(), &annotations.DeleteParams{ID: annotationId, OrgID: 1})
+			err = store.Delete(context.Background(), &annotations.DeleteParams{ID: annotationId, OrgID: 1})
 			require.NoError(t, err)
 
-			items, err = repo.Get(context.Background(), query)
+			items, err = store.Get(context.Background(), query, accRes)
 			require.NoError(t, err)
 			assert.Empty(t, items)
 		})
@@ -462,29 +502,36 @@ func TestIntegrationAnnotations(t *testing.T) {
 				Tags:        []string{"test"},
 				PanelID:     20,
 			}
-			err = repo.Add(context.Background(), annotation3)
+			err = store.Add(context.Background(), annotation3)
 			require.NoError(t, err)
 
+			accRes := &annotation_ac.AccessResources{
+				Dashboards: map[string]int64{
+					dashboard2.UID: dashboard2.ID,
+				},
+				CanAccessDashAnnotations: true,
+			}
+
 			query := &annotations.ItemQuery{
 				OrgID:        1,
 				AnnotationID: annotation3.ID,
 				SignedInUser: testUser,
 			}
-			items, err := repo.Get(context.Background(), query)
+			items, err := store.Get(context.Background(), query, accRes)
 			require.NoError(t, err)
 
 			dashboardId := items[0].DashboardID
 			panelId := items[0].PanelID
-			err = repo.Delete(context.Background(), &annotations.DeleteParams{DashboardID: dashboardId, PanelID: panelId, OrgID: 1})
+			err = store.Delete(context.Background(), &annotations.DeleteParams{DashboardID: dashboardId, PanelID: panelId, OrgID: 1})
 			require.NoError(t, err)
 
-			items, err = repo.Get(context.Background(), query)
+			items, err = store.Get(context.Background(), query, accRes)
 			require.NoError(t, err)
 			assert.Empty(t, items)
 		})
 
 		t.Run("Should find tags by key", func(t *testing.T) {
-			result, err := repo.GetTags(context.Background(), &annotations.TagsQuery{
+			result, err := store.GetTags(context.Background(), &annotations.TagsQuery{
 				OrgID: 1,
 				Tag:   "server",
 			})
@@ -495,7 +542,7 @@ func TestIntegrationAnnotations(t *testing.T) {
 		})
 
 		t.Run("Should find tags by value", func(t *testing.T) {
-			result, err := repo.GetTags(context.Background(), &annotations.TagsQuery{
+			result, err := store.GetTags(context.Background(), &annotations.TagsQuery{
 				OrgID: 1,
 				Tag:   "outage",
 			})
@@ -508,7 +555,7 @@ func TestIntegrationAnnotations(t *testing.T) {
 		})
 
 		t.Run("Should not find tags in other org", func(t *testing.T) {
-			result, err := repo.GetTags(context.Background(), &annotations.TagsQuery{
+			result, err := store.GetTags(context.Background(), &annotations.TagsQuery{
 				OrgID: 0,
 				Tag:   "server-1",
 			})
@@ -517,7 +564,7 @@ func TestIntegrationAnnotations(t *testing.T) {
 		})
 
 		t.Run("Should not find tags that do not exist", func(t *testing.T) {
-			result, err := repo.GetTags(context.Background(), &annotations.TagsQuery{
+			result, err := store.GetTags(context.Background(), &annotations.TagsQuery{
 				OrgID: 0,
 				Tag:   "unknown:tag",
 			})
@@ -527,359 +574,6 @@ func TestIntegrationAnnotations(t *testing.T) {
 	})
 }
 
-func TestIntegrationAnnotationListingWithRBAC(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	sql := db.InitTestDB(t)
-
-	var maximumTagsLength int64 = 60
-	repo := xormRepositoryImpl{db: sql, cfg: setting.NewCfg(), log: log.New("annotation.test"), tagService: tagimpl.ProvideService(sql, sql.Cfg), maximumTagsLength: maximumTagsLength, features: featuremgmt.WithFeatures()}
-	quotaService := quotatest.New(false, nil)
-	dashboardStore, err := dashboardstore.ProvideDashboardStore(sql, sql.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sql, sql.Cfg), quotaService)
-	require.NoError(t, err)
-
-	testDashboard1 := dashboards.SaveDashboardCommand{
-		UserID:   1,
-		OrgID:    1,
-		IsFolder: false,
-		Dashboard: simplejson.NewFromAny(map[string]any{
-			"title": "Dashboard 1",
-		}),
-	}
-	dashboard, err := dashboardStore.SaveDashboard(context.Background(), testDashboard1)
-	require.NoError(t, err)
-	dash1UID := dashboard.UID
-
-	testDashboard2 := dashboards.SaveDashboardCommand{
-		UserID: 1,
-		OrgID:  1,
-		Dashboard: simplejson.NewFromAny(map[string]any{
-			"title": "Dashboard 2",
-		}),
-	}
-	_, err = dashboardStore.SaveDashboard(context.Background(), testDashboard2)
-	require.NoError(t, err)
-
-	dash1Annotation := &annotations.Item{
-		OrgID:       1,
-		DashboardID: 1,
-		Epoch:       10,
-	}
-	err = repo.Add(context.Background(), dash1Annotation)
-	require.NoError(t, err)
-
-	dash2Annotation := &annotations.Item{
-		OrgID:       1,
-		DashboardID: 2,
-		Epoch:       10,
-		Tags:        []string{"foo:bar"},
-	}
-	err = repo.Add(context.Background(), dash2Annotation)
-	require.NoError(t, err)
-
-	organizationAnnotation := &annotations.Item{
-		OrgID: 1,
-		Epoch: 10,
-	}
-	err = repo.Add(context.Background(), organizationAnnotation)
-	require.NoError(t, err)
-
-	user := &user.SignedInUser{
-		UserID: 1,
-		OrgID:  1,
-	}
-	role := setupRBACRole(t, sql, user)
-
-	type testStruct struct {
-		description           string
-		permissions           map[string][]string
-		expectedAnnotationIds []int64
-		expectedError         bool
-	}
-
-	testCases := []testStruct{
-		{
-			description: "Should find all annotations when has permissions to list all annotations and read all dashboards",
-			permissions: map[string][]string{
-				accesscontrol.ActionAnnotationsRead: {accesscontrol.ScopeAnnotationsAll},
-				dashboards.ActionDashboardsRead:     {dashboards.ScopeDashboardsAll},
-			},
-			expectedAnnotationIds: []int64{dash1Annotation.ID, dash2Annotation.ID, organizationAnnotation.ID},
-		},
-		{
-			description: "Should find all dashboard annotations",
-			permissions: map[string][]string{
-				accesscontrol.ActionAnnotationsRead: {accesscontrol.ScopeAnnotationsTypeDashboard},
-				dashboards.ActionDashboardsRead:     {dashboards.ScopeDashboardsAll},
-			},
-			expectedAnnotationIds: []int64{dash1Annotation.ID, dash2Annotation.ID},
-		},
-		{
-			description: "Should find only annotations from dashboards that user can read",
-			permissions: map[string][]string{
-				accesscontrol.ActionAnnotationsRead: {accesscontrol.ScopeAnnotationsTypeDashboard},
-				dashboards.ActionDashboardsRead:     {fmt.Sprintf("dashboards:uid:%s", dash1UID)},
-			},
-			expectedAnnotationIds: []int64{dash1Annotation.ID},
-		},
-		{
-			description: "Should find no annotations if user can't view dashboards or organization annotations",
-			permissions: map[string][]string{
-				accesscontrol.ActionAnnotationsRead: {accesscontrol.ScopeAnnotationsTypeDashboard},
-			},
-			expectedAnnotationIds: []int64{},
-		},
-		{
-			description: "Should find only organization annotations",
-			permissions: map[string][]string{
-				accesscontrol.ActionAnnotationsRead: {accesscontrol.ScopeAnnotationsTypeOrganization},
-				dashboards.ActionDashboardsRead:     {dashboards.ScopeDashboardsAll},
-			},
-			expectedAnnotationIds: []int64{organizationAnnotation.ID},
-		},
-		{
-			description: "Should error if user doesn't have annotation read permissions",
-			permissions: map[string][]string{
-				dashboards.ActionDashboardsRead: {dashboards.ScopeDashboardsAll},
-			},
-			expectedError: true,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.description, func(t *testing.T) {
-			user.Permissions = map[int64]map[string][]string{1: tc.permissions}
-			setupRBACPermission(t, sql, role, user)
-
-			results, err := repo.Get(context.Background(), &annotations.ItemQuery{
-				OrgID:        1,
-				SignedInUser: user,
-			})
-			if tc.expectedError {
-				require.Error(t, err)
-				return
-			}
-			require.NoError(t, err)
-			assert.Len(t, results, len(tc.expectedAnnotationIds))
-			for _, r := range results {
-				assert.Contains(t, tc.expectedAnnotationIds, r.ID)
-			}
-		})
-	}
-}
-
-func TestIntegrationAnnotationListingWithInheritedRBAC(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-
-	orgID := int64(1)
-	permissions := []accesscontrol.Permission{
-		{
-			Action: dashboards.ActionFoldersCreate,
-		}, {
-			Action: dashboards.ActionFoldersWrite,
-			Scope:  dashboards.ScopeFoldersAll,
-		},
-	}
-	usr := &user.SignedInUser{
-		UserID:      1,
-		OrgID:       orgID,
-		Permissions: map[int64]map[string][]string{orgID: accesscontrol.GroupScopesByAction(permissions)},
-	}
-
-	var role *accesscontrol.Role
-
-	dashboardIDs := make([]int64, 0, folder.MaxNestedFolderDepth+1)
-	annotationsTexts := make([]string, 0, folder.MaxNestedFolderDepth+1)
-
-	setupFolderStructure := func() *sqlstore.SQLStore {
-		db := db.InitTestDB(t)
-
-		// enable nested folders so that the folder table is populated for all the tests
-		features := featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)
-
-		origNewGuardian := guardian.New
-		guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanViewValue: true, CanSaveValue: true})
-		t.Cleanup(func() {
-			guardian.New = origNewGuardian
-		})
-
-		// dashboard store commands that should be called.
-		dashStore, err := dashboardstore.ProvideDashboardStore(db, db.Cfg, features, tagimpl.ProvideService(db, db.Cfg), quotatest.New(false, nil))
-		require.NoError(t, err)
-
-		folderSvc := folderimpl.ProvideService(mock.New(), bus.ProvideBus(tracing.InitializeTracerForTest()), db.Cfg, dashStore, folderimpl.ProvideDashboardFolderStore(db), db, features)
-
-		var maximumTagsLength int64 = 60
-		repo := xormRepositoryImpl{db: db, cfg: setting.NewCfg(), log: log.New("annotation.test"), tagService: tagimpl.ProvideService(db, db.Cfg), maximumTagsLength: maximumTagsLength, features: features}
-
-		parentUID := ""
-		for i := 0; ; i++ {
-			uid := fmt.Sprintf("f%d", i)
-			f, err := folderSvc.Create(context.Background(), &folder.CreateFolderCommand{
-				UID:          uid,
-				OrgID:        orgID,
-				Title:        uid,
-				SignedInUser: usr,
-				ParentUID:    parentUID,
-			})
-			if err != nil {
-				if errors.Is(err, folder.ErrMaximumDepthReached) {
-					break
-				}
-
-				t.Log("unexpected error", "error", err)
-				t.Fail()
-			}
-
-			dashInFolder := dashboards.SaveDashboardCommand{
-				UserID:   usr.UserID,
-				OrgID:    orgID,
-				IsFolder: false,
-				Dashboard: simplejson.NewFromAny(map[string]any{
-					"title": fmt.Sprintf("Dashboard under %s", f.UID),
-				}),
-				FolderID:  f.ID,
-				FolderUID: f.UID,
-			}
-			dashboard, err := dashStore.SaveDashboard(context.Background(), dashInFolder)
-			require.NoError(t, err)
-
-			dashboardIDs = append(dashboardIDs, dashboard.ID)
-
-			parentUID = f.UID
-
-			annotationTxt := fmt.Sprintf("annotation %d", i)
-			dash1Annotation := &annotations.Item{
-				OrgID:       orgID,
-				DashboardID: dashboard.ID,
-				Epoch:       10,
-				Text:        annotationTxt,
-			}
-			err = repo.Add(context.Background(), dash1Annotation)
-			require.NoError(t, err)
-
-			annotationsTexts = append(annotationsTexts, annotationTxt)
-		}
-
-		role = setupRBACRole(t, db, usr)
-		return db
-	}
-
-	db := setupFolderStructure()
-
-	testCases := []struct {
-		desc                   string
-		features               featuremgmt.FeatureToggles
-		permissions            map[string][]string
-		expectedAnnotationText []string
-		expectedError          bool
-	}{
-		{
-			desc:     "Should find only annotations from dashboards under folders that user can read",
-			features: featuremgmt.WithFeatures(),
-			permissions: map[string][]string{
-				accesscontrol.ActionAnnotationsRead: {accesscontrol.ScopeAnnotationsTypeDashboard},
-				dashboards.ActionDashboardsRead:     {"folders:uid:f0"},
-			},
-			expectedAnnotationText: annotationsTexts[:1],
-		},
-		{
-			desc:     "Should find only annotations from dashboards under inherited folders if nested folder are enabled",
-			features: featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders),
-			permissions: map[string][]string{
-				accesscontrol.ActionAnnotationsRead: {accesscontrol.ScopeAnnotationsTypeDashboard},
-				dashboards.ActionDashboardsRead:     {"folders:uid:f0"},
-			},
-			expectedAnnotationText: annotationsTexts[:],
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.desc, func(t *testing.T) {
-			var maximumTagsLength int64 = 60
-			repo := xormRepositoryImpl{db: db, cfg: setting.NewCfg(), log: log.New("annotation.test"), tagService: tagimpl.ProvideService(db, db.Cfg), maximumTagsLength: maximumTagsLength, features: tc.features}
-
-			usr.Permissions = map[int64]map[string][]string{1: tc.permissions}
-			setupRBACPermission(t, db, role, usr)
-
-			results, err := repo.Get(context.Background(), &annotations.ItemQuery{
-				OrgID:        1,
-				SignedInUser: usr,
-			})
-			if tc.expectedError {
-				require.Error(t, err)
-				return
-			}
-			require.NoError(t, err)
-			require.Len(t, results, len(tc.expectedAnnotationText))
-			for _, r := range results {
-				assert.Contains(t, tc.expectedAnnotationText, r.Text)
-			}
-		})
-	}
-}
-
-func setupRBACRole(t *testing.T, db *sqlstore.SQLStore, user *user.SignedInUser) *accesscontrol.Role {
-	t.Helper()
-	var role *accesscontrol.Role
-	err := db.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
-		role = &accesscontrol.Role{
-			OrgID:   user.OrgID,
-			UID:     "test_role",
-			Name:    "test:role",
-			Updated: time.Now(),
-			Created: time.Now(),
-		}
-		_, err := sess.Insert(role)
-		if err != nil {
-			return err
-		}
-
-		_, err = sess.Insert(accesscontrol.UserRole{
-			OrgID:   role.OrgID,
-			RoleID:  role.ID,
-			UserID:  user.UserID,
-			Created: time.Now(),
-		})
-		if err != nil {
-			return err
-		}
-		return nil
-	})
-
-	require.NoError(t, err)
-	return role
-}
-
-func setupRBACPermission(t *testing.T, db *sqlstore.SQLStore, role *accesscontrol.Role, user *user.SignedInUser) {
-	t.Helper()
-	err := db.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
-		if _, err := sess.Exec("DELETE FROM permission WHERE role_id = ?", role.ID); err != nil {
-			return err
-		}
-
-		var acPermission []accesscontrol.Permission
-		for action, scopes := range user.Permissions[user.OrgID] {
-			for _, scope := range scopes {
-				acPermission = append(acPermission, accesscontrol.Permission{
-					RoleID: role.ID, Action: action, Scope: scope, Created: time.Now(), Updated: time.Now(),
-				})
-			}
-		}
-
-		if _, err := sess.InsertMulti(&acPermission); err != nil {
-			return err
-		}
-
-		return nil
-	})
-
-	require.NoError(t, err)
-}
-
 func BenchmarkFindTags_10k(b *testing.B) {
 	benchmarkFindTags(b, 10000)
 }
@@ -890,8 +584,9 @@ func BenchmarkFindTags_100k(b *testing.B) {
 
 func benchmarkFindTags(b *testing.B, numAnnotations int) {
 	sql := db.InitTestDB(b)
-	var maximumTagsLength int64 = 60
-	repo := xormRepositoryImpl{db: sql, cfg: setting.NewCfg(), log: log.New("annotation.test"), tagService: tagimpl.ProvideService(sql, sql.Cfg), maximumTagsLength: maximumTagsLength}
+	cfg := setting.NewCfg()
+	cfg.AnnotationMaximumTagsLength = 60
+	store := xormRepositoryImpl{db: sql, cfg: cfg, log: log.New("annotation.test"), tagService: tagimpl.ProvideService(sql)}
 
 	type annotationTag struct {
 		ID           int64 `xorm:"pk autoincr 'id'"`
@@ -950,12 +645,12 @@ func benchmarkFindTags(b *testing.B, numAnnotations int) {
 		Tags:        []string{"outage", "error", "type:outage", "server:server-1"},
 		Data:        simplejson.NewFromAny(map[string]any{"data1": "I am a cool data", "data2": "I am another cool data"}),
 	}
-	err = repo.Add(context.Background(), &annotationWithTheTag)
+	err = store.Add(context.Background(), &annotationWithTheTag)
 	require.NoError(b, err)
 
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		result, err := repo.GetTags(context.Background(), &annotations.TagsQuery{
+		result, err := store.GetTags(context.Background(), &annotations.TagsQuery{
 			OrgID: 1,
 			Tag:   "outage",
 		})
diff --git a/pkg/services/annotations/models.go b/pkg/services/annotations/models.go
index e1cef2fbe6ec2..2b1325b4f3c93 100644
--- a/pkg/services/annotations/models.go
+++ b/pkg/services/annotations/models.go
@@ -44,6 +44,21 @@ type TagsDTO struct {
 	Count int64  `json:"count"`
 }
 
+// sort tags in ascending order by tag string
+type SortedTags []*TagsDTO
+
+func (s SortedTags) Len() int {
+	return len(s)
+}
+
+func (s SortedTags) Less(i, j int) bool {
+	return s[i].Tag < s[j].Tag
+}
+
+func (s SortedTags) Swap(i, j int) {
+	s[i], s[j] = s[j], s[i]
+}
+
 // FindTagsResult is the result of a tags search.
 type FindTagsResult struct {
 	Tags []*TagsDTO `json:"tags"`
@@ -87,6 +102,7 @@ func (i Item) TableName() string {
 	return "annotation"
 }
 
+// swagger:model Annotation
 type ItemDTO struct {
 	ID           int64            `json:"id" xorm:"id"`
 	AlertID      int64            `json:"alertId" xorm:"alert_id"`
@@ -109,6 +125,24 @@ type ItemDTO struct {
 	Data         *simplejson.Json `json:"data"`
 }
 
+type SortedItems []*ItemDTO
+
+// sort annotations in descending order by end time, then by start time
+func (s SortedItems) Len() int {
+	return len(s)
+}
+
+func (s SortedItems) Less(i, j int) bool {
+	if s[i].TimeEnd != s[j].TimeEnd {
+		return s[i].TimeEnd > s[j].TimeEnd
+	}
+	return s[i].Time > s[j].Time
+}
+
+func (s SortedItems) Swap(i, j int) {
+	s[i], s[j] = s[j], s[i]
+}
+
 type annotationType int
 
 const (
diff --git a/pkg/services/annotations/testutil/testutil.go b/pkg/services/annotations/testutil/testutil.go
new file mode 100644
index 0000000000000..2e24e3a2c9b13
--- /dev/null
+++ b/pkg/services/annotations/testutil/testutil.go
@@ -0,0 +1,96 @@
+package testutil
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/dashboards"
+	dashboardstore "github.com/grafana/grafana/pkg/services/dashboards/database"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/quota/quotatest"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/stretchr/testify/require"
+)
+
+func SetupRBACRole(t *testing.T, db *sqlstore.SQLStore, user *user.SignedInUser) *accesscontrol.Role {
+	t.Helper()
+
+	var role *accesscontrol.Role
+	err := db.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
+		role = &accesscontrol.Role{
+			OrgID:   user.OrgID,
+			UID:     "test_role",
+			Name:    "test:role",
+			Updated: time.Now(),
+			Created: time.Now(),
+		}
+		_, err := sess.Insert(role)
+		if err != nil {
+			return err
+		}
+
+		_, err = sess.Insert(accesscontrol.UserRole{
+			OrgID:   role.OrgID,
+			RoleID:  role.ID,
+			UserID:  user.UserID,
+			Created: time.Now(),
+		})
+		if err != nil {
+			return err
+		}
+		return nil
+	})
+	require.NoError(t, err)
+
+	return role
+}
+
+func SetupRBACPermission(t *testing.T, db *sqlstore.SQLStore, role *accesscontrol.Role, user *user.SignedInUser) {
+	t.Helper()
+
+	err := db.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
+		if _, err := sess.Exec("DELETE FROM permission WHERE role_id = ?", role.ID); err != nil {
+			return err
+		}
+
+		var acPermission []accesscontrol.Permission
+		for action, scopes := range user.Permissions[user.OrgID] {
+			for _, scope := range scopes {
+				p := accesscontrol.Permission{RoleID: role.ID, Action: action, Scope: scope, Created: time.Now(), Updated: time.Now()}
+				p.Kind, p.Attribute, p.Identifier = p.SplitScope()
+				acPermission = append(acPermission, p)
+			}
+		}
+
+		if _, err := sess.InsertMulti(&acPermission); err != nil {
+			return err
+		}
+
+		return nil
+	})
+
+	require.NoError(t, err)
+}
+
+func CreateDashboard(t *testing.T, sql *sqlstore.SQLStore, features featuremgmt.FeatureToggles, cmd dashboards.SaveDashboardCommand) *dashboards.Dashboard {
+	t.Helper()
+
+	dashboardStore, err := dashboardstore.ProvideDashboardStore(
+		sql,
+		sql.Cfg,
+		features,
+		tagimpl.ProvideService(sql),
+		quotatest.New(false, nil),
+	)
+	require.NoError(t, err)
+
+	dash, err := dashboardStore.SaveDashboard(context.Background(), cmd)
+	require.NoError(t, err)
+	require.NotNil(t, dash)
+
+	return dash
+}
diff --git a/pkg/services/anonymous/anonimpl/anonstore/database.go b/pkg/services/anonymous/anonimpl/anonstore/database.go
index a2a848cfb340d..34470936217d0 100644
--- a/pkg/services/anonymous/anonimpl/anonstore/database.go
+++ b/pkg/services/anonymous/anonimpl/anonstore/database.go
@@ -8,24 +8,53 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/search/model"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 )
 
 const cacheKeyPrefix = "anon-device"
+const anonymousDeviceExpiration = 30 * 24 * time.Hour
+
+var ErrDeviceLimitReached = fmt.Errorf("device limit reached")
 
 type AnonDBStore struct {
-	sqlStore db.DB
-	log      log.Logger
+	sqlStore    db.DB
+	log         log.Logger
+	deviceLimit int64
 }
 
 type Device struct {
 	ID        int64     `json:"-" xorm:"id" db:"id"`
-	DeviceID  string    `json:"device_id" xorm:"device_id" db:"device_id"`
-	ClientIP  string    `json:"client_ip" xorm:"client_ip" db:"client_ip"`
-	UserAgent string    `json:"user_agent" xorm:"user_agent" db:"user_agent"`
-	CreatedAt time.Time `json:"created_at" xorm:"created_at" db:"created_at"`
-	UpdatedAt time.Time `json:"updated_at" xorm:"updated_at" db:"updated_at"`
+	DeviceID  string    `json:"deviceId" xorm:"device_id" db:"device_id"`
+	ClientIP  string    `json:"clientIp" xorm:"client_ip" db:"client_ip"`
+	UserAgent string    `json:"userAgent" xorm:"user_agent" db:"user_agent"`
+	CreatedAt time.Time `json:"createdAt" xorm:"created_at" db:"created_at"`
+	UpdatedAt time.Time `json:"updatedAt" xorm:"updated_at" db:"updated_at"`
+}
+
+type DeviceSearchHitDTO struct {
+	DeviceID   string    `json:"deviceId" xorm:"device_id" db:"device_id"`
+	ClientIP   string    `json:"clientIp" xorm:"client_ip" db:"client_ip"`
+	UserAgent  string    `json:"userAgent" xorm:"user_agent" db:"user_agent"`
+	CreatedAt  time.Time `json:"createdAt" xorm:"created_at" db:"created_at"`
+	UpdatedAt  time.Time `json:"updatedAt" xorm:"updated_at" db:"updated_at"`
+	LastSeenAt time.Time `json:"lastSeenAt"`
+}
+
+type SearchDeviceQueryResult struct {
+	TotalCount int64                 `json:"totalCount"`
+	Devices    []*DeviceSearchHitDTO `json:"devices"`
+	Page       int                   `json:"page"`
+	PerPage    int                   `json:"perPage"`
+}
+type SearchDeviceQuery struct {
+	Query    string
+	Page     int
+	Limit    int
+	From     time.Time
+	To       time.Time
+	SortOpts []model.SortOption
 }
 
 func (a *Device) CacheKey() string {
@@ -43,10 +72,12 @@ type AnonStore interface {
 	DeleteDevice(ctx context.Context, deviceID string) error
 	// DeleteDevicesOlderThan deletes all devices that have no been updated since the given time.
 	DeleteDevicesOlderThan(ctx context.Context, olderThan time.Time) error
+	// SearchDevices searches for devices within the 30 days active.
+	SearchDevices(ctx context.Context, query *SearchDeviceQuery) (*SearchDeviceQueryResult, error)
 }
 
-func ProvideAnonDBStore(sqlStore db.DB) *AnonDBStore {
-	return &AnonDBStore{sqlStore: sqlStore, log: log.New("anonstore")}
+func ProvideAnonDBStore(sqlStore db.DB, deviceLimit int64) *AnonDBStore {
+	return &AnonDBStore{sqlStore: sqlStore, log: log.New("anonstore"), deviceLimit: deviceLimit}
 }
 
 func (s *AnonDBStore) ListDevices(ctx context.Context, from *time.Time, to *time.Time) ([]*Device, error) {
@@ -65,9 +96,54 @@ func (s *AnonDBStore) ListDevices(ctx context.Context, from *time.Time, to *time
 	return devices, err
 }
 
+// updateDevice updates a device if it exists and has been updated between the given times.
+func (s *AnonDBStore) updateDevice(ctx context.Context, device *Device) error {
+	const query = `UPDATE anon_device SET
+client_ip = ?,
+user_agent = ?,
+updated_at = ?
+WHERE device_id = ? AND updated_at BETWEEN ? AND ?`
+
+	args := []interface{}{device.ClientIP, device.UserAgent, device.UpdatedAt.UTC(), device.DeviceID,
+		device.UpdatedAt.UTC().Add(-anonymousDeviceExpiration), device.UpdatedAt.UTC().Add(time.Minute),
+	}
+	err := s.sqlStore.WithDbSession(ctx, func(dbSession *sqlstore.DBSession) error {
+		args = append([]interface{}{query}, args...)
+		result, err := dbSession.Exec(args...)
+		if err != nil {
+			return err
+		}
+
+		rowsAffected, err := result.RowsAffected()
+		if err != nil {
+			return err
+		}
+
+		if rowsAffected == 0 {
+			return ErrDeviceLimitReached
+		}
+
+		return nil
+	})
+
+	return err
+}
+
 func (s *AnonDBStore) CreateOrUpdateDevice(ctx context.Context, device *Device) error {
 	var query string
 
+	// if device limit is reached, only update devices
+	if s.deviceLimit > 0 {
+		count, err := s.CountDevices(ctx, time.Now().UTC().Add(-anonymousDeviceExpiration), time.Now().UTC().Add(time.Minute))
+		if err != nil {
+			return err
+		}
+
+		if count >= s.deviceLimit {
+			return s.updateDevice(ctx, device)
+		}
+	}
+
 	args := []any{device.DeviceID, device.ClientIP, device.UserAgent,
 		device.CreatedAt.UTC(), device.UpdatedAt.UTC()}
 	switch s.sqlStore.GetDBType() {
@@ -134,3 +210,64 @@ func (s *AnonDBStore) DeleteDevicesOlderThan(ctx context.Context, olderThan time
 
 	return err
 }
+
+func (s *AnonDBStore) SearchDevices(ctx context.Context, query *SearchDeviceQuery) (*SearchDeviceQueryResult, error) {
+	result := SearchDeviceQueryResult{
+		Devices: make([]*DeviceSearchHitDTO, 0),
+	}
+	err := s.sqlStore.WithDbSession(ctx, func(dbSess *db.Session) error {
+		if query.From.IsZero() && !query.To.IsZero() {
+			return fmt.Errorf("from date must be set if to date is set")
+		}
+		if !query.From.IsZero() && query.To.IsZero() {
+			return fmt.Errorf("to date must be set if from date is set")
+		}
+
+		// restricted only to last 30 days, if noting else specified
+		if query.From.IsZero() && query.To.IsZero() {
+			query.From = time.Now().Add(-anonymousDeviceExpiration)
+			query.To = time.Now()
+		}
+
+		sess := dbSess.Table("anon_device").Alias("d")
+
+		if query.Limit > 0 {
+			offset := query.Limit * (query.Page - 1)
+			sess.Limit(query.Limit, offset)
+		}
+		sess.Cols("d.id", "d.device_id", "d.client_ip", "d.user_agent", "d.updated_at")
+
+		if len(query.SortOpts) > 0 {
+			for i := range query.SortOpts {
+				for j := range query.SortOpts[i].Filter {
+					sess.OrderBy(query.SortOpts[i].Filter[j].OrderBy())
+				}
+			}
+		} else {
+			sess.Asc("d.user_agent")
+		}
+
+		// add to query about from and to session
+		sess.Where("d.updated_at BETWEEN ? AND ?", query.From.UTC(), query.To.UTC())
+
+		if query.Query != "" {
+			queryWithWildcards := "%" + strings.Replace(query.Query, "\\", "", -1) + "%"
+			sess.Where("d.client_ip "+s.sqlStore.GetDialect().LikeStr()+" ?", queryWithWildcards)
+		}
+
+		// get total
+		devices, err := s.ListDevices(ctx, &query.From, &query.To)
+		if err != nil {
+			return err
+		}
+		// cast to int64
+		result.TotalCount = int64(len(devices))
+		if err := sess.Find(&result.Devices); err != nil {
+			return err
+		}
+		result.Page = query.Page
+		result.PerPage = query.Limit
+		return nil
+	})
+	return &result, err
+}
diff --git a/pkg/services/anonymous/anonimpl/anonstore/database_test.go b/pkg/services/anonymous/anonimpl/anonstore/database_test.go
index b94dd82d286c3..54e625662ede8 100644
--- a/pkg/services/anonymous/anonimpl/anonstore/database_test.go
+++ b/pkg/services/anonymous/anonimpl/anonstore/database_test.go
@@ -9,11 +9,16 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationAnonStore_DeleteDevicesOlderThan(t *testing.T) {
 	store := db.InitTestDB(t)
-	anonDBStore := ProvideAnonDBStore(store)
+	anonDBStore := ProvideAnonDBStore(store, 0)
 	const keepFor = time.Hour * 24 * 61
 
 	anonDevice := &Device{
@@ -48,9 +53,30 @@ func TestIntegrationAnonStore_DeleteDevicesOlderThan(t *testing.T) {
 	assert.Equal(t, "keep", devices[0].DeviceID)
 }
 
+func TestIntegrationBeyondDeviceLimit(t *testing.T) {
+	store := db.InitTestDB(t)
+	anonDBStore := ProvideAnonDBStore(store, 1)
+
+	anonDevice := &Device{
+		DeviceID:  "32mdo31deeqwes",
+		ClientIP:  "10.30.30.2",
+		UserAgent: "test",
+		UpdatedAt: time.Now().Add(-time.Hour),
+	}
+
+	err := anonDBStore.CreateOrUpdateDevice(context.Background(), anonDevice)
+	require.NoError(t, err)
+
+	anonDevice.DeviceID = "keep"
+	anonDevice.UpdatedAt = time.Now().Add(-time.Hour)
+
+	err = anonDBStore.CreateOrUpdateDevice(context.Background(), anonDevice)
+	require.ErrorIs(t, err, ErrDeviceLimitReached)
+}
+
 func TestIntegrationAnonStore_DeleteDevice(t *testing.T) {
 	store := db.InitTestDB(t)
-	anonDBStore := ProvideAnonDBStore(store)
+	anonDBStore := ProvideAnonDBStore(store, 0)
 	const keepFor = time.Hour * 24 * 61
 
 	anonDevice := &Device{
diff --git a/pkg/services/anonymous/anonimpl/anonstore/fake.go b/pkg/services/anonymous/anonimpl/anonstore/fake.go
index 9c7249d37bf65..8db978d309e1d 100644
--- a/pkg/services/anonymous/anonimpl/anonstore/fake.go
+++ b/pkg/services/anonymous/anonimpl/anonstore/fake.go
@@ -19,3 +19,7 @@ func (s *FakeAnonStore) CreateOrUpdateDevice(ctx context.Context, device *Device
 func (s *FakeAnonStore) CountDevices(ctx context.Context, from time.Time, to time.Time) (int64, error) {
 	return 0, nil
 }
+
+func (s *FakeAnonStore) SearchDevices(ctx context.Context, query SearchDeviceQuery) (*SearchDeviceQueryResult, error) {
+	return nil, nil
+}
diff --git a/pkg/services/anonymous/anonimpl/api/api.go b/pkg/services/anonymous/anonimpl/api/api.go
new file mode 100644
index 0000000000000..95774e1682b4d
--- /dev/null
+++ b/pkg/services/anonymous/anonimpl/api/api.go
@@ -0,0 +1,150 @@
+package api
+
+import (
+	"net/http"
+	"time"
+
+	"github.com/grafana/grafana/pkg/api/dtos"
+	"github.com/grafana/grafana/pkg/api/response"
+	"github.com/grafana/grafana/pkg/api/routing"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/anonymous/anonimpl/anonstore"
+	"github.com/grafana/grafana/pkg/services/anonymous/sortopts"
+	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util"
+)
+
+const anonymousDeviceExpiration = 30 * 24 * time.Hour
+
+type deviceDTO struct {
+	anonstore.Device
+	LastSeenAt string `json:"lastSeenAt"`
+	AvatarUrl  string `json:"avatarUrl"`
+}
+
+type AnonDeviceServiceAPI struct {
+	cfg            *setting.Cfg
+	store          anonstore.AnonStore
+	accesscontrol  accesscontrol.AccessControl
+	RouterRegister routing.RouteRegister
+	log            log.Logger
+}
+
+func NewAnonDeviceServiceAPI(
+	cfg *setting.Cfg,
+	anonstore anonstore.AnonStore,
+	accesscontrol accesscontrol.AccessControl,
+	routerRegister routing.RouteRegister,
+) *AnonDeviceServiceAPI {
+	return &AnonDeviceServiceAPI{
+		cfg:            cfg,
+		store:          anonstore,
+		accesscontrol:  accesscontrol,
+		RouterRegister: routerRegister,
+		log:            log.New("anon.api"),
+	}
+}
+
+func (api *AnonDeviceServiceAPI) RegisterAPIEndpoints() {
+	auth := accesscontrol.Middleware(api.accesscontrol)
+	api.RouterRegister.Group("/api/anonymous", func(anonRoutes routing.RouteRegister) {
+		anonRoutes.Get("/devices", auth(accesscontrol.EvalPermission(accesscontrol.ActionUsersRead)), routing.Wrap(api.ListDevices))
+		anonRoutes.Get("/search", auth(accesscontrol.EvalPermission(accesscontrol.ActionUsersRead)), routing.Wrap(api.SearchDevices))
+	})
+}
+
+// swagger:route GET /stats devices listDevices
+//
+// # Lists all devices within the last 30 days
+//
+// Produces:
+// - application/json
+//
+// Responses:
+//
+//	200: devicesResponse
+//	401: unauthorisedError
+//	403: forbiddenError
+//	404: notFoundError
+//	500: internalServerError
+func (api *AnonDeviceServiceAPI) ListDevices(c *contextmodel.ReqContext) response.Response {
+	fromTime := time.Now().Add(-anonymousDeviceExpiration)
+	toTime := time.Now()
+
+	devices, err := api.store.ListDevices(c.Req.Context(), &fromTime, &toTime)
+	if err != nil {
+		return response.ErrOrFallback(http.StatusInternalServerError, "Failed to list devices", err)
+	}
+
+	// convert to response format
+	resDevices := make([]*deviceDTO, 0, len(devices))
+	for _, device := range devices {
+		resDevices = append(resDevices, &deviceDTO{
+			Device:     *device,
+			LastSeenAt: util.GetAgeString(device.UpdatedAt),
+			AvatarUrl:  dtos.GetGravatarUrl(api.cfg, device.DeviceID),
+		})
+	}
+
+	return response.JSON(http.StatusOK, resDevices)
+}
+
+// swagger:route POST /search devices SearchDevices
+//
+// # Lists all devices within the last 30 days
+//
+// Produces:
+// - application/json
+//
+// Responses:
+//
+//	200: devicesSearchResponse
+//	401: unauthorisedError
+//	403: forbiddenError
+//	404: notFoundError
+//	500: internalServerError
+func (api *AnonDeviceServiceAPI) SearchDevices(c *contextmodel.ReqContext) response.Response {
+	perPage := c.QueryInt("perpage")
+	if perPage <= 0 {
+		perPage = 100
+	}
+	page := c.QueryInt("page")
+
+	if page < 1 {
+		page = 1
+	}
+
+	searchQuery := c.Query("query")
+
+	sortOpts, err := sortopts.ParseSortQueryParam(c.Query("sort"))
+	if err != nil {
+		return response.ErrOrFallback(http.StatusInternalServerError, "Failed to list devices", err)
+	}
+
+	// TODO: potential add from and to time to query
+	query := &anonstore.SearchDeviceQuery{
+		Query:    searchQuery,
+		Page:     page,
+		Limit:    perPage,
+		SortOpts: sortOpts,
+	}
+	results, err := api.store.SearchDevices(c.Req.Context(), query)
+	if err != nil {
+		return response.ErrOrFallback(http.StatusInternalServerError, "Failed to list devices", err)
+	}
+	return response.JSON(http.StatusOK, results)
+}
+
+// swagger:response devicesResponse
+type DevicesResponse struct {
+	// in:body
+	Body []deviceDTO `json:"body"`
+}
+
+// swagger:response devicesSearchResponse
+type DevicesSearchResponse struct {
+	// in:body
+	Body anonstore.SearchDeviceQueryResult `json:"body"`
+}
diff --git a/pkg/services/anonymous/anonimpl/client.go b/pkg/services/anonymous/anonimpl/client.go
index 363345e6cb978..a74c9367cddd2 100644
--- a/pkg/services/anonymous/anonimpl/client.go
+++ b/pkg/services/anonymous/anonimpl/client.go
@@ -2,12 +2,13 @@ package anonimpl
 
 import (
 	"context"
+	"errors"
 	"net/http"
 	"strings"
-	"time"
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/anonymous"
+	"github.com/grafana/grafana/pkg/services/anonymous/anonimpl/anonstore"
 	"github.com/grafana/grafana/pkg/services/authn"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/setting"
@@ -15,8 +16,6 @@ import (
 
 var _ authn.ContextAwareClient = new(Anonymous)
 
-const timeoutTag = 2 * time.Minute
-
 type Anonymous struct {
 	cfg               *setting.Cfg
 	log               log.Logger
@@ -42,19 +41,13 @@ func (a *Anonymous) Authenticate(ctx context.Context, r *authn.Request) (*authn.
 		httpReqCopy.RemoteAddr = r.HTTPRequest.RemoteAddr
 	}
 
-	go func() {
-		defer func() {
-			if err := recover(); err != nil {
-				a.log.Warn("Tag anon session panic", "err", err)
-			}
-		}()
-
-		newCtx, cancel := context.WithTimeout(context.Background(), timeoutTag)
-		defer cancel()
-		if err := a.anonDeviceService.TagDevice(newCtx, httpReqCopy, anonymous.AnonDeviceUI); err != nil {
-			a.log.Warn("Failed to tag anonymous session", "error", err)
+	if err := a.anonDeviceService.TagDevice(ctx, httpReqCopy, anonymous.AnonDeviceUI); err != nil {
+		if errors.Is(err, anonstore.ErrDeviceLimitReached) {
+			return nil, err
 		}
-	}()
+
+		a.log.Warn("Failed to tag anonymous session", "error", err)
+	}
 
 	return &authn.Identity{
 		ID:           authn.AnonymousNamespaceID,
diff --git a/pkg/services/anonymous/anonimpl/client_test.go b/pkg/services/anonymous/anonimpl/client_test.go
index 229b6c7dbc5f4..7f3118d61a6a1 100644
--- a/pkg/services/anonymous/anonimpl/client_test.go
+++ b/pkg/services/anonymous/anonimpl/client_test.go
@@ -49,7 +49,7 @@ func TestAnonymous_Authenticate(t *testing.T) {
 				cfg:               tt.cfg,
 				log:               log.NewNopLogger(),
 				orgService:        &orgtest.FakeOrgService{ExpectedOrg: tt.org, ExpectedError: tt.err},
-				anonDeviceService: &anontest.FakeAnonymousSessionService{},
+				anonDeviceService: anontest.NewFakeService(),
 			}
 
 			identity, err := c.Authenticate(context.Background(), &authn.Request{})
diff --git a/pkg/services/anonymous/anonimpl/impl.go b/pkg/services/anonymous/anonimpl/impl.go
index fec95479aab2e..b34048be40760 100644
--- a/pkg/services/anonymous/anonimpl/impl.go
+++ b/pkg/services/anonymous/anonimpl/impl.go
@@ -5,13 +5,17 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/grafana/grafana/pkg/api/routing"
+	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/localcache"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/network"
 	"github.com/grafana/grafana/pkg/infra/serverlock"
 	"github.com/grafana/grafana/pkg/infra/usagestats"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/anonymous"
 	"github.com/grafana/grafana/pkg/services/anonymous/anonimpl/anonstore"
+	"github.com/grafana/grafana/pkg/services/anonymous/anonimpl/api"
 	"github.com/grafana/grafana/pkg/services/authn"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/setting"
@@ -27,17 +31,19 @@ type AnonDeviceService struct {
 	localCache *localcache.CacheService
 	anonStore  anonstore.AnonStore
 	serverLock *serverlock.ServerLockService
+	cfg        *setting.Cfg
 }
 
 func ProvideAnonymousDeviceService(usageStats usagestats.Service, authBroker authn.Service,
-	anonStore anonstore.AnonStore, cfg *setting.Cfg, orgService org.Service,
-	serverLockService *serverlock.ServerLockService,
+	sqlStore db.DB, cfg *setting.Cfg, orgService org.Service,
+	serverLockService *serverlock.ServerLockService, accesscontrol accesscontrol.AccessControl, routeRegister routing.RouteRegister,
 ) *AnonDeviceService {
 	a := &AnonDeviceService{
 		log:        log.New("anonymous-session-service"),
 		localCache: localcache.New(29*time.Minute, 15*time.Minute),
-		anonStore:  anonStore,
+		anonStore:  anonstore.ProvideAnonDBStore(sqlStore, cfg.AnonymousDeviceLimit),
 		serverLock: serverLockService,
+		cfg:        cfg,
 	}
 
 	usageStats.RegisterMetricsFunc(a.usageStatFn)
@@ -49,11 +55,14 @@ func ProvideAnonymousDeviceService(usageStats usagestats.Service, authBroker aut
 		anonDeviceService: a,
 	}
 
-	if anonClient.cfg.AnonymousEnabled {
+	if cfg.AnonymousEnabled {
 		authBroker.RegisterClient(anonClient)
 		authBroker.RegisterPostLoginHook(a.untagDevice, 100)
 	}
 
+	anonAPI := api.NewAnonDeviceServiceAPI(cfg, a.anonStore, accesscontrol, routeRegister)
+	anonAPI.RegisterAPIEndpoints()
+
 	return a
 }
 
@@ -79,7 +88,7 @@ func (a *AnonDeviceService) tagDeviceUI(ctx context.Context, httpReq *http.Reque
 
 	a.localCache.SetDefault(key, struct{}{})
 
-	if setting.Env == setting.Dev {
+	if a.cfg.Env == setting.Dev {
 		a.log.Debug("Tagging device for UI", "deviceID", device.DeviceID, "device", device, "key", key)
 	}
 
@@ -103,11 +112,10 @@ func (a *AnonDeviceService) untagDevice(ctx context.Context,
 
 	errD := a.anonStore.DeleteDevice(ctx, deviceID)
 	if errD != nil {
-		a.log.Debug("Failed to untag device", "error", err)
+		a.log.Debug("Failed to untag device", "error", errD)
 	}
 }
 
-// FIXME: Unexport and remove interface
 func (a *AnonDeviceService) TagDevice(ctx context.Context, httpReq *http.Request, kind anonymous.DeviceKind) error {
 	deviceID := httpReq.Header.Get(deviceIDHeader)
 	if deviceID == "" {
@@ -137,11 +145,40 @@ func (a *AnonDeviceService) TagDevice(ctx context.Context, httpReq *http.Request
 	err = a.tagDeviceUI(ctx, httpReq, taggedDevice)
 	if err != nil {
 		a.log.Debug("Failed to tag device for UI", "error", err)
+		return err
 	}
 
 	return nil
 }
 
+// ListDevices returns all devices that have been updated between the given times.
+func (a *AnonDeviceService) ListDevices(ctx context.Context, from *time.Time, to *time.Time) ([]*anonstore.Device, error) {
+	if !a.cfg.AnonymousEnabled {
+		a.log.Debug("Anonymous access is disabled, returning empty result")
+		return []*anonstore.Device{}, nil
+	}
+
+	return a.anonStore.ListDevices(ctx, from, to)
+}
+
+// CountDevices returns the number of devices that have been updated between the given times.
+func (a *AnonDeviceService) CountDevices(ctx context.Context, from time.Time, to time.Time) (int64, error) {
+	if !a.cfg.AnonymousEnabled {
+		a.log.Debug("Anonymous access is disabled, returning empty result")
+		return 0, nil
+	}
+
+	return a.anonStore.CountDevices(ctx, from, to)
+}
+
+func (a *AnonDeviceService) SearchDevices(ctx context.Context, query *anonstore.SearchDeviceQuery) (*anonstore.SearchDeviceQueryResult, error) {
+	if !a.cfg.AnonymousEnabled {
+		a.log.Debug("Anonymous access is disabled, returning empty result")
+		return nil, nil
+	}
+	return a.anonStore.SearchDevices(ctx, query)
+}
+
 func (a *AnonDeviceService) Run(ctx context.Context) error {
 	ticker := time.NewTicker(2 * time.Hour)
 
diff --git a/pkg/services/anonymous/anonimpl/impl_test.go b/pkg/services/anonymous/anonimpl/impl_test.go
index a199aa46e9d26..a84e913f3b1ae 100644
--- a/pkg/services/anonymous/anonimpl/impl_test.go
+++ b/pkg/services/anonymous/anonimpl/impl_test.go
@@ -9,15 +9,22 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/api/routing"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/usagestats"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
 	"github.com/grafana/grafana/pkg/services/anonymous"
 	"github.com/grafana/grafana/pkg/services/anonymous/anonimpl/anonstore"
 	"github.com/grafana/grafana/pkg/services/authn/authntest"
 	"github.com/grafana/grafana/pkg/services/org/orgtest"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationDeviceService_tag(t *testing.T) {
 	type tagReq struct {
 		httpReq *http.Request
@@ -111,16 +118,15 @@ func TestIntegrationDeviceService_tag(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			store := db.InitTestDB(t)
-			anonDBStore := anonstore.ProvideAnonDBStore(store)
 			anonService := ProvideAnonymousDeviceService(&usagestats.UsageStatsMock{},
-				&authntest.FakeService{}, anonDBStore, setting.NewCfg(), orgtest.NewOrgServiceFake(), nil)
+				&authntest.FakeService{}, store, setting.NewCfg(), orgtest.NewOrgServiceFake(), nil, actest.FakeAccessControl{}, &routing.RouteRegisterImpl{})
 
 			for _, req := range tc.req {
 				err := anonService.TagDevice(context.Background(), req.httpReq, req.kind)
 				require.NoError(t, err)
 			}
 
-			devices, err := anonDBStore.ListDevices(context.Background(), nil, nil)
+			devices, err := anonService.anonStore.ListDevices(context.Background(), nil, nil)
 			require.NoError(t, err)
 			require.Len(t, devices, int(tc.expectedAnonUICount))
 			if tc.expectedDevice != nil {
@@ -147,9 +153,8 @@ func TestIntegrationDeviceService_tag(t *testing.T) {
 // Ensure that the local cache prevents request from being tagged
 func TestIntegrationAnonDeviceService_localCacheSafety(t *testing.T) {
 	store := db.InitTestDB(t)
-	anonDBStore := anonstore.ProvideAnonDBStore(store)
 	anonService := ProvideAnonymousDeviceService(&usagestats.UsageStatsMock{},
-		&authntest.FakeService{}, anonDBStore, setting.NewCfg(), orgtest.NewOrgServiceFake(), nil)
+		&authntest.FakeService{}, store, setting.NewCfg(), orgtest.NewOrgServiceFake(), nil, actest.FakeAccessControl{}, &routing.RouteRegisterImpl{})
 
 	req := &http.Request{
 		Header: http.Header{
@@ -177,3 +182,92 @@ func TestIntegrationAnonDeviceService_localCacheSafety(t *testing.T) {
 
 	assert.Equal(t, int64(0), stats["stats.anonymous.device.ui.count"].(int64))
 }
+
+func TestIntegrationDeviceService_SearchDevice(t *testing.T) {
+	fixedTime := time.Date(2024, 1, 1, 12, 0, 0, 0, time.UTC) // Fixed timestamp for testing
+
+	testCases := []struct {
+		name           string
+		insertDevices  []*anonstore.Device
+		searchQuery    anonstore.SearchDeviceQuery
+		expectedCount  int
+		expectedDevice *anonstore.Device
+	}{
+		{
+			name: "two devices and limit set to 1",
+			insertDevices: []*anonstore.Device{
+				{
+					DeviceID:  "32mdo31deeqwes",
+					ClientIP:  "",
+					UserAgent: "test",
+				},
+				{
+					DeviceID:  "32mdo31deeqwes2",
+					ClientIP:  "",
+					UserAgent: "test2",
+				},
+			},
+			searchQuery: anonstore.SearchDeviceQuery{
+				Query: "",
+				Page:  1,
+				Limit: 1,
+				From:  fixedTime,
+				To:    fixedTime.Add(1 * time.Hour),
+			},
+			expectedCount: 1,
+		},
+		{
+			name: "two devices and search for client ip 192.1",
+			insertDevices: []*anonstore.Device{
+				{
+					DeviceID:  "32mdo31deeqwes",
+					ClientIP:  "192.168.0.2:10",
+					UserAgent: "",
+				},
+				{
+					DeviceID:  "32mdo31deeqwes2",
+					ClientIP:  "192.268.1.3:200",
+					UserAgent: "",
+				},
+			},
+			searchQuery: anonstore.SearchDeviceQuery{
+				Query: "192.1",
+				Page:  1,
+				Limit: 50,
+				From:  fixedTime,
+				To:    fixedTime.Add(1 * time.Hour),
+			},
+			expectedCount: 1,
+			expectedDevice: &anonstore.Device{
+				DeviceID:  "32mdo31deeqwes",
+				ClientIP:  "192.168.0.2:10",
+				UserAgent: "",
+			},
+		},
+	}
+	store := db.InitTestDB(t)
+	cfg := setting.NewCfg()
+	cfg.AnonymousEnabled = true
+	anonService := ProvideAnonymousDeviceService(&usagestats.UsageStatsMock{}, &authntest.FakeService{}, store, cfg, orgtest.NewOrgServiceFake(), nil, actest.FakeAccessControl{}, &routing.RouteRegisterImpl{})
+
+	for _, tc := range testCases {
+		err := store.Reset()
+		assert.NoError(t, err)
+		t.Run(tc.name, func(t *testing.T) {
+			for _, device := range tc.insertDevices {
+				device.CreatedAt = fixedTime.Add(-10 * time.Hour) // Use fixed time
+				device.UpdatedAt = fixedTime
+				err := anonService.anonStore.CreateOrUpdateDevice(context.Background(), device)
+				require.NoError(t, err)
+			}
+
+			devices, err := anonService.anonStore.SearchDevices(context.Background(), &tc.searchQuery)
+			require.NoError(t, err)
+			require.Len(t, devices.Devices, tc.expectedCount)
+			if tc.expectedDevice != nil {
+				device := devices.Devices[0]
+				require.Equal(t, tc.expectedDevice.UserAgent, device.UserAgent)
+			}
+		})
+	}
+}
diff --git a/pkg/services/anonymous/anontest/fake.go b/pkg/services/anonymous/anontest/fake.go
index 44b1fcca0cec5..91a97de01727e 100644
--- a/pkg/services/anonymous/anontest/fake.go
+++ b/pkg/services/anonymous/anontest/fake.go
@@ -3,13 +3,30 @@ package anontest
 import (
 	"context"
 	"net/http"
+	"time"
 
 	"github.com/grafana/grafana/pkg/services/anonymous"
+	"github.com/grafana/grafana/pkg/services/anonymous/anonimpl/anonstore"
 )
 
-type FakeAnonymousSessionService struct {
+type FakeService struct {
+	ExpectedCountDevices int64
+	ExpectedListDevices  []*anonstore.Device
+	ExpectedError        error
 }
 
-func (f *FakeAnonymousSessionService) TagDevice(ctx context.Context, httpReq *http.Request, kind anonymous.DeviceKind) error {
-	return nil
+func NewFakeService() *FakeService {
+	return &FakeService{}
+}
+
+func (f *FakeService) TagDevice(ctx context.Context, httpReq *http.Request, kind anonymous.DeviceKind) error {
+	return f.ExpectedError
+}
+
+func (f *FakeService) CountDevices(ctx context.Context, from time.Time, to time.Time) (int64, error) {
+	return f.ExpectedCountDevices, f.ExpectedError
+}
+
+func (f *FakeService) ListDevices(ctx context.Context, from *time.Time, to *time.Time) ([]*anonstore.Device, error) {
+	return f.ExpectedListDevices, f.ExpectedError
 }
diff --git a/pkg/services/anonymous/service.go b/pkg/services/anonymous/service.go
index b303d705843c6..5765816e61a8f 100644
--- a/pkg/services/anonymous/service.go
+++ b/pkg/services/anonymous/service.go
@@ -3,6 +3,9 @@ package anonymous
 import (
 	"context"
 	"net/http"
+	"time"
+
+	"github.com/grafana/grafana/pkg/services/anonymous/anonimpl/anonstore"
 )
 
 type DeviceKind string
@@ -13,4 +16,6 @@ const (
 
 type Service interface {
 	TagDevice(context.Context, *http.Request, DeviceKind) error
+	CountDevices(ctx context.Context, from time.Time, to time.Time) (int64, error)
+	ListDevices(ctx context.Context, from *time.Time, to *time.Time) ([]*anonstore.Device, error)
 }
diff --git a/pkg/services/anonymous/sortopts/sortopts.go b/pkg/services/anonymous/sortopts/sortopts.go
new file mode 100644
index 0000000000000..4ebb16e4929c0
--- /dev/null
+++ b/pkg/services/anonymous/sortopts/sortopts.go
@@ -0,0 +1,97 @@
+package sortopts
+
+import (
+	"fmt"
+	"sort"
+	"strings"
+
+	"github.com/grafana/grafana/pkg/services/search/model"
+	"github.com/grafana/grafana/pkg/util/errutil"
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
+)
+
+var (
+	// SortOptionsByQueryParam is a map to translate the "sort" query param values to SortOption(s)
+	SortOptionsByQueryParam = map[string]model.SortOption{
+		"userAgent-asc":  newSortOption("user_agent", false, 0),
+		"userAgent-desc": newSortOption("user_agent", true, 0),
+		"updatedAt-asc":  newTimeSortOption("updated_at", false, 1),
+		"updatedAt-desc": newTimeSortOption("updated_at", true, 2),
+	}
+
+	ErrorUnknownSortingOption = errutil.BadRequest("unknown sorting option")
+)
+
+type Sorter struct {
+	Field         string
+	LowerCase     bool
+	Descending    bool
+	WithTableName bool
+}
+
+func (s Sorter) OrderBy() string {
+	orderBy := "anon_device."
+	if !s.WithTableName {
+		orderBy = ""
+	}
+	orderBy += s.Field
+	if s.LowerCase {
+		orderBy = fmt.Sprintf("LOWER(%v)", orderBy)
+	}
+	if s.Descending {
+		return orderBy + " DESC"
+	}
+	return orderBy + " ASC"
+}
+
+func newSortOption(field string, desc bool, index int) model.SortOption {
+	direction := "asc"
+	description := ("A-Z")
+	if desc {
+		direction = "desc"
+		description = ("Z-A")
+	}
+	return model.SortOption{
+		Name:        fmt.Sprintf("%v-%v", field, direction),
+		DisplayName: fmt.Sprintf("%v (%v)", cases.Title(language.Und).String(field), description),
+		Description: fmt.Sprintf("Sort %v in an alphabetically %vending order", field, direction),
+		Index:       index,
+		Filter:      []model.SortOptionFilter{Sorter{Field: field, Descending: desc}},
+	}
+}
+
+func newTimeSortOption(field string, desc bool, index int) model.SortOption {
+	direction := "asc"
+	description := ("Oldest-Newest")
+	if desc {
+		direction = "desc"
+		description = ("Newest-Oldest")
+	}
+	return model.SortOption{
+		Name:        fmt.Sprintf("%v-%v", field, direction),
+		DisplayName: fmt.Sprintf("%v (%v)", cases.Title(language.Und).String(field), description),
+		Description: fmt.Sprintf("Sort %v by time in an %vending order", field, direction),
+		Index:       index,
+		Filter:      []model.SortOptionFilter{Sorter{Field: field, Descending: desc}},
+	}
+}
+
+// ParseSortQueryParam parses the "sort" query param and returns an ordered list of SortOption(s)
+func ParseSortQueryParam(param string) ([]model.SortOption, error) {
+	opts := []model.SortOption{}
+	if param != "" {
+		optsStr := strings.Split(param, ",")
+		for i := range optsStr {
+			if opt, ok := SortOptionsByQueryParam[optsStr[i]]; !ok {
+				return nil, ErrorUnknownSortingOption.Errorf("%v option unknown", optsStr[i])
+			} else {
+				opts = append(opts, opt)
+			}
+		}
+		sort.Slice(opts, func(i, j int) bool {
+			return opts[i].Index < opts[j].Index || (opts[i].Index == opts[j].Index && opts[i].Name < opts[j].Name)
+		})
+	}
+	return opts, nil
+}
diff --git a/pkg/services/apikey/apikeyimpl/apikey.go b/pkg/services/apikey/apikeyimpl/apikey.go
index 89addfc3beb82..9cd6ccbb78475 100644
--- a/pkg/services/apikey/apikeyimpl/apikey.go
+++ b/pkg/services/apikey/apikeyimpl/apikey.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/services/apikey"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/quota"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -15,15 +14,9 @@ type Service struct {
 }
 
 func ProvideService(db db.DB, cfg *setting.Cfg, quotaService quota.Service) (apikey.Service, error) {
-	s := &Service{}
-	if cfg.IsFeatureToggleEnabled(featuremgmt.FlagNewDBLibrary) {
-		s.store = &sqlxStore{
-			sess: db.GetSqlxSession(),
-			cfg:  cfg,
-		}
+	s := &Service{
+		store: &sqlStore{db: db},
 	}
-	s.store = &sqlStore{db: db, cfg: cfg}
-
 	defaultLimits, err := readQuotaConfig(cfg)
 	if err != nil {
 		return s, err
diff --git a/pkg/services/apikey/apikeyimpl/sqlx_store.go b/pkg/services/apikey/apikeyimpl/sqlx_store.go
deleted file mode 100644
index 07e2ddf4018a5..0000000000000
--- a/pkg/services/apikey/apikeyimpl/sqlx_store.go
+++ /dev/null
@@ -1,184 +0,0 @@
-package apikeyimpl
-
-import (
-	"context"
-	"database/sql"
-	"errors"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/apikey"
-	"github.com/grafana/grafana/pkg/services/quota"
-	"github.com/grafana/grafana/pkg/services/sqlstore/session"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-type sqlxStore struct {
-	sess *session.SessionDB
-	cfg  *setting.Cfg
-}
-
-func (ss *sqlxStore) GetAPIKeys(ctx context.Context, query *apikey.GetApiKeysQuery) ([]*apikey.APIKey, error) {
-	var where []string
-	var args []any
-
-	if query.IncludeExpired {
-		where = append(where, "org_id=?")
-		args = append(args, query.OrgID)
-	} else {
-		where = append(where, "org_id=? and ( expires IS NULL or expires >= ?)")
-		args = append(args, query.OrgID, timeNow().Unix())
-	}
-
-	where = append(where, "service_account_id IS NULL")
-
-	filter, err := accesscontrol.Filter(query.User, "id", "apikeys:id:", accesscontrol.ActionAPIKeyRead)
-	if err != nil {
-		return nil, err
-	}
-	where = append(where, filter.Where)
-	args = append(args, filter.Args...)
-
-	ws := fmt.Sprint(strings.Join(where[:], " AND "))
-	qr := fmt.Sprintf(`SELECT * FROM api_key WHERE %s ORDER BY name ASC LIMIT 100`, ws)
-	keys := make([]*apikey.APIKey, 0)
-	err = ss.sess.Select(ctx, &keys, qr, args...)
-	return keys, err
-}
-
-func (ss *sqlxStore) GetAllAPIKeys(ctx context.Context, orgID int64) ([]*apikey.APIKey, error) {
-	result := make([]*apikey.APIKey, 0)
-	var err error
-	if orgID != -1 {
-		err = ss.sess.Select(
-			ctx, &result, "SELECT * FROM api_key WHERE service_account_id IS NULL AND org_id = ? ORDER BY name ASC", orgID)
-	} else {
-		err = ss.sess.Select(
-			ctx, &result, "SELECT * FROM api_key WHERE service_account_id IS NULL ORDER BY name ASC")
-	}
-	return result, err
-}
-
-func (ss *sqlxStore) CountAPIKeys(ctx context.Context, orgID int64) (int64, error) {
-	type result struct {
-		Count int64
-	}
-	r := result{}
-	err := ss.sess.Get(ctx, &r, `SELECT COUNT(*) AS count FROM api_key WHERE service_account_id IS NULL and org_id = ?`, orgID)
-	if err != nil {
-		return 0, err
-	}
-	return r.Count, err
-}
-
-func (ss *sqlxStore) DeleteApiKey(ctx context.Context, cmd *apikey.DeleteCommand) error {
-	res, err := ss.sess.Exec(ctx, "DELETE FROM api_key WHERE id=? and org_id=? and service_account_id IS NULL", cmd.ID, cmd.OrgID)
-	if err != nil {
-		return err
-	}
-	n, err := res.RowsAffected()
-	if err == nil && n == 0 {
-		return apikey.ErrNotFound
-	}
-	return err
-}
-
-func (ss *sqlxStore) AddAPIKey(ctx context.Context, cmd *apikey.AddCommand) (*apikey.APIKey, error) {
-	updated := timeNow()
-	var expires *int64 = nil
-	if cmd.SecondsToLive > 0 {
-		v := updated.Add(time.Second * time.Duration(cmd.SecondsToLive)).Unix()
-		expires = &v
-	} else if cmd.SecondsToLive < 0 {
-		return nil, apikey.ErrInvalidExpiration
-	}
-
-	_, err := ss.GetApiKeyByName(ctx, &apikey.GetByNameQuery{OrgID: cmd.OrgID, KeyName: cmd.Name})
-	// If key with the same orgId and name already exist return err
-	if !errors.Is(err, apikey.ErrInvalid) {
-		return nil, apikey.ErrDuplicate
-	}
-	isRevoked := false
-	t := apikey.APIKey{
-		OrgID:            cmd.OrgID,
-		Name:             cmd.Name,
-		Role:             cmd.Role,
-		Key:              cmd.Key,
-		Created:          updated,
-		Updated:          updated,
-		Expires:          expires,
-		ServiceAccountId: nil,
-		IsRevoked:        &isRevoked,
-	}
-
-	t.ID, err = ss.sess.ExecWithReturningId(ctx,
-		`INSERT INTO api_key (org_id, name, role, "key", created, updated, expires, service_account_id, is_revoked) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`, t.OrgID, t.Name, t.Role, t.Key, t.Created, t.Updated, t.Expires, t.ServiceAccountId, t.IsRevoked)
-	return &t, err
-}
-
-func (ss *sqlxStore) GetApiKeyById(ctx context.Context, query *apikey.GetByIDQuery) (*apikey.APIKey, error) {
-	var key apikey.APIKey
-	err := ss.sess.Get(ctx, &key, "SELECT * FROM api_key WHERE id=?", query.ApiKeyID)
-	if err != nil && errors.Is(err, sql.ErrNoRows) {
-		return nil, apikey.ErrInvalid
-	}
-	return &key, err
-}
-
-func (ss *sqlxStore) GetApiKeyByName(ctx context.Context, query *apikey.GetByNameQuery) (*apikey.APIKey, error) {
-	var key apikey.APIKey
-	err := ss.sess.Get(ctx, &key, "SELECT * FROM api_key WHERE org_id=? AND name=?", query.OrgID, query.KeyName)
-	if err != nil && errors.Is(err, sql.ErrNoRows) {
-		return nil, apikey.ErrInvalid
-	}
-	return &key, err
-}
-
-func (ss *sqlxStore) GetAPIKeyByHash(ctx context.Context, hash string) (*apikey.APIKey, error) {
-	var key apikey.APIKey
-	err := ss.sess.Get(ctx, &key, `SELECT * FROM api_key WHERE "key"=?`, hash)
-	if err != nil && errors.Is(err, sql.ErrNoRows) {
-		return nil, apikey.ErrInvalid
-	}
-	return &key, err
-}
-
-func (ss *sqlxStore) UpdateAPIKeyLastUsedDate(ctx context.Context, tokenID int64) error {
-	now := timeNow()
-	_, err := ss.sess.Exec(ctx, `UPDATE api_key SET last_used_at=? WHERE id=?`, &now, tokenID)
-	return err
-}
-
-func (ss *sqlxStore) Count(ctx context.Context, scopeParams *quota.ScopeParameters) (*quota.Map, error) {
-	u := &quota.Map{}
-	type result struct {
-		Count int64
-	}
-
-	r := result{}
-	if err := ss.sess.Get(ctx, &r, `SELECT COUNT(*) AS count FROM api_key`); err != nil {
-		return u, err
-	} else {
-		tag, err := quota.NewTag(apikey.QuotaTargetSrv, apikey.QuotaTarget, quota.GlobalScope)
-		if err != nil {
-			return nil, err
-		}
-		u.Set(tag, r.Count)
-	}
-
-	if scopeParams != nil && scopeParams.OrgID != 0 {
-		if err := ss.sess.Get(ctx, &r, `SELECT COUNT(*) AS count FROM api_key WHERE org_id = ?`, scopeParams.OrgID); err != nil {
-			return u, err
-		} else {
-			tag, err := quota.NewTag(apikey.QuotaTargetSrv, apikey.QuotaTarget, quota.OrgScope)
-			if err != nil {
-				return nil, err
-			}
-			u.Set(tag, r.Count)
-		}
-	}
-
-	return u, nil
-}
diff --git a/pkg/services/apikey/apikeyimpl/sqlx_store_test.go b/pkg/services/apikey/apikeyimpl/sqlx_store_test.go
deleted file mode 100644
index 42435ecfc584b..0000000000000
--- a/pkg/services/apikey/apikeyimpl/sqlx_store_test.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package apikeyimpl
-
-import (
-	"testing"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func TestIntegrationSQLxApiKeyDataAccess(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	testIntegrationApiKeyDataAccess(t, func(ss db.DB, cfg *setting.Cfg) store {
-		return &sqlxStore{sess: ss.GetSqlxSession(), cfg: cfg}
-	})
-}
diff --git a/pkg/services/apikey/apikeyimpl/store_test.go b/pkg/services/apikey/apikeyimpl/store_test.go
index 6cb6ab1b99cde..3b5089526cdaa 100644
--- a/pkg/services/apikey/apikeyimpl/store_test.go
+++ b/pkg/services/apikey/apikeyimpl/store_test.go
@@ -14,10 +14,14 @@ import (
 	"github.com/grafana/grafana/pkg/services/apikey"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/user"
-	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
-type getStore func(db.DB, *setting.Cfg) store
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
+type getStore func(db.DB) store
 
 type getApiKeysTestCase struct {
 	desc               string
@@ -61,7 +65,7 @@ func testIntegrationApiKeyDataAccess(t *testing.T, fn getStore) {
 
 	t.Run("Testing API Key data access", func(t *testing.T) {
 		db := db.InitTestDB(t)
-		ss := fn(db, db.Cfg)
+		ss := fn(db)
 
 		t.Run("Given saved api key", func(t *testing.T) {
 			cmd := apikey.AddCommand{OrgID: 1, Name: "hello", Key: "asd"}
@@ -200,7 +204,7 @@ func testIntegrationApiKeyDataAccess(t *testing.T, fn getStore) {
 
 	t.Run("Testing API Key errors", func(t *testing.T) {
 		db := db.InitTestDB(t)
-		ss := fn(db, db.Cfg)
+		ss := fn(db)
 
 		t.Run("Delete non-existing key should return error", func(t *testing.T) {
 			cmd := apikey.DeleteCommand{ID: 1}
@@ -255,7 +259,7 @@ func testIntegrationApiKeyDataAccess(t *testing.T, fn getStore) {
 		for _, tt := range tests {
 			t.Run(tt.desc, func(t *testing.T) {
 				db := db.InitTestDB(t, db.InitTestDBOpt{})
-				store := fn(db, db.Cfg)
+				store := fn(db)
 				seedApiKeys(t, store, 10)
 
 				query := &apikey.GetApiKeysQuery{OrgID: 1, User: tt.user}
diff --git a/pkg/services/apikey/apikeyimpl/xorm_store.go b/pkg/services/apikey/apikeyimpl/xorm_store.go
index 11c9bd8468aa0..cef1129847378 100644
--- a/pkg/services/apikey/apikeyimpl/xorm_store.go
+++ b/pkg/services/apikey/apikeyimpl/xorm_store.go
@@ -12,12 +12,10 @@ import (
 	"github.com/grafana/grafana/pkg/services/apikey"
 	"github.com/grafana/grafana/pkg/services/quota"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
-	"github.com/grafana/grafana/pkg/setting"
 )
 
 type sqlStore struct {
-	db  db.DB
-	cfg *setting.Cfg
+	db db.DB
 }
 
 // timeNow makes it possible to test usage of time
diff --git a/pkg/services/apikey/apikeyimpl/xorm_store_test.go b/pkg/services/apikey/apikeyimpl/xorm_store_test.go
index e0b3d268497cb..06cd3bee1488b 100644
--- a/pkg/services/apikey/apikeyimpl/xorm_store_test.go
+++ b/pkg/services/apikey/apikeyimpl/xorm_store_test.go
@@ -4,14 +4,13 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/setting"
 )
 
 func TestIntegrationXORMApiKeyDataAccess(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
-	testIntegrationApiKeyDataAccess(t, func(ss db.DB, cfg *setting.Cfg) store {
-		return &sqlStore{db: ss, cfg: cfg}
+	testIntegrationApiKeyDataAccess(t, func(ss db.DB) store {
+		return &sqlStore{db: ss}
 	})
 }
diff --git a/pkg/services/apikey/model.go b/pkg/services/apikey/model.go
index fe6c7b036900a..c9457b8e84533 100644
--- a/pkg/services/apikey/model.go
+++ b/pkg/services/apikey/model.go
@@ -32,7 +32,7 @@ type APIKey struct {
 
 func (k APIKey) TableName() string { return "api_key" }
 
-// swagger:model
+// swagger:model AddAPIKeyCommand
 type AddCommand struct {
 	Name             string       `json:"name" binding:"Required"`
 	Role             org.RoleType `json:"role" binding:"Required"`
diff --git a/pkg/services/apiserver/README.md b/pkg/services/apiserver/README.md
new file mode 100644
index 0000000000000..98df14b6dc1be
--- /dev/null
+++ b/pkg/services/apiserver/README.md
@@ -0,0 +1,81 @@
+# Grafana Kubernetes compatible API Server
+
+## Basic Setup
+
+```ini
+[feature_toggles]
+kubernetesPlaylists = true
+```
+
+Start Grafana:
+
+```bash
+make run
+```
+
+## Enable dual write to `etcd`
+
+Start `etcd`:
+```bash
+make devenv sources=etcd
+```
+
+Set storage type and etcd server address in `custom.ini`:
+
+```ini
+[grafana-apiserver]
+storage_type = etcd
+etcd_servers = 127.0.0.1:2379
+```
+
+## Enable dual write to JSON files:
+
+Set storage type:
+
+```ini
+[grafana-apiserver]
+storage_type = file
+```
+
+Objects will be written to disk under the `{data.path}/grafana-apiserver/` directory.
+
+For example:
+
+```
+data/grafana-apiserver
+├── grafana.kubeconfig
+└── playlist.grafana.app
+    └── playlists
+        └── default
+            └── hi.json
+```
+
+## Enable aggregation
+
+See [aggregator/README.md](./aggregator/README.md) for more information.
+
+### `kubectl` access
+
+For kubectl to work, grafana needs to run over https.  To simplify development, you can use:
+
+```ini
+app_mode = development
+
+[feature_toggles]
+grafanaAPIServerEnsureKubectlAccess = true 
+kubernetesPlaylists = true
+```
+
+This will create a development kubeconfig and start a parallel ssl listener.  It can be registered by
+navigating to the root grafana folder, then running:
+```bash
+export KUBECONFIG=$PWD/data/grafana-apiserver/grafana.kubeconfig
+kubectl api-resources
+```
+
+### Grafana API Access
+
+The Kubernetes compatible API can be accessed using existing Grafana AuthN at: [http://localhost:3000/apis](http://localhost:3000/apis).
+
+The equivalent openapi docs can be seen in [http://localhost:3000/swagger](http://localhost:3000/swagger), 
+select the relevant API from the dropdown in the upper right.
diff --git a/pkg/services/apiserver/aggregator/README.md b/pkg/services/apiserver/aggregator/README.md
new file mode 100644
index 0000000000000..5216b23873c89
--- /dev/null
+++ b/pkg/services/apiserver/aggregator/README.md
@@ -0,0 +1,127 @@
+# aggregator
+
+This is a package that is intended to power the aggregation of microservices within Grafana. The concept
+as well as implementation is largely borrowed from [kube-aggregator](https://github.com/kubernetes/kube-aggregator).
+
+## Why aggregate services?
+
+Grafana's future architecture will entail the same API Server design as that of Kubernetes API Servers. API Servers
+provide a standard way of stitching together API Groups through discovery and shared routing patterns that allows
+them to aggregate to a parent API Server in a seamless manner. Since we desire to break Grafana monolith up into
+more functionally divided microservices, aggregation does the job of still being able to provide these services
+under a single address. Other benefits of aggregation include free health checks and being able to independently 
+roll out features for each service without downtime.
+
+To read more about the concept, see 
+[here](https://kubernetes.io/docs/tasks/extend-kubernetes/setup-extension-api-server/).
+
+Note that this aggregation will be a totally internal detail to Grafana. External fully functional API Servers that
+may themselves act as parent API Servers to Grafana will never be made aware of internal Grafana API Servers.
+Thus, any `APIService` objects corresponding to Grafana's API groups will take the address of 
+Grafana's main API Server (the one that bundles grafana-aggregator).
+
+Also, note that the single binary OSS offering of Grafana doesn't make use of the aggregator component at all, instead
+opting for local installation of all the Grafana API groups.
+
+### kube-aggregator versus grafana-aggregator
+
+The `grafana-aggregator` component will work similarly to how `kube-aggregator` works for `kube-apiserver`, the major
+difference being that it doesn't require core V1 APIs such as `Service`. Early on, we decided to not have core V1
+APIs in the root Grafana API Server. In order to still be able to implement aggregation, we do the following in this Go
+package:
+
+1. We do not start the core shared informer factories as well as any default controllers that utilize them. 
+This is achieved using `DisabledPostStartHooks` facility under the GenericAPIServer's RecommendedConfig.
+2. We provide an `externalname` Kind API implementation under `service.grafana.app` group which works functionally 
+equivalent to the idea with the same name under `core/v1/Service`.
+3. Lastly, we swap the default available condition controller with the custom one written by us. This one is based on
+our `externalname` (`service.grafana.app`) implementation. We register separate `PostStartHooks` 
+using `AddPostStartHookOrDie` on the GenericAPIServer to start the corresponding custom controller as well as 
+requisite informer factories for our own `externalname` Kind.
+4. For now, we bundle apiextensions-apiserver under our aggregator component. This is slightly different from K8s
+where kube-apiserver is called the top-level component and controlplane, aggregator and apiextensions-apiserver
+live under that instead.
+
+### Gotchas (Pay Attention)
+
+1. `grafana-aggregator` uses file storage under `data/grafana-apiserver` (`apiregistration.k8s.io`,
+`service.grafana.app`). Thus, any restarts will still have any prior configured aggregation in effect.
+2. During local development, ensure you start the aggregated service after launching the aggregator. This is
+so you have TLS and kubeconfig available for use with example aggregated api servers.
+3. Ensure you have `grafanaAPIServerWithExperimentalAPIs = false` in your custom.ini. Otherwise, the example
+service the following guide uses for the aggregation test is bundled as a `Local` `APIService` and will cause
+configuration overwrites on startup.
+
+## Testing aggregation locally
+
+1. Generate the PKI using `openssl` (for development purposes, we will use the CN of `system:masters`):
+  ```shell
+  ./hack/make-aggregator-pki.sh
+  ```
+2. Configure the aggregator:
+  ```ini
+  [feature_toggles]
+  grafanaAPIServerEnsureKubectlAccess = true
+  ; disable the experimental APIs flag to disable bundling of the example service locally
+  grafanaAPIServerWithExperimentalAPIs = false
+  kubernetesAggregator = true
+
+  [grafana-apiserver]
+  proxy_client_cert_file = ./data/grafana-aggregator/client.crt
+  proxy_client_key_file = ./data/grafana-aggregator/client.key
+  ```
+3. Start the server
+  ```shell
+  make run
+  ```
+4. In another tab, apply the manifests: 
+  ```shell
+  export KUBECONFIG=$PWD/data/grafana-apiserver/grafana.kubeconfig
+  kubectl apply -f ./pkg/services/apiserver/aggregator/examples/manual-test/
+  # SAMPLE OUTPUT
+  # apiservice.apiregistration.k8s.io/v0alpha1.example.grafana.app created
+  # externalname.service.grafana.app/example-apiserver created
+  
+  kubectl get apiservice
+  # SAMPLE OUTPUT
+  # NAME                           SERVICE                     AVAILABLE                      AGE
+  # v0alpha1.example.grafana.app   grafana/example-apiserver   False (FailedDiscoveryCheck)   29m
+  ```
+5. In another tab, start the example microservice that will be aggregated by the parent apiserver:
+  ```shell
+  go run ./pkg/cmd/grafana apiserver \
+    --runtime-config=example.grafana.app/v0alpha1=true \
+    --secure-port 7443 \
+    --tls-cert-file $PWD/data/grafana-aggregator/server.crt \
+    --tls-private-key-file $PWD/data/grafana-aggregator/server.key \ 
+    --requestheader-client-ca-file=$PWD/data/grafana-aggregator/ca.crt \
+    --requestheader-extra-headers-prefix=X-Remote-Extra- \
+    --requestheader-group-headers=X-Remote-Group \
+    --requestheader-username-headers=X-Remote-User \
+    -v 10
+  ```
+6. After 10 seconds, check `APIService` again. It should report as available.
+  ```shell
+  export KUBECONFIG=$PWD/data/grafana-apiserver/grafana.kubeconfig
+  kubectl get apiservice
+  # SAMPLE OUTPUT
+  # NAME                           SERVICE                     AVAILABLE      AGE
+  # v0alpha1.example.grafana.app   grafana/example-apiserver   True           30m
+  ```
+7. For tear down of the above test:
+  ```shell
+  kubectl delete -f ./pkg/services/apiserver/aggregator/examples/
+  ```
+
+## Testing auto-registration of remote services locally
+
+A sample aggregation config for remote services is provided under [conf](../../../../conf/aggregation/apiservices.yaml). Provided, you have the following setup in your custom.ini, the apiserver will
+register your remotely running services on startup.
+
+```ini
+; in custom.ini
+; the bundle is only used when not in dev mode
+apiservice_ca_bundle_file = ./data/grafana-aggregator/ca.crt
+
+remote_services_file = ./pkg/services/apiserver/aggregator/examples/autoregister/apiservices.yaml
+```
diff --git a/pkg/services/apiserver/aggregator/aggregator.go b/pkg/services/apiserver/aggregator/aggregator.go
new file mode 100644
index 0000000000000..75028060d4c68
--- /dev/null
+++ b/pkg/services/apiserver/aggregator/aggregator.go
@@ -0,0 +1,474 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+// Provenance-includes-location: https://github.com/kubernetes/kubernetes/blob/master/cmd/kube-apiserver/app/aggregator.go
+// Provenance-includes-license: Apache-2.0
+// Provenance-includes-copyright: The Kubernetes Authors.
+// Provenance-includes-location: https://github.com/kubernetes/kubernetes/blob/master/cmd/kube-apiserver/app/server.go
+// Provenance-includes-license: Apache-2.0
+// Provenance-includes-copyright: The Kubernetes Authors.
+// Provenance-includes-location: https://github.com/kubernetes/kubernetes/blob/master/pkg/controlplane/apiserver/apiextensions.go
+// Provenance-includes-license: Apache-2.0
+// Provenance-includes-copyright: The Kubernetes Authors.
+
+package aggregator
+
+import (
+	"context"
+	"crypto/tls"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"strings"
+	"sync"
+	"time"
+
+	servicev0alpha1 "github.com/grafana/grafana/pkg/apis/service/v0alpha1"
+	"github.com/grafana/grafana/pkg/registry/apis/service"
+	"gopkg.in/yaml.v3"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	utilnet "k8s.io/apimachinery/pkg/util/net"
+	"k8s.io/apimachinery/pkg/util/sets"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+	"k8s.io/apiserver/pkg/server/dynamiccertificates"
+	"k8s.io/apiserver/pkg/server/healthz"
+	"k8s.io/client-go/informers"
+	"k8s.io/client-go/kubernetes/fake"
+	"k8s.io/client-go/tools/cache"
+	"k8s.io/klog/v2"
+	v1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
+	v1helper "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/helper"
+	aggregatorapiserver "k8s.io/kube-aggregator/pkg/apiserver"
+	aggregatorscheme "k8s.io/kube-aggregator/pkg/apiserver/scheme"
+	apiregistrationclientset "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset"
+	apiregistrationclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1"
+	apiregistrationInformers "k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1"
+	"k8s.io/kube-aggregator/pkg/controllers"
+	"k8s.io/kube-aggregator/pkg/controllers/autoregister"
+
+	"github.com/grafana/grafana/pkg/apiserver/builder"
+	servicev0alpha1applyconfiguration "github.com/grafana/grafana/pkg/generated/applyconfiguration/service/v0alpha1"
+	serviceclientset "github.com/grafana/grafana/pkg/generated/clientset/versioned"
+	informersv0alpha1 "github.com/grafana/grafana/pkg/generated/informers/externalversions"
+	"github.com/grafana/grafana/pkg/services/apiserver/options"
+)
+
+func readCABundlePEM(path string, devMode bool) ([]byte, error) {
+	if devMode {
+		return nil, nil
+	}
+
+	// We can ignore the gosec G304 warning on this one because `path` comes
+	// from Grafana configuration (commandOptions.AggregatorOptions.APIServiceCABundleFile)
+	//nolint:gosec
+	f, err := os.Open(path)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		if err := f.Close(); err != nil {
+			klog.Errorf("error closing remote services file: %s", err)
+		}
+	}()
+
+	return io.ReadAll(f)
+}
+
+func readRemoteServices(path string) ([]RemoteService, error) {
+	// We can ignore the gosec G304 warning on this one because `path` comes
+	// from Grafana configuration (commandOptions.AggregatorOptions.RemoteServicesFile)
+	//nolint:gosec
+	f, err := os.Open(path)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		if err := f.Close(); err != nil {
+			klog.Errorf("error closing remote services file: %s", err)
+		}
+	}()
+
+	rawRemoteServices, err := io.ReadAll(f)
+	if err != nil {
+		return nil, err
+	}
+
+	remoteServices := make([]RemoteService, 0)
+	if err := yaml.Unmarshal(rawRemoteServices, &remoteServices); err != nil {
+		return nil, err
+	}
+
+	return remoteServices, nil
+}
+
+func CreateAggregatorConfig(commandOptions *options.Options, sharedConfig genericapiserver.RecommendedConfig, externalNamesNamespace string) (*Config, error) {
+	// Create a fake clientset and informers for the k8s v1 API group.
+	// These are not used in grafana's aggregator because v1 APIs are not available.
+	fakev1Informers := informers.NewSharedInformerFactory(fake.NewSimpleClientset(), 10*time.Minute)
+
+	serviceClient, err := serviceclientset.NewForConfig(sharedConfig.LoopbackClientConfig)
+	if err != nil {
+		return nil, err
+	}
+	sharedInformerFactory := informersv0alpha1.NewSharedInformerFactory(
+		serviceClient,
+		5*time.Minute, // this is effectively used as a refresh interval right now.  Might want to do something nicer later on.
+	)
+	serviceResolver := NewExternalNameResolver(sharedInformerFactory.Service().V0alpha1().ExternalNames().Lister())
+
+	aggregatorConfig := &aggregatorapiserver.Config{
+		GenericConfig: &genericapiserver.RecommendedConfig{
+			Config:                sharedConfig.Config,
+			SharedInformerFactory: fakev1Informers,
+			ClientConfig:          sharedConfig.LoopbackClientConfig,
+		},
+		ExtraConfig: aggregatorapiserver.ExtraConfig{
+			ProxyClientCertFile: commandOptions.AggregatorOptions.ProxyClientCertFile,
+			ProxyClientKeyFile:  commandOptions.AggregatorOptions.ProxyClientKeyFile,
+			// NOTE: while ProxyTransport can be skipped in the configuration, it allows honoring
+			// DISABLE_HTTP2, HTTPS_PROXY and NO_PROXY env vars as needed
+			ProxyTransport:  createProxyTransport(),
+			ServiceResolver: serviceResolver,
+		},
+	}
+
+	if err := commandOptions.AggregatorOptions.ApplyTo(aggregatorConfig, commandOptions.RecommendedOptions.Etcd, commandOptions.StorageOptions.DataPath); err != nil {
+		return nil, err
+	}
+
+	serviceAPIBuilder := service.NewServiceAPIBuilder()
+	if err := serviceAPIBuilder.InstallSchema(aggregatorscheme.Scheme); err != nil {
+		return nil, err
+	}
+	APIVersionPriorities[serviceAPIBuilder.GetGroupVersion()] = Priority{Group: 15000, Version: int32(1)}
+
+	// Exit early, if no remote services file is configured
+	if commandOptions.AggregatorOptions.RemoteServicesFile == "" {
+		return NewConfig(aggregatorConfig, sharedInformerFactory, []builder.APIGroupBuilder{serviceAPIBuilder}, nil), nil
+	}
+
+	_, err = readCABundlePEM(commandOptions.AggregatorOptions.APIServiceCABundleFile, commandOptions.ExtraOptions.DevMode)
+	if err != nil {
+		return nil, err
+	}
+	remoteServices, err := readRemoteServices(commandOptions.AggregatorOptions.RemoteServicesFile)
+	if err != nil {
+		return nil, err
+	}
+
+	remoteServicesConfig := &RemoteServicesConfig{
+		// TODO: in practice, we should only use the insecure flag when commandOptions.ExtraOptions.DevMode == true
+		// But given the bug in K8s, we are forced to set it to true until the below PR is merged and available
+		// https://github.com/kubernetes/kubernetes/pull/123808
+		InsecureSkipTLSVerify:  true,
+		ExternalNamesNamespace: externalNamesNamespace,
+		// TODO: CABundle can't be set when insecure is true
+		// CABundle: caBundlePEM,
+		Services:         remoteServices,
+		serviceClientSet: serviceClient,
+	}
+
+	return NewConfig(aggregatorConfig, sharedInformerFactory, []builder.APIGroupBuilder{serviceAPIBuilder}, remoteServicesConfig), nil
+}
+
+func CreateAggregatorServer(config *Config, delegateAPIServer genericapiserver.DelegationTarget) (*aggregatorapiserver.APIAggregator, error) {
+	aggregatorConfig := config.KubeAggregatorConfig
+	sharedInformerFactory := config.Informers
+	remoteServicesConfig := config.RemoteServicesConfig
+	externalNamesInformer := sharedInformerFactory.Service().V0alpha1().ExternalNames()
+	completedConfig := aggregatorConfig.Complete()
+
+	aggregatorServer, err := completedConfig.NewWithDelegate(delegateAPIServer)
+	if err != nil {
+		return nil, err
+	}
+
+	// create controllers for auto-registration
+	apiRegistrationClient, err := apiregistrationclient.NewForConfig(completedConfig.GenericConfig.LoopbackClientConfig)
+	if err != nil {
+		return nil, err
+	}
+
+	autoRegistrationController := autoregister.NewAutoRegisterController(aggregatorServer.APIRegistrationInformers.Apiregistration().V1().APIServices(), apiRegistrationClient)
+
+	apiServices := apiServicesToRegister(delegateAPIServer, autoRegistrationController)
+
+	// Imbue all builtin group-priorities onto the aggregated discovery
+	if completedConfig.GenericConfig.AggregatedDiscoveryGroupManager != nil {
+		for gv, entry := range APIVersionPriorities {
+			completedConfig.GenericConfig.AggregatedDiscoveryGroupManager.SetGroupVersionPriority(metav1.GroupVersion(gv), int(entry.Group), int(entry.Version))
+		}
+	}
+
+	err = aggregatorServer.GenericAPIServer.AddPostStartHook("grafana-apiserver-autoregistration", func(context genericapiserver.PostStartHookContext) error {
+		go autoRegistrationController.Run(5, context.StopCh)
+		return nil
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	if remoteServicesConfig != nil {
+		addRemoteAPIServicesToRegister(remoteServicesConfig, autoRegistrationController)
+		externalNames := getRemoteExternalNamesToRegister(remoteServicesConfig)
+		err = aggregatorServer.GenericAPIServer.AddPostStartHook("grafana-apiserver-remote-autoregistration", func(ctx genericapiserver.PostStartHookContext) error {
+			controllers.WaitForCacheSync("grafana-apiserver-remote-autoregistration", ctx.StopCh, externalNamesInformer.Informer().HasSynced)
+			namespacedClient := remoteServicesConfig.serviceClientSet.ServiceV0alpha1().ExternalNames(remoteServicesConfig.ExternalNamesNamespace)
+			for _, externalName := range externalNames {
+				_, err := namespacedClient.Apply(context.Background(), externalName, metav1.ApplyOptions{
+					FieldManager: "grafana-aggregator",
+					Force:        true,
+				})
+				if err != nil {
+					return err
+				}
+			}
+			return nil
+		})
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	err = aggregatorServer.GenericAPIServer.AddBootSequenceHealthChecks(
+		makeAPIServiceAvailableHealthCheck(
+			"autoregister-completion",
+			apiServices,
+			aggregatorServer.APIRegistrationInformers.Apiregistration().V1().APIServices(),
+		),
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	apiregistrationClient, err := apiregistrationclientset.NewForConfig(completedConfig.GenericConfig.LoopbackClientConfig)
+	if err != nil {
+		return nil, err
+	}
+
+	proxyCurrentCertKeyContentFunc := func() ([]byte, []byte) {
+		return nil, nil
+	}
+	if len(config.KubeAggregatorConfig.ExtraConfig.ProxyClientCertFile) > 0 && len(config.KubeAggregatorConfig.ExtraConfig.ProxyClientKeyFile) > 0 {
+		aggregatorProxyCerts, err := dynamiccertificates.NewDynamicServingContentFromFiles("aggregator-proxy-cert", config.KubeAggregatorConfig.ExtraConfig.ProxyClientCertFile, config.KubeAggregatorConfig.ExtraConfig.ProxyClientKeyFile)
+		if err != nil {
+			return nil, err
+		}
+		proxyCurrentCertKeyContentFunc = func() ([]byte, []byte) {
+			return aggregatorProxyCerts.CurrentCertKeyContent()
+		}
+	}
+
+	availableController, err := NewAvailableConditionController(
+		aggregatorServer.APIRegistrationInformers.Apiregistration().V1().APIServices(),
+		externalNamesInformer,
+		apiregistrationClient.ApiregistrationV1(),
+		nil,
+		proxyCurrentCertKeyContentFunc,
+		completedConfig.ExtraConfig.ServiceResolver,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	aggregatorServer.GenericAPIServer.AddPostStartHookOrDie("apiservice-status-override-available-controller", func(context genericapiserver.PostStartHookContext) error {
+		// if we end up blocking for long periods of time, we may need to increase workers.
+		go availableController.Run(5, context.StopCh)
+		return nil
+	})
+
+	aggregatorServer.GenericAPIServer.AddPostStartHookOrDie("start-grafana-aggregator-informers", func(context genericapiserver.PostStartHookContext) error {
+		sharedInformerFactory.Start(context.StopCh)
+		aggregatorServer.APIRegistrationInformers.Start(context.StopCh)
+		return nil
+	})
+
+	for _, b := range config.Builders {
+		serviceAPIGroupInfo, err := b.GetAPIGroupInfo(aggregatorscheme.Scheme, aggregatorscheme.Codecs, aggregatorConfig.GenericConfig.RESTOptionsGetter, false)
+		if err != nil {
+			return nil, err
+		}
+		if err := aggregatorServer.GenericAPIServer.InstallAPIGroup(serviceAPIGroupInfo); err != nil {
+			return nil, err
+		}
+	}
+
+	return aggregatorServer, nil
+}
+
+func makeAPIService(gv schema.GroupVersion) *v1.APIService {
+	apiServicePriority, ok := APIVersionPriorities[gv]
+	if !ok {
+		// if we aren't found, then we shouldn't register ourselves because it could result in a CRD group version
+		// being permanently stuck in the APIServices list.
+		klog.Infof("Skipping APIService creation for %v", gv)
+		return nil
+	}
+	return &v1.APIService{
+		ObjectMeta: metav1.ObjectMeta{Name: gv.Version + "." + gv.Group},
+		Spec: v1.APIServiceSpec{
+			Group:                gv.Group,
+			Version:              gv.Version,
+			GroupPriorityMinimum: apiServicePriority.Group,
+			VersionPriority:      apiServicePriority.Version,
+		},
+	}
+}
+
+// makeAPIServiceAvailableHealthCheck returns a healthz check that returns healthy
+// once all of the specified services have been observed to be available at least once.
+func makeAPIServiceAvailableHealthCheck(name string, apiServices []*v1.APIService, apiServiceInformer apiregistrationInformers.APIServiceInformer) healthz.HealthChecker {
+	// Track the auto-registered API services that have not been observed to be available yet
+	pendingServiceNamesLock := &sync.RWMutex{}
+	pendingServiceNames := sets.NewString()
+	for _, service := range apiServices {
+		pendingServiceNames.Insert(service.Name)
+	}
+
+	// When an APIService in the list is seen as available, remove it from the pending list
+	handleAPIServiceChange := func(service *v1.APIService) {
+		pendingServiceNamesLock.Lock()
+		defer pendingServiceNamesLock.Unlock()
+		if !pendingServiceNames.Has(service.Name) {
+			return
+		}
+		if v1helper.IsAPIServiceConditionTrue(service, v1.Available) {
+			pendingServiceNames.Delete(service.Name)
+		}
+	}
+
+	// Watch add/update events for APIServices
+	_, err := apiServiceInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
+		AddFunc:    func(obj interface{}) { handleAPIServiceChange(obj.(*v1.APIService)) },
+		UpdateFunc: func(old, new interface{}) { handleAPIServiceChange(new.(*v1.APIService)) },
+	})
+	if err != nil {
+		klog.Errorf("Failed to watch APIServices for health check: %v", err)
+	}
+
+	// Don't return healthy until the pending list is empty
+	return healthz.NamedCheck(name, func(r *http.Request) error {
+		pendingServiceNamesLock.RLock()
+		defer pendingServiceNamesLock.RUnlock()
+		if pendingServiceNames.Len() > 0 {
+			klog.Error("APIServices not yet available", "services", pendingServiceNames.List())
+			return fmt.Errorf("missing APIService: %v", pendingServiceNames.List())
+		}
+		return nil
+	})
+}
+
+// Priority defines group Priority that is used in discovery. This controls
+// group position in the kubectl output.
+type Priority struct {
+	// Group indicates the order of the Group relative to other groups.
+	Group int32
+	// Version indicates the relative order of the Version inside of its group.
+	Version int32
+}
+
+// APIVersionPriorities are the proper way to resolve this letting the aggregator know the desired group and version-within-group order of the underlying servers
+// is to refactor the genericapiserver.DelegationTarget to include a list of priorities based on which APIs were installed.
+// This requires the APIGroupInfo struct to evolve and include the concept of priorities and to avoid mistakes, the core storage map there needs to be updated.
+// That ripples out every bit as far as you'd expect, so for 1.7 we'll include the list here instead of being built up during storage.
+var APIVersionPriorities = map[schema.GroupVersion]Priority{
+	{Group: "", Version: "v1"}: {Group: 18000, Version: 1},
+	// to my knowledge, nothing below here collides
+	{Group: "admissionregistration.k8s.io", Version: "v1"}:       {Group: 16700, Version: 15},
+	{Group: "admissionregistration.k8s.io", Version: "v1beta1"}:  {Group: 16700, Version: 12},
+	{Group: "admissionregistration.k8s.io", Version: "v1alpha1"}: {Group: 16700, Version: 9},
+	// Append a new group to the end of the list if unsure.
+	// You can use min(existing group)-100 as the initial value for a group.
+	// Version can be set to 9 (to have space around) for a new group.
+}
+
+func addRemoteAPIServicesToRegister(config *RemoteServicesConfig, registration autoregister.AutoAPIServiceRegistration) {
+	for i, service := range config.Services {
+		port := service.Port
+		apiService := &v1.APIService{
+			ObjectMeta: metav1.ObjectMeta{Name: service.Version + "." + service.Group},
+			Spec: v1.APIServiceSpec{
+				Group:                 service.Group,
+				Version:               service.Version,
+				InsecureSkipTLSVerify: config.InsecureSkipTLSVerify,
+				CABundle:              config.CABundle,
+				// TODO: Group priority minimum of 1000 more than for local services, figure out a better story
+				// when we have multiple versions, potentially running in heterogeneous ways (local and remote)
+				GroupPriorityMinimum: 16000,
+				VersionPriority:      1 + int32(i),
+				Service: &v1.ServiceReference{
+					Name:      service.Version + "." + service.Group,
+					Namespace: config.ExternalNamesNamespace,
+					Port:      &port,
+				},
+			},
+		}
+
+		registration.AddAPIServiceToSyncOnStart(apiService)
+	}
+}
+
+func getRemoteExternalNamesToRegister(config *RemoteServicesConfig) []*servicev0alpha1applyconfiguration.ExternalNameApplyConfiguration {
+	externalNames := make([]*servicev0alpha1applyconfiguration.ExternalNameApplyConfiguration, 0)
+
+	for _, service := range config.Services {
+		host := service.Host
+		name := service.Version + "." + service.Group
+		externalName := &servicev0alpha1applyconfiguration.ExternalNameApplyConfiguration{}
+		externalName.WithAPIVersion(servicev0alpha1.SchemeGroupVersion.String())
+		externalName.WithKind("ExternalName")
+		externalName.WithName(name)
+		externalName.WithSpec(&servicev0alpha1applyconfiguration.ExternalNameSpecApplyConfiguration{
+			Host: &host,
+		})
+		externalNames = append(externalNames, externalName)
+	}
+
+	return externalNames
+}
+
+func apiServicesToRegister(delegateAPIServer genericapiserver.DelegationTarget, registration autoregister.AutoAPIServiceRegistration) []*v1.APIService {
+	apiServices := []*v1.APIService{}
+
+	for _, curr := range delegateAPIServer.ListedPaths() {
+		if curr == "/api/v1" {
+			apiService := makeAPIService(schema.GroupVersion{Group: "", Version: "v1"})
+			registration.AddAPIServiceToSyncOnStart(apiService)
+			apiServices = append(apiServices, apiService)
+			continue
+		}
+
+		if !strings.HasPrefix(curr, "/apis/") {
+			continue
+		}
+		// this comes back in a list that looks like /apis/rbac.authorization.k8s.io/v1alpha1
+		tokens := strings.Split(curr, "/")
+		if len(tokens) != 4 {
+			continue
+		}
+
+		apiService := makeAPIService(schema.GroupVersion{Group: tokens[2], Version: tokens[3]})
+		if apiService == nil {
+			continue
+		}
+		registration.AddAPIServiceToSyncOnStart(apiService)
+		apiServices = append(apiServices, apiService)
+	}
+
+	return apiServices
+}
+
+// NOTE: below function imported from https://github.com/kubernetes/kubernetes/blob/master/cmd/kube-apiserver/app/server.go#L197
+// createProxyTransport creates the dialer infrastructure to connect to the api servers.
+func createProxyTransport() *http.Transport {
+	// NOTE: We don't set proxyDialerFn but the below SetTransportDefaults will
+	// See https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/apimachinery/pkg/util/net/http.go#L109
+	var proxyDialerFn utilnet.DialFunc
+	// Proxying to services is IP-based... don't expect to be able to verify the hostname
+	proxyTLSClientConfig := &tls.Config{InsecureSkipVerify: true}
+	proxyTransport := utilnet.SetTransportDefaults(&http.Transport{
+		DialContext:     proxyDialerFn,
+		TLSClientConfig: proxyTLSClientConfig,
+	})
+	return proxyTransport
+}
diff --git a/pkg/services/apiserver/aggregator/availableController.go b/pkg/services/apiserver/aggregator/availableController.go
new file mode 100644
index 0000000000000..adc534982e5e5
--- /dev/null
+++ b/pkg/services/apiserver/aggregator/availableController.go
@@ -0,0 +1,466 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+// Provenance-includes-location: https://github.com/kubernetes/kube-aggregator/blob/master/pkg/controllers/status/available_controller.go
+// Provenance-includes-license: Apache-2.0
+// Provenance-includes-copyright: The Kubernetes Authors.
+
+package aggregator
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"net/url"
+	"reflect"
+	"sync"
+	"time"
+
+	"github.com/grafana/grafana/pkg/apis/service/v0alpha1"
+	informersservicev0alpha1 "github.com/grafana/grafana/pkg/generated/informers/externalversions/service/v0alpha1"
+	listersservicev0alpha1 "github.com/grafana/grafana/pkg/generated/listers/service/v0alpha1"
+
+	"k8s.io/apimachinery/pkg/api/equality"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/runtime"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	"k8s.io/apimachinery/pkg/util/wait"
+	"k8s.io/client-go/tools/cache"
+	"k8s.io/client-go/transport"
+	"k8s.io/client-go/util/workqueue"
+	"k8s.io/klog/v2"
+	apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
+	apiregistrationv1apihelper "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/helper"
+	apiregistrationclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1"
+	informers "k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1"
+	listers "k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1"
+	"k8s.io/kube-aggregator/pkg/controllers"
+)
+
+type certKeyFunc func() ([]byte, []byte)
+
+// ServiceResolver knows how to convert a service reference into an actual location.
+type ServiceResolver interface {
+	ResolveEndpoint(namespace, name string, port int32) (*url.URL, error)
+}
+
+// AvailableConditionController handles checking the availability of registered API services.
+type AvailableConditionController struct {
+	apiServiceClient apiregistrationclient.APIServicesGetter
+
+	apiServiceLister listers.APIServiceLister
+	apiServiceSynced cache.InformerSynced
+
+	// externalNameLister is used to get the IP to create the transport for
+	externalNameLister listersservicev0alpha1.ExternalNameLister
+	servicesSynced     cache.InformerSynced
+
+	// proxyTransportDial specifies the dial function for creating unencrypted TCP connections.
+	proxyTransportDial         *transport.DialHolder
+	proxyCurrentCertKeyContent certKeyFunc
+	serviceResolver            ServiceResolver
+
+	// To allow injection for testing.
+	syncFn func(key string) error
+
+	queue workqueue.RateLimitingInterface
+	// map from service-namespace -> service-name -> apiservice names
+	cache map[string]map[string][]string
+	// this lock protects operations on the above cache
+	cacheLock sync.RWMutex
+}
+
+// NewAvailableConditionController returns a new AvailableConditionController.
+func NewAvailableConditionController(
+	apiServiceInformer informers.APIServiceInformer,
+	externalNameInformer informersservicev0alpha1.ExternalNameInformer,
+	apiServiceClient apiregistrationclient.APIServicesGetter,
+	proxyTransportDial *transport.DialHolder,
+	proxyCurrentCertKeyContent certKeyFunc,
+	serviceResolver ServiceResolver,
+) (*AvailableConditionController, error) {
+	c := &AvailableConditionController{
+		apiServiceClient:   apiServiceClient,
+		apiServiceLister:   apiServiceInformer.Lister(),
+		externalNameLister: externalNameInformer.Lister(),
+		serviceResolver:    serviceResolver,
+		queue: workqueue.NewNamedRateLimitingQueue(
+			// We want a fairly tight requeue time.  The controller listens to the API, but because it relies on the routability of the
+			// service network, it is possible for an external, non-watchable factor to affect availability.  This keeps
+			// the maximum disruption time to a minimum, but it does prevent hot loops.
+			workqueue.NewItemExponentialFailureRateLimiter(5*time.Millisecond, 30*time.Second),
+			"AvailableConditionController"),
+		proxyTransportDial:         proxyTransportDial,
+		proxyCurrentCertKeyContent: proxyCurrentCertKeyContent,
+	}
+
+	// resync on this one because it is low cardinality and rechecking the actual discovery
+	// allows us to detect health in a more timely fashion when network connectivity to
+	// nodes is snipped, but the network still attempts to route there.  See
+	// https://github.com/openshift/origin/issues/17159#issuecomment-341798063
+	apiServiceHandler, _ := apiServiceInformer.Informer().AddEventHandlerWithResyncPeriod(
+		cache.ResourceEventHandlerFuncs{
+			AddFunc:    c.addAPIService,
+			UpdateFunc: c.updateAPIService,
+			DeleteFunc: c.deleteAPIService,
+		},
+		30*time.Second)
+	c.apiServiceSynced = apiServiceHandler.HasSynced
+
+	serviceHandler, _ := externalNameInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
+		AddFunc:    c.addService,
+		UpdateFunc: c.updateService,
+		DeleteFunc: c.deleteService,
+	})
+	c.servicesSynced = serviceHandler.HasSynced
+
+	c.syncFn = c.sync
+
+	return c, nil
+}
+
+func (c *AvailableConditionController) sync(key string) error {
+	originalAPIService, err := c.apiServiceLister.Get(key)
+	if apierrors.IsNotFound(err) {
+		return nil
+	}
+	if err != nil {
+		return err
+	}
+
+	// if a particular transport was specified, use that otherwise build one
+	// construct an http client that will ignore TLS verification (if someone owns the network and messes with your status
+	// that's not so bad) and sets a very short timeout.  This is a best effort GET that provides no additional information
+	transportConfig := &transport.Config{
+		TLS: transport.TLSConfig{
+			Insecure: true,
+		},
+		DialHolder: c.proxyTransportDial,
+	}
+
+	if c.proxyCurrentCertKeyContent != nil {
+		proxyClientCert, proxyClientKey := c.proxyCurrentCertKeyContent()
+
+		transportConfig.TLS.CertData = proxyClientCert
+		transportConfig.TLS.KeyData = proxyClientKey
+	}
+	restTransport, err := transport.New(transportConfig)
+	if err != nil {
+		return err
+	}
+	discoveryClient := &http.Client{
+		Transport: restTransport,
+		// the request should happen quickly.
+		Timeout: 5 * time.Second,
+		CheckRedirect: func(req *http.Request, via []*http.Request) error {
+			return http.ErrUseLastResponse
+		},
+	}
+
+	apiService := originalAPIService.DeepCopy()
+
+	availableCondition := apiregistrationv1.APIServiceCondition{
+		Type:               apiregistrationv1.Available,
+		Status:             apiregistrationv1.ConditionTrue,
+		LastTransitionTime: metav1.Now(),
+	}
+
+	// local API services are always considered available
+	if apiService.Spec.Service == nil {
+		apiregistrationv1apihelper.SetAPIServiceCondition(apiService, apiregistrationv1apihelper.NewLocalAvailableAPIServiceCondition())
+		_, err := c.updateAPIServiceStatus(originalAPIService, apiService)
+		return err
+	}
+
+	_, err = c.externalNameLister.ExternalNames(apiService.Spec.Service.Namespace).Get(apiService.Spec.Service.Name)
+	if apierrors.IsNotFound(err) {
+		availableCondition.Status = apiregistrationv1.ConditionFalse
+		availableCondition.Reason = "ServiceNotFound"
+		availableCondition.Message = fmt.Sprintf("service/%s in %q is not present", apiService.Spec.Service.Name, apiService.Spec.Service.Namespace)
+		apiregistrationv1apihelper.SetAPIServiceCondition(apiService, availableCondition)
+		_, err := c.updateAPIServiceStatus(originalAPIService, apiService)
+		return err
+	} else if err != nil {
+		availableCondition.Status = apiregistrationv1.ConditionUnknown
+		availableCondition.Reason = "ServiceAccessError"
+		availableCondition.Message = fmt.Sprintf("service/%s in %q cannot be checked due to: %v", apiService.Spec.Service.Name, apiService.Spec.Service.Namespace, err)
+		apiregistrationv1apihelper.SetAPIServiceCondition(apiService, availableCondition)
+		_, err := c.updateAPIServiceStatus(originalAPIService, apiService)
+		return err
+	}
+
+	// actually try to hit the discovery endpoint when it isn't local and when we're routing as a service.
+	if apiService.Spec.Service != nil && c.serviceResolver != nil {
+		attempts := 5
+		results := make(chan error, attempts)
+		for i := 0; i < attempts; i++ {
+			go func() {
+				discoveryURL, err := c.serviceResolver.ResolveEndpoint(apiService.Spec.Service.Namespace, apiService.Spec.Service.Name, *apiService.Spec.Service.Port)
+				if err != nil {
+					results <- err
+					return
+				}
+				// render legacyAPIService health check path when it is delegated to a service
+				if apiService.Name == "v1." {
+					discoveryURL.Path = "/api/" + apiService.Spec.Version
+				} else {
+					discoveryURL.Path = "/apis/" + apiService.Spec.Group + "/" + apiService.Spec.Version
+				}
+
+				errCh := make(chan error, 1)
+				go func() {
+					// be sure to check a URL that the aggregated API server is required to serve
+					newReq, err := http.NewRequest("GET", discoveryURL.String(), nil)
+					if err != nil {
+						errCh <- err
+						return
+					}
+
+					// setting the system-masters identity ensures that we will always have access rights
+					transport.SetAuthProxyHeaders(newReq, "system:kube-aggregator", []string{"system:masters"}, nil)
+					resp, err := discoveryClient.Do(newReq)
+					if resp != nil {
+						_ = resp.Body.Close()
+						// we should always been in the 200s or 300s
+						if resp.StatusCode < http.StatusOK || resp.StatusCode >= http.StatusMultipleChoices {
+							errCh <- fmt.Errorf("bad status from %v: %v", discoveryURL, resp.StatusCode)
+							return
+						}
+					}
+
+					errCh <- err
+				}()
+
+				select {
+				case err = <-errCh:
+					if err != nil {
+						results <- fmt.Errorf("failing or missing response from %v: %v", discoveryURL, err)
+						return
+					}
+
+					// we had trouble with slow dial and DNS responses causing us to wait too long.
+					// we added this as insurance
+				case <-time.After(6 * time.Second):
+					results <- fmt.Errorf("timed out waiting for %v", discoveryURL)
+					return
+				}
+
+				results <- nil
+			}()
+		}
+
+		var lastError error
+		for i := 0; i < attempts; i++ {
+			lastError = <-results
+			// if we had at least one success, we are successful overall and we can return now
+			if lastError == nil {
+				break
+			}
+		}
+
+		if lastError != nil {
+			availableCondition.Status = apiregistrationv1.ConditionFalse
+			availableCondition.Reason = "FailedDiscoveryCheck"
+			availableCondition.Message = lastError.Error()
+			apiregistrationv1apihelper.SetAPIServiceCondition(apiService, availableCondition)
+			_, updateErr := c.updateAPIServiceStatus(originalAPIService, apiService)
+			if updateErr != nil {
+				return updateErr
+			}
+			// force a requeue to make it very obvious that this will be retried at some point in the future
+			// along with other requeues done via service change, endpoint change, and resync
+			return lastError
+		}
+	}
+
+	availableCondition.Reason = "Passed"
+	availableCondition.Message = "all checks passed"
+	apiregistrationv1apihelper.SetAPIServiceCondition(apiService, availableCondition)
+	_, err = c.updateAPIServiceStatus(originalAPIService, apiService)
+	return err
+}
+
+// updateAPIServiceStatus only issues an update if a change is detected.  We have a tight resync loop to quickly detect dead
+// apiservices. Doing that means we don't want to quickly issue no-op updates.
+func (c *AvailableConditionController) updateAPIServiceStatus(originalAPIService, newAPIService *apiregistrationv1.APIService) (*apiregistrationv1.APIService, error) {
+	if equality.Semantic.DeepEqual(originalAPIService.Status, newAPIService.Status) {
+		return newAPIService, nil
+	}
+
+	orig := apiregistrationv1apihelper.GetAPIServiceConditionByType(originalAPIService, apiregistrationv1.Available)
+	now := apiregistrationv1apihelper.GetAPIServiceConditionByType(newAPIService, apiregistrationv1.Available)
+	unknown := apiregistrationv1.APIServiceCondition{
+		Type:   apiregistrationv1.Available,
+		Status: apiregistrationv1.ConditionUnknown,
+	}
+	if orig == nil {
+		orig = &unknown
+	}
+	if now == nil {
+		now = &unknown
+	}
+	if *orig != *now {
+		klog.V(2).InfoS("changing APIService availability", "name", newAPIService.Name, "oldStatus", orig.Status, "newStatus", now.Status, "message", now.Message, "reason", now.Reason)
+	}
+
+	newAPIService, err := c.apiServiceClient.APIServices().UpdateStatus(context.TODO(), newAPIService, metav1.UpdateOptions{})
+	if err != nil {
+		return nil, err
+	}
+
+	return newAPIService, nil
+}
+
+// Run starts the AvailableConditionController loop which manages the availability condition of API services.
+func (c *AvailableConditionController) Run(workers int, stopCh <-chan struct{}) {
+	defer utilruntime.HandleCrash()
+	defer c.queue.ShutDown()
+
+	klog.Info("Starting AvailableConditionController")
+	defer klog.Info("Shutting down AvailableConditionController")
+
+	// This waits not just for the informers to sync, but for our handlers
+	// to be called; since the handlers are three different ways of
+	// enqueueing the same thing, waiting for this permits the queue to
+	// maximally de-duplicate the entries.
+	if !controllers.WaitForCacheSync("AvailableConditionCOverrideController", stopCh, c.apiServiceSynced, c.servicesSynced) {
+		return
+	}
+
+	for i := 0; i < workers; i++ {
+		go wait.Until(c.runWorker, time.Second, stopCh)
+	}
+
+	<-stopCh
+}
+
+func (c *AvailableConditionController) runWorker() {
+	for c.processNextWorkItem() {
+	}
+}
+
+// processNextWorkItem deals with one key off the queue.  It returns false when it's time to quit.
+func (c *AvailableConditionController) processNextWorkItem() bool {
+	key, quit := c.queue.Get()
+	if quit {
+		return false
+	}
+	defer c.queue.Done(key)
+
+	err := c.syncFn(key.(string))
+	if err == nil {
+		c.queue.Forget(key)
+		return true
+	}
+
+	utilruntime.HandleError(fmt.Errorf("%v failed with: %v", key, err))
+	c.queue.AddRateLimited(key)
+
+	return true
+}
+
+func (c *AvailableConditionController) addAPIService(obj interface{}) {
+	castObj := obj.(*apiregistrationv1.APIService)
+	klog.V(4).Infof("Adding %s", castObj.Name)
+	if castObj.Spec.Service != nil {
+		c.rebuildAPIServiceCache()
+	}
+	c.queue.Add(castObj.Name)
+}
+
+func (c *AvailableConditionController) updateAPIService(oldObj, newObj interface{}) {
+	castObj := newObj.(*apiregistrationv1.APIService)
+	oldCastObj := oldObj.(*apiregistrationv1.APIService)
+	klog.V(4).Infof("Updating %s", oldCastObj.Name)
+	if !reflect.DeepEqual(castObj.Spec.Service, oldCastObj.Spec.Service) {
+		c.rebuildAPIServiceCache()
+	}
+	c.queue.Add(oldCastObj.Name)
+}
+
+func (c *AvailableConditionController) deleteAPIService(obj interface{}) {
+	castObj, ok := obj.(*apiregistrationv1.APIService)
+	if !ok {
+		tombstone, ok := obj.(cache.DeletedFinalStateUnknown)
+		if !ok {
+			klog.Errorf("Couldn't get object from tombstone %#v", obj)
+			return
+		}
+		castObj, ok = tombstone.Obj.(*apiregistrationv1.APIService)
+		if !ok {
+			klog.Errorf("Tombstone contained object that is not expected %#v", obj)
+			return
+		}
+	}
+	klog.V(4).Infof("Deleting %q", castObj.Name)
+	if castObj.Spec.Service != nil {
+		c.rebuildAPIServiceCache()
+	}
+	c.queue.Add(castObj.Name)
+}
+
+func (c *AvailableConditionController) getAPIServicesFor(obj runtime.Object) []string {
+	metadata, err := meta.Accessor(obj)
+	if err != nil {
+		utilruntime.HandleError(err)
+		return nil
+	}
+	c.cacheLock.RLock()
+	defer c.cacheLock.RUnlock()
+	return c.cache[metadata.GetNamespace()][metadata.GetName()]
+}
+
+// if the service/endpoint handler wins the race against the cache rebuilding, it may queue a no-longer-relevant apiservice
+// (which will get processed an extra time - this doesn't matter),
+// and miss a newly relevant apiservice (which will get queued by the apiservice handler)
+func (c *AvailableConditionController) rebuildAPIServiceCache() {
+	apiServiceList, _ := c.apiServiceLister.List(labels.Everything())
+	newCache := map[string]map[string][]string{}
+	for _, apiService := range apiServiceList {
+		if apiService.Spec.Service == nil {
+			continue
+		}
+		if newCache[apiService.Spec.Service.Namespace] == nil {
+			newCache[apiService.Spec.Service.Namespace] = map[string][]string{}
+		}
+		newCache[apiService.Spec.Service.Namespace][apiService.Spec.Service.Name] = append(newCache[apiService.Spec.Service.Namespace][apiService.Spec.Service.Name], apiService.Name)
+	}
+
+	c.cacheLock.Lock()
+	defer c.cacheLock.Unlock()
+	c.cache = newCache
+}
+
+// TODO, think of a way to avoid checking on every service manipulation
+
+func (c *AvailableConditionController) addService(obj interface{}) {
+	for _, apiService := range c.getAPIServicesFor(obj.(*v0alpha1.ExternalName)) {
+		c.queue.Add(apiService)
+	}
+}
+
+func (c *AvailableConditionController) updateService(obj, _ interface{}) {
+	for _, apiService := range c.getAPIServicesFor(obj.(*v0alpha1.ExternalName)) {
+		c.queue.Add(apiService)
+	}
+}
+
+func (c *AvailableConditionController) deleteService(obj interface{}) {
+	castObj, ok := obj.(*v0alpha1.ExternalName)
+	if !ok {
+		tombstone, ok := obj.(cache.DeletedFinalStateUnknown)
+		if !ok {
+			klog.Errorf("Couldn't get object from tombstone %#v", obj)
+			return
+		}
+		castObj, ok = tombstone.Obj.(*v0alpha1.ExternalName)
+		if !ok {
+			klog.Errorf("Tombstone contained object that is not expected %#v", obj)
+			return
+		}
+	}
+	for _, apiService := range c.getAPIServicesFor(castObj) {
+		c.queue.Add(apiService)
+	}
+}
diff --git a/pkg/services/apiserver/aggregator/config.go b/pkg/services/apiserver/aggregator/config.go
new file mode 100644
index 0000000000000..e50f938316573
--- /dev/null
+++ b/pkg/services/apiserver/aggregator/config.go
@@ -0,0 +1,68 @@
+package aggregator
+
+import (
+	openapinamer "k8s.io/apiserver/pkg/endpoints/openapi"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+	aggregatorapiserver "k8s.io/kube-aggregator/pkg/apiserver"
+	aggregatorscheme "k8s.io/kube-aggregator/pkg/apiserver/scheme"
+	aggregatoropenapi "k8s.io/kube-aggregator/pkg/generated/openapi"
+	"k8s.io/kube-openapi/pkg/common"
+
+	"github.com/grafana/grafana/pkg/apiserver/builder"
+	serviceclientset "github.com/grafana/grafana/pkg/generated/clientset/versioned"
+	informersv0alpha1 "github.com/grafana/grafana/pkg/generated/informers/externalversions"
+)
+
+type RemoteService struct {
+	Group   string `yaml:"group"`
+	Version string `yaml:"version"`
+	Host    string `yaml:"host"`
+	Port    int32  `yaml:"port"`
+}
+
+type RemoteServicesConfig struct {
+	ExternalNamesNamespace string
+	InsecureSkipTLSVerify  bool
+	CABundle               []byte
+	Services               []RemoteService
+	serviceClientSet       *serviceclientset.Clientset
+}
+
+type Config struct {
+	KubeAggregatorConfig *aggregatorapiserver.Config
+	Informers            informersv0alpha1.SharedInformerFactory
+	RemoteServicesConfig *RemoteServicesConfig
+	// Builders contain prerequisite api groups for aggregator to function correctly e.g. ExternalName
+	// Since the main APIServer delegate supports storage implementations that intend to be multi-tenant
+	// Aggregator builders that we don't intend to use multi-tenant storage are kept in aggregator's
+	// Delegate, one which is configured explicitly to use file storage only
+	Builders []builder.APIGroupBuilder
+}
+
+// remoteServices may be nil when not using aggregation
+func NewConfig(aggregator *aggregatorapiserver.Config, informers informersv0alpha1.SharedInformerFactory, builders []builder.APIGroupBuilder, remoteServices *RemoteServicesConfig) *Config {
+	getMergedOpenAPIDefinitions := func(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
+		aggregatorAPIs := aggregatoropenapi.GetOpenAPIDefinitions(ref)
+		builderAPIs := builder.GetOpenAPIDefinitions(builders)(ref)
+
+		for k, v := range builderAPIs {
+			aggregatorAPIs[k] = v
+		}
+
+		return aggregatorAPIs
+	}
+
+	// Add OpenAPI config, which depends on builders
+	namer := openapinamer.NewDefinitionNamer(aggregatorscheme.Scheme)
+	aggregator.GenericConfig.OpenAPIV3Config = genericapiserver.DefaultOpenAPIV3Config(getMergedOpenAPIDefinitions, namer)
+	aggregator.GenericConfig.OpenAPIV3Config.Info.Title = "Kubernetes"
+	aggregator.GenericConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(getMergedOpenAPIDefinitions, namer)
+	aggregator.GenericConfig.OpenAPIConfig.Info.Title = "Kubernetes"
+
+	return &Config{
+		aggregator,
+		informers,
+		remoteServices,
+		builders,
+	}
+}
diff --git a/pkg/services/apiserver/aggregator/examples/autoregister/apiservices.yaml b/pkg/services/apiserver/aggregator/examples/autoregister/apiservices.yaml
new file mode 100644
index 0000000000000..183afb542b24a
--- /dev/null
+++ b/pkg/services/apiserver/aggregator/examples/autoregister/apiservices.yaml
@@ -0,0 +1,14 @@
+# NOTE: dev-mode only and governed by presence of non-empty value for cfg["grafana-apiserver"]["remote_services_file"]
+# List of sample multi-tenant services to aggregate on startup
+- group: example.grafana.app
+  version: v0alpha1
+  host: localhost
+  port: 7443
+- group: query.grafana.app
+  version: v0alpha1
+  host: localhost
+  port: 7444
+- group: testdata.datasource.grafana.app
+  version: v0alpha1
+  host: localhost
+  port: 7445
diff --git a/pkg/services/apiserver/aggregator/examples/manual-test/apiservice.yaml b/pkg/services/apiserver/aggregator/examples/manual-test/apiservice.yaml
new file mode 100644
index 0000000000000..65cc2a5884a59
--- /dev/null
+++ b/pkg/services/apiserver/aggregator/examples/manual-test/apiservice.yaml
@@ -0,0 +1,15 @@
+---
+apiVersion: apiregistration.k8s.io/v1
+kind: APIService
+metadata:
+  name: v0alpha1.example.grafana.app
+spec:
+  version: v0alpha1
+  insecureSkipTLSVerify: true
+  group: example.grafana.app
+  groupPriorityMinimum: 1000
+  versionPriority: 15
+  service:
+    name: example-apiserver
+    namespace: grafana
+    port: 7443
diff --git a/pkg/services/apiserver/aggregator/examples/manual-test/externalname.yaml b/pkg/services/apiserver/aggregator/examples/manual-test/externalname.yaml
new file mode 100644
index 0000000000000..731782611d51c
--- /dev/null
+++ b/pkg/services/apiserver/aggregator/examples/manual-test/externalname.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: service.grafana.app/v0alpha1
+kind: ExternalName
+metadata:
+  name: example-apiserver
+  namespace: grafana
+spec:
+  host: localhost
diff --git a/pkg/services/apiserver/aggregator/resolver.go b/pkg/services/apiserver/aggregator/resolver.go
new file mode 100644
index 0000000000000..c0970ab726c57
--- /dev/null
+++ b/pkg/services/apiserver/aggregator/resolver.go
@@ -0,0 +1,32 @@
+package aggregator
+
+import (
+	"fmt"
+	"net"
+	"net/url"
+
+	"k8s.io/kube-aggregator/pkg/apiserver"
+
+	servicelistersv0alpha1 "github.com/grafana/grafana/pkg/generated/listers/service/v0alpha1"
+)
+
+func NewExternalNameResolver(externalNames servicelistersv0alpha1.ExternalNameLister) apiserver.ServiceResolver {
+	return &externalNameResolver{
+		externalNames: externalNames,
+	}
+}
+
+type externalNameResolver struct {
+	externalNames servicelistersv0alpha1.ExternalNameLister
+}
+
+func (r *externalNameResolver) ResolveEndpoint(namespace, name string, port int32) (*url.URL, error) {
+	extName, err := r.externalNames.ExternalNames(namespace).Get(name)
+	if err != nil {
+		return nil, err
+	}
+	return &url.URL{
+		Scheme: "https",
+		Host:   net.JoinHostPort(extName.Spec.Host, fmt.Sprintf("%d", port)),
+	}, nil
+}
diff --git a/pkg/services/apiserver/auth/authenticator/provider.go b/pkg/services/apiserver/auth/authenticator/provider.go
new file mode 100644
index 0000000000000..389c808d52835
--- /dev/null
+++ b/pkg/services/apiserver/auth/authenticator/provider.go
@@ -0,0 +1,11 @@
+package authenticator
+
+import (
+	"k8s.io/apiserver/pkg/authentication/authenticator"
+	"k8s.io/apiserver/pkg/authentication/request/union"
+)
+
+func NewAuthenticator(authRequestHandlers ...authenticator.Request) authenticator.Request {
+	handlers := append([]authenticator.Request{authenticator.RequestFunc(signedInUserAuthenticator)}, authRequestHandlers...)
+	return union.New(handlers...)
+}
diff --git a/pkg/services/apiserver/auth/authenticator/signedinuser.go b/pkg/services/apiserver/auth/authenticator/signedinuser.go
new file mode 100644
index 0000000000000..76dc5289bb61b
--- /dev/null
+++ b/pkg/services/apiserver/auth/authenticator/signedinuser.go
@@ -0,0 +1,45 @@
+package authenticator
+
+import (
+	"net/http"
+	"strconv"
+
+	"k8s.io/apiserver/pkg/authentication/authenticator"
+	k8suser "k8s.io/apiserver/pkg/authentication/user"
+	"k8s.io/klog/v2"
+
+	"github.com/grafana/grafana/pkg/infra/appcontext"
+)
+
+var _ authenticator.RequestFunc = signedInUserAuthenticator
+
+func signedInUserAuthenticator(req *http.Request) (*authenticator.Response, bool, error) {
+	ctx := req.Context()
+	signedInUser, err := appcontext.User(ctx)
+	if err != nil {
+		klog.V(5).Info("failed to get signed in user", "err", err)
+		return nil, false, nil
+	}
+
+	userInfo := &k8suser.DefaultInfo{
+		Name:   signedInUser.Login,
+		UID:    signedInUser.UserUID,
+		Groups: []string{},
+		// In order to faithfully round-trip through an impersonation flow, Extra keys MUST be lowercase.
+		// see: https://pkg.go.dev/k8s.io/apiserver@v0.27.1/pkg/authentication/user#Info
+		Extra: map[string][]string{},
+	}
+
+	for _, v := range signedInUser.Teams {
+		userInfo.Groups = append(userInfo.Groups, strconv.FormatInt(v, 10))
+	}
+
+	//
+	if signedInUser.IDToken != "" {
+		userInfo.Extra["id-token"] = []string{signedInUser.IDToken}
+	}
+
+	return &authenticator.Response{
+		User: userInfo,
+	}, true, nil
+}
diff --git a/pkg/services/apiserver/auth/authenticator/signedinuser_test.go b/pkg/services/apiserver/auth/authenticator/signedinuser_test.go
new file mode 100644
index 0000000000000..a06abe06aaf91
--- /dev/null
+++ b/pkg/services/apiserver/auth/authenticator/signedinuser_test.go
@@ -0,0 +1,88 @@
+package authenticator
+
+import (
+	"context"
+	"net/http"
+	"testing"
+
+	"github.com/google/uuid"
+	"github.com/grafana/grafana/pkg/infra/appcontext"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/stretchr/testify/require"
+	"k8s.io/apiserver/pkg/authentication/authenticator"
+	"k8s.io/apiserver/pkg/authentication/request/union"
+)
+
+func TestSignedInUser(t *testing.T) {
+	t.Run("should call next authenticator if SignedInUser is not set", func(t *testing.T) {
+		req, err := http.NewRequest("GET", "http://localhost:3000/apis", nil)
+		require.NoError(t, err)
+		mockAuthenticator := &mockAuthenticator{}
+		all := union.New(authenticator.RequestFunc(signedInUserAuthenticator), mockAuthenticator)
+		res, ok, err := all.AuthenticateRequest(req)
+		require.NoError(t, err)
+		require.False(t, ok)
+		require.Nil(t, res)
+		require.True(t, mockAuthenticator.called)
+	})
+
+	t.Run("should set user and group", func(t *testing.T) {
+		u := &user.SignedInUser{
+			Login:   "admin",
+			UserID:  1,
+			UserUID: uuid.New().String(),
+			Teams:   []int64{1, 2},
+		}
+		ctx := appcontext.WithUser(context.Background(), u)
+		req, err := http.NewRequest("GET", "http://localhost:3000/apis", nil)
+		require.NoError(t, err)
+		req = req.WithContext(ctx)
+		mockAuthenticator := &mockAuthenticator{}
+		all := union.New(authenticator.RequestFunc(signedInUserAuthenticator), mockAuthenticator)
+		res, ok, err := all.AuthenticateRequest(req)
+		require.NoError(t, err)
+		require.True(t, ok)
+		require.False(t, mockAuthenticator.called)
+
+		require.Equal(t, u.Login, res.User.GetName())
+		require.Equal(t, u.UserUID, res.User.GetUID())
+		require.Equal(t, []string{"1", "2"}, res.User.GetGroups())
+		require.Empty(t, res.User.GetExtra()["id-token"])
+	})
+
+	t.Run("should set ID token when available", func(t *testing.T) {
+		u := &user.SignedInUser{
+			Login:   "admin",
+			UserID:  1,
+			UserUID: uuid.New().String(),
+			Teams:   []int64{1, 2},
+			IDToken: "test-id-token",
+		}
+		ctx := appcontext.WithUser(context.Background(), u)
+		req, err := http.NewRequest("GET", "http://localhost:3000/apis", nil)
+		require.NoError(t, err)
+		req = req.WithContext(ctx)
+		mockAuthenticator := &mockAuthenticator{}
+		all := union.New(authenticator.RequestFunc(signedInUserAuthenticator), mockAuthenticator)
+		res, ok, err := all.AuthenticateRequest(req)
+		require.NoError(t, err)
+		require.True(t, ok)
+
+		require.False(t, mockAuthenticator.called)
+		require.Equal(t, u.Login, res.User.GetName())
+		require.Equal(t, u.UserUID, res.User.GetUID())
+		require.Equal(t, []string{"1", "2"}, res.User.GetGroups())
+		require.Equal(t, "test-id-token", res.User.GetExtra()["id-token"][0])
+	})
+}
+
+var _ authenticator.Request = (*mockAuthenticator)(nil)
+
+type mockAuthenticator struct {
+	called bool
+}
+
+func (a *mockAuthenticator) AuthenticateRequest(req *http.Request) (*authenticator.Response, bool, error) {
+	a.called = true
+	return nil, false, nil
+}
diff --git a/pkg/services/apiserver/auth/authorizer/impersonation.go b/pkg/services/apiserver/auth/authorizer/impersonation.go
new file mode 100644
index 0000000000000..f01cc825013bc
--- /dev/null
+++ b/pkg/services/apiserver/auth/authorizer/impersonation.go
@@ -0,0 +1,19 @@
+package authorizer
+
+import (
+	"context"
+
+	"k8s.io/apiserver/pkg/authorization/authorizer"
+)
+
+var _ authorizer.Authorizer = (*impersonationAuthorizer)(nil)
+
+// ImpersonationAuthorizer denies all impersonation requests.
+type impersonationAuthorizer struct{}
+
+func (auth impersonationAuthorizer) Authorize(ctx context.Context, a authorizer.Attributes) (authorized authorizer.Decision, reason string, err error) {
+	if a.GetVerb() == "impersonate" {
+		return authorizer.DecisionDeny, "user impersonation is not supported", nil
+	}
+	return authorizer.DecisionNoOpinion, "", nil
+}
diff --git a/pkg/services/apiserver/auth/authorizer/impersonation_test.go b/pkg/services/apiserver/auth/authorizer/impersonation_test.go
new file mode 100644
index 0000000000000..6af580d892ee4
--- /dev/null
+++ b/pkg/services/apiserver/auth/authorizer/impersonation_test.go
@@ -0,0 +1,46 @@
+package authorizer
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"k8s.io/apiserver/pkg/authorization/authorizer"
+)
+
+func TestImpersonationAuthorizer_Authorize(t *testing.T) {
+	auth := impersonationAuthorizer{}
+
+	t.Run("impersonate verb", func(t *testing.T) {
+		attrs := &fakeAttributes{
+			verb: "impersonate",
+		}
+
+		authorized, reason, err := auth.Authorize(context.Background(), attrs)
+
+		require.Equal(t, authorizer.DecisionDeny, authorized)
+		require.Equal(t, "user impersonation is not supported", reason)
+		require.NoError(t, err)
+	})
+
+	t.Run("other verb", func(t *testing.T) {
+		attrs := &fakeAttributes{
+			verb: "get",
+		}
+
+		authorized, reason, err := auth.Authorize(context.Background(), attrs)
+
+		require.Equal(t, authorizer.DecisionNoOpinion, authorized)
+		require.Equal(t, "", reason)
+		require.NoError(t, err)
+	})
+}
+
+type fakeAttributes struct {
+	authorizer.Attributes
+	verb string
+}
+
+func (a fakeAttributes) GetVerb() string {
+	return a.verb
+}
diff --git a/pkg/services/grafana-apiserver/auth/authorizer/org/org_id.go b/pkg/services/apiserver/auth/authorizer/org_id.go
similarity index 82%
rename from pkg/services/grafana-apiserver/auth/authorizer/org/org_id.go
rename to pkg/services/apiserver/auth/authorizer/org_id.go
index 9dee8bf81e4dc..e9d4a6786a8ed 100644
--- a/pkg/services/grafana-apiserver/auth/authorizer/org/org_id.go
+++ b/pkg/services/apiserver/auth/authorizer/org_id.go
@@ -1,4 +1,4 @@
-package org
+package authorizer
 
 import (
 	"context"
@@ -8,25 +8,25 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/appcontext"
 	"github.com/grafana/grafana/pkg/infra/log"
-	grafanarequest "github.com/grafana/grafana/pkg/services/grafana-apiserver/endpoints/request"
+	grafanarequest "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
 	"github.com/grafana/grafana/pkg/services/org"
 )
 
-var _ authorizer.Authorizer = &OrgIDAuthorizer{}
+var _ authorizer.Authorizer = &orgIDAuthorizer{}
 
-type OrgIDAuthorizer struct {
+type orgIDAuthorizer struct {
 	log log.Logger
 	org org.Service
 }
 
-func ProvideOrgIDAuthorizer(orgService org.Service) *OrgIDAuthorizer {
-	return &OrgIDAuthorizer{
+func newOrgIDAuthorizer(orgService org.Service) *orgIDAuthorizer {
+	return &orgIDAuthorizer{
 		log: log.New("grafana-apiserver.authorizer.orgid"),
 		org: orgService,
 	}
 }
 
-func (auth OrgIDAuthorizer) Authorize(ctx context.Context, a authorizer.Attributes) (authorized authorizer.Decision, reason string, err error) {
+func (auth orgIDAuthorizer) Authorize(ctx context.Context, a authorizer.Attributes) (authorized authorizer.Decision, reason string, err error) {
 	signedInUser, err := appcontext.User(ctx)
 	if err != nil {
 		return authorizer.DecisionDeny, fmt.Sprintf("error getting signed in user: %v", err), nil
diff --git a/pkg/services/grafana-apiserver/auth/authorizer/org/org_role.go b/pkg/services/apiserver/auth/authorizer/org_role.go
similarity index 83%
rename from pkg/services/grafana-apiserver/auth/authorizer/org/org_role.go
rename to pkg/services/apiserver/auth/authorizer/org_role.go
index 3776da4377dad..4717741a8d50a 100644
--- a/pkg/services/grafana-apiserver/auth/authorizer/org/org_role.go
+++ b/pkg/services/apiserver/auth/authorizer/org_role.go
@@ -1,4 +1,4 @@
-package org
+package authorizer
 
 import (
 	"context"
@@ -11,17 +11,17 @@ import (
 	"github.com/grafana/grafana/pkg/services/org"
 )
 
-var _ authorizer.Authorizer = &OrgIDAuthorizer{}
+var _ authorizer.Authorizer = &orgRoleAuthorizer{}
 
-type OrgRoleAuthorizer struct {
+type orgRoleAuthorizer struct {
 	log log.Logger
 }
 
-func ProvideOrgRoleAuthorizer(orgService org.Service) *OrgRoleAuthorizer {
-	return &OrgRoleAuthorizer{log: log.New("grafana-apiserver.authorizer.orgrole")}
+func newOrgRoleAuthorizer(orgService org.Service) *orgRoleAuthorizer {
+	return &orgRoleAuthorizer{log: log.New("grafana-apiserver.authorizer.orgrole")}
 }
 
-func (auth OrgRoleAuthorizer) Authorize(ctx context.Context, a authorizer.Attributes) (authorized authorizer.Decision, reason string, err error) {
+func (auth orgRoleAuthorizer) Authorize(ctx context.Context, a authorizer.Attributes) (authorized authorizer.Decision, reason string, err error) {
 	signedInUser, err := appcontext.User(ctx)
 	if err != nil {
 		return authorizer.DecisionDeny, fmt.Sprintf("error getting signed in user: %v", err), nil
diff --git a/pkg/services/apiserver/auth/authorizer/provider.go b/pkg/services/apiserver/auth/authorizer/provider.go
new file mode 100644
index 0000000000000..5cd92982e4061
--- /dev/null
+++ b/pkg/services/apiserver/auth/authorizer/provider.go
@@ -0,0 +1,68 @@
+package authorizer
+
+import (
+	"context"
+
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	k8suser "k8s.io/apiserver/pkg/authentication/user"
+	"k8s.io/apiserver/pkg/authorization/authorizer"
+	"k8s.io/apiserver/pkg/authorization/authorizerfactory"
+	"k8s.io/apiserver/pkg/authorization/union"
+
+	orgsvc "github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+var _ authorizer.Authorizer = (*GrafanaAuthorizer)(nil)
+
+type GrafanaAuthorizer struct {
+	apis map[string]authorizer.Authorizer
+	auth authorizer.Authorizer
+}
+
+func NewGrafanaAuthorizer(cfg *setting.Cfg, orgService orgsvc.Service) *GrafanaAuthorizer {
+	authorizers := []authorizer.Authorizer{
+		&impersonationAuthorizer{},
+		authorizerfactory.NewPrivilegedGroups(k8suser.SystemPrivilegedGroup),
+	}
+
+	// In Hosted grafana, the StackID replaces the orgID as a valid namespace
+	if cfg.StackID != "" {
+		authorizers = append(authorizers, newStackIDAuthorizer(cfg))
+	} else {
+		authorizers = append(authorizers, newOrgIDAuthorizer(orgService))
+	}
+
+	// Individual services may have explicit implementations
+	apis := make(map[string]authorizer.Authorizer)
+	authorizers = append(authorizers, &authorizerForAPI{apis})
+
+	// org role is last -- and will return allow for verbs that match expectations
+	// The apiVersion flavors will run first and can return early when FGAC has appropriate rules
+	authorizers = append(authorizers, newOrgRoleAuthorizer(orgService))
+	return &GrafanaAuthorizer{
+		apis: apis,
+		auth: union.New(authorizers...),
+	}
+}
+
+func (a *GrafanaAuthorizer) Register(gv schema.GroupVersion, fn authorizer.Authorizer) {
+	a.apis[gv.String()] = fn
+}
+
+// Authorize implements authorizer.Authorizer.
+func (a *GrafanaAuthorizer) Authorize(ctx context.Context, attr authorizer.Attributes) (authorized authorizer.Decision, reason string, err error) {
+	return a.auth.Authorize(ctx, attr)
+}
+
+type authorizerForAPI struct {
+	apis map[string]authorizer.Authorizer
+}
+
+func (a *authorizerForAPI) Authorize(ctx context.Context, attr authorizer.Attributes) (authorized authorizer.Decision, reason string, err error) {
+	auth, ok := a.apis[attr.GetAPIGroup()+"/"+attr.GetAPIVersion()]
+	if ok {
+		return auth.Authorize(ctx, attr)
+	}
+	return authorizer.DecisionNoOpinion, "", nil
+}
diff --git a/pkg/services/grafana-apiserver/auth/authorizer/stack/stack_id.go b/pkg/services/apiserver/auth/authorizer/stack_id.go
similarity index 78%
rename from pkg/services/grafana-apiserver/auth/authorizer/stack/stack_id.go
rename to pkg/services/apiserver/auth/authorizer/stack_id.go
index 88cb83883d7dc..0098c1dfd2185 100644
--- a/pkg/services/grafana-apiserver/auth/authorizer/stack/stack_id.go
+++ b/pkg/services/apiserver/auth/authorizer/stack_id.go
@@ -1,4 +1,4 @@
-package stack
+package authorizer
 
 import (
 	"context"
@@ -8,25 +8,25 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/appcontext"
 	"github.com/grafana/grafana/pkg/infra/log"
-	grafanarequest "github.com/grafana/grafana/pkg/services/grafana-apiserver/endpoints/request"
+	grafanarequest "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
-var _ authorizer.Authorizer = &StackIDAuthorizer{}
+var _ authorizer.Authorizer = &stackIDAuthorizer{}
 
-type StackIDAuthorizer struct {
+type stackIDAuthorizer struct {
 	log     log.Logger
 	stackID string
 }
 
-func ProvideStackIDAuthorizer(cfg *setting.Cfg) *StackIDAuthorizer {
-	return &StackIDAuthorizer{
+func newStackIDAuthorizer(cfg *setting.Cfg) *stackIDAuthorizer {
+	return &stackIDAuthorizer{
 		log:     log.New("grafana-apiserver.authorizer.stackid"),
 		stackID: cfg.StackID, // this lets a single tenant grafana validate stack id (rather than orgs)
 	}
 }
 
-func (auth StackIDAuthorizer) Authorize(ctx context.Context, a authorizer.Attributes) (authorized authorizer.Decision, reason string, err error) {
+func (auth stackIDAuthorizer) Authorize(ctx context.Context, a authorizer.Attributes) (authorized authorizer.Decision, reason string, err error) {
 	signedInUser, err := appcontext.User(ctx)
 	if err != nil {
 		return authorizer.DecisionDeny, fmt.Sprintf("error getting signed in user: %v", err), nil
diff --git a/pkg/services/apiserver/config.go b/pkg/services/apiserver/config.go
new file mode 100644
index 0000000000000..5436b97be4dd1
--- /dev/null
+++ b/pkg/services/apiserver/config.go
@@ -0,0 +1,57 @@
+package apiserver
+
+import (
+	"fmt"
+	"net"
+	"path/filepath"
+	"strconv"
+
+	"github.com/grafana/grafana/pkg/services/apiserver/options"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+func applyGrafanaConfig(cfg *setting.Cfg, features featuremgmt.FeatureToggles, o *options.Options) {
+	defaultLogLevel := 0
+	ip := net.ParseIP(cfg.HTTPAddr)
+	apiURL := cfg.AppURL
+	port, err := strconv.Atoi(cfg.HTTPPort)
+	if err != nil {
+		port = 3000
+	}
+
+	if cfg.Env == setting.Dev {
+		defaultLogLevel = 10
+		port = 6443
+		ip = net.ParseIP("127.0.0.1")
+		apiURL = fmt.Sprintf("https://%s:%d", ip, port)
+	}
+
+	host := fmt.Sprintf("%s:%d", ip, port)
+
+	apiserverCfg := cfg.SectionWithEnvOverrides("grafana-apiserver")
+
+	o.RecommendedOptions.Etcd.StorageConfig.Transport.ServerList = apiserverCfg.Key("etcd_servers").Strings(",")
+
+	o.RecommendedOptions.SecureServing.BindAddress = ip
+	o.RecommendedOptions.SecureServing.BindPort = port
+	o.RecommendedOptions.Authentication.RemoteKubeConfigFileOptional = true
+	o.RecommendedOptions.Authorization.RemoteKubeConfigFileOptional = true
+
+	o.AggregatorOptions.ProxyClientCertFile = apiserverCfg.Key("proxy_client_cert_file").MustString("")
+	o.AggregatorOptions.ProxyClientKeyFile = apiserverCfg.Key("proxy_client_key_file").MustString("")
+
+	o.AggregatorOptions.APIServiceCABundleFile = apiserverCfg.Key("apiservice_ca_bundle_file").MustString("")
+	o.AggregatorOptions.RemoteServicesFile = apiserverCfg.Key("remote_services_file").MustString("")
+
+	o.RecommendedOptions.Admission = nil
+	o.RecommendedOptions.CoreAPI = nil
+
+	o.StorageOptions.StorageType = options.StorageType(apiserverCfg.Key("storage_type").MustString(string(options.StorageTypeLegacy)))
+	o.StorageOptions.DataPath = apiserverCfg.Key("storage_path").MustString(filepath.Join(cfg.DataPath, "grafana-apiserver"))
+	o.StorageOptions.Address = apiserverCfg.Key("address").MustString(o.StorageOptions.Address)
+	o.ExtraOptions.DevMode = features.IsEnabledGlobally(featuremgmt.FlagGrafanaAPIServerEnsureKubectlAccess)
+	o.ExtraOptions.ExternalAddress = host
+	o.ExtraOptions.APIURL = apiURL
+	o.ExtraOptions.Verbosity = apiserverCfg.Key("log_level").MustInt(defaultLogLevel)
+}
diff --git a/pkg/services/grafana-apiserver/endpoints/request/namespace.go b/pkg/services/apiserver/endpoints/request/namespace.go
similarity index 76%
rename from pkg/services/grafana-apiserver/endpoints/request/namespace.go
rename to pkg/services/apiserver/endpoints/request/namespace.go
index 4848c24386c4b..899e342dc9f2f 100644
--- a/pkg/services/grafana-apiserver/endpoints/request/namespace.go
+++ b/pkg/services/apiserver/endpoints/request/namespace.go
@@ -8,6 +8,7 @@ import (
 
 	"k8s.io/apiserver/pkg/endpoints/request"
 
+	"github.com/grafana/grafana/pkg/infra/appcontext"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
@@ -41,7 +42,7 @@ func GetNamespaceMapper(cfg *setting.Cfg) NamespaceMapper {
 func NamespaceInfoFrom(ctx context.Context, requireOrgID bool) (NamespaceInfo, error) {
 	info, err := ParseNamespace(request.NamespaceValue(ctx))
 	if err == nil && requireOrgID && info.OrgID < 1 {
-		return info, fmt.Errorf("expected valid orgId")
+		return info, fmt.Errorf("expected valid orgId in namespace")
 	}
 	return info, err
 }
@@ -66,12 +67,27 @@ func ParseNamespace(ns string) (NamespaceInfo, error) {
 	}
 
 	if strings.HasPrefix(ns, "stack-") {
-		info.StackID = ns[6:]
-		if len(info.StackID) < 2 {
+		stackIDStr := ns[6:]
+		stackID, err := strconv.Atoi(stackIDStr)
+		if err != nil || stackID < 1 {
 			return info, fmt.Errorf("invalid stack id")
 		}
+		info.StackID = stackIDStr
 		info.OrgID = 1
 		return info, nil
 	}
 	return info, nil
 }
+
+func OrgIDForList(ctx context.Context) (int64, error) {
+	ns := request.NamespaceValue(ctx)
+	if ns == "" {
+		user, err := appcontext.User(ctx)
+		if user != nil {
+			return user.OrgID, err
+		}
+		return -1, err
+	}
+	info, err := ParseNamespace(ns)
+	return info.OrgID, err
+}
diff --git a/pkg/services/grafana-apiserver/endpoints/request/namespace_test.go b/pkg/services/apiserver/endpoints/request/namespace_test.go
similarity index 90%
rename from pkg/services/grafana-apiserver/endpoints/request/namespace_test.go
rename to pkg/services/apiserver/endpoints/request/namespace_test.go
index 4f9dc7e928181..f5665ff2f5b89 100644
--- a/pkg/services/grafana-apiserver/endpoints/request/namespace_test.go
+++ b/pkg/services/apiserver/endpoints/request/namespace_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/grafana/pkg/services/grafana-apiserver/endpoints/request"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
@@ -77,15 +77,15 @@ func TestParseNamespace(t *testing.T) {
 			},
 		},
 		{
-			name:      "valid stack",
+			name:      "invalid stack id (must be an int)",
+			expectErr: true,
 			namespace: "stack-abcdef",
 			expected: request.NamespaceInfo{
-				OrgID:   1,
-				StackID: "abcdef",
+				OrgID: -1,
 			},
 		},
 		{
-			name:      "invalid stack id",
+			name:      "invalid stack id (must be provided)",
 			namespace: "stack-",
 			expectErr: true,
 			expected: request.NamespaceInfo{
@@ -93,11 +93,18 @@ func TestParseNamespace(t *testing.T) {
 			},
 		},
 		{
-			name:      "invalid stack id (too short)",
-			namespace: "stack-1",
+			name:      "invalid stack id (cannot be 0)",
+			namespace: "stack-0",
 			expectErr: true,
 			expected: request.NamespaceInfo{
-				OrgID:   -1,
+				OrgID: -1,
+			},
+		},
+		{
+			name:      "valid stack",
+			namespace: "stack-1",
+			expected: request.NamespaceInfo{
+				OrgID:   1,
 				StackID: "1",
 			},
 		},
diff --git a/pkg/services/apiserver/options/aggregator.go b/pkg/services/apiserver/options/aggregator.go
new file mode 100644
index 0000000000000..56728814696d3
--- /dev/null
+++ b/pkg/services/apiserver/options/aggregator.go
@@ -0,0 +1,110 @@
+package options
+
+import (
+	servicev0alpha1 "github.com/grafana/grafana/pkg/apis/service/v0alpha1"
+	filestorage "github.com/grafana/grafana/pkg/apiserver/storage/file"
+	"github.com/spf13/pflag"
+	v1 "k8s.io/api/apps/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	genericfeatures "k8s.io/apiserver/pkg/features"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+	"k8s.io/apiserver/pkg/server/options"
+	"k8s.io/apiserver/pkg/server/resourceconfig"
+	utilfeature "k8s.io/apiserver/pkg/util/feature"
+	apiregistrationv1beta1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1"
+	aggregatorapiserver "k8s.io/kube-aggregator/pkg/apiserver"
+	aggregatorscheme "k8s.io/kube-aggregator/pkg/apiserver/scheme"
+)
+
+// AggregatorServerOptions contains the state for the aggregator apiserver
+type AggregatorServerOptions struct {
+	AlternateDNS           []string
+	ProxyClientCertFile    string
+	ProxyClientKeyFile     string
+	RemoteServicesFile     string
+	APIServiceCABundleFile string
+}
+
+func NewAggregatorServerOptions() *AggregatorServerOptions {
+	return &AggregatorServerOptions{}
+}
+
+func (o *AggregatorServerOptions) AddFlags(fs *pflag.FlagSet) {
+	if o == nil {
+		return
+	}
+
+	fs.StringVar(&o.ProxyClientCertFile, "proxy-client-cert-file", o.ProxyClientCertFile,
+		"path to proxy client cert file")
+
+	fs.StringVar(&o.ProxyClientKeyFile, "proxy-client-key-file", o.ProxyClientKeyFile,
+		"path to proxy client key file")
+}
+
+func (o *AggregatorServerOptions) Validate() []error {
+	if o == nil {
+		return nil
+	}
+
+	// TODO: do we need to validate anything here?
+	return nil
+}
+
+func (o *AggregatorServerOptions) ApplyTo(aggregatorConfig *aggregatorapiserver.Config, etcdOpts *options.EtcdOptions, dataPath string) error {
+	genericConfig := aggregatorConfig.GenericConfig
+
+	genericConfig.PostStartHooks = map[string]genericapiserver.PostStartHookConfigEntry{}
+	genericConfig.RESTOptionsGetter = nil
+
+	if utilfeature.DefaultFeatureGate.Enabled(genericfeatures.StorageVersionAPI) &&
+		utilfeature.DefaultFeatureGate.Enabled(genericfeatures.APIServerIdentity) {
+		// Add StorageVersionPrecondition handler to aggregator-apiserver.
+		// The handler will block write requests to built-in resources until the
+		// target resources' storage versions are up-to-date.
+		genericConfig.BuildHandlerChainFunc = genericapiserver.BuildHandlerChainWithStorageVersionPrecondition
+	}
+
+	// copy the etcd options so we don't mutate originals.
+	// we assume that the etcd options have been completed already.  avoid messing with anything outside
+	// of changes to StorageConfig as that may lead to unexpected behavior when the options are applied.
+	etcdOptions := *etcdOpts
+	etcdOptions.StorageConfig.Codec = aggregatorscheme.Codecs.LegacyCodec(v1.SchemeGroupVersion,
+		apiregistrationv1beta1.SchemeGroupVersion,
+		servicev0alpha1.SchemeGroupVersion)
+	etcdOptions.StorageConfig.EncodeVersioner = runtime.NewMultiGroupVersioner(v1.SchemeGroupVersion,
+		schema.GroupKind{Group: apiregistrationv1beta1.GroupName},
+		schema.GroupKind{Group: servicev0alpha1.GROUP})
+	etcdOptions.SkipHealthEndpoints = true // avoid double wiring of health checks
+	if err := etcdOptions.ApplyTo(&genericConfig.Config); err != nil {
+		return err
+	}
+	// override the RESTOptionsGetter to use the file storage options getter
+	restOptionsGetter, err := filestorage.NewRESTOptionsGetter(dataPath, etcdOptions.StorageConfig,
+		"apiregistration.k8s.io/apiservices",
+		"service.grafana.app/externalnames",
+	)
+	if err != nil {
+		return err
+	}
+	aggregatorConfig.GenericConfig.RESTOptionsGetter = restOptionsGetter
+
+	// prevent generic API server from installing the OpenAPI handler. Aggregator server has its own customized OpenAPI handler.
+	genericConfig.SkipOpenAPIInstallation = true
+	mergedResourceConfig, err := resourceconfig.MergeAPIResourceConfigs(aggregatorapiserver.DefaultAPIResourceConfigSource(), nil, aggregatorscheme.Scheme)
+	if err != nil {
+		return err
+	}
+	genericConfig.MergedResourceConfig = mergedResourceConfig
+
+	aggregatorConfig.ExtraConfig.ProxyClientCertFile = o.ProxyClientCertFile
+	aggregatorConfig.ExtraConfig.ProxyClientKeyFile = o.ProxyClientKeyFile
+
+	genericConfig.PostStartHooks = map[string]genericapiserver.PostStartHookConfigEntry{}
+
+	// These hooks use v1 informers, which are not available in the grafana aggregator.
+	genericConfig.DisabledPostStartHooks = genericConfig.DisabledPostStartHooks.Insert("apiservice-status-available-controller")
+	genericConfig.DisabledPostStartHooks = genericConfig.DisabledPostStartHooks.Insert("start-kube-aggregator-informers")
+
+	return nil
+}
diff --git a/pkg/services/apiserver/options/extra.go b/pkg/services/apiserver/options/extra.go
new file mode 100644
index 0000000000000..fdb394d4d2879
--- /dev/null
+++ b/pkg/services/apiserver/options/extra.go
@@ -0,0 +1,46 @@
+package options
+
+import (
+	"strconv"
+
+	"github.com/go-logr/logr"
+	"github.com/spf13/pflag"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+	"k8s.io/component-base/logs"
+	"k8s.io/klog/v2"
+)
+
+type ExtraOptions struct {
+	DevMode         bool
+	ExternalAddress string
+	APIURL          string
+	Verbosity       int
+}
+
+func NewExtraOptions() *ExtraOptions {
+	return &ExtraOptions{
+		DevMode:   false,
+		Verbosity: 0,
+	}
+}
+
+func (o *ExtraOptions) AddFlags(fs *pflag.FlagSet) {
+	fs.BoolVar(&o.DevMode, "grafana-apiserver-dev-mode", o.DevMode, "Enable dev mode")
+	fs.StringVar(&o.ExternalAddress, "grafana-apiserver-host", o.ExternalAddress, "Host")
+	fs.StringVar(&o.APIURL, "grafana-apiserver-api-url", o.APIURL, "API URL")
+	fs.IntVar(&o.Verbosity, "verbosity", o.Verbosity, "Verbosity")
+}
+
+func (o *ExtraOptions) Validate() []error {
+	return nil
+}
+
+func (o *ExtraOptions) ApplyTo(c *genericapiserver.RecommendedConfig) error {
+	logger := logr.New(newLogAdapter(o.Verbosity))
+	klog.SetLoggerWithOptions(logger, klog.ContextualLogger(true))
+	if _, err := logs.GlogSetter(strconv.Itoa(o.Verbosity)); err != nil {
+		logger.Error(err, "failed to set log level")
+	}
+	c.ExternalAddress = o.ExternalAddress
+	return nil
+}
diff --git a/pkg/services/grafana-apiserver/log.go b/pkg/services/apiserver/options/log.go
similarity index 97%
rename from pkg/services/grafana-apiserver/log.go
rename to pkg/services/apiserver/options/log.go
index edf10c0d3d3b6..9e32f66e3b300 100644
--- a/pkg/services/grafana-apiserver/log.go
+++ b/pkg/services/apiserver/options/log.go
@@ -1,4 +1,4 @@
-package grafanaapiserver
+package options
 
 import (
 	"strings"
diff --git a/pkg/services/apiserver/options/options.go b/pkg/services/apiserver/options/options.go
new file mode 100644
index 0000000000000..3aef73d57823c
--- /dev/null
+++ b/pkg/services/apiserver/options/options.go
@@ -0,0 +1,151 @@
+package options
+
+import (
+	"net"
+
+	"github.com/spf13/pflag"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/endpoints/discovery/aggregated"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+	genericoptions "k8s.io/apiserver/pkg/server/options"
+)
+
+type OptionsProvider interface {
+	AddFlags(fs *pflag.FlagSet)
+	ValidateOptions() []error
+}
+
+const defaultEtcdPathPrefix = "/registry/grafana.app"
+
+type Options struct {
+	RecommendedOptions *genericoptions.RecommendedOptions
+	AggregatorOptions  *AggregatorServerOptions
+	StorageOptions     *StorageOptions
+	ExtraOptions       *ExtraOptions
+	APIOptions         []OptionsProvider
+}
+
+func NewOptions(codec runtime.Codec) *Options {
+	return &Options{
+		RecommendedOptions: NewRecommendedOptions(codec),
+		AggregatorOptions:  NewAggregatorServerOptions(),
+		StorageOptions:     NewStorageOptions(),
+		ExtraOptions:       NewExtraOptions(),
+	}
+}
+
+func (o *Options) AddFlags(fs *pflag.FlagSet) {
+	o.RecommendedOptions.AddFlags(fs)
+	o.AggregatorOptions.AddFlags(fs)
+	o.StorageOptions.AddFlags(fs)
+	o.ExtraOptions.AddFlags(fs)
+
+	for _, api := range o.APIOptions {
+		api.AddFlags(fs)
+	}
+}
+
+func (o *Options) Validate() []error {
+	if errs := o.ExtraOptions.Validate(); len(errs) != 0 {
+		return errs
+	}
+
+	if errs := o.StorageOptions.Validate(); len(errs) != 0 {
+		return errs
+	}
+
+	if errs := o.AggregatorOptions.Validate(); len(errs) != 0 {
+		return errs
+	}
+
+	if errs := o.RecommendedOptions.SecureServing.Validate(); len(errs) != 0 {
+		return errs
+	}
+
+	if o.ExtraOptions.DevMode {
+		// NOTE: Only consider authn for dev mode - resolves the failure due to missing extension apiserver auth-config
+		// in parent k8s
+		if errs := o.RecommendedOptions.Authentication.Validate(); len(errs) != 0 {
+			return errs
+		}
+	}
+
+	if o.StorageOptions.StorageType == StorageTypeEtcd {
+		if errs := o.RecommendedOptions.Etcd.Validate(); len(errs) != 0 {
+			return errs
+		}
+	}
+
+	for _, api := range o.APIOptions {
+		if errs := api.ValidateOptions(); len(errs) != 0 {
+			return errs
+		}
+	}
+	return nil
+}
+
+func (o *Options) ApplyTo(serverConfig *genericapiserver.RecommendedConfig) error {
+	serverConfig.AggregatedDiscoveryGroupManager = aggregated.NewResourceManager("apis")
+
+	// avoid picking up an in-cluster service account token
+	o.RecommendedOptions.Authentication.SkipInClusterLookup = true
+
+	if err := o.ExtraOptions.ApplyTo(serverConfig); err != nil {
+		return err
+	}
+
+	if !o.ExtraOptions.DevMode {
+		o.RecommendedOptions.SecureServing.Listener = newFakeListener()
+	}
+
+	if err := o.RecommendedOptions.SecureServing.ApplyTo(&serverConfig.SecureServing, &serverConfig.LoopbackClientConfig); err != nil {
+		return err
+	}
+
+	if err := o.RecommendedOptions.Authentication.ApplyTo(&serverConfig.Authentication, serverConfig.SecureServing, serverConfig.OpenAPIConfig); err != nil {
+		return err
+	}
+
+	if !o.ExtraOptions.DevMode {
+		if err := serverConfig.SecureServing.Listener.Close(); err != nil {
+			return err
+		}
+		serverConfig.SecureServing = nil
+	}
+	return nil
+}
+
+func NewRecommendedOptions(codec runtime.Codec) *genericoptions.RecommendedOptions {
+	return genericoptions.NewRecommendedOptions(
+		defaultEtcdPathPrefix,
+		codec,
+	)
+}
+
+type fakeListener struct {
+	server net.Conn
+	client net.Conn
+}
+
+func newFakeListener() *fakeListener {
+	server, client := net.Pipe()
+	return &fakeListener{
+		server: server,
+		client: client,
+	}
+}
+
+func (f *fakeListener) Accept() (net.Conn, error) {
+	return f.server, nil
+}
+
+func (f *fakeListener) Close() error {
+	if err := f.client.Close(); err != nil {
+		return err
+	}
+	return f.server.Close()
+}
+
+func (f *fakeListener) Addr() net.Addr {
+	return &net.TCPAddr{IP: net.IPv4(127, 0, 0, 1), Port: 3000, Zone: ""}
+}
diff --git a/pkg/services/apiserver/options/storage.go b/pkg/services/apiserver/options/storage.go
new file mode 100644
index 0000000000000..dc99d98e9b40b
--- /dev/null
+++ b/pkg/services/apiserver/options/storage.go
@@ -0,0 +1,59 @@
+package options
+
+import (
+	"fmt"
+	"net"
+
+	"github.com/spf13/pflag"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+	"k8s.io/apiserver/pkg/server/options"
+)
+
+type StorageType string
+
+const (
+	StorageTypeFile        StorageType = "file"
+	StorageTypeEtcd        StorageType = "etcd"
+	StorageTypeLegacy      StorageType = "legacy"
+	StorageTypeUnified     StorageType = "unified"
+	StorageTypeUnifiedGrpc StorageType = "unified-grpc"
+)
+
+type StorageOptions struct {
+	StorageType StorageType
+	DataPath    string
+	Address     string
+}
+
+func NewStorageOptions() *StorageOptions {
+	return &StorageOptions{
+		StorageType: StorageTypeLegacy,
+		Address:     "localhost:10000",
+	}
+}
+
+func (o *StorageOptions) AddFlags(fs *pflag.FlagSet) {
+	fs.StringVar((*string)(&o.StorageType), "grafana-apiserver-storage-type", string(o.StorageType), "Storage type")
+	fs.StringVar(&o.DataPath, "grafana-apiserver-storage-path", o.DataPath, "Storage path for file storage")
+	fs.StringVar(&o.Address, "grafana-apiserver-storage-address", o.Address, "Remote grpc address endpoint")
+}
+
+func (o *StorageOptions) Validate() []error {
+	errs := []error{}
+	switch o.StorageType {
+	case StorageTypeFile, StorageTypeEtcd, StorageTypeLegacy, StorageTypeUnified, StorageTypeUnifiedGrpc:
+		// no-op
+	default:
+		errs = append(errs, fmt.Errorf("--grafana-apiserver-storage-type must be one of %s, %s, %s, %s, %s", StorageTypeFile, StorageTypeEtcd, StorageTypeLegacy, StorageTypeUnified, StorageTypeUnifiedGrpc))
+	}
+
+	if _, _, err := net.SplitHostPort(o.Address); err != nil {
+		errs = append(errs, fmt.Errorf("--grafana-apiserver-storage-address must be a valid network address: %v", err))
+	}
+	return errs
+}
+
+func (o *StorageOptions) ApplyTo(serverConfig *genericapiserver.RecommendedConfig, etcdOptions *options.EtcdOptions) error {
+	// TODO: move storage setup here
+	return nil
+}
diff --git a/pkg/services/apiserver/service.go b/pkg/services/apiserver/service.go
new file mode 100644
index 0000000000000..3315c62fabb12
--- /dev/null
+++ b/pkg/services/apiserver/service.go
@@ -0,0 +1,451 @@
+package apiserver
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"path"
+
+	"github.com/grafana/dskit/services"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
+	"k8s.io/apiserver/pkg/endpoints/responsewriter"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+	clientrest "k8s.io/client-go/rest"
+	"k8s.io/client-go/tools/clientcmd"
+
+	"github.com/grafana/grafana/pkg/api/routing"
+	"github.com/grafana/grafana/pkg/apiserver/builder"
+	grafanaresponsewriter "github.com/grafana/grafana/pkg/apiserver/endpoints/responsewriter"
+	filestorage "github.com/grafana/grafana/pkg/apiserver/storage/file"
+	"github.com/grafana/grafana/pkg/infra/appcontext"
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/middleware"
+	"github.com/grafana/grafana/pkg/modules"
+	"github.com/grafana/grafana/pkg/registry"
+	"github.com/grafana/grafana/pkg/services/apiserver/aggregator"
+	"github.com/grafana/grafana/pkg/services/apiserver/auth/authenticator"
+	"github.com/grafana/grafana/pkg/services/apiserver/auth/authorizer"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+	grafanaapiserveroptions "github.com/grafana/grafana/pkg/services/apiserver/options"
+	entitystorage "github.com/grafana/grafana/pkg/services/apiserver/storage/entity"
+	"github.com/grafana/grafana/pkg/services/apiserver/utils"
+	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/services/store/entity"
+	"github.com/grafana/grafana/pkg/services/store/entity/db/dbimpl"
+	"github.com/grafana/grafana/pkg/services/store/entity/sqlstash"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+var (
+	_ Service                    = (*service)(nil)
+	_ RestConfigProvider         = (*service)(nil)
+	_ registry.BackgroundService = (*service)(nil)
+	_ registry.CanBeDisabled     = (*service)(nil)
+
+	Scheme = runtime.NewScheme()
+	Codecs = serializer.NewCodecFactory(Scheme)
+
+	unversionedVersion = schema.GroupVersion{Group: "", Version: "v1"}
+	unversionedTypes   = []runtime.Object{
+		&metav1.Status{},
+		&metav1.WatchEvent{},
+		&metav1.APIVersions{},
+		&metav1.APIGroupList{},
+		&metav1.APIGroup{},
+		&metav1.APIResourceList{},
+	}
+)
+
+func init() {
+	// we need to add the options to empty v1
+	metav1.AddToGroupVersion(Scheme, schema.GroupVersion{Group: "", Version: "v1"})
+	Scheme.AddUnversionedTypes(unversionedVersion, unversionedTypes...)
+}
+
+type Service interface {
+	services.NamedService
+	registry.BackgroundService
+	registry.CanBeDisabled
+}
+
+type RestConfigProvider interface {
+	GetRestConfig() *clientrest.Config
+}
+
+type DirectRestConfigProvider interface {
+	// GetDirectRestConfig returns a k8s client configuration that will use the same
+	// logged logged in user as the current request context.  This is useful when
+	// creating clients that map legacy API handlers to k8s backed services
+	GetDirectRestConfig(c *contextmodel.ReqContext) *clientrest.Config
+
+	// This can be used to rewrite incoming requests to path now supported under /apis
+	DirectlyServeHTTP(w http.ResponseWriter, r *http.Request)
+}
+
+type service struct {
+	*services.BasicService
+
+	options    *grafanaapiserveroptions.Options
+	restConfig *clientrest.Config
+
+	cfg      *setting.Cfg
+	features featuremgmt.FeatureToggles
+
+	stopCh    chan struct{}
+	stoppedCh chan error
+
+	db       db.DB
+	rr       routing.RouteRegister
+	handler  http.Handler
+	builders []builder.APIGroupBuilder
+
+	tracing *tracing.TracingService
+
+	authorizer *authorizer.GrafanaAuthorizer
+}
+
+func ProvideService(
+	cfg *setting.Cfg,
+	features featuremgmt.FeatureToggles,
+	rr routing.RouteRegister,
+	orgService org.Service,
+	tracing *tracing.TracingService,
+	db db.DB,
+) (*service, error) {
+	s := &service{
+		cfg:        cfg,
+		features:   features,
+		rr:         rr,
+		stopCh:     make(chan struct{}),
+		builders:   []builder.APIGroupBuilder{},
+		authorizer: authorizer.NewGrafanaAuthorizer(cfg, orgService),
+		tracing:    tracing,
+		db:         db, // For Unified storage
+	}
+
+	// This will be used when running as a dskit service
+	s.BasicService = services.NewBasicService(s.start, s.running, nil).WithName(modules.GrafanaAPIServer)
+
+	// TODO: this is very hacky
+	// We need to register the routes in ProvideService to make sure
+	// the routes are registered before the Grafana HTTP server starts.
+	proxyHandler := func(k8sRoute routing.RouteRegister) {
+		handler := func(c *contextmodel.ReqContext) {
+			if s.handler == nil {
+				c.Resp.WriteHeader(404)
+				_, _ = c.Resp.Write([]byte("Not found"))
+				return
+			}
+
+			req := c.Req
+			if req.URL.Path == "" {
+				req.URL.Path = "/"
+			}
+
+			resp := responsewriter.WrapForHTTP1Or2(c.Resp)
+			s.handler.ServeHTTP(resp, req)
+		}
+		k8sRoute.Any("/", middleware.ReqSignedIn, handler)
+		k8sRoute.Any("/*", middleware.ReqSignedIn, handler)
+	}
+
+	s.rr.Group("/apis", proxyHandler)
+	s.rr.Group("/livez", proxyHandler)
+	s.rr.Group("/readyz", proxyHandler)
+	s.rr.Group("/healthz", proxyHandler)
+	s.rr.Group("/openapi", proxyHandler)
+	s.rr.Group("/version", proxyHandler)
+
+	return s, nil
+}
+
+func (s *service) GetRestConfig() *clientrest.Config {
+	return s.restConfig
+}
+
+func (s *service) IsDisabled() bool {
+	return false
+}
+
+// Run is an adapter for the BackgroundService interface.
+func (s *service) Run(ctx context.Context) error {
+	if err := s.start(ctx); err != nil {
+		return err
+	}
+	return s.running(ctx)
+}
+
+func (s *service) RegisterAPI(b builder.APIGroupBuilder) {
+	s.builders = append(s.builders, b)
+}
+
+func (s *service) start(ctx context.Context) error {
+	// Get the list of groups the server will support
+	builders := s.builders
+
+	groupVersions := make([]schema.GroupVersion, 0, len(builders))
+	// Install schemas
+	initialSize := len(aggregator.APIVersionPriorities)
+	for i, b := range builders {
+		groupVersions = append(groupVersions, b.GetGroupVersion())
+		if err := b.InstallSchema(Scheme); err != nil {
+			return err
+		}
+
+		if s.features.IsEnabledGlobally(featuremgmt.FlagKubernetesAggregator) {
+			// set the priority for the group+version
+			aggregator.APIVersionPriorities[b.GetGroupVersion()] = aggregator.Priority{Group: 15000, Version: int32(i + initialSize)}
+		}
+
+		auth := b.GetAuthorizer()
+		if auth != nil {
+			s.authorizer.Register(b.GetGroupVersion(), auth)
+		}
+	}
+
+	o := grafanaapiserveroptions.NewOptions(Codecs.LegacyCodec(groupVersions...))
+	applyGrafanaConfig(s.cfg, s.features, o)
+
+	if errs := o.Validate(); len(errs) != 0 {
+		// TODO: handle multiple errors
+		return errs[0]
+	}
+
+	serverConfig := genericapiserver.NewRecommendedConfig(Codecs)
+	if err := o.ApplyTo(serverConfig); err != nil {
+		return err
+	}
+	serverConfig.Authorization.Authorizer = s.authorizer
+	serverConfig.Authentication.Authenticator = authenticator.NewAuthenticator(serverConfig.Authentication.Authenticator)
+	serverConfig.TracerProvider = s.tracing.GetTracerProvider()
+
+	// setup loopback transport for the aggregator server
+	transport := &roundTripperFunc{ready: make(chan struct{})}
+	serverConfig.LoopbackClientConfig.Transport = transport
+	serverConfig.LoopbackClientConfig.TLSClientConfig = clientrest.TLSClientConfig{}
+
+	switch o.StorageOptions.StorageType {
+	case grafanaapiserveroptions.StorageTypeEtcd:
+		if err := o.RecommendedOptions.Etcd.Validate(); len(err) > 0 {
+			return err[0]
+		}
+		if err := o.RecommendedOptions.Etcd.ApplyTo(&serverConfig.Config); err != nil {
+			return err
+		}
+
+	case grafanaapiserveroptions.StorageTypeUnified:
+		if !s.features.IsEnabledGlobally(featuremgmt.FlagUnifiedStorage) {
+			return fmt.Errorf("unified storage requires the unifiedStorage feature flag (and app_mode = development)")
+		}
+
+		eDB, err := dbimpl.ProvideEntityDB(s.db, s.cfg, s.features)
+		if err != nil {
+			return err
+		}
+
+		storeServer, err := sqlstash.ProvideSQLEntityServer(eDB)
+		if err != nil {
+			return err
+		}
+
+		store := entity.NewEntityStoreClientLocal(storeServer)
+
+		serverConfig.Config.RESTOptionsGetter = entitystorage.NewRESTOptionsGetter(s.cfg, store, o.RecommendedOptions.Etcd.StorageConfig.Codec)
+
+	case grafanaapiserveroptions.StorageTypeUnifiedGrpc:
+		// Create a connection to the gRPC server
+		conn, err := grpc.Dial(o.StorageOptions.Address, grpc.WithTransportCredentials(insecure.NewCredentials()))
+		if err != nil {
+			return err
+		}
+
+		// TODO: determine when to close the connection, we cannot defer it here
+		// defer conn.Close()
+
+		// Create a client instance
+		store := entity.NewEntityStoreClientGRPC(conn)
+
+		serverConfig.Config.RESTOptionsGetter = entitystorage.NewRESTOptionsGetter(s.cfg, store, o.RecommendedOptions.Etcd.StorageConfig.Codec)
+
+	case grafanaapiserveroptions.StorageTypeLegacy:
+		fallthrough
+	case grafanaapiserveroptions.StorageTypeFile:
+		restOptionsGetter, err := filestorage.NewRESTOptionsGetter(o.StorageOptions.DataPath, o.RecommendedOptions.Etcd.StorageConfig)
+		if err != nil {
+			return err
+		}
+		serverConfig.RESTOptionsGetter = restOptionsGetter
+	}
+
+	// Add OpenAPI specs for each group+version
+	err := builder.SetupConfig(
+		Scheme,
+		serverConfig,
+		builders,
+		s.cfg.BuildStamp,
+		s.cfg.BuildVersion,
+		s.cfg.BuildCommit,
+		s.cfg.BuildBranch,
+	)
+	if err != nil {
+		return err
+	}
+
+	// Create the server
+	server, err := serverConfig.Complete().New("grafana-apiserver", genericapiserver.NewEmptyDelegate())
+	if err != nil {
+		return err
+	}
+
+	// dual writing is only enabled when the storage type is not legacy.
+	// this is needed to support setting a default RESTOptionsGetter for new APIs that don't
+	// support the legacy storage type.
+	dualWriteEnabled := o.StorageOptions.StorageType != grafanaapiserveroptions.StorageTypeLegacy
+
+	// Install the API group+version
+	err = builder.InstallAPIs(Scheme, Codecs, server, serverConfig.RESTOptionsGetter, builders, dualWriteEnabled)
+	if err != nil {
+		return err
+	}
+
+	// stash the options for later use
+	s.options = o
+
+	var runningServer *genericapiserver.GenericAPIServer
+	if s.features.IsEnabledGlobally(featuremgmt.FlagKubernetesAggregator) {
+		runningServer, err = s.startAggregator(transport, serverConfig, server)
+		if err != nil {
+			return err
+		}
+	} else {
+		runningServer, err = s.startCoreServer(transport, serverConfig, server)
+		if err != nil {
+			return err
+		}
+	}
+
+	// only write kubeconfig in dev mode
+	if o.ExtraOptions.DevMode {
+		if err := ensureKubeConfig(runningServer.LoopbackClientConfig, o.StorageOptions.DataPath); err != nil {
+			return err
+		}
+	}
+
+	// used by the proxy wrapper registered in ProvideService
+	s.handler = runningServer.Handler
+	// used by local clients to make requests to the server
+	s.restConfig = runningServer.LoopbackClientConfig
+
+	return nil
+}
+
+func (s *service) startCoreServer(
+	transport *roundTripperFunc,
+	serverConfig *genericapiserver.RecommendedConfig,
+	server *genericapiserver.GenericAPIServer,
+) (*genericapiserver.GenericAPIServer, error) {
+	// setup the loopback transport and signal that it's ready.
+	// ignore the lint error because the response is passed directly to the client,
+	// so the client will be responsible for closing the response body.
+	// nolint:bodyclose
+	transport.fn = grafanaresponsewriter.WrapHandler(server.Handler)
+	close(transport.ready)
+
+	prepared := server.PrepareRun()
+	go func() {
+		s.stoppedCh <- prepared.Run(s.stopCh)
+	}()
+
+	return server, nil
+}
+
+func (s *service) startAggregator(
+	transport *roundTripperFunc,
+	serverConfig *genericapiserver.RecommendedConfig,
+	server *genericapiserver.GenericAPIServer,
+) (*genericapiserver.GenericAPIServer, error) {
+	namespaceMapper := request.GetNamespaceMapper(s.cfg)
+
+	aggregatorConfig, err := aggregator.CreateAggregatorConfig(s.options, *serverConfig, namespaceMapper(1))
+	if err != nil {
+		return nil, err
+	}
+
+	aggregatorServer, err := aggregator.CreateAggregatorServer(aggregatorConfig, server)
+	if err != nil {
+		return nil, err
+	}
+
+	// setup the loopback transport for the aggregator server and signal that it's ready
+	// ignore the lint error because the response is passed directly to the client,
+	// so the client will be responsible for closing the response body.
+	// nolint:bodyclose
+	transport.fn = grafanaresponsewriter.WrapHandler(aggregatorServer.GenericAPIServer.Handler)
+	close(transport.ready)
+
+	prepared, err := aggregatorServer.PrepareRun()
+	if err != nil {
+		return nil, err
+	}
+
+	go func() {
+		s.stoppedCh <- prepared.Run(s.stopCh)
+	}()
+
+	return aggregatorServer.GenericAPIServer, nil
+}
+
+func (s *service) GetDirectRestConfig(c *contextmodel.ReqContext) *clientrest.Config {
+	return &clientrest.Config{
+		Transport: &roundTripperFunc{
+			fn: func(req *http.Request) (*http.Response, error) {
+				ctx := appcontext.WithUser(req.Context(), c.SignedInUser)
+				wrapped := grafanaresponsewriter.WrapHandler(s.handler)
+				return wrapped(req.WithContext(ctx))
+			},
+		},
+	}
+}
+
+func (s *service) DirectlyServeHTTP(w http.ResponseWriter, r *http.Request) {
+	s.handler.ServeHTTP(w, r)
+}
+
+func (s *service) running(ctx context.Context) error {
+	select {
+	case err := <-s.stoppedCh:
+		if err != nil {
+			return err
+		}
+	case <-ctx.Done():
+		close(s.stopCh)
+	}
+	return nil
+}
+
+func ensureKubeConfig(restConfig *clientrest.Config, dir string) error {
+	return clientcmd.WriteToFile(
+		utils.FormatKubeConfig(restConfig),
+		path.Join(dir, "grafana.kubeconfig"),
+	)
+}
+
+type roundTripperFunc struct {
+	ready chan struct{}
+	fn    func(req *http.Request) (*http.Response, error)
+}
+
+func (f *roundTripperFunc) RoundTrip(req *http.Request) (*http.Response, error) {
+	if f.fn == nil {
+		<-f.ready
+	}
+	return f.fn(req)
+}
diff --git a/pkg/services/apiserver/standalone/factory.go b/pkg/services/apiserver/standalone/factory.go
new file mode 100644
index 0000000000000..19c18cab5e01f
--- /dev/null
+++ b/pkg/services/apiserver/standalone/factory.go
@@ -0,0 +1,164 @@
+package standalone
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/prometheus/client_golang/prometheus"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	"github.com/grafana/grafana/pkg/apis/datasource/v0alpha1"
+	"github.com/grafana/grafana/pkg/apiserver/builder"
+	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/registry/apis/datasource"
+	"github.com/grafana/grafana/pkg/registry/apis/example"
+	"github.com/grafana/grafana/pkg/registry/apis/featuretoggle"
+	"github.com/grafana/grafana/pkg/registry/apis/query"
+	"github.com/grafana/grafana/pkg/registry/apis/query/client"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+	"github.com/grafana/grafana/pkg/services/apiserver/options"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/setting"
+	testdatasource "github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource"
+)
+
+type APIServerFactory interface {
+	// Called before the groups are loaded so any custom command can be registered
+	GetOptions() options.OptionsProvider
+
+	// Given the flags, what can we produce
+	GetEnabled(runtime []RuntimeConfig) ([]schema.GroupVersion, error)
+
+	// Make an API server for a given group+version
+	MakeAPIServer(tracer tracing.Tracer, gv schema.GroupVersion) (builder.APIGroupBuilder, error)
+}
+
+// Zero dependency provider for testing
+func GetDummyAPIFactory() APIServerFactory {
+	return &DummyAPIFactory{}
+}
+
+type DummyAPIFactory struct{}
+
+func (p *DummyAPIFactory) GetOptions() options.OptionsProvider {
+	return nil
+}
+
+func (p *DummyAPIFactory) GetEnabled(runtime []RuntimeConfig) ([]schema.GroupVersion, error) {
+	gv := []schema.GroupVersion{}
+	for _, cfg := range runtime {
+		if !cfg.Enabled {
+			return nil, fmt.Errorf("only enabled supported now")
+		}
+		if cfg.Group == "all" {
+			return nil, fmt.Errorf("all not yet supported")
+		}
+		gv = append(gv, schema.GroupVersion{Group: cfg.Group, Version: cfg.Version})
+	}
+	return gv, nil
+}
+
+func (p *DummyAPIFactory) MakeAPIServer(tracer tracing.Tracer, gv schema.GroupVersion) (builder.APIGroupBuilder, error) {
+	if gv.Version != "v0alpha1" {
+		return nil, fmt.Errorf("only alpha supported now")
+	}
+
+	switch gv.Group {
+	case "example.grafana.app":
+		return example.NewTestingAPIBuilder(), nil
+
+	// Only works with testdata
+	case "query.grafana.app":
+		return query.NewQueryAPIBuilder(
+			featuremgmt.WithFeatures(),
+			&query.CommonDataSourceClientSupplier{
+				Client: client.NewTestDataClient(),
+			},
+			client.NewTestDataRegistry(),
+			nil,                      // legacy lookup
+			prometheus.NewRegistry(), // ???
+			tracer,
+		)
+
+	case "featuretoggle.grafana.app":
+		return featuretoggle.NewFeatureFlagAPIBuilder(
+			featuremgmt.WithFeatureManager(setting.FeatureMgmtSettings{}, nil), // none... for now
+			&actest.FakeAccessControl{ExpectedEvaluate: false},
+			&setting.Cfg{},
+		), nil
+
+	case "testdata.datasource.grafana.app":
+		return datasource.NewDataSourceAPIBuilder(
+			plugins.JSONData{
+				ID: "grafana-testdata-datasource",
+			},
+			testdatasource.ProvideService(), // the client
+			&pluginDatasourceImpl{
+				startup: v1.Now(),
+			},
+			&pluginDatasourceImpl{}, // stub
+			&actest.FakeAccessControl{ExpectedEvaluate: true},
+		)
+	}
+
+	return nil, fmt.Errorf("unsupported group")
+}
+
+// Simple stub for standalone datasource testing
+type pluginDatasourceImpl struct {
+	startup v1.Time
+}
+
+var (
+	_ datasource.PluginDatasourceProvider = (*pluginDatasourceImpl)(nil)
+)
+
+// Get implements PluginDatasourceProvider.
+func (p *pluginDatasourceImpl) Get(ctx context.Context, uid string) (*v0alpha1.DataSourceConnection, error) {
+	all, err := p.List(ctx)
+	if err != nil {
+		return nil, err
+	}
+	for idx, v := range all.Items {
+		if v.Name == uid {
+			return &all.Items[idx], nil
+		}
+	}
+	return nil, fmt.Errorf("not found")
+}
+
+// List implements PluginConfigProvider.
+func (p *pluginDatasourceImpl) List(ctx context.Context) (*v0alpha1.DataSourceConnectionList, error) {
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, err
+	}
+
+	return &v0alpha1.DataSourceConnectionList{
+		TypeMeta: v0alpha1.GenericConnectionResourceInfo.TypeMeta(),
+		Items: []v0alpha1.DataSourceConnection{
+			{
+				ObjectMeta: v1.ObjectMeta{
+					Name:              "PD8C576611E62080A",
+					Namespace:         info.Value, // the raw namespace value
+					CreationTimestamp: p.startup,
+				},
+				Title: "gdev-testdata",
+			},
+		},
+	}, nil
+}
+
+// PluginContextForDataSource implements PluginConfigProvider.
+func (*pluginDatasourceImpl) GetInstanceSettings(ctx context.Context, uid string) (*backend.DataSourceInstanceSettings, error) {
+	return &backend.DataSourceInstanceSettings{}, nil
+}
+
+// PluginContextWrapper
+func (*pluginDatasourceImpl) PluginContextForDataSource(ctx context.Context, datasourceSettings *backend.DataSourceInstanceSettings) (backend.PluginContext, error) {
+	return backend.PluginContext{DataSourceInstanceSettings: datasourceSettings}, nil
+}
diff --git a/pkg/services/apiserver/standalone/options/authn.go b/pkg/services/apiserver/standalone/options/authn.go
new file mode 100644
index 0000000000000..81dd44cc98af7
--- /dev/null
+++ b/pkg/services/apiserver/standalone/options/authn.go
@@ -0,0 +1,9 @@
+package options
+
+import "github.com/grafana/authlib/authn"
+
+func NewAuthnOptions() *AuthnOptions {
+	return &AuthnOptions{
+		IDVerifierConfig: &authn.IDVerifierConfig{},
+	}
+}
diff --git a/pkg/services/apiserver/standalone/options/logging.go b/pkg/services/apiserver/standalone/options/logging.go
new file mode 100644
index 0000000000000..4f6bf0ebb4c33
--- /dev/null
+++ b/pkg/services/apiserver/standalone/options/logging.go
@@ -0,0 +1,41 @@
+package options
+
+import (
+	"time"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/spf13/pflag"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+)
+
+type LoggingOptions struct {
+	logger log.Logger
+	Level  string
+}
+
+func NewLoggingOptions(logger log.Logger) *LoggingOptions {
+	return &LoggingOptions{
+		logger: logger,
+	}
+}
+
+func (o *LoggingOptions) AddFlags(fs *pflag.FlagSet) {
+	fs.StringVar(&o.Level, "grafana.log.level", "debug", "Log level, debug, info, warn, error.")
+}
+
+func (o *LoggingOptions) Validate() []error {
+	return nil
+}
+
+func (o *LoggingOptions) ApplyTo(c *genericapiserver.RecommendedConfig) error {
+	err := log.SetupConsoleLogger(o.Level)
+	if err != nil {
+		return err
+	}
+
+	o.logger.Info("Starting grafana-apiserver", "version", setting.BuildVersion, "commit", setting.BuildCommit, "branch", setting.BuildBranch, "compiled", time.Unix(setting.BuildStamp, 0))
+	o.logger.Debug("Console logging initialized", "logLevel", o.Level)
+
+	return nil
+}
diff --git a/pkg/services/apiserver/standalone/options/metrics.go b/pkg/services/apiserver/standalone/options/metrics.go
new file mode 100644
index 0000000000000..4a213bd460655
--- /dev/null
+++ b/pkg/services/apiserver/standalone/options/metrics.go
@@ -0,0 +1,42 @@
+package options
+
+import (
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/metrics"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/spf13/pflag"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+)
+
+type MetricsOptions struct {
+	logger            log.Logger
+	Enabled           bool
+	MetricsRegisterer prometheus.Registerer
+}
+
+func NewMetrcicsOptions(logger log.Logger) *MetricsOptions {
+	return &MetricsOptions{
+		logger: logger,
+	}
+}
+
+func (o *MetricsOptions) AddFlags(fs *pflag.FlagSet) {
+	fs.BoolVar(&o.Enabled, "grafana.metrics.enable", false, "Enable metrics and Prometheus /metrics endpoint.")
+}
+
+func (o *MetricsOptions) Validate() []error {
+	return nil
+}
+
+func (o *MetricsOptions) ApplyTo(c *genericapiserver.RecommendedConfig) error {
+	c.EnableMetrics = o.Enabled
+	o.MetricsRegisterer = metrics.ProvideRegisterer()
+	metrics.SetBuildInformation(o.MetricsRegisterer, setting.BuildVersion, setting.BuildCommit, setting.BuildBranch, setting.BuildStamp)
+
+	if o.Enabled {
+		o.logger.Debug("Metrics enabled")
+	}
+
+	return nil
+}
diff --git a/pkg/services/apiserver/standalone/options/options.go b/pkg/services/apiserver/standalone/options/options.go
new file mode 100644
index 0000000000000..173db33a48c80
--- /dev/null
+++ b/pkg/services/apiserver/standalone/options/options.go
@@ -0,0 +1,176 @@
+package options
+
+import (
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/apiserver/options"
+	"github.com/spf13/pflag"
+	"k8s.io/apimachinery/pkg/runtime"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+	genericoptions "k8s.io/apiserver/pkg/server/options"
+
+	"github.com/grafana/authlib/authn"
+)
+
+type Options struct {
+	LoggingOptions     *LoggingOptions
+	ExtraOptions       *options.ExtraOptions
+	RecommendedOptions *genericoptions.RecommendedOptions
+	TracingOptions     *TracingOptions
+	MetricsOptions     *MetricsOptions
+	AuthnOptions       *AuthnOptions
+}
+
+func New(logger log.Logger, codec runtime.Codec) *Options {
+	return &Options{
+		LoggingOptions:     NewLoggingOptions(logger),
+		ExtraOptions:       options.NewExtraOptions(),
+		RecommendedOptions: options.NewRecommendedOptions(codec),
+		TracingOptions:     NewTracingOptions(logger),
+		MetricsOptions:     NewMetrcicsOptions(logger),
+		AuthnOptions:       NewAuthnOptions(),
+	}
+}
+
+func (o *Options) AddFlags(fs *pflag.FlagSet) {
+	o.LoggingOptions.AddFlags(fs)
+	o.ExtraOptions.AddFlags(fs)
+	o.RecommendedOptions.AddFlags(fs)
+	o.TracingOptions.AddFlags(fs)
+	o.MetricsOptions.AddFlags(fs)
+	o.AuthnOptions.AddFlags(fs)
+}
+
+func (o *Options) Validate() []error {
+	if errs := o.LoggingOptions.Validate(); len(errs) != 0 {
+		return errs
+	}
+
+	if errs := o.ExtraOptions.Validate(); len(errs) != 0 {
+		return errs
+	}
+
+	if errs := o.TracingOptions.Validate(); len(errs) != 0 {
+		return errs
+	}
+
+	if errs := o.MetricsOptions.Validate(); len(errs) != 0 {
+		return errs
+	}
+
+	// NOTE: we don't call validate on the top level recommended options as it doesn't like skipping etcd-servers
+	// the function is left here for troubleshooting any other config issues
+	// errors = append(errors, o.RecommendedOptions.Validate()...)
+
+	if errs := o.RecommendedOptions.SecureServing.Validate(); len(errs) != 0 {
+		return errs
+	}
+
+	if o.ExtraOptions.DevMode {
+		// NOTE: Only consider authn for dev mode - resolves the failure due to missing extension apiserver auth-config
+		// in parent k8s
+		if errs := o.RecommendedOptions.Authentication.Validate(); len(errs) != 0 {
+			return errs
+		}
+	}
+
+	return nil
+}
+
+// A copy of ApplyTo in recommended.go, but for >= 0.28, server pkg in apiserver does a bit extra causing
+// a panic when CoreAPI is set to nil
+func (o *Options) ModifiedApplyTo(config *genericapiserver.RecommendedConfig) error {
+	if err := o.RecommendedOptions.Etcd.ApplyTo(&config.Config); err != nil {
+		return err
+	}
+	if err := o.RecommendedOptions.EgressSelector.ApplyTo(&config.Config); err != nil {
+		return err
+	}
+	if err := o.RecommendedOptions.Traces.ApplyTo(config.Config.EgressSelector, &config.Config); err != nil {
+		return err
+	}
+	if err := o.RecommendedOptions.SecureServing.ApplyTo(&config.Config.SecureServing, &config.Config.LoopbackClientConfig); err != nil {
+		return err
+	}
+	if err := o.RecommendedOptions.Authentication.ApplyTo(&config.Config.Authentication, config.SecureServing, config.OpenAPIConfig); err != nil {
+		return err
+	}
+	if err := o.RecommendedOptions.Authorization.ApplyTo(&config.Config.Authorization); err != nil {
+		return err
+	}
+	if err := o.RecommendedOptions.Audit.ApplyTo(&config.Config); err != nil {
+		return err
+	}
+
+	// TODO: determine whether we need flow control (API priority and fairness)
+	// We can't assume that a shared informers config was provided in standalone mode and will need a guard
+	// when enabling below
+	/* kubeClient, err := kubernetes.NewForConfig(config.ClientConfig)
+	if err != nil {
+		return err
+	}
+
+	if err := o.RecommendedOptions.Features.ApplyTo(&config.Config, kubeClient, config.SharedInformerFactory); err != nil {
+		return err
+	} */
+
+	if err := o.RecommendedOptions.CoreAPI.ApplyTo(config); err != nil {
+		return err
+	}
+
+	_, err := o.RecommendedOptions.ExtraAdmissionInitializers(config)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (o *Options) ApplyTo(serverConfig *genericapiserver.RecommendedConfig) error {
+	if o.LoggingOptions != nil {
+		if err := o.LoggingOptions.ApplyTo(serverConfig); err != nil {
+			return err
+		}
+	}
+
+	if o.ExtraOptions != nil {
+		if err := o.ExtraOptions.ApplyTo(serverConfig); err != nil {
+			return err
+		}
+	}
+
+	if o.RecommendedOptions.CoreAPI == nil {
+		if err := o.ModifiedApplyTo(serverConfig); err != nil {
+			return err
+		}
+	} else {
+		if err := o.RecommendedOptions.ApplyTo(serverConfig); err != nil {
+			return err
+		}
+	}
+
+	if o.TracingOptions != nil {
+		if err := o.TracingOptions.ApplyTo(serverConfig); err != nil {
+			return err
+		}
+	}
+
+	if o.MetricsOptions != nil {
+		if err := o.MetricsOptions.ApplyTo(serverConfig); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+type AuthnOptions struct {
+	IDVerifierConfig *authn.IDVerifierConfig
+}
+
+func (authOpts *AuthnOptions) AddFlags(fs *pflag.FlagSet) {
+	prefix := "grafana.authn"
+	fs.StringVar(&authOpts.IDVerifierConfig.SigningKeysURL, prefix+".signing-keys-url", "", "URL to jwks endpoint")
+
+	audience := fs.StringSlice(prefix+".allowed-audiences", []string{}, "Specifies a comma-separated list of allowed audiences.")
+	authOpts.IDVerifierConfig.AllowedAudiences = *audience
+}
diff --git a/pkg/services/apiserver/standalone/options/tracing.go b/pkg/services/apiserver/standalone/options/tracing.go
new file mode 100644
index 0000000000000..a330c7aec2602
--- /dev/null
+++ b/pkg/services/apiserver/standalone/options/tracing.go
@@ -0,0 +1,124 @@
+package options
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"net/url"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/spf13/pflag"
+	"go.opentelemetry.io/otel/attribute"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+)
+
+type TracingOptions struct {
+	logger log.Logger
+
+	JaegerAddress     string
+	JaegerPropagation string
+
+	OTLPAddress     string
+	OTLPPropagation string
+
+	Tags map[string]string
+
+	SamplerType        string
+	SamplerParam       float64
+	SamplingServiceURL string
+
+	TracingService *tracing.TracingService
+}
+
+func NewTracingOptions(logger log.Logger) *TracingOptions {
+	return &TracingOptions{
+		logger: logger,
+		Tags:   map[string]string{},
+	}
+}
+
+func (o *TracingOptions) AddFlags(fs *pflag.FlagSet) {
+	fs.StringVar(&o.JaegerAddress, "grafana.tracing.jaeger.address", "", "Tracing Jaeger exporter destination, e.g. http://localhost:14268/api/traces. This enabled the Jaeger export and takes presedence over grafana.tracing.otlp.")
+	fs.StringVar(&o.JaegerPropagation, "grafana.tracing.jaeger.propagation", "jaeger", "Tracing Jaeger propagation specifies the text map propagation format, w3c or jaeger.")
+	fs.StringVar(&o.OTLPAddress, "grafana.tracing.otlp.address", "", "Tracing OTLP exporter destination, e.g. localhost:4317.")
+	fs.StringVar(&o.OTLPPropagation, "grafana.tracing.otlp.propagation", "w3c", "Tracing OTLP propagation specifies the text map propagation format, w3c or jaeger.")
+	fs.StringToStringVar(&o.Tags, "grafana.tracing.tag", map[string]string{}, "Tracing server tag in 'key=value' format. Specify multiple times to add many.")
+	fs.StringVar(&o.SamplerType, "grafana.tracing.sampler-type", "const", "Tracing sampler type specifies the type of the sampler: const, probabilistic, rateLimiting, or remote.")
+	fs.Float64Var(&o.SamplerParam, "grafana.tracing.sampler-param", 0, "Tracing sampler configuration parameter. For 'const' sampler, 0 or 1 for always false/true respectively. For 'rateLimiting' sampler, the number of spans per second. For 'remote' sampler, param is the same as for 'probabilistic' and indicates the initial sampling rate before the actual one is received from the sampling service.")
+	fs.StringVar(&o.SamplingServiceURL, "grafana.tracing.sampling-service", "", "Tracing server sampling service URL (used for both Jaeger and OTLP) if grafana.tracing.sampler-type=remote.")
+}
+
+func (o *TracingOptions) Validate() []error {
+	errors := []error{}
+
+	if o.JaegerAddress != "" {
+		if _, err := url.Parse(o.JaegerAddress); err != nil {
+			errors = append(errors, fmt.Errorf("failed to parse tracing.jaeger.address: %w", err))
+		}
+	}
+
+	if o.SamplingServiceURL != "" {
+		if _, err := url.Parse(o.SamplingServiceURL); err != nil {
+			errors = append(errors, fmt.Errorf("failed to parse tracing.sampling-service: %w", err))
+		}
+	}
+
+	return errors
+}
+
+func (o *TracingOptions) ApplyTo(config *genericapiserver.RecommendedConfig) error {
+	tracingCfg := tracing.NewEmptyTracingConfig()
+	var err error
+
+	if o.OTLPAddress != "" {
+		tracingCfg, err = tracing.NewOTLPTracingConfig(o.OTLPAddress, o.OTLPPropagation)
+	}
+
+	if o.JaegerAddress != "" {
+		tracingCfg, err = tracing.NewJaegerTracingConfig(o.JaegerAddress, o.JaegerPropagation)
+	}
+
+	if err != nil {
+		return err
+	}
+
+	tracingCfg.ServiceName = "grafana-apiserver"
+	tracingCfg.ServiceVersion = setting.BuildVersion
+
+	for k, v := range o.Tags {
+		tracingCfg.CustomAttribs = append(tracingCfg.CustomAttribs, attribute.String(k, v))
+	}
+
+	tracingCfg.Sampler = o.SamplerType
+	tracingCfg.SamplerParam = o.SamplerParam
+	tracingCfg.SamplerRemoteURL = o.SamplingServiceURL
+
+	ts, err := tracing.ProvideService(tracingCfg)
+	if err != nil {
+		return err
+	}
+
+	o.TracingService = ts
+	config.TracerProvider = ts.GetTracerProvider()
+
+	config.AddPostStartHookOrDie("grafana-tracing-service", func(hookCtx genericapiserver.PostStartHookContext) error {
+		ctx, cancel := context.WithCancel(context.Background())
+
+		go func() {
+			<-hookCtx.StopCh
+			cancel()
+		}()
+
+		go func() {
+			if err := ts.Run(ctx); err != nil && !errors.Is(err, context.Canceled) {
+				o.logger.Error("failed to shutdown tracing service", "error", err)
+			}
+		}()
+
+		return nil
+	})
+
+	return nil
+}
diff --git a/pkg/services/apiserver/standalone/runtime.go b/pkg/services/apiserver/standalone/runtime.go
new file mode 100644
index 0000000000000..7b8abcb6d9304
--- /dev/null
+++ b/pkg/services/apiserver/standalone/runtime.go
@@ -0,0 +1,46 @@
+package standalone
+
+import (
+	"fmt"
+	"strings"
+)
+
+type RuntimeConfig struct {
+	Group   string
+	Version string
+	Enabled bool
+}
+
+func (a RuntimeConfig) String() string {
+	return fmt.Sprintf("%s/%s=%v", a.Group, a.Version, a.Enabled)
+}
+
+// Supported options are:
+//
+//	<group>/<version>=true|false for a specific API group and version (e.g. dashboards.grafana.app/v0alpha1=true)
+//	api/all=true|false controls all API versions
+//	api/ga=true|false controls all API versions of the form v[0-9]+
+//	api/beta=true|false controls all API versions of the form v[0-9]+beta[0-9]+
+//	api/alpha=true|false controls all API versions of the form v[0-9]+alpha[0-9]+`)
+//
+// See: https://kubernetes.io/docs/reference/command-line-tools-reference/kube-apiserver/
+func ReadRuntimeConfig(cfg string) ([]RuntimeConfig, error) {
+	if cfg == "" {
+		return nil, fmt.Errorf("missing --runtime-config={apiservers}")
+	}
+	parts := strings.Split(cfg, ",")
+	apis := make([]RuntimeConfig, len(parts))
+	for i, part := range parts {
+		idx0 := strings.Index(part, "/")
+		idx1 := strings.LastIndex(part, "=")
+		if idx1 < idx0 || idx0 < 0 {
+			return nil, fmt.Errorf("expected values in the form: group/version=true")
+		}
+		apis[i] = RuntimeConfig{
+			Group:   part[:idx0],
+			Version: part[idx0+1 : idx1],
+			Enabled: part[idx1+1:] == "true",
+		}
+	}
+	return apis, nil
+}
diff --git a/pkg/services/apiserver/standalone/runtime_test.go b/pkg/services/apiserver/standalone/runtime_test.go
new file mode 100644
index 0000000000000..374920cfd0e2a
--- /dev/null
+++ b/pkg/services/apiserver/standalone/runtime_test.go
@@ -0,0 +1,22 @@
+package standalone
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestReadRuntimeCOnfig(t *testing.T) {
+	out, err := ReadRuntimeConfig("all/all=true,dashboards.grafana.app/v0alpha1=false")
+	require.NoError(t, err)
+	require.Equal(t, []RuntimeConfig{
+		{Group: "all", Version: "all", Enabled: true},
+		{Group: "dashboards.grafana.app", Version: "v0alpha1", Enabled: false},
+	}, out)
+	require.Equal(t, "all/all=true", fmt.Sprintf("%v", out[0]))
+
+	// Empty is an error
+	_, err = ReadRuntimeConfig("")
+	require.Error(t, err)
+}
diff --git a/pkg/services/apiserver/storage/entity/restoptions.go b/pkg/services/apiserver/storage/entity/restoptions.go
new file mode 100644
index 0000000000000..58119cc87acab
--- /dev/null
+++ b/pkg/services/apiserver/storage/entity/restoptions.go
@@ -0,0 +1,90 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+package entity
+
+import (
+	"encoding/json"
+	"path"
+	"time"
+
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apiserver/pkg/registry/generic"
+	"k8s.io/apiserver/pkg/storage"
+	"k8s.io/apiserver/pkg/storage/storagebackend"
+	"k8s.io/apiserver/pkg/storage/storagebackend/factory"
+	flowcontrolrequest "k8s.io/apiserver/pkg/util/flowcontrol/request"
+	"k8s.io/client-go/tools/cache"
+
+	entityStore "github.com/grafana/grafana/pkg/services/store/entity"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+var _ generic.RESTOptionsGetter = (*RESTOptionsGetter)(nil)
+
+type RESTOptionsGetter struct {
+	cfg   *setting.Cfg
+	store entityStore.EntityStoreClient
+	Codec runtime.Codec
+}
+
+func NewRESTOptionsGetter(cfg *setting.Cfg, store entityStore.EntityStoreClient, codec runtime.Codec) *RESTOptionsGetter {
+	return &RESTOptionsGetter{
+		cfg:   cfg,
+		store: store,
+		Codec: codec,
+	}
+}
+
+func (f *RESTOptionsGetter) GetRESTOptions(resource schema.GroupResource) (generic.RESTOptions, error) {
+	// build connection string to uniquely identify the storage backend
+	connectionInfo, err := json.Marshal(f.cfg.SectionWithEnvOverrides("entity_api").KeysHash())
+	if err != nil {
+		return generic.RESTOptions{}, err
+	}
+
+	storageConfig := &storagebackend.ConfigForResource{
+		Config: storagebackend.Config{
+			Type:   "custom",
+			Prefix: "",
+			Transport: storagebackend.TransportConfig{
+				ServerList: []string{
+					string(connectionInfo),
+				},
+			},
+			Codec:                     f.Codec,
+			EncodeVersioner:           nil,
+			Transformer:               nil,
+			CompactionInterval:        0,
+			CountMetricPollPeriod:     0,
+			DBMetricPollInterval:      0,
+			HealthcheckTimeout:        0,
+			ReadycheckTimeout:         0,
+			StorageObjectCountTracker: nil,
+		},
+		GroupResource: resource,
+	}
+
+	ret := generic.RESTOptions{
+		StorageConfig: storageConfig,
+		Decorator: func(
+			config *storagebackend.ConfigForResource,
+			resourcePrefix string,
+			keyFunc func(obj runtime.Object) (string, error),
+			newFunc func() runtime.Object,
+			newListFunc func() runtime.Object,
+			getAttrsFunc storage.AttrFunc,
+			trigger storage.IndexerFuncs,
+			indexers *cache.Indexers,
+		) (storage.Interface, factory.DestroyFunc, error) {
+			return NewStorage(config, resource, f.store, f.Codec, keyFunc, newFunc, newListFunc, getAttrsFunc)
+		},
+		DeleteCollectionWorkers:   0,
+		EnableGarbageCollection:   false,
+		ResourcePrefix:            path.Join(storageConfig.Prefix, resource.Group, resource.Resource),
+		CountMetricPollPeriod:     1 * time.Second,
+		StorageObjectCountTracker: flowcontrolrequest.NewStorageObjectCountTracker(),
+	}
+
+	return ret, nil
+}
diff --git a/pkg/services/apiserver/storage/entity/selector.go b/pkg/services/apiserver/storage/entity/selector.go
new file mode 100644
index 0000000000000..14ad0619cea3c
--- /dev/null
+++ b/pkg/services/apiserver/storage/entity/selector.go
@@ -0,0 +1,81 @@
+package entity
+
+import (
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/selection"
+)
+
+const FolderAnnoKey = "grafana.app/folder"
+const SortByKey = "grafana.app/sortBy"
+const ListDeletedKey = "grafana.app/listDeleted"
+const ListHistoryKey = "grafana.app/listHistory"
+
+type Requirements struct {
+	// Equals folder
+	Folder *string
+	// SortBy is a list of fields to sort by
+	SortBy []string
+	// ListDeleted is a flag to list deleted entities
+	ListDeleted bool
+	// ListHistory is a resource name to list the history of
+	ListHistory string
+}
+
+func ReadLabelSelectors(selector labels.Selector) (Requirements, labels.Selector, error) {
+	requirements := Requirements{}
+	newSelector := labels.NewSelector()
+
+	if selector == nil {
+		return requirements, newSelector, nil
+	}
+
+	labelSelectors, _ := selector.Requirements()
+
+	for _, r := range labelSelectors {
+		switch r.Key() {
+		case FolderAnnoKey:
+			if (r.Operator() != selection.Equals) && (r.Operator() != selection.DoubleEquals) {
+				return requirements, newSelector, apierrors.NewBadRequest(FolderAnnoKey + " label selector only supports equality")
+			}
+			folder := r.Values().List()[0]
+			requirements.Folder = &folder
+		case SortByKey:
+			if r.Operator() != selection.In {
+				return requirements, newSelector, apierrors.NewBadRequest(SortByKey + " label selector only supports in")
+			}
+			requirements.SortBy = r.Values().List()
+		case ListDeletedKey:
+			if r.Operator() != selection.Equals {
+				return requirements, newSelector, apierrors.NewBadRequest(ListDeletedKey + " label selector only supports equality")
+			}
+			if len(r.Values().List()) != 1 {
+				return requirements, newSelector, apierrors.NewBadRequest(ListDeletedKey + " label selector only supports one value")
+			}
+			if r.Values().List()[0] != "true" && r.Values().List()[0] != "false" {
+				return requirements, newSelector, apierrors.NewBadRequest(ListDeletedKey + " label selector only supports true or false")
+			}
+			requirements.ListDeleted = r.Values().List()[0] == "true"
+		case ListHistoryKey:
+			if r.Operator() != selection.Equals {
+				return requirements, newSelector, apierrors.NewBadRequest(ListHistoryKey + " label selector only supports equality")
+			}
+			if len(r.Values().List()) != 1 {
+				return requirements, newSelector, apierrors.NewBadRequest(ListHistoryKey + " label selector only supports one value")
+			}
+			if r.Values().List()[0] == "" {
+				return requirements, newSelector, apierrors.NewBadRequest(ListHistoryKey + " label selector must not be empty")
+			}
+			requirements.ListHistory = r.Values().List()[0]
+		// add all unregonized label selectors to the new selector list, these will be processed by the entity store
+		default:
+			newSelector = newSelector.Add(r)
+		}
+	}
+
+	if requirements.ListDeleted && requirements.ListHistory != "" {
+		return requirements, newSelector, apierrors.NewBadRequest("cannot list deleted and history at the same time")
+	}
+
+	return requirements, newSelector, nil
+}
diff --git a/pkg/services/apiserver/storage/entity/storage.go b/pkg/services/apiserver/storage/entity/storage.go
new file mode 100644
index 0000000000000..f3e4a9fcc1aa2
--- /dev/null
+++ b/pkg/services/apiserver/storage/entity/storage.go
@@ -0,0 +1,671 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+// Provenance-includes-location: https://github.com/kubernetes-sigs/apiserver-runtime/blob/main/pkg/experimental/storage/filepath/jsonfile_rest.go
+// Provenance-includes-license: Apache-2.0
+// Provenance-includes-copyright: The Kubernetes Authors.
+
+package entity
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"io"
+	"log"
+	"reflect"
+	"strconv"
+
+	grpcCodes "google.golang.org/grpc/codes"
+	grpcStatus "google.golang.org/grpc/status"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/conversion"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/selection"
+	"k8s.io/apimachinery/pkg/watch"
+	"k8s.io/apiserver/pkg/endpoints/request"
+	"k8s.io/apiserver/pkg/storage"
+	"k8s.io/apiserver/pkg/storage/storagebackend"
+	"k8s.io/apiserver/pkg/storage/storagebackend/factory"
+
+	entityStore "github.com/grafana/grafana/pkg/services/store/entity"
+)
+
+var _ storage.Interface = (*Storage)(nil)
+
+// Storage implements storage.Interface and stores resources in unified storage
+type Storage struct {
+	config       *storagebackend.ConfigForResource
+	store        entityStore.EntityStoreClient
+	gr           schema.GroupResource
+	codec        runtime.Codec
+	keyFunc      func(obj runtime.Object) (string, error)
+	newFunc      func() runtime.Object
+	newListFunc  func() runtime.Object
+	getAttrsFunc storage.AttrFunc
+	// trigger      storage.IndexerFuncs
+	// indexers     *cache.Indexers
+}
+
+func NewStorage(
+	config *storagebackend.ConfigForResource,
+	gr schema.GroupResource,
+	store entityStore.EntityStoreClient,
+	codec runtime.Codec,
+	keyFunc func(obj runtime.Object) (string, error),
+	newFunc func() runtime.Object,
+	newListFunc func() runtime.Object,
+	getAttrsFunc storage.AttrFunc,
+) (storage.Interface, factory.DestroyFunc, error) {
+	return &Storage{
+		config:       config,
+		gr:           gr,
+		codec:        codec,
+		store:        store,
+		keyFunc:      keyFunc,
+		newFunc:      newFunc,
+		newListFunc:  newListFunc,
+		getAttrsFunc: getAttrsFunc,
+	}, nil, nil
+}
+
+// Create adds a new object at a key unless it already exists. 'ttl' is time-to-live
+// in seconds (0 means forever). If no error is returned and out is not nil, out will be
+// set to the read value from database.
+func (s *Storage) Create(ctx context.Context, key string, obj runtime.Object, out runtime.Object, ttl uint64) error {
+	requestInfo, ok := request.RequestInfoFrom(ctx)
+	if !ok {
+		return apierrors.NewInternalError(fmt.Errorf("could not get request info"))
+	}
+
+	if err := s.Versioner().PrepareObjectForStorage(obj); err != nil {
+		return err
+	}
+
+	e, err := resourceToEntity(obj, requestInfo, s.codec)
+	if err != nil {
+		return err
+	}
+
+	req := &entityStore.CreateEntityRequest{
+		Entity: e,
+	}
+
+	rsp, err := s.store.Create(ctx, req)
+	if err != nil {
+		return err
+	}
+	if rsp.Status != entityStore.CreateEntityResponse_CREATED {
+		return fmt.Errorf("this was not a create operation... (%s)", rsp.Status.String())
+	}
+
+	err = entityToResource(rsp.Entity, out, s.codec)
+	if err != nil {
+		return apierrors.NewInternalError(err)
+	}
+
+	return nil
+}
+
+// Delete removes the specified key and returns the value that existed at that spot.
+// If key didn't exist, it will return NotFound storage error.
+// If 'cachedExistingObject' is non-nil, it can be used as a suggestion about the
+// current version of the object to avoid read operation from storage to get it.
+// However, the implementations have to retry in case suggestion is stale.
+func (s *Storage) Delete(ctx context.Context, key string, out runtime.Object, preconditions *storage.Preconditions, validateDeletion storage.ValidateObjectFunc, cachedExistingObject runtime.Object) error {
+	requestInfo, ok := request.RequestInfoFrom(ctx)
+	if !ok {
+		return apierrors.NewInternalError(fmt.Errorf("could not get request info"))
+	}
+
+	k := &entityStore.Key{
+		Group:       requestInfo.APIGroup,
+		Resource:    requestInfo.Resource,
+		Namespace:   requestInfo.Namespace,
+		Name:        requestInfo.Name,
+		Subresource: requestInfo.Subresource,
+	}
+
+	previousVersion := int64(0)
+	if preconditions != nil && preconditions.ResourceVersion != nil {
+		previousVersion, _ = strconv.ParseInt(*preconditions.ResourceVersion, 10, 64)
+	}
+
+	rsp, err := s.store.Delete(ctx, &entityStore.DeleteEntityRequest{
+		Key:             k.String(),
+		PreviousVersion: previousVersion,
+	})
+	if err != nil {
+		return err
+	}
+
+	err = entityToResource(rsp.Entity, out, s.codec)
+	if err != nil {
+		return apierrors.NewInternalError(err)
+	}
+
+	return nil
+}
+
+// Watch begins watching the specified key. Events are decoded into API objects,
+// and any items selected by 'p' are sent down to returned watch.Interface.
+// resourceVersion may be used to specify what version to begin watching,
+// which should be the current resourceVersion, and no longer rv+1
+// (e.g. reconnecting without missing any updates).
+// If resource version is "0", this interface will get current object at given key
+// and send it in an "ADDED" event, before watch starts.
+func (s *Storage) Watch(ctx context.Context, key string, opts storage.ListOptions) (watch.Interface, error) {
+	requestInfo, ok := request.RequestInfoFrom(ctx)
+	if !ok {
+		return nil, apierrors.NewInternalError(fmt.Errorf("could not get request info"))
+	}
+
+	k := &entityStore.Key{
+		Group:       requestInfo.APIGroup,
+		Resource:    requestInfo.Resource,
+		Namespace:   requestInfo.Namespace,
+		Name:        requestInfo.Name,
+		Subresource: requestInfo.Subresource,
+	}
+
+	if opts.Predicate.Field != nil {
+		// check for metadata.name field selector
+		if v, ok := opts.Predicate.Field.RequiresExactMatch("metadata.name"); ok {
+			if k.Name != "" && k.Name != v {
+				return nil, apierrors.NewBadRequest("name field selector does not match key")
+			}
+
+			// just watch the specific key if we have a name field selector
+			k.Name = v
+		}
+
+		// check for metadata.namespace field selector
+		if v, ok := opts.Predicate.Field.RequiresExactMatch("metadata.namespace"); ok {
+			if k.Namespace != "" && k.Namespace != v {
+				return nil, apierrors.NewBadRequest("namespace field selector does not match key")
+			}
+
+			// just watch the specific namespace if we have a namespace field selector
+			k.Namespace = v
+		}
+	}
+
+	// translate grafana.app/* label selectors into field requirements
+	requirements, newSelector, err := ReadLabelSelectors(opts.Predicate.Label)
+	if err != nil {
+		return nil, err
+	}
+
+	// Update the selector to remove the unneeded requirements
+	opts.Predicate.Label = newSelector
+
+	// if we got a listHistory label selector, watch the specified resource
+	if requirements.ListHistory != "" {
+		if k.Name != "" && k.Name != requirements.ListHistory {
+			return nil, apierrors.NewBadRequest("name field selector does not match listHistory")
+		}
+		k.Name = requirements.ListHistory
+	}
+
+	req := &entityStore.EntityWatchRequest{
+		Key: []string{
+			k.String(),
+		},
+		Labels:     map[string]string{},
+		WithBody:   true,
+		WithStatus: true,
+	}
+
+	if requirements.Folder != nil {
+		req.Folder = *requirements.Folder
+	}
+
+	// translate "equals" label selectors to storage label conditions
+	labelRequirements, selectable := opts.Predicate.Label.Requirements()
+	if !selectable {
+		return nil, apierrors.NewBadRequest("label selector is not selectable")
+	}
+
+	for _, r := range labelRequirements {
+		if r.Operator() == selection.Equals {
+			req.Labels[r.Key()] = r.Values().List()[0]
+		}
+	}
+
+	if opts.ResourceVersion != "" {
+		rv, err := strconv.ParseInt(opts.ResourceVersion, 10, 64)
+		if err != nil {
+			return nil, apierrors.NewBadRequest(fmt.Sprintf("invalid resource version: %s", opts.ResourceVersion))
+		}
+
+		req.Since = rv
+	}
+
+	result, err := s.store.Watch(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	reporter := apierrors.NewClientErrorReporter(500, "WATCH", "")
+
+	decoder := &Decoder{
+		client:  result,
+		newFunc: s.newFunc,
+		opts:    opts,
+		codec:   s.codec,
+	}
+
+	w := watch.NewStreamWatcher(decoder, reporter)
+
+	return w, nil
+}
+
+// Get unmarshals object found at key into objPtr. On a not found error, will either
+// return a zero object of the requested type, or an error, depending on 'opts.ignoreNotFound'.
+// Treats empty responses and nil response nodes exactly like a not found error.
+// The returned contents may be delayed, but it is guaranteed that they will
+// match 'opts.ResourceVersion' according 'opts.ResourceVersionMatch'.
+func (s *Storage) Get(ctx context.Context, key string, opts storage.GetOptions, objPtr runtime.Object) error {
+	requestInfo, ok := request.RequestInfoFrom(ctx)
+	if !ok {
+		return apierrors.NewInternalError(fmt.Errorf("could not get request info"))
+	}
+
+	k := &entityStore.Key{
+		Group:       requestInfo.APIGroup,
+		Resource:    requestInfo.Resource,
+		Namespace:   requestInfo.Namespace,
+		Name:        requestInfo.Name,
+		Subresource: requestInfo.Subresource,
+	}
+
+	resourceVersion := int64(0)
+	var err error
+	if opts.ResourceVersion != "" {
+		resourceVersion, err = strconv.ParseInt(opts.ResourceVersion, 10, 64)
+		if err != nil {
+			return apierrors.NewBadRequest(fmt.Sprintf("invalid resource version: %s", opts.ResourceVersion))
+		}
+	}
+
+	rsp, err := s.store.Read(ctx, &entityStore.ReadEntityRequest{
+		Key:             k.String(),
+		WithBody:        true,
+		WithStatus:      true,
+		ResourceVersion: resourceVersion,
+	})
+	if err != nil {
+		return err
+	}
+
+	if rsp.Key == "" {
+		if opts.IgnoreNotFound {
+			return nil
+		}
+
+		return apierrors.NewNotFound(s.gr, k.Name)
+	}
+
+	err = entityToResource(rsp, objPtr, s.codec)
+	if err != nil {
+		return apierrors.NewInternalError(err)
+	}
+
+	return nil
+}
+
+// GetList unmarshalls objects found at key into a *List api object (an object
+// that satisfies runtime.IsList definition).
+// If 'opts.Recursive' is false, 'key' is used as an exact match. If `opts.Recursive'
+// is true, 'key' is used as a prefix.
+// The returned contents may be delayed, but it is guaranteed that they will
+// match 'opts.ResourceVersion' according 'opts.ResourceVersionMatch'.
+func (s *Storage) GetList(ctx context.Context, key string, opts storage.ListOptions, listObj runtime.Object) error {
+	requestInfo, ok := request.RequestInfoFrom(ctx)
+	if !ok {
+		return apierrors.NewInternalError(fmt.Errorf("could not get request info"))
+	}
+
+	k := &entityStore.Key{
+		Group:       requestInfo.APIGroup,
+		Resource:    requestInfo.Resource,
+		Namespace:   requestInfo.Namespace,
+		Name:        requestInfo.Name,
+		Subresource: requestInfo.Subresource,
+	}
+
+	listPtr, err := meta.GetItemsPtr(listObj)
+	if err != nil {
+		return err
+	}
+	v, err := conversion.EnforcePtr(listPtr)
+	if err != nil {
+		return err
+	}
+
+	// translate grafana.app/* label selectors into field requirements
+	requirements, newSelector, err := ReadLabelSelectors(opts.Predicate.Label)
+	if err != nil {
+		return err
+	}
+
+	// Update the selector to remove the unneeded requirements
+	opts.Predicate.Label = newSelector
+
+	if requirements.ListHistory != "" {
+		k.Name = requirements.ListHistory
+
+		req := &entityStore.EntityHistoryRequest{
+			Key:           k.String(),
+			WithBody:      true,
+			WithStatus:    true,
+			NextPageToken: opts.Predicate.Continue,
+			Limit:         opts.Predicate.Limit,
+			Sort:          requirements.SortBy,
+		}
+
+		rsp, err := s.store.History(ctx, req)
+		if err != nil {
+			return apierrors.NewInternalError(err)
+		}
+
+		for _, r := range rsp.Versions {
+			res := s.newFunc()
+
+			err := entityToResource(r, res, s.codec)
+			if err != nil {
+				return apierrors.NewInternalError(err)
+			}
+
+			// apply any predicates not handled in storage
+			matches, err := opts.Predicate.Matches(res)
+			if err != nil {
+				return apierrors.NewInternalError(err)
+			}
+			if !matches {
+				continue
+			}
+
+			v.Set(reflect.Append(v, reflect.ValueOf(res).Elem()))
+		}
+
+		listAccessor, err := meta.ListAccessor(listObj)
+		if err != nil {
+			return err
+		}
+
+		if rsp.NextPageToken != "" {
+			listAccessor.SetContinue(rsp.NextPageToken)
+		}
+
+		listAccessor.SetResourceVersion(strconv.FormatInt(rsp.ResourceVersion, 10))
+
+		return nil
+	}
+
+	req := &entityStore.EntityListRequest{
+		Key: []string{
+			k.String(),
+		},
+		WithBody:      true,
+		WithStatus:    true,
+		NextPageToken: opts.Predicate.Continue,
+		Limit:         opts.Predicate.Limit,
+		Labels:        map[string]string{},
+	}
+
+	if requirements.Folder != nil {
+		req.Folder = *requirements.Folder
+	}
+	if len(requirements.SortBy) > 0 {
+		req.Sort = requirements.SortBy
+	}
+	if requirements.ListDeleted {
+		req.Deleted = true
+	}
+
+	// translate "equals" label selectors to storage label conditions
+	labelRequirements, selectable := opts.Predicate.Label.Requirements()
+	if !selectable {
+		return apierrors.NewBadRequest("label selector is not selectable")
+	}
+
+	for _, r := range labelRequirements {
+		if r.Operator() == selection.Equals {
+			req.Labels[r.Key()] = r.Values().List()[0]
+		}
+	}
+
+	rsp, err := s.store.List(ctx, req)
+	if err != nil {
+		return apierrors.NewInternalError(err)
+	}
+
+	for _, r := range rsp.Results {
+		res := s.newFunc()
+
+		err := entityToResource(r, res, s.codec)
+		if err != nil {
+			return apierrors.NewInternalError(err)
+		}
+
+		// apply any predicates not handled in storage
+		matches, err := opts.Predicate.Matches(res)
+		if err != nil {
+			return apierrors.NewInternalError(err)
+		}
+		if !matches {
+			continue
+		}
+
+		v.Set(reflect.Append(v, reflect.ValueOf(res).Elem()))
+	}
+
+	listAccessor, err := meta.ListAccessor(listObj)
+	if err != nil {
+		return err
+	}
+
+	if rsp.NextPageToken != "" {
+		listAccessor.SetContinue(rsp.NextPageToken)
+	}
+
+	listAccessor.SetResourceVersion(strconv.FormatInt(rsp.ResourceVersion, 10))
+
+	return nil
+}
+
+// GuaranteedUpdate keeps calling 'tryUpdate()' to update key 'key' (of type 'destination')
+// retrying the update until success if there is index conflict.
+// Note that object passed to tryUpdate may change across invocations of tryUpdate() if
+// other writers are simultaneously updating it, so tryUpdate() needs to take into account
+// the current contents of the object when deciding how the update object should look.
+// If the key doesn't exist, it will return NotFound storage error if ignoreNotFound=false
+// else `destination` will be set to the zero value of it's type.
+// If the eventual successful invocation of `tryUpdate` returns an output with the same serialized
+// contents as the input, it won't perform any update, but instead set `destination` to an object with those
+// contents.
+// If 'cachedExistingObject' is non-nil, it can be used as a suggestion about the
+// current version of the object to avoid read operation from storage to get it.
+// However, the implementations have to retry in case suggestion is stale.
+func (s *Storage) GuaranteedUpdate(
+	ctx context.Context,
+	key string,
+	destination runtime.Object,
+	ignoreNotFound bool,
+	preconditions *storage.Preconditions,
+	tryUpdate storage.UpdateFunc,
+	cachedExistingObject runtime.Object,
+) error {
+	requestInfo, ok := request.RequestInfoFrom(ctx)
+	if !ok {
+		return apierrors.NewInternalError(fmt.Errorf("could not get request info"))
+	}
+
+	k := &entityStore.Key{
+		Group:       requestInfo.APIGroup,
+		Resource:    requestInfo.Resource,
+		Namespace:   requestInfo.Namespace,
+		Name:        requestInfo.Name,
+		Subresource: requestInfo.Subresource,
+	}
+
+	getErr := s.Get(ctx, k.String(), storage.GetOptions{}, destination)
+	if getErr != nil {
+		if ignoreNotFound && apierrors.IsNotFound(getErr) {
+			// destination is already set to zero value
+			// we'll create the resource
+		} else {
+			return getErr
+		}
+	}
+
+	accessor, err := meta.Accessor(destination)
+	if err != nil {
+		return err
+	}
+	previousVersion, _ := strconv.ParseInt(accessor.GetResourceVersion(), 10, 64)
+	if preconditions != nil && preconditions.ResourceVersion != nil {
+		previousVersion, _ = strconv.ParseInt(*preconditions.ResourceVersion, 10, 64)
+	}
+
+	res := &storage.ResponseMeta{}
+	updatedObj, _, err := tryUpdate(destination, *res)
+	if err != nil {
+		var statusErr *apierrors.StatusError
+		if errors.As(err, &statusErr) {
+			// For now, forbidden may come from a mutation handler
+			if statusErr.ErrStatus.Reason == metav1.StatusReasonForbidden {
+				return statusErr
+			}
+		}
+
+		return apierrors.NewInternalError(fmt.Errorf("could not successfully update object. key=%s, err=%s", k.String(), err.Error()))
+	}
+
+	e, err := resourceToEntity(updatedObj, requestInfo, s.codec)
+	if err != nil {
+		return err
+	}
+
+	// if we have a non-nil getErr, then we've ignored a not found error
+	if getErr != nil {
+		// object does not exist, create it
+		req := &entityStore.CreateEntityRequest{
+			Entity: e,
+		}
+
+		rsp, err := s.store.Create(ctx, req)
+		if err != nil {
+			return err
+		}
+
+		err = entityToResource(rsp.Entity, destination, s.codec)
+		if err != nil {
+			return apierrors.NewInternalError(err)
+		}
+
+		return nil
+	}
+
+	// update the existing object
+	req := &entityStore.UpdateEntityRequest{
+		Entity:          e,
+		PreviousVersion: previousVersion,
+	}
+
+	rsp, err := s.store.Update(ctx, req)
+	if err != nil {
+		return err // continue???
+	}
+
+	if rsp.Status == entityStore.UpdateEntityResponse_UNCHANGED {
+		return nil // destination is already set
+	}
+
+	err = entityToResource(rsp.Entity, destination, s.codec)
+	if err != nil {
+		return apierrors.NewInternalError(err)
+	}
+
+	return nil
+}
+
+// Count returns number of different entries under the key (generally being path prefix).
+func (s *Storage) Count(key string) (int64, error) {
+	return 0, nil
+}
+
+func (s *Storage) Versioner() storage.Versioner {
+	return &storage.APIObjectVersioner{}
+}
+
+func (s *Storage) RequestWatchProgress(ctx context.Context) error {
+	return nil
+}
+
+type Decoder struct {
+	client  entityStore.EntityStore_WatchClient
+	newFunc func() runtime.Object
+	opts    storage.ListOptions
+	codec   runtime.Codec
+}
+
+func (d *Decoder) Decode() (action watch.EventType, object runtime.Object, err error) {
+	for {
+		resp, err := d.client.Recv()
+		if errors.Is(err, io.EOF) {
+			log.Printf("watch is done")
+			return watch.Error, nil, err
+		}
+
+		if grpcStatus.Code(err) == grpcCodes.Canceled {
+			log.Printf("watch was canceled")
+			return watch.Error, nil, err
+		}
+
+		if err != nil {
+			log.Printf("error receiving result: %s", err)
+			return watch.Error, nil, err
+		}
+
+		obj := d.newFunc()
+
+		err = entityToResource(resp.Entity, obj, d.codec)
+		if err != nil {
+			log.Printf("error decoding entity: %s", err)
+			return watch.Error, nil, err
+		}
+
+		// apply any predicates not handled in storage
+		matches, err := d.opts.Predicate.Matches(obj)
+		if err != nil {
+			log.Printf("error matching object: %s", err)
+			return watch.Error, nil, err
+		}
+		if !matches {
+			continue
+		}
+
+		var watchAction watch.EventType
+		switch resp.Entity.Action {
+		case entityStore.Entity_CREATED:
+			watchAction = watch.Added
+		case entityStore.Entity_UPDATED:
+			watchAction = watch.Modified
+		case entityStore.Entity_DELETED:
+			watchAction = watch.Deleted
+		default:
+			watchAction = watch.Error
+		}
+
+		return watchAction, obj, nil
+	}
+}
+
+func (d *Decoder) Close() {
+	_ = d.client.CloseSend()
+}
+
+var _ watch.Decoder = (*Decoder)(nil)
diff --git a/pkg/services/apiserver/storage/entity/utils.go b/pkg/services/apiserver/storage/entity/utils.go
new file mode 100644
index 0000000000000..51cd46d339718
--- /dev/null
+++ b/pkg/services/apiserver/storage/entity/utils.go
@@ -0,0 +1,183 @@
+package entity
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"reflect"
+	"strconv"
+	"time"
+
+	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apiserver/pkg/endpoints/request"
+
+	"github.com/grafana/grafana/pkg/services/apiserver/utils"
+	entityStore "github.com/grafana/grafana/pkg/services/store/entity"
+)
+
+func entityToResource(rsp *entityStore.Entity, res runtime.Object, codec runtime.Codec) error {
+	var err error
+
+	// Read the body first -- it includes old resourceVersion!
+	if len(rsp.Body) > 0 {
+		decoded, _, err := codec.Decode(rsp.Body, &schema.GroupVersionKind{Group: rsp.Group, Version: rsp.GroupVersion}, res)
+		if err != nil {
+			return err
+		}
+		res = decoded
+	}
+
+	metaAccessor, err := meta.Accessor(res)
+	if err != nil {
+		return err
+	}
+
+	if len(rsp.Meta) > 0 {
+		err = json.Unmarshal(rsp.Meta, res)
+		if err != nil {
+			return err
+		}
+	}
+
+	metaAccessor.SetName(rsp.Name)
+	metaAccessor.SetNamespace(rsp.Namespace)
+	metaAccessor.SetUID(types.UID(rsp.Guid))
+	metaAccessor.SetResourceVersion(fmt.Sprintf("%d", rsp.ResourceVersion))
+	metaAccessor.SetCreationTimestamp(metav1.Unix(rsp.CreatedAt/1000, rsp.CreatedAt%1000*1000000))
+
+	grafanaAccessor, err := utils.MetaAccessor(metaAccessor)
+	if err != nil {
+		return err
+	}
+
+	if rsp.Folder != "" {
+		grafanaAccessor.SetFolder(rsp.Folder)
+	}
+	if rsp.CreatedBy != "" {
+		grafanaAccessor.SetCreatedBy(rsp.CreatedBy)
+	}
+	if rsp.UpdatedBy != "" {
+		grafanaAccessor.SetUpdatedBy(rsp.UpdatedBy)
+	}
+	if rsp.UpdatedAt != 0 {
+		updatedAt := time.UnixMilli(rsp.UpdatedAt).UTC()
+		grafanaAccessor.SetUpdatedTimestamp(&updatedAt)
+	}
+	grafanaAccessor.SetSlug(rsp.Slug)
+	grafanaAccessor.SetAction(rsp.Action.String())
+
+	if rsp.Origin != nil {
+		originTime := time.UnixMilli(rsp.Origin.Time).UTC()
+		grafanaAccessor.SetOriginInfo(&utils.ResourceOriginInfo{
+			Name: rsp.Origin.Source,
+			Key:  rsp.Origin.Key,
+			// Path: rsp.Origin.Path,
+			Timestamp: &originTime,
+		})
+	}
+
+	if len(rsp.Labels) > 0 {
+		metaAccessor.SetLabels(rsp.Labels)
+	}
+
+	// TODO fields?
+
+	if len(rsp.Status) > 0 {
+		status := reflect.ValueOf(res).Elem().FieldByName("Status")
+		if status != (reflect.Value{}) && status.CanSet() {
+			err = json.Unmarshal(rsp.Status, status.Addr().Interface())
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
+func resourceToEntity(res runtime.Object, requestInfo *request.RequestInfo, codec runtime.Codec) (*entityStore.Entity, error) {
+	metaAccessor, err := meta.Accessor(res)
+	if err != nil {
+		return nil, err
+	}
+
+	grafanaAccessor, err := utils.MetaAccessor(metaAccessor)
+	if err != nil {
+		return nil, err
+	}
+	rv, _ := strconv.ParseInt(metaAccessor.GetResourceVersion(), 10, 64)
+
+	k := &entityStore.Key{
+		Group:       requestInfo.APIGroup,
+		Resource:    requestInfo.Resource,
+		Namespace:   requestInfo.Namespace,
+		Name:        metaAccessor.GetName(),
+		Subresource: requestInfo.Subresource,
+	}
+
+	rsp := &entityStore.Entity{
+		Group:           k.Group,
+		GroupVersion:    requestInfo.APIVersion,
+		Resource:        k.Resource,
+		Subresource:     k.Subresource,
+		Namespace:       k.Namespace,
+		Key:             k.String(),
+		Name:            k.Name,
+		Guid:            string(metaAccessor.GetUID()),
+		ResourceVersion: rv,
+		Folder:          grafanaAccessor.GetFolder(),
+		CreatedAt:       metaAccessor.GetCreationTimestamp().Time.UnixMilli(),
+		CreatedBy:       grafanaAccessor.GetCreatedBy(),
+		UpdatedBy:       grafanaAccessor.GetUpdatedBy(),
+		Slug:            grafanaAccessor.GetSlug(),
+		Title:           grafanaAccessor.FindTitle(metaAccessor.GetName()),
+		Origin: &entityStore.EntityOriginInfo{
+			Source: grafanaAccessor.GetOriginName(),
+			Key:    grafanaAccessor.GetOriginKey(),
+			// Path: 	grafanaAccessor.GetOriginPath(),
+		},
+		Labels: metaAccessor.GetLabels(),
+	}
+
+	t, err := grafanaAccessor.GetUpdatedTimestamp()
+	if err != nil {
+		return nil, err
+	}
+	if t != nil {
+		rsp.UpdatedAt = t.UnixMilli()
+	}
+
+	t, err = grafanaAccessor.GetOriginTimestamp()
+	if err != nil {
+		return nil, err
+	}
+	if t != nil {
+		rsp.Origin.Time = t.UnixMilli()
+	}
+
+	rsp.Meta, err = json.Marshal(meta.AsPartialObjectMetadata(metaAccessor))
+	if err != nil {
+		return nil, err
+	}
+
+	var buf bytes.Buffer
+	err = codec.Encode(res, &buf)
+	if err != nil {
+		return nil, err
+	}
+	rsp.Body = buf.Bytes()
+
+	status := reflect.ValueOf(res).Elem().FieldByName("Status")
+	if status != (reflect.Value{}) {
+		rsp.Status, err = json.Marshal(status.Interface())
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return rsp, nil
+}
diff --git a/pkg/services/apiserver/storage/entity/utils_test.go b/pkg/services/apiserver/storage/entity/utils_test.go
new file mode 100644
index 0000000000000..c5e470bdbca51
--- /dev/null
+++ b/pkg/services/apiserver/storage/entity/utils_test.go
@@ -0,0 +1,216 @@
+package entity
+
+import (
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/grafana/grafana/pkg/apis/playlist/v0alpha1"
+	entityStore "github.com/grafana/grafana/pkg/services/store/entity"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
+	"k8s.io/apiserver/pkg/endpoints/request"
+)
+
+func TestResourceToEntity(t *testing.T) {
+	createdAt := metav1.Now()
+	createdAtStr := createdAt.UTC().Format(time.RFC3339)
+
+	// truncate here because RFC3339 doesn't support millisecond precision
+	// consider updating accessor to use RFC3339Nano to encode timestamps
+	updatedAt := createdAt.Add(time.Hour).Truncate(time.Second)
+	updatedAtStr := updatedAt.UTC().Format(time.RFC3339)
+
+	Scheme := runtime.NewScheme()
+	Scheme.AddKnownTypes(v0alpha1.PlaylistResourceInfo.GroupVersion(), &v0alpha1.Playlist{})
+	Codecs := serializer.NewCodecFactory(Scheme)
+
+	testCases := []struct {
+		requestInfo          *request.RequestInfo
+		resource             runtime.Object
+		codec                runtime.Codec
+		expectedKey          string
+		expectedGroupVersion string
+		expectedName         string
+		expectedNamespace    string
+		expectedTitle        string
+		expectedGuid         string
+		expectedVersion      string
+		expectedFolder       string
+		expectedCreatedAt    int64
+		expectedUpdatedAt    int64
+		expectedCreatedBy    string
+		expectedUpdatedBy    string
+		expectedSlug         string
+		expectedOrigin       *entityStore.EntityOriginInfo
+		expectedLabels       map[string]string
+		expectedMeta         []byte
+		expectedBody         []byte
+	}{
+		{
+			requestInfo: &request.RequestInfo{
+				APIGroup:   "playlist.grafana.app",
+				APIVersion: "v0alpha1",
+				Resource:   "playlists",
+				Namespace:  "default",
+				Name:       "test-name",
+			},
+			resource: &v0alpha1.Playlist{
+				ObjectMeta: metav1.ObjectMeta{
+					CreationTimestamp: createdAt,
+					Labels:            map[string]string{"label1": "value1", "label2": "value2"},
+					Name:              "test-name",
+					ResourceVersion:   "1",
+					UID:               "test-uid",
+					Annotations: map[string]string{
+						"grafana.app/createdBy":        "test-created-by",
+						"grafana.app/updatedBy":        "test-updated-by",
+						"grafana.app/updatedTimestamp": updatedAtStr,
+						"grafana.app/folder":           "test-folder",
+						"grafana.app/slug":             "test-slug",
+					},
+				},
+				Spec: v0alpha1.Spec{
+					Title:    "A playlist",
+					Interval: "5m",
+					Items: []v0alpha1.Item{
+						{Type: v0alpha1.ItemTypeDashboardByTag, Value: "panel-tests"},
+						{Type: v0alpha1.ItemTypeDashboardByUid, Value: "vmie2cmWz"},
+					},
+				},
+			},
+			expectedKey:          "/playlist.grafana.app/playlists/namespaces/default/test-name",
+			expectedGroupVersion: "v0alpha1",
+			expectedName:         "test-name",
+			expectedNamespace:    "default",
+			expectedTitle:        "A playlist",
+			expectedGuid:         "test-uid",
+			expectedVersion:      "1",
+			expectedFolder:       "test-folder",
+			expectedCreatedAt:    createdAt.UnixMilli(),
+			expectedUpdatedAt:    updatedAt.UnixMilli(),
+			expectedCreatedBy:    "test-created-by",
+			expectedUpdatedBy:    "test-updated-by",
+			expectedSlug:         "test-slug",
+			expectedOrigin:       &entityStore.EntityOriginInfo{Source: "", Key: ""},
+			expectedLabels:       map[string]string{"label1": "value1", "label2": "value2"},
+			expectedMeta:         []byte(fmt.Sprintf(`{"metadata":{"name":"test-name","uid":"test-uid","resourceVersion":"1","creationTimestamp":%q,"labels":{"label1":"value1","label2":"value2"},"annotations":{"grafana.app/createdBy":"test-created-by","grafana.app/folder":"test-folder","grafana.app/slug":"test-slug","grafana.app/updatedBy":"test-updated-by","grafana.app/updatedTimestamp":%q}}}`, createdAtStr, updatedAtStr)),
+			expectedBody:         []byte(fmt.Sprintf(`{"kind":"Playlist","apiVersion":"playlist.grafana.app/v0alpha1","metadata":{"name":"test-name","uid":"test-uid","resourceVersion":"1","creationTimestamp":%q,"labels":{"label1":"value1","label2":"value2"},"annotations":{"grafana.app/createdBy":"test-created-by","grafana.app/folder":"test-folder","grafana.app/slug":"test-slug","grafana.app/updatedBy":"test-updated-by","grafana.app/updatedTimestamp":%q}},"spec":{"title":"A playlist","interval":"5m","items":[{"type":"dashboard_by_tag","value":"panel-tests"},{"type":"dashboard_by_uid","value":"vmie2cmWz"}]}}`, createdAtStr, updatedAtStr)),
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.resource.GetObjectKind().GroupVersionKind().Kind+" to entity conversion should succeed", func(t *testing.T) {
+			entity, err := resourceToEntity(tc.resource, tc.requestInfo, Codecs.LegacyCodec(v0alpha1.PlaylistResourceInfo.GroupVersion()))
+			require.NoError(t, err)
+			assert.Equal(t, tc.expectedKey, entity.Key)
+			assert.Equal(t, tc.expectedName, entity.Name)
+			assert.Equal(t, tc.expectedNamespace, entity.Namespace)
+			assert.Equal(t, tc.expectedTitle, entity.Title)
+			assert.Equal(t, tc.expectedGroupVersion, entity.GroupVersion)
+			assert.Equal(t, tc.expectedName, entity.Name)
+			assert.Equal(t, tc.expectedGuid, entity.Guid)
+			assert.Equal(t, tc.expectedFolder, entity.Folder)
+			assert.Equal(t, tc.expectedCreatedAt, entity.CreatedAt)
+			assert.Equal(t, tc.expectedUpdatedAt, entity.UpdatedAt)
+			assert.Equal(t, tc.expectedCreatedBy, entity.CreatedBy)
+			assert.Equal(t, tc.expectedUpdatedBy, entity.UpdatedBy)
+			assert.Equal(t, tc.expectedSlug, entity.Slug)
+			assert.Equal(t, tc.expectedOrigin, entity.Origin)
+			assert.Equal(t, tc.expectedLabels, entity.Labels)
+			assert.Equal(t, tc.expectedMeta, entity.Meta)
+			assert.Equal(t, tc.expectedBody, entity.Body[:len(entity.Body)-1]) // remove trailing newline
+		})
+	}
+}
+
+func TestEntityToResource(t *testing.T) {
+	createdAt := metav1.Now()
+	createdAtStr := createdAt.UTC().Format(time.RFC3339)
+
+	updatedAt := createdAt.Add(time.Hour)
+	updatedAtStr := updatedAt.UTC().Format(time.RFC3339)
+
+	Scheme := runtime.NewScheme()
+	Scheme.AddKnownTypes(v0alpha1.PlaylistResourceInfo.GroupVersion(), &v0alpha1.Playlist{})
+	Codecs := serializer.NewCodecFactory(Scheme)
+
+	testCases := []struct {
+		entity                    *entityStore.Entity
+		codec                     runtime.Codec
+		expectedApiVersion        string
+		expectedCreationTimestamp metav1.Time
+		expectedLabels            map[string]string
+		expectedName              string
+		expectedResourceVersion   string
+		expectedUid               string
+		expectedTitle             string
+		expectedAnnotations       map[string]string
+		expectedSpec              any
+	}{
+		{
+			entity: &entityStore.Entity{
+				Key:             "/playlist.grafana.app/playlists/namespaces/default/test-uid",
+				GroupVersion:    "v0alpha1",
+				Name:            "test-uid",
+				Title:           "A playlist",
+				Guid:            "test-guid",
+				Folder:          "test-folder",
+				CreatedBy:       "test-created-by",
+				CreatedAt:       createdAt.UnixMilli(),
+				UpdatedAt:       updatedAt.UnixMilli(),
+				UpdatedBy:       "test-updated-by",
+				Slug:            "test-slug",
+				Origin:          &entityStore.EntityOriginInfo{},
+				Labels:          map[string]string{"label1": "value1", "label2": "value2"},
+				Meta:            []byte(fmt.Sprintf(`{"metadata":{"name":"test-name","uid":"test-uid","resourceVersion":"1","creationTimestamp":%q,"labels":{"label1":"value1","label2":"value2"},"annotations":{"grafana.app/createdBy":"test-created-by","grafana.app/folder":"test-folder","grafana.app/slug":"test-slug","grafana.app/updatedTimestamp":%q,"grafana.app/updatedBy":"test-updated-by"}}}`, createdAtStr, updatedAtStr)),
+				Body:            []byte(fmt.Sprintf(`{"kind":"Playlist","apiVersion":"playlist.grafana.app/v0alpha1","metadata":{"name":"test-name","uid":"test-uid","resourceVersion":"1","creationTimestamp":%q,"labels":{"label1":"value1","label2":"value2"},"annotations":{"grafana.app/createdBy":"test-created-by","grafana.app/folder":"test-folder","grafana.app/slug":"test-slug","grafana.app/updatedBy":"test-updated-by","grafana.app/updatedTimestamp":%q}},"spec":{"title":"A playlist","interval":"5m","items":[{"type":"dashboard_by_tag","value":"panel-tests"},{"type":"dashboard_by_uid","value":"vmie2cmWz"}]}}`, createdAtStr, updatedAtStr)),
+				ResourceVersion: 1,
+				Action:          entityStore.Entity_CREATED,
+			},
+			codec:                     runtime.Codec(nil),
+			expectedApiVersion:        "playlist.grafana.app/v0alpha1",
+			expectedCreationTimestamp: createdAt,
+			expectedLabels:            map[string]string{"label1": "value1", "label2": "value2"},
+			expectedName:              "test-uid",
+			expectedTitle:             "test-name",
+			expectedResourceVersion:   "1",
+			expectedUid:               "test-guid",
+			expectedAnnotations: map[string]string{
+				"grafana.app/action":           "CREATED",
+				"grafana.app/createdBy":        "test-created-by",
+				"grafana.app/folder":           "test-folder",
+				"grafana.app/slug":             "test-slug",
+				"grafana.app/updatedBy":        "test-updated-by",
+				"grafana.app/updatedTimestamp": updatedAtStr,
+			},
+			expectedSpec: v0alpha1.Spec{
+				Title:    "A playlist",
+				Interval: "5m",
+				Items: []v0alpha1.Item{
+					{Type: v0alpha1.ItemTypeDashboardByTag, Value: "panel-tests"},
+					{Type: v0alpha1.ItemTypeDashboardByUid, Value: "vmie2cmWz"},
+				},
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.entity.Key+" to resource conversion should succeed", func(t *testing.T) {
+			var p v0alpha1.Playlist
+			err := entityToResource(tc.entity, &p, Codecs.LegacyCodec(v0alpha1.PlaylistResourceInfo.GroupVersion()))
+			require.NoError(t, err)
+			assert.Equal(t, tc.expectedApiVersion, p.TypeMeta.APIVersion)
+			assert.Equal(t, tc.expectedCreationTimestamp.Unix(), p.ObjectMeta.CreationTimestamp.Unix())
+			assert.Equal(t, tc.expectedLabels, p.ObjectMeta.Labels)
+			assert.Equal(t, tc.expectedName, p.ObjectMeta.Name)
+			assert.Equal(t, tc.expectedResourceVersion, p.ObjectMeta.ResourceVersion)
+			assert.Equal(t, tc.expectedUid, string(p.ObjectMeta.UID))
+			assert.Equal(t, tc.expectedAnnotations, p.ObjectMeta.Annotations)
+			assert.Equal(t, tc.expectedSpec, p.Spec)
+		})
+	}
+}
diff --git a/pkg/services/apiserver/utils/clientConfig.go b/pkg/services/apiserver/utils/clientConfig.go
new file mode 100644
index 0000000000000..9714c9d2e1fff
--- /dev/null
+++ b/pkg/services/apiserver/utils/clientConfig.go
@@ -0,0 +1,35 @@
+package utils
+
+import (
+	clientrest "k8s.io/client-go/rest"
+	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
+)
+
+func FormatKubeConfig(restConfig *clientrest.Config) clientcmdapi.Config {
+	clusters := make(map[string]*clientcmdapi.Cluster)
+	clusters["default-cluster"] = &clientcmdapi.Cluster{
+		Server:                restConfig.Host,
+		InsecureSkipTLSVerify: true,
+	}
+
+	contexts := make(map[string]*clientcmdapi.Context)
+	contexts["default-context"] = &clientcmdapi.Context{
+		Cluster:   "default-cluster",
+		Namespace: "default",
+		AuthInfo:  "default",
+	}
+
+	authinfos := make(map[string]*clientcmdapi.AuthInfo)
+	authinfos["default"] = &clientcmdapi.AuthInfo{
+		Token: restConfig.BearerToken,
+	}
+
+	return clientcmdapi.Config{
+		Kind:           "Config",
+		APIVersion:     "v1",
+		Clusters:       clusters,
+		Contexts:       contexts,
+		CurrentContext: "default-context",
+		AuthInfos:      authinfos,
+	}
+}
diff --git a/pkg/services/apiserver/utils/meta.go b/pkg/services/apiserver/utils/meta.go
new file mode 100644
index 0000000000000..e2b7a6f8f2979
--- /dev/null
+++ b/pkg/services/apiserver/utils/meta.go
@@ -0,0 +1,278 @@
+package utils
+
+import (
+	"fmt"
+	"reflect"
+	"time"
+
+	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// Annotation keys
+
+const AnnoKeyCreatedBy = "grafana.app/createdBy"
+const AnnoKeyUpdatedTimestamp = "grafana.app/updatedTimestamp"
+const AnnoKeyUpdatedBy = "grafana.app/updatedBy"
+const AnnoKeyFolder = "grafana.app/folder"
+const AnnoKeySlug = "grafana.app/slug"
+const AnnoKeyAction = "grafana.app/action"
+
+// Identify where values came from
+
+const AnnoKeyOriginName = "grafana.app/originName"
+const AnnoKeyOriginPath = "grafana.app/originPath"
+const AnnoKeyOriginKey = "grafana.app/originKey"
+const AnnoKeyOriginTimestamp = "grafana.app/originTimestamp"
+
+// ResourceOriginInfo is saved in annotations.  This is used to identify where the resource came from
+// This object can model the same data as our existing provisioning table or a more general git sync
+type ResourceOriginInfo struct {
+	// Name of the origin/provisioning source
+	Name string `json:"name,omitempty"`
+
+	// The path within the named origin above (external_id in the existing dashboard provisioing)
+	Path string `json:"path,omitempty"`
+
+	// Verification/identification key (check_sum in existing dashboard provisioning)
+	Key string `json:"key,omitempty"`
+
+	// Origin modification timestamp when the resource was saved
+	// This will be before the resource updated time
+	Timestamp *time.Time `json:"time,omitempty"`
+
+	// Avoid extending
+	_ any `json:"-"`
+}
+
+// Accessor functions for k8s objects
+type GrafanaResourceMetaAccessor interface {
+	GetUpdatedTimestamp() (*time.Time, error)
+	SetUpdatedTimestamp(v *time.Time)
+	SetUpdatedTimestampMillis(unix int64)
+	GetCreatedBy() string
+	SetCreatedBy(user string)
+	GetUpdatedBy() string
+	SetUpdatedBy(user string)
+	GetFolder() string
+	SetFolder(uid string)
+	GetSlug() string
+	SetSlug(v string)
+	GetAction() string
+	SetAction(v string)
+
+	GetOriginInfo() (*ResourceOriginInfo, error)
+	SetOriginInfo(info *ResourceOriginInfo)
+	GetOriginName() string
+	GetOriginPath() string
+	GetOriginKey() string
+	GetOriginTimestamp() (*time.Time, error)
+
+	// Find a title in the object
+	// This will reflect the object and try to get:
+	//  * spec.title
+	//  * spec.name
+	//  * title
+	// and return an empty string if nothing was found
+	FindTitle(defaultTitle string) string
+}
+
+var _ GrafanaResourceMetaAccessor = (*grafanaResourceMetaAccessor)(nil)
+
+type grafanaResourceMetaAccessor struct {
+	raw interface{} // the original object (it implements metav1.Object)
+	obj metav1.Object
+}
+
+// Accessor takes an arbitrary object pointer and returns meta.Interface.
+// obj must be a pointer to an API type. An error is returned if the minimum
+// required fields are missing. Fields that are not required return the default
+// value and are a no-op if set.
+func MetaAccessor(raw interface{}) (GrafanaResourceMetaAccessor, error) {
+	obj, err := meta.Accessor(raw)
+	if err != nil {
+		return nil, err
+	}
+	return &grafanaResourceMetaAccessor{raw, obj}, nil
+}
+
+func (m *grafanaResourceMetaAccessor) set(key string, val string) {
+	anno := m.obj.GetAnnotations()
+	if val == "" {
+		if anno != nil {
+			delete(anno, key)
+		}
+	} else {
+		if anno == nil {
+			anno = make(map[string]string)
+		}
+		anno[key] = val
+	}
+	m.obj.SetAnnotations(anno)
+}
+
+func (m *grafanaResourceMetaAccessor) get(key string) string {
+	return m.obj.GetAnnotations()[key]
+}
+
+func (m *grafanaResourceMetaAccessor) GetUpdatedTimestamp() (*time.Time, error) {
+	v, ok := m.obj.GetAnnotations()[AnnoKeyUpdatedTimestamp]
+	if !ok || v == "" {
+		return nil, nil
+	}
+	t, err := time.Parse(time.RFC3339, v)
+	if err != nil {
+		return nil, fmt.Errorf("invalid updated timestamp: %s", err.Error())
+	}
+	return &t, nil
+}
+
+func (m *grafanaResourceMetaAccessor) SetUpdatedTimestampMillis(v int64) {
+	if v > 0 {
+		t := time.UnixMilli(v)
+		m.SetUpdatedTimestamp(&t)
+	} else {
+		m.set(AnnoKeyUpdatedTimestamp, "") // will clear the annotation
+	}
+}
+
+func (m *grafanaResourceMetaAccessor) SetUpdatedTimestamp(v *time.Time) {
+	txt := ""
+	if v != nil && v.Unix() != 0 {
+		txt = v.UTC().Format(time.RFC3339)
+	}
+	m.set(AnnoKeyUpdatedTimestamp, txt)
+}
+
+func (m *grafanaResourceMetaAccessor) GetCreatedBy() string {
+	return m.get(AnnoKeyCreatedBy)
+}
+
+func (m *grafanaResourceMetaAccessor) SetCreatedBy(user string) {
+	m.set(AnnoKeyCreatedBy, user)
+}
+
+func (m *grafanaResourceMetaAccessor) GetUpdatedBy() string {
+	return m.get(AnnoKeyUpdatedBy)
+}
+
+func (m *grafanaResourceMetaAccessor) SetUpdatedBy(user string) {
+	m.set(AnnoKeyUpdatedBy, user)
+}
+
+func (m *grafanaResourceMetaAccessor) GetFolder() string {
+	return m.get(AnnoKeyFolder)
+}
+
+func (m *grafanaResourceMetaAccessor) SetFolder(uid string) {
+	m.set(AnnoKeyFolder, uid)
+}
+
+func (m *grafanaResourceMetaAccessor) GetSlug() string {
+	return m.get(AnnoKeySlug)
+}
+
+func (m *grafanaResourceMetaAccessor) SetSlug(v string) {
+	m.set(AnnoKeySlug, v)
+}
+
+func (m *grafanaResourceMetaAccessor) GetAction() string {
+	return m.get(AnnoKeyAction)
+}
+
+func (m *grafanaResourceMetaAccessor) SetAction(v string) {
+	m.set(AnnoKeyAction, v)
+}
+
+func (m *grafanaResourceMetaAccessor) SetOriginInfo(info *ResourceOriginInfo) {
+	anno := m.obj.GetAnnotations()
+	if anno == nil {
+		if info == nil {
+			return
+		}
+		anno = make(map[string]string, 0)
+	}
+
+	delete(anno, AnnoKeyOriginName)
+	delete(anno, AnnoKeyOriginPath)
+	delete(anno, AnnoKeyOriginKey)
+	delete(anno, AnnoKeyOriginTimestamp)
+	if info != nil && info.Name != "" {
+		anno[AnnoKeyOriginName] = info.Name
+		if info.Path != "" {
+			anno[AnnoKeyOriginPath] = info.Path
+		}
+		if info.Key != "" {
+			anno[AnnoKeyOriginKey] = info.Key
+		}
+		if info.Timestamp != nil {
+			anno[AnnoKeyOriginTimestamp] = info.Timestamp.Format(time.RFC3339)
+		}
+	}
+	m.obj.SetAnnotations(anno)
+}
+
+func (m *grafanaResourceMetaAccessor) GetOriginInfo() (*ResourceOriginInfo, error) {
+	v, ok := m.obj.GetAnnotations()[AnnoKeyOriginName]
+	if !ok {
+		return nil, nil
+	}
+	t, err := m.GetOriginTimestamp()
+	return &ResourceOriginInfo{
+		Name:      v,
+		Path:      m.GetOriginPath(),
+		Key:       m.GetOriginKey(),
+		Timestamp: t,
+	}, err
+}
+
+func (m *grafanaResourceMetaAccessor) GetOriginName() string {
+	return m.get(AnnoKeyOriginName)
+}
+
+func (m *grafanaResourceMetaAccessor) GetOriginPath() string {
+	return m.get(AnnoKeyOriginPath)
+}
+
+func (m *grafanaResourceMetaAccessor) GetOriginKey() string {
+	return m.get(AnnoKeyOriginKey)
+}
+
+func (m *grafanaResourceMetaAccessor) GetOriginTimestamp() (*time.Time, error) {
+	v, ok := m.obj.GetAnnotations()[AnnoKeyOriginTimestamp]
+	if !ok || v == "" {
+		return nil, nil
+	}
+	t, err := time.Parse(time.RFC3339, v)
+	if err != nil {
+		return nil, fmt.Errorf("invalid origin timestamp: %s", err.Error())
+	}
+	return &t, nil
+}
+
+func (m *grafanaResourceMetaAccessor) FindTitle(defaultTitle string) string {
+	// look for Spec.Title or Spec.Name
+	r := reflect.ValueOf(m.raw)
+	if r.Kind() == reflect.Ptr || r.Kind() == reflect.Interface {
+		r = r.Elem()
+	}
+	if r.Kind() == reflect.Struct {
+		spec := r.FieldByName("Spec")
+		if spec.Kind() == reflect.Struct {
+			title := spec.FieldByName("Title")
+			if title.IsValid() && title.Kind() == reflect.String {
+				return title.String()
+			}
+			name := spec.FieldByName("Name")
+			if name.IsValid() && name.Kind() == reflect.String {
+				return name.String()
+			}
+		}
+
+		title := r.FieldByName("Title")
+		if title.IsValid() && title.Kind() == reflect.String {
+			return title.String()
+		}
+	}
+	return defaultTitle
+}
diff --git a/pkg/services/apiserver/utils/meta_test.go b/pkg/services/apiserver/utils/meta_test.go
new file mode 100644
index 0000000000000..e8555bdff6ec7
--- /dev/null
+++ b/pkg/services/apiserver/utils/meta_test.go
@@ -0,0 +1,208 @@
+package utils_test
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+
+	"github.com/grafana/grafana/pkg/services/apiserver/utils"
+)
+
+type TestResource struct {
+	metav1.TypeMeta `json:",inline"`
+	// Standard object's metadata
+	// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
+	// +optional
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec Spec `json:"spec,omitempty"`
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *TestResource) DeepCopyInto(out *TestResource) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Playlist.
+func (in *TestResource) DeepCopy() *TestResource {
+	if in == nil {
+		return nil
+	}
+	out := new(TestResource)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *TestResource) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// Spec defines model for Spec.
+type Spec struct {
+	// Name of the object.
+	Title string `json:"title"`
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Spec) DeepCopyInto(out *Spec) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Spec.
+func (in *Spec) DeepCopy() *Spec {
+	if in == nil {
+		return nil
+	}
+	out := new(Spec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+type TestResource2 struct {
+	metav1.TypeMeta `json:",inline"`
+	// Standard object's metadata
+	// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
+	// +optional
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec Spec2 `json:"spec,omitempty"`
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *TestResource2) DeepCopyInto(out *TestResource2) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Playlist.
+func (in *TestResource2) DeepCopy() *TestResource2 {
+	if in == nil {
+		return nil
+	}
+	out := new(TestResource2)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *TestResource2) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// Spec defines model for Spec.
+type Spec2 struct{}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Spec2) DeepCopyInto(out *Spec2) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Spec.
+func (in *Spec2) DeepCopy() *Spec2 {
+	if in == nil {
+		return nil
+	}
+	out := new(Spec2)
+	in.DeepCopyInto(out)
+	return out
+}
+
+func TestMetaAccessor(t *testing.T) {
+	originInfo := &utils.ResourceOriginInfo{
+		Name: "test",
+		Path: "a/b/c",
+		Key:  "kkk",
+	}
+
+	t.Run("fails for non resource objects", func(t *testing.T) {
+		_, err := utils.MetaAccessor("hello")
+		require.Error(t, err)
+
+		_, err = utils.MetaAccessor(unstructured.Unstructured{})
+		require.Error(t, err) // Not a pointer!
+
+		_, err = utils.MetaAccessor(&unstructured.Unstructured{})
+		require.NoError(t, err) // Must be a pointer
+
+		_, err = utils.MetaAccessor(&TestResource{
+			Spec: Spec{
+				Title: "HELLO",
+			},
+		})
+		require.NoError(t, err) // Must be a pointer
+	})
+
+	t.Run("get and set grafana metadata", func(t *testing.T) {
+		res := &unstructured.Unstructured{}
+		meta, err := utils.MetaAccessor(res)
+		require.NoError(t, err)
+
+		meta.SetOriginInfo(originInfo)
+		meta.SetFolder("folderUID")
+
+		require.Equal(t, map[string]string{
+			"grafana.app/originName": "test",
+			"grafana.app/originPath": "a/b/c",
+			"grafana.app/originKey":  "kkk",
+			"grafana.app/folder":     "folderUID",
+		}, res.GetAnnotations())
+	})
+
+	t.Run("find titles", func(t *testing.T) {
+		// with a k8s object that has Spec.Title
+		obj := &TestResource{
+			Spec: Spec{
+				Title: "HELLO",
+			},
+		}
+
+		meta, err := utils.MetaAccessor(obj)
+		require.NoError(t, err)
+		meta.SetOriginInfo(originInfo)
+		meta.SetFolder("folderUID")
+
+		require.Equal(t, map[string]string{
+			"grafana.app/originName": "test",
+			"grafana.app/originPath": "a/b/c",
+			"grafana.app/originKey":  "kkk",
+			"grafana.app/folder":     "folderUID",
+		}, obj.GetAnnotations())
+
+		require.Equal(t, "HELLO", obj.Spec.Title)
+		require.Equal(t, "HELLO", meta.FindTitle(""))
+		obj.Spec.Title = ""
+		require.Equal(t, "", meta.FindTitle("xxx"))
+
+		// with a k8s object without Spec.Title
+		obj2 := &TestResource2{}
+
+		meta, err = utils.MetaAccessor(obj2)
+		require.NoError(t, err)
+		meta.SetOriginInfo(originInfo)
+		meta.SetFolder("folderUID")
+
+		require.Equal(t, map[string]string{
+			"grafana.app/originName": "test",
+			"grafana.app/originPath": "a/b/c",
+			"grafana.app/originKey":  "kkk",
+			"grafana.app/folder":     "folderUID",
+		}, obj2.GetAnnotations())
+
+		require.Equal(t, "xxx", meta.FindTitle("xxx"))
+	})
+}
diff --git a/pkg/services/grafana-apiserver/utils/tableConverter.go b/pkg/services/apiserver/utils/tableConverter.go
similarity index 78%
rename from pkg/services/grafana-apiserver/utils/tableConverter.go
rename to pkg/services/apiserver/utils/tableConverter.go
index e4cc54823a63f..755dc8f74f468 100644
--- a/pkg/services/grafana-apiserver/utils/tableConverter.go
+++ b/pkg/services/apiserver/utils/tableConverter.go
@@ -4,6 +4,8 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"reflect"
+	"time"
 
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -17,10 +19,10 @@ import (
 type customTableConvertor struct {
 	gr      schema.GroupResource
 	columns []metav1.TableColumnDefinition
-	reader  func(obj runtime.Object) ([]interface{}, error)
+	reader  func(obj any) ([]interface{}, error)
 }
 
-func NewTableConverter(gr schema.GroupResource, columns []metav1.TableColumnDefinition, reader func(obj runtime.Object) ([]interface{}, error)) rest.TableConvertor {
+func NewTableConverter(gr schema.GroupResource, columns []metav1.TableColumnDefinition, reader func(obj any) ([]interface{}, error)) rest.TableConvertor {
 	converter := customTableConvertor{
 		gr:      gr,
 		columns: columns,
@@ -40,6 +42,38 @@ func NewTableConverter(gr schema.GroupResource, columns []metav1.TableColumnDefi
 	return converter
 }
 
+func NewDefaultTableConverter(gr schema.GroupResource) rest.TableConvertor {
+	return NewTableConverter(gr,
+		[]metav1.TableColumnDefinition{
+			{Name: "Name", Type: "string", Format: "name"},
+			{Name: "Created At", Type: "date"},
+		},
+		func(obj any) ([]interface{}, error) {
+			v, err := meta.Accessor(obj)
+			if err == nil && v != nil {
+				return []interface{}{
+					v.GetName(),
+					v.GetCreationTimestamp().UTC().Format(time.RFC3339),
+				}, nil
+			}
+
+			r := reflect.ValueOf(obj).Elem()
+			n := r.FieldByName("Name").String()
+			if n != "" {
+				return []interface{}{
+					n,
+					"",
+				}, nil
+			}
+
+			return []interface{}{
+				fmt.Sprintf("%v", obj),
+				"",
+			}, nil
+		},
+	)
+}
+
 var _ rest.TableConvertor = &customTableConvertor{}
 var swaggerMetadataDescriptions = metav1.ObjectMeta{}.SwaggerDoc()
 
diff --git a/pkg/services/grafana-apiserver/utils/tableConverter_test.go b/pkg/services/apiserver/utils/tableConverter_test.go
similarity index 79%
rename from pkg/services/grafana-apiserver/utils/tableConverter_test.go
rename to pkg/services/apiserver/utils/tableConverter_test.go
index 13bb62a71d887..7c7618d4f0d1b 100644
--- a/pkg/services/grafana-apiserver/utils/tableConverter_test.go
+++ b/pkg/services/apiserver/utils/tableConverter_test.go
@@ -7,11 +7,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/grafana/grafana/pkg/services/grafana-apiserver/utils"
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	"github.com/grafana/grafana/pkg/services/apiserver/utils"
 )
 
 func TestTableConverter(t *testing.T) {
@@ -23,7 +23,7 @@ func TestTableConverter(t *testing.T) {
 			{Name: "Dummy", Type: "string", Format: "string", Description: "Something here"},
 			{Name: "Created At", Type: "date"},
 		},
-		func(obj runtime.Object) ([]interface{}, error) {
+		func(obj any) ([]interface{}, error) {
 			m, ok := obj.(*metav1.APIGroup)
 			if !ok {
 				return nil, fmt.Errorf("expected status")
@@ -94,4 +94,31 @@ func TestTableConverter(t *testing.T) {
 	require.Error(t, err)
 	require.Nil(t, table)
 	require.Equal(t, "the resource y.x does not support being converted to a Table", err.Error())
+
+	// Default table converter
+	// Convert a single table
+	converter = utils.NewDefaultTableConverter(schema.GroupResource{Group: "x", Resource: "y"})
+	table, err = converter.ConvertToTable(context.Background(), &metav1.APIGroup{
+		Name: "hello",
+	}, nil)
+	require.NoError(t, err)
+	out, err = json.MarshalIndent(table.Rows, "", "  ")
+	require.NoError(t, err)
+	//fmt.Printf("%s", string(out))
+	require.JSONEq(t, `[
+		{
+		  "cells": [
+			"hello",
+			""
+		  ],
+		  "object": {
+			"name": "hello",
+			"versions": null,
+			"preferredVersion": {
+			  "groupVersion": "",
+			  "version": ""
+			}
+		  }
+		}
+	  ]`, string(out))
 }
diff --git a/pkg/services/apiserver/utils/uids.go b/pkg/services/apiserver/utils/uids.go
new file mode 100644
index 0000000000000..b9f812ae3cd2b
--- /dev/null
+++ b/pkg/services/apiserver/utils/uids.go
@@ -0,0 +1,37 @@
+package utils
+
+import (
+	"crypto/sha256"
+	"encoding/base64"
+	"strings"
+	"unicode"
+
+	"k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+)
+
+// Create a stable UID that will be unique across a multi-tenant cluster
+// This is useful while we migrate from SQL storage to something where the UID (GUID)
+// is actually baked into the storage engine itself.
+func CalculateClusterWideUID(obj runtime.Object) types.UID {
+	gvk := obj.GetObjectKind().GroupVersionKind()
+	hasher := sha256.New()
+	hasher.Write([]byte(gvk.Group))
+	hasher.Write([]byte("|"))
+	hasher.Write([]byte(gvk.Kind))
+	hasher.Write([]byte("|"))
+	meta, err := meta.Accessor(obj)
+	if err == nil {
+		hasher.Write([]byte(meta.GetNamespace()))
+		hasher.Write([]byte("|"))
+		hasher.Write([]byte(meta.GetName()))
+	}
+	v := base64.URLEncoding.EncodeToString(hasher.Sum(nil))
+	return types.UID(strings.Map(func(r rune) rune {
+		if !(unicode.IsLetter(r) || unicode.IsDigit(r)) {
+			return 'X'
+		}
+		return r
+	}, v))
+}
diff --git a/pkg/services/apiserver/wireset.go b/pkg/services/apiserver/wireset.go
new file mode 100644
index 0000000000000..f8e840e424bc6
--- /dev/null
+++ b/pkg/services/apiserver/wireset.go
@@ -0,0 +1,15 @@
+package apiserver
+
+import (
+	"github.com/google/wire"
+
+	"github.com/grafana/grafana/pkg/apiserver/builder"
+)
+
+var WireSet = wire.NewSet(
+	ProvideService,
+	wire.Bind(new(RestConfigProvider), new(*service)),
+	wire.Bind(new(Service), new(*service)),
+	wire.Bind(new(DirectRestConfigProvider), new(*service)),
+	wire.Bind(new(builder.APIRegistrar), new(*service)),
+)
diff --git a/pkg/services/auth/authimpl/auth_token.go b/pkg/services/auth/authimpl/auth_token.go
index 837ee5925b06b..2b28327e6d546 100644
--- a/pkg/services/auth/authimpl/auth_token.go
+++ b/pkg/services/auth/authimpl/auth_token.go
@@ -66,7 +66,7 @@ type UserAuthTokenService struct {
 }
 
 func (s *UserAuthTokenService) CreateToken(ctx context.Context, user *user.User, clientIP net.IP, userAgent string) (*auth.UserToken, error) {
-	token, hashedToken, err := generateAndHashToken()
+	token, hashedToken, err := generateAndHashToken(s.cfg.SecretKey)
 	if err != nil {
 		return nil, err
 	}
@@ -103,7 +103,7 @@ func (s *UserAuthTokenService) CreateToken(ctx context.Context, user *user.User,
 	userAuthToken.UnhashedToken = token
 
 	ctxLogger := s.log.FromContext(ctx)
-	ctxLogger.Debug("User auth token created", "tokenId", userAuthToken.Id, "userId", userAuthToken.UserId, "clientIP", userAuthToken.ClientIp, "userAgent", userAuthToken.UserAgent, "authToken", userAuthToken.AuthToken)
+	ctxLogger.Debug("User auth token created", "tokenID", userAuthToken.Id, "userID", userAuthToken.UserId, "clientIP", userAuthToken.ClientIp, "userAgent", userAuthToken.UserAgent, "authToken", userAuthToken.AuthToken)
 
 	var userToken auth.UserToken
 	err = userAuthToken.toUserToken(&userToken)
@@ -112,7 +112,7 @@ func (s *UserAuthTokenService) CreateToken(ctx context.Context, user *user.User,
 }
 
 func (s *UserAuthTokenService) LookupToken(ctx context.Context, unhashedToken string) (*auth.UserToken, error) {
-	hashedToken := hashToken(unhashedToken)
+	hashedToken := hashToken(s.cfg.SecretKey, unhashedToken)
 	var model userAuthToken
 	var exists bool
 	var err error
@@ -135,7 +135,7 @@ func (s *UserAuthTokenService) LookupToken(ctx context.Context, unhashedToken st
 	ctxLogger := s.log.FromContext(ctx)
 
 	if model.RevokedAt > 0 {
-		ctxLogger.Debug("User token has been revoked", "user ID", model.UserId, "token ID", model.Id)
+		ctxLogger.Debug("User token has been revoked", "userID", model.UserId, "tokenID", model.Id, "revokedAt", model.RevokedAt)
 		return nil, &auth.TokenRevokedError{
 			UserID:  model.UserId,
 			TokenID: model.Id,
@@ -143,7 +143,7 @@ func (s *UserAuthTokenService) LookupToken(ctx context.Context, unhashedToken st
 	}
 
 	if model.CreatedAt <= s.createdAfterParam() || model.RotatedAt <= s.rotatedAfterParam() {
-		ctxLogger.Debug("User token has expired", "user ID", model.UserId, "token ID", model.Id)
+		ctxLogger.Debug("User token has expired", "userID", model.UserId, "tokenID", model.Id, "createdAt", model.CreatedAt, "rotatedAt", model.RotatedAt)
 		return nil, &auth.TokenExpiredError{
 			UserID:  model.UserId,
 			TokenID: model.Id,
@@ -171,9 +171,9 @@ func (s *UserAuthTokenService) LookupToken(ctx context.Context, unhashedToken st
 		}
 
 		if affectedRows == 0 {
-			ctxLogger.Debug("Prev seen token unchanged", "tokenId", model.Id, "userId", model.UserId, "clientIP", model.ClientIp, "userAgent", model.UserAgent, "authToken", model.AuthToken)
+			ctxLogger.Debug("Prev seen token unchanged", "tokenID", model.Id, "userID", model.UserId, "clientIP", model.ClientIp, "userAgent", model.UserAgent, "authToken", model.AuthToken)
 		} else {
-			ctxLogger.Debug("Prev seen token", "tokenId", model.Id, "userId", model.UserId, "clientIP", model.ClientIp, "userAgent", model.UserAgent, "authToken", model.AuthToken)
+			ctxLogger.Debug("Prev seen token", "tokenID", model.Id, "userID", model.UserId, "clientIP", model.ClientIp, "userAgent", model.UserAgent, "authToken", model.AuthToken)
 		}
 	}
 
@@ -197,9 +197,9 @@ func (s *UserAuthTokenService) LookupToken(ctx context.Context, unhashedToken st
 		}
 
 		if affectedRows == 0 {
-			ctxLogger.Debug("Seen wrong token", "tokenId", model.Id, "userId", model.UserId, "clientIP", model.ClientIp, "userAgent", model.UserAgent, "authToken", model.AuthToken)
+			ctxLogger.Debug("Seen wrong token", "tokenID", model.Id, "userID", model.UserId, "clientIP", model.ClientIp, "userAgent", model.UserAgent, "authToken", model.AuthToken)
 		} else {
-			ctxLogger.Debug("Seen token", "tokenId", model.Id, "userId", model.UserId, "clientIP", model.ClientIp, "userAgent", model.UserAgent, "authToken", model.AuthToken)
+			ctxLogger.Debug("Seen token", "tokenID", model.Id, "userID", model.UserId, "clientIP", model.ClientIp, "userAgent", model.UserAgent, "authToken", model.AuthToken)
 		}
 	}
 
@@ -221,6 +221,7 @@ func (s *UserAuthTokenService) RotateToken(ctx context.Context, cmd auth.RotateC
 		if err != nil {
 			return nil, err
 		}
+		s.log.FromContext(ctx).Debug("Rotating token", "tokenID", token.Id, "userID", token.UserId, "createdAt", token.CreatedAt, "rotatedAt", token.RotatedAt)
 
 		newToken, err := s.rotateToken(ctx, token, cmd.IP, cmd.UserAgent)
 
@@ -248,7 +249,7 @@ func (s *UserAuthTokenService) rotateToken(ctx context.Context, token *auth.User
 		clientIPStr = clientIP.String()
 	}
 
-	newToken, hashedToken, err := generateAndHashToken()
+	newToken, hashedToken, err := generateAndHashToken(s.cfg.SecretKey)
 	if err != nil {
 		return nil, err
 	}
@@ -327,7 +328,7 @@ func (s *UserAuthTokenService) TryRotateToken(ctx context.Context, token *auth.U
 		}
 
 		ctxLogger := s.log.FromContext(ctx)
-		ctxLogger.Debug("Token needs rotation", "tokenId", model.Id, "authTokenSeen", model.AuthTokenSeen, "rotatedAt", rotatedAt)
+		ctxLogger.Debug("Token needs rotation", "tokenID", model.Id, "authTokenSeen", model.AuthTokenSeen, "rotatedAt", rotatedAt)
 
 		clientIPStr := clientIP.String()
 		if len(clientIP) == 0 {
@@ -337,7 +338,7 @@ func (s *UserAuthTokenService) TryRotateToken(ctx context.Context, token *auth.U
 		if err != nil {
 			return nil, err
 		}
-		hashedToken := hashToken(newToken)
+		hashedToken := hashToken(s.cfg.SecretKey, newToken)
 
 		// very important that auth_token_seen is set after the prev_auth_token = case when ... for mysql to function correctly
 		sql := `
@@ -370,7 +371,7 @@ func (s *UserAuthTokenService) TryRotateToken(ctx context.Context, token *auth.U
 		}
 
 		if affected > 0 {
-			ctxLogger.Debug("Auth token rotated", "affected", affected, "auth_token_id", model.Id, "userId", model.UserId)
+			ctxLogger.Debug("Auth token rotated", "affected", affected, "tokenID", model.Id, "userID", model.UserId)
 			model.UnhashedToken = newToken
 			var result auth.UserToken
 			if err := model.toUserToken(&result); err != nil {
@@ -426,11 +427,11 @@ func (s *UserAuthTokenService) RevokeToken(ctx context.Context, token *auth.User
 	ctxLogger := s.log.FromContext(ctx)
 
 	if rowsAffected == 0 {
-		ctxLogger.Debug("User auth token not found/revoked", "tokenId", model.Id, "userId", model.UserId, "clientIP", model.ClientIp, "userAgent", model.UserAgent)
+		ctxLogger.Debug("User auth token not found/revoked", "tokenID", model.Id, "userID", model.UserId, "clientIP", model.ClientIp, "userAgent", model.UserAgent)
 		return auth.ErrUserTokenNotFound
 	}
 
-	ctxLogger.Debug("User auth token revoked", "tokenId", model.Id, "userId", model.UserId, "clientIP", model.ClientIp, "userAgent", model.UserAgent, "soft", soft)
+	ctxLogger.Debug("User auth token revoked", "tokenID", model.Id, "userID", model.UserId, "clientIP", model.ClientIp, "userAgent", model.UserAgent, "soft", soft)
 
 	return nil
 }
@@ -448,7 +449,7 @@ func (s *UserAuthTokenService) RevokeAllUserTokens(ctx context.Context, userId i
 			return err
 		}
 
-		s.log.FromContext(ctx).Debug("All user tokens for user revoked", "userId", userId, "count", affected)
+		s.log.FromContext(ctx).Debug("All user tokens for user revoked", "userID", userId, "count", affected)
 
 		return err
 	})
@@ -564,7 +565,7 @@ func (s *UserAuthTokenService) DeleteUserRevokedTokens(ctx context.Context, user
 			return err
 		}
 
-		s.log.FromContext(ctx).Debug("Deleted user revoked tokens", "userId", userID, "count", rows)
+		s.log.FromContext(ctx).Debug("Deleted user revoked tokens", "userID", userID, "count", rows)
 		return err
 	})
 }
@@ -626,18 +627,18 @@ func createToken() (string, error) {
 	return token, nil
 }
 
-func hashToken(token string) string {
-	hashBytes := sha256.Sum256([]byte(token + setting.SecretKey))
+func hashToken(secretKey string, token string) string {
+	hashBytes := sha256.Sum256([]byte(token + secretKey))
 	return hex.EncodeToString(hashBytes[:])
 }
 
-func generateAndHashToken() (string, string, error) {
+func generateAndHashToken(secretKey string) (string, string, error) {
 	token, err := createToken()
 	if err != nil {
 		return "", "", err
 	}
 
-	return token, hashToken(token), nil
+	return token, hashToken(secretKey, token), nil
 }
 
 func readQuotaConfig(cfg *setting.Cfg) (*quota.Map, error) {
diff --git a/pkg/services/auth/authimpl/auth_token_test.go b/pkg/services/auth/authimpl/auth_token_test.go
index 6c3db6c8bc492..b0a8beb94f151 100644
--- a/pkg/services/auth/authimpl/auth_token_test.go
+++ b/pkg/services/auth/authimpl/auth_token_test.go
@@ -19,8 +19,13 @@ import (
 	"github.com/grafana/grafana/pkg/services/quota"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationUserAuthToken(t *testing.T) {
 	ctx := createTestContext(t)
 	usr := &user.User{ID: int64(10)}
@@ -479,14 +484,14 @@ func TestIntegrationUserAuthToken(t *testing.T) {
 			token, err = ctx.tokenService.RotateToken(context.Background(), auth.RotateCommand{UnHashedToken: token.UnhashedToken})
 			require.NoError(t, err)
 			assert.True(t, token.UnhashedToken != prev)
-			assert.True(t, token.PrevAuthToken == hashToken(prev))
+			assert.True(t, token.PrevAuthToken == hashToken("", prev))
 		})
 
 		t.Run("should rotate token when called with previous", func(t *testing.T) {
 			newPrev := token.UnhashedToken
 			token, err = ctx.tokenService.RotateToken(context.Background(), auth.RotateCommand{UnHashedToken: prev})
 			require.NoError(t, err)
-			assert.True(t, token.PrevAuthToken == hashToken(newPrev))
+			assert.True(t, token.PrevAuthToken == hashToken("", newPrev))
 		})
 
 		t.Run("should not rotate token when called with old previous", func(t *testing.T) {
diff --git a/pkg/services/auth/id.go b/pkg/services/auth/id.go
index 33d505b23f7a6..06d302d0f1567 100644
--- a/pkg/services/auth/id.go
+++ b/pkg/services/auth/id.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/go-jose/go-jose/v3/jwt"
+
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 )
 
@@ -18,4 +19,5 @@ type IDSigner interface {
 
 type IDClaims struct {
 	jwt.Claims
+	AuthenticatedBy string `json:"authenticatedBy,omitempty"`
 }
diff --git a/pkg/services/auth/identity/requester.go b/pkg/services/auth/identity/requester.go
index 1eb72bb5a9031..a33544a70d2d1 100644
--- a/pkg/services/auth/identity/requester.go
+++ b/pkg/services/auth/identity/requester.go
@@ -20,6 +20,11 @@ var ErrNotIntIdentifier = errors.New("identifier is not an int64")
 var ErrIdentifierNotInitialized = errors.New("identifier is not initialized")
 
 type Requester interface {
+	// GetID returns namespaced id for the entity
+	GetID() string
+	// GetNamespacedID returns the namespace and ID of the active entity.
+	// The namespace is one of the constants defined in pkg/services/auth/identity.
+	GetNamespacedID() (namespace string, identifier string)
 	// GetDisplayName returns the display name of the active entity.
 	// The display name is the name if it is set, otherwise the login or email.
 	GetDisplayName() string
@@ -31,21 +36,22 @@ type Requester interface {
 	// GetLogin returns the login of the active entity
 	// Can be empty.
 	GetLogin() string
-	// GetNamespacedID returns the namespace and ID of the active entity.
-	// The namespace is one of the constants defined in pkg/services/auth/identity.
-	GetNamespacedID() (namespace string, identifier string)
 	// GetOrgID returns the ID of the active organization
 	GetOrgID() int64
 	// GetOrgRole returns the role of the active entity in the active organization.
 	GetOrgRole() roletype.RoleType
 	// GetPermissions returns the permissions of the active entity.
 	GetPermissions() map[string][]string
+	// GetGlobalPermissions returns the permissions of the active entity that are available across all organizations.
+	GetGlobalPermissions() map[string][]string
 	// DEPRECATED: GetTeams returns the teams the entity is a member of.
 	// Retrieve the teams from the team service instead of using this method.
 	GetTeams() []int64
 	// DEPRECATED: GetOrgName returns the name of the active organization.
 	// Retrieve the organization name from the organization service instead of using this method.
 	GetOrgName() string
+	// IsAuthenticatedBy returns true if entity was authenticated by any of supplied providers.
+	IsAuthenticatedBy(providers ...string) bool
 
 	// IsNil returns true if the identity is nil
 	// FIXME: remove this method once all services are using an interface
@@ -67,12 +73,22 @@ type Requester interface {
 	GetIDToken() string
 }
 
+// IsNamespace returns true if namespace matches any expected namespace
+func IsNamespace(namespace string, expected ...string) bool {
+	for _, e := range expected {
+		if namespace == e {
+			return true
+		}
+	}
+
+	return false
+}
+
 // IntIdentifier converts a string identifier to an int64.
 // Applicable for users, service accounts, api keys and renderer service.
 // Errors if the identifier is not initialized or if namespace is not recognized.
 func IntIdentifier(namespace, identifier string) (int64, error) {
-	switch namespace {
-	case NamespaceUser, NamespaceAPIKey, NamespaceServiceAccount, NamespaceRenderService:
+	if IsNamespace(namespace, NamespaceUser, NamespaceAPIKey, NamespaceServiceAccount, NamespaceRenderService) {
 		id, err := strconv.ParseInt(identifier, 10, 64)
 		if err != nil {
 			return 0, fmt.Errorf("unrecognized format for valid namespace %s: %w", namespace, err)
@@ -98,8 +114,7 @@ func UserIdentifier(namespace, identifier string) (int64, error) {
 		return 0, nil
 	}
 
-	switch namespace {
-	case NamespaceUser, NamespaceServiceAccount:
+	if IsNamespace(namespace, NamespaceUser, NamespaceServiceAccount) {
 		return userID, nil
 	}
 
diff --git a/pkg/services/auth/idimpl/service.go b/pkg/services/auth/idimpl/service.go
index 92074df5c3350..48eac95a9556e 100644
--- a/pkg/services/auth/idimpl/service.go
+++ b/pkg/services/auth/idimpl/service.go
@@ -2,7 +2,9 @@ package idimpl
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"strconv"
 	"time"
 
 	"github.com/go-jose/go-jose/v3/jwt"
@@ -15,24 +17,31 @@ import (
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/authn"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/login"
+	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
 const (
 	cachePrefix = "id-token"
-	tokenTTL    = 1 * time.Hour
-	cacheTTL    = 58 * time.Minute
+	tokenTTL    = 10 * time.Minute
+	cacheLeeway = 30 * time.Second
 )
 
 var _ auth.IDService = (*Service)(nil)
 
 func ProvideService(
 	cfg *setting.Cfg, signer auth.IDSigner, cache remotecache.CacheStorage,
-	features featuremgmt.FeatureToggles, authnService authn.Service, reg prometheus.Registerer,
+	features featuremgmt.FeatureToggles, authnService authn.Service,
+	authInfoService login.AuthInfoService, reg prometheus.Registerer,
 ) *Service {
-	s := &Service{cfg: cfg, logger: log.New("id-service"), signer: signer, cache: cache, metrics: newMetrics(reg)}
+	s := &Service{
+		cfg: cfg, logger: log.New("id-service"),
+		signer: signer, cache: cache,
+		authInfoService: authInfoService, metrics: newMetrics(reg),
+	}
 
-	if features.IsEnabled(featuremgmt.FlagIdForwarding) {
+	if features.IsEnabledGlobally(featuremgmt.FlagIdForwarding) {
 		authnService.RegisterPostAuthHook(s.hook, 140)
 	}
 
@@ -40,12 +49,13 @@ func ProvideService(
 }
 
 type Service struct {
-	cfg     *setting.Cfg
-	logger  log.Logger
-	signer  auth.IDSigner
-	cache   remotecache.CacheStorage
-	si      singleflight.Group
-	metrics *metrics
+	cfg             *setting.Cfg
+	logger          log.Logger
+	signer          auth.IDSigner
+	cache           remotecache.CacheStorage
+	authInfoService login.AuthInfoService
+	si              singleflight.Group
+	metrics         *metrics
 }
 
 func (s *Service) SignIdentity(ctx context.Context, id identity.Requester) (string, error) {
@@ -61,15 +71,15 @@ func (s *Service) SignIdentity(ctx context.Context, id identity.Requester) (stri
 		cachedToken, err := s.cache.Get(ctx, cacheKey)
 		if err == nil {
 			s.metrics.tokenSigningFromCacheCounter.Inc()
-			s.logger.Debug("Cached token found", "namespace", namespace, "id", identifier)
+			s.logger.FromContext(ctx).Debug("Cached token found", "namespace", namespace, "id", identifier)
 			return string(cachedToken), nil
 		}
 
 		s.metrics.tokenSigningCounter.Inc()
-		s.logger.Debug("Sign new id token", "namespace", namespace, "id", identifier)
+		s.logger.FromContext(ctx).Debug("Sign new id token", "namespace", namespace, "id", identifier)
 
 		now := time.Now()
-		token, err := s.signer.SignIDToken(ctx, &auth.IDClaims{
+		claims := &auth.IDClaims{
 			Claims: jwt.Claims{
 				Issuer:   s.cfg.AppURL,
 				Audience: getAudience(id.GetOrgID()),
@@ -77,15 +87,37 @@ func (s *Service) SignIdentity(ctx context.Context, id identity.Requester) (stri
 				Expiry:   jwt.NewNumericDate(now.Add(tokenTTL)),
 				IssuedAt: jwt.NewNumericDate(now),
 			},
-		})
+		}
+
+		if identity.IsNamespace(namespace, identity.NamespaceUser) {
+			if err := s.setUserClaims(ctx, identifier, claims); err != nil {
+				return "", err
+			}
+		}
+
+		token, err := s.signer.SignIDToken(ctx, claims)
+		if err != nil {
+			s.metrics.failedTokenSigningCounter.Inc()
+			return "", err
+		}
 
+		parsed, err := jwt.ParseSigned(token)
 		if err != nil {
 			s.metrics.failedTokenSigningCounter.Inc()
 			return "", err
 		}
 
-		if err := s.cache.Set(ctx, cacheKey, []byte(token), cacheTTL); err != nil {
-			s.logger.Error("Failed to add id token to cache", "error", err)
+		extracted := auth.IDClaims{}
+		// We don't need to verify the signature here, we are only intrested in checking
+		// when the token expires.
+		if err := parsed.UnsafeClaimsWithoutVerification(&extracted); err != nil {
+			s.metrics.failedTokenSigningCounter.Inc()
+			return "", err
+		}
+
+		expires := time.Until(extracted.Expiry.Time())
+		if err := s.cache.Set(ctx, cacheKey, []byte(token), expires-cacheLeeway); err != nil {
+			s.logger.FromContext(ctx).Error("Failed to add id token to cache", "error", err)
 		}
 
 		return token, nil
@@ -98,12 +130,39 @@ func (s *Service) SignIdentity(ctx context.Context, id identity.Requester) (stri
 	return result.(string), nil
 }
 
+func (s *Service) setUserClaims(ctx context.Context, identifier string, claims *auth.IDClaims) error {
+	id, err := strconv.ParseInt(identifier, 10, 64)
+	if err != nil {
+		return err
+	}
+
+	if id == 0 {
+		return nil
+	}
+
+	info, err := s.authInfoService.GetAuthInfo(ctx, &login.GetAuthInfoQuery{UserId: id})
+	if err != nil {
+		// we ignore errors when a user don't have external user auth
+		if !errors.Is(err, user.ErrUserNotFound) {
+			s.logger.FromContext(ctx).Error("Failed to fetch auth info", "userId", id, "error", err)
+		}
+
+		return nil
+	}
+
+	claims.AuthenticatedBy = info.AuthModule
+
+	return nil
+}
+
 func (s *Service) hook(ctx context.Context, identity *authn.Identity, _ *authn.Request) error {
 	// FIXME(kalleep): we should probably lazy load this
 	token, err := s.SignIdentity(ctx, identity)
 	if err != nil {
-		namespace, id := identity.NamespacedID()
-		s.logger.Error("Failed to sign id token", "err", err, "namespace", namespace, "id", id)
+		if shouldLogErr(err) {
+			namespace, id := identity.GetNamespacedID()
+			s.logger.FromContext(ctx).Error("Failed to sign id token", "err", err, "namespace", namespace, "id", id)
+		}
 		// for now don't return error so we don't break authentication from this hook
 		return nil
 	}
@@ -123,3 +182,7 @@ func getSubject(namespace, identifier string) string {
 func prefixCacheKey(key string) string {
 	return fmt.Sprintf("%s-%s", cachePrefix, key)
 }
+
+func shouldLogErr(err error) bool {
+	return !errors.Is(err, context.Canceled)
+}
diff --git a/pkg/services/auth/idimpl/service_test.go b/pkg/services/auth/idimpl/service_test.go
index 14a7fb36d5ea8..a5e746904b5f8 100644
--- a/pkg/services/auth/idimpl/service_test.go
+++ b/pkg/services/auth/idimpl/service_test.go
@@ -1,13 +1,23 @@
 package idimpl
 
 import (
+	"context"
 	"testing"
 
+	"github.com/go-jose/go-jose/v3"
+	"github.com/go-jose/go-jose/v3/jwt"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/infra/remotecache"
+	"github.com/grafana/grafana/pkg/services/auth"
+	"github.com/grafana/grafana/pkg/services/auth/idtest"
 	"github.com/grafana/grafana/pkg/services/authn"
 	"github.com/grafana/grafana/pkg/services/authn/authntest"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/login"
+	"github.com/grafana/grafana/pkg/services/login/authinfotest"
+	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
@@ -22,7 +32,7 @@ func Test_ProvideService(t *testing.T) {
 			},
 		}
 
-		_ = ProvideService(setting.NewCfg(), nil, nil, features, authnService, nil)
+		_ = ProvideService(setting.NewCfg(), nil, nil, features, authnService, nil, nil)
 		assert.True(t, hookRegistered)
 	})
 
@@ -36,7 +46,50 @@ func Test_ProvideService(t *testing.T) {
 			},
 		}
 
-		_ = ProvideService(setting.NewCfg(), nil, nil, features, authnService, nil)
+		_ = ProvideService(setting.NewCfg(), nil, nil, features, authnService, nil, nil)
 		assert.False(t, hookRegistered)
 	})
 }
+
+func TestService_SignIdentity(t *testing.T) {
+	signer := &idtest.MockSigner{
+		SignIDTokenFn: func(_ context.Context, claims *auth.IDClaims) (string, error) {
+			key := []byte("key")
+			s, err := jose.NewSigner(jose.SigningKey{Algorithm: jose.HS256, Key: key}, nil)
+			require.NoError(t, err)
+
+			token, err := jwt.Signed(s).Claims(claims).CompactSerialize()
+			require.NoError(t, err)
+
+			return token, nil
+		},
+	}
+
+	t.Run("should sing identity", func(t *testing.T) {
+		s := ProvideService(
+			setting.NewCfg(), signer, remotecache.NewFakeCacheStorage(),
+			featuremgmt.WithFeatures(featuremgmt.FlagIdForwarding),
+			&authntest.FakeService{}, &authinfotest.FakeService{ExpectedError: user.ErrUserNotFound}, nil,
+		)
+		token, err := s.SignIdentity(context.Background(), &authn.Identity{ID: "user:1"})
+		require.NoError(t, err)
+		require.NotEmpty(t, token)
+	})
+
+	t.Run("should sing identity with authenticated by if user is externally authenticated", func(t *testing.T) {
+		s := ProvideService(
+			setting.NewCfg(), signer, remotecache.NewFakeCacheStorage(),
+			featuremgmt.WithFeatures(featuremgmt.FlagIdForwarding),
+			&authntest.FakeService{}, &authinfotest.FakeService{ExpectedUserAuth: &login.UserAuth{AuthModule: login.AzureADAuthModule}}, nil,
+		)
+		token, err := s.SignIdentity(context.Background(), &authn.Identity{ID: "user:1"})
+		require.NoError(t, err)
+
+		parsed, err := jwt.ParseSigned(token)
+		require.NoError(t, err)
+
+		claims := &auth.IDClaims{}
+		require.NoError(t, parsed.UnsafeClaimsWithoutVerification(&claims))
+		assert.Equal(t, login.AzureADAuthModule, claims.AuthenticatedBy)
+	})
+}
diff --git a/pkg/services/auth/idimpl/signer.go b/pkg/services/auth/idimpl/signer.go
index 4cd8a090503ea..e69a8422b4808 100644
--- a/pkg/services/auth/idimpl/signer.go
+++ b/pkg/services/auth/idimpl/signer.go
@@ -28,7 +28,7 @@ type LocalSigner struct {
 }
 
 func (s *LocalSigner) SignIDToken(ctx context.Context, claims *auth.IDClaims) (string, error) {
-	if !s.features.IsEnabled(featuremgmt.FlagIdForwarding) {
+	if !s.features.IsEnabled(ctx, featuremgmt.FlagIdForwarding) {
 		return "", nil
 	}
 
@@ -37,7 +37,7 @@ func (s *LocalSigner) SignIDToken(ctx context.Context, claims *auth.IDClaims) (s
 		return "", err
 	}
 
-	builder := jwt.Signed(signer).Claims(claims.Claims)
+	builder := jwt.Signed(signer).Claims(claims)
 
 	token, err := builder.CompactSerialize()
 	if err != nil {
diff --git a/pkg/services/auth/idtest/mock.go b/pkg/services/auth/idtest/mock.go
new file mode 100644
index 0000000000000..eafc244ec5b53
--- /dev/null
+++ b/pkg/services/auth/idtest/mock.go
@@ -0,0 +1,18 @@
+package idtest
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/services/auth"
+)
+
+type MockSigner struct {
+	SignIDTokenFn func(ctx context.Context, claims *auth.IDClaims) (string, error)
+}
+
+func (s *MockSigner) SignIDToken(ctx context.Context, claims *auth.IDClaims) (string, error) {
+	if s.SignIDTokenFn != nil {
+		return s.SignIDTokenFn(ctx, claims)
+	}
+	return "", nil
+}
diff --git a/pkg/services/auth/jwt/auth.go b/pkg/services/auth/jwt/auth.go
index c2d317a056e02..aaa15b98321a4 100644
--- a/pkg/services/auth/jwt/auth.go
+++ b/pkg/services/auth/jwt/auth.go
@@ -33,7 +33,7 @@ func newService(cfg *setting.Cfg, remoteCache *remotecache.RemoteCache) *AuthSer
 }
 
 func (s *AuthService) init() error {
-	if !s.Cfg.JWTAuthEnabled {
+	if !s.Cfg.JWTAuth.Enabled {
 		return nil
 	}
 
@@ -65,7 +65,7 @@ func sanitizeJWT(jwtToken string) string {
 	return strings.ReplaceAll(jwtToken, string(base64.StdPadding), "")
 }
 
-func (s *AuthService) Verify(ctx context.Context, strToken string) (JWTClaims, error) {
+func (s *AuthService) Verify(ctx context.Context, strToken string) (map[string]any, error) {
 	s.log.Debug("Parsing JSON Web Token")
 
 	strToken = sanitizeJWT(strToken)
@@ -84,7 +84,7 @@ func (s *AuthService) Verify(ctx context.Context, strToken string) (JWTClaims, e
 
 	s.log.Debug("Trying to verify JSON Web Token using a key")
 
-	var claims JWTClaims
+	var claims map[string]any
 	for _, key := range keys {
 		if err = token.Claims(key, &claims); err == nil {
 			break
diff --git a/pkg/services/auth/jwt/auth_test.go b/pkg/services/auth/jwt/auth_test.go
index 3cc93a5f912d6..73d2106b72dd9 100644
--- a/pkg/services/auth/jwt/auth_test.go
+++ b/pkg/services/auth/jwt/auth_test.go
@@ -20,6 +20,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/remotecache"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
 type scenarioContext struct {
@@ -39,6 +40,10 @@ type cachingScenarioFunc func(*testing.T, cachingScenarioContext)
 
 const subject = "foo-subj"
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestVerifyUsingPKIXPublicKeyFile(t *testing.T) {
 	key := rsaKeys[0]
 	unknownKey := rsaKeys[1]
@@ -70,7 +75,7 @@ func TestVerifyUsingPKIXPublicKeyFile(t *testing.T) {
 		assert.Equal(t, verifiedClaims["sub"], subject)
 	}, configurePKIXPublicKeyFile, func(t *testing.T, cfg *setting.Cfg) {
 		t.Helper()
-		cfg.JWTAuthKeyID = publicKeyID
+		cfg.JWTAuth.KeyID = publicKeyID
 	})
 }
 
@@ -89,7 +94,7 @@ func TestVerifyUsingJWKSetFile(t *testing.T) {
 		require.NoError(t, json.NewEncoder(file).Encode(jwksPublic))
 		require.NoError(t, file.Close())
 
-		cfg.JWTAuthJWKSetFile = file.Name()
+		cfg.JWTAuth.JWKSetFile = file.Name()
 	}
 
 	scenario(t, "verifies a token signed with a key from the set", func(t *testing.T, sc scenarioContext) {
@@ -118,22 +123,18 @@ func TestVerifyUsingJWKSetURL(t *testing.T) {
 		var err error
 
 		_, err = initAuthService(t, func(t *testing.T, cfg *setting.Cfg) {
-			cfg.JWTAuthJWKSetURL = "https://example.com/.well-known/jwks.json"
+			cfg.JWTAuth.JWKSetURL = "https://example.com/.well-known/jwks.json"
 		})
 		require.NoError(t, err)
 
 		_, err = initAuthService(t, func(t *testing.T, cfg *setting.Cfg) {
-			cfg.JWTAuthJWKSetURL = "http://example.com/.well-known/jwks.json"
+			cfg.JWTAuth.JWKSetURL = "http://example.com/.well-known/jwks.json"
 		})
 		require.NoError(t, err)
 
-		oldEnv := setting.Env
-		setting.Env = setting.Prod
-		defer func() {
-			setting.Env = oldEnv
-		}()
 		_, err = initAuthService(t, func(t *testing.T, cfg *setting.Cfg) {
-			cfg.JWTAuthJWKSetURL = "http://example.com/.well-known/jwks.json"
+			cfg.Env = setting.Prod
+			cfg.JWTAuth.JWKSetURL = "http://example.com/.well-known/jwks.json"
 		})
 		require.Error(t, err)
 	})
@@ -184,7 +185,7 @@ func TestCachingJWKHTTPResponse(t *testing.T) {
 		assert.Equal(t, 1, *sc.reqCount)
 	}, func(t *testing.T, cfg *setting.Cfg) {
 		// Arbitrary high value, several times what the test should take.
-		cfg.JWTAuthCacheTTL = time.Minute
+		cfg.JWTAuth.CacheTTL = time.Minute
 	})
 
 	jwkCachingScenario(t, "does not cache the response when TTL is zero", func(t *testing.T, sc cachingScenarioContext) {
@@ -195,7 +196,7 @@ func TestCachingJWKHTTPResponse(t *testing.T) {
 
 		assert.Equal(t, 2, *sc.reqCount)
 	}, func(t *testing.T, cfg *setting.Cfg) {
-		cfg.JWTAuthCacheTTL = 0
+		cfg.JWTAuth.CacheTTL = 0
 	})
 }
 
@@ -220,7 +221,7 @@ func TestClaimValidation(t *testing.T) {
 		_, err = sc.authJWTSvc.Verify(sc.ctx, tokenInvalid)
 		require.Error(t, err)
 	}, configurePKIXPublicKeyFile, func(t *testing.T, cfg *setting.Cfg) {
-		cfg.JWTAuthExpectClaims = `{"iss": "http://foo"}`
+		cfg.JWTAuth.ExpectClaims = `{"iss": "http://foo"}`
 	})
 
 	scenario(t, "validates sub field for equality", func(t *testing.T, sc scenarioContext) {
@@ -235,7 +236,7 @@ func TestClaimValidation(t *testing.T) {
 		_, err = sc.authJWTSvc.Verify(sc.ctx, tokenInvalid)
 		require.Error(t, err)
 	}, configurePKIXPublicKeyFile, func(t *testing.T, cfg *setting.Cfg) {
-		cfg.JWTAuthExpectClaims = `{"sub": "foo"}`
+		cfg.JWTAuth.ExpectClaims = `{"sub": "foo"}`
 	})
 
 	scenario(t, "validates aud field for inclusion", func(t *testing.T, sc scenarioContext) {
@@ -256,7 +257,7 @@ func TestClaimValidation(t *testing.T) {
 		_, err = sc.authJWTSvc.Verify(sc.ctx, sign(t, key, jwt.Claims{Audience: []string{"baz"}}, nil))
 		require.Error(t, err)
 	}, configurePKIXPublicKeyFile, func(t *testing.T, cfg *setting.Cfg) {
-		cfg.JWTAuthExpectClaims = `{"aud": ["foo", "bar"]}`
+		cfg.JWTAuth.ExpectClaims = `{"aud": ["foo", "bar"]}`
 	})
 
 	scenario(t, "validates non-registered (custom) claims for equality", func(t *testing.T, sc scenarioContext) {
@@ -277,7 +278,7 @@ func TestClaimValidation(t *testing.T) {
 		_, err = sc.authJWTSvc.Verify(sc.ctx, sign(t, key, map[string]any{"my-number": 123}, nil))
 		require.Error(t, err)
 	}, configurePKIXPublicKeyFile, func(t *testing.T, cfg *setting.Cfg) {
-		cfg.JWTAuthExpectClaims = `{"my-str": "foo", "my-number": 123}`
+		cfg.JWTAuth.ExpectClaims = `{"my-str": "foo", "my-number": 123}`
 	})
 
 	scenario(t, "validates exp claim of the token", func(t *testing.T, sc scenarioContext) {
@@ -322,7 +323,7 @@ func jwkHTTPScenario(t *testing.T, desc string, fn scenarioFunc, cbs ...configur
 		t.Cleanup(ts.Close)
 
 		configure := func(t *testing.T, cfg *setting.Cfg) {
-			cfg.JWTAuthJWKSetURL = ts.URL
+			cfg.JWTAuth.JWKSetURL = ts.URL
 		}
 		runner := scenarioRunner(func(t *testing.T, sc scenarioContext) {
 			keySet := sc.authJWTSvc.keySet.(*keySetHTTP)
@@ -354,8 +355,8 @@ func jwkCachingScenario(t *testing.T, desc string, fn cachingScenarioFunc, cbs .
 		t.Cleanup(ts.Close)
 
 		configure := func(t *testing.T, cfg *setting.Cfg) {
-			cfg.JWTAuthJWKSetURL = ts.URL
-			cfg.JWTAuthCacheTTL = time.Hour
+			cfg.JWTAuth.JWKSetURL = ts.URL
+			cfg.JWTAuth.CacheTTL = time.Hour
 		}
 		runner := scenarioRunner(func(t *testing.T, sc scenarioContext) {
 			keySet := sc.authJWTSvc.keySet.(*keySetHTTP)
@@ -396,8 +397,8 @@ func initAuthService(t *testing.T, cbs ...configureFunc) (*AuthService, error) {
 	t.Helper()
 
 	cfg := setting.NewCfg()
-	cfg.JWTAuthEnabled = true
-	cfg.JWTAuthExpectClaims = "{}"
+	cfg.JWTAuth.Enabled = true
+	cfg.JWTAuth.ExpectClaims = "{}"
 
 	for _, cb := range cbs {
 		cb(t, cfg)
@@ -441,5 +442,5 @@ func configurePKIXPublicKeyFile(t *testing.T, cfg *setting.Cfg) {
 	}))
 	require.NoError(t, file.Close())
 
-	cfg.JWTAuthKeyFile = file.Name()
+	cfg.JWTAuth.KeyFile = file.Name()
 }
diff --git a/pkg/services/auth/jwt/jwt.go b/pkg/services/auth/jwt/jwt.go
index c0c7ddd42920b..f070772ac5d87 100644
--- a/pkg/services/auth/jwt/jwt.go
+++ b/pkg/services/auth/jwt/jwt.go
@@ -4,24 +4,22 @@ import (
 	"context"
 )
 
-type JWTClaims map[string]any
-
 type JWTService interface {
-	Verify(ctx context.Context, strToken string) (JWTClaims, error)
+	Verify(ctx context.Context, strToken string) (map[string]any, error)
 }
 
 type FakeJWTService struct {
-	VerifyProvider func(context.Context, string) (JWTClaims, error)
+	VerifyProvider func(context.Context, string) (map[string]any, error)
 }
 
-func (s *FakeJWTService) Verify(ctx context.Context, token string) (JWTClaims, error) {
+func (s *FakeJWTService) Verify(ctx context.Context, token string) (map[string]any, error) {
 	return s.VerifyProvider(ctx, token)
 }
 
 func NewFakeJWTService() *FakeJWTService {
 	return &FakeJWTService{
-		VerifyProvider: func(ctx context.Context, token string) (JWTClaims, error) {
-			return JWTClaims{}, nil
+		VerifyProvider: func(ctx context.Context, token string) (map[string]any, error) {
+			return map[string]any{}, nil
 		},
 	}
 }
diff --git a/pkg/services/auth/jwt/key_sets.go b/pkg/services/auth/jwt/key_sets.go
index 6c9597c895bd0..5361f3b3fbb03 100644
--- a/pkg/services/auth/jwt/key_sets.go
+++ b/pkg/services/auth/jwt/key_sets.go
@@ -49,13 +49,13 @@ type keySetHTTP struct {
 
 func (s *AuthService) checkKeySetConfiguration() error {
 	var count int
-	if s.Cfg.JWTAuthKeyFile != "" {
+	if s.Cfg.JWTAuth.KeyFile != "" {
 		count++
 	}
-	if s.Cfg.JWTAuthJWKSetFile != "" {
+	if s.Cfg.JWTAuth.JWKSetFile != "" {
 		count++
 	}
-	if s.Cfg.JWTAuthJWKSetURL != "" {
+	if s.Cfg.JWTAuth.JWKSetURL != "" {
 		count++
 	}
 
@@ -75,7 +75,7 @@ func (s *AuthService) initKeySet() error {
 		return err
 	}
 
-	if keyFilePath := s.Cfg.JWTAuthKeyFile; keyFilePath != "" {
+	if keyFilePath := s.Cfg.JWTAuth.KeyFile; keyFilePath != "" {
 		// nolint:gosec
 		// We can ignore the gosec G304 warning on this one because `fileName` comes from grafana configuration file
 		file, err := os.Open(keyFilePath)
@@ -125,10 +125,10 @@ func (s *AuthService) initKeySet() error {
 
 		s.keySet = &keySetJWKS{
 			jose.JSONWebKeySet{
-				Keys: []jose.JSONWebKey{{Key: key, KeyID: s.Cfg.JWTAuthKeyID}},
+				Keys: []jose.JSONWebKey{{Key: key, KeyID: s.Cfg.JWTAuth.KeyID}},
 			},
 		}
-	} else if keyFilePath := s.Cfg.JWTAuthJWKSetFile; keyFilePath != "" {
+	} else if keyFilePath := s.Cfg.JWTAuth.JWKSetFile; keyFilePath != "" {
 		// nolint:gosec
 		// We can ignore the gosec G304 warning on this one because `fileName` comes from grafana configuration file
 		file, err := os.Open(keyFilePath)
@@ -147,12 +147,12 @@ func (s *AuthService) initKeySet() error {
 		}
 
 		s.keySet = &keySetJWKS{jwks}
-	} else if urlStr := s.Cfg.JWTAuthJWKSetURL; urlStr != "" {
+	} else if urlStr := s.Cfg.JWTAuth.JWKSetURL; urlStr != "" {
 		urlParsed, err := url.Parse(urlStr)
 		if err != nil {
 			return err
 		}
-		if urlParsed.Scheme != "https" && setting.Env != setting.Dev {
+		if urlParsed.Scheme != "https" && s.Cfg.Env != setting.Dev {
 			return ErrJWTSetURLMustHaveHTTPSScheme
 		}
 		s.keySet = &keySetHTTP{
@@ -176,7 +176,7 @@ func (s *AuthService) initKeySet() error {
 				Timeout: time.Second * 30,
 			},
 			cacheKey:        fmt.Sprintf("auth-jwt:jwk-%s", urlStr),
-			cacheExpiration: s.Cfg.JWTAuthCacheTTL,
+			cacheExpiration: s.Cfg.JWTAuth.CacheTTL,
 			cache:           s.RemoteCache,
 		}
 	}
@@ -194,7 +194,11 @@ func (ks *keySetHTTP) getJWKS(ctx context.Context) (keySetJWKS, error) {
 	if ks.cacheExpiration > 0 {
 		if val, err := ks.cache.Get(ctx, ks.cacheKey); err == nil {
 			err := json.Unmarshal(val, &jwks)
-			return jwks, err
+			if err != nil {
+				ks.log.Warn("Failed to unmarshal key set from cache", "err", err)
+			} else {
+				return jwks, err
+			}
 		}
 	}
 
diff --git a/pkg/services/auth/jwt/rsa_keys_test.go b/pkg/services/auth/jwt/rsa_keys_test.go
index 3a93da5ebe12d..5d5ede0ec5541 100644
--- a/pkg/services/auth/jwt/rsa_keys_test.go
+++ b/pkg/services/auth/jwt/rsa_keys_test.go
@@ -6,13 +6,14 @@ import (
 	"encoding/pem"
 	"fmt"
 
-	jose "github.com/go-jose/go-jose/v3"
+	"github.com/go-jose/go-jose/v3"
 )
 
 var rsaKeys [3]*rsa.PrivateKey
 var jwKeys [3]jose.JSONWebKey
 var jwksPublic jose.JSONWebKeySet
 
+// #nosec G101
 const rsaKeysPEM = `
 -----BEGIN RSA PRIVATE KEY-----
 MIIEpAIBAAKCAQEA0vKKKQzRHxtnvgvScOvZW2lIBiZ0YBN8ZwAfQdpEQy2w7qAT
diff --git a/pkg/services/auth/jwt/validation.go b/pkg/services/auth/jwt/validation.go
index 260aa964f29cd..d6c347de01edc 100644
--- a/pkg/services/auth/jwt/validation.go
+++ b/pkg/services/auth/jwt/validation.go
@@ -10,7 +10,7 @@ import (
 )
 
 func (s *AuthService) initClaimExpectations() error {
-	if err := json.Unmarshal([]byte(s.Cfg.JWTAuthExpectClaims), &s.expect); err != nil {
+	if err := json.Unmarshal([]byte(s.Cfg.JWTAuth.ExpectClaims), &s.expect); err != nil {
 		return err
 	}
 
@@ -52,7 +52,7 @@ func (s *AuthService) initClaimExpectations() error {
 	return nil
 }
 
-func (s *AuthService) validateClaims(claims JWTClaims) error {
+func (s *AuthService) validateClaims(claims map[string]any) error {
 	var registeredClaims jwt.Claims
 	for key, value := range claims {
 		switch key {
diff --git a/pkg/services/authn/authn.go b/pkg/services/authn/authn.go
index 2fd46dc811445..27658cecb44d1 100644
--- a/pkg/services/authn/authn.go
+++ b/pkg/services/authn/authn.go
@@ -11,6 +11,7 @@ import (
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/middleware/cookies"
 	"github.com/grafana/grafana/pkg/models/usertoken"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/login"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/web"
@@ -74,6 +75,12 @@ type Service interface {
 	RegisterPostLoginHook(hook PostLoginHookFn, priority uint)
 	// RedirectURL will generate url that we can use to initiate auth flow for supported clients.
 	RedirectURL(ctx context.Context, client string, r *Request) (*Redirect, error)
+	// Logout revokes session token and does additional clean up if client used to authenticate supports it
+	Logout(ctx context.Context, user identity.Requester, sessionToken *usertoken.UserToken) (*Redirect, error)
+
+	// ResolveIdentity resolves an identity from org and namespace id.
+	ResolveIdentity(ctx context.Context, orgID int64, namespaceID string) (*Identity, error)
+
 	// RegisterClient will register a new authn.Client that can be used for authentication
 	RegisterClient(c Client)
 }
@@ -115,6 +122,14 @@ type RedirectClient interface {
 	RedirectURL(ctx context.Context, r *Request) (*Redirect, error)
 }
 
+// LogoutCLient is an optional interface that auth client can implement.
+// Clients that implements this interface can implement additional logic
+// that should happen during logout and supports client specific redirect URL.
+type LogoutClient interface {
+	Client
+	Logout(ctx context.Context, user identity.Requester, info *login.UserAuth) (*Redirect, bool)
+}
+
 type PasswordClient interface {
 	AuthenticatePassword(ctx context.Context, r *Request, username, password string) (*Identity, error)
 }
diff --git a/pkg/services/authn/authnimpl/service.go b/pkg/services/authn/authnimpl/service.go
index 4c50c97e9ff2e..1aecec43a3a09 100644
--- a/pkg/services/authn/authnimpl/service.go
+++ b/pkg/services/authn/authnimpl/service.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"net/http"
 	"strconv"
+	"strings"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"go.opentelemetry.io/otel/attribute"
@@ -19,10 +20,10 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/apikey"
 	"github.com/grafana/grafana/pkg/services/auth"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/authn"
 	"github.com/grafana/grafana/pkg/services/authn/authnimpl/sync"
 	"github.com/grafana/grafana/pkg/services/authn/clients"
-	"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/ldap/service"
 	"github.com/grafana/grafana/pkg/services/login"
@@ -70,27 +71,29 @@ func ProvideService(
 	features *featuremgmt.FeatureManager, oauthTokenService oauthtoken.OAuthTokenService,
 	socialService social.Service, cache *remotecache.RemoteCache,
 	ldapService service.LDAP, registerer prometheus.Registerer,
-	signingKeysService signingkeys.Service, oauthServer oauthserver.OAuth2Server,
+	signingKeysService signingkeys.Service,
+	settingsProviderService setting.Provider,
 ) *Service {
 	s := &Service{
-		log:            log.New("authn.service"),
-		cfg:            cfg,
-		clients:        make(map[string]authn.Client),
-		clientQueue:    newQueue[authn.ContextAwareClient](),
-		tracer:         tracer,
-		metrics:        newMetrics(registerer),
-		sessionService: sessionService,
-		postAuthHooks:  newQueue[authn.PostAuthHookFn](),
-		postLoginHooks: newQueue[authn.PostLoginHookFn](),
+		log:             log.New("authn.service"),
+		cfg:             cfg,
+		clients:         make(map[string]authn.Client),
+		clientQueue:     newQueue[authn.ContextAwareClient](),
+		tracer:          tracer,
+		metrics:         newMetrics(registerer),
+		authInfoService: authInfoService,
+		sessionService:  sessionService,
+		postAuthHooks:   newQueue[authn.PostAuthHookFn](),
+		postLoginHooks:  newQueue[authn.PostLoginHookFn](),
 	}
 
 	usageStats.RegisterMetricsFunc(s.getUsageStats)
 
-	s.RegisterClient(clients.ProvideRender(userService, renderService))
-	s.RegisterClient(clients.ProvideAPIKey(apikeyService, userService))
+	s.RegisterClient(clients.ProvideRender(renderService))
+	s.RegisterClient(clients.ProvideAPIKey(apikeyService))
 
 	if cfg.LoginCookieName != "" {
-		s.RegisterClient(clients.ProvideSession(cfg, sessionService, features))
+		s.RegisterClient(clients.ProvideSession(cfg, sessionService))
 	}
 
 	var proxyClients []authn.ProxyClient
@@ -119,8 +122,8 @@ func ProvideService(
 		}
 	}
 
-	if s.cfg.AuthProxyEnabled && len(proxyClients) > 0 {
-		proxy, err := clients.ProvideProxy(cfg, cache, userService, proxyClients...)
+	if s.cfg.AuthProxy.Enabled && len(proxyClients) > 0 {
+		proxy, err := clients.ProvideProxy(cfg, cache, proxyClients...)
 		if err != nil {
 			s.log.Error("Failed to configure auth proxy", "err", err)
 		} else {
@@ -128,43 +131,38 @@ func ProvideService(
 		}
 	}
 
-	if s.cfg.JWTAuthEnabled {
+	if s.cfg.JWTAuth.Enabled {
 		s.RegisterClient(clients.ProvideJWT(jwtService, cfg))
 	}
 
-	if s.cfg.ExtendedJWTAuthEnabled && features.IsEnabled(featuremgmt.FlagExternalServiceAuth) {
-		s.RegisterClient(clients.ProvideExtendedJWT(userService, cfg, signingKeysService, oauthServer))
-	}
+	// FIXME (gamab): Commenting that out for now as we want to re-use the client for external service auth
+	// if s.cfg.ExtendedJWTAuthEnabled && features.IsEnabledGlobally(featuremgmt.FlagExternalServiceAuth) {
+	// 	s.RegisterClient(clients.ProvideExtendedJWT(userService, cfg, signingKeysService, oauthServer))
+	// }
 
 	for name := range socialService.GetOAuthProviders() {
-		oauthCfg := socialService.GetOAuthInfoProvider(name)
-		if oauthCfg != nil && oauthCfg.Enabled {
-			clientName := authn.ClientWithPrefix(name)
-
-			connector, errConnector := socialService.GetConnector(name)
-			httpClient, errHTTPClient := socialService.GetOAuthHttpClient(name)
-			if errConnector != nil || errHTTPClient != nil {
-				s.log.Error("Failed to configure oauth client", "client", clientName, "err", errors.Join(errConnector, errHTTPClient))
-			} else {
-				s.RegisterClient(clients.ProvideOAuth(clientName, cfg, oauthCfg, connector, httpClient))
-			}
-		}
+		clientName := authn.ClientWithPrefix(name)
+		s.RegisterClient(clients.ProvideOAuth(clientName, cfg, oauthTokenService, socialService, settingsProviderService, features))
 	}
 
 	// FIXME (jguer): move to User package
 	userSyncService := sync.ProvideUserSync(userService, userProtectionService, authInfoService, quotaService)
-	orgUserSyncService := sync.ProvideOrgSync(userService, orgService, accessControlService)
+	orgUserSyncService := sync.ProvideOrgSync(userService, orgService, accessControlService, cfg)
 	s.RegisterPostAuthHook(userSyncService.SyncUserHook, 10)
 	s.RegisterPostAuthHook(userSyncService.EnableUserHook, 20)
 	s.RegisterPostAuthHook(orgUserSyncService.SyncOrgRolesHook, 30)
-	s.RegisterPostAuthHook(userSyncService.SyncLastSeenHook, 120)
+	s.RegisterPostAuthHook(userSyncService.SyncLastSeenHook, 130)
+	s.RegisterPostAuthHook(sync.ProvideOAuthTokenSync(oauthTokenService, sessionService, socialService).SyncOauthTokenHook, 60)
+	s.RegisterPostAuthHook(userSyncService.FetchSyncedUserHook, 100)
 
-	if features.IsEnabled(featuremgmt.FlagAccessTokenExpirationCheck) {
-		s.RegisterPostAuthHook(sync.ProvideOAuthTokenSync(oauthTokenService, sessionService, socialService).SyncOauthTokenHook, 60)
+	rbacSync := sync.ProvideRBACSync(accessControlService)
+	if features.IsEnabledGlobally(featuremgmt.FlagCloudRBACRoles) {
+		s.RegisterPostAuthHook(rbacSync.SyncCloudRoles, 110)
 	}
 
-	s.RegisterPostAuthHook(userSyncService.FetchSyncedUserHook, 100)
-	s.RegisterPostAuthHook(sync.ProvidePermissionsSync(accessControlService).SyncPermissionsHook, 110)
+	s.RegisterPostAuthHook(rbacSync.SyncPermissionsHook, 120)
+
+	s.RegisterPostLoginHook(orgUserSyncService.SetDefaultOrgHook, 140)
 
 	return s
 }
@@ -179,7 +177,8 @@ type Service struct {
 	tracer  tracing.Tracer
 	metrics *metrics
 
-	sessionService auth.UserTokenService
+	authInfoService login.AuthInfoService
+	sessionService  auth.UserTokenService
 
 	// postAuthHooks are called after a successful authentication. They can modify the identity.
 	postAuthHooks *queue[authn.PostAuthHookFn]
@@ -191,6 +190,8 @@ func (s *Service) Authenticate(ctx context.Context, r *authn.Request) (*authn.Id
 	ctx, span := s.tracer.Start(ctx, "authn.Authenticate")
 	defer span.End()
 
+	r.OrgID = orgIDFromRequest(r)
+
 	var authErr error
 	for _, item := range s.clientQueue.items {
 		if item.v.Test(ctx, r) {
@@ -223,7 +224,6 @@ func (s *Service) Authenticate(ctx context.Context, r *authn.Request) (*authn.Id
 }
 
 func (s *Service) authenticate(ctx context.Context, c authn.Client, r *authn.Request) (*authn.Identity, error) {
-	r.OrgID = orgIDFromRequest(r)
 	identity, err := c.Authenticate(ctx, r)
 	if err != nil {
 		s.errorLogFunc(ctx, err)("Failed to authenticate request", "client", c.Name(), "error", err)
@@ -262,15 +262,17 @@ func (s *Service) RegisterPostAuthHook(hook authn.PostAuthHookFn, priority uint)
 	s.postAuthHooks.insert(hook, priority)
 }
 
-func (s *Service) Login(ctx context.Context, client string, r *authn.Request) (identity *authn.Identity, err error) {
+func (s *Service) Login(ctx context.Context, client string, r *authn.Request) (id *authn.Identity, err error) {
 	ctx, span := s.tracer.Start(ctx, "authn.Login", trace.WithAttributes(
 		attribute.String(attributeKeyClient, client),
 	))
 	defer span.End()
 
+	r.OrgID = orgIDFromRequest(r)
+
 	defer func() {
 		for _, hook := range s.postLoginHooks.items {
-			hook.v(ctx, identity, r, err)
+			hook.v(ctx, id, r, err)
 		}
 	}()
 
@@ -281,36 +283,40 @@ func (s *Service) Login(ctx context.Context, client string, r *authn.Request) (i
 	}
 
 	r.SetMeta(authn.MetaKeyIsLogin, "true")
-	identity, err = s.authenticate(ctx, c, r)
+	id, err = s.authenticate(ctx, c, r)
 	if err != nil {
 		s.metrics.failedLogin.WithLabelValues(client).Inc()
 		return nil, err
 	}
 
-	namespace, id := identity.NamespacedID()
-
+	namespace, namespaceID := id.GetNamespacedID()
 	// Login is only supported for users
-	if namespace != authn.NamespaceUser || id <= 0 {
+	if namespace != authn.NamespaceUser {
 		s.metrics.failedLogin.WithLabelValues(client).Inc()
 		return nil, authn.ErrUnsupportedIdentity.Errorf("expected identity of type user but got: %s", namespace)
 	}
 
+	intId, err := identity.IntIdentifier(namespace, namespaceID)
+	if err != nil {
+		return nil, err
+	}
+
 	addr := web.RemoteAddr(r.HTTPRequest)
 	ip, err := network.GetIPFromAddress(addr)
 	if err != nil {
-		s.log.FromContext(ctx).Debug("Failed to parse ip from address", "client", c.Name(), "id", identity.ID, "addr", addr, "error", err)
+		s.log.FromContext(ctx).Debug("Failed to parse ip from address", "client", c.Name(), "id", id.ID, "addr", addr, "error", err)
 	}
 
-	sessionToken, err := s.sessionService.CreateToken(ctx, &user.User{ID: id}, ip, r.HTTPRequest.UserAgent())
+	sessionToken, err := s.sessionService.CreateToken(ctx, &user.User{ID: intId}, ip, r.HTTPRequest.UserAgent())
 	if err != nil {
 		s.metrics.failedLogin.WithLabelValues(client).Inc()
-		s.log.FromContext(ctx).Error("Failed to create session", "client", client, "id", identity.ID, "err", err)
+		s.log.FromContext(ctx).Error("Failed to create session", "client", client, "id", id.ID, "err", err)
 		return nil, err
 	}
 
 	s.metrics.successfulLogin.WithLabelValues(client).Inc()
-	identity.SessionToken = sessionToken
-	return identity, nil
+	id.SessionToken = sessionToken
+	return id, nil
 }
 
 func (s *Service) RegisterPostLoginHook(hook authn.PostLoginHookFn, priority uint) {
@@ -336,6 +342,72 @@ func (s *Service) RedirectURL(ctx context.Context, client string, r *authn.Reque
 	return redirectClient.RedirectURL(ctx, r)
 }
 
+func (s *Service) Logout(ctx context.Context, user identity.Requester, sessionToken *auth.UserToken) (*authn.Redirect, error) {
+	ctx, span := s.tracer.Start(ctx, "authn.Logout")
+	defer span.End()
+
+	redirect := &authn.Redirect{URL: s.cfg.AppSubURL + "/login"}
+	if s.cfg.SignoutRedirectUrl != "" {
+		redirect.URL = s.cfg.SignoutRedirectUrl
+	}
+
+	namespace, id := user.GetNamespacedID()
+	if namespace != authn.NamespaceUser {
+		return redirect, nil
+	}
+
+	userID, err := identity.IntIdentifier(namespace, id)
+	if err != nil {
+		s.log.FromContext(ctx).Debug("Invalid user id", "id", userID, "err", err)
+		return redirect, nil
+	}
+
+	info, _ := s.authInfoService.GetAuthInfo(ctx, &login.GetAuthInfoQuery{UserId: userID})
+	if info != nil {
+		client := authn.ClientWithPrefix(strings.TrimPrefix(info.AuthModule, "oauth_"))
+
+		c, ok := s.clients[client]
+		if !ok {
+			s.log.FromContext(ctx).Debug("No client configured for auth module", "client", client)
+			goto Default
+		}
+
+		logoutClient, ok := c.(authn.LogoutClient)
+		if !ok {
+			s.log.FromContext(ctx).Debug("Client do not support specialized logout logic", "client", client)
+			goto Default
+		}
+
+		clientRedirect, ok := logoutClient.Logout(ctx, user, info)
+		if !ok {
+			goto Default
+		}
+
+		redirect = clientRedirect
+	}
+
+Default:
+	if err = s.sessionService.RevokeToken(ctx, sessionToken, false); err != nil && !errors.Is(err, auth.ErrUserTokenNotFound) {
+		return nil, err
+	}
+
+	return redirect, nil
+}
+
+func (s *Service) ResolveIdentity(ctx context.Context, orgID int64, namespaceID string) (*authn.Identity, error) {
+	r := &authn.Request{}
+	r.OrgID = orgID
+	// hack to not update last seen
+	r.SetMeta(authn.MetaKeyIsLogin, "true")
+
+	identity, err := s.authenticate(ctx, clients.ProvideIdentity(namespaceID), r)
+	if err != nil {
+		return nil, err
+	}
+
+	return identity, nil
+}
+
 func (s *Service) RegisterClient(c authn.Client) {
 	s.clients[c.Name()] = c
 	if cac, ok := c.(authn.ContextAwareClient); ok {
diff --git a/pkg/services/authn/authnimpl/service_test.go b/pkg/services/authn/authnimpl/service_test.go
index 8e253d23dd93f..08b7f8b6af6ac 100644
--- a/pkg/services/authn/authnimpl/service_test.go
+++ b/pkg/services/authn/authnimpl/service_test.go
@@ -13,10 +13,14 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/models/usertoken"
 	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/auth/authtest"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/authn"
 	"github.com/grafana/grafana/pkg/services/authn/authntest"
+	"github.com/grafana/grafana/pkg/services/login"
+	"github.com/grafana/grafana/pkg/services/login/authinfotest"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -299,6 +303,108 @@ func TestService_RedirectURL(t *testing.T) {
 	}
 }
 
+func TestService_Logout(t *testing.T) {
+	type TestCase struct {
+		desc string
+
+		identity     *authn.Identity
+		sessionToken *usertoken.UserToken
+		info         *login.UserAuth
+
+		client             authn.Client
+		signoutRedirectURL string
+
+		expectedErr          error
+		expectedTokenRevoked bool
+		expectedRedirect     *authn.Redirect
+	}
+
+	tests := []TestCase{
+		{
+			desc:             "should redirect to default redirect url when identity is not a user",
+			identity:         &authn.Identity{ID: authn.NamespacedID(authn.NamespaceServiceAccount, 1)},
+			expectedRedirect: &authn.Redirect{URL: "http://localhost:3000/login"},
+		},
+		{
+			desc:                 "should redirect to default redirect url when no external provider was used to authenticate",
+			identity:             &authn.Identity{ID: authn.NamespacedID(authn.NamespaceUser, 1)},
+			expectedRedirect:     &authn.Redirect{URL: "http://localhost:3000/login"},
+			expectedTokenRevoked: true,
+		},
+		{
+			desc:                 "should redirect to default redirect url when client is not found",
+			identity:             &authn.Identity{ID: authn.NamespacedID(authn.NamespaceUser, 1)},
+			info:                 &login.UserAuth{AuthModule: "notFound"},
+			expectedRedirect:     &authn.Redirect{URL: "http://localhost:3000/login"},
+			expectedTokenRevoked: true,
+		},
+		{
+			desc:                 "should redirect to default redirect url when client do not implement logout extension",
+			identity:             &authn.Identity{ID: authn.NamespacedID(authn.NamespaceUser, 1)},
+			info:                 &login.UserAuth{AuthModule: "azuread"},
+			expectedRedirect:     &authn.Redirect{URL: "http://localhost:3000/login"},
+			client:               &authntest.FakeClient{ExpectedName: "auth.client.azuread"},
+			expectedTokenRevoked: true,
+		},
+		{
+			desc:                 "should use signout redirect url if configured",
+			identity:             &authn.Identity{ID: authn.NamespacedID(authn.NamespaceUser, 1), AuthenticatedBy: "azuread"},
+			expectedRedirect:     &authn.Redirect{URL: "some-url"},
+			client:               &authntest.FakeClient{ExpectedName: "auth.client.azuread"},
+			signoutRedirectURL:   "some-url",
+			expectedTokenRevoked: true,
+		},
+		{
+			desc:             "should redirect to client specific url",
+			identity:         &authn.Identity{ID: authn.NamespacedID(authn.NamespaceUser, 1)},
+			info:             &login.UserAuth{AuthModule: "azuread"},
+			expectedRedirect: &authn.Redirect{URL: "http://idp.com/logout"},
+			client: &authntest.MockClient{
+				NameFunc: func() string { return "auth.client.azuread" },
+				LogoutFunc: func(ctx context.Context, _ identity.Requester, _ *login.UserAuth) (*authn.Redirect, bool) {
+					return &authn.Redirect{URL: "http://idp.com/logout"}, true
+				},
+			},
+			expectedTokenRevoked: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.desc, func(t *testing.T) {
+			var tokenRevoked bool
+
+			s := setupTests(t, func(svc *Service) {
+				if tt.client != nil {
+					svc.RegisterClient(tt.client)
+				}
+				svc.cfg.AppSubURL = "http://localhost:3000"
+				svc.authInfoService = &authinfotest.FakeService{
+					ExpectedUserAuth: tt.info,
+				}
+
+				svc.sessionService = &authtest.FakeUserAuthTokenService{
+					RevokeTokenProvider: func(_ context.Context, sessionToken *auth.UserToken, soft bool) error {
+						tokenRevoked = true
+						assert.EqualValues(t, tt.sessionToken, sessionToken)
+						assert.False(t, soft)
+						return nil
+					},
+				}
+
+				if tt.signoutRedirectURL != "" {
+					svc.cfg.SignoutRedirectUrl = tt.signoutRedirectURL
+				}
+			})
+
+			redirect, err := s.Logout(context.Background(), tt.identity, tt.sessionToken)
+
+			assert.ErrorIs(t, err, tt.expectedErr)
+			assert.EqualValues(t, tt.expectedRedirect, redirect)
+			assert.Equal(t, tt.expectedTokenRevoked, tokenRevoked)
+		})
+	}
+}
+
 func mustParseURL(s string) *url.URL {
 	u, err := url.Parse(s)
 	if err != nil {
diff --git a/pkg/services/authn/authnimpl/sync/oauth_token_sync.go b/pkg/services/authn/authnimpl/sync/oauth_token_sync.go
index 5cffdeea056f1..8756ce603cba8 100644
--- a/pkg/services/authn/authnimpl/sync/oauth_token_sync.go
+++ b/pkg/services/authn/authnimpl/sync/oauth_token_sync.go
@@ -3,26 +3,20 @@ package sync
 import (
 	"context"
 	"errors"
-	"fmt"
-	"strings"
 	"time"
 
-	"github.com/go-jose/go-jose/v3/jwt"
 	"golang.org/x/sync/singleflight"
 
-	"github.com/grafana/grafana/pkg/infra/localcache"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/login/social"
 	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/authn"
-	"github.com/grafana/grafana/pkg/services/login"
 	"github.com/grafana/grafana/pkg/services/oauthtoken"
 )
 
 func ProvideOAuthTokenSync(service oauthtoken.OAuthTokenService, sessionService auth.UserTokenService, socialService social.Service) *OAuthTokenSync {
 	return &OAuthTokenSync{
 		log.New("oauth_token.sync"),
-		localcache.New(maxOAuthTokenCacheTTL, 15*time.Minute),
 		service,
 		sessionService,
 		socialService,
@@ -31,16 +25,15 @@ func ProvideOAuthTokenSync(service oauthtoken.OAuthTokenService, sessionService
 }
 
 type OAuthTokenSync struct {
-	log            log.Logger
-	cache          *localcache.CacheService
-	service        oauthtoken.OAuthTokenService
-	sessionService auth.UserTokenService
-	socialService  social.Service
-	sf             *singleflight.Group
+	log               log.Logger
+	service           oauthtoken.OAuthTokenService
+	sessionService    auth.UserTokenService
+	socialService     social.Service
+	singleflightGroup *singleflight.Group
 }
 
 func (s *OAuthTokenSync) SyncOauthTokenHook(ctx context.Context, identity *authn.Identity, _ *authn.Request) error {
-	namespace, _ := identity.NamespacedID()
+	namespace, _ := identity.GetNamespacedID()
 	// only perform oauth token check if identity is a user
 	if namespace != authn.NamespaceUser {
 		return nil
@@ -51,65 +44,14 @@ func (s *OAuthTokenSync) SyncOauthTokenHook(ctx context.Context, identity *authn
 		return nil
 	}
 
-	// if we recently have performed this it would be cached, so we can skip the hook
-	if _, ok := s.cache.Get(identity.ID); ok {
-		return nil
-	}
-
-	token, exists, _ := s.service.HasOAuthEntry(ctx, identity)
-	// user is not authenticated through oauth so skip further checks
-	if !exists {
-		return nil
-	}
-
-	idTokenExpiry, err := getIDTokenExpiry(token)
-	if err != nil {
-		s.log.FromContext(ctx).Error("Failed to extract expiry of ID token", "id", identity.ID, "error", err)
-	}
-
-	// token has no expire time configured, so we don't have to refresh it
-	if token.OAuthExpiry.IsZero() {
-		// cache the token check, so we don't perform it on every request
-		s.cache.Set(identity.ID, struct{}{}, getOAuthTokenCacheTTL(token.OAuthExpiry, idTokenExpiry))
-		return nil
-	}
-
-	// get the token's auth provider (f.e. azuread)
-	provider := strings.TrimPrefix(token.AuthModule, "oauth_")
-	currentOAuthInfo := s.socialService.GetOAuthInfoProvider(provider)
-	if currentOAuthInfo == nil {
-		s.log.Warn("OAuth provider not found", "provider", provider)
-		return nil
-	}
-
-	// if refresh token handling is disabled for this provider, we can skip the hook
-	if !currentOAuthInfo.UseRefreshToken {
-		return nil
-	}
-
-	accessTokenExpires, hasAccessTokenExpired := getExpiryWithSkew(token.OAuthExpiry)
-
-	hasIdTokenExpired := false
-	idTokenExpires := time.Time{}
-
-	if !idTokenExpiry.IsZero() {
-		idTokenExpires, hasIdTokenExpired = getExpiryWithSkew(idTokenExpiry)
-	}
-	// token has not expired, so we don't have to refresh it
-	if !hasAccessTokenExpired && !hasIdTokenExpired {
-		// cache the token check, so we don't perform it on every request
-		s.cache.Set(identity.ID, struct{}{}, getOAuthTokenCacheTTL(accessTokenExpires, idTokenExpires))
-		return nil
-	}
-
-	_, err, _ = s.sf.Do(identity.ID, func() (interface{}, error) {
+	_, err, _ := s.singleflightGroup.Do(identity.ID, func() (interface{}, error) {
 		s.log.Debug("Singleflight request for OAuth token sync", "key", identity.ID)
 
 		// FIXME: Consider using context.WithoutCancel instead of context.Background after Go 1.21 update
 		updateCtx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
 		defer cancel()
 
-		if refreshErr := s.service.TryTokenRefresh(updateCtx, token); refreshErr != nil {
+		if refreshErr := s.service.TryTokenRefresh(updateCtx, identity); refreshErr != nil {
 			if errors.Is(refreshErr, context.Canceled) {
 				return nil, nil
 			}
@@ -147,56 +89,3 @@ func (s *OAuthTokenSync) SyncOauthTokenHook(ctx context.Context, identity *authn
 
 	return nil
 }
-
-const maxOAuthTokenCacheTTL = 10 * time.Minute
-
-func getOAuthTokenCacheTTL(accessTokenExpiry, idTokenExpiry time.Time) time.Duration {
-	if accessTokenExpiry.IsZero() && idTokenExpiry.IsZero() {
-		return maxOAuthTokenCacheTTL
-	}
-
-	min := func(a, b time.Duration) time.Duration {
-		if a <= b {
-			return a
-		}
-		return b
-	}
-
-	if accessTokenExpiry.IsZero() && !idTokenExpiry.IsZero() {
-		return min(time.Until(idTokenExpiry), maxOAuthTokenCacheTTL)
-	}
-
-	if !accessTokenExpiry.IsZero() && idTokenExpiry.IsZero() {
-		return min(time.Until(accessTokenExpiry), maxOAuthTokenCacheTTL)
-	}
-
-	return min(min(time.Until(accessTokenExpiry), time.Until(idTokenExpiry)), maxOAuthTokenCacheTTL)
-}
-
-// getIDTokenExpiry extracts the expiry time from the ID token
-func getIDTokenExpiry(token *login.UserAuth) (time.Time, error) {
-	if token.OAuthIdToken == "" {
-		return time.Time{}, nil
-	}
-
-	parsedToken, err := jwt.ParseSigned(token.OAuthIdToken)
-	if err != nil {
-		return time.Time{}, fmt.Errorf("error parsing id token: %w", err)
-	}
-
-	type Claims struct {
-		Exp int64 `json:"exp"`
-	}
-	var claims Claims
-	if err := parsedToken.UnsafeClaimsWithoutVerification(&claims); err != nil {
-		return time.Time{}, fmt.Errorf("error getting claims from id token: %w", err)
-	}
-
-	return time.Unix(claims.Exp, 0), nil
-}
-
-func getExpiryWithSkew(expiry time.Time) (adjustedExpiry time.Time, hasTokenExpired bool) {
-	adjustedExpiry = expiry.Round(0).Add(-oauthtoken.ExpiryDelta)
-	hasTokenExpired = adjustedExpiry.Before(time.Now())
-	return
-}
diff --git a/pkg/services/authn/authnimpl/sync/oauth_token_sync_test.go b/pkg/services/authn/authnimpl/sync/oauth_token_sync_test.go
index 8c494c8525f43..9bd0863c82c85 100644
--- a/pkg/services/authn/authnimpl/sync/oauth_token_sync_test.go
+++ b/pkg/services/authn/authnimpl/sync/oauth_token_sync_test.go
@@ -2,21 +2,16 @@ package sync
 
 import (
 	"context"
-	"encoding/base64"
-	"encoding/json"
 	"errors"
-	"fmt"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 	"golang.org/x/sync/singleflight"
 
-	"github.com/grafana/grafana/pkg/infra/localcache"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/login/social"
-	"github.com/grafana/grafana/pkg/login/socialtest"
+	"github.com/grafana/grafana/pkg/login/social/socialtest"
 	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/auth/authtest"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
@@ -45,45 +40,17 @@ func TestOAuthTokenSync_SyncOAuthTokenHook(t *testing.T) {
 
 	tests := []testCase{
 		{
-			desc:     "should skip sync when identity is not a user",
-			identity: &authn.Identity{ID: "service-account:1"},
-		},
-		{
-			desc:     "should skip sync when identity is a user but is not authenticated with session token",
-			identity: &authn.Identity{ID: "user:1"},
-		},
-		{
-			desc:                 "should skip sync when user has session but is not authenticated with oauth",
-			identity:             &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}},
-			expectHasEntryCalled: true,
-		},
-		{
-			desc:                  "should skip sync for when access token don't have expire time",
-			identity:              &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}},
-			expectHasEntryCalled:  true,
-			expectedHasEntryToken: &login.UserAuth{},
-		},
-		{
-			desc:                  "should skip sync when access token has no expired yet",
-			identity:              &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}},
-			expectHasEntryCalled:  true,
-			expectedHasEntryToken: &login.UserAuth{OAuthExpiry: time.Now().Add(10 * time.Minute)},
-		},
-		{
-			desc:                  "should skip sync when access token has no expired yet",
-			identity:              &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}},
-			expectHasEntryCalled:  true,
-			expectedHasEntryToken: &login.UserAuth{OAuthExpiry: time.Now().Add(10 * time.Minute)},
+			desc:                        "should skip sync when identity is not a user",
+			identity:                    &authn.Identity{ID: "service-account:1"},
+			expectTryRefreshTokenCalled: false,
 		},
 		{
-			desc:                        "should refresh access token when it has expired",
-			identity:                    &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}},
-			expectHasEntryCalled:        true,
-			expectTryRefreshTokenCalled: true,
-			expectedHasEntryToken:       &login.UserAuth{OAuthExpiry: time.Now().Add(-10 * time.Minute)},
+			desc:                        "should skip sync when identity is a user but is not authenticated with session token",
+			identity:                    &authn.Identity{ID: "user:1"},
+			expectTryRefreshTokenCalled: false,
 		},
 		{
-			desc:                              "should invalidate access token and session token if access token can't be refreshed",
+			desc:                              "should invalidate access token and session token if token refresh fails",
 			identity:                          &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}},
 			expectHasEntryCalled:              true,
 			expectedTryRefreshErr:             errors.New("some err"),
@@ -92,21 +59,27 @@ func TestOAuthTokenSync_SyncOAuthTokenHook(t *testing.T) {
 			expectRevokeTokenCalled:           true,
 			expectedHasEntryToken:             &login.UserAuth{OAuthExpiry: time.Now().Add(-10 * time.Minute)},
 			expectedErr:                       authn.ErrExpiredAccessToken,
-		}, {
-			desc:                        "should skip sync when use_refresh_token is disabled",
-			identity:                    &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}, AuthenticatedBy: login.GitLabAuthModule},
-			expectHasEntryCalled:        true,
-			expectTryRefreshTokenCalled: false,
-			expectedHasEntryToken:       &login.UserAuth{OAuthExpiry: time.Now().Add(-10 * time.Minute)},
-			oauthInfo:                   &social.OAuthInfo{UseRefreshToken: false},
 		},
 		{
-			desc:                        "should refresh access token when ID token has expired",
-			identity:                    &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}},
-			expectHasEntryCalled:        true,
-			expectTryRefreshTokenCalled: true,
-			expectedHasEntryToken:       &login.UserAuth{OAuthExpiry: time.Now().Add(10 * time.Minute), OAuthIdToken: fakeIDToken(t, time.Now().Add(-10*time.Minute))},
+			desc:                              "should refresh the token successfully",
+			identity:                          &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}},
+			expectHasEntryCalled:              false,
+			expectTryRefreshTokenCalled:       true,
+			expectInvalidateOauthTokensCalled: false,
+			expectRevokeTokenCalled:           false,
+		},
+		{
+			desc:                              "should not invalidate the token if the token has already been refreshed by another request (singleflight)",
+			identity:                          &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}},
+			expectHasEntryCalled:              true,
+			expectTryRefreshTokenCalled:       true,
+			expectInvalidateOauthTokensCalled: false,
+			expectRevokeTokenCalled:           false,
+			expectedHasEntryToken:             &login.UserAuth{OAuthExpiry: time.Now().Add(10 * time.Minute)},
+			expectedTryRefreshErr:             errors.New("some err"),
 		},
+
+		// TODO: address coverage of oauthtoken sync
 	}
 
 	for _, tt := range tests {
@@ -127,7 +100,7 @@ func TestOAuthTokenSync_SyncOAuthTokenHook(t *testing.T) {
 					invalidateTokensCalled = true
 					return nil
 				},
-				TryTokenRefreshFunc: func(ctx context.Context, usr *login.UserAuth) error {
+				TryTokenRefreshFunc: func(ctx context.Context, usr identity.Requester) error {
 					tryRefreshCalled = true
 					return tt.expectedTryRefreshErr
 				},
@@ -151,12 +124,11 @@ func TestOAuthTokenSync_SyncOAuthTokenHook(t *testing.T) {
 			}
 
 			sync := &OAuthTokenSync{
-				log:            log.NewNopLogger(),
-				cache:          localcache.New(0, 0),
-				service:        service,
-				sessionService: sessionService,
-				socialService:  socialService,
-				sf:             new(singleflight.Group),
+				log:               log.NewNopLogger(),
+				service:           service,
+				sessionService:    sessionService,
+				socialService:     socialService,
+				singleflightGroup: new(singleflight.Group),
 			}
 
 			err := sync.SyncOauthTokenHook(context.Background(), tt.identity, nil)
@@ -168,93 +140,3 @@ func TestOAuthTokenSync_SyncOAuthTokenHook(t *testing.T) {
 		})
 	}
 }
-
-// fakeIDToken is used to create a fake invalid token to verify expiry logic
-func fakeIDToken(t *testing.T, expiryDate time.Time) string {
-	type Header struct {
-		Kid string `json:"kid"`
-		Alg string `json:"alg"`
-	}
-	type Payload struct {
-		Iss string `json:"iss"`
-		Sub string `json:"sub"`
-		Exp int64  `json:"exp"`
-	}
-
-	header, err := json.Marshal(Header{Kid: "123", Alg: "none"})
-	require.NoError(t, err)
-	u := expiryDate.UTC().Unix()
-	payload, err := json.Marshal(Payload{Iss: "fake", Sub: "a-sub", Exp: u})
-	require.NoError(t, err)
-
-	fakeSignature := []byte("6ICJm")
-	return fmt.Sprintf("%s.%s.%s", base64.RawURLEncoding.EncodeToString(header), base64.RawURLEncoding.EncodeToString(payload), base64.RawURLEncoding.EncodeToString(fakeSignature))
-}
-
-func TestOAuthTokenSync_getOAuthTokenCacheTTL(t *testing.T) {
-	defaultTime := time.Now()
-	tests := []struct {
-		name              string
-		accessTokenExpiry time.Time
-		idTokenExpiry     time.Time
-		want              time.Duration
-	}{
-		{
-			name:              "should return maxOAuthTokenCacheTTL when no expiry is given",
-			accessTokenExpiry: time.Time{},
-			idTokenExpiry:     time.Time{},
-
-			want: maxOAuthTokenCacheTTL,
-		},
-		{
-			name:              "should return maxOAuthTokenCacheTTL when access token is not given and id token expiry is greater than max cache ttl",
-			accessTokenExpiry: time.Time{},
-			idTokenExpiry:     defaultTime.Add(5*time.Minute + maxOAuthTokenCacheTTL),
-
-			want: maxOAuthTokenCacheTTL,
-		},
-		{
-			name:              "should return idTokenExpiry when access token is not given and id token expiry is less than max cache ttl",
-			accessTokenExpiry: time.Time{},
-			idTokenExpiry:     defaultTime.Add(-5*time.Minute + maxOAuthTokenCacheTTL),
-			want:              time.Until(defaultTime.Add(-5*time.Minute + maxOAuthTokenCacheTTL)),
-		},
-		{
-			name:              "should return maxOAuthTokenCacheTTL when access token expiry is greater than max cache ttl and id token is not given",
-			accessTokenExpiry: defaultTime.Add(5*time.Minute + maxOAuthTokenCacheTTL),
-			idTokenExpiry:     time.Time{},
-			want:              maxOAuthTokenCacheTTL,
-		},
-		{
-			name:              "should return accessTokenExpiry when access token expiry is less than max cache ttl and id token is not given",
-			accessTokenExpiry: defaultTime.Add(-5*time.Minute + maxOAuthTokenCacheTTL),
-			idTokenExpiry:     time.Time{},
-			want:              time.Until(defaultTime.Add(-5*time.Minute + maxOAuthTokenCacheTTL)),
-		},
-		{
-			name:              "should return accessTokenExpiry when access token expiry is less than max cache ttl and less than id token expiry",
-			accessTokenExpiry: defaultTime.Add(-5*time.Minute + maxOAuthTokenCacheTTL),
-			idTokenExpiry:     defaultTime.Add(5*time.Minute + maxOAuthTokenCacheTTL),
-			want:              time.Until(defaultTime.Add(-5*time.Minute + maxOAuthTokenCacheTTL)),
-		},
-		{
-			name:              "should return idTokenExpiry when id token expiry is less than max cache ttl and less than access token expiry",
-			accessTokenExpiry: defaultTime.Add(5*time.Minute + maxOAuthTokenCacheTTL),
-			idTokenExpiry:     defaultTime.Add(-3*time.Minute + maxOAuthTokenCacheTTL),
-			want:              time.Until(defaultTime.Add(-3*time.Minute + maxOAuthTokenCacheTTL)),
-		},
-		{
-			name:              "should return maxOAuthTokenCacheTTL when access token expiry is greater than max cache ttl and id token expiry is greater than max cache ttl",
-			accessTokenExpiry: defaultTime.Add(5*time.Minute + maxOAuthTokenCacheTTL),
-			idTokenExpiry:     defaultTime.Add(5*time.Minute + maxOAuthTokenCacheTTL),
-			want:              maxOAuthTokenCacheTTL,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := getOAuthTokenCacheTTL(tt.accessTokenExpiry, tt.idTokenExpiry)
-
-			assert.Equal(t, tt.want.Round(time.Second), got.Round(time.Second))
-		})
-	}
-}
diff --git a/pkg/services/authn/authnimpl/sync/org_sync.go b/pkg/services/authn/authnimpl/sync/org_sync.go
index a22034113856a..d8d1146dab487 100644
--- a/pkg/services/authn/authnimpl/sync/org_sync.go
+++ b/pkg/services/authn/authnimpl/sync/org_sync.go
@@ -3,23 +3,27 @@ package sync
 import (
 	"context"
 	"errors"
+	"fmt"
 	"sort"
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/authn"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
 )
 
-func ProvideOrgSync(userService user.Service, orgService org.Service, accessControl accesscontrol.Service) *OrgSync {
-	return &OrgSync{userService, orgService, accessControl, log.New("org.sync")}
+func ProvideOrgSync(userService user.Service, orgService org.Service, accessControl accesscontrol.Service, cfg *setting.Cfg) *OrgSync {
+	return &OrgSync{userService, orgService, accessControl, cfg, log.New("org.sync")}
 }
 
 type OrgSync struct {
 	userService   user.Service
 	orgService    org.Service
 	accessControl accesscontrol.Service
+	cfg           *setting.Cfg
 
 	log log.Logger
 }
@@ -29,25 +33,31 @@ func (s *OrgSync) SyncOrgRolesHook(ctx context.Context, id *authn.Identity, _ *a
 		return nil
 	}
 
-	ctxLogger := s.log.FromContext(ctx)
+	ctxLogger := s.log.FromContext(ctx).New("id", id.ID, "login", id.Login)
+
+	namespace, identifier := id.GetNamespacedID()
+	if namespace != authn.NamespaceUser {
+		ctxLogger.Warn("Failed to sync org role, invalid namespace for identity", "namespace", namespace)
+		return nil
+	}
 
-	namespace, userID := id.NamespacedID()
-	if namespace != authn.NamespaceUser || userID <= 0 {
-		ctxLogger.Warn("Failed to sync org role, invalid namespace for identity", "id", id.ID, "namespace", namespace)
+	userID, err := identity.IntIdentifier(namespace, identifier)
+	if err != nil {
+		ctxLogger.Warn("Failed to sync org role, invalid ID for identity", "namespace", namespace, "err", err)
 		return nil
 	}
 
-	ctxLogger.Debug("Syncing organization roles", "id", id.ID, "extOrgRoles", id.OrgRoles)
+	ctxLogger.Debug("Syncing organization roles", "extOrgRoles", id.OrgRoles)
 	// don't sync org roles if none is specified
 	if len(id.OrgRoles) == 0 {
-		ctxLogger.Debug("Not syncing organization roles since external user doesn't have any", "id", id.ID)
+		ctxLogger.Debug("Not syncing organization roles since external user doesn't have any")
 		return nil
 	}
 
 	orgsQuery := &org.GetUserOrgListQuery{UserID: userID}
 	result, err := s.orgService.GetUserOrgList(ctx, orgsQuery)
 	if err != nil {
-		ctxLogger.Error("Failed to get user's organizations", "id", id.ID, "error", err)
+		ctxLogger.Error("Failed to get user's organizations", "error", err)
 		return nil
 	}
 
@@ -65,7 +75,7 @@ func (s *OrgSync) SyncOrgRolesHook(ctx context.Context, id *authn.Identity, _ *a
 			// update role
 			cmd := &org.UpdateOrgUserCommand{OrgID: orga.OrgID, UserID: userID, Role: extRole}
 			if err := s.orgService.UpdateOrgUser(ctx, cmd); err != nil {
-				s.log.FromContext(ctx).Error("Failed to update active org user", "id", id.ID, "error", err)
+				ctxLogger.Error("Failed to update active org user", "error", err)
 				return err
 			}
 		}
@@ -83,17 +93,17 @@ func (s *OrgSync) SyncOrgRolesHook(ctx context.Context, id *authn.Identity, _ *a
 		cmd := &org.AddOrgUserCommand{UserID: userID, Role: orgRole, OrgID: orgId}
 		err := s.orgService.AddOrgUser(ctx, cmd)
 		if err != nil && !errors.Is(err, org.ErrOrgNotFound) {
-			s.log.FromContext(ctx).Error("Failed to update active org for user", "id", id.ID, "error", err)
+			ctxLogger.Error("Failed to update active org for user", "error", err)
 			return err
 		}
 	}
 
 	// delete any removed org roles
 	for _, orgID := range deleteOrgIds {
-		ctxLogger.Debug("Removing user's organization membership as part of syncing with OAuth login", "id", id.ID, "orgId", orgID)
+		ctxLogger.Debug("Removing user's organization membership as part of syncing with OAuth login", "orgId", orgID)
 		cmd := &org.RemoveOrgUserCommand{OrgID: orgID, UserID: userID}
 		if err := s.orgService.RemoveOrgUser(ctx, cmd); err != nil {
-			s.log.FromContext(ctx).Error("Failed to remove user from org", "id", id.ID, "orgId", orgID, "error", err)
+			ctxLogger.Error("Failed to remove user from org", "orgId", orgID, "error", err)
 			if errors.Is(err, org.ErrLastOrgAdmin) {
 				continue
 			}
@@ -102,7 +112,7 @@ func (s *OrgSync) SyncOrgRolesHook(ctx context.Context, id *authn.Identity, _ *a
 		}
 
 		if err := s.accessControl.DeleteUserPermissions(ctx, orgID, cmd.UserID); err != nil {
-			ctxLogger.Error("Failed to delete permissions for user", "id", id.ID, "orgId", orgID, "error", err)
+			ctxLogger.Error("Failed to delete permissions for user", "orgId", orgID, "error", err)
 		}
 	}
 
@@ -121,3 +131,56 @@ func (s *OrgSync) SyncOrgRolesHook(ctx context.Context, id *authn.Identity, _ *a
 
 	return nil
 }
+
+func (s *OrgSync) SetDefaultOrgHook(ctx context.Context, currentIdentity *authn.Identity, r *authn.Request, err error) {
+	if s.cfg.LoginDefaultOrgId < 1 || currentIdentity == nil || err != nil {
+		return
+	}
+
+	ctxLogger := s.log.FromContext(ctx)
+
+	namespace, identifier := currentIdentity.GetNamespacedID()
+	if namespace != identity.NamespaceUser {
+		ctxLogger.Debug("Skipping default org sync, not a user", "namespace", namespace)
+		return
+	}
+
+	userID, err := identity.IntIdentifier(namespace, identifier)
+	if err != nil {
+		ctxLogger.Debug("Skipping default org sync, invalid ID for identity", "id", currentIdentity.ID, "namespace", namespace, "err", err)
+		return
+	}
+
+	hasAssignedToOrg, err := s.validateUsingOrg(ctx, userID, s.cfg.LoginDefaultOrgId)
+	if err != nil {
+		ctxLogger.Error("Skipping default org sync, failed to validate user's organizations", "id", currentIdentity.ID, "err", err)
+		return
+	}
+
+	if !hasAssignedToOrg {
+		ctxLogger.Debug("Skipping default org sync, user is not assigned to org", "id", currentIdentity.ID, "org", s.cfg.LoginDefaultOrgId)
+		return
+	}
+
+	cmd := user.SetUsingOrgCommand{UserID: userID, OrgID: s.cfg.LoginDefaultOrgId}
+	if svcErr := s.userService.SetUsingOrg(ctx, &cmd); svcErr != nil {
+		ctxLogger.Error("Failed to set default org", "id", currentIdentity.ID, "err", svcErr)
+	}
+}
+
+func (s *OrgSync) validateUsingOrg(ctx context.Context, userID int64, orgID int64) (bool, error) {
+	query := org.GetUserOrgListQuery{UserID: userID}
+
+	result, err := s.orgService.GetUserOrgList(ctx, &query)
+	if err != nil {
+		return false, fmt.Errorf("failed to get user's organizations: %w", err)
+	}
+
+	// validate that the org id in the list
+	for _, other := range result {
+		if other.OrgID == orgID {
+			return true, nil
+		}
+	}
+	return false, nil
+}
diff --git a/pkg/services/authn/authnimpl/sync/org_sync_test.go b/pkg/services/authn/authnimpl/sync/org_sync_test.go
index 00bbbf5b1a312..b2083f3a3e439 100644
--- a/pkg/services/authn/authnimpl/sync/org_sync_test.go
+++ b/pkg/services/authn/authnimpl/sync/org_sync_test.go
@@ -2,9 +2,11 @@ package sync
 
 import (
 	"context"
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models/roletype"
@@ -16,6 +18,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/org/orgtest"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/user/usertest"
+	"github.com/grafana/grafana/pkg/setting"
 )
 
 func TestOrgSync_SyncOrgRolesHook(t *testing.T) {
@@ -124,3 +127,100 @@ func TestOrgSync_SyncOrgRolesHook(t *testing.T) {
 		})
 	}
 }
+
+func TestOrgSync_SetDefaultOrgHook(t *testing.T) {
+	testCases := []struct {
+		name              string
+		defaultOrgSetting int64
+		identity          *authn.Identity
+		setupMock         func(*usertest.MockService, *orgtest.FakeOrgService)
+		inputErr          error
+	}{
+		{
+			name:              "should set default org",
+			defaultOrgSetting: 2,
+			identity:          &authn.Identity{ID: "user:1"},
+			setupMock: func(userService *usertest.MockService, orgService *orgtest.FakeOrgService) {
+				userService.On("SetUsingOrg", mock.Anything, mock.MatchedBy(func(cmd *user.SetUsingOrgCommand) bool {
+					return cmd.UserID == 1 && cmd.OrgID == 2
+				})).Return(nil)
+			},
+		},
+		{
+			name:              "should skip setting the default org when default org is not set",
+			defaultOrgSetting: -1,
+			identity:          &authn.Identity{ID: "user:1"},
+		},
+		{
+			name:              "should skip setting the default org when identity is nil",
+			defaultOrgSetting: -1,
+			identity:          nil,
+		},
+		{
+			name:              "should skip setting the default org when input err is not nil",
+			defaultOrgSetting: 2,
+			identity:          &authn.Identity{ID: "user:1"},
+			inputErr:          fmt.Errorf("error"),
+		},
+		{
+			name:              "should skip setting the default org when identity is not a user",
+			defaultOrgSetting: 2,
+			identity:          &authn.Identity{ID: "service-account:1"},
+		},
+		{
+			name:              "should skip setting the default org when user id is not valid",
+			defaultOrgSetting: 2,
+			identity:          &authn.Identity{ID: "user:invalid"},
+		},
+		{
+			name:              "should skip setting the default org when user is not allowed to use the configured default org",
+			defaultOrgSetting: 3,
+			identity:          &authn.Identity{ID: "user:1"},
+		},
+		{
+			name:              "should skip setting the default org when validateUsingOrg returns error",
+			defaultOrgSetting: 2,
+			identity:          &authn.Identity{ID: "user:1"},
+			setupMock: func(userService *usertest.MockService, orgService *orgtest.FakeOrgService) {
+				orgService.ExpectedError = fmt.Errorf("error")
+			},
+		},
+		{
+			name:              "should skip the hook when the user org update was unsuccessful",
+			defaultOrgSetting: 2,
+			identity:          &authn.Identity{ID: "user:1"},
+			setupMock: func(userService *usertest.MockService, orgService *orgtest.FakeOrgService) {
+				userService.On("SetUsingOrg", mock.Anything, mock.Anything).Return(fmt.Errorf("error"))
+			},
+		},
+	}
+	for _, tt := range testCases {
+		t.Run(tt.name, func(t *testing.T) {
+			cfg := setting.NewCfg()
+			cfg.LoginDefaultOrgId = tt.defaultOrgSetting
+
+			userService := &usertest.MockService{}
+			defer userService.AssertExpectations(t)
+
+			orgService := &orgtest.FakeOrgService{
+				ExpectedUserOrgDTO: []*org.UserOrgDTO{{OrgID: 2}},
+			}
+
+			if tt.setupMock != nil {
+				tt.setupMock(userService, orgService)
+			}
+
+			s := &OrgSync{
+				userService:   userService,
+				orgService:    orgService,
+				accessControl: actest.FakeService{},
+				log:           log.NewNopLogger(),
+				cfg:           cfg,
+			}
+
+			s.SetDefaultOrgHook(context.Background(), tt.identity, nil, tt.inputErr)
+
+			userService.AssertExpectations(t)
+		})
+	}
+}
diff --git a/pkg/services/authn/authnimpl/sync/permission_sync.go b/pkg/services/authn/authnimpl/sync/permission_sync.go
deleted file mode 100644
index c9c9d67f742ec..0000000000000
--- a/pkg/services/authn/authnimpl/sync/permission_sync.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package sync
-
-import (
-	"context"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/authn"
-	"github.com/grafana/grafana/pkg/util/errutil"
-)
-
-var (
-	errSyncPermissionsForbidden = errutil.Forbidden("permissions.sync.forbidden")
-)
-
-func ProvidePermissionsSync(acService accesscontrol.Service) *PermissionsSync {
-	return &PermissionsSync{
-		ac:  acService,
-		log: log.New("permissions.sync"),
-	}
-}
-
-type PermissionsSync struct {
-	ac  accesscontrol.Service
-	log log.Logger
-}
-
-func (s *PermissionsSync) SyncPermissionsHook(ctx context.Context, identity *authn.Identity, _ *authn.Request) error {
-	if !identity.ClientParams.SyncPermissions {
-		return nil
-	}
-
-	permissions, err := s.ac.GetUserPermissions(ctx, identity, accesscontrol.Options{ReloadCache: false})
-	if err != nil {
-		s.log.FromContext(ctx).Error("Failed to fetch permissions from db", "error", err, "user_id", identity.ID)
-		return errSyncPermissionsForbidden
-	}
-
-	if identity.Permissions == nil {
-		identity.Permissions = make(map[int64]map[string][]string)
-	}
-	identity.Permissions[identity.OrgID] = accesscontrol.GroupScopesByAction(permissions)
-	return nil
-}
diff --git a/pkg/services/authn/authnimpl/sync/permission_sync_test.go b/pkg/services/authn/authnimpl/sync/permission_sync_test.go
deleted file mode 100644
index db4445536b480..0000000000000
--- a/pkg/services/authn/authnimpl/sync/permission_sync_test.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package sync
-
-import (
-	"context"
-	"testing"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/accesscontrol"
-	acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
-	"github.com/grafana/grafana/pkg/services/auth/identity"
-	"github.com/grafana/grafana/pkg/services/authn"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestPermissionsSync_SyncPermission(t *testing.T) {
-	type testCase struct {
-		name                string
-		identity            *authn.Identity
-		expectedPermissions []accesscontrol.Permission
-	}
-	testCases := []testCase{
-		{
-			name:     "enriches the identity successfully when SyncPermissions is true",
-			identity: &authn.Identity{ID: "user:2", OrgID: 1, ClientParams: authn.ClientParams{SyncPermissions: true}},
-			expectedPermissions: []accesscontrol.Permission{
-				{Action: accesscontrol.ActionUsersRead},
-			},
-		},
-		{
-			name:     "does not load the permissions when SyncPermissions is false",
-			identity: &authn.Identity{ID: "user:2", OrgID: 1, ClientParams: authn.ClientParams{SyncPermissions: true}},
-			expectedPermissions: []accesscontrol.Permission{
-				{Action: accesscontrol.ActionUsersRead},
-			},
-		},
-	}
-
-	for _, tt := range testCases {
-		t.Run(tt.name, func(t *testing.T) {
-			s := setupTestEnv()
-
-			err := s.SyncPermissionsHook(context.Background(), tt.identity, &authn.Request{})
-			require.NoError(t, err)
-
-			assert.Equal(t, 1, len(tt.identity.Permissions))
-			assert.Equal(t, accesscontrol.GroupScopesByAction(tt.expectedPermissions), tt.identity.Permissions[tt.identity.OrgID])
-		})
-	}
-}
-
-func setupTestEnv() *PermissionsSync {
-	acMock := &acmock.Mock{
-		GetUserPermissionsFunc: func(ctx context.Context, siu identity.Requester, o accesscontrol.Options) ([]accesscontrol.Permission, error) {
-			return []accesscontrol.Permission{
-				{Action: accesscontrol.ActionUsersRead},
-			}, nil
-		},
-	}
-	s := &PermissionsSync{
-		ac:  acMock,
-		log: log.NewNopLogger(),
-	}
-	return s
-}
diff --git a/pkg/services/authn/authnimpl/sync/rbac_sync.go b/pkg/services/authn/authnimpl/sync/rbac_sync.go
new file mode 100644
index 0000000000000..98135f5b1945f
--- /dev/null
+++ b/pkg/services/authn/authnimpl/sync/rbac_sync.go
@@ -0,0 +1,93 @@
+package sync
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/authn"
+	"github.com/grafana/grafana/pkg/services/login"
+	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/util/errutil"
+)
+
+var (
+	errInvalidCloudRole         = errutil.BadRequest("rbac.sync.invalid-cloud-role")
+	errSyncPermissionsForbidden = errutil.Forbidden("permissions.sync.forbidden")
+)
+
+func ProvideRBACSync(acService accesscontrol.Service) *RBACSync {
+	return &RBACSync{
+		ac:  acService,
+		log: log.New("permissions.sync"),
+	}
+}
+
+type RBACSync struct {
+	ac  accesscontrol.Service
+	log log.Logger
+}
+
+func (s *RBACSync) SyncPermissionsHook(ctx context.Context, ident *authn.Identity, _ *authn.Request) error {
+	if !ident.ClientParams.SyncPermissions {
+		return nil
+	}
+
+	permissions, err := s.ac.GetUserPermissions(ctx, ident, accesscontrol.Options{ReloadCache: false})
+	if err != nil {
+		s.log.FromContext(ctx).Error("Failed to fetch permissions from db", "error", err, "id", ident.ID)
+		return errSyncPermissionsForbidden
+	}
+
+	if ident.Permissions == nil {
+		ident.Permissions = make(map[int64]map[string][]string)
+	}
+	ident.Permissions[ident.OrgID] = accesscontrol.GroupScopesByAction(permissions)
+	return nil
+}
+
+var fixedCloudRoles = map[org.RoleType]string{
+	org.RoleViewer: accesscontrol.FixedCloudViewerRole,
+	org.RoleEditor: accesscontrol.FixedCloudEditorRole,
+	org.RoleAdmin:  accesscontrol.FixedCloudAdminRole,
+}
+
+func (s *RBACSync) SyncCloudRoles(ctx context.Context, ident *authn.Identity, r *authn.Request) error {
+	// we only want to run this hook during login and if the module used is grafana com
+	if r.GetMeta(authn.MetaKeyAuthModule) != login.GrafanaComAuthModule {
+		return nil
+	}
+
+	namespace, id := ident.GetNamespacedID()
+	if namespace != authn.NamespaceUser {
+		s.log.FromContext(ctx).Debug("Skip syncing cloud role", "id", ident.ID)
+		return nil
+	}
+
+	userID, err := identity.IntIdentifier(namespace, id)
+	if err != nil {
+		return err
+	}
+
+	rolesToAdd := make([]string, 0, 1)
+	rolesToRemove := make([]string, 0, 2)
+
+	for role, fixedRole := range fixedCloudRoles {
+		if role == ident.GetOrgRole() {
+			rolesToAdd = append(rolesToAdd, fixedRole)
+		} else {
+			rolesToRemove = append(rolesToRemove, fixedRole)
+		}
+	}
+
+	if len(rolesToAdd) != 1 {
+		return errInvalidCloudRole.Errorf("invalid role: %s", ident.GetOrgRole())
+	}
+
+	return s.ac.SyncUserRoles(ctx, ident.GetOrgID(), accesscontrol.SyncUserRolesCommand{
+		UserID:        userID,
+		RolesToAdd:    rolesToAdd,
+		RolesToRemove: rolesToRemove,
+	})
+}
diff --git a/pkg/services/authn/authnimpl/sync/rbac_sync_test.go b/pkg/services/authn/authnimpl/sync/rbac_sync_test.go
new file mode 100644
index 0000000000000..27436998f4d61
--- /dev/null
+++ b/pkg/services/authn/authnimpl/sync/rbac_sync_test.go
@@ -0,0 +1,157 @@
+package sync
+
+import (
+	"context"
+	"testing"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/authn"
+	"github.com/grafana/grafana/pkg/services/login"
+	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestRBACSync_SyncPermission(t *testing.T) {
+	type testCase struct {
+		name                string
+		identity            *authn.Identity
+		expectedPermissions []accesscontrol.Permission
+	}
+	testCases := []testCase{
+		{
+			name:     "enriches the identity successfully when SyncPermissions is true",
+			identity: &authn.Identity{ID: "user:2", OrgID: 1, ClientParams: authn.ClientParams{SyncPermissions: true}},
+			expectedPermissions: []accesscontrol.Permission{
+				{Action: accesscontrol.ActionUsersRead},
+			},
+		},
+		{
+			name:     "does not load the permissions when SyncPermissions is false",
+			identity: &authn.Identity{ID: "user:2", OrgID: 1, ClientParams: authn.ClientParams{SyncPermissions: true}},
+			expectedPermissions: []accesscontrol.Permission{
+				{Action: accesscontrol.ActionUsersRead},
+			},
+		},
+	}
+
+	for _, tt := range testCases {
+		t.Run(tt.name, func(t *testing.T) {
+			s := setupTestEnv()
+
+			err := s.SyncPermissionsHook(context.Background(), tt.identity, &authn.Request{})
+			require.NoError(t, err)
+
+			assert.Equal(t, 1, len(tt.identity.Permissions))
+			assert.Equal(t, accesscontrol.GroupScopesByAction(tt.expectedPermissions), tt.identity.Permissions[tt.identity.OrgID])
+		})
+	}
+}
+
+func TestRBACSync_SyncCloudRoles(t *testing.T) {
+	type testCase struct {
+		desc           string
+		module         string
+		identity       *authn.Identity
+		expectedErr    error
+		expectedCalled bool
+	}
+
+	tests := []testCase{
+		{
+			desc:   "should call sync when authenticated with grafana com and has viewer role",
+			module: login.GrafanaComAuthModule,
+			identity: &authn.Identity{
+				ID:       authn.NamespacedID(authn.NamespaceUser, 1),
+				OrgID:    1,
+				OrgRoles: map[int64]org.RoleType{1: org.RoleViewer},
+			},
+			expectedErr:    nil,
+			expectedCalled: true,
+		},
+		{
+			desc:   "should call sync when authenticated with grafana com and has editor role",
+			module: login.GrafanaComAuthModule,
+			identity: &authn.Identity{
+				ID:       authn.NamespacedID(authn.NamespaceUser, 1),
+				OrgID:    1,
+				OrgRoles: map[int64]org.RoleType{1: org.RoleEditor},
+			},
+			expectedErr:    nil,
+			expectedCalled: true,
+		},
+		{
+			desc:   "should call sync when authenticated with grafana com and has admin role",
+			module: login.GrafanaComAuthModule,
+			identity: &authn.Identity{
+				ID:       authn.NamespacedID(authn.NamespaceUser, 1),
+				OrgID:    1,
+				OrgRoles: map[int64]org.RoleType{1: org.RoleAdmin},
+			},
+			expectedErr:    nil,
+			expectedCalled: true,
+		},
+		{
+			desc:   "should not call sync when authenticated with grafana com and has invalid role",
+			module: login.GrafanaComAuthModule,
+			identity: &authn.Identity{
+				ID:       authn.NamespacedID(authn.NamespaceUser, 1),
+				OrgID:    1,
+				OrgRoles: map[int64]org.RoleType{1: org.RoleType("something else")},
+			},
+			expectedErr:    errInvalidCloudRole,
+			expectedCalled: false,
+		},
+		{
+			desc:   "should not call sync when not authenticated with grafana com",
+			module: login.LDAPAuthModule,
+			identity: &authn.Identity{
+				ID:       authn.NamespacedID(authn.NamespaceUser, 1),
+				OrgID:    1,
+				OrgRoles: map[int64]org.RoleType{1: org.RoleAdmin},
+			},
+			expectedErr:    nil,
+			expectedCalled: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.desc, func(t *testing.T) {
+			var called bool
+			s := &RBACSync{
+				ac: &acmock.Mock{
+					SyncUserRolesFunc: func(_ context.Context, _ int64, _ accesscontrol.SyncUserRolesCommand) error {
+						called = true
+						return nil
+					},
+				},
+				log: log.NewNopLogger(),
+			}
+
+			req := &authn.Request{}
+			req.SetMeta(authn.MetaKeyAuthModule, tt.module)
+
+			err := s.SyncCloudRoles(context.Background(), tt.identity, req)
+			assert.ErrorIs(t, err, tt.expectedErr)
+			assert.Equal(t, tt.expectedCalled, called)
+		})
+	}
+}
+
+func setupTestEnv() *RBACSync {
+	acMock := &acmock.Mock{
+		GetUserPermissionsFunc: func(ctx context.Context, siu identity.Requester, o accesscontrol.Options) ([]accesscontrol.Permission, error) {
+			return []accesscontrol.Permission{
+				{Action: accesscontrol.ActionUsersRead},
+			}, nil
+		},
+	}
+	s := &RBACSync{
+		ac:  acMock,
+		log: log.NewNopLogger(),
+	}
+	return s
+}
diff --git a/pkg/services/authn/authnimpl/sync/user_sync.go b/pkg/services/authn/authnimpl/sync/user_sync.go
index 0b0a5b09b912d..6ba757b561527 100644
--- a/pkg/services/authn/authnimpl/sync/user_sync.go
+++ b/pkg/services/authn/authnimpl/sync/user_sync.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 
 	"github.com/grafana/grafana/pkg/infra/log"
+	authidentity "github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/authn"
 	"github.com/grafana/grafana/pkg/services/login"
 	"github.com/grafana/grafana/pkg/services/org"
@@ -109,13 +110,19 @@ func (s *UserSync) FetchSyncedUserHook(ctx context.Context, identity *authn.Iden
 	if !identity.ClientParams.FetchSyncedUser {
 		return nil
 	}
-	namespace, id := identity.NamespacedID()
-	if namespace != authn.NamespaceUser {
+	namespace, id := identity.GetNamespacedID()
+	if namespace != authn.NamespaceUser && namespace != authn.NamespaceServiceAccount {
+		return nil
+	}
+
+	userID, err := authidentity.IntIdentifier(namespace, id)
+	if err != nil {
+		s.log.FromContext(ctx).Warn("got invalid identity ID", "id", id, "err", err)
 		return nil
 	}
 
 	usr, err := s.userService.GetSignedInUserWithCacheCtx(ctx, &user.GetSignedInUserQuery{
-		UserID: id,
+		UserID: userID,
 		OrgID:  r.OrgID,
 	})
 	if err != nil {
@@ -135,15 +142,15 @@ func (s *UserSync) SyncLastSeenHook(ctx context.Context, identity *authn.Identit
 		return nil
 	}
 
-	namespace, id := identity.NamespacedID()
-
-	// do not sync invalid users
-	if id <= 0 {
-		return nil // skip sync
+	namespace, id := identity.GetNamespacedID()
+	if namespace != authn.NamespaceUser && namespace != authn.NamespaceServiceAccount {
+		return nil
 	}
 
-	if namespace != authn.NamespaceUser && namespace != authn.NamespaceServiceAccount {
-		return nil // skip sync
+	userID, err := authidentity.IntIdentifier(namespace, id)
+	if err != nil {
+		s.log.FromContext(ctx).Warn("got invalid identity ID", "id", id, "err", err)
+		return nil
 	}
 
 	go func(userID int64) {
@@ -158,7 +165,7 @@ func (s *UserSync) SyncLastSeenHook(ctx context.Context, identity *authn.Identit
 			!errors.Is(err, user.ErrLastSeenUpToDate) {
 			s.log.Error("Failed to update last_seen_at", "err", err, "userId", userID)
 		}
-	}(id)
+	}(userID)
 
 	return nil
 }
@@ -168,12 +175,18 @@ func (s *UserSync) EnableUserHook(ctx context.Context, identity *authn.Identity,
 		return nil
 	}
 
-	namespace, id := identity.NamespacedID()
+	namespace, id := identity.GetNamespacedID()
 	if namespace != authn.NamespaceUser {
 		return nil
 	}
 
-	return s.userService.Disable(ctx, &user.DisableUserCommand{UserID: id, IsDisabled: false})
+	userID, err := authidentity.IntIdentifier(namespace, id)
+	if err != nil {
+		s.log.FromContext(ctx).Warn("got invalid identity ID", "id", id, "err", err)
+		return nil
+	}
+
+	return s.userService.Disable(ctx, &user.DisableUserCommand{UserID: userID, IsDisabled: false})
 }
 
 func (s *UserSync) upsertAuthConnection(ctx context.Context, userID int64, identity *authn.Identity, createConnection bool) error {
diff --git a/pkg/services/authn/authnimpl/sync/user_sync_test.go b/pkg/services/authn/authnimpl/sync/user_sync_test.go
index eb85191795651..b36033b286c01 100644
--- a/pkg/services/authn/authnimpl/sync/user_sync_test.go
+++ b/pkg/services/authn/authnimpl/sync/user_sync_test.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/grafana/grafana/pkg/services/authn"
 	"github.com/grafana/grafana/pkg/services/login"
-	"github.com/grafana/grafana/pkg/services/login/authinfoservice"
-	"github.com/grafana/grafana/pkg/services/login/logintest"
+	"github.com/grafana/grafana/pkg/services/login/authinfoimpl"
+	"github.com/grafana/grafana/pkg/services/login/authinfotest"
 	"github.com/grafana/grafana/pkg/services/quota"
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
 	"github.com/grafana/grafana/pkg/services/user"
@@ -30,10 +30,9 @@ func ptrInt64(i int64) *int64 {
 }
 
 func TestUserSync_SyncUserHook(t *testing.T) {
-	userProtection := &authinfoservice.OSSUserProtectionImpl{}
+	userProtection := &authinfoimpl.OSSUserProtectionImpl{}
 
-	authFakeNil := &logintest.AuthInfoServiceFake{
-		ExpectedUser:  nil,
+	authFakeNil := &authinfotest.FakeService{
 		ExpectedError: user.ErrUserNotFound,
 		SetAuthInfoFn: func(ctx context.Context, cmd *login.SetAuthInfoCommand) error {
 			return nil
@@ -42,8 +41,7 @@ func TestUserSync_SyncUserHook(t *testing.T) {
 			return nil
 		},
 	}
-	authFakeUserID := &logintest.AuthInfoServiceFake{
-		ExpectedUser:  nil,
+	authFakeUserID := &authinfotest.FakeService{
 		ExpectedError: nil,
 		ExpectedUserAuth: &login.UserAuth{
 			AuthModule: "oauth",
@@ -68,7 +66,6 @@ func TestUserSync_SyncUserHook(t *testing.T) {
 	}}
 
 	userServiceNil := &usertest.FakeUserService{
-		ExpectedUser:  nil,
 		ExpectedError: user.ErrUserNotFound,
 		CreateFn: func(ctx context.Context, cmd *user.CreateUserCommand) (*user.User, error) {
 			return &user.User{
diff --git a/pkg/services/authn/authnimpl/usage_stats.go b/pkg/services/authn/authnimpl/usage_stats.go
index e2b15cf1ab4de..52f224c7326de 100644
--- a/pkg/services/authn/authnimpl/usage_stats.go
+++ b/pkg/services/authn/authnimpl/usage_stats.go
@@ -13,9 +13,9 @@ func (s *Service) getUsageStats(ctx context.Context) (map[string]any, error) {
 	authTypes := map[string]bool{}
 	authTypes["basic_auth"] = s.cfg.BasicAuthEnabled
 	authTypes["ldap"] = s.cfg.LDAPAuthEnabled
-	authTypes["auth_proxy"] = s.cfg.AuthProxyEnabled
+	authTypes["auth_proxy"] = s.cfg.AuthProxy.Enabled
 	authTypes["anonymous"] = s.cfg.AnonymousEnabled
-	authTypes["jwt"] = s.cfg.JWTAuthEnabled
+	authTypes["jwt"] = s.cfg.JWTAuth.Enabled
 	authTypes["grafana_password"] = !s.cfg.DisableLogin
 	authTypes["login_form"] = !s.cfg.DisableLoginForm
 
diff --git a/pkg/services/authn/authnimpl/usage_stats_test.go b/pkg/services/authn/authnimpl/usage_stats_test.go
index ba59c1f1818fe..04d9776ce3174 100644
--- a/pkg/services/authn/authnimpl/usage_stats_test.go
+++ b/pkg/services/authn/authnimpl/usage_stats_test.go
@@ -20,8 +20,8 @@ func TestService_getUsageStats(t *testing.T) {
 	svc.cfg.DisableLoginForm = false
 	svc.cfg.DisableLogin = false
 	svc.cfg.BasicAuthEnabled = true
-	svc.cfg.AuthProxyEnabled = true
-	svc.cfg.JWTAuthEnabled = true
+	svc.cfg.AuthProxy.Enabled = true
+	svc.cfg.JWTAuth.Enabled = true
 	svc.cfg.LDAPAuthEnabled = true
 	svc.cfg.EditorsCanAdmin = true
 	svc.cfg.ViewersCanEdit = true
diff --git a/pkg/services/authn/authntest/fake.go b/pkg/services/authn/authntest/fake.go
index 3c7af4060f175..c83154a9d8cfb 100644
--- a/pkg/services/authn/authntest/fake.go
+++ b/pkg/services/authn/authntest/fake.go
@@ -3,6 +3,8 @@ package authntest
 import (
 	"context"
 
+	"github.com/grafana/grafana/pkg/models/usertoken"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/authn"
 )
 
@@ -66,6 +68,14 @@ func (f *FakeService) RedirectURL(ctx context.Context, client string, r *authn.R
 	return f.ExpectedRedirect, f.ExpectedErr
 }
 
+func (f *FakeService) Logout(_ context.Context, _ identity.Requester, _ *usertoken.UserToken) (*authn.Redirect, error) {
+	panic("unimplemented")
+}
+
+func (f *FakeService) ResolveIdentity(ctx context.Context, orgID int64, namespaceID string) (*authn.Identity, error) {
+	panic("unimplemented")
+}
+
 func (f *FakeService) RegisterClient(c authn.Client) {}
 
 func (f *FakeService) SyncIdentity(ctx context.Context, identity *authn.Identity) error {
diff --git a/pkg/services/authn/authntest/mock.go b/pkg/services/authn/authntest/mock.go
index 0868fad5aaabc..193200e549883 100644
--- a/pkg/services/authn/authntest/mock.go
+++ b/pkg/services/authn/authntest/mock.go
@@ -3,7 +3,10 @@ package authntest
 import (
 	"context"
 
+	"github.com/grafana/grafana/pkg/models/usertoken"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/authn"
+	"github.com/grafana/grafana/pkg/services/login"
 )
 
 var _ authn.Service = new(MockService)
@@ -40,6 +43,14 @@ func (m *MockService) RegisterPostLoginHook(hook authn.PostLoginHookFn, priority
 	panic("unimplemented")
 }
 
+func (*MockService) Logout(_ context.Context, _ identity.Requester, _ *usertoken.UserToken) (*authn.Redirect, error) {
+	panic("unimplemented")
+}
+
+func (m *MockService) ResolveIdentity(ctx context.Context, orgID int64, namespaceID string) (*authn.Identity, error) {
+	panic("unimplemented")
+}
+
 func (m *MockService) SyncIdentity(ctx context.Context, identity *authn.Identity) error {
 	if m.SyncIdentityFunc != nil {
 		return m.SyncIdentityFunc(ctx, identity)
@@ -48,6 +59,7 @@ func (m *MockService) SyncIdentity(ctx context.Context, identity *authn.Identity
 }
 
 var _ authn.HookClient = new(MockClient)
+var _ authn.LogoutClient = new(MockClient)
 var _ authn.ContextAwareClient = new(MockClient)
 
 type MockClient struct {
@@ -56,6 +68,7 @@ type MockClient struct {
 	TestFunc         func(ctx context.Context, r *authn.Request) bool
 	PriorityFunc     func() uint
 	HookFunc         func(ctx context.Context, identity *authn.Identity, r *authn.Request) error
+	LogoutFunc       func(ctx context.Context, user identity.Requester, info *login.UserAuth) (*authn.Redirect, bool)
 }
 
 func (m MockClient) Name() string {
@@ -93,6 +106,13 @@ func (m MockClient) Hook(ctx context.Context, identity *authn.Identity, r *authn
 	return nil
 }
 
+func (m *MockClient) Logout(ctx context.Context, user identity.Requester, info *login.UserAuth) (*authn.Redirect, bool) {
+	if m.LogoutFunc != nil {
+		return m.LogoutFunc(ctx, user, info)
+	}
+	return nil, false
+}
+
 var _ authn.ProxyClient = new(MockProxyClient)
 
 type MockProxyClient struct {
diff --git a/pkg/services/authn/clients/api_key.go b/pkg/services/authn/clients/api_key.go
index 11e0e689aba75..4005005631185 100644
--- a/pkg/services/authn/clients/api_key.go
+++ b/pkg/services/authn/clients/api_key.go
@@ -10,34 +10,33 @@ import (
 	"github.com/grafana/grafana/pkg/components/satokengen"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/apikey"
+	authidentity "github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/authn"
 	"github.com/grafana/grafana/pkg/services/login"
 	"github.com/grafana/grafana/pkg/services/org"
-	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/util"
 	"github.com/grafana/grafana/pkg/util/errutil"
 )
 
 var (
-	errAPIKeyInvalid = errutil.Unauthorized("api-key.invalid", errutil.WithPublicMessage("Invalid API key"))
-	errAPIKeyExpired = errutil.Unauthorized("api-key.expired", errutil.WithPublicMessage("Expired API key"))
-	errAPIKeyRevoked = errutil.Unauthorized("api-key.revoked", errutil.WithPublicMessage("Revoked API key"))
+	errAPIKeyInvalid     = errutil.Unauthorized("api-key.invalid", errutil.WithPublicMessage("Invalid API key"))
+	errAPIKeyExpired     = errutil.Unauthorized("api-key.expired", errutil.WithPublicMessage("Expired API key"))
+	errAPIKeyRevoked     = errutil.Unauthorized("api-key.revoked", errutil.WithPublicMessage("Revoked API key"))
+	errAPIKeyOrgMismatch = errutil.Unauthorized("api-key.organization-mismatch", errutil.WithPublicMessage("API key does not belong to the requested organization"))
 )
 
 var _ authn.HookClient = new(APIKey)
 var _ authn.ContextAwareClient = new(APIKey)
 
-func ProvideAPIKey(apiKeyService apikey.Service, userService user.Service) *APIKey {
+func ProvideAPIKey(apiKeyService apikey.Service) *APIKey {
 	return &APIKey{
 		log:           log.New(authn.ClientAPIKey),
-		userService:   userService,
 		apiKeyService: apiKeyService,
 	}
 }
 
 type APIKey struct {
 	log           log.Logger
-	userService   user.Service
 	apiKeyService apikey.Service
 }
 
@@ -62,6 +61,12 @@ func (s *APIKey) Authenticate(ctx context.Context, r *authn.Request) (*authn.Ide
 		return nil, errAPIKeyRevoked.Errorf("Api key is revoked")
 	}
 
+	if r.OrgID == 0 {
+		r.OrgID = apiKey.OrgID
+	} else if r.OrgID != apiKey.OrgID {
+		return nil, errAPIKeyOrgMismatch.Errorf("API does not belong in Organization %v", r.OrgID)
+	}
+
 	// if the api key don't belong to a service account construct the identity and return it
 	if apiKey.ServiceAccountId == nil || *apiKey.ServiceAccountId < 1 {
 		return &authn.Identity{
@@ -73,16 +78,12 @@ func (s *APIKey) Authenticate(ctx context.Context, r *authn.Request) (*authn.Ide
 		}, nil
 	}
 
-	usr, err := s.userService.GetSignedInUserWithCacheCtx(ctx, &user.GetSignedInUserQuery{
-		UserID: *apiKey.ServiceAccountId,
-		OrgID:  apiKey.OrgID,
-	})
-
-	if err != nil {
-		return nil, err
-	}
-
-	return authn.IdentityFromSignedInUser(authn.NamespacedID(authn.NamespaceServiceAccount, usr.UserID), usr, authn.ClientParams{SyncPermissions: true}, login.APIKeyAuthModule), nil
+	return &authn.Identity{
+		ID:              authn.NamespacedID(authn.NamespaceServiceAccount, *apiKey.ServiceAccountId),
+		OrgID:           apiKey.OrgID,
+		AuthenticatedBy: login.APIKeyAuthModule,
+		ClientParams:    authn.ClientParams{FetchSyncedUser: true, SyncPermissions: true},
+	}, nil
 }
 
 func (s *APIKey) getAPIKey(ctx context.Context, token string) (*apikey.APIKey, error) {
@@ -147,8 +148,9 @@ func (s *APIKey) Priority() uint {
 }
 
 func (s *APIKey) Hook(ctx context.Context, identity *authn.Identity, r *authn.Request) error {
-	namespace, id := identity.NamespacedID()
-	if namespace != authn.NamespaceAPIKey {
+	id, exists := s.getAPIKeyID(ctx, identity, r)
+
+	if !exists {
 		return nil
 	}
 
@@ -166,6 +168,32 @@ func (s *APIKey) Hook(ctx context.Context, identity *authn.Identity, r *authn.Re
 	return nil
 }
 
+func (s *APIKey) getAPIKeyID(ctx context.Context, identity *authn.Identity, r *authn.Request) (apiKeyID int64, exists bool) {
+	namespace, identifier := identity.GetNamespacedID()
+
+	id, err := authidentity.IntIdentifier(namespace, identifier)
+	if err != nil {
+		s.log.Warn("Failed to parse ID from identifier", "err", err)
+		return -1, false
+	}
+	if namespace == authn.NamespaceAPIKey {
+		return id, true
+	}
+
+	if namespace == authn.NamespaceServiceAccount {
+		// When the identity is service account, the ID in from the namespace is the service account ID.
+		// We need to fetch the API key in this scenario, as we could use it to uniquely identify a service account token.
+		apiKey, err := s.getAPIKey(ctx, getTokenFromRequest(r))
+		if err != nil {
+			s.log.Warn("Failed to fetch the API Key from request")
+			return -1, false
+		}
+
+		return apiKey.ID, true
+	}
+	return -1, false
+}
+
 func looksLikeApiKey(token string) bool {
 	return token != ""
 }
diff --git a/pkg/services/authn/clients/api_key_test.go b/pkg/services/authn/clients/api_key_test.go
index a996dcca3f7d9..5cb8ae6311887 100644
--- a/pkg/services/authn/clients/api_key_test.go
+++ b/pkg/services/authn/clients/api_key_test.go
@@ -16,8 +16,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/authn"
 	"github.com/grafana/grafana/pkg/services/login"
 	"github.com/grafana/grafana/pkg/services/org"
-	"github.com/grafana/grafana/pkg/services/user"
-	"github.com/grafana/grafana/pkg/services/user/usertest"
 )
 
 var (
@@ -30,7 +28,6 @@ func TestAPIKey_Authenticate(t *testing.T) {
 		desc             string
 		req              *authn.Request
 		expectedKey      *apikey.APIKey
-		expectedUser     *user.SignedInUser
 		expectedErr      error
 		expectedIdentity *authn.Identity
 	}
@@ -72,20 +69,11 @@ func TestAPIKey_Authenticate(t *testing.T) {
 				Key:              hash,
 				ServiceAccountId: intPtr(1),
 			},
-			expectedUser: &user.SignedInUser{
-				UserID:           1,
-				OrgID:            1,
-				IsServiceAccount: true,
-				OrgRole:          org.RoleViewer,
-				Name:             "test",
-			},
 			expectedIdentity: &authn.Identity{
-				ID:             "service-account:1",
-				OrgID:          1,
-				Name:           "test",
-				OrgRoles:       map[int64]org.RoleType{1: org.RoleViewer},
-				IsGrafanaAdmin: boolPtr(false),
+				ID:    "service-account:1",
+				OrgID: 1,
 				ClientParams: authn.ClientParams{
+					FetchSyncedUser: true,
 					SyncPermissions: true,
 				},
 				AuthenticatedBy: login.APIKeyAuthModule,
@@ -109,24 +97,33 @@ func TestAPIKey_Authenticate(t *testing.T) {
 			},
 			expectedErr: errAPIKeyRevoked,
 		},
+		{
+			desc: "should fail for api key in another organization",
+			req:  &authn.Request{OrgID: 1, HTTPRequest: &http.Request{Header: map[string][]string{"Authorization": {"Bearer " + secret}}}},
+			expectedKey: &apikey.APIKey{
+				ID:               1,
+				OrgID:            2,
+				Key:              hash,
+				ServiceAccountId: intPtr(1),
+			},
+			expectedErr: errAPIKeyOrgMismatch,
+		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.desc, func(t *testing.T) {
-			c := ProvideAPIKey(&apikeytest.Service{
-				ExpectedAPIKey: tt.expectedKey,
-			}, &usertest.FakeUserService{
-				ExpectedSignedInUser: tt.expectedUser,
-			})
+			c := ProvideAPIKey(&apikeytest.Service{ExpectedAPIKey: tt.expectedKey})
 
 			identity, err := c.Authenticate(context.Background(), tt.req)
 			if tt.expectedErr != nil {
 				assert.Nil(t, identity)
 				assert.ErrorIs(t, err, tt.expectedErr)
-			} else {
-				assert.NoError(t, err)
-				assert.EqualValues(t, *tt.expectedIdentity, *identity)
+				return
 			}
+
+			assert.NoError(t, err)
+			assert.EqualValues(t, *tt.expectedIdentity, *identity)
+			assert.Equal(t, tt.req.OrgID, tt.expectedIdentity.OrgID, "the request organization should match the identity's one")
 		})
 	}
 }
@@ -182,12 +179,110 @@ func TestAPIKey_Test(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.desc, func(t *testing.T) {
-			c := ProvideAPIKey(&apikeytest.Service{}, usertest.NewUserServiceFake())
+			c := ProvideAPIKey(&apikeytest.Service{})
 			assert.Equal(t, tt.expected, c.Test(context.Background(), tt.req))
 		})
 	}
 }
 
+func TestAPIKey_GetAPIKeyIDFromIdentity(t *testing.T) {
+	type TestCase struct {
+		desc             string
+		expectedKey      *apikey.APIKey
+		expectedIdentity *authn.Identity
+		expectedError    error
+		expectedKeyID    int64
+		expectedExists   bool
+	}
+
+	tests := []TestCase{
+		{
+			desc: "should return API Key ID for valid token that is connected to service account",
+			expectedKey: &apikey.APIKey{
+				ID:               1,
+				OrgID:            1,
+				Key:              hash,
+				ServiceAccountId: intPtr(1),
+			},
+			expectedIdentity: &authn.Identity{
+				ID:              "service-account:1",
+				OrgID:           1,
+				Name:            "test",
+				AuthenticatedBy: login.APIKeyAuthModule,
+			},
+			expectedKeyID:  1,
+			expectedExists: true,
+		},
+		{
+			desc: "should return API Key ID for valid token for API key",
+			expectedKey: &apikey.APIKey{
+				ID:    2,
+				OrgID: 1,
+				Key:   hash,
+			},
+			expectedIdentity: &authn.Identity{
+				ID:              "api-key:2",
+				OrgID:           1,
+				Name:            "test",
+				AuthenticatedBy: login.APIKeyAuthModule,
+			},
+			expectedKeyID:  2,
+			expectedExists: true,
+		},
+		{
+			desc: "should not return any ID when the request is not made by API key or service account",
+			expectedKey: &apikey.APIKey{
+				ID:    2,
+				OrgID: 1,
+				Key:   hash,
+			},
+			expectedIdentity: &authn.Identity{
+				ID:              "user:2",
+				OrgID:           1,
+				Name:            "test",
+				AuthenticatedBy: login.APIKeyAuthModule,
+			},
+			expectedKeyID:  -1,
+			expectedExists: false,
+		},
+		{
+			desc: "should not return any ID when the can't fetch API Key",
+			expectedKey: &apikey.APIKey{
+				ID:    1,
+				OrgID: 1,
+				Key:   hash,
+			},
+			expectedIdentity: &authn.Identity{
+				ID:              "service-account:2",
+				OrgID:           1,
+				Name:            "test",
+				AuthenticatedBy: login.APIKeyAuthModule,
+			},
+			expectedError:  fmt.Errorf("invalid token"),
+			expectedKeyID:  -1,
+			expectedExists: false,
+		},
+	}
+
+	req := &authn.Request{HTTPRequest: &http.Request{
+		Header: map[string][]string{
+			"Authorization": {"Bearer " + secret},
+		},
+	}}
+
+	for _, tt := range tests {
+		t.Run(tt.desc, func(t *testing.T) {
+			c := ProvideAPIKey(&apikeytest.Service{
+				ExpectedError:  tt.expectedError,
+				ExpectedAPIKey: tt.expectedKey,
+			})
+			id, exists := c.getAPIKeyID(context.Background(), tt.expectedIdentity, req)
+			assert.Equal(t, tt.expectedExists, exists)
+			assert.Equal(t, tt.expectedKeyID, id)
+		})
+	}
+}
+
 func intPtr(n int64) *int64 {
 	return &n
 }
diff --git a/pkg/services/authn/clients/basic.go b/pkg/services/authn/clients/basic.go
index bda9f3c1ed56a..d0c7050f5bf55 100644
--- a/pkg/services/authn/clients/basic.go
+++ b/pkg/services/authn/clients/basic.go
@@ -2,7 +2,6 @@ package clients
 
 import (
 	"context"
-	"strings"
 
 	"github.com/grafana/grafana/pkg/services/authn"
 	"github.com/grafana/grafana/pkg/util/errutil"
@@ -43,10 +42,6 @@ func (c *Basic) Test(ctx context.Context, r *authn.Request) bool {
 	if r.HTTPRequest == nil {
 		return false
 	}
-	// The OAuth2 introspection endpoint uses basic auth but is handled by the oauthserver package.
-	if strings.EqualFold(r.HTTPRequest.RequestURI, "/oauth2/introspect") {
-		return false
-	}
 	return looksLikeBasicAuthRequest(r)
 }
 
diff --git a/pkg/services/authn/clients/basic_test.go b/pkg/services/authn/clients/basic_test.go
index 93fbd7d4165cf..fbf2a96a2d7d0 100644
--- a/pkg/services/authn/clients/basic_test.go
+++ b/pkg/services/authn/clients/basic_test.go
@@ -85,12 +85,6 @@ func TestBasic_Test(t *testing.T) {
 				HTTPRequest: &http.Request{Header: map[string][]string{authorizationHeaderName: {"something"}}},
 			},
 		},
-		{
-			desc: "should fail when the URL ends with /oauth2/introspect",
-			req: &authn.Request{
-				HTTPRequest: &http.Request{Header: map[string][]string{authorizationHeaderName: {encodeBasicAuth("user", "password")}}, RequestURI: "/oauth2/introspect"},
-			},
-		},
 	}
 
 	for _, tt := range tests {
diff --git a/pkg/services/authn/clients/ext_jwt.go b/pkg/services/authn/clients/ext_jwt.go
index 4d9b88d0de28e..1fd3ef8b358c1 100644
--- a/pkg/services/authn/clients/ext_jwt.go
+++ b/pkg/services/authn/clients/ext_jwt.go
@@ -4,17 +4,16 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
 
 	"github.com/go-jose/go-jose/v3"
 	"github.com/go-jose/go-jose/v3/jwt"
-	"golang.org/x/exp/slices"
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/authn"
-	"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver"
 	"github.com/grafana/grafana/pkg/services/login"
 	"github.com/grafana/grafana/pkg/services/signingkeys"
 	"github.com/grafana/grafana/pkg/services/user"
@@ -33,13 +32,12 @@ const (
 	rfc9068MediaType      = "application/at+jwt"
 )
 
-func ProvideExtendedJWT(userService user.Service, cfg *setting.Cfg, signingKeys signingkeys.Service, oauthServer oauthserver.OAuth2Server) *ExtendedJWT {
+func ProvideExtendedJWT(userService user.Service, cfg *setting.Cfg, signingKeys signingkeys.Service) *ExtendedJWT {
 	return &ExtendedJWT{
 		cfg:         cfg,
 		log:         log.New(authn.ClientExtendedJWT),
 		userService: userService,
 		signingKeys: signingKeys,
-		oauthServer: oauthServer,
 	}
 }
 
@@ -48,7 +46,6 @@ type ExtendedJWT struct {
 	log         log.Logger
 	userService user.Service
 	signingKeys signingkeys.Service
-	oauthServer oauthserver.OAuth2Server
 }
 
 type ExtendedJWTClaims struct {
@@ -222,10 +219,6 @@ func (s *ExtendedJWT) validateClientIdClaim(ctx context.Context, claims Extended
 		return fmt.Errorf("missing 'client_id' claim")
 	}
 
-	if _, err := s.oauthServer.GetExternalService(ctx, claims.ClientID); err != nil {
-		return fmt.Errorf("invalid 'client_id' claim: %s", claims.ClientID)
-	}
-
 	return nil
 }
 
diff --git a/pkg/services/authn/clients/ext_jwt_test.go b/pkg/services/authn/clients/ext_jwt_test.go
index 7f2f3e91f7dcb..64ff1c5095cdd 100644
--- a/pkg/services/authn/clients/ext_jwt_test.go
+++ b/pkg/services/authn/clients/ext_jwt_test.go
@@ -17,8 +17,6 @@ import (
 
 	"github.com/grafana/grafana/pkg/models/roletype"
 	"github.com/grafana/grafana/pkg/services/authn"
-	"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver"
-	"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver/oastest"
 	"github.com/grafana/grafana/pkg/services/login"
 	"github.com/grafana/grafana/pkg/services/signingkeys"
 	"github.com/grafana/grafana/pkg/services/signingkeys/signingkeystest"
@@ -268,27 +266,6 @@ func TestExtendedJWT_Authenticate(t *testing.T) {
 			want:    nil,
 			wantErr: true,
 		},
-		{
-			name: "should return error when the client was not found",
-			payload: ExtendedJWTClaims{
-				Claims: jwt.Claims{
-					Issuer:   "http://localhost:3000",
-					Subject:  "user:id:2",
-					Audience: jwt.Audience{"http://localhost:3000"},
-					ID:       "1234567890",
-					Expiry:   jwt.NewNumericDate(time.Date(2023, 5, 3, 0, 0, 0, 0, time.UTC)),
-					IssuedAt: jwt.NewNumericDate(time.Date(2023, 5, 2, 0, 0, 0, 0, time.UTC)),
-				},
-				ClientID: "unknown-client-id",
-				Scopes:   []string{"profile", "groups"},
-			},
-			initTestEnv: func(env *testEnv) {
-				env.oauthSvc.ExpectedErr = oauthserver.ErrClientNotFound("unknown-client-id")
-			},
-			orgID:   1,
-			want:    nil,
-			wantErr: true,
-		},
 	}
 
 	for _, tc := range testCases {
@@ -521,21 +498,18 @@ func setupTestCtx(t *testing.T, cfg *setting.Cfg) *testEnv {
 	}
 
 	userSvc := &usertest.FakeUserService{}
-	oauthSvc := &oastest.FakeService{}
 
-	extJwtClient := ProvideExtendedJWT(userSvc, cfg, signingKeysSvc, oauthSvc)
+	extJwtClient := ProvideExtendedJWT(userSvc, cfg, signingKeysSvc)
 
 	return &testEnv{
-		oauthSvc: oauthSvc,
-		userSvc:  userSvc,
-		s:        extJwtClient,
+		userSvc: userSvc,
+		s:       extJwtClient,
 	}
 }
 
 type testEnv struct {
-	oauthSvc *oastest.FakeService
-	userSvc  *usertest.FakeUserService
-	s        *ExtendedJWT
+	userSvc *usertest.FakeUserService
+	s       *ExtendedJWT
 }
 
 func generateToken(payload ExtendedJWTClaims, signingKey any, alg jose.SignatureAlgorithm) string {
diff --git a/pkg/services/authn/clients/grafana.go b/pkg/services/authn/clients/grafana.go
index 6f16e3e910d74..10e330086004b 100644
--- a/pkg/services/authn/clients/grafana.go
+++ b/pkg/services/authn/clients/grafana.go
@@ -40,11 +40,11 @@ func (c *Grafana) AuthenticateProxy(ctx context.Context, r *authn.Request, usern
 			FetchSyncedUser: true,
 			SyncOrgRoles:    true,
 			SyncPermissions: true,
-			AllowSignUp:     c.cfg.AuthProxyAutoSignUp,
+			AllowSignUp:     c.cfg.AuthProxy.AutoSignUp,
 		},
 	}
 
-	switch c.cfg.AuthProxyHeaderProperty {
+	switch c.cfg.AuthProxy.HeaderProperty {
 	case "username":
 		identity.Login = username
 		addr, err := mail.ParseAddress(username)
@@ -55,7 +55,7 @@ func (c *Grafana) AuthenticateProxy(ctx context.Context, r *authn.Request, usern
 		identity.Login = username
 		identity.Email = username
 	default:
-		return nil, errInvalidProxyHeader.Errorf("invalid auth proxy header property, expected username or email but got: %s", c.cfg.AuthProxyHeaderProperty)
+		return nil, errInvalidProxyHeader.Errorf("invalid auth proxy header property, expected username or email but got: %s", c.cfg.AuthProxy.HeaderProperty)
 	}
 
 	if v, ok := additional[proxyFieldName]; ok {
@@ -92,7 +92,7 @@ func (c *Grafana) AuthenticatePassword(ctx context.Context, r *authn.Request, us
 	usr, err := c.userService.GetByLogin(ctx, &user.GetUserByLoginQuery{LoginOrEmail: username})
 	if err != nil {
 		if errors.Is(err, user.ErrUserNotFound) {
-			return nil, errIdentityNotFound.Errorf("no user fund: %w", err)
+			return nil, errIdentityNotFound.Errorf("no user found: %w", err)
 		}
 		return nil, err
 	}
@@ -100,7 +100,7 @@ func (c *Grafana) AuthenticatePassword(ctx context.Context, r *authn.Request, us
 	// user was found so set auth module in req metadata
 	r.SetMeta(authn.MetaKeyAuthModule, "grafana")
 
-	if ok := comparePassword(password, usr.Salt, usr.Password); !ok {
+	if ok := comparePassword(password, usr.Salt, string(usr.Password)); !ok {
 		return nil, errInvalidPassword.Errorf("invalid password")
 	}
 
diff --git a/pkg/services/authn/clients/grafana_test.go b/pkg/services/authn/clients/grafana_test.go
index 53dab4486e4f6..f77d233744fad 100644
--- a/pkg/services/authn/clients/grafana_test.go
+++ b/pkg/services/authn/clients/grafana_test.go
@@ -94,8 +94,8 @@ func TestGrafana_AuthenticateProxy(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.desc, func(t *testing.T) {
 			cfg := setting.NewCfg()
-			cfg.AuthProxyAutoSignUp = true
-			cfg.AuthProxyHeaderProperty = tt.proxyProperty
+			cfg.AuthProxy.AutoSignUp = true
+			cfg.AuthProxy.HeaderProperty = tt.proxyProperty
 			c := ProvideGrafana(cfg, usertest.NewUserServiceFake())
 
 			identity, err := c.AuthenticateProxy(context.Background(), tt.req, tt.username, tt.additional)
@@ -171,7 +171,7 @@ func TestGrafana_AuthenticatePassword(t *testing.T) {
 			hashed, _ := util.EncodePassword("password", "salt")
 			userService := &usertest.FakeUserService{
 				ExpectedSignedInUser: tt.expectedSignedInUser,
-				ExpectedUser:         &user.User{Password: hashed, Salt: "salt"},
+				ExpectedUser:         &user.User{Password: user.Password(hashed), Salt: "salt"},
 			}
 
 			if !tt.findUser {
diff --git a/pkg/services/authn/clients/identity.go b/pkg/services/authn/clients/identity.go
new file mode 100644
index 0000000000000..557f04db9d50f
--- /dev/null
+++ b/pkg/services/authn/clients/identity.go
@@ -0,0 +1,33 @@
+package clients
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/services/authn"
+)
+
+var _ authn.Client = (*IdentityClient)(nil)
+
+func ProvideIdentity(namespaceID string) *IdentityClient {
+	return &IdentityClient{namespaceID}
+}
+
+type IdentityClient struct {
+	namespaceID string
+}
+
+func (i *IdentityClient) Name() string {
+	return "identity"
+}
+
+// Authenticate implements authn.Client.
+func (i *IdentityClient) Authenticate(ctx context.Context, r *authn.Request) (*authn.Identity, error) {
+	return &authn.Identity{
+		OrgID: r.OrgID,
+		ID:    i.namespaceID,
+		ClientParams: authn.ClientParams{
+			FetchSyncedUser: true,
+			SyncPermissions: true,
+		},
+	}, nil
+}
diff --git a/pkg/services/authn/clients/jwt.go b/pkg/services/authn/clients/jwt.go
index 9c628906bafae..4c741fd2ab0e6 100644
--- a/pkg/services/authn/clients/jwt.go
+++ b/pkg/services/authn/clients/jwt.go
@@ -2,13 +2,9 @@ package clients
 
 import (
 	"context"
-	"errors"
-	"fmt"
 	"net/http"
 	"strings"
 
-	"github.com/jmespath/go-jmespath"
-
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/auth"
 	authJWT "github.com/grafana/grafana/pkg/services/auth/jwt"
@@ -16,6 +12,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/login"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util"
 	"github.com/grafana/grafana/pkg/util/errutil"
 )
 
@@ -73,17 +70,31 @@ func (s *JWT) Authenticate(ctx context.Context, r *authn.Request) (*authn.Identi
 			SyncUser:        true,
 			FetchSyncedUser: true,
 			SyncPermissions: true,
-			SyncOrgRoles:    !s.cfg.JWTAuthSkipOrgRoleSync,
-			AllowSignUp:     s.cfg.JWTAuthAutoSignUp,
+			SyncOrgRoles:    !s.cfg.JWTAuth.SkipOrgRoleSync,
+			AllowSignUp:     s.cfg.JWTAuth.AutoSignUp,
+			SyncTeams:       s.cfg.JWTAuth.GroupsAttributePath != "",
 		}}
 
-	if key := s.cfg.JWTAuthUsernameClaim; key != "" {
+	if key := s.cfg.JWTAuth.UsernameClaim; key != "" {
 		id.Login, _ = claims[key].(string)
 		id.ClientParams.LookUpParams.Login = &id.Login
+	} else if key := s.cfg.JWTAuth.UsernameAttributePath; key != "" {
+		id.Login, err = util.SearchJSONForStringAttr(s.cfg.JWTAuth.UsernameAttributePath, claims)
+		if err != nil {
+			return nil, err
+		}
+		id.ClientParams.LookUpParams.Login = &id.Login
 	}
-	if key := s.cfg.JWTAuthEmailClaim; key != "" {
+
+	if key := s.cfg.JWTAuth.EmailClaim; key != "" {
 		id.Email, _ = claims[key].(string)
 		id.ClientParams.LookUpParams.Email = &id.Email
+	} else if key := s.cfg.JWTAuth.EmailAttributePath; key != "" {
+		id.Email, err = util.SearchJSONForStringAttr(s.cfg.JWTAuth.EmailAttributePath, claims)
+		if err != nil {
+			return nil, err
+		}
+		id.ClientParams.LookUpParams.Email = &id.Email
 	}
 
 	if name, _ := claims["name"].(string); name != "" {
@@ -91,16 +102,16 @@ func (s *JWT) Authenticate(ctx context.Context, r *authn.Request) (*authn.Identi
 	}
 
 	orgRoles, isGrafanaAdmin, err := getRoles(s.cfg, func() (org.RoleType, *bool, error) {
-		if s.cfg.JWTAuthSkipOrgRoleSync {
+		if s.cfg.JWTAuth.SkipOrgRoleSync {
 			return "", nil, nil
 		}
 
 		role, grafanaAdmin := s.extractRoleAndAdmin(claims)
-		if s.cfg.JWTAuthRoleAttributeStrict && !role.IsValid() {
+		if s.cfg.JWTAuth.RoleAttributeStrict && !role.IsValid() {
 			return "", nil, errJWTInvalidRole.Errorf("invalid role claim in JWT: %s", role)
 		}
 
-		if !s.cfg.JWTAuthAllowAssignGrafanaAdmin {
+		if !s.cfg.JWTAuth.AllowAssignGrafanaAdmin {
 			return role, nil, nil
 		}
 
@@ -114,6 +125,11 @@ func (s *JWT) Authenticate(ctx context.Context, r *authn.Request) (*authn.Identi
 	id.OrgRoles = orgRoles
 	id.IsGrafanaAdmin = isGrafanaAdmin
 
+	id.Groups, err = s.extractGroups(claims)
+	if err != nil {
+		return nil, err
+	}
+
 	if id.Login == "" && id.Email == "" {
 		s.log.FromContext(ctx).Debug("Failed to get an authentication claim from JWT",
 			"login", id.Login, "email", id.Email)
@@ -126,7 +142,7 @@ func (s *JWT) Authenticate(ctx context.Context, r *authn.Request) (*authn.Identi
 // remove sensitive query param
 // avoid JWT URL login passing auth_token in URL
 func (s *JWT) stripSensitiveParam(httpRequest *http.Request) {
-	if s.cfg.JWTAuthURLLogin {
+	if s.cfg.JWTAuth.URLLogin {
 		params := httpRequest.URL.Query()
 		if params.Has(authQueryParamName) {
 			params.Del(authQueryParamName)
@@ -137,8 +153,8 @@ func (s *JWT) stripSensitiveParam(httpRequest *http.Request) {
 
 // retrieveToken retrieves the JWT token from the request.
 func (s *JWT) retrieveToken(httpRequest *http.Request) string {
-	jwtToken := httpRequest.Header.Get(s.cfg.JWTAuthHeaderName)
-	if jwtToken == "" && s.cfg.JWTAuthURLLogin {
+	jwtToken := httpRequest.Header.Get(s.cfg.JWTAuth.HeaderName)
+	if jwtToken == "" && s.cfg.JWTAuth.URLLogin {
 		jwtToken = httpRequest.URL.Query().Get("auth_token")
 	}
 	// Strip the 'Bearer' prefix if it exists.
@@ -146,7 +162,7 @@ func (s *JWT) retrieveToken(httpRequest *http.Request) string {
 }
 
 func (s *JWT) Test(ctx context.Context, r *authn.Request) bool {
-	if !s.cfg.JWTAuthEnabled || s.cfg.JWTAuthHeaderName == "" {
+	if !s.cfg.JWTAuth.Enabled || s.cfg.JWTAuth.HeaderName == "" {
 		return false
 	}
 
@@ -171,11 +187,11 @@ func (s *JWT) Priority() uint {
 const roleGrafanaAdmin = "GrafanaAdmin"
 
 func (s *JWT) extractRoleAndAdmin(claims map[string]any) (org.RoleType, bool) {
-	if s.cfg.JWTAuthRoleAttributePath == "" {
+	if s.cfg.JWTAuth.RoleAttributePath == "" {
 		return "", false
 	}
 
-	role, err := searchClaimsForStringAttr(s.cfg.JWTAuthRoleAttributePath, claims)
+	role, err := util.SearchJSONForStringAttr(s.cfg.JWTAuth.RoleAttributePath, claims)
 	if err != nil || role == "" {
 		return "", false
 	}
@@ -186,33 +202,10 @@ func (s *JWT) extractRoleAndAdmin(claims map[string]any) (org.RoleType, bool) {
 	return org.RoleType(role), false
 }
 
-func searchClaimsForStringAttr(attributePath string, claims map[string]any) (string, error) {
-	val, err := searchClaimsForAttr(attributePath, claims)
-	if err != nil {
-		return "", err
-	}
-
-	strVal, ok := val.(string)
-	if ok {
-		return strVal, nil
-	}
-
-	return "", nil
-}
-
-func searchClaimsForAttr(attributePath string, claims map[string]any) (any, error) {
-	if attributePath == "" {
-		return "", errors.New("no attribute path specified")
-	}
-
-	if len(claims) == 0 {
-		return "", errors.New("empty claims provided")
-	}
-
-	val, err := jmespath.Search(attributePath, claims)
-	if err != nil {
-		return "", fmt.Errorf("failed to search claims with provided path: %q: %w", attributePath, err)
+func (s *JWT) extractGroups(claims map[string]any) ([]string, error) {
+	if s.cfg.JWTAuth.GroupsAttributePath == "" {
+		return []string{}, nil
 	}
 
-	return val, nil
+	return util.SearchJSONForStringSliceAttr(s.cfg.JWTAuth.GroupsAttributePath, claims)
 }
diff --git a/pkg/services/authn/clients/jwt_test.go b/pkg/services/authn/clients/jwt_test.go
index 95ce08467a16b..d9476f373204e 100644
--- a/pkg/services/authn/clients/jwt_test.go
+++ b/pkg/services/authn/clients/jwt_test.go
@@ -15,6 +15,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/authn"
 	"github.com/grafana/grafana/pkg/services/login"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util"
 )
 
 func stringPtr(s string) *string {
@@ -22,75 +23,156 @@ func stringPtr(s string) *string {
 }
 
 func TestAuthenticateJWT(t *testing.T) {
-	jwtService := &jwt.FakeJWTService{
-		VerifyProvider: func(context.Context, string) (jwt.JWTClaims, error) {
-			return jwt.JWTClaims{
-				"sub":                "1234567890",
-				"email":              "eai.doe@cor.po",
-				"preferred_username": "eai-doe",
-				"name":               "Eai Doe",
-				"roles":              "Admin",
-			}, nil
-		},
-	}
+	t.Parallel()
+
 	jwtHeaderName := "X-Forwarded-User"
-	wantID := &authn.Identity{
-		OrgID:           0,
-		OrgName:         "",
-		OrgRoles:        map[int64]roletype.RoleType{1: roletype.RoleAdmin},
-		ID:              "",
-		Login:           "eai-doe",
-		Name:            "Eai Doe",
-		Email:           "eai.doe@cor.po",
-		IsGrafanaAdmin:  boolPtr(false),
-		AuthenticatedBy: login.JWTModule,
-		AuthID:          "1234567890",
-		IsDisabled:      false,
-		HelpFlags1:      0,
-		ClientParams: authn.ClientParams{
-			SyncUser:        true,
-			AllowSignUp:     true,
-			FetchSyncedUser: true,
-			SyncOrgRoles:    true,
-			SyncPermissions: true,
-			LookUpParams: login.UserLookupParams{
-				UserID: nil,
-				Email:  stringPtr("eai.doe@cor.po"),
-				Login:  stringPtr("eai-doe"),
+
+	testCases := []struct {
+		name           string
+		wantID         *authn.Identity
+		verifyProvider func(context.Context, string) (map[string]any, error)
+		cfg            *setting.Cfg
+	}{
+		{
+			name: "Valid Use case with group path",
+			wantID: &authn.Identity{
+				OrgID:           0,
+				OrgName:         "",
+				OrgRoles:        map[int64]roletype.RoleType{1: roletype.RoleAdmin},
+				Groups:          []string{"foo", "bar"},
+				ID:              "",
+				Login:           "eai-doe",
+				Name:            "Eai Doe",
+				Email:           "eai.doe@cor.po",
+				IsGrafanaAdmin:  boolPtr(false),
+				AuthenticatedBy: login.JWTModule,
+				AuthID:          "1234567890",
+				IsDisabled:      false,
+				HelpFlags1:      0,
+				ClientParams: authn.ClientParams{
+					SyncUser:        true,
+					AllowSignUp:     true,
+					FetchSyncedUser: true,
+					SyncOrgRoles:    true,
+					SyncPermissions: true,
+					SyncTeams:       true,
+					LookUpParams: login.UserLookupParams{
+						UserID: nil,
+						Email:  stringPtr("eai.doe@cor.po"),
+						Login:  stringPtr("eai-doe"),
+					},
+				},
+			},
+			verifyProvider: func(context.Context, string) (map[string]any, error) {
+				return map[string]any{
+					"sub":                "1234567890",
+					"email":              "eai.doe@cor.po",
+					"preferred_username": "eai-doe",
+					"name":               "Eai Doe",
+					"roles":              "Admin",
+					"groups":             []string{"foo", "bar"},
+				}, nil
+			},
+			cfg: &setting.Cfg{
+				JWTAuth: setting.AuthJWTSettings{
+					Enabled:                 true,
+					HeaderName:              jwtHeaderName,
+					EmailClaim:              "email",
+					UsernameClaim:           "preferred_username",
+					AutoSignUp:              true,
+					AllowAssignGrafanaAdmin: true,
+					RoleAttributeStrict:     true,
+					RoleAttributePath:       "roles",
+					GroupsAttributePath:     "groups[]",
+				},
+			},
+		},
+		{
+			name: "Valid Use case without group path",
+			wantID: &authn.Identity{
+				OrgID:           0,
+				OrgName:         "",
+				OrgRoles:        map[int64]roletype.RoleType{1: roletype.RoleAdmin},
+				ID:              "",
+				Login:           "eai-doe",
+				Groups:          []string{},
+				Name:            "Eai Doe",
+				Email:           "eai.doe@cor.po",
+				IsGrafanaAdmin:  boolPtr(false),
+				AuthenticatedBy: login.JWTModule,
+				AuthID:          "1234567890",
+				IsDisabled:      false,
+				HelpFlags1:      0,
+				ClientParams: authn.ClientParams{
+					SyncUser:        true,
+					AllowSignUp:     true,
+					FetchSyncedUser: true,
+					SyncOrgRoles:    true,
+					SyncPermissions: true,
+					SyncTeams:       false,
+					LookUpParams: login.UserLookupParams{
+						UserID: nil,
+						Email:  stringPtr("eai.doe@cor.po"),
+						Login:  stringPtr("eai-doe"),
+					},
+				},
+			},
+			verifyProvider: func(context.Context, string) (map[string]any, error) {
+				return map[string]any{
+					"sub":                "1234567890",
+					"email":              "eai.doe@cor.po",
+					"preferred_username": "eai-doe",
+					"name":               "Eai Doe",
+					"roles":              "Admin",
+					"groups":             []string{"foo", "bar"},
+				}, nil
+			},
+			cfg: &setting.Cfg{
+				JWTAuth: setting.AuthJWTSettings{
+					Enabled:                 true,
+					HeaderName:              jwtHeaderName,
+					EmailClaim:              "email",
+					UsernameClaim:           "preferred_username",
+					AutoSignUp:              true,
+					AllowAssignGrafanaAdmin: true,
+					RoleAttributeStrict:     true,
+					RoleAttributePath:       "roles",
+				},
 			},
 		},
 	}
 
-	cfg := &setting.Cfg{
-		JWTAuthEnabled:                 true,
-		JWTAuthHeaderName:              jwtHeaderName,
-		JWTAuthEmailClaim:              "email",
-		JWTAuthUsernameClaim:           "preferred_username",
-		JWTAuthAutoSignUp:              true,
-		JWTAuthAllowAssignGrafanaAdmin: true,
-		JWTAuthRoleAttributeStrict:     true,
-		JWTAuthRoleAttributePath:       "roles",
-	}
-	jwtClient := ProvideJWT(jwtService, cfg)
-	validHTTPReq := &http.Request{
-		Header: map[string][]string{
-			jwtHeaderName: {"sample-token"}},
-	}
+	for _, tc := range testCases {
+		tc := tc
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+			jwtService := &jwt.FakeJWTService{
+				VerifyProvider: tc.verifyProvider,
+			}
 
-	id, err := jwtClient.Authenticate(context.Background(), &authn.Request{
-		OrgID:       1,
-		HTTPRequest: validHTTPReq,
-		Resp:        nil,
-	})
-	require.NoError(t, err)
+			jwtClient := ProvideJWT(jwtService, tc.cfg)
+			validHTTPReq := &http.Request{
+				Header: map[string][]string{
+					jwtHeaderName: {"sample-token"}},
+			}
 
-	assert.EqualValues(t, wantID, id, fmt.Sprintf("%+v", id))
+			id, err := jwtClient.Authenticate(context.Background(), &authn.Request{
+				OrgID:       1,
+				HTTPRequest: validHTTPReq,
+				Resp:        nil,
+			})
+			require.NoError(t, err)
+
+			assert.EqualValues(t, tc.wantID, id, fmt.Sprintf("%+v", id))
+		})
+	}
 }
 
 func TestJWTClaimConfig(t *testing.T) {
+	t.Parallel()
 	jwtService := &jwt.FakeJWTService{
-		VerifyProvider: func(context.Context, string) (jwt.JWTClaims, error) {
-			return jwt.JWTClaims{
+		VerifyProvider: func(context.Context, string) (map[string]any, error) {
+			return map[string]any{
 				"sub":                "1234567890",
 				"email":              "eai.doe@cor.po",
 				"preferred_username": "eai-doe",
@@ -102,30 +184,19 @@ func TestJWTClaimConfig(t *testing.T) {
 
 	jwtHeaderName := "X-Forwarded-User"
 
-	cfg := &setting.Cfg{
-		JWTAuthEnabled:                 true,
-		JWTAuthHeaderName:              jwtHeaderName,
-		JWTAuthAutoSignUp:              true,
-		JWTAuthAllowAssignGrafanaAdmin: true,
-		JWTAuthRoleAttributeStrict:     true,
-		JWTAuthRoleAttributePath:       "roles",
-	}
-
 	// #nosec G101 -- This is a dummy/test token
 	token := "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.XbPfbIHMI6arZ3Y922BhjWgQzWXcXNrz0ogtVhfEd2o"
 
-	type Dictionary map[string]any
-
 	type testCase struct {
 		desc                 string
-		claimsConfigurations []Dictionary
+		claimsConfigurations []util.DynMap
 		valid                bool
 	}
 
 	testCases := []testCase{
 		{
 			desc: "JWT configuration with email and username claims",
-			claimsConfigurations: []Dictionary{
+			claimsConfigurations: []util.DynMap{
 				{
 					"JWTAuthEmailClaim":    true,
 					"JWTAuthUsernameClaim": true,
@@ -135,7 +206,7 @@ func TestJWTClaimConfig(t *testing.T) {
 		},
 		{
 			desc: "JWT configuration with email claim",
-			claimsConfigurations: []Dictionary{
+			claimsConfigurations: []util.DynMap{
 				{
 					"JWTAuthEmailClaim":    true,
 					"JWTAuthUsernameClaim": false,
@@ -145,7 +216,7 @@ func TestJWTClaimConfig(t *testing.T) {
 		},
 		{
 			desc: "JWT configuration with username claim",
-			claimsConfigurations: []Dictionary{
+			claimsConfigurations: []util.DynMap{
 				{
 					"JWTAuthEmailClaim":    false,
 					"JWTAuthUsernameClaim": true,
@@ -155,7 +226,7 @@ func TestJWTClaimConfig(t *testing.T) {
 		},
 		{
 			desc: "JWT configuration without email and username claims",
-			claimsConfigurations: []Dictionary{
+			claimsConfigurations: []util.DynMap{
 				{
 					"JWTAuthEmailClaim":    false,
 					"JWTAuthUsernameClaim": false,
@@ -166,39 +237,53 @@ func TestJWTClaimConfig(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
+		tc := tc
 		t.Run(tc.desc, func(t *testing.T) {
+			t.Parallel()
+			cfg := &setting.Cfg{
+				JWTAuth: setting.AuthJWTSettings{
+					Enabled:                 true,
+					HeaderName:              jwtHeaderName,
+					AutoSignUp:              true,
+					AllowAssignGrafanaAdmin: true,
+					RoleAttributeStrict:     true,
+					RoleAttributePath:       "roles",
+				},
+			}
 			for _, claims := range tc.claimsConfigurations {
-				cfg.JWTAuthEmailClaim = ""
-				cfg.JWTAuthUsernameClaim = ""
+				cfg.JWTAuth.EmailClaim = ""
+				cfg.JWTAuth.UsernameClaim = ""
 
 				if claims["JWTAuthEmailClaim"] == true {
-					cfg.JWTAuthEmailClaim = "email"
+					cfg.JWTAuth.EmailClaim = "email"
 				}
 				if claims["JWTAuthUsernameClaim"] == true {
-					cfg.JWTAuthUsernameClaim = "preferred_username"
+					cfg.JWTAuth.UsernameClaim = "preferred_username"
 				}
 			}
+
+			httpReq := &http.Request{
+				URL: &url.URL{RawQuery: "auth_token=" + token},
+				Header: map[string][]string{
+					jwtHeaderName: {token}},
+			}
+			jwtClient := ProvideJWT(jwtService, cfg)
+			_, err := jwtClient.Authenticate(context.Background(), &authn.Request{
+				OrgID:       1,
+				HTTPRequest: httpReq,
+				Resp:        nil,
+			})
+			if tc.valid {
+				require.NoError(t, err)
+			} else {
+				require.Error(t, err)
+			}
 		})
-		httpReq := &http.Request{
-			URL: &url.URL{RawQuery: "auth_token=" + token},
-			Header: map[string][]string{
-				jwtHeaderName: {token}},
-		}
-		jwtClient := ProvideJWT(jwtService, cfg)
-		_, err := jwtClient.Authenticate(context.Background(), &authn.Request{
-			OrgID:       1,
-			HTTPRequest: httpReq,
-			Resp:        nil,
-		})
-		if tc.valid {
-			require.NoError(t, err)
-		} else {
-			require.Error(t, err)
-		}
 	}
 }
 
 func TestJWTTest(t *testing.T) {
+	t.Parallel()
 	jwtService := &jwt.FakeJWTService{}
 	jwtHeaderName := "X-Forwarded-User"
 	// #nosec G101 -- This is dummy/test token
@@ -280,14 +365,18 @@ func TestJWTTest(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
+		tc := tc
 		t.Run(tc.desc, func(t *testing.T) {
+			t.Parallel()
 			cfg := &setting.Cfg{
-				JWTAuthEnabled:                 true,
-				JWTAuthURLLogin:                tc.urlLogin,
-				JWTAuthHeaderName:              tc.cfgHeaderName,
-				JWTAuthAutoSignUp:              true,
-				JWTAuthAllowAssignGrafanaAdmin: true,
-				JWTAuthRoleAttributeStrict:     true,
+				JWTAuth: setting.AuthJWTSettings{
+					Enabled:                 true,
+					URLLogin:                tc.urlLogin,
+					HeaderName:              tc.cfgHeaderName,
+					AutoSignUp:              true,
+					AllowAssignGrafanaAdmin: true,
+					RoleAttributeStrict:     true,
+				},
 			}
 			jwtClient := ProvideJWT(jwtService, cfg)
 			httpReq := &http.Request{
@@ -308,9 +397,10 @@ func TestJWTTest(t *testing.T) {
 }
 
 func TestJWTStripParam(t *testing.T) {
+	t.Parallel()
 	jwtService := &jwt.FakeJWTService{
-		VerifyProvider: func(context.Context, string) (jwt.JWTClaims, error) {
-			return jwt.JWTClaims{
+		VerifyProvider: func(context.Context, string) (map[string]any, error) {
+			return map[string]any{
 				"sub":                "1234567890",
 				"email":              "eai.doe@cor.po",
 				"preferred_username": "eai-doe",
@@ -323,15 +413,17 @@ func TestJWTStripParam(t *testing.T) {
 	jwtHeaderName := "X-Forwarded-User"
 
 	cfg := &setting.Cfg{
-		JWTAuthEnabled:                 true,
-		JWTAuthHeaderName:              jwtHeaderName,
-		JWTAuthAutoSignUp:              true,
-		JWTAuthAllowAssignGrafanaAdmin: true,
-		JWTAuthURLLogin:                true,
-		JWTAuthRoleAttributeStrict:     false,
-		JWTAuthRoleAttributePath:       "roles",
-		JWTAuthEmailClaim:              "email",
-		JWTAuthUsernameClaim:           "preferred_username",
+		JWTAuth: setting.AuthJWTSettings{
+			Enabled:                 true,
+			HeaderName:              jwtHeaderName,
+			AutoSignUp:              true,
+			AllowAssignGrafanaAdmin: true,
+			URLLogin:                true,
+			RoleAttributeStrict:     false,
+			RoleAttributePath:       "roles",
+			EmailClaim:              "email",
+			UsernameClaim:           "preferred_username",
+		},
 	}
 
 	// #nosec G101 -- This is a dummy/test token
@@ -350,3 +442,61 @@ func TestJWTStripParam(t *testing.T) {
 	// auth_token should be removed from the query string
 	assert.Equal(t, "other_param=other_value", httpReq.URL.RawQuery)
 }
+
+func TestJWTSubClaimsConfig(t *testing.T) {
+	t.Parallel()
+
+	// #nosec G101 -- This is a dummy/test token
+	token := "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXIiOiIxLjAiLCJpc3MiOiJodHRwczovL2F6dXJlZG9tYWlubmFtZS5iMmNsb2dpbi5jb20vNjIwYjI2MzQtYmI4OC00MzdiLTgwYWQtYWM0YTkwZGZkZTkxL3YyLjAvIiwic3ViIjoiOWI4OTg5MDgtMWFlYy00NDc1LTljNDgtNzg1MWQyNjVkZGIxIiwiYXVkIjoiYmEyNzM0NDktMmZiNS00YTRhLTlmODItYTA2MTRhM2MxODQ1IiwiZXhwIjoxNzExNTYwMDcxLCJub25jZSI6ImRlZmF1bHROb25jZSIsImlhdCI6MTcxMTU1NjQ3MSwiYXV0aF90aW1lIjoxNzExNTU2NDcxLCJuYW1lIjoibmFtZV9vZl90aGVfdXNlciIsImdpdmVuX25hbWUiOiJVc2VyTmFtZSIsImZhbWlseV9uYW1lIjoiVXNlclN1cm5hbWUiLCJlbWFpbHMiOlsibWFpbmVtYWlsK2V4dHJhZW1haWwwNUBnbWFpbC5jb20iLCJtYWluZW1haWwrZXh0cmFlbWFpbDA0QGdtYWlsLmNvbSIsIm1haW5lbWFpbCtleHRyYWVtYWlsMDNAZ21haWwuY29tIiwibWFpbmVtYWlsK2V4dHJhZW1haWwwMkBnbWFpbC5jb20iLCJtYWluZW1haWwrZXh0cmFlbWFpbDAxQGdtYWlsLmNvbSIsIm1haW5lbWFpbEBnbWFpbC5jb20iXSwidGZwIjoiQjJDXzFfdXNlcmZsb3ciLCJuYmYiOjE3MTE1NTY0NzF9.qpN3upxUB5CTJ7kmYPHFuhlwG95vdQqJaDDC_8KJFZ8"
+	jwtHeaderName := "X-Forwarded-User"
+	response := map[string]any{
+		"ver":         "1.0",
+		"iss":         "https://azuredomainname.b2clogin.com/620b2634-bb88-437b-80ad-ac4a90dfde91/v2.0/",
+		"sub":         "9b898908-1aec-4475-9c48-7851d265ddb1",
+		"aud":         "ba273449-2fb5-4a4a-9f82-a0614a3c1845",
+		"exp":         1711560071,
+		"nonce":       "defaultNonce",
+		"iat":         1711556471,
+		"auth_time":   1711556471,
+		"name":        "name_of_the_user",
+		"given_name":  "UserName",
+		"family_name": "UserSurname",
+		"emails": []string{
+			"mainemail+extraemail04@gmail.com",
+			"mainemail+extraemail03@gmail.com",
+			"mainemail+extraemail02@gmail.com",
+			"mainemail+extraemail01@gmail.com",
+			"mainemail@gmail.com",
+		},
+		"tfp": "B2C_1_userflow",
+		"nbf": 1711556471,
+	}
+	cfg := &setting.Cfg{
+		JWTAuth: setting.AuthJWTSettings{
+			HeaderName:            jwtHeaderName,
+			EmailAttributePath:    "emails[2]",
+			UsernameAttributePath: "name",
+		},
+	}
+	httpReq := &http.Request{
+		URL: &url.URL{RawQuery: "auth_token=" + token},
+		Header: map[string][]string{
+			jwtHeaderName: {token}},
+	}
+	jwtService := &jwt.FakeJWTService{
+		VerifyProvider: func(context.Context, string) (map[string]any, error) {
+			return response, nil
+		},
+	}
+
+	jwtClient := ProvideJWT(jwtService, cfg)
+	identity, err := jwtClient.Authenticate(context.Background(), &authn.Request{
+		OrgID:       1,
+		HTTPRequest: httpReq,
+		Resp:        nil,
+	})
+	require.NoError(t, err)
+	require.Equal(t, "mainemail+extraemail02@gmail.com", identity.Email)
+	require.Equal(t, "name_of_the_user", identity.Name)
+	fmt.Println("identity.Email", identity.Email)
+}
diff --git a/pkg/services/authn/clients/ldap_test.go b/pkg/services/authn/clients/ldap_test.go
index 30d9a79f4a7ee..592d74ed0f27d 100644
--- a/pkg/services/authn/clients/ldap_test.go
+++ b/pkg/services/authn/clients/ldap_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/ldap/multildap"
 	"github.com/grafana/grafana/pkg/services/ldap/service"
 	"github.com/grafana/grafana/pkg/services/login"
-	"github.com/grafana/grafana/pkg/services/login/logintest"
+	"github.com/grafana/grafana/pkg/services/login/authinfotest"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/user/usertest"
@@ -192,7 +192,7 @@ func setupLDAPTestCase(tt *ldapTestCase) *LDAP {
 			return nil
 		},
 	}
-	authInfoService := &logintest.AuthInfoServiceFake{
+	authInfoService := &authinfotest.FakeService{
 		ExpectedUserAuth: &tt.expectedAuthInfo,
 		ExpectedError:    tt.expectedAuthInfoErr,
 	}
diff --git a/pkg/services/authn/clients/oauth.go b/pkg/services/authn/clients/oauth.go
index e2b39229478dd..9cfcec0e635b4 100644
--- a/pkg/services/authn/clients/oauth.go
+++ b/pkg/services/authn/clients/oauth.go
@@ -8,15 +8,19 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"net/http"
+	"net/url"
 	"strings"
 
 	"golang.org/x/oauth2"
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/login/social/connectors"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/authn"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/login"
+	"github.com/grafana/grafana/pkg/services/oauthtoken"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util/errutil"
@@ -29,12 +33,16 @@ const (
 	codeChallengeMethodParamName = "code_challenge_method"
 	codeChallengeMethod          = "S256"
 
-	oauthStateQueryName  = "state"
-	oauthStateCookieName = "oauth_state"
-	oauthPKCECookieName  = "oauth_code_verifier"
+	oauthStateQueryName          = "state"
+	oauthStateCookieName         = "oauth_state"
+	oauthPKCECookieName          = "oauth_code_verifier"
+	oauthPostLogoutRedirectParam = "post_logout_redirect_uri"
 )
 
 var (
+	errOAuthClientDisabled = errutil.BadRequest("auth.oauth.disabled", errutil.WithPublicMessage("OAuth client is disabled"))
+	errOAuthInternal       = errutil.Internal("auth.oauth.internal", errutil.WithPublicMessage("An internal error occurred in the OAuth client"))
+
 	errOAuthGenPKCE     = errutil.Internal("auth.oauth.pkce.internal", errutil.WithPublicMessage("An internal error occurred"))
 	errOAuthMissingPKCE = errutil.BadRequest("auth.oauth.pkce.missing", errutil.WithPublicMessage("Missing required pkce cookie"))
 
@@ -49,30 +57,35 @@ var (
 	errOAuthEmailNotAllowed      = errutil.Unauthorized("auth.oauth.email.not-allowed", errutil.WithPublicMessage("Required email domain not fulfilled"))
 )
 
-func fromSocialErr(err *social.Error) error {
+func fromSocialErr(err *connectors.SocialError) error {
 	return errutil.Unauthorized("auth.oauth.userinfo.failed", errutil.WithPublicMessage(err.Error())).Errorf("%w", err)
 }
 
+var _ authn.LogoutClient = new(OAuth)
 var _ authn.RedirectClient = new(OAuth)
 
 func ProvideOAuth(
-	name string, cfg *setting.Cfg, oauthCfg *social.OAuthInfo,
-	connector social.SocialConnector, httpClient *http.Client,
+	name string, cfg *setting.Cfg, oauthService oauthtoken.OAuthTokenService,
+	socialService social.Service, settingsProviderService setting.Provider, features featuremgmt.FeatureToggles,
 ) *OAuth {
+	providerName := strings.TrimPrefix(name, "auth.client.")
 	return &OAuth{
-		name, fmt.Sprintf("oauth_%s", strings.TrimPrefix(name, "auth.client.")),
-		log.New(name), cfg, oauthCfg, connector, httpClient,
+		name, fmt.Sprintf("oauth_%s", providerName), providerName,
+		log.New(name), cfg, settingsProviderService, oauthService, socialService, features,
 	}
 }
 
 type OAuth struct {
-	name       string
-	moduleName string
-	log        log.Logger
-	cfg        *setting.Cfg
-	oauthCfg   *social.OAuthInfo
-	connector  social.SocialConnector
-	httpClient *http.Client
+	name         string
+	moduleName   string
+	providerName string
+	log          log.Logger
+	cfg          *setting.Cfg
+
+	settingsProviderSvc setting.Provider
+	oauthService        oauthtoken.OAuthTokenService
+	socialService       social.Service
+	features            featuremgmt.FeatureToggles
 }
 
 func (c *OAuth) Name() string {
@@ -81,6 +94,12 @@ func (c *OAuth) Name() string {
 
 func (c *OAuth) Authenticate(ctx context.Context, r *authn.Request) (*authn.Identity, error) {
 	r.SetMeta(authn.MetaKeyAuthModule, c.moduleName)
+
+	oauthCfg := c.socialService.GetOAuthInfoProvider(c.providerName)
+	if !oauthCfg.Enabled {
+		return nil, errOAuthClientDisabled.Errorf("oauth client is disabled: %s", c.providerName)
+	}
+
 	// get hashed state stored in cookie
 	stateCookie, err := r.HTTPRequest.Cookie(oauthStateCookieName)
 	if err != nil {
@@ -92,7 +111,7 @@ func (c *OAuth) Authenticate(ctx context.Context, r *authn.Request) (*authn.Iden
 	}
 
 	// get state returned by the idp and hash it
-	stateQuery := hashOAuthState(r.HTTPRequest.URL.Query().Get(oauthStateQueryName), c.cfg.SecretKey, c.oauthCfg.ClientSecret)
+	stateQuery := hashOAuthState(r.HTTPRequest.URL.Query().Get(oauthStateQueryName), c.cfg.SecretKey, oauthCfg.ClientSecret)
 	// compare the state returned by idp against the one we stored in cookie
 	if stateQuery != stateCookie.Value {
 		return nil, errOAuthInvalidState.Errorf("provided state did not match stored state")
@@ -100,48 +119,60 @@ func (c *OAuth) Authenticate(ctx context.Context, r *authn.Request) (*authn.Iden
 
 	var opts []oauth2.AuthCodeOption
 	// if pkce is enabled for client validate we have the cookie and set it as url param
-	if c.oauthCfg.UsePKCE {
+	if oauthCfg.UsePKCE {
 		pkceCookie, err := r.HTTPRequest.Cookie(oauthPKCECookieName)
 		if err != nil {
 			return nil, errOAuthMissingPKCE.Errorf("no pkce cookie found: %w", err)
 		}
-		opts = append(opts, oauth2.SetAuthURLParam(codeVerifierParamName, pkceCookie.Value))
+		opts = append(opts, oauth2.VerifierOption(pkceCookie.Value))
+	}
+
+	connector, errConnector := c.socialService.GetConnector(c.providerName)
+	httpClient, errHTTPClient := c.socialService.GetOAuthHttpClient(c.providerName)
+	if errConnector != nil || errHTTPClient != nil {
+		return nil, errOAuthInternal.Errorf("failed to get %s oauth client: %w", c.name, errors.Join(errConnector, errHTTPClient))
 	}
 
-	clientCtx := context.WithValue(ctx, oauth2.HTTPClient, c.httpClient)
+	clientCtx := context.WithValue(ctx, oauth2.HTTPClient, httpClient)
 	// exchange auth code to a valid token
-	token, err := c.connector.Exchange(clientCtx, r.HTTPRequest.URL.Query().Get("code"), opts...)
+	token, err := connector.Exchange(clientCtx, r.HTTPRequest.URL.Query().Get("code"), opts...)
 	if err != nil {
 		return nil, errOAuthTokenExchange.Errorf("failed to exchange code to token: %w", err)
 	}
 	token.TokenType = "Bearer"
 
-	userInfo, err := c.connector.UserInfo(ctx, c.connector.Client(clientCtx, token), token)
+	userInfo, err := connector.UserInfo(ctx, connector.Client(clientCtx, token), token)
 	if err != nil {
-		var sErr *social.Error
+		var sErr *connectors.SocialError
 		if errors.As(err, &sErr) {
 			return nil, fromSocialErr(sErr)
 		}
 		return nil, errOAuthUserInfo.Errorf("failed to get user info: %w", err)
 	}
 
+	if userInfo.Id == "" {
+		if c.features.IsEnabledGlobally(featuremgmt.FlagOauthRequireSubClaim) {
+			return nil, errOAuthUserInfo.Errorf("missing required sub claims")
+		} else {
+			c.log.FromContext(ctx).Warn("Missing sub claim, oauth authentication without a sub claim is deprecated and will be rejected in future versions.")
+		}
+	}
+
 	if userInfo.Email == "" {
 		return nil, errOAuthMissingRequiredEmail.Errorf("required attribute email was not provided")
 	}
 
-	if !c.connector.IsEmailAllowed(userInfo.Email) {
+	if !connector.IsEmailAllowed(userInfo.Email) {
 		return nil, errOAuthEmailNotAllowed.Errorf("provided email is not allowed")
 	}
 
 	orgRoles, isGrafanaAdmin, _ := getRoles(c.cfg, func() (org.RoleType, *bool, error) {
-		if c.cfg.OAuthSkipOrgRoleUpdateSync {
-			return "", nil, nil
-		}
 		return userInfo.Role, userInfo.IsGrafanaAdmin, nil
 	})
 
 	lookupParams := login.UserLookupParams{}
-	if c.cfg.OAuthAllowInsecureEmailLookup {
+	allowInsecureEmailLookup := c.settingsProviderSvc.KeyValue("auth", "oauth_allow_insecure_email_lookup").MustBool(false)
+	if allowInsecureEmailLookup {
 		lookupParams.Email = &userInfo.Email
 	}
 
@@ -160,7 +191,7 @@ func (c *OAuth) Authenticate(ctx context.Context, r *authn.Request) (*authn.Iden
 			SyncTeams:       true,
 			FetchSyncedUser: true,
 			SyncPermissions: true,
-			AllowSignUp:     c.connector.IsSignupAllowed(),
+			AllowSignUp:     connector.IsSignupAllowed(),
 			// skip org role flag is checked and handled in the connector. For now we can skip the hook if no roles are passed
 			SyncOrgRoles: len(orgRoles) > 0,
 			LookUpParams: lookupParams,
@@ -171,31 +202,38 @@ func (c *OAuth) Authenticate(ctx context.Context, r *authn.Request) (*authn.Iden
 func (c *OAuth) RedirectURL(ctx context.Context, r *authn.Request) (*authn.Redirect, error) {
 	var opts []oauth2.AuthCodeOption
 
-	if c.oauthCfg.HostedDomain != "" {
-		opts = append(opts, oauth2.SetAuthURLParam(hostedDomainParamName, c.oauthCfg.HostedDomain))
+	oauthCfg := c.socialService.GetOAuthInfoProvider(c.providerName)
+	if !oauthCfg.Enabled {
+		return nil, errOAuthClientDisabled.Errorf("oauth client is disabled: %s", c.providerName)
+	}
+
+	if oauthCfg.HostedDomain != "" {
+		opts = append(opts, oauth2.SetAuthURLParam(hostedDomainParamName, oauthCfg.HostedDomain))
 	}
 
 	var plainPKCE string
-	if c.oauthCfg.UsePKCE {
-		pkce, hashedPKCE, err := genPKCECode()
+	if oauthCfg.UsePKCE {
+		verifier, err := genPKCECodeVerifier()
 		if err != nil {
 			return nil, errOAuthGenPKCE.Errorf("failed to generate pkce: %w", err)
 		}
 
-		plainPKCE = pkce
-		opts = append(opts,
-			oauth2.SetAuthURLParam(codeChallengeParamName, hashedPKCE),
-			oauth2.SetAuthURLParam(codeChallengeMethodParamName, codeChallengeMethod),
-		)
+		plainPKCE = verifier
+		opts = append(opts, oauth2.S256ChallengeOption(plainPKCE))
 	}
 
-	state, hashedSate, err := genOAuthState(c.cfg.SecretKey, c.oauthCfg.ClientSecret)
+	state, hashedSate, err := genOAuthState(c.cfg.SecretKey, oauthCfg.ClientSecret)
 	if err != nil {
 		return nil, errOAuthGenState.Errorf("failed to generate state: %w", err)
 	}
 
+	connector, err := c.socialService.GetConnector(c.providerName)
+	if err != nil {
+		return nil, errOAuthInternal.Errorf("failed to get %s oauth connector: %w", c.name, err)
+	}
+
 	return &authn.Redirect{
-		URL: c.connector.AuthCodeURL(state, opts...),
+		URL: connector.AuthCodeURL(state, opts...),
 		Extra: map[string]string{
 			authn.KeyOAuthState: hashedSate,
 			authn.KeyOAuthPKCE:  plainPKCE,
@@ -203,8 +241,37 @@ func (c *OAuth) RedirectURL(ctx context.Context, r *authn.Request) (*authn.Redir
 	}, nil
 }
 
-// genPKCECode returns a random URL-friendly string and it's base64 URL encoded SHA256 digest.
-func genPKCECode() (string, string, error) {
+func (c *OAuth) Logout(ctx context.Context, user identity.Requester, info *login.UserAuth) (*authn.Redirect, bool) {
+	token := c.oauthService.GetCurrentOAuthToken(ctx, user)
+
+	if err := c.oauthService.InvalidateOAuthTokens(ctx, info); err != nil {
+		namespace, id := user.GetNamespacedID()
+		c.log.FromContext(ctx).Error("Failed to invalidate tokens", "namespace", namespace, "id", id, "error", err)
+	}
+
+	oauthCfg := c.socialService.GetOAuthInfoProvider(c.providerName)
+	if !oauthCfg.Enabled {
+		c.log.FromContext(ctx).Debug("OAuth client is disabled")
+		return nil, false
+	}
+
+	redirectURL := getOAuthSignoutRedirectURL(c.cfg, oauthCfg)
+	if redirectURL == "" {
+		c.log.FromContext(ctx).Debug("No signout redirect url configured")
+		return nil, false
+	}
+
+	if isOICDLogout(redirectURL) && token != nil && token.Valid() {
+		if idToken, ok := token.Extra("id_token").(string); ok {
+			redirectURL = withIDTokenHint(redirectURL, idToken)
+		}
+	}
+
+	return &authn.Redirect{URL: redirectURL}, true
+}
+
+// genPKCECodeVerifier returns code verifier that 128 characters random URL-friendly string.
+func genPKCECodeVerifier() (string, error) {
 	// IETF RFC 7636 specifies that the code verifier should be 43-128
 	// characters from a set of unreserved URI characters which is
 	// almost the same as the set of characters in base64url.
@@ -219,14 +286,12 @@ func genPKCECode() (string, string, error) {
 	raw := make([]byte, 96)
 	_, err := rand.Read(raw)
 	if err != nil {
-		return "", "", err
+		return "", err
 	}
 	ascii := make([]byte, 128)
 	base64.RawURLEncoding.Encode(ascii, raw)
 
-	shasum := sha256.Sum256(ascii)
-	pkce := base64.RawURLEncoding.EncodeToString(shasum[:])
-	return string(ascii), pkce, nil
+	return string(ascii), nil
 }
 
 func genOAuthState(secret, seed string) (string, string, error) {
@@ -242,3 +307,43 @@ func hashOAuthState(state, secret, seed string) string {
 	hashBytes := sha256.Sum256([]byte(state + secret + seed))
 	return hex.EncodeToString(hashBytes[:])
 }
+
+func getOAuthSignoutRedirectURL(cfg *setting.Cfg, oauthCfg *social.OAuthInfo) string {
+	if oauthCfg.SignoutRedirectUrl != "" {
+		return oauthCfg.SignoutRedirectUrl
+	}
+
+	return cfg.SignoutRedirectUrl
+}
+
+func withIDTokenHint(redirectURL string, idToken string) string {
+	if idToken == "" {
+		return redirectURL
+	}
+
+	u, err := url.Parse(redirectURL)
+	if err != nil {
+		return redirectURL
+	}
+
+	q := u.Query()
+	q.Set("id_token_hint", idToken)
+	u.RawQuery = q.Encode()
+
+	return u.String()
+}
+
+func isOICDLogout(redirectUrl string) bool {
+	if redirectUrl == "" {
+		return false
+	}
+
+	u, err := url.Parse(redirectUrl)
+	if err != nil {
+		return false
+	}
+
+	q := u.Query()
+	_, ok := q[oauthPostLogoutRedirectParam]
+	return ok
+}
diff --git a/pkg/services/authn/clients/oauth_test.go b/pkg/services/authn/clients/oauth_test.go
index 30da79459c0b4..7432ac2ad8392 100644
--- a/pkg/services/authn/clients/oauth_test.go
+++ b/pkg/services/authn/clients/oauth_test.go
@@ -4,7 +4,10 @@ import (
 	"context"
 	"net/http"
 	"net/url"
+	"strconv"
+	"strings"
 	"testing"
+	"time"
 
 	"golang.org/x/oauth2"
 
@@ -12,8 +15,12 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/login/social/socialtest"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/authn"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/login"
+	"github.com/grafana/grafana/pkg/services/oauthtoken/oauthtokentest"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -31,6 +38,8 @@ func TestOAuth_Authenticate(t *testing.T) {
 		addPKCECookie   bool
 		pkceCookieValue string
 
+		features []any
+
 		isEmailAllowed bool
 		userInfo       *social.BasicUserInfo
 
@@ -42,17 +51,23 @@ func TestOAuth_Authenticate(t *testing.T) {
 		{
 			desc:        "should return error when missing state cookie",
 			req:         &authn.Request{HTTPRequest: &http.Request{Header: map[string][]string{}}},
-			oauthCfg:    &social.OAuthInfo{},
+			oauthCfg:    &social.OAuthInfo{Enabled: true},
 			expectedErr: errOAuthMissingState,
 		},
 		{
 			desc:             "should return error when state cookie is present but don't have a value",
 			req:              &authn.Request{HTTPRequest: &http.Request{Header: map[string][]string{}}},
-			oauthCfg:         &social.OAuthInfo{},
+			oauthCfg:         &social.OAuthInfo{Enabled: true},
 			addStateCookie:   true,
 			stateCookieValue: "",
 			expectedErr:      errOAuthMissingState,
 		},
+		{
+			desc:        "should return error when the client is not enabled",
+			req:         &authn.Request{HTTPRequest: &http.Request{Header: map[string][]string{}}},
+			oauthCfg:    &social.OAuthInfo{Enabled: false},
+			expectedErr: errOAuthClientDisabled,
+		},
 		{
 			desc: "should return error when state from ipd does not match stored state",
 			req: &authn.Request{HTTPRequest: &http.Request{
@@ -60,7 +75,7 @@ func TestOAuth_Authenticate(t *testing.T) {
 				URL:    mustParseURL("http://grafana.com/?state=some-other-state"),
 			},
 			},
-			oauthCfg:         &social.OAuthInfo{UsePKCE: true},
+			oauthCfg:         &social.OAuthInfo{UsePKCE: true, Enabled: true},
 			addStateCookie:   true,
 			stateCookieValue: "some-state",
 			expectedErr:      errOAuthInvalidState,
@@ -72,7 +87,7 @@ func TestOAuth_Authenticate(t *testing.T) {
 				URL:    mustParseURL("http://grafana.com/?state=some-state"),
 			},
 			},
-			oauthCfg:         &social.OAuthInfo{UsePKCE: true},
+			oauthCfg:         &social.OAuthInfo{UsePKCE: true, Enabled: true},
 			addStateCookie:   true,
 			stateCookieValue: "some-state",
 			expectedErr:      errOAuthMissingPKCE,
@@ -84,7 +99,7 @@ func TestOAuth_Authenticate(t *testing.T) {
 				URL:    mustParseURL("http://grafana.com/?state=some-state"),
 			},
 			},
-			oauthCfg:         &social.OAuthInfo{UsePKCE: true},
+			oauthCfg:         &social.OAuthInfo{UsePKCE: true, Enabled: true},
 			addStateCookie:   true,
 			stateCookieValue: "some-state",
 			addPKCECookie:    true,
@@ -99,7 +114,7 @@ func TestOAuth_Authenticate(t *testing.T) {
 				URL:    mustParseURL("http://grafana.com/?state=some-state"),
 			},
 			},
-			oauthCfg:         &social.OAuthInfo{UsePKCE: true},
+			oauthCfg:         &social.OAuthInfo{UsePKCE: true, Enabled: true},
 			addStateCookie:   true,
 			stateCookieValue: "some-state",
 			addPKCECookie:    true,
@@ -108,6 +123,24 @@ func TestOAuth_Authenticate(t *testing.T) {
 			isEmailAllowed:   false,
 			expectedErr:      errOAuthEmailNotAllowed,
 		},
+		{
+			desc: "should return error when no auth id is set and feature toggle is enabled",
+			req: &authn.Request{
+				HTTPRequest: &http.Request{
+					Header: map[string][]string{},
+					URL:    mustParseURL("http://grafana.com/?state=some-state"),
+				},
+			},
+			features:         []any{featuremgmt.FlagOauthRequireSubClaim},
+			oauthCfg:         &social.OAuthInfo{UsePKCE: true, Enabled: true},
+			addStateCookie:   true,
+			stateCookieValue: "some-state",
+			addPKCECookie:    true,
+			pkceCookieValue:  "some-pkce-value",
+			userInfo:         &social.BasicUserInfo{Email: "some@email.com"},
+			isEmailAllowed:   false,
+			expectedErr:      errOAuthUserInfo,
+		},
 		{
 			desc: "should return identity for valid request",
 			req: &authn.Request{HTTPRequest: &http.Request{
@@ -115,7 +148,7 @@ func TestOAuth_Authenticate(t *testing.T) {
 				URL:    mustParseURL("http://grafana.com/?state=some-state"),
 			},
 			},
-			oauthCfg:         &social.OAuthInfo{UsePKCE: true},
+			oauthCfg:         &social.OAuthInfo{UsePKCE: true, Enabled: true},
 			addStateCookie:   true,
 			stateCookieValue: "some-state",
 			addPKCECookie:    true,
@@ -153,7 +186,7 @@ func TestOAuth_Authenticate(t *testing.T) {
 				URL:    mustParseURL("http://grafana.com/?state=some-state"),
 			},
 			},
-			oauthCfg:              &social.OAuthInfo{UsePKCE: true},
+			oauthCfg:              &social.OAuthInfo{UsePKCE: true, Enabled: true},
 			allowInsecureTakeover: true,
 			addStateCookie:        true,
 			stateCookieValue:      "some-state",
@@ -185,15 +218,53 @@ func TestOAuth_Authenticate(t *testing.T) {
 				},
 			},
 		},
+		{
+			desc: "should return identity when feature toggle is enabled and auth id is set",
+			req: &authn.Request{
+				HTTPRequest: &http.Request{
+					Header: map[string][]string{},
+					URL:    mustParseURL("http://grafana.com/?state=some-state"),
+				},
+			},
+			oauthCfg:         &social.OAuthInfo{Enabled: true},
+			addStateCookie:   true,
+			stateCookieValue: "some-state",
+			isEmailAllowed:   true,
+			features:         []any{featuremgmt.FlagOauthRequireSubClaim},
+			userInfo: &social.BasicUserInfo{
+				Id:    "123",
+				Name:  "name",
+				Email: "some@email.com",
+				Role:  "Admin",
+			},
+			expectedIdentity: &authn.Identity{
+				Email:           "some@email.com",
+				AuthenticatedBy: login.AzureADAuthModule,
+				AuthID:          "123",
+				Name:            "name",
+				OAuthToken:      &oauth2.Token{},
+				OrgRoles:        map[int64]org.RoleType{1: org.RoleAdmin},
+				ClientParams: authn.ClientParams{
+					SyncUser:        true,
+					SyncTeams:       true,
+					AllowSignUp:     true,
+					FetchSyncedUser: true,
+					SyncOrgRoles:    true,
+					LookUpParams:    login.UserLookupParams{},
+				},
+			},
+		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.desc, func(t *testing.T) {
 			cfg := setting.NewCfg()
+			auth, err := cfg.Raw.NewSection("auth")
+			assert.NoError(t, err)
+			_, err = auth.NewKey("oauth_allow_insecure_email_lookup", strconv.FormatBool(tt.allowInsecureTakeover))
+			assert.NoError(t, err)
 
-			if tt.allowInsecureTakeover {
-				cfg.OAuthAllowInsecureEmailLookup = true
-			}
+			settingsProvider := &setting.OSSImpl{Cfg: cfg}
 
 			if tt.addStateCookie {
 				v := tt.stateCookieValue
@@ -207,12 +278,18 @@ func TestOAuth_Authenticate(t *testing.T) {
 				tt.req.HTTPRequest.AddCookie(&http.Cookie{Name: oauthPKCECookieName, Value: tt.pkceCookieValue})
 			}
 
-			c := ProvideOAuth(authn.ClientWithPrefix("azuread"), cfg, tt.oauthCfg, fakeConnector{
-				ExpectedUserInfo:        tt.userInfo,
-				ExpectedToken:           &oauth2.Token{},
-				ExpectedIsSignupAllowed: true,
-				ExpectedIsEmailAllowed:  tt.isEmailAllowed,
-			}, nil)
+			fakeSocialSvc := &socialtest.FakeSocialService{
+				ExpectedAuthInfoProvider: tt.oauthCfg,
+				ExpectedConnector: fakeConnector{
+					ExpectedUserInfo:        tt.userInfo,
+					ExpectedToken:           &oauth2.Token{},
+					ExpectedIsSignupAllowed: true,
+					ExpectedIsEmailAllowed:  tt.isEmailAllowed,
+				},
+			}
+
+			c := ProvideOAuth(authn.ClientWithPrefix("azuread"), cfg, nil, fakeSocialSvc, settingsProvider, featuremgmt.WithFeatures(tt.features...))
+
 			identity, err := c.Authenticate(context.Background(), tt.req)
 			assert.ErrorIs(t, err, tt.expectedErr)
 
@@ -252,21 +329,27 @@ func TestOAuth_RedirectURL(t *testing.T) {
 	tests := []testCase{
 		{
 			desc:              "should generate redirect url and state",
-			oauthCfg:          &social.OAuthInfo{},
+			oauthCfg:          &social.OAuthInfo{Enabled: true},
 			authCodeUrlCalled: true,
 		},
 		{
 			desc:              "should generate redirect url with hosted domain option if configured",
-			oauthCfg:          &social.OAuthInfo{HostedDomain: "grafana.com"},
+			oauthCfg:          &social.OAuthInfo{HostedDomain: "grafana.com", Enabled: true},
 			numCallOptions:    1,
 			authCodeUrlCalled: true,
 		},
 		{
 			desc:              "should generate redirect url with pkce if configured",
-			oauthCfg:          &social.OAuthInfo{UsePKCE: true},
-			numCallOptions:    2,
+			oauthCfg:          &social.OAuthInfo{UsePKCE: true, Enabled: true},
+			numCallOptions:    1,
 			authCodeUrlCalled: true,
 		},
+		{
+			desc:              "should return error if the client is not enabled",
+			oauthCfg:          &social.OAuthInfo{Enabled: false},
+			authCodeUrlCalled: false,
+			expectedErr:       errOAuthClientDisabled,
+		},
 	}
 
 	for _, tt := range tests {
@@ -275,13 +358,20 @@ func TestOAuth_RedirectURL(t *testing.T) {
 				authCodeUrlCalled = false
 			)
 
-			c := ProvideOAuth(authn.ClientWithPrefix("azuread"), setting.NewCfg(), tt.oauthCfg, mockConnector{
-				AuthCodeURLFunc: func(state string, opts ...oauth2.AuthCodeOption) string {
-					authCodeUrlCalled = true
-					require.Len(t, opts, tt.numCallOptions)
-					return ""
+			fakeSocialSvc := &socialtest.FakeSocialService{
+				ExpectedAuthInfoProvider: tt.oauthCfg,
+				ExpectedConnector: mockConnector{
+					AuthCodeURLFunc: func(state string, opts ...oauth2.AuthCodeOption) string {
+						authCodeUrlCalled = true
+						require.Len(t, opts, tt.numCallOptions)
+						return ""
+					},
 				},
-			}, nil)
+			}
+
+			cfg := setting.NewCfg()
+
+			c := ProvideOAuth(authn.ClientWithPrefix("azuread"), cfg, nil, fakeSocialSvc, &setting.OSSImpl{Cfg: cfg}, featuremgmt.WithFeatures())
 
 			redirect, err := c.RedirectURL(context.Background(), nil)
 			assert.ErrorIs(t, err, tt.expectedErr)
@@ -299,6 +389,124 @@ func TestOAuth_RedirectURL(t *testing.T) {
 	}
 }
 
+func TestOAuth_Logout(t *testing.T) {
+	type testCase struct {
+		desc     string
+		cfg      *setting.Cfg
+		oauthCfg *social.OAuthInfo
+
+		expectedOK            bool
+		expectedURL           string
+		expectedIDTokenHint   string
+		expectedPostLogoutURI string
+	}
+
+	tests := []testCase{
+		{
+			desc:     "should not return redirect url if not configured for client or globably",
+			cfg:      &setting.Cfg{},
+			oauthCfg: &social.OAuthInfo{},
+		},
+		{
+			desc:     "should not return redirect url when client is not enabled",
+			cfg:      &setting.Cfg{},
+			oauthCfg: &social.OAuthInfo{Enabled: false},
+		},
+		{
+			desc: "should return redirect url for globably configured redirect url",
+			cfg: &setting.Cfg{
+				SignoutRedirectUrl: "http://idp.com/logout",
+			},
+			oauthCfg:    &social.OAuthInfo{Enabled: true},
+			expectedURL: "http://idp.com/logout",
+			expectedOK:  true,
+		},
+		{
+			desc: "should return redirect url for client configured redirect url",
+			cfg:  &setting.Cfg{},
+			oauthCfg: &social.OAuthInfo{
+				Enabled:            true,
+				SignoutRedirectUrl: "http://idp.com/logout",
+			},
+			expectedURL: "http://idp.com/logout",
+			expectedOK:  true,
+		},
+		{
+			desc: "client specific url should take precedence",
+			cfg: &setting.Cfg{
+				SignoutRedirectUrl: "http://idp.com/logout",
+			},
+			oauthCfg: &social.OAuthInfo{
+				Enabled:            true,
+				SignoutRedirectUrl: "http://idp-2.com/logout",
+			},
+			expectedURL: "http://idp-2.com/logout",
+			expectedOK:  true,
+		},
+		{
+			desc: "should add id token hint if oicd logout is configured and token is valid",
+			cfg:  &setting.Cfg{},
+			oauthCfg: &social.OAuthInfo{
+				Enabled:            true,
+				SignoutRedirectUrl: "http://idp.com/logout?post_logout_redirect_uri=http%3A%3A%2F%2Ftest.com%2Flogin",
+			},
+			expectedURL:           "http://idp.com/logout",
+			expectedIDTokenHint:   "id_token_hint=some.id.token",
+			expectedPostLogoutURI: "http%3A%3A%2F%2Ftest.com%2Flogin",
+			expectedOK:            true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.desc, func(t *testing.T) {
+			var (
+				getTokenCalled        bool
+				invalidateTokenCalled bool
+			)
+
+			mockService := &oauthtokentest.MockOauthTokenService{
+				GetCurrentOauthTokenFunc: func(_ context.Context, _ identity.Requester) *oauth2.Token {
+					getTokenCalled = true
+					token := &oauth2.Token{
+						AccessToken: "some.access.token",
+						Expiry:      time.Now().Add(10 * time.Minute),
+					}
+					return token.WithExtra(map[string]any{
+						"id_token": "some.id.token",
+					})
+				},
+				InvalidateOAuthTokensFunc: func(_ context.Context, _ *login.UserAuth) error {
+					invalidateTokenCalled = true
+					return nil
+				},
+			}
+
+			fakeSocialSvc := &socialtest.FakeSocialService{
+				ExpectedAuthInfoProvider: tt.oauthCfg,
+			}
+			c := ProvideOAuth(authn.ClientWithPrefix("azuread"), tt.cfg, mockService, fakeSocialSvc, &setting.OSSImpl{Cfg: tt.cfg}, featuremgmt.WithFeatures())
+
+			redirect, ok := c.Logout(context.Background(), &authn.Identity{}, &login.UserAuth{})
+
+			assert.Equal(t, tt.expectedOK, ok)
+			if tt.expectedOK {
+				assert.True(t, strings.HasPrefix(redirect.URL, tt.expectedURL))
+				assert.Contains(t, redirect.URL, tt.expectedIDTokenHint)
+				assert.Contains(t, redirect.URL, tt.expectedPostLogoutURI)
+			}
+
+			assert.True(t, getTokenCalled)
+			assert.True(t, invalidateTokenCalled)
+		})
+	}
+}
+
+func TestGenPKCECodeVerifier(t *testing.T) {
+	verifier, err := genPKCECodeVerifier()
+	assert.NoError(t, err)
+	assert.Len(t, verifier, 128)
+}
+
 type mockConnector struct {
 	AuthCodeURLFunc func(state string, opts ...oauth2.AuthCodeOption) string
 	social.SocialConnector
diff --git a/pkg/services/authn/clients/proxy.go b/pkg/services/authn/clients/proxy.go
index a5631efe1ebaa..cd6a890761577 100644
--- a/pkg/services/authn/clients/proxy.go
+++ b/pkg/services/authn/clients/proxy.go
@@ -3,6 +3,7 @@ package clients
 import (
 	"context"
 	"encoding/hex"
+	"errors"
 	"fmt"
 	"hash/fnv"
 	"net"
@@ -12,9 +13,10 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/remotecache"
+	authidentity "github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/authn"
 	"github.com/grafana/grafana/pkg/services/login"
-	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
 	"github.com/grafana/grafana/pkg/util/errutil"
@@ -42,24 +44,24 @@ var (
 	_ authn.ContextAwareClient = new(Proxy)
 )
 
-func ProvideProxy(cfg *setting.Cfg, cache proxyCache, userSrv user.Service, clients ...authn.ProxyClient) (*Proxy, error) {
-	list, err := parseAcceptList(cfg.AuthProxyWhitelist)
+func ProvideProxy(cfg *setting.Cfg, cache proxyCache, clients ...authn.ProxyClient) (*Proxy, error) {
+	list, err := parseAcceptList(cfg.AuthProxy.Whitelist)
 	if err != nil {
 		return nil, err
 	}
-	return &Proxy{log.New(authn.ClientProxy), cfg, cache, userSrv, clients, list}, nil
+	return &Proxy{log.New(authn.ClientProxy), cfg, cache, clients, list}, nil
 }
 
 type proxyCache interface {
 	Get(ctx context.Context, key string) ([]byte, error)
 	Set(ctx context.Context, key string, value []byte, expire time.Duration) error
+	Delete(ctx context.Context, key string) error
 }
 
 type Proxy struct {
 	log         log.Logger
 	cfg         *setting.Cfg
 	cache       proxyCache
-	userSrv     user.Service
 	clients     []authn.ProxyClient
 	acceptedIPs []*net.IPNet
 }
@@ -73,38 +75,22 @@ func (c *Proxy) Authenticate(ctx context.Context, r *authn.Request) (*authn.Iden
 		return nil, errNotAcceptedIP.Errorf("request ip is not in the configured accept list")
 	}
 
-	username := getProxyHeader(r, c.cfg.AuthProxyHeaderName, c.cfg.AuthProxyHeadersEncoded)
+	username := getProxyHeader(r, c.cfg.AuthProxy.HeaderName, c.cfg.AuthProxy.HeadersEncoded)
 	if len(username) == 0 {
 		return nil, errEmptyProxyHeader.Errorf("no username provided in auth proxy header")
 	}
 
 	additional := getAdditionalProxyHeaders(r, c.cfg)
-
 	cacheKey, ok := getProxyCacheKey(username, additional)
-	if ok {
-		// See if we have cached the user id, in that case we can fetch the signed-in user and skip sync.
-		// Error here means that we could not find anything in cache, so we can proceed as usual
-		if entry, err := c.cache.Get(ctx, cacheKey); err == nil {
-			uid, err := strconv.ParseInt(string(entry), 10, 64)
-			if err != nil {
-				c.log.FromContext(ctx).Warn("Failed to parse user id from cache", "error", err, "userId", string(entry))
-			} else {
-				usr, err := c.userSrv.GetSignedInUserWithCacheCtx(ctx, &user.GetSignedInUserQuery{
-					UserID: uid,
-					OrgID:  r.OrgID,
-				})
-
-				if err != nil {
-					c.log.FromContext(ctx).Warn("Could not resolved cached user", "error", err, "userId", string(entry))
-				}
-
-				// if we for some reason cannot find the user we proceed with the normal flow, authenticate with ProxyClient
-				// and perform syncs
-				if usr != nil {
-					c.log.FromContext(ctx).Debug("User was loaded from cache, skip syncs", "userId", usr.UserID)
-					return authn.IdentityFromSignedInUser(authn.NamespacedID(authn.NamespaceUser, usr.UserID), usr, authn.ClientParams{SyncPermissions: true}, login.AuthProxyAuthModule), nil
-				}
-			}
+
+	if c.cfg.AuthProxy.SyncTTL != 0 && ok {
+		identity, errCache := c.retrieveIDFromCache(ctx, cacheKey, r)
+		if errCache == nil {
+			return identity, nil
+		}
+
+		if !errors.Is(errCache, remotecache.ErrCacheItemNotFound) {
+			c.log.FromContext(ctx).Warn("Failed to fetch auth proxy info from cache", "error", errCache)
 		}
 	}
 
@@ -121,8 +107,34 @@ func (c *Proxy) Authenticate(ctx context.Context, r *authn.Request) (*authn.Iden
 	return nil, clientErr
 }
 
+// See if we have cached the user id, in that case we can fetch the signed-in user and skip sync.
+// Error here means that we could not find anything in cache, so we can proceed as usual
+func (c *Proxy) retrieveIDFromCache(ctx context.Context, cacheKey string, r *authn.Request) (*authn.Identity, error) {
+	entry, err := c.cache.Get(ctx, cacheKey)
+	if err != nil {
+		return nil, err
+	}
+
+	uid, err := strconv.ParseInt(string(entry), 10, 64)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse user id from cache: %w - entry: %s", err, string(entry))
+	}
+
+	return &authn.Identity{
+		ID:    authn.NamespacedID(authn.NamespaceUser, uid),
+		OrgID: r.OrgID,
+		// FIXME: This does not match the actual auth module used, but should not have any impact
+		// Maybe caching the auth module used with the user ID would be a good idea
+		AuthenticatedBy: login.AuthProxyAuthModule,
+		ClientParams: authn.ClientParams{
+			FetchSyncedUser: true,
+			SyncPermissions: true,
+		},
+	}, nil
+}
+
 func (c *Proxy) Test(ctx context.Context, r *authn.Request) bool {
-	return len(getProxyHeader(r, c.cfg.AuthProxyHeaderName, c.cfg.AuthProxyHeadersEncoded)) != 0
+	return len(getProxyHeader(r, c.cfg.AuthProxy.HeaderName, c.cfg.AuthProxy.HeadersEncoded)) != 0
 }
 
 func (c *Proxy) Priority() uint {
@@ -134,18 +146,42 @@ func (c *Proxy) Hook(ctx context.Context, identity *authn.Identity, r *authn.Req
 		return nil
 	}
 
-	namespace, id := identity.NamespacedID()
+	namespace, identifier := identity.GetNamespacedID()
 	if namespace != authn.NamespaceUser {
 		return nil
 	}
 
+	id, err := authidentity.IntIdentifier(namespace, identifier)
+	if err != nil {
+		c.log.Warn("Failed to cache proxy user", "error", err, "userId", identifier, "err", err)
+		return nil
+	}
+
+	// User's role would not be updated if the cache hit. If requests arrive in the following order:
+	// 1. Name = x; Role = Admin			# cache missed, new user created and cached with key Name=x;Role=Admin
+	// 2. Name = x; Role = Editor			# cache missed, the user got updated and cached with key Name=x;Role=Editor
+	// 3. Name = x; Role = Admin			# cache hit with key Name=x;Role=Admin, no update, the user stays with Role=Editor
+	// To avoid such a problem we also cache the key used using `prefix:[username]`.
+	// Then whenever we get a cache miss due to changes in any header we use it to invalidate the previous item.
+	username := getProxyHeader(r, c.cfg.AuthProxy.HeaderName, c.cfg.AuthProxy.HeadersEncoded)
+	userKey := fmt.Sprintf("%s:%s", proxyCachePrefix, username)
+
+	// invalidate previously cached user id
+	if prevCacheKey, err := c.cache.Get(ctx, userKey); err == nil && len(prevCacheKey) > 0 {
+		if err := c.cache.Delete(ctx, string(prevCacheKey)); err != nil {
+			return err
+		}
+	}
+
 	c.log.FromContext(ctx).Debug("Cache proxy user", "userId", id)
 	bytes := []byte(strconv.FormatInt(id, 10))
-	if err := c.cache.Set(ctx, identity.ClientParams.CacheAuthProxyKey, bytes, time.Duration(c.cfg.AuthProxySyncTTL)*time.Minute); err != nil {
+	duration := time.Duration(c.cfg.AuthProxy.SyncTTL) * time.Minute
+	if err := c.cache.Set(ctx, identity.ClientParams.CacheAuthProxyKey, bytes, duration); err != nil {
 		c.log.Warn("Failed to cache proxy user", "error", err, "userId", id)
 	}
 
-	return nil
+	// store current cacheKey for the user
+	return c.cache.Set(ctx, userKey, []byte(identity.ClientParams.CacheAuthProxyKey), duration)
 }
 
 func (c *Proxy) isAllowedIP(r *authn.Request) bool {
@@ -212,7 +248,7 @@ func getProxyHeader(r *authn.Request, headerName string, encoded bool) string {
 func getAdditionalProxyHeaders(r *authn.Request, cfg *setting.Cfg) map[string]string {
 	additional := make(map[string]string, len(proxyFields))
 	for _, k := range proxyFields {
-		if v := getProxyHeader(r, cfg.AuthProxyHeaders[k], cfg.AuthProxyHeadersEncoded); v != "" {
+		if v := getProxyHeader(r, cfg.AuthProxy.Headers[k], cfg.AuthProxy.HeadersEncoded); v != "" {
 			additional[k] = v
 		}
 	}
diff --git a/pkg/services/authn/clients/proxy_test.go b/pkg/services/authn/clients/proxy_test.go
index a0b19dc1a0d93..1f9801224766c 100644
--- a/pkg/services/authn/clients/proxy_test.go
+++ b/pkg/services/authn/clients/proxy_test.go
@@ -3,6 +3,7 @@ package clients
 import (
 	"context"
 	"errors"
+	"fmt"
 	"net/http"
 	"testing"
 	"time"
@@ -12,7 +13,6 @@ import (
 
 	"github.com/grafana/grafana/pkg/services/authn"
 	"github.com/grafana/grafana/pkg/services/authn/authntest"
-	"github.com/grafana/grafana/pkg/services/user/usertest"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
@@ -100,9 +100,9 @@ func TestProxy_Authenticate(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.desc, func(t *testing.T) {
 			cfg := setting.NewCfg()
-			cfg.AuthProxyHeaderName = "X-Username"
-			cfg.AuthProxyHeaders = tt.proxyHeaders
-			cfg.AuthProxyWhitelist = tt.ips
+			cfg.AuthProxy.HeaderName = "X-Username"
+			cfg.AuthProxy.Headers = tt.proxyHeaders
+			cfg.AuthProxy.Whitelist = tt.ips
 
 			calledUsername := ""
 			var calledAdditional map[string]string
@@ -112,7 +112,7 @@ func TestProxy_Authenticate(t *testing.T) {
 				calledAdditional = additional
 				return nil, nil
 			}}
-			c, err := ProvideProxy(cfg, fakeCache{expectedErr: errors.New("")}, usertest.NewUserServiceFake(), proxyClient)
+			c, err := ProvideProxy(cfg, &fakeCache{expectedErr: errors.New("")}, proxyClient)
 			require.NoError(t, err)
 
 			_, err = c.Authenticate(context.Background(), tt.req)
@@ -166,7 +166,7 @@ func TestProxy_Test(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.desc, func(t *testing.T) {
 			cfg := setting.NewCfg()
-			cfg.AuthProxyHeaderName = "Proxy-Header"
+			cfg.AuthProxy.HeaderName = "Proxy-Header"
 
 			c, _ := ProvideProxy(cfg, nil, nil, nil)
 			assert.Equal(t, tt.expectedOK, c.Test(context.Background(), tt.req))
@@ -177,14 +177,65 @@ func TestProxy_Test(t *testing.T) {
 var _ proxyCache = new(fakeCache)
 
 type fakeCache struct {
-	expectedErr  error
-	expectedItem []byte
+	data        map[string][]byte
+	expectedErr error
 }
 
-func (f fakeCache) Get(ctx context.Context, key string) ([]byte, error) {
-	return f.expectedItem, f.expectedErr
+func (f *fakeCache) Get(ctx context.Context, key string) ([]byte, error) {
+	return f.data[key], f.expectedErr
 }
 
-func (f fakeCache) Set(ctx context.Context, key string, value []byte, expire time.Duration) error {
+func (f *fakeCache) Set(ctx context.Context, key string, value []byte, expire time.Duration) error {
+	f.data[key] = value
 	return f.expectedErr
 }
+
+func (f fakeCache) Delete(ctx context.Context, key string) error {
+	delete(f.data, key)
+	return f.expectedErr
+}
+
+func TestProxy_Hook(t *testing.T) {
+	cfg := setting.NewCfg()
+	cfg.AuthProxy.HeaderName = "X-Username"
+	cfg.AuthProxy.Headers = map[string]string{
+		proxyFieldRole: "X-Role",
+	}
+	cache := &fakeCache{data: make(map[string][]byte)}
+	userId := 1
+	userID := fmt.Sprintf("%s:%d", authn.NamespaceUser, userId)
+
+	// withRole creates a test case for a user with a specific role.
+	withRole := func(role string) func(t *testing.T) {
+		cacheKey := fmt.Sprintf("users:johndoe-%s", role)
+		return func(t *testing.T) {
+			c, err := ProvideProxy(cfg, cache, authntest.MockProxyClient{})
+			require.NoError(t, err)
+			userIdentity := &authn.Identity{
+				ID: userID,
+				ClientParams: authn.ClientParams{
+					CacheAuthProxyKey: cacheKey,
+				},
+			}
+			userReq := &authn.Request{
+				HTTPRequest: &http.Request{
+					Header: map[string][]string{
+						"X-Username": {"johndoe"},
+						"X-Role":     {role},
+					},
+				},
+			}
+			err = c.Hook(context.Background(), userIdentity, userReq)
+			assert.NoError(t, err)
+			expectedCache := map[string][]byte{
+				cacheKey: []byte(fmt.Sprintf("%d", userId)),
+				fmt.Sprintf("%s:%s", proxyCachePrefix, "johndoe"): []byte(fmt.Sprintf("users:johndoe-%s", role)),
+			}
+			assert.Equal(t, expectedCache, cache.data)
+		}
+	}
+
+	t.Run("step 1: new user with role Admin", withRole("Admin"))
+	t.Run("step 2: cached user with new Role Viewer", withRole("Viewer"))
+	t.Run("step 3: cached user get changed back to Admin", withRole("Admin"))
+}
diff --git a/pkg/services/authn/clients/render.go b/pkg/services/authn/clients/render.go
index 5386240822875..e5a1b6970a40c 100644
--- a/pkg/services/authn/clients/render.go
+++ b/pkg/services/authn/clients/render.go
@@ -8,7 +8,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/login"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/rendering"
-	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/util/errutil"
 )
 
@@ -22,12 +21,11 @@ const (
 
 var _ authn.ContextAwareClient = new(Render)
 
-func ProvideRender(userService user.Service, renderService rendering.Service) *Render {
-	return &Render{userService, renderService}
+func ProvideRender(renderService rendering.Service) *Render {
+	return &Render{renderService}
 }
 
 type Render struct {
-	userService   user.Service
 	renderService rendering.Service
 }
 
@@ -42,26 +40,23 @@ func (c *Render) Authenticate(ctx context.Context, r *authn.Request) (*authn.Ide
 		return nil, errInvalidRenderKey.Errorf("found no render user for key: %s", key)
 	}
 
-	var identity *authn.Identity
 	if renderUsr.UserID <= 0 {
-		identity = &authn.Identity{
-			ID:           authn.NamespacedID(authn.NamespaceRenderService, 0),
-			OrgID:        renderUsr.OrgID,
-			OrgRoles:     map[int64]org.RoleType{renderUsr.OrgID: org.RoleType(renderUsr.OrgRole)},
-			ClientParams: authn.ClientParams{SyncPermissions: true},
-		}
-	} else {
-		usr, err := c.userService.GetSignedInUserWithCacheCtx(ctx, &user.GetSignedInUserQuery{UserID: renderUsr.UserID, OrgID: renderUsr.OrgID})
-		if err != nil {
-			return nil, err
-		}
-
-		identity = authn.IdentityFromSignedInUser(authn.NamespacedID(authn.NamespaceUser, usr.UserID), usr, authn.ClientParams{SyncPermissions: true}, login.RenderModule)
+		return &authn.Identity{
+			ID:              authn.NamespacedID(authn.NamespaceRenderService, 0),
+			OrgID:           renderUsr.OrgID,
+			OrgRoles:        map[int64]org.RoleType{renderUsr.OrgID: org.RoleType(renderUsr.OrgRole)},
+			ClientParams:    authn.ClientParams{SyncPermissions: true},
+			LastSeenAt:      time.Now(),
+			AuthenticatedBy: login.RenderModule,
+		}, nil
 	}
 
-	identity.LastSeenAt = time.Now()
-	identity.AuthenticatedBy = login.RenderModule
-	return identity, nil
+	return &authn.Identity{
+		ID:              authn.NamespacedID(authn.NamespaceUser, renderUsr.UserID),
+		LastSeenAt:      time.Now(),
+		AuthenticatedBy: login.RenderModule,
+		ClientParams:    authn.ClientParams{FetchSyncedUser: true, SyncPermissions: true},
+	}, nil
 }
 
 func (c *Render) Test(ctx context.Context, r *authn.Request) bool {
diff --git a/pkg/services/authn/clients/render_test.go b/pkg/services/authn/clients/render_test.go
index 19e18dbb33665..24051db326f6f 100644
--- a/pkg/services/authn/clients/render_test.go
+++ b/pkg/services/authn/clients/render_test.go
@@ -13,8 +13,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/login"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/rendering"
-	"github.com/grafana/grafana/pkg/services/user"
-	"github.com/grafana/grafana/pkg/services/user/usertest"
 )
 
 func TestRender_Authenticate(t *testing.T) {
@@ -23,7 +21,6 @@ func TestRender_Authenticate(t *testing.T) {
 		renderKey         string
 		req               *authn.Request
 		expectedErr       error
-		expectedUsr       *user.SignedInUser
 		expectedIdentity  *authn.Identity
 		expectedRenderUsr *rendering.RenderUser
 	}
@@ -60,23 +57,13 @@ func TestRender_Authenticate(t *testing.T) {
 			},
 			expectedIdentity: &authn.Identity{
 				ID:              "user:1",
-				OrgID:           1,
-				OrgName:         "test",
-				OrgRoles:        map[int64]org.RoleType{1: org.RoleAdmin},
-				IsGrafanaAdmin:  boolPtr(false),
 				AuthenticatedBy: login.RenderModule,
-				ClientParams:    authn.ClientParams{SyncPermissions: true},
+				ClientParams:    authn.ClientParams{FetchSyncedUser: true, SyncPermissions: true},
 			},
 			expectedRenderUsr: &rendering.RenderUser{
 				OrgID:  1,
 				UserID: 1,
 			},
-			expectedUsr: &user.SignedInUser{
-				UserID:  1,
-				OrgID:   1,
-				OrgName: "test",
-				OrgRole: "Admin",
-			},
 		},
 		{
 			desc:      "expect error when render key is invalid",
@@ -97,7 +84,7 @@ func TestRender_Authenticate(t *testing.T) {
 			renderService := rendering.NewMockService(ctrl)
 			renderService.EXPECT().GetRenderUser(gomock.Any(), tt.renderKey).Return(tt.expectedRenderUsr, tt.expectedRenderUsr != nil)
 
-			c := ProvideRender(&usertest.FakeUserService{ExpectedSignedInUser: tt.expectedUsr}, renderService)
+			c := ProvideRender(renderService)
 			identity, err := c.Authenticate(context.Background(), tt.req)
 			if tt.expectedErr != nil {
 				assert.ErrorIs(t, tt.expectedErr, err)
@@ -141,7 +128,7 @@ func TestRender_Test(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.desc, func(t *testing.T) {
-			c := ProvideRender(&usertest.FakeUserService{}, &rendering.MockService{})
+			c := ProvideRender(&rendering.MockService{})
 			assert.Equal(t, tt.expected, c.Test(context.Background(), tt.req))
 		})
 	}
diff --git a/pkg/services/authn/clients/session.go b/pkg/services/authn/clients/session.go
index c97a87d27f190..1af47b16449d6 100644
--- a/pkg/services/authn/clients/session.go
+++ b/pkg/services/authn/clients/session.go
@@ -2,27 +2,20 @@ package clients
 
 import (
 	"context"
-	"errors"
 	"net/url"
 	"time"
 
 	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/infra/network"
 	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/authn"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/web"
 )
 
-var _ authn.HookClient = new(Session)
 var _ authn.ContextAwareClient = new(Session)
 
-func ProvideSession(cfg *setting.Cfg, sessionService auth.UserTokenService,
-	features *featuremgmt.FeatureManager) *Session {
+func ProvideSession(cfg *setting.Cfg, sessionService auth.UserTokenService) *Session {
 	return &Session{
 		cfg:            cfg,
-		features:       features,
 		sessionService: sessionService,
 		log:            log.New(authn.ClientSession),
 	}
@@ -30,7 +23,6 @@ func ProvideSession(cfg *setting.Cfg, sessionService auth.UserTokenService,
 
 type Session struct {
 	cfg            *setting.Cfg
-	features       *featuremgmt.FeatureManager
 	sessionService auth.UserTokenService
 	log            log.Logger
 }
@@ -55,10 +47,8 @@ func (s *Session) Authenticate(ctx context.Context, r *authn.Request) (*authn.Id
 		return nil, err
 	}
 
-	if s.features.IsEnabled(featuremgmt.FlagClientTokenRotation) {
-		if token.NeedsRotation(time.Duration(s.cfg.TokenRotationIntervalMinutes) * time.Minute) {
-			return nil, authn.ErrTokenNeedsRotation.Errorf("token needs to be rotated")
-		}
+	if token.NeedsRotation(time.Duration(s.cfg.TokenRotationIntervalMinutes) * time.Minute) {
+		return nil, authn.ErrTokenNeedsRotation.Errorf("token needs to be rotated")
 	}
 
 	return &authn.Identity{
@@ -86,40 +76,3 @@ func (s *Session) Test(ctx context.Context, r *authn.Request) bool {
 func (s *Session) Priority() uint {
 	return 60
 }
-
-func (s *Session) Hook(ctx context.Context, identity *authn.Identity, r *authn.Request) error {
-	if identity.SessionToken == nil || s.features.IsEnabled(featuremgmt.FlagClientTokenRotation) {
-		return nil
-	}
-
-	r.Resp.Before(func(w web.ResponseWriter) {
-		if w.Written() || errors.Is(ctx.Err(), context.Canceled) {
-			return
-		}
-
-		// FIXME (jguer): get real values
-		addr := web.RemoteAddr(r.HTTPRequest)
-		userAgent := r.HTTPRequest.UserAgent()
-
-		// addr := reqContext.RemoteAddr()
-		ip, err := network.GetIPFromAddress(addr)
-		if err != nil {
-			s.log.Debug("Failed to get client IP address", "addr", addr, "err", err)
-			ip = nil
-		}
-		rotated, newToken, err := s.sessionService.TryRotateToken(ctx, identity.SessionToken, ip, userAgent)
-		if err != nil {
-			s.log.Error("Failed to rotate token", "error", err)
-			return
-		}
-
-		if rotated {
-			identity.SessionToken = newToken
-			s.log.Debug("Rotated session token", "user", identity.ID)
-
-			authn.WriteSessionCookie(w, s.cfg, identity.SessionToken)
-		}
-	})
-
-	return nil
-}
diff --git a/pkg/services/authn/clients/session_test.go b/pkg/services/authn/clients/session_test.go
index 8dd7555cd269b..41fc4e5f7aea0 100644
--- a/pkg/services/authn/clients/session_test.go
+++ b/pkg/services/authn/clients/session_test.go
@@ -2,7 +2,6 @@ package clients
 
 import (
 	"context"
-	"net"
 	"net/http"
 	"testing"
 	"time"
@@ -14,9 +13,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/auth/authtest"
 	"github.com/grafana/grafana/pkg/services/authn"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/web"
 )
 
 func TestSession_Test(t *testing.T) {
@@ -29,7 +26,7 @@ func TestSession_Test(t *testing.T) {
 	cfg := setting.NewCfg()
 	cfg.LoginCookieName = ""
 	cfg.LoginMaxLifetime = 20 * time.Second
-	s := ProvideSession(cfg, &authtest.FakeUserAuthTokenService{}, featuremgmt.WithFeatures())
+	s := ProvideSession(cfg, &authtest.FakeUserAuthTokenService{})
 
 	disabled := s.Test(context.Background(), &authn.Request{HTTPRequest: validHTTPReq})
 	assert.False(t, disabled)
@@ -64,7 +61,6 @@ func TestSession_Authenticate(t *testing.T) {
 
 	type fields struct {
 		sessionService auth.UserTokenService
-		features       *featuremgmt.FeatureManager
 	}
 	type args struct {
 		r *authn.Request
@@ -80,7 +76,6 @@ func TestSession_Authenticate(t *testing.T) {
 			name: "cookie not found",
 			fields: fields{
 				sessionService: &authtest.FakeUserAuthTokenService{},
-				features:       featuremgmt.WithFeatures(),
 			},
 			args:    args{r: &authn.Request{HTTPRequest: &http.Request{}}},
 			wantID:  nil,
@@ -92,7 +87,6 @@ func TestSession_Authenticate(t *testing.T) {
 				sessionService: &authtest.FakeUserAuthTokenService{LookupTokenProvider: func(ctx context.Context, unhashedToken string) (*auth.UserToken, error) {
 					return validToken, nil
 				}},
-				features: featuremgmt.WithFeatures(),
 			},
 			args: args{r: &authn.Request{HTTPRequest: validHTTPReq}},
 			wantID: &authn.Identity{
@@ -106,7 +100,7 @@ func TestSession_Authenticate(t *testing.T) {
 			wantErr: false,
 		},
 		{
-			name: "should return error for token that needs rotation if ClientTokenRotation is enabled",
+			name: "should return error for token that needs rotation",
 			fields: fields{
 				sessionService: &authtest.FakeUserAuthTokenService{LookupTokenProvider: func(ctx context.Context, unhashedToken string) (*auth.UserToken, error) {
 					return &auth.UserToken{
@@ -114,18 +108,16 @@ func TestSession_Authenticate(t *testing.T) {
 						RotatedAt:     time.Now().Add(-11 * time.Minute).Unix(),
 					}, nil
 				}},
-				features: featuremgmt.WithFeatures(featuremgmt.FlagClientTokenRotation),
 			},
 			args:    args{r: &authn.Request{HTTPRequest: validHTTPReq}},
 			wantErr: true,
 		},
 		{
-			name: "should return identity for token that don't need rotation if ClientTokenRotation is enabled",
+			name: "should return identity for token that don't need rotation",
 			fields: fields{
 				sessionService: &authtest.FakeUserAuthTokenService{LookupTokenProvider: func(ctx context.Context, unhashedToken string) (*auth.UserToken, error) {
 					return validToken, nil
 				}},
-				features: featuremgmt.WithFeatures(featuremgmt.FlagClientTokenRotation),
 			},
 			args: args{r: &authn.Request{HTTPRequest: validHTTPReq}},
 			wantID: &authn.Identity{
@@ -145,7 +137,7 @@ func TestSession_Authenticate(t *testing.T) {
 			cfg.LoginCookieName = cookieName
 			cfg.TokenRotationIntervalMinutes = 10
 			cfg.LoginMaxLifetime = 20 * time.Second
-			s := ProvideSession(cfg, tt.fields.sessionService, tt.fields.features)
+			s := ProvideSession(cfg, tt.fields.sessionService)
 
 			got, err := s.Authenticate(context.Background(), tt.args.r)
 			require.True(t, (err != nil) == tt.wantErr, err)
@@ -157,73 +149,3 @@ func TestSession_Authenticate(t *testing.T) {
 		})
 	}
 }
-
-type fakeResponseWriter struct {
-	Status      int
-	HeaderStore http.Header
-}
-
-func (f *fakeResponseWriter) Header() http.Header {
-	return f.HeaderStore
-}
-
-func (f *fakeResponseWriter) Write([]byte) (int, error) {
-	return 0, nil
-}
-
-func (f *fakeResponseWriter) WriteHeader(statusCode int) {
-	f.Status = statusCode
-}
-
-func TestSession_Hook(t *testing.T) {
-	t.Run("should rotate token", func(t *testing.T) {
-		cfg := setting.NewCfg()
-		cfg.LoginCookieName = "grafana-session"
-		cfg.LoginMaxLifetime = 20 * time.Second
-		s := ProvideSession(cfg, &authtest.FakeUserAuthTokenService{
-			TryRotateTokenProvider: func(ctx context.Context, token *auth.UserToken, clientIP net.IP, userAgent string) (bool, *auth.UserToken, error) {
-				token.UnhashedToken = "new-token"
-				return true, token, nil
-			},
-		}, featuremgmt.WithFeatures())
-
-		sampleID := &authn.Identity{
-			SessionToken: &auth.UserToken{
-				Id:     1,
-				UserId: 1,
-			},
-		}
-
-		mockResponseWriter := &fakeResponseWriter{
-			Status:      0,
-			HeaderStore: map[string][]string{},
-		}
-
-		resp := &authn.Request{
-			HTTPRequest: &http.Request{
-				Header: map[string][]string{},
-			},
-			Resp: web.NewResponseWriter(http.MethodConnect, mockResponseWriter),
-		}
-
-		err := s.Hook(context.Background(), sampleID, resp)
-		require.NoError(t, err)
-
-		resp.Resp.WriteHeader(201)
-		require.Equal(t, 201, mockResponseWriter.Status)
-
-		assert.Equal(t, "new-token", sampleID.SessionToken.UnhashedToken)
-		require.Len(t, mockResponseWriter.HeaderStore, 1)
-		assert.Equal(t, "grafana-session=new-token; Path=/; Max-Age=20; HttpOnly",
-			mockResponseWriter.HeaderStore.Get("set-cookie"), mockResponseWriter.HeaderStore)
-	})
-
-	t.Run("should not rotate token with feature flag", func(t *testing.T) {
-		s := ProvideSession(setting.NewCfg(), nil, featuremgmt.WithFeatures(featuremgmt.FlagClientTokenRotation))
-
-		req := &authn.Request{}
-		identity := &authn.Identity{}
-		err := s.Hook(context.Background(), identity, req)
-		require.NoError(t, err)
-	})
-}
diff --git a/pkg/services/authn/identity.go b/pkg/services/authn/identity.go
index 74a827010cb87..5eeb636980a89 100644
--- a/pkg/services/authn/identity.go
+++ b/pkg/services/authn/identity.go
@@ -31,6 +31,7 @@ const (
 
 const (
 	AnonymousNamespaceID = NamespaceAnonymous + ":0"
+	GlobalOrgID          = int64(0)
 )
 
 var _ identity.Requester = (*Identity)(nil)
@@ -86,6 +87,18 @@ type Identity struct {
 	IDToken string
 }
 
+func (i *Identity) GetID() string {
+	return i.ID
+}
+
+func (i *Identity) GetNamespacedID() (namespace string, identifier string) {
+	split := strings.Split(i.GetID(), ":")
+	if len(split) != 2 {
+		return "", ""
+	}
+	return split[0], split[1]
+}
+
 func (i *Identity) GetAuthenticatedBy() string {
 	return i.AuthenticatedBy
 }
@@ -121,16 +134,6 @@ func (i *Identity) GetLogin() string {
 	return i.Login
 }
 
-func (i *Identity) GetNamespacedID() (namespace string, identifier string) {
-	split := strings.Split(i.ID, ":")
-
-	if len(split) != 2 {
-		return "", ""
-	}
-
-	return split[0], split[1]
-}
-
 // GetOrgID implements identity.Requester.
 func (i *Identity) GetOrgID() int64 {
 	return i.OrgID
@@ -164,6 +167,19 @@ func (i *Identity) GetPermissions() map[string][]string {
 	return i.Permissions[i.GetOrgID()]
 }
 
+// GetGlobalPermissions returns the permissions of the active entity that are available across all organizations
+func (i *Identity) GetGlobalPermissions() map[string][]string {
+	if i.Permissions == nil {
+		return make(map[string][]string)
+	}
+
+	if i.Permissions[GlobalOrgID] == nil {
+		return make(map[string][]string)
+	}
+
+	return i.Permissions[GlobalOrgID]
+}
+
 func (i *Identity) GetTeams() []int64 {
 	return i.Teams
 }
@@ -181,25 +197,17 @@ func (i *Identity) HasUniqueId() bool {
 	return namespace == NamespaceUser || namespace == NamespaceServiceAccount || namespace == NamespaceAPIKey
 }
 
-func (i *Identity) IsNil() bool {
-	return i == nil
-}
-
-// NamespacedID returns the namespace, e.g. "user" and the id for that namespace
-// FIXME(kalleep): Replace with GetNamespacedID
-func (i *Identity) NamespacedID() (string, int64) {
-	split := strings.Split(i.ID, ":")
-	if len(split) != 2 {
-		return "", -1
-	}
-
-	id, err := strconv.ParseInt(split[1], 10, 64)
-	if err != nil {
-		// FIXME (kalleep): Improve error handling
-		return "", -1
+func (i *Identity) IsAuthenticatedBy(providers ...string) bool {
+	for _, p := range providers {
+		if i.AuthenticatedBy == p {
+			return true
+		}
 	}
+	return false
+}
 
-	return split[0], id
+func (i *Identity) IsNil() bool {
+	return i == nil
 }
 
 // SignedInUser returns a SignedInUser from the identity.
diff --git a/pkg/services/cleanup/cleanup.go b/pkg/services/cleanup/cleanup.go
index a96d5f5a702f3..3b1a2c5e201dd 100644
--- a/pkg/services/cleanup/cleanup.go
+++ b/pkg/services/cleanup/cleanup.go
@@ -102,6 +102,7 @@ func (srv *CleanUpService) clean(ctx context.Context) {
 		{"expire old user invites", srv.expireOldUserInvites},
 		{"delete stale short URLs", srv.deleteStaleShortURLs},
 		{"delete stale query history", srv.deleteStaleQueryHistory},
+		{"expire old email verifications", srv.expireOldVerifications},
 	}
 
 	logger := srv.log.FromContext(ctx)
@@ -134,6 +135,7 @@ func (srv *CleanUpService) cleanUpTmpFiles(ctx context.Context) {
 	folders := []string{
 		srv.Cfg.ImagesDir,
 		srv.Cfg.CSVsDir,
+		srv.Cfg.PDFsDir,
 	}
 
 	for _, f := range folders {
@@ -237,6 +239,21 @@ func (srv *CleanUpService) expireOldUserInvites(ctx context.Context) {
 	}
 }
 
+func (srv *CleanUpService) expireOldVerifications(ctx context.Context) {
+	logger := srv.log.FromContext(ctx)
+	maxVerificationLifetime := srv.Cfg.VerificationEmailMaxLifetime
+
+	cmd := tempuser.ExpireTempUsersCommand{
+		OlderThan: time.Now().Add(-maxVerificationLifetime),
+	}
+
+	if err := srv.tempUserService.ExpireOldVerifications(ctx, &cmd); err != nil {
+		logger.Error("Problem expiring email verifications", "error", err.Error())
+	} else {
+		logger.Debug("Expired email verifications", "rows affected", cmd.NumExpired)
+	}
+}
+
 func (srv *CleanUpService) deleteStaleShortURLs(ctx context.Context) {
 	logger := srv.log.FromContext(ctx)
 	cmd := shorturls.DeleteShortUrlCommand{
diff --git a/pkg/services/cloudmigration/api/api.go b/pkg/services/cloudmigration/api/api.go
new file mode 100644
index 0000000000000..bfe83105eb8dd
--- /dev/null
+++ b/pkg/services/cloudmigration/api/api.go
@@ -0,0 +1,131 @@
+package api
+
+import (
+	"net/http"
+	"strconv"
+
+	"github.com/grafana/grafana/pkg/api/response"
+	"github.com/grafana/grafana/pkg/api/routing"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/middleware"
+	"github.com/grafana/grafana/pkg/services/cloudmigration"
+	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/web"
+)
+
+type CloudMigrationAPI struct {
+	cloudMigrationsService cloudmigration.Service
+	routeRegister          routing.RouteRegister
+	log                    log.Logger
+	tracer                 tracing.Tracer
+}
+
+func RegisterApi(
+	rr routing.RouteRegister,
+	cms cloudmigration.Service,
+	tracer tracing.Tracer,
+) *CloudMigrationAPI {
+	api := &CloudMigrationAPI{
+		log:                    log.New("cloudmigrations.api"),
+		routeRegister:          rr,
+		cloudMigrationsService: cms,
+		tracer:                 tracer,
+	}
+	api.registerEndpoints()
+	return api
+}
+
+// RegisterAPIEndpoints Registers Endpoints on Grafana Router
+func (cma *CloudMigrationAPI) registerEndpoints() {
+	cma.routeRegister.Group("/api/cloudmigration", func(cloudMigrationRoute routing.RouteRegister) {
+		// migration
+		cloudMigrationRoute.Get("/migration", routing.Wrap(cma.GetMigrationList))
+		cloudMigrationRoute.Post("/migration", routing.Wrap(cma.CreateMigration))
+		cloudMigrationRoute.Get("/migration/:id", routing.Wrap(cma.GetMigration))
+		cloudMigrationRoute.Delete("migration/:id", routing.Wrap(cma.DeleteMigration))
+		cloudMigrationRoute.Post("/migration/:id/run", routing.Wrap(cma.RunMigration))
+		cloudMigrationRoute.Get("/migration/:id/run", routing.Wrap(cma.GetMigrationRunList))
+		cloudMigrationRoute.Get("/migration/:id/run/:runID", routing.Wrap(cma.GetMigrationRun))
+		cloudMigrationRoute.Post("/token", routing.Wrap(cma.CreateToken))
+	}, middleware.ReqGrafanaAdmin)
+}
+
+func (cma *CloudMigrationAPI) CreateToken(c *contextmodel.ReqContext) response.Response {
+	ctx, span := cma.tracer.Start(c.Req.Context(), "MigrationAPI.CreateAccessToken")
+	defer span.End()
+
+	logger := cma.log.FromContext(ctx)
+
+	resp, err := cma.cloudMigrationsService.CreateToken(ctx)
+	if err != nil {
+		logger.Error("creating gcom access token", "err", err.Error())
+		return response.Error(http.StatusInternalServerError, "creating gcom access token", err)
+	}
+
+	return response.JSON(http.StatusOK, cloudmigration.CreateAccessTokenResponseDTO(resp))
+}
+
+func (cma *CloudMigrationAPI) GetMigrationList(c *contextmodel.ReqContext) response.Response {
+	cloudMigrations, err := cma.cloudMigrationsService.GetMigrationList(c.Req.Context())
+	if err != nil {
+		return response.Error(http.StatusInternalServerError, "migration list error", err)
+	}
+	return response.JSON(http.StatusOK, cloudMigrations)
+}
+
+func (cma *CloudMigrationAPI) GetMigration(c *contextmodel.ReqContext) response.Response {
+	id, err := strconv.ParseInt(web.Params(c.Req)[":id"], 10, 64)
+	if err != nil {
+		return response.Error(http.StatusBadRequest, "id is invalid", err)
+	}
+	cloudMigration, err := cma.cloudMigrationsService.GetMigration(c.Req.Context(), id)
+	if err != nil {
+		return response.Error(http.StatusNotFound, "migration not found", err)
+	}
+	return response.JSON(http.StatusOK, cloudMigration)
+}
+
+func (cma *CloudMigrationAPI) CreateMigration(c *contextmodel.ReqContext) response.Response {
+	cmd := cloudmigration.CloudMigrationRequest{}
+	if err := web.Bind(c.Req, &cmd); err != nil {
+		return response.Error(http.StatusBadRequest, "bad request data", err)
+	}
+	cloudMigration, err := cma.cloudMigrationsService.CreateMigration(c.Req.Context(), cmd)
+	if err != nil {
+		return response.Error(http.StatusInternalServerError, "migration creation error", err)
+	}
+	return response.JSON(http.StatusOK, cloudMigration)
+}
+
+func (cma *CloudMigrationAPI) RunMigration(c *contextmodel.ReqContext) response.Response {
+	cloudMigrationRun, err := cma.cloudMigrationsService.RunMigration(c.Req.Context(), web.Params(c.Req)[":id"])
+	if err != nil {
+		return response.Error(http.StatusInternalServerError, "migration run error", err)
+	}
+	return response.JSON(http.StatusOK, cloudMigrationRun)
+}
+
+func (cma *CloudMigrationAPI) GetMigrationRun(c *contextmodel.ReqContext) response.Response {
+	migrationStatus, err := cma.cloudMigrationsService.GetMigrationStatus(c.Req.Context(), web.Params(c.Req)[":id"], web.Params(c.Req)[":runID"])
+	if err != nil {
+		return response.Error(http.StatusInternalServerError, "migration status error", err)
+	}
+	return response.JSON(http.StatusOK, migrationStatus)
+}
+
+func (cma *CloudMigrationAPI) GetMigrationRunList(c *contextmodel.ReqContext) response.Response {
+	migrationStatus, err := cma.cloudMigrationsService.GetMigrationStatusList(c.Req.Context(), web.Params(c.Req)[":id"])
+	if err != nil {
+		return response.Error(http.StatusInternalServerError, "migration status error", err)
+	}
+	return response.JSON(http.StatusOK, migrationStatus)
+}
+
+func (cma *CloudMigrationAPI) DeleteMigration(c *contextmodel.ReqContext) response.Response {
+	err := cma.cloudMigrationsService.DeleteMigration(c.Req.Context(), web.Params(c.Req)[":id"])
+	if err != nil {
+		return response.Error(http.StatusInternalServerError, "migration delete error", err)
+	}
+	return response.Empty(http.StatusOK)
+}
diff --git a/pkg/services/cloudmigration/api/api_test.go b/pkg/services/cloudmigration/api/api_test.go
new file mode 100644
index 0000000000000..3a5fe5a122738
--- /dev/null
+++ b/pkg/services/cloudmigration/api/api_test.go
@@ -0,0 +1,12 @@
+package api
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_OnlyEnabledForGrafanaAdmi(t *testing.T) {
+	// TODO: implement
+	assert.True(t, true)
+}
diff --git a/pkg/services/cloudmigration/cloudmigration.go b/pkg/services/cloudmigration/cloudmigration.go
new file mode 100644
index 0000000000000..d06ebe840b086
--- /dev/null
+++ b/pkg/services/cloudmigration/cloudmigration.go
@@ -0,0 +1,20 @@
+package cloudmigration
+
+import (
+	"context"
+)
+
+type Service interface {
+	CreateToken(context.Context) (CreateAccessTokenResponse, error)
+	ValidateToken(context.Context, string) error
+	SaveEncryptedToken(context.Context, string) error
+	// migration
+	GetMigration(context.Context, int64) (*CloudMigrationResponse, error)
+	GetMigrationList(context.Context) (*CloudMigrationListResponse, error)
+	CreateMigration(context.Context, CloudMigrationRequest) (*CloudMigrationResponse, error)
+	UpdateMigration(context.Context, int64, CloudMigrationRequest) (*CloudMigrationResponse, error)
+	RunMigration(context.Context, string) (*CloudMigrationRun, error)
+	GetMigrationStatus(context.Context, string, string) (*CloudMigrationRun, error)
+	GetMigrationStatusList(context.Context, string) ([]CloudMigrationRun, error)
+	DeleteMigration(context.Context, string) error
+}
diff --git a/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration.go b/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration.go
new file mode 100644
index 0000000000000..96ab5716cd747
--- /dev/null
+++ b/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration.go
@@ -0,0 +1,280 @@
+package cloudmigrationimpl
+
+import (
+	"context"
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"time"
+
+	"github.com/grafana/grafana/pkg/api/routing"
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/services/cloudmigration"
+	"github.com/grafana/grafana/pkg/services/cloudmigration/api"
+	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/gcom"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+// Service Define the cloudmigration.Service Implementation.
+type Service struct {
+	store store
+
+	log *log.ConcreteLogger
+	cfg *setting.Cfg
+
+	features    featuremgmt.FeatureToggles
+	dsService   datasources.DataSourceService
+	gcomService gcom.Service
+
+	api     *api.CloudMigrationAPI
+	tracer  tracing.Tracer
+	metrics *Metrics
+}
+
+var LogPrefix = "cloudmigration.service"
+
+const (
+	// nolint:gosec
+	cloudMigrationAccessPolicyName = "grafana-cloud-migrations"
+	//nolint:gosec
+	cloudMigrationTokenName = "grafana-cloud-migrations"
+)
+
+var _ cloudmigration.Service = (*Service)(nil)
+
+// ProvideService Factory for method used by wire to inject dependencies.
+// builds the service, and api, and configures routes
+func ProvideService(
+	cfg *setting.Cfg,
+	features featuremgmt.FeatureToggles,
+	db db.DB,
+	dsService datasources.DataSourceService,
+	routeRegister routing.RouteRegister,
+	prom prometheus.Registerer,
+	tracer tracing.Tracer,
+) cloudmigration.Service {
+	if !features.IsEnabledGlobally(featuremgmt.FlagOnPremToCloudMigrations) {
+		return &NoopServiceImpl{}
+	}
+
+	s := &Service{
+		store:       &sqlStore{db: db},
+		log:         log.New(LogPrefix),
+		cfg:         cfg,
+		features:    features,
+		dsService:   dsService,
+		gcomService: gcom.New(gcom.Config{ApiURL: cfg.GrafanaComAPIURL, Token: cfg.CloudMigration.GcomAPIToken}),
+		tracer:      tracer,
+		metrics:     newMetrics(),
+	}
+	s.api = api.RegisterApi(routeRegister, s, tracer)
+
+	if err := s.registerMetrics(prom, s.metrics); err != nil {
+		s.log.Warn("error registering prom metrics", "error", err.Error())
+	}
+
+	return s
+}
+
+func (s *Service) CreateToken(ctx context.Context) (cloudmigration.CreateAccessTokenResponse, error) {
+	ctx, span := s.tracer.Start(ctx, "CloudMigrationService.CreateToken")
+	defer span.End()
+	logger := s.log.FromContext(ctx)
+	requestID := tracing.TraceIDFromContext(ctx, false)
+
+	timeoutCtx, cancel := context.WithTimeout(ctx, s.cfg.CloudMigration.FetchInstanceTimeout)
+	defer cancel()
+	instance, err := s.gcomService.GetInstanceByID(timeoutCtx, requestID, s.cfg.StackID)
+	if err != nil {
+		return cloudmigration.CreateAccessTokenResponse{}, fmt.Errorf("fetching instance by id: id=%s %w", s.cfg.StackID, err)
+	}
+
+	timeoutCtx, cancel = context.WithTimeout(ctx, s.cfg.CloudMigration.FetchAccessPolicyTimeout)
+	defer cancel()
+	existingAccessPolicy, err := s.findAccessPolicyByName(timeoutCtx, instance.RegionSlug, cloudMigrationAccessPolicyName)
+	if err != nil {
+		return cloudmigration.CreateAccessTokenResponse{}, fmt.Errorf("fetching access policy by name: name=%s %w", cloudMigrationAccessPolicyName, err)
+	}
+
+	if existingAccessPolicy != nil {
+		timeoutCtx, cancel := context.WithTimeout(ctx, s.cfg.CloudMigration.DeleteAccessPolicyTimeout)
+		defer cancel()
+		if _, err := s.gcomService.DeleteAccessPolicy(timeoutCtx, gcom.DeleteAccessPolicyParams{
+			RequestID:      requestID,
+			AccessPolicyID: existingAccessPolicy.ID,
+			Region:         instance.RegionSlug,
+		}); err != nil {
+			return cloudmigration.CreateAccessTokenResponse{}, fmt.Errorf("deleting access policy: id=%s region=%s %w", existingAccessPolicy.ID, instance.RegionSlug, err)
+		}
+		logger.Info("deleted access policy", existingAccessPolicy.ID, "name", existingAccessPolicy.Name)
+	}
+
+	timeoutCtx, cancel = context.WithTimeout(ctx, s.cfg.CloudMigration.CreateAccessPolicyTimeout)
+	defer cancel()
+	accessPolicy, err := s.gcomService.CreateAccessPolicy(timeoutCtx,
+		gcom.CreateAccessPolicyParams{
+			RequestID: requestID,
+			Region:    instance.RegionSlug,
+		},
+		gcom.CreateAccessPolicyPayload{
+			Name:        cloudMigrationAccessPolicyName,
+			DisplayName: cloudMigrationAccessPolicyName,
+			Realms:      []gcom.Realm{{Type: "stack", Identifier: s.cfg.StackID, LabelPolicies: []gcom.LabelPolicy{}}},
+			Scopes:      []string{"cloud-migrations:read", "cloud-migrations:write"},
+		})
+	if err != nil {
+		return cloudmigration.CreateAccessTokenResponse{}, fmt.Errorf("creating access policy: %w", err)
+	}
+	logger.Info("created access policy", "id", accessPolicy.ID, "name", accessPolicy.Name)
+
+	timeoutCtx, cancel = context.WithTimeout(ctx, s.cfg.CloudMigration.CreateTokenTimeout)
+	defer cancel()
+	token, err := s.gcomService.CreateToken(timeoutCtx,
+		gcom.CreateTokenParams{RequestID: requestID, Region: instance.RegionSlug},
+		gcom.CreateTokenPayload{
+			AccessPolicyID: accessPolicy.ID,
+			DisplayName:    cloudMigrationTokenName,
+			Name:           cloudMigrationTokenName,
+			ExpiresAt:      time.Now().Add(s.cfg.CloudMigration.TokenExpiresAfter),
+		})
+	if err != nil {
+		return cloudmigration.CreateAccessTokenResponse{}, fmt.Errorf("creating access token: %w", err)
+	}
+	logger.Info("created access token", "id", token.ID, "name", token.Name)
+	s.metrics.accessTokenCreated.With(prometheus.Labels{"slug": s.cfg.Slug}).Inc()
+
+	bytes, err := json.Marshal(cloudmigration.Base64EncodedTokenPayload{
+		Token: token.Token,
+		Instance: cloudmigration.Base64HGInstance{
+			StackID:     instance.ID,
+			RegionSlug:  instance.RegionSlug,
+			ClusterSlug: instance.ClusterSlug, // This should be used for routing to CMS
+			Slug:        instance.Slug,
+		},
+	})
+	if err != nil {
+		return cloudmigration.CreateAccessTokenResponse{}, fmt.Errorf("encoding token: %w", err)
+	}
+
+	return cloudmigration.CreateAccessTokenResponse{Token: base64.StdEncoding.EncodeToString(bytes)}, nil
+}
+
+func (s *Service) findAccessPolicyByName(ctx context.Context, regionSlug, accessPolicyName string) (*gcom.AccessPolicy, error) {
+	ctx, span := s.tracer.Start(ctx, "CloudMigrationService.findAccessPolicyByName")
+	defer span.End()
+
+	accessPolicies, err := s.gcomService.ListAccessPolicies(ctx, gcom.ListAccessPoliciesParams{
+		RequestID: tracing.TraceIDFromContext(ctx, false),
+		Region:    regionSlug,
+		Name:      accessPolicyName,
+	})
+	if err != nil {
+		return nil, fmt.Errorf("listing access policies: name=%s region=%s :%w", accessPolicyName, regionSlug, err)
+	}
+
+	for _, accessPolicy := range accessPolicies {
+		if accessPolicy.Name == accessPolicyName {
+			return &accessPolicy, nil
+		}
+	}
+
+	return nil, nil
+}
+
+func (s *Service) ValidateToken(ctx context.Context, token string) error {
+	// TODO: Implement method
+	return nil
+}
+
+func (s *Service) SaveEncryptedToken(ctx context.Context, token string) error {
+	// TODO: Implement method
+	return nil
+}
+
+func (s *Service) GetMigration(ctx context.Context, id int64) (*cloudmigration.CloudMigrationResponse, error) {
+	// commenting to fix linter, uncomment when this function is implemented
+	// ctx, span := s.tracer.Start(ctx, "CloudMigrationService.GetMigration")
+	// defer span.End()
+
+	return nil, nil
+}
+
+func (s *Service) GetMigrationList(ctx context.Context) (*cloudmigration.CloudMigrationListResponse, error) {
+	values, err := s.store.GetAllCloudMigrations(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	migrations := make([]cloudmigration.CloudMigrationResponse, 0)
+	for _, v := range values {
+		migrations = append(migrations, cloudmigration.CloudMigrationResponse{
+			ID:      v.ID,
+			Stack:   v.Stack,
+			Created: v.Created,
+			Updated: v.Updated,
+		})
+	}
+	return &cloudmigration.CloudMigrationListResponse{Migrations: migrations}, nil
+}
+
+func (s *Service) CreateMigration(ctx context.Context, cmd cloudmigration.CloudMigrationRequest) (*cloudmigration.CloudMigrationResponse, error) {
+	ctx, span := s.tracer.Start(ctx, "CloudMigrationService.createMigration")
+	defer span.End()
+
+	base64Token := cmd.AuthToken
+	b, err := base64.StdEncoding.DecodeString(base64Token)
+	if err != nil {
+		return nil, fmt.Errorf("token could not be decoded")
+	}
+	var token cloudmigration.Base64EncodedTokenPayload
+	if err := json.Unmarshal(b, &token); err != nil {
+		return nil, fmt.Errorf("invalid token") // don't want to leak info here
+	}
+
+	migration := token.ToMigration()
+	if err := s.store.CreateMigration(ctx, migration); err != nil {
+		return nil, fmt.Errorf("error creating migration: %w", err)
+	}
+
+	return &cloudmigration.CloudMigrationResponse{
+		ID:    int64(token.Instance.StackID),
+		Stack: token.Instance.Slug,
+		// TODO replace this with the actual value once the storage piece is implemented
+		Created: time.Now(),
+		Updated: time.Now(),
+	}, nil
+}
+
+func (s *Service) UpdateMigration(ctx context.Context, id int64, cm cloudmigration.CloudMigrationRequest) (*cloudmigration.CloudMigrationResponse, error) {
+	// TODO: Implement method
+	return nil, nil
+}
+
+func (s *Service) RunMigration(ctx context.Context, uid string) (*cloudmigration.CloudMigrationRun, error) {
+	// TODO: Implement method
+	return nil, nil
+}
+
+func (s *Service) GetMigrationStatus(ctx context.Context, id string, runID string) (*cloudmigration.CloudMigrationRun, error) {
+	// TODO: Implement method
+	return nil, nil
+}
+
+func (s *Service) GetMigrationStatusList(ctx context.Context, id string) ([]cloudmigration.CloudMigrationRun, error) {
+	// TODO: Implement method
+	return nil, nil
+}
+
+func (s *Service) DeleteMigration(ctx context.Context, id string) error {
+	// TODO: Implement method
+	return nil
+}
+
+// func (s *Service) MigrateDatasources(ctx context.Context, request *cloudmigration.MigrateDatasourcesRequest) (*cloudmigration.MigrateDatasourcesResponse, error) {
+// 	return s.store.MigrateDatasources(ctx, request)
+// }
diff --git a/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_noop.go b/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_noop.go
new file mode 100644
index 0000000000000..a60383c2c1e8e
--- /dev/null
+++ b/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_noop.go
@@ -0,0 +1,59 @@
+package cloudmigrationimpl
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/services/cloudmigration"
+)
+
+// CloudMigrationsServiceImpl Define the Service Implementation.
+type NoopServiceImpl struct{}
+
+var _ cloudmigration.Service = (*NoopServiceImpl)(nil)
+
+func (s *NoopServiceImpl) MigrateDatasources(ctx context.Context, request *cloudmigration.MigrateDatasourcesRequest) (*cloudmigration.MigrateDatasourcesResponse, error) {
+	return nil, cloudmigration.ErrFeatureDisabledError
+}
+
+func (s *NoopServiceImpl) CreateToken(ctx context.Context) (cloudmigration.CreateAccessTokenResponse, error) {
+	return cloudmigration.CreateAccessTokenResponse{}, cloudmigration.ErrFeatureDisabledError
+}
+func (s *NoopServiceImpl) ValidateToken(ctx context.Context, token string) error {
+	return cloudmigration.ErrFeatureDisabledError
+}
+
+func (s *NoopServiceImpl) SaveEncryptedToken(ctx context.Context, token string) error {
+	return cloudmigration.ErrFeatureDisabledError
+}
+
+func (s *NoopServiceImpl) GetMigration(ctx context.Context, id int64) (*cloudmigration.CloudMigrationResponse, error) {
+	return nil, cloudmigration.ErrFeatureDisabledError
+}
+
+func (s *NoopServiceImpl) GetMigrationList(ctx context.Context) (*cloudmigration.CloudMigrationListResponse, error) {
+	return nil, cloudmigration.ErrFeatureDisabledError
+}
+
+func (s *NoopServiceImpl) CreateMigration(ctx context.Context, cm cloudmigration.CloudMigrationRequest) (*cloudmigration.CloudMigrationResponse, error) {
+	return nil, cloudmigration.ErrFeatureDisabledError
+}
+
+func (s *NoopServiceImpl) UpdateMigration(ctx context.Context, id int64, cm cloudmigration.CloudMigrationRequest) (*cloudmigration.CloudMigrationResponse, error) {
+	return nil, cloudmigration.ErrFeatureDisabledError
+}
+
+func (s *NoopServiceImpl) RunMigration(ctx context.Context, uid string) (*cloudmigration.CloudMigrationRun, error) {
+	return nil, cloudmigration.ErrFeatureDisabledError
+}
+
+func (s *NoopServiceImpl) GetMigrationStatus(ctx context.Context, id string, runID string) (*cloudmigration.CloudMigrationRun, error) {
+	return nil, cloudmigration.ErrFeatureDisabledError
+}
+
+func (s *NoopServiceImpl) GetMigrationStatusList(ctx context.Context, id string) ([]cloudmigration.CloudMigrationRun, error) {
+	return nil, cloudmigration.ErrFeatureDisabledError
+}
+
+func (s *NoopServiceImpl) DeleteMigration(ctx context.Context, id string) error {
+	return cloudmigration.ErrFeatureDisabledError
+}
diff --git a/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_test.go b/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_test.go
new file mode 100644
index 0000000000000..008a9b66add51
--- /dev/null
+++ b/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_test.go
@@ -0,0 +1,15 @@
+package cloudmigrationimpl
+
+import (
+	"context"
+	"testing"
+
+	"github.com/grafana/grafana/pkg/services/cloudmigration"
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_NoopServiceDoesNothing(t *testing.T) {
+	s := &NoopServiceImpl{}
+	_, e := s.MigrateDatasources(context.Background(), &cloudmigration.MigrateDatasourcesRequest{})
+	assert.ErrorIs(t, e, cloudmigration.ErrFeatureDisabledError)
+}
diff --git a/pkg/services/cloudmigration/cloudmigrationimpl/metric.go b/pkg/services/cloudmigration/cloudmigrationimpl/metric.go
new file mode 100644
index 0000000000000..61580b3f53503
--- /dev/null
+++ b/pkg/services/cloudmigration/cloudmigrationimpl/metric.go
@@ -0,0 +1,51 @@
+package cloudmigrationimpl
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+// type Metrics struct {
+const (
+	namespace = "grafana"
+	subsystem = "cloudmigrations"
+)
+
+var PromMetrics = []prometheus.Collector{
+	prometheus.NewCounterVec(prometheus.CounterOpts{
+		Namespace: namespace,
+		Subsystem: subsystem,
+		Name:      "datasources_migrated",
+		Help:      "Total amount of data sources migrated",
+	}, []string{"pdc_converted"}),
+}
+
+type Metrics struct {
+	accessTokenCreated *prometheus.CounterVec
+}
+
+func newMetrics() *Metrics {
+	return &Metrics{
+		accessTokenCreated: prometheus.NewCounterVec(prometheus.CounterOpts{
+			Namespace: namespace,
+			Subsystem: subsystem,
+			Name:      "access_token_created",
+			Help:      "Total of access tokens created",
+		}, []string{"slug"}),
+	}
+}
+
+func (s *Service) registerMetrics(prom prometheus.Registerer, metrics *Metrics) error {
+	if err := prom.Register(metrics.accessTokenCreated); err != nil {
+		var alreadyRegisterErr prometheus.AlreadyRegisteredError
+		if errors.As(err, &alreadyRegisterErr) {
+			s.log.Warn("metric already registered", "metric", metrics.accessTokenCreated)
+		} else {
+			return fmt.Errorf("registering access token created metric: %w", err)
+		}
+	}
+
+	return nil
+}
diff --git a/pkg/services/cloudmigration/cloudmigrationimpl/store.go b/pkg/services/cloudmigration/cloudmigrationimpl/store.go
new file mode 100644
index 0000000000000..ddeae282dd843
--- /dev/null
+++ b/pkg/services/cloudmigration/cloudmigrationimpl/store.go
@@ -0,0 +1,13 @@
+package cloudmigrationimpl
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/services/cloudmigration"
+)
+
+type store interface {
+	MigrateDatasources(context.Context, *cloudmigration.MigrateDatasourcesRequest) (*cloudmigration.MigrateDatasourcesResponse, error)
+	CreateMigration(ctx context.Context, token cloudmigration.CloudMigration) error
+	GetAllCloudMigrations(ctx context.Context) ([]*cloudmigration.CloudMigration, error)
+}
diff --git a/pkg/services/cloudmigration/cloudmigrationimpl/xorm_store.go b/pkg/services/cloudmigration/cloudmigrationimpl/xorm_store.go
new file mode 100644
index 0000000000000..c93fe9156bb52
--- /dev/null
+++ b/pkg/services/cloudmigration/cloudmigrationimpl/xorm_store.go
@@ -0,0 +1,44 @@
+package cloudmigrationimpl
+
+import (
+	"context"
+	"time"
+
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/services/cloudmigration"
+)
+
+type sqlStore struct {
+	db db.DB
+}
+
+func (ss *sqlStore) MigrateDatasources(ctx context.Context, request *cloudmigration.MigrateDatasourcesRequest) (*cloudmigration.MigrateDatasourcesResponse, error) {
+	return nil, cloudmigration.ErrInternalNotImplementedError
+}
+
+func (ss *sqlStore) CreateMigration(ctx context.Context, migration cloudmigration.CloudMigration) error {
+	err := ss.db.WithDbSession(ctx, func(sess *sqlstore.DBSession) error {
+		migration.Created = time.Now()
+		migration.Updated = time.Now()
+		_, err := sess.Insert(migration)
+		if err != nil {
+			return err
+		}
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (ss *sqlStore) GetAllCloudMigrations(ctx context.Context) ([]*cloudmigration.CloudMigration, error) {
+	var migrations = make([]*cloudmigration.CloudMigration, 0)
+	err := ss.db.WithDbSession(ctx, func(sess *db.Session) error { return sess.Find(&migrations) })
+	if err != nil {
+		return nil, err
+	}
+	return migrations, nil
+}
diff --git a/pkg/services/cloudmigration/cloudmigrationimpl/xorm_store_test.go b/pkg/services/cloudmigration/cloudmigrationimpl/xorm_store_test.go
new file mode 100644
index 0000000000000..03f57a7844885
--- /dev/null
+++ b/pkg/services/cloudmigration/cloudmigrationimpl/xorm_store_test.go
@@ -0,0 +1,56 @@
+package cloudmigrationimpl
+
+import (
+	"context"
+	"strconv"
+	"testing"
+
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
+func TestMigrateDatasources(t *testing.T) {
+	// TODO: Write this test
+}
+
+func TestGetAllCloudMigrations(t *testing.T) {
+	testDB := db.InitTestDB(t)
+	s := &sqlStore{db: testDB}
+	ctx := context.Background()
+
+	t.Run("get all cloud_migrations", func(t *testing.T) {
+		// replace this with proper method when created
+		_, err := testDB.GetSqlxSession().Exec(ctx, `
+			INSERT INTO cloud_migration (id, auth_token, stack, stack_id, region_slug, cluster_slug, created, updated)
+			VALUES (1, '12345', '11111', 11111, 'test', 'test', '2024-03-25 15:30:36.000', '2024-03-27 15:30:43.000'),
+ 				(2, '6789', '22222', 22222, 'test', 'test', '2024-03-25 15:30:36.000', '2024-03-27 15:30:43.000'),
+ 				(3, '777', '33333', 33333, 'test', 'test', '2024-03-25 15:30:36.000', '2024-03-27 15:30:43.000');
+		`)
+		require.NoError(t, err)
+
+		value, err := s.GetAllCloudMigrations(ctx)
+		require.NoError(t, err)
+		require.Equal(t, 3, len(value))
+		for _, m := range value {
+			switch m.ID {
+			case 1:
+				assert.Equal(t, "11111", m.Stack)
+				assert.Equal(t, "12345", m.AuthToken)
+			case 2:
+				assert.Equal(t, "22222", m.Stack)
+				assert.Equal(t, "6789", m.AuthToken)
+			case 3:
+				assert.Equal(t, "33333", m.Stack)
+				assert.Equal(t, "777", m.AuthToken)
+			default:
+				require.Fail(t, "ID value not expected: "+strconv.FormatInt(m.ID, 10))
+			}
+		}
+	})
+}
diff --git a/pkg/services/cloudmigration/cloudmigrationtest/fake.go b/pkg/services/cloudmigration/cloudmigrationtest/fake.go
new file mode 100644
index 0000000000000..7f410d3a27dc0
--- /dev/null
+++ b/pkg/services/cloudmigration/cloudmigrationtest/fake.go
@@ -0,0 +1,15 @@
+package cloudmigrationtest
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/services/cloudmigration"
+)
+
+type Service struct {
+	ExpectedError error
+}
+
+func (s *Service) MigrateDatasources(ctx context.Context, request *cloudmigration.MigrateDatasourcesRequest) (*cloudmigration.MigrateDatasourcesResponse, error) {
+	return nil, cloudmigration.ErrInternalNotImplementedError
+}
diff --git a/pkg/services/cloudmigration/model.go b/pkg/services/cloudmigration/model.go
new file mode 100644
index 0000000000000..e5723b2b45c5a
--- /dev/null
+++ b/pkg/services/cloudmigration/model.go
@@ -0,0 +1,114 @@
+package cloudmigration
+
+import (
+	"time"
+
+	"github.com/grafana/grafana/pkg/util/errutil"
+)
+
+var (
+	ErrInternalNotImplementedError = errutil.Internal("cloudmigrations.notImplemented", errutil.WithPublicMessage("Internal server error"))
+	ErrFeatureDisabledError        = errutil.Internal("cloudmigrations.disabled", errutil.WithPublicMessage("Cloud migrations are disabled on this instance"))
+)
+
+type CloudMigration struct {
+	ID          int64     `json:"id" xorm:"pk autoincr 'id'"`
+	AuthToken   string    `json:"authToken"`
+	Stack       string    `json:"stack"`
+	StackID     int       `json:"stackID" xorm:"stack_id"`
+	RegionSlug  string    `json:"regionSlug"`
+	ClusterSlug string    `json:"clusterSlug"`
+	Created     time.Time `json:"created"`
+	Updated     time.Time `json:"updated"`
+}
+
+type MigratedResourceResult struct {
+	Status  string `json:"status"`
+	Message string `json:"message"`
+}
+
+type MigrationResult struct {
+	Status  string `json:"status"`
+	Message string `json:"message"`
+}
+
+type MigratedResource struct {
+	Type   string                 `json:"type"`
+	ID     string                 `json:"id"`
+	RefID  string                 `json:"refID"`
+	Name   string                 `json:"name"`
+	Result MigratedResourceResult `json:"result"`
+}
+
+type CloudMigrationRun struct {
+	ID                int64              `json:"id" xorm:"pk autoincr 'id'"`
+	CloudMigrationUID string             `json:"uid" xorm:"cloud_migration_uid"`
+	Resources         []MigratedResource `json:"items"`
+	Result            MigrationResult    `json:"result"`
+	Created           time.Time          `json:"created"`
+	Updated           time.Time          `json:"updated"`
+	Finished          time.Time          `json:"finished"`
+}
+
+type CloudMigrationRequest struct {
+	AuthToken string `json:"authToken"`
+}
+
+type CloudMigrationResponse struct {
+	ID      int64     `json:"id"`
+	Stack   string    `json:"stack"`
+	Created time.Time `json:"created"`
+	Updated time.Time `json:"updated"`
+}
+
+type CloudMigrationListResponse struct {
+	Migrations []CloudMigrationResponse `json:"migrations"`
+}
+
+type MigrateDatasourcesRequest struct {
+	MigrateToPDC       bool
+	MigrateCredentials bool
+}
+
+type MigrateDatasourcesResponse struct {
+	DatasourcesMigrated int
+}
+
+type MigrateDatasourcesRequestDTO struct {
+	MigrateToPDC       bool `json:"migrateToPDC"`
+	MigrateCredentials bool `json:"migrateCredentials"`
+}
+
+type MigrateDatasourcesResponseDTO struct {
+	DatasourcesMigrated int `json:"datasourcesMigrated"`
+}
+
+type CreateAccessTokenResponse struct {
+	Token string
+}
+
+type CreateAccessTokenResponseDTO struct {
+	Token string `json:"token"`
+}
+
+type Base64EncodedTokenPayload struct {
+	Token    string
+	Instance Base64HGInstance
+}
+
+func (p Base64EncodedTokenPayload) ToMigration() CloudMigration {
+	return CloudMigration{
+		AuthToken:   p.Token,
+		Stack:       p.Instance.Slug,
+		StackID:     p.Instance.StackID,
+		RegionSlug:  p.Instance.RegionSlug,
+		ClusterSlug: p.Instance.ClusterSlug,
+	}
+}
+
+type Base64HGInstance struct {
+	StackID     int
+	Slug        string
+	RegionSlug  string
+	ClusterSlug string
+}
diff --git a/pkg/services/contexthandler/contexthandler.go b/pkg/services/contexthandler/contexthandler.go
index ab49137b0e729..2437f38aa8b99 100644
--- a/pkg/services/contexthandler/contexthandler.go
+++ b/pkg/services/contexthandler/contexthandler.go
@@ -3,13 +3,16 @@ package contexthandler
 
 import (
 	"context"
-	"errors"
+	"fmt"
 	"net/http"
 
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/trace"
+
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
-	"github.com/grafana/grafana/pkg/services/auth"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/authn"
 	"github.com/grafana/grafana/pkg/services/contexthandler/ctxkey"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
@@ -18,11 +21,9 @@ import (
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/web"
-	"go.opentelemetry.io/otel/attribute"
-	"go.opentelemetry.io/otel/trace"
 )
 
-func ProvideService(cfg *setting.Cfg, tracer tracing.Tracer, features *featuremgmt.FeatureManager, authnService authn.Service,
+func ProvideService(cfg *setting.Cfg, tracer tracing.Tracer, features featuremgmt.FeatureToggles, authnService authn.Service,
 ) *ContextHandler {
 	return &ContextHandler{
 		Cfg:          cfg,
@@ -36,7 +37,7 @@ func ProvideService(cfg *setting.Cfg, tracer tracing.Tracer, features *featuremg
 type ContextHandler struct {
 	Cfg          *setting.Cfg
 	tracer       tracing.Tracer
-	features     *featuremgmt.FeatureManager
+	features     featuremgmt.FeatureToggles
 	authnService authn.Service
 }
 
@@ -112,11 +113,6 @@ func (h *ContextHandler) Middleware(next http.Handler) http.Handler {
 
 		identity, err := h.authnService.Authenticate(reqContext.Req.Context(), &authn.Request{HTTPRequest: reqContext.Req, Resp: reqContext.Resp})
 		if err != nil {
-			if errors.Is(err, auth.ErrInvalidSessionToken) || errors.Is(err, authn.ErrExpiredAccessToken) {
-				// Burn the cookie in case of invalid, expired or missing token
-				reqContext.Resp.Before(h.deleteInvalidCookieEndOfRequestFunc(reqContext))
-			}
-
 			// Hack: set all errors on LookupTokenErr, so we can check it in auth middlewares
 			reqContext.LookupTokenErr = err
 		} else {
@@ -124,7 +120,7 @@ func (h *ContextHandler) Middleware(next http.Handler) http.Handler {
 			reqContext.UserToken = identity.SessionToken
 			reqContext.IsSignedIn = !reqContext.SignedInUser.IsAnonymous
 			reqContext.AllowAnonymous = reqContext.SignedInUser.IsAnonymous
-			reqContext.IsRenderCall = identity.AuthenticatedBy == login.RenderModule
+			reqContext.IsRenderCall = identity.IsAuthenticatedBy(login.RenderModule)
 		}
 
 		reqContext.Logger = reqContext.Logger.New("userId", reqContext.UserID, "orgId", reqContext.OrgID, "uname", reqContext.Login)
@@ -134,23 +130,36 @@ func (h *ContextHandler) Middleware(next http.Handler) http.Handler {
 			attribute.Int64("userId", reqContext.UserID),
 		))
 
+		if h.Cfg.IDResponseHeaderEnabled && reqContext.SignedInUser != nil {
+			reqContext.Resp.Before(h.addIDHeaderEndOfRequestFunc(reqContext.SignedInUser))
+		}
+
 		next.ServeHTTP(w, r)
 	})
 }
 
-func (h *ContextHandler) deleteInvalidCookieEndOfRequestFunc(reqContext *contextmodel.ReqContext) web.BeforeFunc {
+func (h *ContextHandler) addIDHeaderEndOfRequestFunc(ident identity.Requester) web.BeforeFunc {
 	return func(w web.ResponseWriter) {
-		if h.features.IsEnabled(featuremgmt.FlagClientTokenRotation) {
+		if w.Written() {
 			return
 		}
 
-		if w.Written() {
-			reqContext.Logger.Debug("Response written, skipping invalid cookie delete")
+		namespace, id := ident.GetNamespacedID()
+		if !identity.IsNamespace(
+			namespace,
+			identity.NamespaceUser,
+			identity.NamespaceServiceAccount,
+			identity.NamespaceAPIKey,
+		) || id == "0" {
 			return
 		}
 
-		reqContext.Logger.Debug("Expiring invalid cookie")
-		authn.DeleteSessionCookie(reqContext.Resp, h.Cfg)
+		if _, ok := h.Cfg.IDResponseHeaderNamespaces[namespace]; !ok {
+			return
+		}
+
+		headerName := fmt.Sprintf("%s-Identity-Id", h.Cfg.IDResponseHeaderPrefix)
+		w.Header().Add(headerName, fmt.Sprintf("%s:%s", namespace, id))
 	}
 }
 
@@ -177,15 +186,18 @@ func WithAuthHTTPHeaders(ctx context.Context, cfg *setting.Cfg) context.Context
 	// used by basic auth, api keys and potentially jwt auth
 	list.Items = append(list.Items, "Authorization")
 
+	// remove X-Grafana-Device-Id as it is only used for auth in authn clients.
+	list.Items = append(list.Items, "X-Grafana-Device-Id")
+
 	// if jwt is enabled we add it to the list. We can ignore in case it is set to Authorization
-	if cfg.JWTAuthEnabled && cfg.JWTAuthHeaderName != "" && cfg.JWTAuthHeaderName != "Authorization" {
-		list.Items = append(list.Items, cfg.JWTAuthHeaderName)
+	if cfg.JWTAuth.Enabled && cfg.JWTAuth.HeaderName != "" && cfg.JWTAuth.HeaderName != "Authorization" {
+		list.Items = append(list.Items, cfg.JWTAuth.HeaderName)
 	}
 
 	// if auth proxy is enabled add the main proxy header and all configured headers
-	if cfg.AuthProxyEnabled {
-		list.Items = append(list.Items, cfg.AuthProxyHeaderName)
-		for _, header := range cfg.AuthProxyHeaders {
+	if cfg.AuthProxy.Enabled {
+		list.Items = append(list.Items, cfg.AuthProxy.HeaderName)
+		for _, header := range cfg.AuthProxy.Headers {
 			if header != "" {
 				list.Items = append(list.Items, header)
 			}
diff --git a/pkg/services/contexthandler/contexthandler_test.go b/pkg/services/contexthandler/contexthandler_test.go
index ca9a003231cc7..f7c46f7208c47 100644
--- a/pkg/services/contexthandler/contexthandler_test.go
+++ b/pkg/services/contexthandler/contexthandler_test.go
@@ -2,6 +2,7 @@ package contexthandler_test
 
 import (
 	"errors"
+	"net/http"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -9,7 +10,6 @@ import (
 
 	"github.com/grafana/grafana/pkg/api/routing"
 	"github.com/grafana/grafana/pkg/infra/tracing"
-	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/authn"
 	"github.com/grafana/grafana/pkg/services/authn/authntest"
 	"github.com/grafana/grafana/pkg/services/contexthandler"
@@ -38,8 +38,9 @@ func TestContextHandler(t *testing.T) {
 			require.Error(t, c.LookupTokenErr)
 		})
 
-		_, err := server.Send(server.NewGetRequest("/api/handler"))
+		res, err := server.Send(server.NewGetRequest("/api/handler"))
 		require.NoError(t, err)
+		require.NoError(t, res.Body.Close())
 	})
 
 	t.Run("should set identity on successful authentication", func(t *testing.T) {
@@ -59,8 +60,9 @@ func TestContextHandler(t *testing.T) {
 			require.NoError(t, c.LookupTokenErr)
 		})
 
-		_, err := server.Send(server.NewGetRequest("/api/handler"))
+		res, err := server.Send(server.NewGetRequest("/api/handler"))
 		require.NoError(t, err)
+		require.NoError(t, res.Body.Close())
 	})
 
 	t.Run("should not set IsSignedIn on anonymous identity", func(t *testing.T) {
@@ -80,8 +82,9 @@ func TestContextHandler(t *testing.T) {
 			require.NoError(t, c.LookupTokenErr)
 		})
 
-		_, err := server.Send(server.NewGetRequest("/api/handler"))
+		res, err := server.Send(server.NewGetRequest("/api/handler"))
 		require.NoError(t, err)
+		require.NoError(t, res.Body.Close())
 	})
 
 	t.Run("should set IsRenderCall when authenticated by render client", func(t *testing.T) {
@@ -102,57 +105,18 @@ func TestContextHandler(t *testing.T) {
 			require.NoError(t, c.LookupTokenErr)
 		})
 
-		_, err := server.Send(server.NewGetRequest("/api/handler"))
-		require.NoError(t, err)
-	})
-
-	t.Run("should delete session cookie on invalid session", func(t *testing.T) {
-		handler := contexthandler.ProvideService(
-			setting.NewCfg(),
-			tracing.InitializeTracerForTest(),
-			featuremgmt.WithFeatures(),
-			&authntest.FakeService{ExpectedErr: auth.ErrInvalidSessionToken},
-		)
-
-		server := webtest.NewServer(t, routing.NewRouteRegister())
-		server.Mux.Use(handler.Middleware)
-		server.Mux.Get("/api/handler", func(c *contextmodel.ReqContext) {})
-
-		res, err := server.Send(server.NewGetRequest("/api/handler"))
-		require.NoError(t, err)
-		cookies := res.Cookies()
-		require.Len(t, cookies, 1)
-		require.Equal(t, cookies[0].String(), "grafana_session_expiry=; Path=/; Max-Age=0")
-		require.NoError(t, res.Body.Close())
-	})
-
-	t.Run("should delete session cookie when oauth token refresh failed", func(t *testing.T) {
-		handler := contexthandler.ProvideService(
-			setting.NewCfg(),
-			tracing.InitializeTracerForTest(),
-			featuremgmt.WithFeatures(),
-			&authntest.FakeService{ExpectedErr: authn.ErrExpiredAccessToken.Errorf("")},
-		)
-
-		server := webtest.NewServer(t, routing.NewRouteRegister())
-		server.Mux.Use(handler.Middleware)
-		server.Mux.Get("/api/handler", func(c *contextmodel.ReqContext) {})
-
 		res, err := server.Send(server.NewGetRequest("/api/handler"))
 		require.NoError(t, err)
-		cookies := res.Cookies()
-		require.Len(t, cookies, 1)
-		require.Equal(t, cookies[0].String(), "grafana_session_expiry=; Path=/; Max-Age=0")
 		require.NoError(t, res.Body.Close())
 	})
 
 	t.Run("should store auth header in context", func(t *testing.T) {
 		cfg := setting.NewCfg()
-		cfg.JWTAuthEnabled = true
-		cfg.JWTAuthHeaderName = "jwt-header"
-		cfg.AuthProxyEnabled = true
-		cfg.AuthProxyHeaderName = "proxy-header"
-		cfg.AuthProxyHeaders = map[string]string{
+		cfg.JWTAuth.Enabled = true
+		cfg.JWTAuth.HeaderName = "jwt-header"
+		cfg.AuthProxy.Enabled = true
+		cfg.AuthProxy.HeaderName = "proxy-header"
+		cfg.AuthProxy.Headers = map[string]string{
 			"name": "proxy-header-name",
 		}
 
@@ -175,7 +139,72 @@ func TestContextHandler(t *testing.T) {
 			assert.Contains(t, list.Items, "Authorization")
 		})
 
-		_, err := server.Send(server.NewGetRequest("/api/handler"))
+		res, err := server.Send(server.NewGetRequest("/api/handler"))
 		require.NoError(t, err)
+		require.NoError(t, res.Body.Close())
+	})
+
+	t.Run("id response headers", func(t *testing.T) {
+		run := func(cfg *setting.Cfg, id string) *http.Response {
+			handler := contexthandler.ProvideService(
+				cfg,
+				tracing.InitializeTracerForTest(),
+				featuremgmt.WithFeatures(),
+				&authntest.FakeService{ExpectedIdentity: &authn.Identity{ID: id}},
+			)
+
+			server := webtest.NewServer(t, routing.NewRouteRegister())
+			server.Mux.Use(handler.Middleware)
+			server.Mux.Get("/api/handler", func(c *contextmodel.ReqContext) {})
+
+			res, err := server.Send(server.NewGetRequest("/api/handler"))
+			require.NoError(t, err)
+
+			return res
+		}
+
+		t.Run("should add id header for user", func(t *testing.T) {
+			cfg := setting.NewCfg()
+			cfg.IDResponseHeaderEnabled = true
+			cfg.IDResponseHeaderPrefix = "X-Grafana"
+			cfg.IDResponseHeaderNamespaces = map[string]struct{}{"user": {}}
+			res := run(cfg, "user:1")
+
+			require.Equal(t, "user:1", res.Header.Get("X-Grafana-Identity-Id"))
+			require.NoError(t, res.Body.Close())
+		})
+
+		t.Run("should not add id header for user when id is 0", func(t *testing.T) {
+			cfg := setting.NewCfg()
+			cfg.IDResponseHeaderEnabled = true
+			cfg.IDResponseHeaderPrefix = "X-Grafana"
+			cfg.IDResponseHeaderNamespaces = map[string]struct{}{"user": {}}
+			res := run(cfg, "user:0")
+
+			require.Empty(t, res.Header.Get("X-Grafana-Identity-Id"))
+			require.NoError(t, res.Body.Close())
+		})
+
+		t.Run("should add id header for service account", func(t *testing.T) {
+			cfg := setting.NewCfg()
+			cfg.IDResponseHeaderEnabled = true
+			cfg.IDResponseHeaderPrefix = "X-Grafana"
+			cfg.IDResponseHeaderNamespaces = map[string]struct{}{"service-account": {}}
+			res := run(cfg, "service-account:1")
+
+			require.Equal(t, "service-account:1", res.Header.Get("X-Grafana-Identity-Id"))
+			require.NoError(t, res.Body.Close())
+		})
+
+		t.Run("should not add id header for service account when not configured", func(t *testing.T) {
+			cfg := setting.NewCfg()
+			cfg.IDResponseHeaderEnabled = true
+			cfg.IDResponseHeaderPrefix = "X-Grafana"
+			cfg.IDResponseHeaderNamespaces = map[string]struct{}{"user": {}}
+			res := run(cfg, "service-account:1")
+
+			require.Empty(t, res.Header.Get("X-Grafana-Identity-Id"))
+			require.NoError(t, res.Body.Close())
+		})
 	})
 }
diff --git a/pkg/services/contexthandler/model/model.go b/pkg/services/contexthandler/model/model.go
index 679b68afeee84..e7b9ebc8c78e2 100644
--- a/pkg/services/contexthandler/model/model.go
+++ b/pkg/services/contexthandler/model/model.go
@@ -43,14 +43,12 @@ func (ctx *ReqContext) Handle(cfg *setting.Cfg, status int, title string, err er
 		Title     string
 		AppTitle  string
 		AppSubUrl string
-		Theme     string
+		ThemeType string
 		ErrorMsg  error
 	}{title, "Grafana", cfg.AppSubURL, "dark", nil}
+
 	if err != nil {
 		ctx.Logger.Error(title, "error", err)
-		if setting.Env != setting.Prod {
-			data.ErrorMsg = err
-		}
 	}
 
 	ctx.HTML(status, cfg.ErrTemplateName, data)
@@ -75,10 +73,6 @@ func (ctx *ReqContext) JsonApiErr(status int, message string, err error) {
 		} else {
 			ctx.Logger.Warn(message, "error", err, "traceID", traceID)
 		}
-
-		if setting.Env != setting.Prod {
-			resp["error"] = err.Error()
-		}
 	}
 
 	switch status {
diff --git a/pkg/services/dashboardimport/api/api.go b/pkg/services/dashboardimport/api/api.go
index 819aa30ab030e..8134b190de96e 100644
--- a/pkg/services/dashboardimport/api/api.go
+++ b/pkg/services/dashboardimport/api/api.go
@@ -1,6 +1,7 @@
 package api
 
 import (
+	"errors"
 	"net/http"
 
 	"github.com/grafana/grafana/pkg/api/apierrors"
@@ -10,6 +11,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/dashboardimport"
+	"github.com/grafana/grafana/pkg/services/dashboardimport/utils"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 	"github.com/grafana/grafana/pkg/services/quota"
@@ -71,12 +73,15 @@ func (api *ImportDashboardAPI) ImportDashboard(c *contextmodel.ReqContext) respo
 	}
 
 	if limitReached {
-		return response.Error(403, "Quota reached", nil)
+		return response.Error(http.StatusForbidden, "Quota reached", nil)
 	}
 
 	req.User = c.SignedInUser
 	resp, err := api.dashboardImportService.ImportDashboard(c.Req.Context(), &req)
 	if err != nil {
+		if errors.Is(err, utils.ErrDashboardInputMissing) {
+			return response.Error(http.StatusBadRequest, err.Error(), err)
+		}
 		return apierrors.ToDashboardErrorResponse(c.Req.Context(), api.pluginStore, err)
 	}
 
diff --git a/pkg/services/dashboardimport/dashboardimport.go b/pkg/services/dashboardimport/dashboardimport.go
index be8b414b5a004..32ccfd9f3ff39 100644
--- a/pkg/services/dashboardimport/dashboardimport.go
+++ b/pkg/services/dashboardimport/dashboardimport.go
@@ -22,22 +22,24 @@ type ImportDashboardRequest struct {
 	Overwrite bool                   `json:"overwrite"`
 	Dashboard *simplejson.Json       `json:"dashboard"`
 	Inputs    []ImportDashboardInput `json:"inputs"`
-	FolderId  int64                  `json:"folderId"`
-	FolderUid string                 `json:"folderUid"`
+	// Deprecated: use FolderUID instead
+	FolderId  int64  `json:"folderId"`
+	FolderUid string `json:"folderUid"`
 
 	User identity.Requester `json:"-"`
 }
 
 // ImportDashboardResponse response object returned when importing a dashboard.
 type ImportDashboardResponse struct {
-	UID              string `json:"uid"`
-	PluginId         string `json:"pluginId"`
-	Title            string `json:"title"`
-	Imported         bool   `json:"imported"`
-	ImportedUri      string `json:"importedUri"`
-	ImportedUrl      string `json:"importedUrl"`
-	Slug             string `json:"slug"`
-	DashboardId      int64  `json:"dashboardId"`
+	UID         string `json:"uid"`
+	PluginId    string `json:"pluginId"`
+	Title       string `json:"title"`
+	Imported    bool   `json:"imported"`
+	ImportedUri string `json:"importedUri"`
+	ImportedUrl string `json:"importedUrl"`
+	Slug        string `json:"slug"`
+	DashboardId int64  `json:"dashboardId"`
+	// Deprecated: use FolderUID instead
 	FolderId         int64  `json:"folderId"`
 	FolderUID        string `json:"folderUid"`
 	ImportedRevision int64  `json:"importedRevision,omitempty"` // Only used for plugin imports
diff --git a/pkg/services/dashboardimport/service/service.go b/pkg/services/dashboardimport/service/service.go
index 63dd1b1e53ae7..00cd032496c16 100644
--- a/pkg/services/dashboardimport/service/service.go
+++ b/pkg/services/dashboardimport/service/service.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/api/routing"
 	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/dashboardimport"
@@ -83,6 +84,7 @@ func (s *ImportDashboardService) ImportDashboard(ctx context.Context, req *dashb
 	generatedDash.Del("__inputs")
 	generatedDash.Del("__requires")
 
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.DashboardImport).Inc()
 	// here we need to get FolderId from FolderUID if it present in the request, if both exist, FolderUID would overwrite FolderID
 	if req.FolderUid != "" {
 		folder, err := s.folderService.Get(ctx, &folder.GetFolderQuery{
@@ -93,10 +95,11 @@ func (s *ImportDashboardService) ImportDashboard(ctx context.Context, req *dashb
 		if err != nil {
 			return nil, err
 		}
+		// nolint:staticcheck
 		req.FolderId = folder.ID
 	} else {
 		folder, err := s.folderService.Get(ctx, &folder.GetFolderQuery{
-			ID:           &req.FolderId,
+			ID:           &req.FolderId, // nolint:staticcheck
 			OrgID:        req.User.GetOrgID(),
 			SignedInUser: req.User,
 		})
@@ -120,7 +123,7 @@ func (s *ImportDashboardService) ImportDashboard(ctx context.Context, req *dashb
 		UserID:    userID,
 		Overwrite: req.Overwrite,
 		PluginID:  req.PluginId,
-		FolderID:  req.FolderId,
+		FolderID:  req.FolderId, // nolint:staticcheck
 		FolderUID: req.FolderUid,
 	}
 
@@ -136,7 +139,9 @@ func (s *ImportDashboardService) ImportDashboard(ctx context.Context, req *dashb
 		return nil, err
 	}
 
-	err = s.libraryPanelService.ImportLibraryPanelsForDashboard(ctx, req.User, libraryElements, generatedDash.Get("panels").MustArray(), req.FolderId)
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.DashboardImport).Inc()
+	// nolint:staticcheck
+	err = s.libraryPanelService.ImportLibraryPanelsForDashboard(ctx, req.User, libraryElements, generatedDash.Get("panels").MustArray(), req.FolderId, req.FolderUid)
 	if err != nil {
 		return nil, err
 	}
@@ -147,13 +152,14 @@ func (s *ImportDashboardService) ImportDashboard(ctx context.Context, req *dashb
 	}
 
 	revision := savedDashboard.Data.Get("revision").MustInt64(0)
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.DashboardImport).Inc()
 	return &dashboardimport.ImportDashboardResponse{
 		UID:              savedDashboard.UID,
 		PluginId:         req.PluginId,
 		Title:            savedDashboard.Title,
 		Path:             req.Path,
-		Revision:         revision, // only used for plugin version tracking
-		FolderId:         savedDashboard.FolderID,
+		Revision:         revision,                // only used for plugin version tracking
+		FolderId:         savedDashboard.FolderID, // nolint:staticcheck
 		FolderUID:        req.FolderUid,
 		ImportedUri:      "db/" + savedDashboard.Slug,
 		ImportedUrl:      savedDashboard.GetURL(),
diff --git a/pkg/services/dashboardimport/service/service_test.go b/pkg/services/dashboardimport/service/service_test.go
index bc3da63dea297..e8958f22c9c55 100644
--- a/pkg/services/dashboardimport/service/service_test.go
+++ b/pkg/services/dashboardimport/service/service_test.go
@@ -31,15 +31,15 @@ func TestImportDashboardService(t *testing.T) {
 			importDashboardFunc: func(ctx context.Context, dto *dashboards.SaveDashboardDTO) (*dashboards.Dashboard, error) {
 				importDashboardArg = dto
 				return &dashboards.Dashboard{
-					ID:       4,
-					UID:      dto.Dashboard.UID,
-					Slug:     dto.Dashboard.Slug,
-					OrgID:    3,
-					Version:  dto.Dashboard.Version,
-					PluginID: "prometheus",
-					FolderID: dto.Dashboard.FolderID,
-					Title:    dto.Dashboard.Title,
-					Data:     dto.Dashboard.Data,
+					ID:        4,
+					UID:       dto.Dashboard.UID,
+					Slug:      dto.Dashboard.Slug,
+					OrgID:     3,
+					Version:   dto.Dashboard.Version,
+					PluginID:  "prometheus",
+					FolderUID: dto.Dashboard.FolderUID,
+					Title:     dto.Dashboard.Title,
+					Data:      dto.Dashboard.Data,
 				}, nil
 			},
 		}
@@ -47,7 +47,7 @@ func TestImportDashboardService(t *testing.T) {
 		importLibraryPanelsForDashboard := false
 		connectLibraryPanelsForDashboardCalled := false
 		libraryPanelService := &libraryPanelServiceMock{
-			importLibraryPanelsForDashboardFunc: func(ctx context.Context, signedInUser identity.Requester, libraryPanels *simplejson.Json, panels []any, folderID int64) error {
+			importLibraryPanelsForDashboardFunc: func(ctx context.Context, signedInUser identity.Requester, libraryPanels *simplejson.Json, panels []any, folderID int64, folderUID string) error {
 				importLibraryPanelsForDashboard = true
 				return nil
 			},
@@ -58,7 +58,6 @@ func TestImportDashboardService(t *testing.T) {
 		}
 		folderService := &foldertest.FakeService{
 			ExpectedFolder: &folder.Folder{
-				ID:  5,
 				UID: "123",
 			},
 		}
@@ -76,8 +75,8 @@ func TestImportDashboardService(t *testing.T) {
 			Inputs: []dashboardimport.ImportDashboardInput{
 				{Name: "*", Type: "datasource", Value: "prom"},
 			},
-			User:     &user.SignedInUser{UserID: 2, OrgRole: org.RoleAdmin, OrgID: 3},
-			FolderId: 5,
+			User:      &user.SignedInUser{UserID: 2, OrgRole: org.RoleAdmin, OrgID: 3},
+			FolderUid: "folderUID",
 		}
 		resp, err := s.ImportDashboard(context.Background(), req)
 		require.NoError(t, err)
@@ -91,7 +90,7 @@ func TestImportDashboardService(t *testing.T) {
 		require.Equal(t, int64(3), importDashboardArg.OrgID)
 		require.Equal(t, int64(2), userID)
 		require.Equal(t, "prometheus", importDashboardArg.Dashboard.PluginID)
-		require.Equal(t, int64(5), importDashboardArg.Dashboard.FolderID)
+		require.Equal(t, "folderUID", importDashboardArg.Dashboard.FolderUID)
 
 		panel := importDashboardArg.Dashboard.Data.Get("panels").GetIndex(0)
 		require.Equal(t, "prom", panel.Get("datasource").MustString())
@@ -106,22 +105,21 @@ func TestImportDashboardService(t *testing.T) {
 			importDashboardFunc: func(ctx context.Context, dto *dashboards.SaveDashboardDTO) (*dashboards.Dashboard, error) {
 				importDashboardArg = dto
 				return &dashboards.Dashboard{
-					ID:       4,
-					UID:      dto.Dashboard.UID,
-					Slug:     dto.Dashboard.Slug,
-					OrgID:    3,
-					Version:  dto.Dashboard.Version,
-					PluginID: "prometheus",
-					FolderID: dto.Dashboard.FolderID,
-					Title:    dto.Dashboard.Title,
-					Data:     dto.Dashboard.Data,
+					ID:        4,
+					UID:       dto.Dashboard.UID,
+					Slug:      dto.Dashboard.Slug,
+					OrgID:     3,
+					Version:   dto.Dashboard.Version,
+					PluginID:  "prometheus",
+					FolderUID: dto.Dashboard.FolderUID,
+					Title:     dto.Dashboard.Title,
+					Data:      dto.Dashboard.Data,
 				}, nil
 			},
 		}
 		libraryPanelService := &libraryPanelServiceMock{}
 		folderService := &foldertest.FakeService{
 			ExpectedFolder: &folder.Folder{
-				ID:  5,
 				UID: "123",
 			},
 		}
@@ -143,8 +141,8 @@ func TestImportDashboardService(t *testing.T) {
 			Inputs: []dashboardimport.ImportDashboardInput{
 				{Name: "*", Type: "datasource", Value: "prom"},
 			},
-			User:     &user.SignedInUser{UserID: 2, OrgRole: org.RoleAdmin, OrgID: 3},
-			FolderId: 5,
+			User:      &user.SignedInUser{UserID: 2, OrgRole: org.RoleAdmin, OrgID: 3},
+			FolderUid: "folderUID",
 		}
 		resp, err := s.ImportDashboard(context.Background(), req)
 		require.NoError(t, err)
@@ -158,7 +156,7 @@ func TestImportDashboardService(t *testing.T) {
 		require.Equal(t, int64(3), importDashboardArg.OrgID)
 		require.Equal(t, int64(2), userID)
 		require.Equal(t, "", importDashboardArg.Dashboard.PluginID)
-		require.Equal(t, int64(5), importDashboardArg.Dashboard.FolderID)
+		require.Equal(t, "folderUID", importDashboardArg.Dashboard.FolderUID)
 
 		panel := importDashboardArg.Dashboard.Data.Get("panels").GetIndex(0)
 		require.Equal(t, "prom", panel.Get("datasource").MustString())
@@ -212,7 +210,7 @@ func (s *dashboardServiceMock) ImportDashboard(ctx context.Context, dto *dashboa
 type libraryPanelServiceMock struct {
 	librarypanels.Service
 	connectLibraryPanelsForDashboardFunc func(c context.Context, signedInUser identity.Requester, dash *dashboards.Dashboard) error
-	importLibraryPanelsForDashboardFunc  func(c context.Context, signedInUser identity.Requester, libraryPanels *simplejson.Json, panels []any, folderID int64) error
+	importLibraryPanelsForDashboardFunc  func(c context.Context, signedInUser identity.Requester, libraryPanels *simplejson.Json, panels []any, folderID int64, folderUID string) error
 }
 
 var _ librarypanels.Service = (*libraryPanelServiceMock)(nil)
@@ -225,9 +223,9 @@ func (s *libraryPanelServiceMock) ConnectLibraryPanelsForDashboard(ctx context.C
 	return nil
 }
 
-func (s *libraryPanelServiceMock) ImportLibraryPanelsForDashboard(ctx context.Context, signedInUser identity.Requester, libraryPanels *simplejson.Json, panels []any, folderID int64) error {
+func (s *libraryPanelServiceMock) ImportLibraryPanelsForDashboard(ctx context.Context, signedInUser identity.Requester, libraryPanels *simplejson.Json, panels []any, folderID int64, folderUID string) error {
 	if s.importLibraryPanelsForDashboardFunc != nil {
-		return s.importLibraryPanelsForDashboardFunc(ctx, signedInUser, libraryPanels, panels, folderID)
+		return s.importLibraryPanelsForDashboardFunc(ctx, signedInUser, libraryPanels, panels, folderID, folderUID)
 	}
 
 	return nil
diff --git a/pkg/services/dashboardimport/utils/dash_template_evaluator.go b/pkg/services/dashboardimport/utils/dash_template_evaluator.go
index c21b1ce62f008..29c8f76ad6523 100644
--- a/pkg/services/dashboardimport/utils/dash_template_evaluator.go
+++ b/pkg/services/dashboardimport/utils/dash_template_evaluator.go
@@ -2,6 +2,7 @@ package utils
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"regexp"
 
@@ -11,14 +12,7 @@ import (
 )
 
 var varRegex = regexp.MustCompile(`(\$\{.+?\})`)
-
-type DashboardInputMissingError struct {
-	VariableName string
-}
-
-func (e DashboardInputMissingError) Error() string {
-	return fmt.Sprintf("Dashboard input variable: %v missing from import command", e.VariableName)
-}
+var ErrDashboardInputMissing = errors.New("missing dashboard input variable")
 
 type DashTemplateEvaluator struct {
 	template  *simplejson.Json
@@ -63,7 +57,7 @@ func (e *DashTemplateEvaluator) Eval() (*simplejson.Json, error) {
 		}
 
 		if input == nil {
-			return nil, &DashboardInputMissingError{VariableName: inputName}
+			return nil, fmt.Errorf("dashboard import failed: %w %s", ErrDashboardInputMissing, inputName)
 		}
 
 		e.variables["${"+inputName+"}"] = input.Value
diff --git a/pkg/services/dashboards/accesscontrol.go b/pkg/services/dashboards/accesscontrol.go
index 3b798fddb4da8..e8ec7661b35a8 100644
--- a/pkg/services/dashboards/accesscontrol.go
+++ b/pkg/services/dashboards/accesscontrol.go
@@ -2,8 +2,10 @@ package dashboards
 
 import (
 	"context"
+	"errors"
 	"strings"
 
+	"github.com/grafana/grafana/pkg/infra/metrics"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/folder"
 )
@@ -49,7 +51,9 @@ func NewFolderNameScopeResolver(folderDB folder.FolderStore, folderSvc folder.Se
 		if len(nsName) == 0 {
 			return nil, ac.ErrInvalidScope
 		}
-		folder, err := folderDB.GetFolderByTitle(ctx, orgID, nsName)
+		// this will fetch only root folders
+		// this is legacy code so most probably it is not used
+		folder, err := folderDB.GetFolderByTitle(ctx, orgID, nsName, nil)
 		if err != nil {
 			return nil, err
 		}
@@ -166,10 +170,14 @@ func NewDashboardUIDScopeResolver(folderDB folder.FolderStore, ds DashboardServi
 
 func resolveDashboardScope(ctx context.Context, folderDB folder.FolderStore, orgID int64, dashboard *Dashboard, folderSvc folder.Service) ([]string, error) {
 	var folderUID string
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Dashboard).Inc()
+	// nolint:staticcheck
 	if dashboard.FolderID < 0 {
 		return []string{ScopeDashboardsProvider.GetResourceScopeUID(dashboard.UID)}, nil
 	}
 
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Dashboard).Inc()
+	// nolint:staticcheck
 	if dashboard.FolderID == 0 {
 		folderUID = ac.GeneralFolderUID
 	} else {
@@ -205,6 +213,9 @@ func GetInheritedScopes(ctx context.Context, orgID int64, folderUID string, fold
 	})
 
 	if err != nil {
+		if errors.Is(err, folder.ErrFolderNotFound) {
+			return nil, err
+		}
 		return nil, ac.ErrInternal.Errorf("could not retrieve folder parents: %w", err)
 	}
 
diff --git a/pkg/services/dashboards/accesscontrol_test.go b/pkg/services/dashboards/accesscontrol_test.go
index 267778d0cbd46..57e1d8e80e0aa 100644
--- a/pkg/services/dashboards/accesscontrol_test.go
+++ b/pkg/services/dashboards/accesscontrol_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"math/rand"
-	"strconv"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
@@ -26,9 +25,9 @@ func TestNewFolderNameScopeResolver(t *testing.T) {
 	t.Run("resolver should convert to uid scope", func(t *testing.T) {
 		orgId := rand.Int63()
 		title := "Very complex :title with: and /" + util.GenerateShortUID()
-		db := &folder.Folder{Title: title, ID: rand.Int63(), UID: util.GenerateShortUID()}
+		db := &folder.Folder{Title: title, UID: util.GenerateShortUID()}
 		folderStore := foldertest.NewFakeFolderStore(t)
-		folderStore.On("GetFolderByTitle", mock.Anything, mock.Anything, mock.Anything).Return(db, nil).Once()
+		folderStore.On("GetFolderByTitle", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(db, nil).Once()
 
 		scope := "folders:name:" + title
 
@@ -37,16 +36,16 @@ func TestNewFolderNameScopeResolver(t *testing.T) {
 		require.NoError(t, err)
 		require.Len(t, resolvedScopes, 1)
 		require.Equal(t, fmt.Sprintf("folders:uid:%v", db.UID), resolvedScopes[0])
-		folderStore.AssertCalled(t, "GetFolderByTitle", mock.Anything, orgId, title)
+		folderStore.AssertCalled(t, "GetFolderByTitle", mock.Anything, orgId, title, mock.Anything)
 	})
 	t.Run("resolver should include inherited scopes if any", func(t *testing.T) {
 		orgId := rand.Int63()
 		title := "Very complex :title with: and /" + util.GenerateShortUID()
 
-		db := &folder.Folder{Title: title, ID: rand.Int63(), UID: util.GenerateShortUID()}
+		db := &folder.Folder{Title: title, UID: util.GenerateShortUID()}
 
 		folderStore := foldertest.NewFakeFolderStore(t)
-		folderStore.On("GetFolderByTitle", mock.Anything, mock.Anything, mock.Anything).Return(db, nil).Once()
+		folderStore.On("GetFolderByTitle", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(db, nil).Once()
 
 		scope := "folders:name:" + title
 
@@ -73,7 +72,7 @@ func TestNewFolderNameScopeResolver(t *testing.T) {
 			t.Errorf("Result mismatch (-want +got):\n%s", diff)
 		}
 
-		folderStore.AssertCalled(t, "GetFolderByTitle", mock.Anything, orgId, title)
+		folderStore.AssertCalled(t, "GetFolderByTitle", mock.Anything, orgId, title, mock.Anything)
 	})
 	t.Run("resolver should fail if input scope is not expected", func(t *testing.T) {
 		_, resolver := NewFolderNameScopeResolver(foldertest.NewFakeFolderStore(t), foldertest.NewFakeService())
@@ -92,7 +91,7 @@ func TestNewFolderNameScopeResolver(t *testing.T) {
 		_, resolver := NewFolderNameScopeResolver(folderStore, foldertest.NewFakeService())
 
 		orgId := rand.Int63()
-		folderStore.On("GetFolderByTitle", mock.Anything, mock.Anything, mock.Anything).Return(nil, ErrDashboardNotFound).Once()
+		folderStore.On("GetFolderByTitle", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, ErrDashboardNotFound).Once()
 
 		scope := "folders:name:" + util.GenerateShortUID()
 
@@ -108,57 +107,6 @@ func TestNewFolderIDScopeResolver(t *testing.T) {
 		require.Equal(t, "folders:id:", prefix)
 	})
 
-	t.Run("resolver should convert to uid scope", func(t *testing.T) {
-		folderStore := foldertest.NewFakeFolderStore(t)
-		_, resolver := NewFolderIDScopeResolver(folderStore, foldertest.NewFakeService())
-
-		orgId := rand.Int63()
-		uid := util.GenerateShortUID()
-		db := &folder.Folder{ID: rand.Int63(), UID: uid}
-		folderStore.On("GetFolderByID", mock.Anything, mock.Anything, mock.Anything).Return(db, nil).Once()
-
-		scope := "folders:id:" + strconv.FormatInt(db.ID, 10)
-		resolvedScopes, err := resolver.Resolve(context.Background(), orgId, scope)
-		require.NoError(t, err)
-		require.Len(t, resolvedScopes, 1)
-		require.Equal(t, fmt.Sprintf("folders:uid:%v", db.UID), resolvedScopes[0])
-
-		folderStore.AssertCalled(t, "GetFolderByID", mock.Anything, orgId, db.ID)
-	})
-	t.Run("resolver should should include inherited scopes if any", func(t *testing.T) {
-		folderStore := foldertest.NewFakeFolderStore(t)
-		folderSvc := foldertest.NewFakeService()
-		folderSvc.ExpectedFolders = []*folder.Folder{
-			{
-				UID: "parent",
-			},
-			{
-				UID: "grandparent",
-			},
-		}
-		_, resolver := NewFolderIDScopeResolver(folderStore, folderSvc)
-
-		orgId := rand.Int63()
-		uid := util.GenerateShortUID()
-		db := &folder.Folder{ID: rand.Int63(), UID: uid}
-		folderStore.On("GetFolderByID", mock.Anything, mock.Anything, mock.Anything).Return(db, nil).Once()
-
-		scope := "folders:id:" + strconv.FormatInt(db.ID, 10)
-
-		resolvedScopes, err := resolver.Resolve(context.Background(), orgId, scope)
-		require.NoError(t, err)
-		require.Len(t, resolvedScopes, 3)
-
-		if diff := cmp.Diff([]string{
-			fmt.Sprintf("folders:uid:%v", db.UID),
-			"folders:uid:parent",
-			"folders:uid:grandparent",
-		}, resolvedScopes); diff != "" {
-			t.Errorf("Result mismatch (-want +got):\n%s", diff)
-		}
-
-		folderStore.AssertCalled(t, "GetFolderByID", mock.Anything, orgId, db.ID)
-	})
 	t.Run("resolver should fail if input scope is not expected", func(t *testing.T) {
 		_, resolver := NewFolderIDScopeResolver(foldertest.NewFakeFolderStore(t), foldertest.NewFakeService())
 
@@ -205,80 +153,11 @@ func TestNewDashboardIDScopeResolver(t *testing.T) {
 		require.Equal(t, "dashboards:id:", prefix)
 	})
 
-	t.Run("resolver should convert to uid dashboard and folder scope", func(t *testing.T) {
-		folderStore := foldertest.NewFakeFolderStore(t)
-		dashSvc := &FakeDashboardService{}
-		_, resolver := NewDashboardIDScopeResolver(folderStore, dashSvc, foldertest.NewFakeService())
-
-		orgID := rand.Int63()
-		folder := &folder.Folder{ID: 2, UID: "2"}
-		dashboard := &Dashboard{ID: 1, FolderID: folder.ID, UID: "1"}
-		dashSvc.On("G")
-		folderStore.On("GetFolderByID", mock.Anything, orgID, folder.ID).Return(folder, nil).Once()
-		dashSvc.On("GetDashboard", mock.Anything, mock.Anything).Return(dashboard, nil).Once()
-		scope := ac.Scope("dashboards", "id", strconv.FormatInt(dashboard.ID, 10))
-		resolvedScopes, err := resolver.Resolve(context.Background(), orgID, scope)
-		require.NoError(t, err)
-		require.Len(t, resolvedScopes, 2)
-		require.Equal(t, fmt.Sprintf("dashboards:uid:%s", dashboard.UID), resolvedScopes[0])
-		require.Equal(t, fmt.Sprintf("folders:uid:%s", folder.UID), resolvedScopes[1])
-	})
-
-	t.Run("resolver should inlude inherited scopes if any", func(t *testing.T) {
-		dashSvc := &FakeDashboardService{}
-		folderStore := foldertest.NewFakeFolderStore(t)
-		folderSvc := foldertest.NewFakeService()
-		folderSvc.ExpectedFolders = []*folder.Folder{
-			{
-				UID: "parent",
-			},
-			{
-				UID: "grandparent",
-			},
-		}
-		_, resolver := NewDashboardIDScopeResolver(folderStore, dashSvc, folderSvc)
-
-		orgID := rand.Int63()
-		folder := &folder.Folder{ID: 2, UID: "2"}
-		dashboard := &Dashboard{ID: 1, FolderID: folder.ID, UID: "1"}
-
-		dashSvc.On("GetDashboard", mock.Anything, mock.Anything).Return(dashboard, nil).Once()
-		folderStore.On("GetFolderByID", mock.Anything, orgID, folder.ID).Return(folder, nil).Once()
-
-		scope := ac.Scope("dashboards", "id", strconv.FormatInt(dashboard.ID, 10))
-		resolvedScopes, err := resolver.Resolve(context.Background(), orgID, scope)
-		require.NoError(t, err)
-		require.Len(t, resolvedScopes, 4)
-
-		if diff := cmp.Diff([]string{
-			fmt.Sprintf("dashboards:uid:%s", dashboard.UID),
-			fmt.Sprintf("folders:uid:%s", folder.UID),
-			"folders:uid:parent",
-			"folders:uid:grandparent",
-		}, resolvedScopes); diff != "" {
-			t.Errorf("Result mismatch (-want +got):\n%s", diff)
-		}
-	})
-
 	t.Run("resolver should fail if input scope is not expected", func(t *testing.T) {
 		_, resolver := NewDashboardIDScopeResolver(foldertest.NewFakeFolderStore(t), &FakeDashboardService{}, foldertest.NewFakeService())
 		_, err := resolver.Resolve(context.Background(), rand.Int63(), "dashboards:uid:123")
 		require.ErrorIs(t, err, ac.ErrInvalidScope)
 	})
-
-	t.Run("resolver should convert folderID 0 to general uid scope for the folder scope", func(t *testing.T) {
-		dashSvc := &FakeDashboardService{}
-		_, resolver := NewDashboardIDScopeResolver(foldertest.NewFakeFolderStore(t), dashSvc, foldertest.NewFakeService())
-
-		dashboard := &Dashboard{ID: 1, FolderID: 0, UID: "1"}
-		dashSvc.On("GetDashboard", mock.Anything, mock.Anything).Return(dashboard, nil)
-		resolved, err := resolver.Resolve(context.Background(), 1, ac.Scope("dashboards", "id", "1"))
-		require.NoError(t, err)
-
-		require.Len(t, resolved, 2)
-		require.Equal(t, "dashboards:uid:1", resolved[0])
-		require.Equal(t, "folders:uid:general", resolved[1])
-	})
 }
 
 func TestNewDashboardUIDScopeResolver(t *testing.T) {
@@ -287,77 +166,9 @@ func TestNewDashboardUIDScopeResolver(t *testing.T) {
 		require.Equal(t, "dashboards:uid:", prefix)
 	})
 
-	t.Run("resolver should convert to uid dashboard and folder scope", func(t *testing.T) {
-		folderStore := foldertest.NewFakeFolderStore(t)
-		dashSvc := &FakeDashboardService{}
-		_, resolver := NewDashboardUIDScopeResolver(folderStore, dashSvc, foldertest.NewFakeService())
-
-		orgID := rand.Int63()
-		folder := &folder.Folder{ID: 2, UID: "2"}
-		dashboard := &Dashboard{ID: 1, FolderID: folder.ID, UID: "1"}
-
-		dashSvc.On("GetDashboard", mock.Anything, mock.Anything).Return(dashboard, nil).Once()
-		folderStore.On("GetFolderByID", mock.Anything, orgID, folder.ID).Return(folder, nil).Once()
-		scope := ac.Scope("dashboards", "uid", dashboard.UID)
-		resolvedScopes, err := resolver.Resolve(context.Background(), orgID, scope)
-		require.NoError(t, err)
-		require.Len(t, resolvedScopes, 2)
-		require.Equal(t, fmt.Sprintf("dashboards:uid:%s", dashboard.UID), resolvedScopes[0])
-		require.Equal(t, fmt.Sprintf("folders:uid:%s", folder.UID), resolvedScopes[1])
-	})
-
-	t.Run("resolver should include inherited scopes if any", func(t *testing.T) {
-		folderStore := foldertest.NewFakeFolderStore(t)
-		folderSvc := foldertest.NewFakeService()
-		folderSvc.ExpectedFolders = []*folder.Folder{
-			{
-				UID: "parent",
-			},
-			{
-				UID: "grandparent",
-			},
-		}
-		dashSvc := &FakeDashboardService{}
-		_, resolver := NewDashboardUIDScopeResolver(folderStore, dashSvc, folderSvc)
-
-		orgID := rand.Int63()
-		folder := &folder.Folder{ID: 2, UID: "2"}
-		dashboard := &Dashboard{ID: 1, FolderID: folder.ID, UID: "1"}
-		dashSvc.On("GetDashboard", mock.Anything, mock.Anything).Return(dashboard, nil).Once()
-		folderStore.On("GetFolderByID", mock.Anything, mock.Anything, mock.Anything).Return(folder, nil).Once()
-
-		scope := ac.Scope("dashboards", "uid", dashboard.UID)
-		resolvedScopes, err := resolver.Resolve(context.Background(), orgID, scope)
-		require.NoError(t, err)
-		require.Len(t, resolvedScopes, 4)
-
-		if diff := cmp.Diff([]string{
-			fmt.Sprintf("dashboards:uid:%s", dashboard.UID),
-			fmt.Sprintf("folders:uid:%s", folder.UID),
-			"folders:uid:parent",
-			"folders:uid:grandparent",
-		}, resolvedScopes); diff != "" {
-			t.Errorf("Result mismatch (-want +got):\n%s", diff)
-		}
-	})
-
 	t.Run("resolver should fail if input scope is not expected", func(t *testing.T) {
 		_, resolver := NewDashboardUIDScopeResolver(foldertest.NewFakeFolderStore(t), &FakeDashboardService{}, foldertest.NewFakeService())
 		_, err := resolver.Resolve(context.Background(), rand.Int63(), "dashboards:id:123")
 		require.ErrorIs(t, err, ac.ErrInvalidScope)
 	})
-
-	t.Run("resolver should convert folderID 0 to general uid scope for the folder scope", func(t *testing.T) {
-		service := &FakeDashboardService{}
-		_, resolver := NewDashboardUIDScopeResolver(foldertest.NewFakeFolderStore(t), service, foldertest.NewFakeService())
-
-		dashboard := &Dashboard{ID: 1, FolderID: 0, UID: "1"}
-		service.On("GetDashboard", mock.Anything, mock.Anything).Return(dashboard, nil)
-		resolved, err := resolver.Resolve(context.Background(), 1, ac.Scope("dashboards", "uid", "1"))
-		require.NoError(t, err)
-
-		require.Len(t, resolved, 2)
-		require.Equal(t, "dashboards:uid:1", resolved[0])
-		require.Equal(t, "folders:uid:general", resolved[1])
-	})
 }
diff --git a/pkg/services/dashboards/dashboard.go b/pkg/services/dashboards/dashboard.go
index dd2a8268de7c2..9958fbfe3bd40 100644
--- a/pkg/services/dashboards/dashboard.go
+++ b/pkg/services/dashboards/dashboard.go
@@ -3,8 +3,8 @@ package dashboards
 import (
 	"context"
 
-	alertmodels "github.com/grafana/grafana/pkg/services/alerting/models"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/quota"
 	"github.com/grafana/grafana/pkg/services/search/model"
 )
@@ -13,20 +13,21 @@ import (
 //
 //go:generate mockery --name DashboardService --structname FakeDashboardService --inpackage --filename dashboard_service_mock.go
 type DashboardService interface {
-	BuildSaveDashboardCommand(ctx context.Context, dto *SaveDashboardDTO, shouldValidateAlerts bool, validateProvisionedDashboard bool) (*SaveDashboardCommand, error)
+	BuildSaveDashboardCommand(ctx context.Context, dto *SaveDashboardDTO, validateProvisionedDashboard bool) (*SaveDashboardCommand, error)
 	DeleteDashboard(ctx context.Context, dashboardId int64, orgId int64) error
 	FindDashboards(ctx context.Context, query *FindPersistedDashboardsQuery) ([]DashboardSearchProjection, error)
+	// GetDashboard fetches a dashboard.
+	// To fetch a dashboard under root by title should set the folder UID to point to an empty string
+	// eg. util.Pointer("")
 	GetDashboard(ctx context.Context, query *GetDashboardQuery) (*Dashboard, error)
-	GetDashboardACLInfoList(ctx context.Context, query *GetDashboardACLInfoListQuery) ([]*DashboardACLInfoDTO, error)
 	GetDashboards(ctx context.Context, query *GetDashboardsQuery) ([]*Dashboard, error)
 	GetDashboardTags(ctx context.Context, query *GetDashboardTagsQuery) ([]*DashboardTagCloudItem, error)
 	GetDashboardUIDByID(ctx context.Context, query *GetDashboardRefByIDQuery) (*DashboardRef, error)
 	ImportDashboard(ctx context.Context, dto *SaveDashboardDTO) (*Dashboard, error)
 	SaveDashboard(ctx context.Context, dto *SaveDashboardDTO, allowUiUpdate bool) (*Dashboard, error)
 	SearchDashboards(ctx context.Context, query *FindPersistedDashboardsQuery) (model.HitList, error)
-	UpdateDashboardACL(ctx context.Context, uid int64, items []*DashboardACL) error
-	DeleteACLByUser(ctx context.Context, userID int64) error
-	CountInFolder(ctx context.Context, orgID int64, folderUID string, user identity.Requester) (int64, error)
+	CountInFolders(ctx context.Context, orgID int64, folderUIDs []string, user identity.Requester) (int64, error)
+	GetDashboardsSharedWithUser(ctx context.Context, user identity.Requester) ([]*Dashboard, error)
 }
 
 // PluginService is a service for operating on plugin dashboards.
@@ -43,7 +44,7 @@ type DashboardProvisioningService interface {
 	GetProvisionedDashboardData(ctx context.Context, name string) ([]*DashboardProvisioning, error)
 	GetProvisionedDashboardDataByDashboardID(ctx context.Context, dashboardID int64) (*DashboardProvisioning, error)
 	GetProvisionedDashboardDataByDashboardUID(ctx context.Context, orgID int64, dashboardUID string) (*DashboardProvisioning, error)
-	SaveFolderForProvisionedDashboards(context.Context, *SaveDashboardDTO) (*Dashboard, error)
+	SaveFolderForProvisionedDashboards(context.Context, *folder.CreateFolderCommand) (*folder.Folder, error)
 	SaveProvisionedDashboard(ctx context.Context, dto *SaveDashboardDTO, provisioning *DashboardProvisioning) (*Dashboard, error)
 	UnprovisionDashboard(ctx context.Context, dashboardID int64) error
 }
@@ -56,7 +57,6 @@ type Store interface {
 	DeleteOrphanedProvisionedDashboards(ctx context.Context, cmd *DeleteOrphanedProvisionedDashboardsCommand) error
 	FindDashboards(ctx context.Context, query *FindPersistedDashboardsQuery) ([]DashboardSearchProjection, error)
 	GetDashboard(ctx context.Context, query *GetDashboardQuery) (*Dashboard, error)
-	GetDashboardACLInfoList(ctx context.Context, query *GetDashboardACLInfoListQuery) ([]*DashboardACLInfoDTO, error)
 	GetDashboardUIDByID(ctx context.Context, query *GetDashboardRefByIDQuery) (*DashboardRef, error)
 	GetDashboards(ctx context.Context, query *GetDashboardsQuery) ([]*Dashboard, error)
 	// GetDashboardsByPluginID retrieves dashboards identified by plugin.
@@ -65,19 +65,15 @@ type Store interface {
 	GetProvisionedDashboardData(ctx context.Context, name string) ([]*DashboardProvisioning, error)
 	GetProvisionedDataByDashboardID(ctx context.Context, dashboardID int64) (*DashboardProvisioning, error)
 	GetProvisionedDataByDashboardUID(ctx context.Context, orgID int64, dashboardUID string) (*DashboardProvisioning, error)
-	// SaveAlerts saves dashboard alerts.
-	SaveAlerts(ctx context.Context, dashID int64, alerts []*alertmodels.Alert) error
 	SaveDashboard(ctx context.Context, cmd SaveDashboardCommand) (*Dashboard, error)
 	SaveProvisionedDashboard(ctx context.Context, cmd SaveDashboardCommand, provisioning *DashboardProvisioning) (*Dashboard, error)
 	UnprovisionDashboard(ctx context.Context, id int64) error
-	UpdateDashboardACL(ctx context.Context, uid int64, items []*DashboardACL) error
 	// ValidateDashboardBeforeSave validates a dashboard before save.
 	ValidateDashboardBeforeSave(ctx context.Context, dashboard *Dashboard, overwrite bool) (bool, error)
-	DeleteACLByUser(context.Context, int64) error
 
 	Count(context.Context, *quota.ScopeParameters) (*quota.Map, error)
 	// CountDashboardsInFolder returns the number of dashboards associated with
 	// the given parent folder ID.
-	CountDashboardsInFolder(ctx context.Context, request *CountDashboardsInFolderRequest) (int64, error)
-	DeleteDashboardsInFolder(ctx context.Context, request *DeleteDashboardsInFolderRequest) error
+	CountDashboardsInFolders(ctx context.Context, request *CountDashboardsInFolderRequest) (int64, error)
+	DeleteDashboardsInFolders(ctx context.Context, request *DeleteDashboardsInFolderRequest) error
 }
diff --git a/pkg/services/dashboards/dashboard_acl.go b/pkg/services/dashboards/dashboard_acl.go
deleted file mode 100644
index 2068e7d583255..0000000000000
--- a/pkg/services/dashboards/dashboard_acl.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package dashboards
-
-import (
-	"errors"
-)
-
-type PermissionType int
-
-const (
-	PERMISSION_VIEW PermissionType = 1 << iota
-	PERMISSION_EDIT
-	PERMISSION_ADMIN
-)
-
-func (p PermissionType) String() string {
-	names := map[int]string{
-		int(PERMISSION_VIEW):  "View",
-		int(PERMISSION_EDIT):  "Edit",
-		int(PERMISSION_ADMIN): "Admin",
-	}
-	return names[int(p)]
-}
-
-// Typed errors
-var (
-	ErrDashboardACLInfoMissing              = errors.New("user id and team id cannot both be empty for a dashboard permission")
-	ErrDashboardPermissionDashboardEmpty    = errors.New("dashboard id must be greater than zero for a dashboard permission")
-	ErrFolderACLInfoMissing                 = errors.New("user id and team id cannot both be empty for a folder permission")
-	ErrFolderPermissionFolderEmpty          = errors.New("folder id must be greater than zero for a folder permission")
-	ErrPermissionsWithRoleNotAllowed        = errors.New("permissions cannot have both a user and team")
-	ErrPermissionsWithUserAndTeamNotAllowed = errors.New("team and user permissions cannot have an associated role")
-)
diff --git a/pkg/services/dashboards/dashboard_acl_test.go b/pkg/services/dashboards/dashboard_acl_test.go
deleted file mode 100644
index 97ba21dd58acf..0000000000000
--- a/pkg/services/dashboards/dashboard_acl_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package dashboards
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestPermissionType_String(t *testing.T) {
-	testCases := []struct {
-		permissionType PermissionType
-		expected       string
-	}{
-		{PERMISSION_ADMIN, "Admin"},
-		{PERMISSION_EDIT, "Edit"},
-		{PERMISSION_VIEW, "View"},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.expected, func(t *testing.T) {
-			assert.Equal(t, tc.expected, fmt.Sprint(tc.permissionType))
-			assert.Equal(t, tc.expected, tc.permissionType.String())
-		})
-	}
-}
diff --git a/pkg/services/dashboards/dashboard_provisioning_mock.go b/pkg/services/dashboards/dashboard_provisioning_mock.go
index 7b6a111992499..a743752fcd57e 100644
--- a/pkg/services/dashboards/dashboard_provisioning_mock.go
+++ b/pkg/services/dashboards/dashboard_provisioning_mock.go
@@ -1,10 +1,11 @@
-// Code generated by mockery v2.28.0. DO NOT EDIT.
+// Code generated by mockery v2.32.0. DO NOT EDIT.
 
 package dashboards
 
 import (
 	context "context"
 
+	folder "github.com/grafana/grafana/pkg/services/folder"
 	mock "github.com/stretchr/testify/mock"
 )
 
@@ -120,23 +121,23 @@ func (_m *FakeDashboardProvisioning) GetProvisionedDashboardDataByDashboardUID(c
 }
 
 // SaveFolderForProvisionedDashboards provides a mock function with given fields: _a0, _a1
-func (_m *FakeDashboardProvisioning) SaveFolderForProvisionedDashboards(_a0 context.Context, _a1 *SaveDashboardDTO) (*Dashboard, error) {
+func (_m *FakeDashboardProvisioning) SaveFolderForProvisionedDashboards(_a0 context.Context, _a1 *folder.CreateFolderCommand) (*folder.Folder, error) {
 	ret := _m.Called(_a0, _a1)
 
-	var r0 *Dashboard
+	var r0 *folder.Folder
 	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, *SaveDashboardDTO) (*Dashboard, error)); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *folder.CreateFolderCommand) (*folder.Folder, error)); ok {
 		return rf(_a0, _a1)
 	}
-	if rf, ok := ret.Get(0).(func(context.Context, *SaveDashboardDTO) *Dashboard); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *folder.CreateFolderCommand) *folder.Folder); ok {
 		r0 = rf(_a0, _a1)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*Dashboard)
+			r0 = ret.Get(0).(*folder.Folder)
 		}
 	}
 
-	if rf, ok := ret.Get(1).(func(context.Context, *SaveDashboardDTO) error); ok {
+	if rf, ok := ret.Get(1).(func(context.Context, *folder.CreateFolderCommand) error); ok {
 		r1 = rf(_a0, _a1)
 	} else {
 		r1 = ret.Error(1)
@@ -185,13 +186,12 @@ func (_m *FakeDashboardProvisioning) UnprovisionDashboard(ctx context.Context, d
 	return r0
 }
 
-type mockConstructorTestingTNewFakeDashboardProvisioning interface {
+// NewFakeDashboardProvisioning creates a new instance of FakeDashboardProvisioning. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewFakeDashboardProvisioning(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewFakeDashboardProvisioning creates a new instance of FakeDashboardProvisioning. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewFakeDashboardProvisioning(t mockConstructorTestingTNewFakeDashboardProvisioning) *FakeDashboardProvisioning {
+}) *FakeDashboardProvisioning {
 	mock := &FakeDashboardProvisioning{}
 	mock.Mock.Test(t)
 
diff --git a/pkg/services/dashboards/dashboard_service_mock.go b/pkg/services/dashboards/dashboard_service_mock.go
index e4c47eb8c5e03..f8be5a2e900a8 100644
--- a/pkg/services/dashboards/dashboard_service_mock.go
+++ b/pkg/services/dashboards/dashboard_service_mock.go
@@ -1,11 +1,13 @@
+// Code generated by mockery v2.34.2. DO NOT EDIT.
+
 package dashboards
 
 import (
 	context "context"
 
+	identity "github.com/grafana/grafana/pkg/services/auth/identity"
 	mock "github.com/stretchr/testify/mock"
 
-	"github.com/grafana/grafana/pkg/services/auth/identity"
 	model "github.com/grafana/grafana/pkg/services/search/model"
 )
 
@@ -14,25 +16,25 @@ type FakeDashboardService struct {
 	mock.Mock
 }
 
-// BuildSaveDashboardCommand provides a mock function with given fields: ctx, dto, shouldValidateAlerts, validateProvisionedDashboard
-func (_m *FakeDashboardService) BuildSaveDashboardCommand(ctx context.Context, dto *SaveDashboardDTO, shouldValidateAlerts bool, validateProvisionedDashboard bool) (*SaveDashboardCommand, error) {
-	ret := _m.Called(ctx, dto, shouldValidateAlerts, validateProvisionedDashboard)
+// BuildSaveDashboardCommand provides a mock function with given fields: ctx, dto, validateProvisionedDashboard
+func (_m *FakeDashboardService) BuildSaveDashboardCommand(ctx context.Context, dto *SaveDashboardDTO, validateProvisionedDashboard bool) (*SaveDashboardCommand, error) {
+	ret := _m.Called(ctx, dto, validateProvisionedDashboard)
 
 	var r0 *SaveDashboardCommand
 	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, *SaveDashboardDTO, bool, bool) (*SaveDashboardCommand, error)); ok {
-		return rf(ctx, dto, shouldValidateAlerts, validateProvisionedDashboard)
+	if rf, ok := ret.Get(0).(func(context.Context, *SaveDashboardDTO, bool) (*SaveDashboardCommand, error)); ok {
+		return rf(ctx, dto, validateProvisionedDashboard)
 	}
-	if rf, ok := ret.Get(0).(func(context.Context, *SaveDashboardDTO, bool, bool) *SaveDashboardCommand); ok {
-		r0 = rf(ctx, dto, shouldValidateAlerts, validateProvisionedDashboard)
+	if rf, ok := ret.Get(0).(func(context.Context, *SaveDashboardDTO, bool) *SaveDashboardCommand); ok {
+		r0 = rf(ctx, dto, validateProvisionedDashboard)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).(*SaveDashboardCommand)
 		}
 	}
 
-	if rf, ok := ret.Get(1).(func(context.Context, *SaveDashboardDTO, bool, bool) error); ok {
-		r1 = rf(ctx, dto, shouldValidateAlerts, validateProvisionedDashboard)
+	if rf, ok := ret.Get(1).(func(context.Context, *SaveDashboardDTO, bool) error); ok {
+		r1 = rf(ctx, dto, validateProvisionedDashboard)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -40,23 +42,23 @@ func (_m *FakeDashboardService) BuildSaveDashboardCommand(ctx context.Context, d
 	return r0, r1
 }
 
-// CountInFolder provides a mock function with given fields: ctx, orgID, folderUID, _a3
-func (_m *FakeDashboardService) CountInFolder(ctx context.Context, orgID int64, folderUID string, _a3 identity.Requester) (int64, error) {
-	ret := _m.Called(ctx, orgID, folderUID, _a3)
+// CountInFolders provides a mock function with given fields: ctx, orgID, folderUIDs, user
+func (_m *FakeDashboardService) CountInFolders(ctx context.Context, orgID int64, folderUIDs []string, user identity.Requester) (int64, error) {
+	ret := _m.Called(ctx, orgID, folderUIDs, user)
 
 	var r0 int64
 	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, int64, string, identity.Requester) (int64, error)); ok {
-		return rf(ctx, orgID, folderUID, _a3)
+	if rf, ok := ret.Get(0).(func(context.Context, int64, []string, identity.Requester) (int64, error)); ok {
+		return rf(ctx, orgID, folderUIDs, user)
 	}
-	if rf, ok := ret.Get(0).(func(context.Context, int64, string, identity.Requester) int64); ok {
-		r0 = rf(ctx, orgID, folderUID, _a3)
+	if rf, ok := ret.Get(0).(func(context.Context, int64, []string, identity.Requester) int64); ok {
+		r0 = rf(ctx, orgID, folderUIDs, user)
 	} else {
 		r0 = ret.Get(0).(int64)
 	}
 
-	if rf, ok := ret.Get(1).(func(context.Context, int64, string, identity.Requester) error); ok {
-		r1 = rf(ctx, orgID, folderUID, _a3)
+	if rf, ok := ret.Get(1).(func(context.Context, int64, []string, identity.Requester) error); ok {
+		r1 = rf(ctx, orgID, folderUIDs, user)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -64,20 +66,6 @@ func (_m *FakeDashboardService) CountInFolder(ctx context.Context, orgID int64,
 	return r0, r1
 }
 
-// DeleteACLByUser provides a mock function with given fields: ctx, userID
-func (_m *FakeDashboardService) DeleteACLByUser(ctx context.Context, userID int64) error {
-	ret := _m.Called(ctx, userID)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context, int64) error); ok {
-		r0 = rf(ctx, userID)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
 // DeleteDashboard provides a mock function with given fields: ctx, dashboardId, orgId
 func (_m *FakeDashboardService) DeleteDashboard(ctx context.Context, dashboardId int64, orgId int64) error {
 	ret := _m.Called(ctx, dashboardId, orgId)
@@ -144,32 +132,6 @@ func (_m *FakeDashboardService) GetDashboard(ctx context.Context, query *GetDash
 	return r0, r1
 }
 
-// GetDashboardACLInfoList provides a mock function with given fields: ctx, query
-func (_m *FakeDashboardService) GetDashboardACLInfoList(ctx context.Context, query *GetDashboardACLInfoListQuery) ([]*DashboardACLInfoDTO, error) {
-	ret := _m.Called(ctx, query)
-
-	var r0 []*DashboardACLInfoDTO
-	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardACLInfoListQuery) ([]*DashboardACLInfoDTO, error)); ok {
-		return rf(ctx, query)
-	}
-	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardACLInfoListQuery) []*DashboardACLInfoDTO); ok {
-		r0 = rf(ctx, query)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]*DashboardACLInfoDTO)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(context.Context, *GetDashboardACLInfoListQuery) error); ok {
-		r1 = rf(ctx, query)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
 // GetDashboardTags provides a mock function with given fields: ctx, query
 func (_m *FakeDashboardService) GetDashboardTags(ctx context.Context, query *GetDashboardTagsQuery) ([]*DashboardTagCloudItem, error) {
 	ret := _m.Called(ctx, query)
@@ -248,6 +210,32 @@ func (_m *FakeDashboardService) GetDashboards(ctx context.Context, query *GetDas
 	return r0, r1
 }
 
+// GetDashboardsSharedWithUser provides a mock function with given fields: ctx, user
+func (_m *FakeDashboardService) GetDashboardsSharedWithUser(ctx context.Context, user identity.Requester) ([]*Dashboard, error) {
+	ret := _m.Called(ctx, user)
+
+	var r0 []*Dashboard
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, identity.Requester) ([]*Dashboard, error)); ok {
+		return rf(ctx, user)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, identity.Requester) []*Dashboard); ok {
+		r0 = rf(ctx, user)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]*Dashboard)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, identity.Requester) error); ok {
+		r1 = rf(ctx, user)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // ImportDashboard provides a mock function with given fields: ctx, dto
 func (_m *FakeDashboardService) ImportDashboard(ctx context.Context, dto *SaveDashboardDTO) (*Dashboard, error) {
 	ret := _m.Called(ctx, dto)
@@ -326,27 +314,12 @@ func (_m *FakeDashboardService) SearchDashboards(ctx context.Context, query *Fin
 	return r0, r1
 }
 
-// UpdateDashboardACL provides a mock function with given fields: ctx, uid, items
-func (_m *FakeDashboardService) UpdateDashboardACL(ctx context.Context, uid int64, items []*DashboardACL) error {
-	ret := _m.Called(ctx, uid, items)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context, int64, []*DashboardACL) error); ok {
-		r0 = rf(ctx, uid, items)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-type mockConstructorTestingTNewFakeDashboardService interface {
+// NewFakeDashboardService creates a new instance of FakeDashboardService. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewFakeDashboardService(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewFakeDashboardService creates a new instance of FakeDashboardService. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewFakeDashboardService(t mockConstructorTestingTNewFakeDashboardService) *FakeDashboardService {
+}) *FakeDashboardService {
 	mock := &FakeDashboardService{}
 	mock.Mock.Test(t)
 
diff --git a/pkg/services/dashboards/dashboardaccess/dashboard_access.go b/pkg/services/dashboards/dashboardaccess/dashboard_access.go
new file mode 100644
index 0000000000000..7711fe2a0a7f1
--- /dev/null
+++ b/pkg/services/dashboards/dashboardaccess/dashboard_access.go
@@ -0,0 +1,32 @@
+package dashboardaccess
+
+import (
+	"errors"
+)
+
+type PermissionType int
+
+const (
+	PERMISSION_VIEW PermissionType = 1 << iota
+	PERMISSION_EDIT
+	PERMISSION_ADMIN
+)
+
+func (p PermissionType) String() string {
+	names := map[int]string{
+		int(PERMISSION_VIEW):  "View",
+		int(PERMISSION_EDIT):  "Edit",
+		int(PERMISSION_ADMIN): "Admin",
+	}
+	return names[int(p)]
+}
+
+// Typed errors
+var (
+	ErrDashboardACLInfoMissing              = errors.New("user id and team id cannot both be empty for a dashboard permission")
+	ErrDashboardPermissionDashboardEmpty    = errors.New("dashboard id must be greater than zero for a dashboard permission")
+	ErrFolderACLInfoMissing                 = errors.New("user id and team id cannot both be empty for a folder permission")
+	ErrFolderPermissionFolderEmpty          = errors.New("folder id must be greater than zero for a folder permission")
+	ErrPermissionsWithRoleNotAllowed        = errors.New("permissions cannot have both a user and team")
+	ErrPermissionsWithUserAndTeamNotAllowed = errors.New("team and user permissions cannot have an associated role")
+)
diff --git a/pkg/services/dashboards/dashboardaccess/dashboard_access_test.go b/pkg/services/dashboards/dashboardaccess/dashboard_access_test.go
new file mode 100644
index 0000000000000..19f22eb199cbb
--- /dev/null
+++ b/pkg/services/dashboards/dashboardaccess/dashboard_access_test.go
@@ -0,0 +1,26 @@
+package dashboardaccess
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestPermissionType_String(t *testing.T) {
+	testCases := []struct {
+		permissionType PermissionType
+		expected       string
+	}{
+		{PERMISSION_ADMIN, "Admin"},
+		{PERMISSION_EDIT, "Edit"},
+		{PERMISSION_VIEW, "View"},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.expected, func(t *testing.T) {
+			assert.Equal(t, tc.expected, fmt.Sprint(tc.permissionType))
+			assert.Equal(t, tc.expected, tc.permissionType.String())
+		})
+	}
+}
diff --git a/pkg/services/dashboards/database/acl.go b/pkg/services/dashboards/database/acl.go
deleted file mode 100644
index 5fb3529828061..0000000000000
--- a/pkg/services/dashboards/database/acl.go
+++ /dev/null
@@ -1,103 +0,0 @@
-package database
-
-import (
-	"context"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-)
-
-// GetDashboardACLInfoList returns a list of permissions for a dashboard. They can be fetched from three
-// different places.
-// 1) Permissions for the dashboard
-// 2) permissions for its parent folder
-// 3) if no specific permissions have been set for the dashboard or its parent folder then get the default permissions
-func (d *dashboardStore) GetDashboardACLInfoList(ctx context.Context, query *dashboards.GetDashboardACLInfoListQuery) ([]*dashboards.DashboardACLInfoDTO, error) {
-	queryResult := make([]*dashboards.DashboardACLInfoDTO, 0)
-	outerErr := d.store.WithDbSession(ctx, func(dbSession *db.Session) error {
-		falseStr := d.store.GetDialect().BooleanStr(false)
-
-		if query.DashboardID == 0 {
-			sql := `SELECT
-		da.id,
-		da.org_id,
-		da.dashboard_id,
-		da.user_id,
-		da.team_id,
-		da.permission,
-		da.role,
-		da.created,
-		da.updated,
-		'' as user_login,
-		'' as user_email,
-		'' as team,
-		'' as title,
-		'' as slug,
-		'' as uid,` +
-				falseStr + ` AS is_folder,` +
-				falseStr + ` AS inherited
-		FROM dashboard_acl as da
-		WHERE da.dashboard_id = -1`
-			return dbSession.SQL(sql).Find(&queryResult)
-		}
-
-		rawSQL := `
-			-- get permissions for the dashboard and its parent folder
-			SELECT
-				da.id,
-				da.org_id,
-				da.dashboard_id,
-				da.user_id,
-				da.team_id,
-				da.permission,
-				da.role,
-				da.created,
-				da.updated,
-				u.login AS user_login,
-				u.email AS user_email,
-				ug.name AS team,
-				ug.email AS team_email,
-				d.title,
-				d.slug,
-				d.uid,
-				d.is_folder,
-				CASE WHEN (da.dashboard_id = -1 AND d.folder_id > 0) OR da.dashboard_id = d.folder_id THEN ` + d.store.GetDialect().BooleanStr(true) + ` ELSE ` + falseStr + ` END AS inherited
-			FROM dashboard as d
-				LEFT JOIN dashboard folder on folder.id = d.folder_id
-				LEFT JOIN dashboard_acl AS da ON
-				da.dashboard_id = d.id OR
-				da.dashboard_id = d.folder_id OR
-				(
-					-- include default permissions -->
-					da.org_id = -1 AND (
-					  (folder.id IS NOT NULL AND folder.has_acl = ` + falseStr + `) OR
-					  (folder.id IS NULL AND d.has_acl = ` + falseStr + `)
-					)
-				)
-				LEFT JOIN ` + d.store.GetDialect().Quote("user") + ` AS u ON u.id = da.user_id
-				LEFT JOIN team ug on ug.id = da.team_id
-			WHERE d.org_id = ? AND d.id = ? AND da.id IS NOT NULL
-			ORDER BY da.id ASC
-			`
-
-		return dbSession.SQL(rawSQL, query.OrgID, query.DashboardID).Find(&queryResult)
-	})
-
-	if outerErr != nil {
-		return nil, outerErr
-	}
-
-	for _, p := range queryResult {
-		p.PermissionName = p.Permission.String()
-	}
-
-	return queryResult, nil
-}
-
-func (d *dashboardStore) DeleteACLByUser(ctx context.Context, userID int64) error {
-	return d.store.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		var rawSQL = "DELETE FROM dashboard_acl WHERE user_id = ?"
-		_, err := sess.Exec(rawSQL, userID)
-		return err
-	})
-}
diff --git a/pkg/services/dashboards/database/acl_test.go b/pkg/services/dashboards/database/acl_test.go
deleted file mode 100644
index 1c7bebe11533d..0000000000000
--- a/pkg/services/dashboards/database/acl_test.go
+++ /dev/null
@@ -1,299 +0,0 @@
-package database
-
-import (
-	"context"
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/org"
-	"github.com/grafana/grafana/pkg/services/org/orgimpl"
-	"github.com/grafana/grafana/pkg/services/quota/quotaimpl"
-	"github.com/grafana/grafana/pkg/services/quota/quotatest"
-	"github.com/grafana/grafana/pkg/services/sqlstore"
-	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
-	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
-	"github.com/grafana/grafana/pkg/services/team/teamimpl"
-	"github.com/grafana/grafana/pkg/services/user"
-	"github.com/grafana/grafana/pkg/services/user/userimpl"
-)
-
-func TestIntegrationDashboardACLDataAccess(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	var sqlStore *sqlstore.SQLStore
-	var currentUser user.User
-	var savedFolder, childDash *dashboards.Dashboard
-	var dashboardStore dashboards.Store
-
-	setup := func(t *testing.T) int64 {
-		sqlStore = db.InitTestDB(t)
-		quotaService := quotatest.New(false, nil)
-		var err error
-		dashboardStore, err = ProvideDashboardStore(sqlStore, sqlStore.Cfg, testFeatureToggles, tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
-		require.NoError(t, err)
-		currentUser = createUser(t, sqlStore, "viewer", "Viewer", false)
-		savedFolder = insertTestDashboard(t, dashboardStore, "1 test dash folder", 1, 0, "", true, "prod", "webapp")
-		childDash = insertTestDashboard(t, dashboardStore, "2 test dash", 1, savedFolder.ID, savedFolder.UID, false, "prod", "webapp")
-		return currentUser.OrgID
-	}
-
-	t.Run("Dashboard permission with userId and teamId set to 0", func(t *testing.T) {
-		orgID := setup(t)
-		err := updateDashboardACL(t, dashboardStore, savedFolder.ID, dashboards.DashboardACL{
-			OrgID:       orgID,
-			DashboardID: savedFolder.ID,
-			Permission:  dashboards.PERMISSION_EDIT,
-		})
-		require.Equal(t, dashboards.ErrDashboardACLInfoMissing, err)
-	})
-
-	t.Run("Folder acl should include default acl", func(t *testing.T) {
-		orgID := setup(t)
-		query := dashboards.GetDashboardACLInfoListQuery{DashboardID: savedFolder.ID, OrgID: orgID}
-
-		queryResult, err := dashboardStore.GetDashboardACLInfoList(context.Background(), &query)
-		require.Nil(t, err)
-
-		require.Equal(t, 2, len(queryResult))
-		defaultPermissionsId := int64(-1)
-		require.Equal(t, defaultPermissionsId, queryResult[0].DashboardID)
-		require.Equal(t, org.RoleViewer, *queryResult[0].Role)
-		require.False(t, queryResult[0].Inherited)
-		require.Equal(t, defaultPermissionsId, queryResult[1].DashboardID)
-		require.Equal(t, org.RoleEditor, *queryResult[1].Role)
-		require.False(t, queryResult[1].Inherited)
-	})
-
-	t.Run("Dashboard acl should include acl for parent folder", func(t *testing.T) {
-		orgID := setup(t)
-		query := dashboards.GetDashboardACLInfoListQuery{DashboardID: childDash.ID, OrgID: orgID}
-
-		queryResult, err := dashboardStore.GetDashboardACLInfoList(context.Background(), &query)
-		require.Nil(t, err)
-
-		require.Equal(t, 2, len(queryResult))
-		defaultPermissionsId := int64(-1)
-		require.Equal(t, defaultPermissionsId, queryResult[0].DashboardID)
-		require.Equal(t, org.RoleViewer, *queryResult[0].Role)
-		require.True(t, queryResult[0].Inherited)
-		require.Equal(t, defaultPermissionsId, queryResult[1].DashboardID)
-		require.Equal(t, org.RoleEditor, *queryResult[1].Role)
-		require.True(t, queryResult[1].Inherited)
-	})
-
-	t.Run("Folder with removed default permissions returns no acl items", func(t *testing.T) {
-		orgID := setup(t)
-		err := dashboardStore.UpdateDashboardACL(context.Background(), savedFolder.ID, nil)
-		require.Nil(t, err)
-
-		query := dashboards.GetDashboardACLInfoListQuery{DashboardID: childDash.ID, OrgID: orgID}
-		queryResult, err := dashboardStore.GetDashboardACLInfoList(context.Background(), &query)
-		require.Nil(t, err)
-
-		require.Equal(t, 0, len(queryResult))
-	})
-
-	t.Run("Given a dashboard folder and a user", func(t *testing.T) {
-		t.Run("Given dashboard folder permission", func(t *testing.T) {
-			orgID := setup(t)
-			err := updateDashboardACL(t, dashboardStore, savedFolder.ID, dashboards.DashboardACL{
-				OrgID:       orgID,
-				UserID:      currentUser.ID,
-				DashboardID: savedFolder.ID,
-				Permission:  dashboards.PERMISSION_EDIT,
-			})
-			require.Nil(t, err)
-
-			t.Run("When reading dashboard acl should include acl for parent folder", func(t *testing.T) {
-				query := dashboards.GetDashboardACLInfoListQuery{DashboardID: childDash.ID, OrgID: orgID}
-
-				queryResult, err := dashboardStore.GetDashboardACLInfoList(context.Background(), &query)
-				require.Nil(t, err)
-
-				require.Equal(t, 1, len(queryResult))
-				require.Equal(t, savedFolder.ID, queryResult[0].DashboardID)
-			})
-
-			t.Run("Given child dashboard permission", func(t *testing.T) {
-				err := updateDashboardACL(t, dashboardStore, childDash.ID, dashboards.DashboardACL{
-					OrgID:       orgID,
-					UserID:      currentUser.ID,
-					DashboardID: childDash.ID,
-					Permission:  dashboards.PERMISSION_EDIT,
-				})
-				require.Nil(t, err)
-
-				t.Run("When reading dashboard acl should include acl for parent folder and child", func(t *testing.T) {
-					query := dashboards.GetDashboardACLInfoListQuery{OrgID: orgID, DashboardID: childDash.ID}
-
-					queryResult, err := dashboardStore.GetDashboardACLInfoList(context.Background(), &query)
-					require.Nil(t, err)
-
-					require.Equal(t, 2, len(queryResult))
-					require.Equal(t, savedFolder.ID, queryResult[0].DashboardID)
-					require.True(t, queryResult[0].Inherited)
-					require.Equal(t, childDash.ID, queryResult[1].DashboardID)
-					require.False(t, queryResult[1].Inherited)
-				})
-			})
-		})
-
-		t.Run("Reading dashboard acl should include default acl for parent folder and the child acl", func(t *testing.T) {
-			orgID := setup(t)
-			err := updateDashboardACL(t, dashboardStore, childDash.ID, dashboards.DashboardACL{
-				OrgID:       1,
-				UserID:      currentUser.ID,
-				DashboardID: childDash.ID,
-				Permission:  dashboards.PERMISSION_EDIT,
-			})
-			require.Nil(t, err)
-
-			query := dashboards.GetDashboardACLInfoListQuery{OrgID: orgID, DashboardID: childDash.ID}
-
-			queryResult, err := dashboardStore.GetDashboardACLInfoList(context.Background(), &query)
-			require.Nil(t, err)
-
-			defaultPermissionsId := int64(-1)
-			require.Equal(t, 3, len(queryResult))
-			require.Equal(t, defaultPermissionsId, queryResult[0].DashboardID)
-			require.Equal(t, org.RoleViewer, *queryResult[0].Role)
-			require.True(t, queryResult[0].Inherited)
-			require.Equal(t, defaultPermissionsId, queryResult[1].DashboardID)
-			require.Equal(t, org.RoleEditor, *queryResult[1].Role)
-			require.True(t, queryResult[1].Inherited)
-			require.Equal(t, childDash.ID, queryResult[2].DashboardID)
-			require.False(t, queryResult[2].Inherited)
-		})
-
-		t.Run("Add and delete dashboard permission", func(t *testing.T) {
-			orgID := setup(t)
-			err := updateDashboardACL(t, dashboardStore, savedFolder.ID, dashboards.DashboardACL{
-				OrgID:       1,
-				UserID:      currentUser.ID,
-				DashboardID: savedFolder.ID,
-				Permission:  dashboards.PERMISSION_EDIT,
-			})
-			require.Nil(t, err)
-
-			q1 := &dashboards.GetDashboardACLInfoListQuery{DashboardID: savedFolder.ID, OrgID: orgID}
-			q1Result, err := dashboardStore.GetDashboardACLInfoList(context.Background(), q1)
-			require.Nil(t, err)
-
-			require.Equal(t, savedFolder.ID, q1Result[0].DashboardID)
-			require.Equal(t, dashboards.PERMISSION_EDIT, q1Result[0].Permission)
-			require.Equal(t, "Edit", q1Result[0].PermissionName)
-			require.Equal(t, currentUser.ID, q1Result[0].UserID)
-			require.Equal(t, currentUser.Login, q1Result[0].UserLogin)
-			require.Equal(t, currentUser.Email, q1Result[0].UserEmail)
-
-			err = updateDashboardACL(t, dashboardStore, savedFolder.ID)
-			require.Nil(t, err)
-
-			q3 := &dashboards.GetDashboardACLInfoListQuery{DashboardID: savedFolder.ID, OrgID: orgID}
-			q3Result, err := dashboardStore.GetDashboardACLInfoList(context.Background(), q3)
-			require.Nil(t, err)
-			require.Equal(t, 0, len(q3Result))
-		})
-
-		t.Run("Should be able to add a user permission for a team", func(t *testing.T) {
-			orgID := setup(t)
-			teamSvc := teamimpl.ProvideService(sqlStore, sqlStore.Cfg)
-			team1, err := teamSvc.CreateTeam("group1 name", "", 1)
-			require.Nil(t, err)
-
-			err = updateDashboardACL(t, dashboardStore, savedFolder.ID, dashboards.DashboardACL{
-				OrgID:       1,
-				TeamID:      team1.ID,
-				DashboardID: savedFolder.ID,
-				Permission:  dashboards.PERMISSION_EDIT,
-			})
-			require.Nil(t, err)
-
-			q1 := &dashboards.GetDashboardACLInfoListQuery{DashboardID: savedFolder.ID, OrgID: orgID}
-			q1Result, err := dashboardStore.GetDashboardACLInfoList(context.Background(), q1)
-			require.Nil(t, err)
-			require.Equal(t, savedFolder.ID, q1Result[0].DashboardID)
-			require.Equal(t, dashboards.PERMISSION_EDIT, q1Result[0].Permission)
-			require.Equal(t, team1.ID, q1Result[0].TeamID)
-		})
-
-		t.Run("Should be able to update an existing permission for a team", func(t *testing.T) {
-			orgID := setup(t)
-			teamSvc := teamimpl.ProvideService(sqlStore, sqlStore.Cfg)
-			team1, err := teamSvc.CreateTeam("group1 name", "", 1)
-			require.Nil(t, err)
-			err = updateDashboardACL(t, dashboardStore, savedFolder.ID, dashboards.DashboardACL{
-				OrgID:       1,
-				TeamID:      team1.ID,
-				DashboardID: savedFolder.ID,
-				Permission:  dashboards.PERMISSION_ADMIN,
-			})
-			require.Nil(t, err)
-
-			q3 := &dashboards.GetDashboardACLInfoListQuery{DashboardID: savedFolder.ID, OrgID: orgID}
-			q3Result, err := dashboardStore.GetDashboardACLInfoList(context.Background(), q3)
-			require.Nil(t, err)
-			require.Equal(t, 1, len(q3Result))
-			require.Equal(t, savedFolder.ID, q3Result[0].DashboardID)
-			require.Equal(t, dashboards.PERMISSION_ADMIN, q3Result[0].Permission)
-			require.Equal(t, team1.ID, q3Result[0].TeamID)
-		})
-	})
-
-	t.Run("Default permissions for root folder dashboards", func(t *testing.T) {
-		orgID := setup(t)
-		var rootFolderId int64 = 0
-		//sqlStore := db.InitTestDB(t)
-
-		query := dashboards.GetDashboardACLInfoListQuery{DashboardID: rootFolderId, OrgID: orgID}
-
-		queryResult, err := dashboardStore.GetDashboardACLInfoList(context.Background(), &query)
-		require.Nil(t, err)
-
-		require.Equal(t, 2, len(queryResult))
-		defaultPermissionsId := int64(-1)
-		require.Equal(t, defaultPermissionsId, queryResult[0].DashboardID)
-		require.Equal(t, org.RoleViewer, *queryResult[0].Role)
-		require.False(t, queryResult[0].Inherited)
-		require.Equal(t, defaultPermissionsId, queryResult[1].DashboardID)
-		require.Equal(t, org.RoleEditor, *queryResult[1].Role)
-		require.False(t, queryResult[1].Inherited)
-	})
-
-	t.Run("Delete acl by user", func(t *testing.T) {
-		setup(t)
-		err := dashboardStore.DeleteACLByUser(context.Background(), currentUser.ID)
-		require.NoError(t, err)
-	})
-}
-
-func createUser(t *testing.T, sqlStore *sqlstore.SQLStore, name string, role string, isAdmin bool) user.User {
-	t.Helper()
-	sqlStore.Cfg.AutoAssignOrg = true
-	sqlStore.Cfg.AutoAssignOrgId = 1
-	sqlStore.Cfg.AutoAssignOrgRole = role
-
-	qs := quotaimpl.ProvideService(sqlStore, sqlStore.Cfg)
-	orgService, err := orgimpl.ProvideService(sqlStore, sqlStore.Cfg, qs)
-	require.NoError(t, err)
-	usrSvc, err := userimpl.ProvideService(sqlStore, orgService, sqlStore.Cfg, nil, nil, qs, supportbundlestest.NewFakeBundleService())
-	require.NoError(t, err)
-
-	o, err := orgService.CreateWithMember(context.Background(), &org.CreateOrgCommand{Name: fmt.Sprintf("test org %d", time.Now().UnixNano())})
-	require.NoError(t, err)
-
-	currentUserCmd := user.CreateUserCommand{Login: name, Email: name + "@test.com", Name: "a " + name, IsAdmin: isAdmin, OrgID: o.ID}
-	currentUser, err := usrSvc.Create(context.Background(), &currentUserCmd)
-	require.NoError(t, err)
-	orgs, err := orgService.GetUserOrgList(context.Background(), &org.GetUserOrgListQuery{UserID: currentUser.ID})
-	require.NoError(t, err)
-	require.Equal(t, org.RoleType(role), orgs[0].Role)
-	require.Equal(t, o.ID, orgs[0].OrgID)
-	return *currentUser
-}
diff --git a/pkg/services/dashboards/database/database.go b/pkg/services/dashboards/database/database.go
index b04453bc1b111..04b4354922c0e 100644
--- a/pkg/services/dashboards/database/database.go
+++ b/pkg/services/dashboards/database/database.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"strings"
 	"time"
 
 	"xorm.io/xorm"
@@ -12,7 +13,6 @@ import (
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/metrics"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
-	alertmodels "github.com/grafana/grafana/pkg/services/alerting/models"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	dashver "github.com/grafana/grafana/pkg/services/dashboardversion"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
@@ -66,7 +66,7 @@ func ProvideDashboardStore(sqlStore db.DB, cfg *setting.Cfg, features featuremgm
 }
 
 func (d *dashboardStore) emitEntityEvent() bool {
-	return d.features != nil && d.features.IsEnabled(featuremgmt.FlagPanelTitleSearch)
+	return d.features != nil && d.features.IsEnabledGlobally(featuremgmt.FlagPanelTitleSearch)
 }
 
 func (d *dashboardStore) ValidateDashboardBeforeSave(ctx context.Context, dashboard *dashboards.Dashboard, overwrite bool) (bool, error) {
@@ -171,55 +171,6 @@ func (d *dashboardStore) SaveDashboard(ctx context.Context, cmd dashboards.SaveD
 	return result, err
 }
 
-func (d *dashboardStore) UpdateDashboardACL(ctx context.Context, dashboardID int64, items []*dashboards.DashboardACL) error {
-	return d.store.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		// delete existing items
-		_, err := sess.Exec("DELETE FROM dashboard_acl WHERE dashboard_id=?", dashboardID)
-		if err != nil {
-			return fmt.Errorf("deleting from dashboard_acl failed: %w", err)
-		}
-
-		for _, item := range items {
-			if item.UserID == 0 && item.TeamID == 0 && (item.Role == nil || !item.Role.IsValid()) {
-				return dashboards.ErrDashboardACLInfoMissing
-			}
-
-			if item.DashboardID == 0 {
-				return dashboards.ErrDashboardPermissionDashboardEmpty
-			}
-
-			sess.Nullable("user_id", "team_id")
-			if _, err := sess.Insert(item); err != nil {
-				return err
-			}
-		}
-
-		// Update dashboard HasACL flag
-		dashboard := dashboards.Dashboard{HasACL: true}
-		_, err = sess.Cols("has_acl").Where("id=?", dashboardID).Update(&dashboard)
-		return err
-	})
-}
-
-func (d *dashboardStore) SaveAlerts(ctx context.Context, dashID int64, alerts []*alertmodels.Alert) error {
-	return d.store.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		existingAlerts, err := GetAlertsByDashboardId2(dashID, sess)
-		if err != nil {
-			return err
-		}
-
-		if err := d.updateAlerts(ctx, existingAlerts, alerts, d.log); err != nil {
-			return err
-		}
-
-		if err := d.deleteMissingAlerts(existingAlerts, alerts, sess); err != nil {
-			return err
-		}
-
-		return nil
-	})
-}
-
 // UnprovisionDashboard removes row in dashboard_provisioning for the dashboard making it seem as if manually created.
 // The dashboard will still have `created_by = -1` to see it was not created by any particular user.
 func (d *dashboardStore) UnprovisionDashboard(ctx context.Context, id int64) error {
@@ -330,19 +281,6 @@ func getExistingDashboardByIDOrUIDForUpdate(sess *db.Session, dash *dashboards.D
 		}
 	}
 
-	if dash.FolderID > 0 {
-		var existingFolder dashboards.Dashboard
-		folderExists, err := sess.Where("org_id=? AND id=? AND is_folder=?", dash.OrgID, dash.FolderID,
-			dialect.BooleanStr(true)).Get(&existingFolder)
-		if err != nil {
-			return false, fmt.Errorf("SQL query for folder failed: %w", err)
-		}
-
-		if !folderExists {
-			return false, dashboards.ErrDashboardFolderNotFound
-		}
-	}
-
 	if !dashWithIdExists && !dashWithUidExists {
 		return false, nil
 	}
@@ -364,7 +302,7 @@ func getExistingDashboardByIDOrUIDForUpdate(sess *db.Session, dash *dashboards.D
 		return isParentFolderChanged, dashboards.ErrDashboardTypeMismatch
 	}
 
-	if !dash.IsFolder && dash.FolderID != existing.FolderID {
+	if !dash.IsFolder && dash.FolderUID != existing.FolderUID {
 		isParentFolderChanged = true
 	}
 
@@ -389,8 +327,15 @@ func getExistingDashboardByIDOrUIDForUpdate(sess *db.Session, dash *dashboards.D
 func getExistingDashboardByTitleAndFolder(sess *db.Session, dash *dashboards.Dashboard, dialect migrator.Dialect, overwrite,
 	isParentFolderChanged bool) (bool, error) {
 	var existing dashboards.Dashboard
-	exists, err := sess.Where("org_id=? AND title=? AND (is_folder=? OR folder_id=?)", dash.OrgID, dash.Title,
-		dialect.BooleanStr(true), dash.FolderID).Get(&existing)
+	condition := "org_id=? AND title=?"
+	args := []any{dash.OrgID, dash.Title}
+	if dash.FolderUID != "" {
+		condition += " AND folder_uid=?"
+		args = append(args, dash.FolderUID)
+	} else {
+		condition += " AND folder_uid IS NULL"
+	}
+	exists, err := sess.Where(condition, args...).Get(&existing)
 	if err != nil {
 		return isParentFolderChanged, fmt.Errorf("SQL query for existing dashboard by org ID or folder ID failed: %w", err)
 	}
@@ -403,6 +348,8 @@ func getExistingDashboardByTitleAndFolder(sess *db.Session, dash *dashboards.Das
 			return isParentFolderChanged, dashboards.ErrDashboardFolderWithSameNameAsDashboard
 		}
 
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Dashboard).Inc()
+		// nolint:staticcheck
 		if !dash.IsFolder && (dash.FolderID != existing.FolderID || dash.ID == 0) {
 			isParentFolderChanged = true
 		}
@@ -553,123 +500,6 @@ func saveProvisionedData(sess *db.Session, provisioning *dashboards.DashboardPro
 	return err
 }
 
-func GetAlertsByDashboardId2(dashboardId int64, sess *db.Session) ([]*alertmodels.Alert, error) {
-	alerts := make([]*alertmodels.Alert, 0)
-	err := sess.Where("dashboard_id = ?", dashboardId).Find(&alerts)
-
-	if err != nil {
-		return []*alertmodels.Alert{}, err
-	}
-
-	return alerts, nil
-}
-
-func (d *dashboardStore) updateAlerts(ctx context.Context, existingAlerts []*alertmodels.Alert, alertsIn []*alertmodels.Alert, log log.Logger) error {
-	return d.store.WithDbSession(ctx, func(sess *db.Session) error {
-		for _, alert := range alertsIn {
-			update := false
-			var alertToUpdate *alertmodels.Alert
-
-			for _, k := range existingAlerts {
-				if alert.PanelID == k.PanelID {
-					update = true
-					alert.ID = k.ID
-					alertToUpdate = k
-					break
-				}
-			}
-
-			if update {
-				if alertToUpdate.ContainsUpdates(alert) {
-					alert.Updated = time.Now()
-					alert.State = alertToUpdate.State
-					sess.MustCols("message", "for")
-
-					_, err := sess.ID(alert.ID).Update(alert)
-					if err != nil {
-						return err
-					}
-
-					log.Debug("Alert updated", "name", alert.Name, "id", alert.ID)
-				}
-			} else {
-				alert.Updated = time.Now()
-				alert.Created = time.Now()
-				alert.State = alertmodels.AlertStateUnknown
-				alert.NewStateDate = time.Now()
-
-				_, err := sess.Insert(alert)
-				if err != nil {
-					return err
-				}
-
-				log.Debug("Alert inserted", "name", alert.Name, "id", alert.ID)
-			}
-			tags := alert.GetTagsFromSettings()
-			if _, err := sess.Exec("DELETE FROM alert_rule_tag WHERE alert_id = ?", alert.ID); err != nil {
-				return err
-			}
-			if tags != nil {
-				tags, err := d.tagService.EnsureTagsExist(ctx, tags)
-				if err != nil {
-					return err
-				}
-				for _, tag := range tags {
-					if _, err := sess.Exec("INSERT INTO alert_rule_tag (alert_id, tag_id) VALUES(?,?)", alert.ID, tag.Id); err != nil {
-						return err
-					}
-				}
-			}
-		}
-		return nil
-	})
-}
-
-func (d *dashboardStore) deleteMissingAlerts(alerts []*alertmodels.Alert, existingAlerts []*alertmodels.Alert, sess *db.Session) error {
-	for _, missingAlert := range alerts {
-		missing := true
-
-		for _, k := range existingAlerts {
-			if missingAlert.PanelID == k.PanelID {
-				missing = false
-				break
-			}
-		}
-
-		if missing {
-			if err := d.deleteAlertByIdInternal(missingAlert.ID, "Removed from dashboard", sess); err != nil {
-				// No use trying to delete more, since we're in a transaction and it will be
-				// rolled back on error.
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-func (d *dashboardStore) deleteAlertByIdInternal(alertId int64, reason string, sess *db.Session) error {
-	d.log.Debug("Deleting alert", "id", alertId, "reason", reason)
-
-	if _, err := sess.Exec("DELETE FROM alert WHERE id = ?", alertId); err != nil {
-		return err
-	}
-
-	if _, err := sess.Exec("DELETE FROM annotation WHERE alert_id = ?", alertId); err != nil {
-		return err
-	}
-
-	if _, err := sess.Exec("DELETE FROM alert_notification_state WHERE alert_id = ?", alertId); err != nil {
-		return err
-	}
-
-	if _, err := sess.Exec("DELETE FROM alert_rule_tag WHERE alert_id = ?", alertId); err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func (d *dashboardStore) GetDashboardsByPluginID(ctx context.Context, query *dashboards.GetDashboardsByPluginIDQuery) ([]*dashboards.Dashboard, error) {
 	var dashboards = make([]*dashboards.Dashboard, 0)
 	err := d.store.WithDbSession(ctx, func(dbSession *db.Session) error {
@@ -691,7 +521,12 @@ func (d *dashboardStore) DeleteDashboard(ctx context.Context, cmd *dashboards.De
 }
 
 func (d *dashboardStore) deleteDashboard(cmd *dashboards.DeleteDashboardCommand, sess *db.Session, emitEntityEvent bool) error {
-	dashboard := dashboards.Dashboard{ID: cmd.ID, OrgID: cmd.OrgID}
+	dashboard := dashboards.Dashboard{OrgID: cmd.OrgID}
+	if cmd.UID != "" {
+		dashboard.UID = cmd.UID
+	} else {
+		dashboard.ID = cmd.ID
+	}
 	has, err := sess.Get(&dashboard)
 	if err != nil {
 		return err
@@ -721,20 +556,12 @@ func (d *dashboardStore) deleteDashboard(cmd *dashboards.DeleteDashboardCommand,
 		if err != nil {
 			return err
 		}
-
-		if err := deleteFolderAlertRules(sess, dashboard, cmd.ForceDeleteFolderRules); err != nil {
-			return err
-		}
 	} else {
 		if err := d.deleteResourcePermissions(sess, dashboard.OrgID, ac.GetResourceScopeUID("dashboards", dashboard.UID)); err != nil {
 			return err
 		}
 	}
 
-	if err := d.deleteAlertDefinition(dashboard.ID, sess); err != nil {
-		return err
-	}
-
 	_, err = sess.Exec("DELETE FROM annotation WHERE dashboard_id = ? AND org_id = ?", dashboard.ID, dashboard.OrgID)
 	if err != nil {
 		return err
@@ -786,10 +613,6 @@ func (d *dashboardStore) deleteChildrenDashboardAssociations(sess *db.Session, d
 
 	if len(dashIds) > 0 {
 		for _, dash := range dashIds {
-			if err := d.deleteAlertDefinition(dash.Id, sess); err != nil {
-				return err
-			}
-
 			// remove all access control permission with child dashboard scopes
 			if err := d.deleteResourcePermissions(sess, dashboard.OrgID, ac.GetResourceScopeUID("dashboards", dash.Uid)); err != nil {
 				return err
@@ -819,33 +642,6 @@ func (d *dashboardStore) deleteChildrenDashboardAssociations(sess *db.Session, d
 	return nil
 }
 
-func deleteFolderAlertRules(sess *db.Session, dashboard dashboards.Dashboard, forceDeleteFolderAlertRules bool) error {
-	var existingRuleID int64
-	exists, err := sess.Table("alert_rule").Where("namespace_uid = (SELECT uid FROM dashboard WHERE id = ?)", dashboard.ID).Cols("id").Get(&existingRuleID)
-	if err != nil {
-		return err
-	}
-	if exists {
-		if !forceDeleteFolderAlertRules {
-			return fmt.Errorf("folder cannot be deleted: %w", dashboards.ErrFolderContainsAlertRules)
-		}
-
-		// Delete all rules under this folder.
-		deleteNGAlertsByFolder := []string{
-			"DELETE FROM alert_rule WHERE namespace_uid = (SELECT uid FROM dashboard WHERE id = ?)",
-			"DELETE FROM alert_rule_version WHERE rule_namespace_uid = (SELECT uid FROM dashboard WHERE id = ?)",
-		}
-
-		for _, sql := range deleteNGAlertsByFolder {
-			_, err := sess.Exec(sql, dashboard.ID)
-			if err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
 func createEntityEvent(dashboard *dashboards.Dashboard, eventType store.EntityEventType) *store.EntityEvent {
 	var entityEvent *store.EntityEvent
 	if dashboard.IsFolder {
@@ -864,27 +660,12 @@ func createEntityEvent(dashboard *dashboards.Dashboard, eventType store.EntityEv
 	return entityEvent
 }
 
-func (d *dashboardStore) deleteAlertDefinition(dashboardId int64, sess *db.Session) error {
-	alerts := make([]*alertmodels.Alert, 0)
-	if err := sess.Where("dashboard_id = ?", dashboardId).Find(&alerts); err != nil {
-		return err
-	}
-
-	for _, alert := range alerts {
-		if err := d.deleteAlertByIdInternal(alert.ID, "Dashboard deleted", sess); err != nil {
-			// If we return an error, the current transaction gets rolled back, so no use
-			// trying to delete more
-			return err
-		}
-	}
-
-	return nil
-}
-
 func (d *dashboardStore) GetDashboard(ctx context.Context, query *dashboards.GetDashboardQuery) (*dashboards.Dashboard, error) {
 	var queryResult *dashboards.Dashboard
 	err := d.store.WithDbSession(ctx, func(sess *db.Session) error {
-		if query.ID == 0 && len(query.UID) == 0 && (query.Title == nil || query.FolderID == nil) {
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Dashboard).Inc()
+		// nolint:staticcheck
+		if query.ID == 0 && len(query.UID) == 0 && (query.Title == nil || (query.FolderID == nil && query.FolderUID == nil)) {
 			return dashboards.ErrDashboardIdentifierNotSet
 		}
 
@@ -894,13 +675,18 @@ func (d *dashboardStore) GetDashboard(ctx context.Context, query *dashboards.Get
 			dashboard.Title = *query.Title
 			mustCols = append(mustCols, "title")
 		}
-		if query.FolderID != nil {
+
+		if query.FolderUID != nil {
+			dashboard.FolderUID = *query.FolderUID
+			mustCols = append(mustCols, "folder_uid")
+		} else if query.FolderID != nil { // nolint:staticcheck
+			// nolint:staticcheck
 			dashboard.FolderID = *query.FolderID
 			mustCols = append(mustCols, "folder_id")
+			metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Dashboard).Inc()
 		}
 
-		has, err := sess.MustCols(mustCols...).Get(&dashboard)
-
+		has, err := sess.MustCols(mustCols...).Nullable("folder_uid").Get(&dashboard)
 		if err != nil {
 			return err
 		} else if !has {
@@ -979,8 +765,8 @@ func (d *dashboardStore) FindDashboards(ctx context.Context, query *dashboards.F
 	if query.OrgId != 0 {
 		orgID = query.OrgId
 		filters = append(filters, searchstore.OrgFilter{OrgId: orgID})
-	} else if query.SignedInUser.OrgID != 0 {
-		orgID = query.SignedInUser.OrgID
+	} else if query.SignedInUser.GetOrgID() != 0 {
+		orgID = query.SignedInUser.GetOrgID()
 		filters = append(filters, searchstore.OrgFilter{OrgId: orgID})
 	}
 
@@ -1001,13 +787,19 @@ func (d *dashboardStore) FindDashboards(ctx context.Context, query *dashboards.F
 	if len(query.Type) > 0 {
 		filters = append(filters, searchstore.TypeFilter{Dialect: d.store.GetDialect(), Type: query.Type})
 	}
-
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Dashboard).Inc()
+	// nolint:staticcheck
 	if len(query.FolderIds) > 0 {
 		filters = append(filters, searchstore.FolderFilter{IDs: query.FolderIds})
 	}
 
 	if len(query.FolderUIDs) > 0 {
-		filters = append(filters, searchstore.FolderUIDFilter{Dialect: d.store.GetDialect(), OrgID: orgID, UIDs: query.FolderUIDs, NestedFoldersEnabled: d.features.IsEnabled(featuremgmt.FlagNestedFolders)})
+		filters = append(filters, searchstore.FolderUIDFilter{
+			Dialect:              d.store.GetDialect(),
+			OrgID:                orgID,
+			UIDs:                 query.FolderUIDs,
+			NestedFoldersEnabled: d.features.IsEnabled(ctx, featuremgmt.FlagNestedFolders),
+		})
 	}
 
 	var res []dashboards.DashboardSearchProjection
@@ -1060,40 +852,58 @@ func (d *dashboardStore) GetDashboardTags(ctx context.Context, query *dashboards
 
 // CountDashboardsInFolder returns a count of all dashboards associated with the
 // given parent folder ID.
-//
-// This will be updated to take CountDashboardsInFolderQuery as an argument and
-// lookup dashboards using the ParentFolderUID when dashboards are associated with a parent folder UID instead of ID.
-func (d *dashboardStore) CountDashboardsInFolder(
+func (d *dashboardStore) CountDashboardsInFolders(
 	ctx context.Context, req *dashboards.CountDashboardsInFolderRequest) (int64, error) {
+	if len(req.FolderUIDs) == 0 {
+		return 0, nil
+	}
 	var count int64
-	var err error
-	err = d.store.WithDbSession(ctx, func(sess *db.Session) error {
-		session := sess.In("folder_id", req.FolderID).In("org_id", req.OrgID).
-			In("is_folder", d.store.GetDialect().BooleanStr(false))
-		count, err = session.Count(&dashboards.Dashboard{})
+	err := d.store.WithDbSession(ctx, func(sess *db.Session) error {
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Dashboard).Inc()
+		s := strings.Builder{}
+		args := make([]any, 0, 3)
+		s.WriteString("SELECT COUNT(*) FROM dashboard WHERE ")
+		if len(req.FolderUIDs) == 1 && req.FolderUIDs[0] == "" {
+			s.WriteString("folder_uid IS NULL")
+		} else {
+			s.WriteString(fmt.Sprintf("folder_uid IN (%s)", strings.Repeat("?,", len(req.FolderUIDs)-1)+"?"))
+			for _, folderUID := range req.FolderUIDs {
+				args = append(args, folderUID)
+			}
+		}
+		s.WriteString(" AND org_id = ? AND is_folder = ?")
+		args = append(args, req.OrgID, d.store.GetDialect().BooleanStr(false))
+		sql := s.String()
+		_, err := sess.SQL(sql, args...).Get(&count)
 		return err
 	})
 	return count, err
 }
 
-func (d *dashboardStore) DeleteDashboardsInFolder(
+func (d *dashboardStore) DeleteDashboardsInFolders(
 	ctx context.Context, req *dashboards.DeleteDashboardsInFolderRequest) error {
 	return d.store.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		dashboard := dashboards.Dashboard{OrgID: req.OrgID}
-		has, err := sess.Where("uid = ? AND org_id = ?", req.FolderUID, req.OrgID).Get(&dashboard)
-		if err != nil {
-			return err
-		}
-		if !has {
-			return dashboards.ErrFolderNotFound
-		}
+		// TODO delete all dashboards in the folder in a bulk query
+		for _, folderUID := range req.FolderUIDs {
+			dashboard := dashboards.Dashboard{OrgID: req.OrgID}
+			has, err := sess.Where("org_id = ? AND uid = ?", req.OrgID, folderUID).Get(&dashboard)
+			if err != nil {
+				return err
+			}
+			if !has {
+				return dashboards.ErrFolderNotFound
+			}
 
-		if err := d.deleteChildrenDashboardAssociations(sess, &dashboard); err != nil {
-			return err
-		}
+			if err := d.deleteChildrenDashboardAssociations(sess, &dashboard); err != nil {
+				return err
+			}
 
-		_, err = sess.Where("folder_id = ? AND org_id = ? AND is_folder = ?", dashboard.ID, dashboard.OrgID, false).Delete(&dashboards.Dashboard{})
-		return err
+			_, err = sess.Where("folder_id = ? AND org_id = ? AND is_folder = ?", dashboard.ID, dashboard.OrgID, false).Delete(&dashboards.Dashboard{})
+			if err != nil {
+				return err
+			}
+		}
+		return nil
 	})
 }
 
diff --git a/pkg/services/dashboards/database/database_folder_test.go b/pkg/services/dashboards/database/database_folder_test.go
index 482f515717a9a..250f926d5701d 100644
--- a/pkg/services/dashboards/database/database_folder_test.go
+++ b/pkg/services/dashboards/database/database_folder_test.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -23,6 +24,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/guardian"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/org/orgimpl"
+	"github.com/grafana/grafana/pkg/services/quota/quotaimpl"
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
@@ -47,7 +49,7 @@ func TestIntegrationDashboardFolderDataAccess(t *testing.T) {
 			sqlStore = db.InitTestDB(t)
 			quotaService := quotatest.New(false, nil)
 			var err error
-			dashboardStore, err = ProvideDashboardStore(sqlStore, sqlStore.Cfg, testFeatureToggles, tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
+			dashboardStore, err = ProvideDashboardStore(sqlStore, sqlStore.Cfg, testFeatureToggles, tagimpl.ProvideService(sqlStore), quotaService)
 			require.NoError(t, err)
 			flder = insertTestDashboard(t, dashboardStore, "1 test dash folder", 1, 0, "", true, "prod", "webapp")
 			dashInRoot = insertTestDashboard(t, dashboardStore, "test dash 67", 1, 0, "", false, "prod", "webapp")
@@ -145,7 +147,7 @@ func TestIntegrationDashboardFolderDataAccess(t *testing.T) {
 				sqlStore = db.InitTestDB(t)
 				quotaService := quotatest.New(false, nil)
 				var err error
-				dashboardStore, err = ProvideDashboardStore(sqlStore, sqlStore.Cfg, testFeatureToggles, tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
+				dashboardStore, err = ProvideDashboardStore(sqlStore, sqlStore.Cfg, testFeatureToggles, tagimpl.ProvideService(sqlStore), quotaService)
 				require.NoError(t, err)
 				folder1 = insertTestDashboard(t, dashboardStore, "1 test dash folder", 1, 0, "", true, "prod")
 				folder2 = insertTestDashboard(t, dashboardStore, "2 test dash folder", 1, 0, "", true, "prod")
@@ -170,7 +172,7 @@ func TestIntegrationDashboardFolderDataAccess(t *testing.T) {
 						FolderIds: []int64{
 							rootFolderId,
 							folder1.ID,
-						},
+						}, // nolint:staticcheck
 						SignedInUser: currentUser,
 						OrgId:        1,
 					}
@@ -192,9 +194,10 @@ func TestIntegrationDashboardFolderDataAccess(t *testing.T) {
 
 					t.Run("should not return folder with acl or its children", func(t *testing.T) {
 						query := &dashboards.FindPersistedDashboardsQuery{
-							SignedInUser: currentUser,
-							OrgId:        1,
-							DashboardIds: []int64{folder1.ID, childDash1.ID, childDash2.ID, dashInRoot.ID},
+							SignedInUser:  currentUser,
+							OrgId:         1,
+							DashboardIds:  []int64{folder1.ID, childDash1.ID, childDash2.ID, dashInRoot.ID},
+							DashboardUIDs: []string{folder1.UID, childDash1.UID, childDash2.UID, dashInRoot.UID},
 						}
 						hits, err := testSearchDashboards(dashboardStore, query)
 						require.NoError(t, err)
@@ -204,7 +207,7 @@ func TestIntegrationDashboardFolderDataAccess(t *testing.T) {
 				})
 				t.Run("and a dashboard is moved from folder with acl to the folder without an acl", func(t *testing.T) {
 					setup2()
-					moveDashboard(t, dashboardStore, 1, childDash1.Data, folder2.ID, folder2.UID)
+					moveDashboard(t, dashboardStore, 1, childDash1.Data, folder2.ID, childDash2.FolderUID)
 					currentUser.Permissions = map[int64]map[string][]string{1: {dashboards.ActionDashboardsRead: {dashboards.ScopeDashboardsProvider.GetResourceScopeUID(dashInRoot.UID), dashboards.ScopeFoldersProvider.GetResourceScopeUID(folder2.UID)}, dashboards.ActionFoldersRead: {dashboards.ScopeFoldersProvider.GetResourceScopeUID(folder2.UID)}}}
 					actest.AddUserPermissionToDB(t, sqlStore, currentUser)
 
@@ -216,11 +219,11 @@ func TestIntegrationDashboardFolderDataAccess(t *testing.T) {
 						}
 						hits, err := testSearchDashboards(dashboardStore, query)
 						require.NoError(t, err)
-						require.Equal(t, len(hits), 4)
-						require.Equal(t, hits[0].ID, folder2.ID)
-						require.Equal(t, hits[1].ID, childDash1.ID)
-						require.Equal(t, hits[2].ID, childDash2.ID)
-						require.Equal(t, hits[3].ID, dashInRoot.ID)
+						assert.Equal(t, len(hits), 4)
+						assert.Equal(t, hits[0].ID, folder2.ID)
+						assert.Equal(t, hits[1].ID, childDash1.ID)
+						assert.Equal(t, hits[2].ID, childDash2.ID)
+						assert.Equal(t, hits[3].ID, dashInRoot.ID)
 					})
 				})
 			})
@@ -252,7 +255,7 @@ func TestIntegrationDashboardInheritedFolderRBAC(t *testing.T) {
 		features := featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)
 
 		var err error
-		dashboardWriteStore, err := ProvideDashboardStore(sqlStore, sqlStore.Cfg, features, tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
+		dashboardWriteStore, err := ProvideDashboardStore(sqlStore, sqlStore.Cfg, features, tagimpl.ProvideService(sqlStore), quotaService)
 		require.NoError(t, err)
 
 		usr := createUser(t, sqlStore, "viewer", "Viewer", false)
@@ -292,7 +295,7 @@ func TestIntegrationDashboardInheritedFolderRBAC(t *testing.T) {
 			guardian.New = origNewGuardian
 		})
 
-		folderSvc := folderimpl.ProvideService(mock.New(), bus.ProvideBus(tracing.InitializeTracerForTest()), sqlStore.Cfg, dashboardWriteStore, folderimpl.ProvideDashboardFolderStore(sqlStore), sqlStore, features)
+		folderSvc := folderimpl.ProvideService(mock.New(), bus.ProvideBus(tracing.InitializeTracerForTest()), sqlStore.Cfg, dashboardWriteStore, folderimpl.ProvideDashboardFolderStore(sqlStore), sqlStore, features, supportbundlestest.NewFakeBundleService(), nil)
 
 		parentUID := ""
 		for i := 0; ; i++ {
@@ -337,7 +340,6 @@ func TestIntegrationDashboardInheritedFolderRBAC(t *testing.T) {
 			Dashboard: simplejson.NewFromAny(map[string]any{
 				"title": dashInParentTitle,
 			}),
-			FolderID:  nestedFolders[0].ID,
 			FolderUID: nestedFolders[0].UID,
 		}
 		_, err = dashboardWriteStore.SaveDashboard(context.Background(), saveDashboardCmd)
@@ -350,7 +352,6 @@ func TestIntegrationDashboardInheritedFolderRBAC(t *testing.T) {
 			Dashboard: simplejson.NewFromAny(map[string]any{
 				"title": dashInSubfolderTitle,
 			}),
-			FolderID:  nestedFolders[1].ID,
 			FolderUID: nestedFolders[1].UID,
 		}
 		_, err = dashboardWriteStore.SaveDashboard(context.Background(), saveDashboardCmd)
@@ -376,22 +377,6 @@ func TestIntegrationDashboardInheritedFolderRBAC(t *testing.T) {
 			permissions:    nil,
 			expectedTitles: nil,
 		},
-		{
-			desc:     "it should not return dashboard in subfolder if nested folders are disabled and the user has permission to read dashboards under parent folder",
-			features: featuremgmt.WithFeatures(featuremgmt.FlagPanelTitleSearch),
-			permissions: map[string][]string{
-				dashboards.ActionDashboardsRead: {fmt.Sprintf("folders:uid:%s", nestedFolders[0].UID)},
-			},
-			expectedTitles: []string{dashInParentTitle},
-		},
-		{
-			desc:     "it should return dashboard in subfolder if nested folders are enabled and the user has permission to read dashboards under parent folder",
-			features: featuremgmt.WithFeatures(featuremgmt.FlagPanelTitleSearch, featuremgmt.FlagNestedFolders),
-			permissions: map[string][]string{
-				dashboards.ActionDashboardsRead: {fmt.Sprintf("folders:uid:%s", nestedFolders[0].UID)},
-			},
-			expectedTitles: []string{dashInParentTitle, dashInSubfolderTitle},
-		},
 		{
 			desc:     "it should not return subfolder if nested folders are disabled and the user has permission to read folders under parent folder",
 			features: featuremgmt.WithFeatures(featuremgmt.FlagPanelTitleSearch),
@@ -412,7 +397,7 @@ func TestIntegrationDashboardInheritedFolderRBAC(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.desc, func(t *testing.T) {
-			dashboardReadStore, err := ProvideDashboardStore(sqlStore, sqlStore.Cfg, tc.features, tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotatest.New(false, nil))
+			dashboardReadStore, err := ProvideDashboardStore(sqlStore, sqlStore.Cfg, tc.features, tagimpl.ProvideService(sqlStore), quotatest.New(false, nil))
 			require.NoError(t, err)
 
 			viewer.Permissions = map[int64]map[string][]string{viewer.OrgID: tc.permissions}
@@ -440,7 +425,7 @@ func moveDashboard(t *testing.T, dashboardStore dashboards.Store, orgId int64, d
 
 	cmd := dashboards.SaveDashboardCommand{
 		OrgID:     orgId,
-		FolderID:  newFolderId,
+		FolderID:  newFolderId, // nolint:staticcheck
 		FolderUID: newFolderUID,
 		Dashboard: dashboard,
 		Overwrite: true,
@@ -450,3 +435,28 @@ func moveDashboard(t *testing.T, dashboardStore dashboards.Store, orgId int64, d
 
 	return dash
 }
+
+func createUser(t *testing.T, sqlStore *sqlstore.SQLStore, name string, role string, isAdmin bool) user.User {
+	t.Helper()
+	sqlStore.Cfg.AutoAssignOrg = true
+	sqlStore.Cfg.AutoAssignOrgId = 1
+	sqlStore.Cfg.AutoAssignOrgRole = role
+
+	qs := quotaimpl.ProvideService(sqlStore, sqlStore.Cfg)
+	orgService, err := orgimpl.ProvideService(sqlStore, sqlStore.Cfg, qs)
+	require.NoError(t, err)
+	usrSvc, err := userimpl.ProvideService(sqlStore, orgService, sqlStore.Cfg, nil, nil, qs, supportbundlestest.NewFakeBundleService())
+	require.NoError(t, err)
+
+	o, err := orgService.CreateWithMember(context.Background(), &org.CreateOrgCommand{Name: fmt.Sprintf("test org %d", time.Now().UnixNano())})
+	require.NoError(t, err)
+
+	currentUserCmd := user.CreateUserCommand{Login: name, Email: name + "@test.com", Name: "a " + name, IsAdmin: isAdmin, OrgID: o.ID}
+	currentUser, err := usrSvc.Create(context.Background(), &currentUserCmd)
+	require.NoError(t, err)
+	orgs, err := orgService.GetUserOrgList(context.Background(), &org.GetUserOrgListQuery{UserID: currentUser.ID})
+	require.NoError(t, err)
+	require.Equal(t, org.RoleType(role), orgs[0].Role)
+	require.Equal(t, o.ID, orgs[0].OrgID)
+	return *currentUser
+}
diff --git a/pkg/services/dashboards/database/database_provisioning_test.go b/pkg/services/dashboards/database/database_provisioning_test.go
index 8baca27e87621..4415cd77bec24 100644
--- a/pkg/services/dashboards/database/database_provisioning_test.go
+++ b/pkg/services/dashboards/database/database_provisioning_test.go
@@ -20,12 +20,11 @@ func TestIntegrationDashboardProvisioningTest(t *testing.T) {
 	}
 	sqlStore := db.InitTestDB(t)
 	quotaService := quotatest.New(false, nil)
-	dashboardStore, err := ProvideDashboardStore(sqlStore, sqlStore.Cfg, testFeatureToggles, tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
+	dashboardStore, err := ProvideDashboardStore(sqlStore, sqlStore.Cfg, testFeatureToggles, tagimpl.ProvideService(sqlStore), quotaService)
 	require.NoError(t, err)
 
 	folderCmd := dashboards.SaveDashboardCommand{
 		OrgID:     1,
-		FolderID:  0,
 		FolderUID: "",
 		IsFolder:  true,
 		Dashboard: simplejson.NewFromAny(map[string]any{
@@ -40,11 +39,10 @@ func TestIntegrationDashboardProvisioningTest(t *testing.T) {
 	saveDashboardCmd := dashboards.SaveDashboardCommand{
 		OrgID:     1,
 		IsFolder:  false,
-		FolderID:  dash.ID,
 		FolderUID: dash.UID,
 		Dashboard: simplejson.NewFromAny(map[string]any{
 			"id":    nil,
-			"title": "test dashboard",
+			"title": "test dashboard 2",
 		}),
 	}
 
@@ -67,7 +65,6 @@ func TestIntegrationDashboardProvisioningTest(t *testing.T) {
 			saveCmd := dashboards.SaveDashboardCommand{
 				OrgID:     1,
 				IsFolder:  false,
-				FolderID:  dash.ID,
 				FolderUID: dash.UID,
 				Dashboard: simplejson.NewFromAny(map[string]any{
 					"id":    nil,
diff --git a/pkg/services/dashboards/database/database_test.go b/pkg/services/dashboards/database/database_test.go
index 822cdc12acfd4..2bf380956f320 100644
--- a/pkg/services/dashboards/database/database_test.go
+++ b/pkg/services/dashboards/database/database_test.go
@@ -3,7 +3,6 @@ package database
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"testing"
 	"time"
@@ -27,12 +26,19 @@ import (
 	"github.com/grafana/grafana/pkg/services/search/model"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/services/sqlstore/searchstore"
+	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
 	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 	"github.com/grafana/grafana/pkg/util"
 )
 
+// run tests with cleanup
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationDashboardDataAccess(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
@@ -46,8 +52,13 @@ func TestIntegrationDashboardDataAccess(t *testing.T) {
 		sqlStore, cfg = db.InitTestDBwithCfg(t)
 		quotaService := quotatest.New(false, nil)
 		var err error
-		dashboardStore, err = ProvideDashboardStore(sqlStore, cfg, testFeatureToggles, tagimpl.ProvideService(sqlStore, cfg), quotaService)
+		dashboardStore, err = ProvideDashboardStore(sqlStore, cfg, testFeatureToggles, tagimpl.ProvideService(sqlStore), quotaService)
 		require.NoError(t, err)
+		// insertTestDashboard creates the following hierarchy:
+		// 1 test dash folder
+		//   test dash 23
+		//   test dash 45
+		// test dash 67
 		savedFolder = insertTestDashboard(t, dashboardStore, "1 test dash folder", 1, 0, "", true, "prod", "webapp")
 		savedDash = insertTestDashboard(t, dashboardStore, "test dash 23", 1, savedFolder.ID, savedFolder.UID, false, "prod", "webapp")
 		insertTestDashboard(t, dashboardStore, "test dash 45", 1, savedFolder.ID, savedFolder.UID, false, "prod")
@@ -61,14 +72,14 @@ func TestIntegrationDashboardDataAccess(t *testing.T) {
 		require.Equal(t, savedDash.Slug, "test-dash-23")
 		require.NotEqual(t, savedDash.ID, 0)
 		require.False(t, savedDash.IsFolder)
-		require.Positive(t, savedDash.FolderID)
+		require.NotEmpty(t, savedDash.FolderUID)
 		require.Positive(t, len(savedDash.UID))
 
 		require.Equal(t, savedFolder.Title, "1 test dash folder")
 		require.Equal(t, savedFolder.Slug, "1-test-dash-folder")
 		require.NotEqual(t, savedFolder.ID, 0)
 		require.True(t, savedFolder.IsFolder)
-		require.EqualValues(t, savedFolder.FolderID, 0)
+		require.Empty(t, savedFolder.FolderUID)
 		require.Positive(t, len(savedFolder.UID))
 	})
 
@@ -89,45 +100,56 @@ func TestIntegrationDashboardDataAccess(t *testing.T) {
 		require.False(t, queryResult.IsFolder)
 	})
 
-	t.Run("Should be able to get dashboard by title and folderID", func(t *testing.T) {
+	t.Run("Should not be able to get dashboard by title alone", func(t *testing.T) {
 		setup()
 		query := dashboards.GetDashboardQuery{
-			Title:    util.Pointer("test dash 23"),
-			FolderID: &savedFolder.ID,
-			OrgID:    1,
+			Title: util.Pointer("test dash 23"),
+			OrgID: 1,
 		}
 
-		queryResult, err := dashboardStore.GetDashboard(context.Background(), &query)
-		require.NoError(t, err)
-
-		require.Equal(t, queryResult.Title, "test dash 23")
-		require.Equal(t, queryResult.Slug, "test-dash-23")
-		require.Equal(t, queryResult.ID, savedDash.ID)
-		require.Equal(t, queryResult.UID, savedDash.UID)
-		require.False(t, queryResult.IsFolder)
+		_, err := dashboardStore.GetDashboard(context.Background(), &query)
+		require.ErrorIs(t, err, dashboards.ErrDashboardIdentifierNotSet)
 	})
 
-	t.Run("Should not be able to get dashboard by title alone", func(t *testing.T) {
+	t.Run("Should be able to get root dashboard by title", func(t *testing.T) {
 		setup()
 		query := dashboards.GetDashboardQuery{
-			Title: util.Pointer("test dash 23"),
-			OrgID: 1,
+			Title:     util.Pointer("test dash 67"),
+			FolderUID: util.Pointer(""),
+			OrgID:     1,
 		}
 
 		_, err := dashboardStore.GetDashboard(context.Background(), &query)
-		require.ErrorIs(t, err, dashboards.ErrDashboardIdentifierNotSet)
+		require.Error(t, err)
 	})
 
-	t.Run("Folder=0 should not be able to get a dashboard in a folder", func(t *testing.T) {
+	t.Run("Should be able to get dashboard by title and folderID", func(t *testing.T) {
 		setup()
 		query := dashboards.GetDashboardQuery{
 			Title:    util.Pointer("test dash 23"),
-			FolderID: util.Pointer(int64(0)),
+			FolderID: &savedDash.ID,
 			OrgID:    1,
 		}
 
 		_, err := dashboardStore.GetDashboard(context.Background(), &query)
-		require.ErrorIs(t, err, dashboards.ErrDashboardNotFound)
+		require.Error(t, err)
+	})
+
+	t.Run("Should be able to get dashboard by title and folderUID", func(t *testing.T) {
+		setup()
+		query := dashboards.GetDashboardQuery{
+			Title:     util.Pointer("test dash 23"),
+			FolderUID: util.Pointer(savedFolder.UID),
+			OrgID:     1,
+		}
+		queryResult, err := dashboardStore.GetDashboard(context.Background(), &query)
+		require.NoError(t, err)
+
+		require.Equal(t, queryResult.Title, "test dash 23")
+		require.Equal(t, queryResult.Slug, "test-dash-23")
+		require.Equal(t, queryResult.ID, savedDash.ID)
+		require.Equal(t, queryResult.UID, savedDash.UID)
+		require.False(t, queryResult.IsFolder)
 	})
 
 	t.Run("Should be able to get dashboard by uid", func(t *testing.T) {
@@ -165,6 +187,18 @@ func TestIntegrationDashboardDataAccess(t *testing.T) {
 		require.Equal(t, err, dashboards.ErrDashboardIdentifierNotSet)
 	})
 
+	t.Run("Folder=0 should not be able to get a dashboard in a folder", func(t *testing.T) {
+		setup()
+		query := dashboards.GetDashboardQuery{
+			Title:     util.Pointer("test dash 23"),
+			FolderUID: util.Pointer(""),
+			OrgID:     1,
+		}
+
+		_, err := dashboardStore.GetDashboard(context.Background(), &query)
+		require.Error(t, err, dashboards.ErrDashboardNotFound)
+	})
+
 	t.Run("Should be able to get dashboards by IDs & UIDs", func(t *testing.T) {
 		setup()
 		query := dashboards.GetDashboardsQuery{DashboardIDs: []int64{savedDash.ID, savedDash2.ID}}
@@ -217,12 +251,12 @@ func TestIntegrationDashboardDataAccess(t *testing.T) {
 				"tags":  []interface{}{},
 			}),
 			Overwrite: true,
-			FolderID:  2,
+			FolderUID: "2",
 			UserID:    100,
 		}
 		dash, err := dashboardStore.SaveDashboard(context.Background(), cmd)
 		require.NoError(t, err)
-		require.EqualValues(t, dash.FolderID, 2)
+		require.EqualValues(t, dash.FolderUID, "2")
 
 		cmd = dashboards.SaveDashboardCommand{
 			OrgID: 1,
@@ -231,7 +265,7 @@ func TestIntegrationDashboardDataAccess(t *testing.T) {
 				"title": "folderId",
 				"tags":  []interface{}{},
 			}),
-			FolderID:  0,
+			FolderUID: "",
 			Overwrite: true,
 			UserID:    100,
 		}
@@ -245,7 +279,7 @@ func TestIntegrationDashboardDataAccess(t *testing.T) {
 
 		queryResult, err := dashboardStore.GetDashboard(context.Background(), &query)
 		require.NoError(t, err)
-		require.Equal(t, queryResult.FolderID, int64(0))
+		require.Equal(t, queryResult.FolderUID, "")
 		require.Equal(t, queryResult.CreatedBy, savedDash.CreatedBy)
 		require.WithinDuration(t, queryResult.Created, savedDash.Created, 3*time.Second)
 		require.Equal(t, queryResult.UpdatedBy, int64(100))
@@ -261,45 +295,6 @@ func TestIntegrationDashboardDataAccess(t *testing.T) {
 		require.NoError(t, err)
 	})
 
-	t.Run("Should be not able to delete a dashboard if force delete rules is disabled", func(t *testing.T) {
-		setup()
-		deleteCmd := &dashboards.DeleteDashboardCommand{ID: savedFolder.ID, ForceDeleteFolderRules: false}
-		err := dashboardStore.DeleteDashboard(context.Background(), deleteCmd)
-		require.True(t, errors.Is(err, dashboards.ErrFolderContainsAlertRules))
-	})
-
-	t.Run("Should be able to delete a dashboard folder and its children if force delete rules is enabled", func(t *testing.T) {
-		setup()
-		deleteCmd := &dashboards.DeleteDashboardCommand{ID: savedFolder.ID, ForceDeleteFolderRules: true}
-		err := dashboardStore.DeleteDashboard(context.Background(), deleteCmd)
-		require.NoError(t, err)
-
-		query := dashboards.FindPersistedDashboardsQuery{
-			OrgId:        1,
-			FolderIds:    []int64{savedFolder.ID},
-			SignedInUser: &user.SignedInUser{},
-		}
-
-		res, err := dashboardStore.FindDashboards(context.Background(), &query)
-		require.NoError(t, err)
-		require.Equal(t, len(res), 0)
-
-		err = sqlStore.WithDbSession(context.Background(), func(sess *db.Session) error {
-			var existingRuleID int64
-			exists, err := sess.Table("alert_rule").Where("namespace_uid = (SELECT uid FROM dashboard WHERE id = ?)", savedFolder.ID).Cols("id").Get(&existingRuleID)
-			require.NoError(t, err)
-			require.False(t, exists)
-
-			var existingRuleVersionID int64
-			exists, err = sess.Table("alert_rule_version").Where("rule_namespace_uid = (SELECT uid FROM dashboard WHERE id = ?)", savedFolder.ID).Cols("id").Get(&existingRuleVersionID)
-			require.NoError(t, err)
-			require.False(t, exists)
-
-			return nil
-		})
-		require.NoError(t, err)
-	})
-
 	t.Run("Should return error if no dashboard is found for update when dashboard id is greater than zero", func(t *testing.T) {
 		cmd := dashboards.SaveDashboardCommand{
 			OrgID:     1,
@@ -434,8 +429,8 @@ func TestIntegrationDashboardDataAccess(t *testing.T) {
 	t.Run("Should be able to find a dashboard folder's children", func(t *testing.T) {
 		setup()
 		query := dashboards.FindPersistedDashboardsQuery{
-			OrgId:     1,
-			FolderIds: []int64{savedFolder.ID},
+			OrgId:      1,
+			FolderUIDs: []string{savedFolder.UID},
 			SignedInUser: &user.SignedInUser{
 				OrgID:   1,
 				OrgRole: org.RoleEditor,
@@ -452,7 +447,6 @@ func TestIntegrationDashboardDataAccess(t *testing.T) {
 		hit := hits[0]
 		require.Equal(t, hit.ID, savedDash.ID)
 		require.Equal(t, hit.URL, fmt.Sprintf("/d/%s/%s", savedDash.UID, savedDash.Slug))
-		require.Equal(t, hit.FolderID, savedFolder.ID)
 		require.Equal(t, hit.FolderUID, savedFolder.UID)
 		require.Equal(t, hit.FolderTitle, savedFolder.Title)
 		require.Equal(t, hit.FolderURL, fmt.Sprintf("/dashboards/f/%s/%s", savedFolder.UID, savedFolder.Slug))
@@ -479,7 +473,6 @@ func TestIntegrationDashboardDataAccess(t *testing.T) {
 		hit := hits[0]
 		require.Equal(t, hit.ID, savedDash.ID)
 		require.Equal(t, hit.URL, fmt.Sprintf("/d/%s/%s", savedDash.UID, savedDash.Slug))
-		require.Equal(t, hit.FolderID, savedFolder.ID)
 		require.Equal(t, hit.FolderUID, savedFolder.UID)
 		require.Equal(t, hit.FolderTitle, savedFolder.Title)
 		require.Equal(t, hit.FolderURL, fmt.Sprintf("/dashboards/f/%s/%s", savedFolder.UID, savedFolder.Slug))
@@ -513,15 +506,15 @@ func TestIntegrationDashboardDataAccess(t *testing.T) {
 	t.Run("Can count dashboards by parent folder", func(t *testing.T) {
 		setup()
 		// setup() saves one dashboard in the general folder and two in the "savedFolder".
-		count, err := dashboardStore.CountDashboardsInFolder(
+		count, err := dashboardStore.CountDashboardsInFolders(
 			context.Background(),
-			&dashboards.CountDashboardsInFolderRequest{FolderID: 0, OrgID: 1})
+			&dashboards.CountDashboardsInFolderRequest{FolderUIDs: []string{""}, OrgID: 1})
 		require.NoError(t, err)
 		require.Equal(t, int64(1), count)
 
-		count, err = dashboardStore.CountDashboardsInFolder(
+		count, err = dashboardStore.CountDashboardsInFolders(
 			context.Background(),
-			&dashboards.CountDashboardsInFolderRequest{FolderID: savedFolder.ID, OrgID: 1})
+			&dashboards.CountDashboardsInFolderRequest{FolderUIDs: []string{savedFolder.UID}, OrgID: 1})
 		require.NoError(t, err)
 		require.Equal(t, int64(2), count)
 	})
@@ -532,15 +525,15 @@ func TestIntegrationDashboardDataAccess(t *testing.T) {
 		_ = insertTestDashboard(t, dashboardStore, "delete me 1", 1, folder.ID, folder.UID, false, "delete this 1")
 		_ = insertTestDashboard(t, dashboardStore, "delete me 2", 1, folder.ID, folder.UID, false, "delete this 2")
 
-		err := dashboardStore.DeleteDashboardsInFolder(
+		err := dashboardStore.DeleteDashboardsInFolders(
 			context.Background(),
 			&dashboards.DeleteDashboardsInFolderRequest{
-				FolderUID: folder.UID,
-				OrgID:     1,
+				FolderUIDs: []string{folder.UID},
+				OrgID:      1,
 			})
 		require.NoError(t, err)
 
-		count, err := dashboardStore.CountDashboardsInFolder(context.Background(), &dashboards.CountDashboardsInFolderRequest{FolderID: 2, OrgID: 1})
+		count, err := dashboardStore.CountDashboardsInFolders(context.Background(), &dashboards.CountDashboardsInFolderRequest{FolderUIDs: []string{folder.UID}, OrgID: 1})
 		require.NoError(t, err)
 		require.Equal(t, count, int64(0))
 	})
@@ -551,16 +544,15 @@ func TestIntegrationDashboardDataAccessGivenPluginWithImportedDashboards(t *test
 		t.Skip("skipping integration test")
 	}
 	sqlStore := db.InitTestDB(t)
-	cfg := setting.NewCfg()
-	cfg.IsFeatureToggleEnabled = func(key string) bool { return false }
 	quotaService := quotatest.New(false, nil)
-	dashboardStore, err := ProvideDashboardStore(sqlStore, &setting.Cfg{}, testFeatureToggles, tagimpl.ProvideService(sqlStore, cfg), quotaService)
+	dashboardStore, err := ProvideDashboardStore(sqlStore, &setting.Cfg{}, testFeatureToggles, tagimpl.ProvideService(sqlStore), quotaService)
 	require.NoError(t, err)
 	pluginId := "test-app"
 
-	appFolder := insertTestDashboardForPlugin(t, dashboardStore, "app-test", 1, 0, true, pluginId)
-	insertTestDashboardForPlugin(t, dashboardStore, "app-dash1", 1, appFolder.ID, false, pluginId)
-	insertTestDashboardForPlugin(t, dashboardStore, "app-dash2", 1, appFolder.ID, false, pluginId)
+	insertTestDashboardForPlugin(t, dashboardStore, "app-test", 1, "", true, pluginId)
+	insertTestDashboardForPlugin(t, dashboardStore, "app-test", 1, "", true, pluginId)
+	insertTestDashboardForPlugin(t, dashboardStore, "app-dash1", 1, "", false, pluginId)
+	insertTestDashboardForPlugin(t, dashboardStore, "app-dash2", 1, "", false, pluginId)
 
 	query := dashboards.GetDashboardsByPluginIDQuery{
 		PluginID: pluginId,
@@ -577,10 +569,8 @@ func TestIntegrationDashboard_SortingOptions(t *testing.T) {
 		t.Skip("skipping integration test")
 	}
 	sqlStore := db.InitTestDB(t)
-	cfg := setting.NewCfg()
-	cfg.IsFeatureToggleEnabled = func(key string) bool { return false }
 	quotaService := quotatest.New(false, nil)
-	dashboardStore, err := ProvideDashboardStore(sqlStore, &setting.Cfg{}, testFeatureToggles, tagimpl.ProvideService(sqlStore, cfg), quotaService)
+	dashboardStore, err := ProvideDashboardStore(sqlStore, &setting.Cfg{}, testFeatureToggles, tagimpl.ProvideService(sqlStore), quotaService)
 	require.NoError(t, err)
 
 	dashB := insertTestDashboard(t, dashboardStore, "Beta", 1, 0, "", false)
@@ -631,9 +621,8 @@ func TestIntegrationDashboard_Filter(t *testing.T) {
 	}
 	sqlStore := db.InitTestDB(t)
 	cfg := setting.NewCfg()
-	cfg.IsFeatureToggleEnabled = func(key string) bool { return false }
 	quotaService := quotatest.New(false, nil)
-	dashboardStore, err := ProvideDashboardStore(sqlStore, cfg, testFeatureToggles, tagimpl.ProvideService(sqlStore, cfg), quotaService)
+	dashboardStore, err := ProvideDashboardStore(sqlStore, cfg, testFeatureToggles, tagimpl.ProvideService(sqlStore), quotaService)
 	require.NoError(t, err)
 	insertTestDashboard(t, dashboardStore, "Alfa", 1, 0, "", false)
 	dashB := insertTestDashboard(t, dashboardStore, "Beta", 1, 0, "", false)
@@ -676,9 +665,8 @@ func TestIntegrationDashboard_Filter(t *testing.T) {
 func TestGetExistingDashboardByTitleAndFolder(t *testing.T) {
 	sqlStore := db.InitTestDB(t)
 	cfg := setting.NewCfg()
-	cfg.IsFeatureToggleEnabled = func(key string) bool { return false }
 	quotaService := quotatest.New(false, nil)
-	dashboardStore, err := ProvideDashboardStore(sqlStore, cfg, testFeatureToggles, tagimpl.ProvideService(sqlStore, cfg), quotaService)
+	dashboardStore, err := ProvideDashboardStore(sqlStore, cfg, testFeatureToggles, tagimpl.ProvideService(sqlStore), quotaService)
 	require.NoError(t, err)
 	insertTestDashboard(t, dashboardStore, "Apple", 1, 0, "", false)
 	t.Run("Finds a dashboard with existing name in root directory and throws DashboardWithSameNameInFolderExists error", func(t *testing.T) {
@@ -701,7 +689,7 @@ func TestGetExistingDashboardByTitleAndFolder(t *testing.T) {
 		savedFolder := insertTestDashboard(t, dashboardStore, "test dash folder", 1, 0, "", true, "prod", "webapp")
 		savedDash := insertTestDashboard(t, dashboardStore, "test dash", 1, savedFolder.ID, savedFolder.UID, false, "prod", "webapp")
 		err = sqlStore.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
-			_, err = getExistingDashboardByTitleAndFolder(sess, &dashboards.Dashboard{Title: savedDash.Title, FolderID: savedFolder.ID, OrgID: 1}, sqlStore.GetDialect(), false, false)
+			_, err = getExistingDashboardByTitleAndFolder(sess, &dashboards.Dashboard{Title: savedDash.Title, FolderUID: savedFolder.UID, OrgID: 1}, sqlStore.GetDialect(), false, false)
 			return err
 		})
 		require.ErrorIs(t, err, dashboards.ErrDashboardWithSameNameInFolderExists)
@@ -715,10 +703,9 @@ func TestIntegrationFindDashboardsByTitle(t *testing.T) {
 
 	sqlStore := db.InitTestDB(t)
 	cfg := setting.NewCfg()
-	cfg.IsFeatureToggleEnabled = func(key string) bool { return false }
 	quotaService := quotatest.New(false, nil)
 	features := featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders, featuremgmt.FlagPanelTitleSearch)
-	dashboardStore, err := ProvideDashboardStore(sqlStore, cfg, features, tagimpl.ProvideService(sqlStore, cfg), quotaService)
+	dashboardStore, err := ProvideDashboardStore(sqlStore, cfg, features, tagimpl.ProvideService(sqlStore), quotaService)
 	require.NoError(t, err)
 
 	orgID := int64(1)
@@ -726,7 +713,7 @@ func TestIntegrationFindDashboardsByTitle(t *testing.T) {
 
 	ac := acimpl.ProvideAccessControl(sqlStore.Cfg)
 	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
-	folderServiceWithFlagOn := folderimpl.ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), sqlStore.Cfg, dashboardStore, folderStore, sqlStore, features)
+	folderServiceWithFlagOn := folderimpl.ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), sqlStore.Cfg, dashboardStore, folderStore, sqlStore, features, supportbundlestest.NewFakeBundleService(), nil)
 
 	user := &user.SignedInUser{
 		OrgID: 1,
@@ -756,7 +743,8 @@ func TestIntegrationFindDashboardsByTitle(t *testing.T) {
 		SignedInUser: user,
 	})
 	require.NoError(t, err)
-	insertTestDashboard(t, dashboardStore, "dashboard under f0", orgID, f0.ID, f0.UID, false)
+
+	insertTestDashboard(t, dashboardStore, "dashboard under f0", orgID, 0, f0.UID, false)
 
 	subfolder, err := folderServiceWithFlagOn.Create(context.Background(), &folder.CreateFolderCommand{
 		OrgID:        orgID,
@@ -765,7 +753,8 @@ func TestIntegrationFindDashboardsByTitle(t *testing.T) {
 		SignedInUser: user,
 	})
 	require.NoError(t, err)
-	insertTestDashboard(t, dashboardStore, "dashboard under subfolder", orgID, subfolder.ID, subfolder.UID, false)
+
+	insertTestDashboard(t, dashboardStore, "dashboard under subfolder", orgID, 0, subfolder.UID, false)
 
 	type res struct {
 		title       string
@@ -798,7 +787,7 @@ func TestIntegrationFindDashboardsByTitle(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.desc, func(t *testing.T) {
-			dashboardStore, err := ProvideDashboardStore(sqlStore, cfg, features, tagimpl.ProvideService(sqlStore, cfg), quotaService)
+			dashboardStore, err := ProvideDashboardStore(sqlStore, cfg, features, tagimpl.ProvideService(sqlStore), quotaService)
 			require.NoError(t, err)
 			res, err := dashboardStore.FindDashboards(context.Background(), &dashboards.FindPersistedDashboardsQuery{
 				SignedInUser: user,
@@ -831,10 +820,9 @@ func TestIntegrationFindDashboardsByFolder(t *testing.T) {
 
 	sqlStore := db.InitTestDB(t)
 	cfg := setting.NewCfg()
-	cfg.IsFeatureToggleEnabled = func(key string) bool { return false }
 	quotaService := quotatest.New(false, nil)
 	features := featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders, featuremgmt.FlagPanelTitleSearch)
-	dashboardStore, err := ProvideDashboardStore(sqlStore, cfg, features, tagimpl.ProvideService(sqlStore, cfg), quotaService)
+	dashboardStore, err := ProvideDashboardStore(sqlStore, cfg, features, tagimpl.ProvideService(sqlStore), quotaService)
 	require.NoError(t, err)
 
 	orgID := int64(1)
@@ -842,7 +830,7 @@ func TestIntegrationFindDashboardsByFolder(t *testing.T) {
 
 	ac := acimpl.ProvideAccessControl(sqlStore.Cfg)
 	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
-	folderServiceWithFlagOn := folderimpl.ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), sqlStore.Cfg, dashboardStore, folderStore, sqlStore, features)
+	folderServiceWithFlagOn := folderimpl.ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), sqlStore.Cfg, dashboardStore, folderStore, sqlStore, features, supportbundlestest.NewFakeBundleService(), nil)
 
 	user := &user.SignedInUser{
 		OrgID: 1,
@@ -872,6 +860,7 @@ func TestIntegrationFindDashboardsByFolder(t *testing.T) {
 		SignedInUser: user,
 	})
 	require.NoError(t, err)
+	// nolint:staticcheck
 	insertTestDashboard(t, dashboardStore, "dashboard under f0", orgID, f0.ID, f0.UID, false)
 
 	f1, err := folderServiceWithFlagOn.Create(context.Background(), &folder.CreateFolderCommand{
@@ -880,6 +869,7 @@ func TestIntegrationFindDashboardsByFolder(t *testing.T) {
 		SignedInUser: user,
 	})
 	require.NoError(t, err)
+	// nolint:staticcheck
 	insertTestDashboard(t, dashboardStore, "dashboard under f1", orgID, f1.ID, f1.UID, false)
 
 	subfolder, err := folderServiceWithFlagOn.Create(context.Background(), &folder.CreateFolderCommand{
@@ -897,50 +887,14 @@ func TestIntegrationFindDashboardsByFolder(t *testing.T) {
 	}
 
 	testCases := []struct {
-		desc           string
+		desc string
+		// Deprecated: use FolderUID instead
 		folderIDs      []int64
 		folderUIDs     []string
 		query          string
 		expectedResult map[string][]res
 		typ            string
 	}{
-		{
-			desc:      "find dashboard under general using folder id",
-			folderIDs: []int64{0},
-			typ:       searchstore.TypeDashboard,
-			expectedResult: map[string][]res{
-				"":                            {{title: "dashboard under general"}},
-				featuremgmt.FlagNestedFolders: {{title: "dashboard under general"}},
-			},
-		},
-		{
-			desc:      "find dashboard under general using folder id",
-			folderIDs: []int64{0},
-			typ:       searchstore.TypeDashboard,
-			expectedResult: map[string][]res{
-				"":                            {{title: "dashboard under general"}},
-				featuremgmt.FlagNestedFolders: {{title: "dashboard under general"}},
-			},
-		},
-		{
-			desc:      "find dashboard under f0 using folder id",
-			folderIDs: []int64{f0.ID},
-			typ:       searchstore.TypeDashboard,
-			expectedResult: map[string][]res{
-				"": {{title: "dashboard under f0", folderUID: f0.UID, folderTitle: f0.Title}},
-			},
-		},
-		{
-			desc:      "find dashboard under f0 or f1 using folder id",
-			folderIDs: []int64{f0.ID, f1.ID},
-			typ:       searchstore.TypeDashboard,
-			expectedResult: map[string][]res{
-				"": {{title: "dashboard under f0", folderUID: f0.UID, folderTitle: f0.Title},
-					{title: "dashboard under f1", folderUID: f1.UID, folderTitle: f1.Title}},
-				featuremgmt.FlagNestedFolders: {{title: "dashboard under f0", folderUID: f0.UID, folderTitle: f0.Title},
-					{title: "dashboard under f1", folderUID: f1.UID, folderTitle: f1.Title}},
-			},
-		},
 		{
 			desc:       "find dashboard under general using folder UID",
 			folderUIDs: []string{folder.GeneralFolderUID},
@@ -979,30 +933,6 @@ func TestIntegrationFindDashboardsByFolder(t *testing.T) {
 					{title: "dashboard under f1", folderUID: f1.UID, folderTitle: f1.Title}},
 			},
 		},
-		{
-			desc:      "find dashboard under general or f0 using folder id",
-			folderIDs: []int64{0, f0.ID},
-			typ:       searchstore.TypeDashboard,
-			expectedResult: map[string][]res{
-				"": {{title: "dashboard under f0", folderUID: f0.UID, folderTitle: f0.Title},
-					{title: "dashboard under general"}},
-				featuremgmt.FlagNestedFolders: {{title: "dashboard under f0", folderUID: f0.UID, folderTitle: f0.Title},
-					{title: "dashboard under general"}},
-			},
-		},
-		{
-			desc:      "find dashboard under general or f0 or f1 using folder id",
-			folderIDs: []int64{0, f0.ID, f1.ID},
-			typ:       searchstore.TypeDashboard,
-			expectedResult: map[string][]res{
-				"": {{title: "dashboard under f0", folderUID: f0.UID, folderTitle: f0.Title},
-					{title: "dashboard under f1", folderUID: f1.UID, folderTitle: f1.Title},
-					{title: "dashboard under general"}},
-				featuremgmt.FlagNestedFolders: {{title: "dashboard under f0", folderUID: f0.UID, folderTitle: f0.Title},
-					{title: "dashboard under f1", folderUID: f1.UID, folderTitle: f1.Title},
-					{title: "dashboard under general"}},
-			},
-		},
 		{
 			desc:       "find dashboard under general or f0 using folder UID",
 			folderUIDs: []string{folder.GeneralFolderUID, f0.UID},
@@ -1041,12 +971,11 @@ func TestIntegrationFindDashboardsByFolder(t *testing.T) {
 	for _, tc := range testCases {
 		for featureFlags := range tc.expectedResult {
 			t.Run(fmt.Sprintf("%s with featureFlags: %v", tc.desc, featureFlags), func(t *testing.T) {
-				dashboardStore, err := ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(featureFlags), tagimpl.ProvideService(sqlStore, cfg), quotaService)
+				dashboardStore, err := ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(featureFlags), tagimpl.ProvideService(sqlStore), quotaService)
 				require.NoError(t, err)
 				res, err := dashboardStore.FindDashboards(context.Background(), &dashboards.FindPersistedDashboardsQuery{
 					SignedInUser: user,
 					Type:         tc.typ,
-					FolderIds:    tc.folderIDs,
 					FolderUIDs:   tc.folderUIDs,
 				})
 				require.NoError(t, err)
@@ -1148,7 +1077,7 @@ func insertTestDashboard(t *testing.T, dashboardStore dashboards.Store, title st
 	t.Helper()
 	cmd := dashboards.SaveDashboardCommand{
 		OrgID:     orgId,
-		FolderID:  folderId,
+		FolderID:  folderId, // nolint:staticcheck
 		FolderUID: folderUID,
 		IsFolder:  isFolder,
 		Dashboard: simplejson.NewFromAny(map[string]interface{}{
@@ -1166,12 +1095,12 @@ func insertTestDashboard(t *testing.T, dashboardStore dashboards.Store, title st
 }
 
 func insertTestDashboardForPlugin(t *testing.T, dashboardStore dashboards.Store, title string, orgId int64,
-	folderId int64, isFolder bool, pluginId string) *dashboards.Dashboard {
+	folderUID string, isFolder bool, pluginId string) *dashboards.Dashboard {
 	t.Helper()
 	cmd := dashboards.SaveDashboardCommand{
-		OrgID:    orgId,
-		FolderID: folderId,
-		IsFolder: isFolder,
+		OrgID:     orgId,
+		IsFolder:  isFolder,
+		FolderUID: folderUID,
 		Dashboard: simplejson.NewFromAny(map[string]interface{}{
 			"id":    nil,
 			"title": title,
@@ -1185,21 +1114,6 @@ func insertTestDashboardForPlugin(t *testing.T, dashboardStore dashboards.Store,
 	return dash
 }
 
-func updateDashboardACL(t *testing.T, dashboardStore dashboards.Store, dashboardID int64,
-	items ...dashboards.DashboardACL) error {
-	t.Helper()
-
-	var itemPtrs []*dashboards.DashboardACL
-	for _, it := range items {
-		item := it
-		item.Created = time.Now()
-		item.Updated = time.Now()
-		itemPtrs = append(itemPtrs, &item)
-	}
-
-	return dashboardStore.UpdateDashboardACL(context.Background(), dashboardID, itemPtrs)
-}
-
 // testSearchDashboards is a (near) copy of the dashboard service
 // SearchDashboards, which is a wrapper around FindDashboards.
 func testSearchDashboards(d dashboards.Store, query *dashboards.FindPersistedDashboardsQuery) (model.HitList, error) {
@@ -1230,13 +1144,12 @@ func makeQueryResult(query *dashboards.FindPersistedDashboardsQuery, res []dashb
 				URI:         "db/" + item.Slug,
 				URL:         dashboards.GetDashboardFolderURL(item.IsFolder, item.UID, item.Slug),
 				Type:        hitType,
-				FolderID:    item.FolderID,
 				FolderUID:   item.FolderUID,
 				FolderTitle: item.FolderTitle,
 				Tags:        []string{},
 			}
 
-			if item.FolderID > 0 {
+			if item.FolderUID != "" {
 				hit.FolderURL = dashboards.GetFolderURL(item.FolderUID, item.FolderSlug)
 			}
 
diff --git a/pkg/services/dashboards/database/migrations/folder_uid_migrator.go b/pkg/services/dashboards/database/migrations/folder_uid_migrator.go
index 672279e15a4c9..fd1a075c82f16 100644
--- a/pkg/services/dashboards/database/migrations/folder_uid_migrator.go
+++ b/pkg/services/dashboards/database/migrations/folder_uid_migrator.go
@@ -5,6 +5,18 @@ import (
 	"xorm.io/xorm"
 )
 
+type DummyMigration struct {
+	migrator.MigrationBase
+}
+
+func (m *DummyMigration) SQL(dialect migrator.Dialect) string {
+	return "code migration"
+}
+
+func (m *DummyMigration) Exec(sess *xorm.Session, mgrtr *migrator.Migrator) error {
+	return nil
+}
+
 // FolderUIDMigration is a code migration that populates folder_uid column
 type FolderUIDMigration struct {
 	migrator.MigrationBase
@@ -39,11 +51,14 @@ func (m *FolderUIDMigration) Exec(sess *xorm.Session, mgrtr *migrator.Migrator)
 	}
 
 	// for folders the source of truth is the folder table
+	// covered by UQE_folder_org_id_uid
 	q = `UPDATE dashboard
 	SET folder_uid = folder.parent_uid
 	FROM folder
 	WHERE dashboard.uid = folder.uid AND dashboard.org_id = folder.org_id
 	AND dashboard.is_folder = ?`
+
+	// covered by UQE_folder_org_id_uid
 	if mgrtr.Dialect.DriverName() == migrator.MySQL {
 		q = `UPDATE dashboard
 		SET folder_uid = (
@@ -75,7 +90,20 @@ func AddDashboardFolderMigrations(mg *migrator.Migrator) {
 
 	mg.AddMigration("Populate dashboard folder_uid column", &FolderUIDMigration{})
 
-	mg.AddMigration("Add unique index for dashboard_org_id_folder_uid_title", migrator.NewAddIndexMigration(migrator.Table{Name: "dashboard"}, &migrator.Index{
-		Cols: []string{"org_id", "folder_uid", "title"}, Type: migrator.UniqueIndex,
+	mg.AddMigration("Add unique index for dashboard_org_id_folder_uid_title", &DummyMigration{})
+
+	mg.AddMigration("Delete unique index for dashboard_org_id_folder_id_title", migrator.NewDropIndexMigration(migrator.Table{Name: "dashboard"}, &migrator.Index{
+		Cols: []string{"org_id", "folder_id", "title"}, Type: migrator.UniqueIndex,
+	}))
+
+	mg.AddMigration("Delete unique index for dashboard_org_id_folder_uid_title", &DummyMigration{})
+
+	mg.AddMigration("Add unique index for dashboard_org_id_folder_uid_title_is_folder", migrator.NewAddIndexMigration(migrator.Table{Name: "dashboard"}, &migrator.Index{
+		Cols: []string{"org_id", "folder_uid", "title", "is_folder"}, Type: migrator.UniqueIndex,
+	}))
+
+	// Temporary index until decommisioning of folder_id in query
+	mg.AddMigration("Restore index for dashboard_org_id_folder_id_title", migrator.NewAddIndexMigration(migrator.Table{Name: "dashboard"}, &migrator.Index{
+		Cols: []string{"org_id", "folder_id", "title"},
 	}))
 }
diff --git a/pkg/services/dashboards/errors.go b/pkg/services/dashboards/errors.go
index be505679e4853..307f18fc50e86 100644
--- a/pkg/services/dashboards/errors.go
+++ b/pkg/services/dashboards/errors.go
@@ -117,14 +117,13 @@ var (
 		Status:     "not-found",
 	}
 
-	ErrFolderNotFound           = errors.New("folder not found")
-	ErrFolderVersionMismatch    = errors.New("the folder has been changed by someone else")
-	ErrFolderTitleEmpty         = errors.New("folder title cannot be empty")
-	ErrFolderWithSameUIDExists  = errors.New("a folder/dashboard with the same uid already exists")
-	ErrFolderInvalidUID         = errors.New("invalid uid for folder provided")
-	ErrFolderSameNameExists     = errors.New("a folder or dashboard in the general folder with the same name already exists")
-	ErrFolderAccessDenied       = errors.New("access denied to folder")
-	ErrFolderContainsAlertRules = errors.New("folder contains alert rules")
+	ErrFolderNotFound          = errors.New("folder not found")
+	ErrFolderVersionMismatch   = errors.New("the folder has been changed by someone else")
+	ErrFolderTitleEmpty        = errors.New("folder title cannot be empty")
+	ErrFolderWithSameUIDExists = errors.New("a folder/dashboard with the same uid already exists")
+	ErrFolderInvalidUID        = errors.New("invalid uid for folder provided")
+	ErrFolderSameNameExists    = errors.New("a folder with the same name already exists in the current location")
+	ErrFolderAccessDenied      = errors.New("access denied to folder")
 )
 
 // DashboardErr represents a dashboard error.
diff --git a/pkg/services/dashboards/models.go b/pkg/services/dashboards/models.go
index 1a572ca44c1b0..4df6dc95153ba 100644
--- a/pkg/services/dashboards/models.go
+++ b/pkg/services/dashboards/models.go
@@ -5,18 +5,16 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/infra/slugify"
-	"github.com/grafana/grafana/pkg/kinds"
-	"github.com/grafana/grafana/pkg/kinds/dashboard"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/quota"
 	"github.com/grafana/grafana/pkg/services/search/model"
-	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 const RootFolderName = "General"
@@ -41,6 +39,7 @@ type Dashboard struct {
 
 	UpdatedBy int64
 	CreatedBy int64
+	// Deprecated: use FolderUID instead
 	FolderID  int64  `xorm:"folder_id"`
 	FolderUID string `xorm:"folder_uid"`
 	IsFolder  bool
@@ -65,54 +64,6 @@ func (d *Dashboard) SetVersion(version int) {
 	d.Data.Set("version", version)
 }
 
-func (d *Dashboard) ToResource() kinds.GrafanaResource[simplejson.Json, any] {
-	parent := dashboard.NewK8sResource(d.UID, nil)
-	res := kinds.GrafanaResource[simplejson.Json, any]{
-		Kind:       parent.Kind,
-		APIVersion: parent.APIVersion,
-		Metadata: kinds.GrafanaResourceMetadata{
-			Name:              d.UID,
-			Annotations:       make(map[string]string),
-			Labels:            make(map[string]string),
-			CreationTimestamp: v1.NewTime(d.Created),
-			ResourceVersion:   fmt.Sprintf("%d", d.Version),
-		},
-	}
-	if d.Data != nil {
-		copy := &simplejson.Json{}
-		db, _ := d.Data.ToDB()
-		_ = copy.FromDB(db)
-
-		copy.Del("id")
-		copy.Del("version") // ???
-		copy.Del("uid")     // duplicated to name
-		res.Spec = copy
-	}
-
-	d.UpdateSlug()
-	res.Metadata.SetUpdatedTimestamp(&d.Updated)
-	res.Metadata.SetSlug(d.Slug)
-	if d.CreatedBy > 0 {
-		res.Metadata.SetCreatedBy(fmt.Sprintf("user:%d", d.CreatedBy))
-	}
-	if d.UpdatedBy > 0 {
-		res.Metadata.SetUpdatedBy(fmt.Sprintf("user:%d", d.UpdatedBy))
-	}
-	if d.PluginID != "" {
-		res.Metadata.SetOriginInfo(&kinds.ResourceOriginInfo{
-			Name: "plugin",
-			Key:  d.PluginID,
-		})
-	}
-	if d.FolderID > 0 {
-		res.Metadata.SetFolder(fmt.Sprintf("folder:%d", d.FolderID))
-	}
-	if d.IsFolder {
-		res.Kind = "Folder"
-	}
-	return res
-}
-
 // NewDashboard creates a new dashboard
 func NewDashboard(title string) *Dashboard {
 	dash := &Dashboard{}
@@ -186,6 +137,8 @@ func (cmd *SaveDashboardCommand) GetDashboardModel() *Dashboard {
 	dash.OrgID = cmd.OrgID
 	dash.PluginID = cmd.PluginID
 	dash.IsFolder = cmd.IsFolder
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Dashboard).Inc()
+	// nolint:staticcheck
 	dash.FolderID = cmd.FolderID
 	dash.FolderUID = cmd.FolderUID
 	dash.UpdateSlug()
@@ -256,15 +209,6 @@ type SaveDashboardCommand struct {
 	UpdatedAt time.Time
 }
 
-type ValidateDashboardCommand struct {
-	Dashboard string `json:"dashboard" binding:"Required"`
-}
-
-type TrimDashboardCommand struct {
-	Dashboard *simplejson.Json `json:"dashboard" binding:"Required"`
-	Meta      *simplejson.Json `json:"meta"`
-}
-
 type DashboardProvisioning struct {
 	ID          int64 `xorm:"pk autoincr 'id'"`
 	DashboardID int64 `xorm:"dashboard_id"`
@@ -276,6 +220,7 @@ type DashboardProvisioning struct {
 
 type DeleteDashboardCommand struct {
 	ID                     int64
+	UID                    string
 	OrgID                  int64
 	ForceDeleteFolderRules bool
 }
@@ -302,11 +247,13 @@ type DeleteOrphanedProvisionedDashboardsCommand struct {
 //
 // Multiple constraints can be combined.
 type GetDashboardQuery struct {
-	ID       int64
-	UID      string
-	Title    *string
-	FolderID *int64
-	OrgID    int64
+	ID    int64
+	UID   string
+	Title *string
+	// Deprecated: use FolderUID instead
+	FolderID  *int64
+	FolderUID *string
+	OrgID     int64
 }
 
 type DashboardTagCloudItem struct {
@@ -348,12 +295,13 @@ type SaveDashboardDTO struct {
 }
 
 type DashboardSearchProjection struct {
-	ID          int64  `xorm:"id"`
-	UID         string `xorm:"uid"`
-	Title       string
-	Slug        string
-	Term        string
-	IsFolder    bool
+	ID       int64  `xorm:"id"`
+	UID      string `xorm:"uid"`
+	Title    string
+	Slug     string
+	Term     string
+	IsFolder bool
+	// Deprecated: use FolderUID instead
 	FolderID    int64  `xorm:"folder_id"`
 	FolderUID   string `xorm:"folder_uid"`
 	FolderSlug  string
@@ -375,13 +323,14 @@ type CountDashboardsInFolderQuery struct {
 // to the store layer. The FolderID will be replaced with FolderUID when
 // dashboards are updated with parent folder UIDs.
 type CountDashboardsInFolderRequest struct {
-	FolderID int64
-	OrgID    int64
+	FolderUIDs []string
+	OrgID      int64
 }
 
 func FromDashboard(dash *Dashboard) *folder.Folder {
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Dashboard).Inc()
 	return &folder.Folder{
-		ID:        dash.ID,
+		ID:        dash.ID, // nolint:staticcheck
 		UID:       dash.UID,
 		OrgID:     dash.OrgID,
 		Title:     dash.Title,
@@ -396,8 +345,8 @@ func FromDashboard(dash *Dashboard) *folder.Folder {
 }
 
 type DeleteDashboardsInFolderRequest struct {
-	FolderUID string
-	OrgID     int64
+	FolderUIDs []string
+	OrgID      int64
 }
 
 //
@@ -413,7 +362,7 @@ type DashboardACL struct {
 	UserID     int64         `xorm:"user_id"`
 	TeamID     int64         `xorm:"team_id"`
 	Role       *org.RoleType // pointer to be nullable
-	Permission PermissionType
+	Permission dashboardaccess.PermissionType
 
 	Created time.Time
 	Updated time.Time
@@ -422,74 +371,49 @@ type DashboardACL struct {
 func (p DashboardACL) TableName() string { return "dashboard_acl" }
 
 type DashboardACLInfoDTO struct {
-	OrgID       int64  `json:"-" xorm:"org_id"`
-	DashboardID int64  `json:"dashboardId,omitempty" xorm:"dashboard_id"`
-	FolderID    int64  `json:"folderId,omitempty" xorm:"folder_id"`
-	FolderUID   string `json:"folderUid,omitempty" xorm:"folder_uid"`
+	OrgID       int64 `json:"-" xorm:"org_id"`
+	DashboardID int64 `json:"dashboardId,omitempty" xorm:"dashboard_id"`
+	// Deprecated: use FolderUID instead
+	FolderID  int64  `json:"folderId,omitempty" xorm:"folder_id"`
+	FolderUID string `json:"folderUid,omitempty" xorm:"folder_uid"`
 
 	Created time.Time `json:"created"`
 	Updated time.Time `json:"updated"`
 
-	UserID         int64          `json:"userId" xorm:"user_id"`
-	UserLogin      string         `json:"userLogin"`
-	UserEmail      string         `json:"userEmail"`
-	UserAvatarURL  string         `json:"userAvatarUrl" xorm:"user_avatar_url"`
-	TeamID         int64          `json:"teamId" xorm:"team_id"`
-	TeamEmail      string         `json:"teamEmail"`
-	TeamAvatarURL  string         `json:"teamAvatarUrl" xorm:"team_avatar_url"`
-	Team           string         `json:"team"`
-	Role           *org.RoleType  `json:"role,omitempty"`
-	Permission     PermissionType `json:"permission"`
-	PermissionName string         `json:"permissionName"`
-	UID            string         `json:"uid" xorm:"uid"`
-	Title          string         `json:"title"`
-	Slug           string         `json:"slug"`
-	IsFolder       bool           `json:"isFolder"`
-	URL            string         `json:"url" xorm:"url"`
-	Inherited      bool           `json:"inherited"`
-}
-
-func (dto *DashboardACLInfoDTO) hasSameRoleAs(other *DashboardACLInfoDTO) bool {
-	if dto.Role == nil || other.Role == nil {
-		return false
-	}
-
-	return dto.UserID <= 0 && dto.TeamID <= 0 && dto.UserID == other.UserID && dto.TeamID == other.TeamID && *dto.Role == *other.Role
-}
-
-func (dto *DashboardACLInfoDTO) hasSameUserAs(other *DashboardACLInfoDTO) bool {
-	return dto.UserID > 0 && dto.UserID == other.UserID
-}
-
-func (dto *DashboardACLInfoDTO) hasSameTeamAs(other *DashboardACLInfoDTO) bool {
-	return dto.TeamID > 0 && dto.TeamID == other.TeamID
-}
-
-// IsDuplicateOf returns true if other item has same role, same user or same team
-func (dto *DashboardACLInfoDTO) IsDuplicateOf(other *DashboardACLInfoDTO) bool {
-	return dto.hasSameRoleAs(other) || dto.hasSameUserAs(other) || dto.hasSameTeamAs(other)
-}
-
-// QUERIES
-type GetDashboardACLInfoListQuery struct {
-	DashboardID int64
-	OrgID       int64
+	UserID         int64                          `json:"userId" xorm:"user_id"`
+	UserLogin      string                         `json:"userLogin"`
+	UserEmail      string                         `json:"userEmail"`
+	UserAvatarURL  string                         `json:"userAvatarUrl" xorm:"user_avatar_url"`
+	TeamID         int64                          `json:"teamId" xorm:"team_id"`
+	TeamEmail      string                         `json:"teamEmail"`
+	TeamAvatarURL  string                         `json:"teamAvatarUrl" xorm:"team_avatar_url"`
+	Team           string                         `json:"team"`
+	Role           *org.RoleType                  `json:"role,omitempty"`
+	Permission     dashboardaccess.PermissionType `json:"permission"`
+	PermissionName string                         `json:"permissionName"`
+	UID            string                         `json:"uid" xorm:"uid"`
+	Title          string                         `json:"title"`
+	Slug           string                         `json:"slug"`
+	IsFolder       bool                           `json:"isFolder"`
+	URL            string                         `json:"url" xorm:"url"`
+	Inherited      bool                           `json:"inherited"`
 }
 
 type FindPersistedDashboardsQuery struct {
 	Title         string
 	OrgId         int64
-	SignedInUser  *user.SignedInUser
+	SignedInUser  identity.Requester
 	DashboardIds  []int64
 	DashboardUIDs []string
 	Type          string
-	FolderIds     []int64
-	FolderUIDs    []string
-	Tags          []string
-	Limit         int64
-	Page          int64
-	Permission    PermissionType
-	Sort          model.SortOption
+	// Deprecated: use FolderUIDs instead
+	FolderIds  []int64
+	FolderUIDs []string
+	Tags       []string
+	Limit      int64
+	Page       int64
+	Permission dashboardaccess.PermissionType
+	Sort       model.SortOption
 
 	Filters []any
 }
diff --git a/pkg/services/dashboards/models_test.go b/pkg/services/dashboards/models_test.go
index 32f038d4315de..06aeb1eba6094 100644
--- a/pkg/services/dashboards/models_test.go
+++ b/pkg/services/dashboards/models_test.go
@@ -1,10 +1,7 @@
 package dashboards
 
 import (
-	"encoding/json"
-	"fmt"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -66,10 +63,10 @@ func TestSaveDashboardCommand_GetDashboardModel(t *testing.T) {
 		json := simplejson.New()
 		json.Set("title", "test dash")
 
-		cmd := &SaveDashboardCommand{Dashboard: json, FolderID: 1, FolderUID: "1"}
+		cmd := &SaveDashboardCommand{Dashboard: json, FolderUID: "1"}
 		dash := cmd.GetDashboardModel()
 
-		assert.Equal(t, int64(1), dash.FolderID)
+		assert.Equal(t, "1", dash.FolderUID)
 	})
 }
 
@@ -89,53 +86,3 @@ func TestSlugifyTitle(t *testing.T) {
 		})
 	}
 }
-
-func TestResourceConversion(t *testing.T) {
-	body := simplejson.New()
-	body.Set("title", "test dash")
-	body.Set("tags", []string{"hello", "world"})
-
-	dash := NewDashboardFromJson(body)
-	dash.SetUID("TheUID")
-	dash.SetVersion(10)
-	dash.Created = time.UnixMilli(946713600000).UTC()  // 2000-01-01
-	dash.Updated = time.UnixMilli(1262332800000).UTC() // 2010-01-01
-	dash.CreatedBy = 10
-	dash.UpdatedBy = 11
-	dash.PluginID = "plugin-xyz"
-	dash.FolderID = 1234
-	dash.SetID(12345) // should be removed in resource version
-
-	dst := dash.ToResource()
-	require.Equal(t, int64(12345), dash.ID)
-	require.Equal(t, int64(12345), dash.Data.Get("id").MustInt64(0))
-
-	out, err := json.MarshalIndent(dst, "", "  ")
-	require.NoError(t, err)
-	fmt.Printf("%s", string(out))
-	require.JSONEq(t, `{
-		"apiVersion": "v0-0-alpha",
-		"kind": "Dashboard",
-		"metadata": {
-		  "name": "TheUID",
-		  "resourceVersion": "10",
-		  "creationTimestamp": "2000-01-01T08:00:00Z",
-		  "annotations": {
-			"grafana.com/createdBy": "user:10",
-			"grafana.com/folder": "folder:1234",
-			"grafana.com/originKey": "plugin-xyz",
-			"grafana.com/originName": "plugin",
-			"grafana.com/slug": "test-dash",
-			"grafana.com/updatedBy": "user:11",
-			"grafana.com/updatedTimestamp": "2010-01-01T08:00:00Z"
-		  }
-		},
-		"spec": {
-		  "tags": [
-			"hello",
-			"world"
-		  ],
-		  "title": "test dash"
-		}
-	  }`, string(out))
-}
diff --git a/pkg/services/dashboards/service/dashboard_service.go b/pkg/services/dashboards/service/dashboard_service.go
index 6175599b0ddbe..b21b3472d90f2 100644
--- a/pkg/services/dashboards/service/dashboard_service.go
+++ b/pkg/services/dashboards/service/dashboard_service.go
@@ -4,14 +4,20 @@ import (
 	"context"
 	"fmt"
 	"strings"
+	"time"
+
+	"github.com/prometheus/client_golang/prometheus"
+
+	"golang.org/x/exp/slices"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
 
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/folder"
@@ -43,31 +49,31 @@ type DashboardServiceImpl struct {
 	dashboardStore       dashboards.Store
 	folderStore          folder.FolderStore
 	folderService        folder.Service
-	dashAlertExtractor   alerting.DashAlertExtractor
 	features             featuremgmt.FeatureToggles
 	folderPermissions    accesscontrol.FolderPermissionsService
 	dashboardPermissions accesscontrol.DashboardPermissionsService
 	ac                   accesscontrol.AccessControl
+	metrics              *dashboardsMetrics
 }
 
 // This is the uber service that implements a three smaller services
 func ProvideDashboardServiceImpl(
-	cfg *setting.Cfg, dashboardStore dashboards.Store, folderStore folder.FolderStore, dashAlertExtractor alerting.DashAlertExtractor,
+	cfg *setting.Cfg, dashboardStore dashboards.Store, folderStore folder.FolderStore,
 	features featuremgmt.FeatureToggles, folderPermissionsService accesscontrol.FolderPermissionsService,
 	dashboardPermissionsService accesscontrol.DashboardPermissionsService, ac accesscontrol.AccessControl,
-	folderSvc folder.Service,
+	folderSvc folder.Service, r prometheus.Registerer,
 ) (*DashboardServiceImpl, error) {
 	dashSvc := &DashboardServiceImpl{
 		cfg:                  cfg,
 		log:                  log.New("dashboard-service"),
 		dashboardStore:       dashboardStore,
-		dashAlertExtractor:   dashAlertExtractor,
 		features:             features,
 		folderPermissions:    folderPermissionsService,
 		dashboardPermissions: dashboardPermissionsService,
 		ac:                   ac,
 		folderStore:          folderStore,
 		folderService:        folderSvc,
+		metrics:              newDashboardsMetrics(r),
 	}
 
 	ac.RegisterScopeAttributeResolver(dashboards.NewDashboardIDScopeResolver(folderStore, dashSvc, folderSvc))
@@ -93,7 +99,7 @@ func (dr *DashboardServiceImpl) GetProvisionedDashboardDataByDashboardUID(ctx co
 }
 
 //nolint:gocyclo
-func (dr *DashboardServiceImpl) BuildSaveDashboardCommand(ctx context.Context, dto *dashboards.SaveDashboardDTO, shouldValidateAlerts bool,
+func (dr *DashboardServiceImpl) BuildSaveDashboardCommand(ctx context.Context, dto *dashboards.SaveDashboardDTO,
 	validateProvisionedDashboard bool) (*dashboards.SaveDashboardCommand, error) {
 	dash := dto.Dashboard
 
@@ -106,6 +112,8 @@ func (dr *DashboardServiceImpl) BuildSaveDashboardCommand(ctx context.Context, d
 		return nil, dashboards.ErrDashboardTitleEmpty
 	}
 
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Dashboard).Inc()
+	// nolint:staticcheck
 	if dash.IsFolder && dash.FolderID > 0 {
 		return nil, dashboards.ErrDashboardFolderCannotHaveParent
 	}
@@ -120,15 +128,27 @@ func (dr *DashboardServiceImpl) BuildSaveDashboardCommand(ctx context.Context, d
 		return nil, dashboards.ErrDashboardUidTooLong
 	}
 
-	if err := validateDashboardRefreshInterval(dash); err != nil {
+	if err := validateDashboardRefreshInterval(dr.cfg.MinRefreshInterval, dash); err != nil {
 		return nil, err
 	}
 
-	if shouldValidateAlerts {
-		dashAlertInfo := alerting.DashAlertInfo{Dash: dash, User: dto.User, OrgID: dash.OrgID}
-		if err := dr.dashAlertExtractor.ValidateAlerts(ctx, dashAlertInfo); err != nil {
+	// Validate folder
+	if dash.FolderUID != "" {
+		folder, err := dr.folderStore.GetFolderByUID(ctx, dash.OrgID, dash.FolderUID)
+		if err != nil {
+			return nil, err
+		}
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Dashboard).Inc()
+		// nolint:staticcheck
+		dash.FolderID = folder.ID
+	} else if dash.FolderID != 0 { // nolint:staticcheck
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Dashboard).Inc()
+		// nolint:staticcheck
+		folder, err := dr.folderStore.GetFolderByID(ctx, dash.OrgID, dash.FolderID)
+		if err != nil {
 			return nil, err
 		}
+		dash.FolderUID = folder.UID
 	}
 
 	isParentFolderChanged, err := dr.dashboardStore.ValidateDashboardBeforeSave(ctx, dash, dto.Overwrite)
@@ -142,6 +162,8 @@ func (dr *DashboardServiceImpl) BuildSaveDashboardCommand(ctx context.Context, d
 		if err != nil {
 			return nil, err
 		}
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Dashboard).Inc()
+		// nolint:staticcheck
 		if canSave, err := guardian.CanCreate(dash.FolderID, dash.IsFolder); err != nil || !canSave {
 			if err != nil {
 				return nil, err
@@ -167,6 +189,8 @@ func (dr *DashboardServiceImpl) BuildSaveDashboardCommand(ctx context.Context, d
 	}
 
 	if dash.ID == 0 {
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Dashboard).Inc()
+		// nolint:staticcheck
 		if canCreate, err := guard.CanCreate(dash.FolderID, dash.IsFolder); err != nil || !canCreate {
 			if err != nil {
 				return nil, err
@@ -187,13 +211,14 @@ func (dr *DashboardServiceImpl) BuildSaveDashboardCommand(ctx context.Context, d
 		return nil, err
 	}
 
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Dashboard).Inc()
 	cmd := &dashboards.SaveDashboardCommand{
 		Dashboard: dash.Data,
 		Message:   dto.Message,
 		OrgID:     dto.OrgID,
 		Overwrite: dto.Overwrite,
 		UserID:    userID,
-		FolderID:  dash.FolderID,
+		FolderID:  dash.FolderID, // nolint:staticcheck
 		FolderUID: dash.FolderUID,
 		IsFolder:  dash.IsFolder,
 		PluginID:  dash.PluginID,
@@ -221,10 +246,6 @@ func resolveUserID(user identity.Requester, log log.Logger) (int64, error) {
 	return userID, nil
 }
 
-func (dr *DashboardServiceImpl) UpdateDashboardACL(ctx context.Context, uid int64, items []*dashboards.DashboardACL) error {
-	return dr.dashboardStore.UpdateDashboardACL(ctx, uid, items)
-}
-
 func (dr *DashboardServiceImpl) DeleteOrphanedProvisionedDashboards(ctx context.Context, cmd *dashboards.DeleteOrphanedProvisionedDashboardsCommand) error {
 	return dr.dashboardStore.DeleteOrphanedProvisionedDashboards(ctx, cmd)
 }
@@ -236,6 +257,8 @@ func getGuardianForSavePermissionCheck(ctx context.Context, d *dashboards.Dashbo
 
 	if newDashboard {
 		// if it's a new dashboard/folder check the parent folder permissions
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Dashboard).Inc()
+		// nolint:staticcheck
 		guard, err := guardian.New(ctx, d.FolderID, d.OrgID, user)
 		if err != nil {
 			return nil, err
@@ -249,27 +272,27 @@ func getGuardianForSavePermissionCheck(ctx context.Context, d *dashboards.Dashbo
 	return guard, nil
 }
 
-func validateDashboardRefreshInterval(dash *dashboards.Dashboard) error {
-	if setting.MinRefreshInterval == "" {
+func validateDashboardRefreshInterval(minRefreshInterval string, dash *dashboards.Dashboard) error {
+	if minRefreshInterval == "" {
 		return nil
 	}
 
 	refresh := dash.Data.Get("refresh").MustString("")
-	if refresh == "" {
+	if refresh == "" || refresh == "auto" {
 		// since no refresh is set it is a valid refresh rate
 		return nil
 	}
 
-	minRefreshInterval, err := gtime.ParseDuration(setting.MinRefreshInterval)
+	minRefreshIntervalDur, err := gtime.ParseDuration(minRefreshInterval)
 	if err != nil {
-		return fmt.Errorf("parsing min refresh interval %q failed: %w", setting.MinRefreshInterval, err)
+		return fmt.Errorf("parsing min refresh interval %q failed: %w", minRefreshInterval, err)
 	}
 	d, err := gtime.ParseDuration(refresh)
 	if err != nil {
 		return fmt.Errorf("parsing refresh duration %q failed: %w", refresh, err)
 	}
 
-	if d < minRefreshInterval {
+	if d < minRefreshIntervalDur {
 		return dashboards.ErrDashboardRefreshIntervalTooShort
 	}
 
@@ -278,15 +301,15 @@ func validateDashboardRefreshInterval(dash *dashboards.Dashboard) error {
 
 func (dr *DashboardServiceImpl) SaveProvisionedDashboard(ctx context.Context, dto *dashboards.SaveDashboardDTO,
 	provisioning *dashboards.DashboardProvisioning) (*dashboards.Dashboard, error) {
-	if err := validateDashboardRefreshInterval(dto.Dashboard); err != nil {
+	if err := validateDashboardRefreshInterval(dr.cfg.MinRefreshInterval, dto.Dashboard); err != nil {
 		dr.log.Warn("Changing refresh interval for provisioned dashboard to minimum refresh interval", "dashboardUid",
-			dto.Dashboard.UID, "dashboardTitle", dto.Dashboard.Title, "minRefreshInterval", setting.MinRefreshInterval)
-		dto.Dashboard.Data.Set("refresh", setting.MinRefreshInterval)
+			dto.Dashboard.UID, "dashboardTitle", dto.Dashboard.Title, "minRefreshInterval", dr.cfg.MinRefreshInterval)
+		dto.Dashboard.Data.Set("refresh", dr.cfg.MinRefreshInterval)
 	}
 
 	dto.User = accesscontrol.BackgroundUser("dashboard_provisioning", dto.OrgID, org.RoleAdmin, provisionerPermissions)
 
-	cmd, err := dr.BuildSaveDashboardCommand(ctx, dto, setting.IsLegacyAlertingEnabled(), false)
+	cmd, err := dr.BuildSaveDashboardCommand(ctx, dto, false)
 	if err != nil {
 		return nil, err
 	}
@@ -297,26 +320,6 @@ func (dr *DashboardServiceImpl) SaveProvisionedDashboard(ctx context.Context, dt
 		return nil, err
 	}
 
-	// alerts
-	dashAlertInfo := alerting.DashAlertInfo{
-		User:  dto.User,
-		Dash:  dash,
-		OrgID: dto.OrgID,
-	}
-
-	// extract/save legacy alerts only if legacy alerting is enabled
-	if setting.IsLegacyAlertingEnabled() {
-		alerts, err := dr.dashAlertExtractor.GetAlerts(ctx, dashAlertInfo)
-		if err != nil {
-			return nil, err
-		}
-
-		err = dr.dashboardStore.SaveAlerts(ctx, dash.ID, alerts)
-		if err != nil {
-			return nil, err
-		}
-	}
-
 	if dto.Dashboard.ID == 0 {
 		dr.setDefaultPermissions(ctx, dto, dash, true)
 	}
@@ -324,54 +327,29 @@ func (dr *DashboardServiceImpl) SaveProvisionedDashboard(ctx context.Context, dt
 	return dash, nil
 }
 
-func (dr *DashboardServiceImpl) SaveFolderForProvisionedDashboards(ctx context.Context, dto *dashboards.SaveDashboardDTO) (*dashboards.Dashboard, error) {
-	dto.User = accesscontrol.BackgroundUser("dashboard_provisioning", dto.OrgID, org.RoleAdmin, provisionerPermissions)
-	cmd, err := dr.BuildSaveDashboardCommand(ctx, dto, false, false)
-	if err != nil {
-		return nil, err
-	}
+func (dr *DashboardServiceImpl) SaveFolderForProvisionedDashboards(ctx context.Context, dto *folder.CreateFolderCommand) (*folder.Folder, error) {
+	dto.SignedInUser = accesscontrol.BackgroundUser("dashboard_provisioning", dto.OrgID, org.RoleAdmin, provisionerPermissions)
 
-	dash, err := dr.dashboardStore.SaveDashboard(ctx, *cmd)
+	f, err := dr.folderService.Create(ctx, dto)
 	if err != nil {
+		dr.log.Error("failed to create folder for provisioned dashboards", "folder", dto.Title, "org", dto.OrgID, "err", err)
 		return nil, err
 	}
 
-	dashAlertInfo := alerting.DashAlertInfo{
-		User:  dto.User,
-		Dash:  dash,
-		OrgID: dto.OrgID,
-	}
-
-	// extract/save legacy alerts only if legacy alerting is enabled
-	if setting.IsLegacyAlertingEnabled() {
-		alerts, err := dr.dashAlertExtractor.GetAlerts(ctx, dashAlertInfo)
-		if err != nil {
-			return nil, err
-		}
-
-		err = dr.dashboardStore.SaveAlerts(ctx, dash.ID, alerts)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if dto.Dashboard.ID == 0 {
-		dr.setDefaultPermissions(ctx, dto, dash, true)
-	}
-
-	return dash, nil
+	dr.setDefaultFolderPermissions(ctx, dto, f, true)
+	return f, nil
 }
 
 func (dr *DashboardServiceImpl) SaveDashboard(ctx context.Context, dto *dashboards.SaveDashboardDTO,
 	allowUiUpdate bool) (*dashboards.Dashboard, error) {
-	if err := validateDashboardRefreshInterval(dto.Dashboard); err != nil {
+	if err := validateDashboardRefreshInterval(dr.cfg.MinRefreshInterval, dto.Dashboard); err != nil {
 		dr.log.Warn("Changing refresh interval for imported dashboard to minimum refresh interval",
 			"dashboardUid", dto.Dashboard.UID, "dashboardTitle", dto.Dashboard.Title, "minRefreshInterval",
-			setting.MinRefreshInterval)
-		dto.Dashboard.Data.Set("refresh", setting.MinRefreshInterval)
+			dr.cfg.MinRefreshInterval)
+		dto.Dashboard.Data.Set("refresh", dr.cfg.MinRefreshInterval)
 	}
 
-	cmd, err := dr.BuildSaveDashboardCommand(ctx, dto, setting.IsLegacyAlertingEnabled(), !allowUiUpdate)
+	cmd, err := dr.BuildSaveDashboardCommand(ctx, dto, !allowUiUpdate)
 	if err != nil {
 		return nil, err
 	}
@@ -381,25 +359,6 @@ func (dr *DashboardServiceImpl) SaveDashboard(ctx context.Context, dto *dashboar
 		return nil, fmt.Errorf("saving dashboard failed: %w", err)
 	}
 
-	dashAlertInfo := alerting.DashAlertInfo{
-		User:  dto.User,
-		Dash:  dash,
-		OrgID: dto.OrgID,
-	}
-
-	// extract/save legacy alerts only if legacy alerting is enabled
-	if setting.IsLegacyAlertingEnabled() {
-		alerts, err := dr.dashAlertExtractor.GetAlerts(ctx, dashAlertInfo)
-		if err != nil {
-			return nil, err
-		}
-
-		err = dr.dashboardStore.SaveAlerts(ctx, dash.ID, alerts)
-		if err != nil {
-			return nil, err
-		}
-	}
-
 	// new dashboard created
 	if dto.Dashboard.ID == 0 {
 		dr.setDefaultPermissions(ctx, dto, dash, false)
@@ -440,14 +399,14 @@ func (dr *DashboardServiceImpl) deleteDashboard(ctx context.Context, dashboardId
 
 func (dr *DashboardServiceImpl) ImportDashboard(ctx context.Context, dto *dashboards.SaveDashboardDTO) (
 	*dashboards.Dashboard, error) {
-	if err := validateDashboardRefreshInterval(dto.Dashboard); err != nil {
+	if err := validateDashboardRefreshInterval(dr.cfg.MinRefreshInterval, dto.Dashboard); err != nil {
 		dr.log.Warn("Changing refresh interval for imported dashboard to minimum refresh interval",
 			"dashboardUid", dto.Dashboard.UID, "dashboardTitle", dto.Dashboard.Title,
-			"minRefreshInterval", setting.MinRefreshInterval)
-		dto.Dashboard.Data.Set("refresh", setting.MinRefreshInterval)
+			"minRefreshInterval", dr.cfg.MinRefreshInterval)
+		dto.Dashboard.Data.Set("refresh", dr.cfg.MinRefreshInterval)
 	}
 
-	cmd, err := dr.BuildSaveDashboardCommand(ctx, dto, false, true)
+	cmd, err := dr.BuildSaveDashboardCommand(ctx, dto, true)
 	if err != nil {
 		return nil, err
 	}
@@ -473,6 +432,8 @@ func (dr *DashboardServiceImpl) GetDashboardsByPluginID(ctx context.Context, que
 }
 
 func (dr *DashboardServiceImpl) setDefaultPermissions(ctx context.Context, dto *dashboards.SaveDashboardDTO, dash *dashboards.Dashboard, provisioned bool) {
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Dashboard).Inc()
+	// nolint:staticcheck
 	inFolder := dash.FolderID > 0
 	var permissions []accesscontrol.SetResourcePermissionCommand
 
@@ -484,15 +445,15 @@ func (dr *DashboardServiceImpl) setDefaultPermissions(ctx context.Context, dto *
 			dr.log.Error("Could not make user admin", "dashboard", dash.Title, "namespaceID", namespaceID, "userID", userID, "error", err)
 		} else if namespaceID == identity.NamespaceUser && userID > 0 {
 			permissions = append(permissions, accesscontrol.SetResourcePermissionCommand{
-				UserID: userID, Permission: dashboards.PERMISSION_ADMIN.String(),
+				UserID: userID, Permission: dashboardaccess.PERMISSION_ADMIN.String(),
 			})
 		}
 	}
 
 	if !inFolder {
 		permissions = append(permissions, []accesscontrol.SetResourcePermissionCommand{
-			{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
-			{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_VIEW.String()},
+			{BuiltinRole: string(org.RoleEditor), Permission: dashboardaccess.PERMISSION_EDIT.String()},
+			{BuiltinRole: string(org.RoleViewer), Permission: dashboardaccess.PERMISSION_VIEW.String()},
 		}...)
 	}
 
@@ -506,6 +467,35 @@ func (dr *DashboardServiceImpl) setDefaultPermissions(ctx context.Context, dto *
 	}
 }
 
+func (dr *DashboardServiceImpl) setDefaultFolderPermissions(ctx context.Context, cmd *folder.CreateFolderCommand, f *folder.Folder, provisioned bool) {
+	inFolder := f.ParentUID != ""
+	var permissions []accesscontrol.SetResourcePermissionCommand
+
+	if !provisioned {
+		namespaceID, userIDstr := cmd.SignedInUser.GetNamespacedID()
+		userID, err := identity.IntIdentifier(namespaceID, userIDstr)
+
+		if err != nil {
+			dr.log.Error("Could not make user admin", "folder", cmd.Title, "namespaceID", namespaceID, "userID", userID, "error", err)
+		} else if namespaceID == identity.NamespaceUser && userID > 0 {
+			permissions = append(permissions, accesscontrol.SetResourcePermissionCommand{
+				UserID: userID, Permission: dashboardaccess.PERMISSION_ADMIN.String(),
+			})
+		}
+	}
+
+	if !inFolder {
+		permissions = append(permissions, []accesscontrol.SetResourcePermissionCommand{
+			{BuiltinRole: string(org.RoleEditor), Permission: dashboardaccess.PERMISSION_EDIT.String()},
+			{BuiltinRole: string(org.RoleViewer), Permission: dashboardaccess.PERMISSION_VIEW.String()},
+		}...)
+	}
+
+	if _, err := dr.folderPermissions.SetPermissions(ctx, cmd.OrgID, f.UID, permissions...); err != nil {
+		dr.log.Error("Could not set default folder permissions", "folder", f.Title, "error", err)
+	}
+}
+
 func (dr *DashboardServiceImpl) GetDashboard(ctx context.Context, query *dashboards.GetDashboardQuery) (*dashboards.Dashboard, error) {
 	return dr.dashboardStore.GetDashboard(ctx, query)
 }
@@ -518,7 +508,107 @@ func (dr *DashboardServiceImpl) GetDashboards(ctx context.Context, query *dashbo
 	return dr.dashboardStore.GetDashboards(ctx, query)
 }
 
+func (dr *DashboardServiceImpl) GetDashboardsSharedWithUser(ctx context.Context, user identity.Requester) ([]*dashboards.Dashboard, error) {
+	return dr.getDashboardsSharedWithUser(ctx, user)
+}
+
+func (dr *DashboardServiceImpl) getDashboardsSharedWithUser(ctx context.Context, user identity.Requester) ([]*dashboards.Dashboard, error) {
+	permissions := user.GetPermissions()
+	dashboardPermissions := permissions[dashboards.ActionDashboardsRead]
+	sharedDashboards := make([]*dashboards.Dashboard, 0)
+	dashboardUids := make([]string, 0)
+	for _, p := range dashboardPermissions {
+		if dashboardUid, found := strings.CutPrefix(p, dashboards.ScopeDashboardsPrefix); found {
+			if !slices.Contains(dashboardUids, dashboardUid) {
+				dashboardUids = append(dashboardUids, dashboardUid)
+			}
+		}
+	}
+
+	if len(dashboardUids) == 0 {
+		return sharedDashboards, nil
+	}
+
+	dashboardsQuery := &dashboards.GetDashboardsQuery{
+		DashboardUIDs: dashboardUids,
+		OrgID:         user.GetOrgID(),
+	}
+	sharedDashboards, err := dr.dashboardStore.GetDashboards(ctx, dashboardsQuery)
+	if err != nil {
+		return nil, err
+	}
+	return dr.filterUserSharedDashboards(ctx, user, sharedDashboards)
+}
+
+// filterUserSharedDashboards filter dashboards directly assigned to user, but not located in folders with view permissions
+func (dr *DashboardServiceImpl) filterUserSharedDashboards(ctx context.Context, user identity.Requester, userDashboards []*dashboards.Dashboard) ([]*dashboards.Dashboard, error) {
+	filteredDashboards := make([]*dashboards.Dashboard, 0)
+
+	folderUIDs := make([]string, 0)
+	for _, dashboard := range userDashboards {
+		folderUIDs = append(folderUIDs, dashboard.FolderUID)
+	}
+
+	// GetFolders return only folders available to user. So we can use is to check access.
+	userDashFolders, err := dr.folderService.GetFolders(ctx, folder.GetFoldersQuery{
+		UIDs:         folderUIDs,
+		OrgID:        user.GetOrgID(),
+		OrderByTitle: true,
+		SignedInUser: user,
+	})
+	if err != nil {
+		return nil, folder.ErrInternal.Errorf("failed to fetch parent folders from store: %w", err)
+	}
+
+	dashFoldersMap := make(map[string]*folder.Folder, 0)
+	for _, f := range userDashFolders {
+		dashFoldersMap[f.UID] = f
+	}
+
+	for _, dashboard := range userDashboards {
+		// Filter out dashboards if user has access to parent folder
+		if dashboard.FolderUID == "" {
+			continue
+		}
+
+		_, hasAccess := dashFoldersMap[dashboard.FolderUID]
+		if !hasAccess {
+			filteredDashboards = append(filteredDashboards, dashboard)
+		}
+	}
+	return filteredDashboards, nil
+}
+
+func (dr *DashboardServiceImpl) getUserSharedDashboardUIDs(ctx context.Context, user identity.Requester) ([]string, error) {
+	userDashboards, err := dr.getDashboardsSharedWithUser(ctx, user)
+	if err != nil {
+		return nil, err
+	}
+	userDashboardUIDs := make([]string, 0)
+	for _, dashboard := range userDashboards {
+		userDashboardUIDs = append(userDashboardUIDs, dashboard.UID)
+	}
+	return userDashboardUIDs, nil
+}
+
 func (dr *DashboardServiceImpl) FindDashboards(ctx context.Context, query *dashboards.FindPersistedDashboardsQuery) ([]dashboards.DashboardSearchProjection, error) {
+	if dr.features.IsEnabled(ctx, featuremgmt.FlagNestedFolders) && len(query.FolderUIDs) > 0 && slices.Contains(query.FolderUIDs, folder.SharedWithMeFolderUID) {
+		start := time.Now()
+		userDashboardUIDs, err := dr.getUserSharedDashboardUIDs(ctx, query.SignedInUser)
+		if err != nil {
+			dr.metrics.sharedWithMeFetchDashboardsRequestsDuration.WithLabelValues("failure").Observe(time.Since(start).Seconds())
+			return nil, err
+		}
+		if len(userDashboardUIDs) == 0 {
+			return []dashboards.DashboardSearchProjection{}, nil
+		}
+		query.DashboardUIDs = userDashboardUIDs
+		query.FolderUIDs = []string{}
+
+		defer func(t time.Time) {
+			dr.metrics.sharedWithMeFetchDashboardsRequestsDuration.WithLabelValues("success").Observe(time.Since(start).Seconds())
+		}(time.Now())
+	}
 	return dr.dashboardStore.FindDashboards(ctx, query)
 }
 
@@ -551,6 +641,7 @@ func makeQueryResult(query *dashboards.FindPersistedDashboardsQuery, res []dashb
 	for _, item := range res {
 		hit, exists := hits[item.ID]
 		if !exists {
+			metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Dashboard).Inc()
 			hit = &model.Hit{
 				ID:          item.ID,
 				UID:         item.UID,
@@ -558,12 +649,13 @@ func makeQueryResult(query *dashboards.FindPersistedDashboardsQuery, res []dashb
 				URI:         "db/" + item.Slug,
 				URL:         dashboards.GetDashboardFolderURL(item.IsFolder, item.UID, item.Slug),
 				Type:        getHitType(item),
-				FolderID:    item.FolderID,
+				FolderID:    item.FolderID, // nolint:staticcheck
 				FolderUID:   item.FolderUID,
 				FolderTitle: item.FolderTitle,
 				Tags:        []string{},
 			}
 
+			// nolint:staticcheck
 			if item.FolderID > 0 {
 				hit.FolderURL = dashboards.GetFolderURL(item.FolderUID, item.FolderSlug)
 			}
@@ -583,29 +675,16 @@ func makeQueryResult(query *dashboards.FindPersistedDashboardsQuery, res []dashb
 	return hitList
 }
 
-func (dr *DashboardServiceImpl) GetDashboardACLInfoList(ctx context.Context, query *dashboards.GetDashboardACLInfoListQuery) ([]*dashboards.DashboardACLInfoDTO, error) {
-	return dr.dashboardStore.GetDashboardACLInfoList(ctx, query)
-}
-
 func (dr *DashboardServiceImpl) GetDashboardTags(ctx context.Context, query *dashboards.GetDashboardTagsQuery) ([]*dashboards.DashboardTagCloudItem, error) {
 	return dr.dashboardStore.GetDashboardTags(ctx, query)
 }
 
-func (dr *DashboardServiceImpl) DeleteACLByUser(ctx context.Context, userID int64) error {
-	return dr.dashboardStore.DeleteACLByUser(ctx, userID)
-}
-
-func (dr DashboardServiceImpl) CountInFolder(ctx context.Context, orgID int64, folderUID string, u identity.Requester) (int64, error) {
-	folder, err := dr.folderService.Get(ctx, &folder.GetFolderQuery{UID: &folderUID, OrgID: orgID, SignedInUser: u})
-	if err != nil {
-		return 0, err
-	}
-
-	return dr.dashboardStore.CountDashboardsInFolder(ctx, &dashboards.CountDashboardsInFolderRequest{FolderID: folder.ID, OrgID: orgID})
+func (dr DashboardServiceImpl) CountInFolders(ctx context.Context, orgID int64, folderUIDs []string, u identity.Requester) (int64, error) {
+	return dr.dashboardStore.CountDashboardsInFolders(ctx, &dashboards.CountDashboardsInFolderRequest{FolderUIDs: folderUIDs, OrgID: orgID})
 }
 
-func (dr *DashboardServiceImpl) DeleteInFolder(ctx context.Context, orgID int64, folderUID string, u identity.Requester) error {
-	return dr.dashboardStore.DeleteDashboardsInFolder(ctx, &dashboards.DeleteDashboardsInFolderRequest{FolderUID: folderUID, OrgID: orgID})
+func (dr *DashboardServiceImpl) DeleteInFolders(ctx context.Context, orgID int64, folderUIDs []string, u identity.Requester) error {
+	return dr.dashboardStore.DeleteDashboardsInFolders(ctx, &dashboards.DeleteDashboardsInFolderRequest{FolderUIDs: folderUIDs, OrgID: orgID})
 }
 
 func (dr *DashboardServiceImpl) Kind() string { return entity.StandardKindDashboard }
diff --git a/pkg/services/dashboards/service/dashboard_service_integration_test.go b/pkg/services/dashboards/service/dashboard_service_integration_test.go
index e6b33c28f4a53..448dad895b615 100644
--- a/pkg/services/dashboards/service/dashboard_service_integration_test.go
+++ b/pkg/services/dashboards/service/dashboard_service_integration_test.go
@@ -13,8 +13,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
 	accesscontrolmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/dashboards/database"
@@ -27,10 +25,15 @@ import (
 	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
 const testOrgID int64 = 1
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationIntegratedDashboardService(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
@@ -128,7 +131,6 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 						Dashboard: simplejson.NewFromAny(map[string]any{
 							"title": "Dash",
 						}),
-						FolderID:  sc.otherSavedFolder.ID,
 						FolderUID: sc.otherSavedFolder.UID,
 						UserID:    10000,
 						Overwrite: true,
@@ -152,7 +154,6 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 						Dashboard: simplejson.NewFromAny(map[string]any{
 							"title": sc.savedDashInFolder.Title,
 						}),
-						FolderID:  sc.savedFolder.ID,
 						FolderUID: sc.savedFolder.UID,
 						UserID:    10000,
 						Overwrite: true,
@@ -177,7 +178,6 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 							"uid":   sc.savedDashInFolder.UID,
 							"title": "New dash",
 						}),
-						FolderID:  sc.savedFolder.ID,
 						FolderUID: sc.savedFolder.UID,
 						UserID:    10000,
 						Overwrite: true,
@@ -202,7 +202,6 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 							"id":    sc.savedDashInGeneralFolder.ID,
 							"title": "Dash",
 						}),
-						FolderID:  sc.savedDashInGeneralFolder.FolderID,
 						FolderUID: sc.savedDashInGeneralFolder.FolderUID,
 						UserID:    10000,
 						Overwrite: true,
@@ -227,7 +226,6 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 							"id":    sc.savedDashInFolder.ID,
 							"title": "Dash",
 						}),
-						FolderID:  sc.savedDashInFolder.FolderID,
 						FolderUID: sc.savedDashInFolder.FolderUID,
 						UserID:    10000,
 						Overwrite: true,
@@ -252,7 +250,6 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 							"id":    sc.savedDashInGeneralFolder.ID,
 							"title": "Dash",
 						}),
-						FolderID:  sc.otherSavedFolder.ID,
 						FolderUID: sc.otherSavedFolder.UID,
 						UserID:    10000,
 						Overwrite: true,
@@ -277,7 +274,6 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 							"id":    sc.savedDashInFolder.ID,
 							"title": "Dash",
 						}),
-						FolderID:  0,
 						FolderUID: "",
 						UserID:    10000,
 						Overwrite: true,
@@ -302,7 +298,6 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 							"uid":   sc.savedDashInGeneralFolder.UID,
 							"title": "Dash",
 						}),
-						FolderID:  sc.otherSavedFolder.ID,
 						FolderUID: sc.otherSavedFolder.UID,
 						UserID:    10000,
 						Overwrite: true,
@@ -327,7 +322,6 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 							"uid":   sc.savedDashInFolder.UID,
 							"title": "Dash",
 						}),
-						FolderID:  0,
 						FolderUID: "",
 						UserID:    10000,
 						Overwrite: true,
@@ -359,7 +353,6 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 								"id":    nil,
 								"title": sc.savedDashInFolder.Title,
 							}),
-							FolderID:  0,
 							FolderUID: "",
 							Overwrite: shouldOverwrite,
 						}
@@ -383,7 +376,6 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 								"id":    nil,
 								"title": sc.savedDashInGeneralFolder.Title,
 							}),
-							FolderID:  sc.savedFolder.ID,
 							FolderUID: sc.savedFolder.UID,
 							Overwrite: shouldOverwrite,
 						}
@@ -475,13 +467,12 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 							Dashboard: simplejson.NewFromAny(map[string]any{
 								"title": "Expect error",
 							}),
-							FolderID:  123412321,
 							FolderUID: "123412321",
 							Overwrite: shouldOverwrite,
 						}
 
 						err := callSaveWithError(t, cmd, sc.sqlStore)
-						assert.Equal(t, dashboards.ErrDashboardFolderNotFound, err)
+						assert.Equal(t, dashboards.ErrFolderNotFound, err)
 					})
 
 				permissionScenario(t, "When updating an existing dashboard by id without current version", canSave,
@@ -492,7 +483,6 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 								"id":    sc.savedDashInGeneralFolder.ID,
 								"title": "test dash 23",
 							}),
-							FolderID:  sc.savedFolder.ID,
 							FolderUID: sc.savedFolder.UID,
 							Overwrite: shouldOverwrite,
 						}
@@ -510,7 +500,6 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 								"title":   "Updated title",
 								"version": sc.savedDashInGeneralFolder.Version,
 							}),
-							FolderID:  sc.savedFolder.ID,
 							FolderUID: sc.savedFolder.UID,
 							Overwrite: shouldOverwrite,
 						}
@@ -534,7 +523,6 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 								"uid":   sc.savedDashInFolder.UID,
 								"title": "test dash 23",
 							}),
-							FolderID:  0,
 							FolderUID: "",
 							Overwrite: shouldOverwrite,
 						}
@@ -552,7 +540,6 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 								"title":   "Updated title",
 								"version": sc.savedDashInFolder.Version,
 							}),
-							FolderID:  0,
 							FolderUID: "",
 							Overwrite: shouldOverwrite,
 						}
@@ -575,7 +562,6 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 								"id":    nil,
 								"title": sc.savedDashInFolder.Title,
 							}),
-							FolderID:  sc.savedDashInFolder.FolderID,
 							FolderUID: sc.savedDashInFolder.FolderUID,
 							Overwrite: shouldOverwrite,
 						}
@@ -592,7 +578,6 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 								"id":    nil,
 								"title": sc.savedDashInGeneralFolder.Title,
 							}),
-							FolderID:  sc.savedDashInGeneralFolder.FolderID,
 							FolderUID: sc.savedDashInGeneralFolder.FolderUID,
 							Overwrite: shouldOverwrite,
 						}
@@ -629,7 +614,6 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 								"id":    sc.savedDashInGeneralFolder.ID,
 								"title": "Updated title",
 							}),
-							FolderID:  sc.savedFolder.ID,
 							FolderUID: sc.savedFolder.UID,
 							Overwrite: shouldOverwrite,
 						}
@@ -652,7 +636,6 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 								"uid":   sc.savedDashInFolder.UID,
 								"title": "Updated title",
 							}),
-							FolderID:  0,
 							FolderUID: "",
 							Overwrite: shouldOverwrite,
 						}
@@ -715,7 +698,6 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 								"id":    nil,
 								"title": sc.savedDashInFolder.Title,
 							}),
-							FolderID:  sc.savedDashInFolder.FolderID,
 							FolderUID: sc.savedDashInFolder.FolderUID,
 							Overwrite: shouldOverwrite,
 						}
@@ -740,7 +722,6 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 								"id":    nil,
 								"title": sc.savedDashInGeneralFolder.Title,
 							}),
-							FolderID:  sc.savedDashInGeneralFolder.FolderID,
 							FolderUID: sc.savedDashInGeneralFolder.FolderUID,
 							Overwrite: shouldOverwrite,
 						}
@@ -875,46 +856,45 @@ func permissionScenario(t *testing.T, desc string, canSave bool, fn permissionSc
 	}
 
 	t.Run(desc, func(t *testing.T) {
+		features := featuremgmt.WithFeatures()
 		cfg := setting.NewCfg()
-		cfg.IsFeatureToggleEnabled = featuremgmt.WithFeatures().IsEnabled
 		sqlStore := db.InitTestDB(t)
 		quotaService := quotatest.New(false, nil)
 		ac := actest.FakeAccessControl{ExpectedEvaluate: true}
-		dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
+		dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, features, tagimpl.ProvideService(sqlStore), quotaService)
 		require.NoError(t, err)
 		folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
 		folderPermissions := accesscontrolmock.NewMockedPermissionsService()
 		folderPermissions.On("SetPermissions", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]accesscontrol.ResourcePermission{}, nil)
 		dashboardPermissions := accesscontrolmock.NewMockedPermissionsService()
 		dashboardService, err := ProvideDashboardServiceImpl(
-			cfg, dashboardStore, folderStore, &dummyDashAlertExtractor{},
+			cfg, dashboardStore, folderStore,
 			featuremgmt.WithFeatures(),
 			folderPermissions,
 			dashboardPermissions,
 			ac,
 			foldertest.NewFakeService(),
+			nil,
 		)
 		require.NoError(t, err)
 		guardian.InitAccessControlGuardian(cfg, ac, dashboardService)
 
 		savedFolder := saveTestFolder(t, "Saved folder", testOrgID, sqlStore)
-		savedDashInFolder := saveTestDashboard(t, "Saved dash in folder", testOrgID, savedFolder.ID, savedFolder.UID, sqlStore)
-		saveTestDashboard(t, "Other saved dash in folder", testOrgID, savedFolder.ID, savedFolder.UID, sqlStore)
-		savedDashInGeneralFolder := saveTestDashboard(t, "Saved dashboard in general folder", testOrgID, 0, "", sqlStore)
+		savedDashInFolder := saveTestDashboard(t, "Saved dash in folder", testOrgID, savedFolder.UID, sqlStore)
+		saveTestDashboard(t, "Other saved dash in folder", testOrgID, savedFolder.UID, sqlStore)
+		savedDashInGeneralFolder := saveTestDashboard(t, "Saved dashboard in general folder", testOrgID, "", sqlStore)
 		otherSavedFolder := saveTestFolder(t, "Other saved folder", testOrgID, sqlStore)
 
 		require.Equal(t, "Saved folder", savedFolder.Title)
 		require.Equal(t, "saved-folder", savedFolder.Slug)
 		require.NotEqual(t, int64(0), savedFolder.ID)
 		require.True(t, savedFolder.IsFolder)
-		require.Equal(t, int64(0), savedFolder.FolderID)
 		require.NotEmpty(t, savedFolder.UID)
 
 		require.Equal(t, "Saved dash in folder", savedDashInFolder.Title)
 		require.Equal(t, "saved-dash-in-folder", savedDashInFolder.Slug)
 		require.NotEqual(t, int64(0), savedDashInFolder.ID)
 		require.False(t, savedDashInFolder.IsFolder)
-		require.Equal(t, savedFolder.ID, savedDashInFolder.FolderID)
 		require.NotEmpty(t, savedDashInFolder.UID)
 
 		origNewDashboardGuardian := guardian.New
@@ -940,11 +920,11 @@ func permissionScenario(t *testing.T, desc string, canSave bool, fn permissionSc
 func callSaveWithResult(t *testing.T, cmd dashboards.SaveDashboardCommand, sqlStore db.DB) *dashboards.Dashboard {
 	t.Helper()
 
+	features := featuremgmt.WithFeatures()
 	dto := toSaveDashboardDto(cmd)
 	cfg := setting.NewCfg()
-	cfg.IsFeatureToggleEnabled = featuremgmt.WithFeatures().IsEnabled
 	quotaService := quotatest.New(false, nil)
-	dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
+	dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, features, tagimpl.ProvideService(sqlStore), quotaService)
 	require.NoError(t, err)
 	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
 	folderPermissions := accesscontrolmock.NewMockedPermissionsService()
@@ -953,12 +933,13 @@ func callSaveWithResult(t *testing.T, cmd dashboards.SaveDashboardCommand, sqlSt
 	dashboardPermissions := accesscontrolmock.NewMockedPermissionsService()
 	dashboardPermissions.On("SetPermissions", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]accesscontrol.ResourcePermission{}, nil)
 	service, err := ProvideDashboardServiceImpl(
-		cfg, dashboardStore, folderStore, &dummyDashAlertExtractor{},
+		cfg, dashboardStore, folderStore,
 		featuremgmt.WithFeatures(),
 		folderPermissions,
 		dashboardPermissions,
 		actest.FakeAccessControl{},
 		foldertest.NewFakeService(),
+		nil,
 	)
 	require.NoError(t, err)
 	res, err := service.SaveDashboard(context.Background(), &dto, false)
@@ -968,32 +949,32 @@ func callSaveWithResult(t *testing.T, cmd dashboards.SaveDashboardCommand, sqlSt
 }
 
 func callSaveWithError(t *testing.T, cmd dashboards.SaveDashboardCommand, sqlStore db.DB) error {
+	features := featuremgmt.WithFeatures()
 	dto := toSaveDashboardDto(cmd)
 	cfg := setting.NewCfg()
-	cfg.IsFeatureToggleEnabled = featuremgmt.WithFeatures().IsEnabled
 	quotaService := quotatest.New(false, nil)
-	dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
+	dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, features, tagimpl.ProvideService(sqlStore), quotaService)
 	require.NoError(t, err)
 	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
 	service, err := ProvideDashboardServiceImpl(
-		cfg, dashboardStore, folderStore, &dummyDashAlertExtractor{},
+		cfg, dashboardStore, folderStore,
 		featuremgmt.WithFeatures(),
 		accesscontrolmock.NewMockedPermissionsService(),
 		accesscontrolmock.NewMockedPermissionsService(),
 		actest.FakeAccessControl{},
 		foldertest.NewFakeService(),
+		nil,
 	)
 	require.NoError(t, err)
 	_, err = service.SaveDashboard(context.Background(), &dto, false)
 	return err
 }
 
-func saveTestDashboard(t *testing.T, title string, orgID, folderID int64, folderUID string, sqlStore db.DB) *dashboards.Dashboard {
+func saveTestDashboard(t *testing.T, title string, orgID int64, folderUID string, sqlStore db.DB) *dashboards.Dashboard {
 	t.Helper()
 
 	cmd := dashboards.SaveDashboardCommand{
 		OrgID:     orgID,
-		FolderID:  folderID,
 		FolderUID: folderUID,
 		IsFolder:  false,
 		Dashboard: simplejson.NewFromAny(map[string]any{
@@ -1010,21 +991,22 @@ func saveTestDashboard(t *testing.T, title string, orgID, folderID int64, folder
 			OrgRole: org.RoleAdmin,
 		},
 	}
+	features := featuremgmt.WithFeatures()
 	cfg := setting.NewCfg()
-	cfg.IsFeatureToggleEnabled = featuremgmt.WithFeatures().IsEnabled
 	quotaService := quotatest.New(false, nil)
-	dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
+	dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, features, tagimpl.ProvideService(sqlStore), quotaService)
 	require.NoError(t, err)
 	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
 	dashboardPermissions := accesscontrolmock.NewMockedPermissionsService()
 	dashboardPermissions.On("SetPermissions", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]accesscontrol.ResourcePermission{}, nil)
 	service, err := ProvideDashboardServiceImpl(
-		cfg, dashboardStore, folderStore, &dummyDashAlertExtractor{},
-		featuremgmt.WithFeatures(),
+		cfg, dashboardStore, folderStore,
+		features,
 		accesscontrolmock.NewMockedPermissionsService(),
 		dashboardPermissions,
 		actest.FakeAccessControl{},
 		foldertest.NewFakeService(),
+		nil,
 	)
 	require.NoError(t, err)
 	res, err := service.SaveDashboard(context.Background(), &dto, false)
@@ -1038,7 +1020,6 @@ func saveTestFolder(t *testing.T, title string, orgID int64, sqlStore db.DB) *da
 	t.Helper()
 	cmd := dashboards.SaveDashboardCommand{
 		OrgID:     orgID,
-		FolderID:  0,
 		FolderUID: "",
 		IsFolder:  true,
 		Dashboard: simplejson.NewFromAny(map[string]any{
@@ -1060,21 +1041,22 @@ func saveTestFolder(t *testing.T, title string, orgID int64, sqlStore db.DB) *da
 		},
 	}
 
+	features := featuremgmt.WithFeatures()
 	cfg := setting.NewCfg()
-	cfg.IsFeatureToggleEnabled = featuremgmt.WithFeatures().IsEnabled
 	quotaService := quotatest.New(false, nil)
-	dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
+	dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, features, tagimpl.ProvideService(sqlStore), quotaService)
 	require.NoError(t, err)
 	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
 	folderPermissions := accesscontrolmock.NewMockedPermissionsService()
 	folderPermissions.On("SetPermissions", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]accesscontrol.ResourcePermission{}, nil)
 	service, err := ProvideDashboardServiceImpl(
-		cfg, dashboardStore, folderStore, &dummyDashAlertExtractor{},
+		cfg, dashboardStore, folderStore,
 		featuremgmt.WithFeatures(),
 		folderPermissions,
 		accesscontrolmock.NewMockedPermissionsService(),
 		actest.FakeAccessControl{},
 		foldertest.NewFakeService(),
+		nil,
 	)
 	require.NoError(t, err)
 	res, err := service.SaveDashboard(context.Background(), &dto, false)
@@ -1094,14 +1076,3 @@ func toSaveDashboardDto(cmd dashboards.SaveDashboardCommand) dashboards.SaveDash
 		Overwrite: cmd.Overwrite,
 	}
 }
-
-type dummyDashAlertExtractor struct {
-}
-
-func (d *dummyDashAlertExtractor) GetAlerts(ctx context.Context, dashAlertInfo alerting.DashAlertInfo) ([]*models.Alert, error) {
-	return nil, nil
-}
-
-func (d *dummyDashAlertExtractor) ValidateAlerts(ctx context.Context, dashAlertInfo alerting.DashAlertInfo) error {
-	return nil
-}
diff --git a/pkg/services/dashboards/service/dashboard_service_test.go b/pkg/services/dashboards/service/dashboard_service_test.go
index 5a907f3716ee4..b13f0bbb666b6 100644
--- a/pkg/services/dashboards/service/dashboard_service_test.go
+++ b/pkg/services/dashboards/service/dashboard_service_test.go
@@ -2,7 +2,6 @@ package service
 
 import (
 	"context"
-	"errors"
 	"testing"
 
 	"github.com/stretchr/testify/mock"
@@ -17,7 +16,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/guardian"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/util"
 )
 
 func TestDashboardService(t *testing.T) {
@@ -28,11 +26,10 @@ func TestDashboardService(t *testing.T) {
 		folderSvc := foldertest.NewFakeService()
 
 		service := &DashboardServiceImpl{
-			cfg:                setting.NewCfg(),
-			log:                log.New("test.logger"),
-			dashboardStore:     &fakeStore,
-			folderService:      folderSvc,
-			dashAlertExtractor: &dummyDashAlertExtractor{},
+			cfg:            setting.NewCfg(),
+			log:            log.New("test.logger"),
+			dashboardStore: &fakeStore,
+			folderService:  folderSvc,
 		}
 
 		origNewDashboardGuardian := guardian.New
@@ -52,13 +49,6 @@ func TestDashboardService(t *testing.T) {
 				}
 			})
 
-			t.Run("Should return validation error if it's a folder and have a folder id", func(t *testing.T) {
-				dto.Dashboard = dashboards.NewDashboardFolder("Folder")
-				dto.Dashboard.FolderID = 1
-				_, err := service.SaveDashboard(context.Background(), dto, false)
-				require.Equal(t, err, dashboards.ErrDashboardFolderCannotHaveParent)
-			})
-
 			t.Run("Should return validation error if folder is named General", func(t *testing.T) {
 				dto.Dashboard = dashboards.NewDashboardFolder("General")
 				_, err := service.SaveDashboard(context.Background(), dto, false)
@@ -87,11 +77,21 @@ func TestDashboardService(t *testing.T) {
 					if tc.Error == nil {
 						fakeStore.On("ValidateDashboardBeforeSave", mock.Anything, mock.Anything, mock.AnythingOfType("bool")).Return(true, nil).Once()
 					}
-					_, err := service.BuildSaveDashboardCommand(context.Background(), dto, true, false)
+					_, err := service.BuildSaveDashboardCommand(context.Background(), dto, false)
 					require.Equal(t, err, tc.Error)
 				}
 			})
 
+			t.Run("Should return validation error if a folder that is specified can't be found", func(t *testing.T) {
+				dto.Dashboard = dashboards.NewDashboard("Dash")
+				dto.Dashboard.FolderUID = "non-existing-folder"
+				folderStore := foldertest.FakeFolderStore{}
+				folderStore.On("GetFolderByUID", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("string")).Return(nil, dashboards.ErrFolderNotFound).Once()
+				service.folderStore = &folderStore
+				_, err := service.SaveDashboard(context.Background(), dto, false)
+				require.Equal(t, err, dashboards.ErrFolderNotFound)
+			})
+
 			t.Run("Should return validation error if dashboard is provisioned", func(t *testing.T) {
 				fakeStore.On("ValidateDashboardBeforeSave", mock.Anything, mock.Anything, mock.AnythingOfType("bool")).Return(true, nil).Once()
 				fakeStore.On("GetProvisionedDataByDashboardID", mock.Anything, mock.AnythingOfType("int64")).Return(&dashboards.DashboardProvisioning{}, nil).Once()
@@ -113,33 +113,6 @@ func TestDashboardService(t *testing.T) {
 				_, err := service.SaveDashboard(context.Background(), dto, true)
 				require.NoError(t, err)
 			})
-
-			t.Run("Should return validation error if alert data is invalid", func(t *testing.T) {
-				origAlertingEnabledSet := setting.AlertingEnabled != nil
-				origAlertingEnabledVal := false
-				if origAlertingEnabledSet {
-					origAlertingEnabledVal = *setting.AlertingEnabled
-				}
-				setting.AlertingEnabled = util.Pointer(true)
-				t.Cleanup(func() {
-					if !origAlertingEnabledSet {
-						setting.AlertingEnabled = nil
-					} else {
-						setting.AlertingEnabled = &origAlertingEnabledVal
-					}
-				})
-
-				fakeStore.On("ValidateDashboardBeforeSave", mock.Anything, mock.Anything, mock.AnythingOfType("bool")).Return(true, nil).Once()
-				fakeStore.On("GetProvisionedDataByDashboardID", mock.Anything, mock.AnythingOfType("int64")).Return(nil, nil).Once()
-				fakeStore.On("SaveDashboard", mock.Anything, mock.AnythingOfType("dashboards.SaveDashboardCommand")).Return(&dashboards.Dashboard{Data: simplejson.New()}, nil).Once()
-				fakeStore.On("SaveAlerts", mock.Anything, mock.Anything, mock.Anything).Return(errors.New("alert validation error")).Once()
-
-				dto.Dashboard = dashboards.NewDashboard("Dash")
-				dto.User = &user.SignedInUser{UserID: 1}
-				_, err := service.SaveDashboard(context.Background(), dto, false)
-				require.Error(t, err)
-				require.Equal(t, err.Error(), "alert validation error")
-			})
 		})
 
 		t.Run("Save provisioned dashboard validation", func(t *testing.T) {
@@ -160,9 +133,9 @@ func TestDashboardService(t *testing.T) {
 				fakeStore.On("ValidateDashboardBeforeSave", mock.Anything, mock.Anything, mock.AnythingOfType("bool")).Return(true, nil).Once()
 				fakeStore.On("SaveProvisionedDashboard", mock.Anything, mock.AnythingOfType("dashboards.SaveDashboardCommand"), mock.AnythingOfType("*dashboards.DashboardProvisioning")).Return(&dashboards.Dashboard{Data: simplejson.New()}, nil).Once()
 
-				oldRefreshInterval := setting.MinRefreshInterval
-				setting.MinRefreshInterval = "5m"
-				defer func() { setting.MinRefreshInterval = oldRefreshInterval }()
+				oldRefreshInterval := service.cfg.MinRefreshInterval
+				service.cfg.MinRefreshInterval = "5m"
+				defer func() { service.cfg.MinRefreshInterval = oldRefreshInterval }()
 
 				dto.Dashboard = dashboards.NewDashboard("Dash")
 				dto.Dashboard.SetID(3)
@@ -206,7 +179,7 @@ func TestDashboardService(t *testing.T) {
 
 		t.Run("Given non provisioned dashboard", func(t *testing.T) {
 			t.Run("DeleteProvisionedDashboard should delete the dashboard", func(t *testing.T) {
-				args := &dashboards.DeleteDashboardCommand{OrgID: 1, ID: 1, ForceDeleteFolderRules: false}
+				args := &dashboards.DeleteDashboardCommand{OrgID: 1, ID: 1}
 				fakeStore.On("DeleteDashboard", mock.Anything, args).Return(nil).Once()
 				err := service.DeleteProvisionedDashboard(context.Background(), 1, 1)
 				require.NoError(t, err)
@@ -219,69 +192,24 @@ func TestDashboardService(t *testing.T) {
 				err := service.DeleteDashboard(context.Background(), 1, 1)
 				require.NoError(t, err)
 			})
-
-			// t.Run("Delete ACL by user", func(t *testing.T) {
-			// 	fakeStore := dashboards.FakeDashboardStore{}
-			// 	args := 1
-			// 	fakeStore.On("DeleteACLByUser", mock.Anything, args).Return(nil).Once()
-			// 	err := service.DeleteACLByUser(context.Background(), 1)
-			// 	require.NoError(t, err)
-			// })
 		})
 
 		t.Run("Count dashboards in folder", func(t *testing.T) {
-			fakeStore.On("CountDashboardsInFolder", mock.Anything, mock.AnythingOfType("*dashboards.CountDashboardsInFolderRequest")).Return(int64(3), nil)
-			folderSvc.ExpectedFolder = &folder.Folder{ID: 1}
+			fakeStore.On("CountDashboardsInFolders", mock.Anything, mock.AnythingOfType("*dashboards.CountDashboardsInFolderRequest")).Return(int64(3), nil)
+			folderSvc.ExpectedFolder = &folder.Folder{UID: "i am a folder"}
 			// set up a ctx with signed in user
 			usr := &user.SignedInUser{UserID: 1}
 			ctx := appcontext.WithUser(context.Background(), usr)
 
-			count, err := service.CountInFolder(ctx, 1, "i am a folder", usr)
+			count, err := service.CountInFolders(ctx, 1, []string{"i am a folder"}, usr)
 			require.NoError(t, err)
 			require.Equal(t, int64(3), count)
 		})
 
 		t.Run("Delete dashboards in folder", func(t *testing.T) {
-			args := &dashboards.DeleteDashboardsInFolderRequest{OrgID: 1, FolderUID: "uid"}
-			fakeStore.On("DeleteDashboardsInFolder", mock.Anything, args).Return(nil).Once()
-			err := service.DeleteInFolder(context.Background(), 1, "uid", nil)
-			require.NoError(t, err)
-		})
-	})
-
-	t.Run("Delete user by acl", func(t *testing.T) {
-		fakeStore := dashboards.FakeDashboardStore{}
-		fakeStore.On("DeleteACLByUser", mock.Anything, mock.AnythingOfType("int64")).Return(nil)
-		defer fakeStore.AssertExpectations(t)
-
-		service := &DashboardServiceImpl{
-			cfg:                setting.NewCfg(),
-			log:                log.New("test.logger"),
-			dashboardStore:     &fakeStore,
-			dashAlertExtractor: &dummyDashAlertExtractor{},
-		}
-		err := service.DeleteACLByUser(context.Background(), 1)
-		require.NoError(t, err)
-	})
-
-	t.Run("When org user is deleted", func(t *testing.T) {
-		fakeStore := dashboards.FakeDashboardStore{}
-		fakeStore.On("GetDashboardACLInfoList", mock.Anything, mock.AnythingOfType("*dashboards.GetDashboardACLInfoListQuery")).Return(nil, nil)
-		t.Run("Should remove dependent permissions for deleted org user", func(t *testing.T) {
-			permQuery := &dashboards.GetDashboardACLInfoListQuery{DashboardID: 1, OrgID: 1}
-
-			permQueryResult, err := fakeStore.GetDashboardACLInfoList(context.Background(), permQuery)
-			require.NoError(t, err)
-
-			require.Equal(t, len(permQueryResult), 0)
-		})
-
-		t.Run("Should not remove dashboard permissions for same user in another org", func(t *testing.T) {
-			fakeStore := dashboards.FakeDashboardStore{}
-			fakeStore.On("GetDashboardACLInfoList", mock.Anything, mock.AnythingOfType("*dashboards.GetDashboardACLInfoListQuery")).Return(nil, nil)
-			permQuery := &dashboards.GetDashboardACLInfoListQuery{DashboardID: 2, OrgID: 3}
-
-			_, err := fakeStore.GetDashboardACLInfoList(context.Background(), permQuery)
+			args := &dashboards.DeleteDashboardsInFolderRequest{OrgID: 1, FolderUIDs: []string{"uid"}}
+			fakeStore.On("DeleteDashboardsInFolders", mock.Anything, args).Return(nil).Once()
+			err := service.DeleteInFolders(context.Background(), 1, []string{"uid"}, nil)
 			require.NoError(t, err)
 		})
 	})
diff --git a/pkg/services/dashboards/service/metrics.go b/pkg/services/dashboards/service/metrics.go
new file mode 100644
index 0000000000000..2fb45131a6090
--- /dev/null
+++ b/pkg/services/dashboards/service/metrics.go
@@ -0,0 +1,30 @@
+package service
+
+import (
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
+)
+
+const (
+	metricsNamespace = "grafana"
+	metricsSubSystem = "dashboards"
+)
+
+type dashboardsMetrics struct {
+	sharedWithMeFetchDashboardsRequestsDuration *prometheus.HistogramVec
+}
+
+func newDashboardsMetrics(r prometheus.Registerer) *dashboardsMetrics {
+	return &dashboardsMetrics{
+		sharedWithMeFetchDashboardsRequestsDuration: promauto.With(r).NewHistogramVec(
+			prometheus.HistogramOpts{
+				Name:      "sharedwithme_fetch_dashboards_duration_seconds",
+				Help:      "Duration of fetching dashboards with permissions directly assigned to user",
+				Buckets:   []float64{.005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10, 25, 50, 100},
+				Namespace: metricsNamespace,
+				Subsystem: metricsSubSystem,
+			},
+			[]string{"status"},
+		),
+	}
+}
diff --git a/pkg/services/dashboards/store_mock.go b/pkg/services/dashboards/store_mock.go
index 0e23d220237bf..d22013833ac49 100644
--- a/pkg/services/dashboards/store_mock.go
+++ b/pkg/services/dashboards/store_mock.go
@@ -1,14 +1,12 @@
-// Code generated by mockery v2.28.0. DO NOT EDIT.
+// Code generated by mockery v2.34.2. DO NOT EDIT.
 
 package dashboards
 
 import (
 	context "context"
 
-	models "github.com/grafana/grafana/pkg/services/alerting/models"
-	mock "github.com/stretchr/testify/mock"
-
 	quota "github.com/grafana/grafana/pkg/services/quota"
+	mock "github.com/stretchr/testify/mock"
 )
 
 // FakeDashboardStore is an autogenerated mock type for the Store type
@@ -42,8 +40,8 @@ func (_m *FakeDashboardStore) Count(_a0 context.Context, _a1 *quota.ScopeParamet
 	return r0, r1
 }
 
-// CountDashboardsInFolder provides a mock function with given fields: ctx, request
-func (_m *FakeDashboardStore) CountDashboardsInFolder(ctx context.Context, request *CountDashboardsInFolderRequest) (int64, error) {
+// CountDashboardsInFolders provides a mock function with given fields: ctx, request
+func (_m *FakeDashboardStore) CountDashboardsInFolders(ctx context.Context, request *CountDashboardsInFolderRequest) (int64, error) {
 	ret := _m.Called(ctx, request)
 
 	var r0 int64
@@ -66,20 +64,6 @@ func (_m *FakeDashboardStore) CountDashboardsInFolder(ctx context.Context, reque
 	return r0, r1
 }
 
-// DeleteACLByUser provides a mock function with given fields: _a0, _a1
-func (_m *FakeDashboardStore) DeleteACLByUser(_a0 context.Context, _a1 int64) error {
-	ret := _m.Called(_a0, _a1)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context, int64) error); ok {
-		r0 = rf(_a0, _a1)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
 // DeleteDashboard provides a mock function with given fields: ctx, cmd
 func (_m *FakeDashboardStore) DeleteDashboard(ctx context.Context, cmd *DeleteDashboardCommand) error {
 	ret := _m.Called(ctx, cmd)
@@ -94,8 +78,8 @@ func (_m *FakeDashboardStore) DeleteDashboard(ctx context.Context, cmd *DeleteDa
 	return r0
 }
 
-// DeleteDashboardsInFolder provides a mock function with given fields: ctx, request
-func (_m *FakeDashboardStore) DeleteDashboardsInFolder(ctx context.Context, request *DeleteDashboardsInFolderRequest) error {
+// DeleteDashboardsInFolders provides a mock function with given fields: ctx, request
+func (_m *FakeDashboardStore) DeleteDashboardsInFolders(ctx context.Context, request *DeleteDashboardsInFolderRequest) error {
 	ret := _m.Called(ctx, request)
 
 	var r0 error
@@ -174,32 +158,6 @@ func (_m *FakeDashboardStore) GetDashboard(ctx context.Context, query *GetDashbo
 	return r0, r1
 }
 
-// GetDashboardACLInfoList provides a mock function with given fields: ctx, query
-func (_m *FakeDashboardStore) GetDashboardACLInfoList(ctx context.Context, query *GetDashboardACLInfoListQuery) ([]*DashboardACLInfoDTO, error) {
-	ret := _m.Called(ctx, query)
-
-	var r0 []*DashboardACLInfoDTO
-	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardACLInfoListQuery) ([]*DashboardACLInfoDTO, error)); ok {
-		return rf(ctx, query)
-	}
-	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardACLInfoListQuery) []*DashboardACLInfoDTO); ok {
-		r0 = rf(ctx, query)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]*DashboardACLInfoDTO)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(context.Context, *GetDashboardACLInfoListQuery) error); ok {
-		r1 = rf(ctx, query)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
 // GetDashboardTags provides a mock function with given fields: ctx, query
 func (_m *FakeDashboardStore) GetDashboardTags(ctx context.Context, query *GetDashboardTagsQuery) ([]*DashboardTagCloudItem, error) {
 	ret := _m.Called(ctx, query)
@@ -382,20 +340,6 @@ func (_m *FakeDashboardStore) GetProvisionedDataByDashboardUID(ctx context.Conte
 	return r0, r1
 }
 
-// SaveAlerts provides a mock function with given fields: ctx, dashID, alerts
-func (_m *FakeDashboardStore) SaveAlerts(ctx context.Context, dashID int64, alerts []*models.Alert) error {
-	ret := _m.Called(ctx, dashID, alerts)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context, int64, []*models.Alert) error); ok {
-		r0 = rf(ctx, dashID, alerts)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
 // SaveDashboard provides a mock function with given fields: ctx, cmd
 func (_m *FakeDashboardStore) SaveDashboard(ctx context.Context, cmd SaveDashboardCommand) (*Dashboard, error) {
 	ret := _m.Called(ctx, cmd)
@@ -462,20 +406,6 @@ func (_m *FakeDashboardStore) UnprovisionDashboard(ctx context.Context, id int64
 	return r0
 }
 
-// UpdateDashboardACL provides a mock function with given fields: ctx, uid, items
-func (_m *FakeDashboardStore) UpdateDashboardACL(ctx context.Context, uid int64, items []*DashboardACL) error {
-	ret := _m.Called(ctx, uid, items)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context, int64, []*DashboardACL) error); ok {
-		r0 = rf(ctx, uid, items)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
 // ValidateDashboardBeforeSave provides a mock function with given fields: ctx, dashboard, overwrite
 func (_m *FakeDashboardStore) ValidateDashboardBeforeSave(ctx context.Context, dashboard *Dashboard, overwrite bool) (bool, error) {
 	ret := _m.Called(ctx, dashboard, overwrite)
@@ -500,13 +430,12 @@ func (_m *FakeDashboardStore) ValidateDashboardBeforeSave(ctx context.Context, d
 	return r0, r1
 }
 
-type mockConstructorTestingTNewFakeDashboardStore interface {
+// NewFakeDashboardStore creates a new instance of FakeDashboardStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewFakeDashboardStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewFakeDashboardStore creates a new instance of FakeDashboardStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewFakeDashboardStore(t mockConstructorTestingTNewFakeDashboardStore) *FakeDashboardStore {
+}) *FakeDashboardStore {
 	mock := &FakeDashboardStore{}
 	mock.Mock.Test(t)
 
diff --git a/pkg/services/dashboardsnapshots/database/database.go b/pkg/services/dashboardsnapshots/database/database.go
index 4d1bb798df990..0acd68838bf9c 100644
--- a/pkg/services/dashboardsnapshots/database/database.go
+++ b/pkg/services/dashboardsnapshots/database/database.go
@@ -16,26 +16,36 @@ import (
 type DashboardSnapshotStore struct {
 	store db.DB
 	log   log.Logger
-	cfg   *setting.Cfg
+
+	// deprecated behavior
+	skipDeleteExpired bool
 }
 
 // DashboardStore implements the Store interface
 var _ dashboardsnapshots.Store = (*DashboardSnapshotStore)(nil)
 
 func ProvideStore(db db.DB, cfg *setting.Cfg) *DashboardSnapshotStore {
-	return &DashboardSnapshotStore{store: db, log: log.New("dashboardsnapshot.store"), cfg: cfg}
+	// nolint:staticcheck
+	return NewStore(db, !cfg.SnapShotRemoveExpired)
+}
+
+func NewStore(db db.DB, skipDeleteExpired bool) *DashboardSnapshotStore {
+	log := log.New("dashboardsnapshot.store")
+	if skipDeleteExpired {
+		log.Warn("[Deprecated] The snapshot_remove_expired setting is outdated. Please remove from your config.")
+	}
+	return &DashboardSnapshotStore{store: db, skipDeleteExpired: skipDeleteExpired}
 }
 
 // DeleteExpiredSnapshots removes snapshots with old expiry dates.
 // SnapShotRemoveExpired is deprecated and should be removed in the future.
 // Snapshot expiry is decided by the user when they share the snapshot.
 func (d *DashboardSnapshotStore) DeleteExpiredSnapshots(ctx context.Context, cmd *dashboardsnapshots.DeleteExpiredSnapshotsCommand) error {
+	if d.skipDeleteExpired {
+		d.log.Warn("[Deprecated] The snapshot_remove_expired setting is outdated. Please remove from your config.")
+		return nil
+	}
 	return d.store.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		if !d.cfg.SnapShotRemoveExpired {
-			d.log.Warn("[Deprecated] The snapshot_remove_expired setting is outdated. Please remove from your config.")
-			return nil
-		}
-
 		deleteExpiredSQL := "DELETE FROM dashboard_snapshot WHERE expires < ?"
 		expiredResponse, err := sess.Exec(deleteExpiredSQL, time.Now())
 		if err != nil {
diff --git a/pkg/services/dashboardsnapshots/database/database_test.go b/pkg/services/dashboardsnapshots/database/database_test.go
index 7646a02e4ef1f..45e53d3ef6149 100644
--- a/pkg/services/dashboardsnapshots/database/database_test.go
+++ b/pkg/services/dashboardsnapshots/database/database_test.go
@@ -8,6 +8,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+	dashboardsnapshot "github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1"
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/services/dashboardsnapshots"
@@ -16,19 +18,25 @@ import (
 	"github.com/grafana/grafana/pkg/services/secrets/fakes"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationDashboardSnapshotDBAccess(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
 	sqlstore := db.InitTestDB(t)
-	dashStore := ProvideStore(sqlstore, setting.NewCfg())
+	cfg := setting.NewCfg()
+	dashStore := ProvideStore(sqlstore, cfg)
 
-	origSecret := setting.SecretKey
-	setting.SecretKey = "dashboard_snapshot_testing"
+	origSecret := cfg.SecretKey
+	cfg.SecretKey = "dashboard_snapshot_testing"
 	t.Cleanup(func() {
-		setting.SecretKey = origSecret
+		cfg.SecretKey = origSecret
 	})
 	secretsService := fakes.NewFakeSecretsService()
 	dashboard := simplejson.NewFromAny(map[string]any{"hello": "mupp"})
@@ -115,9 +123,11 @@ func TestIntegrationDashboardSnapshotDBAccess(t *testing.T) {
 			cmd := dashboardsnapshots.CreateDashboardSnapshotCommand{
 				Key:       "strangesnapshotwithuserid0",
 				DeleteKey: "adeletekey",
-				Dashboard: simplejson.NewFromAny(map[string]any{
-					"hello": "mupp",
-				}),
+				DashboardCreateCommand: dashboardsnapshot.DashboardCreateCommand{
+					Dashboard: &common.Unstructured{Object: map[string]any{
+						"hello": "mupp",
+					}},
+				},
 				UserID: 0,
 				OrgID:  1,
 			}
@@ -154,11 +164,9 @@ func TestIntegrationDeleteExpiredSnapshots(t *testing.T) {
 		t.Skip("skipping integration test")
 	}
 	sqlstore := db.InitTestDB(t)
-	dashStore := ProvideStore(sqlstore, setting.NewCfg())
+	dashStore := NewStore(sqlstore, false)
 
 	t.Run("Testing dashboard snapshots clean up", func(t *testing.T) {
-		dashStore.cfg.SnapShotRemoveExpired = true
-
 		nonExpiredSnapshot := createTestSnapshot(t, dashStore, "key1", 48000)
 		createTestSnapshot(t, dashStore, "key2", -1200)
 		createTestSnapshot(t, dashStore, "key3", -1200)
@@ -195,12 +203,14 @@ func createTestSnapshot(t *testing.T, dashStore *DashboardSnapshotStore, key str
 	cmd := dashboardsnapshots.CreateDashboardSnapshotCommand{
 		Key:       key,
 		DeleteKey: "delete" + key,
-		Dashboard: simplejson.NewFromAny(map[string]any{
-			"hello": "mupp",
-		}),
-		UserID:  1000,
-		OrgID:   1,
-		Expires: expires,
+		DashboardCreateCommand: dashboardsnapshot.DashboardCreateCommand{
+			Expires: expires,
+			Dashboard: &common.Unstructured{Object: map[string]any{
+				"hello": "mupp",
+			}},
+		},
+		UserID: 1000,
+		OrgID:  1,
 	}
 	result, err := dashStore.CreateDashboardSnapshot(context.Background(), &cmd)
 	require.NoError(t, err)
diff --git a/pkg/services/dashboardsnapshots/models.go b/pkg/services/dashboardsnapshots/models.go
index 00e5b4582e316..7e4becec46baa 100644
--- a/pkg/services/dashboardsnapshots/models.go
+++ b/pkg/services/dashboardsnapshots/models.go
@@ -3,6 +3,7 @@ package dashboardsnapshots
 import (
 	"time"
 
+	dashboardsnapshot "github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1"
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 )
@@ -29,11 +30,11 @@ type DashboardSnapshot struct {
 
 // DashboardSnapshotDTO without dashboard map
 type DashboardSnapshotDTO struct {
-	ID          int64  `json:"id" xorm:"id"`
+	ID          int64  `json:"-" xorm:"id"`
 	Name        string `json:"name"`
 	Key         string `json:"key"`
-	OrgID       int64  `json:"orgId" xorm:"org_id"`
-	UserID      int64  `json:"userId" xorm:"user_id"`
+	OrgID       int64  `json:"-" xorm:"org_id"`
+	UserID      int64  `json:"-" xorm:"user_id"`
 	External    bool   `json:"external"`
 	ExternalURL string `json:"externalUrl" xorm:"external_url"`
 
@@ -47,28 +48,17 @@ type DashboardSnapshotDTO struct {
 
 // swagger:model
 type CreateDashboardSnapshotCommand struct {
-	// The complete dashboard model.
-	// required:true
-	Dashboard *simplejson.Json `json:"dashboard" binding:"Required"`
-	// Snapshot name
-	// required:false
-	Name string `json:"name"`
-	// When the snapshot should expire in seconds in seconds. Default is never to expire.
-	// required:false
-	// default:0
-	Expires int64 `json:"expires"`
+	// The "public" fields are defined in this struct while the private/SQL/response params are
+	// defied in the rest of this command
+	dashboardsnapshot.DashboardCreateCommand
 
-	// these are passed when storing an external snapshot ref
-	// Save the snapshot on an external server rather than locally.
-	// required:false
-	// default: false
-	External          bool   `json:"external"`
 	ExternalURL       string `json:"-"`
 	ExternalDeleteURL string `json:"-"`
 
 	// Define the unique key. Required if `external` is `true`.
 	// required:false
 	Key string `json:"key"`
+
 	// Unique key used to delete the snapshot. It is different from the `key` so that only the creator can delete the snapshot. Required if `external` is `true`.
 	// required:false
 	DeleteKey string `json:"deleteKey"`
@@ -100,3 +90,10 @@ type GetDashboardSnapshotsQuery struct {
 	OrgID        int64
 	SignedInUser identity.Requester
 }
+
+type CreateExternalSnapshotResponse struct {
+	Key       string `json:"key"`
+	DeleteKey string `json:"deleteKey"`
+	Url       string `json:"url"`
+	DeleteUrl string `json:"deleteUrl"`
+}
diff --git a/pkg/services/dashboardsnapshots/service.go b/pkg/services/dashboardsnapshots/service.go
index ae229d27fed1c..3fcf4d42d4592 100644
--- a/pkg/services/dashboardsnapshots/service.go
+++ b/pkg/services/dashboardsnapshots/service.go
@@ -1,7 +1,22 @@
 package dashboardsnapshots
 
 import (
+	"bytes"
 	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"time"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+	dashboardsnapshot "github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1"
+	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/metrics"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util"
 )
 
 //go:generate mockery --name Service --structname MockService --inpackage --filename service_mock.go
@@ -12,3 +27,193 @@ type Service interface {
 	GetDashboardSnapshot(context.Context, *GetDashboardSnapshotQuery) (*DashboardSnapshot, error)
 	SearchDashboardSnapshots(context.Context, *GetDashboardSnapshotsQuery) (DashboardSnapshotsList, error)
 }
+
+var client = &http.Client{
+	Timeout:   time.Second * 5,
+	Transport: &http.Transport{Proxy: http.ProxyFromEnvironment},
+}
+
+func CreateDashboardSnapshot(c *contextmodel.ReqContext, cfg dashboardsnapshot.SnapshotSharingOptions, cmd CreateDashboardSnapshotCommand, svc Service) {
+	if !cfg.SnapshotsEnabled {
+		c.JsonApiErr(http.StatusForbidden, "Dashboard Snapshots are disabled", nil)
+		return
+	}
+
+	if cmd.DashboardCreateCommand.Name == "" {
+		cmd.DashboardCreateCommand.Name = "Unnamed snapshot"
+	}
+
+	userID, err := identity.UserIdentifier(c.SignedInUser.GetNamespacedID())
+	if err != nil {
+		c.JsonApiErr(http.StatusInternalServerError,
+			"Failed to create external snapshot", err)
+		return
+	}
+
+	var snapshotUrl string
+	cmd.ExternalURL = ""
+	cmd.OrgID = c.SignedInUser.GetOrgID()
+	cmd.UserID = userID
+	originalDashboardURL, err := createOriginalDashboardURL(&cmd)
+	if err != nil {
+		c.JsonApiErr(http.StatusInternalServerError, "Invalid app URL", err)
+		return
+	}
+
+	if cmd.DashboardCreateCommand.External {
+		if !cfg.ExternalEnabled {
+			c.JsonApiErr(http.StatusForbidden, "External dashboard creation is disabled", nil)
+			return
+		}
+
+		resp, err := createExternalDashboardSnapshot(cmd, cfg.ExternalSnapshotURL)
+		if err != nil {
+			c.JsonApiErr(http.StatusInternalServerError, "Failed to create external snapshot", err)
+			return
+		}
+
+		snapshotUrl = resp.Url
+		cmd.Key = resp.Key
+		cmd.DeleteKey = resp.DeleteKey
+		cmd.ExternalURL = resp.Url
+		cmd.ExternalDeleteURL = resp.DeleteUrl
+		cmd.DashboardCreateCommand.Dashboard = &common.Unstructured{}
+
+		metrics.MApiDashboardSnapshotExternal.Inc()
+	} else {
+		cmd.DashboardCreateCommand.Dashboard.SetNestedField(originalDashboardURL, "snapshot", "originalUrl")
+
+		if cmd.Key == "" {
+			var err error
+			cmd.Key, err = util.GetRandomString(32)
+			if err != nil {
+				c.JsonApiErr(http.StatusInternalServerError, "Could not generate random string", err)
+				return
+			}
+		}
+
+		if cmd.DeleteKey == "" {
+			var err error
+			cmd.DeleteKey, err = util.GetRandomString(32)
+			if err != nil {
+				c.JsonApiErr(http.StatusInternalServerError, "Could not generate random string", err)
+				return
+			}
+		}
+
+		snapshotUrl = setting.ToAbsUrl("dashboard/snapshot/" + cmd.Key)
+
+		metrics.MApiDashboardSnapshotCreate.Inc()
+	}
+
+	result, err := svc.CreateDashboardSnapshot(c.Req.Context(), &cmd)
+	if err != nil {
+		c.JsonApiErr(http.StatusInternalServerError, "Failed to create snapshot", err)
+		return
+	}
+
+	c.JSON(http.StatusOK, dashboardsnapshot.DashboardCreateResponse{
+		Key:       result.Key,
+		DeleteKey: result.DeleteKey,
+		URL:       snapshotUrl,
+		DeleteURL: setting.ToAbsUrl("api/snapshots-delete/" + result.DeleteKey),
+	})
+}
+
+var plog = log.New("external-snapshot")
+
+func DeleteExternalDashboardSnapshot(externalUrl string) error {
+	resp, err := client.Get(externalUrl)
+	if err != nil {
+		return err
+	}
+
+	defer func() {
+		if err := resp.Body.Close(); err != nil {
+			plog.Warn("Failed to close response body", "err", err)
+		}
+	}()
+
+	if resp.StatusCode == 200 {
+		return nil
+	}
+
+	// Gracefully ignore "snapshot not found" errors as they could have already
+	// been removed either via the cleanup script or by request.
+	if resp.StatusCode == 500 {
+		var respJson map[string]any
+		if err := json.NewDecoder(resp.Body).Decode(&respJson); err != nil {
+			return err
+		}
+
+		if respJson["message"] == "Failed to get dashboard snapshot" {
+			return nil
+		}
+	}
+
+	return fmt.Errorf("unexpected response when deleting external snapshot, status code: %d", resp.StatusCode)
+}
+
+func createExternalDashboardSnapshot(cmd CreateDashboardSnapshotCommand, externalSnapshotUrl string) (*CreateExternalSnapshotResponse, error) {
+	var createSnapshotResponse CreateExternalSnapshotResponse
+	message := map[string]any{
+		"name":      cmd.Name,
+		"expires":   cmd.Expires,
+		"dashboard": cmd.Dashboard,
+		"key":       cmd.Key,
+		"deleteKey": cmd.DeleteKey,
+	}
+
+	messageBytes, err := simplejson.NewFromAny(message).Encode()
+	if err != nil {
+		return nil, err
+	}
+
+	resp, err := client.Post(externalSnapshotUrl+"/api/snapshots", "application/json", bytes.NewBuffer(messageBytes))
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		if err := resp.Body.Close(); err != nil {
+			plog.Warn("Failed to close response body", "err", err)
+		}
+	}()
+
+	if resp.StatusCode != 200 {
+		return nil, fmt.Errorf("create external snapshot response status code %d", resp.StatusCode)
+	}
+
+	if err := json.NewDecoder(resp.Body).Decode(&createSnapshotResponse); err != nil {
+		return nil, err
+	}
+
+	return &createSnapshotResponse, nil
+}
+
+func createOriginalDashboardURL(cmd *CreateDashboardSnapshotCommand) (string, error) {
+	dashUID := cmd.Dashboard.GetNestedString("uid")
+	if ok := util.IsValidShortUID(dashUID); !ok {
+		return "", fmt.Errorf("invalid dashboard UID")
+	}
+
+	return fmt.Sprintf("/d/%v", dashUID), nil
+}
+
+func DeleteWithKey(ctx context.Context, key string, svc Service) error {
+	query := &GetDashboardSnapshotQuery{DeleteKey: key}
+	queryResult, err := svc.GetDashboardSnapshot(ctx, query)
+	if err != nil {
+		return err
+	}
+
+	if queryResult.External {
+		err := DeleteExternalDashboardSnapshot(queryResult.ExternalDeleteURL)
+		if err != nil {
+			return err
+		}
+	}
+
+	cmd := &DeleteDashboardSnapshotCommand{DeleteKey: queryResult.DeleteKey}
+
+	return svc.DeleteDashboardSnapshot(ctx, cmd)
+}
diff --git a/pkg/services/dashboardsnapshots/service/service.go b/pkg/services/dashboardsnapshots/service/service.go
index 247f0e7aec9c3..c26f00e7d2329 100644
--- a/pkg/services/dashboardsnapshots/service/service.go
+++ b/pkg/services/dashboardsnapshots/service/service.go
@@ -26,7 +26,7 @@ func ProvideService(store dashboardsnapshots.Store, secretsService secrets.Servi
 }
 
 func (s *ServiceImpl) CreateDashboardSnapshot(ctx context.Context, cmd *dashboardsnapshots.CreateDashboardSnapshotCommand) (*dashboardsnapshots.DashboardSnapshot, error) {
-	marshalledData, err := cmd.Dashboard.Encode()
+	marshalledData, err := cmd.Dashboard.MarshalJSON()
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/services/dashboardsnapshots/service/service_test.go b/pkg/services/dashboardsnapshots/service/service_test.go
index d18e77cea67a4..f71de4d176829 100644
--- a/pkg/services/dashboardsnapshots/service/service_test.go
+++ b/pkg/services/dashboardsnapshots/service/service_test.go
@@ -2,35 +2,44 @@ package service
 
 import (
 	"context"
+	"encoding/json"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/grafana/pkg/components/simplejson"
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+	dashboardsnapshot "github.com/grafana/grafana/pkg/apis/dashboardsnapshot/v0alpha1"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/services/dashboardsnapshots"
 	dashsnapdb "github.com/grafana/grafana/pkg/services/dashboardsnapshots/database"
 	"github.com/grafana/grafana/pkg/services/secrets/database"
 	secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestDashboardSnapshotsService(t *testing.T) {
 	sqlStore := db.InitTestDB(t)
-	dsStore := dashsnapdb.ProvideStore(sqlStore, setting.NewCfg())
+	cfg := setting.NewCfg()
+	dsStore := dashsnapdb.ProvideStore(sqlStore, cfg)
 	secretsService := secretsManager.SetupTestService(t, database.ProvideSecretsStore(sqlStore))
 	s := ProvideService(dsStore, secretsService)
 
-	origSecret := setting.SecretKey
-	setting.SecretKey = "dashboard_snapshot_service_test"
+	origSecret := cfg.SecretKey
+	cfg.SecretKey = "dashboard_snapshot_service_test"
 	t.Cleanup(func() {
-		setting.SecretKey = origSecret
+		cfg.SecretKey = origSecret
 	})
 
 	dashboardKey := "12345"
 
+	dashboard := &common.Unstructured{}
 	rawDashboard := []byte(`{"id":123}`)
-	dashboard, err := simplejson.NewJson(rawDashboard)
+	err := json.Unmarshal(rawDashboard, dashboard)
 	require.NoError(t, err)
 
 	t.Run("create dashboard snapshot should encrypt the dashboard", func(t *testing.T) {
@@ -39,7 +48,9 @@ func TestDashboardSnapshotsService(t *testing.T) {
 		cmd := dashboardsnapshots.CreateDashboardSnapshotCommand{
 			Key:       dashboardKey,
 			DeleteKey: dashboardKey,
-			Dashboard: dashboard,
+			DashboardCreateCommand: dashboardsnapshot.DashboardCreateCommand{
+				Dashboard: dashboard,
+			},
 		}
 
 		result, err := s.CreateDashboardSnapshot(ctx, &cmd)
diff --git a/pkg/services/dashboardsnapshots/service_mock.go b/pkg/services/dashboardsnapshots/service_mock.go
index 95ae9708c92ba..8773fbd3a68a7 100644
--- a/pkg/services/dashboardsnapshots/service_mock.go
+++ b/pkg/services/dashboardsnapshots/service_mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.16.0. DO NOT EDIT.
+// Code generated by mockery v2.32.0. DO NOT EDIT.
 
 package dashboardsnapshots
 
@@ -18,6 +18,10 @@ func (_m *MockService) CreateDashboardSnapshot(_a0 context.Context, _a1 *CreateD
 	ret := _m.Called(_a0, _a1)
 
 	var r0 *DashboardSnapshot
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *CreateDashboardSnapshotCommand) (*DashboardSnapshot, error)); ok {
+		return rf(_a0, _a1)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *CreateDashboardSnapshotCommand) *DashboardSnapshot); ok {
 		r0 = rf(_a0, _a1)
 	} else {
@@ -26,7 +30,6 @@ func (_m *MockService) CreateDashboardSnapshot(_a0 context.Context, _a1 *CreateD
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *CreateDashboardSnapshotCommand) error); ok {
 		r1 = rf(_a0, _a1)
 	} else {
@@ -69,6 +72,10 @@ func (_m *MockService) GetDashboardSnapshot(_a0 context.Context, _a1 *GetDashboa
 	ret := _m.Called(_a0, _a1)
 
 	var r0 *DashboardSnapshot
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardSnapshotQuery) (*DashboardSnapshot, error)); ok {
+		return rf(_a0, _a1)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardSnapshotQuery) *DashboardSnapshot); ok {
 		r0 = rf(_a0, _a1)
 	} else {
@@ -77,7 +84,6 @@ func (_m *MockService) GetDashboardSnapshot(_a0 context.Context, _a1 *GetDashboa
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *GetDashboardSnapshotQuery) error); ok {
 		r1 = rf(_a0, _a1)
 	} else {
@@ -92,6 +98,10 @@ func (_m *MockService) SearchDashboardSnapshots(_a0 context.Context, _a1 *GetDas
 	ret := _m.Called(_a0, _a1)
 
 	var r0 DashboardSnapshotsList
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardSnapshotsQuery) (DashboardSnapshotsList, error)); ok {
+		return rf(_a0, _a1)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *GetDashboardSnapshotsQuery) DashboardSnapshotsList); ok {
 		r0 = rf(_a0, _a1)
 	} else {
@@ -100,7 +110,6 @@ func (_m *MockService) SearchDashboardSnapshots(_a0 context.Context, _a1 *GetDas
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *GetDashboardSnapshotsQuery) error); ok {
 		r1 = rf(_a0, _a1)
 	} else {
@@ -110,13 +119,12 @@ func (_m *MockService) SearchDashboardSnapshots(_a0 context.Context, _a1 *GetDas
 	return r0, r1
 }
 
-type mockConstructorTestingTNewMockService interface {
+// NewMockService creates a new instance of MockService. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewMockService(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewMockService creates a new instance of MockService. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewMockService(t mockConstructorTestingTNewMockService) *MockService {
+}) *MockService {
 	mock := &MockService{}
 	mock.Mock.Test(t)
 
diff --git a/pkg/services/dashboardversion/dashverimpl/dashver.go b/pkg/services/dashboardversion/dashverimpl/dashver.go
index f8b090560ba9d..04fed84c9bd6d 100644
--- a/pkg/services/dashboardversion/dashverimpl/dashver.go
+++ b/pkg/services/dashboardversion/dashverimpl/dashver.go
@@ -17,13 +17,15 @@ const (
 )
 
 type Service struct {
+	cfg     *setting.Cfg
 	store   store
 	dashSvc dashboards.DashboardService
 	log     log.Logger
 }
 
-func ProvideService(db db.DB, dashboardService dashboards.DashboardService) dashver.Service {
+func ProvideService(cfg *setting.Cfg, db db.DB, dashboardService dashboards.DashboardService) dashver.Service {
 	return &Service{
+		cfg: cfg,
 		store: &sqlStore{
 			db:      db,
 			dialect: db.GetDialect(),
@@ -63,7 +65,7 @@ func (s *Service) Get(ctx context.Context, query *dashver.GetDashboardVersionQue
 }
 
 func (s *Service) DeleteExpired(ctx context.Context, cmd *dashver.DeleteExpiredVersionsCommand) error {
-	versionsToKeep := setting.DashboardVersionsToKeep
+	versionsToKeep := s.cfg.DashboardVersionsToKeep
 	if versionsToKeep < 1 {
 		versionsToKeep = 1
 	}
diff --git a/pkg/services/dashboardversion/dashverimpl/dashver_test.go b/pkg/services/dashboardversion/dashverimpl/dashver_test.go
index 6f672f62714cc..7ec8fc4ef64bf 100644
--- a/pkg/services/dashboardversion/dashverimpl/dashver_test.go
+++ b/pkg/services/dashboardversion/dashverimpl/dashver_test.go
@@ -36,11 +36,13 @@ func TestDashboardVersionService(t *testing.T) {
 
 func TestDeleteExpiredVersions(t *testing.T) {
 	versionsToKeep := 5
-	setting.DashboardVersionsToKeep = versionsToKeep
+	cfg := setting.NewCfg()
+	cfg.DashboardVersionsToKeep = versionsToKeep
 
 	dashboardVersionStore := newDashboardVersionStoreFake()
 	dashboardService := dashboards.NewFakeDashboardService(t)
-	dashboardVersionService := Service{store: dashboardVersionStore, dashSvc: dashboardService}
+	dashboardVersionService := Service{
+		cfg: cfg, store: dashboardVersionStore, dashSvc: dashboardService}
 
 	t.Run("Don't delete anything if there are no expired versions", func(t *testing.T) {
 		err := dashboardVersionService.DeleteExpired(context.Background(), &dashver.DeleteExpiredVersionsCommand{DeletedRows: 4})
diff --git a/pkg/services/dashboardversion/dashverimpl/sqlx_store.go b/pkg/services/dashboardversion/dashverimpl/sqlx_store.go
deleted file mode 100644
index 10be3cb6962fd..0000000000000
--- a/pkg/services/dashboardversion/dashverimpl/sqlx_store.go
+++ /dev/null
@@ -1,86 +0,0 @@
-package dashverimpl
-
-import (
-	"context"
-	"database/sql"
-	"errors"
-	"strings"
-
-	dashver "github.com/grafana/grafana/pkg/services/dashboardversion"
-	"github.com/grafana/grafana/pkg/services/sqlstore/session"
-)
-
-type sqlxStore struct {
-	sess *session.SessionDB
-}
-
-func (ss *sqlxStore) Get(ctx context.Context, query *dashver.GetDashboardVersionQuery) (*dashver.DashboardVersion, error) {
-	var version dashver.DashboardVersion
-	qr := `SELECT dashboard_version.* 
-	FROM dashboard_version
-	LEFT JOIN dashboard ON dashboard.id=dashboard_version.dashboard_id
-	WHERE dashboard_version.dashboard_id=? AND dashboard_version.version=? AND dashboard.org_id=? 
-	`
-	err := ss.sess.Get(ctx, &version, qr, query.DashboardID, query.Version, query.OrgID)
-	if err != nil && errors.Is(err, sql.ErrNoRows) {
-		return nil, dashver.ErrDashboardVersionNotFound
-	}
-	return &version, err
-}
-
-func (ss *sqlxStore) GetBatch(ctx context.Context, cmd *dashver.DeleteExpiredVersionsCommand, perBatch int, versionsToKeep int) ([]any, error) {
-	var versionIds []any
-	versionIdsToDeleteQuery := `SELECT id
-	FROM dashboard_version, (
-		SELECT dashboard_id, count(version) as count, min(version) as min
-		FROM dashboard_version
-		GROUP BY dashboard_id
-	) AS vtd
-	WHERE dashboard_version.dashboard_id=vtd.dashboard_id
-	AND version < vtd.min + vtd.count - ?
-	LIMIT ?`
-	err := ss.sess.Get(ctx, &versionIds, versionIdsToDeleteQuery, versionsToKeep, perBatch)
-	return versionIds, err
-}
-
-// This service is used by cleanup which need to belong to the same transaction
-// Here we need to make sure that the transaction is shared between services
-func (ss *sqlxStore) DeleteBatch(ctx context.Context, cmd *dashver.DeleteExpiredVersionsCommand, versionIdsToDelete []any) (int64, error) {
-	var deleted int64
-	err := ss.sess.WithTransaction(ctx, func(tx *session.SessionTx) error {
-		deleteExpiredSQL := `DELETE FROM dashboard_version WHERE id IN (?` + strings.Repeat(",?", len(versionIdsToDelete)-1) + `)`
-		expiredResponse, err := tx.Exec(ctx, deleteExpiredSQL, versionIdsToDelete...)
-		if err != nil {
-			return err
-		}
-		deleted, err = expiredResponse.RowsAffected()
-		return err
-	})
-	return deleted, err
-}
-
-func (ss *sqlxStore) List(ctx context.Context, query *dashver.ListDashboardVersionsQuery) ([]*dashver.DashboardVersion, error) {
-	var dashboardVersion []*dashver.DashboardVersion
-	qr := `SELECT dashboard_version.id,
-				dashboard_version.dashboard_id,
-				dashboard_version.parent_version,
-				dashboard_version.restored_from,
-				dashboard_version.version,
-				dashboard_version.created,
-				dashboard_version.created_by,
-				dashboard_version.message
-			FROM dashboard_version
-			LEFT JOIN dashboard ON dashboard.id = dashboard_version.dashboard_id
-			WHERE dashboard_version.dashboard_id=? AND dashboard.org_id=?
-			ORDER BY dashboard_version.version DESC
-			LIMIT ? OFFSET ?`
-
-	err := ss.sess.Select(ctx, &dashboardVersion, qr, query.DashboardID, query.OrgID, query.Limit, query.Start)
-	if err != nil {
-		return nil, err
-	}
-	if len(dashboardVersion) < 1 {
-		return nil, dashver.ErrNoVersionsForDashboardID
-	}
-	return dashboardVersion, nil
-}
diff --git a/pkg/services/dashboardversion/dashverimpl/sqlx_store_test.go b/pkg/services/dashboardversion/dashverimpl/sqlx_store_test.go
deleted file mode 100644
index 59ffe69e9462b..0000000000000
--- a/pkg/services/dashboardversion/dashverimpl/sqlx_store_test.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package dashverimpl
-
-import (
-	"testing"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-)
-
-func TestIntegrationSQLxGetDashboardVersion(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	testIntegrationGetDashboardVersion(t, func(ss db.DB) store {
-		return &sqlxStore{
-			sess: ss.GetSqlxSession(),
-		}
-	})
-}
diff --git a/pkg/services/dashboardversion/dashverimpl/store_test.go b/pkg/services/dashboardversion/dashverimpl/store_test.go
index cd7d6c029c880..cccd1d220ce52 100644
--- a/pkg/services/dashboardversion/dashverimpl/store_test.go
+++ b/pkg/services/dashboardversion/dashverimpl/store_test.go
@@ -13,9 +13,14 @@ import (
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	dashver "github.com/grafana/grafana/pkg/services/dashboardversion"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 	"github.com/grafana/grafana/pkg/util"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 type getStore func(db.DB) store
 
 func testIntegrationGetDashboardVersion(t *testing.T, fn getStore) {
@@ -25,7 +30,7 @@ func testIntegrationGetDashboardVersion(t *testing.T, fn getStore) {
 	dashVerStore := fn(ss)
 
 	t.Run("Get a Dashboard ID and version ID", func(t *testing.T) {
-		savedDash := insertTestDashboard(t, ss, "test dash 26", 1, 0, "", false, "diff")
+		savedDash := insertTestDashboard(t, ss, "test dash 26", 1, "", false, "diff")
 
 		query := dashver.GetDashboardVersionQuery{
 			DashboardID: savedDash.ID,
@@ -67,7 +72,7 @@ func testIntegrationGetDashboardVersion(t *testing.T, fn getStore) {
 	t.Run("Clean up old dashboard versions", func(t *testing.T) {
 		versionsToWrite := 10
 		for i := 0; i < versionsToWrite-1; i++ {
-			insertTestDashboard(t, ss, "test dash 53", 1, int64(i), strconv.Itoa(i), false, "diff-all")
+			insertTestDashboard(t, ss, "test dash 53"+strconv.Itoa(i), 1, strconv.Itoa(i), false, "diff-all")
 		}
 		versionIDsToDelete := []any{1, 2, 3, 4}
 		res, err := dashVerStore.DeleteBatch(
@@ -79,7 +84,7 @@ func testIntegrationGetDashboardVersion(t *testing.T, fn getStore) {
 		assert.EqualValues(t, 4, res)
 	})
 
-	savedDash := insertTestDashboard(t, ss, "test dash 43", 1, 0, "", false, "diff-all")
+	savedDash := insertTestDashboard(t, ss, "test dash 43", 1, "", false, "diff-all")
 	t.Run("Get all versions for a given Dashboard ID", func(t *testing.T) {
 		query := dashver.ListDashboardVersionsQuery{
 			DashboardID: savedDash.ID,
@@ -135,11 +140,10 @@ var (
 )
 
 func insertTestDashboard(t *testing.T, sqlStore db.DB, title string, orgId int64,
-	folderId int64, folderUID string, isFolder bool, tags ...any) *dashboards.Dashboard {
+	folderUID string, isFolder bool, tags ...any) *dashboards.Dashboard {
 	t.Helper()
 	cmd := dashboards.SaveDashboardCommand{
 		OrgID:     orgId,
-		FolderID:  folderId,
 		FolderUID: folderUID,
 		IsFolder:  isFolder,
 		Dashboard: simplejson.NewFromAny(map[string]any{
diff --git a/pkg/services/datasourceproxy/datasourceproxy_test.go b/pkg/services/datasourceproxy/datasourceproxy_test.go
index 5d60a43e9cfbc..cf26cfab381d2 100644
--- a/pkg/services/datasourceproxy/datasourceproxy_test.go
+++ b/pkg/services/datasourceproxy/datasourceproxy_test.go
@@ -69,19 +69,16 @@ func TestDataProxy(t *testing.T) {
 // Tests request to datasource proxy service
 func TestDatasourceProxy_proxyDatasourceRequest(t *testing.T) {
 	tcs := []struct {
-		name             string
-		dsURL            string
-		expectedErrorMsg string
+		name  string
+		dsURL string
 	}{
 		{
-			name:             "Empty datasource URL will return a 400 HTTP status code",
-			dsURL:            "",
-			expectedErrorMsg: "validation of data source URL \"\" failed: empty URL string",
+			name:  "Empty datasource URL will return a 400 HTTP status code",
+			dsURL: "",
 		},
 		{
-			name:             "Invalid datasource URL will return a 400 HTTP status code",
-			dsURL:            "://host/path",
-			expectedErrorMsg: "validation of data source URL \"://host/path\" failed: parse \"://host/path\": missing protocol scheme",
+			name:  "Invalid datasource URL will return a 400 HTTP status code",
+			dsURL: "://host/path",
 		},
 	}
 	for _, tc := range tcs {
@@ -124,7 +121,6 @@ func TestDatasourceProxy_proxyDatasourceRequest(t *testing.T) {
 
 			require.Equal(t, http.StatusBadRequest, resp.StatusCode)
 			require.Equal(t, fmt.Sprintf("Invalid data source URL: %q", tc.dsURL), jsonBody["message"])
-			require.Equal(t, tc.expectedErrorMsg, jsonBody["error"])
 		})
 	}
 }
diff --git a/pkg/services/datasources/accesscontrol.go b/pkg/services/datasources/accesscontrol.go
index aae4773e18ad0..03d88e8e3bd14 100644
--- a/pkg/services/datasources/accesscontrol.go
+++ b/pkg/services/datasources/accesscontrol.go
@@ -26,10 +26,10 @@ var (
 	// ConfigurationPageAccess is used to protect the "Configure > Data sources" tab access
 	ConfigurationPageAccess = accesscontrol.EvalAny(
 		accesscontrol.EvalPermission(accesscontrol.ActionDatasourcesExplore),
+		accesscontrol.EvalPermission(ActionCreate),
 		accesscontrol.EvalAll(
 			accesscontrol.EvalPermission(ActionRead),
 			accesscontrol.EvalAny(
-				accesscontrol.EvalPermission(ActionCreate),
 				accesscontrol.EvalPermission(ActionDelete),
 				accesscontrol.EvalPermission(ActionWrite),
 			),
diff --git a/pkg/services/datasources/datasources.go b/pkg/services/datasources/datasources.go
index accc207588736..cc4573fb21c40 100644
--- a/pkg/services/datasources/datasources.go
+++ b/pkg/services/datasources/datasources.go
@@ -58,7 +58,7 @@ type DataSourceService interface {
 	// CustomHeaders returns a map of custom headers the user might have
 	// configured for this Datasource. Not every datasource can has the option
 	// to configure those.
-	CustomHeaders(ctx context.Context, ds *DataSource) (map[string]string, error)
+	CustomHeaders(ctx context.Context, ds *DataSource) (http.Header, error)
 }
 
 // CacheService interface for retrieving a cached datasource.
diff --git a/pkg/services/datasources/fakes/fake_datasource_service.go b/pkg/services/datasources/fakes/fake_datasource_service.go
index 69959cc6d5739..3f9fcf4d5602a 100644
--- a/pkg/services/datasources/fakes/fake_datasource_service.go
+++ b/pkg/services/datasources/fakes/fake_datasource_service.go
@@ -134,6 +134,6 @@ func (s *FakeDataSourceService) DecryptedPassword(ctx context.Context, ds *datas
 	return "", nil
 }
 
-func (s *FakeDataSourceService) CustomHeaders(ctx context.Context, ds *datasources.DataSource) (map[string]string, error) {
+func (s *FakeDataSourceService) CustomHeaders(ctx context.Context, ds *datasources.DataSource) (http.Header, error) {
 	return nil, nil
 }
diff --git a/pkg/services/datasources/models.go b/pkg/services/datasources/models.go
index 3e4ccc4a5a971..98a279498998f 100644
--- a/pkg/services/datasources/models.go
+++ b/pkg/services/datasources/models.go
@@ -2,6 +2,7 @@ package datasources
 
 import (
 	"encoding/json"
+	"errors"
 	"time"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
@@ -22,7 +23,7 @@ const (
 	DS_TEMPO          = "tempo"
 	DS_ZIPKIN         = "zipkin"
 	DS_MYSQL          = "mysql"
-	DS_POSTGRES       = "postgres"
+	DS_POSTGRES       = "grafana-postgresql-datasource"
 	DS_MSSQL          = "mssql"
 	DS_ACCESS_DIRECT  = "direct"
 	DS_ACCESS_PROXY   = "proxy"
@@ -70,31 +71,55 @@ type TeamHTTPHeadersJSONData struct {
 	TeamHTTPHeaders TeamHTTPHeaders `json:"teamHttpHeaders"`
 }
 
-type TeamHTTPHeaders map[string][]TeamHTTPHeader
+type TeamHTTPHeaders struct {
+	Headers        TeamHeaders `json:"headers"`
+	RestrictAccess bool        `json:"restrictAccess"`
+}
+
+type TeamHeaders map[string][]TeamHTTPHeader
 
 type TeamHTTPHeader struct {
 	Header string `json:"header"`
 	Value  string `json:"value"`
 }
 
-func (ds DataSource) TeamHTTPHeaders() (TeamHTTPHeaders, error) {
+func (ds DataSource) TeamHTTPHeaders() (*TeamHTTPHeaders, error) {
 	return GetTeamHTTPHeaders(ds.JsonData)
 }
 
-func GetTeamHTTPHeaders(jsonData *simplejson.Json) (TeamHTTPHeaders, error) {
-	teamHTTPHeadersJSON := TeamHTTPHeaders{}
-	if jsonData != nil && jsonData.Get("teamHttpHeaders") != nil {
-		jsonData, err := jsonData.Get("teamHttpHeaders").MarshalJSON()
-		if err != nil {
-			return nil, err
+func GetTeamHTTPHeaders(jsonData *simplejson.Json) (*TeamHTTPHeaders, error) {
+	teamHTTPHeaders := &TeamHTTPHeaders{}
+	if jsonData == nil {
+		return nil, nil
+	}
+	if _, ok := jsonData.CheckGet("teamHttpHeaders"); !ok {
+		return nil, nil
+	}
+
+	teamHTTPHeadersJSON, err := jsonData.Get("teamHttpHeaders").MarshalJSON()
+	if err != nil {
+		return nil, err
+	}
+	err = json.Unmarshal(teamHTTPHeadersJSON, teamHTTPHeaders)
+	if err != nil {
+		return nil, err
+	}
+	for teamID, headers := range teamHTTPHeaders.Headers {
+		if teamID == "" {
+			return nil, errors.New("teamID is missing or empty in teamHttpHeaders")
 		}
-		err = json.Unmarshal(jsonData, &teamHTTPHeadersJSON)
-		if err != nil {
-			return nil, err
+
+		for _, header := range headers {
+			if header.Header == "" {
+				return nil, errors.New("header name is missing or empty")
+			}
+			if header.Value == "" {
+				return nil, errors.New("header value is missing or empty")
+			}
 		}
 	}
 
-	return teamHTTPHeadersJSON, nil
+	return teamHTTPHeaders, nil
 }
 
 // AllowedCookies parses the jsondata.keepCookies and returns a list of
@@ -123,7 +148,7 @@ func (e ErrDatasourceSecretsPluginUserFriendly) Error() string {
 
 // Also acts as api DTO
 type AddDataSourceCommand struct {
-	Name            string            `json:"name" binding:"Required"`
+	Name            string            `json:"name"`
 	Type            string            `json:"type" binding:"Required"`
 	Access          DsAccess          `json:"access" binding:"Required"`
 	URL             string            `json:"url"`
diff --git a/pkg/services/datasources/models_test.go b/pkg/services/datasources/models_test.go
index c6838447440b3..782bf43f47550 100644
--- a/pkg/services/datasources/models_test.go
+++ b/pkg/services/datasources/models_test.go
@@ -63,14 +63,16 @@ func TestTeamHTTPHeaders(t *testing.T) {
 	testCases := []struct {
 		desc  string
 		given string
-		want  TeamHTTPHeaders
+		want  *TeamHTTPHeaders
 	}{
 		{
 			desc:  "Usual json data with teamHttpHeaders",
-			given: `{"teamHttpHeaders": {"101": [{"header": "X-CUSTOM-HEADER", "value": "foo"}]}}`,
-			want: TeamHTTPHeaders{
-				"101": {
-					{Header: "X-CUSTOM-HEADER", Value: "foo"},
+			given: `{"teamHttpHeaders": {"headers": {"101": [{"header": "X-CUSTOM-HEADER", "value": "foo"}]}}}`,
+			want: &TeamHTTPHeaders{
+				Headers: TeamHeaders{
+					"101": {
+						{Header: "X-CUSTOM-HEADER", Value: "foo"},
+					},
 				},
 			},
 		},
diff --git a/pkg/services/datasources/service/datasource.go b/pkg/services/datasources/service/datasource.go
index fe193937529ca..dc4d749b56065 100644
--- a/pkg/services/datasources/service/datasource.go
+++ b/pkg/services/datasources/service/datasource.go
@@ -188,17 +188,30 @@ func (s *Service) GetDataSourcesByType(ctx context.Context, query *datasources.G
 }
 
 func (s *Service) AddDataSource(ctx context.Context, cmd *datasources.AddDataSourceCommand) (*datasources.DataSource, error) {
-	var dataSource *datasources.DataSource
+	dataSources, err := s.SQLStore.GetDataSources(ctx, &datasources.GetDataSourcesQuery{OrgID: cmd.OrgID})
+	if err != nil {
+		return nil, err
+	}
+
+	// Set the first created data source as default
+	if len(dataSources) == 0 {
+		cmd.IsDefault = true
+	}
+
+	if cmd.Name == "" {
+		cmd.Name = getAvailableName(cmd.Type, dataSources)
+	}
 
 	if err := validateFields(cmd.Name, cmd.URL); err != nil {
-		return dataSource, err
+		return nil, err
 	}
 
+	var dataSource *datasources.DataSource
 	return dataSource, s.db.InTransaction(ctx, func(ctx context.Context) error {
 		var err error
 
 		cmd.EncryptedSecureJsonData = make(map[string][]byte)
-		if !s.features.IsEnabled(featuremgmt.FlagDisableSecretsCompatibility) {
+		if !s.features.IsEnabled(ctx, featuremgmt.FlagDisableSecretsCompatibility) {
 			cmd.EncryptedSecureJsonData, err = s.SecretsService.EncryptJsonData(ctx, cmd.SecureJsonData, secrets.WithoutScope())
 			if err != nil {
 				return err
@@ -236,13 +249,35 @@ func (s *Service) AddDataSource(ctx context.Context, cmd *datasources.AddDataSou
 	})
 }
 
+// getAvailableName finds the first available name for a datasource of the given type.
+func getAvailableName(dsType string, dataSources []*datasources.DataSource) string {
+	dsNames := make(map[string]bool)
+	for _, ds := range dataSources {
+		dsNames[strings.ToLower(ds.Name)] = true
+	}
+
+	name := dsType
+	currentDigit := 0
+
+	for dsNames[strings.ToLower(name)] {
+		currentDigit++
+		name = fmt.Sprintf("%s-%d", dsType, currentDigit)
+	}
+
+	return name
+}
+
 func (s *Service) DeleteDataSource(ctx context.Context, cmd *datasources.DeleteDataSourceCommand) error {
 	return s.db.InTransaction(ctx, func(ctx context.Context) error {
 		cmd.UpdateSecretFn = func() error {
 			return s.SecretsStore.Del(ctx, cmd.OrgID, cmd.Name, kvstore.DataSourceSecretType)
 		}
 
-		return s.SQLStore.DeleteDataSource(ctx, cmd)
+		if err := s.SQLStore.DeleteDataSource(ctx, cmd); err != nil {
+			return err
+		}
+
+		return s.permissionsService.DeleteResourcePermissions(ctx, cmd.OrgID, cmd.UID)
 	})
 }
 
@@ -449,7 +484,7 @@ func (s *Service) httpClientOptions(ctx context.Context, ds *datasources.DataSou
 
 	opts := &sdkhttpclient.Options{
 		Timeouts: timeouts,
-		Headers:  s.getCustomHeaders(ds.JsonData, decryptedValues),
+		Header:   s.getCustomHeaders(ds.JsonData, decryptedValues),
 		Labels: map[string]string{
 			"datasource_type": ds.Type,
 			"datasource_name": ds.Name,
@@ -497,11 +532,15 @@ func (s *Service) httpClientOptions(ctx context.Context, ds *datasources.DataSou
 			},
 			Timeouts: &sdkproxy.DefaultTimeoutOptions,
 			ClientCfg: &sdkproxy.ClientCfg{
-				ClientCert:   s.cfg.SecureSocksDSProxy.ClientCert,
-				ClientKey:    s.cfg.SecureSocksDSProxy.ClientKey,
-				RootCA:       s.cfg.SecureSocksDSProxy.RootCA,
-				ProxyAddress: s.cfg.SecureSocksDSProxy.ProxyAddress,
-				ServerName:   s.cfg.SecureSocksDSProxy.ServerName,
+				ClientCert:    s.cfg.SecureSocksDSProxy.ClientCertFilePath,
+				ClientKey:     s.cfg.SecureSocksDSProxy.ClientKeyFilePath,
+				RootCAs:       s.cfg.SecureSocksDSProxy.RootCAFilePaths,
+				ClientCertVal: s.cfg.SecureSocksDSProxy.ClientCert,
+				ClientKeyVal:  s.cfg.SecureSocksDSProxy.ClientKey,
+				RootCAsVals:   s.cfg.SecureSocksDSProxy.RootCAs,
+				ProxyAddress:  s.cfg.SecureSocksDSProxy.ProxyAddress,
+				ServerName:    s.cfg.SecureSocksDSProxy.ServerName,
+				AllowInsecure: s.cfg.SecureSocksDSProxy.AllowInsecure,
 			},
 		}
 
@@ -518,7 +557,7 @@ func (s *Service) httpClientOptions(ctx context.Context, ds *datasources.DataSou
 		opts.ProxyOptions = proxyOpts
 	}
 
-	if ds.JsonData != nil && ds.JsonData.Get("sigV4Auth").MustBool(false) && setting.SigV4AuthEnabled {
+	if ds.JsonData != nil && ds.JsonData.Get("sigV4Auth").MustBool(false) && s.cfg.SigV4AuthEnabled {
 		opts.SigV4 = &sdkhttpclient.SigV4Config{
 			Service:       awsServiceNamespace(ds.Type, ds.JsonData),
 			Region:        ds.JsonData.Get("sigV4Region").MustString(),
@@ -618,8 +657,8 @@ func (s *Service) getTimeout(ds *datasources.DataSource) time.Duration {
 
 // getCustomHeaders returns a map with all the to be set headers
 // The map key represents the HeaderName and the value represents this header's value
-func (s *Service) getCustomHeaders(jsonData *simplejson.Json, decryptedValues map[string]string) map[string]string {
-	headers := make(map[string]string)
+func (s *Service) getCustomHeaders(jsonData *simplejson.Json, decryptedValues map[string]string) http.Header {
+	headers := make(http.Header)
 	if jsonData == nil {
 		return headers
 	}
@@ -639,12 +678,12 @@ func (s *Service) getCustomHeaders(jsonData *simplejson.Json, decryptedValues ma
 		// skip a header with name that corresponds to auth proxy header's name
 		// to make sure that data source proxy isn't used to circumvent auth proxy.
 		// For more context take a look at CVE-2022-35957
-		if s.cfg.AuthProxyEnabled && http.CanonicalHeaderKey(key) == http.CanonicalHeaderKey(s.cfg.AuthProxyHeaderName) {
+		if s.cfg.AuthProxy.Enabled && http.CanonicalHeaderKey(key) == http.CanonicalHeaderKey(s.cfg.AuthProxy.HeaderName) {
 			continue
 		}
 
 		if val, ok := decryptedValues[headerValueSuffix]; ok {
-			headers[key] = val
+			headers.Add(key, val)
 		}
 	}
 
@@ -689,7 +728,7 @@ func (s *Service) fillWithSecureJSONData(ctx context.Context, cmd *datasources.U
 	}
 
 	cmd.EncryptedSecureJsonData = make(map[string][]byte)
-	if !s.features.IsEnabled(featuremgmt.FlagDisableSecretsCompatibility) {
+	if !s.features.IsEnabled(ctx, featuremgmt.FlagDisableSecretsCompatibility) {
 		cmd.EncryptedSecureJsonData, err = s.SecretsService.EncryptJsonData(ctx, cmd.SecureJsonData, secrets.WithoutScope())
 		if err != nil {
 			return err
@@ -733,7 +772,7 @@ func readQuotaConfig(cfg *setting.Cfg) (*quota.Map, error) {
 }
 
 // CustomerHeaders returns the custom headers specified in the datasource. The context is used for the decryption operation that might use the store, so consider setting an acceptable timeout for your use case.
-func (s *Service) CustomHeaders(ctx context.Context, ds *datasources.DataSource) (map[string]string, error) {
+func (s *Service) CustomHeaders(ctx context.Context, ds *datasources.DataSource) (http.Header, error) {
 	values, err := s.SecretsService.DecryptJsonData(ctx, ds.SecureJsonData)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get custom headers: %w", err)
diff --git a/pkg/services/datasources/service/datasource_test.go b/pkg/services/datasources/service/datasource_test.go
index 3ebfbaeb0d40d..9cc7dd8a4d8a3 100644
--- a/pkg/services/datasources/service/datasource_test.go
+++ b/pkg/services/datasources/service/datasource_test.go
@@ -31,8 +31,13 @@ import (
 	secretskvs "github.com/grafana/grafana/pkg/services/secrets/kvstore"
 	secretsmng "github.com/grafana/grafana/pkg/services/secrets/manager"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 type dataSourceMockRetriever struct {
 	res []*datasources.DataSource
 }
@@ -79,6 +84,85 @@ func TestService_AddDataSource(t *testing.T) {
 	})
 }
 
+func TestService_getAvailableName(t *testing.T) {
+	type testCase struct {
+		desc       string
+		dsType     string
+		existingDs []*datasources.DataSource
+		expected   string
+	}
+
+	testCases := []testCase{
+		{
+			desc:     "should return type as the name if no DS are passed in",
+			dsType:   "prometheus",
+			expected: "prometheus",
+		},
+		{
+			desc:   "should return type as the name if no DS with that name exists",
+			dsType: "prometheus",
+			existingDs: []*datasources.DataSource{
+				{Name: "graphite"},
+				{Name: "loki"},
+			},
+			expected: "prometheus",
+		},
+		{
+			desc:   "should return type-1 as the name if one data source with that name exists",
+			dsType: "prometheus",
+			existingDs: []*datasources.DataSource{
+				{Name: "graphite"},
+				{Name: "prometheus"},
+			},
+			expected: "prometheus-1",
+		},
+		{
+			desc:   "should correctly increment the number suffix of the name",
+			dsType: "prometheus",
+			existingDs: []*datasources.DataSource{
+				{Name: "prometheus"},
+				{Name: "prometheus-1"},
+				{Name: "prometheus-3"},
+			},
+			expected: "prometheus-2",
+		},
+		{
+			desc:   "should correctly increment the number suffix for multidigit numbers",
+			dsType: "prometheus",
+			existingDs: []*datasources.DataSource{
+				{Name: "prometheus"},
+				{Name: "prometheus-1"},
+				{Name: "prometheus-2"},
+				{Name: "prometheus-3"},
+				{Name: "prometheus-4"},
+				{Name: "prometheus-5"},
+				{Name: "prometheus-6"},
+				{Name: "prometheus-7"},
+				{Name: "prometheus-8"},
+				{Name: "prometheus-9"},
+				{Name: "prometheus-10"},
+			},
+			expected: "prometheus-11",
+		},
+		{
+			desc:   "name comparison should be case insensitive",
+			dsType: "prometheus",
+			existingDs: []*datasources.DataSource{
+				{Name: "Prometheus"},
+				{Name: "PROMETHEUS"},
+			},
+			expected: "prometheus-1",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.desc, func(t *testing.T) {
+			name := getAvailableName(tc.dsType, tc.existingDs)
+			assert.Equal(t, tc.expected, name)
+		})
+	}
+}
+
 func TestService_UpdateDataSource(t *testing.T) {
 	cfg := &setting.Cfg{}
 
@@ -529,7 +613,7 @@ func TestService_GetHttpTransport(t *testing.T) {
 			},
 		})
 
-		setting.SecretKey = "password"
+		cfg.SecretKey = "password"
 
 		sjson := simplejson.New()
 		sjson.Set("tlsAuthWithCACert", true)
@@ -580,7 +664,7 @@ func TestService_GetHttpTransport(t *testing.T) {
 			},
 		})
 
-		setting.SecretKey = "password"
+		cfg.SecretKey = "password"
 
 		sjson := simplejson.New()
 		sjson.Set("tlsAuth", true)
@@ -627,7 +711,7 @@ func TestService_GetHttpTransport(t *testing.T) {
 			},
 		})
 
-		setting.SecretKey = "password"
+		cfg.SecretKey = "password"
 
 		sjson := simplejson.New()
 		sjson.Set("tlsAuthWithCACert", true)
@@ -749,7 +833,7 @@ func TestService_GetHttpTransport(t *testing.T) {
 		require.NoError(t, err)
 
 		headers := dsService.getCustomHeaders(sjson, map[string]string{"httpHeaderValue1": "Bearer xf5yhfkpsnmgo"})
-		require.Equal(t, "Bearer xf5yhfkpsnmgo", headers["Authorization"])
+		require.Equal(t, "Bearer xf5yhfkpsnmgo", headers.Get("Authorization"))
 
 		// 1. Start HTTP test server which checks the request headers
 		backend := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -786,6 +870,75 @@ func TestService_GetHttpTransport(t *testing.T) {
 		require.Equal(t, "Ok", bodyStr)
 	})
 
+	t.Run("Should set request Host if it is configured in custom headers within JsonData", func(t *testing.T) {
+		provider := httpclient.NewProvider()
+
+		sjson := simplejson.NewFromAny(map[string]any{
+			"httpHeaderName1": "Host",
+		})
+
+		sqlStore := db.InitTestDB(t)
+		secretsService := secretsmng.SetupTestService(t, fakes.NewFakeSecretsStore())
+		secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
+		quotaService := quotatest.New(false, nil)
+		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService, &pluginstore.FakePluginStore{})
+		require.NoError(t, err)
+
+		ds := datasources.DataSource{
+			ID:       1,
+			OrgID:    1,
+			Name:     "kubernetes",
+			URL:      "http://k8s:8001",
+			Type:     "Kubernetes",
+			JsonData: sjson,
+		}
+
+		secureJsonData, err := json.Marshal(map[string]string{
+			"httpHeaderValue1": "example.com",
+		})
+		require.NoError(t, err)
+
+		err = secretsStore.Set(context.Background(), ds.OrgID, ds.Name, secretskvs.DataSourceSecretType, string(secureJsonData))
+		require.NoError(t, err)
+
+		headers := dsService.getCustomHeaders(sjson, map[string]string{"httpHeaderValue1": "example.com"})
+		require.Equal(t, "example.com", headers.Get("Host"))
+
+		// 1. Start HTTP test server which checks the request headers
+		backend := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			if r.Host == "example.com" {
+				w.WriteHeader(200)
+				_, err := w.Write([]byte("Ok"))
+				require.NoError(t, err)
+				return
+			}
+
+			w.WriteHeader(503)
+			_, err := w.Write([]byte("Server name mismatch"))
+			require.NoError(t, err)
+		}))
+		defer backend.Close()
+
+		// 2. Get HTTP transport from datasource which uses the test server as backend
+		ds.URL = backend.URL
+		rt, err := dsService.GetHTTPTransport(context.Background(), &ds, provider)
+		require.NoError(t, err)
+		require.NotNil(t, rt)
+
+		// 3. Send test request which should have the Authorization header set
+		req := httptest.NewRequest("GET", backend.URL+"/test-host", nil)
+		res, err := rt.RoundTrip(req)
+		require.NoError(t, err)
+		t.Cleanup(func() {
+			err := res.Body.Close()
+			require.NoError(t, err)
+		})
+		body, err := io.ReadAll(res.Body)
+		require.NoError(t, err)
+		bodyStr := string(body)
+		require.Equal(t, "Ok", bodyStr)
+	})
+
 	t.Run("Should use request timeout if configured in JsonData", func(t *testing.T) {
 		provider := httpclient.NewProvider()
 
@@ -820,10 +973,10 @@ func TestService_GetHttpTransport(t *testing.T) {
 			},
 		})
 
-		origSigV4Enabled := setting.SigV4AuthEnabled
-		setting.SigV4AuthEnabled = true
+		origSigV4Enabled := cfg.SigV4AuthEnabled
+		cfg.SigV4AuthEnabled = true
 		t.Cleanup(func() {
-			setting.SigV4AuthEnabled = origSigV4Enabled
+			cfg.SigV4AuthEnabled = origSigV4Enabled
 		})
 
 		sjson, err := simplejson.NewJson([]byte(`{ "sigV4Auth": true }`))
@@ -1039,7 +1192,7 @@ func TestDataSource_CustomHeaders(t *testing.T) {
 		name             string
 		jsonData         *simplejson.Json
 		secureJsonData   map[string][]byte
-		expectedHeaders  map[string]string
+		expectedHeaders  http.Header
 		expectedErrorMsg string
 	}{
 		{
@@ -1050,8 +1203,8 @@ func TestDataSource_CustomHeaders(t *testing.T) {
 			secureJsonData: map[string][]byte{
 				"httpHeaderValue1": encryptedValue,
 			},
-			expectedHeaders: map[string]string{
-				"X-Test-Header1": testValue,
+			expectedHeaders: http.Header{
+				"X-Test-Header1": []string{testValue},
 			},
 		},
 		{
@@ -1060,7 +1213,7 @@ func TestDataSource_CustomHeaders(t *testing.T) {
 				"httpHeaderName1": "X-Test-Header1",
 			}),
 			secureJsonData:  map[string][]byte{},
-			expectedHeaders: map[string]string{},
+			expectedHeaders: http.Header{},
 		},
 		{
 			name: "non customer header value",
@@ -1068,7 +1221,21 @@ func TestDataSource_CustomHeaders(t *testing.T) {
 				"someotherheader": "X-Test-Header1",
 			}),
 			secureJsonData:  map[string][]byte{},
-			expectedHeaders: map[string]string{},
+			expectedHeaders: http.Header{},
+		},
+		{
+			name: "add multiple header value",
+			jsonData: simplejson.NewFromAny(map[string]any{
+				"httpHeaderName1": "X-Test-Header1",
+				"httpHeaderName2": "X-Test-Header1",
+			}),
+			secureJsonData: map[string][]byte{
+				"httpHeaderValue1": encryptedValue,
+				"httpHeaderValue2": encryptedValue,
+			},
+			expectedHeaders: http.Header{
+				"X-Test-Header1": []string{testValue, testValue},
+			},
 		},
 	}
 
@@ -1131,6 +1298,7 @@ AU6WWoaAIEhhbWQfth/Diz3mivl1ARB+YqiWca2mjRPLTPcKJEURDVddQ423el0Q
 llG/Sw5+FquFuChaA6l5KWy7F3bQyA==
 -----END CERTIFICATE-----`
 
+// #nosec G101
 const clientKey string = `-----BEGIN RSA PRIVATE KEY-----
 MIIEpQIBAAKCAQEA4yWJpbI0RQkozfu9YKXlsa5veUyJzJECoZDJj+rEP3IoozYV
 u5xVyZaaDm+9OpBWXmuVD5zsYjw4Pqm2YWXxrbpygSSLtsWvxuSlLIFIRzmnbttn
diff --git a/pkg/services/datasources/service/legacy.go b/pkg/services/datasources/service/legacy.go
new file mode 100644
index 0000000000000..db5b008b13ea9
--- /dev/null
+++ b/pkg/services/datasources/service/legacy.go
@@ -0,0 +1,90 @@
+package service
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"sync"
+
+	data "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+
+	"github.com/grafana/grafana/pkg/infra/appcontext"
+	"github.com/grafana/grafana/pkg/services/datasources"
+)
+
+// LegacyDataSourceRetriever supports finding a reference to datasources using the name or internal ID
+type LegacyDataSourceLookup interface {
+	// Find the UID from either the name or internal id
+	// NOTE the orgID will be fetched from the context
+	GetDataSourceFromDeprecatedFields(ctx context.Context, name string, id int64) (*data.DataSourceRef, error)
+}
+
+var (
+	_ DataSourceRetriever    = (*Service)(nil)
+	_ LegacyDataSourceLookup = (*cachingLegacyDataSourceLookup)(nil)
+	_ LegacyDataSourceLookup = (*NoopLegacyDataSourcLookup)(nil)
+)
+
+// NoopLegacyDataSourceRetriever does not even try to lookup, it returns a raw reference
+type NoopLegacyDataSourcLookup struct {
+	Ref *data.DataSourceRef
+}
+
+func (s *NoopLegacyDataSourcLookup) GetDataSourceFromDeprecatedFields(ctx context.Context, name string, id int64) (*data.DataSourceRef, error) {
+	return s.Ref, nil
+}
+
+type cachingLegacyDataSourceLookup struct {
+	retriever DataSourceRetriever
+	cache     map[string]cachedValue
+	cacheMu   sync.Mutex
+}
+
+type cachedValue struct {
+	ref *data.DataSourceRef
+	err error
+}
+
+func ProvideLegacyDataSourceLookup(p *Service) LegacyDataSourceLookup {
+	return &cachingLegacyDataSourceLookup{
+		retriever: p,
+		cache:     make(map[string]cachedValue),
+	}
+}
+
+func (s *cachingLegacyDataSourceLookup) GetDataSourceFromDeprecatedFields(ctx context.Context, name string, id int64) (*data.DataSourceRef, error) {
+	if id == 0 && name == "" {
+		return nil, fmt.Errorf("either name or ID must be set")
+	}
+	user, err := appcontext.User(ctx)
+	if err != nil {
+		return nil, err
+	}
+	key := fmt.Sprintf("%d/%s/%d", user.OrgID, name, id)
+	s.cacheMu.Lock()
+	defer s.cacheMu.Unlock()
+
+	v, ok := s.cache[key]
+	if ok {
+		return v.ref, v.err
+	}
+
+	ds, err := s.retriever.GetDataSource(ctx, &datasources.GetDataSourceQuery{
+		OrgID: user.OrgID,
+		Name:  name,
+		ID:    id,
+	})
+	if errors.Is(err, datasources.ErrDataSourceNotFound) && name != "" {
+		ds, err = s.retriever.GetDataSource(ctx, &datasources.GetDataSourceQuery{
+			OrgID: user.OrgID,
+			UID:   name, // Sometimes name is actually the UID :(
+		})
+	}
+	v = cachedValue{
+		err: err,
+	}
+	if ds != nil {
+		v.ref = &data.DataSourceRef{Type: ds.Type, UID: ds.UID}
+	}
+	return v.ref, v.err
+}
diff --git a/pkg/services/datasources/service/store.go b/pkg/services/datasources/service/store.go
index 23ba2ceb66e1a..b8afc57dbad45 100644
--- a/pkg/services/datasources/service/store.go
+++ b/pkg/services/datasources/service/store.go
@@ -253,8 +253,8 @@ func (ss *SqlStore) AddDataSource(ctx context.Context, cmd *datasources.AddDataS
 				return fmt.Errorf("failed to generate UID for datasource %q: %w", cmd.Name, err)
 			}
 			cmd.UID = uid
-		} else if !util.IsValidShortUID(cmd.UID) {
-			logDeprecatedInvalidDsUid(ss.logger, cmd.UID, cmd.Name)
+		} else if err := util.ValidateUID(cmd.UID); err != nil {
+			logDeprecatedInvalidDsUid(ss.logger, cmd.UID, cmd.Name, err)
 		}
 
 		ds = &datasources.DataSource{
@@ -388,8 +388,10 @@ func (ss *SqlStore) UpdateDataSource(ctx context.Context, cmd *datasources.Updat
 			}
 		}
 
-		if !util.IsValidShortUID(cmd.UID) {
-			logDeprecatedInvalidDsUid(ss.logger, cmd.UID, cmd.Name)
+		if cmd.UID != "" {
+			if err := util.ValidateUID(cmd.UID); err != nil {
+				logDeprecatedInvalidDsUid(ss.logger, cmd.UID, cmd.Name, err)
+			}
 		}
 
 		return err
@@ -415,11 +417,11 @@ func generateNewDatasourceUid(sess *db.Session, orgId int64) (string, error) {
 
 var generateNewUid func() string = util.GenerateShortUID
 
-func logDeprecatedInvalidDsUid(logger log.Logger, uid, name string) {
+func logDeprecatedInvalidDsUid(logger log.Logger, uid string, name string, err error) {
 	logger.Warn(
 		"Invalid datasource uid. The use of invalid uids is deprecated and this operation will fail in a future "+
 			"version of Grafana. A valid uid is a combination of a-z, A-Z, 0-9 (alphanumeric), - (dash) and _ "+
 			"(underscore) characters, maximum length 40",
-		"uid", uid, "name", name,
+		"uid", uid, "name", name, "error", err,
 	)
 }
diff --git a/pkg/services/extsvcauth/models.go b/pkg/services/extsvcauth/models.go
index fd69ec4efe500..4891ef930a9a4 100644
--- a/pkg/services/extsvcauth/models.go
+++ b/pkg/services/extsvcauth/models.go
@@ -7,16 +7,26 @@ import (
 )
 
 const (
-	OAuth2Server    AuthProvider = "OAuth2Server"
 	ServiceAccounts AuthProvider = "ServiceAccounts"
 
 	// TmpOrgID is the orgID we use while global service accounts are not supported.
-	TmpOrgID int64 = 1
+	TmpOrgIDStr string = "1"
+	TmpOrgID    int64  = 1
 )
 
 type AuthProvider string
 
+//go:generate mockery --name ExternalServiceRegistry --structname ExternalServiceRegistryMock --output tests --outpkg tests --filename extsvcregmock.go
 type ExternalServiceRegistry interface {
+	// HasExternalService returns whether an external service has been saved with that name.
+	HasExternalService(ctx context.Context, name string) (bool, error)
+
+	// GetExternalServiceNames returns the names of external services registered in store.
+	GetExternalServiceNames(ctx context.Context) ([]string, error)
+
+	// RemoveExternalService removes an external service and its associated resources from the database (ex: service account, token).
+	RemoveExternalService(ctx context.Context, name string) error
+
 	// SaveExternalService creates or updates an external service in the database. Based on the requested auth provider,
 	// it generates client_id, secrets and any additional provider specificities (ex: rsa keys). It also ensures that the
 	// associated service account has the correct permissions.
@@ -30,23 +40,9 @@ type SelfCfg struct {
 	Permissions []accesscontrol.Permission
 }
 
-type ImpersonationCfg struct {
-	// Enabled allows the service to request access tokens to impersonate users
-	Enabled bool
-	// Groups allows the service to list the impersonated user's teams
-	Groups bool
-	// Permissions are the permissions that the external service needs when impersonating a user.
-	// The intersection of this set with the impersonated user's permission guarantees that the client will not
-	// gain more privileges than the impersonated user has and vice versa.
-	Permissions []accesscontrol.Permission
-}
-
 // ExternalServiceRegistration represents the registration form to save new client.
 type ExternalServiceRegistration struct {
 	Name string
-	// Impersonation access configuration
-	// (this is not available on all auth providers)
-	Impersonation ImpersonationCfg
 	// Self access configuration
 	Self SelfCfg
 	// Auth Provider that the client will use to connect to Grafana
diff --git a/pkg/services/extsvcauth/oauthserver/api/api.go b/pkg/services/extsvcauth/oauthserver/api/api.go
deleted file mode 100644
index 921a01cb1d604..0000000000000
--- a/pkg/services/extsvcauth/oauthserver/api/api.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package api
-
-import (
-	"github.com/grafana/grafana/pkg/api/routing"
-	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
-	"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver"
-)
-
-type api struct {
-	router      routing.RouteRegister
-	oauthServer oauthserver.OAuth2Server
-}
-
-func NewAPI(
-	router routing.RouteRegister,
-	oauthServer oauthserver.OAuth2Server,
-) *api {
-	return &api{
-		router:      router,
-		oauthServer: oauthServer,
-	}
-}
-
-func (a *api) RegisterAPIEndpoints() {
-	a.router.Group("/oauth2", func(oauthRouter routing.RouteRegister) {
-		oauthRouter.Post("/introspect", a.handleIntrospectionRequest)
-		oauthRouter.Post("/token", a.handleTokenRequest)
-	})
-}
-
-func (a *api) handleTokenRequest(c *contextmodel.ReqContext) {
-	a.oauthServer.HandleTokenRequest(c.Resp, c.Req)
-}
-
-func (a *api) handleIntrospectionRequest(c *contextmodel.ReqContext) {
-	a.oauthServer.HandleIntrospectionRequest(c.Resp, c.Req)
-}
diff --git a/pkg/services/extsvcauth/oauthserver/errors.go b/pkg/services/extsvcauth/oauthserver/errors.go
deleted file mode 100644
index 43d395b4d4913..0000000000000
--- a/pkg/services/extsvcauth/oauthserver/errors.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package oauthserver
-
-import (
-	"fmt"
-
-	"github.com/grafana/grafana/pkg/util/errutil"
-)
-
-var (
-	ErrClientNotFoundMessageID = "oauthserver.client-not-found"
-)
-
-var (
-	ErrClientRequiredID = errutil.BadRequest(
-		"oauthserver.required-client-id",
-		errutil.WithPublicMessage("client ID is required")).Errorf("Client ID is required")
-	ErrClientRequiredName = errutil.BadRequest(
-		"oauthserver.required-client-name",
-		errutil.WithPublicMessage("client name is required")).Errorf("Client name is required")
-)
-
-func ErrClientNotFound(clientID string) error {
-	return errutil.NotFound(
-		ErrClientNotFoundMessageID,
-		errutil.WithPublicMessage(fmt.Sprintf("Client '%s' not found", clientID))).
-		Errorf("client '%s' not found", clientID)
-}
diff --git a/pkg/services/extsvcauth/oauthserver/external_service.go b/pkg/services/extsvcauth/oauthserver/external_service.go
deleted file mode 100644
index bff2bf93466ae..0000000000000
--- a/pkg/services/extsvcauth/oauthserver/external_service.go
+++ /dev/null
@@ -1,153 +0,0 @@
-package oauthserver
-
-import (
-	"context"
-	"strconv"
-	"strings"
-
-	"github.com/ory/fosite"
-
-	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/extsvcauth"
-	"github.com/grafana/grafana/pkg/services/user"
-)
-
-type OAuthExternalService struct {
-	ID               int64  `xorm:"id pk autoincr"`
-	Name             string `xorm:"name"`
-	ClientID         string `xorm:"client_id"`
-	Secret           string `xorm:"secret"`
-	RedirectURI      string `xorm:"redirect_uri"` // Not used yet (code flow)
-	GrantTypes       string `xorm:"grant_types"`  // CSV value
-	Audiences        string `xorm:"audiences"`    // CSV value
-	PublicPem        []byte `xorm:"public_pem"`
-	ServiceAccountID int64  `xorm:"service_account_id"`
-	// SelfPermissions are the registered service account permissions (registered and managed permissions)
-	SelfPermissions []ac.Permission
-	// ImpersonatePermissions is the restriction set of permissions while impersonating
-	ImpersonatePermissions []ac.Permission
-
-	// SignedInUser refers to the current Service Account identity/user
-	SignedInUser      *user.SignedInUser
-	Scopes            []string
-	ImpersonateScopes []string
-}
-
-// ToExternalService converts the ExternalService (used internally by the oauthserver) to extsvcauth.ExternalService (used outside the package)
-// If object must contain Key pairs, pass them as parameters, otherwise only the client PublicPem will be added.
-func (c *OAuthExternalService) ToExternalService(keys *extsvcauth.KeyResult) *extsvcauth.ExternalService {
-	c2 := &extsvcauth.ExternalService{
-		ID:     c.ClientID,
-		Name:   c.Name,
-		Secret: c.Secret,
-		OAuthExtra: &extsvcauth.OAuthExtra{
-			GrantTypes:  c.GrantTypes,
-			Audiences:   c.Audiences,
-			RedirectURI: c.RedirectURI,
-			KeyResult:   keys,
-		},
-	}
-
-	// Fallback to only display the public pem
-	if keys == nil && len(c.PublicPem) > 0 {
-		c2.OAuthExtra.KeyResult = &extsvcauth.KeyResult{PublicPem: string(c.PublicPem)}
-	}
-
-	return c2
-}
-
-func (c *OAuthExternalService) LogID() string {
-	return "{name: " + c.Name + ", clientID: " + c.ClientID + "}"
-}
-
-// GetID returns the client ID.
-func (c *OAuthExternalService) GetID() string { return c.ClientID }
-
-// GetHashedSecret returns the hashed secret as it is stored in the store.
-func (c *OAuthExternalService) GetHashedSecret() []byte {
-	// Hashed version is stored in the secret field
-	return []byte(c.Secret)
-}
-
-// GetRedirectURIs returns the client's allowed redirect URIs.
-func (c *OAuthExternalService) GetRedirectURIs() []string {
-	return []string{c.RedirectURI}
-}
-
-// GetGrantTypes returns the client's allowed grant types.
-func (c *OAuthExternalService) GetGrantTypes() fosite.Arguments {
-	return strings.Split(c.GrantTypes, ",")
-}
-
-// GetResponseTypes returns the client's allowed response types.
-// All allowed combinations of response types have to be listed, each combination having
-// response types of the combination separated by a space.
-func (c *OAuthExternalService) GetResponseTypes() fosite.Arguments {
-	return fosite.Arguments{"code"}
-}
-
-// GetScopes returns the scopes this client is allowed to request on its own behalf.
-func (c *OAuthExternalService) GetScopes() fosite.Arguments {
-	if c.Scopes != nil {
-		return c.Scopes
-	}
-
-	ret := []string{"profile", "email", "groups", "entitlements"}
-	if c.SignedInUser != nil && c.SignedInUser.Permissions != nil {
-		perms := c.SignedInUser.Permissions[TmpOrgID]
-		for action := range perms {
-			// Add all actions that the plugin is allowed to request
-			ret = append(ret, action)
-		}
-	}
-
-	c.Scopes = ret
-	return ret
-}
-
-// GetScopes returns the scopes this client is allowed to request on a specific user.
-func (c *OAuthExternalService) GetScopesOnUser(ctx context.Context, accessControl ac.AccessControl, userID int64) []string {
-	ev := ac.EvalPermission(ac.ActionUsersImpersonate, ac.Scope("users", "id", strconv.FormatInt(userID, 10)))
-	hasAccess, errAccess := accessControl.Evaluate(ctx, c.SignedInUser, ev)
-	if errAccess != nil || !hasAccess {
-		return nil
-	}
-
-	if c.ImpersonateScopes != nil {
-		return c.ImpersonateScopes
-	}
-
-	ret := []string{}
-	if c.ImpersonatePermissions != nil {
-		perms := c.ImpersonatePermissions
-		for i := range perms {
-			if perms[i].Action == ac.ActionUsersRead && perms[i].Scope == ScopeGlobalUsersSelf {
-				ret = append(ret, "profile", "email", ac.ActionUsersRead)
-				continue
-			}
-			if perms[i].Action == ac.ActionUsersPermissionsRead && perms[i].Scope == ScopeUsersSelf {
-				ret = append(ret, "entitlements", ac.ActionUsersPermissionsRead)
-				continue
-			}
-			if perms[i].Action == ac.ActionTeamsRead && perms[i].Scope == ScopeTeamsSelf {
-				ret = append(ret, "groups", ac.ActionTeamsRead)
-				continue
-			}
-			// Add all actions that the plugin is allowed to request
-			ret = append(ret, perms[i].Action)
-		}
-	}
-
-	c.ImpersonateScopes = ret
-	return ret
-}
-
-// IsPublic returns true, if this client is marked as public.
-func (c *OAuthExternalService) IsPublic() bool {
-	return false
-}
-
-// GetAudience returns the allowed audience(s) for this client.
-func (c *OAuthExternalService) GetAudience() fosite.Arguments {
-	return strings.Split(c.Audiences, ",")
-}
diff --git a/pkg/services/extsvcauth/oauthserver/external_service_test.go b/pkg/services/extsvcauth/oauthserver/external_service_test.go
deleted file mode 100644
index 67e4011738768..0000000000000
--- a/pkg/services/extsvcauth/oauthserver/external_service_test.go
+++ /dev/null
@@ -1,213 +0,0 @@
-package oauthserver
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/user"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func setupTestEnv(t *testing.T) *OAuthExternalService {
-	t.Helper()
-
-	client := &OAuthExternalService{
-		Name:             "my-ext-service",
-		ClientID:         "RANDOMID",
-		Secret:           "RANDOMSECRET",
-		GrantTypes:       "client_credentials,urn:ietf:params:oauth:grant-type:jwt-bearer",
-		ServiceAccountID: 2,
-		SelfPermissions: []ac.Permission{
-			{Action: ac.ActionUsersImpersonate, Scope: ac.ScopeUsersAll},
-		},
-		SignedInUser: &user.SignedInUser{
-			UserID: 2,
-			OrgID:  1,
-		},
-	}
-	return client
-}
-
-func TestExternalService_GetScopesOnUser(t *testing.T) {
-	testCases := []struct {
-		name                   string
-		impersonatePermissions []ac.Permission
-		initTestEnv            func(*OAuthExternalService)
-		expectedScopes         []string
-	}{
-		{
-			name:           "should return nil when the service account has no impersonate permissions",
-			expectedScopes: nil,
-		},
-		{
-			name: "should return the 'profile', 'email' and associated RBAC action",
-			initTestEnv: func(c *OAuthExternalService) {
-				c.SignedInUser.Permissions = map[int64]map[string][]string{
-					1: {
-						ac.ActionUsersImpersonate: {ac.ScopeUsersAll},
-					},
-				}
-				c.ImpersonatePermissions = []ac.Permission{
-					{Action: ac.ActionUsersRead, Scope: ScopeGlobalUsersSelf},
-				}
-			},
-			expectedScopes: []string{"profile", "email", ac.ActionUsersRead},
-		},
-		{
-			name: "should return 'entitlements' and associated RBAC action scopes",
-			initTestEnv: func(c *OAuthExternalService) {
-				c.SignedInUser.Permissions = map[int64]map[string][]string{
-					1: {
-						ac.ActionUsersImpersonate: {ac.ScopeUsersAll},
-					},
-				}
-				c.ImpersonatePermissions = []ac.Permission{
-					{Action: ac.ActionUsersPermissionsRead, Scope: ScopeUsersSelf},
-				}
-			},
-			expectedScopes: []string{"entitlements", ac.ActionUsersPermissionsRead},
-		},
-		{
-			name: "should return 'groups' and associated RBAC action scopes",
-			initTestEnv: func(c *OAuthExternalService) {
-				c.SignedInUser.Permissions = map[int64]map[string][]string{
-					1: {
-						ac.ActionUsersImpersonate: {ac.ScopeUsersAll},
-					},
-				}
-				c.ImpersonatePermissions = []ac.Permission{
-					{Action: ac.ActionTeamsRead, Scope: ScopeTeamsSelf},
-				}
-			},
-			expectedScopes: []string{"groups", ac.ActionTeamsRead},
-		},
-		{
-			name: "should return all scopes",
-			initTestEnv: func(c *OAuthExternalService) {
-				c.SignedInUser.Permissions = map[int64]map[string][]string{
-					1: {
-						ac.ActionUsersImpersonate: {ac.ScopeUsersAll},
-					},
-				}
-				c.ImpersonatePermissions = []ac.Permission{
-					{Action: ac.ActionUsersRead, Scope: ScopeGlobalUsersSelf},
-					{Action: ac.ActionUsersPermissionsRead, Scope: ScopeUsersSelf},
-					{Action: ac.ActionTeamsRead, Scope: ScopeTeamsSelf},
-					{Action: dashboards.ActionDashboardsRead, Scope: dashboards.ScopeDashboardsAll},
-				}
-			},
-			expectedScopes: []string{"profile", "email", ac.ActionUsersRead,
-				"entitlements", ac.ActionUsersPermissionsRead,
-				"groups", ac.ActionTeamsRead,
-				"dashboards:read"},
-		},
-		{
-			name: "should return stored scopes when the client's impersonate scopes has already been set",
-			initTestEnv: func(c *OAuthExternalService) {
-				c.SignedInUser.Permissions = map[int64]map[string][]string{
-					1: {
-						ac.ActionUsersImpersonate: {ac.ScopeUsersAll},
-					},
-				}
-				c.ImpersonateScopes = []string{"dashboard:create", "profile", "email", "entitlements", "groups"}
-			},
-			expectedScopes: []string{"profile", "email", "entitlements", "groups", "dashboard:create"},
-		},
-	}
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			c := setupTestEnv(t)
-			if tc.initTestEnv != nil {
-				tc.initTestEnv(c)
-			}
-			scopes := c.GetScopesOnUser(context.Background(), acimpl.ProvideAccessControl(setting.NewCfg()), 3)
-			require.ElementsMatch(t, tc.expectedScopes, scopes)
-		})
-	}
-}
-
-func TestExternalService_GetScopes(t *testing.T) {
-	testCases := []struct {
-		name                   string
-		impersonatePermissions []ac.Permission
-		initTestEnv            func(*OAuthExternalService)
-		expectedScopes         []string
-	}{
-		{
-			name: "should return default scopes when the signed in user is nil",
-			initTestEnv: func(c *OAuthExternalService) {
-				c.SignedInUser = nil
-			},
-			expectedScopes: []string{"profile", "email", "entitlements", "groups"},
-		},
-		{
-			name: "should return default scopes when the signed in user has no permissions",
-			initTestEnv: func(c *OAuthExternalService) {
-				c.SignedInUser.Permissions = map[int64]map[string][]string{}
-			},
-			expectedScopes: []string{"profile", "email", "entitlements", "groups"},
-		},
-		{
-			name: "should return additional scopes from signed in user's permissions",
-			initTestEnv: func(c *OAuthExternalService) {
-				c.SignedInUser.Permissions = map[int64]map[string][]string{
-					1: {
-						dashboards.ActionDashboardsRead: {dashboards.ScopeDashboardsAll},
-					},
-				}
-			},
-			expectedScopes: []string{"profile", "email", "entitlements", "groups", "dashboards:read"},
-		},
-		{
-			name: "should return stored scopes when the client's scopes has already been set",
-			initTestEnv: func(c *OAuthExternalService) {
-				c.Scopes = []string{"profile", "email", "entitlements", "groups"}
-			},
-			expectedScopes: []string{"profile", "email", "entitlements", "groups"},
-		},
-	}
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			c := setupTestEnv(t)
-			if tc.initTestEnv != nil {
-				tc.initTestEnv(c)
-			}
-			scopes := c.GetScopes()
-			require.ElementsMatch(t, tc.expectedScopes, scopes)
-		})
-	}
-}
-
-func TestExternalService_ToDTO(t *testing.T) {
-	client := &OAuthExternalService{
-		ID:          1,
-		Name:        "my-ext-service",
-		ClientID:    "test",
-		Secret:      "testsecret",
-		RedirectURI: "http://localhost:3000",
-		GrantTypes:  "client_credentials,urn:ietf:params:oauth:grant-type:jwt-bearer",
-		Audiences:   "https://example.org,https://second.example.org",
-		PublicPem:   []byte("pem_encoded_public_key"),
-	}
-
-	dto := client.ToExternalService(nil)
-
-	require.Equal(t, client.ClientID, dto.ID)
-	require.Equal(t, client.Name, dto.Name)
-	require.Equal(t, client.Secret, dto.Secret)
-
-	require.NotNil(t, dto.OAuthExtra)
-
-	require.Equal(t, client.RedirectURI, dto.OAuthExtra.RedirectURI)
-	require.Equal(t, client.GrantTypes, dto.OAuthExtra.GrantTypes)
-	require.Equal(t, client.Audiences, dto.OAuthExtra.Audiences)
-	require.Equal(t, client.PublicPem, []byte(dto.OAuthExtra.KeyResult.PublicPem))
-	require.Empty(t, dto.OAuthExtra.KeyResult.PrivatePem)
-	require.Empty(t, dto.OAuthExtra.KeyResult.URL)
-	require.False(t, dto.OAuthExtra.KeyResult.Generated)
-}
diff --git a/pkg/services/extsvcauth/oauthserver/models.go b/pkg/services/extsvcauth/oauthserver/models.go
deleted file mode 100644
index 606086895db3e..0000000000000
--- a/pkg/services/extsvcauth/oauthserver/models.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package oauthserver
-
-import (
-	"context"
-	"net/http"
-
-	"github.com/grafana/grafana/pkg/services/extsvcauth"
-	"gopkg.in/square/go-jose.v2"
-)
-
-const (
-	// TmpOrgID is the orgID we use while global service accounts are not supported.
-	TmpOrgID int64 = 1
-	// NoServiceAccountID is the ID we use for client that have no service account associated.
-	NoServiceAccountID int64 = 0
-
-	// List of scopes used to identify the impersonated user.
-	ScopeUsersSelf       = "users:self"
-	ScopeGlobalUsersSelf = "global.users:self"
-	ScopeTeamsSelf       = "teams:self"
-
-	// Supported encryptions
-	RS256 = "RS256"
-	ES256 = "ES256"
-)
-
-// OAuth2Server represents a service in charge of managing OAuth2 clients
-// and handling OAuth2 requests (token, introspection).
-type OAuth2Server interface {
-	// SaveExternalService creates or updates an external service in the database, it generates client_id and secrets and
-	// it ensures that the associated service account has the correct permissions.
-	SaveExternalService(ctx context.Context, cmd *extsvcauth.ExternalServiceRegistration) (*extsvcauth.ExternalService, error)
-	// GetExternalService retrieves an external service from store by client_id. It populates the SelfPermissions and
-	// SignedInUser from the associated service account.
-	GetExternalService(ctx context.Context, id string) (*OAuthExternalService, error)
-
-	// HandleTokenRequest handles the client's OAuth2 query to obtain an access_token by presenting its authorization
-	// grant (ex: client_credentials, jwtbearer).
-	HandleTokenRequest(rw http.ResponseWriter, req *http.Request)
-	// HandleIntrospectionRequest handles the OAuth2 query to determine the active state of an OAuth 2.0 token and
-	// to determine meta-information about this token.
-	HandleIntrospectionRequest(rw http.ResponseWriter, req *http.Request)
-}
-
-//go:generate mockery --name Store --structname MockStore --outpkg oauthtest --filename store_mock.go --output ./oauthtest/
-
-type Store interface {
-	RegisterExternalService(ctx context.Context, client *OAuthExternalService) error
-	SaveExternalService(ctx context.Context, client *OAuthExternalService) error
-	GetExternalService(ctx context.Context, id string) (*OAuthExternalService, error)
-	GetExternalServiceByName(ctx context.Context, name string) (*OAuthExternalService, error)
-	GetExternalServicePublicKey(ctx context.Context, clientID string) (*jose.JSONWebKey, error)
-}
diff --git a/pkg/services/extsvcauth/oauthserver/oasimpl/aggregate_store.go b/pkg/services/extsvcauth/oauthserver/oasimpl/aggregate_store.go
deleted file mode 100644
index bd2bb90371c8c..0000000000000
--- a/pkg/services/extsvcauth/oauthserver/oasimpl/aggregate_store.go
+++ /dev/null
@@ -1,162 +0,0 @@
-package oasimpl
-
-import (
-	"context"
-	"time"
-
-	"github.com/ory/fosite"
-	"github.com/ory/fosite/handler/oauth2"
-	"github.com/ory/fosite/handler/rfc7523"
-	"gopkg.in/square/go-jose.v2"
-
-	"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver/utils"
-)
-
-var _ fosite.ClientManager = &OAuth2ServiceImpl{}
-var _ oauth2.AuthorizeCodeStorage = &OAuth2ServiceImpl{}
-var _ oauth2.AccessTokenStorage = &OAuth2ServiceImpl{}
-var _ oauth2.RefreshTokenStorage = &OAuth2ServiceImpl{}
-var _ rfc7523.RFC7523KeyStorage = &OAuth2ServiceImpl{}
-var _ oauth2.TokenRevocationStorage = &OAuth2ServiceImpl{}
-
-// GetClient loads the client by its ID or returns an error
-// if the client does not exist or another error occurred.
-func (s *OAuth2ServiceImpl) GetClient(ctx context.Context, id string) (fosite.Client, error) {
-	return s.GetExternalService(ctx, id)
-}
-
-// ClientAssertionJWTValid returns an error if the JTI is
-// known or the DB check failed and nil if the JTI is not known.
-func (s *OAuth2ServiceImpl) ClientAssertionJWTValid(ctx context.Context, jti string) error {
-	return s.memstore.ClientAssertionJWTValid(ctx, jti)
-}
-
-// SetClientAssertionJWT marks a JTI as known for the given
-// expiry time. Before inserting the new JTI, it will clean
-// up any existing JTIs that have expired as those tokens can
-// not be replayed due to the expiry.
-func (s *OAuth2ServiceImpl) SetClientAssertionJWT(ctx context.Context, jti string, exp time.Time) error {
-	return s.memstore.SetClientAssertionJWT(ctx, jti, exp)
-}
-
-// GetAuthorizeCodeSession stores the authorization request for a given authorization code.
-func (s *OAuth2ServiceImpl) CreateAuthorizeCodeSession(ctx context.Context, code string, request fosite.Requester) (err error) {
-	return s.memstore.CreateAuthorizeCodeSession(ctx, code, request)
-}
-
-// GetAuthorizeCodeSession hydrates the session based on the given code and returns the authorization request.
-// If the authorization code has been invalidated with `InvalidateAuthorizeCodeSession`, this
-// method should return the ErrInvalidatedAuthorizeCode error.
-//
-// Make sure to also return the fosite.Requester value when returning the fosite.ErrInvalidatedAuthorizeCode error!
-func (s *OAuth2ServiceImpl) GetAuthorizeCodeSession(ctx context.Context, code string, session fosite.Session) (request fosite.Requester, err error) {
-	return s.memstore.GetAuthorizeCodeSession(ctx, code, session)
-}
-
-// InvalidateAuthorizeCodeSession is called when an authorize code is being used. The state of the authorization
-// code should be set to invalid and consecutive requests to GetAuthorizeCodeSession should return the
-// ErrInvalidatedAuthorizeCode error.
-func (s *OAuth2ServiceImpl) InvalidateAuthorizeCodeSession(ctx context.Context, code string) (err error) {
-	return s.memstore.InvalidateAuthorizeCodeSession(ctx, code)
-}
-
-func (s *OAuth2ServiceImpl) CreateAccessTokenSession(ctx context.Context, signature string, request fosite.Requester) (err error) {
-	return s.memstore.CreateAccessTokenSession(ctx, signature, request)
-}
-
-func (s *OAuth2ServiceImpl) GetAccessTokenSession(ctx context.Context, signature string, session fosite.Session) (request fosite.Requester, err error) {
-	return s.memstore.GetAccessTokenSession(ctx, signature, session)
-}
-
-func (s *OAuth2ServiceImpl) DeleteAccessTokenSession(ctx context.Context, signature string) (err error) {
-	return s.memstore.DeleteAccessTokenSession(ctx, signature)
-}
-
-func (s *OAuth2ServiceImpl) CreateRefreshTokenSession(ctx context.Context, signature string, request fosite.Requester) (err error) {
-	return s.memstore.CreateRefreshTokenSession(ctx, signature, request)
-}
-
-func (s *OAuth2ServiceImpl) GetRefreshTokenSession(ctx context.Context, signature string, session fosite.Session) (request fosite.Requester, err error) {
-	return s.memstore.GetRefreshTokenSession(ctx, signature, session)
-}
-
-func (s *OAuth2ServiceImpl) DeleteRefreshTokenSession(ctx context.Context, signature string) (err error) {
-	return s.memstore.DeleteRefreshTokenSession(ctx, signature)
-}
-
-// RevokeRefreshToken revokes a refresh token as specified in:
-// https://tools.ietf.org/html/rfc7009#section-2.1
-// If the particular
-// token is a refresh token and the authorization server supports the
-// revocation of access tokens, then the authorization server SHOULD
-// also invalidate all access tokens based on the same authorization
-// grant (see Implementation Note).
-func (s *OAuth2ServiceImpl) RevokeRefreshToken(ctx context.Context, requestID string) error {
-	return s.memstore.RevokeRefreshToken(ctx, requestID)
-}
-
-// RevokeRefreshTokenMaybeGracePeriod revokes a refresh token as specified in:
-// https://tools.ietf.org/html/rfc7009#section-2.1
-// If the particular
-// token is a refresh token and the authorization server supports the
-// revocation of access tokens, then the authorization server SHOULD
-// also invalidate all access tokens based on the same authorization
-// grant (see Implementation Note).
-//
-// If the Refresh Token grace period is greater than zero in configuration the token
-// will have its expiration time set as UTCNow + GracePeriod.
-func (s *OAuth2ServiceImpl) RevokeRefreshTokenMaybeGracePeriod(ctx context.Context, requestID string, signature string) error {
-	return s.memstore.RevokeRefreshTokenMaybeGracePeriod(ctx, requestID, signature)
-}
-
-// RevokeAccessToken revokes an access token as specified in:
-// https://tools.ietf.org/html/rfc7009#section-2.1
-// If the token passed to the request
-// is an access token, the server MAY revoke the respective refresh
-// token as well.
-func (s *OAuth2ServiceImpl) RevokeAccessToken(ctx context.Context, requestID string) error {
-	return s.memstore.RevokeAccessToken(ctx, requestID)
-}
-
-// GetPublicKey returns public key, issued by 'issuer', and assigned for subject. Public key is used to check
-// signature of jwt assertion in authorization grants.
-func (s *OAuth2ServiceImpl) GetPublicKey(ctx context.Context, issuer string, subject string, kid string) (*jose.JSONWebKey, error) {
-	return s.sqlstore.GetExternalServicePublicKey(ctx, issuer)
-}
-
-// GetPublicKeys returns public key, set issued by 'issuer', and assigned for subject.
-func (s *OAuth2ServiceImpl) GetPublicKeys(ctx context.Context, issuer string, subject string) (*jose.JSONWebKeySet, error) {
-	jwk, err := s.sqlstore.GetExternalServicePublicKey(ctx, issuer)
-	if err != nil {
-		return nil, err
-	}
-	return &jose.JSONWebKeySet{
-		Keys: []jose.JSONWebKey{*jwk},
-	}, nil
-}
-
-// GetPublicKeyScopes returns assigned scope for assertion, identified by public key, issued by 'issuer'.
-func (s *OAuth2ServiceImpl) GetPublicKeyScopes(ctx context.Context, issuer string, subject string, kid string) ([]string, error) {
-	client, err := s.GetExternalService(ctx, issuer)
-	if err != nil {
-		return nil, err
-	}
-	userID, err := utils.ParseUserIDFromSubject(subject)
-	if err != nil {
-		return nil, err
-	}
-	return client.GetScopesOnUser(ctx, s.accessControl, userID), nil
-}
-
-// IsJWTUsed returns true, if JWT is not known yet or it can not be considered valid, because it must be already
-// expired.
-func (s *OAuth2ServiceImpl) IsJWTUsed(ctx context.Context, jti string) (bool, error) {
-	return s.memstore.IsJWTUsed(ctx, jti)
-}
-
-// MarkJWTUsedForTime marks JWT as used for a time passed in exp parameter. This helps ensure that JWTs are not
-// replayed by maintaining the set of used "jti" values for the length of time for which the JWT would be
-// considered valid based on the applicable "exp" instant. (https://tools.ietf.org/html/rfc7523#section-3)
-func (s *OAuth2ServiceImpl) MarkJWTUsedForTime(ctx context.Context, jti string, exp time.Time) error {
-	return s.memstore.MarkJWTUsedForTime(ctx, jti, exp)
-}
diff --git a/pkg/services/extsvcauth/oauthserver/oasimpl/aggregate_store_test.go b/pkg/services/extsvcauth/oauthserver/oasimpl/aggregate_store_test.go
deleted file mode 100644
index b5899c8760186..0000000000000
--- a/pkg/services/extsvcauth/oauthserver/oasimpl/aggregate_store_test.go
+++ /dev/null
@@ -1,119 +0,0 @@
-package oasimpl
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-
-	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver"
-	"github.com/grafana/grafana/pkg/services/user"
-)
-
-var cachedExternalService = func() *oauthserver.OAuthExternalService {
-	return &oauthserver.OAuthExternalService{
-		Name:             "my-ext-service",
-		ClientID:         "RANDOMID",
-		Secret:           "RANDOMSECRET",
-		GrantTypes:       "client_credentials",
-		PublicPem:        []byte("-----BEGIN PUBLIC KEY-----"),
-		ServiceAccountID: 1,
-		SelfPermissions:  []ac.Permission{{Action: "users:impersonate", Scope: "users:*"}},
-		SignedInUser: &user.SignedInUser{
-			UserID: 2,
-			OrgID:  1,
-			Permissions: map[int64]map[string][]string{
-				1: {
-					"users:impersonate": {"users:*"},
-				},
-			},
-		},
-	}
-}
-
-func TestOAuth2ServiceImpl_GetPublicKeyScopes(t *testing.T) {
-	testCases := []struct {
-		name                   string
-		initTestEnv            func(*TestEnv)
-		impersonatePermissions []ac.Permission
-		userID                 string
-		expectedScopes         []string
-		wantErr                bool
-	}{
-		{
-			name: "should error out when GetExternalService returns error",
-			initTestEnv: func(env *TestEnv) {
-				env.OAuthStore.On("GetExternalService", mock.Anything, mock.Anything).Return(nil, oauthserver.ErrClientNotFound("my-ext-service"))
-			},
-			wantErr: true,
-		},
-		{
-			name: "should error out when the user id cannot be parsed",
-			initTestEnv: func(env *TestEnv) {
-				env.S.cache.Set("my-ext-service", *cachedExternalService(), time.Minute)
-			},
-			userID:  "user:3",
-			wantErr: true,
-		},
-		{
-			name: "should return no scope when the external service is not allowed to impersonate the user",
-			initTestEnv: func(env *TestEnv) {
-				client := cachedExternalService()
-				client.SignedInUser.Permissions = map[int64]map[string][]string{}
-				env.S.cache.Set("my-ext-service", *client, time.Minute)
-			},
-			userID:         "user:id:3",
-			expectedScopes: nil,
-			wantErr:        false,
-		},
-		{
-			name: "should return no scope when the external service has an no impersonate permission",
-			initTestEnv: func(env *TestEnv) {
-				client := cachedExternalService()
-				client.ImpersonatePermissions = []ac.Permission{}
-				env.S.cache.Set("my-ext-service", *client, time.Minute)
-			},
-			userID:         "user:id:3",
-			expectedScopes: []string{},
-			wantErr:        false,
-		},
-		{
-			name: "should return the scopes when the external service has impersonate permissions",
-			initTestEnv: func(env *TestEnv) {
-				env.S.cache.Set("my-ext-service", *cachedExternalService(), time.Minute)
-				client := cachedExternalService()
-				client.ImpersonatePermissions = []ac.Permission{
-					{Action: ac.ActionUsersImpersonate, Scope: ac.ScopeUsersAll},
-					{Action: ac.ActionUsersRead, Scope: oauthserver.ScopeGlobalUsersSelf},
-					{Action: ac.ActionUsersPermissionsRead, Scope: oauthserver.ScopeUsersSelf},
-					{Action: ac.ActionTeamsRead, Scope: oauthserver.ScopeTeamsSelf}}
-				env.S.cache.Set("my-ext-service", *client, time.Minute)
-			},
-			userID: "user:id:3",
-			expectedScopes: []string{"users:impersonate",
-				"profile", "email", ac.ActionUsersRead,
-				"entitlements", ac.ActionUsersPermissionsRead,
-				"groups", ac.ActionTeamsRead},
-			wantErr: false,
-		},
-	}
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			env := setupTestEnv(t)
-			if tc.initTestEnv != nil {
-				tc.initTestEnv(env)
-			}
-
-			scopes, err := env.S.GetPublicKeyScopes(context.Background(), "my-ext-service", tc.userID, "")
-			if tc.wantErr {
-				require.Error(t, err)
-				return
-			}
-
-			require.EqualValues(t, tc.expectedScopes, scopes)
-		})
-	}
-}
diff --git a/pkg/services/extsvcauth/oauthserver/oasimpl/introspection.go b/pkg/services/extsvcauth/oauthserver/oasimpl/introspection.go
deleted file mode 100644
index 3182efbf3ac1a..0000000000000
--- a/pkg/services/extsvcauth/oauthserver/oasimpl/introspection.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package oasimpl
-
-import (
-	"log"
-	"net/http"
-)
-
-// HandleIntrospectionRequest handles the OAuth2 query to determine the active state of an OAuth 2.0 token and
-// to determine meta-information about this token
-func (s *OAuth2ServiceImpl) HandleIntrospectionRequest(rw http.ResponseWriter, req *http.Request) {
-	ctx := req.Context()
-	currentOAuthSessionData := NewAuthSession()
-	ir, err := s.oauthProvider.NewIntrospectionRequest(ctx, req, currentOAuthSessionData)
-	if err != nil {
-		log.Printf("Error occurred in NewIntrospectionRequest: %+v", err)
-		s.oauthProvider.WriteIntrospectionError(ctx, rw, err)
-		return
-	}
-
-	s.oauthProvider.WriteIntrospectionResponse(ctx, rw, ir)
-}
diff --git a/pkg/services/extsvcauth/oauthserver/oasimpl/service.go b/pkg/services/extsvcauth/oauthserver/oasimpl/service.go
deleted file mode 100644
index 9aae5e8feae0c..0000000000000
--- a/pkg/services/extsvcauth/oauthserver/oasimpl/service.go
+++ /dev/null
@@ -1,407 +0,0 @@
-package oasimpl
-
-import (
-	"context"
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/x509"
-	"encoding/base64"
-	"encoding/pem"
-	"errors"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/go-jose/go-jose/v3"
-	"github.com/ory/fosite"
-	"github.com/ory/fosite/compose"
-	"github.com/ory/fosite/storage"
-	"github.com/ory/fosite/token/jwt"
-	"golang.org/x/crypto/bcrypt"
-
-	"github.com/grafana/grafana/pkg/api/routing"
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/infra/localcache"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/infra/slugify"
-	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/extsvcauth"
-	"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver"
-	"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver/api"
-	"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver/store"
-	"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver/utils"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/services/serviceaccounts"
-	"github.com/grafana/grafana/pkg/services/signingkeys"
-	"github.com/grafana/grafana/pkg/services/team"
-	"github.com/grafana/grafana/pkg/services/user"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/util/errutil"
-)
-
-const (
-	cacheExpirationTime  = 5 * time.Minute
-	cacheCleanupInterval = 5 * time.Minute
-)
-
-type OAuth2ServiceImpl struct {
-	cache         *localcache.CacheService
-	memstore      *storage.MemoryStore
-	cfg           *setting.Cfg
-	sqlstore      oauthserver.Store
-	oauthProvider fosite.OAuth2Provider
-	logger        log.Logger
-	accessControl ac.AccessControl
-	acService     ac.Service
-	saService     serviceaccounts.ExtSvcAccountsService
-	userService   user.Service
-	teamService   team.Service
-	publicKey     any
-}
-
-func ProvideService(router routing.RouteRegister, db db.DB, cfg *setting.Cfg,
-	extSvcAccSvc serviceaccounts.ExtSvcAccountsService, accessControl ac.AccessControl, acSvc ac.Service, userSvc user.Service,
-	teamSvc team.Service, keySvc signingkeys.Service, fmgmt *featuremgmt.FeatureManager) (*OAuth2ServiceImpl, error) {
-	if !fmgmt.IsEnabled(featuremgmt.FlagExternalServiceAuth) {
-		return nil, nil
-	}
-	config := &fosite.Config{
-		AccessTokenLifespan: cfg.OAuth2ServerAccessTokenLifespan,
-		TokenURL:            fmt.Sprintf("%voauth2/token", cfg.AppURL),
-		AccessTokenIssuer:   cfg.AppURL,
-		IDTokenIssuer:       cfg.AppURL,
-		ScopeStrategy:       fosite.WildcardScopeStrategy,
-	}
-
-	s := &OAuth2ServiceImpl{
-		cache:         localcache.New(cacheExpirationTime, cacheCleanupInterval),
-		cfg:           cfg,
-		accessControl: accessControl,
-		acService:     acSvc,
-		memstore:      storage.NewMemoryStore(),
-		sqlstore:      store.NewStore(db),
-		logger:        log.New("oauthserver"),
-		userService:   userSvc,
-		saService:     extSvcAccSvc,
-		teamService:   teamSvc,
-	}
-
-	api := api.NewAPI(router, s)
-	api.RegisterAPIEndpoints()
-
-	s.oauthProvider = newProvider(config, s, keySvc)
-
-	return s, nil
-}
-
-func newProvider(config *fosite.Config, storage any, signingKeyService signingkeys.Service) fosite.OAuth2Provider {
-	keyGetter := func(ctx context.Context) (any, error) {
-		_, key, err := signingKeyService.GetOrCreatePrivateKey(ctx, signingkeys.ServerPrivateKeyID, jose.ES256)
-		return key, err
-	}
-	return compose.Compose(
-		config,
-		storage,
-		&compose.CommonStrategy{
-			CoreStrategy: compose.NewOAuth2JWTStrategy(keyGetter, compose.NewOAuth2HMACStrategy(config), config),
-			Signer:       &jwt.DefaultSigner{GetPrivateKey: keyGetter},
-		},
-		compose.OAuth2ClientCredentialsGrantFactory,
-		compose.RFC7523AssertionGrantFactory,
-
-		compose.OAuth2TokenIntrospectionFactory,
-		compose.OAuth2TokenRevocationFactory,
-	)
-}
-
-// GetExternalService retrieves an external service from store by client_id. It populates the SelfPermissions and
-// SignedInUser from the associated service account.
-// For performance reason, the service uses caching.
-func (s *OAuth2ServiceImpl) GetExternalService(ctx context.Context, id string) (*oauthserver.OAuthExternalService, error) {
-	entry, ok := s.cache.Get(id)
-	if ok {
-		client, ok := entry.(oauthserver.OAuthExternalService)
-		if ok {
-			s.logger.Debug("GetExternalService: cache hit", "id", id)
-			return &client, nil
-		}
-	}
-
-	client, err := s.sqlstore.GetExternalService(ctx, id)
-	if err != nil {
-		return nil, err
-	}
-
-	// Handle the case where the external service has no service account
-	if client.ServiceAccountID == oauthserver.NoServiceAccountID {
-		s.logger.Debug("GetExternalService: service has no service account, hence no permission", "id", id, "name", client.Name)
-		// Create a signed in user with no role and no permissions
-		client.SignedInUser = &user.SignedInUser{
-			UserID:      oauthserver.NoServiceAccountID,
-			OrgID:       oauthserver.TmpOrgID,
-			Name:        client.Name,
-			Permissions: map[int64]map[string][]string{oauthserver.TmpOrgID: {}},
-		}
-		s.cache.Set(id, *client, cacheExpirationTime)
-		return client, nil
-	}
-
-	// Retrieve self permissions and generate a signed in user
-	s.logger.Debug("GetExternalService: fetch permissions", "client id", id)
-	sa, err := s.saService.RetrieveExtSvcAccount(ctx, oauthserver.TmpOrgID, client.ServiceAccountID)
-	if err != nil {
-		s.logger.Error("GetExternalService: error fetching service account", "id", id, "error", err)
-		return nil, err
-	}
-	client.SignedInUser = &user.SignedInUser{
-		UserID:      sa.ID,
-		OrgID:       oauthserver.TmpOrgID,
-		OrgRole:     sa.Role, // Need this to compute the permissions in OSS
-		Login:       sa.Login,
-		Name:        sa.Name,
-		Permissions: map[int64]map[string][]string{},
-	}
-	client.SelfPermissions, err = s.acService.GetUserPermissions(ctx, client.SignedInUser, ac.Options{})
-	if err != nil {
-		s.logger.Error("GetExternalService: error fetching permissions", "id", id, "error", err)
-		return nil, err
-	}
-	client.SignedInUser.Permissions[oauthserver.TmpOrgID] = ac.GroupScopesByAction(client.SelfPermissions)
-
-	s.cache.Set(id, *client, cacheExpirationTime)
-	return client, nil
-}
-
-// SaveExternalService creates or updates an external service in the database, it generates client_id and secrets and
-// it ensures that the associated service account has the correct permissions.
-// Database consistency is not guaranteed, consider changing this in the future.
-func (s *OAuth2ServiceImpl) SaveExternalService(ctx context.Context, registration *extsvcauth.ExternalServiceRegistration) (*extsvcauth.ExternalService, error) {
-	if registration == nil {
-		s.logger.Warn("RegisterExternalService called without registration")
-		return nil, nil
-	}
-	s.logger.Info("Registering external service", "external service name", registration.Name)
-
-	// Check if the client already exists in store
-	client, errFetchExtSvc := s.sqlstore.GetExternalServiceByName(ctx, registration.Name)
-	if errFetchExtSvc != nil {
-		var srcError errutil.Error
-		if errors.As(errFetchExtSvc, &srcError) {
-			if srcError.MessageID != oauthserver.ErrClientNotFoundMessageID {
-				s.logger.Error("Error fetching service", "external service", registration.Name, "error", errFetchExtSvc)
-				return nil, errFetchExtSvc
-			}
-		}
-	}
-	// Otherwise, create a new client
-	if client == nil {
-		s.logger.Debug("External service does not yet exist", "external service name", registration.Name)
-		client = &oauthserver.OAuthExternalService{
-			Name:             registration.Name,
-			ServiceAccountID: oauthserver.NoServiceAccountID,
-			Audiences:        s.cfg.AppURL,
-		}
-	}
-
-	// Parse registration form to compute required permissions for the client
-	client.SelfPermissions, client.ImpersonatePermissions = s.handleRegistrationPermissions(registration)
-
-	if registration.OAuthProviderCfg == nil {
-		return nil, errors.New("missing oauth provider configuration")
-	}
-
-	if registration.OAuthProviderCfg.RedirectURI != nil {
-		client.RedirectURI = *registration.OAuthProviderCfg.RedirectURI
-	}
-
-	var errGenCred error
-	client.ClientID, client.Secret, errGenCred = s.genCredentials()
-	if errGenCred != nil {
-		s.logger.Error("Error generating credentials", "client", client.LogID(), "error", errGenCred)
-		return nil, errGenCred
-	}
-
-	grantTypes := s.computeGrantTypes(registration.Self.Enabled, registration.Impersonation.Enabled)
-	client.GrantTypes = strings.Join(grantTypes, ",")
-
-	// Handle key options
-	s.logger.Debug("Handle key options")
-	keys, err := s.handleKeyOptions(ctx, registration.OAuthProviderCfg.Key)
-	if err != nil {
-		s.logger.Error("Error handling key options", "client", client.LogID(), "error", err)
-		return nil, err
-	}
-	if keys != nil {
-		client.PublicPem = []byte(keys.PublicPem)
-	}
-	dto := client.ToExternalService(keys)
-
-	hashedSecret, err := bcrypt.GenerateFromPassword([]byte(client.Secret), bcrypt.DefaultCost)
-	if err != nil {
-		s.logger.Error("Error hashing secret", "client", client.LogID(), "error", err)
-		return nil, err
-	}
-	client.Secret = string(hashedSecret)
-
-	s.logger.Debug("Save service account")
-	saID, errSaveServiceAccount := s.saService.ManageExtSvcAccount(ctx, &serviceaccounts.ManageExtSvcAccountCmd{
-		ExtSvcSlug:  slugify.Slugify(client.Name),
-		Enabled:     registration.Self.Enabled,
-		OrgID:       oauthserver.TmpOrgID,
-		Permissions: client.SelfPermissions,
-	})
-	if errSaveServiceAccount != nil {
-		return nil, errSaveServiceAccount
-	}
-	client.ServiceAccountID = saID
-
-	err = s.sqlstore.SaveExternalService(ctx, client)
-	if err != nil {
-		s.logger.Error("Error saving external service", "client", client.LogID(), "error", err)
-		return nil, err
-	}
-	s.logger.Debug("Registered", "client", client.LogID())
-	return dto, nil
-}
-
-// randString generates a a cryptographically secure random string of n bytes
-func (s *OAuth2ServiceImpl) randString(n int) (string, error) {
-	res := make([]byte, n)
-	if _, err := rand.Read(res); err != nil {
-		return "", err
-	}
-	return base64.RawURLEncoding.EncodeToString(res), nil
-}
-
-func (s *OAuth2ServiceImpl) genCredentials() (string, string, error) {
-	id, err := s.randString(20)
-	if err != nil {
-		return "", "", err
-	}
-	// client_secret must be at least 32 bytes long
-	secret, err := s.randString(32)
-	if err != nil {
-		return "", "", err
-	}
-	return id, secret, err
-}
-
-func (s *OAuth2ServiceImpl) computeGrantTypes(selfAccessEnabled, impersonationEnabled bool) []string {
-	grantTypes := []string{}
-
-	if selfAccessEnabled {
-		grantTypes = append(grantTypes, string(fosite.GrantTypeClientCredentials))
-	}
-
-	if impersonationEnabled {
-		grantTypes = append(grantTypes, string(fosite.GrantTypeJWTBearer))
-	}
-
-	return grantTypes
-}
-
-func (s *OAuth2ServiceImpl) handleKeyOptions(ctx context.Context, keyOption *extsvcauth.KeyOption) (*extsvcauth.KeyResult, error) {
-	if keyOption == nil {
-		return nil, fmt.Errorf("keyOption is nil")
-	}
-
-	var publicPem, privatePem string
-
-	if keyOption.Generate {
-		switch s.cfg.OAuth2ServerGeneratedKeyTypeForClient {
-		case "RSA":
-			privateKey, err := rsa.GenerateKey(rand.Reader, 2048)
-			if err != nil {
-				return nil, err
-			}
-			publicPem = string(pem.EncodeToMemory(&pem.Block{
-				Type:  "RSA PUBLIC KEY",
-				Bytes: x509.MarshalPKCS1PublicKey(&privateKey.PublicKey),
-			}))
-			privatePem = string(pem.EncodeToMemory(&pem.Block{
-				Type:  "RSA PRIVATE KEY",
-				Bytes: x509.MarshalPKCS1PrivateKey(privateKey),
-			}))
-			s.logger.Debug("RSA key has been generated")
-		default: // default to ECDSA
-			privateKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-			if err != nil {
-				return nil, err
-			}
-			publicDer, err := x509.MarshalPKIXPublicKey(&privateKey.PublicKey)
-			if err != nil {
-				return nil, err
-			}
-
-			privateDer, err := x509.MarshalPKCS8PrivateKey(privateKey)
-			if err != nil {
-				return nil, err
-			}
-
-			publicPem = string(pem.EncodeToMemory(&pem.Block{
-				Type:  "PUBLIC KEY",
-				Bytes: publicDer,
-			}))
-			privatePem = string(pem.EncodeToMemory(&pem.Block{
-				Type:  "PRIVATE KEY",
-				Bytes: privateDer,
-			}))
-			s.logger.Debug("ECDSA key has been generated")
-		}
-
-		return &extsvcauth.KeyResult{
-			PrivatePem: privatePem,
-			PublicPem:  publicPem,
-			Generated:  true,
-		}, nil
-	}
-
-	// TODO MVP allow specifying a URL to get the public key
-	// if registration.Key.URL != "" {
-	// 	return &oauthserver.KeyResult{
-	// 		URL: registration.Key.URL,
-	// 	}, nil
-	// }
-
-	if keyOption.PublicPEM != "" {
-		pemEncoded, err := base64.StdEncoding.DecodeString(keyOption.PublicPEM)
-		if err != nil {
-			s.logger.Error("Cannot decode base64 encoded PEM string", "error", err)
-		}
-		_, err = utils.ParsePublicKeyPem(pemEncoded)
-		if err != nil {
-			s.logger.Error("Cannot parse PEM encoded string", "error", err)
-			return nil, err
-		}
-		return &extsvcauth.KeyResult{
-			PublicPem: string(pemEncoded),
-		}, nil
-	}
-
-	return nil, fmt.Errorf("at least one key option must be specified")
-}
-
-// handleRegistrationPermissions parses the registration form to retrieve requested permissions and adds default
-// permissions when impersonation is requested
-func (*OAuth2ServiceImpl) handleRegistrationPermissions(registration *extsvcauth.ExternalServiceRegistration) ([]ac.Permission, []ac.Permission) {
-	selfPermissions := []ac.Permission{}
-	impersonatePermissions := []ac.Permission{}
-
-	if registration.Self.Enabled {
-		selfPermissions = append(selfPermissions, registration.Self.Permissions...)
-	}
-	if registration.Impersonation.Enabled {
-		requiredForToken := []ac.Permission{
-			{Action: ac.ActionUsersRead, Scope: oauthserver.ScopeGlobalUsersSelf},
-			{Action: ac.ActionUsersPermissionsRead, Scope: oauthserver.ScopeUsersSelf},
-		}
-		if registration.Impersonation.Groups {
-			requiredForToken = append(requiredForToken, ac.Permission{Action: ac.ActionTeamsRead, Scope: oauthserver.ScopeTeamsSelf})
-		}
-		impersonatePermissions = append(requiredForToken, registration.Impersonation.Permissions...)
-		selfPermissions = append(selfPermissions, ac.Permission{Action: ac.ActionUsersImpersonate, Scope: ac.ScopeUsersAll})
-	}
-	return selfPermissions, impersonatePermissions
-}
diff --git a/pkg/services/extsvcauth/oauthserver/oasimpl/service_test.go b/pkg/services/extsvcauth/oauthserver/oasimpl/service_test.go
deleted file mode 100644
index afcedd06cc2a5..0000000000000
--- a/pkg/services/extsvcauth/oauthserver/oasimpl/service_test.go
+++ /dev/null
@@ -1,476 +0,0 @@
-package oasimpl
-
-import (
-	"context"
-	"crypto/rand"
-	"crypto/rsa"
-	"encoding/base64"
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/ory/fosite"
-	"github.com/ory/fosite/storage"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/slices"
-
-	"github.com/grafana/grafana/pkg/infra/localcache"
-	"github.com/grafana/grafana/pkg/infra/log"
-	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
-	"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
-	"github.com/grafana/grafana/pkg/services/extsvcauth"
-	"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver"
-	"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver/oastest"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	sa "github.com/grafana/grafana/pkg/services/serviceaccounts"
-	saTests "github.com/grafana/grafana/pkg/services/serviceaccounts/tests"
-	"github.com/grafana/grafana/pkg/services/signingkeys/signingkeystest"
-	"github.com/grafana/grafana/pkg/services/team/teamtest"
-	"github.com/grafana/grafana/pkg/services/user"
-	"github.com/grafana/grafana/pkg/services/user/usertest"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-const (
-	AppURL   = "https://oauth.test/"
-	TokenURL = AppURL + "oauth2/token"
-)
-
-var (
-	pk, _         = rsa.GenerateKey(rand.Reader, 4096)
-	Client1Key, _ = rsa.GenerateKey(rand.Reader, 4096)
-)
-
-type TestEnv struct {
-	S           *OAuth2ServiceImpl
-	Cfg         *setting.Cfg
-	AcStore     *actest.MockStore
-	OAuthStore  *oastest.MockStore
-	UserService *usertest.FakeUserService
-	TeamService *teamtest.FakeService
-	SAService   *saTests.MockExtSvcAccountsService
-}
-
-func setupTestEnv(t *testing.T) *TestEnv {
-	t.Helper()
-
-	cfg := setting.NewCfg()
-	cfg.AppURL = AppURL
-
-	config := &fosite.Config{
-		AccessTokenLifespan: time.Hour,
-		TokenURL:            TokenURL,
-		AccessTokenIssuer:   AppURL,
-		IDTokenIssuer:       AppURL,
-		ScopeStrategy:       fosite.WildcardScopeStrategy,
-	}
-
-	fmgt := featuremgmt.WithFeatures(featuremgmt.FlagExternalServiceAuth)
-
-	env := &TestEnv{
-		Cfg:         cfg,
-		AcStore:     &actest.MockStore{},
-		OAuthStore:  &oastest.MockStore{},
-		UserService: usertest.NewUserServiceFake(),
-		TeamService: teamtest.NewFakeService(),
-		SAService:   saTests.NewMockExtSvcAccountsService(t),
-	}
-	env.S = &OAuth2ServiceImpl{
-		cache:         localcache.New(cacheExpirationTime, cacheCleanupInterval),
-		cfg:           cfg,
-		accessControl: acimpl.ProvideAccessControl(cfg),
-		acService:     acimpl.ProvideOSSService(cfg, env.AcStore, localcache.New(0, 0), fmgt),
-		memstore:      storage.NewMemoryStore(),
-		sqlstore:      env.OAuthStore,
-		logger:        log.New("oauthserver.test"),
-		userService:   env.UserService,
-		saService:     env.SAService,
-		teamService:   env.TeamService,
-		publicKey:     &pk.PublicKey,
-	}
-
-	env.S.oauthProvider = newProvider(config, env.S, &signingkeystest.FakeSigningKeysService{
-		ExpectedSinger: pk,
-		ExpectedKeyID:  "default",
-		ExpectedError:  nil,
-	})
-
-	return env
-}
-
-func TestOAuth2ServiceImpl_SaveExternalService(t *testing.T) {
-	const serviceName = "my-ext-service"
-
-	tests := []struct {
-		name       string
-		init       func(*TestEnv)
-		cmd        *extsvcauth.ExternalServiceRegistration
-		mockChecks func(*testing.T, *TestEnv)
-		wantErr    bool
-	}{
-		{
-			name: "should create a new client without permissions",
-			init: func(env *TestEnv) {
-				// No client at the beginning
-				env.OAuthStore.On("GetExternalServiceByName", mock.Anything, mock.Anything).Return(nil, oauthserver.ErrClientNotFound(serviceName))
-				env.OAuthStore.On("SaveExternalService", mock.Anything, mock.Anything).Return(nil)
-
-				// Return a service account ID
-				env.SAService.On("ManageExtSvcAccount", mock.Anything, mock.Anything).Return(int64(0), nil)
-			},
-			cmd: &extsvcauth.ExternalServiceRegistration{
-				Name:             serviceName,
-				OAuthProviderCfg: &extsvcauth.OAuthProviderCfg{Key: &extsvcauth.KeyOption{Generate: true}},
-			},
-			mockChecks: func(t *testing.T, env *TestEnv) {
-				env.OAuthStore.AssertCalled(t, "GetExternalServiceByName", mock.Anything, mock.MatchedBy(func(name string) bool {
-					return name == serviceName
-				}))
-				env.OAuthStore.AssertCalled(t, "SaveExternalService", mock.Anything, mock.MatchedBy(func(client *oauthserver.OAuthExternalService) bool {
-					return client.Name == serviceName && client.ClientID != "" && client.Secret != "" &&
-						len(client.GrantTypes) == 0 && len(client.PublicPem) > 0 && client.ServiceAccountID == 0 &&
-						len(client.ImpersonatePermissions) == 0
-				}))
-			},
-		},
-		{
-			name: "should allow client credentials grant with correct permissions",
-			init: func(env *TestEnv) {
-				// No client at the beginning
-				env.OAuthStore.On("GetExternalServiceByName", mock.Anything, mock.Anything).Return(nil, oauthserver.ErrClientNotFound(serviceName))
-				env.OAuthStore.On("SaveExternalService", mock.Anything, mock.Anything).Return(nil)
-
-				// Return a service account ID
-				env.SAService.On("ManageExtSvcAccount", mock.Anything, mock.Anything).Return(int64(10), nil)
-			},
-			cmd: &extsvcauth.ExternalServiceRegistration{
-				Name: serviceName,
-				Self: extsvcauth.SelfCfg{
-					Enabled:     true,
-					Permissions: []ac.Permission{{Action: ac.ActionUsersRead, Scope: ac.ScopeUsersAll}},
-				},
-				OAuthProviderCfg: &extsvcauth.OAuthProviderCfg{Key: &extsvcauth.KeyOption{Generate: true}},
-			},
-			mockChecks: func(t *testing.T, env *TestEnv) {
-				env.OAuthStore.AssertCalled(t, "GetExternalServiceByName", mock.Anything, mock.MatchedBy(func(name string) bool {
-					return name == serviceName
-				}))
-				env.OAuthStore.AssertCalled(t, "SaveExternalService", mock.Anything, mock.MatchedBy(func(client *oauthserver.OAuthExternalService) bool {
-					return client.Name == serviceName && len(client.ClientID) > 0 && len(client.Secret) > 0 &&
-						client.GrantTypes == string(fosite.GrantTypeClientCredentials) &&
-						len(client.PublicPem) > 0 && client.ServiceAccountID == 10 &&
-						len(client.ImpersonatePermissions) == 0 &&
-						len(client.SelfPermissions) > 0
-				}))
-				// Check that despite no credential_grants the service account still has a permission to impersonate users
-				env.SAService.AssertCalled(t, "ManageExtSvcAccount", mock.Anything,
-					mock.MatchedBy(func(cmd *sa.ManageExtSvcAccountCmd) bool {
-						return len(cmd.Permissions) == 1 && cmd.Permissions[0] == ac.Permission{Action: ac.ActionUsersRead, Scope: ac.ScopeUsersAll}
-					}))
-			},
-		},
-		{
-			name: "should allow jwt bearer grant and set default permissions",
-			init: func(env *TestEnv) {
-				// No client at the beginning
-				env.OAuthStore.On("GetExternalServiceByName", mock.Anything, mock.Anything).Return(nil, oauthserver.ErrClientNotFound(serviceName))
-				env.OAuthStore.On("SaveExternalService", mock.Anything, mock.Anything).Return(nil)
-				// The service account needs to be created with a permission to impersonate users
-				env.SAService.On("ManageExtSvcAccount", mock.Anything, mock.Anything).Return(int64(10), nil)
-			},
-			cmd: &extsvcauth.ExternalServiceRegistration{
-				Name:             serviceName,
-				OAuthProviderCfg: &extsvcauth.OAuthProviderCfg{Key: &extsvcauth.KeyOption{Generate: true}},
-				Impersonation: extsvcauth.ImpersonationCfg{
-					Enabled:     true,
-					Groups:      true,
-					Permissions: []ac.Permission{{Action: "dashboards:read", Scope: "dashboards:*"}},
-				},
-			},
-			mockChecks: func(t *testing.T, env *TestEnv) {
-				// Check that the external service impersonate permissions contains the default permissions required to populate the access token
-				env.OAuthStore.AssertCalled(t, "SaveExternalService", mock.Anything, mock.MatchedBy(func(client *oauthserver.OAuthExternalService) bool {
-					impPerm := client.ImpersonatePermissions
-					return slices.Contains(impPerm, ac.Permission{Action: "dashboards:read", Scope: "dashboards:*"}) &&
-						slices.Contains(impPerm, ac.Permission{Action: ac.ActionUsersRead, Scope: oauthserver.ScopeGlobalUsersSelf}) &&
-						slices.Contains(impPerm, ac.Permission{Action: ac.ActionUsersPermissionsRead, Scope: oauthserver.ScopeUsersSelf}) &&
-						slices.Contains(impPerm, ac.Permission{Action: ac.ActionTeamsRead, Scope: oauthserver.ScopeTeamsSelf})
-				}))
-				// Check that despite no credential_grants the service account still has a permission to impersonate users
-				env.SAService.AssertCalled(t, "ManageExtSvcAccount", mock.Anything,
-					mock.MatchedBy(func(cmd *sa.ManageExtSvcAccountCmd) bool {
-						return len(cmd.Permissions) == 1 && cmd.Permissions[0] == ac.Permission{Action: ac.ActionUsersImpersonate, Scope: ac.ScopeUsersAll}
-					}))
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			env := setupTestEnv(t)
-			if tt.init != nil {
-				tt.init(env)
-			}
-
-			dto, err := env.S.SaveExternalService(context.Background(), tt.cmd)
-			if tt.wantErr {
-				require.Error(t, err)
-				return
-			}
-			require.NoError(t, err)
-
-			// Check that we generated client ID and secret
-			require.NotEmpty(t, dto.ID)
-			require.NotEmpty(t, dto.Secret)
-
-			// Check that we have generated keys and that we correctly return them
-			if tt.cmd.OAuthProviderCfg.Key != nil && tt.cmd.OAuthProviderCfg.Key.Generate {
-				require.NotNil(t, dto.OAuthExtra.KeyResult)
-				require.True(t, dto.OAuthExtra.KeyResult.Generated)
-				require.NotEmpty(t, dto.OAuthExtra.KeyResult.PublicPem)
-				require.NotEmpty(t, dto.OAuthExtra.KeyResult.PrivatePem)
-			}
-
-			// Check that we computed grant types and created or updated the service account
-			if tt.cmd.Self.Enabled {
-				require.NotNil(t, dto.OAuthExtra.GrantTypes)
-				require.Contains(t, dto.OAuthExtra.GrantTypes, fosite.GrantTypeClientCredentials, "grant types should contain client_credentials")
-			} else {
-				require.NotContains(t, dto.OAuthExtra.GrantTypes, fosite.GrantTypeClientCredentials, "grant types should not contain client_credentials")
-			}
-			// Check that we updated grant types
-			if tt.cmd.Impersonation.Enabled {
-				require.NotNil(t, dto.OAuthExtra.GrantTypes)
-				require.Contains(t, dto.OAuthExtra.GrantTypes, fosite.GrantTypeJWTBearer, "grant types should contain JWT Bearer grant")
-			} else {
-				require.NotContains(t, dto.OAuthExtra.GrantTypes, fosite.GrantTypeJWTBearer, "grant types should not contain JWT Bearer grant")
-			}
-
-			// Check that mocks were called as expected
-			env.OAuthStore.AssertExpectations(t)
-			env.SAService.AssertExpectations(t)
-			env.AcStore.AssertExpectations(t)
-
-			// Additional checks performed
-			if tt.mockChecks != nil {
-				tt.mockChecks(t, env)
-			}
-		})
-	}
-}
-
-func TestOAuth2ServiceImpl_GetExternalService(t *testing.T) {
-	const serviceName = "my-ext-service"
-
-	dummyClient := func() *oauthserver.OAuthExternalService {
-		return &oauthserver.OAuthExternalService{
-			Name:             serviceName,
-			ClientID:         "RANDOMID",
-			Secret:           "RANDOMSECRET",
-			GrantTypes:       "client_credentials",
-			PublicPem:        []byte("-----BEGIN PUBLIC KEY-----"),
-			ServiceAccountID: 1,
-		}
-	}
-	cachedClient := &oauthserver.OAuthExternalService{
-		Name:             serviceName,
-		ClientID:         "RANDOMID",
-		Secret:           "RANDOMSECRET",
-		GrantTypes:       "client_credentials",
-		PublicPem:        []byte("-----BEGIN PUBLIC KEY-----"),
-		ServiceAccountID: 1,
-		SelfPermissions:  []ac.Permission{{Action: "users:impersonate", Scope: "users:*"}},
-		SignedInUser: &user.SignedInUser{
-			UserID: 1,
-			Permissions: map[int64]map[string][]string{
-				1: {
-					"users:impersonate": {"users:*"},
-				},
-			},
-		},
-	}
-	testCases := []struct {
-		name       string
-		init       func(*TestEnv)
-		mockChecks func(*testing.T, *TestEnv)
-		wantPerm   []ac.Permission
-		wantErr    bool
-	}{
-		{
-			name: "should hit the cache",
-			init: func(env *TestEnv) {
-				env.S.cache.Set(serviceName, *cachedClient, time.Minute)
-			},
-			mockChecks: func(t *testing.T, env *TestEnv) {
-				env.OAuthStore.AssertNotCalled(t, "GetExternalService", mock.Anything, mock.Anything)
-			},
-			wantPerm: []ac.Permission{{Action: "users:impersonate", Scope: "users:*"}},
-		},
-		{
-			name: "should return error when the client was not found",
-			init: func(env *TestEnv) {
-				env.OAuthStore.On("GetExternalService", mock.Anything, mock.Anything).Return(nil, oauthserver.ErrClientNotFound(serviceName))
-			},
-			wantErr: true,
-		},
-		{
-			name: "should return error when the service account was not found",
-			init: func(env *TestEnv) {
-				env.OAuthStore.On("GetExternalService", mock.Anything, mock.Anything).Return(dummyClient(), nil)
-				env.SAService.On("RetrieveExtSvcAccount", mock.Anything, int64(1), int64(1)).Return(&sa.ExtSvcAccount{}, sa.ErrServiceAccountNotFound)
-			},
-			mockChecks: func(t *testing.T, env *TestEnv) {
-				env.OAuthStore.AssertCalled(t, "GetExternalService", mock.Anything, mock.Anything)
-				env.SAService.AssertCalled(t, "RetrieveExtSvcAccount", mock.Anything, 1, 1)
-			},
-			wantErr: true,
-		},
-		{
-			name: "should return error when the service account has no permissions",
-			init: func(env *TestEnv) {
-				env.OAuthStore.On("GetExternalService", mock.Anything, mock.Anything).Return(dummyClient(), nil)
-				env.SAService.On("RetrieveExtSvcAccount", mock.Anything, int64(1), int64(1)).Return(&sa.ExtSvcAccount{}, nil)
-				env.AcStore.On("GetUserPermissions", mock.Anything, mock.Anything).Return(nil, fmt.Errorf("some error"))
-			},
-			mockChecks: func(t *testing.T, env *TestEnv) {
-				env.OAuthStore.AssertCalled(t, "GetExternalService", mock.Anything, mock.Anything)
-				env.SAService.AssertCalled(t, "RetrieveExtSvcAccount", mock.Anything, 1, 1)
-			},
-			wantErr: true,
-		},
-		{
-			name: "should return correctly",
-			init: func(env *TestEnv) {
-				env.OAuthStore.On("GetExternalService", mock.Anything, mock.Anything).Return(dummyClient(), nil)
-				env.SAService.On("RetrieveExtSvcAccount", mock.Anything, int64(1), int64(1)).Return(&sa.ExtSvcAccount{ID: 1}, nil)
-				env.AcStore.On("GetUserPermissions", mock.Anything, mock.Anything).Return([]ac.Permission{{Action: ac.ActionUsersImpersonate, Scope: ac.ScopeUsersAll}}, nil)
-			},
-			mockChecks: func(t *testing.T, env *TestEnv) {
-				env.OAuthStore.AssertCalled(t, "GetExternalService", mock.Anything, mock.Anything)
-				env.SAService.AssertCalled(t, "RetrieveExtSvcAccount", mock.Anything, int64(1), int64(1))
-			},
-			wantPerm: []ac.Permission{{Action: "users:impersonate", Scope: "users:*"}},
-		},
-		{
-			name: "should return correctly when the client has no service account",
-			init: func(env *TestEnv) {
-				client := &oauthserver.OAuthExternalService{
-					Name:             serviceName,
-					ClientID:         "RANDOMID",
-					Secret:           "RANDOMSECRET",
-					GrantTypes:       "client_credentials",
-					PublicPem:        []byte("-----BEGIN PUBLIC KEY-----"),
-					ServiceAccountID: oauthserver.NoServiceAccountID,
-				}
-				env.OAuthStore.On("GetExternalService", mock.Anything, mock.Anything).Return(client, nil)
-			},
-			mockChecks: func(t *testing.T, env *TestEnv) {
-				env.OAuthStore.AssertCalled(t, "GetExternalService", mock.Anything, mock.Anything)
-			},
-			wantPerm: []ac.Permission{},
-		},
-	}
-	for _, tt := range testCases {
-		t.Run(tt.name, func(t *testing.T) {
-			env := setupTestEnv(t)
-			if tt.init != nil {
-				tt.init(env)
-			}
-
-			client, err := env.S.GetExternalService(context.Background(), serviceName)
-			if tt.wantErr {
-				require.Error(t, err)
-				return
-			}
-			require.NoError(t, err)
-
-			if tt.mockChecks != nil {
-				tt.mockChecks(t, env)
-			}
-
-			require.Equal(t, serviceName, client.Name)
-			require.ElementsMatch(t, client.SelfPermissions, tt.wantPerm)
-			assertArrayInMap(t, client.SignedInUser.Permissions[1], ac.GroupScopesByAction(tt.wantPerm))
-
-			env.OAuthStore.AssertExpectations(t)
-			env.SAService.AssertExpectations(t)
-		})
-	}
-}
-
-func assertArrayInMap[K comparable, V string](t *testing.T, m1 map[K][]V, m2 map[K][]V) {
-	for k, v := range m1 {
-		require.Contains(t, m2, k)
-		require.ElementsMatch(t, v, m2[k])
-	}
-}
-
-func TestTestOAuth2ServiceImpl_handleKeyOptions(t *testing.T) {
-	testCases := []struct {
-		name           string
-		keyOption      *extsvcauth.KeyOption
-		expectedResult *extsvcauth.KeyResult
-		wantErr        bool
-	}{
-		{
-			name:    "should return error when the key option is nil",
-			wantErr: true,
-		},
-		{
-			name:      "should return error when the key option is empty",
-			keyOption: &extsvcauth.KeyOption{},
-			wantErr:   true,
-		},
-		{
-			name: "should return successfully when PublicPEM is specified",
-			keyOption: &extsvcauth.KeyOption{
-				PublicPEM: base64.StdEncoding.EncodeToString([]byte(`-----BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEbsGtoGJTopAIbhqy49/vyCJuDot+
-mgGaC8vUIigFQVsVB+v/HZ4yG1Rcvysig+tyNk1dZQpozpFc2dGmzHlGhw==
------END PUBLIC KEY-----`)),
-			},
-			wantErr: false,
-			expectedResult: &extsvcauth.KeyResult{
-				PublicPem: `-----BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEbsGtoGJTopAIbhqy49/vyCJuDot+
-mgGaC8vUIigFQVsVB+v/HZ4yG1Rcvysig+tyNk1dZQpozpFc2dGmzHlGhw==
------END PUBLIC KEY-----`,
-				Generated:  false,
-				PrivatePem: "",
-				URL:        "",
-			},
-		},
-	}
-	env := setupTestEnv(t)
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			result, err := env.S.handleKeyOptions(context.Background(), tc.keyOption)
-			if tc.wantErr {
-				require.Error(t, err)
-				return
-			}
-			require.NoError(t, err)
-			require.Equal(t, tc.expectedResult, result)
-		})
-	}
-
-	t.Run("should generate an ECDSA key pair (default) when generate key option is specified", func(t *testing.T) {
-		result, err := env.S.handleKeyOptions(context.Background(), &extsvcauth.KeyOption{Generate: true})
-
-		require.NoError(t, err)
-		require.NotNil(t, result.PrivatePem)
-		require.NotNil(t, result.PublicPem)
-		require.True(t, result.Generated)
-	})
-
-	t.Run("should generate an RSA key pair when generate key option is specified", func(t *testing.T) {
-		env.S.cfg.OAuth2ServerGeneratedKeyTypeForClient = "RSA"
-		result, err := env.S.handleKeyOptions(context.Background(), &extsvcauth.KeyOption{Generate: true})
-
-		require.NoError(t, err)
-		require.NotNil(t, result.PrivatePem)
-		require.NotNil(t, result.PublicPem)
-		require.True(t, result.Generated)
-	})
-}
diff --git a/pkg/services/extsvcauth/oauthserver/oasimpl/session.go b/pkg/services/extsvcauth/oauthserver/oasimpl/session.go
deleted file mode 100644
index 6d184c8c6d880..0000000000000
--- a/pkg/services/extsvcauth/oauthserver/oasimpl/session.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package oasimpl
-
-import (
-	"github.com/ory/fosite/handler/oauth2"
-	"github.com/ory/fosite/token/jwt"
-)
-
-func NewAuthSession() *oauth2.JWTSession {
-	sess := &oauth2.JWTSession{
-		JWTClaims: new(jwt.JWTClaims),
-		JWTHeader: new(jwt.Headers),
-	}
-	// Our tokens will follow the RFC9068
-	sess.JWTHeader.Add("typ", "at+jwt")
-	return sess
-}
diff --git a/pkg/services/extsvcauth/oauthserver/oasimpl/token.go b/pkg/services/extsvcauth/oauthserver/oasimpl/token.go
deleted file mode 100644
index 2dc18d6370dd1..0000000000000
--- a/pkg/services/extsvcauth/oauthserver/oasimpl/token.go
+++ /dev/null
@@ -1,351 +0,0 @@
-package oasimpl
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"net/http"
-	"strconv"
-
-	"github.com/ory/fosite"
-	"github.com/ory/fosite/handler/oauth2"
-
-	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver"
-	"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver/utils"
-	"github.com/grafana/grafana/pkg/services/team"
-	"github.com/grafana/grafana/pkg/services/user"
-)
-
-// HandleTokenRequest handles the client's OAuth2 query to obtain an access_token by presenting its authorization
-// grant (ex: client_credentials, jwtbearer)
-func (s *OAuth2ServiceImpl) HandleTokenRequest(rw http.ResponseWriter, req *http.Request) {
-	// This context will be passed to all methods.
-	ctx := req.Context()
-
-	// Create an empty session object which will be passed to the request handlers
-	oauthSession := NewAuthSession()
-
-	// This will create an access request object and iterate through the registered TokenEndpointHandlers to validate the request.
-	accessRequest, err := s.oauthProvider.NewAccessRequest(ctx, req, oauthSession)
-	if err != nil {
-		s.writeAccessError(ctx, rw, accessRequest, err)
-		return
-	}
-
-	client, err := s.GetExternalService(ctx, accessRequest.GetClient().GetID())
-	if err != nil || client == nil {
-		s.oauthProvider.WriteAccessError(ctx, rw, accessRequest, &fosite.RFC6749Error{
-			DescriptionField: "Could not find the requested subject.",
-			ErrorField:       "not_found",
-			CodeField:        http.StatusBadRequest,
-		})
-		return
-	}
-	oauthSession.JWTClaims.Add("client_id", client.ClientID)
-
-	errClientCred := s.handleClientCredentials(ctx, accessRequest, oauthSession, client)
-	if errClientCred != nil {
-		s.writeAccessError(ctx, rw, accessRequest, errClientCred)
-		return
-	}
-
-	errJWTBearer := s.handleJWTBearer(ctx, accessRequest, oauthSession, client)
-	if errJWTBearer != nil {
-		s.writeAccessError(ctx, rw, accessRequest, errJWTBearer)
-		return
-	}
-
-	// All tokens we generate in this service should target Grafana's API.
-	accessRequest.GrantAudience(s.cfg.AppURL)
-
-	// Prepare response, fosite handlers will populate the token.
-	response, err := s.oauthProvider.NewAccessResponse(ctx, accessRequest)
-	if err != nil {
-		s.writeAccessError(ctx, rw, accessRequest, err)
-		return
-	}
-	s.oauthProvider.WriteAccessResponse(ctx, rw, accessRequest, response)
-}
-
-// writeAccessError logs the error then uses fosite to write the error back to the user.
-func (s *OAuth2ServiceImpl) writeAccessError(ctx context.Context, rw http.ResponseWriter, accessRequest fosite.AccessRequester, err error) {
-	var fositeErr *fosite.RFC6749Error
-	if errors.As(err, &fositeErr) {
-		s.logger.Error("Description", fositeErr.DescriptionField, "hint", fositeErr.HintField, "error", fositeErr.ErrorField)
-	} else {
-		s.logger.Error("Error", err)
-	}
-	s.oauthProvider.WriteAccessError(ctx, rw, accessRequest, err)
-}
-
-// splitOAuthScopes sort scopes that are generic (profile, email, groups, entitlements) from scopes
-// that are RBAC actions (used to further restrict the entitlements embedded in the access_token)
-func splitOAuthScopes(requestedScopes fosite.Arguments) (map[string]bool, map[string]bool) {
-	actionsFilter := map[string]bool{}
-	claimsFilter := map[string]bool{}
-	for _, scope := range requestedScopes {
-		switch scope {
-		case "profile", "email", "groups", "entitlements":
-			claimsFilter[scope] = true
-		default:
-			actionsFilter[scope] = true
-		}
-	}
-	return actionsFilter, claimsFilter
-}
-
-// handleJWTBearer populates the "impersonation" access_token generated by fosite to match the rfc9068 specifications (entitlements, groups).
-// It ensures that the user can be impersonated, that the generated token audiences only contain Grafana's AppURL (and token endpoint)
-// and that entitlements solely contain the user's permissions that the client is allowed to have.
-func (s *OAuth2ServiceImpl) handleJWTBearer(ctx context.Context, accessRequest fosite.AccessRequester, oauthSession *oauth2.JWTSession, client *oauthserver.OAuthExternalService) error {
-	if !accessRequest.GetGrantTypes().ExactOne(string(fosite.GrantTypeJWTBearer)) {
-		return nil
-	}
-
-	userID, err := utils.ParseUserIDFromSubject(oauthSession.Subject)
-	if err != nil {
-		return &fosite.RFC6749Error{
-			DescriptionField: "Could not find the requested subject.",
-			ErrorField:       "not_found",
-			CodeField:        http.StatusBadRequest,
-		}
-	}
-
-	// Check audiences list only contains the AppURL and the token endpoint
-	for _, aud := range accessRequest.GetGrantedAudience() {
-		if aud != fmt.Sprintf("%voauth2/token", s.cfg.AppURL) && aud != s.cfg.AppURL {
-			return &fosite.RFC6749Error{
-				DescriptionField: "Client is not allowed to target this Audience.",
-				HintField:        "The audience must be the AppURL or the token endpoint.",
-				ErrorField:       "invalid_request",
-				CodeField:        http.StatusForbidden,
-			}
-		}
-	}
-
-	// If the client was not allowed to impersonate the user we would not have reached this point given allowed scopes would have been empty
-	// But just in case we check again
-	ev := ac.EvalPermission(ac.ActionUsersImpersonate, ac.Scope("users", "id", strconv.FormatInt(userID, 10)))
-	hasAccess, errAccess := s.accessControl.Evaluate(ctx, client.SignedInUser, ev)
-	if errAccess != nil || !hasAccess {
-		return &fosite.RFC6749Error{
-			DescriptionField: "Client is not allowed to impersonate subject.",
-			ErrorField:       "restricted_access",
-			CodeField:        http.StatusForbidden,
-		}
-	}
-
-	// Populate claims' suject from the session subject
-	oauthSession.JWTClaims.Subject = oauthSession.Subject
-
-	// Get the user
-	query := user.GetUserByIDQuery{ID: userID}
-	dbUser, err := s.userService.GetByID(ctx, &query)
-	if err != nil {
-		if errors.Is(err, user.ErrUserNotFound) {
-			return &fosite.RFC6749Error{
-				DescriptionField: "Could not find the requested subject.",
-				ErrorField:       "not_found",
-				CodeField:        http.StatusBadRequest,
-			}
-		}
-		return &fosite.RFC6749Error{
-			DescriptionField: "The request subject could not be processed.",
-			ErrorField:       "server_error",
-			CodeField:        http.StatusInternalServerError,
-		}
-	}
-	oauthSession.Username = dbUser.Login
-
-	// Split scopes into actions and claims
-	actionsFilter, claimsFilter := splitOAuthScopes(accessRequest.GetGrantedScopes())
-
-	teams := []*team.TeamDTO{}
-	// Fetch teams if the groups scope is requested or if we need to populate it in the entitlements
-	if claimsFilter["groups"] ||
-		(claimsFilter["entitlements"] && (len(actionsFilter) == 0 || actionsFilter["teams:read"])) {
-		var errGetTeams error
-		teams, errGetTeams = s.teamService.GetTeamsByUser(ctx, &team.GetTeamsByUserQuery{
-			OrgID:  oauthserver.TmpOrgID,
-			UserID: dbUser.ID,
-			// Fetch teams without restriction on permissions
-			SignedInUser: &user.SignedInUser{
-				OrgID: oauthserver.TmpOrgID,
-				Permissions: map[int64]map[string][]string{
-					oauthserver.TmpOrgID: {
-						ac.ActionTeamsRead: {ac.ScopeTeamsAll},
-					},
-				},
-			},
-		})
-		if errGetTeams != nil {
-			return &fosite.RFC6749Error{
-				DescriptionField: "The teams scope could not be processed.",
-				ErrorField:       "server_error",
-				CodeField:        http.StatusInternalServerError,
-			}
-		}
-	}
-	if claimsFilter["profile"] {
-		oauthSession.JWTClaims.Add("name", dbUser.Name)
-		oauthSession.JWTClaims.Add("login", dbUser.Login)
-		oauthSession.JWTClaims.Add("updated_at", dbUser.Updated.Unix())
-	}
-	if claimsFilter["email"] {
-		oauthSession.JWTClaims.Add("email", dbUser.Email)
-	}
-	if claimsFilter["groups"] {
-		teamNames := make([]string, 0, len(teams))
-		for _, team := range teams {
-			teamNames = append(teamNames, team.Name)
-		}
-		oauthSession.JWTClaims.Add("groups", teamNames)
-	}
-
-	if claimsFilter["entitlements"] {
-		// Get the user permissions (apply the actions filter)
-		permissions, errGetPermission := s.filteredUserPermissions(ctx, userID, actionsFilter)
-		if errGetPermission != nil {
-			return errGetPermission
-		}
-
-		// Compute the impersonated permissions (apply the actions filter, replace the scope self with the user id)
-		impPerms := s.filteredImpersonatePermissions(client.ImpersonatePermissions, userID, teams, actionsFilter)
-
-		// Intersect the permissions with the client permissions
-		intesect := ac.Intersect(permissions, impPerms)
-
-		oauthSession.JWTClaims.Add("entitlements", intesect)
-	}
-
-	return nil
-}
-
-// filteredUserPermissions gets the user permissions and applies the actions filter
-func (s *OAuth2ServiceImpl) filteredUserPermissions(ctx context.Context, userID int64, actionsFilter map[string]bool) ([]ac.Permission, error) {
-	permissions, err := s.acService.SearchUserPermissions(ctx, oauthserver.TmpOrgID, ac.SearchOptions{UserID: userID})
-	if err != nil {
-		return nil, &fosite.RFC6749Error{
-			DescriptionField: "The permissions scope could not be processed.",
-			ErrorField:       "server_error",
-			CodeField:        http.StatusInternalServerError,
-		}
-	}
-
-	// Apply the actions filter
-	if len(actionsFilter) > 0 {
-		filtered := []ac.Permission{}
-		for i := range permissions {
-			if actionsFilter[permissions[i].Action] {
-				filtered = append(filtered, permissions[i])
-			}
-		}
-		permissions = filtered
-	}
-	return permissions, nil
-}
-
-// filteredImpersonatePermissions computes the impersonated permissions.
-// It applies the actions filter and replaces the "self RBAC scopes" (~ scope templates) by the correct user id/team id.
-func (*OAuth2ServiceImpl) filteredImpersonatePermissions(impersonatePermissions []ac.Permission, userID int64, teams []*team.TeamDTO, actionsFilter map[string]bool) []ac.Permission {
-	// Compute the impersonated permissions
-	impPerms := impersonatePermissions
-	// Apply the actions filter
-	if len(actionsFilter) > 0 {
-		filtered := []ac.Permission{}
-		for i := range impPerms {
-			if actionsFilter[impPerms[i].Action] {
-				filtered = append(filtered, impPerms[i])
-			}
-		}
-		impPerms = filtered
-	}
-
-	// Replace the scope self with the user id
-	correctScopes := []ac.Permission{}
-	for i := range impPerms {
-		switch impPerms[i].Scope {
-		case oauthserver.ScopeGlobalUsersSelf:
-			correctScopes = append(correctScopes, ac.Permission{
-				Action: impPerms[i].Action,
-				Scope:  ac.Scope("global.users", "id", strconv.FormatInt(userID, 10)),
-			})
-		case oauthserver.ScopeUsersSelf:
-			correctScopes = append(correctScopes, ac.Permission{
-				Action: impPerms[i].Action,
-				Scope:  ac.Scope("users", "id", strconv.FormatInt(userID, 10)),
-			})
-		case oauthserver.ScopeTeamsSelf:
-			for t := range teams {
-				correctScopes = append(correctScopes, ac.Permission{
-					Action: impPerms[i].Action,
-					Scope:  ac.Scope("teams", "id", strconv.FormatInt(teams[t].ID, 10)),
-				})
-			}
-		default:
-			correctScopes = append(correctScopes, impPerms[i])
-		}
-		continue
-	}
-	return correctScopes
-}
-
-// handleClientCredentials populates the client's access_token generated by fosite to match the rfc9068 specifications (entitlements, groups)
-func (s *OAuth2ServiceImpl) handleClientCredentials(ctx context.Context, accessRequest fosite.AccessRequester, oauthSession *oauth2.JWTSession, client *oauthserver.OAuthExternalService) error {
-	if !accessRequest.GetGrantTypes().ExactOne("client_credentials") {
-		return nil
-	}
-	// Set the subject to the service account associated to the client
-	oauthSession.JWTClaims.Subject = fmt.Sprintf("user:id:%d", client.ServiceAccountID)
-
-	sa := client.SignedInUser
-	if sa == nil {
-		return &fosite.RFC6749Error{
-			DescriptionField: "Could not find the service account of the client",
-			ErrorField:       "not_found",
-			CodeField:        http.StatusNotFound,
-		}
-	}
-	oauthSession.Username = sa.Login
-
-	// For client credentials, scopes are not marked as granted by fosite but the request would have been rejected
-	// already if the client was not allowed to request them
-	for _, scope := range accessRequest.GetRequestedScopes() {
-		accessRequest.GrantScope(scope)
-	}
-
-	// Split scopes into actions and claims
-	actionsFilter, claimsFilter := splitOAuthScopes(accessRequest.GetGrantedScopes())
-
-	if claimsFilter["profile"] {
-		oauthSession.JWTClaims.Add("name", sa.Name)
-		oauthSession.JWTClaims.Add("login", sa.Login)
-	}
-	if claimsFilter["email"] {
-		s.logger.Debug("Service accounts have no emails")
-	}
-	if claimsFilter["groups"] {
-		s.logger.Debug("Service accounts have no groups")
-	}
-	if claimsFilter["entitlements"] {
-		s.logger.Debug("Processing client entitlements")
-		if sa.Permissions != nil && sa.Permissions[oauthserver.TmpOrgID] != nil {
-			perms := sa.Permissions[oauthserver.TmpOrgID]
-			if len(actionsFilter) > 0 {
-				filtered := map[string][]string{}
-				for action := range actionsFilter {
-					if _, ok := perms[action]; ok {
-						filtered[action] = perms[action]
-					}
-				}
-				perms = filtered
-			}
-			oauthSession.JWTClaims.Add("entitlements", perms)
-		} else {
-			s.logger.Debug("Client has no permissions")
-		}
-	}
-
-	return nil
-}
diff --git a/pkg/services/extsvcauth/oauthserver/oasimpl/token_test.go b/pkg/services/extsvcauth/oauthserver/oasimpl/token_test.go
deleted file mode 100644
index ac49dfddb5d57..0000000000000
--- a/pkg/services/extsvcauth/oauthserver/oasimpl/token_test.go
+++ /dev/null
@@ -1,745 +0,0 @@
-package oasimpl
-
-import (
-	"context"
-	"crypto/rsa"
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/google/uuid"
-	"github.com/ory/fosite"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-	"golang.org/x/crypto/bcrypt"
-	"golang.org/x/exp/maps"
-	"gopkg.in/square/go-jose.v2"
-	"gopkg.in/square/go-jose.v2/jwt"
-
-	"github.com/grafana/grafana/pkg/models/roletype"
-	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver"
-	sa "github.com/grafana/grafana/pkg/services/serviceaccounts"
-	"github.com/grafana/grafana/pkg/services/team"
-	"github.com/grafana/grafana/pkg/services/user"
-)
-
-func TestOAuth2ServiceImpl_handleClientCredentials(t *testing.T) {
-	client1 := &oauthserver.OAuthExternalService{
-		Name:             "testapp",
-		ClientID:         "RANDOMID",
-		GrantTypes:       string(fosite.GrantTypeClientCredentials),
-		ServiceAccountID: 2,
-		SignedInUser: &user.SignedInUser{
-			UserID:  2,
-			Name:    "Test App",
-			Login:   "testapp",
-			OrgRole: roletype.RoleViewer,
-			Permissions: map[int64]map[string][]string{
-				oauthserver.TmpOrgID: {
-					"dashboards:read":  {"dashboards:*", "folders:*"},
-					"dashboards:write": {"dashboards:uid:1"},
-				},
-			},
-		},
-	}
-
-	tests := []struct {
-		name           string
-		scopes         []string
-		client         *oauthserver.OAuthExternalService
-		expectedClaims map[string]any
-		wantErr        bool
-	}{
-		{
-			name: "no claim without client_credentials grant type",
-			client: &oauthserver.OAuthExternalService{
-				Name:             "testapp",
-				ClientID:         "RANDOMID",
-				GrantTypes:       string(fosite.GrantTypeJWTBearer),
-				ServiceAccountID: 2,
-				SignedInUser:     &user.SignedInUser{},
-			},
-		},
-		{
-			name:   "no claims without scopes",
-			client: client1,
-		},
-		{
-			name:           "profile claims",
-			client:         client1,
-			scopes:         []string{"profile"},
-			expectedClaims: map[string]any{"name": "Test App", "login": "testapp"},
-		},
-		{
-			name:   "email claims should be empty",
-			client: client1,
-			scopes: []string{"email"},
-		},
-		{
-			name:   "groups claims should be empty",
-			client: client1,
-			scopes: []string{"groups"},
-		},
-		{
-			name:   "entitlements claims",
-			client: client1,
-			scopes: []string{"entitlements"},
-			expectedClaims: map[string]any{"entitlements": map[string][]string{
-				"dashboards:read":  {"dashboards:*", "folders:*"},
-				"dashboards:write": {"dashboards:uid:1"},
-			}},
-		},
-		{
-			name:   "scoped entitlements claims",
-			client: client1,
-			scopes: []string{"entitlements", "dashboards:write"},
-			expectedClaims: map[string]any{"entitlements": map[string][]string{
-				"dashboards:write": {"dashboards:uid:1"},
-			}},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			ctx := context.Background()
-			env := setupTestEnv(t)
-			session := &fosite.DefaultSession{}
-			requester := fosite.NewAccessRequest(session)
-			requester.GrantTypes = fosite.Arguments(strings.Split(tt.client.GrantTypes, ","))
-			requester.RequestedScope = fosite.Arguments(tt.scopes)
-			sessionData := NewAuthSession()
-			err := env.S.handleClientCredentials(ctx, requester, sessionData, tt.client)
-			if tt.wantErr {
-				require.Error(t, err)
-				return
-			}
-			require.NoError(t, err)
-
-			if tt.expectedClaims == nil {
-				require.Empty(t, sessionData.JWTClaims.Extra)
-				return
-			}
-			require.Len(t, sessionData.JWTClaims.Extra, len(tt.expectedClaims))
-			for claimsKey, claimsValue := range tt.expectedClaims {
-				switch expected := claimsValue.(type) {
-				case []string:
-					require.ElementsMatch(t, claimsValue, sessionData.JWTClaims.Extra[claimsKey])
-				case map[string][]string:
-					actual, ok := sessionData.JWTClaims.Extra[claimsKey].(map[string][]string)
-					require.True(t, ok, "expected map[string][]string")
-
-					require.ElementsMatch(t, maps.Keys(expected), maps.Keys(actual))
-					for expKey, expValue := range expected {
-						require.ElementsMatch(t, expValue, actual[expKey])
-					}
-				default:
-					require.Equal(t, claimsValue, sessionData.JWTClaims.Extra[claimsKey])
-				}
-			}
-		})
-	}
-}
-
-func TestOAuth2ServiceImpl_handleJWTBearer(t *testing.T) {
-	now := time.Now()
-	client1 := &oauthserver.OAuthExternalService{
-		Name:             "testapp",
-		ClientID:         "RANDOMID",
-		GrantTypes:       string(fosite.GrantTypeJWTBearer),
-		ServiceAccountID: 2,
-		SignedInUser: &user.SignedInUser{
-			UserID:  2,
-			OrgID:   oauthserver.TmpOrgID,
-			Name:    "Test App",
-			Login:   "testapp",
-			OrgRole: roletype.RoleViewer,
-			Permissions: map[int64]map[string][]string{
-				oauthserver.TmpOrgID: {
-					"users:impersonate": {"users:*"},
-				},
-			},
-		},
-	}
-	user56 := &user.User{
-		ID:      56,
-		Email:   "user56@example.org",
-		Login:   "user56",
-		Name:    "User 56",
-		Updated: now,
-	}
-	teams := []*team.TeamDTO{
-		{ID: 1, Name: "Team 1", OrgID: 1},
-		{ID: 2, Name: "Team 2", OrgID: 1},
-	}
-	client1WithPerm := func(perms []ac.Permission) *oauthserver.OAuthExternalService {
-		client := *client1
-		client.ImpersonatePermissions = perms
-		return &client
-	}
-
-	tests := []struct {
-		name           string
-		initEnv        func(*TestEnv)
-		scopes         []string
-		client         *oauthserver.OAuthExternalService
-		subject        string
-		expectedClaims map[string]any
-		wantErr        bool
-	}{
-		{
-			name: "no claim without jwtbearer grant type",
-			client: &oauthserver.OAuthExternalService{
-				Name:             "testapp",
-				ClientID:         "RANDOMID",
-				GrantTypes:       string(fosite.GrantTypeClientCredentials),
-				ServiceAccountID: 2,
-			},
-		},
-		{
-			name:    "err invalid subject",
-			client:  client1,
-			subject: "invalid_subject",
-			wantErr: true,
-		},
-		{
-			name: "err client is not allowed to impersonate",
-			client: &oauthserver.OAuthExternalService{
-				Name:             "testapp",
-				ClientID:         "RANDOMID",
-				GrantTypes:       string(fosite.GrantTypeJWTBearer),
-				ServiceAccountID: 2,
-				SignedInUser: &user.SignedInUser{
-					UserID:      2,
-					Name:        "Test App",
-					Login:       "testapp",
-					OrgRole:     roletype.RoleViewer,
-					Permissions: map[int64]map[string][]string{oauthserver.TmpOrgID: {}},
-				},
-			},
-			subject: "user:id:56",
-			wantErr: true,
-		},
-		{
-			name: "err subject not found",
-			initEnv: func(env *TestEnv) {
-				env.UserService.ExpectedError = user.ErrUserNotFound
-			},
-			client:  client1,
-			subject: "user:id:56",
-			wantErr: true,
-		},
-		{
-			name: "no claim without scope",
-			initEnv: func(env *TestEnv) {
-				env.UserService.ExpectedUser = user56
-			},
-			client:  client1,
-			subject: "user:id:56",
-		},
-		{
-			name: "profile claims",
-			initEnv: func(env *TestEnv) {
-				env.UserService.ExpectedUser = user56
-			},
-			client:  client1,
-			subject: "user:id:56",
-			scopes:  []string{"profile"},
-			expectedClaims: map[string]any{
-				"name":       "User 56",
-				"login":      "user56",
-				"updated_at": now.Unix(),
-			},
-		},
-		{
-			name: "email claim",
-			initEnv: func(env *TestEnv) {
-				env.UserService.ExpectedUser = user56
-			},
-			client:  client1,
-			subject: "user:id:56",
-			scopes:  []string{"email"},
-			expectedClaims: map[string]any{
-				"email": "user56@example.org",
-			},
-		},
-		{
-			name: "groups claim",
-			initEnv: func(env *TestEnv) {
-				env.UserService.ExpectedUser = user56
-				env.TeamService.ExpectedTeamsByUser = teams
-			},
-			client:  client1,
-			subject: "user:id:56",
-			scopes:  []string{"groups"},
-			expectedClaims: map[string]any{
-				"groups": []string{"Team 1", "Team 2"},
-			},
-		},
-		{
-			name: "no entitlement without permission intersection",
-			initEnv: func(env *TestEnv) {
-				env.UserService.ExpectedUser = user56
-				env.AcStore.On("GetUsersBasicRoles", mock.Anything, mock.Anything, mock.Anything).Return(map[int64][]string{
-					56: {"Viewer"}}, nil)
-				env.AcStore.On("SearchUsersPermissions", mock.Anything, mock.Anything, mock.Anything).Return(map[int64][]ac.Permission{
-					56: {{Action: "dashboards:read", Scope: "dashboards:uid:1"}},
-				}, nil)
-			},
-			client: client1WithPerm([]ac.Permission{
-				{Action: "datasources:read", Scope: "datasources:*"},
-			}),
-			subject: "user:id:56",
-			expectedClaims: map[string]any{
-				"entitlements": map[string][]string{},
-			},
-			scopes: []string{"entitlements"},
-		},
-		{
-			name: "entitlements contains only the intersection of permissions",
-			initEnv: func(env *TestEnv) {
-				env.UserService.ExpectedUser = user56
-				env.AcStore.On("GetUsersBasicRoles", mock.Anything, mock.Anything, mock.Anything).Return(map[int64][]string{
-					56: {"Viewer"}}, nil)
-				env.AcStore.On("SearchUsersPermissions", mock.Anything, mock.Anything, mock.Anything).Return(map[int64][]ac.Permission{
-					56: {
-						{Action: "dashboards:read", Scope: "dashboards:uid:1"},
-						{Action: "datasources:read", Scope: "datasources:uid:1"},
-					},
-				}, nil)
-			},
-			client: client1WithPerm([]ac.Permission{
-				{Action: "datasources:read", Scope: "datasources:*"},
-			}),
-			subject: "user:id:56",
-			expectedClaims: map[string]any{
-				"entitlements": map[string][]string{
-					"datasources:read": {"datasources:uid:1"},
-				},
-			},
-			scopes: []string{"entitlements"},
-		},
-		{
-			name: "entitlements have correctly translated users:self permissions",
-			initEnv: func(env *TestEnv) {
-				env.UserService.ExpectedUser = user56
-				env.AcStore.On("GetUsersBasicRoles", mock.Anything, mock.Anything, mock.Anything).Return(map[int64][]string{
-					56: {"Viewer"}}, nil)
-				env.AcStore.On("SearchUsersPermissions", mock.Anything, mock.Anything, mock.Anything).Return(map[int64][]ac.Permission{
-					56: {
-						{Action: "users:read", Scope: "global.users:id:*"},
-						{Action: "users.permissions:read", Scope: "users:id:*"},
-					}}, nil)
-			},
-			client: client1WithPerm([]ac.Permission{
-				{Action: "users:read", Scope: "global.users:self"},
-				{Action: "users.permissions:read", Scope: "users:self"},
-			}),
-			subject: "user:id:56",
-			expectedClaims: map[string]any{
-				"entitlements": map[string][]string{
-					"users:read":             {"global.users:id:56"},
-					"users.permissions:read": {"users:id:56"},
-				},
-			},
-			scopes: []string{"entitlements"},
-		},
-		{
-			name: "entitlements have correctly translated teams:self permissions",
-			initEnv: func(env *TestEnv) {
-				env.UserService.ExpectedUser = user56
-				env.TeamService.ExpectedTeamsByUser = teams
-				env.AcStore.On("GetUsersBasicRoles", mock.Anything, mock.Anything, mock.Anything).Return(map[int64][]string{
-					56: {"Viewer"}}, nil)
-				env.AcStore.On("SearchUsersPermissions", mock.Anything, mock.Anything, mock.Anything).Return(map[int64][]ac.Permission{
-					56: {{Action: "teams:read", Scope: "teams:*"}}}, nil)
-			},
-			client: client1WithPerm([]ac.Permission{
-				{Action: "teams:read", Scope: "teams:self"},
-			}),
-			subject: "user:id:56",
-			expectedClaims: map[string]any{
-				"entitlements": map[string][]string{"teams:read": {"teams:id:1", "teams:id:2"}},
-			},
-			scopes: []string{"entitlements"},
-		},
-		{
-			name: "entitlements are correctly filtered based on scopes",
-			initEnv: func(env *TestEnv) {
-				env.UserService.ExpectedUser = user56
-				env.TeamService.ExpectedTeamsByUser = teams
-				env.AcStore.On("GetUsersBasicRoles", mock.Anything, mock.Anything, mock.Anything).Return(map[int64][]string{
-					56: {"Viewer"}}, nil)
-				env.AcStore.On("SearchUsersPermissions", mock.Anything, mock.Anything, mock.Anything).Return(map[int64][]ac.Permission{
-					56: {
-						{Action: "users:read", Scope: "global.users:id:*"},
-						{Action: "datasources:read", Scope: "datasources:uid:1"},
-					}}, nil)
-			},
-			client: client1WithPerm([]ac.Permission{
-				{Action: "users:read", Scope: "global.users:*"},
-				{Action: "datasources:read", Scope: "datasources:*"},
-			}),
-			subject: "user:id:56",
-			expectedClaims: map[string]any{
-				"entitlements": map[string][]string{"users:read": {"global.users:id:*"}},
-			},
-			scopes: []string{"entitlements", "users:read"},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			ctx := context.Background()
-			env := setupTestEnv(t)
-			session := &fosite.DefaultSession{}
-			requester := fosite.NewAccessRequest(session)
-			requester.GrantTypes = fosite.Arguments(strings.Split(tt.client.GrantTypes, ","))
-			requester.RequestedScope = fosite.Arguments(tt.scopes)
-			requester.GrantedScope = fosite.Arguments(tt.scopes)
-			sessionData := NewAuthSession()
-			sessionData.Subject = tt.subject
-
-			if tt.initEnv != nil {
-				tt.initEnv(env)
-			}
-			err := env.S.handleJWTBearer(ctx, requester, sessionData, tt.client)
-			if tt.wantErr {
-				require.Error(t, err)
-				return
-			}
-			require.NoError(t, err)
-
-			if tt.expectedClaims == nil {
-				require.Empty(t, sessionData.JWTClaims.Extra)
-				return
-			}
-			require.Len(t, sessionData.JWTClaims.Extra, len(tt.expectedClaims))
-
-			for claimsKey, claimsValue := range tt.expectedClaims {
-				switch expected := claimsValue.(type) {
-				case []string:
-					require.ElementsMatch(t, claimsValue, sessionData.JWTClaims.Extra[claimsKey])
-				case map[string][]string:
-					actual, ok := sessionData.JWTClaims.Extra[claimsKey].(map[string][]string)
-					require.True(t, ok, "expected map[string][]string")
-
-					require.ElementsMatch(t, maps.Keys(expected), maps.Keys(actual))
-					for expKey, expValue := range expected {
-						require.ElementsMatch(t, expValue, actual[expKey])
-					}
-				default:
-					require.Equal(t, claimsValue, sessionData.JWTClaims.Extra[claimsKey])
-				}
-			}
-
-			env.AcStore.AssertExpectations(t)
-		})
-	}
-}
-
-type tokenResponse struct {
-	AccessToken string `json:"access_token"`
-	ExpiresIn   int    `json:"expires_in"`
-	Scope       string `json:"scope"`
-	TokenType   string `json:"token_type"`
-}
-
-type claims struct {
-	jwt.Claims
-	ClientID     string              `json:"client_id"`
-	Groups       []string            `json:"groups"`
-	Email        string              `json:"email"`
-	Name         string              `json:"name"`
-	Login        string              `json:"login"`
-	Scopes       []string            `json:"scope"`
-	Entitlements map[string][]string `json:"entitlements"`
-}
-
-func TestOAuth2ServiceImpl_HandleTokenRequest(t *testing.T) {
-	tests := []struct {
-		name            string
-		tweakTestClient func(*oauthserver.OAuthExternalService)
-		reqParams       url.Values
-		wantCode        int
-		wantScope       []string
-		wantClaims      *claims
-	}{
-		{
-			name: "should allow client credentials grant",
-			reqParams: url.Values{
-				"grant_type":    {string(fosite.GrantTypeClientCredentials)},
-				"client_id":     {"CLIENT1ID"},
-				"client_secret": {"CLIENT1SECRET"},
-				"scope":         {"profile email groups entitlements"},
-				"audience":      {AppURL},
-			},
-			wantCode:  http.StatusOK,
-			wantScope: []string{"profile", "email", "groups", "entitlements"},
-			wantClaims: &claims{
-				Claims: jwt.Claims{
-					Subject:  "user:id:2", // From client1.ServiceAccountID
-					Issuer:   AppURL,      // From env.S.Config.Issuer
-					Audience: jwt.Audience{AppURL},
-				},
-				ClientID: "CLIENT1ID",
-				Name:     "client-1",
-				Login:    "client-1",
-				Entitlements: map[string][]string{
-					"users:impersonate": {"users:*"},
-				},
-			},
-		},
-		{
-			name: "should allow jwt-bearer grant",
-			reqParams: url.Values{
-				"grant_type":    {string(fosite.GrantTypeJWTBearer)},
-				"client_id":     {"CLIENT1ID"},
-				"client_secret": {"CLIENT1SECRET"},
-				"assertion": {
-					genAssertion(t, Client1Key, "CLIENT1ID", "user:id:56", TokenURL, AppURL),
-				},
-				"scope": {"profile email groups entitlements"},
-			},
-			wantCode:  http.StatusOK,
-			wantScope: []string{"profile", "email", "groups", "entitlements"},
-			wantClaims: &claims{
-				Claims: jwt.Claims{
-					Subject:  "user:id:56", // To match the assertion
-					Issuer:   AppURL,       // From env.S.Config.Issuer
-					Audience: jwt.Audience{TokenURL, AppURL},
-				},
-				ClientID: "CLIENT1ID",
-				Email:    "user56@example.org",
-				Name:     "User 56",
-				Login:    "user56",
-				Groups:   []string{"Team 1", "Team 2"},
-				Entitlements: map[string][]string{
-					"dashboards:read": {"folders:uid:UID1"},
-					"folders:read":    {"folders:uid:UID1"},
-					"users:read":      {"global.users:id:56"},
-				},
-			},
-		},
-		{
-			name: "should deny jwt-bearer grant with wrong audience",
-			reqParams: url.Values{
-				"grant_type":    {string(fosite.GrantTypeJWTBearer)},
-				"client_id":     {"CLIENT1ID"},
-				"client_secret": {"CLIENT1SECRET"},
-				"assertion": {
-					genAssertion(t, Client1Key, "CLIENT1ID", "user:id:56", TokenURL, "invalid audience"),
-				},
-				"scope": {"profile email groups entitlements"},
-			},
-			wantCode: http.StatusForbidden,
-		},
-		{
-			name: "should deny jwt-bearer grant for clients without the grant",
-			reqParams: url.Values{
-				"grant_type":    {string(fosite.GrantTypeJWTBearer)},
-				"client_id":     {"CLIENT1ID"},
-				"client_secret": {"CLIENT1SECRET"},
-				"assertion": {
-					genAssertion(t, Client1Key, "CLIENT1ID", "user:id:56", TokenURL, AppURL),
-				},
-				"scope": {"profile email groups entitlements"},
-			},
-			tweakTestClient: func(es *oauthserver.OAuthExternalService) {
-				es.GrantTypes = string(fosite.GrantTypeClientCredentials)
-			},
-			wantCode: http.StatusBadRequest,
-		},
-		{
-			name: "should deny client_credentials grant for clients without the grant",
-			reqParams: url.Values{
-				"grant_type":    {string(fosite.GrantTypeClientCredentials)},
-				"client_id":     {"CLIENT1ID"},
-				"client_secret": {"CLIENT1SECRET"},
-				"scope":         {"profile email groups entitlements"},
-				"audience":      {AppURL},
-			},
-			tweakTestClient: func(es *oauthserver.OAuthExternalService) {
-				es.GrantTypes = string(fosite.GrantTypeJWTBearer)
-			},
-			wantCode: http.StatusBadRequest,
-		},
-		{
-			name: "should deny client_credentials grant with wrong secret",
-			reqParams: url.Values{
-				"grant_type":    {string(fosite.GrantTypeClientCredentials)},
-				"client_id":     {"CLIENT1ID"},
-				"client_secret": {"WRONG_SECRET"},
-				"scope":         {"profile email groups entitlements"},
-				"audience":      {AppURL},
-			},
-			tweakTestClient: func(es *oauthserver.OAuthExternalService) {
-				es.GrantTypes = string(fosite.GrantTypeClientCredentials)
-			},
-			wantCode: http.StatusUnauthorized,
-		},
-		{
-			name: "should deny jwt-bearer grant with wrong secret",
-			reqParams: url.Values{
-				"grant_type":    {string(fosite.GrantTypeJWTBearer)},
-				"client_id":     {"CLIENT1ID"},
-				"client_secret": {"WRONG_SECRET"},
-				"assertion": {
-					genAssertion(t, Client1Key, "CLIENT1ID", "user:id:56", TokenURL, AppURL),
-				},
-				"scope": {"profile email groups entitlements"},
-			},
-			tweakTestClient: func(es *oauthserver.OAuthExternalService) {
-				es.GrantTypes = string(fosite.GrantTypeJWTBearer)
-			},
-			wantCode: http.StatusUnauthorized,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			env := setupTestEnv(t)
-			setupHandleTokenRequestEnv(t, env, tt.tweakTestClient)
-
-			req := httptest.NewRequest("POST", "/oauth2/token", strings.NewReader(tt.reqParams.Encode()))
-			req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-
-			resp := httptest.NewRecorder()
-
-			env.S.HandleTokenRequest(resp, req)
-
-			require.Equal(t, tt.wantCode, resp.Code, resp.Body.String())
-			if tt.wantCode != http.StatusOK {
-				return
-			}
-
-			body := resp.Body.Bytes()
-			require.NotEmpty(t, body)
-
-			var tokenResp tokenResponse
-			require.NoError(t, json.Unmarshal(body, &tokenResp))
-
-			// Check token response
-			require.NotEmpty(t, tokenResp.Scope)
-			require.ElementsMatch(t, tt.wantScope, strings.Split(tokenResp.Scope, " "))
-			require.Positive(t, tokenResp.ExpiresIn)
-			require.Equal(t, "bearer", tokenResp.TokenType)
-			require.NotEmpty(t, tokenResp.AccessToken)
-
-			// Check access token
-			parsedToken, err := jwt.ParseSigned(tokenResp.AccessToken)
-			require.NoError(t, err)
-			require.Len(t, parsedToken.Headers, 1)
-			typeHeader := parsedToken.Headers[0].ExtraHeaders["typ"]
-			require.Equal(t, "at+jwt", strings.ToLower(typeHeader.(string)))
-			require.Equal(t, "RS256", parsedToken.Headers[0].Algorithm)
-			// Check access token claims
-			var claims claims
-			require.NoError(t, parsedToken.Claims(pk.Public(), &claims))
-			// Check times and remove them
-			require.Positive(t, claims.IssuedAt.Time())
-			require.Positive(t, claims.Expiry.Time())
-			claims.IssuedAt = jwt.NewNumericDate(time.Time{})
-			claims.Expiry = jwt.NewNumericDate(time.Time{})
-			// Check the ID and remove it
-			require.NotEmpty(t, claims.ID)
-			claims.ID = ""
-			// Compare the rest
-			require.Equal(t, tt.wantClaims, &claims)
-		})
-	}
-}
-
-func genAssertion(t *testing.T, signKey *rsa.PrivateKey, clientID, sub string, audience ...string) string {
-	key := jose.SigningKey{Algorithm: jose.RS256, Key: signKey}
-	assertion := jwt.Claims{
-		ID:       uuid.New().String(),
-		Issuer:   clientID,
-		Subject:  sub,
-		Audience: audience,
-		Expiry:   jwt.NewNumericDate(time.Now().Add(time.Hour)),
-		IssuedAt: jwt.NewNumericDate(time.Now()),
-	}
-
-	var signerOpts = jose.SignerOptions{}
-	signerOpts.WithType("JWT")
-	rsaSigner, errSigner := jose.NewSigner(key, &signerOpts)
-	require.NoError(t, errSigner)
-	builder := jwt.Signed(rsaSigner)
-	rawJWT, errSign := builder.Claims(assertion).CompactSerialize()
-	require.NoError(t, errSign)
-	return rawJWT
-}
-
-// setupHandleTokenRequestEnv creates a client and a user and sets all Mocks call for the handleTokenRequest test cases
-func setupHandleTokenRequestEnv(t *testing.T, env *TestEnv, opt func(*oauthserver.OAuthExternalService)) {
-	now := time.Now()
-	hashedSecret, err := bcrypt.GenerateFromPassword([]byte("CLIENT1SECRET"), bcrypt.DefaultCost)
-	require.NoError(t, err)
-	client1 := &oauthserver.OAuthExternalService{
-		Name:             "client-1",
-		ClientID:         "CLIENT1ID",
-		Secret:           string(hashedSecret),
-		GrantTypes:       string(fosite.GrantTypeClientCredentials + "," + fosite.GrantTypeJWTBearer),
-		ServiceAccountID: 2,
-		ImpersonatePermissions: []ac.Permission{
-			{Action: "users:read", Scope: oauthserver.ScopeGlobalUsersSelf},
-			{Action: "users.permissions:read", Scope: oauthserver.ScopeUsersSelf},
-			{Action: "teams:read", Scope: oauthserver.ScopeTeamsSelf},
-
-			{Action: "folders:read", Scope: "folders:*"},
-			{Action: "dashboards:read", Scope: "folders:*"},
-			{Action: "dashboards:read", Scope: "dashboards:*"},
-		},
-		SelfPermissions: []ac.Permission{
-			{Action: "users:impersonate", Scope: "users:*"},
-		},
-		Audiences: AppURL,
-	}
-
-	// Apply any option the test case might need
-	if opt != nil {
-		opt(client1)
-	}
-
-	sa1 := &sa.ExtSvcAccount{
-		ID:         client1.ServiceAccountID,
-		Name:       client1.Name,
-		Login:      client1.Name,
-		OrgID:      oauthserver.TmpOrgID,
-		IsDisabled: false,
-		Role:       roletype.RoleNone,
-	}
-
-	user56 := &user.User{
-		ID:      56,
-		Email:   "user56@example.org",
-		Login:   "user56",
-		Name:    "User 56",
-		Updated: now,
-	}
-	user56Permissions := []ac.Permission{
-		{Action: "users:read", Scope: "global.users:id:56"},
-		{Action: "folders:read", Scope: "folders:uid:UID1"},
-		{Action: "dashboards:read", Scope: "folders:uid:UID1"},
-		{Action: "datasources:read", Scope: "datasources:uid:DS_UID2"}, // This one should be ignored when impersonating
-	}
-	user56Teams := []*team.TeamDTO{
-		{ID: 1, Name: "Team 1", OrgID: 1},
-		{ID: 2, Name: "Team 2", OrgID: 1},
-	}
-
-	// To retrieve the Client, its publicKey and its permissions
-	env.OAuthStore.On("GetExternalService", mock.Anything, client1.ClientID).Return(client1, nil)
-	env.OAuthStore.On("GetExternalServicePublicKey", mock.Anything, client1.ClientID).Return(&jose.JSONWebKey{Key: Client1Key.Public(), Algorithm: "RS256"}, nil)
-	env.SAService.On("RetrieveExtSvcAccount", mock.Anything, oauthserver.TmpOrgID, client1.ServiceAccountID).Return(sa1, nil)
-	env.AcStore.On("GetUserPermissions", mock.Anything, mock.Anything).Return(client1.SelfPermissions, nil)
-	// To retrieve the user to impersonate, its permissions and its teams
-	env.AcStore.On("SearchUsersPermissions", mock.Anything, mock.Anything, mock.Anything).Return(map[int64][]ac.Permission{
-		user56.ID: user56Permissions}, nil)
-	env.AcStore.On("GetUsersBasicRoles", mock.Anything, mock.Anything, mock.Anything).Return(map[int64][]string{
-		user56.ID: {"Viewer"}}, nil)
-	env.TeamService.ExpectedTeamsByUser = user56Teams
-	env.UserService.ExpectedUser = user56
-}
diff --git a/pkg/services/extsvcauth/oauthserver/oastest/fakes.go b/pkg/services/extsvcauth/oauthserver/oastest/fakes.go
deleted file mode 100644
index 71aab89ab68d4..0000000000000
--- a/pkg/services/extsvcauth/oauthserver/oastest/fakes.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package oastest
-
-import (
-	"context"
-	"net/http"
-
-	"github.com/grafana/grafana/pkg/services/extsvcauth"
-	"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver"
-	"gopkg.in/square/go-jose.v2"
-)
-
-type FakeService struct {
-	ExpectedClient *oauthserver.OAuthExternalService
-	ExpectedKey    *jose.JSONWebKey
-	ExpectedErr    error
-}
-
-var _ oauthserver.OAuth2Server = &FakeService{}
-
-func (s *FakeService) SaveExternalService(ctx context.Context, cmd *extsvcauth.ExternalServiceRegistration) (*extsvcauth.ExternalService, error) {
-	return s.ExpectedClient.ToExternalService(nil), s.ExpectedErr
-}
-
-func (s *FakeService) GetExternalService(ctx context.Context, id string) (*oauthserver.OAuthExternalService, error) {
-	return s.ExpectedClient, s.ExpectedErr
-}
-
-func (s *FakeService) HandleTokenRequest(rw http.ResponseWriter, req *http.Request) {}
-
-func (s *FakeService) HandleIntrospectionRequest(rw http.ResponseWriter, req *http.Request) {}
diff --git a/pkg/services/extsvcauth/oauthserver/oastest/store_mock.go b/pkg/services/extsvcauth/oauthserver/oastest/store_mock.go
deleted file mode 100644
index 30cf07882b9e6..0000000000000
--- a/pkg/services/extsvcauth/oauthserver/oastest/store_mock.go
+++ /dev/null
@@ -1,138 +0,0 @@
-// Code generated by mockery v2.20.0. DO NOT EDIT.
-
-package oastest
-
-import (
-	context "context"
-
-	mock "github.com/stretchr/testify/mock"
-	jose "gopkg.in/square/go-jose.v2"
-
-	oauthserver "github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver"
-)
-
-// MockStore is an autogenerated mock type for the Store type
-type MockStore struct {
-	mock.Mock
-}
-
-// GetExternalService provides a mock function with given fields: ctx, id
-func (_m *MockStore) GetExternalService(ctx context.Context, id string) (*oauthserver.OAuthExternalService, error) {
-	ret := _m.Called(ctx, id)
-
-	var r0 *oauthserver.OAuthExternalService
-	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, string) (*oauthserver.OAuthExternalService, error)); ok {
-		return rf(ctx, id)
-	}
-	if rf, ok := ret.Get(0).(func(context.Context, string) *oauthserver.OAuthExternalService); ok {
-		r0 = rf(ctx, id)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*oauthserver.OAuthExternalService)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(context.Context, string) error); ok {
-		r1 = rf(ctx, id)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// GetExternalServiceByName provides a mock function with given fields: ctx, name
-func (_m *MockStore) GetExternalServiceByName(ctx context.Context, name string) (*oauthserver.OAuthExternalService, error) {
-	ret := _m.Called(ctx, name)
-
-	var r0 *oauthserver.OAuthExternalService
-	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, string) (*oauthserver.OAuthExternalService, error)); ok {
-		return rf(ctx, name)
-	}
-	if rf, ok := ret.Get(0).(func(context.Context, string) *oauthserver.OAuthExternalService); ok {
-		r0 = rf(ctx, name)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*oauthserver.OAuthExternalService)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(context.Context, string) error); ok {
-		r1 = rf(ctx, name)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// GetExternalServicePublicKey provides a mock function with given fields: ctx, clientID
-func (_m *MockStore) GetExternalServicePublicKey(ctx context.Context, clientID string) (*jose.JSONWebKey, error) {
-	ret := _m.Called(ctx, clientID)
-
-	var r0 *jose.JSONWebKey
-	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, string) (*jose.JSONWebKey, error)); ok {
-		return rf(ctx, clientID)
-	}
-	if rf, ok := ret.Get(0).(func(context.Context, string) *jose.JSONWebKey); ok {
-		r0 = rf(ctx, clientID)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*jose.JSONWebKey)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(context.Context, string) error); ok {
-		r1 = rf(ctx, clientID)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// RegisterExternalService provides a mock function with given fields: ctx, client
-func (_m *MockStore) RegisterExternalService(ctx context.Context, client *oauthserver.OAuthExternalService) error {
-	ret := _m.Called(ctx, client)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context, *oauthserver.OAuthExternalService) error); ok {
-		r0 = rf(ctx, client)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// SaveExternalService provides a mock function with given fields: ctx, client
-func (_m *MockStore) SaveExternalService(ctx context.Context, client *oauthserver.OAuthExternalService) error {
-	ret := _m.Called(ctx, client)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context, *oauthserver.OAuthExternalService) error); ok {
-		r0 = rf(ctx, client)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-type mockConstructorTestingTNewMockStore interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewMockStore creates a new instance of MockStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewMockStore(t mockConstructorTestingTNewMockStore) *MockStore {
-	mock := &MockStore{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/pkg/services/extsvcauth/oauthserver/store/database.go b/pkg/services/extsvcauth/oauthserver/store/database.go
deleted file mode 100644
index 124fc5888a6d8..0000000000000
--- a/pkg/services/extsvcauth/oauthserver/store/database.go
+++ /dev/null
@@ -1,219 +0,0 @@
-package store
-
-import (
-	"context"
-	"crypto/ecdsa"
-	"crypto/rsa"
-	"errors"
-
-	"gopkg.in/square/go-jose.v2"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver"
-	"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver/utils"
-	"github.com/grafana/grafana/pkg/util/errutil"
-)
-
-type store struct {
-	db db.DB
-}
-
-func NewStore(db db.DB) oauthserver.Store {
-	return &store{db: db}
-}
-
-func createImpersonatePermissions(sess *db.Session, client *oauthserver.OAuthExternalService) error {
-	if len(client.ImpersonatePermissions) == 0 {
-		return nil
-	}
-
-	insertPermQuery := make([]any, 1, len(client.ImpersonatePermissions)*3+1)
-	insertPermStmt := `INSERT INTO oauth_impersonate_permission (client_id, action, scope) VALUES `
-	for _, perm := range client.ImpersonatePermissions {
-		insertPermStmt += "(?, ?, ?),"
-		insertPermQuery = append(insertPermQuery, client.ClientID, perm.Action, perm.Scope)
-	}
-	insertPermQuery[0] = insertPermStmt[:len(insertPermStmt)-1]
-	_, err := sess.Exec(insertPermQuery...)
-	return err
-}
-
-func registerExternalService(sess *db.Session, client *oauthserver.OAuthExternalService) error {
-	insertQuery := []any{
-		`INSERT INTO oauth_client (name, client_id, secret, grant_types, audiences, service_account_id, public_pem, redirect_uri) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
-		client.Name,
-		client.ClientID,
-		client.Secret,
-		client.GrantTypes,
-		client.Audiences,
-		client.ServiceAccountID,
-		client.PublicPem,
-		client.RedirectURI,
-	}
-	if _, err := sess.Exec(insertQuery...); err != nil {
-		return err
-	}
-
-	return createImpersonatePermissions(sess, client)
-}
-
-func (s *store) RegisterExternalService(ctx context.Context, client *oauthserver.OAuthExternalService) error {
-	return s.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		return registerExternalService(sess, client)
-	})
-}
-
-func recreateImpersonatePermissions(sess *db.Session, client *oauthserver.OAuthExternalService, prevClientID string) error {
-	deletePermQuery := `DELETE FROM oauth_impersonate_permission WHERE client_id = ?`
-	if _, errDelPerm := sess.Exec(deletePermQuery, prevClientID); errDelPerm != nil {
-		return errDelPerm
-	}
-
-	if len(client.ImpersonatePermissions) == 0 {
-		return nil
-	}
-
-	return createImpersonatePermissions(sess, client)
-}
-
-func updateExternalService(sess *db.Session, client *oauthserver.OAuthExternalService, prevClientID string) error {
-	updateQuery := []any{
-		`UPDATE oauth_client SET client_id = ?, secret = ?, grant_types = ?, audiences = ?, service_account_id = ?, public_pem = ?, redirect_uri = ? WHERE name = ?`,
-		client.ClientID,
-		client.Secret,
-		client.GrantTypes,
-		client.Audiences,
-		client.ServiceAccountID,
-		client.PublicPem,
-		client.RedirectURI,
-		client.Name,
-	}
-	if _, err := sess.Exec(updateQuery...); err != nil {
-		return err
-	}
-
-	return recreateImpersonatePermissions(sess, client, prevClientID)
-}
-
-func (s *store) SaveExternalService(ctx context.Context, client *oauthserver.OAuthExternalService) error {
-	if client.Name == "" {
-		return oauthserver.ErrClientRequiredName
-	}
-	return s.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		previous, errFetchExtSvc := getExternalServiceByName(sess, client.Name)
-		if errFetchExtSvc != nil {
-			var srcError errutil.Error
-			if errors.As(errFetchExtSvc, &srcError) {
-				if srcError.MessageID != oauthserver.ErrClientNotFoundMessageID {
-					return errFetchExtSvc
-				}
-			}
-		}
-		if previous == nil {
-			return registerExternalService(sess, client)
-		}
-		return updateExternalService(sess, client, previous.ClientID)
-	})
-}
-
-func (s *store) GetExternalService(ctx context.Context, id string) (*oauthserver.OAuthExternalService, error) {
-	res := &oauthserver.OAuthExternalService{}
-	if id == "" {
-		return nil, oauthserver.ErrClientRequiredID
-	}
-
-	err := s.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		getClientQuery := `SELECT
-		id, name, client_id, secret, grant_types, audiences, service_account_id, public_pem, redirect_uri
-		FROM oauth_client
-		WHERE client_id = ?`
-		found, err := sess.SQL(getClientQuery, id).Get(res)
-		if err != nil {
-			return err
-		}
-		if !found {
-			return oauthserver.ErrClientNotFound(id)
-		}
-
-		impersonatePermQuery := `SELECT action, scope FROM oauth_impersonate_permission WHERE client_id = ?`
-		return sess.SQL(impersonatePermQuery, id).Find(&res.ImpersonatePermissions)
-	})
-
-	return res, err
-}
-
-// GetPublicKey returns public key, issued by 'issuer', and assigned for subject. Public key is used to check
-// signature of jwt assertion in authorization grants.
-func (s *store) GetExternalServicePublicKey(ctx context.Context, clientID string) (*jose.JSONWebKey, error) {
-	res := &oauthserver.OAuthExternalService{}
-	if clientID == "" {
-		return nil, oauthserver.ErrClientRequiredID
-	}
-
-	if err := s.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		getKeyQuery := `SELECT public_pem FROM oauth_client WHERE client_id = ?`
-		found, err := sess.SQL(getKeyQuery, clientID).Get(res)
-		if err != nil {
-			return err
-		}
-		if !found {
-			return oauthserver.ErrClientNotFound(clientID)
-		}
-		return nil
-	}); err != nil {
-		return nil, err
-	}
-
-	key, errParseKey := utils.ParsePublicKeyPem(res.PublicPem)
-	if errParseKey != nil {
-		return nil, errParseKey
-	}
-
-	var alg string
-	switch key.(type) {
-	case *rsa.PublicKey:
-		alg = oauthserver.RS256
-	case *ecdsa.PublicKey:
-		alg = oauthserver.ES256
-	}
-
-	return &jose.JSONWebKey{
-		Algorithm: alg,
-		Key:       key,
-	}, nil
-}
-
-func (s *store) GetExternalServiceByName(ctx context.Context, name string) (*oauthserver.OAuthExternalService, error) {
-	res := &oauthserver.OAuthExternalService{}
-	if name == "" {
-		return nil, oauthserver.ErrClientRequiredName
-	}
-
-	err := s.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		var errGetByName error
-		res, errGetByName = getExternalServiceByName(sess, name)
-		return errGetByName
-	})
-
-	return res, err
-}
-
-func getExternalServiceByName(sess *db.Session, name string) (*oauthserver.OAuthExternalService, error) {
-	res := &oauthserver.OAuthExternalService{}
-	getClientQuery := `SELECT
-		id, name, client_id, secret, grant_types, audiences, service_account_id, public_pem, redirect_uri
-		FROM oauth_client
-		WHERE name = ?`
-	found, err := sess.SQL(getClientQuery, name).Get(res)
-	if err != nil {
-		return nil, err
-	}
-	if !found {
-		return nil, oauthserver.ErrClientNotFound(name)
-	}
-
-	impersonatePermQuery := `SELECT action, scope FROM oauth_impersonate_permission WHERE client_id = ?`
-	errPerm := sess.SQL(impersonatePermQuery, res.ClientID).Find(&res.ImpersonatePermissions)
-
-	return res, errPerm
-}
diff --git a/pkg/services/extsvcauth/oauthserver/store/database_test.go b/pkg/services/extsvcauth/oauthserver/store/database_test.go
deleted file mode 100644
index 5748ac2d91ce1..0000000000000
--- a/pkg/services/extsvcauth/oauthserver/store/database_test.go
+++ /dev/null
@@ -1,376 +0,0 @@
-package store
-
-import (
-	"context"
-	"testing"
-
-	"github.com/go-jose/go-jose/v3"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-)
-
-func TestStore_RegisterAndGetClient(t *testing.T) {
-	s := &store{db: db.InitTestDB(t, db.InitTestDBOpt{FeatureFlags: []string{featuremgmt.FlagExternalServiceAuth}})}
-	tests := []struct {
-		name    string
-		client  oauthserver.OAuthExternalService
-		wantErr bool
-	}{
-		{
-			name: "register and get",
-			client: oauthserver.OAuthExternalService{
-				Name:       "The Worst App Ever",
-				ClientID:   "ANonRandomClientID",
-				Secret:     "ICouldKeepSecrets",
-				GrantTypes: "clients_credentials",
-				PublicPem: []byte(`------BEGIN FAKE PUBLIC KEY-----
-VGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBO
-b3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNB
-IEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhp
-cyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3Qg
-QW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtl
-eS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJ
-cyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4g
-UlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4g
-VGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBO
-b3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNB
-IEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhp
-cyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3Qg
-QW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtl
-eS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJ
-cyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4g
-UlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4g
-VGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBO
-b3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNB
-IEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4gVGhp
-cyBJcyBOb3QgQW4gUlNBIEtleS4gVGhpcyBJcyBOb3QgQW4gUlNBIEtleS4uLi4gSXQgSXMgSnVz
-dCBBIFJlZ3VsYXIgQmFzZTY0IEVuY29kZWQgU3RyaW5nLi4uCg==
-------END FAKE PUBLIC KEY-----`),
-				ServiceAccountID:       2,
-				SelfPermissions:        nil,
-				ImpersonatePermissions: nil,
-				RedirectURI:            "/whereto",
-			},
-			wantErr: false,
-		},
-		{
-			name: "register with impersonate permissions and get",
-			client: oauthserver.OAuthExternalService{
-				Name:             "The Best App Ever",
-				ClientID:         "AnAlmostRandomClientID",
-				Secret:           "ICannotKeepSecrets",
-				GrantTypes:       "clients_credentials",
-				PublicPem:        []byte(`test`),
-				ServiceAccountID: 2,
-				SelfPermissions:  nil,
-				ImpersonatePermissions: []accesscontrol.Permission{
-					{Action: "dashboards:create", Scope: "folders:*"},
-					{Action: "dashboards:read", Scope: "folders:*"},
-					{Action: "dashboards:read", Scope: "dashboards:*"},
-					{Action: "dashboards:write", Scope: "folders:*"},
-					{Action: "dashboards:write", Scope: "dashboards:*"},
-				},
-				RedirectURI: "/whereto",
-			},
-			wantErr: false,
-		},
-		{
-			name: "register with audiences and get",
-			client: oauthserver.OAuthExternalService{
-				Name:             "The Most Normal App Ever",
-				ClientID:         "AnAlmostRandomClientIDAgain",
-				Secret:           "ICanKeepSecretsEventually",
-				GrantTypes:       "clients_credentials",
-				PublicPem:        []byte(`test`),
-				ServiceAccountID: 2,
-				SelfPermissions:  nil,
-				Audiences:        "https://oauth.test/,https://sub.oauth.test/",
-				RedirectURI:      "/whereto",
-			},
-			wantErr: false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			ctx := context.Background()
-			err := s.RegisterExternalService(ctx, &tt.client)
-			if tt.wantErr {
-				require.Error(t, err)
-				return
-			}
-			require.NoError(t, err)
-
-			// Compare results
-			compareClientToStored(t, s, &tt.client)
-		})
-	}
-}
-
-func TestStore_SaveExternalService(t *testing.T) {
-	client1 := oauthserver.OAuthExternalService{
-		Name:                   "my-external-service",
-		ClientID:               "ClientID",
-		Secret:                 "Secret",
-		GrantTypes:             "client_credentials",
-		PublicPem:              []byte("test"),
-		ServiceAccountID:       2,
-		ImpersonatePermissions: []accesscontrol.Permission{},
-		RedirectURI:            "/whereto",
-	}
-	client1WithPerm := client1
-	client1WithPerm.ImpersonatePermissions = []accesscontrol.Permission{
-		{Action: "dashboards:read", Scope: "folders:*"},
-		{Action: "dashboards:read", Scope: "dashboards:*"},
-	}
-	client1WithNewSecrets := client1
-	client1WithNewSecrets.ClientID = "NewClientID"
-	client1WithNewSecrets.Secret = "NewSecret"
-	client1WithNewSecrets.PublicPem = []byte("newtest")
-
-	client1WithAud := client1
-	client1WithAud.Audiences = "https://oauth.test/,https://sub.oauth.test/"
-
-	tests := []struct {
-		name    string
-		runs    []oauthserver.OAuthExternalService
-		wantErr bool
-	}{
-		{
-			name:    "error no name",
-			runs:    []oauthserver.OAuthExternalService{{}},
-			wantErr: true,
-		},
-		{
-			name:    "simple register",
-			runs:    []oauthserver.OAuthExternalService{client1},
-			wantErr: false,
-		},
-		{
-			name:    "no update",
-			runs:    []oauthserver.OAuthExternalService{client1, client1},
-			wantErr: false,
-		},
-		{
-			name:    "add permissions",
-			runs:    []oauthserver.OAuthExternalService{client1, client1WithPerm},
-			wantErr: false,
-		},
-		{
-			name:    "remove permissions",
-			runs:    []oauthserver.OAuthExternalService{client1WithPerm, client1},
-			wantErr: false,
-		},
-		{
-			name:    "update id and secrets",
-			runs:    []oauthserver.OAuthExternalService{client1, client1WithNewSecrets},
-			wantErr: false,
-		},
-		{
-			name:    "update audience",
-			runs:    []oauthserver.OAuthExternalService{client1, client1WithAud},
-			wantErr: false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			s := &store{db: db.InitTestDB(t, db.InitTestDBOpt{FeatureFlags: []string{featuremgmt.FlagExternalServiceAuth}})}
-			for i := range tt.runs {
-				err := s.SaveExternalService(context.Background(), &tt.runs[i])
-				if tt.wantErr {
-					require.Error(t, err)
-					return
-				}
-				require.NoError(t, err)
-
-				compareClientToStored(t, s, &tt.runs[i])
-			}
-		})
-	}
-}
-
-func TestStore_GetExternalServiceByName(t *testing.T) {
-	client1 := oauthserver.OAuthExternalService{
-		Name:                   "my-external-service",
-		ClientID:               "ClientID",
-		Secret:                 "Secret",
-		GrantTypes:             "client_credentials",
-		PublicPem:              []byte("test"),
-		ServiceAccountID:       2,
-		ImpersonatePermissions: []accesscontrol.Permission{},
-		RedirectURI:            "/whereto",
-	}
-	client2 := oauthserver.OAuthExternalService{
-		Name:             "my-external-service-2",
-		ClientID:         "ClientID2",
-		Secret:           "Secret2",
-		GrantTypes:       "client_credentials,urn:ietf:params:grant-type:jwt-bearer",
-		PublicPem:        []byte("test2"),
-		ServiceAccountID: 3,
-		Audiences:        "https://oauth.test/,https://sub.oauth.test/",
-		ImpersonatePermissions: []accesscontrol.Permission{
-			{Action: "dashboards:read", Scope: "folders:*"},
-			{Action: "dashboards:read", Scope: "dashboards:*"},
-		},
-		RedirectURI: "/whereto",
-	}
-	s := &store{db: db.InitTestDB(t, db.InitTestDBOpt{FeatureFlags: []string{featuremgmt.FlagExternalServiceAuth}})}
-	require.NoError(t, s.SaveExternalService(context.Background(), &client1))
-	require.NoError(t, s.SaveExternalService(context.Background(), &client2))
-
-	tests := []struct {
-		name    string
-		search  string
-		want    *oauthserver.OAuthExternalService
-		wantErr bool
-	}{
-		{
-			name:    "no name provided",
-			search:  "",
-			want:    nil,
-			wantErr: true,
-		},
-		{
-			name:    "not found",
-			search:  "unknown-external-service",
-			want:    nil,
-			wantErr: true,
-		},
-		{
-			name:    "search client 1 by name",
-			search:  "my-external-service",
-			want:    &client1,
-			wantErr: false,
-		},
-		{
-			name:    "search client 2 by name",
-			search:  "my-external-service-2",
-			want:    &client2,
-			wantErr: false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			stored, err := s.GetExternalServiceByName(context.Background(), tt.search)
-			if tt.wantErr {
-				require.Error(t, err)
-				return
-			}
-			require.NoError(t, err)
-
-			compareClients(t, stored, tt.want)
-		})
-	}
-}
-
-func TestStore_GetExternalServicePublicKey(t *testing.T) {
-	clientID := "ClientID"
-	createClient := func(clientID string, publicPem string) *oauthserver.OAuthExternalService {
-		return &oauthserver.OAuthExternalService{
-			Name:                   "my-external-service",
-			ClientID:               clientID,
-			Secret:                 "Secret",
-			GrantTypes:             "client_credentials",
-			PublicPem:              []byte(publicPem),
-			ServiceAccountID:       2,
-			ImpersonatePermissions: []accesscontrol.Permission{},
-			RedirectURI:            "/whereto",
-		}
-	}
-
-	testCases := []struct {
-		name        string
-		client      *oauthserver.OAuthExternalService
-		clientID    string
-		want        *jose.JSONWebKey
-		wantKeyType string
-		wantErr     bool
-	}{
-		{
-			name:     "should return an error when clientID is empty",
-			clientID: "",
-			client:   createClient(clientID, ""),
-			want:     nil,
-			wantErr:  true,
-		},
-		{
-			name:     "should return an error when the client was not found",
-			clientID: "random",
-			client:   createClient(clientID, ""),
-			want:     nil,
-			wantErr:  true,
-		},
-		{
-			name:     "should return an error when PublicPem is not valid",
-			clientID: clientID,
-			client:   createClient(clientID, ""),
-			want:     nil,
-			wantErr:  true,
-		},
-		{
-			name:     "should return the JSON Web Key ES256",
-			clientID: clientID,
-			client: createClient(clientID, `-----BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEbsGtoGJTopAIbhqy49/vyCJuDot+
-mgGaC8vUIigFQVsVB+v/HZ4yG1Rcvysig+tyNk1dZQpozpFc2dGmzHlGhw==
------END PUBLIC KEY-----`),
-			wantKeyType: oauthserver.ES256,
-			wantErr:     false,
-		},
-		{
-			name:     "should return the JSON Web Key RS256",
-			clientID: clientID,
-			client: createClient(clientID, `-----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAxkly/cHvsxd6EcShGUlFAB5lIMlIbGRocCVWbIM26f6pnGr+gCNv
-s365DQdQ/jUjF8bSEQM+EtjGlv2Y7Jm7dQROpPzX/1M+53Us/Gl138UtAEgL5ZKe
-SKN5J/f9Nx4wkgb99v2Bt0nz6xv+kSJwgR0o8zi8shDR5n7a5mTdlQe2NOixzWlT
-vnpp6Tm+IE+XyXXcrCr01I9Rf+dKuYOPSJ1K3PDgFmmGvsLcjRCCK9EftfY0keU+
-IP+sh8ewNxc6KcaLBXm3Tadb1c/HyuMi6FyYw7s9m8tyAvI1CMBAcXqLIEaRgNrc
-vuO8AU0bVoUmYMKhozkcCYHudkeS08hEjQIDAQAB
------END RSA PUBLIC KEY-----`),
-			wantKeyType: oauthserver.RS256,
-			wantErr:     false,
-		},
-	}
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			s := &store{db: db.InitTestDB(t, db.InitTestDBOpt{FeatureFlags: []string{featuremgmt.FlagExternalServiceAuth}})}
-			require.NoError(t, s.SaveExternalService(context.Background(), tc.client))
-
-			webKey, err := s.GetExternalServicePublicKey(context.Background(), tc.clientID)
-			if tc.wantErr {
-				require.Error(t, err)
-				return
-			}
-			require.NoError(t, err)
-
-			require.Equal(t, tc.wantKeyType, webKey.Algorithm)
-		})
-	}
-}
-
-func compareClientToStored(t *testing.T, s *store, wanted *oauthserver.OAuthExternalService) {
-	ctx := context.Background()
-	stored, err := s.GetExternalService(ctx, wanted.ClientID)
-	require.NoError(t, err)
-	require.NotNil(t, stored)
-
-	compareClients(t, stored, wanted)
-}
-
-func compareClients(t *testing.T, stored *oauthserver.OAuthExternalService, wanted *oauthserver.OAuthExternalService) {
-	// Reset ID so we can compare
-	require.NotZero(t, stored.ID)
-	stored.ID = 0
-
-	// Compare permissions separately
-	wantedPerms := wanted.ImpersonatePermissions
-	storedPerms := stored.ImpersonatePermissions
-	wanted.ImpersonatePermissions = nil
-	stored.ImpersonatePermissions = nil
-	require.EqualValues(t, *wanted, *stored)
-	require.ElementsMatch(t, wantedPerms, storedPerms)
-}
diff --git a/pkg/services/extsvcauth/oauthserver/utils/utils.go b/pkg/services/extsvcauth/oauthserver/utils/utils.go
deleted file mode 100644
index 83f79d1973bc7..0000000000000
--- a/pkg/services/extsvcauth/oauthserver/utils/utils.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package utils
-
-import (
-	"crypto/x509"
-	"encoding/pem"
-	"errors"
-	"fmt"
-	"strconv"
-	"strings"
-
-	"github.com/grafana/grafana/pkg/services/authn"
-)
-
-// ParseUserIDFromSubject parses the user ID from format "user:id:<id>".
-func ParseUserIDFromSubject(subject string) (int64, error) {
-	trimmed := strings.TrimPrefix(subject, fmt.Sprintf("%s:id:", authn.NamespaceUser))
-	return strconv.ParseInt(trimmed, 10, 64)
-}
-
-// ParsePublicKeyPem parses the public key from the PEM encoded public key.
-func ParsePublicKeyPem(publicPem []byte) (any, error) {
-	block, _ := pem.Decode(publicPem)
-	if block == nil {
-		return nil, errors.New("could not decode PEM block")
-	}
-
-	switch block.Type {
-	case "PUBLIC KEY":
-		return x509.ParsePKIXPublicKey(block.Bytes)
-	case "RSA PUBLIC KEY":
-		return x509.ParsePKCS1PublicKey(block.Bytes)
-	default:
-		return nil, fmt.Errorf("unknown key type %q", block.Type)
-	}
-}
diff --git a/pkg/services/extsvcauth/oauthserver/utils/utils_test.go b/pkg/services/extsvcauth/oauthserver/utils/utils_test.go
deleted file mode 100644
index 8da34460e6d3f..0000000000000
--- a/pkg/services/extsvcauth/oauthserver/utils/utils_test.go
+++ /dev/null
@@ -1,82 +0,0 @@
-package utils
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestParsePublicKeyPem(t *testing.T) {
-	testCases := []struct {
-		name         string
-		publicKeyPem string
-		wantErr      bool
-	}{
-		{
-			name:         "should return error when the public key pem is empty",
-			publicKeyPem: "",
-			wantErr:      true,
-		},
-		{
-			name: "should return error when the public key pem is invalid",
-			publicKeyPem: `-----BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAxP72NEnQF3o3eFFMtFqyloW9oLhTydxXS2dA2NolMvXewO77
-UvJw54wkOdrJrJO2BIw+XBrrb+13+koRUnwa2DNsh+SWG0PEe/31mt0zJrCmNM37
-iJYIu3KZR2aRlierVY5gyrIniBIZ9blQspI6SRY9xmo6Wdh0VCRnsCV5sMlaqerI
-snLpYOjGtMmL0rFuW2jKrAzpbq7L99IDgPbiH7tluaQkGIxoc29S4wjwg0NgQONT
-GkfJEeXQIkxOHNM5WGb8mvjX4U0jMdXvC4WUWcS+KpcIV7ee8uEs2xDz++N4HYAS
-ty37sY8wwW22QUW9I7XlSC4rsC88Ft5ar8yLsQIDAQABAoIBAAQ1yTv+mFmKGYGj
-JiskFZVBNDdpPRQvNvfj8+c2iU08ozc3HEyuZQKT1InefsknCoCwIRyNkDrPBc2F
-8/cR8y5r8e25EUqxoPM/7xXxVIinBZRTEyU9BKCB71vu6Z1eiWs9jNzEIDNopKCj
-ZmG8nY2Gkckp58eYCEtskEE72c0RBPg8ZTBdc1cLqbNVUjkLvR5e98ruDz6b+wyH
-FnztZ0k48zM047Ior69OwFRBg+S7d6cgMMmcq4X2pg3xgQMs0Se/4+pmvBf9JPSB
-kl3qpVAkzM1IFdrmpFtBzeaqYNj3uU6Bm7NxEiqjAoeDxO231ziSdzIPtXIy5eRl
-9WMZCqkCgYEA1ZOaT77aa54zgjAwjNB2Poo3yoUtYJz+yNCR0CPM4MzCas3PR4XI
-WUXo+RNofWvRJF88aAVX7+J0UTnRr25rN12NDbo3aZhX2YNDGBe3hgB/FOAI5UAh
-9SaU070PFeGzqlu/xWdx5GFk/kiNUNLX/X4xgUGPTiwY4LQeI9lffzkCgYEA7CA7
-VHaNPGVsaNKMJVjrZeYOxNBsrH99IEgaP76DC+EVR2JYVzrNxmN6ZlRxD4CRTcyd
-oquTFoFFw26gJIJAYF8MtusOD3PArnpdCRSoELezYdtVhS0yx8TSHGVC9MWSSt7O
-IdjzEFpA99HPkYFjXUiWXjfCTK7ofI0RXC6a+DkCgYEAoQb8nYuEGwfYRhwXPtQd
-kuGbVvI6WFGGN9opVgjn+8Xl/6jU01QmzkhLcyAS9B1KPmYfoT4GIzNWB7fURLS3
-2bKLGwJ/rPnTooe5Gn0nPb06E38mtdI4yCEirNIqgZD+aT9rw2ZPFKXqA16oTXvq
-pZFzucS4S3Qr/Z9P6i+GNOECgYBkvPuS9WEcO0kdD3arGFyVhKkYXrN+hIWlmB1a
-xLS0BLtHUTXPQU85LIez0KLLslZLkthN5lVCbLSOxEueR9OfSe3qvC2ref7icWHv
-1dg+CaGGRkUeJEJd6CKb6re+Jexb9OKMnjpU56yADgs4ULNLwQQl/jPu81BMkwKt
-CVUkQQKBgFvbuUmYtP3aqV/Kt036Q6aB6Xwg29u2XFTe4BgW7c55teebtVmGA/zc
-GMwRsF4rWCcScmHGcSKlW9L6S6OxmkYjDDRhimKyHgoiQ9tawWag2XCeOlyJ+hkc
-/qwwKxScuFIi2xwT+aAmR70Xk11qXTft+DaEcHdxOOZD8gA0Gxr3
------END RSA PRIVATE KEY-----`,
-			wantErr: true,
-		},
-		{
-			name: "should parse the public key if it is in PKCS1 format",
-			publicKeyPem: `-----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAy06MeS06Ea7zGKfOM8kosxuUBMNhrWKWMvW4Jq1IXG+lyTfann2+
-kI1rKeWAQ9YbxNzLynahoKN47EQ6mqM1Yj5v9iKWtSvCMKHWBuqrG5ksaEQaAVsA
-PDg8aOQrI1MSW9Hoc1CummcWX+HKNPVwIzG3sCboENFzEG8GrJgoNHZgmyOYEMMD
-2WCdfY0I9Dm0/uuNMAcyMuVhRhOtT3j91zCXvDju2+M2EejApMkV9r7FqGmNH5Hw
-8u43nWXnWc4UYXEItE8nPxuqsZia2mdB5MSIdKu8a7ytFcQ+tiK6vempnxHZytEL
-6NDX8DLydHbEsLUn6hc76ODVkr/wRiuYdQIDAQAB
------END RSA PUBLIC KEY-----`,
-			wantErr: false,
-		},
-		{
-			name: "should parse the public key if it is in PKIX/X.509 format",
-			publicKeyPem: `-----BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEbsGtoGJTopAIbhqy49/vyCJuDot+
-mgGaC8vUIigFQVsVB+v/HZ4yG1Rcvysig+tyNk1dZQpozpFc2dGmzHlGhw==
------END PUBLIC KEY-----`,
-			wantErr: false,
-		},
-	}
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			_, err := ParsePublicKeyPem([]byte(tc.publicKeyPem))
-			if tc.wantErr {
-				require.Error(t, err)
-			} else {
-				require.NoError(t, err)
-			}
-		})
-	}
-}
diff --git a/pkg/services/extsvcauth/registry/service.go b/pkg/services/extsvcauth/registry/service.go
index efeb7c1771d44..cd6c603bcd8dd 100644
--- a/pkg/services/extsvcauth/registry/service.go
+++ b/pkg/services/extsvcauth/registry/service.go
@@ -1,30 +1,123 @@
 package registry
 
+// FIXME (gamab): we can eventually remove this package
+
 import (
 	"context"
+	"sync"
+	"time"
 
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/serverlock"
+	"github.com/grafana/grafana/pkg/infra/slugify"
 	"github.com/grafana/grafana/pkg/services/extsvcauth"
-	"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts/extsvcaccounts"
 )
 
 var _ extsvcauth.ExternalServiceRegistry = &Registry{}
 
+var lockTimeConfig = serverlock.LockTimeConfig{
+	MaxInterval: 2 * time.Minute,
+	MinWait:     1 * time.Second,
+	MaxWait:     5 * time.Second,
+}
+
+type serverLocker interface {
+	LockExecuteAndReleaseWithRetries(context.Context, string, serverlock.LockTimeConfig, func(ctx context.Context), ...serverlock.RetryOpt) error
+}
+
 type Registry struct {
-	features    featuremgmt.FeatureToggles
-	logger      log.Logger
-	oauthServer oauthserver.OAuth2Server
-	saSvc       *extsvcaccounts.ExtSvcAccountsService
+	features featuremgmt.FeatureToggles
+	logger   log.Logger
+	saReg    extsvcauth.ExternalServiceRegistry
+
+	// FIXME (gamab): we can remove this field and use the saReg.GetExternalServiceNames directly
+	extSvcProviders map[string]extsvcauth.AuthProvider
+	lock            sync.Mutex
+	serverLock      serverLocker
 }
 
-func ProvideExtSvcRegistry(oauthServer oauthserver.OAuth2Server, saSvc *extsvcaccounts.ExtSvcAccountsService, features featuremgmt.FeatureToggles) *Registry {
+func ProvideExtSvcRegistry(saSvc *extsvcaccounts.ExtSvcAccountsService, serverLock *serverlock.ServerLockService, features featuremgmt.FeatureToggles) *Registry {
 	return &Registry{
-		features:    features,
-		logger:      log.New("extsvcauth.registry"),
-		oauthServer: oauthServer,
-		saSvc:       saSvc,
+		extSvcProviders: map[string]extsvcauth.AuthProvider{},
+		features:        features,
+		lock:            sync.Mutex{},
+		logger:          log.New("extsvcauth.registry"),
+		saReg:           saSvc,
+		serverLock:      serverLock,
+	}
+}
+
+// CleanUpOrphanedExternalServices remove external services present in store that have not been registered on startup.
+func (r *Registry) CleanUpOrphanedExternalServices(ctx context.Context) error {
+	var errCleanUp error
+
+	errLock := r.serverLock.LockExecuteAndReleaseWithRetries(ctx, "ext-svc-clean-up", lockTimeConfig, func(ctx context.Context) {
+		extsvcs, err := r.retrieveExtSvcProviders(ctx)
+		if err != nil {
+			r.logger.Error("Could not retrieve external services from store", "error", err.Error())
+			errCleanUp = err
+			return
+		}
+		for name, provider := range extsvcs {
+			// The service did not register this time. Removed.
+			if _, ok := r.extSvcProviders[slugify.Slugify(name)]; !ok {
+				r.logger.Info("Detected removed External Service", "service", name, "provider", provider)
+				switch provider {
+				case extsvcauth.ServiceAccounts:
+					if err := r.saReg.RemoveExternalService(ctx, name); err != nil {
+						errCleanUp = err
+						return
+					}
+				}
+			}
+		}
+	})
+	if errLock != nil {
+		return errLock
+	}
+
+	return errCleanUp
+}
+
+// HasExternalService returns whether an external service has been saved with that name.
+func (r *Registry) HasExternalService(ctx context.Context, name string) (bool, error) {
+	_, ok := r.extSvcProviders[slugify.Slugify(name)]
+	return ok, nil
+}
+
+// GetExternalServiceNames returns the list of external services registered in store.
+func (r *Registry) GetExternalServiceNames(ctx context.Context) ([]string, error) {
+	extSvcProviders, err := r.retrieveExtSvcProviders(ctx)
+	if err != nil {
+		return nil, err
+	}
+	names := []string{}
+	for s := range extSvcProviders {
+		names = append(names, s)
+	}
+	return names, nil
+}
+
+// RemoveExternalService removes an external service and its associated resources from the database (ex: service account, token).
+func (r *Registry) RemoveExternalService(ctx context.Context, name string) error {
+	provider, ok := r.extSvcProviders[slugify.Slugify(name)]
+	if !ok {
+		r.logger.Debug("external service not found", "service", name)
+		return nil
+	}
+
+	switch provider {
+	case extsvcauth.ServiceAccounts:
+		if !r.features.IsEnabled(ctx, featuremgmt.FlagExternalServiceAccounts) {
+			r.logger.Debug("Skipping External Service removal, flag disabled", "service", name, "flag", featuremgmt.FlagExternalServiceAccounts)
+			return nil
+		}
+		r.logger.Debug("Routing External Service removal to the External Service Account service", "service", name)
+		return r.saReg.RemoveExternalService(ctx, name)
+	default:
+		return extsvcauth.ErrUnknownProvider.Errorf("unknown provider '%v'", provider)
 	}
 }
 
@@ -32,22 +125,56 @@ func ProvideExtSvcRegistry(oauthServer oauthserver.OAuth2Server, saSvc *extsvcac
 // it generates client_id, secrets and any additional provider specificities (ex: rsa keys). It also ensures that the
 // associated service account has the correct permissions.
 func (r *Registry) SaveExternalService(ctx context.Context, cmd *extsvcauth.ExternalServiceRegistration) (*extsvcauth.ExternalService, error) {
-	switch cmd.AuthProvider {
-	case extsvcauth.ServiceAccounts:
-		if !r.features.IsEnabled(featuremgmt.FlagExternalServiceAccounts) {
-			r.logger.Warn("Skipping external service authentication, flag disabled", "service", cmd.Name, "flag", featuremgmt.FlagExternalServiceAccounts)
-			return nil, nil
+	var (
+		errSave   error
+		extSvc    *extsvcauth.ExternalService
+		lockName  = "ext-svc-save-" + cmd.Name
+		ctxLogger = r.logger.FromContext(ctx)
+	)
+
+	err := r.serverLock.LockExecuteAndReleaseWithRetries(ctx, lockName, lockTimeConfig, func(ctx context.Context) {
+		// Record provider in case of removal
+		r.lock.Lock()
+		r.extSvcProviders[slugify.Slugify(cmd.Name)] = cmd.AuthProvider
+		r.lock.Unlock()
+
+		switch cmd.AuthProvider {
+		case extsvcauth.ServiceAccounts:
+			if !r.features.IsEnabled(ctx, featuremgmt.FlagExternalServiceAccounts) {
+				ctxLogger.Warn("Skipping External Service authentication, flag disabled", "service", cmd.Name, "flag", featuremgmt.FlagExternalServiceAccounts)
+				return
+			}
+			ctxLogger.Debug("Routing the External Service registration to the External Service Account service", "service", cmd.Name)
+			extSvc, errSave = r.saReg.SaveExternalService(ctx, cmd)
+		default:
+			errSave = extsvcauth.ErrUnknownProvider.Errorf("unknown provider '%v'", cmd.AuthProvider)
 		}
-		r.logger.Debug("Routing the External Service registration to the External Service Account service", "service", cmd.Name)
-		return r.saSvc.SaveExternalService(ctx, cmd)
-	case extsvcauth.OAuth2Server:
-		if !r.features.IsEnabled(featuremgmt.FlagExternalServiceAuth) {
-			r.logger.Warn("Skipping external service authentication, flag disabled", "service", cmd.Name, "flag", featuremgmt.FlagExternalServiceAuth)
-			return nil, nil
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return extSvc, errSave
+}
+
+// retrieveExtSvcProviders fetches external services from store and map their associated provider
+func (r *Registry) retrieveExtSvcProviders(ctx context.Context) (map[string]extsvcauth.AuthProvider, error) {
+	extsvcs := map[string]extsvcauth.AuthProvider{}
+	if r.features.IsEnabled(ctx, featuremgmt.FlagExternalServiceAccounts) {
+		names, err := r.saReg.GetExternalServiceNames(ctx)
+		if err != nil {
+			return nil, err
+		}
+		for i := range names {
+			extsvcs[names[i]] = extsvcauth.ServiceAccounts
 		}
-		r.logger.Debug("Routing the External Service registration to the OAuth2Server", "service", cmd.Name)
-		return r.oauthServer.SaveExternalService(ctx, cmd)
-	default:
-		return nil, extsvcauth.ErrUnknownProvider.Errorf("unknow provider '%v'", cmd.AuthProvider)
 	}
+
+	return extsvcs, nil
 }
+
+// func (r *Registry) Run(ctx context.Context) error {
+// 	// This is a one-time background job.
+// 	// Cleans up external services that have not been registered this time.
+// 	return r.CleanUpOrphanedExternalServices(ctx)
+// }
diff --git a/pkg/services/extsvcauth/registry/service_test.go b/pkg/services/extsvcauth/registry/service_test.go
new file mode 100644
index 0000000000000..40c046f4ceb54
--- /dev/null
+++ b/pkg/services/extsvcauth/registry/service_test.go
@@ -0,0 +1,81 @@
+package registry
+
+import (
+	"context"
+	"testing"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/serverlock"
+	"github.com/grafana/grafana/pkg/services/extsvcauth"
+	"github.com/grafana/grafana/pkg/services/extsvcauth/tests"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+)
+
+type TestEnv struct {
+	r     *Registry
+	saReg *tests.ExternalServiceRegistryMock
+}
+
+// Never lock in tests
+type fakeServerLock struct{}
+
+func (f *fakeServerLock) LockExecuteAndReleaseWithRetries(ctx context.Context, actionName string, timeConfig serverlock.LockTimeConfig, fn func(ctx context.Context), retryOpts ...serverlock.RetryOpt) error {
+	fn(ctx)
+	return nil
+}
+
+func setupTestEnv(t *testing.T) *TestEnv {
+	env := TestEnv{}
+	env.saReg = tests.NewExternalServiceRegistryMock(t)
+	env.r = &Registry{
+		features:        featuremgmt.WithFeatures(featuremgmt.FlagExternalServiceAccounts),
+		logger:          log.New("extsvcauth.registry.test"),
+		saReg:           env.saReg,
+		extSvcProviders: map[string]extsvcauth.AuthProvider{},
+		serverLock:      &fakeServerLock{},
+	}
+	return &env
+}
+
+func TestRegistry_CleanUpOrphanedExternalServices(t *testing.T) {
+	tests := []struct {
+		name string
+		init func(*TestEnv)
+	}{
+		{
+			name: "should not clean up when every service registered",
+			init: func(te *TestEnv) {
+				// Have registered two services one requested a service account, the other requested to be an oauth client
+				te.r.extSvcProviders = map[string]extsvcauth.AuthProvider{"sa-svc": extsvcauth.ServiceAccounts}
+
+				// Also return the external service account attached to the OAuth Server
+				te.saReg.On("GetExternalServiceNames", mock.Anything).Return([]string{"sa-svc"}, nil)
+			},
+		},
+		{
+			name: "should clean up an orphaned service account",
+			init: func(te *TestEnv) {
+				// Have registered two services one requested a service account, the other requested to be an oauth client
+				te.r.extSvcProviders = map[string]extsvcauth.AuthProvider{"sa-svc": extsvcauth.ServiceAccounts}
+
+				// Also return the external service account attached to the OAuth Server
+				te.saReg.On("GetExternalServiceNames", mock.Anything).Return([]string{"sa-svc", "orphaned-sa-svc"}, nil)
+
+				te.saReg.On("RemoveExternalService", mock.Anything, "orphaned-sa-svc").Return(nil)
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			env := setupTestEnv(t)
+			tt.init(env)
+
+			err := env.r.CleanUpOrphanedExternalServices(context.Background())
+			require.NoError(t, err)
+
+			env.saReg.AssertExpectations(t)
+		})
+	}
+}
diff --git a/pkg/services/extsvcauth/tests/extsvcregmock.go b/pkg/services/extsvcauth/tests/extsvcregmock.go
new file mode 100644
index 0000000000000..82b0a278108a6
--- /dev/null
+++ b/pkg/services/extsvcauth/tests/extsvcregmock.go
@@ -0,0 +1,119 @@
+// Code generated by mockery v2.35.2. DO NOT EDIT.
+
+package tests
+
+import (
+	context "context"
+
+	extsvcauth "github.com/grafana/grafana/pkg/services/extsvcauth"
+	mock "github.com/stretchr/testify/mock"
+)
+
+// ExternalServiceRegistryMock is an autogenerated mock type for the ExternalServiceRegistry type
+type ExternalServiceRegistryMock struct {
+	mock.Mock
+}
+
+// GetExternalServiceNames provides a mock function with given fields: ctx
+func (_m *ExternalServiceRegistryMock) GetExternalServiceNames(ctx context.Context) ([]string, error) {
+	ret := _m.Called(ctx)
+
+	var r0 []string
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context) ([]string, error)); ok {
+		return rf(ctx)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context) []string); ok {
+		r0 = rf(ctx)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]string)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context) error); ok {
+		r1 = rf(ctx)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// HasExternalService provides a mock function with given fields: ctx, name
+func (_m *ExternalServiceRegistryMock) HasExternalService(ctx context.Context, name string) (bool, error) {
+	ret := _m.Called(ctx, name)
+
+	var r0 bool
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, string) (bool, error)); ok {
+		return rf(ctx, name)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, string) bool); ok {
+		r0 = rf(ctx, name)
+	} else {
+		r0 = ret.Get(0).(bool)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, string) error); ok {
+		r1 = rf(ctx, name)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// RemoveExternalService provides a mock function with given fields: ctx, name
+func (_m *ExternalServiceRegistryMock) RemoveExternalService(ctx context.Context, name string) error {
+	ret := _m.Called(ctx, name)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, string) error); ok {
+		r0 = rf(ctx, name)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// SaveExternalService provides a mock function with given fields: ctx, cmd
+func (_m *ExternalServiceRegistryMock) SaveExternalService(ctx context.Context, cmd *extsvcauth.ExternalServiceRegistration) (*extsvcauth.ExternalService, error) {
+	ret := _m.Called(ctx, cmd)
+
+	var r0 *extsvcauth.ExternalService
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *extsvcauth.ExternalServiceRegistration) (*extsvcauth.ExternalService, error)); ok {
+		return rf(ctx, cmd)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *extsvcauth.ExternalServiceRegistration) *extsvcauth.ExternalService); ok {
+		r0 = rf(ctx, cmd)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*extsvcauth.ExternalService)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *extsvcauth.ExternalServiceRegistration) error); ok {
+		r1 = rf(ctx, cmd)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// NewExternalServiceRegistryMock creates a new instance of ExternalServiceRegistryMock. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewExternalServiceRegistryMock(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *ExternalServiceRegistryMock {
+	mock := &ExternalServiceRegistryMock{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/pkg/services/featuremgmt/codeowners.go b/pkg/services/featuremgmt/codeowners.go
index 2a555a2906ec9..a303f74f9b2b4 100644
--- a/pkg/services/featuremgmt/codeowners.go
+++ b/pkg/services/featuremgmt/codeowners.go
@@ -8,13 +8,12 @@ const (
 	grafanaAppPlatformSquad                     codeowner = "@grafana/grafana-app-platform-squad"
 	grafanaDashboardsSquad                      codeowner = "@grafana/dashboards-squad"
 	grafanaExploreSquad                         codeowner = "@grafana/explore-squad"
-	grafanaBiSquad                              codeowner = "@grafana/grafana-bi-squad"
 	grafanaDatavizSquad                         codeowner = "@grafana/dataviz-squad"
 	grafanaFrontendPlatformSquad                codeowner = "@grafana/grafana-frontend-platform"
 	grafanaBackendPlatformSquad                 codeowner = "@grafana/backend-platform"
 	grafanaPluginsPlatformSquad                 codeowner = "@grafana/plugins-platform-backend"
 	grafanaAsCodeSquad                          codeowner = "@grafana/grafana-as-code"
-	grafanaAuthnzSquad                          codeowner = "@grafana/grafana-authnz-team"
+	identityAccessTeam                          codeowner = "@grafana/identity-access-team"
 	grafanaObservabilityLogsSquad               codeowner = "@grafana/observability-logs"
 	grafanaObservabilityTracesAndProfilingSquad codeowner = "@grafana/observability-traces-and-profiling"
 	grafanaObservabilityMetricsSquad            codeowner = "@grafana/observability-metrics"
diff --git a/pkg/services/featuremgmt/manager.go b/pkg/services/featuremgmt/manager.go
index 95ab6180580b7..457436790a5b4 100644
--- a/pkg/services/featuremgmt/manager.go
+++ b/pkg/services/featuremgmt/manager.go
@@ -6,7 +6,7 @@ import (
 	"reflect"
 
 	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/licensing"
+	"github.com/grafana/grafana/pkg/setting"
 )
 
 var (
@@ -16,13 +16,14 @@ var (
 type FeatureManager struct {
 	isDevMod        bool
 	restartRequired bool
-	allowEditing    bool
-	licensing       licensing.Licensing
-	flags           map[string]*FeatureFlag
-	enabled         map[string]bool // only the "on" values
-	config          string          // path to config file
-	vars            map[string]any
-	log             log.Logger
+
+	Settings setting.FeatureMgmtSettings
+
+	flags    map[string]*FeatureFlag
+	enabled  map[string]bool   // only the "on" values
+	startup  map[string]bool   // the explicit values registered at startup
+	warnings map[string]string // potential warnings about the flag
+	log      log.Logger
 }
 
 // This will merge the flags with the current configuration
@@ -42,9 +43,6 @@ func (fm *FeatureManager) registerFlags(flags ...FeatureFlag) {
 		if add.Description != "" {
 			flag.Description = add.Description
 		}
-		if add.DocsURL != "" {
-			flag.DocsURL = add.DocsURL
-		}
 		if add.Expression != "" {
 			flag.Expression = add.Expression
 		}
@@ -59,10 +57,6 @@ func (fm *FeatureManager) registerFlags(flags ...FeatureFlag) {
 			flag.RequiresDevMode = true
 		}
 
-		if add.RequiresLicense {
-			flag.RequiresLicense = true
-		}
-
 		if add.RequiresRestart {
 			flag.RequiresRestart = true
 		}
@@ -73,16 +67,12 @@ func (fm *FeatureManager) registerFlags(flags ...FeatureFlag) {
 }
 
 // meetsRequirements checks if grafana is able to run the given feature due to dev mode or licensing requirements
-func (fm *FeatureManager) meetsRequirements(ff *FeatureFlag) bool {
+func (fm *FeatureManager) meetsRequirements(ff *FeatureFlag) (bool, string) {
 	if ff.RequiresDevMode && !fm.isDevMod {
-		return false
+		return false, "requires dev mode"
 	}
 
-	if ff.RequiresLicense && (fm.licensing == nil || !fm.licensing.FeatureEnabled(ff.Name)) {
-		return false
-	}
-
-	return true
+	return true, ""
 }
 
 // Update
@@ -90,14 +80,17 @@ func (fm *FeatureManager) update() {
 	enabled := make(map[string]bool)
 	for _, flag := range fm.flags {
 		// if grafana cannot run the feature, omit metrics around it
-		if !fm.meetsRequirements(flag) {
+		ok, reason := fm.meetsRequirements(flag)
+		if !ok {
+			fm.warnings[flag.Name] = reason
 			continue
 		}
 
 		// Update the registry
 		track := 0.0
-		// TODO: CEL - expression
-		if flag.Expression == "true" {
+
+		startup, ok := fm.startup[flag.Name]
+		if startup || (!ok && flag.Expression == "true") {
 			track = 1
 			enabled[flag.Name] = true
 		}
@@ -108,25 +101,13 @@ func (fm *FeatureManager) update() {
 	fm.enabled = enabled
 }
 
-// Run is called by background services
-func (fm *FeatureManager) readFile() error {
-	if fm.config == "" {
-		return nil // not configured
-	}
-
-	cfg, err := readConfigFile(fm.config)
-	if err != nil {
-		return err
-	}
-
-	fm.registerFlags(cfg.Flags...)
-	fm.vars = cfg.Vars
-
-	return nil
+// IsEnabled checks if a feature is enabled
+func (fm *FeatureManager) IsEnabled(ctx context.Context, flag string) bool {
+	return fm.enabled[flag]
 }
 
-// IsEnabled checks if a feature is enabled
-func (fm *FeatureManager) IsEnabled(flag string) bool {
+// IsEnabledGlobally checks if a feature is for all tenants
+func (fm *FeatureManager) IsEnabledGlobally(flag string) bool {
 	return fm.enabled[flag]
 }
 
@@ -150,29 +131,76 @@ func (fm *FeatureManager) GetFlags() []FeatureFlag {
 	return v
 }
 
-func (fm *FeatureManager) GetState() *FeatureManagerState {
-	return &FeatureManagerState{RestartRequired: fm.restartRequired, AllowEditing: fm.allowEditing}
+// isFeatureEditingAllowed checks if the backend is properly configured to allow feature toggle changes from the UI
+func (fm *FeatureManager) IsFeatureEditingAllowed() bool {
+	return fm.Settings.AllowEditing && fm.Settings.UpdateWebhook != ""
 }
 
-func (fm *FeatureManager) SetRestartRequired() {
-	fm.restartRequired = true
+// indicate if a change has been made (not that accurate, but better than nothing)
+func (fm *FeatureManager) IsRestartRequired() bool {
+	return fm.restartRequired
 }
 
-// Check to see if a feature toggle exists by name
-func (fm *FeatureManager) LookupFlag(name string) (FeatureFlag, bool) {
-	f, ok := fm.flags[name]
-	if !ok {
-		return FeatureFlag{}, false
+// Flags that can be edited
+func (fm *FeatureManager) IsEditableFromAdminPage(key string) bool {
+	flag, ok := fm.flags[key]
+	if !ok ||
+		!fm.IsFeatureEditingAllowed() ||
+		!flag.AllowSelfServe ||
+		flag.Name == FlagFeatureToggleAdminPage {
+		return false
 	}
-	return *f, true
+	return flag.Stage == FeatureStageGeneralAvailability ||
+		flag.Stage == FeatureStagePublicPreview ||
+		flag.Stage == FeatureStageDeprecated
+}
+
+// Flags that should not be shown in the UI (regardless of their state)
+func (fm *FeatureManager) IsHiddenFromAdminPage(key string, lenient bool) bool {
+	_, hide := fm.Settings.HiddenToggles[key]
+	flag, ok := fm.flags[key]
+	if !ok || flag.HideFromAdminPage || hide {
+		return true // unknown flag (should we show it as a warning!)
+	}
+
+	// Explicitly hidden from configs
+	_, found := fm.Settings.HiddenToggles[key]
+	if found {
+		return true
+	}
+	if lenient {
+		return false
+	}
+
+	return flag.Stage == FeatureStageUnknown ||
+		flag.Stage == FeatureStageExperimental ||
+		flag.Stage == FeatureStagePrivatePreview
+}
+
+// Get the flags that were explicitly set on startup
+func (fm *FeatureManager) GetStartupFlags() map[string]bool {
+	return fm.startup
+}
+
+// Perhaps expose the flag warnings
+func (fm *FeatureManager) GetWarning() map[string]string {
+	return fm.warnings
+}
+
+func (fm *FeatureManager) SetRestartRequired() {
+	fm.restartRequired = true
 }
 
 // ############# Test Functions #############
 
+func WithFeatures(spec ...any) FeatureToggles {
+	return WithManager(spec...)
+}
+
 // WithFeatures is used to define feature toggles for testing.
 // The arguments are a list of strings that are optionally followed by a boolean value for example:
 // WithFeatures([]any{"my_feature", "other_feature"}) or WithFeatures([]any{"my_feature", true})
-func WithFeatures(spec ...any) *FeatureManager {
+func WithManager(spec ...any) *FeatureManager {
 	count := len(spec)
 	features := make(map[string]*FeatureFlag, count)
 	enabled := make(map[string]bool, count)
@@ -187,30 +215,41 @@ func WithFeatures(spec ...any) *FeatureManager {
 			idx++
 		}
 
-		features[key] = &FeatureFlag{Name: key, Enabled: val}
+		features[key] = &FeatureFlag{Name: key}
 		if val {
 			enabled[key] = true
 		}
 	}
 
-	return &FeatureManager{enabled: enabled, flags: features}
+	return &FeatureManager{enabled: enabled, flags: features, startup: enabled, warnings: map[string]string{}}
 }
 
-// WithFeatureFlags is used to define feature toggles for testing.
+// WithFeatureManager is used to define feature toggle manager for testing.
 // It should be used when your test feature toggles require metadata beyond `Name` and `Enabled`.
 // You should provide a feature toggle Name at a minimum.
-func WithFeatureFlags(flags []*FeatureFlag) *FeatureManager {
+func WithFeatureManager(cfg setting.FeatureMgmtSettings, flags []*FeatureFlag, disabled ...string) *FeatureManager {
 	count := len(flags)
 	features := make(map[string]*FeatureFlag, count)
 	enabled := make(map[string]bool, count)
 
+	dis := make(map[string]bool)
+	for _, v := range disabled {
+		dis[v] = true
+	}
+
 	for _, f := range flags {
 		if f.Name == "" {
 			continue
 		}
 		features[f.Name] = f
-		enabled[f.Name] = f.Enabled
+		enabled[f.Name] = !dis[f.Name]
 	}
 
-	return &FeatureManager{enabled: enabled, flags: features}
+	return &FeatureManager{
+		Settings: cfg,
+		enabled:  enabled,
+		flags:    features,
+		startup:  enabled,
+		warnings: map[string]string{},
+	}
 }
diff --git a/pkg/services/featuremgmt/manager_test.go b/pkg/services/featuremgmt/manager_test.go
index 68c31daf9a909..449a46ca05500 100644
--- a/pkg/services/featuremgmt/manager_test.go
+++ b/pkg/services/featuremgmt/manager_test.go
@@ -9,69 +9,60 @@ import (
 
 func TestFeatureManager(t *testing.T) {
 	t.Run("check testing stubs", func(t *testing.T) {
-		ft := WithFeatures("a", "b", "c")
-		require.True(t, ft.IsEnabled("a"))
-		require.True(t, ft.IsEnabled("b"))
-		require.True(t, ft.IsEnabled("c"))
-		require.False(t, ft.IsEnabled("d"))
+		ft := WithManager("a", "b", "c")
+		require.True(t, ft.IsEnabledGlobally("a"))
+		require.True(t, ft.IsEnabledGlobally("b"))
+		require.True(t, ft.IsEnabledGlobally("c"))
+		require.False(t, ft.IsEnabledGlobally("d"))
 
 		require.Equal(t, map[string]bool{"a": true, "b": true, "c": true}, ft.GetEnabled(context.Background()))
 
 		// Explicit values
-		ft = WithFeatures("a", true, "b", false)
-		require.True(t, ft.IsEnabled("a"))
-		require.False(t, ft.IsEnabled("b"))
+		ft = WithManager("a", true, "b", false)
+		require.True(t, ft.IsEnabledGlobally("a"))
+		require.False(t, ft.IsEnabledGlobally("b"))
 		require.Equal(t, map[string]bool{"a": true}, ft.GetEnabled(context.Background()))
 	})
 
-	t.Run("check license validation", func(t *testing.T) {
+	t.Run("check description and stage configs", func(t *testing.T) {
 		ft := FeatureManager{
 			flags: map[string]*FeatureFlag{},
 		}
 		ft.registerFlags(FeatureFlag{
-			Name:            "a",
-			RequiresLicense: true,
-			RequiresDevMode: true,
-			Expression:      "true",
+			Name:        "a",
+			Description: "first",
 		}, FeatureFlag{
-			Name:       "b",
-			Expression: "true",
-		})
-		require.False(t, ft.IsEnabled("a"))
-		require.True(t, ft.IsEnabled("b"))
-		require.False(t, ft.IsEnabled("c")) // uknown flag
-
-		// Try changing "requires license"
-		ft.registerFlags(FeatureFlag{
-			Name:            "a",
-			RequiresLicense: false, // shuld still require license!
+			Name:        "a",
+			Description: "second",
 		}, FeatureFlag{
-			Name:            "b",
-			RequiresLicense: true, // expression is still "true"
+			Name:  "a",
+			Stage: FeatureStagePrivatePreview,
+		}, FeatureFlag{
+			Name: "a",
 		})
-		require.False(t, ft.IsEnabled("a"))
-		require.False(t, ft.IsEnabled("b"))
-		require.False(t, ft.IsEnabled("c"))
+		flag := ft.flags["a"]
+		require.Equal(t, "second", flag.Description)
+		require.Equal(t, FeatureStagePrivatePreview, flag.Stage)
 	})
 
-	t.Run("check description and docs configs", func(t *testing.T) {
+	t.Run("check startup false flags", func(t *testing.T) {
 		ft := FeatureManager{
 			flags: map[string]*FeatureFlag{},
+			startup: map[string]bool{
+				"a": true,
+				"b": false, // but default true
+			},
 		}
 		ft.registerFlags(FeatureFlag{
-			Name:        "a",
-			Description: "first",
-		}, FeatureFlag{
-			Name:        "a",
-			Description: "second",
+			Name: "a",
 		}, FeatureFlag{
-			Name:    "a",
-			DocsURL: "http://something",
+			Name:       "b",
+			Expression: "true",
 		}, FeatureFlag{
-			Name: "a",
+			Name: "c",
 		})
-		flag := ft.flags["a"]
-		require.Equal(t, "second", flag.Description)
-		require.Equal(t, "http://something", flag.DocsURL)
+		require.True(t, ft.IsEnabledGlobally("a"))
+		require.False(t, ft.IsEnabledGlobally("b"))
+		require.False(t, ft.IsEnabledGlobally("c"))
 	})
 }
diff --git a/pkg/services/featuremgmt/models.go b/pkg/services/featuremgmt/models.go
index f2aaa7b1c196e..6260547585ba3 100644
--- a/pkg/services/featuremgmt/models.go
+++ b/pkg/services/featuremgmt/models.go
@@ -2,11 +2,25 @@ package featuremgmt
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 )
 
 type FeatureToggles interface {
-	IsEnabled(flag string) bool
+	// IsEnabled checks if a feature is enabled for a given context.
+	// The settings may be per user, tenant, or globally set in the cloud
+	IsEnabled(ctx context.Context, flag string) bool
+
+	// IsEnabledGlobally checks if a flag is configured globally.  For now, this is the same
+	// as the function above, however it will move to only checking flags that
+	// are configured by the operator and shared across all tenants.
+	// Use of global feature flags should be limited and careful as they require
+	// a full server restart for a change to take place.
+	IsEnabledGlobally(flag string) bool
+
+	// Get the enabled flags -- this *may* also include disabled flags (with value false)
+	// but it is guaranteed to have the enabled ones listed
+	GetEnabled(ctx context.Context) map[string]bool
 }
 
 // FeatureFlagStage indicates the quality level
@@ -95,42 +109,30 @@ func (s *FeatureFlagStage) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
+// These are properties about the feature, but not the current state or value for it
 type FeatureFlag struct {
 	Name        string           `json:"name" yaml:"name"` // Unique name
 	Description string           `json:"description"`
 	Stage       FeatureFlagStage `json:"stage,omitempty"`
-	DocsURL     string           `json:"docsURL,omitempty"`
+	Owner       codeowner        `json:"-"` // Owner person or team that owns this feature flag
 
-	// Owner person or team that owns this feature flag
-	Owner codeowner `json:"-"`
+	// Recommended properties - control behavior of the feature toggle management page in the UI
+	AllowSelfServe    bool `json:"allowSelfServe,omitempty"`    // allow users with the right privileges to toggle this from the UI (GeneralAvailability, PublicPreview, and Deprecated toggles only)
+	HideFromAdminPage bool `json:"hideFromAdminPage,omitempty"` // GA, Deprecated, and PublicPreview toggles only: don't display this feature in the UI; if this is a GA toggle, add a comment with the reasoning
 
 	// CEL-GO expression.  Using the value "true" will mean this is on by default
 	Expression string `json:"expression,omitempty"`
 
-	// Special behavior flags
+	// Special behavior properties
 	RequiresDevMode bool `json:"requiresDevMode,omitempty"` // can not be enabled in production
-	// This flag is currently unused.
-	RequiresRestart bool `json:"requiresRestart,omitempty"` // The server must be initialized with the value
-	RequiresLicense bool `json:"requiresLicense,omitempty"` // Must be enabled in the license
 	FrontendOnly    bool `json:"frontend,omitempty"`        // change is only seen in the frontend
 	HideFromDocs    bool `json:"hideFromDocs,omitempty"`    // don't add the values to docs
 
-	// This field is only for the feature management API. To enable your feature toggle by default, use `Expression`.
-	Enabled bool `json:"enabled,omitempty"`
+	// The server must be initialized with the value
+	RequiresRestart bool `json:"requiresRestart,omitempty"`
 }
 
-type UpdateFeatureTogglesCommand struct {
-	FeatureToggles []FeatureToggleDTO `json:"featureToggles"`
-}
-
-type FeatureToggleDTO struct {
-	Name        string `json:"name" binding:"Required"`
-	Description string `json:"description"`
-	Enabled     bool   `json:"enabled"`
-	ReadOnly    bool   `json:"readOnly,omitempty"`
-}
-
-type FeatureManagerState struct {
-	RestartRequired bool `json:"restartRequired"`
-	AllowEditing    bool `json:"allowEditing"`
+type FeatureToggleWebhookPayload struct {
+	FeatureToggles map[string]string `json:"feature_toggles"`
+	User           string            `json:"user"`
 }
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index d12d46d9dfef3..b8f3bbb646de8 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -3,23 +3,28 @@
 // Then run tests in:
 //  pkg/services/featuremgmt/toggles_gen_test.go
 // twice to generate and validate the feature flag files
+//
+// Alternatively, use `make gen-feature-toggles`
 
 package featuremgmt
 
+import (
+	"embed"
+	"encoding/json"
+
+	featuretoggle "github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1"
+)
+
 var (
 	// Register each toggle here
 	standardFeatureFlags = []FeatureFlag{
 		{
-			Name:        "trimDefaults",
-			Description: "Use cue schema to remove values that will be applied automatically",
-			Stage:       FeatureStagePublicPreview,
-			Owner:       grafanaAsCodeSquad,
-		},
-		{
-			Name:        "disableEnvelopeEncryption",
-			Description: "Disable envelope encryption (emergency only)",
-			Stage:       FeatureStageGeneralAvailability,
-			Owner:       grafanaAsCodeSquad,
+			Name:              "disableEnvelopeEncryption",
+			Description:       "Disable envelope encryption (emergency only)",
+			Stage:             FeatureStageGeneralAvailability,
+			Owner:             grafanaAsCodeSquad,
+			HideFromAdminPage: true,
+			AllowSelfServe:    false,
 		},
 		{
 			Name:         "live-service-web-worker",
@@ -36,25 +41,34 @@ var (
 			Owner:        grafanaAppPlatformSquad,
 		},
 		{
-			Name:        "panelTitleSearch",
-			Description: "Search for dashboards using panel title",
-			Stage:       FeatureStagePublicPreview,
-			Owner:       grafanaAppPlatformSquad,
+			Name:              "panelTitleSearch",
+			Description:       "Search for dashboards using panel title",
+			Stage:             FeatureStagePublicPreview,
+			Owner:             grafanaAppPlatformSquad,
+			HideFromAdminPage: true,
 		},
 		{
-			Name:        "publicDashboards",
-			Description: "Enables public access to dashboards",
-			Stage:       FeatureStageGeneralAvailability,
-			Owner:       grafanaSharingSquad,
-			Expression:  "true", // enabled by default
+			Name:           "publicDashboards",
+			Description:    "[Deprecated] Public dashboards are now enabled by default; to disable them, use the configuration setting. This feature toggle will be removed in the next major version.",
+			Stage:          FeatureStageGeneralAvailability,
+			Owner:          grafanaSharingSquad,
+			Expression:     "true", // enabled by default
+			AllowSelfServe: true,
 		},
 		{
-			Name:            "publicDashboardsEmailSharing",
-			Description:     "Enables public dashboard sharing to be restricted to only allowed emails",
-			Stage:           FeatureStagePublicPreview,
-			RequiresLicense: true,
-			Owner:           grafanaSharingSquad,
-			HideFromDocs:    true,
+			Name:              "publicDashboardsEmailSharing",
+			Description:       "Enables public dashboard sharing to be restricted to only allowed emails",
+			Stage:             FeatureStagePublicPreview,
+			Owner:             grafanaSharingSquad,
+			HideFromDocs:      true,
+			HideFromAdminPage: true,
+		},
+		{
+			Name:         "publicDashboardsScene",
+			Description:  "Enables public dashboard rendering using scenes",
+			Stage:        FeatureStageExperimental,
+			FrontendOnly: true,
+			Owner:        grafanaSharingSquad,
 		},
 		{
 			Name:        "lokiExperimentalStreaming",
@@ -63,16 +77,11 @@ var (
 			Owner:       grafanaObservabilityLogsSquad,
 		},
 		{
-			Name:        "featureHighlights",
-			Description: "Highlight Grafana Enterprise features",
-			Stage:       FeatureStageGeneralAvailability,
-			Owner:       grafanaAsCodeSquad,
-		},
-		{
-			Name:        "migrationLocking",
-			Description: "Lock database during migrations",
-			Stage:       FeatureStagePublicPreview,
-			Owner:       grafanaBackendPlatformSquad,
+			Name:           "featureHighlights",
+			Description:    "Highlight Grafana Enterprise features",
+			Stage:          FeatureStageGeneralAvailability,
+			Owner:          grafanaAsCodeSquad,
+			AllowSelfServe: true,
 		},
 		{
 			Name:        "storage",
@@ -81,18 +90,20 @@ var (
 			Owner:       grafanaAppPlatformSquad,
 		},
 		{
-			Name:        "correlations",
-			Description: "Correlations page",
-			Stage:       FeatureStagePublicPreview,
-			Owner:       grafanaExploreSquad,
+			Name:           "correlations",
+			Description:    "Correlations page",
+			Stage:          FeatureStageGeneralAvailability,
+			Owner:          grafanaExploreSquad,
+			AllowSelfServe: true,
 		},
 		{
-			Name:         "exploreContentOutline",
-			Description:  "Content outline sidebar",
-			Stage:        FeatureStageGeneralAvailability,
-			Owner:        grafanaExploreSquad,
-			Expression:   "true", // enabled by default
-			FrontendOnly: true,
+			Name:           "exploreContentOutline",
+			Description:    "Content outline sidebar",
+			Stage:          FeatureStageGeneralAvailability,
+			Owner:          grafanaExploreSquad,
+			Expression:     "true", // enabled by default
+			FrontendOnly:   true,
+			AllowSelfServe: true,
 		},
 		{
 			Name:        "datasourceQueryMultiStatus",
@@ -101,39 +112,78 @@ var (
 			Owner:       grafanaPluginsPlatformSquad,
 		},
 		{
-			Name:         "traceToMetrics",
-			Description:  "Enable trace to metrics links",
-			Stage:        FeatureStageExperimental,
+			Name:         "autoMigrateOldPanels",
+			Description:  "Migrate old angular panels to supported versions (graph, table-old, worldmap, etc)",
+			Stage:        FeatureStagePublicPreview,
 			FrontendOnly: true,
-			Owner:        grafanaObservabilityTracesAndProfilingSquad,
+			Owner:        grafanaDatavizSquad,
 		},
 		{
-			Name:        "newDBLibrary",
-			Description: "Use jmoiron/sqlx rather than xorm for a few backend services",
-			Stage:       FeatureStagePublicPreview,
-			Owner:       grafanaBackendPlatformSquad,
+			Name:         "autoMigrateGraphPanel",
+			Description:  "Migrate old graph panel to supported time series panel - broken out from autoMigrateOldPanels to enable granular tracking",
+			Stage:        FeatureStagePublicPreview,
+			FrontendOnly: true,
+			Owner:        grafanaDatavizSquad,
 		},
 		{
-			Name:         "autoMigrateOldPanels",
-			Description:  "Migrate old angular panels to supported versions (graph, table-old, worldmap, etc)",
+			Name:         "autoMigrateTablePanel",
+			Description:  "Migrate old table panel to supported table panel - broken out from autoMigrateOldPanels to enable granular tracking",
 			Stage:        FeatureStagePublicPreview,
 			FrontendOnly: true,
 			Owner:        grafanaDatavizSquad,
 		},
 		{
-			Name:         "disableAngular",
-			Description:  "Dynamic flag to disable angular at runtime. The preferred method is to set `angular_support_enabled` to `false` in the [security] settings, which allows you to change the state at runtime.",
+			Name:         "autoMigratePiechartPanel",
+			Description:  "Migrate old piechart panel to supported piechart panel - broken out from autoMigrateOldPanels to enable granular tracking",
 			Stage:        FeatureStagePublicPreview,
 			FrontendOnly: true,
 			Owner:        grafanaDatavizSquad,
 		},
 		{
-			Name:         "canvasPanelNesting",
-			Description:  "Allow elements nesting",
-			Stage:        FeatureStageExperimental,
+			Name:         "autoMigrateWorldmapPanel",
+			Description:  "Migrate old worldmap panel to supported geomap panel - broken out from autoMigrateOldPanels to enable granular tracking",
+			Stage:        FeatureStagePublicPreview,
+			FrontendOnly: true,
+			Owner:        grafanaDatavizSquad,
+		},
+		{
+			Name:         "autoMigrateStatPanel",
+			Description:  "Migrate old stat panel to supported stat panel - broken out from autoMigrateOldPanels to enable granular tracking",
+			Stage:        FeatureStagePublicPreview,
 			FrontendOnly: true,
 			Owner:        grafanaDatavizSquad,
 		},
+		{
+			Name:         "autoMigrateXYChartPanel",
+			Description:  "Migrate old XYChart panel to new XYChart2 model",
+			Stage:        FeatureStagePublicPreview,
+			FrontendOnly: true,
+			Owner:        grafanaDatavizSquad,
+		},
+		{
+			Name:              "disableAngular",
+			Description:       "Dynamic flag to disable angular at runtime. The preferred method is to set `angular_support_enabled` to `false` in the [security] settings, which allows you to change the state at runtime.",
+			Stage:             FeatureStagePublicPreview,
+			FrontendOnly:      true,
+			Owner:             grafanaDatavizSquad,
+			HideFromAdminPage: true,
+		},
+		{
+			Name:              "canvasPanelNesting",
+			Description:       "Allow elements nesting",
+			Stage:             FeatureStageExperimental,
+			FrontendOnly:      true,
+			Owner:             grafanaDatavizSquad,
+			HideFromAdminPage: true,
+		},
+		{
+			Name:           "newVizTooltips",
+			Description:    "New visualizations tooltips UX",
+			Stage:          FeatureStagePublicPreview,
+			FrontendOnly:   true,
+			Owner:          grafanaDatavizSquad,
+			AllowSelfServe: false,
+		},
 		{
 			Name:         "scenes",
 			Description:  "Experimental framework to build interactive dashboards",
@@ -154,13 +204,6 @@ var (
 			Stage:       FeatureStageExperimental,
 			Owner:       hostedGrafanaTeam,
 		},
-		{
-			Name:        "dataConnectionsConsole",
-			Description: "Enables a new top-level page called Connections. This page is an experiment that provides a better experience when you install and configure data sources and other plugins.",
-			Stage:       FeatureStageGeneralAvailability,
-			Expression:  "true", // turned on by default
-			Owner:       grafanaPluginsPlatformSquad,
-		},
 		{
 			// Some plugins rely on topnav feature flag being enabled, so we cannot remove this until we
 			// can afford the breaking change, or we've detemined no one else is relying on it
@@ -171,52 +214,35 @@ var (
 			Owner:       grafanaFrontendPlatformSquad,
 		},
 		{
-			Name:         "dockedMegaMenu",
-			Description:  "Enable support for a persistent (docked) navigation menu",
-			Stage:        FeatureStageExperimental,
+			Name:         "returnToPrevious",
+			Description:  "Enables the return to previous context functionality",
+			Stage:        FeatureStageGeneralAvailability,
 			FrontendOnly: true,
+			Expression:   "true", // enabled by default
 			Owner:        grafanaFrontendPlatformSquad,
 		},
 		{
-			Name:        "grpcServer",
-			Description: "Run the GRPC server",
-			Stage:       FeatureStagePublicPreview,
-			Owner:       grafanaAppPlatformSquad,
+			Name:              "grpcServer",
+			Description:       "Run the GRPC server",
+			Stage:             FeatureStagePublicPreview,
+			Owner:             grafanaAppPlatformSquad,
+			HideFromAdminPage: true,
 		},
 		{
-			Name:            "entityStore",
-			Description:     "SQL-based entity store (requires storage flag also)",
+			Name:            "unifiedStorage",
+			Description:     "SQL-based k8s storage",
 			Stage:           FeatureStageExperimental,
 			RequiresDevMode: true,
+			RequiresRestart: true, // new SQL tables created
 			Owner:           grafanaAppPlatformSquad,
 		},
 		{
-			Name:        "cloudWatchCrossAccountQuerying",
-			Description: "Enables cross-account querying in CloudWatch datasources",
-			Stage:       FeatureStageGeneralAvailability,
-			Expression:  "true", // enabled by default
-			Owner:       awsDatasourcesSquad,
-		},
-		{
-			Name:        "redshiftAsyncQueryDataSupport",
-			Description: "Enable async query data support for Redshift",
-			Stage:       FeatureStageGeneralAvailability,
-			Expression:  "true", // enabled by default
-			Owner:       awsDatasourcesSquad,
-		},
-		{
-			Name:         "athenaAsyncQueryDataSupport",
-			Description:  "Enable async query data support for Athena",
-			Stage:        FeatureStageGeneralAvailability,
-			Expression:   "true", // enabled by default
-			FrontendOnly: true,
-			Owner:        awsDatasourcesSquad,
-		},
-		{
-			Name:        "cloudwatchNewRegionsHandler",
-			Description: "Refactor of /regions endpoint, no user-facing changes",
-			Stage:       FeatureStageExperimental,
-			Owner:       awsDatasourcesSquad,
+			Name:           "cloudWatchCrossAccountQuerying",
+			Description:    "Enables cross-account querying in CloudWatch datasources",
+			Stage:          FeatureStageGeneralAvailability,
+			Expression:     "true", // enabled by default
+			Owner:          awsDatasourcesSquad,
+			AllowSelfServe: true,
 		},
 		{
 			Name:        "showDashboardValidationWarnings",
@@ -231,44 +257,27 @@ var (
 			Owner:       grafanaBackendPlatformSquad,
 		},
 		{
-			Name:        "accessControlOnCall",
-			Description: "Access control primitives for OnCall",
-			Stage:       FeatureStagePublicPreview,
-			Owner:       grafanaAuthnzSquad,
+			Name:              "accessControlOnCall",
+			Description:       "Access control primitives for OnCall",
+			Stage:             FeatureStagePublicPreview,
+			Owner:             identityAccessTeam,
+			HideFromAdminPage: true,
 		},
 		{
 			Name:        "nestedFolders",
 			Description: "Enable folder nesting",
-			Stage:       FeatureStagePublicPreview,
-			Owner:       grafanaBackendPlatformSquad,
-		},
-		{
-			Name:         "nestedFolderPicker",
-			Description:  "Enables the new folder picker to work with nested folders. Requires the nestedFolders feature toggle",
-			Stage:        FeatureStageGeneralAvailability,
-			Owner:        grafanaFrontendPlatformSquad,
-			FrontendOnly: true,
-			Expression:   "true", // enabled by default
-		},
-		{
-			Name:        "accessTokenExpirationCheck",
-			Description: "Enable OAuth access_token expiration check and token refresh using the refresh_token",
 			Stage:       FeatureStageGeneralAvailability,
-			Owner:       grafanaAuthnzSquad,
-		},
-		{
-			Name:         "emptyDashboardPage",
-			Description:  "Enable the redesigned user interface of a dashboard page that includes no panels",
-			Stage:        FeatureStageGeneralAvailability,
-			FrontendOnly: true,
-			Expression:   "true", // enabled by default
-			Owner:        grafanaDashboardsSquad,
+			Owner:       grafanaBackendPlatformSquad,
+			Expression:  "true", // enabled by default
 		},
 		{
-			Name:        "disablePrometheusExemplarSampling",
-			Description: "Disable Prometheus exemplar sampling",
-			Stage:       FeatureStageGeneralAvailability,
-			Owner:       grafanaObservabilityMetricsSquad,
+			Name:           "nestedFolderPicker",
+			Description:    "Enables the new folder picker to work with nested folders. Requires the nestedFolders feature toggle",
+			Stage:          FeatureStageGeneralAvailability,
+			Owner:          grafanaFrontendPlatformSquad,
+			FrontendOnly:   true,
+			Expression:     "true", // enabled by default
+			AllowSelfServe: true,
 		},
 		{
 			Name:        "alertingBacktesting",
@@ -281,30 +290,33 @@ var (
 			Description:  "Enables drag and drop for CSV and Excel files",
 			FrontendOnly: true,
 			Stage:        FeatureStageExperimental,
-			Owner:        grafanaBiSquad,
+			Owner:        grafanaDatavizSquad,
 		},
 		{
-			Name:            "alertingNoNormalState",
-			Description:     "Stop maintaining state of alerts that are not firing",
-			Stage:           FeatureStagePublicPreview,
-			RequiresRestart: false,
-			Owner:           grafanaAlertingSquad,
+			Name:              "alertingNoNormalState",
+			Description:       "Stop maintaining state of alerts that are not firing",
+			Stage:             FeatureStagePublicPreview,
+			RequiresRestart:   false,
+			Owner:             grafanaAlertingSquad,
+			HideFromAdminPage: true,
 		},
 		{
-			Name:         "logsContextDatasourceUi",
-			Description:  "Allow datasource to provide custom UI for context view",
-			Stage:        FeatureStageGeneralAvailability,
-			FrontendOnly: true,
-			Owner:        grafanaObservabilityLogsSquad,
-			Expression:   "true", // turned on by default
+			Name:           "logsContextDatasourceUi",
+			Description:    "Allow datasource to provide custom UI for context view",
+			Stage:          FeatureStageGeneralAvailability,
+			FrontendOnly:   true,
+			Owner:          grafanaObservabilityLogsSquad,
+			Expression:     "true", // turned on by default
+			AllowSelfServe: true,
 		},
 		{
-			Name:         "lokiQuerySplitting",
-			Description:  "Split large interval queries into subqueries with smaller time intervals",
-			Stage:        FeatureStageGeneralAvailability,
-			FrontendOnly: true,
-			Owner:        grafanaObservabilityLogsSquad,
-			Expression:   "true", // turned on by default
+			Name:           "lokiQuerySplitting",
+			Description:    "Split large interval queries into subqueries with smaller time intervals",
+			Stage:          FeatureStageGeneralAvailability,
+			FrontendOnly:   true,
+			Owner:          grafanaObservabilityLogsSquad,
+			Expression:     "true", // turned on by default
+			AllowSelfServe: true,
 		},
 		{
 			Name:         "lokiQuerySplittingConfig",
@@ -320,46 +332,51 @@ var (
 			Owner:       grafanaBackendPlatformSquad,
 		},
 		{
-			Name:        "gcomOnlyExternalOrgRoleSync",
-			Description: "Prohibits a user from changing organization roles synced with Grafana Cloud auth provider",
-			Stage:       FeatureStageGeneralAvailability,
-			Owner:       grafanaAuthnzSquad,
+			Name:           "prometheusMetricEncyclopedia",
+			Description:    "Adds the metrics explorer component to the Prometheus query builder as an option in metric select",
+			Expression:     "true",
+			Stage:          FeatureStageGeneralAvailability,
+			FrontendOnly:   true,
+			Owner:          grafanaObservabilityMetricsSquad,
+			AllowSelfServe: true,
 		},
 		{
-			Name:         "prometheusMetricEncyclopedia",
-			Description:  "Adds the metrics explorer component to the Prometheus query builder as an option in metric select",
-			Expression:   "true",
-			Stage:        FeatureStageGeneralAvailability,
-			FrontendOnly: true,
-			Owner:        grafanaObservabilityMetricsSquad,
+			Name:           "influxdbBackendMigration",
+			Description:    "Query InfluxDB InfluxQL without the proxy",
+			Stage:          FeatureStageGeneralAvailability,
+			FrontendOnly:   true,
+			Owner:          grafanaObservabilityMetricsSquad,
+			Expression:     "true", // enabled by default
+			AllowSelfServe: false,
 		},
 		{
-			Name:         "influxdbBackendMigration",
-			Description:  "Query InfluxDB InfluxQL without the proxy",
-			Stage:        FeatureStageGeneralAvailability,
-			FrontendOnly: true,
-			Owner:        grafanaObservabilityMetricsSquad,
-			Expression:   "true", // enabled by default
+			Name:        "influxqlStreamingParser",
+			Description: "Enable streaming JSON parser for InfluxDB datasource InfluxQL query language",
+			Stage:       FeatureStageExperimental,
+			Owner:       grafanaObservabilityMetricsSquad,
 		},
 		{
-			Name:        "clientTokenRotation",
-			Description: "Replaces the current in-request token rotation so that the client initiates the rotation",
-			Stage:       FeatureStageExperimental,
-			Owner:       grafanaAuthnzSquad,
+			Name:         "influxdbRunQueriesInParallel",
+			Description:  "Enables running InfluxDB Influxql queries in parallel",
+			Stage:        FeatureStagePrivatePreview,
+			FrontendOnly: false,
+			Owner:        grafanaObservabilityMetricsSquad,
 		},
 		{
-			Name:        "prometheusDataplane",
-			Description: "Changes responses to from Prometheus to be compliant with the dataplane specification. In particular, when this feature toggle is active, the numeric `Field.Name` is set from 'Value' to the value of the `__name__` label.",
-			Expression:  "true",
-			Stage:       FeatureStageGeneralAvailability,
-			Owner:       grafanaObservabilityMetricsSquad,
+			Name:           "prometheusDataplane",
+			Description:    "Changes responses to from Prometheus to be compliant with the dataplane specification. In particular, when this feature toggle is active, the numeric `Field.Name` is set from 'Value' to the value of the `__name__` label.",
+			Expression:     "true",
+			Stage:          FeatureStageGeneralAvailability,
+			Owner:          grafanaObservabilityMetricsSquad,
+			AllowSelfServe: true,
 		},
 		{
-			Name:        "lokiMetricDataplane",
-			Description: "Changes metric responses from Loki to be compliant with the dataplane specification.",
-			Stage:       FeatureStageGeneralAvailability,
-			Expression:  "true",
-			Owner:       grafanaObservabilityLogsSquad,
+			Name:           "lokiMetricDataplane",
+			Description:    "Changes metric responses from Loki to be compliant with the dataplane specification.",
+			Stage:          FeatureStageGeneralAvailability,
+			Expression:     "true",
+			Owner:          grafanaObservabilityLogsSquad,
+			AllowSelfServe: true,
 		},
 		{
 			Name:        "lokiLogsDataplane",
@@ -368,12 +385,13 @@ var (
 			Owner:       grafanaObservabilityLogsSquad,
 		},
 		{
-			Name:         "dataplaneFrontendFallback",
-			Description:  "Support dataplane contract field name change for transformations and field name matchers where the name is different",
-			Stage:        FeatureStageGeneralAvailability,
-			FrontendOnly: true,
-			Expression:   "true",
-			Owner:        grafanaObservabilityMetricsSquad,
+			Name:           "dataplaneFrontendFallback",
+			Description:    "Support dataplane contract field name change for transformations and field name matchers where the name is different",
+			Stage:          FeatureStageGeneralAvailability,
+			FrontendOnly:   true,
+			Expression:     "true",
+			Owner:          grafanaObservabilityMetricsSquad,
+			AllowSelfServe: true,
 		},
 		{
 			Name:        "disableSSEDataplane",
@@ -387,14 +405,6 @@ var (
 			Stage:       FeatureStageExperimental,
 			Owner:       grafanaAlertingSquad,
 		},
-		{
-			Name:         "alertingNotificationsPoliciesMatchingInstances",
-			Description:  "Enables the preview of matching instances for notification policies",
-			Stage:        FeatureStageGeneralAvailability,
-			FrontendOnly: true,
-			Expression:   "true", // enabled by default
-			Owner:        grafanaAlertingSquad,
-		},
 		{
 			Name:        "alertStateHistoryLokiPrimary",
 			Description: "Enable a remote Loki instance as the primary source for state history reads.",
@@ -414,46 +424,26 @@ var (
 			Owner:       grafanaBackendPlatformSquad,
 		},
 		{
-			Name:        "renderAuthJWT",
-			Description: "Uses JWT-based auth for rendering instead of relying on remote cache",
-			Stage:       FeatureStagePublicPreview,
-			Owner:       grafanaAsCodeSquad,
-		},
-		{
-			Name:            "externalServiceAuth",
-			Description:     "Starts an OAuth2 authentication provider for external services",
-			Stage:           FeatureStageExperimental,
-			RequiresDevMode: true,
-			Owner:           grafanaAuthnzSquad,
-		},
-		{
-			Name:        "refactorVariablesTimeRange",
-			Description: "Refactor time range variables flow to reduce number of API calls made when query variables are chained",
-			Stage:       FeatureStagePublicPreview,
-			Owner:       grafanaDashboardsSquad,
-		},
-		{
-			Name:            "useCachingService",
-			Description:     "When active, the new query and resource caching implementation using a wire service inject replaces the previous middleware implementation.",
-			Stage:           FeatureStageGeneralAvailability,
-			Owner:           grafanaOperatorExperienceSquad,
-			RequiresRestart: true,
-			Expression:      "true", // enabled by default
+			Name:              "renderAuthJWT",
+			Description:       "Uses JWT-based auth for rendering instead of relying on remote cache",
+			Stage:             FeatureStagePublicPreview,
+			Owner:             grafanaAsCodeSquad,
+			HideFromAdminPage: true,
 		},
 		{
-			Name:        "enableElasticsearchBackendQuerying",
-			Description: "Enable the processing of queries and responses in the Elasticsearch data source through backend",
-			Stage:       FeatureStageGeneralAvailability,
-			Owner:       grafanaObservabilityLogsSquad,
-			Expression:  "true", // enabled by default
+			Name:              "refactorVariablesTimeRange",
+			Description:       "Refactor time range variables flow to reduce number of API calls made when query variables are chained",
+			Stage:             FeatureStagePublicPreview,
+			Owner:             grafanaDashboardsSquad,
+			HideFromAdminPage: true, // Non-feature, used to test out a bug fix that impacts the performance of template variables.
 		},
 		{
-			Name:         "advancedDataSourcePicker",
-			Description:  "Enable a new data source picker with contextual information, recently used order and advanced mode",
-			Stage:        FeatureStageGeneralAvailability,
-			FrontendOnly: true,
-			Expression:   "true", // enabled by default
-			Owner:        grafanaDashboardsSquad,
+			Name:           "enableElasticsearchBackendQuerying",
+			Description:    "Enable the processing of queries and responses in the Elasticsearch data source through backend",
+			Stage:          FeatureStageGeneralAvailability,
+			Owner:          grafanaObservabilityLogsSquad,
+			Expression:     "true", // enabled by default
+			AllowSelfServe: true,
 		},
 		{
 			Name:         "faroDatasourceSelector",
@@ -467,14 +457,7 @@ var (
 			Description:  "Enables the edit functionality in the datagrid panel",
 			FrontendOnly: true,
 			Stage:        FeatureStagePublicPreview,
-			Owner:        grafanaBiSquad,
-		},
-		{
-			Name:         "dataSourcePageHeader",
-			Description:  "Apply new pageHeader UI in data source edit page",
-			FrontendOnly: true,
-			Stage:        FeatureStagePublicPreview,
-			Owner:        enterpriseDatasourcesSquad,
+			Owner:        grafanaDatavizSquad,
 		},
 		{
 			Name:         "extraThemes",
@@ -512,11 +495,12 @@ var (
 			Owner:        grafanaPluginsPlatformSquad,
 		},
 		{
-			Name:         "sqlDatasourceDatabaseSelection",
-			Description:  "Enables previous SQL data source dataset dropdown behavior",
-			FrontendOnly: true,
-			Stage:        FeatureStagePublicPreview,
-			Owner:        grafanaBiSquad,
+			Name:              "sqlDatasourceDatabaseSelection",
+			Description:       "Enables previous SQL data source dataset dropdown behavior",
+			FrontendOnly:      true,
+			Stage:             FeatureStagePublicPreview,
+			Owner:             grafanaDatavizSquad,
+			HideFromAdminPage: true,
 		},
 		{
 			Name:         "lokiFormatQuery",
@@ -526,33 +510,20 @@ var (
 			Owner:        grafanaObservabilityLogsSquad,
 		},
 		{
-			Name:         "cloudWatchLogsMonacoEditor",
-			Description:  "Enables the Monaco editor for CloudWatch Logs queries",
-			Stage:        FeatureStageGeneralAvailability,
-			FrontendOnly: true,
-			Expression:   "true", // enabled by default
-			Owner:        awsDatasourcesSquad,
-		},
-		{
-			Name:         "exploreScrollableLogsContainer",
-			Description:  "Improves the scrolling behavior of logs in Explore",
-			Stage:        FeatureStageExperimental,
-			FrontendOnly: true,
-			Owner:        grafanaObservabilityLogsSquad,
-		},
-		{
-			Name:        "recordedQueriesMulti",
-			Description: "Enables writing multiple items from a single query within Recorded Queries",
-			Stage:       FeatureStageGeneralAvailability,
-			Expression:  "true",
-			Owner:       grafanaObservabilityMetricsSquad,
+			Name:           "recordedQueriesMulti",
+			Description:    "Enables writing multiple items from a single query within Recorded Queries",
+			Stage:          FeatureStageGeneralAvailability,
+			Expression:     "true",
+			Owner:          grafanaObservabilityMetricsSquad,
+			AllowSelfServe: false,
 		},
 		{
 			Name:         "pluginsDynamicAngularDetectionPatterns",
 			Description:  "Enables fetching Angular detection patterns for plugins from GCOM and fallback to hardcoded ones",
-			Stage:        FeatureStageExperimental,
+			Stage:        FeatureStageGeneralAvailability,
 			FrontendOnly: false,
 			Owner:        grafanaPluginsPlatformSquad,
+			Expression:   "true", // enabled by default
 		},
 		{
 			Name:         "vizAndWidgetSplit",
@@ -571,7 +542,8 @@ var (
 		{
 			Name:         "logsExploreTableVisualisation",
 			Description:  "A table visualisation for logs in Explore",
-			Stage:        FeatureStageExperimental,
+			Stage:        FeatureStageGeneralAvailability,
+			Expression:   "true", // enabled by default,
 			FrontendOnly: true,
 			Owner:        grafanaObservabilityLogsSquad,
 		},
@@ -582,20 +554,13 @@ var (
 			Owner:       awsDatasourcesSquad,
 		},
 		{
-			Name:         "transformationsRedesign",
-			Description:  "Enables the transformations redesign",
-			Stage:        FeatureStageGeneralAvailability,
-			FrontendOnly: true,
-			Expression:   "true", // enabled by default
-			Owner:        grafanaObservabilityMetricsSquad,
-		},
-		{
-			Name:         "toggleLabelsInLogsUI",
-			Description:  "Enable toggleable filters in log details view",
-			Stage:        FeatureStageGeneralAvailability,
-			FrontendOnly: true,
-			Expression:   "true", // enabled by default
-			Owner:        grafanaObservabilityLogsSquad,
+			Name:           "transformationsRedesign",
+			Description:    "Enables the transformations redesign",
+			Stage:          FeatureStageGeneralAvailability,
+			FrontendOnly:   true,
+			Expression:     "true", // enabled by default
+			Owner:          grafanaObservabilityMetricsSquad,
+			AllowSelfServe: true,
 		},
 		{
 			Name:         "mlExpressions",
@@ -607,7 +572,7 @@ var (
 		{
 			Name:         "traceQLStreaming",
 			Description:  "Enables response streaming of TraceQL queries of the Tempo data source",
-			Stage:        FeatureStageExperimental,
+			Stage:        FeatureStageGeneralAvailability,
 			FrontendOnly: true,
 			Owner:        grafanaObservabilityTracesAndProfilingSquad,
 		},
@@ -619,18 +584,20 @@ var (
 			Owner:        grafanaObservabilityTracesAndProfilingSquad,
 		},
 		{
-			Name:         "grafanaAPIServer",
-			Description:  "Enable Kubernetes API Server for Grafana resources",
-			Stage:        FeatureStageExperimental,
-			FrontendOnly: false,
-			Owner:        grafanaAppPlatformSquad,
+			Name:            "grafanaAPIServerWithExperimentalAPIs",
+			Description:     "Register experimental APIs with the k8s API server",
+			Stage:           FeatureStageExperimental,
+			RequiresRestart: true,
+			RequiresDevMode: true,
+			Owner:           grafanaAppPlatformSquad,
 		},
 		{
-			Name:         "grafanaAPIServerWithExperimentalAPIs",
-			Description:  "Register experimental APIs with the k8s API server",
-			Stage:        FeatureStageExperimental,
-			FrontendOnly: false,
-			Owner:        grafanaAppPlatformSquad,
+			Name:            "grafanaAPIServerEnsureKubectlAccess",
+			Description:     "Start an additional https handler and write kubectl options",
+			Stage:           FeatureStageExperimental,
+			RequiresDevMode: true,
+			RequiresRestart: true,
+			Owner:           grafanaAppPlatformSquad,
 		},
 		{
 			Name:            "featureToggleAdminPage",
@@ -642,24 +609,10 @@ var (
 		},
 		{
 			Name:        "awsAsyncQueryCaching",
-			Description: "Enable caching for async queries for Redshift and Athena. Requires that the `useCachingService` feature toggle is enabled and the datasource has caching and async query support enabled",
-			Stage:       FeatureStagePublicPreview,
-			Owner:       awsDatasourcesSquad,
-		},
-		{
-			Name:            "splitScopes",
-			Description:     "Support faster dashboard and folder search by splitting permission scopes into parts",
-			Stage:           FeatureStagePublicPreview,
-			FrontendOnly:    false,
-			Owner:           grafanaAuthnzSquad,
-			RequiresRestart: true,
-		},
-		{
-			Name:        "azureMonitorDataplane",
-			Description: "Adds dataplane compliant frame metadata in the Azure Monitor datasource",
+			Description: "Enable caching for async queries for Redshift and Athena. Requires that the datasource has caching and async query support enabled",
 			Stage:       FeatureStageGeneralAvailability,
-			Owner:       grafanaPartnerPluginsSquad,
-			Expression:  "true", // on by default
+			Expression:  "true", // enabled by default
+			Owner:       awsDatasourcesSquad,
 		},
 		{
 			Name:        "permissionsFilterRemoveSubquery",
@@ -668,11 +621,12 @@ var (
 			Owner:       grafanaBackendPlatformSquad,
 		},
 		{
-			Name:        "prometheusConfigOverhaulAuth",
-			Description: "Update the Prometheus configuration page with the new auth component",
-			Owner:       grafanaObservabilityMetricsSquad,
-			Stage:       FeatureStageGeneralAvailability,
-			Expression:  "true", // on by default
+			Name:           "prometheusConfigOverhaulAuth",
+			Description:    "Update the Prometheus configuration page with the new auth component",
+			Owner:          grafanaObservabilityMetricsSquad,
+			Stage:          FeatureStageGeneralAvailability,
+			Expression:     "true", // on by default
+			AllowSelfServe: false,
 		},
 		{
 			Name:            "configurableSchedulerTick",
@@ -686,25 +640,29 @@ var (
 		{
 			Name:            "influxdbSqlSupport",
 			Description:     "Enable InfluxDB SQL query language support with new querying UI",
-			Stage:           FeatureStageExperimental,
+			Stage:           FeatureStageGeneralAvailability,
 			FrontendOnly:    false,
 			Owner:           grafanaObservabilityMetricsSquad,
-			RequiresRestart: false,
+			RequiresRestart: true,
+			AllowSelfServe:  true,
+			Expression:      "true", // enabled by default
 		},
 		{
 			Name:            "alertingNoDataErrorExecution",
 			Description:     "Changes how Alerting state manager handles execution of NoData/Error",
-			Stage:           FeatureStagePrivatePreview,
+			Stage:           FeatureStageGeneralAvailability,
 			FrontendOnly:    false,
 			Owner:           grafanaAlertingSquad,
 			RequiresRestart: true,
+			Expression:      "true", // enabled by default
 		},
 		{
 			Name:         "angularDeprecationUI",
-			Description:  "Display new Angular deprecation-related UI features",
-			Stage:        FeatureStageExperimental,
+			Description:  "Display Angular warnings in dashboards and panels",
+			Stage:        FeatureStageGeneralAvailability,
 			FrontendOnly: true,
 			Owner:        grafanaPluginsPlatformSquad,
+			Expression:   "true", // Enabled by default
 		},
 		{
 			Name:         "dashgpt",
@@ -712,7 +670,14 @@ var (
 			Stage:        FeatureStageGeneralAvailability,
 			FrontendOnly: true,
 			Owner:        grafanaDashboardsSquad,
-			Expression:   "true", // on by default
+			Expression:   "true", // enabled by default
+		},
+		{
+			Name:         "aiGeneratedDashboardChanges",
+			Description:  "Enable AI powered features for dashboards to auto-summary changes when saving",
+			Stage:        FeatureStageExperimental,
+			FrontendOnly: true,
+			Owner:        grafanaDashboardsSquad,
 		},
 		{
 			Name:            "reportingRetries",
@@ -722,27 +687,12 @@ var (
 			Owner:           grafanaSharingSquad,
 			RequiresRestart: true,
 		},
-		{
-			Name:         "newBrowseDashboards",
-			Description:  "New browse/manage dashboards UI",
-			Stage:        FeatureStageGeneralAvailability,
-			Owner:        grafanaFrontendPlatformSquad,
-			FrontendOnly: true,
-			Expression:   "true", // on by default
-		},
 		{
 			Name:        "sseGroupByDatasource",
-			Description: "Send query to the same datasource in a single request when using server side expressions",
+			Description: "Send query to the same datasource in a single request when using server side expressions. The `cloudWatchBatchQueries` feature toggle should be enabled if this used with CloudWatch.",
 			Stage:       FeatureStageExperimental,
 			Owner:       grafanaObservabilityMetricsSquad,
 		},
-		{
-			Name:         "requestInstrumentationStatusSource",
-			Description:  "Include a status source label for request metrics and logs",
-			Stage:        FeatureStageExperimental,
-			FrontendOnly: false,
-			Owner:        grafanaPluginsPlatformSquad,
-		},
 		{
 			Name:            "libraryPanelRBAC",
 			Description:     "Enables RBAC support for library panels",
@@ -766,19 +716,14 @@ var (
 			Owner:        hostedGrafanaTeam,
 		},
 		{
-			Name:         "alertingInsights",
-			Description:  "Show the new alerting insights landing page",
-			FrontendOnly: true,
-			Stage:        FeatureStageGeneralAvailability,
-			Owner:        grafanaAlertingSquad,
-			Expression:   "true", // enabled by default
-		},
-		{
-			Name:         "alertingContactPointsV2",
-			Description:  "Show the new contacpoints list view",
-			FrontendOnly: true,
-			Stage:        FeatureStagePublicPreview,
-			Owner:        grafanaAlertingSquad,
+			Name:              "alertingInsights",
+			Description:       "Show the new alerting insights landing page",
+			FrontendOnly:      true,
+			Stage:             FeatureStageGeneralAvailability,
+			Owner:             grafanaAlertingSquad,
+			Expression:        "true", // enabled by default
+			AllowSelfServe:    false,
+			HideFromAdminPage: true, // This is moving away from being a feature toggle.
 		},
 		{
 			Name:        "externalCorePlugins",
@@ -794,38 +739,23 @@ var (
 			Owner:        grafanaPluginsPlatformSquad,
 		},
 		{
-			Name:            "httpSLOLevels",
-			Description:     "Adds SLO level to http request metrics",
-			Stage:           FeatureStageExperimental,
-			FrontendOnly:    false,
-			Owner:           hostedGrafanaTeam,
-			RequiresRestart: true,
-		},
-		{
-			Name:            "idForwarding",
-			Description:     "Generate signed id token for identity that can be forwarded to plugins and external services",
-			Stage:           FeatureStageExperimental,
-			Owner:           grafanaAuthnzSquad,
-			RequiresDevMode: true,
-		},
-		{
-			Name:        "cloudWatchWildCardDimensionValues",
-			Description: "Fetches dimension values from CloudWatch to correctly label wildcard dimensions",
-			Stage:       FeatureStageGeneralAvailability,
-			Expression:  "true", // enabled by default
-			Owner:       awsDatasourcesSquad,
+			Name:        "idForwarding",
+			Description: "Generate signed id token for identity that can be forwarded to plugins and external services",
+			Stage:       FeatureStageExperimental,
+			Owner:       identityAccessTeam,
 		},
 		{
-			Name:            "externalServiceAccounts",
-			Description:     "Automatic service account and token setup for plugins",
-			Stage:           FeatureStageExperimental,
-			RequiresDevMode: true,
-			Owner:           grafanaAuthnzSquad,
+			Name:              "externalServiceAccounts",
+			Description:       "Automatic service account and token setup for plugins",
+			HideFromAdminPage: true,
+			Stage:             FeatureStagePublicPreview,
+			Owner:             identityAccessTeam,
 		},
 		{
 			Name:         "panelMonitoring",
 			Description:  "Enables panel monitoring through logs and measurements",
-			Stage:        FeatureStageExperimental,
+			Stage:        FeatureStageGeneralAvailability,
+			Expression:   "true", // enabled by default
 			Owner:        grafanaDatavizSquad,
 			FrontendOnly: true,
 		},
@@ -839,23 +769,38 @@ var (
 		{
 			Name:         "formatString",
 			Description:  "Enable format string transformer",
-			Stage:        FeatureStageExperimental,
+			Stage:        FeatureStagePublicPreview,
 			FrontendOnly: true,
-			Owner:        grafanaBiSquad,
+			Owner:        grafanaDatavizSquad,
 		},
 		{
 			Name:         "transformationsVariableSupport",
 			Description:  "Allows using variables in transformations",
 			FrontendOnly: true,
-			Stage:        FeatureStageExperimental,
-			Owner:        grafanaBiSquad,
+			Stage:        FeatureStagePublicPreview,
+			Owner:        grafanaDatavizSquad,
 		},
 		{
-			Name:         "kubernetesPlaylists",
-			Description:  "Use the kubernetes API in the frontend for playlists",
-			FrontendOnly: true,
-			Stage:        FeatureStageExperimental,
-			Owner:        grafanaAppPlatformSquad,
+			Name:            "kubernetesPlaylists",
+			Description:     "Use the kubernetes API in the frontend for playlists, and route /api/playlist requests to k8s",
+			Stage:           FeatureStageExperimental,
+			Owner:           grafanaAppPlatformSquad,
+			RequiresRestart: true, // changes the API routing
+		},
+		{
+			Name:            "kubernetesSnapshots",
+			Description:     "Routes snapshot requests from /api to the /apis endpoint",
+			Stage:           FeatureStageExperimental,
+			Owner:           grafanaAppPlatformSquad,
+			RequiresRestart: true, // changes the API routing
+		},
+		{
+			Name:            "kubernetesQueryServiceRewrite",
+			Description:     "Rewrite requests targeting /ds/query to the query service",
+			Stage:           FeatureStageExperimental,
+			Owner:           grafanaAppPlatformSquad,
+			RequiresRestart: true, // changes the API routing
+			RequiresDevMode: true,
 		},
 		{
 			Name:        "cloudWatchBatchQueries",
@@ -863,32 +808,34 @@ var (
 			Stage:       FeatureStagePublicPreview,
 			Owner:       awsDatasourcesSquad,
 		},
-		{
-			Name:         "navAdminSubsections",
-			Description:  "Splits the administration section of the nav tree into subsections",
-			Stage:        FeatureStageExperimental,
-			FrontendOnly: false,
-			Owner:        grafanaFrontendPlatformSquad,
-		},
 		{
 			Name:            "recoveryThreshold",
 			Description:     "Enables feature recovery threshold (aka hysteresis) for threshold server-side expression",
-			Stage:           FeatureStageExperimental,
+			Stage:           FeatureStageGeneralAvailability,
 			FrontendOnly:    false,
 			Owner:           grafanaAlertingSquad,
 			RequiresRestart: true,
+			Expression:      "true",
+		},
+		{
+			Name:         "lokiStructuredMetadata",
+			Description:  "Enables the loki data source to request structured metadata from the Loki server",
+			Stage:        FeatureStageGeneralAvailability,
+			FrontendOnly: false,
+			Owner:        grafanaObservabilityLogsSquad,
+			Expression:   "true",
 		},
 		{
 			Name:         "teamHttpHeaders",
-			Description:  "Enables datasources to apply team headers to the client requests",
-			Stage:        FeatureStageExperimental,
+			Description:  "Enables Team LBAC for datasources to apply team headers to the client requests",
+			Stage:        FeatureStagePublicPreview,
 			FrontendOnly: false,
-			Owner:        grafanaAuthnzSquad,
+			Owner:        identityAccessTeam,
 		},
 		{
 			Name:         "awsDatasourcesNewFormStyling",
 			Description:  "Applies new form styling for configuration and query editors in AWS plugins",
-			Stage:        FeatureStageExperimental,
+			Stage:        FeatureStagePublicPreview,
 			FrontendOnly: true,
 			Owner:        awsDatasourcesSquad,
 		},
@@ -907,32 +854,354 @@ var (
 			Owner:           grafanaBackendPlatformSquad,
 		},
 		{
-			Name:         "pluginsInstrumentationStatusSource",
-			Description:  "Include a status source label for plugin request metrics and logs",
+			Name:            "managedPluginsInstall",
+			Description:     "Install managed plugins directly from plugins catalog",
+			Stage:           FeatureStageGeneralAvailability,
+			RequiresDevMode: false,
+			Owner:           grafanaPluginsPlatformSquad,
+			Expression:      "true", // enabled by default
+		},
+		{
+			Name:         "prometheusPromQAIL",
+			Description:  "Prometheus and AI/ML to assist users in creating a query",
+			Stage:        FeatureStageExperimental,
+			FrontendOnly: true,
+			Owner:        grafanaObservabilityMetricsSquad,
+		},
+		{
+			Name:         "addFieldFromCalculationStatFunctions",
+			Description:  "Add cumulative and window functions to the add field from calculation transformation",
+			Stage:        FeatureStagePublicPreview,
+			FrontendOnly: true,
+			Owner:        grafanaDatavizSquad,
+		},
+		{
+			Name:        "alertmanagerRemoteSecondary",
+			Description: "Enable Grafana to sync configuration and state with a remote Alertmanager.",
+			Stage:       FeatureStageExperimental,
+			Owner:       grafanaAlertingSquad,
+		},
+		{
+			Name:        "alertmanagerRemotePrimary",
+			Description: "Enable Grafana to have a remote Alertmanager instance as the primary Alertmanager.",
+			Stage:       FeatureStageExperimental,
+			Owner:       grafanaAlertingSquad,
+		},
+		{
+			Name:        "alertmanagerRemoteOnly",
+			Description: "Disable the internal Alertmanager and only use the external one defined.",
+			Stage:       FeatureStageExperimental,
+			Owner:       grafanaAlertingSquad,
+		},
+		{
+			Name:            "annotationPermissionUpdate",
+			Description:     "Change the way annotation permissions work by scoping them to folders and dashboards.",
+			Stage:           FeatureStageGeneralAvailability,
+			RequiresDevMode: false,
+			Expression:      "true", // enabled by default
+			Owner:           identityAccessTeam,
+		},
+		{
+			Name:         "extractFieldsNameDeduplication",
+			Description:  "Make sure extracted field names are unique in the dataframe",
+			Stage:        FeatureStageExperimental,
+			FrontendOnly: true,
+			Owner:        grafanaDatavizSquad,
+		},
+		{
+			Name:         "dashboardSceneForViewers",
+			Description:  "Enables dashboard rendering using Scenes for viewer roles",
+			Stage:        FeatureStageExperimental,
+			FrontendOnly: true,
+			Owner:        grafanaDashboardsSquad,
+		},
+		{
+			Name:         "dashboardSceneSolo",
+			Description:  "Enables rendering dashboards using scenes for solo panels",
+			Stage:        FeatureStageExperimental,
+			FrontendOnly: true,
+			Owner:        grafanaDashboardsSquad,
+		},
+		{
+			Name:         "dashboardScene",
+			Description:  "Enables dashboard rendering using scenes for all roles",
+			Stage:        FeatureStageExperimental,
+			FrontendOnly: true,
+			Owner:        grafanaDashboardsSquad,
+		},
+		{
+			Name:         "panelFilterVariable",
+			Description:  "Enables use of the `systemPanelFilterVar` variable to filter panels in a dashboard",
+			Stage:        FeatureStageExperimental,
+			FrontendOnly: true,
+			Owner:        grafanaDashboardsSquad,
+			HideFromDocs: true,
+		},
+		{
+			Name:         "pdfTables",
+			Description:  "Enables generating table data as PDF in reporting",
+			Stage:        FeatureStagePublicPreview,
 			FrontendOnly: false,
+			Owner:        grafanaSharingSquad,
+		},
+		{
+			Name:           "ssoSettingsApi",
+			Description:    "Enables the SSO settings API and the OAuth configuration UIs in Grafana",
+			Stage:          FeatureStagePublicPreview,
+			AllowSelfServe: true,
+			FrontendOnly:   false,
+			Owner:          identityAccessTeam,
+		},
+		{
+			Name:         "canvasPanelPanZoom",
+			Description:  "Allow pan and zoom in canvas panel",
+			Stage:        FeatureStagePublicPreview,
+			FrontendOnly: true,
+			Owner:        grafanaDatavizSquad,
+		},
+		{
+			Name:         "logsInfiniteScrolling",
+			Description:  "Enables infinite scrolling for the Logs panel in Explore and Dashboards",
+			Stage:        FeatureStageExperimental,
+			FrontendOnly: true,
+			Owner:        grafanaObservabilityLogsSquad,
+		},
+		{
+			Name:         "flameGraphItemCollapsing",
+			Description:  "Allow collapsing of flame graph items",
+			Stage:        FeatureStageExperimental,
+			FrontendOnly: true,
+			Owner:        grafanaObservabilityTracesAndProfilingSquad,
+		},
+		{
+			Name:         "exploreMetrics",
+			Description:  "Enables the new Explore Metrics core app",
+			Stage:        FeatureStageGeneralAvailability,
+			Expression:   "true", // enabled by default
+			FrontendOnly: true,
+			Owner:        grafanaDashboardsSquad,
+		},
+		{
+			Name:         "alertingSimplifiedRouting",
+			Description:  "Enables users to easily configure alert notifications by specifying a contact point directly when editing or creating an alert rule",
+			Stage:        FeatureStageGeneralAvailability,
+			FrontendOnly: false,
+			Owner:        grafanaAlertingSquad,
+			Expression:   "true", // enabled by default
+		},
+		{
+			Name:         "logRowsPopoverMenu",
+			Description:  "Enable filtering menu displayed when text of a log line is selected",
+			Stage:        FeatureStageGeneralAvailability,
+			FrontendOnly: true,
+			Expression:   "true",
+			Owner:        grafanaObservabilityLogsSquad,
+		},
+		{
+			Name:         "pluginsSkipHostEnvVars",
+			Description:  "Disables passing host environment variable to plugin processes",
 			Stage:        FeatureStageExperimental,
+			FrontendOnly: false,
 			Owner:        grafanaPluginsPlatformSquad,
 		},
 		{
-			Name:         "costManagementUi",
-			Description:  "Toggles the display of the cost management ui plugin",
+			Name:         "tableSharedCrosshair",
+			Description:  "Enables shared crosshair in table panel",
+			FrontendOnly: true,
+			Stage:        FeatureStageExperimental,
+			Owner:        grafanaDatavizSquad,
+		},
+		{
+			Name:         "regressionTransformation",
+			Description:  "Enables regression analysis transformation",
+			Stage:        FeatureStagePublicPreview,
+			FrontendOnly: true,
+			Owner:        grafanaDatavizSquad,
+		},
+		{
+			// this is mainly used a a way to quickly disable query hints as a safe guard for our infrastructure
+			Name:           "lokiQueryHints",
+			Description:    "Enables query hints for Loki",
+			Stage:          FeatureStageGeneralAvailability,
+			FrontendOnly:   true,
+			Expression:     "true",
+			Owner:          grafanaObservabilityLogsSquad,
+			AllowSelfServe: false,
+		},
+		{
+			Name:              "kubernetesFeatureToggles",
+			Description:       "Use the kubernetes API for feature toggle management in the frontend",
+			Stage:             FeatureStageExperimental,
+			FrontendOnly:      true,
+			Owner:             grafanaOperatorExperienceSquad,
+			AllowSelfServe:    false,
+			HideFromAdminPage: true,
+		},
+		{
+			Name:            "enablePluginsTracingByDefault",
+			Description:     "Enable plugin tracing for all external plugins",
+			FrontendOnly:    false,
+			Stage:           FeatureStageGeneralAvailability,
+			Owner:           grafanaPluginsPlatformSquad,
+			RequiresRestart: true,
+			Expression:      "true", // enabled by default
+		},
+		{
+			Name:            "cloudRBACRoles",
+			Description:     "Enabled grafana cloud specific RBAC roles",
+			Stage:           FeatureStageExperimental,
+			Owner:           identityAccessTeam,
+			HideFromDocs:    true,
+			RequiresRestart: true,
+		},
+		{
+			Name:           "alertingQueryOptimization",
+			Description:    "Optimizes eligible queries in order to reduce load on datasources",
+			Stage:          FeatureStageGeneralAvailability,
+			Owner:          grafanaAlertingSquad,
+			AllowSelfServe: false,
+		},
+		{
+			Name:         "newFolderPicker",
+			Description:  "Enables the nested folder picker without having nested folders enabled",
 			Stage:        FeatureStageExperimental,
+			Owner:        grafanaFrontendPlatformSquad,
+			FrontendOnly: true,
+		},
+		{
+			Name:              "jitterAlertRulesWithinGroups",
+			Description:       "Distributes alert rule evaluations more evenly over time, including spreading out rules within the same group",
+			FrontendOnly:      false,
+			Stage:             FeatureStagePublicPreview,
+			Owner:             grafanaAlertingSquad,
+			AllowSelfServe:    false,
+			HideFromDocs:      true,
+			HideFromAdminPage: false,
+			RequiresRestart:   true,
+		},
+		{
+			Name:        "onPremToCloudMigrations",
+			Description: "In-development feature that will allow users to easily migrate their on-prem Grafana instances to Grafana Cloud.",
+			Stage:       FeatureStageExperimental,
+			Owner:       grafanaOperatorExperienceSquad,
+		},
+		{
+			Name:         "alertingSaveStatePeriodic",
+			Description:  "Writes the state periodically to the database, asynchronous to rule evaluation",
+			Stage:        FeatureStagePrivatePreview,
 			FrontendOnly: false,
-			Owner:        grafanaDatabasesFrontend,
+			Owner:        grafanaAlertingSquad,
 		},
 		{
-			Name:            "managedPluginsInstall",
-			Description:     "Install managed plugins directly from plugins catalog",
+			Name:        "promQLScope",
+			Description: "In-development feature that will allow injection of labels into prometheus queries.",
+			Stage:       FeatureStageExperimental,
+			Owner:       grafanaObservabilityMetricsSquad,
+		},
+		{
+			Name:         "sqlExpressions",
+			Description:  "Enables using SQL and DuckDB functions as Expressions.",
+			Stage:        FeatureStageExperimental,
+			FrontendOnly: false,
+			Owner:        grafanaAppPlatformSquad,
+		},
+		{
+			Name:         "nodeGraphDotLayout",
+			Description:  "Changed the layout algorithm for the node graph",
+			Stage:        FeatureStageExperimental,
+			FrontendOnly: true,
+			Owner:        grafanaObservabilityTracesAndProfilingSquad,
+		},
+		{
+			Name:         "groupToNestedTableTransformation",
+			Description:  "Enables the group to nested table transformation",
+			Stage:        FeatureStagePublicPreview,
+			FrontendOnly: true,
+			Owner:        grafanaDatavizSquad,
+		},
+		{
+			Name:        "newPDFRendering",
+			Description: "New implementation for the dashboard-to-PDF rendering",
+			Stage:       FeatureStagePublicPreview,
+			Owner:       grafanaSharingSquad,
+		},
+		{
+			Name:            "kubernetesAggregator",
+			Description:     "Enable grafana aggregator",
 			Stage:           FeatureStageExperimental,
-			RequiresDevMode: false,
-			Owner:           grafanaPluginsPlatformSquad,
+			Owner:           grafanaAppPlatformSquad,
+			RequiresRestart: true,
 		},
 		{
-			Name:         "prometheusPromQAIL",
-			Description:  "Prometheus and AI/ML to assist users in creating a query",
+			Name:            "expressionParser",
+			Description:     "Enable new expression parser",
+			Stage:           FeatureStageExperimental,
+			Owner:           grafanaAppPlatformSquad,
+			RequiresRestart: true,
+		},
+		{
+			Name:              "groupByVariable",
+			Description:       "Enable groupBy variable support in scenes dashboards",
+			Stage:             FeatureStageExperimental,
+			Owner:             grafanaDashboardsSquad,
+			AllowSelfServe:    false,
+			HideFromDocs:      true,
+			HideFromAdminPage: true,
+		},
+		{
+			Name:         "betterPageScrolling",
+			Description:  "Removes CustomScrollbar from the UI, relying on native browser scrollbars",
+			Stage:        FeatureStageGeneralAvailability,
+			FrontendOnly: true,
+			Owner:        grafanaFrontendPlatformSquad,
+			Expression:   "true", // enabled by default
+		},
+		{
+			Name:              "scopeFilters",
+			Description:       "Enables the use of scope filters in Grafana",
+			FrontendOnly:      false,
+			Stage:             FeatureStageExperimental,
+			Owner:             grafanaDashboardsSquad,
+			RequiresRestart:   false,
+			AllowSelfServe:    false,
+			HideFromDocs:      true,
+			HideFromAdminPage: true,
+		},
+		{
+			Name:              "ssoSettingsSAML",
+			Description:       "Use the new SSO Settings API to configure the SAML connector",
+			Stage:             FeatureStageExperimental,
+			Owner:             identityAccessTeam,
+			HideFromDocs:      true,
+			HideFromAdminPage: true,
+		},
+		{
+			Name:         "usePrometheusFrontendPackage",
+			Description:  "Use the @grafana/prometheus frontend package in core Prometheus.",
 			Stage:        FeatureStageExperimental,
 			FrontendOnly: true,
 			Owner:        grafanaObservabilityMetricsSquad,
 		},
+		{
+			Name:              "oauthRequireSubClaim",
+			Description:       "Require that sub claims is present in oauth tokens.",
+			Stage:             FeatureStageExperimental,
+			Owner:             identityAccessTeam,
+			HideFromDocs:      true,
+			HideFromAdminPage: true,
+		},
 	}
 )
+
+//go:embed toggles_gen.json
+var f embed.FS
+
+// Get the cached feature list (exposed as a k8s resource)
+func GetEmbeddedFeatureList() (featuretoggle.FeatureList, error) {
+	features := featuretoggle.FeatureList{}
+	body, err := f.ReadFile("toggles_gen.json")
+	if err == nil {
+		err = json.Unmarshal(body, &features)
+	}
+	return features, err
+}
diff --git a/pkg/services/featuremgmt/service.go b/pkg/services/featuremgmt/service.go
index b8b7f0ce6d64c..137b8e174b4af 100644
--- a/pkg/services/featuremgmt/service.go
+++ b/pkg/services/featuremgmt/service.go
@@ -1,15 +1,10 @@
 package featuremgmt
 
 import (
-	"fmt"
-	"os"
-	"path/filepath"
-
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
 	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/licensing"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
@@ -22,14 +17,15 @@ var (
 	}, []string{"name"})
 )
 
-func ProvideManagerService(cfg *setting.Cfg, licensing licensing.Licensing) (*FeatureManager, error) {
+func ProvideManagerService(cfg *setting.Cfg) (*FeatureManager, error) {
 	mgmt := &FeatureManager{
-		isDevMod:     setting.Env != setting.Prod,
-		licensing:    licensing,
-		flags:        make(map[string]*FeatureFlag, 30),
-		enabled:      make(map[string]bool),
-		allowEditing: cfg.FeatureManagement.AllowEditing && cfg.FeatureManagement.UpdateWebhook != "",
-		log:          log.New("featuremgmt"),
+		isDevMod: cfg.Env != setting.Prod,
+		flags:    make(map[string]*FeatureFlag, 30),
+		enabled:  make(map[string]bool),
+		startup:  make(map[string]bool),
+		warnings: make(map[string]string),
+		Settings: cfg.FeatureManagement,
+		log:      log.New("featuremgmt"),
 	}
 
 	// Register the standard flags
@@ -41,39 +37,29 @@ func ProvideManagerService(cfg *setting.Cfg, licensing licensing.Licensing) (*Fe
 		return mgmt, err
 	}
 	for key, val := range flags {
-		flag, ok := mgmt.flags[key]
+		_, ok := mgmt.flags[key]
 		if !ok {
 			switch key {
 			// renamed the flag so it supports more panels
 			case "autoMigrateGraphPanels":
-				flag = mgmt.flags[FlagAutoMigrateOldPanels]
+				key = FlagAutoMigrateOldPanels
 			default:
-				flag = &FeatureFlag{
+				mgmt.flags[key] = &FeatureFlag{
 					Name:  key,
 					Stage: FeatureStageUnknown,
 				}
-				mgmt.flags[key] = flag
+				mgmt.warnings[key] = "unknown flag in config"
 			}
 		}
-		flag.Expression = fmt.Sprintf("%t", val) // true | false
-	}
-
-	// Load config settings
-	configfile := filepath.Join(cfg.HomePath, "conf", "features.yaml")
-	if _, err := os.Stat(configfile); err == nil {
-		mgmt.log.Info("[experimental] loading features from config file", "path", configfile)
-		mgmt.config = configfile
-		err = mgmt.readFile()
-		if err != nil {
-			return mgmt, err
-		}
+		mgmt.startup[key] = val
 	}
 
 	// update the values
 	mgmt.update()
 
 	// Minimum approach to avoid circular dependency
-	cfg.IsFeatureToggleEnabled = mgmt.IsEnabled
+	// nolint:staticcheck
+	cfg.IsFeatureToggleEnabled = mgmt.IsEnabledGlobally
 	return mgmt, nil
 }
 
diff --git a/pkg/services/featuremgmt/service_test.go b/pkg/services/featuremgmt/service_test.go
index 660dbda813614..49d85e98e0680 100644
--- a/pkg/services/featuremgmt/service_test.go
+++ b/pkg/services/featuremgmt/service_test.go
@@ -5,81 +5,16 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/grafana/pkg/services/licensing"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
 func TestFeatureService(t *testing.T) {
-	license := stubLicenseServier{
-		flags: []FeatureFlag{
-			{
-				Name:            "a.yes.default",
-				RequiresLicense: true,
-				Expression:      "true",
-			},
-			{
-				Name:            "a.yes",
-				RequiresLicense: true,
-				Expression:      "",
-			},
-			{
-				Name:            "b.no",
-				RequiresLicense: true,
-			},
-		},
-		enabled: map[string]bool{
-			"a.yes.default": true,
-			"a.yes":         true,
-		},
-	}
-	require.False(t, license.FeatureEnabled("unknown"))
-	require.False(t, license.FeatureEnabled("b.no"))
-	require.True(t, license.FeatureEnabled("a.yes"))
-	require.True(t, license.FeatureEnabled("a.yes.default"))
-
 	cfg := setting.NewCfg()
-	mgmt, err := ProvideManagerService(cfg, license)
+	mgmt, err := ProvideManagerService(cfg)
 	require.NoError(t, err)
 	require.NotNil(t, mgmt)
 
 	// Enterprise features do not fall though automatically
-	require.False(t, mgmt.IsEnabled("a.yes.default"))
-	require.False(t, mgmt.IsEnabled("a.yes")) // licensed, but not enabled
-}
-
-var (
-	_ licensing.Licensing = (*stubLicenseServier)(nil)
-)
-
-type stubLicenseServier struct {
-	flags   []FeatureFlag
-	enabled map[string]bool
-}
-
-func (s stubLicenseServier) Expiry() int64 {
-	return 100
-}
-
-func (s stubLicenseServier) Edition() string {
-	return "test"
-}
-
-func (s stubLicenseServier) ContentDeliveryPrefix() string {
-	return ""
-}
-
-func (s stubLicenseServier) LicenseURL(showAdminLicensingPage bool) string {
-	return "http://??"
-}
-
-func (s stubLicenseServier) StateInfo() string {
-	return "ok"
-}
-
-func (s stubLicenseServier) EnabledFeatures() map[string]bool {
-	return map[string]bool{}
-}
-
-func (s stubLicenseServier) FeatureEnabled(feature string) bool {
-	return s.enabled[feature]
+	require.False(t, mgmt.IsEnabledGlobally("a.yes.default"))
+	require.False(t, mgmt.IsEnabledGlobally("a.yes")) // licensed, but not enabled
 }
diff --git a/pkg/services/featuremgmt/settings.go b/pkg/services/featuremgmt/settings.go
deleted file mode 100644
index 3c33979e2d7f1..0000000000000
--- a/pkg/services/featuremgmt/settings.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package featuremgmt
-
-import (
-	"os"
-
-	"gopkg.in/yaml.v3"
-)
-
-type configBody struct {
-	// define variables that can be used in expressions
-	Vars map[string]any `yaml:"vars"`
-
-	// Define and override feature flag properties
-	Flags []FeatureFlag `yaml:"flags"`
-
-	// keep track of where the fie was loaded from
-	filename string
-}
-
-// will read a single configfile
-func readConfigFile(filename string) (*configBody, error) {
-	cfg := &configBody{}
-
-	// Can ignore gosec G304 because the file path is forced within config subfolder
-	//nolint:gosec
-	yamlFile, err := os.ReadFile(filename)
-	if err != nil {
-		return cfg, err
-	}
-
-	err = yaml.Unmarshal(yamlFile, cfg)
-	cfg.filename = filename
-	return cfg, err
-}
diff --git a/pkg/services/featuremgmt/settings_test.go b/pkg/services/featuremgmt/settings_test.go
deleted file mode 100644
index 7b8e6c83b42ff..0000000000000
--- a/pkg/services/featuremgmt/settings_test.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package featuremgmt
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v3"
-)
-
-func TestReadingFeatureSettings(t *testing.T) {
-	config, err := readConfigFile("testdata/features.yaml")
-	require.NoError(t, err, "No error when reading feature configs")
-
-	assert.Equal(t, map[string]any{
-		"level": "free",
-		"stack": "something",
-		"valA":  "value from features.yaml",
-	}, config.Vars)
-
-	out, err := yaml.Marshal(config)
-	require.NoError(t, err)
-	fmt.Printf("%s", string(out))
-}
diff --git a/pkg/services/featuremgmt/testdata/features.yaml b/pkg/services/featuremgmt/testdata/features.yaml
deleted file mode 100644
index dd73749458047..0000000000000
--- a/pkg/services/featuremgmt/testdata/features.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-include:
- - included.yaml # not yet supported
-
-vars: 
-  stack: something
-  level: free
-  valA: value from features.yaml
-
-flags: 
-  - name: feature1
-    description: feature1
-    expression: "false"
-
-  - name: feature3
-    description: feature3
-    expression: "true"
-
-  - name: feature3
-    description: feature3
-    expression: env.level == 'free'
-
-  - name: displaySwedishTheme
-    description: enable swedish background theme
-    expression: |
-      // restrict to users allowing swedish language
-      req.locale.contains("sv")
-  - name: displayFrenchFlag
-    description: sho background theme
-    expression: |
-      // only admins
-      user.id == 1
-      // show to users allowing french language
-      && req.locale.contains("fr")
\ No newline at end of file
diff --git a/pkg/services/featuremgmt/testdata/included.yaml b/pkg/services/featuremgmt/testdata/included.yaml
deleted file mode 100644
index 322b5c7972f1c..0000000000000
--- a/pkg/services/featuremgmt/testdata/included.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-include:
- - features.yaml # make sure we avoid recusion!
-
-# variables that can be used in expressions
-vars:
-  stack: something
-  deep: 1
-  valA: value from included.yaml
-
-flags: 
-  - name: featureFromIncludedFile
-    description: an inlcuded file
-    expression: invalid expression string here
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index d94647febe32e..339cd7dc90f4e 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -1,134 +1,160 @@
-Name,Stage,Owner,requiresDevMode,RequiresLicense,RequiresRestart,FrontendOnly
-trimDefaults,preview,@grafana/grafana-as-code,false,false,false,false
-disableEnvelopeEncryption,GA,@grafana/grafana-as-code,false,false,false,false
-live-service-web-worker,experimental,@grafana/grafana-app-platform-squad,false,false,false,true
-queryOverLive,experimental,@grafana/grafana-app-platform-squad,false,false,false,true
-panelTitleSearch,preview,@grafana/grafana-app-platform-squad,false,false,false,false
-publicDashboards,GA,@grafana/sharing-squad,false,false,false,false
-publicDashboardsEmailSharing,preview,@grafana/sharing-squad,false,true,false,false
-lokiExperimentalStreaming,experimental,@grafana/observability-logs,false,false,false,false
-featureHighlights,GA,@grafana/grafana-as-code,false,false,false,false
-migrationLocking,preview,@grafana/backend-platform,false,false,false,false
-storage,experimental,@grafana/grafana-app-platform-squad,false,false,false,false
-correlations,preview,@grafana/explore-squad,false,false,false,false
-exploreContentOutline,GA,@grafana/explore-squad,false,false,false,true
-datasourceQueryMultiStatus,experimental,@grafana/plugins-platform-backend,false,false,false,false
-traceToMetrics,experimental,@grafana/observability-traces-and-profiling,false,false,false,true
-newDBLibrary,preview,@grafana/backend-platform,false,false,false,false
-autoMigrateOldPanels,preview,@grafana/dataviz-squad,false,false,false,true
-disableAngular,preview,@grafana/dataviz-squad,false,false,false,true
-canvasPanelNesting,experimental,@grafana/dataviz-squad,false,false,false,true
-scenes,experimental,@grafana/dashboards-squad,false,false,false,true
-disableSecretsCompatibility,experimental,@grafana/hosted-grafana-team,false,false,true,false
-logRequestsInstrumentedAsUnknown,experimental,@grafana/hosted-grafana-team,false,false,false,false
-dataConnectionsConsole,GA,@grafana/plugins-platform-backend,false,false,false,false
-topnav,deprecated,@grafana/grafana-frontend-platform,false,false,false,false
-dockedMegaMenu,experimental,@grafana/grafana-frontend-platform,false,false,false,true
-grpcServer,preview,@grafana/grafana-app-platform-squad,false,false,false,false
-entityStore,experimental,@grafana/grafana-app-platform-squad,true,false,false,false
-cloudWatchCrossAccountQuerying,GA,@grafana/aws-datasources,false,false,false,false
-redshiftAsyncQueryDataSupport,GA,@grafana/aws-datasources,false,false,false,false
-athenaAsyncQueryDataSupport,GA,@grafana/aws-datasources,false,false,false,true
-cloudwatchNewRegionsHandler,experimental,@grafana/aws-datasources,false,false,false,false
-showDashboardValidationWarnings,experimental,@grafana/dashboards-squad,false,false,false,false
-mysqlAnsiQuotes,experimental,@grafana/backend-platform,false,false,false,false
-accessControlOnCall,preview,@grafana/grafana-authnz-team,false,false,false,false
-nestedFolders,preview,@grafana/backend-platform,false,false,false,false
-nestedFolderPicker,GA,@grafana/grafana-frontend-platform,false,false,false,true
-accessTokenExpirationCheck,GA,@grafana/grafana-authnz-team,false,false,false,false
-emptyDashboardPage,GA,@grafana/dashboards-squad,false,false,false,true
-disablePrometheusExemplarSampling,GA,@grafana/observability-metrics,false,false,false,false
-alertingBacktesting,experimental,@grafana/alerting-squad,false,false,false,false
-editPanelCSVDragAndDrop,experimental,@grafana/grafana-bi-squad,false,false,false,true
-alertingNoNormalState,preview,@grafana/alerting-squad,false,false,false,false
-logsContextDatasourceUi,GA,@grafana/observability-logs,false,false,false,true
-lokiQuerySplitting,GA,@grafana/observability-logs,false,false,false,true
-lokiQuerySplittingConfig,experimental,@grafana/observability-logs,false,false,false,true
-individualCookiePreferences,experimental,@grafana/backend-platform,false,false,false,false
-gcomOnlyExternalOrgRoleSync,GA,@grafana/grafana-authnz-team,false,false,false,false
-prometheusMetricEncyclopedia,GA,@grafana/observability-metrics,false,false,false,true
-influxdbBackendMigration,GA,@grafana/observability-metrics,false,false,false,true
-clientTokenRotation,experimental,@grafana/grafana-authnz-team,false,false,false,false
-prometheusDataplane,GA,@grafana/observability-metrics,false,false,false,false
-lokiMetricDataplane,GA,@grafana/observability-logs,false,false,false,false
-lokiLogsDataplane,experimental,@grafana/observability-logs,false,false,false,false
-dataplaneFrontendFallback,GA,@grafana/observability-metrics,false,false,false,true
-disableSSEDataplane,experimental,@grafana/observability-metrics,false,false,false,false
-alertStateHistoryLokiSecondary,experimental,@grafana/alerting-squad,false,false,false,false
-alertingNotificationsPoliciesMatchingInstances,GA,@grafana/alerting-squad,false,false,false,true
-alertStateHistoryLokiPrimary,experimental,@grafana/alerting-squad,false,false,false,false
-alertStateHistoryLokiOnly,experimental,@grafana/alerting-squad,false,false,false,false
-unifiedRequestLog,experimental,@grafana/backend-platform,false,false,false,false
-renderAuthJWT,preview,@grafana/grafana-as-code,false,false,false,false
-externalServiceAuth,experimental,@grafana/grafana-authnz-team,true,false,false,false
-refactorVariablesTimeRange,preview,@grafana/dashboards-squad,false,false,false,false
-useCachingService,GA,@grafana/grafana-operator-experience-squad,false,false,true,false
-enableElasticsearchBackendQuerying,GA,@grafana/observability-logs,false,false,false,false
-advancedDataSourcePicker,GA,@grafana/dashboards-squad,false,false,false,true
-faroDatasourceSelector,preview,@grafana/app-o11y,false,false,false,true
-enableDatagridEditing,preview,@grafana/grafana-bi-squad,false,false,false,true
-dataSourcePageHeader,preview,@grafana/enterprise-datasources,false,false,false,true
-extraThemes,experimental,@grafana/grafana-frontend-platform,false,false,false,true
-lokiPredefinedOperations,experimental,@grafana/observability-logs,false,false,false,true
-pluginsFrontendSandbox,experimental,@grafana/plugins-platform-backend,false,false,false,true
-dashboardEmbed,experimental,@grafana/grafana-as-code,false,false,false,true
-frontendSandboxMonitorOnly,experimental,@grafana/plugins-platform-backend,false,false,false,true
-sqlDatasourceDatabaseSelection,preview,@grafana/grafana-bi-squad,false,false,false,true
-lokiFormatQuery,experimental,@grafana/observability-logs,false,false,false,true
-cloudWatchLogsMonacoEditor,GA,@grafana/aws-datasources,false,false,false,true
-exploreScrollableLogsContainer,experimental,@grafana/observability-logs,false,false,false,true
-recordedQueriesMulti,GA,@grafana/observability-metrics,false,false,false,false
-pluginsDynamicAngularDetectionPatterns,experimental,@grafana/plugins-platform-backend,false,false,false,false
-vizAndWidgetSplit,experimental,@grafana/dashboards-squad,false,false,false,true
-prometheusIncrementalQueryInstrumentation,experimental,@grafana/observability-metrics,false,false,false,true
-logsExploreTableVisualisation,experimental,@grafana/observability-logs,false,false,false,true
-awsDatasourcesTempCredentials,experimental,@grafana/aws-datasources,false,false,false,false
-transformationsRedesign,GA,@grafana/observability-metrics,false,false,false,true
-toggleLabelsInLogsUI,GA,@grafana/observability-logs,false,false,false,true
-mlExpressions,experimental,@grafana/alerting-squad,false,false,false,false
-traceQLStreaming,experimental,@grafana/observability-traces-and-profiling,false,false,false,true
-metricsSummary,experimental,@grafana/observability-traces-and-profiling,false,false,false,true
-grafanaAPIServer,experimental,@grafana/grafana-app-platform-squad,false,false,false,false
-grafanaAPIServerWithExperimentalAPIs,experimental,@grafana/grafana-app-platform-squad,false,false,false,false
-featureToggleAdminPage,experimental,@grafana/grafana-operator-experience-squad,false,false,true,false
-awsAsyncQueryCaching,preview,@grafana/aws-datasources,false,false,false,false
-splitScopes,preview,@grafana/grafana-authnz-team,false,false,true,false
-azureMonitorDataplane,GA,@grafana/partner-datasources,false,false,false,false
-permissionsFilterRemoveSubquery,experimental,@grafana/backend-platform,false,false,false,false
-prometheusConfigOverhaulAuth,GA,@grafana/observability-metrics,false,false,false,false
-configurableSchedulerTick,experimental,@grafana/alerting-squad,false,false,true,false
-influxdbSqlSupport,experimental,@grafana/observability-metrics,false,false,false,false
-alertingNoDataErrorExecution,privatePreview,@grafana/alerting-squad,false,false,true,false
-angularDeprecationUI,experimental,@grafana/plugins-platform-backend,false,false,false,true
-dashgpt,GA,@grafana/dashboards-squad,false,false,false,true
-reportingRetries,preview,@grafana/sharing-squad,false,false,true,false
-newBrowseDashboards,GA,@grafana/grafana-frontend-platform,false,false,false,true
-sseGroupByDatasource,experimental,@grafana/observability-metrics,false,false,false,false
-requestInstrumentationStatusSource,experimental,@grafana/plugins-platform-backend,false,false,false,false
-libraryPanelRBAC,experimental,@grafana/dashboards-squad,false,false,true,false
-lokiRunQueriesInParallel,privatePreview,@grafana/observability-logs,false,false,false,false
-wargamesTesting,experimental,@grafana/hosted-grafana-team,false,false,false,false
-alertingInsights,GA,@grafana/alerting-squad,false,false,false,true
-alertingContactPointsV2,preview,@grafana/alerting-squad,false,false,false,true
-externalCorePlugins,experimental,@grafana/plugins-platform-backend,false,false,false,false
-pluginsAPIMetrics,experimental,@grafana/plugins-platform-backend,false,false,false,true
-httpSLOLevels,experimental,@grafana/hosted-grafana-team,false,false,true,false
-idForwarding,experimental,@grafana/grafana-authnz-team,true,false,false,false
-cloudWatchWildCardDimensionValues,GA,@grafana/aws-datasources,false,false,false,false
-externalServiceAccounts,experimental,@grafana/grafana-authnz-team,true,false,false,false
-panelMonitoring,experimental,@grafana/dataviz-squad,false,false,false,true
-enableNativeHTTPHistogram,experimental,@grafana/hosted-grafana-team,false,false,false,false
-formatString,experimental,@grafana/grafana-bi-squad,false,false,false,true
-transformationsVariableSupport,experimental,@grafana/grafana-bi-squad,false,false,false,true
-kubernetesPlaylists,experimental,@grafana/grafana-app-platform-squad,false,false,false,true
-cloudWatchBatchQueries,preview,@grafana/aws-datasources,false,false,false,false
-navAdminSubsections,experimental,@grafana/grafana-frontend-platform,false,false,false,false
-recoveryThreshold,experimental,@grafana/alerting-squad,false,false,true,false
-teamHttpHeaders,experimental,@grafana/grafana-authnz-team,false,false,false,false
-awsDatasourcesNewFormStyling,experimental,@grafana/aws-datasources,false,false,false,true
-cachingOptimizeSerializationMemoryUsage,experimental,@grafana/grafana-operator-experience-squad,false,false,false,false
-panelTitleSearchInV1,experimental,@grafana/backend-platform,true,false,false,false
-pluginsInstrumentationStatusSource,experimental,@grafana/plugins-platform-backend,false,false,false,false
-costManagementUi,experimental,@grafana/databases-frontend,false,false,false,false
-managedPluginsInstall,experimental,@grafana/plugins-platform-backend,false,false,false,false
-prometheusPromQAIL,experimental,@grafana/observability-metrics,false,false,false,true
+Name,Stage,Owner,requiresDevMode,RequiresRestart,FrontendOnly
+disableEnvelopeEncryption,GA,@grafana/grafana-as-code,false,false,false
+live-service-web-worker,experimental,@grafana/grafana-app-platform-squad,false,false,true
+queryOverLive,experimental,@grafana/grafana-app-platform-squad,false,false,true
+panelTitleSearch,preview,@grafana/grafana-app-platform-squad,false,false,false
+publicDashboards,GA,@grafana/sharing-squad,false,false,false
+publicDashboardsEmailSharing,preview,@grafana/sharing-squad,false,false,false
+publicDashboardsScene,experimental,@grafana/sharing-squad,false,false,true
+lokiExperimentalStreaming,experimental,@grafana/observability-logs,false,false,false
+featureHighlights,GA,@grafana/grafana-as-code,false,false,false
+storage,experimental,@grafana/grafana-app-platform-squad,false,false,false
+correlations,GA,@grafana/explore-squad,false,false,false
+exploreContentOutline,GA,@grafana/explore-squad,false,false,true
+datasourceQueryMultiStatus,experimental,@grafana/plugins-platform-backend,false,false,false
+autoMigrateOldPanels,preview,@grafana/dataviz-squad,false,false,true
+autoMigrateGraphPanel,preview,@grafana/dataviz-squad,false,false,true
+autoMigrateTablePanel,preview,@grafana/dataviz-squad,false,false,true
+autoMigratePiechartPanel,preview,@grafana/dataviz-squad,false,false,true
+autoMigrateWorldmapPanel,preview,@grafana/dataviz-squad,false,false,true
+autoMigrateStatPanel,preview,@grafana/dataviz-squad,false,false,true
+autoMigrateXYChartPanel,preview,@grafana/dataviz-squad,false,false,true
+disableAngular,preview,@grafana/dataviz-squad,false,false,true
+canvasPanelNesting,experimental,@grafana/dataviz-squad,false,false,true
+newVizTooltips,preview,@grafana/dataviz-squad,false,false,true
+scenes,experimental,@grafana/dashboards-squad,false,false,true
+disableSecretsCompatibility,experimental,@grafana/hosted-grafana-team,false,true,false
+logRequestsInstrumentedAsUnknown,experimental,@grafana/hosted-grafana-team,false,false,false
+topnav,deprecated,@grafana/grafana-frontend-platform,false,false,false
+returnToPrevious,GA,@grafana/grafana-frontend-platform,false,false,true
+grpcServer,preview,@grafana/grafana-app-platform-squad,false,false,false
+unifiedStorage,experimental,@grafana/grafana-app-platform-squad,true,true,false
+cloudWatchCrossAccountQuerying,GA,@grafana/aws-datasources,false,false,false
+showDashboardValidationWarnings,experimental,@grafana/dashboards-squad,false,false,false
+mysqlAnsiQuotes,experimental,@grafana/backend-platform,false,false,false
+accessControlOnCall,preview,@grafana/identity-access-team,false,false,false
+nestedFolders,GA,@grafana/backend-platform,false,false,false
+nestedFolderPicker,GA,@grafana/grafana-frontend-platform,false,false,true
+alertingBacktesting,experimental,@grafana/alerting-squad,false,false,false
+editPanelCSVDragAndDrop,experimental,@grafana/dataviz-squad,false,false,true
+alertingNoNormalState,preview,@grafana/alerting-squad,false,false,false
+logsContextDatasourceUi,GA,@grafana/observability-logs,false,false,true
+lokiQuerySplitting,GA,@grafana/observability-logs,false,false,true
+lokiQuerySplittingConfig,experimental,@grafana/observability-logs,false,false,true
+individualCookiePreferences,experimental,@grafana/backend-platform,false,false,false
+prometheusMetricEncyclopedia,GA,@grafana/observability-metrics,false,false,true
+influxdbBackendMigration,GA,@grafana/observability-metrics,false,false,true
+influxqlStreamingParser,experimental,@grafana/observability-metrics,false,false,false
+influxdbRunQueriesInParallel,privatePreview,@grafana/observability-metrics,false,false,false
+prometheusDataplane,GA,@grafana/observability-metrics,false,false,false
+lokiMetricDataplane,GA,@grafana/observability-logs,false,false,false
+lokiLogsDataplane,experimental,@grafana/observability-logs,false,false,false
+dataplaneFrontendFallback,GA,@grafana/observability-metrics,false,false,true
+disableSSEDataplane,experimental,@grafana/observability-metrics,false,false,false
+alertStateHistoryLokiSecondary,experimental,@grafana/alerting-squad,false,false,false
+alertStateHistoryLokiPrimary,experimental,@grafana/alerting-squad,false,false,false
+alertStateHistoryLokiOnly,experimental,@grafana/alerting-squad,false,false,false
+unifiedRequestLog,experimental,@grafana/backend-platform,false,false,false
+renderAuthJWT,preview,@grafana/grafana-as-code,false,false,false
+refactorVariablesTimeRange,preview,@grafana/dashboards-squad,false,false,false
+enableElasticsearchBackendQuerying,GA,@grafana/observability-logs,false,false,false
+faroDatasourceSelector,preview,@grafana/app-o11y,false,false,true
+enableDatagridEditing,preview,@grafana/dataviz-squad,false,false,true
+extraThemes,experimental,@grafana/grafana-frontend-platform,false,false,true
+lokiPredefinedOperations,experimental,@grafana/observability-logs,false,false,true
+pluginsFrontendSandbox,experimental,@grafana/plugins-platform-backend,false,false,true
+dashboardEmbed,experimental,@grafana/grafana-as-code,false,false,true
+frontendSandboxMonitorOnly,experimental,@grafana/plugins-platform-backend,false,false,true
+sqlDatasourceDatabaseSelection,preview,@grafana/dataviz-squad,false,false,true
+lokiFormatQuery,experimental,@grafana/observability-logs,false,false,true
+recordedQueriesMulti,GA,@grafana/observability-metrics,false,false,false
+pluginsDynamicAngularDetectionPatterns,GA,@grafana/plugins-platform-backend,false,false,false
+vizAndWidgetSplit,experimental,@grafana/dashboards-squad,false,false,true
+prometheusIncrementalQueryInstrumentation,experimental,@grafana/observability-metrics,false,false,true
+logsExploreTableVisualisation,GA,@grafana/observability-logs,false,false,true
+awsDatasourcesTempCredentials,experimental,@grafana/aws-datasources,false,false,false
+transformationsRedesign,GA,@grafana/observability-metrics,false,false,true
+mlExpressions,experimental,@grafana/alerting-squad,false,false,false
+traceQLStreaming,GA,@grafana/observability-traces-and-profiling,false,false,true
+metricsSummary,experimental,@grafana/observability-traces-and-profiling,false,false,true
+grafanaAPIServerWithExperimentalAPIs,experimental,@grafana/grafana-app-platform-squad,true,true,false
+grafanaAPIServerEnsureKubectlAccess,experimental,@grafana/grafana-app-platform-squad,true,true,false
+featureToggleAdminPage,experimental,@grafana/grafana-operator-experience-squad,false,true,false
+awsAsyncQueryCaching,GA,@grafana/aws-datasources,false,false,false
+permissionsFilterRemoveSubquery,experimental,@grafana/backend-platform,false,false,false
+prometheusConfigOverhaulAuth,GA,@grafana/observability-metrics,false,false,false
+configurableSchedulerTick,experimental,@grafana/alerting-squad,false,true,false
+influxdbSqlSupport,GA,@grafana/observability-metrics,false,true,false
+alertingNoDataErrorExecution,GA,@grafana/alerting-squad,false,true,false
+angularDeprecationUI,GA,@grafana/plugins-platform-backend,false,false,true
+dashgpt,GA,@grafana/dashboards-squad,false,false,true
+aiGeneratedDashboardChanges,experimental,@grafana/dashboards-squad,false,false,true
+reportingRetries,preview,@grafana/sharing-squad,false,true,false
+sseGroupByDatasource,experimental,@grafana/observability-metrics,false,false,false
+libraryPanelRBAC,experimental,@grafana/dashboards-squad,false,true,false
+lokiRunQueriesInParallel,privatePreview,@grafana/observability-logs,false,false,false
+wargamesTesting,experimental,@grafana/hosted-grafana-team,false,false,false
+alertingInsights,GA,@grafana/alerting-squad,false,false,true
+externalCorePlugins,experimental,@grafana/plugins-platform-backend,false,false,false
+pluginsAPIMetrics,experimental,@grafana/plugins-platform-backend,false,false,true
+idForwarding,experimental,@grafana/identity-access-team,false,false,false
+externalServiceAccounts,preview,@grafana/identity-access-team,false,false,false
+panelMonitoring,GA,@grafana/dataviz-squad,false,false,true
+enableNativeHTTPHistogram,experimental,@grafana/hosted-grafana-team,false,false,false
+formatString,preview,@grafana/dataviz-squad,false,false,true
+transformationsVariableSupport,preview,@grafana/dataviz-squad,false,false,true
+kubernetesPlaylists,experimental,@grafana/grafana-app-platform-squad,false,true,false
+kubernetesSnapshots,experimental,@grafana/grafana-app-platform-squad,false,true,false
+kubernetesQueryServiceRewrite,experimental,@grafana/grafana-app-platform-squad,true,true,false
+cloudWatchBatchQueries,preview,@grafana/aws-datasources,false,false,false
+recoveryThreshold,GA,@grafana/alerting-squad,false,true,false
+lokiStructuredMetadata,GA,@grafana/observability-logs,false,false,false
+teamHttpHeaders,preview,@grafana/identity-access-team,false,false,false
+awsDatasourcesNewFormStyling,preview,@grafana/aws-datasources,false,false,true
+cachingOptimizeSerializationMemoryUsage,experimental,@grafana/grafana-operator-experience-squad,false,false,false
+panelTitleSearchInV1,experimental,@grafana/backend-platform,true,false,false
+managedPluginsInstall,GA,@grafana/plugins-platform-backend,false,false,false
+prometheusPromQAIL,experimental,@grafana/observability-metrics,false,false,true
+addFieldFromCalculationStatFunctions,preview,@grafana/dataviz-squad,false,false,true
+alertmanagerRemoteSecondary,experimental,@grafana/alerting-squad,false,false,false
+alertmanagerRemotePrimary,experimental,@grafana/alerting-squad,false,false,false
+alertmanagerRemoteOnly,experimental,@grafana/alerting-squad,false,false,false
+annotationPermissionUpdate,GA,@grafana/identity-access-team,false,false,false
+extractFieldsNameDeduplication,experimental,@grafana/dataviz-squad,false,false,true
+dashboardSceneForViewers,experimental,@grafana/dashboards-squad,false,false,true
+dashboardSceneSolo,experimental,@grafana/dashboards-squad,false,false,true
+dashboardScene,experimental,@grafana/dashboards-squad,false,false,true
+panelFilterVariable,experimental,@grafana/dashboards-squad,false,false,true
+pdfTables,preview,@grafana/sharing-squad,false,false,false
+ssoSettingsApi,preview,@grafana/identity-access-team,false,false,false
+canvasPanelPanZoom,preview,@grafana/dataviz-squad,false,false,true
+logsInfiniteScrolling,experimental,@grafana/observability-logs,false,false,true
+flameGraphItemCollapsing,experimental,@grafana/observability-traces-and-profiling,false,false,true
+exploreMetrics,GA,@grafana/dashboards-squad,false,false,true
+alertingSimplifiedRouting,GA,@grafana/alerting-squad,false,false,false
+logRowsPopoverMenu,GA,@grafana/observability-logs,false,false,true
+pluginsSkipHostEnvVars,experimental,@grafana/plugins-platform-backend,false,false,false
+tableSharedCrosshair,experimental,@grafana/dataviz-squad,false,false,true
+regressionTransformation,preview,@grafana/dataviz-squad,false,false,true
+lokiQueryHints,GA,@grafana/observability-logs,false,false,true
+kubernetesFeatureToggles,experimental,@grafana/grafana-operator-experience-squad,false,false,true
+enablePluginsTracingByDefault,GA,@grafana/plugins-platform-backend,false,true,false
+cloudRBACRoles,experimental,@grafana/identity-access-team,false,true,false
+alertingQueryOptimization,GA,@grafana/alerting-squad,false,false,false
+newFolderPicker,experimental,@grafana/grafana-frontend-platform,false,false,true
+jitterAlertRulesWithinGroups,preview,@grafana/alerting-squad,false,true,false
+onPremToCloudMigrations,experimental,@grafana/grafana-operator-experience-squad,false,false,false
+alertingSaveStatePeriodic,privatePreview,@grafana/alerting-squad,false,false,false
+promQLScope,experimental,@grafana/observability-metrics,false,false,false
+sqlExpressions,experimental,@grafana/grafana-app-platform-squad,false,false,false
+nodeGraphDotLayout,experimental,@grafana/observability-traces-and-profiling,false,false,true
+groupToNestedTableTransformation,preview,@grafana/dataviz-squad,false,false,true
+newPDFRendering,preview,@grafana/sharing-squad,false,false,false
+kubernetesAggregator,experimental,@grafana/grafana-app-platform-squad,false,true,false
+expressionParser,experimental,@grafana/grafana-app-platform-squad,false,true,false
+groupByVariable,experimental,@grafana/dashboards-squad,false,false,false
+betterPageScrolling,GA,@grafana/grafana-frontend-platform,false,false,true
+scopeFilters,experimental,@grafana/dashboards-squad,false,false,false
+ssoSettingsSAML,experimental,@grafana/identity-access-team,false,false,false
+usePrometheusFrontendPackage,experimental,@grafana/observability-metrics,false,false,true
+oauthRequireSubClaim,experimental,@grafana/identity-access-team,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 7cdc48e682a81..4e8adf7f9db2d 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -7,10 +7,6 @@
 package featuremgmt
 
 const (
-	// FlagTrimDefaults
-	// Use cue schema to remove values that will be applied automatically
-	FlagTrimDefaults = "trimDefaults"
-
 	// FlagDisableEnvelopeEncryption
 	// Disable envelope encryption (emergency only)
 	FlagDisableEnvelopeEncryption = "disableEnvelopeEncryption"
@@ -28,13 +24,17 @@ const (
 	FlagPanelTitleSearch = "panelTitleSearch"
 
 	// FlagPublicDashboards
-	// Enables public access to dashboards
+	// [Deprecated] Public dashboards are now enabled by default; to disable them, use the configuration setting. This feature toggle will be removed in the next major version.
 	FlagPublicDashboards = "publicDashboards"
 
 	// FlagPublicDashboardsEmailSharing
 	// Enables public dashboard sharing to be restricted to only allowed emails
 	FlagPublicDashboardsEmailSharing = "publicDashboardsEmailSharing"
 
+	// FlagPublicDashboardsScene
+	// Enables public dashboard rendering using scenes
+	FlagPublicDashboardsScene = "publicDashboardsScene"
+
 	// FlagLokiExperimentalStreaming
 	// Support new streaming approach for loki (prototype, needs special loki build)
 	FlagLokiExperimentalStreaming = "lokiExperimentalStreaming"
@@ -43,10 +43,6 @@ const (
 	// Highlight Grafana Enterprise features
 	FlagFeatureHighlights = "featureHighlights"
 
-	// FlagMigrationLocking
-	// Lock database during migrations
-	FlagMigrationLocking = "migrationLocking"
-
 	// FlagStorage
 	// Configurable storage for dashboards, datasources, and resources
 	FlagStorage = "storage"
@@ -63,18 +59,34 @@ const (
 	// Introduce HTTP 207 Multi Status for api/ds/query
 	FlagDatasourceQueryMultiStatus = "datasourceQueryMultiStatus"
 
-	// FlagTraceToMetrics
-	// Enable trace to metrics links
-	FlagTraceToMetrics = "traceToMetrics"
-
-	// FlagNewDBLibrary
-	// Use jmoiron/sqlx rather than xorm for a few backend services
-	FlagNewDBLibrary = "newDBLibrary"
-
 	// FlagAutoMigrateOldPanels
 	// Migrate old angular panels to supported versions (graph, table-old, worldmap, etc)
 	FlagAutoMigrateOldPanels = "autoMigrateOldPanels"
 
+	// FlagAutoMigrateGraphPanel
+	// Migrate old graph panel to supported time series panel - broken out from autoMigrateOldPanels to enable granular tracking
+	FlagAutoMigrateGraphPanel = "autoMigrateGraphPanel"
+
+	// FlagAutoMigrateTablePanel
+	// Migrate old table panel to supported table panel - broken out from autoMigrateOldPanels to enable granular tracking
+	FlagAutoMigrateTablePanel = "autoMigrateTablePanel"
+
+	// FlagAutoMigratePiechartPanel
+	// Migrate old piechart panel to supported piechart panel - broken out from autoMigrateOldPanels to enable granular tracking
+	FlagAutoMigratePiechartPanel = "autoMigratePiechartPanel"
+
+	// FlagAutoMigrateWorldmapPanel
+	// Migrate old worldmap panel to supported geomap panel - broken out from autoMigrateOldPanels to enable granular tracking
+	FlagAutoMigrateWorldmapPanel = "autoMigrateWorldmapPanel"
+
+	// FlagAutoMigrateStatPanel
+	// Migrate old stat panel to supported stat panel - broken out from autoMigrateOldPanels to enable granular tracking
+	FlagAutoMigrateStatPanel = "autoMigrateStatPanel"
+
+	// FlagAutoMigrateXYChartPanel
+	// Migrate old XYChart panel to new XYChart2 model
+	FlagAutoMigrateXYChartPanel = "autoMigrateXYChartPanel"
+
 	// FlagDisableAngular
 	// Dynamic flag to disable angular at runtime. The preferred method is to set `angular_support_enabled` to `false` in the [security] settings, which allows you to change the state at runtime.
 	FlagDisableAngular = "disableAngular"
@@ -83,6 +95,10 @@ const (
 	// Allow elements nesting
 	FlagCanvasPanelNesting = "canvasPanelNesting"
 
+	// FlagNewVizTooltips
+	// New visualizations tooltips UX
+	FlagNewVizTooltips = "newVizTooltips"
+
 	// FlagScenes
 	// Experimental framework to build interactive dashboards
 	FlagScenes = "scenes"
@@ -95,42 +111,26 @@ const (
 	// Logs the path for requests that are instrumented as unknown
 	FlagLogRequestsInstrumentedAsUnknown = "logRequestsInstrumentedAsUnknown"
 
-	// FlagDataConnectionsConsole
-	// Enables a new top-level page called Connections. This page is an experiment that provides a better experience when you install and configure data sources and other plugins.
-	FlagDataConnectionsConsole = "dataConnectionsConsole"
-
 	// FlagTopnav
 	// Enables topnav support in external plugins. The new Grafana navigation cannot be disabled.
 	FlagTopnav = "topnav"
 
-	// FlagDockedMegaMenu
-	// Enable support for a persistent (docked) navigation menu
-	FlagDockedMegaMenu = "dockedMegaMenu"
+	// FlagReturnToPrevious
+	// Enables the return to previous context functionality
+	FlagReturnToPrevious = "returnToPrevious"
 
 	// FlagGrpcServer
 	// Run the GRPC server
 	FlagGrpcServer = "grpcServer"
 
-	// FlagEntityStore
-	// SQL-based entity store (requires storage flag also)
-	FlagEntityStore = "entityStore"
+	// FlagUnifiedStorage
+	// SQL-based k8s storage
+	FlagUnifiedStorage = "unifiedStorage"
 
 	// FlagCloudWatchCrossAccountQuerying
 	// Enables cross-account querying in CloudWatch datasources
 	FlagCloudWatchCrossAccountQuerying = "cloudWatchCrossAccountQuerying"
 
-	// FlagRedshiftAsyncQueryDataSupport
-	// Enable async query data support for Redshift
-	FlagRedshiftAsyncQueryDataSupport = "redshiftAsyncQueryDataSupport"
-
-	// FlagAthenaAsyncQueryDataSupport
-	// Enable async query data support for Athena
-	FlagAthenaAsyncQueryDataSupport = "athenaAsyncQueryDataSupport"
-
-	// FlagCloudwatchNewRegionsHandler
-	// Refactor of /regions endpoint, no user-facing changes
-	FlagCloudwatchNewRegionsHandler = "cloudwatchNewRegionsHandler"
-
 	// FlagShowDashboardValidationWarnings
 	// Show warnings when dashboards do not validate against the schema
 	FlagShowDashboardValidationWarnings = "showDashboardValidationWarnings"
@@ -151,18 +151,6 @@ const (
 	// Enables the new folder picker to work with nested folders. Requires the nestedFolders feature toggle
 	FlagNestedFolderPicker = "nestedFolderPicker"
 
-	// FlagAccessTokenExpirationCheck
-	// Enable OAuth access_token expiration check and token refresh using the refresh_token
-	FlagAccessTokenExpirationCheck = "accessTokenExpirationCheck"
-
-	// FlagEmptyDashboardPage
-	// Enable the redesigned user interface of a dashboard page that includes no panels
-	FlagEmptyDashboardPage = "emptyDashboardPage"
-
-	// FlagDisablePrometheusExemplarSampling
-	// Disable Prometheus exemplar sampling
-	FlagDisablePrometheusExemplarSampling = "disablePrometheusExemplarSampling"
-
 	// FlagAlertingBacktesting
 	// Rule backtesting API for alerting
 	FlagAlertingBacktesting = "alertingBacktesting"
@@ -191,10 +179,6 @@ const (
 	// Support overriding cookie preferences per user
 	FlagIndividualCookiePreferences = "individualCookiePreferences"
 
-	// FlagGcomOnlyExternalOrgRoleSync
-	// Prohibits a user from changing organization roles synced with Grafana Cloud auth provider
-	FlagGcomOnlyExternalOrgRoleSync = "gcomOnlyExternalOrgRoleSync"
-
 	// FlagPrometheusMetricEncyclopedia
 	// Adds the metrics explorer component to the Prometheus query builder as an option in metric select
 	FlagPrometheusMetricEncyclopedia = "prometheusMetricEncyclopedia"
@@ -203,9 +187,13 @@ const (
 	// Query InfluxDB InfluxQL without the proxy
 	FlagInfluxdbBackendMigration = "influxdbBackendMigration"
 
-	// FlagClientTokenRotation
-	// Replaces the current in-request token rotation so that the client initiates the rotation
-	FlagClientTokenRotation = "clientTokenRotation"
+	// FlagInfluxqlStreamingParser
+	// Enable streaming JSON parser for InfluxDB datasource InfluxQL query language
+	FlagInfluxqlStreamingParser = "influxqlStreamingParser"
+
+	// FlagInfluxdbRunQueriesInParallel
+	// Enables running InfluxDB Influxql queries in parallel
+	FlagInfluxdbRunQueriesInParallel = "influxdbRunQueriesInParallel"
 
 	// FlagPrometheusDataplane
 	// Changes responses to from Prometheus to be compliant with the dataplane specification. In particular, when this feature toggle is active, the numeric `Field.Name` is set from &#39;Value&#39; to the value of the `__name__` label.
@@ -231,10 +219,6 @@ const (
 	// Enable Grafana to write alert state history to an external Loki instance in addition to Grafana annotations.
 	FlagAlertStateHistoryLokiSecondary = "alertStateHistoryLokiSecondary"
 
-	// FlagAlertingNotificationsPoliciesMatchingInstances
-	// Enables the preview of matching instances for notification policies
-	FlagAlertingNotificationsPoliciesMatchingInstances = "alertingNotificationsPoliciesMatchingInstances"
-
 	// FlagAlertStateHistoryLokiPrimary
 	// Enable a remote Loki instance as the primary source for state history reads.
 	FlagAlertStateHistoryLokiPrimary = "alertStateHistoryLokiPrimary"
@@ -251,26 +235,14 @@ const (
 	// Uses JWT-based auth for rendering instead of relying on remote cache
 	FlagRenderAuthJWT = "renderAuthJWT"
 
-	// FlagExternalServiceAuth
-	// Starts an OAuth2 authentication provider for external services
-	FlagExternalServiceAuth = "externalServiceAuth"
-
 	// FlagRefactorVariablesTimeRange
 	// Refactor time range variables flow to reduce number of API calls made when query variables are chained
 	FlagRefactorVariablesTimeRange = "refactorVariablesTimeRange"
 
-	// FlagUseCachingService
-	// When active, the new query and resource caching implementation using a wire service inject replaces the previous middleware implementation.
-	FlagUseCachingService = "useCachingService"
-
 	// FlagEnableElasticsearchBackendQuerying
 	// Enable the processing of queries and responses in the Elasticsearch data source through backend
 	FlagEnableElasticsearchBackendQuerying = "enableElasticsearchBackendQuerying"
 
-	// FlagAdvancedDataSourcePicker
-	// Enable a new data source picker with contextual information, recently used order and advanced mode
-	FlagAdvancedDataSourcePicker = "advancedDataSourcePicker"
-
 	// FlagFaroDatasourceSelector
 	// Enable the data source selector within the Frontend Apps section of the Frontend Observability
 	FlagFaroDatasourceSelector = "faroDatasourceSelector"
@@ -279,10 +251,6 @@ const (
 	// Enables the edit functionality in the datagrid panel
 	FlagEnableDatagridEditing = "enableDatagridEditing"
 
-	// FlagDataSourcePageHeader
-	// Apply new pageHeader UI in data source edit page
-	FlagDataSourcePageHeader = "dataSourcePageHeader"
-
 	// FlagExtraThemes
 	// Enables extra themes
 	FlagExtraThemes = "extraThemes"
@@ -311,14 +279,6 @@ const (
 	// Enables the ability to format Loki queries
 	FlagLokiFormatQuery = "lokiFormatQuery"
 
-	// FlagCloudWatchLogsMonacoEditor
-	// Enables the Monaco editor for CloudWatch Logs queries
-	FlagCloudWatchLogsMonacoEditor = "cloudWatchLogsMonacoEditor"
-
-	// FlagExploreScrollableLogsContainer
-	// Improves the scrolling behavior of logs in Explore
-	FlagExploreScrollableLogsContainer = "exploreScrollableLogsContainer"
-
 	// FlagRecordedQueriesMulti
 	// Enables writing multiple items from a single query within Recorded Queries
 	FlagRecordedQueriesMulti = "recordedQueriesMulti"
@@ -347,10 +307,6 @@ const (
 	// Enables the transformations redesign
 	FlagTransformationsRedesign = "transformationsRedesign"
 
-	// FlagToggleLabelsInLogsUI
-	// Enable toggleable filters in log details view
-	FlagToggleLabelsInLogsUI = "toggleLabelsInLogsUI"
-
 	// FlagMlExpressions
 	// Enable support for Machine Learning in server-side expressions
 	FlagMlExpressions = "mlExpressions"
@@ -363,30 +319,22 @@ const (
 	// Enables metrics summary queries in the Tempo data source
 	FlagMetricsSummary = "metricsSummary"
 
-	// FlagGrafanaAPIServer
-	// Enable Kubernetes API Server for Grafana resources
-	FlagGrafanaAPIServer = "grafanaAPIServer"
-
 	// FlagGrafanaAPIServerWithExperimentalAPIs
 	// Register experimental APIs with the k8s API server
 	FlagGrafanaAPIServerWithExperimentalAPIs = "grafanaAPIServerWithExperimentalAPIs"
 
+	// FlagGrafanaAPIServerEnsureKubectlAccess
+	// Start an additional https handler and write kubectl options
+	FlagGrafanaAPIServerEnsureKubectlAccess = "grafanaAPIServerEnsureKubectlAccess"
+
 	// FlagFeatureToggleAdminPage
 	// Enable admin page for managing feature toggles from the Grafana front-end
 	FlagFeatureToggleAdminPage = "featureToggleAdminPage"
 
 	// FlagAwsAsyncQueryCaching
-	// Enable caching for async queries for Redshift and Athena. Requires that the `useCachingService` feature toggle is enabled and the datasource has caching and async query support enabled
+	// Enable caching for async queries for Redshift and Athena. Requires that the datasource has caching and async query support enabled
 	FlagAwsAsyncQueryCaching = "awsAsyncQueryCaching"
 
-	// FlagSplitScopes
-	// Support faster dashboard and folder search by splitting permission scopes into parts
-	FlagSplitScopes = "splitScopes"
-
-	// FlagAzureMonitorDataplane
-	// Adds dataplane compliant frame metadata in the Azure Monitor datasource
-	FlagAzureMonitorDataplane = "azureMonitorDataplane"
-
 	// FlagPermissionsFilterRemoveSubquery
 	// Alternative permission filter implementation that does not use subqueries for fetching the dashboard folder
 	FlagPermissionsFilterRemoveSubquery = "permissionsFilterRemoveSubquery"
@@ -408,29 +356,25 @@ const (
 	FlagAlertingNoDataErrorExecution = "alertingNoDataErrorExecution"
 
 	// FlagAngularDeprecationUI
-	// Display new Angular deprecation-related UI features
+	// Display Angular warnings in dashboards and panels
 	FlagAngularDeprecationUI = "angularDeprecationUI"
 
 	// FlagDashgpt
 	// Enable AI powered features in dashboards
 	FlagDashgpt = "dashgpt"
 
+	// FlagAiGeneratedDashboardChanges
+	// Enable AI powered features for dashboards to auto-summary changes when saving
+	FlagAiGeneratedDashboardChanges = "aiGeneratedDashboardChanges"
+
 	// FlagReportingRetries
 	// Enables rendering retries for the reporting feature
 	FlagReportingRetries = "reportingRetries"
 
-	// FlagNewBrowseDashboards
-	// New browse/manage dashboards UI
-	FlagNewBrowseDashboards = "newBrowseDashboards"
-
 	// FlagSseGroupByDatasource
-	// Send query to the same datasource in a single request when using server side expressions
+	// Send query to the same datasource in a single request when using server side expressions. The `cloudWatchBatchQueries` feature toggle should be enabled if this used with CloudWatch.
 	FlagSseGroupByDatasource = "sseGroupByDatasource"
 
-	// FlagRequestInstrumentationStatusSource
-	// Include a status source label for request metrics and logs
-	FlagRequestInstrumentationStatusSource = "requestInstrumentationStatusSource"
-
 	// FlagLibraryPanelRBAC
 	// Enables RBAC support for library panels
 	FlagLibraryPanelRBAC = "libraryPanelRBAC"
@@ -447,10 +391,6 @@ const (
 	// Show the new alerting insights landing page
 	FlagAlertingInsights = "alertingInsights"
 
-	// FlagAlertingContactPointsV2
-	// Show the new contacpoints list view
-	FlagAlertingContactPointsV2 = "alertingContactPointsV2"
-
 	// FlagExternalCorePlugins
 	// Allow core plugins to be loaded as external
 	FlagExternalCorePlugins = "externalCorePlugins"
@@ -459,18 +399,10 @@ const (
 	// Sends metrics of public grafana packages usage by plugins
 	FlagPluginsAPIMetrics = "pluginsAPIMetrics"
 
-	// FlagHttpSLOLevels
-	// Adds SLO level to http request metrics
-	FlagHttpSLOLevels = "httpSLOLevels"
-
 	// FlagIdForwarding
 	// Generate signed id token for identity that can be forwarded to plugins and external services
 	FlagIdForwarding = "idForwarding"
 
-	// FlagCloudWatchWildCardDimensionValues
-	// Fetches dimension values from CloudWatch to correctly label wildcard dimensions
-	FlagCloudWatchWildCardDimensionValues = "cloudWatchWildCardDimensionValues"
-
 	// FlagExternalServiceAccounts
 	// Automatic service account and token setup for plugins
 	FlagExternalServiceAccounts = "externalServiceAccounts"
@@ -492,23 +424,31 @@ const (
 	FlagTransformationsVariableSupport = "transformationsVariableSupport"
 
 	// FlagKubernetesPlaylists
-	// Use the kubernetes API in the frontend for playlists
+	// Use the kubernetes API in the frontend for playlists, and route /api/playlist requests to k8s
 	FlagKubernetesPlaylists = "kubernetesPlaylists"
 
+	// FlagKubernetesSnapshots
+	// Routes snapshot requests from /api to the /apis endpoint
+	FlagKubernetesSnapshots = "kubernetesSnapshots"
+
+	// FlagKubernetesQueryServiceRewrite
+	// Rewrite requests targeting /ds/query to the query service
+	FlagKubernetesQueryServiceRewrite = "kubernetesQueryServiceRewrite"
+
 	// FlagCloudWatchBatchQueries
 	// Runs CloudWatch metrics queries as separate batches
 	FlagCloudWatchBatchQueries = "cloudWatchBatchQueries"
 
-	// FlagNavAdminSubsections
-	// Splits the administration section of the nav tree into subsections
-	FlagNavAdminSubsections = "navAdminSubsections"
-
 	// FlagRecoveryThreshold
 	// Enables feature recovery threshold (aka hysteresis) for threshold server-side expression
 	FlagRecoveryThreshold = "recoveryThreshold"
 
+	// FlagLokiStructuredMetadata
+	// Enables the loki data source to request structured metadata from the Loki server
+	FlagLokiStructuredMetadata = "lokiStructuredMetadata"
+
 	// FlagTeamHttpHeaders
-	// Enables datasources to apply team headers to the client requests
+	// Enables Team LBAC for datasources to apply team headers to the client requests
 	FlagTeamHttpHeaders = "teamHttpHeaders"
 
 	// FlagAwsDatasourcesNewFormStyling
@@ -523,14 +463,6 @@ const (
 	// Enable searching for dashboards using panel title in search v1
 	FlagPanelTitleSearchInV1 = "panelTitleSearchInV1"
 
-	// FlagPluginsInstrumentationStatusSource
-	// Include a status source label for plugin request metrics and logs
-	FlagPluginsInstrumentationStatusSource = "pluginsInstrumentationStatusSource"
-
-	// FlagCostManagementUi
-	// Toggles the display of the cost management ui plugin
-	FlagCostManagementUi = "costManagementUi"
-
 	// FlagManagedPluginsInstall
 	// Install managed plugins directly from plugins catalog
 	FlagManagedPluginsInstall = "managedPluginsInstall"
@@ -538,4 +470,176 @@ const (
 	// FlagPrometheusPromQAIL
 	// Prometheus and AI/ML to assist users in creating a query
 	FlagPrometheusPromQAIL = "prometheusPromQAIL"
+
+	// FlagAddFieldFromCalculationStatFunctions
+	// Add cumulative and window functions to the add field from calculation transformation
+	FlagAddFieldFromCalculationStatFunctions = "addFieldFromCalculationStatFunctions"
+
+	// FlagAlertmanagerRemoteSecondary
+	// Enable Grafana to sync configuration and state with a remote Alertmanager.
+	FlagAlertmanagerRemoteSecondary = "alertmanagerRemoteSecondary"
+
+	// FlagAlertmanagerRemotePrimary
+	// Enable Grafana to have a remote Alertmanager instance as the primary Alertmanager.
+	FlagAlertmanagerRemotePrimary = "alertmanagerRemotePrimary"
+
+	// FlagAlertmanagerRemoteOnly
+	// Disable the internal Alertmanager and only use the external one defined.
+	FlagAlertmanagerRemoteOnly = "alertmanagerRemoteOnly"
+
+	// FlagAnnotationPermissionUpdate
+	// Change the way annotation permissions work by scoping them to folders and dashboards.
+	FlagAnnotationPermissionUpdate = "annotationPermissionUpdate"
+
+	// FlagExtractFieldsNameDeduplication
+	// Make sure extracted field names are unique in the dataframe
+	FlagExtractFieldsNameDeduplication = "extractFieldsNameDeduplication"
+
+	// FlagDashboardSceneForViewers
+	// Enables dashboard rendering using Scenes for viewer roles
+	FlagDashboardSceneForViewers = "dashboardSceneForViewers"
+
+	// FlagDashboardSceneSolo
+	// Enables rendering dashboards using scenes for solo panels
+	FlagDashboardSceneSolo = "dashboardSceneSolo"
+
+	// FlagDashboardScene
+	// Enables dashboard rendering using scenes for all roles
+	FlagDashboardScene = "dashboardScene"
+
+	// FlagPanelFilterVariable
+	// Enables use of the `systemPanelFilterVar` variable to filter panels in a dashboard
+	FlagPanelFilterVariable = "panelFilterVariable"
+
+	// FlagPdfTables
+	// Enables generating table data as PDF in reporting
+	FlagPdfTables = "pdfTables"
+
+	// FlagSsoSettingsApi
+	// Enables the SSO settings API and the OAuth configuration UIs in Grafana
+	FlagSsoSettingsApi = "ssoSettingsApi"
+
+	// FlagCanvasPanelPanZoom
+	// Allow pan and zoom in canvas panel
+	FlagCanvasPanelPanZoom = "canvasPanelPanZoom"
+
+	// FlagLogsInfiniteScrolling
+	// Enables infinite scrolling for the Logs panel in Explore and Dashboards
+	FlagLogsInfiniteScrolling = "logsInfiniteScrolling"
+
+	// FlagFlameGraphItemCollapsing
+	// Allow collapsing of flame graph items
+	FlagFlameGraphItemCollapsing = "flameGraphItemCollapsing"
+
+	// FlagExploreMetrics
+	// Enables the new Explore Metrics core app
+	FlagExploreMetrics = "exploreMetrics"
+
+	// FlagAlertingSimplifiedRouting
+	// Enables users to easily configure alert notifications by specifying a contact point directly when editing or creating an alert rule
+	FlagAlertingSimplifiedRouting = "alertingSimplifiedRouting"
+
+	// FlagLogRowsPopoverMenu
+	// Enable filtering menu displayed when text of a log line is selected
+	FlagLogRowsPopoverMenu = "logRowsPopoverMenu"
+
+	// FlagPluginsSkipHostEnvVars
+	// Disables passing host environment variable to plugin processes
+	FlagPluginsSkipHostEnvVars = "pluginsSkipHostEnvVars"
+
+	// FlagTableSharedCrosshair
+	// Enables shared crosshair in table panel
+	FlagTableSharedCrosshair = "tableSharedCrosshair"
+
+	// FlagRegressionTransformation
+	// Enables regression analysis transformation
+	FlagRegressionTransformation = "regressionTransformation"
+
+	// FlagLokiQueryHints
+	// Enables query hints for Loki
+	FlagLokiQueryHints = "lokiQueryHints"
+
+	// FlagKubernetesFeatureToggles
+	// Use the kubernetes API for feature toggle management in the frontend
+	FlagKubernetesFeatureToggles = "kubernetesFeatureToggles"
+
+	// FlagEnablePluginsTracingByDefault
+	// Enable plugin tracing for all external plugins
+	FlagEnablePluginsTracingByDefault = "enablePluginsTracingByDefault"
+
+	// FlagCloudRBACRoles
+	// Enabled grafana cloud specific RBAC roles
+	FlagCloudRBACRoles = "cloudRBACRoles"
+
+	// FlagAlertingQueryOptimization
+	// Optimizes eligible queries in order to reduce load on datasources
+	FlagAlertingQueryOptimization = "alertingQueryOptimization"
+
+	// FlagNewFolderPicker
+	// Enables the nested folder picker without having nested folders enabled
+	FlagNewFolderPicker = "newFolderPicker"
+
+	// FlagJitterAlertRulesWithinGroups
+	// Distributes alert rule evaluations more evenly over time, including spreading out rules within the same group
+	FlagJitterAlertRulesWithinGroups = "jitterAlertRulesWithinGroups"
+
+	// FlagOnPremToCloudMigrations
+	// In-development feature that will allow users to easily migrate their on-prem Grafana instances to Grafana Cloud.
+	FlagOnPremToCloudMigrations = "onPremToCloudMigrations"
+
+	// FlagAlertingSaveStatePeriodic
+	// Writes the state periodically to the database, asynchronous to rule evaluation
+	FlagAlertingSaveStatePeriodic = "alertingSaveStatePeriodic"
+
+	// FlagPromQLScope
+	// In-development feature that will allow injection of labels into prometheus queries.
+	FlagPromQLScope = "promQLScope"
+
+	// FlagSqlExpressions
+	// Enables using SQL and DuckDB functions as Expressions.
+	FlagSqlExpressions = "sqlExpressions"
+
+	// FlagNodeGraphDotLayout
+	// Changed the layout algorithm for the node graph
+	FlagNodeGraphDotLayout = "nodeGraphDotLayout"
+
+	// FlagGroupToNestedTableTransformation
+	// Enables the group to nested table transformation
+	FlagGroupToNestedTableTransformation = "groupToNestedTableTransformation"
+
+	// FlagNewPDFRendering
+	// New implementation for the dashboard-to-PDF rendering
+	FlagNewPDFRendering = "newPDFRendering"
+
+	// FlagKubernetesAggregator
+	// Enable grafana aggregator
+	FlagKubernetesAggregator = "kubernetesAggregator"
+
+	// FlagExpressionParser
+	// Enable new expression parser
+	FlagExpressionParser = "expressionParser"
+
+	// FlagGroupByVariable
+	// Enable groupBy variable support in scenes dashboards
+	FlagGroupByVariable = "groupByVariable"
+
+	// FlagBetterPageScrolling
+	// Removes CustomScrollbar from the UI, relying on native browser scrollbars
+	FlagBetterPageScrolling = "betterPageScrolling"
+
+	// FlagScopeFilters
+	// Enables the use of scope filters in Grafana
+	FlagScopeFilters = "scopeFilters"
+
+	// FlagSsoSettingsSAML
+	// Use the new SSO Settings API to configure the SAML connector
+	FlagSsoSettingsSAML = "ssoSettingsSAML"
+
+	// FlagUsePrometheusFrontendPackage
+	// Use the @grafana/prometheus frontend package in core Prometheus.
+	FlagUsePrometheusFrontendPackage = "usePrometheusFrontendPackage"
+
+	// FlagOauthRequireSubClaim
+	// Require that sub claims is present in oauth tokens.
+	FlagOauthRequireSubClaim = "oauthRequireSubClaim"
 )
diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json
new file mode 100644
index 0000000000000..2f132630d10fa
--- /dev/null
+++ b/pkg/services/featuremgmt/toggles_gen.json
@@ -0,0 +1,2057 @@
+{
+  "kind": "FeatureList",
+  "apiVersion": "featuretoggle.grafana.app/v0alpha1",
+  "metadata": {},
+  "items": [
+    {
+      "metadata": {
+        "name": "renderAuthJWT",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Uses JWT-based auth for rendering instead of relying on remote cache",
+        "stage": "preview",
+        "codeowner": "@grafana/grafana-as-code",
+        "hideFromAdminPage": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "grafanaAPIServerEnsureKubectlAccess",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Start an additional https handler and write kubectl options",
+        "stage": "experimental",
+        "codeowner": "@grafana/grafana-app-platform-squad",
+        "requiresDevMode": true,
+        "requiresRestart": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "managedPluginsInstall",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Install managed plugins directly from plugins catalog",
+        "stage": "GA",
+        "codeowner": "@grafana/plugins-platform-backend"
+      }
+    },
+    {
+      "metadata": {
+        "name": "exploreMetrics",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables the new Explore Metrics core app",
+        "stage": "GA",
+        "codeowner": "@grafana/dashboards-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "disableSSEDataplane",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Disables dataplane specific processing in server side expressions.",
+        "stage": "experimental",
+        "codeowner": "@grafana/observability-metrics"
+      }
+    },
+    {
+      "metadata": {
+        "name": "disableSecretsCompatibility",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Disable duplicated secret storage in legacy tables",
+        "stage": "experimental",
+        "codeowner": "@grafana/hosted-grafana-team",
+        "requiresRestart": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "influxqlStreamingParser",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enable streaming JSON parser for InfluxDB datasource InfluxQL query language",
+        "stage": "experimental",
+        "codeowner": "@grafana/observability-metrics"
+      }
+    },
+    {
+      "metadata": {
+        "name": "cachingOptimizeSerializationMemoryUsage",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "If enabled, the caching backend gradually serializes query responses for the cache, comparing against the configured `[caching]max_value_mb` value as it goes. This can can help prevent Grafana from running out of memory while attempting to cache very large query responses.",
+        "stage": "experimental",
+        "codeowner": "@grafana/grafana-operator-experience-squad"
+      }
+    },
+    {
+      "metadata": {
+        "name": "pluginsSkipHostEnvVars",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Disables passing host environment variable to plugin processes",
+        "stage": "experimental",
+        "codeowner": "@grafana/plugins-platform-backend"
+      }
+    },
+    {
+      "metadata": {
+        "name": "regressionTransformation",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables regression analysis transformation",
+        "stage": "preview",
+        "codeowner": "@grafana/dataviz-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "live-service-web-worker",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "This will use a webworker thread to processes events rather than the main thread",
+        "stage": "experimental",
+        "codeowner": "@grafana/grafana-app-platform-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "lokiRunQueriesInParallel",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables running Loki queries in parallel",
+        "stage": "privatePreview",
+        "codeowner": "@grafana/observability-logs"
+      }
+    },
+    {
+      "metadata": {
+        "name": "alertingInsights",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Show the new alerting insights landing page",
+        "stage": "GA",
+        "codeowner": "@grafana/alerting-squad",
+        "frontend": true,
+        "hideFromAdminPage": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "awsDatasourcesTempCredentials",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Support temporary security credentials in AWS plugins for Grafana Cloud customers",
+        "stage": "experimental",
+        "codeowner": "@grafana/aws-datasources"
+      }
+    },
+    {
+      "metadata": {
+        "name": "transformationsRedesign",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables the transformations redesign",
+        "stage": "GA",
+        "codeowner": "@grafana/observability-metrics",
+        "frontend": true,
+        "allowSelfServe": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "kubernetesPlaylists",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Use the kubernetes API in the frontend for playlists, and route /api/playlist requests to k8s",
+        "stage": "experimental",
+        "codeowner": "@grafana/grafana-app-platform-squad",
+        "requiresRestart": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "prometheusPromQAIL",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Prometheus and AI/ML to assist users in creating a query",
+        "stage": "experimental",
+        "codeowner": "@grafana/observability-metrics",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "alertingSimplifiedRouting",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables users to easily configure alert notifications by specifying a contact point directly when editing or creating an alert rule",
+        "stage": "GA",
+        "codeowner": "@grafana/alerting-squad"
+      }
+    },
+    {
+      "metadata": {
+        "name": "betterPageScrolling",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Removes CustomScrollbar from the UI, relying on native browser scrollbars",
+        "stage": "GA",
+        "codeowner": "@grafana/grafana-frontend-platform",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "correlations",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Correlations page",
+        "stage": "GA",
+        "codeowner": "@grafana/explore-squad",
+        "allowSelfServe": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "cloudWatchCrossAccountQuerying",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables cross-account querying in CloudWatch datasources",
+        "stage": "GA",
+        "codeowner": "@grafana/aws-datasources",
+        "allowSelfServe": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "canvasPanelNesting",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Allow elements nesting",
+        "stage": "experimental",
+        "codeowner": "@grafana/dataviz-squad",
+        "frontend": true,
+        "hideFromAdminPage": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "pluginsFrontendSandbox",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables the plugins frontend sandbox",
+        "stage": "experimental",
+        "codeowner": "@grafana/plugins-platform-backend",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "prometheusConfigOverhaulAuth",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Update the Prometheus configuration page with the new auth component",
+        "stage": "GA",
+        "codeowner": "@grafana/observability-metrics"
+      }
+    },
+    {
+      "metadata": {
+        "name": "ssoSettingsApi",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables the SSO settings API and the OAuth configuration UIs in Grafana",
+        "stage": "preview",
+        "codeowner": "@grafana/identity-access-team",
+        "allowSelfServe": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "canvasPanelPanZoom",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Allow pan and zoom in canvas panel",
+        "stage": "preview",
+        "codeowner": "@grafana/dataviz-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "alertingNoNormalState",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Stop maintaining state of alerts that are not firing",
+        "stage": "preview",
+        "codeowner": "@grafana/alerting-squad",
+        "hideFromAdminPage": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "recoveryThreshold",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables feature recovery threshold (aka hysteresis) for threshold server-side expression",
+        "stage": "GA",
+        "codeowner": "@grafana/alerting-squad",
+        "requiresRestart": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "awsDatasourcesNewFormStyling",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Applies new form styling for configuration and query editors in AWS plugins",
+        "stage": "preview",
+        "codeowner": "@grafana/aws-datasources",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "extractFieldsNameDeduplication",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Make sure extracted field names are unique in the dataframe",
+        "stage": "experimental",
+        "codeowner": "@grafana/dataviz-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "pdfTables",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables generating table data as PDF in reporting",
+        "stage": "preview",
+        "codeowner": "@grafana/sharing-squad"
+      }
+    },
+    {
+      "metadata": {
+        "name": "exploreContentOutline",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Content outline sidebar",
+        "stage": "GA",
+        "codeowner": "@grafana/explore-squad",
+        "frontend": true,
+        "allowSelfServe": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "panelTitleSearchInV1",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enable searching for dashboards using panel title in search v1",
+        "stage": "experimental",
+        "codeowner": "@grafana/backend-platform",
+        "requiresDevMode": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "panelMonitoring",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables panel monitoring through logs and measurements",
+        "stage": "GA",
+        "codeowner": "@grafana/dataviz-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "publicDashboardsEmailSharing",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables public dashboard sharing to be restricted to only allowed emails",
+        "stage": "preview",
+        "codeowner": "@grafana/sharing-squad",
+        "hideFromAdminPage": true,
+        "hideFromDocs": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "enableElasticsearchBackendQuerying",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enable the processing of queries and responses in the Elasticsearch data source through backend",
+        "stage": "GA",
+        "codeowner": "@grafana/observability-logs",
+        "allowSelfServe": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "featureToggleAdminPage",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enable admin page for managing feature toggles from the Grafana front-end",
+        "stage": "experimental",
+        "codeowner": "@grafana/grafana-operator-experience-squad",
+        "requiresRestart": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "dashboardSceneSolo",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables rendering dashboards using scenes for solo panels",
+        "stage": "experimental",
+        "codeowner": "@grafana/dashboards-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "cloudRBACRoles",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enabled grafana cloud specific RBAC roles",
+        "stage": "experimental",
+        "codeowner": "@grafana/identity-access-team",
+        "requiresRestart": true,
+        "hideFromDocs": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "groupByVariable",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enable groupBy variable support in scenes dashboards",
+        "stage": "experimental",
+        "codeowner": "@grafana/dashboards-squad",
+        "hideFromAdminPage": true,
+        "hideFromDocs": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "queryOverLive",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Use Grafana Live WebSocket to execute backend queries",
+        "stage": "experimental",
+        "codeowner": "@grafana/grafana-app-platform-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "autoMigrateXYChartPanel",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Migrate old XYChart panel to new XYChart2 model",
+        "stage": "preview",
+        "codeowner": "@grafana/dataviz-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "influxdbRunQueriesInParallel",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables running InfluxDB Influxql queries in parallel",
+        "stage": "privatePreview",
+        "codeowner": "@grafana/observability-metrics"
+      }
+    },
+    {
+      "metadata": {
+        "name": "alertingNoDataErrorExecution",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Changes how Alerting state manager handles execution of NoData/Error",
+        "stage": "GA",
+        "codeowner": "@grafana/alerting-squad",
+        "requiresRestart": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "reportingRetries",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables rendering retries for the reporting feature",
+        "stage": "preview",
+        "codeowner": "@grafana/sharing-squad",
+        "requiresRestart": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "featureHighlights",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Highlight Grafana Enterprise features",
+        "stage": "GA",
+        "codeowner": "@grafana/grafana-as-code",
+        "allowSelfServe": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "pluginsDynamicAngularDetectionPatterns",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables fetching Angular detection patterns for plugins from GCOM and fallback to hardcoded ones",
+        "stage": "GA",
+        "codeowner": "@grafana/plugins-platform-backend"
+      }
+    },
+    {
+      "metadata": {
+        "name": "faroDatasourceSelector",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enable the data source selector within the Frontend Apps section of the Frontend Observability",
+        "stage": "preview",
+        "codeowner": "@grafana/app-o11y",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "refactorVariablesTimeRange",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Refactor time range variables flow to reduce number of API calls made when query variables are chained",
+        "stage": "preview",
+        "codeowner": "@grafana/dashboards-squad",
+        "hideFromAdminPage": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "enableDatagridEditing",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables the edit functionality in the datagrid panel",
+        "stage": "preview",
+        "codeowner": "@grafana/dataviz-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "vizAndWidgetSplit",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Split panels between visualizations and widgets",
+        "stage": "experimental",
+        "codeowner": "@grafana/dashboards-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "libraryPanelRBAC",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables RBAC support for library panels",
+        "stage": "experimental",
+        "codeowner": "@grafana/dashboards-squad",
+        "requiresRestart": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "formatString",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enable format string transformer",
+        "stage": "preview",
+        "codeowner": "@grafana/dataviz-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "disableAngular",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Dynamic flag to disable angular at runtime. The preferred method is to set `angular_support_enabled` to `false` in the [security] settings, which allows you to change the state at runtime.",
+        "stage": "preview",
+        "codeowner": "@grafana/dataviz-squad",
+        "frontend": true,
+        "hideFromAdminPage": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "returnToPrevious",
+        "resourceVersion": "1713870623848",
+        "creationTimestamp": "2024-04-19T16:50:44Z",
+        "annotations": {
+          "grafana.app/updatedTimestamp": "2024-04-23 11:10:23.848446 +0000 UTC"
+        }
+      },
+      "spec": {
+        "description": "Enables the return to previous context functionality",
+        "stage": "GA",
+        "codeowner": "@grafana/grafana-frontend-platform",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "mysqlAnsiQuotes",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Use double quotes to escape keyword in a MySQL query",
+        "stage": "experimental",
+        "codeowner": "@grafana/backend-platform"
+      }
+    },
+    {
+      "metadata": {
+        "name": "alertStateHistoryLokiOnly",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Disable Grafana alerts from emitting annotations when a remote Loki instance is available.",
+        "stage": "experimental",
+        "codeowner": "@grafana/alerting-squad"
+      }
+    },
+    {
+      "metadata": {
+        "name": "externalCorePlugins",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Allow core plugins to be loaded as external",
+        "stage": "experimental",
+        "codeowner": "@grafana/plugins-platform-backend"
+      }
+    },
+    {
+      "metadata": {
+        "name": "alertmanagerRemoteSecondary",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enable Grafana to sync configuration and state with a remote Alertmanager.",
+        "stage": "experimental",
+        "codeowner": "@grafana/alerting-squad"
+      }
+    },
+    {
+      "metadata": {
+        "name": "lokiQueryHints",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables query hints for Loki",
+        "stage": "GA",
+        "codeowner": "@grafana/observability-logs",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "nodeGraphDotLayout",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Changed the layout algorithm for the node graph",
+        "stage": "experimental",
+        "codeowner": "@grafana/observability-traces-and-profiling",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "logRequestsInstrumentedAsUnknown",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Logs the path for requests that are instrumented as unknown",
+        "stage": "experimental",
+        "codeowner": "@grafana/hosted-grafana-team"
+      }
+    },
+    {
+      "metadata": {
+        "name": "newVizTooltips",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "New visualizations tooltips UX",
+        "stage": "preview",
+        "codeowner": "@grafana/dataviz-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "nestedFolders",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enable folder nesting",
+        "stage": "GA",
+        "codeowner": "@grafana/backend-platform"
+      }
+    },
+    {
+      "metadata": {
+        "name": "nestedFolderPicker",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables the new folder picker to work with nested folders. Requires the nestedFolders feature toggle",
+        "stage": "GA",
+        "codeowner": "@grafana/grafana-frontend-platform",
+        "frontend": true,
+        "allowSelfServe": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "logsContextDatasourceUi",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Allow datasource to provide custom UI for context view",
+        "stage": "GA",
+        "codeowner": "@grafana/observability-logs",
+        "frontend": true,
+        "allowSelfServe": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "externalServiceAccounts",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Automatic service account and token setup for plugins",
+        "stage": "preview",
+        "codeowner": "@grafana/identity-access-team",
+        "hideFromAdminPage": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "flameGraphItemCollapsing",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Allow collapsing of flame graph items",
+        "stage": "experimental",
+        "codeowner": "@grafana/observability-traces-and-profiling",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "alertingSaveStatePeriodic",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Writes the state periodically to the database, asynchronous to rule evaluation",
+        "stage": "privatePreview",
+        "codeowner": "@grafana/alerting-squad"
+      }
+    },
+    {
+      "metadata": {
+        "name": "autoMigrateOldPanels",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Migrate old angular panels to supported versions (graph, table-old, worldmap, etc)",
+        "stage": "preview",
+        "codeowner": "@grafana/dataviz-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "scopeFilters",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables the use of scope filters in Grafana",
+        "stage": "experimental",
+        "codeowner": "@grafana/dashboards-squad",
+        "hideFromAdminPage": true,
+        "hideFromDocs": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "lokiFormatQuery",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables the ability to format Loki queries",
+        "stage": "experimental",
+        "codeowner": "@grafana/observability-logs",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "prometheusIncrementalQueryInstrumentation",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Adds RudderStack events to incremental queries",
+        "stage": "experimental",
+        "codeowner": "@grafana/observability-metrics",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "addFieldFromCalculationStatFunctions",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Add cumulative and window functions to the add field from calculation transformation",
+        "stage": "preview",
+        "codeowner": "@grafana/dataviz-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "dashboardSceneForViewers",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables dashboard rendering using Scenes for viewer roles",
+        "stage": "experimental",
+        "codeowner": "@grafana/dashboards-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "jitterAlertRulesWithinGroups",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Distributes alert rule evaluations more evenly over time, including spreading out rules within the same group",
+        "stage": "preview",
+        "codeowner": "@grafana/alerting-squad",
+        "requiresRestart": true,
+        "hideFromDocs": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "alertingBacktesting",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Rule backtesting API for alerting",
+        "stage": "experimental",
+        "codeowner": "@grafana/alerting-squad"
+      }
+    },
+    {
+      "metadata": {
+        "name": "dataplaneFrontendFallback",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Support dataplane contract field name change for transformations and field name matchers where the name is different",
+        "stage": "GA",
+        "codeowner": "@grafana/observability-metrics",
+        "frontend": true,
+        "allowSelfServe": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "mlExpressions",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enable support for Machine Learning in server-side expressions",
+        "stage": "experimental",
+        "codeowner": "@grafana/alerting-squad"
+      }
+    },
+    {
+      "metadata": {
+        "name": "storage",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Configurable storage for dashboards, datasources, and resources",
+        "stage": "experimental",
+        "codeowner": "@grafana/grafana-app-platform-squad"
+      }
+    },
+    {
+      "metadata": {
+        "name": "topnav",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables topnav support in external plugins. The new Grafana navigation cannot be disabled.",
+        "stage": "deprecated",
+        "codeowner": "@grafana/grafana-frontend-platform"
+      }
+    },
+    {
+      "metadata": {
+        "name": "showDashboardValidationWarnings",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Show warnings when dashboards do not validate against the schema",
+        "stage": "experimental",
+        "codeowner": "@grafana/dashboards-squad"
+      }
+    },
+    {
+      "metadata": {
+        "name": "prometheusMetricEncyclopedia",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Adds the metrics explorer component to the Prometheus query builder as an option in metric select",
+        "stage": "GA",
+        "codeowner": "@grafana/observability-metrics",
+        "frontend": true,
+        "allowSelfServe": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "metricsSummary",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables metrics summary queries in the Tempo data source",
+        "stage": "experimental",
+        "codeowner": "@grafana/observability-traces-and-profiling",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "idForwarding",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Generate signed id token for identity that can be forwarded to plugins and external services",
+        "stage": "experimental",
+        "codeowner": "@grafana/identity-access-team"
+      }
+    },
+    {
+      "metadata": {
+        "name": "panelTitleSearch",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Search for dashboards using panel title",
+        "stage": "preview",
+        "codeowner": "@grafana/grafana-app-platform-squad",
+        "hideFromAdminPage": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "pluginsAPIMetrics",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Sends metrics of public grafana packages usage by plugins",
+        "stage": "experimental",
+        "codeowner": "@grafana/plugins-platform-backend",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "panelFilterVariable",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables use of the `systemPanelFilterVar` variable to filter panels in a dashboard",
+        "stage": "experimental",
+        "codeowner": "@grafana/dashboards-squad",
+        "frontend": true,
+        "hideFromDocs": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "sseGroupByDatasource",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Send query to the same datasource in a single request when using server side expressions. The `cloudWatchBatchQueries` feature toggle should be enabled if this used with CloudWatch.",
+        "stage": "experimental",
+        "codeowner": "@grafana/observability-metrics"
+      }
+    },
+    {
+      "metadata": {
+        "name": "grpcServer",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Run the GRPC server",
+        "stage": "preview",
+        "codeowner": "@grafana/grafana-app-platform-squad",
+        "hideFromAdminPage": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "alertStateHistoryLokiPrimary",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enable a remote Loki instance as the primary source for state history reads.",
+        "stage": "experimental",
+        "codeowner": "@grafana/alerting-squad"
+      }
+    },
+    {
+      "metadata": {
+        "name": "logsExploreTableVisualisation",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "A table visualisation for logs in Explore",
+        "stage": "GA",
+        "codeowner": "@grafana/observability-logs",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "kubernetesQueryServiceRewrite",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Rewrite requests targeting /ds/query to the query service",
+        "stage": "experimental",
+        "codeowner": "@grafana/grafana-app-platform-squad",
+        "requiresDevMode": true,
+        "requiresRestart": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "cloudWatchBatchQueries",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Runs CloudWatch metrics queries as separate batches",
+        "stage": "preview",
+        "codeowner": "@grafana/aws-datasources"
+      }
+    },
+    {
+      "metadata": {
+        "name": "kubernetesFeatureToggles",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Use the kubernetes API for feature toggle management in the frontend",
+        "stage": "experimental",
+        "codeowner": "@grafana/grafana-operator-experience-squad",
+        "frontend": true,
+        "hideFromAdminPage": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "publicDashboards",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "[Deprecated] Public dashboards are now enabled by default; to disable them, use the configuration setting. This feature toggle will be removed in the next major version.",
+        "stage": "GA",
+        "codeowner": "@grafana/sharing-squad",
+        "allowSelfServe": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "transformationsVariableSupport",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Allows using variables in transformations",
+        "stage": "preview",
+        "codeowner": "@grafana/dataviz-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "tableSharedCrosshair",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables shared crosshair in table panel",
+        "stage": "experimental",
+        "codeowner": "@grafana/dataviz-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "enableNativeHTTPHistogram",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables native HTTP Histograms",
+        "stage": "experimental",
+        "codeowner": "@grafana/hosted-grafana-team"
+      }
+    },
+    {
+      "metadata": {
+        "name": "lokiExperimentalStreaming",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Support new streaming approach for loki (prototype, needs special loki build)",
+        "stage": "experimental",
+        "codeowner": "@grafana/observability-logs"
+      }
+    },
+    {
+      "metadata": {
+        "name": "datasourceQueryMultiStatus",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Introduce HTTP 207 Multi Status for api/ds/query",
+        "stage": "experimental",
+        "codeowner": "@grafana/plugins-platform-backend"
+      }
+    },
+    {
+      "metadata": {
+        "name": "autoMigrateGraphPanel",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Migrate old graph panel to supported time series panel - broken out from autoMigrateOldPanels to enable granular tracking",
+        "stage": "preview",
+        "codeowner": "@grafana/dataviz-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "autoMigratePiechartPanel",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Migrate old piechart panel to supported piechart panel - broken out from autoMigrateOldPanels to enable granular tracking",
+        "stage": "preview",
+        "codeowner": "@grafana/dataviz-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "accessControlOnCall",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Access control primitives for OnCall",
+        "stage": "preview",
+        "codeowner": "@grafana/identity-access-team",
+        "hideFromAdminPage": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "extraThemes",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables extra themes",
+        "stage": "experimental",
+        "codeowner": "@grafana/grafana-frontend-platform",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "kubernetesSnapshots",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Routes snapshot requests from /api to the /apis endpoint",
+        "stage": "experimental",
+        "codeowner": "@grafana/grafana-app-platform-squad",
+        "requiresRestart": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "publicDashboardsScene",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables public dashboard rendering using scenes",
+        "stage": "experimental",
+        "codeowner": "@grafana/sharing-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "alertingQueryOptimization",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Optimizes eligible queries in order to reduce load on datasources",
+        "stage": "GA",
+        "codeowner": "@grafana/alerting-squad"
+      }
+    },
+    {
+      "metadata": {
+        "name": "newPDFRendering",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "New implementation for the dashboard-to-PDF rendering",
+        "stage": "preview",
+        "codeowner": "@grafana/sharing-squad"
+      }
+    },
+    {
+      "metadata": {
+        "name": "kubernetesAggregator",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enable grafana aggregator",
+        "stage": "experimental",
+        "codeowner": "@grafana/grafana-app-platform-squad",
+        "requiresRestart": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "enablePluginsTracingByDefault",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enable plugin tracing for all external plugins",
+        "stage": "GA",
+        "codeowner": "@grafana/plugins-platform-backend",
+        "requiresRestart": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "individualCookiePreferences",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Support overriding cookie preferences per user",
+        "stage": "experimental",
+        "codeowner": "@grafana/backend-platform"
+      }
+    },
+    {
+      "metadata": {
+        "name": "sqlDatasourceDatabaseSelection",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables previous SQL data source dataset dropdown behavior",
+        "stage": "preview",
+        "codeowner": "@grafana/dataviz-squad",
+        "frontend": true,
+        "hideFromAdminPage": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "configurableSchedulerTick",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enable changing the scheduler base interval via configuration option unified_alerting.scheduler_tick_interval",
+        "stage": "experimental",
+        "codeowner": "@grafana/alerting-squad",
+        "requiresRestart": true,
+        "hideFromDocs": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "angularDeprecationUI",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Display Angular warnings in dashboards and panels",
+        "stage": "GA",
+        "codeowner": "@grafana/plugins-platform-backend",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "dashgpt",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enable AI powered features in dashboards",
+        "stage": "GA",
+        "codeowner": "@grafana/dashboards-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "teamHttpHeaders",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables Team LBAC for datasources to apply team headers to the client requests",
+        "stage": "preview",
+        "codeowner": "@grafana/identity-access-team"
+      }
+    },
+    {
+      "metadata": {
+        "name": "lokiQuerySplittingConfig",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Give users the option to configure split durations for Loki queries",
+        "stage": "experimental",
+        "codeowner": "@grafana/observability-logs",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "influxdbBackendMigration",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Query InfluxDB InfluxQL without the proxy",
+        "stage": "GA",
+        "codeowner": "@grafana/observability-metrics",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "disableEnvelopeEncryption",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Disable envelope encryption (emergency only)",
+        "stage": "GA",
+        "codeowner": "@grafana/grafana-as-code",
+        "hideFromAdminPage": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "alertStateHistoryLokiSecondary",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enable Grafana to write alert state history to an external Loki instance in addition to Grafana annotations.",
+        "stage": "experimental",
+        "codeowner": "@grafana/alerting-squad"
+      }
+    },
+    {
+      "metadata": {
+        "name": "permissionsFilterRemoveSubquery",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Alternative permission filter implementation that does not use subqueries for fetching the dashboard folder",
+        "stage": "experimental",
+        "codeowner": "@grafana/backend-platform"
+      }
+    },
+    {
+      "metadata": {
+        "name": "influxdbSqlSupport",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enable InfluxDB SQL query language support with new querying UI",
+        "stage": "GA",
+        "codeowner": "@grafana/observability-metrics",
+        "requiresRestart": true,
+        "allowSelfServe": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "newFolderPicker",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables the nested folder picker without having nested folders enabled",
+        "stage": "experimental",
+        "codeowner": "@grafana/grafana-frontend-platform",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "autoMigrateStatPanel",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Migrate old stat panel to supported stat panel - broken out from autoMigrateOldPanels to enable granular tracking",
+        "stage": "preview",
+        "codeowner": "@grafana/dataviz-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "lokiPredefinedOperations",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Adds predefined query operations to Loki query editor",
+        "stage": "experimental",
+        "codeowner": "@grafana/observability-logs",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "grafanaAPIServerWithExperimentalAPIs",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Register experimental APIs with the k8s API server",
+        "stage": "experimental",
+        "codeowner": "@grafana/grafana-app-platform-squad",
+        "requiresDevMode": true,
+        "requiresRestart": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "logRowsPopoverMenu",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enable filtering menu displayed when text of a log line is selected",
+        "stage": "GA",
+        "codeowner": "@grafana/observability-logs",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "ssoSettingsSAML",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Use the new SSO Settings API to configure the SAML connector",
+        "stage": "experimental",
+        "codeowner": "@grafana/identity-access-team",
+        "hideFromAdminPage": true,
+        "hideFromDocs": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "scenes",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Experimental framework to build interactive dashboards",
+        "stage": "experimental",
+        "codeowner": "@grafana/dashboards-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "prometheusDataplane",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Changes responses to from Prometheus to be compliant with the dataplane specification. In particular, when this feature toggle is active, the numeric `Field.Name` is set from 'Value' to the value of the `__name__` label.",
+        "stage": "GA",
+        "codeowner": "@grafana/observability-metrics",
+        "allowSelfServe": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "lokiLogsDataplane",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Changes logs responses from Loki to be compliant with the dataplane specification.",
+        "stage": "experimental",
+        "codeowner": "@grafana/observability-logs"
+      }
+    },
+    {
+      "metadata": {
+        "name": "unifiedRequestLog",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Writes error logs to the request logger",
+        "stage": "experimental",
+        "codeowner": "@grafana/backend-platform"
+      }
+    },
+    {
+      "metadata": {
+        "name": "frontendSandboxMonitorOnly",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables monitor only in the plugin frontend sandbox (if enabled)",
+        "stage": "experimental",
+        "codeowner": "@grafana/plugins-platform-backend",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "recordedQueriesMulti",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables writing multiple items from a single query within Recorded Queries",
+        "stage": "GA",
+        "codeowner": "@grafana/observability-metrics"
+      }
+    },
+    {
+      "metadata": {
+        "name": "awsAsyncQueryCaching",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enable caching for async queries for Redshift and Athena. Requires that the datasource has caching and async query support enabled",
+        "stage": "GA",
+        "codeowner": "@grafana/aws-datasources"
+      }
+    },
+    {
+      "metadata": {
+        "name": "annotationPermissionUpdate",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Change the way annotation permissions work by scoping them to folders and dashboards.",
+        "stage": "GA",
+        "codeowner": "@grafana/identity-access-team"
+      }
+    },
+    {
+      "metadata": {
+        "name": "autoMigrateWorldmapPanel",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Migrate old worldmap panel to supported geomap panel - broken out from autoMigrateOldPanels to enable granular tracking",
+        "stage": "preview",
+        "codeowner": "@grafana/dataviz-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "groupToNestedTableTransformation",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables the group to nested table transformation",
+        "stage": "preview",
+        "codeowner": "@grafana/dataviz-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "sqlExpressions",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables using SQL and DuckDB functions as Expressions.",
+        "stage": "experimental",
+        "codeowner": "@grafana/grafana-app-platform-squad"
+      }
+    },
+    {
+      "metadata": {
+        "name": "aiGeneratedDashboardChanges",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enable AI powered features for dashboards to auto-summary changes when saving",
+        "stage": "experimental",
+        "codeowner": "@grafana/dashboards-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "dashboardScene",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables dashboard rendering using scenes for all roles",
+        "stage": "experimental",
+        "codeowner": "@grafana/dashboards-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "traceQLStreaming",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables response streaming of TraceQL queries of the Tempo data source",
+        "stage": "GA",
+        "codeowner": "@grafana/observability-traces-and-profiling",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "wargamesTesting",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Placeholder feature flag for internal testing",
+        "stage": "experimental",
+        "codeowner": "@grafana/hosted-grafana-team"
+      }
+    },
+    {
+      "metadata": {
+        "name": "promQLScope",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "In-development feature that will allow injection of labels into prometheus queries.",
+        "stage": "experimental",
+        "codeowner": "@grafana/observability-metrics"
+      }
+    },
+    {
+      "metadata": {
+        "name": "editPanelCSVDragAndDrop",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables drag and drop for CSV and Excel files",
+        "stage": "experimental",
+        "codeowner": "@grafana/dataviz-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "alertmanagerRemoteOnly",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Disable the internal Alertmanager and only use the external one defined.",
+        "stage": "experimental",
+        "codeowner": "@grafana/alerting-squad"
+      }
+    },
+    {
+      "metadata": {
+        "name": "logsInfiniteScrolling",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables infinite scrolling for the Logs panel in Explore and Dashboards",
+        "stage": "experimental",
+        "codeowner": "@grafana/observability-logs",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "autoMigrateTablePanel",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Migrate old table panel to supported table panel - broken out from autoMigrateOldPanels to enable granular tracking",
+        "stage": "preview",
+        "codeowner": "@grafana/dataviz-squad",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "alertmanagerRemotePrimary",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enable Grafana to have a remote Alertmanager instance as the primary Alertmanager.",
+        "stage": "experimental",
+        "codeowner": "@grafana/alerting-squad"
+      }
+    },
+    {
+      "metadata": {
+        "name": "expressionParser",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enable new expression parser",
+        "stage": "experimental",
+        "codeowner": "@grafana/grafana-app-platform-squad",
+        "requiresRestart": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "usePrometheusFrontendPackage",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Use the @grafana/prometheus frontend package in core Prometheus.",
+        "stage": "experimental",
+        "codeowner": "@grafana/observability-metrics",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "unifiedStorage",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "SQL-based k8s storage",
+        "stage": "experimental",
+        "codeowner": "@grafana/grafana-app-platform-squad",
+        "requiresDevMode": true,
+        "requiresRestart": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "lokiMetricDataplane",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Changes metric responses from Loki to be compliant with the dataplane specification.",
+        "stage": "GA",
+        "codeowner": "@grafana/observability-logs",
+        "allowSelfServe": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "dashboardEmbed",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Allow embedding dashboard for external use in Code editors",
+        "stage": "experimental",
+        "codeowner": "@grafana/grafana-as-code",
+        "frontend": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "lokiStructuredMetadata",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Enables the loki data source to request structured metadata from the Loki server",
+        "stage": "GA",
+        "codeowner": "@grafana/observability-logs"
+      }
+    },
+    {
+      "metadata": {
+        "name": "onPremToCloudMigrations",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "In-development feature that will allow users to easily migrate their on-prem Grafana instances to Grafana Cloud.",
+        "stage": "experimental",
+        "codeowner": "@grafana/grafana-operator-experience-squad"
+      }
+    },
+    {
+      "metadata": {
+        "name": "lokiQuerySplitting",
+        "resourceVersion": "1712686869842",
+        "creationTimestamp": "2024-04-09T18:21:09Z"
+      },
+      "spec": {
+        "description": "Split large interval queries into subqueries with smaller time intervals",
+        "stage": "GA",
+        "codeowner": "@grafana/observability-logs",
+        "frontend": true,
+        "allowSelfServe": true
+      }
+    },
+    {
+      "metadata": {
+        "name": "oauthRequireSubClaim",
+        "resourceVersion": "1711371458317",
+        "creationTimestamp": "2024-03-25T10:50:29Z",
+        "annotations": {
+          "grafana.app/updatedTimestamp": "2024-03-25 12:57:38.317427693 +0000 UTC"
+        }
+      },
+      "spec": {
+        "description": "Require that sub claims is present in oauth tokens.",
+        "stage": "experimental",
+        "codeowner": "@grafana/identity-access-team",
+        "hideFromAdminPage": true,
+        "hideFromDocs": true
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/services/featuremgmt/toggles_gen_test.go b/pkg/services/featuremgmt/toggles_gen_test.go
index 5f7798195e66e..6881e21d07bb0 100644
--- a/pkg/services/featuremgmt/toggles_gen_test.go
+++ b/pkg/services/featuremgmt/toggles_gen_test.go
@@ -3,6 +3,7 @@ package featuremgmt
 import (
 	"bytes"
 	"encoding/csv"
+	"encoding/json"
 	"fmt"
 	"html/template"
 	"log"
@@ -11,24 +12,27 @@ import (
 	"strconv"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/olekukonko/tablewriter"
 	"github.com/stretchr/testify/require"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	featuretoggleapi "github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1"
+	"github.com/grafana/grafana/pkg/services/apiserver/utils"
 	"github.com/grafana/grafana/pkg/services/featuremgmt/strcase"
 )
 
 func TestFeatureToggleFiles(t *testing.T) {
 	legacyNames := map[string]bool{
-		"httpclientprovider_azure_auth": true,
-		"service-accounts":              true,
-		"database_metrics":              true,
-		"live-service-web-worker":       true,
-		"k8s":                           true, // Camel case does not like this one
+		"live-service-web-worker": true,
 	}
 
 	t.Run("check registry constraints", func(t *testing.T) {
+		invalidNames := make([]string, 0)
+
+		// Check that all flags set in code are valid
 		for _, flag := range standardFeatureFlags {
 			if flag.Expression == "true" && !(flag.Stage == FeatureStageGeneralAvailability || flag.Stage == FeatureStageDeprecated) {
 				t.Errorf("only FeatureStageGeneralAvailability or FeatureStageDeprecated features can be enabled by default.  See: %s", flag.Name)
@@ -45,15 +49,108 @@ func TestFeatureToggleFiles(t *testing.T) {
 			if flag.Name != strings.TrimSpace(flag.Name) {
 				t.Errorf("flag Name should not start/end with spaces.  See: %s", flag.Name)
 			}
-		}
-	})
-
-	t.Run("all new features should have an owner", func(t *testing.T) {
-		for _, flag := range standardFeatureFlags {
+			if flag.AllowSelfServe && !(flag.Stage == FeatureStageGeneralAvailability || flag.Stage == FeatureStagePublicPreview || flag.Stage == FeatureStageDeprecated) {
+				t.Errorf("only allow self-serving GA, PublicPreview and Deprecated toggles")
+			}
 			if flag.Owner == "" {
 				t.Errorf("feature %s does not have an owner. please fill the FeatureFlag.Owner property", flag.Name)
 			}
+			// Check camel case names
+			if flag.Name != strcase.ToLowerCamel(flag.Name) && !legacyNames[flag.Name] {
+				invalidNames = append(invalidNames, flag.Name)
+			}
 		}
+
+		// Make sure the names are valid
+		require.Empty(t, invalidNames, "%s feature names should be camel cased", invalidNames)
+		// acronyms can be configured as needed via `ConfigureAcronym` function from `./strcase/camel.go`
+
+		// Now that we know they are valid, update the json database
+		t.Run("update k8s resource list", func(t *testing.T) {
+			created := v1.NewTime(time.Now().UTC())
+			resourceVersion := fmt.Sprintf("%d", created.UnixMilli())
+
+			featuresFile := "toggles_gen.json"
+			current := featuretoggleapi.FeatureList{
+				TypeMeta: v1.TypeMeta{
+					Kind:       "FeatureList",
+					APIVersion: featuretoggleapi.APIVERSION,
+				},
+			}
+			existing := featuretoggleapi.FeatureList{}
+			body, err := os.ReadFile(featuresFile)
+			if err == nil {
+				_ = json.Unmarshal(body, &existing)
+				current.ListMeta = existing.ListMeta
+			}
+
+			lookup := map[string]featuretoggleapi.FeatureSpec{}
+			for _, flag := range standardFeatureFlags {
+				lookup[flag.Name] = featuretoggleapi.FeatureSpec{
+					Description:       flag.Description,
+					Stage:             flag.Stage.String(),
+					Owner:             string(flag.Owner),
+					RequiresDevMode:   flag.RequiresDevMode,
+					FrontendOnly:      flag.FrontendOnly,
+					RequiresRestart:   flag.RequiresRestart,
+					AllowSelfServe:    flag.AllowSelfServe,
+					HideFromAdminPage: flag.HideFromAdminPage,
+					HideFromDocs:      flag.HideFromDocs,
+					// EnabledVersion: ???,
+				}
+
+				// Replace them all
+				// current.Items = append(current.Items, featuretoggleapi.Feature{
+				// 	ObjectMeta: v1.ObjectMeta{
+				// 		Name:              flag.Name,
+				// 		CreationTimestamp: v1.NewTime(flag.Created),
+				// 		ResourceVersion:   fmt.Sprintf("%d", flag.Created.UnixMilli()),
+				// 	},
+				// 	Spec: lookup[flag.Name],
+				// })
+				// current.ListMeta.ResourceVersion = resourceVersion
+			}
+
+			// Check for changes in any existing values
+			for _, item := range existing.Items {
+				v, ok := lookup[item.Name]
+				if ok {
+					delete(lookup, item.Name)
+					a, e1 := json.Marshal(v)
+					b, e2 := json.Marshal(item.Spec)
+					if e1 != nil || e2 != nil || !bytes.Equal(a, b) {
+						item.ResourceVersion = resourceVersion
+						if item.Annotations == nil {
+							item.Annotations = make(map[string]string)
+						}
+						item.Annotations[utils.AnnoKeyUpdatedTimestamp] = created.String()
+						item.Spec = v // the current value
+					}
+				} else if item.DeletionTimestamp == nil {
+					item.DeletionTimestamp = &created
+					fmt.Printf("mark feature as deleted")
+				}
+				current.Items = append(current.Items, item)
+			}
+
+			// New flags not in the existing list
+			for k, v := range lookup {
+				current.Items = append(current.Items, featuretoggleapi.Feature{
+					ObjectMeta: v1.ObjectMeta{
+						Name:              k,
+						CreationTimestamp: created,
+						ResourceVersion:   fmt.Sprintf("%d", created.UnixMilli()),
+					},
+					Spec: v,
+				})
+			}
+
+			out, err := json.MarshalIndent(current, "", "  ")
+			require.NoError(t, err)
+
+			err = os.WriteFile(featuresFile, out, 0644)
+			require.NoError(t, err, "error writing file")
+		})
 	})
 
 	t.Run("verify files", func(t *testing.T) {
@@ -81,22 +178,6 @@ func TestFeatureToggleFiles(t *testing.T) {
 			generateCSV(),
 		)
 	})
-
-	t.Run("check feature naming convention", func(t *testing.T) {
-		invalidNames := make([]string, 0)
-		for _, f := range standardFeatureFlags {
-			if legacyNames[f.Name] {
-				continue
-			}
-
-			if f.Name != strcase.ToLowerCamel(f.Name) {
-				invalidNames = append(invalidNames, f.Name)
-			}
-		}
-
-		require.Empty(t, invalidNames, "%s feature names should be camel cased", invalidNames)
-		// acronyms can be configured as needed via `ConfigureAcronym` function from `./strcase/camel.go`
-	})
 }
 
 func verifyAndGenerateFile(t *testing.T, fpath string, gen string) {
@@ -213,7 +294,6 @@ func generateCSV() string {
 		"Stage",           //flag.Stage.String(),
 		"Owner",           //string(flag.Owner),
 		"requiresDevMode", //strconv.FormatBool(flag.RequiresDevMode),
-		"RequiresLicense", //strconv.FormatBool(flag.RequiresLicense),
 		"RequiresRestart", //strconv.FormatBool(flag.RequiresRestart),
 		"FrontendOnly",    //strconv.FormatBool(flag.FrontendOnly),
 	}); err != nil {
@@ -226,7 +306,6 @@ func generateCSV() string {
 			flag.Stage.String(),
 			string(flag.Owner),
 			strconv.FormatBool(flag.RequiresDevMode),
-			strconv.FormatBool(flag.RequiresLicense),
 			strconv.FormatBool(flag.RequiresRestart),
 			strconv.FormatBool(flag.FrontendOnly),
 		}); err != nil {
diff --git a/pkg/services/featuremgmt/usage_stats_test.go b/pkg/services/featuremgmt/usage_stats_test.go
index 1496bb055c4d5..a24b86cbef6b6 100644
--- a/pkg/services/featuremgmt/usage_stats_test.go
+++ b/pkg/services/featuremgmt/usage_stats_test.go
@@ -8,8 +8,7 @@ import (
 )
 
 func TestFeatureUsageStats(t *testing.T) {
-	featureManagerWithAllFeatures := WithFeatures(
-		"trimDefaults",
+	featureManagerWithAllFeatures := WithManager(
 		"database_metrics",
 		"live-config",
 		"UPPER_SNAKE_CASE",
@@ -17,7 +16,6 @@ func TestFeatureUsageStats(t *testing.T) {
 	)
 
 	require.Equal(t, map[string]any{
-		"stats.features.trim_defaults.count":      1,
 		"stats.features.database_metrics.count":   1,
 		"stats.features.live_config.count":        1,
 		"stats.features.upper_snake_case.count":   1,
diff --git a/pkg/services/folder/folderimpl/dashboard_folder_store.go b/pkg/services/folder/folderimpl/dashboard_folder_store.go
index 8a98b2adcb779..65ff76e05700c 100644
--- a/pkg/services/folder/folderimpl/dashboard_folder_store.go
+++ b/pkg/services/folder/folderimpl/dashboard_folder_store.go
@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/folder"
 )
@@ -19,16 +20,24 @@ func ProvideDashboardFolderStore(sqlStore db.DB) *DashboardFolderStoreImpl {
 	return &DashboardFolderStoreImpl{store: sqlStore}
 }
 
-func (d *DashboardFolderStoreImpl) GetFolderByTitle(ctx context.Context, orgID int64, title string) (*folder.Folder, error) {
+func (d *DashboardFolderStoreImpl) GetFolderByTitle(ctx context.Context, orgID int64, title string, folderUID *string) (*folder.Folder, error) {
 	if title == "" {
 		return nil, dashboards.ErrFolderTitleEmpty
 	}
 
-	// there is a unique constraint on org_id, folder_id, title
+	// there is a unique constraint on org_id, folder_uid, title
 	// there are no nested folders so the parent folder id is always 0
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Folder).Inc()
+	// nolint:staticcheck
 	dashboard := dashboards.Dashboard{OrgID: orgID, FolderID: 0, Title: title}
 	err := d.store.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		has, err := sess.Table(&dashboards.Dashboard{}).Where("is_folder = " + d.store.GetDialect().BooleanStr(true)).Where("folder_id=0").Get(&dashboard)
+		s := sess.Table(&dashboards.Dashboard{}).Where("is_folder = " + d.store.GetDialect().BooleanStr(true))
+		if folderUID != nil {
+			s = s.Where("folder_uid = ?", *folderUID)
+		} else {
+			s = s.Where("folder_uid IS NULL")
+		}
+		has, err := s.Get(&dashboard)
 		if err != nil {
 			return err
 		}
@@ -43,9 +52,11 @@ func (d *DashboardFolderStoreImpl) GetFolderByTitle(ctx context.Context, orgID i
 }
 
 func (d *DashboardFolderStoreImpl) GetFolderByID(ctx context.Context, orgID int64, id int64) (*folder.Folder, error) {
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Folder).Inc()
+	// nolint:staticcheck
 	dashboard := dashboards.Dashboard{OrgID: orgID, FolderID: 0, ID: id}
 	err := d.store.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		has, err := sess.Table(&dashboards.Dashboard{}).Where("is_folder = " + d.store.GetDialect().BooleanStr(true)).Where("folder_id=0").Get(&dashboard)
+		has, err := sess.Table(&dashboards.Dashboard{}).Where("is_folder = " + d.store.GetDialect().BooleanStr(true)).Get(&dashboard)
 		if err != nil {
 			return err
 		}
@@ -66,10 +77,11 @@ func (d *DashboardFolderStoreImpl) GetFolderByUID(ctx context.Context, orgID int
 	if uid == "" {
 		return nil, dashboards.ErrDashboardIdentifierNotSet
 	}
-
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Folder).Inc()
+	// nolint:staticcheck
 	dashboard := dashboards.Dashboard{OrgID: orgID, FolderID: 0, UID: uid}
 	err := d.store.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		has, err := sess.Table(&dashboards.Dashboard{}).Where("is_folder = " + d.store.GetDialect().BooleanStr(true)).Where("folder_id=0").Get(&dashboard)
+		has, err := sess.Table(&dashboards.Dashboard{}).Where("is_folder = " + d.store.GetDialect().BooleanStr(true)).Get(&dashboard)
 		if err != nil {
 			return err
 		}
@@ -88,28 +100,30 @@ func (d *DashboardFolderStoreImpl) GetFolderByUID(ctx context.Context, orgID int
 
 func (d *DashboardFolderStoreImpl) GetFolders(ctx context.Context, orgID int64, uids []string) (map[string]*folder.Folder, error) {
 	m := make(map[string]*folder.Folder, len(uids))
+	if len(uids) == 0 {
+		return m, nil
+	}
+
 	var folders []*folder.Folder
 	if err := d.store.WithDbSession(ctx, func(sess *db.Session) error {
 		b := strings.Builder{}
 		args := make([]any, 0, len(uids)+1)
 
-		b.WriteString("SELECT * FROM dashboard WHERE org_id=? ")
+		b.WriteString("SELECT * FROM dashboard WHERE org_id=? AND is_folder = " + d.store.GetDialect().BooleanStr(true))
 		args = append(args, orgID)
-		for i, uid := range uids {
-			if i == 0 {
-				b.WriteString("  AND (")
-			}
-
-			if i > 0 {
-				b.WriteString(" OR ")
-			}
-			b.WriteString(" uid=? ")
-			args = append(args, uid)
 
-			if i == len(uids)-1 {
-				b.WriteString(")")
-			}
+		if len(uids) == 1 {
+			b.WriteString(" AND uid=?")
 		}
+
+		if len(uids) > 1 {
+			b.WriteString(" AND uid IN (" + strings.Repeat("?, ", len(uids)-1) + "?)")
+		}
+
+		for _, uid := range uids {
+			args = append(args, uid)
+		}
+
 		return sess.SQL(b.String(), args...).Find(&folders)
 	}); err != nil {
 		return nil, err
diff --git a/pkg/services/folder/folderimpl/dashboard_folder_store_test.go b/pkg/services/folder/folderimpl/dashboard_folder_store_test.go
index fa8c31084ddd9..12d8c65c1b43e 100644
--- a/pkg/services/folder/folderimpl/dashboard_folder_store_test.go
+++ b/pkg/services/folder/folderimpl/dashboard_folder_store_test.go
@@ -4,6 +4,8 @@ import (
 	"context"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/services/dashboards"
@@ -13,9 +15,14 @@ import (
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
 	"github.com/grafana/grafana/pkg/setting"
-	"github.com/stretchr/testify/require"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+// run tests with cleanup
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationDashboardFolderStore(t *testing.T) {
 	var sqlStore *sqlstore.SQLStore
 	var cfg *setting.Cfg
@@ -25,7 +32,7 @@ func TestIntegrationDashboardFolderStore(t *testing.T) {
 		sqlStore, cfg = db.InitTestDBwithCfg(t)
 		quotaService := quotatest.New(false, nil)
 		var err error
-		dashboardStore, err = database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(featuremgmt.FlagPanelTitleSearch), tagimpl.ProvideService(sqlStore, cfg), quotaService)
+		dashboardStore, err = database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(featuremgmt.FlagPanelTitleSearch), tagimpl.ProvideService(sqlStore), quotaService)
 		require.NoError(t, err)
 	}
 	t.Run("Given dashboard and folder with the same title", func(t *testing.T) {
@@ -36,27 +43,35 @@ func TestIntegrationDashboardFolderStore(t *testing.T) {
 		var folder1, folder2 *dashboards.Dashboard
 		sqlStore = db.InitTestDB(t)
 		folderStore := ProvideDashboardFolderStore(sqlStore)
-		folder2 = insertTestFolder(t, dashboardStore, "TEST", orgId, 0, "prod")
+		folder2 = insertTestFolder(t, dashboardStore, "TEST", orgId, "", "prod")
 		_ = insertTestDashboard(t, dashboardStore, title, orgId, folder2.ID, folder2.UID, "prod")
-		folder1 = insertTestFolder(t, dashboardStore, title, orgId, 0, "prod")
+		folder1 = insertTestFolder(t, dashboardStore, title, orgId, "", "prod")
 
 		t.Run("GetFolderByTitle should find the folder", func(t *testing.T) {
-			result, err := folderStore.GetFolderByTitle(context.Background(), orgId, title)
+			result, err := folderStore.GetFolderByTitle(context.Background(), orgId, title, nil)
 			require.NoError(t, err)
-			require.Equal(t, folder1.ID, result.ID)
+			require.Equal(t, folder1.UID, result.UID)
+		})
+
+		t.Run("GetFolderByTitle should find the folder by folderUID", func(t *testing.T) {
+			folder3 := insertTestFolder(t, dashboardStore, title, orgId, folder2.UID, "prod")
+			result, err := folderStore.GetFolderByTitle(context.Background(), orgId, title, &folder2.UID)
+			require.NoError(t, err)
+			require.Equal(t, folder3.UID, result.UID)
 		})
 	})
 
 	t.Run("GetFolderByUID", func(t *testing.T) {
+		setup()
 		var orgId int64 = 1
 		sqlStore := db.InitTestDB(t)
 		folderStore := ProvideDashboardFolderStore(sqlStore)
-		folder := insertTestFolder(t, dashboardStore, "TEST", orgId, 0, "prod")
+		folder := insertTestFolder(t, dashboardStore, "TEST", orgId, "", "prod")
 		dash := insertTestDashboard(t, dashboardStore, "Very Unique Name", orgId, folder.ID, folder.UID, "prod")
 
 		t.Run("should return folder by UID", func(t *testing.T) {
 			d, err := folderStore.GetFolderByUID(context.Background(), orgId, folder.UID)
-			require.Equal(t, folder.ID, d.ID)
+			require.Equal(t, folder.UID, d.UID)
 			require.NoError(t, err)
 		})
 		t.Run("should not find dashboard", func(t *testing.T) {
@@ -72,15 +87,16 @@ func TestIntegrationDashboardFolderStore(t *testing.T) {
 	})
 
 	t.Run("GetFolderByID", func(t *testing.T) {
+		setup()
 		var orgId int64 = 1
 		sqlStore := db.InitTestDB(t)
 		folderStore := ProvideDashboardFolderStore(sqlStore)
-		folder := insertTestFolder(t, dashboardStore, "TEST", orgId, 0, "prod")
+		folder := insertTestFolder(t, dashboardStore, "TEST", orgId, "", "prod")
 		dash := insertTestDashboard(t, dashboardStore, "Very Unique Name", orgId, folder.ID, folder.UID, "prod")
 
 		t.Run("should return folder by ID", func(t *testing.T) {
 			d, err := folderStore.GetFolderByID(context.Background(), orgId, folder.ID)
-			require.Equal(t, folder.ID, d.ID)
+			require.Equal(t, folder.UID, d.UID)
 			require.NoError(t, err)
 		})
 		t.Run("should not find dashboard", func(t *testing.T) {
@@ -96,12 +112,12 @@ func TestIntegrationDashboardFolderStore(t *testing.T) {
 	})
 }
 
-func insertTestDashboard(t *testing.T, dashboardStore dashboards.Store, title string, orgId int64, folderID int64, folderUID string, tags ...any) *dashboards.Dashboard {
+func insertTestDashboard(t *testing.T, dashboardStore dashboards.Store, title string, orgId, folderID int64, folderUID string, tags ...any) *dashboards.Dashboard {
 	t.Helper()
 	cmd := dashboards.SaveDashboardCommand{
 		OrgID:     orgId,
-		FolderID:  folderID,
 		FolderUID: folderUID,
+		FolderID:  folderID, // nolint:staticcheck
 		IsFolder:  false,
 		Dashboard: simplejson.NewFromAny(map[string]any{
 			"id":    nil,
@@ -109,6 +125,9 @@ func insertTestDashboard(t *testing.T, dashboardStore dashboards.Store, title st
 			"tags":  tags,
 		}),
 	}
+	if folderUID != "" {
+		cmd.FolderUID = folderUID
+	}
 	dash, err := dashboardStore.SaveDashboard(context.Background(), cmd)
 	require.NoError(t, err)
 	require.NotNil(t, dash)
@@ -117,11 +136,11 @@ func insertTestDashboard(t *testing.T, dashboardStore dashboards.Store, title st
 	return dash
 }
 
-func insertTestFolder(t *testing.T, dashboardStore dashboards.Store, title string, orgId int64, folderId int64, folderUID string, tags ...any) *dashboards.Dashboard {
+func insertTestFolder(t *testing.T, dashboardStore dashboards.Store, title string, orgId int64, folderUID string, tags ...any) *dashboards.Dashboard {
 	t.Helper()
 	cmd := dashboards.SaveDashboardCommand{
-		OrgID:     orgId,
-		FolderID:  folderId,
+		OrgID: orgId,
+		// FolderID: folderId, // nolint:staticcheck
 		FolderUID: folderUID,
 		IsFolder:  true,
 		Dashboard: simplejson.NewFromAny(map[string]any{
@@ -130,6 +149,9 @@ func insertTestFolder(t *testing.T, dashboardStore dashboards.Store, title strin
 			"tags":  tags,
 		}),
 	}
+	if folderUID != "" {
+		cmd.FolderUID = folderUID
+	}
 	dash, err := dashboardStore.SaveDashboard(context.Background(), cmd)
 	require.NoError(t, err)
 	require.NotNil(t, dash)
diff --git a/pkg/services/folder/folderimpl/folder.go b/pkg/services/folder/folderimpl/folder.go
index 67d38d7fa212c..c7a74ff7d2b9e 100644
--- a/pkg/services/folder/folderimpl/folder.go
+++ b/pkg/services/folder/folderimpl/folder.go
@@ -2,24 +2,35 @@ package folderimpl
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
+	"runtime"
 	"strings"
 	"sync"
+	"time"
+
+	"github.com/grafana/dskit/concurrency"
+	"github.com/prometheus/client_golang/prometheus"
+	"golang.org/x/exp/slices"
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/events"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/guardian"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 	"github.com/grafana/grafana/pkg/services/store/entity"
+	"github.com/grafana/grafana/pkg/services/supportbundles"
+	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
 )
@@ -33,12 +44,12 @@ type Service struct {
 	dashboardFolderStore folder.FolderStore
 	features             featuremgmt.FeatureToggles
 	accessControl        accesscontrol.AccessControl
-
 	// bus is currently used to publish event in case of title change
 	bus bus.Bus
 
 	mutex    sync.RWMutex
 	registry map[string]folder.RegistryService
+	metrics  *foldersMetrics
 }
 
 func ProvideService(
@@ -49,8 +60,10 @@ func ProvideService(
 	folderStore folder.FolderStore,
 	db db.DB, // DB for the (new) nested folder store
 	features featuremgmt.FeatureToggles,
+	supportBundles supportbundles.Service,
+	r prometheus.Registerer,
 ) folder.Service {
-	store := ProvideStore(db, cfg, features)
+	store := ProvideStore(db, cfg)
 	srv := &Service{
 		cfg:                  cfg,
 		log:                  log.New("folder-service"),
@@ -62,9 +75,12 @@ func ProvideService(
 		bus:                  bus,
 		db:                   db,
 		registry:             make(map[string]folder.RegistryService),
+		metrics:              newFoldersMetrics(r),
 	}
 	srv.DBMigration(db)
 
+	supportBundles.RegisterSupportItemCollector(srv.supportBundleCollector())
+
 	ac.RegisterScopeAttributeResolver(dashboards.NewFolderNameScopeResolver(folderStore, srv))
 	ac.RegisterScopeAttributeResolver(dashboards.NewFolderIDScopeResolver(folderStore, srv))
 	ac.RegisterScopeAttributeResolver(dashboards.NewFolderUIDScopeResolver(srv))
@@ -72,22 +88,27 @@ func ProvideService(
 }
 
 func (s *Service) DBMigration(db db.DB) {
+	s.log.Debug("syncing dashboard and folder tables started")
+
 	ctx := context.Background()
 	err := db.WithDbSession(ctx, func(sess *sqlstore.DBSession) error {
 		var err error
 		if db.GetDialect().DriverName() == migrator.SQLite {
+			// covered by UQE_folder_org_id_uid
 			_, err = sess.Exec(`
 				INSERT INTO folder (uid, org_id, title, created, updated)
 				SELECT uid, org_id, title, created, updated FROM dashboard WHERE is_folder = 1
 				ON CONFLICT DO UPDATE SET title=excluded.title, updated=excluded.updated
 			`)
 		} else if db.GetDialect().DriverName() == migrator.Postgres {
+			// covered by UQE_folder_org_id_uid
 			_, err = sess.Exec(`
 				INSERT INTO folder (uid, org_id, title, created, updated)
 				SELECT uid, org_id, title, created, updated FROM dashboard WHERE is_folder = true
 				ON CONFLICT(uid, org_id) DO UPDATE SET title=excluded.title, updated=excluded.updated
 			`)
 		} else {
+			// covered by UQE_folder_org_id_uid
 			_, err = sess.Exec(`
 				INSERT INTO folder (uid, org_id, title, created, updated)
 				SELECT * FROM (SELECT uid, org_id, title, created, updated FROM dashboard WHERE is_folder = 1) AS derived
@@ -97,6 +118,8 @@ func (s *Service) DBMigration(db db.DB) {
 		if err != nil {
 			return err
 		}
+
+		// covered by UQE_folder_org_id_uid
 		_, err = sess.Exec(`
 			DELETE FROM folder WHERE NOT EXISTS
 				(SELECT 1 FROM dashboard WHERE dashboard.uid = folder.uid AND dashboard.org_id = folder.org_id AND dashboard.is_folder = true)
@@ -106,28 +129,92 @@ func (s *Service) DBMigration(db db.DB) {
 	if err != nil {
 		s.log.Error("DB migration on folder service start failed.", "err", err)
 	}
+
+	s.log.Debug("syncing dashboard and folder tables finished")
 }
 
-func (s *Service) Get(ctx context.Context, cmd *folder.GetFolderQuery) (*folder.Folder, error) {
-	if cmd.SignedInUser == nil {
+func (s *Service) GetFolders(ctx context.Context, q folder.GetFoldersQuery) ([]*folder.Folder, error) {
+	if q.SignedInUser == nil {
+		return nil, folder.ErrBadRequest.Errorf("missing signed in user")
+	}
+
+	qry := NewGetFoldersQuery(q)
+	permissions := q.SignedInUser.GetPermissions()
+	folderPermissions := permissions[dashboards.ActionFoldersRead]
+	qry.ancestorUIDs = make([]string, 0, len(folderPermissions))
+	if len(folderPermissions) == 0 && !q.SignedInUser.GetIsGrafanaAdmin() {
+		return nil, nil
+	}
+	for _, p := range folderPermissions {
+		if p == dashboards.ScopeFoldersAll {
+			// no need to query for folders with permissions
+			// the user has permission to access all folders
+			qry.ancestorUIDs = nil
+			break
+		}
+		if folderUid, found := strings.CutPrefix(p, dashboards.ScopeFoldersPrefix); found {
+			if !slices.Contains(qry.ancestorUIDs, folderUid) {
+				qry.ancestorUIDs = append(qry.ancestorUIDs, folderUid)
+			}
+		}
+	}
+
+	if !s.features.IsEnabled(ctx, featuremgmt.FlagNestedFolders) {
+		qry.WithFullpath = false // do not request full path if nested folders are disabled
+		qry.WithFullpathUIDs = false
+	}
+
+	dashFolders, err := s.store.GetFolders(ctx, qry)
+	if err != nil {
+		return nil, folder.ErrInternal.Errorf("failed to fetch subfolders: %w", err)
+	}
+
+	if !s.features.IsEnabled(ctx, featuremgmt.FlagNestedFolders) {
+		if q.WithFullpathUIDs || q.WithFullpath {
+			for _, f := range dashFolders { // and fix the full path with folder title (unescaped)
+				if q.WithFullpath {
+					f.Fullpath = f.Title
+				}
+				if q.WithFullpathUIDs {
+					f.FullpathUIDs = f.UID
+				}
+			}
+		}
+	}
+
+	return dashFolders, nil
+}
+
+func (s *Service) Get(ctx context.Context, q *folder.GetFolderQuery) (*folder.Folder, error) {
+	if q.SignedInUser == nil {
 		return nil, folder.ErrBadRequest.Errorf("missing signed in user")
 	}
 
+	if q.UID != nil && *q.UID == accesscontrol.GeneralFolderUID {
+		return folder.RootFolder, nil
+	}
+
+	if s.features.IsEnabled(ctx, featuremgmt.FlagNestedFolders) && q.UID != nil && *q.UID == folder.SharedWithMeFolderUID {
+		return folder.SharedWithMeFolder.WithURL(), nil
+	}
+
 	var dashFolder *folder.Folder
 	var err error
 	switch {
-	case cmd.UID != nil:
-		dashFolder, err = s.getFolderByUID(ctx, cmd.OrgID, *cmd.UID)
+	case q.UID != nil && *q.UID != "":
+		dashFolder, err = s.getFolderByUID(ctx, q.OrgID, *q.UID)
 		if err != nil {
 			return nil, err
 		}
-	case cmd.ID != nil:
-		dashFolder, err = s.getFolderByID(ctx, *cmd.ID, cmd.OrgID)
+	// nolint:staticcheck
+	case q.ID != nil:
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Folder).Inc()
+		dashFolder, err = s.getFolderByID(ctx, *q.ID, q.OrgID)
 		if err != nil {
 			return nil, err
 		}
-	case cmd.Title != nil:
-		dashFolder, err = s.getFolderByTitle(ctx, cmd.OrgID, *cmd.Title)
+	case q.Title != nil:
+		dashFolder, err = s.getFolderByTitle(ctx, q.OrgID, *q.Title, q.ParentUID)
 		if err != nil {
 			return nil, err
 		}
@@ -142,7 +229,7 @@ func (s *Service) Get(ctx context.Context, cmd *folder.GetFolderQuery) (*folder.
 	// do not get guardian by the folder ID because it differs from the nested folder ID
 	// and the legacy folder ID has been associated with the permissions:
 	// use the folde UID instead that is the same for both
-	g, err := guardian.NewByFolder(ctx, dashFolder, dashFolder.OrgID, cmd.SignedInUser)
+	g, err := guardian.NewByFolder(ctx, dashFolder, dashFolder.OrgID, q.SignedInUser)
 	if err != nil {
 		return nil, err
 	}
@@ -154,49 +241,78 @@ func (s *Service) Get(ctx context.Context, cmd *folder.GetFolderQuery) (*folder.
 		return nil, dashboards.ErrFolderAccessDenied
 	}
 
-	if !s.features.IsEnabled(featuremgmt.FlagNestedFolders) {
+	if !s.features.IsEnabled(ctx, featuremgmt.FlagNestedFolders) {
+		dashFolder.Fullpath = dashFolder.Title
 		return dashFolder, nil
 	}
 
-	if cmd.ID != nil {
-		cmd.ID = nil
-		cmd.UID = &dashFolder.UID
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Folder).Inc()
+	// nolint:staticcheck
+	if q.ID != nil {
+		q.ID = nil
+		q.UID = &dashFolder.UID
 	}
 
-	f, err := s.store.Get(ctx, *cmd)
+	f, err := s.store.Get(ctx, *q)
 	if err != nil {
 		return nil, err
 	}
 
 	// always expose the dashboard store sequential ID
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Folder).Inc()
+	// nolint:staticcheck
 	f.ID = dashFolder.ID
 	f.Version = dashFolder.Version
 
+	if !s.features.IsEnabled(ctx, featuremgmt.FlagNestedFolders) {
+		f.Fullpath = f.Title // set full path to the folder title (unescaped)
+	}
+
 	return f, err
 }
 
-func (s *Service) GetChildren(ctx context.Context, cmd *folder.GetChildrenQuery) ([]*folder.Folder, error) {
-	if cmd.SignedInUser == nil {
+func (s *Service) GetChildren(ctx context.Context, q *folder.GetChildrenQuery) ([]*folder.Folder, error) {
+	defer func(t time.Time) {
+		parent := q.UID
+		if q.UID != folder.SharedWithMeFolderUID {
+			parent = "folder"
+		}
+		s.metrics.foldersGetChildrenRequestsDuration.WithLabelValues(parent).Observe(time.Since(t).Seconds())
+	}(time.Now())
+
+	if q.SignedInUser == nil {
 		return nil, folder.ErrBadRequest.Errorf("missing signed in user")
 	}
 
-	if cmd.UID != "" {
-		g, err := guardian.NewByUID(ctx, cmd.UID, cmd.OrgID, cmd.SignedInUser)
-		if err != nil {
-			return nil, err
-		}
+	if s.features.IsEnabled(ctx, featuremgmt.FlagNestedFolders) && q.UID == folder.SharedWithMeFolderUID {
+		return s.GetSharedWithMe(ctx, q)
+	}
 
-		canView, err := g.CanView()
-		if err != nil {
-			return nil, err
-		}
+	if q.UID == "" {
+		return s.getRootFolders(ctx, q)
+	}
 
-		if !canView {
-			return nil, dashboards.ErrFolderAccessDenied
-		}
+	// we only need to check access to the folder
+	// if the parent is accessible then the subfolders are accessible as well (due to inheritance)
+	g, err := guardian.NewByUID(ctx, q.UID, q.OrgID, q.SignedInUser)
+	if err != nil {
+		return nil, err
+	}
+
+	guardianFunc := g.CanView
+	if q.Permission == dashboardaccess.PERMISSION_EDIT {
+		guardianFunc = g.CanEdit
+	}
+
+	hasAccess, err := guardianFunc()
+	if err != nil {
+		return nil, err
+	}
+	if !hasAccess {
+		return nil, dashboards.ErrFolderAccessDenied
 	}
 
-	children, err := s.store.GetChildren(ctx, *cmd)
+	children, err := s.store.GetChildren(ctx, *q)
 	if err != nil {
 		return nil, err
 	}
@@ -206,12 +322,11 @@ func (s *Service) GetChildren(ctx context.Context, cmd *folder.GetChildrenQuery)
 		childrenUIDs = append(childrenUIDs, f.UID)
 	}
 
-	dashFolders, err := s.dashboardFolderStore.GetFolders(ctx, cmd.OrgID, childrenUIDs)
+	dashFolders, err := s.dashboardFolderStore.GetFolders(ctx, q.OrgID, childrenUIDs)
 	if err != nil {
 		return nil, folder.ErrInternal.Errorf("failed to fetch subfolders from dashboard store: %w", err)
 	}
 
-	filtered := make([]*folder.Folder, 0, len(children))
 	for _, f := range children {
 		// fetch folder from dashboard store
 		dashFolder, ok := dashFolders[f.UID]
@@ -221,35 +336,196 @@ func (s *Service) GetChildren(ctx context.Context, cmd *folder.GetChildrenQuery)
 		}
 
 		// always expose the dashboard store sequential ID
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Folder).Inc()
+		// nolint:staticcheck
 		f.ID = dashFolder.ID
+	}
 
-		if cmd.UID != "" {
-			// parent access has been checked already
-			// the subfolder must be accessible as well (due to inheritance)
-			filtered = append(filtered, f)
-			continue
+	return children, nil
+}
+
+func (s *Service) getRootFolders(ctx context.Context, q *folder.GetChildrenQuery) ([]*folder.Folder, error) {
+	permissions := q.SignedInUser.GetPermissions()
+	var folderPermissions []string
+	if q.Permission == dashboardaccess.PERMISSION_EDIT {
+		folderPermissions = permissions[dashboards.ActionFoldersWrite]
+		folderPermissions = append(folderPermissions, permissions[dashboards.ActionDashboardsWrite]...)
+	} else {
+		folderPermissions = permissions[dashboards.ActionFoldersRead]
+		folderPermissions = append(folderPermissions, permissions[dashboards.ActionDashboardsRead]...)
+	}
+
+	if len(folderPermissions) == 0 && !q.SignedInUser.GetIsGrafanaAdmin() {
+		return nil, nil
+	}
+
+	q.FolderUIDs = make([]string, 0, len(folderPermissions))
+	for _, p := range folderPermissions {
+		if p == dashboards.ScopeFoldersAll {
+			// no need to query for folders with permissions
+			// the user has permission to access all folders
+			q.FolderUIDs = nil
+			break
+		}
+		if folderUid, found := strings.CutPrefix(p, dashboards.ScopeFoldersPrefix); found {
+			if !slices.Contains(q.FolderUIDs, folderUid) {
+				q.FolderUIDs = append(q.FolderUIDs, folderUid)
+			}
 		}
+	}
 
-		g, err := guardian.NewByFolder(ctx, dashFolder, dashFolder.OrgID, cmd.SignedInUser)
-		if err != nil {
-			return nil, err
+	children, err := s.store.GetChildren(ctx, *q)
+	if err != nil {
+		return nil, err
+	}
+
+	childrenUIDs := make([]string, 0, len(children))
+	for _, f := range children {
+		childrenUIDs = append(childrenUIDs, f.UID)
+	}
+
+	dashFolders, err := s.dashboardFolderStore.GetFolders(ctx, q.OrgID, childrenUIDs)
+	if err != nil {
+		return nil, folder.ErrInternal.Errorf("failed to fetch subfolders from dashboard store: %w", err)
+	}
+
+	if err := concurrency.ForEachJob(ctx, len(children), runtime.NumCPU(), func(ctx context.Context, i int) error {
+		f := children[i]
+		// fetch folder from dashboard store
+		dashFolder, ok := dashFolders[f.UID]
+		if !ok {
+			s.log.Error("failed to fetch folder by UID from dashboard store", "orgID", f.OrgID, "uid", f.UID)
 		}
-		canView, err := g.CanView()
-		if err != nil {
-			return nil, err
+		// always expose the dashboard store sequential ID
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Folder).Inc()
+		// nolint:staticcheck
+		f.ID = dashFolder.ID
+
+		return nil
+	}); err != nil {
+		return nil, folder.ErrInternal.Errorf("failed to assign folder sequential ID: %w", err)
+	}
+
+	// add "shared with me" folder on the 1st page
+	if (q.Page == 0 || q.Page == 1) && len(q.FolderUIDs) != 0 {
+		children = append([]*folder.Folder{&folder.SharedWithMeFolder}, children...)
+	}
+
+	return children, nil
+}
+
+// GetSharedWithMe returns folders available to user, which cannot be accessed from the root folders
+func (s *Service) GetSharedWithMe(ctx context.Context, q *folder.GetChildrenQuery) ([]*folder.Folder, error) {
+	start := time.Now()
+	availableNonRootFolders, err := s.getAvailableNonRootFolders(ctx, q)
+	if err != nil {
+		s.metrics.sharedWithMeFetchFoldersRequestsDuration.WithLabelValues("failure").Observe(time.Since(start).Seconds())
+		return nil, folder.ErrInternal.Errorf("failed to fetch subfolders to which the user has explicit access: %w", err)
+	}
+	rootFolders, err := s.GetChildren(ctx, &folder.GetChildrenQuery{UID: "", OrgID: q.OrgID, SignedInUser: q.SignedInUser, Permission: q.Permission})
+	if err != nil {
+		s.metrics.sharedWithMeFetchFoldersRequestsDuration.WithLabelValues("failure").Observe(time.Since(start).Seconds())
+		return nil, folder.ErrInternal.Errorf("failed to fetch root folders to which the user has access: %w", err)
+	}
+
+	availableNonRootFolders = s.deduplicateAvailableFolders(ctx, availableNonRootFolders, rootFolders, q.OrgID)
+	s.metrics.sharedWithMeFetchFoldersRequestsDuration.WithLabelValues("success").Observe(time.Since(start).Seconds())
+	return availableNonRootFolders, nil
+}
+
+func (s *Service) getAvailableNonRootFolders(ctx context.Context, q *folder.GetChildrenQuery) ([]*folder.Folder, error) {
+	permissions := q.SignedInUser.GetPermissions()
+	var folderPermissions []string
+	if q.Permission == dashboardaccess.PERMISSION_EDIT {
+		folderPermissions = permissions[dashboards.ActionFoldersWrite]
+		folderPermissions = append(folderPermissions, permissions[dashboards.ActionDashboardsWrite]...)
+	} else {
+		folderPermissions = permissions[dashboards.ActionFoldersRead]
+		folderPermissions = append(folderPermissions, permissions[dashboards.ActionDashboardsRead]...)
+	}
+
+	if len(folderPermissions) == 0 {
+		return nil, nil
+	}
+
+	nonRootFolders := make([]*folder.Folder, 0)
+	folderUids := make([]string, 0, len(folderPermissions))
+	for _, p := range folderPermissions {
+		if folderUid, found := strings.CutPrefix(p, dashboards.ScopeFoldersPrefix); found {
+			if !slices.Contains(folderUids, folderUid) {
+				folderUids = append(folderUids, folderUid)
+			}
 		}
-		if canView {
-			filtered = append(filtered, f)
+	}
+
+	if len(folderUids) == 0 {
+		return nonRootFolders, nil
+	}
+
+	dashFolders, err := s.GetFolders(ctx, folder.GetFoldersQuery{
+		UIDs:             folderUids,
+		OrgID:            q.OrgID,
+		SignedInUser:     q.SignedInUser,
+		OrderByTitle:     true,
+		WithFullpathUIDs: true,
+	})
+	if err != nil {
+		return nil, folder.ErrInternal.Errorf("failed to fetch subfolders: %w", err)
+	}
+
+	for _, f := range dashFolders {
+		if f.ParentUID != "" {
+			nonRootFolders = append(nonRootFolders, f)
 		}
 	}
 
-	return filtered, nil
+	return nonRootFolders, nil
+}
+
+func (s *Service) deduplicateAvailableFolders(ctx context.Context, folders []*folder.Folder, rootFolders []*folder.Folder, orgID int64) []*folder.Folder {
+	allFolders := append(folders, rootFolders...)
+	foldersDedup := make([]*folder.Folder, 0)
+
+	for _, f := range folders {
+		isSubfolder := slices.ContainsFunc(allFolders, func(folder *folder.Folder) bool {
+			return f.ParentUID == folder.UID
+		})
+
+		if !isSubfolder {
+			// Get parents UIDs
+			parentUIDs := make([]string, 0)
+			pathUIDs := strings.Split(f.FullpathUIDs, "/")
+			for _, p := range pathUIDs {
+				if p != "" && p != f.UID {
+					parentUIDs = append(parentUIDs, p)
+				}
+			}
+
+			for _, parentUID := range parentUIDs {
+				contains := slices.ContainsFunc(allFolders, func(f *folder.Folder) bool {
+					return f.UID == parentUID
+				})
+				if contains {
+					isSubfolder = true
+					break
+				}
+			}
+		}
+
+		if !isSubfolder {
+			foldersDedup = append(foldersDedup, f)
+		}
+	}
+	return foldersDedup
 }
 
 func (s *Service) GetParents(ctx context.Context, q folder.GetParentsQuery) ([]*folder.Folder, error) {
-	if !s.features.IsEnabled(featuremgmt.FlagNestedFolders) {
+	if !s.features.IsEnabled(ctx, featuremgmt.FlagNestedFolders) || q.UID == accesscontrol.GeneralFolderUID {
 		return nil, nil
 	}
+	if q.UID == folder.SharedWithMeFolderUID {
+		return []*folder.Folder{&folder.SharedWithMeFolder}, nil
+	}
 	return s.store.GetParents(ctx, q)
 }
 
@@ -265,8 +541,8 @@ func (s *Service) getFolderByUID(ctx context.Context, orgID int64, uid string) (
 	return s.dashboardFolderStore.GetFolderByUID(ctx, orgID, uid)
 }
 
-func (s *Service) getFolderByTitle(ctx context.Context, orgID int64, title string) (*folder.Folder, error) {
-	return s.dashboardFolderStore.GetFolderByTitle(ctx, orgID, title)
+func (s *Service) getFolderByTitle(ctx context.Context, orgID int64, title string, parentUID *string) (*folder.Folder, error) {
+	return s.dashboardFolderStore.GetFolderByTitle(ctx, orgID, title, parentUID)
 }
 
 func (s *Service) Create(ctx context.Context, cmd *folder.CreateFolderCommand) (*folder.Folder, error) {
@@ -279,7 +555,7 @@ func (s *Service) Create(ctx context.Context, cmd *folder.CreateFolderCommand) (
 	dashFolder := dashboards.NewDashboardFolder(cmd.Title)
 	dashFolder.OrgID = cmd.OrgID
 
-	if s.features.IsEnabled(featuremgmt.FlagNestedFolders) && cmd.ParentUID != "" {
+	if s.features.IsEnabled(ctx, featuremgmt.FlagNestedFolders) && cmd.ParentUID != "" {
 		// Check that the user is allowed to create a subfolder in this folder
 		evaluator := accesscontrol.EvalPermission(dashboards.ActionFoldersWrite, dashboards.ScopeFoldersProvider.GetResourceScopeUID(cmd.ParentUID))
 		hasAccess, evalErr := s.accessControl.Evaluate(ctx, cmd.SignedInUser, evaluator)
@@ -292,6 +568,10 @@ func (s *Service) Create(ctx context.Context, cmd *folder.CreateFolderCommand) (
 		dashFolder.FolderUID = cmd.ParentUID
 	}
 
+	if s.features.IsEnabled(ctx, featuremgmt.FlagNestedFolders) && cmd.UID == folder.SharedWithMeFolderUID {
+		return nil, folder.ErrBadRequest.Errorf("cannot create folder with UID %s", folder.SharedWithMeFolderUID)
+	}
+
 	trimmedUID := strings.TrimSpace(cmd.UID)
 	if trimmedUID == accesscontrol.GeneralFolderUID {
 		return nil, dashboards.ErrFolderInvalidUID
@@ -331,43 +611,33 @@ func (s *Service) Create(ctx context.Context, cmd *folder.CreateFolderCommand) (
 		return nil, toFolderError(err)
 	}
 
-	dash, err := s.dashboardStore.SaveDashboard(ctx, *saveDashboardCmd)
-	if err != nil {
-		return nil, toFolderError(err)
-	}
-
-	var createdFolder *folder.Folder
-	createdFolder, err = s.dashboardFolderStore.GetFolderByID(ctx, cmd.OrgID, dash.ID)
-	if err != nil {
-		return nil, err
-	}
-
 	var nestedFolder *folder.Folder
-	if s.features.IsEnabled(featuremgmt.FlagNestedFolders) {
-		cmd := &folder.CreateFolderCommand{
+	var dash *dashboards.Dashboard
+	err = s.db.InTransaction(ctx, func(ctx context.Context) error {
+		if dash, err = s.dashboardStore.SaveDashboard(ctx, *saveDashboardCmd); err != nil {
+			return toFolderError(err)
+		}
+
+		cmd = &folder.CreateFolderCommand{
 			// TODO: Today, if a UID isn't specified, the dashboard store
 			// generates a new UID. The new folder store will need to do this as
 			// well, but for now we take the UID from the newly created folder.
 			UID:         dash.UID,
 			OrgID:       cmd.OrgID,
-			Title:       cmd.Title,
+			Title:       dashFolder.Title,
 			Description: cmd.Description,
 			ParentUID:   cmd.ParentUID,
 		}
-		nestedFolder, err = s.nestedFolderCreate(ctx, cmd)
-		if err != nil {
-			// We'll log the error and also roll back the previously-created
-			// (legacy) folder.
+
+		if nestedFolder, err = s.nestedFolderCreate(ctx, cmd); err != nil {
 			logger.Error("error saving folder to nested folder store", "error", err)
-			// do not shallow create error if the legacy folder delete fails
-			if deleteErr := s.dashboardStore.DeleteDashboard(ctx, &dashboards.DeleteDashboardCommand{
-				ID:    createdFolder.ID,
-				OrgID: createdFolder.OrgID,
-			}); deleteErr != nil {
-				logger.Error("error deleting folder after failed save to nested folder store", "error", err)
-			}
-			return dashboards.FromDashboard(dash), err
+			return err
 		}
+
+		return nil
+	})
+	if err != nil {
+		return nil, err
 	}
 
 	f := dashboards.FromDashboard(dash)
@@ -378,32 +648,61 @@ func (s *Service) Create(ctx context.Context, cmd *folder.CreateFolderCommand) (
 }
 
 func (s *Service) Update(ctx context.Context, cmd *folder.UpdateFolderCommand) (*folder.Folder, error) {
+	logger := s.log.FromContext(ctx)
+
 	if cmd.SignedInUser == nil {
 		return nil, folder.ErrBadRequest.Errorf("missing signed in user")
 	}
 	user := cmd.SignedInUser
 
-	dashFolder, err := s.legacyUpdate(ctx, cmd)
-	if err != nil {
-		return nil, err
-	}
+	var dashFolder, foldr *folder.Folder
+	var err error
+	err = s.db.InTransaction(ctx, func(ctx context.Context) error {
+		if dashFolder, err = s.legacyUpdate(ctx, cmd); err != nil {
+			return err
+		}
 
-	if !s.features.IsEnabled(featuremgmt.FlagNestedFolders) {
-		return dashFolder, nil
-	}
+		if foldr, err = s.store.Update(ctx, folder.UpdateFolderCommand{
+			UID:            cmd.UID,
+			OrgID:          cmd.OrgID,
+			NewTitle:       &dashFolder.Title,
+			NewDescription: cmd.NewDescription,
+			SignedInUser:   user,
+		}); err != nil {
+			return err
+		}
+
+		if cmd.NewTitle != nil {
+			namespace, id := cmd.SignedInUser.GetNamespacedID()
+
+			metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Folder).Inc()
+			if err := s.bus.Publish(ctx, &events.FolderTitleUpdated{
+				Timestamp: foldr.Updated,
+				Title:     foldr.Title,
+				ID:        dashFolder.ID, // nolint:staticcheck
+				UID:       dashFolder.UID,
+				OrgID:     cmd.OrgID,
+			}); err != nil {
+				logger.Error("failed to publish FolderTitleUpdated event", "folder", foldr.Title, "user", id, "namespace", namespace, "error", err)
+				return err
+			}
+		}
 
-	foldr, err := s.store.Update(ctx, folder.UpdateFolderCommand{
-		UID:            cmd.UID,
-		OrgID:          cmd.OrgID,
-		NewTitle:       cmd.NewTitle,
-		NewDescription: cmd.NewDescription,
-		SignedInUser:   user,
+		return nil
 	})
+
 	if err != nil {
+		logger.Error("folder update failed", "folderUID", cmd.UID, "error", err)
 		return nil, err
 	}
 
+	if !s.features.IsEnabled(ctx, featuremgmt.FlagNestedFolders) {
+		return dashFolder, nil
+	}
+
 	// always expose the dashboard store sequential ID
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Folder).Inc()
+	// nolint:staticcheck
 	foldr.ID = dashFolder.ID
 	foldr.Version = dashFolder.Version
 
@@ -424,8 +723,6 @@ func (s *Service) legacyUpdate(ctx context.Context, cmd *folder.UpdateFolderComm
 		dashFolder.FolderUID = *cmd.NewParentUID
 	}
 
-	currentTitle := dashFolder.Title
-
 	if !dashFolder.IsFolder {
 		return nil, dashboards.ErrFolderNotFound
 	}
@@ -468,17 +765,6 @@ func (s *Service) legacyUpdate(ctx context.Context, cmd *folder.UpdateFolderComm
 		return nil, err
 	}
 
-	if currentTitle != foldr.Title {
-		if err := s.bus.Publish(ctx, &events.FolderTitleUpdated{
-			Timestamp: foldr.Updated,
-			Title:     foldr.Title,
-			ID:        dash.ID,
-			UID:       dash.UID,
-			OrgID:     cmd.OrgID,
-		}); err != nil {
-			logger.Error("failed to publish FolderTitleUpdated event", "folder", foldr.Title, "user", id, "namespace", namespace, "error", err)
-		}
-	}
 	return foldr, nil
 }
 
@@ -528,60 +814,62 @@ func (s *Service) Delete(ctx context.Context, cmd *folder.DeleteFolderCommand) e
 		return dashboards.ErrFolderAccessDenied
 	}
 
-	result := []string{cmd.UID}
+	folders := []string{cmd.UID}
 	err = s.db.InTransaction(ctx, func(ctx context.Context) error {
-		if s.features.IsEnabled(featuremgmt.FlagNestedFolders) {
-			subfolders, err := s.nestedFolderDelete(ctx, cmd)
+		descendants, err := s.nestedFolderDelete(ctx, cmd)
 
-			if err != nil {
-				logger.Error("the delete folder on folder table failed with err: ", "error", err)
-				return err
-			}
-			result = append(result, subfolders...)
-		}
-
-		dashFolders, err := s.dashboardFolderStore.GetFolders(ctx, cmd.OrgID, result)
 		if err != nil {
-			return folder.ErrInternal.Errorf("failed to fetch subfolders from dashboard store: %w", err)
+			logger.Error("the delete folder on folder table failed with err: ", "error", err)
+			return err
 		}
+		folders = append(folders, descendants...)
 
-		for _, folder := range result {
-			dashFolder, ok := dashFolders[folder]
-			if !ok {
+		if cmd.ForceDeleteRules {
+			if err := s.deleteChildrenInFolder(ctx, cmd.OrgID, folders, cmd.SignedInUser); err != nil {
 				return err
 			}
-
-			if cmd.ForceDeleteRules {
-				if err := s.deleteChildrenInFolder(ctx, dashFolder.OrgID, dashFolder.UID, cmd.SignedInUser); err != nil {
-					return err
-				}
+		} else {
+			alertRuleSrv, ok := s.registry[entity.StandardKindAlertRule]
+			if !ok {
+				return folder.ErrInternal.Errorf("no alert rule service found in registry")
 			}
-
-			err = s.legacyDelete(ctx, cmd, dashFolder)
+			alertRulesInFolder, err := alertRuleSrv.CountInFolders(ctx, cmd.OrgID, folders, cmd.SignedInUser)
 			if err != nil {
+				s.log.Error("failed to count alert rules in folder", "error", err)
 				return err
 			}
+			if alertRulesInFolder > 0 {
+				return folder.ErrFolderNotEmpty.Errorf("folder contains %d alert rules", alertRulesInFolder)
+			}
 		}
+
+		if err = s.legacyDelete(ctx, cmd, folders); err != nil {
+			return err
+		}
+
 		return nil
 	})
 
 	return err
 }
 
-func (s *Service) deleteChildrenInFolder(ctx context.Context, orgID int64, folderUID string, user identity.Requester) error {
+func (s *Service) deleteChildrenInFolder(ctx context.Context, orgID int64, folderUIDs []string, user identity.Requester) error {
 	for _, v := range s.registry {
-		if err := v.DeleteInFolder(ctx, orgID, folderUID, user); err != nil {
+		if err := v.DeleteInFolders(ctx, orgID, folderUIDs, user); err != nil {
 			return err
 		}
 	}
 	return nil
 }
 
-func (s *Service) legacyDelete(ctx context.Context, cmd *folder.DeleteFolderCommand, dashFolder *folder.Folder) error {
-	deleteCmd := dashboards.DeleteDashboardCommand{OrgID: cmd.OrgID, ID: dashFolder.ID, ForceDeleteFolderRules: cmd.ForceDeleteRules}
+func (s *Service) legacyDelete(ctx context.Context, cmd *folder.DeleteFolderCommand, folderUIDs []string) error {
+	// TODO use bulk delete
+	for _, folderUID := range folderUIDs {
+		deleteCmd := dashboards.DeleteDashboardCommand{OrgID: cmd.OrgID, UID: folderUID, ForceDeleteFolderRules: cmd.ForceDeleteRules}
 
-	if err := s.dashboardStore.DeleteDashboard(ctx, &deleteCmd); err != nil {
-		return toFolderError(err)
+		if err := s.dashboardStore.DeleteDashboard(ctx, &deleteCmd); err != nil {
+			return toFolderError(err)
+		}
 	}
 	return nil
 }
@@ -618,8 +906,8 @@ func (s *Service) Move(ctx context.Context, cmd *folder.MoveFolderCommand) (*fol
 		return nil, err
 	}
 
-	// current folder height + current folder + parent folder + parent folder depth should be less than or equal 8
-	if folderHeight+len(parents)+2 > folder.MaxNestedFolderDepth {
+	// height of the folder that is being moved + this current folder itself + depth of the NewParent folder should be less than or equal MaxNestedFolderDepth
+	if folderHeight+len(parents)+1 > folder.MaxNestedFolderDepth {
 		return nil, folder.ErrMaximumDepthReached.Errorf("failed to move folder")
 	}
 
@@ -643,6 +931,9 @@ func (s *Service) Move(ctx context.Context, cmd *folder.MoveFolderCommand) (*fol
 			NewParentUID: &newParentUID,
 			SignedInUser: cmd.SignedInUser,
 		}); err != nil {
+			if s.db.GetDialect().IsUniqueConstraintViolation(err) {
+				return folder.ErrConflict.Errorf("%w", dashboards.ErrFolderSameNameExists)
+			}
 			return folder.ErrInternal.Errorf("failed to move folder: %w", err)
 		}
 
@@ -654,6 +945,9 @@ func (s *Service) Move(ctx context.Context, cmd *folder.MoveFolderCommand) (*fol
 			// bypass optimistic locking used for dashboards
 			Overwrite: true,
 		}); err != nil {
+			if s.db.GetDialect().IsUniqueConstraintViolation(err) {
+				return folder.ErrConflict.Errorf("%w", dashboards.ErrFolderSameNameExists)
+			}
 			return folder.ErrInternal.Errorf("failed to move legacy folder: %w", err)
 		}
 
@@ -669,9 +963,9 @@ func (s *Service) Move(ctx context.Context, cmd *folder.MoveFolderCommand) (*fol
 // the folder store and returns the UIDs for all its descendants.
 func (s *Service) nestedFolderDelete(ctx context.Context, cmd *folder.DeleteFolderCommand) ([]string, error) {
 	logger := s.log.FromContext(ctx)
-	result := []string{}
+	descendantUIDs := []string{}
 	if cmd.SignedInUser == nil {
-		return result, folder.ErrBadRequest.Errorf("missing signed in user")
+		return descendantUIDs, folder.ErrBadRequest.Errorf("missing signed in user")
 	}
 
 	_, err := s.Get(ctx, &folder.GetFolderQuery{
@@ -680,86 +974,63 @@ func (s *Service) nestedFolderDelete(ctx context.Context, cmd *folder.DeleteFold
 		SignedInUser: cmd.SignedInUser,
 	})
 	if err != nil {
-		return result, err
+		return descendantUIDs, err
 	}
 
-	folders, err := s.store.GetChildren(ctx, folder.GetChildrenQuery{UID: cmd.UID, OrgID: cmd.OrgID})
+	descendants, err := s.store.GetDescendants(ctx, cmd.OrgID, cmd.UID)
 	if err != nil {
-		return result, err
-	}
-	for _, f := range folders {
-		result = append(result, f.UID)
-		logger.Info("deleting subfolder", "org_id", f.OrgID, "uid", f.UID)
-		subfolders, err := s.nestedFolderDelete(ctx, &folder.DeleteFolderCommand{UID: f.UID, OrgID: f.OrgID, ForceDeleteRules: cmd.ForceDeleteRules, SignedInUser: cmd.SignedInUser})
-		if err != nil {
-			logger.Error("failed deleting subfolder", "org_id", f.OrgID, "uid", f.UID, "error", err)
-			return result, err
-		}
-		result = append(result, subfolders...)
+		logger.Error("failed to get descendant folders", "error", err)
+		return descendantUIDs, err
 	}
 
-	logger.Info("deleting folder and its contents", "org_id", cmd.OrgID, "uid", cmd.UID)
-	err = s.store.Delete(ctx, cmd.UID, cmd.OrgID)
+	for _, f := range descendants {
+		descendantUIDs = append(descendantUIDs, f.UID)
+	}
+	logger.Info("deleting folder and its descendants", "org_id", cmd.OrgID, "uid", cmd.UID)
+	toDelete := append(descendantUIDs, cmd.UID)
+	err = s.store.Delete(ctx, toDelete, cmd.OrgID)
 	if err != nil {
 		logger.Info("failed deleting folder", "org_id", cmd.OrgID, "uid", cmd.UID, "err", err)
-		return result, err
+		return descendantUIDs, err
 	}
-	return result, nil
+	return descendantUIDs, nil
 }
 
-func (s *Service) GetDescendantCounts(ctx context.Context, cmd *folder.GetDescendantCountsQuery) (folder.DescendantCounts, error) {
+func (s *Service) GetDescendantCounts(ctx context.Context, q *folder.GetDescendantCountsQuery) (folder.DescendantCounts, error) {
 	logger := s.log.FromContext(ctx)
-	if cmd.SignedInUser == nil {
+	if q.SignedInUser == nil {
 		return nil, folder.ErrBadRequest.Errorf("missing signed-in user")
 	}
-	if *cmd.UID == "" {
+	if q.UID == nil || *q.UID == "" {
 		return nil, folder.ErrBadRequest.Errorf("missing UID")
 	}
-	if cmd.OrgID < 1 {
+	if q.OrgID < 1 {
 		return nil, folder.ErrBadRequest.Errorf("invalid orgID")
 	}
 
-	result := []string{*cmd.UID}
+	folders := []string{*q.UID}
 	countsMap := make(folder.DescendantCounts, len(s.registry)+1)
-	if s.features.IsEnabled(featuremgmt.FlagNestedFolders) {
-		subfolders, err := s.getNestedFolders(ctx, cmd.OrgID, *cmd.UID)
+	if s.features.IsEnabled(ctx, featuremgmt.FlagNestedFolders) {
+		descendantFolders, err := s.store.GetDescendants(ctx, q.OrgID, *q.UID)
 		if err != nil {
-			logger.Error("failed to get subfolders", "error", err)
+			logger.Error("failed to get descendant folders", "error", err)
 			return nil, err
 		}
-		result = append(result, subfolders...)
-		countsMap[entity.StandardKindFolder] = int64(len(subfolders))
-	}
-
-	for _, v := range s.registry {
-		for _, folder := range result {
-			c, err := v.CountInFolder(ctx, cmd.OrgID, folder, cmd.SignedInUser)
-			if err != nil {
-				logger.Error("failed to count folder descendants", "error", err)
-				return nil, err
-			}
-			countsMap[v.Kind()] += c
+		for _, f := range descendantFolders {
+			folders = append(folders, f.UID)
 		}
-	}
-	return countsMap, nil
-}
-
-func (s *Service) getNestedFolders(ctx context.Context, orgID int64, uid string) ([]string, error) {
-	result := []string{}
-	folders, err := s.store.GetChildren(ctx, folder.GetChildrenQuery{UID: uid, OrgID: orgID})
-	if err != nil {
-		return nil, err
+		countsMap[entity.StandardKindFolder] = int64(len(descendantFolders))
 	}
 
-	for _, f := range folders {
-		result = append(result, f.UID)
-		subfolders, err := s.getNestedFolders(ctx, f.OrgID, f.UID)
+	for _, v := range s.registry {
+		c, err := v.CountInFolders(ctx, q.OrgID, folders, q.SignedInUser)
 		if err != nil {
+			logger.Error("failed to count folder descendants", "error", err)
 			return nil, err
 		}
-		result = append(result, subfolders...)
+		countsMap[v.Kind()] = c
 	}
-	return result, nil
+	return countsMap, nil
 }
 
 // buildSaveDashboardCommand is a simplified version on DashboardServiceImpl.buildSaveDashboardCommand
@@ -776,12 +1047,14 @@ func (s *Service) buildSaveDashboardCommand(ctx context.Context, dto *dashboards
 		return nil, dashboards.ErrDashboardTitleEmpty
 	}
 
-	if dash.IsFolder && dash.FolderID > 0 {
-		return nil, dashboards.ErrDashboardFolderCannotHaveParent
+	if strings.EqualFold(dash.Title, dashboards.RootFolderName) {
+		return nil, dashboards.ErrDashboardFolderNameExists
 	}
 
-	if dash.IsFolder && strings.EqualFold(dash.Title, dashboards.RootFolderName) {
-		return nil, dashboards.ErrDashboardFolderNameExists
+	if dash.FolderUID != "" {
+		if _, err := s.dashboardFolderStore.GetFolderByUID(ctx, dash.OrgID, dash.FolderUID); err != nil {
+			return nil, err
+		}
 	}
 
 	if !util.IsValidShortUID(dash.UID) {
@@ -801,6 +1074,8 @@ func (s *Service) buildSaveDashboardCommand(ctx context.Context, dto *dashboards
 	}
 
 	if dash.ID == 0 {
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Folder).Inc()
+		// nolint:staticcheck
 		if canCreate, err := guard.CanCreate(dash.FolderID, dash.IsFolder); err != nil || !canCreate {
 			if err != nil {
 				return nil, err
@@ -827,13 +1102,14 @@ func (s *Service) buildSaveDashboardCommand(ctx context.Context, dto *dashboards
 		}
 	}
 
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Folder).Inc()
 	cmd := &dashboards.SaveDashboardCommand{
 		Dashboard: dash.Data,
 		Message:   dto.Message,
 		OrgID:     dto.OrgID,
 		Overwrite: dto.Overwrite,
 		UserID:    userID,
-		FolderID:  dash.FolderID,
+		FolderID:  dash.FolderID, // nolint:staticcheck
 		FolderUID: dash.FolderUID,
 		IsFolder:  dash.IsFolder,
 		PluginID:  dash.PluginID,
@@ -853,6 +1129,8 @@ func getGuardianForSavePermissionCheck(ctx context.Context, d *dashboards.Dashbo
 
 	if newDashboard {
 		// if it's a new dashboard/folder check the parent folder permissions
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Folder).Inc()
+		// nolint:staticcheck
 		guard, err := guardian.New(ctx, d.FolderID, d.OrgID, user)
 		if err != nil {
 			return nil, err
@@ -881,7 +1159,7 @@ func (s *Service) validateParent(ctx context.Context, orgID int64, parentUID str
 		return fmt.Errorf("failed to get parents: %w", err)
 	}
 
-	if len(ancestors) == folder.MaxNestedFolderDepth {
+	if len(ancestors) >= folder.MaxNestedFolderDepth {
 		return folder.ErrMaximumDepthReached.Errorf("failed to validate parent folder")
 	}
 
@@ -936,3 +1214,66 @@ func (s *Service) RegisterService(r folder.RegistryService) error {
 
 	return nil
 }
+
+func (s *Service) supportBundleCollector() supportbundles.Collector {
+	collector := supportbundles.Collector{
+		UID:               "folder-stats",
+		DisplayName:       "Folder information",
+		Description:       "Folder information for the Grafana instance",
+		IncludedByDefault: false,
+		Default:           true,
+		Fn: func(ctx context.Context) (*supportbundles.SupportItem, error) {
+			s.log.Info("Generating folder support bundle")
+			folders, err := s.GetFolders(ctx, folder.GetFoldersQuery{
+				OrgID: 0,
+				SignedInUser: &user.SignedInUser{
+					Login:            "sa-supportbundle",
+					OrgRole:          "Admin",
+					IsGrafanaAdmin:   true,
+					IsServiceAccount: true,
+					Permissions:      map[int64]map[string][]string{accesscontrol.GlobalOrgID: {dashboards.ActionFoldersRead: {dashboards.ScopeFoldersAll}}},
+				},
+			})
+			if err != nil {
+				return nil, err
+			}
+			return s.supportItemFromFolders(folders)
+		},
+	}
+	return collector
+}
+
+func (s *Service) supportItemFromFolders(folders []*folder.Folder) (*supportbundles.SupportItem, error) {
+	stats := struct {
+		Total    int              `json:"total"`    // how many folders?
+		Depths   map[int]int      `json:"depths"`   // how deep they are?
+		Children map[int]int      `json:"children"` // how many child folders they have?
+		Folders  []*folder.Folder `json:"folders"`  // what are they?
+	}{Total: len(folders), Folders: folders, Children: map[int]int{}, Depths: map[int]int{}}
+
+	// Build parent-child mapping
+	parents := map[string]string{}
+	children := map[string][]string{}
+	for _, f := range folders {
+		parents[f.UID] = f.ParentUID
+		children[f.ParentUID] = append(children[f.ParentUID], f.UID)
+	}
+	// Find depths of each folder
+	for _, f := range folders {
+		depth := 0
+		for uid := f.UID; uid != ""; uid = parents[uid] {
+			depth++
+		}
+		stats.Depths[depth] += 1
+		stats.Children[len(children[f.UID])] += 1
+	}
+
+	b, err := json.MarshalIndent(stats, "", " ")
+	if err != nil {
+		return nil, err
+	}
+	return &supportbundles.SupportItem{
+		Filename:  "folders.json",
+		FileBytes: b,
+	}, nil
+}
diff --git a/pkg/services/folder/folderimpl/folder_test.go b/pkg/services/folder/folderimpl/folder_test.go
index 3b4fd217c92db..0e2839378322c 100644
--- a/pkg/services/folder/folderimpl/folder_test.go
+++ b/pkg/services/folder/folderimpl/folder_test.go
@@ -2,12 +2,15 @@ package folderimpl
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"math/rand"
+	"strings"
 	"testing"
 	"time"
 
+	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
@@ -23,8 +26,9 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
 	acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/dashboards/database"
-	"github.com/grafana/grafana/pkg/services/dashboards/service"
+	dashboardservice "github.com/grafana/grafana/pkg/services/dashboards/service"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/folder/foldertest"
@@ -37,6 +41,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/services/store/entity"
+	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
 	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
@@ -54,7 +59,7 @@ func TestIntegrationProvideFolderService(t *testing.T) {
 		cfg := setting.NewCfg()
 		ac := acmock.New()
 		db := sqlstore.InitTestDB(t)
-		ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), cfg, nil, nil, db, &featuremgmt.FeatureManager{})
+		ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), cfg, nil, nil, db, &featuremgmt.FeatureManager{}, supportbundlestest.NewFakeBundleService(), nil)
 
 		require.Len(t, ac.Calls.RegisterAttributeScopeResolver, 3)
 	})
@@ -67,13 +72,23 @@ func TestIntegrationFolderService(t *testing.T) {
 	t.Run("Folder service tests", func(t *testing.T) {
 		dashStore := &dashboards.FakeDashboardStore{}
 		db := sqlstore.InitTestDB(t)
-		nestedFolderStore := ProvideStore(db, db.Cfg, featuremgmt.WithFeatures([]interface{}{"nestedFolders"}))
+		nestedFolderStore := ProvideStore(db, db.Cfg)
 
 		folderStore := foldertest.NewFakeFolderStore(t)
 
 		cfg := setting.NewCfg()
 		features := featuremgmt.WithFeatures()
 
+		ac := acmock.New().WithPermissions([]accesscontrol.Permission{
+			{Action: accesscontrol.ActionAlertingRuleDelete, Scope: dashboards.ScopeFoldersAll},
+		})
+		alertingStore := ngstore.DBstore{
+			SQLStore:      db,
+			Cfg:           cfg.UnifiedAlerting,
+			Logger:        log.New("test-alerting-store"),
+			AccessControl: ac,
+		}
+
 		service := &Service{
 			cfg:                  cfg,
 			log:                  log.New("test-folder-service"),
@@ -84,42 +99,32 @@ func TestIntegrationFolderService(t *testing.T) {
 			bus:                  bus.ProvideBus(tracing.InitializeTracerForTest()),
 			db:                   db,
 			accessControl:        acimpl.ProvideAccessControl(cfg),
+			metrics:              newFoldersMetrics(nil),
+			registry:             make(map[string]folder.RegistryService),
 		}
 
+		require.NoError(t, service.RegisterService(alertingStore))
+
 		t.Run("Given user has no permissions", func(t *testing.T) {
 			origNewGuardian := guardian.New
 			guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{})
 
-			folderId := rand.Int63()
 			folderUID := util.GenerateShortUID()
 
 			f := folder.NewFolder("Folder", "")
-			f.ID = folderId
 			f.UID = folderUID
 
-			folderStore.On("GetFolderByID", mock.Anything, orgID, folderId).Return(f, nil)
 			folderStore.On("GetFolderByUID", mock.Anything, orgID, folderUID).Return(f, nil)
 
 			t.Run("When get folder by id should return access denied error", func(t *testing.T) {
 				_, err := service.Get(context.Background(), &folder.GetFolderQuery{
-					ID:           &folderId,
+					UID:          &folderUID,
 					OrgID:        orgID,
 					SignedInUser: usr,
 				})
 				require.Equal(t, err, dashboards.ErrFolderAccessDenied)
 			})
 
-			var zeroInt int64 = 0
-			t.Run("When get folder by id, with id = 0 should return default folder", func(t *testing.T) {
-				foldr, err := service.Get(context.Background(), &folder.GetFolderQuery{
-					ID:           &zeroInt,
-					OrgID:        orgID,
-					SignedInUser: usr,
-				})
-				require.NoError(t, err)
-				require.Equal(t, foldr, &folder.Folder{ID: 0, Title: "General"})
-			})
-
 			t.Run("When get folder by uid should return access denied error", func(t *testing.T) {
 				_, err := service.Get(context.Background(), &folder.GetFolderQuery{
 					UID:          &folderUID,
@@ -158,7 +163,6 @@ func TestIntegrationFolderService(t *testing.T) {
 				newFolder := folder.NewFolder("Folder", "")
 				newFolder.UID = folderUID
 
-				folderStore.On("GetFolderByID", mock.Anything, orgID, folderId).Return(newFolder, nil)
 				folderStore.On("GetFolderByUID", mock.Anything, orgID, folderUID).Return(newFolder, nil)
 
 				err := service.Delete(context.Background(), &folder.DeleteFolderCommand{
@@ -178,22 +182,22 @@ func TestIntegrationFolderService(t *testing.T) {
 
 		t.Run("Given user has permission to save", func(t *testing.T) {
 			origNewGuardian := guardian.New
-			guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanSaveValue: true})
+			guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanSaveValue: true, CanViewValue: true})
 			service.features = featuremgmt.WithFeatures()
 
 			t.Run("When creating folder should not return access denied error", func(t *testing.T) {
 				dash := dashboards.NewDashboardFolder("Test-Folder")
 				dash.ID = rand.Int63()
+				dash.UID = util.GenerateShortUID()
 				f := dashboards.FromDashboard(dash)
 
 				dashStore.On("ValidateDashboardBeforeSave", mock.Anything, mock.AnythingOfType("*dashboards.Dashboard"), mock.AnythingOfType("bool")).Return(true, nil)
 				dashStore.On("SaveDashboard", mock.Anything, mock.AnythingOfType("dashboards.SaveDashboardCommand")).Return(dash, nil).Once()
-				folderStore.On("GetFolderByID", mock.Anything, orgID, dash.ID).Return(f, nil)
 
 				actualFolder, err := service.Create(context.Background(), &folder.CreateFolderCommand{
 					OrgID:        orgID,
 					Title:        dash.Title,
-					UID:          "someuid",
+					UID:          dash.UID,
 					SignedInUser: usr,
 				})
 				require.NoError(t, err)
@@ -217,13 +221,31 @@ func TestIntegrationFolderService(t *testing.T) {
 				dashboardFolder := dashboards.NewDashboardFolder("Folder")
 				dashboardFolder.ID = rand.Int63()
 				dashboardFolder.UID = util.GenerateShortUID()
-				f := dashboards.FromDashboard(dashboardFolder)
+				dashboardFolder.OrgID = orgID
 
-				dashStore.On("ValidateDashboardBeforeSave", mock.Anything, mock.AnythingOfType("*dashboards.Dashboard"), mock.AnythingOfType("bool")).Return(true, nil)
-				dashStore.On("SaveDashboard", mock.Anything, mock.AnythingOfType("dashboards.SaveDashboardCommand")).Return(dashboardFolder, nil)
-				folderStore.On("GetFolderByID", mock.Anything, orgID, dashboardFolder.ID).Return(f, nil)
+				f, err := service.store.Create(context.Background(), folder.CreateFolderCommand{
+					OrgID:        orgID,
+					Title:        dashboardFolder.Title,
+					UID:          dashboardFolder.UID,
+					SignedInUser: usr,
+				})
+				require.NoError(t, err)
+				assert.Equal(t, "Folder", f.Title)
 
+				dashStore.On("ValidateDashboardBeforeSave", mock.Anything, mock.AnythingOfType("*dashboards.Dashboard"), mock.AnythingOfType("bool")).Return(true, nil)
 				title := "TEST-Folder"
+				updatedDashboardFolder := *dashboardFolder
+				updatedDashboardFolder.Title = title
+				dashStore.On("SaveDashboard", mock.Anything, mock.AnythingOfType("dashboards.SaveDashboardCommand")).Return(&updatedDashboardFolder, nil)
+				dashStore.On("GetDashboard", mock.Anything, mock.AnythingOfType("*dashboards.GetDashboardQuery")).Return(&updatedDashboardFolder, nil)
+
+				folderStore.On("GetFolderByID", mock.Anything, orgID, dashboardFolder.ID).Return(&folder.Folder{
+					OrgID: orgID,
+					ID:    dashboardFolder.ID,
+					UID:   dashboardFolder.UID,
+					Title: title,
+				}, nil)
+
 				req := &folder.UpdateFolderCommand{
 					UID:          dashboardFolder.UID,
 					OrgID:        orgID,
@@ -233,14 +255,13 @@ func TestIntegrationFolderService(t *testing.T) {
 
 				reqResult, err := service.Update(context.Background(), req)
 				require.NoError(t, err)
-				require.Equal(t, f, reqResult)
+				assert.Equal(t, title, reqResult.Title)
 			})
 
 			t.Run("When deleting folder by uid should not return access denied error", func(t *testing.T) {
 				f := folder.NewFolder(util.GenerateShortUID(), "")
-				f.ID = rand.Int63()
 				f.UID = util.GenerateShortUID()
-				folderStore.On("GetFolders", mock.Anything, orgID, []string{f.UID}).Return(map[string]*folder.Folder{f.UID: f}, nil)
+				folderStore.On("GetFolderByUID", mock.Anything, orgID, f.UID).Return(f, nil)
 
 				var actualCmd *dashboards.DeleteDashboardCommand
 				dashStore.On("DeleteDashboard", mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
@@ -256,7 +277,6 @@ func TestIntegrationFolderService(t *testing.T) {
 				})
 				require.NoError(t, err)
 				require.NotNil(t, actualCmd)
-				require.Equal(t, f.ID, actualCmd.ID)
 				require.Equal(t, orgID, actualCmd.OrgID)
 				require.Equal(t, expectedForceDeleteRules, actualCmd.ForceDeleteFolderRules)
 			})
@@ -270,17 +290,6 @@ func TestIntegrationFolderService(t *testing.T) {
 			origNewGuardian := guardian.New
 			guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanViewValue: true})
 
-			t.Run("When get folder by id should return folder", func(t *testing.T) {
-				expected := folder.NewFolder(util.GenerateShortUID(), "")
-				expected.ID = rand.Int63()
-
-				folderStore.On("GetFolderByID", mock.Anything, orgID, expected.ID).Return(expected, nil)
-
-				actual, err := service.getFolderByID(context.Background(), expected.ID, orgID)
-				require.Equal(t, expected, actual)
-				require.NoError(t, err)
-			})
-
 			t.Run("When get folder by uid should return folder", func(t *testing.T) {
 				expected := folder.NewFolder(util.GenerateShortUID(), "")
 				expected.UID = util.GenerateShortUID()
@@ -292,12 +301,23 @@ func TestIntegrationFolderService(t *testing.T) {
 				require.NoError(t, err)
 			})
 
+			t.Run("When get folder by uid and uid is general should return the root folder object", func(t *testing.T) {
+				uid := accesscontrol.GeneralFolderUID
+				query := &folder.GetFolderQuery{
+					UID:          &uid,
+					SignedInUser: usr,
+				}
+				actual, err := service.Get(context.Background(), query)
+				require.Equal(t, folder.RootFolder, actual)
+				require.NoError(t, err)
+			})
+
 			t.Run("When get folder by title should return folder", func(t *testing.T) {
 				expected := folder.NewFolder("TEST-"+util.GenerateShortUID(), "")
 
-				folderStore.On("GetFolderByTitle", mock.Anything, orgID, expected.Title).Return(expected, nil)
+				folderStore.On("GetFolderByTitle", mock.Anything, orgID, expected.Title, mock.Anything).Return(expected, nil)
 
-				actual, err := service.getFolderByTitle(context.Background(), orgID, expected.Title)
+				actual, err := service.getFolderByTitle(context.Background(), orgID, expected.Title, nil)
 				require.Equal(t, expected, actual)
 				require.NoError(t, err)
 			})
@@ -341,9 +361,9 @@ func TestIntegrationNestedFolderService(t *testing.T) {
 	cfg := setting.NewCfg()
 
 	featuresFlagOn := featuremgmt.WithFeatures("nestedFolders")
-	dashStore, err := database.ProvideDashboardStore(db, db.Cfg, featuresFlagOn, tagimpl.ProvideService(db, db.Cfg), quotaService)
+	dashStore, err := database.ProvideDashboardStore(db, db.Cfg, featuresFlagOn, tagimpl.ProvideService(db), quotaService)
 	require.NoError(t, err)
-	nestedFolderStore := ProvideStore(db, db.Cfg, featuresFlagOn)
+	nestedFolderStore := ProvideStore(db, db.Cfg)
 
 	b := bus.ProvideBus(tracing.InitializeTracerForTest())
 	ac := acimpl.ProvideAccessControl(cfg)
@@ -359,12 +379,15 @@ func TestIntegrationNestedFolderService(t *testing.T) {
 		db:                   db,
 		accessControl:        ac,
 		registry:             make(map[string]folder.RegistryService),
+		metrics:              newFoldersMetrics(nil),
 	}
 
 	signedInUser := user.SignedInUser{UserID: 1, OrgID: orgID, Permissions: map[int64]map[string][]string{
 		orgID: {
-			dashboards.ActionFoldersCreate: {},
-			dashboards.ActionFoldersWrite:  {dashboards.ScopeFoldersAll}},
+			dashboards.ActionFoldersCreate:         {},
+			dashboards.ActionFoldersWrite:          {dashboards.ScopeFoldersAll},
+			accesscontrol.ActionAlertingRuleDelete: {dashboards.ScopeFoldersAll},
+		},
 	}}
 	createCmd := folder.CreateFolderCommand{
 		OrgID:        orgID,
@@ -400,36 +423,42 @@ func TestIntegrationNestedFolderService(t *testing.T) {
 				CanEditValue: true,
 			})
 
-			dashSrv, err := service.ProvideDashboardServiceImpl(cfg, dashStore, folderStore, nil, featuresFlagOn, folderPermissions, dashboardPermissions, ac, serviceWithFlagOn)
+			dashSrv, err := dashboardservice.ProvideDashboardServiceImpl(cfg, dashStore, folderStore, featuresFlagOn, folderPermissions, dashboardPermissions, ac, serviceWithFlagOn, nil)
 			require.NoError(t, err)
 
-			alertStore, err := ngstore.ProvideDBStore(cfg, featuresFlagOn, db, serviceWithFlagOn, ac, dashSrv)
+			alertStore, err := ngstore.ProvideDBStore(cfg, featuresFlagOn, db, serviceWithFlagOn, dashSrv, ac)
 			require.NoError(t, err)
 
 			elementService := libraryelements.ProvideService(cfg, db, routeRegister, serviceWithFlagOn, featuresFlagOn, ac)
 			lps, err := librarypanels.ProvideService(cfg, db, routeRegister, elementService, serviceWithFlagOn)
 			require.NoError(t, err)
 
-			ancestorUIDs := CreateSubtreeInStore(t, nestedFolderStore, serviceWithFlagOn, depth, "getDescendantCountsOn", createCmd)
+			ancestors := CreateSubtreeInStore(t, nestedFolderStore, serviceWithFlagOn, depth, "getDescendantCountsOn", createCmd)
 
-			parent, err := serviceWithFlagOn.dashboardFolderStore.GetFolderByUID(context.Background(), orgID, ancestorUIDs[0])
+			parent, err := serviceWithFlagOn.dashboardFolderStore.GetFolderByUID(context.Background(), orgID, ancestors[0].UID)
 			require.NoError(t, err)
-			subfolder, err := serviceWithFlagOn.dashboardFolderStore.GetFolderByUID(context.Background(), orgID, ancestorUIDs[1])
+			subfolder, err := serviceWithFlagOn.dashboardFolderStore.GetFolderByUID(context.Background(), orgID, ancestors[1].UID)
 			require.NoError(t, err)
+			// nolint:staticcheck
 			_ = insertTestDashboard(t, serviceWithFlagOn.dashboardStore, "dashboard in parent", orgID, parent.ID, parent.UID, "prod")
+			// nolint:staticcheck
 			_ = insertTestDashboard(t, serviceWithFlagOn.dashboardStore, "dashboard in subfolder", orgID, subfolder.ID, subfolder.UID, "prod")
 			_ = createRule(t, alertStore, parent.UID, "parent alert")
 			_ = createRule(t, alertStore, subfolder.UID, "sub alert")
 
+			// nolint:staticcheck
 			libraryElementCmd.FolderID = parent.ID
+			libraryElementCmd.FolderUID = &parent.UID
 			_, err = lps.LibraryElementService.CreateElement(context.Background(), &signedInUser, libraryElementCmd)
 			require.NoError(t, err)
+			// nolint:staticcheck
 			libraryElementCmd.FolderID = subfolder.ID
+			libraryElementCmd.FolderUID = &subfolder.UID
 			_, err = lps.LibraryElementService.CreateElement(context.Background(), &signedInUser, libraryElementCmd)
 			require.NoError(t, err)
 
 			countCmd := folder.GetDescendantCountsQuery{
-				UID:          &ancestorUIDs[0],
+				UID:          &ancestors[0].UID,
 				OrgID:        orgID,
 				SignedInUser: &signedInUser,
 			}
@@ -442,17 +471,17 @@ func TestIntegrationNestedFolderService(t *testing.T) {
 
 			t.Cleanup(func() {
 				guardian.New = origNewGuardian
-				for _, uid := range ancestorUIDs {
-					err := serviceWithFlagOn.store.Delete(context.Background(), uid, orgID)
+				for _, ancestor := range ancestors {
+					err := serviceWithFlagOn.store.Delete(context.Background(), []string{ancestor.UID}, orgID)
 					assert.NoError(t, err)
 				}
 			})
 		})
 		t.Run("With nested folder feature flag off", func(t *testing.T) {
 			featuresFlagOff := featuremgmt.WithFeatures()
-			dashStore, err := database.ProvideDashboardStore(db, db.Cfg, featuresFlagOff, tagimpl.ProvideService(db, db.Cfg), quotaService)
+			dashStore, err := database.ProvideDashboardStore(db, db.Cfg, featuresFlagOff, tagimpl.ProvideService(db), quotaService)
 			require.NoError(t, err)
-			nestedFolderStore := ProvideStore(db, db.Cfg, featuresFlagOff)
+			nestedFolderStore := ProvideStore(db, db.Cfg)
 
 			serviceWithFlagOff := &Service{
 				cfg:                  cfg,
@@ -464,6 +493,7 @@ func TestIntegrationNestedFolderService(t *testing.T) {
 				bus:                  b,
 				db:                   db,
 				registry:             make(map[string]folder.RegistryService),
+				metrics:              newFoldersMetrics(nil),
 			}
 
 			origNewGuardian := guardian.New
@@ -474,37 +504,43 @@ func TestIntegrationNestedFolderService(t *testing.T) {
 				CanEditValue: true,
 			})
 
-			dashSrv, err := service.ProvideDashboardServiceImpl(cfg, dashStore, folderStore, nil, featuresFlagOff,
-				folderPermissions, dashboardPermissions, ac, serviceWithFlagOff)
+			dashSrv, err := dashboardservice.ProvideDashboardServiceImpl(cfg, dashStore, folderStore, featuresFlagOff,
+				folderPermissions, dashboardPermissions, ac, serviceWithFlagOff, nil)
 			require.NoError(t, err)
 
-			alertStore, err := ngstore.ProvideDBStore(cfg, featuresFlagOff, db, serviceWithFlagOff, ac, dashSrv)
+			alertStore, err := ngstore.ProvideDBStore(cfg, featuresFlagOff, db, serviceWithFlagOff, dashSrv, ac)
 			require.NoError(t, err)
 
 			elementService := libraryelements.ProvideService(cfg, db, routeRegister, serviceWithFlagOff, featuresFlagOff, ac)
 			lps, err := librarypanels.ProvideService(cfg, db, routeRegister, elementService, serviceWithFlagOff)
 			require.NoError(t, err)
 
-			ancestorUIDs := CreateSubtreeInStore(t, nestedFolderStore, serviceWithFlagOn, depth, "getDescendantCountsOff", createCmd)
+			ancestors := CreateSubtreeInStore(t, nestedFolderStore, serviceWithFlagOn, depth, "getDescendantCountsOff", createCmd)
 
-			parent, err := serviceWithFlagOn.dashboardFolderStore.GetFolderByUID(context.Background(), orgID, ancestorUIDs[0])
+			parent, err := serviceWithFlagOn.dashboardFolderStore.GetFolderByUID(context.Background(), orgID, ancestors[0].UID)
 			require.NoError(t, err)
-			subfolder, err := serviceWithFlagOn.dashboardFolderStore.GetFolderByUID(context.Background(), orgID, ancestorUIDs[1])
+			subfolder, err := serviceWithFlagOn.dashboardFolderStore.GetFolderByUID(context.Background(), orgID, ancestors[1].UID)
 			require.NoError(t, err)
+			// nolint:staticcheck
 			_ = insertTestDashboard(t, serviceWithFlagOn.dashboardStore, "dashboard in parent", orgID, parent.ID, parent.UID, "prod")
+			// nolint:staticcheck
 			_ = insertTestDashboard(t, serviceWithFlagOn.dashboardStore, "dashboard in subfolder", orgID, subfolder.ID, subfolder.UID, "prod")
 			_ = createRule(t, alertStore, parent.UID, "parent alert")
 			_ = createRule(t, alertStore, subfolder.UID, "sub alert")
 
+			// nolint:staticcheck
 			libraryElementCmd.FolderID = parent.ID
+			libraryElementCmd.FolderUID = &parent.UID
 			_, err = lps.LibraryElementService.CreateElement(context.Background(), &signedInUser, libraryElementCmd)
 			require.NoError(t, err)
+			// nolint:staticcheck
 			libraryElementCmd.FolderID = subfolder.ID
+			libraryElementCmd.FolderUID = &subfolder.UID
 			_, err = lps.LibraryElementService.CreateElement(context.Background(), &signedInUser, libraryElementCmd)
 			require.NoError(t, err)
 
 			countCmd := folder.GetDescendantCountsQuery{
-				UID:          &ancestorUIDs[0],
+				UID:          &ancestors[0].UID,
 				OrgID:        orgID,
 				SignedInUser: &signedInUser,
 			}
@@ -517,8 +553,8 @@ func TestIntegrationNestedFolderService(t *testing.T) {
 
 			t.Cleanup(func() {
 				guardian.New = origNewGuardian
-				for _, uid := range ancestorUIDs {
-					err := serviceWithFlagOn.store.Delete(context.Background(), uid, orgID)
+				for _, ancestor := range ancestors {
+					err := serviceWithFlagOn.store.Delete(context.Background(), []string{ancestor.UID}, orgID)
 					assert.NoError(t, err)
 				}
 			})
@@ -535,11 +571,12 @@ func TestIntegrationNestedFolderService(t *testing.T) {
 			bus:                  b,
 			db:                   db,
 			registry:             make(map[string]folder.RegistryService),
+			metrics:              newFoldersMetrics(nil),
 		}
 
 		testCases := []struct {
 			service           *Service
-			featuresFlag      *featuremgmt.FeatureManager
+			featuresFlag      featuremgmt.FeatureToggles
 			prefix            string
 			depth             int
 			forceDelete       bool
@@ -568,7 +605,7 @@ func TestIntegrationNestedFolderService(t *testing.T) {
 				prefix:       "flagon-noforce",
 				depth:        3,
 				forceDelete:  false,
-				deletionErr:  dashboards.ErrFolderContainsAlertRules,
+				deletionErr:  folder.ErrFolderNotEmpty,
 				desc:         "With nested folder feature flag on and no force deletion of rules",
 			},
 			{
@@ -578,6 +615,7 @@ func TestIntegrationNestedFolderService(t *testing.T) {
 				depth:             1,
 				forceDelete:       true,
 				dashboardErr:      dashboards.ErrFolderNotFound,
+				folderErr:         folder.ErrFolderNotFound,
 				libPanelParentErr: model.ErrLibraryElementNotFound,
 				desc:              "With nested folder feature flag off and force deletion of rules",
 			},
@@ -587,7 +625,7 @@ func TestIntegrationNestedFolderService(t *testing.T) {
 				prefix:       "flagoff-noforce",
 				depth:        1,
 				forceDelete:  false,
-				deletionErr:  dashboards.ErrFolderContainsAlertRules,
+				deletionErr:  folder.ErrFolderNotEmpty,
 				desc:         "With nested folder feature flag off and no force deletion of rules",
 			},
 		}
@@ -606,20 +644,20 @@ func TestIntegrationNestedFolderService(t *testing.T) {
 				lps, err := librarypanels.ProvideService(cfg, db, routeRegister, elementService, tc.service)
 				require.NoError(t, err)
 
-				dashStore, err := database.ProvideDashboardStore(db, db.Cfg, tc.featuresFlag, tagimpl.ProvideService(db, db.Cfg), quotaService)
+				dashStore, err := database.ProvideDashboardStore(db, db.Cfg, tc.featuresFlag, tagimpl.ProvideService(db), quotaService)
 				require.NoError(t, err)
-				nestedFolderStore := ProvideStore(db, db.Cfg, tc.featuresFlag)
+				nestedFolderStore := ProvideStore(db, db.Cfg)
 				tc.service.dashboardStore = dashStore
 				tc.service.store = nestedFolderStore
 
-				dashSrv, err := service.ProvideDashboardServiceImpl(cfg, dashStore, folderStore, nil, tc.featuresFlag, folderPermissions, dashboardPermissions, ac, tc.service)
+				dashSrv, err := dashboardservice.ProvideDashboardServiceImpl(cfg, dashStore, folderStore, tc.featuresFlag, folderPermissions, dashboardPermissions, ac, tc.service, nil)
 				require.NoError(t, err)
-				alertStore, err := ngstore.ProvideDBStore(cfg, tc.featuresFlag, db, tc.service, ac, dashSrv)
+				alertStore, err := ngstore.ProvideDBStore(cfg, tc.featuresFlag, db, tc.service, dashSrv, ac)
 				require.NoError(t, err)
 
-				ancestorUIDs := CreateSubtreeInStore(t, nestedFolderStore, serviceWithFlagOn, tc.depth, tc.prefix, createCmd)
+				ancestors := CreateSubtreeInStore(t, nestedFolderStore, serviceWithFlagOn, tc.depth, tc.prefix, createCmd)
 
-				parent, err := serviceWithFlagOn.dashboardFolderStore.GetFolderByUID(context.Background(), orgID, ancestorUIDs[0])
+				parent, err := serviceWithFlagOn.dashboardFolderStore.GetFolderByUID(context.Background(), orgID, ancestors[0].UID)
 				require.NoError(t, err)
 				_ = createRule(t, alertStore, parent.UID, "parent alert")
 
@@ -628,20 +666,23 @@ func TestIntegrationNestedFolderService(t *testing.T) {
 					subPanel  model.LibraryElementDTO
 				)
 				if tc.depth > 1 {
-					subfolder, err = serviceWithFlagOn.dashboardFolderStore.GetFolderByUID(context.Background(), orgID, ancestorUIDs[1])
+					subfolder, err = serviceWithFlagOn.dashboardFolderStore.GetFolderByUID(context.Background(), orgID, ancestors[1].UID)
 					require.NoError(t, err)
 					_ = createRule(t, alertStore, subfolder.UID, "sub alert")
+					// nolint:staticcheck
 					libraryElementCmd.FolderID = subfolder.ID
+					libraryElementCmd.FolderUID = &subPanel.FolderUID
 					subPanel, err = lps.LibraryElementService.CreateElement(context.Background(), &signedInUser, libraryElementCmd)
 					require.NoError(t, err)
 				}
-
+				// nolint:staticcheck
 				libraryElementCmd.FolderID = parent.ID
+				libraryElementCmd.FolderUID = &parent.UID
 				parentPanel, err := lps.LibraryElementService.CreateElement(context.Background(), &signedInUser, libraryElementCmd)
 				require.NoError(t, err)
 
 				deleteCmd := folder.DeleteFolderCommand{
-					UID:              ancestorUIDs[0],
+					UID:              ancestors[0].UID,
 					OrgID:            orgID,
 					SignedInUser:     &signedInUser,
 					ForceDeleteRules: tc.forceDelete,
@@ -650,25 +691,25 @@ func TestIntegrationNestedFolderService(t *testing.T) {
 				err = tc.service.Delete(context.Background(), &deleteCmd)
 				require.ErrorIs(t, err, tc.deletionErr)
 
-				for i, uid := range ancestorUIDs {
+				for i, ancestor := range ancestors {
 					// dashboard table
-					_, err := tc.service.dashboardFolderStore.GetFolderByUID(context.Background(), orgID, uid)
+					_, err := tc.service.dashboardFolderStore.GetFolderByUID(context.Background(), orgID, ancestor.UID)
 					require.ErrorIs(t, err, tc.dashboardErr)
 					// folder table
-					_, err = tc.service.store.Get(context.Background(), folder.GetFolderQuery{UID: &ancestorUIDs[i], OrgID: orgID})
+					_, err = tc.service.store.Get(context.Background(), folder.GetFolderQuery{UID: &ancestors[i].UID, OrgID: orgID})
 					require.ErrorIs(t, err, tc.folderErr)
 				}
 
 				_, err = lps.LibraryElementService.GetElement(context.Background(), &signedInUser, model.GetLibraryElementCommand{
 					FolderName: parent.Title,
-					FolderID:   parent.ID,
+					FolderID:   parent.ID, // nolint:staticcheck
 					UID:        parentPanel.UID,
 				})
 				require.ErrorIs(t, err, tc.libPanelParentErr)
 				if tc.depth > 1 {
 					_, err = lps.LibraryElementService.GetElement(context.Background(), &signedInUser, model.GetLibraryElementCommand{
 						FolderName: subfolder.Title,
-						FolderID:   subfolder.ID,
+						FolderID:   subfolder.ID, // nolint:staticcheck
 						UID:        subPanel.UID,
 					})
 					require.ErrorIs(t, err, tc.libPanelSubErr)
@@ -695,17 +736,18 @@ func TestNestedFolderServiceFeatureToggle(t *testing.T) {
 	dashStore.On("SaveDashboard", mock.Anything, mock.AnythingOfType("dashboards.SaveDashboardCommand")).Return(&dashboards.Dashboard{}, nil)
 
 	dashboardFolderStore := foldertest.NewFakeFolderStore(t)
-	dashboardFolderStore.On("GetFolderByID", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).Return(&folder.Folder{}, nil)
 
 	cfg := setting.NewCfg()
 	folderService := &Service{
 		cfg:                  cfg,
 		store:                nestedFolderStore,
+		db:                   sqlstore.InitTestDB(t),
 		dashboardStore:       &dashStore,
 		dashboardFolderStore: dashboardFolderStore,
 		features:             featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders),
 		log:                  log.New("test-folder-service"),
 		accessControl:        acimpl.ProvideAccessControl(cfg),
+		metrics:              newFoldersMetrics(nil),
 	}
 	t.Run("create folder", func(t *testing.T) {
 		nestedFolderStore.ExpectedFolder = &folder.Folder{ParentUID: util.GenerateShortUID()}
@@ -716,35 +758,102 @@ func TestNestedFolderServiceFeatureToggle(t *testing.T) {
 	})
 }
 
+func TestFolderServiceDualWrite(t *testing.T) {
+	g := guardian.New
+	guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanSaveValue: true})
+	t.Cleanup(func() {
+		guardian.New = g
+	})
+
+	db := sqlstore.InitTestDB(t)
+	cfg := setting.NewCfg()
+	features := featuremgmt.WithFeatures()
+	nestedFolderStore := ProvideStore(db, cfg)
+
+	dashStore, err := database.ProvideDashboardStore(db, cfg, features, tagimpl.ProvideService(db), &quotatest.FakeQuotaService{})
+	require.NoError(t, err)
+
+	dashboardFolderStore := ProvideDashboardFolderStore(db)
+
+	folderService := &Service{
+		cfg:                  setting.NewCfg(),
+		store:                nestedFolderStore,
+		db:                   sqlstore.InitTestDB(t),
+		dashboardStore:       dashStore,
+		dashboardFolderStore: dashboardFolderStore,
+		features:             featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders),
+		log:                  log.New("test-folder-service"),
+		accessControl:        acimpl.ProvideAccessControl(cfg),
+		metrics:              newFoldersMetrics(nil),
+		bus:                  bus.ProvideBus(tracing.InitializeTracerForTest()),
+	}
+
+	t.Run("When creating a folder it should trim leading and trailing spaces in both dashboard and folder tables", func(t *testing.T) {
+		f, err := folderService.Create(context.Background(), &folder.CreateFolderCommand{SignedInUser: usr, OrgID: orgID, Title: "  my folder  "})
+		require.NoError(t, err)
+
+		assert.Equal(t, "my folder", f.Title)
+
+		dashFolder, err := dashboardFolderStore.GetFolderByUID(context.Background(), orgID, f.UID)
+		require.NoError(t, err)
+
+		nestedFolder, err := nestedFolderStore.Get(context.Background(), folder.GetFolderQuery{UID: &f.UID, OrgID: orgID})
+		require.NoError(t, err)
+
+		assert.Equal(t, dashFolder.Title, nestedFolder.Title)
+	})
+
+	t.Run("When updating a folder it should trim leading and trailing spaces in both dashboard and folder tables", func(t *testing.T) {
+		f, err := folderService.Create(context.Background(), &folder.CreateFolderCommand{SignedInUser: usr, OrgID: orgID, Title: "my folder 2"})
+		require.NoError(t, err)
+
+		f, err = folderService.Update(context.Background(), &folder.UpdateFolderCommand{SignedInUser: usr, OrgID: orgID, UID: f.UID, NewTitle: util.Pointer("  my updated folder 2 "), Version: f.Version})
+		require.NoError(t, err)
+
+		assert.Equal(t, "my updated folder 2", f.Title)
+
+		dashFolder, err := dashboardFolderStore.GetFolderByUID(context.Background(), orgID, f.UID)
+		require.NoError(t, err)
+
+		nestedFolder, err := nestedFolderStore.Get(context.Background(), folder.GetFolderQuery{UID: &f.UID, OrgID: orgID})
+		require.NoError(t, err)
+
+		assert.Equal(t, dashFolder.Title, nestedFolder.Title)
+	})
+}
+
 func TestNestedFolderService(t *testing.T) {
 	t.Run("with feature flag unset", func(t *testing.T) {
-		t.Run("When create folder, no create in folder table done", func(t *testing.T) {
+		t.Run("Should create a folder in both dashboard and folders tables", func(t *testing.T) {
 			g := guardian.New
 			guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanSaveValue: true})
 			t.Cleanup(func() {
 				guardian.New = g
 			})
 
+			// dash is needed here because folderSvc.Create expects SaveDashboard to return it
+			dash := dashboards.NewDashboardFolder("myFolder")
+			dash.ID = rand.Int63()
+			dash.UID = "some_uid"
+
 			// dashboard store & service commands that should be called.
 			dashStore := &dashboards.FakeDashboardStore{}
 			dashStore.On("ValidateDashboardBeforeSave", mock.Anything, mock.AnythingOfType("*dashboards.Dashboard"), mock.AnythingOfType("bool")).Return(true, nil)
-			dashStore.On("SaveDashboard", mock.Anything, mock.AnythingOfType("dashboards.SaveDashboardCommand")).Return(&dashboards.Dashboard{}, nil)
+			dashStore.On("SaveDashboard", mock.Anything, mock.AnythingOfType("dashboards.SaveDashboardCommand")).Return(dash, nil)
 
 			dashboardFolderStore := foldertest.NewFakeFolderStore(t)
-			dashboardFolderStore.On("GetFolderByID", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).Return(&folder.Folder{}, nil)
 
 			nestedFolderStore := NewFakeStore()
 
-			folderSvc := setup(t, dashStore, dashboardFolderStore, nestedFolderStore, featuremgmt.WithFeatures(), acimpl.ProvideAccessControl(setting.NewCfg()), dbtest.NewFakeDB())
+			folderSvc := setup(t, dashStore, dashboardFolderStore, nestedFolderStore, featuremgmt.WithFeatures(), acimpl.ProvideAccessControl(setting.NewCfg()), sqlstore.InitTestDB(t))
 			_, err := folderSvc.Create(context.Background(), &folder.CreateFolderCommand{
 				OrgID:        orgID,
-				Title:        "myFolder",
-				UID:          "myFolder",
+				Title:        dash.Title,
+				UID:          dash.UID,
 				SignedInUser: usr,
 			})
 			require.NoError(t, err)
-			// CreateFolder should not call the folder store create if the feature toggle is not enabled.
-			require.False(t, nestedFolderStore.CreateCalled)
+			require.True(t, nestedFolderStore.CreateCalled)
 		})
 	})
 
@@ -756,21 +865,23 @@ func TestNestedFolderService(t *testing.T) {
 				guardian.New = g
 			})
 
+			dash := dashboards.NewDashboardFolder("myFolder")
+			dash.ID = rand.Int63()
+			dash.UID = "some_uid"
+
 			// dashboard store commands that should be called.
 			dashStore := &dashboards.FakeDashboardStore{}
 			dashStore.On("ValidateDashboardBeforeSave", mock.Anything, mock.AnythingOfType("*dashboards.Dashboard"), mock.AnythingOfType("bool")).Return(true, nil)
-			dashStore.On("SaveDashboard", mock.Anything, mock.AnythingOfType("dashboards.SaveDashboardCommand")).Return(&dashboards.Dashboard{}, nil)
+			dashStore.On("SaveDashboard", mock.Anything, mock.AnythingOfType("dashboards.SaveDashboardCommand")).Return(dash, nil)
 
 			dashboardFolderStore := foldertest.NewFakeFolderStore(t)
-			dashboardFolderStore.On("GetFolderByID", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).Return(&folder.Folder{}, nil)
-
 			nestedFolderStore := NewFakeStore()
 
-			folderSvc := setup(t, dashStore, dashboardFolderStore, nestedFolderStore, featuremgmt.WithFeatures("nestedFolders"), acimpl.ProvideAccessControl(setting.NewCfg()), dbtest.NewFakeDB())
+			folderSvc := setup(t, dashStore, dashboardFolderStore, nestedFolderStore, featuremgmt.WithFeatures("nestedFolders"), acimpl.ProvideAccessControl(setting.NewCfg()), sqlstore.InitTestDB(t))
 			_, err := folderSvc.Create(context.Background(), &folder.CreateFolderCommand{
 				OrgID:        orgID,
-				Title:        "myFolder",
-				UID:          "myFolder",
+				Title:        dash.Title,
+				UID:          dash.UID,
 				SignedInUser: usr,
 			})
 			require.NoError(t, err)
@@ -822,16 +933,16 @@ func TestNestedFolderService(t *testing.T) {
 			// dashboard store commands that should be called.
 			dashStore := &dashboards.FakeDashboardStore{}
 			dashStore.On("ValidateDashboardBeforeSave", mock.Anything, mock.AnythingOfType("*dashboards.Dashboard"), mock.AnythingOfType("bool")).Return(true, nil)
-			dashStore.On("SaveDashboard", mock.Anything, mock.AnythingOfType("dashboards.SaveDashboardCommand")).Return(&dashboards.Dashboard{}, nil)
+			dashStore.On("SaveDashboard", mock.Anything, mock.AnythingOfType("dashboards.SaveDashboardCommand")).Return(dash, nil)
 
 			dashboardFolderStore := foldertest.NewFakeFolderStore(t)
-			dashboardFolderStore.On("GetFolderByID", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).Return(&folder.Folder{}, nil)
+			dashboardFolderStore.On("GetFolderByUID", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("string")).Return(&folder.Folder{}, nil)
 
 			nestedFolderUser := &user.SignedInUser{UserID: 1, OrgID: orgID, Permissions: map[int64]map[string][]string{}}
 			nestedFolderUser.Permissions[orgID] = map[string][]string{dashboards.ActionFoldersWrite: {dashboards.ScopeFoldersProvider.GetResourceScopeUID("some_parent")}}
 
 			nestedFolderStore := NewFakeStore()
-			folderSvc := setup(t, dashStore, dashboardFolderStore, nestedFolderStore, featuremgmt.WithFeatures("nestedFolders"), acimpl.ProvideAccessControl(setting.NewCfg()), dbtest.NewFakeDB())
+			folderSvc := setup(t, dashStore, dashboardFolderStore, nestedFolderStore, featuremgmt.WithFeatures("nestedFolders"), acimpl.ProvideAccessControl(setting.NewCfg()), sqlstore.InitTestDB(t))
 			_, err := folderSvc.Create(context.Background(), &folder.CreateFolderCommand{
 				OrgID:        orgID,
 				Title:        dash.Title,
@@ -856,13 +967,11 @@ func TestNestedFolderService(t *testing.T) {
 			dashStore.On("SaveDashboard", mock.Anything, mock.AnythingOfType("dashboards.SaveDashboardCommand")).Return(&dashboards.Dashboard{UID: "newUID"}, nil)
 
 			dashboardFolderStore := foldertest.NewFakeFolderStore(t)
-			dashboardFolderStore.On("GetFolderByID", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).Return(&folder.Folder{}, nil)
-
 			nestedFolderStore := NewFakeStore()
 
 			folderSvc := setup(t, dashStore, dashboardFolderStore, nestedFolderStore, featuremgmt.WithFeatures("nestedFolders"), actest.FakeAccessControl{
 				ExpectedEvaluate: true,
-			}, dbtest.NewFakeDB())
+			}, sqlstore.InitTestDB(t))
 			f, err := folderSvc.Create(context.Background(), &folder.CreateFolderCommand{
 				OrgID:        orgID,
 				Title:        "myFolder",
@@ -890,13 +999,9 @@ func TestNestedFolderService(t *testing.T) {
 			dashStore := &dashboards.FakeDashboardStore{}
 			dashStore.On("ValidateDashboardBeforeSave", mock.Anything, mock.AnythingOfType("*dashboards.Dashboard"), mock.AnythingOfType("bool")).Return(true, nil)
 			dashStore.On("SaveDashboard", mock.Anything, mock.AnythingOfType("dashboards.SaveDashboardCommand")).Return(dashboardFolder, nil)
-			var actualCmd *dashboards.DeleteDashboardCommand
-			dashStore.On("DeleteDashboard", mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
-				actualCmd = args.Get(1).(*dashboards.DeleteDashboardCommand)
-			}).Return(nil).Once()
 
 			dashboardFolderStore := foldertest.NewFakeFolderStore(t)
-			dashboardFolderStore.On("GetFolderByID", mock.Anything, orgID, dashboardFolder.ID).Return(f, nil)
+			dashboardFolderStore.On("GetFolderByUID", mock.Anything, orgID, dashboardFolder.UID).Return(f, nil)
 
 			nestedFolderStore := NewFakeStore()
 			nestedFolderStore.ExpectedParentFolders = []*folder.Folder{
@@ -907,21 +1012,20 @@ func TestNestedFolderService(t *testing.T) {
 			}
 
 			cmd := folder.CreateFolderCommand{
-				ParentUID:    "myFolder1",
+				ParentUID:    dashboardFolder.UID,
 				OrgID:        orgID,
-				Title:        "myFolder",
-				UID:          "myFolder",
+				Title:        "myFolder1",
+				UID:          "myFolder1",
 				SignedInUser: usr,
 			}
 
 			folderSvc := setup(t, dashStore, dashboardFolderStore, nestedFolderStore, featuremgmt.WithFeatures("nestedFolders"), actest.FakeAccessControl{
 				ExpectedEvaluate: true,
-			}, dbtest.NewFakeDB())
+			}, sqlstore.InitTestDB(t))
 			_, err := folderSvc.Create(context.Background(), &cmd)
 			require.Error(t, err, folder.ErrCircularReference)
 			// CreateFolder should not call the folder store's create method.
 			require.False(t, nestedFolderStore.CreateCalled)
-			require.NotNil(t, actualCmd)
 		})
 
 		t.Run("create returns error from nested folder service", func(t *testing.T) {
@@ -936,13 +1040,8 @@ func TestNestedFolderService(t *testing.T) {
 			dashStore := &dashboards.FakeDashboardStore{}
 			dashStore.On("ValidateDashboardBeforeSave", mock.Anything, mock.AnythingOfType("*dashboards.Dashboard"), mock.AnythingOfType("bool")).Return(true, nil)
 			dashStore.On("SaveDashboard", mock.Anything, mock.AnythingOfType("dashboards.SaveDashboardCommand")).Return(&dashboards.Dashboard{}, nil)
-			var actualCmd *dashboards.DeleteDashboardCommand
-			dashStore.On("DeleteDashboard", mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
-				actualCmd = args.Get(1).(*dashboards.DeleteDashboardCommand)
-			}).Return(nil).Once()
 
 			dashboardFolderStore := foldertest.NewFakeFolderStore(t)
-			dashboardFolderStore.On("GetFolderByID", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).Return(&folder.Folder{}, nil)
 
 			// return an error from the folder store
 			nestedFolderStore := NewFakeStore()
@@ -951,7 +1050,7 @@ func TestNestedFolderService(t *testing.T) {
 			// the service return success as long as the legacy create succeeds
 			folderSvc := setup(t, dashStore, dashboardFolderStore, nestedFolderStore, featuremgmt.WithFeatures("nestedFolders"), actest.FakeAccessControl{
 				ExpectedEvaluate: true,
-			}, dbtest.NewFakeDB())
+			}, sqlstore.InitTestDB(t))
 			_, err := folderSvc.Create(context.Background(), &folder.CreateFolderCommand{
 				OrgID:        orgID,
 				Title:        "myFolder",
@@ -962,7 +1061,6 @@ func TestNestedFolderService(t *testing.T) {
 
 			// CreateFolder should also call the folder store's create method.
 			require.True(t, nestedFolderStore.CreateCalled)
-			require.NotNil(t, actualCmd)
 		})
 
 		t.Run("move without the right permissions should fail", func(t *testing.T) {
@@ -1121,13 +1219,9 @@ func TestNestedFolderService(t *testing.T) {
 			dashStore := &dashboards.FakeDashboardStore{}
 			dashStore.On("ValidateDashboardBeforeSave", mock.Anything, mock.AnythingOfType("*dashboards.Dashboard"), mock.AnythingOfType("bool")).Return(true, nil).Times(2)
 			dashStore.On("SaveDashboard", mock.Anything, mock.AnythingOfType("dashboards.SaveDashboardCommand")).Return(&dashboards.Dashboard{}, nil)
-			var actualCmd *dashboards.DeleteDashboardCommand
-			dashStore.On("DeleteDashboard", mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
-				actualCmd = args.Get(1).(*dashboards.DeleteDashboardCommand)
-			}).Return(nil).Once()
 
 			dashboardFolderStore := foldertest.NewFakeFolderStore(t)
-			dashboardFolderStore.On("GetFolderByID", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).Return(&folder.Folder{}, nil)
+			dashboardFolderStore.On("GetFolderByUID", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("string")).Return(&folder.Folder{}, nil)
 
 			parents := make([]*folder.Folder, 0, folder.MaxNestedFolderDepth)
 			for i := 0; i < folder.MaxNestedFolderDepth; i++ {
@@ -1140,7 +1234,7 @@ func TestNestedFolderService(t *testing.T) {
 
 			folderSvc := setup(t, dashStore, dashboardFolderStore, nestedFolderStore, featuremgmt.WithFeatures("nestedFolders"), actest.FakeAccessControl{
 				ExpectedEvaluate: true,
-			}, dbtest.NewFakeDB())
+			}, sqlstore.InitTestDB(t))
 			_, err := folderSvc.Create(context.Background(), &folder.CreateFolderCommand{
 				Title:        "folder",
 				OrgID:        orgID,
@@ -1149,7 +1243,6 @@ func TestNestedFolderService(t *testing.T) {
 				SignedInUser: usr,
 			})
 			assert.ErrorIs(t, err, folder.ErrMaximumDepthReached)
-			require.NotNil(t, actualCmd)
 		})
 
 		t.Run("get default folder, no error", func(t *testing.T) {
@@ -1172,7 +1265,7 @@ func TestNestedFolderService(t *testing.T) {
 			}, dbtest.NewFakeDB())
 			_, err := folderSvc.Get(context.Background(), &folder.GetFolderQuery{
 				OrgID:        orgID,
-				ID:           &folder.GeneralFolder.ID,
+				ID:           &folder.GeneralFolder.ID, // nolint:staticcheck
 				SignedInUser: usr,
 			})
 			require.NoError(t, err)
@@ -1180,13 +1273,848 @@ func TestNestedFolderService(t *testing.T) {
 	})
 }
 
-func CreateSubtreeInStore(t *testing.T, store *sqlStore, service *Service, depth int, prefix string, cmd folder.CreateFolderCommand) []string {
-	t.Helper()
+func TestIntegrationNestedFolderSharedWithMe(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+	db := sqlstore.InitTestDB(t)
+	quotaService := quotatest.New(false, nil)
+	folderStore := ProvideDashboardFolderStore(db)
+
+	cfg := setting.NewCfg()
+
+	featuresFlagOn := featuremgmt.WithFeatures("nestedFolders")
+	dashStore, err := database.ProvideDashboardStore(db, db.Cfg, featuresFlagOn, tagimpl.ProvideService(db), quotaService)
+	require.NoError(t, err)
+	nestedFolderStore := ProvideStore(db, db.Cfg)
+
+	b := bus.ProvideBus(tracing.InitializeTracerForTest())
+	ac := acimpl.ProvideAccessControl(cfg)
+
+	serviceWithFlagOn := &Service{
+		cfg:                  cfg,
+		log:                  log.New("test-folder-service"),
+		dashboardStore:       dashStore,
+		dashboardFolderStore: folderStore,
+		store:                nestedFolderStore,
+		features:             featuresFlagOn,
+		bus:                  b,
+		db:                   db,
+		accessControl:        ac,
+		registry:             make(map[string]folder.RegistryService),
+		metrics:              newFoldersMetrics(nil),
+	}
+
+	dashboardPermissions := acmock.NewMockedPermissionsService()
+	dashboardService, err := dashboardservice.ProvideDashboardServiceImpl(
+		cfg, dashStore, folderStore,
+		featuresFlagOn,
+		acmock.NewMockedPermissionsService(),
+		dashboardPermissions,
+		actest.FakeAccessControl{},
+		serviceWithFlagOn,
+		nil,
+	)
+	require.NoError(t, err)
+
+	signedInUser := user.SignedInUser{UserID: 1, OrgID: orgID, Permissions: map[int64]map[string][]string{
+		orgID: {
+			dashboards.ActionFoldersRead: {},
+		},
+	}}
+
+	signedInAdminUser := user.SignedInUser{UserID: 1, OrgID: orgID, Permissions: map[int64]map[string][]string{
+		orgID: {
+			dashboards.ActionFoldersCreate: {},
+			dashboards.ActionFoldersWrite:  {dashboards.ScopeFoldersAll},
+			dashboards.ActionFoldersRead:   {dashboards.ScopeFoldersAll},
+		},
+	}}
 
-	ancestorUIDs := []string{}
-	if cmd.ParentUID != "" {
-		ancestorUIDs = append(ancestorUIDs, cmd.ParentUID)
+	createCmd := folder.CreateFolderCommand{
+		OrgID:        orgID,
+		ParentUID:    "",
+		SignedInUser: &signedInAdminUser,
 	}
+
+	guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{
+		CanSaveValue: true,
+		CanViewValue: true,
+	})
+
+	t.Run("Should get folders shared with given user", func(t *testing.T) {
+		depth := 3
+
+		ancestorFoldersWithPermissions := CreateSubtreeInStore(t, nestedFolderStore, serviceWithFlagOn, depth, "withPermissions", createCmd)
+		ancestorFoldersWithoutPermissions := CreateSubtreeInStore(t, nestedFolderStore, serviceWithFlagOn, depth, "withoutPermissions", createCmd)
+
+		parent, err := serviceWithFlagOn.dashboardFolderStore.GetFolderByUID(context.Background(), orgID, ancestorFoldersWithoutPermissions[0].UID)
+		require.NoError(t, err)
+		subfolder, err := serviceWithFlagOn.dashboardFolderStore.GetFolderByUID(context.Background(), orgID, ancestorFoldersWithoutPermissions[1].UID)
+		require.NoError(t, err)
+		// nolint:staticcheck
+		dash1 := insertTestDashboard(t, serviceWithFlagOn.dashboardStore, "dashboard in parent", orgID, parent.ID, parent.UID, "prod")
+		// nolint:staticcheck
+		dash2 := insertTestDashboard(t, serviceWithFlagOn.dashboardStore, "dashboard in subfolder", orgID, subfolder.ID, subfolder.UID, "prod")
+
+		signedInUser.Permissions[orgID][dashboards.ActionFoldersRead] = []string{
+			dashboards.ScopeFoldersProvider.GetResourceScopeUID(ancestorFoldersWithPermissions[0].UID),
+			// Add permission to the subfolder of folder with permission (to check deduplication)
+			dashboards.ScopeFoldersProvider.GetResourceScopeUID(ancestorFoldersWithPermissions[1].UID),
+			// Add permission to the subfolder of folder without permission
+			dashboards.ScopeFoldersProvider.GetResourceScopeUID(ancestorFoldersWithoutPermissions[1].UID),
+		}
+		signedInUser.Permissions[orgID][dashboards.ActionDashboardsRead] = []string{
+			dashboards.ScopeDashboardsProvider.GetResourceScopeUID(dash1.UID),
+			dashboards.ScopeDashboardsProvider.GetResourceScopeUID(dash2.UID),
+		}
+
+		getSharedCmd := folder.GetChildrenQuery{
+			UID:          folder.SharedWithMeFolderUID,
+			OrgID:        orgID,
+			SignedInUser: &signedInUser,
+		}
+
+		sharedFolders, err := serviceWithFlagOn.GetChildren(context.Background(), &getSharedCmd)
+		sharedFoldersUIDs := make([]string, 0)
+		for _, f := range sharedFolders {
+			sharedFoldersUIDs = append(sharedFoldersUIDs, f.UID)
+		}
+
+		require.NoError(t, err)
+		require.Len(t, sharedFolders, 1)
+		require.Contains(t, sharedFoldersUIDs, ancestorFoldersWithoutPermissions[1].UID)
+		require.NotContains(t, sharedFoldersUIDs, ancestorFoldersWithPermissions[1].UID)
+
+		sharedDashboards, err := dashboardService.GetDashboardsSharedWithUser(context.Background(), &signedInUser)
+		sharedDashboardsUIDs := make([]string, 0)
+		for _, d := range sharedDashboards {
+			sharedDashboardsUIDs = append(sharedDashboardsUIDs, d.UID)
+		}
+
+		require.NoError(t, err)
+		require.Len(t, sharedDashboards, 1)
+		require.Contains(t, sharedDashboardsUIDs, dash1.UID)
+		require.NotContains(t, sharedDashboardsUIDs, dash2.UID)
+
+		t.Cleanup(func() {
+			//guardian.New = origNewGuardian
+			toDelete := make([]string, 0, len(ancestorFoldersWithPermissions)+len(ancestorFoldersWithoutPermissions))
+			for _, ancestor := range append(ancestorFoldersWithPermissions, ancestorFoldersWithoutPermissions...) {
+				toDelete = append(toDelete, ancestor.UID)
+			}
+			err := serviceWithFlagOn.store.Delete(context.Background(), toDelete, orgID)
+			assert.NoError(t, err)
+		})
+	})
+
+	t.Run("Should get org folders visible", func(t *testing.T) {
+		depth := 3
+
+		// create folder sctructure like this:
+		// tree1-folder-0
+		// └──tree1-folder-1
+		// 	└──tree1-folder-2
+		// tree2-folder-0
+		//  └──tree2-folder-1
+		// 	 └──tree2-folder-2
+		tree1 := CreateSubtreeInStore(t, nestedFolderStore, serviceWithFlagOn, depth, "tree1-", createCmd)
+		tree2 := CreateSubtreeInStore(t, nestedFolderStore, serviceWithFlagOn, depth, "tree2-", createCmd)
+
+		signedInUser.Permissions[orgID][dashboards.ActionFoldersRead] = []string{
+			// Add permission to tree1-folder-0
+			dashboards.ScopeFoldersProvider.GetResourceScopeUID(tree1[0].UID),
+			// Add permission to the subfolder of folder with permission (tree1-folder-1) to check deduplication
+			dashboards.ScopeFoldersProvider.GetResourceScopeUID(tree1[1].UID),
+			// Add permission to the subfolder of folder without permission (tree2-folder-1)
+			dashboards.ScopeFoldersProvider.GetResourceScopeUID(tree2[1].UID),
+		}
+
+		t.Cleanup(func() {
+			toDelete := make([]string, 0, len(tree1)+len(tree2))
+			for _, f := range append(tree1, tree2...) {
+				toDelete = append(toDelete, f.UID)
+			}
+			err := serviceWithFlagOn.store.Delete(context.Background(), toDelete, orgID)
+			assert.NoError(t, err)
+		})
+
+		testCases := []struct {
+			name     string
+			cmd      folder.GetFoldersQuery
+			expected []*folder.Folder
+		}{
+			{
+				name: "Should get all org folders visible to the user",
+				cmd: folder.GetFoldersQuery{
+					OrgID:        orgID,
+					SignedInUser: &signedInUser,
+				},
+				expected: []*folder.Folder{
+					{
+						UID: tree1[0].UID,
+					},
+					{
+						UID: tree1[1].UID,
+					},
+					{
+						UID: tree1[2].UID,
+					},
+					{
+						UID: tree2[1].UID,
+					},
+					{
+						UID: tree2[2].UID,
+					},
+				},
+			},
+			{
+				name: "Should get all org folders visible to the user with fullpath",
+				cmd: folder.GetFoldersQuery{
+					OrgID:        orgID,
+					WithFullpath: true,
+					SignedInUser: &signedInUser,
+				},
+				expected: []*folder.Folder{
+					{
+						UID:      tree1[0].UID,
+						Fullpath: "tree1-folder-0",
+					},
+					{
+						UID:      tree1[1].UID,
+						Fullpath: "tree1-folder-0/tree1-folder-1",
+					},
+					{
+						UID:      tree1[2].UID,
+						Fullpath: "tree1-folder-0/tree1-folder-1/tree1-folder-2",
+					},
+					{
+						UID:      tree2[1].UID,
+						Fullpath: "tree2-folder-0/tree2-folder-1",
+					},
+					{
+						UID:      tree2[2].UID,
+						Fullpath: "tree2-folder-0/tree2-folder-1/tree2-folder-2",
+					},
+				},
+			},
+			{
+				name: "Should get all org folders visible to the user with fullpath UIDs",
+				cmd: folder.GetFoldersQuery{
+					OrgID:            orgID,
+					WithFullpathUIDs: true,
+					SignedInUser:     &signedInUser,
+				},
+				expected: []*folder.Folder{
+					{
+						UID:          tree1[0].UID,
+						FullpathUIDs: strings.Join([]string{tree1[0].UID}, "/"),
+					},
+					{
+						UID:          tree1[1].UID,
+						FullpathUIDs: strings.Join([]string{tree1[0].UID, tree1[1].UID}, "/"),
+					},
+					{
+						UID:          tree1[2].UID,
+						FullpathUIDs: strings.Join([]string{tree1[0].UID, tree1[1].UID, tree1[2].UID}, "/"),
+					},
+					{
+						UID:          tree2[1].UID,
+						FullpathUIDs: strings.Join([]string{tree2[0].UID, tree2[1].UID}, "/"),
+					},
+					{
+						UID:          tree2[2].UID,
+						FullpathUIDs: strings.Join([]string{tree2[0].UID, tree2[1].UID, tree2[2].UID}, "/"),
+					},
+				},
+			},
+			{
+				name: "Should get specific org folders visible to the user",
+				cmd: folder.GetFoldersQuery{
+					OrgID:        orgID,
+					UIDs:         []string{tree1[0].UID, tree2[0].UID, tree2[1].UID},
+					SignedInUser: &signedInUser,
+				},
+				expected: []*folder.Folder{
+					{
+						UID: tree1[0].UID,
+					},
+					{
+						UID: tree2[1].UID,
+					},
+				},
+			},
+			{
+				name: "Should get all org folders visible to the user with admin permissions",
+				cmd: folder.GetFoldersQuery{
+					OrgID:        orgID,
+					SignedInUser: &signedInAdminUser,
+				},
+				expected: []*folder.Folder{
+					{
+						UID:          tree1[0].UID,
+						Fullpath:     "tree1-folder-0",
+						FullpathUIDs: strings.Join([]string{tree1[0].UID}, "/"),
+					},
+					{
+						UID:          tree1[1].UID,
+						Fullpath:     "tree1-folder-0/tree1-folder-1",
+						FullpathUIDs: strings.Join([]string{tree1[0].UID, tree1[1].UID}, "/"),
+					},
+					{
+						UID:      tree1[2].UID,
+						Fullpath: "tree1-folder-0/tree1-folder-1/tree1-folder-2",
+					},
+					{
+						UID:          tree2[0].UID,
+						Fullpath:     "tree2-folder-0",
+						FullpathUIDs: strings.Join([]string{tree2[0].UID}, "/"),
+					},
+					{
+						UID:          tree2[1].UID,
+						Fullpath:     "tree2-folder-0/tree2-folder-1",
+						FullpathUIDs: strings.Join([]string{tree2[0].UID, tree2[1].UID}, "/"),
+					},
+					{
+						UID:          tree2[2].UID,
+						Fullpath:     "tree2-folder-0/tree2-folder-1/tree2-folder-2",
+						FullpathUIDs: strings.Join([]string{tree2[0].UID, tree2[1].UID, tree2[2].UID}, "/"),
+					},
+				},
+			},
+			{
+				name: "Should not get any folders if user has no permissions",
+				cmd: folder.GetFoldersQuery{
+					OrgID: orgID,
+					SignedInUser: &user.SignedInUser{UserID: 999, OrgID: orgID, Permissions: map[int64]map[string][]string{
+						orgID: {},
+					}},
+				},
+				expected: nil,
+			},
+		}
+
+		for _, tc := range testCases {
+			t.Run(tc.name, func(t *testing.T) {
+				actualFolders, err := serviceWithFlagOn.GetFolders(context.Background(), tc.cmd)
+				require.NoError(t, err)
+
+				require.NoError(t, err)
+				require.Len(t, actualFolders, len(tc.expected))
+
+				for _, expected := range tc.expected {
+					var actualFolder *folder.Folder
+					for _, f := range actualFolders {
+						if f.UID == expected.UID {
+							actualFolder = f
+							break
+						}
+					}
+					if actualFolder == nil {
+						t.Fatalf("expected folder with UID %s not found", expected.UID)
+					}
+					if tc.cmd.WithFullpath {
+						require.Equal(t, expected.Fullpath, actualFolder.Fullpath)
+					} else {
+						require.Empty(t, actualFolder.Fullpath)
+					}
+
+					if tc.cmd.WithFullpathUIDs {
+						require.Equal(t, expected.FullpathUIDs, actualFolder.FullpathUIDs)
+					} else {
+						require.Empty(t, actualFolder.FullpathUIDs)
+					}
+				}
+			})
+		}
+	})
+}
+
+func TestFolderServiceGetFolder(t *testing.T) {
+	db := sqlstore.InitTestDB(t)
+
+	signedInAdminUser := user.SignedInUser{UserID: 1, OrgID: orgID, Permissions: map[int64]map[string][]string{
+		orgID: {
+			dashboards.ActionFoldersCreate: {},
+			dashboards.ActionFoldersWrite:  {dashboards.ScopeFoldersAll},
+			dashboards.ActionFoldersRead:   {dashboards.ScopeFoldersAll},
+		},
+	}}
+
+	guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{
+		CanSaveValue: true,
+		CanViewValue: true,
+	})
+
+	getSvc := func(features featuremgmt.FeatureToggles) Service {
+		quotaService := quotatest.New(false, nil)
+		folderStore := ProvideDashboardFolderStore(db)
+
+		cfg := setting.NewCfg()
+
+		featuresFlagOff := featuremgmt.WithFeatures()
+		dashStore, err := database.ProvideDashboardStore(db, db.Cfg, featuresFlagOff, tagimpl.ProvideService(db), quotaService)
+		require.NoError(t, err)
+		nestedFolderStore := ProvideStore(db, db.Cfg)
+
+		b := bus.ProvideBus(tracing.InitializeTracerForTest())
+		ac := acimpl.ProvideAccessControl(cfg)
+
+		return Service{
+			cfg:                  cfg,
+			log:                  log.New("test-folder-service"),
+			dashboardStore:       dashStore,
+			dashboardFolderStore: folderStore,
+			store:                nestedFolderStore,
+			features:             features,
+			bus:                  b,
+			db:                   db,
+			accessControl:        ac,
+			registry:             make(map[string]folder.RegistryService),
+			metrics:              newFoldersMetrics(nil),
+		}
+	}
+
+	folderSvcOn := getSvc(featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders))
+	folderSvcOff := getSvc(featuremgmt.WithFeatures())
+
+	createCmd := folder.CreateFolderCommand{
+		OrgID:        orgID,
+		ParentUID:    "",
+		SignedInUser: &signedInAdminUser,
+	}
+
+	depth := 3
+	folders := CreateSubtreeInStore(t, folderSvcOn.store, &folderSvcOn, depth, "get/folder-", createCmd)
+	f := folders[1]
+
+	testCases := []struct {
+		name             string
+		svc              *Service
+		WithFullpath     bool
+		expectedFullpath string
+	}{
+		{
+			name:             "when flag is off",
+			svc:              &folderSvcOff,
+			expectedFullpath: f.Title,
+		},
+		{
+			name:             "when flag is on and WithFullpath is false",
+			svc:              &folderSvcOn,
+			WithFullpath:     false,
+			expectedFullpath: "",
+		},
+		{
+			name:             "when flag is on and WithFullpath is true",
+			svc:              &folderSvcOn,
+			WithFullpath:     true,
+			expectedFullpath: "get\\/folder-folder-0/get\\/folder-folder-1",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			q := folder.GetFolderQuery{
+				OrgID:        orgID,
+				UID:          &f.UID,
+				WithFullpath: tc.WithFullpath,
+				SignedInUser: &signedInAdminUser,
+			}
+			fldr, err := tc.svc.Get(context.Background(), &q)
+			require.NoError(t, err)
+			require.Equal(t, f.UID, fldr.UID)
+
+			require.Equal(t, tc.expectedFullpath, fldr.Fullpath)
+		})
+	}
+}
+
+func TestFolderServiceGetFolders(t *testing.T) {
+	db := sqlstore.InitTestDB(t)
+	quotaService := quotatest.New(false, nil)
+	folderStore := ProvideDashboardFolderStore(db)
+
+	cfg := setting.NewCfg()
+
+	featuresFlagOff := featuremgmt.WithFeatures()
+	dashStore, err := database.ProvideDashboardStore(db, db.Cfg, featuresFlagOff, tagimpl.ProvideService(db), quotaService)
+	require.NoError(t, err)
+	nestedFolderStore := ProvideStore(db, db.Cfg)
+
+	b := bus.ProvideBus(tracing.InitializeTracerForTest())
+	ac := acimpl.ProvideAccessControl(cfg)
+
+	serviceWithFlagOff := &Service{
+		cfg:                  cfg,
+		log:                  log.New("test-folder-service"),
+		dashboardStore:       dashStore,
+		dashboardFolderStore: folderStore,
+		store:                nestedFolderStore,
+		features:             featuresFlagOff,
+		bus:                  b,
+		db:                   db,
+		accessControl:        ac,
+		registry:             make(map[string]folder.RegistryService),
+		metrics:              newFoldersMetrics(nil),
+	}
+
+	signedInAdminUser := user.SignedInUser{UserID: 1, OrgID: orgID, Permissions: map[int64]map[string][]string{
+		orgID: {
+			dashboards.ActionFoldersCreate: {},
+			dashboards.ActionFoldersWrite:  {dashboards.ScopeFoldersAll},
+			dashboards.ActionFoldersRead:   {dashboards.ScopeFoldersAll},
+		},
+	}}
+
+	createCmd := folder.CreateFolderCommand{
+		OrgID:        orgID,
+		ParentUID:    "",
+		SignedInUser: &signedInAdminUser,
+	}
+
+	guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{
+		CanSaveValue: true,
+		CanViewValue: true,
+	})
+
+	prefix := "getfolders/ff/off"
+	folders := CreateSubtreeInStore(t, nestedFolderStore, serviceWithFlagOff, 5, prefix, createCmd)
+	f := folders[rand.Intn(len(folders))]
+
+	t.Run("when flag is off", func(t *testing.T) {
+		t.Run("full path should be a title", func(t *testing.T) {
+			q := folder.GetFoldersQuery{
+				OrgID:            orgID,
+				WithFullpath:     true,
+				WithFullpathUIDs: true,
+				SignedInUser:     &signedInAdminUser,
+				UIDs:             []string{f.UID},
+			}
+			fldrs, err := serviceWithFlagOff.GetFolders(context.Background(), q)
+			require.NoError(t, err)
+			require.Len(t, fldrs, 1)
+			require.Equal(t, f.UID, fldrs[0].UID)
+			require.Equal(t, f.Title, fldrs[0].Title)
+			require.Equal(t, f.Title, fldrs[0].Fullpath)
+
+			t.Run("path should not be escaped", func(t *testing.T) {
+				require.Contains(t, fldrs[0].Fullpath, prefix)
+				require.Contains(t, fldrs[0].Title, prefix)
+			})
+		})
+	})
+}
+
+// TODO replace it with an API test under /pkg/tests/api/folders
+// whenever the golang client with get updated to allow filtering child folders by permission
+func TestGetChildrenFilterByPermission(t *testing.T) {
+	db := sqlstore.InitTestDB(t)
+
+	signedInAdminUser := user.SignedInUser{UserID: 1, OrgID: orgID, Permissions: map[int64]map[string][]string{
+		orgID: {
+			dashboards.ActionFoldersCreate: {},
+			dashboards.ActionFoldersWrite:  {dashboards.ScopeFoldersAll},
+			dashboards.ActionFoldersRead:   {dashboards.ScopeFoldersAll},
+		},
+	}}
+
+	quotaService := quotatest.New(false, nil)
+	folderStore := ProvideDashboardFolderStore(db)
+
+	cfg := setting.NewCfg()
+
+	featuresFlagOff := featuremgmt.WithFeatures()
+	dashStore, err := database.ProvideDashboardStore(db, db.Cfg, featuresFlagOff, tagimpl.ProvideService(db), quotaService)
+	require.NoError(t, err)
+	nestedFolderStore := ProvideStore(db, db.Cfg)
+
+	b := bus.ProvideBus(tracing.InitializeTracerForTest())
+	ac := acimpl.ProvideAccessControl(cfg)
+
+	features := featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)
+
+	folderSvcOn := &Service{
+		cfg:                  cfg,
+		log:                  log.New("test-folder-service"),
+		dashboardStore:       dashStore,
+		dashboardFolderStore: folderStore,
+		store:                nestedFolderStore,
+		features:             features,
+		bus:                  b,
+		db:                   db,
+		accessControl:        ac,
+		registry:             make(map[string]folder.RegistryService),
+		metrics:              newFoldersMetrics(nil),
+	}
+
+	origGuardian := guardian.New
+	fakeGuardian := &guardian.FakeDashboardGuardian{
+		CanSaveValue: true,
+		CanEditUIDs:  []string{},
+		CanViewUIDs:  []string{},
+	}
+	guardian.MockDashboardGuardian(fakeGuardian)
+	t.Cleanup(func() {
+		guardian.New = origGuardian
+	})
+
+	viewer := user.SignedInUser{UserID: 1, OrgID: orgID, Permissions: map[int64]map[string][]string{
+		orgID: {
+			dashboards.ActionFoldersRead:  {},
+			dashboards.ActionFoldersWrite: {},
+		},
+	}}
+
+	// no view permission
+	// 	|_ subfolder under no view permission with view permission
+	// 	|_ subfolder under no view permission with view permissionn and with edit permission
+	// with edit permission
+	//	|_ subfolder under with edit permission
+	// no edit permission
+	// 	|_ subfolder under no edit permission
+	// 	|_ subfolder under no edit permission with edit permission
+	noViewPermission, err := folderSvcOn.Create(context.Background(), &folder.CreateFolderCommand{
+		OrgID:        orgID,
+		ParentUID:    "",
+		Title:        "no view permission",
+		SignedInUser: &signedInAdminUser,
+	})
+	require.NoError(t, err)
+
+	f, err := folderSvcOn.Create(context.Background(), &folder.CreateFolderCommand{
+		OrgID:        orgID,
+		ParentUID:    noViewPermission.UID,
+		Title:        "subfolder under no view permission with view permission",
+		SignedInUser: &signedInAdminUser,
+	})
+	viewer.Permissions[orgID][dashboards.ActionFoldersRead] = append(viewer.Permissions[orgID][dashboards.ActionFoldersRead], dashboards.ScopeFoldersProvider.GetResourceScopeUID(f.UID))
+	fakeGuardian.CanViewUIDs = append(fakeGuardian.CanViewUIDs, f.UID)
+
+	require.NoError(t, err)
+	f, err = folderSvcOn.Create(context.Background(), &folder.CreateFolderCommand{
+		OrgID:        orgID,
+		ParentUID:    noViewPermission.UID,
+		Title:        "subfolder under no view permission with view permission and with edit permission",
+		SignedInUser: &signedInAdminUser,
+	})
+	require.NoError(t, err)
+	viewer.Permissions[orgID][dashboards.ActionFoldersRead] = append(viewer.Permissions[orgID][dashboards.ActionFoldersRead], dashboards.ScopeFoldersProvider.GetResourceScopeUID(f.UID))
+	fakeGuardian.CanViewUIDs = append(fakeGuardian.CanViewUIDs, f.UID)
+	viewer.Permissions[orgID][dashboards.ActionFoldersWrite] = append(viewer.Permissions[orgID][dashboards.ActionFoldersWrite], dashboards.ScopeFoldersProvider.GetResourceScopeUID(f.UID))
+	fakeGuardian.CanEditUIDs = append(fakeGuardian.CanEditUIDs, f.UID)
+
+	withEditPermission, err := folderSvcOn.Create(context.Background(), &folder.CreateFolderCommand{
+		OrgID:        orgID,
+		ParentUID:    "",
+		Title:        "with edit permission",
+		SignedInUser: &signedInAdminUser,
+	})
+	require.NoError(t, err)
+	viewer.Permissions[orgID][dashboards.ActionFoldersRead] = append(viewer.Permissions[orgID][dashboards.ActionFoldersRead], dashboards.ScopeFoldersProvider.GetResourceScopeUID(withEditPermission.UID))
+	fakeGuardian.CanViewUIDs = append(fakeGuardian.CanViewUIDs, withEditPermission.UID)
+	viewer.Permissions[orgID][dashboards.ActionFoldersWrite] = append(viewer.Permissions[orgID][dashboards.ActionFoldersWrite], dashboards.ScopeFoldersProvider.GetResourceScopeUID(withEditPermission.UID))
+	fakeGuardian.CanEditUIDs = append(fakeGuardian.CanEditUIDs, withEditPermission.UID)
+
+	_, err = folderSvcOn.Create(context.Background(), &folder.CreateFolderCommand{
+		OrgID:        orgID,
+		ParentUID:    withEditPermission.UID,
+		Title:        "subfolder under with edit permission",
+		SignedInUser: &signedInAdminUser,
+	})
+	require.NoError(t, err)
+
+	noEditPermission, err := folderSvcOn.Create(context.Background(), &folder.CreateFolderCommand{
+		OrgID:        orgID,
+		ParentUID:    "",
+		Title:        "no edit permission",
+		SignedInUser: &signedInAdminUser,
+	})
+	require.NoError(t, err)
+	viewer.Permissions[orgID][dashboards.ActionFoldersRead] = append(viewer.Permissions[orgID][dashboards.ActionFoldersRead], dashboards.ScopeFoldersProvider.GetResourceScopeUID(noEditPermission.UID))
+	fakeGuardian.CanViewUIDs = append(fakeGuardian.CanViewUIDs, noEditPermission.UID)
+
+	_, err = folderSvcOn.Create(context.Background(), &folder.CreateFolderCommand{
+		OrgID:        orgID,
+		ParentUID:    noEditPermission.UID,
+		Title:        "subfolder under no edit permission",
+		SignedInUser: &signedInAdminUser,
+	})
+	require.NoError(t, err)
+
+	f, err = folderSvcOn.Create(context.Background(), &folder.CreateFolderCommand{
+		OrgID:        orgID,
+		ParentUID:    noEditPermission.UID,
+		Title:        "subfolder under no edit permission with edit permission",
+		SignedInUser: &signedInAdminUser,
+	})
+	require.NoError(t, err)
+	viewer.Permissions[orgID][dashboards.ActionFoldersWrite] = append(viewer.Permissions[orgID][dashboards.ActionFoldersWrite], dashboards.ScopeFoldersProvider.GetResourceScopeUID(f.UID))
+	fakeGuardian.CanEditUIDs = append(fakeGuardian.CanEditUIDs, f.UID)
+
+	testCases := []struct {
+		name            string
+		q               folder.GetChildrenQuery
+		expectedErr     error
+		expectedFolders []string
+	}{
+		{
+			name: "should return root folders with view permission",
+			q: folder.GetChildrenQuery{
+				OrgID:        orgID,
+				SignedInUser: &viewer,
+			},
+			expectedFolders: []string{
+				"Shared with me",
+				"no edit permission",
+				"with edit permission"},
+		},
+		{
+			name: "should return subfolders with view permission",
+			q: folder.GetChildrenQuery{
+				OrgID:        orgID,
+				SignedInUser: &viewer,
+				UID:          noEditPermission.UID,
+			},
+			expectedFolders: []string{
+				"subfolder under no edit permission",
+				"subfolder under no edit permission with edit permission"},
+		},
+		{
+			name: "should return shared with me folders with view permission",
+			q: folder.GetChildrenQuery{
+				OrgID:        orgID,
+				SignedInUser: &viewer,
+				UID:          folder.SharedWithMeFolderUID,
+			},
+			expectedFolders: []string{
+				"subfolder under no view permission with view permission",
+				"subfolder under no view permission with view permission and with edit permission"},
+		},
+		{
+			name: "should return root folders with edit permission",
+			q: folder.GetChildrenQuery{
+				OrgID:        orgID,
+				SignedInUser: &viewer,
+				Permission:   dashboardaccess.PERMISSION_EDIT,
+			},
+			expectedFolders: []string{
+				"Shared with me",
+				"with edit permission"},
+		},
+		{
+			name: "should fail returning subfolders with edit permission when parent folder has no edit permission",
+			q: folder.GetChildrenQuery{
+				OrgID:        orgID,
+				SignedInUser: &viewer,
+				Permission:   dashboardaccess.PERMISSION_EDIT,
+				UID:          noEditPermission.UID,
+			},
+			expectedErr: dashboards.ErrFolderAccessDenied,
+		},
+		{
+			name: "should return shared with me folders with edit permission",
+			q: folder.GetChildrenQuery{
+				OrgID:        orgID,
+				SignedInUser: &viewer,
+				Permission:   dashboardaccess.PERMISSION_EDIT,
+				UID:          folder.SharedWithMeFolderUID,
+			},
+			expectedFolders: []string{
+				"subfolder under no edit permission with edit permission",
+				"subfolder under no view permission with view permission and with edit permission",
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			folders, err := folderSvcOn.GetChildren(context.Background(), &tc.q)
+			if tc.expectedErr != nil {
+				require.Error(t, err)
+				require.Equal(t, tc.expectedErr, err)
+			} else {
+				require.NoError(t, err)
+				actual := make([]string, 0, len(folders))
+				for _, f := range folders {
+					actual = append(actual, f.Title)
+				}
+				if cmp.Diff(tc.expectedFolders, actual) != "" {
+					t.Fatalf("unexpected folders: %s", cmp.Diff(tc.expectedFolders, actual))
+				}
+			}
+		})
+	}
+}
+
+func TestSupportBundle(t *testing.T) {
+	f := func(uid, parent string) *folder.Folder { return &folder.Folder{UID: uid, ParentUID: parent} }
+	for _, tc := range []struct {
+		Folders          []*folder.Folder
+		ExpectedTotal    int
+		ExpectedDepths   map[int]int
+		ExpectedChildren map[int]int
+	}{
+		// Empty folder list
+		{
+			Folders:          []*folder.Folder{},
+			ExpectedTotal:    0,
+			ExpectedDepths:   map[int]int{},
+			ExpectedChildren: map[int]int{},
+		},
+		// Single folder
+		{
+			Folders:          []*folder.Folder{f("a", "")},
+			ExpectedTotal:    1,
+			ExpectedDepths:   map[int]int{1: 1},
+			ExpectedChildren: map[int]int{0: 1},
+		},
+		// Flat folders
+		{
+			Folders:          []*folder.Folder{f("a", ""), f("b", ""), f("c", "")},
+			ExpectedTotal:    3,
+			ExpectedDepths:   map[int]int{1: 3},
+			ExpectedChildren: map[int]int{0: 3},
+		},
+		// Nested folders
+		{
+			Folders:          []*folder.Folder{f("a", ""), f("ab", "a"), f("ac", "a"), f("x", ""), f("xy", "x"), f("xyz", "xy")},
+			ExpectedTotal:    6,
+			ExpectedDepths:   map[int]int{1: 2, 2: 3, 3: 1},
+			ExpectedChildren: map[int]int{0: 3, 1: 2, 2: 1},
+		},
+	} {
+		svc := &Service{}
+		supportItem, err := svc.supportItemFromFolders(tc.Folders)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		stats := struct {
+			Total    int         `json:"total"`
+			Depths   map[int]int `json:"depths"`
+			Children map[int]int `json:"children"`
+		}{}
+		if err := json.Unmarshal(supportItem.FileBytes, &stats); err != nil {
+			t.Fatal(err)
+		}
+
+		if stats.Total != tc.ExpectedTotal {
+			t.Error("Total mismatch", stats, tc)
+		}
+		if fmt.Sprint(stats.Depths) != fmt.Sprint(tc.ExpectedDepths) {
+			t.Error("Depths mismatch", stats, tc.ExpectedDepths)
+		}
+		if fmt.Sprint(stats.Children) != fmt.Sprint(tc.ExpectedChildren) {
+			t.Error("Depths mismatch", stats, tc.ExpectedChildren)
+		}
+	}
+}
+
+func CreateSubtreeInStore(t *testing.T, store store, service *Service, depth int, prefix string, cmd folder.CreateFolderCommand) []*folder.Folder {
+	t.Helper()
+
+	folders := make([]*folder.Folder, 0, depth)
 	for i := 0; i < depth; i++ {
 		title := fmt.Sprintf("%sfolder-%d", prefix, i)
 		cmd.Title = title
@@ -1195,26 +2123,14 @@ func CreateSubtreeInStore(t *testing.T, store *sqlStore, service *Service, depth
 		f, err := service.Create(context.Background(), &cmd)
 		require.NoError(t, err)
 		require.Equal(t, title, f.Title)
-		require.NotEmpty(t, f.ID)
 		require.NotEmpty(t, f.UID)
 
-		parents, err := store.GetParents(context.Background(), folder.GetParentsQuery{
-			UID:   f.UID,
-			OrgID: cmd.OrgID,
-		})
-		require.NoError(t, err)
-		parentUIDs := []string{}
-		for _, p := range parents {
-			parentUIDs = append(parentUIDs, p.UID)
-		}
-		require.Equal(t, ancestorUIDs, parentUIDs)
-
-		ancestorUIDs = append(ancestorUIDs, f.UID)
+		folders = append(folders, f)
 
 		cmd.ParentUID = f.UID
 	}
 
-	return ancestorUIDs
+	return folders
 }
 
 func setup(t *testing.T, dashStore dashboards.Store, dashboardFolderStore folder.FolderStore, nestedFolderStore store, features featuremgmt.FeatureToggles, ac accesscontrol.AccessControl, db db.DB) folder.Service {
@@ -1231,6 +2147,7 @@ func setup(t *testing.T, dashStore dashboards.Store, dashboardFolderStore folder
 		features:             features,
 		accessControl:        ac,
 		db:                   db,
+		metrics:              newFoldersMetrics(nil),
 	}
 }
 
diff --git a/pkg/services/folder/folderimpl/metrics.go b/pkg/services/folder/folderimpl/metrics.go
new file mode 100644
index 0000000000000..2f72c1ac64331
--- /dev/null
+++ b/pkg/services/folder/folderimpl/metrics.go
@@ -0,0 +1,41 @@
+package folderimpl
+
+import (
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
+)
+
+const (
+	metricsNamespace = "grafana"
+	metricsSubSystem = "folders"
+)
+
+type foldersMetrics struct {
+	sharedWithMeFetchFoldersRequestsDuration *prometheus.HistogramVec
+	foldersGetChildrenRequestsDuration       *prometheus.HistogramVec
+}
+
+func newFoldersMetrics(r prometheus.Registerer) *foldersMetrics {
+	return &foldersMetrics{
+		sharedWithMeFetchFoldersRequestsDuration: promauto.With(r).NewHistogramVec(
+			prometheus.HistogramOpts{
+				Name:      "sharedwithme_fetch_folders_duration_seconds",
+				Help:      "Duration of fetching folders with permissions directly assigned to user",
+				Buckets:   []float64{.005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10, 25, 50, 100},
+				Namespace: metricsNamespace,
+				Subsystem: metricsSubSystem,
+			},
+			[]string{"status"},
+		),
+		foldersGetChildrenRequestsDuration: promauto.With(r).NewHistogramVec(
+			prometheus.HistogramOpts{
+				Name:      "get_children_duration_seconds",
+				Help:      "Duration of listing subfolders in specific folder",
+				Buckets:   []float64{.005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10, 25, 50, 100},
+				Namespace: metricsNamespace,
+				Subsystem: metricsSubSystem,
+			},
+			[]string{"parent"},
+		),
+	}
+}
diff --git a/pkg/services/folder/folderimpl/sqlstore.go b/pkg/services/folder/folderimpl/sqlstore.go
index 7bac08fe0d74c..d77ef2bcd44e6 100644
--- a/pkg/services/folder/folderimpl/sqlstore.go
+++ b/pkg/services/folder/folderimpl/sqlstore.go
@@ -2,30 +2,36 @@ package folderimpl
 
 import (
 	"context"
+	"fmt"
+	"runtime"
 	"strings"
 	"time"
 
 	"github.com/grafana/dskit/concurrency"
+
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/infra/metrics"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/folder"
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
 )
 
+const DEFAULT_BATCH_SIZE = 999
+
 type sqlStore struct {
 	db  db.DB
 	log log.Logger
 	cfg *setting.Cfg
-	fm  featuremgmt.FeatureToggles
 }
 
 // sqlStore implements the store interface.
 var _ store = (*sqlStore)(nil)
 
-func ProvideStore(db db.DB, cfg *setting.Cfg, features featuremgmt.FeatureToggles) *sqlStore {
-	return &sqlStore{db: db, log: log.New("folder-store"), cfg: cfg, fm: features}
+func ProvideStore(db db.DB, cfg *setting.Cfg) *sqlStore {
+	return &sqlStore{db: db, log: log.New("folder-store"), cfg: cfg}
 }
 
 func (ss *sqlStore) Create(ctx context.Context, cmd folder.CreateFolderCommand) (*folder.Folder, error) {
@@ -65,8 +71,9 @@ func (ss *sqlStore) Create(ctx context.Context, cmd folder.CreateFolderCommand)
 			return err
 		}
 
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Folder).Inc()
 		foldr, err = ss.Get(ctx, folder.GetFolderQuery{
-			ID: &lastInsertedID,
+			ID: &lastInsertedID, // nolint:staticcheck
 		})
 		if err != nil {
 			return err
@@ -76,11 +83,21 @@ func (ss *sqlStore) Create(ctx context.Context, cmd folder.CreateFolderCommand)
 	return foldr.WithURL(), err
 }
 
-func (ss *sqlStore) Delete(ctx context.Context, uid string, orgID int64) error {
+func (ss *sqlStore) Delete(ctx context.Context, UIDs []string, orgID int64) error {
+	if len(UIDs) == 0 {
+		return nil
+	}
 	return ss.db.WithDbSession(ctx, func(sess *db.Session) error {
-		_, err := sess.Exec("DELETE FROM folder WHERE uid=? AND org_id=?", uid, orgID)
+		// covered by UQE_folder_org_id_uid
+		s := fmt.Sprintf("DELETE FROM folder WHERE org_id=? AND uid IN (%s)", strings.Repeat("?, ", len(UIDs)-1)+"?")
+		sqlArgs := make([]any, 0, len(UIDs)+2)
+		sqlArgs = append(sqlArgs, s, orgID)
+		for _, uid := range UIDs {
+			sqlArgs = append(sqlArgs, uid)
+		}
+		_, err := sess.Exec(sqlArgs...)
 		if err != nil {
-			return folder.ErrDatabaseError.Errorf("failed to delete folder: %w", err)
+			return folder.ErrDatabaseError.Errorf("failed to delete folders: %w", err)
 		}
 		return nil
 	})
@@ -124,6 +141,7 @@ func (ss *sqlStore) Update(ctx context.Context, cmd folder.UpdateFolderCommand)
 		}
 
 		sql.WriteString(strings.Join(columnsToUpdate, ", "))
+		// covered by UQE_folder_org_id_uid
 		sql.WriteString(" WHERE uid = ? AND org_id = ?")
 		args = append(args, cmd.UID, cmd.OrgID)
 
@@ -139,7 +157,7 @@ func (ss *sqlStore) Update(ctx context.Context, cmd folder.UpdateFolderCommand)
 			return folder.ErrInternal.Errorf("failed to get affected row: %w", err)
 		}
 		if affected == 0 {
-			return folder.ErrInternal.Errorf("no folders are updated")
+			return folder.ErrInternal.Errorf("no folders are updated: %w", folder.ErrFolderNotFound)
 		}
 
 		foldr, err = ss.Get(ctx, folder.GetFolderQuery{
@@ -155,18 +173,60 @@ func (ss *sqlStore) Update(ctx context.Context, cmd folder.UpdateFolderCommand)
 	return foldr.WithURL(), err
 }
 
+// If WithFullpath is true it computes also the full path of a folder.
+// The full path is a string that contains the titles of all parent folders separated by a slash.
+// For example, if the folder structure is:
+//
+//	A
+//	└── B
+//	    └── C
+//
+// The full path of C is "A/B/C".
+// The full path of B is "A/B".
+// The full path of A is "A".
+// If a folder contains a slash in its title, it is escaped with a backslash.
+// For example, if the folder structure is:
+//
+//	A
+//	└── B/C
+//
+// The full path of C is "A/B\/C".
 func (ss *sqlStore) Get(ctx context.Context, q folder.GetFolderQuery) (*folder.Folder, error) {
 	foldr := &folder.Folder{}
 	err := ss.db.WithDbSession(ctx, func(sess *db.Session) error {
 		exists := false
 		var err error
+		s := strings.Builder{}
+		s.WriteString("SELECT *")
+		if q.WithFullpath {
+			s.WriteString(fmt.Sprintf(`, %s AS fullpath`, getFullpathSQL(ss.db.GetDialect())))
+		}
+		s.WriteString(" FROM folder f0")
+		if q.WithFullpath {
+			s.WriteString(getFullpathJoinsSQL())
+		}
 		switch {
 		case q.UID != nil:
-			exists, err = sess.SQL("SELECT * FROM folder WHERE uid = ? AND org_id = ?", q.UID, q.OrgID).Get(foldr)
+			// covered UQE_folder_uid_org_id
+			s.WriteString(" WHERE f0.uid = ? AND f0.org_id = ?")
+			exists, err = sess.SQL(s.String(), q.UID, q.OrgID).Get(foldr)
+		// nolint:staticcheck
 		case q.ID != nil:
-			exists, err = sess.SQL("SELECT * FROM folder WHERE id = ?", q.ID).Get(foldr)
+			s.WriteString(" WHERE f0.id = ?")
+			metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Folder).Inc()
+			// covered by primary key
+			exists, err = sess.SQL(s.String(), q.ID).Get(foldr)
 		case q.Title != nil:
-			exists, err = sess.SQL("SELECT * FROM folder WHERE title = ? AND org_id = ?", q.Title, q.OrgID).Get(foldr)
+			// covered by UQE_folder_org_id_parent_uid_title
+			s.WriteString(" WHERE f0.title = ? AND f0.org_id = ?")
+			args := []any{*q.Title, q.OrgID}
+			if q.ParentUID != nil {
+				s.WriteString(" AND f0.parent_uid = ?")
+				args = append(args, *q.ParentUID)
+			} else {
+				s.WriteString(" AND f0.parent_uid IS NULL")
+			}
+			exists, err = sess.SQL(s.String(), args...).Get(foldr)
 		default:
 			return folder.ErrBadRequest.Errorf("one of ID, UID, or Title must be included in the command")
 		}
@@ -174,10 +234,13 @@ func (ss *sqlStore) Get(ctx context.Context, q folder.GetFolderQuery) (*folder.F
 			return folder.ErrDatabaseError.Errorf("failed to get folder: %w", err)
 		}
 		if !exists {
-			return folder.ErrFolderNotFound.Errorf("folder not found")
+			// embed dashboards.ErrFolderNotFound
+			return folder.ErrFolderNotFound.Errorf("%w", dashboards.ErrFolderNotFound)
 		}
 		return nil
 	})
+
+	foldr.Fullpath = strings.TrimLeft(foldr.Fullpath, "/")
 	return foldr.WithURL(), err
 }
 
@@ -187,6 +250,7 @@ func (ss *sqlStore) GetParents(ctx context.Context, q folder.GetParentsQuery) ([
 	}
 	var folders []*folder.Folder
 
+	// covered by UQE_folder_org_id_uid
 	recQuery := `
 		WITH RECURSIVE RecQry AS (
 			SELECT * FROM folder WHERE uid = ? AND org_id = ?
@@ -211,7 +275,7 @@ func (ss *sqlStore) GetParents(ctx context.Context, q folder.GetParentsQuery) ([
 			return nil, err
 		}
 
-		if err := concurrency.ForEachJob(ctx, len(folders), len(folders), func(ctx context.Context, idx int) error {
+		if err := concurrency.ForEachJob(ctx, len(folders), runtime.NumCPU(), func(ctx context.Context, idx int) error {
 			folders[idx].WithURL()
 			return nil
 		}); err != nil {
@@ -225,7 +289,7 @@ func (ss *sqlStore) GetParents(ctx context.Context, q folder.GetParentsQuery) ([
 	if len(folders) < 1 {
 		// the query is expected to return at least the same folder
 		// if it's empty it means that the folder does not exist
-		return nil, folder.ErrFolderNotFound
+		return nil, folder.ErrFolderNotFound.Errorf("folder not found")
 	}
 
 	return util.Reverse(folders[1:]), nil
@@ -237,14 +301,28 @@ func (ss *sqlStore) GetChildren(ctx context.Context, q folder.GetChildrenQuery)
 	err := ss.db.WithDbSession(ctx, func(sess *db.Session) error {
 		sql := strings.Builder{}
 		args := make([]any, 0, 2)
+		// covered by UQE_folder_org_id_parent_uid_title
 		if q.UID == "" {
-			sql.WriteString("SELECT * FROM folder WHERE parent_uid IS NULL AND org_id=? ORDER BY title ASC")
+			sql.WriteString("SELECT * FROM folder WHERE parent_uid IS NULL AND org_id=?")
 			args = append(args, q.OrgID)
 		} else {
-			sql.WriteString("SELECT * FROM folder WHERE parent_uid=? AND org_id=? ORDER BY title ASC")
+			sql.WriteString("SELECT * FROM folder WHERE parent_uid=? AND org_id=?")
 			args = append(args, q.UID, q.OrgID)
 		}
 
+		if len(q.FolderUIDs) > 0 {
+			sql.WriteString(" AND uid IN (")
+			for i, uid := range q.FolderUIDs {
+				if i > 0 {
+					sql.WriteString(", ")
+				}
+				sql.WriteString("?")
+				args = append(args, uid)
+			}
+			sql.WriteString(")")
+		}
+		sql.WriteString(" ORDER BY title ASC")
+
 		if q.Limit != 0 {
 			var offset int64 = 0
 			if q.Page > 0 {
@@ -257,7 +335,7 @@ func (ss *sqlStore) GetChildren(ctx context.Context, q folder.GetChildrenQuery)
 			return folder.ErrDatabaseError.Errorf("failed to get folder children: %w", err)
 		}
 
-		if err := concurrency.ForEachJob(ctx, len(folders), len(folders), func(ctx context.Context, idx int) error {
+		if err := concurrency.ForEachJob(ctx, len(folders), runtime.NumCPU(), func(ctx context.Context, idx int) error {
 			folders[idx].WithURL()
 			return nil
 		}); err != nil {
@@ -268,19 +346,21 @@ func (ss *sqlStore) GetChildren(ctx context.Context, q folder.GetChildrenQuery)
 	return folders, err
 }
 
-func (ss *sqlStore) getParentsMySQL(ctx context.Context, cmd folder.GetParentsQuery) (folders []*folder.Folder, err error) {
+func (ss *sqlStore) getParentsMySQL(ctx context.Context, q folder.GetParentsQuery) (folders []*folder.Folder, err error) {
 	err = ss.db.WithDbSession(ctx, func(sess *db.Session) error {
 		uid := ""
-		ok, err := sess.SQL("SELECT parent_uid FROM folder WHERE org_id=? AND uid=?", cmd.OrgID, cmd.UID).Get(&uid)
+		// covered by UQE_folder_org_id_uid
+		ok, err := sess.SQL("SELECT parent_uid FROM folder WHERE org_id=? AND uid=?", q.OrgID, q.UID).Get(&uid)
 		if err != nil {
 			return err
 		}
 		if !ok {
-			return folder.ErrFolderNotFound
+			return folder.ErrFolderNotFound.Errorf("folder not found")
 		}
 		for {
 			f := &folder.Folder{}
-			ok, err := sess.SQL("SELECT * FROM folder WHERE org_id=? AND uid=?", cmd.OrgID, uid).Get(f)
+			// covered by UQE_folder_org_id_uid
+			ok, err := sess.SQL("SELECT * FROM folder WHERE org_id=? AND uid=?", q.OrgID, uid).Get(f)
 			if err != nil {
 				return err
 			}
@@ -299,6 +379,7 @@ func (ss *sqlStore) getParentsMySQL(ctx context.Context, cmd folder.GetParentsQu
 	return util.Reverse(folders), err
 }
 
+// TODO use a single query to get the height of a folder
 func (ss *sqlStore) GetHeight(ctx context.Context, foldrUID string, orgID int64, parentUID *string) (int, error) {
 	height := -1
 	queue := []string{foldrUID}
@@ -325,3 +406,254 @@ func (ss *sqlStore) GetHeight(ctx context.Context, foldrUID string, orgID int64,
 	}
 	return height, nil
 }
+
+// GetFolders returns org folders by their UIDs.
+// If UIDs is empty, it returns all folders in the org.
+// If WithFullpath is true it computes also the full path of a folder.
+// The full path is a string that contains the titles of all parent folders separated by a slash.
+// For example, if the folder structure is:
+//
+//	A
+//	└── B
+//	    └── C
+//
+// The full path of C is "A/B/C".
+// The full path of B is "A/B".
+// The full path of A is "A".
+// If a folder contains a slash in its title, it is escaped with a backslash.
+// For example, if the folder structure is:
+//
+//	A
+//	└── B/C
+//
+// The full path of C is "A/B\/C".
+//
+// If FullpathUIDs is true it computes a string that contains the UIDs of all parent folders separated by slash.
+// For example, if the folder structure is:
+//
+//	A (uid: "uid1")
+//	└── B (uid: "uid2")
+//	    └── C (uid: "uid3")
+//
+// The full path UIDs of C is "uid1/uid2/uid3".
+// The full path UIDs of B is "uid1/uid2".
+// The full path UIDs of A is "uid1".
+func (ss *sqlStore) GetFolders(ctx context.Context, q getFoldersQuery) ([]*folder.Folder, error) {
+	if q.BatchSize == 0 {
+		q.BatchSize = DEFAULT_BATCH_SIZE
+	}
+
+	var folders []*folder.Folder
+	if err := ss.db.WithDbSession(ctx, func(sess *db.Session) error {
+		return batch(len(q.UIDs), int(q.BatchSize), func(start, end int) error {
+			partialFolders := make([]*folder.Folder, 0, q.BatchSize)
+			partialUIDs := q.UIDs[start:min(end, len(q.UIDs))]
+			s := strings.Builder{}
+			s.WriteString(`SELECT f0.id, f0.org_id, f0.uid, f0.parent_uid, f0.title, f0.description, f0.created, f0.updated`)
+			// compute full path column if requested
+			if q.WithFullpath {
+				s.WriteString(fmt.Sprintf(`, %s AS fullpath`, getFullpathSQL(ss.db.GetDialect())))
+			}
+			// compute full path UIDs column if requested
+			if q.WithFullpathUIDs {
+				s.WriteString(fmt.Sprintf(`, %s AS fullpath_uids`, getFullapathUIDsSQL(ss.db.GetDialect())))
+			}
+			s.WriteString(` FROM folder f0`)
+			// join the same table multiple times to compute the full path of a folder
+			if q.WithFullpath || q.WithFullpathUIDs || len(q.ancestorUIDs) > 0 {
+				s.WriteString(getFullpathJoinsSQL())
+			}
+			// covered by UQE_folder_org_id_uid
+			args := []any{}
+			if q.OrgID > 0 {
+				s.WriteString(` WHERE f0.org_id=?`)
+				args = []any{q.OrgID}
+			}
+			if len(partialUIDs) > 0 {
+				s.WriteString(` AND f0.uid IN (?` + strings.Repeat(", ?", len(partialUIDs)-1) + `)`)
+				for _, uid := range partialUIDs {
+					args = append(args, uid)
+				}
+			}
+
+			if len(q.ancestorUIDs) == 0 {
+				if q.OrderByTitle {
+					s.WriteString(` ORDER BY f0.title ASC`)
+				}
+
+				err := sess.SQL(s.String(), args...).Find(&partialFolders)
+				if err != nil {
+					return err
+				}
+				folders = append(folders, partialFolders...)
+				return nil
+			}
+
+			// filter out folders if they are not in the subtree of the given ancestor folders
+			if err := batch(len(q.ancestorUIDs), int(q.BatchSize), func(start2, end2 int) error {
+				s2, args2 := getAncestorsSQL(ss.db.GetDialect(), q.ancestorUIDs, start2, end2, s.String(), args)
+				if q.OrderByTitle {
+					s2 += " ORDER BY f0.title ASC"
+				}
+				err := sess.SQL(s2, args2...).Find(&partialFolders)
+				if err != nil {
+					return err
+				}
+				folders = append(folders, partialFolders...)
+				return nil
+			}); err != nil {
+				return err
+			}
+			return nil
+		})
+	}); err != nil {
+		return nil, err
+	}
+
+	// Add URLs
+	for i, f := range folders {
+		f.Fullpath = strings.TrimLeft(f.Fullpath, "/")
+		f.FullpathUIDs = strings.TrimLeft(f.FullpathUIDs, "/")
+		folders[i] = f.WithURL()
+	}
+
+	return folders, nil
+}
+
+func (ss *sqlStore) GetDescendants(ctx context.Context, orgID int64, ancestor_uid string) ([]*folder.Folder, error) {
+	var folders []*folder.Folder
+
+	recursiveQueriesAreSupported, err := ss.db.RecursiveQueriesAreSupported()
+	if err != nil {
+		return nil, err
+	}
+	switch recursiveQueriesAreSupported {
+	case true:
+		// covered by UQE_folder_org_id_parent_uid_title
+		recQuery := `
+		WITH RECURSIVE RecQry AS (
+			SELECT * FROM folder WHERE parent_uid = ? AND org_id = ?
+			UNION ALL SELECT f.* FROM folder f INNER JOIN RecQry r ON f.parent_uid = r.uid and f.org_id = r.org_id
+		)
+		SELECT * FROM RecQry;
+	`
+		if err := ss.db.WithDbSession(ctx, func(sess *db.Session) error {
+			err := sess.SQL(recQuery, ancestor_uid, orgID).Find(&folders)
+			if err != nil {
+				return folder.ErrDatabaseError.Errorf("failed to get folder descendants: %w", err)
+			}
+			return nil
+		}); err != nil {
+			return nil, err
+		}
+	default:
+		// this is suboptimal because results is full table scan on f0
+		// but it's the best we can do without recursive CTE
+		if err := ss.db.WithDbSession(ctx, func(sess *db.Session) error {
+			s := strings.Builder{}
+			args := make([]any, 0, 1+folder.MaxNestedFolderDepth)
+			args = append(args, orgID)
+			// covered by UQE_folder_org_id_uid
+			s.WriteString(`SELECT f0.id, f0.org_id, f0.uid, f0.parent_uid, f0.title, f0.description, f0.created, f0.updated`)
+			s.WriteString(` FROM folder f0`)
+			s.WriteString(getFullpathJoinsSQL())
+			s.WriteString(` WHERE f0.org_id=?`)
+			s.WriteString(` AND (`)
+			for i := 1; i <= folder.MaxNestedFolderDepth; i++ {
+				if i > 1 {
+					s.WriteString(` OR `)
+				}
+				s.WriteString(fmt.Sprintf(`f%d.uid=?`, i))
+				args = append(args, ancestor_uid)
+			}
+			s.WriteString(`)`)
+			return sess.SQL(s.String(), args...).Find(&folders)
+		}); err != nil {
+			return nil, err
+		}
+	}
+
+	// Add URLs
+	for i, f := range folders {
+		folders[i] = f.WithURL()
+	}
+
+	return folders, nil
+}
+
+func getFullpathSQL(dialect migrator.Dialect) string {
+	escaped := "\\/"
+	if dialect.DriverName() == migrator.MySQL {
+		escaped = "\\\\/"
+	}
+	concatCols := make([]string, 0, folder.MaxNestedFolderDepth)
+	concatCols = append(concatCols, fmt.Sprintf("COALESCE(REPLACE(f0.title, '/', '%s'), '')", escaped))
+	for i := 1; i <= folder.MaxNestedFolderDepth; i++ {
+		concatCols = append([]string{fmt.Sprintf("COALESCE(REPLACE(f%d.title, '/', '%s'), '')", i, escaped), "'/'"}, concatCols...)
+	}
+	return dialect.Concat(concatCols...)
+}
+
+func getFullapathUIDsSQL(dialect migrator.Dialect) string {
+	concatCols := make([]string, 0, folder.MaxNestedFolderDepth)
+	concatCols = append(concatCols, "COALESCE(f0.uid, '')")
+	for i := 1; i <= folder.MaxNestedFolderDepth; i++ {
+		concatCols = append([]string{fmt.Sprintf("COALESCE(f%d.uid, '')", i), "'/'"}, concatCols...)
+	}
+	return dialect.Concat(concatCols...)
+}
+
+// getFullpathJoinsSQL returns a SQL fragment that joins the same table multiple times to get the full path of a folder.
+func getFullpathJoinsSQL() string {
+	joins := make([]string, 0, folder.MaxNestedFolderDepth)
+	for i := 1; i <= folder.MaxNestedFolderDepth; i++ {
+		// covered by UQE_folder_org_id_uid
+		joins = append(joins, fmt.Sprintf(` LEFT JOIN folder f%d ON f%d.org_id = f%d.org_id AND f%d.uid = f%d.parent_uid`, i, i, i-1, i, i-1))
+	}
+	return strings.Join(joins, "\n")
+}
+
+func getAncestorsSQL(dialect migrator.Dialect, ancestorUIDs []string, start int, end int, origSQL string, origArgs []any) (string, []any) {
+	s2 := strings.Builder{}
+	s2.WriteString(origSQL)
+	args2 := make([]any, 0, len(ancestorUIDs)*folder.MaxNestedFolderDepth)
+	args2 = append(args2, origArgs...)
+
+	partialAncestorUIDs := ancestorUIDs[start:min(end, len(ancestorUIDs))]
+	partialArgs := make([]any, 0, len(partialAncestorUIDs))
+	for _, uid := range partialAncestorUIDs {
+		partialArgs = append(partialArgs, uid)
+	}
+	s2.WriteString(` AND ( f0.uid IN (?` + strings.Repeat(", ?", len(partialAncestorUIDs)-1) + `)`)
+	args2 = append(args2, partialArgs...)
+	for i := 1; i <= folder.MaxNestedFolderDepth; i++ {
+		s2.WriteString(fmt.Sprintf(` OR f%d.uid IN (?`+strings.Repeat(", ?", len(partialAncestorUIDs)-1)+`)`, i))
+		args2 = append(args2, partialArgs...)
+	}
+	s2.WriteString(` )`)
+	return s2.String(), args2
+}
+
+func batch(count, batchSize int, eachFn func(start, end int) error) error {
+	if count == 0 {
+		if err := eachFn(0, 0); err != nil {
+			return err
+		}
+		return nil
+	}
+
+	for i := 0; i < count; {
+		end := i + batchSize
+		if end > count {
+			end = count
+		}
+
+		if err := eachFn(i, end); err != nil {
+			return err
+		}
+
+		i = end
+	}
+
+	return nil
+}
diff --git a/pkg/services/folder/folderimpl/sqlstore_test.go b/pkg/services/folder/folderimpl/sqlstore_test.go
index 21f7ba880099d..08df34d0568df 100644
--- a/pkg/services/folder/folderimpl/sqlstore_test.go
+++ b/pkg/services/folder/folderimpl/sqlstore_test.go
@@ -3,14 +3,16 @@ package folderimpl
 import (
 	"context"
 	"fmt"
+	"path"
+	"slices"
 	"sort"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/org/orgimpl"
@@ -28,7 +30,7 @@ func TestIntegrationCreate(t *testing.T) {
 	}
 
 	db := sqlstore.InitTestDB(t)
-	folderStore := ProvideStore(db, db.Cfg, featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders))
+	folderStore := ProvideStore(db, db.Cfg)
 
 	orgID := CreateOrg(t, db)
 
@@ -63,13 +65,13 @@ func TestIntegrationCreate(t *testing.T) {
 		require.NoError(t, err)
 
 		t.Cleanup(func() {
-			err := folderStore.Delete(context.Background(), f.UID, orgID)
+			err := folderStore.Delete(context.Background(), []string{f.UID}, orgID)
 			require.NoError(t, err)
 		})
 
 		assert.Equal(t, folderTitle, f.Title)
 		assert.Equal(t, folderDsc, f.Description)
-		assert.NotEmpty(t, f.ID)
+		assert.NotEmpty(t, f.UID)
 		assert.Equal(t, uid, f.UID)
 		assert.Empty(t, f.ParentUID)
 		assert.NotEmpty(t, f.URL)
@@ -96,12 +98,12 @@ func TestIntegrationCreate(t *testing.T) {
 		})
 		require.NoError(t, err)
 		require.Equal(t, "parent", parent.Title)
-		require.NotEmpty(t, parent.ID)
+		require.NotEmpty(t, parent.UID)
 		assert.Equal(t, parentUID, parent.UID)
 		assert.NotEmpty(t, parent.URL)
 
 		t.Cleanup(func() {
-			err := folderStore.Delete(context.Background(), parent.UID, orgID)
+			err := folderStore.Delete(context.Background(), []string{parent.UID}, orgID)
 			require.NoError(t, err)
 		})
 		assertAncestorUIDs(t, folderStore, parent, []string{folder.GeneralFolderUID})
@@ -116,13 +118,13 @@ func TestIntegrationCreate(t *testing.T) {
 		})
 		require.NoError(t, err)
 		t.Cleanup(func() {
-			err := folderStore.Delete(context.Background(), f.UID, orgID)
+			err := folderStore.Delete(context.Background(), []string{f.UID}, orgID)
 			require.NoError(t, err)
 		})
 
 		assert.Equal(t, folderTitle, f.Title)
 		assert.Equal(t, folderDsc, f.Description)
-		assert.NotEmpty(t, f.ID)
+		assert.NotEmpty(t, f.UID)
 		assert.Equal(t, uid, f.UID)
 		assert.Equal(t, parentUID, f.ParentUID)
 		assert.NotEmpty(t, f.URL)
@@ -148,7 +150,7 @@ func TestIntegrationDelete(t *testing.T) {
 	}
 
 	db := sqlstore.InitTestDB(t)
-	folderStore := ProvideStore(db, db.Cfg, featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders))
+	folderStore := ProvideStore(db, db.Cfg)
 
 	orgID := CreateOrg(t, db)
 
@@ -164,7 +166,7 @@ func TestIntegrationDelete(t *testing.T) {
 
 	t.Cleanup(func() {
 		for _, uid := range ancestorUIDs[1:] {
-			err := folderStore.Delete(context.Background(), uid, orgID)
+			err := folderStore.Delete(context.Background(), []string{uid}, orgID)
 			require.NoError(t, err)
 		}
 	})
@@ -177,7 +179,7 @@ func TestIntegrationDelete(t *testing.T) {
 	*/
 
 	t.Run("deleting a leaf folder should succeed", func(t *testing.T) {
-		err := folderStore.Delete(context.Background(), ancestorUIDs[len(ancestorUIDs)-1], orgID)
+		err := folderStore.Delete(context.Background(), []string{ancestorUIDs[len(ancestorUIDs)-1]}, orgID)
 		require.NoError(t, err)
 
 		children, err := folderStore.GetChildren(context.Background(), folder.GetChildrenQuery{
@@ -195,7 +197,7 @@ func TestIntegrationUpdate(t *testing.T) {
 	}
 
 	db := sqlstore.InitTestDB(t)
-	folderStore := ProvideStore(db, db.Cfg, featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders))
+	folderStore := ProvideStore(db, db.Cfg)
 
 	orgID := CreateOrg(t, db)
 
@@ -220,7 +222,7 @@ func TestIntegrationUpdate(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, f.ParentUID, parent.UID)
 	t.Cleanup(func() {
-		err := folderStore.Delete(context.Background(), f.UID, orgID)
+		err := folderStore.Delete(context.Background(), []string{f.UID}, orgID)
 		require.NoError(t, err)
 	})
 
@@ -370,7 +372,7 @@ func TestIntegrationGet(t *testing.T) {
 	}
 
 	db := sqlstore.InitTestDB(t)
-	folderStore := ProvideStore(db, db.Cfg, featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders))
+	folderStore := ProvideStore(db, db.Cfg)
 
 	orgID := CreateOrg(t, db)
 
@@ -383,11 +385,14 @@ func TestIntegrationGet(t *testing.T) {
 		UID:         uid1,
 	})
 	require.NoError(t, err)
-
-	t.Cleanup(func() {
-		err := folderStore.Delete(context.Background(), f.UID, orgID)
-		require.NoError(t, err)
+	subfolderWithSameName, err := folderStore.Create(context.Background(), folder.CreateFolderCommand{
+		Title:       folderTitle,
+		Description: folderDsc,
+		OrgID:       orgID,
+		UID:         util.GenerateShortUID(),
+		ParentUID:   f.UID,
 	})
+	require.NoError(t, err)
 
 	t.Run("should gently fail in case of bad request", func(t *testing.T) {
 		_, err = folderStore.Get(context.Background(), folder.GetFolderQuery{})
@@ -400,7 +405,6 @@ func TestIntegrationGet(t *testing.T) {
 			OrgID: orgID,
 		})
 		require.NoError(t, err)
-		assert.Equal(t, f.ID, ff.ID)
 		assert.Equal(t, f.UID, ff.UID)
 		assert.Equal(t, f.OrgID, ff.OrgID)
 		assert.Equal(t, f.Title, ff.Title)
@@ -417,7 +421,6 @@ func TestIntegrationGet(t *testing.T) {
 			OrgID: orgID,
 		})
 		require.NoError(t, err)
-		assert.Equal(t, f.ID, ff.ID)
 		assert.Equal(t, f.UID, ff.UID)
 		assert.Equal(t, f.OrgID, ff.OrgID)
 		assert.Equal(t, f.Title, ff.Title)
@@ -428,12 +431,29 @@ func TestIntegrationGet(t *testing.T) {
 		assert.NotEmpty(t, ff.URL)
 	})
 
+	t.Run("get folder by title and parent UID should succeed", func(t *testing.T) {
+		ff, err := folderStore.Get(context.Background(), folder.GetFolderQuery{
+			Title:     &f.Title,
+			OrgID:     orgID,
+			ParentUID: &uid1,
+		})
+		require.NoError(t, err)
+		assert.Equal(t, subfolderWithSameName.UID, ff.UID)
+		assert.Equal(t, subfolderWithSameName.OrgID, ff.OrgID)
+		assert.Equal(t, subfolderWithSameName.Title, ff.Title)
+		assert.Equal(t, subfolderWithSameName.Description, ff.Description)
+		assert.Equal(t, subfolderWithSameName.ParentUID, ff.ParentUID)
+		assert.NotEmpty(t, ff.Created)
+		assert.NotEmpty(t, ff.Updated)
+		assert.NotEmpty(t, ff.URL)
+	})
+
 	t.Run("get folder by title should succeed", func(t *testing.T) {
 		ff, err := folderStore.Get(context.Background(), folder.GetFolderQuery{
-			ID: &f.ID,
+			UID:   &f.UID,
+			OrgID: orgID,
 		})
 		require.NoError(t, err)
-		assert.Equal(t, f.ID, ff.ID)
 		assert.Equal(t, f.UID, ff.UID)
 		assert.Equal(t, f.OrgID, ff.OrgID)
 		assert.Equal(t, f.Title, ff.Title)
@@ -443,6 +463,24 @@ func TestIntegrationGet(t *testing.T) {
 		assert.NotEmpty(t, ff.Updated)
 		assert.NotEmpty(t, ff.URL)
 	})
+
+	t.Run("get folder with fullpath should set fullpath as expected", func(t *testing.T) {
+		ff, err := folderStore.Get(context.Background(), folder.GetFolderQuery{
+			UID:          &subfolderWithSameName.UID,
+			OrgID:        orgID,
+			WithFullpath: true,
+		})
+		require.NoError(t, err)
+		assert.Equal(t, subfolderWithSameName.UID, ff.UID)
+		assert.Equal(t, subfolderWithSameName.OrgID, ff.OrgID)
+		assert.Equal(t, subfolderWithSameName.Title, ff.Title)
+		assert.Equal(t, subfolderWithSameName.Description, ff.Description)
+		assert.Equal(t, path.Join(f.Title, subfolderWithSameName.Title), ff.Fullpath)
+		assert.Equal(t, f.UID, ff.ParentUID)
+		assert.NotEmpty(t, ff.Created)
+		assert.NotEmpty(t, ff.Updated)
+		assert.NotEmpty(t, ff.URL)
+	})
 }
 
 func TestIntegrationGetParents(t *testing.T) {
@@ -451,7 +489,7 @@ func TestIntegrationGetParents(t *testing.T) {
 	}
 
 	db := sqlstore.InitTestDB(t)
-	folderStore := ProvideStore(db, db.Cfg, featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders))
+	folderStore := ProvideStore(db, db.Cfg)
 
 	orgID := CreateOrg(t, db)
 
@@ -466,7 +504,7 @@ func TestIntegrationGetParents(t *testing.T) {
 	require.NoError(t, err)
 
 	t.Cleanup(func() {
-		err := folderStore.Delete(context.Background(), f.UID, orgID)
+		err := folderStore.Delete(context.Background(), []string{f.UID}, orgID)
 		require.NoError(t, err)
 	})
 
@@ -519,7 +557,7 @@ func TestIntegrationGetChildren(t *testing.T) {
 	}
 
 	db := sqlstore.InitTestDB(t)
-	folderStore := ProvideStore(db, db.Cfg, featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders))
+	folderStore := ProvideStore(db, db.Cfg)
 
 	orgID := CreateOrg(t, db)
 
@@ -538,7 +576,7 @@ func TestIntegrationGetChildren(t *testing.T) {
 
 	t.Cleanup(func() {
 		for _, uid := range treeLeaves {
-			err := folderStore.Delete(context.Background(), uid, orgID)
+			err := folderStore.Delete(context.Background(), []string{uid}, orgID)
 			require.NoError(t, err)
 		}
 	})
@@ -635,6 +673,26 @@ func TestIntegrationGetChildren(t *testing.T) {
 			t.Errorf("Result mismatch (-want +got):\n%s", diff)
 		}
 
+		// fetch folder with specific UIDs and pagination
+		children, err = folderStore.GetChildren(context.Background(), folder.GetChildrenQuery{
+			UID:        parent.UID,
+			OrgID:      orgID,
+			Limit:      2,
+			Page:       1,
+			FolderUIDs: treeLeaves[3:4],
+		})
+		require.NoError(t, err)
+
+		childrenUIDs = make([]string, 0, len(children))
+		for _, c := range children {
+			assert.NotEmpty(t, c.URL)
+			childrenUIDs = append(childrenUIDs, c.UID)
+		}
+
+		if diff := cmp.Diff(treeLeaves[3:4], childrenUIDs); diff != "" {
+			t.Errorf("Result mismatch (-want +got):\n%s", diff)
+		}
+
 		// no page is set
 		children, err = folderStore.GetChildren(context.Background(), folder.GetChildrenQuery{
 			UID:   parent.UID,
@@ -679,7 +737,7 @@ func TestIntegrationGetHeight(t *testing.T) {
 	}
 
 	db := sqlstore.InitTestDB(t)
-	folderStore := ProvideStore(db, db.Cfg, featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders))
+	folderStore := ProvideStore(db, db.Cfg)
 
 	orgID := CreateOrg(t, db)
 
@@ -705,6 +763,129 @@ func TestIntegrationGetHeight(t *testing.T) {
 	})
 }
 
+func TestIntegrationGetFolders(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	foldersNum := 10
+	db := sqlstore.InitTestDB(t)
+	folderStore := ProvideStore(db, db.Cfg)
+
+	orgID := CreateOrg(t, db)
+
+	// create folders
+	uids := make([]string, 0)
+	folders := make([]*folder.Folder, 0)
+	for i := 0; i < foldersNum; i++ {
+		uid := util.GenerateShortUID()
+		f, err := folderStore.Create(context.Background(), folder.CreateFolderCommand{
+			Title:       folderTitle,
+			Description: folderDsc,
+			OrgID:       orgID,
+			UID:         uid,
+		})
+		require.NoError(t, err)
+
+		uids = append(uids, uid)
+		folders = append(folders, f)
+	}
+
+	t.Cleanup(func() {
+		for _, uid := range uids {
+			err := folderStore.Delete(context.Background(), []string{uid}, orgID)
+			require.NoError(t, err)
+		}
+	})
+
+	t.Run("get folders by UIDs should succeed", func(t *testing.T) {
+		actualFolders, err := folderStore.GetFolders(context.Background(), NewGetFoldersQuery(folder.GetFoldersQuery{OrgID: orgID, UIDs: uids[1:]}))
+		require.NoError(t, err)
+		assert.Equal(t, len(uids[1:]), len(actualFolders))
+		for _, f := range folders[1:] {
+			folderInResponseIdx := slices.IndexFunc(actualFolders, func(rf *folder.Folder) bool {
+				return rf.UID == f.UID
+			})
+			assert.NotEqual(t, -1, folderInResponseIdx)
+			actualFolder := actualFolders[folderInResponseIdx]
+			assert.Equal(t, f.UID, actualFolder.UID)
+			assert.Equal(t, f.OrgID, actualFolder.OrgID)
+			assert.Equal(t, f.Title, actualFolder.Title)
+			assert.Equal(t, f.Description, actualFolder.Description)
+			assert.NotEmpty(t, actualFolder.Created)
+			assert.NotEmpty(t, actualFolder.Updated)
+			assert.NotEmpty(t, actualFolder.URL)
+		}
+	})
+
+	t.Run("get folders by UIDs batching should work as expected", func(t *testing.T) {
+		q := NewGetFoldersQuery(folder.GetFoldersQuery{OrgID: orgID, UIDs: uids[1:], BatchSize: 3})
+		actualFolders, err := folderStore.GetFolders(context.Background(), q)
+		require.NoError(t, err)
+		assert.Equal(t, len(uids[1:]), len(actualFolders))
+		for _, f := range folders[1:] {
+			folderInResponseIdx := slices.IndexFunc(actualFolders, func(rf *folder.Folder) bool {
+				return rf.UID == f.UID
+			})
+			assert.NotEqual(t, -1, folderInResponseIdx)
+			actualFolder := actualFolders[folderInResponseIdx]
+			assert.Equal(t, f.UID, actualFolder.UID)
+			assert.Equal(t, f.OrgID, actualFolder.OrgID)
+			assert.Equal(t, f.Title, actualFolder.Title)
+			assert.Equal(t, f.Description, actualFolder.Description)
+			assert.NotEmpty(t, actualFolder.Created)
+			assert.NotEmpty(t, actualFolder.Updated)
+			assert.NotEmpty(t, actualFolder.URL)
+		}
+	})
+
+	t.Run("get folders by UIDs with fullpath should succeed", func(t *testing.T) {
+		q := NewGetFoldersQuery(folder.GetFoldersQuery{OrgID: orgID, UIDs: uids[1:], WithFullpath: true})
+		q.BatchSize = 3
+		actualFolders, err := folderStore.GetFolders(context.Background(), q)
+		require.NoError(t, err)
+		assert.Equal(t, len(uids[1:]), len(actualFolders))
+		for _, f := range folders[1:] {
+			folderInResponseIdx := slices.IndexFunc(actualFolders, func(rf *folder.Folder) bool {
+				return rf.UID == f.UID
+			})
+			assert.NotEqual(t, -1, folderInResponseIdx)
+			actualFolder := actualFolders[folderInResponseIdx]
+			assert.Equal(t, f.UID, actualFolder.UID)
+			assert.Equal(t, f.OrgID, actualFolder.OrgID)
+			assert.Equal(t, f.Title, actualFolder.Title)
+			assert.Equal(t, f.Description, actualFolder.Description)
+			assert.NotEmpty(t, actualFolder.Created)
+			assert.NotEmpty(t, actualFolder.Updated)
+			assert.NotEmpty(t, actualFolder.URL)
+			assert.NotEmpty(t, actualFolder.Fullpath)
+		}
+	})
+
+	t.Run("get folders by UIDs and ancestor UIDs should work as expected", func(t *testing.T) {
+		q := NewGetFoldersQuery(folder.GetFoldersQuery{OrgID: orgID, UIDs: uids[1:], BatchSize: 3})
+		q.ancestorUIDs = make([]string, 0, int(q.BatchSize)+1)
+		for i := 0; i < int(q.BatchSize); i++ {
+			q.ancestorUIDs = append(q.ancestorUIDs, uuid.New().String())
+		}
+		q.ancestorUIDs = append(q.ancestorUIDs, folders[len(folders)-1].UID)
+
+		actualFolders, err := folderStore.GetFolders(context.Background(), q)
+		require.NoError(t, err)
+		assert.Equal(t, 1, len(actualFolders))
+
+		f := folders[len(folders)-1]
+		actualFolder := actualFolders[0]
+		assert.Equal(t, f.UID, actualFolder.UID)
+		assert.Equal(t, f.OrgID, actualFolder.OrgID)
+		assert.Equal(t, f.Title, actualFolder.Title)
+		assert.Equal(t, f.Description, actualFolder.Description)
+		assert.NotEmpty(t, actualFolder.Created)
+		assert.NotEmpty(t, actualFolder.Updated)
+		assert.NotEmpty(t, actualFolder.URL)
+	})
+}
+
 func CreateOrg(t *testing.T, db *sqlstore.SQLStore) int64 {
 	t.Helper()
 
@@ -738,7 +919,6 @@ func CreateSubtree(t *testing.T, store *sqlStore, orgID int64, parentUID string,
 		f, err := store.Create(context.Background(), cmd)
 		require.NoError(t, err)
 		require.Equal(t, title, f.Title)
-		require.NotEmpty(t, f.ID)
 		require.NotEmpty(t, f.UID)
 
 		parents, err := store.GetParents(context.Background(), folder.GetParentsQuery{
diff --git a/pkg/services/folder/folderimpl/store.go b/pkg/services/folder/folderimpl/store.go
index a286391a8874f..d2177ae4bfb97 100644
--- a/pkg/services/folder/folderimpl/store.go
+++ b/pkg/services/folder/folderimpl/store.go
@@ -6,13 +6,25 @@ import (
 	"github.com/grafana/grafana/pkg/services/folder"
 )
 
+type getFoldersQuery struct {
+	folder.GetFoldersQuery
+	ancestorUIDs []string
+}
+
+func NewGetFoldersQuery(q folder.GetFoldersQuery) getFoldersQuery {
+	return getFoldersQuery{
+		GetFoldersQuery: q,
+		ancestorUIDs:    []string{},
+	}
+}
+
 // store is the interface which a folder store must implement.
 type store interface {
 	// Create creates a folder and returns the newly-created folder.
 	Create(ctx context.Context, cmd folder.CreateFolderCommand) (*folder.Folder, error)
 
-	// Delete deletes a folder from the folder store.
-	Delete(ctx context.Context, uid string, orgID int64) error
+	// Delete folders with the specified UIDs and orgID from the folder store.
+	Delete(ctx context.Context, UIDs []string, orgID int64) error
 
 	// Update updates the given folder's UID, Title, and Description (update mode).
 	// If the NewParentUID field is not nil, it updates also the parent UID (move mode).
@@ -21,16 +33,21 @@ type store interface {
 	Update(ctx context.Context, cmd folder.UpdateFolderCommand) (*folder.Folder, error)
 
 	// Get returns a folder.
-	Get(ctx context.Context, cmd folder.GetFolderQuery) (*folder.Folder, error)
+	Get(ctx context.Context, q folder.GetFolderQuery) (*folder.Folder, error)
 
 	// GetParents returns an ordered list of parent folder of the given folder.
-	GetParents(ctx context.Context, cmd folder.GetParentsQuery) ([]*folder.Folder, error)
+	GetParents(ctx context.Context, q folder.GetParentsQuery) ([]*folder.Folder, error)
 
 	// GetChildren returns the set of immediate children folders (depth=1) of the
 	// given folder.
-	GetChildren(ctx context.Context, cmd folder.GetChildrenQuery) ([]*folder.Folder, error)
+	GetChildren(ctx context.Context, q folder.GetChildrenQuery) ([]*folder.Folder, error)
 
 	// GetHeight returns the height of the folder tree. When parentUID is set, the function would
 	// verify in the meanwhile that parentUID is not present in the subtree of the folder with the given UID.
 	GetHeight(ctx context.Context, foldrUID string, orgID int64, parentUID *string) (int, error)
+
+	// GetFolders returns folders with given uids
+	GetFolders(ctx context.Context, q getFoldersQuery) ([]*folder.Folder, error)
+	// GetDescendants returns all descendants of a folder
+	GetDescendants(ctx context.Context, orgID int64, anchestor_uid string) ([]*folder.Folder, error)
 }
diff --git a/pkg/services/folder/folderimpl/store_fake.go b/pkg/services/folder/folderimpl/store_fake.go
index 9a8a47a4ae8f6..33af4ebed0936 100644
--- a/pkg/services/folder/folderimpl/store_fake.go
+++ b/pkg/services/folder/folderimpl/store_fake.go
@@ -9,6 +9,7 @@ import (
 type fakeStore struct {
 	ExpectedChildFolders  []*folder.Folder
 	ExpectedParentFolders []*folder.Folder
+	ExpectedFolders       []*folder.Folder
 	ExpectedFolder        *folder.Folder
 	ExpectedError         error
 	ExpectedFolderHeight  int
@@ -27,7 +28,7 @@ func (f *fakeStore) Create(ctx context.Context, cmd folder.CreateFolderCommand)
 	return f.ExpectedFolder, f.ExpectedError
 }
 
-func (f *fakeStore) Delete(ctx context.Context, uid string, orgID int64) error {
+func (f *fakeStore) Delete(ctx context.Context, UIDs []string, orgID int64) error {
 	f.DeleteCalled = true
 	return f.ExpectedError
 }
@@ -44,7 +45,7 @@ func (f *fakeStore) Get(ctx context.Context, cmd folder.GetFolderQuery) (*folder
 	return f.ExpectedFolder, f.ExpectedError
 }
 
-func (f *fakeStore) GetParents(ctx context.Context, cmd folder.GetParentsQuery) ([]*folder.Folder, error) {
+func (f *fakeStore) GetParents(ctx context.Context, q folder.GetParentsQuery) ([]*folder.Folder, error) {
 	return f.ExpectedParentFolders, f.ExpectedError
 }
 
@@ -55,3 +56,11 @@ func (f *fakeStore) GetChildren(ctx context.Context, cmd folder.GetChildrenQuery
 func (f *fakeStore) GetHeight(ctx context.Context, folderUID string, orgID int64, parentUID *string) (int, error) {
 	return f.ExpectedFolderHeight, f.ExpectedError
 }
+
+func (f *fakeStore) GetFolders(ctx context.Context, q getFoldersQuery) ([]*folder.Folder, error) {
+	return f.ExpectedFolders, f.ExpectedError
+}
+
+func (f *fakeStore) GetDescendants(ctx context.Context, orgID int64, ancestor_uid string) ([]*folder.Folder, error) {
+	return f.ExpectedFolders, f.ExpectedError
+}
diff --git a/pkg/services/folder/foldertest/folder_store_mock.go b/pkg/services/folder/foldertest/folder_store_mock.go
index aa5b782a90324..93de1422257bb 100644
--- a/pkg/services/folder/foldertest/folder_store_mock.go
+++ b/pkg/services/folder/foldertest/folder_store_mock.go
@@ -40,25 +40,25 @@ func (_m *FakeFolderStore) GetFolderByID(ctx context.Context, orgID int64, id in
 	return r0, r1
 }
 
-// GetFolderByTitle provides a mock function with given fields: ctx, orgID, title
-func (_m *FakeFolderStore) GetFolderByTitle(ctx context.Context, orgID int64, title string) (*folder.Folder, error) {
-	ret := _m.Called(ctx, orgID, title)
+// GetFolderByTitle provides a mock function with given fields: ctx, orgID, title, folderUID
+func (_m *FakeFolderStore) GetFolderByTitle(ctx context.Context, orgID int64, title string, folderUID *string) (*folder.Folder, error) {
+	ret := _m.Called(ctx, orgID, title, folderUID)
 
 	var r0 *folder.Folder
 	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, int64, string) (*folder.Folder, error)); ok {
-		return rf(ctx, orgID, title)
+	if rf, ok := ret.Get(0).(func(context.Context, int64, string, *string) (*folder.Folder, error)); ok {
+		return rf(ctx, orgID, title, folderUID)
 	}
-	if rf, ok := ret.Get(0).(func(context.Context, int64, string) *folder.Folder); ok {
-		r0 = rf(ctx, orgID, title)
+	if rf, ok := ret.Get(0).(func(context.Context, int64, string, *string) *folder.Folder); ok {
+		r0 = rf(ctx, orgID, title, folderUID)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).(*folder.Folder)
 		}
 	}
 
-	if rf, ok := ret.Get(1).(func(context.Context, int64, string) error); ok {
-		r1 = rf(ctx, orgID, title)
+	if rf, ok := ret.Get(1).(func(context.Context, int64, string, *string) error); ok {
+		r1 = rf(ctx, orgID, title, folderUID)
 	} else {
 		r1 = ret.Error(1)
 	}
diff --git a/pkg/services/folder/foldertest/foldertest.go b/pkg/services/folder/foldertest/foldertest.go
index a1fbf4368bbff..7cfccb3b5c25f 100644
--- a/pkg/services/folder/foldertest/foldertest.go
+++ b/pkg/services/folder/foldertest/foldertest.go
@@ -19,7 +19,7 @@ func NewFakeService() *FakeService {
 
 var _ folder.Service = (*FakeService)(nil)
 
-func (s *FakeService) GetChildren(ctx context.Context, cmd *folder.GetChildrenQuery) ([]*folder.Folder, error) {
+func (s *FakeService) GetChildren(ctx context.Context, q *folder.GetChildrenQuery) ([]*folder.Folder, error) {
 	return s.ExpectedFolders, s.ExpectedError
 }
 
@@ -30,7 +30,7 @@ func (s *FakeService) GetParents(ctx context.Context, q folder.GetParentsQuery)
 func (s *FakeService) Create(ctx context.Context, cmd *folder.CreateFolderCommand) (*folder.Folder, error) {
 	return s.ExpectedFolder, s.ExpectedError
 }
-func (s *FakeService) Get(ctx context.Context, cmd *folder.GetFolderQuery) (*folder.Folder, error) {
+func (s *FakeService) Get(ctx context.Context, q *folder.GetFolderQuery) (*folder.Folder, error) {
 	return s.ExpectedFolder, s.ExpectedError
 }
 func (s *FakeService) Update(ctx context.Context, cmd *folder.UpdateFolderCommand) (*folder.Folder, error) {
@@ -48,6 +48,10 @@ func (s *FakeService) RegisterService(service folder.RegistryService) error {
 	return s.ExpectedError
 }
 
-func (s *FakeService) GetDescendantCounts(ctx context.Context, cmd *folder.GetDescendantCountsQuery) (folder.DescendantCounts, error) {
+func (s *FakeService) GetDescendantCounts(ctx context.Context, q *folder.GetDescendantCountsQuery) (folder.DescendantCounts, error) {
 	return s.ExpectedDescendantCounts, s.ExpectedError
 }
+
+func (s *FakeService) GetFolders(ctx context.Context, q folder.GetFoldersQuery) ([]*folder.Folder, error) {
+	return s.ExpectedFolders, s.ExpectedError
+}
diff --git a/pkg/services/folder/model.go b/pkg/services/folder/model.go
index b2674134bc392..892c0e6ebed1d 100644
--- a/pkg/services/folder/model.go
+++ b/pkg/services/folder/model.go
@@ -4,8 +4,10 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/infra/slugify"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util/errutil"
 )
@@ -13,19 +15,23 @@ import (
 var ErrMaximumDepthReached = errutil.BadRequest("folder.maximum-depth-reached", errutil.WithPublicMessage("Maximum nested folder depth reached"))
 var ErrBadRequest = errutil.BadRequest("folder.bad-request")
 var ErrDatabaseError = errutil.Internal("folder.database-error")
+var ErrConflict = errutil.Conflict("folder.conflict")
 var ErrInternal = errutil.Internal("folder.internal")
 var ErrCircularReference = errutil.BadRequest("folder.circular-reference", errutil.WithPublicMessage("Circular reference detected"))
 var ErrTargetRegistrySrvConflict = errutil.Internal("folder.target-registry-srv-conflict")
+var ErrFolderNotEmpty = errutil.BadRequest("folder.not-empty", errutil.WithPublicMessage("Folder cannot be deleted: folder is not empty"))
 
 const (
-	GeneralFolderUID     = "general"
-	RootFolderUID        = ""
-	MaxNestedFolderDepth = 8
+	GeneralFolderUID      = "general"
+	RootFolderUID         = ""
+	MaxNestedFolderDepth  = 4
+	SharedWithMeFolderUID = "sharedwithme"
 )
 
 var ErrFolderNotFound = errutil.NotFound("folder.notFound")
 
 type Folder struct {
+	// Deprecated: use UID instead
 	ID          int64  `xorm:"pk autoincr 'id'"`
 	OrgID       int64  `xorm:"org_id"`
 	UID         string `xorm:"uid"`
@@ -38,16 +44,28 @@ type Folder struct {
 
 	// TODO: validate if this field is required/relevant to folders.
 	// currently there is no such column
-	Version   int
-	URL       string
-	UpdatedBy int64
-	CreatedBy int64
-	HasACL    bool
+	Version      int
+	URL          string
+	UpdatedBy    int64
+	CreatedBy    int64
+	HasACL       bool
+	Fullpath     string `xorm:"fullpath"`
+	FullpathUIDs string `xorm:"fullpath_uids"`
 }
 
 var GeneralFolder = Folder{ID: 0, Title: "General"}
+var RootFolder = &Folder{ID: 0, Title: "Root", UID: GeneralFolderUID, ParentUID: ""}
+var SharedWithMeFolder = Folder{
+	Title:       "Shared with me",
+	Description: "Dashboards and folders shared with me",
+	UID:         SharedWithMeFolderUID,
+	ParentUID:   "",
+	ID:          -1,
+}
 
 func (f *Folder) IsGeneral() bool {
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Folder).Inc()
+	// nolint:staticcheck
 	return f.ID == GeneralFolder.ID && f.Title == GeneralFolder.Title
 }
 
@@ -128,11 +146,28 @@ type DeleteFolderCommand struct {
 // service will select the field with the most specificity, in order: ID, UID,
 // Title.
 type GetFolderQuery struct {
-	UID   *string
-	ID    *int64
-	Title *string
-	OrgID int64
+	UID *string
+	// Deprecated: use FolderUID instead
+	ID           *int64
+	Title        *string
+	ParentUID    *string
+	OrgID        int64
+	WithFullpath bool
+
+	SignedInUser identity.Requester `json:"-"`
+}
 
+type GetFoldersQuery struct {
+	OrgID            int64
+	UIDs             []string
+	WithFullpath     bool
+	WithFullpathUIDs bool
+	BatchSize        uint64
+
+	// OrderByTitle is used to sort the folders by title
+	// Set to true when ordering is meaningful (used for listing folders)
+	// otherwise better to keep it false since ordering can have a performance impact
+	OrderByTitle bool
 	SignedInUser identity.Requester `json:"-"`
 }
 
@@ -147,15 +182,21 @@ type GetParentsQuery struct {
 // return a list of child folders of the given folder.
 
 type GetChildrenQuery struct {
-	UID   string `xorm:"uid"`
-	OrgID int64  `xorm:"org_id"`
+	UID   string
+	OrgID int64
 	Depth int64
 
 	// Pagination options
 	Limit int64
 	Page  int64
 
+	// Permission to filter by
+	Permission dashboardaccess.PermissionType
+
 	SignedInUser identity.Requester `json:"-"`
+
+	// array of folder uids to filter by
+	FolderUIDs []string `json:"-"`
 }
 
 type HasEditPermissionInFoldersQuery struct {
diff --git a/pkg/services/folder/registry.go b/pkg/services/folder/registry.go
index 7a6ff865b0e72..d87b494576163 100644
--- a/pkg/services/folder/registry.go
+++ b/pkg/services/folder/registry.go
@@ -7,7 +7,7 @@ import (
 )
 
 type RegistryService interface {
-	DeleteInFolder(ctx context.Context, orgID int64, folderUID string, user identity.Requester) error
-	CountInFolder(ctx context.Context, orgID int64, folderUID string, user identity.Requester) (int64, error)
+	DeleteInFolders(ctx context.Context, orgID int64, folderUIDs []string, user identity.Requester) error
+	CountInFolders(ctx context.Context, orgID int64, folderUIDs []string, user identity.Requester) (int64, error)
 	Kind() string
 }
diff --git a/pkg/services/folder/service.go b/pkg/services/folder/service.go
index 0d7a8218651f4..50a1bec339185 100644
--- a/pkg/services/folder/service.go
+++ b/pkg/services/folder/service.go
@@ -6,17 +6,20 @@ import (
 
 type Service interface {
 	// GetChildren returns an array containing all child folders.
-	GetChildren(ctx context.Context, cmd *GetChildrenQuery) ([]*Folder, error)
+	GetChildren(ctx context.Context, q *GetChildrenQuery) ([]*Folder, error)
 	// GetParents returns an array containing add parent folders if nested folders are enabled
 	// otherwise it returns an empty array
 	GetParents(ctx context.Context, q GetParentsQuery) ([]*Folder, error)
 	Create(ctx context.Context, cmd *CreateFolderCommand) (*Folder, error)
 
 	// GetFolder takes a GetFolderCommand and returns a folder matching the
-	// request. One of ID, UID, or Title must be included. If multiple values
+	// request. One of UID, ID or Title must be included. If multiple values
 	// are included in the request, Grafana will select one in order of
-	// specificity (ID, UID, Title).
-	Get(ctx context.Context, cmd *GetFolderQuery) (*Folder, error)
+	// specificity (UID, ID, Title).
+	// When fetching a folder by Title, callers can optionally define a ParentUID.
+	// If ParentUID is not set then the folder will be fetched from the root level.
+	// If WithFullpath is true it computes also the full path of a folder.
+	Get(ctx context.Context, q *GetFolderQuery) (*Folder, error)
 
 	// Update is used to update a folder's UID, Title and Description. To change
 	// a folder's parent folder, use Move.
@@ -25,7 +28,13 @@ type Service interface {
 	// Move changes a folder's parent folder to the requested new parent.
 	Move(ctx context.Context, cmd *MoveFolderCommand) (*Folder, error)
 	RegisterService(service RegistryService) error
-	GetDescendantCounts(ctx context.Context, cmd *GetDescendantCountsQuery) (DescendantCounts, error)
+	// GetFolders returns org folders that are accessible by the signed in user by their UIDs.
+	// If WithFullpath is true it computes also the full path of a folder.
+	// The full path is a string that contains the titles of all parent folders separated by a slash.
+	// If a folder contains a slash in its title, it is escaped with a backslash.
+	// If FullpathUIDs is true it computes a string that contains the UIDs of all parent folders separated by slash.
+	GetFolders(ctx context.Context, q GetFoldersQuery) ([]*Folder, error)
+	GetDescendantCounts(ctx context.Context, q *GetDescendantCountsQuery) (DescendantCounts, error)
 }
 
 // FolderStore is a folder store.
@@ -33,7 +42,10 @@ type Service interface {
 //go:generate mockery --name FolderStore --structname FakeFolderStore --outpkg foldertest --output foldertest --filename folder_store_mock.go
 type FolderStore interface {
 	// GetFolderByTitle retrieves a folder by its title
-	GetFolderByTitle(ctx context.Context, orgID int64, title string) (*Folder, error)
+	// It expects a parentUID as last argument.
+	// If parentUID is empty then the folder will be fetched from the root level
+	// otherwise it will be fetched from the subfolder under the folder with the given UID.
+	GetFolderByTitle(ctx context.Context, orgID int64, title string, parentUID *string) (*Folder, error)
 	// GetFolderByUID retrieves a folder by its UID
 	GetFolderByUID(ctx context.Context, orgID int64, uid string) (*Folder, error)
 	// GetFolderByID retrieves a folder by its ID
diff --git a/pkg/services/gcom/gcom.go b/pkg/services/gcom/gcom.go
new file mode 100644
index 0000000000000..dbcbeb1bf652c
--- /dev/null
+++ b/pkg/services/gcom/gcom.go
@@ -0,0 +1,330 @@
+package gcom
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"time"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+)
+
+var LogPrefix = "gcom.service"
+
+type Service interface {
+	GetInstanceByID(ctx context.Context, requestID string, instanceID string) (Instance, error)
+	CreateAccessPolicy(ctx context.Context, params CreateAccessPolicyParams, payload CreateAccessPolicyPayload) (AccessPolicy, error)
+	ListAccessPolicies(ctx context.Context, params ListAccessPoliciesParams) ([]AccessPolicy, error)
+	DeleteAccessPolicy(ctx context.Context, params DeleteAccessPolicyParams) (bool, error)
+	CreateToken(ctx context.Context, params CreateTokenParams, payload CreateTokenPayload) (Token, error)
+}
+
+type Instance struct {
+	ID          int    `json:"id"`
+	Slug        string `json:"slug"`
+	RegionSlug  string `json:"regionSlug"`
+	ClusterSlug string `json:"clusterSlug"`
+}
+
+type CreateAccessPolicyParams struct {
+	RequestID string
+	Region    string
+}
+
+type CreateAccessPolicyPayload struct {
+	Name        string   `json:"name"`
+	DisplayName string   `json:"displayName"`
+	Realms      []Realm  `json:"realms"`
+	Scopes      []string `json:"scopes"`
+}
+
+type Realm struct {
+	Identifier    string        `json:"identifier"`
+	LabelPolicies []LabelPolicy `json:"labelPolicies"`
+	Type          string        `json:"type"`
+}
+
+type LabelPolicy struct {
+	Selector string `json:"selector"`
+}
+
+type AccessPolicy struct {
+	ID   string `json:"id"`
+	Name string `json:"name"`
+}
+
+type ListAccessPoliciesParams struct {
+	RequestID string
+	Region    string
+	Name      string
+}
+
+type listAccessPoliciesResponse struct {
+	Items []AccessPolicy `json:"items"`
+}
+
+type DeleteAccessPolicyParams struct {
+	RequestID      string
+	AccessPolicyID string
+	Region         string
+}
+
+type CreateTokenParams struct {
+	RequestID string
+	Region    string
+}
+
+type CreateTokenPayload struct {
+	AccessPolicyID string    `json:"accessPolicyId"`
+	DisplayName    string    `json:"displayName"`
+	Name           string    `json:"name"`
+	ExpiresAt      time.Time `json:"expiresAt"`
+}
+
+type Token struct {
+	ID             string `json:"id"`
+	AccessPolicyID string `json:"accessPolicyId"`
+	Name           string `json:"name"`
+	Token          string `json:"token"`
+}
+
+type GcomClient struct {
+	log        log.Logger
+	cfg        Config
+	httpClient *http.Client
+}
+
+type Config struct {
+	ApiURL string
+	Token  string
+}
+
+func New(cfg Config) Service {
+	return &GcomClient{
+		log:        log.New(LogPrefix),
+		cfg:        cfg,
+		httpClient: &http.Client{},
+	}
+}
+
+func (client *GcomClient) GetInstanceByID(ctx context.Context, requestID string, instanceID string) (Instance, error) {
+	endpoint, err := url.JoinPath(client.cfg.ApiURL, "/instances/", instanceID)
+	if err != nil {
+		return Instance{}, fmt.Errorf("building gcom instance url: %w", err)
+	}
+
+	request, err := http.NewRequestWithContext(ctx, http.MethodGet, endpoint, nil)
+	if err != nil {
+		return Instance{}, fmt.Errorf("creating http request: %w", err)
+	}
+
+	request.Header.Set("x-request-id", requestID)
+	request.Header.Set("Content-Type", "application/json")
+
+	request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", client.cfg.Token))
+
+	response, err := client.httpClient.Do(request)
+	if err != nil {
+		return Instance{}, fmt.Errorf("sending http request to create fetch instance by id: %w", err)
+	}
+	defer func() {
+		if err := response.Body.Close(); err != nil {
+			client.log.Error("closing http response body", "err", err.Error())
+		}
+	}()
+
+	if response.StatusCode != http.StatusOK {
+		body, _ := io.ReadAll(response.Body)
+		return Instance{}, fmt.Errorf("unexpected response when fetching instance by id: code=%d body=%s", response.StatusCode, body)
+	}
+
+	var instance Instance
+	if err := json.NewDecoder(response.Body).Decode(&instance); err != nil {
+		return instance, fmt.Errorf("unmarshaling response body: %w", err)
+	}
+
+	return instance, nil
+}
+
+func (client *GcomClient) CreateAccessPolicy(ctx context.Context, params CreateAccessPolicyParams, payload CreateAccessPolicyPayload) (AccessPolicy, error) {
+	endpoint, err := url.JoinPath(client.cfg.ApiURL, "/v1/accesspolicies")
+	if err != nil {
+		return AccessPolicy{}, fmt.Errorf("building gcom access policy url: %w", err)
+	}
+
+	body, err := json.Marshal(&payload)
+	if err != nil {
+		return AccessPolicy{}, fmt.Errorf("marshaling request body: %w", err)
+	}
+
+	request, err := http.NewRequestWithContext(ctx, http.MethodPost, endpoint, bytes.NewReader(body))
+	if err != nil {
+		return AccessPolicy{}, fmt.Errorf("creating http request: %w", err)
+	}
+
+	query := url.Values{}
+	query.Set("region", params.Region)
+
+	request.URL.RawQuery = query.Encode()
+	request.Header.Set("x-request-id", params.RequestID)
+	request.Header.Set("Content-Type", "application/json")
+
+	request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", client.cfg.Token))
+
+	response, err := client.httpClient.Do(request)
+	if err != nil {
+		return AccessPolicy{}, fmt.Errorf("sending http request to create access policy: %w", err)
+	}
+	defer func() {
+		if err := response.Body.Close(); err != nil {
+			client.log.Error("closing http response body", "err", err.Error())
+		}
+	}()
+
+	if response.StatusCode != http.StatusOK {
+		body, _ := io.ReadAll(response.Body)
+		return AccessPolicy{}, fmt.Errorf("unexpected response when creating access policy: code=%d body=%s", response.StatusCode, body)
+	}
+
+	var accessPolicy AccessPolicy
+	if err := json.NewDecoder(response.Body).Decode(&accessPolicy); err != nil {
+		return accessPolicy, fmt.Errorf("unmarshaling response body: %w", err)
+	}
+
+	return accessPolicy, nil
+}
+
+func (client *GcomClient) DeleteAccessPolicy(ctx context.Context, params DeleteAccessPolicyParams) (bool, error) {
+	endpoint, err := url.JoinPath(client.cfg.ApiURL, "/v1/accesspolicies/", params.AccessPolicyID)
+	if err != nil {
+		return false, fmt.Errorf("building gcom access policy url: %w", err)
+	}
+
+	request, err := http.NewRequestWithContext(ctx, http.MethodDelete, endpoint, nil)
+	if err != nil {
+		return false, fmt.Errorf("creating http request: %w", err)
+	}
+
+	query := url.Values{}
+	query.Set("region", params.Region)
+
+	request.URL.RawQuery = query.Encode()
+	request.Header.Set("x-request-id", params.RequestID)
+	request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", client.cfg.Token))
+
+	response, err := client.httpClient.Do(request)
+	if err != nil {
+		return false, fmt.Errorf("sending http request to create access policy: %w", err)
+	}
+	defer func() {
+		if err := response.Body.Close(); err != nil {
+			client.log.Error("closing http response body", "err", err.Error())
+		}
+	}()
+
+	if response.StatusCode == http.StatusNotFound {
+		return false, nil
+	}
+
+	if response.StatusCode == http.StatusOK || response.StatusCode == http.StatusNoContent {
+		return true, nil
+	}
+
+	body, _ := io.ReadAll(response.Body)
+	return false, fmt.Errorf("unexpected response when deleting access policy: code=%d body=%s", response.StatusCode, body)
+}
+
+func (client *GcomClient) ListAccessPolicies(ctx context.Context, params ListAccessPoliciesParams) ([]AccessPolicy, error) {
+	endpoint, err := url.JoinPath(client.cfg.ApiURL, "/v1/accesspolicies")
+	if err != nil {
+		return nil, fmt.Errorf("building gcom access policy url: %w", err)
+	}
+
+	request, err := http.NewRequestWithContext(ctx, http.MethodGet, endpoint, nil)
+	if err != nil {
+		return nil, fmt.Errorf("creating http request: %w", err)
+	}
+
+	query := url.Values{}
+	query.Set("region", params.Region)
+	query.Set("name", params.Name)
+	request.URL.RawQuery = query.Encode()
+	request.Header.Set("x-request-id", params.RequestID)
+	request.Header.Set("Accept", "application/json")
+
+	request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", client.cfg.Token))
+
+	response, err := client.httpClient.Do(request)
+	if err != nil {
+		return nil, fmt.Errorf("sending http request to create access policy: %w", err)
+	}
+	defer func() {
+		if err := response.Body.Close(); err != nil {
+			client.log.Error("closing http response body", "err", err.Error())
+		}
+	}()
+
+	if response.StatusCode != http.StatusOK {
+		body, _ := io.ReadAll(response.Body)
+		return nil, fmt.Errorf("unexpected response when listing access policies: code=%d body=%s", response.StatusCode, body)
+	}
+
+	var responseBody listAccessPoliciesResponse
+	if err := json.NewDecoder(response.Body).Decode(&responseBody); err != nil {
+		return responseBody.Items, fmt.Errorf("unmarshaling response body: %w", err)
+	}
+
+	return responseBody.Items, nil
+}
+
+func (client *GcomClient) CreateToken(ctx context.Context, params CreateTokenParams, payload CreateTokenPayload) (Token, error) {
+	endpoint, err := url.JoinPath(client.cfg.ApiURL, "/v1/tokens")
+	if err != nil {
+		return Token{}, fmt.Errorf("building gcom tokens url: %w", err)
+	}
+
+	body, err := json.Marshal(&payload)
+	if err != nil {
+		return Token{}, fmt.Errorf("marshaling request body: %w", err)
+	}
+
+	request, err := http.NewRequestWithContext(ctx, http.MethodPost, endpoint, bytes.NewReader(body))
+	if err != nil {
+		return Token{}, fmt.Errorf("creating http request: %w", err)
+	}
+
+	query := url.Values{}
+	query.Set("region", params.Region)
+
+	request.URL.RawQuery = query.Encode()
+	request.Header.Set("x-request-id", params.RequestID)
+	request.Header.Set("Content-Type", "application/json")
+
+	request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", client.cfg.Token))
+
+	response, err := client.httpClient.Do(request)
+	if err != nil {
+		return Token{}, fmt.Errorf("sending http request to create access token: %w", err)
+	}
+	defer func() {
+		if err := response.Body.Close(); err != nil {
+			client.log.Error("closing http response body", "err", err.Error())
+		}
+	}()
+
+	if response.StatusCode != http.StatusOK {
+		body, _ := io.ReadAll(response.Body)
+		return Token{}, fmt.Errorf("unexpected response when creating access token: code=%d body=%s", response.StatusCode, body)
+	}
+
+	var token Token
+	if err := json.NewDecoder(response.Body).Decode(&token); err != nil {
+		return token, fmt.Errorf("unmarshaling response body: %w", err)
+	}
+
+	return token, nil
+}
diff --git a/pkg/services/grafana-apiserver/README.md b/pkg/services/grafana-apiserver/README.md
deleted file mode 100644
index 8beebc853e93b..0000000000000
--- a/pkg/services/grafana-apiserver/README.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Grafana Kubernetes compatible API Server
-
-## Basic Setup
-
-```ini
-app_mode = development
-
-[feature_toggles]
-grafanaAPIServer = true
-kubernetesPlaylists = true
-```
-
-Start Grafana:
-
-```bash
-make run
-```
-
-## Enable dual write to `etcd`
-
-Start `etcd`:
-```bash
-make devenv sources=etcd
-```
-
-Add etcd server to `custom.ini`:
-
-```ini
-[grafana-apiserver]
-etcd_servers = 127.0.0.1:2379
-```
-
-### `kubectl` access
-
-From the root of the Grafanaa repository, run the following:
-```bash
-export KUBECONFIG=$PWD/data/grafana-apiserver/grafana.kubeconfig
-kubectl api-resources
-```
-
-### Grafana API Access
-
-The Kubernetes compatible API can be accessed using existing Grafana AuthN at: [http://localhost:3000/apis](http://localhost:3000/apis).
diff --git a/pkg/services/grafana-apiserver/auth/authorizer/org/wireset.go b/pkg/services/grafana-apiserver/auth/authorizer/org/wireset.go
deleted file mode 100644
index b213b08859749..0000000000000
--- a/pkg/services/grafana-apiserver/auth/authorizer/org/wireset.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package org
-
-import "github.com/google/wire"
-
-var WireSet = wire.NewSet(
-	ProvideOrgIDAuthorizer,
-	ProvideOrgRoleAuthorizer,
-)
diff --git a/pkg/services/grafana-apiserver/auth/authorizer/provider.go b/pkg/services/grafana-apiserver/auth/authorizer/provider.go
deleted file mode 100644
index c658252bb410b..0000000000000
--- a/pkg/services/grafana-apiserver/auth/authorizer/provider.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package authorizer
-
-import (
-	"k8s.io/apiserver/pkg/authentication/user"
-	"k8s.io/apiserver/pkg/authorization/authorizer"
-	"k8s.io/apiserver/pkg/authorization/authorizerfactory"
-	"k8s.io/apiserver/pkg/authorization/union"
-
-	"github.com/grafana/grafana/pkg/services/grafana-apiserver/auth/authorizer/org"
-	"github.com/grafana/grafana/pkg/services/grafana-apiserver/auth/authorizer/stack"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func ProvideAuthorizer(
-	orgIDAuthorizer *org.OrgIDAuthorizer,
-	orgRoleAuthorizer *org.OrgRoleAuthorizer,
-	stackIDAuthorizer *stack.StackIDAuthorizer,
-	cfg *setting.Cfg,
-) authorizer.Authorizer {
-	authorizers := []authorizer.Authorizer{
-		authorizerfactory.NewPrivilegedGroups(user.SystemPrivilegedGroup),
-	}
-
-	// In Hosted grafana, the StackID replaces the orgID as a valid namespace
-	if cfg.StackID != "" {
-		authorizers = append(authorizers, stackIDAuthorizer)
-	} else {
-		authorizers = append(authorizers, orgIDAuthorizer)
-	}
-
-	// org role is last -- and will return allow for verbs that match expectations
-	// Ideally FGAC happens earlier and returns an explicit answer
-	authorizers = append(authorizers, orgRoleAuthorizer)
-	return union.New(authorizers...)
-}
diff --git a/pkg/services/grafana-apiserver/auth/authorizer/stack/wireset.go b/pkg/services/grafana-apiserver/auth/authorizer/stack/wireset.go
deleted file mode 100644
index fe1a183c79f00..0000000000000
--- a/pkg/services/grafana-apiserver/auth/authorizer/stack/wireset.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package stack
-
-import "github.com/google/wire"
-
-var WireSet = wire.NewSet(
-	ProvideStackIDAuthorizer,
-)
diff --git a/pkg/services/grafana-apiserver/auth/authorizer/wireset.go b/pkg/services/grafana-apiserver/auth/authorizer/wireset.go
deleted file mode 100644
index ae2d31200a3e0..0000000000000
--- a/pkg/services/grafana-apiserver/auth/authorizer/wireset.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package authorizer
-
-import (
-	"github.com/google/wire"
-
-	"github.com/grafana/grafana/pkg/services/grafana-apiserver/auth/authorizer/org"
-	"github.com/grafana/grafana/pkg/services/grafana-apiserver/auth/authorizer/stack"
-)
-
-var WireSet = wire.NewSet(
-	org.WireSet,
-	stack.WireSet,
-	ProvideAuthorizer,
-)
diff --git a/pkg/services/grafana-apiserver/common.go b/pkg/services/grafana-apiserver/common.go
deleted file mode 100644
index 94aedc0cd7b29..0000000000000
--- a/pkg/services/grafana-apiserver/common.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package grafanaapiserver
-
-import (
-	"net/http"
-
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/runtime/serializer"
-	"k8s.io/apiserver/pkg/registry/generic"
-	genericapiserver "k8s.io/apiserver/pkg/server"
-	"k8s.io/kube-openapi/pkg/common"
-	"k8s.io/kube-openapi/pkg/spec3"
-)
-
-// TODO: this (or something like it) belongs in grafana-app-sdk,
-// but lets keep it here while we iterate on a few simple examples
-type APIGroupBuilder interface {
-	// Get the main group name
-	GetGroupVersion() schema.GroupVersion
-
-	// Add the kinds to the server scheme
-	InstallSchema(scheme *runtime.Scheme) error
-
-	// Build the group+version behavior
-	GetAPIGroupInfo(
-		scheme *runtime.Scheme,
-		codecs serializer.CodecFactory, // pointer?
-		optsGetter generic.RESTOptionsGetter,
-	) (*genericapiserver.APIGroupInfo, error)
-
-	// Get OpenAPI definitions
-	GetOpenAPIDefinitions() common.GetOpenAPIDefinitions
-
-	// Get the API routes for each version
-	GetAPIRoutes() *APIRoutes
-}
-
-// This is used to implement dynamic sub-resources like pods/x/logs
-type APIRouteHandler struct {
-	Path    string           // added to the appropriate level
-	Spec    *spec3.PathProps // Exposed in the open api service discovery
-	Handler http.HandlerFunc // when Level = resource, the resource will be available in context
-}
-
-// APIRoutes define the
-type APIRoutes struct {
-	// Root handlers are registered directly after the apiVersion identifier
-	Root []APIRouteHandler
-
-	// Namespace handlers are mounted under the namespace
-	Namespace []APIRouteHandler
-
-	// Resource routes behave the same as pod/logs
-	// it looks like a sub-resource, however the response is backed directly by an http handler
-	// The current resource can be fetched through context
-	Resource map[string]APIRouteHandler
-}
diff --git a/pkg/services/grafana-apiserver/config.go b/pkg/services/grafana-apiserver/config.go
deleted file mode 100644
index 75916af55e563..0000000000000
--- a/pkg/services/grafana-apiserver/config.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package grafanaapiserver
-
-import (
-	"fmt"
-	"net"
-	"path/filepath"
-	"strconv"
-
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-type config struct {
-	enabled bool
-	devMode bool
-
-	ip     net.IP
-	port   int
-	host   string
-	apiURL string
-
-	etcdServers []string
-	dataPath    string
-
-	logLevel int
-}
-
-func newConfig(cfg *setting.Cfg) *config {
-	defaultLogLevel := 0
-	ip := net.ParseIP(cfg.HTTPAddr)
-	apiURL := cfg.AppURL
-	port, err := strconv.Atoi(cfg.HTTPPort)
-	if err != nil {
-		port = 3000
-	}
-
-	if cfg.Env == setting.Dev {
-		defaultLogLevel = 10
-		port = 6443
-		ip = net.ParseIP("127.0.0.1")
-		apiURL = fmt.Sprintf("https://%s:%d", ip, port)
-	}
-
-	host := fmt.Sprintf("%s:%d", ip, port)
-
-	return &config{
-		enabled:     cfg.IsFeatureToggleEnabled(featuremgmt.FlagGrafanaAPIServer),
-		devMode:     cfg.Env == setting.Dev,
-		dataPath:    filepath.Join(cfg.DataPath, "grafana-apiserver"),
-		ip:          ip,
-		port:        port,
-		host:        host,
-		logLevel:    cfg.SectionWithEnvOverrides("grafana-apiserver").Key("log_level").MustInt(defaultLogLevel),
-		etcdServers: cfg.SectionWithEnvOverrides("grafana-apiserver").Key("etcd_servers").Strings(","),
-		apiURL:      apiURL,
-	}
-}
diff --git a/pkg/services/grafana-apiserver/config_test.go b/pkg/services/grafana-apiserver/config_test.go
deleted file mode 100644
index aa0eb211d25e8..0000000000000
--- a/pkg/services/grafana-apiserver/config_test.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package grafanaapiserver
-
-import (
-	"net"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func TestNewConfig(t *testing.T) {
-	cfg := setting.NewCfg()
-	cfg.Env = setting.Prod
-	cfg.DataPath = "/tmp/grafana"
-	cfg.HTTPAddr = "10.0.0.1"
-	cfg.HTTPPort = "4000"
-	cfg.IsFeatureToggleEnabled = func(_ string) bool { return true }
-	cfg.AppURL = "http://test:4000"
-
-	section := cfg.Raw.Section("grafana-apiserver")
-	section.Key("log_level").SetValue("5")
-	section.Key("etcd_servers").SetValue("http://localhost:2379")
-
-	actual := newConfig(cfg)
-
-	expected := &config{
-		enabled:     true,
-		devMode:     false,
-		etcdServers: []string{"http://localhost:2379"},
-		apiURL:      "http://test:4000",
-		ip:          net.ParseIP("10.0.0.1"),
-		port:        4000,
-		host:        "10.0.0.1:4000",
-		dataPath:    "/tmp/grafana/grafana-apiserver",
-		logLevel:    5,
-	}
-	require.Equal(t, expected, actual)
-}
diff --git a/pkg/services/grafana-apiserver/openapi.go b/pkg/services/grafana-apiserver/openapi.go
deleted file mode 100644
index 4e27fb03b7fcf..0000000000000
--- a/pkg/services/grafana-apiserver/openapi.go
+++ /dev/null
@@ -1,2510 +0,0 @@
-package grafanaapiserver
-
-import (
-	"golang.org/x/exp/maps"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	common "k8s.io/kube-openapi/pkg/common"
-	spec "k8s.io/kube-openapi/pkg/validation/spec"
-)
-
-// This should eventually live in grafana-app-sdk
-func getOpenAPIDefinitions(builders []APIGroupBuilder) common.GetOpenAPIDefinitions {
-	return func(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
-		defs := getStandardOpenAPIDefinitions(ref)
-		for _, builder := range builders {
-			g := builder.GetOpenAPIDefinitions()
-			if g != nil {
-				out := g(ref)
-				maps.Copy(defs, out)
-			}
-		}
-		return defs
-	}
-}
-
-func getStandardOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
-	return map[string]common.OpenAPIDefinition{
-		"k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup":                  schema_pkg_apis_meta_v1_APIGroup(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList":              schema_pkg_apis_meta_v1_APIGroupList(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.APIResource":               schema_pkg_apis_meta_v1_APIResource(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.APIResourceList":           schema_pkg_apis_meta_v1_APIResourceList(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.APIVersions":               schema_pkg_apis_meta_v1_APIVersions(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.ApplyOptions":              schema_pkg_apis_meta_v1_ApplyOptions(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.Condition":                 schema_pkg_apis_meta_v1_Condition(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.CreateOptions":             schema_pkg_apis_meta_v1_CreateOptions(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions":             schema_pkg_apis_meta_v1_DeleteOptions(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.Duration":                  schema_pkg_apis_meta_v1_Duration(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1":                  schema_pkg_apis_meta_v1_FieldsV1(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions":                schema_pkg_apis_meta_v1_GetOptions(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind":                 schema_pkg_apis_meta_v1_GroupKind(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource":             schema_pkg_apis_meta_v1_GroupResource(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersion":              schema_pkg_apis_meta_v1_GroupVersion(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery":  schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionKind":          schema_pkg_apis_meta_v1_GroupVersionKind(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionResource":      schema_pkg_apis_meta_v1_GroupVersionResource(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.InternalEvent":             schema_pkg_apis_meta_v1_InternalEvent(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector":             schema_pkg_apis_meta_v1_LabelSelector(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement":  schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.List":                      schema_pkg_apis_meta_v1_List(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta":                  schema_pkg_apis_meta_v1_ListMeta(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.ListOptions":               schema_pkg_apis_meta_v1_ListOptions(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry":        schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.MicroTime":                 schema_pkg_apis_meta_v1_MicroTime(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta":                schema_pkg_apis_meta_v1_ObjectMeta(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference":            schema_pkg_apis_meta_v1_OwnerReference(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata":     schema_pkg_apis_meta_v1_PartialObjectMetadata(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadataList": schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.Patch":                     schema_pkg_apis_meta_v1_Patch(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions":              schema_pkg_apis_meta_v1_PatchOptions(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions":             schema_pkg_apis_meta_v1_Preconditions(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths":                 schema_pkg_apis_meta_v1_RootPaths(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.Status":                    schema_pkg_apis_meta_v1_Status(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause":               schema_pkg_apis_meta_v1_StatusCause(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails":             schema_pkg_apis_meta_v1_StatusDetails(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.Table":                     schema_pkg_apis_meta_v1_Table(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition":     schema_pkg_apis_meta_v1_TableColumnDefinition(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.TableOptions":              schema_pkg_apis_meta_v1_TableOptions(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.TableRow":                  schema_pkg_apis_meta_v1_TableRow(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition":         schema_pkg_apis_meta_v1_TableRowCondition(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.Time":                      schema_pkg_apis_meta_v1_Time(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.Timestamp":                 schema_pkg_apis_meta_v1_Timestamp(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta":                  schema_pkg_apis_meta_v1_TypeMeta(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.UpdateOptions":             schema_pkg_apis_meta_v1_UpdateOptions(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.WatchEvent":                schema_pkg_apis_meta_v1_WatchEvent(ref),
-		"k8s.io/apimachinery/pkg/runtime.RawExtension":                   schema_k8sio_apimachinery_pkg_runtime_RawExtension(ref),
-		"k8s.io/apimachinery/pkg/runtime.TypeMeta":                       schema_k8sio_apimachinery_pkg_runtime_TypeMeta(ref),
-		"k8s.io/apimachinery/pkg/runtime.Unknown":                        schema_k8sio_apimachinery_pkg_runtime_Unknown(ref),
-		"k8s.io/apimachinery/pkg/version.Info":                           schema_k8sio_apimachinery_pkg_version_Info(ref),
-	}
-}
-
-func schema_pkg_apis_meta_v1_APIGroup(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "APIGroup contains the name, the supported versions, and the preferred version of a group.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"name": {
-						SchemaProps: spec.SchemaProps{
-							Description: "name is the name of the group.",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"versions": {
-						SchemaProps: spec.SchemaProps{
-							Description: "versions are the versions supported in this group.",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery"),
-									},
-								},
-							},
-						},
-					},
-					"preferredVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "preferredVersion is the version preferred by the API server, which probably is the storage version.",
-							Default:     map[string]interface{}{},
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery"),
-						},
-					},
-					"serverAddressByClientCIDRs": {
-						SchemaProps: spec.SchemaProps{
-							Description: "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP.",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR"),
-									},
-								},
-							},
-						},
-					},
-				},
-				Required: []string{"name", "versions"},
-			},
-		},
-		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery", "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR"},
-	}
-}
-
-func schema_pkg_apis_meta_v1_APIGroupList(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "APIGroupList is a list of APIGroup, to allow clients to discover the API at /apis.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"groups": {
-						SchemaProps: spec.SchemaProps{
-							Description: "groups is a list of APIGroup.",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup"),
-									},
-								},
-							},
-						},
-					},
-				},
-				Required: []string{"groups"},
-			},
-		},
-		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup"},
-	}
-}
-
-func schema_pkg_apis_meta_v1_APIResource(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "APIResource specifies the name of a resource and whether it is namespaced.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"name": {
-						SchemaProps: spec.SchemaProps{
-							Description: "name is the plural name of the resource.",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"singularName": {
-						SchemaProps: spec.SchemaProps{
-							Description: "singularName is the singular name of the resource.  This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"namespaced": {
-						SchemaProps: spec.SchemaProps{
-							Description: "namespaced indicates if a resource is namespaced or not.",
-							Default:     false,
-							Type:        []string{"boolean"},
-							Format:      "",
-						},
-					},
-					"group": {
-						SchemaProps: spec.SchemaProps{
-							Description: "group is the preferred group of the resource.  Empty implies the group of the containing resource list. For subresources, this may have a different value, for example: Scale\".",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"version": {
-						SchemaProps: spec.SchemaProps{
-							Description: "version is the preferred version of the resource.  Empty implies the version of the containing resource list For subresources, this may have a different value, for example: v1 (while inside a v1beta1 version of the core resource's group)\".",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Description: "kind is the kind for the resource (e.g. 'Foo' is the kind for a resource 'foo')",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"verbs": {
-						SchemaProps: spec.SchemaProps{
-							Description: "verbs is a list of supported kube verbs (this includes get, list, watch, create, update, patch, delete, deletecollection, and proxy)",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
-									},
-								},
-							},
-						},
-					},
-					"shortNames": {
-						SchemaProps: spec.SchemaProps{
-							Description: "shortNames is a list of suggested short names of the resource.",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
-									},
-								},
-							},
-						},
-					},
-					"categories": {
-						SchemaProps: spec.SchemaProps{
-							Description: "categories is a list of the grouped resources this resource belongs to (e.g. 'all')",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
-									},
-								},
-							},
-						},
-					},
-					"storageVersionHash": {
-						SchemaProps: spec.SchemaProps{
-							Description: "The hash value of the storage version, the version this resource is converted to when written to the data store. Value must be treated as opaque by clients. Only equality comparison on the value is valid. This is an alpha feature and may change or be removed in the future. The field is populated by the apiserver only if the StorageVersionHash feature gate is enabled. This field will remain optional even if it graduates.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-				},
-				Required: []string{"name", "singularName", "namespaced", "kind", "verbs"},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_APIResourceList(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"groupVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "groupVersion is the group and version this APIResourceList is for.",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"resources": {
-						SchemaProps: spec.SchemaProps{
-							Description: "resources contains the name of the resources and if they are namespaced.",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.APIResource"),
-									},
-								},
-							},
-						},
-					},
-				},
-				Required: []string{"groupVersion", "resources"},
-			},
-		},
-		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.APIResource"},
-	}
-}
-
-func schema_pkg_apis_meta_v1_APIVersions(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "APIVersions lists the versions that are available, to allow clients to discover the API at /api, which is the root path of the legacy v1 API.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"versions": {
-						SchemaProps: spec.SchemaProps{
-							Description: "versions are the api versions that are available.",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
-									},
-								},
-							},
-						},
-					},
-					"serverAddressByClientCIDRs": {
-						SchemaProps: spec.SchemaProps{
-							Description: "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP.",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR"),
-									},
-								},
-							},
-						},
-					},
-				},
-				Required: []string{"versions", "serverAddressByClientCIDRs"},
-			},
-		},
-		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR"},
-	}
-}
-
-func schema_pkg_apis_meta_v1_ApplyOptions(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "ApplyOptions may be provided when applying an API object. FieldManager is required for apply requests. ApplyOptions is equivalent to PatchOptions. It is provided as a convenience with documentation that speaks specifically to how the options fields relate to apply.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"dryRun": {
-						SchemaProps: spec.SchemaProps{
-							Description: "When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
-									},
-								},
-							},
-						},
-					},
-					"force": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Force is going to \"force\" Apply requests. It means user will re-acquire conflicting fields owned by other people.",
-							Default:     false,
-							Type:        []string{"boolean"},
-							Format:      "",
-						},
-					},
-					"fieldManager": {
-						SchemaProps: spec.SchemaProps{
-							Description: "fieldManager is a name associated with the actor or entity that is making these changes. The value must be less than or 128 characters long, and only contain printable characters, as defined by https://golang.org/pkg/unicode/#IsPrint. This field is required.",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-				},
-				Required: []string{"force", "fieldManager"},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_Condition(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "Condition contains details for one aspect of the current state of this API Resource.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"type": {
-						SchemaProps: spec.SchemaProps{
-							Description: "type of condition in CamelCase or in foo.example.com/CamelCase.",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"status": {
-						SchemaProps: spec.SchemaProps{
-							Description: "status of the condition, one of True, False, Unknown.",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"observedGeneration": {
-						SchemaProps: spec.SchemaProps{
-							Description: "observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance.",
-							Type:        []string{"integer"},
-							Format:      "int64",
-						},
-					},
-					"lastTransitionTime": {
-						SchemaProps: spec.SchemaProps{
-							Description: "lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.",
-							Default:     map[string]interface{}{},
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"),
-						},
-					},
-					"reason": {
-						SchemaProps: spec.SchemaProps{
-							Description: "reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty.",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"message": {
-						SchemaProps: spec.SchemaProps{
-							Description: "message is a human readable message indicating details about the transition. This may be an empty string.",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-				},
-				Required: []string{"type", "status", "lastTransitionTime", "reason", "message"},
-			},
-		},
-		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.Time"},
-	}
-}
-
-func schema_pkg_apis_meta_v1_CreateOptions(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "CreateOptions may be provided when creating an API object.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"dryRun": {
-						SchemaProps: spec.SchemaProps{
-							Description: "When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
-									},
-								},
-							},
-						},
-					},
-					"fieldManager": {
-						SchemaProps: spec.SchemaProps{
-							Description: "fieldManager is a name associated with the actor or entity that is making these changes. The value must be less than or 128 characters long, and only contain printable characters, as defined by https://golang.org/pkg/unicode/#IsPrint.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"fieldValidation": {
-						SchemaProps: spec.SchemaProps{
-							Description: "fieldValidation instructs the server on how to handle objects in the request (POST/PUT/PATCH) containing unknown or duplicate fields. Valid values are: - Ignore: This will ignore any unknown fields that are silently dropped from the object, and will ignore all but the last duplicate field that the decoder encounters. This is the default behavior prior to v1.23. - Warn: This will send a warning via the standard warning response header for each unknown field that is dropped from the object, and for each duplicate field that is encountered. The request will still succeed if there are no other errors, and will only persist the last of any duplicate fields. This is the default in v1.23+ - Strict: This will fail the request with a BadRequest error if any unknown fields would be dropped from the object, or if any duplicate fields are present. The error returned from the server will contain all unknown and duplicate fields encountered.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_DeleteOptions(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "DeleteOptions may be provided when deleting an API object.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"gracePeriodSeconds": {
-						SchemaProps: spec.SchemaProps{
-							Description: "The duration in seconds before the object should be deleted. Value must be non-negative integer. The value zero indicates delete immediately. If this value is nil, the default grace period for the specified type will be used. Defaults to a per object value if not specified. zero means delete immediately.",
-							Type:        []string{"integer"},
-							Format:      "int64",
-						},
-					},
-					"preconditions": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Must be fulfilled before a deletion is carried out. If not possible, a 409 Conflict status will be returned.",
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions"),
-						},
-					},
-					"orphanDependents": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Deprecated: please use the PropagationPolicy, this field will be deprecated in 1.7. Should the dependent objects be orphaned. If true/false, the \"orphan\" finalizer will be added to/removed from the object's finalizers list. Either this field or PropagationPolicy may be set, but not both.",
-							Type:        []string{"boolean"},
-							Format:      "",
-						},
-					},
-					"propagationPolicy": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy. Acceptable values are: 'Orphan' - orphan the dependents; 'Background' - allow the garbage collector to delete the dependents in the background; 'Foreground' - a cascading policy that deletes all dependents in the foreground.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"dryRun": {
-						SchemaProps: spec.SchemaProps{
-							Description: "When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions"},
-	}
-}
-
-func schema_pkg_apis_meta_v1_Duration(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "Duration is a wrapper around time.Duration which supports correct marshaling to YAML and JSON. In particular, it marshals into strings, which can be used as map keys in json.",
-				Type:        v1.Duration{}.OpenAPISchemaType(),
-				Format:      v1.Duration{}.OpenAPISchemaFormat(),
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_FieldsV1(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "FieldsV1 stores a set of fields in a data structure like a Trie, in JSON format.\n\nEach key is either a '.' representing the field itself, and will always map to an empty set, or a string representing a sub-field or item. The string will follow one of these four formats: 'f:<name>', where <name> is the name of a field in a struct, or key in a map 'v:<value>', where <value> is the exact json formatted value of a list item 'i:<index>', where <index> is position of a item in a list 'k:<keys>', where <keys> is a map of  a list item's key fields to their unique values If a key maps to an empty Fields value, the field that key represents is part of the set.\n\nThe exact format is defined in sigs.k8s.io/structured-merge-diff",
-				Type:        []string{"object"},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_GetOptions(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "GetOptions is the standard query options to the standard REST get call.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"resourceVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "resourceVersion sets a constraint on what resource versions a request may be served from. See https://kubernetes.io/docs/reference/using-api/api-concepts/#resource-versions for details.\n\nDefaults to unset",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_GroupKind(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "GroupKind specifies a Group and a Kind, but does not force a version.  This is useful for identifying concepts during lookup stages without having partially valid types",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"group": {
-						SchemaProps: spec.SchemaProps{
-							Default: "",
-							Type:    []string{"string"},
-							Format:  "",
-						},
-					},
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Default: "",
-							Type:    []string{"string"},
-							Format:  "",
-						},
-					},
-				},
-				Required: []string{"group", "kind"},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_GroupResource(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "GroupResource specifies a Group and a Resource, but does not force a version.  This is useful for identifying concepts during lookup stages without having partially valid types",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"group": {
-						SchemaProps: spec.SchemaProps{
-							Default: "",
-							Type:    []string{"string"},
-							Format:  "",
-						},
-					},
-					"resource": {
-						SchemaProps: spec.SchemaProps{
-							Default: "",
-							Type:    []string{"string"},
-							Format:  "",
-						},
-					},
-				},
-				Required: []string{"group", "resource"},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_GroupVersion(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "GroupVersion contains the \"group\" and the \"version\", which uniquely identifies the API.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"group": {
-						SchemaProps: spec.SchemaProps{
-							Default: "",
-							Type:    []string{"string"},
-							Format:  "",
-						},
-					},
-					"version": {
-						SchemaProps: spec.SchemaProps{
-							Default: "",
-							Type:    []string{"string"},
-							Format:  "",
-						},
-					},
-				},
-				Required: []string{"group", "version"},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"groupVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "groupVersion specifies the API group and version in the form \"group/version\"",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"version": {
-						SchemaProps: spec.SchemaProps{
-							Description: "version specifies the version in the form of \"version\". This is to save the clients the trouble of splitting the GroupVersion.",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-				},
-				Required: []string{"groupVersion", "version"},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_GroupVersionKind(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "GroupVersionKind unambiguously identifies a kind.  It doesn't anonymously include GroupVersion to avoid automatic coercion.  It doesn't use a GroupVersion to avoid custom marshalling",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"group": {
-						SchemaProps: spec.SchemaProps{
-							Default: "",
-							Type:    []string{"string"},
-							Format:  "",
-						},
-					},
-					"version": {
-						SchemaProps: spec.SchemaProps{
-							Default: "",
-							Type:    []string{"string"},
-							Format:  "",
-						},
-					},
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Default: "",
-							Type:    []string{"string"},
-							Format:  "",
-						},
-					},
-				},
-				Required: []string{"group", "version", "kind"},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_GroupVersionResource(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "GroupVersionResource unambiguously identifies a resource.  It doesn't anonymously include GroupVersion to avoid automatic coercion.  It doesn't use a GroupVersion to avoid custom marshalling",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"group": {
-						SchemaProps: spec.SchemaProps{
-							Default: "",
-							Type:    []string{"string"},
-							Format:  "",
-						},
-					},
-					"version": {
-						SchemaProps: spec.SchemaProps{
-							Default: "",
-							Type:    []string{"string"},
-							Format:  "",
-						},
-					},
-					"resource": {
-						SchemaProps: spec.SchemaProps{
-							Default: "",
-							Type:    []string{"string"},
-							Format:  "",
-						},
-					},
-				},
-				Required: []string{"group", "version", "resource"},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_InternalEvent(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "InternalEvent makes watch.Event versioned",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"Type": {
-						SchemaProps: spec.SchemaProps{
-							Default: "",
-							Type:    []string{"string"},
-							Format:  "",
-						},
-					},
-					"Object": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Object is:\n * If Type is Added or Modified: the new state of the object.\n * If Type is Deleted: the state of the object immediately before deletion.\n * If Type is Bookmark: the object (instance of a type being watched) where\n   only ResourceVersion field is set. On successful restart of watch from a\n   bookmark resourceVersion, client is guaranteed to not get repeat event\n   nor miss any events.\n * If Type is Error: *api.Status is recommended; other types may make sense\n   depending on context.",
-							Ref:         ref("k8s.io/apimachinery/pkg/runtime.Object"),
-						},
-					},
-				},
-				Required: []string{"Type", "Object"},
-			},
-		},
-		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/runtime.Object"},
-	}
-}
-
-func schema_pkg_apis_meta_v1_LabelSelector(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"matchLabels": {
-						SchemaProps: spec.SchemaProps{
-							Description: "matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is \"key\", the operator is \"In\", and the values array contains only \"value\". The requirements are ANDed.",
-							Type:        []string{"object"},
-							AdditionalProperties: &spec.SchemaOrBool{
-								Allows: true,
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
-									},
-								},
-							},
-						},
-					},
-					"matchExpressions": {
-						SchemaProps: spec.SchemaProps{
-							Description: "matchExpressions is a list of label selector requirements. The requirements are ANDed.",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			VendorExtensible: spec.VendorExtensible{
-				Extensions: spec.Extensions{
-					"x-kubernetes-map-type": "atomic",
-				},
-			},
-		},
-		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement"},
-	}
-}
-
-func schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"key": {
-						VendorExtensible: spec.VendorExtensible{
-							Extensions: spec.Extensions{
-								"x-kubernetes-patch-merge-key": "key",
-								"x-kubernetes-patch-strategy":  "merge",
-							},
-						},
-						SchemaProps: spec.SchemaProps{
-							Description: "key is the label key that the selector applies to.",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"operator": {
-						SchemaProps: spec.SchemaProps{
-							Description: "operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"values": {
-						SchemaProps: spec.SchemaProps{
-							Description: "values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
-									},
-								},
-							},
-						},
-					},
-				},
-				Required: []string{"key", "operator"},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_List(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "List holds a list of objects, which may not be known by the server.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"metadata": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Default:     map[string]interface{}{},
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
-						},
-					},
-					"items": {
-						SchemaProps: spec.SchemaProps{
-							Description: "List of objects",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/runtime.RawExtension"),
-									},
-								},
-							},
-						},
-					},
-				},
-				Required: []string{"items"},
-			},
-		},
-		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "k8s.io/apimachinery/pkg/runtime.RawExtension"},
-	}
-}
-
-func schema_pkg_apis_meta_v1_ListMeta(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"selfLink": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Deprecated: selfLink is a legacy read-only field that is no longer populated by the system.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"resourceVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "String that identifies the server's internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"continue": {
-						SchemaProps: spec.SchemaProps{
-							Description: "continue may be set if the user set a limit on the number of items returned, and indicates that the server has more data available. The value is opaque and may be used to issue another request to the endpoint that served this list to retrieve the next set of available objects. Continuing a consistent list may not be possible if the server configuration has changed or more than a few minutes have passed. The resourceVersion field returned when using this continue value will be identical to the value in the first response, unless you have received this token from an error message.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"remainingItemCount": {
-						SchemaProps: spec.SchemaProps{
-							Description: "remainingItemCount is the number of subsequent items in the list which are not included in this list response. If the list request contained label or field selectors, then the number of remaining items is unknown and the field will be left unset and omitted during serialization. If the list is complete (either because it is not chunking or because this is the last chunk), then there are no more remaining items and this field will be left unset and omitted during serialization. Servers older than v1.15 do not set this field. The intended use of the remainingItemCount is *estimating* the size of a collection. Clients should not rely on the remainingItemCount to be set or to be exact.",
-							Type:        []string{"integer"},
-							Format:      "int64",
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_ListOptions(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "ListOptions is the query options to a standard REST list call.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"labelSelector": {
-						SchemaProps: spec.SchemaProps{
-							Description: "A selector to restrict the list of returned objects by their labels. Defaults to everything.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"fieldSelector": {
-						SchemaProps: spec.SchemaProps{
-							Description: "A selector to restrict the list of returned objects by their fields. Defaults to everything.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"watch": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.",
-							Type:        []string{"boolean"},
-							Format:      "",
-						},
-					},
-					"allowWatchBookmarks": {
-						SchemaProps: spec.SchemaProps{
-							Description: "allowWatchBookmarks requests watch events with type \"BOOKMARK\". Servers that do not implement bookmarks may ignore this flag and bookmarks are sent at the server's discretion. Clients should not assume bookmarks are returned at any specific interval, nor may they assume the server will send any BOOKMARK event during a session. If this is not a watch, this field is ignored.",
-							Type:        []string{"boolean"},
-							Format:      "",
-						},
-					},
-					"resourceVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "resourceVersion sets a constraint on what resource versions a request may be served from. See https://kubernetes.io/docs/reference/using-api/api-concepts/#resource-versions for details.\n\nDefaults to unset",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"resourceVersionMatch": {
-						SchemaProps: spec.SchemaProps{
-							Description: "resourceVersionMatch determines how resourceVersion is applied to list calls. It is highly recommended that resourceVersionMatch be set for list calls where resourceVersion is set See https://kubernetes.io/docs/reference/using-api/api-concepts/#resource-versions for details.\n\nDefaults to unset",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"timeoutSeconds": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Timeout for the list/watch call. This limits the duration of the call, regardless of any activity or inactivity.",
-							Type:        []string{"integer"},
-							Format:      "int64",
-						},
-					},
-					"limit": {
-						SchemaProps: spec.SchemaProps{
-							Description: "limit is a maximum number of responses to return for a list call. If more items exist, the server will set the `continue` field on the list metadata to a value that can be used with the same initial query to retrieve the next set of results. Setting a limit may return fewer than the requested amount of items (up to zero items) in the event all requested objects are filtered out and clients should only use the presence of the continue field to determine whether more results are available. Servers may choose not to support the limit argument and will return all of the available results. If limit is specified and the continue field is empty, clients may assume that no more results are available. This field is not supported if watch is true.\n\nThe server guarantees that the objects returned when using continue will be identical to issuing a single list call without a limit - that is, no objects created, modified, or deleted after the first request is issued will be included in any subsequent continued requests. This is sometimes referred to as a consistent snapshot, and ensures that a client that is using limit to receive smaller chunks of a very large result can ensure they see all possible objects. If objects are updated during a chunked list the version of the object that was present at the time the first list result was calculated is returned.",
-							Type:        []string{"integer"},
-							Format:      "int64",
-						},
-					},
-					"continue": {
-						SchemaProps: spec.SchemaProps{
-							Description: "The continue option should be set when retrieving more results from the server. Since this value is server defined, clients may only use the continue value from a previous query result with identical query parameters (except for the value of continue) and the server may reject a continue value it does not recognize. If the specified continue value is no longer valid whether due to expiration (generally five to fifteen minutes) or a configuration change on the server, the server will respond with a 410 ResourceExpired error together with a continue token. If the client needs a consistent list, it must restart their list without the continue field. Otherwise, the client may send another list request with the token received with the 410 error, the server will respond with a list starting from the next key, but from the latest snapshot, which is inconsistent from the previous list results - objects that are created, modified, or deleted after the first list request will be included in the response, as long as their keys are after the \"next key\".\n\nThis field is not supported when watch is true. Clients may start a watch from the last resourceVersion value returned by the server and not miss any modifications.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"sendInitialEvents": {
-						SchemaProps: spec.SchemaProps{
-							Description: "`sendInitialEvents=true` may be set together with `watch=true`. In that case, the watch stream will begin with synthetic events to produce the current state of objects in the collection. Once all such events have been sent, a synthetic \"Bookmark\" event  will be sent. The bookmark will report the ResourceVersion (RV) corresponding to the set of objects, and be marked with `\"k8s.io/initial-events-end\": \"true\"` annotation. Afterwards, the watch stream will proceed as usual, sending watch events corresponding to changes (subsequent to the RV) to objects watched.\n\nWhen `sendInitialEvents` option is set, we require `resourceVersionMatch` option to also be set. The semantic of the watch request is as following: - `resourceVersionMatch` = NotOlderThan\n  is interpreted as \"data at least as new as the provided `resourceVersion`\"\n  and the bookmark event is send when the state is synced\n  to a `resourceVersion` at least as fresh as the one provided by the ListOptions.\n  If `resourceVersion` is unset, this is interpreted as \"consistent read\" and the\n  bookmark event is send when the state is synced at least to the moment\n  when request started being processed.\n- `resourceVersionMatch` set to any other value or unset\n  Invalid error is returned.\n\nDefaults to true if `resourceVersion=\"\"` or `resourceVersion=\"0\"` (for backward compatibility reasons) and to false otherwise.",
-							Type:        []string{"boolean"},
-							Format:      "",
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "ManagedFieldsEntry is a workflow-id, a FieldSet and the group version of the resource that the fieldset applies to.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"manager": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Manager is an identifier of the workflow managing these fields.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"operation": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Operation is the type of operation which lead to this ManagedFieldsEntry being created. The only valid values for this field are 'Apply' and 'Update'.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "APIVersion defines the version of this resource that this field set applies to. The format is \"group/version\" just like the top-level APIVersion field. It is necessary to track the version of a field set because it cannot be automatically converted.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"time": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Time is the timestamp of when the ManagedFields entry was added. The timestamp will also be updated if a field is added, the manager changes any of the owned fields value or removes a field. The timestamp does not update when a field is removed from the entry because another manager took it over.",
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"),
-						},
-					},
-					"fieldsType": {
-						SchemaProps: spec.SchemaProps{
-							Description: "FieldsType is the discriminator for the different fields format and version. There is currently only one possible value: \"FieldsV1\"",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"fieldsV1": {
-						SchemaProps: spec.SchemaProps{
-							Description: "FieldsV1 holds the first JSON version format as described in the \"FieldsV1\" type.",
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1"),
-						},
-					},
-					"subresource": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Subresource is the name of the subresource used to update that object, or empty string if the object was updated through the main resource. The value of this field is used to distinguish between managers, even if they share the same name. For example, a status update will be distinct from a regular update using the same manager name. Note that the APIVersion field is not related to the Subresource field and it always corresponds to the version of the main resource.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-				},
-			},
-		},
-		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"},
-	}
-}
-
-func schema_pkg_apis_meta_v1_MicroTime(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "MicroTime is version of Time with microsecond level precision.",
-				Type:        v1.MicroTime{}.OpenAPISchemaType(),
-				Format:      v1.MicroTime{}.OpenAPISchemaFormat(),
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_ObjectMeta(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "ObjectMeta is metadata that all persisted resources must have, which includes all objects users must create.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"name": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Name must be unique within a namespace. Is required when creating resources, although some resources may allow a client to request the generation of an appropriate name automatically. Name is primarily intended for creation idempotence and configuration definition. Cannot be updated. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#names",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"generateName": {
-						SchemaProps: spec.SchemaProps{
-							Description: "GenerateName is an optional prefix, used by the server, to generate a unique name ONLY IF the Name field has not been provided. If this field is used, the name returned to the client will be different than the name passed. This value will also be combined with a unique suffix. The provided value has the same validation rules as the Name field, and may be truncated by the length of the suffix required to make the value unique on the server.\n\nIf this field is specified and the generated name exists, the server will return a 409.\n\nApplied only if Name is not specified. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"namespace": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Namespace defines the space within which each name must be unique. An empty namespace is equivalent to the \"default\" namespace, but \"default\" is the canonical representation. Not all objects are required to be scoped to a namespace - the value of this field for those objects will be empty.\n\nMust be a DNS_LABEL. Cannot be updated. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"selfLink": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Deprecated: selfLink is a legacy read-only field that is no longer populated by the system.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"uid": {
-						SchemaProps: spec.SchemaProps{
-							Description: "UID is the unique in time and space value for this object. It is typically generated by the server on successful creation of a resource and is not allowed to change on PUT operations.\n\nPopulated by the system. Read-only. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#uids",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"resourceVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "An opaque value that represents the internal version of this object that can be used by clients to determine when objects have changed. May be used for optimistic concurrency, change detection, and the watch operation on a resource or set of resources. Clients must treat these values as opaque and passed unmodified back to the server. They may only be valid for a particular resource or set of resources.\n\nPopulated by the system. Read-only. Value must be treated as opaque by clients and . More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"generation": {
-						SchemaProps: spec.SchemaProps{
-							Description: "A sequence number representing a specific generation of the desired state. Populated by the system. Read-only.",
-							Type:        []string{"integer"},
-							Format:      "int64",
-						},
-					},
-					"creationTimestamp": {
-						SchemaProps: spec.SchemaProps{
-							Description: "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata",
-							Default:     map[string]interface{}{},
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"),
-						},
-					},
-					"deletionTimestamp": {
-						SchemaProps: spec.SchemaProps{
-							Description: "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field, once the finalizers list is empty. As long as the finalizers list contains items, deletion is blocked. Once the deletionTimestamp is set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata",
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"),
-						},
-					},
-					"deletionGracePeriodSeconds": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Number of seconds allowed for this object to gracefully terminate before it will be removed from the system. Only set when deletionTimestamp is also set. May only be shortened. Read-only.",
-							Type:        []string{"integer"},
-							Format:      "int64",
-						},
-					},
-					"labels": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Map of string keys and values that can be used to organize and categorize (scope and select) objects. May match selectors of replication controllers and services. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels",
-							Type:        []string{"object"},
-							AdditionalProperties: &spec.SchemaOrBool{
-								Allows: true,
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
-									},
-								},
-							},
-						},
-					},
-					"annotations": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. They are not queryable and should be preserved when modifying objects. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations",
-							Type:        []string{"object"},
-							AdditionalProperties: &spec.SchemaOrBool{
-								Allows: true,
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
-									},
-								},
-							},
-						},
-					},
-					"ownerReferences": {
-						VendorExtensible: spec.VendorExtensible{
-							Extensions: spec.Extensions{
-								"x-kubernetes-patch-merge-key": "uid",
-								"x-kubernetes-patch-strategy":  "merge",
-							},
-						},
-						SchemaProps: spec.SchemaProps{
-							Description: "List of objects depended by this object. If ALL objects in the list have been deleted, this object will be garbage collected. If this object is managed by a controller, then an entry in this list will point to this controller, with the controller field set to true. There cannot be more than one managing controller.",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference"),
-									},
-								},
-							},
-						},
-					},
-					"finalizers": {
-						VendorExtensible: spec.VendorExtensible{
-							Extensions: spec.Extensions{
-								"x-kubernetes-patch-strategy": "merge",
-							},
-						},
-						SchemaProps: spec.SchemaProps{
-							Description: "Must be empty before the object is deleted from the registry. Each entry is an identifier for the responsible component that will remove the entry from the list. If the deletionTimestamp of the object is non-nil, entries in this list can only be removed. Finalizers may be processed and removed in any order.  Order is NOT enforced because it introduces significant risk of stuck finalizers. finalizers is a shared field, any actor with permission can reorder it. If the finalizer list is processed in order, then this can lead to a situation in which the component responsible for the first finalizer in the list is waiting for a signal (field value, external system, or other) produced by a component responsible for a finalizer later in the list, resulting in a deadlock. Without enforced ordering finalizers are free to order amongst themselves and are not vulnerable to ordering changes in the list.",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
-									},
-								},
-							},
-						},
-					},
-					"managedFields": {
-						SchemaProps: spec.SchemaProps{
-							Description: "ManagedFields maps workflow-id and version to the set of fields that are managed by that workflow. This is mostly for internal housekeeping, and users typically shouldn't need to set or understand this field. A workflow can be the user's name, a controller's name, or the name of a specific apply path like \"ci-cd\". The set of fields is always in the version that the workflow used when modifying the object.",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry"),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry", "k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"},
-	}
-}
-
-func schema_pkg_apis_meta_v1_OwnerReference(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "OwnerReference contains enough information to let you identify an owning object. An owning object must be in the same namespace as the dependent, or be cluster-scoped, so there is no namespace field.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "API version of the referent.",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"name": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#names",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"uid": {
-						SchemaProps: spec.SchemaProps{
-							Description: "UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#uids",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"controller": {
-						SchemaProps: spec.SchemaProps{
-							Description: "If true, this reference points to the managing controller.",
-							Type:        []string{"boolean"},
-							Format:      "",
-						},
-					},
-					"blockOwnerDeletion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "If true, AND if the owner has the \"foregroundDeletion\" finalizer, then the owner cannot be deleted from the key-value store until this reference is removed. See https://kubernetes.io/docs/concepts/architecture/garbage-collection/#foreground-deletion for how the garbage collector interacts with this field and enforces the foreground deletion. Defaults to false. To set this field, a user needs \"delete\" permission of the owner, otherwise 422 (Unprocessable Entity) will be returned.",
-							Type:        []string{"boolean"},
-							Format:      "",
-						},
-					},
-				},
-				Required: []string{"apiVersion", "kind", "name", "uid"},
-			},
-			VendorExtensible: spec.VendorExtensible{
-				Extensions: spec.Extensions{
-					"x-kubernetes-map-type": "atomic",
-				},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_PartialObjectMetadata(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "PartialObjectMetadata is a generic representation of any object with ObjectMeta. It allows clients to get access to a particular ObjectMeta schema without knowing the details of the version.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"metadata": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata",
-							Default:     map[string]interface{}{},
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
-						},
-					},
-				},
-			},
-		},
-		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
-	}
-}
-
-func schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "PartialObjectMetadataList contains a list of objects containing only their metadata",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"metadata": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Default:     map[string]interface{}{},
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
-						},
-					},
-					"items": {
-						SchemaProps: spec.SchemaProps{
-							Description: "items contains each of the included items.",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata"),
-									},
-								},
-							},
-						},
-					},
-				},
-				Required: []string{"items"},
-			},
-		},
-		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata"},
-	}
-}
-
-func schema_pkg_apis_meta_v1_Patch(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.",
-				Type:        []string{"object"},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_PatchOptions(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "PatchOptions may be provided when patching an API object. PatchOptions is meant to be a superset of UpdateOptions.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"dryRun": {
-						SchemaProps: spec.SchemaProps{
-							Description: "When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
-									},
-								},
-							},
-						},
-					},
-					"force": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Force is going to \"force\" Apply requests. It means user will re-acquire conflicting fields owned by other people. Force flag must be unset for non-apply patch requests.",
-							Type:        []string{"boolean"},
-							Format:      "",
-						},
-					},
-					"fieldManager": {
-						SchemaProps: spec.SchemaProps{
-							Description: "fieldManager is a name associated with the actor or entity that is making these changes. The value must be less than or 128 characters long, and only contain printable characters, as defined by https://golang.org/pkg/unicode/#IsPrint. This field is required for apply requests (application/apply-patch) but optional for non-apply patch types (JsonPatch, MergePatch, StrategicMergePatch).",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"fieldValidation": {
-						SchemaProps: spec.SchemaProps{
-							Description: "fieldValidation instructs the server on how to handle objects in the request (POST/PUT/PATCH) containing unknown or duplicate fields. Valid values are: - Ignore: This will ignore any unknown fields that are silently dropped from the object, and will ignore all but the last duplicate field that the decoder encounters. This is the default behavior prior to v1.23. - Warn: This will send a warning via the standard warning response header for each unknown field that is dropped from the object, and for each duplicate field that is encountered. The request will still succeed if there are no other errors, and will only persist the last of any duplicate fields. This is the default in v1.23+ - Strict: This will fail the request with a BadRequest error if any unknown fields would be dropped from the object, or if any duplicate fields are present. The error returned from the server will contain all unknown and duplicate fields encountered.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_Preconditions(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "Preconditions must be fulfilled before an operation (update, delete, etc.) is carried out.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"uid": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Specifies the target UID.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"resourceVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Specifies the target ResourceVersion",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_RootPaths(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "RootPaths lists the paths available at root. For example: \"/healthz\", \"/apis\".",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"paths": {
-						SchemaProps: spec.SchemaProps{
-							Description: "paths are the paths available at root.",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
-									},
-								},
-							},
-						},
-					},
-				},
-				Required: []string{"paths"},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"clientCIDR": {
-						SchemaProps: spec.SchemaProps{
-							Description: "The CIDR with which clients can match their IP to figure out the server address that they should use.",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"serverAddress": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Address of this server, suitable for a client that matches the above CIDR. This can be a hostname, hostname:port, IP or IP:port.",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-				},
-				Required: []string{"clientCIDR", "serverAddress"},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_Status(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "Status is a return value for calls that don't return other objects.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"metadata": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Default:     map[string]interface{}{},
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
-						},
-					},
-					"status": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Status of the operation. One of: \"Success\" or \"Failure\". More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"message": {
-						SchemaProps: spec.SchemaProps{
-							Description: "A human-readable description of the status of this operation.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"reason": {
-						SchemaProps: spec.SchemaProps{
-							Description: "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"details": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Extended data associated with the reason.  Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.",
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails"),
-						},
-					},
-					"code": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Suggested HTTP return code for this status, 0 if not set.",
-							Type:        []string{"integer"},
-							Format:      "int32",
-						},
-					},
-				},
-			},
-		},
-		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails"},
-	}
-}
-
-func schema_pkg_apis_meta_v1_StatusCause(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"reason": {
-						SchemaProps: spec.SchemaProps{
-							Description: "A machine-readable description of the cause of the error. If this value is empty there is no information available.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"message": {
-						SchemaProps: spec.SchemaProps{
-							Description: "A human-readable description of the cause of the error.  This field may be presented as-is to a reader.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"field": {
-						SchemaProps: spec.SchemaProps{
-							Description: "The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed.  Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.\n\nExamples:\n  \"name\" - the field \"name\" on the current resource\n  \"items[0].name\" - the field \"name\" on the first array entry in \"items\"",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_StatusDetails(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"name": {
-						SchemaProps: spec.SchemaProps{
-							Description: "The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"group": {
-						SchemaProps: spec.SchemaProps{
-							Description: "The group attribute of the resource associated with the status StatusReason.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Description: "The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"uid": {
-						SchemaProps: spec.SchemaProps{
-							Description: "UID of the resource. (when there is a single resource which can be described). More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#uids",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"causes": {
-						SchemaProps: spec.SchemaProps{
-							Description: "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause"),
-									},
-								},
-							},
-						},
-					},
-					"retryAfterSeconds": {
-						SchemaProps: spec.SchemaProps{
-							Description: "If specified, the time in seconds before the operation should be retried. Some errors may indicate the client must take an alternate action - for those errors this field may indicate how long to wait before taking the alternate action.",
-							Type:        []string{"integer"},
-							Format:      "int32",
-						},
-					},
-				},
-			},
-		},
-		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause"},
-	}
-}
-
-func schema_pkg_apis_meta_v1_Table(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "Table is a tabular representation of a set of API resources. The server transforms the object into a set of preferred columns for quickly reviewing the objects.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"metadata": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Default:     map[string]interface{}{},
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
-						},
-					},
-					"columnDefinitions": {
-						SchemaProps: spec.SchemaProps{
-							Description: "columnDefinitions describes each column in the returned items array. The number of cells per row will always match the number of column definitions.",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition"),
-									},
-								},
-							},
-						},
-					},
-					"rows": {
-						SchemaProps: spec.SchemaProps{
-							Description: "rows is the list of items in the table.",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.TableRow"),
-									},
-								},
-							},
-						},
-					},
-				},
-				Required: []string{"columnDefinitions", "rows"},
-			},
-		},
-		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition", "k8s.io/apimachinery/pkg/apis/meta/v1.TableRow"},
-	}
-}
-
-func schema_pkg_apis_meta_v1_TableColumnDefinition(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "TableColumnDefinition contains information about a column returned in the Table.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"name": {
-						SchemaProps: spec.SchemaProps{
-							Description: "name is a human readable name for the column.",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"type": {
-						SchemaProps: spec.SchemaProps{
-							Description: "type is an OpenAPI type definition for this column, such as number, integer, string, or array. See https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#data-types for more.",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"format": {
-						SchemaProps: spec.SchemaProps{
-							Description: "format is an optional OpenAPI type modifier for this column. A format modifies the type and imposes additional rules, like date or time formatting for a string. The 'name' format is applied to the primary identifier column which has type 'string' to assist in clients identifying column is the resource name. See https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#data-types for more.",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"description": {
-						SchemaProps: spec.SchemaProps{
-							Description: "description is a human readable description of this column.",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"priority": {
-						SchemaProps: spec.SchemaProps{
-							Description: "priority is an integer defining the relative importance of this column compared to others. Lower numbers are considered higher priority. Columns that may be omitted in limited space scenarios should be given a higher priority.",
-							Default:     0,
-							Type:        []string{"integer"},
-							Format:      "int32",
-						},
-					},
-				},
-				Required: []string{"name", "type", "format", "description", "priority"},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_TableOptions(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "TableOptions are used when a Table is requested by the caller.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"includeObject": {
-						SchemaProps: spec.SchemaProps{
-							Description: "includeObject decides whether to include each object along with its columnar information. Specifying \"None\" will return no object, specifying \"Object\" will return the full object contents, and specifying \"Metadata\" (the default) will return the object's metadata in the PartialObjectMetadata kind in version v1beta1 of the meta.k8s.io API group.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_TableRow(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "TableRow is an individual row in a table.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"cells": {
-						SchemaProps: spec.SchemaProps{
-							Description: "cells will be as wide as the column definitions array and may contain strings, numbers (float64 or int64), booleans, simple maps, lists, or null. See the type field of the column definition for a more detailed description.",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Type:   []string{"object"},
-										Format: "",
-									},
-								},
-							},
-						},
-					},
-					"conditions": {
-						SchemaProps: spec.SchemaProps{
-							Description: "conditions describe additional status of a row that are relevant for a human user. These conditions apply to the row, not to the object, and will be specific to table output. The only defined condition type is 'Completed', for a row that indicates a resource that has run to completion and can be given less visual priority.",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition"),
-									},
-								},
-							},
-						},
-					},
-					"object": {
-						SchemaProps: spec.SchemaProps{
-							Description: "This field contains the requested additional information about each object based on the includeObject policy when requesting the Table. If \"None\", this field is empty, if \"Object\" this will be the default serialization of the object for the current API version, and if \"Metadata\" (the default) will contain the object metadata. Check the returned kind and apiVersion of the object before parsing. The media type of the object will always match the enclosing list - if this as a JSON table, these will be JSON encoded objects.",
-							Default:     map[string]interface{}{},
-							Ref:         ref("k8s.io/apimachinery/pkg/runtime.RawExtension"),
-						},
-					},
-				},
-				Required: []string{"cells"},
-			},
-		},
-		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition", "k8s.io/apimachinery/pkg/runtime.RawExtension"},
-	}
-}
-
-func schema_pkg_apis_meta_v1_TableRowCondition(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "TableRowCondition allows a row to be marked with additional information.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"type": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Type of row condition. The only defined value is 'Completed' indicating that the object this row represents has reached a completed state and may be given less visual priority than other rows. Clients are not required to honor any conditions but should be consistent where possible about handling the conditions.",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"status": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Status of the condition, one of True, False, Unknown.",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"reason": {
-						SchemaProps: spec.SchemaProps{
-							Description: "(brief) machine readable reason for the condition's last transition.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"message": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Human readable message indicating details about last transition.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-				},
-				Required: []string{"type", "status"},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_Time(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "Time is a wrapper around time.Time which supports correct marshaling to YAML and JSON.  Wrappers are provided for many of the factory methods that the time package offers.",
-				Type:        v1.Time{}.OpenAPISchemaType(),
-				Format:      v1.Time{}.OpenAPISchemaFormat(),
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_Timestamp(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "Timestamp is a struct that is equivalent to Time, but intended for protobuf marshalling/unmarshalling. It is generated into a serialization that matches Time. Do not use in Go structs.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"seconds": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Represents seconds of UTC time since Unix epoch 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59Z inclusive.",
-							Default:     0,
-							Type:        []string{"integer"},
-							Format:      "int64",
-						},
-					},
-					"nanos": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Non-negative fractions of a second at nanosecond resolution. Negative second values with fractions must still have non-negative nanos values that count forward in time. Must be from 0 to 999,999,999 inclusive. This field may be limited in precision depending on context.",
-							Default:     0,
-							Type:        []string{"integer"},
-							Format:      "int32",
-						},
-					},
-				},
-				Required: []string{"seconds", "nanos"},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_TypeMeta(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "TypeMeta describes an individual object in an API response or request with strings representing the type of the object and its API schema version. Structures that are versioned or persisted should inline TypeMeta.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_UpdateOptions(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "UpdateOptions may be provided when updating an API object. All fields in UpdateOptions should also be present in PatchOptions.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"dryRun": {
-						SchemaProps: spec.SchemaProps{
-							Description: "When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
-									},
-								},
-							},
-						},
-					},
-					"fieldManager": {
-						SchemaProps: spec.SchemaProps{
-							Description: "fieldManager is a name associated with the actor or entity that is making these changes. The value must be less than or 128 characters long, and only contain printable characters, as defined by https://golang.org/pkg/unicode/#IsPrint.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"fieldValidation": {
-						SchemaProps: spec.SchemaProps{
-							Description: "fieldValidation instructs the server on how to handle objects in the request (POST/PUT/PATCH) containing unknown or duplicate fields. Valid values are: - Ignore: This will ignore any unknown fields that are silently dropped from the object, and will ignore all but the last duplicate field that the decoder encounters. This is the default behavior prior to v1.23. - Warn: This will send a warning via the standard warning response header for each unknown field that is dropped from the object, and for each duplicate field that is encountered. The request will still succeed if there are no other errors, and will only persist the last of any duplicate fields. This is the default in v1.23+ - Strict: This will fail the request with a BadRequest error if any unknown fields would be dropped from the object, or if any duplicate fields are present. The error returned from the server will contain all unknown and duplicate fields encountered.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
-func schema_pkg_apis_meta_v1_WatchEvent(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "Event represents a single event to a watched resource.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"type": {
-						SchemaProps: spec.SchemaProps{
-							Default: "",
-							Type:    []string{"string"},
-							Format:  "",
-						},
-					},
-					"object": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Object is:\n * If Type is Added or Modified: the new state of the object.\n * If Type is Deleted: the state of the object immediately before deletion.\n * If Type is Error: *Status is recommended; other types may make sense\n   depending on context.",
-							Default:     map[string]interface{}{},
-							Ref:         ref("k8s.io/apimachinery/pkg/runtime.RawExtension"),
-						},
-					},
-				},
-				Required: []string{"type", "object"},
-			},
-		},
-		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/runtime.RawExtension"},
-	}
-}
-
-func schema_k8sio_apimachinery_pkg_runtime_RawExtension(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "RawExtension is used to hold extensions in external versions.\n\nTo use this, make a field which has RawExtension as its type in your external, versioned struct, and Object in your internal struct. You also need to register your various plugin types.\n\n// Internal package:\n\n\ttype MyAPIObject struct {\n\t\truntime.TypeMeta `json:\",inline\"`\n\t\tMyPlugin runtime.Object `json:\"myPlugin\"`\n\t}\n\n\ttype PluginA struct {\n\t\tAOption string `json:\"aOption\"`\n\t}\n\n// External package:\n\n\ttype MyAPIObject struct {\n\t\truntime.TypeMeta `json:\",inline\"`\n\t\tMyPlugin runtime.RawExtension `json:\"myPlugin\"`\n\t}\n\n\ttype PluginA struct {\n\t\tAOption string `json:\"aOption\"`\n\t}\n\n// On the wire, the JSON will look something like this:\n\n\t{\n\t\t\"kind\":\"MyAPIObject\",\n\t\t\"apiVersion\":\"v1\",\n\t\t\"myPlugin\": {\n\t\t\t\"kind\":\"PluginA\",\n\t\t\t\"aOption\":\"foo\",\n\t\t},\n\t}\n\nSo what happens? Decode first uses json or yaml to unmarshal the serialized data into your external MyAPIObject. That causes the raw JSON to be stored, but not unpacked. The next step is to copy (using pkg/conversion) into the internal struct. The runtime package's DefaultScheme has conversion functions installed which will unpack the JSON stored in RawExtension, turning it into the correct object type, and storing it in the Object. (TODO: In the case where the object is of an unknown type, a runtime.Unknown object will be created and stored.)",
-				Type:        []string{"object"},
-			},
-		},
-	}
-}
-
-func schema_k8sio_apimachinery_pkg_runtime_TypeMeta(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "TypeMeta is shared by all top level objects. The proper way to use it is to inline it in your type, like this:\n\n\ttype MyAwesomeAPIObject struct {\n\t     runtime.TypeMeta    `json:\",inline\"`\n\t     ... // other fields\n\t}\n\nfunc (obj *MyAwesomeAPIObject) SetGroupVersionKind(gvk *metav1.GroupVersionKind) { metav1.UpdateTypeMeta(obj,gvk) }; GroupVersionKind() *GroupVersionKind\n\nTypeMeta is provided here for convenience. You may use it directly from this package or define your own with the same fields.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Type:   []string{"string"},
-							Format: "",
-						},
-					},
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Type:   []string{"string"},
-							Format: "",
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
-func schema_k8sio_apimachinery_pkg_runtime_Unknown(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "Unknown allows api objects with unknown types to be passed-through. This can be used to deal with the API objects from a plug-in. Unknown objects still have functioning TypeMeta features-- kind, version, etc. metadata and field mutatation.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Type:   []string{"string"},
-							Format: "",
-						},
-					},
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Type:   []string{"string"},
-							Format: "",
-						},
-					},
-					"ContentEncoding": {
-						SchemaProps: spec.SchemaProps{
-							Description: "ContentEncoding is encoding used to encode 'Raw' data. Unspecified means no encoding.",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"ContentType": {
-						SchemaProps: spec.SchemaProps{
-							Description: "ContentType  is serialization method used to serialize 'Raw'. Unspecified means ContentTypeJSON.",
-							Default:     "",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-				},
-				Required: []string{"ContentEncoding", "ContentType"},
-			},
-		},
-	}
-}
-
-func schema_k8sio_apimachinery_pkg_version_Info(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "Info contains versioning information. how we'll want to distribute that information.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"major": {
-						SchemaProps: spec.SchemaProps{
-							Default: "",
-							Type:    []string{"string"},
-							Format:  "",
-						},
-					},
-					"minor": {
-						SchemaProps: spec.SchemaProps{
-							Default: "",
-							Type:    []string{"string"},
-							Format:  "",
-						},
-					},
-					"gitVersion": {
-						SchemaProps: spec.SchemaProps{
-							Default: "",
-							Type:    []string{"string"},
-							Format:  "",
-						},
-					},
-					"gitCommit": {
-						SchemaProps: spec.SchemaProps{
-							Default: "",
-							Type:    []string{"string"},
-							Format:  "",
-						},
-					},
-					"gitTreeState": {
-						SchemaProps: spec.SchemaProps{
-							Default: "",
-							Type:    []string{"string"},
-							Format:  "",
-						},
-					},
-					"buildDate": {
-						SchemaProps: spec.SchemaProps{
-							Default: "",
-							Type:    []string{"string"},
-							Format:  "",
-						},
-					},
-					"goVersion": {
-						SchemaProps: spec.SchemaProps{
-							Default: "",
-							Type:    []string{"string"},
-							Format:  "",
-						},
-					},
-					"compiler": {
-						SchemaProps: spec.SchemaProps{
-							Default: "",
-							Type:    []string{"string"},
-							Format:  "",
-						},
-					},
-					"platform": {
-						SchemaProps: spec.SchemaProps{
-							Default: "",
-							Type:    []string{"string"},
-							Format:  "",
-						},
-					},
-				},
-				Required: []string{"major", "minor", "gitVersion", "gitCommit", "gitTreeState", "buildDate", "goVersion", "compiler", "platform"},
-			},
-		},
-	}
-}
diff --git a/pkg/services/grafana-apiserver/request_handler.go b/pkg/services/grafana-apiserver/request_handler.go
deleted file mode 100644
index e9f04ad4bda32..0000000000000
--- a/pkg/services/grafana-apiserver/request_handler.go
+++ /dev/null
@@ -1,198 +0,0 @@
-package grafanaapiserver
-
-import (
-	"fmt"
-	"net/http"
-	"strings"
-
-	"github.com/gorilla/mux"
-	restclient "k8s.io/client-go/rest"
-	"k8s.io/kube-openapi/pkg/spec3"
-)
-
-type requestHandler struct {
-	router *mux.Router
-}
-
-func getAPIHandler(delegateHandler http.Handler, restConfig *restclient.Config, builders []APIGroupBuilder) (http.Handler, error) {
-	useful := false // only true if any routes exist anywhere
-	router := mux.NewRouter()
-	var err error
-
-	for _, builder := range builders {
-		routes := builder.GetAPIRoutes()
-		if routes == nil {
-			continue
-		}
-
-		gv := builder.GetGroupVersion()
-		prefix := "/apis/" + gv.String()
-
-		// Root handlers
-		var sub *mux.Router
-		for _, route := range routes.Root {
-			err = validPath(route.Path)
-			if err != nil {
-				return nil, err
-			}
-
-			if sub == nil {
-				sub = router.PathPrefix(prefix).Subrouter()
-				sub.MethodNotAllowedHandler = &methodNotAllowedHandler{}
-			}
-
-			useful = true
-			methods, err := methodsFromSpec(route.Path, route.Spec)
-			if err != nil {
-				return nil, err
-			}
-			sub.HandleFunc(route.Path, route.Handler).
-				Methods(methods...)
-		}
-
-		// Namespace handlers
-		sub = nil
-		prefix += "/namespaces/{namespace}"
-		for _, route := range routes.Namespace {
-			err = validPath(route.Path)
-			if err != nil {
-				return nil, err
-			}
-			if sub == nil {
-				sub = router.PathPrefix(prefix).Subrouter()
-				sub.MethodNotAllowedHandler = &methodNotAllowedHandler{}
-			}
-
-			useful = true
-			methods, err := methodsFromSpec(route.Path, route.Spec)
-			if err != nil {
-				return nil, err
-			}
-			sub.HandleFunc(route.Path, route.Handler).
-				Methods(methods...)
-		}
-
-		//	getter := makeGetter(restConfig)
-		for resource, route := range routes.Resource {
-			err = validPath(route.Path)
-			if err != nil {
-				return nil, err
-			}
-			fmt.Printf("TODO: %s/%v\n", resource, route)
-
-			// get a client for that resource kind
-			//getter := makeGetter(restConfig)
-
-			useful = true
-			// sub.HandleFunc(v.Slug, SubresourceHandlerWrapper(v.Handler, getter)).
-			// 	Methods(methods...)
-		}
-	}
-
-	if !useful {
-		return delegateHandler, nil
-	}
-
-	// Per Gorilla Mux issue here: https://github.com/gorilla/mux/issues/616#issuecomment-798807509
-	// default handler must come last
-	router.PathPrefix("/").Handler(delegateHandler)
-
-	return &requestHandler{
-		router: router,
-	}, nil
-}
-
-// The registered path must start with a slash, and (for now) not have any more
-func validPath(p string) error {
-	if !strings.HasPrefix(p, "/") {
-		return fmt.Errorf("path must start with slash")
-	}
-	if strings.Count(p, "/") > 1 {
-		return fmt.Errorf("path can only have one slash (for now)")
-	}
-	return nil
-}
-
-func (h *requestHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	h.router.ServeHTTP(w, req)
-}
-
-func methodsFromSpec(slug string, props *spec3.PathProps) ([]string, error) {
-	if props == nil {
-		return []string{"GET", "POST", "PUT", "PATCH", "DELETE"}, nil
-	}
-
-	methods := make([]string, 0)
-	if props.Get != nil {
-		methods = append(methods, "GET")
-	}
-	if props.Post != nil {
-		methods = append(methods, "POST")
-	}
-	if props.Put != nil {
-		methods = append(methods, "PUT")
-	}
-	if props.Patch != nil {
-		methods = append(methods, "PATCH")
-	}
-	if props.Delete != nil {
-		methods = append(methods, "DELETE")
-	}
-
-	if len(methods) == 0 {
-		return nil, fmt.Errorf("invalid OpenAPI Spec for slug=%s without any methods in PathProps", slug)
-	}
-
-	return methods, nil
-}
-
-type methodNotAllowedHandler struct{}
-
-func (h *methodNotAllowedHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	w.WriteHeader(405) // method not allowed
-}
-
-// Modify the the OpenAPI spec to include the additional routes.
-// Currently this requires: https://github.com/kubernetes/kube-openapi/pull/420
-// In future k8s release, the hook will use Config3 rather than the same hook for both v2 and v3
-func getOpenAPIPostProcessor(builders []APIGroupBuilder) func(*spec3.OpenAPI) (*spec3.OpenAPI, error) {
-	return func(s *spec3.OpenAPI) (*spec3.OpenAPI, error) {
-		if s.Paths == nil {
-			return s, nil
-		}
-		for _, builder := range builders {
-			routes := builder.GetAPIRoutes()
-			if routes == nil {
-				continue
-			}
-
-			gv := builder.GetGroupVersion()
-			prefix := "/apis/" + gv.String()
-			if s.Paths.Paths[prefix] != nil {
-				copy := *s // will copy the rest of the properties
-				copy.Info.Title = "Grafana API server: " + gv.Group
-
-				for _, route := range routes.Root {
-					copy.Paths.Paths[prefix+route.Path] = &spec3.Path{
-						PathProps: *route.Spec,
-					}
-				}
-
-				for _, route := range routes.Namespace {
-					copy.Paths.Paths[prefix+"/namespaces/{namespace}"+route.Path] = &spec3.Path{
-						PathProps: *route.Spec,
-					}
-				}
-
-				for resource, route := range routes.Resource {
-					copy.Paths.Paths[prefix+"/namespaces/{namespace}/"+resource+"{name}"+route.Path] = &spec3.Path{
-						PathProps: *route.Spec,
-					}
-				}
-
-				return &copy, nil
-			}
-		}
-		return s, nil
-	}
-}
diff --git a/pkg/services/grafana-apiserver/rest/dualwriter.go b/pkg/services/grafana-apiserver/rest/dualwriter.go
deleted file mode 100644
index 5c1872997328a..0000000000000
--- a/pkg/services/grafana-apiserver/rest/dualwriter.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package rest
-
-import (
-	"context"
-
-	metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apiserver/pkg/registry/rest"
-)
-
-var (
-	_ rest.Storage              = (*DualWriter)(nil)
-	_ rest.Scoper               = (*DualWriter)(nil)
-	_ rest.TableConvertor       = (*DualWriter)(nil)
-	_ rest.CreaterUpdater       = (*DualWriter)(nil)
-	_ rest.CollectionDeleter    = (*DualWriter)(nil)
-	_ rest.GracefulDeleter      = (*DualWriter)(nil)
-	_ rest.SingularNameProvider = (*DualWriter)(nil)
-)
-
-// Storage is a storage implementation that satisfies the same interfaces as genericregistry.Store.
-type Storage interface {
-	rest.Storage
-	rest.StandardStorage
-	rest.Scoper
-	rest.TableConvertor
-	rest.SingularNameProvider
-}
-
-// LegacyStorage is a storage implementation that writes to the Grafana SQL database.
-type LegacyStorage interface {
-	rest.Storage
-	rest.Scoper
-	rest.SingularNameProvider
-	rest.TableConvertor
-}
-
-// DualWriter is a storage implementation that writes first to LegacyStorage and then to Storage.
-// If writing to LegacyStorage fails, the write to Storage is skipped and the error is returned.
-// Storage is used for all read operations.
-//
-// The LegacyStorage implementation must implement the following interfaces:
-// - rest.Storage
-// - rest.TableConvertor
-// - rest.Scoper
-// - rest.SingularNameProvider
-//
-// These interfaces are optional, but they all should be implemented to fully support dual writes:
-// - rest.Creater
-// - rest.Updater
-// - rest.GracefulDeleter
-// - rest.CollectionDeleter
-type DualWriter struct {
-	Storage
-	legacy LegacyStorage
-}
-
-// NewDualWriter returns a new DualWriter.
-func NewDualWriter(legacy LegacyStorage, storage Storage) *DualWriter {
-	return &DualWriter{
-		Storage: storage,
-		legacy:  legacy,
-	}
-}
-
-// Create overrides the default behavior of the Storage and writes to both the LegacyStorage and Storage.
-func (d *DualWriter) Create(ctx context.Context, obj runtime.Object, createValidation rest.ValidateObjectFunc, options *metav1.CreateOptions) (runtime.Object, error) {
-	if legacy, ok := d.legacy.(rest.Creater); ok {
-		_, err := legacy.Create(ctx, obj, createValidation, options)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return d.Storage.Create(ctx, obj, createValidation, options)
-}
-
-// Update overrides the default behavior of the Storage and writes to both the LegacyStorage and Storage.
-func (d *DualWriter) Update(ctx context.Context, name string, objInfo rest.UpdatedObjectInfo, createValidation rest.ValidateObjectFunc, updateValidation rest.ValidateObjectUpdateFunc, forceAllowCreate bool, options *metav1.UpdateOptions) (runtime.Object, bool, error) {
-	if legacy, ok := d.legacy.(rest.Updater); ok {
-		_, _, err := legacy.Update(ctx, name, objInfo, createValidation, updateValidation, forceAllowCreate, options)
-		if err != nil {
-			return nil, false, err
-		}
-	}
-
-	return d.Storage.Update(ctx, name, objInfo, createValidation, updateValidation, forceAllowCreate, options)
-}
-
-// Delete overrides the default behavior of the Storage and delete from both the LegacyStorage and Storage.
-func (d *DualWriter) Delete(ctx context.Context, name string, deleteValidation rest.ValidateObjectFunc, options *metav1.DeleteOptions) (runtime.Object, bool, error) {
-	if legacy, ok := d.legacy.(rest.GracefulDeleter); ok {
-		_, _, err := legacy.Delete(ctx, name, deleteValidation, options)
-		if err != nil {
-			return nil, false, err
-		}
-	}
-
-	return d.Storage.Delete(ctx, name, deleteValidation, options)
-}
-
-// DeleteCollection overrides the default behavior of the Storage and delete from both the LegacyStorage and Storage.
-func (d *DualWriter) DeleteCollection(ctx context.Context, deleteValidation rest.ValidateObjectFunc, options *metav1.DeleteOptions, listOptions *metainternalversion.ListOptions) (runtime.Object, error) {
-	if legacy, ok := d.legacy.(rest.CollectionDeleter); ok {
-		_, err := legacy.DeleteCollection(ctx, deleteValidation, options, listOptions)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return d.Storage.DeleteCollection(ctx, deleteValidation, options, listOptions)
-}
diff --git a/pkg/services/grafana-apiserver/service.go b/pkg/services/grafana-apiserver/service.go
deleted file mode 100644
index 932b936e01de3..0000000000000
--- a/pkg/services/grafana-apiserver/service.go
+++ /dev/null
@@ -1,376 +0,0 @@
-package grafanaapiserver
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-	"path"
-	"strconv"
-
-	"github.com/go-logr/logr"
-	"github.com/grafana/dskit/services"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/runtime/serializer"
-	"k8s.io/apiserver/pkg/authorization/authorizer"
-	openapinamer "k8s.io/apiserver/pkg/endpoints/openapi"
-	"k8s.io/apiserver/pkg/endpoints/responsewriter"
-	genericapiserver "k8s.io/apiserver/pkg/server"
-	"k8s.io/apiserver/pkg/server/options"
-	"k8s.io/apiserver/pkg/util/openapi"
-	"k8s.io/client-go/kubernetes/scheme"
-	clientrest "k8s.io/client-go/rest"
-	"k8s.io/client-go/tools/clientcmd"
-	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
-	"k8s.io/component-base/logs"
-	"k8s.io/klog/v2"
-
-	"github.com/grafana/grafana/pkg/api/routing"
-	"github.com/grafana/grafana/pkg/infra/appcontext"
-	"github.com/grafana/grafana/pkg/infra/tracing"
-	"github.com/grafana/grafana/pkg/middleware"
-	"github.com/grafana/grafana/pkg/modules"
-	"github.com/grafana/grafana/pkg/registry"
-	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/web"
-)
-
-var (
-	_ Service                    = (*service)(nil)
-	_ RestConfigProvider         = (*service)(nil)
-	_ registry.BackgroundService = (*service)(nil)
-	_ registry.CanBeDisabled     = (*service)(nil)
-
-	Scheme = runtime.NewScheme()
-	Codecs = serializer.NewCodecFactory(Scheme)
-
-	unversionedVersion = schema.GroupVersion{Group: "", Version: "v1"}
-	unversionedTypes   = []runtime.Object{
-		&metav1.Status{},
-		&metav1.WatchEvent{},
-		&metav1.APIVersions{},
-		&metav1.APIGroupList{},
-		&metav1.APIGroup{},
-		&metav1.APIResourceList{},
-	}
-)
-
-func init() {
-	// we need to add the options to empty v1
-	metav1.AddToGroupVersion(Scheme, schema.GroupVersion{Group: "", Version: "v1"})
-	Scheme.AddUnversionedTypes(unversionedVersion, unversionedTypes...)
-}
-
-type Service interface {
-	services.NamedService
-	registry.BackgroundService
-	registry.CanBeDisabled
-}
-
-type APIRegistrar interface {
-	RegisterAPI(builder APIGroupBuilder)
-}
-
-type RestConfigProvider interface {
-	GetRestConfig() *clientrest.Config
-}
-
-type service struct {
-	*services.BasicService
-
-	config     *config
-	restConfig *clientrest.Config
-
-	stopCh    chan struct{}
-	stoppedCh chan error
-
-	rr       routing.RouteRegister
-	handler  web.Handler
-	builders []APIGroupBuilder
-
-	tracing *tracing.TracingService
-
-	authorizer authorizer.Authorizer
-}
-
-func ProvideService(
-	cfg *setting.Cfg,
-	rr routing.RouteRegister,
-	authz authorizer.Authorizer,
-	tracing *tracing.TracingService,
-) (*service, error) {
-	s := &service{
-		config:     newConfig(cfg),
-		rr:         rr,
-		stopCh:     make(chan struct{}),
-		builders:   []APIGroupBuilder{},
-		tracing:    tracing,
-		authorizer: authz,
-	}
-
-	// This will be used when running as a dskit service
-	s.BasicService = services.NewBasicService(s.start, s.running, nil).WithName(modules.GrafanaAPIServer)
-
-	// TODO: this is very hacky
-	// We need to register the routes in ProvideService to make sure
-	// the routes are registered before the Grafana HTTP server starts.
-	proxyHandler := func(k8sRoute routing.RouteRegister) {
-		handler := func(c *contextmodel.ReqContext) {
-			if s.handler == nil {
-				c.Resp.WriteHeader(404)
-				_, _ = c.Resp.Write([]byte("Not found"))
-				return
-			}
-
-			if handle, ok := s.handler.(func(c *contextmodel.ReqContext)); ok {
-				handle(c)
-				return
-			}
-		}
-		k8sRoute.Any("/", middleware.ReqSignedIn, handler)
-		k8sRoute.Any("/*", middleware.ReqSignedIn, handler)
-	}
-
-	s.rr.Group("/apis", proxyHandler)
-	s.rr.Group("/apiserver-metrics", proxyHandler)
-	s.rr.Group("/openapi", proxyHandler)
-
-	return s, nil
-}
-
-func (s *service) GetRestConfig() *clientrest.Config {
-	return s.restConfig
-}
-
-func (s *service) IsDisabled() bool {
-	return !s.config.enabled
-}
-
-// Run is an adapter for the BackgroundService interface.
-func (s *service) Run(ctx context.Context) error {
-	if err := s.start(ctx); err != nil {
-		return err
-	}
-	return s.running(ctx)
-}
-
-func (s *service) RegisterAPI(builder APIGroupBuilder) {
-	s.builders = append(s.builders, builder)
-}
-
-func (s *service) start(ctx context.Context) error {
-	logger := logr.New(newLogAdapter(s.config.logLevel))
-	klog.SetLoggerWithOptions(logger, klog.ContextualLogger(true))
-	if _, err := logs.GlogSetter(strconv.Itoa(s.config.logLevel)); err != nil {
-		logger.Error(err, "failed to set log level")
-	}
-
-	// Get the list of groups the server will support
-	builders := s.builders
-
-	groupVersions := make([]schema.GroupVersion, 0, len(builders))
-	// Install schemas
-	for _, b := range builders {
-		groupVersions = append(groupVersions, b.GetGroupVersion())
-		if err := b.InstallSchema(Scheme); err != nil {
-			return err
-		}
-	}
-
-	o := options.NewRecommendedOptions("/registry/grafana.app", Codecs.LegacyCodec(groupVersions...))
-	o.SecureServing.BindAddress = s.config.ip
-	o.SecureServing.BindPort = s.config.port
-	o.Authentication.RemoteKubeConfigFileOptional = true
-	o.Authorization.RemoteKubeConfigFileOptional = true
-	o.Etcd.StorageConfig.Transport.ServerList = s.config.etcdServers
-
-	o.Admission = nil
-	o.CoreAPI = nil
-	if len(o.Etcd.StorageConfig.Transport.ServerList) == 0 {
-		o.Etcd = nil
-	}
-
-	if err := o.Validate(); len(err) > 0 {
-		return err[0]
-	}
-
-	serverConfig := genericapiserver.NewRecommendedConfig(Codecs)
-	serverConfig.ExternalAddress = s.config.host
-
-	if s.config.devMode {
-		// SecureServingOptions is used when the apiserver needs it's own listener.
-		// this is not needed in production, but it's useful for development kubectl access.
-		if err := o.SecureServing.ApplyTo(&serverConfig.SecureServing, &serverConfig.LoopbackClientConfig); err != nil {
-			return err
-		}
-		// AuthenticationOptions is needed to authenticate requests from kubectl in dev mode.
-		if err := o.Authentication.ApplyTo(&serverConfig.Authentication, serverConfig.SecureServing, serverConfig.OpenAPIConfig); err != nil {
-			return err
-		}
-	}
-
-	// override ExternalAddress and LoopbackClientConfig in prod mode.
-	// in dev mode we want to use the loopback client config
-	// and address provided by SecureServingOptions.
-	if !s.config.devMode {
-		serverConfig.ExternalAddress = s.config.host
-		serverConfig.LoopbackClientConfig = &clientrest.Config{
-			Host: s.config.apiURL,
-			TLSClientConfig: clientrest.TLSClientConfig{
-				Insecure: true,
-			},
-		}
-	}
-
-	if o.Etcd != nil {
-		if err := o.Etcd.Complete(serverConfig.Config.StorageObjectCountTracker, serverConfig.Config.DrainedNotify(), serverConfig.Config.AddPostStartHook); err != nil {
-			return err
-		}
-		if err := o.Etcd.ApplyTo(&serverConfig.Config); err != nil {
-			return err
-		}
-	}
-
-	serverConfig.Authorization.Authorizer = s.authorizer
-
-	// Add OpenAPI specs for each group+version
-	defsGetter := getOpenAPIDefinitions(builders)
-	serverConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(
-		openapi.GetOpenAPIDefinitionsWithoutDisabledFeatures(defsGetter),
-		openapinamer.NewDefinitionNamer(Scheme, scheme.Scheme))
-
-	serverConfig.OpenAPIV3Config = genericapiserver.DefaultOpenAPIV3Config(
-		openapi.GetOpenAPIDefinitionsWithoutDisabledFeatures(defsGetter),
-		openapinamer.NewDefinitionNamer(Scheme, scheme.Scheme))
-
-	// Add the custom routes to service discovery
-	serverConfig.OpenAPIV3Config.PostProcessSpec3 = getOpenAPIPostProcessor(builders)
-
-	serverConfig.SkipOpenAPIInstallation = false
-	serverConfig.BuildHandlerChainFunc = func(delegateHandler http.Handler, c *genericapiserver.Config) http.Handler {
-		// Call DefaultBuildHandlerChain on the main entrypoint http.Handler
-		// See https://github.com/kubernetes/apiserver/blob/v0.28.0/pkg/server/config.go#L906
-		// DefaultBuildHandlerChain provides many things, notably CORS, HSTS, cache-control, authz and latency tracking
-		requestHandler, err := getAPIHandler(
-			delegateHandler,
-			c.LoopbackClientConfig,
-			builders)
-		if err != nil {
-			panic(fmt.Sprintf("could not build handler chain func: %s", err.Error()))
-		}
-		return genericapiserver.DefaultBuildHandlerChain(requestHandler, c)
-	}
-
-	serverConfig.TracerProvider = s.tracing.GetTracerProvider()
-
-	// Create the server
-	server, err := serverConfig.Complete().New("grafana-apiserver", genericapiserver.NewEmptyDelegate())
-	if err != nil {
-		return err
-	}
-
-	// Install the API Group+version
-	for _, b := range builders {
-		g, err := b.GetAPIGroupInfo(Scheme, Codecs, serverConfig.RESTOptionsGetter)
-		if err != nil {
-			return err
-		}
-		err = server.InstallAPIGroup(g)
-		if err != nil {
-			return err
-		}
-	}
-
-	s.restConfig = server.LoopbackClientConfig
-
-	// only write kubeconfig in dev mode
-	if s.config.devMode {
-		if err := s.ensureKubeConfig(); err != nil {
-			return err
-		}
-	}
-
-	// TODO: this is a hack. see note in ProvideService
-	s.handler = func(c *contextmodel.ReqContext) {
-		req := c.Req
-		if req.URL.Path == "" {
-			req.URL.Path = "/"
-		}
-
-		//TODO: add support for the existing MetricsEndpointBasicAuth config option
-		if req.URL.Path == "/apiserver-metrics" {
-			req.URL.Path = "/metrics"
-		}
-
-		ctx := req.Context()
-		signedInUser := appcontext.MustUser(ctx)
-
-		req.Header.Set("X-Remote-User", strconv.FormatInt(signedInUser.UserID, 10))
-		req.Header.Set("X-Remote-Group", "grafana")
-
-		resp := responsewriter.WrapForHTTP1Or2(c.Resp)
-		server.Handler.ServeHTTP(resp, req)
-	}
-
-	// skip starting the server in prod mode
-	if !s.config.devMode {
-		return nil
-	}
-
-	prepared := server.PrepareRun()
-	go func() {
-		s.stoppedCh <- prepared.Run(s.stopCh)
-	}()
-	return nil
-}
-
-func (s *service) running(ctx context.Context) error {
-	// skip waiting for the server in prod mode
-	if !s.config.devMode {
-		<-ctx.Done()
-		return nil
-	}
-
-	select {
-	case err := <-s.stoppedCh:
-		if err != nil {
-			return err
-		}
-	case <-ctx.Done():
-		close(s.stopCh)
-	}
-	return nil
-}
-
-func (s *service) ensureKubeConfig() error {
-	clusters := make(map[string]*clientcmdapi.Cluster)
-	clusters["default-cluster"] = &clientcmdapi.Cluster{
-		Server:                s.restConfig.Host,
-		InsecureSkipTLSVerify: true,
-	}
-
-	contexts := make(map[string]*clientcmdapi.Context)
-	contexts["default-context"] = &clientcmdapi.Context{
-		Cluster:   "default-cluster",
-		Namespace: "default",
-		AuthInfo:  "default",
-	}
-
-	authinfos := make(map[string]*clientcmdapi.AuthInfo)
-	authinfos["default"] = &clientcmdapi.AuthInfo{
-		Token: s.restConfig.BearerToken,
-	}
-
-	clientConfig := clientcmdapi.Config{
-		Kind:           "Config",
-		APIVersion:     "v1",
-		Clusters:       clusters,
-		Contexts:       contexts,
-		CurrentContext: "default-context",
-		AuthInfos:      authinfos,
-	}
-
-	return clientcmd.WriteToFile(clientConfig, path.Join(s.config.dataPath, "grafana.kubeconfig"))
-}
diff --git a/pkg/services/grafana-apiserver/wireset.go b/pkg/services/grafana-apiserver/wireset.go
deleted file mode 100644
index f4986e59313be..0000000000000
--- a/pkg/services/grafana-apiserver/wireset.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package grafanaapiserver
-
-import (
-	"github.com/google/wire"
-
-	"github.com/grafana/grafana/pkg/services/grafana-apiserver/auth/authorizer"
-)
-
-var WireSet = wire.NewSet(
-	ProvideService,
-	wire.Bind(new(RestConfigProvider), new(*service)),
-	wire.Bind(new(Service), new(*service)),
-	wire.Bind(new(APIRegistrar), new(*service)),
-	authorizer.WireSet,
-)
diff --git a/pkg/services/grpcserver/interceptors/tracing.go b/pkg/services/grpcserver/interceptors/tracing.go
index c65a8dda3593a..e7bd3b6a925db 100644
--- a/pkg/services/grpcserver/interceptors/tracing.go
+++ b/pkg/services/grpcserver/interceptors/tracing.go
@@ -3,7 +3,10 @@ package interceptors
 import (
 	"context"
 
+	"go.opentelemetry.io/otel"
+	"go.opentelemetry.io/otel/propagation"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/metadata"
 
 	"github.com/grafana/grafana/pkg/infra/tracing"
 )
@@ -17,6 +20,10 @@ func TracingUnaryInterceptor(tracer tracing.Tracer) grpc.UnaryServerInterceptor
 		info *grpc.UnaryServerInfo,
 		handler grpc.UnaryHandler,
 	) (resp any, err error) {
+		if md, ok := metadata.FromIncomingContext(ctx); ok {
+			ctx = otel.GetTextMapPropagator().Extract(ctx, propagation.HeaderCarrier(md))
+		}
+
 		ctx, span := tracer.Start(ctx, tracingPrefix+info.FullMethod)
 		defer span.End()
 		resp, err = handler(ctx, req)
@@ -26,7 +33,11 @@ func TracingUnaryInterceptor(tracer tracing.Tracer) grpc.UnaryServerInterceptor
 
 func TracingStreamInterceptor(tracer tracing.Tracer) grpc.StreamServerInterceptor {
 	return func(srv any, stream grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error {
-		ctx, span := tracer.Start(stream.Context(), tracingPrefix+info.FullMethod)
+		ctx := stream.Context()
+		if md, ok := metadata.FromIncomingContext(ctx); ok {
+			ctx = otel.GetTextMapPropagator().Extract(ctx, propagation.HeaderCarrier(md))
+		}
+		ctx, span := tracer.Start(ctx, tracingPrefix+info.FullMethod)
 		defer span.End()
 		tracingStream := &tracingServerStream{
 			ServerStream: stream,
diff --git a/pkg/services/grpcserver/service.go b/pkg/services/grpcserver/service.go
index 56e2b09b86c48..456a26932df8c 100644
--- a/pkg/services/grpcserver/service.go
+++ b/pkg/services/grpcserver/service.go
@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"net"
 
+	"github.com/grafana/dskit/instrument"
+	"github.com/grafana/dskit/middleware"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
 	grpcAuth "github.com/grpc-ecosystem/go-grpc-middleware/auth"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/weaveworks/common/instrument"
-	"github.com/weaveworks/common/middleware"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 
@@ -38,12 +38,14 @@ type gPRCServerService struct {
 	logger  log.Logger
 	server  *grpc.Server
 	address string
+	enabled bool
 }
 
-func ProvideService(cfg *setting.Cfg, authenticator interceptors.Authenticator, tracer tracing.Tracer, registerer prometheus.Registerer) (Provider, error) {
+func ProvideService(cfg *setting.Cfg, features featuremgmt.FeatureToggles, authenticator interceptors.Authenticator, tracer tracing.Tracer, registerer prometheus.Registerer) (Provider, error) {
 	s := &gPRCServerService{
-		cfg:    cfg,
-		logger: log.New("grpc-server"),
+		cfg:     cfg,
+		logger:  log.New("grpc-server"),
+		enabled: features.IsEnabledGlobally(featuremgmt.FlagGrpcServer),
 	}
 
 	// Register the metric here instead of an init() function so that we do
@@ -123,10 +125,7 @@ func (s *gPRCServerService) Run(ctx context.Context) error {
 }
 
 func (s *gPRCServerService) IsDisabled() bool {
-	if s.cfg == nil {
-		return true
-	}
-	return !s.cfg.IsFeatureToggleEnabled(featuremgmt.FlagGrpcServer)
+	return !s.enabled
 }
 
 func (s *gPRCServerService) GetServer() *grpc.Server {
diff --git a/pkg/services/guardian/accesscontrol_guardian_test.go b/pkg/services/guardian/accesscontrol_guardian_test.go
index 666b67e3f1209..ef8980bd54d5f 100644
--- a/pkg/services/guardian/accesscontrol_guardian_test.go
+++ b/pkg/services/guardian/accesscontrol_guardian_test.go
@@ -12,7 +12,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
 	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/folder/foldertest"
 	"github.com/grafana/grafana/pkg/services/licensing/licensingtest"
 	"github.com/grafana/grafana/pkg/services/user"
@@ -30,7 +29,7 @@ const (
 var (
 	folderUIDScope        = fmt.Sprintf("folders:uid:%s", folderUID)
 	invalidFolderUIDScope = fmt.Sprintf("folders:uid:%s", invalidFolderUID)
-	dashboard             = &dashboards.Dashboard{OrgID: orgID, UID: dashUID, IsFolder: false, FolderID: folderID}
+	dashboard             = &dashboards.Dashboard{OrgID: orgID, UID: dashUID, IsFolder: false, FolderUID: folderUID}
 	fldr                  = &dashboards.Dashboard{OrgID: orgID, UID: folderUID, IsFolder: true}
 )
 
@@ -79,7 +78,7 @@ func TestAccessControlDashboardGuardian_CanSave(t *testing.T) {
 		},
 		{
 			desc:      "should be able to save dashboard under root with general folder scope",
-			dashboard: &dashboards.Dashboard{OrgID: orgID, UID: dashUID, IsFolder: false, FolderID: 0},
+			dashboard: &dashboards.Dashboard{OrgID: orgID, UID: dashUID, IsFolder: false},
 			permissions: []accesscontrol.Permission{
 				{
 					Action: dashboards.ActionDashboardsWrite,
@@ -88,17 +87,6 @@ func TestAccessControlDashboardGuardian_CanSave(t *testing.T) {
 			},
 			expected: true,
 		},
-		{
-			desc:      "should be able to save dashboard with folder scope",
-			dashboard: dashboard,
-			permissions: []accesscontrol.Permission{
-				{
-					Action: dashboards.ActionDashboardsWrite,
-					Scope:  folderUIDScope,
-				},
-			},
-			expected: true,
-		},
 		{
 			desc:      "should not be able to save dashboard with incorrect dashboard scope",
 			dashboard: dashboard,
@@ -236,7 +224,7 @@ func TestAccessControlDashboardGuardian_CanEdit(t *testing.T) {
 		},
 		{
 			desc:      "should be able to edit dashboard under root with general folder scope",
-			dashboard: &dashboards.Dashboard{OrgID: orgID, UID: dashUID, IsFolder: false, FolderID: 0},
+			dashboard: &dashboards.Dashboard{OrgID: orgID, UID: dashUID, IsFolder: false},
 			permissions: []accesscontrol.Permission{
 				{
 					Action: dashboards.ActionDashboardsWrite,
@@ -245,17 +233,6 @@ func TestAccessControlDashboardGuardian_CanEdit(t *testing.T) {
 			},
 			expected: true,
 		},
-		{
-			desc:      "should be able to edit dashboard with folder scope",
-			dashboard: dashboard,
-			permissions: []accesscontrol.Permission{
-				{
-					Action: dashboards.ActionDashboardsWrite,
-					Scope:  folderUIDScope,
-				},
-			},
-			expected: true,
-		},
 		{
 			desc:      "should not be able to edit dashboard with incorrect dashboard scope",
 			dashboard: dashboard,
@@ -409,7 +386,7 @@ func TestAccessControlDashboardGuardian_CanView(t *testing.T) {
 		},
 		{
 			desc:      "should be able to view dashboard under root with general folder scope",
-			dashboard: &dashboards.Dashboard{OrgID: orgID, UID: dashUID, IsFolder: false, FolderID: 0},
+			dashboard: &dashboards.Dashboard{OrgID: orgID, UID: dashUID, IsFolder: false},
 			permissions: []accesscontrol.Permission{
 				{
 					Action: dashboards.ActionDashboardsRead,
@@ -418,17 +395,6 @@ func TestAccessControlDashboardGuardian_CanView(t *testing.T) {
 			},
 			expected: true,
 		},
-		{
-			desc:      "should be able to view dashboard with folder scope",
-			dashboard: dashboard,
-			permissions: []accesscontrol.Permission{
-				{
-					Action: dashboards.ActionDashboardsRead,
-					Scope:  folderUIDScope,
-				},
-			},
-			expected: true,
-		},
 		{
 			desc:      "should not be able to view dashboard with incorrect dashboard scope",
 			dashboard: dashboard,
@@ -529,6 +495,7 @@ func TestAccessControlDashboardGuardian_CanView(t *testing.T) {
 		})
 	}
 }
+
 func TestAccessControlDashboardGuardian_CanAdmin(t *testing.T) {
 	tests := []accessControlGuardianTestCase{
 		{
@@ -578,7 +545,7 @@ func TestAccessControlDashboardGuardian_CanAdmin(t *testing.T) {
 		},
 		{
 			desc:      "should be able to admin dashboard under root with general folder scope",
-			dashboard: &dashboards.Dashboard{OrgID: orgID, UID: dashUID, IsFolder: false, FolderID: 0},
+			dashboard: &dashboards.Dashboard{OrgID: orgID, UID: dashUID, IsFolder: false},
 			permissions: []accesscontrol.Permission{
 				{
 					Action: dashboards.ActionDashboardsPermissionsRead,
@@ -591,21 +558,6 @@ func TestAccessControlDashboardGuardian_CanAdmin(t *testing.T) {
 			},
 			expected: true,
 		},
-		{
-			desc:      "should be able to admin dashboard with folder scope",
-			dashboard: dashboard,
-			permissions: []accesscontrol.Permission{
-				{
-					Action: dashboards.ActionDashboardsPermissionsRead,
-					Scope:  folderUIDScope,
-				},
-				{
-					Action: dashboards.ActionDashboardsPermissionsWrite,
-					Scope:  folderUIDScope,
-				},
-			},
-			expected: true,
-		},
 		{
 			desc:      "should not be able to admin dashboard with incorrect dashboard scope",
 			dashboard: dashboard,
@@ -820,7 +772,7 @@ func TestAccessControlDashboardGuardian_CanDelete(t *testing.T) {
 		},
 		{
 			desc:      "should be able to delete dashboard under root with general folder scope",
-			dashboard: &dashboards.Dashboard{OrgID: orgID, UID: dashUID, IsFolder: false, FolderID: 0},
+			dashboard: &dashboards.Dashboard{OrgID: orgID, UID: dashUID, IsFolder: false},
 			permissions: []accesscontrol.Permission{
 				{
 					Action: dashboards.ActionDashboardsDelete,
@@ -829,17 +781,6 @@ func TestAccessControlDashboardGuardian_CanDelete(t *testing.T) {
 			},
 			expected: true,
 		},
-		{
-			desc:      "should be able to delete dashboard with folder scope",
-			dashboard: dashboard,
-			permissions: []accesscontrol.Permission{
-				{
-					Action: dashboards.ActionDashboardsDelete,
-					Scope:  folderUIDScope,
-				},
-			},
-			expected: true,
-		},
 		{
 			desc:      "should not be able to delete dashboard with incorrect dashboard scope",
 			dashboard: dashboard,
@@ -1018,7 +959,6 @@ func setupAccessControlGuardianTest(
 	folderSvc := foldertest.NewFakeService()
 
 	folderStore := foldertest.NewFakeFolderStore(t)
-	folderStore.On("GetFolderByID", mock.Anything, mock.Anything, mock.Anything).Maybe().Return(&folder.Folder{ID: folderID, UID: folderUID, OrgID: orgID}, nil)
 
 	ac.RegisterScopeAttributeResolver(dashboards.NewDashboardUIDScopeResolver(folderStore, fakeDashboardService, folderSvc))
 	ac.RegisterScopeAttributeResolver(dashboards.NewFolderUIDScopeResolver(folderSvc))
diff --git a/pkg/services/guardian/guardian.go b/pkg/services/guardian/guardian.go
index 795780253881b..0d393820eeb96 100644
--- a/pkg/services/guardian/guardian.go
+++ b/pkg/services/guardian/guardian.go
@@ -2,7 +2,9 @@ package guardian
 
 import (
 	"context"
+	"slices"
 
+	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/folder"
@@ -59,17 +61,29 @@ type FakeDashboardGuardian struct {
 	CanEditValue  bool
 	CanViewValue  bool
 	CanAdminValue bool
+	CanViewUIDs   []string
+	CanEditUIDs   []string
+	CanSaveUIDs   []string
 }
 
 func (g *FakeDashboardGuardian) CanSave() (bool, error) {
+	if g.CanSaveUIDs != nil {
+		return slices.Contains(g.CanSaveUIDs, g.DashUID), nil
+	}
 	return g.CanSaveValue, nil
 }
 
 func (g *FakeDashboardGuardian) CanEdit() (bool, error) {
+	if g.CanEditUIDs != nil {
+		return slices.Contains(g.CanEditUIDs, g.DashUID), nil
+	}
 	return g.CanEditValue, nil
 }
 
 func (g *FakeDashboardGuardian) CanView() (bool, error) {
+	if g.CanViewUIDs != nil {
+		return slices.Contains(g.CanViewUIDs, g.DashUID), nil
+	}
 	return g.CanViewValue, nil
 }
 
@@ -112,6 +126,8 @@ func MockDashboardGuardian(mock *FakeDashboardGuardian) {
 	NewByFolder = func(_ context.Context, f *folder.Folder, orgId int64, user identity.Requester) (DashboardGuardian, error) {
 		mock.OrgID = orgId
 		mock.DashUID = f.UID
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Guardian).Inc()
+		// nolint:staticcheck
 		mock.DashID = f.ID
 		mock.User = user
 		return mock, nil
diff --git a/pkg/services/ldap/api/service.go b/pkg/services/ldap/api/service.go
index 2c288c60fb182..2d5de2a1da276 100644
--- a/pkg/services/ldap/api/service.go
+++ b/pkg/services/ldap/api/service.go
@@ -197,10 +197,10 @@ func (s *Service) PostSyncUserWithLDAP(c *contextmodel.ReqContext) response.Resp
 	authModuleQuery := &login.GetAuthInfoQuery{UserId: usr.ID, AuthModule: login.LDAPAuthModule}
 	if _, err := s.authInfoService.GetAuthInfo(c.Req.Context(), authModuleQuery); err != nil { // validate the userId comes from LDAP
 		if errors.Is(err, user.ErrUserNotFound) {
-			return response.Error(404, user.ErrUserNotFound.Error(), nil)
+			return response.Error(http.StatusNotFound, user.ErrUserNotFound.Error(), nil)
 		}
 
-		return response.Error(500, "Failed to get user", err)
+		return response.Error(http.StatusInternalServerError, "Failed to get user", err)
 	}
 
 	userInfo, _, err := ldapClient.User(usr.Login)
diff --git a/pkg/services/ldap/api/service_test.go b/pkg/services/ldap/api/service_test.go
index f8b37e09eea3d..8282408341edd 100644
--- a/pkg/services/ldap/api/service_test.go
+++ b/pkg/services/ldap/api/service_test.go
@@ -20,7 +20,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/ldap/multildap"
 	"github.com/grafana/grafana/pkg/services/ldap/service"
 	"github.com/grafana/grafana/pkg/services/login"
-	"github.com/grafana/grafana/pkg/services/login/logintest"
+	"github.com/grafana/grafana/pkg/services/login/authinfotest"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/org/orgtest"
 	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
@@ -67,7 +67,7 @@ func setupAPITest(t *testing.T, opts ...func(a *Service)) (*Service, *webtest.Se
 		router,
 		acimpl.ProvideAccessControl(cfg),
 		usertest.NewUserServiceFake(),
-		&logintest.AuthInfoServiceFake{},
+		&authinfotest.FakeService{},
 		ldap.ProvideGroupsService(),
 		&authntest.FakeService{},
 		&orgtest.FakeOrgService{},
@@ -180,7 +180,6 @@ func TestGetUserFromLDAPAPIEndpoint_OrgNotfound(t *testing.T) {
 	var resMap map[string]interface{}
 	err = json.Unmarshal(bodyBytes, &resMap)
 	assert.NoError(t, err)
-	assert.Equal(t, "unable to find organization with ID '2'", resMap["error"])
 	assert.Equal(t, "An organization was not found - Please verify your LDAP configuration", resMap["message"])
 }
 
@@ -499,7 +498,6 @@ func TestPostSyncUserWithLDAPAPIEndpoint_WhenGrafanaAdmin(t *testing.T) {
 	var resMap map[string]interface{}
 	err = json.Unmarshal(bodyBytes, &resMap)
 	assert.NoError(t, err)
-	assert.Equal(t, "did not find a user", resMap["error"])
 	assert.Equal(t, "Refusing to sync grafana super admin \"ldap-daniel\" - it would be disabled", resMap["message"])
 }
 
@@ -509,7 +507,7 @@ func TestPostSyncUserWithLDAPAPIEndpoint_WhenUserNotInLDAP(t *testing.T) {
 
 	_, server := setupAPITest(t, func(a *Service) {
 		a.userService = userServiceMock
-		a.authInfoService = &logintest.AuthInfoServiceFake{ExpectedExternalUser: &login.ExternalUserInfo{IsDisabled: true, UserId: 34}}
+		a.authInfoService = &authinfotest.FakeService{ExpectedExternalUser: &login.ExternalUserInfo{IsDisabled: true, UserId: 34}}
 		a.ldapService = &service.LDAPFakeService{
 			ExpectedClient: &LDAPMock{UserSearchError: multildap.ErrDidNotFindUser},
 			ExpectedConfig: &ldap.Config{},
diff --git a/pkg/services/libraryelements/api.go b/pkg/services/libraryelements/api.go
index d3113c48526b8..a8ed34609c43a 100644
--- a/pkg/services/libraryelements/api.go
+++ b/pkg/services/libraryelements/api.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/api/routing"
+	"github.com/grafana/grafana/pkg/infra/metrics"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/dashboards"
@@ -21,11 +22,11 @@ func (l *LibraryElementService) registerAPIEndpoints() {
 	l.RouteRegister.Group("/api/library-elements", func(entities routing.RouteRegister) {
 		uidScope := ScopeLibraryPanelsProvider.GetResourceScopeUID(ac.Parameter(":uid"))
 
-		if l.features.IsEnabled(featuremgmt.FlagLibraryPanelRBAC) {
+		if l.features.IsEnabledGlobally(featuremgmt.FlagLibraryPanelRBAC) {
 			entities.Post("/", authorize(ac.EvalPermission(ActionLibraryPanelsCreate)), routing.Wrap(l.createHandler))
 			entities.Delete("/:uid", authorize(ac.EvalPermission(ActionLibraryPanelsDelete, uidScope)), routing.Wrap(l.deleteHandler))
 			entities.Get("/", authorize(ac.EvalPermission(ActionLibraryPanelsRead)), routing.Wrap(l.getAllHandler))
-			entities.Get("/:uid", authorize(ac.EvalPermission(ActionLibraryPanelsRead, uidScope)), routing.Wrap(l.getHandler))
+			entities.Get("/:uid", authorize(ac.EvalPermission(ActionLibraryPanelsRead)), routing.Wrap(l.getHandler))
 			entities.Get("/:uid/connections/", authorize(ac.EvalPermission(ActionLibraryPanelsRead, uidScope)), routing.Wrap(l.getConnectionsHandler))
 			entities.Get("/name/:name", routing.Wrap(l.getByNameHandler))
 			entities.Patch("/:uid", authorize(ac.EvalPermission(ActionLibraryPanelsWrite, uidScope)), routing.Wrap(l.patchHandler))
@@ -62,6 +63,8 @@ func (l *LibraryElementService) createHandler(c *contextmodel.ReqContext) respon
 
 	if cmd.FolderUID != nil {
 		if *cmd.FolderUID == "" {
+			metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryElements).Inc()
+			// nolint:staticcheck
 			cmd.FolderID = 0
 			generalFolderUID := ac.GeneralFolderUID
 			cmd.FolderUID = &generalFolderUID
@@ -70,6 +73,8 @@ func (l *LibraryElementService) createHandler(c *contextmodel.ReqContext) respon
 			if err != nil || folder == nil {
 				return response.ErrOrFallback(http.StatusBadRequest, "failed to get folder", err)
 			}
+			metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryElements).Inc()
+			// nolint:staticcheck
 			cmd.FolderID = folder.ID
 		}
 	}
@@ -79,7 +84,11 @@ func (l *LibraryElementService) createHandler(c *contextmodel.ReqContext) respon
 		return toLibraryElementError(err, "Failed to create library element")
 	}
 
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryElements).Inc()
+	// nolint:staticcheck
 	if element.FolderID != 0 {
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryElements).Inc()
+		// nolint:staticcheck
 		folder, err := l.folderService.Get(c.Req.Context(), &folder.GetFolderQuery{OrgID: c.SignedInUser.GetOrgID(), ID: &element.FolderID, SignedInUser: c.SignedInUser})
 		if err != nil {
 			return response.ErrOrFallback(http.StatusInternalServerError, "failed to get folder", err)
@@ -131,7 +140,8 @@ func (l *LibraryElementService) deleteHandler(c *contextmodel.ReqContext) respon
 // 404: notFoundError
 // 500: internalServerError
 func (l *LibraryElementService) getHandler(c *contextmodel.ReqContext) response.Response {
-	element, err := l.getLibraryElementByUid(c.Req.Context(), c.SignedInUser,
+	ctx := c.Req.Context()
+	element, err := l.getLibraryElementByUid(ctx, c.SignedInUser,
 		model.GetLibraryElementCommand{
 			UID:        web.Params(c.Req)[":uid"],
 			FolderName: dashboards.RootFolderName,
@@ -141,6 +151,15 @@ func (l *LibraryElementService) getHandler(c *contextmodel.ReqContext) response.
 		return toLibraryElementError(err, "Failed to get library element")
 	}
 
+	if l.features.IsEnabled(ctx, featuremgmt.FlagLibraryPanelRBAC) {
+		allowed, err := l.AccessControl.Evaluate(ctx, c.SignedInUser, ac.EvalPermission(ActionLibraryPanelsRead, ScopeLibraryPanelsProvider.GetResourceScopeUID(web.Params(c.Req)[":uid"])))
+		if err != nil {
+			return response.Error(http.StatusInternalServerError, "unable to evaluate library panel permissions", err)
+		} else if !allowed {
+			return response.Error(http.StatusForbidden, "insufficient permissions for getting library panel", err)
+		}
+	}
+
 	return response.JSON(http.StatusOK, model.LibraryElementResponse{Result: element})
 }
 
@@ -173,7 +192,7 @@ func (l *LibraryElementService) getAllHandler(c *contextmodel.ReqContext) respon
 		return toLibraryElementError(err, "Failed to get library elements")
 	}
 
-	if l.features.IsEnabled(featuremgmt.FlagLibraryPanelRBAC) {
+	if l.features.IsEnabled(c.Req.Context(), featuremgmt.FlagLibraryPanelRBAC) {
 		filteredPanels, err := l.filterLibraryPanelsByPermission(c, elementsResult.Elements)
 		if err != nil {
 			return toLibraryElementError(err, "Failed to evaluate permissions")
@@ -206,12 +225,16 @@ func (l *LibraryElementService) patchHandler(c *contextmodel.ReqContext) respons
 
 	if cmd.FolderUID != nil {
 		if *cmd.FolderUID == "" {
+			metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryElements).Inc()
+			// nolint:staticcheck
 			cmd.FolderID = 0
 		} else {
 			folder, err := l.folderService.Get(c.Req.Context(), &folder.GetFolderQuery{OrgID: c.SignedInUser.GetOrgID(), UID: cmd.FolderUID, SignedInUser: c.SignedInUser})
 			if err != nil || folder == nil {
 				return response.Error(http.StatusBadRequest, "failed to get folder", err)
 			}
+			metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryElements).Inc()
+			// nolint:staticcheck
 			cmd.FolderID = folder.ID
 		}
 	}
@@ -221,7 +244,11 @@ func (l *LibraryElementService) patchHandler(c *contextmodel.ReqContext) respons
 		return toLibraryElementError(err, "Failed to update library element")
 	}
 
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryElements).Inc()
+	// nolint:staticcheck
 	if element.FolderID != 0 {
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryElements).Inc()
+		// nolint:staticcheck
 		folder, err := l.folderService.Get(c.Req.Context(), &folder.GetFolderQuery{OrgID: c.SignedInUser.GetOrgID(), ID: &element.FolderID, SignedInUser: c.SignedInUser})
 		if err != nil {
 			return response.Error(http.StatusInternalServerError, "failed to get folder", err)
@@ -262,7 +289,7 @@ func (l *LibraryElementService) getConnectionsHandler(c *contextmodel.ReqContext
 // Returns a library element with the given name.
 //
 // Responses:
-// 200: getLibraryElementResponse
+// 200: getLibraryElementArrayResponse
 // 401: unauthorisedError
 // 404: notFoundError
 // 500: internalServerError
@@ -272,7 +299,7 @@ func (l *LibraryElementService) getByNameHandler(c *contextmodel.ReqContext) res
 		return toLibraryElementError(err, "Failed to get library element")
 	}
 
-	if l.features.IsEnabled(featuremgmt.FlagLibraryPanelRBAC) {
+	if l.features.IsEnabled(c.Req.Context(), featuremgmt.FlagLibraryPanelRBAC) {
 		filteredElements, err := l.filterLibraryPanelsByPermission(c, elements)
 		if err != nil {
 			return toLibraryElementError(err, err.Error())
@@ -301,31 +328,31 @@ func (l *LibraryElementService) filterLibraryPanelsByPermission(c *contextmodel.
 
 func toLibraryElementError(err error, message string) response.Response {
 	if errors.Is(err, model.ErrLibraryElementAlreadyExists) {
-		return response.Error(400, model.ErrLibraryElementAlreadyExists.Error(), err)
+		return response.Error(http.StatusBadRequest, model.ErrLibraryElementAlreadyExists.Error(), err)
 	}
 	if errors.Is(err, model.ErrLibraryElementNotFound) {
-		return response.Error(404, model.ErrLibraryElementNotFound.Error(), err)
+		return response.Error(http.StatusNotFound, model.ErrLibraryElementNotFound.Error(), err)
 	}
 	if errors.Is(err, model.ErrLibraryElementDashboardNotFound) {
-		return response.Error(404, model.ErrLibraryElementDashboardNotFound.Error(), err)
+		return response.Error(http.StatusNotFound, model.ErrLibraryElementDashboardNotFound.Error(), err)
 	}
 	if errors.Is(err, model.ErrLibraryElementVersionMismatch) {
-		return response.Error(412, model.ErrLibraryElementVersionMismatch.Error(), err)
+		return response.Error(http.StatusPreconditionFailed, model.ErrLibraryElementVersionMismatch.Error(), err)
 	}
 	if errors.Is(err, dashboards.ErrFolderNotFound) {
-		return response.Error(404, dashboards.ErrFolderNotFound.Error(), err)
+		return response.Error(http.StatusNotFound, dashboards.ErrFolderNotFound.Error(), err)
 	}
 	if errors.Is(err, dashboards.ErrFolderAccessDenied) {
-		return response.Error(403, dashboards.ErrFolderAccessDenied.Error(), err)
+		return response.Error(http.StatusForbidden, dashboards.ErrFolderAccessDenied.Error(), err)
 	}
 	if errors.Is(err, model.ErrLibraryElementHasConnections) {
-		return response.Error(403, model.ErrLibraryElementHasConnections.Error(), err)
+		return response.Error(http.StatusForbidden, model.ErrLibraryElementHasConnections.Error(), err)
 	}
 	if errors.Is(err, model.ErrLibraryElementInvalidUID) {
-		return response.Error(400, model.ErrLibraryElementInvalidUID.Error(), err)
+		return response.Error(http.StatusBadRequest, model.ErrLibraryElementInvalidUID.Error(), err)
 	}
 	if errors.Is(err, model.ErrLibraryElementUIDTooLong) {
-		return response.Error(400, model.ErrLibraryElementUIDTooLong.Error(), err)
+		return response.Error(http.StatusBadRequest, model.ErrLibraryElementUIDTooLong.Error(), err)
 	}
 	return response.ErrOrFallback(http.StatusInternalServerError, message, err)
 }
@@ -440,6 +467,12 @@ type GetLibraryElementResponse struct {
 	Body model.LibraryElementResponse `json:"body"`
 }
 
+// swagger:response getLibraryElementArrayResponse
+type GetLibraryElementArrayResponse struct {
+	// in: body
+	Body model.LibraryElementArrayResponse `json:"body"`
+}
+
 // swagger:response getLibraryElementConnectionsResponse
 type GetLibraryElementConnectionsResponse struct {
 	// in: body
diff --git a/pkg/services/libraryelements/database.go b/pkg/services/libraryelements/database.go
index d2614d6af5041..4f5932ec6b556 100644
--- a/pkg/services/libraryelements/database.go
+++ b/pkg/services/libraryelements/database.go
@@ -10,15 +10,18 @@ import (
 
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/kinds/librarypanel"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/libraryelements/model"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/search"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+	"github.com/grafana/grafana/pkg/services/sqlstore/searchstore"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
 )
@@ -145,14 +148,21 @@ func (l *LibraryElementService) createLibraryElement(c context.Context, signedIn
 		}
 	}
 
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryElements).Inc()
+	// folderUID *string will be changed to string
+	var folderUID string
+	if cmd.FolderUID != nil {
+		folderUID = *cmd.FolderUID
+	}
 	element := model.LibraryElement{
-		OrgID:    signedInUser.GetOrgID(),
-		FolderID: cmd.FolderID,
-		UID:      createUID,
-		Name:     cmd.Name,
-		Model:    updatedModel,
-		Version:  1,
-		Kind:     cmd.Kind,
+		OrgID:     signedInUser.GetOrgID(),
+		FolderID:  cmd.FolderID, // nolint:staticcheck
+		FolderUID: folderUID,
+		UID:       createUID,
+		Name:      cmd.Name,
+		Model:     updatedModel,
+		Version:   1,
+		Kind:      cmd.Kind,
 
 		Created: time.Now(),
 		Updated: time.Now(),
@@ -166,7 +176,7 @@ func (l *LibraryElementService) createLibraryElement(c context.Context, signedIn
 	}
 
 	err = l.SQLStore.WithTransactionalDbSession(c, func(session *db.Session) error {
-		if l.features.IsEnabled(featuremgmt.FlagLibraryPanelRBAC) {
+		if l.features.IsEnabled(c, featuremgmt.FlagLibraryPanelRBAC) {
 			allowed, err := l.AccessControl.Evaluate(c, signedInUser, ac.EvalPermission(ActionLibraryPanelsCreate, dashboards.ScopeFoldersProvider.GetResourceScopeUID(*cmd.FolderUID)))
 			if !allowed {
 				return fmt.Errorf("insufficient permissions for creating library panel in folder with UID %s", *cmd.FolderUID)
@@ -175,6 +185,8 @@ func (l *LibraryElementService) createLibraryElement(c context.Context, signedIn
 				return err
 			}
 		} else {
+			metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryElements).Inc()
+			// nolint:staticcheck
 			if err := l.requireEditPermissionsOnFolder(c, signedInUser, cmd.FolderID); err != nil {
 				return err
 			}
@@ -188,10 +200,11 @@ func (l *LibraryElementService) createLibraryElement(c context.Context, signedIn
 		return nil
 	})
 
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryElements).Inc()
 	dto := model.LibraryElementDTO{
 		ID:          element.ID,
 		OrgID:       element.OrgID,
-		FolderID:    element.FolderID,
+		FolderID:    element.FolderID, // nolint:staticcheck
 		UID:         element.UID,
 		Name:        element.Name,
 		Kind:        element.Kind,
@@ -206,12 +219,12 @@ func (l *LibraryElementService) createLibraryElement(c context.Context, signedIn
 			CreatedBy: librarypanel.LibraryElementDTOMetaUser{
 				Id:        element.CreatedBy,
 				Name:      signedInUser.GetLogin(),
-				AvatarUrl: dtos.GetGravatarUrl(signedInUser.GetEmail()),
+				AvatarUrl: dtos.GetGravatarUrl(l.Cfg, signedInUser.GetEmail()),
 			},
 			UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
 				Id:        element.UpdatedBy,
 				Name:      signedInUser.GetLogin(),
-				AvatarUrl: dtos.GetGravatarUrl(signedInUser.GetEmail()),
+				AvatarUrl: dtos.GetGravatarUrl(l.Cfg, signedInUser.GetEmail()),
 			},
 		},
 	}
@@ -227,6 +240,8 @@ func (l *LibraryElementService) deleteLibraryElement(c context.Context, signedIn
 		if err != nil {
 			return err
 		}
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryElements).Inc()
+		// nolint:staticcheck
 		if err := l.requireEditPermissionsOnFolder(c, signedInUser, element.FolderID); err != nil {
 			return err
 		}
@@ -275,8 +290,10 @@ func (l *LibraryElementService) getLibraryElements(c context.Context, store db.D
 		builder := db.NewSqlBuilder(cfg, features, store.GetDialect(), recursiveQueriesAreSupported)
 		builder.Write(selectLibraryElementDTOWithMeta)
 		builder.Write(", ? as folder_name ", cmd.FolderName)
-		builder.Write(", '' as folder_uid ")
+		builder.Write(", COALESCE((SELECT folder.uid FROM folder WHERE folder.id = le.folder_id), '') as folder_uid ")
 		builder.Write(getFromLibraryElementDTOWithMeta(store.GetDialect()))
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryElements).Inc()
+		// nolint:staticcheck
 		writeParamSelectorSQL(&builder, append(params, Pair{"folder_id", cmd.FolderID})...)
 		builder.Write(" UNION ")
 		builder.Write(selectLibraryElementDTOWithMeta)
@@ -285,7 +302,12 @@ func (l *LibraryElementService) getLibraryElements(c context.Context, store db.D
 		builder.Write(getFromLibraryElementDTOWithMeta(store.GetDialect()))
 		builder.Write(" INNER JOIN dashboard AS dashboard on le.folder_id = dashboard.id AND le.folder_id <> 0")
 		writeParamSelectorSQL(&builder, params...)
-		builder.WriteDashboardPermissionFilter(signedInUser, dashboards.PERMISSION_VIEW, "")
+
+		// use permission filter if lib panel RBAC isn't enabled
+		if !l.features.IsEnabled(c, featuremgmt.FlagLibraryPanelRBAC) {
+			builder.WriteDashboardPermissionFilter(signedInUser, dashboardaccess.PERMISSION_VIEW, searchstore.TypeFolder)
+		}
+
 		builder.Write(` OR dashboard.id=0`)
 		if err := session.SQL(builder.GetSQLString(), builder.GetParams()...).Find(&libraryElements); err != nil {
 			return err
@@ -310,11 +332,16 @@ func (l *LibraryElementService) getLibraryElements(c context.Context, store db.D
 			}
 		}
 
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryElements).Inc()
+		folderUID := libraryElement.FolderUID
+		if libraryElement.FolderID == 0 { // nolint:staticcheck
+			folderUID = ac.GeneralFolderUID
+		}
 		leDtos[i] = model.LibraryElementDTO{
 			ID:          libraryElement.ID,
 			OrgID:       libraryElement.OrgID,
-			FolderID:    libraryElement.FolderID,
-			FolderUID:   libraryElement.FolderUID,
+			FolderID:    libraryElement.FolderID, // nolint:staticcheck
+			FolderUID:   folderUID,
 			UID:         libraryElement.UID,
 			Name:        libraryElement.Name,
 			Kind:        libraryElement.Kind,
@@ -331,12 +358,12 @@ func (l *LibraryElementService) getLibraryElements(c context.Context, store db.D
 				CreatedBy: librarypanel.LibraryElementDTOMetaUser{
 					Id:        libraryElement.CreatedBy,
 					Name:      libraryElement.CreatedByName,
-					AvatarUrl: dtos.GetGravatarUrl(libraryElement.CreatedByEmail),
+					AvatarUrl: dtos.GetGravatarUrl(l.Cfg, libraryElement.CreatedByEmail),
 				},
 				UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
 					Id:        libraryElement.UpdatedBy,
 					Name:      libraryElement.UpdatedByName,
-					AvatarUrl: dtos.GetGravatarUrl(libraryElement.UpdatedByEmail),
+					AvatarUrl: dtos.GetGravatarUrl(l.Cfg, libraryElement.UpdatedByEmail),
 				},
 			},
 		}
@@ -418,7 +445,7 @@ func (l *LibraryElementService) getAllLibraryElements(c context.Context, signedI
 			return err
 		}
 		if !signedInUser.HasRole(org.RoleAdmin) {
-			builder.WriteDashboardPermissionFilter(signedInUser, dashboards.PERMISSION_VIEW, "")
+			builder.WriteDashboardPermissionFilter(signedInUser, dashboardaccess.PERMISSION_VIEW, "")
 		}
 		if query.SortDirection == search.SortAlphaDesc.Name {
 			builder.Write(" ORDER BY 1 DESC")
@@ -430,12 +457,13 @@ func (l *LibraryElementService) getAllLibraryElements(c context.Context, signedI
 			return err
 		}
 
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryElements).Inc()
 		retDTOs := make([]model.LibraryElementDTO, 0)
 		for _, element := range elements {
 			retDTOs = append(retDTOs, model.LibraryElementDTO{
 				ID:          element.ID,
 				OrgID:       element.OrgID,
-				FolderID:    element.FolderID,
+				FolderID:    element.FolderID, // nolint:staticcheck
 				FolderUID:   element.FolderUID,
 				UID:         element.UID,
 				Name:        element.Name,
@@ -453,12 +481,12 @@ func (l *LibraryElementService) getAllLibraryElements(c context.Context, signedI
 					CreatedBy: librarypanel.LibraryElementDTOMetaUser{
 						Id:        element.CreatedBy,
 						Name:      element.CreatedByName,
-						AvatarUrl: dtos.GetGravatarUrl(element.CreatedByEmail),
+						AvatarUrl: dtos.GetGravatarUrl(l.Cfg, element.CreatedByEmail),
 					},
 					UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
 						Id:        element.UpdatedBy,
 						Name:      element.UpdatedByName,
-						AvatarUrl: dtos.GetGravatarUrl(element.UpdatedByEmail),
+						AvatarUrl: dtos.GetGravatarUrl(l.Cfg, element.UpdatedByEmail),
 					},
 				},
 			})
@@ -522,7 +550,8 @@ func (l *LibraryElementService) handleFolderIDPatches(ctx context.Context, eleme
 	if err := l.requireEditPermissionsOnFolder(ctx, user, fromFolderID); err != nil {
 		return err
 	}
-
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryElements).Inc()
+	// nolint:staticcheck
 	elementToPatch.FolderID = toFolderID
 
 	return nil
@@ -569,10 +598,11 @@ func (l *LibraryElementService) patchLibraryElement(c context.Context, signedInU
 			}
 		}
 
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryElements).Inc()
 		var libraryElement = model.LibraryElement{
 			ID:          elementInDB.ID,
 			OrgID:       signedInUser.GetOrgID(),
-			FolderID:    cmd.FolderID,
+			FolderID:    cmd.FolderID, // nolint:staticcheck
 			UID:         updateUID,
 			Name:        cmd.Name,
 			Kind:        elementInDB.Kind,
@@ -592,6 +622,8 @@ func (l *LibraryElementService) patchLibraryElement(c context.Context, signedInU
 		if cmd.Model == nil {
 			libraryElement.Model = elementInDB.Model
 		}
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryElements).Inc()
+		// nolint:staticcheck
 		if err := l.handleFolderIDPatches(c, &libraryElement, elementInDB.FolderID, cmd.FolderID, signedInUser); err != nil {
 			return err
 		}
@@ -607,10 +639,11 @@ func (l *LibraryElementService) patchLibraryElement(c context.Context, signedInU
 			return model.ErrLibraryElementNotFound
 		}
 
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryElements).Inc()
 		dto = model.LibraryElementDTO{
 			ID:          libraryElement.ID,
 			OrgID:       libraryElement.OrgID,
-			FolderID:    libraryElement.FolderID,
+			FolderID:    libraryElement.FolderID, // nolint:staticcheck
 			UID:         libraryElement.UID,
 			Name:        libraryElement.Name,
 			Kind:        libraryElement.Kind,
@@ -625,12 +658,12 @@ func (l *LibraryElementService) patchLibraryElement(c context.Context, signedInU
 				CreatedBy: librarypanel.LibraryElementDTOMetaUser{
 					Id:        elementInDB.CreatedBy,
 					Name:      elementInDB.CreatedByName,
-					AvatarUrl: dtos.GetGravatarUrl(elementInDB.CreatedByEmail),
+					AvatarUrl: dtos.GetGravatarUrl(l.Cfg, elementInDB.CreatedByEmail),
 				},
 				UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
 					Id:        libraryElement.UpdatedBy,
 					Name:      signedInUser.GetLogin(),
-					AvatarUrl: dtos.GetGravatarUrl(signedInUser.GetEmail()),
+					AvatarUrl: dtos.GetGravatarUrl(l.Cfg, signedInUser.GetEmail()),
 				},
 			},
 		}
@@ -661,7 +694,7 @@ func (l *LibraryElementService) getConnections(c context.Context, signedInUser i
 		builder.Write(" INNER JOIN dashboard AS dashboard on lec.connection_id = dashboard.id")
 		builder.Write(` WHERE lec.element_id=?`, element.ID)
 		if signedInUser.GetOrgRole() != org.RoleAdmin {
-			builder.WriteDashboardPermissionFilter(signedInUser, dashboards.PERMISSION_VIEW, "")
+			builder.WriteDashboardPermissionFilter(signedInUser, dashboardaccess.PERMISSION_VIEW, "")
 		}
 		if err := session.SQL(builder.GetSQLString(), builder.GetParams()...).Find(&libraryElementConnections); err != nil {
 			return err
@@ -678,7 +711,7 @@ func (l *LibraryElementService) getConnections(c context.Context, signedInUser i
 				CreatedBy: librarypanel.LibraryElementDTOMetaUser{
 					Id:        connection.CreatedBy,
 					Name:      connection.CreatedByName,
-					AvatarUrl: dtos.GetGravatarUrl(connection.CreatedByEmail),
+					AvatarUrl: dtos.GetGravatarUrl(l.Cfg, connection.CreatedByEmail),
 				},
 			})
 		}
@@ -706,11 +739,12 @@ func (l *LibraryElementService) getElementsForDashboardID(c context.Context, das
 			return err
 		}
 
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryElements).Inc()
 		for _, element := range libraryElements {
 			libraryElementMap[element.UID] = model.LibraryElementDTO{
 				ID:          element.ID,
 				OrgID:       element.OrgID,
-				FolderID:    element.FolderID,
+				FolderID:    element.FolderID, // nolint:staticcheck
 				UID:         element.UID,
 				Name:        element.Name,
 				Kind:        element.Kind,
@@ -727,12 +761,12 @@ func (l *LibraryElementService) getElementsForDashboardID(c context.Context, das
 					CreatedBy: librarypanel.LibraryElementDTOMetaUser{
 						Id:        element.CreatedBy,
 						Name:      element.CreatedByName,
-						AvatarUrl: dtos.GetGravatarUrl(element.CreatedByEmail),
+						AvatarUrl: dtos.GetGravatarUrl(l.Cfg, element.CreatedByEmail),
 					},
 					UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
 						Id:        element.UpdatedBy,
 						Name:      element.UpdatedByName,
-						AvatarUrl: dtos.GetGravatarUrl(element.UpdatedByEmail),
+						AvatarUrl: dtos.GetGravatarUrl(l.Cfg, element.UpdatedByEmail),
 					},
 				},
 			}
@@ -756,6 +790,8 @@ func (l *LibraryElementService) connectElementsToDashboardID(c context.Context,
 			if err != nil {
 				return err
 			}
+			metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryElements).Inc()
+			// nolint:staticcheck
 			if err := l.requireViewPermissionsOnFolder(c, signedInUser, element.FolderID); err != nil {
 				return err
 			}
diff --git a/pkg/services/libraryelements/libraryelements_create_test.go b/pkg/services/libraryelements/libraryelements_create_test.go
index 4570353d84d69..7adca02ebd174 100644
--- a/pkg/services/libraryelements/libraryelements_create_test.go
+++ b/pkg/services/libraryelements/libraryelements_create_test.go
@@ -14,7 +14,8 @@ import (
 func TestCreateLibraryElement(t *testing.T) {
 	scenarioWithPanel(t, "When an admin tries to create a library panel that already exists, it should fail",
 		func(t *testing.T, sc scenarioContext) {
-			command := getCreatePanelCommand(sc.folder.ID, "Text - Library Panel")
+			// nolint:staticcheck
+			command := getCreatePanelCommand(sc.folder.ID, sc.folder.UID, "Text - Library Panel")
 			sc.reqContext.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
 			require.Equal(t, 400, resp.Status())
@@ -26,7 +27,8 @@ func TestCreateLibraryElement(t *testing.T) {
 				Result: libraryElement{
 					ID:          1,
 					OrgID:       1,
-					FolderID:    1,
+					FolderID:    1, // nolint:staticcheck
+					FolderUID:   sc.folder.UID,
 					UID:         sc.initialResult.Result.UID,
 					Name:        "Text - Library Panel",
 					Kind:        int64(model.PanelElement),
@@ -66,7 +68,8 @@ func TestCreateLibraryElement(t *testing.T) {
 
 	testScenario(t, "When an admin tries to create a library panel that does not exists using an nonexistent UID, it should succeed",
 		func(t *testing.T, sc scenarioContext) {
-			command := getCreatePanelCommand(sc.folder.ID, "Nonexistent UID")
+			// nolint:staticcheck
+			command := getCreatePanelCommand(sc.folder.ID, sc.folder.UID, "Nonexistent UID")
 			command.UID = util.GenerateShortUID()
 			sc.reqContext.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
@@ -75,7 +78,8 @@ func TestCreateLibraryElement(t *testing.T) {
 				Result: libraryElement{
 					ID:          1,
 					OrgID:       1,
-					FolderID:    1,
+					FolderID:    1, // nolint:staticcheck
+					FolderUID:   sc.folder.UID,
 					UID:         command.UID,
 					Name:        "Nonexistent UID",
 					Kind:        int64(model.PanelElement),
@@ -115,7 +119,8 @@ func TestCreateLibraryElement(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to create a library panel that does not exists using an existent UID, it should fail",
 		func(t *testing.T, sc scenarioContext) {
-			command := getCreatePanelCommand(sc.folder.ID, "Existing UID")
+			// nolint:staticcheck
+			command := getCreatePanelCommand(sc.folder.ID, sc.folder.UID, "Existing UID")
 			command.UID = sc.initialResult.Result.UID
 			sc.reqContext.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
@@ -124,7 +129,8 @@ func TestCreateLibraryElement(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to create a library panel that does not exists using an invalid UID, it should fail",
 		func(t *testing.T, sc scenarioContext) {
-			command := getCreatePanelCommand(sc.folder.ID, "Invalid UID")
+			// nolint:staticcheck
+			command := getCreatePanelCommand(sc.folder.ID, sc.folder.UID, "Invalid UID")
 			command.UID = "Testing an invalid UID"
 			sc.reqContext.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
@@ -133,7 +139,8 @@ func TestCreateLibraryElement(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to create a library panel that does not exists using an UID that is too long, it should fail",
 		func(t *testing.T, sc scenarioContext) {
-			command := getCreatePanelCommand(sc.folder.ID, "Invalid UID")
+			// nolint:staticcheck
+			command := getCreatePanelCommand(sc.folder.ID, sc.folder.UID, "Invalid UID")
 			command.UID = "j6T00KRZzj6T00KRZzj6T00KRZzj6T00KRZzj6T00K"
 			sc.reqContext.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
@@ -142,7 +149,7 @@ func TestCreateLibraryElement(t *testing.T) {
 
 	testScenario(t, "When an admin tries to create a library panel where name and panel title differ, it should not update panel title",
 		func(t *testing.T, sc scenarioContext) {
-			command := getCreatePanelCommand(1, "Library Panel Name")
+			command := getCreatePanelCommand(1, sc.folder.UID, "Library Panel Name")
 			sc.reqContext.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
 			var result = validateAndUnMarshalResponse(t, resp)
@@ -150,7 +157,8 @@ func TestCreateLibraryElement(t *testing.T) {
 				Result: libraryElement{
 					ID:          1,
 					OrgID:       1,
-					FolderID:    1,
+					FolderID:    1, // nolint:staticcheck
+					FolderUID:   sc.folder.UID,
 					UID:         result.Result.UID,
 					Name:        "Library Panel Name",
 					Kind:        int64(model.PanelElement),
diff --git a/pkg/services/libraryelements/libraryelements_delete_test.go b/pkg/services/libraryelements/libraryelements_delete_test.go
index 5639ac773b730..597787d6ee035 100644
--- a/pkg/services/libraryelements/libraryelements_delete_test.go
+++ b/pkg/services/libraryelements/libraryelements_delete_test.go
@@ -73,7 +73,8 @@ func TestDeleteLibraryElement(t *testing.T) {
 				Title: "Testing deleteHandler ",
 				Data:  simplejson.NewFromAny(dashJSON),
 			}
-			dashInDB := createDashboard(t, sc.sqlStore, sc.user, &dash, sc.folder.ID)
+			// nolint:staticcheck
+			dashInDB := createDashboard(t, sc.sqlStore, sc.user, &dash, sc.folder.ID, sc.folder.UID)
 			err := sc.service.ConnectElementsToDashboard(sc.reqContext.Req.Context(), sc.reqContext.SignedInUser, []string{sc.initialResult.Result.UID}, dashInDB.ID)
 			require.NoError(t, err)
 
diff --git a/pkg/services/libraryelements/libraryelements_get_all_test.go b/pkg/services/libraryelements/libraryelements_get_all_test.go
index 1b76dfc3e1453..29cc7819fca51 100644
--- a/pkg/services/libraryelements/libraryelements_get_all_test.go
+++ b/pkg/services/libraryelements/libraryelements_get_all_test.go
@@ -38,7 +38,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to get all panel elements and both panels and variables exist, it should only return panels",
 		func(t *testing.T, sc scenarioContext) {
-			command := getCreateVariableCommand(sc.folder.ID, "query0")
+			// nolint:staticcheck
+			command := getCreateVariableCommand(sc.folder.ID, sc.folder.UID, "query0")
 			sc.reqContext.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
 			require.Equal(t, 200, resp.Status())
@@ -62,7 +63,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 						{
 							ID:          1,
 							OrgID:       1,
-							FolderID:    1,
+							FolderID:    1, // nolint:staticcheck
+							FolderUID:   sc.folder.UID,
 							UID:         result.Result.Elements[0].UID,
 							Name:        "Text - Library Panel",
 							Kind:        int64(model.PanelElement),
@@ -104,7 +106,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to get all variable elements and both panels and variables exist, it should only return panels",
 		func(t *testing.T, sc scenarioContext) {
-			command := getCreateVariableCommand(sc.folder.ID, "query0")
+			// nolint:staticcheck
+			command := getCreateVariableCommand(sc.folder.ID, sc.folder.UID, "query0")
 			sc.reqContext.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
 			require.Equal(t, 200, resp.Status())
@@ -128,7 +131,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 						{
 							ID:          2,
 							OrgID:       1,
-							FolderID:    1,
+							FolderID:    1, // nolint:staticcheck
+							FolderUID:   sc.folder.UID,
 							UID:         result.Result.Elements[0].UID,
 							Name:        "query0",
 							Kind:        int64(model.VariableElement),
@@ -169,7 +173,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to get all library panels and two exist, it should succeed",
 		func(t *testing.T, sc scenarioContext) {
-			command := getCreatePanelCommand(sc.folder.ID, "Text - Library Panel2")
+			// nolint:staticcheck
+			command := getCreatePanelCommand(sc.folder.ID, sc.folder.UID, "Text - Library Panel2")
 			sc.reqContext.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
 			require.Equal(t, 200, resp.Status())
@@ -189,7 +194,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 						{
 							ID:          1,
 							OrgID:       1,
-							FolderID:    1,
+							FolderID:    1, // nolint:staticcheck
+							FolderUID:   sc.folder.UID,
 							UID:         result.Result.Elements[0].UID,
 							Name:        "Text - Library Panel",
 							Kind:        int64(model.PanelElement),
@@ -224,7 +230,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 						{
 							ID:          2,
 							OrgID:       1,
-							FolderID:    1,
+							FolderID:    1, // nolint:staticcheck
+							FolderUID:   sc.folder.UID,
 							UID:         result.Result.Elements[1].UID,
 							Name:        "Text - Library Panel2",
 							Kind:        int64(model.PanelElement),
@@ -266,7 +273,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to get all library panels and two exist and sort desc is set, it should succeed and the result should be correct",
 		func(t *testing.T, sc scenarioContext) {
-			command := getCreatePanelCommand(sc.folder.ID, "Text - Library Panel2")
+			// nolint:staticcheck
+			command := getCreatePanelCommand(sc.folder.ID, sc.folder.UID, "Text - Library Panel2")
 			sc.reqContext.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
 			require.Equal(t, 200, resp.Status())
@@ -289,7 +297,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 						{
 							ID:          2,
 							OrgID:       1,
-							FolderID:    1,
+							FolderID:    1, // nolint:staticcheck
+							FolderUID:   sc.folder.UID,
 							UID:         result.Result.Elements[0].UID,
 							Name:        "Text - Library Panel2",
 							Kind:        int64(model.PanelElement),
@@ -324,7 +333,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 						{
 							ID:          1,
 							OrgID:       1,
-							FolderID:    1,
+							FolderID:    1, // nolint:staticcheck
+							FolderUID:   sc.folder.UID,
 							UID:         result.Result.Elements[1].UID,
 							Name:        "Text - Library Panel",
 							Kind:        int64(model.PanelElement),
@@ -366,7 +376,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to get all library panels and two exist and typeFilter is set to existing types, it should succeed and the result should be correct",
 		func(t *testing.T, sc scenarioContext) {
-			command := getCreateCommandWithModel(sc.folder.ID, "Gauge - Library Panel", model.PanelElement, []byte(`
+			// nolint:staticcheck
+			command := getCreateCommandWithModel(sc.folder.ID, sc.folder.UID, "Gauge - Library Panel", model.PanelElement, []byte(`
 			{
 			  "datasource": "${DS_GDEV-TESTDATA}",
 			  "id": 1,
@@ -379,7 +390,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 			resp := sc.service.createHandler(sc.reqContext)
 			require.Equal(t, 200, resp.Status())
 
-			command = getCreateCommandWithModel(sc.folder.ID, "BarGauge - Library Panel", model.PanelElement, []byte(`
+			// nolint:staticcheck
+			command = getCreateCommandWithModel(sc.folder.ID, sc.folder.UID, "BarGauge - Library Panel", model.PanelElement, []byte(`
 			{
 			  "datasource": "${DS_GDEV-TESTDATA}",
 			  "id": 1,
@@ -410,7 +422,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 						{
 							ID:          3,
 							OrgID:       1,
-							FolderID:    1,
+							FolderID:    1, // nolint:staticcheck
+							FolderUID:   sc.folder.UID,
 							UID:         result.Result.Elements[0].UID,
 							Name:        "BarGauge - Library Panel",
 							Kind:        int64(model.PanelElement),
@@ -445,7 +458,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 						{
 							ID:          2,
 							OrgID:       1,
-							FolderID:    1,
+							FolderID:    1, // nolint:staticcheck
+							FolderUID:   sc.folder.UID,
 							UID:         result.Result.Elements[1].UID,
 							Name:        "Gauge - Library Panel",
 							Kind:        int64(model.PanelElement),
@@ -487,7 +501,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to get all library panels and two exist and typeFilter is set to a nonexistent type, it should succeed and the result should be correct",
 		func(t *testing.T, sc scenarioContext) {
-			command := getCreateCommandWithModel(sc.folder.ID, "Gauge - Library Panel", model.PanelElement, []byte(`
+			// nolint:staticcheck
+			command := getCreateCommandWithModel(sc.folder.ID, sc.folder.UID, "Gauge - Library Panel", model.PanelElement, []byte(`
 			{
 			  "datasource": "${DS_GDEV-TESTDATA}",
 			  "id": 1,
@@ -522,23 +537,24 @@ func TestGetAllLibraryElements(t *testing.T) {
 			}
 		})
 
-	scenarioWithPanel(t, "When an admin tries to get all library panels and two exist and folderFilter is set to existing folders, it should succeed and the result should be correct",
+	scenarioWithPanel(t, "When an admin tries to get all library panels and two exist and folderFilterUIDs is set to existing folders, it should succeed and the result should be correct",
 		func(t *testing.T, sc scenarioContext) {
 			newFolder := createFolder(t, sc, "NewFolder")
-			command := getCreatePanelCommand(newFolder.ID, "Text - Library Panel2")
+			// nolint:staticcheck
+			command := getCreatePanelCommand(newFolder.ID, newFolder.UID, "Text - Library Panel2")
 			sc.reqContext.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
 			require.Equal(t, 200, resp.Status())
-			folderFilter := strconv.FormatInt(newFolder.ID, 10)
-
+			folderFilterUID := newFolder.UID
 			err := sc.reqContext.Req.ParseForm()
 			require.NoError(t, err)
-			sc.reqContext.Req.Form.Add("folderFilter", folderFilter)
+			sc.reqContext.Req.Form.Add("folderFilterUIDs", folderFilterUID)
 			resp = sc.service.getAllHandler(sc.reqContext)
 			require.Equal(t, 200, resp.Status())
 
 			var result libraryElementsSearch
 			err = json.Unmarshal(resp.Body(), &result)
+
 			require.NoError(t, err)
 			var expected = libraryElementsSearch{
 				Result: libraryElementsSearchResult{
@@ -549,7 +565,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 						{
 							ID:          2,
 							OrgID:       1,
-							FolderID:    newFolder.ID,
+							FolderID:    newFolder.ID, // nolint:staticcheck
+							FolderUID:   newFolder.UID,
 							UID:         result.Result.Elements[0].UID,
 							Name:        "Text - Library Panel2",
 							Kind:        int64(model.PanelElement),
@@ -592,15 +609,16 @@ func TestGetAllLibraryElements(t *testing.T) {
 	scenarioWithPanel(t, "When an admin tries to get all library panels and two exist and folderFilter is set to a nonexistent folders, it should succeed and the result should be correct",
 		func(t *testing.T, sc scenarioContext) {
 			newFolder := createFolder(t, sc, "NewFolder")
-			command := getCreatePanelCommand(newFolder.ID, "Text - Library Panel2")
+			// nolint:staticcheck
+			command := getCreatePanelCommand(newFolder.ID, sc.folder.UID, "Text - Library Panel2")
 			sc.reqContext.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
 			require.Equal(t, 200, resp.Status())
-			folderFilter := "2020,2021"
+			folderFilterUIDs := "2020,2021"
 
 			err := sc.reqContext.Req.ParseForm()
 			require.NoError(t, err)
-			sc.reqContext.Req.Form.Add("folderFilter", folderFilter)
+			sc.reqContext.Req.Form.Add("folderFilterUIDs", folderFilterUIDs)
 			resp = sc.service.getAllHandler(sc.reqContext)
 			require.Equal(t, 200, resp.Status())
 
@@ -622,7 +640,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to get all library panels and two exist and folderFilter is set to General folder, it should succeed and the result should be correct",
 		func(t *testing.T, sc scenarioContext) {
-			command := getCreatePanelCommand(sc.folder.ID, "Text - Library Panel2")
+			// nolint:staticcheck
+			command := getCreatePanelCommand(sc.folder.ID, sc.folder.UID, "Text - Library Panel2")
 			sc.reqContext.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
 			require.Equal(t, 200, resp.Status())
@@ -646,7 +665,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 						{
 							ID:          1,
 							OrgID:       1,
-							FolderID:    1,
+							FolderID:    1, // nolint:staticcheck
+							FolderUID:   sc.folder.UID,
 							UID:         result.Result.Elements[0].UID,
 							Name:        "Text - Library Panel",
 							Kind:        int64(model.PanelElement),
@@ -681,7 +701,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 						{
 							ID:          2,
 							OrgID:       1,
-							FolderID:    1,
+							FolderID:    1, // nolint:staticcheck
+							FolderUID:   sc.folder.UID,
 							UID:         result.Result.Elements[1].UID,
 							Name:        "Text - Library Panel2",
 							Kind:        int64(model.PanelElement),
@@ -723,7 +744,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to get all library panels and two exist and excludeUID is set, it should succeed and the result should be correct",
 		func(t *testing.T, sc scenarioContext) {
-			command := getCreatePanelCommand(sc.folder.ID, "Text - Library Panel2")
+			// nolint:staticcheck
+			command := getCreatePanelCommand(sc.folder.ID, sc.folder.UID, "Text - Library Panel2")
 			sc.reqContext.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
 			require.Equal(t, 200, resp.Status())
@@ -746,7 +768,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 						{
 							ID:          2,
 							OrgID:       1,
-							FolderID:    1,
+							FolderID:    1, // nolint:staticcheck
+							FolderUID:   sc.folder.UID,
 							UID:         result.Result.Elements[0].UID,
 							Name:        "Text - Library Panel2",
 							Kind:        int64(model.PanelElement),
@@ -788,7 +811,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to get all library panels and two exist and perPage is 1, it should succeed and the result should be correct",
 		func(t *testing.T, sc scenarioContext) {
-			command := getCreatePanelCommand(sc.folder.ID, "Text - Library Panel2")
+			// nolint:staticcheck
+			command := getCreatePanelCommand(sc.folder.ID, sc.folder.UID, "Text - Library Panel2")
 			sc.reqContext.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
 			require.Equal(t, 200, resp.Status())
@@ -811,7 +835,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 						{
 							ID:          1,
 							OrgID:       1,
-							FolderID:    1,
+							FolderID:    1, // nolint:staticcheck
+							FolderUID:   sc.folder.UID,
 							UID:         result.Result.Elements[0].UID,
 							Name:        "Text - Library Panel",
 							Kind:        int64(model.PanelElement),
@@ -853,7 +878,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to get all library panels and two exist and perPage is 1 and page is 2, it should succeed and the result should be correct",
 		func(t *testing.T, sc scenarioContext) {
-			command := getCreatePanelCommand(sc.folder.ID, "Text - Library Panel2")
+			// nolint:staticcheck
+			command := getCreatePanelCommand(sc.folder.ID, sc.folder.UID, "Text - Library Panel2")
 			sc.reqContext.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
 			require.Equal(t, 200, resp.Status())
@@ -877,7 +903,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 						{
 							ID:          2,
 							OrgID:       1,
-							FolderID:    1,
+							FolderID:    1, // nolint:staticcheck
+							FolderUID:   sc.folder.UID,
 							UID:         result.Result.Elements[0].UID,
 							Name:        "Text - Library Panel2",
 							Kind:        int64(model.PanelElement),
@@ -919,7 +946,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to get all library panels and two exist and searchString exists in the description, it should succeed and the result should be correct",
 		func(t *testing.T, sc scenarioContext) {
-			command := getCreateCommandWithModel(sc.folder.ID, "Text - Library Panel2", model.PanelElement, []byte(`
+			// nolint:staticcheck
+			command := getCreateCommandWithModel(sc.folder.ID, sc.folder.UID, "Text - Library Panel2", model.PanelElement, []byte(`
 			{
 			  "datasource": "${DS_GDEV-TESTDATA}",
 			  "id": 1,
@@ -952,7 +980,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 						{
 							ID:          1,
 							OrgID:       1,
-							FolderID:    1,
+							FolderID:    1, // nolint:staticcheck
+							FolderUID:   sc.folder.UID,
 							UID:         result.Result.Elements[0].UID,
 							Name:        "Text - Library Panel",
 							Kind:        int64(model.PanelElement),
@@ -994,7 +1023,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to get all library panels and two exist and searchString exists in both name and description, it should succeed and the result should be correct",
 		func(t *testing.T, sc scenarioContext) {
-			command := getCreateCommandWithModel(sc.folder.ID, "Some Other", model.PanelElement, []byte(`
+			// nolint:staticcheck
+			command := getCreateCommandWithModel(sc.folder.ID, sc.folder.UID, "Some Other", model.PanelElement, []byte(`
 			{
 			  "datasource": "${DS_GDEV-TESTDATA}",
 			  "id": 1,
@@ -1025,7 +1055,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 						{
 							ID:          2,
 							OrgID:       1,
-							FolderID:    1,
+							FolderID:    1, // nolint:staticcheck
+							FolderUID:   sc.folder.UID,
 							UID:         result.Result.Elements[0].UID,
 							Name:        "Some Other",
 							Kind:        int64(model.PanelElement),
@@ -1060,7 +1091,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 						{
 							ID:          1,
 							OrgID:       1,
-							FolderID:    1,
+							FolderID:    1, // nolint:staticcheck
+							FolderUID:   sc.folder.UID,
 							UID:         result.Result.Elements[1].UID,
 							Name:        "Text - Library Panel",
 							Kind:        int64(model.PanelElement),
@@ -1102,7 +1134,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to get all library panels and two exist and perPage is 1 and page is 1 and searchString is panel2, it should succeed and the result should be correct",
 		func(t *testing.T, sc scenarioContext) {
-			command := getCreatePanelCommand(sc.folder.ID, "Text - Library Panel2")
+			// nolint:staticcheck
+			command := getCreatePanelCommand(sc.folder.ID, sc.folder.UID, "Text - Library Panel2")
 			sc.reqContext.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
 			require.Equal(t, 200, resp.Status())
@@ -1127,7 +1160,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 						{
 							ID:          2,
 							OrgID:       1,
-							FolderID:    1,
+							FolderID:    1, // nolint:staticcheck
+							FolderUID:   sc.folder.UID,
 							UID:         result.Result.Elements[0].UID,
 							Name:        "Text - Library Panel2",
 							Kind:        int64(model.PanelElement),
@@ -1169,7 +1203,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to get all library panels and two exist and perPage is 1 and page is 3 and searchString is panel, it should succeed and the result should be correct",
 		func(t *testing.T, sc scenarioContext) {
-			command := getCreatePanelCommand(sc.folder.ID, "Text - Library Panel2")
+			// nolint:staticcheck
+			command := getCreatePanelCommand(sc.folder.ID, sc.folder.UID, "Text - Library Panel2")
 			sc.reqContext.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
 			require.Equal(t, 200, resp.Status())
@@ -1200,7 +1235,8 @@ func TestGetAllLibraryElements(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to get all library panels and two exist and perPage is 1 and page is 3 and searchString does not exist, it should succeed and the result should be correct",
 		func(t *testing.T, sc scenarioContext) {
-			command := getCreatePanelCommand(sc.folder.ID, "Text - Library Panel2")
+			// nolint:staticcheck
+			command := getCreatePanelCommand(sc.folder.ID, sc.folder.UID, "Text - Library Panel2")
 			sc.reqContext.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
 			require.Equal(t, 200, resp.Status())
@@ -1238,6 +1274,7 @@ func TestGetAllLibraryElements(t *testing.T) {
 			err := json.Unmarshal(resp.Body(), &result)
 			require.NoError(t, err)
 			require.Equal(t, 1, len(result.Result.Elements))
+			// nolint:staticcheck
 			require.Equal(t, int64(1), result.Result.Elements[0].FolderID)
 			require.Equal(t, "Text - Library Panel", result.Result.Elements[0].Name)
 
diff --git a/pkg/services/libraryelements/libraryelements_get_test.go b/pkg/services/libraryelements/libraryelements_get_test.go
index 34008728671b6..b441505639b93 100644
--- a/pkg/services/libraryelements/libraryelements_get_test.go
+++ b/pkg/services/libraryelements/libraryelements_get_test.go
@@ -34,7 +34,8 @@ func TestGetLibraryElement(t *testing.T) {
 					Result: libraryElement{
 						ID:          1,
 						OrgID:       1,
-						FolderID:    1,
+						FolderID:    1, // nolint:staticcheck
+						FolderUID:   sc.folder.UID,
 						UID:         res.Result.UID,
 						Name:        "Text - Library Panel",
 						Kind:        int64(model.PanelElement),
@@ -122,7 +123,8 @@ func TestGetLibraryElement(t *testing.T) {
 				Title: "Testing getHandler",
 				Data:  simplejson.NewFromAny(dashJSON),
 			}
-			dashInDB := createDashboard(t, sc.sqlStore, sc.user, &dash, sc.folder.ID)
+			// nolint:staticcheck
+			dashInDB := createDashboard(t, sc.sqlStore, sc.user, &dash, sc.folder.ID, sc.folder.UID)
 			err := sc.service.ConnectElementsToDashboard(sc.reqContext.Req.Context(), sc.reqContext.SignedInUser, []string{sc.initialResult.Result.UID}, dashInDB.ID)
 			require.NoError(t, err)
 
@@ -131,7 +133,8 @@ func TestGetLibraryElement(t *testing.T) {
 					Result: libraryElement{
 						ID:          1,
 						OrgID:       1,
-						FolderID:    1,
+						FolderID:    1, // nolint:staticcheck
+						FolderUID:   sc.folder.UID,
 						UID:         res.Result.UID,
 						Name:        "Text - Library Panel",
 						Kind:        int64(model.PanelElement),
diff --git a/pkg/services/libraryelements/libraryelements_patch_test.go b/pkg/services/libraryelements/libraryelements_patch_test.go
index e693a8202c25a..e59a19e29b6fc 100644
--- a/pkg/services/libraryelements/libraryelements_patch_test.go
+++ b/pkg/services/libraryelements/libraryelements_patch_test.go
@@ -26,8 +26,9 @@ func TestPatchLibraryElement(t *testing.T) {
 		func(t *testing.T, sc scenarioContext) {
 			newFolder := createFolder(t, sc, "NewFolder")
 			cmd := model.PatchLibraryElementCommand{
-				FolderID: newFolder.ID,
-				Name:     "Panel - New name",
+				FolderID:  newFolder.ID, // nolint:staticcheck
+				FolderUID: &newFolder.UID,
+				Name:      "Panel - New name",
 				Model: []byte(`
 								{
 								  "datasource": "${DS_GDEV-TESTDATA}",
@@ -49,7 +50,8 @@ func TestPatchLibraryElement(t *testing.T) {
 				Result: libraryElement{
 					ID:          1,
 					OrgID:       1,
-					FolderID:    newFolder.ID,
+					FolderID:    newFolder.ID, // nolint:staticcheck
+					FolderUID:   newFolder.UID,
 					UID:         sc.initialResult.Result.UID,
 					Name:        "Panel - New name",
 					Kind:        int64(model.PanelElement),
@@ -91,16 +93,19 @@ func TestPatchLibraryElement(t *testing.T) {
 		func(t *testing.T, sc scenarioContext) {
 			newFolder := createFolder(t, sc, "NewFolder")
 			cmd := model.PatchLibraryElementCommand{
-				FolderID: newFolder.ID,
-				Kind:     int64(model.PanelElement),
-				Version:  1,
+				FolderID:  newFolder.ID, // nolint:staticcheck
+				FolderUID: &newFolder.UID,
+				Kind:      int64(model.PanelElement),
+				Version:   1,
 			}
 			sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
 			sc.reqContext.Req.Body = mockRequestBody(cmd)
 			resp := sc.service.patchHandler(sc.reqContext)
 			require.Equal(t, 200, resp.Status())
 			var result = validateAndUnMarshalResponse(t, resp)
+			// nolint:staticcheck
 			sc.initialResult.Result.FolderID = newFolder.ID
+			sc.initialResult.Result.FolderUID = newFolder.UID
 			sc.initialResult.Result.Meta.CreatedBy.Name = userInDbName
 			sc.initialResult.Result.Meta.CreatedBy.AvatarUrl = userInDbAvatar
 			sc.initialResult.Result.Meta.Updated = result.Result.Meta.Updated
@@ -115,7 +120,7 @@ func TestPatchLibraryElement(t *testing.T) {
 	scenarioWithPanel(t, "When an admin tries to patch a library panel with name only, it should change name successfully and return correct result",
 		func(t *testing.T, sc scenarioContext) {
 			cmd := model.PatchLibraryElementCommand{
-				FolderID: -1,
+				FolderID: -1, // nolint:staticcheck
 				Name:     "New Name",
 				Kind:     int64(model.PanelElement),
 				Version:  1,
@@ -138,7 +143,7 @@ func TestPatchLibraryElement(t *testing.T) {
 	scenarioWithPanel(t, "When an admin tries to patch a library panel with a nonexistent UID, it should change UID successfully and return correct result",
 		func(t *testing.T, sc scenarioContext) {
 			cmd := model.PatchLibraryElementCommand{
-				FolderID: -1,
+				FolderID: -1, // nolint:staticcheck
 				UID:      util.GenerateShortUID(),
 				Kind:     int64(model.PanelElement),
 				Version:  1,
@@ -161,7 +166,7 @@ func TestPatchLibraryElement(t *testing.T) {
 	scenarioWithPanel(t, "When an admin tries to patch a library panel with an invalid UID, it should fail",
 		func(t *testing.T, sc scenarioContext) {
 			cmd := model.PatchLibraryElementCommand{
-				FolderID: -1,
+				FolderID: -1, // nolint:staticcheck
 				UID:      "Testing an invalid UID",
 				Kind:     int64(model.PanelElement),
 				Version:  1,
@@ -175,10 +180,11 @@ func TestPatchLibraryElement(t *testing.T) {
 	scenarioWithPanel(t, "When an admin tries to patch a library panel with an UID that is too long, it should fail",
 		func(t *testing.T, sc scenarioContext) {
 			cmd := model.PatchLibraryElementCommand{
-				FolderID: -1,
-				UID:      "j6T00KRZzj6T00KRZzj6T00KRZzj6T00KRZzj6T00K",
-				Kind:     int64(model.PanelElement),
-				Version:  1,
+				FolderID:  -1, // nolint:staticcheck
+				FolderUID: &sc.folder.UID,
+				UID:       "j6T00KRZzj6T00KRZzj6T00KRZzj6T00KRZzj6T00K",
+				Kind:      int64(model.PanelElement),
+				Version:   1,
 			}
 			sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
 			sc.ctx.Req.Body = mockRequestBody(cmd)
@@ -188,16 +194,18 @@ func TestPatchLibraryElement(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to patch a library panel with an existing UID, it should fail",
 		func(t *testing.T, sc scenarioContext) {
-			command := getCreatePanelCommand(sc.folder.ID, "Existing UID")
+			// nolint:staticcheck
+			command := getCreatePanelCommand(sc.folder.ID, sc.folder.UID, "Existing UID")
 			command.UID = util.GenerateShortUID()
 			sc.reqContext.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
 			require.Equal(t, 200, resp.Status())
 			cmd := model.PatchLibraryElementCommand{
-				FolderID: -1,
-				UID:      command.UID,
-				Kind:     int64(model.PanelElement),
-				Version:  1,
+				FolderID:  -1, // nolint:staticcheck
+				FolderUID: &sc.folder.UID,
+				UID:       command.UID,
+				Kind:      int64(model.PanelElement),
+				Version:   1,
 			}
 			sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
 			sc.ctx.Req.Body = mockRequestBody(cmd)
@@ -208,7 +216,7 @@ func TestPatchLibraryElement(t *testing.T) {
 	scenarioWithPanel(t, "When an admin tries to patch a library panel with model only, it should change model successfully, sync type and description fields and return correct result",
 		func(t *testing.T, sc scenarioContext) {
 			cmd := model.PatchLibraryElementCommand{
-				FolderID: -1,
+				FolderID: -1, // nolint:staticcheck
 				Model:    []byte(`{ "title": "New Model Title", "name": "New Model Name", "type":"graph", "description": "New description" }`),
 				Kind:     int64(model.PanelElement),
 				Version:  1,
@@ -237,7 +245,7 @@ func TestPatchLibraryElement(t *testing.T) {
 	scenarioWithPanel(t, "When an admin tries to patch a library panel with model.description only, it should change model successfully, sync type and description fields and return correct result",
 		func(t *testing.T, sc scenarioContext) {
 			cmd := model.PatchLibraryElementCommand{
-				FolderID: -1,
+				FolderID: -1, // nolint:staticcheck
 				Model:    []byte(`{ "description": "New description" }`),
 				Kind:     int64(model.PanelElement),
 				Version:  1,
@@ -264,7 +272,7 @@ func TestPatchLibraryElement(t *testing.T) {
 	scenarioWithPanel(t, "When an admin tries to patch a library panel with model.type only, it should change model successfully, sync type and description fields and return correct result",
 		func(t *testing.T, sc scenarioContext) {
 			cmd := model.PatchLibraryElementCommand{
-				FolderID: -1,
+				FolderID: -1, // nolint:staticcheck
 				Model:    []byte(`{ "type": "graph" }`),
 				Kind:     int64(model.PanelElement),
 				Version:  1,
@@ -290,6 +298,7 @@ func TestPatchLibraryElement(t *testing.T) {
 
 	scenarioWithPanel(t, "When another admin tries to patch a library panel, it should change UpdatedBy successfully and return correct result",
 		func(t *testing.T, sc scenarioContext) {
+			// nolint:staticcheck
 			cmd := model.PatchLibraryElementCommand{FolderID: -1, Version: 1, Kind: int64(model.PanelElement)}
 			sc.reqContext.UserID = 2
 			sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
@@ -308,7 +317,8 @@ func TestPatchLibraryElement(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to patch a library panel with a name that already exists, it should fail",
 		func(t *testing.T, sc scenarioContext) {
-			command := getCreatePanelCommand(sc.folder.ID, "Another Panel")
+			// nolint:staticcheck
+			command := getCreatePanelCommand(sc.folder.ID, sc.folder.UID, "Another Panel")
 			sc.ctx.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
 			var result = validateAndUnMarshalResponse(t, resp)
@@ -326,14 +336,16 @@ func TestPatchLibraryElement(t *testing.T) {
 	scenarioWithPanel(t, "When an admin tries to patch a library panel with a folder where a library panel with the same name already exists, it should fail",
 		func(t *testing.T, sc scenarioContext) {
 			newFolder := createFolder(t, sc, "NewFolder")
-			command := getCreatePanelCommand(newFolder.ID, "Text - Library Panel")
+			// nolint:staticcheck
+			command := getCreatePanelCommand(newFolder.ID, newFolder.UID, "Text - Library Panel")
 			sc.ctx.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
 			var result = validateAndUnMarshalResponse(t, resp)
 			cmd := model.PatchLibraryElementCommand{
-				FolderID: 1,
-				Version:  1,
-				Kind:     int64(model.PanelElement),
+				FolderID:  1, // nolint:staticcheck
+				FolderUID: &sc.folder.UID,
+				Version:   1,
+				Kind:      int64(model.PanelElement),
 			}
 			sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID})
 			sc.ctx.Req.Body = mockRequestBody(cmd)
@@ -344,23 +356,25 @@ func TestPatchLibraryElement(t *testing.T) {
 	scenarioWithPanel(t, "When an admin tries to patch a library panel in another org, it should fail",
 		func(t *testing.T, sc scenarioContext) {
 			cmd := model.PatchLibraryElementCommand{
-				FolderID: sc.folder.ID,
-				Version:  1,
-				Kind:     int64(model.PanelElement),
+				FolderID:  sc.folder.ID, // nolint:staticcheck
+				FolderUID: &sc.folder.UID,
+				Version:   1,
+				Kind:      int64(model.PanelElement),
 			}
 			sc.reqContext.OrgID = 2
 			sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
 			sc.ctx.Req.Body = mockRequestBody(cmd)
 			resp := sc.service.patchHandler(sc.reqContext)
-			require.Equal(t, 404, resp.Status())
+			require.Equal(t, 400, resp.Status())
 		})
 
 	scenarioWithPanel(t, "When an admin tries to patch a library panel with an old version number, it should fail",
 		func(t *testing.T, sc scenarioContext) {
 			cmd := model.PatchLibraryElementCommand{
-				FolderID: sc.folder.ID,
-				Version:  1,
-				Kind:     int64(model.PanelElement),
+				FolderID:  sc.folder.ID, // nolint:staticcheck
+				FolderUID: &sc.folder.UID,
+				Version:   1,
+				Kind:      int64(model.PanelElement),
 			}
 			sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
 			sc.ctx.Req.Body = mockRequestBody(cmd)
@@ -374,9 +388,10 @@ func TestPatchLibraryElement(t *testing.T) {
 	scenarioWithPanel(t, "When an admin tries to patch a library panel with an other kind, it should succeed but panel should not change",
 		func(t *testing.T, sc scenarioContext) {
 			cmd := model.PatchLibraryElementCommand{
-				FolderID: sc.folder.ID,
-				Version:  1,
-				Kind:     int64(model.VariableElement),
+				FolderID:  sc.folder.ID, // nolint:staticcheck
+				FolderUID: &sc.folder.UID,
+				Version:   1,
+				Kind:      int64(model.VariableElement),
 			}
 			sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
 			sc.ctx.Req.Body = mockRequestBody(cmd)
diff --git a/pkg/services/libraryelements/libraryelements_permissions_test.go b/pkg/services/libraryelements/libraryelements_permissions_test.go
index 662f823e64932..327366115aea9 100644
--- a/pkg/services/libraryelements/libraryelements_permissions_test.go
+++ b/pkg/services/libraryelements/libraryelements_permissions_test.go
@@ -30,7 +30,7 @@ func TestLibraryElementPermissionsGeneralFolder(t *testing.T) {
 			func(t *testing.T, sc scenarioContext) {
 				sc.reqContext.SignedInUser.OrgRole = testCase.role
 
-				command := getCreatePanelCommand(0, "Library Panel Name")
+				command := getCreatePanelCommand(0, "", "Library Panel Name")
 				sc.reqContext.Req.Body = mockRequestBody(command)
 				resp := sc.service.createHandler(sc.reqContext)
 				require.Equal(t, testCase.status, resp.Status())
@@ -39,12 +39,14 @@ func TestLibraryElementPermissionsGeneralFolder(t *testing.T) {
 		testScenario(t, fmt.Sprintf("When %s tries to patch a library panel by moving it to the General folder, it should return correct status", testCase.role),
 			func(t *testing.T, sc scenarioContext) {
 				folder := createFolder(t, sc, "Folder")
-				command := getCreatePanelCommand(folder.ID, "Library Panel Name")
+				// nolint:staticcheck
+				command := getCreatePanelCommand(folder.ID, folder.UID, "Library Panel Name")
 				sc.reqContext.Req.Body = mockRequestBody(command)
 				resp := sc.service.createHandler(sc.reqContext)
 				result := validateAndUnMarshalResponse(t, resp)
 				sc.reqContext.SignedInUser.OrgRole = testCase.role
 
+				// nolint:staticcheck
 				cmd := model.PatchLibraryElementCommand{FolderID: 0, Version: 1, Kind: int64(model.PanelElement)}
 				sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID})
 				sc.ctx.Req.Body = mockRequestBody(cmd)
@@ -55,12 +57,13 @@ func TestLibraryElementPermissionsGeneralFolder(t *testing.T) {
 		testScenario(t, fmt.Sprintf("When %s tries to patch a library panel by moving it from the General folder, it should return correct status", testCase.role),
 			func(t *testing.T, sc scenarioContext) {
 				folder := createFolder(t, sc, "Folder")
-				command := getCreatePanelCommand(0, "Library Panel Name")
+				command := getCreatePanelCommand(0, "", "Library Panel Name")
 				sc.reqContext.Req.Body = mockRequestBody(command)
 				resp := sc.service.createHandler(sc.reqContext)
 				result := validateAndUnMarshalResponse(t, resp)
 				sc.reqContext.SignedInUser.OrgRole = testCase.role
 
+				// nolint:staticcheck
 				cmd := model.PatchLibraryElementCommand{FolderID: folder.ID, Version: 1, Kind: int64(model.PanelElement)}
 				sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID})
 				sc.ctx.Req.Body = mockRequestBody(cmd)
@@ -70,7 +73,7 @@ func TestLibraryElementPermissionsGeneralFolder(t *testing.T) {
 
 		testScenario(t, fmt.Sprintf("When %s tries to delete a library panel in the General folder, it should return correct status", testCase.role),
 			func(t *testing.T, sc scenarioContext) {
-				cmd := getCreatePanelCommand(0, "Library Panel Name")
+				cmd := getCreatePanelCommand(0, "", "Library Panel Name")
 				sc.reqContext.Req.Body = mockRequestBody(cmd)
 				resp := sc.service.createHandler(sc.reqContext)
 				result := validateAndUnMarshalResponse(t, resp)
@@ -83,7 +86,7 @@ func TestLibraryElementPermissionsGeneralFolder(t *testing.T) {
 
 		testScenario(t, fmt.Sprintf("When %s tries to get a library panel from General folder, it should return correct response", testCase.role),
 			func(t *testing.T, sc scenarioContext) {
-				cmd := getCreatePanelCommand(0, "Library Panel in General Folder")
+				cmd := getCreatePanelCommand(0, "", "Library Panel in General Folder")
 				sc.reqContext.Req.Body = mockRequestBody(cmd)
 				resp := sc.service.createHandler(sc.reqContext)
 				result := validateAndUnMarshalResponse(t, resp)
@@ -93,6 +96,7 @@ func TestLibraryElementPermissionsGeneralFolder(t *testing.T) {
 				result.Result.Meta.UpdatedBy.AvatarUrl = userInDbAvatar
 				result.Result.Meta.FolderName = "General"
 				result.Result.Meta.FolderUID = ""
+				result.Result.FolderUID = "general"
 				sc.reqContext.SignedInUser.OrgRole = testCase.role
 
 				sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID})
@@ -108,7 +112,7 @@ func TestLibraryElementPermissionsGeneralFolder(t *testing.T) {
 
 		testScenario(t, fmt.Sprintf("When %s tries to get all library panels from General folder, it should return correct response", testCase.role),
 			func(t *testing.T, sc scenarioContext) {
-				cmd := getCreatePanelCommand(0, "Library Panel in General Folder")
+				cmd := getCreatePanelCommand(0, "", "Library Panel in General Folder")
 				sc.reqContext.Req.Body = mockRequestBody(cmd)
 				resp := sc.service.createHandler(sc.reqContext)
 				result := validateAndUnMarshalResponse(t, resp)
@@ -179,7 +183,8 @@ func TestLibraryElementCreatePermissions(t *testing.T) {
 					1: testCase.permissions,
 				}
 
-				command := getCreatePanelCommand(folder.ID, "Library Panel Name")
+				// nolint:staticcheck
+				command := getCreatePanelCommand(folder.ID, folder.UID, "Library Panel Name")
 				sc.reqContext.Req.Body = mockRequestBody(command)
 				resp := sc.service.createHandler(sc.reqContext)
 				require.Equal(t, testCase.status, resp.Status())
@@ -231,7 +236,8 @@ func TestLibraryElementPatchPermissions(t *testing.T) {
 		testScenario(t, testCase.desc,
 			func(t *testing.T, sc scenarioContext) {
 				fromFolder := createFolder(t, sc, "FromFolder")
-				command := getCreatePanelCommand(fromFolder.ID, "Library Panel Name")
+				// nolint:staticcheck
+				command := getCreatePanelCommand(fromFolder.ID, fromFolder.UID, "Library Panel Name")
 				sc.reqContext.Req.Body = mockRequestBody(command)
 				resp := sc.service.createHandler(sc.reqContext)
 				result := validateAndUnMarshalResponse(t, resp)
@@ -242,7 +248,8 @@ func TestLibraryElementPatchPermissions(t *testing.T) {
 					1: testCase.permissions,
 				}
 
-				cmd := model.PatchLibraryElementCommand{FolderID: toFolder.ID, Version: 1, Kind: int64(model.PanelElement)}
+				// nolint:staticcheck
+				cmd := model.PatchLibraryElementCommand{FolderID: toFolder.ID, FolderUID: &toFolder.UID, Version: 1, Kind: int64(model.PanelElement)}
 				sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID})
 				sc.reqContext.Req.Body = mockRequestBody(cmd)
 				resp = sc.service.patchHandler(sc.reqContext)
@@ -291,7 +298,8 @@ func TestLibraryElementDeletePermissions(t *testing.T) {
 		testScenario(t, testCase.desc,
 			func(t *testing.T, sc scenarioContext) {
 				folder := createFolder(t, sc, "Folder")
-				command := getCreatePanelCommand(folder.ID, "Library Panel Name")
+				// nolint:staticcheck
+				command := getCreatePanelCommand(folder.ID, folder.UID, "Library Panel Name")
 				sc.reqContext.Req.Body = mockRequestBody(command)
 				resp := sc.service.createHandler(sc.reqContext)
 				result := validateAndUnMarshalResponse(t, resp)
@@ -310,25 +318,29 @@ func TestLibraryElementDeletePermissions(t *testing.T) {
 func TestLibraryElementsWithMissingFolders(t *testing.T) {
 	testScenario(t, "When a user tries to create a library panel in a folder that doesn't exist, it should fail",
 		func(t *testing.T, sc scenarioContext) {
-			command := getCreatePanelCommand(-100, "Library Panel Name")
+			command := getCreatePanelCommand(0, "badFolderUID", "Library Panel Name")
 			sc.reqContext.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
-			require.Equal(t, 404, resp.Status())
+			fmt.Println(string(resp.Body()))
+			require.Equal(t, 400, resp.Status())
 		})
 
 	testScenario(t, "When a user tries to patch a library panel by moving it to a folder that doesn't exist, it should fail",
 		func(t *testing.T, sc scenarioContext) {
 			folder := createFolder(t, sc, "Folder")
-			command := getCreatePanelCommand(folder.ID, "Library Panel Name")
+			// nolint:staticcheck
+			command := getCreatePanelCommand(folder.ID, folder.UID, "Library Panel Name")
 			sc.reqContext.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
 			result := validateAndUnMarshalResponse(t, resp)
 
-			cmd := model.PatchLibraryElementCommand{FolderID: -100, Version: 1, Kind: int64(model.PanelElement)}
+			folderUID := "badFolderUID"
+			// nolint:staticcheck
+			cmd := model.PatchLibraryElementCommand{FolderID: -100, FolderUID: &folderUID, Version: 1, Kind: int64(model.PanelElement)}
 			sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID})
 			sc.reqContext.Req.Body = mockRequestBody(cmd)
 			resp = sc.service.patchHandler(sc.reqContext)
-			require.Equal(t, 404, resp.Status())
+			require.Equal(t, 400, resp.Status())
 		})
 }
 
@@ -357,7 +369,8 @@ func TestLibraryElementsGetPermissions(t *testing.T) {
 		testScenario(t, testCase.desc,
 			func(t *testing.T, sc scenarioContext) {
 				folder := createFolder(t, sc, "Folder")
-				cmd := getCreatePanelCommand(folder.ID, "Library Panel")
+				// nolint:staticcheck
+				cmd := getCreatePanelCommand(folder.ID, folder.UID, "Library Panel")
 				sc.reqContext.Req.Body = mockRequestBody(cmd)
 				resp := sc.service.createHandler(sc.reqContext)
 				result := validateAndUnMarshalResponse(t, resp)
@@ -407,7 +420,8 @@ func TestLibraryElementsGetAllPermissions(t *testing.T) {
 			func(t *testing.T, sc scenarioContext) {
 				for i := 1; i <= 2; i++ {
 					folder := createFolder(t, sc, fmt.Sprintf("Folder%d", i))
-					cmd := getCreatePanelCommand(folder.ID, fmt.Sprintf("Library Panel %d", i))
+					// nolint:staticcheck
+					cmd := getCreatePanelCommand(folder.ID, folder.UID, fmt.Sprintf("Library Panel %d", i))
 					sc.reqContext.Req.Body = mockRequestBody(cmd)
 					resp := sc.service.createHandler(sc.reqContext)
 					result := validateAndUnMarshalResponse(t, resp)
diff --git a/pkg/services/libraryelements/libraryelements_test.go b/pkg/services/libraryelements/libraryelements_test.go
index 38e40479abb9f..189ccfac3507f 100644
--- a/pkg/services/libraryelements/libraryelements_test.go
+++ b/pkg/services/libraryelements/libraryelements_test.go
@@ -25,7 +25,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
 	acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
-	"github.com/grafana/grafana/pkg/services/alerting"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/dashboards/database"
@@ -44,12 +43,17 @@ import (
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/user/userimpl"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 	"github.com/grafana/grafana/pkg/web"
 )
 
 const userInDbName = "user_in_db"
 const userInDbAvatar = "/avatar/402d08de060496d6b6874495fe20f5ad"
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestDeleteLibraryPanelsInFolder(t *testing.T) {
 	scenarioWithPanel(t, "When an admin tries to delete a folder that contains connected library elements, it should fail",
 		func(t *testing.T, sc scenarioContext) {
@@ -83,7 +87,8 @@ func TestDeleteLibraryPanelsInFolder(t *testing.T) {
 				Title: "Testing DeleteLibraryElementsInFolder",
 				Data:  simplejson.NewFromAny(dashJSON),
 			}
-			dashInDB := createDashboard(t, sc.sqlStore, sc.user, &dash, sc.folder.ID)
+			// nolint:staticcheck
+			dashInDB := createDashboard(t, sc.sqlStore, sc.user, &dash, sc.folder.ID, sc.folder.UID)
 			err := sc.service.ConnectElementsToDashboard(sc.reqContext.Req.Context(), sc.reqContext.SignedInUser, []string{sc.initialResult.Result.UID}, dashInDB.ID)
 			require.NoError(t, err)
 
@@ -99,7 +104,8 @@ func TestDeleteLibraryPanelsInFolder(t *testing.T) {
 
 	scenarioWithPanel(t, "When an admin tries to delete a folder that contains disconnected elements, it should delete all disconnected elements too",
 		func(t *testing.T, sc scenarioContext) {
-			command := getCreateVariableCommand(sc.folder.ID, "query0")
+			// nolint:staticcheck
+			command := getCreateVariableCommand(sc.folder.ID, sc.folder.UID, "query0")
 			sc.reqContext.Req.Body = mockRequestBody(command)
 			resp := sc.service.createHandler(sc.reqContext)
 			require.Equal(t, 200, resp.Status())
@@ -156,7 +162,8 @@ func TestGetLibraryPanelConnections(t *testing.T) {
 				Title: "Testing GetLibraryPanelConnections",
 				Data:  simplejson.NewFromAny(dashJSON),
 			}
-			dashInDB := createDashboard(t, sc.sqlStore, sc.user, &dash, sc.folder.ID)
+			// nolint:staticcheck
+			dashInDB := createDashboard(t, sc.sqlStore, sc.user, &dash, sc.folder.ID, sc.folder.UID)
 			err := sc.service.ConnectElementsToDashboard(sc.reqContext.Req.Context(), sc.reqContext.SignedInUser, []string{sc.initialResult.Result.UID}, dashInDB.ID)
 			require.NoError(t, err)
 
@@ -191,9 +198,11 @@ func TestGetLibraryPanelConnections(t *testing.T) {
 }
 
 type libraryElement struct {
-	ID          int64                       `json:"id"`
-	OrgID       int64                       `json:"orgId"`
+	ID    int64 `json:"id"`
+	OrgID int64 `json:"orgId"`
+	// Deprecated: use FolderUID instead
 	FolderID    int64                       `json:"folderId"`
+	FolderUID   string                      `json:"folderUid"`
 	UID         string                      `json:"uid"`
 	Name        string                      `json:"name"`
 	Kind        int64                       `json:"kind"`
@@ -223,8 +232,8 @@ type libraryElementsSearchResult struct {
 	PerPage    int              `json:"perPage"`
 }
 
-func getCreatePanelCommand(folderID int64, name string) model.CreateLibraryElementCommand {
-	command := getCreateCommandWithModel(folderID, name, model.PanelElement, []byte(`
+func getCreatePanelCommand(folderID int64, folderUID string, name string) model.CreateLibraryElementCommand {
+	command := getCreateCommandWithModel(folderID, folderUID, name, model.PanelElement, []byte(`
 			{
 			  "datasource": "${DS_GDEV-TESTDATA}",
 			  "id": 1,
@@ -237,8 +246,8 @@ func getCreatePanelCommand(folderID int64, name string) model.CreateLibraryEleme
 	return command
 }
 
-func getCreateVariableCommand(folderID int64, name string) model.CreateLibraryElementCommand {
-	command := getCreateCommandWithModel(folderID, name, model.VariableElement, []byte(`
+func getCreateVariableCommand(folderID int64, folderUID, name string) model.CreateLibraryElementCommand {
+	command := getCreateCommandWithModel(folderID, folderUID, name, model.VariableElement, []byte(`
 			{
 			  "datasource": "${DS_GDEV-TESTDATA}",
 			  "name": "query0",
@@ -250,12 +259,12 @@ func getCreateVariableCommand(folderID int64, name string) model.CreateLibraryEl
 	return command
 }
 
-func getCreateCommandWithModel(folderID int64, name string, kind model.LibraryElementKind, byteModel []byte) model.CreateLibraryElementCommand {
+func getCreateCommandWithModel(folderID int64, folderUID, name string, kind model.LibraryElementKind, byteModel []byte) model.CreateLibraryElementCommand {
 	command := model.CreateLibraryElementCommand{
-		FolderID: folderID,
-		Name:     name,
-		Model:    byteModel,
-		Kind:     int64(kind),
+		FolderUID: &folderUID,
+		Name:      name,
+		Model:     byteModel,
+		Kind:      int64(kind),
 	}
 
 	return command
@@ -272,8 +281,10 @@ type scenarioContext struct {
 	log           log.Logger
 }
 
-func createDashboard(t *testing.T, sqlStore db.DB, user user.SignedInUser, dash *dashboards.Dashboard, folderID int64) *dashboards.Dashboard {
+func createDashboard(t *testing.T, sqlStore db.DB, user user.SignedInUser, dash *dashboards.Dashboard, folderID int64, folderUID string) *dashboards.Dashboard {
+	// nolint:staticcheck
 	dash.FolderID = folderID
+	dash.FolderUID = folderUID
 	dashItem := &dashboards.SaveDashboardDTO{
 		Dashboard: dash,
 		Message:   "",
@@ -282,22 +293,21 @@ func createDashboard(t *testing.T, sqlStore db.DB, user user.SignedInUser, dash
 		Overwrite: false,
 	}
 
-	cfg := setting.NewCfg()
 	features := featuremgmt.WithFeatures()
-	cfg.IsFeatureToggleEnabled = features.IsEnabled
+	cfg := setting.NewCfg()
 	quotaService := quotatest.New(false, nil)
-	dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
+	dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, features, tagimpl.ProvideService(sqlStore), quotaService)
 	require.NoError(t, err)
-	dashAlertExtractor := alerting.ProvideDashAlertExtractorService(nil, nil, nil)
 	ac := actest.FakeAccessControl{ExpectedEvaluate: true}
 	folderPermissions := acmock.NewMockedPermissionsService()
 	dashboardPermissions := acmock.NewMockedPermissionsService()
 	dashboardPermissions.On("SetPermissions", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]accesscontrol.ResourcePermission{}, nil)
 	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
 	service, err := dashboardservice.ProvideDashboardServiceImpl(
-		cfg, dashboardStore, folderStore, dashAlertExtractor,
+		cfg, dashboardStore, folderStore,
 		features, folderPermissions, dashboardPermissions, ac,
 		foldertest.NewFakeService(),
+		nil,
 	)
 	require.NoError(t, err)
 	dashboard, err := service.SaveDashboard(context.Background(), dashItem, true)
@@ -309,16 +319,15 @@ func createDashboard(t *testing.T, sqlStore db.DB, user user.SignedInUser, dash
 func createFolder(t *testing.T, sc scenarioContext, title string) *folder.Folder {
 	t.Helper()
 
-	cfg := setting.NewCfg()
 	features := featuremgmt.WithFeatures()
-	cfg.IsFeatureToggleEnabled = features.IsEnabled
+	cfg := setting.NewCfg()
 	ac := actest.FakeAccessControl{}
 	quotaService := quotatest.New(false, nil)
-	dashboardStore, err := database.ProvideDashboardStore(sc.sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sc.sqlStore, cfg), quotaService)
+	dashboardStore, err := database.ProvideDashboardStore(sc.sqlStore, cfg, features, tagimpl.ProvideService(sc.sqlStore), quotaService)
 	require.NoError(t, err)
 
 	folderStore := folderimpl.ProvideDashboardFolderStore(sc.sqlStore)
-	s := folderimpl.ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), cfg, dashboardStore, folderStore, sc.sqlStore, features)
+	s := folderimpl.ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), cfg, dashboardStore, folderStore, sc.sqlStore, features, supportbundlestest.NewFakeBundleService(), nil)
 	t.Logf("Creating folder with title and UID %q", title)
 	ctx := appcontext.WithUser(context.Background(), &sc.user)
 	folder, err := s.Create(ctx, &folder.CreateFolderCommand{
@@ -369,25 +378,27 @@ func validateAndUnMarshalArrayResponse(t *testing.T, resp response.Response) lib
 func scenarioWithPanel(t *testing.T, desc string, fn func(t *testing.T, sc scenarioContext)) {
 	t.Helper()
 
+	features := featuremgmt.WithFeatures()
 	sqlStore := db.InitTestDB(t)
 	ac := actest.FakeAccessControl{}
 	quotaService := quotatest.New(false, nil)
-	dashboardStore, err := database.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
+	dashboardStore, err := database.ProvideDashboardStore(sqlStore, sqlStore.Cfg, features, tagimpl.ProvideService(sqlStore), quotaService)
 	require.NoError(t, err)
-	features := featuremgmt.WithFeatures()
 	folderPermissions := acmock.NewMockedPermissionsService()
 	dashboardPermissions := acmock.NewMockedPermissionsService()
 	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
 	dashboardService, svcErr := dashboardservice.ProvideDashboardServiceImpl(
-		sqlStore.Cfg, dashboardStore, folderStore, nil,
+		sqlStore.Cfg, dashboardStore, folderStore,
 		features, folderPermissions, dashboardPermissions, ac,
 		foldertest.NewFakeService(),
+		nil,
 	)
 	require.NoError(t, svcErr)
 	guardian.InitAccessControlGuardian(sqlStore.Cfg, ac, dashboardService)
 
 	testScenario(t, desc, func(t *testing.T, sc scenarioContext) {
-		command := getCreatePanelCommand(sc.folder.ID, "Text - Library Panel")
+		// nolint:staticcheck
+		command := getCreatePanelCommand(sc.folder.ID, sc.folder.UID, "Text - Library Panel")
 		sc.reqContext.Req.Body = mockRequestBody(command)
 		resp := sc.service.createHandler(sc.reqContext)
 		sc.initialResult = validateAndUnMarshalResponse(t, resp)
@@ -427,20 +438,21 @@ func testScenario(t *testing.T, desc string, fn func(t *testing.T, sc scenarioCo
 		req = req.WithContext(ctx)
 		webCtx := web.Context{Req: req}
 
+		features := featuremgmt.WithFeatures()
 		sqlStore := db.InitTestDB(t)
 		quotaService := quotatest.New(false, nil)
-		dashboardStore, err := database.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
+		dashboardStore, err := database.ProvideDashboardStore(sqlStore, sqlStore.Cfg, features, tagimpl.ProvideService(sqlStore), quotaService)
 		require.NoError(t, err)
-		features := featuremgmt.WithFeatures()
 		ac := acimpl.ProvideAccessControl(sqlStore.Cfg)
 		folderPermissions := acmock.NewMockedPermissionsService()
 		folderPermissions.On("SetPermissions", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]accesscontrol.ResourcePermission{}, nil)
 		dashboardPermissions := acmock.NewMockedPermissionsService()
 		folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
 		dashService, dashSvcErr := dashboardservice.ProvideDashboardServiceImpl(
-			sqlStore.Cfg, dashboardStore, folderStore, nil,
+			sqlStore.Cfg, dashboardStore, folderStore,
 			features, folderPermissions, dashboardPermissions, ac,
 			foldertest.NewFakeService(),
+			nil,
 		)
 		require.NoError(t, dashSvcErr)
 		guardian.InitAccessControlGuardian(sqlStore.Cfg, ac, dashService)
@@ -448,7 +460,7 @@ func testScenario(t *testing.T, desc string, fn func(t *testing.T, sc scenarioCo
 			Cfg:           sqlStore.Cfg,
 			features:      featuremgmt.WithFeatures(),
 			SQLStore:      sqlStore,
-			folderService: folderimpl.ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), sqlStore.Cfg, dashboardStore, folderStore, sqlStore, features),
+			folderService: folderimpl.ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), sqlStore.Cfg, dashboardStore, folderStore, sqlStore, features, supportbundlestest.NewFakeBundleService(), nil),
 		}
 
 		// deliberate difference between signed in user and user in db to make it crystal clear
diff --git a/pkg/services/libraryelements/model/model.go b/pkg/services/libraryelements/model/model.go
index 194e6620b18d0..e53ef13816f43 100644
--- a/pkg/services/libraryelements/model/model.go
+++ b/pkg/services/libraryelements/model/model.go
@@ -3,13 +3,9 @@ package model
 import (
 	"encoding/json"
 	"errors"
-	"fmt"
 	"time"
 
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/kinds"
 	"github.com/grafana/grafana/pkg/kinds/librarypanel"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 type LibraryConnectionKind int
@@ -20,9 +16,11 @@ const (
 
 // LibraryElement is the model for library element definitions.
 type LibraryElement struct {
-	ID          int64  `xorm:"pk autoincr 'id'"`
-	OrgID       int64  `xorm:"org_id"`
+	ID    int64 `xorm:"pk autoincr 'id'"`
+	OrgID int64 `xorm:"org_id"`
+	// Deprecated: use FolderUID instead
 	FolderID    int64  `xorm:"folder_id"`
+	FolderUID   string `xorm:"folder_uid"`
 	UID         string `xorm:"uid"`
 	Name        string
 	Kind        int64
@@ -40,9 +38,11 @@ type LibraryElement struct {
 
 // LibraryElementWithMeta is the model used to retrieve entities with additional meta information.
 type LibraryElementWithMeta struct {
-	ID          int64  `xorm:"pk autoincr 'id'"`
-	OrgID       int64  `xorm:"org_id"`
+	ID    int64 `xorm:"pk autoincr 'id'"`
+	OrgID int64 `xorm:"org_id"`
+	// Deprecated: use FolderUID instead
 	FolderID    int64  `xorm:"folder_id"`
+	FolderUID   string `xorm:"folder_uid"`
 	UID         string `xorm:"uid"`
 	Name        string
 	Kind        int64
@@ -55,7 +55,6 @@ type LibraryElementWithMeta struct {
 	Updated time.Time
 
 	FolderName          string
-	FolderUID           string `xorm:"folder_uid"`
 	ConnectedDashboards int64
 	CreatedBy           int64
 	UpdatedBy           int64
@@ -67,8 +66,9 @@ type LibraryElementWithMeta struct {
 
 // LibraryElementDTO is the frontend DTO for entities.
 type LibraryElementDTO struct {
-	ID            int64                 `json:"id"`
-	OrgID         int64                 `json:"orgId"`
+	ID    int64 `json:"id"`
+	OrgID int64 `json:"orgId"`
+	// Deprecated: use FolderUID instead
 	FolderID      int64                 `json:"folderId"`
 	FolderUID     string                `json:"folderUid"`
 	UID           string                `json:"uid"`
@@ -82,32 +82,6 @@ type LibraryElementDTO struct {
 	SchemaVersion int64                 `json:"schemaVersion,omitempty"`
 }
 
-func (dto *LibraryElementDTO) ToResource() kinds.GrafanaResource[simplejson.Json, simplejson.Json] {
-	body := &simplejson.Json{}
-	_ = body.FromDB(dto.Model)
-	parent := librarypanel.NewK8sResource(dto.UID, nil)
-	res := kinds.GrafanaResource[simplejson.Json, simplejson.Json]{
-		Kind:       parent.Kind,
-		APIVersion: parent.APIVersion,
-		Metadata: kinds.GrafanaResourceMetadata{
-			Name:              dto.UID,
-			Annotations:       make(map[string]string),
-			Labels:            make(map[string]string),
-			ResourceVersion:   fmt.Sprintf("%d", dto.Version),
-			CreationTimestamp: v1.NewTime(dto.Meta.Created),
-		},
-		Spec: body,
-	}
-
-	if dto.FolderUID != "" {
-		res.Metadata.SetFolder(dto.FolderUID)
-	}
-	res.Metadata.SetCreatedBy(fmt.Sprintf("user:%d", dto.Meta.CreatedBy.Id))
-	res.Metadata.SetUpdatedBy(fmt.Sprintf("user:%d", dto.Meta.UpdatedBy.Id))
-	res.Metadata.SetUpdatedTimestamp(&dto.Meta.Updated)
-	return res
-}
-
 // LibraryElementSearchResult is the search result for entities.
 type LibraryElementSearchResult struct {
 	TotalCount int64               `json:"totalCount"`
@@ -190,6 +164,8 @@ var (
 // swagger:model
 type CreateLibraryElementCommand struct {
 	// ID of the folder where the library element is stored.
+	//
+	// Deprecated: use FolderUID instead
 	FolderID int64 `json:"folderId"`
 	// UID of the folder where the library element is stored.
 	FolderUID *string `json:"folderUid"`
@@ -211,6 +187,8 @@ type CreateLibraryElementCommand struct {
 // PatchLibraryElementCommand is the command for patching a LibraryElement
 type PatchLibraryElementCommand struct {
 	// ID of the folder where the library element is stored.
+	//
+	// Deprecated: use FolderUID instead
 	FolderID int64 `json:"folderId" binding:"Default(-1)"`
 	// UID of the folder where the library element is stored.
 	FolderUID *string `json:"folderUid"`
@@ -233,19 +211,21 @@ type PatchLibraryElementCommand struct {
 // GetLibraryElementCommand is the command for getting a library element.
 type GetLibraryElementCommand struct {
 	FolderName string
-	FolderID   int64
-	UID        string
+	// Deprecated: use FolderUID instead
+	FolderID int64
+	UID      string
 }
 
 // SearchLibraryElementsQuery is the query used for searching for Elements
 type SearchLibraryElementsQuery struct {
-	PerPage          int
-	Page             int
-	SearchString     string
-	SortDirection    string
-	Kind             int
-	TypeFilter       string
-	ExcludeUID       string
+	PerPage       int
+	Page          int
+	SearchString  string
+	SortDirection string
+	Kind          int
+	TypeFilter    string
+	ExcludeUID    string
+	// Deprecated: use FolderFilterUIDs instead
 	FolderFilter     string
 	FolderFilterUIDs string
 }
diff --git a/pkg/services/libraryelements/model/model_test.go b/pkg/services/libraryelements/model/model_test.go
deleted file mode 100644
index 9ef45cf9e2978..0000000000000
--- a/pkg/services/libraryelements/model/model_test.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package model
-
-import (
-	"encoding/json"
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/grafana/grafana/pkg/kinds/librarypanel"
-	"github.com/stretchr/testify/require"
-)
-
-func TestLibaryPanelConversion(t *testing.T) {
-	body := `{}`
-
-	src := LibraryElementDTO{
-		Kind:      0, // always library panel
-		FolderUID: "TheFolderUID",
-		UID:       "TheUID",
-		Version:   10,
-		Model:     json.RawMessage(body),
-		Meta: LibraryElementDTOMeta{
-			Created: time.UnixMilli(946713600000).UTC(),  // 2000-01-01
-			Updated: time.UnixMilli(1262332800000).UTC(), // 2010-01-01,
-			CreatedBy: librarypanel.LibraryElementDTOMetaUser{
-				Id: 11,
-			},
-			UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
-				Id: 12,
-			},
-		},
-	}
-
-	dst := src.ToResource()
-
-	require.Equal(t, src.UID, dst.Metadata.Name)
-
-	out, err := json.MarshalIndent(dst, "", "  ")
-	require.NoError(t, err)
-	fmt.Printf("%s", string(out))
-	require.JSONEq(t, `{
-		"apiVersion": "v0-0-alpha",
-		"kind": "LibraryPanel",
-		"metadata": {
-		  "name": "TheUID",
-		  "resourceVersion": "10",
-		  "creationTimestamp": "2000-01-01T08:00:00Z",
-		  "annotations": {
-			"grafana.com/createdBy": "user:11",
-			"grafana.com/folder": "TheFolderUID",
-			"grafana.com/updatedBy": "user:12",
-			"grafana.com/updatedTimestamp": "2010-01-01T08:00:00Z"
-		  }
-		},
-		"spec": {}
-	  }`, string(out))
-}
diff --git a/pkg/services/libraryelements/writers.go b/pkg/services/libraryelements/writers.go
index 9d29b1a4b8412..18781637fac6f 100644
--- a/pkg/services/libraryelements/writers.go
+++ b/pkg/services/libraryelements/writers.go
@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/services/libraryelements/model"
 )
 
@@ -72,20 +73,23 @@ func writeExcludeSQL(query model.SearchLibraryElementsQuery, builder *db.SQLBuil
 
 type FolderFilter struct {
 	includeGeneralFolder bool
-	folderIDs            []string
-	folderUIDs           []string
-	parseError           error
+	// Deprecated: use FolderUID instead
+	folderIDs  []string
+	folderUIDs []string
+	parseError error
 }
 
 func parseFolderFilter(query model.SearchLibraryElementsQuery) FolderFilter {
 	folderIDs := make([]string, 0)
 	folderUIDs := make([]string, 0)
+	// nolint:staticcheck
 	hasFolderFilter := len(strings.TrimSpace(query.FolderFilter)) > 0
 	hasFolderFilterUID := len(strings.TrimSpace(query.FolderFilterUIDs)) > 0
 
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryElements).Inc()
 	result := FolderFilter{
 		includeGeneralFolder: true,
-		folderIDs:            folderIDs,
+		folderIDs:            folderIDs, // nolint:staticcheck
 		folderUIDs:           folderUIDs,
 		parseError:           nil,
 	}
@@ -97,7 +101,10 @@ func parseFolderFilter(query model.SearchLibraryElementsQuery) FolderFilter {
 
 	if hasFolderFilter {
 		result.includeGeneralFolder = false
+		// nolint:staticcheck
 		folderIDs = strings.Split(query.FolderFilter, ",")
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryElements).Inc()
+		// nolint:staticcheck
 		result.folderIDs = folderIDs
 		for _, filter := range folderIDs {
 			folderID, err := strconv.ParseInt(filter, 10, 64)
@@ -130,6 +137,8 @@ func parseFolderFilter(query model.SearchLibraryElementsQuery) FolderFilter {
 func (f *FolderFilter) writeFolderFilterSQL(includeGeneral bool, builder *db.SQLBuilder) error {
 	var sql bytes.Buffer
 	params := make([]any, 0)
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryElements).Inc()
+	// nolint:staticcheck
 	for _, filter := range f.folderIDs {
 		folderID, err := strconv.ParseInt(filter, 10, 64)
 		if err != nil {
diff --git a/pkg/services/librarypanels/librarypanels.go b/pkg/services/librarypanels/librarypanels.go
index 163bcf9153e2a..91fd6107a5d99 100644
--- a/pkg/services/librarypanels/librarypanels.go
+++ b/pkg/services/librarypanels/librarypanels.go
@@ -4,11 +4,14 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"fmt"
+	"strings"
 
 	"github.com/grafana/grafana/pkg/api/routing"
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/folder"
@@ -39,7 +42,7 @@ func ProvideService(cfg *setting.Cfg, sqlStore db.DB, routeRegister routing.Rout
 // Service is a service for operating on library panels.
 type Service interface {
 	ConnectLibraryPanelsForDashboard(c context.Context, signedInUser identity.Requester, dash *dashboards.Dashboard) error
-	ImportLibraryPanelsForDashboard(c context.Context, signedInUser identity.Requester, libraryPanels *simplejson.Json, panels []any, folderID int64) error
+	ImportLibraryPanelsForDashboard(c context.Context, signedInUser identity.Requester, libraryPanels *simplejson.Json, panels []any, folderID int64, folderUID string) error
 }
 
 type LibraryInfo struct {
@@ -114,11 +117,11 @@ func connectLibraryPanelsRecursively(c context.Context, panels []any, libraryPan
 }
 
 // ImportLibraryPanelsForDashboard loops through all panels in dashboard JSON and creates any missing library panels in the database.
-func (lps *LibraryPanelService) ImportLibraryPanelsForDashboard(c context.Context, signedInUser identity.Requester, libraryPanels *simplejson.Json, panels []any, folderID int64) error {
-	return importLibraryPanelsRecursively(c, lps.LibraryElementService, signedInUser, libraryPanels, panels, folderID)
+func (lps *LibraryPanelService) ImportLibraryPanelsForDashboard(c context.Context, signedInUser identity.Requester, libraryPanels *simplejson.Json, panels []any, folderID int64, folderUID string) error {
+	return importLibraryPanelsRecursively(c, lps.LibraryElementService, signedInUser, libraryPanels, panels, folderID, folderUID)
 }
 
-func importLibraryPanelsRecursively(c context.Context, service libraryelements.Service, signedInUser identity.Requester, libraryPanels *simplejson.Json, panels []any, folderID int64) error {
+func importLibraryPanelsRecursively(c context.Context, service libraryelements.Service, signedInUser identity.Requester, libraryPanels *simplejson.Json, panels []any, folderID int64, folderUID string) error {
 	for _, panel := range panels {
 		panelAsJSON := simplejson.NewFromAny(panel)
 		libraryPanel := panelAsJSON.Get("libraryPanel")
@@ -129,7 +132,7 @@ func importLibraryPanelsRecursively(c context.Context, service libraryelements.S
 
 		// we have a row
 		if panelType == "row" {
-			err := importLibraryPanelsRecursively(c, service, signedInUser, libraryPanels, panelAsJSON.Get("panels").MustArray(), folderID)
+			err := importLibraryPanelsRecursively(c, service, signedInUser, libraryPanels, panelAsJSON.Get("panels").MustArray(), folderID, folderUID)
 			if err != nil {
 				return err
 			}
@@ -163,12 +166,14 @@ func importLibraryPanelsRecursively(c context.Context, service libraryelements.S
 				return err
 			}
 
+			metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryPanels).Inc()
 			var cmd = model.CreateLibraryElementCommand{
-				FolderID: folderID,
-				Name:     name,
-				Model:    Model,
-				Kind:     int64(model.PanelElement),
-				UID:      UID,
+				FolderID:  folderID, // nolint:staticcheck
+				FolderUID: &folderUID,
+				Name:      name,
+				Model:     Model,
+				Kind:      int64(model.PanelElement),
+				UID:       UID,
 			}
 			_, err = service.CreateElement(c, signedInUser, cmd)
 			if err != nil {
@@ -186,24 +191,41 @@ func importLibraryPanelsRecursively(c context.Context, service libraryelements.S
 
 // CountInFolder is a handler for retrieving the number of library panels contained
 // within a given folder and for a specific organisation.
-func (lps LibraryPanelService) CountInFolder(ctx context.Context, orgID int64, folderUID string, u identity.Requester) (int64, error) {
+func (lps LibraryPanelService) CountInFolders(ctx context.Context, orgID int64, folderUIDs []string, u identity.Requester) (int64, error) {
+	if len(folderUIDs) == 0 {
+		return 0, nil
+	}
 	var count int64
 	return count, lps.SQLStore.WithDbSession(ctx, func(sess *db.Session) error {
-		folder, err := lps.FolderService.Get(ctx, &folder.GetFolderQuery{UID: &folderUID, OrgID: orgID, SignedInUser: u})
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryPanels).Inc()
+		// the sequential IDs for the respective entries of dashboard and folder tables are different,
+		// so we need to get the folder ID from the dashboard table
+		// TODO: In the future, we should consider adding a folder UID column to the library_element table
+		// and use that instead of the folder ID.
+		s := fmt.Sprintf(`SELECT COUNT(*) FROM library_element
+			WHERE org_id = ? AND folder_id IN (SELECT id FROM dashboard WHERE org_id = ? AND uid IN (%s)) AND kind = ?`, strings.Repeat("?,", len(folderUIDs)-1)+"?")
+		args := make([]interface{}, 0, len(folderUIDs)+2)
+		args = append(args, orgID, orgID)
+		for _, folderUID := range folderUIDs {
+			args = append(args, folderUID)
+		}
+		args = append(args, int64(model.PanelElement))
+		_, err := sess.SQL(s, args...).Get(&count)
 		if err != nil {
 			return err
 		}
-
-		q := sess.Table("library_element").Where("org_id = ?", u.GetOrgID()).
-			Where("folder_id = ?", folder.ID).Where("kind = ?", int64(model.PanelElement))
-		count, err = q.Count()
 		return err
 	})
 }
 
 // DeleteInFolder deletes the library panels contained in a given folder.
-func (lps LibraryPanelService) DeleteInFolder(ctx context.Context, orgID int64, folderUID string, user identity.Requester) error {
-	return lps.LibraryElementService.DeleteLibraryElementsInFolder(ctx, user, folderUID)
+func (lps LibraryPanelService) DeleteInFolders(ctx context.Context, orgID int64, folderUIDs []string, user identity.Requester) error {
+	for _, folderUID := range folderUIDs {
+		if err := lps.LibraryElementService.DeleteLibraryElementsInFolder(ctx, user, folderUID); err != nil {
+			return err
+		}
+	}
+	return nil
 }
 
 // Kind returns the name of the library panel type of entity.
diff --git a/pkg/services/librarypanels/librarypanels_test.go b/pkg/services/librarypanels/librarypanels_test.go
index 2b3bae99b2aec..ab36bda9fa10f 100644
--- a/pkg/services/librarypanels/librarypanels_test.go
+++ b/pkg/services/librarypanels/librarypanels_test.go
@@ -21,7 +21,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
 	acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
-	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/dashboards/database"
 	dashboardservice "github.com/grafana/grafana/pkg/services/dashboards/service"
@@ -40,11 +39,17 @@ import (
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/user/userimpl"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
 const userInDbName = "user_in_db"
 const userInDbAvatar = "/avatar/402d08de060496d6b6874495fe20f5ad"
 
+// run tests with cleanup
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestConnectLibraryPanelsForDashboard(t *testing.T) {
 	scenarioWithLibraryPanel(t, "When an admin tries to store a dashboard with a library panel, it should connect the two",
 		func(t *testing.T, sc scenarioContext) {
@@ -80,7 +85,7 @@ func TestConnectLibraryPanelsForDashboard(t *testing.T) {
 				Title: "Testing ConnectLibraryPanelsForDashboard",
 				Data:  simplejson.NewFromAny(dashJSON),
 			}
-			dashInDB := createDashboard(t, sc.sqlStore, sc.user, &dash, sc.folder.ID)
+			dashInDB := createDashboard(t, sc.sqlStore, sc.user, &dash)
 
 			err := sc.service.ConnectLibraryPanelsForDashboard(sc.ctx, sc.user, dashInDB)
 			require.NoError(t, err)
@@ -94,8 +99,7 @@ func TestConnectLibraryPanelsForDashboard(t *testing.T) {
 	scenarioWithLibraryPanel(t, "When an admin tries to store a dashboard with library panels inside and outside of rows, it should connect all",
 		func(t *testing.T, sc scenarioContext) {
 			cmd := model.CreateLibraryElementCommand{
-				FolderID: sc.initialResult.Result.FolderID,
-				Name:     "Outside row",
+				Name: "Outside row",
 				Model: []byte(`
 			{
 			  "datasource": "${DS_GDEV-TESTDATA}",
@@ -105,7 +109,8 @@ func TestConnectLibraryPanelsForDashboard(t *testing.T) {
 			  "description": "A description"
 			}
 		`),
-				Kind: int64(model.PanelElement),
+				Kind:      int64(model.PanelElement),
+				FolderUID: &sc.folder.UID,
 			}
 			outsidePanel, err := sc.elementService.CreateElement(sc.ctx, sc.user, cmd)
 			require.NoError(t, err)
@@ -178,7 +183,7 @@ func TestConnectLibraryPanelsForDashboard(t *testing.T) {
 				Title: "Testing ConnectLibraryPanelsForDashboard",
 				Data:  simplejson.NewFromAny(dashJSON),
 			}
-			dashInDB := createDashboard(t, sc.sqlStore, sc.user, &dash, sc.folder.ID)
+			dashInDB := createDashboard(t, sc.sqlStore, sc.user, &dash)
 
 			err = sc.service.ConnectLibraryPanelsForDashboard(sc.ctx, sc.user, dashInDB)
 			require.NoError(t, err)
@@ -224,7 +229,7 @@ func TestConnectLibraryPanelsForDashboard(t *testing.T) {
 				Title: "Testing ConnectLibraryPanelsForDashboard",
 				Data:  simplejson.NewFromAny(dashJSON),
 			}
-			dashInDB := createDashboard(t, sc.sqlStore, sc.user, &dash, sc.folder.ID)
+			dashInDB := createDashboard(t, sc.sqlStore, sc.user, &dash)
 
 			err := sc.service.ConnectLibraryPanelsForDashboard(sc.ctx, sc.user, dashInDB)
 			require.EqualError(t, err, errLibraryPanelHeaderUIDMissing.Error())
@@ -233,8 +238,7 @@ func TestConnectLibraryPanelsForDashboard(t *testing.T) {
 	scenarioWithLibraryPanel(t, "When an admin tries to store a dashboard with unused/removed library panels, it should disconnect unused/removed library panels",
 		func(t *testing.T, sc scenarioContext) {
 			unused, err := sc.elementService.CreateElement(sc.ctx, sc.user, model.CreateLibraryElementCommand{
-				FolderID: sc.folder.ID,
-				Name:     "Unused Libray Panel",
+				Name: "Unused Libray Panel",
 				Model: []byte(`
 			{
 			  "datasource": "${DS_GDEV-TESTDATA}",
@@ -244,7 +248,8 @@ func TestConnectLibraryPanelsForDashboard(t *testing.T) {
 			  "description": "Unused description"
 			}
 		`),
-				Kind: int64(model.PanelElement),
+				Kind:      int64(model.PanelElement),
+				FolderUID: &sc.folder.UID,
 			})
 			require.NoError(t, err)
 			dashJSON := map[string]any{
@@ -280,7 +285,7 @@ func TestConnectLibraryPanelsForDashboard(t *testing.T) {
 				Title: "Testing ConnectLibraryPanelsForDashboard",
 				Data:  simplejson.NewFromAny(dashJSON),
 			}
-			dashInDB := createDashboard(t, sc.sqlStore, sc.user, &dash, sc.folder.ID)
+			dashInDB := createDashboard(t, sc.sqlStore, sc.user, &dash)
 			err = sc.elementService.ConnectElementsToDashboard(sc.ctx, sc.user, []string{sc.initialResult.Result.UID}, dashInDB.ID)
 			require.NoError(t, err)
 
@@ -322,14 +327,14 @@ func TestConnectLibraryPanelsForDashboard(t *testing.T) {
 
 	scenarioWithLibraryPanel(t, "It should return the correct count of library panels in a folder",
 		func(t *testing.T, sc scenarioContext) {
-			count, err := sc.lps.CountInFolder(context.Background(), sc.user.OrgID, sc.folder.UID, sc.user)
+			count, err := sc.lps.CountInFolders(context.Background(), sc.user.OrgID, []string{sc.folder.UID}, sc.user)
 			require.NoError(t, err)
 			require.Equal(t, int64(1), count)
 		})
 
 	scenarioWithLibraryPanel(t, "It should delete library panels in a folder",
 		func(t *testing.T, sc scenarioContext) {
-			err := sc.lps.DeleteInFolder(context.Background(), sc.user.OrgID, sc.folder.UID, sc.user)
+			err := sc.lps.DeleteInFolders(context.Background(), sc.user.OrgID, []string{sc.folder.UID}, sc.user)
 			require.NoError(t, err)
 
 			_, err = sc.elementService.GetElement(sc.ctx, sc.user,
@@ -389,7 +394,7 @@ func TestImportLibraryPanelsForDashboard(t *testing.T) {
 
 			require.EqualError(t, err, model.ErrLibraryElementNotFound.Error())
 
-			err = sc.service.ImportLibraryPanelsForDashboard(sc.ctx, sc.user, simplejson.NewFromAny(libraryElements), panels, 0)
+			err = sc.service.ImportLibraryPanelsForDashboard(sc.ctx, sc.user, simplejson.NewFromAny(libraryElements), panels, 0, "")
 			require.NoError(t, err)
 
 			element, err := sc.elementService.GetElement(sc.ctx, sc.user,
@@ -429,14 +434,15 @@ func TestImportLibraryPanelsForDashboard(t *testing.T) {
 				model.GetLibraryElementCommand{UID: existingUID, FolderName: dashboards.RootFolderName})
 			require.NoError(t, err)
 
-			err = sc.service.ImportLibraryPanelsForDashboard(sc.ctx, sc.user, simplejson.New(), panels, sc.folder.ID)
+			// nolint:staticcheck
+			err = sc.service.ImportLibraryPanelsForDashboard(sc.ctx, sc.user, simplejson.New(), panels, sc.folder.ID, sc.folder.UID)
 			require.NoError(t, err)
 
 			element, err := sc.elementService.GetElement(sc.ctx, sc.user,
 				model.GetLibraryElementCommand{UID: existingUID, FolderName: dashboards.RootFolderName})
 			require.NoError(t, err)
 			var expected = getExpected(t, element, existingUID, existingName, sc.initialResult.Result.Model)
-			expected.FolderID = sc.initialResult.Result.FolderID
+			expected.FolderUID = sc.initialResult.Result.FolderUID
 			expected.Description = sc.initialResult.Result.Description
 			expected.Meta.FolderUID = sc.folder.UID
 			expected.Meta.FolderName = sc.folder.Title
@@ -545,7 +551,7 @@ func TestImportLibraryPanelsForDashboard(t *testing.T) {
 			_, err = sc.elementService.GetElement(sc.ctx, sc.user, model.GetLibraryElementCommand{UID: insideUID, FolderName: dashboards.RootFolderName})
 			require.EqualError(t, err, model.ErrLibraryElementNotFound.Error())
 
-			err = sc.service.ImportLibraryPanelsForDashboard(sc.ctx, sc.user, simplejson.NewFromAny(libraryElements), panels, 0)
+			err = sc.service.ImportLibraryPanelsForDashboard(sc.ctx, sc.user, simplejson.NewFromAny(libraryElements), panels, 0, "")
 			require.NoError(t, err)
 
 			element, err := sc.elementService.GetElement(sc.ctx, sc.user, model.GetLibraryElementCommand{UID: outsideUID, FolderName: dashboards.RootFolderName})
@@ -567,9 +573,11 @@ func TestImportLibraryPanelsForDashboard(t *testing.T) {
 }
 
 type libraryPanel struct {
-	ID          int64
-	OrgID       int64
+	ID    int64
+	OrgID int64
+	// Deprecated: use FolderUID instead
 	FolderID    int64
+	FolderUID   string
 	UID         string
 	Name        string
 	Type        string
@@ -605,6 +613,7 @@ type libraryElement struct {
 	ID          int64                       `json:"id"`
 	OrgID       int64                       `json:"orgId"`
 	FolderID    int64                       `json:"folderId"`
+	FolderUID   string                      `json:"folderUid"`
 	UID         string                      `json:"uid"`
 	Name        string                      `json:"name"`
 	Kind        int64                       `json:"kind"`
@@ -638,7 +647,6 @@ func toLibraryElement(t *testing.T, res model.LibraryElementDTO) libraryElement
 	return libraryElement{
 		ID:          res.ID,
 		OrgID:       res.OrgID,
-		FolderID:    res.FolderID,
 		UID:         res.UID,
 		Name:        res.Name,
 		Type:        res.Type,
@@ -704,8 +712,7 @@ func getExpected(t *testing.T, res model.LibraryElementDTO, UID string, name str
 	}
 }
 
-func createDashboard(t *testing.T, sqlStore db.DB, user *user.SignedInUser, dash *dashboards.Dashboard, folderID int64) *dashboards.Dashboard {
-	dash.FolderID = folderID
+func createDashboard(t *testing.T, sqlStore db.DB, user *user.SignedInUser, dash *dashboards.Dashboard) *dashboards.Dashboard {
 	dashItem := &dashboards.SaveDashboardDTO{
 		Dashboard: dash,
 		Message:   "",
@@ -714,20 +721,20 @@ func createDashboard(t *testing.T, sqlStore db.DB, user *user.SignedInUser, dash
 		Overwrite: false,
 	}
 
+	features := featuremgmt.WithFeatures()
 	cfg := setting.NewCfg()
-	cfg.IsFeatureToggleEnabled = featuremgmt.WithFeatures().IsEnabled
 	quotaService := quotatest.New(false, nil)
-	dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
+	dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, features, tagimpl.ProvideService(sqlStore), quotaService)
 	require.NoError(t, err)
-	dashAlertService := alerting.ProvideDashAlertExtractorService(nil, nil, nil)
 	ac := actest.FakeAccessControl{ExpectedEvaluate: true}
 	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
 	dashPermissionService := acmock.NewMockedPermissionsService()
 	dashPermissionService.On("SetPermissions", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]accesscontrol.ResourcePermission{}, nil)
 	service, err := dashboardservice.ProvideDashboardServiceImpl(
-		cfg, dashboardStore, folderStore, dashAlertService,
+		cfg, dashboardStore, folderStore,
 		featuremgmt.WithFeatures(), acmock.NewMockedPermissionsService(), dashPermissionService, ac,
 		foldertest.NewFakeService(),
+		nil,
 	)
 	require.NoError(t, err)
 	dashboard, err := service.SaveDashboard(context.Background(), dashItem, true)
@@ -739,15 +746,14 @@ func createDashboard(t *testing.T, sqlStore db.DB, user *user.SignedInUser, dash
 func createFolder(t *testing.T, sc scenarioContext, title string) *folder.Folder {
 	t.Helper()
 
+	features := featuremgmt.WithFeatures()
 	ac := actest.FakeAccessControl{ExpectedEvaluate: true}
 	cfg := setting.NewCfg()
-	cfg.IsFeatureToggleEnabled = featuremgmt.WithFeatures().IsEnabled
-	features := featuremgmt.WithFeatures()
 	quotaService := quotatest.New(false, nil)
-	dashboardStore, err := database.ProvideDashboardStore(sc.sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sc.sqlStore, cfg), quotaService)
+	dashboardStore, err := database.ProvideDashboardStore(sc.sqlStore, cfg, features, tagimpl.ProvideService(sc.sqlStore), quotaService)
 	require.NoError(t, err)
 	folderStore := folderimpl.ProvideDashboardFolderStore(sc.sqlStore)
-	s := folderimpl.ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), cfg, dashboardStore, folderStore, sc.sqlStore, features)
+	s := folderimpl.ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), cfg, dashboardStore, folderStore, sc.sqlStore, features, supportbundlestest.NewFakeBundleService(), nil)
 
 	t.Logf("Creating folder with title and UID %q", title)
 	ctx := appcontext.WithUser(context.Background(), sc.user)
@@ -762,8 +768,9 @@ func scenarioWithLibraryPanel(t *testing.T, desc string, fn func(t *testing.T, s
 
 	testScenario(t, desc, func(t *testing.T, sc scenarioContext) {
 		command := model.CreateLibraryElementCommand{
-			FolderID: sc.folder.ID,
-			Name:     "Text - Library Panel",
+			FolderID:  sc.folder.ID, // nolint:staticcheck
+			FolderUID: &sc.folder.UID,
+			Name:      "Text - Library Panel",
 			Model: []byte(`
 			{
 			  "datasource": "${DS_GDEV-TESTDATA}",
@@ -785,7 +792,7 @@ func scenarioWithLibraryPanel(t *testing.T, desc string, fn func(t *testing.T, s
 			Result: libraryPanel{
 				ID:          resp.ID,
 				OrgID:       resp.OrgID,
-				FolderID:    resp.FolderID,
+				FolderUID:   resp.FolderUID,
 				UID:         resp.UID,
 				Name:        resp.Name,
 				Type:        resp.Type,
@@ -815,20 +822,20 @@ func testScenario(t *testing.T, desc string, fn func(t *testing.T, sc scenarioCo
 		dashStore := &dashboards.FakeDashboardStore{}
 		dashStore.On("GetDashboard", mock.Anything, mock.Anything).Return(&dashboards.Dashboard{ID: 1}, nil)
 		folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
-		dashAlertService := alerting.ProvideDashAlertExtractorService(nil, nil, nil)
 		dashPermissionService := acmock.NewMockedPermissionsService()
 		dashService, err := dashboardservice.ProvideDashboardServiceImpl(
-			setting.NewCfg(), dashStore, folderStore, dashAlertService,
+			setting.NewCfg(), dashStore, folderStore,
 			featuremgmt.WithFeatures(), acmock.NewMockedPermissionsService(), dashPermissionService, ac,
 			foldertest.NewFakeService(),
+			nil,
 		)
 		require.NoError(t, err)
 		guardian.InitAccessControlGuardian(setting.NewCfg(), ac, dashService)
 
-		dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
+		dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotaService)
 		require.NoError(t, err)
 		features := featuremgmt.WithFeatures()
-		folderService := folderimpl.ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), cfg, dashboardStore, folderStore, sqlStore, features)
+		folderService := folderimpl.ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), cfg, dashboardStore, folderStore, sqlStore, features, supportbundlestest.NewFakeBundleService(), nil)
 
 		elementService := libraryelements.ProvideService(cfg, sqlStore, routing.NewRouteRegister(), folderService, featuremgmt.WithFeatures(), ac)
 		service := LibraryPanelService{
@@ -880,7 +887,7 @@ func testScenario(t *testing.T, desc string, fn func(t *testing.T, sc scenarioCo
 
 		foldr := createFolder(t, sc, "ScenarioFolder")
 		sc.folder = &folder.Folder{
-			ID:        foldr.ID,
+			ID:        foldr.ID, // nolint:staticcheck
 			UID:       foldr.UID,
 			Title:     foldr.Title,
 			URL:       dashboards.GetFolderURL(foldr.UID, slugify.Slugify(foldr.Title)),
diff --git a/pkg/services/live/database/tests/storage_test.go b/pkg/services/live/database/tests/storage_test.go
index cd3a483e39076..b9ce2d2bd2c1c 100644
--- a/pkg/services/live/database/tests/storage_test.go
+++ b/pkg/services/live/database/tests/storage_test.go
@@ -7,8 +7,13 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/services/live/model"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationLiveMessage(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
diff --git a/pkg/services/live/live.go b/pkg/services/live/live.go
index eb802c8b2362f..f580caf6a3b34 100644
--- a/pkg/services/live/live.go
+++ b/pkg/services/live/live.go
@@ -29,6 +29,7 @@ import (
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/usagestats"
 	"github.com/grafana/grafana/pkg/middleware"
+	"github.com/grafana/grafana/pkg/middleware/requestmeta"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/annotations"
@@ -119,55 +120,36 @@ func ProvideService(plugCtxProvider *plugincontext.Provider, cfg *setting.Cfg, r
 	}
 	g.node = node
 
+	redisHealthy := false
 	if g.IsHA() {
 		// Configure HA with Redis. In this case Centrifuge nodes
 		// will be connected over Redis PUB/SUB. Presence will work
 		// globally since kept inside Redis.
-		redisAddress := g.Cfg.LiveHAEngineAddress
-		redisPassword := g.Cfg.LiveHAEnginePassword
-		redisShardConfigs := []centrifuge.RedisShardConfig{
-			{Address: redisAddress, Password: redisPassword},
-		}
-		var redisShards []*centrifuge.RedisShard
-		for _, redisConf := range redisShardConfigs {
-			redisShard, err := centrifuge.NewRedisShard(node, redisConf)
-			if err != nil {
-				return nil, fmt.Errorf("error connecting to Live Redis: %v", err)
-			}
-			redisShards = append(redisShards, redisShard)
-		}
-
-		broker, err := centrifuge.NewRedisBroker(node, centrifuge.RedisBrokerConfig{
-			Prefix: "gf_live",
-			Shards: redisShards,
-		})
-		if err != nil {
-			return nil, fmt.Errorf("error creating Live Redis broker: %v", err)
-		}
-		node.SetBroker(broker)
-
-		presenceManager, err := centrifuge.NewRedisPresenceManager(node, centrifuge.RedisPresenceManagerConfig{
-			Prefix: "gf_live",
-			Shards: redisShards,
-		})
+		err := setupRedisLiveEngine(g, node)
 		if err != nil {
-			return nil, fmt.Errorf("error creating Live Redis presence manager: %v", err)
+			logger.Error("failed to setup redis live engine: %v", err)
+		} else {
+			redisHealthy = true
 		}
-		node.SetPresenceManager(presenceManager)
 	}
 
 	channelLocalPublisher := liveplugin.NewChannelLocalPublisher(node, nil)
 
 	var managedStreamRunner *managedstream.Runner
-	if g.IsHA() {
+	var redisClient *redis.Client
+	if g.IsHA() && redisHealthy {
 		redisClient := redis.NewClient(&redis.Options{
 			Addr:     g.Cfg.LiveHAEngineAddress,
 			Password: g.Cfg.LiveHAEnginePassword,
 		})
 		cmd := redisClient.Ping(context.Background())
 		if _, err := cmd.Result(); err != nil {
-			return nil, fmt.Errorf("error pinging Redis: %v", err)
+			logger.Error("live engine failed to ping redis, proceeding without live ha, error: %v", err)
+			redisClient = nil
 		}
+	}
+
+	if redisClient != nil {
 		managedStreamRunner = managedstream.NewRunner(
 			g.Publish,
 			channelLocalPublisher,
@@ -333,18 +315,53 @@ func ProvideService(plugCtxProvider *plugincontext.Provider, cfg *setting.Cfg, r
 
 	g.RouteRegister.Group("/api/live", func(group routing.RouteRegister) {
 		group.Get("/ws", g.websocketHandler)
-	}, middleware.ReqSignedIn)
+	}, middleware.ReqSignedIn, requestmeta.SetSLOGroup(requestmeta.SLOGroupNone))
 
 	g.RouteRegister.Group("/api/live", func(group routing.RouteRegister) {
 		group.Get("/push/:streamId", g.pushWebsocketHandler)
 		group.Get("/pipeline/push/*", g.pushPipelineWebsocketHandler)
-	}, middleware.ReqOrgAdmin)
+	}, middleware.ReqOrgAdmin, requestmeta.SetSLOGroup(requestmeta.SLOGroupNone))
 
 	g.registerUsageMetrics()
 
 	return g, nil
 }
 
+func setupRedisLiveEngine(g *GrafanaLive, node *centrifuge.Node) error {
+	redisAddress := g.Cfg.LiveHAEngineAddress
+	redisPassword := g.Cfg.LiveHAEnginePassword
+	redisShardConfigs := []centrifuge.RedisShardConfig{
+		{Address: redisAddress, Password: redisPassword},
+	}
+	var redisShards []*centrifuge.RedisShard
+	for _, redisConf := range redisShardConfigs {
+		redisShard, err := centrifuge.NewRedisShard(node, redisConf)
+		if err != nil {
+			return fmt.Errorf("error connecting to Live Redis: %v", err)
+		}
+		redisShards = append(redisShards, redisShard)
+	}
+
+	broker, err := centrifuge.NewRedisBroker(node, centrifuge.RedisBrokerConfig{
+		Prefix: "gf_live",
+		Shards: redisShards,
+	})
+	if err != nil {
+		return fmt.Errorf("error creating Live Redis broker: %v", err)
+	}
+	node.SetBroker(broker)
+
+	presenceManager, err := centrifuge.NewRedisPresenceManager(node, centrifuge.RedisPresenceManagerConfig{
+		Prefix: "gf_live",
+		Shards: redisShards,
+	})
+	if err != nil {
+		return fmt.Errorf("error creating Live Redis presence manager: %v", err)
+	}
+	node.SetPresenceManager(presenceManager)
+	return nil
+}
+
 // GrafanaLive manages live real-time connections to Grafana (over WebSocket at this moment).
 // The main concept here is Channel. Connections can subscribe to many channels. Each channel
 // can have different permissions and properties but once a connection subscribed to a channel
@@ -1026,7 +1043,7 @@ func (g *GrafanaLive) HandleInfoHTTP(ctx *contextmodel.ReqContext) response.Resp
 			"active": g.GrafanaScope.Dashboards.HasGitOpsObserver(ctx.SignedInUser.GetOrgID()),
 		})
 	}
-	return response.JSONStreaming(404, util.DynMap{
+	return response.JSONStreaming(http.StatusNotFound, util.DynMap{
 		"message": "Info is not supported for this channel",
 	})
 }
diff --git a/pkg/services/live/live_test.go b/pkg/services/live/live_test.go
index a448e55d7c0a9..f37266acb1657 100644
--- a/pkg/services/live/live_test.go
+++ b/pkg/services/live/live_test.go
@@ -9,9 +9,39 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/api/routing"
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/infra/usagestats"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
+	"github.com/grafana/grafana/pkg/services/annotations/annotationstest"
+	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
+func Test_provideLiveService_RedisUnavailable(t *testing.T) {
+	cfg := setting.NewCfg()
+
+	cfg.LiveHAEngine = "testredisunavailable"
+
+	_, err := ProvideService(nil, cfg,
+		routing.NewRouteRegister(),
+		nil, nil, nil, nil,
+		db.InitTestDB(t),
+		nil,
+		&usagestats.UsageStatsMock{T: t},
+		nil,
+		featuremgmt.WithFeatures(), acimpl.ProvideAccessControl(cfg), &dashboards.FakeDashboardService{}, annotationstest.NewFakeAnnotationsRepo(), nil)
+
+	// Proceeds without live HA if redis is unavaialble
+	require.NoError(t, err)
+}
+
 func Test_runConcurrentlyIfNeeded_Concurrent(t *testing.T) {
 	doneCh := make(chan struct{})
 	f := func() {
diff --git a/pkg/services/login/authinfo.go b/pkg/services/login/authinfo.go
index 67729b56af20c..103372c942d84 100644
--- a/pkg/services/login/authinfo.go
+++ b/pkg/services/login/authinfo.go
@@ -3,35 +3,24 @@ package login
 import (
 	"context"
 
-	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/login/social"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
 type AuthInfoService interface {
-	LookupAndUpdate(ctx context.Context, query *GetUserByAuthInfoQuery) (*user.User, error)
 	GetAuthInfo(ctx context.Context, query *GetAuthInfoQuery) (*UserAuth, error)
 	GetUserLabels(ctx context.Context, query GetUserLabelsQuery) (map[int64]string, error)
-	GetExternalUserInfoByLogin(ctx context.Context, query *GetExternalUserInfoByLoginQuery) (*ExternalUserInfo, error)
 	SetAuthInfo(ctx context.Context, cmd *SetAuthInfoCommand) error
 	UpdateAuthInfo(ctx context.Context, cmd *UpdateAuthInfoCommand) error
 	DeleteUserAuthInfo(ctx context.Context, userID int64) error
 }
 
 type Store interface {
-	GetExternalUserInfoByLogin(ctx context.Context, query *GetExternalUserInfoByLoginQuery) (*ExternalUserInfo, error)
 	GetAuthInfo(ctx context.Context, query *GetAuthInfoQuery) (*UserAuth, error)
 	GetUserLabels(ctx context.Context, query GetUserLabelsQuery) (map[int64]string, error)
 	SetAuthInfo(ctx context.Context, cmd *SetAuthInfoCommand) error
 	UpdateAuthInfo(ctx context.Context, cmd *UpdateAuthInfoCommand) error
-	UpdateAuthInfoDate(ctx context.Context, authInfo *UserAuth) error
-	DeleteAuthInfo(ctx context.Context, cmd *DeleteAuthInfoCommand) error
 	DeleteUserAuthInfo(ctx context.Context, userID int64) error
-	GetUserById(ctx context.Context, id int64) (*user.User, error)
-	GetUserByLogin(ctx context.Context, login string) (*user.User, error)
-	GetUserByEmail(ctx context.Context, email string) (*user.User, error)
-	CollectLoginStats(ctx context.Context) (map[string]any, error)
-	RunMetricsCollection(ctx context.Context) error
-	GetLoginStats(ctx context.Context) (LoginStats, error)
 }
 
 const (
@@ -75,9 +64,9 @@ const (
 // https://github.com/grafana/grafana/blob/4181acec72f76df7ad02badce13769bae4a1f840/pkg/services/login/authinfoservice/database/database.go#L61
 // this means that if the user has multiple auth providers and one of them is set to sync org roles
 // then IsExternallySynced will be true for this one provider and false for the others
-func IsExternallySynced(cfg *setting.Cfg, authModule string) bool {
+func IsExternallySynced(cfg *setting.Cfg, authModule string, oauthInfo *social.OAuthInfo) bool {
 	// provider enabled in config
-	if !IsProviderEnabled(cfg, authModule) {
+	if !IsProviderEnabled(cfg, authModule, oauthInfo) {
 		return false
 	}
 	// first check SAML, LDAP and JWT
@@ -87,29 +76,14 @@ func IsExternallySynced(cfg *setting.Cfg, authModule string) bool {
 	case LDAPAuthModule:
 		return !cfg.LDAPSkipOrgRoleSync
 	case JWTModule:
-		return !cfg.JWTAuthSkipOrgRoleSync
-	}
-	// then check the rest of the oauth providers
-	// FIXME: remove this once we remove the setting
-	// is a deprecated setting that is used to skip org role sync for all external oauth providers
-	if cfg.OAuthSkipOrgRoleUpdateSync {
-		return false
+		return !cfg.JWTAuth.SkipOrgRoleSync
 	}
 	switch authModule {
-	case GoogleAuthModule:
-		return !cfg.GoogleSkipOrgRoleSync
-	case OktaAuthModule:
-		return !cfg.OktaSkipOrgRoleSync
-	case AzureADAuthModule:
-		return !cfg.AzureADSkipOrgRoleSync
-	case GitLabAuthModule:
-		return !cfg.GitLabSkipOrgRoleSync
-	case GithubAuthModule:
-		return !cfg.GitHubSkipOrgRoleSync
-	case GrafanaComAuthModule:
-		return !cfg.GrafanaComSkipOrgRoleSync
-	case GenericOAuthModule:
-		return !cfg.GenericOAuthSkipOrgRoleSync
+	case GoogleAuthModule, OktaAuthModule, AzureADAuthModule, GitLabAuthModule, GithubAuthModule, GrafanaComAuthModule, GenericOAuthModule:
+		if oauthInfo == nil {
+			return false
+		}
+		return !oauthInfo.SkipOrgRoleSync
 	}
 	return true
 }
@@ -117,45 +91,36 @@ func IsExternallySynced(cfg *setting.Cfg, authModule string) bool {
 // IsGrafanaAdminExternallySynced returns true if Grafana server admin role is being managed by an external auth provider, and false otherwise.
 // Grafana admin role sync is available for JWT, OAuth providers and LDAP.
 // For JWT and OAuth providers there is an additional config option `allow_assign_grafana_admin` that has to be enabled for Grafana Admin role to be synced.
-func IsGrafanaAdminExternallySynced(cfg *setting.Cfg, authModule string, oAuthAndAllowAssignGrafanaAdmin bool) bool {
-	if !IsExternallySynced(cfg, authModule) {
+func IsGrafanaAdminExternallySynced(cfg *setting.Cfg, oauthInfo *social.OAuthInfo, authModule string) bool {
+	if !IsExternallySynced(cfg, authModule, oauthInfo) {
 		return false
 	}
 
 	switch authModule {
 	case JWTModule:
-		return cfg.JWTAuthAllowAssignGrafanaAdmin
+		return cfg.JWTAuth.AllowAssignGrafanaAdmin
 	case SAMLAuthModule:
 		return cfg.SAMLRoleValuesGrafanaAdmin != ""
 	case LDAPAuthModule:
 		return true
 	default:
-		return oAuthAndAllowAssignGrafanaAdmin
+		return oauthInfo != nil && oauthInfo.AllowAssignGrafanaAdmin
 	}
 }
 
-func IsProviderEnabled(cfg *setting.Cfg, authModule string) bool {
+func IsProviderEnabled(cfg *setting.Cfg, authModule string, oauthInfo *social.OAuthInfo) bool {
 	switch authModule {
 	case SAMLAuthModule:
 		return cfg.SAMLAuthEnabled
 	case LDAPAuthModule:
 		return cfg.LDAPAuthEnabled
 	case JWTModule:
-		return cfg.JWTAuthEnabled
-	case GoogleAuthModule:
-		return cfg.GoogleAuthEnabled
-	case OktaAuthModule:
-		return cfg.OktaAuthEnabled
-	case AzureADAuthModule:
-		return cfg.AzureADEnabled
-	case GitLabAuthModule:
-		return cfg.GitLabAuthEnabled
-	case GithubAuthModule:
-		return cfg.GitHubAuthEnabled
-	case GrafanaComAuthModule:
-		return cfg.GrafanaComAuthEnabled || cfg.GrafanaNetAuthEnabled
-	case GenericOAuthModule:
-		return cfg.GenericOAuthAuthEnabled
+		return cfg.JWTAuth.Enabled
+	case GoogleAuthModule, OktaAuthModule, AzureADAuthModule, GitLabAuthModule, GithubAuthModule, GrafanaComAuthModule, GenericOAuthModule:
+		if oauthInfo == nil {
+			return false
+		}
+		return oauthInfo.Enabled
 	}
 	return false
 }
diff --git a/pkg/services/login/authinfo_test.go b/pkg/services/login/authinfo_test.go
index f65e24662ba50..53996b6785c7d 100644
--- a/pkg/services/login/authinfo_test.go
+++ b/pkg/services/login/authinfo_test.go
@@ -3,165 +3,48 @@ package login
 import (
 	"testing"
 
-	"github.com/grafana/grafana/pkg/setting"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/setting"
 )
 
 func TestIsExternallySynced(t *testing.T) {
 	testcases := []struct {
-		name     string
-		cfg      *setting.Cfg
-		provider string
-		expected bool
+		name      string
+		cfg       *setting.Cfg
+		oauthInfo *social.OAuthInfo
+		provider  string
+		expected  bool
 	}{
-		// azure
+		// Same for all of the OAuth providers
 		{
-			name:     "AzureAD synced user should return that it is externally synced",
-			cfg:      &setting.Cfg{AzureADEnabled: true, AzureADSkipOrgRoleSync: false},
-			provider: AzureADAuthModule,
-			expected: true,
+			name:      "AzureAD external user should return that it is externally synced",
+			cfg:       &setting.Cfg{},
+			oauthInfo: &social.OAuthInfo{Enabled: true, SkipOrgRoleSync: false},
+			provider:  AzureADAuthModule,
+			expected:  true,
 		},
 		{
-			name:     "AzureAD synced user should return that it is not externally synced when org role sync is set",
-			cfg:      &setting.Cfg{AzureADEnabled: true, AzureADSkipOrgRoleSync: true},
-			provider: AzureADAuthModule,
-			expected: false,
+			name:      "AzureAD external user should return that it is not externally synced when org role sync is set",
+			cfg:       &setting.Cfg{},
+			oauthInfo: &social.OAuthInfo{Enabled: true, SkipOrgRoleSync: true},
+			provider:  AzureADAuthModule,
+			expected:  false,
 		},
-		// FIXME: remove this test as soon as we remove the deprecated setting for skipping org role sync for all external oauth providers
 		{
-			name:     "azuread external user should return that it is not externally synced when oauth org role sync is set",
-			cfg:      &setting.Cfg{AzureADEnabled: true, AzureADSkipOrgRoleSync: false, OAuthSkipOrgRoleUpdateSync: true},
-			provider: AzureADAuthModule,
-			expected: false,
-		},
-		// google
-		{
-			name:     "Google synced user should return that it is externally synced",
-			cfg:      &setting.Cfg{GoogleAuthEnabled: true, GoogleSkipOrgRoleSync: false},
-			provider: GoogleAuthModule,
-			expected: true,
+			name:      "AzureAD external user should return that it is not externally synced when the provider is not enabled",
+			cfg:       &setting.Cfg{},
+			oauthInfo: &social.OAuthInfo{Enabled: false, SkipOrgRoleSync: false},
+			provider:  AzureADAuthModule,
+			expected:  false,
 		},
 		{
-			name:     "Google synced user should return that it is not externally synced when org role sync is set",
-			cfg:      &setting.Cfg{GoogleAuthEnabled: true, GoogleSkipOrgRoleSync: true},
-			provider: GoogleAuthModule,
-			expected: false,
-		},
-		// FIXME: remove this test as soon as we remove the deprecated setting for skipping org role sync for all external oauth providers
-		{
-			name:     "google external user should return that it is not externally synced when oauth org role sync is set",
-			cfg:      &setting.Cfg{GoogleAuthEnabled: true, GoogleSkipOrgRoleSync: false, OAuthSkipOrgRoleUpdateSync: true},
-			provider: GoogleAuthModule,
-			expected: false,
-		},
-		{
-			name:     "external user should return that it is not externally synced when oauth org role sync is set and google skip org role sync set",
-			cfg:      &setting.Cfg{GoogleAuthEnabled: true, GoogleSkipOrgRoleSync: true, OAuthSkipOrgRoleUpdateSync: true},
-			provider: GoogleAuthModule,
-			expected: false,
-		},
-		// okta
-		{
-			name:     "Okta synced user should return that it is externally synced",
-			cfg:      &setting.Cfg{OktaAuthEnabled: true, OktaSkipOrgRoleSync: false},
-			provider: OktaAuthModule,
-			expected: true,
-		},
-		{
-			name: "Okta synced user should return that it is not externally synced when org role sync is set",
-			cfg:  &setting.Cfg{OktaAuthEnabled: true, OktaSkipOrgRoleSync: true},
-
-			provider: OktaAuthModule,
-			expected: false,
-		},
-		// FIXME: remove this test as soon as we remove the deprecated setting for skipping org role sync for all external oauth providers
-		{
-			name:     "okta external user should return that it is not externally synced when oauth org role sync is set",
-			cfg:      &setting.Cfg{OktaAuthEnabled: true, OktaSkipOrgRoleSync: false, OAuthSkipOrgRoleUpdateSync: true},
-			provider: OktaAuthModule,
-			expected: false,
-		},
-		// github
-		{
-			name:     "Github synced user should return that it is externally synced",
-			cfg:      &setting.Cfg{GitHubAuthEnabled: true, GitHubSkipOrgRoleSync: false},
-			provider: GithubAuthModule,
-			expected: true,
-		},
-		{
-			name:     "Github synced user should return that it is not externally synced when org role sync is set",
-			cfg:      &setting.Cfg{GitHubAuthEnabled: true, GitHubSkipOrgRoleSync: true},
-			provider: GithubAuthModule,
-			expected: false,
-		},
-		// FIXME: remove this test as soon as we remove the deprecated setting for skipping org role sync for all external oauth providers
-		{
-			name:     "github external user should return that it is not externally synced when oauth org role sync is set",
-			cfg:      &setting.Cfg{GitHubAuthEnabled: true, GitHubSkipOrgRoleSync: false, OAuthSkipOrgRoleUpdateSync: true},
-			provider: GithubAuthModule,
-			expected: false,
-		},
-		// gitlab
-		{
-			name:     "Gitlab synced user should return that it is externally synced",
-			cfg:      &setting.Cfg{GitLabAuthEnabled: true, GitLabSkipOrgRoleSync: false},
-			provider: GitLabAuthModule,
-			expected: true,
-		},
-		{
-			name:     "Gitlab synced user should return that it is not externally synced when org role sync is set",
-			cfg:      &setting.Cfg{GitLabAuthEnabled: true, GitLabSkipOrgRoleSync: true},
-			provider: GitLabAuthModule,
-			expected: false,
-		},
-		// FIXME: remove this test as soon as we remove the deprecated setting for skipping org role sync for all external oauth providers
-		{
-			name:     "gitlab external user should return that it is not externally synced when oauth org role sync is set",
-			cfg:      &setting.Cfg{GitLabAuthEnabled: true, GitLabSkipOrgRoleSync: false, OAuthSkipOrgRoleUpdateSync: true},
-			provider: GitLabAuthModule,
-			expected: false,
-		},
-		// grafana.com
-		{
-			name:     "Grafana.com synced user should return that it is externally synced",
-			cfg:      &setting.Cfg{GrafanaComAuthEnabled: true, GrafanaComSkipOrgRoleSync: false},
-			provider: GrafanaComAuthModule,
-			expected: true,
-		},
-		{
-			name:     "Grafana.com synced user should return that it is not externally synced when org role sync is set",
-			cfg:      &setting.Cfg{GrafanaComAuthEnabled: true, GrafanaComSkipOrgRoleSync: true},
-			provider: GrafanaComAuthModule,
-			expected: false,
-		},
-		// FIXME: remove this test as soon as we remove the deprecated setting for skipping org role sync for all external oauth providers
-		{
-			name:     "grafanacom external user should return that it is not externally synced when oauth org role sync is set",
-			cfg:      &setting.Cfg{GrafanaComAuthEnabled: true, GrafanaComSkipOrgRoleSync: false, OAuthSkipOrgRoleUpdateSync: true},
-			provider: GrafanaComAuthModule,
-			expected: false,
-		},
-		// generic oauth
-		{
-			name: "OAuth synced user should return that it is externally synced",
-			cfg:  &setting.Cfg{GenericOAuthAuthEnabled: true, OAuthSkipOrgRoleUpdateSync: false},
-			// this could be any of the external oauth providers
-			provider: GenericOAuthModule,
-			expected: true,
-		},
-		{
-			name: "OAuth synced user should return that it is not externally synced when org role sync is set",
-			cfg:  &setting.Cfg{GenericOAuthAuthEnabled: true, OAuthSkipOrgRoleUpdateSync: true},
-			// this could be any of the external oauth providers
-			provider: GenericOAuthModule,
-			expected: false,
-		},
-		// FIXME: remove this test as soon as we remove the deprecated setting for skipping org role sync for all external oauth providers
-		{
-			name:     "generic oauth external user should return that it is not externally synced when oauth org role sync is set",
-			cfg:      &setting.Cfg{GenericOAuthAuthEnabled: true, GenericOAuthSkipOrgRoleSync: false, OAuthSkipOrgRoleUpdateSync: true},
-			provider: GenericOAuthModule,
-			expected: false,
+			name:      "AzureAD synced user should return that it is not externally synced when the provider is not enabled and nil",
+			cfg:       &setting.Cfg{},
+			oauthInfo: nil,
+			provider:  AzureADAuthModule,
+			expected:  false,
 		},
 		// saml
 		{
@@ -192,20 +75,20 @@ func TestIsExternallySynced(t *testing.T) {
 		// jwt
 		{
 			name:     "JWT synced user should return that it is externally synced",
-			cfg:      &setting.Cfg{JWTAuthEnabled: true, JWTAuthSkipOrgRoleSync: false},
+			cfg:      &setting.Cfg{JWTAuth: setting.AuthJWTSettings{Enabled: true, SkipOrgRoleSync: false}},
 			provider: JWTModule,
 			expected: true,
 		},
 		{
 			name:     "JWT synced user should return that it is not externally synced when org role sync is set",
-			cfg:      &setting.Cfg{JWTAuthEnabled: true, JWTAuthSkipOrgRoleSync: true},
+			cfg:      &setting.Cfg{JWTAuth: setting.AuthJWTSettings{Enabled: true, SkipOrgRoleSync: true}},
 			provider: JWTModule,
 			expected: false,
 		},
 		// IsProvider test
 		{
 			name:     "If no provider enabled should return false",
-			cfg:      &setting.Cfg{JWTAuthSkipOrgRoleSync: true},
+			cfg:      &setting.Cfg{JWTAuth: setting.AuthJWTSettings{Enabled: false, SkipOrgRoleSync: true}},
 			provider: JWTModule,
 			expected: false,
 		},
@@ -213,36 +96,36 @@ func TestIsExternallySynced(t *testing.T) {
 
 	for _, tc := range testcases {
 		t.Run(tc.name, func(t *testing.T) {
-			assert.Equal(t, tc.expected, IsExternallySynced(tc.cfg, tc.provider))
+			assert.Equal(t, tc.expected, IsExternallySynced(tc.cfg, tc.provider, tc.oauthInfo))
 		})
 	}
 }
 
 func TestIsProviderEnabled(t *testing.T) {
 	testcases := []struct {
-		name     string
-		cfg      *setting.Cfg
-		provider string
-		expected bool
+		name      string
+		oauthInfo *social.OAuthInfo
+		provider  string
+		expected  bool
 	}{
 		// github
 		{
-			name:     "Github should return true if enabled",
-			cfg:      &setting.Cfg{GitHubAuthEnabled: true},
-			provider: GithubAuthModule,
-			expected: true,
+			name:      "Github should return true if enabled",
+			oauthInfo: &social.OAuthInfo{Enabled: true},
+			provider:  GithubAuthModule,
+			expected:  true,
 		},
 		{
-			name:     "Github should return false if not enabled",
-			cfg:      &setting.Cfg{},
-			provider: GithubAuthModule,
-			expected: false,
+			name:      "Github should return false if not enabled",
+			oauthInfo: &social.OAuthInfo{Enabled: false},
+			provider:  GithubAuthModule,
+			expected:  false,
 		},
 	}
 
 	for _, tc := range testcases {
 		t.Run(tc.name, func(t *testing.T) {
-			assert.Equal(t, tc.expected, IsProviderEnabled(tc.cfg, tc.provider))
+			assert.Equal(t, tc.expected, IsProviderEnabled(setting.NewCfg(), tc.provider, tc.oauthInfo))
 		})
 	}
 }
diff --git a/pkg/services/login/authinfoimpl/service.go b/pkg/services/login/authinfoimpl/service.go
new file mode 100644
index 0000000000000..4bd5814302b16
--- /dev/null
+++ b/pkg/services/login/authinfoimpl/service.go
@@ -0,0 +1,204 @@
+package authinfoimpl
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"strconv"
+	"time"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/remotecache"
+	"github.com/grafana/grafana/pkg/services/login"
+	"github.com/grafana/grafana/pkg/services/secrets"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/util/errutil"
+)
+
+type Service struct {
+	authInfoStore login.Store
+	logger        log.Logger
+	remoteCache   remotecache.CacheStorage
+	secretService secrets.Service
+}
+
+const remoteCachePrefix = "authinfo-"
+const remoteCacheTTL = 60 * time.Hour
+
+var errMissingParameters = errutil.NewBase(errutil.StatusBadRequest, "auth-missing-parameters", errutil.WithPublicMessage("Missing parameters for auth info"))
+
+func ProvideService(authInfoStore login.Store,
+	remoteCache remotecache.CacheStorage,
+	secretService secrets.Service) *Service {
+	s := &Service{
+		authInfoStore: authInfoStore,
+		logger:        log.New("login.authinfo"),
+		remoteCache:   remoteCache,
+		secretService: secretService,
+	}
+
+	return s
+}
+
+func (s *Service) GetAuthInfo(ctx context.Context, query *login.GetAuthInfoQuery) (*login.UserAuth, error) {
+	if query.UserId == 0 && query.AuthId == "" {
+		return nil, user.ErrUserNotFound
+	}
+
+	authInfo, err := s.getAuthInfoFromCache(ctx, query)
+	if err != nil && !errors.Is(err, remotecache.ErrCacheItemNotFound) {
+		s.logger.Error("failed to retrieve auth info from cache", "error", err)
+	} else if authInfo != nil {
+		return authInfo, nil
+	}
+
+	authInfo, err = s.authInfoStore.GetAuthInfo(ctx, query)
+	if err != nil {
+		return nil, err
+	}
+
+	err = s.setAuthInfoInCache(ctx, query, authInfo)
+	if err != nil {
+		s.logger.Error("failed to set auth info in cache", "error", err)
+	} else {
+		s.logger.Debug("auth info set in cache", "cacheKey", generateCacheKey(query))
+	}
+
+	return authInfo, nil
+}
+
+func (s *Service) GetUserLabels(ctx context.Context, query login.GetUserLabelsQuery) (map[int64]string, error) {
+	if len(query.UserIDs) == 0 {
+		return map[int64]string{}, nil
+	}
+	return s.authInfoStore.GetUserLabels(ctx, query)
+}
+
+func (s *Service) setAuthInfoInCache(ctx context.Context, query *login.GetAuthInfoQuery, info *login.UserAuth) error {
+	cacheKey := generateCacheKey(query)
+	infoJSON, err := json.Marshal(info)
+	if err != nil {
+		return err
+	}
+
+	encryptedInfo, err := s.secretService.Encrypt(ctx, infoJSON, secrets.WithoutScope())
+	if err != nil {
+		return err
+	}
+
+	return s.remoteCache.Set(ctx, cacheKey, encryptedInfo, remoteCacheTTL)
+}
+
+func (s *Service) getAuthInfoFromCache(ctx context.Context, query *login.GetAuthInfoQuery) (*login.UserAuth, error) {
+	// check if we have the auth info in the remote cache
+	cacheKey := generateCacheKey(query)
+	item, err := s.remoteCache.Get(ctx, cacheKey)
+	if err != nil {
+		return nil, err
+	}
+
+	info := &login.UserAuth{}
+	itemJSON, err := s.secretService.Decrypt(ctx, item)
+	if err != nil {
+		return nil, err
+	}
+
+	if err := json.Unmarshal(itemJSON, info); err != nil {
+		return nil, err
+	}
+
+	s.logger.Debug("auth info retrieved from cache", "cacheKey", cacheKey)
+
+	return info, nil
+}
+
+func generateCacheKey(query *login.GetAuthInfoQuery) string {
+	cacheKey := remoteCachePrefix + strconv.FormatInt(query.UserId, 10) + "-" +
+		query.AuthModule + "-" + query.AuthId
+	return cacheKey
+}
+
+func (s *Service) UpdateAuthInfo(ctx context.Context, cmd *login.UpdateAuthInfoCommand) error {
+	// Only update auth info if we have an (user id + auth module)
+	if cmd.UserId == 0 || cmd.AuthModule == "" {
+		return errMissingParameters.Errorf("missing parameters for auth info %v", cmd)
+	}
+
+	if err := s.authInfoStore.UpdateAuthInfo(ctx, cmd); err != nil {
+		return err
+	}
+
+	s.deleteUserAuthInfoInCache(ctx, &login.GetAuthInfoQuery{
+		AuthModule: cmd.AuthModule,
+		AuthId:     cmd.AuthId,
+		UserId:     cmd.UserId,
+	})
+
+	return nil
+}
+
+func (s *Service) SetAuthInfo(ctx context.Context, cmd *login.SetAuthInfoCommand) error {
+	// Only set auth info if we have an (user id + auth module)
+	if cmd.UserId == 0 || cmd.AuthModule == "" {
+		return errMissingParameters.Errorf("missing parameters for auth info %v", cmd)
+	}
+
+	if err := s.authInfoStore.SetAuthInfo(ctx, cmd); err != nil {
+		return err
+	}
+
+	s.deleteUserAuthInfoInCache(ctx, &login.GetAuthInfoQuery{
+		AuthModule: cmd.AuthModule,
+		AuthId:     cmd.AuthId,
+		UserId:     cmd.UserId,
+	})
+
+	return nil
+}
+
+func (s *Service) DeleteUserAuthInfo(ctx context.Context, userID int64) error {
+	err := s.authInfoStore.DeleteUserAuthInfo(ctx, userID)
+	if err != nil {
+		return err
+	}
+
+	err = s.remoteCache.Delete(ctx, generateCacheKey(&login.GetAuthInfoQuery{
+		UserId: userID,
+	}))
+	if err != nil {
+		s.logger.Error("failed to delete auth info from cache", "error", err)
+	}
+
+	return nil
+}
+
+func (s *Service) deleteUserAuthInfoInCache(ctx context.Context, query *login.GetAuthInfoQuery) {
+	if query.AuthId != "" {
+		err := s.remoteCache.Delete(ctx, generateCacheKey(&login.GetAuthInfoQuery{
+			AuthModule: query.AuthModule,
+			AuthId:     query.AuthId,
+		}))
+		if err != nil {
+			s.logger.Warn("failed to delete auth info from cache", "error", err)
+		}
+	}
+
+	if query.UserId != 0 {
+		errN := s.remoteCache.Delete(ctx, generateCacheKey(
+			&login.GetAuthInfoQuery{
+				UserId: query.UserId,
+			}))
+		if errN != nil {
+			s.logger.Warn("failed to delete user auth info from cache", "error", errN)
+		}
+
+		errA := s.remoteCache.Delete(ctx, generateCacheKey(
+			&login.GetAuthInfoQuery{
+				UserId:     query.UserId,
+				AuthModule: query.AuthModule,
+			}))
+		if errA != nil {
+			s.logger.Warn("failed to delete user module auth info from cache", "error", errA)
+		}
+	}
+}
diff --git a/pkg/services/login/authinfoimpl/store.go b/pkg/services/login/authinfoimpl/store.go
new file mode 100644
index 0000000000000..7c1ffad017b10
--- /dev/null
+++ b/pkg/services/login/authinfoimpl/store.go
@@ -0,0 +1,254 @@
+package authinfoimpl
+
+import (
+	"context"
+	"encoding/base64"
+	"time"
+
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/login"
+	"github.com/grafana/grafana/pkg/services/secrets"
+	"github.com/grafana/grafana/pkg/services/user"
+)
+
+var GetTime = time.Now
+
+type Store struct {
+	sqlStore       db.DB
+	secretsService secrets.Service
+	logger         log.Logger
+}
+
+func ProvideStore(sqlStore db.DB, secretsService secrets.Service) login.Store {
+	store := &Store{
+		sqlStore:       sqlStore,
+		secretsService: secretsService,
+		logger:         log.New("login.authinfo.store"),
+	}
+
+	return store
+}
+
+// GetAuthInfo returns the auth info for a user
+// It will return the latest auth info for a user
+func (s *Store) GetAuthInfo(ctx context.Context, query *login.GetAuthInfoQuery) (*login.UserAuth, error) {
+	if query.UserId == 0 && query.AuthId == "" {
+		return nil, user.ErrUserNotFound
+	}
+
+	userAuth := &login.UserAuth{
+		UserId:     query.UserId,
+		AuthModule: query.AuthModule,
+		AuthId:     query.AuthId,
+	}
+
+	var has bool
+	var err error
+
+	err = s.sqlStore.WithDbSession(ctx, func(sess *db.Session) error {
+		has, err = sess.Desc("created").Get(userAuth)
+		return err
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	if !has {
+		return nil, user.ErrUserNotFound
+	}
+
+	secretAccessToken, err := s.decodeAndDecrypt(userAuth.OAuthAccessToken)
+	if err != nil {
+		return nil, err
+	}
+	secretRefreshToken, err := s.decodeAndDecrypt(userAuth.OAuthRefreshToken)
+	if err != nil {
+		return nil, err
+	}
+	secretTokenType, err := s.decodeAndDecrypt(userAuth.OAuthTokenType)
+	if err != nil {
+		return nil, err
+	}
+	secretIdToken, err := s.decodeAndDecrypt(userAuth.OAuthIdToken)
+	if err != nil {
+		return nil, err
+	}
+	userAuth.OAuthAccessToken = secretAccessToken
+	userAuth.OAuthRefreshToken = secretRefreshToken
+	userAuth.OAuthTokenType = secretTokenType
+	userAuth.OAuthIdToken = secretIdToken
+
+	return userAuth, nil
+}
+
+func (s *Store) GetUserLabels(ctx context.Context, query login.GetUserLabelsQuery) (map[int64]string, error) {
+	userAuths := []login.UserAuth{}
+	params := make([]interface{}, 0, len(query.UserIDs))
+	for _, id := range query.UserIDs {
+		params = append(params, id)
+	}
+
+	err := s.sqlStore.WithDbSession(ctx, func(sess *db.Session) error {
+		return sess.Table("user_auth").In("user_id", params).OrderBy("created").Find(&userAuths)
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	labelMap := make(map[int64]string, len(userAuths))
+
+	for i := range userAuths {
+		labelMap[userAuths[i].UserId] = userAuths[i].AuthModule
+	}
+
+	return labelMap, nil
+}
+
+func (s *Store) SetAuthInfo(ctx context.Context, cmd *login.SetAuthInfoCommand) error {
+	authUser := &login.UserAuth{
+		UserId:     cmd.UserId,
+		AuthModule: cmd.AuthModule,
+		AuthId:     cmd.AuthId,
+		Created:    GetTime(),
+	}
+
+	if cmd.OAuthToken != nil {
+		secretAccessToken, err := s.encryptAndEncode(cmd.OAuthToken.AccessToken)
+		if err != nil {
+			return err
+		}
+		secretRefreshToken, err := s.encryptAndEncode(cmd.OAuthToken.RefreshToken)
+		if err != nil {
+			return err
+		}
+		secretTokenType, err := s.encryptAndEncode(cmd.OAuthToken.TokenType)
+		if err != nil {
+			return err
+		}
+
+		var secretIdToken string
+		if idToken, ok := cmd.OAuthToken.Extra("id_token").(string); ok && idToken != "" {
+			secretIdToken, err = s.encryptAndEncode(idToken)
+			if err != nil {
+				return err
+			}
+		}
+
+		authUser.OAuthAccessToken = secretAccessToken
+		authUser.OAuthRefreshToken = secretRefreshToken
+		authUser.OAuthTokenType = secretTokenType
+		authUser.OAuthIdToken = secretIdToken
+		authUser.OAuthExpiry = cmd.OAuthToken.Expiry
+	}
+
+	return s.sqlStore.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
+		_, err := sess.Insert(authUser)
+		return err
+	})
+}
+
+func (s *Store) UpdateAuthInfo(ctx context.Context, cmd *login.UpdateAuthInfoCommand) error {
+	authUser := &login.UserAuth{
+		UserId:     cmd.UserId,
+		AuthModule: cmd.AuthModule,
+		AuthId:     cmd.AuthId,
+		Created:    GetTime(),
+	}
+
+	if cmd.OAuthToken != nil {
+		secretAccessToken, err := s.encryptAndEncode(cmd.OAuthToken.AccessToken)
+		if err != nil {
+			return err
+		}
+		secretRefreshToken, err := s.encryptAndEncode(cmd.OAuthToken.RefreshToken)
+		if err != nil {
+			return err
+		}
+		secretTokenType, err := s.encryptAndEncode(cmd.OAuthToken.TokenType)
+		if err != nil {
+			return err
+		}
+
+		var secretIdToken string
+		if idToken, ok := cmd.OAuthToken.Extra("id_token").(string); ok && idToken != "" {
+			secretIdToken, err = s.encryptAndEncode(idToken)
+			if err != nil {
+				return err
+			}
+		}
+
+		authUser.OAuthAccessToken = secretAccessToken
+		authUser.OAuthRefreshToken = secretRefreshToken
+		authUser.OAuthTokenType = secretTokenType
+		authUser.OAuthIdToken = secretIdToken
+		authUser.OAuthExpiry = cmd.OAuthToken.Expiry
+	}
+
+	return s.sqlStore.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
+		upd, err := sess.MustCols("o_auth_expiry").Where("user_id = ? AND auth_module = ?", cmd.UserId, cmd.AuthModule).Update(authUser)
+
+		s.logger.Debug("Updated user_auth", "user_id", cmd.UserId, "auth_id", cmd.AuthId, "auth_module", cmd.AuthModule, "rows", upd)
+
+		// Clean up duplicated entries
+		if upd > 1 {
+			var id int64
+			ok, err := sess.SQL(
+				"SELECT id FROM user_auth WHERE user_id = ? AND auth_module = ? AND auth_id = ?",
+				cmd.UserId, cmd.AuthModule, cmd.AuthId,
+			).Get(&id)
+
+			if err != nil {
+				return err
+			}
+
+			if !ok {
+				return nil
+			}
+
+			_, err = sess.Exec(
+				"DELETE FROM user_auth WHERE user_id = ? AND auth_module = ? AND auth_id = ? AND id != ?",
+				cmd.UserId, cmd.AuthModule, cmd.AuthId, id,
+			)
+			return err
+		}
+
+		return err
+	})
+}
+
+func (s *Store) DeleteUserAuthInfo(ctx context.Context, userID int64) error {
+	return s.sqlStore.WithDbSession(ctx, func(sess *db.Session) error {
+		var rawSQL = "DELETE FROM user_auth WHERE user_id = ?"
+		_, err := sess.Exec(rawSQL, userID)
+		return err
+	})
+}
+
+// decodeAndDecrypt will decode the string with the standard base64 decoder and then decrypt it
+func (s *Store) decodeAndDecrypt(str string) (string, error) {
+	// Bail out if empty string since it'll cause a segfault in Decrypt
+	if str == "" {
+		return "", nil
+	}
+	decoded, err := base64.StdEncoding.DecodeString(str)
+	if err != nil {
+		return "", err
+	}
+	decrypted, err := s.secretsService.Decrypt(context.Background(), decoded)
+	if err != nil {
+		return "", err
+	}
+	return string(decrypted), nil
+}
+
+// encryptAndEncode will encrypt a string with grafana's secretKey, and
+// then encode it with the standard bas64 encoder
+func (s *Store) encryptAndEncode(str string) (string, error) {
+	encrypted, err := s.secretsService.Encrypt(context.Background(), []byte(str), secrets.WithoutScope())
+	if err != nil {
+		return "", err
+	}
+	return base64.StdEncoding.EncodeToString(encrypted), nil
+}
diff --git a/pkg/services/login/authinfoimpl/store_test.go b/pkg/services/login/authinfoimpl/store_test.go
new file mode 100644
index 0000000000000..9fad32337e8d4
--- /dev/null
+++ b/pkg/services/login/authinfoimpl/store_test.go
@@ -0,0 +1,142 @@
+package authinfoimpl
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"golang.org/x/oauth2"
+
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/services/login"
+	secretstest "github.com/grafana/grafana/pkg/services/secrets/fakes"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
+)
+
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
+func TestIntegrationAuthInfoStore(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	sql := db.InitTestDB(t)
+	store := ProvideStore(sql, secretstest.NewFakeSecretsService())
+
+	t.Run("should be able to auth lables for users", func(t *testing.T) {
+		ctx := context.Background()
+		require.NoError(t, store.SetAuthInfo(ctx, &login.SetAuthInfoCommand{
+			AuthModule: login.LDAPAuthModule,
+			AuthId:     "1",
+			UserId:     1,
+		}))
+		require.NoError(t, store.SetAuthInfo(ctx, &login.SetAuthInfoCommand{
+			AuthModule: login.AzureADAuthModule,
+			AuthId:     "1",
+			UserId:     1,
+		}))
+		require.NoError(t, store.SetAuthInfo(ctx, &login.SetAuthInfoCommand{
+			AuthModule: login.GoogleAuthModule,
+			AuthId:     "10",
+			UserId:     2,
+		}))
+
+		labels, err := store.GetUserLabels(ctx, login.GetUserLabelsQuery{UserIDs: []int64{1, 2}})
+		require.NoError(t, err)
+		require.Len(t, labels, 2)
+
+		require.Equal(t, login.AzureADAuthModule, labels[1])
+		require.Equal(t, login.GoogleAuthModule, labels[2])
+	})
+
+	t.Run("should always get the latest used", func(t *testing.T) {
+		ctx := context.Background()
+		require.NoError(t, store.SetAuthInfo(ctx, &login.SetAuthInfoCommand{
+			AuthModule: login.LDAPAuthModule,
+			AuthId:     "1",
+			UserId:     1,
+		}))
+
+		defer func() {
+			GetTime = time.Now
+		}()
+
+		GetTime = func() time.Time {
+			return time.Now().Add(1 * time.Hour)
+		}
+
+		require.NoError(t, store.SetAuthInfo(ctx, &login.SetAuthInfoCommand{
+			AuthModule: login.AzureADAuthModule,
+			AuthId:     "2",
+			UserId:     1,
+		}))
+
+		info, err := store.GetAuthInfo(ctx, &login.GetAuthInfoQuery{
+			UserId: 1,
+		})
+		require.NoError(t, err)
+
+		assert.Equal(t, login.AzureADAuthModule, info.AuthModule)
+		assert.Equal(t, "2", info.AuthId)
+	})
+
+	t.Run("should return error when userID and authID is zero value", func(t *testing.T) {
+		ctx := context.Background()
+		info, err := store.GetAuthInfo(ctx, &login.GetAuthInfoQuery{
+			AuthModule: login.GoogleAuthModule,
+		})
+
+		require.ErrorIs(t, err, user.ErrUserNotFound)
+		require.Nil(t, info)
+	})
+
+	t.Run("should remove duplicates on update", func(t *testing.T) {
+		ctx := context.Background()
+		setCmd := &login.SetAuthInfoCommand{
+			AuthModule: login.GenericOAuthModule,
+			AuthId:     "1",
+			UserId:     10,
+		}
+
+		require.NoError(t, store.SetAuthInfo(ctx, setCmd))
+		require.NoError(t, store.SetAuthInfo(ctx, setCmd))
+
+		count := countEntries(t, sql, setCmd.AuthModule, setCmd.AuthId, setCmd.UserId)
+		require.Equal(t, 2, count)
+
+		err := store.UpdateAuthInfo(ctx, &login.UpdateAuthInfoCommand{
+			AuthModule: setCmd.AuthModule,
+			AuthId:     setCmd.AuthId,
+			UserId:     setCmd.UserId,
+			OAuthToken: &oauth2.Token{
+				AccessToken:  "atoken",
+				RefreshToken: "rtoken",
+				Expiry:       time.Now(),
+			},
+		})
+		require.NoError(t, err)
+
+		count = countEntries(t, sql, setCmd.AuthModule, setCmd.AuthId, setCmd.UserId)
+		require.Equal(t, 1, count)
+	})
+}
+
+func countEntries(t *testing.T, sql db.DB, authModule, authID string, userID int64) int {
+	var result int
+
+	err := sql.WithDbSession(context.Background(), func(sess *db.Session) error {
+		_, err := sess.SQL(
+			"SELECT COUNT(*) FROM user_auth WHERE auth_module = ? AND auth_id = ? AND user_id = ?",
+			authModule, authID, userID,
+		).Get(&result)
+		return err
+	})
+
+	require.NoError(t, err)
+	return result
+}
diff --git a/pkg/services/login/authinfoservice/userprotection.go b/pkg/services/login/authinfoimpl/userprotection.go
similarity index 92%
rename from pkg/services/login/authinfoservice/userprotection.go
rename to pkg/services/login/authinfoimpl/userprotection.go
index 4c95d411f877c..1ed7cf9a6a53b 100644
--- a/pkg/services/login/authinfoservice/userprotection.go
+++ b/pkg/services/login/authinfoimpl/userprotection.go
@@ -1,4 +1,4 @@
-package authinfoservice
+package authinfoimpl
 
 import "github.com/grafana/grafana/pkg/services/user"
 
diff --git a/pkg/services/login/authinfoservice/database/database.go b/pkg/services/login/authinfoservice/database/database.go
deleted file mode 100644
index 995a119fd82c0..0000000000000
--- a/pkg/services/login/authinfoservice/database/database.go
+++ /dev/null
@@ -1,312 +0,0 @@
-package database
-
-import (
-	"context"
-	"encoding/base64"
-	"time"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/login"
-	"github.com/grafana/grafana/pkg/services/secrets"
-	"github.com/grafana/grafana/pkg/services/user"
-)
-
-var GetTime = time.Now
-
-type AuthInfoStore struct {
-	sqlStore       db.DB
-	secretsService secrets.Service
-	logger         log.Logger
-	userService    user.Service
-}
-
-func ProvideAuthInfoStore(sqlStore db.DB, secretsService secrets.Service, userService user.Service) login.Store {
-	store := &AuthInfoStore{
-		sqlStore:       sqlStore,
-		secretsService: secretsService,
-		logger:         log.New("login.authinfo.store"),
-		userService:    userService,
-	}
-	// FIXME: disabled the metric collection for duplicate user entries
-	// due to query performance issues that is clogging the users Grafana instance
-	// InitDuplicateUserMetrics()
-	return store
-}
-
-func (s *AuthInfoStore) GetExternalUserInfoByLogin(ctx context.Context, query *login.GetExternalUserInfoByLoginQuery) (*login.ExternalUserInfo, error) {
-	userQuery := user.GetUserByLoginQuery{LoginOrEmail: query.LoginOrEmail}
-	usr, err := s.userService.GetByLogin(ctx, &userQuery)
-	if err != nil {
-		return nil, err
-	}
-
-	authInfoQuery := &login.GetAuthInfoQuery{UserId: usr.ID}
-	authInfo, err := s.GetAuthInfo(ctx, authInfoQuery)
-	if err != nil {
-		return nil, err
-	}
-
-	result := &login.ExternalUserInfo{
-		UserId:     usr.ID,
-		Login:      usr.Login,
-		Email:      usr.Email,
-		Name:       usr.Name,
-		IsDisabled: usr.IsDisabled,
-		AuthModule: authInfo.AuthModule,
-		AuthId:     authInfo.AuthId,
-	}
-	return result, nil
-}
-
-// GetAuthInfo returns the auth info for a user
-// It will return the latest auth info for a user
-func (s *AuthInfoStore) GetAuthInfo(ctx context.Context, query *login.GetAuthInfoQuery) (*login.UserAuth, error) {
-	if query.UserId == 0 && query.AuthId == "" {
-		return nil, user.ErrUserNotFound
-	}
-
-	userAuth := &login.UserAuth{
-		UserId:     query.UserId,
-		AuthModule: query.AuthModule,
-		AuthId:     query.AuthId,
-	}
-
-	var has bool
-	var err error
-
-	err = s.sqlStore.WithDbSession(ctx, func(sess *db.Session) error {
-		has, err = sess.Desc("created").Get(userAuth)
-		return err
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	if !has {
-		return nil, user.ErrUserNotFound
-	}
-
-	secretAccessToken, err := s.decodeAndDecrypt(userAuth.OAuthAccessToken)
-	if err != nil {
-		return nil, err
-	}
-	secretRefreshToken, err := s.decodeAndDecrypt(userAuth.OAuthRefreshToken)
-	if err != nil {
-		return nil, err
-	}
-	secretTokenType, err := s.decodeAndDecrypt(userAuth.OAuthTokenType)
-	if err != nil {
-		return nil, err
-	}
-	secretIdToken, err := s.decodeAndDecrypt(userAuth.OAuthIdToken)
-	if err != nil {
-		return nil, err
-	}
-	userAuth.OAuthAccessToken = secretAccessToken
-	userAuth.OAuthRefreshToken = secretRefreshToken
-	userAuth.OAuthTokenType = secretTokenType
-	userAuth.OAuthIdToken = secretIdToken
-
-	return userAuth, nil
-}
-
-func (s *AuthInfoStore) GetUserLabels(ctx context.Context, query login.GetUserLabelsQuery) (map[int64]string, error) {
-	userAuths := []login.UserAuth{}
-	params := make([]interface{}, 0, len(query.UserIDs))
-	for _, id := range query.UserIDs {
-		params = append(params, id)
-	}
-
-	err := s.sqlStore.WithDbSession(ctx, func(sess *db.Session) error {
-		return sess.Table("user_auth").In("user_id", params).OrderBy("created").Find(&userAuths)
-	})
-
-	if err != nil {
-		return nil, err
-	}
-
-	labelMap := make(map[int64]string, len(userAuths))
-
-	for i := range userAuths {
-		labelMap[userAuths[i].UserId] = userAuths[i].AuthModule
-	}
-
-	return labelMap, nil
-}
-
-func (s *AuthInfoStore) SetAuthInfo(ctx context.Context, cmd *login.SetAuthInfoCommand) error {
-	authUser := &login.UserAuth{
-		UserId:     cmd.UserId,
-		AuthModule: cmd.AuthModule,
-		AuthId:     cmd.AuthId,
-		Created:    GetTime(),
-	}
-
-	if cmd.OAuthToken != nil {
-		secretAccessToken, err := s.encryptAndEncode(cmd.OAuthToken.AccessToken)
-		if err != nil {
-			return err
-		}
-		secretRefreshToken, err := s.encryptAndEncode(cmd.OAuthToken.RefreshToken)
-		if err != nil {
-			return err
-		}
-		secretTokenType, err := s.encryptAndEncode(cmd.OAuthToken.TokenType)
-		if err != nil {
-			return err
-		}
-
-		var secretIdToken string
-		if idToken, ok := cmd.OAuthToken.Extra("id_token").(string); ok && idToken != "" {
-			secretIdToken, err = s.encryptAndEncode(idToken)
-			if err != nil {
-				return err
-			}
-		}
-
-		authUser.OAuthAccessToken = secretAccessToken
-		authUser.OAuthRefreshToken = secretRefreshToken
-		authUser.OAuthTokenType = secretTokenType
-		authUser.OAuthIdToken = secretIdToken
-		authUser.OAuthExpiry = cmd.OAuthToken.Expiry
-	}
-
-	return s.sqlStore.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		_, err := sess.Insert(authUser)
-		return err
-	})
-}
-
-// UpdateAuthInfoDate updates the auth info for the user with the latest date.
-// Avoids overlapping entries hiding the last used one (ex: LDAP->SAML->LDAP).
-func (s *AuthInfoStore) UpdateAuthInfoDate(ctx context.Context, authInfo *login.UserAuth) error {
-	authInfo.Created = GetTime()
-
-	cond := &login.UserAuth{
-		Id:         authInfo.Id,
-		UserId:     authInfo.UserId,
-		AuthModule: authInfo.AuthModule,
-	}
-	return s.sqlStore.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		_, err := sess.Cols("created").Update(authInfo, cond)
-		return err
-	})
-}
-
-func (s *AuthInfoStore) UpdateAuthInfo(ctx context.Context, cmd *login.UpdateAuthInfoCommand) error {
-	authUser := &login.UserAuth{
-		UserId:     cmd.UserId,
-		AuthModule: cmd.AuthModule,
-		AuthId:     cmd.AuthId,
-		Created:    GetTime(),
-	}
-
-	if cmd.OAuthToken != nil {
-		secretAccessToken, err := s.encryptAndEncode(cmd.OAuthToken.AccessToken)
-		if err != nil {
-			return err
-		}
-		secretRefreshToken, err := s.encryptAndEncode(cmd.OAuthToken.RefreshToken)
-		if err != nil {
-			return err
-		}
-		secretTokenType, err := s.encryptAndEncode(cmd.OAuthToken.TokenType)
-		if err != nil {
-			return err
-		}
-
-		var secretIdToken string
-		if idToken, ok := cmd.OAuthToken.Extra("id_token").(string); ok && idToken != "" {
-			secretIdToken, err = s.encryptAndEncode(idToken)
-			if err != nil {
-				return err
-			}
-		}
-
-		authUser.OAuthAccessToken = secretAccessToken
-		authUser.OAuthRefreshToken = secretRefreshToken
-		authUser.OAuthTokenType = secretTokenType
-		authUser.OAuthIdToken = secretIdToken
-		authUser.OAuthExpiry = cmd.OAuthToken.Expiry
-	}
-
-	return s.sqlStore.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		upd, err := sess.MustCols("o_auth_expiry").Where("user_id = ? AND auth_module = ?", cmd.UserId, cmd.AuthModule).Update(authUser)
-		s.logger.Debug("Updated user_auth", "user_id", cmd.UserId,
-			"auth_id", cmd.AuthId, "auth_module", cmd.AuthModule, "rows", upd)
-		return err
-	})
-}
-
-func (s *AuthInfoStore) DeleteAuthInfo(ctx context.Context, cmd *login.DeleteAuthInfoCommand) error {
-	return s.sqlStore.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		_, err := sess.Delete(cmd.UserAuth)
-		return err
-	})
-}
-
-func (s *AuthInfoStore) DeleteUserAuthInfo(ctx context.Context, userID int64) error {
-	return s.sqlStore.WithDbSession(ctx, func(sess *db.Session) error {
-		var rawSQL = "DELETE FROM user_auth WHERE user_id = ?"
-		_, err := sess.Exec(rawSQL, userID)
-		return err
-	})
-}
-
-func (s *AuthInfoStore) GetUserById(ctx context.Context, id int64) (*user.User, error) {
-	query := user.GetUserByIDQuery{ID: id}
-	user, err := s.userService.GetByID(ctx, &query)
-	if err != nil {
-		return nil, err
-	}
-
-	return user, nil
-}
-
-func (s *AuthInfoStore) GetUserByLogin(ctx context.Context, login string) (*user.User, error) {
-	query := user.GetUserByLoginQuery{LoginOrEmail: login}
-	usr, err := s.userService.GetByLogin(ctx, &query)
-	if err != nil {
-		return nil, err
-	}
-
-	return usr, nil
-}
-
-func (s *AuthInfoStore) GetUserByEmail(ctx context.Context, email string) (*user.User, error) {
-	query := user.GetUserByEmailQuery{Email: email}
-	usr, err := s.userService.GetByEmail(ctx, &query)
-	if err != nil {
-		return nil, err
-	}
-
-	return usr, nil
-}
-
-// decodeAndDecrypt will decode the string with the standard base64 decoder and then decrypt it
-func (s *AuthInfoStore) decodeAndDecrypt(str string) (string, error) {
-	// Bail out if empty string since it'll cause a segfault in Decrypt
-	if str == "" {
-		return "", nil
-	}
-	decoded, err := base64.StdEncoding.DecodeString(str)
-	if err != nil {
-		return "", err
-	}
-	decrypted, err := s.secretsService.Decrypt(context.Background(), decoded)
-	if err != nil {
-		return "", err
-	}
-	return string(decrypted), nil
-}
-
-// encryptAndEncode will encrypt a string with grafana's secretKey, and
-// then encode it with the standard bas64 encoder
-func (s *AuthInfoStore) encryptAndEncode(str string) (string, error) {
-	encrypted, err := s.secretsService.Encrypt(context.Background(), []byte(str), secrets.WithoutScope())
-	if err != nil {
-		return "", err
-	}
-	return base64.StdEncoding.EncodeToString(encrypted), nil
-}
diff --git a/pkg/services/login/authinfoservice/database/stats.go b/pkg/services/login/authinfoservice/database/stats.go
deleted file mode 100644
index c0780f124b68e..0000000000000
--- a/pkg/services/login/authinfoservice/database/stats.go
+++ /dev/null
@@ -1,127 +0,0 @@
-package database
-
-import (
-	"context"
-	"time"
-
-	"github.com/prometheus/client_golang/prometheus"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/login"
-)
-
-// Should be in use in ProvideAuthInfoStore
-// due to query performance for big user tables
-// we have disabled these metrics from Grafana for now
-func InitDuplicateUserMetrics() {
-	login.Once.Do(func() {
-		login.MStatDuplicateUserEntries = prometheus.NewGauge(prometheus.GaugeOpts{
-			Name:      "stat_users_total_duplicate_user_entries",
-			Help:      "total number of duplicate user entries by email or login",
-			Namespace: login.ExporterName,
-		})
-
-		login.MStatHasDuplicateEntries = prometheus.NewGauge(prometheus.GaugeOpts{
-			Name:      "stat_users_has_duplicate_user_entries",
-			Help:      "instance has duplicate user entries by email or login",
-			Namespace: login.ExporterName,
-		})
-
-		login.MStatMixedCasedUsers = prometheus.NewGauge(prometheus.GaugeOpts{
-			Name:      "stat_users_total_mixed_cased_users",
-			Help:      "total number of users with upper and lower case logins or emails",
-			Namespace: login.ExporterName,
-		})
-
-		prometheus.MustRegister(
-			login.MStatDuplicateUserEntries,
-			login.MStatHasDuplicateEntries,
-			login.MStatMixedCasedUsers,
-		)
-	})
-}
-
-func (s *AuthInfoStore) RunMetricsCollection(ctx context.Context) error {
-	// 	if _, err := s.GetLoginStats(ctx); err != nil {
-	// 		s.logger.Warn("Failed to get authinfo metrics", "error", err.Error())
-	// 	}
-	updateStatsTicker := time.NewTicker(login.MetricsCollectionInterval)
-	defer updateStatsTicker.Stop()
-
-	for {
-		select {
-		case <-updateStatsTicker.C:
-			// if _, err := s.GetLoginStats(ctx); err != nil {
-			// s.logger.Warn("Failed to get authinfo metrics", "error", nil)
-			// }
-		case <-ctx.Done():
-			return ctx.Err()
-		}
-	}
-}
-
-func (s *AuthInfoStore) GetLoginStats(ctx context.Context) (login.LoginStats, error) {
-	var stats login.LoginStats
-	outerErr := s.sqlStore.WithDbSession(ctx, func(dbSession *db.Session) error {
-		rawSQL := `SELECT
-		(SELECT COUNT(*) FROM (` + s.duplicateUserEntriesSQL(ctx) + `) AS d WHERE (d.dup_login IS NOT NULL OR d.dup_email IS NOT NULL)) as duplicate_user_entries,
-		(SELECT COUNT(*) FROM (` + s.mixedCasedUsers(ctx) + `) AS mcu) AS mixed_cased_users
-		`
-		_, err := dbSession.SQL(rawSQL).Get(&stats)
-		return err
-	})
-	if outerErr != nil {
-		return stats, outerErr
-	}
-
-	// set prometheus metrics stats
-	login.MStatDuplicateUserEntries.Set(float64(stats.DuplicateUserEntries))
-	if stats.DuplicateUserEntries == 0 {
-		login.MStatHasDuplicateEntries.Set(float64(0))
-	} else {
-		login.MStatHasDuplicateEntries.Set(float64(1))
-	}
-
-	login.MStatMixedCasedUsers.Set(float64(stats.MixedCasedUsers))
-	return stats, nil
-}
-
-func (s *AuthInfoStore) CollectLoginStats(ctx context.Context) (map[string]any, error) {
-	m := map[string]any{}
-
-	loginStats, err := s.GetLoginStats(ctx)
-	if err != nil {
-		s.logger.Error("Failed to get login stats", "error", err)
-		return nil, err
-	}
-	m["stats.users.duplicate_user_entries"] = loginStats.DuplicateUserEntries
-	if loginStats.DuplicateUserEntries > 0 {
-		m["stats.users.has_duplicate_user_entries"] = 1
-	} else {
-		m["stats.users.has_duplicate_user_entries"] = 0
-	}
-	m["stats.users.mixed_cased_users"] = loginStats.MixedCasedUsers
-
-	return m, nil
-}
-
-func (s *AuthInfoStore) duplicateUserEntriesSQL(ctx context.Context) string {
-	userDialect := s.sqlStore.GetDialect().Quote("user")
-	// this query counts how many users have the same login or email.
-	// which might be confusing, but gives a good indication
-	// we want this query to not require too much cpu
-	sqlQuery := `SELECT
-		(SELECT login from ` + userDialect + ` WHERE (LOWER(login) = LOWER(u.login)) AND (login != u.login)) AS dup_login,
-		(SELECT email from ` + userDialect + ` WHERE (LOWER(email) = LOWER(u.email)) AND (email != u.email)) AS dup_email
-	FROM ` + userDialect + ` AS u`
-	return sqlQuery
-}
-
-func (s *AuthInfoStore) mixedCasedUsers(ctx context.Context) string {
-	userDialect := db.DB.GetDialect(s.sqlStore).Quote("user")
-	// this query counts how many users have upper case and lower case login or emails.
-	// why
-	// users login via IDP or service providers get upper cased domains at times :shrug:
-	sqlQuery := `SELECT login, email FROM ` + userDialect + ` WHERE (LOWER(login) != login OR lower(email) != email)`
-	return sqlQuery
-}
diff --git a/pkg/services/login/authinfoservice/service.go b/pkg/services/login/authinfoservice/service.go
deleted file mode 100644
index d6a49cfb28b56..0000000000000
--- a/pkg/services/login/authinfoservice/service.go
+++ /dev/null
@@ -1,215 +0,0 @@
-package authinfoservice
-
-import (
-	"context"
-	"errors"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/infra/usagestats"
-	"github.com/grafana/grafana/pkg/services/login"
-	"github.com/grafana/grafana/pkg/services/user"
-)
-
-const genericOAuthModule = "oauth_generic_oauth"
-
-type Implementation struct {
-	UserProtectionService login.UserProtectionService
-	authInfoStore         login.Store
-	logger                log.Logger
-}
-
-func ProvideAuthInfoService(userProtectionService login.UserProtectionService, authInfoStore login.Store, usageStats usagestats.Service) *Implementation {
-	s := &Implementation{
-		UserProtectionService: userProtectionService,
-		authInfoStore:         authInfoStore,
-		logger:                log.New("login.authinfo"),
-	}
-	// FIXME: disabled metrics until further notice
-	// query performance is slow for more than 20000 users
-	// usageStats.RegisterMetricsFunc(authInfoStore.CollectLoginStats)
-	return s
-}
-
-func (s *Implementation) LookupAndFix(ctx context.Context, query *login.GetUserByAuthInfoQuery) (bool, *user.User, *login.UserAuth, error) {
-	authQuery := &login.GetAuthInfoQuery{}
-
-	// Try to find the user by auth module and id first
-	if query.AuthModule != "" && query.AuthId != "" {
-		authQuery.AuthModule = query.AuthModule
-		authQuery.AuthId = query.AuthId
-
-		userAuth, err := s.authInfoStore.GetAuthInfo(ctx, authQuery)
-		if !errors.Is(err, user.ErrUserNotFound) {
-			if err != nil {
-				return false, nil, nil, err
-			}
-
-			// if user id was specified and doesn't match the user_auth entry, remove it
-			if query.UserLookupParams.UserID != nil &&
-				*query.UserLookupParams.UserID != 0 &&
-				*query.UserLookupParams.UserID != userAuth.UserId {
-				if err := s.authInfoStore.DeleteAuthInfo(ctx, &login.DeleteAuthInfoCommand{
-					UserAuth: userAuth,
-				}); err != nil {
-					s.logger.Error("Error removing user_auth entry", "error", err)
-				}
-
-				return false, nil, nil, user.ErrUserNotFound
-			} else {
-				usr, err := s.authInfoStore.GetUserById(ctx, userAuth.UserId)
-				if err != nil {
-					if errors.Is(err, user.ErrUserNotFound) {
-						// if the user has been deleted then remove the entry
-						if errDel := s.authInfoStore.DeleteAuthInfo(ctx, &login.DeleteAuthInfoCommand{
-							UserAuth: userAuth,
-						}); errDel != nil {
-							s.logger.Error("Error removing user_auth entry", "error", errDel)
-						}
-
-						return false, nil, nil, user.ErrUserNotFound
-					}
-
-					return false, nil, nil, err
-				}
-
-				return true, usr, userAuth, nil
-			}
-		}
-	}
-
-	return false, nil, nil, user.ErrUserNotFound
-}
-
-func (s *Implementation) LookupByOneOf(ctx context.Context, params *login.UserLookupParams) (*user.User, error) {
-	var usr *user.User
-	var err error
-
-	// If not found, try to find the user by id
-	if params.UserID != nil && *params.UserID != 0 {
-		usr, err = s.authInfoStore.GetUserById(ctx, *params.UserID)
-		if err != nil && !errors.Is(err, user.ErrUserNotFound) {
-			return nil, err
-		}
-	}
-
-	// If not found, try to find the user by email address
-	if usr == nil && params.Email != nil && *params.Email != "" {
-		usr, err = s.authInfoStore.GetUserByEmail(ctx, *params.Email)
-		if err != nil && !errors.Is(err, user.ErrUserNotFound) {
-			return nil, err
-		}
-	}
-
-	// If not found, try to find the user by login
-	if usr == nil && params.Login != nil && *params.Login != "" {
-		usr, err = s.authInfoStore.GetUserByLogin(ctx, *params.Login)
-		if err != nil && !errors.Is(err, user.ErrUserNotFound) {
-			return nil, err
-		}
-	}
-
-	if usr == nil {
-		return nil, user.ErrUserNotFound
-	}
-
-	return usr, nil
-}
-
-func (s *Implementation) GenericOAuthLookup(ctx context.Context, authModule string, authId string, userID int64) (*login.UserAuth, error) {
-	if authModule == genericOAuthModule && userID != 0 {
-		authQuery := &login.GetAuthInfoQuery{}
-		authQuery.AuthModule = authModule
-		authQuery.AuthId = authId
-		authQuery.UserId = userID
-		userAuth, err := s.authInfoStore.GetAuthInfo(ctx, authQuery)
-		if err != nil {
-			return nil, err
-		}
-
-		return userAuth, nil
-	}
-	return nil, nil
-}
-
-func (s *Implementation) LookupAndUpdate(ctx context.Context, query *login.GetUserByAuthInfoQuery) (*user.User, error) {
-	// 1. LookupAndFix = auth info, user, error
-	// TODO: Not a big fan of the fact that we are deleting auth info here, might want to move that
-	foundUser, usr, authInfo, err := s.LookupAndFix(ctx, query)
-	if err != nil && !errors.Is(err, user.ErrUserNotFound) {
-		return nil, err
-	}
-
-	// 2. FindByUserDetails
-	if !foundUser {
-		usr, err = s.LookupByOneOf(ctx, &query.UserLookupParams)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if err := s.UserProtectionService.AllowUserMapping(usr, query.AuthModule); err != nil {
-		return nil, err
-	}
-
-	// Special case for generic oauth duplicates
-	ai, err := s.GenericOAuthLookup(ctx, query.AuthModule, query.AuthId, usr.ID)
-	if !errors.Is(err, user.ErrUserNotFound) {
-		if err != nil {
-			return nil, err
-		}
-	}
-	if ai != nil {
-		authInfo = ai
-	}
-
-	if query.AuthModule != "" {
-		if authInfo == nil {
-			cmd := &login.SetAuthInfoCommand{
-				UserId:     usr.ID,
-				AuthModule: query.AuthModule,
-				AuthId:     query.AuthId,
-			}
-			if err := s.authInfoStore.SetAuthInfo(ctx, cmd); err != nil {
-				return nil, err
-			}
-		} else {
-			if err := s.authInfoStore.UpdateAuthInfoDate(ctx, authInfo); err != nil {
-				return nil, err
-			}
-		}
-	}
-
-	return usr, nil
-}
-
-func (s *Implementation) GetAuthInfo(ctx context.Context, query *login.GetAuthInfoQuery) (*login.UserAuth, error) {
-	return s.authInfoStore.GetAuthInfo(ctx, query)
-}
-
-func (s *Implementation) GetUserLabels(ctx context.Context, query login.GetUserLabelsQuery) (map[int64]string, error) {
-	if len(query.UserIDs) == 0 {
-		return map[int64]string{}, nil
-	}
-	return s.authInfoStore.GetUserLabels(ctx, query)
-}
-
-func (s *Implementation) UpdateAuthInfo(ctx context.Context, cmd *login.UpdateAuthInfoCommand) error {
-	return s.authInfoStore.UpdateAuthInfo(ctx, cmd)
-}
-
-func (s *Implementation) SetAuthInfo(ctx context.Context, cmd *login.SetAuthInfoCommand) error {
-	return s.authInfoStore.SetAuthInfo(ctx, cmd)
-}
-
-func (s *Implementation) GetExternalUserInfoByLogin(ctx context.Context, query *login.GetExternalUserInfoByLoginQuery) (*login.ExternalUserInfo, error) {
-	return s.authInfoStore.GetExternalUserInfoByLogin(ctx, query)
-}
-
-func (s *Implementation) DeleteUserAuthInfo(ctx context.Context, userID int64) error {
-	return s.authInfoStore.DeleteUserAuthInfo(ctx, userID)
-}
-
-func (s *Implementation) Run(ctx context.Context) error {
-	s.logger.Debug("Started AuthInfo Metrics collection service")
-	return s.authInfoStore.RunMetricsCollection(ctx)
-}
diff --git a/pkg/services/login/authinfoservice/user_auth_test.go b/pkg/services/login/authinfoservice/user_auth_test.go
deleted file mode 100644
index eb524adde84d5..0000000000000
--- a/pkg/services/login/authinfoservice/user_auth_test.go
+++ /dev/null
@@ -1,571 +0,0 @@
-package authinfoservice
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-	"golang.org/x/oauth2"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/infra/usagestats"
-	"github.com/grafana/grafana/pkg/services/login"
-	"github.com/grafana/grafana/pkg/services/login/authinfoservice/database"
-	"github.com/grafana/grafana/pkg/services/org/orgimpl"
-	"github.com/grafana/grafana/pkg/services/quota/quotaimpl"
-	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
-	"github.com/grafana/grafana/pkg/services/user"
-	"github.com/grafana/grafana/pkg/services/user/userimpl"
-)
-
-//nolint:goconst
-func TestUserAuth(t *testing.T) {
-	sqlStore := db.InitTestDB(t)
-	authInfoStore := newFakeAuthInfoStore()
-	srv := ProvideAuthInfoService(
-		&OSSUserProtectionImpl{},
-		authInfoStore,
-		&usagestats.UsageStatsMock{},
-	)
-
-	t.Run("Given 5 users", func(t *testing.T) {
-		qs := quotaimpl.ProvideService(sqlStore, sqlStore.Cfg)
-		orgSvc, err := orgimpl.ProvideService(sqlStore, sqlStore.Cfg, qs)
-		require.NoError(t, err)
-		usrSvc, err := userimpl.ProvideService(sqlStore, orgSvc, sqlStore.Cfg, nil, nil, qs, supportbundlestest.NewFakeBundleService())
-		require.NoError(t, err)
-
-		for i := 0; i < 5; i++ {
-			cmd := user.CreateUserCommand{
-				Email: fmt.Sprint("user", i, "@test.com"),
-				Name:  fmt.Sprint("user", i),
-				Login: fmt.Sprint("loginuser", i),
-			}
-			_, err := usrSvc.Create(context.Background(), &cmd)
-			require.Nil(t, err)
-		}
-
-		t.Run("Can find existing user", func(t *testing.T) {
-			// By Login
-			userlogin := "loginuser0"
-			authInfoStore.ExpectedUser = &user.User{
-				Login: "loginuser0",
-				ID:    1,
-				Email: "user1@test.com",
-			}
-			query := &login.GetUserByAuthInfoQuery{UserLookupParams: login.UserLookupParams{Login: &userlogin}}
-			usr, err := srv.LookupAndUpdate(context.Background(), query)
-
-			require.Nil(t, err)
-			require.Equal(t, usr.Login, userlogin)
-
-			// By ID
-			id := usr.ID
-
-			usr, err = srv.LookupByOneOf(context.Background(), &login.UserLookupParams{
-				UserID: &id,
-			})
-
-			require.Nil(t, err)
-			require.Equal(t, usr.ID, id)
-
-			// By Email
-			email := "user1@test.com"
-
-			usr, err = srv.LookupByOneOf(context.Background(), &login.UserLookupParams{
-				Email: &email,
-			})
-
-			require.Nil(t, err)
-			require.Equal(t, usr.Email, email)
-
-			authInfoStore.ExpectedUser = nil
-			// Don't find nonexistent user
-			email = "nonexistent@test.com"
-
-			usr, err = srv.LookupByOneOf(context.Background(), &login.UserLookupParams{
-				Email: &email,
-			})
-
-			require.Equal(t, user.ErrUserNotFound, err)
-			require.Nil(t, usr)
-		})
-
-		t.Run("Can set & locate by AuthModule and AuthId", func(t *testing.T) {
-			// get nonexistent user_auth entry
-			authInfoStore.ExpectedUser = &user.User{}
-			authInfoStore.ExpectedError = user.ErrUserNotFound
-			query := &login.GetUserByAuthInfoQuery{AuthModule: "test", AuthId: "test"}
-			usr, err := srv.LookupAndUpdate(context.Background(), query)
-
-			require.Equal(t, user.ErrUserNotFound, err)
-			require.Nil(t, usr)
-
-			// create user_auth entry
-			userlogin := "loginuser0"
-			authInfoStore.ExpectedUser = &user.User{Login: "loginuser0", ID: 1, Email: ""}
-			authInfoStore.ExpectedError = nil
-			authInfoStore.ExpectedOAuth = &login.UserAuth{Id: 1}
-			query.UserLookupParams.Login = &userlogin
-			usr, err = srv.LookupAndUpdate(context.Background(), query)
-
-			require.Nil(t, err)
-			require.Equal(t, usr.Login, userlogin)
-
-			// get via user_auth
-			query = &login.GetUserByAuthInfoQuery{AuthModule: "test", AuthId: "test"}
-			usr, err = srv.LookupAndUpdate(context.Background(), query)
-
-			require.Nil(t, err)
-			require.Equal(t, usr.Login, userlogin)
-
-			// get with non-matching id
-			idPlusOne := usr.ID + 1
-
-			authInfoStore.ExpectedUser.Login = "loginuser1"
-			query.UserLookupParams.UserID = &idPlusOne
-			usr, err = srv.LookupAndUpdate(context.Background(), query)
-
-			require.Nil(t, err)
-			require.Equal(t, usr.Login, "loginuser1")
-
-			// get via user_auth
-			query = &login.GetUserByAuthInfoQuery{AuthModule: "test", AuthId: "test"}
-			usr, err = srv.LookupAndUpdate(context.Background(), query)
-
-			require.Nil(t, err)
-			require.Equal(t, usr.Login, "loginuser1")
-
-			// remove user
-			err = sqlStore.WithDbSession(context.Background(), func(sess *db.Session) error {
-				_, err := sess.Exec("DELETE FROM "+sqlStore.Dialect.Quote("user")+" WHERE id=?", usr.ID)
-				return err
-			})
-			require.NoError(t, err)
-
-			authInfoStore.ExpectedUser = nil
-			authInfoStore.ExpectedError = user.ErrUserNotFound
-			// get via user_auth for deleted user
-			query = &login.GetUserByAuthInfoQuery{AuthModule: "test", AuthId: "test"}
-			usr, err = srv.LookupAndUpdate(context.Background(), query)
-
-			require.Equal(t, err, user.ErrUserNotFound)
-			require.Nil(t, usr)
-		})
-
-		t.Run("Can set & retrieve oauth token information", func(t *testing.T) {
-			token := &oauth2.Token{
-				AccessToken:  "testaccess",
-				RefreshToken: "testrefresh",
-				Expiry:       time.Now(),
-				TokenType:    "Bearer",
-			}
-			idToken := "testidtoken"
-			token = token.WithExtra(map[string]any{"id_token": idToken})
-
-			// Find a user to set tokens on
-			userlogin := "loginuser0"
-			authInfoStore.ExpectedUser = &user.User{Login: "loginuser0", ID: 1, Email: ""}
-			authInfoStore.ExpectedError = nil
-			authInfoStore.ExpectedOAuth = &login.UserAuth{
-				Id:                1,
-				OAuthAccessToken:  token.AccessToken,
-				OAuthRefreshToken: token.RefreshToken,
-				OAuthTokenType:    token.TokenType,
-				OAuthIdToken:      idToken,
-				OAuthExpiry:       token.Expiry,
-			}
-			// Calling GetUserByAuthInfoQuery on an existing user will populate an entry in the user_auth table
-			query := &login.GetUserByAuthInfoQuery{AuthModule: "test", AuthId: "test", UserLookupParams: login.UserLookupParams{
-				Login: &userlogin,
-			}}
-			user, err := srv.LookupAndUpdate(context.Background(), query)
-
-			require.Nil(t, err)
-			require.Equal(t, user.Login, userlogin)
-
-			cmd := &login.UpdateAuthInfoCommand{
-				UserId:     user.ID,
-				AuthId:     query.AuthId,
-				AuthModule: query.AuthModule,
-				OAuthToken: token,
-			}
-			err = srv.authInfoStore.UpdateAuthInfo(context.Background(), cmd)
-
-			require.Nil(t, err)
-
-			getAuthQuery := &login.GetAuthInfoQuery{
-				UserId: user.ID,
-			}
-
-			authInfo, err := srv.authInfoStore.GetAuthInfo(context.Background(), getAuthQuery)
-
-			require.Nil(t, err)
-			require.Equal(t, token.AccessToken, authInfo.OAuthAccessToken)
-			require.Equal(t, token.RefreshToken, authInfo.OAuthRefreshToken)
-			require.Equal(t, token.TokenType, authInfo.OAuthTokenType)
-			require.Equal(t, idToken, authInfo.OAuthIdToken)
-		})
-
-		t.Run("Always return the most recently used auth_module", func(t *testing.T) {
-			// Restore after destructive operation
-			sqlStore = db.InitTestDB(t)
-			qs := quotaimpl.ProvideService(sqlStore, sqlStore.Cfg)
-			orgSvc, err := orgimpl.ProvideService(sqlStore, sqlStore.Cfg, qs)
-			require.NoError(t, err)
-			usrSvc, err := userimpl.ProvideService(sqlStore, orgSvc, sqlStore.Cfg, nil, nil, qs, supportbundlestest.NewFakeBundleService())
-			require.NoError(t, err)
-
-			for i := 0; i < 5; i++ {
-				cmd := user.CreateUserCommand{
-					Email: fmt.Sprint("user", i, "@test.com"),
-					Name:  fmt.Sprint("user", i),
-					Login: fmt.Sprint("loginuser", i),
-				}
-				_, err = usrSvc.Create(context.Background(), &cmd)
-				require.NoError(t, err)
-			}
-
-			// Find a user to set tokens on
-			userlogin := "loginuser0"
-
-			// Calling srv.LookupAndUpdateQuery on an existing user will populate an entry in the user_auth table
-			// Make the first log-in during the past
-			database.GetTime = func() time.Time { return time.Now().AddDate(0, 0, -2) }
-			query := &login.GetUserByAuthInfoQuery{AuthModule: "test1", AuthId: "test1", UserLookupParams: login.UserLookupParams{
-				Login: &userlogin,
-			}}
-			user, err := srv.LookupAndUpdate(context.Background(), query)
-			database.GetTime = time.Now
-
-			require.Nil(t, err)
-			require.Equal(t, user.Login, userlogin)
-
-			// Add a second auth module for this user
-			// Have this module's last log-in be more recent
-			database.GetTime = func() time.Time { return time.Now().AddDate(0, 0, -1) }
-			query = &login.GetUserByAuthInfoQuery{AuthModule: "test2", AuthId: "test2", UserLookupParams: login.UserLookupParams{
-				Login: &userlogin,
-			}}
-			user, err = srv.LookupAndUpdate(context.Background(), query)
-			database.GetTime = time.Now
-
-			require.Nil(t, err)
-			require.Equal(t, user.Login, userlogin)
-			authInfoStore.ExpectedOAuth.AuthModule = "test2"
-			// Get the latest entry by not supply an authmodule or authid
-			getAuthQuery := &login.GetAuthInfoQuery{
-				UserId: user.ID,
-			}
-
-			authInfo, err := authInfoStore.GetAuthInfo(context.Background(), getAuthQuery)
-
-			require.Nil(t, err)
-			require.Equal(t, authInfo.AuthModule, "test2")
-
-			// "log in" again with the first auth module
-			updateAuthCmd := &login.UpdateAuthInfoCommand{UserId: user.ID, AuthModule: "test1", AuthId: "test1"}
-			err = authInfoStore.UpdateAuthInfo(context.Background(), updateAuthCmd)
-
-			require.Nil(t, err)
-			authInfoStore.ExpectedOAuth.AuthModule = "test1"
-			// Get the latest entry by not supply an authmodule or authid
-			getAuthQuery = &login.GetAuthInfoQuery{
-				UserId: user.ID,
-			}
-
-			authInfo, err = authInfoStore.GetAuthInfo(context.Background(), getAuthQuery)
-
-			require.Nil(t, err)
-			require.Equal(t, authInfo.AuthModule, "test1")
-		})
-
-		t.Run("Keeps track of last used auth_module when not using oauth", func(t *testing.T) {
-			// Restore after destructive operation
-			sqlStore = db.InitTestDB(t)
-			qs := quotaimpl.ProvideService(sqlStore, sqlStore.Cfg)
-			orgSvc, err := orgimpl.ProvideService(sqlStore, sqlStore.Cfg, qs)
-			require.NoError(t, err)
-			usrSvc, err := userimpl.ProvideService(sqlStore, orgSvc, sqlStore.Cfg, nil, nil, qs, supportbundlestest.NewFakeBundleService())
-			require.NoError(t, err)
-
-			for i := 0; i < 5; i++ {
-				cmd := user.CreateUserCommand{
-					Email: fmt.Sprint("user", i, "@test.com"),
-					Name:  fmt.Sprint("user", i),
-					Login: fmt.Sprint("loginuser", i),
-				}
-				_, err := usrSvc.Create(context.Background(), &cmd)
-				require.Nil(t, err)
-			}
-
-			// Find a user to set tokens on
-			userlogin := "loginuser0"
-
-			fixedTime := time.Now()
-			// Calling srv.LookupAndUpdateQuery on an existing user will populate an entry in the user_auth table
-			// Make the first log-in during the past
-			database.GetTime = func() time.Time { return fixedTime.AddDate(0, 0, -2) }
-			queryOne := &login.GetUserByAuthInfoQuery{AuthModule: "test1", AuthId: "test1", UserLookupParams: login.UserLookupParams{
-				Login: &userlogin,
-			}}
-			user, err := srv.LookupAndUpdate(context.Background(), queryOne)
-			database.GetTime = time.Now
-
-			require.Nil(t, err)
-			require.Equal(t, user.Login, userlogin)
-
-			// Add a second auth module for this user
-			// Have this module's last log-in be more recent
-			database.GetTime = func() time.Time { return fixedTime.AddDate(0, 0, -1) }
-			queryTwo := &login.GetUserByAuthInfoQuery{AuthModule: "test2", AuthId: "test2", UserLookupParams: login.UserLookupParams{
-				Login: &userlogin,
-			}}
-			user, err = srv.LookupAndUpdate(context.Background(), queryTwo)
-			require.Nil(t, err)
-			require.Equal(t, user.Login, userlogin)
-
-			// Get the latest entry by not supply an authmodule or authid
-			getAuthQuery := &login.GetAuthInfoQuery{
-				UserId: user.ID,
-			}
-			authInfoStore.ExpectedOAuth.AuthModule = "test2"
-
-			authInfo, err := authInfoStore.GetAuthInfo(context.Background(), getAuthQuery)
-
-			require.Nil(t, err)
-			require.Equal(t, "test2", authInfo.AuthModule)
-
-			// Now reuse first auth module and make sure it's updated to the most recent
-			database.GetTime = func() time.Time { return fixedTime }
-
-			// add oauth info to auth_info to make sure update date does not overwrite it
-			updateAuthCmd := &login.UpdateAuthInfoCommand{UserId: user.ID, AuthModule: "test1", AuthId: "test1", OAuthToken: &oauth2.Token{
-				AccessToken:  "access_token",
-				TokenType:    "token_type",
-				RefreshToken: "refresh_token",
-				Expiry:       fixedTime,
-			}}
-			err = authInfoStore.UpdateAuthInfo(context.Background(), updateAuthCmd)
-			require.Nil(t, err)
-			user, err = srv.LookupAndUpdate(context.Background(), queryOne)
-
-			require.Nil(t, err)
-			require.Equal(t, user.Login, userlogin)
-			authInfoStore.ExpectedOAuth.AuthModule = "test1"
-			authInfoStore.ExpectedOAuth.OAuthAccessToken = "access_token"
-			authInfo, err = authInfoStore.GetAuthInfo(context.Background(), getAuthQuery)
-
-			require.Nil(t, err)
-			require.Equal(t, "test1", authInfo.AuthModule)
-			// make sure oauth info is not overwritten by update date
-			require.Equal(t, "access_token", authInfo.OAuthAccessToken)
-
-			// Now reuse second auth module and make sure it's updated to the most recent
-			database.GetTime = func() time.Time { return fixedTime.AddDate(0, 0, 1) }
-			user, err = srv.LookupAndUpdate(context.Background(), queryTwo)
-			require.Nil(t, err)
-			require.Equal(t, user.Login, userlogin)
-			authInfoStore.ExpectedOAuth.AuthModule = "test2"
-
-			authInfo, err = authInfoStore.GetAuthInfo(context.Background(), getAuthQuery)
-			require.Nil(t, err)
-			require.Equal(t, "test2", authInfo.AuthModule)
-
-			// Ensure test 1 did not have its entry modified
-			getAuthQueryUnchanged := &login.GetAuthInfoQuery{
-				UserId:     user.ID,
-				AuthModule: "test1",
-			}
-			authInfoStore.ExpectedOAuth.AuthModule = "test1"
-
-			authInfo, err = authInfoStore.GetAuthInfo(context.Background(), getAuthQueryUnchanged)
-			require.Nil(t, err)
-			require.Equal(t, "test1", authInfo.AuthModule)
-		})
-
-		t.Run("Can set & locate by generic oauth auth module and user id", func(t *testing.T) {
-			// Find a user to set tokens on
-			userlogin := "loginuser0"
-
-			// Expect to pass since there's a matching login user
-			database.GetTime = func() time.Time { return time.Now().AddDate(0, 0, -2) }
-			query := &login.GetUserByAuthInfoQuery{AuthModule: genericOAuthModule, AuthId: "", UserLookupParams: login.UserLookupParams{
-				Login: &userlogin,
-			}}
-			user, err := srv.LookupAndUpdate(context.Background(), query)
-			database.GetTime = time.Now
-
-			require.Nil(t, err)
-			require.Equal(t, user.Login, userlogin)
-
-			otherLoginUser := "aloginuser"
-			// Should throw a "user not found" error since there's no matching login user
-			database.GetTime = func() time.Time { return time.Now().AddDate(0, 0, -2) }
-			query = &login.GetUserByAuthInfoQuery{AuthModule: genericOAuthModule, AuthId: "", UserLookupParams: login.UserLookupParams{
-				Login: &otherLoginUser,
-			}}
-			authInfoStore.ExpectedError = errors.New("some error")
-
-			user, err = srv.LookupAndUpdate(context.Background(), query)
-			database.GetTime = time.Now
-
-			require.NotNil(t, err)
-			require.Nil(t, user)
-			authInfoStore.ExpectedError = nil
-		})
-
-		t.Run("should be able to run loginstats query in all dbs", func(t *testing.T) {
-			// we need to see that we can run queries for all db
-			// as it is only a concern for postgres/sqllite3
-			// where we have duplicate users
-
-			// Restore after destructive operation
-			sqlStore = db.InitTestDB(t)
-			qs := quotaimpl.ProvideService(sqlStore, sqlStore.Cfg)
-			orgSvc, err := orgimpl.ProvideService(sqlStore, sqlStore.Cfg, qs)
-			require.NoError(t, err)
-			usrSvc, err := userimpl.ProvideService(sqlStore, orgSvc, sqlStore.Cfg, nil, nil, qs, supportbundlestest.NewFakeBundleService())
-			require.NoError(t, err)
-			for i := 0; i < 5; i++ {
-				cmd := user.CreateUserCommand{
-					Email: fmt.Sprint("user", i, "@test.com"),
-					Name:  fmt.Sprint("user", i),
-					Login: fmt.Sprint("loginuser", i),
-					OrgID: 1,
-				}
-				_, err := usrSvc.Create(context.Background(), &cmd)
-				require.Nil(t, err)
-			}
-
-			_, err = srv.authInfoStore.GetLoginStats(context.Background())
-			require.Nil(t, err)
-		})
-
-		t.Run("calculate metrics on duplicate userstats", func(t *testing.T) {
-			// Restore after destructive operation
-			sqlStore = db.InitTestDB(t)
-			qs := quotaimpl.ProvideService(sqlStore, sqlStore.Cfg)
-			orgSvc, err := orgimpl.ProvideService(sqlStore, sqlStore.Cfg, qs)
-			require.NoError(t, err)
-			usrSvc, err := userimpl.ProvideService(sqlStore, orgSvc, sqlStore.Cfg, nil, nil, qs, supportbundlestest.NewFakeBundleService())
-			require.NoError(t, err)
-
-			for i := 0; i < 5; i++ {
-				cmd := user.CreateUserCommand{
-					Email: fmt.Sprint("user", i, "@test.com"),
-					Name:  fmt.Sprint("user", i),
-					Login: fmt.Sprint("loginuser", i),
-					OrgID: 1,
-				}
-				_, err := usrSvc.Create(context.Background(), &cmd)
-				require.Nil(t, err)
-			}
-
-			// "Skipping duplicate users test for mysql as it does make unique constraint case insensitive by default
-			if sqlStore.GetDialect().DriverName() != "mysql" {
-				dupUserEmailcmd := user.CreateUserCommand{
-					Email: "USERDUPLICATETEST1@TEST.COM",
-					Name:  "user name 1",
-					Login: "USER_DUPLICATE_TEST_1_LOGIN",
-				}
-				_, err := usrSvc.Create(context.Background(), &dupUserEmailcmd)
-				require.NoError(t, err)
-
-				// add additional user with duplicate login where DOMAIN is upper case
-				dupUserLogincmd := user.CreateUserCommand{
-					Email: "userduplicatetest1@test.com",
-					Name:  "user name 1",
-					Login: "user_duplicate_test_1_login",
-				}
-				_, err = usrSvc.Create(context.Background(), &dupUserLogincmd)
-				require.NoError(t, err)
-				authInfoStore.ExpectedUser = &user.User{
-					Email: "userduplicatetest1@test.com",
-					Name:  "user name 1",
-					Login: "user_duplicate_test_1_login",
-				}
-				authInfoStore.ExpectedDuplicateUserEntries = 2
-				authInfoStore.ExpectedHasDuplicateUserEntries = 1
-				authInfoStore.ExpectedLoginStats = login.LoginStats{
-					DuplicateUserEntries: 2,
-					MixedCasedUsers:      1,
-				}
-				// require metrics and statistics to be 2
-				m, err := srv.authInfoStore.CollectLoginStats(context.Background())
-				require.NoError(t, err)
-				require.Equal(t, 2, m["stats.users.duplicate_user_entries"])
-				require.Equal(t, 1, m["stats.users.has_duplicate_user_entries"])
-
-				require.Equal(t, 1, m["stats.users.mixed_cased_users"])
-			}
-		})
-	})
-}
-
-type FakeAuthInfoStore struct {
-	login.AuthInfoService
-	ExpectedError                   error
-	ExpectedUser                    *user.User
-	ExpectedOAuth                   *login.UserAuth
-	ExpectedDuplicateUserEntries    int
-	ExpectedHasDuplicateUserEntries int
-	ExpectedLoginStats              login.LoginStats
-}
-
-func newFakeAuthInfoStore() *FakeAuthInfoStore {
-	return &FakeAuthInfoStore{}
-}
-
-func (f *FakeAuthInfoStore) GetExternalUserInfoByLogin(ctx context.Context, query *login.GetExternalUserInfoByLoginQuery) (*login.ExternalUserInfo, error) {
-	return nil, f.ExpectedError
-}
-func (f *FakeAuthInfoStore) GetAuthInfo(ctx context.Context, query *login.GetAuthInfoQuery) (*login.UserAuth, error) {
-	return f.ExpectedOAuth, f.ExpectedError
-}
-func (f *FakeAuthInfoStore) SetAuthInfo(ctx context.Context, cmd *login.SetAuthInfoCommand) error {
-	return f.ExpectedError
-}
-func (f *FakeAuthInfoStore) UpdateAuthInfoDate(ctx context.Context, authInfo *login.UserAuth) error {
-	return f.ExpectedError
-}
-func (f *FakeAuthInfoStore) UpdateAuthInfo(ctx context.Context, cmd *login.UpdateAuthInfoCommand) error {
-	return f.ExpectedError
-}
-func (f *FakeAuthInfoStore) DeleteAuthInfo(ctx context.Context, cmd *login.DeleteAuthInfoCommand) error {
-	return f.ExpectedError
-}
-func (f *FakeAuthInfoStore) GetUserById(ctx context.Context, id int64) (*user.User, error) {
-	return f.ExpectedUser, f.ExpectedError
-}
-
-func (f *FakeAuthInfoStore) GetUserByLogin(ctx context.Context, login string) (*user.User, error) {
-	return f.ExpectedUser, f.ExpectedError
-}
-
-func (f *FakeAuthInfoStore) GetUserByEmail(ctx context.Context, email string) (*user.User, error) {
-	return f.ExpectedUser, f.ExpectedError
-}
-
-func (f *FakeAuthInfoStore) CollectLoginStats(ctx context.Context) (map[string]any, error) {
-	var res = make(map[string]any)
-	res["stats.users.duplicate_user_entries"] = f.ExpectedDuplicateUserEntries
-	res["stats.users.has_duplicate_user_entries"] = f.ExpectedHasDuplicateUserEntries
-	res["stats.users.duplicate_user_entries_by_login"] = 0
-	res["stats.users.has_duplicate_user_entries_by_login"] = 0
-	res["stats.users.duplicate_user_entries_by_email"] = 0
-	res["stats.users.has_duplicate_user_entries_by_email"] = 0
-	res["stats.users.mixed_cased_users"] = f.ExpectedLoginStats.MixedCasedUsers
-	return res, f.ExpectedError
-}
-
-func (f *FakeAuthInfoStore) RunMetricsCollection(ctx context.Context) error {
-	return f.ExpectedError
-}
-
-func (f *FakeAuthInfoStore) GetLoginStats(ctx context.Context) (login.LoginStats, error) {
-	return f.ExpectedLoginStats, f.ExpectedError
-}
diff --git a/pkg/services/login/authinfotest/fake.go b/pkg/services/login/authinfotest/fake.go
new file mode 100644
index 0000000000000..730af8b8f734a
--- /dev/null
+++ b/pkg/services/login/authinfotest/fake.go
@@ -0,0 +1,48 @@
+package authinfotest
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/services/login"
+)
+
+type FakeService struct {
+	login.AuthInfoService
+	LatestUserID         int64
+	ExpectedUserAuth     *login.UserAuth
+	ExpectedExternalUser *login.ExternalUserInfo
+	ExpectedError        error
+	ExpectedLabels       map[int64]string
+
+	SetAuthInfoFn    func(ctx context.Context, cmd *login.SetAuthInfoCommand) error
+	UpdateAuthInfoFn func(ctx context.Context, cmd *login.UpdateAuthInfoCommand) error
+}
+
+func (a *FakeService) GetAuthInfo(ctx context.Context, query *login.GetAuthInfoQuery) (*login.UserAuth, error) {
+	a.LatestUserID = query.UserId
+	return a.ExpectedUserAuth, a.ExpectedError
+}
+
+func (a *FakeService) GetUserLabels(ctx context.Context, query login.GetUserLabelsQuery) (map[int64]string, error) {
+	return a.ExpectedLabels, a.ExpectedError
+}
+
+func (a *FakeService) SetAuthInfo(ctx context.Context, cmd *login.SetAuthInfoCommand) error {
+	if a.SetAuthInfoFn != nil {
+		return a.SetAuthInfoFn(ctx, cmd)
+	}
+
+	return a.ExpectedError
+}
+
+func (a *FakeService) UpdateAuthInfo(ctx context.Context, cmd *login.UpdateAuthInfoCommand) error {
+	if a.UpdateAuthInfoFn != nil {
+		return a.UpdateAuthInfoFn(ctx, cmd)
+	}
+
+	return a.ExpectedError
+}
+
+func (a *FakeService) DeleteUserAuthInfo(ctx context.Context, userID int64) error {
+	return a.ExpectedError
+}
diff --git a/pkg/services/login/logintest/logintest.go b/pkg/services/login/logintest/logintest.go
deleted file mode 100644
index f48e32253a025..0000000000000
--- a/pkg/services/login/logintest/logintest.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package logintest
-
-import (
-	"context"
-
-	"github.com/grafana/grafana/pkg/services/login"
-	"github.com/grafana/grafana/pkg/services/user"
-)
-
-type AuthInfoServiceFake struct {
-	login.AuthInfoService
-	LatestUserID         int64
-	ExpectedUserAuth     *login.UserAuth
-	ExpectedUser         *user.User
-	ExpectedExternalUser *login.ExternalUserInfo
-	ExpectedError        error
-	ExpectedLabels       map[int64]string
-
-	SetAuthInfoFn    func(ctx context.Context, cmd *login.SetAuthInfoCommand) error
-	UpdateAuthInfoFn func(ctx context.Context, cmd *login.UpdateAuthInfoCommand) error
-}
-
-func (a *AuthInfoServiceFake) LookupAndUpdate(ctx context.Context, query *login.GetUserByAuthInfoQuery) (*user.User, error) {
-	if query.UserLookupParams.UserID != nil {
-		a.LatestUserID = *query.UserLookupParams.UserID
-	} else {
-		a.LatestUserID = 0
-	}
-	return a.ExpectedUser, a.ExpectedError
-}
-
-func (a *AuthInfoServiceFake) GetAuthInfo(ctx context.Context, query *login.GetAuthInfoQuery) (*login.UserAuth, error) {
-	a.LatestUserID = query.UserId
-	return a.ExpectedUserAuth, a.ExpectedError
-}
-
-func (a *AuthInfoServiceFake) GetUserLabels(ctx context.Context, query login.GetUserLabelsQuery) (map[int64]string, error) {
-	return a.ExpectedLabels, a.ExpectedError
-}
-
-func (a *AuthInfoServiceFake) SetAuthInfo(ctx context.Context, cmd *login.SetAuthInfoCommand) error {
-	if a.SetAuthInfoFn != nil {
-		return a.SetAuthInfoFn(ctx, cmd)
-	}
-
-	return a.ExpectedError
-}
-
-func (a *AuthInfoServiceFake) UpdateAuthInfo(ctx context.Context, cmd *login.UpdateAuthInfoCommand) error {
-	if a.UpdateAuthInfoFn != nil {
-		return a.UpdateAuthInfoFn(ctx, cmd)
-	}
-
-	return a.ExpectedError
-}
-
-func (a *AuthInfoServiceFake) GetExternalUserInfoByLogin(ctx context.Context, query *login.GetExternalUserInfoByLoginQuery) (*login.ExternalUserInfo, error) {
-	return a.ExpectedExternalUser, a.ExpectedError
-}
-
-func (a *AuthInfoServiceFake) DeleteUserAuthInfo(ctx context.Context, userID int64) error {
-	return a.ExpectedError
-}
diff --git a/pkg/services/login/model.go b/pkg/services/login/model.go
index d8401df48245d..3ec4b55d99eb3 100644
--- a/pkg/services/login/model.go
+++ b/pkg/services/login/model.go
@@ -2,10 +2,8 @@ package login
 
 import (
 	"fmt"
-	"sync"
 	"time"
 
-	"github.com/prometheus/client_golang/prometheus"
 	"golang.org/x/oauth2"
 
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
@@ -14,30 +12,6 @@ import (
 	"github.com/grafana/grafana/pkg/setting"
 )
 
-type LoginStats struct {
-	DuplicateUserEntries int `xorm:"duplicate_user_entries"`
-	MixedCasedUsers      int `xorm:"mixed_cased_users"`
-}
-
-const (
-	ExporterName              = "grafana"
-	MetricsCollectionInterval = time.Hour * 4 // every 4 hours, indication of duplicate users
-)
-
-var (
-	// MStatDuplicateUserEntries is a indication metric gauge for number of users with duplicate emails or logins
-	MStatDuplicateUserEntries prometheus.Gauge
-
-	// MStatHasDuplicateEntries is a metric for if there is duplicate users
-	MStatHasDuplicateEntries prometheus.Gauge
-
-	// MStatMixedCasedUsers is a metric for if there is duplicate users
-	MStatMixedCasedUsers prometheus.Gauge
-
-	Once        sync.Once
-	Initialised bool = false
-)
-
 type UserAuth struct {
 	Id                int64
 	UserId            int64
@@ -135,10 +109,6 @@ type UserLookupParams struct {
 	Login  *string // if set, will try to find the user by login
 }
 
-type GetExternalUserInfoByLoginQuery struct {
-	LoginOrEmail string
-}
-
 type GetAuthInfoQuery struct {
 	UserId     int64
 	AuthModule string
diff --git a/pkg/services/loginattempt/loginattemptimpl/login_attempt.go b/pkg/services/loginattempt/loginattemptimpl/login_attempt.go
index 6686fb3645a0c..611d83b0d5fc4 100644
--- a/pkg/services/loginattempt/loginattemptimpl/login_attempt.go
+++ b/pkg/services/loginattempt/loginattemptimpl/login_attempt.go
@@ -2,6 +2,7 @@ package loginattemptimpl
 
 import (
 	"context"
+	"strings"
 	"time"
 
 	"github.com/grafana/grafana/pkg/infra/db"
@@ -54,14 +55,14 @@ func (s *Service) Add(ctx context.Context, username, IPAddress string) error {
 	}
 
 	_, err := s.store.CreateLoginAttempt(ctx, CreateLoginAttemptCommand{
-		Username:  username,
+		Username:  strings.ToLower(username),
 		IpAddress: IPAddress,
 	})
 	return err
 }
 
 func (s *Service) Reset(ctx context.Context, username string) error {
-	return s.store.DeleteLoginAttempts(ctx, DeleteLoginAttemptsCommand{username})
+	return s.store.DeleteLoginAttempts(ctx, DeleteLoginAttemptsCommand{strings.ToLower(username)})
 }
 
 func (s *Service) Validate(ctx context.Context, username string) (bool, error) {
@@ -70,7 +71,7 @@ func (s *Service) Validate(ctx context.Context, username string) (bool, error) {
 	}
 
 	loginAttemptCountQuery := GetUserLoginAttemptCountQuery{
-		Username: username,
+		Username: strings.ToLower(username),
 		Since:    time.Now().Add(-loginAttemptsWindow),
 	}
 
diff --git a/pkg/services/loginattempt/loginattemptimpl/login_attempt_test.go b/pkg/services/loginattempt/loginattemptimpl/login_attempt_test.go
index 8ec85223c1065..13b1bc2706ffd 100644
--- a/pkg/services/loginattempt/loginattemptimpl/login_attempt_test.go
+++ b/pkg/services/loginattempt/loginattemptimpl/login_attempt_test.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/services/loginattempt"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -79,6 +80,31 @@ func TestService_Validate(t *testing.T) {
 	}
 }
 
+func TestLoginAttempts(t *testing.T) {
+	ctx := context.Background()
+	cfg := setting.NewCfg()
+	cfg.DisableBruteForceLoginProtection = false
+	db := db.InitTestDB(t)
+	service := ProvideService(db, cfg, nil)
+
+	// add multiple login attempts with different uppercases, they all should be counted as the same user
+	_ = service.Add(ctx, "admin", "[::1]")
+	_ = service.Add(ctx, "Admin", "[::1]")
+	_ = service.Add(ctx, "aDmin", "[::1]")
+	_ = service.Add(ctx, "adMin", "[::1]")
+	_ = service.Add(ctx, "admIn", "[::1]")
+	_ = service.Add(ctx, "admIN", "[::1]")
+
+	// validate the number of attempts is correct for all the different uppercases
+	count, err := service.store.GetUserLoginAttemptCount(ctx, GetUserLoginAttemptCountQuery{Username: "admin"})
+	assert.Nil(t, err)
+	assert.Equal(t, int64(6), count)
+
+	ok, err := service.Validate(ctx, "admin")
+	assert.False(t, ok)
+	assert.Nil(t, err)
+}
+
 var _ store = new(fakeStore)
 
 type fakeStore struct {
diff --git a/pkg/services/loginattempt/loginattemptimpl/store_test.go b/pkg/services/loginattempt/loginattemptimpl/store_test.go
index 45c27c0c90fb4..194e64ff572b4 100644
--- a/pkg/services/loginattempt/loginattemptimpl/store_test.go
+++ b/pkg/services/loginattempt/loginattemptimpl/store_test.go
@@ -8,8 +8,13 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationLoginAttemptsQuery(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
diff --git a/pkg/services/navtree/models.go b/pkg/services/navtree/models.go
index 800cc62d56ac5..76d718f4c10b2 100644
--- a/pkg/services/navtree/models.go
+++ b/pkg/services/navtree/models.go
@@ -13,34 +13,40 @@ const (
 
 	WeightHome = (iota - 20) * 100
 	WeightSavedItems
-	WeightCreate
 	WeightDashboard
 	WeightExplore
 	WeightAlerting
 	WeightAlertsAndIncidents
+	WeightTestingAndSynthetics
 	WeightMonitoring
+	WeightInfrastructure
+	WeightApplication
+	WeightFrontend
+	WeightAsserts
 	WeightDataConnections
 	WeightApps
 	WeightPlugin
 	WeightConfig
-	WeightAdmin
 	WeightProfile
 	WeightHelp
 )
 
 const (
-	NavIDRoot               = "root"
-	NavIDDashboards         = "dashboards/browse"
-	NavIDCfg                = "cfg" // NavIDCfg is the id for org configuration navigation node
-	NavIDAlertsAndIncidents = "alerts-and-incidents"
-	NavIDAlerting           = "alerting"
-	NavIDAlertingLegacy     = "alerting-legacy"
-	NavIDMonitoring         = "monitoring"
-	NavIDReporting          = "reports"
-	NavIDApps               = "apps"
-	NavIDCfgGeneral         = "cfg/general"
-	NavIDCfgPlugins         = "cfg/plugins"
-	NavIDCfgAccess          = "cfg/access"
+	NavIDRoot                 = "root"
+	NavIDDashboards           = "dashboards/browse"
+	NavIDExplore              = "explore"
+	NavIDCfg                  = "cfg" // NavIDCfg is the id for org configuration navigation node
+	NavIDAlertsAndIncidents   = "alerts-and-incidents"
+	NavIDTestingAndSynthetics = "testing-and-synthetics"
+	NavIDAlerting             = "alerting"
+	NavIDMonitoring           = "monitoring"
+	NavIDInfrastructure       = "infrastructure"
+	NavIDFrontend             = "frontend"
+	NavIDReporting            = "reports"
+	NavIDApps                 = "apps"
+	NavIDCfgGeneral           = "cfg/general"
+	NavIDCfgPlugins           = "cfg/plugins"
+	NavIDCfgAccess            = "cfg/access"
 )
 
 type NavLink struct {
@@ -61,6 +67,7 @@ type NavLink struct {
 	EmptyMessageId string     `json:"emptyMessageId,omitempty"`
 	PluginID       string     `json:"pluginId,omitempty"` // (Optional) The ID of the plugin that registered nav link (e.g. as a standalone plugin page)
 	IsCreateAction bool       `json:"isCreateAction,omitempty"`
+	Keywords       []string   `json:"keywords,omitempty"`
 }
 
 func (node *NavLink) Sort() {
@@ -120,122 +127,107 @@ func Sort(nodes []*NavLink) {
 	}
 }
 
-func (root *NavTreeRoot) ApplyAdminIA(navAdminSubsectionsEnabled bool) {
+func (root *NavTreeRoot) ApplyHelpVersion(version string) {
+	helpNode := root.FindById("help")
+
+	if helpNode != nil {
+		helpNode.SubTitle = version
+	}
+}
+
+func (root *NavTreeRoot) ApplyAdminIA() {
 	orgAdminNode := root.FindById(NavIDCfg)
 
 	if orgAdminNode != nil {
 		adminNodeLinks := []*NavLink{}
 
-		if navAdminSubsectionsEnabled {
-			generalNodeLinks := []*NavLink{}
-			generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("upgrading")) // TODO does this even exist
-			generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("licensing"))
-			generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("org-settings"))
-			generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("server-settings"))
-			generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("global-orgs"))
-			generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("feature-toggles"))
-			generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("storage"))
-
-			generalNode := &NavLink{
-				Text:     "General",
-				SubTitle: "Manage default preferences and settings across Grafana",
-				Id:       NavIDCfgGeneral,
-				Url:      "/admin/general",
-				Icon:     "shield",
-				Children: generalNodeLinks,
-			}
+		generalNodeLinks := []*NavLink{}
+		generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("upgrading")) // TODO does this even exist
+		generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("licensing"))
+		generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("org-settings"))
+		generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("server-settings"))
+		generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("global-orgs"))
+		generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("feature-toggles"))
+		generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("storage"))
+		generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("migrate-to-cloud"))
+
+		generalNode := &NavLink{
+			Text:     "General",
+			SubTitle: "Manage default preferences and settings across Grafana",
+			Id:       NavIDCfgGeneral,
+			Url:      "/admin/general",
+			Icon:     "shield",
+			Children: generalNodeLinks,
+		}
 
-			pluginsNodeLinks := []*NavLink{}
-			pluginsNodeLinks = AppendIfNotNil(pluginsNodeLinks, root.FindById("plugins"))
-			pluginsNodeLinks = AppendIfNotNil(pluginsNodeLinks, root.FindById("datasources"))
-			pluginsNodeLinks = AppendIfNotNil(pluginsNodeLinks, root.FindById("recordedQueries"))
-			pluginsNodeLinks = AppendIfNotNil(pluginsNodeLinks, root.FindById("correlations"))
-			pluginsNodeLinks = AppendIfNotNil(pluginsNodeLinks, root.FindById("plugin-page-grafana-cloud-link-app"))
-
-			pluginsNode := &NavLink{
-				Text:     "Plugins and data",
-				SubTitle: "Install plugins and define the relationships between data",
-				Id:       NavIDCfgPlugins,
-				Url:      "/admin/plugins",
-				Icon:     "shield",
-				Children: pluginsNodeLinks,
-			}
+		pluginsNodeLinks := []*NavLink{}
+		pluginsNodeLinks = AppendIfNotNil(pluginsNodeLinks, root.FindById("plugins"))
+		pluginsNodeLinks = AppendIfNotNil(pluginsNodeLinks, root.FindById("datasources"))
+		pluginsNodeLinks = AppendIfNotNil(pluginsNodeLinks, root.FindById("recordedQueries"))
+		pluginsNodeLinks = AppendIfNotNil(pluginsNodeLinks, root.FindById("correlations"))
+		pluginsNodeLinks = AppendIfNotNil(pluginsNodeLinks, root.FindById("plugin-page-grafana-cloud-link-app"))
+
+		pluginsNode := &NavLink{
+			Text:     "Plugins and data",
+			SubTitle: "Install plugins and define the relationships between data",
+			Id:       NavIDCfgPlugins,
+			Url:      "/admin/plugins",
+			Icon:     "shield",
+			Children: pluginsNodeLinks,
+		}
 
-			accessNodeLinks := []*NavLink{}
-			accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("global-users"))
-			accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("teams"))
-			accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("standalone-plugin-page-/a/grafana-auth-app"))
-			accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("serviceaccounts"))
-			accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("apikeys"))
-
-			usersNode := &NavLink{
-				Text:     "Users and access",
-				SubTitle: "Configure access for individual users, teams, and service accounts",
-				Id:       NavIDCfgAccess,
-				Url:      "/admin/access",
-				Icon:     "shield",
-				Children: accessNodeLinks,
-			}
+		accessNodeLinks := []*NavLink{}
+		accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("global-users"))
+		accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("teams"))
+		accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("standalone-plugin-page-/a/grafana-auth-app"))
+		accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("serviceaccounts"))
+		accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("apikeys"))
+
+		usersNode := &NavLink{
+			Text:     "Users and access",
+			SubTitle: "Configure access for individual users, teams, and service accounts",
+			Id:       NavIDCfgAccess,
+			Url:      "/admin/access",
+			Icon:     "shield",
+			Children: accessNodeLinks,
+		}
 
-			if len(generalNode.Children) > 0 {
-				adminNodeLinks = append(adminNodeLinks, generalNode)
-			}
+		if len(generalNode.Children) > 0 {
+			adminNodeLinks = append(adminNodeLinks, generalNode)
+		}
 
-			if len(pluginsNode.Children) > 0 {
-				adminNodeLinks = append(adminNodeLinks, pluginsNode)
-			}
+		if len(pluginsNode.Children) > 0 {
+			adminNodeLinks = append(adminNodeLinks, pluginsNode)
+		}
 
-			if len(usersNode.Children) > 0 {
-				adminNodeLinks = append(adminNodeLinks, usersNode)
-			}
+		if len(usersNode.Children) > 0 {
+			adminNodeLinks = append(adminNodeLinks, usersNode)
+		}
 
-			authenticationNode := root.FindById("authentication")
-			if authenticationNode != nil {
-				authenticationNode.IsSection = true
-				adminNodeLinks = append(adminNodeLinks, authenticationNode)
-			}
+		authenticationNode := root.FindById("authentication")
+		if authenticationNode != nil {
+			authenticationNode.IsSection = true
+			adminNodeLinks = append(adminNodeLinks, authenticationNode)
+		}
 
-			costManagementNode := root.FindById("plugin-page-grafana-costmanagementui-app")
+		costManagementNode := root.FindById("plugin-page-grafana-costmanagementui-app")
 
-			if costManagementNode != nil {
-				adminNodeLinks = append(adminNodeLinks, costManagementNode)
-			}
+		if costManagementNode != nil {
+			adminNodeLinks = append(adminNodeLinks, costManagementNode)
+		}
 
-			costManagementMetricsNode := root.FindByURL("/a/grafana-costmanagementui-app/metrics")
-			adaptiveMetricsNode := root.FindById("plugin-page-grafana-adaptive-metrics-app")
+		costManagementMetricsNode := root.FindByURL("/a/grafana-costmanagementui-app/metrics")
+		adaptiveMetricsNode := root.FindById("plugin-page-grafana-adaptive-metrics-app")
 
-			if costManagementMetricsNode != nil && adaptiveMetricsNode != nil {
-				costManagementMetricsNode.Children = append(costManagementMetricsNode.Children, adaptiveMetricsNode)
-			}
+		if costManagementMetricsNode != nil && adaptiveMetricsNode != nil {
+			costManagementMetricsNode.Children = append(costManagementMetricsNode.Children, adaptiveMetricsNode)
+		}
 
-			costManagementLogsNode := root.FindByURL("/a/grafana-costmanagementui-app/logs")
-			logVolumeExplorerNode := root.FindById("plugin-page-grafana-logvolumeexplorer-app")
+		costManagementLogsNode := root.FindByURL("/a/grafana-costmanagementui-app/logs")
+		logVolumeExplorerNode := root.FindById("plugin-page-grafana-logvolumeexplorer-app")
 
-			if costManagementLogsNode != nil && logVolumeExplorerNode != nil {
-				costManagementLogsNode.Children = append(costManagementLogsNode.Children, logVolumeExplorerNode)
-			}
-		} else {
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("datasources"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("plugins"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("global-users"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("teams"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("serviceaccounts"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("apikeys"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("org-settings"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("authentication"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("server-settings"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("global-orgs"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("feature-toggles"))
-
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("upgrading"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("licensing"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("recordedQueries")) // enterprise only
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("correlations"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("plugin-page-grafana-cloud-link-app"))
-
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("ldap"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("standalone-plugin-page-/a/grafana-auth-app")) // Cloud Access Policies
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("storage"))
+		if costManagementLogsNode != nil && logVolumeExplorerNode != nil {
+			costManagementLogsNode.Children = append(costManagementLogsNode.Children, logVolumeExplorerNode)
 		}
 
 		if len(adminNodeLinks) > 0 {
diff --git a/pkg/services/navtree/navtreeimpl/admin.go b/pkg/services/navtree/navtreeimpl/admin.go
index c3d5602e8e437..8d3b73dfef687 100644
--- a/pkg/services/navtree/navtreeimpl/admin.go
+++ b/pkg/services/navtree/navtreeimpl/admin.go
@@ -1,21 +1,25 @@
 package navtreeimpl
 
 import (
+	"github.com/grafana/grafana/pkg/login/social"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/ssoutils"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/correlations"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/navtree"
+	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginaccesscontrol"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts"
 )
 
 func (s *ServiceImpl) getAdminNode(c *contextmodel.ReqContext) (*navtree.NavLink, error) {
 	var configNodes []*navtree.NavLink
+	ctx := c.Req.Context()
 	hasAccess := ac.HasAccess(s.accessControl, c)
 	hasGlobalAccess := ac.HasGlobalAccess(s.accessControl, s.accesscontrolService, c)
 	orgsAccessEvaluator := ac.EvalPermission(ac.ActionOrgsRead)
-	authConfigUIAvailable := s.license.FeatureEnabled("saml") || s.cfg.LDAPAuthEnabled
+	authConfigUIAvailable := s.license.FeatureEnabled(social.SAMLProviderName) || s.cfg.LDAPAuthEnabled
 
 	// FIXME: If plugin admin is disabled or externally managed, server admins still need to access the page, this is why
 	// while we don't have a permissions for listing plugins the legacy check has to stay as a default
@@ -55,7 +59,7 @@ func (s *ServiceImpl) getAdminNode(c *contextmodel.ReqContext) (*navtree.NavLink
 		})
 	}
 
-	disabled, err := s.apiKeyService.IsDisabled(c.Req.Context(), c.SignedInUser.GetOrgID())
+	disabled, err := s.apiKeyService.IsDisabled(ctx, c.SignedInUser.GetOrgID())
 	if err != nil {
 		return nil, err
 	}
@@ -79,7 +83,8 @@ func (s *ServiceImpl) getAdminNode(c *contextmodel.ReqContext) (*navtree.NavLink
 		})
 	}
 
-	if authConfigUIAvailable && hasAccess(evalAuthenticationSettings()) {
+	if authConfigUIAvailable && hasAccess(ssoutils.EvalAuthenticationSettings(s.cfg)) ||
+		(hasAccess(ssoutils.OauthSettingsEvaluator(s.cfg)) && s.features.IsEnabled(ctx, featuremgmt.FlagSsoSettingsApi)) {
 		configNodes = append(configNodes, &navtree.NavLink{
 			Text:     "Authentication",
 			Id:       "authentication",
@@ -101,13 +106,17 @@ func (s *ServiceImpl) getAdminNode(c *contextmodel.ReqContext) (*navtree.NavLink
 		})
 	}
 
-	if s.features.IsEnabled(featuremgmt.FlagFeatureToggleAdminPage) && hasAccess(ac.EvalPermission(ac.ActionFeatureManagementRead)) {
+	if s.features.IsEnabled(ctx, featuremgmt.FlagFeatureToggleAdminPage) && hasAccess(ac.EvalPermission(ac.ActionFeatureManagementRead)) {
 		configNodes = append(configNodes, &navtree.NavLink{
-			Text: "Feature Toggles", SubTitle: "View and edit feature toggles", Id: "feature-toggles", Url: s.cfg.AppSubURL + "/admin/featuretoggles", Icon: "toggle-on",
+			Text:     "Feature Toggles",
+			SubTitle: "View and edit feature toggles",
+			Id:       "feature-toggles",
+			Url:      s.cfg.AppSubURL + "/admin/featuretoggles",
+			Icon:     "toggle-on",
 		})
 	}
 
-	if s.features.IsEnabled(featuremgmt.FlagCorrelations) && hasAccess(correlations.ConfigurationPageAccess) {
+	if s.features.IsEnabled(ctx, featuremgmt.FlagCorrelations) && hasAccess(correlations.ConfigurationPageAccess) {
 		configNodes = append(configNodes, &navtree.NavLink{
 			Text:     "Correlations",
 			Icon:     "gf-glue",
@@ -117,7 +126,7 @@ func (s *ServiceImpl) getAdminNode(c *contextmodel.ReqContext) (*navtree.NavLink
 		})
 	}
 
-	if hasAccess(ac.EvalPermission(ac.ActionSettingsRead, ac.ScopeSettingsAll)) && s.features.IsEnabled(featuremgmt.FlagStorage) {
+	if hasAccess(ac.EvalPermission(ac.ActionSettingsRead, ac.ScopeSettingsAll)) && s.features.IsEnabled(ctx, featuremgmt.FlagStorage) {
 		storage := &navtree.NavLink{
 			Text:     "Storage",
 			Id:       "storage",
@@ -128,10 +137,20 @@ func (s *ServiceImpl) getAdminNode(c *contextmodel.ReqContext) (*navtree.NavLink
 		configNodes = append(configNodes, storage)
 	}
 
+	if s.features.IsEnabled(ctx, featuremgmt.FlagOnPremToCloudMigrations) && c.SignedInUser.HasRole(org.RoleAdmin) {
+		migrateToCloud := &navtree.NavLink{
+			Text:     "Migrate to Grafana Cloud",
+			Id:       "migrate-to-cloud",
+			SubTitle: "Copy configuration from your self-managed installation to a cloud stack",
+			Url:      s.cfg.AppSubURL + "/admin/migrate-to-cloud",
+		}
+		configNodes = append(configNodes, migrateToCloud)
+	}
+
 	configNode := &navtree.NavLink{
 		Id:         navtree.NavIDCfg,
 		Text:       "Administration",
-		SubTitle:   "Organization: " + c.OrgName,
+		SubTitle:   "Organization: " + c.SignedInUser.GetOrgName(),
 		Icon:       "cog",
 		SortWeight: navtree.WeightConfig,
 		Children:   configNodes,
@@ -145,10 +164,3 @@ func enableServiceAccount(s *ServiceImpl, c *contextmodel.ReqContext) bool {
 	hasAccess := ac.HasAccess(s.accessControl, c)
 	return hasAccess(serviceaccounts.AccessEvaluator)
 }
-
-func evalAuthenticationSettings() ac.Evaluator {
-	return ac.EvalAny(ac.EvalAll(
-		ac.EvalPermission(ac.ActionSettingsWrite, ac.ScopeSettingsSAML),
-		ac.EvalPermission(ac.ActionSettingsRead, ac.ScopeSettingsSAML),
-	), ac.EvalPermission(ac.ActionLDAPStatusRead))
-}
diff --git a/pkg/services/navtree/navtreeimpl/applinks.go b/pkg/services/navtree/navtreeimpl/applinks.go
index 15f3f2f8b4aea..ceb2e3c882b8f 100644
--- a/pkg/services/navtree/navtreeimpl/applinks.go
+++ b/pkg/services/navtree/navtreeimpl/applinks.go
@@ -168,10 +168,10 @@ func (s *ServiceImpl) processAppPlugin(plugin pluginstore.Plugin, c *contextmode
 
 func (s *ServiceImpl) addPluginToSection(c *contextmodel.ReqContext, treeRoot *navtree.NavTreeRoot, plugin pluginstore.Plugin, appLink *navtree.NavLink) {
 	// Handle moving apps into specific navtree sections
+	var alertingNodes []*navtree.NavLink
 	alertingNode := treeRoot.FindById(navtree.NavIDAlerting)
-	if alertingNode == nil {
-		// Search for legacy alerting node just in case
-		alertingNode = treeRoot.FindById(navtree.NavIDAlertingLegacy)
+	if alertingNode != nil {
+		alertingNodes = append(alertingNodes, alertingNode)
 	}
 	sectionID := navtree.NavIDApps
 
@@ -213,9 +213,29 @@ func (s *ServiceImpl) addPluginToSection(c *contextmodel.ReqContext, treeRoot *n
 				Children:   []*navtree.NavLink{appLink},
 				Url:        s.cfg.AppSubURL + "/monitoring",
 			})
+		case navtree.NavIDInfrastructure:
+			treeRoot.AddSection(&navtree.NavLink{
+				Text:       "Infrastructure",
+				Id:         navtree.NavIDInfrastructure,
+				SubTitle:   "Understand your infrastructure's health",
+				Icon:       "heart-rate",
+				SortWeight: navtree.WeightInfrastructure,
+				Children:   []*navtree.NavLink{appLink},
+				Url:        s.cfg.AppSubURL + "/infrastructure",
+			})
+		case navtree.NavIDFrontend:
+			treeRoot.AddSection(&navtree.NavLink{
+				Text:       "Frontend",
+				Id:         navtree.NavIDFrontend,
+				SubTitle:   "Gain real user monitoring insights",
+				Icon:       "frontend-observability",
+				SortWeight: navtree.WeightFrontend,
+				Children:   []*navtree.NavLink{appLink},
+				Url:        s.cfg.AppSubURL + "/frontend",
+			})
 		case navtree.NavIDAlertsAndIncidents:
 			alertsAndIncidentsChildren := []*navtree.NavLink{}
-			if alertingNode != nil {
+			for _, alertingNode := range alertingNodes {
 				alertsAndIncidentsChildren = append(alertsAndIncidentsChildren, alertingNode)
 				treeRoot.RemoveSection(alertingNode)
 			}
@@ -229,6 +249,16 @@ func (s *ServiceImpl) addPluginToSection(c *contextmodel.ReqContext, treeRoot *n
 				Children:   alertsAndIncidentsChildren,
 				Url:        s.cfg.AppSubURL + "/alerts-and-incidents",
 			})
+		case navtree.NavIDTestingAndSynthetics:
+			treeRoot.AddSection(&navtree.NavLink{
+				Text:       "Testing & synthetics",
+				Id:         navtree.NavIDTestingAndSynthetics,
+				SubTitle:   "Optimize performance with k6 and Synthetic Monitoring insights",
+				Icon:       "k6",
+				SortWeight: navtree.WeightTestingAndSynthetics,
+				Children:   []*navtree.NavLink{appLink},
+				Url:        s.cfg.AppSubURL + "/testing-and-synthetics",
+			})
 		default:
 			s.log.Error("Plugin app nav id not found", "pluginId", plugin.ID, "navId", sectionID)
 		}
@@ -238,7 +268,7 @@ func (s *ServiceImpl) addPluginToSection(c *contextmodel.ReqContext, treeRoot *n
 func (s *ServiceImpl) hasAccessToInclude(c *contextmodel.ReqContext, pluginID string) func(include *plugins.Includes) bool {
 	hasAccess := ac.HasAccess(s.accessControl, c)
 	return func(include *plugins.Includes) bool {
-		useRBAC := s.features.IsEnabled(featuremgmt.FlagAccessControlOnCall) && include.RequiresRBACAction()
+		useRBAC := s.features.IsEnabledGlobally(featuremgmt.FlagAccessControlOnCall) && include.RequiresRBACAction()
 		if useRBAC && !hasAccess(ac.EvalPermission(include.Action)) {
 			s.log.Debug("plugin include is covered by RBAC, user doesn't have access",
 				"plugin", pluginID,
@@ -253,25 +283,24 @@ func (s *ServiceImpl) hasAccessToInclude(c *contextmodel.ReqContext, pluginID st
 
 func (s *ServiceImpl) readNavigationSettings() {
 	s.navigationAppConfig = map[string]NavigationAppConfig{
-		"grafana-k8s-app":                  {SectionID: navtree.NavIDMonitoring, SortWeight: 1, Text: "Kubernetes"},
-		"grafana-app-observability-app":    {SectionID: navtree.NavIDMonitoring, SortWeight: 2, Text: "Application (preview)"},
-		"grafana-pyroscope-app":            {SectionID: navtree.NavIDMonitoring, SortWeight: 3, Text: "Profiles"},
-		"grafana-kowalski-app":             {SectionID: navtree.NavIDMonitoring, SortWeight: 4, Text: "Frontend"},
-		"grafana-synthetic-monitoring-app": {SectionID: navtree.NavIDMonitoring, SortWeight: 5, Text: "Synthetics"},
+		"grafana-k8s-app":                  {SectionID: navtree.NavIDInfrastructure, SortWeight: 1, Text: "Kubernetes"},
+		"grafana-aws-app":                  {SectionID: navtree.NavIDInfrastructure, SortWeight: 2},
+		"grafana-app-observability-app":    {SectionID: navtree.NavIDRoot, SortWeight: navtree.WeightApplication, Text: "Application", Icon: "graph-bar"},
+		"grafana-pyroscope-app":            {SectionID: navtree.NavIDExplore, SortWeight: 1, Text: "Profiles"},
+		"grafana-lokiexplore-app":          {SectionID: navtree.NavIDExplore, SortWeight: 2, Text: "Logs"},
+		"grafana-kowalski-app":             {SectionID: navtree.NavIDRoot, SortWeight: navtree.WeightFrontend, Text: "Frontend", Icon: "frontend-observability"},
+		"grafana-synthetic-monitoring-app": {SectionID: navtree.NavIDTestingAndSynthetics, SortWeight: 2, Text: "Synthetics"},
 		"grafana-oncall-app":               {SectionID: navtree.NavIDAlertsAndIncidents, SortWeight: 1, Text: "OnCall"},
 		"grafana-incident-app":             {SectionID: navtree.NavIDAlertsAndIncidents, SortWeight: 2, Text: "Incidents"},
 		"grafana-ml-app":                   {SectionID: navtree.NavIDAlertsAndIncidents, SortWeight: 3, Text: "Machine Learning"},
+		"grafana-slo-app":                  {SectionID: navtree.NavIDAlertsAndIncidents, SortWeight: 4},
 		"grafana-cloud-link-app":           {SectionID: navtree.NavIDCfg},
 		"grafana-costmanagementui-app":     {SectionID: navtree.NavIDCfg, Text: "Cost management"},
+		"grafana-adaptive-metrics-app":     {SectionID: navtree.NavIDCfg, Text: "Adaptive Metrics"},
+		"grafana-logvolumeexplorer-app":    {SectionID: navtree.NavIDCfg, Text: "Log Volume Explorer"},
 		"grafana-easystart-app":            {SectionID: navtree.NavIDRoot, SortWeight: navtree.WeightApps + 1, Text: "Connections", Icon: "adjust-circle"},
-		"k6-app":                           {SectionID: navtree.NavIDRoot, SortWeight: navtree.WeightAlertsAndIncidents + 1, Text: "Performance testing", Icon: "k6"},
-	}
-
-	if s.features.IsEnabled(featuremgmt.FlagNavAdminSubsections) && s.features.IsEnabled(featuremgmt.FlagCostManagementUi) {
-		// if cost management is enabled we want to nest adaptive metrics and log volume explorer under that plugin
-		// in the admin section
-		s.navigationAppConfig["grafana-adaptive-metrics-app"] = NavigationAppConfig{SectionID: navtree.NavIDCfg}
-		s.navigationAppConfig["grafana-logvolumeexplorer-app"] = NavigationAppConfig{SectionID: navtree.NavIDCfg}
+		"k6-app":                           {SectionID: navtree.NavIDTestingAndSynthetics, SortWeight: 1, Text: "Performance"},
+		"grafana-asserts-app":              {SectionID: navtree.NavIDRoot, SortWeight: navtree.WeightAsserts, Icon: "asserts"},
 	}
 
 	s.navigationAppPathConfig = map[string]NavigationAppConfig{
diff --git a/pkg/services/navtree/navtreeimpl/applinks_test.go b/pkg/services/navtree/navtreeimpl/applinks_test.go
index a877638fd6b1b..a526caef8997a 100644
--- a/pkg/services/navtree/navtreeimpl/applinks_test.go
+++ b/pkg/services/navtree/navtreeimpl/applinks_test.go
@@ -367,7 +367,7 @@ func TestReadingNavigationSettings(t *testing.T) {
 		_, _ = service.cfg.Raw.NewSection("navigation.app_sections")
 		service.readNavigationSettings()
 
-		require.Equal(t, "monitoring", service.navigationAppConfig["grafana-k8s-app"].SectionID)
+		require.Equal(t, "infrastructure", service.navigationAppConfig["grafana-k8s-app"].SectionID)
 	})
 
 	t.Run("Can add additional overrides via ini system", func(t *testing.T) {
diff --git a/pkg/services/navtree/navtreeimpl/navtree.go b/pkg/services/navtree/navtreeimpl/navtree.go
index 366de94a796f2..00cdfc4069840 100644
--- a/pkg/services/navtree/navtreeimpl/navtree.go
+++ b/pkg/services/navtree/navtreeimpl/navtree.go
@@ -1,7 +1,6 @@
 package navtreeimpl
 
 import (
-	"fmt"
 	"sort"
 
 	"github.com/grafana/grafana/pkg/api/dtos"
@@ -9,6 +8,7 @@ import (
 	"github.com/grafana/grafana/pkg/infra/log"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/apikey"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/datasources"
@@ -31,7 +31,7 @@ type ServiceImpl struct {
 	pluginStore          pluginstore.Store
 	pluginSettings       pluginsettings.Service
 	starService          star.Service
-	features             *featuremgmt.FeatureManager
+	features             featuremgmt.FeatureToggles
 	dashboardService     dashboards.DashboardService
 	accesscontrolService ac.Service
 	kvStore              kvstore.KVStore
@@ -50,7 +50,7 @@ type NavigationAppConfig struct {
 	Icon       string
 }
 
-func ProvideService(cfg *setting.Cfg, accessControl ac.AccessControl, pluginStore pluginstore.Store, pluginSettings pluginsettings.Service, starService star.Service, features *featuremgmt.FeatureManager, dashboardService dashboards.DashboardService, accesscontrolService ac.Service, kvStore kvstore.KVStore, apiKeyService apikey.Service, license licensing.Licensing) navtree.Service {
+func ProvideService(cfg *setting.Cfg, accessControl ac.AccessControl, pluginStore pluginstore.Store, pluginSettings pluginsettings.Service, starService star.Service, features featuremgmt.FeatureToggles, dashboardService dashboards.DashboardService, accesscontrolService ac.Service, kvStore kvstore.KVStore, apiKeyService apikey.Service, license licensing.Licensing) navtree.Service {
 	service := &ServiceImpl{
 		cfg:                  cfg,
 		log:                  log.New("navtree service"),
@@ -75,10 +75,13 @@ func ProvideService(cfg *setting.Cfg, accessControl ac.AccessControl, pluginStor
 func (s *ServiceImpl) GetNavTree(c *contextmodel.ReqContext, prefs *pref.Preference) (*navtree.NavTreeRoot, error) {
 	hasAccess := ac.HasAccess(s.accessControl, c)
 	treeRoot := &navtree.NavTreeRoot{}
+	// Psiphon change - add check to see if user is admin or editor
+	hasEditorOrAdminRole := c.OrgRole == org.RoleAdmin || c.OrgRole == org.RoleEditor
 
 	treeRoot.AddSection(s.getHomeNode(c, prefs))
 
-	if hasAccess(ac.EvalPermission(dashboards.ActionDashboardsRead)) {
+	// Psiphon change - check user role before adding starred items to nav tree
+	if hasAccess(ac.EvalPermission(dashboards.ActionDashboardsRead)) && hasEditorOrAdminRole {
 		starredItemsLinks, err := s.buildStarredItemsNavLinks(c)
 		if err != nil {
 			return nil, err
@@ -95,10 +98,11 @@ func (s *ServiceImpl) GetNavTree(c *contextmodel.ReqContext, prefs *pref.Prefere
 		})
 	}
 
+	// Psiphon change - add check for hasEditorOrAdminRole
 	if c.IsPublicDashboardView() || hasAccess(ac.EvalAny(
 		ac.EvalPermission(dashboards.ActionFoldersRead), ac.EvalPermission(dashboards.ActionFoldersCreate),
 		ac.EvalPermission(dashboards.ActionDashboardsRead), ac.EvalPermission(dashboards.ActionDashboardsCreate)),
-	) {
+	) && hasEditorOrAdminRole {
 		dashboardChildLinks := s.buildDashboardNavLinks(c)
 
 		dashboardLink := &navtree.NavLink{
@@ -114,30 +118,30 @@ func (s *ServiceImpl) GetNavTree(c *contextmodel.ReqContext, prefs *pref.Prefere
 		treeRoot.AddSection(dashboardLink)
 	}
 
-	if setting.ExploreEnabled && hasAccess(ac.EvalPermission(ac.ActionDatasourcesExplore)) {
+	// Psiphon change - check user role before adding Explore to nav tree
+	if s.cfg.ExploreEnabled && hasAccess(ac.EvalPermission(ac.ActionDatasourcesExplore)) && hasEditorOrAdminRole {
+		exploreChildNavLinks := s.buildExploreNavLinks(c)
 		treeRoot.AddSection(&navtree.NavLink{
 			Text:       "Explore",
-			Id:         "explore",
+			Id:         navtree.NavIDExplore,
 			SubTitle:   "Explore your data",
 			Icon:       "compass",
 			SortWeight: navtree.WeightExplore,
 			Url:        s.cfg.AppSubURL + "/explore",
+			Children:   exploreChildNavLinks,
 		})
 	}
 
-	if setting.ProfileEnabled && c.IsSignedIn {
+	if s.cfg.ProfileEnabled && c.IsSignedIn {
 		treeRoot.AddSection(s.getProfileNode(c))
 	}
 
 	_, uaIsDisabledForOrg := s.cfg.UnifiedAlerting.DisabledOrgs[c.SignedInUser.GetOrgID()]
 	uaVisibleForOrg := s.cfg.UnifiedAlerting.IsEnabled() && !uaIsDisabledForOrg
 
-	if setting.AlertingEnabled != nil && *setting.AlertingEnabled {
-		if legacyAlertSection := s.buildLegacyAlertNavLinks(c); legacyAlertSection != nil {
-			treeRoot.AddSection(legacyAlertSection)
-		}
-	} else if uaVisibleForOrg {
-		if alertingSection := s.buildAlertNavLinks(c); alertingSection != nil {
+	// Psiphon change - check user role before adding to nav tree
+	if uaVisibleForOrg {
+		if alertingSection := s.buildAlertNavLinks(c); alertingSection != nil && hasEditorOrAdminRole {
 			treeRoot.AddSection(alertingSection)
 		}
 	}
@@ -154,7 +158,8 @@ func (s *ServiceImpl) GetNavTree(c *contextmodel.ReqContext, prefs *pref.Prefere
 		return nil, err
 	}
 
-	s.addHelpLinks(treeRoot, c)
+	// Psiphon change - comment out help links in nav tree
+	//s.addHelpLinks(treeRoot, c)
 
 	if err := s.addAppLinks(treeRoot, c); err != nil {
 		return nil, err
@@ -190,15 +195,10 @@ func isSupportBundlesEnabled(s *ServiceImpl) bool {
 }
 
 func (s *ServiceImpl) addHelpLinks(treeRoot *navtree.NavTreeRoot, c *contextmodel.ReqContext) {
-	if setting.HelpEnabled {
-		helpVersion := fmt.Sprintf(`%s v%s (%s)`, setting.ApplicationName, setting.BuildVersion, setting.BuildCommit)
-		if s.cfg.AnonymousHideVersion && !c.IsSignedIn {
-			helpVersion = setting.ApplicationName
-		}
-
+	if s.cfg.HelpEnabled {
+		// The version subtitle is set later by NavTree.ApplyHelpVersion
 		helpNode := &navtree.NavLink{
 			Text:       "Help",
-			SubTitle:   helpVersion,
 			Id:         "help",
 			Url:        "#",
 			Icon:       "question-circle",
@@ -231,10 +231,10 @@ func (s *ServiceImpl) addHelpLinks(treeRoot *navtree.NavTreeRoot, c *contextmode
 func (s *ServiceImpl) getProfileNode(c *contextmodel.ReqContext) *navtree.NavLink {
 	// Only set login if it's different from the name
 	var login string
-	if c.SignedInUser.Login != c.SignedInUser.NameOrFallback() {
-		login = c.SignedInUser.Login
+	if c.SignedInUser.GetLogin() != c.SignedInUser.GetDisplayName() {
+		login = c.SignedInUser.GetLogin()
 	}
-	gravatarURL := dtos.GetGravatarUrl(c.Email)
+	gravatarURL := dtos.GetGravatarUrl(s.cfg, c.SignedInUser.GetEmail())
 
 	children := []*navtree.NavLink{
 		{
@@ -253,7 +253,7 @@ func (s *ServiceImpl) getProfileNode(c *contextmodel.ReqContext) *navtree.NavLin
 		})
 	}
 
-	if !setting.DisableSignoutMenu {
+	if !s.cfg.DisableSignoutMenu {
 		// add sign out first
 		children = append(children, &navtree.NavLink{
 			Text:         "Sign out",
@@ -266,7 +266,7 @@ func (s *ServiceImpl) getProfileNode(c *contextmodel.ReqContext) *navtree.NavLin
 	}
 
 	return &navtree.NavLink{
-		Text:       c.SignedInUser.NameOrFallback(),
+		Text:       c.SignedInUser.GetDisplayName(),
 		SubTitle:   login,
 		Id:         "profile",
 		Img:        gravatarURL,
@@ -280,8 +280,9 @@ func (s *ServiceImpl) getProfileNode(c *contextmodel.ReqContext) *navtree.NavLin
 func (s *ServiceImpl) buildStarredItemsNavLinks(c *contextmodel.ReqContext) ([]*navtree.NavLink, error) {
 	starredItemsChildNavs := []*navtree.NavLink{}
 
+	userID, _ := identity.UserIdentifier(c.SignedInUser.GetNamespacedID())
 	query := star.GetUserStarsQuery{
-		UserID: c.SignedInUser.UserID,
+		UserID: userID,
 	}
 
 	starredDashboardResult, err := s.starService.GetByUser(c.Req.Context(), &query)
@@ -346,7 +347,7 @@ func (s *ServiceImpl) buildDashboardNavLinks(c *contextmodel.ReqContext) []*navt
 			Icon:     "library-panel",
 		})
 
-		if s.features.IsEnabled(featuremgmt.FlagPublicDashboards) {
+		if s.features.IsEnabled(c.Req.Context(), featuremgmt.FlagPublicDashboards) && s.cfg.PublicDashboardsEnabled {
 			dashboardChildNavs = append(dashboardChildNavs, &navtree.NavLink{
 				Text: "Public dashboards",
 				Id:   "dashboards/public",
@@ -356,15 +357,6 @@ func (s *ServiceImpl) buildDashboardNavLinks(c *contextmodel.ReqContext) []*navt
 		}
 	}
 
-	if s.features.IsEnabled(featuremgmt.FlagScenes) {
-		dashboardChildNavs = append(dashboardChildNavs, &navtree.NavLink{
-			Text: "Scenes",
-			Id:   "scenes",
-			Url:  s.cfg.AppSubURL + "/scenes",
-			Icon: "apps",
-		})
-	}
-
 	if hasAccess(ac.EvalPermission(dashboards.ActionDashboardsCreate)) {
 		dashboardChildNavs = append(dashboardChildNavs, &navtree.NavLink{
 			Text: "New dashboard", Icon: "plus", Url: s.cfg.AppSubURL + "/dashboard/new", HideFromTabs: true, Id: "dashboards/new", IsCreateAction: true,
@@ -379,32 +371,6 @@ func (s *ServiceImpl) buildDashboardNavLinks(c *contextmodel.ReqContext) []*navt
 	return dashboardChildNavs
 }
 
-func (s *ServiceImpl) buildLegacyAlertNavLinks(c *contextmodel.ReqContext) *navtree.NavLink {
-	var alertChildNavs []*navtree.NavLink
-	alertChildNavs = append(alertChildNavs, &navtree.NavLink{
-		Text: "Alert rules", Id: "alert-list", Url: s.cfg.AppSubURL + "/alerting/list", Icon: "list-ul",
-	})
-
-	if c.HasRole(org.RoleEditor) {
-		alertChildNavs = append(alertChildNavs, &navtree.NavLink{
-			Text: "Notification channels", Id: "channels", Url: s.cfg.AppSubURL + "/alerting/notifications",
-			Icon: "comment-alt-share",
-		})
-	}
-
-	var alertNav = navtree.NavLink{
-		Text:       "Alerting",
-		SubTitle:   "Learn about problems in your systems moments after they occur",
-		Id:         "alerting-legacy",
-		Icon:       "bell",
-		Children:   alertChildNavs,
-		SortWeight: navtree.WeightAlerting,
-		Url:        s.cfg.AppSubURL + "/alerting",
-	}
-
-	return &alertNav
-}
-
 func (s *ServiceImpl) buildAlertNavLinks(c *contextmodel.ReqContext) *navtree.NavLink {
 	hasAccess := ac.HasAccess(s.accessControl, c)
 	var alertChildNavs []*navtree.NavLink
@@ -428,7 +394,7 @@ func (s *ServiceImpl) buildAlertNavLinks(c *contextmodel.ReqContext) *navtree.Na
 		alertChildNavs = append(alertChildNavs, &navtree.NavLink{Text: "Alert groups", SubTitle: "See grouped alerts from an Alertmanager instance", Id: "groups", Url: s.cfg.AppSubURL + "/alerting/groups", Icon: "layer-group"})
 	}
 
-	if c.OrgRole == org.RoleAdmin {
+	if c.SignedInUser.GetOrgRole() == org.RoleAdmin {
 		alertChildNavs = append(alertChildNavs, &navtree.NavLink{
 			Text: "Admin", Id: "alerting-admin", Url: s.cfg.AppSubURL + "/alerting/admin",
 			Icon: "cog",
@@ -475,6 +441,7 @@ func (s *ServiceImpl) buildDataConnectionsNavLink(c *contextmodel.ReqContext) *n
 			SubTitle: "Browse and create new connections",
 			Url:      baseUrl + "/add-new-connection",
 			Children: []*navtree.NavLink{},
+			Keywords: []string{"csv", "graphite", "json", "loki", "prometheus", "sql", "tempo"},
 		})
 
 		// Data sources
@@ -502,3 +469,17 @@ func (s *ServiceImpl) buildDataConnectionsNavLink(c *contextmodel.ReqContext) *n
 	}
 	return nil
 }
+
+func (s *ServiceImpl) buildExploreNavLinks(c *contextmodel.ReqContext) []*navtree.NavLink {
+	exploreChildNavs := []*navtree.NavLink{}
+	if s.features.IsEnabled(c.Req.Context(), featuremgmt.FlagExploreMetrics) {
+		exploreChildNavs = append(exploreChildNavs, &navtree.NavLink{
+			Text:     "Metrics",
+			SubTitle: "Queryless exploration of your metrics",
+			Id:       "explore/metrics",
+			Url:      s.cfg.AppSubURL + "/explore/metrics",
+			Icon:     "code-branch",
+		})
+	}
+	return exploreChildNavs
+}
diff --git a/pkg/services/ngalert/README.md b/pkg/services/ngalert/README.md
index da0b978302594..78e2e59644c14 100644
--- a/pkg/services/ngalert/README.md
+++ b/pkg/services/ngalert/README.md
@@ -30,7 +30,7 @@ The scheduler runs at a fixed interval, called its heartbeat, in which it does a
 3. Send an `*evaluation` event to the goroutine for each alert rule if its interval has elapsed
 4. Stop the goroutines for all alert rules that have been deleted since the last heartbeat
 
-The function that evaluates each alert rule is called `ruleRoutine`. It waits for an `*evaluation` event (sent each
+The function that evaluates each alert rule is called `run`. It waits for an `*evaluation` event (sent each
 interval seconds elapsed and is configurable per alert rule) and then evaluates the alert rule. To ensure that the
 scheduler is evaluating the latest version of the alert rule it compares its local version of the alert rule with that
 in the `*evaluation` event, fetching the latest version of the alert rule from the database if the version numbers
diff --git a/pkg/services/ngalert/accesscontrol.go b/pkg/services/ngalert/accesscontrol.go
index 3e9ce4a3f73a6..013bf13a40656 100644
--- a/pkg/services/ngalert/accesscontrol.go
+++ b/pkg/services/ngalert/accesscontrol.go
@@ -25,6 +25,13 @@ var (
 					Action: accesscontrol.ActionAlertingRuleExternalRead,
 					Scope:  datasources.ScopeAll,
 				},
+				// Following are needed for simplified notification policies
+				{
+					Action: accesscontrol.ActionAlertingNotificationsTimeIntervalsRead,
+				},
+				{
+					Action: accesscontrol.ActionAlertingReceiversList,
+				},
 			},
 		},
 	}
@@ -109,6 +116,12 @@ var (
 					Action: accesscontrol.ActionAlertingNotificationsExternalRead,
 					Scope:  datasources.ScopeAll,
 				},
+				{
+					Action: accesscontrol.ActionAlertingNotificationsTimeIntervalsRead,
+				},
+				{
+					Action: accesscontrol.ActionAlertingReceiversRead,
+				},
 			},
 		},
 	}
@@ -166,6 +179,22 @@ var (
 				{
 					Action: accesscontrol.ActionAlertingProvisioningWrite, // organization scope
 				},
+				{
+					Action: accesscontrol.ActionAlertingRulesProvisioningRead, // organization scope
+				},
+				{
+					Action: accesscontrol.ActionAlertingRulesProvisioningWrite, // organization scope
+				},
+				{
+					Action: accesscontrol.ActionAlertingNotificationsProvisioningRead, // organization scope
+				},
+				{
+					Action: accesscontrol.ActionAlertingNotificationsProvisioningWrite, // organization scope
+				},
+				{
+					Action: dashboards.ActionFoldersRead,
+					Scope:  dashboards.ScopeFoldersAll,
+				},
 			},
 		},
 		Grants: []string{string(org.RoleAdmin)},
@@ -184,10 +213,31 @@ var (
 				{
 					Action: accesscontrol.ActionAlertingProvisioningRead, // organization scope
 				},
+				{
+					Action: accesscontrol.ActionAlertingRulesProvisioningRead, // organization scope
+				},
+				{
+					Action: accesscontrol.ActionAlertingNotificationsProvisioningRead, // organization scope
+				},
 			},
 		},
 		Grants: []string{string(org.RoleAdmin)},
 	}
+
+	alertingProvisioningStatus = accesscontrol.RoleRegistration{
+		Role: accesscontrol.RoleDTO{
+			Name:        accesscontrol.FixedRolePrefix + "alerting.provisioning.provenance:writer",
+			DisplayName: "Set provisioning status",
+			Description: "Set provisioning status for alerting resources. Should be used together with other regular roles (Notifications Writer and/or Rules Writer)",
+			Group:       AlertRolesGroup,
+			Permissions: []accesscontrol.Permission{
+				{
+					Action: accesscontrol.ActionAlertingProvisioningSetStatus, // organization scope
+				},
+			},
+		},
+		Grants: []string{string(org.RoleAdmin), string(org.RoleEditor)},
+	}
 )
 
 func DeclareFixedRoles(service accesscontrol.Service) error {
@@ -195,6 +245,6 @@ func DeclareFixedRoles(service accesscontrol.Service) error {
 		rulesReaderRole, rulesWriterRole,
 		instancesReaderRole, instancesWriterRole,
 		notificationsReaderRole, notificationsWriterRole,
-		alertingReaderRole, alertingWriterRole, alertingProvisionerRole, alertingProvisioningReaderWithSecretsRole,
+		alertingReaderRole, alertingWriterRole, alertingProvisionerRole, alertingProvisioningReaderWithSecretsRole, alertingProvisioningStatus,
 	)
 }
diff --git a/pkg/services/ngalert/accesscontrol/fakes/rules.go b/pkg/services/ngalert/accesscontrol/fakes/rules.go
new file mode 100644
index 0000000000000..0514a69cb9aa6
--- /dev/null
+++ b/pkg/services/ngalert/accesscontrol/fakes/rules.go
@@ -0,0 +1,74 @@
+package fakes
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/store"
+)
+
+type Call struct {
+	MethodName string
+	Arguments  []interface{}
+}
+
+type FakeRuleService struct {
+	HasAccessFunc                        func(context.Context, identity.Requester, accesscontrol.Evaluator) (bool, error)
+	HasAccessOrErrorFunc                 func(context.Context, identity.Requester, accesscontrol.Evaluator, func() string) error
+	AuthorizeDatasourceAccessForRuleFunc func(context.Context, identity.Requester, *models.AlertRule) error
+	HasAccessToRuleGroupFunc             func(context.Context, identity.Requester, models.RulesGroup) (bool, error)
+	AuthorizeAccessToRuleGroupFunc       func(context.Context, identity.Requester, models.RulesGroup) error
+	AuthorizeRuleChangesFunc             func(context.Context, identity.Requester, *store.GroupDelta) error
+
+	Calls []Call
+}
+
+func (s *FakeRuleService) HasAccess(ctx context.Context, user identity.Requester, evaluator accesscontrol.Evaluator) (bool, error) {
+	s.Calls = append(s.Calls, Call{"HasAccess", []interface{}{ctx, user, evaluator}})
+	if s.HasAccessFunc != nil {
+		return s.HasAccessFunc(ctx, user, evaluator)
+	}
+	return false, nil
+}
+
+func (s *FakeRuleService) HasAccessOrError(ctx context.Context, user identity.Requester, evaluator accesscontrol.Evaluator, action func() string) error {
+	s.Calls = append(s.Calls, Call{"HasAccessOrError", []interface{}{ctx, user, evaluator, action}})
+	if s.HasAccessOrErrorFunc != nil {
+		return s.HasAccessOrErrorFunc(ctx, user, evaluator, action)
+	}
+	return nil
+}
+
+func (s *FakeRuleService) AuthorizeDatasourceAccessForRule(ctx context.Context, user identity.Requester, rule *models.AlertRule) error {
+	s.Calls = append(s.Calls, Call{"AuthorizeDatasourceAccessForRule", []interface{}{ctx, user, rule}})
+	if s.AuthorizeDatasourceAccessForRuleFunc != nil {
+		return s.AuthorizeDatasourceAccessForRuleFunc(ctx, user, rule)
+	}
+	return nil
+}
+
+func (s *FakeRuleService) HasAccessToRuleGroup(ctx context.Context, user identity.Requester, rules models.RulesGroup) (bool, error) {
+	s.Calls = append(s.Calls, Call{"HasAccessToRuleGroup", []interface{}{ctx, user, rules}})
+	if s.HasAccessToRuleGroupFunc != nil {
+		return s.HasAccessToRuleGroupFunc(ctx, user, rules)
+	}
+	return false, nil
+}
+
+func (s *FakeRuleService) AuthorizeAccessToRuleGroup(ctx context.Context, user identity.Requester, rules models.RulesGroup) error {
+	s.Calls = append(s.Calls, Call{"AuthorizeRuleGroupRead", []interface{}{ctx, user, rules}})
+	if s.AuthorizeAccessToRuleGroupFunc != nil {
+		return s.AuthorizeAccessToRuleGroupFunc(ctx, user, rules)
+	}
+	return nil
+}
+
+func (s *FakeRuleService) AuthorizeRuleChanges(ctx context.Context, user identity.Requester, change *store.GroupDelta) error {
+	s.Calls = append(s.Calls, Call{"AuthorizeRuleGroupWrite", []interface{}{ctx, user, change}})
+	if s.AuthorizeRuleChangesFunc != nil {
+		return s.AuthorizeRuleChangesFunc(ctx, user, change)
+	}
+	return nil
+}
diff --git a/pkg/services/ngalert/accesscontrol/models.go b/pkg/services/ngalert/accesscontrol/models.go
new file mode 100644
index 0000000000000..49188277da4ce
--- /dev/null
+++ b/pkg/services/ngalert/accesscontrol/models.go
@@ -0,0 +1,28 @@
+package accesscontrol
+
+import (
+	"fmt"
+
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/util/errutil"
+)
+
+var (
+	ErrAuthorizationBase = errutil.Forbidden("alerting.unauthorized")
+)
+
+func NewAuthorizationErrorWithPermissions(action string, eval accesscontrol.Evaluator) error {
+	msg := fmt.Sprintf("user is not authorized to %s", action)
+	err := ErrAuthorizationBase.Errorf(msg)
+	err.PublicMessage = msg
+	if eval != nil {
+		err.PublicPayload = map[string]any{
+			"permissions": eval.GoString(),
+		}
+	}
+	return err
+}
+
+func NewAuthorizationErrorGeneric(action string) error {
+	return NewAuthorizationErrorWithPermissions(action, nil)
+}
diff --git a/pkg/services/ngalert/accesscontrol/rules.go b/pkg/services/ngalert/accesscontrol/rules.go
new file mode 100644
index 0000000000000..9f45193558bec
--- /dev/null
+++ b/pkg/services/ngalert/accesscontrol/rules.go
@@ -0,0 +1,238 @@
+package accesscontrol
+
+import (
+	"fmt"
+
+	"golang.org/x/net/context"
+
+	"github.com/grafana/grafana/pkg/expr"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/store"
+)
+
+const (
+	ruleCreate = accesscontrol.ActionAlertingRuleCreate
+	ruleRead   = accesscontrol.ActionAlertingRuleRead
+	ruleUpdate = accesscontrol.ActionAlertingRuleUpdate
+	ruleDelete = accesscontrol.ActionAlertingRuleDelete
+)
+
+type RuleService struct {
+	ac accesscontrol.AccessControl
+}
+
+func NewRuleService(ac accesscontrol.AccessControl) *RuleService {
+	return &RuleService{
+		ac: ac,
+	}
+}
+
+// HasAccess returns true if the identity.Requester has all permissions specified by the evaluator. Returns error if access control backend could not evaluate permissions
+func (r *RuleService) HasAccess(ctx context.Context, user identity.Requester, evaluator accesscontrol.Evaluator) (bool, error) {
+	return r.ac.Evaluate(ctx, user, evaluator)
+}
+
+// HasAccessOrError returns nil if the identity.Requester has enough permissions to pass the accesscontrol.Evaluator. Otherwise, returns authorization error that contains action that was performed
+func (r *RuleService) HasAccessOrError(ctx context.Context, user identity.Requester, evaluator accesscontrol.Evaluator, action func() string) error {
+	has, err := r.HasAccess(ctx, user, evaluator)
+	if err != nil {
+		return err
+	}
+	if !has {
+		return NewAuthorizationErrorWithPermissions(action(), evaluator)
+	}
+	return nil
+}
+
+// getReadFolderAccessEvaluator constructs accesscontrol.Evaluator that checks all permissions required to read rules in  specific folder
+func getReadFolderAccessEvaluator(folderUID string) accesscontrol.Evaluator {
+	return accesscontrol.EvalAll(
+		accesscontrol.EvalPermission(ruleRead, dashboards.ScopeFoldersProvider.GetResourceScopeUID(folderUID)),
+		accesscontrol.EvalPermission(dashboards.ActionFoldersRead, dashboards.ScopeFoldersProvider.GetResourceScopeUID(folderUID)),
+	)
+}
+
+// getRulesReadEvaluator constructs accesscontrol.Evaluator that checks all permissions required to access provided rules
+func (r *RuleService) getRulesReadEvaluator(rules ...*models.AlertRule) accesscontrol.Evaluator {
+	added := make(map[string]struct{}, 1)
+	evals := make([]accesscontrol.Evaluator, 0, 1)
+	for _, rule := range rules {
+		if _, ok := added[rule.NamespaceUID]; ok {
+			continue
+		}
+		added[rule.NamespaceUID] = struct{}{}
+		evals = append(evals, getReadFolderAccessEvaluator(rule.NamespaceUID))
+	}
+	dsEvals := r.getRulesQueryEvaluator(rules...)
+	return accesscontrol.EvalAll(append(evals, dsEvals)...)
+}
+
+// getRulesQueryEvaluator constructs accesscontrol.Evaluator that checks all permissions to query data sources used by the provided rules
+func (r *RuleService) getRulesQueryEvaluator(rules ...*models.AlertRule) accesscontrol.Evaluator {
+	added := make(map[string]struct{}, 2)
+	evals := make([]accesscontrol.Evaluator, 0, 2)
+	for _, rule := range rules {
+		for _, query := range rule.Data {
+			if query.QueryType == expr.DatasourceType || query.DatasourceUID == expr.DatasourceUID || query.
+				DatasourceUID == expr.OldDatasourceUID {
+				continue
+			}
+			if _, ok := added[query.DatasourceUID]; ok {
+				continue
+			}
+			evals = append(evals, accesscontrol.EvalPermission(datasources.ActionQuery, datasources.ScopeProvider.GetResourceScopeUID(query.DatasourceUID)))
+			added[query.DatasourceUID] = struct{}{}
+		}
+	}
+	if len(evals) == 1 {
+		return evals[0]
+	}
+	return accesscontrol.EvalAll(evals...)
+}
+
+// AuthorizeDatasourceAccessForRule checks that user has access to all data sources declared by the rule
+func (r *RuleService) AuthorizeDatasourceAccessForRule(ctx context.Context, user identity.Requester, rule *models.AlertRule) error {
+	ds := r.getRulesQueryEvaluator(rule)
+	return r.HasAccessOrError(ctx, user, ds, func() string {
+		suffix := ""
+		if rule.UID != "" {
+			suffix = fmt.Sprintf(" of the rule UID '%s'", rule.UID)
+		}
+		return fmt.Sprintf("access one or many data sources%s", suffix)
+	})
+}
+
+// AuthorizeAccessToRuleGroup checks that the identity.Requester has permissions to all rules, which means that it has permissions to:
+// - ("folders:read") read folders which contain the rules
+// - ("alert.rules:read") read alert rules in the folders
+// - ("datasources:query") query all data sources that rules refer to
+// Returns false if the requester does not have enough permissions, and error if something went wrong during the permission evaluation.
+func (r *RuleService) HasAccessToRuleGroup(ctx context.Context, user identity.Requester, rules models.RulesGroup) (bool, error) {
+	eval := r.getRulesReadEvaluator(rules...)
+	return r.HasAccess(ctx, user, eval)
+}
+
+// AuthorizeAccessToRuleGroup checks that the identity.Requester has permissions to all rules, which means that it has permissions to:
+// - ("folders:read") read folders which contain the rules
+// - ("alert.rules:read") read alert rules in the folders
+// - ("datasources:query") query all data sources that rules refer to
+// Returns error if at least one permissions is missing or if something went wrong during the permission evaluation
+func (r *RuleService) AuthorizeAccessToRuleGroup(ctx context.Context, user identity.Requester, rules models.RulesGroup) error {
+	eval := r.getRulesReadEvaluator(rules...)
+	return r.HasAccessOrError(ctx, user, eval, func() string {
+		var groupName, folderUID string
+		if len(rules) > 0 {
+			groupName = rules[0].RuleGroup
+			folderUID = rules[0].NamespaceUID
+		}
+		return fmt.Sprintf("access rule group '%s' in folder '%s'", groupName, folderUID)
+	})
+}
+
+// AuthorizeRuleChanges analyzes changes in the rule group, and checks whether the changes are authorized.
+// NOTE: if there are rules for deletion, and the user does not have access to data sources that a rule uses, the rule is removed from the list.
+// If the user is not authorized to perform the changes the function returns ErrAuthorization with a description of what action is not authorized.
+func (r *RuleService) AuthorizeRuleChanges(ctx context.Context, user identity.Requester, change *store.GroupDelta) error {
+	namespaceScope := dashboards.ScopeFoldersProvider.GetResourceScopeUID(change.GroupKey.NamespaceUID)
+
+	rules, existingGroup := change.AffectedGroups[change.GroupKey]
+	if existingGroup { // not existingGroup can be when user creates a new rule group or moves existing alerts to a new group
+		if err := r.AuthorizeAccessToRuleGroup(ctx, user, rules); err != nil { // if user is not authorized to do operation in the group that is being changed
+			return err
+		}
+	} else if len(change.Delete) > 0 {
+		// add a safeguard in the case of inconsistency. If user hit this then there is a bug in the calculating of changes struct
+		return fmt.Errorf("failed to authorize changes in rule group %s. Detected %d deletes but group was not provided", change.GroupKey.RuleGroup, len(change.Delete))
+	}
+
+	if len(change.Delete) > 0 {
+		if err := r.HasAccessOrError(ctx, user, accesscontrol.EvalPermission(ruleDelete, namespaceScope), func() string {
+			return fmt.Sprintf("delete alert rules that belong to folder %s", change.GroupKey.NamespaceUID)
+		}); err != nil {
+			return err
+		}
+		for _, rule := range change.Delete {
+			if err := r.HasAccessOrError(ctx, user, r.getRulesQueryEvaluator(rule), func() string {
+				return fmt.Sprintf("delete an alert rule '%s'", rule.UID)
+			}); err != nil {
+				return err
+			}
+		}
+	}
+
+	var addAuthorized, updateAuthorized bool // these are needed to check authorization for the rule create\update only once
+	if len(change.New) > 0 {
+		if err := r.HasAccessOrError(ctx, user, accesscontrol.EvalPermission(ruleCreate, namespaceScope), func() string {
+			return fmt.Sprintf("create alert rules in the folder %s", change.GroupKey.NamespaceUID)
+		}); err != nil {
+			return err
+		}
+		addAuthorized = true
+		for _, rule := range change.New {
+			if err := r.HasAccessOrError(ctx, user, r.getRulesQueryEvaluator(rule), func() string {
+				return fmt.Sprintf("create a new alert rule '%s'", rule.Title)
+			}); err != nil {
+				return err
+			}
+		}
+		if !existingGroup {
+			// create a new group, check that user has "read" access to that new group. Otherwise, it will not be able to read it back.
+			if err := r.AuthorizeAccessToRuleGroup(ctx, user, change.New); err != nil { // if user is not authorized to do operation in the group that is being changed
+				return err
+			}
+		}
+	}
+
+	for _, rule := range change.Update {
+		if err := r.HasAccessOrError(ctx, user, r.getRulesQueryEvaluator(rule.New), func() string {
+			return fmt.Sprintf("update alert rule '%s' (UID: %s)", rule.Existing.Title, rule.Existing.UID)
+		}); err != nil {
+			return err
+		}
+
+		// Check if the rule is moved from one folder to the current. If yes, then the user must have the authorization to delete rules from the source folder and add rules to the target folder.
+		if rule.Existing.NamespaceUID != rule.New.NamespaceUID {
+			ev := accesscontrol.EvalPermission(ruleDelete, dashboards.ScopeFoldersProvider.GetResourceScopeUID(rule.Existing.NamespaceUID))
+			if err := r.HasAccessOrError(ctx, user, ev, func() string {
+				return fmt.Sprintf("move alert rules from folder %s", rule.Existing.NamespaceUID)
+			}); err != nil {
+				return err
+			}
+
+			if !addAuthorized {
+				if err := r.HasAccessOrError(ctx, user, accesscontrol.EvalPermission(ruleCreate, namespaceScope), func() string {
+					return fmt.Sprintf("move alert rules to folder '%s'", change.GroupKey.NamespaceUID)
+				}); err != nil {
+					return err
+				}
+				addAuthorized = true
+			}
+		} else if !updateAuthorized { // if it is false then the authorization was not checked. If it is true then the user is authorized to update rules
+			if err := r.HasAccessOrError(ctx, user, accesscontrol.EvalPermission(ruleUpdate, namespaceScope), func() string {
+				return fmt.Sprintf("update alert rules that belongs to folder '%s'", change.GroupKey.NamespaceUID)
+			}); err != nil {
+				return err
+			}
+			updateAuthorized = true
+		}
+
+		if rule.Existing.NamespaceUID != rule.New.NamespaceUID || rule.Existing.RuleGroup != rule.New.RuleGroup {
+			key := rule.Existing.GetGroupKey()
+			rules, existingGroup = change.AffectedGroups[key]
+			if !existingGroup {
+				// add a safeguard in the case of inconsistency. If user hit this then there is a bug in the calculating of changes struct
+				return fmt.Errorf("failed to authorize moving an alert rule %s between groups because unable to check access to group %s from which the rule is moved", rule.Existing.UID, rule.Existing.RuleGroup)
+			}
+			if err := r.HasAccessOrError(ctx, user, r.getRulesQueryEvaluator(rules...), func() string {
+				return fmt.Sprintf("move rule %s between two different groups because user does not have access to the source group %s", rule.Existing.UID, rule.Existing.RuleGroup)
+			}); err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
diff --git a/pkg/services/ngalert/accesscontrol/rules_test.go b/pkg/services/ngalert/accesscontrol/rules_test.go
new file mode 100644
index 0000000000000..a95b0e9b8ebf2
--- /dev/null
+++ b/pkg/services/ngalert/accesscontrol/rules_test.go
@@ -0,0 +1,503 @@
+package accesscontrol
+
+import (
+	"context"
+	"math"
+	"math/rand"
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/expr"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/folder"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/store"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/util"
+)
+
+func createAllCombinationsOfPermissions(permissions map[string][]string) []map[string][]string {
+	type actionscope struct {
+		action string
+		scope  string
+	}
+
+	var flattenPermissions []actionscope
+	for action, scopes := range permissions {
+		for _, scope := range scopes {
+			flattenPermissions = append(flattenPermissions, actionscope{
+				action,
+				scope,
+			})
+		}
+	}
+
+	l := len(flattenPermissions)
+	// this is all possible combinations of the permissions
+	var permissionCombinations []map[string][]string
+	for bit := uint(0); bit < uint(math.Pow(2, float64(l))); bit++ {
+		var tuple []actionscope
+		for idx := 0; idx < l; idx++ {
+			if (bit>>idx)&1 == 1 {
+				tuple = append(tuple, flattenPermissions[idx])
+			}
+		}
+
+		combination := make(map[string][]string)
+		for _, perm := range tuple {
+			combination[perm.action] = append(combination[perm.action], perm.scope)
+		}
+
+		permissionCombinations = append(permissionCombinations, combination)
+	}
+	return permissionCombinations
+}
+
+func getDatasourceScopesForRules(rules models.RulesGroup) []string {
+	scopesMap := map[string]struct{}{}
+	var result []string
+	for _, rule := range rules {
+		for _, query := range rule.Data {
+			scope := datasources.ScopeProvider.GetResourceScopeUID(query.DatasourceUID)
+			if _, ok := scopesMap[scope]; ok {
+				continue
+			}
+			result = append(result, scope)
+			scopesMap[scope] = struct{}{}
+		}
+	}
+	return result
+}
+
+func mapUpdates(updates []store.RuleDelta, mapFunc func(store.RuleDelta) *models.AlertRule) models.RulesGroup {
+	result := make(models.RulesGroup, 0, len(updates))
+	for _, update := range updates {
+		result = append(result, mapFunc(update))
+	}
+	return result
+}
+
+func createUserWithPermissions(permissions map[string][]string) identity.Requester {
+	return &user.SignedInUser{OrgID: 1, Permissions: map[int64]map[string][]string{
+		1: permissions,
+	}}
+}
+
+func TestAuthorizeRuleChanges(t *testing.T) {
+	groupKey := models.GenerateGroupKey(rand.Int63())
+	namespaceIdScope := dashboards.ScopeFoldersProvider.GetResourceScopeUID(groupKey.NamespaceUID)
+
+	testCases := []struct {
+		name        string
+		changes     func() *store.GroupDelta
+		permissions func(c *store.GroupDelta) map[string][]string
+	}{
+		{
+			name: "if there are rules to add it should check create action and query for datasource",
+			changes: func() *store.GroupDelta {
+				return &store.GroupDelta{
+					GroupKey: groupKey,
+					New:      models.GenerateAlertRules(rand.Intn(4)+1, models.AlertRuleGen(models.WithGroupKey(groupKey))),
+					Update:   nil,
+					Delete:   nil,
+				}
+			},
+			permissions: func(c *store.GroupDelta) map[string][]string {
+				var scopes []string
+				for _, rule := range c.New {
+					for _, query := range rule.Data {
+						scopes = append(scopes, datasources.ScopeProvider.GetResourceScopeUID(query.DatasourceUID))
+					}
+				}
+				return map[string][]string{
+					ruleCreate: {
+						namespaceIdScope,
+					},
+					ruleRead: {
+						namespaceIdScope,
+					},
+					dashboards.ActionFoldersRead: {
+						namespaceIdScope,
+					},
+					datasources.ActionQuery: scopes,
+				}
+			},
+		},
+		{
+			name: "if there are rules to delete it should check delete action and query for datasource",
+			changes: func() *store.GroupDelta {
+				rules := models.GenerateAlertRules(rand.Intn(4)+1, models.AlertRuleGen(models.WithGroupKey(groupKey)))
+				rules2 := models.GenerateAlertRules(rand.Intn(4)+1, models.AlertRuleGen(models.WithGroupKey(groupKey)))
+				return &store.GroupDelta{
+					GroupKey: groupKey,
+					AffectedGroups: map[models.AlertRuleGroupKey]models.RulesGroup{
+						groupKey: append(rules, rules2...),
+					},
+					New:    nil,
+					Update: nil,
+					Delete: rules2,
+				}
+			},
+			permissions: func(c *store.GroupDelta) map[string][]string {
+				return map[string][]string{
+					ruleRead: {
+						namespaceIdScope,
+					},
+					dashboards.ActionFoldersRead: {
+						namespaceIdScope,
+					},
+					ruleDelete: {
+						namespaceIdScope,
+					},
+					datasources.ActionQuery: getDatasourceScopesForRules(c.AffectedGroups[c.GroupKey]),
+				}
+			},
+		},
+		{
+			name: "if there are rules to update within the same namespace it should check update action and access to datasource",
+			changes: func() *store.GroupDelta {
+				rules1 := models.GenerateAlertRules(rand.Intn(4)+1, models.AlertRuleGen(models.WithGroupKey(groupKey)))
+				rules := models.GenerateAlertRules(rand.Intn(4)+1, models.AlertRuleGen(models.WithGroupKey(groupKey)))
+				updates := make([]store.RuleDelta, 0, len(rules))
+
+				for _, rule := range rules {
+					cp := models.CopyRule(rule)
+					cp.Data = []models.AlertQuery{models.GenerateAlertQuery()}
+					updates = append(updates, store.RuleDelta{
+						Existing: rule,
+						New:      cp,
+						Diff:     nil,
+					})
+				}
+
+				return &store.GroupDelta{
+					GroupKey: groupKey,
+					AffectedGroups: map[models.AlertRuleGroupKey]models.RulesGroup{
+						groupKey: append(rules, rules1...),
+					},
+					New:    nil,
+					Update: updates,
+					Delete: nil,
+				}
+			},
+			permissions: func(c *store.GroupDelta) map[string][]string {
+				scopes := getDatasourceScopesForRules(append(c.AffectedGroups[c.GroupKey], mapUpdates(c.Update, func(update store.RuleDelta) *models.AlertRule {
+					return update.New
+				})...))
+				return map[string][]string{
+					ruleRead: {
+						namespaceIdScope,
+					},
+					dashboards.ActionFoldersRead: {
+						namespaceIdScope,
+					},
+					ruleUpdate: {
+						namespaceIdScope,
+					},
+					datasources.ActionQuery: scopes,
+				}
+			},
+		},
+		{
+			name: "if there are rules that are moved between namespaces it should check delete+add action and access to group where rules come from",
+			changes: func() *store.GroupDelta {
+				rules1 := models.GenerateAlertRules(rand.Intn(4)+1, models.AlertRuleGen(models.WithGroupKey(groupKey)))
+				rules := models.GenerateAlertRules(rand.Intn(4)+1, models.AlertRuleGen(models.WithGroupKey(groupKey)))
+
+				targetGroupKey := models.GenerateGroupKey(groupKey.OrgID)
+
+				updates := make([]store.RuleDelta, 0, len(rules))
+				for _, rule := range rules {
+					cp := models.CopyRule(rule)
+					models.WithGroupKey(targetGroupKey)(cp)
+					cp.Data = []models.AlertQuery{
+						models.GenerateAlertQuery(),
+					}
+
+					updates = append(updates, store.RuleDelta{
+						Existing: rule,
+						New:      cp,
+					})
+				}
+
+				return &store.GroupDelta{
+					GroupKey: targetGroupKey,
+					AffectedGroups: map[models.AlertRuleGroupKey]models.RulesGroup{
+						groupKey: append(rules, rules1...),
+					},
+					New:    nil,
+					Update: updates,
+					Delete: nil,
+				}
+			},
+			permissions: func(c *store.GroupDelta) map[string][]string {
+				dsScopes := getDatasourceScopesForRules(
+					append(append(append(c.AffectedGroups[c.GroupKey],
+						mapUpdates(c.Update, func(update store.RuleDelta) *models.AlertRule {
+							return update.New
+						})...,
+					), mapUpdates(c.Update, func(update store.RuleDelta) *models.AlertRule {
+						return update.Existing
+					})...), c.AffectedGroups[groupKey]...),
+				)
+
+				var deleteScopes []string
+				for key := range c.AffectedGroups {
+					deleteScopes = append(deleteScopes, dashboards.ScopeFoldersProvider.GetResourceScopeUID(key.NamespaceUID))
+				}
+
+				return map[string][]string{
+					ruleDelete: deleteScopes,
+					ruleCreate: {
+						dashboards.ScopeFoldersProvider.GetResourceScopeUID(c.GroupKey.NamespaceUID),
+					},
+					datasources.ActionQuery: dsScopes,
+				}
+			},
+		},
+		{
+			name: "if there are rules that are moved between groups in the same namespace it should check update action and access to all groups (source+target)",
+			changes: func() *store.GroupDelta {
+				targetGroupKey := models.AlertRuleGroupKey{
+					OrgID:        groupKey.OrgID,
+					NamespaceUID: groupKey.NamespaceUID,
+					RuleGroup:    util.GenerateShortUID(),
+				}
+				sourceGroup := models.GenerateAlertRules(rand.Intn(4)+1, models.AlertRuleGen(models.WithGroupKey(groupKey)))
+				targetGroup := models.GenerateAlertRules(rand.Intn(4)+1, models.AlertRuleGen(models.WithGroupKey(targetGroupKey)))
+
+				updates := make([]store.RuleDelta, 0, len(sourceGroup))
+				toCopy := len(sourceGroup)
+				if toCopy > 1 {
+					toCopy = rand.Intn(toCopy-1) + 1
+				}
+				for i := 0; i < toCopy; i++ {
+					rule := sourceGroup[0]
+					cp := models.CopyRule(rule)
+					models.WithGroupKey(targetGroupKey)(cp)
+					cp.Data = []models.AlertQuery{
+						models.GenerateAlertQuery(),
+					}
+
+					updates = append(updates, store.RuleDelta{
+						Existing: rule,
+						New:      cp,
+					})
+				}
+
+				return &store.GroupDelta{
+					GroupKey: targetGroupKey,
+					AffectedGroups: map[models.AlertRuleGroupKey]models.RulesGroup{
+						groupKey:       sourceGroup,
+						targetGroupKey: targetGroup,
+					},
+					New:    nil,
+					Update: updates,
+					Delete: nil,
+				}
+			},
+			permissions: func(c *store.GroupDelta) map[string][]string {
+				scopes := make(map[string]struct{})
+				for _, update := range c.Update {
+					for _, query := range update.New.Data {
+						scopes[datasources.ScopeProvider.GetResourceScopeUID(query.DatasourceUID)] = struct{}{}
+					}
+					for _, query := range update.Existing.Data {
+						scopes[datasources.ScopeProvider.GetResourceScopeUID(query.DatasourceUID)] = struct{}{}
+					}
+				}
+				for _, rules := range c.AffectedGroups {
+					for _, rule := range rules {
+						for _, query := range rule.Data {
+							scopes[datasources.ScopeProvider.GetResourceScopeUID(query.DatasourceUID)] = struct{}{}
+						}
+					}
+				}
+
+				dsScopes := make([]string, 0, len(scopes))
+				for key := range scopes {
+					dsScopes = append(dsScopes, key)
+				}
+
+				return map[string][]string{
+					ruleRead: {
+						dashboards.ScopeFoldersProvider.GetResourceScopeUID(c.GroupKey.NamespaceUID),
+					},
+					dashboards.ActionFoldersRead: {
+						dashboards.ScopeFoldersProvider.GetResourceScopeUID(c.GroupKey.NamespaceUID),
+					},
+					ruleUpdate: {
+						dashboards.ScopeFoldersProvider.GetResourceScopeUID(c.GroupKey.NamespaceUID),
+					},
+					datasources.ActionQuery: dsScopes,
+				}
+			},
+		},
+	}
+
+	for _, testCase := range testCases {
+		t.Run(testCase.name, func(t *testing.T) {
+			groupChanges := testCase.changes()
+			permissions := testCase.permissions(groupChanges)
+
+			t.Run("should fail with insufficient permissions", func(t *testing.T) {
+				permissionCombinations := createAllCombinationsOfPermissions(permissions)
+				permissionCombinations = permissionCombinations[0 : len(permissionCombinations)-1] // exclude all permissions
+				for _, missing := range permissionCombinations {
+					ac := &recordingAccessControlFake{}
+					srv := RuleService{
+						ac: ac,
+					}
+					err := srv.AuthorizeRuleChanges(context.Background(), createUserWithPermissions(missing), groupChanges)
+
+					assert.Errorf(t, err, "expected error because less permissions than expected were provided. Provided: %v; Expected: %v; Diff: %v", missing, permissions, cmp.Diff(permissions, missing))
+					require.NotEmptyf(t, ac.EvaluateRecordings, "Access control was supposed to be called but it was not")
+				}
+			})
+
+			ac := &recordingAccessControlFake{
+				Callback: func(user identity.Requester, evaluator accesscontrol.Evaluator) (bool, error) {
+					response := evaluator.Evaluate(user.GetPermissions())
+					require.Truef(t, response, "provided permissions [%v] is not enough for requested permissions [%s]", permissions, evaluator.GoString())
+					return response, nil
+				},
+			}
+			srv := RuleService{
+				ac: ac,
+			}
+			err := srv.AuthorizeRuleChanges(context.Background(), createUserWithPermissions(permissions), groupChanges)
+			require.NoError(t, err)
+			require.NotEmptyf(t, ac.EvaluateRecordings, "evaluation function is expected to be called but it was not.")
+		})
+	}
+}
+
+func TestCheckDatasourcePermissionsForRule(t *testing.T) {
+	rule := models.AlertRuleGen()()
+
+	expressionByType := models.GenerateAlertQuery()
+	expressionByType.QueryType = expr.DatasourceType
+	expressionByUID := models.GenerateAlertQuery()
+	expressionByUID.DatasourceUID = expr.DatasourceUID
+
+	var data []models.AlertQuery
+	var scopes []string
+	for i := 0; i < rand.Intn(3)+2; i++ {
+		q := models.GenerateAlertQuery()
+		scopes = append(scopes, datasources.ScopeProvider.GetResourceScopeUID(q.DatasourceUID))
+		data = append(data, q)
+	}
+
+	data = append(data, expressionByType, expressionByUID)
+	rand.Shuffle(len(data), func(i, j int) {
+		data[j], data[i] = data[i], data[j]
+	})
+
+	rule.Data = data
+
+	t.Run("should check only expressions", func(t *testing.T) {
+		permissions := map[string][]string{
+			ruleRead: {
+				dashboards.ScopeFoldersProvider.GetResourceScopeUID(rule.NamespaceUID),
+			},
+			dashboards.ActionFoldersRead: {
+				dashboards.ScopeFoldersProvider.GetResourceScopeUID(rule.NamespaceUID),
+			},
+			datasources.ActionQuery: scopes,
+		}
+
+		ac := &recordingAccessControlFake{}
+		svc := RuleService{
+			ac: ac,
+		}
+
+		eval := svc.AuthorizeDatasourceAccessForRule(context.Background(), createUserWithPermissions(permissions), rule)
+
+		require.NoError(t, eval)
+		require.Len(t, ac.EvaluateRecordings, 1)
+	})
+
+	t.Run("should return on first negative evaluation", func(t *testing.T) {
+		ac := &recordingAccessControlFake{
+			Callback: func(user identity.Requester, evaluator accesscontrol.Evaluator) (bool, error) {
+				return false, nil
+			},
+		}
+		svc := RuleService{
+			ac: ac,
+		}
+
+		result := svc.AuthorizeDatasourceAccessForRule(context.Background(), createUserWithPermissions(nil), rule)
+
+		require.Error(t, result)
+		require.Len(t, ac.EvaluateRecordings, 1)
+	})
+}
+
+func Test_authorizeAccessToRuleGroup(t *testing.T) {
+	t.Run("should return true if user has access to all datasources of all rules in group", func(t *testing.T) {
+		rules := models.GenerateAlertRules(rand.Intn(4)+1, models.AlertRuleGen())
+		var scopes []string
+		for _, rule := range rules {
+			for _, query := range rule.Data {
+				scopes = append(scopes, datasources.ScopeProvider.GetResourceScopeUID(query.DatasourceUID))
+			}
+		}
+		namespaceScopes := make([]string, 0)
+		for _, rule := range rules {
+			namespaceScopes = append(namespaceScopes, dashboards.ScopeFoldersProvider.GetResourceScopeUID(rule.NamespaceUID))
+		}
+		permissions := map[string][]string{
+			ruleRead:                     namespaceScopes,
+			dashboards.ActionFoldersRead: namespaceScopes,
+			datasources.ActionQuery:      scopes,
+		}
+		ac := &recordingAccessControlFake{}
+		svc := RuleService{
+			ac: ac,
+		}
+
+		result := svc.AuthorizeAccessToRuleGroup(context.Background(), createUserWithPermissions(permissions), rules)
+
+		require.NoError(t, result)
+		require.NotEmpty(t, ac.EvaluateRecordings)
+	})
+	t.Run("should return false if user does not have access to at least one rule in group", func(t *testing.T) {
+		f := &folder.Folder{UID: "test-folder"}
+		rules := models.GenerateAlertRules(rand.Intn(4)+1, models.AlertRuleGen(models.WithNamespace(f)))
+		var scopes []string
+		for _, rule := range rules {
+			for _, query := range rule.Data {
+				scopes = append(scopes, datasources.ScopeProvider.GetResourceScopeUID(query.DatasourceUID))
+			}
+		}
+		permissions := map[string][]string{
+			ruleRead: {
+				dashboards.ScopeFoldersProvider.GetResourceScopeUID(f.UID),
+			},
+			dashboards.ActionFoldersRead: {
+				dashboards.ScopeFoldersProvider.GetResourceScopeUID(f.UID),
+			},
+			datasources.ActionQuery: scopes,
+		}
+
+		rule := models.AlertRuleGen(models.WithNamespace(f))()
+		rules = append(rules, rule)
+
+		ac := &recordingAccessControlFake{}
+
+		svc := RuleService{
+			ac: ac,
+		}
+
+		result := svc.AuthorizeAccessToRuleGroup(context.Background(), createUserWithPermissions(permissions), rules)
+
+		require.Error(t, result)
+	})
+}
diff --git a/pkg/services/ngalert/accesscontrol/testing.go b/pkg/services/ngalert/accesscontrol/testing.go
new file mode 100644
index 0000000000000..6e99264f7e13e
--- /dev/null
+++ b/pkg/services/ngalert/accesscontrol/testing.go
@@ -0,0 +1,39 @@
+package accesscontrol
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+)
+
+type recordingAccessControlFake struct {
+	Disabled           bool
+	EvaluateRecordings []struct {
+		Permissions map[string][]string
+		Evaluator   accesscontrol.Evaluator
+	}
+	Callback func(user identity.Requester, evaluator accesscontrol.Evaluator) (bool, error)
+}
+
+func (a *recordingAccessControlFake) Evaluate(_ context.Context, ur identity.Requester, evaluator accesscontrol.Evaluator) (bool, error) {
+	a.EvaluateRecordings = append(a.EvaluateRecordings, struct {
+		Permissions map[string][]string
+		Evaluator   accesscontrol.Evaluator
+	}{Permissions: ur.GetPermissions(), Evaluator: evaluator})
+	if a.Callback == nil {
+		return evaluator.Evaluate(ur.GetPermissions()), nil
+	}
+	return a.Callback(ur, evaluator)
+}
+
+func (a *recordingAccessControlFake) RegisterScopeAttributeResolver(prefix string, resolver accesscontrol.ScopeAttributeResolver) {
+	// TODO implement me
+	panic("implement me")
+}
+
+func (a *recordingAccessControlFake) IsDisabled() bool {
+	return a.Disabled
+}
+
+var _ accesscontrol.AccessControl = &recordingAccessControlFake{}
diff --git a/pkg/services/ngalert/api/api.go b/pkg/services/ngalert/api/api.go
index a64825f27045b..fcbe4e498eab1 100644
--- a/pkg/services/ngalert/api/api.go
+++ b/pkg/services/ngalert/api/api.go
@@ -8,10 +8,12 @@ import (
 	"github.com/grafana/grafana/pkg/api/routing"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
-	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/datasourceproxy"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/ngalert/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/ngalert/backtesting"
 	"github.com/grafana/grafana/pkg/services/ngalert/eval"
 	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
@@ -34,7 +36,14 @@ type ExternalAlertmanagerProvider interface {
 }
 
 type AlertingStore interface {
-	GetLatestAlertmanagerConfiguration(ctx context.Context, query *models.GetLatestAlertmanagerConfigurationQuery) (*models.AlertConfiguration, error)
+	GetLatestAlertmanagerConfiguration(ctx context.Context, orgID int64) (*models.AlertConfiguration, error)
+}
+
+type RuleAccessControlService interface {
+	HasAccessToRuleGroup(ctx context.Context, user identity.Requester, rules models.RulesGroup) (bool, error)
+	AuthorizeAccessToRuleGroup(ctx context.Context, user identity.Requester, rules models.RulesGroup) error
+	AuthorizeRuleChanges(ctx context.Context, user identity.Requester, change *store.GroupDelta) error
+	AuthorizeDatasourceAccessForRule(ctx context.Context, user identity.Requester, rule *models.AlertRule) error
 }
 
 // API handlers.
@@ -47,13 +56,14 @@ type API struct {
 	TransactionManager   provisioning.TransactionManager
 	ProvenanceStore      provisioning.ProvisioningStore
 	RuleStore            RuleStore
-	AlertingStore        AlertingStore
+	AlertingStore        store.AlertingStore
 	AdminConfigStore     store.AdminConfigurationStore
 	DataProxy            *datasourceproxy.DataSourceProxyService
 	MultiOrgAlertmanager *notifier.MultiOrgAlertmanager
 	StateManager         *state.Manager
-	AccessControl        accesscontrol.AccessControl
+	AccessControl        ac.AccessControl
 	Policies             *provisioning.NotificationPolicyService
+	ReceiverService      *notifier.ReceiverService
 	ContactPointService  *provisioning.ContactPointService
 	Templates            *provisioning.TemplateService
 	MuteTimings          *provisioning.MuteTimingService
@@ -76,6 +86,7 @@ func (api *API) RegisterAPIEndpoints(m *metrics.API) {
 		DataProxy: api.DataProxy,
 		ac:        api.AccessControl,
 	}
+	ruleAuthzService := accesscontrol.NewRuleService(api.AccessControl)
 
 	// Register endpoints for proxying to Alertmanager-compatible backends.
 	api.RegisterAlertmanagerApiEndpoints(NewForkingAM(
@@ -87,7 +98,7 @@ func (api *API) RegisterAPIEndpoints(m *metrics.API) {
 	api.RegisterPrometheusApiEndpoints(NewForkingProm(
 		api.DatasourceCache,
 		NewLotexProm(proxy, logger),
-		&PrometheusSrv{log: logger, manager: api.StateManager, store: api.RuleStore, ac: api.AccessControl},
+		&PrometheusSrv{log: logger, manager: api.StateManager, store: api.RuleStore, authz: ruleAuthzService},
 	), m)
 	// Register endpoints for proxying to Cortex Ruler-compatible backends.
 	api.RegisterRulerApiEndpoints(NewForkingRuler(
@@ -101,7 +112,10 @@ func (api *API) RegisterAPIEndpoints(m *metrics.API) {
 			xactManager:        api.TransactionManager,
 			log:                logger,
 			cfg:                &api.Cfg.UnifiedAlerting,
-			ac:                 api.AccessControl,
+			authz:              ruleAuthzService,
+			amConfigStore:      api.AlertingStore,
+			amRefresher:        api.MultiOrgAlertmanager,
+			featureManager:     api.FeatureManager,
 		},
 	), m)
 	api.RegisterTestingApiEndpoints(NewTestingApi(
@@ -109,13 +123,14 @@ func (api *API) RegisterAPIEndpoints(m *metrics.API) {
 			AlertingProxy:   proxy,
 			DatasourceCache: api.DatasourceCache,
 			log:             logger,
-			accessControl:   api.AccessControl,
+			authz:           ruleAuthzService,
 			evaluator:       api.EvaluatorFactory,
 			cfg:             &api.Cfg.UnifiedAlerting,
 			backtesting:     backtesting.NewEngine(api.AppUrl, api.EvaluatorFactory, api.Tracer),
 			featureManager:  api.FeatureManager,
 			appUrl:          api.AppUrl,
 			tracer:          api.Tracer,
+			folderService:   api.RuleStore,
 		}), m)
 	api.RegisterConfigurationApiEndpoints(NewConfiguration(
 		&ConfigSrv{
@@ -139,35 +154,10 @@ func (api *API) RegisterAPIEndpoints(m *metrics.API) {
 		logger: logger,
 		hist:   api.Historian,
 	}), m)
-}
-
-func (api *API) Usage(ctx context.Context, scopeParams *quota.ScopeParameters) (*quota.Map, error) {
-	u := &quota.Map{}
-
-	var orgID int64 = 0
-	if scopeParams != nil {
-		orgID = scopeParams.OrgID
-	}
 
-	if orgUsage, err := api.RuleStore.Count(ctx, orgID); err != nil {
-		return u, err
-	} else {
-		tag, err := quota.NewTag(models.QuotaTargetSrv, models.QuotaTarget, quota.OrgScope)
-		if err != nil {
-			return u, err
-		}
-		u.Set(tag, orgUsage)
-	}
-
-	if globalUsage, err := api.RuleStore.Count(ctx, 0); err != nil {
-		return u, err
-	} else {
-		tag, err := quota.NewTag(models.QuotaTargetSrv, models.QuotaTarget, quota.GlobalScope)
-		if err != nil {
-			return u, err
-		}
-		u.Set(tag, globalUsage)
-	}
-
-	return u, nil
+	api.RegisterNotificationsApiEndpoints(NewNotificationsApi(&NotificationSrv{
+		logger:            logger,
+		receiverService:   api.ReceiverService,
+		muteTimingService: api.MuteTimings,
+	}), m)
 }
diff --git a/pkg/services/ngalert/api/api_alertmanager.go b/pkg/services/ngalert/api/api_alertmanager.go
index aea9d89382e5e..aa53a83c93fd8 100644
--- a/pkg/services/ngalert/api/api_alertmanager.go
+++ b/pkg/services/ngalert/api/api_alertmanager.go
@@ -10,15 +10,18 @@ import (
 	"time"
 
 	"github.com/go-openapi/strfmt"
+
 	alertingNotify "github.com/grafana/alerting/notify"
 
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	authz "github.com/grafana/grafana/pkg/services/ngalert/accesscontrol"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/ngalert/notifier"
 	"github.com/grafana/grafana/pkg/services/ngalert/store"
+	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/util"
 )
 
@@ -48,7 +51,12 @@ func (srv AlertmanagerSrv) RouteGetAMStatus(c *contextmodel.ReqContext) response
 		return errResp
 	}
 
-	return response.JSON(http.StatusOK, am.GetStatus())
+	status := am.GetStatus()
+	if !c.SignedInUser.HasRole(org.RoleAdmin) {
+		notifier.RemoveAutogenConfigIfExists(status.Config.Route)
+	}
+
+	return response.JSON(http.StatusOK, status)
 }
 
 func (srv AlertmanagerSrv) RouteCreateSilence(c *contextmodel.ReqContext, postableSilence apimodels.PostableSilence) response.Response {
@@ -67,12 +75,13 @@ func (srv AlertmanagerSrv) RouteCreateSilence(c *contextmodel.ReqContext, postab
 	if postableSilence.ID == "" {
 		action = accesscontrol.ActionAlertingInstanceCreate
 	}
-	if !accesscontrol.HasAccess(srv.ac, c)(accesscontrol.EvalPermission(action)) {
+	evaluator := accesscontrol.EvalPermission(action)
+	if !accesscontrol.HasAccess(srv.ac, c)(evaluator) {
 		errAction := "update"
 		if postableSilence.ID == "" {
 			errAction = "create"
 		}
-		return ErrResp(http.StatusUnauthorized, fmt.Errorf("user is not authorized to %s silences", errAction), "")
+		return response.Err(authz.NewAuthorizationErrorWithPermissions(fmt.Sprintf("%s silences", errAction), evaluator))
 	}
 
 	silenceID, err := am.CreateSilence(c.Req.Context(), &postableSilence)
@@ -122,7 +131,8 @@ func (srv AlertmanagerSrv) RouteDeleteSilence(c *contextmodel.ReqContext, silenc
 }
 
 func (srv AlertmanagerSrv) RouteGetAlertingConfig(c *contextmodel.ReqContext) response.Response {
-	config, err := srv.mam.GetAlertmanagerConfiguration(c.Req.Context(), c.SignedInUser.GetOrgID())
+	canSeeAutogen := c.SignedInUser.HasRole(org.RoleAdmin)
+	config, err := srv.mam.GetAlertmanagerConfiguration(c.Req.Context(), c.SignedInUser.GetOrgID(), canSeeAutogen)
 	if err != nil {
 		if errors.Is(err, store.ErrNoAlertmanagerConfiguration) {
 			return ErrResp(http.StatusNotFound, err, "")
@@ -262,7 +272,10 @@ func (srv AlertmanagerSrv) RoutePostGrafanaAlertingConfigHistoryActivate(c *cont
 }
 
 func (srv AlertmanagerSrv) RoutePostAlertingConfig(c *contextmodel.ReqContext, body apimodels.PostableUserConfig) response.Response {
-	currentConfig, err := srv.mam.GetAlertmanagerConfiguration(c.Req.Context(), c.SignedInUser.GetOrgID())
+	// Remove autogenerated config from the user config before checking provenance guard and eventually saving it.
+	// TODO: This and provenance guard should be moved to the notifier package.
+	notifier.RemoveAutogenConfigIfExists(body.AlertmanagerConfig.Route)
+	currentConfig, err := srv.mam.GetAlertmanagerConfiguration(c.Req.Context(), c.SignedInUser.GetOrgID(), false)
 	// If a config is present and valid we proceed with the guard, otherwise we
 	// just bypass the guard which is okay as we are anyway in an invalid state.
 	if err == nil {
@@ -270,7 +283,7 @@ func (srv AlertmanagerSrv) RoutePostAlertingConfig(c *contextmodel.ReqContext, b
 			return ErrResp(http.StatusBadRequest, err, "")
 		}
 	}
-	err = srv.mam.ApplyAlertmanagerConfiguration(c.Req.Context(), c.SignedInUser.GetOrgID(), body)
+	err = srv.mam.SaveAndApplyAlertmanagerConfiguration(c.Req.Context(), c.SignedInUser.GetOrgID(), body)
 	if err == nil {
 		return response.JSON(http.StatusAccepted, util.DynMap{"message": "configuration created"})
 	}
@@ -289,7 +302,7 @@ func (srv AlertmanagerSrv) RoutePostAlertingConfig(c *contextmodel.ReqContext, b
 		return response.Error(http.StatusConflict, err.Error(), err)
 	}
 
-	return ErrResp(http.StatusInternalServerError, err, "")
+	return response.ErrOrFallback(http.StatusInternalServerError, err.Error(), err)
 }
 
 func (srv AlertmanagerSrv) RouteGetReceivers(c *contextmodel.ReqContext) response.Response {
diff --git a/pkg/services/ngalert/api/api_alertmanager_guards.go b/pkg/services/ngalert/api/api_alertmanager_guards.go
index 1b1f7b438d67b..90b6dd9225461 100644
--- a/pkg/services/ngalert/api/api_alertmanager_guards.go
+++ b/pkg/services/ngalert/api/api_alertmanager_guards.go
@@ -3,6 +3,7 @@ package api
 import (
 	"encoding/json"
 	"fmt"
+	"time"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
@@ -137,7 +138,14 @@ func checkMuteTimes(currentConfig apimodels.GettableUserConfig, newConfig apimod
 			return fmt.Errorf("cannot delete provisioned mute time '%s'", muteTime.Name)
 		}
 		reporter := cmputil.DiffReporter{}
-		options := []cmp.Option{cmp.Reporter(&reporter), cmpopts.EquateEmpty()}
+		options := []cmp.Option{
+			cmp.Reporter(&reporter),
+			cmp.Comparer(func(a, b *time.Location) bool {
+				// Check if both are nil or both have the same string representation
+				return (a == nil && b == nil) || (a != nil && b != nil && a.String() == b.String())
+			}),
+			cmpopts.EquateEmpty(),
+		}
 		timesEqual := cmp.Equal(muteTime.TimeIntervals, postedMT.TimeIntervals, options...)
 		if !timesEqual {
 			return fmt.Errorf("cannot save provisioned mute time '%s'", muteTime.Name)
diff --git a/pkg/services/ngalert/api/api_alertmanager_guards_test.go b/pkg/services/ngalert/api/api_alertmanager_guards_test.go
index d0219ed02f02e..93f0d8dcf630f 100644
--- a/pkg/services/ngalert/api/api_alertmanager_guards_test.go
+++ b/pkg/services/ngalert/api/api_alertmanager_guards_test.go
@@ -2,6 +2,7 @@ package api
 
 import (
 	"testing"
+	"time"
 
 	amConfig "github.com/prometheus/alertmanager/config"
 	"github.com/prometheus/alertmanager/pkg/labels"
@@ -563,6 +564,7 @@ func defaultInterval(t *testing.T) []timeinterval.TimeInterval {
 	t.Helper()
 	return []timeinterval.TimeInterval{
 		{
+			Location: &timeinterval.Location{Location: time.Local},
 			Years: []timeinterval.YearRange{
 				{
 					InclusiveRange: timeinterval.InclusiveRange{
diff --git a/pkg/services/ngalert/api/api_alertmanager_test.go b/pkg/services/ngalert/api/api_alertmanager_test.go
index 8ab0b168b4aa5..879ad9a39d78e 100644
--- a/pkg/services/ngalert/api/api_alertmanager_test.go
+++ b/pkg/services/ngalert/api/api_alertmanager_test.go
@@ -10,8 +10,11 @@ import (
 	"time"
 
 	"github.com/go-openapi/strfmt"
+	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 	alertingNotify "github.com/grafana/alerting/notify"
 	amv2 "github.com/prometheus/alertmanager/api/v2/models"
+	"github.com/prometheus/alertmanager/pkg/labels"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/require"
 
@@ -20,6 +23,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
 	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
@@ -325,6 +329,131 @@ func TestAlertmanagerConfig(t *testing.T) {
 	})
 }
 
+func TestAlertmanagerAutogenConfig(t *testing.T) {
+	createSutForAutogen := func(t *testing.T) (AlertmanagerSrv, map[int64]*ngmodels.AlertConfiguration) {
+		sut := createSut(t)
+		configs := map[int64]*ngmodels.AlertConfiguration{
+			1: {AlertmanagerConfiguration: validConfig, OrgID: 1},
+			2: {AlertmanagerConfiguration: validConfigWithoutAutogen, OrgID: 2},
+		}
+		sut.mam = createMultiOrgAlertmanager(t, configs)
+		return sut, configs
+	}
+
+	compare := func(t *testing.T, expectedAm string, testAm string) {
+		test, err := notifier.Load([]byte(testAm))
+		require.NoError(t, err)
+
+		exp, err := notifier.Load([]byte(expectedAm))
+		require.NoError(t, err)
+
+		cOpt := []cmp.Option{
+			cmpopts.IgnoreUnexported(apimodels.PostableUserConfig{}, apimodels.Route{}, labels.Matcher{}),
+			cmpopts.IgnoreFields(apimodels.PostableGrafanaReceiver{}, "UID", "Settings"),
+		}
+		if !cmp.Equal(test, exp, cOpt...) {
+			t.Errorf("Unexpected AM Config: %v", cmp.Diff(test, exp, cOpt...))
+		}
+	}
+
+	t.Run("route POST config", func(t *testing.T) {
+		t.Run("does not save autogen routes", func(t *testing.T) {
+			sut, configs := createSutForAutogen(t)
+			rc := createRequestCtxInOrg(1)
+			request := createAmConfigRequest(t, validConfigWithAutogen)
+			response := sut.RoutePostAlertingConfig(rc, request)
+			require.Equal(t, 202, response.Status())
+
+			compare(t, validConfigWithoutAutogen, configs[1].AlertmanagerConfiguration)
+		})
+
+		t.Run("provenance guard ignores autogen routes", func(t *testing.T) {
+			sut := createSut(t)
+			rc := createRequestCtxInOrg(1)
+			request := createAmConfigRequest(t, validConfigWithoutAutogen)
+			_ = sut.RoutePostAlertingConfig(rc, request)
+
+			setRouteProvenance(t, 1, sut.mam.ProvStore)
+			request = createAmConfigRequest(t, validConfigWithAutogen)
+			request.AlertmanagerConfig.Route.Provenance = apimodels.Provenance(ngmodels.ProvenanceAPI)
+			response := sut.RoutePostAlertingConfig(rc, request)
+			require.Equal(t, 202, response.Status())
+		})
+	})
+
+	t.Run("route GET config", func(t *testing.T) {
+		t.Run("when admin return autogen routes", func(t *testing.T) {
+			sut, _ := createSutForAutogen(t)
+
+			rc := createRequestCtxInOrg(2)
+			rc.SignedInUser.OrgRole = org.RoleAdmin
+
+			response := sut.RouteGetAlertingConfig(rc)
+			require.Equal(t, 200, response.Status())
+
+			compare(t, validConfigWithAutogen, string(response.Body()))
+		})
+
+		t.Run("when not admin return no autogen routes", func(t *testing.T) {
+			sut, _ := createSutForAutogen(t)
+
+			rc := createRequestCtxInOrg(2)
+
+			response := sut.RouteGetAlertingConfig(rc)
+			require.Equal(t, 200, response.Status())
+
+			compare(t, validConfigWithoutAutogen, string(response.Body()))
+		})
+	})
+
+	t.Run("route GET status", func(t *testing.T) {
+		t.Run("when admin return autogen routes", func(t *testing.T) {
+			sut, _ := createSutForAutogen(t)
+
+			rc := createRequestCtxInOrg(2)
+			rc.SignedInUser.OrgRole = org.RoleAdmin
+
+			response := sut.RouteGetAMStatus(rc)
+			require.Equal(t, 200, response.Status())
+
+			var status struct {
+				Config apimodels.PostableApiAlertingConfig `json:"config"`
+			}
+			err := json.Unmarshal(response.Body(), &status)
+			require.NoError(t, err)
+			configBody, err := json.Marshal(apimodels.PostableUserConfig{
+				TemplateFiles:      map[string]string{"a": "template"},
+				AlertmanagerConfig: status.Config,
+			})
+			require.NoError(t, err)
+
+			compare(t, validConfigWithAutogen, string(configBody))
+		})
+
+		t.Run("when not admin return no autogen routes", func(t *testing.T) {
+			sut, _ := createSutForAutogen(t)
+
+			rc := createRequestCtxInOrg(2)
+
+			response := sut.RouteGetAMStatus(rc)
+			require.Equal(t, 200, response.Status())
+
+			var status struct {
+				Config apimodels.PostableApiAlertingConfig `json:"config"`
+			}
+			err := json.Unmarshal(response.Body(), &status)
+			require.NoError(t, err)
+			configBody, err := json.Marshal(apimodels.PostableUserConfig{
+				TemplateFiles:      map[string]string{"a": "template"},
+				AlertmanagerConfig: status.Config,
+			})
+			require.NoError(t, err)
+
+			compare(t, validConfigWithoutAutogen, string(configBody))
+		})
+	})
+}
+
 func TestRouteGetAlertingConfigHistory(t *testing.T) {
 	sut := createSut(t)
 
@@ -571,7 +700,7 @@ func TestRouteCreateSilence(t *testing.T) {
 			permissions: map[int64]map[string][]string{
 				1: {},
 			},
-			expectedStatus: http.StatusUnauthorized,
+			expectedStatus: http.StatusForbidden,
 		},
 		{
 			name:    "new silence, role-based access control is enabled, authorized",
@@ -587,7 +716,7 @@ func TestRouteCreateSilence(t *testing.T) {
 			permissions: map[int64]map[string][]string{
 				1: {accesscontrol.ActionAlertingInstanceCreate: {}},
 			},
-			expectedStatus: http.StatusUnauthorized,
+			expectedStatus: http.StatusForbidden,
 		},
 		{
 			name:    "update silence, role-based access control is enabled, authorized",
@@ -633,7 +762,12 @@ func TestRouteCreateSilence(t *testing.T) {
 func createSut(t *testing.T) AlertmanagerSrv {
 	t.Helper()
 
-	mam := createMultiOrgAlertmanager(t)
+	configs := map[int64]*ngmodels.AlertConfiguration{
+		1: {AlertmanagerConfiguration: validConfig, OrgID: 1},
+		2: {AlertmanagerConfiguration: validConfig, OrgID: 2},
+		3: {AlertmanagerConfiguration: brokenConfig, OrgID: 3},
+	}
+	mam := createMultiOrgAlertmanager(t, configs)
 	log := log.NewNopLogger()
 	return AlertmanagerSrv{
 		mam:    mam,
@@ -653,17 +787,12 @@ func createAmConfigRequest(t *testing.T, config string) apimodels.PostableUserCo
 	return request
 }
 
-func createMultiOrgAlertmanager(t *testing.T) *notifier.MultiOrgAlertmanager {
+func createMultiOrgAlertmanager(t *testing.T, configs map[int64]*ngmodels.AlertConfiguration) *notifier.MultiOrgAlertmanager {
 	t.Helper()
 
-	configs := map[int64]*ngmodels.AlertConfiguration{
-		1: {AlertmanagerConfiguration: validConfig, OrgID: 1},
-		2: {AlertmanagerConfiguration: validConfig, OrgID: 2},
-		3: {AlertmanagerConfiguration: brokenConfig, OrgID: 3},
-	}
 	configStore := notifier.NewFakeConfigStore(t, configs)
 	orgStore := notifier.NewFakeOrgStore(t, []int64{1, 2, 3})
-	provStore := provisioning.NewFakeProvisioningStore()
+	provStore := ngfakes.NewFakeProvisioningStore()
 	tmpDir := t.TempDir()
 	kvStore := ngfakes.NewFakeKVStore(t)
 	secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore())
@@ -679,7 +808,7 @@ func createMultiOrgAlertmanager(t *testing.T) *notifier.MultiOrgAlertmanager {
 		}, // do not poll in tests.
 	}
 
-	mam, err := notifier.NewMultiOrgAlertmanager(cfg, configStore, &orgStore, kvStore, provStore, decryptFn, m.GetMultiOrgAlertmanagerMetrics(), nil, log.New("testlogger"), secretsService)
+	mam, err := notifier.NewMultiOrgAlertmanager(cfg, configStore, orgStore, kvStore, provStore, decryptFn, m.GetMultiOrgAlertmanagerMetrics(), nil, log.New("testlogger"), secretsService, featuremgmt.WithManager(featuremgmt.FlagAlertingSimplifiedRouting))
 	require.NoError(t, err)
 	err = mam.LoadAndSyncAlertmanagersForOrgs(context.Background())
 	require.NoError(t, err)
@@ -710,6 +839,90 @@ var validConfig = `{
 }
 `
 
+var validConfigWithoutAutogen = `{
+	"template_files": {
+		"a": "template"
+	},
+	"alertmanager_config": {
+		"route": {
+			"receiver": "some email",
+			"routes": [{
+				"receiver": "other email",
+				"object_matchers": [["a", "=", "b"]]
+			}]
+		},
+		"receivers": [{
+			"name": "some email",
+			"grafana_managed_receiver_configs": [{
+				"name": "some email",
+				"type": "email",
+				"settings": {
+					"addresses": "<some@email.com>"
+				}
+			}]
+		},{
+			"name": "other email",
+			"grafana_managed_receiver_configs": [{
+				"name": "other email",
+				"type": "email",
+				"settings": {
+					"addresses": "<other@email.com>"
+				}
+			}]
+		}]
+	}
+}
+`
+
+var validConfigWithAutogen = `{
+	"template_files": {
+		"a": "template"
+	},
+	"alertmanager_config": {
+		"route": {
+			"receiver": "some email",
+			"routes": [{
+				"receiver": "some email",
+				"object_matchers": [["__grafana_autogenerated__", "=", "true"]],
+				"routes": [{
+					"receiver": "some email",
+					"group_by": ["grafana_folder", "alertname"],
+					"object_matchers": [["__grafana_receiver__", "=", "some email"]],
+					"continue": false
+				},{
+					"receiver": "other email",
+					"group_by": ["grafana_folder", "alertname"],
+					"object_matchers": [["__grafana_receiver__", "=", "other email"]],
+					"continue": false
+				}]
+			},{
+				"receiver": "other email",
+				"object_matchers": [["a", "=", "b"]]
+			}]
+		},
+		"receivers": [{
+			"name": "some email",
+			"grafana_managed_receiver_configs": [{
+				"name": "some email",
+				"type": "email",
+				"settings": {
+					"addresses": "<some@email.com>"
+				}
+			}]
+		},{
+			"name": "other email",
+			"grafana_managed_receiver_configs": [{
+				"name": "other email",
+				"type": "email",
+				"settings": {
+					"addresses": "<other@email.com>"
+				}
+			}]
+		}]
+	}
+}
+`
+
 var validConfigWithSecureSetting = `{
 	"template_files": {
 		"a": "template"
diff --git a/pkg/services/ngalert/api/api_configuration.go b/pkg/services/ngalert/api/api_configuration.go
index bcd65080db684..e1c4fd3376f2d 100644
--- a/pkg/services/ngalert/api/api_configuration.go
+++ b/pkg/services/ngalert/api/api_configuration.go
@@ -44,7 +44,7 @@ func (srv ConfigSrv) RouteGetAlertmanagers(c *contextmodel.ReqContext) response.
 }
 
 func (srv ConfigSrv) RouteGetNGalertConfig(c *contextmodel.ReqContext) response.Response {
-	if c.OrgRole != org.RoleAdmin {
+	if c.SignedInUser.GetOrgRole() != org.RoleAdmin {
 		return accessForbiddenResp()
 	}
 
@@ -66,22 +66,22 @@ func (srv ConfigSrv) RouteGetNGalertConfig(c *contextmodel.ReqContext) response.
 }
 
 func (srv ConfigSrv) RoutePostNGalertConfig(c *contextmodel.ReqContext, body apimodels.PostableNGalertConfig) response.Response {
-	if c.OrgRole != org.RoleAdmin {
+	if c.SignedInUser.GetOrgRole() != org.RoleAdmin {
 		return accessForbiddenResp()
 	}
 
 	sendAlertsTo, err := ngmodels.StringToAlertmanagersChoice(string(body.AlertmanagersChoice))
 	if err != nil {
-		return response.Error(400, "Invalid alertmanager choice specified", err)
+		return response.Error(http.StatusBadRequest, "Invalid alertmanager choice specified", err)
 	}
 
 	externalAlertmanagers, err := srv.externalAlertmanagers(c.Req.Context(), c.SignedInUser.GetOrgID())
 	if err != nil {
-		return response.Error(500, "Couldn't fetch the external Alertmanagers from datasources", err)
+		return response.Error(http.StatusInternalServerError, "Couldn't fetch the external Alertmanagers from datasources", err)
 	}
 
 	if sendAlertsTo == ngmodels.ExternalAlertmanagers && len(externalAlertmanagers) < 1 {
-		return response.Error(400, "At least one Alertmanager must be provided or configured as a datasource that handles alerts to choose this option", nil)
+		return response.Error(http.StatusBadRequest, "At least one Alertmanager must be provided or configured as a datasource that handles alerts to choose this option", nil)
 	}
 
 	cfg := &ngmodels.AdminConfiguration{
@@ -100,7 +100,7 @@ func (srv ConfigSrv) RoutePostNGalertConfig(c *contextmodel.ReqContext, body api
 }
 
 func (srv ConfigSrv) RouteDeleteNGalertConfig(c *contextmodel.ReqContext) response.Response {
-	if c.OrgRole != org.RoleAdmin {
+	if c.SignedInUser.GetOrgRole() != org.RoleAdmin {
 		return accessForbiddenResp()
 	}
 
diff --git a/pkg/services/ngalert/api/api_notifications.go b/pkg/services/ngalert/api/api_notifications.go
new file mode 100644
index 0000000000000..1fd4bafec307c
--- /dev/null
+++ b/pkg/services/ngalert/api/api_notifications.go
@@ -0,0 +1,83 @@
+package api
+
+import (
+	"context"
+	"errors"
+	"net/http"
+
+	"github.com/grafana/grafana/pkg/api/response"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/notifier"
+)
+
+type NotificationSrv struct {
+	logger            log.Logger
+	receiverService   ReceiverService
+	muteTimingService MuteTimingService // defined in api_provisioning.go
+}
+
+type ReceiverService interface {
+	GetReceiver(ctx context.Context, q models.GetReceiverQuery, u identity.Requester) (definitions.GettableApiReceiver, error)
+	GetReceivers(ctx context.Context, q models.GetReceiversQuery, u identity.Requester) ([]definitions.GettableApiReceiver, error)
+}
+
+func (srv *NotificationSrv) RouteGetTimeInterval(c *contextmodel.ReqContext, name string) response.Response {
+	muteTimeInterval, err := srv.muteTimingService.GetMuteTiming(c.Req.Context(), name, c.OrgID)
+	if err != nil {
+		return errorToResponse(err)
+	}
+	return response.JSON(http.StatusOK, muteTimeInterval) // TODO convert to timing interval
+}
+
+func (srv *NotificationSrv) RouteGetTimeIntervals(c *contextmodel.ReqContext) response.Response {
+	muteTimeIntervals, err := srv.muteTimingService.GetMuteTimings(c.Req.Context(), c.OrgID)
+	if err != nil {
+		return errorToResponse(err)
+	}
+	return response.JSON(http.StatusOK, muteTimeIntervals) // TODO convert to timing interval
+}
+
+func (srv *NotificationSrv) RouteGetReceiver(c *contextmodel.ReqContext, name string) response.Response {
+	q := models.GetReceiverQuery{
+		OrgID:   c.SignedInUser.OrgID,
+		Name:    name,
+		Decrypt: c.QueryBool("decrypt"),
+	}
+
+	receiver, err := srv.receiverService.GetReceiver(c.Req.Context(), q, c.SignedInUser)
+	if err != nil {
+		if errors.Is(err, notifier.ErrNotFound) {
+			return ErrResp(http.StatusNotFound, err, "receiver not found")
+		}
+		if errors.Is(err, notifier.ErrPermissionDenied) {
+			return ErrResp(http.StatusForbidden, err, "permission denied")
+		}
+		return ErrResp(http.StatusInternalServerError, err, "failed to get receiver")
+	}
+
+	return response.JSON(http.StatusOK, receiver)
+}
+
+func (srv *NotificationSrv) RouteGetReceivers(c *contextmodel.ReqContext) response.Response {
+	q := models.GetReceiversQuery{
+		OrgID:   c.SignedInUser.OrgID,
+		Names:   c.QueryStrings("names"),
+		Limit:   c.QueryInt("limit"),
+		Offset:  c.QueryInt("offset"),
+		Decrypt: c.QueryBool("decrypt"),
+	}
+
+	receivers, err := srv.receiverService.GetReceivers(c.Req.Context(), q, c.SignedInUser)
+	if err != nil {
+		if errors.Is(err, notifier.ErrPermissionDenied) {
+			return ErrResp(http.StatusForbidden, err, "permission denied")
+		}
+		return ErrResp(http.StatusInternalServerError, err, "failed to get receiver groups")
+	}
+
+	return response.JSON(http.StatusOK, receivers)
+}
diff --git a/pkg/services/ngalert/api/api_notifications_test.go b/pkg/services/ngalert/api/api_notifications_test.go
new file mode 100644
index 0000000000000..1af5cbac066c5
--- /dev/null
+++ b/pkg/services/ngalert/api/api_notifications_test.go
@@ -0,0 +1,188 @@
+package api
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"testing"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/log/logtest"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/notifier"
+	"github.com/grafana/grafana/pkg/services/ngalert/tests/fakes"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/web"
+
+	am_config "github.com/prometheus/alertmanager/config"
+	"github.com/stretchr/testify/require"
+)
+
+func TestRouteGetReceiver(t *testing.T) {
+	fakeReceiverSvc := fakes.NewFakeReceiverService()
+
+	t.Run("returns expected model", func(t *testing.T) {
+		expected := definitions.GettableApiReceiver{
+			Receiver: am_config.Receiver{
+				Name: "receiver1",
+			},
+			GettableGrafanaReceivers: definitions.GettableGrafanaReceivers{
+				GrafanaManagedReceivers: []*definitions.GettableGrafanaReceiver{
+					{
+						UID:  "uid1",
+						Name: "receiver1",
+						Type: "slack",
+					},
+				},
+			},
+		}
+		fakeReceiverSvc.GetReceiverFn = func(ctx context.Context, q models.GetReceiverQuery, u identity.Requester) (definitions.GettableApiReceiver, error) {
+			return expected, nil
+		}
+		handler := NewNotificationsApi(newNotificationSrv(fakeReceiverSvc))
+		rc := testReqCtx("GET")
+		resp := handler.handleRouteGetReceiver(&rc, "receiver1")
+		require.Equal(t, http.StatusOK, resp.Status())
+		json, err := json.Marshal(expected)
+		require.NoError(t, err)
+		require.Equal(t, json, resp.Body())
+	})
+
+	t.Run("builds query from request context and url param", func(t *testing.T) {
+		fakeReceiverSvc.GetReceiverFn = func(ctx context.Context, q models.GetReceiverQuery, u identity.Requester) (definitions.GettableApiReceiver, error) {
+			return definitions.GettableApiReceiver{}, nil
+		}
+		handler := NewNotificationsApi(newNotificationSrv(fakeReceiverSvc))
+		rc := testReqCtx("GET")
+		rc.Context.Req.Form.Set("decrypt", "true")
+		resp := handler.handleRouteGetReceiver(&rc, "receiver1")
+		require.Equal(t, http.StatusOK, resp.Status())
+
+		call := fakeReceiverSvc.PopMethodCall()
+		require.Equal(t, "GetReceiver", call.Method)
+		expectedQ := models.GetReceiverQuery{
+			Name:    "receiver1",
+			Decrypt: true,
+			OrgID:   1,
+		}
+		require.Equal(t, expectedQ, call.Args[1])
+	})
+
+	t.Run("should pass along not found response", func(t *testing.T) {
+		fakeReceiverSvc.GetReceiverFn = func(ctx context.Context, q models.GetReceiverQuery, u identity.Requester) (definitions.GettableApiReceiver, error) {
+			return definitions.GettableApiReceiver{}, notifier.ErrNotFound
+		}
+		handler := NewNotificationsApi(newNotificationSrv(fakeReceiverSvc))
+		rc := testReqCtx("GET")
+		resp := handler.handleRouteGetReceiver(&rc, "receiver1")
+		require.Equal(t, http.StatusNotFound, resp.Status())
+	})
+
+	t.Run("should pass along permission denied response", func(t *testing.T) {
+		fakeReceiverSvc.GetReceiverFn = func(ctx context.Context, q models.GetReceiverQuery, u identity.Requester) (definitions.GettableApiReceiver, error) {
+			return definitions.GettableApiReceiver{}, notifier.ErrPermissionDenied
+		}
+		handler := NewNotificationsApi(newNotificationSrv(fakeReceiverSvc))
+		rc := testReqCtx("GET")
+		resp := handler.handleRouteGetReceiver(&rc, "receiver1")
+		require.Equal(t, http.StatusForbidden, resp.Status())
+	})
+}
+
+func TestRouteGetReceivers(t *testing.T) {
+	fakeReceiverSvc := fakes.NewFakeReceiverService()
+
+	t.Run("returns expected model", func(t *testing.T) {
+		expected := []definitions.GettableApiReceiver{
+			{
+				Receiver: am_config.Receiver{
+					Name: "receiver1",
+				},
+				GettableGrafanaReceivers: definitions.GettableGrafanaReceivers{
+					GrafanaManagedReceivers: []*definitions.GettableGrafanaReceiver{
+						{
+							UID:  "uid1",
+							Name: "receiver1",
+							Type: "slack",
+						},
+					},
+				},
+			},
+		}
+		fakeReceiverSvc.GetReceiversFn = func(ctx context.Context, q models.GetReceiversQuery, u identity.Requester) ([]definitions.GettableApiReceiver, error) {
+			return expected, nil
+		}
+		handler := NewNotificationsApi(newNotificationSrv(fakeReceiverSvc))
+		rc := testReqCtx("GET")
+		rc.Context.Req.Form.Set("names", "receiver1")
+		resp := handler.handleRouteGetReceivers(&rc)
+		require.Equal(t, http.StatusOK, resp.Status())
+		json, err := json.Marshal(expected)
+		require.NoError(t, err)
+		require.Equal(t, json, resp.Body())
+	})
+
+	t.Run("builds query from request context", func(t *testing.T) {
+		fakeReceiverSvc.GetReceiversFn = func(ctx context.Context, q models.GetReceiversQuery, u identity.Requester) ([]definitions.GettableApiReceiver, error) {
+			return []definitions.GettableApiReceiver{}, nil
+		}
+		handler := NewNotificationsApi(newNotificationSrv(fakeReceiverSvc))
+		rc := testReqCtx("GET")
+		rc.Context.Req.Form.Set("names", "receiver1")
+		rc.Context.Req.Form.Add("names", "receiver2")
+		rc.Context.Req.Form.Set("limit", "1")
+		rc.Context.Req.Form.Set("offset", "2")
+		rc.Context.Req.Form.Set("decrypt", "true")
+		resp := handler.handleRouteGetReceivers(&rc)
+		require.Equal(t, http.StatusOK, resp.Status())
+
+		call := fakeReceiverSvc.PopMethodCall()
+		require.Equal(t, "GetReceivers", call.Method)
+		expectedQ := models.GetReceiversQuery{
+			Names:   []string{"receiver1", "receiver2"},
+			Limit:   1,
+			Offset:  2,
+			Decrypt: true,
+			OrgID:   1,
+		}
+		require.Equal(t, expectedQ, call.Args[1])
+	})
+
+	t.Run("should pass along permission denied response", func(t *testing.T) {
+		fakeReceiverSvc.GetReceiversFn = func(ctx context.Context, q models.GetReceiversQuery, u identity.Requester) ([]definitions.GettableApiReceiver, error) {
+			return nil, notifier.ErrPermissionDenied
+		}
+		handler := NewNotificationsApi(newNotificationSrv(fakeReceiverSvc))
+		rc := testReqCtx("GET")
+		resp := handler.handleRouteGetReceivers(&rc)
+		require.Equal(t, http.StatusForbidden, resp.Status())
+	})
+}
+
+func newNotificationSrv(receiverService ReceiverService) *NotificationSrv {
+	return &NotificationSrv{
+		logger:          log.NewNopLogger(),
+		receiverService: receiverService,
+	}
+}
+
+func testReqCtx(method string) contextmodel.ReqContext {
+	return contextmodel.ReqContext{
+		Context: &web.Context{
+			Req: &http.Request{
+				Header: make(http.Header),
+				Form:   make(url.Values),
+			},
+			Resp: web.NewResponseWriter(method, httptest.NewRecorder()),
+		},
+		SignedInUser: &user.SignedInUser{
+			OrgID: 1,
+		},
+		Logger: &logtest.Fake{},
+	}
+}
diff --git a/pkg/services/ngalert/api/api_prometheus.go b/pkg/services/ngalert/api/api_prometheus.go
index 560103825932d..883dcf577248b 100644
--- a/pkg/services/ngalert/api/api_prometheus.go
+++ b/pkg/services/ngalert/api/api_prometheus.go
@@ -15,7 +15,6 @@ import (
 
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/folder"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
@@ -29,7 +28,7 @@ type PrometheusSrv struct {
 	log     log.Logger
 	manager state.AlertInstanceManager
 	store   RuleStore
-	ac      accesscontrol.AccessControl
+	authz   RuleAccessControlService
 }
 
 const queryIncludeInternalLabels = "includeInternalLabels"
@@ -201,7 +200,7 @@ func (srv PrometheusSrv) RouteGetRuleStatuses(c *contextmodel.ReqContext) respon
 	}
 
 	alertRuleQuery := ngmodels.ListAlertRulesQuery{
-		OrgID:         c.SignedInUser.OrgID,
+		OrgID:         c.SignedInUser.GetOrgID(),
 		NamespaceUIDs: namespaceUIDs,
 		DashboardUID:  dashboardUID,
 		PanelID:       panelID,
@@ -213,9 +212,6 @@ func (srv PrometheusSrv) RouteGetRuleStatuses(c *contextmodel.ReqContext) respon
 		ruleResponse.DiscoveryBase.ErrorType = apiv1.ErrServer
 		return response.JSON(http.StatusInternalServerError, ruleResponse)
 	}
-	hasAccess := func(evaluator accesscontrol.Evaluator) bool {
-		return accesscontrol.HasAccess(srv.ac, c)(evaluator)
-	}
 
 	// Group rules together by Namespace and Rule Group. Rules are also grouped by Org ID,
 	// but in this API all rules belong to the same organization.
@@ -239,7 +235,11 @@ func (srv PrometheusSrv) RouteGetRuleStatuses(c *contextmodel.ReqContext) respon
 			srv.log.Warn("Query returned rules that belong to folder the user does not have access to. All rules that belong to that namespace will not be added to the response", "folder_uid", groupKey.NamespaceUID)
 			continue
 		}
-		if !authorizeAccessToRuleGroup(rules, hasAccess) {
+		ok, err := srv.authz.HasAccessToRuleGroup(c.Req.Context(), c.SignedInUser, rules)
+		if err != nil {
+			return response.ErrOrFallback(http.StatusInternalServerError, "cannot authorize access to rule group", err)
+		}
+		if !ok {
 			continue
 		}
 		ruleGroup, totals := srv.toRuleGroup(groupKey, folder, rules, limitAlertsPerRule, withStatesFast, matchers, labelOptions)
@@ -304,7 +304,7 @@ func (srv PrometheusSrv) toRuleGroup(groupKey ngmodels.AlertRuleGroupKey, folder
 	newGroup := &apimodels.RuleGroup{
 		Name: groupKey.RuleGroup,
 		// file is what Prometheus uses for provisioning, we replace it with namespace which is the folder in Grafana.
-		File: folder.Title,
+		File: folder.Fullpath,
 	}
 
 	rulesTotals := make(map[string]int64, len(rules))
diff --git a/pkg/services/ngalert/api/api_prometheus_test.go b/pkg/services/ngalert/api/api_prometheus_test.go
index 5a34b2f0b692d..e08152d7441b9 100644
--- a/pkg/services/ngalert/api/api_prometheus_test.go
+++ b/pkg/services/ngalert/api/api_prometheus_test.go
@@ -15,13 +15,14 @@ import (
 
 	alertingModels "github.com/grafana/alerting/models"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
+
 	"github.com/grafana/grafana/pkg/expr"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
-	acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/folder"
+	"github.com/grafana/grafana/pkg/services/ngalert/accesscontrol"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/ngalert/eval"
 	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
@@ -502,7 +503,7 @@ func TestRouteGetRuleStatuses(t *testing.T) {
 				log:     log.NewNopLogger(),
 				manager: fakeAIM,
 				store:   ruleStore,
-				ac:      acmock.New(),
+				authz:   &fakeRuleAccessControlService{},
 			}
 
 			response := api.RouteGetRuleStatuses(c)
@@ -546,7 +547,7 @@ func TestRouteGetRuleStatuses(t *testing.T) {
 				log:     log.NewNopLogger(),
 				manager: fakeAIM,
 				store:   ruleStore,
-				ac:      acimpl.ProvideAccessControl(setting.NewCfg()),
+				authz:   &fakeRuleAccessControlService{},
 			}
 
 			c := &contextmodel.ReqContext{Context: &web.Context{Req: req}, SignedInUser: &user.SignedInUser{OrgID: orgID, Permissions: createPermissionsForRules(rules, orgID)}}
@@ -1259,7 +1260,7 @@ func setupAPI(t *testing.T) (*fakes.RuleStore, *fakeAlertInstanceManager, Promet
 		log:     log.NewNopLogger(),
 		manager: fakeAIM,
 		store:   fakeStore,
-		ac:      acimpl.ProvideAccessControl(setting.NewCfg()),
+		authz:   accesscontrol.NewRuleService(acimpl.ProvideAccessControl(setting.NewCfg())),
 	}
 
 	return fakeStore, fakeAIM, api
diff --git a/pkg/services/ngalert/api/api_provisioning.go b/pkg/services/ngalert/api/api_provisioning.go
index a7bec82dd8898..877fd116c387e 100644
--- a/pkg/services/ngalert/api/api_provisioning.go
+++ b/pkg/services/ngalert/api/api_provisioning.go
@@ -9,13 +9,13 @@ import (
 
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/ngalert/api/hcl"
 	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	alerting_models "github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/provisioning"
 	"github.com/grafana/grafana/pkg/services/ngalert/store"
-	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/util"
 )
 
@@ -31,14 +31,14 @@ type ProvisioningSrv struct {
 }
 
 type ContactPointService interface {
-	GetContactPoints(ctx context.Context, q provisioning.ContactPointQuery, user *user.SignedInUser) ([]definitions.EmbeddedContactPoint, error)
+	GetContactPoints(ctx context.Context, q provisioning.ContactPointQuery, user identity.Requester) ([]definitions.EmbeddedContactPoint, error)
 	CreateContactPoint(ctx context.Context, orgID int64, contactPoint definitions.EmbeddedContactPoint, p alerting_models.Provenance) (definitions.EmbeddedContactPoint, error)
 	UpdateContactPoint(ctx context.Context, orgID int64, contactPoint definitions.EmbeddedContactPoint, p alerting_models.Provenance) error
 	DeleteContactPoint(ctx context.Context, orgID int64, uid string) error
 }
 
 type TemplateService interface {
-	GetTemplates(ctx context.Context, orgID int64) (map[string]string, error)
+	GetTemplates(ctx context.Context, orgID int64) ([]definitions.NotificationTemplate, error)
 	SetTemplate(ctx context.Context, orgID int64, tmpl definitions.NotificationTemplate) (definitions.NotificationTemplate, error)
 	DeleteTemplate(ctx context.Context, orgID int64, name string) error
 }
@@ -51,22 +51,24 @@ type NotificationPolicyService interface {
 
 type MuteTimingService interface {
 	GetMuteTimings(ctx context.Context, orgID int64) ([]definitions.MuteTimeInterval, error)
-	CreateMuteTiming(ctx context.Context, mt definitions.MuteTimeInterval, orgID int64) (*definitions.MuteTimeInterval, error)
-	UpdateMuteTiming(ctx context.Context, mt definitions.MuteTimeInterval, orgID int64) (*definitions.MuteTimeInterval, error)
+	GetMuteTiming(ctx context.Context, name string, orgID int64) (definitions.MuteTimeInterval, error)
+	CreateMuteTiming(ctx context.Context, mt definitions.MuteTimeInterval, orgID int64) (definitions.MuteTimeInterval, error)
+	UpdateMuteTiming(ctx context.Context, mt definitions.MuteTimeInterval, orgID int64) (definitions.MuteTimeInterval, error)
 	DeleteMuteTiming(ctx context.Context, name string, orgID int64) error
 }
 
 type AlertRuleService interface {
-	GetAlertRules(ctx context.Context, orgID int64) ([]*alerting_models.AlertRule, map[string]alerting_models.Provenance, error)
-	GetAlertRule(ctx context.Context, orgID int64, ruleUID string) (alerting_models.AlertRule, alerting_models.Provenance, error)
-	CreateAlertRule(ctx context.Context, rule alerting_models.AlertRule, provenance alerting_models.Provenance, userID int64) (alerting_models.AlertRule, error)
-	UpdateAlertRule(ctx context.Context, rule alerting_models.AlertRule, provenance alerting_models.Provenance) (alerting_models.AlertRule, error)
-	DeleteAlertRule(ctx context.Context, orgID int64, ruleUID string, provenance alerting_models.Provenance) error
-	GetRuleGroup(ctx context.Context, orgID int64, folder, group string) (alerting_models.AlertRuleGroup, error)
-	ReplaceRuleGroup(ctx context.Context, orgID int64, group alerting_models.AlertRuleGroup, userID int64, provenance alerting_models.Provenance) error
-	GetAlertRuleWithFolderTitle(ctx context.Context, orgID int64, ruleUID string) (provisioning.AlertRuleWithFolderTitle, error)
-	GetAlertRuleGroupWithFolderTitle(ctx context.Context, orgID int64, folder, group string) (alerting_models.AlertRuleGroupWithFolderTitle, error)
-	GetAlertGroupsWithFolderTitle(ctx context.Context, orgID int64, folderUIDs []string) ([]alerting_models.AlertRuleGroupWithFolderTitle, error)
+	GetAlertRules(ctx context.Context, user identity.Requester) ([]*alerting_models.AlertRule, map[string]alerting_models.Provenance, error)
+	GetAlertRule(ctx context.Context, user identity.Requester, ruleUID string) (alerting_models.AlertRule, alerting_models.Provenance, error)
+	CreateAlertRule(ctx context.Context, user identity.Requester, rule alerting_models.AlertRule, provenance alerting_models.Provenance) (alerting_models.AlertRule, error)
+	UpdateAlertRule(ctx context.Context, user identity.Requester, rule alerting_models.AlertRule, provenance alerting_models.Provenance) (alerting_models.AlertRule, error)
+	DeleteAlertRule(ctx context.Context, user identity.Requester, ruleUID string, provenance alerting_models.Provenance) error
+	GetRuleGroup(ctx context.Context, user identity.Requester, folder, group string) (alerting_models.AlertRuleGroup, error)
+	ReplaceRuleGroup(ctx context.Context, user identity.Requester, group alerting_models.AlertRuleGroup, provenance alerting_models.Provenance) error
+	DeleteRuleGroup(ctx context.Context, user identity.Requester, folder, group string, provenance alerting_models.Provenance) error
+	GetAlertRuleWithFolderTitle(ctx context.Context, user identity.Requester, ruleUID string) (provisioning.AlertRuleWithFolderTitle, error)
+	GetAlertRuleGroupWithFolderTitle(ctx context.Context, user identity.Requester, folder, group string) (alerting_models.AlertRuleGroupWithFolderTitle, error)
+	GetAlertGroupsWithFolderTitle(ctx context.Context, user identity.Requester, folderUIDs []string) ([]alerting_models.AlertRuleGroupWithFolderTitle, error)
 }
 
 func (srv *ProvisioningSrv) RouteGetPolicyTree(c *contextmodel.ReqContext) response.Response {
@@ -190,7 +192,7 @@ func (srv *ProvisioningSrv) RoutePutContactPoint(c *contextmodel.ReqContext, cp
 func (srv *ProvisioningSrv) RouteDeleteContactPoint(c *contextmodel.ReqContext, UID string) response.Response {
 	err := srv.contactPointService.DeleteContactPoint(c.Req.Context(), c.SignedInUser.GetOrgID(), UID)
 	if err != nil {
-		return ErrResp(http.StatusInternalServerError, err, "")
+		return response.ErrOrFallback(http.StatusInternalServerError, "failed to delete contact point", err)
 	}
 	return response.JSON(http.StatusAccepted, util.DynMap{"message": "contactpoint deleted"})
 }
@@ -200,11 +202,7 @@ func (srv *ProvisioningSrv) RouteGetTemplates(c *contextmodel.ReqContext) respon
 	if err != nil {
 		return ErrResp(http.StatusInternalServerError, err, "")
 	}
-	result := make([]definitions.NotificationTemplate, 0, len(templates))
-	for k, v := range templates {
-		result = append(result, definitions.NotificationTemplate{Name: k, Template: v})
-	}
-	return response.JSON(http.StatusOK, result)
+	return response.JSON(http.StatusOK, templates)
 }
 
 func (srv *ProvisioningSrv) RouteGetTemplate(c *contextmodel.ReqContext, name string) response.Response {
@@ -212,8 +210,10 @@ func (srv *ProvisioningSrv) RouteGetTemplate(c *contextmodel.ReqContext, name st
 	if err != nil {
 		return ErrResp(http.StatusInternalServerError, err, "")
 	}
-	if tmpl, ok := templates[name]; ok {
-		return response.JSON(http.StatusOK, definitions.NotificationTemplate{Name: name, Template: tmpl})
+	for _, tmpl := range templates {
+		if tmpl.Name == name {
+			return response.JSON(http.StatusOK, tmpl)
+		}
 	}
 	return response.Empty(http.StatusNotFound)
 }
@@ -243,13 +243,22 @@ func (srv *ProvisioningSrv) RouteDeleteTemplate(c *contextmodel.ReqContext, name
 }
 
 func (srv *ProvisioningSrv) RouteGetMuteTiming(c *contextmodel.ReqContext, name string) response.Response {
+	timing, err := srv.muteTimings.GetMuteTiming(c.Req.Context(), name, c.SignedInUser.GetOrgID())
+	if err != nil {
+		return response.ErrOrFallback(http.StatusInternalServerError, "failed to get mute timing by name", err)
+	}
+	return response.JSON(http.StatusOK, timing)
+}
+
+func (srv *ProvisioningSrv) RouteGetMuteTimingExport(c *contextmodel.ReqContext, name string) response.Response {
 	timings, err := srv.muteTimings.GetMuteTimings(c.Req.Context(), c.SignedInUser.GetOrgID())
 	if err != nil {
-		return ErrResp(http.StatusInternalServerError, err, "")
+		return response.ErrOrFallback(http.StatusInternalServerError, "failed to get mute timings", err)
 	}
 	for _, timing := range timings {
 		if name == timing.Name {
-			return response.JSON(http.StatusOK, timing)
+			e := AlertingFileExportFromMuteTimings(c.SignedInUser.GetOrgID(), []definitions.MuteTimeInterval{timing})
+			return exportResponse(c, e)
 		}
 	}
 	return response.Empty(http.StatusNotFound)
@@ -258,19 +267,25 @@ func (srv *ProvisioningSrv) RouteGetMuteTiming(c *contextmodel.ReqContext, name
 func (srv *ProvisioningSrv) RouteGetMuteTimings(c *contextmodel.ReqContext) response.Response {
 	timings, err := srv.muteTimings.GetMuteTimings(c.Req.Context(), c.SignedInUser.GetOrgID())
 	if err != nil {
-		return ErrResp(http.StatusInternalServerError, err, "")
+		return response.ErrOrFallback(http.StatusInternalServerError, "failed to get mute timings", err)
 	}
 	return response.JSON(http.StatusOK, timings)
 }
 
+func (srv *ProvisioningSrv) RouteGetMuteTimingsExport(c *contextmodel.ReqContext) response.Response {
+	timings, err := srv.muteTimings.GetMuteTimings(c.Req.Context(), c.SignedInUser.GetOrgID())
+	if err != nil {
+		return response.ErrOrFallback(http.StatusInternalServerError, "failed to get mute timings", err)
+	}
+	e := AlertingFileExportFromMuteTimings(c.SignedInUser.GetOrgID(), timings)
+	return exportResponse(c, e)
+}
+
 func (srv *ProvisioningSrv) RoutePostMuteTiming(c *contextmodel.ReqContext, mt definitions.MuteTimeInterval) response.Response {
 	mt.Provenance = determineProvenance(c)
 	created, err := srv.muteTimings.CreateMuteTiming(c.Req.Context(), mt, c.SignedInUser.GetOrgID())
 	if err != nil {
-		if errors.Is(err, provisioning.ErrValidation) {
-			return ErrResp(http.StatusBadRequest, err, "")
-		}
-		return ErrResp(http.StatusInternalServerError, err, "")
+		return response.ErrOrFallback(http.StatusInternalServerError, "failed to create mute timing", err)
 	}
 	return response.JSON(http.StatusCreated, created)
 }
@@ -280,13 +295,7 @@ func (srv *ProvisioningSrv) RoutePutMuteTiming(c *contextmodel.ReqContext, mt de
 	mt.Provenance = determineProvenance(c)
 	updated, err := srv.muteTimings.UpdateMuteTiming(c.Req.Context(), mt, c.SignedInUser.GetOrgID())
 	if err != nil {
-		if errors.Is(err, provisioning.ErrValidation) {
-			return ErrResp(http.StatusBadRequest, err, "")
-		}
-		return ErrResp(http.StatusInternalServerError, err, "")
-	}
-	if updated == nil {
-		return response.Empty(http.StatusNotFound)
+		return response.ErrOrFallback(http.StatusInternalServerError, "failed to update mute timing", err)
 	}
 	return response.JSON(http.StatusAccepted, updated)
 }
@@ -294,26 +303,26 @@ func (srv *ProvisioningSrv) RoutePutMuteTiming(c *contextmodel.ReqContext, mt de
 func (srv *ProvisioningSrv) RouteDeleteMuteTiming(c *contextmodel.ReqContext, name string) response.Response {
 	err := srv.muteTimings.DeleteMuteTiming(c.Req.Context(), name, c.SignedInUser.GetOrgID())
 	if err != nil {
-		return ErrResp(http.StatusInternalServerError, err, "")
+		return response.ErrOrFallback(http.StatusInternalServerError, "failed to delete mute timing", err)
 	}
 	return response.JSON(http.StatusNoContent, nil)
 }
 
 func (srv *ProvisioningSrv) RouteGetAlertRules(c *contextmodel.ReqContext) response.Response {
-	rules, provenances, err := srv.alertRules.GetAlertRules(c.Req.Context(), c.SignedInUser.GetOrgID())
+	rules, provenances, err := srv.alertRules.GetAlertRules(c.Req.Context(), c.SignedInUser)
 	if err != nil {
-		return ErrResp(http.StatusInternalServerError, err, "")
+		return response.ErrOrFallback(http.StatusInternalServerError, "", err)
 	}
 	return response.JSON(http.StatusOK, ProvisionedAlertRuleFromAlertRules(rules, provenances))
 }
 
 func (srv *ProvisioningSrv) RouteRouteGetAlertRule(c *contextmodel.ReqContext, UID string) response.Response {
-	rule, provenace, err := srv.alertRules.GetAlertRule(c.Req.Context(), c.SignedInUser.GetOrgID(), UID)
+	rule, provenace, err := srv.alertRules.GetAlertRule(c.Req.Context(), c.SignedInUser, UID)
 	if err != nil {
 		if errors.Is(err, alerting_models.ErrAlertRuleNotFound) {
 			return response.Empty(http.StatusNotFound)
 		}
-		return ErrResp(http.StatusInternalServerError, err, "")
+		return response.ErrOrFallback(http.StatusInternalServerError, "failed to get rule by UID", err)
 	}
 	return response.JSON(http.StatusOK, ProvisionedAlertRuleFromAlertRule(rule, provenace))
 }
@@ -325,7 +334,7 @@ func (srv *ProvisioningSrv) RoutePostAlertRule(c *contextmodel.ReqContext, ar de
 		return ErrResp(http.StatusBadRequest, err, "")
 	}
 	provenance := determineProvenance(c)
-	createdAlertRule, err := srv.alertRules.CreateAlertRule(c.Req.Context(), upstreamModel, alerting_models.Provenance(provenance), c.UserID)
+	createdAlertRule, err := srv.alertRules.CreateAlertRule(c.Req.Context(), c.SignedInUser, upstreamModel, alerting_models.Provenance(provenance))
 	if errors.Is(err, alerting_models.ErrAlertRuleFailedValidation) {
 		return ErrResp(http.StatusBadRequest, err, "")
 	}
@@ -339,7 +348,7 @@ func (srv *ProvisioningSrv) RoutePostAlertRule(c *contextmodel.ReqContext, ar de
 		if errors.Is(err, alerting_models.ErrQuotaReached) {
 			return ErrResp(http.StatusForbidden, err, "")
 		}
-		return ErrResp(http.StatusInternalServerError, err, "")
+		return response.ErrOrFallback(http.StatusInternalServerError, "", err)
 	}
 
 	resp := ProvisionedAlertRuleFromAlertRule(createdAlertRule, alerting_models.Provenance(provenance))
@@ -354,7 +363,7 @@ func (srv *ProvisioningSrv) RoutePutAlertRule(c *contextmodel.ReqContext, ar def
 	updated.OrgID = c.SignedInUser.GetOrgID()
 	updated.UID = UID
 	provenance := determineProvenance(c)
-	updatedAlertRule, err := srv.alertRules.UpdateAlertRule(c.Req.Context(), updated, alerting_models.Provenance(provenance))
+	updatedAlertRule, err := srv.alertRules.UpdateAlertRule(c.Req.Context(), c.SignedInUser, updated, alerting_models.Provenance(provenance))
 	if errors.Is(err, alerting_models.ErrAlertRuleUniqueConstraintViolation) {
 		return ErrResp(http.StatusBadRequest, err, "")
 	}
@@ -368,7 +377,7 @@ func (srv *ProvisioningSrv) RoutePutAlertRule(c *contextmodel.ReqContext, ar def
 		if errors.Is(err, store.ErrOptimisticLock) {
 			return ErrResp(http.StatusConflict, err, "")
 		}
-		return ErrResp(http.StatusInternalServerError, err, "")
+		return response.ErrOrFallback(http.StatusInternalServerError, "", err)
 	}
 
 	resp := ProvisionedAlertRuleFromAlertRule(updatedAlertRule, alerting_models.Provenance(provenance))
@@ -377,20 +386,17 @@ func (srv *ProvisioningSrv) RoutePutAlertRule(c *contextmodel.ReqContext, ar def
 
 func (srv *ProvisioningSrv) RouteDeleteAlertRule(c *contextmodel.ReqContext, UID string) response.Response {
 	provenance := determineProvenance(c)
-	err := srv.alertRules.DeleteAlertRule(c.Req.Context(), c.SignedInUser.GetOrgID(), UID, alerting_models.Provenance(provenance))
+	err := srv.alertRules.DeleteAlertRule(c.Req.Context(), c.SignedInUser, UID, alerting_models.Provenance(provenance))
 	if err != nil {
-		return ErrResp(http.StatusInternalServerError, err, "")
+		return response.ErrOrFallback(http.StatusInternalServerError, "", err)
 	}
 	return response.JSON(http.StatusNoContent, "")
 }
 
 func (srv *ProvisioningSrv) RouteGetAlertRuleGroup(c *contextmodel.ReqContext, folder string, group string) response.Response {
-	g, err := srv.alertRules.GetRuleGroup(c.Req.Context(), c.SignedInUser.GetOrgID(), folder, group)
+	g, err := srv.alertRules.GetRuleGroup(c.Req.Context(), c.SignedInUser, folder, group)
 	if err != nil {
-		if errors.Is(err, store.ErrAlertRuleGroupNotFound) {
-			return ErrResp(http.StatusNotFound, err, "")
-		}
-		return ErrResp(http.StatusInternalServerError, err, "")
+		return response.ErrOrFallback(http.StatusInternalServerError, "", err)
 	}
 	return response.JSON(http.StatusOK, ApiAlertRuleGroupFromAlertRuleGroup(g))
 }
@@ -416,9 +422,9 @@ func (srv *ProvisioningSrv) RouteGetAlertRulesExport(c *contextmodel.ReqContext)
 		return srv.RouteGetAlertRuleGroupExport(c, folderUIDs[0], group)
 	}
 
-	groupsWithTitle, err := srv.alertRules.GetAlertGroupsWithFolderTitle(c.Req.Context(), c.SignedInUser.GetOrgID(), folderUIDs)
+	groupsWithTitle, err := srv.alertRules.GetAlertGroupsWithFolderTitle(c.Req.Context(), c.SignedInUser, folderUIDs)
 	if err != nil {
-		return ErrResp(http.StatusInternalServerError, err, "failed to get alert rules")
+		return response.ErrOrFallback(http.StatusInternalServerError, "failed to get alert rules", err)
 	}
 	if len(groupsWithTitle) == 0 {
 		return response.Empty(http.StatusNotFound)
@@ -426,7 +432,7 @@ func (srv *ProvisioningSrv) RouteGetAlertRulesExport(c *contextmodel.ReqContext)
 
 	e, err := AlertingFileExportFromAlertRuleGroupWithFolderTitle(groupsWithTitle)
 	if err != nil {
-		return ErrResp(http.StatusInternalServerError, err, "failed to create alerting file export")
+		return response.ErrOrFallback(http.StatusInternalServerError, "failed to create alerting file export", err)
 	}
 
 	return exportResponse(c, e)
@@ -434,17 +440,14 @@ func (srv *ProvisioningSrv) RouteGetAlertRulesExport(c *contextmodel.ReqContext)
 
 // RouteGetAlertRuleGroupExport retrieves the given alert rule group in a format compatible with file provisioning.
 func (srv *ProvisioningSrv) RouteGetAlertRuleGroupExport(c *contextmodel.ReqContext, folder string, group string) response.Response {
-	g, err := srv.alertRules.GetAlertRuleGroupWithFolderTitle(c.Req.Context(), c.SignedInUser.GetOrgID(), folder, group)
+	g, err := srv.alertRules.GetAlertRuleGroupWithFolderTitle(c.Req.Context(), c.SignedInUser, folder, group)
 	if err != nil {
-		if errors.Is(err, store.ErrAlertRuleGroupNotFound) {
-			return ErrResp(http.StatusNotFound, err, "")
-		}
-		return ErrResp(http.StatusInternalServerError, err, "failed to get alert rule group")
+		return response.ErrOrFallback(http.StatusInternalServerError, "failed to get alert rule group", err)
 	}
 
 	e, err := AlertingFileExportFromAlertRuleGroupWithFolderTitle([]alerting_models.AlertRuleGroupWithFolderTitle{g})
 	if err != nil {
-		return ErrResp(http.StatusInternalServerError, err, "failed to create alerting file export")
+		return response.ErrOrFallback(http.StatusInternalServerError, "failed to create alerting file export", err)
 	}
 
 	return exportResponse(c, e)
@@ -452,12 +455,12 @@ func (srv *ProvisioningSrv) RouteGetAlertRuleGroupExport(c *contextmodel.ReqCont
 
 // RouteGetAlertRuleExport retrieves the given alert rule in a format compatible with file provisioning.
 func (srv *ProvisioningSrv) RouteGetAlertRuleExport(c *contextmodel.ReqContext, UID string) response.Response {
-	rule, err := srv.alertRules.GetAlertRuleWithFolderTitle(c.Req.Context(), c.SignedInUser.GetOrgID(), UID)
+	rule, err := srv.alertRules.GetAlertRuleWithFolderTitle(c.Req.Context(), c.SignedInUser, UID)
 	if err != nil {
 		if errors.Is(err, alerting_models.ErrAlertRuleNotFound) {
 			return ErrResp(http.StatusNotFound, err, "")
 		}
-		return ErrResp(http.StatusInternalServerError, err, "")
+		return response.ErrOrFallback(http.StatusInternalServerError, "failed to get alert rules", err)
 	}
 
 	e, err := AlertingFileExportFromAlertRuleGroupWithFolderTitle([]alerting_models.AlertRuleGroupWithFolderTitle{
@@ -478,7 +481,7 @@ func (srv *ProvisioningSrv) RoutePutAlertRuleGroup(c *contextmodel.ReqContext, a
 		ErrResp(http.StatusBadRequest, err, "")
 	}
 	provenance := determineProvenance(c)
-	err = srv.alertRules.ReplaceRuleGroup(c.Req.Context(), c.SignedInUser.GetOrgID(), groupModel, c.UserID, alerting_models.Provenance(provenance))
+	err = srv.alertRules.ReplaceRuleGroup(c.Req.Context(), c.SignedInUser, groupModel, alerting_models.Provenance(provenance))
 	if errors.Is(err, alerting_models.ErrAlertRuleUniqueConstraintViolation) {
 		return ErrResp(http.StatusBadRequest, err, "")
 	}
@@ -489,11 +492,20 @@ func (srv *ProvisioningSrv) RoutePutAlertRuleGroup(c *contextmodel.ReqContext, a
 		if errors.Is(err, store.ErrOptimisticLock) {
 			return ErrResp(http.StatusConflict, err, "")
 		}
-		return ErrResp(http.StatusInternalServerError, err, "")
+		return response.ErrOrFallback(http.StatusInternalServerError, "", err)
 	}
 	return response.JSON(http.StatusOK, ag)
 }
 
+func (srv *ProvisioningSrv) RouteDeleteAlertRuleGroup(c *contextmodel.ReqContext, folderUID string, group string) response.Response {
+	provenance := determineProvenance(c)
+	err := srv.alertRules.DeleteRuleGroup(c.Req.Context(), c.SignedInUser, folderUID, group, alerting_models.Provenance(provenance))
+	if err != nil {
+		return response.ErrOrFallback(http.StatusInternalServerError, "", err)
+	}
+	return response.JSON(http.StatusNoContent, "")
+}
+
 func determineProvenance(ctx *contextmodel.ReqContext) definitions.Provenance {
 	if _, disabled := ctx.Req.Header[disableProvenanceHeaderName]; disabled {
 		return definitions.Provenance(alerting_models.ProvenanceNone)
@@ -548,39 +560,56 @@ func exportResponse(c *contextmodel.ReqContext, body definitions.AlertingFileExp
 }
 
 func exportHcl(download bool, body definitions.AlertingFileExport) response.Response {
-	resources := make([]hcl.Resource, 0, len(body.Groups)+len(body.ContactPoints)+len(body.Policies))
-	for idx, group := range body.Groups {
-		gr := group
-		resources = append(resources, hcl.Resource{
-			Type: "grafana_rule_group",
-			Name: fmt.Sprintf("rule_group_%04d", idx),
-			Body: &gr,
-		})
-	}
-	for idx, cp := range body.ContactPoints {
-		upd, err := ContactPointFromContactPointExport(cp)
-		if err != nil {
-			return response.Error(http.StatusInternalServerError, "failed to convert contact points to HCL", err)
+	resources := make([]hcl.Resource, 0, len(body.Groups)+len(body.ContactPoints)+len(body.Policies)+len(body.MuteTimings))
+	convertToResources := func() error {
+		for idx, group := range body.Groups {
+			gr := group
+			resources = append(resources, hcl.Resource{
+				Type: "grafana_rule_group",
+				Name: fmt.Sprintf("rule_group_%04d", idx),
+				Body: &gr,
+			})
+		}
+		for idx, cp := range body.ContactPoints {
+			upd, err := ContactPointFromContactPointExport(cp)
+			if err != nil {
+				return fmt.Errorf("failed to convert contact points to HCL:%w", err)
+			}
+			resources = append(resources, hcl.Resource{
+				Type: "grafana_contact_point",
+				Name: fmt.Sprintf("contact_point_%d", idx),
+				Body: &upd,
+			})
 		}
-		resources = append(resources, hcl.Resource{
-			Type: "grafana_contact_point",
-			Name: fmt.Sprintf("contact_point_%d", idx),
-			Body: &upd,
-		})
-	}
 
-	for idx, cp := range body.Policies {
-		policy := cp.Policy
-		resources = append(resources, hcl.Resource{
-			Type: "grafana_notification_policy",
-			Name: fmt.Sprintf("notification_policy_%d", idx+1),
-			Body: policy,
-		})
-	}
+		for idx, cp := range body.Policies {
+			policy := cp.RouteExport
+			resources = append(resources, hcl.Resource{
+				Type: "grafana_notification_policy",
+				Name: fmt.Sprintf("notification_policy_%d", idx+1),
+				Body: policy,
+			})
+		}
 
+		for idx, mt := range body.MuteTimings {
+			mthcl, err := MuteTimingIntervalToMuteTimeIntervalHclExport(mt)
+			if err != nil {
+				return fmt.Errorf("failed to convert mute timing [%s] to HCL:%w", mt.Name, err)
+			}
+			resources = append(resources, hcl.Resource{
+				Type: "grafana_mute_timing",
+				Name: fmt.Sprintf("mute_timing_%d", idx+1),
+				Body: mthcl,
+			})
+		}
+		return nil
+	}
+	if err := convertToResources(); err != nil {
+		return response.Error(http.StatusInternalServerError, "failed to convert to HCL resources", err)
+	}
 	hclBody, err := hcl.Encode(resources...)
 	if err != nil {
-		return response.Error(500, "body hcl encode", err)
+		return response.Error(http.StatusInternalServerError, "body hcl encode", err)
 	}
 	resp := response.Respond(http.StatusOK, hclBody)
 	if download {
diff --git a/pkg/services/ngalert/api/api_provisioning_test.go b/pkg/services/ngalert/api/api_provisioning_test.go
index cc61525e8553c..944720d69728a 100644
--- a/pkg/services/ngalert/api/api_provisioning_test.go
+++ b/pkg/services/ngalert/api/api_provisioning_test.go
@@ -7,6 +7,8 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"net/url"
+	"path"
+	"strings"
 	"testing"
 	"time"
 
@@ -24,6 +26,9 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/folder"
+	"github.com/grafana/grafana/pkg/services/folder/foldertest"
+	"github.com/grafana/grafana/pkg/services/ngalert/accesscontrol/fakes"
 	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/notifier"
@@ -33,10 +38,15 @@ import (
 	secrets_fakes "github.com/grafana/grafana/pkg/services/secrets/fakes"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 	"github.com/grafana/grafana/pkg/util"
 	"github.com/grafana/grafana/pkg/web"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestProvisioningApi(t *testing.T) {
 	t.Run("policies", func(t *testing.T) {
 		t.Run("successful GET returns 200", func(t *testing.T) {
@@ -77,7 +87,7 @@ func TestProvisioningApi(t *testing.T) {
 				response := sut.RoutePutPolicyTree(&rc, tree)
 
 				require.Equal(t, 400, response.Status())
-				expBody := `{"error":"invalid object specification: invalid policy tree","message":"invalid object specification: invalid policy tree"}`
+				expBody := `{"message":"invalid object specification: invalid policy tree"}`
 				require.Equal(t, expBody, string(response.Body()))
 			})
 		})
@@ -264,6 +274,39 @@ func TestProvisioningApi(t *testing.T) {
 				require.NotEmpty(t, response.Body())
 				require.Contains(t, string(response.Body()), "invalid alert rule")
 			})
+
+			t.Run("POST returns 400 when folderUID not set", func(t *testing.T) {
+				sut := createProvisioningSrvSut(t)
+				rc := createTestRequestCtx()
+				rule := createTestAlertRule("rule", 1)
+				rule.FolderUID = ""
+
+				response := sut.RoutePostAlertRule(&rc, rule)
+
+				require.Equal(t, 400, response.Status())
+				require.NotEmpty(t, response.Body())
+				require.Contains(t, string(response.Body()), "invalid alert rule")
+				require.Contains(t, string(response.Body()), "folderUID must be set")
+			})
+
+			t.Run("POST returns 400 if folder does not exist", func(t *testing.T) {
+				testEnv := createTestEnv(t, testConfig)
+				// Create a fake folder service that will return an error when trying to get a folder.
+				folderService := foldertest.NewFakeService()
+				folderService.ExpectedError = dashboards.ErrFolderNotFound
+				testEnv.folderService = folderService
+				sut := createProvisioningSrvSutFromEnv(t, &testEnv)
+
+				rc := createTestRequestCtx()
+				rule := createTestAlertRule("rule", 1)
+
+				response := sut.RoutePostAlertRule(&rc, rule)
+
+				require.Equal(t, 400, response.Status())
+				require.NotEmpty(t, response.Body())
+				require.Contains(t, string(response.Body()), "invalid alert rule")
+				require.Contains(t, string(response.Body()), "folder does not exist")
+			})
 		})
 
 		t.Run("exist in non-default orgs", func(t *testing.T) {
@@ -336,24 +379,40 @@ func TestProvisioningApi(t *testing.T) {
 	})
 
 	t.Run("alert rule groups", func(t *testing.T) {
-		t.Run("are present, GET returns 200", func(t *testing.T) {
+		t.Run("are present", func(t *testing.T) {
 			sut := createProvisioningSrvSut(t)
 			rc := createTestRequestCtx()
 			insertRule(t, sut, createTestAlertRule("rule", 1))
 
-			response := sut.RouteGetAlertRuleGroup(&rc, "folder-uid", "my-cool-group")
+			t.Run("GET returns 200", func(t *testing.T) {
+				response := sut.RouteGetAlertRuleGroup(&rc, "folder-uid", "my-cool-group")
 
-			require.Equal(t, 200, response.Status())
+				require.Equal(t, 200, response.Status())
+			})
+
+			t.Run("DELETE returns 204", func(t *testing.T) {
+				response := sut.RouteDeleteAlertRuleGroup(&rc, "folder-uid", "my-cool-group")
+
+				require.Equal(t, 204, response.Status())
+			})
 		})
 
-		t.Run("are missing, GET returns 404", func(t *testing.T) {
+		t.Run("are missing", func(t *testing.T) {
 			sut := createProvisioningSrvSut(t)
 			rc := createTestRequestCtx()
 			insertRule(t, sut, createTestAlertRule("rule", 1))
 
-			response := sut.RouteGetAlertRuleGroup(&rc, "folder-uid", "does not exist")
+			t.Run("GET returns 404", func(t *testing.T) {
+				response := sut.RouteGetAlertRuleGroup(&rc, "folder-uid", "does not exist")
 
-			require.Equal(t, 404, response.Status())
+				require.Equal(t, 404, response.Status())
+			})
+
+			t.Run("DELETE returns 404", func(t *testing.T) {
+				response := sut.RouteDeleteAlertRuleGroup(&rc, "folder-uid", "does not exist")
+
+				require.Equal(t, 404, response.Status())
+			})
 		})
 
 		t.Run("are invalid at group level", func(t *testing.T) {
@@ -518,17 +577,14 @@ func TestProvisioningApi(t *testing.T) {
 			t.Run("yaml body content is the default", func(t *testing.T) {
 				sut := createProvisioningSrvSut(t)
 				rc := createTestRequestCtx()
-				insertRule(t, sut, createTestAlertRule("rule1", 1))
+				rule1 := createTestAlertRule("rule1", 1)
+				rule1.NotificationSettings = nil
+				insertRule(t, sut, rule1)
 				insertRule(t, sut, createTestAlertRule("rule2", 1))
 
-				expectedResponse := "apiVersion: 1\ngroups:\n    - orgId: 1\n      name: my-cool-group\n      folder" +
-					": Folder Title\n      interval: 1m\n      rules:\n        - uid: rule1\n          title: rule1\n" +
-					"          condition: A\n          data:\n            - refId: A\n              datasourceUid" +
-					": \"\"\n              model:\n                conditions:\n                    - evaluator:\n" +
-					"                        params:\n                            - 3\n                        type: gt\n                      operator:\n                        type: and\n                      query:\n                        params:\n                            - A\n                      reducer:\n                        type: last\n                      type: query\n                datasource:\n                    type: __expr__\n                    uid: __expr__\n                expression: 1==0\n                intervalMs: 1000\n                maxDataPoints: 43200\n                refId: A\n                type: math\n          noDataState: OK\n          execErrState: OK\n          for: 0s\n          isPaused: false\n        - uid: rule2\n          title: rule2\n          condition: A\n          data:\n            - refId: A\n              datasourceUid: \"\"\n              model:\n                conditions:\n                    - evaluator:\n                        params:\n                            - 3\n                        type: gt\n                      operator:\n                        type: and\n                      query:\n                        params:\n                            - A\n                      reducer:\n                        type: last\n                      type: query\n                datasource:\n                    type: __expr__\n                    uid: __expr__\n                expression: 1==0\n                intervalMs: 1000\n                maxDataPoints: 43200\n                refId: A\n                type: math\n          noDataState: OK\n          execErrState: OK\n          for: 0s\n          isPaused: false\n"
+				expectedResponse := "apiVersion: 1\ngroups:\n    - orgId: 1\n      name: my-cool-group\n      folder: Folder Title\n      interval: 1m\n      rules:\n        - uid: rule1\n          title: rule1\n          condition: A\n          data:\n            - refId: A\n              datasourceUid: \"\"\n              model:\n                conditions:\n                    - evaluator:\n                        params:\n                            - 3\n                        type: gt\n                      operator:\n                        type: and\n                      query:\n                        params:\n                            - A\n                      reducer:\n                        type: last\n                      type: query\n                datasource:\n                    type: __expr__\n                    uid: __expr__\n                expression: 1==0\n                intervalMs: 1000\n                maxDataPoints: 43200\n                refId: A\n                type: math\n          noDataState: OK\n          execErrState: OK\n          for: 0s\n          isPaused: false\n        - uid: rule2\n          title: rule2\n          condition: A\n          data:\n            - refId: A\n              datasourceUid: \"\"\n              model:\n                conditions:\n                    - evaluator:\n                        params:\n                            - 3\n                        type: gt\n                      operator:\n                        type: and\n                      query:\n                        params:\n                            - A\n                      reducer:\n                        type: last\n                      type: query\n                datasource:\n                    type: __expr__\n                    uid: __expr__\n                expression: 1==0\n                intervalMs: 1000\n                maxDataPoints: 43200\n                refId: A\n                type: math\n          noDataState: OK\n          execErrState: OK\n          for: 0s\n          isPaused: false\n          notification_settings:\n            receiver: Test-Receiver\n            group_by:\n                - alertname\n                - grafana_folder\n                - test\n            group_wait: 1s\n            group_interval: 5s\n            repeat_interval: 5m\n            mute_time_intervals:\n                - test-mute\n"
 
 				response := sut.RouteGetAlertRuleGroupExport(&rc, "folder-uid", "my-cool-group")
-
 				require.Equal(t, 200, response.Status())
 				require.Equal(t, expectedResponse, string(response.Body()))
 			})
@@ -536,14 +592,15 @@ func TestProvisioningApi(t *testing.T) {
 			t.Run("json body content is as expected", func(t *testing.T) {
 				sut := createProvisioningSrvSut(t)
 				rc := createTestRequestCtx()
-				insertRule(t, sut, createTestAlertRule("rule1", 1))
+				rule1 := createTestAlertRule("rule1", 1)
+				rule1.NotificationSettings = nil
+				insertRule(t, sut, rule1)
 				insertRule(t, sut, createTestAlertRule("rule2", 1))
 
 				rc.Context.Req.Header.Add("Accept", "application/json")
-				expectedResponse := `{"apiVersion":1,"groups":[{"orgId":1,"name":"my-cool-group","folder":"Folder Title","interval":"1m","rules":[{"uid":"rule1","title":"rule1","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false},{"uid":"rule2","title":"rule2","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false}]}]}`
+				expectedResponse := `{"apiVersion":1,"groups":[{"orgId":1,"name":"my-cool-group","folder":"Folder Title","interval":"1m","rules":[{"uid":"rule1","title":"rule1","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false},{"uid":"rule2","title":"rule2","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false,"notification_settings":{"receiver":"Test-Receiver","group_by":["alertname","grafana_folder","test"],"group_wait":"1s","group_interval":"5s","repeat_interval":"5m","mute_time_intervals":["test-mute"]}}]}]}`
 
 				response := sut.RouteGetAlertRuleGroupExport(&rc, "folder-uid", "my-cool-group")
-
 				require.Equal(t, 200, response.Status())
 				require.Equal(t, expectedResponse, string(response.Body()))
 			})
@@ -559,7 +616,7 @@ func TestProvisioningApi(t *testing.T) {
 					": Folder Title\n      interval: 1m\n      rules:\n        - uid: rule1\n          title: rule1\n" +
 					"          condition: A\n          data:\n            - refId: A\n              datasourceUid" +
 					": \"\"\n              model:\n                conditions:\n                    - evaluator:\n" +
-					"                        params:\n                            - 3\n                        type: gt\n                      operator:\n                        type: and\n                      query:\n                        params:\n                            - A\n                      reducer:\n                        type: last\n                      type: query\n                datasource:\n                    type: __expr__\n                    uid: __expr__\n                expression: 1==0\n                intervalMs: 1000\n                maxDataPoints: 43200\n                refId: A\n                type: math\n          noDataState: OK\n          execErrState: OK\n          for: 0s\n          isPaused: false\n        - uid: rule2\n          title: rule2\n          condition: A\n          data:\n            - refId: A\n              datasourceUid: \"\"\n              model:\n                conditions:\n                    - evaluator:\n                        params:\n                            - 3\n                        type: gt\n                      operator:\n                        type: and\n                      query:\n                        params:\n                            - A\n                      reducer:\n                        type: last\n                      type: query\n                datasource:\n                    type: __expr__\n                    uid: __expr__\n                expression: 1==0\n                intervalMs: 1000\n                maxDataPoints: 43200\n                refId: A\n                type: math\n          noDataState: OK\n          execErrState: OK\n          for: 0s\n          isPaused: false\n"
+					"                        params:\n                            - 3\n                        type: gt\n                      operator:\n                        type: and\n                      query:\n                        params:\n                            - A\n                      reducer:\n                        type: last\n                      type: query\n                datasource:\n                    type: __expr__\n                    uid: __expr__\n                expression: 1==0\n                intervalMs: 1000\n                maxDataPoints: 43200\n                refId: A\n                type: math\n          noDataState: OK\n          execErrState: OK\n          for: 0s\n          isPaused: false\n          notification_settings:\n            receiver: Test-Receiver\n            group_by:\n                - alertname\n                - grafana_folder\n                - test\n            group_wait: 1s\n            group_interval: 5s\n            repeat_interval: 5m\n            mute_time_intervals:\n                - test-mute\n        - uid: rule2\n          title: rule2\n          condition: A\n          data:\n            - refId: A\n              datasourceUid: \"\"\n              model:\n                conditions:\n                    - evaluator:\n                        params:\n                            - 3\n                        type: gt\n                      operator:\n                        type: and\n                      query:\n                        params:\n                            - A\n                      reducer:\n                        type: last\n                      type: query\n                datasource:\n                    type: __expr__\n                    uid: __expr__\n                expression: 1==0\n                intervalMs: 1000\n                maxDataPoints: 43200\n                refId: A\n                type: math\n          noDataState: OK\n          execErrState: OK\n          for: 0s\n          isPaused: false\n          notification_settings:\n            receiver: Test-Receiver\n            group_by:\n                - alertname\n                - grafana_folder\n                - test\n            group_wait: 1s\n            group_interval: 5s\n            repeat_interval: 5m\n            mute_time_intervals:\n                - test-mute\n"
 
 				response := sut.RouteGetAlertRuleGroupExport(&rc, "folder-uid", "my-cool-group")
 
@@ -578,6 +635,7 @@ func TestProvisioningApi(t *testing.T) {
 				}
 				rule1.NoDataState = definitions.Alerting
 				rule1.ExecErrState = definitions.ErrorErrState
+				rule1.NotificationSettings = nil
 				insertRule(t, sut, rule1)
 				insertRule(t, sut, createTestAlertRule("rule2", 1))
 
@@ -634,6 +692,15 @@ func TestProvisioningApi(t *testing.T) {
     exec_err_state = "OK"
     for            = "0s"
     is_paused      = false
+
+    notification_settings {
+      contact_point   = "Test-Receiver"
+      group_by        = ["alertname", "grafana_folder", "test"]
+      group_wait      = "1s"
+      group_interval  = "5s"
+      repeat_interval = "5m"
+      mute_timings    = ["test-mute"]
+    }
   }
 }
 `
@@ -767,7 +834,7 @@ func TestProvisioningApi(t *testing.T) {
 				rc := createTestRequestCtx()
 				insertRule(t, sut, createTestAlertRule("rule1", 1))
 
-				expectedResponse := `{"apiVersion":1,"groups":[{"orgId":1,"name":"my-cool-group","folder":"Folder Title","interval":"1m","rules":[{"uid":"rule1","title":"rule1","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false}]}]}`
+				expectedResponse := `{"apiVersion":1,"groups":[{"orgId":1,"name":"my-cool-group","folder":"Folder Title","interval":"1m","rules":[{"uid":"rule1","title":"rule1","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false,"notification_settings":{"receiver":"Test-Receiver","group_by":["alertname","grafana_folder","test"],"group_wait":"1s","group_interval":"5s","repeat_interval":"5m","mute_time_intervals":["test-mute"]}}]}]}`
 
 				rc.Context.Req.Header.Add("Accept", "application/json")
 				response := sut.RouteGetAlertRuleExport(&rc, "rule1")
@@ -782,7 +849,7 @@ func TestProvisioningApi(t *testing.T) {
 				insertRule(t, sut, createTestAlertRule("rule1", 1))
 
 				rc.Context.Req.Header.Add("Accept", "application/yaml")
-				expectedResponse := "apiVersion: 1\ngroups:\n    - orgId: 1\n      name: my-cool-group\n      folder: Folder Title\n      interval: 1m\n      rules:\n        - uid: rule1\n          title: rule1\n          condition: A\n          data:\n            - refId: A\n              datasourceUid: \"\"\n              model:\n                conditions:\n                    - evaluator:\n                        params:\n                            - 3\n                        type: gt\n                      operator:\n                        type: and\n                      query:\n                        params:\n                            - A\n                      reducer:\n                        type: last\n                      type: query\n                datasource:\n                    type: __expr__\n                    uid: __expr__\n                expression: 1==0\n                intervalMs: 1000\n                maxDataPoints: 43200\n                refId: A\n                type: math\n          noDataState: OK\n          execErrState: OK\n          for: 0s\n          isPaused: false\n"
+				expectedResponse := "apiVersion: 1\ngroups:\n    - orgId: 1\n      name: my-cool-group\n      folder: Folder Title\n      interval: 1m\n      rules:\n        - uid: rule1\n          title: rule1\n          condition: A\n          data:\n            - refId: A\n              datasourceUid: \"\"\n              model:\n                conditions:\n                    - evaluator:\n                        params:\n                            - 3\n                        type: gt\n                      operator:\n                        type: and\n                      query:\n                        params:\n                            - A\n                      reducer:\n                        type: last\n                      type: query\n                datasource:\n                    type: __expr__\n                    uid: __expr__\n                expression: 1==0\n                intervalMs: 1000\n                maxDataPoints: 43200\n                refId: A\n                type: math\n          noDataState: OK\n          execErrState: OK\n          for: 0s\n          isPaused: false\n          notification_settings:\n            receiver: Test-Receiver\n            group_by:\n                - alertname\n                - grafana_folder\n                - test\n            group_wait: 1s\n            group_interval: 5s\n            repeat_interval: 5m\n            mute_time_intervals:\n                - test-mute\n"
 
 				response := sut.RouteGetAlertRuleExport(&rc, "rule1")
 
@@ -882,15 +949,19 @@ func TestProvisioningApi(t *testing.T) {
 			t.Run("json body content is as expected", func(t *testing.T) {
 				sut := createProvisioningSrvSut(t)
 				rc := createTestRequestCtx()
-				insertRule(t, sut, createTestAlertRuleWithFolderAndGroup("rule1", 1, "folder-uid", "groupa"))
-				insertRule(t, sut, createTestAlertRuleWithFolderAndGroup("rule2", 1, "folder-uid", "groupb"))
-				insertRule(t, sut, createTestAlertRuleWithFolderAndGroup("rule3", 1, "folder-uid2", "groupb"))
+				rule1 := createTestAlertRuleWithFolderAndGroup("rule1", 1, "folder-uid", "groupa")
+				rule1.NotificationSettings = nil
+				rule2 := createTestAlertRuleWithFolderAndGroup("rule2", 1, "folder-uid", "groupb")
+				rule1.NotificationSettings = &definitions.AlertRuleNotificationSettings{Receiver: "Email"}
+				rule3 := createTestAlertRuleWithFolderAndGroup("rule3", 1, "folder-uid2", "groupb")
+				insertRule(t, sut, rule1)
+				insertRule(t, sut, rule2)
+				insertRule(t, sut, rule3)
 
 				rc.Context.Req.Header.Add("Accept", "application/json")
-				expectedResponse := `{"apiVersion":1,"groups":[{"orgId":1,"name":"groupa","folder":"Folder Title","interval":"1m","rules":[{"uid":"rule1","title":"rule1","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false}]},{"orgId":1,"name":"groupb","folder":"Folder Title","interval":"1m","rules":[{"uid":"rule2","title":"rule2","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false}]},{"orgId":1,"name":"groupb","folder":"Folder Title2","interval":"1m","rules":[{"uid":"rule3","title":"rule3","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false}]}]}`
+				expectedResponse := `{"apiVersion":1,"groups":[{"orgId":1,"name":"groupa","folder":"Folder Title","interval":"1m","rules":[{"uid":"rule1","title":"rule1","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false,"notification_settings":{"receiver":"Email"}}]},{"orgId":1,"name":"groupb","folder":"Folder Title","interval":"1m","rules":[{"uid":"rule2","title":"rule2","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false,"notification_settings":{"receiver":"Test-Receiver","group_by":["alertname","grafana_folder","test"],"group_wait":"1s","group_interval":"5s","repeat_interval":"5m","mute_time_intervals":["test-mute"]}}]},{"orgId":1,"name":"groupb","folder":"Folder Title2","interval":"1m","rules":[{"uid":"rule3","title":"rule3","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false,"notification_settings":{"receiver":"Test-Receiver","group_by":["alertname","grafana_folder","test"],"group_wait":"1s","group_interval":"5s","repeat_interval":"5m","mute_time_intervals":["test-mute"]}}]}]}`
 
 				response := sut.RouteGetAlertRulesExport(&rc)
-
 				require.Equal(t, 200, response.Status())
 				require.Equal(t, expectedResponse, string(response.Body()))
 			})
@@ -898,15 +969,19 @@ func TestProvisioningApi(t *testing.T) {
 			t.Run("yaml body content is as expected", func(t *testing.T) {
 				sut := createProvisioningSrvSut(t)
 				rc := createTestRequestCtx()
-				insertRule(t, sut, createTestAlertRuleWithFolderAndGroup("rule1", 1, "folder-uid", "groupa"))
-				insertRule(t, sut, createTestAlertRuleWithFolderAndGroup("rule2", 1, "folder-uid", "groupb"))
-				insertRule(t, sut, createTestAlertRuleWithFolderAndGroup("rule3", 1, "folder-uid2", "groupb"))
+				rule1 := createTestAlertRuleWithFolderAndGroup("rule1", 1, "folder-uid", "groupa")
+				rule1.NotificationSettings = nil
+				rule2 := createTestAlertRuleWithFolderAndGroup("rule2", 1, "folder-uid", "groupb")
+				rule1.NotificationSettings = &definitions.AlertRuleNotificationSettings{Receiver: "Email"}
+				rule3 := createTestAlertRuleWithFolderAndGroup("rule3", 1, "folder-uid2", "groupb")
+				insertRule(t, sut, rule1)
+				insertRule(t, sut, rule2)
+				insertRule(t, sut, rule3)
 
 				rc.Context.Req.Header.Add("Accept", "application/yaml")
-				expectedResponse := "apiVersion: 1\ngroups:\n    - orgId: 1\n      name: groupa\n      folder: Folder Title\n      interval: 1m\n      rules:\n        - uid: rule1\n          title: rule1\n          condition: A\n          data:\n            - refId: A\n              datasourceUid: \"\"\n              model:\n                conditions:\n                    - evaluator:\n                        params:\n                            - 3\n                        type: gt\n                      operator:\n                        type: and\n                      query:\n                        params:\n                            - A\n                      reducer:\n                        type: last\n                      type: query\n                datasource:\n                    type: __expr__\n                    uid: __expr__\n                expression: 1==0\n                intervalMs: 1000\n                maxDataPoints: 43200\n                refId: A\n                type: math\n          noDataState: OK\n          execErrState: OK\n          for: 0s\n          isPaused: false\n    - orgId: 1\n      name: groupb\n      folder: Folder Title\n      interval: 1m\n      rules:\n        - uid: rule2\n          title: rule2\n          condition: A\n          data:\n            - refId: A\n              datasourceUid: \"\"\n              model:\n                conditions:\n                    - evaluator:\n                        params:\n                            - 3\n                        type: gt\n                      operator:\n                        type: and\n                      query:\n                        params:\n                            - A\n                      reducer:\n                        type: last\n                      type: query\n                datasource:\n                    type: __expr__\n                    uid: __expr__\n                expression: 1==0\n                intervalMs: 1000\n                maxDataPoints: 43200\n                refId: A\n                type: math\n          noDataState: OK\n          execErrState: OK\n          for: 0s\n          isPaused: false\n    - orgId: 1\n      name: groupb\n      folder: Folder Title2\n      interval: 1m\n      rules:\n        - uid: rule3\n          title: rule3\n          condition: A\n          data:\n            - refId: A\n              datasourceUid: \"\"\n              model:\n                conditions:\n                    - evaluator:\n                        params:\n                            - 3\n                        type: gt\n                      operator:\n                        type: and\n                      query:\n                        params:\n                            - A\n                      reducer:\n                        type: last\n                      type: query\n                datasource:\n                    type: __expr__\n                    uid: __expr__\n                expression: 1==0\n                intervalMs: 1000\n                maxDataPoints: 43200\n                refId: A\n                type: math\n          noDataState: OK\n          execErrState: OK\n          for: 0s\n          isPaused: false\n"
+				expectedResponse := "apiVersion: 1\ngroups:\n    - orgId: 1\n      name: groupa\n      folder: Folder Title\n      interval: 1m\n      rules:\n        - uid: rule1\n          title: rule1\n          condition: A\n          data:\n            - refId: A\n              datasourceUid: \"\"\n              model:\n                conditions:\n                    - evaluator:\n                        params:\n                            - 3\n                        type: gt\n                      operator:\n                        type: and\n                      query:\n                        params:\n                            - A\n                      reducer:\n                        type: last\n                      type: query\n                datasource:\n                    type: __expr__\n                    uid: __expr__\n                expression: 1==0\n                intervalMs: 1000\n                maxDataPoints: 43200\n                refId: A\n                type: math\n          noDataState: OK\n          execErrState: OK\n          for: 0s\n          isPaused: false\n          notification_settings:\n            receiver: Email\n    - orgId: 1\n      name: groupb\n      folder: Folder Title\n      interval: 1m\n      rules:\n        - uid: rule2\n          title: rule2\n          condition: A\n          data:\n            - refId: A\n              datasourceUid: \"\"\n              model:\n                conditions:\n                    - evaluator:\n                        params:\n                            - 3\n                        type: gt\n                      operator:\n                        type: and\n                      query:\n                        params:\n                            - A\n                      reducer:\n                        type: last\n                      type: query\n                datasource:\n                    type: __expr__\n                    uid: __expr__\n                expression: 1==0\n                intervalMs: 1000\n                maxDataPoints: 43200\n                refId: A\n                type: math\n          noDataState: OK\n          execErrState: OK\n          for: 0s\n          isPaused: false\n          notification_settings:\n            receiver: Test-Receiver\n            group_by:\n                - alertname\n                - grafana_folder\n                - test\n            group_wait: 1s\n            group_interval: 5s\n            repeat_interval: 5m\n            mute_time_intervals:\n                - test-mute\n    - orgId: 1\n      name: groupb\n      folder: Folder Title2\n      interval: 1m\n      rules:\n        - uid: rule3\n          title: rule3\n          condition: A\n          data:\n            - refId: A\n              datasourceUid: \"\"\n              model:\n                conditions:\n                    - evaluator:\n                        params:\n                            - 3\n                        type: gt\n                      operator:\n                        type: and\n                      query:\n                        params:\n                            - A\n                      reducer:\n                        type: last\n                      type: query\n                datasource:\n                    type: __expr__\n                    uid: __expr__\n                expression: 1==0\n                intervalMs: 1000\n                maxDataPoints: 43200\n                refId: A\n                type: math\n          noDataState: OK\n          execErrState: OK\n          for: 0s\n          isPaused: false\n          notification_settings:\n            receiver: Test-Receiver\n            group_by:\n                - alertname\n                - grafana_folder\n                - test\n            group_wait: 1s\n            group_interval: 5s\n            repeat_interval: 5m\n            mute_time_intervals:\n                - test-mute\n"
 
 				response := sut.RouteGetAlertRulesExport(&rc)
-
 				require.Equal(t, 200, response.Status())
 				require.Equal(t, expectedResponse, string(response.Body()))
 			})
@@ -920,10 +995,9 @@ func TestProvisioningApi(t *testing.T) {
 
 				rc.Context.Req.Header.Add("Accept", "application/json")
 				rc.Context.Req.Form.Set("folderUid", "folder-uid")
-				expectedResponse := `{"apiVersion":1,"groups":[{"orgId":1,"name":"groupa","folder":"Folder Title","interval":"1m","rules":[{"uid":"rule1","title":"rule1","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false}]},{"orgId":1,"name":"groupb","folder":"Folder Title","interval":"1m","rules":[{"uid":"rule2","title":"rule2","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false}]}]}`
+				expectedResponse := `{"apiVersion":1,"groups":[{"orgId":1,"name":"groupa","folder":"Folder Title","interval":"1m","rules":[{"uid":"rule1","title":"rule1","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false,"notification_settings":{"receiver":"Test-Receiver","group_by":["alertname","grafana_folder","test"],"group_wait":"1s","group_interval":"5s","repeat_interval":"5m","mute_time_intervals":["test-mute"]}}]},{"orgId":1,"name":"groupb","folder":"Folder Title","interval":"1m","rules":[{"uid":"rule2","title":"rule2","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false,"notification_settings":{"receiver":"Test-Receiver","group_by":["alertname","grafana_folder","test"],"group_wait":"1s","group_interval":"5s","repeat_interval":"5m","mute_time_intervals":["test-mute"]}}]}]}`
 
 				response := sut.RouteGetAlertRulesExport(&rc)
-
 				require.Equal(t, 200, response.Status())
 				require.Equal(t, expectedResponse, string(response.Body()))
 			})
@@ -938,10 +1012,9 @@ func TestProvisioningApi(t *testing.T) {
 				rc.Context.Req.Header.Add("Accept", "application/json")
 				rc.Context.Req.Form.Set("folder_uid", "folder-uid")
 				rc.Context.Req.Form.Add("folder_uid", "folder-uid2")
-				expectedResponse := `{"apiVersion":1,"groups":[{"orgId":1,"name":"groupa","folder":"Folder Title","interval":"1m","rules":[{"uid":"rule1","title":"rule1","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false}]},{"orgId":1,"name":"groupb","folder":"Folder Title","interval":"1m","rules":[{"uid":"rule2","title":"rule2","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false}]},{"orgId":1,"name":"groupb","folder":"Folder Title2","interval":"1m","rules":[{"uid":"rule3","title":"rule3","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false}]}]}`
+				expectedResponse := `{"apiVersion":1,"groups":[{"orgId":1,"name":"groupa","folder":"Folder Title","interval":"1m","rules":[{"uid":"rule1","title":"rule1","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false,"notification_settings":{"receiver":"Test-Receiver","group_by":["alertname","grafana_folder","test"],"group_wait":"1s","group_interval":"5s","repeat_interval":"5m","mute_time_intervals":["test-mute"]}}]},{"orgId":1,"name":"groupb","folder":"Folder Title","interval":"1m","rules":[{"uid":"rule2","title":"rule2","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false,"notification_settings":{"receiver":"Test-Receiver","group_by":["alertname","grafana_folder","test"],"group_wait":"1s","group_interval":"5s","repeat_interval":"5m","mute_time_intervals":["test-mute"]}}]},{"orgId":1,"name":"groupb","folder":"Folder Title2","interval":"1m","rules":[{"uid":"rule3","title":"rule3","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false,"notification_settings":{"receiver":"Test-Receiver","group_by":["alertname","grafana_folder","test"],"group_wait":"1s","group_interval":"5s","repeat_interval":"5m","mute_time_intervals":["test-mute"]}}]}]}`
 
 				response := sut.RouteGetAlertRulesExport(&rc)
-
 				require.Equal(t, 200, response.Status())
 				require.Equal(t, expectedResponse, string(response.Body()))
 			})
@@ -957,10 +1030,9 @@ func TestProvisioningApi(t *testing.T) {
 				rc.Context.Req.Form.Set("folderUid", "folder-uid")
 				rc.Context.Req.Form.Set("group", "groupa")
 
-				expectedResponse := `{"apiVersion":1,"groups":[{"orgId":1,"name":"groupa","folder":"Folder Title","interval":"1m","rules":[{"uid":"rule1","title":"rule1","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false}]}]}`
+				expectedResponse := `{"apiVersion":1,"groups":[{"orgId":1,"name":"groupa","folder":"Folder Title","interval":"1m","rules":[{"uid":"rule1","title":"rule1","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false,"notification_settings":{"receiver":"Test-Receiver","group_by":["alertname","grafana_folder","test"],"group_wait":"1s","group_interval":"5s","repeat_interval":"5m","mute_time_intervals":["test-mute"]}}]}]}`
 
 				response := sut.RouteGetAlertRulesExport(&rc)
-
 				require.Equal(t, 200, response.Status())
 				require.Equal(t, expectedResponse, string(response.Body()))
 
@@ -996,7 +1068,7 @@ func TestProvisioningApi(t *testing.T) {
 				rc.Context.Req.Header.Add("Accept", "application/json")
 				rc.Context.Req.Form.Set("ruleUid", "rule1")
 
-				expectedResponse := `{"apiVersion":1,"groups":[{"orgId":1,"name":"groupa","folder":"Folder Title","interval":"1m","rules":[{"uid":"rule1","title":"rule1","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false}]}]}`
+				expectedResponse := `{"apiVersion":1,"groups":[{"orgId":1,"name":"groupa","folder":"Folder Title","interval":"1m","rules":[{"uid":"rule1","title":"rule1","condition":"A","data":[{"refId":"A","relativeTimeRange":{"from":0,"to":0},"datasourceUid":"","model":{"conditions":[{"evaluator":{"params":[3],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"type":"last"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1==0","intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"}}],"noDataState":"OK","execErrState":"OK","for":"0s","isPaused":false,"notification_settings":{"receiver":"Test-Receiver","group_by":["alertname","grafana_folder","test"],"group_wait":"1s","group_interval":"5s","repeat_interval":"5m","mute_time_intervals":["test-mute"]}}]}]}`
 
 				response := sut.RouteGetAlertRulesExport(&rc)
 
@@ -1113,7 +1185,7 @@ func TestProvisioningApi(t *testing.T) {
 				rc := createTestRequestCtx()
 
 				rc.Context.Req.Header.Add("Accept", "application/json")
-				expectedResponse := `{"apiVersion":1,"policies":[{"orgId":1,"Policy":{"receiver":"default-receiver","group_by":["g1","g2"],"routes":[{"receiver":"nested-receiver","group_by":["g3","g4"],"matchers":["a=\"b\""],"object_matchers":[["foo","=","bar"]],"mute_time_intervals":["interval"],"continue":true,"group_wait":"5m","group_interval":"5m","repeat_interval":"5m"}],"group_wait":"30s","group_interval":"5m","repeat_interval":"1h"}}]}`
+				expectedResponse := `{"apiVersion":1,"policies":[{"orgId":1,"receiver":"default-receiver","group_by":["g1","g2"],"routes":[{"receiver":"nested-receiver","group_by":["g3","g4"],"matchers":["a=\"b\""],"object_matchers":[["foo","=","bar"]],"mute_time_intervals":["interval"],"continue":true,"group_wait":"5m","group_interval":"5m","repeat_interval":"5m"}],"group_wait":"30s","group_interval":"5m","repeat_interval":"1h"}]}`
 
 				response := sut.RouteGetPolicyTreeExport(&rc)
 
@@ -1150,6 +1222,132 @@ func TestProvisioningApi(t *testing.T) {
 				require.Equal(t, expectedResponse, string(response.Body()))
 			})
 		})
+
+		t.Run("mute timings", func(t *testing.T) {
+			t.Run("are present, GET returns 200", func(t *testing.T) {
+				sut := createProvisioningSrvSut(t)
+				rc := createTestRequestCtx()
+
+				response := sut.RouteGetMuteTimingsExport(&rc)
+
+				require.Equal(t, 200, response.Status())
+			})
+
+			t.Run("accept header contains yaml, GET returns text yaml", func(t *testing.T) {
+				sut := createProvisioningSrvSut(t)
+				rc := createTestRequestCtx()
+
+				rc.Context.Req.Header.Add("Accept", "application/yaml")
+				response := sut.RouteGetMuteTimingsExport(&rc)
+				response.WriteTo(&rc)
+
+				require.Equal(t, 200, response.Status())
+				require.Equal(t, "text/yaml", rc.Context.Resp.Header().Get("Content-Type"))
+			})
+
+			t.Run("accept header contains json, GET returns json", func(t *testing.T) {
+				sut := createProvisioningSrvSut(t)
+				rc := createTestRequestCtx()
+
+				rc.Context.Req.Header.Add("Accept", "application/json")
+				response := sut.RouteGetMuteTimingsExport(&rc)
+				response.WriteTo(&rc)
+
+				require.Equal(t, 200, response.Status())
+				require.Equal(t, "application/json", rc.Context.Resp.Header().Get("Content-Type"))
+			})
+
+			t.Run("accept header contains json and yaml, GET returns json", func(t *testing.T) {
+				sut := createProvisioningSrvSut(t)
+				rc := createTestRequestCtx()
+
+				rc.Context.Req.Header.Add("Accept", "application/json, application/yaml")
+				response := sut.RouteGetMuteTimingsExport(&rc)
+				response.WriteTo(&rc)
+
+				require.Equal(t, 200, response.Status())
+				require.Equal(t, "application/json", rc.Context.Resp.Header().Get("Content-Type"))
+			})
+
+			t.Run("query param download=true, GET returns content disposition attachment", func(t *testing.T) {
+				sut := createProvisioningSrvSut(t)
+				rc := createTestRequestCtx()
+
+				rc.Context.Req.Form.Set("download", "true")
+				response := sut.RouteGetMuteTimingsExport(&rc)
+				response.WriteTo(&rc)
+
+				require.Equal(t, 200, response.Status())
+				require.Contains(t, rc.Context.Resp.Header().Get("Content-Disposition"), "attachment")
+			})
+
+			t.Run("query param download=false, GET returns empty content disposition", func(t *testing.T) {
+				sut := createProvisioningSrvSut(t)
+				rc := createTestRequestCtx()
+
+				rc.Context.Req.Form.Set("download", "false")
+				response := sut.RouteGetMuteTimingsExport(&rc)
+				response.WriteTo(&rc)
+
+				require.Equal(t, 200, response.Status())
+				require.Equal(t, "", rc.Context.Resp.Header().Get("Content-Disposition"))
+			})
+
+			t.Run("query param download not set, GET returns empty content disposition", func(t *testing.T) {
+				sut := createProvisioningSrvSut(t)
+				rc := createTestRequestCtx()
+
+				response := sut.RouteGetMuteTimingsExport(&rc)
+				response.WriteTo(&rc)
+
+				require.Equal(t, 200, response.Status())
+				require.Equal(t, "", rc.Context.Resp.Header().Get("Content-Disposition"))
+			})
+
+			t.Run("json body content is as expected", func(t *testing.T) {
+				expectedResponse, err := testData.ReadFile(path.Join("test-data", "alertmanager_default_mutetimings-export.json"))
+				require.NoError(t, err)
+				sut := createProvisioningSrvSut(t)
+				sut.policies = createFakeNotificationPolicyService()
+				rc := createTestRequestCtx()
+
+				rc.Context.Req.Header.Add("Accept", "application/json")
+				response := sut.RouteGetMuteTimingsExport(&rc)
+
+				require.Equal(t, 200, response.Status())
+				require.JSONEq(t, string(expectedResponse), string(response.Body()))
+			})
+
+			t.Run("yaml body content is as expected", func(t *testing.T) {
+				expectedResponse, err := testData.ReadFile(path.Join("test-data", "alertmanager_default_mutetimings-export.yaml"))
+				require.NoError(t, err)
+				sut := createProvisioningSrvSut(t)
+				sut.policies = createFakeNotificationPolicyService()
+				rc := createTestRequestCtx()
+
+				rc.Context.Req.Header.Add("Accept", "application/yaml")
+
+				response := sut.RouteGetMuteTimingsExport(&rc)
+
+				require.Equal(t, 200, response.Status())
+				require.Equal(t, string(expectedResponse), string(response.Body()))
+			})
+
+			t.Run("hcl body content is as expected", func(t *testing.T) {
+				expectedResponse, err := testData.ReadFile(path.Join("test-data", "alertmanager_default_mutetimings-export.hcl"))
+				require.NoError(t, err)
+				sut := createProvisioningSrvSut(t)
+				sut.policies = createFakeNotificationPolicyService()
+				rc := createTestRequestCtx()
+
+				rc.Context.Req.Form.Add("format", "hcl")
+
+				response := sut.RouteGetMuteTimingsExport(&rc)
+				t.Log(string(response.Body()))
+				require.Equal(t, 200, response.Status())
+				require.Equal(t, string(expectedResponse), string(response.Body()))
+			})
+		})
 	})
 }
 
@@ -1236,9 +1434,13 @@ func TestProvisioningApiContactPointExport(t *testing.T) {
 		})
 
 		t.Run("decrypt true without alert.provisioning.secrets:read permissions returns 403", func(t *testing.T) {
+			recPermCheck := false
 			env := createTestEnv(t, testConfig)
 			env.ac = &recordingAccessControlFake{
 				Callback: func(user *user.SignedInUser, evaluator accesscontrol.Evaluator) (bool, error) {
+					if strings.Contains(evaluator.String(), accesscontrol.ActionAlertingProvisioningReadSecrets) {
+						recPermCheck = true
+					}
 					return false, nil
 				},
 			}
@@ -1250,16 +1452,18 @@ func TestProvisioningApiContactPointExport(t *testing.T) {
 
 			response := sut.RouteGetContactPointsExport(&rc)
 
+			require.True(t, recPermCheck)
 			require.Equal(t, 403, response.Status())
-			require.Len(t, env.ac.EvaluateRecordings, 1)
-			require.Equal(t, accesscontrol.ActionAlertingProvisioningReadSecrets, env.ac.EvaluateRecordings[0].Evaluator.String())
 		})
 
 		t.Run("decrypt true with admin returns 200", func(t *testing.T) {
+			recPermCheck := false
 			env := createTestEnv(t, testConfig)
 			env.ac = &recordingAccessControlFake{
 				Callback: func(user *user.SignedInUser, evaluator accesscontrol.Evaluator) (bool, error) {
-					require.Equal(t, accesscontrol.ActionAlertingProvisioningReadSecrets, evaluator.String())
+					if strings.Contains(evaluator.String(), accesscontrol.ActionAlertingProvisioningReadSecrets) {
+						recPermCheck = true
+					}
 					return true, nil
 				},
 			}
@@ -1272,9 +1476,8 @@ func TestProvisioningApiContactPointExport(t *testing.T) {
 			response := sut.RouteGetContactPointsExport(&rc)
 			response.WriteTo(&rc)
 
+			require.True(t, recPermCheck)
 			require.Equal(t, 200, response.Status())
-			require.Len(t, env.ac.EvaluateRecordings, 1)
-			require.Equal(t, accesscontrol.ActionAlertingProvisioningReadSecrets, env.ac.EvaluateRecordings[0].Evaluator.String())
 		})
 
 		t.Run("json body content is as expected", func(t *testing.T) {
@@ -1404,12 +1607,14 @@ type testEnvironment struct {
 	secrets          secrets.Service
 	log              log.Logger
 	store            store.DBstore
+	folderService    folder.Service
 	dashboardService dashboards.DashboardService
 	configs          provisioning.AMConfigStore
 	xact             provisioning.TransactionManager
 	quotas           provisioning.QuotaChecker
 	prov             provisioning.ProvisioningStore
 	ac               *recordingAccessControlFake
+	rulesAuthz       *fakes.FakeRuleService
 }
 
 func createTestEnv(t *testing.T, testConfig string) testEnvironment {
@@ -1435,11 +1640,18 @@ func createTestEnv(t *testing.T, testConfig string) testEnvironment {
 			AlertmanagerConfiguration: string(raw),
 		})
 	sqlStore := db.InitTestDB(t)
+
+	// init folder service with default folder
+	folderService := foldertest.NewFakeService()
+	folderService.ExpectedFolder = &folder.Folder{}
+
 	store := store.DBstore{
+		Logger:   log,
 		SQLStore: sqlStore,
 		Cfg: setting.UnifiedAlertingSettings{
 			BaseInterval: time.Second * 10,
 		},
+		FolderService: folderService,
 	}
 	quotas := &provisioning.MockQuotaChecker{}
 	quotas.EXPECT().LimitOK()
@@ -1464,16 +1676,20 @@ func createTestEnv(t *testing.T, testConfig string) testEnvironment {
 
 	ac := &recordingAccessControlFake{}
 
+	ruleAuthz := &fakes.FakeRuleService{}
+
 	return testEnvironment{
 		secrets:          secretsService,
 		log:              log,
 		configs:          configs,
 		store:            store,
+		folderService:    folderService,
 		dashboardService: dashboardService,
 		xact:             xact,
 		prov:             prov,
 		quotas:           quotas,
 		ac:               ac,
+		rulesAuthz:       ruleAuthz,
 	}
 }
 
@@ -1487,13 +1703,14 @@ func createProvisioningSrvSut(t *testing.T) ProvisioningSrv {
 func createProvisioningSrvSutFromEnv(t *testing.T, env *testEnvironment) ProvisioningSrv {
 	t.Helper()
 
+	receiverSvc := notifier.NewReceiverService(env.ac, env.configs, env.prov, env.secrets, env.xact, env.log)
 	return ProvisioningSrv{
 		log:                 env.log,
 		policies:            newFakeNotificationPolicyService(),
-		contactPointService: provisioning.NewContactPointService(env.configs, env.secrets, env.prov, env.xact, env.log, env.ac),
+		contactPointService: provisioning.NewContactPointService(env.configs, env.secrets, env.prov, env.xact, receiverSvc, env.log, env.store),
 		templates:           provisioning.NewTemplateService(env.configs, env.prov, env.xact, env.log),
 		muteTimings:         provisioning.NewMuteTimingService(env.configs, env.prov, env.xact, env.log),
-		alertRules:          provisioning.NewAlertRuleService(env.store, env.prov, env.dashboardService, env.quotas, env.xact, 60, 10, env.log),
+		alertRules:          provisioning.NewAlertRuleService(env.store, env.prov, env.folderService, env.dashboardService, env.quotas, env.xact, 60, 10, 100, env.log, &provisioning.NotificationSettingsValidatorProviderFake{}, env.rulesAuthz),
 	}
 }
 
@@ -1680,6 +1897,14 @@ func createTestAlertRule(title string, orgID int64) definitions.ProvisionedAlert
 		For:          model.Duration(60),
 		NoDataState:  definitions.OK,
 		ExecErrState: definitions.OkErrState,
+		NotificationSettings: &definitions.AlertRuleNotificationSettings{
+			Receiver:          "Test-Receiver",
+			GroupBy:           []string{"alertname", "grafana_folder", "test"},
+			GroupWait:         util.Pointer(model.Duration(1 * time.Second)),
+			GroupInterval:     util.Pointer(model.Duration(5 * time.Second)),
+			RepeatInterval:    util.Pointer(model.Duration(5 * time.Minute)),
+			MuteTimeIntervals: []string{"test-mute"},
+		},
 	}
 }
 
@@ -1765,7 +1990,38 @@ var testConfig = `
 		"mute_time_intervals": [{
 			"name": "interval",
 			"time_intervals": []
-		}]
+		}, {
+                "name": "full-interval",
+                "time_intervals": [
+                    {
+                        "times": [
+                            {
+                                "start_time": "10:00",
+                                "end_time": "12:00"
+                            }
+                        ],
+                        "weekdays": [
+                            "monday",
+                            "wednesday",
+                            "friday"
+                        ],
+                        "days_of_month": [
+                            "1",
+                            "14:16",
+                            "20"
+                        ],
+                        "months": [
+                            "1:3",
+                            "7",
+                            "12"
+                        ],
+                        "years": [
+                            "2023:2025"
+                        ],
+                        "location": "America/New_York"
+                    }
+                ]
+            }]
 	}
 }
 `
diff --git a/pkg/services/ngalert/api/api_ruler.go b/pkg/services/ngalert/api/api_ruler.go
index 106e1c6934541..8a77b72a9cfeb 100644
--- a/pkg/services/ngalert/api/api_ruler.go
+++ b/pkg/services/ngalert/api/api_ruler.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"slices"
 	"strings"
 	"time"
 
@@ -13,18 +14,21 @@ import (
 	"github.com/grafana/grafana/pkg/api/apierrors"
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/ngalert/accesscontrol"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/ngalert/eval"
 	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/notifier"
 	"github.com/grafana/grafana/pkg/services/ngalert/provisioning"
 	"github.com/grafana/grafana/pkg/services/ngalert/store"
 	"github.com/grafana/grafana/pkg/services/quota"
-	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
+	"github.com/grafana/grafana/pkg/util/errutil"
 )
 
 type ConditionValidator interface {
@@ -32,6 +36,14 @@ type ConditionValidator interface {
 	Validate(ctx eval.EvaluationContext, condition ngmodels.Condition) error
 }
 
+type AMConfigStore interface {
+	GetLatestAlertmanagerConfiguration(ctx context.Context, orgID int64) (*ngmodels.AlertConfiguration, error)
+}
+
+type AMRefresher interface {
+	ApplyConfig(ctx context.Context, orgId int64, dbConfig *ngmodels.AlertConfiguration) error
+}
+
 type RulerSrv struct {
 	xactManager        provisioning.TransactionManager
 	provenanceStore    provisioning.ProvisioningStore
@@ -39,27 +51,37 @@ type RulerSrv struct {
 	QuotaService       quota.Service
 	log                log.Logger
 	cfg                *setting.UnifiedAlertingSettings
-	ac                 accesscontrol.AccessControl
 	conditionValidator ConditionValidator
+	authz              RuleAccessControlService
+
+	amConfigStore  AMConfigStore
+	amRefresher    AMRefresher
+	featureManager featuremgmt.FeatureToggles
 }
 
 var (
 	errProvisionedResource = errors.New("request affects resources created via provisioning API")
 )
 
+// ignore fields that are not part of the rule definition
+var ignoreFieldsForValidate = [...]string{"RuleGroupIndex"}
+
 // RouteDeleteAlertRules deletes all alert rules the user is authorized to access in the given namespace
 // or, if non-empty, a specific group of rules in the namespace.
-// Returns http.StatusUnauthorized if user does not have access to any of the rules that match the filter.
+// Returns http.StatusForbidden if user does not have access to any of the rules that match the filter.
 // Returns http.StatusBadRequest if all rules that match the filter and the user is authorized to delete are provisioned.
-func (srv RulerSrv) RouteDeleteAlertRules(c *contextmodel.ReqContext, namespaceTitle string, group string) response.Response {
-	namespace, err := srv.store.GetNamespaceByTitle(c.Req.Context(), namespaceTitle, c.SignedInUser.OrgID, c.SignedInUser)
+func (srv RulerSrv) RouteDeleteAlertRules(c *contextmodel.ReqContext, namespaceUID string, group string) response.Response {
+	namespace, err := srv.store.GetNamespaceByUID(c.Req.Context(), namespaceUID, c.SignedInUser.GetOrgID(), c.SignedInUser)
 	if err != nil {
 		return toNamespaceErrorResponse(err)
 	}
 
+	userNamespace, id := c.SignedInUser.GetNamespacedID()
 	var loggerCtx = []any{
 		"userId",
-		c.SignedInUser.UserID,
+		id,
+		"userNamespace",
+		userNamespace,
 		"namespaceUid",
 		namespace.UID,
 	}
@@ -68,7 +90,7 @@ func (srv RulerSrv) RouteDeleteAlertRules(c *contextmodel.ReqContext, namespaceT
 	}
 	logger := srv.log.New(loggerCtx...)
 
-	provenances, err := srv.provenanceStore.GetProvenances(c.Req.Context(), c.SignedInUser.OrgID, (&ngmodels.AlertRule{}).ResourceType())
+	provenances, err := srv.provenanceStore.GetProvenances(c.Req.Context(), c.SignedInUser.GetOrgID(), (&ngmodels.AlertRule{}).ResourceType())
 	if err != nil {
 		return ErrResp(http.StatusInternalServerError, err, "failed to fetch provenances of alert rules")
 	}
@@ -93,7 +115,7 @@ func (srv RulerSrv) RouteDeleteAlertRules(c *contextmodel.ReqContext, namespaceT
 				return err
 			}
 			if totalGroups > 0 && len(deletionCandidates) == 0 {
-				return fmt.Errorf("%w to delete any existing rules in the namespace", ErrAuthorization)
+				return accesscontrol.NewAuthorizationErrorGeneric("delete any existing rules in the namespace")
 			}
 		}
 		rulesToDelete := make([]string, 0)
@@ -111,7 +133,7 @@ func (srv RulerSrv) RouteDeleteAlertRules(c *contextmodel.ReqContext, namespaceT
 			rulesToDelete = append(rulesToDelete, uid...)
 		}
 		if len(rulesToDelete) > 0 {
-			err := srv.store.DeleteAlertRulesByUID(ctx, c.SignedInUser.OrgID, rulesToDelete...)
+			err := srv.store.DeleteAlertRulesByUID(ctx, c.SignedInUser.GetOrgID(), rulesToDelete...)
 			if err != nil {
 				return err
 			}
@@ -128,8 +150,8 @@ func (srv RulerSrv) RouteDeleteAlertRules(c *contextmodel.ReqContext, namespaceT
 	})
 
 	if err != nil {
-		if errors.Is(err, ErrAuthorization) {
-			return ErrResp(http.StatusUnauthorized, err, "failed to delete rule group")
+		if errors.As(err, &errutil.Error{}) {
+			return response.Err(err)
 		}
 		if errors.Is(err, errProvisionedResource) {
 			return ErrResp(http.StatusBadRequest, err, "failed to delete rule group")
@@ -140,8 +162,8 @@ func (srv RulerSrv) RouteDeleteAlertRules(c *contextmodel.ReqContext, namespaceT
 }
 
 // RouteGetNamespaceRulesConfig returns all rules in a specific folder that user has access to
-func (srv RulerSrv) RouteGetNamespaceRulesConfig(c *contextmodel.ReqContext, namespaceTitle string) response.Response {
-	namespace, err := srv.store.GetNamespaceByTitle(c.Req.Context(), namespaceTitle, c.SignedInUser.OrgID, c.SignedInUser)
+func (srv RulerSrv) RouteGetNamespaceRulesConfig(c *contextmodel.ReqContext, namespaceUID string) response.Response {
+	namespace, err := srv.store.GetNamespaceByUID(c.Req.Context(), namespaceUID, c.SignedInUser.GetOrgID(), c.SignedInUser)
 	if err != nil {
 		return toNamespaceErrorResponse(err)
 	}
@@ -150,7 +172,7 @@ func (srv RulerSrv) RouteGetNamespaceRulesConfig(c *contextmodel.ReqContext, nam
 	if err != nil {
 		return errorToResponse(err)
 	}
-	provenanceRecords, err := srv.provenanceStore.GetProvenances(c.Req.Context(), c.SignedInUser.OrgID, (&ngmodels.AlertRule{}).ResourceType())
+	provenanceRecords, err := srv.provenanceStore.GetProvenances(c.Req.Context(), c.SignedInUser.GetOrgID(), (&ngmodels.AlertRule{}).ResourceType())
 	if err != nil {
 		return ErrResp(http.StatusInternalServerError, err, "failed to get provenance for rule group")
 	}
@@ -158,16 +180,16 @@ func (srv RulerSrv) RouteGetNamespaceRulesConfig(c *contextmodel.ReqContext, nam
 	result := apimodels.NamespaceConfigResponse{}
 
 	for groupKey, rules := range ruleGroups {
-		result[namespaceTitle] = append(result[namespaceTitle], toGettableRuleGroupConfig(groupKey.RuleGroup, rules, namespace.ID, provenanceRecords))
+		result[namespace.Fullpath] = append(result[namespace.Fullpath], toGettableRuleGroupConfig(groupKey.RuleGroup, rules, provenanceRecords))
 	}
 
 	return response.JSON(http.StatusAccepted, result)
 }
 
 // RouteGetRulesGroupConfig returns rules that belong to a specific group in a specific namespace (folder).
-// If user does not have access to at least one of the rule in the group, returns status 401 Unauthorized
-func (srv RulerSrv) RouteGetRulesGroupConfig(c *contextmodel.ReqContext, namespaceTitle string, ruleGroup string) response.Response {
-	namespace, err := srv.store.GetNamespaceByTitle(c.Req.Context(), namespaceTitle, c.SignedInUser.OrgID, c.SignedInUser)
+// If user does not have access to at least one of the rule in the group, returns status 403 Forbidden
+func (srv RulerSrv) RouteGetRulesGroupConfig(c *contextmodel.ReqContext, namespaceUID string, ruleGroup string) response.Response {
+	namespace, err := srv.store.GetNamespaceByUID(c.Req.Context(), namespaceUID, c.SignedInUser.GetOrgID(), c.SignedInUser)
 	if err != nil {
 		return toNamespaceErrorResponse(err)
 	}
@@ -181,13 +203,14 @@ func (srv RulerSrv) RouteGetRulesGroupConfig(c *contextmodel.ReqContext, namespa
 		return errorToResponse(err)
 	}
 
-	provenanceRecords, err := srv.provenanceStore.GetProvenances(c.Req.Context(), c.SignedInUser.OrgID, (&ngmodels.AlertRule{}).ResourceType())
+	provenanceRecords, err := srv.provenanceStore.GetProvenances(c.Req.Context(), c.SignedInUser.GetOrgID(), (&ngmodels.AlertRule{}).ResourceType())
 	if err != nil {
 		return ErrResp(http.StatusInternalServerError, err, "failed to get group alert rules")
 	}
 
 	result := apimodels.RuleGroupConfigResponse{
-		GettableRuleGroupConfig: toGettableRuleGroupConfig(ruleGroup, rules, namespace.ID, provenanceRecords),
+		// nolint:staticcheck
+		GettableRuleGroupConfig: toGettableRuleGroupConfig(ruleGroup, rules, provenanceRecords),
 	}
 	return response.JSON(http.StatusAccepted, result)
 }
@@ -223,7 +246,7 @@ func (srv RulerSrv) RouteGetRulesConfig(c *contextmodel.ReqContext) response.Res
 	if err != nil {
 		return errorToResponse(err)
 	}
-	provenanceRecords, err := srv.provenanceStore.GetProvenances(c.Req.Context(), c.SignedInUser.OrgID, (&ngmodels.AlertRule{}).ResourceType())
+	provenanceRecords, err := srv.provenanceStore.GetProvenances(c.Req.Context(), c.SignedInUser.GetOrgID(), (&ngmodels.AlertRule{}).ResourceType())
 	if err != nil {
 		return ErrResp(http.StatusInternalServerError, err, "failed to get alert rules")
 	}
@@ -231,28 +254,32 @@ func (srv RulerSrv) RouteGetRulesConfig(c *contextmodel.ReqContext) response.Res
 	for groupKey, rules := range configs {
 		folder, ok := namespaceMap[groupKey.NamespaceUID]
 		if !ok {
-			srv.log.Error("Namespace not visible to the user", "user", c.SignedInUser.UserID, "namespace", groupKey.NamespaceUID)
+			userNamespace, id := c.SignedInUser.GetNamespacedID()
+			srv.log.Error("Namespace not visible to the user", "user", id, "userNamespace", userNamespace, "namespace", groupKey.NamespaceUID)
 			continue
 		}
-		namespace := folder.Title
-		result[namespace] = append(result[namespace], toGettableRuleGroupConfig(groupKey.RuleGroup, rules, folder.ID, provenanceRecords))
+		result[folder.Fullpath] = append(result[folder.Fullpath], toGettableRuleGroupConfig(groupKey.RuleGroup, rules, provenanceRecords))
 	}
 	return response.JSON(http.StatusOK, result)
 }
 
-func (srv RulerSrv) RoutePostNameRulesConfig(c *contextmodel.ReqContext, ruleGroupConfig apimodels.PostableRuleGroupConfig, namespaceTitle string) response.Response {
-	namespace, err := srv.store.GetNamespaceByTitle(c.Req.Context(), namespaceTitle, c.SignedInUser.OrgID, c.SignedInUser)
+func (srv RulerSrv) RoutePostNameRulesConfig(c *contextmodel.ReqContext, ruleGroupConfig apimodels.PostableRuleGroupConfig, namespaceUID string) response.Response {
+	namespace, err := srv.store.GetNamespaceByUID(c.Req.Context(), namespaceUID, c.SignedInUser.GetOrgID(), c.SignedInUser)
 	if err != nil {
 		return toNamespaceErrorResponse(err)
 	}
 
-	rules, err := validateRuleGroup(&ruleGroupConfig, c.SignedInUser.OrgID, namespace, srv.cfg)
+	if err := srv.checkGroupLimits(ruleGroupConfig); err != nil {
+		return ErrResp(http.StatusBadRequest, err, "")
+	}
+
+	rules, err := ValidateRuleGroup(&ruleGroupConfig, c.SignedInUser.GetOrgID(), namespace.UID, RuleLimitsFromConfig(srv.cfg))
 	if err != nil {
 		return ErrResp(http.StatusBadRequest, err, "")
 	}
 
 	groupKey := ngmodels.AlertRuleGroupKey{
-		OrgID:        c.SignedInUser.OrgID,
+		OrgID:        c.SignedInUser.GetOrgID(),
 		NamespaceUID: namespace.UID,
 		RuleGroup:    ruleGroupConfig.Name,
 	}
@@ -260,13 +287,29 @@ func (srv RulerSrv) RoutePostNameRulesConfig(c *contextmodel.ReqContext, ruleGro
 	return srv.updateAlertRulesInGroup(c, groupKey, rules)
 }
 
+func (srv RulerSrv) checkGroupLimits(group apimodels.PostableRuleGroupConfig) error {
+	if srv.cfg.RulesPerRuleGroupLimit > 0 && int64(len(group.Rules)) > srv.cfg.RulesPerRuleGroupLimit {
+		srv.log.Warn("Large rule group was edited. Large groups are discouraged and may be rejected in the future.",
+			"limit", srv.cfg.RulesPerRuleGroupLimit,
+			"actual", len(group.Rules),
+			"group", group.Name,
+		)
+	}
+
+	return nil
+}
+
 // updateAlertRulesInGroup calculates changes (rules to add,update,delete), verifies that the user is authorized to do the calculated changes and updates database.
 // All operations are performed in a single transaction
+//
+//nolint:gocyclo
 func (srv RulerSrv) updateAlertRulesInGroup(c *contextmodel.ReqContext, groupKey ngmodels.AlertRuleGroupKey, rules []*ngmodels.AlertRuleWithOptionals) response.Response {
 	var finalChanges *store.GroupDelta
-	hasAccess := accesscontrol.HasAccess(srv.ac, c)
+	var dbConfig *ngmodels.AlertConfiguration
 	err := srv.xactManager.InTransaction(c.Req.Context(), func(tranCtx context.Context) error {
-		logger := srv.log.New("namespace_uid", groupKey.NamespaceUID, "group", groupKey.RuleGroup, "org_id", groupKey.OrgID, "user_id", c.UserID)
+		userNamespace, id := c.SignedInUser.GetNamespacedID()
+		logger := srv.log.New("namespace_uid", groupKey.NamespaceUID, "group",
+			groupKey.RuleGroup, "org_id", groupKey.OrgID, "user_id", id, "userNamespace", userNamespace)
 		groupChanges, err := store.CalculateChanges(tranCtx, srv.store, groupKey, rules)
 		if err != nil {
 			return err
@@ -278,9 +321,7 @@ func (srv RulerSrv) updateAlertRulesInGroup(c *contextmodel.ReqContext, groupKey
 			return nil
 		}
 
-		err = authorizeRuleChanges(groupChanges, func(evaluator accesscontrol.Evaluator) bool {
-			return hasAccess(evaluator)
-		})
+		err = srv.authz.AuthorizeRuleChanges(c.Req.Context(), c.SignedInUser, groupChanges)
 		if err != nil {
 			return err
 		}
@@ -289,6 +330,24 @@ func (srv RulerSrv) updateAlertRulesInGroup(c *contextmodel.ReqContext, groupKey
 			return err
 		}
 
+		newOrUpdatedNotificationSettings := groupChanges.NewOrUpdatedNotificationSettings()
+		if len(newOrUpdatedNotificationSettings) > 0 {
+			dbConfig, err = srv.amConfigStore.GetLatestAlertmanagerConfiguration(c.Req.Context(), groupChanges.GroupKey.OrgID)
+			if err != nil {
+				return fmt.Errorf("failed to get latest configuration: %w", err)
+			}
+			cfg, err := notifier.Load([]byte(dbConfig.AlertmanagerConfiguration))
+			if err != nil {
+				return fmt.Errorf("failed to parse configuration: %w", err)
+			}
+			validator := notifier.NewNotificationSettingsValidator(&cfg.AlertmanagerConfig)
+			for _, s := range newOrUpdatedNotificationSettings {
+				if err := validator.Validate(s); err != nil {
+					return errors.Join(ngmodels.ErrAlertRuleFailedValidation, err)
+				}
+			}
+		}
+
 		if err := verifyProvisionedRulesNotAffected(c.Req.Context(), srv.provenanceStore, c.SignedInUser.GetOrgID(), groupChanges); err != nil {
 			return err
 		}
@@ -303,7 +362,7 @@ func (srv RulerSrv) updateAlertRulesInGroup(c *contextmodel.ReqContext, groupKey
 				UIDs = append(UIDs, rule.UID)
 			}
 
-			if err = srv.store.DeleteAlertRulesByUID(tranCtx, c.SignedInUser.OrgID, UIDs...); err != nil {
+			if err = srv.store.DeleteAlertRulesByUID(tranCtx, c.SignedInUser.GetOrgID(), UIDs...); err != nil {
 				return fmt.Errorf("failed to delete rules: %w", err)
 			}
 		}
@@ -343,9 +402,10 @@ func (srv RulerSrv) updateAlertRulesInGroup(c *contextmodel.ReqContext, groupKey
 		}
 
 		if len(finalChanges.New) > 0 {
+			userID, _ := identity.UserIdentifier(c.SignedInUser.GetNamespacedID())
 			limitReached, err := srv.QuotaService.CheckQuotaReached(tranCtx, ngmodels.QuotaTargetSrv, &quota.ScopeParameters{
 				OrgID:  c.SignedInUser.GetOrgID(),
-				UserID: c.UserID,
+				UserID: userID,
 			}) // alert rule is table name
 			if err != nil {
 				return fmt.Errorf("failed to get alert rules quota: %w", err)
@@ -358,19 +418,28 @@ func (srv RulerSrv) updateAlertRulesInGroup(c *contextmodel.ReqContext, groupKey
 	})
 
 	if err != nil {
-		if errors.Is(err, ngmodels.ErrAlertRuleNotFound) {
+		if errors.As(err, &errutil.Error{}) {
+			return response.Err(err)
+		} else if errors.Is(err, ngmodels.ErrAlertRuleNotFound) {
 			return ErrResp(http.StatusNotFound, err, "failed to update rule group")
 		} else if errors.Is(err, ngmodels.ErrAlertRuleFailedValidation) || errors.Is(err, errProvisionedResource) {
 			return ErrResp(http.StatusBadRequest, err, "failed to update rule group")
 		} else if errors.Is(err, ngmodels.ErrQuotaReached) {
 			return ErrResp(http.StatusForbidden, err, "")
-		} else if errors.Is(err, ErrAuthorization) {
-			return ErrResp(http.StatusUnauthorized, err, "")
 		} else if errors.Is(err, store.ErrOptimisticLock) {
 			return ErrResp(http.StatusConflict, err, "")
 		}
 		return ErrResp(http.StatusInternalServerError, err, "failed to update rule group")
 	}
+
+	if srv.featureManager.IsEnabled(c.Req.Context(), featuremgmt.FlagAlertingSimplifiedRouting) && dbConfig != nil {
+		// This isn't strictly necessary since the alertmanager config is periodically synced.
+		err := srv.amRefresher.ApplyConfig(c.Req.Context(), groupKey.OrgID, dbConfig)
+		if err != nil {
+			srv.log.Warn("Failed to refresh Alertmanager config for org after change in notification settings", "org", c.SignedInUser.GetOrgID(), "error", err)
+		}
+	}
+
 	return changesToResponse(finalChanges)
 }
 
@@ -397,7 +466,7 @@ func changesToResponse(finalChanges *store.GroupDelta) response.Response {
 	return response.JSON(http.StatusAccepted, body)
 }
 
-func toGettableRuleGroupConfig(groupName string, rules ngmodels.RulesGroup, namespaceID int64, provenanceRecords map[string]ngmodels.Provenance) apimodels.GettableRuleGroupConfig {
+func toGettableRuleGroupConfig(groupName string, rules ngmodels.RulesGroup, provenanceRecords map[string]ngmodels.Provenance) apimodels.GettableRuleGroupConfig {
 	rules.SortByGroupIndex()
 	ruleNodes := make([]apimodels.GettableExtendedRuleNode, 0, len(rules))
 	var interval time.Duration
@@ -405,7 +474,7 @@ func toGettableRuleGroupConfig(groupName string, rules ngmodels.RulesGroup, name
 		interval = time.Duration(rules[0].IntervalSeconds) * time.Second
 	}
 	for _, r := range rules {
-		ruleNodes = append(ruleNodes, toGettableExtendedRuleNode(*r, namespaceID, provenanceRecords))
+		ruleNodes = append(ruleNodes, toGettableExtendedRuleNode(*r, provenanceRecords))
 	}
 	return apimodels.GettableRuleGroupConfig{
 		Name:     groupName,
@@ -414,29 +483,30 @@ func toGettableRuleGroupConfig(groupName string, rules ngmodels.RulesGroup, name
 	}
 }
 
-func toGettableExtendedRuleNode(r ngmodels.AlertRule, namespaceID int64, provenanceRecords map[string]ngmodels.Provenance) apimodels.GettableExtendedRuleNode {
+func toGettableExtendedRuleNode(r ngmodels.AlertRule, provenanceRecords map[string]ngmodels.Provenance) apimodels.GettableExtendedRuleNode {
 	provenance := ngmodels.ProvenanceNone
 	if prov, exists := provenanceRecords[r.ResourceID()]; exists {
 		provenance = prov
 	}
+
 	gettableExtendedRuleNode := apimodels.GettableExtendedRuleNode{
 		GrafanaManagedAlert: &apimodels.GettableGrafanaRule{
-			ID:              r.ID,
-			OrgID:           r.OrgID,
-			Title:           r.Title,
-			Condition:       r.Condition,
-			Data:            ApiAlertQueriesFromAlertQueries(r.Data),
-			Updated:         r.Updated,
-			IntervalSeconds: r.IntervalSeconds,
-			Version:         r.Version,
-			UID:             r.UID,
-			NamespaceUID:    r.NamespaceUID,
-			NamespaceID:     namespaceID,
-			RuleGroup:       r.RuleGroup,
-			NoDataState:     apimodels.NoDataState(r.NoDataState),
-			ExecErrState:    apimodels.ExecutionErrorState(r.ExecErrState),
-			Provenance:      apimodels.Provenance(provenance),
-			IsPaused:        r.IsPaused,
+			ID:                   r.ID,
+			OrgID:                r.OrgID,
+			Title:                r.Title,
+			Condition:            r.Condition,
+			Data:                 ApiAlertQueriesFromAlertQueries(r.Data),
+			Updated:              r.Updated,
+			IntervalSeconds:      r.IntervalSeconds,
+			Version:              r.Version,
+			UID:                  r.UID,
+			NamespaceUID:         r.NamespaceUID,
+			RuleGroup:            r.RuleGroup,
+			NoDataState:          apimodels.NoDataState(r.NoDataState),
+			ExecErrState:         apimodels.ExecutionErrorState(r.ExecErrState),
+			Provenance:           apimodels.Provenance(provenance),
+			IsPaused:             r.IsPaused,
+			NotificationSettings: AlertRuleNotificationSettingsFromNotificationSettings(r.NotificationSettings),
 		},
 	}
 	forDuration := model.Duration(r.For)
@@ -481,7 +551,7 @@ func verifyProvisionedRulesNotAffected(ctx context.Context, provenanceStore prov
 	return fmt.Errorf("%w: alert rule group [%s]", errProvisionedResource, errorMsg.String())
 }
 
-func validateQueries(ctx context.Context, groupChanges *store.GroupDelta, validator ConditionValidator, user *user.SignedInUser) error {
+func validateQueries(ctx context.Context, groupChanges *store.GroupDelta, validator ConditionValidator, user identity.Requester) error {
 	if len(groupChanges.New) > 0 {
 		for _, rule := range groupChanges.New {
 			err := validator.Validate(eval.NewContext(ctx, user), rule.GetEvalCondition())
@@ -492,6 +562,9 @@ func validateQueries(ctx context.Context, groupChanges *store.GroupDelta, valida
 	}
 	if len(groupChanges.Update) > 0 {
 		for _, upd := range groupChanges.Update {
+			if !shouldValidate(upd) {
+				continue
+			}
 			err := validator.Validate(eval.NewContext(ctx, user), upd.New.GetEvalCondition())
 			if err != nil {
 				return fmt.Errorf("%w '%s' (UID: %s): %s", ngmodels.ErrAlertRuleFailedValidation, upd.New.Title, upd.New.UID, err.Error())
@@ -501,11 +574,22 @@ func validateQueries(ctx context.Context, groupChanges *store.GroupDelta, valida
 	return nil
 }
 
+// shouldValidate returns true if the rule is not paused and there are changes in the rule that are not ignored
+func shouldValidate(delta store.RuleDelta) bool {
+	for _, diff := range delta.Diff {
+		if !slices.Contains(ignoreFieldsForValidate[:], diff.Path) {
+			return true
+		}
+	}
+
+	// TODO: consider also checking if rule will be paused after the update
+	return false
+}
+
 // getAuthorizedRuleByUid fetches all rules in group to which the specified rule belongs, and checks whether the user is authorized to access the group.
 // A user is authorized to access a group of rules only when it has permission to query all data sources used by all rules in this group.
 // Returns rule identified by provided UID or ErrAuthorization if user is not authorized to access the rule.
 func (srv RulerSrv) getAuthorizedRuleByUid(ctx context.Context, c *contextmodel.ReqContext, ruleUID string) (ngmodels.AlertRule, error) {
-	hasAccess := accesscontrol.HasAccess(srv.ac, c)
 	q := ngmodels.GetAlertRulesGroupByRuleUIDQuery{
 		UID:   ruleUID,
 		OrgID: c.SignedInUser.GetOrgID(),
@@ -515,8 +599,8 @@ func (srv RulerSrv) getAuthorizedRuleByUid(ctx context.Context, c *contextmodel.
 	if err != nil {
 		return ngmodels.AlertRule{}, err
 	}
-	if !authorizeAccessToRuleGroup(rules, hasAccess) {
-		return ngmodels.AlertRule{}, fmt.Errorf("%w to access rules in this group", ErrAuthorization)
+	if err := srv.authz.AuthorizeAccessToRuleGroup(ctx, c.SignedInUser, rules); err != nil {
+		return ngmodels.AlertRule{}, err
 	}
 	for _, rule := range rules {
 		if rule.UID == ruleUID {
@@ -530,8 +614,6 @@ func (srv RulerSrv) getAuthorizedRuleByUid(ctx context.Context, c *contextmodel.
 // A user is authorized to access a group of rules only when it has permission to query all data sources used by all rules in this group.
 // Returns models.RuleGroup if authorization passed or ErrAuthorization if user is not authorized to access the rule.
 func (srv RulerSrv) getAuthorizedRuleGroup(ctx context.Context, c *contextmodel.ReqContext, ruleGroupKey ngmodels.AlertRuleGroupKey) (ngmodels.RulesGroup, error) {
-	hasAccess := accesscontrol.HasAccess(srv.ac, c)
-
 	q := ngmodels.ListAlertRulesQuery{
 		OrgID:         ruleGroupKey.OrgID,
 		NamespaceUIDs: []string{ruleGroupKey.NamespaceUID},
@@ -541,8 +623,8 @@ func (srv RulerSrv) getAuthorizedRuleGroup(ctx context.Context, c *contextmodel.
 	if err != nil {
 		return nil, err
 	}
-	if !authorizeAccessToRuleGroup(rules, hasAccess) {
-		return nil, fmt.Errorf("%w to access rules in this group", ErrAuthorization)
+	if err := srv.authz.AuthorizeAccessToRuleGroup(ctx, c.SignedInUser, rules); err != nil {
+		return nil, err
 	}
 	return rules, nil
 }
@@ -551,7 +633,6 @@ func (srv RulerSrv) getAuthorizedRuleGroup(ctx context.Context, c *contextmodel.
 // A user is authorized to access a group of rules only when it has permission to query all data sources used by all rules in this group.
 // Returns groups that user is authorized to access, and total count of groups returned by query
 func (srv RulerSrv) searchAuthorizedAlertRules(ctx context.Context, c *contextmodel.ReqContext, folderUIDs []string, dashboardUID string, panelID int64) (map[ngmodels.AlertRuleGroupKey]ngmodels.RulesGroup, int, error) {
-	hasAccess := accesscontrol.HasAccess(srv.ac, c)
 	query := ngmodels.ListAlertRulesQuery{
 		OrgID:         c.SignedInUser.GetOrgID(),
 		NamespaceUIDs: folderUIDs,
@@ -566,7 +647,10 @@ func (srv RulerSrv) searchAuthorizedAlertRules(ctx context.Context, c *contextmo
 	byGroupKey := ngmodels.GroupByAlertRuleGroupKey(rules)
 	totalGroups := len(byGroupKey)
 	for groupKey, rulesGroup := range byGroupKey {
-		if !authorizeAccessToRuleGroup(rulesGroup, hasAccess) {
+		if ok, err := srv.authz.HasAccessToRuleGroup(ctx, c.SignedInUser, rulesGroup); !ok || err != nil {
+			if err != nil {
+				return nil, 0, err
+			}
 			delete(byGroupKey, groupKey)
 		}
 	}
diff --git a/pkg/services/ngalert/api/api_ruler_export.go b/pkg/services/ngalert/api/api_ruler_export.go
index 0a34cf0b050d3..f925a4d4a8afc 100644
--- a/pkg/services/ngalert/api/api_ruler_export.go
+++ b/pkg/services/ngalert/api/api_ruler_export.go
@@ -7,19 +7,20 @@ import (
 
 	"github.com/grafana/grafana/pkg/api/response"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/ngalert/accesscontrol"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
 )
 
 // ExportFromPayload converts the rule groups from the argument `ruleGroupConfig` to export format. All rules are expected to be fully specified. The access to data sources mentioned in the rules is not enforced.
-// Can return 403 StatusForbidden if user is not authorized to read folder `namespaceTitle`
-func (srv RulerSrv) ExportFromPayload(c *contextmodel.ReqContext, ruleGroupConfig apimodels.PostableRuleGroupConfig, namespaceTitle string) response.Response {
-	namespace, err := srv.store.GetNamespaceByTitle(c.Req.Context(), namespaceTitle, c.SignedInUser.OrgID, c.SignedInUser)
+// Can return 403 StatusForbidden if user is not authorized to read folder `namespaceUID`
+func (srv RulerSrv) ExportFromPayload(c *contextmodel.ReqContext, ruleGroupConfig apimodels.PostableRuleGroupConfig, namespaceUID string) response.Response {
+	namespace, err := srv.store.GetNamespaceByUID(c.Req.Context(), namespaceUID, c.SignedInUser.GetOrgID(), c.SignedInUser)
 	if err != nil {
 		return toNamespaceErrorResponse(err)
 	}
 
-	rulesWithOptionals, err := validateRuleGroup(&ruleGroupConfig, c.SignedInUser.OrgID, namespace, srv.cfg)
+	rulesWithOptionals, err := ValidateRuleGroup(&ruleGroupConfig, c.SignedInUser.GetOrgID(), namespace.UID, RuleLimitsFromConfig(srv.cfg))
 	if err != nil {
 		return ErrResp(http.StatusBadRequest, err, "")
 	}
@@ -106,7 +107,7 @@ func (srv RulerSrv) getRuleWithFolderTitleByRuleUid(c *contextmodel.ReqContext,
 	if err != nil {
 		return ngmodels.AlertRuleGroupWithFolderTitle{}, err
 	}
-	namespace, err := srv.store.GetNamespaceByUID(c.Req.Context(), rule.NamespaceUID, c.SignedInUser.OrgID, c.SignedInUser)
+	namespace, err := srv.store.GetNamespaceByUID(c.Req.Context(), rule.NamespaceUID, c.SignedInUser.GetOrgID(), c.SignedInUser)
 	if err != nil {
 		return ngmodels.AlertRuleGroupWithFolderTitle{}, errors.Join(errFolderAccess, err)
 	}
@@ -115,7 +116,7 @@ func (srv RulerSrv) getRuleWithFolderTitleByRuleUid(c *contextmodel.ReqContext,
 
 // getRuleGroupWithFolderTitle calls getAuthorizedRuleGroup and combines its result with folder (aka namespace) title.
 func (srv RulerSrv) getRuleGroupWithFolderTitle(c *contextmodel.ReqContext, ruleGroupKey ngmodels.AlertRuleGroupKey) (ngmodels.AlertRuleGroupWithFolderTitle, error) {
-	namespace, err := srv.store.GetNamespaceByUID(c.Req.Context(), ruleGroupKey.NamespaceUID, c.SignedInUser.OrgID, c.SignedInUser)
+	namespace, err := srv.store.GetNamespaceByUID(c.Req.Context(), ruleGroupKey.NamespaceUID, c.SignedInUser.GetOrgID(), c.SignedInUser)
 	if err != nil {
 		return ngmodels.AlertRuleGroupWithFolderTitle{}, errors.Join(errFolderAccess, err)
 	}
@@ -147,7 +148,7 @@ func (srv RulerSrv) getRulesWithFolderTitleInFolders(c *contextmodel.ReqContext,
 			}
 		}
 		if len(query.NamespaceUIDs) == 0 {
-			return nil, fmt.Errorf("%w access rules in the specified folders", ErrAuthorization)
+			return nil, accesscontrol.NewAuthorizationErrorGeneric("access rules in the specified folders")
 		}
 	} else {
 		for _, folder := range folders {
diff --git a/pkg/services/ngalert/api/api_ruler_export_test.go b/pkg/services/ngalert/api/api_ruler_export_test.go
index 6cbeb65c893f9..ae91fb0389afe 100644
--- a/pkg/services/ngalert/api/api_ruler_export_test.go
+++ b/pkg/services/ngalert/api/api_ruler_export_test.go
@@ -15,7 +15,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	folder2 "github.com/grafana/grafana/pkg/services/folder"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
@@ -52,7 +54,7 @@ func TestExportFromPayload(t *testing.T) {
 		rc := createRequest()
 		rc.Context.Req.Header.Add("Accept", "application/yaml")
 
-		response := srv.ExportFromPayload(rc, body, folder.Title)
+		response := srv.ExportFromPayload(rc, body, folder.UID)
 
 		response.WriteTo(rc)
 
@@ -64,7 +66,7 @@ func TestExportFromPayload(t *testing.T) {
 		rc := createRequest()
 		rc.Context.Req.Form.Set("format", "yaml")
 
-		response := srv.ExportFromPayload(rc, body, folder.Title)
+		response := srv.ExportFromPayload(rc, body, folder.UID)
 		response.WriteTo(rc)
 
 		require.Equal(t, 200, response.Status())
@@ -75,7 +77,7 @@ func TestExportFromPayload(t *testing.T) {
 		rc := createRequest()
 		rc.Context.Req.Form.Set("format", "foo")
 
-		response := srv.ExportFromPayload(rc, body, folder.Title)
+		response := srv.ExportFromPayload(rc, body, folder.UID)
 		response.WriteTo(rc)
 
 		require.Equal(t, 200, response.Status())
@@ -86,7 +88,7 @@ func TestExportFromPayload(t *testing.T) {
 		rc := createRequest()
 		rc.Context.Req.Header.Add("Accept", "application/json")
 
-		response := srv.ExportFromPayload(rc, body, folder.Title)
+		response := srv.ExportFromPayload(rc, body, folder.UID)
 		response.WriteTo(rc)
 
 		require.Equal(t, 200, response.Status())
@@ -97,7 +99,7 @@ func TestExportFromPayload(t *testing.T) {
 		rc := createRequest()
 		rc.Context.Req.Header.Add("Accept", "application/json, application/yaml")
 
-		response := srv.ExportFromPayload(rc, body, folder.Title)
+		response := srv.ExportFromPayload(rc, body, folder.UID)
 		response.WriteTo(rc)
 
 		require.Equal(t, 200, response.Status())
@@ -108,7 +110,7 @@ func TestExportFromPayload(t *testing.T) {
 		rc := createRequest()
 		rc.Context.Req.Form.Set("download", "true")
 
-		response := srv.ExportFromPayload(rc, body, folder.Title)
+		response := srv.ExportFromPayload(rc, body, folder.UID)
 		response.WriteTo(rc)
 
 		require.Equal(t, 200, response.Status())
@@ -119,7 +121,7 @@ func TestExportFromPayload(t *testing.T) {
 		rc := createRequest()
 		rc.Context.Req.Form.Set("download", "false")
 
-		response := srv.ExportFromPayload(rc, body, folder.Title)
+		response := srv.ExportFromPayload(rc, body, folder.UID)
 		response.WriteTo(rc)
 
 		require.Equal(t, 200, response.Status())
@@ -129,7 +131,7 @@ func TestExportFromPayload(t *testing.T) {
 	t.Run("query param download not set, GET returns empty content disposition", func(t *testing.T) {
 		rc := createRequest()
 
-		response := srv.ExportFromPayload(rc, body, folder.Title)
+		response := srv.ExportFromPayload(rc, body, folder.UID)
 		response.WriteTo(rc)
 
 		require.Equal(t, 200, response.Status())
@@ -143,7 +145,7 @@ func TestExportFromPayload(t *testing.T) {
 		rc := createRequest()
 		rc.Context.Req.Header.Add("Accept", "application/json")
 
-		response := srv.ExportFromPayload(rc, body, folder.Title)
+		response := srv.ExportFromPayload(rc, body, folder.UID)
 		response.WriteTo(rc)
 		t.Log(string(response.Body()))
 
@@ -158,7 +160,7 @@ func TestExportFromPayload(t *testing.T) {
 		rc := createRequest()
 		rc.Context.Req.Header.Add("Accept", "application/yaml")
 
-		response := srv.ExportFromPayload(rc, body, folder.Title)
+		response := srv.ExportFromPayload(rc, body, folder.UID)
 		response.WriteTo(rc)
 		require.Equal(t, 200, response.Status())
 		require.Equal(t, string(expectedResponse), string(response.Body()))
@@ -172,7 +174,7 @@ func TestExportFromPayload(t *testing.T) {
 		rc.Context.Req.Form.Set("format", "hcl")
 		rc.Context.Req.Form.Set("download", "false")
 
-		response := srv.ExportFromPayload(rc, body, folder.Title)
+		response := srv.ExportFromPayload(rc, body, folder.UID)
 		response.WriteTo(rc)
 
 		require.Equal(t, 200, response.Status())
@@ -184,7 +186,7 @@ func TestExportFromPayload(t *testing.T) {
 			rc.Context.Req.Form.Set("format", "hcl")
 			rc.Context.Req.Form.Set("download", "true")
 
-			response := srv.ExportFromPayload(rc, body, folder.Title)
+			response := srv.ExportFromPayload(rc, body, folder.UID)
 			response.WriteTo(rc)
 
 			require.Equal(t, 200, response.Status())
@@ -202,7 +204,6 @@ func TestExportRules(t *testing.T) {
 	f2 := randFolder()
 
 	ruleStore := fakes.NewRuleStore(t)
-	ruleStore.Folders[orgID] = append(ruleStore.Folders[orgID], f1, f2)
 
 	hasAccessKey1 := ngmodels.AlertRuleGroupKey{
 		OrgID:        orgID,
@@ -253,12 +254,16 @@ func TestExportRules(t *testing.T) {
 		))
 	ruleStore.PutRule(context.Background(), hasAccess2...)
 
-	_, noAccess2 := ngmodels.GenerateUniqueAlertRules(10,
+	_, noAccessByFolder := ngmodels.GenerateUniqueAlertRules(10,
 		ngmodels.AlertRuleGen(
 			ngmodels.WithUniqueUID(&uids),
 			ngmodels.WithQuery(accessQuery), // no access because of folder
+			ngmodels.WithNamespaceUIDNotIn(f1.UID, f2.UID),
 		))
-	ruleStore.PutRule(context.Background(), noAccess2...)
+
+	ruleStore.PutRule(context.Background(), noAccessByFolder...)
+	// overwrite the folders visible to user because PutRule automatically creates folders in the fake store.
+	ruleStore.Folders[orgID] = []*folder2.Folder{f1, f2}
 
 	srv := createService(ruleStore)
 
@@ -349,27 +354,27 @@ func TestExportRules(t *testing.T) {
 			expectedStatus: 400,
 		},
 		{
-			title: "unauthorized if folders are not accessible",
+			title: "forbidden if folders are not accessible",
 			params: url.Values{
-				"folderUid": []string{noAccess2[0].NamespaceUID},
+				"folderUid": []string{noAccessByFolder[0].NamespaceUID},
 			},
-			expectedStatus: 401,
+			expectedStatus: http.StatusForbidden,
 			expectedRules:  nil,
 		},
 		{
-			title: "unauthorized if group is not accessible",
+			title: "forbidden if group is not accessible",
 			params: url.Values{
 				"folderUid": []string{noAccessKey1.NamespaceUID},
 				"group":     []string{noAccessKey1.RuleGroup},
 			},
-			expectedStatus: 401,
+			expectedStatus: http.StatusForbidden,
 		},
 		{
-			title: "unauthorized if rule's group is not accessible",
+			title: "forbidden if rule's group is not accessible",
 			params: url.Values{
 				"ruleUid": []string{noAccessRule.UID},
 			},
-			expectedStatus: 401,
+			expectedStatus: http.StatusForbidden,
 		},
 		{
 			title: "return in JSON if header is specified",
@@ -410,7 +415,9 @@ func TestExportRules(t *testing.T) {
 		t.Run(tc.title, func(t *testing.T) {
 			rc := createRequestContextWithPerms(orgID, map[int64]map[string][]string{
 				orgID: {
-					datasources.ActionQuery: []string{datasources.ScopeProvider.GetResourceScopeUID(accessQuery.DatasourceUID)},
+					dashboards.ActionFoldersRead:         []string{dashboards.ScopeFoldersProvider.GetResourceScopeUID(f1.UID), dashboards.ScopeFoldersProvider.GetResourceScopeUID(f2.UID)},
+					accesscontrol.ActionAlertingRuleRead: []string{dashboards.ScopeFoldersProvider.GetResourceScopeUID(f1.UID), dashboards.ScopeFoldersProvider.GetResourceScopeUID(f2.UID)},
+					datasources.ActionQuery:              []string{datasources.ScopeProvider.GetResourceScopeUID(accessQuery.DatasourceUID)},
 				},
 			}, nil)
 			rc.Req.Form = tc.params
diff --git a/pkg/services/ngalert/api/api_ruler_test.go b/pkg/services/ngalert/api/api_ruler_test.go
index 7299f4977cad7..7de00b82bf5fc 100644
--- a/pkg/services/ngalert/api/api_ruler_test.go
+++ b/pkg/services/ngalert/api/api_ruler_test.go
@@ -9,6 +9,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"net/url"
+	"slices"
 	"testing"
 	"time"
 
@@ -17,10 +18,14 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/infra/log"
+	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/folder"
+	"github.com/grafana/grafana/pkg/services/ngalert/accesscontrol"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/provisioning"
@@ -29,6 +34,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
+	"github.com/grafana/grafana/pkg/util/cmputil"
 	"github.com/grafana/grafana/pkg/web"
 )
 
@@ -72,20 +78,20 @@ func TestRouteDeleteAlertRules(t *testing.T) {
 
 	t.Run("when fine-grained access is enabled", func(t *testing.T) {
 		t.Run("and group argument is empty", func(t *testing.T) {
-			t.Run("return 401 if user is not authorized to access any group in the folder", func(t *testing.T) {
+			t.Run("return Forbidden if user is not authorized to access any group in the folder", func(t *testing.T) {
 				ruleStore := initFakeRuleStore(t)
 				ruleStore.PutRule(context.Background(), models.GenerateAlertRulesSmallNonEmpty(models.AlertRuleGen(withOrgID(orgID), withNamespace(folder)))...)
 
 				request := createRequestContextWithPerms(orgID, map[int64]map[string][]string{}, nil)
 
-				response := createService(ruleStore).RouteDeleteAlertRules(request, folder.Title, "")
-				require.Equalf(t, 401, response.Status(), "Expected 401 but got %d: %v", response.Status(), string(response.Body()))
+				response := createService(ruleStore).RouteDeleteAlertRules(request, folder.UID, "")
+				require.Equalf(t, http.StatusForbidden, response.Status(), "Expected 403 but got %d: %v", response.Status(), string(response.Body()))
 
 				require.Empty(t, getRecordedCommand(ruleStore))
 			})
 			t.Run("delete only non-provisioned groups that user is authorized", func(t *testing.T) {
 				ruleStore := initFakeRuleStore(t)
-				provisioningStore := provisioning.NewFakeProvisioningStore()
+				provisioningStore := fakes.NewFakeProvisioningStore()
 
 				authorizedRulesInFolder := models.GenerateAlertRulesSmallNonEmpty(models.AlertRuleGen(withOrgID(orgID), withNamespace(folder), withGroup("authz_"+util.GenerateShortUID())))
 
@@ -101,14 +107,14 @@ func TestRouteDeleteAlertRules(t *testing.T) {
 				permissions := createPermissionsForRules(append(authorizedRulesInFolder, provisionedRulesInFolder...), orgID)
 				requestCtx := createRequestContextWithPerms(orgID, permissions, nil)
 
-				response := createServiceWithProvenanceStore(ruleStore, provisioningStore).RouteDeleteAlertRules(requestCtx, folder.Title, "")
+				response := createServiceWithProvenanceStore(ruleStore, provisioningStore).RouteDeleteAlertRules(requestCtx, folder.UID, "")
 
 				require.Equalf(t, 202, response.Status(), "Expected 202 but got %d: %v", response.Status(), string(response.Body()))
 				assertRulesDeleted(t, authorizedRulesInFolder, ruleStore)
 			})
 			t.Run("return 400 if all rules user can access are provisioned", func(t *testing.T) {
 				ruleStore := initFakeRuleStore(t)
-				provisioningStore := provisioning.NewFakeProvisioningStore()
+				provisioningStore := fakes.NewFakeProvisioningStore()
 
 				provisionedRulesInFolder := models.GenerateAlertRulesSmallNonEmpty(models.AlertRuleGen(withOrgID(orgID), withNamespace(folder), withGroup(util.GenerateShortUID())))
 				err := provisioningStore.SetProvenance(context.Background(), provisionedRulesInFolder[0], orgID, models.ProvenanceAPI)
@@ -121,7 +127,7 @@ func TestRouteDeleteAlertRules(t *testing.T) {
 				permissions := createPermissionsForRules(provisionedRulesInFolder, orgID)
 				requestCtx := createRequestContextWithPerms(orgID, permissions, nil)
 
-				response := createServiceWithProvenanceStore(ruleStore, provisioningStore).RouteDeleteAlertRules(requestCtx, folder.Title, "")
+				response := createServiceWithProvenanceStore(ruleStore, provisioningStore).RouteDeleteAlertRules(requestCtx, folder.UID, "")
 
 				require.Equalf(t, 400, response.Status(), "Expected 400 but got %d: %v", response.Status(), string(response.Body()))
 				require.Empty(t, getRecordedCommand(ruleStore))
@@ -130,7 +136,7 @@ func TestRouteDeleteAlertRules(t *testing.T) {
 				ruleStore := initFakeRuleStore(t)
 
 				requestCtx := createRequestContext(orgID, nil)
-				response := createService(ruleStore).RouteDeleteAlertRules(requestCtx, folder.Title, "")
+				response := createService(ruleStore).RouteDeleteAlertRules(requestCtx, folder.UID, "")
 
 				require.Equalf(t, 202, response.Status(), "Expected 202 but got %d: %v", response.Status(), string(response.Body()))
 				require.Empty(t, getRecordedCommand(ruleStore))
@@ -138,7 +144,7 @@ func TestRouteDeleteAlertRules(t *testing.T) {
 		})
 		t.Run("and group argument is not empty", func(t *testing.T) {
 			groupName := util.GenerateShortUID()
-			t.Run("return 401 if user is not authorized to access the group", func(t *testing.T) {
+			t.Run("return Forbidden if user is not authorized to access the group", func(t *testing.T) {
 				ruleStore := initFakeRuleStore(t)
 
 				authorizedRulesInGroup := models.GenerateAlertRulesSmallNonEmpty(models.AlertRuleGen(withOrgID(orgID), withNamespace(folder), withGroup(groupName)))
@@ -149,15 +155,15 @@ func TestRouteDeleteAlertRules(t *testing.T) {
 				permissions := createPermissionsForRules(authorizedRulesInGroup, orgID)
 				requestCtx := createRequestContextWithPerms(orgID, permissions, nil)
 
-				response := createService(ruleStore).RouteDeleteAlertRules(requestCtx, folder.Title, groupName)
+				response := createService(ruleStore).RouteDeleteAlertRules(requestCtx, folder.UID, groupName)
 
-				require.Equalf(t, 401, response.Status(), "Expected 401 but got %d: %v", response.Status(), string(response.Body()))
+				require.Equalf(t, http.StatusForbidden, response.Status(), "Expected 403 but got %d: %v", response.Status(), string(response.Body()))
 				deleteCommands := getRecordedCommand(ruleStore)
 				require.Empty(t, deleteCommands)
 			})
 			t.Run("return 400 if group is provisioned", func(t *testing.T) {
 				ruleStore := initFakeRuleStore(t)
-				provisioningStore := provisioning.NewFakeProvisioningStore()
+				provisioningStore := fakes.NewFakeProvisioningStore()
 
 				provisionedRulesInFolder := models.GenerateAlertRulesSmallNonEmpty(models.AlertRuleGen(withOrgID(orgID), withNamespace(folder), withGroup(groupName)))
 				err := provisioningStore.SetProvenance(context.Background(), provisionedRulesInFolder[0], orgID, models.ProvenanceAPI)
@@ -168,7 +174,7 @@ func TestRouteDeleteAlertRules(t *testing.T) {
 				permissions := createPermissionsForRules(provisionedRulesInFolder, orgID)
 				requestCtx := createRequestContextWithPerms(orgID, permissions, nil)
 
-				response := createServiceWithProvenanceStore(ruleStore, provisioningStore).RouteDeleteAlertRules(requestCtx, folder.Title, groupName)
+				response := createServiceWithProvenanceStore(ruleStore, provisioningStore).RouteDeleteAlertRules(requestCtx, folder.UID, groupName)
 
 				require.Equalf(t, 400, response.Status(), "Expected 400 but got %d: %v", response.Status(), string(response.Body()))
 				deleteCommands := getRecordedCommand(ruleStore)
@@ -192,14 +198,14 @@ func TestRouteGetNamespaceRulesConfig(t *testing.T) {
 			permissions := createPermissionsForRules(expectedRules, orgID)
 			req := createRequestContextWithPerms(orgID, permissions, nil)
 
-			response := createService(ruleStore).RouteGetNamespaceRulesConfig(req, folder.Title)
+			response := createService(ruleStore).RouteGetNamespaceRulesConfig(req, folder.UID)
 
 			require.Equal(t, http.StatusAccepted, response.Status())
 			result := &apimodels.NamespaceConfigResponse{}
 			require.NoError(t, json.Unmarshal(response.Body(), result))
 			require.NotNil(t, result)
 			for namespace, groups := range *result {
-				require.Equal(t, folder.Title, namespace)
+				require.Equal(t, folder.Fullpath, namespace)
 				for _, group := range groups {
 				grouploop:
 					for _, actualRule := range group.Rules {
@@ -233,8 +239,9 @@ func TestRouteGetNamespaceRulesConfig(t *testing.T) {
 		err := svc.provenanceStore.SetProvenance(context.Background(), rule, orgID, models.ProvenanceAPI)
 		require.NoError(t, err)
 
-		req := createRequestContext(orgID, nil)
-		response := svc.RouteGetNamespaceRulesConfig(req, folder.Title)
+		perms := createPermissionsForRules(expectedRules, orgID)
+		req := createRequestContextWithPerms(orgID, perms, nil)
+		response := svc.RouteGetNamespaceRulesConfig(req, folder.UID)
 
 		require.Equal(t, http.StatusAccepted, response.Status())
 		result := &apimodels.NamespaceConfigResponse{}
@@ -242,7 +249,7 @@ func TestRouteGetNamespaceRulesConfig(t *testing.T) {
 		require.NotNil(t, result)
 		found := false
 		for namespace, groups := range *result {
-			require.Equal(t, folder.Title, namespace)
+			require.Equal(t, folder.Fullpath, namespace)
 			for _, group := range groups {
 				for _, actualRule := range group.Rules {
 					if actualRule.GrafanaManagedAlert.UID == expectedRules[0].UID {
@@ -267,8 +274,9 @@ func TestRouteGetNamespaceRulesConfig(t *testing.T) {
 		expectedRules := models.GenerateAlertRules(rand.Intn(5)+5, models.AlertRuleGen(withGroupKey(groupKey), models.WithUniqueGroupIndex()))
 		ruleStore.PutRule(context.Background(), expectedRules...)
 
-		req := createRequestContext(orgID, nil)
-		response := createService(ruleStore).RouteGetNamespaceRulesConfig(req, folder.Title)
+		perms := createPermissionsForRules(expectedRules, orgID)
+		req := createRequestContextWithPerms(orgID, perms, nil)
+		response := createService(ruleStore).RouteGetNamespaceRulesConfig(req, folder.UID)
 
 		require.Equal(t, http.StatusAccepted, response.Status())
 		result := &apimodels.NamespaceConfigResponse{}
@@ -277,8 +285,8 @@ func TestRouteGetNamespaceRulesConfig(t *testing.T) {
 
 		models.RulesGroup(expectedRules).SortByGroupIndex()
 
-		require.Contains(t, *result, folder.Title)
-		groups := (*result)[folder.Title]
+		groups, ok := (*result)[folder.Fullpath]
+		require.True(t, ok)
 		require.Len(t, groups, 1)
 		group := groups[0]
 		require.Equal(t, groupKey.RuleGroup, group.Name)
@@ -328,10 +336,10 @@ func TestRouteGetRulesConfig(t *testing.T) {
 				require.NoError(t, json.Unmarshal(response.Body(), result))
 				require.NotNil(t, result)
 
-				require.Contains(t, *result, folder1.Title)
-				require.NotContains(t, *result, folder2.Title)
+				require.Contains(t, *result, folder1.Fullpath)
+				require.NotContains(t, *result, folder2.UID)
 
-				groups := (*result)[folder1.Title]
+				groups := (*result)[folder1.Fullpath]
 				require.Len(t, groups, 1)
 				require.Equal(t, group1Key.RuleGroup, groups[0].Name)
 				require.Len(t, groups[0].Rules, len(group1))
@@ -350,7 +358,8 @@ func TestRouteGetRulesConfig(t *testing.T) {
 		expectedRules := models.GenerateAlertRules(rand.Intn(5)+5, models.AlertRuleGen(withGroupKey(groupKey), models.WithUniqueGroupIndex()))
 		ruleStore.PutRule(context.Background(), expectedRules...)
 
-		req := createRequestContext(orgID, nil)
+		perms := createPermissionsForRules(expectedRules, orgID)
+		req := createRequestContextWithPerms(orgID, perms, nil)
 		response := createService(ruleStore).RouteGetRulesConfig(req)
 
 		require.Equal(t, http.StatusOK, response.Status())
@@ -360,8 +369,8 @@ func TestRouteGetRulesConfig(t *testing.T) {
 
 		models.RulesGroup(expectedRules).SortByGroupIndex()
 
-		require.Contains(t, *result, folder.Title)
-		groups := (*result)[folder.Title]
+		groups, ok := (*result)[folder.Fullpath]
+		require.True(t, ok)
 		require.Len(t, groups, 1)
 		group := groups[0]
 		require.Equal(t, groupKey.RuleGroup, group.Name)
@@ -395,23 +404,23 @@ func TestRouteGetRulesGroupConfig(t *testing.T) {
 			expectedRules := models.GenerateAlertRules(rand.Intn(4)+2, models.AlertRuleGen(withGroupKey(groupKey)))
 			ruleStore.PutRule(context.Background(), expectedRules...)
 
-			t.Run("and return 401 if user does not have access one of rules", func(t *testing.T) {
+			t.Run("and return Forbidden if user does not have access one of rules", func(t *testing.T) {
 				permissions := createPermissionsForRules(expectedRules[1:], orgID)
 				request := createRequestContextWithPerms(orgID, permissions, map[string]string{
-					":Namespace": folder.Title,
+					":Namespace": folder.UID,
 					":Groupname": groupKey.RuleGroup,
 				})
-				response := createService(ruleStore).RouteGetRulesGroupConfig(request, folder.Title, groupKey.RuleGroup)
-				require.Equal(t, http.StatusUnauthorized, response.Status())
+				response := createService(ruleStore).RouteGetRulesGroupConfig(request, folder.UID, groupKey.RuleGroup)
+				require.Equal(t, http.StatusForbidden, response.Status())
 			})
 
 			t.Run("and return rules if user has access to all of them", func(t *testing.T) {
 				permissions := createPermissionsForRules(expectedRules, orgID)
 				request := createRequestContextWithPerms(orgID, permissions, map[string]string{
-					":Namespace": folder.Title,
+					":Namespace": folder.UID,
 					":Groupname": groupKey.RuleGroup,
 				})
-				response := createService(ruleStore).RouteGetRulesGroupConfig(request, folder.Title, groupKey.RuleGroup)
+				response := createService(ruleStore).RouteGetRulesGroupConfig(request, folder.UID, groupKey.RuleGroup)
 
 				require.Equal(t, http.StatusAccepted, response.Status())
 				result := &apimodels.RuleGroupConfigResponse{}
@@ -433,8 +442,10 @@ func TestRouteGetRulesGroupConfig(t *testing.T) {
 		expectedRules := models.GenerateAlertRules(rand.Intn(5)+5, models.AlertRuleGen(withGroupKey(groupKey), models.WithUniqueGroupIndex()))
 		ruleStore.PutRule(context.Background(), expectedRules...)
 
-		req := createRequestContext(orgID, nil)
-		response := createService(ruleStore).RouteGetRulesGroupConfig(req, folder.Title, groupKey.RuleGroup)
+		perms := createPermissionsForRules(expectedRules, orgID)
+		req := createRequestContextWithPerms(orgID, perms, nil)
+
+		response := createService(ruleStore).RouteGetRulesGroupConfig(req, folder.UID, groupKey.RuleGroup)
 
 		require.Equal(t, http.StatusAccepted, response.Status())
 		result := &apimodels.RuleGroupConfigResponse{}
@@ -536,7 +547,24 @@ func TestValidateQueries(t *testing.T) {
 				New: models.AlertRuleGen(func(rule *models.AlertRule) {
 					rule.Condition = "Update_New"
 				})(),
-				Diff: nil,
+				Diff: cmputil.DiffReport{
+					cmputil.Diff{
+						Path: "SomeField",
+					},
+				},
+			},
+			{
+				Existing: models.AlertRuleGen(func(rule *models.AlertRule) {
+					rule.Condition = "Update_Index_Existing"
+				})(),
+				New: models.AlertRuleGen(func(rule *models.AlertRule) {
+					rule.Condition = "Update_Index_New"
+				})(),
+				Diff: cmputil.DiffReport{
+					cmputil.Diff{
+						Path: "RuleGroupIndex",
+					},
+				},
 			},
 		},
 		Delete: []*models.AlertRule{
@@ -546,12 +574,13 @@ func TestValidateQueries(t *testing.T) {
 		},
 	}
 
-	t.Run("should validate New and Updated only", func(t *testing.T) {
+	t.Run("should not validate deleted rules or updated rules with ignored fields", func(t *testing.T) {
 		validator := &recordingConditionValidator{}
 		err := validateQueries(context.Background(), &delta, validator, nil)
 		require.NoError(t, err)
+		noValidate := []string{"Deleted", "Update_Index_New"}
 		for _, condition := range validator.recorded {
-			if condition.Condition == "New" || condition.Condition == "Update_New" {
+			if !slices.Contains(noValidate, condition.Condition) {
 				continue
 			}
 			assert.Failf(t, "validated unexpected condition", "condition '%s' was validated but should not", condition.Condition)
@@ -597,15 +626,29 @@ func createService(store *fakes.RuleStore) *RulerSrv {
 		xactManager:     store,
 		store:           store,
 		QuotaService:    nil,
-		provenanceStore: provisioning.NewFakeProvisioningStore(),
+		provenanceStore: fakes.NewFakeProvisioningStore(),
 		log:             log.New("test"),
 		cfg: &setting.UnifiedAlertingSettings{
 			BaseInterval: 10 * time.Second,
 		},
-		ac: acimpl.ProvideAccessControl(setting.NewCfg()),
+		authz:          accesscontrol.NewRuleService(acimpl.ProvideAccessControl(setting.NewCfg())),
+		amConfigStore:  &fakeAMRefresher{},
+		amRefresher:    &fakeAMRefresher{},
+		featureManager: &featuremgmt.FeatureManager{},
 	}
 }
 
+type fakeAMRefresher struct {
+}
+
+func (f *fakeAMRefresher) ApplyConfig(ctx context.Context, orgId int64, dbConfig *models.AlertConfiguration) error {
+	return nil
+}
+
+func (f *fakeAMRefresher) GetLatestAlertmanagerConfiguration(ctx context.Context, orgID int64) (*models.AlertConfiguration, error) {
+	return nil, nil
+}
+
 func createRequestContext(orgID int64, params map[string]string) *contextmodel.ReqContext {
 	defaultPerms := map[int64]map[string][]string{orgID: {datasources.ActionQuery: []string{datasources.ScopeAll}}}
 	return createRequestContextWithPerms(orgID, defaultPerms, params)
@@ -636,8 +679,15 @@ func createRequestContextWithPerms(orgID int64, permissions map[int64]map[string
 }
 
 func createPermissionsForRules(rules []*models.AlertRule, orgID int64) map[int64]map[string][]string {
+	ns := map[string]any{}
 	permissions := map[string][]string{}
 	for _, rule := range rules {
+		if _, ok := ns[rule.NamespaceUID]; !ok {
+			scope := dashboards.ScopeFoldersProvider.GetResourceScopeUID(rule.NamespaceUID)
+			permissions[dashboards.ActionFoldersRead] = append(permissions[dashboards.ActionFoldersRead], scope)
+			permissions[ac.ActionAlertingRuleRead] = append(permissions[ac.ActionAlertingRuleRead], scope)
+			ns[rule.NamespaceUID] = struct{}{}
+		}
 		for _, query := range rule.Data {
 			permissions[datasources.ActionQuery] = append(permissions[datasources.ActionQuery], datasources.ScopeProvider.GetResourceScopeUID(query.DatasourceUID))
 		}
diff --git a/pkg/services/ngalert/api/api_ruler_validation.go b/pkg/services/ngalert/api/api_ruler_validation.go
index 583a39718bcfb..91a012b0b1e04 100644
--- a/pkg/services/ngalert/api/api_ruler_validation.go
+++ b/pkg/services/ngalert/api/api_ruler_validation.go
@@ -7,22 +7,35 @@ import (
 	"strings"
 	"time"
 
-	"github.com/grafana/grafana/pkg/services/folder"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/store"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
+type RuleLimits struct {
+	// The default interval if not specified.
+	DefaultRuleEvaluationInterval time.Duration
+	// All intervals must be an integer multiple of this duration.
+	BaseInterval time.Duration
+}
+
+func RuleLimitsFromConfig(cfg *setting.UnifiedAlertingSettings) RuleLimits {
+	return RuleLimits{
+		DefaultRuleEvaluationInterval: cfg.DefaultRuleEvaluationInterval,
+		BaseInterval:                  cfg.BaseInterval,
+	}
+}
+
 // validateRuleNode validates API model (definitions.PostableExtendedRuleNode) and converts it to models.AlertRule
 func validateRuleNode(
 	ruleNode *apimodels.PostableExtendedRuleNode,
 	groupName string,
 	interval time.Duration,
 	orgId int64,
-	namespace *folder.Folder,
-	cfg *setting.UnifiedAlertingSettings) (*ngmodels.AlertRule, error) {
-	intervalSeconds, err := validateInterval(cfg, interval)
+	namespaceUID string,
+	limits RuleLimits) (*ngmodels.AlertRule, error) {
+	intervalSeconds, err := validateInterval(interval, limits.BaseInterval)
 	if err != nil {
 		return nil, err
 	}
@@ -91,12 +104,19 @@ func validateRuleNode(
 		Data:            queries,
 		UID:             ruleNode.GrafanaManagedAlert.UID,
 		IntervalSeconds: intervalSeconds,
-		NamespaceUID:    namespace.UID,
+		NamespaceUID:    namespaceUID,
 		RuleGroup:       groupName,
 		NoDataState:     noDataState,
 		ExecErrState:    errorState,
 	}
 
+	if ruleNode.GrafanaManagedAlert.NotificationSettings != nil {
+		newAlertRule.NotificationSettings, err = validateNotificationSettings(ruleNode.GrafanaManagedAlert.NotificationSettings)
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	newAlertRule.For, err = validateForInterval(ruleNode)
 	if err != nil {
 		return nil, err
@@ -104,6 +124,10 @@ func validateRuleNode(
 
 	if ruleNode.ApiRuleNode != nil {
 		newAlertRule.Annotations = ruleNode.ApiRuleNode.Annotations
+		err = validateLabels(ruleNode.Labels)
+		if err != nil {
+			return nil, err
+		}
 		newAlertRule.Labels = ruleNode.ApiRuleNode.Labels
 
 		err = newAlertRule.SetDashboardAndPanelFromAnnotations()
@@ -114,6 +138,15 @@ func validateRuleNode(
 	return &newAlertRule, nil
 }
 
+func validateLabels(l map[string]string) error {
+	for key := range l {
+		if _, ok := ngmodels.LabelsUserCannotSpecify[key]; ok {
+			return fmt.Errorf("system reserved labels cannot be defined in the rule. Label %s is the reserved", key)
+		}
+	}
+	return nil
+}
+
 func validateCondition(condition string, queries []apimodels.AlertQuery) error {
 	if condition == "" {
 		return errors.New("condition cannot be empty")
@@ -142,10 +175,10 @@ func validateCondition(condition string, queries []apimodels.AlertQuery) error {
 	return nil
 }
 
-func validateInterval(cfg *setting.UnifiedAlertingSettings, interval time.Duration) (int64, error) {
+func validateInterval(interval, baseInterval time.Duration) (int64, error) {
 	intervalSeconds := int64(interval.Seconds())
 
-	baseIntervalSeconds := int64(cfg.BaseInterval.Seconds())
+	baseIntervalSeconds := int64(baseInterval.Seconds())
 
 	if interval <= 0 {
 		return 0, fmt.Errorf("rule evaluation interval must be positive duration that is multiple of the base interval %d seconds", baseIntervalSeconds)
@@ -173,14 +206,14 @@ func validateForInterval(ruleNode *apimodels.PostableExtendedRuleNode) (time.Dur
 	return duration, nil
 }
 
-// validateRuleGroup validates API model (definitions.PostableRuleGroupConfig) and converts it to a collection of models.AlertRule.
+// ValidateRuleGroup validates API model (definitions.PostableRuleGroupConfig) and converts it to a collection of models.AlertRule.
 // Returns a slice that contains all rules described by API model or error if either group specification or an alert definition is not valid.
 // It also returns a map containing current existing alerts that don't contain the is_paused field in the body of the call.
-func validateRuleGroup(
+func ValidateRuleGroup(
 	ruleGroupConfig *apimodels.PostableRuleGroupConfig,
 	orgId int64,
-	namespace *folder.Folder,
-	cfg *setting.UnifiedAlertingSettings) ([]*ngmodels.AlertRuleWithOptionals, error) {
+	namespaceUID string,
+	limits RuleLimits) ([]*ngmodels.AlertRuleWithOptionals, error) {
 	if ruleGroupConfig.Name == "" {
 		return nil, errors.New("rule group name cannot be empty")
 	}
@@ -192,11 +225,11 @@ func validateRuleGroup(
 	interval := time.Duration(ruleGroupConfig.Interval)
 	if interval == 0 {
 		// if group interval is 0 (undefined) then we automatically fall back to the default interval
-		interval = cfg.DefaultRuleEvaluationInterval
+		interval = limits.DefaultRuleEvaluationInterval
 	}
 
-	if interval < 0 || int64(interval.Seconds())%int64(cfg.BaseInterval.Seconds()) != 0 {
-		return nil, fmt.Errorf("rule evaluation interval (%d second) should be positive number that is multiple of the base interval of %d seconds", int64(interval.Seconds()), int64(cfg.BaseInterval.Seconds()))
+	if interval < 0 || int64(interval.Seconds())%int64(limits.BaseInterval.Seconds()) != 0 {
+		return nil, fmt.Errorf("rule evaluation interval (%d second) should be positive number that is multiple of the base interval of %d seconds", int64(interval.Seconds()), int64(limits.BaseInterval.Seconds()))
 	}
 
 	// TODO should we validate that interval is >= cfg.MinInterval? Currently, we allow to save but fix the specified interval if it is < cfg.MinInterval
@@ -204,7 +237,7 @@ func validateRuleGroup(
 	result := make([]*ngmodels.AlertRuleWithOptionals, 0, len(ruleGroupConfig.Rules))
 	uids := make(map[string]int, cap(result))
 	for idx := range ruleGroupConfig.Rules {
-		rule, err := validateRuleNode(&ruleGroupConfig.Rules[idx], ruleGroupConfig.Name, interval, orgId, namespace, cfg)
+		rule, err := validateRuleNode(&ruleGroupConfig.Rules[idx], ruleGroupConfig.Name, interval, orgId, namespaceUID, limits)
 		// TODO do not stop on the first failure but return all failures
 		if err != nil {
 			return nil, fmt.Errorf("invalid rule specification at index [%d]: %w", idx, err)
@@ -235,3 +268,21 @@ func validateRuleGroup(
 	}
 	return result, nil
 }
+
+func validateNotificationSettings(n *apimodels.AlertRuleNotificationSettings) ([]ngmodels.NotificationSettings, error) {
+	s := ngmodels.NotificationSettings{
+		Receiver:          n.Receiver,
+		GroupBy:           n.GroupBy,
+		GroupWait:         n.GroupWait,
+		GroupInterval:     n.GroupInterval,
+		RepeatInterval:    n.RepeatInterval,
+		MuteTimeIntervals: n.MuteTimeIntervals,
+	}
+
+	if err := s.Validate(); err != nil {
+		return nil, fmt.Errorf("invalid notification settings: %w", err)
+	}
+	return []ngmodels.NotificationSettings{
+		s,
+	}, nil
+}
diff --git a/pkg/services/ngalert/api/api_ruler_validation_test.go b/pkg/services/ngalert/api/api_ruler_validation_test.go
index 03e38b78326b3..f2332211129b7 100644
--- a/pkg/services/ngalert/api/api_ruler_validation_test.go
+++ b/pkg/services/ngalert/api/api_ruler_validation_test.go
@@ -2,6 +2,7 @@ package api
 
 import (
 	"fmt"
+	"path"
 	"strconv"
 	"testing"
 	"time"
@@ -43,6 +44,7 @@ func config(t *testing.T) *setting.UnifiedAlertingSettings {
 
 func validRule() apimodels.PostableExtendedRuleNode {
 	forDuration := model.Duration(rand.Int63n(1000))
+	uid := util.GenerateShortUID()
 	return apimodels.PostableExtendedRuleNode{
 		ApiRuleNode: &apimodels.ApiRuleNode{
 			For: &forDuration,
@@ -54,7 +56,7 @@ func validRule() apimodels.PostableExtendedRuleNode {
 			},
 		},
 		GrafanaManagedAlert: &apimodels.PostableGrafanaRule{
-			Title:     fmt.Sprintf("TEST-ALERT-%d", rand.Int63()),
+			Title:     fmt.Sprintf("TEST-ALERT-%s", uid),
 			Condition: "A",
 			Data: []apimodels.AlertQuery{
 				{
@@ -68,7 +70,7 @@ func validRule() apimodels.PostableExtendedRuleNode {
 					Model:         nil,
 				},
 			},
-			UID:          util.GenerateShortUID(),
+			UID:          uid,
 			NoDataState:  allNoData[rand.Intn(len(allNoData))],
 			ExecErrState: allExecError[rand.Intn(len(allExecError))],
 		},
@@ -84,10 +86,10 @@ func validGroup(cfg *setting.UnifiedAlertingSettings, rules ...apimodels.Postabl
 }
 
 func randFolder() *folder.Folder {
+	title := "TEST-FOLDER-" + util.GenerateShortUID()
 	return &folder.Folder{
-		ID:    rand.Int63(),
 		UID:   util.GenerateShortUID(),
-		Title: "TEST-FOLDER-" + util.GenerateShortUID(),
+		Title: title,
 		// URL:       "",
 		// Version:   0,
 		Created: time.Time{},
@@ -95,6 +97,8 @@ func randFolder() *folder.Folder {
 		// UpdatedBy: 0,
 		// CreatedBy: 0,
 		// HasACL:    false,
+		ParentUID: uuid.NewString(),
+		Fullpath:  path.Join("parent-folder", title),
 	}
 }
 
@@ -194,7 +198,7 @@ func TestValidateRuleGroup(t *testing.T) {
 
 	t.Run("should validate struct and rules", func(t *testing.T) {
 		g := validGroup(cfg, rules...)
-		alerts, err := validateRuleGroup(&g, orgId, folder, cfg)
+		alerts, err := ValidateRuleGroup(&g, orgId, folder.UID, RuleLimitsFromConfig(cfg))
 		require.NoError(t, err)
 		require.Len(t, alerts, len(rules))
 	})
@@ -202,7 +206,7 @@ func TestValidateRuleGroup(t *testing.T) {
 	t.Run("should default to default interval from config if group interval is 0", func(t *testing.T) {
 		g := validGroup(cfg, rules...)
 		g.Interval = 0
-		alerts, err := validateRuleGroup(&g, orgId, folder, cfg)
+		alerts, err := ValidateRuleGroup(&g, orgId, folder.UID, RuleLimitsFromConfig(cfg))
 		require.NoError(t, err)
 		for _, alert := range alerts {
 			require.Equal(t, int64(cfg.DefaultRuleEvaluationInterval.Seconds()), alert.IntervalSeconds)
@@ -217,7 +221,7 @@ func TestValidateRuleGroup(t *testing.T) {
 			isPaused = !(isPaused)
 		}
 		g := validGroup(cfg, rules...)
-		alerts, err := validateRuleGroup(&g, orgId, folder, cfg)
+		alerts, err := ValidateRuleGroup(&g, orgId, folder.UID, RuleLimitsFromConfig(cfg))
 		require.NoError(t, err)
 		for _, alert := range alerts {
 			require.True(t, alert.HasPause)
@@ -289,7 +293,7 @@ func TestValidateRuleGroupFailures(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.name, func(t *testing.T) {
 			g := testCase.group()
-			_, err := validateRuleGroup(g, orgId, folder, cfg)
+			_, err := ValidateRuleGroup(g, orgId, folder.UID, RuleLimitsFromConfig(cfg))
 			require.Error(t, err)
 			if testCase.assert != nil {
 				testCase.assert(t, g, err)
@@ -396,7 +400,7 @@ func TestValidateRuleNode_NoUID(t *testing.T) {
 			r := testCase.rule()
 			r.GrafanaManagedAlert.UID = ""
 
-			alert, err := validateRuleNode(r, name, interval, orgId, folder, cfg)
+			alert, err := validateRuleNode(r, name, interval, orgId, folder.UID, RuleLimitsFromConfig(cfg))
 			require.NoError(t, err)
 			testCase.assert(t, r, alert)
 		})
@@ -404,7 +408,7 @@ func TestValidateRuleNode_NoUID(t *testing.T) {
 
 	t.Run("accepts empty group name", func(t *testing.T) {
 		r := validRule()
-		alert, err := validateRuleNode(&r, "", interval, orgId, folder, cfg)
+		alert, err := validateRuleNode(&r, "", interval, orgId, folder.UID, RuleLimitsFromConfig(cfg))
 		require.NoError(t, err)
 		require.Equal(t, "", alert.RuleGroup)
 	})
@@ -557,7 +561,7 @@ func TestValidateRuleNodeFailures_NoUID(t *testing.T) {
 				interval = *testCase.interval
 			}
 
-			_, err := validateRuleNode(r, "", interval, orgId, folder, cfg)
+			_, err := validateRuleNode(r, "", interval, orgId, folder.UID, RuleLimitsFromConfig(cfg))
 			require.Error(t, err)
 			if testCase.assert != nil {
 				testCase.assert(t, r, err)
@@ -649,7 +653,7 @@ func TestValidateRuleNode_UID(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.name, func(t *testing.T) {
 			r := testCase.rule()
-			alert, err := validateRuleNode(r, name, interval, orgId, folder, cfg)
+			alert, err := validateRuleNode(r, name, interval, orgId, folder.UID, RuleLimitsFromConfig(cfg))
 			require.NoError(t, err)
 			testCase.assert(t, r, alert)
 		})
@@ -657,7 +661,7 @@ func TestValidateRuleNode_UID(t *testing.T) {
 
 	t.Run("accepts empty group name", func(t *testing.T) {
 		r := validRule()
-		alert, err := validateRuleNode(&r, "", interval, orgId, folder, cfg)
+		alert, err := validateRuleNode(&r, "", interval, orgId, folder.UID, RuleLimitsFromConfig(cfg))
 		require.NoError(t, err)
 		require.Equal(t, "", alert.RuleGroup)
 	})
@@ -752,7 +756,7 @@ func TestValidateRuleNodeFailures_UID(t *testing.T) {
 				interval = *testCase.interval
 			}
 
-			_, err := validateRuleNode(r, "", interval, orgId, folder, cfg)
+			_, err := validateRuleNode(r, "", interval, orgId, folder.UID, RuleLimitsFromConfig(cfg))
 			require.Error(t, err)
 			if testCase.assert != nil {
 				testCase.assert(t, r, err)
@@ -785,8 +789,120 @@ func TestValidateRuleNodeIntervalFailures(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.name, func(t *testing.T) {
 			r := validRule()
-			_, err := validateRuleNode(&r, util.GenerateShortUID(), testCase.interval, rand.Int63(), randFolder(), cfg)
+			_, err := validateRuleNode(&r, util.GenerateShortUID(), testCase.interval, rand.Int63(), randFolder().UID, RuleLimitsFromConfig(cfg))
 			require.Error(t, err)
 		})
 	}
 }
+
+func TestValidateRuleNodeNotificationSettings(t *testing.T) {
+	cfg := config(t)
+
+	validNotificationSettings := models.NotificationSettingsGen(models.NSMuts.WithGroupBy(model.AlertNameLabel, models.FolderTitleLabel))
+
+	testCases := []struct {
+		name                 string
+		notificationSettings models.NotificationSettings
+		expErrorContains     string
+	}{
+		{
+			name:                 "valid notification settings",
+			notificationSettings: validNotificationSettings(),
+		},
+		{
+			name:                 "missing receiver is invalid",
+			notificationSettings: models.CopyNotificationSettings(validNotificationSettings(), models.NSMuts.WithReceiver("")),
+			expErrorContains:     "receiver",
+		},
+		{
+			name:                 "group by empty is valid",
+			notificationSettings: models.CopyNotificationSettings(validNotificationSettings(), models.NSMuts.WithGroupBy()),
+		},
+		{
+			name:                 "group by ... is valid",
+			notificationSettings: models.CopyNotificationSettings(validNotificationSettings(), models.NSMuts.WithGroupBy("...")),
+		},
+		{
+			name:                 "group by with alert name and folder name labels is valid",
+			notificationSettings: models.CopyNotificationSettings(validNotificationSettings(), models.NSMuts.WithGroupBy(model.AlertNameLabel, models.FolderTitleLabel)),
+		},
+		{
+			name:                 "group by missing alert name label is valid",
+			notificationSettings: models.CopyNotificationSettings(validNotificationSettings(), models.NSMuts.WithGroupBy(models.FolderTitleLabel)),
+		},
+		{
+			name:                 "group by missing folder name label is valid",
+			notificationSettings: models.CopyNotificationSettings(validNotificationSettings(), models.NSMuts.WithGroupBy(model.AlertNameLabel)),
+		},
+		{
+			name:                 "group wait empty is valid",
+			notificationSettings: models.CopyNotificationSettings(validNotificationSettings(), models.NSMuts.WithGroupWait(nil)),
+		},
+		{
+			name:                 "group wait positive is valid",
+			notificationSettings: models.CopyNotificationSettings(validNotificationSettings(), models.NSMuts.WithGroupWait(util.Pointer(1*time.Second))),
+		},
+		{
+			name:                 "group wait negative is invalid",
+			notificationSettings: models.CopyNotificationSettings(validNotificationSettings(), models.NSMuts.WithGroupWait(util.Pointer(-1*time.Second))),
+			expErrorContains:     "group wait",
+		},
+		{
+			name:                 "group interval empty is valid",
+			notificationSettings: models.CopyNotificationSettings(validNotificationSettings(), models.NSMuts.WithGroupInterval(nil)),
+		},
+		{
+			name:                 "group interval positive is valid",
+			notificationSettings: models.CopyNotificationSettings(validNotificationSettings(), models.NSMuts.WithGroupInterval(util.Pointer(1*time.Second))),
+		},
+		{
+			name:                 "group interval negative is invalid",
+			notificationSettings: models.CopyNotificationSettings(validNotificationSettings(), models.NSMuts.WithGroupInterval(util.Pointer(-1*time.Second))),
+			expErrorContains:     "group interval",
+		},
+		{
+			name:                 "repeat interval empty is valid",
+			notificationSettings: models.CopyNotificationSettings(validNotificationSettings(), models.NSMuts.WithRepeatInterval(nil)),
+		},
+		{
+			name:                 "repeat interval positive is valid",
+			notificationSettings: models.CopyNotificationSettings(validNotificationSettings(), models.NSMuts.WithRepeatInterval(util.Pointer(1*time.Second))),
+		},
+		{
+			name:                 "repeat interval negative is invalid",
+			notificationSettings: models.CopyNotificationSettings(validNotificationSettings(), models.NSMuts.WithRepeatInterval(util.Pointer(-1*time.Second))),
+			expErrorContains:     "repeat interval",
+		},
+	}
+
+	for _, tt := range testCases {
+		t.Run(tt.name, func(t *testing.T) {
+			r := validRule()
+			r.GrafanaManagedAlert.NotificationSettings = AlertRuleNotificationSettingsFromNotificationSettings([]models.NotificationSettings{tt.notificationSettings})
+			_, err := validateRuleNode(&r, util.GenerateShortUID(), cfg.BaseInterval*time.Duration(rand.Int63n(10)+1), rand.Int63(), randFolder().UID, RuleLimitsFromConfig(cfg))
+
+			if tt.expErrorContains != "" {
+				require.Error(t, err)
+				require.ErrorContains(t, err, tt.expErrorContains)
+			} else {
+				require.NoError(t, err)
+			}
+		})
+	}
+}
+
+func TestValidateRuleNodeReservedLabels(t *testing.T) {
+	cfg := config(t)
+
+	for label := range models.LabelsUserCannotSpecify {
+		t.Run(label, func(t *testing.T) {
+			r := validRule()
+			r.ApiRuleNode.Labels = map[string]string{
+				label: "true",
+			}
+			_, err := validateRuleNode(&r, util.GenerateShortUID(), cfg.BaseInterval*time.Duration(rand.Int63n(10)+1), rand.Int63(), randFolder().UID, RuleLimitsFromConfig(cfg))
+			require.Error(t, err)
+			require.ErrorContains(t, err, label)
+		})
+	}
+}
diff --git a/pkg/services/ngalert/api/api_testing.go b/pkg/services/ngalert/api/api_testing.go
index 66d26b2f57575..8be9845eba5de 100644
--- a/pkg/services/ngalert/api/api_testing.go
+++ b/pkg/services/ngalert/api/api_testing.go
@@ -1,24 +1,27 @@
 package api
 
 import (
+	"context"
 	"errors"
-	"fmt"
 	"net/http"
 	"net/url"
 	"strconv"
 	"time"
 
 	"github.com/benbjohnson/clock"
-	"github.com/grafana/alerting/models"
 	amv2 "github.com/prometheus/alertmanager/api/v2/models"
 
+	"github.com/grafana/alerting/models"
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
-	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/folder"
@@ -27,47 +30,57 @@ import (
 	"github.com/grafana/grafana/pkg/services/ngalert/eval"
 	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/state"
+	"github.com/grafana/grafana/pkg/services/ngalert/store"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
 )
 
+type folderService interface {
+	GetNamespaceByUID(ctx context.Context, uid string, orgID int64, user identity.Requester) (*folder.Folder, error)
+}
+
 type TestingApiSrv struct {
 	*AlertingProxy
 	DatasourceCache datasources.CacheService
 	log             log.Logger
-	accessControl   accesscontrol.AccessControl
+	authz           RuleAccessControlService
 	evaluator       eval.EvaluatorFactory
 	cfg             *setting.UnifiedAlertingSettings
 	backtesting     *backtesting.Engine
 	featureManager  featuremgmt.FeatureToggles
 	appUrl          *url.URL
 	tracer          tracing.Tracer
+	folderService   folderService
 }
 
 // RouteTestGrafanaRuleConfig returns a list of potential alerts for a given rule configuration. This is intended to be
 // as true as possible to what would be generated by the ruler except that the resulting alerts are not filtered to
 // only Resolved / Firing and ready to send.
 func (srv TestingApiSrv) RouteTestGrafanaRuleConfig(c *contextmodel.ReqContext, body apimodels.PostableExtendedRuleNodeExtended) response.Response {
+	folder, err := srv.folderService.GetNamespaceByUID(c.Req.Context(), body.NamespaceUID, c.OrgID, c.SignedInUser)
+	if err != nil {
+		return toNamespaceErrorResponse(dashboards.ErrFolderAccessDenied)
+	}
 	rule, err := validateRuleNode(
 		&body.Rule,
 		body.RuleGroup,
 		srv.cfg.BaseInterval,
 		c.SignedInUser.GetOrgID(),
-		&folder.Folder{
-			OrgID: c.SignedInUser.GetOrgID(),
-			UID:   body.NamespaceUID,
-			Title: body.NamespaceTitle,
-		},
-		srv.cfg,
+		folder.UID,
+		RuleLimitsFromConfig(srv.cfg),
 	)
 	if err != nil {
 		return ErrResp(http.StatusBadRequest, err, "")
 	}
 
-	if !authorizeDatasourceAccessForRule(rule, func(evaluator accesscontrol.Evaluator) bool {
-		return accesscontrol.HasAccess(srv.accessControl, c)(evaluator)
-	}) {
-		return errorToResponse(fmt.Errorf("%w to query one or many data sources used by the rule", ErrAuthorization))
+	if err := srv.authz.AuthorizeDatasourceAccessForRule(c.Req.Context(), c.SignedInUser, rule); err != nil {
+		return response.ErrOrFallback(http.StatusInternalServerError, "failed to authorize access to rule group", err)
+	}
+
+	if srv.featureManager.IsEnabled(c.Req.Context(), featuremgmt.FlagAlertingQueryOptimization) {
+		if _, err := store.OptimizeAlertQueries(rule.Data); err != nil {
+			return ErrResp(http.StatusInternalServerError, err, "Failed to optimize query")
+		}
 	}
 
 	evaluator, err := srv.evaluator.Create(eval.NewContext(c.Req.Context(), c.SignedInUser), rule.GetEvalCondition())
@@ -82,29 +95,28 @@ func (srv TestingApiSrv) RouteTestGrafanaRuleConfig(c *contextmodel.ReqContext,
 	}
 
 	cfg := state.ManagerCfg{
-		Metrics:                 nil,
-		ExternalURL:             srv.appUrl,
-		InstanceStore:           nil,
-		Images:                  &backtesting.NoopImageService{},
-		Clock:                   clock.New(),
-		Historian:               nil,
-		MaxStateSaveConcurrency: 1,
-		Tracer:                  srv.tracer,
-		Log:                     log.New("ngalert.state.manager"),
-	}
-	manager := state.NewManager(cfg)
+		Metrics:       nil,
+		ExternalURL:   srv.appUrl,
+		InstanceStore: nil,
+		Images:        &backtesting.NoopImageService{},
+		Clock:         clock.New(),
+		Historian:     nil,
+		Tracer:        srv.tracer,
+		Log:           log.New("ngalert.state.manager"),
+	}
+	manager := state.NewManager(cfg, state.NewNoopPersister())
 	includeFolder := !srv.cfg.ReservedLabels.IsReservedLabelDisabled(models.FolderTitleLabel)
 	transitions := manager.ProcessEvalResults(
 		c.Req.Context(),
 		now,
 		rule,
 		results,
-		state.GetRuleExtraLabels(rule, body.NamespaceTitle, includeFolder),
+		state.GetRuleExtraLabels(log.New("testing"), rule, folder.Fullpath, includeFolder),
 	)
 
 	alerts := make([]*amv2.PostableAlert, 0, len(transitions))
 	for _, alertState := range transitions {
-		alerts = append(alerts, state.StateToPostableAlert(alertState.State, srv.appUrl))
+		alerts = append(alerts, state.StateToPostableAlert(alertState, srv.appUrl))
 	}
 
 	return response.JSON(http.StatusOK, alerts)
@@ -150,19 +162,27 @@ func (srv TestingApiSrv) RouteTestRuleConfig(c *contextmodel.ReqContext, body ap
 
 func (srv TestingApiSrv) RouteEvalQueries(c *contextmodel.ReqContext, cmd apimodels.EvalQueriesPayload) response.Response {
 	queries := AlertQueriesFromApiAlertQueries(cmd.Data)
-	if !authorizeDatasourceAccessForRule(&ngmodels.AlertRule{Data: queries}, func(evaluator accesscontrol.Evaluator) bool {
-		return accesscontrol.HasAccess(srv.accessControl, c)(evaluator)
-	}) {
-		return ErrResp(http.StatusUnauthorized, fmt.Errorf("%w to query one or many data sources used by the rule", ErrAuthorization), "")
+	if err := srv.authz.AuthorizeDatasourceAccessForRule(c.Req.Context(), c.SignedInUser, &ngmodels.AlertRule{Data: queries}); err != nil {
+		return response.ErrOrFallback(http.StatusInternalServerError, "failed to authorize access to data sources", err)
 	}
 
 	cond := ngmodels.Condition{
-		Condition: "",
+		Condition: cmd.Condition,
 		Data:      queries,
 	}
-	if len(cmd.Data) > 0 {
-		cond.Condition = cmd.Data[0].RefID
+	if cond.Condition == "" && len(cond.Data) > 0 {
+		cond.Condition = cond.Data[len(cond.Data)-1].RefID
 	}
+
+	var optimizations []store.Optimization
+	if srv.featureManager.IsEnabled(c.Req.Context(), featuremgmt.FlagAlertingQueryOptimization) {
+		var err error
+		optimizations, err = store.OptimizeAlertQueries(cond.Data)
+		if err != nil {
+			return ErrResp(http.StatusInternalServerError, err, "Failed to optimize query")
+		}
+	}
+
 	evaluator, err := srv.evaluator.Create(eval.NewContext(c.Req.Context(), c.SignedInUser), cond)
 
 	if err != nil {
@@ -180,11 +200,27 @@ func (srv TestingApiSrv) RouteEvalQueries(c *contextmodel.ReqContext, cmd apimod
 		return ErrResp(http.StatusInternalServerError, err, "Failed to evaluate queries and expressions")
 	}
 
+	addOptimizedQueryWarnings(evalResults, optimizations)
 	return response.JSONStreaming(http.StatusOK, evalResults)
 }
 
+// addOptimizedQueryWarnings adds warnings to the query results for any queries that were optimized.
+func addOptimizedQueryWarnings(evalResults *backend.QueryDataResponse, optimizations []store.Optimization) {
+	for _, opt := range optimizations {
+		if res, ok := evalResults.Responses[opt.RefID]; ok {
+			if len(res.Frames) > 0 {
+				res.Frames[0].AppendNotices(data.Notice{
+					Severity: data.NoticeSeverityWarning,
+					Text: "Query optimized from Range to Instant type; all uses exclusively require the last datapoint. " +
+						"Consider modifying your query to Instant type to ensure accuracy.", // Currently this is the only optimization we do.
+				})
+			}
+		}
+	}
+}
+
 func (srv TestingApiSrv) BacktestAlertRule(c *contextmodel.ReqContext, cmd apimodels.BacktestConfig) response.Response {
-	if !srv.featureManager.IsEnabled(featuremgmt.FlagAlertingBacktesting) {
+	if !srv.featureManager.IsEnabled(c.Req.Context(), featuremgmt.FlagAlertingBacktesting) {
 		return ErrResp(http.StatusNotFound, nil, "Backgtesting API is not enabled")
 	}
 
@@ -202,16 +238,14 @@ func (srv TestingApiSrv) BacktestAlertRule(c *contextmodel.ReqContext, cmd apimo
 		return ErrResp(400, nil, "Bad For interval")
 	}
 
-	intervalSeconds, err := validateInterval(srv.cfg, time.Duration(cmd.Interval))
+	intervalSeconds, err := validateInterval(time.Duration(cmd.Interval), srv.cfg.BaseInterval)
 	if err != nil {
 		return ErrResp(400, err, "")
 	}
 
 	queries := AlertQueriesFromApiAlertQueries(cmd.Data)
-	if !authorizeDatasourceAccessForRule(&ngmodels.AlertRule{Data: queries}, func(evaluator accesscontrol.Evaluator) bool {
-		return accesscontrol.HasAccess(srv.accessControl, c)(evaluator)
-	}) {
-		return errorToResponse(fmt.Errorf("%w to query one or many data sources used by the rule", ErrAuthorization))
+	if err := srv.authz.AuthorizeDatasourceAccessForRule(c.Req.Context(), c.SignedInUser, &ngmodels.AlertRule{Data: queries}); err != nil {
+		return errorToResponse(err)
 	}
 
 	rule := &ngmodels.AlertRule{
diff --git a/pkg/services/ngalert/api/api_testing_test.go b/pkg/services/ngalert/api/api_testing_test.go
index f3e6924a2dc2a..7a571244b0ee6 100644
--- a/pkg/services/ngalert/api/api_testing_test.go
+++ b/pkg/services/ngalert/api/api_testing_test.go
@@ -6,20 +6,27 @@ import (
 	"testing"
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/infra/tracing"
-	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	acMock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	fakes "github.com/grafana/grafana/pkg/services/datasources/fakes"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/folder"
+	"github.com/grafana/grafana/pkg/services/ngalert/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/ngalert/eval"
 	"github.com/grafana/grafana/pkg/services/ngalert/eval/eval_mocks"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	fakes2 "github.com/grafana/grafana/pkg/services/ngalert/tests/fakes"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/web"
 )
@@ -136,33 +143,66 @@ func TestRouteTestGrafanaRuleConfig(t *testing.T) {
 			},
 		}
 
-		t.Run("should return 401 if user cannot query a data source", func(t *testing.T) {
+		t.Run("should return Forbidden if user cannot access folder", func(t *testing.T) {
+			ac := acMock.New().WithPermissions([]ac.Permission{
+				{Action: datasources.ActionQuery, Scope: datasources.ScopeProvider.GetResourceAllScope()},
+			})
+
+			ruleStore := fakes2.NewRuleStore(t)
+			ruleStore.Hook = func(cmd any) error {
+				q, ok := cmd.(fakes2.GenericRecordedQuery)
+				if !ok {
+					return nil
+				}
+				if q.Name == "GetNamespaceByUID" {
+					return dashboards.ErrFolderAccessDenied
+				}
+				return nil
+			}
+
+			srv := createTestingApiSrv(t, nil, ac, eval_mocks.NewEvaluatorFactory(&eval_mocks.ConditionEvaluatorMock{}), &featuremgmt.FeatureManager{}, ruleStore)
+
+			rule := validRule()
+
+			response := srv.RouteTestGrafanaRuleConfig(rc, definitions.PostableExtendedRuleNodeExtended{
+				Rule:           rule,
+				NamespaceUID:   uuid.NewString(),
+				NamespaceTitle: "test-folder",
+			})
+
+			require.Equal(t, http.StatusForbidden, response.Status())
+		})
+
+		t.Run("should return Forbidden if user cannot query a data source", func(t *testing.T) {
 			data1 := models.GenerateAlertQuery()
 			data2 := models.GenerateAlertQuery()
 
-			ac := acMock.New().WithPermissions([]accesscontrol.Permission{
+			ac := acMock.New().WithPermissions([]ac.Permission{
 				{Action: datasources.ActionQuery, Scope: datasources.ScopeProvider.GetResourceScopeUID(data1.DatasourceUID)},
 			})
 
-			srv := createTestingApiSrv(t, nil, ac, eval_mocks.NewEvaluatorFactory(&eval_mocks.ConditionEvaluatorMock{}))
+			f := randFolder()
+			ruleStore := fakes2.NewRuleStore(t)
+			ruleStore.Folders[rc.OrgID] = []*folder.Folder{f}
+			srv := createTestingApiSrv(t, nil, ac, eval_mocks.NewEvaluatorFactory(&eval_mocks.ConditionEvaluatorMock{}), &featuremgmt.FeatureManager{}, ruleStore)
 
 			rule := validRule()
 			rule.GrafanaManagedAlert.Data = ApiAlertQueriesFromAlertQueries([]models.AlertQuery{data1, data2})
 			rule.GrafanaManagedAlert.Condition = data2.RefID
 			response := srv.RouteTestGrafanaRuleConfig(rc, definitions.PostableExtendedRuleNodeExtended{
 				Rule:           rule,
-				NamespaceUID:   "test-folder",
-				NamespaceTitle: "test-folder",
+				NamespaceUID:   f.UID,
+				NamespaceTitle: f.Title,
 			})
 
-			require.Equal(t, http.StatusUnauthorized, response.Status())
+			require.Equal(t, http.StatusForbidden, response.Status())
 		})
 
 		t.Run("should return 200 if user can query all data sources", func(t *testing.T) {
 			data1 := models.GenerateAlertQuery()
 			data2 := models.GenerateAlertQuery()
 
-			ac := acMock.New().WithPermissions([]accesscontrol.Permission{
+			ac := acMock.New().WithPermissions([]ac.Permission{
 				{Action: datasources.ActionQuery, Scope: datasources.ScopeProvider.GetResourceScopeUID(data1.DatasourceUID)},
 				{Action: datasources.ActionQuery, Scope: datasources.ScopeProvider.GetResourceScopeUID(data2.DatasourceUID)},
 			})
@@ -178,15 +218,19 @@ func TestRouteTestGrafanaRuleConfig(t *testing.T) {
 
 			evalFactory := eval_mocks.NewEvaluatorFactory(evaluator)
 
-			srv := createTestingApiSrv(t, ds, ac, evalFactory)
+			f := randFolder()
+			ruleStore := fakes2.NewRuleStore(t)
+			ruleStore.Folders[rc.OrgID] = []*folder.Folder{f}
+
+			srv := createTestingApiSrv(t, ds, ac, evalFactory, &featuremgmt.FeatureManager{}, ruleStore)
 
 			rule := validRule()
 			rule.GrafanaManagedAlert.Data = ApiAlertQueriesFromAlertQueries([]models.AlertQuery{data1, data2})
 			rule.GrafanaManagedAlert.Condition = data2.RefID
 			response := srv.RouteTestGrafanaRuleConfig(rc, definitions.PostableExtendedRuleNodeExtended{
 				Rule:           rule,
-				NamespaceUID:   "test-folder",
-				NamespaceTitle: "test-folder",
+				NamespaceUID:   f.UID,
+				NamespaceTitle: f.Title,
 			})
 
 			require.Equal(t, http.StatusOK, response.Status())
@@ -207,17 +251,15 @@ func TestRouteEvalQueries(t *testing.T) {
 			},
 		}
 
-		t.Run("should return 401 if user cannot query a data source", func(t *testing.T) {
+		t.Run("should return Forbidden if user cannot query a data source", func(t *testing.T) {
 			data1 := models.GenerateAlertQuery()
 			data2 := models.GenerateAlertQuery()
 
-			ac := acMock.New().WithPermissions([]accesscontrol.Permission{
-				{Action: datasources.ActionQuery, Scope: datasources.ScopeProvider.GetResourceScopeUID(data1.DatasourceUID)},
-			})
-
 			srv := &TestingApiSrv{
-				accessControl: ac,
-				tracer:        tracing.InitializeTracerForTest(),
+				authz: accesscontrol.NewRuleService(acMock.New().WithPermissions([]ac.Permission{
+					{Action: datasources.ActionQuery, Scope: datasources.ScopeProvider.GetResourceScopeUID(data1.DatasourceUID)},
+				})),
+				tracer: tracing.InitializeTracerForTest(),
 			}
 
 			response := srv.RouteEvalQueries(rc, definitions.EvalQueriesPayload{
@@ -225,7 +267,7 @@ func TestRouteEvalQueries(t *testing.T) {
 				Now:  time.Time{},
 			})
 
-			require.Equal(t, http.StatusUnauthorized, response.Status())
+			require.Equal(t, http.StatusForbidden, response.Status())
 		})
 
 		t.Run("should return 200 if user can query all data sources", func(t *testing.T) {
@@ -234,7 +276,7 @@ func TestRouteEvalQueries(t *testing.T) {
 
 			currentTime := time.Now()
 
-			ac := acMock.New().WithPermissions([]accesscontrol.Permission{
+			ac := acMock.New().WithPermissions([]ac.Permission{
 				{Action: datasources.ActionQuery, Scope: datasources.ScopeProvider.GetResourceScopeUID(data1.DatasourceUID)},
 				{Action: datasources.ActionQuery, Scope: datasources.ScopeProvider.GetResourceScopeUID(data2.DatasourceUID)},
 			})
@@ -255,7 +297,9 @@ func TestRouteEvalQueries(t *testing.T) {
 			}
 			evaluator.EXPECT().EvaluateRaw(mock.Anything, mock.Anything).Return(result, nil)
 
-			srv := createTestingApiSrv(t, ds, ac, eval_mocks.NewEvaluatorFactory(evaluator))
+			ruleStore := fakes2.NewRuleStore(t)
+
+			srv := createTestingApiSrv(t, ds, ac, eval_mocks.NewEvaluatorFactory(evaluator), &featuremgmt.FeatureManager{}, ruleStore)
 
 			response := srv.RouteEvalQueries(rc, definitions.EvalQueriesPayload{
 				Data: ApiAlertQueriesFromAlertQueries([]models.AlertQuery{data1, data2}),
@@ -267,18 +311,94 @@ func TestRouteEvalQueries(t *testing.T) {
 			evaluator.AssertCalled(t, "EvaluateRaw", mock.Anything, currentTime)
 		})
 	})
+
+	t.Run("when query is optimizable", func(t *testing.T) {
+		rc := &contextmodel.ReqContext{
+			Context: &web.Context{
+				Req: &http.Request{},
+			},
+			SignedInUser: &user.SignedInUser{
+				OrgID: 1,
+			},
+		}
+		t.Run("should return warning notice on optimized queries", func(t *testing.T) {
+			queries := []models.AlertQuery{
+				models.CreatePrometheusQuery("A", "1", 1000, 43200, false, "some-ds"),
+				models.CreatePrometheusQuery("B", "1", 1000, 43200, false, "some-ds"),
+				models.CreatePrometheusQuery("C", "1", 1000, 43200, false, "some-ds"), // Not optimizable.
+				models.CreateReduceExpression("D", "A", "last"),
+				models.CreateReduceExpression("E", "B", "last"),
+			}
+
+			currentTime := time.Now()
+
+			ac := acMock.New().WithPermissions([]ac.Permission{
+				{Action: datasources.ActionQuery, Scope: datasources.ScopeProvider.GetResourceScopeUID(queries[0].DatasourceUID)},
+			})
+
+			ds := &fakes.FakeCacheService{DataSources: []*datasources.DataSource{
+				{UID: queries[0].DatasourceUID},
+			}}
+
+			evaluator := &eval_mocks.ConditionEvaluatorMock{}
+			createEmptyFrameResponse := func(refId string) backend.DataResponse {
+				frame := data.NewFrame("")
+				frame.RefID = refId
+				frame.SetMeta(&data.FrameMeta{})
+				return backend.DataResponse{
+					Frames: []*data.Frame{frame},
+					Error:  nil,
+				}
+			}
+			result := &backend.QueryDataResponse{
+				Responses: map[string]backend.DataResponse{
+					"A": createEmptyFrameResponse("A"),
+					"B": createEmptyFrameResponse("B"),
+					"C": createEmptyFrameResponse("C"),
+				},
+			}
+			evaluator.EXPECT().EvaluateRaw(mock.Anything, mock.Anything).Return(result, nil)
+
+			ruleStore := fakes2.NewRuleStore(t)
+
+			srv := createTestingApiSrv(t, ds, ac, eval_mocks.NewEvaluatorFactory(evaluator), featuremgmt.WithManager(featuremgmt.FlagAlertingQueryOptimization), ruleStore)
+
+			response := srv.RouteEvalQueries(rc, definitions.EvalQueriesPayload{
+				Data: ApiAlertQueriesFromAlertQueries(queries),
+				Now:  currentTime,
+			})
+
+			require.Equal(t, http.StatusOK, response.Status())
+
+			evaluator.AssertCalled(t, "EvaluateRaw", mock.Anything, currentTime)
+
+			require.Equal(t, []data.Notice{{
+				Severity: data.NoticeSeverityWarning,
+				Text:     "Query optimized from Range to Instant type; all uses exclusively require the last datapoint. Consider modifying your query to Instant type to ensure accuracy.",
+			}}, result.Responses["A"].Frames[0].Meta.Notices)
+
+			require.Equal(t, []data.Notice{{
+				Severity: data.NoticeSeverityWarning,
+				Text:     "Query optimized from Range to Instant type; all uses exclusively require the last datapoint. Consider modifying your query to Instant type to ensure accuracy.",
+			}}, result.Responses["B"].Frames[0].Meta.Notices)
+
+			require.Equal(t, 0, len(result.Responses["C"].Frames[0].Meta.Notices))
+		})
+	})
 }
 
-func createTestingApiSrv(t *testing.T, ds *fakes.FakeCacheService, ac *acMock.Mock, evaluator eval.EvaluatorFactory) *TestingApiSrv {
+func createTestingApiSrv(t *testing.T, ds *fakes.FakeCacheService, ac *acMock.Mock, evaluator eval.EvaluatorFactory, featureManager *featuremgmt.FeatureManager, ruleStore RuleStore) *TestingApiSrv {
 	if ac == nil {
 		ac = acMock.New()
 	}
 
 	return &TestingApiSrv{
 		DatasourceCache: ds,
-		accessControl:   ac,
+		authz:           accesscontrol.NewRuleService(ac),
 		evaluator:       evaluator,
 		cfg:             config(t),
 		tracer:          tracing.InitializeTracerForTest(),
+		featureManager:  featureManager,
+		folderService:   ruleStore,
 	}
 }
diff --git a/pkg/services/ngalert/api/authorization.go b/pkg/services/ngalert/api/authorization.go
index cc7ca55193797..80565745d26dd 100644
--- a/pkg/services/ngalert/api/authorization.go
+++ b/pkg/services/ngalert/api/authorization.go
@@ -1,24 +1,16 @@
 package api
 
 import (
-	"errors"
 	"fmt"
 	"net/http"
 
-	"github.com/grafana/grafana/pkg/expr"
 	"github.com/grafana/grafana/pkg/middleware"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/datasources"
-	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
-	"github.com/grafana/grafana/pkg/services/ngalert/store"
 	"github.com/grafana/grafana/pkg/web"
 )
 
-var (
-	ErrAuthorization = errors.New("user is not authorized")
-)
-
 //nolint:gocyclo
 func (api *API) authorize(method, path string) web.Handler {
 	authorize := ac.Middleware(api.AccessControl)
@@ -28,33 +20,65 @@ func (api *API) authorize(method, path string) web.Handler {
 	// Alert Rules
 
 	// Grafana Paths
-	case http.MethodDelete + "/api/ruler/grafana/api/v1/rules/{Namespace}/{Groupname}":
-		eval = ac.EvalPermission(ac.ActionAlertingRuleDelete, dashboards.ScopeFoldersProvider.GetResourceScopeName(ac.Parameter(":Namespace")))
-	case http.MethodDelete + "/api/ruler/grafana/api/v1/rules/{Namespace}":
-		eval = ac.EvalPermission(ac.ActionAlertingRuleDelete, dashboards.ScopeFoldersProvider.GetResourceScopeName(ac.Parameter(":Namespace")))
+	case http.MethodDelete + "/api/ruler/grafana/api/v1/rules/{Namespace}/{Groupname}",
+		http.MethodDelete + "/api/ruler/grafana/api/v1/rules/{Namespace}":
+		eval = ac.EvalAll(
+			ac.EvalPermission(ac.ActionAlertingRuleDelete, dashboards.ScopeFoldersProvider.GetResourceScopeUID(ac.Parameter(":Namespace"))),
+			ac.EvalPermission(ac.ActionAlertingRuleRead, dashboards.ScopeFoldersProvider.GetResourceScopeUID(ac.Parameter(":Namespace"))),
+			ac.EvalPermission(dashboards.ActionFoldersRead, dashboards.ScopeFoldersProvider.GetResourceScopeUID(ac.Parameter(":Namespace"))),
+		)
 	case http.MethodGet + "/api/ruler/grafana/api/v1/rules/{Namespace}/{Groupname}":
-		eval = ac.EvalPermission(ac.ActionAlertingRuleRead, dashboards.ScopeFoldersProvider.GetResourceScopeName(ac.Parameter(":Namespace")))
+		eval = ac.EvalAll(
+			ac.EvalPermission(ac.ActionAlertingRuleRead, dashboards.ScopeFoldersProvider.GetResourceScopeUID(ac.Parameter(":Namespace"))),
+			ac.EvalPermission(dashboards.ActionFoldersRead, dashboards.ScopeFoldersProvider.GetResourceScopeUID(ac.Parameter(":Namespace"))),
+		)
 	case http.MethodGet + "/api/ruler/grafana/api/v1/rules/{Namespace}":
-		eval = ac.EvalPermission(ac.ActionAlertingRuleRead, dashboards.ScopeFoldersProvider.GetResourceScopeName(ac.Parameter(":Namespace")))
+		eval = ac.EvalAll(
+			ac.EvalPermission(ac.ActionAlertingRuleRead, dashboards.ScopeFoldersProvider.GetResourceScopeUID(ac.Parameter(":Namespace"))),
+			ac.EvalPermission(dashboards.ActionFoldersRead, dashboards.ScopeFoldersProvider.GetResourceScopeUID(ac.Parameter(":Namespace"))),
+		)
 	case http.MethodGet + "/api/ruler/grafana/api/v1/rules",
 		http.MethodGet + "/api/ruler/grafana/api/v1/export/rules":
 		eval = ac.EvalPermission(ac.ActionAlertingRuleRead)
 	case http.MethodPost + "/api/ruler/grafana/api/v1/rules/{Namespace}/export":
-		scope := dashboards.ScopeFoldersProvider.GetResourceScopeName(ac.Parameter(":Namespace"))
+		scope := dashboards.ScopeFoldersProvider.GetResourceScopeUID(ac.Parameter(":Namespace"))
 		// more granular permissions are enforced by the handler via "authorizeRuleChanges"
-		eval = ac.EvalPermission(ac.ActionAlertingRuleRead, scope)
+		eval = ac.EvalAll(ac.EvalPermission(ac.ActionAlertingRuleRead, scope),
+			ac.EvalPermission(dashboards.ActionFoldersRead, scope),
+		)
 	case http.MethodPost + "/api/ruler/grafana/api/v1/rules/{Namespace}":
-		scope := dashboards.ScopeFoldersProvider.GetResourceScopeName(ac.Parameter(":Namespace"))
+		scope := dashboards.ScopeFoldersProvider.GetResourceScopeUID(ac.Parameter(":Namespace"))
 		// more granular permissions are enforced by the handler via "authorizeRuleChanges"
-		eval = ac.EvalAny(
-			ac.EvalPermission(ac.ActionAlertingRuleUpdate, scope),
-			ac.EvalPermission(ac.ActionAlertingRuleCreate, scope),
-			ac.EvalPermission(ac.ActionAlertingRuleDelete, scope),
+		eval = ac.EvalAll(
+			ac.EvalPermission(ac.ActionAlertingRuleRead, scope),
+			ac.EvalPermission(dashboards.ActionFoldersRead, scope),
+			ac.EvalAny(
+				ac.EvalPermission(ac.ActionAlertingRuleUpdate, scope),
+				ac.EvalPermission(ac.ActionAlertingRuleCreate, scope),
+				ac.EvalPermission(ac.ActionAlertingRuleDelete, scope),
+			),
 		)
+
 	// Grafana rule state history paths
 	case http.MethodGet + "/api/v1/rules/history":
 		eval = ac.EvalPermission(ac.ActionAlertingRuleRead)
 
+	// Grafana receivers paths
+	case http.MethodGet + "/api/v1/notifications/receivers":
+		// additional authorization is done at the service level
+		eval = ac.EvalAny(
+			ac.EvalPermission(ac.ActionAlertingNotificationsRead),
+			ac.EvalPermission(ac.ActionAlertingReceiversList),
+			ac.EvalPermission(ac.ActionAlertingReceiversRead),
+			ac.EvalPermission(ac.ActionAlertingReceiversReadSecrets),
+		)
+	case http.MethodGet + "/api/v1/notifications/receivers/{Name}":
+		// TODO: scope to :Name
+		eval = ac.EvalAny(
+			ac.EvalPermission(ac.ActionAlertingReceiversRead),
+			ac.EvalPermission(ac.ActionAlertingReceiversReadSecrets),
+		)
+
 	// Grafana, Prometheus-compatible Paths
 	case http.MethodGet + "/api/prometheus/grafana/api/v1/rules":
 		eval = ac.EvalPermission(ac.ActionAlertingRuleRead)
@@ -190,11 +214,50 @@ func (api *API) authorize(method, path string) web.Handler {
 
 	// Grafana-only Provisioning Read Paths
 	case http.MethodGet + "/api/v1/provisioning/policies/export",
-		http.MethodGet + "/api/v1/provisioning/contact-points/export":
+		http.MethodGet + "/api/v1/provisioning/contact-points/export",
+		http.MethodGet + "/api/v1/provisioning/mute-timings/export",
+		http.MethodGet + "/api/v1/provisioning/mute-timings/{name}/export":
+		eval = ac.EvalAny(
+			ac.EvalPermission(ac.ActionAlertingNotificationsRead),             // organization scope
+			ac.EvalPermission(ac.ActionAlertingProvisioningRead),              // organization scope
+			ac.EvalPermission(ac.ActionAlertingNotificationsProvisioningRead), // organization scope
+			ac.EvalPermission(ac.ActionAlertingProvisioningReadSecrets),       // organization scope
+		)
+
+	case http.MethodGet + "/api/v1/provisioning/alert-rules",
+		http.MethodGet + "/api/v1/provisioning/alert-rules/export":
+		eval = ac.EvalAny(
+			ac.EvalPermission(ac.ActionAlertingProvisioningRead),
+			ac.EvalPermission(ac.ActionAlertingRulesProvisioningRead),
+			ac.EvalPermission(ac.ActionAlertingProvisioningReadSecrets),
+			ac.EvalAll( // scopes are enforced in the handler
+				ac.EvalPermission(ac.ActionAlertingRuleRead),
+				ac.EvalPermission(dashboards.ActionFoldersRead),
+			),
+		)
+	case http.MethodGet + "/api/v1/provisioning/alert-rules/{UID}",
+		http.MethodGet + "/api/v1/provisioning/alert-rules/{UID}/export":
+		eval = ac.EvalAny(
+			ac.EvalPermission(ac.ActionAlertingProvisioningRead),
+			ac.EvalPermission(ac.ActionAlertingRulesProvisioningRead),
+			ac.EvalPermission(ac.ActionAlertingProvisioningReadSecrets),
+			ac.EvalAll(
+				ac.EvalPermission(ac.ActionAlertingRuleRead),
+				ac.EvalPermission(dashboards.ActionFoldersRead),
+			),
+		)
+
+	case http.MethodGet + "/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}",
+		http.MethodGet + "/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}/export":
+		scope := dashboards.ScopeFoldersProvider.GetResourceScopeUID(ac.Parameter(":FolderUID"))
 		eval = ac.EvalAny(
-			ac.EvalPermission(ac.ActionAlertingNotificationsRead),       // organization scope
-			ac.EvalPermission(ac.ActionAlertingProvisioningRead),        // organization scope
-			ac.EvalPermission(ac.ActionAlertingProvisioningReadSecrets), // organization scope
+			ac.EvalPermission(ac.ActionAlertingProvisioningRead),
+			ac.EvalPermission(ac.ActionAlertingRulesProvisioningRead),
+			ac.EvalPermission(ac.ActionAlertingProvisioningReadSecrets),
+			ac.EvalAll(
+				ac.EvalPermission(ac.ActionAlertingRuleRead, scope),
+				ac.EvalPermission(dashboards.ActionFoldersRead, scope),
+			),
 		)
 
 	case http.MethodGet + "/api/v1/provisioning/policies",
@@ -202,14 +265,70 @@ func (api *API) authorize(method, path string) web.Handler {
 		http.MethodGet + "/api/v1/provisioning/templates",
 		http.MethodGet + "/api/v1/provisioning/templates/{name}",
 		http.MethodGet + "/api/v1/provisioning/mute-timings",
-		http.MethodGet + "/api/v1/provisioning/mute-timings/{name}",
-		http.MethodGet + "/api/v1/provisioning/alert-rules",
-		http.MethodGet + "/api/v1/provisioning/alert-rules/{UID}",
-		http.MethodGet + "/api/v1/provisioning/alert-rules/export",
-		http.MethodGet + "/api/v1/provisioning/alert-rules/{UID}/export",
-		http.MethodGet + "/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}",
-		http.MethodGet + "/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}/export":
-		eval = ac.EvalAny(ac.EvalPermission(ac.ActionAlertingProvisioningRead), ac.EvalPermission(ac.ActionAlertingProvisioningReadSecrets)) // organization scope
+		http.MethodGet + "/api/v1/provisioning/mute-timings/{name}":
+		eval = ac.EvalAny(
+			ac.EvalPermission(ac.ActionAlertingProvisioningRead),
+			ac.EvalPermission(ac.ActionAlertingNotificationsProvisioningRead), // organization scope
+			ac.EvalPermission(ac.ActionAlertingProvisioningReadSecrets),
+			ac.EvalPermission(ac.ActionAlertingNotificationsRead),
+		)
+
+	// Grafana-only Provisioning Write Paths
+	case http.MethodPost + "/api/v1/provisioning/alert-rules":
+		eval = ac.EvalAny(
+			ac.EvalPermission(ac.ActionAlertingProvisioningWrite),
+			ac.EvalPermission(ac.ActionAlertingRulesProvisioningWrite),
+			ac.EvalAll(
+				ac.EvalPermission(ac.ActionAlertingRuleCreate), // more granular permissions are enforced by the handler via "authorizeRuleChanges"
+				ac.EvalPermission(ac.ActionAlertingProvisioningSetStatus),
+			),
+		)
+	case http.MethodPut + "/api/v1/provisioning/alert-rules/{UID}":
+		eval = ac.EvalAny(
+			ac.EvalPermission(ac.ActionAlertingProvisioningWrite),
+			ac.EvalPermission(ac.ActionAlertingRulesProvisioningWrite),
+			ac.EvalAll(
+				ac.EvalPermission(ac.ActionAlertingRuleUpdate), // more granular permissions are enforced by the handler via "authorizeRuleChanges"
+				ac.EvalPermission(ac.ActionAlertingProvisioningSetStatus),
+			),
+		)
+	case http.MethodDelete + "/api/v1/provisioning/alert-rules/{UID}":
+		eval = ac.EvalAny(
+			ac.EvalPermission(ac.ActionAlertingProvisioningWrite),
+			ac.EvalPermission(ac.ActionAlertingRulesProvisioningWrite),
+			ac.EvalAll(
+				ac.EvalPermission(ac.ActionAlertingRuleDelete), // more granular permissions are enforced by the handler via "authorizeRuleChanges"
+				ac.EvalPermission(ac.ActionAlertingProvisioningSetStatus),
+			),
+		)
+	case http.MethodDelete + "/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}":
+		scope := dashboards.ScopeFoldersProvider.GetResourceScopeUID(ac.Parameter(":FolderUID"))
+		eval = ac.EvalAny(
+			ac.EvalPermission(ac.ActionAlertingProvisioningWrite),
+			ac.EvalPermission(ac.ActionAlertingRulesProvisioningWrite),
+			ac.EvalAll(
+				ac.EvalPermission(ac.ActionAlertingRuleDelete, scope),
+				ac.EvalPermission(ac.ActionAlertingRuleRead, scope),
+				ac.EvalPermission(dashboards.ActionFoldersRead, scope),
+				ac.EvalPermission(ac.ActionAlertingProvisioningSetStatus),
+			),
+		)
+	case http.MethodPut + "/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}":
+		scope := dashboards.ScopeFoldersProvider.GetResourceScopeUID(ac.Parameter(":FolderUID"))
+		eval = ac.EvalAny(
+			ac.EvalPermission(ac.ActionAlertingProvisioningWrite),
+			ac.EvalPermission(ac.ActionAlertingRulesProvisioningWrite),
+			ac.EvalAll(
+				ac.EvalPermission(ac.ActionAlertingRuleRead, scope),
+				ac.EvalPermission(dashboards.ActionFoldersRead, scope),
+				ac.EvalPermission(ac.ActionAlertingProvisioningSetStatus),
+				ac.EvalAny( // the exact permissions will be checked after the operations are determined
+					ac.EvalPermission(ac.ActionAlertingRuleUpdate, scope),
+					ac.EvalPermission(ac.ActionAlertingRuleCreate, scope),
+					ac.EvalPermission(ac.ActionAlertingRuleDelete, scope),
+				),
+			),
+		)
 
 	case http.MethodPut + "/api/v1/provisioning/policies",
 		http.MethodDelete + "/api/v1/provisioning/policies",
@@ -220,12 +339,23 @@ func (api *API) authorize(method, path string) web.Handler {
 		http.MethodDelete + "/api/v1/provisioning/templates/{name}",
 		http.MethodPost + "/api/v1/provisioning/mute-timings",
 		http.MethodPut + "/api/v1/provisioning/mute-timings/{name}",
-		http.MethodDelete + "/api/v1/provisioning/mute-timings/{name}",
-		http.MethodPost + "/api/v1/provisioning/alert-rules",
-		http.MethodPut + "/api/v1/provisioning/alert-rules/{UID}",
-		http.MethodDelete + "/api/v1/provisioning/alert-rules/{UID}",
-		http.MethodPut + "/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}":
-		eval = ac.EvalPermission(ac.ActionAlertingProvisioningWrite) // organization scope
+		http.MethodDelete + "/api/v1/provisioning/mute-timings/{name}":
+		eval = ac.EvalAny(
+			ac.EvalPermission(ac.ActionAlertingProvisioningWrite),              // organization scope,
+			ac.EvalPermission(ac.ActionAlertingNotificationsProvisioningWrite), // organization scope
+			ac.EvalAll(
+				ac.EvalPermission(ac.ActionAlertingNotificationsWrite),
+				ac.EvalPermission(ac.ActionAlertingProvisioningSetStatus),
+			),
+		)
+	case http.MethodGet + "/api/v1/notifications/time-intervals/{name}",
+		http.MethodGet + "/api/v1/notifications/time-intervals":
+		eval = ac.EvalAny(
+			ac.EvalPermission(ac.ActionAlertingNotificationsRead),
+			ac.EvalPermission(ac.ActionAlertingNotificationsTimeIntervalsRead),
+			ac.EvalPermission(ac.ActionAlertingProvisioningRead),
+			ac.EvalPermission(ac.ActionAlertingNotificationsProvisioningRead), // organization scope
+		)
 	}
 
 	if eval != nil {
@@ -234,113 +364,3 @@ func (api *API) authorize(method, path string) web.Handler {
 
 	panic(fmt.Sprintf("no authorization handler for method [%s] of endpoint [%s]", method, path))
 }
-
-// authorizeDatasourceAccessForRule checks that user has access to all data sources declared by the rule
-func authorizeDatasourceAccessForRule(rule *ngmodels.AlertRule, evaluator func(evaluator ac.Evaluator) bool) bool {
-	for _, query := range rule.Data {
-		if query.QueryType == expr.DatasourceType || query.DatasourceUID == expr.DatasourceUID || query.
-			DatasourceUID == expr.
-			OldDatasourceUID {
-			continue
-		}
-		if !evaluator(ac.EvalPermission(datasources.ActionQuery, datasources.ScopeProvider.GetResourceScopeUID(query.DatasourceUID))) {
-			return false
-		}
-	}
-	return true
-}
-
-// authorizeAccessToRuleGroup checks all rules against authorizeDatasourceAccessForRule and exits on the first negative result
-func authorizeAccessToRuleGroup(rules []*ngmodels.AlertRule, evaluator func(evaluator ac.Evaluator) bool) bool {
-	for _, rule := range rules {
-		if !authorizeDatasourceAccessForRule(rule, evaluator) {
-			return false
-		}
-	}
-	return true
-}
-
-// authorizeRuleChanges analyzes changes in the rule group, and checks whether the changes are authorized.
-// NOTE: if there are rules for deletion, and the user does not have access to data sources that a rule uses, the rule is removed from the list.
-// If the user is not authorized to perform the changes the function returns ErrAuthorization with a description of what action is not authorized.
-// Return changes that the user is authorized to perform or ErrAuthorization
-func authorizeRuleChanges(change *store.GroupDelta, evaluator func(evaluator ac.Evaluator) bool) error {
-	namespaceScope := dashboards.ScopeFoldersProvider.GetResourceScopeUID(change.GroupKey.NamespaceUID)
-
-	rules, ok := change.AffectedGroups[change.GroupKey]
-	if ok { // not ok can be when user creates a new rule group or moves existing alerts to a new group
-		if !authorizeAccessToRuleGroup(rules, evaluator) { // if user is not authorized to do operation in the group that is being changed
-			return fmt.Errorf("%w to change group %s because it does not have access to one or many rules in this group", ErrAuthorization, change.GroupKey.RuleGroup)
-		}
-	} else if len(change.Delete) > 0 {
-		// add a safeguard in the case of inconsistency. If user hit this then there is a bug in the calculating of changes struct
-		return fmt.Errorf("failed to authorize changes in rule group %s. Detected %d deletes but group was not provided", change.GroupKey.RuleGroup, len(change.Delete))
-	}
-
-	if len(change.Delete) > 0 {
-		allowed := evaluator(ac.EvalPermission(ac.ActionAlertingRuleDelete, namespaceScope))
-		if !allowed {
-			return fmt.Errorf("%w to delete alert rules that belong to folder %s", ErrAuthorization, change.GroupKey.NamespaceUID)
-		}
-		for _, rule := range change.Delete {
-			if !authorizeDatasourceAccessForRule(rule, evaluator) {
-				return fmt.Errorf("%w to delete an alert rule '%s' because the user does not have read permissions for one or many datasources the rule uses", ErrAuthorization, rule.UID)
-			}
-		}
-	}
-
-	var addAuthorized, updateAuthorized bool
-
-	if len(change.New) > 0 {
-		addAuthorized = evaluator(ac.EvalPermission(ac.ActionAlertingRuleCreate, namespaceScope))
-		if !addAuthorized {
-			return fmt.Errorf("%w to create alert rules in the folder %s", ErrAuthorization, change.GroupKey.NamespaceUID)
-		}
-		for _, rule := range change.New {
-			dsAllowed := authorizeDatasourceAccessForRule(rule, evaluator)
-			if !dsAllowed {
-				return fmt.Errorf("%w to create a new alert rule '%s' because the user does not have read permissions for one or many datasources the rule uses", ErrAuthorization, rule.Title)
-			}
-		}
-	}
-
-	for _, rule := range change.Update {
-		dsAllowed := authorizeDatasourceAccessForRule(rule.New, evaluator)
-		if !dsAllowed {
-			return fmt.Errorf("%w to update alert rule '%s' (UID: %s) because the user does not have read permissions for one or many datasources the rule uses", ErrAuthorization, rule.Existing.Title, rule.Existing.UID)
-		}
-
-		// Check if the rule is moved from one folder to the current. If yes, then the user must have the authorization to delete rules from the source folder and add rules to the target folder.
-		if rule.Existing.NamespaceUID != rule.New.NamespaceUID {
-			allowed := evaluator(ac.EvalAll(ac.EvalPermission(ac.ActionAlertingRuleDelete, dashboards.ScopeFoldersProvider.GetResourceScopeUID(rule.Existing.NamespaceUID))))
-			if !allowed {
-				return fmt.Errorf("%w to delete alert rules from folder UID %s", ErrAuthorization, rule.Existing.NamespaceUID)
-			}
-
-			if !addAuthorized {
-				addAuthorized = evaluator(ac.EvalPermission(ac.ActionAlertingRuleCreate, namespaceScope))
-				if !addAuthorized {
-					return fmt.Errorf("%w to create alert rules in the folder '%s'", ErrAuthorization, change.GroupKey.NamespaceUID)
-				}
-			}
-		} else if !updateAuthorized { // if it is false then the authorization was not checked. If it is true then the user is authorized to update rules
-			updateAuthorized = evaluator(ac.EvalPermission(ac.ActionAlertingRuleUpdate, namespaceScope))
-			if !updateAuthorized {
-				return fmt.Errorf("%w to update alert rules that belong to folder %s", ErrAuthorization, change.GroupKey.NamespaceUID)
-			}
-		}
-
-		if rule.Existing.NamespaceUID != rule.New.NamespaceUID || rule.Existing.RuleGroup != rule.New.RuleGroup {
-			key := rule.Existing.GetGroupKey()
-			rules, ok = change.AffectedGroups[key]
-			if !ok {
-				// add a safeguard in the case of inconsistency. If user hit this then there is a bug in the calculating of changes struct
-				return fmt.Errorf("failed to authorize moving an alert rule %s between groups because unable to check access to group %s from which the rule is moved", rule.Existing.UID, rule.Existing.RuleGroup)
-			}
-			if !authorizeAccessToRuleGroup(rules, evaluator) {
-				return fmt.Errorf("%w to move rule %s between two different groups because user does not have access to the source group %s", ErrAuthorization, rule.Existing.UID, rule.Existing.RuleGroup)
-			}
-		}
-	}
-	return nil
-}
diff --git a/pkg/services/ngalert/api/authorization_test.go b/pkg/services/ngalert/api/authorization_test.go
index 01627fac49a2f..a4603e2c06a02 100644
--- a/pkg/services/ngalert/api/authorization_test.go
+++ b/pkg/services/ngalert/api/authorization_test.go
@@ -1,8 +1,6 @@
 package api
 
 import (
-	"math"
-	"math/rand"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -11,14 +9,7 @@ import (
 	"github.com/go-openapi/loads"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/grafana/pkg/expr"
-	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/datasources"
-	"github.com/grafana/grafana/pkg/services/ngalert/models"
-	"github.com/grafana/grafana/pkg/services/ngalert/store"
-	"github.com/grafana/grafana/pkg/util"
 )
 
 func TestAuthorize(t *testing.T) {
@@ -49,13 +40,14 @@ func TestAuthorize(t *testing.T) {
 		}
 		paths[p] = methods
 	}
-	require.Len(t, paths, 52)
+	require.Len(t, paths, 58)
 
 	ac := acmock.New()
 	api := &API{AccessControl: ac}
 
 	t.Run("should not panic on known routes", func(t *testing.T) {
 		for path, methods := range paths {
+			path := swaggerSpec.Spec().BasePath + path
 			for _, method := range methods {
 				require.NotPanics(t, func() {
 					api.authorize(method, path)
@@ -70,427 +62,3 @@ func TestAuthorize(t *testing.T) {
 		})
 	})
 }
-
-func createAllCombinationsOfPermissions(permissions map[string][]string) []map[string][]string {
-	type actionscope struct {
-		action string
-		scope  string
-	}
-
-	var flattenPermissions []actionscope
-	for action, scopes := range permissions {
-		for _, scope := range scopes {
-			flattenPermissions = append(flattenPermissions, actionscope{
-				action,
-				scope,
-			})
-		}
-	}
-
-	l := len(flattenPermissions)
-	// this is all possible combinations of the permissions
-	var permissionCombinations []map[string][]string
-	for bit := uint(0); bit < uint(math.Pow(2, float64(l))); bit++ {
-		var tuple []actionscope
-		for idx := 0; idx < l; idx++ {
-			if (bit>>idx)&1 == 1 {
-				tuple = append(tuple, flattenPermissions[idx])
-			}
-		}
-
-		combination := make(map[string][]string)
-		for _, perm := range tuple {
-			combination[perm.action] = append(combination[perm.action], perm.scope)
-		}
-
-		permissionCombinations = append(permissionCombinations, combination)
-	}
-	return permissionCombinations
-}
-
-func getDatasourceScopesForRules(rules models.RulesGroup) []string {
-	scopesMap := map[string]struct{}{}
-	var result []string
-	for _, rule := range rules {
-		for _, query := range rule.Data {
-			scope := datasources.ScopeProvider.GetResourceScopeUID(query.DatasourceUID)
-			if _, ok := scopesMap[scope]; ok {
-				continue
-			}
-			result = append(result, scope)
-			scopesMap[scope] = struct{}{}
-		}
-	}
-	return result
-}
-
-func mapUpdates(updates []store.RuleDelta, mapFunc func(store.RuleDelta) *models.AlertRule) models.RulesGroup {
-	result := make(models.RulesGroup, 0, len(updates))
-	for _, update := range updates {
-		result = append(result, mapFunc(update))
-	}
-	return result
-}
-
-func TestAuthorizeRuleChanges(t *testing.T) {
-	groupKey := models.GenerateGroupKey(rand.Int63())
-	namespaceIdScope := dashboards.ScopeFoldersProvider.GetResourceScopeUID(groupKey.NamespaceUID)
-
-	testCases := []struct {
-		name        string
-		changes     func() *store.GroupDelta
-		permissions func(c *store.GroupDelta) map[string][]string
-	}{
-		{
-			name: "if there are rules to add it should check create action and query for datasource",
-			changes: func() *store.GroupDelta {
-				return &store.GroupDelta{
-					GroupKey: groupKey,
-					New:      models.GenerateAlertRules(rand.Intn(4)+1, models.AlertRuleGen(withGroupKey(groupKey))),
-					Update:   nil,
-					Delete:   nil,
-				}
-			},
-			permissions: func(c *store.GroupDelta) map[string][]string {
-				var scopes []string
-				for _, rule := range c.New {
-					for _, query := range rule.Data {
-						scopes = append(scopes, datasources.ScopeProvider.GetResourceScopeUID(query.DatasourceUID))
-					}
-				}
-				return map[string][]string{
-					ac.ActionAlertingRuleCreate: {
-						namespaceIdScope,
-					},
-					datasources.ActionQuery: scopes,
-				}
-			},
-		},
-		{
-			name: "if there are rules to delete it should check delete action and query for datasource",
-			changes: func() *store.GroupDelta {
-				rules := models.GenerateAlertRules(rand.Intn(4)+1, models.AlertRuleGen(withGroupKey(groupKey)))
-				rules2 := models.GenerateAlertRules(rand.Intn(4)+1, models.AlertRuleGen(withGroupKey(groupKey)))
-				return &store.GroupDelta{
-					GroupKey: groupKey,
-					AffectedGroups: map[models.AlertRuleGroupKey]models.RulesGroup{
-						groupKey: append(rules, rules2...),
-					},
-					New:    nil,
-					Update: nil,
-					Delete: rules2,
-				}
-			},
-			permissions: func(c *store.GroupDelta) map[string][]string {
-				return map[string][]string{
-					ac.ActionAlertingRuleDelete: {
-						namespaceIdScope,
-					},
-					datasources.ActionQuery: getDatasourceScopesForRules(c.AffectedGroups[c.GroupKey]),
-				}
-			},
-		},
-		{
-			name: "if there are rules to update within the same namespace it should check update action and access to datasource",
-			changes: func() *store.GroupDelta {
-				rules1 := models.GenerateAlertRules(rand.Intn(4)+1, models.AlertRuleGen(withGroupKey(groupKey)))
-				rules := models.GenerateAlertRules(rand.Intn(4)+1, models.AlertRuleGen(withGroupKey(groupKey)))
-				updates := make([]store.RuleDelta, 0, len(rules))
-
-				for _, rule := range rules {
-					cp := models.CopyRule(rule)
-					cp.Data = []models.AlertQuery{models.GenerateAlertQuery()}
-					updates = append(updates, store.RuleDelta{
-						Existing: rule,
-						New:      cp,
-						Diff:     nil,
-					})
-				}
-
-				return &store.GroupDelta{
-					GroupKey: groupKey,
-					AffectedGroups: map[models.AlertRuleGroupKey]models.RulesGroup{
-						groupKey: append(rules, rules1...),
-					},
-					New:    nil,
-					Update: updates,
-					Delete: nil,
-				}
-			},
-			permissions: func(c *store.GroupDelta) map[string][]string {
-				scopes := getDatasourceScopesForRules(append(c.AffectedGroups[c.GroupKey], mapUpdates(c.Update, func(update store.RuleDelta) *models.AlertRule {
-					return update.New
-				})...))
-				return map[string][]string{
-					ac.ActionAlertingRuleUpdate: {
-						namespaceIdScope,
-					},
-					datasources.ActionQuery: scopes,
-				}
-			},
-		},
-		{
-			name: "if there are rules that are moved between namespaces it should check delete+add action and access to group where rules come from",
-			changes: func() *store.GroupDelta {
-				rules1 := models.GenerateAlertRules(rand.Intn(4)+1, models.AlertRuleGen(withGroupKey(groupKey)))
-				rules := models.GenerateAlertRules(rand.Intn(4)+1, models.AlertRuleGen(withGroupKey(groupKey)))
-
-				targetGroupKey := models.GenerateGroupKey(groupKey.OrgID)
-
-				updates := make([]store.RuleDelta, 0, len(rules))
-				for _, rule := range rules {
-					cp := models.CopyRule(rule)
-					withGroupKey(targetGroupKey)(cp)
-					cp.Data = []models.AlertQuery{
-						models.GenerateAlertQuery(),
-					}
-
-					updates = append(updates, store.RuleDelta{
-						Existing: rule,
-						New:      cp,
-					})
-				}
-
-				return &store.GroupDelta{
-					GroupKey: targetGroupKey,
-					AffectedGroups: map[models.AlertRuleGroupKey]models.RulesGroup{
-						groupKey: append(rules, rules1...),
-					},
-					New:    nil,
-					Update: updates,
-					Delete: nil,
-				}
-			},
-			permissions: func(c *store.GroupDelta) map[string][]string {
-				dsScopes := getDatasourceScopesForRules(
-					append(append(append(c.AffectedGroups[c.GroupKey],
-						mapUpdates(c.Update, func(update store.RuleDelta) *models.AlertRule {
-							return update.New
-						})...,
-					), mapUpdates(c.Update, func(update store.RuleDelta) *models.AlertRule {
-						return update.Existing
-					})...), c.AffectedGroups[groupKey]...),
-				)
-
-				var deleteScopes []string
-				for key := range c.AffectedGroups {
-					deleteScopes = append(deleteScopes, dashboards.ScopeFoldersProvider.GetResourceScopeUID(key.NamespaceUID))
-				}
-
-				return map[string][]string{
-					ac.ActionAlertingRuleDelete: deleteScopes,
-					ac.ActionAlertingRuleCreate: {
-						dashboards.ScopeFoldersProvider.GetResourceScopeUID(c.GroupKey.NamespaceUID),
-					},
-					datasources.ActionQuery: dsScopes,
-				}
-			},
-		},
-		{
-			name: "if there are rules that are moved between groups in the same namespace it should check update action and access to all groups (source+target)",
-			changes: func() *store.GroupDelta {
-				targetGroupKey := models.AlertRuleGroupKey{
-					OrgID:        groupKey.OrgID,
-					NamespaceUID: groupKey.NamespaceUID,
-					RuleGroup:    util.GenerateShortUID(),
-				}
-				sourceGroup := models.GenerateAlertRules(rand.Intn(4)+1, models.AlertRuleGen(withGroupKey(groupKey)))
-				targetGroup := models.GenerateAlertRules(rand.Intn(4)+1, models.AlertRuleGen(withGroupKey(targetGroupKey)))
-
-				updates := make([]store.RuleDelta, 0, len(sourceGroup))
-				toCopy := len(sourceGroup)
-				if toCopy > 1 {
-					toCopy = rand.Intn(toCopy-1) + 1
-				}
-				for i := 0; i < toCopy; i++ {
-					rule := sourceGroup[0]
-					cp := models.CopyRule(rule)
-					withGroupKey(targetGroupKey)(cp)
-					cp.Data = []models.AlertQuery{
-						models.GenerateAlertQuery(),
-					}
-
-					updates = append(updates, store.RuleDelta{
-						Existing: rule,
-						New:      cp,
-					})
-				}
-
-				return &store.GroupDelta{
-					GroupKey: targetGroupKey,
-					AffectedGroups: map[models.AlertRuleGroupKey]models.RulesGroup{
-						groupKey:       sourceGroup,
-						targetGroupKey: targetGroup,
-					},
-					New:    nil,
-					Update: updates,
-					Delete: nil,
-				}
-			},
-			permissions: func(c *store.GroupDelta) map[string][]string {
-				scopes := make(map[string]struct{})
-				for _, update := range c.Update {
-					for _, query := range update.New.Data {
-						scopes[datasources.ScopeProvider.GetResourceScopeUID(query.DatasourceUID)] = struct{}{}
-					}
-					for _, query := range update.Existing.Data {
-						scopes[datasources.ScopeProvider.GetResourceScopeUID(query.DatasourceUID)] = struct{}{}
-					}
-				}
-				for _, rules := range c.AffectedGroups {
-					for _, rule := range rules {
-						for _, query := range rule.Data {
-							scopes[datasources.ScopeProvider.GetResourceScopeUID(query.DatasourceUID)] = struct{}{}
-						}
-					}
-				}
-
-				dsScopes := make([]string, 0, len(scopes))
-				for key := range scopes {
-					dsScopes = append(dsScopes, key)
-				}
-
-				return map[string][]string{
-					ac.ActionAlertingRuleUpdate: {
-						dashboards.ScopeFoldersProvider.GetResourceScopeUID(c.GroupKey.NamespaceUID),
-					},
-					datasources.ActionQuery: dsScopes,
-				}
-			},
-		},
-	}
-
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			groupChanges := testCase.changes()
-			permissions := testCase.permissions(groupChanges)
-
-			t.Run("should fail with insufficient permissions", func(t *testing.T) {
-				permissionCombinations := createAllCombinationsOfPermissions(permissions)
-				permissionCombinations = permissionCombinations[0 : len(permissionCombinations)-1] // exclude all permissions
-				for _, missing := range permissionCombinations {
-					executed := false
-					err := authorizeRuleChanges(groupChanges, func(evaluator ac.Evaluator) bool {
-						response := evaluator.Evaluate(missing)
-						executed = true
-						return response
-					})
-					require.Errorf(t, err, "expected error because less permissions than expected were provided. Provided: %v; Expected: %v", missing, permissions)
-					require.ErrorIs(t, err, ErrAuthorization)
-					require.Truef(t, executed, "evaluation function is expected to be called but it was not.")
-				}
-			})
-
-			executed := false
-
-			err := authorizeRuleChanges(groupChanges, func(evaluator ac.Evaluator) bool {
-				response := evaluator.Evaluate(permissions)
-				require.Truef(t, response, "provided permissions [%v] is not enough for requested permissions [%s]", permissions, evaluator.GoString())
-				executed = true
-				return true
-			})
-			require.NoError(t, err)
-			require.Truef(t, executed, "evaluation function is expected to be called but it was not.")
-		})
-	}
-}
-
-func TestCheckDatasourcePermissionsForRule(t *testing.T) {
-	rule := models.AlertRuleGen()()
-
-	expressionByType := models.GenerateAlertQuery()
-	expressionByType.QueryType = expr.DatasourceType
-	expressionByUID := models.GenerateAlertQuery()
-	expressionByUID.DatasourceUID = expr.DatasourceUID
-
-	var data []models.AlertQuery
-	var scopes []string
-	expectedExecutions := rand.Intn(3) + 2
-	for i := 0; i < expectedExecutions; i++ {
-		q := models.GenerateAlertQuery()
-		scopes = append(scopes, datasources.ScopeProvider.GetResourceScopeUID(q.DatasourceUID))
-		data = append(data, q)
-	}
-
-	data = append(data, expressionByType, expressionByUID)
-	rand.Shuffle(len(data), func(i, j int) {
-		data[j], data[i] = data[i], data[j]
-	})
-
-	rule.Data = data
-
-	t.Run("should check only expressions", func(t *testing.T) {
-		permissions := map[string][]string{
-			datasources.ActionQuery: scopes,
-		}
-
-		executed := 0
-
-		eval := authorizeDatasourceAccessForRule(rule, func(evaluator ac.Evaluator) bool {
-			response := evaluator.Evaluate(permissions)
-			require.Truef(t, response, "provided permissions [%v] is not enough for requested permissions [%s]", permissions, evaluator.GoString())
-			executed++
-			return true
-		})
-
-		require.True(t, eval)
-		require.Equal(t, expectedExecutions, executed)
-	})
-
-	t.Run("should return on first negative evaluation", func(t *testing.T) {
-		executed := 0
-
-		eval := authorizeDatasourceAccessForRule(rule, func(evaluator ac.Evaluator) bool {
-			executed++
-			return false
-		})
-
-		require.False(t, eval)
-		require.Equal(t, 1, executed)
-	})
-}
-
-func Test_authorizeAccessToRuleGroup(t *testing.T) {
-	t.Run("should return true if user has access to all datasources of all rules in group", func(t *testing.T) {
-		rules := models.GenerateAlertRules(rand.Intn(4)+1, models.AlertRuleGen())
-		var scopes []string
-		for _, rule := range rules {
-			for _, query := range rule.Data {
-				scopes = append(scopes, datasources.ScopeProvider.GetResourceScopeUID(query.DatasourceUID))
-			}
-		}
-		permissions := map[string][]string{
-			datasources.ActionQuery: scopes,
-		}
-
-		result := authorizeAccessToRuleGroup(rules, func(evaluator ac.Evaluator) bool {
-			response := evaluator.Evaluate(permissions)
-			require.Truef(t, response, "provided permissions [%v] is not enough for requested permissions [%s]", permissions, evaluator.GoString())
-			return true
-		})
-
-		require.True(t, result)
-	})
-	t.Run("should return false if user does not have access to at least one rule in group", func(t *testing.T) {
-		rules := models.GenerateAlertRules(rand.Intn(4)+1, models.AlertRuleGen())
-		var scopes []string
-		for _, rule := range rules {
-			for _, query := range rule.Data {
-				scopes = append(scopes, datasources.ScopeProvider.GetResourceScopeUID(query.DatasourceUID))
-			}
-		}
-		permissions := map[string][]string{
-			datasources.ActionQuery: scopes,
-		}
-
-		rule := models.AlertRuleGen()()
-		rules = append(rules, rule)
-
-		result := authorizeAccessToRuleGroup(rules, func(evaluator ac.Evaluator) bool {
-			response := evaluator.Evaluate(permissions)
-			return response
-		})
-
-		require.False(t, result)
-	})
-}
diff --git a/pkg/services/ngalert/api/compat.go b/pkg/services/ngalert/api/compat.go
index 349b9e2fd1f74..8f671b113416b 100644
--- a/pkg/services/ngalert/api/compat.go
+++ b/pkg/services/ngalert/api/compat.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"time"
 
+	jsoniter "github.com/json-iterator/go"
 	"github.com/prometheus/common/model"
 
 	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
@@ -14,43 +15,45 @@ import (
 // AlertRuleFromProvisionedAlertRule converts definitions.ProvisionedAlertRule to models.AlertRule
 func AlertRuleFromProvisionedAlertRule(a definitions.ProvisionedAlertRule) (models.AlertRule, error) {
 	return models.AlertRule{
-		ID:           a.ID,
-		UID:          a.UID,
-		OrgID:        a.OrgID,
-		NamespaceUID: a.FolderUID,
-		RuleGroup:    a.RuleGroup,
-		Title:        a.Title,
-		Condition:    a.Condition,
-		Data:         AlertQueriesFromApiAlertQueries(a.Data),
-		Updated:      a.Updated,
-		NoDataState:  models.NoDataState(a.NoDataState),          // TODO there must be a validation
-		ExecErrState: models.ExecutionErrorState(a.ExecErrState), // TODO there must be a validation
-		For:          time.Duration(a.For),
-		Annotations:  a.Annotations,
-		Labels:       a.Labels,
-		IsPaused:     a.IsPaused,
+		ID:                   a.ID,
+		UID:                  a.UID,
+		OrgID:                a.OrgID,
+		NamespaceUID:         a.FolderUID,
+		RuleGroup:            a.RuleGroup,
+		Title:                a.Title,
+		Condition:            a.Condition,
+		Data:                 AlertQueriesFromApiAlertQueries(a.Data),
+		Updated:              a.Updated,
+		NoDataState:          models.NoDataState(a.NoDataState),          // TODO there must be a validation
+		ExecErrState:         models.ExecutionErrorState(a.ExecErrState), // TODO there must be a validation
+		For:                  time.Duration(a.For),
+		Annotations:          a.Annotations,
+		Labels:               a.Labels,
+		IsPaused:             a.IsPaused,
+		NotificationSettings: NotificationSettingsFromAlertRuleNotificationSettings(a.NotificationSettings),
 	}, nil
 }
 
 // ProvisionedAlertRuleFromAlertRule converts models.AlertRule to definitions.ProvisionedAlertRule and sets provided provenance status
 func ProvisionedAlertRuleFromAlertRule(rule models.AlertRule, provenance models.Provenance) definitions.ProvisionedAlertRule {
 	return definitions.ProvisionedAlertRule{
-		ID:           rule.ID,
-		UID:          rule.UID,
-		OrgID:        rule.OrgID,
-		FolderUID:    rule.NamespaceUID,
-		RuleGroup:    rule.RuleGroup,
-		Title:        rule.Title,
-		For:          model.Duration(rule.For),
-		Condition:    rule.Condition,
-		Data:         ApiAlertQueriesFromAlertQueries(rule.Data),
-		Updated:      rule.Updated,
-		NoDataState:  definitions.NoDataState(rule.NoDataState),          // TODO there may be a validation
-		ExecErrState: definitions.ExecutionErrorState(rule.ExecErrState), // TODO there may be a validation
-		Annotations:  rule.Annotations,
-		Labels:       rule.Labels,
-		Provenance:   definitions.Provenance(provenance), // TODO validate enum conversion?
-		IsPaused:     rule.IsPaused,
+		ID:                   rule.ID,
+		UID:                  rule.UID,
+		OrgID:                rule.OrgID,
+		FolderUID:            rule.NamespaceUID,
+		RuleGroup:            rule.RuleGroup,
+		Title:                rule.Title,
+		For:                  model.Duration(rule.For),
+		Condition:            rule.Condition,
+		Data:                 ApiAlertQueriesFromAlertQueries(rule.Data),
+		Updated:              rule.Updated,
+		NoDataState:          definitions.NoDataState(rule.NoDataState),          // TODO there may be a validation
+		ExecErrState:         definitions.ExecutionErrorState(rule.ExecErrState), // TODO there may be a validation
+		Annotations:          rule.Annotations,
+		Labels:               rule.Labels,
+		Provenance:           definitions.Provenance(provenance), // TODO validate enum conversion?
+		IsPaused:             rule.IsPaused,
+		NotificationSettings: AlertRuleNotificationSettingsFromNotificationSettings(rule.NotificationSettings),
 	}
 }
 
@@ -174,16 +177,17 @@ func AlertRuleExportFromAlertRule(rule models.AlertRule) (definitions.AlertRuleE
 	}
 
 	result := definitions.AlertRuleExport{
-		UID:          rule.UID,
-		Title:        rule.Title,
-		For:          model.Duration(rule.For),
-		Condition:    rule.Condition,
-		Data:         data,
-		DashboardUID: rule.DashboardUID,
-		PanelID:      rule.PanelID,
-		NoDataState:  definitions.NoDataState(rule.NoDataState),
-		ExecErrState: definitions.ExecutionErrorState(rule.ExecErrState),
-		IsPaused:     rule.IsPaused,
+		UID:                  rule.UID,
+		Title:                rule.Title,
+		For:                  model.Duration(rule.For),
+		Condition:            rule.Condition,
+		Data:                 data,
+		DashboardUID:         rule.DashboardUID,
+		PanelID:              rule.PanelID,
+		NoDataState:          definitions.NoDataState(rule.NoDataState),
+		ExecErrState:         definitions.ExecutionErrorState(rule.ExecErrState),
+		IsPaused:             rule.IsPaused,
+		NotificationSettings: AlertRuleNotificationSettingsExportFromNotificationSettings(rule.NotificationSettings),
 	}
 	if rule.For.Seconds() > 0 {
 		result.ForString = util.Pointer(model.Duration(rule.For).String())
@@ -272,8 +276,8 @@ func AlertingFileExportFromRoute(orgID int64, route definitions.Route) (definiti
 	f := definitions.AlertingFileExport{
 		APIVersion: 1,
 		Policies: []definitions.NotificationPolicyExport{{
-			OrgID:  orgID,
-			Policy: RouteExportFromRoute(&route),
+			OrgID:       orgID,
+			RouteExport: RouteExportFromRoute(&route),
 		}},
 	}
 	return f, nil
@@ -342,3 +346,91 @@ func NilIfEmpty[T any](v *[]T) *[]T {
 	}
 	return v
 }
+
+func AlertingFileExportFromMuteTimings(orgID int64, m []definitions.MuteTimeInterval) definitions.AlertingFileExport {
+	f := definitions.AlertingFileExport{
+		APIVersion:  1,
+		MuteTimings: make([]definitions.MuteTimeIntervalExport, 0, len(m)),
+	}
+	for _, mi := range m {
+		f.MuteTimings = append(f.MuteTimings, MuteTimeIntervalExportFromMuteTiming(orgID, mi))
+	}
+	return f
+}
+
+func MuteTimeIntervalExportFromMuteTiming(orgID int64, m definitions.MuteTimeInterval) definitions.MuteTimeIntervalExport {
+	return definitions.MuteTimeIntervalExport{
+		OrgID:            orgID,
+		MuteTimeInterval: m.MuteTimeInterval,
+	}
+}
+
+// Converts definitions.MuteTimeIntervalExport to definitions.MuteTimeIntervalExportHcl using JSON marshalling. Returns error if structure could not be marshalled\unmarshalled
+func MuteTimingIntervalToMuteTimeIntervalHclExport(m definitions.MuteTimeIntervalExport) (definitions.MuteTimeIntervalExportHcl, error) {
+	result := definitions.MuteTimeIntervalExportHcl{}
+	j := jsoniter.ConfigCompatibleWithStandardLibrary
+	mdata, err := j.Marshal(m)
+	if err != nil {
+		return result, err
+	}
+	err = j.Unmarshal(mdata, &result)
+	return result, err
+}
+
+// AlertRuleNotificationSettingsFromNotificationSettings converts []models.NotificationSettings to definitions.AlertRuleNotificationSettings
+func AlertRuleNotificationSettingsFromNotificationSettings(ns []models.NotificationSettings) *definitions.AlertRuleNotificationSettings {
+	if len(ns) == 0 {
+		return nil
+	}
+	m := ns[0]
+	return &definitions.AlertRuleNotificationSettings{
+		Receiver:          m.Receiver,
+		GroupBy:           m.GroupBy,
+		GroupWait:         m.GroupWait,
+		GroupInterval:     m.GroupInterval,
+		RepeatInterval:    m.RepeatInterval,
+		MuteTimeIntervals: m.MuteTimeIntervals,
+	}
+}
+
+// AlertRuleNotificationSettingsFromNotificationSettings converts []models.NotificationSettings to definitions.AlertRuleNotificationSettingsExport
+func AlertRuleNotificationSettingsExportFromNotificationSettings(ns []models.NotificationSettings) *definitions.AlertRuleNotificationSettingsExport {
+	if len(ns) == 0 {
+		return nil
+	}
+	m := ns[0]
+
+	toStringIfNotNil := func(d *model.Duration) *string {
+		if d == nil {
+			return nil
+		}
+		s := d.String()
+		return &s
+	}
+
+	return &definitions.AlertRuleNotificationSettingsExport{
+		Receiver:          m.Receiver,
+		GroupBy:           m.GroupBy,
+		GroupWait:         toStringIfNotNil(m.GroupWait),
+		GroupInterval:     toStringIfNotNil(m.GroupInterval),
+		RepeatInterval:    toStringIfNotNil(m.RepeatInterval),
+		MuteTimeIntervals: m.MuteTimeIntervals,
+	}
+}
+
+// NotificationSettingsFromAlertRuleNotificationSettings converts definitions.AlertRuleNotificationSettings to []models.NotificationSettings
+func NotificationSettingsFromAlertRuleNotificationSettings(ns *definitions.AlertRuleNotificationSettings) []models.NotificationSettings {
+	if ns == nil {
+		return nil
+	}
+	return []models.NotificationSettings{
+		{
+			Receiver:          ns.Receiver,
+			GroupBy:           ns.GroupBy,
+			GroupWait:         ns.GroupWait,
+			GroupInterval:     ns.GroupInterval,
+			RepeatInterval:    ns.RepeatInterval,
+			MuteTimeIntervals: ns.MuteTimeIntervals,
+		},
+	}
+}
diff --git a/pkg/services/ngalert/api/errors.go b/pkg/services/ngalert/api/errors.go
index 86cb7b04c6617..1e9dd272b247c 100644
--- a/pkg/services/ngalert/api/errors.go
+++ b/pkg/services/ngalert/api/errors.go
@@ -7,6 +7,7 @@ import (
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/util/errutil"
 )
 
 var (
@@ -28,15 +29,15 @@ func backendTypeDoesNotMatchPayloadTypeError(backendType apimodels.Backend, payl
 }
 
 func errorToResponse(err error) response.Response {
+	if errors.As(err, &errutil.Error{}) {
+		return response.Err(err)
+	}
 	if errors.Is(err, datasources.ErrDataSourceNotFound) {
 		return ErrResp(404, err, "")
 	}
 	if errors.Is(err, errUnexpectedDatasourceType) {
 		return ErrResp(400, err, "")
 	}
-	if errors.Is(err, ErrAuthorization) {
-		return ErrResp(401, err, "")
-	}
 	if errors.Is(err, errFolderAccess) {
 		return toNamespaceErrorResponse(err)
 	}
diff --git a/pkg/services/ngalert/api/generated_base_api_notifications.go b/pkg/services/ngalert/api/generated_base_api_notifications.go
new file mode 100644
index 0000000000000..17b82056b7d93
--- /dev/null
+++ b/pkg/services/ngalert/api/generated_base_api_notifications.go
@@ -0,0 +1,96 @@
+/*Package api contains base API implementation of unified alerting
+ *
+ *Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ *
+ *Do not manually edit these files, please find ngalert/api/swagger-codegen/ for commands on how to generate them.
+ */
+package api
+
+import (
+	"net/http"
+
+	"github.com/grafana/grafana/pkg/api/response"
+	"github.com/grafana/grafana/pkg/api/routing"
+	"github.com/grafana/grafana/pkg/middleware"
+	"github.com/grafana/grafana/pkg/middleware/requestmeta"
+	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
+	"github.com/grafana/grafana/pkg/web"
+)
+
+type NotificationsApi interface {
+	RouteGetReceiver(*contextmodel.ReqContext) response.Response
+	RouteGetReceivers(*contextmodel.ReqContext) response.Response
+	RouteNotificationsGetTimeInterval(*contextmodel.ReqContext) response.Response
+	RouteNotificationsGetTimeIntervals(*contextmodel.ReqContext) response.Response
+}
+
+func (f *NotificationsApiHandler) RouteGetReceiver(ctx *contextmodel.ReqContext) response.Response {
+	// Parse Path Parameters
+	nameParam := web.Params(ctx.Req)[":name"]
+	return f.handleRouteGetReceiver(ctx, nameParam)
+}
+func (f *NotificationsApiHandler) RouteGetReceivers(ctx *contextmodel.ReqContext) response.Response {
+	return f.handleRouteGetReceivers(ctx)
+}
+func (f *NotificationsApiHandler) RouteNotificationsGetTimeInterval(ctx *contextmodel.ReqContext) response.Response {
+	// Parse Path Parameters
+	nameParam := web.Params(ctx.Req)[":name"]
+	return f.handleRouteNotificationsGetTimeInterval(ctx, nameParam)
+}
+func (f *NotificationsApiHandler) RouteNotificationsGetTimeIntervals(ctx *contextmodel.ReqContext) response.Response {
+	return f.handleRouteNotificationsGetTimeIntervals(ctx)
+}
+
+func (api *API) RegisterNotificationsApiEndpoints(srv NotificationsApi, m *metrics.API) {
+	api.RouteRegister.Group("", func(group routing.RouteRegister) {
+		group.Get(
+			toMacaronPath("/api/v1/notifications/receivers/{Name}"),
+			requestmeta.SetOwner(requestmeta.TeamAlerting),
+			requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow),
+			api.authorize(http.MethodGet, "/api/v1/notifications/receivers/{Name}"),
+			metrics.Instrument(
+				http.MethodGet,
+				"/api/v1/notifications/receivers/{Name}",
+				api.Hooks.Wrap(srv.RouteGetReceiver),
+				m,
+			),
+		)
+		group.Get(
+			toMacaronPath("/api/v1/notifications/receivers"),
+			requestmeta.SetOwner(requestmeta.TeamAlerting),
+			requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow),
+			api.authorize(http.MethodGet, "/api/v1/notifications/receivers"),
+			metrics.Instrument(
+				http.MethodGet,
+				"/api/v1/notifications/receivers",
+				api.Hooks.Wrap(srv.RouteGetReceivers),
+				m,
+			),
+		)
+		group.Get(
+			toMacaronPath("/api/v1/notifications/time-intervals/{name}"),
+			requestmeta.SetOwner(requestmeta.TeamAlerting),
+			requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow),
+			api.authorize(http.MethodGet, "/api/v1/notifications/time-intervals/{name}"),
+			metrics.Instrument(
+				http.MethodGet,
+				"/api/v1/notifications/time-intervals/{name}",
+				api.Hooks.Wrap(srv.RouteNotificationsGetTimeInterval),
+				m,
+			),
+		)
+		group.Get(
+			toMacaronPath("/api/v1/notifications/time-intervals"),
+			requestmeta.SetOwner(requestmeta.TeamAlerting),
+			requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow),
+			api.authorize(http.MethodGet, "/api/v1/notifications/time-intervals"),
+			metrics.Instrument(
+				http.MethodGet,
+				"/api/v1/notifications/time-intervals",
+				api.Hooks.Wrap(srv.RouteNotificationsGetTimeIntervals),
+				m,
+			),
+		)
+	}, middleware.ReqSignedIn)
+}
diff --git a/pkg/services/ngalert/api/generated_base_api_provisioning.go b/pkg/services/ngalert/api/generated_base_api_provisioning.go
index e931284ea1360..202d643a11d4f 100644
--- a/pkg/services/ngalert/api/generated_base_api_provisioning.go
+++ b/pkg/services/ngalert/api/generated_base_api_provisioning.go
@@ -21,9 +21,12 @@ import (
 
 type ProvisioningApi interface {
 	RouteDeleteAlertRule(*contextmodel.ReqContext) response.Response
+	RouteDeleteAlertRuleGroup(*contextmodel.ReqContext) response.Response
 	RouteDeleteContactpoints(*contextmodel.ReqContext) response.Response
 	RouteDeleteMuteTiming(*contextmodel.ReqContext) response.Response
 	RouteDeleteTemplate(*contextmodel.ReqContext) response.Response
+	RouteExportMuteTiming(*contextmodel.ReqContext) response.Response
+	RouteExportMuteTimings(*contextmodel.ReqContext) response.Response
 	RouteGetAlertRule(*contextmodel.ReqContext) response.Response
 	RouteGetAlertRuleExport(*contextmodel.ReqContext) response.Response
 	RouteGetAlertRuleGroup(*contextmodel.ReqContext) response.Response
@@ -55,6 +58,12 @@ func (f *ProvisioningApiHandler) RouteDeleteAlertRule(ctx *contextmodel.ReqConte
 	uIDParam := web.Params(ctx.Req)[":UID"]
 	return f.handleRouteDeleteAlertRule(ctx, uIDParam)
 }
+func (f *ProvisioningApiHandler) RouteDeleteAlertRuleGroup(ctx *contextmodel.ReqContext) response.Response {
+	// Parse Path Parameters
+	folderUIDParam := web.Params(ctx.Req)[":FolderUID"]
+	groupParam := web.Params(ctx.Req)[":Group"]
+	return f.handleRouteDeleteAlertRuleGroup(ctx, folderUIDParam, groupParam)
+}
 func (f *ProvisioningApiHandler) RouteDeleteContactpoints(ctx *contextmodel.ReqContext) response.Response {
 	// Parse Path Parameters
 	uIDParam := web.Params(ctx.Req)[":UID"]
@@ -70,6 +79,14 @@ func (f *ProvisioningApiHandler) RouteDeleteTemplate(ctx *contextmodel.ReqContex
 	nameParam := web.Params(ctx.Req)[":name"]
 	return f.handleRouteDeleteTemplate(ctx, nameParam)
 }
+func (f *ProvisioningApiHandler) RouteExportMuteTiming(ctx *contextmodel.ReqContext) response.Response {
+	// Parse Path Parameters
+	nameParam := web.Params(ctx.Req)[":name"]
+	return f.handleRouteExportMuteTiming(ctx, nameParam)
+}
+func (f *ProvisioningApiHandler) RouteExportMuteTimings(ctx *contextmodel.ReqContext) response.Response {
+	return f.handleRouteExportMuteTimings(ctx)
+}
 func (f *ProvisioningApiHandler) RouteGetAlertRule(ctx *contextmodel.ReqContext) response.Response {
 	// Parse Path Parameters
 	uIDParam := web.Params(ctx.Req)[":UID"]
@@ -227,6 +244,18 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 				m,
 			),
 		)
+		group.Delete(
+			toMacaronPath("/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}"),
+			requestmeta.SetOwner(requestmeta.TeamAlerting),
+			requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow),
+			api.authorize(http.MethodDelete, "/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}"),
+			metrics.Instrument(
+				http.MethodDelete,
+				"/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}",
+				api.Hooks.Wrap(srv.RouteDeleteAlertRuleGroup),
+				m,
+			),
+		)
 		group.Delete(
 			toMacaronPath("/api/v1/provisioning/contact-points/{UID}"),
 			requestmeta.SetOwner(requestmeta.TeamAlerting),
@@ -263,6 +292,30 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApi, m *metrics
 				m,
 			),
 		)
+		group.Get(
+			toMacaronPath("/api/v1/provisioning/mute-timings/{name}/export"),
+			requestmeta.SetOwner(requestmeta.TeamAlerting),
+			requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow),
+			api.authorize(http.MethodGet, "/api/v1/provisioning/mute-timings/{name}/export"),
+			metrics.Instrument(
+				http.MethodGet,
+				"/api/v1/provisioning/mute-timings/{name}/export",
+				api.Hooks.Wrap(srv.RouteExportMuteTiming),
+				m,
+			),
+		)
+		group.Get(
+			toMacaronPath("/api/v1/provisioning/mute-timings/export"),
+			requestmeta.SetOwner(requestmeta.TeamAlerting),
+			requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow),
+			api.authorize(http.MethodGet, "/api/v1/provisioning/mute-timings/export"),
+			metrics.Instrument(
+				http.MethodGet,
+				"/api/v1/provisioning/mute-timings/export",
+				api.Hooks.Wrap(srv.RouteExportMuteTimings),
+				m,
+			),
+		)
 		group.Get(
 			toMacaronPath("/api/v1/provisioning/alert-rules/{UID}"),
 			requestmeta.SetOwner(requestmeta.TeamAlerting),
diff --git a/pkg/services/ngalert/api/generated_base_api_ruler.go b/pkg/services/ngalert/api/generated_base_api_ruler.go
index cd98a6b55bc7e..6c496e3137530 100644
--- a/pkg/services/ngalert/api/generated_base_api_ruler.go
+++ b/pkg/services/ngalert/api/generated_base_api_ruler.go
@@ -252,6 +252,7 @@ func (api *API) RegisterRulerApiEndpoints(srv RulerApi, m *metrics.API) {
 		group.Get(
 			toMacaronPath("/api/ruler/grafana/api/v1/export/rules"),
 			requestmeta.SetOwner(requestmeta.TeamAlerting),
+			requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow),
 			api.authorize(http.MethodGet, "/api/ruler/grafana/api/v1/export/rules"),
 			metrics.Instrument(
 				http.MethodGet,
@@ -287,6 +288,7 @@ func (api *API) RegisterRulerApiEndpoints(srv RulerApi, m *metrics.API) {
 		group.Post(
 			toMacaronPath("/api/ruler/grafana/api/v1/rules/{Namespace}/export"),
 			requestmeta.SetOwner(requestmeta.TeamAlerting),
+			requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow),
 			api.authorize(http.MethodPost, "/api/ruler/grafana/api/v1/rules/{Namespace}/export"),
 			metrics.Instrument(
 				http.MethodPost,
diff --git a/pkg/services/ngalert/api/hooks.go b/pkg/services/ngalert/api/hooks.go
index c90e23ec74e2a..663b886a0d0dd 100644
--- a/pkg/services/ngalert/api/hooks.go
+++ b/pkg/services/ngalert/api/hooks.go
@@ -1,6 +1,10 @@
 package api
 
 import (
+	"net/http"
+	"net/url"
+
+	"github.com/gorilla/mux"
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/infra/log"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
@@ -9,24 +13,40 @@ import (
 type RequestHandlerFunc func(*contextmodel.ReqContext) response.Response
 
 type Hooks struct {
-	logger log.Logger
-	hooks  map[string]RequestHandlerFunc
+	logger     log.Logger
+	router     *mux.Router
+	routeHooks map[*mux.Route]RequestHandlerFunc
 }
 
 // NewHooks creates an empty set of request handler hooks. Hooks can be used
 // to replace handlers for specific paths.
 func NewHooks(logger log.Logger) *Hooks {
 	return &Hooks{
-		logger: logger,
-		hooks:  make(map[string]RequestHandlerFunc),
+		logger:     logger,
+		router:     mux.NewRouter(),
+		routeHooks: make(map[*mux.Route]RequestHandlerFunc),
 	}
 }
 
 // Add creates a new request hook for a path, causing requests to the path to
 // be handled by the hook function, and not the original handler.
-func (h *Hooks) Set(path string, hook RequestHandlerFunc) {
+func (h *Hooks) Set(method string, path string, hook RequestHandlerFunc) {
 	h.logger.Info("Setting hook override for the specified route", "path", path)
-	h.hooks[path] = hook
+	route := h.router.NewRoute().Path(path).Methods(method)
+	h.routeHooks[route] = hook
+}
+
+// Get returns a hook if one is defined for the matching URL.
+// Get also returns a bool indicating whether or not a matching hook exists.
+func (h *Hooks) Get(method string, url *url.URL) (RequestHandlerFunc, bool) {
+	req := http.Request{Method: method, URL: url}
+
+	match := mux.RouteMatch{}
+	if ok := h.router.Match(&req, &match); ok {
+		return h.routeHooks[match.Route], ok
+	}
+
+	return nil, false
 }
 
 // Wrap returns a new handler which will intercept paths with hooks configured,
@@ -34,7 +54,7 @@ func (h *Hooks) Set(path string, hook RequestHandlerFunc) {
 // then the given handler is invoked.
 func (h *Hooks) Wrap(next RequestHandlerFunc) RequestHandlerFunc {
 	return func(req *contextmodel.ReqContext) response.Response {
-		if hook, ok := h.hooks[req.Context.Req.URL.Path]; ok {
+		if hook, ok := h.Get(req.Context.Req.Method, req.Context.Req.URL); ok {
 			h.logger.Debug("Hook defined - invoking new handler", "path", req.Context.Req.URL.Path)
 			return hook(req)
 		}
diff --git a/pkg/services/ngalert/api/hooks_test.go b/pkg/services/ngalert/api/hooks_test.go
new file mode 100644
index 0000000000000..6e9b04b10e139
--- /dev/null
+++ b/pkg/services/ngalert/api/hooks_test.go
@@ -0,0 +1,144 @@
+package api
+
+import (
+	"net/http"
+	"net/url"
+	"testing"
+
+	"github.com/grafana/grafana/pkg/api/response"
+	"github.com/grafana/grafana/pkg/infra/log"
+	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/web"
+	"github.com/stretchr/testify/require"
+)
+
+func TestHooks(t *testing.T) {
+	t.Run("Hooks", func(t *testing.T) {
+		t.Run("yields handlers for paths with hooks", func(t *testing.T) {
+			hooks := NewHooks(log.NewNopLogger())
+			invoked := false
+			hook := func(*contextmodel.ReqContext) response.Response { invoked = true; return nil }
+
+			hooks.Set("GET", "/some/path", hook)
+			reqURL, _ := url.Parse("http://domain.test/some/path")
+			handler, ok := hooks.Get("GET", reqURL)
+
+			require.True(t, ok, "hooks did not contain a matching hook for path")
+			require.False(t, invoked, "hook was invoked earlier than expected")
+			handler(nil)
+			require.True(t, invoked, "the hook returned by get() was not invoked as expected")
+		})
+
+		t.Run("yields no handlers for paths without hooks", func(t *testing.T) {
+			hooks := NewHooks(log.NewNopLogger())
+			hook := func(*contextmodel.ReqContext) response.Response { return nil }
+
+			hooks.Set("GET", "/some/path", hook)
+			reqURL, _ := url.Parse("http://domain.test/does/not/match")
+			handler, ok := hooks.Get("GET", reqURL)
+
+			require.False(t, ok, "hooks returned a hook when we expected it not to")
+			require.Nil(t, handler)
+		})
+
+		t.Run("hooks do not match routes with additional subpaths", func(t *testing.T) {
+			hooks := NewHooks(log.NewNopLogger())
+			hook := func(*contextmodel.ReqContext) response.Response { return nil }
+
+			hooks.Set("GET", "/some/path", hook)
+			reqURL, _ := url.Parse("http://domain.test/some/path/with/more")
+			handler, ok := hooks.Get("GET", reqURL)
+
+			require.False(t, ok, "hooks returned a hook when we expected it not to")
+			require.Nil(t, handler)
+		})
+
+		t.Run("hooks do not match requests with the wrong HTTP method", func(t *testing.T) {
+			hooks := NewHooks(log.NewNopLogger())
+			hook := func(*contextmodel.ReqContext) response.Response { return nil }
+
+			hooks.Set("POST", "/some/path", hook)
+			reqURL, _ := url.Parse("http://domain.test/some/path")
+			handler, ok := hooks.Get("GET", reqURL)
+
+			require.False(t, ok, "hooks returned a hook when we expected it not to")
+			require.Nil(t, handler)
+		})
+
+		t.Run("hooks match routes with query parameters", func(t *testing.T) {
+			hooks := NewHooks(log.NewNopLogger())
+			invoked := false
+			hook := func(*contextmodel.ReqContext) response.Response { invoked = true; return nil }
+
+			hooks.Set("GET", "/some/path", hook)
+			reqURL, _ := url.Parse("http://domain.test/some/path?query=param")
+			handler, ok := hooks.Get("GET", reqURL)
+
+			require.True(t, ok, "hooks did not contain a matching hook for path")
+			require.False(t, invoked, "hook was invoked earlier than expected")
+			handler(nil)
+			require.True(t, invoked, "the hook returned by get() was not invoked as expected")
+		})
+
+		t.Run("hooks match routes with path variables", func(t *testing.T) {
+			hooks := NewHooks(log.NewNopLogger())
+			invoked := false
+			hook := func(*contextmodel.ReqContext) response.Response { invoked = true; return nil }
+
+			hooks.Set("GET", "/some/{value}", hook)
+			reqURL, _ := url.Parse("http://domain.test/some/123")
+			handler, ok := hooks.Get("GET", reqURL)
+
+			require.True(t, ok, "hooks did not contain a matching hook for path")
+			require.False(t, invoked, "hook was invoked earlier than expected")
+			handler(nil)
+			require.True(t, invoked, "the hook returned by get() was not invoked as expected")
+		})
+	})
+
+	t.Run("Wrap", func(t *testing.T) {
+		t.Run("invokes hooks if one is defined", func(t *testing.T) {
+			defaultInvoked := false
+			defaultHandler := func(*contextmodel.ReqContext) response.Response { defaultInvoked = true; return nil }
+			hookInvoked := false
+			hookHandler := func(*contextmodel.ReqContext) response.Response { hookInvoked = true; return nil }
+			hooks := NewHooks(log.NewNopLogger())
+			hooks.Set("GET", "/some/path", hookHandler)
+
+			composed := hooks.Wrap(defaultHandler)
+			req := createReqForTests("GET", "http://domain.test/some/path")
+			composed(req)
+
+			require.True(t, hookInvoked, "hook was expected to be invoked, but it was not")
+			require.False(t, defaultInvoked, "default handler was invoked, but it should not have been")
+		})
+
+		t.Run("does not invoke hooks if path has none defined", func(t *testing.T) {
+			defaultInvoked := false
+			defaultHandler := func(*contextmodel.ReqContext) response.Response { defaultInvoked = true; return nil }
+			hookInvoked := false
+			hookHandler := func(*contextmodel.ReqContext) response.Response { hookInvoked = true; return nil }
+			hooks := NewHooks(log.NewNopLogger())
+			hooks.Set("GET", "/some/path", hookHandler)
+
+			composed := hooks.Wrap(defaultHandler)
+			req := createReqForTests("GET", "http://domain.test/does/not/match")
+			composed(req)
+
+			require.False(t, hookInvoked, "hook was invoked, but it should not have been")
+			require.True(t, defaultInvoked, "default handler was expected to be invoked, but it was not")
+		})
+	})
+}
+
+func createReqForTests(method, setupURL string) *contextmodel.ReqContext {
+	reqURL, _ := url.Parse(setupURL)
+	return &contextmodel.ReqContext{
+		Context: &web.Context{
+			Req: &http.Request{
+				Method: method,
+				URL:    reqURL,
+			},
+		},
+	}
+}
diff --git a/pkg/services/ngalert/api/lotex_ruler.go b/pkg/services/ngalert/api/lotex_ruler.go
index 4e0100304cc83..bcffe81c63f69 100644
--- a/pkg/services/ngalert/api/lotex_ruler.go
+++ b/pkg/services/ngalert/api/lotex_ruler.go
@@ -3,6 +3,7 @@ package api
 import (
 	"bytes"
 	"fmt"
+	"io"
 	"net/http"
 	"net/url"
 
@@ -43,15 +44,22 @@ var subtypeToPrefix = map[string]string{
 	Mimir:      mimirPrefix,
 }
 
+// The requester is primarily used for testing purposes, allowing us to inject a different implementation of withReq.
+type requester interface {
+	withReq(ctx *contextmodel.ReqContext, method string, u *url.URL, body io.Reader, extractor func(*response.NormalResponse) (any, error), headers map[string]string) response.Response
+}
+
 type LotexRuler struct {
 	log log.Logger
 	*AlertingProxy
+	requester requester
 }
 
 func NewLotexRuler(proxy *AlertingProxy, log log.Logger) *LotexRuler {
 	return &LotexRuler{
 		log:           log,
 		AlertingProxy: proxy,
+		requester:     proxy,
 	}
 }
 
@@ -60,12 +68,12 @@ func (r *LotexRuler) RouteDeleteNamespaceRulesConfig(ctx *contextmodel.ReqContex
 	if err != nil {
 		return ErrResp(500, err, "")
 	}
-	return r.withReq(
+	return r.requester.withReq(
 		ctx,
 		http.MethodDelete,
 		withPath(
 			*ctx.Req.URL,
-			fmt.Sprintf("%s/%s", legacyRulerPrefix, namespace),
+			fmt.Sprintf("%s/%s", legacyRulerPrefix, url.PathEscape(namespace)),
 		),
 		nil,
 		messageExtractor,
@@ -78,7 +86,7 @@ func (r *LotexRuler) RouteDeleteRuleGroupConfig(ctx *contextmodel.ReqContext, na
 	if err != nil {
 		return ErrResp(500, err, "")
 	}
-	return r.withReq(
+	return r.requester.withReq(
 		ctx,
 		http.MethodDelete,
 		withPath(
@@ -86,8 +94,8 @@ func (r *LotexRuler) RouteDeleteRuleGroupConfig(ctx *contextmodel.ReqContext, na
 			fmt.Sprintf(
 				"%s/%s/%s",
 				legacyRulerPrefix,
-				namespace,
-				group,
+				url.PathEscape(namespace),
+				url.PathEscape(group),
 			),
 		),
 		nil,
@@ -101,7 +109,7 @@ func (r *LotexRuler) RouteGetNamespaceRulesConfig(ctx *contextmodel.ReqContext,
 	if err != nil {
 		return ErrResp(500, err, "")
 	}
-	return r.withReq(
+	return r.requester.withReq(
 		ctx,
 		http.MethodGet,
 		withPath(
@@ -109,7 +117,7 @@ func (r *LotexRuler) RouteGetNamespaceRulesConfig(ctx *contextmodel.ReqContext,
 			fmt.Sprintf(
 				"%s/%s",
 				legacyRulerPrefix,
-				namespace,
+				url.PathEscape(namespace),
 			),
 		),
 		nil,
@@ -123,7 +131,7 @@ func (r *LotexRuler) RouteGetRulegGroupConfig(ctx *contextmodel.ReqContext, name
 	if err != nil {
 		return ErrResp(500, err, "")
 	}
-	return r.withReq(
+	return r.requester.withReq(
 		ctx,
 		http.MethodGet,
 		withPath(
@@ -131,8 +139,8 @@ func (r *LotexRuler) RouteGetRulegGroupConfig(ctx *contextmodel.ReqContext, name
 			fmt.Sprintf(
 				"%s/%s/%s",
 				legacyRulerPrefix,
-				namespace,
-				group,
+				url.PathEscape(namespace),
+				url.PathEscape(group),
 			),
 		),
 		nil,
@@ -147,7 +155,7 @@ func (r *LotexRuler) RouteGetRulesConfig(ctx *contextmodel.ReqContext) response.
 		return ErrResp(500, err, "")
 	}
 
-	return r.withReq(
+	return r.requester.withReq(
 		ctx,
 		http.MethodGet,
 		withPath(
@@ -170,7 +178,7 @@ func (r *LotexRuler) RoutePostNameRulesConfig(ctx *contextmodel.ReqContext, conf
 		return ErrResp(500, err, "Failed marshal rule group")
 	}
 	u := withPath(*ctx.Req.URL, fmt.Sprintf("%s/%s", legacyRulerPrefix, ns))
-	return r.withReq(ctx, http.MethodPost, u, bytes.NewBuffer(yml), jsonExtractor(nil), nil)
+	return r.requester.withReq(ctx, http.MethodPost, u, bytes.NewBuffer(yml), jsonExtractor(nil), nil)
 }
 
 func (r *LotexRuler) validateAndGetPrefix(ctx *contextmodel.ReqContext) (string, error) {
@@ -216,7 +224,8 @@ func (r *LotexRuler) validateAndGetPrefix(ctx *contextmodel.ReqContext) (string,
 }
 
 func withPath(u url.URL, newPath string) *url.URL {
-	// TODO: handle path escaping
-	u.Path = newPath
+	u.Path, _ = url.PathUnescape(newPath)
+	u.RawPath = newPath
+
 	return &u
 }
diff --git a/pkg/services/ngalert/api/lotex_ruler_test.go b/pkg/services/ngalert/api/lotex_ruler_test.go
index 661377d68f325..c54272e9953ee 100644
--- a/pkg/services/ngalert/api/lotex_ruler_test.go
+++ b/pkg/services/ngalert/api/lotex_ruler_test.go
@@ -3,11 +3,15 @@ package api
 import (
 	"context"
 	"errors"
+	"io"
 	"net/http"
+	"net/url"
 	"testing"
 
+	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
@@ -129,3 +133,262 @@ func (f fakeCacheService) GetDatasourceByUID(ctx context.Context, datasourceUID
 
 	return f.datasource, nil
 }
+
+func TestLotexRuler_RouteDeleteNamespaceRulesConfig(t *testing.T) {
+	tc := []struct {
+		name        string
+		namespace   string
+		expected    string
+		urlParams   string
+		namedParams map[string]string
+		datasource  *datasources.DataSource
+	}{
+		{
+			name:        "with a namespace that has to be escaped",
+			namespace:   "namespace/with/slashes",
+			expected:    "http://mimir.com/config/v1/rules/namespace%2Fwith%2Fslashes?subtype=mimir",
+			urlParams:   "?subtype=mimir",
+			namedParams: map[string]string{":DatasourceUID": "d164"},
+			datasource:  &datasources.DataSource{URL: "http://mimir.com", Type: PrometheusDatasourceType},
+		},
+		{
+			name:        "with a namespace that does not need to be escaped",
+			namespace:   "namespace_without_slashes",
+			expected:    "http://mimir.com/config/v1/rules/namespace_without_slashes?subtype=mimir",
+			urlParams:   "?subtype=mimir",
+			namedParams: map[string]string{":DatasourceUID": "d164"},
+			datasource:  &datasources.DataSource{URL: "http://mimir.com", Type: PrometheusDatasourceType},
+		},
+	}
+
+	for _, tt := range tc {
+		t.Run(tt.name, func(t *testing.T) {
+			requestMock := RequestMock{}
+			defer requestMock.AssertExpectations(t)
+
+			requestMock.On(
+				"withReq",
+				mock.Anything,
+				mock.Anything,
+				mock.AnythingOfType("*url.URL"),
+				mock.Anything,
+				mock.Anything,
+				mock.Anything,
+			).Return(response.Empty(200)).Run(func(args mock.Arguments) {
+				// Validate that the full url as string is equal to the expected value
+				require.Equal(t, tt.expected, args.Get(2).(*url.URL).String())
+			})
+
+			// Setup Proxy.
+			proxy := &AlertingProxy{DataProxy: &datasourceproxy.DataSourceProxyService{DataSourceCache: fakeCacheService{datasource: tt.datasource}}}
+			ruler := &LotexRuler{AlertingProxy: proxy, log: log.NewNopLogger(), requester: &requestMock}
+
+			// Setup request context.
+			httpReq, err := http.NewRequest(http.MethodGet, tt.datasource.URL+tt.urlParams, nil)
+			require.NoError(t, err)
+			ctx := &contextmodel.ReqContext{Context: &web.Context{Req: web.SetURLParams(httpReq, tt.namedParams)}}
+
+			ruler.RouteDeleteNamespaceRulesConfig(ctx, tt.namespace)
+		})
+	}
+}
+
+func TestLotexRuler_RouteDeleteRuleGroupConfig(t *testing.T) {
+	tc := []struct {
+		name        string
+		namespace   string
+		group       string
+		expected    string
+		urlParams   string
+		namedParams map[string]string
+		datasource  *datasources.DataSource
+	}{
+		{
+			name:        "with a namespace that has to be escaped",
+			namespace:   "namespace/with/slashes",
+			group:       "group/with/slashes",
+			expected:    "http://mimir.com/config/v1/rules/namespace%2Fwith%2Fslashes/group%2Fwith%2Fslashes?subtype=mimir",
+			urlParams:   "?subtype=mimir",
+			namedParams: map[string]string{":DatasourceUID": "d164"},
+			datasource:  &datasources.DataSource{URL: "http://mimir.com", Type: PrometheusDatasourceType},
+		},
+		{
+			name:        "with a namespace that does not need to be escaped",
+			namespace:   "namespace_without_slashes",
+			group:       "group_without_slashes",
+			expected:    "http://mimir.com/config/v1/rules/namespace_without_slashes/group_without_slashes?subtype=mimir",
+			urlParams:   "?subtype=mimir",
+			namedParams: map[string]string{":DatasourceUID": "d164"},
+			datasource:  &datasources.DataSource{URL: "http://mimir.com", Type: PrometheusDatasourceType},
+		},
+	}
+
+	for _, tt := range tc {
+		t.Run(tt.name, func(t *testing.T) {
+			requestMock := RequestMock{}
+			defer requestMock.AssertExpectations(t)
+
+			requestMock.On(
+				"withReq",
+				mock.Anything,
+				mock.Anything,
+				mock.AnythingOfType("*url.URL"),
+				mock.Anything,
+				mock.Anything,
+				mock.Anything,
+			).Return(response.Empty(200)).Run(func(args mock.Arguments) {
+				// Validate that the full url as string is equal to the expected value
+				require.Equal(t, tt.expected, args.Get(2).(*url.URL).String())
+			})
+
+			// Setup Proxy.
+			proxy := &AlertingProxy{DataProxy: &datasourceproxy.DataSourceProxyService{DataSourceCache: fakeCacheService{datasource: tt.datasource}}}
+			ruler := &LotexRuler{AlertingProxy: proxy, log: log.NewNopLogger(), requester: &requestMock}
+
+			// Setup request context.
+			httpReq, err := http.NewRequest(http.MethodGet, tt.datasource.URL+tt.urlParams, nil)
+			require.NoError(t, err)
+			ctx := &contextmodel.ReqContext{Context: &web.Context{Req: web.SetURLParams(httpReq, tt.namedParams)}}
+
+			ruler.RouteDeleteRuleGroupConfig(ctx, tt.namespace, tt.group)
+		})
+	}
+}
+
+func TestLotexRuler_RouteGetNamespaceRulesConfig(t *testing.T) {
+	tc := []struct {
+		name        string
+		namespace   string
+		group       string
+		expected    string
+		urlParams   string
+		namedParams map[string]string
+		datasource  *datasources.DataSource
+	}{
+		{
+			name:        "with a namespace that has to be escaped",
+			namespace:   "namespace/with/slashes",
+			expected:    "http://mimir.com/config/v1/rules/namespace%2Fwith%2Fslashes?subtype=mimir",
+			urlParams:   "?subtype=mimir",
+			namedParams: map[string]string{":DatasourceUID": "d164"},
+			datasource:  &datasources.DataSource{URL: "http://mimir.com", Type: PrometheusDatasourceType},
+		},
+		{
+			name:        "with a namespace that does not need to be escaped",
+			namespace:   "namespace_without_slashes",
+			expected:    "http://mimir.com/config/v1/rules/namespace_without_slashes?subtype=mimir",
+			urlParams:   "?subtype=mimir",
+			namedParams: map[string]string{":DatasourceUID": "d164"},
+			datasource:  &datasources.DataSource{URL: "http://mimir.com", Type: PrometheusDatasourceType},
+		},
+	}
+
+	for _, tt := range tc {
+		t.Run(tt.name, func(t *testing.T) {
+			requestMock := RequestMock{}
+			defer requestMock.AssertExpectations(t)
+
+			requestMock.On(
+				"withReq",
+				mock.Anything,
+				mock.Anything,
+				mock.AnythingOfType("*url.URL"),
+				mock.Anything,
+				mock.Anything,
+				mock.Anything,
+			).Return(response.Empty(200)).Run(func(args mock.Arguments) {
+				// Validate that the full url as string is equal to the expected value
+				require.Equal(t, tt.expected, args.Get(2).(*url.URL).String())
+			})
+
+			// Setup Proxy.
+			proxy := &AlertingProxy{DataProxy: &datasourceproxy.DataSourceProxyService{DataSourceCache: fakeCacheService{datasource: tt.datasource}}}
+			ruler := &LotexRuler{AlertingProxy: proxy, log: log.NewNopLogger(), requester: &requestMock}
+
+			// Setup request context.
+			httpReq, err := http.NewRequest(http.MethodGet, tt.datasource.URL+tt.urlParams, nil)
+			require.NoError(t, err)
+			ctx := &contextmodel.ReqContext{Context: &web.Context{Req: web.SetURLParams(httpReq, tt.namedParams)}}
+
+			ruler.RouteGetNamespaceRulesConfig(ctx, tt.namespace)
+		})
+	}
+}
+
+func TestLotexRuler_RouteGetRulegGroupConfig(t *testing.T) {
+	tc := []struct {
+		name        string
+		namespace   string
+		group       string
+		expected    string
+		urlParams   string
+		namedParams map[string]string
+		datasource  *datasources.DataSource
+	}{
+		{
+			name:        "with a namespace that has to be escaped",
+			namespace:   "namespace/with/slashes",
+			group:       "group/with/slashes",
+			expected:    "http://mimir.com/config/v1/rules/namespace%2Fwith%2Fslashes/group%2Fwith%2Fslashes?subtype=mimir",
+			urlParams:   "?subtype=mimir",
+			namedParams: map[string]string{":DatasourceUID": "d164"},
+			datasource:  &datasources.DataSource{URL: "http://mimir.com", Type: PrometheusDatasourceType},
+		},
+		{
+			name:        "with a namespace that does not need to be escaped",
+			namespace:   "namespace_without_slashes",
+			group:       "group_without_slashes",
+			expected:    "http://mimir.com/config/v1/rules/namespace_without_slashes/group_without_slashes?subtype=mimir",
+			urlParams:   "?subtype=mimir",
+			namedParams: map[string]string{":DatasourceUID": "d164"},
+			datasource:  &datasources.DataSource{URL: "http://mimir.com", Type: PrometheusDatasourceType},
+		},
+	}
+
+	for _, tt := range tc {
+		t.Run(tt.name, func(t *testing.T) {
+			requestMock := RequestMock{}
+			defer requestMock.AssertExpectations(t)
+
+			requestMock.On(
+				"withReq",
+				mock.Anything,
+				mock.Anything,
+				mock.AnythingOfType("*url.URL"),
+				mock.Anything,
+				mock.Anything,
+				mock.Anything,
+			).Return(response.Empty(200)).Run(func(args mock.Arguments) {
+				// Validate that the full url as string is equal to the expected value
+				require.Equal(t, tt.expected, args.Get(2).(*url.URL).String())
+			})
+
+			// Setup Proxy.
+			proxy := &AlertingProxy{DataProxy: &datasourceproxy.DataSourceProxyService{DataSourceCache: fakeCacheService{datasource: tt.datasource}}}
+			ruler := &LotexRuler{AlertingProxy: proxy, log: log.NewNopLogger(), requester: &requestMock}
+
+			// Setup request context.
+			httpReq, err := http.NewRequest(http.MethodGet, tt.datasource.URL+tt.urlParams, nil)
+			require.NoError(t, err)
+			ctx := &contextmodel.ReqContext{Context: &web.Context{Req: web.SetURLParams(httpReq, tt.namedParams)}}
+
+			ruler.RouteGetRulegGroupConfig(ctx, tt.namespace, tt.group)
+		})
+	}
+}
+
+type RequestMock struct {
+	mock.Mock
+}
+
+func (a *RequestMock) withReq(
+	ctx *contextmodel.ReqContext,
+	method string,
+	u *url.URL,
+	body io.Reader,
+	extractor func(*response.NormalResponse) (any, error),
+	headers map[string]string,
+) response.Response {
+	args := a.Called(ctx, method, u, body, extractor, headers)
+	return args.Get(0).(response.Response)
+}
diff --git a/pkg/services/ngalert/api/notifications.go b/pkg/services/ngalert/api/notifications.go
new file mode 100644
index 0000000000000..5a189e00fddfb
--- /dev/null
+++ b/pkg/services/ngalert/api/notifications.go
@@ -0,0 +1,32 @@
+package api
+
+import (
+	"github.com/grafana/grafana/pkg/api/response"
+	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+)
+
+type NotificationsApiHandler struct {
+	notificationSrv *NotificationSrv
+}
+
+func NewNotificationsApi(notificationSrv *NotificationSrv) *NotificationsApiHandler {
+	return &NotificationsApiHandler{
+		notificationSrv: notificationSrv,
+	}
+}
+
+func (f *NotificationsApiHandler) handleRouteNotificationsGetTimeInterval(ctx *contextmodel.ReqContext, name string) response.Response {
+	return f.notificationSrv.RouteGetTimeInterval(ctx, name)
+}
+
+func (f *NotificationsApiHandler) handleRouteNotificationsGetTimeIntervals(ctx *contextmodel.ReqContext) response.Response {
+	return f.notificationSrv.RouteGetTimeIntervals(ctx)
+}
+
+func (f *NotificationsApiHandler) handleRouteGetReceiver(ctx *contextmodel.ReqContext, name string) response.Response {
+	return f.notificationSrv.RouteGetReceiver(ctx, name)
+}
+
+func (f *NotificationsApiHandler) handleRouteGetReceivers(ctx *contextmodel.ReqContext) response.Response {
+	return f.notificationSrv.RouteGetReceivers(ctx)
+}
diff --git a/pkg/services/ngalert/api/persist.go b/pkg/services/ngalert/api/persist.go
index b9ecfe20a890a..ebefb6e33abc9 100644
--- a/pkg/services/ngalert/api/persist.go
+++ b/pkg/services/ngalert/api/persist.go
@@ -3,16 +3,18 @@ package api
 import (
 	"context"
 
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/folder"
 	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
-	"github.com/grafana/grafana/pkg/services/user"
 )
 
 // RuleStore is the interface for persisting alert rules and instances
 type RuleStore interface {
-	GetUserVisibleNamespaces(context.Context, int64, *user.SignedInUser) (map[string]*folder.Folder, error)
-	GetNamespaceByTitle(context.Context, string, int64, *user.SignedInUser) (*folder.Folder, error)
-	GetNamespaceByUID(ctx context.Context, uid string, orgID int64, user *user.SignedInUser) (*folder.Folder, error)
+	// TODO after deprecating namespace_id field in GettableGrafanaRule we can simplify this interface
+	// by returning map[string]struct{} instead of map[string]*folder.Folder
+	GetUserVisibleNamespaces(context.Context, int64, identity.Requester) (map[string]*folder.Folder, error)
+	GetNamespaceByUID(ctx context.Context, uid string, orgID int64, user identity.Requester) (*folder.Folder, error)
+
 	GetAlertRulesGroupByRuleUID(ctx context.Context, query *ngmodels.GetAlertRulesGroupByRuleUIDQuery) ([]*ngmodels.AlertRule, error)
 	ListAlertRules(ctx context.Context, query *ngmodels.ListAlertRulesQuery) (ngmodels.RulesGroup, error)
 
@@ -23,7 +25,5 @@ type RuleStore interface {
 	DeleteAlertRulesByUID(ctx context.Context, orgID int64, ruleUID ...string) error
 
 	// IncreaseVersionForAllRulesInNamespace Increases version for all rules that have specified namespace. Returns all rules that belong to the namespace
-	IncreaseVersionForAllRulesInNamespace(ctx context.Context, orgID int64, namespaceUID string) ([]ngmodels.AlertRuleKeyWithVersionAndPauseStatus, error)
-
-	Count(ctx context.Context, orgID int64) (int64, error)
+	IncreaseVersionForAllRulesInNamespace(ctx context.Context, orgID int64, namespaceUID string) ([]ngmodels.AlertRuleKeyWithVersion, error)
 }
diff --git a/pkg/services/ngalert/api/provisioning.go b/pkg/services/ngalert/api/provisioning.go
index 7430b74d7d328..91d1a6da639ec 100644
--- a/pkg/services/ngalert/api/provisioning.go
+++ b/pkg/services/ngalert/api/provisioning.go
@@ -127,3 +127,15 @@ func (f *ProvisioningApiHandler) handleRouteGetAlertRuleGroupExport(ctx *context
 func (f *ProvisioningApiHandler) handleRoutePutAlertRuleGroup(ctx *contextmodel.ReqContext, ag apimodels.AlertRuleGroup, folder, group string) response.Response {
 	return f.svc.RoutePutAlertRuleGroup(ctx, ag, folder, group)
 }
+
+func (f *ProvisioningApiHandler) handleRouteExportMuteTiming(ctx *contextmodel.ReqContext, name string) response.Response {
+	return f.svc.RouteGetMuteTimingExport(ctx, name)
+}
+
+func (f *ProvisioningApiHandler) handleRouteExportMuteTimings(ctx *contextmodel.ReqContext) response.Response {
+	return f.svc.RouteGetMuteTimingsExport(ctx)
+}
+
+func (f *ProvisioningApiHandler) handleRouteDeleteAlertRuleGroup(ctx *contextmodel.ReqContext, folderUID, group string) response.Response {
+	return f.svc.RouteDeleteAlertRuleGroup(ctx, folderUID, group)
+}
diff --git a/pkg/services/ngalert/api/test-data/alertmanager_default_mutetimings-export.hcl b/pkg/services/ngalert/api/test-data/alertmanager_default_mutetimings-export.hcl
new file mode 100644
index 0000000000000..0b949503cf64a
--- /dev/null
+++ b/pkg/services/ngalert/api/test-data/alertmanager_default_mutetimings-export.hcl
@@ -0,0 +1,20 @@
+resource "grafana_mute_timing" "mute_timing_1" {
+  name = "interval"
+}
+resource "grafana_mute_timing" "mute_timing_2" {
+  name = "full-interval"
+
+  intervals {
+
+    times {
+      start = "10:00"
+      end   = "12:00"
+    }
+
+    weekdays      = ["monday", "wednesday", "friday"]
+    days_of_month = ["1", "14:16", "20"]
+    months        = ["1:3", "7", "12"]
+    years         = ["2023:2025"]
+    location      = "America/New_York"
+  }
+}
diff --git a/pkg/services/ngalert/api/test-data/alertmanager_default_mutetimings-export.json b/pkg/services/ngalert/api/test-data/alertmanager_default_mutetimings-export.json
new file mode 100644
index 0000000000000..4b62851e1a6b5
--- /dev/null
+++ b/pkg/services/ngalert/api/test-data/alertmanager_default_mutetimings-export.json
@@ -0,0 +1 @@
+{"apiVersion":1,"muteTimes":[{"orgId":1,"name":"interval","time_intervals":[]},{"orgId":1,"name":"full-interval","time_intervals":[{"times":[{"start_time":"10:00","end_time":"12:00"}],"weekdays":["monday","wednesday","friday"],"days_of_month":["1","14:16","20"],"months":["1:3","7","12"],"years":["2023:2025"],"location":"America/New_York"}]}]}
\ No newline at end of file
diff --git a/pkg/services/ngalert/api/test-data/alertmanager_default_mutetimings-export.yaml b/pkg/services/ngalert/api/test-data/alertmanager_default_mutetimings-export.yaml
new file mode 100644
index 0000000000000..2abc990a44fab
--- /dev/null
+++ b/pkg/services/ngalert/api/test-data/alertmanager_default_mutetimings-export.yaml
@@ -0,0 +1,16 @@
+apiVersion: 1
+muteTimes:
+    - orgId: 1
+      name: interval
+      time_intervals: []
+    - orgId: 1
+      name: full-interval
+      time_intervals:
+        - times:
+            - start_time: "10:00"
+              end_time: "12:00"
+          weekdays: [monday, wednesday, friday]
+          days_of_month: ["1", "14:16", "20"]
+          months: ["1:3", "7", "12"]
+          years: ['2023:2025']
+          location: America/New_York
diff --git a/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.hcl b/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.hcl
index 33f84709de6da..142aead24d086 100644
--- a/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.hcl
+++ b/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.hcl
@@ -77,5 +77,14 @@ resource "grafana_rule_group" "rule_group_0000" {
     no_data_state  = "NoData"
     exec_err_state = "Alerting"
     is_paused      = false
+
+    notification_settings {
+      contact_point   = "Test-Receiver"
+      group_by        = ["alertname", "grafana_folder", "test"]
+      group_wait      = "1s"
+      group_interval  = "5s"
+      repeat_interval = "5m"
+      mute_timings    = ["test-mute"]
+    }
   }
 }
diff --git a/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.json b/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.json
index 2feec5bab39bb..6af0194cb8ab1 100644
--- a/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.json
+++ b/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.json
@@ -109,7 +109,15 @@
           "noDataState": "NoData",
           "execErrState": "Alerting",
           "for": "0s",
-          "isPaused": false
+          "isPaused": false,
+          "notification_settings":{
+            "receiver":"Test-Receiver",
+            "group_by":["alertname","grafana_folder","test"],
+            "group_wait":"1s",
+            "group_interval":"5s",
+            "repeat_interval":"5m",
+            "mute_time_intervals":["test-mute"]
+          }
         }
       ]
     }
diff --git a/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.yaml b/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.yaml
index 9f87a264fc2b4..f91d13ec63555 100644
--- a/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.yaml
+++ b/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.yaml
@@ -83,3 +83,14 @@ groups:
           execErrState: Alerting
           for: 0s
           isPaused: false
+          notification_settings:
+            receiver: Test-Receiver
+            group_by:
+                - alertname
+                - grafana_folder
+                - test
+            group_wait: 1s
+            group_interval: 5s
+            repeat_interval: 5m
+            mute_time_intervals:
+                - test-mute
diff --git a/pkg/services/ngalert/api/test-data/post-rulegroup-101.json b/pkg/services/ngalert/api/test-data/post-rulegroup-101.json
index 61f7c1652894b..2871b1f578780 100644
--- a/pkg/services/ngalert/api/test-data/post-rulegroup-101.json
+++ b/pkg/services/ngalert/api/test-data/post-rulegroup-101.json
@@ -109,7 +109,15 @@
           }
         ],
         "no_data_state": "NoData",
-        "exec_err_state": "Alerting"
+        "exec_err_state": "Alerting",
+        "notification_settings":{
+          "receiver":"Test-Receiver",
+          "group_by":["alertname","grafana_folder","test"],
+          "group_wait":"1s",
+          "group_interval":"5s",
+          "repeat_interval":"5m",
+          "mute_time_intervals":["test-mute"]
+        }
       }
     }
   ]
diff --git a/pkg/services/ngalert/api/test-data/ruler-grafana-recipient.http b/pkg/services/ngalert/api/test-data/ruler-grafana-recipient.http
index 33650932d5765..ff61d3b7b45b7 100644
--- a/pkg/services/ngalert/api/test-data/ruler-grafana-recipient.http
+++ b/pkg/services/ngalert/api/test-data/ruler-grafana-recipient.http
@@ -1,7 +1,7 @@
 @grafanaRecipient = grafana
 
-// should point to an existing folder named alerting
-@namespace1 = foo%20bar
+// should point to an existing folder UID
+@namespace1 = baf2c548-5e1e-42e8-8fde-8320e50d801e
 
 // create group42 under unknown namespace - it should fail
 POST http://admin:admin@localhost:3000/api/ruler/{{grafanaRecipient}}/api/v1/rules/unknown
diff --git a/pkg/services/ngalert/api/testing.go b/pkg/services/ngalert/api/testing.go
index 032bc108d1f4f..2e9b2cee6e0bc 100644
--- a/pkg/services/ngalert/api/testing.go
+++ b/pkg/services/ngalert/api/testing.go
@@ -12,7 +12,9 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/ngalert/eval"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/state"
+	"github.com/grafana/grafana/pkg/services/ngalert/store"
 	"github.com/grafana/grafana/pkg/services/user"
 )
 
@@ -139,3 +141,22 @@ func (a *recordingAccessControlFake) IsDisabled() bool {
 }
 
 var _ accesscontrol.AccessControl = &recordingAccessControlFake{}
+
+type fakeRuleAccessControlService struct {
+}
+
+func (f fakeRuleAccessControlService) HasAccessToRuleGroup(ctx context.Context, user identity.Requester, rules models.RulesGroup) (bool, error) {
+	return true, nil
+}
+
+func (f fakeRuleAccessControlService) AuthorizeAccessToRuleGroup(ctx context.Context, user identity.Requester, rules models.RulesGroup) error {
+	return nil
+}
+
+func (f fakeRuleAccessControlService) AuthorizeRuleChanges(ctx context.Context, user identity.Requester, change *store.GroupDelta) error {
+	return nil
+}
+
+func (f fakeRuleAccessControlService) AuthorizeDatasourceAccessForRule(ctx context.Context, user identity.Requester, rule *models.AlertRule) error {
+	return nil
+}
diff --git a/pkg/services/ngalert/api/tooling/Makefile b/pkg/services/ngalert/api/tooling/Makefile
index 82d72f892f4f0..afc8ae474a2a3 100644
--- a/pkg/services/ngalert/api/tooling/Makefile
+++ b/pkg/services/ngalert/api/tooling/Makefile
@@ -15,8 +15,12 @@ GENERATED_GO_MATCHERS = ./go/*.go
 SED_INPLACE := -i
 
 ifneq ($(OS),Windows_NT)
+	# If we're not using the GNU version of sed, we need to specify an argument to -i
 	UNAME := $(shell uname)
-	ifeq ($(UNAME),Darwin)
+	isGNU := $(shell sed --help 2>&1 | grep -c GNU)
+	ifneq ($(isGNU),0)
+		# Do nothing
+	else ifeq ($(UNAME),Darwin)
 		SED_INPLACE = -i ''
 	endif
 endif
diff --git a/pkg/services/ngalert/api/tooling/README.md b/pkg/services/ngalert/api/tooling/README.md
index bee2a4dcb4f29..692deb5b8478a 100644
--- a/pkg/services/ngalert/api/tooling/README.md
+++ b/pkg/services/ngalert/api/tooling/README.md
@@ -19,10 +19,10 @@ Instead, we use a hybrid approach - we define the types in Golang, with comments
 
 ### Stability
 
-We have some endpoints that we document publically as being stable, and others that we consider unstable. The stable endpoints are documented in `api.json`, where all endpoints are available in `post.json`.
+We have some endpoints that we document publicly as being stable, and others that we consider unstable. The stable endpoints are documented in `api.json`, where all endpoints are available in `post.json`.
 
 To stabilize an endpoint, add the `stable` tag to its route comment:
 
 ```
-// swagger:route GET /api/provisioning/contact-points provisioning stable RouteGetContactpoints
+// swagger:route GET /provisioning/contact-points provisioning stable RouteGetContactpoints
 ```
diff --git a/pkg/services/ngalert/api/tooling/api.json b/pkg/services/ngalert/api/tooling/api.json
index 93198d78e9858..5e25f7b670237 100644
--- a/pkg/services/ngalert/api/tooling/api.json
+++ b/pkg/services/ngalert/api/tooling/api.json
@@ -1,5 +1,5 @@
 {
- "basePath": "/api/v1",
+ "basePath": "/api",
  "consumes": [
   "application/json"
  ],
@@ -211,6 +211,9 @@
      ],
      "type": "string"
     },
+    "notification_settings": {
+     "$ref": "#/definitions/AlertRuleNotificationSettingsExport"
+    },
     "panelId": {
      "format": "int64",
      "type": "integer"
@@ -280,6 +283,90 @@
    },
    "type": "object"
   },
+  "AlertRuleNotificationSettings": {
+   "properties": {
+    "group_by": {
+     "default": [
+      "alertname",
+      "grafana_folder"
+     ],
+     "description": "Override the labels by which incoming alerts are grouped together. For example, multiple alerts coming in for\ncluster=A and alertname=LatencyHigh would be batched into a single group. To aggregate by all possible labels\nuse the special value '...' as the sole label name.\nThis effectively disables aggregation entirely, passing through all alerts as-is. This is unlikely to be what\nyou want, unless you have a very low alert volume or your upstream notification system performs its own grouping.\nMust include 'alertname' and 'grafana_folder' if not using '...'.",
+     "example": [
+      "alertname",
+      "grafana_folder",
+      "cluster"
+     ],
+     "items": {
+      "type": "string"
+     },
+     "type": "array"
+    },
+    "group_interval": {
+     "description": "Override how long to wait before sending a notification about new alerts that are added to a group of alerts for\nwhich an initial notification has already been sent. (Usually ~5m or more.)",
+     "example": "5m",
+     "type": "string"
+    },
+    "group_wait": {
+     "description": "Override how long to initially wait to send a notification for a group of alerts. Allows to wait for an\ninhibiting alert to arrive or collect more initial alerts for the same group. (Usually ~0s to few minutes.)",
+     "example": "30s",
+     "type": "string"
+    },
+    "mute_time_intervals": {
+     "description": "Override the times when notifications should be muted. These must match the name of a mute time interval defined\nin the alertmanager configuration mute_time_intervals section. When muted it will not send any notifications, but\notherwise acts normally.",
+     "example": [
+      "maintenance"
+     ],
+     "items": {
+      "type": "string"
+     },
+     "type": "array"
+    },
+    "receiver": {
+     "description": "Name of the receiver to send notifications to.",
+     "example": "grafana-default-email",
+     "type": "string"
+    },
+    "repeat_interval": {
+     "description": "Override how long to wait before sending a notification again if it has already been sent successfully for an\nalert. (Usually ~3h or more).\nNote that this parameter is implicitly bound by Alertmanager's `--data.retention` configuration flag.\nNotifications will be resent after either repeat_interval or the data retention period have passed, whichever\noccurs first. `repeat_interval` should not be less than `group_interval`.",
+     "example": "4h",
+     "type": "string"
+    }
+   },
+   "required": [
+    "receiver"
+   ],
+   "type": "object"
+  },
+  "AlertRuleNotificationSettingsExport": {
+   "properties": {
+    "group_by": {
+     "items": {
+      "type": "string"
+     },
+     "type": "array"
+    },
+    "group_interval": {
+     "type": "string"
+    },
+    "group_wait": {
+     "type": "string"
+    },
+    "mute_time_intervals": {
+     "items": {
+      "type": "string"
+     },
+     "type": "array"
+    },
+    "receiver": {
+     "type": "string"
+    },
+    "repeat_interval": {
+     "type": "string"
+    }
+   },
+   "title": "AlertRuleNotificationSettingsExport is the provisioned export of models.NotificationSettings.",
+   "type": "object"
+  },
   "AlertingFileExport": {
    "properties": {
     "apiVersion": {
@@ -298,6 +385,12 @@
      },
      "type": "array"
     },
+    "muteTimes": {
+     "items": {
+      "$ref": "#/definitions/MuteTimeIntervalExport"
+     },
+     "type": "array"
+    },
     "policies": {
      "items": {
       "$ref": "#/definitions/NotificationPolicyExport"
@@ -512,6 +605,9 @@
     },
     "username": {
      "type": "string"
+    },
+    "username_file": {
+     "type": "string"
     }
    },
    "title": "BasicAuth contains basic HTTP authentication credentials.",
@@ -534,6 +630,7 @@
      "type": "array"
     },
     "mute_time_intervals": {
+     "description": "MuteTimeIntervals is deprecated and will be removed before Alertmanager 1.0.",
      "items": {
       "$ref": "#/definitions/MuteTimeInterval"
      },
@@ -547,6 +644,12 @@
       "type": "string"
      },
      "type": "array"
+    },
+    "time_intervals": {
+     "items": {
+      "$ref": "#/definitions/TimeInterval"
+     },
+     "type": "array"
     }
    },
    "title": "Config is the top-level configuration for Alertmanager's config files.",
@@ -608,6 +711,9 @@
      "description": "Error is a property to be set if the corresponding DataQuery has an error.",
      "type": "string"
     },
+    "ErrorSource": {
+     "$ref": "#/definitions/ErrorSource"
+    },
     "Frames": {
      "$ref": "#/definitions/Frames"
     },
@@ -639,6 +745,9 @@
     },
     "webhook_url": {
      "$ref": "#/definitions/SecretURL"
+    },
+    "webhook_url_file": {
+     "type": "string"
     }
    },
    "title": "DiscordConfig configures notifications via Discord.",
@@ -813,6 +922,10 @@
    },
    "type": "object"
   },
+  "ErrorSource": {
+   "description": "ErrorSource type defines the source of the error",
+   "type": "string"
+  },
   "ErrorType": {
    "title": "ErrorType models the different API error types.",
    "type": "string"
@@ -838,6 +951,9 @@
   },
   "EvalQueriesPayload": {
    "properties": {
+    "condition": {
+     "type": "string"
+    },
     "data": {
      "items": {
       "$ref": "#/definitions/AlertQuery"
@@ -1045,6 +1161,14 @@
    "title": "FloatHistogram is similar to Histogram but uses float64 for all\ncounts. Additionally, bucket counts are absolute and not deltas.",
    "type": "object"
   },
+  "ForbiddenError": {
+   "properties": {
+    "body": {
+     "$ref": "#/definitions/PublicError"
+    }
+   },
+   "type": "object"
+  },
   "Frame": {
    "description": "Each Field is well typed by its FieldType and supports optional Labels.\n\nA Frame is a general data container for Grafana. A Frame can be table data\nor time series data depending on its content and field types.",
    "properties": {
@@ -1128,13 +1252,22 @@
     },
     "typeVersion": {
      "$ref": "#/definitions/FrameTypeVersion"
+    },
+    "uniqueRowIdFields": {
+     "description": "Array of field indices which values create a unique id for each row. Ideally this should be globally unique ID\nbut that isn't guarantied. Should help with keeping track and deduplicating rows in visualizations, especially\nwith streaming data with frequent updates.",
+     "example": "TraceID in Tempo, table name + primary key in SQL",
+     "items": {
+      "format": "int64",
+      "type": "integer"
+     },
+     "type": "array"
     }
    },
    "title": "FrameMeta matches:",
    "type": "object"
   },
   "FrameType": {
-   "description": "A FrameType string, when present in a frame's metadata, asserts that the\nframe's structure conforms to the FrameType's specification.\nThis property is currently optional, so FrameType may be FrameTypeUnknown even if the properties of\nthe Frame correspond to a defined FrameType.",
+   "description": "A FrameType string, when present in a frame's metadata, asserts that the\nframe's structure conforms to the FrameType's specification.\nThis property is currently optional, so FrameType may be FrameTypeUnknown even if the properties of\nthe Frame correspond to a defined FrameType.\n+enum",
    "type": "string"
   },
   "FrameTypeVersion": {
@@ -1153,6 +1286,14 @@
    "title": "Frames is a slice of Frame pointers.",
    "type": "array"
   },
+  "GenericPublicError": {
+   "properties": {
+    "body": {
+     "$ref": "#/definitions/PublicError"
+    }
+   },
+   "type": "object"
+  },
   "GettableAlertmanagers": {
    "properties": {
     "data": {
@@ -1182,6 +1323,7 @@
      "type": "object"
     },
     "mute_time_intervals": {
+     "description": "MuteTimeIntervals is deprecated and will be removed before Alertmanager 1.0.",
      "items": {
       "$ref": "#/definitions/MuteTimeInterval"
      },
@@ -1202,6 +1344,12 @@
       "type": "string"
      },
      "type": "array"
+    },
+    "time_intervals": {
+     "items": {
+      "$ref": "#/definitions/TimeInterval"
+     },
+     "type": "array"
     }
    },
    "type": "object"
@@ -1404,10 +1552,6 @@
     "is_paused": {
      "type": "boolean"
     },
-    "namespace_id": {
-     "format": "int64",
-     "type": "integer"
-    },
     "namespace_uid": {
      "type": "string"
     },
@@ -1419,6 +1563,9 @@
      ],
      "type": "string"
     },
+    "notification_settings": {
+     "$ref": "#/definitions/AlertRuleNotificationSettings"
+    },
     "orgId": {
      "format": "int64",
      "type": "integer"
@@ -1535,6 +1682,23 @@
    ],
    "type": "object"
   },
+  "GettableTimeIntervals": {
+   "properties": {
+    "name": {
+     "type": "string"
+    },
+    "provenance": {
+     "$ref": "#/definitions/Provenance"
+    },
+    "time_intervals": {
+     "items": {
+      "$ref": "#/definitions/TimeIntervalItem"
+     },
+     "type": "array"
+    }
+   },
+   "type": "object"
+  },
   "GettableUserConfig": {
    "properties": {
     "alertmanager_config": {
@@ -1835,6 +1999,9 @@
     "send_resolved": {
      "type": "boolean"
     },
+    "summary": {
+     "type": "string"
+    },
     "text": {
      "type": "string"
     },
@@ -1843,13 +2010,16 @@
     },
     "webhook_url": {
      "$ref": "#/definitions/SecretURL"
+    },
+    "webhook_url_file": {
+     "type": "string"
     }
    },
    "type": "object"
   },
   "MatchRegexps": {
    "additionalProperties": {
-    "$ref": "#/definitions/Regexp"
+    "type": "string"
    },
    "title": "MatchRegexps represents a map of Regexp.",
    "type": "object"
@@ -1899,6 +2069,24 @@
    "title": "MuteTimeInterval represents a named set of time intervals for which a route should be muted.",
    "type": "object"
   },
+  "MuteTimeIntervalExport": {
+   "properties": {
+    "name": {
+     "type": "string"
+    },
+    "orgId": {
+     "format": "int64",
+     "type": "integer"
+    },
+    "time_intervals": {
+     "items": {
+      "$ref": "#/definitions/TimeInterval"
+     },
+     "type": "array"
+    }
+   },
+   "type": "object"
+  },
   "MuteTimings": {
    "items": {
     "$ref": "#/definitions/MuteTimeInterval"
@@ -1944,12 +2132,58 @@
   },
   "NotificationPolicyExport": {
    "properties": {
-    "Policy": {
-     "$ref": "#/definitions/RouteExport"
+    "continue": {
+     "type": "boolean"
+    },
+    "group_by": {
+     "items": {
+      "type": "string"
+     },
+     "type": "array"
+    },
+    "group_interval": {
+     "type": "string"
+    },
+    "group_wait": {
+     "type": "string"
+    },
+    "match": {
+     "additionalProperties": {
+      "type": "string"
+     },
+     "description": "Deprecated. Remove before v1.0 release.",
+     "type": "object"
+    },
+    "match_re": {
+     "$ref": "#/definitions/MatchRegexps"
+    },
+    "matchers": {
+     "$ref": "#/definitions/Matchers"
+    },
+    "mute_time_intervals": {
+     "items": {
+      "type": "string"
+     },
+     "type": "array"
+    },
+    "object_matchers": {
+     "$ref": "#/definitions/ObjectMatchers"
     },
     "orgId": {
      "format": "int64",
      "type": "integer"
+    },
+    "receiver": {
+     "type": "string"
+    },
+    "repeat_interval": {
+     "type": "string"
+    },
+    "routes": {
+     "items": {
+      "$ref": "#/definitions/RouteExport"
+     },
+     "type": "array"
     }
    },
    "title": "NotificationPolicyExport is the provisioned file export of alerting.NotificiationPolicyV1.",
@@ -2039,9 +2273,18 @@
    "title": "OAuth2 is the oauth2 client configuration.",
    "type": "object"
   },
+  "ObjectMatcher": {
+   "items": {
+    "type": "string"
+   },
+   "title": "ObjectMatcher is a matcher that can be used to filter alerts.",
+   "type": "array"
+  },
   "ObjectMatchers": {
-   "$ref": "#/definitions/Matchers",
-   "description": "ObjectMatchers is Matchers with a different Unmarshal and Marshal methods that accept matchers as objects\nthat have already been parsed."
+   "items": {
+    "$ref": "#/definitions/ObjectMatcher"
+   },
+   "type": "array"
   },
   "OpsGenieConfig": {
    "properties": {
@@ -2221,25 +2464,8 @@
   "PermissionDenied": {
    "type": "object"
   },
-  "Point": {
-   "description": "If H is not nil, then this is a histogram point and only (T, H) is valid.\nIf H is nil, then only (T, V) is valid.",
-   "properties": {
-    "H": {
-     "$ref": "#/definitions/FloatHistogram"
-    },
-    "T": {
-     "format": "int64",
-     "type": "integer"
-    },
-    "V": {
-     "format": "double",
-     "type": "number"
-    }
-   },
-   "title": "Point represents a single data point for a given timestamp.",
-   "type": "object"
-  },
   "PostableApiAlertingConfig": {
+   "description": "nolint:revive",
    "properties": {
     "global": {
      "$ref": "#/definitions/GlobalConfig"
@@ -2251,6 +2477,7 @@
      "type": "array"
     },
     "mute_time_intervals": {
+     "description": "MuteTimeIntervals is deprecated and will be removed before Alertmanager 1.0.",
      "items": {
       "$ref": "#/definitions/MuteTimeInterval"
      },
@@ -2271,11 +2498,18 @@
       "type": "string"
      },
      "type": "array"
+    },
+    "time_intervals": {
+     "items": {
+      "$ref": "#/definitions/TimeInterval"
+     },
+     "type": "array"
     }
    },
    "type": "object"
   },
   "PostableApiReceiver": {
+   "description": "nolint:revive",
    "properties": {
     "discord_configs": {
      "items": {
@@ -2493,6 +2727,9 @@
      ],
      "type": "string"
     },
+    "notification_settings": {
+     "$ref": "#/definitions/AlertRuleNotificationSettings"
+    },
     "title": {
      "type": "string"
     },
@@ -2532,6 +2769,20 @@
    },
    "type": "object"
   },
+  "PostableTimeIntervals": {
+   "properties": {
+    "name": {
+     "type": "string"
+    },
+    "time_intervals": {
+     "items": {
+      "$ref": "#/definitions/TimeIntervalItem"
+     },
+     "type": "array"
+    }
+   },
+   "type": "object"
+  },
   "PostableUserConfig": {
    "properties": {
     "alertmanager_config": {
@@ -2655,6 +2906,9 @@
      ],
      "type": "string"
     },
+    "notification_settings": {
+     "$ref": "#/definitions/AlertRuleNotificationSettings"
+    },
     "orgID": {
      "format": "int64",
      "type": "integer"
@@ -2724,6 +2978,26 @@
    },
    "type": "object"
   },
+  "PublicError": {
+   "description": "PublicError is derived from Error and only contains information\navailable to the end user.",
+   "properties": {
+    "extra": {
+     "additionalProperties": {},
+     "type": "object"
+    },
+    "message": {
+     "type": "string"
+    },
+    "messageId": {
+     "type": "string"
+    },
+    "statusCode": {
+     "format": "int64",
+     "type": "integer"
+    }
+   },
+   "type": "object"
+  },
   "PushoverConfig": {
    "properties": {
     "device": {
@@ -2973,11 +3247,6 @@
    "title": "ReceiverExport is the provisioned file export of alerting.ReceiverV1.",
    "type": "object"
   },
-  "Regexp": {
-   "description": "A Regexp is safe for concurrent use by multiple goroutines,\nexcept for configuration methods, such as Longest.",
-   "title": "Regexp is the representation of a compiled regular expression.",
-   "type": "object"
-  },
   "RelativeTimeRange": {
    "description": "RelativeTimeRange is the per query start and end time\nfor requests.",
    "properties": {
@@ -3320,7 +3589,12 @@
    "type": "object"
   },
   "Sample": {
+   "description": "Sample is a single sample belonging to a metric. It represents either a float\nsample or a histogram sample. If H is nil, it is a float sample. Otherwise,\nit is a histogram sample.",
    "properties": {
+    "F": {
+     "format": "double",
+     "type": "number"
+    },
     "H": {
      "$ref": "#/definitions/FloatHistogram"
     },
@@ -3330,13 +3604,8 @@
     "T": {
      "format": "int64",
      "type": "integer"
-    },
-    "V": {
-     "format": "double",
-     "type": "number"
     }
    },
-   "title": "Sample is a single sample belonging to a metric.",
    "type": "object"
   },
   "Secret": {
@@ -3829,7 +4098,21 @@
    "type": "string"
   },
   "TimeInterval": {
-   "description": "TimeInterval describes intervals of time. ContainsTime will tell you if a golang time is contained\nwithin the interval.",
+   "properties": {
+    "name": {
+     "type": "string"
+    },
+    "time_intervals": {
+     "items": {
+      "$ref": "#/definitions/TimeInterval"
+     },
+     "type": "array"
+    }
+   },
+   "title": "TimeInterval represents a named set of time intervals for which a route should be muted.",
+   "type": "object"
+  },
+  "TimeIntervalItem": {
    "properties": {
     "days_of_month": {
      "items": {
@@ -3848,7 +4131,7 @@
     },
     "times": {
      "items": {
-      "$ref": "#/definitions/TimeRange"
+      "$ref": "#/definitions/TimeIntervalTimeRange"
      },
      "type": "array"
     },
@@ -3867,6 +4150,17 @@
    },
    "type": "object"
   },
+  "TimeIntervalTimeRange": {
+   "properties": {
+    "end_time": {
+     "type": "string"
+    },
+    "start_time": {
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
   "TimeRange": {
    "description": "Redefining this to avoid an import cycle",
    "properties": {
@@ -3882,7 +4176,6 @@
    "type": "object"
   },
   "URL": {
-   "description": "The general form represented is:\n\n[scheme:][//[userinfo@]host][/]path[?query][#fragment]\n\nURLs that do not start with a slash after the scheme are interpreted as:\n\nscheme:opaque[?query][#fragment]\n\nNote that the Path field is stored in decoded form: /%47%6f%2f becomes /Go/.\nA consequence is that it is impossible to tell which slashes in the Path were\nslashes in the raw URL and which were %2f. This distinction is rarely important,\nbut when it is, the code should use the EscapedPath method, which preserves\nthe original encoding of Path.\n\nThe RawPath field is an optional field which is only set when the default\nencoding of Path is different from the escaped path. See the EscapedPath method\nfor more details.\n\nURL's String method uses the EscapedPath method to obtain the path.",
    "properties": {
     "ForceQuery": {
      "type": "boolean"
@@ -3918,7 +4211,7 @@
      "$ref": "#/definitions/Userinfo"
     }
    },
-   "title": "A URL represents a parsed URL (technically, a URI reference).",
+   "title": "URL is a custom URL type that allows validation at configuration load time.",
    "type": "object"
   },
   "UpdateRuleGroupResponse": {
@@ -3971,7 +4264,7 @@
    "type": "array"
   },
   "Vector": {
-   "description": "Vector is basically only an alias for model.Samples, but the\ncontract is that in a Vector, all Samples have the same timestamp.",
+   "description": "Vector is basically only an alias for []Sample, but the contract is that\nin a Vector, all Samples have the same timestamp.",
    "items": {
     "$ref": "#/definitions/Sample"
    },
@@ -4124,6 +4417,7 @@
    "type": "object"
   },
   "alertGroup": {
+   "description": "AlertGroup alert group",
    "properties": {
     "alerts": {
      "description": "alerts",
@@ -4362,12 +4656,14 @@
    "type": "object"
   },
   "gettableSilences": {
+   "description": "GettableSilences gettable silences",
    "items": {
     "$ref": "#/definitions/gettableSilence"
    },
    "type": "array"
   },
   "integration": {
+   "description": "Integration integration",
    "properties": {
     "lastNotifyAttempt": {
      "description": "A timestamp indicating the last attempt to deliver a notification regardless of the outcome.\nFormat: date-time",
@@ -4549,7 +4845,6 @@
    "type": "object"
   },
   "receiver": {
-   "description": "Receiver receiver",
    "properties": {
     "active": {
      "description": "active",
@@ -4669,7 +4964,7 @@
   "version": "1.1.0"
  },
  "paths": {
-  "/api/v1/provisioning/alert-rules": {
+  "/v1/provisioning/alert-rules": {
    "get": {
     "operationId": "RouteGetAlertRules",
     "responses": {
@@ -4724,7 +5019,7 @@
     ]
    }
   },
-  "/api/v1/provisioning/alert-rules/export": {
+  "/v1/provisioning/alert-rules/export": {
    "get": {
     "operationId": "RouteGetAlertRulesExport",
     "parameters": [
@@ -4737,7 +5032,12 @@
      },
      {
       "default": "yaml",
-      "description": "Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.",
+      "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+      "enum": [
+       "yaml",
+       "json",
+       "hcl"
+      ],
       "in": "query",
       "name": "format",
       "type": "string"
@@ -4764,6 +5064,13 @@
       "type": "string"
      }
     ],
+    "produces": [
+     "application/json",
+     "application/yaml",
+     "application/terraform+hcl",
+     "text/yaml",
+     "text/hcl"
+    ],
     "responses": {
      "200": {
       "description": "AlertingFileExport",
@@ -4781,7 +5088,7 @@
     ]
    }
   },
-  "/api/v1/provisioning/alert-rules/{UID}": {
+  "/v1/provisioning/alert-rules/{UID}": {
    "delete": {
     "operationId": "RouteDeleteAlertRule",
     "parameters": [
@@ -4791,6 +5098,11 @@
       "name": "UID",
       "required": true,
       "type": "string"
+     },
+     {
+      "in": "header",
+      "name": "X-Disable-Provenance",
+      "type": "string"
      }
     ],
     "responses": {
@@ -4876,7 +5188,7 @@
     ]
    }
   },
-  "/api/v1/provisioning/alert-rules/{UID}/export": {
+  "/v1/provisioning/alert-rules/{UID}/export": {
    "get": {
     "operationId": "RouteGetAlertRuleExport",
     "parameters": [
@@ -4889,7 +5201,12 @@
      },
      {
       "default": "yaml",
-      "description": "Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.",
+      "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+      "enum": [
+       "yaml",
+       "json",
+       "hcl"
+      ],
       "in": "query",
       "name": "format",
       "type": "string"
@@ -4905,7 +5222,9 @@
     "produces": [
      "application/json",
      "application/yaml",
-     "text/yaml"
+     "application/terraform+hcl",
+     "text/yaml",
+     "text/hcl"
     ],
     "responses": {
      "200": {
@@ -4924,7 +5243,7 @@
     ]
    }
   },
-  "/api/v1/provisioning/contact-points": {
+  "/v1/provisioning/contact-points": {
    "get": {
     "operationId": "RouteGetContactpoints",
     "parameters": [
@@ -4960,6 +5279,11 @@
       "schema": {
        "$ref": "#/definitions/EmbeddedContactPoint"
       }
+     },
+     {
+      "in": "header",
+      "name": "X-Disable-Provenance",
+      "type": "string"
      }
     ],
     "responses": {
@@ -4982,7 +5306,7 @@
     ]
    }
   },
-  "/api/v1/provisioning/contact-points/export": {
+  "/v1/provisioning/contact-points/export": {
    "get": {
     "operationId": "RouteGetContactpointsExport",
     "parameters": [
@@ -4995,7 +5319,12 @@
      },
      {
       "default": "yaml",
-      "description": "Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.",
+      "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+      "enum": [
+       "yaml",
+       "json",
+       "hcl"
+      ],
       "in": "query",
       "name": "format",
       "type": "string"
@@ -5014,6 +5343,13 @@
       "type": "string"
      }
     ],
+    "produces": [
+     "application/json",
+     "application/yaml",
+     "application/terraform+hcl",
+     "text/yaml",
+     "text/hcl"
+    ],
     "responses": {
      "200": {
       "description": "AlertingFileExport",
@@ -5034,7 +5370,7 @@
     ]
    }
   },
-  "/api/v1/provisioning/contact-points/{UID}": {
+  "/v1/provisioning/contact-points/{UID}": {
    "delete": {
     "consumes": [
      "application/json"
@@ -5050,7 +5386,7 @@
      }
     ],
     "responses": {
-     "204": {
+     "202": {
       "description": " The contact point was deleted successfully."
      }
     },
@@ -5078,6 +5414,11 @@
       "schema": {
        "$ref": "#/definitions/EmbeddedContactPoint"
       }
+     },
+     {
+      "in": "header",
+      "name": "X-Disable-Provenance",
+      "type": "string"
      }
     ],
     "responses": {
@@ -5100,7 +5441,45 @@
     ]
    }
   },
-  "/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}": {
+  "/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}": {
+   "delete": {
+    "description": "Delete rule group",
+    "operationId": "RouteDeleteAlertRuleGroup",
+    "parameters": [
+     {
+      "in": "path",
+      "name": "FolderUID",
+      "required": true,
+      "type": "string"
+     },
+     {
+      "in": "path",
+      "name": "Group",
+      "required": true,
+      "type": "string"
+     }
+    ],
+    "responses": {
+     "204": {
+      "description": " The alert rule group was deleted successfully."
+     },
+     "403": {
+      "description": "ForbiddenError",
+      "schema": {
+       "$ref": "#/definitions/ForbiddenError"
+      }
+     },
+     "404": {
+      "description": "NotFound",
+      "schema": {
+       "$ref": "#/definitions/NotFound"
+      }
+     }
+    },
+    "tags": [
+     "provisioning"
+    ]
+   },
    "get": {
     "operationId": "RouteGetAlertRuleGroup",
     "parameters": [
@@ -5139,6 +5518,11 @@
     ],
     "operationId": "RoutePutAlertRuleGroup",
     "parameters": [
+     {
+      "in": "header",
+      "name": "X-Disable-Provenance",
+      "type": "string"
+     },
      {
       "in": "path",
       "name": "FolderUID",
@@ -5173,13 +5557,13 @@
       }
      }
     },
-    "summary": "Update the interval of a rule group.",
+    "summary": "Create or update alert rule group.",
     "tags": [
      "provisioning"
     ]
    }
   },
-  "/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}/export": {
+  "/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}/export": {
    "get": {
     "operationId": "RouteGetAlertRuleGroupExport",
     "parameters": [
@@ -5192,7 +5576,12 @@
      },
      {
       "default": "yaml",
-      "description": "Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.",
+      "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+      "enum": [
+       "yaml",
+       "json",
+       "hcl"
+      ],
       "in": "query",
       "name": "format",
       "type": "string"
@@ -5213,7 +5602,9 @@
     "produces": [
      "application/json",
      "application/yaml",
-     "text/yaml"
+     "application/terraform+hcl",
+     "text/yaml",
+     "text/hcl"
     ],
     "responses": {
      "200": {
@@ -5232,7 +5623,7 @@
     ]
    }
   },
-  "/api/v1/provisioning/mute-timings": {
+  "/v1/provisioning/mute-timings": {
    "get": {
     "operationId": "RouteGetMuteTimings",
     "responses": {
@@ -5260,6 +5651,11 @@
       "schema": {
        "$ref": "#/definitions/MuteTimeInterval"
       }
+     },
+     {
+      "in": "header",
+      "name": "X-Disable-Provenance",
+      "type": "string"
      }
     ],
     "responses": {
@@ -5282,7 +5678,58 @@
     ]
    }
   },
-  "/api/v1/provisioning/mute-timings/{name}": {
+  "/v1/provisioning/mute-timings/export": {
+   "get": {
+    "operationId": "RouteExportMuteTimings",
+    "parameters": [
+     {
+      "default": false,
+      "description": "Whether to initiate a download of the file or not.",
+      "in": "query",
+      "name": "download",
+      "type": "boolean"
+     },
+     {
+      "default": "yaml",
+      "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+      "enum": [
+       "yaml",
+       "json",
+       "hcl"
+      ],
+      "in": "query",
+      "name": "format",
+      "type": "string"
+     }
+    ],
+    "produces": [
+     "application/json",
+     "application/yaml",
+     "application/terraform+hcl",
+     "text/yaml",
+     "text/hcl"
+    ],
+    "responses": {
+     "200": {
+      "description": "AlertingFileExport",
+      "schema": {
+       "$ref": "#/definitions/AlertingFileExport"
+      }
+     },
+     "403": {
+      "description": "PermissionDenied",
+      "schema": {
+       "$ref": "#/definitions/PermissionDenied"
+      }
+     }
+    },
+    "summary": "Export all mute timings in provisioning format.",
+    "tags": [
+     "provisioning"
+    ]
+   }
+  },
+  "/v1/provisioning/mute-timings/{name}": {
    "delete": {
     "operationId": "RouteDeleteMuteTiming",
     "parameters": [
@@ -5297,6 +5744,12 @@
     "responses": {
      "204": {
       "description": " The mute timing was deleted successfully."
+     },
+     "409": {
+      "description": "GenericPublicError",
+      "schema": {
+       "$ref": "#/definitions/GenericPublicError"
+      }
      }
     },
     "summary": "Delete a mute timing.",
@@ -5350,10 +5803,15 @@
       "schema": {
        "$ref": "#/definitions/MuteTimeInterval"
       }
+     },
+     {
+      "in": "header",
+      "name": "X-Disable-Provenance",
+      "type": "string"
      }
     ],
     "responses": {
-     "200": {
+     "202": {
       "description": "MuteTimeInterval",
       "schema": {
        "$ref": "#/definitions/MuteTimeInterval"
@@ -5372,7 +5830,65 @@
     ]
    }
   },
-  "/api/v1/provisioning/policies": {
+  "/v1/provisioning/mute-timings/{name}/export": {
+   "get": {
+    "operationId": "RouteExportMuteTiming",
+    "parameters": [
+     {
+      "default": false,
+      "description": "Whether to initiate a download of the file or not.",
+      "in": "query",
+      "name": "download",
+      "type": "boolean"
+     },
+     {
+      "default": "yaml",
+      "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+      "enum": [
+       "yaml",
+       "json",
+       "hcl"
+      ],
+      "in": "query",
+      "name": "format",
+      "type": "string"
+     },
+     {
+      "description": "Mute timing name",
+      "in": "path",
+      "name": "name",
+      "required": true,
+      "type": "string"
+     }
+    ],
+    "produces": [
+     "application/json",
+     "application/yaml",
+     "application/terraform+hcl",
+     "text/yaml",
+     "text/hcl"
+    ],
+    "responses": {
+     "200": {
+      "description": "AlertingFileExport",
+      "schema": {
+       "$ref": "#/definitions/AlertingFileExport"
+      }
+     },
+     "403": {
+      "description": "PermissionDenied",
+      "schema": {
+       "$ref": "#/definitions/PermissionDenied"
+      }
+     }
+    },
+    "summary": "Export a mute timing in provisioning format.",
+    "tags": [
+     "provisioning"
+    ]
+   }
+  },
+  "/v1/provisioning/policies": {
    "delete": {
     "consumes": [
      "application/json"
@@ -5419,6 +5935,11 @@
       "schema": {
        "$ref": "#/definitions/Route"
       }
+     },
+     {
+      "in": "header",
+      "name": "X-Disable-Provenance",
+      "type": "string"
      }
     ],
     "responses": {
@@ -5441,9 +5962,16 @@
     ]
    }
   },
-  "/api/v1/provisioning/policies/export": {
+  "/v1/provisioning/policies/export": {
    "get": {
     "operationId": "RouteGetPolicyTreeExport",
+    "produces": [
+     "application/json",
+     "application/yaml",
+     "application/terraform+hcl",
+     "text/yaml",
+     "text/hcl"
+    ],
     "responses": {
      "200": {
       "description": "AlertingFileExport",
@@ -5464,7 +5992,7 @@
     ]
    }
   },
-  "/api/v1/provisioning/templates": {
+  "/v1/provisioning/templates": {
    "get": {
     "operationId": "RouteGetTemplates",
     "responses": {
@@ -5484,7 +6012,7 @@
     ]
    }
   },
-  "/api/v1/provisioning/templates/{name}": {
+  "/v1/provisioning/templates/{name}": {
    "delete": {
     "operationId": "RouteDeleteTemplate",
     "parameters": [
@@ -5552,6 +6080,11 @@
       "schema": {
        "$ref": "#/definitions/NotificationTemplateContent"
       }
+     },
+     {
+      "in": "header",
+      "name": "X-Disable-Provenance",
+      "type": "string"
      }
     ],
     "responses": {
@@ -5579,6 +6112,36 @@
   "application/json"
  ],
  "responses": {
+  "GetAllIntervalsResponse": {
+   "description": "",
+   "schema": {
+    "items": {
+     "$ref": "#/definitions/GettableTimeIntervals"
+    },
+    "type": "array"
+   }
+  },
+  "GetIntervalsByNameResponse": {
+   "description": "",
+   "schema": {
+    "$ref": "#/definitions/GettableTimeIntervals"
+   }
+  },
+  "GetReceiverResponse": {
+   "description": "",
+   "schema": {
+    "$ref": "#/definitions/GettableApiReceiver"
+   }
+  },
+  "GetReceiversResponse": {
+   "description": "",
+   "schema": {
+    "items": {
+     "$ref": "#/definitions/GettableApiReceiver"
+    },
+    "type": "array"
+   }
+  },
   "GettableHistoricUserConfigs": {
    "description": "",
    "schema": {
diff --git a/pkg/services/ngalert/api/tooling/definitions/admin.go b/pkg/services/ngalert/api/tooling/definitions/admin.go
index 25488d1fb6e75..3c7e3ef394456 100644
--- a/pkg/services/ngalert/api/tooling/definitions/admin.go
+++ b/pkg/services/ngalert/api/tooling/definitions/admin.go
@@ -4,7 +4,7 @@ import (
 	v1 "github.com/prometheus/client_golang/api/prometheus/v1"
 )
 
-// swagger:route GET /api/v1/ngalert configuration RouteGetStatus
+// swagger:route GET /v1/ngalert configuration RouteGetStatus
 //
 //  Get the status of the alerting engine
 //
@@ -14,7 +14,7 @@ import (
 //     Responses:
 //		 200: AlertingStatus
 
-// swagger:route GET /api/v1/ngalert/alertmanagers configuration RouteGetAlertmanagers
+// swagger:route GET /v1/ngalert/alertmanagers configuration RouteGetAlertmanagers
 //
 //  Get the discovered and dropped Alertmanagers of the user's organization based on the specified configuration.
 //
@@ -24,7 +24,7 @@ import (
 //     Responses:
 //		 200: GettableAlertmanagers
 
-// swagger:route GET /api/v1/ngalert/admin_config configuration RouteGetNGalertConfig
+// swagger:route GET /v1/ngalert/admin_config configuration RouteGetNGalertConfig
 //
 //  Get the NGalert configuration of the user's organization, returns 404 if no configuration is present.
 //
@@ -36,7 +36,7 @@ import (
 //		 404: Failure
 //		 500: Failure
 
-// swagger:route POST /api/v1/ngalert/admin_config configuration RoutePostNGalertConfig
+// swagger:route POST /v1/ngalert/admin_config configuration RoutePostNGalertConfig
 //
 // Creates or updates the NGalert configuration of the user's organization. If no value is sent for alertmanagersChoice, it defaults to "all".
 //
@@ -47,7 +47,7 @@ import (
 //       201: Ack
 //       400: ValidationError
 
-// swagger:route DELETE /api/v1/ngalert/admin_config configuration RouteDeleteNGalertConfig
+// swagger:route DELETE /v1/ngalert/admin_config configuration RouteDeleteNGalertConfig
 //
 // Deletes the NGalert configuration of the user's organization.
 //
diff --git a/pkg/services/ngalert/api/tooling/definitions/alertmanager.go b/pkg/services/ngalert/api/tooling/definitions/alertmanager.go
index 9e3d3a28c1434..5248a2e5bbf98 100644
--- a/pkg/services/ngalert/api/tooling/definitions/alertmanager.go
+++ b/pkg/services/ngalert/api/tooling/definitions/alertmanager.go
@@ -2,22 +2,21 @@ package definitions
 
 import (
 	"context"
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"reflect"
-	"sort"
-	"strings"
 	"time"
 
 	"github.com/go-openapi/strfmt"
+	"github.com/grafana/alerting/definition"
+	"github.com/mohae/deepcopy"
 	amv2 "github.com/prometheus/alertmanager/api/v2/models"
 	"github.com/prometheus/alertmanager/config"
-	"github.com/prometheus/alertmanager/pkg/labels"
 	"github.com/prometheus/common/model"
 	"gopkg.in/yaml.v3"
 )
 
-// swagger:route POST /api/alertmanager/grafana/config/api/v1/alerts alertmanager RoutePostGrafanaAlertingConfig
+// swagger:route POST /alertmanager/grafana/config/api/v1/alerts alertmanager RoutePostGrafanaAlertingConfig
 //
 // sets an Alerting config
 //
@@ -25,7 +24,7 @@ import (
 //       201: Ack
 //       400: ValidationError
 
-// swagger:route POST /api/alertmanager/{DatasourceUID}/config/api/v1/alerts alertmanager RoutePostAlertingConfig
+// swagger:route POST /alertmanager/{DatasourceUID}/config/api/v1/alerts alertmanager RoutePostAlertingConfig
 //
 // sets an Alerting config
 //
@@ -34,7 +33,7 @@ import (
 //       400: ValidationError
 //       404: NotFound
 
-// swagger:route GET /api/alertmanager/grafana/config/api/v1/alerts alertmanager RouteGetGrafanaAlertingConfig
+// swagger:route GET /alertmanager/grafana/config/api/v1/alerts alertmanager RouteGetGrafanaAlertingConfig
 //
 // gets an Alerting config
 //
@@ -42,7 +41,7 @@ import (
 //       200: GettableUserConfig
 //       400: ValidationError
 
-// swagger:route GET /api/alertmanager/{DatasourceUID}/config/api/v1/alerts alertmanager RouteGetAlertingConfig
+// swagger:route GET /alertmanager/{DatasourceUID}/config/api/v1/alerts alertmanager RouteGetAlertingConfig
 //
 // gets an Alerting config
 //
@@ -51,14 +50,14 @@ import (
 //       400: ValidationError
 //       404: NotFound
 
-// swagger:route GET /api/alertmanager/grafana/config/history alertmanager RouteGetGrafanaAlertingConfigHistory
+// swagger:route GET /alertmanager/grafana/config/history alertmanager RouteGetGrafanaAlertingConfigHistory
 //
 // gets Alerting configurations that were successfully applied in the past
 //
 //     Responses:
 //       200: GettableHistoricUserConfigs
 
-// swagger:route POST /api/alertmanager/grafana/config/history/{id}/_activate alertmanager RoutePostGrafanaAlertingConfigHistoryActivate
+// swagger:route POST /alertmanager/grafana/config/history/{id}/_activate alertmanager RoutePostGrafanaAlertingConfigHistoryActivate
 //
 // revert Alerting configuration to the historical configuration specified by the given id
 //
@@ -67,7 +66,7 @@ import (
 //       400: ValidationError
 //       404: NotFound
 
-// swagger:route DELETE /api/alertmanager/grafana/config/api/v1/alerts alertmanager RouteDeleteGrafanaAlertingConfig
+// swagger:route DELETE /alertmanager/grafana/config/api/v1/alerts alertmanager RouteDeleteGrafanaAlertingConfig
 //
 // deletes the Alerting config for a tenant
 //
@@ -75,7 +74,7 @@ import (
 //       200: Ack
 //       400: ValidationError
 
-// swagger:route DELETE /api/alertmanager/{DatasourceUID}/config/api/v1/alerts alertmanager RouteDeleteAlertingConfig
+// swagger:route DELETE /alertmanager/{DatasourceUID}/config/api/v1/alerts alertmanager RouteDeleteAlertingConfig
 //
 // deletes the Alerting config for a tenant
 //
@@ -84,7 +83,7 @@ import (
 //       400: ValidationError
 //       404: NotFound
 
-// swagger:route GET /api/alertmanager/grafana/api/v2/status alertmanager RouteGetGrafanaAMStatus
+// swagger:route GET /alertmanager/grafana/api/v2/status alertmanager RouteGetGrafanaAMStatus
 //
 // get alertmanager status and configuration
 //
@@ -92,7 +91,7 @@ import (
 //       200: GettableStatus
 //       400: ValidationError
 
-// swagger:route GET /api/alertmanager/{DatasourceUID}/api/v2/status alertmanager RouteGetAMStatus
+// swagger:route GET /alertmanager/{DatasourceUID}/api/v2/status alertmanager RouteGetAMStatus
 //
 // get alertmanager status and configuration
 //
@@ -101,7 +100,7 @@ import (
 //       400: ValidationError
 //       404: NotFound
 
-// swagger:route GET /api/alertmanager/grafana/api/v2/alerts alertmanager RouteGetGrafanaAMAlerts
+// swagger:route GET /alertmanager/grafana/api/v2/alerts alertmanager RouteGetGrafanaAMAlerts
 //
 // get alertmanager alerts
 //
@@ -109,7 +108,7 @@ import (
 //       200: gettableAlerts
 //       400: ValidationError
 
-// swagger:route GET /api/alertmanager/{DatasourceUID}/api/v2/alerts alertmanager RouteGetAMAlerts
+// swagger:route GET /alertmanager/{DatasourceUID}/api/v2/alerts alertmanager RouteGetAMAlerts
 //
 // get alertmanager alerts
 //
@@ -118,7 +117,7 @@ import (
 //       400: ValidationError
 //       404: NotFound
 
-// swagger:route POST /api/alertmanager/{DatasourceUID}/api/v2/alerts alertmanager RoutePostAMAlerts
+// swagger:route POST /alertmanager/{DatasourceUID}/api/v2/alerts alertmanager RoutePostAMAlerts
 //
 // create alertmanager alerts
 //
@@ -127,7 +126,7 @@ import (
 //       400: ValidationError
 //       404: NotFound
 
-// swagger:route GET /api/alertmanager/grafana/api/v2/alerts/groups alertmanager RouteGetGrafanaAMAlertGroups
+// swagger:route GET /alertmanager/grafana/api/v2/alerts/groups alertmanager RouteGetGrafanaAMAlertGroups
 //
 // get alertmanager alerts
 //
@@ -135,7 +134,7 @@ import (
 //       200: alertGroups
 //       400: ValidationError
 
-// swagger:route GET /api/alertmanager/{DatasourceUID}/api/v2/alerts/groups alertmanager RouteGetAMAlertGroups
+// swagger:route GET /alertmanager/{DatasourceUID}/api/v2/alerts/groups alertmanager RouteGetAMAlertGroups
 //
 // get alertmanager alerts
 //
@@ -144,14 +143,14 @@ import (
 //       400: ValidationError
 //       404: NotFound
 
-// swagger:route GET /api/alertmanager/grafana/config/api/v1/receivers alertmanager RouteGetGrafanaReceivers
+// swagger:route GET /alertmanager/grafana/config/api/v1/receivers alertmanager RouteGetGrafanaReceivers
 //
 // Get a list of all receivers
 //
 //     Responses:
 //       200: receiversResponse
 
-// swagger:route POST /api/alertmanager/grafana/config/api/v1/receivers/test alertmanager RoutePostTestGrafanaReceivers
+// swagger:route POST /alertmanager/grafana/config/api/v1/receivers/test alertmanager RoutePostTestGrafanaReceivers
 //
 // Test Grafana managed receivers without saving them.
 //
@@ -165,7 +164,7 @@ import (
 //       408: Failure
 //       409: AlertManagerNotReady
 
-// swagger:route POST /api/alertmanager/grafana/config/api/v1/templates/test alertmanager RoutePostTestGrafanaTemplates
+// swagger:route POST /alertmanager/grafana/config/api/v1/templates/test alertmanager RoutePostTestGrafanaTemplates
 //
 // Test Grafana managed templates without saving them.
 //     Produces:
@@ -178,7 +177,7 @@ import (
 //       403: PermissionDenied
 //       409: AlertManagerNotReady
 
-// swagger:route GET /api/alertmanager/grafana/api/v2/silences alertmanager RouteGetGrafanaSilences
+// swagger:route GET /alertmanager/grafana/api/v2/silences alertmanager RouteGetGrafanaSilences
 //
 // get silences
 //
@@ -186,7 +185,7 @@ import (
 //       200: gettableSilences
 //       400: ValidationError
 
-// swagger:route GET /api/alertmanager/{DatasourceUID}/api/v2/silences alertmanager RouteGetSilences
+// swagger:route GET /alertmanager/{DatasourceUID}/api/v2/silences alertmanager RouteGetSilences
 //
 // get silences
 //
@@ -195,7 +194,7 @@ import (
 //       400: ValidationError
 //       404: NotFound
 
-// swagger:route POST /api/alertmanager/grafana/api/v2/silences alertmanager RouteCreateGrafanaSilence
+// swagger:route POST /alertmanager/grafana/api/v2/silences alertmanager RouteCreateGrafanaSilence
 //
 // create silence
 //
@@ -203,7 +202,7 @@ import (
 //       202: postSilencesOKBody
 //       400: ValidationError
 
-// swagger:route POST /api/alertmanager/{DatasourceUID}/api/v2/silences alertmanager RouteCreateSilence
+// swagger:route POST /alertmanager/{DatasourceUID}/api/v2/silences alertmanager RouteCreateSilence
 //
 // create silence
 //
@@ -212,7 +211,7 @@ import (
 //       400: ValidationError
 //       404: NotFound
 
-// swagger:route GET /api/alertmanager/grafana/api/v2/silence/{SilenceId} alertmanager RouteGetGrafanaSilence
+// swagger:route GET /alertmanager/grafana/api/v2/silence/{SilenceId} alertmanager RouteGetGrafanaSilence
 //
 // get silence
 //
@@ -220,7 +219,7 @@ import (
 //       200: gettableSilence
 //       400: ValidationError
 
-// swagger:route GET /api/alertmanager/{DatasourceUID}/api/v2/silence/{SilenceId} alertmanager RouteGetSilence
+// swagger:route GET /alertmanager/{DatasourceUID}/api/v2/silence/{SilenceId} alertmanager RouteGetSilence
 //
 // get silence
 //
@@ -229,7 +228,7 @@ import (
 //       400: ValidationError
 //       404: NotFound
 
-// swagger:route DELETE /api/alertmanager/grafana/api/v2/silence/{SilenceId} alertmanager RouteDeleteGrafanaSilence
+// swagger:route DELETE /alertmanager/grafana/api/v2/silence/{SilenceId} alertmanager RouteDeleteGrafanaSilence
 //
 // delete silence
 //
@@ -237,7 +236,7 @@ import (
 //       200: Ack
 //       400: ValidationError
 
-// swagger:route DELETE /api/alertmanager/{DatasourceUID}/api/v2/silence/{SilenceId} alertmanager RouteDeleteSilence
+// swagger:route DELETE /alertmanager/{DatasourceUID}/api/v2/silence/{SilenceId} alertmanager RouteDeleteSilence
 //
 // delete silence
 //
@@ -246,6 +245,31 @@ import (
 //       400: ValidationError
 //       404: NotFound
 
+// Alias all the needed Alertmanager types, functions and constants so that they can be imported directly from grafana/alerting
+// without having to modify any of the usage within Grafana.
+type (
+	Config                    = definition.Config
+	Route                     = definition.Route
+	PostableGrafanaReceiver   = definition.PostableGrafanaReceiver
+	PostableApiAlertingConfig = definition.PostableApiAlertingConfig
+	RawMessage                = definition.RawMessage
+	Provenance                = definition.Provenance
+	ObjectMatchers            = definition.ObjectMatchers
+	PostableApiReceiver       = definition.PostableApiReceiver
+	PostableGrafanaReceivers  = definition.PostableGrafanaReceivers
+	ReceiverType              = definition.ReceiverType
+)
+
+const (
+	GrafanaReceiverType      = definition.GrafanaReceiverType
+	AlertmanagerReceiverType = definition.AlertmanagerReceiverType
+)
+
+var (
+	AsGrafanaRoute = definition.AsGrafanaRoute
+	AllReceivers   = definition.AllReceivers
+)
+
 // swagger:model
 type PermissionDenied struct{}
 
@@ -593,6 +617,34 @@ func (c *PostableUserConfig) validate() error {
 	return nil
 }
 
+// Decrypt returns a copy of the configuration struct with decrypted secure settings in receivers.
+func (c *PostableUserConfig) Decrypt(decryptFn func(payload []byte) ([]byte, error)) (PostableUserConfig, error) {
+	newCfg, ok := deepcopy.Copy(c).(*PostableUserConfig)
+	if !ok {
+		return PostableUserConfig{}, fmt.Errorf("failed to copy config")
+	}
+
+	// Iterate through receivers and decrypt secure settings.
+	for _, rcv := range newCfg.AlertmanagerConfig.Receivers {
+		for _, gmr := range rcv.PostableGrafanaReceivers.GrafanaManagedReceivers {
+			for k, v := range gmr.SecureSettings {
+				decoded, err := base64.StdEncoding.DecodeString(v)
+				if err != nil {
+					return PostableUserConfig{}, fmt.Errorf("failed to decode value for key '%s': %w", k, err)
+				}
+
+				decrypted, err := decryptFn(decoded)
+				if err != nil {
+					return PostableUserConfig{}, fmt.Errorf("failed to decrypt value for key '%s': %w", k, err)
+				}
+
+				gmr.SecureSettings[k] = string(decrypted)
+			}
+		}
+	}
+	return *newCfg, nil
+}
+
 // GetGrafanaReceiverMap returns a map that associates UUIDs to grafana receivers
 func (c *PostableUserConfig) GetGrafanaReceiverMap() map[string]*PostableGrafanaReceiver {
 	UIDs := make(map[string]*PostableGrafanaReceiver)
@@ -646,8 +698,6 @@ func (c *PostableUserConfig) UnmarshalYAML(value *yaml.Node) error {
 	return nil
 }
 
-type Provenance string
-
 // swagger:model
 type GettableUserConfig struct {
 	TemplateFiles           map[string]string         `yaml:"template_files" json:"template_files"`
@@ -735,233 +785,22 @@ type GettableApiAlertingConfig struct {
 	Receivers []*GettableApiReceiver `yaml:"receivers,omitempty" json:"receivers,omitempty"`
 }
 
-func (c *GettableApiAlertingConfig) UnmarshalJSON(b []byte) error {
-	type plain GettableApiAlertingConfig
-	if err := json.Unmarshal(b, (*plain)(c)); err != nil {
-		return err
-	}
-
-	// Since Config implements json.Unmarshaler, we must handle _all_ other fields independently.
-	// Otherwise, the json decoder will detect this and only use the embedded type.
-	// Additionally, we'll use pointers to slices in order to reference the intended target.
-	type overrides struct {
-		Receivers *[]*GettableApiReceiver `yaml:"receivers,omitempty" json:"receivers,omitempty"`
-	}
-
-	if err := json.Unmarshal(b, &overrides{Receivers: &c.Receivers}); err != nil {
-		return err
-	}
-
-	return c.validate()
+func (c *GettableApiAlertingConfig) GetReceivers() []*GettableApiReceiver {
+	return c.Receivers
 }
 
-// validate ensures that the two routing trees use the correct receiver types.
-func (c *GettableApiAlertingConfig) validate() error {
-	receivers := make(map[string]struct{}, len(c.Receivers))
-
-	var hasGrafReceivers, hasAMReceivers bool
-	for _, r := range c.Receivers {
-		receivers[r.Name] = struct{}{}
-		switch r.Type() {
-		case GrafanaReceiverType:
-			hasGrafReceivers = true
-		case AlertmanagerReceiverType:
-			hasAMReceivers = true
-		default:
-			continue
-		}
-	}
-
-	if hasGrafReceivers && hasAMReceivers {
-		return fmt.Errorf("cannot mix Alertmanager & Grafana receiver types")
-	}
-
-	for _, receiver := range AllReceivers(c.Route.AsAMRoute()) {
-		_, ok := receivers[receiver]
-		if !ok {
-			return fmt.Errorf("unexpected receiver (%s) is undefined", receiver)
-		}
-	}
-
-	return nil
+func (c *GettableApiAlertingConfig) GetMuteTimeIntervals() []config.MuteTimeInterval {
+	return c.MuteTimeIntervals
 }
 
-// Config is the top-level configuration for Alertmanager's config files.
-type Config struct {
-	Global            *config.GlobalConfig      `yaml:"global,omitempty" json:"global,omitempty"`
-	Route             *Route                    `yaml:"route,omitempty" json:"route,omitempty"`
-	InhibitRules      []config.InhibitRule      `yaml:"inhibit_rules,omitempty" json:"inhibit_rules,omitempty"`
-	MuteTimeIntervals []config.MuteTimeInterval `yaml:"mute_time_intervals,omitempty" json:"mute_time_intervals,omitempty"`
-	Templates         []string                  `yaml:"templates" json:"templates"`
-}
+func (c *GettableApiAlertingConfig) GetTimeIntervals() []config.TimeInterval { return c.TimeIntervals }
 
-// A Route is a node that contains definitions of how to handle alerts. This is modified
-// from the upstream alertmanager in that it adds the ObjectMatchers property.
-type Route struct {
-	Receiver string `yaml:"receiver,omitempty" json:"receiver,omitempty"`
-
-	GroupByStr []string          `yaml:"group_by,omitempty" json:"group_by,omitempty"`
-	GroupBy    []model.LabelName `yaml:"-" json:"-"`
-	GroupByAll bool              `yaml:"-" json:"-"`
-	// Deprecated. Remove before v1.0 release.
-	Match map[string]string `yaml:"match,omitempty" json:"match,omitempty"`
-	// Deprecated. Remove before v1.0 release.
-	MatchRE           config.MatchRegexps `yaml:"match_re,omitempty" json:"match_re,omitempty"`
-	Matchers          config.Matchers     `yaml:"matchers,omitempty" json:"matchers,omitempty"`
-	ObjectMatchers    ObjectMatchers      `yaml:"object_matchers,omitempty" json:"object_matchers,omitempty"`
-	MuteTimeIntervals []string            `yaml:"mute_time_intervals,omitempty" json:"mute_time_intervals,omitempty"`
-	Continue          bool                `yaml:"continue" json:"continue,omitempty"`
-	Routes            []*Route            `yaml:"routes,omitempty" json:"routes,omitempty"`
-
-	GroupWait      *model.Duration `yaml:"group_wait,omitempty" json:"group_wait,omitempty"`
-	GroupInterval  *model.Duration `yaml:"group_interval,omitempty" json:"group_interval,omitempty"`
-	RepeatInterval *model.Duration `yaml:"repeat_interval,omitempty" json:"repeat_interval,omitempty"`
-
-	Provenance Provenance `yaml:"provenance,omitempty" json:"provenance,omitempty"`
+func (c *GettableApiAlertingConfig) GetRoute() *Route {
+	return c.Route
 }
 
-// UnmarshalYAML implements the yaml.Unmarshaler interface for Route. This is a copy of alertmanager's upstream except it removes validation on the label key.
-func (r *Route) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	type plain Route
-	if err := unmarshal((*plain)(r)); err != nil {
-		return err
-	}
-
-	return r.validateChild()
-}
-
-// AsAMRoute returns an Alertmanager route from a Grafana route. The ObjectMatchers are converted to Matchers.
-func (r *Route) AsAMRoute() *config.Route {
-	amRoute := &config.Route{
-		Receiver:          r.Receiver,
-		GroupByStr:        r.GroupByStr,
-		GroupBy:           r.GroupBy,
-		GroupByAll:        r.GroupByAll,
-		Match:             r.Match,
-		MatchRE:           r.MatchRE,
-		Matchers:          append(r.Matchers, r.ObjectMatchers...),
-		MuteTimeIntervals: r.MuteTimeIntervals,
-		Continue:          r.Continue,
-
-		GroupWait:      r.GroupWait,
-		GroupInterval:  r.GroupInterval,
-		RepeatInterval: r.RepeatInterval,
-
-		Routes: make([]*config.Route, 0, len(r.Routes)),
-	}
-	for _, rt := range r.Routes {
-		amRoute.Routes = append(amRoute.Routes, rt.AsAMRoute())
-	}
-
-	return amRoute
-}
-
-// AsGrafanaRoute returns a Grafana route from an Alertmanager route. The Matchers are converted to ObjectMatchers.
-func AsGrafanaRoute(r *config.Route) *Route {
-	gRoute := &Route{
-		Receiver:          r.Receiver,
-		GroupByStr:        r.GroupByStr,
-		GroupBy:           r.GroupBy,
-		GroupByAll:        r.GroupByAll,
-		Match:             r.Match,
-		MatchRE:           r.MatchRE,
-		ObjectMatchers:    ObjectMatchers(r.Matchers),
-		MuteTimeIntervals: r.MuteTimeIntervals,
-		Continue:          r.Continue,
-
-		GroupWait:      r.GroupWait,
-		GroupInterval:  r.GroupInterval,
-		RepeatInterval: r.RepeatInterval,
-
-		Routes: make([]*Route, 0, len(r.Routes)),
-	}
-	for _, rt := range r.Routes {
-		gRoute.Routes = append(gRoute.Routes, AsGrafanaRoute(rt))
-	}
-
-	return gRoute
-}
-
-func (r *Route) ResourceType() string {
-	return "route"
-}
-
-func (r *Route) ResourceID() string {
-	return ""
-}
-
-// Config is the entrypoint for the embedded Alertmanager config with the exception of receivers.
-// Prometheus historically uses yaml files as the method of configuration and thus some
-// post-validation is included in the UnmarshalYAML method. Here we simply run this with
-// a noop unmarshaling function in order to benefit from said validation.
-func (c *Config) UnmarshalJSON(b []byte) error {
-	type plain Config
-	if err := json.Unmarshal(b, (*plain)(c)); err != nil {
-		return err
-	}
-
-	noopUnmarshal := func(_ interface{}) error { return nil }
-
-	if c.Global != nil {
-		if err := c.Global.UnmarshalYAML(noopUnmarshal); err != nil {
-			return err
-		}
-	}
-
-	if c.Route == nil {
-		return fmt.Errorf("no routes provided")
-	}
-
-	err := c.Route.Validate()
-	if err != nil {
-		return err
-	}
-
-	for _, r := range c.InhibitRules {
-		if err := r.UnmarshalYAML(noopUnmarshal); err != nil {
-			return err
-		}
-	}
-
-	tiNames := make(map[string]struct{})
-	for _, mt := range c.MuteTimeIntervals {
-		if mt.Name == "" {
-			return fmt.Errorf("missing name in mute time interval")
-		}
-		if _, ok := tiNames[mt.Name]; ok {
-			return fmt.Errorf("mute time interval %q is not unique", mt.Name)
-		}
-		tiNames[mt.Name] = struct{}{}
-	}
-	return checkTimeInterval(c.Route, tiNames)
-}
-
-func checkTimeInterval(r *Route, timeIntervals map[string]struct{}) error {
-	for _, sr := range r.Routes {
-		if err := checkTimeInterval(sr, timeIntervals); err != nil {
-			return err
-		}
-	}
-	if len(r.MuteTimeIntervals) == 0 {
-		return nil
-	}
-	for _, mt := range r.MuteTimeIntervals {
-		if _, ok := timeIntervals[mt]; !ok {
-			return fmt.Errorf("undefined time interval %q used in route", mt)
-		}
-	}
-	return nil
-}
-
-type PostableApiAlertingConfig struct {
-	Config `yaml:",inline"`
-
-	// Override with our superset receiver type
-	Receivers []*PostableApiReceiver `yaml:"receivers,omitempty" json:"receivers,omitempty"`
-}
-
-func (c *PostableApiAlertingConfig) UnmarshalJSON(b []byte) error {
-	type plain PostableApiAlertingConfig
+func (c *GettableApiAlertingConfig) UnmarshalJSON(b []byte) error {
+	type plain GettableApiAlertingConfig
 	if err := json.Unmarshal(b, (*plain)(c)); err != nil {
 		return err
 	}
@@ -970,7 +809,7 @@ func (c *PostableApiAlertingConfig) UnmarshalJSON(b []byte) error {
 	// Otherwise, the json decoder will detect this and only use the embedded type.
 	// Additionally, we'll use pointers to slices in order to reference the intended target.
 	type overrides struct {
-		Receivers *[]*PostableApiReceiver `yaml:"receivers,omitempty" json:"receivers,omitempty"`
+		Receivers *[]*GettableApiReceiver `yaml:"receivers,omitempty" json:"receivers,omitempty"`
 	}
 
 	if err := json.Unmarshal(b, &overrides{Receivers: &c.Receivers}); err != nil {
@@ -981,7 +820,7 @@ func (c *PostableApiAlertingConfig) UnmarshalJSON(b []byte) error {
 }
 
 // validate ensures that the two routing trees use the correct receiver types.
-func (c *PostableApiAlertingConfig) validate() error {
+func (c *GettableApiAlertingConfig) validate() error {
 	receivers := make(map[string]struct{}, len(c.Receivers))
 
 	var hasGrafReceivers, hasAMReceivers bool
@@ -1001,21 +840,6 @@ func (c *PostableApiAlertingConfig) validate() error {
 		return fmt.Errorf("cannot mix Alertmanager & Grafana receiver types")
 	}
 
-	if hasGrafReceivers {
-		// Taken from https://github.com/prometheus/alertmanager/blob/master/config/config.go#L170-L191
-		// Check if we have a root route. We cannot check for it in the
-		// UnmarshalYAML method because it won't be called if the input is empty
-		// (e.g. the config file is empty or only contains whitespace).
-		if c.Route == nil {
-			return fmt.Errorf("no route provided in config")
-		}
-
-		// Check if continue in root route.
-		if c.Route.Continue {
-			return fmt.Errorf("cannot have continue in root route")
-		}
-	}
-
 	for _, receiver := range AllReceivers(c.Route.AsAMRoute()) {
 		_, ok := receivers[receiver]
 		if !ok {
@@ -1026,80 +850,6 @@ func (c *PostableApiAlertingConfig) validate() error {
 	return nil
 }
 
-// Type requires validate has been called and just checks the first receiver type
-func (c *PostableApiAlertingConfig) ReceiverType() ReceiverType {
-	for _, r := range c.Receivers {
-		switch r.Type() {
-		case GrafanaReceiverType:
-			return GrafanaReceiverType
-		case AlertmanagerReceiverType:
-			return AlertmanagerReceiverType
-		default:
-			continue
-		}
-	}
-	return EmptyReceiverType
-}
-
-// AllReceivers will recursively walk a routing tree and return a list of all the
-// referenced receiver names.
-func AllReceivers(route *config.Route) (res []string) {
-	if route == nil {
-		return res
-	}
-
-	if route.Receiver != "" {
-		res = append(res, route.Receiver)
-	}
-
-	for _, subRoute := range route.Routes {
-		res = append(res, AllReceivers(subRoute)...)
-	}
-	return res
-}
-
-type RawMessage json.RawMessage // This type alias adds YAML marshaling to the json.RawMessage.
-
-// MarshalJSON returns m as the JSON encoding of m.
-func (r RawMessage) MarshalJSON() ([]byte, error) {
-	return json.Marshal(json.RawMessage(r))
-}
-
-func (r *RawMessage) UnmarshalJSON(data []byte) error {
-	var raw json.RawMessage
-	err := json.Unmarshal(data, &raw)
-	if err != nil {
-		return err
-	}
-	*r = RawMessage(raw)
-	return nil
-}
-
-func (r *RawMessage) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	var data interface{}
-	if err := unmarshal(&data); err != nil {
-		return err
-	}
-	bytes, err := json.Marshal(data)
-	if err != nil {
-		return err
-	}
-	*r = bytes
-	return nil
-}
-
-func (r RawMessage) MarshalYAML() (interface{}, error) {
-	if r == nil {
-		return nil, nil
-	}
-	var d interface{}
-	err := json.Unmarshal(r, &d)
-	if err != nil {
-		return nil, err
-	}
-	return d, nil
-}
-
 type GettableGrafanaReceiver struct {
 	UID                   string          `json:"uid"`
 	Name                  string          `json:"name"`
@@ -1110,41 +860,6 @@ type GettableGrafanaReceiver struct {
 	Provenance            Provenance      `json:"provenance,omitempty"`
 }
 
-type PostableGrafanaReceiver struct {
-	UID                   string            `json:"uid"`
-	Name                  string            `json:"name"`
-	Type                  string            `json:"type"`
-	DisableResolveMessage bool              `json:"disableResolveMessage"`
-	Settings              RawMessage        `json:"settings,omitempty"`
-	SecureSettings        map[string]string `json:"secureSettings"`
-}
-
-type ReceiverType int
-
-const (
-	GrafanaReceiverType ReceiverType = 1 << iota
-	AlertmanagerReceiverType
-	EmptyReceiverType = GrafanaReceiverType | AlertmanagerReceiverType
-)
-
-func (r ReceiverType) String() string {
-	switch r {
-	case GrafanaReceiverType:
-		return "grafana"
-	case AlertmanagerReceiverType:
-		return "alertmanager"
-	case EmptyReceiverType:
-		return "empty"
-	default:
-		return "unknown"
-	}
-}
-
-// Can determines whether a receiver type can implement another receiver type.
-// This is useful as receivers with just names but no contact points
-// are valid in all backends.
-func (r ReceiverType) Can(other ReceiverType) bool { return r&other != 0 }
-
 type GettableApiReceiver struct {
 	config.Receiver          `yaml:",inline"`
 	GettableGrafanaReceivers `yaml:",inline"`
@@ -1195,186 +910,12 @@ func (r *GettableApiReceiver) Type() ReceiverType {
 	return AlertmanagerReceiverType
 }
 
-type PostableApiReceiver struct {
-	config.Receiver          `yaml:",inline"`
-	PostableGrafanaReceivers `yaml:",inline"`
-}
-
-func (r *PostableApiReceiver) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	if err := unmarshal(&r.PostableGrafanaReceivers); err != nil {
-		return err
-	}
-
-	if err := unmarshal(&r.Receiver); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (r *PostableApiReceiver) UnmarshalJSON(b []byte) error {
-	type plain PostableApiReceiver
-	if err := json.Unmarshal(b, (*plain)(r)); err != nil {
-		return err
-	}
-
-	hasGrafanaReceivers := len(r.PostableGrafanaReceivers.GrafanaManagedReceivers) > 0
-
-	if hasGrafanaReceivers {
-		if len(r.EmailConfigs) > 0 {
-			return fmt.Errorf("cannot have both Alertmanager EmailConfigs & Grafana receivers together")
-		}
-		if len(r.PagerdutyConfigs) > 0 {
-			return fmt.Errorf("cannot have both Alertmanager PagerdutyConfigs & Grafana receivers together")
-		}
-		if len(r.SlackConfigs) > 0 {
-			return fmt.Errorf("cannot have both Alertmanager SlackConfigs & Grafana receivers together")
-		}
-		if len(r.WebhookConfigs) > 0 {
-			return fmt.Errorf("cannot have both Alertmanager WebhookConfigs & Grafana receivers together")
-		}
-		if len(r.OpsGenieConfigs) > 0 {
-			return fmt.Errorf("cannot have both Alertmanager OpsGenieConfigs & Grafana receivers together")
-		}
-		if len(r.WechatConfigs) > 0 {
-			return fmt.Errorf("cannot have both Alertmanager WechatConfigs & Grafana receivers together")
-		}
-		if len(r.PushoverConfigs) > 0 {
-			return fmt.Errorf("cannot have both Alertmanager PushoverConfigs & Grafana receivers together")
-		}
-		if len(r.VictorOpsConfigs) > 0 {
-			return fmt.Errorf("cannot have both Alertmanager VictorOpsConfigs & Grafana receivers together")
-		}
-	}
-	return nil
-}
-
-func (r *PostableApiReceiver) Type() ReceiverType {
-	if len(r.PostableGrafanaReceivers.GrafanaManagedReceivers) > 0 {
-		return GrafanaReceiverType
-	}
-
-	cpy := r.Receiver
-	cpy.Name = ""
-	if reflect.ValueOf(cpy).IsZero() {
-		return EmptyReceiverType
-	}
-
-	return AlertmanagerReceiverType
+func (r *GettableApiReceiver) GetName() string {
+	return r.Receiver.Name
 }
 
 type GettableGrafanaReceivers struct {
 	GrafanaManagedReceivers []*GettableGrafanaReceiver `yaml:"grafana_managed_receiver_configs,omitempty" json:"grafana_managed_receiver_configs,omitempty"`
 }
 
-type PostableGrafanaReceivers struct {
-	GrafanaManagedReceivers []*PostableGrafanaReceiver `yaml:"grafana_managed_receiver_configs,omitempty" json:"grafana_managed_receiver_configs,omitempty"`
-}
-
 type EncryptFn func(ctx context.Context, payload []byte) ([]byte, error)
-
-// ObjectMatchers is Matchers with a different Unmarshal and Marshal methods that accept matchers as objects
-// that have already been parsed.
-type ObjectMatchers labels.Matchers
-
-// UnmarshalYAML implements the yaml.Unmarshaler interface for Matchers.
-func (m *ObjectMatchers) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	var rawMatchers [][3]string
-	if err := unmarshal(&rawMatchers); err != nil {
-		return err
-	}
-	for _, rawMatcher := range rawMatchers {
-		var matchType labels.MatchType
-		switch rawMatcher[1] {
-		case "=":
-			matchType = labels.MatchEqual
-		case "!=":
-			matchType = labels.MatchNotEqual
-		case "=~":
-			matchType = labels.MatchRegexp
-		case "!~":
-			matchType = labels.MatchNotRegexp
-		default:
-			return fmt.Errorf("unsupported match type %q in matcher", rawMatcher[1])
-		}
-
-		// When Prometheus serializes a matcher, the value gets wrapped in quotes:
-		// https://github.com/prometheus/alertmanager/blob/main/pkg/labels/matcher.go#L77
-		// Remove these quotes so that we are matching against the right value.
-		//
-		// This is a stop-gap solution which will be superceded by https://github.com/grafana/grafana/issues/50040.
-		//
-		// The ngalert migration converts matchers into the Prom-style, quotes included.
-		// The UI then stores the quotes into ObjectMatchers without removing them.
-		// This approach allows these extra quotes to be stored in the database, and fixes them at read time.
-		// This works because the database stores matchers as JSON text.
-		//
-		// There is a subtle bug here, where users might intentionally add quotes to matchers. This method can remove such quotes.
-		// Since ObjectMatchers will be deprecated entirely, this bug will go away naturally with time.
-		rawMatcher[2] = strings.TrimPrefix(rawMatcher[2], "\"")
-		rawMatcher[2] = strings.TrimSuffix(rawMatcher[2], "\"")
-
-		matcher, err := labels.NewMatcher(matchType, rawMatcher[0], rawMatcher[2])
-		if err != nil {
-			return err
-		}
-		*m = append(*m, matcher)
-	}
-	sort.Sort(labels.Matchers(*m))
-	return nil
-}
-
-// UnmarshalJSON implements the json.Unmarshaler interface for Matchers.
-func (m *ObjectMatchers) UnmarshalJSON(data []byte) error {
-	var rawMatchers [][3]string
-	if err := json.Unmarshal(data, &rawMatchers); err != nil {
-		return err
-	}
-	for _, rawMatcher := range rawMatchers {
-		var matchType labels.MatchType
-		switch rawMatcher[1] {
-		case "=":
-			matchType = labels.MatchEqual
-		case "!=":
-			matchType = labels.MatchNotEqual
-		case "=~":
-			matchType = labels.MatchRegexp
-		case "!~":
-			matchType = labels.MatchNotRegexp
-		default:
-			return fmt.Errorf("unsupported match type %q in matcher", rawMatcher[1])
-		}
-
-		rawMatcher[2] = strings.TrimPrefix(rawMatcher[2], "\"")
-		rawMatcher[2] = strings.TrimSuffix(rawMatcher[2], "\"")
-
-		matcher, err := labels.NewMatcher(matchType, rawMatcher[0], rawMatcher[2])
-		if err != nil {
-			return err
-		}
-		*m = append(*m, matcher)
-	}
-	sort.Sort(labels.Matchers(*m))
-	return nil
-}
-
-// MarshalYAML implements the yaml.Marshaler interface for Matchers.
-func (m ObjectMatchers) MarshalYAML() (interface{}, error) {
-	result := make([][3]string, len(m))
-	for i, matcher := range m {
-		result[i] = [3]string{matcher.Name, matcher.Type.String(), matcher.Value}
-	}
-	return result, nil
-}
-
-// MarshalJSON implements the json.Marshaler interface for Matchers.
-func (m ObjectMatchers) MarshalJSON() ([]byte, error) {
-	if len(m) == 0 {
-		return nil, nil
-	}
-	result := make([][3]string, len(m))
-	for i, matcher := range m {
-		result[i] = [3]string{matcher.Name, matcher.Type.String(), matcher.Value}
-	}
-	return json.Marshal(result)
-}
diff --git a/pkg/services/ngalert/api/tooling/definitions/alertmanager_test.go b/pkg/services/ngalert/api/tooling/definitions/alertmanager_test.go
index 224c484fd4043..55821b9ba58c9 100644
--- a/pkg/services/ngalert/api/tooling/definitions/alertmanager_test.go
+++ b/pkg/services/ngalert/api/tooling/definitions/alertmanager_test.go
@@ -2,7 +2,6 @@ package definitions
 
 import (
 	"encoding/json"
-	"errors"
 	"os"
 	"strings"
 	"testing"
@@ -14,675 +13,6 @@ import (
 	"gopkg.in/yaml.v3"
 )
 
-func Test_ApiReceiver_Marshaling(t *testing.T) {
-	for _, tc := range []struct {
-		desc  string
-		input PostableApiReceiver
-		err   bool
-	}{
-		{
-			desc: "success AM",
-			input: PostableApiReceiver{
-				Receiver: config.Receiver{
-					Name:         "foo",
-					EmailConfigs: []*config.EmailConfig{{}},
-				},
-			},
-		},
-		{
-			desc: "success GM",
-			input: PostableApiReceiver{
-				Receiver: config.Receiver{
-					Name: "foo",
-				},
-				PostableGrafanaReceivers: PostableGrafanaReceivers{
-					GrafanaManagedReceivers: []*PostableGrafanaReceiver{{}},
-				},
-			},
-		},
-		{
-			desc: "failure mixed",
-			input: PostableApiReceiver{
-				Receiver: config.Receiver{
-					Name:         "foo",
-					EmailConfigs: []*config.EmailConfig{{}},
-				},
-				PostableGrafanaReceivers: PostableGrafanaReceivers{
-					GrafanaManagedReceivers: []*PostableGrafanaReceiver{{}},
-				},
-			},
-			err: true,
-		},
-	} {
-		t.Run(tc.desc, func(t *testing.T) {
-			encoded, err := json.Marshal(tc.input)
-			require.Nil(t, err)
-
-			var out PostableApiReceiver
-			err = json.Unmarshal(encoded, &out)
-
-			if tc.err {
-				require.Error(t, err)
-			} else {
-				require.Nil(t, err)
-				require.Equal(t, tc.input, out)
-			}
-		})
-	}
-}
-
-func Test_APIReceiverType(t *testing.T) {
-	for _, tc := range []struct {
-		desc     string
-		input    PostableApiReceiver
-		expected ReceiverType
-	}{
-		{
-			desc: "empty",
-			input: PostableApiReceiver{
-				Receiver: config.Receiver{
-					Name: "foo",
-				},
-			},
-			expected: EmptyReceiverType,
-		},
-		{
-			desc: "am",
-			input: PostableApiReceiver{
-				Receiver: config.Receiver{
-					Name:         "foo",
-					EmailConfigs: []*config.EmailConfig{{}},
-				},
-			},
-			expected: AlertmanagerReceiverType,
-		},
-		{
-			desc: "graf",
-			input: PostableApiReceiver{
-				Receiver: config.Receiver{
-					Name: "foo",
-				},
-				PostableGrafanaReceivers: PostableGrafanaReceivers{
-					GrafanaManagedReceivers: []*PostableGrafanaReceiver{{}},
-				},
-			},
-			expected: GrafanaReceiverType,
-		},
-	} {
-		t.Run(tc.desc, func(t *testing.T) {
-			require.Equal(t, tc.expected, tc.input.Type())
-		})
-	}
-}
-
-func Test_AllReceivers(t *testing.T) {
-	input := &Route{
-		Receiver: "foo",
-		Routes: []*Route{
-			{
-				Receiver: "bar",
-				Routes: []*Route{
-					{
-						Receiver: "bazz",
-					},
-				},
-			},
-			{
-				Receiver: "buzz",
-			},
-		},
-	}
-
-	require.Equal(t, []string{"foo", "bar", "bazz", "buzz"}, AllReceivers(input.AsAMRoute()))
-
-	// test empty
-	var empty []string
-	emptyRoute := &Route{}
-	require.Equal(t, empty, AllReceivers(emptyRoute.AsAMRoute()))
-}
-
-func Test_ApiAlertingConfig_Marshaling(t *testing.T) {
-	for _, tc := range []struct {
-		desc  string
-		input PostableApiAlertingConfig
-		err   bool
-	}{
-		{
-			desc: "success am",
-			input: PostableApiAlertingConfig{
-				Config: Config{
-					Route: &Route{
-						Receiver: "am",
-						Routes: []*Route{
-							{
-								Receiver: "am",
-							},
-						},
-					},
-				},
-				Receivers: []*PostableApiReceiver{
-					{
-						Receiver: config.Receiver{
-							Name:         "am",
-							EmailConfigs: []*config.EmailConfig{{}},
-						},
-					},
-				},
-			},
-		},
-		{
-			desc: "success graf",
-			input: PostableApiAlertingConfig{
-				Config: Config{
-					Route: &Route{
-						Receiver: "graf",
-						Routes: []*Route{
-							{
-								Receiver: "graf",
-							},
-						},
-					},
-				},
-				Receivers: []*PostableApiReceiver{
-					{
-						Receiver: config.Receiver{
-							Name: "graf",
-						},
-						PostableGrafanaReceivers: PostableGrafanaReceivers{
-							GrafanaManagedReceivers: []*PostableGrafanaReceiver{{}},
-						},
-					},
-				},
-			},
-		},
-		{
-			desc: "failure undefined am receiver",
-			input: PostableApiAlertingConfig{
-				Config: Config{
-					Route: &Route{
-						Receiver: "am",
-						Routes: []*Route{
-							{
-								Receiver: "unmentioned",
-							},
-						},
-					},
-				},
-				Receivers: []*PostableApiReceiver{
-					{
-						Receiver: config.Receiver{
-							Name:         "am",
-							EmailConfigs: []*config.EmailConfig{{}},
-						},
-					},
-				},
-			},
-			err: true,
-		},
-		{
-			desc: "failure undefined graf receiver",
-			input: PostableApiAlertingConfig{
-				Config: Config{
-					Route: &Route{
-						Receiver: "graf",
-						Routes: []*Route{
-							{
-								Receiver: "unmentioned",
-							},
-						},
-					},
-				},
-				Receivers: []*PostableApiReceiver{
-					{
-						Receiver: config.Receiver{
-							Name: "graf",
-						},
-						PostableGrafanaReceivers: PostableGrafanaReceivers{
-							GrafanaManagedReceivers: []*PostableGrafanaReceiver{{}},
-						},
-					},
-				},
-			},
-			err: true,
-		},
-		{
-			desc: "failure graf no route",
-			input: PostableApiAlertingConfig{
-				Receivers: []*PostableApiReceiver{
-					{
-						Receiver: config.Receiver{
-							Name: "graf",
-						},
-						PostableGrafanaReceivers: PostableGrafanaReceivers{
-							GrafanaManagedReceivers: []*PostableGrafanaReceiver{{}},
-						},
-					},
-				},
-			},
-			err: true,
-		},
-		{
-			desc: "failure graf no default receiver",
-			input: PostableApiAlertingConfig{
-				Config: Config{
-					Route: &Route{
-						Routes: []*Route{
-							{
-								Receiver: "graf",
-							},
-						},
-					},
-				},
-				Receivers: []*PostableApiReceiver{
-					{
-						Receiver: config.Receiver{
-							Name: "graf",
-						},
-						PostableGrafanaReceivers: PostableGrafanaReceivers{
-							GrafanaManagedReceivers: []*PostableGrafanaReceiver{{}},
-						},
-					},
-				},
-			},
-			err: true,
-		},
-		{
-			desc: "failure graf root route with matchers",
-			input: PostableApiAlertingConfig{
-				Config: Config{
-					Route: &Route{
-						Receiver: "graf",
-						Routes: []*Route{
-							{
-								Receiver: "graf",
-							},
-						},
-						Match: map[string]string{"foo": "bar"},
-					},
-				},
-				Receivers: []*PostableApiReceiver{
-					{
-						Receiver: config.Receiver{
-							Name: "graf",
-						},
-						PostableGrafanaReceivers: PostableGrafanaReceivers{
-							GrafanaManagedReceivers: []*PostableGrafanaReceiver{{}},
-						},
-					},
-				},
-			},
-			err: true,
-		},
-		{
-			desc: "failure graf nested route duplicate group by labels",
-			input: PostableApiAlertingConfig{
-				Config: Config{
-					Route: &Route{
-						Receiver: "graf",
-						Routes: []*Route{
-							{
-								Receiver:   "graf",
-								GroupByStr: []string{"foo", "bar", "foo"},
-							},
-						},
-					},
-				},
-				Receivers: []*PostableApiReceiver{
-					{
-						Receiver: config.Receiver{
-							Name: "graf",
-						},
-						PostableGrafanaReceivers: PostableGrafanaReceivers{
-							GrafanaManagedReceivers: []*PostableGrafanaReceiver{{}},
-						},
-					},
-				},
-			},
-			err: true,
-		},
-	} {
-		t.Run(tc.desc, func(t *testing.T) {
-			encoded, err := json.Marshal(tc.input)
-			require.Nil(t, err)
-
-			var out PostableApiAlertingConfig
-			err = json.Unmarshal(encoded, &out)
-
-			if tc.err {
-				require.Error(t, err)
-			} else {
-				require.Nil(t, err)
-				require.Equal(t, tc.input, out)
-			}
-		})
-	}
-}
-
-func Test_PostableApiReceiver_Unmarshaling_YAML(t *testing.T) {
-	for _, tc := range []struct {
-		desc  string
-		input string
-		rtype ReceiverType
-	}{
-		{
-			desc: "grafana receivers",
-			input: `
-name: grafana_managed
-grafana_managed_receiver_configs:
-  - uid: alertmanager UID
-    name: an alert manager receiver
-    type: prometheus-alertmanager
-    sendreminder: false
-    disableresolvemessage: false
-    frequency: 5m
-    isdefault: false
-    settings: {}
-    securesettings:
-      basicAuthPassword: <basicAuthPassword>
-  - uid: dingding UID
-    name: a dingding receiver
-    type: dingding
-    sendreminder: false
-    disableresolvemessage: false
-    frequency: 5m
-    isdefault: false`,
-			rtype: GrafanaReceiverType,
-		},
-		{
-			desc: "receiver",
-			input: `
-name: example-email
-email_configs:
-  - to: 'youraddress@example.org'`,
-			rtype: AlertmanagerReceiverType,
-		},
-	} {
-		t.Run(tc.desc, func(t *testing.T) {
-			var r PostableApiReceiver
-			err := yaml.Unmarshal([]byte(tc.input), &r)
-			require.Nil(t, err)
-			assert.Equal(t, tc.rtype, r.Type())
-		})
-	}
-}
-
-func Test_ConfigUnmashaling(t *testing.T) {
-	for _, tc := range []struct {
-		desc, input string
-		err         error
-	}{
-		{
-			desc: "empty mute time name should error",
-			err:  errors.New("missing name in mute time interval"),
-			input: `
-				{
-				  "route": {
-					"receiver": "grafana-default-email"
-				  },
-				  "mute_time_intervals": [
-					{
-					  "name": "",
-					  "time_intervals": [
-						{
-						  "times": [
-							{
-							  "start_time": "00:00",
-							  "end_time": "12:00"
-							}
-						  ]
-						}
-					  ]
-					}
-				  ],
-				  "templates": null,
-				  "receivers": [
-					{
-					  "name": "grafana-default-email",
-					  "grafana_managed_receiver_configs": [
-						{
-						  "uid": "uxwfZvtnz",
-						  "name": "email receiver",
-						  "type": "email",
-						  "disableResolveMessage": false,
-						  "settings": {
-							"addresses": "<example@email.com>"
-						  },
-						  "secureFields": {}
-						}
-					  ]
-					}
-				  ]
-				}
-			`,
-		},
-		{
-			desc: "not unique mute time names should error",
-			err:  errors.New("mute time interval \"test1\" is not unique"),
-			input: `
-				{
-				  "route": {
-					"receiver": "grafana-default-email"
-				  },
-				  "mute_time_intervals": [
-					{
-					  "name": "test1",
-					  "time_intervals": [
-						{
-						  "times": [
-							{
-							  "start_time": "00:00",
-							  "end_time": "12:00"
-							}
-						  ]
-						}
-					  ]
-					},
-					{
-						"name": "test1",
-						"time_intervals": [
-						  {
-							"times": [
-							  {
-								"start_time": "00:00",
-								"end_time": "12:00"
-							  }
-							]
-						  }
-						]
-					  }
-				  ],
-				  "templates": null,
-				  "receivers": [
-					{
-					  "name": "grafana-default-email",
-					  "grafana_managed_receiver_configs": [
-						{
-						  "uid": "uxwfZvtnz",
-						  "name": "email receiver",
-						  "type": "email",
-						  "disableResolveMessage": false,
-						  "settings": {
-							"addresses": "<example@email.com>"
-						  },
-						  "secureFields": {}
-						}
-					  ]
-					}
-				  ]
-				}
-			`,
-		},
-		{
-			desc: "mute time intervals on root route should error",
-			err:  errors.New("root route must not have any mute time intervals"),
-			input: `
-				{
-				  "route": {
-					"receiver": "grafana-default-email",
-					"mute_time_intervals": ["test1"]
-				  },
-				  "mute_time_intervals": [
-					{
-					  "name": "test1",
-					  "time_intervals": [
-						{
-						  "times": [
-							{
-							  "start_time": "00:00",
-							  "end_time": "12:00"
-							}
-						  ]
-						}
-					  ]
-					}
-				  ],
-				  "templates": null,
-				  "receivers": [
-					{
-					  "name": "grafana-default-email",
-					  "grafana_managed_receiver_configs": [
-						{
-						  "uid": "uxwfZvtnz",
-						  "name": "email receiver",
-						  "type": "email",
-						  "disableResolveMessage": false,
-						  "settings": {
-							"addresses": "<example@email.com>"
-						  },
-						  "secureFields": {}
-						}
-					  ]
-					}
-				  ]
-				}
-			`,
-		},
-		{
-			desc: "undefined mute time names in routes should error",
-			err:  errors.New("undefined time interval \"test2\" used in route"),
-			input: `
-				{
-				  "route": {
-					"receiver": "grafana-default-email",
-					"routes": [
-						{
-						  "receiver": "grafana-default-email",
-						  "object_matchers": [
-							[
-							  "a",
-							  "=",
-							  "b"
-							]
-						  ],
-						  "mute_time_intervals": [
-							"test2"
-						  ]
-						}
-					  ]
-				  },
-				  "mute_time_intervals": [
-					{
-					  "name": "test1",
-					  "time_intervals": [
-						{
-						  "times": [
-							{
-							  "start_time": "00:00",
-							  "end_time": "12:00"
-							}
-						  ]
-						}
-					  ]
-					}
-				  ],
-				  "templates": null,
-				  "receivers": [
-					{
-					  "name": "grafana-default-email",
-					  "grafana_managed_receiver_configs": [
-						{
-						  "uid": "uxwfZvtnz",
-						  "name": "email receiver",
-						  "type": "email",
-						  "disableResolveMessage": false,
-						  "settings": {
-							"addresses": "<example@email.com>"
-						  },
-						  "secureFields": {}
-						}
-					  ]
-					}
-				  ]
-				}
-			`,
-		},
-		{
-			desc: "valid config should not error",
-			input: `
-				{
-				  "route": {
-					"receiver": "grafana-default-email",
-					"routes": [
-						{
-						  "receiver": "grafana-default-email",
-						  "object_matchers": [
-							[
-							  "a",
-							  "=",
-							  "b"
-							]
-						  ],
-						  "mute_time_intervals": [
-							"test1"
-						  ]
-						}
-					  ]
-				  },
-				  "mute_time_intervals": [
-					{
-					  "name": "test1",
-					  "time_intervals": [
-						{
-						  "times": [
-							{
-							  "start_time": "00:00",
-							  "end_time": "12:00"
-							}
-						  ]
-						}
-					  ]
-					}
-				  ],
-				  "templates": null,
-				  "receivers": [
-					{
-					  "name": "grafana-default-email",
-					  "grafana_managed_receiver_configs": [
-						{
-						  "uid": "uxwfZvtnz",
-						  "name": "email receiver",
-						  "type": "email",
-						  "disableResolveMessage": false,
-						  "settings": {
-							"addresses": "<example@email.com>"
-						  },
-						  "secureFields": {}
-						}
-					  ]
-					}
-				  ]
-				}
-			`,
-		},
-	} {
-		t.Run(tc.desc, func(t *testing.T) {
-			var out Config
-			err := json.Unmarshal([]byte(tc.input), &out)
-			require.Equal(t, tc.err, err)
-		})
-	}
-}
-
 func Test_GettableUserConfigUnmarshaling(t *testing.T) {
 	for _, tc := range []struct {
 		desc, input string
@@ -829,207 +159,6 @@ func Test_GettableUserConfigRoundtrip(t *testing.T) {
 	require.Equal(t, string(yamlEncoded), string(out))
 }
 
-func Test_ReceiverCompatibility(t *testing.T) {
-	for _, tc := range []struct {
-		desc     string
-		a, b     ReceiverType
-		expected bool
-	}{
-		{
-			desc:     "grafana=grafana",
-			a:        GrafanaReceiverType,
-			b:        GrafanaReceiverType,
-			expected: true,
-		},
-		{
-			desc:     "am=am",
-			a:        AlertmanagerReceiverType,
-			b:        AlertmanagerReceiverType,
-			expected: true,
-		},
-		{
-			desc:     "empty=grafana",
-			a:        EmptyReceiverType,
-			b:        AlertmanagerReceiverType,
-			expected: true,
-		},
-		{
-			desc:     "empty=am",
-			a:        EmptyReceiverType,
-			b:        AlertmanagerReceiverType,
-			expected: true,
-		},
-		{
-			desc:     "empty=empty",
-			a:        EmptyReceiverType,
-			b:        EmptyReceiverType,
-			expected: true,
-		},
-		{
-			desc:     "graf!=am",
-			a:        GrafanaReceiverType,
-			b:        AlertmanagerReceiverType,
-			expected: false,
-		},
-		{
-			desc:     "am!=graf",
-			a:        AlertmanagerReceiverType,
-			b:        GrafanaReceiverType,
-			expected: false,
-		},
-	} {
-		t.Run(tc.desc, func(t *testing.T) {
-			require.Equal(t, tc.expected, tc.a.Can(tc.b))
-		})
-	}
-}
-
-func Test_ReceiverMatchesBackend(t *testing.T) {
-	for _, tc := range []struct {
-		desc string
-		rec  ReceiverType
-		b    ReceiverType
-		ok   bool
-	}{
-		{
-			desc: "graf=graf",
-			rec:  GrafanaReceiverType,
-			b:    GrafanaReceiverType,
-			ok:   true,
-		},
-		{
-			desc: "empty=graf",
-			rec:  EmptyReceiverType,
-			b:    GrafanaReceiverType,
-			ok:   true,
-		},
-		{
-			desc: "am=am",
-			rec:  AlertmanagerReceiverType,
-			b:    AlertmanagerReceiverType,
-			ok:   true,
-		},
-		{
-			desc: "empty=am",
-			rec:  EmptyReceiverType,
-			b:    AlertmanagerReceiverType,
-			ok:   true,
-		},
-		{
-			desc: "graf!=am",
-			rec:  GrafanaReceiverType,
-			b:    AlertmanagerReceiverType,
-			ok:   false,
-		},
-	} {
-		t.Run(tc.desc, func(t *testing.T) {
-			ok := tc.rec.Can(tc.b)
-			require.Equal(t, tc.ok, ok)
-		})
-	}
-}
-
-func TestObjectMatchers_UnmarshalJSON(t *testing.T) {
-	j := `{
-		"receiver": "autogen-contact-point-default",
-		"routes": [{
-			"receiver": "autogen-contact-point-1",
-			"object_matchers": [
-				[
-					"a",
-					"=",
-					"MFR3Gxrnk"
-				],
-				[
-					"b",
-					"=",
-					"\"MFR3Gxrnk\""
-				],
-				[
-					"c",
-					"=~",
-					"^[a-z0-9-]{1}[a-z0-9-]{0,30}$"
-				],
-				[
-					"d",
-					"=~",
-					"\"^[a-z0-9-]{1}[a-z0-9-]{0,30}$\""
-				]
-			],
-			"group_interval": "3s",
-			"repeat_interval": "10s"
-		}]
-}`
-	var r Route
-	if err := json.Unmarshal([]byte(j), &r); err != nil {
-		require.NoError(t, err)
-	}
-
-	matchers := r.Routes[0].ObjectMatchers
-
-	// Without quotes.
-	require.Equal(t, matchers[0].Name, "a")
-	require.Equal(t, matchers[0].Value, "MFR3Gxrnk")
-
-	// With double quotes.
-	require.Equal(t, matchers[1].Name, "b")
-	require.Equal(t, matchers[1].Value, "MFR3Gxrnk")
-
-	// Regexp without quotes.
-	require.Equal(t, matchers[2].Name, "c")
-	require.Equal(t, matchers[2].Value, "^[a-z0-9-]{1}[a-z0-9-]{0,30}$")
-
-	// Regexp with quotes.
-	require.Equal(t, matchers[3].Name, "d")
-	require.Equal(t, matchers[3].Value, "^[a-z0-9-]{1}[a-z0-9-]{0,30}$")
-}
-
-func TestObjectMatchers_UnmarshalYAML(t *testing.T) {
-	y := `---
-receiver: autogen-contact-point-default
-routes:
-- receiver: autogen-contact-point-1
-  object_matchers:
-  - - a
-    - "="
-    - MFR3Gxrnk
-  - - b
-    - "="
-    - '"MFR3Gxrnk"'
-  - - c
-    - "=~"
-    - "^[a-z0-9-]{1}[a-z0-9-]{0,30}$"
-  - - d
-    - "=~"
-    - '"^[a-z0-9-]{1}[a-z0-9-]{0,30}$"'
-  group_interval: 3s
-  repeat_interval: 10s
-`
-
-	var r Route
-	if err := yaml.Unmarshal([]byte(y), &r); err != nil {
-		require.NoError(t, err)
-	}
-
-	matchers := r.Routes[0].ObjectMatchers
-
-	// Without quotes.
-	require.Equal(t, matchers[0].Name, "a")
-	require.Equal(t, matchers[0].Value, "MFR3Gxrnk")
-
-	// With double quotes.
-	require.Equal(t, matchers[1].Name, "b")
-	require.Equal(t, matchers[1].Value, "MFR3Gxrnk")
-
-	// Regexp without quotes.
-	require.Equal(t, matchers[2].Name, "c")
-	require.Equal(t, matchers[2].Value, "^[a-z0-9-]{1}[a-z0-9-]{0,30}$")
-
-	// Regexp with quotes.
-	require.Equal(t, matchers[3].Name, "d")
-	require.Equal(t, matchers[3].Value, "^[a-z0-9-]{1}[a-z0-9-]{0,30}$")
-}
-
 func Test_Marshaling_Validation(t *testing.T) {
 	jsonEncoded, err := os.ReadFile("alertmanager_test_artifact.json")
 	require.Nil(t, err)
diff --git a/pkg/services/ngalert/api/tooling/definitions/alertmanager_validation.go b/pkg/services/ngalert/api/tooling/definitions/alertmanager_validation.go
index 276f30ee2eb45..72ca0ebb730fe 100644
--- a/pkg/services/ngalert/api/tooling/definitions/alertmanager_validation.go
+++ b/pkg/services/ngalert/api/tooling/definitions/alertmanager_validation.go
@@ -6,58 +6,11 @@ import (
 	"regexp"
 	"strings"
 	tmpltext "text/template"
-	"time"
 
 	"github.com/prometheus/alertmanager/template"
-	"github.com/prometheus/common/model"
 	"gopkg.in/yaml.v3"
 )
 
-// Validate normalizes a possibly nested Route r, and returns errors if r is invalid.
-func (r *Route) validateChild() error {
-	r.GroupBy = nil
-	r.GroupByAll = false
-	for _, l := range r.GroupByStr {
-		if l == "..." {
-			r.GroupByAll = true
-		} else {
-			r.GroupBy = append(r.GroupBy, model.LabelName(l))
-		}
-	}
-
-	if len(r.GroupBy) > 0 && r.GroupByAll {
-		return fmt.Errorf("cannot have wildcard group_by (`...`) and other other labels at the same time")
-	}
-
-	groupBy := map[model.LabelName]struct{}{}
-
-	for _, ln := range r.GroupBy {
-		if _, ok := groupBy[ln]; ok {
-			return fmt.Errorf("duplicated label %q in group_by, %s %s", ln, r.Receiver, r.GroupBy)
-		}
-		groupBy[ln] = struct{}{}
-	}
-
-	if r.GroupInterval != nil && time.Duration(*r.GroupInterval) == time.Duration(0) {
-		return fmt.Errorf("group_interval cannot be zero")
-	}
-	if r.RepeatInterval != nil && time.Duration(*r.RepeatInterval) == time.Duration(0) {
-		return fmt.Errorf("repeat_interval cannot be zero")
-	}
-
-	// Routes are a self-referential structure.
-	if r.Routes != nil {
-		for _, child := range r.Routes {
-			err := child.validateChild()
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
 func (t *NotificationTemplate) Validate() error {
 	if t.Name == "" {
 		return fmt.Errorf("template must have a name")
@@ -99,48 +52,6 @@ func (t *NotificationTemplate) Validate() error {
 	return nil
 }
 
-// Validate normalizes a Route r, and returns errors if r is an invalid root route. Root routes must satisfy a few additional conditions.
-func (r *Route) Validate() error {
-	if len(r.Receiver) == 0 {
-		return fmt.Errorf("root route must specify a default receiver")
-	}
-	if len(r.Match) > 0 || len(r.MatchRE) > 0 {
-		return fmt.Errorf("root route must not have any matchers")
-	}
-	if len(r.MuteTimeIntervals) > 0 {
-		return fmt.Errorf("root route must not have any mute time intervals")
-	}
-	return r.validateChild()
-}
-
-func (r *Route) ValidateReceivers(receivers map[string]struct{}) error {
-	if _, exists := receivers[r.Receiver]; !exists {
-		return fmt.Errorf("receiver '%s' does not exist", r.Receiver)
-	}
-	for _, children := range r.Routes {
-		err := children.ValidateReceivers(receivers)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (r *Route) ValidateMuteTimes(muteTimes map[string]struct{}) error {
-	for _, name := range r.MuteTimeIntervals {
-		if _, exists := muteTimes[name]; !exists {
-			return fmt.Errorf("mute time interval '%s' does not exist", name)
-		}
-	}
-	for _, child := range r.Routes {
-		err := child.ValidateMuteTimes(muteTimes)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 func (mt *MuteTimeInterval) Validate() error {
 	s, err := yaml.Marshal(mt.MuteTimeInterval)
 	if err != nil {
diff --git a/pkg/services/ngalert/api/tooling/definitions/alertmanager_validation_test.go b/pkg/services/ngalert/api/tooling/definitions/alertmanager_validation_test.go
index cfb504b7291f7..4fbbd983b1342 100644
--- a/pkg/services/ngalert/api/tooling/definitions/alertmanager_validation_test.go
+++ b/pkg/services/ngalert/api/tooling/definitions/alertmanager_validation_test.go
@@ -48,7 +48,7 @@ func TestValidateRoutes(t *testing.T) {
 
 		for _, c := range cases {
 			t.Run(c.desc, func(t *testing.T) {
-				err := c.route.validateChild()
+				err := c.route.ValidateChild()
 
 				require.NoError(t, err)
 			})
@@ -117,7 +117,7 @@ func TestValidateRoutes(t *testing.T) {
 
 		for _, c := range cases {
 			t.Run(c.desc, func(t *testing.T) {
-				err := c.route.validateChild()
+				err := c.route.ValidateChild()
 
 				require.Error(t, err)
 				require.Contains(t, err.Error(), c.expMsg)
@@ -132,7 +132,7 @@ func TestValidateRoutes(t *testing.T) {
 				GroupByStr: []string{"abc", "def"},
 			}
 
-			_ = route.validateChild()
+			_ = route.ValidateChild()
 
 			require.False(t, route.GroupByAll)
 			require.Equal(t, []model.LabelName{"abc", "def"}, route.GroupBy)
@@ -144,7 +144,7 @@ func TestValidateRoutes(t *testing.T) {
 				GroupByStr: []string{"..."},
 			}
 
-			_ = route.validateChild()
+			_ = route.ValidateChild()
 
 			require.True(t, route.GroupByAll)
 			require.Nil(t, route.GroupBy)
@@ -156,9 +156,9 @@ func TestValidateRoutes(t *testing.T) {
 				GroupByStr: []string{"abc", "def"},
 			}
 
-			err := route.validateChild()
+			err := route.ValidateChild()
 			require.NoError(t, err)
-			err = route.validateChild()
+			err = route.ValidateChild()
 			require.NoError(t, err)
 
 			require.False(t, route.GroupByAll)
diff --git a/pkg/services/ngalert/api/tooling/definitions/api.go b/pkg/services/ngalert/api/tooling/definitions/api.go
index b1a5b1a9fdeae..0c9c6786dc9b9 100644
--- a/pkg/services/ngalert/api/tooling/definitions/api.go
+++ b/pkg/services/ngalert/api/tooling/definitions/api.go
@@ -4,7 +4,7 @@
 // spec for the Grafana Alerting API.
 //
 //	 Schemes: http, https
-//	 BasePath: /api/v1
+//	 BasePath: /api
 //	 Version: 1.1.0
 //
 //	 Consumes:
diff --git a/pkg/services/ngalert/api/tooling/definitions/contact_points.go b/pkg/services/ngalert/api/tooling/definitions/contact_points.go
index 3f484be097f27..b5569aa2845fd 100644
--- a/pkg/services/ngalert/api/tooling/definitions/contact_points.go
+++ b/pkg/services/ngalert/api/tooling/definitions/contact_points.go
@@ -100,17 +100,25 @@ type OnCallIntegration struct {
 	Message                  *string `json:"message,omitempty" yaml:"message,omitempty" hcl:"message"`
 }
 
+type OpsgenieIntegrationResponder struct {
+	ID       *string `json:"id,omitempty" yaml:"id,omitempty" hcl:"id"`
+	Name     *string `json:"name,omitempty" yaml:"name,omitempty" hcl:"name"`
+	Username *string `json:"username,omitempty" yaml:"username,omitempty" hcl:"username"`
+	Type     string  `json:"type" yaml:"type" hcl:"type"`
+}
+
 type OpsgenieIntegration struct {
 	DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"`
 
 	APIKey Secret `json:"apiKey" yaml:"apiKey" hcl:"api_key"`
 
-	APIUrl           *string `json:"apiUrl,omitempty" yaml:"apiUrl,omitempty" hcl:"url"`
-	Message          *string `json:"message,omitempty" yaml:"message,omitempty" hcl:"message"`
-	Description      *string `json:"description,omitempty" yaml:"description,omitempty" hcl:"description"`
-	AutoClose        *bool   `json:"autoClose,omitempty" yaml:"autoClose,omitempty" hcl:"auto_close"`
-	OverridePriority *bool   `json:"overridePriority,omitempty" yaml:"overridePriority,omitempty" hcl:"override_priority"`
-	SendTagsAs       *string `json:"sendTagsAs,omitempty" yaml:"sendTagsAs,omitempty" hcl:"send_tags_as"`
+	APIUrl           *string                        `json:"apiUrl,omitempty" yaml:"apiUrl,omitempty" hcl:"url"`
+	Message          *string                        `json:"message,omitempty" yaml:"message,omitempty" hcl:"message"`
+	Description      *string                        `json:"description,omitempty" yaml:"description,omitempty" hcl:"description"`
+	AutoClose        *bool                          `json:"autoClose,omitempty" yaml:"autoClose,omitempty" hcl:"auto_close"`
+	OverridePriority *bool                          `json:"overridePriority,omitempty" yaml:"overridePriority,omitempty" hcl:"override_priority"`
+	SendTagsAs       *string                        `json:"sendTagsAs,omitempty" yaml:"sendTagsAs,omitempty" hcl:"send_tags_as"`
+	Responders       []OpsgenieIntegrationResponder `json:"responders,omitempty" yaml:"responders,omitempty" hcl:"responders,block"`
 }
 
 type PagerdutyIntegration struct {
@@ -180,8 +188,9 @@ type SlackIntegration struct {
 type TelegramIntegration struct {
 	DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"`
 
-	BotToken Secret `json:"bottoken" yaml:"bottoken" hcl:"token"`
-	ChatID   string `json:"chatid,omitempty" yaml:"chatid,omitempty" hcl:"chat_id"`
+	BotToken        Secret `json:"bottoken" yaml:"bottoken" hcl:"token"`
+	ChatID          string `json:"chatid,omitempty" yaml:"chatid,omitempty" hcl:"chat_id"`
+	MessageThreadID string `json:"message_thread_id,omitempty" yaml:"message_thread_id,omitempty" hcl:"message_thread_id"`
 
 	Message               *string `json:"message,omitempty" yaml:"message,omitempty" hcl:"message"`
 	ParseMode             *string `json:"parse_mode,omitempty" yaml:"parse_mode,omitempty" hcl:"parse_mode"`
diff --git a/pkg/services/ngalert/api/tooling/definitions/cortex-ruler.go b/pkg/services/ngalert/api/tooling/definitions/cortex-ruler.go
index 9378f1919312d..55005b1a4f46c 100644
--- a/pkg/services/ngalert/api/tooling/definitions/cortex-ruler.go
+++ b/pkg/services/ngalert/api/tooling/definitions/cortex-ruler.go
@@ -8,7 +8,7 @@ import (
 	"github.com/prometheus/common/model"
 )
 
-// swagger:route Get /api/ruler/grafana/api/v1/rules ruler RouteGetGrafanaRulesConfig
+// swagger:route Get /ruler/grafana/api/v1/rules ruler RouteGetGrafanaRulesConfig
 //
 // List rule groups
 //
@@ -17,21 +17,26 @@ import (
 //
 //     Responses:
 //       202: NamespaceConfigResponse
+//       403: ForbiddenError
 //
 
-// swagger:route Get /api/ruler/grafana/api/v1/export/rules ruler RouteGetRulesForExport
+// swagger:route Get /ruler/grafana/api/v1/export/rules ruler RouteGetRulesForExport
 //
 // List rules in provisioning format
 //
-//     Consumes:
+//     Produces:
 //     - application/json
 //     - application/yaml
+//     - application/terraform+hcl
+//     - text/yaml
+//     - text/hcl
 //
 //     Responses:
 //       200: AlertingFileExport
+//       403: ForbiddenError
 //       404: description: Not found.
 
-// swagger:route Get /api/ruler/{DatasourceUID}/api/v1/rules ruler RouteGetRulesConfig
+// swagger:route Get /ruler/{DatasourceUID}/api/v1/rules ruler RouteGetRulesConfig
 //
 // List rule groups
 //
@@ -40,9 +45,10 @@ import (
 //
 //     Responses:
 //       202: NamespaceConfigResponse
+//       403: ForbiddenError
 //       404: NotFound
 
-// swagger:route POST /api/ruler/grafana/api/v1/rules/{Namespace} ruler RoutePostNameGrafanaRulesConfig
+// swagger:route POST /ruler/grafana/api/v1/rules/{Namespace} ruler RoutePostNameGrafanaRulesConfig
 //
 // Creates or updates a rule group
 //
@@ -52,21 +58,29 @@ import (
 //
 //     Responses:
 //       202: UpdateRuleGroupResponse
+//       403: ForbiddenError
 //
 
-// swagger:route POST /api/ruler/grafana/api/v1/rules/{Namespace}/export ruler RoutePostRulesGroupForExport
+// swagger:route POST /ruler/grafana/api/v1/rules/{Namespace}/export ruler RoutePostRulesGroupForExport
 //
 // Converts submitted rule group to provisioning format
 //
 //     Consumes:
 //     - application/json
+//
+//     Produces:
+//     - application/json
 //     - application/yaml
+//     - application/terraform+hcl
+//     - text/yaml
+//     - text/hcl
 //
 //     Responses:
 //       200: AlertingFileExport
+//       403: ForbiddenError
 //       404: description: Not found.
 
-// swagger:route POST /api/ruler/{DatasourceUID}/api/v1/rules/{Namespace} ruler RoutePostNameRulesConfig
+// swagger:route POST /ruler/{DatasourceUID}/api/v1/rules/{Namespace} ruler RoutePostNameRulesConfig
 //
 // Creates or updates a rule group
 //
@@ -76,9 +90,10 @@ import (
 //
 //     Responses:
 //       202: Ack
+//       403: ForbiddenError
 //       404: NotFound
 
-// swagger:route Get /api/ruler/grafana/api/v1/rules/{Namespace} ruler RouteGetNamespaceGrafanaRulesConfig
+// swagger:route Get /ruler/grafana/api/v1/rules/{Namespace} ruler RouteGetNamespaceGrafanaRulesConfig
 //
 // Get rule groups by namespace
 //
@@ -86,9 +101,10 @@ import (
 //     - application/json
 //
 //     Responses:
+//       403: ForbiddenError
 //       202: NamespaceConfigResponse
 
-// swagger:route Get /api/ruler/{DatasourceUID}/api/v1/rules/{Namespace} ruler RouteGetNamespaceRulesConfig
+// swagger:route Get /ruler/{DatasourceUID}/api/v1/rules/{Namespace} ruler RouteGetNamespaceRulesConfig
 //
 // Get rule groups by namespace
 //
@@ -97,24 +113,27 @@ import (
 //
 //     Responses:
 //       202: NamespaceConfigResponse
+//       403: ForbiddenError
 //       404: NotFound
 
-// swagger:route Delete /api/ruler/grafana/api/v1/rules/{Namespace} ruler RouteDeleteNamespaceGrafanaRulesConfig
+// swagger:route Delete /ruler/grafana/api/v1/rules/{Namespace} ruler RouteDeleteNamespaceGrafanaRulesConfig
 //
 // Delete namespace
 //
 //     Responses:
 //       202: Ack
+//       403: ForbiddenError
 
-// swagger:route Delete /api/ruler/{DatasourceUID}/api/v1/rules/{Namespace} ruler RouteDeleteNamespaceRulesConfig
+// swagger:route Delete /ruler/{DatasourceUID}/api/v1/rules/{Namespace} ruler RouteDeleteNamespaceRulesConfig
 //
 // Delete namespace
 //
 //     Responses:
 //       202: Ack
+//       403: ForbiddenError
 //       404: NotFound
 
-// swagger:route Get /api/ruler/grafana/api/v1/rules/{Namespace}/{Groupname} ruler RouteGetGrafanaRuleGroupConfig
+// swagger:route Get /ruler/grafana/api/v1/rules/{Namespace}/{Groupname} ruler RouteGetGrafanaRuleGroupConfig
 //
 // Get rule group
 //
@@ -123,8 +142,9 @@ import (
 //
 //     Responses:
 //       202: RuleGroupConfigResponse
+//       403: ForbiddenError
 
-// swagger:route Get /api/ruler/{DatasourceUID}/api/v1/rules/{Namespace}/{Groupname} ruler RouteGetRulegGroupConfig
+// swagger:route Get /ruler/{DatasourceUID}/api/v1/rules/{Namespace}/{Groupname} ruler RouteGetRulegGroupConfig
 //
 // Get rule group
 //
@@ -133,25 +153,29 @@ import (
 //
 //     Responses:
 //       202: RuleGroupConfigResponse
+//       403: ForbiddenError
 //       404: NotFound
 
-// swagger:route Delete /api/ruler/grafana/api/v1/rules/{Namespace}/{Groupname} ruler RouteDeleteGrafanaRuleGroupConfig
+// swagger:route Delete /ruler/grafana/api/v1/rules/{Namespace}/{Groupname} ruler RouteDeleteGrafanaRuleGroupConfig
 //
 // Delete rule group
 //
 //     Responses:
 //       202: Ack
+//       403: ForbiddenError
 
-// swagger:route Delete /api/ruler/{DatasourceUID}/api/v1/rules/{Namespace}/{Groupname} ruler RouteDeleteRuleGroupConfig
+// swagger:route Delete /ruler/{DatasourceUID}/api/v1/rules/{Namespace}/{Groupname} ruler RouteDeleteRuleGroupConfig
 //
 // Delete rule group
 //
 //     Responses:
 //       202: Ack
+//       403: ForbiddenError
 //       404: NotFound
 
 // swagger:parameters RoutePostNameRulesConfig RoutePostNameGrafanaRulesConfig RoutePostRulesGroupForExport
 type NamespaceConfig struct {
+	// The UID of the rule folder
 	// in:path
 	Namespace string
 	// in:body
@@ -160,12 +184,14 @@ type NamespaceConfig struct {
 
 // swagger:parameters RouteGetNamespaceRulesConfig RouteDeleteNamespaceRulesConfig RouteGetNamespaceGrafanaRulesConfig RouteDeleteNamespaceGrafanaRulesConfig
 type PathNamespaceConfig struct {
+	// The UID of the rule folder
 	// in: path
 	Namespace string
 }
 
 // swagger:parameters RouteGetRulegGroupConfig RouteDeleteRuleGroupConfig RouteGetGrafanaRuleGroupConfig RouteDeleteGrafanaRuleGroupConfig
 type PathRouleGroupConfig struct {
+	// The UID of the rule folder
 	// in: path
 	Namespace string
 	// in: path
@@ -389,35 +415,80 @@ const (
 	ErrorErrState    ExecutionErrorState = "Error"
 )
 
+// swagger:model
+type AlertRuleNotificationSettings struct {
+	// Name of the receiver to send notifications to.
+	// required: true
+	// example: grafana-default-email
+	Receiver string `json:"receiver"`
+
+	// Optional settings
+
+	// Override the labels by which incoming alerts are grouped together. For example, multiple alerts coming in for
+	// cluster=A and alertname=LatencyHigh would be batched into a single group. To aggregate by all possible labels
+	// use the special value '...' as the sole label name.
+	// This effectively disables aggregation entirely, passing through all alerts as-is. This is unlikely to be what
+	// you want, unless you have a very low alert volume or your upstream notification system performs its own grouping.
+	// Must include 'alertname' and 'grafana_folder' if not using '...'.
+	// default: ["alertname", "grafana_folder"]
+	// example: ["alertname", "grafana_folder", "cluster"]
+	GroupBy []string `json:"group_by,omitempty"`
+
+	// Override how long to initially wait to send a notification for a group of alerts. Allows to wait for an
+	// inhibiting alert to arrive or collect more initial alerts for the same group. (Usually ~0s to few minutes.)
+	// example: 30s
+	GroupWait *model.Duration `json:"group_wait,omitempty"`
+
+	// Override how long to wait before sending a notification about new alerts that are added to a group of alerts for
+	// which an initial notification has already been sent. (Usually ~5m or more.)
+	// example: 5m
+	GroupInterval *model.Duration `json:"group_interval,omitempty"`
+
+	// Override how long to wait before sending a notification again if it has already been sent successfully for an
+	// alert. (Usually ~3h or more).
+	// Note that this parameter is implicitly bound by Alertmanager's `--data.retention` configuration flag.
+	// Notifications will be resent after either repeat_interval or the data retention period have passed, whichever
+	// occurs first. `repeat_interval` should not be less than `group_interval`.
+	// example: 4h
+	RepeatInterval *model.Duration `json:"repeat_interval,omitempty"`
+
+	// Override the times when notifications should be muted. These must match the name of a mute time interval defined
+	// in the alertmanager configuration mute_time_intervals section. When muted it will not send any notifications, but
+	// otherwise acts normally.
+	// example: ["maintenance"]
+	MuteTimeIntervals []string `json:"mute_time_intervals,omitempty"`
+}
+
 // swagger:model
 type PostableGrafanaRule struct {
-	Title        string              `json:"title" yaml:"title"`
-	Condition    string              `json:"condition" yaml:"condition"`
-	Data         []AlertQuery        `json:"data" yaml:"data"`
-	UID          string              `json:"uid" yaml:"uid"`
-	NoDataState  NoDataState         `json:"no_data_state" yaml:"no_data_state"`
-	ExecErrState ExecutionErrorState `json:"exec_err_state" yaml:"exec_err_state"`
-	IsPaused     *bool               `json:"is_paused" yaml:"is_paused"`
+	Title                string                         `json:"title" yaml:"title"`
+	Condition            string                         `json:"condition" yaml:"condition"`
+	Data                 []AlertQuery                   `json:"data" yaml:"data"`
+	UID                  string                         `json:"uid" yaml:"uid"`
+	NoDataState          NoDataState                    `json:"no_data_state" yaml:"no_data_state"`
+	ExecErrState         ExecutionErrorState            `json:"exec_err_state" yaml:"exec_err_state"`
+	IsPaused             *bool                          `json:"is_paused" yaml:"is_paused"`
+	NotificationSettings *AlertRuleNotificationSettings `json:"notification_settings" yaml:"notification_settings"`
 }
 
 // swagger:model
 type GettableGrafanaRule struct {
-	ID              int64               `json:"id" yaml:"id"`
-	OrgID           int64               `json:"orgId" yaml:"orgId"`
-	Title           string              `json:"title" yaml:"title"`
-	Condition       string              `json:"condition" yaml:"condition"`
-	Data            []AlertQuery        `json:"data" yaml:"data"`
-	Updated         time.Time           `json:"updated" yaml:"updated"`
-	IntervalSeconds int64               `json:"intervalSeconds" yaml:"intervalSeconds"`
-	Version         int64               `json:"version" yaml:"version"`
-	UID             string              `json:"uid" yaml:"uid"`
-	NamespaceUID    string              `json:"namespace_uid" yaml:"namespace_uid"`
-	NamespaceID     int64               `json:"namespace_id" yaml:"namespace_id"`
-	RuleGroup       string              `json:"rule_group" yaml:"rule_group"`
-	NoDataState     NoDataState         `json:"no_data_state" yaml:"no_data_state"`
-	ExecErrState    ExecutionErrorState `json:"exec_err_state" yaml:"exec_err_state"`
-	Provenance      Provenance          `json:"provenance,omitempty" yaml:"provenance,omitempty"`
-	IsPaused        bool                `json:"is_paused" yaml:"is_paused"`
+	ID                   int64                          `json:"id" yaml:"id"`
+	OrgID                int64                          `json:"orgId" yaml:"orgId"`
+	Title                string                         `json:"title" yaml:"title"`
+	Condition            string                         `json:"condition" yaml:"condition"`
+	Data                 []AlertQuery                   `json:"data" yaml:"data"`
+	Updated              time.Time                      `json:"updated" yaml:"updated"`
+	IntervalSeconds      int64                          `json:"intervalSeconds" yaml:"intervalSeconds"`
+	Version              int64                          `json:"version" yaml:"version"`
+	UID                  string                         `json:"uid" yaml:"uid"`
+	NamespaceUID         string                         `json:"namespace_uid" yaml:"namespace_uid"`
+	RuleGroup            string                         `json:"rule_group" yaml:"rule_group"`
+	NoDataState          NoDataState                    `json:"no_data_state" yaml:"no_data_state"`
+	ExecErrState         ExecutionErrorState            `json:"exec_err_state" yaml:"exec_err_state"`
+	Provenance           Provenance                     `json:"provenance,omitempty" yaml:"provenance,omitempty"`
+	IsPaused             bool                           `json:"is_paused" yaml:"is_paused"`
+	NotificationSettings *AlertRuleNotificationSettings `json:"notification_settings,omitempty" yaml:"notification_settings,omitempty"`
 }
 
 // AlertQuery represents a single query associated with an alert definition.
diff --git a/pkg/services/ngalert/api/tooling/definitions/prom.go b/pkg/services/ngalert/api/tooling/definitions/prom.go
index 97e03ee74c884..43ae592d32941 100644
--- a/pkg/services/ngalert/api/tooling/definitions/prom.go
+++ b/pkg/services/ngalert/api/tooling/definitions/prom.go
@@ -9,14 +9,14 @@ import (
 	v1 "github.com/prometheus/client_golang/api/prometheus/v1"
 )
 
-// swagger:route GET /api/prometheus/grafana/api/v1/rules prometheus RouteGetGrafanaRuleStatuses
+// swagger:route GET /prometheus/grafana/api/v1/rules prometheus RouteGetGrafanaRuleStatuses
 //
 // gets the evaluation statuses of all rules
 //
 //     Responses:
 //       200: RuleResponse
 
-// swagger:route GET /api/prometheus/{DatasourceUID}/api/v1/rules prometheus RouteGetRuleStatuses
+// swagger:route GET /prometheus/{DatasourceUID}/api/v1/rules prometheus RouteGetRuleStatuses
 //
 // gets the evaluation statuses of all rules
 //
@@ -24,14 +24,14 @@ import (
 //       200: RuleResponse
 //       404: NotFound
 
-// swagger:route GET /api/prometheus/grafana/api/v1/alerts prometheus RouteGetGrafanaAlertStatuses
+// swagger:route GET /prometheus/grafana/api/v1/alerts prometheus RouteGetGrafanaAlertStatuses
 //
 // gets the current alerts
 //
 //     Responses:
 //       200: AlertResponse
 
-// swagger:route GET /api/prometheus/{DatasourceUID}/api/v1/alerts prometheus RouteGetAlertStatuses
+// swagger:route GET /prometheus/{DatasourceUID}/api/v1/alerts prometheus RouteGetAlertStatuses
 //
 // gets the current alerts
 //
diff --git a/pkg/services/ngalert/api/tooling/definitions/provisioning.go b/pkg/services/ngalert/api/tooling/definitions/provisioning.go
index 0833e2c4ee363..6c42cdb6f7a94 100644
--- a/pkg/services/ngalert/api/tooling/definitions/provisioning.go
+++ b/pkg/services/ngalert/api/tooling/definitions/provisioning.go
@@ -7,9 +7,10 @@ type AlertingFileExport struct {
 	Groups        []AlertRuleGroupExport     `json:"groups,omitempty" yaml:"groups,omitempty"`
 	ContactPoints []ContactPointExport       `json:"contactPoints,omitempty" yaml:"contactPoints,omitempty"`
 	Policies      []NotificationPolicyExport `json:"policies,omitempty" yaml:"policies,omitempty"`
+	MuteTimings   []MuteTimeIntervalExport   `json:"muteTimes,omitempty" yaml:"muteTimes,omitempty"`
 }
 
-// swagger:parameters RouteGetAlertRuleGroupExport RouteGetAlertRuleExport RouteGetContactpointsExport RouteGetContactpointExport RoutePostRulesGroupForExport
+// swagger:parameters RouteGetAlertRuleGroupExport RouteGetAlertRuleExport RouteGetContactpointsExport RouteGetContactpointExport RoutePostRulesGroupForExport RouteExportMuteTimings RouteExportMuteTiming
 type ExportQueryParams struct {
 	// Whether to initiate a download of the file or not.
 	// in: query
@@ -17,10 +18,11 @@ type ExportQueryParams struct {
 	// default: false
 	Download bool `json:"download"`
 
-	// Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.
+	// Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.
 	// in: query
 	// required: false
 	// default: yaml
+	// enum: yaml,json,hcl
 	Format string `json:"format"`
 }
 
diff --git a/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go b/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go
index 8304d178e5ce0..b25b41c3395ee 100644
--- a/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go
+++ b/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go
@@ -6,22 +6,29 @@ import (
 	"github.com/prometheus/common/model"
 )
 
-// swagger:route GET /api/v1/provisioning/alert-rules provisioning stable RouteGetAlertRules
+// swagger:route GET /v1/provisioning/alert-rules provisioning stable RouteGetAlertRules
 //
 // Get all the alert rules.
 //
 //     Responses:
 //       200: ProvisionedAlertRules
 
-// swagger:route GET /api/v1/provisioning/alert-rules/export provisioning stable RouteGetAlertRulesExport
+// swagger:route GET /v1/provisioning/alert-rules/export provisioning stable RouteGetAlertRulesExport
 //
 // Export all alert rules in provisioning file format.
 //
+//     Produces:
+//     - application/json
+//     - application/yaml
+//     - application/terraform+hcl
+//     - text/yaml
+//     - text/hcl
+//
 //     Responses:
 //       200: AlertingFileExport
 //       404: description: Not found.
 
-// swagger:route GET /api/v1/provisioning/alert-rules/{UID} provisioning stable RouteGetAlertRule
+// swagger:route GET /v1/provisioning/alert-rules/{UID} provisioning stable RouteGetAlertRule
 //
 // Get a specific alert rule by UID.
 //
@@ -29,20 +36,22 @@ import (
 //       200: ProvisionedAlertRule
 //       404: description: Not found.
 
-// swagger:route GET /api/v1/provisioning/alert-rules/{UID}/export provisioning stable RouteGetAlertRuleExport
+// swagger:route GET /v1/provisioning/alert-rules/{UID}/export provisioning stable RouteGetAlertRuleExport
 //
 // Export an alert rule in provisioning file format.
 //
 //     Produces:
 //     - application/json
 //     - application/yaml
+//     - application/terraform+hcl
 //     - text/yaml
+//     - text/hcl
 //
 //     Responses:
 //       200: AlertingFileExport
 //       404: description: Not found.
 
-// swagger:route POST /api/v1/provisioning/alert-rules provisioning stable RoutePostAlertRule
+// swagger:route POST /v1/provisioning/alert-rules provisioning stable RoutePostAlertRule
 //
 // Create a new alert rule.
 //
@@ -53,7 +62,7 @@ import (
 //       201: ProvisionedAlertRule
 //       400: ValidationError
 
-// swagger:route PUT /api/v1/provisioning/alert-rules/{UID} provisioning stable RoutePutAlertRule
+// swagger:route PUT /v1/provisioning/alert-rules/{UID} provisioning stable RoutePutAlertRule
 //
 // Update an existing alert rule.
 //
@@ -64,7 +73,7 @@ import (
 //       200: ProvisionedAlertRule
 //       400: ValidationError
 
-// swagger:route DELETE /api/v1/provisioning/alert-rules/{UID} provisioning stable RouteDeleteAlertRule
+// swagger:route DELETE /v1/provisioning/alert-rules/{UID} provisioning stable RouteDeleteAlertRule
 //
 // Delete a specific alert rule by UID.
 //
@@ -103,7 +112,7 @@ type AlertRulePayload struct {
 	Body ProvisionedAlertRule
 }
 
-// swagger:parameters RoutePostAlertRule RoutePutAlertRule
+// swagger:parameters RoutePostAlertRule RoutePutAlertRule RouteDeleteAlertRule RoutePutAlertRuleGroup
 type AlertRuleHeaders struct {
 	// in:header
 	XDisableProvenance string `json:"X-Disable-Provenance"`
@@ -156,9 +165,11 @@ type ProvisionedAlertRule struct {
 	Provenance Provenance `json:"provenance,omitempty"`
 	// example: false
 	IsPaused bool `json:"isPaused"`
+	// example: {"receiver":"email","group_by":["alertname","grafana_folder","cluster"],"group_wait":"30s","group_interval":"1m","repeat_interval":"4d","mute_time_intervals":["Weekends","Holidays"]}
+	NotificationSettings *AlertRuleNotificationSettings `json:"notification_settings"`
 }
 
-// swagger:route GET /api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group} provisioning stable RouteGetAlertRuleGroup
+// swagger:route GET /v1/provisioning/folder/{FolderUID}/rule-groups/{Group} provisioning stable RouteGetAlertRuleGroup
 //
 // Get a rule group.
 //
@@ -166,22 +177,33 @@ type ProvisionedAlertRule struct {
 //       200: AlertRuleGroup
 //       404: description: Not found.
 
-// swagger:route GET /api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}/export provisioning stable RouteGetAlertRuleGroupExport
+// swagger:route DELETE /v1/provisioning/folder/{FolderUID}/rule-groups/{Group} provisioning stable RouteDeleteAlertRuleGroup
+//
+// Delete rule group
+//
+//     Responses:
+//       204: description: The alert rule group was deleted successfully.
+//       403: ForbiddenError
+//       404: NotFound
+
+// swagger:route GET /v1/provisioning/folder/{FolderUID}/rule-groups/{Group}/export provisioning stable RouteGetAlertRuleGroupExport
 //
 // Export an alert rule group in provisioning file format.
 //
 //     Produces:
 //     - application/json
 //     - application/yaml
+//     - application/terraform+hcl
 //     - text/yaml
+//     - text/hcl
 //
 //     Responses:
 //       200: AlertingFileExport
 //       404: description: Not found.
 
-// swagger:route PUT /api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group} provisioning stable RoutePutAlertRuleGroup
+// swagger:route PUT /v1/provisioning/folder/{FolderUID}/rule-groups/{Group} provisioning stable RoutePutAlertRuleGroup
 //
-// Update the interval of a rule group.
+// Create or update alert rule group.
 //
 //     Consumes:
 //     - application/json
@@ -190,13 +212,13 @@ type ProvisionedAlertRule struct {
 //       200: AlertRuleGroup
 //       400: ValidationError
 
-// swagger:parameters RouteGetAlertRuleGroup RoutePutAlertRuleGroup RouteGetAlertRuleGroupExport
+// swagger:parameters RouteGetAlertRuleGroup RoutePutAlertRuleGroup RouteGetAlertRuleGroupExport RouteDeleteAlertRuleGroup
 type FolderUIDPathParam struct {
 	// in:path
 	FolderUID string `json:"FolderUID"`
 }
 
-// swagger:parameters RouteGetAlertRuleGroup RoutePutAlertRuleGroup RouteGetAlertRuleGroupExport
+// swagger:parameters RouteGetAlertRuleGroup RoutePutAlertRuleGroup RouteGetAlertRuleGroupExport RouteDeleteAlertRuleGroup
 type RuleGroupPathParam struct {
 	// in:path
 	Group string `json:"Group"`
@@ -246,10 +268,11 @@ type AlertRuleExport struct {
 	// ForString is used to:
 	// - Only export the for field for HCL if it is non-zero.
 	// - Format the Prometheus model.Duration type properly for HCL.
-	ForString   *string            `json:"-" yaml:"-" hcl:"for"`
-	Annotations *map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty" hcl:"annotations"`
-	Labels      *map[string]string `json:"labels,omitempty" yaml:"labels,omitempty" hcl:"labels"`
-	IsPaused    bool               `json:"isPaused" yaml:"isPaused" hcl:"is_paused"`
+	ForString            *string                              `json:"-" yaml:"-" hcl:"for"`
+	Annotations          *map[string]string                   `json:"annotations,omitempty" yaml:"annotations,omitempty" hcl:"annotations"`
+	Labels               *map[string]string                   `json:"labels,omitempty" yaml:"labels,omitempty" hcl:"labels"`
+	IsPaused             bool                                 `json:"isPaused" yaml:"isPaused" hcl:"is_paused"`
+	NotificationSettings *AlertRuleNotificationSettingsExport `json:"notification_settings,omitempty" yaml:"notification_settings,omitempty" hcl:"notification_settings,block"`
 }
 
 // AlertQueryExport is the provisioned export of models.AlertQuery.
@@ -266,3 +289,17 @@ type RelativeTimeRangeExport struct {
 	FromSeconds int64 `json:"from" yaml:"from" hcl:"from"`
 	ToSeconds   int64 `json:"to" yaml:"to" hcl:"to"`
 }
+
+// AlertRuleNotificationSettingsExport is the provisioned export of models.NotificationSettings.
+// Field name mismatches with Terraform provider schema are noted where applicable.
+type AlertRuleNotificationSettingsExport struct {
+	// TF -> `contact_point`
+	Receiver string `yaml:"receiver,omitempty" json:"receiver,omitempty" hcl:"contact_point"`
+
+	GroupBy        []string `yaml:"group_by,omitempty" json:"group_by,omitempty" hcl:"group_by"`
+	GroupWait      *string  `yaml:"group_wait,omitempty" json:"group_wait,omitempty" hcl:"group_wait,optional"`
+	GroupInterval  *string  `yaml:"group_interval,omitempty" json:"group_interval,omitempty" hcl:"group_interval,optional"`
+	RepeatInterval *string  `yaml:"repeat_interval,omitempty" json:"repeat_interval,omitempty" hcl:"repeat_interval,optional"`
+	// TF -> `mute_timings`
+	MuteTimeIntervals []string `yaml:"mute_time_intervals,omitempty" json:"mute_time_intervals,omitempty" hcl:"mute_timings"`
+}
diff --git a/pkg/services/ngalert/api/tooling/definitions/provisioning_contactpoints.go b/pkg/services/ngalert/api/tooling/definitions/provisioning_contactpoints.go
index 6f9d02354e36c..02563d68b2fee 100644
--- a/pkg/services/ngalert/api/tooling/definitions/provisioning_contactpoints.go
+++ b/pkg/services/ngalert/api/tooling/definitions/provisioning_contactpoints.go
@@ -4,22 +4,29 @@ import (
 	"github.com/grafana/grafana/pkg/components/simplejson"
 )
 
-// swagger:route GET /api/v1/provisioning/contact-points provisioning stable RouteGetContactpoints
+// swagger:route GET /v1/provisioning/contact-points provisioning stable RouteGetContactpoints
 //
 // Get all the contact points.
 //
 //     Responses:
 //       200: ContactPoints
 
-// swagger:route GET /api/v1/provisioning/contact-points/export provisioning stable RouteGetContactpointsExport
+// swagger:route GET /v1/provisioning/contact-points/export provisioning stable RouteGetContactpointsExport
 //
 // Export all contact points in provisioning file format.
 //
+//     Produces:
+//     - application/json
+//     - application/yaml
+//     - application/terraform+hcl
+//     - text/yaml
+//     - text/hcl
+//
 //     Responses:
 //       200: AlertingFileExport
 //       403: PermissionDenied
 
-// swagger:route POST /api/v1/provisioning/contact-points provisioning stable RoutePostContactpoints
+// swagger:route POST /v1/provisioning/contact-points provisioning stable RoutePostContactpoints
 //
 // Create a contact point.
 //
@@ -30,7 +37,7 @@ import (
 //       202: EmbeddedContactPoint
 //       400: ValidationError
 
-// swagger:route PUT /api/v1/provisioning/contact-points/{UID} provisioning stable RoutePutContactpoint
+// swagger:route PUT /v1/provisioning/contact-points/{UID} provisioning stable RoutePutContactpoint
 //
 // Update an existing contact point.
 //
@@ -41,7 +48,7 @@ import (
 //       202: Ack
 //       400: ValidationError
 
-// swagger:route DELETE /api/v1/provisioning/contact-points/{UID} provisioning stable RouteDeleteContactpoints
+// swagger:route DELETE /v1/provisioning/contact-points/{UID} provisioning stable RouteDeleteContactpoints
 //
 // Delete a contact point.
 //
@@ -49,7 +56,7 @@ import (
 //     - application/json
 //
 //     Responses:
-//       204: description: The contact point was deleted successfully.
+//       202: description: The contact point was deleted successfully.
 
 // swagger:parameters RoutePutContactpoint RouteDeleteContactpoints
 type ContactPointUIDReference struct {
@@ -75,6 +82,12 @@ type ContactPointPayload struct {
 // swagger:model
 type ContactPoints []EmbeddedContactPoint
 
+// swagger:parameters RoutePostContactpoints RoutePutContactpoint
+type ContactPointHeaders struct {
+	// in:header
+	XDisableProvenance string `json:"X-Disable-Provenance"`
+}
+
 // EmbeddedContactPoint is the contact point type that is used
 // by grafanas embedded alertmanager implementation.
 // swagger:model
diff --git a/pkg/services/ngalert/api/tooling/definitions/provisioning_mute_timings.go b/pkg/services/ngalert/api/tooling/definitions/provisioning_mute_timings.go
index ae61889a0d8bd..b3db12283aa8e 100644
--- a/pkg/services/ngalert/api/tooling/definitions/provisioning_mute_timings.go
+++ b/pkg/services/ngalert/api/tooling/definitions/provisioning_mute_timings.go
@@ -4,14 +4,29 @@ import (
 	"github.com/prometheus/alertmanager/config"
 )
 
-// swagger:route GET /api/v1/provisioning/mute-timings provisioning stable RouteGetMuteTimings
+// swagger:route GET /v1/provisioning/mute-timings provisioning stable RouteGetMuteTimings
 //
 // Get all the mute timings.
 //
 //     Responses:
 //       200: MuteTimings
 
-// swagger:route GET /api/v1/provisioning/mute-timings/{name} provisioning stable RouteGetMuteTiming
+// swagger:route GET /v1/provisioning/mute-timings/export provisioning stable RouteExportMuteTimings
+//
+// Export all mute timings in provisioning format.
+//
+//     Produces:
+//     - application/json
+//     - application/yaml
+//     - application/terraform+hcl
+//     - text/yaml
+//     - text/hcl
+//
+//     Responses:
+//       200: AlertingFileExport
+//       403: PermissionDenied
+
+// swagger:route GET /v1/provisioning/mute-timings/{name} provisioning stable RouteGetMuteTiming
 //
 // Get a mute timing.
 //
@@ -19,7 +34,22 @@ import (
 //       200: MuteTimeInterval
 //       404: description: Not found.
 
-// swagger:route POST /api/v1/provisioning/mute-timings provisioning stable RoutePostMuteTiming
+// swagger:route GET /v1/provisioning/mute-timings/{name}/export provisioning stable RouteExportMuteTiming
+//
+// Export a mute timing in provisioning format.
+//
+//     Produces:
+//     - application/json
+//     - application/yaml
+//     - application/terraform+hcl
+//     - text/yaml
+//     - text/hcl
+//
+//     Responses:
+//       200: AlertingFileExport
+//       403: PermissionDenied
+
+// swagger:route POST /v1/provisioning/mute-timings provisioning stable RoutePostMuteTiming
 //
 // Create a new mute timing.
 //
@@ -30,7 +60,7 @@ import (
 //       201: MuteTimeInterval
 //       400: ValidationError
 
-// swagger:route PUT /api/v1/provisioning/mute-timings/{name} provisioning stable RoutePutMuteTiming
+// swagger:route PUT /v1/provisioning/mute-timings/{name} provisioning stable RoutePutMuteTiming
 //
 // Replace an existing mute timing.
 //
@@ -38,22 +68,23 @@ import (
 //     - application/json
 //
 //     Responses:
-//       200: MuteTimeInterval
+//       202: MuteTimeInterval
 //       400: ValidationError
 
-// swagger:route DELETE /api/v1/provisioning/mute-timings/{name} provisioning stable RouteDeleteMuteTiming
+// swagger:route DELETE /v1/provisioning/mute-timings/{name} provisioning stable RouteDeleteMuteTiming
 //
 // Delete a mute timing.
 //
 //     Responses:
 //       204: description: The mute timing was deleted successfully.
+//       409: GenericPublicError
 
 // swagger:route
 
 // swagger:model
 type MuteTimings []MuteTimeInterval
 
-// swagger:parameters RouteGetTemplate RouteGetMuteTiming RoutePutMuteTiming stable RouteDeleteMuteTiming
+// swagger:parameters RouteGetTemplate RouteGetMuteTiming RoutePutMuteTiming stable RouteDeleteMuteTiming RouteExportMuteTiming
 type RouteGetMuteTimingParam struct {
 	// Mute timing name
 	// in:path
@@ -66,6 +97,12 @@ type MuteTimingPayload struct {
 	Body MuteTimeInterval
 }
 
+// swagger:parameters RoutePostMuteTiming RoutePutMuteTiming
+type MuteTimingHeaders struct {
+	// in:header
+	XDisableProvenance string `json:"X-Disable-Provenance"`
+}
+
 // swagger:model
 type MuteTimeInterval struct {
 	config.MuteTimeInterval `json:",inline" yaml:",inline"`
@@ -79,3 +116,30 @@ func (mt *MuteTimeInterval) ResourceType() string {
 func (mt *MuteTimeInterval) ResourceID() string {
 	return mt.MuteTimeInterval.Name
 }
+
+type MuteTimeIntervalExport struct {
+	OrgID                   int64 `json:"orgId" yaml:"orgId"`
+	config.MuteTimeInterval `json:",inline" yaml:",inline"`
+}
+
+// MuteTimeIntervalExportHcl is a representation of the MuteTimeInterval in HCL
+type MuteTimeIntervalExportHcl struct {
+	Name          string                  `json:"name" hcl:"name"`
+	TimeIntervals []TimeIntervalExportHcl `json:"time_intervals" hcl:"intervals,block"`
+}
+
+// TimeIntervalExportHcl is a representation of the timeinterval.TimeInterval in HCL
+type TimeIntervalExportHcl struct {
+	Times       []TimeRangeExportHcl `json:"times,omitempty" hcl:"times,block"`
+	Weekdays    *[]string            `json:"weekdays,omitempty" hcl:"weekdays"`
+	DaysOfMonth *[]string            `json:"days_of_month,omitempty" hcl:"days_of_month"`
+	Months      *[]string            `json:"months,omitempty" hcl:"months"`
+	Years       *[]string            `json:"years,omitempty" hcl:"years"`
+	Location    *string              `json:"location,omitempty" hcl:"location"`
+}
+
+// TimeRangeExportHcl is a representation of the timeinterval.TimeRange in HCL
+type TimeRangeExportHcl struct {
+	StartMinute string `json:"start_time" hcl:"start"`
+	EndMinute   string `json:"end_time" hcl:"end"`
+}
diff --git a/pkg/services/ngalert/api/tooling/definitions/provisioning_policies.go b/pkg/services/ngalert/api/tooling/definitions/provisioning_policies.go
index 480339895ee44..6e7392c123e37 100644
--- a/pkg/services/ngalert/api/tooling/definitions/provisioning_policies.go
+++ b/pkg/services/ngalert/api/tooling/definitions/provisioning_policies.go
@@ -4,7 +4,7 @@ import (
 	"github.com/prometheus/alertmanager/config"
 )
 
-// swagger:route GET /api/v1/provisioning/policies provisioning stable RouteGetPolicyTree
+// swagger:route GET /v1/provisioning/policies provisioning stable RouteGetPolicyTree
 //
 // Get the notification policy tree.
 //
@@ -12,7 +12,7 @@ import (
 //       200: Route
 //         description: The currently active notification routing tree
 
-// swagger:route PUT /api/v1/provisioning/policies provisioning stable RoutePutPolicyTree
+// swagger:route PUT /v1/provisioning/policies provisioning stable RoutePutPolicyTree
 //
 // Sets the notification policy tree.
 //
@@ -23,7 +23,7 @@ import (
 //       202: Ack
 //       400: ValidationError
 
-// swagger:route DELETE /api/v1/provisioning/policies provisioning stable RouteResetPolicyTree
+// swagger:route DELETE /v1/provisioning/policies provisioning stable RouteResetPolicyTree
 //
 // Clears the notification policy tree.
 //
@@ -33,10 +33,17 @@ import (
 //     Responses:
 //       202: Ack
 
-// swagger:route GET /api/v1/provisioning/policies/export provisioning stable RouteGetPolicyTreeExport
+// swagger:route GET /v1/provisioning/policies/export provisioning stable RouteGetPolicyTreeExport
 //
 // Export the notification policy tree in provisioning file format.
 //
+//     Produces:
+//     - application/json
+//     - application/yaml
+//     - application/terraform+hcl
+//     - text/yaml
+//     - text/hcl
+//
 //     Responses:
 //       200: AlertingFileExport
 //       404: NotFound
@@ -48,10 +55,16 @@ type Policytree struct {
 	Body Route
 }
 
+// swagger:parameters RoutePutPolicyTree
+type PolicyTreeHeaders struct {
+	// in:header
+	XDisableProvenance string `json:"X-Disable-Provenance"`
+}
+
 // NotificationPolicyExport is the provisioned file export of alerting.NotificiationPolicyV1.
 type NotificationPolicyExport struct {
-	OrgID  int64        `json:"orgId" yaml:"orgId"`
-	Policy *RouteExport `json:",inline" yaml:",inline"`
+	OrgID        int64 `json:"orgId" yaml:"orgId"`
+	*RouteExport `yaml:",inline"`
 }
 
 // RouteExport is the provisioned file export of definitions.Route. This is needed to hide fields that aren't useable in
diff --git a/pkg/services/ngalert/api/tooling/definitions/provisioning_policies_test.go b/pkg/services/ngalert/api/tooling/definitions/provisioning_policies_test.go
new file mode 100644
index 0000000000000..0176fbd18157b
--- /dev/null
+++ b/pkg/services/ngalert/api/tooling/definitions/provisioning_policies_test.go
@@ -0,0 +1,30 @@
+package definitions
+
+import (
+	"encoding/json"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"gopkg.in/yaml.v3"
+)
+
+func TestNotificationPolicyExportMarshal(t *testing.T) {
+	c := true
+	npe := &NotificationPolicyExport{
+		OrgID: 1,
+		RouteExport: &RouteExport{
+			Receiver: "receiver",
+			Continue: &c,
+		},
+	}
+	t.Run("json", func(t *testing.T) {
+		val, err := json.Marshal(npe)
+		require.NoError(t, err)
+		require.Equal(t, "{\"orgId\":1,\"receiver\":\"receiver\",\"continue\":true}", string(val))
+	})
+	t.Run("yaml", func(t *testing.T) {
+		val, err := yaml.Marshal(npe)
+		require.NoError(t, err)
+		require.Equal(t, "orgId: 1\nreceiver: receiver\ncontinue: true\n", string(val))
+	})
+}
diff --git a/pkg/services/ngalert/api/tooling/definitions/provisioning_templates.go b/pkg/services/ngalert/api/tooling/definitions/provisioning_templates.go
index d91c47193b7e2..b7779e22321a4 100644
--- a/pkg/services/ngalert/api/tooling/definitions/provisioning_templates.go
+++ b/pkg/services/ngalert/api/tooling/definitions/provisioning_templates.go
@@ -1,6 +1,6 @@
 package definitions
 
-// swagger:route GET /api/v1/provisioning/templates provisioning stable RouteGetTemplates
+// swagger:route GET /v1/provisioning/templates provisioning stable RouteGetTemplates
 //
 // Get all notification templates.
 //
@@ -8,7 +8,7 @@ package definitions
 //       200: NotificationTemplates
 //       404: description: Not found.
 
-// swagger:route GET /api/v1/provisioning/templates/{name} provisioning stable RouteGetTemplate
+// swagger:route GET /v1/provisioning/templates/{name} provisioning stable RouteGetTemplate
 //
 // Get a notification template.
 //
@@ -16,7 +16,7 @@ package definitions
 //       200: NotificationTemplate
 //       404: description: Not found.
 
-// swagger:route PUT /api/v1/provisioning/templates/{name} provisioning stable RoutePutTemplate
+// swagger:route PUT /v1/provisioning/templates/{name} provisioning stable RoutePutTemplate
 //
 // Updates an existing notification template.
 //
@@ -27,7 +27,7 @@ package definitions
 //       202: NotificationTemplate
 //       400: ValidationError
 
-// swagger:route DELETE /api/v1/provisioning/templates/{name} provisioning stable RouteDeleteTemplate
+// swagger:route DELETE /v1/provisioning/templates/{name} provisioning stable RouteDeleteTemplate
 //
 // Delete a template.
 //
@@ -61,6 +61,12 @@ type NotificationTemplatePayload struct {
 	Body NotificationTemplateContent
 }
 
+// swagger:parameters RoutePutTemplate
+type NotificationTemplateHeaders struct {
+	// in:header
+	XDisableProvenance string `json:"X-Disable-Provenance"`
+}
+
 func (t *NotificationTemplate) ResourceType() string {
 	return "template"
 }
diff --git a/pkg/services/ngalert/api/tooling/definitions/receivers.go b/pkg/services/ngalert/api/tooling/definitions/receivers.go
new file mode 100644
index 0000000000000..3e89f819e98e8
--- /dev/null
+++ b/pkg/services/ngalert/api/tooling/definitions/receivers.go
@@ -0,0 +1,56 @@
+package definitions
+
+// swagger:route GET /v1/notifications/receivers/{Name} notifications RouteGetReceiver
+//
+// Get a receiver by name.
+//
+//    Responses:
+//      200: GetReceiverResponse
+// 	    403: PermissionDenied
+//      404: NotFound
+
+// swagger:route GET /v1/notifications/receivers notifications RouteGetReceivers
+//
+// Get all receivers.
+//
+//    Responses:
+//      200: GetReceiversResponse
+//      403: PermissionDenied
+
+// swagger:parameters RouteGetReceiver
+type GetReceiverParams struct {
+	// in:path
+	// required: true
+	Name string `json:"name"`
+	// in:query
+	// required: false
+	Decrypt bool `json:"decrypt"`
+}
+
+// swagger:parameters RouteGetReceivers
+type GetReceiversParams struct {
+	// in:query
+	// required: false
+	Names []string `json:"names"`
+	// in:query
+	// required: false
+	Limit int `json:"limit"`
+	// in:query
+	// required: false
+	Offset int `json:"offset"`
+	// in:query
+	// required: false
+	Decrypt bool `json:"decrypt"`
+}
+
+// swagger:response GetReceiverResponse
+type GetReceiverResponse struct {
+	// in:body
+	Body GettableApiReceiver
+}
+
+// swagger:response GetReceiversResponse
+type GetReceiversResponse struct {
+	// in:body
+	Body []GettableApiReceiver
+}
diff --git a/pkg/services/ngalert/api/tooling/definitions/ruler_state_history.go b/pkg/services/ngalert/api/tooling/definitions/ruler_state_history.go
index 9d365659cc8bf..ae3aa956cd968 100644
--- a/pkg/services/ngalert/api/tooling/definitions/ruler_state_history.go
+++ b/pkg/services/ngalert/api/tooling/definitions/ruler_state_history.go
@@ -2,7 +2,7 @@ package definitions
 
 import "github.com/grafana/grafana-plugin-sdk-go/data"
 
-// swagger:route GET /api/v1/rules/history history RouteGetStateHistory
+// swagger:route GET /v1/rules/history history RouteGetStateHistory
 //
 // Query state history.
 //
diff --git a/pkg/services/ngalert/api/tooling/definitions/shared.go b/pkg/services/ngalert/api/tooling/definitions/shared.go
index 9c15a2b8efbbd..9f8e8447aebb9 100644
--- a/pkg/services/ngalert/api/tooling/definitions/shared.go
+++ b/pkg/services/ngalert/api/tooling/definitions/shared.go
@@ -1,5 +1,7 @@
 package definitions
 
+import "github.com/grafana/grafana/pkg/util/errutil"
+
 // swagger:model
 type NotFound struct{}
 
@@ -11,3 +13,17 @@ type ValidationError struct {
 	// example: error message
 	Msg string `json:"msg"`
 }
+
+// swagger:model
+type ForbiddenError struct {
+	// The response message
+	// in: body
+	Body errutil.PublicError `json:"body"`
+}
+
+// swagger:model
+type GenericPublicError struct {
+	// The response message
+	// in: body
+	Body errutil.PublicError `json:"body"`
+}
diff --git a/pkg/services/ngalert/api/tooling/definitions/testing.go b/pkg/services/ngalert/api/tooling/definitions/testing.go
index e5c3265dbabe1..2c228e94758c7 100644
--- a/pkg/services/ngalert/api/tooling/definitions/testing.go
+++ b/pkg/services/ngalert/api/tooling/definitions/testing.go
@@ -13,7 +13,7 @@ import (
 	"github.com/prometheus/prometheus/promql"
 )
 
-// swagger:route Post /api/v1/rule/test/grafana testing RouteTestRuleGrafanaConfig
+// swagger:route Post /v1/rule/test/grafana testing RouteTestRuleGrafanaConfig
 //
 // Test a rule against Grafana ruler
 //
@@ -28,7 +28,7 @@ import (
 //       400: ValidationError
 //       404: NotFound
 
-// swagger:route Post /api/v1/rule/test/{DatasourceUID} testing RouteTestRuleConfig
+// swagger:route Post /v1/rule/test/{DatasourceUID} testing RouteTestRuleConfig
 //
 // Test a rule against external data source ruler
 //
@@ -42,7 +42,7 @@ import (
 //       200: TestRuleResponse
 //       404: NotFound
 
-// swagger:route Post /api/v1/eval testing RouteEvalQueries
+// swagger:route Post /v1/eval testing RouteEvalQueries
 //
 // Test rule
 //
@@ -55,7 +55,7 @@ import (
 //     Responses:
 //       200: EvalQueriesResponse
 
-// swagger:route Post /api/v1/rule/backtest testing BacktestConfig
+// swagger:route Post /v1/rule/backtest testing BacktestConfig
 //
 // Test rule
 //
@@ -128,8 +128,9 @@ type EvalQueriesRequest struct {
 
 // swagger:model
 type EvalQueriesPayload struct {
-	Data []AlertQuery `json:"data"`
-	Now  time.Time    `json:"now"`
+	Condition string       `json:"condition"`
+	Data      []AlertQuery `json:"data"`
+	Now       time.Time    `json:"now"`
 }
 
 func (p *TestRulePayload) UnmarshalJSON(b []byte) error {
diff --git a/pkg/services/ngalert/api/tooling/definitions/time_intervals.go b/pkg/services/ngalert/api/tooling/definitions/time_intervals.go
new file mode 100644
index 0000000000000..f8d2c9ea82911
--- /dev/null
+++ b/pkg/services/ngalert/api/tooling/definitions/time_intervals.go
@@ -0,0 +1,64 @@
+package definitions
+
+// swagger:route GET /v1/notifications/time-intervals notifications RouteNotificationsGetTimeIntervals
+//
+// Get all the time intervals
+//
+//     Responses:
+//       200: GetAllIntervalsResponse
+//       403: ForbiddenError
+
+// swagger:route GET /v1/notifications/time-intervals/{name} notifications RouteNotificationsGetTimeInterval
+//
+// Get a time interval by name.
+//
+//     Responses:
+//       200: GetIntervalsByNameResponse
+//       404: NotFound
+//       403: ForbiddenError
+
+// swagger:parameters RouteNotificationsGetTimeInterval
+type RouteTimeIntervalNameParam struct {
+	// Time interval name
+	// in:path
+	Name string `json:"name"`
+}
+
+// swagger:response GetAllIntervalsResponse
+type GetAllIntervalsResponse struct {
+	// in:body
+	Body []GettableTimeIntervals
+}
+
+// swagger:response GetIntervalsByNameResponse
+type GetIntervalsByNameResponse struct {
+	// in:body
+	Body GettableTimeIntervals
+}
+
+// swagger:model
+type PostableTimeIntervals struct {
+	Name          string             `json:"name" hcl:"name"`
+	TimeIntervals []TimeIntervalItem `json:"time_intervals" hcl:"intervals,block"`
+}
+
+type TimeIntervalItem struct {
+	Times       []TimeIntervalTimeRange `json:"times,omitempty" hcl:"times,block"`
+	Weekdays    *[]string               `json:"weekdays,omitempty" hcl:"weekdays"`
+	DaysOfMonth *[]string               `json:"days_of_month,omitempty" hcl:"days_of_month"`
+	Months      *[]string               `json:"months,omitempty" hcl:"months"`
+	Years       *[]string               `json:"years,omitempty" hcl:"years"`
+	Location    *string                 `json:"location,omitempty" hcl:"location"`
+}
+
+type TimeIntervalTimeRange struct {
+	StartMinute string `json:"start_time" hcl:"start"`
+	EndMinute   string `json:"end_time" hcl:"end"`
+}
+
+// swagger:model
+type GettableTimeIntervals struct {
+	Name          string             `json:"name" hcl:"name"`
+	TimeIntervals []TimeIntervalItem `json:"time_intervals" hcl:"intervals,block"`
+	Provenance    Provenance         `json:"provenance,omitempty"`
+}
diff --git a/pkg/services/ngalert/api/tooling/post.json b/pkg/services/ngalert/api/tooling/post.json
index 3f3948eacc0cd..687d223c55809 100644
--- a/pkg/services/ngalert/api/tooling/post.json
+++ b/pkg/services/ngalert/api/tooling/post.json
@@ -1,5 +1,5 @@
 {
- "basePath": "/api/v1",
+ "basePath": "/api",
  "consumes": [
   "application/json"
  ],
@@ -211,6 +211,9 @@
      ],
      "type": "string"
     },
+    "notification_settings": {
+     "$ref": "#/definitions/AlertRuleNotificationSettingsExport"
+    },
     "panelId": {
      "format": "int64",
      "type": "integer"
@@ -280,6 +283,90 @@
    },
    "type": "object"
   },
+  "AlertRuleNotificationSettings": {
+   "properties": {
+    "group_by": {
+     "default": [
+      "alertname",
+      "grafana_folder"
+     ],
+     "description": "Override the labels by which incoming alerts are grouped together. For example, multiple alerts coming in for\ncluster=A and alertname=LatencyHigh would be batched into a single group. To aggregate by all possible labels\nuse the special value '...' as the sole label name.\nThis effectively disables aggregation entirely, passing through all alerts as-is. This is unlikely to be what\nyou want, unless you have a very low alert volume or your upstream notification system performs its own grouping.\nMust include 'alertname' and 'grafana_folder' if not using '...'.",
+     "example": [
+      "alertname",
+      "grafana_folder",
+      "cluster"
+     ],
+     "items": {
+      "type": "string"
+     },
+     "type": "array"
+    },
+    "group_interval": {
+     "description": "Override how long to wait before sending a notification about new alerts that are added to a group of alerts for\nwhich an initial notification has already been sent. (Usually ~5m or more.)",
+     "example": "5m",
+     "type": "string"
+    },
+    "group_wait": {
+     "description": "Override how long to initially wait to send a notification for a group of alerts. Allows to wait for an\ninhibiting alert to arrive or collect more initial alerts for the same group. (Usually ~0s to few minutes.)",
+     "example": "30s",
+     "type": "string"
+    },
+    "mute_time_intervals": {
+     "description": "Override the times when notifications should be muted. These must match the name of a mute time interval defined\nin the alertmanager configuration mute_time_intervals section. When muted it will not send any notifications, but\notherwise acts normally.",
+     "example": [
+      "maintenance"
+     ],
+     "items": {
+      "type": "string"
+     },
+     "type": "array"
+    },
+    "receiver": {
+     "description": "Name of the receiver to send notifications to.",
+     "example": "grafana-default-email",
+     "type": "string"
+    },
+    "repeat_interval": {
+     "description": "Override how long to wait before sending a notification again if it has already been sent successfully for an\nalert. (Usually ~3h or more).\nNote that this parameter is implicitly bound by Alertmanager's `--data.retention` configuration flag.\nNotifications will be resent after either repeat_interval or the data retention period have passed, whichever\noccurs first. `repeat_interval` should not be less than `group_interval`.",
+     "example": "4h",
+     "type": "string"
+    }
+   },
+   "required": [
+    "receiver"
+   ],
+   "type": "object"
+  },
+  "AlertRuleNotificationSettingsExport": {
+   "properties": {
+    "group_by": {
+     "items": {
+      "type": "string"
+     },
+     "type": "array"
+    },
+    "group_interval": {
+     "type": "string"
+    },
+    "group_wait": {
+     "type": "string"
+    },
+    "mute_time_intervals": {
+     "items": {
+      "type": "string"
+     },
+     "type": "array"
+    },
+    "receiver": {
+     "type": "string"
+    },
+    "repeat_interval": {
+     "type": "string"
+    }
+   },
+   "title": "AlertRuleNotificationSettingsExport is the provisioned export of models.NotificationSettings.",
+   "type": "object"
+  },
   "AlertingFileExport": {
    "properties": {
     "apiVersion": {
@@ -298,6 +385,12 @@
      },
      "type": "array"
     },
+    "muteTimes": {
+     "items": {
+      "$ref": "#/definitions/MuteTimeIntervalExport"
+     },
+     "type": "array"
+    },
     "policies": {
      "items": {
       "$ref": "#/definitions/NotificationPolicyExport"
@@ -512,6 +605,9 @@
     },
     "username": {
      "type": "string"
+    },
+    "username_file": {
+     "type": "string"
     }
    },
    "title": "BasicAuth contains basic HTTP authentication credentials.",
@@ -534,6 +630,7 @@
      "type": "array"
     },
     "mute_time_intervals": {
+     "description": "MuteTimeIntervals is deprecated and will be removed before Alertmanager 1.0.",
      "items": {
       "$ref": "#/definitions/MuteTimeInterval"
      },
@@ -547,6 +644,12 @@
       "type": "string"
      },
      "type": "array"
+    },
+    "time_intervals": {
+     "items": {
+      "$ref": "#/definitions/TimeInterval"
+     },
+     "type": "array"
     }
    },
    "title": "Config is the top-level configuration for Alertmanager's config files.",
@@ -608,6 +711,9 @@
      "description": "Error is a property to be set if the corresponding DataQuery has an error.",
      "type": "string"
     },
+    "ErrorSource": {
+     "$ref": "#/definitions/ErrorSource"
+    },
     "Frames": {
      "$ref": "#/definitions/Frames"
     },
@@ -639,6 +745,9 @@
     },
     "webhook_url": {
      "$ref": "#/definitions/SecretURL"
+    },
+    "webhook_url_file": {
+     "type": "string"
     }
    },
    "title": "DiscordConfig configures notifications via Discord.",
@@ -813,6 +922,10 @@
    },
    "type": "object"
   },
+  "ErrorSource": {
+   "description": "ErrorSource type defines the source of the error",
+   "type": "string"
+  },
   "ErrorType": {
    "title": "ErrorType models the different API error types.",
    "type": "string"
@@ -838,6 +951,9 @@
   },
   "EvalQueriesPayload": {
    "properties": {
+    "condition": {
+     "type": "string"
+    },
     "data": {
      "items": {
       "$ref": "#/definitions/AlertQuery"
@@ -1045,6 +1161,14 @@
    "title": "FloatHistogram is similar to Histogram but uses float64 for all\ncounts. Additionally, bucket counts are absolute and not deltas.",
    "type": "object"
   },
+  "ForbiddenError": {
+   "properties": {
+    "body": {
+     "$ref": "#/definitions/PublicError"
+    }
+   },
+   "type": "object"
+  },
   "Frame": {
    "description": "Each Field is well typed by its FieldType and supports optional Labels.\n\nA Frame is a general data container for Grafana. A Frame can be table data\nor time series data depending on its content and field types.",
    "properties": {
@@ -1128,13 +1252,22 @@
     },
     "typeVersion": {
      "$ref": "#/definitions/FrameTypeVersion"
+    },
+    "uniqueRowIdFields": {
+     "description": "Array of field indices which values create a unique id for each row. Ideally this should be globally unique ID\nbut that isn't guarantied. Should help with keeping track and deduplicating rows in visualizations, especially\nwith streaming data with frequent updates.",
+     "example": "TraceID in Tempo, table name + primary key in SQL",
+     "items": {
+      "format": "int64",
+      "type": "integer"
+     },
+     "type": "array"
     }
    },
    "title": "FrameMeta matches:",
    "type": "object"
   },
   "FrameType": {
-   "description": "A FrameType string, when present in a frame's metadata, asserts that the\nframe's structure conforms to the FrameType's specification.\nThis property is currently optional, so FrameType may be FrameTypeUnknown even if the properties of\nthe Frame correspond to a defined FrameType.",
+   "description": "A FrameType string, when present in a frame's metadata, asserts that the\nframe's structure conforms to the FrameType's specification.\nThis property is currently optional, so FrameType may be FrameTypeUnknown even if the properties of\nthe Frame correspond to a defined FrameType.\n+enum",
    "type": "string"
   },
   "FrameTypeVersion": {
@@ -1153,6 +1286,14 @@
    "title": "Frames is a slice of Frame pointers.",
    "type": "array"
   },
+  "GenericPublicError": {
+   "properties": {
+    "body": {
+     "$ref": "#/definitions/PublicError"
+    }
+   },
+   "type": "object"
+  },
   "GettableAlertmanagers": {
    "properties": {
     "data": {
@@ -1182,6 +1323,7 @@
      "type": "object"
     },
     "mute_time_intervals": {
+     "description": "MuteTimeIntervals is deprecated and will be removed before Alertmanager 1.0.",
      "items": {
       "$ref": "#/definitions/MuteTimeInterval"
      },
@@ -1202,6 +1344,12 @@
       "type": "string"
      },
      "type": "array"
+    },
+    "time_intervals": {
+     "items": {
+      "$ref": "#/definitions/TimeInterval"
+     },
+     "type": "array"
     }
    },
    "type": "object"
@@ -1404,10 +1552,6 @@
     "is_paused": {
      "type": "boolean"
     },
-    "namespace_id": {
-     "format": "int64",
-     "type": "integer"
-    },
     "namespace_uid": {
      "type": "string"
     },
@@ -1419,6 +1563,9 @@
      ],
      "type": "string"
     },
+    "notification_settings": {
+     "$ref": "#/definitions/AlertRuleNotificationSettings"
+    },
     "orgId": {
      "format": "int64",
      "type": "integer"
@@ -1535,6 +1682,23 @@
    ],
    "type": "object"
   },
+  "GettableTimeIntervals": {
+   "properties": {
+    "name": {
+     "type": "string"
+    },
+    "provenance": {
+     "$ref": "#/definitions/Provenance"
+    },
+    "time_intervals": {
+     "items": {
+      "$ref": "#/definitions/TimeIntervalItem"
+     },
+     "type": "array"
+    }
+   },
+   "type": "object"
+  },
   "GettableUserConfig": {
    "properties": {
     "alertmanager_config": {
@@ -1835,6 +1999,9 @@
     "send_resolved": {
      "type": "boolean"
     },
+    "summary": {
+     "type": "string"
+    },
     "text": {
      "type": "string"
     },
@@ -1843,13 +2010,16 @@
     },
     "webhook_url": {
      "$ref": "#/definitions/SecretURL"
+    },
+    "webhook_url_file": {
+     "type": "string"
     }
    },
    "type": "object"
   },
   "MatchRegexps": {
    "additionalProperties": {
-    "$ref": "#/definitions/Regexp"
+    "type": "string"
    },
    "title": "MatchRegexps represents a map of Regexp.",
    "type": "object"
@@ -1899,6 +2069,24 @@
    "title": "MuteTimeInterval represents a named set of time intervals for which a route should be muted.",
    "type": "object"
   },
+  "MuteTimeIntervalExport": {
+   "properties": {
+    "name": {
+     "type": "string"
+    },
+    "orgId": {
+     "format": "int64",
+     "type": "integer"
+    },
+    "time_intervals": {
+     "items": {
+      "$ref": "#/definitions/TimeInterval"
+     },
+     "type": "array"
+    }
+   },
+   "type": "object"
+  },
   "MuteTimings": {
    "items": {
     "$ref": "#/definitions/MuteTimeInterval"
@@ -1944,12 +2132,58 @@
   },
   "NotificationPolicyExport": {
    "properties": {
-    "Policy": {
-     "$ref": "#/definitions/RouteExport"
+    "continue": {
+     "type": "boolean"
+    },
+    "group_by": {
+     "items": {
+      "type": "string"
+     },
+     "type": "array"
+    },
+    "group_interval": {
+     "type": "string"
+    },
+    "group_wait": {
+     "type": "string"
+    },
+    "match": {
+     "additionalProperties": {
+      "type": "string"
+     },
+     "description": "Deprecated. Remove before v1.0 release.",
+     "type": "object"
+    },
+    "match_re": {
+     "$ref": "#/definitions/MatchRegexps"
+    },
+    "matchers": {
+     "$ref": "#/definitions/Matchers"
+    },
+    "mute_time_intervals": {
+     "items": {
+      "type": "string"
+     },
+     "type": "array"
+    },
+    "object_matchers": {
+     "$ref": "#/definitions/ObjectMatchers"
     },
     "orgId": {
      "format": "int64",
      "type": "integer"
+    },
+    "receiver": {
+     "type": "string"
+    },
+    "repeat_interval": {
+     "type": "string"
+    },
+    "routes": {
+     "items": {
+      "$ref": "#/definitions/RouteExport"
+     },
+     "type": "array"
     }
    },
    "title": "NotificationPolicyExport is the provisioned file export of alerting.NotificiationPolicyV1.",
@@ -2039,9 +2273,18 @@
    "title": "OAuth2 is the oauth2 client configuration.",
    "type": "object"
   },
+  "ObjectMatcher": {
+   "items": {
+    "type": "string"
+   },
+   "title": "ObjectMatcher is a matcher that can be used to filter alerts.",
+   "type": "array"
+  },
   "ObjectMatchers": {
-   "$ref": "#/definitions/Matchers",
-   "description": "ObjectMatchers is Matchers with a different Unmarshal and Marshal methods that accept matchers as objects\nthat have already been parsed."
+   "items": {
+    "$ref": "#/definitions/ObjectMatcher"
+   },
+   "type": "array"
   },
   "OpsGenieConfig": {
    "properties": {
@@ -2221,25 +2464,8 @@
   "PermissionDenied": {
    "type": "object"
   },
-  "Point": {
-   "description": "If H is not nil, then this is a histogram point and only (T, H) is valid.\nIf H is nil, then only (T, V) is valid.",
-   "properties": {
-    "H": {
-     "$ref": "#/definitions/FloatHistogram"
-    },
-    "T": {
-     "format": "int64",
-     "type": "integer"
-    },
-    "V": {
-     "format": "double",
-     "type": "number"
-    }
-   },
-   "title": "Point represents a single data point for a given timestamp.",
-   "type": "object"
-  },
   "PostableApiAlertingConfig": {
+   "description": "nolint:revive",
    "properties": {
     "global": {
      "$ref": "#/definitions/GlobalConfig"
@@ -2251,6 +2477,7 @@
      "type": "array"
     },
     "mute_time_intervals": {
+     "description": "MuteTimeIntervals is deprecated and will be removed before Alertmanager 1.0.",
      "items": {
       "$ref": "#/definitions/MuteTimeInterval"
      },
@@ -2271,11 +2498,18 @@
       "type": "string"
      },
      "type": "array"
+    },
+    "time_intervals": {
+     "items": {
+      "$ref": "#/definitions/TimeInterval"
+     },
+     "type": "array"
     }
    },
    "type": "object"
   },
   "PostableApiReceiver": {
+   "description": "nolint:revive",
    "properties": {
     "discord_configs": {
      "items": {
@@ -2493,6 +2727,9 @@
      ],
      "type": "string"
     },
+    "notification_settings": {
+     "$ref": "#/definitions/AlertRuleNotificationSettings"
+    },
     "title": {
      "type": "string"
     },
@@ -2532,6 +2769,20 @@
    },
    "type": "object"
   },
+  "PostableTimeIntervals": {
+   "properties": {
+    "name": {
+     "type": "string"
+    },
+    "time_intervals": {
+     "items": {
+      "$ref": "#/definitions/TimeIntervalItem"
+     },
+     "type": "array"
+    }
+   },
+   "type": "object"
+  },
   "PostableUserConfig": {
    "properties": {
     "alertmanager_config": {
@@ -2655,6 +2906,9 @@
      ],
      "type": "string"
     },
+    "notification_settings": {
+     "$ref": "#/definitions/AlertRuleNotificationSettings"
+    },
     "orgID": {
      "format": "int64",
      "type": "integer"
@@ -2724,6 +2978,26 @@
    },
    "type": "object"
   },
+  "PublicError": {
+   "description": "PublicError is derived from Error and only contains information\navailable to the end user.",
+   "properties": {
+    "extra": {
+     "additionalProperties": {},
+     "type": "object"
+    },
+    "message": {
+     "type": "string"
+    },
+    "messageId": {
+     "type": "string"
+    },
+    "statusCode": {
+     "format": "int64",
+     "type": "integer"
+    }
+   },
+   "type": "object"
+  },
   "PushoverConfig": {
    "properties": {
     "device": {
@@ -2973,11 +3247,6 @@
    "title": "ReceiverExport is the provisioned file export of alerting.ReceiverV1.",
    "type": "object"
   },
-  "Regexp": {
-   "description": "A Regexp is safe for concurrent use by multiple goroutines,\nexcept for configuration methods, such as Longest.",
-   "title": "Regexp is the representation of a compiled regular expression.",
-   "type": "object"
-  },
   "RelativeTimeRange": {
    "description": "RelativeTimeRange is the per query start and end time\nfor requests.",
    "properties": {
@@ -3320,7 +3589,12 @@
    "type": "object"
   },
   "Sample": {
+   "description": "Sample is a single sample belonging to a metric. It represents either a float\nsample or a histogram sample. If H is nil, it is a float sample. Otherwise,\nit is a histogram sample.",
    "properties": {
+    "F": {
+     "format": "double",
+     "type": "number"
+    },
     "H": {
      "$ref": "#/definitions/FloatHistogram"
     },
@@ -3330,13 +3604,8 @@
     "T": {
      "format": "int64",
      "type": "integer"
-    },
-    "V": {
-     "format": "double",
-     "type": "number"
     }
    },
-   "title": "Sample is a single sample belonging to a metric.",
    "type": "object"
   },
   "Secret": {
@@ -3829,7 +4098,21 @@
    "type": "string"
   },
   "TimeInterval": {
-   "description": "TimeInterval describes intervals of time. ContainsTime will tell you if a golang time is contained\nwithin the interval.",
+   "properties": {
+    "name": {
+     "type": "string"
+    },
+    "time_intervals": {
+     "items": {
+      "$ref": "#/definitions/TimeInterval"
+     },
+     "type": "array"
+    }
+   },
+   "title": "TimeInterval represents a named set of time intervals for which a route should be muted.",
+   "type": "object"
+  },
+  "TimeIntervalItem": {
    "properties": {
     "days_of_month": {
      "items": {
@@ -3848,7 +4131,7 @@
     },
     "times": {
      "items": {
-      "$ref": "#/definitions/TimeRange"
+      "$ref": "#/definitions/TimeIntervalTimeRange"
      },
      "type": "array"
     },
@@ -3867,6 +4150,17 @@
    },
    "type": "object"
   },
+  "TimeIntervalTimeRange": {
+   "properties": {
+    "end_time": {
+     "type": "string"
+    },
+    "start_time": {
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
   "TimeRange": {
    "description": "Redefining this to avoid an import cycle",
    "properties": {
@@ -3970,7 +4264,7 @@
    "type": "array"
   },
   "Vector": {
-   "description": "Vector is basically only an alias for model.Samples, but the\ncontract is that in a Vector, all Samples have the same timestamp.",
+   "description": "Vector is basically only an alias for []Sample, but the contract is that\nin a Vector, all Samples have the same timestamp.",
    "items": {
     "$ref": "#/definitions/Sample"
    },
@@ -4123,6 +4417,7 @@
    "type": "object"
   },
   "alertGroup": {
+   "description": "AlertGroup alert group",
    "properties": {
     "alerts": {
      "description": "alerts",
@@ -4146,7 +4441,6 @@
    "type": "object"
   },
   "alertGroups": {
-   "description": "AlertGroups alert groups",
    "items": {
     "$ref": "#/definitions/alertGroup"
    },
@@ -4251,7 +4545,6 @@
    "type": "object"
   },
   "gettableAlert": {
-   "description": "GettableAlert gettable alert",
    "properties": {
     "annotations": {
      "$ref": "#/definitions/labelSet"
@@ -4307,7 +4600,6 @@
    "type": "object"
   },
   "gettableAlerts": {
-   "description": "GettableAlerts gettable alerts",
    "items": {
     "$ref": "#/definitions/gettableAlert"
    },
@@ -4363,6 +4655,7 @@
    "type": "object"
   },
   "gettableSilences": {
+   "description": "GettableSilences gettable silences",
    "items": {
     "$ref": "#/definitions/gettableSilence"
    },
@@ -4670,7 +4963,7 @@
   "version": "1.1.0"
  },
  "paths": {
-  "/api/alertmanager/grafana/api/v2/alerts": {
+  "/alertmanager/grafana/api/v2/alerts": {
    "get": {
     "description": "get alertmanager alerts",
     "operationId": "RouteGetGrafanaAMAlerts",
@@ -4731,7 +5024,7 @@
     ]
    }
   },
-  "/api/alertmanager/grafana/api/v2/alerts/groups": {
+  "/alertmanager/grafana/api/v2/alerts/groups": {
    "get": {
     "description": "get alertmanager alerts",
     "operationId": "RouteGetGrafanaAMAlertGroups",
@@ -4792,7 +5085,7 @@
     ]
    }
   },
-  "/api/alertmanager/grafana/api/v2/silence/{SilenceId}": {
+  "/alertmanager/grafana/api/v2/silence/{SilenceId}": {
    "delete": {
     "description": "delete silence",
     "operationId": "RouteDeleteGrafanaSilence",
@@ -4852,7 +5145,7 @@
     ]
    }
   },
-  "/api/alertmanager/grafana/api/v2/silences": {
+  "/alertmanager/grafana/api/v2/silences": {
    "get": {
     "description": "get silences",
     "operationId": "RouteGetGrafanaSilences",
@@ -4915,7 +5208,7 @@
     ]
    }
   },
-  "/api/alertmanager/grafana/api/v2/status": {
+  "/alertmanager/grafana/api/v2/status": {
    "get": {
     "description": "get alertmanager status and configuration",
     "operationId": "RouteGetGrafanaAMStatus",
@@ -4938,7 +5231,7 @@
     ]
    }
   },
-  "/api/alertmanager/grafana/config/api/v1/alerts": {
+  "/alertmanager/grafana/config/api/v1/alerts": {
    "delete": {
     "description": "deletes the Alerting config for a tenant",
     "operationId": "RouteDeleteGrafanaAlertingConfig",
@@ -5012,7 +5305,7 @@
     ]
    }
   },
-  "/api/alertmanager/grafana/config/api/v1/receivers": {
+  "/alertmanager/grafana/config/api/v1/receivers": {
    "get": {
     "description": "Get a list of all receivers",
     "operationId": "RouteGetGrafanaReceivers",
@@ -5026,7 +5319,7 @@
     ]
    }
   },
-  "/api/alertmanager/grafana/config/api/v1/receivers/test": {
+  "/alertmanager/grafana/config/api/v1/receivers/test": {
    "post": {
     "operationId": "RoutePostTestGrafanaReceivers",
     "parameters": [
@@ -5088,7 +5381,7 @@
     ]
    }
   },
-  "/api/alertmanager/grafana/config/api/v1/templates/test": {
+  "/alertmanager/grafana/config/api/v1/templates/test": {
    "post": {
     "operationId": "RoutePostTestGrafanaTemplates",
     "parameters": [
@@ -5135,7 +5428,7 @@
     ]
    }
   },
-  "/api/alertmanager/grafana/config/history": {
+  "/alertmanager/grafana/config/history": {
    "get": {
     "description": "gets Alerting configurations that were successfully applied in the past",
     "operationId": "RouteGetGrafanaAlertingConfigHistory",
@@ -5158,7 +5451,7 @@
     ]
    }
   },
-  "/api/alertmanager/grafana/config/history/{id}/_activate": {
+  "/alertmanager/grafana/config/history/{id}/_activate": {
    "post": {
     "description": "revert Alerting configuration to the historical configuration specified by the given id",
     "operationId": "RoutePostGrafanaAlertingConfigHistoryActivate",
@@ -5197,7 +5490,7 @@
     ]
    }
   },
-  "/api/alertmanager/{DatasourceUID}/api/v2/alerts": {
+  "/alertmanager/{DatasourceUID}/api/v2/alerts": {
    "get": {
     "description": "get alertmanager alerts",
     "operationId": "RouteGetAMAlerts",
@@ -5317,7 +5610,7 @@
     ]
    }
   },
-  "/api/alertmanager/{DatasourceUID}/api/v2/alerts/groups": {
+  "/alertmanager/{DatasourceUID}/api/v2/alerts/groups": {
    "get": {
     "description": "get alertmanager alerts",
     "operationId": "RouteGetAMAlertGroups",
@@ -5391,7 +5684,7 @@
     ]
    }
   },
-  "/api/alertmanager/{DatasourceUID}/api/v2/silence/{SilenceId}": {
+  "/alertmanager/{DatasourceUID}/api/v2/silence/{SilenceId}": {
    "delete": {
     "description": "delete silence",
     "operationId": "RouteDeleteSilence",
@@ -5477,7 +5770,7 @@
     ]
    }
   },
-  "/api/alertmanager/{DatasourceUID}/api/v2/silences": {
+  "/alertmanager/{DatasourceUID}/api/v2/silences": {
    "get": {
     "description": "get silences",
     "operationId": "RouteGetSilences",
@@ -5566,7 +5859,7 @@
     ]
    }
   },
-  "/api/alertmanager/{DatasourceUID}/api/v2/status": {
+  "/alertmanager/{DatasourceUID}/api/v2/status": {
    "get": {
     "description": "get alertmanager status and configuration",
     "operationId": "RouteGetAMStatus",
@@ -5604,7 +5897,7 @@
     ]
    }
   },
-  "/api/alertmanager/{DatasourceUID}/config/api/v1/alerts": {
+  "/alertmanager/{DatasourceUID}/config/api/v1/alerts": {
    "delete": {
     "description": "deletes the Alerting config for a tenant",
     "operationId": "RouteDeleteAlertingConfig",
@@ -5721,7 +6014,7 @@
     ]
    }
   },
-  "/api/prometheus/grafana/api/v1/alerts": {
+  "/prometheus/grafana/api/v1/alerts": {
    "get": {
     "description": "gets the current alerts",
     "operationId": "RouteGetGrafanaAlertStatuses",
@@ -5747,7 +6040,7 @@
     ]
    }
   },
-  "/api/prometheus/grafana/api/v1/rules": {
+  "/prometheus/grafana/api/v1/rules": {
    "get": {
     "description": "gets the evaluation statuses of all rules",
     "operationId": "RouteGetGrafanaRuleStatuses",
@@ -5786,7 +6079,7 @@
     ]
    }
   },
-  "/api/prometheus/{DatasourceUID}/api/v1/alerts": {
+  "/prometheus/{DatasourceUID}/api/v1/alerts": {
    "get": {
     "description": "gets the current alerts",
     "operationId": "RouteGetAlertStatuses",
@@ -5818,7 +6111,7 @@
     ]
    }
   },
-  "/api/prometheus/{DatasourceUID}/api/v1/rules": {
+  "/prometheus/{DatasourceUID}/api/v1/rules": {
    "get": {
     "description": "gets the evaluation statuses of all rules",
     "operationId": "RouteGetRuleStatuses",
@@ -5850,12 +6143,8 @@
     ]
    }
   },
-  "/api/ruler/grafana/api/v1/export/rules": {
+  "/ruler/grafana/api/v1/export/rules": {
    "get": {
-    "consumes": [
-     "application/json",
-     "application/yaml"
-    ],
     "description": "List rules in provisioning format",
     "operationId": "RouteGetRulesForExport",
     "parameters": [
@@ -5868,7 +6157,12 @@
      },
      {
       "default": "yaml",
-      "description": "Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.",
+      "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+      "enum": [
+       "yaml",
+       "json",
+       "hcl"
+      ],
       "in": "query",
       "name": "format",
       "type": "string"
@@ -5895,6 +6189,13 @@
       "type": "string"
      }
     ],
+    "produces": [
+     "application/json",
+     "application/yaml",
+     "application/terraform+hcl",
+     "text/yaml",
+     "text/hcl"
+    ],
     "responses": {
      "200": {
       "description": "AlertingFileExport",
@@ -5902,6 +6203,12 @@
        "$ref": "#/definitions/AlertingFileExport"
       }
      },
+     "403": {
+      "description": "ForbiddenError",
+      "schema": {
+       "$ref": "#/definitions/ForbiddenError"
+      }
+     },
      "404": {
       "description": " Not found."
      }
@@ -5911,7 +6218,7 @@
     ]
    }
   },
-  "/api/ruler/grafana/api/v1/rules": {
+  "/ruler/grafana/api/v1/rules": {
    "get": {
     "description": "List rule groups",
     "operationId": "RouteGetGrafanaRulesConfig",
@@ -5937,6 +6244,12 @@
       "schema": {
        "$ref": "#/definitions/NamespaceConfigResponse"
       }
+     },
+     "403": {
+      "description": "ForbiddenError",
+      "schema": {
+       "$ref": "#/definitions/ForbiddenError"
+      }
      }
     },
     "tags": [
@@ -5944,12 +6257,13 @@
     ]
    }
   },
-  "/api/ruler/grafana/api/v1/rules/{Namespace}": {
+  "/ruler/grafana/api/v1/rules/{Namespace}": {
    "delete": {
     "description": "Delete namespace",
     "operationId": "RouteDeleteNamespaceGrafanaRulesConfig",
     "parameters": [
      {
+      "description": "The UID of the rule folder",
       "in": "path",
       "name": "Namespace",
       "required": true,
@@ -5962,6 +6276,12 @@
       "schema": {
        "$ref": "#/definitions/Ack"
       }
+     },
+     "403": {
+      "description": "ForbiddenError",
+      "schema": {
+       "$ref": "#/definitions/ForbiddenError"
+      }
      }
     },
     "tags": [
@@ -5973,6 +6293,7 @@
     "operationId": "RouteGetNamespaceGrafanaRulesConfig",
     "parameters": [
      {
+      "description": "The UID of the rule folder",
       "in": "path",
       "name": "Namespace",
       "required": true,
@@ -5988,6 +6309,12 @@
       "schema": {
        "$ref": "#/definitions/NamespaceConfigResponse"
       }
+     },
+     "403": {
+      "description": "ForbiddenError",
+      "schema": {
+       "$ref": "#/definitions/ForbiddenError"
+      }
      }
     },
     "tags": [
@@ -6003,6 +6330,7 @@
     "operationId": "RoutePostNameGrafanaRulesConfig",
     "parameters": [
      {
+      "description": "The UID of the rule folder",
       "in": "path",
       "name": "Namespace",
       "required": true,
@@ -6022,6 +6350,12 @@
       "schema": {
        "$ref": "#/definitions/UpdateRuleGroupResponse"
       }
+     },
+     "403": {
+      "description": "ForbiddenError",
+      "schema": {
+       "$ref": "#/definitions/ForbiddenError"
+      }
      }
     },
     "tags": [
@@ -6029,16 +6363,16 @@
     ]
    }
   },
-  "/api/ruler/grafana/api/v1/rules/{Namespace}/export": {
+  "/ruler/grafana/api/v1/rules/{Namespace}/export": {
    "post": {
     "consumes": [
-     "application/json",
-     "application/yaml"
+     "application/json"
     ],
     "description": "Converts submitted rule group to provisioning format",
     "operationId": "RoutePostRulesGroupForExport",
     "parameters": [
      {
+      "description": "The UID of the rule folder",
       "in": "path",
       "name": "Namespace",
       "required": true,
@@ -6060,12 +6394,24 @@
      },
      {
       "default": "yaml",
-      "description": "Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.",
+      "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+      "enum": [
+       "yaml",
+       "json",
+       "hcl"
+      ],
       "in": "query",
       "name": "format",
       "type": "string"
      }
     ],
+    "produces": [
+     "application/json",
+     "application/yaml",
+     "application/terraform+hcl",
+     "text/yaml",
+     "text/hcl"
+    ],
     "responses": {
      "200": {
       "description": "AlertingFileExport",
@@ -6073,6 +6419,12 @@
        "$ref": "#/definitions/AlertingFileExport"
       }
      },
+     "403": {
+      "description": "ForbiddenError",
+      "schema": {
+       "$ref": "#/definitions/ForbiddenError"
+      }
+     },
      "404": {
       "description": " Not found."
      }
@@ -6082,12 +6434,13 @@
     ]
    }
   },
-  "/api/ruler/grafana/api/v1/rules/{Namespace}/{Groupname}": {
+  "/ruler/grafana/api/v1/rules/{Namespace}/{Groupname}": {
    "delete": {
     "description": "Delete rule group",
     "operationId": "RouteDeleteGrafanaRuleGroupConfig",
     "parameters": [
      {
+      "description": "The UID of the rule folder",
       "in": "path",
       "name": "Namespace",
       "required": true,
@@ -6106,6 +6459,12 @@
       "schema": {
        "$ref": "#/definitions/Ack"
       }
+     },
+     "403": {
+      "description": "ForbiddenError",
+      "schema": {
+       "$ref": "#/definitions/ForbiddenError"
+      }
      }
     },
     "tags": [
@@ -6117,6 +6476,7 @@
     "operationId": "RouteGetGrafanaRuleGroupConfig",
     "parameters": [
      {
+      "description": "The UID of the rule folder",
       "in": "path",
       "name": "Namespace",
       "required": true,
@@ -6138,6 +6498,12 @@
       "schema": {
        "$ref": "#/definitions/RuleGroupConfigResponse"
       }
+     },
+     "403": {
+      "description": "ForbiddenError",
+      "schema": {
+       "$ref": "#/definitions/ForbiddenError"
+      }
      }
     },
     "tags": [
@@ -6145,7 +6511,7 @@
     ]
    }
   },
-  "/api/ruler/{DatasourceUID}/api/v1/rules": {
+  "/ruler/{DatasourceUID}/api/v1/rules": {
    "get": {
     "description": "List rule groups",
     "operationId": "RouteGetRulesConfig",
@@ -6179,6 +6545,12 @@
        "$ref": "#/definitions/NamespaceConfigResponse"
       }
      },
+     "403": {
+      "description": "ForbiddenError",
+      "schema": {
+       "$ref": "#/definitions/ForbiddenError"
+      }
+     },
      "404": {
       "description": "NotFound",
       "schema": {
@@ -6191,7 +6563,7 @@
     ]
    }
   },
-  "/api/ruler/{DatasourceUID}/api/v1/rules/{Namespace}": {
+  "/ruler/{DatasourceUID}/api/v1/rules/{Namespace}": {
    "delete": {
     "description": "Delete namespace",
     "operationId": "RouteDeleteNamespaceRulesConfig",
@@ -6204,6 +6576,7 @@
       "type": "string"
      },
      {
+      "description": "The UID of the rule folder",
       "in": "path",
       "name": "Namespace",
       "required": true,
@@ -6217,6 +6590,12 @@
        "$ref": "#/definitions/Ack"
       }
      },
+     "403": {
+      "description": "ForbiddenError",
+      "schema": {
+       "$ref": "#/definitions/ForbiddenError"
+      }
+     },
      "404": {
       "description": "NotFound",
       "schema": {
@@ -6240,6 +6619,7 @@
       "type": "string"
      },
      {
+      "description": "The UID of the rule folder",
       "in": "path",
       "name": "Namespace",
       "required": true,
@@ -6256,6 +6636,12 @@
        "$ref": "#/definitions/NamespaceConfigResponse"
       }
      },
+     "403": {
+      "description": "ForbiddenError",
+      "schema": {
+       "$ref": "#/definitions/ForbiddenError"
+      }
+     },
      "404": {
       "description": "NotFound",
       "schema": {
@@ -6283,6 +6669,7 @@
       "type": "string"
      },
      {
+      "description": "The UID of the rule folder",
       "in": "path",
       "name": "Namespace",
       "required": true,
@@ -6303,6 +6690,12 @@
        "$ref": "#/definitions/Ack"
       }
      },
+     "403": {
+      "description": "ForbiddenError",
+      "schema": {
+       "$ref": "#/definitions/ForbiddenError"
+      }
+     },
      "404": {
       "description": "NotFound",
       "schema": {
@@ -6315,7 +6708,7 @@
     ]
    }
   },
-  "/api/ruler/{DatasourceUID}/api/v1/rules/{Namespace}/{Groupname}": {
+  "/ruler/{DatasourceUID}/api/v1/rules/{Namespace}/{Groupname}": {
    "delete": {
     "description": "Delete rule group",
     "operationId": "RouteDeleteRuleGroupConfig",
@@ -6328,6 +6721,7 @@
       "type": "string"
      },
      {
+      "description": "The UID of the rule folder",
       "in": "path",
       "name": "Namespace",
       "required": true,
@@ -6347,6 +6741,12 @@
        "$ref": "#/definitions/Ack"
       }
      },
+     "403": {
+      "description": "ForbiddenError",
+      "schema": {
+       "$ref": "#/definitions/ForbiddenError"
+      }
+     },
      "404": {
       "description": "NotFound",
       "schema": {
@@ -6370,6 +6770,7 @@
       "type": "string"
      },
      {
+      "description": "The UID of the rule folder",
       "in": "path",
       "name": "Namespace",
       "required": true,
@@ -6392,6 +6793,12 @@
        "$ref": "#/definitions/RuleGroupConfigResponse"
       }
      },
+     "403": {
+      "description": "ForbiddenError",
+      "schema": {
+       "$ref": "#/definitions/ForbiddenError"
+      }
+     },
      "404": {
       "description": "NotFound",
       "schema": {
@@ -6404,7 +6811,7 @@
     ]
    }
   },
-  "/api/v1/eval": {
+  "/v1/eval": {
    "post": {
     "consumes": [
      "application/json"
@@ -6436,7 +6843,7 @@
     ]
    }
   },
-  "/api/v1/ngalert": {
+  "/v1/ngalert": {
    "get": {
     "description": "Get the status of the alerting engine",
     "operationId": "RouteGetStatus",
@@ -6456,7 +6863,7 @@
     ]
    }
   },
-  "/api/v1/ngalert/admin_config": {
+  "/v1/ngalert/admin_config": {
    "delete": {
     "consumes": [
      "application/json"
@@ -6545,7 +6952,7 @@
     ]
    }
   },
-  "/api/v1/ngalert/alertmanagers": {
+  "/v1/ngalert/alertmanagers": {
    "get": {
     "operationId": "RouteGetAlertmanagers",
     "produces": [
@@ -6565,7 +6972,148 @@
     ]
    }
   },
-  "/api/v1/provisioning/alert-rules": {
+  "/v1/notifications/receivers": {
+   "get": {
+    "operationId": "RouteGetReceivers",
+    "parameters": [
+     {
+      "in": "query",
+      "items": {
+       "type": "string"
+      },
+      "name": "names",
+      "type": "array"
+     },
+     {
+      "format": "int64",
+      "in": "query",
+      "name": "limit",
+      "type": "integer"
+     },
+     {
+      "format": "int64",
+      "in": "query",
+      "name": "offset",
+      "type": "integer"
+     },
+     {
+      "in": "query",
+      "name": "decrypt",
+      "type": "boolean"
+     }
+    ],
+    "responses": {
+     "200": {
+      "$ref": "#/responses/GetReceiversResponse"
+     },
+     "403": {
+      "description": "PermissionDenied",
+      "schema": {
+       "$ref": "#/definitions/PermissionDenied"
+      }
+     }
+    },
+    "summary": "Get all receivers.",
+    "tags": [
+     "notifications"
+    ]
+   }
+  },
+  "/v1/notifications/receivers/{Name}": {
+   "get": {
+    "operationId": "RouteGetReceiver",
+    "parameters": [
+     {
+      "in": "path",
+      "name": "name",
+      "required": true,
+      "type": "string"
+     },
+     {
+      "in": "query",
+      "name": "decrypt",
+      "type": "boolean"
+     }
+    ],
+    "responses": {
+     "200": {
+      "$ref": "#/responses/GetReceiverResponse"
+     },
+     "403": {
+      "description": "PermissionDenied",
+      "schema": {
+       "$ref": "#/definitions/PermissionDenied"
+      }
+     },
+     "404": {
+      "description": "NotFound",
+      "schema": {
+       "$ref": "#/definitions/NotFound"
+      }
+     }
+    },
+    "summary": "Get a receiver by name.",
+    "tags": [
+     "notifications"
+    ]
+   }
+  },
+  "/v1/notifications/time-intervals": {
+   "get": {
+    "description": "Get all the time intervals",
+    "operationId": "RouteNotificationsGetTimeIntervals",
+    "responses": {
+     "200": {
+      "$ref": "#/responses/GetAllIntervalsResponse"
+     },
+     "403": {
+      "description": "ForbiddenError",
+      "schema": {
+       "$ref": "#/definitions/ForbiddenError"
+      }
+     }
+    },
+    "tags": [
+     "notifications"
+    ]
+   }
+  },
+  "/v1/notifications/time-intervals/{name}": {
+   "get": {
+    "operationId": "RouteNotificationsGetTimeInterval",
+    "parameters": [
+     {
+      "description": "Time interval name",
+      "in": "path",
+      "name": "name",
+      "required": true,
+      "type": "string"
+     }
+    ],
+    "responses": {
+     "200": {
+      "$ref": "#/responses/GetIntervalsByNameResponse"
+     },
+     "403": {
+      "description": "ForbiddenError",
+      "schema": {
+       "$ref": "#/definitions/ForbiddenError"
+      }
+     },
+     "404": {
+      "description": "NotFound",
+      "schema": {
+       "$ref": "#/definitions/NotFound"
+      }
+     }
+    },
+    "summary": "Get a time interval by name.",
+    "tags": [
+     "notifications"
+    ]
+   }
+  },
+  "/v1/provisioning/alert-rules": {
    "get": {
     "operationId": "RouteGetAlertRules",
     "responses": {
@@ -6620,7 +7168,7 @@
     ]
    }
   },
-  "/api/v1/provisioning/alert-rules/export": {
+  "/v1/provisioning/alert-rules/export": {
    "get": {
     "operationId": "RouteGetAlertRulesExport",
     "parameters": [
@@ -6633,7 +7181,12 @@
      },
      {
       "default": "yaml",
-      "description": "Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.",
+      "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+      "enum": [
+       "yaml",
+       "json",
+       "hcl"
+      ],
       "in": "query",
       "name": "format",
       "type": "string"
@@ -6660,6 +7213,13 @@
       "type": "string"
      }
     ],
+    "produces": [
+     "application/json",
+     "application/yaml",
+     "application/terraform+hcl",
+     "text/yaml",
+     "text/hcl"
+    ],
     "responses": {
      "200": {
       "description": "AlertingFileExport",
@@ -6677,7 +7237,7 @@
     ]
    }
   },
-  "/api/v1/provisioning/alert-rules/{UID}": {
+  "/v1/provisioning/alert-rules/{UID}": {
    "delete": {
     "operationId": "RouteDeleteAlertRule",
     "parameters": [
@@ -6687,6 +7247,11 @@
       "name": "UID",
       "required": true,
       "type": "string"
+     },
+     {
+      "in": "header",
+      "name": "X-Disable-Provenance",
+      "type": "string"
      }
     ],
     "responses": {
@@ -6772,7 +7337,7 @@
     ]
    }
   },
-  "/api/v1/provisioning/alert-rules/{UID}/export": {
+  "/v1/provisioning/alert-rules/{UID}/export": {
    "get": {
     "operationId": "RouteGetAlertRuleExport",
     "parameters": [
@@ -6785,7 +7350,12 @@
      },
      {
       "default": "yaml",
-      "description": "Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.",
+      "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+      "enum": [
+       "yaml",
+       "json",
+       "hcl"
+      ],
       "in": "query",
       "name": "format",
       "type": "string"
@@ -6801,7 +7371,9 @@
     "produces": [
      "application/json",
      "application/yaml",
-     "text/yaml"
+     "application/terraform+hcl",
+     "text/yaml",
+     "text/hcl"
     ],
     "responses": {
      "200": {
@@ -6820,7 +7392,7 @@
     ]
    }
   },
-  "/api/v1/provisioning/contact-points": {
+  "/v1/provisioning/contact-points": {
    "get": {
     "operationId": "RouteGetContactpoints",
     "parameters": [
@@ -6856,6 +7428,11 @@
       "schema": {
        "$ref": "#/definitions/EmbeddedContactPoint"
       }
+     },
+     {
+      "in": "header",
+      "name": "X-Disable-Provenance",
+      "type": "string"
      }
     ],
     "responses": {
@@ -6878,7 +7455,7 @@
     ]
    }
   },
-  "/api/v1/provisioning/contact-points/export": {
+  "/v1/provisioning/contact-points/export": {
    "get": {
     "operationId": "RouteGetContactpointsExport",
     "parameters": [
@@ -6891,7 +7468,12 @@
      },
      {
       "default": "yaml",
-      "description": "Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.",
+      "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+      "enum": [
+       "yaml",
+       "json",
+       "hcl"
+      ],
       "in": "query",
       "name": "format",
       "type": "string"
@@ -6910,6 +7492,13 @@
       "type": "string"
      }
     ],
+    "produces": [
+     "application/json",
+     "application/yaml",
+     "application/terraform+hcl",
+     "text/yaml",
+     "text/hcl"
+    ],
     "responses": {
      "200": {
       "description": "AlertingFileExport",
@@ -6930,7 +7519,7 @@
     ]
    }
   },
-  "/api/v1/provisioning/contact-points/{UID}": {
+  "/v1/provisioning/contact-points/{UID}": {
    "delete": {
     "consumes": [
      "application/json"
@@ -6946,7 +7535,7 @@
      }
     ],
     "responses": {
-     "204": {
+     "202": {
       "description": " The contact point was deleted successfully."
      }
     },
@@ -6974,6 +7563,11 @@
       "schema": {
        "$ref": "#/definitions/EmbeddedContactPoint"
       }
+     },
+     {
+      "in": "header",
+      "name": "X-Disable-Provenance",
+      "type": "string"
      }
     ],
     "responses": {
@@ -6996,7 +7590,45 @@
     ]
    }
   },
-  "/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}": {
+  "/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}": {
+   "delete": {
+    "description": "Delete rule group",
+    "operationId": "RouteDeleteAlertRuleGroup",
+    "parameters": [
+     {
+      "in": "path",
+      "name": "FolderUID",
+      "required": true,
+      "type": "string"
+     },
+     {
+      "in": "path",
+      "name": "Group",
+      "required": true,
+      "type": "string"
+     }
+    ],
+    "responses": {
+     "204": {
+      "description": " The alert rule group was deleted successfully."
+     },
+     "403": {
+      "description": "ForbiddenError",
+      "schema": {
+       "$ref": "#/definitions/ForbiddenError"
+      }
+     },
+     "404": {
+      "description": "NotFound",
+      "schema": {
+       "$ref": "#/definitions/NotFound"
+      }
+     }
+    },
+    "tags": [
+     "provisioning"
+    ]
+   },
    "get": {
     "operationId": "RouteGetAlertRuleGroup",
     "parameters": [
@@ -7035,6 +7667,11 @@
     ],
     "operationId": "RoutePutAlertRuleGroup",
     "parameters": [
+     {
+      "in": "header",
+      "name": "X-Disable-Provenance",
+      "type": "string"
+     },
      {
       "in": "path",
       "name": "FolderUID",
@@ -7069,13 +7706,13 @@
       }
      }
     },
-    "summary": "Update the interval of a rule group.",
+    "summary": "Create or update alert rule group.",
     "tags": [
      "provisioning"
     ]
    }
   },
-  "/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}/export": {
+  "/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}/export": {
    "get": {
     "operationId": "RouteGetAlertRuleGroupExport",
     "parameters": [
@@ -7088,7 +7725,12 @@
      },
      {
       "default": "yaml",
-      "description": "Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.",
+      "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+      "enum": [
+       "yaml",
+       "json",
+       "hcl"
+      ],
       "in": "query",
       "name": "format",
       "type": "string"
@@ -7109,7 +7751,9 @@
     "produces": [
      "application/json",
      "application/yaml",
-     "text/yaml"
+     "application/terraform+hcl",
+     "text/yaml",
+     "text/hcl"
     ],
     "responses": {
      "200": {
@@ -7128,7 +7772,7 @@
     ]
    }
   },
-  "/api/v1/provisioning/mute-timings": {
+  "/v1/provisioning/mute-timings": {
    "get": {
     "operationId": "RouteGetMuteTimings",
     "responses": {
@@ -7156,6 +7800,11 @@
       "schema": {
        "$ref": "#/definitions/MuteTimeInterval"
       }
+     },
+     {
+      "in": "header",
+      "name": "X-Disable-Provenance",
+      "type": "string"
      }
     ],
     "responses": {
@@ -7178,7 +7827,58 @@
     ]
    }
   },
-  "/api/v1/provisioning/mute-timings/{name}": {
+  "/v1/provisioning/mute-timings/export": {
+   "get": {
+    "operationId": "RouteExportMuteTimings",
+    "parameters": [
+     {
+      "default": false,
+      "description": "Whether to initiate a download of the file or not.",
+      "in": "query",
+      "name": "download",
+      "type": "boolean"
+     },
+     {
+      "default": "yaml",
+      "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+      "enum": [
+       "yaml",
+       "json",
+       "hcl"
+      ],
+      "in": "query",
+      "name": "format",
+      "type": "string"
+     }
+    ],
+    "produces": [
+     "application/json",
+     "application/yaml",
+     "application/terraform+hcl",
+     "text/yaml",
+     "text/hcl"
+    ],
+    "responses": {
+     "200": {
+      "description": "AlertingFileExport",
+      "schema": {
+       "$ref": "#/definitions/AlertingFileExport"
+      }
+     },
+     "403": {
+      "description": "PermissionDenied",
+      "schema": {
+       "$ref": "#/definitions/PermissionDenied"
+      }
+     }
+    },
+    "summary": "Export all mute timings in provisioning format.",
+    "tags": [
+     "provisioning"
+    ]
+   }
+  },
+  "/v1/provisioning/mute-timings/{name}": {
    "delete": {
     "operationId": "RouteDeleteMuteTiming",
     "parameters": [
@@ -7193,6 +7893,12 @@
     "responses": {
      "204": {
       "description": " The mute timing was deleted successfully."
+     },
+     "409": {
+      "description": "GenericPublicError",
+      "schema": {
+       "$ref": "#/definitions/GenericPublicError"
+      }
      }
     },
     "summary": "Delete a mute timing.",
@@ -7246,10 +7952,15 @@
       "schema": {
        "$ref": "#/definitions/MuteTimeInterval"
       }
+     },
+     {
+      "in": "header",
+      "name": "X-Disable-Provenance",
+      "type": "string"
      }
     ],
     "responses": {
-     "200": {
+     "202": {
       "description": "MuteTimeInterval",
       "schema": {
        "$ref": "#/definitions/MuteTimeInterval"
@@ -7268,7 +7979,65 @@
     ]
    }
   },
-  "/api/v1/provisioning/policies": {
+  "/v1/provisioning/mute-timings/{name}/export": {
+   "get": {
+    "operationId": "RouteExportMuteTiming",
+    "parameters": [
+     {
+      "default": false,
+      "description": "Whether to initiate a download of the file or not.",
+      "in": "query",
+      "name": "download",
+      "type": "boolean"
+     },
+     {
+      "default": "yaml",
+      "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+      "enum": [
+       "yaml",
+       "json",
+       "hcl"
+      ],
+      "in": "query",
+      "name": "format",
+      "type": "string"
+     },
+     {
+      "description": "Mute timing name",
+      "in": "path",
+      "name": "name",
+      "required": true,
+      "type": "string"
+     }
+    ],
+    "produces": [
+     "application/json",
+     "application/yaml",
+     "application/terraform+hcl",
+     "text/yaml",
+     "text/hcl"
+    ],
+    "responses": {
+     "200": {
+      "description": "AlertingFileExport",
+      "schema": {
+       "$ref": "#/definitions/AlertingFileExport"
+      }
+     },
+     "403": {
+      "description": "PermissionDenied",
+      "schema": {
+       "$ref": "#/definitions/PermissionDenied"
+      }
+     }
+    },
+    "summary": "Export a mute timing in provisioning format.",
+    "tags": [
+     "provisioning"
+    ]
+   }
+  },
+  "/v1/provisioning/policies": {
    "delete": {
     "consumes": [
      "application/json"
@@ -7315,6 +8084,11 @@
       "schema": {
        "$ref": "#/definitions/Route"
       }
+     },
+     {
+      "in": "header",
+      "name": "X-Disable-Provenance",
+      "type": "string"
      }
     ],
     "responses": {
@@ -7337,9 +8111,16 @@
     ]
    }
   },
-  "/api/v1/provisioning/policies/export": {
+  "/v1/provisioning/policies/export": {
    "get": {
     "operationId": "RouteGetPolicyTreeExport",
+    "produces": [
+     "application/json",
+     "application/yaml",
+     "application/terraform+hcl",
+     "text/yaml",
+     "text/hcl"
+    ],
     "responses": {
      "200": {
       "description": "AlertingFileExport",
@@ -7360,7 +8141,7 @@
     ]
    }
   },
-  "/api/v1/provisioning/templates": {
+  "/v1/provisioning/templates": {
    "get": {
     "operationId": "RouteGetTemplates",
     "responses": {
@@ -7380,7 +8161,7 @@
     ]
    }
   },
-  "/api/v1/provisioning/templates/{name}": {
+  "/v1/provisioning/templates/{name}": {
    "delete": {
     "operationId": "RouteDeleteTemplate",
     "parameters": [
@@ -7448,6 +8229,11 @@
       "schema": {
        "$ref": "#/definitions/NotificationTemplateContent"
       }
+     },
+     {
+      "in": "header",
+      "name": "X-Disable-Provenance",
+      "type": "string"
      }
     ],
     "responses": {
@@ -7470,7 +8256,7 @@
     ]
    }
   },
-  "/api/v1/rule/backtest": {
+  "/v1/rule/backtest": {
    "post": {
     "consumes": [
      "application/json"
@@ -7502,7 +8288,7 @@
     ]
    }
   },
-  "/api/v1/rule/test/grafana": {
+  "/v1/rule/test/grafana": {
    "post": {
     "consumes": [
      "application/json"
@@ -7543,7 +8329,7 @@
     ]
    }
   },
-  "/api/v1/rule/test/{DatasourceUID}": {
+  "/v1/rule/test/{DatasourceUID}": {
    "post": {
     "consumes": [
      "application/json"
@@ -7588,7 +8374,7 @@
     ]
    }
   },
-  "/api/v1/rules/history": {
+  "/v1/rules/history": {
    "get": {
     "operationId": "RouteGetStateHistory",
     "produces": [
@@ -7610,6 +8396,36 @@
   "application/json"
  ],
  "responses": {
+  "GetAllIntervalsResponse": {
+   "description": "",
+   "schema": {
+    "items": {
+     "$ref": "#/definitions/GettableTimeIntervals"
+    },
+    "type": "array"
+   }
+  },
+  "GetIntervalsByNameResponse": {
+   "description": "",
+   "schema": {
+    "$ref": "#/definitions/GettableTimeIntervals"
+   }
+  },
+  "GetReceiverResponse": {
+   "description": "",
+   "schema": {
+    "$ref": "#/definitions/GettableApiReceiver"
+   }
+  },
+  "GetReceiversResponse": {
+   "description": "",
+   "schema": {
+    "items": {
+     "$ref": "#/definitions/GettableApiReceiver"
+    },
+    "type": "array"
+   }
+  },
   "GettableHistoricUserConfigs": {
    "description": "",
    "schema": {
diff --git a/pkg/services/ngalert/api/tooling/spec.json b/pkg/services/ngalert/api/tooling/spec.json
index 62edc311aa2ae..c58984d9c4ad1 100644
--- a/pkg/services/ngalert/api/tooling/spec.json
+++ b/pkg/services/ngalert/api/tooling/spec.json
@@ -15,9 +15,9 @@
     "title": "Grafana Alerting API.",
     "version": "1.1.0"
   },
-  "basePath": "/api/v1",
+  "basePath": "/api",
   "paths": {
-    "/api/alertmanager/grafana/api/v2/alerts": {
+    "/alertmanager/grafana/api/v2/alerts": {
       "get": {
         "description": "get alertmanager alerts",
         "tags": [
@@ -78,7 +78,7 @@
         }
       }
     },
-    "/api/alertmanager/grafana/api/v2/alerts/groups": {
+    "/alertmanager/grafana/api/v2/alerts/groups": {
       "get": {
         "description": "get alertmanager alerts",
         "tags": [
@@ -139,7 +139,7 @@
         }
       }
     },
-    "/api/alertmanager/grafana/api/v2/silence/{SilenceId}": {
+    "/alertmanager/grafana/api/v2/silence/{SilenceId}": {
       "get": {
         "description": "get silence",
         "tags": [
@@ -199,7 +199,7 @@
         }
       }
     },
-    "/api/alertmanager/grafana/api/v2/silences": {
+    "/alertmanager/grafana/api/v2/silences": {
       "get": {
         "description": "get silences",
         "tags": [
@@ -262,7 +262,7 @@
         }
       }
     },
-    "/api/alertmanager/grafana/api/v2/status": {
+    "/alertmanager/grafana/api/v2/status": {
       "get": {
         "description": "get alertmanager status and configuration",
         "tags": [
@@ -285,7 +285,7 @@
         }
       }
     },
-    "/api/alertmanager/grafana/config/api/v1/alerts": {
+    "/alertmanager/grafana/config/api/v1/alerts": {
       "get": {
         "description": "gets an Alerting config",
         "tags": [
@@ -359,7 +359,7 @@
         }
       }
     },
-    "/api/alertmanager/grafana/config/api/v1/receivers": {
+    "/alertmanager/grafana/config/api/v1/receivers": {
       "get": {
         "description": "Get a list of all receivers",
         "tags": [
@@ -373,7 +373,7 @@
         }
       }
     },
-    "/api/alertmanager/grafana/config/api/v1/receivers/test": {
+    "/alertmanager/grafana/config/api/v1/receivers/test": {
       "post": {
         "tags": [
           "alertmanager"
@@ -435,7 +435,7 @@
         }
       }
     },
-    "/api/alertmanager/grafana/config/api/v1/templates/test": {
+    "/alertmanager/grafana/config/api/v1/templates/test": {
       "post": {
         "produces": [
           "application/json"
@@ -482,7 +482,7 @@
         }
       }
     },
-    "/api/alertmanager/grafana/config/history": {
+    "/alertmanager/grafana/config/history": {
       "get": {
         "description": "gets Alerting configurations that were successfully applied in the past",
         "tags": [
@@ -505,7 +505,7 @@
         }
       }
     },
-    "/api/alertmanager/grafana/config/history/{id}/_activate": {
+    "/alertmanager/grafana/config/history/{id}/_activate": {
       "post": {
         "description": "revert Alerting configuration to the historical configuration specified by the given id",
         "tags": [
@@ -544,7 +544,7 @@
         }
       }
     },
-    "/api/alertmanager/{DatasourceUID}/api/v2/alerts": {
+    "/alertmanager/{DatasourceUID}/api/v2/alerts": {
       "get": {
         "description": "get alertmanager alerts",
         "tags": [
@@ -664,7 +664,7 @@
         }
       }
     },
-    "/api/alertmanager/{DatasourceUID}/api/v2/alerts/groups": {
+    "/alertmanager/{DatasourceUID}/api/v2/alerts/groups": {
       "get": {
         "description": "get alertmanager alerts",
         "tags": [
@@ -738,7 +738,7 @@
         }
       }
     },
-    "/api/alertmanager/{DatasourceUID}/api/v2/silence/{SilenceId}": {
+    "/alertmanager/{DatasourceUID}/api/v2/silence/{SilenceId}": {
       "get": {
         "description": "get silence",
         "tags": [
@@ -824,7 +824,7 @@
         }
       }
     },
-    "/api/alertmanager/{DatasourceUID}/api/v2/silences": {
+    "/alertmanager/{DatasourceUID}/api/v2/silences": {
       "get": {
         "description": "get silences",
         "tags": [
@@ -913,7 +913,7 @@
         }
       }
     },
-    "/api/alertmanager/{DatasourceUID}/api/v2/status": {
+    "/alertmanager/{DatasourceUID}/api/v2/status": {
       "get": {
         "description": "get alertmanager status and configuration",
         "tags": [
@@ -951,7 +951,7 @@
         }
       }
     },
-    "/api/alertmanager/{DatasourceUID}/config/api/v1/alerts": {
+    "/alertmanager/{DatasourceUID}/config/api/v1/alerts": {
       "get": {
         "description": "gets an Alerting config",
         "tags": [
@@ -1068,7 +1068,7 @@
         }
       }
     },
-    "/api/prometheus/grafana/api/v1/alerts": {
+    "/prometheus/grafana/api/v1/alerts": {
       "get": {
         "description": "gets the current alerts",
         "tags": [
@@ -1094,7 +1094,7 @@
         }
       }
     },
-    "/api/prometheus/grafana/api/v1/rules": {
+    "/prometheus/grafana/api/v1/rules": {
       "get": {
         "description": "gets the evaluation statuses of all rules",
         "tags": [
@@ -1133,7 +1133,7 @@
         }
       }
     },
-    "/api/prometheus/{DatasourceUID}/api/v1/alerts": {
+    "/prometheus/{DatasourceUID}/api/v1/alerts": {
       "get": {
         "description": "gets the current alerts",
         "tags": [
@@ -1165,7 +1165,7 @@
         }
       }
     },
-    "/api/prometheus/{DatasourceUID}/api/v1/rules": {
+    "/prometheus/{DatasourceUID}/api/v1/rules": {
       "get": {
         "description": "gets the evaluation statuses of all rules",
         "tags": [
@@ -1197,12 +1197,15 @@
         }
       }
     },
-    "/api/ruler/grafana/api/v1/export/rules": {
+    "/ruler/grafana/api/v1/export/rules": {
       "get": {
         "description": "List rules in provisioning format",
-        "consumes": [
+        "produces": [
           "application/json",
-          "application/yaml"
+          "application/yaml",
+          "application/terraform+hcl",
+          "text/yaml",
+          "text/hcl"
         ],
         "tags": [
           "ruler"
@@ -1217,9 +1220,14 @@
             "in": "query"
           },
           {
+            "enum": [
+              "yaml",
+              "json",
+              "hcl"
+            ],
             "type": "string",
             "default": "yaml",
-            "description": "Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.",
+            "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
             "name": "format",
             "in": "query"
           },
@@ -1252,13 +1260,19 @@
               "$ref": "#/definitions/AlertingFileExport"
             }
           },
+          "403": {
+            "description": "ForbiddenError",
+            "schema": {
+              "$ref": "#/definitions/ForbiddenError"
+            }
+          },
           "404": {
             "description": " Not found."
           }
         }
       }
     },
-    "/api/ruler/grafana/api/v1/rules": {
+    "/ruler/grafana/api/v1/rules": {
       "get": {
         "description": "List rule groups",
         "produces": [
@@ -1287,11 +1301,17 @@
             "schema": {
               "$ref": "#/definitions/NamespaceConfigResponse"
             }
+          },
+          "403": {
+            "description": "ForbiddenError",
+            "schema": {
+              "$ref": "#/definitions/ForbiddenError"
+            }
           }
         }
       }
     },
-    "/api/ruler/grafana/api/v1/rules/{Namespace}": {
+    "/ruler/grafana/api/v1/rules/{Namespace}": {
       "get": {
         "description": "Get rule groups by namespace",
         "produces": [
@@ -1304,6 +1324,7 @@
         "parameters": [
           {
             "type": "string",
+            "description": "The UID of the rule folder",
             "name": "Namespace",
             "in": "path",
             "required": true
@@ -1315,6 +1336,12 @@
             "schema": {
               "$ref": "#/definitions/NamespaceConfigResponse"
             }
+          },
+          "403": {
+            "description": "ForbiddenError",
+            "schema": {
+              "$ref": "#/definitions/ForbiddenError"
+            }
           }
         }
       },
@@ -1331,6 +1358,7 @@
         "parameters": [
           {
             "type": "string",
+            "description": "The UID of the rule folder",
             "name": "Namespace",
             "in": "path",
             "required": true
@@ -1349,6 +1377,12 @@
             "schema": {
               "$ref": "#/definitions/UpdateRuleGroupResponse"
             }
+          },
+          "403": {
+            "description": "ForbiddenError",
+            "schema": {
+              "$ref": "#/definitions/ForbiddenError"
+            }
           }
         }
       },
@@ -1361,6 +1395,7 @@
         "parameters": [
           {
             "type": "string",
+            "description": "The UID of the rule folder",
             "name": "Namespace",
             "in": "path",
             "required": true
@@ -1372,16 +1407,28 @@
             "schema": {
               "$ref": "#/definitions/Ack"
             }
+          },
+          "403": {
+            "description": "ForbiddenError",
+            "schema": {
+              "$ref": "#/definitions/ForbiddenError"
+            }
           }
         }
       }
     },
-    "/api/ruler/grafana/api/v1/rules/{Namespace}/export": {
+    "/ruler/grafana/api/v1/rules/{Namespace}/export": {
       "post": {
         "description": "Converts submitted rule group to provisioning format",
         "consumes": [
+          "application/json"
+        ],
+        "produces": [
           "application/json",
-          "application/yaml"
+          "application/yaml",
+          "application/terraform+hcl",
+          "text/yaml",
+          "text/hcl"
         ],
         "tags": [
           "ruler"
@@ -1390,6 +1437,7 @@
         "parameters": [
           {
             "type": "string",
+            "description": "The UID of the rule folder",
             "name": "Namespace",
             "in": "path",
             "required": true
@@ -1409,9 +1457,14 @@
             "in": "query"
           },
           {
+            "enum": [
+              "yaml",
+              "json",
+              "hcl"
+            ],
             "type": "string",
             "default": "yaml",
-            "description": "Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.",
+            "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
             "name": "format",
             "in": "query"
           }
@@ -1423,13 +1476,19 @@
               "$ref": "#/definitions/AlertingFileExport"
             }
           },
+          "403": {
+            "description": "ForbiddenError",
+            "schema": {
+              "$ref": "#/definitions/ForbiddenError"
+            }
+          },
           "404": {
             "description": " Not found."
           }
         }
       }
     },
-    "/api/ruler/grafana/api/v1/rules/{Namespace}/{Groupname}": {
+    "/ruler/grafana/api/v1/rules/{Namespace}/{Groupname}": {
       "get": {
         "description": "Get rule group",
         "produces": [
@@ -1442,6 +1501,7 @@
         "parameters": [
           {
             "type": "string",
+            "description": "The UID of the rule folder",
             "name": "Namespace",
             "in": "path",
             "required": true
@@ -1459,6 +1519,12 @@
             "schema": {
               "$ref": "#/definitions/RuleGroupConfigResponse"
             }
+          },
+          "403": {
+            "description": "ForbiddenError",
+            "schema": {
+              "$ref": "#/definitions/ForbiddenError"
+            }
           }
         }
       },
@@ -1471,6 +1537,7 @@
         "parameters": [
           {
             "type": "string",
+            "description": "The UID of the rule folder",
             "name": "Namespace",
             "in": "path",
             "required": true
@@ -1488,11 +1555,17 @@
             "schema": {
               "$ref": "#/definitions/Ack"
             }
+          },
+          "403": {
+            "description": "ForbiddenError",
+            "schema": {
+              "$ref": "#/definitions/ForbiddenError"
+            }
           }
         }
       }
     },
-    "/api/ruler/{DatasourceUID}/api/v1/rules": {
+    "/ruler/{DatasourceUID}/api/v1/rules": {
       "get": {
         "description": "List rule groups",
         "produces": [
@@ -1529,6 +1602,12 @@
               "$ref": "#/definitions/NamespaceConfigResponse"
             }
           },
+          "403": {
+            "description": "ForbiddenError",
+            "schema": {
+              "$ref": "#/definitions/ForbiddenError"
+            }
+          },
           "404": {
             "description": "NotFound",
             "schema": {
@@ -1538,7 +1617,7 @@
         }
       }
     },
-    "/api/ruler/{DatasourceUID}/api/v1/rules/{Namespace}": {
+    "/ruler/{DatasourceUID}/api/v1/rules/{Namespace}": {
       "get": {
         "description": "Get rule groups by namespace",
         "produces": [
@@ -1558,6 +1637,7 @@
           },
           {
             "type": "string",
+            "description": "The UID of the rule folder",
             "name": "Namespace",
             "in": "path",
             "required": true
@@ -1570,6 +1650,12 @@
               "$ref": "#/definitions/NamespaceConfigResponse"
             }
           },
+          "403": {
+            "description": "ForbiddenError",
+            "schema": {
+              "$ref": "#/definitions/ForbiddenError"
+            }
+          },
           "404": {
             "description": "NotFound",
             "schema": {
@@ -1598,6 +1684,7 @@
           },
           {
             "type": "string",
+            "description": "The UID of the rule folder",
             "name": "Namespace",
             "in": "path",
             "required": true
@@ -1617,6 +1704,12 @@
               "$ref": "#/definitions/Ack"
             }
           },
+          "403": {
+            "description": "ForbiddenError",
+            "schema": {
+              "$ref": "#/definitions/ForbiddenError"
+            }
+          },
           "404": {
             "description": "NotFound",
             "schema": {
@@ -1641,6 +1734,7 @@
           },
           {
             "type": "string",
+            "description": "The UID of the rule folder",
             "name": "Namespace",
             "in": "path",
             "required": true
@@ -1653,6 +1747,12 @@
               "$ref": "#/definitions/Ack"
             }
           },
+          "403": {
+            "description": "ForbiddenError",
+            "schema": {
+              "$ref": "#/definitions/ForbiddenError"
+            }
+          },
           "404": {
             "description": "NotFound",
             "schema": {
@@ -1662,7 +1762,7 @@
         }
       }
     },
-    "/api/ruler/{DatasourceUID}/api/v1/rules/{Namespace}/{Groupname}": {
+    "/ruler/{DatasourceUID}/api/v1/rules/{Namespace}/{Groupname}": {
       "get": {
         "description": "Get rule group",
         "produces": [
@@ -1682,6 +1782,7 @@
           },
           {
             "type": "string",
+            "description": "The UID of the rule folder",
             "name": "Namespace",
             "in": "path",
             "required": true
@@ -1700,6 +1801,12 @@
               "$ref": "#/definitions/RuleGroupConfigResponse"
             }
           },
+          "403": {
+            "description": "ForbiddenError",
+            "schema": {
+              "$ref": "#/definitions/ForbiddenError"
+            }
+          },
           "404": {
             "description": "NotFound",
             "schema": {
@@ -1724,6 +1831,7 @@
           },
           {
             "type": "string",
+            "description": "The UID of the rule folder",
             "name": "Namespace",
             "in": "path",
             "required": true
@@ -1742,6 +1850,12 @@
               "$ref": "#/definitions/Ack"
             }
           },
+          "403": {
+            "description": "ForbiddenError",
+            "schema": {
+              "$ref": "#/definitions/ForbiddenError"
+            }
+          },
           "404": {
             "description": "NotFound",
             "schema": {
@@ -1751,7 +1865,7 @@
         }
       }
     },
-    "/api/v1/eval": {
+    "/v1/eval": {
       "post": {
         "description": "Test rule",
         "consumes": [
@@ -1783,7 +1897,7 @@
         }
       }
     },
-    "/api/v1/ngalert": {
+    "/v1/ngalert": {
       "get": {
         "description": "Get the status of the alerting engine",
         "produces": [
@@ -1803,7 +1917,7 @@
         }
       }
     },
-    "/api/v1/ngalert/admin_config": {
+    "/v1/ngalert/admin_config": {
       "get": {
         "produces": [
           "application/json"
@@ -1892,7 +2006,7 @@
         }
       }
     },
-    "/api/v1/ngalert/alertmanagers": {
+    "/v1/ngalert/alertmanagers": {
       "get": {
         "produces": [
           "application/json"
@@ -1912,7 +2026,148 @@
         }
       }
     },
-    "/api/v1/provisioning/alert-rules": {
+    "/v1/notifications/receivers": {
+      "get": {
+        "tags": [
+          "notifications"
+        ],
+        "summary": "Get all receivers.",
+        "operationId": "RouteGetReceivers",
+        "parameters": [
+          {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "name": "names",
+            "in": "query"
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "limit",
+            "in": "query"
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "offset",
+            "in": "query"
+          },
+          {
+            "type": "boolean",
+            "name": "decrypt",
+            "in": "query"
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/GetReceiversResponse"
+          },
+          "403": {
+            "description": "PermissionDenied",
+            "schema": {
+              "$ref": "#/definitions/PermissionDenied"
+            }
+          }
+        }
+      }
+    },
+    "/v1/notifications/receivers/{Name}": {
+      "get": {
+        "tags": [
+          "notifications"
+        ],
+        "summary": "Get a receiver by name.",
+        "operationId": "RouteGetReceiver",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "name",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "boolean",
+            "name": "decrypt",
+            "in": "query"
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/GetReceiverResponse"
+          },
+          "403": {
+            "description": "PermissionDenied",
+            "schema": {
+              "$ref": "#/definitions/PermissionDenied"
+            }
+          },
+          "404": {
+            "description": "NotFound",
+            "schema": {
+              "$ref": "#/definitions/NotFound"
+            }
+          }
+        }
+      }
+    },
+    "/v1/notifications/time-intervals": {
+      "get": {
+        "description": "Get all the time intervals",
+        "tags": [
+          "notifications"
+        ],
+        "operationId": "RouteNotificationsGetTimeIntervals",
+        "responses": {
+          "200": {
+            "$ref": "#/responses/GetAllIntervalsResponse"
+          },
+          "403": {
+            "description": "ForbiddenError",
+            "schema": {
+              "$ref": "#/definitions/ForbiddenError"
+            }
+          }
+        }
+      }
+    },
+    "/v1/notifications/time-intervals/{name}": {
+      "get": {
+        "tags": [
+          "notifications"
+        ],
+        "summary": "Get a time interval by name.",
+        "operationId": "RouteNotificationsGetTimeInterval",
+        "parameters": [
+          {
+            "type": "string",
+            "description": "Time interval name",
+            "name": "name",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/GetIntervalsByNameResponse"
+          },
+          "403": {
+            "description": "ForbiddenError",
+            "schema": {
+              "$ref": "#/definitions/ForbiddenError"
+            }
+          },
+          "404": {
+            "description": "NotFound",
+            "schema": {
+              "$ref": "#/definitions/NotFound"
+            }
+          }
+        }
+      }
+    },
+    "/v1/provisioning/alert-rules": {
       "get": {
         "tags": [
           "provisioning",
@@ -1969,8 +2224,15 @@
         }
       }
     },
-    "/api/v1/provisioning/alert-rules/export": {
+    "/v1/provisioning/alert-rules/export": {
       "get": {
+        "produces": [
+          "application/json",
+          "application/yaml",
+          "application/terraform+hcl",
+          "text/yaml",
+          "text/hcl"
+        ],
         "tags": [
           "provisioning",
           "stable"
@@ -1986,9 +2248,14 @@
             "in": "query"
           },
           {
+            "enum": [
+              "yaml",
+              "json",
+              "hcl"
+            ],
             "type": "string",
             "default": "yaml",
-            "description": "Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.",
+            "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
             "name": "format",
             "in": "query"
           },
@@ -2027,7 +2294,7 @@
         }
       }
     },
-    "/api/v1/provisioning/alert-rules/{UID}": {
+    "/v1/provisioning/alert-rules/{UID}": {
       "get": {
         "tags": [
           "provisioning",
@@ -2116,6 +2383,11 @@
             "name": "UID",
             "in": "path",
             "required": true
+          },
+          {
+            "type": "string",
+            "name": "X-Disable-Provenance",
+            "in": "header"
           }
         ],
         "responses": {
@@ -2125,12 +2397,14 @@
         }
       }
     },
-    "/api/v1/provisioning/alert-rules/{UID}/export": {
+    "/v1/provisioning/alert-rules/{UID}/export": {
       "get": {
         "produces": [
           "application/json",
           "application/yaml",
-          "text/yaml"
+          "application/terraform+hcl",
+          "text/yaml",
+          "text/hcl"
         ],
         "tags": [
           "provisioning",
@@ -2147,9 +2421,14 @@
             "in": "query"
           },
           {
+            "enum": [
+              "yaml",
+              "json",
+              "hcl"
+            ],
             "type": "string",
             "default": "yaml",
-            "description": "Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.",
+            "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
             "name": "format",
             "in": "query"
           },
@@ -2174,7 +2453,7 @@
         }
       }
     },
-    "/api/v1/provisioning/contact-points": {
+    "/v1/provisioning/contact-points": {
       "get": {
         "tags": [
           "provisioning",
@@ -2216,6 +2495,11 @@
             "schema": {
               "$ref": "#/definitions/EmbeddedContactPoint"
             }
+          },
+          {
+            "type": "string",
+            "name": "X-Disable-Provenance",
+            "in": "header"
           }
         ],
         "responses": {
@@ -2234,8 +2518,15 @@
         }
       }
     },
-    "/api/v1/provisioning/contact-points/export": {
+    "/v1/provisioning/contact-points/export": {
       "get": {
+        "produces": [
+          "application/json",
+          "application/yaml",
+          "application/terraform+hcl",
+          "text/yaml",
+          "text/hcl"
+        ],
         "tags": [
           "provisioning",
           "stable"
@@ -2251,9 +2542,14 @@
             "in": "query"
           },
           {
+            "enum": [
+              "yaml",
+              "json",
+              "hcl"
+            ],
             "type": "string",
             "default": "yaml",
-            "description": "Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.",
+            "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
             "name": "format",
             "in": "query"
           },
@@ -2287,7 +2583,7 @@
         }
       }
     },
-    "/api/v1/provisioning/contact-points/{UID}": {
+    "/v1/provisioning/contact-points/{UID}": {
       "put": {
         "consumes": [
           "application/json"
@@ -2312,6 +2608,11 @@
             "schema": {
               "$ref": "#/definitions/EmbeddedContactPoint"
             }
+          },
+          {
+            "type": "string",
+            "name": "X-Disable-Provenance",
+            "in": "header"
           }
         ],
         "responses": {
@@ -2349,13 +2650,13 @@
           }
         ],
         "responses": {
-          "204": {
+          "202": {
             "description": " The contact point was deleted successfully."
           }
         }
       }
     },
-    "/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}": {
+    "/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}": {
       "get": {
         "tags": [
           "provisioning",
@@ -2397,9 +2698,14 @@
           "provisioning",
           "stable"
         ],
-        "summary": "Update the interval of a rule group.",
+        "summary": "Create or update alert rule group.",
         "operationId": "RoutePutAlertRuleGroup",
         "parameters": [
+          {
+            "type": "string",
+            "name": "X-Disable-Provenance",
+            "in": "header"
+          },
           {
             "type": "string",
             "name": "FolderUID",
@@ -2434,14 +2740,55 @@
             }
           }
         }
+      },
+      "delete": {
+        "description": "Delete rule group",
+        "tags": [
+          "provisioning",
+          "stable"
+        ],
+        "operationId": "RouteDeleteAlertRuleGroup",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "FolderUID",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "name": "Group",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": " The alert rule group was deleted successfully."
+          },
+          "403": {
+            "description": "ForbiddenError",
+            "schema": {
+              "$ref": "#/definitions/ForbiddenError"
+            }
+          },
+          "404": {
+            "description": "NotFound",
+            "schema": {
+              "$ref": "#/definitions/NotFound"
+            }
+          }
+        }
       }
     },
-    "/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}/export": {
+    "/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}/export": {
       "get": {
         "produces": [
           "application/json",
           "application/yaml",
-          "text/yaml"
+          "application/terraform+hcl",
+          "text/yaml",
+          "text/hcl"
         ],
         "tags": [
           "provisioning",
@@ -2458,9 +2805,14 @@
             "in": "query"
           },
           {
+            "enum": [
+              "yaml",
+              "json",
+              "hcl"
+            ],
             "type": "string",
             "default": "yaml",
-            "description": "Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.",
+            "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
             "name": "format",
             "in": "query"
           },
@@ -2490,7 +2842,7 @@
         }
       }
     },
-    "/api/v1/provisioning/mute-timings": {
+    "/v1/provisioning/mute-timings": {
       "get": {
         "tags": [
           "provisioning",
@@ -2524,6 +2876,11 @@
             "schema": {
               "$ref": "#/definitions/MuteTimeInterval"
             }
+          },
+          {
+            "type": "string",
+            "name": "X-Disable-Provenance",
+            "in": "header"
           }
         ],
         "responses": {
@@ -2542,7 +2899,59 @@
         }
       }
     },
-    "/api/v1/provisioning/mute-timings/{name}": {
+    "/v1/provisioning/mute-timings/export": {
+      "get": {
+        "produces": [
+          "application/json",
+          "application/yaml",
+          "application/terraform+hcl",
+          "text/yaml",
+          "text/hcl"
+        ],
+        "tags": [
+          "provisioning",
+          "stable"
+        ],
+        "summary": "Export all mute timings in provisioning format.",
+        "operationId": "RouteExportMuteTimings",
+        "parameters": [
+          {
+            "type": "boolean",
+            "default": false,
+            "description": "Whether to initiate a download of the file or not.",
+            "name": "download",
+            "in": "query"
+          },
+          {
+            "enum": [
+              "yaml",
+              "json",
+              "hcl"
+            ],
+            "type": "string",
+            "default": "yaml",
+            "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+            "name": "format",
+            "in": "query"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "AlertingFileExport",
+            "schema": {
+              "$ref": "#/definitions/AlertingFileExport"
+            }
+          },
+          "403": {
+            "description": "PermissionDenied",
+            "schema": {
+              "$ref": "#/definitions/PermissionDenied"
+            }
+          }
+        }
+      }
+    },
+    "/v1/provisioning/mute-timings/{name}": {
       "get": {
         "tags": [
           "provisioning",
@@ -2595,10 +3004,15 @@
             "schema": {
               "$ref": "#/definitions/MuteTimeInterval"
             }
+          },
+          {
+            "type": "string",
+            "name": "X-Disable-Provenance",
+            "in": "header"
           }
         ],
         "responses": {
-          "200": {
+          "202": {
             "description": "MuteTimeInterval",
             "schema": {
               "$ref": "#/definitions/MuteTimeInterval"
@@ -2631,11 +3045,76 @@
         "responses": {
           "204": {
             "description": " The mute timing was deleted successfully."
+          },
+          "409": {
+            "description": "GenericPublicError",
+            "schema": {
+              "$ref": "#/definitions/GenericPublicError"
+            }
+          }
+        }
+      }
+    },
+    "/v1/provisioning/mute-timings/{name}/export": {
+      "get": {
+        "produces": [
+          "application/json",
+          "application/yaml",
+          "application/terraform+hcl",
+          "text/yaml",
+          "text/hcl"
+        ],
+        "tags": [
+          "provisioning",
+          "stable"
+        ],
+        "summary": "Export a mute timing in provisioning format.",
+        "operationId": "RouteExportMuteTiming",
+        "parameters": [
+          {
+            "type": "boolean",
+            "default": false,
+            "description": "Whether to initiate a download of the file or not.",
+            "name": "download",
+            "in": "query"
+          },
+          {
+            "enum": [
+              "yaml",
+              "json",
+              "hcl"
+            ],
+            "type": "string",
+            "default": "yaml",
+            "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+            "name": "format",
+            "in": "query"
+          },
+          {
+            "type": "string",
+            "description": "Mute timing name",
+            "name": "name",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "AlertingFileExport",
+            "schema": {
+              "$ref": "#/definitions/AlertingFileExport"
+            }
+          },
+          "403": {
+            "description": "PermissionDenied",
+            "schema": {
+              "$ref": "#/definitions/PermissionDenied"
+            }
           }
         }
       }
     },
-    "/api/v1/provisioning/policies": {
+    "/v1/provisioning/policies": {
       "get": {
         "tags": [
           "provisioning",
@@ -2670,6 +3149,11 @@
             "schema": {
               "$ref": "#/definitions/Route"
             }
+          },
+          {
+            "type": "string",
+            "name": "X-Disable-Provenance",
+            "in": "header"
           }
         ],
         "responses": {
@@ -2707,8 +3191,15 @@
         }
       }
     },
-    "/api/v1/provisioning/policies/export": {
+    "/v1/provisioning/policies/export": {
       "get": {
+        "produces": [
+          "application/json",
+          "application/yaml",
+          "application/terraform+hcl",
+          "text/yaml",
+          "text/hcl"
+        ],
         "tags": [
           "provisioning",
           "stable"
@@ -2731,7 +3222,7 @@
         }
       }
     },
-    "/api/v1/provisioning/templates": {
+    "/v1/provisioning/templates": {
       "get": {
         "tags": [
           "provisioning",
@@ -2752,7 +3243,7 @@
         }
       }
     },
-    "/api/v1/provisioning/templates/{name}": {
+    "/v1/provisioning/templates/{name}": {
       "get": {
         "tags": [
           "provisioning",
@@ -2805,6 +3296,11 @@
             "schema": {
               "$ref": "#/definitions/NotificationTemplateContent"
             }
+          },
+          {
+            "type": "string",
+            "name": "X-Disable-Provenance",
+            "in": "header"
           }
         ],
         "responses": {
@@ -2845,7 +3341,7 @@
         }
       }
     },
-    "/api/v1/rule/backtest": {
+    "/v1/rule/backtest": {
       "post": {
         "description": "Test rule",
         "consumes": [
@@ -2877,7 +3373,7 @@
         }
       }
     },
-    "/api/v1/rule/test/grafana": {
+    "/v1/rule/test/grafana": {
       "post": {
         "description": "Test a rule against Grafana ruler",
         "consumes": [
@@ -2918,7 +3414,7 @@
         }
       }
     },
-    "/api/v1/rule/test/{DatasourceUID}": {
+    "/v1/rule/test/{DatasourceUID}": {
       "post": {
         "description": "Test a rule against external data source ruler",
         "consumes": [
@@ -2963,7 +3459,7 @@
         }
       }
     },
-    "/api/v1/rules/history": {
+    "/v1/rules/history": {
       "get": {
         "produces": [
           "application/json"
@@ -3191,6 +3687,9 @@
             "OK"
           ]
         },
+        "notification_settings": {
+          "$ref": "#/definitions/AlertRuleNotificationSettingsExport"
+        },
         "panelId": {
           "type": "integer",
           "format": "int64"
@@ -3258,6 +3757,90 @@
         }
       }
     },
+    "AlertRuleNotificationSettings": {
+      "type": "object",
+      "required": [
+        "receiver"
+      ],
+      "properties": {
+        "group_by": {
+          "description": "Override the labels by which incoming alerts are grouped together. For example, multiple alerts coming in for\ncluster=A and alertname=LatencyHigh would be batched into a single group. To aggregate by all possible labels\nuse the special value '...' as the sole label name.\nThis effectively disables aggregation entirely, passing through all alerts as-is. This is unlikely to be what\nyou want, unless you have a very low alert volume or your upstream notification system performs its own grouping.\nMust include 'alertname' and 'grafana_folder' if not using '...'.",
+          "type": "array",
+          "default": [
+            "alertname",
+            "grafana_folder"
+          ],
+          "items": {
+            "type": "string"
+          },
+          "example": [
+            "alertname",
+            "grafana_folder",
+            "cluster"
+          ]
+        },
+        "group_interval": {
+          "description": "Override how long to wait before sending a notification about new alerts that are added to a group of alerts for\nwhich an initial notification has already been sent. (Usually ~5m or more.)",
+          "type": "string",
+          "example": "5m"
+        },
+        "group_wait": {
+          "description": "Override how long to initially wait to send a notification for a group of alerts. Allows to wait for an\ninhibiting alert to arrive or collect more initial alerts for the same group. (Usually ~0s to few minutes.)",
+          "type": "string",
+          "example": "30s"
+        },
+        "mute_time_intervals": {
+          "description": "Override the times when notifications should be muted. These must match the name of a mute time interval defined\nin the alertmanager configuration mute_time_intervals section. When muted it will not send any notifications, but\notherwise acts normally.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "example": [
+            "maintenance"
+          ]
+        },
+        "receiver": {
+          "description": "Name of the receiver to send notifications to.",
+          "type": "string",
+          "example": "grafana-default-email"
+        },
+        "repeat_interval": {
+          "description": "Override how long to wait before sending a notification again if it has already been sent successfully for an\nalert. (Usually ~3h or more).\nNote that this parameter is implicitly bound by Alertmanager's `--data.retention` configuration flag.\nNotifications will be resent after either repeat_interval or the data retention period have passed, whichever\noccurs first. `repeat_interval` should not be less than `group_interval`.",
+          "type": "string",
+          "example": "4h"
+        }
+      }
+    },
+    "AlertRuleNotificationSettingsExport": {
+      "type": "object",
+      "title": "AlertRuleNotificationSettingsExport is the provisioned export of models.NotificationSettings.",
+      "properties": {
+        "group_by": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "group_interval": {
+          "type": "string"
+        },
+        "group_wait": {
+          "type": "string"
+        },
+        "mute_time_intervals": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "receiver": {
+          "type": "string"
+        },
+        "repeat_interval": {
+          "type": "string"
+        }
+      }
+    },
     "AlertingFileExport": {
       "type": "object",
       "title": "AlertingFileExport is the full provisioned file export.",
@@ -3278,6 +3861,12 @@
             "$ref": "#/definitions/AlertRuleGroupExport"
           }
         },
+        "muteTimes": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/MuteTimeIntervalExport"
+          }
+        },
         "policies": {
           "type": "array",
           "items": {
@@ -3492,6 +4081,9 @@
         },
         "username": {
           "type": "string"
+        },
+        "username_file": {
+          "type": "string"
         }
       }
     },
@@ -3514,6 +4106,7 @@
           }
         },
         "mute_time_intervals": {
+          "description": "MuteTimeIntervals is deprecated and will be removed before Alertmanager 1.0.",
           "type": "array",
           "items": {
             "$ref": "#/definitions/MuteTimeInterval"
@@ -3527,6 +4120,12 @@
           "items": {
             "type": "string"
           }
+        },
+        "time_intervals": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TimeInterval"
+          }
         }
       }
     },
@@ -3588,6 +4187,9 @@
           "description": "Error is a property to be set if the corresponding DataQuery has an error.",
           "type": "string"
         },
+        "ErrorSource": {
+          "$ref": "#/definitions/ErrorSource"
+        },
         "Frames": {
           "$ref": "#/definitions/Frames"
         },
@@ -3619,6 +4221,9 @@
         },
         "webhook_url": {
           "$ref": "#/definitions/SecretURL"
+        },
+        "webhook_url_file": {
+          "type": "string"
         }
       }
     },
@@ -3792,6 +4397,10 @@
         }
       }
     },
+    "ErrorSource": {
+      "description": "ErrorSource type defines the source of the error",
+      "type": "string"
+    },
     "ErrorType": {
       "type": "string",
       "title": "ErrorType models the different API error types."
@@ -3818,6 +4427,9 @@
     "EvalQueriesPayload": {
       "type": "object",
       "properties": {
+        "condition": {
+          "type": "string"
+        },
         "data": {
           "type": "array",
           "items": {
@@ -4026,6 +4638,14 @@
         }
       }
     },
+    "ForbiddenError": {
+      "type": "object",
+      "properties": {
+        "body": {
+          "$ref": "#/definitions/PublicError"
+        }
+      }
+    },
     "Frame": {
       "description": "Each Field is well typed by its FieldType and supports optional Labels.\n\nA Frame is a general data container for Grafana. A Frame can be table data\nor time series data depending on its content and field types.",
       "type": "object",
@@ -4111,11 +4731,20 @@
         },
         "typeVersion": {
           "$ref": "#/definitions/FrameTypeVersion"
+        },
+        "uniqueRowIdFields": {
+          "description": "Array of field indices which values create a unique id for each row. Ideally this should be globally unique ID\nbut that isn't guarantied. Should help with keeping track and deduplicating rows in visualizations, especially\nwith streaming data with frequent updates.",
+          "type": "array",
+          "items": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "example": "TraceID in Tempo, table name + primary key in SQL"
         }
       }
     },
     "FrameType": {
-      "description": "A FrameType string, when present in a frame's metadata, asserts that the\nframe's structure conforms to the FrameType's specification.\nThis property is currently optional, so FrameType may be FrameTypeUnknown even if the properties of\nthe Frame correspond to a defined FrameType.",
+      "description": "A FrameType string, when present in a frame's metadata, asserts that the\nframe's structure conforms to the FrameType's specification.\nThis property is currently optional, so FrameType may be FrameTypeUnknown even if the properties of\nthe Frame correspond to a defined FrameType.\n+enum",
       "type": "string"
     },
     "FrameTypeVersion": {
@@ -4134,6 +4763,14 @@
         "$ref": "#/definitions/Frame"
       }
     },
+    "GenericPublicError": {
+      "type": "object",
+      "properties": {
+        "body": {
+          "$ref": "#/definitions/PublicError"
+        }
+      }
+    },
     "GettableAlertmanagers": {
       "type": "object",
       "properties": {
@@ -4164,6 +4801,7 @@
           }
         },
         "mute_time_intervals": {
+          "description": "MuteTimeIntervals is deprecated and will be removed before Alertmanager 1.0.",
           "type": "array",
           "items": {
             "$ref": "#/definitions/MuteTimeInterval"
@@ -4184,6 +4822,12 @@
           "items": {
             "type": "string"
           }
+        },
+        "time_intervals": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TimeInterval"
+          }
         }
       }
     },
@@ -4386,10 +5030,6 @@
         "is_paused": {
           "type": "boolean"
         },
-        "namespace_id": {
-          "type": "integer",
-          "format": "int64"
-        },
         "namespace_uid": {
           "type": "string"
         },
@@ -4401,6 +5041,9 @@
             "OK"
           ]
         },
+        "notification_settings": {
+          "$ref": "#/definitions/AlertRuleNotificationSettings"
+        },
         "orgId": {
           "type": "integer",
           "format": "int64"
@@ -4516,6 +5159,23 @@
         }
       }
     },
+    "GettableTimeIntervals": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "provenance": {
+          "$ref": "#/definitions/Provenance"
+        },
+        "time_intervals": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TimeIntervalItem"
+          }
+        }
+      }
+    },
     "GettableUserConfig": {
       "type": "object",
       "properties": {
@@ -4817,6 +5477,9 @@
         "send_resolved": {
           "type": "boolean"
         },
+        "summary": {
+          "type": "string"
+        },
         "text": {
           "type": "string"
         },
@@ -4825,6 +5488,9 @@
         },
         "webhook_url": {
           "$ref": "#/definitions/SecretURL"
+        },
+        "webhook_url_file": {
+          "type": "string"
         }
       }
     },
@@ -4832,7 +5498,7 @@
       "type": "object",
       "title": "MatchRegexps represents a map of Regexp.",
       "additionalProperties": {
-        "$ref": "#/definitions/Regexp"
+        "type": "string"
       }
     },
     "MatchType": {
@@ -4881,6 +5547,24 @@
         }
       }
     },
+    "MuteTimeIntervalExport": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "orgId": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "time_intervals": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TimeInterval"
+          }
+        }
+      }
+    },
     "MuteTimings": {
       "type": "array",
       "items": {
@@ -4928,12 +5612,58 @@
       "type": "object",
       "title": "NotificationPolicyExport is the provisioned file export of alerting.NotificiationPolicyV1.",
       "properties": {
-        "Policy": {
-          "$ref": "#/definitions/RouteExport"
+        "continue": {
+          "type": "boolean"
+        },
+        "group_by": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "group_interval": {
+          "type": "string"
+        },
+        "group_wait": {
+          "type": "string"
+        },
+        "match": {
+          "description": "Deprecated. Remove before v1.0 release.",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
+        "match_re": {
+          "$ref": "#/definitions/MatchRegexps"
+        },
+        "matchers": {
+          "$ref": "#/definitions/Matchers"
+        },
+        "mute_time_intervals": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "object_matchers": {
+          "$ref": "#/definitions/ObjectMatchers"
         },
         "orgId": {
           "type": "integer",
           "format": "int64"
+        },
+        "receiver": {
+          "type": "string"
+        },
+        "repeat_interval": {
+          "type": "string"
+        },
+        "routes": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/RouteExport"
+          }
         }
       }
     },
@@ -5021,9 +5751,18 @@
         }
       }
     },
+    "ObjectMatcher": {
+      "type": "array",
+      "title": "ObjectMatcher is a matcher that can be used to filter alerts.",
+      "items": {
+        "type": "string"
+      }
+    },
     "ObjectMatchers": {
-      "description": "ObjectMatchers is Matchers with a different Unmarshal and Marshal methods that accept matchers as objects\nthat have already been parsed.",
-      "$ref": "#/definitions/Matchers"
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/ObjectMatcher"
+      }
     },
     "OpsGenieConfig": {
       "type": "object",
@@ -5203,25 +5942,8 @@
     "PermissionDenied": {
       "type": "object"
     },
-    "Point": {
-      "description": "If H is not nil, then this is a histogram point and only (T, H) is valid.\nIf H is nil, then only (T, V) is valid.",
-      "type": "object",
-      "title": "Point represents a single data point for a given timestamp.",
-      "properties": {
-        "H": {
-          "$ref": "#/definitions/FloatHistogram"
-        },
-        "T": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "V": {
-          "type": "number",
-          "format": "double"
-        }
-      }
-    },
     "PostableApiAlertingConfig": {
+      "description": "nolint:revive",
       "type": "object",
       "properties": {
         "global": {
@@ -5234,6 +5956,7 @@
           }
         },
         "mute_time_intervals": {
+          "description": "MuteTimeIntervals is deprecated and will be removed before Alertmanager 1.0.",
           "type": "array",
           "items": {
             "$ref": "#/definitions/MuteTimeInterval"
@@ -5254,10 +5977,17 @@
           "items": {
             "type": "string"
           }
+        },
+        "time_intervals": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TimeInterval"
+          }
         }
       }
     },
     "PostableApiReceiver": {
+      "description": "nolint:revive",
       "type": "object",
       "properties": {
         "discord_configs": {
@@ -5476,6 +6206,9 @@
             "OK"
           ]
         },
+        "notification_settings": {
+          "$ref": "#/definitions/AlertRuleNotificationSettings"
+        },
         "title": {
           "type": "string"
         },
@@ -5514,6 +6247,20 @@
         }
       }
     },
+    "PostableTimeIntervals": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "time_intervals": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TimeIntervalItem"
+          }
+        }
+      }
+    },
     "PostableUserConfig": {
       "type": "object",
       "properties": {
@@ -5649,6 +6396,9 @@
             "OK"
           ]
         },
+        "notification_settings": {
+          "$ref": "#/definitions/AlertRuleNotificationSettings"
+        },
         "orgID": {
           "type": "integer",
           "format": "int64"
@@ -5706,6 +6456,26 @@
         }
       }
     },
+    "PublicError": {
+      "description": "PublicError is derived from Error and only contains information\navailable to the end user.",
+      "type": "object",
+      "properties": {
+        "extra": {
+          "type": "object",
+          "additionalProperties": {}
+        },
+        "message": {
+          "type": "string"
+        },
+        "messageId": {
+          "type": "string"
+        },
+        "statusCode": {
+          "type": "integer",
+          "format": "int64"
+        }
+      }
+    },
     "PushoverConfig": {
       "type": "object",
       "properties": {
@@ -5955,11 +6725,6 @@
         }
       }
     },
-    "Regexp": {
-      "description": "A Regexp is safe for concurrent use by multiple goroutines,\nexcept for configuration methods, such as Longest.",
-      "type": "object",
-      "title": "Regexp is the representation of a compiled regular expression."
-    },
     "RelativeTimeRange": {
       "description": "RelativeTimeRange is the per query start and end time\nfor requests.",
       "type": "object",
@@ -6302,9 +7067,13 @@
       }
     },
     "Sample": {
+      "description": "Sample is a single sample belonging to a metric. It represents either a float\nsample or a histogram sample. If H is nil, it is a float sample. Otherwise,\nit is a histogram sample.",
       "type": "object",
-      "title": "Sample is a single sample belonging to a metric.",
       "properties": {
+        "F": {
+          "type": "number",
+          "format": "double"
+        },
         "H": {
           "$ref": "#/definitions/FloatHistogram"
         },
@@ -6314,10 +7083,6 @@
         "T": {
           "type": "integer",
           "format": "int64"
-        },
-        "V": {
-          "type": "number",
-          "format": "double"
         }
       }
     },
@@ -6811,7 +7576,21 @@
       "type": "string"
     },
     "TimeInterval": {
-      "description": "TimeInterval describes intervals of time. ContainsTime will tell you if a golang time is contained\nwithin the interval.",
+      "type": "object",
+      "title": "TimeInterval represents a named set of time intervals for which a route should be muted.",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "time_intervals": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TimeInterval"
+          }
+        }
+      }
+    },
+    "TimeIntervalItem": {
       "type": "object",
       "properties": {
         "days_of_month": {
@@ -6832,7 +7611,7 @@
         "times": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/TimeRange"
+            "$ref": "#/definitions/TimeIntervalTimeRange"
           }
         },
         "weekdays": {
@@ -6849,6 +7628,17 @@
         }
       }
     },
+    "TimeIntervalTimeRange": {
+      "type": "object",
+      "properties": {
+        "end_time": {
+          "type": "string"
+        },
+        "start_time": {
+          "type": "string"
+        }
+      }
+    },
     "TimeRange": {
       "description": "Redefining this to avoid an import cycle",
       "type": "object",
@@ -6952,7 +7742,7 @@
       }
     },
     "Vector": {
-      "description": "Vector is basically only an alias for model.Samples, but the\ncontract is that in a Vector, all Samples have the same timestamp.",
+      "description": "Vector is basically only an alias for []Sample, but the contract is that\nin a Vector, all Samples have the same timestamp.",
       "type": "array",
       "items": {
         "$ref": "#/definitions/Sample"
@@ -7105,6 +7895,7 @@
       }
     },
     "alertGroup": {
+      "description": "AlertGroup alert group",
       "type": "object",
       "required": [
         "alerts",
@@ -7129,7 +7920,6 @@
       "$ref": "#/definitions/alertGroup"
     },
     "alertGroups": {
-      "description": "AlertGroups alert groups",
       "type": "array",
       "items": {
         "$ref": "#/definitions/alertGroup"
@@ -7235,7 +8025,6 @@
       }
     },
     "gettableAlert": {
-      "description": "GettableAlert gettable alert",
       "type": "object",
       "required": [
         "labels",
@@ -7292,7 +8081,6 @@
       "$ref": "#/definitions/gettableAlert"
     },
     "gettableAlerts": {
-      "description": "GettableAlerts gettable alerts",
       "type": "array",
       "items": {
         "$ref": "#/definitions/gettableAlert"
@@ -7350,6 +8138,7 @@
       "$ref": "#/definitions/gettableSilence"
     },
     "gettableSilences": {
+      "description": "GettableSilences gettable silences",
       "type": "array",
       "items": {
         "$ref": "#/definitions/gettableSilence"
@@ -7656,6 +8445,36 @@
     }
   },
   "responses": {
+    "GetAllIntervalsResponse": {
+      "description": "",
+      "schema": {
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/GettableTimeIntervals"
+        }
+      }
+    },
+    "GetIntervalsByNameResponse": {
+      "description": "",
+      "schema": {
+        "$ref": "#/definitions/GettableTimeIntervals"
+      }
+    },
+    "GetReceiverResponse": {
+      "description": "",
+      "schema": {
+        "$ref": "#/definitions/GettableApiReceiver"
+      }
+    },
+    "GetReceiversResponse": {
+      "description": "",
+      "schema": {
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/GettableApiReceiver"
+        }
+      }
+    },
     "GettableHistoricUserConfigs": {
       "description": "",
       "schema": {
diff --git a/pkg/services/ngalert/api/tooling/swagger-codegen/templates/controller-api.mustache b/pkg/services/ngalert/api/tooling/swagger-codegen/templates/controller-api.mustache
index b19a78ac650af..f9902d265c7b6 100644
--- a/pkg/services/ngalert/api/tooling/swagger-codegen/templates/controller-api.mustache
+++ b/pkg/services/ngalert/api/tooling/swagger-codegen/templates/controller-api.mustache
@@ -36,13 +36,13 @@ func (f *{{classname}}Handler) {{nickname}}(ctx *contextmodel.ReqContext) respon
 func (api *API) Register{{classname}}Endpoints(srv {{classname}}, m *metrics.API) {
 	api.RouteRegister.Group("", func(group routing.RouteRegister){ {{#operations}}{{#operation}}
 	group.{{httpMethod}}(
-		toMacaronPath("{{{path}}}"),
+		toMacaronPath("/api{{{path}}}"),
 		requestmeta.SetOwner(requestmeta.TeamAlerting),
 		requestmeta.SetSLOGroup(requestmeta.SLOGroupHighSlow),
-		api.authorize(http.Method{{httpMethod}}, "{{{path}}}"),
+		api.authorize(http.Method{{httpMethod}}, "/api{{{path}}}"),
 		metrics.Instrument(
 			http.Method{{httpMethod}},
-			"{{{path}}}",
+			"/api{{{path}}}",
 			api.Hooks.Wrap(srv.{{nickname}}),
 			m,
 		),
diff --git a/pkg/services/ngalert/backtesting/engine.go b/pkg/services/ngalert/backtesting/engine.go
index 7752f8fac9ca0..30d4c8135b9d6 100644
--- a/pkg/services/ngalert/backtesting/engine.go
+++ b/pkg/services/ngalert/backtesting/engine.go
@@ -9,14 +9,16 @@ import (
 	"time"
 
 	"github.com/benbjohnson/clock"
+
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/ngalert/eval"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/schedule"
 	"github.com/grafana/grafana/pkg/services/ngalert/state"
-	"github.com/grafana/grafana/pkg/services/user"
 )
 
 var (
@@ -34,6 +36,7 @@ type backtestingEvaluator interface {
 
 type stateManager interface {
 	ProcessEvalResults(ctx context.Context, evaluatedAt time.Time, alertRule *models.AlertRule, results eval.Results, extraLabels data.Labels) []state.StateTransition
+	schedule.RuleStateProvider
 }
 
 type Engine struct {
@@ -46,22 +49,21 @@ func NewEngine(appUrl *url.URL, evalFactory eval.EvaluatorFactory, tracer tracin
 		evalFactory: evalFactory,
 		createStateManager: func() stateManager {
 			cfg := state.ManagerCfg{
-				Metrics:                 nil,
-				ExternalURL:             appUrl,
-				InstanceStore:           nil,
-				Images:                  &NoopImageService{},
-				Clock:                   clock.New(),
-				Historian:               nil,
-				MaxStateSaveConcurrency: 1,
-				Tracer:                  tracer,
-				Log:                     log.New("ngalert.state.manager"),
+				Metrics:       nil,
+				ExternalURL:   appUrl,
+				InstanceStore: nil,
+				Images:        &NoopImageService{},
+				Clock:         clock.New(),
+				Historian:     nil,
+				Tracer:        tracer,
+				Log:           log.New("ngalert.state.manager"),
 			}
-			return state.NewManager(cfg)
+			return state.NewManager(cfg, state.NewNoopPersister())
 		},
 	}
 }
 
-func (e *Engine) Test(ctx context.Context, user *user.SignedInUser, rule *models.AlertRule, from, to time.Time) (*data.Frame, error) {
+func (e *Engine) Test(ctx context.Context, user identity.Requester, rule *models.AlertRule, from, to time.Time) (*data.Frame, error) {
 	ruleCtx := models.WithRuleKey(ctx, rule.GetKey())
 	logger := logger.FromContext(ctx)
 
@@ -73,13 +75,16 @@ func (e *Engine) Test(ctx context.Context, user *user.SignedInUser, rule *models
 	}
 	length := int(to.Sub(from).Seconds()) / int(rule.IntervalSeconds)
 
-	evaluator, err := backtestingEvaluatorFactory(ruleCtx, e.evalFactory, user, rule.GetEvalCondition())
+	stateManager := e.createStateManager()
+
+	evaluator, err := backtestingEvaluatorFactory(ruleCtx, e.evalFactory, user, rule.GetEvalCondition(), &schedule.AlertingResultsFromRuleState{
+		Manager: stateManager,
+		Rule:    rule,
+	})
 	if err != nil {
 		return nil, errors.Join(ErrInvalidInputData, err)
 	}
 
-	stateManager := e.createStateManager()
-
 	logger.Info("Start testing alert rule", "from", from, "to", to, "interval", rule.IntervalSeconds, "evaluations", length)
 
 	start := time.Now()
@@ -125,7 +130,7 @@ func (e *Engine) Test(ctx context.Context, user *user.SignedInUser, rule *models
 	return result, nil
 }
 
-func newBacktestingEvaluator(ctx context.Context, evalFactory eval.EvaluatorFactory, user *user.SignedInUser, condition models.Condition) (backtestingEvaluator, error) {
+func newBacktestingEvaluator(ctx context.Context, evalFactory eval.EvaluatorFactory, user identity.Requester, condition models.Condition, reader eval.AlertingResultsReader) (backtestingEvaluator, error) {
 	for _, q := range condition.Data {
 		if q.DatasourceUID == "__data__" || q.QueryType == "__data__" {
 			if len(condition.Data) != 1 {
@@ -151,9 +156,7 @@ func newBacktestingEvaluator(ctx context.Context, evalFactory eval.EvaluatorFact
 		}
 	}
 
-	evaluator, err := evalFactory.Create(eval.EvaluationContext{Ctx: ctx,
-		User: user,
-	}, condition)
+	evaluator, err := evalFactory.Create(eval.NewContextWithPreviousResults(ctx, user, reader), condition)
 
 	if err != nil {
 		return nil, err
diff --git a/pkg/services/ngalert/backtesting/engine_test.go b/pkg/services/ngalert/backtesting/engine_test.go
index e11ab3a033f12..f8d058f141026 100644
--- a/pkg/services/ngalert/backtesting/engine_test.go
+++ b/pkg/services/ngalert/backtesting/engine_test.go
@@ -9,14 +9,15 @@ import (
 	"testing"
 	"time"
 
-	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/ngalert/eval"
 	"github.com/grafana/grafana/pkg/services/ngalert/eval/eval_mocks"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/state"
-	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/util"
 )
 
@@ -144,7 +145,7 @@ func TestNewBacktestingEvaluator(t *testing.T) {
 
 		for _, testCase := range testCases {
 			t.Run(testCase.name, func(t *testing.T) {
-				e, err := newBacktestingEvaluator(context.Background(), evalFactory, nil, testCase.condition)
+				e, err := newBacktestingEvaluator(context.Background(), evalFactory, nil, testCase.condition, nil)
 				if testCase.error {
 					require.Error(t, err)
 					return
@@ -174,7 +175,7 @@ func TestEvaluatorTest(t *testing.T) {
 	}
 	manager := &fakeStateManager{}
 
-	backtestingEvaluatorFactory = func(ctx context.Context, evalFactory eval.EvaluatorFactory, user *user.SignedInUser, condition models.Condition) (backtestingEvaluator, error) {
+	backtestingEvaluatorFactory = func(ctx context.Context, evalFactory eval.EvaluatorFactory, user identity.Requester, condition models.Condition, r eval.AlertingResultsReader) (backtestingEvaluator, error) {
 		return evaluator, nil
 	}
 
@@ -385,6 +386,10 @@ func (f *fakeStateManager) ProcessEvalResults(_ context.Context, evaluatedAt tim
 	return f.stateCallback(evaluatedAt)
 }
 
+func (f *fakeStateManager) GetStatesForRuleUID(orgID int64, alertRuleUID string) []*state.State {
+	return nil
+}
+
 type fakeBacktestingEvaluator struct {
 	evalCallback func(now time.Time) (eval.Results, error)
 }
diff --git a/pkg/services/ngalert/backtesting/eval_data.go b/pkg/services/ngalert/backtesting/eval_data.go
index cd0fecdccff2d..999c0bc6302f6 100644
--- a/pkg/services/ngalert/backtesting/eval_data.go
+++ b/pkg/services/ngalert/backtesting/eval_data.go
@@ -16,8 +16,8 @@ import (
 type dataEvaluator struct {
 	refID              string
 	data               []mathexp.Series
-	downsampleFunction string
-	upsampleFunction   string
+	downsampleFunction mathexp.ReducerID
+	upsampleFunction   mathexp.Upsampler
 }
 
 func newDataEvaluator(refID string, frame *data.Frame) (*dataEvaluator, error) {
@@ -32,8 +32,8 @@ func newDataEvaluator(refID string, frame *data.Frame) (*dataEvaluator, error) {
 	return &dataEvaluator{
 		refID:              refID,
 		data:               series,
-		downsampleFunction: "last",
-		upsampleFunction:   "pad",
+		downsampleFunction: mathexp.ReducerLast,
+		upsampleFunction:   mathexp.UpsamplerPad,
 	}, nil
 }
 
diff --git a/pkg/services/ngalert/client/client.go b/pkg/services/ngalert/client/client.go
new file mode 100644
index 0000000000000..90b080c0bc695
--- /dev/null
+++ b/pkg/services/ngalert/client/client.go
@@ -0,0 +1,72 @@
+package client
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"strconv"
+
+	"github.com/grafana/dskit/instrument"
+)
+
+// Requester executes an HTTP request.
+type Requester interface {
+	Do(req *http.Request) (*http.Response, error)
+}
+
+// TimedClient instruments a request. It implements Requester.
+type TimedClient struct {
+	client    Requester
+	collector instrument.Collector
+}
+
+type contextKey int
+
+// OperationNameContextKey specifies the operation name location within the context
+// for instrumentation.
+const OperationNameContextKey contextKey = 0
+
+// NewTimedClient creates a Requester that instruments requests on `client`.
+func NewTimedClient(client Requester, collector instrument.Collector) *TimedClient {
+	return &TimedClient{
+		client:    client,
+		collector: collector,
+	}
+}
+
+// Do executes the request.
+func (c TimedClient) Do(r *http.Request) (*http.Response, error) {
+	return TimeRequest(r.Context(), c.operationName(r), c.collector, c.client, r)
+}
+
+// RoundTrip implements the RoundTripper interface.
+func (c TimedClient) RoundTrip(r *http.Request) (*http.Response, error) {
+	return c.Do(r)
+}
+
+func (c TimedClient) operationName(r *http.Request) string {
+	operation, _ := r.Context().Value(OperationNameContextKey).(string)
+	if operation == "" {
+		operation = r.URL.Path
+	}
+	return operation
+}
+
+// TimeRequest performs an HTTP client request and records the duration in a histogram.
+func TimeRequest(ctx context.Context, operation string, coll instrument.Collector, client Requester, request *http.Request) (*http.Response, error) {
+	var response *http.Response
+	doRequest := func(_ context.Context) error {
+		var err error
+		response, err = client.Do(request) // nolint:bodyclose
+		return err
+	}
+	toStatusCode := func(err error) string {
+		if err == nil {
+			return strconv.Itoa(response.StatusCode)
+		}
+		return "error"
+	}
+	err := instrument.CollectedRequest(ctx, fmt.Sprintf("%s %s", request.Method, operation),
+		coll, toStatusCode, doRequest)
+	return response, err
+}
diff --git a/pkg/services/ngalert/client/client_test.go b/pkg/services/ngalert/client/client_test.go
new file mode 100644
index 0000000000000..25d26576e662e
--- /dev/null
+++ b/pkg/services/ngalert/client/client_test.go
@@ -0,0 +1,29 @@
+package client
+
+import (
+	"context"
+	"net/http"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestTimedClient_operationName(t *testing.T) {
+	r, err := http.NewRequest("GET", "https://weave.test", nil)
+	assert.NoError(t, err)
+
+	r = r.WithContext(context.WithValue(context.Background(), OperationNameContextKey, "opp"))
+	c := NewTimedClient(http.DefaultClient, nil)
+
+	assert.Equal(t, "opp", c.operationName(r))
+}
+
+func TestTimedClient_operationName_Default(t *testing.T) {
+	r, err := http.NewRequest("GET", "https://weave.test/you/know/me", nil)
+	assert.NoError(t, err)
+
+	r = r.WithContext(context.Background())
+	c := NewTimedClient(http.DefaultClient, nil)
+
+	assert.Equal(t, "/you/know/me", c.operationName(r))
+}
diff --git a/pkg/services/ngalert/eval/context.go b/pkg/services/ngalert/eval/context.go
index 3cdaefceb229f..ffff56c4a5413 100644
--- a/pkg/services/ngalert/eval/context.go
+++ b/pkg/services/ngalert/eval/context.go
@@ -3,18 +3,35 @@ package eval
 import (
 	"context"
 
-	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 )
 
+// AlertingResultsReader provides fingerprints of results that are in alerting state.
+// It is used during the evaluation of queries.
+type AlertingResultsReader interface {
+	Read() map[data.Fingerprint]struct{}
+}
+
 // EvaluationContext represents the context in which a condition is evaluated.
 type EvaluationContext struct {
-	Ctx  context.Context
-	User *user.SignedInUser
+	Ctx                   context.Context
+	User                  identity.Requester
+	AlertingResultsReader AlertingResultsReader
 }
 
-func NewContext(ctx context.Context, user *user.SignedInUser) EvaluationContext {
+func NewContext(ctx context.Context, user identity.Requester) EvaluationContext {
 	return EvaluationContext{
 		Ctx:  ctx,
 		User: user,
 	}
 }
+
+func NewContextWithPreviousResults(ctx context.Context, user identity.Requester, reader AlertingResultsReader) EvaluationContext {
+	return EvaluationContext{
+		Ctx:                   ctx,
+		User:                  user,
+		AlertingResultsReader: reader,
+	}
+}
diff --git a/pkg/services/ngalert/eval/eval.go b/pkg/services/ngalert/eval/eval.go
index 5e554c704347b..4a45ad2f51378 100644
--- a/pkg/services/ngalert/eval/eval.go
+++ b/pkg/services/ngalert/eval/eval.go
@@ -73,6 +73,7 @@ func (r *conditionEvaluator) EvaluateRaw(ctx context.Context, now time.Time) (re
 		defer cancel()
 		execCtx = timeoutCtx
 	}
+	logger.FromContext(ctx).Debug("Executing pipeline", "commands", strings.Join(r.pipeline.GetCommandTypes(), ","), "datasources", strings.Join(r.pipeline.GetDatasourceTypes(), ","))
 	return r.expressionService.ExecutePipeline(execCtx, now, r.pipeline)
 }
 
@@ -157,6 +158,23 @@ func (evalResults Results) HasErrors() bool {
 	return false
 }
 
+// HasNonRetryableErrors returns true if we have at least 1 result with:
+// 1. A `State` of `Error`
+// 2. The `Error` attribute is not nil
+// 3. The `Error` type is of `&invalidEvalResultFormatError`
+// Our thinking with this approach, is that we don't want to retry errors that have relation with invalid alert definition format.
+func (evalResults Results) HasNonRetryableErrors() bool {
+	for _, r := range evalResults {
+		if r.State == Error && r.Error != nil {
+			var nonRetryableError *invalidEvalResultFormatError
+			if errors.As(r.Error, &nonRetryableError) {
+				return true
+			}
+		}
+	}
+	return false
+}
+
 // HasErrors returns true when Results contains at least one element and all elements are errors
 func (evalResults Results) IsError() bool {
 	for _, r := range evalResults {
@@ -177,6 +195,18 @@ func (evalResults Results) IsNoData() bool {
 	return true
 }
 
+// Error returns the aggregated `error` of all results of which state is `Error`.
+func (evalResults Results) Error() error {
+	var errs []error
+	for _, result := range evalResults {
+		if result.State == Error && result.Error != nil {
+			errs = append(errs, result.Error)
+		}
+	}
+
+	return errors.Join(errs...)
+}
+
 // Result contains the evaluated State of an alert instance
 // identified by its labels.
 type Result struct {
@@ -246,6 +276,23 @@ func (s State) String() string {
 	return [...]string{"Normal", "Alerting", "Pending", "NoData", "Error"}[s]
 }
 
+func ParseStateString(repr string) (State, error) {
+	switch strings.ToLower(repr) {
+	case "normal":
+		return Normal, nil
+	case "alerting":
+		return Alerting, nil
+	case "pending":
+		return Pending, nil
+	case "nodata":
+		return NoData, nil
+	case "error":
+		return Error, nil
+	default:
+		return -1, fmt.Errorf("invalid state: %s", repr)
+	}
+}
+
 func buildDatasourceHeaders(ctx context.Context) map[string]string {
 	headers := map[string]string{
 		// Many data sources check this in query method as sometimes alerting needs special considerations.
@@ -269,16 +316,55 @@ func buildDatasourceHeaders(ctx context.Context) map[string]string {
 }
 
 // getExprRequest validates the condition, gets the datasource information and creates an expr.Request from it.
-func getExprRequest(ctx EvaluationContext, data []models.AlertQuery, dsCacheService datasources.CacheService) (*expr.Request, error) {
+func getExprRequest(ctx EvaluationContext, condition models.Condition, dsCacheService datasources.CacheService, reader AlertingResultsReader) (*expr.Request, error) {
 	req := &expr.Request{
-		OrgId:   ctx.User.OrgID,
+		OrgId:   ctx.User.GetOrgID(),
 		Headers: buildDatasourceHeaders(ctx.Ctx),
 		User:    ctx.User,
 	}
+	datasources := make(map[string]*datasources.DataSource, len(condition.Data))
 
-	datasources := make(map[string]*datasources.DataSource, len(data))
+	for _, q := range condition.Data {
+		var err error
+		ds, ok := datasources[q.DatasourceUID]
+		if !ok {
+			switch nodeType := expr.NodeTypeFromDatasourceUID(q.DatasourceUID); nodeType {
+			case expr.TypeDatasourceNode:
+				ds, err = dsCacheService.GetDatasourceByUID(ctx.Ctx, q.DatasourceUID, ctx.User, false /*skipCache*/)
+			default:
+				ds, err = expr.DataSourceModelFromNodeType(nodeType)
+			}
+			if err != nil {
+				return nil, fmt.Errorf("failed to build query '%s': %w", q.RefID, err)
+			}
+			datasources[q.DatasourceUID] = ds
+		}
+
+		// TODO rewrite the code below and remove the mutable component from AlertQuery
+
+		// if the query is command expression and it's a hysteresis, patch it with the current state
+		// it's important to do this before GetModel
+		if ds.Type == expr.DatasourceType {
+			isHysteresis, err := q.IsHysteresisExpression()
+			if err != nil {
+				return nil, fmt.Errorf("failed to build query '%s': %w", q.RefID, err)
+			}
+			if isHysteresis {
+				// make sure we allow hysteresis expressions to be specified only as the alert condition.
+				// This guarantees us that the AlertResultsReader can be correctly applied to the expression tree.
+				if q.RefID != condition.Condition {
+					return nil, fmt.Errorf("recovery threshold '%s' is only allowed to be the alert condition", q.RefID)
+				}
+				if reader != nil {
+					logger.FromContext(ctx.Ctx).Debug("Detected hysteresis threshold command. Populating with the results")
+					err = q.PatchHysteresisExpression(reader.Read())
+					if err != nil {
+						return nil, fmt.Errorf("failed to amend hysteresis command '%s': %w", q.RefID, err)
+					}
+				}
+			}
+		}
 
-	for _, q := range data {
 		model, err := q.GetModel()
 		if err != nil {
 			return nil, fmt.Errorf("failed to get query model from '%s': %w", q.RefID, err)
@@ -293,20 +379,6 @@ func getExprRequest(ctx EvaluationContext, data []models.AlertQuery, dsCacheServ
 			return nil, fmt.Errorf("failed to retrieve maxDatapoints from '%s': %w", q.RefID, err)
 		}
 
-		ds, ok := datasources[q.DatasourceUID]
-		if !ok {
-			switch nodeType := expr.NodeTypeFromDatasourceUID(q.DatasourceUID); nodeType {
-			case expr.TypeDatasourceNode:
-				ds, err = dsCacheService.GetDatasourceByUID(ctx.Ctx, q.DatasourceUID, ctx.User, false /*skipCache*/)
-			default:
-				ds, err = expr.DataSourceModelFromNodeType(nodeType)
-			}
-			if err != nil {
-				return nil, fmt.Errorf("failed to build query '%s': %w", q.RefID, err)
-			}
-			datasources[q.DatasourceUID] = ds
-		}
-
 		req.Queries = append(req.Queries, expr.Query{
 			TimeRange:     q.RelativeTimeRange.ToTimeRange(),
 			DataSource:    ds,
@@ -695,7 +767,7 @@ func (evalResults Results) AsDataFrame() data.Frame {
 }
 
 func (e *evaluatorImpl) Validate(ctx EvaluationContext, condition models.Condition) error {
-	req, err := getExprRequest(ctx, condition.Data, e.dataSourceCache)
+	req, err := getExprRequest(ctx, condition, e.dataSourceCache, ctx.AlertingResultsReader)
 	if err != nil {
 		return err
 	}
@@ -731,7 +803,7 @@ func (e *evaluatorImpl) Create(ctx EvaluationContext, condition models.Condition
 	if len(condition.Condition) == 0 {
 		return nil, errors.New("condition must not be empty")
 	}
-	req, err := getExprRequest(ctx, condition.Data, e.dataSourceCache)
+	req, err := getExprRequest(ctx, condition, e.dataSourceCache, ctx.AlertingResultsReader)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/services/ngalert/eval/eval_test.go b/pkg/services/ngalert/eval/eval_test.go
index 7820036edf66a..1a7615ef5dc21 100644
--- a/pkg/services/ngalert/eval/eval_test.go
+++ b/pkg/services/ngalert/eval/eval_test.go
@@ -2,6 +2,7 @@ package eval
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"math/rand"
 	"testing"
@@ -523,6 +524,59 @@ func TestValidate(t *testing.T) {
 				}
 			},
 		},
+		{
+			name:  "fail if hysteresis command is not the condition",
+			error: true,
+			condition: func(services services) models.Condition {
+				dsQuery := models.GenerateAlertQuery()
+				ds := &datasources.DataSource{
+					UID:  dsQuery.DatasourceUID,
+					Type: util.GenerateShortUID(),
+				}
+				services.cache.DataSources = append(services.cache.DataSources, ds)
+				services.pluginsStore.PluginList = append(services.pluginsStore.PluginList, pluginstore.Plugin{
+					JSONData: plugins.JSONData{
+						ID:      ds.Type,
+						Backend: true,
+					},
+				})
+
+				return models.Condition{
+					Condition: "C",
+					Data: []models.AlertQuery{
+						dsQuery,
+						models.CreateHysteresisExpression(t, "B", dsQuery.RefID, 4, 1),
+						models.CreateClassicConditionExpression("C", "B", "last", "gt", rand.Int()),
+					},
+				}
+			},
+		},
+		{
+			name:  "pass if hysteresis command and it is the condition",
+			error: false,
+			condition: func(services services) models.Condition {
+				dsQuery := models.GenerateAlertQuery()
+				ds := &datasources.DataSource{
+					UID:  dsQuery.DatasourceUID,
+					Type: util.GenerateShortUID(),
+				}
+				services.cache.DataSources = append(services.cache.DataSources, ds)
+				services.pluginsStore.PluginList = append(services.pluginsStore.PluginList, pluginstore.Plugin{
+					JSONData: plugins.JSONData{
+						ID:      ds.Type,
+						Backend: true,
+					},
+				})
+
+				return models.Condition{
+					Condition: "B",
+					Data: []models.AlertQuery{
+						dsQuery,
+						models.CreateHysteresisExpression(t, "B", dsQuery.RefID, 4, 1),
+					},
+				}
+			},
+		},
 	}
 
 	for _, testCase := range testCases {
@@ -549,6 +603,133 @@ func TestValidate(t *testing.T) {
 	}
 }
 
+func TestCreate_HysteresisCommand(t *testing.T) {
+	type services struct {
+		cache        *fakes.FakeCacheService
+		pluginsStore *pluginstore.FakePluginStore
+	}
+
+	testCases := []struct {
+		name      string
+		reader    AlertingResultsReader
+		condition func(services services) models.Condition
+		error     bool
+	}{
+		{
+			name:  "fail if hysteresis command is not the condition",
+			error: true,
+			condition: func(services services) models.Condition {
+				dsQuery := models.GenerateAlertQuery()
+				ds := &datasources.DataSource{
+					UID:  dsQuery.DatasourceUID,
+					Type: util.GenerateShortUID(),
+				}
+				services.cache.DataSources = append(services.cache.DataSources, ds)
+				services.pluginsStore.PluginList = append(services.pluginsStore.PluginList, pluginstore.Plugin{
+					JSONData: plugins.JSONData{
+						ID:      ds.Type,
+						Backend: true,
+					},
+				})
+
+				return models.Condition{
+					Condition: "C",
+					Data: []models.AlertQuery{
+						dsQuery,
+						models.CreateHysteresisExpression(t, "B", dsQuery.RefID, 4, 1),
+						models.CreateClassicConditionExpression("C", "B", "last", "gt", rand.Int()),
+					},
+				}
+			},
+		},
+		{
+			name:   "populate with loaded metrics",
+			error:  false,
+			reader: FakeLoadedMetricsReader{fingerprints: map[data.Fingerprint]struct{}{1: {}, 2: {}, 3: {}}},
+			condition: func(services services) models.Condition {
+				dsQuery := models.GenerateAlertQuery()
+				ds := &datasources.DataSource{
+					UID:  dsQuery.DatasourceUID,
+					Type: util.GenerateShortUID(),
+				}
+				services.cache.DataSources = append(services.cache.DataSources, ds)
+				services.pluginsStore.PluginList = append(services.pluginsStore.PluginList, pluginstore.Plugin{
+					JSONData: plugins.JSONData{
+						ID:      ds.Type,
+						Backend: true,
+					},
+				})
+
+				return models.Condition{
+					Condition: "B",
+					Data: []models.AlertQuery{
+						dsQuery,
+						models.CreateHysteresisExpression(t, "B", dsQuery.RefID, 4, 1),
+					},
+				}
+			},
+		},
+		{
+			name:   "do nothing if reader is not specified",
+			error:  false,
+			reader: nil,
+			condition: func(services services) models.Condition {
+				dsQuery := models.GenerateAlertQuery()
+				ds := &datasources.DataSource{
+					UID:  dsQuery.DatasourceUID,
+					Type: util.GenerateShortUID(),
+				}
+				services.cache.DataSources = append(services.cache.DataSources, ds)
+				services.pluginsStore.PluginList = append(services.pluginsStore.PluginList, pluginstore.Plugin{
+					JSONData: plugins.JSONData{
+						ID:      ds.Type,
+						Backend: true,
+					},
+				})
+
+				return models.Condition{
+					Condition: "B",
+					Data: []models.AlertQuery{
+						dsQuery,
+						models.CreateHysteresisExpression(t, "B", dsQuery.RefID, 4, 1),
+					},
+				}
+			},
+		},
+	}
+
+	for _, testCase := range testCases {
+		u := &user.SignedInUser{}
+
+		t.Run(testCase.name, func(t *testing.T) {
+			cacheService := &fakes.FakeCacheService{}
+			store := &pluginstore.FakePluginStore{}
+			condition := testCase.condition(services{
+				cache:        cacheService,
+				pluginsStore: store,
+			})
+			evaluator := NewEvaluatorFactory(setting.UnifiedAlertingSettings{}, cacheService, expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, nil, nil, featuremgmt.WithFeatures(featuremgmt.FlagRecoveryThreshold), nil, tracing.InitializeTracerForTest()), store)
+			evalCtx := NewContextWithPreviousResults(context.Background(), u, testCase.reader)
+
+			eval, err := evaluator.Create(evalCtx, condition)
+			if testCase.error {
+				require.Error(t, err)
+				return
+			}
+			require.IsType(t, &conditionEvaluator{}, eval)
+			ce := eval.(*conditionEvaluator)
+
+			cmds := expr.GetCommandsFromPipeline[*expr.HysteresisCommand](ce.pipeline)
+			require.Len(t, cmds, 1)
+			if testCase.reader == nil {
+				require.Empty(t, cmds[0].LoadedDimensions)
+			} else {
+				require.EqualValues(t, testCase.reader.Read(), cmds[0].LoadedDimensions)
+			}
+		})
+	}
+}
+
 func TestEvaluate(t *testing.T) {
 	cases := []struct {
 		name     string
@@ -769,6 +950,70 @@ func TestEvaluateRaw(t *testing.T) {
 	})
 }
 
+func TestResults_HasNonRetryableErrors(t *testing.T) {
+	tc := []struct {
+		name     string
+		eval     Results
+		expected bool
+	}{
+		{
+			name: "with non-retryable errors",
+			eval: Results{
+				{
+					State: Error,
+					Error: &invalidEvalResultFormatError{refID: "A", reason: "unable to get frame row length", err: errors.New("weird error")},
+				},
+			},
+			expected: true,
+		},
+		{
+			name: "with retryable errors",
+			eval: Results{
+				{
+					State: Error,
+					Error: errors.New("some weird error"),
+				},
+			},
+			expected: false,
+		},
+	}
+
+	for _, tt := range tc {
+		t.Run(tt.name, func(t *testing.T) {
+			require.Equal(t, tt.expected, tt.eval.HasNonRetryableErrors())
+		})
+	}
+}
+
+func TestResults_Error(t *testing.T) {
+	tc := []struct {
+		name     string
+		eval     Results
+		expected string
+	}{
+		{
+			name: "with non-retryable errors",
+			eval: Results{
+				{
+					State: Error,
+					Error: &invalidEvalResultFormatError{refID: "A", reason: "unable to get frame row length", err: errors.New("weird error")},
+				},
+				{
+					State: Error,
+					Error: errors.New("unable to get a data frame"),
+				},
+			},
+			expected: "invalid format of evaluation results for the alert definition A: unable to get frame row length: weird error\nunable to get a data frame",
+		},
+	}
+
+	for _, tt := range tc {
+		t.Run(tt.name, func(t *testing.T) {
+			require.Equal(t, tt.expected, tt.eval.Error().Error())
+		})
+	}
+}
+
 type fakeExpressionService struct {
 	hook func(ctx context.Context, now time.Time, pipeline expr.DataPipeline) (*backend.QueryDataResponse, error)
 }
diff --git a/pkg/services/ngalert/eval/testing.go b/pkg/services/ngalert/eval/testing.go
index f38ed3fa2d09f..b06d071011bdc 100644
--- a/pkg/services/ngalert/eval/testing.go
+++ b/pkg/services/ngalert/eval/testing.go
@@ -79,3 +79,11 @@ func WithLabels(labels data.Labels) ResultMutator {
 		r.Instance = labels
 	}
 }
+
+type FakeLoadedMetricsReader struct {
+	fingerprints map[data.Fingerprint]struct{}
+}
+
+func (f FakeLoadedMetricsReader) Read() map[data.Fingerprint]struct{} {
+	return f.fingerprints
+}
diff --git a/pkg/services/ngalert/image/service.go b/pkg/services/ngalert/image/service.go
index edaedb1383285..39d1e4f9f0bde 100644
--- a/pkg/services/ngalert/image/service.go
+++ b/pkg/services/ngalert/image/service.go
@@ -93,12 +93,12 @@ func NewScreenshotImageServiceFromCfg(cfg *setting.Cfg, db *store.DBstore, ds da
 	if cfg.UnifiedAlerting.Screenshots.Capture {
 		cache = NewInmemCacheService(screenshotCacheTTL, r)
 		limiter = screenshot.NewTokenRateLimiter(cfg.UnifiedAlerting.Screenshots.MaxConcurrentScreenshots)
-		screenshots = screenshot.NewHeadlessScreenshotService(ds, rs, r)
+		screenshots = screenshot.NewHeadlessScreenshotService(cfg, ds, rs, r)
 		screenshotTimeout = cfg.UnifiedAlerting.Screenshots.CaptureTimeout
 
 		// Image uploading is an optional feature
 		if cfg.UnifiedAlerting.Screenshots.UploadExternalImageStorage {
-			m, err := imguploader.NewImageUploader()
+			m, err := imguploader.NewImageUploader(cfg)
 			if err != nil {
 				return nil, fmt.Errorf("failed to initialize uploading screenshot service: %w", err)
 			}
diff --git a/pkg/services/ngalert/limits.go b/pkg/services/ngalert/limits.go
new file mode 100644
index 0000000000000..1ba538eb66f60
--- /dev/null
+++ b/pkg/services/ngalert/limits.go
@@ -0,0 +1,80 @@
+package ngalert
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/quota"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+type RuleUsageReader interface {
+	Count(ctx context.Context, orgID int64) (int64, error)
+}
+
+func RegisterQuotas(cfg *setting.Cfg, qs quota.Service, rules RuleUsageReader) error {
+	defaultLimits, err := readQuotaConfig(cfg)
+	if err != nil {
+		return err
+	}
+
+	return qs.RegisterQuotaReporter(&quota.NewUsageReporter{
+		TargetSrv:     models.QuotaTargetSrv,
+		DefaultLimits: defaultLimits,
+		Reporter:      UsageReporter(rules),
+	})
+}
+
+func UsageReporter(rules RuleUsageReader) quota.UsageReporterFunc {
+	return func(ctx context.Context, scopeParams *quota.ScopeParameters) (*quota.Map, error) {
+		u := &quota.Map{}
+
+		var orgID int64 = 0
+		if scopeParams != nil {
+			orgID = scopeParams.OrgID
+		}
+
+		if orgUsage, err := rules.Count(ctx, orgID); err != nil {
+			return u, err
+		} else {
+			tag, err := quota.NewTag(models.QuotaTargetSrv, models.QuotaTarget, quota.OrgScope)
+			if err != nil {
+				return u, err
+			}
+			u.Set(tag, orgUsage)
+		}
+
+		if globalUsage, err := rules.Count(ctx, 0); err != nil {
+			return u, err
+		} else {
+			tag, err := quota.NewTag(models.QuotaTargetSrv, models.QuotaTarget, quota.GlobalScope)
+			if err != nil {
+				return u, err
+			}
+			u.Set(tag, globalUsage)
+		}
+
+		return u, nil
+	}
+}
+
+func readQuotaConfig(cfg *setting.Cfg) (*quota.Map, error) {
+	limits := &quota.Map{}
+
+	if cfg == nil {
+		return limits, nil
+	}
+
+	globalQuotaTag, err := quota.NewTag(models.QuotaTargetSrv, models.QuotaTarget, quota.GlobalScope)
+	if err != nil {
+		return limits, err
+	}
+	orgQuotaTag, err := quota.NewTag(models.QuotaTargetSrv, models.QuotaTarget, quota.OrgScope)
+	if err != nil {
+		return limits, err
+	}
+
+	limits.Set(globalQuotaTag, cfg.Quota.Global.AlertRule)
+	limits.Set(orgQuotaTag, cfg.Quota.Org.AlertRule)
+	return limits, nil
+}
diff --git a/pkg/services/ngalert/limits_test.go b/pkg/services/ngalert/limits_test.go
new file mode 100644
index 0000000000000..28895574648be
--- /dev/null
+++ b/pkg/services/ngalert/limits_test.go
@@ -0,0 +1,113 @@
+package ngalert
+
+import (
+	"context"
+	"testing"
+
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/quota"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/stretchr/testify/require"
+)
+
+func TestUsageReporter(t *testing.T) {
+	t.Run("reports org usage", func(t *testing.T) {
+		rules := newFakeUsageReader(map[int64]int64{1: 10, 2: 20})
+		params := quota.ScopeParameters{
+			OrgID: 1,
+		}
+
+		res, err := UsageReporter(rules)(context.Background(), &params)
+
+		require.NoError(t, err)
+		rulesOrg, _ := quota.NewTag(models.QuotaTargetSrv, models.QuotaTarget, quota.OrgScope)
+		val, ok := res.Get(rulesOrg)
+		require.True(t, ok, "reporter did not report on org 1 rules usage")
+		require.Equal(t, int64(10), val)
+	})
+
+	t.Run("reports global usage", func(t *testing.T) {
+		rules := newFakeUsageReader(map[int64]int64{1: 10, 2: 20})
+		params := quota.ScopeParameters{
+			OrgID: 1,
+		}
+
+		res, err := UsageReporter(rules)(context.Background(), &params)
+
+		require.NoError(t, err)
+		rulesGlobal, _ := quota.NewTag(models.QuotaTargetSrv, models.QuotaTarget, quota.GlobalScope)
+		val, ok := res.Get(rulesGlobal)
+		require.True(t, ok, "reporter did not report on global rules usage")
+		require.Equal(t, int64(30), val)
+	})
+
+	t.Run("reports global usage if scope params are nil", func(t *testing.T) {
+		rules := newFakeUsageReader(map[int64]int64{1: 10, 2: 20})
+
+		res, err := UsageReporter(rules)(context.Background(), nil)
+
+		require.NoError(t, err)
+		rulesGlobal, _ := quota.NewTag(models.QuotaTargetSrv, models.QuotaTarget, quota.GlobalScope)
+		val, ok := res.Get(rulesGlobal)
+		require.True(t, ok, "reporter did not report on global rules usage")
+		require.Equal(t, int64(30), val)
+	})
+}
+
+func TestReadQuotaConfig(t *testing.T) {
+	cfg := &setting.Cfg{
+		Quota: setting.QuotaSettings{
+			Org: setting.OrgQuota{
+				AlertRule: 30,
+			},
+			Global: setting.GlobalQuota{
+				AlertRule: 50,
+			},
+		},
+	}
+
+	t.Run("registers per-org rule quota from config", func(t *testing.T) {
+		res, err := readQuotaConfig(cfg)
+
+		require.NoError(t, err)
+		rulesOrg, _ := quota.NewTag(models.QuotaTargetSrv, models.QuotaTarget, quota.OrgScope)
+		val, ok := res.Get(rulesOrg)
+		require.True(t, ok, "did not configure per-org rules quota")
+		require.Equal(t, int64(30), val)
+	})
+
+	t.Run("registers global rule quota from config", func(t *testing.T) {
+		res, err := readQuotaConfig(cfg)
+
+		require.NoError(t, err)
+		rulesGlobal, _ := quota.NewTag(models.QuotaTargetSrv, models.QuotaTarget, quota.GlobalScope)
+		val, ok := res.Get(rulesGlobal)
+		require.True(t, ok, "did not configure global rules quota")
+		require.Equal(t, int64(50), val)
+	})
+}
+
+type fakeUsageReader struct {
+	usage map[int64]int64 // orgID -> count
+}
+
+func newFakeUsageReader(usage map[int64]int64) fakeUsageReader {
+	return fakeUsageReader{
+		usage: usage,
+	}
+}
+
+func (f fakeUsageReader) Count(_ context.Context, orgID int64) (int64, error) {
+	if orgID == 0 {
+		total := int64(0)
+		for _, count := range f.usage {
+			total += count
+		}
+		return total, nil
+	}
+
+	if c, ok := f.usage[orgID]; ok {
+		return c, nil
+	}
+	return 0, nil
+}
diff --git a/pkg/services/ngalert/metrics/alertmanager.go b/pkg/services/ngalert/metrics/alertmanager.go
index 58b4630b04321..2ae5bae521044 100644
--- a/pkg/services/ngalert/metrics/alertmanager.go
+++ b/pkg/services/ngalert/metrics/alertmanager.go
@@ -18,12 +18,13 @@ func NewAlertmanagerMetrics(r prometheus.Registerer) *Alertmanager {
 	other := prometheus.WrapRegistererWithPrefix(fmt.Sprintf("%s_%s_", Namespace, Subsystem), r)
 	return &Alertmanager{
 		Registerer:                r,
-		Alerts:                    metrics.NewAlerts("grafana", other),
+		Alerts:                    metrics.NewAlerts(other),
 		AlertmanagerConfigMetrics: NewAlertmanagerConfigMetrics(r),
 	}
 }
 
 type AlertmanagerConfigMetrics struct {
+	ConfigHash     *prometheus.GaugeVec
 	Matchers       prometheus.Gauge
 	MatchRE        prometheus.Gauge
 	Match          prometheus.Gauge
@@ -32,6 +33,10 @@ type AlertmanagerConfigMetrics struct {
 
 func NewAlertmanagerConfigMetrics(r prometheus.Registerer) *AlertmanagerConfigMetrics {
 	m := &AlertmanagerConfigMetrics{
+		ConfigHash: prometheus.NewGaugeVec(prometheus.GaugeOpts{
+			Name: "alertmanager_config_hash",
+			Help: "The hash of the Alertmanager configuration.",
+		}, []string{"org"}),
 		Matchers: prometheus.NewGauge(prometheus.GaugeOpts{
 			Name: "alertmanager_config_matchers",
 			Help: "The total number of matchers",
@@ -50,7 +55,7 @@ func NewAlertmanagerConfigMetrics(r prometheus.Registerer) *AlertmanagerConfigMe
 		}),
 	}
 	if r != nil {
-		r.MustRegister(m.Matchers, m.MatchRE, m.Match, m.ObjectMatchers)
+		r.MustRegister(m.ConfigHash, m.Matchers, m.MatchRE, m.Match, m.ObjectMatchers)
 	}
 	return m
 }
diff --git a/pkg/services/ngalert/metrics/historian.go b/pkg/services/ngalert/metrics/historian.go
index fa5d55965fd1f..aba23d9816ade 100644
--- a/pkg/services/ngalert/metrics/historian.go
+++ b/pkg/services/ngalert/metrics/historian.go
@@ -1,9 +1,9 @@
 package metrics
 
 import (
+	"github.com/grafana/dskit/instrument"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
-	"github.com/weaveworks/common/instrument"
 )
 
 type Historian struct {
@@ -16,48 +16,48 @@ type Historian struct {
 	BytesWritten      prometheus.Counter
 }
 
-func NewHistorianMetrics(r prometheus.Registerer) *Historian {
+func NewHistorianMetrics(r prometheus.Registerer, subsystem string) *Historian {
 	return &Historian{
 		Info: promauto.With(r).NewGaugeVec(prometheus.GaugeOpts{
 			Namespace: Namespace,
-			Subsystem: Subsystem,
+			Subsystem: subsystem,
 			Name:      "state_history_info",
 			Help:      "Information about the state history store.",
 		}, []string{"backend"}),
 		TransitionsTotal: promauto.With(r).NewCounterVec(prometheus.CounterOpts{
 			Namespace: Namespace,
-			Subsystem: Subsystem,
+			Subsystem: subsystem,
 			Name:      "state_history_transitions_total",
 			Help:      "The total number of state transitions processed.",
 		}, []string{"org"}),
 		TransitionsFailed: promauto.With(r).NewCounterVec(prometheus.CounterOpts{
 			Namespace: Namespace,
-			Subsystem: Subsystem,
+			Subsystem: subsystem,
 			Name:      "state_history_transitions_failed_total",
 			Help:      "The total number of state transitions that failed to be written - they are not retried.",
 		}, []string{"org"}),
 		WritesTotal: promauto.With(r).NewCounterVec(prometheus.CounterOpts{
 			Namespace: Namespace,
-			Subsystem: Subsystem,
+			Subsystem: subsystem,
 			Name:      "state_history_writes_total",
 			Help:      "The total number of state history batches that were attempted to be written.",
 		}, []string{"org", "backend"}),
 		WritesFailed: promauto.With(r).NewCounterVec(prometheus.CounterOpts{
 			Namespace: Namespace,
-			Subsystem: Subsystem,
+			Subsystem: subsystem,
 			Name:      "state_history_writes_failed_total",
 			Help:      "The total number of failed writes of state history batches.",
 		}, []string{"org", "backend"}),
 		WriteDuration: instrument.NewHistogramCollector(promauto.With(r).NewHistogramVec(prometheus.HistogramOpts{
 			Namespace: Namespace,
-			Subsystem: Subsystem,
+			Subsystem: subsystem,
 			Name:      "state_history_request_duration_seconds",
 			Help:      "Histogram of request durations to the state history store. Only valid when using external stores.",
 			Buckets:   instrument.DefBuckets,
 		}, instrument.HistogramCollectorBuckets)),
 		BytesWritten: promauto.With(r).NewCounter(prometheus.CounterOpts{
 			Namespace: Namespace,
-			Subsystem: Subsystem,
+			Subsystem: subsystem,
 			Name:      "state_history_writes_bytes_total",
 			Help:      "The total number of bytes sent within a batch to the state history store. Only valid when using the Loki store.",
 		}),
diff --git a/pkg/services/ngalert/metrics/multi_org_alertmanager.go b/pkg/services/ngalert/metrics/multi_org_alertmanager.go
index 150019f774d9c..7ed927c901f51 100644
--- a/pkg/services/ngalert/metrics/multi_org_alertmanager.go
+++ b/pkg/services/ngalert/metrics/multi_org_alertmanager.go
@@ -73,10 +73,11 @@ type AlertmanagerAggregatedMetrics struct {
 	registries *metrics.TenantRegistries
 
 	// metrics gather from the in-house "Alertmanager" directly.
-	numReceivedAlerts      *prometheus.Desc
-	numInvalidAlerts       *prometheus.Desc
-	configuredReceivers    *prometheus.Desc
-	configuredIntegrations *prometheus.Desc
+	numReceivedAlerts         *prometheus.Desc
+	numInvalidAlerts          *prometheus.Desc
+	configuredReceivers       *prometheus.Desc
+	configuredIntegrations    *prometheus.Desc
+	configuredInhibitionRules *prometheus.Desc
 
 	// exported metrics, gathered from Alertmanager PipelineBuilder
 	numNotifications                   *prometheus.Desc
@@ -117,6 +118,8 @@ type AlertmanagerAggregatedMetrics struct {
 	matchRE        *prometheus.Desc
 	match          *prometheus.Desc
 	objectMatchers *prometheus.Desc
+
+	configHash *prometheus.Desc
 }
 
 func NewAlertmanagerAggregatedMetrics(registries *metrics.TenantRegistries) *AlertmanagerAggregatedMetrics {
@@ -139,6 +142,10 @@ func NewAlertmanagerAggregatedMetrics(registries *metrics.TenantRegistries) *Ale
 			fmt.Sprintf("%s_%s_alertmanager_integrations", Namespace, Subsystem),
 			"Number of configured receivers.",
 			[]string{"org", "type"}, nil),
+		configuredInhibitionRules: prometheus.NewDesc(
+			fmt.Sprintf("%s_%s_alertmanager_inhibition_rules", Namespace, Subsystem),
+			"Number of configured inhibition rules.",
+			[]string{"org"}, nil),
 
 		numNotifications: prometheus.NewDesc(
 			fmt.Sprintf("%s_%s_notifications_total", Namespace, Subsystem),
@@ -253,6 +260,11 @@ func NewAlertmanagerAggregatedMetrics(registries *metrics.TenantRegistries) *Ale
 			fmt.Sprintf("%s_%s_alertmanager_config_object_matchers", Namespace, Subsystem),
 			"The total number of object_matchers",
 			nil, nil),
+
+		configHash: prometheus.NewDesc(
+			fmt.Sprintf("%s_%s_alertmanager_config_hash", Namespace, Subsystem),
+			"The hash of the Alertmanager configuration.",
+			[]string{"org"}, nil),
 	}
 
 	return aggregatedMetrics
@@ -263,6 +275,7 @@ func (a *AlertmanagerAggregatedMetrics) Describe(out chan<- *prometheus.Desc) {
 	out <- a.numInvalidAlerts
 	out <- a.configuredReceivers
 	out <- a.configuredIntegrations
+	out <- a.configuredInhibitionRules
 
 	out <- a.numNotifications
 	out <- a.numFailedNotifications
@@ -296,6 +309,8 @@ func (a *AlertmanagerAggregatedMetrics) Describe(out chan<- *prometheus.Desc) {
 	out <- a.matchRE
 	out <- a.match
 	out <- a.objectMatchers
+
+	out <- a.configHash
 }
 
 func (a *AlertmanagerAggregatedMetrics) Collect(out chan<- prometheus.Metric) {
@@ -305,6 +320,7 @@ func (a *AlertmanagerAggregatedMetrics) Collect(out chan<- prometheus.Metric) {
 	data.SendSumOfCountersPerTenant(out, a.numInvalidAlerts, "alertmanager_alerts_invalid_total")
 	data.SendSumOfGaugesPerTenantWithLabels(out, a.configuredReceivers, "grafana_alerting_alertmanager_receivers", "state")
 	data.SendSumOfGaugesPerTenantWithLabels(out, a.configuredIntegrations, "grafana_alerting_alertmanager_integrations", "type")
+	data.SendSumOfGaugesPerTenant(out, a.configuredInhibitionRules, "grafana_alerting_alertmanager_inhibition_rules")
 
 	data.SendSumOfCountersPerTenant(out, a.numNotifications, "alertmanager_notifications_total", metrics.WithLabels("integration"), metrics.WithSkipZeroValueMetrics)
 	data.SendSumOfCountersPerTenant(out, a.numFailedNotifications, "alertmanager_notifications_failed_total", metrics.WithLabels("integration"), metrics.WithSkipZeroValueMetrics)
@@ -338,4 +354,6 @@ func (a *AlertmanagerAggregatedMetrics) Collect(out chan<- prometheus.Metric) {
 	data.SendSumOfGauges(out, a.matchRE, "alertmanager_config_match_re")
 	data.SendSumOfGauges(out, a.match, "alertmanager_config_match")
 	data.SendSumOfGauges(out, a.objectMatchers, "alertmanager_config_object_matchers")
+
+	data.SendMaxOfGaugesPerTenant(out, a.configHash, "alertmanager_config_hash")
 }
diff --git a/pkg/services/ngalert/metrics/ngalert.go b/pkg/services/ngalert/metrics/ngalert.go
index ddffd9408fa1a..d03597f89b7c6 100644
--- a/pkg/services/ngalert/metrics/ngalert.go
+++ b/pkg/services/ngalert/metrics/ngalert.go
@@ -30,6 +30,7 @@ type NGAlert struct {
 	multiOrgAlertmanagerMetrics *MultiOrgAlertmanager
 	apiMetrics                  *API
 	historianMetrics            *Historian
+	remoteAlertmanagerMetrics   *RemoteAlertmanager
 }
 
 // NewNGAlert manages the metrics of all the alerting components.
@@ -40,7 +41,8 @@ func NewNGAlert(r prometheus.Registerer) *NGAlert {
 		stateMetrics:                NewStateMetrics(r),
 		multiOrgAlertmanagerMetrics: NewMultiOrgAlertmanagerMetrics(r),
 		apiMetrics:                  NewAPIMetrics(r),
-		historianMetrics:            NewHistorianMetrics(r),
+		historianMetrics:            NewHistorianMetrics(r, Subsystem),
+		remoteAlertmanagerMetrics:   NewRemoteAlertmanagerMetrics(r),
 	}
 }
 
@@ -63,3 +65,7 @@ func (ng *NGAlert) GetMultiOrgAlertmanagerMetrics() *MultiOrgAlertmanager {
 func (ng *NGAlert) GetHistorianMetrics() *Historian {
 	return ng.historianMetrics
 }
+
+func (ng *NGAlert) GetRemoteAlertmanagerMetrics() *RemoteAlertmanager {
+	return ng.remoteAlertmanagerMetrics
+}
diff --git a/pkg/services/ngalert/metrics/remote_alertmanager.go b/pkg/services/ngalert/metrics/remote_alertmanager.go
new file mode 100644
index 0000000000000..5963f9facb6dd
--- /dev/null
+++ b/pkg/services/ngalert/metrics/remote_alertmanager.go
@@ -0,0 +1,84 @@
+package metrics
+
+import (
+	"github.com/grafana/dskit/instrument"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
+)
+
+const (
+	ModeRemoteSecondary = "remote_secondary"
+	ModeRemotePrimary   = "remote_primary"
+	ModeRemoteOnly      = "remote_only"
+)
+
+type RemoteAlertmanager struct {
+	Info                  *prometheus.GaugeVec
+	RequestLatency        *instrument.HistogramCollector
+	LastReadinessCheck    prometheus.Gauge
+	ConfigSyncsTotal      prometheus.Counter
+	ConfigSyncErrorsTotal prometheus.Counter
+	LastConfigSync        prometheus.Gauge
+	StateSyncsTotal       prometheus.Counter
+	StateSyncErrorsTotal  prometheus.Counter
+	LastStateSync         prometheus.Gauge
+}
+
+func NewRemoteAlertmanagerMetrics(r prometheus.Registerer) *RemoteAlertmanager {
+	return &RemoteAlertmanager{
+		Info: promauto.With(r).NewGaugeVec(prometheus.GaugeOpts{
+			Namespace: Namespace,
+			Subsystem: Subsystem,
+			Name:      "remote_alertmanager_info",
+			Help:      "Information about the remote Alertmanager.",
+		}, []string{"mode"}),
+		RequestLatency: instrument.NewHistogramCollector(promauto.With(r).NewHistogramVec(prometheus.HistogramOpts{
+			Namespace: Namespace,
+			Subsystem: Subsystem,
+			Name:      "remote_alertmanager_latency_seconds",
+			Help:      "Histogram of request latencies to the remote Alertmanager.",
+		}, instrument.HistogramCollectorBuckets)),
+		LastReadinessCheck: promauto.With(r).NewGauge(prometheus.GaugeOpts{
+			Namespace: Namespace,
+			Subsystem: Subsystem,
+			Name:      "remote_alertmanager_last_readiness_check_timestamp_seconds",
+			Help:      "Timestamp of the last successful readiness check to the remote Alertmanager in seconds.",
+		}),
+		ConfigSyncsTotal: promauto.With(r).NewCounter(prometheus.CounterOpts{
+			Namespace: Namespace,
+			Subsystem: Subsystem,
+			Name:      "remote_alertmanager_configuration_syncs_total",
+			Help:      "Total number of configuration syncs to the remote Alertmanager.",
+		}),
+		ConfigSyncErrorsTotal: promauto.With(r).NewCounter(prometheus.CounterOpts{
+			Namespace: Namespace,
+			Subsystem: Subsystem,
+			Name:      "remote_alertmanager_configuration_sync_failures_total",
+			Help:      "Total number of failed attempts to sync configurations between Alertmanagers.",
+		}),
+		LastConfigSync: promauto.With(r).NewGauge(prometheus.GaugeOpts{
+			Namespace: Namespace,
+			Subsystem: Subsystem,
+			Name:      "remote_alertmanager_last_configuration_sync_timestamp_seconds",
+			Help:      "Timestamp of the last successful configuration sync to the remote Alertmanager in seconds.",
+		}),
+		StateSyncsTotal: promauto.With(r).NewCounter(prometheus.CounterOpts{
+			Namespace: Namespace,
+			Subsystem: Subsystem,
+			Name:      "remote_alertmanager_state_syncs_total",
+			Help:      "Total number of state syncs to the remote Alertmanager.",
+		}),
+		StateSyncErrorsTotal: promauto.With(r).NewCounter(prometheus.CounterOpts{
+			Namespace: Namespace,
+			Subsystem: Subsystem,
+			Name:      "remote_alertmanager_state_sync_failures_total",
+			Help:      "Total number of failed attempts to sync state between Alertmanagers.",
+		}),
+		LastStateSync: promauto.With(r).NewGauge(prometheus.GaugeOpts{
+			Namespace: Namespace,
+			Subsystem: Subsystem,
+			Name:      "remote_alertmanager_last_state_sync_timestamp_seconds",
+			Help:      "Timestamp of the last successful state sync to the remote Alertmanager in seconds.",
+		}),
+	}
+}
diff --git a/pkg/services/ngalert/metrics/scheduler.go b/pkg/services/ngalert/metrics/scheduler.go
index d3f045a46404e..70056ea86c836 100644
--- a/pkg/services/ngalert/metrics/scheduler.go
+++ b/pkg/services/ngalert/metrics/scheduler.go
@@ -18,9 +18,13 @@ type Scheduler struct {
 	EvalTotal                           *prometheus.CounterVec
 	EvalFailures                        *prometheus.CounterVec
 	EvalDuration                        *prometheus.HistogramVec
+	EvalAttemptTotal                    *prometheus.CounterVec
+	EvalAttemptFailures                 *prometheus.CounterVec
 	ProcessDuration                     *prometheus.HistogramVec
 	SendDuration                        *prometheus.HistogramVec
+	SimpleNotificationRules             *prometheus.GaugeVec
 	GroupRules                          *prometheus.GaugeVec
+	Groups                              *prometheus.GaugeVec
 	SchedulePeriodicDuration            prometheus.Histogram
 	SchedulableAlertRules               prometheus.Gauge
 	SchedulableAlertRulesHash           prometheus.Gauge
@@ -70,6 +74,24 @@ func NewSchedulerMetrics(r prometheus.Registerer) *Scheduler {
 			},
 			[]string{"org"},
 		),
+		EvalAttemptTotal: promauto.With(r).NewCounterVec(
+			prometheus.CounterOpts{
+				Namespace: Namespace,
+				Subsystem: Subsystem,
+				Name:      "rule_evaluation_attempts_total",
+				Help:      "The total number of rule evaluation attempts.",
+			},
+			[]string{"org"},
+		),
+		EvalAttemptFailures: promauto.With(r).NewCounterVec(
+			prometheus.CounterOpts{
+				Namespace: Namespace,
+				Subsystem: Subsystem,
+				Name:      "rule_evaluation_attempt_failures_total",
+				Help:      "The total number of rule evaluation attempt failures.",
+			},
+			[]string{"org"},
+		),
 		ProcessDuration: promauto.With(r).NewHistogramVec(
 			prometheus.HistogramOpts{
 				Namespace: Namespace,
@@ -90,6 +112,15 @@ func NewSchedulerMetrics(r prometheus.Registerer) *Scheduler {
 			},
 			[]string{"org"},
 		),
+		SimpleNotificationRules: promauto.With(r).NewGaugeVec(
+			prometheus.GaugeOpts{
+				Namespace: Namespace,
+				Subsystem: Subsystem,
+				Name:      "simple_routing_rules",
+				Help:      "The number of alert rules using simplified routing.",
+			},
+			[]string{"org"},
+		),
 		// TODO: partition on rule group as well as tenant, similar to loki|cortex.
 		GroupRules: promauto.With(r).NewGaugeVec(
 			prometheus.GaugeOpts{
@@ -100,6 +131,15 @@ func NewSchedulerMetrics(r prometheus.Registerer) *Scheduler {
 			},
 			[]string{"org", "state"},
 		),
+		Groups: promauto.With(r).NewGaugeVec(
+			prometheus.GaugeOpts{
+				Namespace: Namespace,
+				Subsystem: Subsystem,
+				Name:      "rule_groups",
+				Help:      "The number of alert rule groups",
+			},
+			[]string{"org"},
+		),
 		SchedulePeriodicDuration: promauto.With(r).NewHistogram(
 			prometheus.HistogramOpts{
 				Namespace: Namespace,
diff --git a/pkg/services/ngalert/metrics/state.go b/pkg/services/ngalert/metrics/state.go
index 83b87f72d0574..92093ad6efa3f 100644
--- a/pkg/services/ngalert/metrics/state.go
+++ b/pkg/services/ngalert/metrics/state.go
@@ -6,8 +6,9 @@ import (
 )
 
 type State struct {
-	StateUpdateDuration prometheus.Histogram
-	r                   prometheus.Registerer
+	StateUpdateDuration   prometheus.Histogram
+	StateFullSyncDuration prometheus.Histogram
+	r                     prometheus.Registerer
 }
 
 // Registerer exposes the Prometheus register directly. The state package needs this as, it uses a collector to fetch the current alerts by state in the system.
@@ -27,5 +28,14 @@ func NewStateMetrics(r prometheus.Registerer) *State {
 				Buckets:   []float64{0.01, 0.1, 1, 2, 5, 10},
 			},
 		),
+		StateFullSyncDuration: promauto.With(r).NewHistogram(
+			prometheus.HistogramOpts{
+				Namespace: Namespace,
+				Subsystem: Subsystem,
+				Name:      "state_full_sync_duration_seconds",
+				Help:      "The duration of fully synchronizing the state with the database.",
+				Buckets:   []float64{0.01, 0.1, 1, 2, 5, 10, 60},
+			},
+		),
 	}
 }
diff --git a/pkg/services/ngalert/migration/alert_rule.go b/pkg/services/ngalert/migration/alert_rule.go
deleted file mode 100644
index be8d39a3da19b..0000000000000
--- a/pkg/services/ngalert/migration/alert_rule.go
+++ /dev/null
@@ -1,305 +0,0 @@
-package migration
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"time"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/log"
-	legacymodels "github.com/grafana/grafana/pkg/services/alerting/models"
-	migmodels "github.com/grafana/grafana/pkg/services/ngalert/migration/models"
-	migrationStore "github.com/grafana/grafana/pkg/services/ngalert/migration/store"
-	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
-	"github.com/grafana/grafana/pkg/services/ngalert/store"
-	"github.com/grafana/grafana/pkg/tsdb/graphite"
-	"github.com/grafana/grafana/pkg/util"
-)
-
-const (
-	// ContactLabel is a private label created during migration and used in notification policies.
-	// It stores a string array of all contact point names an alert rule should send to.
-	// It was created as a means to simplify post-migration notification policies.
-	ContactLabel = "__contacts__"
-)
-
-func addMigrationInfo(da *migrationStore.DashAlert, dashboardUID string) (map[string]string, map[string]string) {
-	tagsMap := simplejson.NewFromAny(da.ParsedSettings.AlertRuleTags).MustMap()
-	lbls := make(map[string]string, len(tagsMap))
-
-	for k, v := range tagsMap {
-		lbls[k] = simplejson.NewFromAny(v).MustString()
-	}
-
-	annotations := make(map[string]string, 3)
-	annotations[ngmodels.DashboardUIDAnnotation] = dashboardUID
-	annotations[ngmodels.PanelIDAnnotation] = fmt.Sprintf("%v", da.PanelID)
-	annotations["__alertId__"] = fmt.Sprintf("%v", da.ID)
-
-	return lbls, annotations
-}
-
-// MigrateAlert migrates a single dashboard alert from legacy alerting to unified alerting.
-func (om *OrgMigration) migrateAlert(ctx context.Context, l log.Logger, da *migrationStore.DashAlert, info migmodels.DashboardUpgradeInfo) (*ngmodels.AlertRule, error) {
-	l.Debug("Migrating alert rule to Unified Alerting")
-	cond, err := transConditions(ctx, da, om.migrationStore)
-	if err != nil {
-		return nil, fmt.Errorf("transform conditions: %w", err)
-	}
-
-	lbls, annotations := addMigrationInfo(da, info.DashboardUID)
-
-	message := MigrateTmpl(l.New("field", "message"), da.Message)
-	annotations["message"] = message
-
-	data, err := migrateAlertRuleQueries(l, cond.Data)
-	if err != nil {
-		return nil, fmt.Errorf("failed to migrate alert rule queries: %w", err)
-	}
-
-	isPaused := false
-	if da.State == "paused" {
-		isPaused = true
-	}
-
-	// Here we ensure that the alert rule title is unique within the folder.
-	titleDedupSet := om.AlertTitleDeduplicator(info.NewFolderUID)
-	name := truncate(da.Name, store.AlertDefinitionMaxTitleLength)
-	if titleDedupSet.contains(name) {
-		dedupedName := titleDedupSet.deduplicate(name)
-		l.Debug("Duplicate alert rule name detected, renaming", "oldName", name, "newName", dedupedName)
-		name = dedupedName
-	}
-	titleDedupSet.add(name)
-
-	// Here we ensure that the alert rule group is unique within the folder.
-	// This is so that we don't have to ensure that the alerts rules have the same interval.
-	groupDedupSet := om.AlertTitleDeduplicator(info.NewFolderUID)
-	panelSuffix := fmt.Sprintf(" - %d", da.PanelID)
-	truncatedDashboard := truncate(info.DashboardName, store.AlertRuleMaxRuleGroupNameLength-len(panelSuffix))
-	groupName := fmt.Sprintf("%s%s", truncatedDashboard, panelSuffix) // Unique to this dash alert but still contains useful info.
-	if groupDedupSet.contains(groupName) {
-		dedupedGroupName := groupDedupSet.deduplicate(groupName)
-		l.Debug("Duplicate alert rule group name detected, renaming", "oldGroup", groupName, "newGroup", dedupedGroupName)
-		groupName = dedupedGroupName
-	}
-	groupDedupSet.add(groupName)
-
-	dashUID := info.DashboardUID
-	ar := &ngmodels.AlertRule{
-		OrgID:           da.OrgID,
-		Title:           name,
-		UID:             util.GenerateShortUID(),
-		Condition:       cond.Condition,
-		Data:            data,
-		IntervalSeconds: ruleAdjustInterval(da.Frequency),
-		Version:         1,
-		NamespaceUID:    info.NewFolderUID,
-		DashboardUID:    &dashUID,
-		PanelID:         &da.PanelID,
-		RuleGroup:       groupName,
-		For:             da.For,
-		Updated:         time.Now().UTC(),
-		Annotations:     annotations,
-		Labels:          lbls,
-		RuleGroupIndex:  1, // Every rule is in its own group.
-		IsPaused:        isPaused,
-		NoDataState:     transNoData(l, da.ParsedSettings.NoDataState),
-		ExecErrState:    transExecErr(l, da.ParsedSettings.ExecutionErrorState),
-	}
-
-	// Label for routing and silences.
-	n, v := getLabelForSilenceMatching(ar.UID)
-	ar.Labels[n] = v
-
-	if da.ParsedSettings.ExecutionErrorState == string(legacymodels.ExecutionErrorKeepState) {
-		if err := om.addErrorSilence(ar); err != nil {
-			om.log.Error("Alert migration error: failed to create silence for Error", "rule_name", ar.Title, "err", err)
-		}
-	}
-
-	if da.ParsedSettings.NoDataState == string(legacymodels.NoDataKeepState) {
-		if err := om.addNoDataSilence(ar); err != nil {
-			om.log.Error("Alert migration error: failed to create silence for NoData", "rule_name", ar.Title, "err", err)
-		}
-	}
-
-	return ar, nil
-}
-
-// migrateAlertRuleQueries attempts to fix alert rule queries so they can work in unified alerting. Queries of some data sources are not compatible with unified alerting.
-func migrateAlertRuleQueries(l log.Logger, data []ngmodels.AlertQuery) ([]ngmodels.AlertQuery, error) {
-	result := make([]ngmodels.AlertQuery, 0, len(data))
-	for _, d := range data {
-		// queries that are expression are not relevant, skip them.
-		if d.DatasourceUID == expressionDatasourceUID {
-			result = append(result, d)
-			continue
-		}
-		var fixedData map[string]json.RawMessage
-		err := json.Unmarshal(d.Model, &fixedData)
-		if err != nil {
-			return nil, err
-		}
-		// remove hidden tag from the query (if exists)
-		delete(fixedData, "hide")
-		fixedData = fixGraphiteReferencedSubQueries(fixedData)
-		fixedData = fixPrometheusBothTypeQuery(l, fixedData)
-		updatedModel, err := json.Marshal(fixedData)
-		if err != nil {
-			return nil, err
-		}
-		d.Model = updatedModel
-		result = append(result, d)
-	}
-	return result, nil
-}
-
-// fixGraphiteReferencedSubQueries attempts to fix graphite referenced sub queries, given unified alerting does not support this.
-// targetFull of Graphite data source contains the expanded version of field 'target', so let's copy that.
-func fixGraphiteReferencedSubQueries(queryData map[string]json.RawMessage) map[string]json.RawMessage {
-	fullQuery, ok := queryData[graphite.TargetFullModelField]
-	if ok {
-		delete(queryData, graphite.TargetFullModelField)
-		queryData[graphite.TargetModelField] = fullQuery
-	}
-
-	return queryData
-}
-
-// fixPrometheusBothTypeQuery converts Prometheus 'Both' type queries to range queries.
-func fixPrometheusBothTypeQuery(l log.Logger, queryData map[string]json.RawMessage) map[string]json.RawMessage {
-	// There is the possibility to support this functionality by:
-	//	- Splitting the query into two: one for instant and one for range.
-	//  - Splitting the condition into two: one for each query, separated by OR.
-	// However, relying on a 'Both' query instead of multiple conditions to do this in legacy is likely
-	// to be unintentional. In addition, this would require more robust operator precedence in classic conditions.
-	// Given these reasons, we opt to convert them to range queries and log a warning.
-
-	var instant bool
-	if instantRaw, ok := queryData["instant"]; ok {
-		if err := json.Unmarshal(instantRaw, &instant); err != nil {
-			// Nothing to do here, we can't parse the instant field.
-			if isPrometheus, _ := isPrometheusQuery(queryData); isPrometheus {
-				l.Info("Failed to parse instant field on Prometheus query", "instant", string(instantRaw), "err", err)
-			}
-			return queryData
-		}
-	}
-	var rng bool
-	if rangeRaw, ok := queryData["range"]; ok {
-		if err := json.Unmarshal(rangeRaw, &rng); err != nil {
-			// Nothing to do here, we can't parse the range field.
-			if isPrometheus, _ := isPrometheusQuery(queryData); isPrometheus {
-				l.Info("Failed to parse range field on Prometheus query", "range", string(rangeRaw), "err", err)
-			}
-			return queryData
-		}
-	}
-
-	if !instant || !rng {
-		// Only apply this fix to 'Both' type queries.
-		return queryData
-	}
-
-	isPrometheus, err := isPrometheusQuery(queryData)
-	if err != nil {
-		l.Info("Unable to convert alert rule that resembles a Prometheus 'Both' type query to 'Range'", "err", err)
-		return queryData
-	}
-	if !isPrometheus {
-		// Only apply this fix to Prometheus.
-		return queryData
-	}
-
-	// Convert 'Both' type queries to `Range` queries by disabling the `Instant` portion.
-	l.Warn("Prometheus 'Both' type queries are not supported in unified alerting. Converting to range query.")
-	queryData["instant"] = []byte("false")
-
-	return queryData
-}
-
-// isPrometheusQuery checks if the query is for Prometheus.
-func isPrometheusQuery(queryData map[string]json.RawMessage) (bool, error) {
-	ds, ok := queryData["datasource"]
-	if !ok {
-		return false, fmt.Errorf("missing datasource field")
-	}
-	var datasource struct {
-		Type string `json:"type"`
-	}
-	if err := json.Unmarshal(ds, &datasource); err != nil {
-		return false, fmt.Errorf("failed to parse datasource '%s': %w", string(ds), err)
-	}
-	if datasource.Type == "" {
-		return false, fmt.Errorf("missing type field '%s'", string(ds))
-	}
-	return datasource.Type == "prometheus", nil
-}
-
-func ruleAdjustInterval(freq int64) int64 {
-	// 10 corresponds to the SchedulerCfg, but TODO not worrying about fetching for now.
-	var baseFreq int64 = 10
-	if freq <= baseFreq {
-		return 10
-	}
-	return freq - (freq % baseFreq)
-}
-
-func transNoData(l log.Logger, s string) ngmodels.NoDataState {
-	switch legacymodels.NoDataOption(s) {
-	case legacymodels.NoDataSetOK:
-		return ngmodels.OK // values from ngalert/models/rule
-	case "", legacymodels.NoDataSetNoData:
-		return ngmodels.NoData
-	case legacymodels.NoDataSetAlerting:
-		return ngmodels.Alerting
-	case legacymodels.NoDataKeepState:
-		return ngmodels.NoData // "keep last state" translates to no data because we now emit a special alert when the state is "noData". The result is that the evaluation will not return firing and instead we'll raise the special alert.
-	default:
-		l.Warn("Unable to translate execution of NoData state. Using default execution", "old", s, "new", ngmodels.NoData)
-		return ngmodels.NoData
-	}
-}
-
-func transExecErr(l log.Logger, s string) ngmodels.ExecutionErrorState {
-	switch legacymodels.ExecutionErrorOption(s) {
-	case "", legacymodels.ExecutionErrorSetAlerting:
-		return ngmodels.AlertingErrState
-	case legacymodels.ExecutionErrorKeepState:
-		// Keep last state is translated to error as we now emit a
-		// DatasourceError alert when the state is error
-		return ngmodels.ErrorErrState
-	case legacymodels.ExecutionErrorSetOk:
-		return ngmodels.OkErrState
-	default:
-		l.Warn("Unable to translate execution of Error state. Using default execution", "old", s, "new", ngmodels.ErrorErrState)
-		return ngmodels.ErrorErrState
-	}
-}
-
-// truncate truncates the given name to the maximum allowed length.
-func truncate(daName string, length int) string {
-	if len(daName) > length {
-		return daName[:length]
-	}
-	return daName
-}
-
-func extractChannelIDs(d *migrationStore.DashAlert) (channelUids []migrationStore.UidOrID) {
-	// Extracting channel UID/ID.
-	for _, ui := range d.ParsedSettings.Notifications {
-		if ui.UID != "" {
-			channelUids = append(channelUids, ui.UID)
-			continue
-		}
-		// In certain circumstances, id is used instead of uid.
-		// We add this if there was no uid.
-		if ui.ID > 0 {
-			channelUids = append(channelUids, ui.ID)
-		}
-	}
-
-	return channelUids
-}
diff --git a/pkg/services/ngalert/migration/alert_rule_test.go b/pkg/services/ngalert/migration/alert_rule_test.go
deleted file mode 100644
index 49296ea0bc454..0000000000000
--- a/pkg/services/ngalert/migration/alert_rule_test.go
+++ /dev/null
@@ -1,318 +0,0 @@
-package migration
-
-import (
-	"context"
-	"fmt"
-	"strings"
-	"testing"
-
-	"github.com/google/uuid"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/infra/log/logtest"
-	legacymodels "github.com/grafana/grafana/pkg/services/alerting/models"
-	migmodels "github.com/grafana/grafana/pkg/services/ngalert/migration/models"
-	migrationStore "github.com/grafana/grafana/pkg/services/ngalert/migration/store"
-	"github.com/grafana/grafana/pkg/services/ngalert/models"
-	"github.com/grafana/grafana/pkg/services/ngalert/store"
-)
-
-func TestMigrateAlertRuleQueries(t *testing.T) {
-	tc := []struct {
-		name     string
-		input    *simplejson.Json
-		expected string
-		err      error
-	}{
-		{
-			name:     "when a query has a sub query - it is extracted",
-			input:    simplejson.NewFromAny(map[string]any{"targetFull": "thisisafullquery", "target": "ahalfquery"}),
-			expected: `{"target":"thisisafullquery"}`,
-		},
-		{
-			name:     "when a query does not have a sub query - it no-ops",
-			input:    simplejson.NewFromAny(map[string]any{"target": "ahalfquery"}),
-			expected: `{"target":"ahalfquery"}`,
-		},
-		{
-			name:     "when query was hidden, it removes the flag",
-			input:    simplejson.NewFromAny(map[string]any{"hide": true}),
-			expected: `{}`,
-		},
-		{
-			name: "when prometheus both type query, convert to range",
-			input: simplejson.NewFromAny(map[string]any{
-				"datasource": map[string]string{
-					"type": "prometheus",
-				},
-				"instant": true,
-				"range":   true,
-			}),
-			expected: `{"datasource":{"type":"prometheus"},"instant":false,"range":true}`,
-		},
-		{
-			name: "when prometheus instant type query, do nothing",
-			input: simplejson.NewFromAny(map[string]any{
-				"datasource": map[string]string{
-					"type": "prometheus",
-				},
-				"instant": true,
-			}),
-			expected: `{"datasource":{"type":"prometheus"},"instant":true}`,
-		},
-		{
-			name: "when non-prometheus with instant and range, do nothing",
-			input: simplejson.NewFromAny(map[string]any{
-				"datasource": map[string]string{
-					"type": "something",
-				},
-				"instant": true,
-				"range":   true,
-			}),
-			expected: `{"datasource":{"type":"something"},"instant":true,"range":true}`,
-		},
-	}
-
-	for _, tt := range tc {
-		t.Run(tt.name, func(t *testing.T) {
-			model, err := tt.input.Encode()
-			require.NoError(t, err)
-			queries, err := migrateAlertRuleQueries(&logtest.Fake{}, []models.AlertQuery{{Model: model}})
-			if tt.err != nil {
-				require.Error(t, err)
-				require.EqualError(t, err, tt.err.Error())
-				return
-			}
-
-			require.NoError(t, err)
-			r, err := queries[0].Model.MarshalJSON()
-			require.NoError(t, err)
-			require.JSONEq(t, tt.expected, string(r))
-		})
-	}
-}
-
-func TestAddMigrationInfo(t *testing.T) {
-	tt := []struct {
-		name                string
-		alert               *migrationStore.DashAlert
-		dashboard           string
-		expectedLabels      map[string]string
-		expectedAnnotations map[string]string
-	}{
-		{
-			name:                "when alert rule tags are a JSON array, they're ignored.",
-			alert:               &migrationStore.DashAlert{Alert: &legacymodels.Alert{ID: 43, PanelID: 42}, ParsedSettings: &migrationStore.DashAlertSettings{AlertRuleTags: []string{"one", "two", "three", "four"}}},
-			dashboard:           "dashboard",
-			expectedLabels:      map[string]string{},
-			expectedAnnotations: map[string]string{"__alertId__": "43", "__dashboardUid__": "dashboard", "__panelId__": "42"},
-		},
-		{
-			name:                "when alert rule tags are a JSON object",
-			alert:               &migrationStore.DashAlert{Alert: &legacymodels.Alert{ID: 43, PanelID: 42}, ParsedSettings: &migrationStore.DashAlertSettings{AlertRuleTags: map[string]any{"key": "value", "key2": "value2"}}},
-			dashboard:           "dashboard",
-			expectedLabels:      map[string]string{"key": "value", "key2": "value2"},
-			expectedAnnotations: map[string]string{"__alertId__": "43", "__dashboardUid__": "dashboard", "__panelId__": "42"},
-		},
-	}
-
-	for _, tc := range tt {
-		t.Run(tc.name, func(t *testing.T) {
-			labels, annotations := addMigrationInfo(tc.alert, tc.dashboard)
-			require.Equal(t, tc.expectedLabels, labels)
-			require.Equal(t, tc.expectedAnnotations, annotations)
-		})
-	}
-}
-
-func TestMakeAlertRule(t *testing.T) {
-	sqlStore := db.InitTestDB(t)
-	info := migmodels.DashboardUpgradeInfo{
-		DashboardUID:  "dashboarduid",
-		DashboardName: "dashboardname",
-		NewFolderUID:  "ewfolderuid",
-		NewFolderName: "newfoldername",
-	}
-	t.Run("when mapping rule names", func(t *testing.T) {
-		t.Run("leaves basic names untouched", func(t *testing.T) {
-			service := NewTestMigrationService(t, sqlStore, nil)
-			m := service.newOrgMigration(1)
-			da := createTestDashAlert()
-
-			ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
-
-			require.NoError(t, err)
-			require.Equal(t, da.Name, ar.Title)
-		})
-
-		t.Run("truncates very long names to max length", func(t *testing.T) {
-			service := NewTestMigrationService(t, sqlStore, nil)
-			m := service.newOrgMigration(1)
-			da := createTestDashAlert()
-			da.Name = strings.Repeat("a", store.AlertDefinitionMaxTitleLength+1)
-
-			ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
-
-			require.NoError(t, err)
-			require.Len(t, ar.Title, store.AlertDefinitionMaxTitleLength)
-		})
-
-		t.Run("deduplicate names in same org and folder", func(t *testing.T) {
-			service := NewTestMigrationService(t, sqlStore, nil)
-			m := service.newOrgMigration(1)
-			da := createTestDashAlert()
-			da.Name = strings.Repeat("a", store.AlertDefinitionMaxTitleLength+1)
-
-			ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
-
-			require.NoError(t, err)
-			require.Len(t, ar.Title, store.AlertDefinitionMaxTitleLength)
-
-			da = createTestDashAlert()
-			da.Name = strings.Repeat("a", store.AlertDefinitionMaxTitleLength+1)
-
-			ar, err = m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
-
-			require.NoError(t, err)
-			require.Len(t, ar.Title, store.AlertDefinitionMaxTitleLength)
-			parts := strings.SplitN(ar.Title, "_", 2)
-			require.Len(t, parts, 2)
-			require.Greater(t, len(parts[1]), 8, "unique identifier should be longer than 9 characters")
-			require.Equal(t, store.AlertDefinitionMaxTitleLength-1, len(parts[0])+len(parts[1]), "truncated name + underscore + unique identifier should together be DefaultFieldMaxLength")
-		})
-	})
-
-	t.Run("alert is not paused", func(t *testing.T) {
-		service := NewTestMigrationService(t, sqlStore, nil)
-		m := service.newOrgMigration(1)
-		da := createTestDashAlert()
-
-		ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
-		require.NoError(t, err)
-		require.False(t, ar.IsPaused)
-	})
-
-	t.Run("paused dash alert is paused", func(t *testing.T) {
-		service := NewTestMigrationService(t, sqlStore, nil)
-		m := service.newOrgMigration(1)
-		da := createTestDashAlert()
-		da.State = "paused"
-
-		ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
-		require.NoError(t, err)
-		require.True(t, ar.IsPaused)
-	})
-
-	t.Run("use default if execution of NoData is not known", func(t *testing.T) {
-		service := NewTestMigrationService(t, sqlStore, nil)
-		m := service.newOrgMigration(1)
-		da := createTestDashAlert()
-		da.ParsedSettings.NoDataState = uuid.NewString()
-
-		ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
-		require.Nil(t, err)
-		require.Equal(t, models.NoData, ar.NoDataState)
-	})
-
-	t.Run("use default if execution of Error is not known", func(t *testing.T) {
-		service := NewTestMigrationService(t, sqlStore, nil)
-		m := service.newOrgMigration(1)
-		da := createTestDashAlert()
-		da.ParsedSettings.ExecutionErrorState = uuid.NewString()
-
-		ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
-		require.Nil(t, err)
-		require.Equal(t, models.ErrorErrState, ar.ExecErrState)
-	})
-
-	t.Run("migrate message template", func(t *testing.T) {
-		service := NewTestMigrationService(t, sqlStore, nil)
-		m := service.newOrgMigration(1)
-		da := createTestDashAlert()
-		da.Message = "Instance ${instance} is down"
-
-		ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
-		require.Nil(t, err)
-		expected :=
-			"{{- $mergedLabels := mergeLabelValues $values -}}\n" +
-				"Instance {{$mergedLabels.instance}} is down"
-		require.Equal(t, expected, ar.Annotations["message"])
-	})
-
-	t.Run("create unique group from dashboard title and panel", func(t *testing.T) {
-		service := NewTestMigrationService(t, sqlStore, nil)
-		m := service.newOrgMigration(1)
-		da := createTestDashAlert()
-		da.PanelID = 42
-
-		ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
-
-		require.NoError(t, err)
-		require.Equal(t, fmt.Sprintf("%s - %d", info.DashboardName, da.PanelID), ar.RuleGroup)
-	})
-
-	t.Run("truncate rule group if dashboard name + panel id is too long", func(t *testing.T) {
-		service := NewTestMigrationService(t, sqlStore, nil)
-		m := service.newOrgMigration(1)
-		da := createTestDashAlert()
-		da.PanelID = 42
-		info := migmodels.DashboardUpgradeInfo{
-			DashboardUID:  "dashboarduid",
-			DashboardName: strings.Repeat("a", store.AlertRuleMaxRuleGroupNameLength-1),
-			NewFolderUID:  "newfolderuid",
-			NewFolderName: "newfoldername",
-		}
-
-		ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
-
-		require.NoError(t, err)
-		require.Len(t, ar.RuleGroup, store.AlertRuleMaxRuleGroupNameLength)
-		require.Equal(t, fmt.Sprintf("%s - %d", strings.Repeat("a", store.AlertRuleMaxRuleGroupNameLength-5), da.PanelID), ar.RuleGroup)
-	})
-
-	t.Run("deduplicate rule group name if truncation is not unique", func(t *testing.T) {
-		service := NewTestMigrationService(t, sqlStore, nil)
-		m := service.newOrgMigration(1)
-		da := createTestDashAlert()
-		da.PanelID = 42
-		info := migmodels.DashboardUpgradeInfo{
-			DashboardUID:  "dashboarduid",
-			DashboardName: strings.Repeat("a", store.AlertRuleMaxRuleGroupNameLength-1),
-			NewFolderUID:  "newfolderuid",
-			NewFolderName: "newfoldername",
-		}
-
-		_, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
-		require.NoError(t, err)
-
-		da = createTestDashAlert()
-		da.PanelID = 42
-		info = migmodels.DashboardUpgradeInfo{
-			DashboardUID:  "dashboarduid",
-			DashboardName: strings.Repeat("a", store.AlertRuleMaxRuleGroupNameLength-1),
-			NewFolderUID:  "newfolderuid",
-			NewFolderName: "newfoldername",
-		}
-
-		ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
-
-		require.NoError(t, err)
-		require.Len(t, ar.RuleGroup, store.AlertRuleMaxRuleGroupNameLength)
-		parts := strings.SplitN(ar.RuleGroup, "_", 2)
-		require.Len(t, parts, 2)
-		require.Greater(t, len(parts[1]), 8, "unique identifier should be longer than 9 characters")
-		require.Equal(t, store.AlertDefinitionMaxTitleLength-1, len(parts[0])+len(parts[1]), "truncated name + underscore + unique identifier should together be DefaultFieldMaxLength")
-	})
-}
-
-func createTestDashAlert() migrationStore.DashAlert {
-	return migrationStore.DashAlert{
-		Alert: &legacymodels.Alert{
-			ID:   1,
-			Name: "test",
-		},
-		ParsedSettings: &migrationStore.DashAlertSettings{},
-	}
-}
diff --git a/pkg/services/ngalert/migration/channel.go b/pkg/services/ngalert/migration/channel.go
deleted file mode 100644
index 35455f7172a97..0000000000000
--- a/pkg/services/ngalert/migration/channel.go
+++ /dev/null
@@ -1,440 +0,0 @@
-package migration
-
-import (
-	"context"
-	"crypto/md5"
-	"encoding/base64"
-	"fmt"
-	"regexp"
-	"sort"
-	"strings"
-	"time"
-
-	alertingNotify "github.com/grafana/alerting/notify"
-	"github.com/prometheus/alertmanager/config"
-	"github.com/prometheus/alertmanager/pkg/labels"
-	"github.com/prometheus/common/model"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	legacymodels "github.com/grafana/grafana/pkg/services/alerting/models"
-	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
-	migrationStore "github.com/grafana/grafana/pkg/services/ngalert/migration/store"
-	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
-	"github.com/grafana/grafana/pkg/services/secrets"
-	"github.com/grafana/grafana/pkg/util"
-)
-
-const (
-	// DisabledRepeatInterval is a large duration that will be used as a pseudo-disable in case a legacy channel doesn't have SendReminders enabled.
-	DisabledRepeatInterval = model.Duration(time.Duration(8736) * time.Hour) // 1y
-)
-
-// channelReceiver is a convenience struct that contains a notificationChannel and its corresponding migrated PostableApiReceiver.
-type channelReceiver struct {
-	channel  *legacymodels.AlertNotification
-	receiver *apimodels.PostableApiReceiver
-}
-
-// setupAlertmanagerConfigs creates Alertmanager configs with migrated receivers and routes.
-func (om *OrgMigration) migrateChannels(allChannels []*legacymodels.AlertNotification, pairs []*AlertPair) (*apimodels.PostableUserConfig, error) {
-	var defaultChannels []*legacymodels.AlertNotification
-	var channels []*legacymodels.AlertNotification
-	for _, c := range allChannels {
-		if c.Type == "hipchat" || c.Type == "sensu" {
-			om.log.Error("Alert migration error: discontinued notification channel found", "type", c.Type, "name", c.Name, "uid", c.UID)
-			continue
-		}
-
-		if c.IsDefault {
-			defaultChannels = append(defaultChannels, c)
-		}
-		channels = append(channels, c)
-	}
-
-	amConfig := &apimodels.PostableUserConfig{
-		AlertmanagerConfig: apimodels.PostableApiAlertingConfig{
-			Receivers: make([]*apimodels.PostableApiReceiver, 0),
-		},
-	}
-
-	// Create all newly migrated receivers from legacy notification channels.
-	receiversMap, receivers, err := om.createReceivers(channels)
-	if err != nil {
-		return nil, fmt.Errorf("create receiver: %w", err)
-	}
-
-	// No need to create an Alertmanager configuration if there are no receivers left that aren't obsolete.
-	if len(receivers) == 0 {
-		om.log.Warn("No available receivers")
-		return nil, nil
-	}
-
-	for _, cr := range receivers {
-		amConfig.AlertmanagerConfig.Receivers = append(amConfig.AlertmanagerConfig.Receivers, cr.receiver)
-	}
-
-	defaultReceivers := make(map[string]struct{})
-	// If the organization has default channels build a map of default receivers, used to create alert-specific routes later.
-	for _, c := range defaultChannels {
-		defaultReceivers[c.Name] = struct{}{}
-	}
-	defaultReceiver, defaultRoute, err := om.createDefaultRouteAndReceiver(defaultChannels)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create default route & receiver in orgId %d: %w", om.orgID, err)
-	}
-	amConfig.AlertmanagerConfig.Route = defaultRoute
-	if defaultReceiver != nil {
-		amConfig.AlertmanagerConfig.Receivers = append(amConfig.AlertmanagerConfig.Receivers, defaultReceiver)
-	}
-
-	for _, cr := range receivers {
-		route, err := createRoute(cr)
-		if err != nil {
-			return nil, fmt.Errorf("failed to create route for receiver %s in orgId %d: %w", cr.receiver.Name, om.orgID, err)
-		}
-
-		amConfig.AlertmanagerConfig.Route.Routes = append(amConfig.AlertmanagerConfig.Route.Routes, route)
-	}
-
-	for _, pair := range pairs {
-		channelUids := extractChannelIDs(pair.DashAlert)
-		filteredReceiverNames := om.filterReceiversForAlert(pair.AlertRule.Title, channelUids, receiversMap, defaultReceivers)
-
-		if len(filteredReceiverNames) != 0 {
-			// Only create a contact label if there are specific receivers, otherwise it defaults to the root-level route.
-			pair.AlertRule.Labels[ContactLabel] = contactListToString(filteredReceiverNames)
-		}
-	}
-
-	// Validate the alertmanager configuration produced, this gives a chance to catch bad configuration at migration time.
-	// Validation between legacy and unified alerting can be different (e.g. due to bug fixes) so this would fail the migration in that case.
-	if err := om.validateAlertmanagerConfig(amConfig); err != nil {
-		return nil, fmt.Errorf("failed to validate AlertmanagerConfig in orgId %d: %w", om.orgID, err)
-	}
-
-	return amConfig, nil
-}
-
-// validateAlertmanagerConfig validates the alertmanager configuration produced by the migration against the receivers.
-func (om *OrgMigration) validateAlertmanagerConfig(config *apimodels.PostableUserConfig) error {
-	for _, r := range config.AlertmanagerConfig.Receivers {
-		for _, gr := range r.GrafanaManagedReceivers {
-			data, err := gr.Settings.MarshalJSON()
-			if err != nil {
-				return err
-			}
-			var (
-				cfg = &alertingNotify.GrafanaIntegrationConfig{
-					UID:                   gr.UID,
-					Name:                  gr.Name,
-					Type:                  gr.Type,
-					DisableResolveMessage: gr.DisableResolveMessage,
-					Settings:              data,
-					SecureSettings:        gr.SecureSettings,
-				}
-			)
-
-			_, err = alertingNotify.BuildReceiverConfiguration(context.Background(), &alertingNotify.APIReceiver{
-				GrafanaIntegrations: alertingNotify.GrafanaIntegrations{Integrations: []*alertingNotify.GrafanaIntegrationConfig{cfg}},
-			}, om.encryptionService.GetDecryptedValue)
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-// contactListToString creates a sorted string representation of a given map (set) of receiver names. Each name will be comma-separated and double-quoted. Names should not contain double quotes.
-func contactListToString(m map[string]any) string {
-	keys := make([]string, 0, len(m))
-	for k := range m {
-		keys = append(keys, quote(k))
-	}
-	sort.Strings(keys)
-
-	return strings.Join(keys, ",")
-}
-
-// quote will surround the given string in double quotes.
-func quote(s string) string {
-	return `"` + s + `"`
-}
-
-// Create a notifier (PostableGrafanaReceiver) from a legacy notification channel
-func (om *OrgMigration) createNotifier(c *legacymodels.AlertNotification) (*apimodels.PostableGrafanaReceiver, error) {
-	uid, err := om.determineChannelUid(c)
-	if err != nil {
-		return nil, err
-	}
-
-	settings, secureSettings, err := om.migrateSettingsToSecureSettings(c.Type, c.Settings, c.SecureSettings)
-	if err != nil {
-		return nil, err
-	}
-
-	data, err := settings.MarshalJSON()
-	if err != nil {
-		return nil, err
-	}
-
-	return &apimodels.PostableGrafanaReceiver{
-		UID:                   uid,
-		Name:                  c.Name,
-		Type:                  c.Type,
-		DisableResolveMessage: c.DisableResolveMessage,
-		Settings:              data,
-		SecureSettings:        secureSettings,
-	}, nil
-}
-
-// Create one receiver for every unique notification channel.
-func (om *OrgMigration) createReceivers(allChannels []*legacymodels.AlertNotification) (map[migrationStore.UidOrID]*apimodels.PostableApiReceiver, []channelReceiver, error) {
-	receivers := make([]channelReceiver, 0, len(allChannels))
-	receiversMap := make(map[migrationStore.UidOrID]*apimodels.PostableApiReceiver)
-
-	set := make(map[string]struct{}) // Used to deduplicate sanitized names.
-	for _, c := range allChannels {
-		notifier, err := om.createNotifier(c)
-		if err != nil {
-			return nil, nil, err
-		}
-
-		// We remove double quotes because this character will be used as the separator in the ContactLabel. To prevent partial matches in the Route Matcher we choose to sanitize them early on instead of complicating the Matcher regex.
-		sanitizedName := strings.ReplaceAll(c.Name, `"`, `_`)
-		// There can be name collisions after we sanitize. We check for this and attempt to make the name unique again using a short hash of the original name.
-		if _, ok := set[sanitizedName]; ok {
-			sanitizedName = sanitizedName + fmt.Sprintf("_%.3x", md5.Sum([]byte(c.Name)))
-			om.log.Warn("Alert contains duplicate contact name after sanitization, appending unique suffix", "type", c.Type, "name", c.Name, "new_name", sanitizedName, "uid", c.UID)
-		}
-		notifier.Name = sanitizedName
-
-		set[sanitizedName] = struct{}{}
-
-		cr := channelReceiver{
-			channel: c,
-			receiver: &apimodels.PostableApiReceiver{
-				Receiver: config.Receiver{
-					Name: sanitizedName, // Channel name is unique within an Org.
-				},
-				PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{
-					GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{notifier},
-				},
-			},
-		}
-
-		receivers = append(receivers, cr)
-
-		// Store receivers for creating routes from alert rules later.
-		if c.UID != "" {
-			receiversMap[c.UID] = cr.receiver
-		}
-		if c.ID != 0 {
-			// In certain circumstances, the alert rule uses ID instead of uid. So, we add this to be able to lookup by ID in case.
-			receiversMap[c.ID] = cr.receiver
-		}
-	}
-
-	return receiversMap, receivers, nil
-}
-
-// Create the root-level route with the default receiver. If no new receiver is created specifically for the root-level route, the returned receiver will be nil.
-func (om *OrgMigration) createDefaultRouteAndReceiver(defaultChannels []*legacymodels.AlertNotification) (*apimodels.PostableApiReceiver, *apimodels.Route, error) {
-	defaultReceiverName := "autogen-contact-point-default"
-	defaultRoute := &apimodels.Route{
-		Receiver:       defaultReceiverName,
-		Routes:         make([]*apimodels.Route, 0),
-		GroupByStr:     []string{ngmodels.FolderTitleLabel, model.AlertNameLabel}, // To keep parity with pre-migration notifications.
-		RepeatInterval: nil,
-	}
-	newDefaultReceiver := &apimodels.PostableApiReceiver{
-		Receiver: config.Receiver{
-			Name: defaultReceiverName,
-		},
-		PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{
-			GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{},
-		},
-	}
-
-	// Return early if there are no default channels
-	if len(defaultChannels) == 0 {
-		return newDefaultReceiver, defaultRoute, nil
-	}
-
-	repeatInterval := DisabledRepeatInterval // If no channels have SendReminders enabled, we will use this large value as a pseudo-disable.
-	if len(defaultChannels) > 1 {
-		// If there are more than one default channels we create a separate contact group that is used only in the root policy. This is to simplify the migrated notification policy structure.
-		// If we ever allow more than one receiver per route this won't be necessary.
-		for _, c := range defaultChannels {
-			// Need to create a new notifier to prevent uid conflict.
-			defaultNotifier, err := om.createNotifier(c)
-			if err != nil {
-				return nil, nil, err
-			}
-
-			newDefaultReceiver.GrafanaManagedReceivers = append(newDefaultReceiver.GrafanaManagedReceivers, defaultNotifier)
-
-			// Choose the lowest send reminder duration from all the notifiers to use for default route.
-			if c.SendReminder && c.Frequency < time.Duration(repeatInterval) {
-				repeatInterval = model.Duration(c.Frequency)
-			}
-		}
-	} else {
-		// If there is only a single default channel, we don't need a separate receiver to hold it. We can reuse the existing receiver for that single notifier.
-		defaultRoute.Receiver = defaultChannels[0].Name
-		if defaultChannels[0].SendReminder {
-			repeatInterval = model.Duration(defaultChannels[0].Frequency)
-		}
-
-		// No need to create a new receiver.
-		newDefaultReceiver = nil
-	}
-	defaultRoute.RepeatInterval = &repeatInterval
-
-	return newDefaultReceiver, defaultRoute, nil
-}
-
-// Create one route per contact point, matching based on ContactLabel.
-func createRoute(cr channelReceiver) (*apimodels.Route, error) {
-	// We create a regex matcher so that each alert rule need only have a single ContactLabel entry for all contact points it sends to.
-	// For example, if an alert needs to send to contact1 and contact2 it will have ContactLabel=`"contact1","contact2"` and will match both routes looking
-	// for `.*"contact1".*` and `.*"contact2".*`.
-
-	// We quote and escape here to ensure the regex will correctly match the ContactLabel on the alerts.
-	name := fmt.Sprintf(`.*%s.*`, regexp.QuoteMeta(quote(cr.receiver.Name)))
-	mat, err := labels.NewMatcher(labels.MatchRegexp, ContactLabel, name)
-	if err != nil {
-		return nil, err
-	}
-
-	repeatInterval := DisabledRepeatInterval
-	if cr.channel.SendReminder {
-		repeatInterval = model.Duration(cr.channel.Frequency)
-	}
-
-	return &apimodels.Route{
-		Receiver:       cr.receiver.Name,
-		ObjectMatchers: apimodels.ObjectMatchers{mat},
-		Continue:       true, // We continue so that each sibling contact point route can separately match.
-		RepeatInterval: &repeatInterval,
-	}, nil
-}
-
-// Filter receivers to select those that were associated to the given rule as channels.
-func (om *OrgMigration) filterReceiversForAlert(name string, channelIDs []migrationStore.UidOrID, receivers map[migrationStore.UidOrID]*apimodels.PostableApiReceiver, defaultReceivers map[string]struct{}) map[string]any {
-	if len(channelIDs) == 0 {
-		// If there are no channels associated, we use the default route.
-		return nil
-	}
-
-	// Filter receiver names.
-	filteredReceiverNames := make(map[string]any)
-	for _, uidOrId := range channelIDs {
-		recv, ok := receivers[uidOrId]
-		if ok {
-			filteredReceiverNames[recv.Name] = struct{}{} // Deduplicate on contact point name.
-		} else {
-			om.log.Warn("Alert linked to obsolete notification channel, ignoring", "alert", name, "uid", uidOrId)
-		}
-	}
-
-	coveredByDefault := func(names map[string]any) bool {
-		// Check if all receivers are also default ones and if so, just use the default route.
-		for n := range names {
-			if _, ok := defaultReceivers[n]; !ok {
-				return false
-			}
-		}
-		return true
-	}
-
-	if len(filteredReceiverNames) == 0 || coveredByDefault(filteredReceiverNames) {
-		// Use the default route instead.
-		return nil
-	}
-
-	// Add default receivers alongside rule-specific ones.
-	for n := range defaultReceivers {
-		filteredReceiverNames[n] = struct{}{}
-	}
-
-	return filteredReceiverNames
-}
-
-func (om *OrgMigration) determineChannelUid(c *legacymodels.AlertNotification) (string, error) {
-	legacyUid := c.UID
-	if legacyUid == "" {
-		newUid := util.GenerateShortUID()
-		om.seenUIDs.add(newUid)
-		om.log.Info("Legacy notification had an empty uid, generating a new one", "id", c.ID, "uid", newUid)
-		return newUid, nil
-	}
-
-	if om.seenUIDs.contains(legacyUid) {
-		newUid := util.GenerateShortUID()
-		om.seenUIDs.add(newUid)
-		om.log.Warn("Legacy notification had a UID that collides with a migrated record, generating a new one", "id", c.ID, "old", legacyUid, "new", newUid)
-		return newUid, nil
-	}
-
-	om.seenUIDs.add(legacyUid)
-	return legacyUid, nil
-}
-
-var secureKeysToMigrate = map[string][]string{
-	"slack":                   {"url", "token"},
-	"pagerduty":               {"integrationKey"},
-	"webhook":                 {"password"},
-	"prometheus-alertmanager": {"basicAuthPassword"},
-	"opsgenie":                {"apiKey"},
-	"telegram":                {"bottoken"},
-	"line":                    {"token"},
-	"pushover":                {"apiToken", "userKey"},
-	"threema":                 {"api_secret"},
-}
-
-// Some settings were migrated from settings to secure settings in between.
-// See https://grafana.com/docs/grafana/latest/installation/upgrading/#ensure-encryption-of-existing-alert-notification-channel-secrets.
-// migrateSettingsToSecureSettings takes care of that.
-func (om *OrgMigration) migrateSettingsToSecureSettings(chanType string, settings *simplejson.Json, secureSettings SecureJsonData) (*simplejson.Json, map[string]string, error) {
-	keys := secureKeysToMigrate[chanType]
-	newSecureSettings := secureSettings.Decrypt()
-	cloneSettings := simplejson.New()
-	settingsMap, err := settings.Map()
-	if err != nil {
-		return nil, nil, err
-	}
-	for k, v := range settingsMap {
-		cloneSettings.Set(k, v)
-	}
-	for _, k := range keys {
-		if v, ok := newSecureSettings[k]; ok && v != "" {
-			continue
-		}
-
-		sv := cloneSettings.Get(k).MustString()
-		if sv != "" {
-			newSecureSettings[k] = sv
-			cloneSettings.Del(k)
-		}
-	}
-
-	err = om.encryptSecureSettings(newSecureSettings)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return cloneSettings, newSecureSettings, nil
-}
-
-func (om *OrgMigration) encryptSecureSettings(secureSettings map[string]string) error {
-	for key, value := range secureSettings {
-		encryptedData, err := om.encryptionService.Encrypt(context.Background(), []byte(value), secrets.WithoutScope())
-		if err != nil {
-			return fmt.Errorf("failed to encrypt secure settings: %w", err)
-		}
-		secureSettings[key] = base64.StdEncoding.EncodeToString(encryptedData)
-	}
-	return nil
-}
diff --git a/pkg/services/ngalert/migration/channel_test.go b/pkg/services/ngalert/migration/channel_test.go
deleted file mode 100644
index 88f4ddbbc453d..0000000000000
--- a/pkg/services/ngalert/migration/channel_test.go
+++ /dev/null
@@ -1,591 +0,0 @@
-package migration
-
-import (
-	"context"
-	"encoding/base64"
-	"encoding/json"
-	"testing"
-	"time"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/prometheus/alertmanager/config"
-	"github.com/prometheus/alertmanager/pkg/labels"
-	"github.com/prometheus/common/model"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/db"
-	legacymodels "github.com/grafana/grafana/pkg/services/alerting/models"
-	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
-	migrationStore "github.com/grafana/grafana/pkg/services/ngalert/migration/store"
-	ngModels "github.com/grafana/grafana/pkg/services/ngalert/models"
-	"github.com/grafana/grafana/pkg/services/ngalert/notifier/channels_config"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/util"
-)
-
-func TestFilterReceiversForAlert(t *testing.T) {
-	tc := []struct {
-		name             string
-		channelIds       []migrationStore.UidOrID
-		receivers        map[migrationStore.UidOrID]*apimodels.PostableApiReceiver
-		defaultReceivers map[string]struct{}
-		expected         map[string]any
-	}{
-		{
-			name:       "when an alert has multiple channels, each should filter for the correct receiver",
-			channelIds: []migrationStore.UidOrID{"uid1", "uid2"},
-			receivers: map[migrationStore.UidOrID]*apimodels.PostableApiReceiver{
-				"uid1": createPostableApiReceiver("recv1", nil),
-				"uid2": createPostableApiReceiver("recv2", nil),
-				"uid3": createPostableApiReceiver("recv3", nil),
-			},
-			defaultReceivers: map[string]struct{}{},
-			expected: map[string]any{
-				"recv1": struct{}{},
-				"recv2": struct{}{},
-			},
-		},
-		{
-			name:       "when default receivers exist, they should be added to an alert's filtered receivers",
-			channelIds: []migrationStore.UidOrID{"uid1"},
-			receivers: map[migrationStore.UidOrID]*apimodels.PostableApiReceiver{
-				"uid1": createPostableApiReceiver("recv1", nil),
-				"uid2": createPostableApiReceiver("recv2", nil),
-				"uid3": createPostableApiReceiver("recv3", nil),
-			},
-			defaultReceivers: map[string]struct{}{
-				"recv2": {},
-			},
-			expected: map[string]any{
-				"recv1": struct{}{}, // From alert
-				"recv2": struct{}{}, // From default
-			},
-		},
-		{
-			name:       "when an alert has a channels associated by ID instead of UID, it should be included",
-			channelIds: []migrationStore.UidOrID{int64(42)},
-			receivers: map[migrationStore.UidOrID]*apimodels.PostableApiReceiver{
-				int64(42): createPostableApiReceiver("recv1", nil),
-			},
-			defaultReceivers: map[string]struct{}{},
-			expected: map[string]any{
-				"recv1": struct{}{},
-			},
-		},
-		{
-			name:       "when an alert's receivers are covered by the defaults, return nil to use default receiver downstream",
-			channelIds: []migrationStore.UidOrID{"uid1"},
-			receivers: map[migrationStore.UidOrID]*apimodels.PostableApiReceiver{
-				"uid1": createPostableApiReceiver("recv1", nil),
-				"uid2": createPostableApiReceiver("recv2", nil),
-				"uid3": createPostableApiReceiver("recv3", nil),
-			},
-			defaultReceivers: map[string]struct{}{
-				"recv1": {},
-				"recv2": {},
-			},
-			expected: nil, // recv1 is already a default
-		},
-	}
-
-	sqlStore := db.InitTestDB(t)
-	for _, tt := range tc {
-		t.Run(tt.name, func(t *testing.T) {
-			service := NewTestMigrationService(t, sqlStore, nil)
-			m := service.newOrgMigration(1)
-			res := m.filterReceiversForAlert("", tt.channelIds, tt.receivers, tt.defaultReceivers)
-
-			require.Equal(t, tt.expected, res)
-		})
-	}
-}
-
-func TestCreateRoute(t *testing.T) {
-	tc := []struct {
-		name     string
-		channel  *legacymodels.AlertNotification
-		recv     *apimodels.PostableApiReceiver
-		expected *apimodels.Route
-	}{
-		{
-			name:    "when a receiver is passed in, the route should regex match based on quoted name with continue=true",
-			channel: &legacymodels.AlertNotification{},
-			recv:    createPostableApiReceiver("recv1", nil),
-			expected: &apimodels.Route{
-				Receiver:       "recv1",
-				ObjectMatchers: apimodels.ObjectMatchers{{Type: 2, Name: ContactLabel, Value: `.*"recv1".*`}},
-				Routes:         nil,
-				Continue:       true,
-				GroupByStr:     nil,
-				RepeatInterval: durationPointer(DisabledRepeatInterval),
-			},
-		},
-		{
-			name:    "notification channel should be escaped for regex in the matcher",
-			channel: &legacymodels.AlertNotification{},
-			recv:    createPostableApiReceiver(`. ^ $ * + - ? ( ) [ ] { } \ |`, nil),
-			expected: &apimodels.Route{
-				Receiver:       `. ^ $ * + - ? ( ) [ ] { } \ |`,
-				ObjectMatchers: apimodels.ObjectMatchers{{Type: 2, Name: ContactLabel, Value: `.*"\. \^ \$ \* \+ - \? \( \) \[ \] \{ \} \\ \|".*`}},
-				Routes:         nil,
-				Continue:       true,
-				GroupByStr:     nil,
-				RepeatInterval: durationPointer(DisabledRepeatInterval),
-			},
-		},
-		{
-			name:    "when a channel has sendReminder=true, the route should use the frequency in repeat interval",
-			channel: &legacymodels.AlertNotification{SendReminder: true, Frequency: time.Duration(42) * time.Hour},
-			recv:    createPostableApiReceiver("recv1", nil),
-			expected: &apimodels.Route{
-				Receiver:       "recv1",
-				ObjectMatchers: apimodels.ObjectMatchers{{Type: 2, Name: ContactLabel, Value: `.*"recv1".*`}},
-				Routes:         nil,
-				Continue:       true,
-				GroupByStr:     nil,
-				RepeatInterval: durationPointer(model.Duration(time.Duration(42) * time.Hour)),
-			},
-		},
-		{
-			name:    "when a channel has sendReminder=false, the route should ignore the frequency in repeat interval and use DisabledRepeatInterval",
-			channel: &legacymodels.AlertNotification{SendReminder: false, Frequency: time.Duration(42) * time.Hour},
-			recv:    createPostableApiReceiver("recv1", nil),
-			expected: &apimodels.Route{
-				Receiver:       "recv1",
-				ObjectMatchers: apimodels.ObjectMatchers{{Type: 2, Name: ContactLabel, Value: `.*"recv1".*`}},
-				Routes:         nil,
-				Continue:       true,
-				GroupByStr:     nil,
-				RepeatInterval: durationPointer(DisabledRepeatInterval),
-			},
-		},
-	}
-
-	for _, tt := range tc {
-		t.Run(tt.name, func(t *testing.T) {
-			res, err := createRoute(channelReceiver{
-				channel:  tt.channel,
-				receiver: tt.recv,
-			})
-			require.NoError(t, err)
-
-			// Order of nested routes is not guaranteed.
-			cOpt := []cmp.Option{
-				cmpopts.SortSlices(func(a, b *apimodels.Route) bool {
-					if a.Receiver != b.Receiver {
-						return a.Receiver < b.Receiver
-					}
-					return a.ObjectMatchers[0].Value < b.ObjectMatchers[0].Value
-				}),
-				cmpopts.IgnoreUnexported(apimodels.Route{}, labels.Matcher{}),
-			}
-
-			if !cmp.Equal(tt.expected, res, cOpt...) {
-				t.Errorf("Unexpected Route: %v", cmp.Diff(tt.expected, res, cOpt...))
-			}
-		})
-	}
-}
-
-func createNotChannel(t *testing.T, uid string, id int64, name string) *legacymodels.AlertNotification {
-	t.Helper()
-	return &legacymodels.AlertNotification{UID: uid, ID: id, Name: name, Settings: simplejson.New()}
-}
-
-func createNotChannelWithReminder(t *testing.T, uid string, id int64, name string, frequency time.Duration) *legacymodels.AlertNotification {
-	t.Helper()
-	return &legacymodels.AlertNotification{UID: uid, ID: id, Name: name, SendReminder: true, Frequency: frequency, Settings: simplejson.New()}
-}
-
-func TestCreateReceivers(t *testing.T) {
-	tc := []struct {
-		name            string
-		allChannels     []*legacymodels.AlertNotification
-		defaultChannels []*legacymodels.AlertNotification
-		expRecvMap      map[migrationStore.UidOrID]*apimodels.PostableApiReceiver
-		expRecv         []channelReceiver
-		expErr          error
-	}{
-		{
-			name:        "when given notification channels migrate them to receivers",
-			allChannels: []*legacymodels.AlertNotification{createNotChannel(t, "uid1", int64(1), "name1"), createNotChannel(t, "uid2", int64(2), "name2")},
-			expRecvMap: map[migrationStore.UidOrID]*apimodels.PostableApiReceiver{
-				"uid1":   createPostableApiReceiver("name1", []string{"name1"}),
-				"uid2":   createPostableApiReceiver("name2", []string{"name2"}),
-				int64(1): createPostableApiReceiver("name1", []string{"name1"}),
-				int64(2): createPostableApiReceiver("name2", []string{"name2"}),
-			},
-			expRecv: []channelReceiver{
-				{
-					channel:  createNotChannel(t, "uid1", int64(1), "name1"),
-					receiver: createPostableApiReceiver("name1", []string{"name1"}),
-				},
-				{
-					channel:  createNotChannel(t, "uid2", int64(2), "name2"),
-					receiver: createPostableApiReceiver("name2", []string{"name2"}),
-				},
-			},
-		},
-		{
-			name:        "when given notification channel contains double quote sanitize with underscore",
-			allChannels: []*legacymodels.AlertNotification{createNotChannel(t, "uid1", int64(1), "name\"1")},
-			expRecvMap: map[migrationStore.UidOrID]*apimodels.PostableApiReceiver{
-				"uid1":   createPostableApiReceiver("name_1", []string{"name_1"}),
-				int64(1): createPostableApiReceiver("name_1", []string{"name_1"}),
-			},
-			expRecv: []channelReceiver{
-				{
-					channel:  createNotChannel(t, "uid1", int64(1), "name\"1"),
-					receiver: createPostableApiReceiver("name_1", []string{"name_1"}),
-				},
-			},
-		},
-		{
-			name:        "when given notification channels collide after sanitization add short hash to end",
-			allChannels: []*legacymodels.AlertNotification{createNotChannel(t, "uid1", int64(1), "name\"1"), createNotChannel(t, "uid2", int64(2), "name_1")},
-			expRecvMap: map[migrationStore.UidOrID]*apimodels.PostableApiReceiver{
-				"uid1":   createPostableApiReceiver("name_1", []string{"name_1"}),
-				"uid2":   createPostableApiReceiver("name_1_dba13d", []string{"name_1_dba13d"}),
-				int64(1): createPostableApiReceiver("name_1", []string{"name_1"}),
-				int64(2): createPostableApiReceiver("name_1_dba13d", []string{"name_1_dba13d"}),
-			},
-			expRecv: []channelReceiver{
-				{
-					channel:  createNotChannel(t, "uid1", int64(1), "name\"1"),
-					receiver: createPostableApiReceiver("name_1", []string{"name_1"}),
-				},
-				{
-					channel:  createNotChannel(t, "uid2", int64(2), "name_1"),
-					receiver: createPostableApiReceiver("name_1_dba13d", []string{"name_1_dba13d"}),
-				},
-			},
-		},
-	}
-
-	sqlStore := db.InitTestDB(t)
-	for _, tt := range tc {
-		t.Run(tt.name, func(t *testing.T) {
-			service := NewTestMigrationService(t, sqlStore, nil)
-			m := service.newOrgMigration(1)
-			recvMap, recvs, err := m.createReceivers(tt.allChannels)
-			if tt.expErr != nil {
-				require.Error(t, err)
-				require.EqualError(t, err, tt.expErr.Error())
-				return
-			}
-
-			require.NoError(t, err)
-
-			// We ignore certain fields for the purposes of this test
-			for _, recv := range recvs {
-				for _, not := range recv.receiver.GrafanaManagedReceivers {
-					not.UID = ""
-					not.Settings = nil
-					not.SecureSettings = nil
-				}
-			}
-
-			require.Equal(t, tt.expRecvMap, recvMap)
-			require.ElementsMatch(t, tt.expRecv, recvs)
-		})
-	}
-}
-
-func TestMigrateNotificationChannelSecureSettings(t *testing.T) {
-	legacyEncryptFn := func(data string) string {
-		raw, err := util.Encrypt([]byte(data), setting.SecretKey)
-		require.NoError(t, err)
-		return string(raw)
-	}
-	decryptFn := func(data string, m *OrgMigration) string {
-		decoded, err := base64.StdEncoding.DecodeString(data)
-		require.NoError(t, err)
-		raw, err := m.encryptionService.Decrypt(context.Background(), decoded)
-		require.NoError(t, err)
-		return string(raw)
-	}
-	gen := func(nType string, fn func(channel *legacymodels.AlertNotification)) *legacymodels.AlertNotification {
-		not := &legacymodels.AlertNotification{
-			UID:  "uid",
-			ID:   1,
-			Name: "channel name",
-			Type: nType,
-			Settings: simplejson.NewFromAny(map[string]any{
-				"something": "some value",
-			}),
-			SecureSettings: map[string][]byte{},
-		}
-		if fn != nil {
-			fn(not)
-		}
-		return not
-	}
-	genExpSlack := func(fn func(channel *apimodels.PostableGrafanaReceiver)) *apimodels.PostableGrafanaReceiver {
-		rawSettings, err := json.Marshal(map[string]string{
-			"something": "some value",
-		})
-		require.NoError(t, err)
-
-		recv := &apimodels.PostableGrafanaReceiver{
-			UID:      "uid",
-			Name:     "channel name",
-			Type:     "slack",
-			Settings: rawSettings,
-			SecureSettings: map[string]string{
-				"token": "secure token",
-				"url":   "secure url",
-			},
-		}
-
-		if fn != nil {
-			fn(recv)
-		}
-		return recv
-	}
-
-	tc := []struct {
-		name    string
-		channel *legacymodels.AlertNotification
-		expRecv *apimodels.PostableGrafanaReceiver
-		expErr  error
-	}{
-		{
-			name: "when secure settings exist, migrate them to receiver secure settings",
-			channel: gen("slack", func(channel *legacymodels.AlertNotification) {
-				channel.SecureSettings = map[string][]byte{
-					"token": []byte(legacyEncryptFn("secure token")),
-					"url":   []byte(legacyEncryptFn("secure url")),
-				}
-			}),
-			expRecv: genExpSlack(nil),
-		},
-		{
-			name:    "when no secure settings are encrypted, do nothing",
-			channel: gen("slack", nil),
-			expRecv: genExpSlack(func(recv *apimodels.PostableGrafanaReceiver) {
-				delete(recv.SecureSettings, "token")
-				delete(recv.SecureSettings, "url")
-			}),
-		},
-		{
-			name: "when some secure settings are available unencrypted in settings, migrate them to secureSettings and encrypt",
-			channel: gen("slack", func(channel *legacymodels.AlertNotification) {
-				channel.SecureSettings = map[string][]byte{
-					"url": []byte(legacyEncryptFn("secure url")),
-				}
-				channel.Settings.Set("token", "secure token")
-			}),
-			expRecv: genExpSlack(nil),
-		},
-	}
-	sqlStore := db.InitTestDB(t)
-	for _, tt := range tc {
-		t.Run(tt.name, func(t *testing.T) {
-			service := NewTestMigrationService(t, sqlStore, nil)
-			m := service.newOrgMigration(1)
-			recv, err := m.createNotifier(tt.channel)
-			if tt.expErr != nil {
-				require.Error(t, err)
-				require.EqualError(t, err, tt.expErr.Error())
-				return
-			}
-			require.NoError(t, err)
-
-			if len(tt.expRecv.SecureSettings) > 0 {
-				require.NotEqual(t, tt.expRecv, recv) // Make sure they were actually encrypted at first.
-			}
-			for k, v := range recv.SecureSettings {
-				recv.SecureSettings[k] = decryptFn(v, m)
-			}
-			require.Equal(t, tt.expRecv, recv)
-		})
-	}
-
-	// Generate tests for each notification channel type.
-	t.Run("secure settings migrations for each notifier type", func(t *testing.T) {
-		notifiers := channels_config.GetAvailableNotifiers()
-		t.Run("migrate notification channel secure settings to receiver secure settings", func(t *testing.T) {
-			for _, notifier := range notifiers {
-				nType := notifier.Type
-				secureSettings, err := channels_config.GetSecretKeysForContactPointType(nType)
-				require.NoError(t, err)
-				t.Run(nType, func(t *testing.T) {
-					service := NewTestMigrationService(t, sqlStore, nil)
-					m := service.newOrgMigration(1)
-					channel := gen(nType, func(channel *legacymodels.AlertNotification) {
-						for _, key := range secureSettings {
-							channel.SecureSettings[key] = []byte(legacyEncryptFn("secure " + key))
-						}
-					})
-					recv, err := m.createNotifier(channel)
-					require.NoError(t, err)
-
-					require.Equal(t, nType, recv.Type)
-					if len(secureSettings) > 0 {
-						for _, key := range secureSettings {
-							require.NotEqual(t, "secure "+key, recv.SecureSettings[key]) // Make sure they were actually encrypted at first.
-						}
-					}
-					require.Len(t, recv.SecureSettings, len(secureSettings))
-					for _, key := range secureSettings {
-						require.Equal(t, "secure "+key, decryptFn(recv.SecureSettings[key], m))
-					}
-				})
-			}
-		})
-
-		t.Run("for certain legacy channel types, migrate secure fields stored in settings to secure settings", func(t *testing.T) {
-			for _, notifier := range notifiers {
-				nType := notifier.Type
-				secureSettings, ok := secureKeysToMigrate[nType]
-				if !ok {
-					continue
-				}
-				t.Run(nType, func(t *testing.T) {
-					service := NewTestMigrationService(t, sqlStore, nil)
-					m := service.newOrgMigration(1)
-
-					channel := gen(nType, func(channel *legacymodels.AlertNotification) {
-						for _, key := range secureSettings {
-							// Key difference to above. We store the secure settings in the settings field and expect
-							// them to be migrated to secureSettings.
-							channel.Settings.Set(key, "secure "+key)
-						}
-					})
-					recv, err := m.createNotifier(channel)
-					require.NoError(t, err)
-
-					require.Equal(t, nType, recv.Type)
-					if len(secureSettings) > 0 {
-						for _, key := range secureSettings {
-							require.NotEqual(t, "secure "+key, recv.SecureSettings[key]) // Make sure they were actually encrypted at first.
-						}
-					}
-					require.Len(t, recv.SecureSettings, len(secureSettings))
-					for _, key := range secureSettings {
-						require.Equal(t, "secure "+key, decryptFn(recv.SecureSettings[key], m))
-					}
-				})
-			}
-		})
-	})
-}
-
-func TestCreateDefaultRouteAndReceiver(t *testing.T) {
-	tc := []struct {
-		name            string
-		amConfig        *apimodels.PostableUserConfig
-		defaultChannels []*legacymodels.AlertNotification
-		expRecv         *apimodels.PostableApiReceiver
-		expRoute        *apimodels.Route
-		expErr          error
-	}{
-		{
-			name:            "when given multiple default notification channels migrate them to a single receiver",
-			defaultChannels: []*legacymodels.AlertNotification{createNotChannel(t, "uid1", int64(1), "name1"), createNotChannel(t, "uid2", int64(2), "name2")},
-			expRecv:         createPostableApiReceiver("autogen-contact-point-default", []string{"name1", "name2"}),
-			expRoute: &apimodels.Route{
-				Receiver:       "autogen-contact-point-default",
-				Routes:         make([]*apimodels.Route, 0),
-				GroupByStr:     []string{ngModels.FolderTitleLabel, model.AlertNameLabel},
-				RepeatInterval: durationPointer(DisabledRepeatInterval),
-			},
-		},
-		{
-			name: "when given multiple default notification channels migrate them to a single receiver with RepeatInterval set to be the minimum of all channel frequencies",
-			defaultChannels: []*legacymodels.AlertNotification{
-				createNotChannelWithReminder(t, "uid1", int64(1), "name1", time.Duration(42)),
-				createNotChannelWithReminder(t, "uid2", int64(2), "name2", time.Duration(100000)),
-			},
-			expRecv: createPostableApiReceiver("autogen-contact-point-default", []string{"name1", "name2"}),
-			expRoute: &apimodels.Route{
-				Receiver:       "autogen-contact-point-default",
-				Routes:         make([]*apimodels.Route, 0),
-				GroupByStr:     []string{ngModels.FolderTitleLabel, model.AlertNameLabel},
-				RepeatInterval: durationPointer(model.Duration(42)),
-			},
-		},
-		{
-			name:            "when given no default notification channels create a single empty receiver for default",
-			defaultChannels: []*legacymodels.AlertNotification{},
-			expRecv:         createPostableApiReceiver("autogen-contact-point-default", nil),
-			expRoute: &apimodels.Route{
-				Receiver:       "autogen-contact-point-default",
-				Routes:         make([]*apimodels.Route, 0),
-				GroupByStr:     []string{ngModels.FolderTitleLabel, model.AlertNameLabel},
-				RepeatInterval: nil,
-			},
-		},
-		{
-			name:            "when given a single default notification channels don't create a new default receiver",
-			defaultChannels: []*legacymodels.AlertNotification{createNotChannel(t, "uid1", int64(1), "name1")},
-			expRecv:         nil,
-			expRoute: &apimodels.Route{
-				Receiver:       "name1",
-				Routes:         make([]*apimodels.Route, 0),
-				GroupByStr:     []string{ngModels.FolderTitleLabel, model.AlertNameLabel},
-				RepeatInterval: durationPointer(DisabledRepeatInterval),
-			},
-		},
-		{
-			name:            "when given a single default notification channel with SendReminder=true, use the channels Frequency as the RepeatInterval",
-			defaultChannels: []*legacymodels.AlertNotification{createNotChannelWithReminder(t, "uid1", int64(1), "name1", time.Duration(42))},
-			expRecv:         nil,
-			expRoute: &apimodels.Route{
-				Receiver:       "name1",
-				Routes:         make([]*apimodels.Route, 0),
-				GroupByStr:     []string{ngModels.FolderTitleLabel, model.AlertNameLabel},
-				RepeatInterval: durationPointer(model.Duration(42)),
-			},
-		},
-	}
-
-	sqlStore := db.InitTestDB(t)
-	for _, tt := range tc {
-		t.Run(tt.name, func(t *testing.T) {
-			service := NewTestMigrationService(t, sqlStore, nil)
-			m := service.newOrgMigration(1)
-			recv, route, err := m.createDefaultRouteAndReceiver(tt.defaultChannels)
-			if tt.expErr != nil {
-				require.Error(t, err)
-				require.EqualError(t, err, tt.expErr.Error())
-				return
-			}
-
-			require.NoError(t, err)
-
-			// We ignore certain fields for the purposes of this test
-			if recv != nil {
-				for _, not := range recv.GrafanaManagedReceivers {
-					not.UID = ""
-					not.Settings = nil
-					not.SecureSettings = nil
-				}
-			}
-
-			require.Equal(t, tt.expRecv, recv)
-			require.Equal(t, tt.expRoute, route)
-		})
-	}
-}
-
-func createPostableApiReceiver(name string, integrationNames []string) *apimodels.PostableApiReceiver {
-	integrations := make([]*apimodels.PostableGrafanaReceiver, 0, len(integrationNames))
-	for _, integrationName := range integrationNames {
-		integrations = append(integrations, &apimodels.PostableGrafanaReceiver{Name: integrationName})
-	}
-	return &apimodels.PostableApiReceiver{
-		Receiver: config.Receiver{
-			Name: name,
-		},
-		PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{
-			GrafanaManagedReceivers: integrations,
-		},
-	}
-}
-
-func durationPointer(d model.Duration) *model.Duration {
-	return &d
-}
diff --git a/pkg/services/ngalert/migration/cond_trans.go b/pkg/services/ngalert/migration/cond_trans.go
deleted file mode 100644
index a2a05681d3da0..0000000000000
--- a/pkg/services/ngalert/migration/cond_trans.go
+++ /dev/null
@@ -1,359 +0,0 @@
-package migration
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"sort"
-	"strings"
-	"time"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/datasources"
-	migrationStore "github.com/grafana/grafana/pkg/services/ngalert/migration/store"
-	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
-	"github.com/grafana/grafana/pkg/tsdb/legacydata"
-	"github.com/grafana/grafana/pkg/tsdb/legacydata/interval"
-	"github.com/grafana/grafana/pkg/util"
-)
-
-// It is defined in pkg/expr/service.go as "DatasourceType"
-const expressionDatasourceUID = "__expr__"
-
-//nolint:gocyclo
-func transConditions(ctx context.Context, alert *migrationStore.DashAlert, store migrationStore.Store) (*condition, error) {
-	// TODO: needs a significant refactor to reduce complexity.
-	usr := getMigrationUser(alert.OrgID)
-	set := alert.ParsedSettings
-
-	refIDtoCondIdx := make(map[string][]int) // a map of original refIds to their corresponding condition index
-	for i, cond := range set.Conditions {
-		if len(cond.Query.Params) != 3 {
-			return nil, fmt.Errorf("unexpected number of query parameters in cond %v, want 3 got %v", i+1, len(cond.Query.Params))
-		}
-		refID := cond.Query.Params[0]
-		refIDtoCondIdx[refID] = append(refIDtoCondIdx[refID], i)
-	}
-
-	newRefIDstoCondIdx := make(map[string][]int) // a map of the new refIds to their coresponding condition index
-
-	refIDs := make([]string, 0, len(refIDtoCondIdx)) // a unique sorted list of the original refIDs
-	for refID := range refIDtoCondIdx {
-		refIDs = append(refIDs, refID)
-	}
-	sort.Strings(refIDs)
-
-	newRefIDsToTimeRanges := make(map[string][2]string) // a map of new RefIDs to their time range string tuple representation
-	for _, refID := range refIDs {
-		condIdxes := refIDtoCondIdx[refID]
-
-		if len(condIdxes) == 1 {
-			// If the refID is used in only condition, keep the letter a new refID
-			newRefIDstoCondIdx[refID] = append(newRefIDstoCondIdx[refID], condIdxes[0])
-			newRefIDsToTimeRanges[refID] = [2]string{set.Conditions[condIdxes[0]].Query.Params[1], set.Conditions[condIdxes[0]].Query.Params[2]}
-			continue
-		}
-
-		// track unique time ranges within the same refID
-		timeRangesToCondIdx := make(map[[2]string][]int) // a map of the time range tuple to the condition index
-		for _, idx := range condIdxes {
-			timeParamFrom := set.Conditions[idx].Query.Params[1]
-			timeParamTo := set.Conditions[idx].Query.Params[2]
-			key := [2]string{timeParamFrom, timeParamTo}
-			timeRangesToCondIdx[key] = append(timeRangesToCondIdx[key], idx)
-		}
-
-		if len(timeRangesToCondIdx) == 1 {
-			// if all shared time range, no need to create a new query with a new RefID
-			for i := range condIdxes {
-				newRefIDstoCondIdx[refID] = append(newRefIDstoCondIdx[refID], condIdxes[i])
-				newRefIDsToTimeRanges[refID] = [2]string{set.Conditions[condIdxes[i]].Query.Params[1], set.Conditions[condIdxes[i]].Query.Params[2]}
-			}
-			continue
-		}
-
-		// This referenced query/refID has different time ranges, so new queries are needed for each unique time range.
-		timeRanges := make([][2]string, 0, len(timeRangesToCondIdx)) // a sorted list of unique time ranges for the query
-		for tr := range timeRangesToCondIdx {
-			timeRanges = append(timeRanges, tr)
-		}
-
-		sort.Slice(timeRanges, func(i, j int) bool {
-			switch {
-			case timeRanges[i][0] < timeRanges[j][0]:
-				return true
-			case timeRanges[i][0] > timeRanges[j][0]:
-				return false
-			default:
-				return timeRanges[i][1] < timeRanges[j][1]
-			}
-		})
-
-		for _, tr := range timeRanges {
-			idxes := timeRangesToCondIdx[tr]
-			for i := 0; i < len(idxes); i++ {
-				newLetter, err := getNewRefID(newRefIDstoCondIdx)
-				if err != nil {
-					return nil, err
-				}
-				newRefIDstoCondIdx[newLetter] = append(newRefIDstoCondIdx[newLetter], idxes[i])
-				newRefIDsToTimeRanges[newLetter] = [2]string{set.Conditions[idxes[i]].Query.Params[1], set.Conditions[idxes[i]].Query.Params[2]}
-			}
-		}
-	}
-
-	newRefIDs := make([]string, 0, len(newRefIDstoCondIdx)) // newRefIds is a sorted list of the unique refIds of new queries
-	for refID := range newRefIDstoCondIdx {
-		newRefIDs = append(newRefIDs, refID)
-	}
-	sort.Strings(newRefIDs)
-
-	newCond := &condition{}
-	condIdxToNewRefID := make(map[int]string) // a map of condition indices to the RefIDs of new queries
-
-	// build the new data source queries
-	for _, refID := range newRefIDs {
-		condIdxes := newRefIDstoCondIdx[refID]
-		for i, condIdx := range condIdxes {
-			condIdxToNewRefID[condIdx] = refID
-			if i > 0 {
-				// only create each unique query once
-				continue
-			}
-
-			var queryObj map[string]any // copy the model
-			err := json.Unmarshal(set.Conditions[condIdx].Query.Model, &queryObj)
-			if err != nil {
-				return nil, err
-			}
-
-			var queryType string
-			if v, ok := queryObj["queryType"]; ok {
-				if s, ok := v.(string); ok {
-					queryType = s
-				}
-			}
-
-			// Could have an alert saved but datasource deleted, so can not require match.
-			dsUid := ""
-			if ds, err := store.GetDatasource(ctx, set.Conditions[condIdx].Query.DatasourceID, usr); err == nil {
-				dsUid = ds.UID
-			} else {
-				if !errors.Is(err, datasources.ErrDataSourceNotFound) {
-					return nil, err
-				}
-			}
-
-			queryObj["refId"] = refID
-
-			// See services/alerting/conditions/query.go's newQueryCondition
-			queryObj["maxDataPoints"] = interval.DefaultRes
-
-			simpleJson, err := simplejson.NewJson(set.Conditions[condIdx].Query.Model)
-			if err != nil {
-				return nil, err
-			}
-
-			rawFrom := newRefIDsToTimeRanges[refID][0]
-			rawTo := newRefIDsToTimeRanges[refID][1]
-			calculatedInterval, err := calculateInterval(legacydata.NewDataTimeRange(rawFrom, rawTo), simpleJson, nil)
-			if err != nil {
-				return nil, err
-			}
-			queryObj["intervalMs"] = calculatedInterval.Milliseconds()
-
-			encodedObj, err := json.Marshal(queryObj)
-			if err != nil {
-				return nil, err
-			}
-
-			rTR, err := getRelativeDuration(rawFrom, rawTo)
-			if err != nil {
-				return nil, err
-			}
-
-			alertQuery := ngmodels.AlertQuery{
-				RefID:             refID,
-				Model:             encodedObj,
-				RelativeTimeRange: *rTR,
-				DatasourceUID:     dsUid,
-				QueryType:         queryType,
-			}
-			newCond.Data = append(newCond.Data, alertQuery)
-		}
-	}
-
-	// build the new classic condition pointing our new equivalent queries
-	conditions := make([]classicConditionJSON, len(set.Conditions))
-	for i, cond := range set.Conditions {
-		newCond := classicConditionJSON{}
-		newCond.Evaluator = migrationStore.ConditionEvalJSON{
-			Type:   cond.Evaluator.Type,
-			Params: cond.Evaluator.Params,
-		}
-		newCond.Operator.Type = cond.Operator.Type
-		newCond.Query.Params = append(newCond.Query.Params, condIdxToNewRefID[i])
-		newCond.Reducer.Type = cond.Reducer.Type
-
-		conditions[i] = newCond
-	}
-
-	ccRefID, err := getNewRefID(newRefIDstoCondIdx) // get refID for the classic condition
-	if err != nil {
-		return nil, err
-	}
-	newCond.Condition = ccRefID // set the alert condition to point to the classic condition
-	newCond.OrgID = alert.OrgID
-
-	exprModel := struct {
-		Type       string                 `json:"type"`
-		RefID      string                 `json:"refId"`
-		Conditions []classicConditionJSON `json:"conditions"`
-	}{
-		"classic_conditions",
-		ccRefID,
-		conditions,
-	}
-
-	exprModelJSON, err := json.Marshal(&exprModel)
-	if err != nil {
-		return nil, err
-	}
-
-	ccAlertQuery := ngmodels.AlertQuery{
-		RefID:         ccRefID,
-		Model:         exprModelJSON,
-		DatasourceUID: expressionDatasourceUID,
-	}
-
-	newCond.Data = append(newCond.Data, ccAlertQuery)
-
-	sort.Slice(newCond.Data, func(i, j int) bool {
-		return newCond.Data[i].RefID < newCond.Data[j].RefID
-	})
-
-	return newCond, nil
-}
-
-type condition struct {
-	// Condition is the RefID of the query or expression from
-	// the Data property to get the results for.
-	Condition string `json:"condition"`
-	OrgID     int64  `json:"-"`
-
-	// Data is an array of data source queries and/or server side expressions.
-	Data []ngmodels.AlertQuery `json:"data"`
-}
-
-const alpha = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-
-// getNewRefID finds first capital letter in the alphabet not in use
-// to use for a new RefID. It errors if it runs out of letters.
-func getNewRefID(refIDs map[string][]int) (string, error) {
-	for _, r := range alpha {
-		sR := string(r)
-		if _, ok := refIDs[sR]; ok {
-			continue
-		}
-		return sR, nil
-	}
-	for i := 0; i < 20; i++ {
-		sR := util.GenerateShortUID()
-		if _, ok := refIDs[sR]; ok {
-			continue
-		}
-		return sR, nil
-	}
-	return "", fmt.Errorf("failed to generate unique RefID")
-}
-
-// getRelativeDuration turns the alerting durations for dashboard conditions
-// into a relative time range.
-func getRelativeDuration(rawFrom, rawTo string) (*ngmodels.RelativeTimeRange, error) {
-	fromD, err := getFrom(rawFrom)
-	if err != nil {
-		return nil, err
-	}
-
-	toD, err := getTo(rawTo)
-	if err != nil {
-		return nil, err
-	}
-	return &ngmodels.RelativeTimeRange{
-		From: ngmodels.Duration(fromD),
-		To:   ngmodels.Duration(toD),
-	}, nil
-}
-
-func getFrom(from string) (time.Duration, error) {
-	fromRaw := strings.Replace(from, "now-", "", 1)
-
-	d, err := time.ParseDuration("-" + fromRaw)
-	if err != nil {
-		return 0, err
-	}
-	return -d, err
-}
-
-func getTo(to string) (time.Duration, error) {
-	if to == "now" {
-		return 0, nil
-	} else if strings.HasPrefix(to, "now-") {
-		withoutNow := strings.Replace(to, "now-", "", 1)
-
-		d, err := time.ParseDuration("-" + withoutNow)
-		if err != nil {
-			return 0, err
-		}
-		return -d, nil
-	}
-
-	d, err := time.ParseDuration(to)
-	if err != nil {
-		return 0, err
-	}
-	return -d, nil
-}
-
-type classicConditionJSON struct {
-	Evaluator migrationStore.ConditionEvalJSON `json:"evaluator"`
-
-	Operator struct {
-		Type string `json:"type"`
-	} `json:"operator"`
-
-	Query struct {
-		Params []string `json:"params"`
-	} `json:"query"`
-
-	Reducer struct {
-		// Params []any `json:"params"` (Unused)
-		Type string `json:"type"`
-	} `json:"reducer"`
-}
-
-// Copied from services/alerting/conditions/query.go's calculateInterval
-func calculateInterval(timeRange legacydata.DataTimeRange, model *simplejson.Json, dsInfo *datasources.DataSource) (time.Duration, error) {
-	// if there is no min-interval specified in the datasource or in the dashboard-panel,
-	// the value of 1ms is used (this is how it is done in the dashboard-interval-calculation too,
-	// see https://github.com/grafana/grafana/blob/9a0040c0aeaae8357c650cec2ee644a571dddf3d/packages/grafana-data/src/datetime/rangeutil.ts#L264)
-	defaultMinInterval := time.Millisecond * 1
-
-	// interval.GetIntervalFrom has two problems (but they do not affect us here):
-	// - it returns the min-interval, so it should be called interval.GetMinIntervalFrom
-	// - it falls back to model.intervalMs. it should not, because that one is the real final
-	//   interval-value calculated by the browser. but, in this specific case (old-alert),
-	//   that value is not set, so the fallback never happens.
-	minInterval, err := interval.GetIntervalFrom(dsInfo, model, defaultMinInterval)
-
-	if err != nil {
-		return time.Duration(0), err
-	}
-
-	calc := interval.NewCalculator()
-
-	intvl := calc.Calculate(timeRange, minInterval)
-
-	return intvl.Value, nil
-}
diff --git a/pkg/services/ngalert/migration/migration_test.go b/pkg/services/ngalert/migration/migration_test.go
deleted file mode 100644
index 408f05b3f7ce0..0000000000000
--- a/pkg/services/ngalert/migration/migration_test.go
+++ /dev/null
@@ -1,1328 +0,0 @@
-package migration
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"strconv"
-	"testing"
-	"time"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/prometheus/alertmanager/config"
-	"github.com/prometheus/alertmanager/pkg/labels"
-	"github.com/prometheus/common/model"
-	"github.com/stretchr/testify/require"
-	"xorm.io/xorm"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/datasources"
-	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
-	migrationStore "github.com/grafana/grafana/pkg/services/ngalert/migration/store"
-	ngModels "github.com/grafana/grafana/pkg/services/ngalert/models"
-	"github.com/grafana/grafana/pkg/services/org"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/tsdb/legacydata"
-)
-
-// TestServiceStart tests the wrapper method that decides when to run the migration based on migration status and settings.
-func TestServiceStart(t *testing.T) {
-	tc := []struct {
-		name           string
-		config         *setting.Cfg
-		isMigrationRun bool
-		expectedErr    bool
-		expected       bool
-	}{
-		{
-			name: "when unified alerting enabled and migration not already run, then run migration",
-			config: &setting.Cfg{
-				UnifiedAlerting: setting.UnifiedAlertingSettings{
-					Enabled: pointer(true),
-				},
-			},
-			isMigrationRun: false,
-			expected:       true,
-		},
-		{
-			name: "when unified alerting disabled, migration is already run and force migration is enabled, then revert migration",
-			config: &setting.Cfg{
-				UnifiedAlerting: setting.UnifiedAlertingSettings{
-					Enabled: pointer(false),
-				},
-				ForceMigration: true,
-			},
-			isMigrationRun: true,
-			expected:       false,
-		},
-		{
-			name: "when unified alerting disabled, migration is already run and force migration is disabled, then the migration should panic",
-			config: &setting.Cfg{
-				UnifiedAlerting: setting.UnifiedAlertingSettings{
-					Enabled: pointer(false),
-				},
-				ForceMigration: false,
-			},
-			isMigrationRun: true,
-			expected:       true,
-			expectedErr:    true,
-		},
-		{
-			name: "when unified alerting enabled and migration is already run, then do nothing",
-			config: &setting.Cfg{
-				UnifiedAlerting: setting.UnifiedAlertingSettings{
-					Enabled: pointer(true),
-				},
-			},
-			isMigrationRun: true,
-			expected:       true,
-		},
-		{
-			name: "when unified alerting disabled and migration is not already run, then do nothing",
-			config: &setting.Cfg{
-				UnifiedAlerting: setting.UnifiedAlertingSettings{
-					Enabled: pointer(false),
-				},
-			},
-			isMigrationRun: false,
-			expected:       false,
-		},
-	}
-
-	sqlStore := db.InitTestDB(t)
-	for _, tt := range tc {
-		t.Run(tt.name, func(t *testing.T) {
-			ctx := context.Background()
-			service := NewTestMigrationService(t, sqlStore, tt.config)
-
-			err := service.migrationStore.SetMigrated(ctx, tt.isMigrationRun)
-			require.NoError(t, err)
-
-			err = service.Run(ctx)
-			if tt.expectedErr {
-				require.Error(t, err)
-			} else {
-				require.NoError(t, err)
-			}
-
-			migrated, err := service.migrationStore.IsMigrated(ctx)
-			require.NoError(t, err)
-			require.Equal(t, tt.expected, migrated)
-		})
-	}
-}
-
-// TestAMConfigMigration tests the execution of the migration specifically for migrations of channels and routes.
-func TestAMConfigMigration(t *testing.T) {
-	sqlStore := db.InitTestDB(t)
-	x := sqlStore.GetEngine()
-	service := NewTestMigrationService(t, sqlStore, &setting.Cfg{})
-	tc := []struct {
-		name           string
-		legacyChannels []*models.AlertNotification
-		alerts         []*models.Alert
-
-		expected map[int64]*apimodels.PostableUserConfig
-		expErr   error
-	}{
-		{
-			name: "general multi-org, multi-alert, multi-channel migration",
-			legacyChannels: []*models.AlertNotification{
-				createAlertNotification(t, int64(1), "notifier1", "email", emailSettings, false),
-				createAlertNotification(t, int64(1), "notifier2", "slack", slackSettings, false),
-				createAlertNotification(t, int64(1), "notifier3", "opsgenie", opsgenieSettings, false),
-				createAlertNotification(t, int64(2), "notifier4", "email", emailSettings, false),
-				createAlertNotification(t, int64(2), "notifier5", "slack", slackSettings, false),
-				createAlertNotification(t, int64(2), "notifier6", "opsgenie", opsgenieSettings, true), // default
-			},
-			alerts: []*models.Alert{
-				createAlert(t, 1, 1, 1, "alert1", []string{"notifier1"}),
-				createAlert(t, 1, 1, 2, "alert2", []string{"notifier2", "notifier3"}),
-				createAlert(t, 1, 2, 3, "alert3", []string{"notifier3"}),
-				createAlert(t, 2, 3, 1, "alert4", []string{"notifier4"}),
-				createAlert(t, 2, 3, 2, "alert5", []string{"notifier4", "notifier5", "notifier6"}),
-				createAlert(t, 2, 4, 3, "alert6", []string{}),
-			},
-			expected: map[int64]*apimodels.PostableUserConfig{
-				int64(1): {
-					AlertmanagerConfig: apimodels.PostableApiAlertingConfig{
-						Config: apimodels.Config{Route: &apimodels.Route{
-							Receiver:   "autogen-contact-point-default",
-							GroupByStr: []string{ngModels.FolderTitleLabel, model.AlertNameLabel},
-							Routes: []*apimodels.Route{
-								{Receiver: "notifier1", ObjectMatchers: apimodels.ObjectMatchers{{Type: 2, Name: ContactLabel, Value: `.*"notifier1".*`}}, Routes: nil, Continue: true, RepeatInterval: durationPointer(DisabledRepeatInterval)},
-								{Receiver: "notifier2", ObjectMatchers: apimodels.ObjectMatchers{{Type: 2, Name: ContactLabel, Value: `.*"notifier2".*`}}, Routes: nil, Continue: true, RepeatInterval: durationPointer(DisabledRepeatInterval)},
-								{Receiver: "notifier3", ObjectMatchers: apimodels.ObjectMatchers{{Type: 2, Name: ContactLabel, Value: `.*"notifier3".*`}}, Routes: nil, Continue: true, RepeatInterval: durationPointer(DisabledRepeatInterval)},
-							},
-							RepeatInterval: nil,
-						}},
-						Receivers: []*apimodels.PostableApiReceiver{
-							{Receiver: config.Receiver{Name: "notifier1"}, PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{{Name: "notifier1", Type: "email"}}}},
-							{Receiver: config.Receiver{Name: "notifier2"}, PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{{Name: "notifier2", Type: "slack"}}}},
-							{Receiver: config.Receiver{Name: "notifier3"}, PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{{Name: "notifier3", Type: "opsgenie"}}}},
-							{Receiver: config.Receiver{Name: "autogen-contact-point-default"}}, // empty default
-
-						},
-					},
-				},
-				int64(2): {
-					AlertmanagerConfig: apimodels.PostableApiAlertingConfig{
-						Config: apimodels.Config{Route: &apimodels.Route{
-							Receiver:   "notifier6",
-							GroupByStr: []string{ngModels.FolderTitleLabel, model.AlertNameLabel},
-							Routes: []*apimodels.Route{
-								{Receiver: "notifier4", ObjectMatchers: apimodels.ObjectMatchers{{Type: 2, Name: ContactLabel, Value: `.*"notifier4".*`}}, Routes: nil, Continue: true, RepeatInterval: durationPointer(DisabledRepeatInterval)},
-								{Receiver: "notifier5", ObjectMatchers: apimodels.ObjectMatchers{{Type: 2, Name: ContactLabel, Value: `.*"notifier5".*`}}, Routes: nil, Continue: true, RepeatInterval: durationPointer(DisabledRepeatInterval)},
-								{Receiver: "notifier6", ObjectMatchers: apimodels.ObjectMatchers{{Type: 2, Name: ContactLabel, Value: `.*"notifier6".*`}}, Routes: nil, Continue: true, RepeatInterval: durationPointer(DisabledRepeatInterval)},
-							},
-							RepeatInterval: durationPointer(DisabledRepeatInterval),
-						}},
-						Receivers: []*apimodels.PostableApiReceiver{
-							{Receiver: config.Receiver{Name: "notifier4"}, PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{{Name: "notifier4", Type: "email"}}}},
-							{Receiver: config.Receiver{Name: "notifier5"}, PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{{Name: "notifier5", Type: "slack"}}}},
-							{Receiver: config.Receiver{Name: "notifier6"}, PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{{Name: "notifier6", Type: "opsgenie"}}}},
-						},
-					},
-				},
-			},
-		},
-		{
-			name: "when no default channel, create empty autogen-contact-point-default",
-			legacyChannels: []*models.AlertNotification{
-				createAlertNotification(t, int64(1), "notifier1", "email", emailSettings, false),
-			},
-			alerts: []*models.Alert{},
-			expected: map[int64]*apimodels.PostableUserConfig{
-				int64(1): {
-					AlertmanagerConfig: apimodels.PostableApiAlertingConfig{
-						Config: apimodels.Config{Route: &apimodels.Route{
-							Receiver:   "autogen-contact-point-default",
-							GroupByStr: []string{ngModels.FolderTitleLabel, model.AlertNameLabel},
-							Routes: []*apimodels.Route{
-								{Receiver: "notifier1", ObjectMatchers: apimodels.ObjectMatchers{{Type: 2, Name: ContactLabel, Value: `.*"notifier1".*`}}, Routes: nil, Continue: true, RepeatInterval: durationPointer(DisabledRepeatInterval)},
-							},
-							RepeatInterval: nil,
-						}},
-						Receivers: []*apimodels.PostableApiReceiver{
-							{Receiver: config.Receiver{Name: "notifier1"}, PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{{Name: "notifier1", Type: "email"}}}},
-							{Receiver: config.Receiver{Name: "autogen-contact-point-default"}},
-						},
-					},
-				},
-			},
-		},
-		{
-			name: "when single default channel, don't create autogen-contact-point-default",
-			legacyChannels: []*models.AlertNotification{
-				createAlertNotification(t, int64(1), "notifier1", "email", emailSettings, true),
-			},
-			alerts: []*models.Alert{},
-			expected: map[int64]*apimodels.PostableUserConfig{
-				int64(1): {
-					AlertmanagerConfig: apimodels.PostableApiAlertingConfig{
-						Config: apimodels.Config{Route: &apimodels.Route{
-							Receiver:   "notifier1",
-							GroupByStr: []string{ngModels.FolderTitleLabel, model.AlertNameLabel},
-							Routes: []*apimodels.Route{
-								{Receiver: "notifier1", ObjectMatchers: apimodels.ObjectMatchers{{Type: 2, Name: ContactLabel, Value: `.*"notifier1".*`}}, Routes: nil, Continue: true, RepeatInterval: durationPointer(DisabledRepeatInterval)},
-							},
-							RepeatInterval: durationPointer(DisabledRepeatInterval),
-						}},
-						Receivers: []*apimodels.PostableApiReceiver{
-							{Receiver: config.Receiver{Name: "notifier1"}, PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{{Name: "notifier1", Type: "email"}}}},
-						},
-					},
-				},
-			},
-		},
-		{
-			name: "when single default channel with SendReminder, use channel Frequency as RepeatInterval",
-			legacyChannels: []*models.AlertNotification{
-				createAlertNotificationWithReminder(t, int64(1), "notifier1", "email", emailSettings, true, true, time.Duration(1)*time.Hour),
-			},
-			alerts: []*models.Alert{},
-			expected: map[int64]*apimodels.PostableUserConfig{
-				int64(1): {
-					AlertmanagerConfig: apimodels.PostableApiAlertingConfig{
-						Config: apimodels.Config{Route: &apimodels.Route{
-							Receiver:   "notifier1",
-							GroupByStr: []string{ngModels.FolderTitleLabel, model.AlertNameLabel},
-							Routes: []*apimodels.Route{
-								{Receiver: "notifier1", ObjectMatchers: apimodels.ObjectMatchers{{Type: 2, Name: ContactLabel, Value: `.*"notifier1".*`}}, Routes: nil, Continue: true, RepeatInterval: durationPointer(model.Duration(time.Duration(1) * time.Hour))},
-							},
-							RepeatInterval: durationPointer(model.Duration(time.Duration(1) * time.Hour)),
-						}},
-						Receivers: []*apimodels.PostableApiReceiver{
-							{Receiver: config.Receiver{Name: "notifier1"}, PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{{Name: "notifier1", Type: "email"}}}},
-						},
-					},
-				},
-			},
-		},
-		{
-			name: "when multiple default channels, add them to autogen-contact-point-default as well",
-			legacyChannels: []*models.AlertNotification{
-				createAlertNotification(t, int64(1), "notifier1", "email", emailSettings, true),
-				createAlertNotification(t, int64(1), "notifier2", "slack", slackSettings, true),
-			},
-			alerts: []*models.Alert{},
-			expected: map[int64]*apimodels.PostableUserConfig{
-				int64(1): {
-					AlertmanagerConfig: apimodels.PostableApiAlertingConfig{
-						Config: apimodels.Config{Route: &apimodels.Route{
-							Receiver:   "autogen-contact-point-default",
-							GroupByStr: []string{ngModels.FolderTitleLabel, model.AlertNameLabel},
-							Routes: []*apimodels.Route{
-								{Receiver: "notifier1", ObjectMatchers: apimodels.ObjectMatchers{{Type: 2, Name: ContactLabel, Value: `.*"notifier1".*`}}, Routes: nil, Continue: true, RepeatInterval: durationPointer(DisabledRepeatInterval)},
-								{Receiver: "notifier2", ObjectMatchers: apimodels.ObjectMatchers{{Type: 2, Name: ContactLabel, Value: `.*"notifier2".*`}}, Routes: nil, Continue: true, RepeatInterval: durationPointer(DisabledRepeatInterval)},
-							},
-							RepeatInterval: durationPointer(DisabledRepeatInterval),
-						}},
-						Receivers: []*apimodels.PostableApiReceiver{
-							{Receiver: config.Receiver{Name: "notifier1"}, PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{{Name: "notifier1", Type: "email"}}}},
-							{Receiver: config.Receiver{Name: "notifier2"}, PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{{Name: "notifier2", Type: "slack"}}}},
-							{Receiver: config.Receiver{Name: "autogen-contact-point-default"}, PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{{Name: "notifier1", Type: "email"}, {Name: "notifier2", Type: "slack"}}}},
-						},
-					},
-				},
-			},
-		},
-		{
-			name: "when multiple default channels with SendReminder, use minimum channel frequency as RepeatInterval",
-			legacyChannels: []*models.AlertNotification{
-				createAlertNotificationWithReminder(t, int64(1), "notifier1", "email", emailSettings, true, true, time.Duration(1)*time.Hour),
-				createAlertNotificationWithReminder(t, int64(1), "notifier2", "slack", slackSettings, true, true, time.Duration(30)*time.Minute),
-			},
-			alerts: []*models.Alert{},
-			expected: map[int64]*apimodels.PostableUserConfig{
-				int64(1): {
-					AlertmanagerConfig: apimodels.PostableApiAlertingConfig{
-						Config: apimodels.Config{Route: &apimodels.Route{
-							Receiver:   "autogen-contact-point-default",
-							GroupByStr: []string{ngModels.FolderTitleLabel, model.AlertNameLabel},
-							Routes: []*apimodels.Route{
-								{Receiver: "notifier1", ObjectMatchers: apimodels.ObjectMatchers{{Type: 2, Name: ContactLabel, Value: `.*"notifier1".*`}}, Routes: nil, Continue: true, RepeatInterval: durationPointer(model.Duration(time.Duration(1) * time.Hour))},
-								{Receiver: "notifier2", ObjectMatchers: apimodels.ObjectMatchers{{Type: 2, Name: ContactLabel, Value: `.*"notifier2".*`}}, Routes: nil, Continue: true, RepeatInterval: durationPointer(model.Duration(time.Duration(30) * time.Minute))},
-							},
-							RepeatInterval: durationPointer(model.Duration(time.Duration(30) * time.Minute)),
-						}},
-						Receivers: []*apimodels.PostableApiReceiver{
-							{Receiver: config.Receiver{Name: "notifier1"}, PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{{Name: "notifier1", Type: "email"}}}},
-							{Receiver: config.Receiver{Name: "notifier2"}, PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{{Name: "notifier2", Type: "slack"}}}},
-							{Receiver: config.Receiver{Name: "autogen-contact-point-default"}, PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{{Name: "notifier1", Type: "email"}, {Name: "notifier2", Type: "slack"}}}},
-						},
-					},
-				},
-			},
-		},
-		{
-			name: "when default channels exist alongside non-default, add only defaults to autogen-contact-point-default",
-			legacyChannels: []*models.AlertNotification{
-				createAlertNotification(t, int64(1), "notifier1", "email", emailSettings, true), // default
-				createAlertNotification(t, int64(1), "notifier2", "slack", slackSettings, false),
-				createAlertNotification(t, int64(1), "notifier3", "opsgenie", opsgenieSettings, true), // default
-			},
-			alerts: []*models.Alert{},
-			expected: map[int64]*apimodels.PostableUserConfig{
-				int64(1): {
-					AlertmanagerConfig: apimodels.PostableApiAlertingConfig{
-						Config: apimodels.Config{Route: &apimodels.Route{
-							Receiver:   "autogen-contact-point-default",
-							GroupByStr: []string{ngModels.FolderTitleLabel, model.AlertNameLabel},
-							Routes: []*apimodels.Route{
-								{Receiver: "notifier1", ObjectMatchers: apimodels.ObjectMatchers{{Type: 2, Name: ContactLabel, Value: `.*"notifier1".*`}}, Routes: nil, Continue: true, RepeatInterval: durationPointer(DisabledRepeatInterval)},
-								{Receiver: "notifier2", ObjectMatchers: apimodels.ObjectMatchers{{Type: 2, Name: ContactLabel, Value: `.*"notifier2".*`}}, Routes: nil, Continue: true, RepeatInterval: durationPointer(DisabledRepeatInterval)},
-								{Receiver: "notifier3", ObjectMatchers: apimodels.ObjectMatchers{{Type: 2, Name: ContactLabel, Value: `.*"notifier3".*`}}, Routes: nil, Continue: true, RepeatInterval: durationPointer(DisabledRepeatInterval)},
-							},
-							RepeatInterval: durationPointer(DisabledRepeatInterval),
-						}},
-						Receivers: []*apimodels.PostableApiReceiver{
-							{Receiver: config.Receiver{Name: "notifier1"}, PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{{Name: "notifier1", Type: "email"}}}},
-							{Receiver: config.Receiver{Name: "notifier2"}, PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{{Name: "notifier2", Type: "slack"}}}},
-							{Receiver: config.Receiver{Name: "notifier3"}, PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{{Name: "notifier3", Type: "opsgenie"}}}},
-							{Receiver: config.Receiver{Name: "autogen-contact-point-default"}, PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{{Name: "notifier1", Type: "email"}, {Name: "notifier3", Type: "opsgenie"}}}}},
-					},
-				},
-			},
-		},
-		{
-			name: "when alerts share channels, only create one receiver per legacy channel",
-			legacyChannels: []*models.AlertNotification{
-				createAlertNotification(t, int64(1), "notifier1", "email", emailSettings, false),
-				createAlertNotification(t, int64(1), "notifier2", "slack", slackSettings, false),
-			},
-			alerts: []*models.Alert{
-				createAlert(t, 1, 1, 1, "alert1", []string{"notifier1"}),
-				createAlert(t, 1, 1, 1, "alert2", []string{"notifier1", "notifier2"}),
-			},
-			expected: map[int64]*apimodels.PostableUserConfig{
-				int64(1): {
-					AlertmanagerConfig: apimodels.PostableApiAlertingConfig{
-						Config: apimodels.Config{Route: &apimodels.Route{
-							Receiver:   "autogen-contact-point-default",
-							GroupByStr: []string{ngModels.FolderTitleLabel, model.AlertNameLabel},
-							Routes: []*apimodels.Route{
-								{Receiver: "notifier1", ObjectMatchers: apimodels.ObjectMatchers{{Type: 2, Name: ContactLabel, Value: `.*"notifier1".*`}}, Routes: nil, Continue: true, RepeatInterval: durationPointer(DisabledRepeatInterval)},
-								{Receiver: "notifier2", ObjectMatchers: apimodels.ObjectMatchers{{Type: 2, Name: ContactLabel, Value: `.*"notifier2".*`}}, Routes: nil, Continue: true, RepeatInterval: durationPointer(DisabledRepeatInterval)},
-							},
-						}},
-						Receivers: []*apimodels.PostableApiReceiver{
-							{Receiver: config.Receiver{Name: "notifier1"}, PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{{Name: "notifier1", Type: "email"}}}},
-							{Receiver: config.Receiver{Name: "notifier2"}, PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{{Name: "notifier2", Type: "slack"}}}},
-							{Receiver: config.Receiver{Name: "autogen-contact-point-default"}},
-						},
-					},
-				},
-			},
-		},
-		{
-			name: "when channel not linked to any alerts, still create a receiver for it",
-			legacyChannels: []*models.AlertNotification{
-				createAlertNotification(t, int64(1), "notifier1", "email", emailSettings, false),
-			},
-			alerts: []*models.Alert{},
-			expected: map[int64]*apimodels.PostableUserConfig{
-				int64(1): {
-					AlertmanagerConfig: apimodels.PostableApiAlertingConfig{
-						Config: apimodels.Config{Route: &apimodels.Route{
-							Receiver:   "autogen-contact-point-default",
-							GroupByStr: []string{ngModels.FolderTitleLabel, model.AlertNameLabel},
-							Routes: []*apimodels.Route{
-								{Receiver: "notifier1", ObjectMatchers: apimodels.ObjectMatchers{{Type: 2, Name: ContactLabel, Value: `.*"notifier1".*`}}, Routes: nil, Continue: true, RepeatInterval: durationPointer(DisabledRepeatInterval)},
-							},
-						}},
-						Receivers: []*apimodels.PostableApiReceiver{
-							{Receiver: config.Receiver{Name: "notifier1"}, PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{{Name: "notifier1", Type: "email"}}}},
-							{Receiver: config.Receiver{Name: "autogen-contact-point-default"}},
-						},
-					},
-				},
-			},
-		},
-		{
-			name: "when unsupported channels, do not migrate them",
-			legacyChannels: []*models.AlertNotification{
-				createAlertNotification(t, int64(1), "notifier1", "email", emailSettings, false),
-				createAlertNotification(t, int64(1), "notifier2", "hipchat", "", false),
-				createAlertNotification(t, int64(1), "notifier3", "sensu", "", false),
-			},
-			alerts: []*models.Alert{},
-			expected: map[int64]*apimodels.PostableUserConfig{
-				int64(1): {
-					AlertmanagerConfig: apimodels.PostableApiAlertingConfig{
-						Config: apimodels.Config{Route: &apimodels.Route{
-							Receiver:   "autogen-contact-point-default",
-							GroupByStr: []string{ngModels.FolderTitleLabel, model.AlertNameLabel},
-							Routes: []*apimodels.Route{
-								{Receiver: "notifier1", ObjectMatchers: apimodels.ObjectMatchers{{Type: 2, Name: ContactLabel, Value: `.*"notifier1".*`}}, Routes: nil, Continue: true, RepeatInterval: durationPointer(DisabledRepeatInterval)},
-							},
-						}},
-						Receivers: []*apimodels.PostableApiReceiver{
-							{Receiver: config.Receiver{Name: "notifier1"}, PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{{Name: "notifier1", Type: "email"}}}},
-							{Receiver: config.Receiver{Name: "autogen-contact-point-default"}},
-						},
-					},
-				},
-			},
-		},
-		{
-			name: "when unsupported channel linked to alert, do not migrate only that channel",
-			legacyChannels: []*models.AlertNotification{
-				createAlertNotification(t, int64(1), "notifier1", "email", emailSettings, false),
-				createAlertNotification(t, int64(1), "notifier2", "sensu", "", false),
-			},
-			alerts: []*models.Alert{
-				createAlert(t, 1, 1, 1, "alert1", []string{"notifier1", "notifier2"}),
-			},
-			expected: map[int64]*apimodels.PostableUserConfig{
-				int64(1): {
-					AlertmanagerConfig: apimodels.PostableApiAlertingConfig{
-						Config: apimodels.Config{Route: &apimodels.Route{
-							Receiver:   "autogen-contact-point-default",
-							GroupByStr: []string{ngModels.FolderTitleLabel, model.AlertNameLabel},
-							Routes: []*apimodels.Route{
-								{Receiver: "notifier1", ObjectMatchers: apimodels.ObjectMatchers{{Type: 2, Name: ContactLabel, Value: `.*"notifier1".*`}}, Routes: nil, Continue: true, RepeatInterval: durationPointer(DisabledRepeatInterval)},
-							},
-						}},
-						Receivers: []*apimodels.PostableApiReceiver{
-							{Receiver: config.Receiver{Name: "notifier1"}, PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{GrafanaManagedReceivers: []*apimodels.PostableGrafanaReceiver{{Name: "notifier1", Type: "email"}}}},
-							{Receiver: config.Receiver{Name: "autogen-contact-point-default"}},
-						},
-					},
-				},
-			},
-		},
-	}
-
-	for _, tt := range tc {
-		t.Run(tt.name, func(t *testing.T) {
-			defer teardown(t, x, service)
-			setupLegacyAlertsTables(t, x, tt.legacyChannels, tt.alerts, nil, nil)
-
-			err := service.Run(context.Background())
-			require.NoError(t, err)
-
-			for orgId := range tt.expected {
-				amConfig := getAlertmanagerConfig(t, x, orgId)
-
-				// Order of nested GrafanaManagedReceivers is not guaranteed.
-				cOpt := []cmp.Option{
-					cmpopts.IgnoreUnexported(apimodels.PostableApiReceiver{}),
-					cmpopts.IgnoreFields(apimodels.PostableGrafanaReceiver{}, "UID", "Settings", "SecureSettings"),
-					cmpopts.SortSlices(func(a, b *apimodels.PostableGrafanaReceiver) bool { return a.Name < b.Name }),
-					cmpopts.SortSlices(func(a, b *apimodels.PostableApiReceiver) bool { return a.Name < b.Name }),
-				}
-				if !cmp.Equal(tt.expected[orgId].AlertmanagerConfig.Receivers, amConfig.AlertmanagerConfig.Receivers, cOpt...) {
-					t.Errorf("Unexpected Receivers: %v", cmp.Diff(tt.expected[orgId].AlertmanagerConfig.Receivers, amConfig.AlertmanagerConfig.Receivers, cOpt...))
-				}
-
-				// Order of routes is not guaranteed.
-				cOpt = []cmp.Option{
-					cmpopts.SortSlices(func(a, b *apimodels.Route) bool {
-						if a.Receiver != b.Receiver {
-							return a.Receiver < b.Receiver
-						}
-						return a.ObjectMatchers[0].Value < b.ObjectMatchers[0].Value
-					}),
-					cmpopts.IgnoreUnexported(apimodels.Route{}, labels.Matcher{}),
-					cmpopts.IgnoreFields(apimodels.Route{}, "GroupBy", "GroupByAll"),
-				}
-				if !cmp.Equal(tt.expected[orgId].AlertmanagerConfig.Route, amConfig.AlertmanagerConfig.Route, cOpt...) {
-					t.Errorf("Unexpected Route: %v", cmp.Diff(tt.expected[orgId].AlertmanagerConfig.Route, amConfig.AlertmanagerConfig.Route, cOpt...))
-				}
-			}
-		})
-	}
-}
-
-// TestDashAlertMigration tests the execution of the migration specifically for alert rules.
-func TestDashAlertMigration(t *testing.T) {
-	sqlStore := db.InitTestDB(t)
-	x := sqlStore.GetEngine()
-	service := NewTestMigrationService(t, sqlStore, &setting.Cfg{})
-
-	t.Run("when DashAlertMigration create ContactLabel on migrated AlertRules", func(t *testing.T) {
-		defer teardown(t, x, service)
-		legacyChannels := []*models.AlertNotification{
-			createAlertNotification(t, int64(1), "notifier1", "email", emailSettings, false),
-			createAlertNotification(t, int64(1), "notifier2", "slack", slackSettings, false),
-			createAlertNotification(t, int64(1), "notifier3", "opsgenie", opsgenieSettings, false),
-			createAlertNotification(t, int64(2), "notifier4", "email", emailSettings, false),
-			createAlertNotification(t, int64(2), "notifier5", "slack", slackSettings, false),
-			createAlertNotification(t, int64(2), "notifier6", "opsgenie", opsgenieSettings, true), // default
-		}
-		alerts := []*models.Alert{
-			createAlert(t, 1, 1, 1, "alert1", []string{"notifier1"}),
-			createAlert(t, 1, 1, 2, "alert2", []string{"notifier2", "notifier3"}),
-			createAlert(t, 1, 2, 3, "alert3", []string{"notifier3"}),
-			createAlert(t, 2, 3, 1, "alert4", []string{"notifier4"}),
-			createAlert(t, 2, 3, 2, "alert5", []string{"notifier4", "notifier5", "notifier6"}),
-			createAlert(t, 2, 4, 3, "alert6", []string{}),
-		}
-		expected := map[int64]map[string]*ngModels.AlertRule{
-			int64(1): {
-				"alert1": {Labels: map[string]string{ContactLabel: `"notifier1"`}},
-				"alert2": {Labels: map[string]string{ContactLabel: `"notifier2","notifier3"`}},
-				"alert3": {Labels: map[string]string{ContactLabel: `"notifier3"`}},
-			},
-			int64(2): {
-				"alert4": {Labels: map[string]string{ContactLabel: `"notifier4","notifier6"`}},
-				"alert5": {Labels: map[string]string{ContactLabel: `"notifier4","notifier5","notifier6"`}},
-				"alert6": {Labels: map[string]string{}},
-			},
-		}
-		dashes := []*dashboards.Dashboard{
-			createDashboard(t, 1, 1, "dash1-1", 5, nil),
-			createDashboard(t, 2, 1, "dash2-1", 5, nil),
-			createDashboard(t, 3, 2, "dash3-2", 6, nil),
-			createDashboard(t, 4, 2, "dash4-2", 6, nil),
-		}
-		folders := []*dashboards.Dashboard{
-			createFolder(t, 5, 1, "folder5-1"),
-			createFolder(t, 6, 2, "folder6-2"),
-		}
-		setupLegacyAlertsTables(t, x, legacyChannels, alerts, folders, dashes)
-		err := service.Run(context.Background())
-		require.NoError(t, err)
-
-		for orgId := range expected {
-			rules := getAlertRules(t, x, orgId)
-			expectedRulesMap := expected[orgId]
-			require.Len(t, rules, len(expectedRulesMap))
-			for _, r := range rules {
-				require.Equal(t, expectedRulesMap[r.Title].Labels[ContactLabel], r.Labels[ContactLabel])
-			}
-		}
-	})
-
-	t.Run("when DashAlertMigration create ContactLabel with sanitized name if name contains double quote", func(t *testing.T) {
-		defer teardown(t, x, service)
-		legacyChannels := []*models.AlertNotification{
-			createAlertNotification(t, int64(1), "notif\"ier1", "email", emailSettings, false),
-		}
-		alerts := []*models.Alert{
-			createAlert(t, 1, 1, 1, "alert1", []string{"notif\"ier1"}),
-		}
-		expected := map[int64]map[string]*ngModels.AlertRule{
-			int64(1): {
-				"alert1": {Labels: map[string]string{ContactLabel: `"notif_ier1"`}},
-			},
-		}
-		dashes := []*dashboards.Dashboard{
-			createDashboard(t, 1, 1, "dash1-1", 5, nil),
-		}
-		folders := []*dashboards.Dashboard{
-			createFolder(t, 5, 1, "folder5-1"),
-		}
-		setupLegacyAlertsTables(t, x, legacyChannels, alerts, folders, dashes)
-		err := service.Run(context.Background())
-		require.NoError(t, err)
-
-		for orgId := range expected {
-			rules := getAlertRules(t, x, orgId)
-			expectedRulesMap := expected[orgId]
-			require.Len(t, rules, len(expectedRulesMap))
-			for _, r := range rules {
-				require.Equal(t, expectedRulesMap[r.Title].Labels[ContactLabel], r.Labels[ContactLabel])
-			}
-		}
-	})
-
-	t.Run("when folder is missing put alert in General folder", func(t *testing.T) {
-		defer teardown(t, x, service)
-		o := createOrg(t, 1)
-		folder1 := createFolder(t, 1, o.ID, "folder-1")
-		dash1 := createDashboard(t, 3, o.ID, "dash1", folder1.ID, nil)
-		dash2 := createDashboard(t, 4, o.ID, "dash2", 22, nil) // missing folder
-
-		a1 := createAlert(t, int(o.ID), int(dash1.ID), 1, "alert-1", []string{})
-		a2 := createAlert(t, int(o.ID), int(dash2.ID), 1, "alert-2", []string{})
-
-		_, err := x.Insert(o, folder1, dash1, dash2, a1, a2)
-		require.NoError(t, err)
-
-		err = service.Run(context.Background())
-		require.NoError(t, err)
-
-		rules := getAlertRules(t, x, o.ID)
-		require.Len(t, rules, 2)
-
-		var generalFolder dashboards.Dashboard
-		_, err = x.Table(&dashboards.Dashboard{}).Where("title = ? AND org_id = ?", generalAlertingFolderTitle, o.ID).Get(&generalFolder)
-		require.NoError(t, err)
-
-		require.NotNil(t, generalFolder)
-
-		for _, rule := range rules {
-			var expectedFolder dashboards.Dashboard
-			if rule.Title == a1.Name {
-				expectedFolder = *folder1
-			} else {
-				expectedFolder = generalFolder
-			}
-			require.Equal(t, expectedFolder.UID, rule.NamespaceUID)
-		}
-	})
-}
-
-// TestDashAlertQueryMigration tests the execution of the migration specifically for alert rule queries.
-func TestDashAlertQueryMigration(t *testing.T) {
-	sqlStore := db.InitTestDB(t)
-	x := sqlStore.GetEngine()
-	service := NewTestMigrationService(t, sqlStore, &setting.Cfg{})
-
-	createAlertQuery := func(refId string, ds string, from string, to string) ngModels.AlertQuery {
-		dur, _ := calculateInterval(legacydata.NewDataTimeRange(from, to), simplejson.New(), nil)
-		intervalMs := strconv.FormatInt(dur.Milliseconds(), 10)
-		rel, _ := getRelativeDuration(from, to)
-		return ngModels.AlertQuery{
-			RefID:             refId,
-			RelativeTimeRange: ngModels.RelativeTimeRange{From: rel.From, To: rel.To},
-			DatasourceUID:     ds,
-			Model:             []byte(fmt.Sprintf(`{"datasource":{"type":"prometheus","uid":"gdev-prometheus"},"expr":"up{job=\"fake-data-gen\"}","instant":false,"intervalMs":%s,"maxDataPoints":1500,"refId":"%s"}`, intervalMs, refId)),
-		}
-	}
-
-	createClassicConditionQuery := func(refId string, conditions []classicConditionJSON) ngModels.AlertQuery {
-		exprModel := struct {
-			Type       string                 `json:"type"`
-			RefID      string                 `json:"refId"`
-			Conditions []classicConditionJSON `json:"conditions"`
-		}{
-			"classic_conditions",
-			refId,
-			conditions,
-		}
-		exprModelJSON, _ := json.Marshal(&exprModel)
-
-		q := ngModels.AlertQuery{
-			RefID:         refId,
-			DatasourceUID: expressionDatasourceUID,
-			Model:         exprModelJSON,
-		}
-		// IntervalMS and MaxDataPoints are created PreSave by AlertQuery. They don't appear to be necessary for expressions,
-		// but run PreSave here to match the expected model.
-		_ = q.PreSave()
-		return q
-	}
-
-	cond := func(refId string, reducer string, evalType string, thresh float64) classicConditionJSON {
-		return classicConditionJSON{
-			Evaluator: migrationStore.ConditionEvalJSON{Params: []float64{thresh}, Type: evalType},
-			Operator: struct {
-				Type string `json:"type"`
-			}{Type: "and"},
-			Query: struct {
-				Params []string `json:"params"`
-			}{Params: []string{refId}},
-			Reducer: struct {
-				Type string `json:"type"`
-			}{Type: reducer},
-		}
-	}
-
-	genAlert := func(mutators ...ngModels.AlertRuleMutator) *ngModels.AlertRule {
-		rule := &ngModels.AlertRule{
-			ID:              1,
-			OrgID:           1,
-			Title:           "alert1",
-			Condition:       "B",
-			Data:            []ngModels.AlertQuery{},
-			IntervalSeconds: 60,
-			Version:         1,
-			NamespaceUID:    "folder5-1",
-			DashboardUID:    pointer("dash1-1"),
-			PanelID:         pointer(int64(1)),
-			RuleGroup:       "dash1-1",
-			RuleGroupIndex:  1,
-			NoDataState:     ngModels.NoData,
-			ExecErrState:    ngModels.AlertingErrState,
-			For:             60 * time.Second,
-			Annotations: map[string]string{
-				"message": "message",
-			},
-			Labels:   map[string]string{},
-			IsPaused: false,
-		}
-
-		for _, mutator := range mutators {
-			mutator(rule)
-		}
-
-		rule.RuleGroup = fmt.Sprintf("%s - %d", *rule.DashboardUID, *rule.PanelID)
-
-		rule.Annotations["__dashboardUid__"] = *rule.DashboardUID
-		rule.Annotations["__panelId__"] = strconv.FormatInt(*rule.PanelID, 10)
-		return rule
-	}
-
-	type testcase struct {
-		name   string
-		alerts []*models.Alert
-
-		expectedFolder *dashboards.Dashboard
-		expected       map[int64][]*ngModels.AlertRule
-	}
-
-	tc := []testcase{
-		{
-			name: "simple query and condition",
-			alerts: []*models.Alert{
-				createAlertWithCond(t, 1, 1, 1, "alert1", nil,
-					[]migrationStore.DashAlertCondition{createCondition("A", "max", "gt", 42, 1, "5m", "now")}),
-				createAlertWithCond(t, 2, 3, 1, "alert1", nil,
-					[]migrationStore.DashAlertCondition{createCondition("A", "max", "gt", 42, 3, "5m", "now")}),
-			},
-			expected: map[int64][]*ngModels.AlertRule{
-				int64(1): {
-					genAlert(func(rule *ngModels.AlertRule) {
-						rule.Data = append(rule.Data, createAlertQuery("A", "ds1-1", "5m", "now"))
-						rule.Data = append(rule.Data, createClassicConditionQuery("B", []classicConditionJSON{
-							cond("A", "max", "gt", 42),
-						}))
-					}),
-				},
-				int64(2): {
-					genAlert(func(rule *ngModels.AlertRule) {
-						rule.OrgID = 2
-						rule.DashboardUID = pointer("dash3-2")
-						rule.NamespaceUID = "folder6-2"
-						rule.Data = append(rule.Data, createAlertQuery("A", "ds3-2", "5m", "now"))
-						rule.Data = append(rule.Data, createClassicConditionQuery("B", []classicConditionJSON{
-							cond("A", "max", "gt", 42),
-						}))
-					}),
-				},
-			},
-		},
-		{
-			name: "multiple conditions",
-			alerts: []*models.Alert{
-				createAlertWithCond(t, 1, 1, 1, "alert1", nil,
-					[]migrationStore.DashAlertCondition{
-						createCondition("A", "avg", "gt", 42, 1, "5m", "now"),
-						createCondition("B", "max", "gt", 43, 2, "3m", "now"),
-						createCondition("C", "min", "lt", 20, 2, "3m", "now"),
-					}),
-			},
-			expected: map[int64][]*ngModels.AlertRule{
-				int64(1): {
-					genAlert(func(rule *ngModels.AlertRule) {
-						rule.Condition = "D"
-						rule.Data = append(rule.Data, createAlertQuery("A", "ds1-1", "5m", "now"))
-						rule.Data = append(rule.Data, createAlertQuery("B", "ds2-1", "3m", "now"))
-						rule.Data = append(rule.Data, createAlertQuery("C", "ds2-1", "3m", "now"))
-						rule.Data = append(rule.Data, createClassicConditionQuery("D", []classicConditionJSON{
-							cond("A", "avg", "gt", 42),
-							cond("B", "max", "gt", 43),
-							cond("C", "min", "lt", 20),
-						}))
-					}),
-				},
-			},
-		},
-		{
-			name: "multiple conditions on same query with same timerange should not create multiple queries",
-			alerts: []*models.Alert{
-				createAlertWithCond(t, 1, 1, 1, "alert1", nil,
-					[]migrationStore.DashAlertCondition{
-						createCondition("A", "max", "gt", 42, 1, "5m", "now"),
-						createCondition("A", "avg", "gt", 20, 1, "5m", "now"),
-					}),
-			},
-			expected: map[int64][]*ngModels.AlertRule{
-				int64(1): {
-					genAlert(func(rule *ngModels.AlertRule) {
-						rule.Condition = "B"
-						rule.Data = append(rule.Data, createAlertQuery("A", "ds1-1", "5m", "now"))
-						rule.Data = append(rule.Data, createClassicConditionQuery("B", []classicConditionJSON{
-							cond("A", "max", "gt", 42),
-							cond("A", "avg", "gt", 20),
-						}))
-					}),
-				},
-			},
-		},
-		{
-			name: "multiple conditions on same query with different timeranges should create multiple queries",
-			alerts: []*models.Alert{
-				createAlertWithCond(t, 1, 1, 1, "alert1", nil,
-					[]migrationStore.DashAlertCondition{
-						createCondition("A", "max", "gt", 42, 1, "5m", "now"),
-						createCondition("A", "avg", "gt", 20, 1, "3m", "now"),
-					}),
-			},
-			expected: map[int64][]*ngModels.AlertRule{
-				int64(1): {
-					genAlert(func(rule *ngModels.AlertRule) {
-						rule.Condition = "C"
-						rule.Data = append(rule.Data, createAlertQuery("A", "ds1-1", "3m", "now")) // Ordered by time range.
-						rule.Data = append(rule.Data, createAlertQuery("B", "ds1-1", "5m", "now"))
-						rule.Data = append(rule.Data, createClassicConditionQuery("C", []classicConditionJSON{
-							cond("B", "max", "gt", 42),
-							cond("A", "avg", "gt", 20),
-						}))
-					}),
-				},
-			},
-		},
-		{
-			name: "multiple conditions custom refIds",
-			alerts: []*models.Alert{
-				createAlertWithCond(t, 1, 1, 1, "alert1", nil,
-					[]migrationStore.DashAlertCondition{
-						createCondition("Q1", "avg", "gt", 42, 1, "5m", "now"),
-						createCondition("Q2", "max", "gt", 43, 2, "3m", "now"),
-						createCondition("Q3", "min", "lt", 20, 2, "3m", "now"),
-					}),
-			},
-			expected: map[int64][]*ngModels.AlertRule{
-				int64(1): {
-					genAlert(func(rule *ngModels.AlertRule) {
-						rule.Condition = "A"
-						rule.Data = append(rule.Data, createClassicConditionQuery("A", []classicConditionJSON{
-							cond("Q1", "avg", "gt", 42),
-							cond("Q2", "max", "gt", 43),
-							cond("Q3", "min", "lt", 20),
-						}))
-						rule.Data = append(rule.Data, createAlertQuery("Q1", "ds1-1", "5m", "now"))
-						rule.Data = append(rule.Data, createAlertQuery("Q2", "ds2-1", "3m", "now"))
-						rule.Data = append(rule.Data, createAlertQuery("Q3", "ds2-1", "3m", "now"))
-					}),
-				},
-			},
-		},
-		{
-			name: "multiple conditions out of order refIds, queries should be sorted by refId and conditions should be in original order",
-			alerts: []*models.Alert{
-				createAlertWithCond(t, 1, 1, 1, "alert1", nil,
-					[]migrationStore.DashAlertCondition{
-						createCondition("B", "avg", "gt", 42, 1, "5m", "now"),
-						createCondition("C", "max", "gt", 43, 2, "3m", "now"),
-						createCondition("A", "min", "lt", 20, 2, "3m", "now"),
-					}),
-			},
-			expected: map[int64][]*ngModels.AlertRule{
-				int64(1): {
-					genAlert(func(rule *ngModels.AlertRule) {
-						rule.Condition = "D"
-						rule.Data = append(rule.Data, createAlertQuery("A", "ds2-1", "3m", "now"))
-						rule.Data = append(rule.Data, createAlertQuery("B", "ds1-1", "5m", "now"))
-						rule.Data = append(rule.Data, createAlertQuery("C", "ds2-1", "3m", "now"))
-						rule.Data = append(rule.Data, createClassicConditionQuery("D", []classicConditionJSON{
-							cond("B", "avg", "gt", 42),
-							cond("C", "max", "gt", 43),
-							cond("A", "min", "lt", 20),
-						}))
-					}),
-				},
-			},
-		},
-		{
-			name: "multiple conditions out of order with duplicate refIds",
-			alerts: []*models.Alert{
-				createAlertWithCond(t, 1, 1, 1, "alert1", nil,
-					[]migrationStore.DashAlertCondition{
-						createCondition("C", "avg", "gt", 42, 1, "5m", "now"),
-						createCondition("C", "max", "gt", 43, 1, "3m", "now"),
-						createCondition("B", "min", "lt", 20, 2, "5m", "now"),
-						createCondition("B", "min", "lt", 21, 2, "3m", "now"),
-					}),
-			},
-			expected: map[int64][]*ngModels.AlertRule{
-				int64(1): {
-					genAlert(func(rule *ngModels.AlertRule) {
-						rule.Condition = "E"
-						rule.Data = append(rule.Data, createAlertQuery("A", "ds2-1", "3m", "now"))
-						rule.Data = append(rule.Data, createAlertQuery("B", "ds2-1", "5m", "now"))
-						rule.Data = append(rule.Data, createAlertQuery("C", "ds1-1", "3m", "now"))
-						rule.Data = append(rule.Data, createAlertQuery("D", "ds1-1", "5m", "now"))
-						rule.Data = append(rule.Data, createClassicConditionQuery("E", []classicConditionJSON{
-							cond("D", "avg", "gt", 42),
-							cond("C", "max", "gt", 43),
-							cond("B", "min", "lt", 20),
-							cond("A", "min", "lt", 21),
-						}))
-					}),
-				},
-			},
-		},
-		{
-			name: "alerts with unknown datasource id migrates with empty datasource uid",
-			alerts: []*models.Alert{
-				createAlertWithCond(t, 1, 1, 1, "alert1", nil,
-					[]migrationStore.DashAlertCondition{createCondition("A", "max", "gt", 42, 123, "5m", "now")}), // Unknown datasource id.
-			},
-			expected: map[int64][]*ngModels.AlertRule{
-				int64(1): {
-					genAlert(func(rule *ngModels.AlertRule) {
-						rule.Data = append(rule.Data, createAlertQuery("A", "", "5m", "now")) // Empty datasource UID.
-						rule.Data = append(rule.Data, createClassicConditionQuery("B", []classicConditionJSON{
-							cond("A", "max", "gt", 42),
-						}))
-					}),
-				},
-			},
-		},
-		{
-			name: "alerts with unknown dashboard do not migrate",
-			alerts: []*models.Alert{
-				createAlertWithCond(t, 1, 22, 1, "alert1", nil,
-					[]migrationStore.DashAlertCondition{
-						createCondition("A", "avg", "gt", 42, 1, "5m", "now"),
-					}),
-			},
-			expected: map[int64][]*ngModels.AlertRule{
-				int64(1): {},
-			},
-		},
-		{
-			name: "alerts with unknown org do not migrate",
-			alerts: []*models.Alert{
-				createAlertWithCond(t, 22, 1, 1, "alert1", nil,
-					[]migrationStore.DashAlertCondition{
-						createCondition("A", "avg", "gt", 42, 1, "5m", "now"),
-					}),
-			},
-			expected: map[int64][]*ngModels.AlertRule{
-				int64(22): {},
-			},
-		},
-		{
-			name: "alerts in general folder migrate to existing general alerting",
-			alerts: []*models.Alert{
-				createAlertWithCond(t, 1, 8, 1, "alert1", nil,
-					[]migrationStore.DashAlertCondition{
-						createCondition("A", "avg", "gt", 42, 1, "5m", "now"),
-					}),
-			},
-			expected: map[int64][]*ngModels.AlertRule{
-				int64(1): {
-					genAlert(func(rule *ngModels.AlertRule) {
-						rule.NamespaceUID = "General Alerting"
-						rule.DashboardUID = pointer("dash-in-general-1")
-						rule.Data = append(rule.Data, createAlertQuery("A", "ds1-1", "5m", "now"))
-						rule.Data = append(rule.Data, createClassicConditionQuery("B", []classicConditionJSON{
-							cond("A", "avg", "gt", 42),
-						}))
-					}),
-				},
-			},
-		},
-		{
-			name: "alerts in general folder migrate to newly created general alerting if one doesn't exist",
-			alerts: []*models.Alert{
-				createAlertWithCond(t, 2, 9, 1, "alert1", nil, // Org 2 doesn't have general alerting folder.
-					[]migrationStore.DashAlertCondition{
-						createCondition("A", "avg", "gt", 42, 3, "5m", "now"),
-					}),
-			},
-			expectedFolder: &dashboards.Dashboard{
-				OrgID:    2,
-				Title:    "General Alerting",
-				FolderID: 0,
-				Slug:     "general-alerting",
-			},
-			expected: map[int64][]*ngModels.AlertRule{
-				int64(2): {
-					genAlert(func(rule *ngModels.AlertRule) {
-						rule.OrgID = 2
-						rule.DashboardUID = pointer("dash-in-general-2")
-						rule.Data = append(rule.Data, createAlertQuery("A", "ds3-2", "5m", "now"))
-						rule.Data = append(rule.Data, createClassicConditionQuery("B", []classicConditionJSON{
-							cond("A", "avg", "gt", 42),
-						}))
-					}),
-				},
-			},
-		},
-	}
-	for _, tt := range tc {
-		t.Run(tt.name, func(t *testing.T) {
-			defer teardown(t, x, service)
-			dashes := []*dashboards.Dashboard{
-				createDashboard(t, 1, 1, "dash1-1", 5, nil),
-				createDashboard(t, 2, 1, "dash2-1", 5, nil),
-				createDashboard(t, 3, 2, "dash3-2", 6, nil),
-				createDashboard(t, 4, 2, "dash4-2", 6, nil),
-				createDashboard(t, 8, 1, "dash-in-general-1", 0, nil),
-				createDashboard(t, 9, 2, "dash-in-general-2", 0, nil),
-				createDashboard(t, 10, 1, "dash-with-acl-1", 5, func(d *dashboards.Dashboard) {
-					d.Title = "Dashboard With ACL 1"
-					d.HasACL = true
-				}),
-			}
-			folders := []*dashboards.Dashboard{
-				createFolder(t, 5, 1, "folder5-1"),
-				createFolder(t, 6, 2, "folder6-2"),
-				createFolder(t, 7, 1, "General Alerting"),
-			}
-			setupLegacyAlertsTables(t, x, nil, tt.alerts, folders, dashes)
-
-			err := service.Run(context.Background())
-			require.NoError(t, err)
-
-			for orgId, expected := range tt.expected {
-				rules := getAlertRules(t, x, orgId)
-
-				for _, r := range rules {
-					// Remove generated fields.
-					require.NotEqual(t, r.Labels["rule_uid"], "")
-					delete(r.Labels, "rule_uid")
-					require.NotEqual(t, r.Annotations["__alertId__"], "")
-					delete(r.Annotations, "__alertId__")
-
-					// If folder is created, we check if separately
-					if tt.expectedFolder != nil {
-						folder := getDashboard(t, x, orgId, r.NamespaceUID)
-						require.Equal(t, tt.expectedFolder.Title, folder.Title)
-						require.Equal(t, tt.expectedFolder.OrgID, folder.OrgID)
-						require.Equal(t, tt.expectedFolder.FolderID, folder.FolderID)
-					}
-				}
-
-				cOpt := []cmp.Option{
-					cmpopts.SortSlices(func(a, b *ngModels.AlertRule) bool {
-						return a.ID < b.ID
-					}),
-					cmpopts.IgnoreUnexported(ngModels.AlertRule{}, ngModels.AlertQuery{}),
-					cmpopts.IgnoreFields(ngModels.AlertRule{}, "Updated", "UID", "ID"),
-				}
-				if tt.expectedFolder != nil {
-					cOpt = append(cOpt, cmpopts.IgnoreFields(ngModels.AlertRule{}, "NamespaceUID"))
-				}
-				if !cmp.Equal(expected, rules, cOpt...) {
-					t.Errorf("Unexpected Rule: %v", cmp.Diff(expected, rules, cOpt...))
-				}
-			}
-		})
-	}
-}
-
-const (
-	emailSettings    = `{"addresses": "test"}`
-	slackSettings    = `{"recipient": "test", "token": "test"}`
-	opsgenieSettings = `{"apiKey": "test"}`
-)
-
-var (
-	now = time.Now()
-)
-
-// createAlertNotificationWithReminder creates a legacy alert notification channel for inserting into the test database.
-func createAlertNotificationWithReminder(t *testing.T, orgId int64, uid string, channelType string, settings string, defaultChannel bool, sendReminder bool, frequency time.Duration) *models.AlertNotification {
-	t.Helper()
-	settingsJson := simplejson.New()
-	if settings != "" {
-		s, err := simplejson.NewJson([]byte(settings))
-		if err != nil {
-			t.Fatalf("Failed to unmarshal alert notification json: %v", err)
-		}
-		settingsJson = s
-	}
-
-	return &models.AlertNotification{
-		OrgID:                 orgId,
-		UID:                   uid,
-		Name:                  uid, // Same as uid to make testing easier.
-		Type:                  channelType,
-		DisableResolveMessage: false,
-		IsDefault:             defaultChannel,
-		Settings:              settingsJson,
-		SecureSettings:        make(map[string][]byte),
-		Created:               now,
-		Updated:               now,
-		SendReminder:          sendReminder,
-		Frequency:             frequency,
-	}
-}
-
-// createAlertNotification creates a legacy alert notification channel for inserting into the test database.
-func createAlertNotification(t *testing.T, orgId int64, uid string, channelType string, settings string, defaultChannel bool) *models.AlertNotification {
-	return createAlertNotificationWithReminder(t, orgId, uid, channelType, settings, defaultChannel, false, time.Duration(0))
-}
-
-var queryModel = `{"datasource":{"type":"prometheus","uid":"gdev-prometheus"},"expr":"up{job=\"fake-data-gen\"}","instant":false,"refId":"%s"}`
-
-func createCondition(refId string, reducer string, evalType string, thresh float64, datasourceId int64, from string, to string) migrationStore.DashAlertCondition {
-	return migrationStore.DashAlertCondition{
-		Evaluator: migrationStore.ConditionEvalJSON{
-			Params: []float64{thresh},
-			Type:   evalType,
-		},
-		Operator: struct {
-			Type string `json:"type"`
-		}{
-			Type: "and",
-		},
-		Query: struct {
-			Params       []string `json:"params"`
-			DatasourceID int64    `json:"datasourceId"`
-			Model        json.RawMessage
-		}{
-			Params:       []string{refId, from, to},
-			DatasourceID: datasourceId,
-			Model:        []byte(fmt.Sprintf(queryModel, refId)),
-		},
-		Reducer: struct {
-			Type string `json:"type"`
-		}{
-			Type: reducer,
-		},
-	}
-}
-
-// createAlert creates a legacy alert rule for inserting into the test database.
-func createAlert(t *testing.T, orgId int, dashboardId int, panelsId int, name string, notifierUids []string) *models.Alert {
-	return createAlertWithCond(t, orgId, dashboardId, panelsId, name, notifierUids, []migrationStore.DashAlertCondition{})
-}
-
-// createAlert creates a legacy alert rule for inserting into the test database.
-func createAlertWithCond(t *testing.T, orgId int, dashboardId int, panelsId int, name string, notifierUids []string, cond []migrationStore.DashAlertCondition) *models.Alert {
-	t.Helper()
-
-	var settings = simplejson.New()
-	if len(notifierUids) != 0 {
-		notifiers := make([]any, 0)
-		for _, n := range notifierUids {
-			notifiers = append(notifiers, struct {
-				Uid string
-			}{Uid: n})
-		}
-
-		settings.Set("notifications", notifiers)
-	}
-	settings.Set("conditions", cond)
-
-	return &models.Alert{
-		OrgID:        int64(orgId),
-		DashboardID:  int64(dashboardId),
-		PanelID:      int64(panelsId),
-		Name:         name,
-		Message:      "message",
-		Frequency:    int64(60),
-		For:          60 * time.Second,
-		State:        models.AlertStateOK,
-		Settings:     settings,
-		NewStateDate: now,
-		Created:      now,
-		Updated:      now,
-	}
-}
-
-// createDashboard creates a folder for inserting into the test database.
-func createFolder(t *testing.T, id int64, orgId int64, uid string) *dashboards.Dashboard {
-	f := createDashboard(t, id, orgId, uid, 0, nil)
-	f.IsFolder = true
-	return f
-}
-
-// createDashboard creates a dashboard for inserting into the test database.
-func createDashboard(t *testing.T, id int64, orgId int64, uid string, folderId int64, mut func(*dashboards.Dashboard)) *dashboards.Dashboard {
-	t.Helper()
-	d := &dashboards.Dashboard{
-		ID:       id,
-		OrgID:    orgId,
-		UID:      uid,
-		Created:  now,
-		Updated:  now,
-		Title:    uid, // Not tested, needed to satisfy constraint.
-		FolderID: folderId,
-		Data:     simplejson.New(),
-		Version:  1,
-	}
-	if mut != nil {
-		mut(d)
-	}
-	return d
-}
-
-// createDatasource creates a datasource for inserting into the test database.
-func createDatasource(t *testing.T, id int64, orgId int64, uid string) *datasources.DataSource {
-	t.Helper()
-	return &datasources.DataSource{
-		ID:      id,
-		OrgID:   orgId,
-		UID:     uid,
-		Created: now,
-		Updated: now,
-		Name:    uid, // Not tested, needed to satisfy constraint.
-	}
-}
-
-func createOrg(t *testing.T, id int64) *org.Org {
-	t.Helper()
-	return &org.Org{
-		ID:      id,
-		Version: 1,
-		Name:    fmt.Sprintf("org_%d", id),
-		Created: time.Now(),
-		Updated: time.Now(),
-	}
-}
-
-// teardown cleans the input tables between test cases.
-func teardown(t *testing.T, x *xorm.Engine, service *migrationService) {
-	_, err := x.Exec("DELETE from org")
-	require.NoError(t, err)
-	_, err = x.Exec("DELETE from alert")
-	require.NoError(t, err)
-	_, err = x.Exec("DELETE from alert_notification")
-	require.NoError(t, err)
-	_, err = x.Exec("DELETE from dashboard")
-	require.NoError(t, err)
-	_, err = x.Exec("DELETE from data_source")
-	require.NoError(t, err)
-	err = service.migrationStore.RevertAllOrgs(context.Background())
-	require.NoError(t, err)
-}
-
-// setupLegacyAlertsTables inserts data into the legacy alerting tables that is needed for testing the
-func setupLegacyAlertsTables(t *testing.T, x *xorm.Engine, legacyChannels []*models.AlertNotification, alerts []*models.Alert, folders []*dashboards.Dashboard, dashes []*dashboards.Dashboard) {
-	t.Helper()
-
-	orgs := []org.Org{
-		*createOrg(t, 1),
-		*createOrg(t, 2),
-	}
-
-	// Setup folders.
-	if len(folders) > 0 {
-		_, err := x.Insert(folders)
-		require.NoError(t, err)
-	}
-
-	// Setup dashboards.
-	if len(dashes) > 0 {
-		_, err := x.Insert(dashes)
-		require.NoError(t, err)
-	}
-
-	// Setup data_sources.
-	dataSources := []datasources.DataSource{
-		*createDatasource(t, 1, 1, "ds1-1"),
-		*createDatasource(t, 2, 1, "ds2-1"),
-		*createDatasource(t, 3, 2, "ds3-2"),
-		*createDatasource(t, 4, 2, "ds4-2"),
-	}
-
-	_, errOrgs := x.Insert(orgs)
-	require.NoError(t, errOrgs)
-
-	_, errDataSourcess := x.Insert(dataSources)
-	require.NoError(t, errDataSourcess)
-
-	if len(legacyChannels) > 0 {
-		_, channelErr := x.Insert(legacyChannels)
-		require.NoError(t, channelErr)
-	}
-
-	if len(alerts) > 0 {
-		_, alertErr := x.Insert(alerts)
-		require.NoError(t, alertErr)
-	}
-}
-
-// getAlertmanagerConfig retreives the Alertmanager Config from the database for a given orgId.
-func getAlertmanagerConfig(t *testing.T, x *xorm.Engine, orgId int64) *apimodels.PostableUserConfig {
-	amConfig := ""
-	_, err := x.Table("alert_configuration").Where("org_id = ?", orgId).Cols("alertmanager_configuration").Get(&amConfig)
-	require.NoError(t, err)
-
-	config := apimodels.PostableUserConfig{}
-	err = json.Unmarshal([]byte(amConfig), &config)
-	require.NoError(t, err)
-	return &config
-}
-
-// getAlertmanagerConfig retreives the Alertmanager Config from the database for a given orgId.
-func getAlertRules(t *testing.T, x *xorm.Engine, orgId int64) []*ngModels.AlertRule {
-	rules := make([]*ngModels.AlertRule, 0)
-	err := x.Table("alert_rule").Where("org_id = ?", orgId).Find(&rules)
-	require.NoError(t, err)
-
-	return rules
-}
-
-// getDashboard retrieves a dashboard from the database for a given org, uid.
-func getDashboard(t *testing.T, x *xorm.Engine, orgId int64, uid string) *dashboards.Dashboard {
-	dashes := make([]*dashboards.Dashboard, 0)
-	err := x.Table("dashboard").Where("org_id = ? AND uid = ?", orgId, uid).Find(&dashes)
-	require.NoError(t, err)
-	if len(dashes) > 1 {
-		t.Error("Expected only one dashboard to be returned")
-	}
-	if len(dashes) == 0 {
-		return nil
-	}
-
-	return dashes[0]
-}
-
-func pointer[T any](b T) *T {
-	return &b
-}
diff --git a/pkg/services/ngalert/migration/models.go b/pkg/services/ngalert/migration/models.go
deleted file mode 100644
index 15a12d2cfd448..0000000000000
--- a/pkg/services/ngalert/migration/models.go
+++ /dev/null
@@ -1,141 +0,0 @@
-package migration
-
-import (
-	"strings"
-
-	pb "github.com/prometheus/alertmanager/silence/silencepb"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/folder"
-	migmodels "github.com/grafana/grafana/pkg/services/ngalert/migration/models"
-	migrationStore "github.com/grafana/grafana/pkg/services/ngalert/migration/store"
-	"github.com/grafana/grafana/pkg/services/ngalert/models"
-	"github.com/grafana/grafana/pkg/services/ngalert/store"
-	"github.com/grafana/grafana/pkg/services/secrets"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/util"
-)
-
-// OrgMigration is a helper struct for migrating alerts for a single org. It contains state, services, and caches.
-type OrgMigration struct {
-	cfg *setting.Cfg
-	log log.Logger
-
-	migrationStore    migrationStore.Store
-	encryptionService secrets.Service
-
-	orgID               int64
-	seenUIDs            Deduplicator
-	silences            []*pb.MeshSilence
-	alertRuleTitleDedup map[string]Deduplicator // Folder -> Deduplicator (Title).
-	alertRuleGroupDedup map[string]Deduplicator // Folder -> Deduplicator (Group).
-
-	// Migrated folder for a dashboard based on permissions. Parent Folder ID -> unique dashboard permission -> custom folder.
-	permissionsMap        map[int64]map[permissionHash]*folder.Folder
-	folderCache           map[int64]*folder.Folder                      // Folder ID -> Folder.
-	folderPermissionCache map[string][]accesscontrol.ResourcePermission // Folder UID -> Folder Permissions.
-	generalAlertingFolder *folder.Folder
-
-	state *migmodels.OrgMigrationState
-}
-
-// newOrgMigration creates a new OrgMigration for the given orgID.
-func (ms *migrationService) newOrgMigration(orgID int64) *OrgMigration {
-	return &OrgMigration{
-		cfg: ms.cfg,
-		log: ms.log.New("orgID", orgID),
-
-		migrationStore:    ms.migrationStore,
-		encryptionService: ms.encryptionService,
-
-		orgID: orgID,
-		// We deduplicate for case-insensitive matching in MySQL-compatible backend flavours because they use case-insensitive collation.
-		seenUIDs:            Deduplicator{set: make(map[string]struct{}), caseInsensitive: ms.migrationStore.CaseInsensitive()},
-		silences:            make([]*pb.MeshSilence, 0),
-		alertRuleTitleDedup: make(map[string]Deduplicator),
-
-		// We deduplicate alert rule groups so that we don't have to ensure that the alerts rules have the same interval.
-		alertRuleGroupDedup: make(map[string]Deduplicator),
-
-		permissionsMap:        make(map[int64]map[permissionHash]*folder.Folder),
-		folderCache:           make(map[int64]*folder.Folder),
-		folderPermissionCache: make(map[string][]accesscontrol.ResourcePermission),
-
-		state: &migmodels.OrgMigrationState{
-			OrgID:          orgID,
-			CreatedFolders: make([]string, 0),
-		},
-	}
-}
-
-func (om *OrgMigration) AlertTitleDeduplicator(folderUID string) Deduplicator {
-	if _, ok := om.alertRuleTitleDedup[folderUID]; !ok {
-		om.alertRuleTitleDedup[folderUID] = Deduplicator{
-			set:             make(map[string]struct{}),
-			caseInsensitive: om.migrationStore.CaseInsensitive(),
-			maxLen:          store.AlertDefinitionMaxTitleLength,
-		}
-	}
-	return om.alertRuleTitleDedup[folderUID]
-}
-
-func (om *OrgMigration) AlertGroupDeduplicator(folderUID string) Deduplicator {
-	if _, ok := om.alertRuleGroupDedup[folderUID]; !ok {
-		om.alertRuleGroupDedup[folderUID] = Deduplicator{
-			set:             make(map[string]struct{}),
-			caseInsensitive: om.migrationStore.CaseInsensitive(),
-			maxLen:          store.AlertRuleMaxRuleGroupNameLength,
-		}
-	}
-	return om.alertRuleGroupDedup[folderUID]
-}
-
-type AlertPair struct {
-	AlertRule *models.AlertRule
-	DashAlert *migrationStore.DashAlert
-}
-
-// Deduplicator is a wrapper around map[string]struct{} and util.GenerateShortUID() which aims help maintain and generate
-// unique strings (such as uids or titles). if caseInsensitive is true, all uniqueness is determined in a
-// case-insensitive manner. if maxLen is greater than 0, all strings will be truncated to maxLen before being checked in
-// contains and dedup will always return a string of length maxLen or less.
-type Deduplicator struct {
-	set             map[string]struct{}
-	caseInsensitive bool
-	maxLen          int
-}
-
-// contains checks whether the given string has already been seen by this Deduplicator.
-func (s *Deduplicator) contains(u string) bool {
-	dedup := u
-	if s.caseInsensitive {
-		dedup = strings.ToLower(dedup)
-	}
-	if s.maxLen > 0 && len(dedup) > s.maxLen {
-		dedup = dedup[:s.maxLen]
-	}
-	_, seen := s.set[dedup]
-	return seen
-}
-
-// deduplicate returns a unique string based on the given string by appending a uuid to it. Will truncate the given string if
-// the resulting string would be longer than maxLen.
-func (s *Deduplicator) deduplicate(dedup string) string {
-	uid := util.GenerateShortUID()
-	if s.maxLen > 0 && len(dedup)+1+len(uid) > s.maxLen {
-		trunc := s.maxLen - 1 - len(uid)
-		dedup = dedup[:trunc]
-	}
-
-	return dedup + "_" + uid
-}
-
-// add adds the given string to the Deduplicator.
-func (s *Deduplicator) add(uid string) {
-	dedup := uid
-	if s.caseInsensitive {
-		dedup = strings.ToLower(dedup)
-	}
-	s.set[dedup] = struct{}{}
-}
diff --git a/pkg/services/ngalert/migration/models/state.go b/pkg/services/ngalert/migration/models/state.go
deleted file mode 100644
index c965443ba67bc..0000000000000
--- a/pkg/services/ngalert/migration/models/state.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package models
-
-// OrgMigrationState contains information about the state of an org migration.
-type OrgMigrationState struct {
-	OrgID          int64    `json:"orgId"`
-	CreatedFolders []string `json:"createdFolders"`
-}
-
-// DashboardUpgradeInfo contains information about a dashboard that was upgraded.
-type DashboardUpgradeInfo struct {
-	DashboardUID  string
-	DashboardName string
-	NewFolderUID  string
-	NewFolderName string
-}
diff --git a/pkg/services/ngalert/migration/permissions.go b/pkg/services/ngalert/migration/permissions.go
deleted file mode 100644
index 48894c9617ec3..0000000000000
--- a/pkg/services/ngalert/migration/permissions.go
+++ /dev/null
@@ -1,412 +0,0 @@
-package migration
-
-import (
-	"context"
-	"crypto"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"sort"
-	"strings"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/auth/identity"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/datasources"
-	"github.com/grafana/grafana/pkg/services/folder"
-	migmodels "github.com/grafana/grafana/pkg/services/ngalert/migration/models"
-	"github.com/grafana/grafana/pkg/services/org"
-	"github.com/grafana/grafana/pkg/services/user"
-)
-
-// DASHBOARD_FOLDER is the format used to generate the folder name for migrated dashboards with custom permissions.
-const DASHBOARD_FOLDER = "%s Alerts - %s"
-
-// MaxFolderName is the maximum length of the folder name generated using DASHBOARD_FOLDER format
-const MaxFolderName = 255
-
-var (
-	// migratorPermissions are the permissions required for the background user to migrate alerts.
-	migratorPermissions = []accesscontrol.Permission{
-		{Action: dashboards.ActionFoldersRead, Scope: dashboards.ScopeFoldersAll},
-		{Action: dashboards.ActionDashboardsRead, Scope: dashboards.ScopeDashboardsAll},
-		{Action: dashboards.ActionFoldersPermissionsRead, Scope: dashboards.ScopeFoldersAll},
-		{Action: dashboards.ActionDashboardsPermissionsRead, Scope: dashboards.ScopeDashboardsAll},
-		{Action: dashboards.ActionFoldersCreate},
-		{Action: datasources.ActionRead, Scope: datasources.ScopeAll},
-		{Action: accesscontrol.ActionOrgUsersRead, Scope: accesscontrol.ScopeUsersAll},
-		{Action: accesscontrol.ActionTeamsRead, Scope: accesscontrol.ScopeTeamsAll},
-	}
-
-	// generalAlertingFolderTitle is the title of the general alerting folder. This is used for dashboard alerts in the general folder.
-	generalAlertingFolderTitle = "General Alerting"
-
-	// permissionMap maps the "friendly" permission name for a ResourcePermissions actions to the dashboards.PermissionType.
-	// A sort of reverse accesscontrol Service.MapActions similar to api.dashboardPermissionMap.
-	permissionMap = map[string]dashboards.PermissionType{
-		"View":  dashboards.PERMISSION_VIEW,
-		"Edit":  dashboards.PERMISSION_EDIT,
-		"Admin": dashboards.PERMISSION_ADMIN,
-	}
-)
-
-// getMigrationUser returns a background user for the given orgID with permissions to execute migration-related tasks.
-func getMigrationUser(orgID int64) identity.Requester {
-	return accesscontrol.BackgroundUser("ngalert_migration", orgID, org.RoleAdmin, migratorPermissions)
-}
-
-func (om *OrgMigration) migratedFolder(ctx context.Context, log log.Logger, dashID int64) (*migmodels.DashboardUpgradeInfo, error) {
-	dash, err := om.migrationStore.GetDashboard(ctx, om.orgID, dashID)
-	if err != nil {
-		return nil, err
-	}
-	l := log.New("dashboardTitle", dash.Title, "dashboardUid", dash.UID)
-
-	dashFolder, err := om.getFolder(ctx, dash)
-	if err != nil {
-		l.Warn("Failed to find folder for dashboard", "missing_folder_id", dash.FolderID, "error", err)
-	}
-	if dashFolder != nil {
-		l = l.New("folderUid", dashFolder.UID, "folderName", dashFolder.Title)
-	}
-
-	migratedFolder, err := om.getOrCreateMigratedFolder(ctx, l, dash, dashFolder)
-	if err != nil {
-		return nil, err
-	}
-
-	return &migmodels.DashboardUpgradeInfo{
-		DashboardUID:  dash.UID,
-		DashboardName: dash.Title,
-		NewFolderUID:  migratedFolder.UID,
-		NewFolderName: migratedFolder.Title,
-	}, nil
-}
-
-// getOrCreateMigratedFolder returns the folder that alerts in a given dashboard should migrate to.
-// If the dashboard has no custom permissions, this should be the same folder as dash.FolderID.
-// If the dashboard has custom permissions that affect access, this should be a new folder with migrated permissions relating to both the dashboard and parent folder.
-// Any dashboard that has greater read/write permissions for an orgRole/team/user compared to its folder will necessitate creating a new folder with the same permissions as the dashboard.
-func (om *OrgMigration) getOrCreateMigratedFolder(ctx context.Context, l log.Logger, dash *dashboards.Dashboard, parentFolder *folder.Folder) (*folder.Folder, error) {
-	// If parentFolder does not exist then the dashboard is an orphan. We migrate the alert to the general alerting folder.
-	// The general alerting folder is only accessible to admins.
-	if parentFolder == nil {
-		l.Warn("Migrating alert to the general alerting folder: original folder not found")
-		f, err := om.getOrCreateGeneralAlertingFolder(ctx, om.orgID)
-		if err != nil {
-			return nil, fmt.Errorf("general alerting folder: %w", err)
-		}
-		return f, nil
-	}
-
-	// Check if the dashboard has custom permissions. If it does, we need to create a new folder for it.
-	// This folder will be cached for re-use for each dashboard in the folder with the same permissions.
-	permissionsToFolder, ok := om.permissionsMap[parentFolder.ID]
-	if !ok {
-		permissionsToFolder = make(map[permissionHash]*folder.Folder)
-		om.permissionsMap[dash.FolderID] = permissionsToFolder
-
-		folderPerms, err := om.getFolderPermissions(ctx, parentFolder)
-		if err != nil {
-			return nil, fmt.Errorf("folder permissions: %w", err)
-		}
-		newFolderPerms, _ := om.convertResourcePerms(folderPerms)
-
-		// We assign the folder to the cache so that any dashboards with identical equivalent permissions will use the parent folder instead of creating a new one.
-		folderPermsHash, err := createHash(newFolderPerms)
-		if err != nil {
-			return nil, fmt.Errorf("hash of folder permissions: %w", err)
-		}
-		permissionsToFolder[folderPermsHash] = parentFolder
-	}
-
-	// Now we compute the hash of the dashboard permissions and check if we have a folder for it. If not, we create a new one.
-	perms, err := om.getDashboardPermissions(ctx, dash)
-	if err != nil {
-		return nil, fmt.Errorf("dashboard permissions: %w", err)
-	}
-	newPerms, unusedPerms := om.convertResourcePerms(perms)
-	hash, err := createHash(newPerms)
-	if err != nil {
-		return nil, fmt.Errorf("hash of dashboard permissions: %w", err)
-	}
-
-	customFolder, ok := permissionsToFolder[hash]
-	if !ok {
-		folderName := generateAlertFolderName(parentFolder, hash)
-		l.Info("Dashboard has custom permissions, create a new folder for alerts.", "newFolder", folderName)
-		f, err := om.createFolder(ctx, om.orgID, folderName, newPerms)
-		if err != nil {
-			return nil, err
-		}
-
-		// If the role is not managed or basic we don't attempt to migrate its permissions. This is because
-		// the logic to migrate would be complex, error-prone, and even if done correctly would have significant
-		// drawbacks in the case of custom provisioned roles. Instead, we log if the role has dashboard permissions that could
-		// potentially override the folder permissions. These overrides would always be to increase permissions not decrease them,
-		// so the risk of giving users access to alerts they shouldn't have access to is mitigated.
-		overrides := potentialOverrides(unusedPerms, newPerms)
-		if len(overrides) > 0 {
-			l.Warn("Some roles were not migrated but had the potential to allow additional access. Please verify the permissions of the new folder.", "roles", overrides, "newFolder", folderName)
-		}
-
-		permissionsToFolder[hash] = f
-		return f, nil
-	}
-
-	return customFolder, nil
-}
-
-// generateAlertFolderName generates a folder name for alerts that belong to a dashboard with custom permissions.
-// Formats the string according to DASHBOARD_FOLDER format.
-// If the resulting string's length exceeds migration.MaxFolderName, the dashboard title is stripped to be at the maximum length.
-func generateAlertFolderName(f *folder.Folder, hash permissionHash) string {
-	maxLen := MaxFolderName - len(fmt.Sprintf(DASHBOARD_FOLDER, "", hash))
-	title := f.Title
-	if len(title) > maxLen {
-		title = title[:maxLen]
-	}
-	return fmt.Sprintf(DASHBOARD_FOLDER, title, hash) // Include hash in the name to avoid collision.
-}
-
-// isBasic returns true if the given roleName is a basic role.
-func isBasic(roleName string) bool {
-	return strings.HasPrefix(roleName, accesscontrol.BasicRolePrefix)
-}
-
-// convertResourcePerms converts the given resource permissions (from a dashboard or folder) to a set of unique, sorted SetResourcePermissionCommands.
-// This is done by iterating over the managed, basic, and inherited resource permissions and adding the highest permission for each orgrole/user/team.
-//
-// # Details
-//
-// There are two role types that we consider:
-//   - managed (ex. managed:users:1:permissions, managed:builtins:editor:permissions, managed:teams:1:permissions):
-//     These are the only roles that exist in OSS. For each of these roles, we add the actions of the highest
-//     dashboards.PermissionType between the folder and the dashboard. Permissions from the folder are inherited.
-//     The added actions should have scope=folder:uid:xxxxxx, where xxxxxx is the new folder uid.
-//   - basic (ex. basic:admin, basic:editor):
-//     These are roles used in enterprise. Every user should have one of these roles. They should be considered
-//     equivalent to managed:builtins. The highest dashboards.PermissionType between the two should be used.
-//
-// There are two role types that we do not consider:
-//   - fixed: (ex. fixed:dashboards:reader, fixed:dashboards:writer):
-//     These are roles with fixed actions/scopes. They should not be given any extra actions/scopes because they
-//     can be overwritten. Because of this, to ensure that all users with this role have the correct access to the
-//     new folder we would need to find all users with this role and add a permission for
-//     action folders:read/write -> folder:uid:xxxxxx to their managed:users:X:permissions.
-//     This will eventually fall out of sync.
-//   - custom: Custom roles created via API or provisioning.
-//     Similar to fixed roles, we can't give them any extra actions/scopes because they can be overwritten.
-//
-// For now, we choose the simpler approach of handling managed and basic roles. Fixed and custom roles will not
-// be taken into account, but we will log a warning if they had the potential to override the folder permissions.
-func (om *OrgMigration) convertResourcePerms(rperms []accesscontrol.ResourcePermission) ([]accesscontrol.SetResourcePermissionCommand, []accesscontrol.ResourcePermission) {
-	keep := make(map[accesscontrol.SetResourcePermissionCommand]dashboards.PermissionType)
-	unusedPerms := make([]accesscontrol.ResourcePermission, 0)
-	for _, p := range rperms {
-		if p.IsManaged || p.IsInherited || isBasic(p.RoleName) {
-			if permission := om.migrationStore.MapActions(p); permission != "" {
-				sp := accesscontrol.SetResourcePermissionCommand{
-					UserID:      p.UserId,
-					TeamID:      p.TeamId,
-					BuiltinRole: p.BuiltInRole,
-				}
-				// We could have redundant perms, ex: if one is inherited from the parent folder, or we have basic roles from enterprise.
-				// We use the highest permission available.
-				pType := permissionMap[permission]
-				current, ok := keep[sp]
-				if !ok || pType > current {
-					keep[sp] = pType
-				}
-			}
-		} else {
-			// Keep track of unused perms, so we can later log a warning if they had the potential to override the folder permissions.
-			unusedPerms = append(unusedPerms, p)
-		}
-	}
-
-	permissions := make([]accesscontrol.SetResourcePermissionCommand, 0, len(keep))
-	for p, pType := range keep {
-		p.Permission = pType.String()
-		permissions = append(permissions, p)
-	}
-
-	// Stable sort since we will be creating a hash of this to compare dashboard perms to folder perms.
-	sort.SliceStable(permissions, func(i, j int) bool {
-		if permissions[i].BuiltinRole != permissions[j].BuiltinRole {
-			return permissions[i].BuiltinRole < permissions[j].BuiltinRole
-		}
-		if permissions[i].UserID != permissions[j].UserID {
-			return permissions[i].UserID < permissions[j].UserID
-		}
-		if permissions[i].TeamID != permissions[j].TeamID {
-			return permissions[i].TeamID < permissions[j].TeamID
-		}
-		return permissions[i].Permission < permissions[j].Permission
-	})
-
-	return permissions, unusedPerms
-}
-
-// potentialOverrides returns a map of roles from unusedOldPerms that have dashboard permissions that could potentially
-// override the given folder permissions in newPerms. These overrides are always to increase permissions not decrease them.
-func potentialOverrides(unusedOldPerms []accesscontrol.ResourcePermission, newPerms []accesscontrol.SetResourcePermissionCommand) map[string]dashboards.PermissionType {
-	var lowestPermission dashboards.PermissionType
-	for _, p := range newPerms {
-		if p.BuiltinRole == string(org.RoleEditor) || p.BuiltinRole == string(org.RoleViewer) {
-			pType := permissionMap[p.Permission]
-			if pType < lowestPermission {
-				lowestPermission = pType
-			}
-		}
-	}
-
-	nonManagedPermissionTypes := make(map[string]dashboards.PermissionType)
-	for _, p := range unusedOldPerms {
-		existing, ok := nonManagedPermissionTypes[p.RoleName]
-		if ok && existing == dashboards.PERMISSION_EDIT {
-			// We've already handled the highest permission we care about, no need to check this role anymore.
-			continue
-		}
-
-		if p.Contains([]string{dashboards.ActionDashboardsWrite}) {
-			existing = dashboards.PERMISSION_EDIT
-		} else if p.Contains([]string{dashboards.ActionDashboardsRead}) {
-			existing = dashboards.PERMISSION_VIEW
-		}
-
-		if existing > lowestPermission && existing > nonManagedPermissionTypes[p.RoleName] {
-			nonManagedPermissionTypes[p.RoleName] = existing
-		}
-	}
-
-	return nonManagedPermissionTypes
-}
-
-type permissionHash string
-
-// createHash returns a hash of the given permissions.
-func createHash(setResourcePermissionCommands []accesscontrol.SetResourcePermissionCommand) (permissionHash, error) {
-	// Speed is not particularly important here.
-	digester := crypto.MD5.New()
-	var separator = []byte{255}
-	for _, perm := range setResourcePermissionCommands {
-		_, err := fmt.Fprint(digester, separator)
-		if err != nil {
-			return "", err
-		}
-		_, err = fmt.Fprint(digester, perm)
-		if err != nil {
-			return "", err
-		}
-	}
-	return permissionHash(hex.EncodeToString(digester.Sum(nil))), nil
-}
-
-// getFolderPermissions Get permissions for folder.
-func (om *OrgMigration) getFolderPermissions(ctx context.Context, f *folder.Folder) ([]accesscontrol.ResourcePermission, error) {
-	if p, ok := om.folderPermissionCache[f.UID]; ok {
-		return p, nil
-	}
-	p, err := om.migrationStore.GetFolderPermissions(ctx, getMigrationUser(f.OrgID), f.UID)
-	if err != nil {
-		return nil, err
-	}
-	om.folderPermissionCache[f.UID] = p
-	return p, nil
-}
-
-// getDashboardPermissions Get permissions for dashboard.
-func (om *OrgMigration) getDashboardPermissions(ctx context.Context, d *dashboards.Dashboard) ([]accesscontrol.ResourcePermission, error) {
-	p, err := om.migrationStore.GetDashboardPermissions(ctx, getMigrationUser(om.orgID), d.UID)
-	if err != nil {
-		return nil, err
-	}
-	return p, nil
-}
-
-// getFolder returns the parent folder for the given dashboard. If the dashboard is in the general folder, it returns the general alerting folder.
-func (om *OrgMigration) getFolder(ctx context.Context, dash *dashboards.Dashboard) (*folder.Folder, error) {
-	if f, ok := om.folderCache[dash.FolderID]; ok {
-		return f, nil
-	}
-
-	if dash.FolderID <= 0 {
-		// Don't use general folder since it has no uid, instead we use a new "General Alerting" folder.
-		migratedFolder, err := om.getOrCreateGeneralAlertingFolder(ctx, om.orgID)
-		if err != nil {
-			return nil, fmt.Errorf("get or create general folder: %w", err)
-		}
-		return migratedFolder, err
-	}
-
-	f, err := om.migrationStore.GetFolder(ctx, &folder.GetFolderQuery{ID: &dash.FolderID, OrgID: om.orgID, SignedInUser: getMigrationUser(om.orgID)})
-	if err != nil {
-		if errors.Is(err, dashboards.ErrFolderNotFound) {
-			return nil, fmt.Errorf("folder with id %v not found", dash.FolderID)
-		}
-		return nil, fmt.Errorf("get folder %d: %w", dash.FolderID, err)
-	}
-	om.folderCache[dash.FolderID] = f
-	return f, nil
-}
-
-// getOrCreateGeneralAlertingFolder returns the general alerting folder under the specific organisation
-// If the general alerting folder does not exist it creates it.
-func (om *OrgMigration) getOrCreateGeneralAlertingFolder(ctx context.Context, orgID int64) (*folder.Folder, error) {
-	if om.generalAlertingFolder != nil {
-		return om.generalAlertingFolder, nil
-	}
-	f, err := om.migrationStore.GetFolder(ctx, &folder.GetFolderQuery{OrgID: orgID, Title: &generalAlertingFolderTitle, SignedInUser: getMigrationUser(orgID)})
-	if err != nil {
-		if errors.Is(err, dashboards.ErrFolderNotFound) {
-			// create general alerting folder without permissions to mimic the general folder.
-			f, err := om.createFolder(ctx, orgID, generalAlertingFolderTitle, nil)
-			if err != nil {
-				return nil, fmt.Errorf("create general alerting folder: %w", err)
-			}
-			om.generalAlertingFolder = f
-			return f, err
-		}
-		return nil, fmt.Errorf("get folder '%s': %w", generalAlertingFolderTitle, err)
-	}
-	om.generalAlertingFolder = f
-	return f, nil
-}
-
-// createFolder creates a new folder with given permissions.
-func (om *OrgMigration) createFolder(ctx context.Context, orgID int64, title string, newPerms []accesscontrol.SetResourcePermissionCommand) (*folder.Folder, error) {
-	f, err := om.migrationStore.CreateFolder(ctx, &folder.CreateFolderCommand{
-		OrgID:        orgID,
-		Title:        title,
-		SignedInUser: getMigrationUser(orgID).(*user.SignedInUser),
-	})
-	if err != nil {
-		if errors.Is(err, dashboards.ErrFolderSameNameExists) {
-			// If the folder already exists, we return the existing folder.
-			// This isn't perfect since permissions might have been manually modified,
-			// but the only folders we should be creating here are ones with permission
-			// hash suffix or general alerting. Neither of which is likely to spuriously
-			// conflict with an existing folder.
-			om.log.Warn("Folder already exists, using existing folder", "title", title)
-			f, err := om.migrationStore.GetFolder(ctx, &folder.GetFolderQuery{OrgID: orgID, Title: &title, SignedInUser: getMigrationUser(orgID)})
-			if err != nil {
-				return nil, err
-			}
-			return f, nil
-		}
-		return nil, err
-	}
-
-	if len(newPerms) > 0 {
-		_, err = om.migrationStore.SetFolderPermissions(ctx, orgID, f.UID, newPerms...)
-		if err != nil {
-			return nil, fmt.Errorf("set permissions: %w", err)
-		}
-	}
-
-	om.state.CreatedFolders = append(om.state.CreatedFolders, f.UID)
-
-	return f, nil
-}
diff --git a/pkg/services/ngalert/migration/permissions_test.go b/pkg/services/ngalert/migration/permissions_test.go
deleted file mode 100644
index bc52ddce191e4..0000000000000
--- a/pkg/services/ngalert/migration/permissions_test.go
+++ /dev/null
@@ -1,820 +0,0 @@
-package migration
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"sort"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/accesscontrol/ossaccesscontrol"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	ngModels "github.com/grafana/grafana/pkg/services/ngalert/models"
-	"github.com/grafana/grafana/pkg/services/org"
-	"github.com/grafana/grafana/pkg/services/team"
-	"github.com/grafana/grafana/pkg/services/user"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-// TestDashAlertPermissionMigration tests the execution of the migration specifically for dashboards with custom permissions.
-//
-//nolint:gocyclo
-func TestDashAlertPermissionMigration(t *testing.T) {
-	genLegacyAlert := func(name string, dashboardId int64, mutators ...func(*models.Alert)) *models.Alert {
-		a := createAlert(t, 1, int(dashboardId), 1, name, nil)
-		if len(mutators) > 0 {
-			for _, mutator := range mutators {
-				mutator(a)
-			}
-		}
-		return a
-	}
-
-	genAlert := func(title string, namespaceUID string, dashboardUID string, mutators ...func(*ngModels.AlertRule)) *ngModels.AlertRule {
-		a := &ngModels.AlertRule{
-			ID:        1,
-			OrgID:     1,
-			Title:     title,
-			Condition: "A",
-			Data: []ngModels.AlertQuery{
-				{
-					RefID:         "A",
-					DatasourceUID: "__expr__",
-					Model:         json.RawMessage(`{"conditions":[],"intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"classic_conditions"}`),
-				},
-			},
-			NamespaceUID:    namespaceUID,
-			DashboardUID:    &dashboardUID,
-			RuleGroup:       fmt.Sprintf("Dashboard Title %s - %d", dashboardUID, 1),
-			IntervalSeconds: 60,
-			Version:         1,
-			PanelID:         pointer(int64(1)),
-			RuleGroupIndex:  1,
-			NoDataState:     ngModels.NoData,
-			ExecErrState:    ngModels.AlertingErrState,
-			For:             60 * time.Second,
-			Annotations: map[string]string{
-				"message":          "message",
-				"__dashboardUid__": dashboardUID,
-				"__panelId__":      "1",
-			},
-			Labels:   map[string]string{},
-			IsPaused: false,
-		}
-		if len(mutators) > 0 {
-			for _, mutator := range mutators {
-				mutator(a)
-			}
-		}
-		return a
-	}
-
-	withPanelId := func(id int64) func(*ngModels.AlertRule) {
-		return func(a *ngModels.AlertRule) {
-			a.PanelID = pointer(id)
-			a.Annotations["__panelId__"] = fmt.Sprintf("%d", id)
-			a.RuleGroup = fmt.Sprintf("Dashboard Title %s - %d", *a.DashboardUID, id)
-		}
-	}
-
-	genFolder := func(t *testing.T, id int64, uid string, mutators ...func(f *dashboards.Dashboard)) *dashboards.Dashboard {
-		d := createFolder(t, id, 1, uid)
-		d.Title = "Original Folder " + uid
-		if len(mutators) > 0 {
-			for _, mutator := range mutators {
-				mutator(d)
-			}
-		}
-		return d
-	}
-
-	genCreatedFolder := func(t *testing.T, title string, mutators ...func(f *dashboards.Dashboard)) *dashboards.Dashboard {
-		d := createFolder(t, 1, 1, "") // Leave generated UID blank, so we don't compare.
-		d.Title = title
-		d.CreatedBy = -1
-		d.UpdatedBy = -1
-		if len(mutators) > 0 {
-			for _, mutator := range mutators {
-				mutator(d)
-			}
-		}
-		return d
-	}
-
-	genDashboard := func(t *testing.T, id int64, uid string, folderId int64, mutators ...func(f *dashboards.Dashboard)) *dashboards.Dashboard {
-		d := createDashboard(t, id, 1, uid, folderId, nil)
-		d.Title = "Dashboard Title " + uid
-		if len(mutators) > 0 {
-			for _, mutator := range mutators {
-				mutator(d)
-			}
-		}
-		return d
-	}
-
-	genPerms := func(perms ...accesscontrol.SetResourcePermissionCommand) []accesscontrol.SetResourcePermissionCommand {
-		return perms
-	}
-
-	type expectedAlertMigration struct {
-		Alert  *ngModels.AlertRule
-		Folder *dashboards.Dashboard
-		Perms  []accesscontrol.SetResourcePermissionCommand
-	}
-
-	type testcase struct {
-		name           string
-		enterprise     bool
-		folders        []*dashboards.Dashboard
-		folderPerms    map[string][]accesscontrol.SetResourcePermissionCommand // UID -> Perms
-		dashboards     []*dashboards.Dashboard
-		dashboardPerms map[string][]accesscontrol.SetResourcePermissionCommand // UID -> Perms
-		alerts         []*models.Alert
-		roles          map[accesscontrol.Role][]accesscontrol.Permission
-
-		expected []expectedAlertMigration
-	}
-
-	// Used to perform the same tests for each of builtins, users, and teams.
-	splitTestcase := func(raw testcase) []testcase {
-		permTypes := make(map[string]func(accesscontrol.SetResourcePermissionCommand) accesscontrol.SetResourcePermissionCommand, 3)
-		permTypes["builtins"] = func(p accesscontrol.SetResourcePermissionCommand) accesscontrol.SetResourcePermissionCommand {
-			return p
-		}
-		mapping := map[string]int64{
-			string(org.RoleEditor): 1,
-			string(org.RoleViewer): 2,
-		}
-		permTypes["users"] = func(p accesscontrol.SetResourcePermissionCommand) accesscontrol.SetResourcePermissionCommand {
-			id, ok := mapping[p.BuiltinRole]
-			if !ok {
-				return p
-			}
-			p.UserID = id
-			p.BuiltinRole = ""
-			return p
-		}
-		permTypes["teams"] = func(p accesscontrol.SetResourcePermissionCommand) accesscontrol.SetResourcePermissionCommand {
-			id, ok := mapping[p.BuiltinRole]
-			if !ok {
-				return p
-			}
-			p.TeamID = id
-			p.BuiltinRole = ""
-			return p
-		}
-
-		applyTransform := func(tt testcase, pfunc func(p accesscontrol.SetResourcePermissionCommand) accesscontrol.SetResourcePermissionCommand) testcase {
-			folderPerms := make(map[string][]accesscontrol.SetResourcePermissionCommand, len(tt.folderPerms))
-			for _, f := range tt.folders {
-				perms := make([]accesscontrol.SetResourcePermissionCommand, 0, len(tt.folderPerms[f.UID]))
-				for _, p := range tt.folderPerms[f.UID] {
-					perms = append(perms, pfunc(p))
-				}
-				folderPerms[f.UID] = perms
-			}
-			tt.folderPerms = folderPerms
-
-			dashboardPerms := make(map[string][]accesscontrol.SetResourcePermissionCommand, len(tt.dashboardPerms))
-			for _, d := range tt.dashboards {
-				perms := make([]accesscontrol.SetResourcePermissionCommand, 0, len(tt.dashboardPerms[d.UID]))
-				for _, p := range tt.dashboardPerms[d.UID] {
-					perms = append(perms, pfunc(p))
-				}
-				dashboardPerms[d.UID] = perms
-			}
-			tt.dashboardPerms = dashboardPerms
-
-			expected := make([]expectedAlertMigration, 0, len(tt.expected))
-			for _, ex := range tt.expected {
-				permissions := make([]accesscontrol.SetResourcePermissionCommand, 0, len(ex.Perms))
-				for _, p := range ex.Perms {
-					permissions = append(permissions, pfunc(p))
-				}
-				ex.Perms = permissions
-
-				sort.SliceStable(permissions, func(i, j int) bool {
-					if permissions[i].BuiltinRole != permissions[j].BuiltinRole {
-						return permissions[i].BuiltinRole < permissions[j].BuiltinRole
-					}
-					if permissions[i].UserID != permissions[j].UserID {
-						return permissions[i].UserID < permissions[j].UserID
-					}
-					if permissions[i].TeamID != permissions[j].TeamID {
-						return permissions[i].TeamID < permissions[j].TeamID
-					}
-					return permissions[i].Permission < permissions[j].Permission
-				})
-
-				f := *ex.Folder
-				if strings.Contains(f.Title, "%s") {
-					hash, err := createHash(permissions)
-					require.NoError(t, err)
-					f.Title = fmt.Sprintf(f.Title, hash)
-				}
-
-				expected = append(expected, expectedAlertMigration{
-					Alert:  ex.Alert,
-					Folder: &f,
-					Perms:  permissions,
-				})
-			}
-			tt.expected = expected
-
-			return tt
-		}
-
-		cases := make([]testcase, 0, 3)
-		for k, pfunc := range permTypes {
-			tt := applyTransform(raw, pfunc)
-			tt.name = k
-			cases = append(cases, tt)
-		}
-		return cases
-	}
-
-	basicFolder := genFolder(t, 1, "f_1")
-	basicDashboard := genDashboard(t, 2, "d_1", basicFolder.ID)
-	defaultPerms := genPerms(
-		accesscontrol.SetResourcePermissionCommand{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
-		accesscontrol.SetResourcePermissionCommand{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_VIEW.String()},
-	)
-
-	basicAlert1 := genLegacyAlert("alert1", basicDashboard.ID, func(a *models.Alert) { a.PanelID = 1 })
-	basicAlert2 := genLegacyAlert("alert2", basicDashboard.ID, func(a *models.Alert) { a.PanelID = 2 })
-
-	basicPerms := func() map[accesscontrol.Role][]accesscontrol.Permission {
-		basic := make(map[accesscontrol.Role][]accesscontrol.Permission)
-		var permissions []accesscontrol.Permission
-		ts := time.Now()
-		for _, action := range append(ossaccesscontrol.DashboardAdminActions, ossaccesscontrol.FolderAdminActions...) {
-			if isDashboardAction := strings.HasPrefix(action, "dashboards"); isDashboardAction {
-				permissions = append(permissions, accesscontrol.Permission{
-					Action:  action,
-					Scope:   dashboards.ScopeDashboardsAll,
-					Created: ts,
-					Updated: ts,
-				})
-			}
-			permissions = append(permissions, accesscontrol.Permission{
-				Action:  action,
-				Scope:   dashboards.ScopeFoldersAll,
-				Created: ts,
-				Updated: ts,
-			})
-		}
-		basic[accesscontrol.Role{Name: accesscontrol.BasicRolePrefix + "admin"}] = permissions
-		return basic
-	}
-
-	tc := []testcase{
-		{
-			name:           "alerts in dashboard and folder with default permissions migrate to same folder",
-			folders:        []*dashboards.Dashboard{basicFolder},
-			folderPerms:    map[string][]accesscontrol.SetResourcePermissionCommand{basicFolder.UID: defaultPerms},
-			dashboards:     []*dashboards.Dashboard{basicDashboard},
-			dashboardPerms: map[string][]accesscontrol.SetResourcePermissionCommand{basicDashboard.UID: defaultPerms},
-			alerts:         []*models.Alert{basicAlert1, basicAlert2},
-			expected: []expectedAlertMigration{
-				{
-					Alert:  genAlert(basicAlert1.Name, basicFolder.UID, basicDashboard.UID, withPanelId(basicAlert1.PanelID)),
-					Folder: basicFolder,
-					Perms:  defaultPerms,
-				},
-				{
-					Alert:  genAlert(basicAlert2.Name, basicFolder.UID, basicDashboard.UID, withPanelId(basicAlert2.PanelID)),
-					Folder: basicFolder,
-					Perms:  defaultPerms,
-				},
-			},
-		},
-		{
-			name:        "dashboard override cannot lessen folder permissions",
-			folders:     []*dashboards.Dashboard{basicFolder},
-			folderPerms: map[string][]accesscontrol.SetResourcePermissionCommand{basicFolder.UID: defaultPerms},
-			dashboards:  []*dashboards.Dashboard{basicDashboard},
-			dashboardPerms: map[string][]accesscontrol.SetResourcePermissionCommand{
-				basicDashboard.UID: {
-					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_VIEW.String()}, // Change.
-					{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_VIEW.String()},
-				},
-			},
-			alerts: []*models.Alert{basicAlert1},
-			expected: []expectedAlertMigration{
-				{
-					Alert:  genAlert(basicAlert1.Name, basicFolder.UID, basicDashboard.UID),
-					Folder: basicFolder,
-					Perms: []accesscontrol.SetResourcePermissionCommand{
-						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()}, // Inherits from Folder.
-						{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_VIEW.String()},
-					},
-				},
-			},
-		},
-		{
-			name:        "dashboard with various permission overrides should create new folder",
-			folders:     []*dashboards.Dashboard{basicFolder},
-			folderPerms: map[string][]accesscontrol.SetResourcePermissionCommand{basicFolder.UID: defaultPerms},
-			dashboards: []*dashboards.Dashboard{
-				genDashboard(t, 2, "d_1", basicFolder.ID),
-				genDashboard(t, 3, "d_2", basicFolder.ID),
-				genDashboard(t, 4, "d_3", basicFolder.ID),
-				genDashboard(t, 5, "d_4", basicFolder.ID),
-				genDashboard(t, 6, "d_5", basicFolder.ID),
-			},
-			dashboardPerms: map[string][]accesscontrol.SetResourcePermissionCommand{
-				"d_1": {
-					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
-					{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_EDIT.String()}, // Change.
-				},
-				"d_2": {
-					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
-					{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_ADMIN.String()}, // Change.
-				},
-				"d_3": {
-					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_ADMIN.String()}, // Change.
-					{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_EDIT.String()},  // Change.
-				},
-				"d_4": {
-					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_ADMIN.String()}, // Change.
-					{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_VIEW.String()},
-				},
-				"d_5": {
-					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_ADMIN.String()}, // Change.
-					{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_ADMIN.String()}, // Change.
-				},
-			},
-			alerts: []*models.Alert{genLegacyAlert("alert1", 2), genLegacyAlert("alert2", 3), genLegacyAlert("alert3", 4), genLegacyAlert("alert4", 5), genLegacyAlert("alert5", 6)},
-			expected: []expectedAlertMigration{
-				{
-					Alert:  genAlert("alert1", "", "d_1"),
-					Folder: genCreatedFolder(t, "Original Folder f_1 Alerts - %s"),
-					Perms: []accesscontrol.SetResourcePermissionCommand{
-						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
-						{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_EDIT.String()}, // Change.
-					},
-				},
-				{
-					Alert:  genAlert("alert2", "", "d_2"),
-					Folder: genCreatedFolder(t, "Original Folder f_1 Alerts - %s"),
-					Perms: []accesscontrol.SetResourcePermissionCommand{
-						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
-						{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_ADMIN.String()}, // Change.
-					},
-				},
-				{
-					Alert:  genAlert("alert3", "", "d_3"),
-					Folder: genCreatedFolder(t, "Original Folder f_1 Alerts - %s"),
-					Perms: []accesscontrol.SetResourcePermissionCommand{
-						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_ADMIN.String()}, // Change.
-						{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_EDIT.String()},  // Change.
-					},
-				},
-				{
-					Alert:  genAlert("alert4", "", "d_4"),
-					Folder: genCreatedFolder(t, "Original Folder f_1 Alerts - %s"),
-					Perms: []accesscontrol.SetResourcePermissionCommand{
-						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_ADMIN.String()}, // Change.
-						{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_VIEW.String()},
-					},
-				},
-				{
-					Alert:  genAlert("alert5", "", "d_5"),
-					Folder: genCreatedFolder(t, "Original Folder f_1 Alerts - %s"),
-					Perms: []accesscontrol.SetResourcePermissionCommand{
-						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_ADMIN.String()}, // Change.
-						{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_ADMIN.String()}, // Change.
-					},
-				},
-			},
-		},
-		{
-			name:    "missing dashboard permission is inherited from folder",
-			folders: []*dashboards.Dashboard{genFolder(t, 1, "f_1"), genFolder(t, 2, "f_2")},
-			folderPerms: map[string][]accesscontrol.SetResourcePermissionCommand{
-				"f_1": {
-					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_ADMIN.String()},
-					{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_ADMIN.String()},
-				},
-				"f_2": {
-					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_VIEW.String()},
-					{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_VIEW.String()},
-				},
-			},
-			dashboards: []*dashboards.Dashboard{
-				genDashboard(t, 3, "d_1", 1),
-				genDashboard(t, 4, "d_2", 1),
-				genDashboard(t, 5, "d_3", 2),
-				genDashboard(t, 6, "d_4", 2),
-			},
-			dashboardPerms: map[string][]accesscontrol.SetResourcePermissionCommand{
-				"d_1": {
-					{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_VIEW.String()},
-				},
-				"d_2": {
-					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
-				},
-				"d_3": {
-					{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_VIEW.String()},
-				},
-				"d_4": {
-					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
-				},
-			},
-			alerts: []*models.Alert{genLegacyAlert("alert1", 3), genLegacyAlert("alert2", 4), genLegacyAlert("alert3", 5), genLegacyAlert("alert4", 6)},
-			expected: []expectedAlertMigration{
-				{
-					Alert:  genAlert("alert1", "f_1", "d_1"),
-					Folder: genFolder(t, 1, "f_1"), // Original folder since the perms didn't change.
-					Perms: []accesscontrol.SetResourcePermissionCommand{
-						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_ADMIN.String()}, // Inherits from Folder.
-						{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_ADMIN.String()}, // Overrides from Folder.
-					},
-				},
-				{
-					Alert:  genAlert("alert2", "f_1", "d_2"),
-					Folder: genFolder(t, 1, "f_1"), // Original folder since the perms didn't change.
-					Perms: []accesscontrol.SetResourcePermissionCommand{
-						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_ADMIN.String()}, // Overrides from Folder.
-						{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_ADMIN.String()}, // Inherits from Folder.
-					},
-				},
-				{
-					Alert:  genAlert("alert3", "f_2", "d_3"),
-					Folder: genFolder(t, 2, "f_2"), // Original folder since the perms didn't change.
-					Perms: []accesscontrol.SetResourcePermissionCommand{
-						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_VIEW.String()}, // Inherits from Folder.
-						{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_VIEW.String()},
-					},
-				},
-				{
-					Alert:  genAlert("alert4", "", "d_4"),
-					Folder: genCreatedFolder(t, "Original Folder f_2 Alerts - %s"),
-					Perms: []accesscontrol.SetResourcePermissionCommand{
-						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
-						{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_VIEW.String()}, // Inherits from Folder.
-					},
-				},
-			},
-		},
-		{
-			name:    "missing dashboard and folder view permission is still missing",
-			folders: []*dashboards.Dashboard{basicFolder},
-			folderPerms: map[string][]accesscontrol.SetResourcePermissionCommand{
-				basicFolder.UID: {
-					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
-				},
-			},
-			dashboards: []*dashboards.Dashboard{basicDashboard},
-			dashboardPerms: map[string][]accesscontrol.SetResourcePermissionCommand{
-				basicDashboard.UID: {
-					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_VIEW.String()},
-				},
-			},
-			alerts: []*models.Alert{basicAlert1},
-			expected: []expectedAlertMigration{
-				{
-					Alert:  genAlert(basicAlert1.Name, basicFolder.UID, basicDashboard.UID),
-					Folder: basicFolder,
-					Perms: []accesscontrol.SetResourcePermissionCommand{
-						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
-					},
-				},
-			},
-		},
-
-		// General folder.
-		{
-			name:       "dashboard in general folder with default permissions migrates to General Alerting subfolder for permission",
-			dashboards: []*dashboards.Dashboard{genDashboard(t, 1, "d_1", 0)}, // Dashboard in general folder.
-			dashboardPerms: map[string][]accesscontrol.SetResourcePermissionCommand{
-				"d_1": defaultPerms,
-			},
-			alerts: []*models.Alert{genLegacyAlert("alert1", 1)},
-			expected: []expectedAlertMigration{
-				{
-					Alert:  genAlert("alert1", "f_1", "d_1"),
-					Folder: genCreatedFolder(t, "General Alerting Alerts - %s"),
-					Perms: []accesscontrol.SetResourcePermissionCommand{
-						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()}, // From Dashboard.
-						{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_VIEW.String()}, // From Dashboard.
-					},
-				},
-			},
-		},
-		{
-			name:       "dashboard in general folder with some perms migrates to General Alerting subfolder with correct permissions",
-			dashboards: []*dashboards.Dashboard{genDashboard(t, 1, "d_1", 0)}, // Dashboard in general folder.
-			dashboardPerms: map[string][]accesscontrol.SetResourcePermissionCommand{
-				"d_1": { // Missing viewer.
-					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
-				},
-			},
-			alerts: []*models.Alert{genLegacyAlert("alert1", 1)},
-			expected: []expectedAlertMigration{
-				{
-					Alert:  genAlert("alert1", "f_1", "d_1"),
-					Folder: genCreatedFolder(t, "General Alerting Alerts - %s"),
-					Perms: []accesscontrol.SetResourcePermissionCommand{
-						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()}, // From Dashboard.
-					},
-				},
-			},
-		},
-		{
-			name:       "dashboard in general folder with empty perms migrates to General Alerting",
-			dashboards: []*dashboards.Dashboard{genDashboard(t, 1, "d_1", 0)}, // Dashboard in general folder.
-			alerts:     []*models.Alert{genLegacyAlert("alert1", 1)},
-			expected: []expectedAlertMigration{
-				{
-					Alert:  genAlert("alert1", "f_1", "d_1"),
-					Folder: genCreatedFolder(t, "General Alerting"),
-					Perms:  []accesscontrol.SetResourcePermissionCommand{},
-				},
-			},
-		},
-
-		// The following tests handled extra requirements of enterprise RBAC in that they include basic, fixed, and custom roles.
-		{
-			name:        "should handle basic roles the same as managed builtin roles",
-			enterprise:  true,
-			roles:       basicPerms(),
-			folders:     []*dashboards.Dashboard{basicFolder},
-			folderPerms: map[string][]accesscontrol.SetResourcePermissionCommand{basicFolder.UID: defaultPerms},
-			dashboards: []*dashboards.Dashboard{
-				genDashboard(t, 2, "d_1", basicFolder.ID),
-			},
-			dashboardPerms: map[string][]accesscontrol.SetResourcePermissionCommand{
-				"d_1": {
-					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
-					{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_EDIT.String()}, // Change.
-				},
-			},
-			alerts: []*models.Alert{genLegacyAlert("alert1", 2)},
-			expected: []expectedAlertMigration{
-				{
-					Alert:  genAlert("alert1", "", "d_1"),
-					Folder: genCreatedFolder(t, "Original Folder f_1 Alerts - %s"),
-					Perms: []accesscontrol.SetResourcePermissionCommand{
-						{BuiltinRole: string(org.RoleAdmin), Permission: dashboards.PERMISSION_ADMIN.String()}, // From basic:admin.
-						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
-						{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_EDIT.String()}, // Change.
-					},
-				},
-			},
-		},
-		{
-			name:       "should ignore fixed roles even if they would affect access",
-			enterprise: true,
-			roles: map[accesscontrol.Role][]accesscontrol.Permission{
-				{Name: "fixed:dashboards:writer"}: {
-					{Action: dashboards.ActionDashboardsRead, Scope: dashboards.ScopeDashboardsAll},
-					{Action: dashboards.ActionDashboardsWrite, Scope: dashboards.ScopeDashboardsAll},
-					{Action: dashboards.ActionDashboardsDelete, Scope: dashboards.ScopeDashboardsAll},
-					{Action: dashboards.ActionDashboardsCreate, Scope: dashboards.ScopeFoldersAll},
-					{Action: dashboards.ActionDashboardsPermissionsRead, Scope: dashboards.ScopeDashboardsAll},
-					{Action: dashboards.ActionDashboardsPermissionsWrite, Scope: dashboards.ScopeDashboardsAll},
-				},
-			},
-			folders:        []*dashboards.Dashboard{basicFolder},
-			folderPerms:    map[string][]accesscontrol.SetResourcePermissionCommand{basicFolder.UID: defaultPerms},
-			dashboards:     []*dashboards.Dashboard{basicDashboard},
-			dashboardPerms: map[string][]accesscontrol.SetResourcePermissionCommand{basicDashboard.UID: defaultPerms},
-			alerts:         []*models.Alert{basicAlert1},
-			expected: []expectedAlertMigration{ // Expect no new folder.
-				{
-					Alert:  genAlert(basicAlert1.Name, basicFolder.UID, basicDashboard.UID),
-					Folder: basicFolder,
-					Perms:  defaultPerms,
-				},
-			},
-		},
-		{
-			name:       "should ignore custom roles even if they would affect access",
-			enterprise: true,
-			roles: map[accesscontrol.Role][]accesscontrol.Permission{
-				{Name: "custom role"}: {
-					{Action: dashboards.ActionDashboardsRead, Scope: dashboards.ScopeDashboardsAll},
-					{Action: dashboards.ActionDashboardsWrite, Scope: dashboards.ScopeDashboardsAll},
-					{Action: dashboards.ActionDashboardsDelete, Scope: dashboards.ScopeDashboardsAll},
-					{Action: dashboards.ActionDashboardsCreate, Scope: dashboards.ScopeFoldersAll},
-					{Action: dashboards.ActionDashboardsPermissionsRead, Scope: dashboards.ScopeDashboardsAll},
-					{Action: dashboards.ActionDashboardsPermissionsWrite, Scope: dashboards.ScopeDashboardsAll},
-				},
-			},
-			folders:        []*dashboards.Dashboard{basicFolder},
-			folderPerms:    map[string][]accesscontrol.SetResourcePermissionCommand{basicFolder.UID: defaultPerms},
-			dashboards:     []*dashboards.Dashboard{basicDashboard},
-			dashboardPerms: map[string][]accesscontrol.SetResourcePermissionCommand{basicDashboard.UID: defaultPerms},
-			alerts:         []*models.Alert{basicAlert1},
-			expected: []expectedAlertMigration{ // Expect no new folder.
-				{
-					Alert:  genAlert(basicAlert1.Name, basicFolder.UID, basicDashboard.UID),
-					Folder: basicFolder,
-					Perms:  defaultPerms,
-				},
-			},
-		},
-	}
-	for _, ttRaw := range tc {
-		t.Run(ttRaw.name, func(t *testing.T) {
-			for _, tt := range splitTestcase(ttRaw) {
-				t.Run(tt.name, func(t *testing.T) {
-					sqlStore := db.InitTestDB(t)
-					x := sqlStore.GetEngine()
-
-					if tt.enterprise {
-						createRoles(t, context.Background(), sqlStore, tt.roles)
-					}
-
-					service := NewTestMigrationService(t, sqlStore, &setting.Cfg{})
-					setupLegacyAlertsTables(t, x, nil, tt.alerts, tt.folders, tt.dashboards)
-
-					for i := 1; i < 3; i++ {
-						_, err := x.Insert(user.User{
-							ID:      int64(i),
-							OrgID:   1,
-							Name:    fmt.Sprintf("user%v", i),
-							Login:   fmt.Sprintf("user%v", i),
-							Email:   fmt.Sprintf("user%v@example.org", i),
-							Created: now,
-							Updated: now,
-						})
-						require.NoError(t, err)
-					}
-
-					for i := 1; i < 3; i++ {
-						_, err := x.Insert(team.Team{
-							ID:      int64(i),
-							OrgID:   1,
-							UID:     fmt.Sprintf("team%v", i),
-							Name:    fmt.Sprintf("team%v", i),
-							Created: now,
-							Updated: now,
-						})
-						require.NoError(t, err)
-					}
-
-					for _, f := range tt.folders {
-						_, err := service.migrationStore.SetFolderPermissions(context.Background(), 1, f.UID, tt.folderPerms[f.UID]...)
-						require.NoError(t, err)
-					}
-					for _, d := range tt.dashboards {
-						_, err := service.migrationStore.SetDashboardPermissions(context.Background(), 1, d.UID, tt.dashboardPerms[d.UID]...)
-						require.NoError(t, err)
-					}
-
-					err := service.Run(context.Background())
-					require.NoError(t, err)
-
-					// construct actuals.
-					orgId := int64(1)
-					rules := getAlertRules(t, x, orgId)
-					actual := make([]expectedAlertMigration, 0, len(rules))
-					for i, r := range rules {
-						// Remove generated fields.
-						require.NotEqual(t, r.Labels["rule_uid"], "")
-						delete(r.Labels, "rule_uid")
-						require.NotEqual(t, r.Annotations["__alertId__"], "")
-						delete(r.Annotations, "__alertId__")
-
-						folder := getDashboard(t, x, orgId, r.NamespaceUID)
-						rperms, err := service.migrationStore.GetFolderPermissions(context.Background(), getMigrationUser(orgId), folder.UID)
-						require.NoError(t, err)
-
-						expected := tt.expected[i]
-						if expected.Folder.UID == "" {
-							// We're expecting the UID to be generated, so remove it from comparison.
-							folder.UID = ""
-							r.NamespaceUID = ""
-							expected.Alert.NamespaceUID = ""
-						}
-
-						keep := make(map[accesscontrol.SetResourcePermissionCommand]dashboards.PermissionType)
-						for _, p := range rperms {
-							if permission := service.migrationStore.MapActions(p); permission != "" {
-								sp := accesscontrol.SetResourcePermissionCommand{
-									UserID:      p.UserId,
-									TeamID:      p.TeamId,
-									BuiltinRole: p.BuiltInRole,
-								}
-								pType := permissionMap[permission]
-								current, ok := keep[sp]
-								if !ok || pType > current {
-									keep[sp] = pType
-								}
-							}
-						}
-						perms := make([]accesscontrol.SetResourcePermissionCommand, 0, len(keep))
-						for p, pType := range keep {
-							p.Permission = pType.String()
-							perms = append(perms, p)
-						}
-
-						actual = append(actual, expectedAlertMigration{
-							Alert:  r,
-							Folder: folder,
-							Perms:  perms,
-						})
-					}
-
-					cOpt := []cmp.Option{
-						cmpopts.SortSlices(func(a, b expectedAlertMigration) bool {
-							return a.Alert.Title < b.Alert.Title
-						}),
-						cmpopts.SortSlices(func(a, b accesscontrol.SetResourcePermissionCommand) bool {
-							if a.BuiltinRole != b.BuiltinRole {
-								return a.BuiltinRole < b.BuiltinRole
-							}
-							if a.UserID != b.UserID {
-								return a.UserID < b.UserID
-							}
-							if a.TeamID != b.TeamID {
-								return a.TeamID < b.TeamID
-							}
-							return a.Permission < b.Permission
-						}),
-						cmpopts.IgnoreUnexported(ngModels.AlertRule{}, ngModels.AlertQuery{}),
-						cmpopts.IgnoreFields(ngModels.AlertRule{}, "ID", "Updated", "UID"),
-						cmpopts.IgnoreFields(dashboards.Dashboard{}, "ID", "Created", "Updated", "Data", "Slug"),
-					}
-					if !cmp.Equal(tt.expected, actual, cOpt...) {
-						t.Errorf("Unexpected Rule: %v", cmp.Diff(tt.expected, actual, cOpt...))
-					}
-				})
-			}
-		})
-	}
-}
-
-func createRoles(t testing.TB, ctx context.Context, store db.DB, rolePerms map[accesscontrol.Role][]accesscontrol.Permission) {
-	_ = store.WithDbSession(ctx, func(sess *db.Session) error {
-		ts := time.Now()
-		var roles []accesscontrol.Role
-
-		basic := accesscontrol.BuildBasicRoleDefinitions()
-
-		var permissions []accesscontrol.Permission
-		var builtinRoleAssignments []accesscontrol.BuiltinRole
-		var userRoleAssignments []accesscontrol.UserRole
-		var teamRoleAssignments []accesscontrol.TeamRole
-		i := int64(1)
-		for role, perms := range rolePerms {
-			if role.IsBasic() {
-				for roleType, br := range basic {
-					if br.Name == role.Name {
-						role = br.Role()
-						builtinRoleAssignments = append(builtinRoleAssignments, accesscontrol.BuiltinRole{
-							OrgID: accesscontrol.GlobalOrgID, RoleID: i, Role: roleType, Created: ts, Updated: ts,
-						})
-					}
-				}
-			} else {
-				userRoleAssignments = append(userRoleAssignments, accesscontrol.UserRole{
-					OrgID: accesscontrol.GlobalOrgID, RoleID: i, UserID: 1, Created: ts,
-				})
-				teamRoleAssignments = append(teamRoleAssignments, accesscontrol.TeamRole{
-					OrgID: accesscontrol.GlobalOrgID, RoleID: i, TeamID: 1, Created: ts,
-				})
-			}
-			role.ID = i
-			role.Created = ts
-			role.Updated = ts
-
-			roles = append(roles, role)
-
-			for _, p := range perms {
-				permissions = append(permissions, accesscontrol.Permission{
-					RoleID: role.ID, Action: p.Action, Scope: p.Scope, Created: ts, Updated: ts,
-				})
-			}
-			i++
-		}
-
-		_, err := sess.InsertMulti(&roles)
-		require.NoError(t, err)
-
-		_, err = sess.InsertMulti(&permissions)
-		require.NoError(t, err)
-
-		_, err = sess.InsertMulti(&builtinRoleAssignments)
-		require.NoError(t, err)
-
-		_, err = sess.InsertMulti(&userRoleAssignments)
-		require.NoError(t, err)
-
-		_, err = sess.InsertMulti(&teamRoleAssignments)
-		require.NoError(t, err)
-
-		return nil
-	})
-}
diff --git a/pkg/services/ngalert/migration/securejsondata.go b/pkg/services/ngalert/migration/securejsondata.go
deleted file mode 100644
index 9de357bb00a64..0000000000000
--- a/pkg/services/ngalert/migration/securejsondata.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package migration
-
-import (
-	"os"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/util"
-)
-
-// SecureJsonData is used to store encrypted data (for example in data_source table). Only values are separately
-// encrypted.
-type SecureJsonData map[string][]byte
-
-var seclogger = log.New("securejsondata")
-
-// Decrypt returns map of the same type but where the all the values are decrypted. Opposite of what
-// GetEncryptedJsonData is doing.
-func (s SecureJsonData) Decrypt() map[string]string {
-	decrypted := make(map[string]string)
-	for key, data := range s {
-		decryptedData, err := util.Decrypt(data, setting.SecretKey)
-		if err != nil {
-			seclogger.Error(err.Error())
-			os.Exit(1)
-		}
-
-		decrypted[key] = string(decryptedData)
-	}
-	return decrypted
-}
diff --git a/pkg/services/ngalert/migration/service.go b/pkg/services/ngalert/migration/service.go
deleted file mode 100644
index 6f3abcc0782ad..0000000000000
--- a/pkg/services/ngalert/migration/service.go
+++ /dev/null
@@ -1,136 +0,0 @@
-package migration
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/infra/serverlock"
-	migrationStore "github.com/grafana/grafana/pkg/services/ngalert/migration/store"
-	"github.com/grafana/grafana/pkg/services/secrets"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-// actionName is the unique row-level lock name for serverlock.ServerLockService.
-const actionName = "alerting migration"
-
-//nolint:stylecheck
-var ForceMigrationError = fmt.Errorf("Grafana has already been migrated to Unified Alerting. Any alert rules created while using Unified Alerting will be deleted by rolling back. Set force_migration=true in your grafana.ini and restart Grafana to roll back and delete Unified Alerting configuration data.")
-
-type UpgradeService interface {
-	Run(ctx context.Context) error
-}
-
-type migrationService struct {
-	lock           *serverlock.ServerLockService
-	cfg            *setting.Cfg
-	log            log.Logger
-	store          db.DB
-	migrationStore migrationStore.Store
-
-	encryptionService secrets.Service
-}
-
-func ProvideService(
-	lock *serverlock.ServerLockService,
-	cfg *setting.Cfg,
-	store db.DB,
-	migrationStore migrationStore.Store,
-	encryptionService secrets.Service,
-) (UpgradeService, error) {
-	return &migrationService{
-		lock:              lock,
-		log:               log.New("ngalert.migration"),
-		cfg:               cfg,
-		store:             store,
-		migrationStore:    migrationStore,
-		encryptionService: encryptionService,
-	}, nil
-}
-
-// Run starts the migration. This will either migrate from legacy alerting to unified alerting or revert the migration.
-// If the migration status in the kvstore is not set and unified alerting is enabled, the migration will be executed.
-// If the migration status in the kvstore is set and both unified alerting is disabled and ForceMigration is set to true, the migration will be reverted.
-func (ms *migrationService) Run(ctx context.Context) error {
-	var errMigration error
-	errLock := ms.lock.LockExecuteAndRelease(ctx, actionName, time.Minute*10, func(ctx context.Context) {
-		ms.log.Info("Starting")
-		errMigration = ms.store.InTransaction(ctx, func(ctx context.Context) error {
-			migrated, err := ms.migrationStore.IsMigrated(ctx)
-			if err != nil {
-				return fmt.Errorf("getting migration status: %w", err)
-			}
-			if migrated == ms.cfg.UnifiedAlerting.IsEnabled() {
-				// Nothing to do.
-				ms.log.Info("No migrations to run")
-				return nil
-			}
-
-			if migrated {
-				// If legacy alerting is also disabled, there is nothing to do
-				if setting.AlertingEnabled != nil && !*setting.AlertingEnabled {
-					return nil
-				}
-
-				// Safeguard to prevent data loss when reverting from UA to LA.
-				if !ms.cfg.ForceMigration {
-					return ForceMigrationError
-				}
-
-				// Revert migration
-				ms.log.Info("Reverting legacy migration")
-				err := ms.migrationStore.RevertAllOrgs(ctx)
-				if err != nil {
-					return fmt.Errorf("reverting migration: %w", err)
-				}
-				ms.log.Info("Legacy migration reverted")
-				return nil
-			}
-
-			ms.log.Info("Starting legacy migration")
-			err = ms.migrateAllOrgs(ctx)
-			if err != nil {
-				return fmt.Errorf("executing migration: %w", err)
-			}
-
-			err = ms.migrationStore.SetMigrated(ctx, true)
-			if err != nil {
-				return fmt.Errorf("setting migration status: %w", err)
-			}
-
-			ms.log.Info("Completed legacy migration")
-			return nil
-		})
-	})
-	if errLock != nil {
-		ms.log.Warn("Server lock for alerting migration already exists")
-		return nil
-	}
-	if errMigration != nil {
-		return fmt.Errorf("migration failed: %w", errMigration)
-	}
-	return nil
-}
-
-// migrateAllOrgs executes the migration for all orgs.
-func (ms *migrationService) migrateAllOrgs(ctx context.Context) error {
-	orgs, err := ms.migrationStore.GetAllOrgs(ctx)
-	if err != nil {
-		return fmt.Errorf("get orgs: %w", err)
-	}
-
-	for _, o := range orgs {
-		om := ms.newOrgMigration(o.ID)
-		if err := om.migrateOrg(ctx); err != nil {
-			return fmt.Errorf("migrate org %d: %w", o.ID, err)
-		}
-
-		err = om.migrationStore.SetOrgMigrationState(ctx, o.ID, om.state)
-		if err != nil {
-			return fmt.Errorf("set org migration state: %w", err)
-		}
-	}
-	return nil
-}
diff --git a/pkg/services/ngalert/migration/service_test.go b/pkg/services/ngalert/migration/service_test.go
deleted file mode 100644
index 0b4c464e97418..0000000000000
--- a/pkg/services/ngalert/migration/service_test.go
+++ /dev/null
@@ -1,292 +0,0 @@
-package migration
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-	legacymodels "github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/ngalert/models"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-// TestServiceRevert tests migration revert.
-func TestServiceRevert(t *testing.T) {
-	alerts := []*legacymodels.Alert{
-		createAlert(t, 1, 1, 1, "alert1", []string{"notifier1"}),
-	}
-	channels := []*legacymodels.AlertNotification{
-		createAlertNotification(t, int64(1), "notifier1", "email", emailSettings, false),
-	}
-	dashes := []*dashboards.Dashboard{
-		createDashboard(t, 1, 1, "dash1-1", 5, nil),
-		createDashboard(t, 2, 1, "dash2-1", 5, nil),
-		createDashboard(t, 8, 1, "dash-in-general-1", 0, nil),
-	}
-	folders := []*dashboards.Dashboard{
-		createFolder(t, 5, 1, "folder5-1"),
-	}
-
-	t.Run("revert deletes UA resources", func(t *testing.T) {
-		sqlStore := db.InitTestDB(t)
-		x := sqlStore.GetEngine()
-
-		setupLegacyAlertsTables(t, x, channels, alerts, folders, dashes)
-
-		dashCount, err := x.Table("dashboard").Count(&dashboards.Dashboard{})
-		require.NoError(t, err)
-		require.Equal(t, int64(4), dashCount)
-
-		// Run migration.
-		ctx := context.Background()
-		cfg := &setting.Cfg{
-			ForceMigration: true,
-			UnifiedAlerting: setting.UnifiedAlertingSettings{
-				Enabled: pointer(true),
-			},
-		}
-		service := NewTestMigrationService(t, sqlStore, cfg)
-
-		err = service.migrationStore.SetMigrated(ctx, false)
-		require.NoError(t, err)
-
-		err = service.Run(ctx)
-		require.NoError(t, err)
-
-		// Verify migration was run.
-		migrated, err := service.migrationStore.IsMigrated(ctx)
-		require.NoError(t, err)
-		require.Equal(t, true, migrated)
-
-		// Currently, we fill in some random data for tables that aren't populated during migration.
-		_, err = x.Table("ngalert_configuration").Insert(models.AdminConfiguration{})
-		require.NoError(t, err)
-		_, err = x.Table("alert_instance").Insert(models.AlertInstance{
-			AlertInstanceKey: models.AlertInstanceKey{
-				RuleOrgID:  1,
-				RuleUID:    "alert1",
-				LabelsHash: "",
-			},
-			CurrentState:      models.InstanceStateNormal,
-			CurrentStateSince: time.Now(),
-			CurrentStateEnd:   time.Now(),
-			LastEvalTime:      time.Now(),
-		})
-		require.NoError(t, err)
-
-		// Verify various UA resources exist
-		tables := []string{
-			"alert_rule",
-			"alert_rule_version",
-			"alert_configuration",
-			"ngalert_configuration",
-			"alert_instance",
-		}
-		for _, table := range tables {
-			count, err := x.Table(table).Count()
-			require.NoError(t, err)
-			require.True(t, count > 0, "table %s should have at least one row", table)
-		}
-
-		// Revert migration.
-		service.cfg.UnifiedAlerting.Enabled = pointer(false)
-		err = service.Run(context.Background())
-		require.NoError(t, err)
-
-		// Verify revert was run.
-		migrated, err = service.migrationStore.IsMigrated(ctx)
-		require.NoError(t, err)
-		require.Equal(t, false, migrated)
-
-		// Verify various UA resources are gone
-		for _, table := range tables {
-			count, err := x.Table(table).Count()
-			require.NoError(t, err)
-			require.Equal(t, int64(0), count, "table %s should have no rows", table)
-		}
-	})
-
-	t.Run("revert deletes folders created during migration", func(t *testing.T) {
-		sqlStore := db.InitTestDB(t)
-		x := sqlStore.GetEngine()
-		alerts = []*legacymodels.Alert{
-			createAlert(t, 1, 8, 1, "alert1", []string{"notifier1"}),
-		}
-		setupLegacyAlertsTables(t, x, channels, alerts, folders, dashes)
-
-		dashCount, err := x.Table("dashboard").Count(&dashboards.Dashboard{})
-		require.NoError(t, err)
-		require.Equal(t, int64(4), dashCount)
-
-		// Run migration.
-		ctx := context.Background()
-		cfg := &setting.Cfg{
-			ForceMigration: true,
-			UnifiedAlerting: setting.UnifiedAlertingSettings{
-				Enabled: pointer(true),
-			},
-		}
-		service := NewTestMigrationService(t, sqlStore, cfg)
-
-		err = service.migrationStore.SetMigrated(ctx, false)
-		require.NoError(t, err)
-
-		err = service.Run(ctx)
-		require.NoError(t, err)
-
-		// Verify migration was run.
-		migrated, err := service.migrationStore.IsMigrated(ctx)
-		require.NoError(t, err)
-		require.Equal(t, true, migrated)
-
-		// Verify we created some folders.
-		newDashCount, err := x.Table("dashboard").Count(&dashboards.Dashboard{})
-		require.NoError(t, err)
-		require.Truef(t, newDashCount > dashCount, "newDashCount: %d should be greater than dashCount: %d", newDashCount, dashCount)
-
-		// Check that dashboards and folders from before migration still exist.
-		require.NotNil(t, getDashboard(t, x, 1, "dash1-1"))
-		require.NotNil(t, getDashboard(t, x, 1, "dash2-1"))
-		require.NotNil(t, getDashboard(t, x, 1, "dash-in-general-1"))
-
-		state, err := service.migrationStore.GetOrgMigrationState(ctx, 1)
-		require.NoError(t, err)
-
-		// Verify list of created folders.
-		require.NotEmpty(t, state.CreatedFolders)
-		for _, uid := range state.CreatedFolders {
-			require.NotNil(t, getDashboard(t, x, 1, uid))
-		}
-
-		// Revert migration.
-		service.cfg.UnifiedAlerting.Enabled = pointer(false)
-		err = service.Run(context.Background())
-		require.NoError(t, err)
-
-		// Verify revert was run.
-		migrated, err = service.migrationStore.IsMigrated(ctx)
-		require.NoError(t, err)
-		require.Equal(t, false, migrated)
-
-		// Verify we are back to the original count.
-		newDashCount, err = x.Table("dashboard").Count(&dashboards.Dashboard{})
-		require.NoError(t, err)
-		require.Equalf(t, dashCount, newDashCount, "newDashCount: %d should be equal to dashCount: %d after revert", newDashCount, dashCount)
-
-		// Check that dashboards and folders from before migration still exist.
-		require.NotNil(t, getDashboard(t, x, 1, "dash1-1"))
-		require.NotNil(t, getDashboard(t, x, 1, "dash2-1"))
-		require.NotNil(t, getDashboard(t, x, 1, "dash-in-general-1"))
-
-		// Check that folders created during migration are gone.
-		for _, uid := range state.CreatedFolders {
-			require.Nil(t, getDashboard(t, x, 1, uid))
-		}
-	})
-
-	t.Run("revert skips migrated folders that are not empty", func(t *testing.T) {
-		sqlStore := db.InitTestDB(t)
-		x := sqlStore.GetEngine()
-		alerts = []*legacymodels.Alert{
-			createAlert(t, 1, 8, 1, "alert1", []string{"notifier1"}),
-		}
-		setupLegacyAlertsTables(t, x, channels, alerts, folders, dashes)
-
-		dashCount, err := x.Table("dashboard").Count(&dashboards.Dashboard{})
-		require.NoError(t, err)
-		require.Equal(t, int64(4), dashCount)
-
-		// Run migration.
-		ctx := context.Background()
-		cfg := &setting.Cfg{
-			ForceMigration: true,
-			UnifiedAlerting: setting.UnifiedAlertingSettings{
-				Enabled: pointer(true),
-			},
-		}
-		service := NewTestMigrationService(t, sqlStore, cfg)
-
-		err = service.migrationStore.SetMigrated(ctx, false)
-		require.NoError(t, err)
-
-		err = service.Run(ctx)
-		require.NoError(t, err)
-
-		// Verify migration was run.
-		migrated, err := service.migrationStore.IsMigrated(ctx)
-		require.NoError(t, err)
-		require.Equal(t, true, migrated)
-
-		// Verify we created some folders.
-		newDashCount, err := x.Table("dashboard").Count(&dashboards.Dashboard{})
-		require.NoError(t, err)
-		require.Truef(t, newDashCount > dashCount, "newDashCount: %d should be greater than dashCount: %d", newDashCount, dashCount)
-
-		// Check that dashboards and folders from before migration still exist.
-		require.NotNil(t, getDashboard(t, x, 1, "dash1-1"))
-		require.NotNil(t, getDashboard(t, x, 1, "dash2-1"))
-		require.NotNil(t, getDashboard(t, x, 1, "dash-in-general-1"))
-
-		state, err := service.migrationStore.GetOrgMigrationState(ctx, 1)
-		require.NoError(t, err)
-
-		// Verify list of created folders.
-		require.NotEmpty(t, state.CreatedFolders)
-		var generalAlertingFolder *dashboards.Dashboard
-		for _, uid := range state.CreatedFolders {
-			f := getDashboard(t, x, 1, uid)
-			require.NotNil(t, f)
-			if f.Slug == "general-alerting" {
-				generalAlertingFolder = f
-			}
-		}
-		require.NotNil(t, generalAlertingFolder)
-
-		// Create dashboard in general alerting.
-		newDashes := []*dashboards.Dashboard{
-			createDashboard(t, 99, 1, "dash-in-general-alerting-1", generalAlertingFolder.ID, nil),
-		}
-		_, err = x.Insert(newDashes)
-		require.NoError(t, err)
-
-		newF := getDashboard(t, x, 1, "dash-in-general-alerting-1")
-		require.NotNil(t, newF)
-
-		// Revert migration.
-		service.cfg.UnifiedAlerting.Enabled = pointer(false)
-		err = service.Run(ctx)
-		require.NoError(t, err)
-
-		// Verify revert was run.
-		migrated, err = service.migrationStore.IsMigrated(ctx)
-		require.NoError(t, err)
-		require.Equal(t, false, migrated)
-
-		// Verify we are back to the original count + 2.
-		newDashCount, err = x.Table("dashboard").Count(&dashboards.Dashboard{})
-		require.NoError(t, err)
-		require.Equalf(t, dashCount+2, newDashCount, "newDashCount: %d should be equal to dashCount + 2: %d after revert", newDashCount, dashCount)
-
-		// Check that dashboards and folders from before migration still exist.
-		require.NotNil(t, getDashboard(t, x, 1, "dash1-1"))
-		require.NotNil(t, getDashboard(t, x, 1, "dash2-1"))
-		require.NotNil(t, getDashboard(t, x, 1, "dash-in-general-1"))
-
-		// Check that the general alerting folder still exists.
-		require.NotNil(t, getDashboard(t, x, 1, generalAlertingFolder.UID))
-		// Check that the new dashboard in general alerting folder still exists.
-		require.NotNil(t, getDashboard(t, x, 1, "dash-in-general-alerting-1"))
-
-		// Check that other folders created during migration are gone.
-		for _, uid := range state.CreatedFolders {
-			if uid == generalAlertingFolder.UID {
-				continue
-			}
-			require.Nil(t, getDashboard(t, x, 1, uid))
-		}
-	})
-}
diff --git a/pkg/services/ngalert/migration/silences.go b/pkg/services/ngalert/migration/silences.go
deleted file mode 100644
index b5431e854f801..0000000000000
--- a/pkg/services/ngalert/migration/silences.go
+++ /dev/null
@@ -1,159 +0,0 @@
-package migration
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"math/rand"
-	"os"
-	"path/filepath"
-	"strconv"
-	"time"
-
-	"github.com/google/uuid"
-	"github.com/matttproud/golang_protobuf_extensions/pbutil"
-	pb "github.com/prometheus/alertmanager/silence/silencepb"
-	"github.com/prometheus/common/model"
-
-	"github.com/grafana/grafana/pkg/services/ngalert/models"
-)
-
-const (
-	// Should be the same as 'NoDataAlertName' in pkg/services/schedule/compat.go.
-	NoDataAlertName = "DatasourceNoData"
-
-	ErrorAlertName = "DatasourceError"
-)
-
-// addErrorSilence adds a silence for the given rule to the orgMigration if the ExecutionErrorState was set to keep_state.
-func (om *OrgMigration) addErrorSilence(rule *models.AlertRule) error {
-	uid, err := uuid.NewRandom()
-	if err != nil {
-		return errors.New("create uuid for silence")
-	}
-
-	s := &pb.MeshSilence{
-		Silence: &pb.Silence{
-			Id: uid.String(),
-			Matchers: []*pb.Matcher{
-				{
-					Type:    pb.Matcher_EQUAL,
-					Name:    model.AlertNameLabel,
-					Pattern: ErrorAlertName,
-				},
-				{
-					Type:    pb.Matcher_EQUAL,
-					Name:    "rule_uid",
-					Pattern: rule.UID,
-				},
-			},
-			StartsAt:  time.Now(),
-			EndsAt:    time.Now().AddDate(1, 0, 0), // 1 year
-			CreatedBy: "Grafana Migration",
-			Comment:   fmt.Sprintf("Created during migration to unified alerting to silence Error state for alert rule ID '%s' and Title '%s' because the option 'Keep Last State' was selected for Error state", rule.UID, rule.Title),
-		},
-		ExpiresAt: time.Now().AddDate(1, 0, 0), // 1 year
-	}
-	om.silences = append(om.silences, s)
-	return nil
-}
-
-// addNoDataSilence adds a silence for the given rule to the orgMigration if the NoDataState was set to keep_state.
-func (om *OrgMigration) addNoDataSilence(rule *models.AlertRule) error {
-	uid, err := uuid.NewRandom()
-	if err != nil {
-		return errors.New("create uuid for silence")
-	}
-
-	s := &pb.MeshSilence{
-		Silence: &pb.Silence{
-			Id: uid.String(),
-			Matchers: []*pb.Matcher{
-				{
-					Type:    pb.Matcher_EQUAL,
-					Name:    model.AlertNameLabel,
-					Pattern: NoDataAlertName,
-				},
-				{
-					Type:    pb.Matcher_EQUAL,
-					Name:    "rule_uid",
-					Pattern: rule.UID,
-				},
-			},
-			StartsAt:  time.Now(),
-			EndsAt:    time.Now().AddDate(1, 0, 0), // 1 year.
-			CreatedBy: "Grafana Migration",
-			Comment:   fmt.Sprintf("Created during migration to unified alerting to silence NoData state for alert rule ID '%s' and Title '%s' because the option 'Keep Last State' was selected for NoData state", rule.UID, rule.Title),
-		},
-		ExpiresAt: time.Now().AddDate(1, 0, 0), // 1 year.
-	}
-	om.silences = append(om.silences, s)
-	return nil
-}
-
-func (om *OrgMigration) writeSilencesFile() error {
-	var buf bytes.Buffer
-	om.log.Debug("Writing silences file", "silences", len(om.silences))
-	for _, e := range om.silences {
-		if _, err := pbutil.WriteDelimited(&buf, e); err != nil {
-			return err
-		}
-	}
-
-	f, err := openReplace(silencesFileNameForOrg(om.cfg.DataPath, om.orgID))
-	if err != nil {
-		return err
-	}
-
-	if _, err := io.Copy(f, bytes.NewReader(buf.Bytes())); err != nil {
-		return err
-	}
-
-	return f.Close()
-}
-
-func silencesFileNameForOrg(dataPath string, orgID int64) string {
-	return filepath.Join(dataPath, "alerting", strconv.Itoa(int(orgID)), "silences")
-}
-
-// replaceFile wraps a file that is moved to another filename on closing.
-type replaceFile struct {
-	*os.File
-	filename string
-}
-
-func (f *replaceFile) Close() error {
-	if err := f.File.Sync(); err != nil {
-		return err
-	}
-	if err := f.File.Close(); err != nil {
-		return err
-	}
-	return os.Rename(f.File.Name(), f.filename)
-}
-
-// openReplace opens a new temporary file that is moved to filename on closing.
-func openReplace(filename string) (*replaceFile, error) {
-	tmpFilename := fmt.Sprintf("%s.%x", filename, uint64(rand.Int63()))
-
-	if err := os.MkdirAll(filepath.Dir(tmpFilename), os.ModePerm); err != nil {
-		return nil, err
-	}
-
-	//nolint:gosec
-	f, err := os.Create(tmpFilename)
-	if err != nil {
-		return nil, err
-	}
-
-	rf := &replaceFile{
-		File:     f,
-		filename: filename,
-	}
-	return rf, nil
-}
-
-func getLabelForSilenceMatching(ruleUID string) (string, string) {
-	return "rule_uid", ruleUID
-}
diff --git a/pkg/services/ngalert/migration/store/database.go b/pkg/services/ngalert/migration/store/database.go
deleted file mode 100644
index 2eecc8924adb8..0000000000000
--- a/pkg/services/ngalert/migration/store/database.go
+++ /dev/null
@@ -1,442 +0,0 @@
-package store
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/infra/kvstore"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/accesscontrol"
-	legacyalerting "github.com/grafana/grafana/pkg/services/alerting"
-	legacymodels "github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/auth/identity"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/datasources"
-	"github.com/grafana/grafana/pkg/services/folder"
-	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
-	migmodels "github.com/grafana/grafana/pkg/services/ngalert/migration/models"
-	"github.com/grafana/grafana/pkg/services/ngalert/models"
-	"github.com/grafana/grafana/pkg/services/ngalert/notifier"
-	"github.com/grafana/grafana/pkg/services/ngalert/store"
-	"github.com/grafana/grafana/pkg/services/org"
-	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
-	"github.com/grafana/grafana/pkg/services/user"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-// Store is the database abstraction for migration persistence.
-type Store interface {
-	InsertAlertRules(ctx context.Context, rules ...models.AlertRule) error
-
-	SaveAlertmanagerConfiguration(ctx context.Context, orgID int64, amConfig *apimodels.PostableUserConfig) error
-
-	GetAllOrgs(ctx context.Context) ([]*org.OrgDTO, error)
-
-	GetDatasource(ctx context.Context, datasourceID int64, user identity.Requester) (*datasources.DataSource, error)
-
-	GetNotificationChannels(ctx context.Context, orgID int64) ([]*legacymodels.AlertNotification, error)
-
-	GetOrgDashboardAlerts(ctx context.Context, orgID int64) (map[int64][]*DashAlert, int, error)
-
-	GetDashboardPermissions(ctx context.Context, user identity.Requester, resourceID string) ([]accesscontrol.ResourcePermission, error)
-	GetFolderPermissions(ctx context.Context, user identity.Requester, resourceID string) ([]accesscontrol.ResourcePermission, error)
-	SetDashboardPermissions(ctx context.Context, orgID int64, resourceID string, commands ...accesscontrol.SetResourcePermissionCommand) ([]accesscontrol.ResourcePermission, error)
-	SetFolderPermissions(ctx context.Context, orgID int64, resourceID string, commands ...accesscontrol.SetResourcePermissionCommand) ([]accesscontrol.ResourcePermission, error)
-	MapActions(permission accesscontrol.ResourcePermission) string
-
-	GetDashboard(ctx context.Context, orgID int64, id int64) (*dashboards.Dashboard, error)
-	GetFolder(ctx context.Context, cmd *folder.GetFolderQuery) (*folder.Folder, error)
-	CreateFolder(ctx context.Context, cmd *folder.CreateFolderCommand) (*folder.Folder, error)
-
-	IsMigrated(ctx context.Context) (bool, error)
-	SetMigrated(ctx context.Context, migrated bool) error
-	GetOrgMigrationState(ctx context.Context, orgID int64) (*migmodels.OrgMigrationState, error)
-	SetOrgMigrationState(ctx context.Context, orgID int64, summary *migmodels.OrgMigrationState) error
-
-	RevertAllOrgs(ctx context.Context) error
-
-	CaseInsensitive() bool
-}
-
-type migrationStore struct {
-	store                db.DB
-	cfg                  *setting.Cfg
-	log                  log.Logger
-	kv                   kvstore.KVStore
-	alertingStore        *store.DBstore
-	dashboardService     dashboards.DashboardService
-	folderService        folder.Service
-	dataSourceCache      datasources.CacheService
-	folderPermissions    accesscontrol.FolderPermissionsService
-	dashboardPermissions accesscontrol.DashboardPermissionsService
-	orgService           org.Service
-
-	legacyAlertNotificationService *legacyalerting.AlertNotificationService
-}
-
-// MigrationStore implements the Store interface.
-var _ Store = (*migrationStore)(nil)
-
-func ProvideMigrationStore(
-	cfg *setting.Cfg,
-	sqlStore db.DB,
-	kv kvstore.KVStore,
-	alertingStore *store.DBstore,
-	dashboardService dashboards.DashboardService,
-	folderService folder.Service,
-	dataSourceCache datasources.CacheService,
-	folderPermissions accesscontrol.FolderPermissionsService,
-	dashboardPermissions accesscontrol.DashboardPermissionsService,
-	orgService org.Service,
-	legacyAlertNotificationService *legacyalerting.AlertNotificationService,
-) (Store, error) {
-	return &migrationStore{
-		log:                            log.New("ngalert.migration-store"),
-		cfg:                            cfg,
-		store:                          sqlStore,
-		kv:                             kv,
-		alertingStore:                  alertingStore,
-		dashboardService:               dashboardService,
-		folderService:                  folderService,
-		dataSourceCache:                dataSourceCache,
-		folderPermissions:              folderPermissions,
-		dashboardPermissions:           dashboardPermissions,
-		orgService:                     orgService,
-		legacyAlertNotificationService: legacyAlertNotificationService,
-	}, nil
-}
-
-// KVNamespace is the kvstore namespace used for the migration status.
-const KVNamespace = "ngalert.migration"
-
-// migratedKey is the kvstore key used for the migration status.
-const migratedKey = "migrated"
-
-// stateKey is the kvstore key used for the OrgMigrationState.
-const stateKey = "stateKey"
-
-const anyOrg = 0
-
-// IsMigrated returns the migration status from the kvstore.
-func (ms *migrationStore) IsMigrated(ctx context.Context) (bool, error) {
-	kv := kvstore.WithNamespace(ms.kv, anyOrg, KVNamespace)
-	content, exists, err := kv.Get(ctx, migratedKey)
-	if err != nil {
-		return false, err
-	}
-
-	if !exists {
-		return false, nil
-	}
-
-	return strconv.ParseBool(content)
-}
-
-// SetMigrated sets the migration status in the kvstore.
-func (ms *migrationStore) SetMigrated(ctx context.Context, migrated bool) error {
-	kv := kvstore.WithNamespace(ms.kv, anyOrg, KVNamespace)
-	return kv.Set(ctx, migratedKey, strconv.FormatBool(migrated))
-}
-
-// GetOrgMigrationState returns a summary of a previous migration.
-func (ms *migrationStore) GetOrgMigrationState(ctx context.Context, orgID int64) (*migmodels.OrgMigrationState, error) {
-	kv := kvstore.WithNamespace(ms.kv, orgID, KVNamespace)
-	content, exists, err := kv.Get(ctx, stateKey)
-	if err != nil {
-		return nil, err
-	}
-
-	if !exists {
-		return &migmodels.OrgMigrationState{OrgID: orgID}, nil
-	}
-
-	var summary migmodels.OrgMigrationState
-	err = json.Unmarshal([]byte(content), &summary)
-	if err != nil {
-		return nil, err
-	}
-
-	return &summary, nil
-}
-
-// SetOrgMigrationState sets the summary of a previous migration.
-func (ms *migrationStore) SetOrgMigrationState(ctx context.Context, orgID int64, summary *migmodels.OrgMigrationState) error {
-	kv := kvstore.WithNamespace(ms.kv, orgID, KVNamespace)
-	raw, err := json.Marshal(summary)
-	if err != nil {
-		return err
-	}
-
-	return kv.Set(ctx, stateKey, string(raw))
-}
-
-func (ms *migrationStore) InsertAlertRules(ctx context.Context, rules ...models.AlertRule) error {
-	if ms.store.GetDialect().DriverName() == migrator.Postgres {
-		// Postgresql which will automatically rollback the whole transaction on constraint violation.
-		// So, for postgresql, insertions will execute in a subtransaction.
-		err := ms.store.InTransaction(ctx, func(subCtx context.Context) error {
-			_, err := ms.alertingStore.InsertAlertRules(subCtx, rules)
-			if err != nil {
-				return err
-			}
-			return nil
-		})
-		if err != nil {
-			return err
-		}
-	} else {
-		_, err := ms.alertingStore.InsertAlertRules(ctx, rules)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (ms *migrationStore) SaveAlertmanagerConfiguration(ctx context.Context, orgID int64, amConfig *apimodels.PostableUserConfig) error {
-	rawAmConfig, err := json.Marshal(amConfig)
-	if err != nil {
-		return err
-	}
-
-	cmd := models.SaveAlertmanagerConfigurationCmd{
-		AlertmanagerConfiguration: string(rawAmConfig),
-		ConfigurationVersion:      fmt.Sprintf("v%d", models.AlertConfigurationVersion),
-		Default:                   false,
-		OrgID:                     orgID,
-		LastApplied:               0,
-	}
-	return ms.alertingStore.SaveAlertmanagerConfiguration(ctx, &cmd)
-}
-
-// revertPermissions are the permissions required for the background user to revert the migration.
-var revertPermissions = []accesscontrol.Permission{
-	{Action: dashboards.ActionFoldersDelete, Scope: dashboards.ScopeFoldersAll},
-	{Action: dashboards.ActionFoldersRead, Scope: dashboards.ScopeFoldersAll},
-}
-
-// RevertAllOrgs reverts the migration, deleting all unified alerting resources such as alert rules, alertmanager configurations, and silence files.
-// In addition, it will delete all folders and permissions originally created by this migration, these are stored in the kvstore.
-func (ms *migrationStore) RevertAllOrgs(ctx context.Context) error {
-	return ms.store.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		if _, err := sess.Exec("DELETE FROM alert_rule"); err != nil {
-			return err
-		}
-
-		if _, err := sess.Exec("DELETE FROM alert_rule_version"); err != nil {
-			return err
-		}
-
-		orgs, err := ms.GetAllOrgs(ctx)
-		if err != nil {
-			return fmt.Errorf("get orgs: %w", err)
-		}
-		for _, o := range orgs {
-			if err := ms.DeleteMigratedFolders(ctx, o.ID); err != nil {
-				ms.log.Warn("Failed to delete migrated folders", "orgID", o.ID, "err", err)
-				continue
-			}
-		}
-
-		if _, err := sess.Exec("DELETE FROM alert_configuration"); err != nil {
-			return err
-		}
-
-		if _, err := sess.Exec("DELETE FROM ngalert_configuration"); err != nil {
-			return err
-		}
-
-		if _, err := sess.Exec("DELETE FROM alert_instance"); err != nil {
-			return err
-		}
-
-		if _, err := sess.Exec("DELETE FROM kv_store WHERE namespace = ?", notifier.KVNamespace); err != nil {
-			return err
-		}
-
-		if _, err := sess.Exec("DELETE FROM kv_store WHERE namespace = ?", KVNamespace); err != nil {
-			return err
-		}
-
-		files, err := filepath.Glob(filepath.Join(ms.cfg.DataPath, "alerting", "*", "silences"))
-		if err != nil {
-			return err
-		}
-		for _, f := range files {
-			if err := os.Remove(f); err != nil {
-				ms.log.Error("Failed to remove silence file", "file", f, "err", err)
-			}
-		}
-
-		err = ms.SetMigrated(ctx, false)
-		if err != nil {
-			return fmt.Errorf("setting migration status: %w", err)
-		}
-
-		return nil
-	})
-}
-
-// DeleteMigratedFolders deletes all folders created by the previous migration run for the given org. This includes all folder permissions.
-// If the folder is not empty of all descendants the operation will fail and return an error.
-func (ms *migrationStore) DeleteMigratedFolders(ctx context.Context, orgID int64) error {
-	summary, err := ms.GetOrgMigrationState(ctx, orgID)
-	if err != nil {
-		return err
-	}
-	return ms.DeleteFolders(ctx, orgID, summary.CreatedFolders...)
-}
-
-var ErrFolderNotDeleted = fmt.Errorf("folder not deleted")
-
-// DeleteFolders deletes the folders from the given orgs with the given UIDs. This includes all folder permissions.
-// If the folder is not empty of all descendants the operation will fail and return an error.
-func (ms *migrationStore) DeleteFolders(ctx context.Context, orgID int64, uids ...string) error {
-	if len(uids) == 0 {
-		return nil
-	}
-
-	var errs error
-	usr := accesscontrol.BackgroundUser("ngalert_migration_revert", orgID, org.RoleAdmin, revertPermissions)
-	for _, folderUID := range uids {
-		// Check if folder is empty. If not, we should not delete it.
-		uid := folderUID
-		countCmd := folder.GetDescendantCountsQuery{
-			UID:          &uid,
-			OrgID:        orgID,
-			SignedInUser: usr.(*user.SignedInUser),
-		}
-		count, err := ms.folderService.GetDescendantCounts(ctx, &countCmd)
-		if err != nil {
-			errs = errors.Join(errs, fmt.Errorf("folder %s: %w", folderUID, err))
-			continue
-		}
-		var descendantCounts []string
-		var cntErr error
-		for kind, cnt := range count {
-			if cnt > 0 {
-				descendantCounts = append(descendantCounts, fmt.Sprintf("%d %s", cnt, kind))
-				if err != nil {
-					cntErr = errors.Join(cntErr, err)
-					continue
-				}
-			}
-		}
-		if cntErr != nil {
-			errs = errors.Join(errs, fmt.Errorf("folder %s: %w", folderUID, cntErr))
-			continue
-		}
-
-		if len(descendantCounts) > 0 {
-			errs = errors.Join(errs, fmt.Errorf("folder %s contains descendants: %s", folderUID, strings.Join(descendantCounts, ", ")))
-			continue
-		}
-
-		cmd := folder.DeleteFolderCommand{
-			UID:          uid,
-			OrgID:        orgID,
-			SignedInUser: usr.(*user.SignedInUser),
-		}
-		err = ms.folderService.Delete(ctx, &cmd) // Also handles permissions and other related entities.
-		if err != nil {
-			errs = errors.Join(errs, fmt.Errorf("folder %s: %w", folderUID, err))
-			continue
-		}
-	}
-	if errs != nil {
-		return fmt.Errorf("%w: %w", ErrFolderNotDeleted, errs)
-	}
-	return nil
-}
-
-func (ms *migrationStore) GetDashboard(ctx context.Context, orgID int64, id int64) (*dashboards.Dashboard, error) {
-	return ms.dashboardService.GetDashboard(ctx, &dashboards.GetDashboardQuery{ID: id, OrgID: orgID})
-}
-
-func (ms *migrationStore) GetAllOrgs(ctx context.Context) ([]*org.OrgDTO, error) {
-	orgQuery := &org.SearchOrgsQuery{}
-	return ms.orgService.Search(ctx, orgQuery)
-}
-
-func (ms *migrationStore) GetDatasource(ctx context.Context, datasourceID int64, user identity.Requester) (*datasources.DataSource, error) {
-	return ms.dataSourceCache.GetDatasource(ctx, datasourceID, user, false)
-}
-
-// GetNotificationChannels returns all channels for this org.
-func (ms *migrationStore) GetNotificationChannels(ctx context.Context, orgID int64) ([]*legacymodels.AlertNotification, error) {
-	return ms.legacyAlertNotificationService.GetAllAlertNotifications(ctx, &legacymodels.GetAllAlertNotificationsQuery{
-		OrgID: orgID,
-	})
-}
-
-// GetOrgDashboardAlerts loads all legacy dashboard alerts for the given org mapped by dashboard id.
-func (ms *migrationStore) GetOrgDashboardAlerts(ctx context.Context, orgID int64) (map[int64][]*DashAlert, int, error) {
-	var alerts []legacymodels.Alert
-	err := ms.store.WithDbSession(ctx, func(sess *db.Session) error {
-		return sess.SQL("select * from alert WHERE org_id = ? AND dashboard_id IN (SELECT id from dashboard)", orgID).Find(&alerts)
-	})
-	if err != nil {
-		return nil, 0, err
-	}
-
-	mappedAlerts := make(map[int64][]*DashAlert)
-	for i := range alerts {
-		alert := alerts[i]
-
-		rawSettings, err := json.Marshal(alert.Settings)
-		if err != nil {
-			return nil, 0, fmt.Errorf("get settings for alert rule ID:%d, name:'%s', orgID:%d: %w", alert.ID, alert.Name, alert.OrgID, err)
-		}
-		var parsedSettings DashAlertSettings
-		err = json.Unmarshal(rawSettings, &parsedSettings)
-		if err != nil {
-			return nil, 0, fmt.Errorf("parse settings for alert rule ID:%d, name:'%s', orgID:%d: %w", alert.ID, alert.Name, alert.OrgID, err)
-		}
-
-		mappedAlerts[alert.DashboardID] = append(mappedAlerts[alert.DashboardID], &DashAlert{
-			Alert:          &alerts[i],
-			ParsedSettings: &parsedSettings,
-		})
-	}
-	return mappedAlerts, len(alerts), nil
-}
-
-func (ms *migrationStore) GetDashboardPermissions(ctx context.Context, user identity.Requester, resourceID string) ([]accesscontrol.ResourcePermission, error) {
-	return ms.dashboardPermissions.GetPermissions(ctx, user, resourceID)
-}
-
-func (ms *migrationStore) GetFolderPermissions(ctx context.Context, user identity.Requester, resourceID string) ([]accesscontrol.ResourcePermission, error) {
-	return ms.folderPermissions.GetPermissions(ctx, user, resourceID)
-}
-
-func (ms *migrationStore) GetFolder(ctx context.Context, cmd *folder.GetFolderQuery) (*folder.Folder, error) {
-	return ms.folderService.Get(ctx, cmd)
-}
-
-func (ms *migrationStore) CreateFolder(ctx context.Context, cmd *folder.CreateFolderCommand) (*folder.Folder, error) {
-	return ms.folderService.Create(ctx, cmd)
-}
-
-func (ms *migrationStore) SetDashboardPermissions(ctx context.Context, orgID int64, resourceID string, commands ...accesscontrol.SetResourcePermissionCommand) ([]accesscontrol.ResourcePermission, error) {
-	return ms.dashboardPermissions.SetPermissions(ctx, orgID, resourceID, commands...)
-}
-
-func (ms *migrationStore) SetFolderPermissions(ctx context.Context, orgID int64, resourceID string, commands ...accesscontrol.SetResourcePermissionCommand) ([]accesscontrol.ResourcePermission, error) {
-	return ms.folderPermissions.SetPermissions(ctx, orgID, resourceID, commands...)
-}
-
-func (ms *migrationStore) MapActions(permission accesscontrol.ResourcePermission) string {
-	return ms.dashboardPermissions.MapActions(permission)
-}
-
-func (ms *migrationStore) CaseInsensitive() bool {
-	return ms.store.GetDialect().SupportEngine()
-}
diff --git a/pkg/services/ngalert/migration/store/models.go b/pkg/services/ngalert/migration/store/models.go
deleted file mode 100644
index 8fe78ee5722da..0000000000000
--- a/pkg/services/ngalert/migration/store/models.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package store
-
-import (
-	"encoding/json"
-
-	legacymodels "github.com/grafana/grafana/pkg/services/alerting/models"
-)
-
-// uidOrID for both uid and ID, primarily used for mapping legacy channel to migrated receiver.
-type UidOrID any
-
-type DashAlert struct {
-	*legacymodels.Alert
-	ParsedSettings *DashAlertSettings
-}
-
-// dashAlertSettings is a type for the JSON that is in the settings field of
-// the alert table.
-type DashAlertSettings struct {
-	NoDataState         string               `json:"noDataState"`
-	ExecutionErrorState string               `json:"executionErrorState"`
-	Conditions          []DashAlertCondition `json:"conditions"`
-	AlertRuleTags       any                  `json:"alertRuleTags"`
-	Notifications       []DashAlertNot       `json:"notifications"`
-}
-
-// dashAlertNot is the object that represents the Notifications array in
-// dashAlertSettings
-type DashAlertNot struct {
-	UID string `json:"uid,omitempty"`
-	ID  int64  `json:"id,omitempty"`
-}
-
-// dashAlertingConditionJSON is like classic.ClassicConditionJSON except that it
-// includes the model property with the query.
-type DashAlertCondition struct {
-	Evaluator ConditionEvalJSON `json:"evaluator"`
-
-	Operator struct {
-		Type string `json:"type"`
-	} `json:"operator"`
-
-	Query struct {
-		Params       []string `json:"params"`
-		DatasourceID int64    `json:"datasourceId"`
-		Model        json.RawMessage
-	} `json:"query"`
-
-	Reducer struct {
-		// Params []any `json:"params"` (Unused)
-		Type string `json:"type"`
-	}
-}
-
-type ConditionEvalJSON struct {
-	Params []float64 `json:"params"`
-	Type   string    `json:"type"` // e.g. "gt"
-}
diff --git a/pkg/services/ngalert/migration/store/testing.go b/pkg/services/ngalert/migration/store/testing.go
deleted file mode 100644
index a21dfa4d41544..0000000000000
--- a/pkg/services/ngalert/migration/store/testing.go
+++ /dev/null
@@ -1,103 +0,0 @@
-package store
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/api/routing"
-	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/infra/localcache"
-	"github.com/grafana/grafana/pkg/infra/log/logtest"
-	"github.com/grafana/grafana/pkg/infra/tracing"
-	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
-	"github.com/grafana/grafana/pkg/services/accesscontrol/ossaccesscontrol"
-	legacyalerting "github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/dashboards/database"
-	dashboardservice "github.com/grafana/grafana/pkg/services/dashboards/service"
-	datasourceGuardian "github.com/grafana/grafana/pkg/services/datasources/guardian"
-	datasourceService "github.com/grafana/grafana/pkg/services/datasources/service"
-	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/services/folder/folderimpl"
-	"github.com/grafana/grafana/pkg/services/guardian"
-	"github.com/grafana/grafana/pkg/services/licensing/licensingtest"
-	"github.com/grafana/grafana/pkg/services/ngalert/store"
-	"github.com/grafana/grafana/pkg/services/ngalert/tests/fakes"
-	"github.com/grafana/grafana/pkg/services/org/orgimpl"
-	"github.com/grafana/grafana/pkg/services/quota/quotatest"
-	"github.com/grafana/grafana/pkg/services/sqlstore"
-	"github.com/grafana/grafana/pkg/services/supportbundles/bundleregistry"
-	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
-	"github.com/grafana/grafana/pkg/services/team/teamimpl"
-	"github.com/grafana/grafana/pkg/services/user/userimpl"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func NewTestMigrationStore(t *testing.T, sqlStore *sqlstore.SQLStore, cfg *setting.Cfg) *migrationStore {
-	if cfg.UnifiedAlerting.BaseInterval == 0 {
-		cfg.UnifiedAlerting.BaseInterval = time.Second * 10
-	}
-	features := featuremgmt.WithFeatures()
-	cfg.IsFeatureToggleEnabled = features.IsEnabled
-	alertingStore := store.DBstore{
-		SQLStore: sqlStore,
-		Cfg:      cfg.UnifiedAlerting,
-	}
-	bus := bus.ProvideBus(tracing.InitializeTracerForTest())
-	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
-
-	cache := localcache.ProvideService()
-	quotaService := &quotatest.FakeQuotaService{}
-	ac := acimpl.ProvideAccessControl(cfg)
-	routeRegister := routing.ProvideRegister()
-	acSvc, err := acimpl.ProvideService(cfg, sqlStore, routing.ProvideRegister(), cache, ac, features)
-	require.NoError(t, err)
-
-	license := licensingtest.NewFakeLicensing()
-	license.On("FeatureEnabled", "accesscontrol.enforcement").Return(true).Maybe()
-	teamSvc := teamimpl.ProvideService(sqlStore, cfg)
-	orgService, err := orgimpl.ProvideService(sqlStore, cfg, quotaService)
-	require.NoError(t, err)
-	userSvc, err := userimpl.ProvideService(sqlStore, orgService, cfg, teamSvc, cache, quotaService, bundleregistry.ProvideService())
-	require.NoError(t, err)
-
-	dashboardStore, err := database.ProvideDashboardStore(sqlStore, sqlStore.Cfg, features, tagimpl.ProvideService(sqlStore, cfg), quotaService)
-	require.NoError(t, err)
-	folderService := folderimpl.ProvideService(ac, bus, cfg, dashboardStore, folderStore, sqlStore, features)
-
-	folderPermissions, err := ossaccesscontrol.ProvideFolderPermissions(
-		features, routeRegister, sqlStore, ac, license, dashboardStore, folderService, acSvc, teamSvc, userSvc)
-	require.NoError(t, err)
-	dashboardPermissions, err := ossaccesscontrol.ProvideDashboardPermissions(
-		features, routeRegister, sqlStore, ac, license, dashboardStore, folderService, acSvc, teamSvc, userSvc)
-	require.NoError(t, err)
-
-	dashboardService, err := dashboardservice.ProvideDashboardServiceImpl(
-		cfg, dashboardStore, folderStore, nil,
-		features, folderPermissions, dashboardPermissions, ac,
-		folderService,
-	)
-	require.NoError(t, err)
-	guardian.InitAccessControlGuardian(setting.NewCfg(), ac, dashboardService)
-
-	err = acSvc.RegisterFixedRoles(context.Background())
-	require.NoError(t, err)
-
-	return &migrationStore{
-		log:                            &logtest.Fake{},
-		cfg:                            cfg,
-		store:                          sqlStore,
-		kv:                             fakes.NewFakeKVStore(t),
-		alertingStore:                  &alertingStore,
-		dashboardService:               dashboardService,
-		folderService:                  folderService,
-		dataSourceCache:                datasourceService.ProvideCacheService(cache, sqlStore, datasourceGuardian.ProvideGuardian()),
-		folderPermissions:              folderPermissions,
-		dashboardPermissions:           dashboardPermissions,
-		orgService:                     orgService,
-		legacyAlertNotificationService: legacyalerting.ProvideService(sqlStore, encryptionservice.SetupTestService(t), nil),
-	}
-}
diff --git a/pkg/services/ngalert/migration/template.go b/pkg/services/ngalert/migration/template.go
deleted file mode 100644
index fb218d582c974..0000000000000
--- a/pkg/services/ngalert/migration/template.go
+++ /dev/null
@@ -1,208 +0,0 @@
-// This file contains code that parses templates from old alerting into a sequence
-// of tokens. Each token can be either a string literal or a variable.
-
-package migration
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"strconv"
-	"strings"
-	"unicode"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/ngalert/state/template"
-)
-
-// Token contains either a string literal or a variable.
-type Token struct {
-	Literal  string
-	Variable string
-}
-
-func (t Token) IsLiteral() bool {
-	return t.Literal != ""
-}
-
-func (t Token) IsVariable() bool {
-	return t.Variable != ""
-}
-
-func (t Token) String() string {
-	if t.IsLiteral() {
-		return t.Literal
-	} else if t.IsVariable() {
-		return t.Variable
-	} else {
-		panic("empty token")
-	}
-}
-
-func MigrateTmpl(l log.Logger, oldTmpl string) string {
-	var newTmpl string
-
-	tokens := tokenizeTmpl(l, oldTmpl)
-	tokens = escapeLiterals(tokens)
-
-	if anyVariableToken(tokens) {
-		tokens = variablesToMapLookups(tokens, "mergedLabels")
-		newTmpl += fmt.Sprintf("{{- $mergedLabels := %s $values -}}\n", template.MergeLabelValuesFuncName)
-	}
-
-	newTmpl += tokensToTmpl(tokens)
-	return newTmpl
-}
-
-func tokenizeTmpl(logger log.Logger, tmpl string) []Token {
-	var (
-		tokens []Token
-		l      int
-		r      int
-		err    error
-	)
-
-	in := []rune(tmpl)
-	for r < len(in) {
-		if !startVariable(in[r:]) {
-			r++
-			continue
-		}
-
-		token, offset, tokenErr := tokenizeVariable(in[r:])
-		if tokenErr != nil {
-			err = errors.Join(err, tokenErr)
-			r += offset
-			continue
-		}
-
-		// we've found a variable, so everything from l -> r is the literal before the variable
-		// ex: "foo ${bar}" -> Literal: "foo ", Variable: "bar"
-		if r > l {
-			tokens = append(tokens, Token{Literal: string(in[l:r])})
-		}
-		tokens = append(tokens, token)
-
-		// seek l and r past the variable
-		r += offset
-		l = r
-	}
-
-	// any remaining runes will be a final literal
-	if r > l {
-		tokens = append(tokens, Token{Literal: string(in[l:r])})
-	}
-
-	if err != nil {
-		logger.Warn("Encountered malformed template", "template", tmpl, "err", err)
-	}
-
-	return tokens
-}
-
-func tokenizeVariable(in []rune) (Token, int, error) {
-	var (
-		pos   int
-		r     rune
-		runes []rune
-	)
-
-	if !startVariable(in) {
-		panic("tokenizeVariable called with input that doesn't start with delimiter")
-	}
-	pos += 2 // seek past opening delimiter
-
-	// consume valid runes until we hit a closing brace
-	// non-space whitespace and the opening delimiter are invalid
-	for pos < len(in) {
-		r = in[pos]
-
-		if unicode.IsSpace(r) && r != ' ' {
-			return Token{}, pos, fmt.Errorf("unexpected whitespace")
-		}
-
-		if startVariable(in[pos:]) {
-			return Token{}, pos, fmt.Errorf("ambiguous delimiter")
-		}
-
-		if r == '}' {
-			pos++
-			break
-		}
-
-		runes = append(runes, r)
-		pos++
-	}
-
-	// variable must end with '}' delimiter
-	if r != '}' {
-		return Token{}, pos, fmt.Errorf("expected '}', got '%c'", r)
-	}
-
-	return Token{Variable: string(runes)}, pos, nil
-}
-
-func startVariable(in []rune) bool {
-	return len(in) >= 2 && in[0] == '$' && in[1] == '{'
-}
-
-func anyVariableToken(tokens []Token) bool {
-	for _, token := range tokens {
-		if token.IsVariable() {
-			return true
-		}
-	}
-	return false
-}
-
-// tokensToTmpl returns the tokens as a Go template
-func tokensToTmpl(tokens []Token) string {
-	buf := bytes.Buffer{}
-	for _, token := range tokens {
-		if token.IsVariable() {
-			buf.WriteString("{{")
-			buf.WriteString(token.String())
-			buf.WriteString("}}")
-		} else {
-			buf.WriteString(token.String())
-		}
-	}
-	return buf.String()
-}
-
-// escapeLiterals escapes any token literals with substrings that would be interpreted as Go template syntax
-func escapeLiterals(tokens []Token) []Token {
-	result := make([]Token, 0, len(tokens))
-	for _, token := range tokens {
-		if token.IsLiteral() && shouldEscape(token.Literal) {
-			token.Literal = fmt.Sprintf("{{`%s`}}", token.Literal)
-		}
-		result = append(result, token)
-	}
-	return result
-}
-
-func shouldEscape(literal string) bool {
-	return strings.Contains(literal, "{{") || literal[len(literal)-1] == '{'
-}
-
-// variablesToMapLookups converts any variables in a slice of tokens to Go template map lookups
-func variablesToMapLookups(tokens []Token, mapName string) []Token {
-	result := make([]Token, 0, len(tokens))
-	for _, token := range tokens {
-		if token.IsVariable() {
-			token.Variable = mapLookupString(token.Variable, mapName)
-		}
-		result = append(result, token)
-	}
-	return result
-}
-
-func mapLookupString(v string, mapName string) string {
-	for _, r := range v {
-		if !(unicode.IsDigit(r) || unicode.IsLetter(r) || r == '_') {
-			return fmt.Sprintf(`index $%s %s`, mapName, strconv.Quote(v)) // quote v to escape any special characters
-		}
-	}
-	return fmt.Sprintf(`$%s.%s`, mapName, v)
-}
diff --git a/pkg/services/ngalert/migration/template_test.go b/pkg/services/ngalert/migration/template_test.go
deleted file mode 100644
index 88786af5e4682..0000000000000
--- a/pkg/services/ngalert/migration/template_test.go
+++ /dev/null
@@ -1,322 +0,0 @@
-package migration
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-)
-
-func TestTokenString(t *testing.T) {
-	t1 := Token{Literal: "this is a literal"}
-	assert.Equal(t, "this is a literal", t1.String())
-	t2 := Token{Variable: "this is a variable"}
-	assert.Equal(t, "this is a variable", t2.String())
-}
-
-func TestTokenizeVariable(t *testing.T) {
-	tests := []struct {
-		name   string
-		text   string
-		token  Token
-		offset int
-		err    string
-	}{{
-		name:   "variable with no trailing text",
-		text:   "${instance}",
-		token:  Token{Variable: "instance"},
-		offset: 11,
-	}, {
-		name:   "variable with trailing text",
-		text:   "${instance} is down",
-		token:  Token{Variable: "instance"},
-		offset: 11,
-	}, {
-		name:   "varaiable with numbers",
-		text:   "${instance1} is down",
-		token:  Token{Variable: "instance1"},
-		offset: 12,
-	}, {
-		name:   "variable with underscores",
-		text:   "${instance_with_underscores} is down",
-		token:  Token{Variable: "instance_with_underscores"},
-		offset: 28,
-	}, {
-		name:   "variable with spaces",
-		text:   "${instance with spaces} is down",
-		token:  Token{Variable: "instance with spaces"},
-		offset: 23,
-	}, {
-		name:   "variable with non-reserved special character",
-		text:   "${@instance1} is down",
-		token:  Token{Variable: "@instance1"},
-		offset: 13,
-	}, {
-		name:   "two variables without spaces",
-		text:   "${variable1}${variable2}",
-		token:  Token{Variable: "variable1"},
-		offset: 12,
-	}, {
-		name:   "variable with two closing braces stops at first brace",
-		text:   "${instance}} is down",
-		token:  Token{Variable: "instance"},
-		offset: 11,
-	}, {
-		name:   "variable with newline",
-		text:   "${instance\n} is down",
-		offset: 10,
-		err:    "unexpected whitespace",
-	}, {
-		name:   "variable with ambiguous delimiter returns error",
-		text:   "${${instance}",
-		offset: 2,
-		err:    "ambiguous delimiter",
-	}, {
-		name:   "variable without closing brace returns error",
-		text:   "${instance is down",
-		offset: 18,
-		err:    "expected '}', got 'n'",
-	}}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			token, offset, err := tokenizeVariable([]rune(test.text))
-			if test.err != "" {
-				assert.EqualError(t, err, test.err)
-			}
-			assert.Equal(t, test.offset, offset)
-			assert.Equal(t, test.token, token)
-		})
-	}
-}
-
-func TestTokenizeTmpl(t *testing.T) {
-	tests := []struct {
-		name   string
-		tmpl   string
-		tokens []Token
-	}{{
-		name:   "simple template can be tokenized",
-		tmpl:   "${instance} is down",
-		tokens: []Token{{Variable: "instance"}, {Literal: " is down"}},
-	}, {
-		name: "complex template can be tokenized",
-		tmpl: "More than ${value} ${status_code} in the last 5 minutes",
-		tokens: []Token{
-			{Literal: "More than "},
-			{Variable: "value"},
-			{Literal: " "},
-			{Variable: "status_code"},
-			{Literal: " in the last 5 minutes"},
-		},
-	}, {
-		name:   "variables without spaces between can be tokenized",
-		tmpl:   "${value}${status_code}",
-		tokens: []Token{{Variable: "value"}, {Variable: "status_code"}},
-	}, {
-		name:   "variables without spaces between then literal can be tokenized",
-		tmpl:   "${value}${status_code} in the last 5 minutes",
-		tokens: []Token{{Variable: "value"}, {Variable: "status_code"}, {Literal: " in the last 5 minutes"}},
-	}, {
-		name: "variables with reserved characters can be tokenized",
-		tmpl: "More than ${$value} ${{status_code} in the last 5 minutes",
-		tokens: []Token{
-			{Literal: "More than "},
-			{Variable: "$value"},
-			{Literal: " "},
-			{Variable: "{status_code"},
-			{Literal: " in the last 5 minutes"},
-		},
-	}, {
-		name:   "ambiguous delimiters are tokenized as literals",
-		tmpl:   "Instance ${instance and ${instance} is down",
-		tokens: []Token{{Literal: "Instance ${instance and "}, {Variable: "instance"}, {Literal: " is down"}},
-	}, {
-		name:   "all '$' runes preceding a variable are included in literal",
-		tmpl:   "Instance $${instance} is down",
-		tokens: []Token{{Literal: "Instance $"}, {Variable: "instance"}, {Literal: " is down"}},
-	}, {
-		name:   "sole '$' rune is included in literal",
-		tmpl:   "Instance $instance and ${instance} is down",
-		tokens: []Token{{Literal: "Instance $instance and "}, {Variable: "instance"}, {Literal: " is down"}},
-	}, {
-		name:   "extra closing brace is included in literal",
-		tmpl:   "Instance ${instance}} and ${instance} is down",
-		tokens: []Token{{Literal: "Instance "}, {Variable: "instance"}, {Literal: "} and "}, {Variable: "instance"}, {Literal: " is down"}},
-	}, {
-		name:   "variable with newline tokenized as literal",
-		tmpl:   "${value}${status_code\n}${value} in the last 5 minutes",
-		tokens: []Token{{Variable: "value"}, {Literal: "${status_code\n}"}, {Variable: "value"}, {Literal: " in the last 5 minutes"}},
-	}, {
-		name:   "extra closing brace between variables is included in literal",
-		tmpl:   "${value}${status_code}}${value} in the last 5 minutes",
-		tokens: []Token{{Variable: "value"}, {Variable: "status_code"}, {Literal: "}"}, {Variable: "value"}, {Literal: " in the last 5 minutes"}},
-	}}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			tokens := tokenizeTmpl(log.NewNopLogger(), test.tmpl)
-			assert.Equal(t, test.tokens, tokens)
-		})
-	}
-}
-
-func TestTokensToTmpl(t *testing.T) {
-	tokens := []Token{{Variable: "instance"}, {Literal: " is down"}}
-	assert.Equal(t, "{{instance}} is down", tokensToTmpl(tokens))
-}
-
-func TestTokensToTmplNewlines(t *testing.T) {
-	tokens := []Token{{Variable: "instance"}, {Literal: " is down\n"}, {Variable: "job"}, {Literal: " is down"}}
-	assert.Equal(t, "{{instance}} is down\n{{job}} is down", tokensToTmpl(tokens))
-}
-
-func TestMapLookupString(t *testing.T) {
-	cases := []struct {
-		name     string
-		input    string
-		expected string
-	}{
-		{
-			name:     "when there are no spaces",
-			input:    "instance",
-			expected: "$labels.instance",
-		},
-		{
-			name:     "when there are spaces",
-			input:    "instance with spaces",
-			expected: `index $labels "instance with spaces"`,
-		},
-		{
-			name:     "when there are quotes",
-			input:    `instance with "quotes"`,
-			expected: `index $labels "instance with \"quotes\""`,
-		},
-		{
-			name:     "when there are backslashes",
-			input:    `instance with \backslashes\`,
-			expected: `index $labels "instance with \\backslashes\\"`,
-		},
-		{
-			name:     "when there are legacy delimiter characters",
-			input:    `instance{ with $delim} characters`,
-			expected: `index $labels "instance{ with $delim} characters"`,
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			assert.Equal(t, tc.expected, mapLookupString(tc.input, "labels"))
-		})
-	}
-}
-
-func TestVariablesToMapLookups(t *testing.T) {
-	tokens := []Token{{Variable: "instance"}, {Literal: " is down"}}
-	expected := []Token{{Variable: "$labels.instance"}, {Literal: " is down"}}
-	assert.Equal(t, expected, variablesToMapLookups(tokens, "labels"))
-}
-
-func TestVariablesToMapLookupsSpace(t *testing.T) {
-	tokens := []Token{{Variable: "instance with spaces"}, {Literal: " is down"}}
-	expected := []Token{{Variable: "index $labels \"instance with spaces\""}, {Literal: " is down"}}
-	assert.Equal(t, expected, variablesToMapLookups(tokens, "labels"))
-}
-
-func TestEscapeLiterals(t *testing.T) {
-	cases := []struct {
-		name     string
-		input    []Token
-		expected []Token
-	}{
-		{
-			name:     "when there are no literals",
-			input:    []Token{{Variable: "instance"}},
-			expected: []Token{{Variable: "instance"}},
-		},
-		{
-			name:     "literal with double braces: {{",
-			input:    []Token{{Literal: "instance {{"}},
-			expected: []Token{{Literal: "{{`instance {{`}}"}},
-		},
-		{
-			name:     "literal that ends with closing brace: {",
-			input:    []Token{{Literal: "instance {"}},
-			expected: []Token{{Literal: "{{`instance {`}}"}},
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			assert.Equal(t, tc.expected, escapeLiterals(tc.input))
-		})
-	}
-}
-
-func TestMigrateTmpl(t *testing.T) {
-	cases := []struct {
-		name     string
-		input    string
-		expected string
-		vars     bool
-	}{
-		{
-			name:     "template does not contain variables",
-			input:    "instance is down",
-			expected: "instance is down",
-			vars:     false,
-		},
-		{
-			name:     "template contains variable",
-			input:    "${instance} is down",
-			expected: withDeduplicateMap("{{$mergedLabels.instance}} is down"),
-			vars:     true,
-		},
-		{
-			name:     "template contains double braces",
-			input:    "{{CRITICAL}} instance is down",
-			expected: "{{`{{CRITICAL}} instance is down`}}",
-			vars:     false,
-		},
-		{
-			name:     "template contains opening brace before variable",
-			input:    `${${instance} is down`,
-			expected: withDeduplicateMap("{{`${`}}{{$mergedLabels.instance}} is down"),
-			vars:     true,
-		},
-		{
-			name:     "template contains newline",
-			input:    "CRITICAL\n${instance} is down",
-			expected: withDeduplicateMap("CRITICAL\n{{$mergedLabels.instance}} is down"),
-			vars:     true,
-		},
-		{
-			name:     "partial migration, no variables",
-			input:    "${instance is down",
-			expected: "${instance is down",
-		},
-		{
-			name:     "partial migration, with variables",
-			input:    "${instance} is down ${${nestedVar}}",
-			expected: withDeduplicateMap("{{$mergedLabels.instance}}{{` is down ${`}}{{$mergedLabels.nestedVar}}}"),
-			vars:     true,
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			tmpl := MigrateTmpl(log.NewNopLogger(), tc.input)
-
-			assert.Equal(t, tc.expected, tmpl)
-		})
-	}
-}
-
-func withDeduplicateMap(input string) string {
-	// hardcode function name to fail tests if it changes
-	funcName := "mergeLabelValues"
-
-	return fmt.Sprintf("{{- $mergedLabels := %s $values -}}\n", funcName) + input
-}
diff --git a/pkg/services/ngalert/migration/testing.go b/pkg/services/ngalert/migration/testing.go
deleted file mode 100644
index 73af30ed2113d..0000000000000
--- a/pkg/services/ngalert/migration/testing.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package migration
-
-import (
-	"context"
-	"testing"
-
-	"github.com/grafana/grafana/pkg/infra/log/logtest"
-	"github.com/grafana/grafana/pkg/infra/serverlock"
-	"github.com/grafana/grafana/pkg/infra/tracing"
-	migrationStore "github.com/grafana/grafana/pkg/services/ngalert/migration/store"
-	fake_secrets "github.com/grafana/grafana/pkg/services/secrets/fakes"
-	"github.com/grafana/grafana/pkg/services/sqlstore"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func NewTestMigrationService(t *testing.T, sqlStore *sqlstore.SQLStore, cfg *setting.Cfg) *migrationService {
-	t.Helper()
-	if cfg == nil {
-		cfg = setting.NewCfg()
-	}
-	return &migrationService{
-		lock:              serverlock.ProvideService(sqlStore, tracing.InitializeTracerForTest()),
-		log:               &logtest.Fake{},
-		cfg:               cfg,
-		store:             sqlStore,
-		migrationStore:    migrationStore.NewTestMigrationStore(t, sqlStore, cfg),
-		encryptionService: fake_secrets.NewFakeSecretsService(),
-	}
-}
-
-func NewFakeMigrationService(t testing.TB) *fakeMigrationService {
-	t.Helper()
-	return &fakeMigrationService{}
-}
-
-type fakeMigrationService struct {
-}
-
-func (ms *fakeMigrationService) Run(_ context.Context) error {
-	// Do nothing.
-	return nil
-}
diff --git a/pkg/services/ngalert/migration/ualert.go b/pkg/services/ngalert/migration/ualert.go
deleted file mode 100644
index 918e7859f1882..0000000000000
--- a/pkg/services/ngalert/migration/ualert.go
+++ /dev/null
@@ -1,117 +0,0 @@
-package migration
-
-import (
-	"context"
-	"fmt"
-
-	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
-	migmodels "github.com/grafana/grafana/pkg/services/ngalert/migration/models"
-	migrationStore "github.com/grafana/grafana/pkg/services/ngalert/migration/store"
-	"github.com/grafana/grafana/pkg/services/ngalert/models"
-)
-
-func (om *OrgMigration) migrateAlerts(ctx context.Context, alerts []*migrationStore.DashAlert, info migmodels.DashboardUpgradeInfo) ([]*AlertPair, error) {
-	log := om.log.New(
-		"dashboardUid", info.DashboardUID,
-		"dashboardName", info.DashboardName,
-		"newFolderUid", info.NewFolderUID,
-		"newFolderNane", info.NewFolderName,
-	)
-
-	pairs := make([]*AlertPair, 0, len(alerts))
-	for _, da := range alerts {
-		al := log.New("ruleID", da.ID, "ruleName", da.Name)
-		alertRule, err := om.migrateAlert(ctx, al, da, info)
-		if err != nil {
-			return nil, fmt.Errorf("migrate alert: %w", err)
-		}
-		pairs = append(pairs, &AlertPair{AlertRule: alertRule, DashAlert: da})
-	}
-
-	return pairs, nil
-}
-
-func (om *OrgMigration) migrateDashboard(ctx context.Context, dashID int64, alerts []*migrationStore.DashAlert) ([]*AlertPair, error) {
-	info, err := om.migratedFolder(ctx, om.log, dashID)
-	if err != nil {
-		return nil, fmt.Errorf("get or create migrated folder: %w", err)
-	}
-	pairs, err := om.migrateAlerts(ctx, alerts, *info)
-	if err != nil {
-		return nil, fmt.Errorf("migrate and save alerts: %w", err)
-	}
-
-	return pairs, nil
-}
-
-func (om *OrgMigration) migrateOrgAlerts(ctx context.Context) ([]*AlertPair, error) {
-	mappedAlerts, cnt, err := om.migrationStore.GetOrgDashboardAlerts(ctx, om.orgID)
-	if err != nil {
-		return nil, fmt.Errorf("load alerts: %w", err)
-	}
-	om.log.Info("Alerts found to migrate", "alerts", cnt)
-
-	pairs := make([]*AlertPair, 0, cnt)
-	for dashID, alerts := range mappedAlerts {
-		dashPairs, err := om.migrateDashboard(ctx, dashID, alerts)
-		if err != nil {
-			return nil, fmt.Errorf("migrate and save dashboard '%d': %w", dashID, err)
-		}
-		pairs = append(pairs, dashPairs...)
-	}
-	return pairs, nil
-}
-
-func (om *OrgMigration) migrateOrgChannels(ctx context.Context, pairs []*AlertPair) (*apimodels.PostableUserConfig, error) {
-	channels, err := om.migrationStore.GetNotificationChannels(ctx, om.orgID)
-	if err != nil {
-		return nil, fmt.Errorf("load notification channels: %w", err)
-	}
-
-	amConfig, err := om.migrateChannels(channels, pairs)
-	if err != nil {
-		return nil, err
-	}
-
-	return amConfig, nil
-}
-
-func (om *OrgMigration) migrateOrg(ctx context.Context) error {
-	om.log.Info("Migrating alerts for organisation")
-
-	pairs, err := om.migrateOrgAlerts(ctx)
-	if err != nil {
-		return fmt.Errorf("migrate alerts: %w", err)
-	}
-
-	// This must happen before we insert the rules into the database because it modifies the alert labels. This will
-	// be changed in the future when we improve how notification policies are created.
-	amConfig, err := om.migrateOrgChannels(ctx, pairs)
-	if err != nil {
-		return fmt.Errorf("migrate channels: %w", err)
-	}
-
-	if err := om.writeSilencesFile(); err != nil {
-		return fmt.Errorf("write silence file for org %d: %w", om.orgID, err)
-	}
-
-	if len(pairs) > 0 {
-		om.log.Debug("Inserting migrated alert rules", "count", len(pairs))
-		rules := make([]models.AlertRule, 0, len(pairs))
-		for _, p := range pairs {
-			rules = append(rules, *p.AlertRule)
-		}
-		err := om.migrationStore.InsertAlertRules(ctx, rules...)
-		if err != nil {
-			return fmt.Errorf("insert alert rules: %w", err)
-		}
-	}
-
-	if amConfig != nil {
-		if err := om.migrationStore.SaveAlertmanagerConfiguration(ctx, om.orgID, amConfig); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/pkg/services/ngalert/migration/ualert_test.go b/pkg/services/ngalert/migration/ualert_test.go
deleted file mode 100644
index 05a278c109345..0000000000000
--- a/pkg/services/ngalert/migration/ualert_test.go
+++ /dev/null
@@ -1,160 +0,0 @@
-package migration
-
-import (
-	"encoding/json"
-	"fmt"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/folder"
-	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
-	"github.com/grafana/grafana/pkg/util"
-)
-
-func Test_validateAlertmanagerConfig(t *testing.T) {
-	tc := []struct {
-		name      string
-		receivers []*apimodels.PostableGrafanaReceiver
-		err       error
-	}{
-		{
-			name: "when a slack receiver does not have a valid URL - it should error",
-			receivers: []*apimodels.PostableGrafanaReceiver{
-				{
-					UID:            "test-uid",
-					Name:           "SlackWithBadURL",
-					Type:           "slack",
-					Settings:       mustRawMessage(map[string]any{}),
-					SecureSettings: map[string]string{"url": invalidUri},
-				},
-			},
-			err: fmt.Errorf("failed to validate integration \"SlackWithBadURL\" (UID test-uid) of type \"slack\": invalid URL %q", invalidUri),
-		},
-		{
-			name: "when a slack receiver has an invalid recipient - it should not error",
-			receivers: []*apimodels.PostableGrafanaReceiver{
-				{
-					UID:            util.GenerateShortUID(),
-					Name:           "SlackWithBadRecipient",
-					Type:           "slack",
-					Settings:       mustRawMessage(map[string]any{"recipient": "this passes"}),
-					SecureSettings: map[string]string{"url": "http://webhook.slack.com/myuser"},
-				},
-			},
-		},
-		{
-			name: "when the configuration is valid - it should not error",
-			receivers: []*apimodels.PostableGrafanaReceiver{
-				{
-					UID:            util.GenerateShortUID(),
-					Name:           "SlackWithBadURL",
-					Type:           "slack",
-					Settings:       mustRawMessage(map[string]interface{}{"recipient": "#a-good-channel"}),
-					SecureSettings: map[string]string{"url": "http://webhook.slack.com/myuser"},
-				},
-			},
-		},
-	}
-
-	sqlStore := db.InitTestDB(t)
-	for _, tt := range tc {
-		t.Run(tt.name, func(t *testing.T) {
-			service := NewTestMigrationService(t, sqlStore, nil)
-			mg := service.newOrgMigration(1)
-
-			config := configFromReceivers(t, tt.receivers)
-			require.NoError(t, encryptSecureSettings(config, mg)) // make sure we encrypt the settings
-			err := mg.validateAlertmanagerConfig(config)
-			if tt.err != nil {
-				require.Error(t, err)
-				require.EqualError(t, err, tt.err.Error())
-			} else {
-				require.NoError(t, err)
-			}
-		})
-	}
-}
-
-func configFromReceivers(t *testing.T, receivers []*apimodels.PostableGrafanaReceiver) *apimodels.PostableUserConfig {
-	t.Helper()
-
-	return &apimodels.PostableUserConfig{
-		AlertmanagerConfig: apimodels.PostableApiAlertingConfig{
-			Receivers: []*apimodels.PostableApiReceiver{
-				{PostableGrafanaReceivers: apimodels.PostableGrafanaReceivers{GrafanaManagedReceivers: receivers}},
-			},
-		},
-	}
-}
-
-func encryptSecureSettings(c *apimodels.PostableUserConfig, m *OrgMigration) error {
-	for _, r := range c.AlertmanagerConfig.Receivers {
-		for _, gr := range r.GrafanaManagedReceivers {
-			err := m.encryptSecureSettings(gr.SecureSettings)
-			if err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-const invalidUri = "�6�M��)uk譹1(�h`$�o�N>mĕ����cS2�dh![ę�	���`csB�!��OSxP�{�"
-
-func Test_getAlertFolderNameFromDashboard(t *testing.T) {
-	t.Run("should include full title", func(t *testing.T) {
-		hash := util.GenerateShortUID()
-		f := &folder.Folder{
-			Title: "TEST",
-		}
-		name := generateAlertFolderName(f, permissionHash(hash))
-		require.Contains(t, name, f.Title)
-		require.Contains(t, name, hash)
-	})
-	t.Run("should cut title to the length", func(t *testing.T) {
-		title := ""
-		for {
-			title += util.GenerateShortUID()
-			if len(title) > MaxFolderName {
-				title = title[:MaxFolderName]
-				break
-			}
-		}
-
-		hash := util.GenerateShortUID()
-		f := &folder.Folder{
-			Title: title,
-		}
-		name := generateAlertFolderName(f, permissionHash(hash))
-		require.Len(t, name, MaxFolderName)
-		require.Contains(t, name, hash)
-	})
-}
-
-func Test_shortUIDCaseInsensitiveConflicts(t *testing.T) {
-	s := Deduplicator{
-		set:             make(map[string]struct{}),
-		caseInsensitive: true,
-	}
-
-	// 10000 uids seems to be enough to cause a collision in almost every run if using util.GenerateShortUID directly.
-	for i := 0; i < 10000; i++ {
-		s.add(util.GenerateShortUID())
-	}
-
-	// check if any are case-insensitive duplicates.
-	deduped := make(map[string]struct{})
-	for k := range s.set {
-		deduped[strings.ToLower(k)] = struct{}{}
-	}
-
-	require.Equal(t, len(s.set), len(deduped))
-}
-
-func mustRawMessage[T any](s T) apimodels.RawMessage {
-	js, _ := json.Marshal(s)
-	return js
-}
diff --git a/pkg/services/ngalert/models/alert_query.go b/pkg/services/ngalert/models/alert_query.go
index 350335e989fa4..8d16005371c05 100644
--- a/pkg/services/ngalert/models/alert_query.go
+++ b/pkg/services/ngalert/models/alert_query.go
@@ -6,6 +6,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+
 	"github.com/grafana/grafana/pkg/expr"
 )
 
@@ -116,6 +118,28 @@ func (aq *AlertQuery) IsExpression() (bool, error) {
 	return expr.NodeTypeFromDatasourceUID(aq.DatasourceUID) == expr.TypeCMDNode, nil
 }
 
+// IsHysteresisExpression returns true if the model describes a hysteresis command expression. Returns error if the Model is not a valid JSON
+func (aq *AlertQuery) IsHysteresisExpression() (bool, error) {
+	if aq.modelProps == nil {
+		err := aq.setModelProps()
+		if err != nil {
+			return false, err
+		}
+	}
+	return expr.IsHysteresisExpression(aq.modelProps), nil
+}
+
+// PatchHysteresisExpression updates the AlertQuery to include loaded metrics into hysteresis
+func (aq *AlertQuery) PatchHysteresisExpression(loadedMetrics map[data.Fingerprint]struct{}) error {
+	if aq.modelProps == nil {
+		err := aq.setModelProps()
+		if err != nil {
+			return err
+		}
+	}
+	return expr.SetLoadedDimensionsToHysteresisCommand(aq.modelProps, loadedMetrics)
+}
+
 // setMaxDatapoints sets the model maxDataPoints if it's missing or invalid
 func (aq *AlertQuery) setMaxDatapoints() error {
 	if aq.modelProps == nil {
diff --git a/pkg/services/ngalert/models/alert_query_test.go b/pkg/services/ngalert/models/alert_query_test.go
index b9fd6dc38f917..634b7cf016597 100644
--- a/pkg/services/ngalert/models/alert_query_test.go
+++ b/pkg/services/ngalert/models/alert_query_test.go
@@ -7,9 +7,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/grafana/grafana/pkg/expr"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/expr"
 )
 
 func TestAlertQuery(t *testing.T) {
@@ -17,6 +19,7 @@ func TestAlertQuery(t *testing.T) {
 		desc                 string
 		alertQuery           AlertQuery
 		expectedIsExpression bool
+		expectedIsHysteresis bool
 		expectedDatasource   string
 		expectedMaxPoints    int64
 		expectedIntervalMS   int64
@@ -133,6 +136,64 @@ func TestAlertQuery(t *testing.T) {
 			expectedMaxPoints:    int64(defaultMaxDataPoints),
 			expectedIntervalMS:   int64(defaultIntervalMS),
 		},
+		{
+			desc: "given a query with threshold expression",
+			alertQuery: AlertQuery{
+				RefID:         "A",
+				DatasourceUID: expr.DatasourceType,
+				Model: json.RawMessage(`{
+	                "type": "threshold",
+					"queryType": "metricQuery",
+					"extraParam": "some text",
+	                "conditions": [
+		                {
+		                  "evaluator": {
+		                    "params": [
+		                      4
+		                    ],
+		                    "type": "gt"
+		                  }
+		                }
+		              ]
+				}`),
+			},
+			expectedIsExpression: true,
+			expectedIsHysteresis: false,
+			expectedMaxPoints:    int64(defaultMaxDataPoints),
+			expectedIntervalMS:   int64(defaultIntervalMS),
+		},
+		{
+			desc: "given a query with hysteresis expression",
+			alertQuery: AlertQuery{
+				RefID:         "A",
+				DatasourceUID: expr.DatasourceType,
+				Model: json.RawMessage(`{
+					"type": "threshold",
+					"queryType": "metricQuery",
+					"extraParam": "some text",
+					"conditions": [
+		                {
+		                  "evaluator": {
+		                    "params": [
+		                      4
+		                    ],
+		                    "type": "gt"
+		                  },
+		                  "unloadEvaluator": {
+		                    "params": [
+		                      2
+		                    ],
+		                    "type": "lt"
+		                  }
+		                }
+		              ]
+				}`),
+			},
+			expectedMaxPoints:    int64(defaultMaxDataPoints),
+			expectedIntervalMS:   int64(defaultIntervalMS),
+			expectedIsExpression: true,
+			expectedIsHysteresis: true,
+		},
 	}
 
 	for _, tc := range testCases {
@@ -143,6 +204,12 @@ func TestAlertQuery(t *testing.T) {
 				assert.Equal(t, tc.expectedIsExpression, isExpression)
 			})
 
+			t.Run("can recognize if it's a hysteresis expression", func(t *testing.T) {
+				isExpression, err := tc.alertQuery.IsHysteresisExpression()
+				require.NoError(t, err)
+				assert.Equal(t, tc.expectedIsHysteresis, isExpression)
+			})
+
 			t.Run("can set queryType for expression", func(t *testing.T) {
 				err := tc.alertQuery.setQueryType()
 				require.NoError(t, err)
@@ -186,6 +253,17 @@ func TestAlertQuery(t *testing.T) {
 				require.True(t, ok)
 				require.Equal(t, "some text", extraParam)
 			})
+
+			if tc.expectedIsHysteresis {
+				t.Run("can patch the command with loaded metrics", func(t *testing.T) {
+					require.NoError(t, tc.alertQuery.PatchHysteresisExpression(map[data.Fingerprint]struct{}{1: {}, 2: {}, 3: {}}))
+					data, ok := tc.alertQuery.modelProps["conditions"].([]any)[0].(map[string]any)["loadedDimensions"]
+					require.True(t, ok)
+					require.NotNil(t, data)
+					_, err := tc.alertQuery.GetModel()
+					require.NoError(t, err)
+				})
+			}
 		})
 	}
 }
diff --git a/pkg/services/ngalert/models/alert_rule.go b/pkg/services/ngalert/models/alert_rule.go
index fc00bab4b251d..d28ff8ecb7057 100644
--- a/pkg/services/ngalert/models/alert_rule.go
+++ b/pkg/services/ngalert/models/alert_rule.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"sort"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/google/go-cmp/cmp"
@@ -14,6 +15,7 @@ import (
 	alertingModels "github.com/grafana/alerting/models"
 
 	"github.com/grafana/grafana/pkg/services/quota"
+	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util/cmputil"
 )
 
@@ -26,7 +28,7 @@ var (
 	ErrCannotEditNamespace                = errors.New("user does not have permissions to edit the namespace")
 	ErrRuleGroupNamespaceNotFound         = errors.New("rule group not found under this namespace")
 	ErrAlertRuleFailedValidation          = errors.New("invalid alert rule")
-	ErrAlertRuleUniqueConstraintViolation = errors.New("a conflicting alert rule is found: rule title under the same organisation and folder should be unique")
+	ErrAlertRuleUniqueConstraintViolation = errors.New("rule title under the same organisation and folder should be unique")
 	ErrQuotaReached                       = errors.New("quota has been exceeded")
 	// ErrNoDashboard is returned when the alert rule does not have a Dashboard UID
 	// in its annotations or the dashboard does not exist.
@@ -52,6 +54,8 @@ func NoDataStateFromString(state string) (NoDataState, error) {
 		return NoData, nil
 	case string(OK):
 		return OK, nil
+	case string(KeepLast):
+		return KeepLast, nil
 	default:
 		return "", fmt.Errorf("unknown NoData state option %s", state)
 	}
@@ -61,6 +65,7 @@ const (
 	Alerting NoDataState = "Alerting"
 	NoData   NoDataState = "NoData"
 	OK       NoDataState = "OK"
+	KeepLast NoDataState = "KeepLast"
 )
 
 // swagger:enum ExecutionErrorState
@@ -78,6 +83,8 @@ func ErrStateFromString(opt string) (ExecutionErrorState, error) {
 		return ErrorErrState, nil
 	case string(OkErrState):
 		return OkErrState, nil
+	case string(KeepLastErrState):
+		return KeepLastErrState, nil
 	default:
 		return "", fmt.Errorf("unknown Error state option %s", opt)
 	}
@@ -87,6 +94,7 @@ const (
 	AlertingErrState ExecutionErrorState = "Alerting"
 	ErrorErrState    ExecutionErrorState = "Error"
 	OkErrState       ExecutionErrorState = "OK"
+	KeepLastErrState ExecutionErrorState = "KeepLast"
 )
 
 const (
@@ -104,6 +112,29 @@ const (
 
 	// StateReasonAnnotation is the name of the annotation that explains the difference between evaluation state and alert state (i.e. changing state when NoData or Error).
 	StateReasonAnnotation = GrafanaReservedLabelPrefix + "state_reason"
+
+	// MigratedLabelPrefix is a label prefix for all labels created during legacy migration.
+	MigratedLabelPrefix = "__legacy_"
+	// MigratedUseLegacyChannelsLabel is created during legacy migration to route to separate nested policies for migrated channels.
+	MigratedUseLegacyChannelsLabel = MigratedLabelPrefix + "use_channels__"
+	// MigratedContactLabelPrefix is created during legacy migration to route a migrated alert rule to a specific migrated channel.
+	MigratedContactLabelPrefix = MigratedLabelPrefix + "c_"
+	// MigratedSilenceLabelErrorKeepState is a label that will match a silence rule intended for legacy alerts with error state = keep_state.
+	MigratedSilenceLabelErrorKeepState = MigratedLabelPrefix + "silence_error_keep_state__"
+	// MigratedSilenceLabelNodataKeepState is a label that will match a silence rule intended for legacy alerts with nodata state = keep_state.
+	MigratedSilenceLabelNodataKeepState = MigratedLabelPrefix + "silence_nodata_keep_state__"
+	// MigratedAlertIdAnnotation is created during legacy migration to store the ID of the migrated legacy alert rule.
+	MigratedAlertIdAnnotation = "__alertId__"
+	// MigratedMessageAnnotation is created during legacy migration to store the migrated alert message.
+	MigratedMessageAnnotation = "message"
+
+	// AutogeneratedRouteLabel a label name used to distinguish alerts that are supposed to be handled by the autogenerated policy. Only expected value is `true`.
+	AutogeneratedRouteLabel = "__grafana_autogenerated__"
+	// AutogeneratedRouteReceiverNameLabel a label name that contains the name of the receiver that should be used to send notifications for the alert.
+	AutogeneratedRouteReceiverNameLabel = "__grafana_receiver__"
+	// AutogeneratedRouteSettingsHashLabel a label name that contains the hash of the notification settings that will be used to send notifications for the alert.
+	// This should uniquely identify the notification settings (group_by, group_wait, group_interval, repeat_interval, mute_time_intervals) for the alert.
+	AutogeneratedRouteSettingsHashLabel = "__grafana_route_settings_hash__"
 )
 
 const (
@@ -113,8 +144,13 @@ const (
 	StateReasonPaused        = "Paused"
 	StateReasonUpdated       = "Updated"
 	StateReasonRuleDeleted   = "RuleDeleted"
+	StateReasonKeepLast      = "KeepLast"
 )
 
+func ConcatReasons(reasons ...string) string {
+	return strings.Join(reasons, ", ")
+}
+
 var (
 	// InternalLabelNameSet are labels that grafana automatically include as part of the labelset.
 	InternalLabelNameSet = map[string]struct{}{
@@ -126,6 +162,13 @@ var (
 		PanelIDAnnotation:                   {},
 		alertingModels.ImageTokenAnnotation: {},
 	}
+
+	// LabelsUserCannotSpecify are labels that the user cannot specify when creating an alert rule.
+	LabelsUserCannotSpecify = map[string]struct{}{
+		AutogeneratedRouteLabel:             {},
+		AutogeneratedRouteReceiverNameLabel: {},
+		AutogeneratedRouteSettingsHashLabel: {},
+	}
 )
 
 // AlertRuleGroup is the base model for a rule group in unified alerting.
@@ -201,10 +244,11 @@ type AlertRule struct {
 	ExecErrState    ExecutionErrorState
 	// ideally this field should have been apimodels.ApiDuration
 	// but this is currently not possible because of circular dependencies
-	For         time.Duration
-	Annotations map[string]string
-	Labels      map[string]string
-	IsPaused    bool
+	For                  time.Duration
+	Annotations          map[string]string
+	Labels               map[string]string
+	IsPaused             bool
+	NotificationSettings []NotificationSettings `xorm:"notification_settings"` // we use slice to workaround xorm mapping that does not serialize a struct to JSON unless it's a slice
 }
 
 // AlertRuleWithOptionals This is to avoid having to pass in additional arguments deep in the call stack. Alert rule
@@ -298,13 +342,23 @@ func (alertRule *AlertRule) GetEvalCondition() Condition {
 // Diff calculates diff between two alert rules. Returns nil if two rules are equal. Otherwise, returns cmputil.DiffReport
 func (alertRule *AlertRule) Diff(rule *AlertRule, ignore ...string) cmputil.DiffReport {
 	var reporter cmputil.DiffReporter
-	ops := make([]cmp.Option, 0, 5)
+	ops := make([]cmp.Option, 0, 6)
 
 	// json.RawMessage is a slice of bytes and therefore cmp's default behavior is to compare it by byte, which is not really useful
 	var jsonCmp = cmp.Transformer("", func(in json.RawMessage) string {
-		return string(in)
+		b, err := json.Marshal(in)
+		if err != nil {
+			return string(in)
+		}
+		return string(b)
 	})
-	ops = append(ops, cmp.Reporter(&reporter), cmpopts.IgnoreFields(AlertQuery{}, "modelProps"), jsonCmp, cmpopts.EquateEmpty())
+	ops = append(
+		ops,
+		cmp.Reporter(&reporter),
+		cmpopts.IgnoreFields(AlertQuery{}, "modelProps"),
+		jsonCmp,
+		cmpopts.EquateEmpty(),
+	)
 
 	if len(ignore) > 0 {
 		ops = append(ops, cmpopts.IgnoreFields(AlertRule{}, ignore...))
@@ -352,11 +406,6 @@ type AlertRuleKeyWithVersion struct {
 	AlertRuleKey `xorm:"extends"`
 }
 
-type AlertRuleKeyWithVersionAndPauseStatus struct {
-	IsPaused                bool
-	AlertRuleKeyWithVersion `xorm:"extends"`
-}
-
 type AlertRuleKeyWithId struct {
 	AlertRuleKey
 	ID int64
@@ -423,6 +472,59 @@ func (alertRule *AlertRule) PreSave(timeNow func() time.Time) error {
 	return nil
 }
 
+// ValidateAlertRule validates various alert rule fields.
+func (alertRule *AlertRule) ValidateAlertRule(cfg setting.UnifiedAlertingSettings) error {
+	if len(alertRule.Data) == 0 {
+		return fmt.Errorf("%w: no queries or expressions are found", ErrAlertRuleFailedValidation)
+	}
+
+	if alertRule.Title == "" {
+		return fmt.Errorf("%w: title is empty", ErrAlertRuleFailedValidation)
+	}
+
+	if err := ValidateRuleGroupInterval(alertRule.IntervalSeconds, int64(cfg.BaseInterval.Seconds())); err != nil {
+		return err
+	}
+
+	if alertRule.OrgID == 0 {
+		return fmt.Errorf("%w: no organisation is found", ErrAlertRuleFailedValidation)
+	}
+
+	if alertRule.DashboardUID == nil && alertRule.PanelID != nil {
+		return fmt.Errorf("%w: cannot have Panel ID without a Dashboard UID", ErrAlertRuleFailedValidation)
+	}
+
+	if _, err := ErrStateFromString(string(alertRule.ExecErrState)); err != nil {
+		return err
+	}
+
+	if _, err := NoDataStateFromString(string(alertRule.NoDataState)); err != nil {
+		return err
+	}
+
+	if alertRule.For < 0 {
+		return fmt.Errorf("%w: field `for` cannot be negative", ErrAlertRuleFailedValidation)
+	}
+
+	if len(alertRule.Labels) > 0 {
+		for label := range alertRule.Labels {
+			if _, ok := LabelsUserCannotSpecify[label]; ok {
+				return fmt.Errorf("%w: system reserved label %s cannot be defined", ErrAlertRuleFailedValidation, label)
+			}
+		}
+	}
+
+	if len(alertRule.NotificationSettings) > 0 {
+		if len(alertRule.NotificationSettings) != 1 {
+			return fmt.Errorf("%w: only one notification settings entry is allowed", ErrAlertRuleFailedValidation)
+		}
+		if err := alertRule.NotificationSettings[0].Validate(); err != nil {
+			return errors.Join(ErrAlertRuleFailedValidation, fmt.Errorf("invalid notification settings: %w", err))
+		}
+	}
+	return nil
+}
+
 func (alertRule *AlertRule) ResourceType() string {
 	return "alertRule"
 }
@@ -435,6 +537,13 @@ func (alertRule *AlertRule) ResourceOrgID() int64 {
 	return alertRule.OrgID
 }
 
+func (alertRule *AlertRule) GetFolderKey() FolderKey {
+	return FolderKey{
+		OrgID: alertRule.OrgID,
+		UID:   alertRule.NamespaceUID,
+	}
+}
+
 // AlertRuleVersion is the model for alert rule versions in unified alerting.
 type AlertRuleVersion struct {
 	ID               int64  `xorm:"pk autoincr 'id'"`
@@ -456,10 +565,11 @@ type AlertRuleVersion struct {
 	ExecErrState    ExecutionErrorState
 	// ideally this field should have been apimodels.ApiDuration
 	// but this is currently not possible because of circular dependencies
-	For         time.Duration
-	Annotations map[string]string
-	Labels      map[string]string
-	IsPaused    bool
+	For                  time.Duration
+	Annotations          map[string]string
+	Labels               map[string]string
+	IsPaused             bool
+	NotificationSettings []NotificationSettings `xorm:"notification_settings"` // we use slice to workaround xorm mapping that does not serialize a struct to JSON unless it's a slice
 }
 
 // GetAlertRuleByUIDQuery is the query for retrieving/deleting an alert rule by UID and organisation ID.
@@ -485,6 +595,8 @@ type ListAlertRulesQuery struct {
 	// to return just those for a dashboard and panel.
 	DashboardUID string
 	PanelID      int64
+
+	ReceiverName string
 }
 
 // CountAlertRulesQuery is the query for counting alert rules
@@ -493,12 +605,22 @@ type CountAlertRulesQuery struct {
 	NamespaceUID string
 }
 
+type FolderKey struct {
+	OrgID int64
+	UID   string
+}
+
+func (f FolderKey) String() string {
+	return fmt.Sprintf("%d:%s", f.OrgID, f.UID)
+}
+
 type GetAlertRulesForSchedulingQuery struct {
 	PopulateFolders bool
 	RuleGroups      []string
 
-	ResultRules         []*AlertRule
-	ResultFoldersTitles map[string]string
+	ResultRules []*AlertRule
+	// A map of folder UID to folder Title in NamespaceKey format (see GetNamespaceKey)
+	ResultFoldersTitles map[FolderKey]string
 }
 
 // ListNamespaceAlertRulesQuery is the query for listing namespace alert rules
diff --git a/pkg/services/ngalert/models/alert_rule_test.go b/pkg/services/ngalert/models/alert_rule_test.go
index b8c75c2ab3dc2..22d2f65a9e673 100644
--- a/pkg/services/ngalert/models/alert_rule_test.go
+++ b/pkg/services/ngalert/models/alert_rule_test.go
@@ -4,17 +4,21 @@ import (
 	"encoding/json"
 	"fmt"
 	"math/rand"
+	"reflect"
 	"sort"
 	"strings"
 	"testing"
 	"time"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
+	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/yaml.v3"
 
 	"github.com/grafana/grafana/pkg/util"
+	"github.com/grafana/grafana/pkg/util/cmputil"
 )
 
 func TestSortAlertRulesByGroupKeyAndIndex(t *testing.T) {
@@ -384,7 +388,7 @@ func TestDiff(t *testing.T) {
 		rule1 := AlertRuleGen()()
 		rule2 := AlertRuleGen()()
 
-		diffs := rule1.Diff(rule2, "Data", "Annotations", "Labels") // these fields will be tested separately
+		diffs := rule1.Diff(rule2, "Data", "Annotations", "Labels", "NotificationSettings") // these fields will be tested separately
 
 		difCnt := 0
 		if rule1.ID != rule2.ID {
@@ -652,6 +656,21 @@ func TestDiff(t *testing.T) {
 			}
 		})
 
+		t.Run("should correctly detect no change with '<' and '>' in query", func(t *testing.T) {
+			old := query1
+			new := query1
+			old.Model = json.RawMessage(`{"field1": "$A \u003c 1"}`)
+			new.Model = json.RawMessage(`{"field1": "$A < 1"}`)
+			rule1.Data = []AlertQuery{old}
+			rule2.Data = []AlertQuery{new}
+
+			diff := rule1.Diff(rule2)
+			assert.Nil(t, diff)
+
+			// reset rule1
+			rule1.Data = []AlertQuery{query1}
+		})
+
 		t.Run("should detect new changes in array if too many fields changed", func(t *testing.T) {
 			query2 := query1
 			query2.QueryType = "test"
@@ -678,6 +697,117 @@ func TestDiff(t *testing.T) {
 			}
 		})
 	})
+
+	t.Run("should detect changes in NotificationSettings", func(t *testing.T) {
+		rule1 := AlertRuleGen()()
+
+		baseSettings := NotificationSettingsGen(NSMuts.WithGroupBy("test1", "test2"))()
+		rule1.NotificationSettings = []NotificationSettings{baseSettings}
+
+		addTime := func(d *model.Duration, duration time.Duration) *time.Duration {
+			dur := time.Duration(*d)
+			dur += duration
+			return &dur
+		}
+
+		testCases := []struct {
+			name                 string
+			notificationSettings NotificationSettings
+			diffs                cmputil.DiffReport
+		}{
+			{
+				name:                 "should detect changes in Receiver",
+				notificationSettings: CopyNotificationSettings(baseSettings, NSMuts.WithReceiver(baseSettings.Receiver+"-modified")),
+				diffs: []cmputil.Diff{
+					{
+						Path:  "NotificationSettings[0].Receiver",
+						Left:  reflect.ValueOf(baseSettings.Receiver),
+						Right: reflect.ValueOf(baseSettings.Receiver + "-modified"),
+					},
+				},
+			},
+			{
+				name:                 "should detect changes in GroupWait",
+				notificationSettings: CopyNotificationSettings(baseSettings, NSMuts.WithGroupWait(addTime(baseSettings.GroupWait, 1*time.Second))),
+				diffs: []cmputil.Diff{
+					{
+						Path:  "NotificationSettings[0].GroupWait",
+						Left:  reflect.ValueOf(*baseSettings.GroupWait),
+						Right: reflect.ValueOf(model.Duration(*addTime(baseSettings.GroupWait, 1*time.Second))),
+					},
+				},
+			},
+			{
+				name:                 "should detect changes in GroupInterval",
+				notificationSettings: CopyNotificationSettings(baseSettings, NSMuts.WithGroupInterval(addTime(baseSettings.GroupInterval, 1*time.Second))),
+				diffs: []cmputil.Diff{
+					{
+						Path:  "NotificationSettings[0].GroupInterval",
+						Left:  reflect.ValueOf(*baseSettings.GroupInterval),
+						Right: reflect.ValueOf(model.Duration(*addTime(baseSettings.GroupInterval, 1*time.Second))),
+					},
+				},
+			},
+			{
+				name:                 "should detect changes in RepeatInterval",
+				notificationSettings: CopyNotificationSettings(baseSettings, NSMuts.WithRepeatInterval(addTime(baseSettings.RepeatInterval, 1*time.Second))),
+				diffs: []cmputil.Diff{
+					{
+						Path:  "NotificationSettings[0].RepeatInterval",
+						Left:  reflect.ValueOf(*baseSettings.RepeatInterval),
+						Right: reflect.ValueOf(model.Duration(*addTime(baseSettings.RepeatInterval, 1*time.Second))),
+					},
+				},
+			},
+			{
+				name:                 "should detect changes in GroupBy",
+				notificationSettings: CopyNotificationSettings(baseSettings, NSMuts.WithGroupBy(baseSettings.GroupBy[0]+"-modified", baseSettings.GroupBy[1]+"-modified")),
+				diffs: []cmputil.Diff{
+					{
+						Path:  "NotificationSettings[0].GroupBy[0]",
+						Left:  reflect.ValueOf(baseSettings.GroupBy[0]),
+						Right: reflect.ValueOf(baseSettings.GroupBy[0] + "-modified"),
+					},
+					{
+						Path:  "NotificationSettings[0].GroupBy[1]",
+						Left:  reflect.ValueOf(baseSettings.GroupBy[1]),
+						Right: reflect.ValueOf(baseSettings.GroupBy[1] + "-modified"),
+					},
+				},
+			},
+			{
+				name:                 "should detect changes in MuteTimeIntervals",
+				notificationSettings: CopyNotificationSettings(baseSettings, NSMuts.WithMuteTimeIntervals(baseSettings.MuteTimeIntervals[0]+"-modified", baseSettings.MuteTimeIntervals[1]+"-modified")),
+				diffs: []cmputil.Diff{
+					{
+						Path:  "NotificationSettings[0].MuteTimeIntervals[0]",
+						Left:  reflect.ValueOf(baseSettings.MuteTimeIntervals[0]),
+						Right: reflect.ValueOf(baseSettings.MuteTimeIntervals[0] + "-modified"),
+					},
+					{
+						Path:  "NotificationSettings[0].MuteTimeIntervals[1]",
+						Left:  reflect.ValueOf(baseSettings.MuteTimeIntervals[1]),
+						Right: reflect.ValueOf(baseSettings.MuteTimeIntervals[1] + "-modified"),
+					},
+				},
+			},
+		}
+
+		for _, tt := range testCases {
+			t.Run(tt.name, func(t *testing.T) {
+				rule2 := CopyRule(rule1)
+				rule2.NotificationSettings = []NotificationSettings{tt.notificationSettings}
+				diffs := rule1.Diff(rule2)
+
+				cOpt := []cmp.Option{
+					cmpopts.IgnoreUnexported(cmputil.Diff{}),
+				}
+				if !cmp.Equal(diffs, tt.diffs, cOpt...) {
+					t.Errorf("Unexpected Diffs: %v", cmp.Diff(diffs, tt.diffs, cOpt...))
+				}
+			})
+		}
+	})
 }
 
 func TestSortByGroupIndex(t *testing.T) {
diff --git a/pkg/services/ngalert/models/alertmanager.go b/pkg/services/ngalert/models/alertmanager.go
index 985ca28162406..0b69f682c8a90 100644
--- a/pkg/services/ngalert/models/alertmanager.go
+++ b/pkg/services/ngalert/models/alertmanager.go
@@ -24,11 +24,6 @@ type HistoricAlertConfiguration struct {
 	LastApplied int64 `xorm:"last_applied"`
 }
 
-// GetLatestAlertmanagerConfigurationQuery is the query to get the latest alertmanager configuration.
-type GetLatestAlertmanagerConfigurationQuery struct {
-	OrgID int64
-}
-
 // SaveAlertmanagerConfigurationCmd is the command to save an alertmanager configuration.
 type SaveAlertmanagerConfigurationCmd struct {
 	AlertmanagerConfiguration string
diff --git a/pkg/services/ngalert/models/errors.go b/pkg/services/ngalert/models/errors.go
new file mode 100644
index 0000000000000..7f0e6cf1cab25
--- /dev/null
+++ b/pkg/services/ngalert/models/errors.go
@@ -0,0 +1,16 @@
+package models
+
+import (
+	"github.com/grafana/grafana/pkg/util/errutil"
+)
+
+var (
+	errAlertRuleConflictMsg  = "conflicting alert rule found [rule_uid: '{{ .Public.RuleUID }}', title: '{{ .Public.Title }}', namespace_uid: '{{ .Public.NamespaceUID }}']: {{ .Public.Error }}"
+	ErrAlertRuleConflictBase = errutil.Conflict("alerting.alert-rule.conflict").
+					MustTemplate(errAlertRuleConflictMsg, errutil.WithPublic(errAlertRuleConflictMsg))
+	ErrAlertRuleGroupNotFound = errutil.NotFound("alerting.alert-rule.notFound")
+)
+
+func ErrAlertRuleConflict(rule AlertRule, underlying error) error {
+	return ErrAlertRuleConflictBase.Build(errutil.TemplateData{Public: map[string]any{"RuleUID": rule.UID, "Title": rule.Title, "NamespaceUID": rule.NamespaceUID, "Error": underlying.Error()}, Error: underlying})
+}
diff --git a/pkg/services/ngalert/models/history.go b/pkg/services/ngalert/models/history.go
index ebc74e94d2ec2..509b1a74398c2 100644
--- a/pkg/services/ngalert/models/history.go
+++ b/pkg/services/ngalert/models/history.go
@@ -3,7 +3,7 @@ package models
 import (
 	"time"
 
-	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 )
 
 // HistoryQuery represents a query for alert state history.
@@ -16,5 +16,5 @@ type HistoryQuery struct {
 	From         time.Time
 	To           time.Time
 	Limit        int
-	SignedInUser *user.SignedInUser
+	SignedInUser identity.Requester
 }
diff --git a/pkg/services/ngalert/models/instance.go b/pkg/services/ngalert/models/instance.go
index 9a86d1ce3ba72..ea731dd950b93 100644
--- a/pkg/services/ngalert/models/instance.go
+++ b/pkg/services/ngalert/models/instance.go
@@ -14,6 +14,7 @@ type AlertInstance struct {
 	CurrentStateSince time.Time
 	CurrentStateEnd   time.Time
 	LastEvalTime      time.Time
+	ResultFingerprint string
 }
 
 type AlertInstanceKey struct {
diff --git a/pkg/services/ngalert/models/notifications.go b/pkg/services/ngalert/models/notifications.go
new file mode 100644
index 0000000000000..8d40c5d88b1df
--- /dev/null
+++ b/pkg/services/ngalert/models/notifications.go
@@ -0,0 +1,185 @@
+package models
+
+import (
+	"encoding/binary"
+	"errors"
+	"hash/fnv"
+	"slices"
+	"unsafe"
+
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/prometheus/common/model"
+)
+
+// GroupByAll is a special value defined by alertmanager that can be used in a Route's GroupBy field to aggregate by all possible labels.
+const GroupByAll = "..."
+
+// DefaultNotificationSettingsGroupBy are the default required GroupBy fields for notification settings.
+var DefaultNotificationSettingsGroupBy = []string{FolderTitleLabel, model.AlertNameLabel}
+
+type ListNotificationSettingsQuery struct {
+	OrgID        int64
+	ReceiverName string
+}
+
+// NotificationSettings represents the settings for sending notifications for a single AlertRule. It is used to
+// automatically generate labels and an associated matching route containing the given settings.
+type NotificationSettings struct {
+	Receiver string `json:"receiver"`
+
+	GroupBy           []string        `json:"group_by,omitempty"`
+	GroupWait         *model.Duration `json:"group_wait,omitempty"`
+	GroupInterval     *model.Duration `json:"group_interval,omitempty"`
+	RepeatInterval    *model.Duration `json:"repeat_interval,omitempty"`
+	MuteTimeIntervals []string        `json:"mute_time_intervals,omitempty"`
+}
+
+// NormalizedGroupBy returns a consistent and ordered GroupBy.
+//   - If the GroupBy is empty, it returns nil so that the parent group can be inherited.
+//   - If the GroupBy contains the special label '...', it returns only '...'.
+//   - Otherwise, it returns the default GroupBy labels followed by any custom labels in sorted order.
+//
+// To ensure consistent and valid generated routes, this should be used instead of GroupBy when generating fingerprints
+// or fingerprint-level routes.
+func (s *NotificationSettings) NormalizedGroupBy() []string {
+	if len(s.GroupBy) == 0 {
+		// Inherit group from parent.
+		return nil
+	}
+
+	defaultGroupBySet := make(map[string]struct{}, len(DefaultNotificationSettingsGroupBy))
+	for _, lbl := range DefaultNotificationSettingsGroupBy {
+		defaultGroupBySet[lbl] = struct{}{}
+	}
+
+	var customLabels []string
+	for _, lbl := range s.GroupBy {
+		if lbl == GroupByAll {
+			return []string{GroupByAll}
+		}
+		if _, ok := defaultGroupBySet[lbl]; !ok {
+			customLabels = append(customLabels, lbl)
+		}
+	}
+
+	// Sort the custom labels to ensure consistent ordering while keeping the required labels in the front.
+	slices.Sort(customLabels)
+
+	normalized := make([]string, 0, len(DefaultNotificationSettingsGroupBy)+len(customLabels))
+	normalized = append(normalized, DefaultNotificationSettingsGroupBy...)
+	return append(normalized, customLabels...)
+}
+
+// Validate checks if the NotificationSettings object is valid.
+// It returns an error if any of the validation checks fail.
+// The receiver must be specified.
+// GroupWait, GroupInterval, RepeatInterval must be positive durations.
+func (s *NotificationSettings) Validate() error {
+	if s.Receiver == "" {
+		return errors.New("receiver must be specified")
+	}
+	if s.GroupWait != nil && *s.GroupWait < 0 {
+		return errors.New("group wait must be a positive duration")
+	}
+	if s.GroupInterval != nil && *s.GroupInterval < 0 {
+		return errors.New("group interval must be a positive duration")
+	}
+	if s.RepeatInterval != nil && *s.RepeatInterval < 0 {
+		return errors.New("repeat interval must be a positive duration")
+	}
+	return nil
+}
+
+// ToLabels converts the NotificationSettings into data.Labels. When added to an AlertRule these labels ensure it will
+// match an autogenerated route with the correct settings.
+// Labels returned:
+//   - AutogeneratedRouteLabel: "true"
+//   - AutogeneratedRouteReceiverNameLabel: Receiver
+//   - AutogeneratedRouteSettingsHashLabel: Fingerprint (if the NotificationSettings are not all default)
+func (s *NotificationSettings) ToLabels() data.Labels {
+	result := make(data.Labels, 3)
+	result[AutogeneratedRouteLabel] = "true"
+	result[AutogeneratedRouteReceiverNameLabel] = s.Receiver
+	if !s.IsAllDefault() {
+		result[AutogeneratedRouteSettingsHashLabel] = s.Fingerprint().String()
+	}
+	return result
+}
+
+func (s *NotificationSettings) Equals(other *NotificationSettings) bool {
+	durationEqual := func(d1, d2 *model.Duration) bool {
+		if d1 == nil || d2 == nil {
+			return d1 == d2
+		}
+		return *d1 == *d2
+	}
+	if s == nil || other == nil {
+		return s == nil && other == nil
+	}
+	if s.Receiver != other.Receiver {
+		return false
+	}
+	if !durationEqual(s.GroupWait, other.GroupWait) {
+		return false
+	}
+	if !durationEqual(s.GroupInterval, other.GroupInterval) {
+		return false
+	}
+	if !durationEqual(s.RepeatInterval, other.RepeatInterval) {
+		return false
+	}
+	if !slices.Equal(s.MuteTimeIntervals, other.MuteTimeIntervals) {
+		return false
+	}
+	sGr := s.GroupBy
+	oGr := other.GroupBy
+	return slices.Equal(sGr, oGr)
+}
+
+// IsAllDefault checks if the NotificationSettings object has all default values for optional fields (all except Receiver) .
+func (s *NotificationSettings) IsAllDefault() bool {
+	return len(s.GroupBy) == 0 && s.GroupWait == nil && s.GroupInterval == nil && s.RepeatInterval == nil && len(s.MuteTimeIntervals) == 0
+}
+
+// NewDefaultNotificationSettings creates a new default NotificationSettings with the specified receiver.
+func NewDefaultNotificationSettings(receiver string) NotificationSettings {
+	return NotificationSettings{
+		Receiver: receiver,
+	}
+}
+
+// Fingerprint calculates a hash value to uniquely identify a NotificationSettings by its attributes.
+// The hash is calculated by concatenating the strings and durations of the NotificationSettings attributes
+// and using an invalid UTF-8 sequence as a separator.
+func (s *NotificationSettings) Fingerprint() data.Fingerprint {
+	h := fnv.New64()
+	tmp := make([]byte, 8)
+
+	writeString := func(s string) {
+		// save on extra slice allocation when string is converted to bytes.
+		_, _ = h.Write(unsafe.Slice(unsafe.StringData(s), len(s))) //nolint:gosec
+		// ignore errors returned by Write method because fnv never returns them.
+		_, _ = h.Write([]byte{255}) // use an invalid utf-8 sequence as separator
+	}
+	writeDuration := func(d *model.Duration) {
+		if d == nil {
+			_, _ = h.Write([]byte{255})
+		} else {
+			binary.LittleEndian.PutUint64(tmp, uint64(*d))
+			_, _ = h.Write(tmp)
+			_, _ = h.Write([]byte{255})
+		}
+	}
+
+	writeString(s.Receiver)
+	for _, gb := range s.NormalizedGroupBy() {
+		writeString(gb)
+	}
+	writeDuration(s.GroupWait)
+	writeDuration(s.GroupInterval)
+	writeDuration(s.RepeatInterval)
+	for _, interval := range s.MuteTimeIntervals {
+		writeString(interval)
+	}
+	return data.Fingerprint(h.Sum64())
+}
diff --git a/pkg/services/ngalert/models/notifications_test.go b/pkg/services/ngalert/models/notifications_test.go
new file mode 100644
index 0000000000000..14e3a3e89bb17
--- /dev/null
+++ b/pkg/services/ngalert/models/notifications_test.go
@@ -0,0 +1,212 @@
+package models
+
+import (
+	"testing"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/prometheus/common/model"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/util"
+)
+
+func TestValidate(t *testing.T) {
+	validNotificationSettings := NotificationSettingsGen(NSMuts.WithGroupBy(model.AlertNameLabel, FolderTitleLabel))
+
+	testCases := []struct {
+		name                 string
+		notificationSettings NotificationSettings
+		expErrorContains     string
+	}{
+		{
+			name:                 "valid notification settings",
+			notificationSettings: validNotificationSettings(),
+		},
+		{
+			name:                 "missing receiver is invalid",
+			notificationSettings: CopyNotificationSettings(validNotificationSettings(), NSMuts.WithReceiver("")),
+			expErrorContains:     "receiver",
+		},
+		{
+			name:                 "group by empty is valid",
+			notificationSettings: CopyNotificationSettings(validNotificationSettings(), NSMuts.WithGroupBy()),
+		},
+		{
+			name:                 "group by ... is valid",
+			notificationSettings: CopyNotificationSettings(validNotificationSettings(), NSMuts.WithGroupBy("...")),
+		},
+		{
+			name:                 "group by with alert name and folder name labels is valid",
+			notificationSettings: CopyNotificationSettings(validNotificationSettings(), NSMuts.WithGroupBy(model.AlertNameLabel, FolderTitleLabel)),
+		},
+		{
+			name:                 "group by missing alert name label is valid",
+			notificationSettings: CopyNotificationSettings(validNotificationSettings(), NSMuts.WithGroupBy(FolderTitleLabel)),
+		},
+		{
+			name:                 "group by missing folder name label is valid",
+			notificationSettings: CopyNotificationSettings(validNotificationSettings(), NSMuts.WithGroupBy(model.AlertNameLabel)),
+		},
+		{
+			name:                 "group wait empty is valid",
+			notificationSettings: CopyNotificationSettings(validNotificationSettings(), NSMuts.WithGroupWait(nil)),
+		},
+		{
+			name:                 "group wait positive is valid",
+			notificationSettings: CopyNotificationSettings(validNotificationSettings(), NSMuts.WithGroupWait(util.Pointer(1*time.Second))),
+		},
+		{
+			name:                 "group wait negative is invalid",
+			notificationSettings: CopyNotificationSettings(validNotificationSettings(), NSMuts.WithGroupWait(util.Pointer(-1*time.Second))),
+			expErrorContains:     "group wait",
+		},
+		{
+			name:                 "group interval empty is valid",
+			notificationSettings: CopyNotificationSettings(validNotificationSettings(), NSMuts.WithGroupInterval(nil)),
+		},
+		{
+			name:                 "group interval positive is valid",
+			notificationSettings: CopyNotificationSettings(validNotificationSettings(), NSMuts.WithGroupInterval(util.Pointer(1*time.Second))),
+		},
+		{
+			name:                 "group interval negative is invalid",
+			notificationSettings: CopyNotificationSettings(validNotificationSettings(), NSMuts.WithGroupInterval(util.Pointer(-1*time.Second))),
+			expErrorContains:     "group interval",
+		},
+		{
+			name:                 "repeat interval empty is valid",
+			notificationSettings: CopyNotificationSettings(validNotificationSettings(), NSMuts.WithRepeatInterval(nil)),
+		},
+		{
+			name:                 "repeat interval positive is valid",
+			notificationSettings: CopyNotificationSettings(validNotificationSettings(), NSMuts.WithRepeatInterval(util.Pointer(1*time.Second))),
+		},
+		{
+			name:                 "repeat interval negative is invalid",
+			notificationSettings: CopyNotificationSettings(validNotificationSettings(), NSMuts.WithRepeatInterval(util.Pointer(-1*time.Second))),
+			expErrorContains:     "repeat interval",
+		},
+	}
+
+	for _, tt := range testCases {
+		t.Run(tt.name, func(t *testing.T) {
+			err := tt.notificationSettings.Validate()
+			if tt.expErrorContains != "" {
+				require.Error(t, err)
+				require.ErrorContains(t, err, tt.expErrorContains)
+			} else {
+				require.NoError(t, err)
+			}
+		})
+	}
+}
+
+func TestNotificationSettingsLabels(t *testing.T) {
+	testCases := []struct {
+		name                 string
+		notificationSettings NotificationSettings
+		labels               data.Labels
+	}{
+		{
+			name:                 "default notification settings",
+			notificationSettings: NewDefaultNotificationSettings("receiver name"),
+			labels: data.Labels{
+				AutogeneratedRouteLabel:             "true",
+				AutogeneratedRouteReceiverNameLabel: "receiver name",
+			},
+		},
+		{
+			name: "default notification settings with hardcoded default group by",
+			notificationSettings: NotificationSettings{
+				Receiver: "receiver name",
+				GroupBy:  DefaultNotificationSettingsGroupBy,
+			},
+			labels: data.Labels{
+				AutogeneratedRouteLabel:             "true",
+				AutogeneratedRouteReceiverNameLabel: "receiver name",
+				AutogeneratedRouteSettingsHashLabel: "6027cdeaff62ba3f",
+			},
+		},
+		{
+			name: "custom notification settings",
+			notificationSettings: NotificationSettings{
+				Receiver:          "receiver name",
+				GroupBy:           []string{"label1", "label2"},
+				GroupWait:         util.Pointer(model.Duration(1 * time.Minute)),
+				GroupInterval:     util.Pointer(model.Duration(2 * time.Minute)),
+				RepeatInterval:    util.Pointer(model.Duration(3 * time.Minute)),
+				MuteTimeIntervals: []string{"maintenance1", "maintenance2"},
+			},
+			labels: data.Labels{
+				AutogeneratedRouteLabel:             "true",
+				AutogeneratedRouteReceiverNameLabel: "receiver name",
+				AutogeneratedRouteSettingsHashLabel: "47164c92f2986a35",
+			},
+		},
+	}
+
+	for _, tt := range testCases {
+		t.Run(tt.name, func(t *testing.T) {
+			labels := tt.notificationSettings.ToLabels()
+			require.Equal(t, tt.labels, labels)
+		})
+	}
+}
+
+func TestNormalizedGroupBy(t *testing.T) {
+	validNotificationSettings := NotificationSettingsGen()
+
+	testCases := []struct {
+		name                      string
+		notificationSettings      NotificationSettings
+		expectedNormalizedGroupBy []string
+	}{
+		{
+			name:                      "default group by is normal",
+			notificationSettings:      CopyNotificationSettings(validNotificationSettings(), NSMuts.WithGroupBy(DefaultNotificationSettingsGroupBy...)),
+			expectedNormalizedGroupBy: DefaultNotificationSettingsGroupBy,
+		},
+		{
+			name:                      "group by ... is normal",
+			notificationSettings:      CopyNotificationSettings(validNotificationSettings(), NSMuts.WithGroupBy(GroupByAll)),
+			expectedNormalizedGroupBy: []string{GroupByAll},
+		},
+		{
+			name:                 "group by empty is normal",
+			notificationSettings: CopyNotificationSettings(validNotificationSettings(), NSMuts.WithGroupBy()),
+		},
+		{
+			name:                      "group by with ... and other labels is not normal",
+			notificationSettings:      CopyNotificationSettings(validNotificationSettings(), NSMuts.WithGroupBy(FolderTitleLabel, model.AlertNameLabel, GroupByAll)),
+			expectedNormalizedGroupBy: []string{GroupByAll},
+		},
+		{
+			name:                      "group by missing alert name label is not normal",
+			notificationSettings:      CopyNotificationSettings(validNotificationSettings(), NSMuts.WithGroupBy(FolderTitleLabel)),
+			expectedNormalizedGroupBy: DefaultNotificationSettingsGroupBy,
+		},
+		{
+			name:                      "group by missing folder name label is not normal",
+			notificationSettings:      CopyNotificationSettings(validNotificationSettings(), NSMuts.WithGroupBy(model.AlertNameLabel)),
+			expectedNormalizedGroupBy: DefaultNotificationSettingsGroupBy,
+		},
+		{
+			name:                      "group by with all required labels plus extra is normal",
+			notificationSettings:      CopyNotificationSettings(validNotificationSettings(), NSMuts.WithGroupBy(FolderTitleLabel, model.AlertNameLabel, "custom")),
+			expectedNormalizedGroupBy: []string{FolderTitleLabel, model.AlertNameLabel, "custom"},
+		},
+		{
+			name:                      "ensure consistent ordering, required labels in front followed by sorted custom labels ",
+			notificationSettings:      CopyNotificationSettings(validNotificationSettings(), NSMuts.WithGroupBy("custom", model.AlertNameLabel, "something", FolderTitleLabel, "other")),
+			expectedNormalizedGroupBy: []string{FolderTitleLabel, model.AlertNameLabel, "custom", "other", "something"},
+		},
+	}
+
+	for _, tt := range testCases {
+		t.Run(tt.name, func(t *testing.T) {
+			normalized := tt.notificationSettings.NormalizedGroupBy()
+			require.Equal(t, normalized, tt.expectedNormalizedGroupBy)
+		})
+	}
+}
diff --git a/pkg/services/ngalert/models/receivers.go b/pkg/services/ngalert/models/receivers.go
new file mode 100644
index 0000000000000..1497395eeec2c
--- /dev/null
+++ b/pkg/services/ngalert/models/receivers.go
@@ -0,0 +1,17 @@
+package models
+
+// GetReceiverQuery represents a query for a single receiver.
+type GetReceiverQuery struct {
+	OrgID   int64
+	Name    string
+	Decrypt bool
+}
+
+// GetReceiversQuery represents a query for receiver groups.
+type GetReceiversQuery struct {
+	OrgID   int64
+	Names   []string
+	Limit   int
+	Offset  int
+	Decrypt bool
+}
diff --git a/pkg/services/ngalert/models/testing.go b/pkg/services/ngalert/models/testing.go
index 7f7746adcf0bd..71ffd9312a965 100644
--- a/pkg/services/ngalert/models/testing.go
+++ b/pkg/services/ngalert/models/testing.go
@@ -4,13 +4,18 @@ import (
 	"encoding/json"
 	"fmt"
 	"math/rand"
+	"slices"
 	"sync"
+	"testing"
 	"time"
 
 	"github.com/google/uuid"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/prometheus/common/model"
+	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/expr"
+	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/util"
 )
@@ -60,26 +65,32 @@ func AlertRuleGen(mutators ...AlertRuleMutator) func() *AlertRule {
 			panelID = &p
 		}
 
+		var ns []NotificationSettings
+		if rand.Int63()%2 == 0 {
+			ns = append(ns, NotificationSettingsGen()())
+		}
+
 		rule := &AlertRule{
-			ID:              rand.Int63n(1500),
-			OrgID:           rand.Int63n(1500) + 1, // Prevent OrgID=0 as this does not pass alert rule validation.
-			Title:           "TEST-ALERT-" + util.GenerateShortUID(),
-			Condition:       "A",
-			Data:            []AlertQuery{GenerateAlertQuery()},
-			Updated:         time.Now().Add(-time.Duration(rand.Intn(100) + 1)),
-			IntervalSeconds: rand.Int63n(60) + 1,
-			Version:         rand.Int63n(1500), // Don't generate a rule ID too big for postgres
-			UID:             util.GenerateShortUID(),
-			NamespaceUID:    util.GenerateShortUID(),
-			DashboardUID:    dashUID,
-			PanelID:         panelID,
-			RuleGroup:       "TEST-GROUP-" + util.GenerateShortUID(),
-			RuleGroupIndex:  rand.Intn(1500),
-			NoDataState:     randNoDataState(),
-			ExecErrState:    randErrState(),
-			For:             forInterval,
-			Annotations:     annotations,
-			Labels:          labels,
+			ID:                   rand.Int63n(1500),
+			OrgID:                rand.Int63n(1500) + 1, // Prevent OrgID=0 as this does not pass alert rule validation.
+			Title:                "TEST-ALERT-" + util.GenerateShortUID(),
+			Condition:            "A",
+			Data:                 []AlertQuery{GenerateAlertQuery()},
+			Updated:              time.Now().Add(-time.Duration(rand.Intn(100) + 1)),
+			IntervalSeconds:      rand.Int63n(60) + 1,
+			Version:              rand.Int63n(1500), // Don't generate a rule ID too big for postgres
+			UID:                  util.GenerateShortUID(),
+			NamespaceUID:         util.GenerateShortUID(),
+			DashboardUID:         dashUID,
+			PanelID:              panelID,
+			RuleGroup:            "TEST-GROUP-" + util.GenerateShortUID(),
+			RuleGroupIndex:       rand.Intn(1500),
+			NoDataState:          randNoDataState(),
+			ExecErrState:         randErrState(),
+			For:                  forInterval,
+			Annotations:          annotations,
+			Labels:               labels,
+			NotificationSettings: ns,
 		}
 
 		for _, mutator := range mutators {
@@ -158,6 +169,18 @@ func WithUniqueOrgID() AlertRuleMutator {
 	}
 }
 
+// WithNamespaceUIDNotIn generates a random namespace UID if it is among excluded
+func WithNamespaceUIDNotIn(exclude ...string) AlertRuleMutator {
+	return func(rule *AlertRule) {
+		for {
+			if !slices.Contains(exclude, rule.NamespaceUID) {
+				return
+			}
+			rule.NamespaceUID = uuid.NewString()
+		}
+	}
+}
+
 func WithNamespace(namespace *folder.Folder) AlertRuleMutator {
 	return func(rule *AlertRule) {
 		rule.NamespaceUID = namespace.UID
@@ -170,6 +193,12 @@ func WithInterval(interval time.Duration) AlertRuleMutator {
 	}
 }
 
+func WithIntervalBetween(min, max int64) AlertRuleMutator {
+	return func(rule *AlertRule) {
+		rule.IntervalSeconds = rand.Int63n(max-min) + min
+	}
+}
+
 func WithTitle(title string) AlertRuleMutator {
 	return func(rule *AlertRule) {
 		rule.Title = title
@@ -244,6 +273,20 @@ func WithUniqueUID(knownUids *sync.Map) AlertRuleMutator {
 	}
 }
 
+func WithUniqueTitle(knownTitles *sync.Map) AlertRuleMutator {
+	return func(rule *AlertRule) {
+		title := rule.Title
+		for {
+			_, ok := knownTitles.LoadOrStore(title, struct{}{})
+			if !ok {
+				rule.Title = title
+				return
+			}
+			title = uuid.NewString()
+		}
+	}
+}
+
 func WithQuery(query ...AlertQuery) AlertRuleMutator {
 	return func(rule *AlertRule) {
 		rule.Data = query
@@ -253,6 +296,26 @@ func WithQuery(query ...AlertQuery) AlertRuleMutator {
 	}
 }
 
+func WithGroupKey(groupKey AlertRuleGroupKey) AlertRuleMutator {
+	return func(rule *AlertRule) {
+		rule.RuleGroup = groupKey.RuleGroup
+		rule.OrgID = groupKey.OrgID
+		rule.NamespaceUID = groupKey.NamespaceUID
+	}
+}
+
+func WithNotificationSettingsGen(ns func() NotificationSettings) AlertRuleMutator {
+	return func(rule *AlertRule) {
+		rule.NotificationSettings = []NotificationSettings{ns()}
+	}
+}
+
+func WithNoNotificationSettings() AlertRuleMutator {
+	return func(rule *AlertRule) {
+		rule.NotificationSettings = nil
+	}
+}
+
 func GenerateAlertLabels(count int, prefix string) data.Labels {
 	labels := make(data.Labels, count)
 	for i := 0; i < count; i++ {
@@ -382,6 +445,10 @@ func CopyRule(r *AlertRule) *AlertRule {
 		}
 	}
 
+	for _, s := range r.NotificationSettings {
+		result.NotificationSettings = append(result.NotificationSettings, CopyNotificationSettings(s))
+	}
+
 	return &result
 }
 
@@ -427,6 +494,108 @@ func CreateClassicConditionExpression(refID string, inputRefID string, reducer s
 	}
 }
 
+func CreateReduceExpression(refID string, inputRefID string, reducer string) AlertQuery {
+	return AlertQuery{
+		RefID:         refID,
+		QueryType:     expr.DatasourceType,
+		DatasourceUID: expr.DatasourceUID,
+		Model: json.RawMessage(fmt.Sprintf(`
+		{
+			"refId": "%[1]s",
+            "hide": false,
+            "type": "reduce",
+			"expression": "%[2]s",
+			"reducer": "%[3]s",
+            "datasource": {
+                "uid": "%[4]s",
+                "type": "%[5]s"
+            }
+		}`, refID, inputRefID, reducer, expr.DatasourceUID, expr.DatasourceType)),
+	}
+}
+
+func CreatePrometheusQuery(refID string, expr string, intervalMs int64, maxDataPoints int64, isInstant bool, datasourceUID string) AlertQuery {
+	return AlertQuery{
+		RefID:         refID,
+		QueryType:     "",
+		DatasourceUID: datasourceUID,
+		Model: json.RawMessage(fmt.Sprintf(`
+		{
+			"refId": "%[1]s",
+			"expr": "%[2]s",
+            "intervalMs": %[3]d,
+            "maxDataPoints": %[4]d,
+			"exemplar": false,
+			"instant": %[5]t,
+			"range": %[6]t,
+            "datasource": {
+                "uid": "%[7]s",
+                "type": "%[8]s"
+            }
+		}`, refID, expr, intervalMs, maxDataPoints, isInstant, !isInstant, datasourceUID, datasources.DS_PROMETHEUS)),
+	}
+}
+
+func CreateLokiQuery(refID string, expr string, intervalMs int64, maxDataPoints int64, queryType string, datasourceUID string) AlertQuery {
+	return AlertQuery{
+		RefID:         refID,
+		QueryType:     queryType,
+		DatasourceUID: datasourceUID,
+		Model: json.RawMessage(fmt.Sprintf(`
+		{
+			"refId": "%[1]s",
+			"expr": "%[2]s",
+            "intervalMs": %[3]d,
+            "maxDataPoints": %[4]d,
+			"queryType": "%[5]s",
+            "datasource": {
+                "uid": "%[6]s",
+                "type": "%[7]s"
+            }
+		}`, refID, expr, intervalMs, maxDataPoints, queryType, datasourceUID, datasources.DS_LOKI)),
+	}
+}
+
+func CreateHysteresisExpression(t *testing.T, refID string, inputRefID string, threshold int, recoveryThreshold int) AlertQuery {
+	t.Helper()
+	q := AlertQuery{
+		RefID:         refID,
+		QueryType:     expr.DatasourceType,
+		DatasourceUID: expr.DatasourceUID,
+		Model: json.RawMessage(fmt.Sprintf(`
+		{
+			"refId": "%[1]s",
+            "type": "threshold",
+            "datasource": {
+                "uid": "%[5]s",
+                "type": "%[6]s"
+            },
+			"expression": "%[2]s",
+            "conditions": [
+                {
+                    "type": "query",
+                    "evaluator": {
+                        "params": [
+                            %[3]d
+                        ],
+                        "type": "gt"
+                    },
+					"unloadEvaluator": {
+                        "params": [
+                            %[4]d
+                        ],
+                        "type": "lt"
+					}
+                }
+            ]
+		}`, refID, inputRefID, threshold, recoveryThreshold, expr.DatasourceUID, expr.DatasourceType)),
+	}
+	h, err := q.IsHysteresisExpression()
+	require.NoError(t, err)
+	require.Truef(t, h, "test model is expected to be a hysteresis expression")
+	return q
+}
+
 type AlertInstanceMutator func(*AlertInstance)
 
 // AlertInstanceGen provides a factory function that generates a random AlertInstance.
@@ -469,3 +638,108 @@ func AlertInstanceGen(mutators ...AlertInstanceMutator) *AlertInstance {
 	}
 	return instance
 }
+
+type Mutator[T any] func(*T)
+
+// CopyNotificationSettings creates a deep copy of NotificationSettings.
+func CopyNotificationSettings(ns NotificationSettings, mutators ...Mutator[NotificationSettings]) NotificationSettings {
+	c := NotificationSettings{
+		Receiver: ns.Receiver,
+	}
+	if ns.GroupWait != nil {
+		c.GroupWait = util.Pointer(*ns.GroupWait)
+	}
+	if ns.GroupInterval != nil {
+		c.GroupInterval = util.Pointer(*ns.GroupInterval)
+	}
+	if ns.RepeatInterval != nil {
+		c.RepeatInterval = util.Pointer(*ns.RepeatInterval)
+	}
+	if ns.GroupBy != nil {
+		c.GroupBy = make([]string, len(ns.GroupBy))
+		copy(c.GroupBy, ns.GroupBy)
+	}
+	if ns.MuteTimeIntervals != nil {
+		c.MuteTimeIntervals = make([]string, len(ns.MuteTimeIntervals))
+		copy(c.MuteTimeIntervals, ns.MuteTimeIntervals)
+	}
+	for _, mutator := range mutators {
+		mutator(&c)
+	}
+	return c
+}
+
+// NotificationSettingsGen generates NotificationSettings using a base and mutators.
+func NotificationSettingsGen(mutators ...Mutator[NotificationSettings]) func() NotificationSettings {
+	return func() NotificationSettings {
+		c := NotificationSettings{
+			Receiver:          util.GenerateShortUID(),
+			GroupBy:           []string{model.AlertNameLabel, FolderTitleLabel, util.GenerateShortUID()},
+			GroupWait:         util.Pointer(model.Duration(time.Duration(rand.Intn(100)+1) * time.Second)),
+			GroupInterval:     util.Pointer(model.Duration(time.Duration(rand.Intn(100)+1) * time.Second)),
+			RepeatInterval:    util.Pointer(model.Duration(time.Duration(rand.Intn(100)+1) * time.Second)),
+			MuteTimeIntervals: []string{util.GenerateShortUID(), util.GenerateShortUID()},
+		}
+		for _, mutator := range mutators {
+			mutator(&c)
+		}
+		return c
+	}
+}
+
+var (
+	NSMuts = NotificationSettingsMutators{}
+)
+
+type NotificationSettingsMutators struct{}
+
+func (n NotificationSettingsMutators) WithReceiver(receiver string) Mutator[NotificationSettings] {
+	return func(ns *NotificationSettings) {
+		ns.Receiver = receiver
+	}
+}
+
+func (n NotificationSettingsMutators) WithGroupWait(groupWait *time.Duration) Mutator[NotificationSettings] {
+	return func(ns *NotificationSettings) {
+		if groupWait == nil {
+			ns.GroupWait = nil
+			return
+		}
+		dur := model.Duration(*groupWait)
+		ns.GroupWait = &dur
+	}
+}
+
+func (n NotificationSettingsMutators) WithGroupInterval(groupInterval *time.Duration) Mutator[NotificationSettings] {
+	return func(ns *NotificationSettings) {
+		if groupInterval == nil {
+			ns.GroupInterval = nil
+			return
+		}
+		dur := model.Duration(*groupInterval)
+		ns.GroupInterval = &dur
+	}
+}
+
+func (n NotificationSettingsMutators) WithRepeatInterval(repeatInterval *time.Duration) Mutator[NotificationSettings] {
+	return func(ns *NotificationSettings) {
+		if repeatInterval == nil {
+			ns.RepeatInterval = nil
+			return
+		}
+		dur := model.Duration(*repeatInterval)
+		ns.RepeatInterval = &dur
+	}
+}
+
+func (n NotificationSettingsMutators) WithGroupBy(groupBy ...string) Mutator[NotificationSettings] {
+	return func(ns *NotificationSettings) {
+		ns.GroupBy = groupBy
+	}
+}
+
+func (n NotificationSettingsMutators) WithMuteTimeIntervals(muteTimeIntervals ...string) Mutator[NotificationSettings] {
+	return func(ns *NotificationSettings) {
+		ns.MuteTimeIntervals = muteTimeIntervals
+	}
+}
diff --git a/pkg/services/ngalert/ngalert.go b/pkg/services/ngalert/ngalert.go
index f3a62a324b6cf..8c23e3ee7c8ea 100644
--- a/pkg/services/ngalert/ngalert.go
+++ b/pkg/services/ngalert/ngalert.go
@@ -7,6 +7,8 @@ import (
 	"time"
 
 	"github.com/benbjohnson/clock"
+	"github.com/prometheus/alertmanager/featurecontrol"
+	"github.com/prometheus/alertmanager/matchers/compat"
 	"golang.org/x/sync/errgroup"
 
 	"github.com/grafana/grafana/pkg/api/routing"
@@ -24,12 +26,11 @@ import (
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/folder"
-	"github.com/grafana/grafana/pkg/services/guardian"
+	ac "github.com/grafana/grafana/pkg/services/ngalert/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/ngalert/api"
 	"github.com/grafana/grafana/pkg/services/ngalert/eval"
 	"github.com/grafana/grafana/pkg/services/ngalert/image"
 	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
-	"github.com/grafana/grafana/pkg/services/ngalert/migration"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/notifier"
 	"github.com/grafana/grafana/pkg/services/ngalert/provisioning"
@@ -71,10 +72,6 @@ func ProvideService(
 	pluginsStore pluginstore.Store,
 	tracer tracing.Tracer,
 	ruleStore *store.DBstore,
-	upgradeService migration.UpgradeService,
-
-	// This is necessary to ensure the guardian provider is initialized before we run the migration.
-	_ *guardian.Provider,
 ) (*AlertNG, error) {
 	ng := &AlertNG{
 		Cfg:                  cfg,
@@ -101,17 +98,9 @@ func ProvideService(
 		pluginsStore:         pluginsStore,
 		tracer:               tracer,
 		store:                ruleStore,
-		upgradeService:       upgradeService,
 	}
 
-	// Migration is called even if UA is disabled. If UA is disabled, this will do nothing except handle logic around
-	// reverting the migration.
-	err := ng.upgradeService.Run(context.Background())
-	if err != nil {
-		return nil, err
-	}
-
-	if !ng.shouldRun() {
+	if ng.IsDisabled() {
 		return ng, nil
 	}
 
@@ -157,35 +146,82 @@ type AlertNG struct {
 	bus          bus.Bus
 	pluginsStore pluginstore.Store
 	tracer       tracing.Tracer
-
-	upgradeService migration.UpgradeService
 }
 
 func (ng *AlertNG) init() error {
-	var err error
-
 	// AlertNG should be initialized before the cancellation deadline of initCtx
 	initCtx, cancelFunc := context.WithTimeout(context.Background(), 30*time.Second)
 	defer cancelFunc()
 
 	ng.store.Logger = ng.Log
 
-	decryptFn := ng.SecretsService.GetDecryptedValue
-	multiOrgMetrics := ng.Metrics.GetMultiOrgAlertmanagerMetrics()
+	// This initializes the compat package in fallback mode with logging. It parses first
+	// using the UTF-8 parser and then fallsback to the classic parser on error.
+	// UTF-8 is permitted in label names. This should be removed when the compat package
+	// is removed from Alertmanager.
+	compat.InitFromFlags(ng.Log, featurecontrol.NoopFlags{})
 
+	// If enabled, configure the remote Alertmanager.
+	// - If several toggles are enabled, the order of precedence is RemoteOnly, RemotePrimary, RemoteSecondary
+	// - If no toggles are enabled, we default to using only the internal Alertmanager
+	// We currently support only remote secondary mode, so in case other toggles are enabled we fall back to remote secondary.
 	var overrides []notifier.Option
+	moaLogger := log.New("ngalert.multiorg.alertmanager")
+	remoteOnly := ng.FeatureToggles.IsEnabled(initCtx, featuremgmt.FlagAlertmanagerRemoteOnly)
+	remotePrimary := ng.FeatureToggles.IsEnabled(initCtx, featuremgmt.FlagAlertmanagerRemotePrimary)
+	remoteSecondary := ng.FeatureToggles.IsEnabled(initCtx, featuremgmt.FlagAlertmanagerRemoteSecondary)
 	if ng.Cfg.UnifiedAlerting.RemoteAlertmanager.Enable {
-		override := notifier.WithAlertmanagerOverride(func(ctx context.Context, orgID int64) (notifier.Alertmanager, error) {
-			externalAMCfg := remote.AlertmanagerConfig{}
-			return remote.NewAlertmanager(externalAMCfg, orgID)
-		})
-
-		overrides = append(overrides, override)
+		switch {
+		case remoteOnly, remotePrimary:
+			ng.Log.Warn("Only remote secondary mode is supported at the moment, falling back to remote secondary")
+			fallthrough
+
+		case remoteSecondary:
+			ng.Log.Debug("Starting Grafana with remote secondary mode enabled")
+			m := ng.Metrics.GetRemoteAlertmanagerMetrics()
+			m.Info.WithLabelValues(metrics.ModeRemoteSecondary).Set(1)
+
+			// This function will be used by the MOA to create new Alertmanagers.
+			override := notifier.WithAlertmanagerOverride(func(factoryFn notifier.OrgAlertmanagerFactory) notifier.OrgAlertmanagerFactory {
+				return func(ctx context.Context, orgID int64) (notifier.Alertmanager, error) {
+					// Create internal Alertmanager.
+					internalAM, err := factoryFn(ctx, orgID)
+					if err != nil {
+						return nil, err
+					}
+
+					// Create remote Alertmanager.
+					remoteAM, err := createRemoteAlertmanager(orgID, ng.Cfg.UnifiedAlerting.RemoteAlertmanager, ng.KVStore, ng.SecretsService.Decrypt, m)
+					if err != nil {
+						moaLogger.Error("Failed to create remote Alertmanager, falling back to using only the internal one", "err", err)
+						return internalAM, nil
+					}
+
+					// Use both Alertmanager implementations in the forked Alertmanager.
+					cfg := remote.RemoteSecondaryConfig{
+						Logger:       log.New("ngalert.forked-alertmanager.remote-secondary"),
+						OrgID:        orgID,
+						Store:        ng.store,
+						SyncInterval: ng.Cfg.UnifiedAlerting.RemoteAlertmanager.SyncInterval,
+					}
+					return remote.NewRemoteSecondaryForkedAlertmanager(cfg, internalAM, remoteAM)
+				}
+			})
+
+			overrides = append(overrides, override)
+
+		default:
+			ng.Log.Error("A mode should be selected when enabling the remote Alertmanager, falling back to using only the internal Alertmanager")
+		}
 	}
-	ng.MultiOrgAlertmanager, err = notifier.NewMultiOrgAlertmanager(ng.Cfg, ng.store, ng.store, ng.KVStore, ng.store, decryptFn, multiOrgMetrics, ng.NotificationService, log.New("ngalert.multiorg.alertmanager"), ng.SecretsService, overrides...)
+
+	decryptFn := ng.SecretsService.GetDecryptedValue
+	multiOrgMetrics := ng.Metrics.GetMultiOrgAlertmanagerMetrics()
+	moa, err := notifier.NewMultiOrgAlertmanager(ng.Cfg, ng.store, ng.store, ng.KVStore, ng.store, decryptFn, multiOrgMetrics, ng.NotificationService, moaLogger, ng.SecretsService, ng.FeatureToggles, overrides...)
 	if err != nil {
 		return err
 	}
+	ng.MultiOrgAlertmanager = moa
 
 	imageService, err := image.NewScreenshotImageServiceFromCfg(ng.Cfg, ng.store, ng.dashboardService, ng.renderService, ng.Metrics.Registerer)
 	if err != nil {
@@ -223,6 +259,7 @@ func (ng *AlertNG) init() error {
 		BaseInterval:         ng.Cfg.UnifiedAlerting.BaseInterval,
 		MinRuleInterval:      ng.Cfg.UnifiedAlerting.MinInterval,
 		DisableGrafanaFolder: ng.Cfg.UnifiedAlerting.ReservedLabels.IsReservedLabelDisabled(models.FolderTitleLabel),
+		JitterEvaluations:    schedule.JitterStrategyFrom(ng.Cfg.UnifiedAlerting, ng.FeatureToggles),
 		AppURL:               appUrl,
 		EvaluatorFactory:     evalFactory,
 		RuleStore:            ng.store,
@@ -234,7 +271,7 @@ func (ng *AlertNG) init() error {
 
 	// There are a set of feature toggles available that act as short-circuits for common configurations.
 	// If any are set, override the config accordingly.
-	applyStateHistoryFeatureToggles(&ng.Cfg.UnifiedAlerting.StateHistory, ng.FeatureToggles, ng.Log)
+	ApplyStateHistoryFeatureToggles(&ng.Cfg.UnifiedAlerting.StateHistory, ng.FeatureToggles, ng.Log)
 	history, err := configureHistorianBackend(initCtx, ng.Cfg.UnifiedAlerting.StateHistory, ng.annotationsRepo, ng.dashboardService, ng.store, ng.Metrics.GetHistorianMetrics(), ng.Log)
 	if err != nil {
 		return err
@@ -246,13 +283,20 @@ func (ng *AlertNG) init() error {
 		Images:                         ng.ImageService,
 		Clock:                          clk,
 		Historian:                      history,
-		DoNotSaveNormalState:           ng.FeatureToggles.IsEnabled(featuremgmt.FlagAlertingNoNormalState),
+		DoNotSaveNormalState:           ng.FeatureToggles.IsEnabledGlobally(featuremgmt.FlagAlertingNoNormalState),
+		ApplyNoDataAndErrorToAllStates: ng.FeatureToggles.IsEnabledGlobally(featuremgmt.FlagAlertingNoDataErrorExecution),
 		MaxStateSaveConcurrency:        ng.Cfg.UnifiedAlerting.MaxStateSaveConcurrency,
-		ApplyNoDataAndErrorToAllStates: ng.FeatureToggles.IsEnabled(featuremgmt.FlagAlertingNoDataErrorExecution),
+		RulesPerRuleGroupLimit:         ng.Cfg.UnifiedAlerting.RulesPerRuleGroupLimit,
 		Tracer:                         ng.tracer,
 		Log:                            log.New("ngalert.state.manager"),
 	}
-	stateManager := state.NewManager(cfg)
+	logger := log.New("ngalert.state.manager.persist")
+	statePersister := state.NewSyncStatePersisiter(logger, cfg)
+	if ng.FeatureToggles.IsEnabledGlobally(featuremgmt.FlagAlertingSaveStatePeriodic) {
+		ticker := clock.New().Ticker(ng.Cfg.UnifiedAlerting.StatePeriodicSaveInterval)
+		statePersister = state.NewAsyncStatePersister(logger, ticker, cfg)
+	}
+	stateManager := state.NewManager(cfg, statePersister)
 	scheduler := schedule.NewScheduler(schedCfg, stateManager)
 
 	// if it is required to include folder title to the alerts, we need to subscribe to changes of alert title
@@ -263,14 +307,18 @@ func (ng *AlertNG) init() error {
 	ng.stateManager = stateManager
 	ng.schedule = scheduler
 
+	receiverService := notifier.NewReceiverService(ng.accesscontrol, ng.store, ng.store, ng.SecretsService, ng.store, ng.Log)
+
 	// Provisioning
 	policyService := provisioning.NewNotificationPolicyService(ng.store, ng.store, ng.store, ng.Cfg.UnifiedAlerting, ng.Log)
-	contactPointService := provisioning.NewContactPointService(ng.store, ng.SecretsService, ng.store, ng.store, ng.Log, ng.accesscontrol)
+	contactPointService := provisioning.NewContactPointService(ng.store, ng.SecretsService, ng.store, ng.store, receiverService, ng.Log, ng.store)
 	templateService := provisioning.NewTemplateService(ng.store, ng.store, ng.store, ng.Log)
 	muteTimingService := provisioning.NewMuteTimingService(ng.store, ng.store, ng.store, ng.Log)
-	alertRuleService := provisioning.NewAlertRuleService(ng.store, ng.store, ng.dashboardService, ng.QuotaService, ng.store,
+	alertRuleService := provisioning.NewAlertRuleService(ng.store, ng.store, ng.folderService, ng.dashboardService, ng.QuotaService, ng.store,
 		int64(ng.Cfg.UnifiedAlerting.DefaultRuleEvaluationInterval.Seconds()),
-		int64(ng.Cfg.UnifiedAlerting.BaseInterval.Seconds()), ng.Log)
+		int64(ng.Cfg.UnifiedAlerting.BaseInterval.Seconds()),
+		ng.Cfg.UnifiedAlerting.RulesPerRuleGroupLimit, ng.Log, notifier.NewNotificationSettingsValidationService(ng.store),
+		ac.NewRuleService(ng.accesscontrol))
 
 	ng.api = &api.API{
 		Cfg:                  ng.Cfg,
@@ -288,6 +336,7 @@ func (ng *AlertNG) init() error {
 		StateManager:         ng.stateManager,
 		AccessControl:        ng.accesscontrol,
 		Policies:             policyService,
+		ReceiverService:      receiverService,
 		ContactPointService:  contactPointService,
 		Templates:            templateService,
 		MuteTimings:          muteTimingService,
@@ -302,16 +351,7 @@ func (ng *AlertNG) init() error {
 	}
 	ng.api.RegisterAPIEndpoints(ng.Metrics.GetAPIMetrics())
 
-	defaultLimits, err := readQuotaConfig(ng.Cfg)
-	if err != nil {
-		return err
-	}
-
-	if err := ng.QuotaService.RegisterQuotaReporter(&quota.NewUsageReporter{
-		TargetSrv:     models.QuotaTargetSrv,
-		DefaultLimits: defaultLimits,
-		Reporter:      ng.api.Usage,
-	}); err != nil {
+	if err := RegisterQuotas(ng.Cfg, ng.QuotaService, ng.store); err != nil {
 		return err
 	}
 
@@ -329,33 +369,20 @@ func (ng *AlertNG) init() error {
 func subscribeToFolderChanges(logger log.Logger, bus bus.Bus, dbStore api.RuleStore) {
 	// if folder title is changed, we update all alert rules in that folder to make sure that all peers (in HA mode) will update folder title and
 	// clean up the current state
-	bus.AddEventListener(func(ctx context.Context, e *events.FolderTitleUpdated) error {
-		// do not block the upstream execution
-		go func(evt *events.FolderTitleUpdated) {
-			logger.Info("Got folder title updated event. updating rules in the folder", "folderUID", evt.UID)
-			_, err := dbStore.IncreaseVersionForAllRulesInNamespace(ctx, evt.OrgID, evt.UID)
-			if err != nil {
-				logger.Error("Failed to update alert rules in the folder after its title was changed", "error", err, "folderUID", evt.UID, "folder", evt.Title)
-				return
-			}
-		}(e)
+	bus.AddEventListener(func(ctx context.Context, evt *events.FolderTitleUpdated) error {
+		logger.Info("Got folder title updated event. updating rules in the folder", "folderUID", evt.UID)
+		_, err := dbStore.IncreaseVersionForAllRulesInNamespace(ctx, evt.OrgID, evt.UID)
+		if err != nil {
+			logger.Error("Failed to update alert rules in the folder after its title was changed", "error", err, "folderUID", evt.UID, "folder", evt.Title)
+			return err
+		}
 		return nil
 	})
 }
 
-// shouldRun determines if AlertNG should init or run anything more than just the migration.
-func (ng *AlertNG) shouldRun() bool {
-	return ng.Cfg.UnifiedAlerting.IsEnabled()
-}
-
 // Run starts the scheduler and Alertmanager.
 func (ng *AlertNG) Run(ctx context.Context) error {
-	if !ng.shouldRun() {
-		return nil
-	}
-	ng.Log.Debug("Starting")
-
-	ng.stateManager.Warm(ctx, ng.store)
+	ng.Log.Debug("Starting", "execute_alerts", ng.Cfg.UnifiedAlerting.ExecuteAlerts)
 
 	children, subCtx := errgroup.WithContext(ctx)
 
@@ -367,16 +394,34 @@ func (ng *AlertNG) Run(ctx context.Context) error {
 	})
 
 	if ng.Cfg.UnifiedAlerting.ExecuteAlerts {
+		// Only Warm() the state manager if we are actually executing alerts.
+		// Doing so when we are not executing alerts is wasteful and could lead
+		// to misleading rule status queries, as the status returned will be
+		// always based on the state loaded from the database at startup, and
+		// not the most recent evaluation state.
+		//
+		// Also note that this runs synchronously to ensure state is loaded
+		// before rule evaluation begins, hence we use ctx and not subCtx.
+		//
+		ng.stateManager.Warm(ctx, ng.store)
+
 		children.Go(func() error {
 			return ng.schedule.Run(subCtx)
 		})
+		children.Go(func() error {
+			return ng.stateManager.Run(subCtx)
+		})
 	}
 	return children.Wait()
 }
 
 // IsDisabled returns true if the alerting service is disabled for this instance.
 func (ng *AlertNG) IsDisabled() bool {
-	return ng.Cfg == nil
+	if ng.Cfg == nil {
+		return true
+	}
+
+	return !ng.Cfg.UnifiedAlerting.IsEnabled()
 }
 
 // GetHooks returns a facility for replacing handlers for paths. The handler hook for a path
@@ -385,35 +430,6 @@ func (ng *AlertNG) GetHooks() *api.Hooks {
 	return ng.api.Hooks
 }
 
-func readQuotaConfig(cfg *setting.Cfg) (*quota.Map, error) {
-	limits := &quota.Map{}
-
-	if cfg == nil {
-		return limits, nil
-	}
-
-	var alertOrgQuota int64
-	var alertGlobalQuota int64
-
-	if cfg.UnifiedAlerting.IsEnabled() {
-		alertOrgQuota = cfg.Quota.Org.AlertRule
-		alertGlobalQuota = cfg.Quota.Global.AlertRule
-	}
-
-	globalQuotaTag, err := quota.NewTag(models.QuotaTargetSrv, models.QuotaTarget, quota.GlobalScope)
-	if err != nil {
-		return limits, err
-	}
-	orgQuotaTag, err := quota.NewTag(models.QuotaTargetSrv, models.QuotaTarget, quota.OrgScope)
-	if err != nil {
-		return limits, err
-	}
-
-	limits.Set(globalQuotaTag, alertGlobalQuota)
-	limits.Set(orgQuotaTag, alertOrgQuota)
-	return limits, nil
-}
-
 type Historian interface {
 	api.Historian
 	state.Historian
@@ -476,14 +492,14 @@ func configureHistorianBackend(ctx context.Context, cfg setting.UnifiedAlertingS
 	return nil, fmt.Errorf("unrecognized state history backend: %s", backend)
 }
 
-// applyStateHistoryFeatureToggles edits state history configuration to comply with currently active feature toggles.
-func applyStateHistoryFeatureToggles(cfg *setting.UnifiedAlertingStateHistorySettings, ft featuremgmt.FeatureToggles, logger log.Logger) {
+// ApplyStateHistoryFeatureToggles edits state history configuration to comply with currently active feature toggles.
+func ApplyStateHistoryFeatureToggles(cfg *setting.UnifiedAlertingStateHistorySettings, ft featuremgmt.FeatureToggles, logger log.Logger) {
 	backend, _ := historian.ParseBackendType(cfg.Backend)
 	// These feature toggles represent specific, common backend configurations.
 	// If all toggles are enabled, we listen to the state history config as written.
 	// If any of them are disabled, we ignore the configured backend and treat the toggles as an override.
 	// If multiple toggles are disabled, we go with the most "restrictive" one.
-	if !ft.IsEnabled(featuremgmt.FlagAlertStateHistoryLokiSecondary) {
+	if !ft.IsEnabledGlobally(featuremgmt.FlagAlertStateHistoryLokiSecondary) {
 		// If we cannot even treat Loki as a secondary, we must use annotations only.
 		if backend == historian.BackendTypeMultiple || backend == historian.BackendTypeLoki {
 			logger.Info("Forcing Annotation backend due to state history feature toggles")
@@ -493,7 +509,7 @@ func applyStateHistoryFeatureToggles(cfg *setting.UnifiedAlertingStateHistorySet
 		}
 		return
 	}
-	if !ft.IsEnabled(featuremgmt.FlagAlertStateHistoryLokiPrimary) {
+	if !ft.IsEnabledGlobally(featuremgmt.FlagAlertStateHistoryLokiPrimary) {
 		// If we're using multiple backends, Loki must be the secondary.
 		if backend == historian.BackendTypeMultiple {
 			logger.Info("Coercing Loki to a secondary backend due to state history feature toggles")
@@ -509,7 +525,7 @@ func applyStateHistoryFeatureToggles(cfg *setting.UnifiedAlertingStateHistorySet
 		}
 		return
 	}
-	if !ft.IsEnabled(featuremgmt.FlagAlertStateHistoryLokiOnly) {
+	if !ft.IsEnabledGlobally(featuremgmt.FlagAlertStateHistoryLokiOnly) {
 		// If we're not allowed to use Loki only, make it the primary but keep the annotation writes.
 		if backend == historian.BackendTypeLoki {
 			logger.Info("Forcing dual writes to Loki and Annotations due to state history feature toggles")
@@ -520,3 +536,13 @@ func applyStateHistoryFeatureToggles(cfg *setting.UnifiedAlertingStateHistorySet
 		return
 	}
 }
+
+func createRemoteAlertmanager(orgID int64, amCfg setting.RemoteAlertmanagerSettings, kvstore kvstore.KVStore, decryptFn remote.DecryptFn, m *metrics.RemoteAlertmanager) (*remote.Alertmanager, error) {
+	externalAMCfg := remote.AlertmanagerConfig{
+		OrgID:             orgID,
+		URL:               amCfg.URL,
+		TenantID:          amCfg.TenantID,
+		BasicAuthPassword: amCfg.Password,
+	}
+	return remote.NewAlertmanager(externalAMCfg, notifier.NewFileStore(orgID, kvstore), decryptFn, m)
+}
diff --git a/pkg/services/ngalert/ngalert_test.go b/pkg/services/ngalert/ngalert_test.go
index 6bd42dee51f86..b717f562cb17f 100644
--- a/pkg/services/ngalert/ngalert_test.go
+++ b/pkg/services/ngalert/ngalert_test.go
@@ -26,7 +26,6 @@ import (
 func Test_subscribeToFolderChanges(t *testing.T) {
 	orgID := rand.Int63()
 	folder := &folder.Folder{
-		ID:    0,
 		UID:   util.GenerateShortUID(),
 		Title: "Folder" + util.GenerateShortUID(),
 	}
@@ -42,7 +41,6 @@ func Test_subscribeToFolderChanges(t *testing.T) {
 	err := bus.Publish(context.Background(), &events.FolderTitleUpdated{
 		Timestamp: time.Now(),
 		Title:     "Folder" + util.GenerateShortUID(),
-		ID:        folder.ID,
 		UID:       folder.UID,
 		OrgID:     orgID,
 	})
@@ -61,7 +59,7 @@ func Test_subscribeToFolderChanges(t *testing.T) {
 
 func TestConfigureHistorianBackend(t *testing.T) {
 	t.Run("fail initialization if invalid backend", func(t *testing.T) {
-		met := metrics.NewHistorianMetrics(prometheus.NewRegistry())
+		met := metrics.NewHistorianMetrics(prometheus.NewRegistry(), metrics.Subsystem)
 		logger := log.NewNopLogger()
 		cfg := setting.UnifiedAlertingStateHistorySettings{
 			Enabled: true,
@@ -74,7 +72,7 @@ func TestConfigureHistorianBackend(t *testing.T) {
 	})
 
 	t.Run("fail initialization if invalid multi-backend primary", func(t *testing.T) {
-		met := metrics.NewHistorianMetrics(prometheus.NewRegistry())
+		met := metrics.NewHistorianMetrics(prometheus.NewRegistry(), metrics.Subsystem)
 		logger := log.NewNopLogger()
 		cfg := setting.UnifiedAlertingStateHistorySettings{
 			Enabled:      true,
@@ -89,7 +87,7 @@ func TestConfigureHistorianBackend(t *testing.T) {
 	})
 
 	t.Run("fail initialization if invalid multi-backend secondary", func(t *testing.T) {
-		met := metrics.NewHistorianMetrics(prometheus.NewRegistry())
+		met := metrics.NewHistorianMetrics(prometheus.NewRegistry(), metrics.Subsystem)
 		logger := log.NewNopLogger()
 		cfg := setting.UnifiedAlertingStateHistorySettings{
 			Enabled:          true,
@@ -105,7 +103,7 @@ func TestConfigureHistorianBackend(t *testing.T) {
 	})
 
 	t.Run("do not fail initialization if pinging Loki fails", func(t *testing.T) {
-		met := metrics.NewHistorianMetrics(prometheus.NewRegistry())
+		met := metrics.NewHistorianMetrics(prometheus.NewRegistry(), metrics.Subsystem)
 		logger := log.NewNopLogger()
 		cfg := setting.UnifiedAlertingStateHistorySettings{
 			Enabled: true,
@@ -123,7 +121,7 @@ func TestConfigureHistorianBackend(t *testing.T) {
 
 	t.Run("emit metric describing chosen backend", func(t *testing.T) {
 		reg := prometheus.NewRegistry()
-		met := metrics.NewHistorianMetrics(reg)
+		met := metrics.NewHistorianMetrics(reg, metrics.Subsystem)
 		logger := log.NewNopLogger()
 		cfg := setting.UnifiedAlertingStateHistorySettings{
 			Enabled: true,
@@ -145,7 +143,7 @@ grafana_alerting_state_history_info{backend="annotations"} 1
 
 	t.Run("emit special zero metric if state history disabled", func(t *testing.T) {
 		reg := prometheus.NewRegistry()
-		met := metrics.NewHistorianMetrics(reg)
+		met := metrics.NewHistorianMetrics(reg, metrics.Subsystem)
 		logger := log.NewNopLogger()
 		cfg := setting.UnifiedAlertingStateHistorySettings{
 			Enabled: false,
diff --git a/pkg/services/ngalert/notifier/alertmanager.go b/pkg/services/ngalert/notifier/alertmanager.go
index aa3e1cf19548e..85eb84fbc20e8 100644
--- a/pkg/services/ngalert/notifier/alertmanager.go
+++ b/pkg/services/ngalert/notifier/alertmanager.go
@@ -3,9 +3,9 @@ package notifier
 import (
 	"context"
 	"crypto/md5"
+	"encoding/binary"
 	"encoding/json"
 	"fmt"
-	"path/filepath"
 	"strconv"
 	"time"
 
@@ -16,7 +16,6 @@ import (
 
 	amv2 "github.com/prometheus/alertmanager/api/v2/models"
 
-	"github.com/grafana/grafana/pkg/infra/kvstore"
 	"github.com/grafana/grafana/pkg/infra/log"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
@@ -27,10 +26,6 @@ import (
 )
 
 const (
-	notificationLogFilename = "notifications"
-	silencesFilename        = "silences"
-
-	workingDir = "alerting"
 	// maintenanceNotificationAndSilences how often should we flush and garbage collect notifications
 	notificationLogMaintenanceInterval = 15 * time.Minute
 )
@@ -42,6 +37,14 @@ var silenceMaintenanceInterval = 15 * time.Minute
 type AlertingStore interface {
 	store.AlertingStore
 	store.ImageStore
+	autogenRuleStore
+}
+
+type stateStore interface {
+	SaveSilences(ctx context.Context, st alertingNotify.State) (int64, error)
+	SaveNotificationLog(ctx context.Context, st alertingNotify.State) (int64, error)
+	GetSilences(ctx context.Context) (string, error)
+	GetNotificationLog(ctx context.Context) (string, error)
 }
 
 type alertmanager struct {
@@ -51,24 +54,28 @@ type alertmanager struct {
 	ConfigMetrics       *metrics.AlertmanagerConfigMetrics
 	Settings            *setting.Cfg
 	Store               AlertingStore
-	fileStore           *FileStore
+	stateStore          stateStore
 	NotificationService notifications.Service
 
 	decryptFn alertingNotify.GetDecryptedValueFn
 	orgID     int64
+
+	withAutogen bool
 }
 
 // maintenanceOptions represent the options for components that need maintenance on a frequency within the Alertmanager.
 // It implements the alerting.MaintenanceOptions interface.
 type maintenanceOptions struct {
-	filepath             string
+	initialState         string
 	retention            time.Duration
 	maintenanceFrequency time.Duration
 	maintenanceFunc      func(alertingNotify.State) (int64, error)
 }
 
-func (m maintenanceOptions) Filepath() string {
-	return m.filepath
+var _ alertingNotify.MaintenanceOptions = maintenanceOptions{}
+
+func (m maintenanceOptions) InitialState() string {
+	return m.initialState
 }
 
 func (m maintenanceOptions) Retention() time.Duration {
@@ -83,43 +90,39 @@ func (m maintenanceOptions) MaintenanceFunc(state alertingNotify.State) (int64,
 	return m.maintenanceFunc(state)
 }
 
-func newAlertmanager(ctx context.Context, orgID int64, cfg *setting.Cfg, store AlertingStore, kvStore kvstore.KVStore,
+func NewAlertmanager(ctx context.Context, orgID int64, cfg *setting.Cfg, store AlertingStore, stateStore stateStore,
 	peer alertingNotify.ClusterPeer, decryptFn alertingNotify.GetDecryptedValueFn, ns notifications.Service,
-	m *metrics.Alertmanager) (*alertmanager, error) {
-	workingPath := filepath.Join(cfg.DataPath, workingDir, strconv.Itoa(int(orgID)))
-	fileStore := NewFileStore(orgID, kvStore, workingPath)
-
-	nflogFilepath, err := fileStore.FilepathFor(ctx, notificationLogFilename)
+	m *metrics.Alertmanager, withAutogen bool) (*alertmanager, error) {
+	nflog, err := stateStore.GetNotificationLog(ctx)
 	if err != nil {
 		return nil, err
 	}
-	silencesFilePath, err := fileStore.FilepathFor(ctx, silencesFilename)
+	silences, err := stateStore.GetSilences(ctx)
 	if err != nil {
 		return nil, err
 	}
 
 	silencesOptions := maintenanceOptions{
-		filepath:             silencesFilePath,
+		initialState:         silences,
 		retention:            retentionNotificationsAndSilences,
 		maintenanceFrequency: silenceMaintenanceInterval,
 		maintenanceFunc: func(state alertingNotify.State) (int64, error) {
 			// Detached context here is to make sure that when the service is shut down the persist operation is executed.
-			return fileStore.Persist(context.Background(), silencesFilename, state)
+			return stateStore.SaveSilences(context.Background(), state)
 		},
 	}
 
 	nflogOptions := maintenanceOptions{
-		filepath:             nflogFilepath,
+		initialState:         nflog,
 		retention:            retentionNotificationsAndSilences,
 		maintenanceFrequency: notificationLogMaintenanceInterval,
 		maintenanceFunc: func(state alertingNotify.State) (int64, error) {
 			// Detached context here is to make sure that when the service is shut down the persist operation is executed.
-			return fileStore.Persist(context.Background(), notificationLogFilename, state)
+			return stateStore.SaveNotificationLog(context.Background(), state)
 		},
 	}
 
 	amcfg := &alertingNotify.GrafanaAlertmanagerConfig{
-		WorkingDirectory:   filepath.Join(cfg.DataPath, workingDir, strconv.Itoa(int(orgID))),
 		ExternalURL:        cfg.AppURL,
 		AlertStoreCallback: nil,
 		PeerTimeout:        cfg.UnifiedAlerting.HAPeerTimeout,
@@ -127,7 +130,7 @@ func newAlertmanager(ctx context.Context, orgID int64, cfg *setting.Cfg, store A
 		Nflog:              nflogOptions,
 	}
 
-	l := log.New("ngalert.notifier.alertmanager", orgID)
+	l := log.New("ngalert.notifier.alertmanager", "org", orgID)
 	gam, err := alertingNotify.NewGrafanaAlertmanager("orgID", orgID, amcfg, peer, l, alertingNotify.NewGrafanaAlertmanagerMetrics(m.Registerer))
 	if err != nil {
 		return nil, err
@@ -141,8 +144,11 @@ func newAlertmanager(ctx context.Context, orgID int64, cfg *setting.Cfg, store A
 		NotificationService: ns,
 		orgID:               orgID,
 		decryptFn:           decryptFn,
-		fileStore:           fileStore,
+		stateStore:          stateStore,
 		logger:              l,
+
+		// TODO: Preferably, logic around autogen would be outside of the specific alertmanager implementation so that remote alertmanager will get it for free.
+		withAutogen: withAutogen,
 	}
 
 	return am, nil
@@ -179,11 +185,17 @@ func (am *alertmanager) SaveAndApplyDefaultConfig(ctx context.Context) error {
 		}
 
 		err = am.Store.SaveAlertmanagerConfigurationWithCallback(ctx, cmd, func() error {
-			_, err := am.applyConfig(cfg, []byte(am.Settings.UnifiedAlerting.DefaultConfiguration))
+			if am.withAutogen {
+				err := AddAutogenConfig(ctx, am.logger, am.Store, am.orgID, &cfg.AlertmanagerConfig, true)
+				if err != nil {
+					return err
+				}
+			}
+			_, err = am.applyConfig(cfg)
 			return err
 		})
 		if err != nil {
-			outerErr = nil
+			outerErr = err
 			return
 		}
 	})
@@ -194,6 +206,9 @@ func (am *alertmanager) SaveAndApplyDefaultConfig(ctx context.Context) error {
 // SaveAndApplyConfig saves the configuration the database and applies the configuration to the Alertmanager.
 // It rollbacks the save if we fail to apply the configuration.
 func (am *alertmanager) SaveAndApplyConfig(ctx context.Context, cfg *apimodels.PostableUserConfig) error {
+	// Remove autogenerated config from the user config before saving it, may not be necessary as we already remove
+	// the autogenerated config before provenance guard. However, this is low impact and a good safety net.
+	RemoveAutogenConfigIfExists(cfg.AlertmanagerConfig.Route)
 	rawConfig, err := json.Marshal(&cfg)
 	if err != nil {
 		return fmt.Errorf("failed to serialize to the Alertmanager configuration: %w", err)
@@ -209,7 +224,14 @@ func (am *alertmanager) SaveAndApplyConfig(ctx context.Context, cfg *apimodels.P
 		}
 
 		err = am.Store.SaveAlertmanagerConfigurationWithCallback(ctx, cmd, func() error {
-			_, err := am.applyConfig(cfg, rawConfig)
+			if am.withAutogen {
+				err := AddAutogenConfig(ctx, am.logger, am.Store, am.orgID, &cfg.AlertmanagerConfig, false)
+				if err != nil {
+					return err
+				}
+			}
+
+			_, err = am.applyConfig(cfg)
 			return err
 		})
 		if err != nil {
@@ -231,7 +253,18 @@ func (am *alertmanager) ApplyConfig(ctx context.Context, dbCfg *ngmodels.AlertCo
 
 	var outerErr error
 	am.Base.WithLock(func() {
-		if err := am.applyAndMarkConfig(ctx, dbCfg.ConfigurationHash, cfg, nil); err != nil {
+		if am.withAutogen {
+			err := AddAutogenConfig(ctx, am.logger, am.Store, am.orgID, &cfg.AlertmanagerConfig, true)
+			if err != nil {
+				outerErr = err
+				return
+			}
+		}
+		// Note: Adding the autogen config here causes alert_configuration_history to update last_applied more often.
+		// Since we will now update last_applied when autogen changes even if the user-created config remains the same.
+		// To fix this however, the local alertmanager needs to be able to tell the difference between user-created and
+		// autogen config, which may introduce cross-cutting complexity.
+		if err := am.applyAndMarkConfig(ctx, dbCfg.ConfigurationHash, cfg); err != nil {
 			outerErr = fmt.Errorf("unable to apply configuration: %w", err)
 			return
 		}
@@ -255,6 +288,10 @@ func (am *alertmanager) updateConfigMetrics(cfg *apimodels.PostableUserConfig) {
 	am.ConfigMetrics.MatchRE.Set(float64(amu.MatchRE))
 	am.ConfigMetrics.Match.Set(float64(amu.Match))
 	am.ConfigMetrics.ObjectMatchers.Set(float64(amu.ObjectMatchers))
+
+	am.ConfigMetrics.ConfigHash.
+		WithLabelValues(strconv.FormatInt(am.orgID, 10)).
+		Set(hashAsMetricValue(am.Base.ConfigHash()))
 }
 
 func (am *alertmanager) aggregateRouteMatchers(r *apimodels.Route, amu *AggregateMatchersUsage) {
@@ -281,45 +318,30 @@ func (am *alertmanager) aggregateInhibitMatchers(rules []config.InhibitRule, amu
 // applyConfig applies a new configuration by re-initializing all components using the configuration provided.
 // It returns a boolean indicating whether the user config was changed and an error.
 // It is not safe to call concurrently.
-func (am *alertmanager) applyConfig(cfg *apimodels.PostableUserConfig, rawConfig []byte) (bool, error) {
+func (am *alertmanager) applyConfig(cfg *apimodels.PostableUserConfig) (bool, error) {
 	// First, let's make sure this config is not already loaded
-	var amConfigChanged bool
-	if rawConfig == nil {
-		enc, err := json.Marshal(cfg.AlertmanagerConfig)
-		if err != nil {
-			// In theory, this should never happen.
-			return false, err
-		}
-		rawConfig = enc
-	}
-
-	if am.Base.ConfigHash() != md5.Sum(rawConfig) {
-		amConfigChanged = true
-	}
-
-	if cfg.TemplateFiles == nil {
-		cfg.TemplateFiles = map[string]string{}
-	}
-	cfg.TemplateFiles["__default__.tmpl"] = alertingTemplates.DefaultTemplateString
-
-	// next, we need to make sure we persist the templates to disk.
-	paths, templatesChanged, err := PersistTemplates(am.logger, cfg, am.Base.WorkingDirectory())
+	rawConfig, err := json.Marshal(cfg)
 	if err != nil {
+		// In theory, this should never happen.
 		return false, err
 	}
-	cfg.AlertmanagerConfig.Templates = paths
 
-	// If neither the configuration nor templates have changed, we've got nothing to do.
-	if !amConfigChanged && !templatesChanged {
-		am.logger.Debug("Neither config nor template have changed, skipping configuration sync.")
+	// If configuration hasn't changed, we've got nothing to do.
+	configHash := md5.Sum(rawConfig)
+	if am.Base.ConfigHash() == configHash {
+		am.logger.Debug("Config hasn't changed, skipping configuration sync.")
 		return false, nil
 	}
 
-	am.updateConfigMetrics(cfg)
-
+	am.logger.Info("Applying new configuration to Alertmanager", "configHash", fmt.Sprintf("%x", configHash))
 	err = am.Base.ApplyConfig(AlertingConfiguration{
 		rawAlertmanagerConfig:    rawConfig,
-		alertmanagerConfig:       cfg.AlertmanagerConfig,
+		configHash:               configHash,
+		route:                    cfg.AlertmanagerConfig.Route.AsAMRoute(),
+		inhibitRules:             cfg.AlertmanagerConfig.InhibitRules,
+		muteTimeIntervals:        cfg.AlertmanagerConfig.MuteTimeIntervals,
+		timeIntervals:            cfg.AlertmanagerConfig.TimeIntervals,
+		templates:                ToTemplateDefinitions(cfg),
 		receivers:                PostableApiAlertingConfigToApiReceivers(cfg.AlertmanagerConfig),
 		receiverIntegrationsFunc: am.buildReceiverIntegrations,
 	})
@@ -327,12 +349,13 @@ func (am *alertmanager) applyConfig(cfg *apimodels.PostableUserConfig, rawConfig
 		return false, err
 	}
 
+	am.updateConfigMetrics(cfg)
 	return true, nil
 }
 
 // applyAndMarkConfig applies a configuration and marks it as applied if no errors occur.
-func (am *alertmanager) applyAndMarkConfig(ctx context.Context, hash string, cfg *apimodels.PostableUserConfig, rawConfig []byte) error {
-	configChanged, err := am.applyConfig(cfg, rawConfig)
+func (am *alertmanager) applyAndMarkConfig(ctx context.Context, hash string, cfg *apimodels.PostableUserConfig) error {
+	configChanged, err := am.applyConfig(cfg)
 	if err != nil {
 		return err
 	}
@@ -395,14 +418,8 @@ func (am *alertmanager) PutAlerts(_ context.Context, postableAlerts apimodels.Po
 	return am.Base.PutAlerts(alerts)
 }
 
-func (am *alertmanager) OrgID() int64 {
-	return am.orgID
-}
-
-// CleanUp removes the directory containing the alertmanager files from disk.
-func (am *alertmanager) CleanUp() {
-	am.fileStore.CleanUp()
-}
+// CleanUp no-ops as no files are stored on disk.
+func (am *alertmanager) CleanUp() {}
 
 // AlertValidationError is the error capturing the validation errors
 // faced on the alerts.
@@ -425,3 +442,13 @@ func (e AlertValidationError) Error() string {
 type nilLimits struct{}
 
 func (n nilLimits) MaxNumberOfAggregationGroups() int { return 0 }
+
+// This function is taken from upstream, modified to take a [16]byte instead of a []byte.
+// https://github.com/prometheus/alertmanager/blob/30fa9cd44bc91c0d6adcc9985609bb08a09a127b/config/coordinator.go#L149-L156
+func hashAsMetricValue(data [16]byte) float64 {
+	// We only want 48 bits as a float64 only has a 53 bit mantissa.
+	smallSum := data[0:6]
+	bytes := make([]byte, 8)
+	copy(bytes, smallSum)
+	return float64(binary.LittleEndian.Uint64(bytes))
+}
diff --git a/pkg/services/ngalert/notifier/alertmanager_config.go b/pkg/services/ngalert/notifier/alertmanager_config.go
index e64eda6a858de..232f17a38997a 100644
--- a/pkg/services/ngalert/notifier/alertmanager_config.go
+++ b/pkg/services/ngalert/notifier/alertmanager_config.go
@@ -8,10 +8,25 @@ import (
 
 	"github.com/go-openapi/strfmt"
 
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/store"
 	"github.com/grafana/grafana/pkg/util"
+	"github.com/grafana/grafana/pkg/util/errutil"
+)
+
+var (
+	// ErrAlertmanagerReceiverInUse is primarily meant for when a receiver is used by a rule and is being deleted.
+	ErrAlertmanagerReceiverInUse = errutil.BadRequest("alerting.notifications.alertmanager.receiverInUse").MustTemplate("receiver [Name: {{ .Public.Receiver }}] is used by rule: {{ .Error }}",
+		errutil.WithPublic(
+			"receiver [Name: {{ .Public.Receiver }}] is used by rule",
+		))
+	// ErrAlertmanagerTimeIntervalInUse is primarily meant for when a time interval is used by a rule and is being deleted.
+	ErrAlertmanagerTimeIntervalInUse = errutil.BadRequest("alerting.notifications.alertmanager.intervalInUse").MustTemplate("time interval [Name: {{ .Public.Interval }}] is used by rule: {{ .Error }}",
+		errutil.WithPublic(
+			"time interval [Name: {{ .Public.Interval }}] is used by rule",
+		))
 )
 
 type UnknownReceiverError struct {
@@ -31,17 +46,51 @@ func (e AlertmanagerConfigRejectedError) Error() string {
 }
 
 type configurationStore interface {
-	GetLatestAlertmanagerConfiguration(ctx context.Context, query *models.GetLatestAlertmanagerConfigurationQuery) (*models.AlertConfiguration, error)
+	GetLatestAlertmanagerConfiguration(ctx context.Context, orgID int64) (*models.AlertConfiguration, error)
+}
+
+// ApplyConfig will apply the given alertmanager configuration for a given org.
+// Can be used to force regeneration of autogenerated routes.
+func (moa *MultiOrgAlertmanager) ApplyConfig(ctx context.Context, orgId int64, dbConfig *models.AlertConfiguration) error {
+	am, err := moa.AlertmanagerFor(orgId)
+	if err != nil {
+		// It's okay if the alertmanager isn't ready yet, we're changing its config anyway.
+		if !errors.Is(err, ErrAlertmanagerNotReady) {
+			return err
+		}
+	}
+
+	err = am.ApplyConfig(ctx, dbConfig)
+	if err != nil {
+		return fmt.Errorf("failed to apply configuration: %w", err)
+	}
+	return nil
 }
 
-func (moa *MultiOrgAlertmanager) GetAlertmanagerConfiguration(ctx context.Context, org int64) (definitions.GettableUserConfig, error) {
-	query := models.GetLatestAlertmanagerConfigurationQuery{OrgID: org}
-	amConfig, err := moa.configStore.GetLatestAlertmanagerConfiguration(ctx, &query)
+// GetAlertmanagerConfiguration returns the latest alertmanager configuration for a given org.
+// If withAutogen is true, the configuration will be augmented with autogenerated routes.
+func (moa *MultiOrgAlertmanager) GetAlertmanagerConfiguration(ctx context.Context, org int64, withAutogen bool) (definitions.GettableUserConfig, error) {
+	amConfig, err := moa.configStore.GetLatestAlertmanagerConfiguration(ctx, org)
 	if err != nil {
 		return definitions.GettableUserConfig{}, fmt.Errorf("failed to get latest configuration: %w", err)
 	}
 
-	return moa.gettableUserConfigFromAMConfigString(ctx, org, amConfig.AlertmanagerConfiguration)
+	cfg, err := moa.gettableUserConfigFromAMConfigString(ctx, org, amConfig.AlertmanagerConfiguration)
+	if err != nil {
+		return definitions.GettableUserConfig{}, err
+	}
+
+	if moa.featureManager.IsEnabled(ctx, featuremgmt.FlagAlertingSimplifiedRouting) && withAutogen {
+		// We validate the notification settings in a similar way to when we POST.
+		// Otherwise, broken settings (e.g. a receiver that doesn't exist) will cause the config returned here to be
+		// different than the config currently in-use.
+		// TODO: Preferably, we'd be getting the config directly from the in-memory AM so adding the autogen config would not be necessary.
+		err := AddAutogenConfig(ctx, moa.logger, moa.configStore, org, &cfg.AlertmanagerConfig, true)
+		if err != nil {
+			return definitions.GettableUserConfig{}, err
+		}
+	}
+	return cfg, nil
 }
 
 // ActivateHistoricalConfiguration will set the current alertmanager configuration to a previous value based on the provided
@@ -109,6 +158,7 @@ func (moa *MultiOrgAlertmanager) gettableUserConfigFromAMConfigString(ctx contex
 	if err != nil {
 		return definitions.GettableUserConfig{}, fmt.Errorf("failed to unmarshal alertmanager configuration: %w", err)
 	}
+
 	result := definitions.GettableUserConfig{
 		TemplateFiles: cfg.TemplateFiles,
 		AlertmanagerConfig: definitions.GettableApiAlertingConfig{
@@ -156,10 +206,16 @@ func (moa *MultiOrgAlertmanager) gettableUserConfigFromAMConfigString(ctx contex
 	return result, nil
 }
 
-func (moa *MultiOrgAlertmanager) ApplyAlertmanagerConfiguration(ctx context.Context, org int64, config definitions.PostableUserConfig) error {
+func (moa *MultiOrgAlertmanager) SaveAndApplyAlertmanagerConfiguration(ctx context.Context, org int64, config definitions.PostableUserConfig) error {
+	// We cannot add this validation to PostableUserConfig as that struct is used for both
+	// Grafana Alertmanager (where inhibition rules are not supported) and External Alertmanagers
+	// (including Mimir) where inhibition rules are supported.
+	if len(config.AlertmanagerConfig.InhibitRules) > 0 {
+		return errors.New("inhibition rules are not supported")
+	}
+
 	// Get the last known working configuration
-	query := models.GetLatestAlertmanagerConfigurationQuery{OrgID: org}
-	_, err := moa.configStore.GetLatestAlertmanagerConfiguration(ctx, &query)
+	_, err := moa.configStore.GetLatestAlertmanagerConfiguration(ctx, org)
 	if err != nil {
 		// If we don't have a configuration there's nothing for us to know and we should just continue saving the new one
 		if !errors.Is(err, store.ErrNoAlertmanagerConfiguration) {
@@ -185,6 +241,14 @@ func (moa *MultiOrgAlertmanager) ApplyAlertmanagerConfiguration(ctx context.Cont
 
 	if err := am.SaveAndApplyConfig(ctx, &config); err != nil {
 		moa.logger.Error("Unable to save and apply alertmanager configuration", "error", err)
+		errReceiverDoesNotExist := ErrorReceiverDoesNotExist{}
+		if errors.As(err, &errReceiverDoesNotExist) {
+			return ErrAlertmanagerReceiverInUse.Build(errutil.TemplateData{Public: map[string]interface{}{"Receiver": errReceiverDoesNotExist.Reference}, Error: err})
+		}
+		errTimeIntervalDoesNotExist := ErrorTimeIntervalDoesNotExist{}
+		if errors.As(err, &errTimeIntervalDoesNotExist) {
+			return ErrAlertmanagerTimeIntervalInUse.Build(errutil.TemplateData{Public: map[string]interface{}{"Interval": errTimeIntervalDoesNotExist.Reference}, Error: err})
+		}
 		return AlertmanagerConfigRejectedError{err}
 	}
 
diff --git a/pkg/services/ngalert/notifier/alertmanager_mock/Alertmanager.go b/pkg/services/ngalert/notifier/alertmanager_mock/Alertmanager.go
new file mode 100644
index 0000000000000..fa94d199e6521
--- /dev/null
+++ b/pkg/services/ngalert/notifier/alertmanager_mock/Alertmanager.go
@@ -0,0 +1,848 @@
+// Code generated by mockery v2.34.2. DO NOT EDIT.
+
+package alertmanager_mock
+
+import (
+	context "context"
+
+	definitions "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	mock "github.com/stretchr/testify/mock"
+
+	models "github.com/grafana/grafana/pkg/services/ngalert/models"
+
+	notifier "github.com/grafana/grafana/pkg/services/ngalert/notifier"
+
+	notify "github.com/grafana/alerting/notify"
+
+	v2models "github.com/prometheus/alertmanager/api/v2/models"
+)
+
+// AlertmanagerMock is an autogenerated mock type for the Alertmanager type
+type AlertmanagerMock struct {
+	mock.Mock
+}
+
+type AlertmanagerMock_Expecter struct {
+	mock *mock.Mock
+}
+
+func (_m *AlertmanagerMock) EXPECT() *AlertmanagerMock_Expecter {
+	return &AlertmanagerMock_Expecter{mock: &_m.Mock}
+}
+
+// ApplyConfig provides a mock function with given fields: _a0, _a1
+func (_m *AlertmanagerMock) ApplyConfig(_a0 context.Context, _a1 *models.AlertConfiguration) error {
+	ret := _m.Called(_a0, _a1)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, *models.AlertConfiguration) error); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// AlertmanagerMock_ApplyConfig_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ApplyConfig'
+type AlertmanagerMock_ApplyConfig_Call struct {
+	*mock.Call
+}
+
+// ApplyConfig is a helper method to define mock.On call
+//   - _a0 context.Context
+//   - _a1 *models.AlertConfiguration
+func (_e *AlertmanagerMock_Expecter) ApplyConfig(_a0 interface{}, _a1 interface{}) *AlertmanagerMock_ApplyConfig_Call {
+	return &AlertmanagerMock_ApplyConfig_Call{Call: _e.mock.On("ApplyConfig", _a0, _a1)}
+}
+
+func (_c *AlertmanagerMock_ApplyConfig_Call) Run(run func(_a0 context.Context, _a1 *models.AlertConfiguration)) *AlertmanagerMock_ApplyConfig_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*models.AlertConfiguration))
+	})
+	return _c
+}
+
+func (_c *AlertmanagerMock_ApplyConfig_Call) Return(_a0 error) *AlertmanagerMock_ApplyConfig_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *AlertmanagerMock_ApplyConfig_Call) RunAndReturn(run func(context.Context, *models.AlertConfiguration) error) *AlertmanagerMock_ApplyConfig_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// CleanUp provides a mock function with given fields:
+func (_m *AlertmanagerMock) CleanUp() {
+	_m.Called()
+}
+
+// AlertmanagerMock_CleanUp_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CleanUp'
+type AlertmanagerMock_CleanUp_Call struct {
+	*mock.Call
+}
+
+// CleanUp is a helper method to define mock.On call
+func (_e *AlertmanagerMock_Expecter) CleanUp() *AlertmanagerMock_CleanUp_Call {
+	return &AlertmanagerMock_CleanUp_Call{Call: _e.mock.On("CleanUp")}
+}
+
+func (_c *AlertmanagerMock_CleanUp_Call) Run(run func()) *AlertmanagerMock_CleanUp_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *AlertmanagerMock_CleanUp_Call) Return() *AlertmanagerMock_CleanUp_Call {
+	_c.Call.Return()
+	return _c
+}
+
+func (_c *AlertmanagerMock_CleanUp_Call) RunAndReturn(run func()) *AlertmanagerMock_CleanUp_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// CreateSilence provides a mock function with given fields: _a0, _a1
+func (_m *AlertmanagerMock) CreateSilence(_a0 context.Context, _a1 *v2models.PostableSilence) (string, error) {
+	ret := _m.Called(_a0, _a1)
+
+	var r0 string
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *v2models.PostableSilence) (string, error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *v2models.PostableSilence) string); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		r0 = ret.Get(0).(string)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *v2models.PostableSilence) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// AlertmanagerMock_CreateSilence_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CreateSilence'
+type AlertmanagerMock_CreateSilence_Call struct {
+	*mock.Call
+}
+
+// CreateSilence is a helper method to define mock.On call
+//   - _a0 context.Context
+//   - _a1 *v2models.PostableSilence
+func (_e *AlertmanagerMock_Expecter) CreateSilence(_a0 interface{}, _a1 interface{}) *AlertmanagerMock_CreateSilence_Call {
+	return &AlertmanagerMock_CreateSilence_Call{Call: _e.mock.On("CreateSilence", _a0, _a1)}
+}
+
+func (_c *AlertmanagerMock_CreateSilence_Call) Run(run func(_a0 context.Context, _a1 *v2models.PostableSilence)) *AlertmanagerMock_CreateSilence_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*v2models.PostableSilence))
+	})
+	return _c
+}
+
+func (_c *AlertmanagerMock_CreateSilence_Call) Return(_a0 string, _a1 error) *AlertmanagerMock_CreateSilence_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *AlertmanagerMock_CreateSilence_Call) RunAndReturn(run func(context.Context, *v2models.PostableSilence) (string, error)) *AlertmanagerMock_CreateSilence_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// DeleteSilence provides a mock function with given fields: _a0, _a1
+func (_m *AlertmanagerMock) DeleteSilence(_a0 context.Context, _a1 string) error {
+	ret := _m.Called(_a0, _a1)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, string) error); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// AlertmanagerMock_DeleteSilence_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'DeleteSilence'
+type AlertmanagerMock_DeleteSilence_Call struct {
+	*mock.Call
+}
+
+// DeleteSilence is a helper method to define mock.On call
+//   - _a0 context.Context
+//   - _a1 string
+func (_e *AlertmanagerMock_Expecter) DeleteSilence(_a0 interface{}, _a1 interface{}) *AlertmanagerMock_DeleteSilence_Call {
+	return &AlertmanagerMock_DeleteSilence_Call{Call: _e.mock.On("DeleteSilence", _a0, _a1)}
+}
+
+func (_c *AlertmanagerMock_DeleteSilence_Call) Run(run func(_a0 context.Context, _a1 string)) *AlertmanagerMock_DeleteSilence_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(string))
+	})
+	return _c
+}
+
+func (_c *AlertmanagerMock_DeleteSilence_Call) Return(_a0 error) *AlertmanagerMock_DeleteSilence_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *AlertmanagerMock_DeleteSilence_Call) RunAndReturn(run func(context.Context, string) error) *AlertmanagerMock_DeleteSilence_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// GetAlertGroups provides a mock function with given fields: ctx, active, silenced, inhibited, filter, receiver
+func (_m *AlertmanagerMock) GetAlertGroups(ctx context.Context, active bool, silenced bool, inhibited bool, filter []string, receiver string) (v2models.AlertGroups, error) {
+	ret := _m.Called(ctx, active, silenced, inhibited, filter, receiver)
+
+	var r0 v2models.AlertGroups
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, bool, bool, bool, []string, string) (v2models.AlertGroups, error)); ok {
+		return rf(ctx, active, silenced, inhibited, filter, receiver)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, bool, bool, bool, []string, string) v2models.AlertGroups); ok {
+		r0 = rf(ctx, active, silenced, inhibited, filter, receiver)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(v2models.AlertGroups)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, bool, bool, bool, []string, string) error); ok {
+		r1 = rf(ctx, active, silenced, inhibited, filter, receiver)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// AlertmanagerMock_GetAlertGroups_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetAlertGroups'
+type AlertmanagerMock_GetAlertGroups_Call struct {
+	*mock.Call
+}
+
+// GetAlertGroups is a helper method to define mock.On call
+//   - ctx context.Context
+//   - active bool
+//   - silenced bool
+//   - inhibited bool
+//   - filter []string
+//   - receiver string
+func (_e *AlertmanagerMock_Expecter) GetAlertGroups(ctx interface{}, active interface{}, silenced interface{}, inhibited interface{}, filter interface{}, receiver interface{}) *AlertmanagerMock_GetAlertGroups_Call {
+	return &AlertmanagerMock_GetAlertGroups_Call{Call: _e.mock.On("GetAlertGroups", ctx, active, silenced, inhibited, filter, receiver)}
+}
+
+func (_c *AlertmanagerMock_GetAlertGroups_Call) Run(run func(ctx context.Context, active bool, silenced bool, inhibited bool, filter []string, receiver string)) *AlertmanagerMock_GetAlertGroups_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(bool), args[2].(bool), args[3].(bool), args[4].([]string), args[5].(string))
+	})
+	return _c
+}
+
+func (_c *AlertmanagerMock_GetAlertGroups_Call) Return(_a0 v2models.AlertGroups, _a1 error) *AlertmanagerMock_GetAlertGroups_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *AlertmanagerMock_GetAlertGroups_Call) RunAndReturn(run func(context.Context, bool, bool, bool, []string, string) (v2models.AlertGroups, error)) *AlertmanagerMock_GetAlertGroups_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// GetAlerts provides a mock function with given fields: ctx, active, silenced, inhibited, filter, receiver
+func (_m *AlertmanagerMock) GetAlerts(ctx context.Context, active bool, silenced bool, inhibited bool, filter []string, receiver string) (v2models.GettableAlerts, error) {
+	ret := _m.Called(ctx, active, silenced, inhibited, filter, receiver)
+
+	var r0 v2models.GettableAlerts
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, bool, bool, bool, []string, string) (v2models.GettableAlerts, error)); ok {
+		return rf(ctx, active, silenced, inhibited, filter, receiver)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, bool, bool, bool, []string, string) v2models.GettableAlerts); ok {
+		r0 = rf(ctx, active, silenced, inhibited, filter, receiver)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(v2models.GettableAlerts)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, bool, bool, bool, []string, string) error); ok {
+		r1 = rf(ctx, active, silenced, inhibited, filter, receiver)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// AlertmanagerMock_GetAlerts_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetAlerts'
+type AlertmanagerMock_GetAlerts_Call struct {
+	*mock.Call
+}
+
+// GetAlerts is a helper method to define mock.On call
+//   - ctx context.Context
+//   - active bool
+//   - silenced bool
+//   - inhibited bool
+//   - filter []string
+//   - receiver string
+func (_e *AlertmanagerMock_Expecter) GetAlerts(ctx interface{}, active interface{}, silenced interface{}, inhibited interface{}, filter interface{}, receiver interface{}) *AlertmanagerMock_GetAlerts_Call {
+	return &AlertmanagerMock_GetAlerts_Call{Call: _e.mock.On("GetAlerts", ctx, active, silenced, inhibited, filter, receiver)}
+}
+
+func (_c *AlertmanagerMock_GetAlerts_Call) Run(run func(ctx context.Context, active bool, silenced bool, inhibited bool, filter []string, receiver string)) *AlertmanagerMock_GetAlerts_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(bool), args[2].(bool), args[3].(bool), args[4].([]string), args[5].(string))
+	})
+	return _c
+}
+
+func (_c *AlertmanagerMock_GetAlerts_Call) Return(_a0 v2models.GettableAlerts, _a1 error) *AlertmanagerMock_GetAlerts_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *AlertmanagerMock_GetAlerts_Call) RunAndReturn(run func(context.Context, bool, bool, bool, []string, string) (v2models.GettableAlerts, error)) *AlertmanagerMock_GetAlerts_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// GetReceivers provides a mock function with given fields: ctx
+func (_m *AlertmanagerMock) GetReceivers(ctx context.Context) ([]v2models.Receiver, error) {
+	ret := _m.Called(ctx)
+
+	var r0 []v2models.Receiver
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context) ([]v2models.Receiver, error)); ok {
+		return rf(ctx)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context) []v2models.Receiver); ok {
+		r0 = rf(ctx)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]v2models.Receiver)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context) error); ok {
+		r1 = rf(ctx)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// AlertmanagerMock_GetReceivers_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetReceivers'
+type AlertmanagerMock_GetReceivers_Call struct {
+	*mock.Call
+}
+
+// GetReceivers is a helper method to define mock.On call
+//   - ctx context.Context
+func (_e *AlertmanagerMock_Expecter) GetReceivers(ctx interface{}) *AlertmanagerMock_GetReceivers_Call {
+	return &AlertmanagerMock_GetReceivers_Call{Call: _e.mock.On("GetReceivers", ctx)}
+}
+
+func (_c *AlertmanagerMock_GetReceivers_Call) Run(run func(ctx context.Context)) *AlertmanagerMock_GetReceivers_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context))
+	})
+	return _c
+}
+
+func (_c *AlertmanagerMock_GetReceivers_Call) Return(_a0 []v2models.Receiver, _a1 error) *AlertmanagerMock_GetReceivers_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *AlertmanagerMock_GetReceivers_Call) RunAndReturn(run func(context.Context) ([]v2models.Receiver, error)) *AlertmanagerMock_GetReceivers_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// GetSilence provides a mock function with given fields: _a0, _a1
+func (_m *AlertmanagerMock) GetSilence(_a0 context.Context, _a1 string) (v2models.GettableSilence, error) {
+	ret := _m.Called(_a0, _a1)
+
+	var r0 v2models.GettableSilence
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, string) (v2models.GettableSilence, error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, string) v2models.GettableSilence); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		r0 = ret.Get(0).(v2models.GettableSilence)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, string) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// AlertmanagerMock_GetSilence_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetSilence'
+type AlertmanagerMock_GetSilence_Call struct {
+	*mock.Call
+}
+
+// GetSilence is a helper method to define mock.On call
+//   - _a0 context.Context
+//   - _a1 string
+func (_e *AlertmanagerMock_Expecter) GetSilence(_a0 interface{}, _a1 interface{}) *AlertmanagerMock_GetSilence_Call {
+	return &AlertmanagerMock_GetSilence_Call{Call: _e.mock.On("GetSilence", _a0, _a1)}
+}
+
+func (_c *AlertmanagerMock_GetSilence_Call) Run(run func(_a0 context.Context, _a1 string)) *AlertmanagerMock_GetSilence_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(string))
+	})
+	return _c
+}
+
+func (_c *AlertmanagerMock_GetSilence_Call) Return(_a0 v2models.GettableSilence, _a1 error) *AlertmanagerMock_GetSilence_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *AlertmanagerMock_GetSilence_Call) RunAndReturn(run func(context.Context, string) (v2models.GettableSilence, error)) *AlertmanagerMock_GetSilence_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// GetStatus provides a mock function with given fields:
+func (_m *AlertmanagerMock) GetStatus() definitions.GettableStatus {
+	ret := _m.Called()
+
+	var r0 definitions.GettableStatus
+	if rf, ok := ret.Get(0).(func() definitions.GettableStatus); ok {
+		r0 = rf()
+	} else {
+		r0 = ret.Get(0).(definitions.GettableStatus)
+	}
+
+	return r0
+}
+
+// AlertmanagerMock_GetStatus_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetStatus'
+type AlertmanagerMock_GetStatus_Call struct {
+	*mock.Call
+}
+
+// GetStatus is a helper method to define mock.On call
+func (_e *AlertmanagerMock_Expecter) GetStatus() *AlertmanagerMock_GetStatus_Call {
+	return &AlertmanagerMock_GetStatus_Call{Call: _e.mock.On("GetStatus")}
+}
+
+func (_c *AlertmanagerMock_GetStatus_Call) Run(run func()) *AlertmanagerMock_GetStatus_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *AlertmanagerMock_GetStatus_Call) Return(_a0 definitions.GettableStatus) *AlertmanagerMock_GetStatus_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *AlertmanagerMock_GetStatus_Call) RunAndReturn(run func() definitions.GettableStatus) *AlertmanagerMock_GetStatus_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ListSilences provides a mock function with given fields: _a0, _a1
+func (_m *AlertmanagerMock) ListSilences(_a0 context.Context, _a1 []string) (v2models.GettableSilences, error) {
+	ret := _m.Called(_a0, _a1)
+
+	var r0 v2models.GettableSilences
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, []string) (v2models.GettableSilences, error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, []string) v2models.GettableSilences); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(v2models.GettableSilences)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, []string) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// AlertmanagerMock_ListSilences_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ListSilences'
+type AlertmanagerMock_ListSilences_Call struct {
+	*mock.Call
+}
+
+// ListSilences is a helper method to define mock.On call
+//   - _a0 context.Context
+//   - _a1 []string
+func (_e *AlertmanagerMock_Expecter) ListSilences(_a0 interface{}, _a1 interface{}) *AlertmanagerMock_ListSilences_Call {
+	return &AlertmanagerMock_ListSilences_Call{Call: _e.mock.On("ListSilences", _a0, _a1)}
+}
+
+func (_c *AlertmanagerMock_ListSilences_Call) Run(run func(_a0 context.Context, _a1 []string)) *AlertmanagerMock_ListSilences_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].([]string))
+	})
+	return _c
+}
+
+func (_c *AlertmanagerMock_ListSilences_Call) Return(_a0 v2models.GettableSilences, _a1 error) *AlertmanagerMock_ListSilences_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *AlertmanagerMock_ListSilences_Call) RunAndReturn(run func(context.Context, []string) (v2models.GettableSilences, error)) *AlertmanagerMock_ListSilences_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// PutAlerts provides a mock function with given fields: _a0, _a1
+func (_m *AlertmanagerMock) PutAlerts(_a0 context.Context, _a1 definitions.PostableAlerts) error {
+	ret := _m.Called(_a0, _a1)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, definitions.PostableAlerts) error); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// AlertmanagerMock_PutAlerts_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'PutAlerts'
+type AlertmanagerMock_PutAlerts_Call struct {
+	*mock.Call
+}
+
+// PutAlerts is a helper method to define mock.On call
+//   - _a0 context.Context
+//   - _a1 definitions.PostableAlerts
+func (_e *AlertmanagerMock_Expecter) PutAlerts(_a0 interface{}, _a1 interface{}) *AlertmanagerMock_PutAlerts_Call {
+	return &AlertmanagerMock_PutAlerts_Call{Call: _e.mock.On("PutAlerts", _a0, _a1)}
+}
+
+func (_c *AlertmanagerMock_PutAlerts_Call) Run(run func(_a0 context.Context, _a1 definitions.PostableAlerts)) *AlertmanagerMock_PutAlerts_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(definitions.PostableAlerts))
+	})
+	return _c
+}
+
+func (_c *AlertmanagerMock_PutAlerts_Call) Return(_a0 error) *AlertmanagerMock_PutAlerts_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *AlertmanagerMock_PutAlerts_Call) RunAndReturn(run func(context.Context, definitions.PostableAlerts) error) *AlertmanagerMock_PutAlerts_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Ready provides a mock function with given fields:
+func (_m *AlertmanagerMock) Ready() bool {
+	ret := _m.Called()
+
+	var r0 bool
+	if rf, ok := ret.Get(0).(func() bool); ok {
+		r0 = rf()
+	} else {
+		r0 = ret.Get(0).(bool)
+	}
+
+	return r0
+}
+
+// AlertmanagerMock_Ready_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Ready'
+type AlertmanagerMock_Ready_Call struct {
+	*mock.Call
+}
+
+// Ready is a helper method to define mock.On call
+func (_e *AlertmanagerMock_Expecter) Ready() *AlertmanagerMock_Ready_Call {
+	return &AlertmanagerMock_Ready_Call{Call: _e.mock.On("Ready")}
+}
+
+func (_c *AlertmanagerMock_Ready_Call) Run(run func()) *AlertmanagerMock_Ready_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *AlertmanagerMock_Ready_Call) Return(_a0 bool) *AlertmanagerMock_Ready_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *AlertmanagerMock_Ready_Call) RunAndReturn(run func() bool) *AlertmanagerMock_Ready_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// SaveAndApplyConfig provides a mock function with given fields: ctx, config
+func (_m *AlertmanagerMock) SaveAndApplyConfig(ctx context.Context, config *definitions.PostableUserConfig) error {
+	ret := _m.Called(ctx, config)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, *definitions.PostableUserConfig) error); ok {
+		r0 = rf(ctx, config)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// AlertmanagerMock_SaveAndApplyConfig_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SaveAndApplyConfig'
+type AlertmanagerMock_SaveAndApplyConfig_Call struct {
+	*mock.Call
+}
+
+// SaveAndApplyConfig is a helper method to define mock.On call
+//   - ctx context.Context
+//   - config *definitions.PostableUserConfig
+func (_e *AlertmanagerMock_Expecter) SaveAndApplyConfig(ctx interface{}, config interface{}) *AlertmanagerMock_SaveAndApplyConfig_Call {
+	return &AlertmanagerMock_SaveAndApplyConfig_Call{Call: _e.mock.On("SaveAndApplyConfig", ctx, config)}
+}
+
+func (_c *AlertmanagerMock_SaveAndApplyConfig_Call) Run(run func(ctx context.Context, config *definitions.PostableUserConfig)) *AlertmanagerMock_SaveAndApplyConfig_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*definitions.PostableUserConfig))
+	})
+	return _c
+}
+
+func (_c *AlertmanagerMock_SaveAndApplyConfig_Call) Return(_a0 error) *AlertmanagerMock_SaveAndApplyConfig_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *AlertmanagerMock_SaveAndApplyConfig_Call) RunAndReturn(run func(context.Context, *definitions.PostableUserConfig) error) *AlertmanagerMock_SaveAndApplyConfig_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// SaveAndApplyDefaultConfig provides a mock function with given fields: ctx
+func (_m *AlertmanagerMock) SaveAndApplyDefaultConfig(ctx context.Context) error {
+	ret := _m.Called(ctx)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
+		r0 = rf(ctx)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// AlertmanagerMock_SaveAndApplyDefaultConfig_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SaveAndApplyDefaultConfig'
+type AlertmanagerMock_SaveAndApplyDefaultConfig_Call struct {
+	*mock.Call
+}
+
+// SaveAndApplyDefaultConfig is a helper method to define mock.On call
+//   - ctx context.Context
+func (_e *AlertmanagerMock_Expecter) SaveAndApplyDefaultConfig(ctx interface{}) *AlertmanagerMock_SaveAndApplyDefaultConfig_Call {
+	return &AlertmanagerMock_SaveAndApplyDefaultConfig_Call{Call: _e.mock.On("SaveAndApplyDefaultConfig", ctx)}
+}
+
+func (_c *AlertmanagerMock_SaveAndApplyDefaultConfig_Call) Run(run func(ctx context.Context)) *AlertmanagerMock_SaveAndApplyDefaultConfig_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context))
+	})
+	return _c
+}
+
+func (_c *AlertmanagerMock_SaveAndApplyDefaultConfig_Call) Return(_a0 error) *AlertmanagerMock_SaveAndApplyDefaultConfig_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *AlertmanagerMock_SaveAndApplyDefaultConfig_Call) RunAndReturn(run func(context.Context) error) *AlertmanagerMock_SaveAndApplyDefaultConfig_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// StopAndWait provides a mock function with given fields:
+func (_m *AlertmanagerMock) StopAndWait() {
+	_m.Called()
+}
+
+// AlertmanagerMock_StopAndWait_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'StopAndWait'
+type AlertmanagerMock_StopAndWait_Call struct {
+	*mock.Call
+}
+
+// StopAndWait is a helper method to define mock.On call
+func (_e *AlertmanagerMock_Expecter) StopAndWait() *AlertmanagerMock_StopAndWait_Call {
+	return &AlertmanagerMock_StopAndWait_Call{Call: _e.mock.On("StopAndWait")}
+}
+
+func (_c *AlertmanagerMock_StopAndWait_Call) Run(run func()) *AlertmanagerMock_StopAndWait_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *AlertmanagerMock_StopAndWait_Call) Return() *AlertmanagerMock_StopAndWait_Call {
+	_c.Call.Return()
+	return _c
+}
+
+func (_c *AlertmanagerMock_StopAndWait_Call) RunAndReturn(run func()) *AlertmanagerMock_StopAndWait_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// TestReceivers provides a mock function with given fields: ctx, c
+func (_m *AlertmanagerMock) TestReceivers(ctx context.Context, c definitions.TestReceiversConfigBodyParams) (*notifier.TestReceiversResult, error) {
+	ret := _m.Called(ctx, c)
+
+	var r0 *notifier.TestReceiversResult
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, definitions.TestReceiversConfigBodyParams) (*notifier.TestReceiversResult, error)); ok {
+		return rf(ctx, c)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, definitions.TestReceiversConfigBodyParams) *notifier.TestReceiversResult); ok {
+		r0 = rf(ctx, c)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*notifier.TestReceiversResult)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, definitions.TestReceiversConfigBodyParams) error); ok {
+		r1 = rf(ctx, c)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// AlertmanagerMock_TestReceivers_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'TestReceivers'
+type AlertmanagerMock_TestReceivers_Call struct {
+	*mock.Call
+}
+
+// TestReceivers is a helper method to define mock.On call
+//   - ctx context.Context
+//   - c definitions.TestReceiversConfigBodyParams
+func (_e *AlertmanagerMock_Expecter) TestReceivers(ctx interface{}, c interface{}) *AlertmanagerMock_TestReceivers_Call {
+	return &AlertmanagerMock_TestReceivers_Call{Call: _e.mock.On("TestReceivers", ctx, c)}
+}
+
+func (_c *AlertmanagerMock_TestReceivers_Call) Run(run func(ctx context.Context, c definitions.TestReceiversConfigBodyParams)) *AlertmanagerMock_TestReceivers_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(definitions.TestReceiversConfigBodyParams))
+	})
+	return _c
+}
+
+func (_c *AlertmanagerMock_TestReceivers_Call) Return(_a0 *notifier.TestReceiversResult, _a1 error) *AlertmanagerMock_TestReceivers_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *AlertmanagerMock_TestReceivers_Call) RunAndReturn(run func(context.Context, definitions.TestReceiversConfigBodyParams) (*notifier.TestReceiversResult, error)) *AlertmanagerMock_TestReceivers_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// TestTemplate provides a mock function with given fields: ctx, c
+func (_m *AlertmanagerMock) TestTemplate(ctx context.Context, c definitions.TestTemplatesConfigBodyParams) (*notify.TestTemplatesResults, error) {
+	ret := _m.Called(ctx, c)
+
+	var r0 *notify.TestTemplatesResults
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, definitions.TestTemplatesConfigBodyParams) (*notify.TestTemplatesResults, error)); ok {
+		return rf(ctx, c)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, definitions.TestTemplatesConfigBodyParams) *notify.TestTemplatesResults); ok {
+		r0 = rf(ctx, c)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*notify.TestTemplatesResults)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, definitions.TestTemplatesConfigBodyParams) error); ok {
+		r1 = rf(ctx, c)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// AlertmanagerMock_TestTemplate_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'TestTemplate'
+type AlertmanagerMock_TestTemplate_Call struct {
+	*mock.Call
+}
+
+// TestTemplate is a helper method to define mock.On call
+//   - ctx context.Context
+//   - c definitions.TestTemplatesConfigBodyParams
+func (_e *AlertmanagerMock_Expecter) TestTemplate(ctx interface{}, c interface{}) *AlertmanagerMock_TestTemplate_Call {
+	return &AlertmanagerMock_TestTemplate_Call{Call: _e.mock.On("TestTemplate", ctx, c)}
+}
+
+func (_c *AlertmanagerMock_TestTemplate_Call) Run(run func(ctx context.Context, c definitions.TestTemplatesConfigBodyParams)) *AlertmanagerMock_TestTemplate_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(definitions.TestTemplatesConfigBodyParams))
+	})
+	return _c
+}
+
+func (_c *AlertmanagerMock_TestTemplate_Call) Return(_a0 *notify.TestTemplatesResults, _a1 error) *AlertmanagerMock_TestTemplate_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *AlertmanagerMock_TestTemplate_Call) RunAndReturn(run func(context.Context, definitions.TestTemplatesConfigBodyParams) (*notify.TestTemplatesResults, error)) *AlertmanagerMock_TestTemplate_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// NewAlertmanagerMock creates a new instance of AlertmanagerMock. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewAlertmanagerMock(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *AlertmanagerMock {
+	mock := &AlertmanagerMock{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/pkg/services/ngalert/notifier/alertmanager_test.go b/pkg/services/ngalert/notifier/alertmanager_test.go
index e0a14bda177b5..caabe38bdb67d 100644
--- a/pkg/services/ngalert/notifier/alertmanager_test.go
+++ b/pkg/services/ngalert/notifier/alertmanager_test.go
@@ -17,8 +17,13 @@ import (
 	"github.com/grafana/grafana/pkg/services/secrets/database"
 	secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func setupAMTest(t *testing.T) *alertmanager {
 	dir := t.TempDir()
 	cfg := &setting.Cfg{
@@ -41,7 +46,11 @@ func setupAMTest(t *testing.T) *alertmanager {
 	kvStore := fakes.NewFakeKVStore(t)
 	secretsService := secretsManager.SetupTestService(t, database.ProvideSecretsStore(sqlStore))
 	decryptFn := secretsService.GetDecryptedValue
-	am, err := newAlertmanager(context.Background(), 1, cfg, s, kvStore, &NilPeer{}, decryptFn, nil, m)
+
+	orgID := 1
+	stateStore := NewFileStore(int64(orgID), kvStore)
+
+	am, err := NewAlertmanager(context.Background(), 1, cfg, s, stateStore, &NilPeer{}, decryptFn, nil, m, false)
 	require.NoError(t, err)
 	return am
 }
diff --git a/pkg/services/ngalert/notifier/autogen_alertmanager.go b/pkg/services/ngalert/notifier/autogen_alertmanager.go
new file mode 100644
index 0000000000000..80df43c9a0f83
--- /dev/null
+++ b/pkg/services/ngalert/notifier/autogen_alertmanager.go
@@ -0,0 +1,206 @@
+package notifier
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"slices"
+
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/prometheus/alertmanager/pkg/labels"
+	"github.com/prometheus/common/model"
+	"golang.org/x/exp/maps"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+)
+
+type autogenRuleStore interface {
+	ListNotificationSettings(ctx context.Context, q models.ListNotificationSettingsQuery) (map[models.AlertRuleKey][]models.NotificationSettings, error)
+}
+
+// AddAutogenConfig creates the autogenerated configuration and adds it to the given apiAlertingConfig.
+// If skipInvalid is true, then invalid notification settings are skipped, otherwise an error is returned.
+func AddAutogenConfig[R receiver](ctx context.Context, logger log.Logger, store autogenRuleStore, orgId int64, cfg apiAlertingConfig[R], skipInvalid bool) error {
+	autogenRoute, err := newAutogeneratedRoute(ctx, logger, store, orgId, cfg, skipInvalid)
+	if err != nil {
+		return err
+	}
+
+	err = autogenRoute.addToRoute(cfg.GetRoute())
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// newAutogeneratedRoute creates a new autogenerated route based on the notification settings for the given org.
+// cfg is used to construct the settings validator and to ensure we create a dedicated route for each receiver.
+// skipInvalid is used to skip invalid settings instead of returning an error.
+func newAutogeneratedRoute[R receiver](ctx context.Context, logger log.Logger, store autogenRuleStore, orgId int64, cfg apiAlertingConfig[R], skipInvalid bool) (autogeneratedRoute, error) {
+	settings, err := store.ListNotificationSettings(ctx, models.ListNotificationSettingsQuery{OrgID: orgId})
+	if err != nil {
+		return autogeneratedRoute{}, fmt.Errorf("failed to list alert rules: %w", err)
+	}
+
+	notificationSettings := make(map[data.Fingerprint]models.NotificationSettings)
+	// Add a default notification setting for each contact point. This is to ensure that we always have a route for each
+	// contact point even if no rules are using it. This will prevent race conditions between AM sync and rule sync.
+	for _, receiver := range cfg.GetReceivers() {
+		setting := models.NewDefaultNotificationSettings(receiver.GetName())
+		fp := setting.Fingerprint()
+		notificationSettings[fp] = setting
+	}
+
+	validator := NewNotificationSettingsValidator(cfg)
+	for ruleKey, ruleSettings := range settings {
+		for _, setting := range ruleSettings {
+			// TODO we should register this errors and somehow present to the users or make sure the config is always valid.
+			if err = validator.Validate(setting); err != nil {
+				if skipInvalid {
+					logger.Error("Rule notification settings are invalid. Skipping", append(ruleKey.LogContext(), "error", err)...)
+					continue
+				}
+				return autogeneratedRoute{}, fmt.Errorf("invalid notification settings for rule %s: %w", ruleKey.UID, err)
+			}
+			fp := setting.Fingerprint()
+			// Keep only unique settings.
+			if _, ok := notificationSettings[fp]; ok {
+				continue
+			}
+			notificationSettings[fp] = setting
+		}
+	}
+	if len(notificationSettings) == 0 {
+		return autogeneratedRoute{}, nil
+	}
+	newAutogenRoute, err := generateRouteFromSettings(cfg.GetRoute().Receiver, notificationSettings)
+	if err != nil {
+		return autogeneratedRoute{}, fmt.Errorf("failed to create autogenerated route: %w", err)
+	}
+	return newAutogenRoute, nil
+}
+
+type autogeneratedRoute struct {
+	Route *definitions.Route
+}
+
+// generateRouteFromSettings generates a route and fingerprint for this route. The route is a tree of 3 layers:
+//  1. with matcher by label models.AutogeneratedRouteLabel equals 'true'.
+//  2. with matcher by receiver name.
+//  3. with matcher by unique combination of optional settings. It is created only if there are optional settings.
+func generateRouteFromSettings(defaultReceiver string, settings map[data.Fingerprint]models.NotificationSettings) (autogeneratedRoute, error) {
+	keys := maps.Keys(settings)
+	// sort keys to make sure that the hash we calculate using it is stable
+	slices.Sort(keys)
+
+	rootMatcher, err := labels.NewMatcher(labels.MatchEqual, models.AutogeneratedRouteLabel, "true")
+	if err != nil {
+		return autogeneratedRoute{}, err
+	}
+
+	autoGenRoot := &definitions.Route{
+		Receiver:       defaultReceiver,
+		ObjectMatchers: definitions.ObjectMatchers{rootMatcher},
+		Continue:       false, // We explicitly don't continue toward user-created routes if this matches.
+	}
+
+	receiverRoutes := make(map[string]*definitions.Route)
+	for _, fingerprint := range keys {
+		s := settings[fingerprint]
+		receiverRoute, ok := receiverRoutes[s.Receiver]
+		if !ok {
+			contactMatcher, err := labels.NewMatcher(labels.MatchEqual, models.AutogeneratedRouteReceiverNameLabel, s.Receiver)
+			if err != nil {
+				return autogeneratedRoute{}, err
+			}
+			groupByStr := append([]string{}, models.DefaultNotificationSettingsGroupBy...)
+			groupByAll, groupBy := toGroupBy(groupByStr...)
+			receiverRoute = &definitions.Route{
+				Receiver:       s.Receiver,
+				ObjectMatchers: definitions.ObjectMatchers{contactMatcher},
+				Continue:       false,
+				// Since we'll have many rules from different folders using this policy, we ensure it has these necessary groupings.
+				GroupByStr: groupByStr,
+				GroupBy:    groupBy,
+				GroupByAll: groupByAll,
+			}
+			receiverRoutes[s.Receiver] = receiverRoute
+			autoGenRoot.Routes = append(autoGenRoot.Routes, receiverRoute)
+		}
+
+		// Do not create hash specific route if all group settings such as mute timings, group_wait, group_interval, etc are default
+		if s.IsAllDefault() {
+			continue
+		}
+		settingMatcher, err := labels.NewMatcher(labels.MatchEqual, models.AutogeneratedRouteSettingsHashLabel, fingerprint.String())
+		if err != nil {
+			return autogeneratedRoute{}, err
+		}
+		normalized := s.NormalizedGroupBy()
+		groupByAll, groupBy := toGroupBy(normalized...)
+		receiverRoute.Routes = append(receiverRoute.Routes, &definitions.Route{
+			Receiver:       s.Receiver,
+			ObjectMatchers: definitions.ObjectMatchers{settingMatcher},
+			Continue:       false, // Only a single setting-specific route should match.
+
+			GroupByStr:        normalized,
+			GroupBy:           groupBy,
+			GroupByAll:        groupByAll,
+			MuteTimeIntervals: s.MuteTimeIntervals,
+			GroupWait:         s.GroupWait,
+			GroupInterval:     s.GroupInterval,
+			RepeatInterval:    s.RepeatInterval,
+		})
+	}
+
+	return autogeneratedRoute{
+		Route: autoGenRoot,
+	}, nil
+}
+
+// toGroupBy converts the given label strings to (groupByAll, []model.LabelName) where groupByAll is true if the input
+// contains models.GroupByAll. This logic is in accordance with upstream Route.ValidateChild().
+func toGroupBy(groupByStr ...string) (groupByAll bool, groupBy []model.LabelName) {
+	for _, l := range groupByStr {
+		if l == models.GroupByAll {
+			return true, nil
+		} else {
+			groupBy = append(groupBy, model.LabelName(l))
+		}
+	}
+	return false, groupBy
+}
+
+// addToRoute adds this autogenerated route to the given route as the first top-level route under the root.
+func (ar *autogeneratedRoute) addToRoute(route *definitions.Route) error {
+	if route == nil {
+		return errors.New("route does not exist")
+	}
+	if ar == nil || ar.Route == nil {
+		return nil
+	}
+	// Combine autogenerated route with the user-created route.
+	ar.Route.Receiver = route.Receiver
+
+	// Remove existing autogenerated route if it exists.
+	RemoveAutogenConfigIfExists(route)
+
+	route.Routes = append([]*definitions.Route{ar.Route}, route.Routes...)
+	return nil
+}
+
+// RemoveAutogenConfigIfExists removes all top-level autogenerated routes from the provided route.
+// If no autogenerated routes exist, this function does nothing.
+func RemoveAutogenConfigIfExists(route *definitions.Route) {
+	route.Routes = slices.DeleteFunc(route.Routes, func(route *definitions.Route) bool {
+		return isAutogeneratedRoot(route)
+	})
+}
+
+// isAutogeneratedRoot returns true if the route is the root of an autogenerated route.
+func isAutogeneratedRoot(route *definitions.Route) bool {
+	return len(route.ObjectMatchers) == 1 && route.ObjectMatchers[0].Name == models.AutogeneratedRouteLabel
+}
diff --git a/pkg/services/ngalert/notifier/autogen_alertmanager_test.go b/pkg/services/ngalert/notifier/autogen_alertmanager_test.go
new file mode 100644
index 0000000000000..bc962728eac74
--- /dev/null
+++ b/pkg/services/ngalert/notifier/autogen_alertmanager_test.go
@@ -0,0 +1,306 @@
+package notifier
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
+	"github.com/prometheus/alertmanager/config"
+	"github.com/prometheus/alertmanager/pkg/labels"
+	"github.com/prometheus/common/model"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/infra/log/logtest"
+	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/util"
+)
+
+func TestAddAutogenConfig(t *testing.T) {
+	rootRoute := func() *definitions.Route {
+		return &definitions.Route{
+			Receiver: "default",
+		}
+	}
+	configGen := func(receivers []string, muteIntervals []string) *definitions.PostableApiAlertingConfig {
+		cfg := &definitions.PostableApiAlertingConfig{
+			Config: definitions.Config{
+				Route: rootRoute(),
+			},
+		}
+		for _, receiver := range receivers {
+			cfg.Receivers = append(cfg.Receivers, &definitions.PostableApiReceiver{
+				Receiver: config.Receiver{
+					Name: receiver,
+				},
+			})
+		}
+		for _, muteInterval := range muteIntervals {
+			cfg.MuteTimeIntervals = append(cfg.MuteTimeIntervals, config.MuteTimeInterval{
+				Name: muteInterval,
+			})
+		}
+		return cfg
+	}
+
+	withChildRoutes := func(route *definitions.Route, children ...*definitions.Route) *definitions.Route {
+		route.Routes = append(route.Routes, children...)
+		return route
+	}
+
+	matcher := func(key, val string) definitions.ObjectMatchers {
+		m, err := labels.NewMatcher(labels.MatchEqual, key, val)
+		require.NoError(t, err)
+		return definitions.ObjectMatchers{m}
+	}
+
+	basicContactRoute := func(receiver string) *definitions.Route {
+		return &definitions.Route{
+			Receiver:       receiver,
+			ObjectMatchers: matcher(models.AutogeneratedRouteReceiverNameLabel, receiver),
+			GroupByStr:     []string{models.FolderTitleLabel, model.AlertNameLabel},
+		}
+	}
+
+	testCases := []struct {
+		name             string
+		existingConfig   *definitions.PostableApiAlertingConfig
+		storeSettings    []models.NotificationSettings
+		skipInvalid      bool
+		expRoute         *definitions.Route
+		expErrorContains string
+	}{
+		{
+			name:           "no settings or receivers, no change",
+			existingConfig: configGen(nil, nil),
+			storeSettings:  []models.NotificationSettings{},
+			expRoute:       rootRoute(),
+		},
+		{
+			name:           "no settings but some receivers, add default routes for receivers",
+			existingConfig: configGen([]string{"receiver1", "receiver2", "receiver3"}, nil),
+			storeSettings:  []models.NotificationSettings{},
+			expRoute: withChildRoutes(rootRoute(), &definitions.Route{
+				Receiver:       "default",
+				ObjectMatchers: matcher(models.AutogeneratedRouteLabel, "true"),
+				Routes: []*definitions.Route{
+					basicContactRoute("receiver1"),
+					basicContactRoute("receiver3"),
+					basicContactRoute("receiver2"),
+				},
+			}),
+		},
+		{
+			name:           "settings with no custom options, add default routes only",
+			existingConfig: configGen([]string{"receiver1", "receiver2", "receiver3"}, nil),
+			storeSettings:  []models.NotificationSettings{models.NewDefaultNotificationSettings("receiver1"), models.NewDefaultNotificationSettings("receiver2")},
+			expRoute: withChildRoutes(rootRoute(), &definitions.Route{
+				Receiver:       "default",
+				ObjectMatchers: matcher(models.AutogeneratedRouteLabel, "true"),
+				Routes: []*definitions.Route{
+					basicContactRoute("receiver1"),
+					basicContactRoute("receiver3"),
+					basicContactRoute("receiver2"),
+				},
+			}),
+		},
+		{
+			name:           "settings with custom options, add option-specific routes",
+			existingConfig: configGen([]string{"receiver1", "receiver2", "receiver3", "receiver4", "receiver5"}, []string{"maintenance"}),
+			storeSettings: []models.NotificationSettings{
+				models.CopyNotificationSettings(models.NewDefaultNotificationSettings("receiver1"), models.NSMuts.WithGroupInterval(util.Pointer(1*time.Minute))),
+				models.CopyNotificationSettings(models.NewDefaultNotificationSettings("receiver2"), models.NSMuts.WithGroupWait(util.Pointer(2*time.Minute))),
+				models.CopyNotificationSettings(models.NewDefaultNotificationSettings("receiver3"), models.NSMuts.WithRepeatInterval(util.Pointer(3*time.Minute))),
+				models.CopyNotificationSettings(models.NewDefaultNotificationSettings("receiver4"), models.NSMuts.WithGroupBy(model.AlertNameLabel, models.FolderTitleLabel, "custom")),
+				models.CopyNotificationSettings(models.NewDefaultNotificationSettings("receiver5"), models.NSMuts.WithMuteTimeIntervals("maintenance")),
+				{
+					Receiver:          "receiver1",
+					GroupBy:           []string{model.AlertNameLabel, models.FolderTitleLabel, "custom"},
+					GroupInterval:     util.Pointer(model.Duration(1 * time.Minute)),
+					GroupWait:         util.Pointer(model.Duration(2 * time.Minute)),
+					RepeatInterval:    util.Pointer(model.Duration(3 * time.Minute)),
+					MuteTimeIntervals: []string{"maintenance"},
+				},
+			},
+			expRoute: withChildRoutes(rootRoute(), &definitions.Route{
+				Receiver:       "default",
+				ObjectMatchers: matcher(models.AutogeneratedRouteLabel, "true"),
+				Routes: []*definitions.Route{
+					withChildRoutes(basicContactRoute("receiver5"), &definitions.Route{
+						Receiver:          "receiver5",
+						ObjectMatchers:    matcher(models.AutogeneratedRouteSettingsHashLabel, "030d6474aec0b553"),
+						MuteTimeIntervals: []string{"maintenance"},
+					}),
+					withChildRoutes(basicContactRoute("receiver1"), &definitions.Route{
+						Receiver:          "receiver1",
+						ObjectMatchers:    matcher(models.AutogeneratedRouteSettingsHashLabel, "4f095749ddf3eeeb"),
+						GroupByStr:        []string{models.FolderTitleLabel, model.AlertNameLabel, "custom"},
+						GroupInterval:     util.Pointer(model.Duration(1 * time.Minute)),
+						GroupWait:         util.Pointer(model.Duration(2 * time.Minute)),
+						RepeatInterval:    util.Pointer(model.Duration(3 * time.Minute)),
+						MuteTimeIntervals: []string{"maintenance"},
+					}, &definitions.Route{
+						Receiver:       "receiver1",
+						ObjectMatchers: matcher(models.AutogeneratedRouteSettingsHashLabel, "dde34b8127e68f31"),
+						GroupInterval:  util.Pointer(model.Duration(1 * time.Minute)),
+					}),
+					withChildRoutes(basicContactRoute("receiver2"), &definitions.Route{
+						Receiver:       "receiver2",
+						ObjectMatchers: matcher(models.AutogeneratedRouteSettingsHashLabel, "27e1d1717c9ef621"),
+						GroupWait:      util.Pointer(model.Duration(2 * time.Minute)),
+					}),
+					withChildRoutes(basicContactRoute("receiver4"), &definitions.Route{
+						Receiver:       "receiver4",
+						ObjectMatchers: matcher(models.AutogeneratedRouteSettingsHashLabel, "b3a2fa5e615dcc7e"),
+						GroupByStr:     []string{models.FolderTitleLabel, model.AlertNameLabel, "custom"},
+					}),
+					withChildRoutes(basicContactRoute("receiver3"), &definitions.Route{
+						Receiver:       "receiver3",
+						ObjectMatchers: matcher(models.AutogeneratedRouteSettingsHashLabel, "9e282ef0193d830a"),
+						RepeatInterval: util.Pointer(model.Duration(3 * time.Minute)),
+					}),
+				},
+			}),
+		},
+		{
+			name:           "settings with custom options and nil groupBy, groupBy should inherit from parent",
+			existingConfig: configGen([]string{"receiver1"}, nil),
+			storeSettings: []models.NotificationSettings{
+				models.CopyNotificationSettings(models.NewDefaultNotificationSettings("receiver1"), models.NSMuts.WithGroupInterval(util.Pointer(1*time.Minute)), models.NSMuts.WithGroupBy()),
+			},
+			expRoute: withChildRoutes(rootRoute(), &definitions.Route{
+				Receiver:       "default",
+				ObjectMatchers: matcher(models.AutogeneratedRouteLabel, "true"),
+				Routes: []*definitions.Route{
+					withChildRoutes(basicContactRoute("receiver1"), &definitions.Route{
+						Receiver:       "receiver1",
+						ObjectMatchers: matcher(models.AutogeneratedRouteSettingsHashLabel, "dde34b8127e68f31"),
+						GroupByStr:     nil,
+						GroupInterval:  util.Pointer(model.Duration(1 * time.Minute)),
+					}),
+				},
+			}),
+		},
+		{
+			name:           "settings with nil groupBy should have different fingerprint than default groupBy",
+			existingConfig: configGen([]string{"receiver1"}, nil),
+			storeSettings: []models.NotificationSettings{
+				models.CopyNotificationSettings(models.NewDefaultNotificationSettings("receiver1"), models.NSMuts.WithGroupInterval(util.Pointer(1*time.Minute)), models.NSMuts.WithGroupBy()),
+				models.CopyNotificationSettings(models.NewDefaultNotificationSettings("receiver1"), models.NSMuts.WithGroupInterval(util.Pointer(1*time.Minute)), models.NSMuts.WithGroupBy(models.DefaultNotificationSettingsGroupBy...)),
+			},
+			expRoute: withChildRoutes(rootRoute(), &definitions.Route{
+				Receiver:       "default",
+				ObjectMatchers: matcher(models.AutogeneratedRouteLabel, "true"),
+				Routes: []*definitions.Route{
+					withChildRoutes(basicContactRoute("receiver1"), &definitions.Route{
+						Receiver:       "receiver1",
+						ObjectMatchers: matcher(models.AutogeneratedRouteSettingsHashLabel, "dde34b8127e68f31"),
+						GroupByStr:     nil,
+						GroupInterval:  util.Pointer(model.Duration(1 * time.Minute)),
+					}, &definitions.Route{
+						Receiver:       "receiver1",
+						ObjectMatchers: matcher(models.AutogeneratedRouteSettingsHashLabel, "e1f3a275a8918385"), // Different hash.
+						GroupByStr:     []string{models.FolderTitleLabel, model.AlertNameLabel},
+						GroupInterval:  util.Pointer(model.Duration(1 * time.Minute)),
+					}),
+				},
+			}),
+		},
+		{
+			name:           "settings with incomplete required groupBy labels will be completed and should have the same fingerprint",
+			existingConfig: configGen([]string{"receiver1"}, nil),
+			storeSettings: []models.NotificationSettings{
+				models.CopyNotificationSettings(models.NewDefaultNotificationSettings("receiver1"), models.NSMuts.WithGroupInterval(util.Pointer(1*time.Minute)), models.NSMuts.WithGroupBy(models.FolderTitleLabel)),
+				models.CopyNotificationSettings(models.NewDefaultNotificationSettings("receiver1"), models.NSMuts.WithGroupInterval(util.Pointer(1*time.Minute)), models.NSMuts.WithGroupBy(model.AlertNameLabel)),
+				models.CopyNotificationSettings(models.NewDefaultNotificationSettings("receiver1"), models.NSMuts.WithGroupInterval(util.Pointer(1*time.Minute)), models.NSMuts.WithGroupBy(models.DefaultNotificationSettingsGroupBy...)),
+			},
+			expRoute: withChildRoutes(rootRoute(), &definitions.Route{
+				Receiver:       "default",
+				ObjectMatchers: matcher(models.AutogeneratedRouteLabel, "true"),
+				Routes: []*definitions.Route{
+					withChildRoutes(basicContactRoute("receiver1"), &definitions.Route{
+						Receiver:       "receiver1",
+						ObjectMatchers: matcher(models.AutogeneratedRouteSettingsHashLabel, "e1f3a275a8918385"),
+						GroupByStr:     []string{models.FolderTitleLabel, model.AlertNameLabel},
+						GroupInterval:  util.Pointer(model.Duration(1 * time.Minute)),
+					}),
+				},
+			}),
+		},
+		{
+			name:           "when skipInvalid=true, invalid settings are skipped",
+			existingConfig: configGen([]string{"receiver1", "receiver2", "receiver3"}, nil),
+			storeSettings: []models.NotificationSettings{
+				models.NewDefaultNotificationSettings("receiverA"), // Doesn't exist.
+				models.CopyNotificationSettings(models.NewDefaultNotificationSettings("receiver1"), models.NSMuts.WithMuteTimeIntervals("maintenance")),        // Doesn't exist.
+				models.CopyNotificationSettings(models.NewDefaultNotificationSettings("receiver2"), models.NSMuts.WithGroupWait(util.Pointer(-2*time.Minute))), // Negative.
+			},
+			skipInvalid: true,
+			expRoute: withChildRoutes(rootRoute(), &definitions.Route{
+				Receiver:       "default",
+				ObjectMatchers: matcher(models.AutogeneratedRouteLabel, "true"),
+				Routes: []*definitions.Route{
+					basicContactRoute("receiver1"),
+					basicContactRoute("receiver3"),
+					basicContactRoute("receiver2"),
+				},
+			}),
+		},
+		{
+			name:             "when skipInvalid=false, invalid receiver throws error",
+			existingConfig:   configGen([]string{"receiver1", "receiver2", "receiver3"}, nil),
+			storeSettings:    []models.NotificationSettings{models.NewDefaultNotificationSettings("receiverA")},
+			skipInvalid:      false,
+			expErrorContains: "receiverA",
+		},
+		{
+			name:             "when skipInvalid=false, invalid settings throws error",
+			existingConfig:   configGen([]string{"receiver1", "receiver2", "receiver3"}, nil),
+			storeSettings:    []models.NotificationSettings{models.CopyNotificationSettings(models.NewDefaultNotificationSettings("receiver1"), models.NSMuts.WithMuteTimeIntervals("maintenance"))},
+			skipInvalid:      false,
+			expErrorContains: "maintenance",
+		},
+		{
+			name:             "when skipInvalid=false, invalid settings throws error",
+			existingConfig:   configGen([]string{"receiver1", "receiver2", "receiver3"}, nil),
+			storeSettings:    []models.NotificationSettings{models.CopyNotificationSettings(models.NewDefaultNotificationSettings("receiver2"), models.NSMuts.WithGroupWait(util.Pointer(-2*time.Minute)))},
+			skipInvalid:      false,
+			expErrorContains: "group wait",
+		},
+	}
+
+	for _, tt := range testCases {
+		t.Run(tt.name, func(t *testing.T) {
+			orgId := int64(1)
+			store := &fakeConfigStore{
+				notificationSettings: make(map[int64]map[models.AlertRuleKey][]models.NotificationSettings),
+			}
+			store.notificationSettings[orgId] = make(map[models.AlertRuleKey][]models.NotificationSettings)
+
+			for _, setting := range tt.storeSettings {
+				store.notificationSettings[orgId][models.AlertRuleKey{OrgID: orgId, UID: util.GenerateShortUID()}] = []models.NotificationSettings{setting}
+			}
+
+			err := AddAutogenConfig(context.Background(), &logtest.Fake{}, store, orgId, tt.existingConfig, tt.skipInvalid)
+			if tt.expErrorContains != "" {
+				require.Error(t, err)
+				require.ErrorContains(t, err, tt.expErrorContains)
+				return
+			} else {
+				require.NoError(t, err)
+			}
+
+			// We compare against the upstream normalized route.
+			require.NoError(t, tt.expRoute.Validate())
+
+			cOpt := []cmp.Option{
+				cmpopts.IgnoreUnexported(definitions.Route{}, labels.Matcher{}),
+			}
+			if !cmp.Equal(tt.expRoute, tt.existingConfig.Route, cOpt...) {
+				t.Errorf("Unexpected Route: %v", cmp.Diff(tt.expRoute, tt.existingConfig.Route, cOpt...))
+			}
+		})
+	}
+}
diff --git a/pkg/services/ngalert/notifier/channels_config/available_channels.go b/pkg/services/ngalert/notifier/channels_config/available_channels.go
index 45072be500918..bf6d5811c321b 100644
--- a/pkg/services/ngalert/notifier/channels_config/available_channels.go
+++ b/pkg/services/ngalert/notifier/channels_config/available_channels.go
@@ -3,6 +3,7 @@ package channels_config
 import (
 	"fmt"
 	"os"
+	"strings"
 
 	alertingOpsgenie "github.com/grafana/alerting/receivers/opsgenie"
 	alertingTemplates "github.com/grafana/alerting/templates"
@@ -266,6 +267,7 @@ func GetAvailableNotifiers() []*NotifierPlugin {
 					Description:  "Optional message. You can use templates to customize this field. Using a custom message will replace the default message",
 					Element:      ElementTypeTextArea,
 					PropertyName: "message",
+					Placeholder:  alertingTemplates.DefaultMessageEmbed,
 				},
 				{ // New in 9.0.
 					Label:        "Subject",
@@ -814,6 +816,15 @@ func GetAvailableNotifiers() []*NotifierPlugin {
 					PropertyName: "chatid",
 					Required:     true,
 				},
+				{
+					Label:          "Message Thread ID",
+					Element:        ElementTypeInput,
+					InputType:      InputTypeText,
+					Description:    "Integer Telegram Message Thread Identifier",
+					PropertyName:   "message_thread_id",
+					Required:       false,
+					ValidationRule: "-?[0-9]{1,10}",
+				},
 				{ // New in 8.0.
 					Label:        "Message",
 					Element:      ElementTypeTextArea,
@@ -1293,6 +1304,40 @@ func GetAvailableNotifiers() []*NotifierPlugin {
 					Description:  "Send the common annotations to Opsgenie as either Extra Properties, Tags or both",
 					PropertyName: "sendTagsAs",
 				},
+				// New in 10.3
+				{
+					Label:        "Responders",
+					PropertyName: "responders",
+					Description:  "If the API key belongs to a team, this field is ignored.",
+					Element:      ElementSubformArray,
+					SubformOptions: []NotifierOption{
+						{
+							Label:        "Type",
+							Description:  fmt.Sprintf("%s or a template", strings.Join(alertingOpsgenie.SupportedResponderTypes, ", ")),
+							Element:      ElementTypeInput,
+							Required:     true,
+							PropertyName: "type",
+						},
+						{
+							Label:        "Name",
+							Element:      ElementTypeInput,
+							Description:  "Name of the responder. Must be specified if ID and Username are empty or if the type is 'teams'.",
+							PropertyName: "name",
+						},
+						{
+							Label:        "ID",
+							Element:      ElementTypeInput,
+							Description:  "ID of the responder. Must be specified if name and Username are empty.",
+							PropertyName: "id",
+						},
+						{
+							Label:        "Username",
+							Element:      ElementTypeInput,
+							Description:  "User name of the responder. Must be specified if ID and Name are empty.",
+							PropertyName: "username",
+						},
+					},
+				},
 			},
 		},
 		{
diff --git a/pkg/services/ngalert/notifier/channels_config/plugin.go b/pkg/services/ngalert/notifier/channels_config/plugin.go
index 8417d304e99aa..f390ee1d9fcb3 100644
--- a/pkg/services/ngalert/notifier/channels_config/plugin.go
+++ b/pkg/services/ngalert/notifier/channels_config/plugin.go
@@ -12,18 +12,19 @@ type NotifierPlugin struct {
 
 // NotifierOption holds information about options specific for the NotifierPlugin.
 type NotifierOption struct {
-	Element        ElementType    `json:"element"`
-	InputType      InputType      `json:"inputType"`
-	Label          string         `json:"label"`
-	Description    string         `json:"description"`
-	Placeholder    string         `json:"placeholder"`
-	PropertyName   string         `json:"propertyName"`
-	SelectOptions  []SelectOption `json:"selectOptions"`
-	ShowWhen       ShowWhen       `json:"showWhen"`
-	Required       bool           `json:"required"`
-	ValidationRule string         `json:"validationRule"`
-	Secure         bool           `json:"secure"`
-	DependsOn      string         `json:"dependsOn"`
+	Element        ElementType      `json:"element"`
+	InputType      InputType        `json:"inputType"`
+	Label          string           `json:"label"`
+	Description    string           `json:"description"`
+	Placeholder    string           `json:"placeholder"`
+	PropertyName   string           `json:"propertyName"`
+	SelectOptions  []SelectOption   `json:"selectOptions"`
+	ShowWhen       ShowWhen         `json:"showWhen"`
+	Required       bool             `json:"required"`
+	ValidationRule string           `json:"validationRule"`
+	Secure         bool             `json:"secure"`
+	DependsOn      string           `json:"dependsOn"`
+	SubformOptions []NotifierOption `json:"subformOptions"`
 }
 
 // ElementType is the type of element that can be rendered in the frontend.
@@ -40,6 +41,10 @@ const (
 	ElementTypeTextArea = "textarea"
 	// ElementTypeKeyValueMap will render inputs to add arbitrary key-value pairs
 	ElementTypeKeyValueMap = "key_value_map"
+	// ElementSubformArray will render a sub-form with schema defined in SubformOptions
+	ElementTypeSubform = "subform"
+	// ElementSubformArray will render a multiple sub-forms with schema defined in SubformOptions
+	ElementSubformArray = "subform_array"
 )
 
 // InputType is the type of input that can be rendered in the frontend.
diff --git a/pkg/services/ngalert/notifier/compat.go b/pkg/services/ngalert/notifier/compat.go
index 41bcb1cab8794..7d6580b9ec735 100644
--- a/pkg/services/ngalert/notifier/compat.go
+++ b/pkg/services/ngalert/notifier/compat.go
@@ -4,8 +4,12 @@ import (
 	"encoding/json"
 
 	alertingNotify "github.com/grafana/alerting/notify"
+	alertingTemplates "github.com/grafana/alerting/templates"
+	"github.com/prometheus/alertmanager/config"
 
+	"github.com/grafana/grafana/pkg/components/simplejson"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
 )
 
 func PostableGrafanaReceiverToGrafanaIntegrationConfig(p *apimodels.PostableGrafanaReceiver) *alertingNotify.GrafanaIntegrationConfig {
@@ -40,3 +44,81 @@ func PostableApiAlertingConfigToApiReceivers(c apimodels.PostableApiAlertingConf
 	}
 	return apiReceivers
 }
+
+type DecryptFn = func(value string) string
+
+func PostableToGettableGrafanaReceiver(r *apimodels.PostableGrafanaReceiver, provenance *models.Provenance, decryptFn DecryptFn, listOnly bool) (apimodels.GettableGrafanaReceiver, error) {
+	out := apimodels.GettableGrafanaReceiver{
+		UID:  r.UID,
+		Name: r.Name,
+		Type: r.Type,
+	}
+	if provenance != nil {
+		out.Provenance = apimodels.Provenance(*provenance)
+	}
+
+	// if we aren't only listing, include the settings in the output
+	if !listOnly {
+		secureFields := make(map[string]bool, len(r.SecureSettings))
+		settings, err := simplejson.NewJson([]byte(r.Settings))
+		if err != nil {
+			return apimodels.GettableGrafanaReceiver{}, err
+		}
+
+		for k, v := range r.SecureSettings {
+			decryptedValue := decryptFn(v)
+			if decryptedValue == "" {
+				continue
+			} else {
+				settings.Set(k, decryptedValue)
+			}
+			secureFields[k] = true
+		}
+
+		jsonBytes, err := settings.MarshalJSON()
+		if err != nil {
+			return apimodels.GettableGrafanaReceiver{}, err
+		}
+
+		out.Settings = jsonBytes
+		out.SecureFields = secureFields
+		out.DisableResolveMessage = r.DisableResolveMessage
+	}
+
+	return out, nil
+}
+
+func PostableToGettableApiReceiver(r *apimodels.PostableApiReceiver, provenances map[string]models.Provenance, decryptFn DecryptFn, listOnly bool) (apimodels.GettableApiReceiver, error) {
+	out := apimodels.GettableApiReceiver{
+		Receiver: config.Receiver{
+			Name: r.Receiver.Name,
+		},
+	}
+
+	for _, gr := range r.GrafanaManagedReceivers {
+		var prov *models.Provenance
+		if p, ok := provenances[gr.UID]; ok {
+			prov = &p
+		}
+
+		gettable, err := PostableToGettableGrafanaReceiver(gr, prov, decryptFn, listOnly)
+		if err != nil {
+			return apimodels.GettableApiReceiver{}, err
+		}
+		out.GrafanaManagedReceivers = append(out.GrafanaManagedReceivers, &gettable)
+	}
+
+	return out, nil
+}
+
+// ToTemplateDefinitions converts the given PostableUserConfig's TemplateFiles to a slice of TemplateDefinitions.
+func ToTemplateDefinitions(cfg *apimodels.PostableUserConfig) []alertingTemplates.TemplateDefinition {
+	out := make([]alertingTemplates.TemplateDefinition, 0, len(cfg.TemplateFiles))
+	for name, tmpl := range cfg.TemplateFiles {
+		out = append(out, alertingTemplates.TemplateDefinition{
+			Name:     name,
+			Template: tmpl,
+		})
+	}
+	return out
+}
diff --git a/pkg/services/ngalert/notifier/config.go b/pkg/services/ngalert/notifier/config.go
index 86dfb404049e3..bffe1b72ce359 100644
--- a/pkg/services/ngalert/notifier/config.go
+++ b/pkg/services/ngalert/notifier/config.go
@@ -1,82 +1,15 @@
 package notifier
 
 import (
-	"crypto/md5"
 	"encoding/json"
 	"fmt"
-	"os"
-	"path/filepath"
 
 	alertingNotify "github.com/grafana/alerting/notify"
 	alertingTemplates "github.com/grafana/alerting/templates"
 
-	"github.com/grafana/grafana/pkg/infra/log"
 	api "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 )
 
-func PersistTemplates(logger log.Logger, cfg *api.PostableUserConfig, path string) ([]string, bool, error) {
-	if len(cfg.TemplateFiles) < 1 {
-		return nil, false, nil
-	}
-
-	var templatesChanged bool
-	pathSet := map[string]struct{}{}
-	for name, content := range cfg.TemplateFiles {
-		if name != filepath.Base(filepath.Clean(name)) {
-			return nil, false, fmt.Errorf("template file name '%s' is not valid", name)
-		}
-
-		err := os.MkdirAll(path, 0750)
-		if err != nil {
-			return nil, false, fmt.Errorf("unable to create template directory %q: %s", path, err)
-		}
-
-		file := filepath.Join(path, name)
-		pathSet[name] = struct{}{}
-
-		// Check if the template file already exists and if it has changed
-		// We can safely ignore gosec here as we've previously checked the filename is clean
-		// nolint:gosec
-		if tmpl, err := os.ReadFile(file); err == nil && string(tmpl) == content {
-			// Templates file is the same we have, no-op and continue.
-			continue
-		} else if err != nil && !os.IsNotExist(err) {
-			return nil, false, err
-		}
-
-		// We can safely ignore gosec here as we've previously checked the filename is clean
-		// nolint:gosec
-		if err := os.WriteFile(file, []byte(content), 0644); err != nil {
-			return nil, false, fmt.Errorf("unable to create Alertmanager template file %q: %s", file, err)
-		}
-
-		templatesChanged = true
-	}
-
-	// Now that we have the list of _actual_ templates, let's remove the ones that we don't need.
-	existingFiles, err := os.ReadDir(path)
-	if err != nil {
-		logger.Error("Unable to read directory for deleting Alertmanager templates", "error", err, "path", path)
-	}
-	for _, existingFile := range existingFiles {
-		p := filepath.Join(path, existingFile.Name())
-		_, ok := pathSet[existingFile.Name()]
-		if !ok {
-			templatesChanged = true
-			err := os.Remove(p)
-			if err != nil {
-				logger.Error("Unable to delete template", "error", err, "file", p)
-			}
-		}
-	}
-
-	paths := make([]string, 0, len(pathSet))
-	for path := range pathSet {
-		paths = append(paths, path)
-	}
-	return paths, templatesChanged, nil
-}
-
 func Load(rawConfig []byte) (*api.PostableUserConfig, error) {
 	cfg := &api.PostableUserConfig{}
 
@@ -90,8 +23,13 @@ func Load(rawConfig []byte) (*api.PostableUserConfig, error) {
 // AlertingConfiguration provides configuration for an Alertmanager.
 // It implements the notify.Configuration interface.
 type AlertingConfiguration struct {
-	alertmanagerConfig    api.PostableApiAlertingConfig
+	route                 *alertingNotify.Route
+	inhibitRules          []alertingNotify.InhibitRule
+	muteTimeIntervals     []alertingNotify.MuteTimeInterval
+	timeIntervals         []alertingNotify.TimeInterval
+	templates             []alertingTemplates.TemplateDefinition
 	rawAlertmanagerConfig []byte
+	configHash            [16]byte
 
 	receivers                []*alertingNotify.APIReceiver
 	receiverIntegrationsFunc func(r *alertingNotify.APIReceiver, tmpl *alertingTemplates.Template) ([]*alertingNotify.Integration, error)
@@ -108,11 +46,15 @@ func (a AlertingConfiguration) DispatcherLimits() alertingNotify.DispatcherLimit
 }
 
 func (a AlertingConfiguration) InhibitRules() []alertingNotify.InhibitRule {
-	return a.alertmanagerConfig.InhibitRules
+	return a.inhibitRules
 }
 
 func (a AlertingConfiguration) MuteTimeIntervals() []alertingNotify.MuteTimeInterval {
-	return a.alertmanagerConfig.MuteTimeIntervals
+	return a.muteTimeIntervals
+}
+
+func (a AlertingConfiguration) TimeIntervals() []alertingNotify.TimeInterval {
+	return a.timeIntervals
 }
 
 func (a AlertingConfiguration) Receivers() []*alertingNotify.APIReceiver {
@@ -120,15 +62,15 @@ func (a AlertingConfiguration) Receivers() []*alertingNotify.APIReceiver {
 }
 
 func (a AlertingConfiguration) RoutingTree() *alertingNotify.Route {
-	return a.alertmanagerConfig.Route.AsAMRoute()
+	return a.route
 }
 
-func (a AlertingConfiguration) Templates() []string {
-	return a.alertmanagerConfig.Templates
+func (a AlertingConfiguration) Templates() []alertingTemplates.TemplateDefinition {
+	return a.templates
 }
 
 func (a AlertingConfiguration) Hash() [16]byte {
-	return md5.Sum(a.rawAlertmanagerConfig)
+	return a.configHash
 }
 
 func (a AlertingConfiguration) Raw() []byte {
diff --git a/pkg/services/ngalert/notifier/config_test.go b/pkg/services/ngalert/notifier/config_test.go
index c39b4f2b2beca..76b910e795c4d 100644
--- a/pkg/services/ngalert/notifier/config_test.go
+++ b/pkg/services/ngalert/notifier/config_test.go
@@ -2,110 +2,12 @@ package notifier
 
 import (
 	"errors"
-	"os"
-	"path/filepath"
 	"testing"
 
-	"github.com/grafana/grafana/pkg/infra/log/logtest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
-	api "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 )
 
-func TestPersistTemplates(t *testing.T) {
-	tc := []struct {
-		name              string
-		templates         map[string]string
-		existingTemplates map[string]string
-		expectedPaths     []string
-		expectedError     error
-		expectedChange    bool
-	}{
-		{
-			name:           "With valid templates file names, it persists successfully",
-			templates:      map[string]string{"email.template": "a perfectly fine template"},
-			expectedChange: true,
-			expectedError:  nil,
-			expectedPaths:  []string{"email.template"},
-		},
-		{
-			name:          "With a invalid filename, it fails",
-			templates:     map[string]string{"adirectory/email.template": "a perfectly fine template"},
-			expectedError: errors.New("template file name 'adirectory/email.template' is not valid"),
-		},
-		{
-			name:              "with a template that has the same name but different content to an existing one",
-			existingTemplates: map[string]string{"email.template": "a perfectly fine template"},
-			templates:         map[string]string{"email.template": "a completely different content"},
-			expectedChange:    true,
-			expectedError:     nil,
-			expectedPaths:     []string{"email.template"},
-		},
-		{
-			name:              "with a template that has the same name and the same content as an existing one",
-			existingTemplates: map[string]string{"email.template": "a perfectly fine template"},
-			templates:         map[string]string{"email.template": "a perfectly fine template"},
-			expectedChange:    false,
-			expectedError:     nil,
-			expectedPaths:     []string{"email.template"},
-		},
-		{
-			name:              "with two new template files, it changes the template tree",
-			existingTemplates: map[string]string{"email.template": "a perfectly fine template"},
-			templates:         map[string]string{"slack.template": "a perfectly fine template", "webhook.template": "a webhook template"},
-			expectedChange:    true,
-			expectedError:     nil,
-			expectedPaths:     []string{"slack.template", "webhook.template"},
-		},
-		{
-			name:              "when we remove a template file from the list, it changes the template tree",
-			existingTemplates: map[string]string{"slack.template": "a perfectly fine template", "webhook.template": "a webhook template"},
-			templates:         map[string]string{"slack.template": "a perfectly fine template"},
-			expectedChange:    true,
-			expectedError:     nil,
-			expectedPaths:     []string{"slack.template"},
-		},
-	}
-
-	for _, tt := range tc {
-		t.Run(tt.name, func(t *testing.T) {
-			dir := t.TempDir()
-			// Write "existing files"
-			for name, content := range tt.existingTemplates {
-				err := os.WriteFile(filepath.Join(dir, name), []byte(content), 0644)
-				require.NoError(t, err)
-			}
-			c := &api.PostableUserConfig{TemplateFiles: tt.templates}
-
-			testLogger := logtest.Fake{}
-			paths, changed, persistErr := PersistTemplates(&testLogger, c, dir)
-
-			files := map[string]string{}
-			readFiles, err := os.ReadDir(dir)
-			require.NoError(t, err)
-			for _, f := range readFiles {
-				if f.IsDir() || f.Name() == "" {
-					continue
-				}
-				// Safe to disable, this is a test.
-				// nolint:gosec
-				content, err := os.ReadFile(filepath.Join(dir, f.Name()))
-				// nolint:gosec
-				require.NoError(t, err)
-				files[f.Name()] = string(content)
-			}
-
-			require.Equal(t, tt.expectedError, persistErr)
-			require.ElementsMatch(t, tt.expectedPaths, paths)
-			require.Equal(t, tt.expectedChange, changed)
-			if tt.expectedError == nil {
-				require.Equal(t, tt.templates, files)
-			}
-		})
-	}
-}
-
 func TestLoad(t *testing.T) {
 	tc := []struct {
 		name              string
diff --git a/pkg/services/ngalert/notifier/crypto.go b/pkg/services/ngalert/notifier/crypto.go
index 248d266b537c8..f710181f45cf7 100644
--- a/pkg/services/ngalert/notifier/crypto.go
+++ b/pkg/services/ngalert/notifier/crypto.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
-	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/store"
 	"github.com/grafana/grafana/pkg/services/secrets"
 )
@@ -80,8 +79,7 @@ func EncryptReceiverConfigs(c []*definitions.PostableApiReceiver, encrypt defini
 // LoadSecureSettings adds the corresponding unencrypted secrets stored to the list of input receivers.
 func (c *alertmanagerCrypto) LoadSecureSettings(ctx context.Context, orgId int64, receivers []*definitions.PostableApiReceiver) error {
 	// Get the last known working configuration.
-	query := models.GetLatestAlertmanagerConfigurationQuery{OrgID: orgId}
-	amConfig, err := c.configs.GetLatestAlertmanagerConfiguration(ctx, &query)
+	amConfig, err := c.configs.GetLatestAlertmanagerConfiguration(ctx, orgId)
 	if err != nil {
 		// If we don't have a configuration there's nothing for us to know and we should just continue saving the new one.
 		if !errors.Is(err, store.ErrNoAlertmanagerConfiguration) {
diff --git a/pkg/services/ngalert/notifier/file_store.go b/pkg/services/ngalert/notifier/file_store.go
index cba28381452ef..e9628cb536e22 100644
--- a/pkg/services/ngalert/notifier/file_store.go
+++ b/pkg/services/ngalert/notifier/file_store.go
@@ -4,8 +4,6 @@ import (
 	"context"
 	"encoding/base64"
 	"fmt"
-	"os"
-	"path/filepath"
 
 	alertingNotify "github.com/grafana/alerting/notify"
 
@@ -13,40 +11,48 @@ import (
 	"github.com/grafana/grafana/pkg/infra/log"
 )
 
-const KVNamespace = "alertmanager"
+const (
+	KVNamespace             = "alertmanager"
+	NotificationLogFilename = "notifications"
+	SilencesFilename        = "silences"
+)
 
 // FileStore is in charge of persisting the alertmanager files to the database.
 // It uses the KVstore table and encodes the files as a base64 string.
 type FileStore struct {
-	kv             *kvstore.NamespacedKVStore
-	orgID          int64
-	workingDirPath string
-	logger         log.Logger
+	kv     *kvstore.NamespacedKVStore
+	orgID  int64
+	logger log.Logger
 }
 
-func NewFileStore(orgID int64, store kvstore.KVStore, workingDirPath string) *FileStore {
+func NewFileStore(orgID int64, store kvstore.KVStore) *FileStore {
 	return &FileStore{
-		workingDirPath: workingDirPath,
-		orgID:          orgID,
-		kv:             kvstore.WithNamespace(store, orgID, KVNamespace),
-		logger:         log.New("ngalert.notifier.alertmanager.file_store", orgID),
+		orgID:  orgID,
+		kv:     kvstore.WithNamespace(store, orgID, KVNamespace),
+		logger: log.New("ngalert.notifier.alertmanager.file_store", orgID),
 	}
 }
 
-// FilepathFor returns the filepath to an Alertmanager file.
-// If the file is already present on disk it no-ops.
-// If not, it tries to read the database and if there's no file it no-ops.
-// If there is a file in the database, it decodes it and writes to disk for Alertmanager consumption.
-func (fileStore *FileStore) FilepathFor(ctx context.Context, filename string) (string, error) {
+// GetSilences returns the content of the silences file from kvstore.
+func (fileStore *FileStore) GetSilences(ctx context.Context) (string, error) {
+	return fileStore.contentFor(ctx, SilencesFilename)
+}
+
+func (fileStore *FileStore) GetNotificationLog(ctx context.Context) (string, error) {
+	return fileStore.contentFor(ctx, NotificationLogFilename)
+}
+
+// contentFor returns the content for the given Alertmanager kvstore key.
+func (fileStore *FileStore) contentFor(ctx context.Context, filename string) (string, error) {
 	// Then, let's attempt to read it from the database.
 	content, exists, err := fileStore.kv.Get(ctx, filename)
 	if err != nil {
 		return "", fmt.Errorf("error reading file '%s' from database: %w", filename, err)
 	}
 
-	// if it doesn't exist, let's no-op and let the Alertmanager create one. We'll eventually save it to the database.
+	// File doesn't exist, Alertmanager will eventually save it to the database.
 	if !exists {
-		return fileStore.pathFor(filename), nil
+		return "", nil
 	}
 
 	// If we have a file stored in the database, let's decode it and write it to disk to perform that initial load to memory.
@@ -55,15 +61,21 @@ func (fileStore *FileStore) FilepathFor(ctx context.Context, filename string) (s
 		return "", fmt.Errorf("error decoding file '%s': %w", filename, err)
 	}
 
-	if err := fileStore.WriteFileToDisk(filename, bytes); err != nil {
-		return "", fmt.Errorf("error writing file %s: %w", filename, err)
-	}
+	return string(bytes), err
+}
 
-	return fileStore.pathFor(filename), err
+// SaveSilences saves the silences to the database and returns the size of the unencoded state.
+func (fileStore *FileStore) SaveSilences(ctx context.Context, st alertingNotify.State) (int64, error) {
+	return fileStore.persist(ctx, SilencesFilename, st)
 }
 
-// Persist takes care of persisting the binary representation of internal state to the database as a base64 encoded string.
-func (fileStore *FileStore) Persist(ctx context.Context, filename string, st alertingNotify.State) (int64, error) {
+// SaveNotificationLog saves the notification log to the database and returns the size of the unencoded state.
+func (fileStore *FileStore) SaveNotificationLog(ctx context.Context, st alertingNotify.State) (int64, error) {
+	return fileStore.persist(ctx, NotificationLogFilename, st)
+}
+
+// persist takes care of persisting the binary representation of internal state to the database as a base64 encoded string.
+func (fileStore *FileStore) persist(ctx context.Context, filename string, st alertingNotify.State) (int64, error) {
 	var size int64
 
 	bytes, err := st.MarshalBinary()
@@ -78,31 +90,6 @@ func (fileStore *FileStore) Persist(ctx context.Context, filename string, st ale
 	return int64(len(bytes)), err
 }
 
-// WriteFileToDisk writes a file with the provided name and contents to the Alertmanager working directory with the default grafana permission.
-func (fileStore *FileStore) WriteFileToDisk(fn string, content []byte) error {
-	// Ensure the working directory is created
-	err := os.MkdirAll(fileStore.workingDirPath, 0750)
-	if err != nil {
-		return fmt.Errorf("unable to create the working directory %q: %s", fileStore.workingDirPath, err)
-	}
-
-	return os.WriteFile(fileStore.pathFor(fn), content, 0644)
-}
-
-// CleanUp will remove the working directory from disk.
-func (fileStore *FileStore) CleanUp() {
-	if err := os.RemoveAll(fileStore.workingDirPath); err != nil {
-		fileStore.logger.Warn("Unable to delete the local working directory", "dir", fileStore.workingDirPath,
-			"error", err)
-		return
-	}
-	fileStore.logger.Info("Successfully deleted working directory", "dir", fileStore.workingDirPath)
-}
-
-func (fileStore *FileStore) pathFor(fn string) string {
-	return filepath.Join(fileStore.workingDirPath, fn)
-}
-
 func decode(s string) ([]byte, error) {
 	return base64.StdEncoding.DecodeString(s)
 }
diff --git a/pkg/services/ngalert/notifier/file_store_test.go b/pkg/services/ngalert/notifier/file_store_test.go
index 92182396fa0cf..1952eb5a0f142 100644
--- a/pkg/services/ngalert/notifier/file_store_test.go
+++ b/pkg/services/ngalert/notifier/file_store_test.go
@@ -2,95 +2,107 @@ package notifier
 
 import (
 	"context"
-	"os"
-	"path/filepath"
+	"encoding/base64"
+	"strings"
 	"testing"
+	"time"
 
+	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/services/ngalert/tests/fakes"
 )
 
-func TestFileStore_FilepathFor_DirectoryNotExist(t *testing.T) {
+func TestFileStore_Silences(t *testing.T) {
 	store := fakes.NewFakeKVStore(t)
-	workingDir := filepath.Join(t.TempDir(), "notexistdir")
-	fs := NewFileStore(1, store, workingDir)
-	filekey := "silences"
-	filePath := filepath.Join(workingDir, filekey)
+	ctx := context.Background()
+	var orgId int64 = 1
 
-	// With a file already on the database and the path does not exist yet, it creates the path,
-	// writes the file to disk, then returns the filepath.
-	{
-		require.NoError(t, store.Set(context.Background(), 1, KVNamespace, filekey, encode([]byte("silence1,silence3"))))
-		r, err := fs.FilepathFor(context.Background(), filekey)
-		require.NoError(t, err)
-		require.Equal(t, filePath, r)
-		f, err := os.ReadFile(filepath.Clean(filePath))
-		require.NoError(t, err)
-		require.Equal(t, "silence1,silence3", string(f))
-		require.NoError(t, os.Remove(filePath))
-		require.NoError(t, store.Del(context.Background(), 1, KVNamespace, filekey))
+	// Initialize kvstore.
+	now := time.Now()
+	oneHour := now.Add(time.Hour)
+	initialState := silenceState{
+		"1": createSilence("1", now, oneHour),
+		"2": createSilence("2", now, oneHour),
 	}
-}
-func TestFileStore_FilepathFor(t *testing.T) {
-	store := fakes.NewFakeKVStore(t)
-	workingDir := t.TempDir()
-	fs := NewFileStore(1, store, workingDir)
-	filekey := "silences"
-	filePath := filepath.Join(workingDir, filekey)
+	decodedState, err := initialState.MarshalBinary()
+	require.NoError(t, err)
+	encodedState := base64.StdEncoding.EncodeToString(decodedState)
+	err = store.Set(ctx, orgId, KVNamespace, SilencesFilename, encodedState)
+	require.NoError(t, err)
+
+	fs := NewFileStore(orgId, store)
 
-	// With a file already on disk, it returns the existing file's filepath and no modification to the original file.
-	{
-		require.NoError(t, os.WriteFile(filePath, []byte("silence1,silence2"), 0644))
-		r, err := fs.FilepathFor(context.Background(), filekey)
-		require.NoError(t, err)
-		require.Equal(t, filePath, r)
-		f, err := os.ReadFile(filepath.Clean(filePath))
-		require.NoError(t, err)
-		require.Equal(t, "silence1,silence2", string(f))
-		require.NoError(t, os.Remove(filePath))
+	// Load initial.
+	silences, err := fs.GetSilences(ctx)
+	require.NoError(t, err)
+	decoded, err := decodeSilenceState(strings.NewReader(silences))
+	require.NoError(t, err)
+	if !cmp.Equal(initialState, decoded) {
+		t.Errorf("Unexpected Diff: %v", cmp.Diff(initialState, decoded))
 	}
 
-	// With a file already on the database, it writes the file to disk and returns the filepath.
-	{
-		require.NoError(t, store.Set(context.Background(), 1, KVNamespace, filekey, encode([]byte("silence1,silence3"))))
-		r, err := fs.FilepathFor(context.Background(), filekey)
-		require.NoError(t, err)
-		require.Equal(t, filePath, r)
-		f, err := os.ReadFile(filepath.Clean(filePath))
-		require.NoError(t, err)
-		require.Equal(t, "silence1,silence3", string(f))
-		require.NoError(t, os.Remove(filePath))
-		require.NoError(t, store.Del(context.Background(), 1, KVNamespace, filekey))
+	// Save new.
+	newState := silenceState{
+		"a": createSilence("a", now, oneHour),
+		"b": createSilence("b", now, oneHour),
 	}
+	size, err := fs.SaveSilences(ctx, newState)
+	require.NoError(t, err)
+	require.EqualValues(t, len(decodedState), size)
 
-	// With no file on disk or database, it returns the original filepath.
-	{
-		r, err := fs.FilepathFor(context.Background(), filekey)
-		require.NoError(t, err)
-		require.Equal(t, filePath, r)
-		_, err = os.ReadFile(filepath.Clean(filePath))
-		require.Error(t, err)
+	// Load new.
+	silences, err = fs.GetSilences(ctx)
+	require.NoError(t, err)
+	decoded, err = decodeSilenceState(strings.NewReader(silences))
+	require.NoError(t, err)
+	if !cmp.Equal(newState, decoded) {
+		t.Errorf("Unexpected Diff: %v", cmp.Diff(newState, decoded))
 	}
 }
 
-func TestFileStore_Persist(t *testing.T) {
+func TestFileStore_NotificationLog(t *testing.T) {
 	store := fakes.NewFakeKVStore(t)
-	state := &fakeState{data: "something to marshal"}
-	workingDir := t.TempDir()
-	fs := NewFileStore(1, store, workingDir)
-	filekey := "silences"
+	ctx := context.Background()
+	var orgId int64 = 1
 
-	size, err := fs.Persist(context.Background(), filekey, state)
+	// Initialize kvstore.
+	now := time.Now()
+	oneHour := now.Add(time.Hour)
+	k1, v1 := createNotificationLog("group1", "receiver1", now, oneHour)
+	k2, v2 := createNotificationLog("group2", "receiver2", now, oneHour)
+	initialState := nflogState{k1: v1, k2: v2}
+	decodedState, err := initialState.MarshalBinary()
 	require.NoError(t, err)
-	require.Equal(t, int64(20), size)
-	store.Mtx.Lock()
-	require.Len(t, store.Store, 1)
-	store.Mtx.Unlock()
-	v, ok, err := store.Get(context.Background(), 1, KVNamespace, filekey)
+	encodedState := base64.StdEncoding.EncodeToString(decodedState)
+	err = store.Set(ctx, orgId, KVNamespace, NotificationLogFilename, encodedState)
 	require.NoError(t, err)
-	require.True(t, ok)
-	b, err := decode(v)
+
+	fs := NewFileStore(orgId, store)
+
+	// Load initial.
+	nflog, err := fs.GetNotificationLog(ctx)
+	require.NoError(t, err)
+	decoded, err := decodeNflogState(strings.NewReader(nflog))
+	require.NoError(t, err)
+	if !cmp.Equal(initialState, decoded) {
+		t.Errorf("Unexpected Diff: %v", cmp.Diff(initialState, decoded))
+	}
+
+	// Save new.
+	k1, v1 = createNotificationLog("groupA", "receiverA", now, oneHour)
+	k2, v2 = createNotificationLog("groupB", "receiverB", now, oneHour)
+	newState := nflogState{k1: v1, k2: v2}
+	size, err := fs.SaveNotificationLog(ctx, newState)
+	require.NoError(t, err)
+	require.EqualValues(t, len(decodedState), size)
+
+	// Load new.
+	nflog, err = fs.GetNotificationLog(ctx)
 	require.NoError(t, err)
-	require.Equal(t, "something to marshal", string(b))
+	decoded, err = decodeNflogState(strings.NewReader(nflog))
+	require.NoError(t, err)
+	if !cmp.Equal(newState, decoded) {
+		t.Errorf("Unexpected Diff: %v", cmp.Diff(newState, decoded))
+	}
 }
diff --git a/pkg/services/ngalert/notifier/multiorg_alertmanager.go b/pkg/services/ngalert/notifier/multiorg_alertmanager.go
index e20df5688e4cc..54db57c223d76 100644
--- a/pkg/services/ngalert/notifier/multiorg_alertmanager.go
+++ b/pkg/services/ngalert/notifier/multiorg_alertmanager.go
@@ -3,19 +3,17 @@ package notifier
 import (
 	"context"
 	"fmt"
-	"os"
-	"path/filepath"
-	"strconv"
 	"sync"
 	"time"
 
-	"github.com/prometheus/alertmanager/cluster"
+	alertingCluster "github.com/grafana/alerting/cluster"
 	"github.com/prometheus/client_golang/prometheus"
 
 	alertingNotify "github.com/grafana/alerting/notify"
 
 	"github.com/grafana/grafana/pkg/infra/kvstore"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
@@ -30,6 +28,7 @@ var (
 	ErrAlertmanagerNotReady = fmt.Errorf("Alertmanager is not ready yet")
 )
 
+//go:generate mockery --name Alertmanager --structname AlertmanagerMock --with-expecter --output alertmanager_mock --outpkg alertmanager_mock
 type Alertmanager interface {
 	// Configuration
 	ApplyConfig(context.Context, *models.AlertConfiguration) error
@@ -57,7 +56,6 @@ type Alertmanager interface {
 	CleanUp()
 	StopAndWait()
 	Ready() bool
-	OrgID() int64
 }
 
 type MultiOrgAlertmanager struct {
@@ -67,8 +65,9 @@ type MultiOrgAlertmanager struct {
 	alertmanagersMtx sync.RWMutex
 	alertmanagers    map[int64]Alertmanager
 
-	settings *setting.Cfg
-	logger   log.Logger
+	settings       *setting.Cfg
+	featureManager featuremgmt.FeatureToggles
+	logger         log.Logger
 
 	// clusterPeer represents the clustering peers of Alertmanagers between Grafana instances.
 	peer         alertingNotify.ClusterPeer
@@ -77,7 +76,7 @@ type MultiOrgAlertmanager struct {
 	configStore AlertingStore
 	orgStore    store.OrgStore
 	kvStore     kvstore.KVStore
-	factory     orgAlertmanagerFactory
+	factory     OrgAlertmanagerFactory
 
 	decryptFn alertingNotify.GetDecryptedValueFn
 
@@ -85,34 +84,45 @@ type MultiOrgAlertmanager struct {
 	ns      notifications.Service
 }
 
-type orgAlertmanagerFactory func(ctx context.Context, orgID int64) (Alertmanager, error)
+type OrgAlertmanagerFactory func(ctx context.Context, orgID int64) (Alertmanager, error)
 
 type Option func(*MultiOrgAlertmanager)
 
-func WithAlertmanagerOverride(f orgAlertmanagerFactory) Option {
+func WithAlertmanagerOverride(f func(OrgAlertmanagerFactory) OrgAlertmanagerFactory) Option {
 	return func(moa *MultiOrgAlertmanager) {
-		moa.factory = f
+		moa.factory = f(moa.factory)
 	}
 }
 
-func NewMultiOrgAlertmanager(cfg *setting.Cfg, configStore AlertingStore, orgStore store.OrgStore,
-	kvStore kvstore.KVStore, provStore provisioningStore, decryptFn alertingNotify.GetDecryptedValueFn,
-	m *metrics.MultiOrgAlertmanager, ns notifications.Service, l log.Logger, s secrets.Service, opts ...Option,
+func NewMultiOrgAlertmanager(
+	cfg *setting.Cfg,
+	configStore AlertingStore,
+	orgStore store.OrgStore,
+	kvStore kvstore.KVStore,
+	provStore provisioningStore,
+	decryptFn alertingNotify.GetDecryptedValueFn,
+	m *metrics.MultiOrgAlertmanager,
+	ns notifications.Service,
+	l log.Logger,
+	s secrets.Service,
+	featureManager featuremgmt.FeatureToggles,
+	opts ...Option,
 ) (*MultiOrgAlertmanager, error) {
 	moa := &MultiOrgAlertmanager{
 		Crypto:    NewCrypto(s, configStore, l),
 		ProvStore: provStore,
 
-		logger:        l,
-		settings:      cfg,
-		alertmanagers: map[int64]Alertmanager{},
-		configStore:   configStore,
-		orgStore:      orgStore,
-		kvStore:       kvStore,
-		decryptFn:     decryptFn,
-		metrics:       m,
-		ns:            ns,
-		peer:          &NilPeer{},
+		logger:         l,
+		settings:       cfg,
+		featureManager: featureManager,
+		alertmanagers:  map[int64]Alertmanager{},
+		configStore:    configStore,
+		orgStore:       orgStore,
+		kvStore:        kvStore,
+		decryptFn:      decryptFn,
+		metrics:        m,
+		ns:             ns,
+		peer:           &NilPeer{},
 	}
 
 	if err := moa.setupClustering(cfg); err != nil {
@@ -122,7 +132,8 @@ func NewMultiOrgAlertmanager(cfg *setting.Cfg, configStore AlertingStore, orgSto
 	// Set up the default per tenant Alertmanager factory.
 	moa.factory = func(ctx context.Context, orgID int64) (Alertmanager, error) {
 		m := metrics.NewAlertmanagerMetrics(moa.metrics.GetOrCreateOrgRegistry(orgID))
-		return newAlertmanager(ctx, orgID, moa.settings, moa.configStore, moa.kvStore, moa.peer, moa.decryptFn, moa.ns, m)
+		stateStore := NewFileStore(orgID, kvStore)
+		return NewAlertmanager(ctx, orgID, moa.settings, moa.configStore, stateStore, moa.peer, moa.decryptFn, moa.ns, m, featureManager.IsEnabled(ctx, featuremgmt.FlagAlertingSimplifiedRouting))
 	}
 
 	for _, opt := range opts {
@@ -137,7 +148,7 @@ func (moa *MultiOrgAlertmanager) setupClustering(cfg *setting.Cfg) error {
 	// We set the settlement timeout to be a multiple of the gossip interval,
 	// ensuring that a sufficient number of broadcasts have occurred, thereby
 	// increasing the probability of success when waiting for the cluster to settle.
-	const settleTimeout = cluster.DefaultGossipInterval * 10
+	const settleTimeout = alertingCluster.DefaultGossipInterval * 10
 	// Redis setup.
 	if cfg.UnifiedAlerting.HARedisAddr != "" {
 		redisPeer, err := newRedisPeer(redisConfig{
@@ -160,7 +171,7 @@ func (moa *MultiOrgAlertmanager) setupClustering(cfg *setting.Cfg) error {
 	}
 	// Memberlist setup.
 	if len(cfg.UnifiedAlerting.HAPeers) > 0 {
-		peer, err := cluster.Create(
+		peer, err := alertingCluster.Create(
 			clusterLogger,
 			moa.metrics.Registerer,
 			cfg.UnifiedAlerting.HAListenAddr,
@@ -169,9 +180,9 @@ func (moa *MultiOrgAlertmanager) setupClustering(cfg *setting.Cfg) error {
 			true,
 			cfg.UnifiedAlerting.HAPushPullInterval,
 			cfg.UnifiedAlerting.HAGossipInterval,
-			cluster.DefaultTCPTimeout,
-			cluster.DefaultProbeTimeout,
-			cluster.DefaultProbeInterval,
+			alertingCluster.DefaultTCPTimeout,
+			alertingCluster.DefaultProbeTimeout,
+			alertingCluster.DefaultProbeInterval,
 			nil,
 			true,
 			cfg.UnifiedAlerting.HALabel,
@@ -181,7 +192,7 @@ func (moa *MultiOrgAlertmanager) setupClustering(cfg *setting.Cfg) error {
 			return fmt.Errorf("unable to initialize gossip mesh: %w", err)
 		}
 
-		err = peer.Join(cluster.DefaultReconnectInterval, cluster.DefaultReconnectTimeout)
+		err = peer.Join(alertingCluster.DefaultReconnectInterval, alertingCluster.DefaultReconnectTimeout)
 		if err != nil {
 			moa.logger.Error("Msg", "Unable to join gossip mesh while initializing cluster for high availability mode", "error", err)
 		}
@@ -269,6 +280,7 @@ func (moa *MultiOrgAlertmanager) SyncAlertmanagersForOrgs(ctx context.Context, o
 			am, err := moa.factory(ctx, orgID)
 			if err != nil {
 				moa.logger.Error("Unable to create Alertmanager for org", "org", orgID, "error", err)
+				continue
 			}
 			moa.alertmanagers[orgID] = am
 			alertmanager = am
@@ -317,46 +329,15 @@ func (moa *MultiOrgAlertmanager) SyncAlertmanagersForOrgs(ctx context.Context, o
 		am.CleanUp()
 	}
 
-	// We look for orphan directories and remove them. Orphan directories can
-	// occur when an organization is deleted and the node running Grafana is
-	// shutdown before the next sync is executed.
 	moa.cleanupOrphanLocalOrgState(ctx, orgsFound)
 }
 
-// cleanupOrphanLocalOrgState will check if there is any organization on
-// disk that is not part of the active organizations. If this is the case
-// it will delete the local state from disk.
+// cleanupOrphanLocalOrgState will remove all orphaned nflog and silence states in kvstore by existing to currently
+// active organizations. The original intention for this was the cleanup deleted orgs, that have had their states
+// saved to the kvstore after deletion on instance shutdown.
 func (moa *MultiOrgAlertmanager) cleanupOrphanLocalOrgState(ctx context.Context,
 	activeOrganizations map[int64]struct{}) {
-	dataDir := filepath.Join(moa.settings.DataPath, workingDir)
-	files, err := os.ReadDir(dataDir)
-	if err != nil {
-		moa.logger.Error("Failed to list local working directory", "dir", dataDir, "error", err)
-		return
-	}
-	for _, file := range files {
-		if !file.IsDir() {
-			moa.logger.Warn("Ignoring unexpected file while scanning local working directory", "filename", filepath.Join(dataDir, file.Name()))
-			continue
-		}
-		orgID, err := strconv.ParseInt(file.Name(), 10, 64)
-		if err != nil {
-			moa.logger.Error("Unable to parse orgID from directory name", "name", file.Name(), "error", err)
-			continue
-		}
-		_, exists := activeOrganizations[orgID]
-		if !exists {
-			moa.logger.Info("Found orphan organization directory", "orgID", orgID)
-			workingDirPath := filepath.Join(dataDir, strconv.FormatInt(orgID, 10))
-			fileStore := NewFileStore(orgID, moa.kvStore, workingDirPath)
-			// Clean up all the remaining resources from this alertmanager.
-			fileStore.CleanUp()
-		}
-	}
-	// Remove all orphaned items from kvstore by listing all existing items
-	// in our used namespace and comparing them to the currently active
-	// organizations.
-	storedFiles := []string{notificationLogFilename, silencesFilename}
+	storedFiles := []string{NotificationLogFilename, SilencesFilename}
 	for _, fileName := range storedFiles {
 		keys, err := moa.kvStore.Keys(ctx, kvstore.AllOrganizations, KVNamespace, fileName)
 		if err != nil {
@@ -384,7 +365,7 @@ func (moa *MultiOrgAlertmanager) StopAndWait() {
 		am.StopAndWait()
 	}
 
-	p, ok := moa.peer.(*cluster.Peer)
+	p, ok := moa.peer.(*alertingCluster.Peer)
 	if ok {
 		moa.settleCancel()
 		if err := p.Leave(10 * time.Second); err != nil {
@@ -422,7 +403,7 @@ type NilPeer struct{}
 
 func (p *NilPeer) Position() int                   { return 0 }
 func (p *NilPeer) WaitReady(context.Context) error { return nil }
-func (p *NilPeer) AddState(string, cluster.State, prometheus.Registerer) cluster.ClusterChannel {
+func (p *NilPeer) AddState(string, alertingCluster.State, prometheus.Registerer) alertingCluster.ClusterChannel {
 	return &NilChannel{}
 }
 
diff --git a/pkg/services/ngalert/notifier/multiorg_alertmanager_remote_test.go b/pkg/services/ngalert/notifier/multiorg_alertmanager_remote_test.go
new file mode 100644
index 0000000000000..7502bc85408ec
--- /dev/null
+++ b/pkg/services/ngalert/notifier/multiorg_alertmanager_remote_test.go
@@ -0,0 +1,278 @@
+package notifier_test
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+	"time"
+
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/notifier"
+	"github.com/grafana/grafana/pkg/services/ngalert/remote"
+	remoteClient "github.com/grafana/grafana/pkg/services/ngalert/remote/client"
+	ngfakes "github.com/grafana/grafana/pkg/services/ngalert/tests/fakes"
+	"github.com/grafana/grafana/pkg/services/secrets/fakes"
+	secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+func TestMultiorgAlertmanager_RemoteSecondaryMode(t *testing.T) {
+	ctx := context.Background()
+	nopLogger := log.NewNopLogger()
+	tenantID := "testTenantID"
+	password := "testPassword"
+	reg := prometheus.NewPedanticRegistry()
+	m := metrics.NewNGAlert(reg)
+
+	// We're gonna use an test server to send configuration and state to.
+	fakeAM := newFakeRemoteAlertmanager(t, tenantID, password)
+	testsrv := httptest.NewServer(fakeAM)
+
+	// We'll start with the default config and no values for silences and notifications.
+	kvStore := ngfakes.NewFakeKVStore(t)
+	require.NoError(t, kvStore.Set(ctx, 1, "alertmanager", notifier.SilencesFilename, ""))
+	require.NoError(t, kvStore.Set(ctx, 1, "alertmanager", notifier.NotificationLogFilename, ""))
+	configStore := notifier.NewFakeConfigStore(t, map[int64]*models.AlertConfiguration{
+		1: {
+			OrgID:                     1,
+			AlertmanagerConfiguration: setting.GetAlertmanagerDefaultConfiguration(),
+			CreatedAt:                 time.Now().Unix(),
+			Default:                   true,
+		},
+	})
+
+	// Create the factory function for the MOA using the forked Alertmanager in remote secondary mode.
+	secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore())
+	override := notifier.WithAlertmanagerOverride(func(factoryFn notifier.OrgAlertmanagerFactory) notifier.OrgAlertmanagerFactory {
+		return func(ctx context.Context, orgID int64) (notifier.Alertmanager, error) {
+			// Create internal Alertmanager.
+			internalAM, err := factoryFn(ctx, orgID)
+			require.NoError(t, err)
+
+			// Create remote Alertmanager.
+			externalAMCfg := remote.AlertmanagerConfig{
+				OrgID:             1,
+				URL:               testsrv.URL,
+				TenantID:          tenantID,
+				BasicAuthPassword: password,
+			}
+			m := metrics.NewRemoteAlertmanagerMetrics(prometheus.NewRegistry())
+			remoteAM, err := remote.NewAlertmanager(externalAMCfg, notifier.NewFileStore(orgID, kvStore), secretsService.Decrypt, m)
+			require.NoError(t, err)
+
+			// Use both Alertmanager implementations in the forked Alertmanager.
+			cfg := remote.RemoteSecondaryConfig{
+				Logger: nopLogger,
+				OrgID:  orgID,
+				Store:  configStore,
+				// Note that we're setting a sync interval of 10 seconds.
+				SyncInterval: 10 * time.Second,
+			}
+			return remote.NewRemoteSecondaryForkedAlertmanager(cfg, internalAM, remoteAM)
+		}
+	})
+
+	cfg := &setting.Cfg{
+		DataPath: t.TempDir(),
+		UnifiedAlerting: setting.UnifiedAlertingSettings{
+			AlertmanagerConfigPollInterval: 3 * time.Minute,
+			DefaultConfiguration:           setting.GetAlertmanagerDefaultConfiguration(),
+		}, // do not poll in tests.
+	}
+	moa, err := notifier.NewMultiOrgAlertmanager(
+		cfg,
+		configStore,
+		notifier.NewFakeOrgStore(t, []int64{1}),
+		kvStore,
+		ngfakes.NewFakeProvisioningStore(),
+		secretsService.GetDecryptedValue,
+		m.GetMultiOrgAlertmanagerMetrics(),
+		nil,
+		nopLogger,
+		secretsService,
+		&featuremgmt.FeatureManager{},
+		override,
+	)
+	require.NoError(t, err)
+
+	// It should send config and state on startup.
+	var lastConfig *remoteClient.UserGrafanaConfig
+	var lastState *remoteClient.UserGrafanaState
+	{
+		// We should start with no config and no state in the external Alertmanager.
+		require.Empty(t, fakeAM.config)
+		require.Empty(t, fakeAM.state)
+
+		// On the first sync (startup), both config and state should be updated.
+		require.NoError(t, moa.LoadAndSyncAlertmanagersForOrgs(ctx))
+		require.NotEmpty(t, fakeAM.config)
+		require.NotEmpty(t, fakeAM.state)
+		lastConfig, lastState = fakeAM.config, fakeAM.state
+	}
+
+	// It should send config and state on an interval.
+	{
+		// Let's change the configuration and state.
+		require.NoError(t, configStore.SaveAlertmanagerConfiguration(ctx, &models.SaveAlertmanagerConfigurationCmd{
+			AlertmanagerConfiguration: validConfig,
+			OrgID:                     1,
+			LastApplied:               time.Now().Unix(),
+		}))
+		require.NoError(t, kvStore.Set(ctx, 1, "alertmanager", notifier.SilencesFilename, "dGVzdAo="))        // base64-encoded string "test"
+		require.NoError(t, kvStore.Set(ctx, 1, "alertmanager", notifier.NotificationLogFilename, "dGVzdAo=")) // base64-encoded string "test"
+
+		// The sync interval (10s) has not elapsed yet, syncing should have no effect.
+		require.NoError(t, moa.LoadAndSyncAlertmanagersForOrgs(ctx))
+		require.Equal(t, fakeAM.config, lastConfig)
+		require.Equal(t, fakeAM.state, lastState)
+
+		// Syncing after the sync interval elapses should update both config and state.
+		require.Eventually(t, func() bool {
+			require.NoError(t, moa.LoadAndSyncAlertmanagersForOrgs(ctx))
+			return fakeAM.config != lastConfig && fakeAM.state != lastState
+		}, 15*time.Second, 300*time.Millisecond)
+		lastConfig, lastState = fakeAM.config, fakeAM.state
+	}
+
+	// It should send config and state on shutdown.
+	{
+		// Let's change the configuration and state again.
+		require.NoError(t, configStore.SaveAlertmanagerConfiguration(ctx, &models.SaveAlertmanagerConfigurationCmd{
+			AlertmanagerConfiguration: setting.GetAlertmanagerDefaultConfiguration(),
+			Default:                   true,
+			OrgID:                     1,
+			LastApplied:               time.Now().Unix(),
+		}))
+		require.NoError(t, kvStore.Set(ctx, 1, "alertmanager", notifier.SilencesFilename, "dGVzdC0yCg=="))        // base64-encoded string "test-2"
+		require.NoError(t, kvStore.Set(ctx, 1, "alertmanager", notifier.NotificationLogFilename, "dGVzdC0yCg==")) // base64-encoded string "test-2"
+
+		// Both state and config should be updated when shutting the Alertmanager down.
+		moa.StopAndWait()
+		require.NotEqual(t, fakeAM.config, lastConfig)
+		require.NotEqual(t, fakeAM.state, lastState)
+	}
+}
+
+func newFakeRemoteAlertmanager(t *testing.T, user, pass string) *fakeRemoteAlertmanager {
+	return &fakeRemoteAlertmanager{
+		t:        t,
+		username: user,
+		password: pass,
+	}
+}
+
+type fakeRemoteAlertmanager struct {
+	t        *testing.T
+	config   *remoteClient.UserGrafanaConfig
+	state    *remoteClient.UserGrafanaState
+	username string
+	password string
+}
+
+// ServeHTTP handles all routes we need for getting and setting state and config.
+func (f *fakeRemoteAlertmanager) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	w.Header().Add("Content-Type", "application/json")
+
+	// Check that basic auth is in place.
+	user, pass, ok := r.BasicAuth()
+	require.True(f.t, ok)
+	require.Equal(f.t, f.username, user)
+	require.Equal(f.t, f.password, pass)
+
+	switch r.Method {
+	// GET routes
+	case http.MethodGet:
+		switch r.RequestURI {
+		case "/alertmanager/-/ready":
+			// Make the readiness check succeed.
+			w.WriteHeader(http.StatusOK)
+		case "/api/v1/grafana/config":
+			f.getConfig(w)
+		case "/api/v1/grafana/state":
+			f.getState(w)
+		default:
+			w.WriteHeader(http.StatusNotFound)
+		}
+
+	// POST routes
+	case http.MethodPost:
+		switch r.RequestURI {
+		case "/api/v1/grafana/config":
+			f.postConfig(w, r)
+		case "/api/v1/grafana/state":
+			f.postState(w, r)
+		default:
+			w.WriteHeader(http.StatusNotFound)
+		}
+	}
+}
+
+type response struct {
+	Data   any    `json:"data"`
+	Status string `json:"status"`
+}
+
+func (f *fakeRemoteAlertmanager) postConfig(w http.ResponseWriter, r *http.Request) {
+	var cfg remoteClient.UserGrafanaConfig
+	require.NoError(f.t, json.NewDecoder(r.Body).Decode(&cfg))
+
+	f.config = &cfg
+	w.WriteHeader(http.StatusCreated)
+	require.NoError(f.t, json.NewEncoder(w).Encode(response{Status: "success"}))
+}
+
+func (f *fakeRemoteAlertmanager) getConfig(w http.ResponseWriter) {
+	res := response{
+		Data:   f.config,
+		Status: "success",
+	}
+	require.NoError(f.t, json.NewEncoder(w).Encode(res))
+}
+
+func (f *fakeRemoteAlertmanager) postState(w http.ResponseWriter, r *http.Request) {
+	var state remoteClient.UserGrafanaState
+	require.NoError(f.t, json.NewDecoder(r.Body).Decode(&state))
+
+	f.state = &state
+	w.WriteHeader(http.StatusCreated)
+	require.NoError(f.t, json.NewEncoder(w).Encode(response{Status: "success"}))
+}
+
+func (f *fakeRemoteAlertmanager) getState(w http.ResponseWriter) {
+	res := response{
+		Data:   f.state,
+		Status: "success",
+	}
+	require.NoError(f.t, json.NewEncoder(w).Encode(res))
+}
+
+var validConfig = `{
+	"template_files": {
+		"a": "template"
+	},
+	"alertmanager_config": {
+		"route": {
+			"receiver": "grafana-default-email"
+		},
+		"receivers": [{
+			"name": "grafana-default-email",
+			"grafana_managed_receiver_configs": [{
+				"uid": "",
+				"name": "email receiver",
+				"type": "email",
+				"isDefault": true,
+				"settings": {
+					"addresses": "<example@email.com>"
+				}
+			}]
+		}]
+	}
+}`
diff --git a/pkg/services/ngalert/notifier/multiorg_alertmanager_test.go b/pkg/services/ngalert/notifier/multiorg_alertmanager_test.go
index b6cdbf992565d..b0af44fe8fa0d 100644
--- a/pkg/services/ngalert/notifier/multiorg_alertmanager_test.go
+++ b/pkg/services/ngalert/notifier/multiorg_alertmanager_test.go
@@ -3,10 +3,6 @@ package notifier
 import (
 	"bytes"
 	"context"
-	"errors"
-	"io/fs"
-	"os"
-	"path/filepath"
 	"testing"
 	"time"
 
@@ -15,9 +11,9 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
-	"github.com/grafana/grafana/pkg/services/ngalert/provisioning"
 	"github.com/grafana/grafana/pkg/services/ngalert/store"
 	ngfakes "github.com/grafana/grafana/pkg/services/ngalert/tests/fakes"
 	"github.com/grafana/grafana/pkg/services/secrets/fakes"
@@ -33,7 +29,7 @@ func TestMultiOrgAlertmanager_SyncAlertmanagersForOrgs(t *testing.T) {
 
 	tmpDir := t.TempDir()
 	kvStore := ngfakes.NewFakeKVStore(t)
-	provStore := provisioning.NewFakeProvisioningStore()
+	provStore := ngfakes.NewFakeProvisioningStore()
 	secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore())
 	decryptFn := secretsService.GetDecryptedValue
 	reg := prometheus.NewPedanticRegistry()
@@ -46,7 +42,7 @@ func TestMultiOrgAlertmanager_SyncAlertmanagersForOrgs(t *testing.T) {
 			DisabledOrgs:                   map[int64]struct{}{5: {}},
 		}, // do not poll in tests.
 	}
-	mam, err := NewMultiOrgAlertmanager(cfg, configStore, orgStore, kvStore, provStore, decryptFn, m.GetMultiOrgAlertmanagerMetrics(), nil, log.New("testlogger"), secretsService)
+	mam, err := NewMultiOrgAlertmanager(cfg, configStore, orgStore, kvStore, provStore, decryptFn, m.GetMultiOrgAlertmanagerMetrics(), nil, log.New("testlogger"), secretsService, &featuremgmt.FeatureManager{})
 	require.NoError(t, err)
 	ctx := context.Background()
 
@@ -108,47 +104,22 @@ grafana_alerting_discovered_configurations 4
 	// Orphaned state should be removed.
 	{
 		orgID := int64(6)
-		// First we create a directory and two files for an ograniztation that
-		// is not existing in the current state.
-		orphanDir := filepath.Join(tmpDir, "alerting", "6")
-		err := os.Mkdir(orphanDir, 0750)
-		require.NoError(t, err)
 
-		silencesPath := filepath.Join(orphanDir, silencesFilename)
-		err = os.WriteFile(silencesPath, []byte("file_1"), 0644)
+		// Populate the kvstore with orphaned records.
+		err = kvStore.Set(ctx, orgID, KVNamespace, SilencesFilename, "file_1")
 		require.NoError(t, err)
 
-		notificationPath := filepath.Join(orphanDir, notificationLogFilename)
-		err = os.WriteFile(notificationPath, []byte("file_2"), 0644)
-		require.NoError(t, err)
-
-		// We make sure that both files are on disk.
-		info, err := os.Stat(silencesPath)
-		require.NoError(t, err)
-		require.Equal(t, info.Name(), silencesFilename)
-		info, err = os.Stat(notificationPath)
-		require.NoError(t, err)
-		require.Equal(t, info.Name(), notificationLogFilename)
-
-		// We also populate the kvstore with orphaned records.
-		err = kvStore.Set(ctx, orgID, KVNamespace, silencesFilename, "file_1")
-		require.NoError(t, err)
-
-		err = kvStore.Set(ctx, orgID, KVNamespace, notificationLogFilename, "file_1")
+		err = kvStore.Set(ctx, orgID, KVNamespace, NotificationLogFilename, "file_1")
 		require.NoError(t, err)
 
 		// Now re run the sync job once.
 		require.NoError(t, mam.LoadAndSyncAlertmanagersForOrgs(ctx))
 
-		// The organization directory should be gone by now.
-		_, err = os.Stat(orphanDir)
-		require.True(t, errors.Is(err, fs.ErrNotExist))
-
 		// The organization kvstore records should be gone by now.
-		_, exists, _ := kvStore.Get(ctx, orgID, KVNamespace, silencesFilename)
+		_, exists, _ := kvStore.Get(ctx, orgID, KVNamespace, SilencesFilename)
 		require.False(t, exists)
 
-		_, exists, _ = kvStore.Get(ctx, orgID, KVNamespace, notificationLogFilename)
+		_, exists, _ = kvStore.Get(ctx, orgID, KVNamespace, NotificationLogFilename)
 		require.False(t, exists)
 	}
 }
@@ -167,7 +138,7 @@ func TestMultiOrgAlertmanager_SyncAlertmanagersForOrgsWithFailures(t *testing.T)
 
 	tmpDir := t.TempDir()
 	kvStore := ngfakes.NewFakeKVStore(t)
-	provStore := provisioning.NewFakeProvisioningStore()
+	provStore := ngfakes.NewFakeProvisioningStore()
 	secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore())
 	decryptFn := secretsService.GetDecryptedValue
 	reg := prometheus.NewPedanticRegistry()
@@ -179,7 +150,7 @@ func TestMultiOrgAlertmanager_SyncAlertmanagersForOrgsWithFailures(t *testing.T)
 			DefaultConfiguration:           setting.GetAlertmanagerDefaultConfiguration(),
 		}, // do not poll in tests.
 	}
-	mam, err := NewMultiOrgAlertmanager(cfg, configStore, orgStore, kvStore, provStore, decryptFn, m.GetMultiOrgAlertmanagerMetrics(), nil, log.New("testlogger"), secretsService)
+	mam, err := NewMultiOrgAlertmanager(cfg, configStore, orgStore, kvStore, provStore, decryptFn, m.GetMultiOrgAlertmanagerMetrics(), nil, log.New("testlogger"), secretsService, &featuremgmt.FeatureManager{})
 	require.NoError(t, err)
 	ctx := context.Background()
 
@@ -261,12 +232,12 @@ func TestMultiOrgAlertmanager_AlertmanagerFor(t *testing.T) {
 		UnifiedAlerting: setting.UnifiedAlertingSettings{AlertmanagerConfigPollInterval: 3 * time.Minute, DefaultConfiguration: setting.GetAlertmanagerDefaultConfiguration()}, // do not poll in tests.
 	}
 	kvStore := ngfakes.NewFakeKVStore(t)
-	provStore := provisioning.NewFakeProvisioningStore()
+	provStore := ngfakes.NewFakeProvisioningStore()
 	secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore())
 	decryptFn := secretsService.GetDecryptedValue
 	reg := prometheus.NewPedanticRegistry()
 	m := metrics.NewNGAlert(reg)
-	mam, err := NewMultiOrgAlertmanager(cfg, configStore, orgStore, kvStore, provStore, decryptFn, m.GetMultiOrgAlertmanagerMetrics(), nil, log.New("testlogger"), secretsService)
+	mam, err := NewMultiOrgAlertmanager(cfg, configStore, orgStore, kvStore, provStore, decryptFn, m.GetMultiOrgAlertmanagerMetrics(), nil, log.New("testlogger"), secretsService, &featuremgmt.FeatureManager{})
 	require.NoError(t, err)
 	ctx := context.Background()
 
@@ -286,8 +257,10 @@ func TestMultiOrgAlertmanager_AlertmanagerFor(t *testing.T) {
 	{
 		am, err := mam.AlertmanagerFor(2)
 		require.NoError(t, err)
+		internalAm, ok := am.(*alertmanager)
+		require.True(t, ok)
 		require.Equal(t, "N/A", *am.GetStatus().VersionInfo.Version)
-		require.Equal(t, int64(2), am.OrgID())
+		require.Equal(t, int64(2), internalAm.orgID)
 	}
 
 	// Let's now remove the previous queried organization.
@@ -311,12 +284,12 @@ func TestMultiOrgAlertmanager_ActivateHistoricalConfiguration(t *testing.T) {
 		UnifiedAlerting: setting.UnifiedAlertingSettings{AlertmanagerConfigPollInterval: 3 * time.Minute, DefaultConfiguration: defaultConfig}, // do not poll in tests.
 	}
 	kvStore := ngfakes.NewFakeKVStore(t)
-	provStore := provisioning.NewFakeProvisioningStore()
+	provStore := ngfakes.NewFakeProvisioningStore()
 	secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore())
 	decryptFn := secretsService.GetDecryptedValue
 	reg := prometheus.NewPedanticRegistry()
 	m := metrics.NewNGAlert(reg)
-	mam, err := NewMultiOrgAlertmanager(cfg, configStore, orgStore, kvStore, provStore, decryptFn, m.GetMultiOrgAlertmanagerMetrics(), nil, log.New("testlogger"), secretsService)
+	mam, err := NewMultiOrgAlertmanager(cfg, configStore, orgStore, kvStore, provStore, decryptFn, m.GetMultiOrgAlertmanagerMetrics(), nil, log.New("testlogger"), secretsService, &featuremgmt.FeatureManager{})
 	require.NoError(t, err)
 	ctx := context.Background()
 
diff --git a/pkg/services/ngalert/notifier/receiver_svc.go b/pkg/services/ngalert/notifier/receiver_svc.go
new file mode 100644
index 0000000000000..aa1f0fbc4452e
--- /dev/null
+++ b/pkg/services/ngalert/notifier/receiver_svc.go
@@ -0,0 +1,201 @@
+package notifier
+
+import (
+	"context"
+	"encoding/base64"
+	"encoding/json"
+	"errors"
+	"slices"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/secrets"
+)
+
+var (
+	// ErrPermissionDenied is returned when the user does not have permission to perform the requested action.
+	ErrPermissionDenied = errors.New("permission denied") // TODO: convert to errutil
+	// ErrNotFound is returned when the requested resource does not exist.
+	ErrNotFound = errors.New("not found") // TODO: convert to errutil
+)
+
+// ReceiverService is the service for managing alertmanager receivers.
+type ReceiverService struct {
+	ac                accesscontrol.AccessControl
+	provisioningStore provisoningStore
+	cfgStore          configStore
+	encryptionService secrets.Service
+	xact              transactionManager
+	log               log.Logger
+}
+
+type configStore interface {
+	GetLatestAlertmanagerConfiguration(ctx context.Context, orgID int64) (*models.AlertConfiguration, error)
+	UpdateAlertmanagerConfiguration(ctx context.Context, cmd *models.SaveAlertmanagerConfigurationCmd) error
+}
+
+type provisoningStore interface {
+	GetProvenances(ctx context.Context, org int64, resourceType string) (map[string]models.Provenance, error)
+}
+
+type transactionManager interface {
+	InTransaction(ctx context.Context, work func(ctx context.Context) error) error
+}
+
+func NewReceiverService(
+	ac accesscontrol.AccessControl,
+	cfgStore configStore,
+	provisioningStore provisoningStore,
+	encryptionService secrets.Service,
+	xact transactionManager,
+	log log.Logger,
+) *ReceiverService {
+	return &ReceiverService{
+		ac:                ac,
+		provisioningStore: provisioningStore,
+		cfgStore:          cfgStore,
+		encryptionService: encryptionService,
+		xact:              xact,
+		log:               log,
+	}
+}
+
+func (rs *ReceiverService) shouldDecrypt(ctx context.Context, user identity.Requester, name string, reqDecrypt bool) (bool, error) {
+	// TODO: migrate to new permission
+	eval := accesscontrol.EvalAny(
+		accesscontrol.EvalPermission(accesscontrol.ActionAlertingReceiversReadSecrets),
+		accesscontrol.EvalPermission(accesscontrol.ActionAlertingProvisioningReadSecrets),
+	)
+
+	decryptAccess, err := rs.ac.Evaluate(ctx, user, eval)
+	if err != nil {
+		return false, err
+	}
+
+	if reqDecrypt && !decryptAccess {
+		return false, ErrPermissionDenied
+	}
+
+	return decryptAccess && reqDecrypt, nil
+}
+
+// GetReceiver returns a receiver by name.
+// The receiver's secure settings are decrypted if requested and the user has access to do so.
+func (rs *ReceiverService) GetReceiver(ctx context.Context, q models.GetReceiverQuery, user identity.Requester) (definitions.GettableApiReceiver, error) {
+	if q.Decrypt && user == nil {
+		return definitions.GettableApiReceiver{}, ErrPermissionDenied
+	}
+
+	baseCfg, err := rs.cfgStore.GetLatestAlertmanagerConfiguration(ctx, q.OrgID)
+	if err != nil {
+		return definitions.GettableApiReceiver{}, err
+	}
+
+	cfg := definitions.PostableUserConfig{}
+	err = json.Unmarshal([]byte(baseCfg.AlertmanagerConfiguration), &cfg)
+	if err != nil {
+		return definitions.GettableApiReceiver{}, err
+	}
+
+	provenances, err := rs.provisioningStore.GetProvenances(ctx, q.OrgID, "contactPoint")
+	if err != nil {
+		return definitions.GettableApiReceiver{}, err
+	}
+
+	receivers := cfg.AlertmanagerConfig.Receivers
+	for _, r := range receivers {
+		if r.Name == q.Name {
+			decrypt, err := rs.shouldDecrypt(ctx, user, q.Name, q.Decrypt)
+			if err != nil {
+				return definitions.GettableApiReceiver{}, err
+			}
+			decryptFn := rs.decryptOrRedact(ctx, decrypt, q.Name, "")
+
+			return PostableToGettableApiReceiver(r, provenances, decryptFn, false)
+		}
+	}
+
+	return definitions.GettableApiReceiver{}, ErrNotFound
+}
+
+// GetReceivers returns a list of receivers a user has access to.
+// Receivers can be filtered by name, and secure settings are decrypted if requested and the user has access to do so.
+func (rs *ReceiverService) GetReceivers(ctx context.Context, q models.GetReceiversQuery, user identity.Requester) ([]definitions.GettableApiReceiver, error) {
+	if q.Decrypt && user == nil {
+		return nil, ErrPermissionDenied
+	}
+
+	baseCfg, err := rs.cfgStore.GetLatestAlertmanagerConfiguration(ctx, q.OrgID)
+	if err != nil {
+		return nil, err
+	}
+
+	cfg := definitions.PostableUserConfig{}
+	err = json.Unmarshal([]byte(baseCfg.AlertmanagerConfiguration), &cfg)
+	if err != nil {
+		return nil, err
+	}
+
+	provenances, err := rs.provisioningStore.GetProvenances(ctx, q.OrgID, "contactPoint")
+	if err != nil {
+		return nil, err
+	}
+
+	eval := accesscontrol.EvalPermission(accesscontrol.ActionAlertingReceiversList)
+	listAccess, err := rs.ac.Evaluate(ctx, user, eval)
+	if err != nil {
+		return nil, err
+	}
+
+	var output []definitions.GettableApiReceiver
+	for i := q.Offset; i < len(cfg.AlertmanagerConfig.Receivers); i++ {
+		r := cfg.AlertmanagerConfig.Receivers[i]
+		if len(q.Names) > 0 && !slices.Contains(q.Names, r.Name) {
+			continue
+		}
+
+		decrypt, err := rs.shouldDecrypt(ctx, user, r.Name, q.Decrypt)
+		if err != nil {
+			return nil, err
+		}
+
+		decryptFn := rs.decryptOrRedact(ctx, decrypt, r.Name, "")
+		listOnly := !decrypt && listAccess
+
+		res, err := PostableToGettableApiReceiver(r, provenances, decryptFn, listOnly)
+		if err != nil {
+			return nil, err
+		}
+
+		output = append(output, res)
+		// stop if we have reached the limit or we have found all the requested receivers
+		if (len(output) == q.Limit && q.Limit > 0) || (len(output) == len(q.Names)) {
+			break
+		}
+	}
+
+	return output, nil
+}
+
+func (rs *ReceiverService) decryptOrRedact(ctx context.Context, decrypt bool, name, fallback string) func(value string) string {
+	return func(value string) string {
+		if !decrypt {
+			return definitions.RedactedValue
+		}
+
+		decoded, err := base64.StdEncoding.DecodeString(value)
+		if err != nil {
+			rs.log.Warn("failed to decode secure setting", "name", name, "error", err)
+			return fallback
+		}
+		decrypted, err := rs.encryptionService.Decrypt(ctx, decoded)
+		if err != nil {
+			rs.log.Warn("failed to decrypt secure setting", "name", name, "error", err)
+			return fallback
+		}
+		return string(decrypted)
+	}
+}
diff --git a/pkg/services/ngalert/notifier/receiver_svc_test.go b/pkg/services/ngalert/notifier/receiver_svc_test.go
new file mode 100644
index 0000000000000..28e477f809529
--- /dev/null
+++ b/pkg/services/ngalert/notifier/receiver_svc_test.go
@@ -0,0 +1,261 @@
+package notifier
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"testing"
+
+	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
+	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/tests/fakes"
+	"github.com/grafana/grafana/pkg/services/secrets"
+	"github.com/grafana/grafana/pkg/services/secrets/database"
+	"github.com/grafana/grafana/pkg/services/secrets/manager"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/stretchr/testify/require"
+)
+
+func TestReceiverService_GetReceiver(t *testing.T) {
+	sqlStore := db.InitTestDB(t)
+	secretsService := manager.SetupTestService(t, database.ProvideSecretsStore(sqlStore))
+
+	t.Run("service gets receiver from AM config", func(t *testing.T) {
+		sut := createReceiverServiceSut(t, secretsService)
+
+		Receiver, err := sut.GetReceiver(context.Background(), singleQ(1, "slack receiver"), nil)
+		require.NoError(t, err)
+		require.Equal(t, "slack receiver", Receiver.Name)
+		require.Len(t, Receiver.GrafanaManagedReceivers, 1)
+		require.Equal(t, "UID2", Receiver.GrafanaManagedReceivers[0].UID)
+	})
+
+	t.Run("service returns error when receiver does not exist", func(t *testing.T) {
+		sut := createReceiverServiceSut(t, secretsService)
+
+		_, err := sut.GetReceiver(context.Background(), singleQ(1, "nonexistent"), nil)
+		require.ErrorIs(t, err, ErrNotFound)
+	})
+}
+
+func TestReceiverService_GetReceivers(t *testing.T) {
+	sqlStore := db.InitTestDB(t)
+	secretsService := manager.SetupTestService(t, database.ProvideSecretsStore(sqlStore))
+
+	t.Run("service gets receivers from AM config", func(t *testing.T) {
+		sut := createReceiverServiceSut(t, secretsService)
+
+		Receivers, err := sut.GetReceivers(context.Background(), multiQ(1), nil)
+		require.NoError(t, err)
+		require.Len(t, Receivers, 2)
+		require.Equal(t, "grafana-default-email", Receivers[0].Name)
+		require.Equal(t, "slack receiver", Receivers[1].Name)
+	})
+
+	t.Run("service filters receivers by name", func(t *testing.T) {
+		sut := createReceiverServiceSut(t, secretsService)
+
+		Receivers, err := sut.GetReceivers(context.Background(), multiQ(1, "slack receiver"), nil)
+		require.NoError(t, err)
+		require.Len(t, Receivers, 1)
+		require.Equal(t, "slack receiver", Receivers[0].Name)
+	})
+}
+
+func TestReceiverService_DecryptRedact(t *testing.T) {
+	sqlStore := db.InitTestDB(t)
+	secretsService := manager.SetupTestService(t, database.ProvideSecretsStore(sqlStore))
+	ac := acimpl.ProvideAccessControl(setting.NewCfg())
+
+	getMethods := []string{"single", "multi"}
+
+	readUser := &user.SignedInUser{
+		OrgID: 1,
+		Permissions: map[int64]map[string][]string{
+			1: {accesscontrol.ActionAlertingProvisioningRead: nil},
+		},
+	}
+
+	secretUser := &user.SignedInUser{
+		OrgID: 1,
+		Permissions: map[int64]map[string][]string{
+			1: {
+				accesscontrol.ActionAlertingProvisioningRead:        nil,
+				accesscontrol.ActionAlertingProvisioningReadSecrets: nil,
+			},
+		},
+	}
+
+	for _, tc := range []struct {
+		name    string
+		decrypt bool
+		user    *user.SignedInUser
+		err     error
+	}{
+		{
+			name:    "service redacts receivers by default",
+			decrypt: false,
+			user:    readUser,
+			err:     nil,
+		},
+		{
+			name:    "service returns error when trying to decrypt without permission",
+			decrypt: true,
+			user:    readUser,
+			err:     ErrPermissionDenied,
+		},
+		{
+			name:    "service returns error if user is nil and decrypt is true",
+			decrypt: true,
+			user:    nil,
+			err:     ErrPermissionDenied,
+		},
+		{
+			name:    "service decrypts receivers with permission",
+			decrypt: true,
+			user:    secretUser,
+			err:     nil,
+		},
+	} {
+		for _, method := range getMethods {
+			t.Run(fmt.Sprintf("%s %s", tc.name, method), func(t *testing.T) {
+				sut := createReceiverServiceSut(t, secretsService)
+				sut.ac = ac
+
+				var res definitions.GettableApiReceiver
+				var err error
+				if method == "single" {
+					q := singleQ(1, "slack receiver")
+					q.Decrypt = tc.decrypt
+					res, err = sut.GetReceiver(context.Background(), q, tc.user)
+				} else {
+					q := multiQ(1, "slack receiver")
+					q.Decrypt = tc.decrypt
+					var multiRes []definitions.GettableApiReceiver
+					multiRes, err = sut.GetReceivers(context.Background(), q, tc.user)
+					if tc.err == nil {
+						require.Len(t, multiRes, 1)
+						res = multiRes[0]
+					}
+				}
+				require.ErrorIs(t, err, tc.err)
+
+				if tc.err == nil {
+					require.Equal(t, "slack receiver", res.Name)
+					require.Len(t, res.GrafanaManagedReceivers, 1)
+					require.Equal(t, "UID2", res.GrafanaManagedReceivers[0].UID)
+
+					testedSettings, err := simplejson.NewJson([]byte(res.GrafanaManagedReceivers[0].Settings))
+					require.NoError(t, err)
+					if tc.decrypt {
+						require.Equal(t, "secure url", testedSettings.Get("url").MustString())
+					} else {
+						require.Equal(t, definitions.RedactedValue, testedSettings.Get("url").MustString())
+					}
+				}
+			})
+		}
+	}
+}
+
+func createReceiverServiceSut(t *testing.T, encryptSvc secrets.Service) *ReceiverService {
+	cfg := createEncryptedConfig(t, encryptSvc)
+	store := fakes.NewFakeAlertmanagerConfigStore(cfg)
+	xact := newNopTransactionManager()
+	provisioningStore := fakes.NewFakeProvisioningStore()
+
+	return &ReceiverService{
+		actest.FakeAccessControl{},
+		provisioningStore,
+		store,
+		encryptSvc,
+		xact,
+		log.NewNopLogger(),
+	}
+}
+
+func createEncryptedConfig(t *testing.T, secretService secrets.Service) string {
+	c := &definitions.PostableUserConfig{}
+	err := json.Unmarshal([]byte(defaultAlertmanagerConfigJSON), c)
+	require.NoError(t, err)
+	err = EncryptReceiverConfigs(c.AlertmanagerConfig.Receivers, func(ctx context.Context, payload []byte) ([]byte, error) {
+		return secretService.Encrypt(ctx, payload, secrets.WithoutScope())
+	})
+	require.NoError(t, err)
+	bytes, err := json.Marshal(c)
+	require.NoError(t, err)
+	return string(bytes)
+}
+
+func singleQ(orgID int64, name string) models.GetReceiverQuery {
+	return models.GetReceiverQuery{
+		OrgID: orgID,
+		Name:  name,
+	}
+}
+
+func multiQ(orgID int64, names ...string) models.GetReceiversQuery {
+	return models.GetReceiversQuery{
+		OrgID: orgID,
+		Names: names,
+	}
+}
+
+const defaultAlertmanagerConfigJSON = `
+{
+	"template_files": null,
+	"alertmanager_config": {
+		"route": {
+			"receiver": "grafana-default-email",
+			"group_by": [
+				"..."
+			],
+			"routes": [{
+				"receiver": "grafana-default-email",
+				"object_matchers": [["a", "=", "b"]]
+			}]
+		},
+		"templates": null,
+		"receivers": [{
+			"name": "grafana-default-email",
+			"grafana_managed_receiver_configs": [{
+				"uid": "UID1",
+				"name": "grafana-default-email",
+				"type": "email",
+				"disableResolveMessage": false,
+				"settings": {
+					"addresses": "\u003cexample@email.com\u003e"
+				},
+				"secureFields": {}
+			}]
+		}, {
+			"name": "slack receiver",
+			"grafana_managed_receiver_configs": [{
+				"uid": "UID2",
+				"name": "slack receiver",
+				"type": "slack",
+				"disableResolveMessage": false,
+				"settings": {},
+				"secureSettings": {"url":"secure url"}
+			}]
+		}]
+	}
+}
+`
+
+type NopTransactionManager struct{}
+
+func newNopTransactionManager() *NopTransactionManager {
+	return &NopTransactionManager{}
+}
+
+func (n *NopTransactionManager) InTransaction(ctx context.Context, work func(ctx context.Context) error) error {
+	return work(context.WithValue(ctx, NopTransactionManager{}, struct{}{}))
+}
diff --git a/pkg/services/ngalert/notifier/redis_channel.go b/pkg/services/ngalert/notifier/redis_channel.go
index e2cf530f54e6a..b7a131dea0d6e 100644
--- a/pkg/services/ngalert/notifier/redis_channel.go
+++ b/pkg/services/ngalert/notifier/redis_channel.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/gogo/protobuf/proto"
-	"github.com/prometheus/alertmanager/cluster"
-	"github.com/prometheus/alertmanager/cluster/clusterpb"
+	alertingCluster "github.com/grafana/alerting/cluster"
+	alertingClusterPB "github.com/grafana/alerting/cluster/clusterpb"
 )
 
 type RedisChannel struct {
@@ -16,7 +16,7 @@ type RedisChannel struct {
 	msgc    chan []byte
 }
 
-func newRedisChannel(p *redisPeer, key, channel, msgType string) cluster.ClusterChannel {
+func newRedisChannel(p *redisPeer, key, channel, msgType string) alertingCluster.ClusterChannel {
 	redisChannel := &RedisChannel{
 		p:       p,
 		key:     key,
@@ -50,7 +50,7 @@ func (c *RedisChannel) handleMessages() {
 }
 
 func (c *RedisChannel) Broadcast(b []byte) {
-	b, err := proto.Marshal(&clusterpb.Part{Key: c.key, Data: b})
+	b, err := proto.Marshal(&alertingClusterPB.Part{Key: c.key, Data: b})
 	if err != nil {
 		c.p.logger.Error("Error marshalling broadcast into proto", "err", err, "channel", c.channel)
 		return
diff --git a/pkg/services/ngalert/notifier/redis_peer.go b/pkg/services/ngalert/notifier/redis_peer.go
index 632019411be9e..0918e79c0a499 100644
--- a/pkg/services/ngalert/notifier/redis_peer.go
+++ b/pkg/services/ngalert/notifier/redis_peer.go
@@ -2,6 +2,7 @@ package notifier
 
 import (
 	"context"
+	"slices"
 	"sort"
 	"strconv"
 	"sync"
@@ -9,10 +10,9 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 	"github.com/google/uuid"
-	"github.com/prometheus/alertmanager/cluster"
-	"github.com/prometheus/alertmanager/cluster/clusterpb"
+	alertingCluster "github.com/grafana/alerting/cluster"
+	alertingClusterPB "github.com/grafana/alerting/cluster/clusterpb"
 	"github.com/prometheus/client_golang/prometheus"
-	"golang.org/x/exp/slices"
 
 	"github.com/redis/go-redis/v9"
 
@@ -54,7 +54,7 @@ type redisPeer struct {
 	redis     *redis.Client
 	prefix    string
 	logger    log.Logger
-	states    map[string]cluster.State
+	states    map[string]alertingCluster.State
 	subs      map[string]*redis.PubSub
 	statesMtx sync.RWMutex
 
@@ -110,7 +110,7 @@ func newRedisPeer(cfg redisConfig, logger log.Logger, reg prometheus.Registerer,
 		name:             name,
 		redis:            rdb,
 		logger:           logger,
-		states:           map[string]cluster.State{},
+		states:           map[string]alertingCluster.State{},
 		subs:             map[string]*redis.PubSub{},
 		pushPullInterval: pushPullInterval,
 		readyc:           make(chan struct{}),
@@ -425,7 +425,7 @@ func (p *redisPeer) Settle(ctx context.Context, interval time.Duration) {
 	close(p.readyc)
 }
 
-func (p *redisPeer) AddState(key string, state cluster.State, _ prometheus.Registerer) cluster.ClusterChannel {
+func (p *redisPeer) AddState(key string, state alertingCluster.State, _ prometheus.Registerer) alertingCluster.ClusterChannel {
 	p.statesMtx.Lock()
 	defer p.statesMtx.Unlock()
 	p.states[key] = state
@@ -453,7 +453,7 @@ func (p *redisPeer) mergePartialState(buf []byte) {
 	p.messagesReceived.WithLabelValues(update).Inc()
 	p.messagesReceivedSize.WithLabelValues(update).Add(float64(len(buf)))
 
-	var part clusterpb.Part
+	var part alertingClusterPB.Part
 	if err := proto.Unmarshal(buf, &part); err != nil {
 		p.logger.Warn("Error decoding the received broadcast message", "err", err)
 		return
@@ -510,7 +510,7 @@ func (p *redisPeer) mergeFullState(buf []byte) {
 	p.messagesReceived.WithLabelValues(fullState).Inc()
 	p.messagesReceivedSize.WithLabelValues(fullState).Add(float64(len(buf)))
 
-	var fs clusterpb.FullState
+	var fs alertingClusterPB.FullState
 	if err := proto.Unmarshal(buf, &fs); err != nil {
 		p.logger.Warn("Error unmarshaling the received remote state", "err", err)
 		return
@@ -564,8 +564,8 @@ func (p *redisPeer) requestFullState() {
 func (p *redisPeer) LocalState() []byte {
 	p.statesMtx.RLock()
 	defer p.statesMtx.RUnlock()
-	all := &clusterpb.FullState{
-		Parts: make([]clusterpb.Part, 0, len(p.states)),
+	all := &alertingClusterPB.FullState{
+		Parts: make([]alertingClusterPB.Part, 0, len(p.states)),
 	}
 
 	for key, s := range p.states {
@@ -573,7 +573,7 @@ func (p *redisPeer) LocalState() []byte {
 		if err != nil {
 			p.logger.Warn("Error encoding the local state", "err", err, "key", key)
 		}
-		all.Parts = append(all.Parts, clusterpb.Part{Key: key, Data: b})
+		all.Parts = append(all.Parts, alertingClusterPB.Part{Key: key, Data: b})
 	}
 	b, err := proto.Marshal(all)
 	if err != nil {
diff --git a/pkg/services/ngalert/notifier/status.go b/pkg/services/ngalert/notifier/status.go
index bae821f6d4023..bcdf065616ca6 100644
--- a/pkg/services/ngalert/notifier/status.go
+++ b/pkg/services/ngalert/notifier/status.go
@@ -9,7 +9,7 @@ import (
 // TODO: We no longer do apimodels at this layer, move it to the API.
 func (am *alertmanager) GetStatus() apimodels.GettableStatus {
 	config := &apimodels.PostableUserConfig{}
-	status := am.Base.GetStatus()
+	status := am.Base.GetStatus() // TODO: This should return a GettableStatus, for now it returns PostableUserConfig.
 	if status == nil {
 		return *apimodels.NewGettableStatus(&config.AlertmanagerConfig)
 	}
diff --git a/pkg/services/ngalert/notifier/testing.go b/pkg/services/ngalert/notifier/testing.go
index ba57d944574e7..3b1a6ea965a52 100644
--- a/pkg/services/ngalert/notifier/testing.go
+++ b/pkg/services/ngalert/notifier/testing.go
@@ -1,13 +1,20 @@
 package notifier
 
 import (
+	"bytes"
 	"context"
 	"crypto/md5"
 	"errors"
 	"fmt"
+	"io"
 	"testing"
 	"time"
 
+	"github.com/matttproud/golang_protobuf_extensions/pbutil"
+	"github.com/prometheus/alertmanager/nflog/nflogpb"
+	"github.com/prometheus/alertmanager/silence/silencepb"
+	"github.com/prometheus/common/model"
+
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/store"
 
@@ -19,6 +26,35 @@ type fakeConfigStore struct {
 
 	// historicConfigs stores configs by orgID.
 	historicConfigs map[int64][]*models.HistoricAlertConfiguration
+
+	// notificationSettings stores notification settings by orgID.
+	notificationSettings map[int64]map[models.AlertRuleKey][]models.NotificationSettings
+}
+
+func (f *fakeConfigStore) ListNotificationSettings(ctx context.Context, q models.ListNotificationSettingsQuery) (map[models.AlertRuleKey][]models.NotificationSettings, error) {
+	settings, ok := f.notificationSettings[q.OrgID]
+	if !ok {
+		return nil, nil
+	}
+	if q.ReceiverName != "" {
+		filteredSettings := make(map[models.AlertRuleKey][]models.NotificationSettings)
+		for key, notificationSettings := range settings {
+			// Current semantics is that we only key entries where any of the settings match the receiver name.
+			var found bool
+			for _, setting := range notificationSettings {
+				if q.ReceiverName == setting.Receiver {
+					found = true
+					break
+				}
+			}
+			if found {
+				filteredSettings[key] = notificationSettings
+			}
+		}
+		return filteredSettings, nil
+	}
+
+	return settings, nil
 }
 
 // Saves the image or returns an error.
@@ -65,8 +101,8 @@ func (f *fakeConfigStore) GetAllLatestAlertmanagerConfiguration(context.Context)
 	return result, nil
 }
 
-func (f *fakeConfigStore) GetLatestAlertmanagerConfiguration(_ context.Context, query *models.GetLatestAlertmanagerConfigurationQuery) (*models.AlertConfiguration, error) {
-	config, ok := f.configs[query.OrgID]
+func (f *fakeConfigStore) GetLatestAlertmanagerConfiguration(_ context.Context, orgID int64) (*models.AlertConfiguration, error) {
+	config, ok := f.configs[orgID]
 	if !ok {
 		return nil, store.ErrNoAlertmanagerConfiguration
 	}
@@ -180,10 +216,10 @@ type FakeOrgStore struct {
 	orgs []int64
 }
 
-func NewFakeOrgStore(t *testing.T, orgs []int64) FakeOrgStore {
+func NewFakeOrgStore(t *testing.T, orgs []int64) *FakeOrgStore {
 	t.Helper()
 
-	return FakeOrgStore{
+	return &FakeOrgStore{
 		orgs: orgs,
 	}
 }
@@ -192,10 +228,132 @@ func (f *FakeOrgStore) GetOrgs(_ context.Context) ([]int64, error) {
 	return f.orgs, nil
 }
 
-type fakeState struct {
-	data string
+type NoValidation struct {
+}
+
+func (n NoValidation) Validate(_ models.NotificationSettings) error {
+	return nil
+}
+
+var errInvalidState = fmt.Errorf("invalid state")
+
+// silenceState copied from state in prometheus-alertmanager/silence/silence.go.
+type silenceState map[string]*silencepb.MeshSilence
+
+// MarshalBinary copied from prometheus-alertmanager/silence/silence.go.
+func (s silenceState) MarshalBinary() ([]byte, error) {
+	var buf bytes.Buffer
+
+	for _, e := range s {
+		if _, err := pbutil.WriteDelimited(&buf, e); err != nil {
+			return nil, err
+		}
+	}
+	return buf.Bytes(), nil
 }
 
-func (fs *fakeState) MarshalBinary() ([]byte, error) {
-	return []byte(fs.data), nil
+// decodeSilenceState copied from decodeState in prometheus-alertmanager/silence/silence.go.
+func decodeSilenceState(r io.Reader) (silenceState, error) {
+	st := silenceState{}
+	for {
+		var s silencepb.MeshSilence
+		_, err := pbutil.ReadDelimited(r, &s)
+		if err == nil {
+			if s.Silence == nil {
+				return nil, errInvalidState
+			}
+			st[s.Silence.Id] = &s
+			continue
+		}
+		//nolint:errorlint
+		if err == io.EOF {
+			break
+		}
+		return nil, err
+	}
+	return st, nil
+}
+
+func createSilence(id string, startsAt, expiresAt time.Time) *silencepb.MeshSilence {
+	return &silencepb.MeshSilence{
+		Silence: &silencepb.Silence{
+			Id: id,
+			Matchers: []*silencepb.Matcher{
+				{
+					Type:    silencepb.Matcher_EQUAL,
+					Name:    model.AlertNameLabel,
+					Pattern: "test_alert",
+				},
+				{
+					Type:    silencepb.Matcher_EQUAL,
+					Name:    models.FolderTitleLabel,
+					Pattern: "test_alert_folder",
+				},
+			},
+			StartsAt:  startsAt,
+			EndsAt:    expiresAt,
+			CreatedBy: "Grafana Test",
+			Comment:   "Test Silence",
+		},
+		ExpiresAt: expiresAt,
+	}
+}
+
+// receiverKey copied from prometheus-alertmanager/nflog/nflog.go.
+func receiverKey(r *nflogpb.Receiver) string {
+	return fmt.Sprintf("%s/%s/%d", r.GroupName, r.Integration, r.Idx)
+}
+
+// stateKey copied from prometheus-alertmanager/nflog/nflog.go.
+func stateKey(k string, r *nflogpb.Receiver) string {
+	return fmt.Sprintf("%s:%s", k, receiverKey(r))
+}
+
+// nflogState copied from state in prometheus-alertmanager/nflog/nflog.go.
+type nflogState map[string]*nflogpb.MeshEntry
+
+// MarshalBinary copied from prometheus-alertmanager/nflog/nflog.go.
+func (s nflogState) MarshalBinary() ([]byte, error) {
+	var buf bytes.Buffer
+
+	for _, e := range s {
+		if _, err := pbutil.WriteDelimited(&buf, e); err != nil {
+			return nil, err
+		}
+	}
+	return buf.Bytes(), nil
+}
+
+// decodeNflogState copied from decodeState in prometheus-alertmanager/nflog/nflog.go.
+func decodeNflogState(r io.Reader) (nflogState, error) {
+	st := nflogState{}
+	for {
+		var e nflogpb.MeshEntry
+		_, err := pbutil.ReadDelimited(r, &e)
+		if err == nil {
+			if e.Entry == nil || e.Entry.Receiver == nil {
+				return nil, errInvalidState
+			}
+			st[stateKey(string(e.Entry.GroupKey), e.Entry.Receiver)] = &e
+			continue
+		}
+		if errors.Is(err, io.EOF) {
+			break
+		}
+		return nil, err
+	}
+	return st, nil
+}
+
+func createNotificationLog(groupKey string, receiverName string, sentAt, expiresAt time.Time) (string, *nflogpb.MeshEntry) {
+	recv := nflogpb.Receiver{GroupName: receiverName, Integration: "test3", Idx: 0}
+	return stateKey(groupKey, &recv), &nflogpb.MeshEntry{
+		Entry: &nflogpb.Entry{
+			GroupKey:  []byte(groupKey),
+			Receiver:  &recv,
+			Resolved:  false,
+			Timestamp: sentAt,
+		},
+		ExpiresAt: expiresAt,
+	}
 }
diff --git a/pkg/services/ngalert/notifier/receivers.go b/pkg/services/ngalert/notifier/testreceivers.go
similarity index 100%
rename from pkg/services/ngalert/notifier/receivers.go
rename to pkg/services/ngalert/notifier/testreceivers.go
diff --git a/pkg/services/ngalert/notifier/receivers_test.go b/pkg/services/ngalert/notifier/testreceivers_test.go
similarity index 100%
rename from pkg/services/ngalert/notifier/receivers_test.go
rename to pkg/services/ngalert/notifier/testreceivers_test.go
diff --git a/pkg/services/ngalert/notifier/validation.go b/pkg/services/ngalert/notifier/validation.go
new file mode 100644
index 0000000000000..835f2f1093478
--- /dev/null
+++ b/pkg/services/ngalert/notifier/validation.go
@@ -0,0 +1,156 @@
+package notifier
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"sync"
+
+	"github.com/prometheus/alertmanager/config"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/store"
+)
+
+type ErrorReferenceInvalid struct {
+	Reference string
+}
+
+type ErrorReceiverDoesNotExist struct {
+	ErrorReferenceInvalid
+}
+type ErrorTimeIntervalDoesNotExist struct {
+	ErrorReferenceInvalid
+}
+
+func (e ErrorReceiverDoesNotExist) Error() string {
+	return fmt.Sprintf("receiver %s does not exist", e.Reference)
+}
+
+func (e ErrorTimeIntervalDoesNotExist) Error() string {
+	return fmt.Sprintf("time interval %s does not exist", e.Reference)
+}
+
+// NotificationSettingsValidator validates NotificationSettings against the current Alertmanager configuration
+type NotificationSettingsValidator interface {
+	Validate(s models.NotificationSettings) error
+}
+
+// staticValidator is a NotificationSettingsValidator that uses static pre-fetched values for available receivers and mute timings.
+type staticValidator struct {
+	availableReceivers     map[string]struct{}
+	availableTimeIntervals map[string]struct{}
+}
+
+// apiAlertingConfig contains the methods required to validate NotificationSettings and create autogen routes.
+type apiAlertingConfig[R receiver] interface {
+	GetReceivers() []R
+	GetMuteTimeIntervals() []config.MuteTimeInterval
+	GetTimeIntervals() []config.TimeInterval
+	GetRoute() *definitions.Route
+}
+
+type receiver interface {
+	GetName() string
+}
+
+// NewNotificationSettingsValidator creates a new NotificationSettingsValidator from the given apiAlertingConfig.
+func NewNotificationSettingsValidator[R receiver](am apiAlertingConfig[R]) NotificationSettingsValidator {
+	availableReceivers := make(map[string]struct{})
+	for _, receiver := range am.GetReceivers() {
+		availableReceivers[receiver.GetName()] = struct{}{}
+	}
+
+	availableTimeIntervals := make(map[string]struct{})
+	for _, interval := range am.GetMuteTimeIntervals() {
+		availableTimeIntervals[interval.Name] = struct{}{}
+	}
+	for _, interval := range am.GetTimeIntervals() {
+		availableTimeIntervals[interval.Name] = struct{}{}
+	}
+
+	return staticValidator{
+		availableReceivers:     availableReceivers,
+		availableTimeIntervals: availableTimeIntervals,
+	}
+}
+
+// Validate checks that models.NotificationSettings is valid and references existing receivers and mute timings.
+func (n staticValidator) Validate(settings models.NotificationSettings) error {
+	if err := settings.Validate(); err != nil {
+		return err
+	}
+	var errs []error
+	if _, ok := n.availableReceivers[settings.Receiver]; !ok {
+		errs = append(errs, ErrorReceiverDoesNotExist{ErrorReferenceInvalid: ErrorReferenceInvalid{Reference: settings.Receiver}})
+	}
+	for _, interval := range settings.MuteTimeIntervals {
+		if _, ok := n.availableTimeIntervals[interval]; !ok {
+			errs = append(errs, ErrorTimeIntervalDoesNotExist{ErrorReferenceInvalid: ErrorReferenceInvalid{Reference: interval}})
+		}
+	}
+	return errors.Join(errs...)
+}
+
+// NotificationSettingsValidatorProvider provides a NotificationSettingsValidator for a given orgID.
+type NotificationSettingsValidatorProvider interface {
+	Validator(ctx context.Context, orgID int64) (NotificationSettingsValidator, error)
+}
+
+// notificationSettingsValidationService provides a new NotificationSettingsValidator for a given orgID by loading the latest Alertmanager configuration.
+type notificationSettingsValidationService struct {
+	store store.AlertingStore
+}
+
+func NewNotificationSettingsValidationService(store store.AlertingStore) NotificationSettingsValidatorProvider {
+	return &notificationSettingsValidationService{
+		store: store,
+	}
+}
+
+// Validator returns a NotificationSettingsValidator using the alertmanager configuration from the given orgID.
+func (v *notificationSettingsValidationService) Validator(ctx context.Context, orgID int64) (NotificationSettingsValidator, error) {
+	rawCfg, err := v.store.GetLatestAlertmanagerConfiguration(ctx, orgID)
+	if err != nil {
+		return staticValidator{}, err
+	}
+	cfg, err := Load([]byte(rawCfg.AlertmanagerConfiguration))
+	if err != nil {
+		return staticValidator{}, err
+	}
+	log.New("ngalert.notifier.validator").FromContext(ctx).Debug("Create validator from Alertmanager configuration", "hash", rawCfg.ConfigurationHash)
+	return NewNotificationSettingsValidator(&cfg.AlertmanagerConfig), nil
+}
+
+type cachedNotificationSettingsValidationService struct {
+	srv        NotificationSettingsValidatorProvider
+	mtx        sync.Mutex
+	validators map[int64]NotificationSettingsValidator
+}
+
+func NewCachedNotificationSettingsValidationService(store store.AlertingStore) NotificationSettingsValidatorProvider {
+	return &cachedNotificationSettingsValidationService{
+		srv:        NewNotificationSettingsValidationService(store),
+		mtx:        sync.Mutex{},
+		validators: map[int64]NotificationSettingsValidator{},
+	}
+}
+
+// Validator returns a NotificationSettingsValidator using the alertmanager configuration from the given orgID.
+func (v *cachedNotificationSettingsValidationService) Validator(ctx context.Context, orgID int64) (NotificationSettingsValidator, error) {
+	v.mtx.Lock()
+	defer v.mtx.Unlock()
+
+	result, ok := v.validators[orgID]
+	if !ok {
+		vd, err := v.srv.Validator(ctx, orgID)
+		if err != nil {
+			return nil, err
+		}
+		v.validators[orgID] = vd
+		result = vd
+	}
+	return result, nil
+}
diff --git a/pkg/services/ngalert/provisioning/accesscontrol.go b/pkg/services/ngalert/provisioning/accesscontrol.go
new file mode 100644
index 0000000000000..33305fec79af7
--- /dev/null
+++ b/pkg/services/ngalert/provisioning/accesscontrol.go
@@ -0,0 +1,80 @@
+package provisioning
+
+import (
+	"context"
+
+	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/store"
+)
+
+type RuleAccessControlService interface {
+	HasAccess(ctx context.Context, user identity.Requester, evaluator ac.Evaluator) (bool, error)
+	AuthorizeAccessToRuleGroup(ctx context.Context, user identity.Requester, rules models.RulesGroup) error
+	AuthorizeRuleChanges(ctx context.Context, user identity.Requester, change *store.GroupDelta) error
+}
+
+func newRuleAccessControlService(ac RuleAccessControlService) *provisioningRuleAccessControl {
+	return &provisioningRuleAccessControl{
+		RuleAccessControlService: ac,
+	}
+}
+
+type provisioningRuleAccessControl struct {
+	RuleAccessControlService
+}
+
+var _ ruleAccessControlService = &provisioningRuleAccessControl{}
+
+// AuthorizeRuleGroupRead authorizes the read access to a group of rules for a user.
+// It first checks if the user has permission to read all rules. If yes, it bypasses the authorization.
+// If not, it calls the RuleAccessControlService to authorize access to the rule group.
+// It returns an error if the authorization fails or if there is an error during permission check.
+func (p *provisioningRuleAccessControl) AuthorizeRuleGroupRead(ctx context.Context, user identity.Requester, rules models.RulesGroup) error {
+	can, err := p.CanReadAllRules(ctx, user)
+	if err != nil {
+		return err
+	}
+	if !can {
+		return p.RuleAccessControlService.AuthorizeAccessToRuleGroup(ctx, user, rules)
+	}
+	return nil
+}
+
+// AuthorizeRuleGroupWrite authorizes the write access to a group of rules for a user.
+// It first checks if the user has permission to write all rules. If yes, it bypasses the authorization.
+// If not, it calls the RuleAccessControlService to authorize the rule changes.
+// It returns an error if the authorization fails or if there is an error during permission check.
+func (p *provisioningRuleAccessControl) AuthorizeRuleGroupWrite(ctx context.Context, user identity.Requester, change *store.GroupDelta) error {
+	can, err := p.CanWriteAllRules(ctx, user)
+	if err != nil {
+		return err
+	}
+	if !can {
+		return p.RuleAccessControlService.AuthorizeRuleChanges(ctx, user, change)
+	}
+	return nil
+}
+
+// CanReadAllRules checks if the user has permission to read all rules.
+// It evaluates if the user has either "alert.provisioning:read" or "alert.provisioning.secrets:read" permissions.
+// It returns true if the user has the required permissions, otherwise it returns false.
+func (p *provisioningRuleAccessControl) CanReadAllRules(ctx context.Context, user identity.Requester) (bool, error) {
+	return p.HasAccess(ctx, user, ac.EvalAny(
+		ac.EvalPermission(ac.ActionAlertingProvisioningRead),
+		ac.EvalPermission(ac.ActionAlertingProvisioningReadSecrets),
+		ac.EvalPermission(ac.ActionAlertingRulesProvisioningRead),
+	))
+}
+
+// CanWriteAllRules is a method that checks if a user has permission to write all rules.
+// It calls the HasAccess method with the provided action "alert.provisioning:write".
+// It returns true if the user has permission, false otherwise.
+// It returns an error if there is a problem checking the permission.
+func (p *provisioningRuleAccessControl) CanWriteAllRules(ctx context.Context, user identity.Requester) (bool, error) {
+	return p.HasAccess(ctx, user, ac.EvalAny(
+		ac.EvalPermission(ac.ActionAlertingProvisioningWrite),
+		ac.EvalPermission(ac.ActionAlertingRulesProvisioningWrite),
+	))
+}
diff --git a/pkg/services/ngalert/provisioning/accesscontrol_test.go b/pkg/services/ngalert/provisioning/accesscontrol_test.go
new file mode 100644
index 0000000000000..4cce8dbb9594e
--- /dev/null
+++ b/pkg/services/ngalert/provisioning/accesscontrol_test.go
@@ -0,0 +1,240 @@
+package provisioning
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"golang.org/x/exp/rand"
+
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/ngalert/accesscontrol/fakes"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/store"
+	"github.com/grafana/grafana/pkg/services/user"
+)
+
+func TestCanReadAllRules(t *testing.T) {
+	testUser := &user.SignedInUser{}
+
+	t.Run("should check for provisioning permissions", func(t *testing.T) {
+		rs := &fakes.FakeRuleService{}
+		expected := rand.Int()%2 == 1
+		rs.HasAccessFunc = func(ctx context.Context, requester identity.Requester, evaluator accesscontrol.Evaluator) (bool, error) {
+			return expected, nil
+		}
+		p := &provisioningRuleAccessControl{rs}
+		res, err := p.CanReadAllRules(context.Background(), testUser)
+		require.NoError(t, err)
+		require.Equal(t, expected, res)
+
+		require.Len(t, rs.Calls, 1)
+		require.Equal(t, "HasAccess", rs.Calls[0].MethodName)
+		require.Equal(t, accesscontrol.EvalAny(
+			accesscontrol.EvalPermission(accesscontrol.ActionAlertingProvisioningRead),
+			accesscontrol.EvalPermission(accesscontrol.ActionAlertingProvisioningReadSecrets),
+			accesscontrol.EvalPermission(accesscontrol.ActionAlertingRulesProvisioningRead),
+		).GoString(), rs.Calls[0].Arguments[2].(accesscontrol.Evaluator).GoString())
+	})
+
+	t.Run("should return error", func(t *testing.T) {
+		rs := &fakes.FakeRuleService{}
+		expected := errors.New("test")
+		rs.HasAccessFunc = func(ctx context.Context, requester identity.Requester, evaluator accesscontrol.Evaluator) (bool, error) {
+			return false, expected
+		}
+		p := &provisioningRuleAccessControl{rs}
+		_, err := p.CanReadAllRules(context.Background(), testUser)
+		require.ErrorIs(t, err, expected)
+	})
+}
+
+func TestCanWriteAllRules(t *testing.T) {
+	testUser := &user.SignedInUser{}
+
+	t.Run("should check for provisioning permissions", func(t *testing.T) {
+		rs := &fakes.FakeRuleService{}
+		expected := rand.Int()%2 == 1
+		rs.HasAccessFunc = func(ctx context.Context, requester identity.Requester, evaluator accesscontrol.Evaluator) (bool, error) {
+			return expected, nil
+		}
+		p := &provisioningRuleAccessControl{rs}
+		res, err := p.CanWriteAllRules(context.Background(), testUser)
+		require.NoError(t, err)
+		require.Equal(t, expected, res)
+
+		require.Len(t, rs.Calls, 1)
+		require.Equal(t, "HasAccess", rs.Calls[0].MethodName)
+		require.Equal(t,
+			accesscontrol.EvalAny(
+				accesscontrol.EvalPermission(accesscontrol.ActionAlertingProvisioningWrite),
+				accesscontrol.EvalPermission(accesscontrol.ActionAlertingRulesProvisioningWrite),
+			).GoString(), rs.Calls[0].Arguments[2].(accesscontrol.Evaluator).GoString())
+	})
+
+	t.Run("should return error", func(t *testing.T) {
+		rs := &fakes.FakeRuleService{}
+		expected := errors.New("test")
+		rs.HasAccessFunc = func(ctx context.Context, requester identity.Requester, evaluator accesscontrol.Evaluator) (bool, error) {
+			return false, expected
+		}
+		p := &provisioningRuleAccessControl{rs}
+		_, err := p.CanWriteAllRules(context.Background(), testUser)
+		require.ErrorIs(t, err, expected)
+	})
+}
+
+func TestAuthorizeAccessToRuleGroup(t *testing.T) {
+	testUser := &user.SignedInUser{}
+	rules := models.GenerateAlertRules(1, models.AlertRuleGen())
+
+	t.Run("should return nil when user has provisioning permissions", func(t *testing.T) {
+		rs := &fakes.FakeRuleService{}
+		provisioner := provisioningRuleAccessControl{
+			RuleAccessControlService: rs,
+		}
+
+		rs.HasAccessFunc = func(ctx context.Context, user identity.Requester, evaluator accesscontrol.Evaluator) (bool, error) {
+			return true, nil
+		}
+
+		err := provisioner.AuthorizeRuleGroupRead(context.Background(), testUser, rules)
+		require.NoError(t, err)
+
+		require.Len(t, rs.Calls, 1)
+		require.Equal(t, "HasAccess", rs.Calls[0].MethodName)
+		assert.Equal(t, accesscontrol.EvalAny(
+			accesscontrol.EvalPermission(accesscontrol.ActionAlertingProvisioningRead),
+			accesscontrol.EvalPermission(accesscontrol.ActionAlertingProvisioningReadSecrets),
+			accesscontrol.EvalPermission(accesscontrol.ActionAlertingRulesProvisioningRead),
+		).GoString(), rs.Calls[0].Arguments[2].(accesscontrol.Evaluator).GoString())
+		assert.Equal(t, testUser, rs.Calls[0].Arguments[1])
+	})
+
+	t.Run("should call upstream method if no provisioning permissions", func(t *testing.T) {
+		rs := &fakes.FakeRuleService{}
+		provisioner := provisioningRuleAccessControl{
+			RuleAccessControlService: rs,
+		}
+
+		rs.HasAccessFunc = func(ctx context.Context, user identity.Requester, evaluator accesscontrol.Evaluator) (bool, error) {
+			return false, nil
+		}
+		rs.AuthorizeAccessToRuleGroupFunc = func(ctx context.Context, requester identity.Requester, group models.RulesGroup) error {
+			return nil
+		}
+
+		err := provisioner.AuthorizeRuleGroupRead(context.Background(), testUser, rules)
+		require.NoError(t, err)
+
+		require.Len(t, rs.Calls, 2)
+		require.Equal(t, "HasAccess", rs.Calls[0].MethodName)
+		require.Equal(t, "AuthorizeRuleGroupRead", rs.Calls[1].MethodName)
+		require.Equal(t, models.RulesGroup(rules), rs.Calls[1].Arguments[2])
+	})
+
+	t.Run("should propagate error", func(t *testing.T) {
+		rs := &fakes.FakeRuleService{}
+		provisioner := provisioningRuleAccessControl{
+			RuleAccessControlService: rs,
+		}
+
+		expected := errors.New("test1")
+		rs.HasAccessFunc = func(ctx context.Context, user identity.Requester, evaluator accesscontrol.Evaluator) (bool, error) {
+			return false, expected
+		}
+
+		err := provisioner.AuthorizeRuleGroupRead(context.Background(), testUser, rules)
+		require.ErrorIs(t, err, expected)
+
+		rs.HasAccessFunc = func(ctx context.Context, user identity.Requester, evaluator accesscontrol.Evaluator) (bool, error) {
+			return false, nil
+		}
+		expected = errors.New("test2")
+		rs.AuthorizeAccessToRuleGroupFunc = func(ctx context.Context, requester identity.Requester, group models.RulesGroup) error {
+			return expected
+		}
+
+		err = provisioner.AuthorizeRuleGroupRead(context.Background(), testUser, rules)
+		require.ErrorIs(t, err, expected)
+	})
+}
+
+func TestAuthorizeRuleChanges(t *testing.T) {
+	testUser := &user.SignedInUser{}
+	change := &store.GroupDelta{}
+
+	t.Run("should return nil when user has provisioning permissions", func(t *testing.T) {
+		rs := &fakes.FakeRuleService{}
+		provisioner := provisioningRuleAccessControl{
+			RuleAccessControlService: rs,
+		}
+
+		rs.HasAccessFunc = func(ctx context.Context, user identity.Requester, evaluator accesscontrol.Evaluator) (bool, error) {
+			return true, nil
+		}
+
+		err := provisioner.AuthorizeRuleGroupWrite(context.Background(), testUser, change)
+		require.NoError(t, err)
+
+		require.Len(t, rs.Calls, 1)
+		require.Equal(t, "HasAccess", rs.Calls[0].MethodName)
+		assert.Equal(t, accesscontrol.EvalAny(
+			accesscontrol.EvalPermission(accesscontrol.ActionAlertingProvisioningWrite),
+			accesscontrol.EvalPermission(accesscontrol.ActionAlertingRulesProvisioningWrite),
+		).GoString(), rs.Calls[0].Arguments[2].(accesscontrol.Evaluator).GoString())
+		assert.Equal(t, testUser, rs.Calls[0].Arguments[1])
+	})
+
+	t.Run("should call upstream method if no provisioning permissions", func(t *testing.T) {
+		rs := &fakes.FakeRuleService{}
+		provisioner := provisioningRuleAccessControl{
+			RuleAccessControlService: rs,
+		}
+
+		rs.HasAccessFunc = func(ctx context.Context, user identity.Requester, evaluator accesscontrol.Evaluator) (bool, error) {
+			return false, nil
+		}
+		rs.AuthorizeRuleChangesFunc = func(ctx context.Context, user identity.Requester, delta *store.GroupDelta) error {
+			return nil
+		}
+
+		err := provisioner.AuthorizeRuleGroupWrite(context.Background(), testUser, change)
+		require.NoError(t, err)
+
+		require.Len(t, rs.Calls, 2)
+		require.Equal(t, "HasAccess", rs.Calls[0].MethodName)
+		require.Equal(t, "AuthorizeRuleGroupWrite", rs.Calls[1].MethodName)
+		require.Equal(t, testUser, rs.Calls[1].Arguments[1])
+		require.Equal(t, change, rs.Calls[1].Arguments[2])
+	})
+
+	t.Run("should propagate error", func(t *testing.T) {
+		rs := &fakes.FakeRuleService{}
+		provisioner := provisioningRuleAccessControl{
+			RuleAccessControlService: rs,
+		}
+
+		expected := errors.New("test1")
+		rs.HasAccessFunc = func(ctx context.Context, user identity.Requester, evaluator accesscontrol.Evaluator) (bool, error) {
+			return false, expected
+		}
+
+		err := provisioner.AuthorizeRuleGroupWrite(context.Background(), testUser, change)
+		require.ErrorIs(t, err, expected)
+
+		rs.HasAccessFunc = func(ctx context.Context, user identity.Requester, evaluator accesscontrol.Evaluator) (bool, error) {
+			return false, nil
+		}
+		expected = errors.New("test2")
+		rs.AuthorizeRuleChangesFunc = func(ctx context.Context, requester identity.Requester, delta *store.GroupDelta) error {
+			return expected
+		}
+
+		err = provisioner.AuthorizeRuleGroupWrite(context.Background(), testUser, change)
+		require.ErrorIs(t, err, expected)
+	})
+}
diff --git a/pkg/services/ngalert/provisioning/alert_rules.go b/pkg/services/ngalert/provisioning/alert_rules.go
index 043f7d8d98917..df227f061ebdb 100644
--- a/pkg/services/ngalert/provisioning/alert_rules.go
+++ b/pkg/services/ngalert/provisioning/alert_rules.go
@@ -7,47 +7,77 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/folder"
+	"github.com/grafana/grafana/pkg/services/ngalert/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/notifier"
 	"github.com/grafana/grafana/pkg/services/ngalert/store"
 	"github.com/grafana/grafana/pkg/services/quota"
 	"github.com/grafana/grafana/pkg/util"
 )
 
+type ruleAccessControlService interface {
+	AuthorizeRuleGroupRead(ctx context.Context, user identity.Requester, rules models.RulesGroup) error
+	AuthorizeRuleGroupWrite(ctx context.Context, user identity.Requester, change *store.GroupDelta) error
+	// CanReadAllRules returns true if the user has full access to read rules via provisioning API and bypass regular checks
+	CanReadAllRules(ctx context.Context, user identity.Requester) (bool, error)
+	// CanWriteAllRules returns true if the user has full access to write rules via provisioning API and bypass regular checks
+	CanWriteAllRules(ctx context.Context, user identity.Requester) (bool, error)
+}
+
+type NotificationSettingsValidatorProvider interface {
+	Validator(ctx context.Context, orgID int64) (notifier.NotificationSettingsValidator, error)
+}
+
 type AlertRuleService struct {
 	defaultIntervalSeconds int64
 	baseIntervalSeconds    int64
+	rulesPerRuleGroupLimit int64
 	ruleStore              RuleStore
 	provenanceStore        ProvisioningStore
+	folderService          folder.Service
 	dashboardService       dashboards.DashboardService
 	quotas                 QuotaChecker
 	xact                   TransactionManager
 	log                    log.Logger
+	nsValidatorProvider    NotificationSettingsValidatorProvider
+	authz                  ruleAccessControlService
 }
 
 func NewAlertRuleService(ruleStore RuleStore,
 	provenanceStore ProvisioningStore,
+	folderService folder.Service,
 	dashboardService dashboards.DashboardService,
 	quotas QuotaChecker,
 	xact TransactionManager,
 	defaultIntervalSeconds int64,
 	baseIntervalSeconds int64,
-	log log.Logger) *AlertRuleService {
+	rulesPerRuleGroupLimit int64,
+	log log.Logger,
+	ns NotificationSettingsValidatorProvider,
+	authz RuleAccessControlService,
+) *AlertRuleService {
 	return &AlertRuleService{
 		defaultIntervalSeconds: defaultIntervalSeconds,
 		baseIntervalSeconds:    baseIntervalSeconds,
+		rulesPerRuleGroupLimit: rulesPerRuleGroupLimit,
 		ruleStore:              ruleStore,
 		provenanceStore:        provenanceStore,
+		folderService:          folderService,
 		dashboardService:       dashboardService,
 		quotas:                 quotas,
 		xact:                   xact,
 		log:                    log,
+		nsValidatorProvider:    ns,
+		authz:                  newRuleAccessControlService(authz),
 	}
 }
 
-func (service *AlertRuleService) GetAlertRules(ctx context.Context, orgID int64) ([]*models.AlertRule, map[string]models.Provenance, error) {
+func (service *AlertRuleService) GetAlertRules(ctx context.Context, user identity.Requester) ([]*models.AlertRule, map[string]models.Provenance, error) {
 	q := models.ListAlertRulesQuery{
-		OrgID: orgID,
+		OrgID: user.GetOrgID(),
 	}
 	rules, err := service.ruleStore.ListAlertRules(ctx, &q)
 	if err != nil {
@@ -56,28 +86,94 @@ func (service *AlertRuleService) GetAlertRules(ctx context.Context, orgID int64)
 	provenances := make(map[string]models.Provenance)
 	if len(rules) > 0 {
 		resourceType := rules[0].ResourceType()
-		provenances, err = service.provenanceStore.GetProvenances(ctx, orgID, resourceType)
+		provenances, err = service.provenanceStore.GetProvenances(ctx, user.GetOrgID(), resourceType)
 		if err != nil {
 			return nil, nil, err
 		}
 	}
-	return rules, provenances, nil
+
+	can, err := service.authz.CanReadAllRules(ctx, user)
+	if err != nil {
+		return nil, nil, err
+	}
+	if can {
+		return rules, provenances, nil
+	}
+	// If user does not have blanket privilege to read rules, remove all rules that are not allowed to the user.
+	groups := models.GroupByAlertRuleGroupKey(rules)
+	result := make([]*models.AlertRule, 0, len(rules))
+	for _, group := range groups {
+		if err := service.authz.AuthorizeRuleGroupRead(ctx, user, group); err != nil {
+			if errors.Is(err, accesscontrol.ErrAuthorizationBase) {
+				// remove provenances for rules that will not be added to the output
+				for _, rule := range group {
+					delete(provenances, rule.ResourceID())
+				}
+				continue
+			}
+			return nil, nil, err
+		}
+		result = append(result, group...)
+	}
+	return result, provenances, nil
 }
 
-func (service *AlertRuleService) GetAlertRule(ctx context.Context, orgID int64, ruleUID string) (models.AlertRule, models.Provenance, error) {
-	query := &models.GetAlertRuleByUIDQuery{
-		OrgID: orgID,
+func (service *AlertRuleService) getAlertRuleAuthorized(ctx context.Context, user identity.Requester, ruleUID string) (models.AlertRule, error) {
+	// check if the user can read all rules. If it cannot, pull the entire group and verify access to the entire group.
+	can, err := service.authz.CanReadAllRules(ctx, user)
+	if err != nil {
+		return models.AlertRule{}, err
+	}
+	// if user has blanket access to all rules, just read a single rule from database
+	if can {
+		query := &models.GetAlertRuleByUIDQuery{
+			OrgID: user.GetOrgID(),
+			UID:   ruleUID,
+		}
+		rule, err := service.ruleStore.GetAlertRuleByUID(ctx, query)
+		if err != nil {
+			return models.AlertRule{}, err
+		}
+		if rule == nil {
+			return models.AlertRule{}, models.ErrAlertRuleNotFound
+		}
+		return *rule, nil
+	}
+
+	// if user does not have privilege to access all rules, check that the user can read this rule by fetching entire group and
+	// checking that user has access to it.
+	q := &models.GetAlertRulesGroupByRuleUIDQuery{
 		UID:   ruleUID,
+		OrgID: user.GetOrgID(),
 	}
-	rule, err := service.ruleStore.GetAlertRuleByUID(ctx, query)
+	group, err := service.ruleStore.GetAlertRulesGroupByRuleUID(ctx, q)
+	if err != nil {
+		return models.AlertRule{}, err
+	}
+	if len(group) == 0 {
+		return models.AlertRule{}, models.ErrAlertRuleNotFound
+	}
+	if err := service.authz.AuthorizeRuleGroupRead(ctx, user, group); err != nil {
+		return models.AlertRule{}, err
+	}
+	for _, rule := range group {
+		if rule.UID == ruleUID {
+			return *rule, nil
+		}
+	}
+	return models.AlertRule{}, models.ErrAlertRuleNotFound
+}
+
+func (service *AlertRuleService) GetAlertRule(ctx context.Context, user identity.Requester, ruleUID string) (models.AlertRule, models.Provenance, error) {
+	rule, err := service.getAlertRuleAuthorized(ctx, user, ruleUID)
 	if err != nil {
 		return models.AlertRule{}, models.ProvenanceNone, err
 	}
-	provenance, err := service.provenanceStore.GetProvenance(ctx, rule, orgID)
+	provenance, err := service.provenanceStore.GetProvenance(ctx, &rule, user.GetOrgID())
 	if err != nil {
 		return models.AlertRule{}, models.ProvenanceNone, err
 	}
-	return *rule, provenance, nil
+	return rule, provenance, nil
 }
 
 type AlertRuleWithFolderTitle struct {
@@ -86,18 +182,14 @@ type AlertRuleWithFolderTitle struct {
 }
 
 // GetAlertRuleWithFolderTitle returns a single alert rule with its folder title.
-func (service *AlertRuleService) GetAlertRuleWithFolderTitle(ctx context.Context, orgID int64, ruleUID string) (AlertRuleWithFolderTitle, error) {
-	query := &models.GetAlertRuleByUIDQuery{
-		OrgID: orgID,
-		UID:   ruleUID,
-	}
-	rule, err := service.ruleStore.GetAlertRuleByUID(ctx, query)
+func (service *AlertRuleService) GetAlertRuleWithFolderTitle(ctx context.Context, user identity.Requester, ruleUID string) (AlertRuleWithFolderTitle, error) {
+	rule, err := service.getAlertRuleAuthorized(ctx, user, ruleUID)
 	if err != nil {
 		return AlertRuleWithFolderTitle{}, err
 	}
 
 	dq := dashboards.GetDashboardQuery{
-		OrgID: orgID,
+		OrgID: user.GetOrgID(),
 		UID:   rule.NamespaceUID,
 	}
 
@@ -107,7 +199,7 @@ func (service *AlertRuleService) GetAlertRuleWithFolderTitle(ctx context.Context
 	}
 
 	return AlertRuleWithFolderTitle{
-		AlertRule:   *rule,
+		AlertRule:   rule,
 		FolderTitle: dash.Title,
 	}, nil
 }
@@ -115,25 +207,59 @@ func (service *AlertRuleService) GetAlertRuleWithFolderTitle(ctx context.Context
 // CreateAlertRule creates a new alert rule. This function will ignore any
 // interval that is set in the rule struct and use the already existing group
 // interval or the default one.
-func (service *AlertRuleService) CreateAlertRule(ctx context.Context, rule models.AlertRule, provenance models.Provenance, userID int64) (models.AlertRule, error) {
+func (service *AlertRuleService) CreateAlertRule(ctx context.Context, user identity.Requester, rule models.AlertRule, provenance models.Provenance) (models.AlertRule, error) {
 	if rule.UID == "" {
 		rule.UID = util.GenerateShortUID()
 	} else if err := util.ValidateUID(rule.UID); err != nil {
 		return models.AlertRule{}, errors.Join(models.ErrAlertRuleFailedValidation, fmt.Errorf("cannot create rule with UID '%s': %w", rule.UID, err))
 	}
-	interval, err := service.ruleStore.GetRuleGroupInterval(ctx, rule.OrgID, rule.NamespaceUID, rule.RuleGroup)
-	// if the alert group does not exists we just use the default interval
-	if err != nil && errors.Is(err, store.ErrAlertRuleGroupNotFound) {
-		interval = service.defaultIntervalSeconds
-	} else if err != nil {
+	var interval = service.defaultIntervalSeconds
+	// check if user can bypass fine-grained rule authorization checks. If it cannot, verfiy that the user can add rules to the group
+	canWriteAllRules, err := service.authz.CanWriteAllRules(ctx, user)
+	if err != nil {
 		return models.AlertRule{}, err
 	}
+	if canWriteAllRules {
+		groupInterval, err := service.ruleStore.GetRuleGroupInterval(ctx, rule.OrgID, rule.NamespaceUID, rule.RuleGroup)
+		// if the alert group does not exist we just use the default interval
+		if err == nil {
+			interval = groupInterval
+		} else if !errors.Is(err, models.ErrAlertRuleGroupNotFound) {
+			return models.AlertRule{}, err
+		}
+	} else {
+		delta, err := store.CalculateRuleCreate(ctx, service.ruleStore, &rule)
+		if err != nil {
+			return models.AlertRule{}, fmt.Errorf("failed to calculate delta: %w", err)
+		}
+		if err := service.authz.AuthorizeRuleGroupWrite(ctx, user, delta); err != nil {
+			return models.AlertRule{}, err
+		}
+		existingGroup := delta.AffectedGroups[rule.GetGroupKey()]
+		if len(existingGroup) > 0 {
+			interval = existingGroup[0].IntervalSeconds
+		}
+	}
 	rule.IntervalSeconds = interval
 	err = rule.SetDashboardAndPanelFromAnnotations()
 	if err != nil {
 		return models.AlertRule{}, err
 	}
+	if err = service.ensureRuleNamespace(ctx, user, rule); err != nil {
+		return models.AlertRule{}, err
+	}
 	rule.Updated = time.Now()
+	if len(rule.NotificationSettings) > 0 {
+		validator, err := service.nsValidatorProvider.Validator(ctx, rule.OrgID)
+		if err != nil {
+			return models.AlertRule{}, err
+		}
+		for _, setting := range rule.NotificationSettings {
+			if err := validator.Validate(setting); err != nil {
+				return models.AlertRule{}, err
+			}
+		}
+	}
 	err = service.xact.InTransaction(ctx, func(ctx context.Context) error {
 		ids, err := service.ruleStore.InsertAlertRules(ctx, []models.AlertRule{
 			rule,
@@ -153,7 +279,7 @@ func (service *AlertRuleService) CreateAlertRule(ctx context.Context, rule model
 			return errors.New("couldn't find newly created id")
 		}
 
-		if err = service.checkLimitsTransactionCtx(ctx, rule.OrgID, userID); err != nil {
+		if err = service.checkLimitsTransactionCtx(ctx, user); err != nil {
 			return err
 		}
 
@@ -165,9 +291,9 @@ func (service *AlertRuleService) CreateAlertRule(ctx context.Context, rule model
 	return rule, nil
 }
 
-func (service *AlertRuleService) GetRuleGroup(ctx context.Context, orgID int64, namespaceUID, group string) (models.AlertRuleGroup, error) {
+func (service *AlertRuleService) GetRuleGroup(ctx context.Context, user identity.Requester, namespaceUID, group string) (models.AlertRuleGroup, error) {
 	q := models.ListAlertRulesQuery{
-		OrgID:         orgID,
+		OrgID:         user.GetOrgID(),
 		NamespaceUIDs: []string{namespaceUID},
 		RuleGroup:     group,
 	}
@@ -176,13 +302,23 @@ func (service *AlertRuleService) GetRuleGroup(ctx context.Context, orgID int64,
 		return models.AlertRuleGroup{}, err
 	}
 	if len(ruleList) == 0 {
-		return models.AlertRuleGroup{}, store.ErrAlertRuleGroupNotFound
+		return models.AlertRuleGroup{}, models.ErrAlertRuleGroupNotFound.Errorf("")
+	}
+
+	can, err := service.authz.CanReadAllRules(ctx, user)
+	if err != nil {
+		return models.AlertRuleGroup{}, err
+	}
+	if !can {
+		if err := service.authz.AuthorizeRuleGroupRead(ctx, user, ruleList); err != nil {
+			return models.AlertRuleGroup{}, err
+		}
 	}
 	res := models.AlertRuleGroup{
 		Title:     ruleList[0].RuleGroup,
 		FolderUID: ruleList[0].NamespaceUID,
 		Interval:  ruleList[0].IntervalSeconds,
-		Rules:     []models.AlertRule{},
+		Rules:     make([]models.AlertRule, 0, len(ruleList)),
 	}
 	for _, r := range ruleList {
 		if r != nil {
@@ -193,13 +329,13 @@ func (service *AlertRuleService) GetRuleGroup(ctx context.Context, orgID int64,
 }
 
 // UpdateRuleGroup will update the interval for all rules in the group.
-func (service *AlertRuleService) UpdateRuleGroup(ctx context.Context, orgID int64, namespaceUID string, ruleGroup string, intervalSeconds int64) error {
+func (service *AlertRuleService) UpdateRuleGroup(ctx context.Context, user identity.Requester, namespaceUID string, ruleGroup string, intervalSeconds int64) error {
 	if err := models.ValidateRuleGroupInterval(intervalSeconds, service.baseIntervalSeconds); err != nil {
 		return err
 	}
 	return service.xact.InTransaction(ctx, func(ctx context.Context) error {
 		query := &models.ListAlertRulesQuery{
-			OrgID:         orgID,
+			OrgID:         user.GetOrgID(),
 			NamespaceUIDs: []string{namespaceUID},
 			RuleGroup:     ruleGroup,
 		}
@@ -219,26 +355,121 @@ func (service *AlertRuleService) UpdateRuleGroup(ctx context.Context, orgID int6
 				New:      newRule,
 			})
 		}
+
+		// check if user has write access to all rules and can bypass the regular checks.
+		can, err := service.authz.CanWriteAllRules(ctx, user)
+		if err != nil {
+			return err
+		}
+		// If it cannot, check that the user is authorized to perform all the changes caused by this request
+		if !can {
+			groupKey := models.AlertRuleGroupKey{
+				OrgID:        user.GetOrgID(),
+				NamespaceUID: namespaceUID,
+				RuleGroup:    ruleGroup,
+			}
+			ruleDeltas := make([]store.RuleDelta, 0, len(ruleList))
+			for _, upd := range updateRules {
+				updNew := upd.New
+				ruleDeltas = append(ruleDeltas, store.RuleDelta{
+					Existing: upd.Existing,
+					New:      &updNew,
+				})
+			}
+			delta := &store.GroupDelta{
+				GroupKey: groupKey,
+				AffectedGroups: map[models.AlertRuleGroupKey]models.RulesGroup{
+					groupKey: ruleList,
+				},
+				Update: ruleDeltas,
+			}
+			if err := service.authz.AuthorizeRuleGroupWrite(ctx, user, delta); err != nil {
+				return err
+			}
+		}
+
 		return service.ruleStore.UpdateAlertRules(ctx, updateRules)
 	})
 }
 
-func (service *AlertRuleService) ReplaceRuleGroup(ctx context.Context, orgID int64, group models.AlertRuleGroup, userID int64, provenance models.Provenance) error {
+func (service *AlertRuleService) ReplaceRuleGroup(ctx context.Context, user identity.Requester, group models.AlertRuleGroup, provenance models.Provenance) error {
 	if err := models.ValidateRuleGroupInterval(group.Interval, service.baseIntervalSeconds); err != nil {
 		return err
 	}
 
+	delta, err := service.calcDelta(ctx, user, group)
+	if err != nil {
+		return err
+	}
+
+	if delta.IsEmpty() {
+		return nil
+	}
+
+	// check if the current user has permissions to all rules and can bypass the regular authorization validation.
+	can, err := service.authz.CanWriteAllRules(ctx, user)
+	if err != nil {
+		return err
+	}
+
+	if !can {
+		if err := service.authz.AuthorizeRuleGroupWrite(ctx, user, delta); err != nil {
+			return err
+		}
+	}
+
+	newOrUpdatedNotificationSettings := delta.NewOrUpdatedNotificationSettings()
+	if len(newOrUpdatedNotificationSettings) > 0 {
+		validator, err := service.nsValidatorProvider.Validator(ctx, delta.GroupKey.OrgID)
+		if err != nil {
+			return err
+		}
+		for _, s := range newOrUpdatedNotificationSettings {
+			if err := validator.Validate(s); err != nil {
+				return errors.Join(models.ErrAlertRuleFailedValidation, err)
+			}
+		}
+	}
+
+	return service.persistDelta(ctx, user, delta, provenance)
+}
+
+func (service *AlertRuleService) DeleteRuleGroup(ctx context.Context, user identity.Requester, namespaceUID, group string, provenance models.Provenance) error {
+	delta, err := store.CalculateRuleGroupDelete(ctx, service.ruleStore, models.AlertRuleGroupKey{
+		OrgID:        user.GetOrgID(),
+		NamespaceUID: namespaceUID,
+		RuleGroup:    group,
+	})
+	if err != nil {
+		return err
+	}
+
+	// check if the current user has permissions to all rules and can bypass the regular authorization validation.
+	can, err := service.authz.CanWriteAllRules(ctx, user)
+	if err != nil {
+		return err
+	}
+	if !can {
+		if err := service.authz.AuthorizeRuleGroupWrite(ctx, user, delta); err != nil {
+			return err
+		}
+	}
+
+	return service.persistDelta(ctx, user, delta, provenance)
+}
+
+func (service *AlertRuleService) calcDelta(ctx context.Context, user identity.Requester, group models.AlertRuleGroup) (*store.GroupDelta, error) {
 	// If the provided request did not provide the rules list at all, treat it as though it does not wish to change rules.
 	// This is done for backwards compatibility. Requests which specify only the interval must update only the interval.
 	if group.Rules == nil {
 		listRulesQuery := models.ListAlertRulesQuery{
-			OrgID:         orgID,
+			OrgID:         user.GetOrgID(),
 			NamespaceUIDs: []string{group.FolderUID},
 			RuleGroup:     group.Title,
 		}
 		ruleList, err := service.ruleStore.ListAlertRules(ctx, &listRulesQuery)
 		if err != nil {
-			return fmt.Errorf("failed to list alert rules: %w", err)
+			return nil, fmt.Errorf("failed to list alert rules: %w", err)
 		}
 		group.Rules = make([]models.AlertRule, 0, len(ruleList))
 		for _, r := range ruleList {
@@ -248,45 +479,47 @@ func (service *AlertRuleService) ReplaceRuleGroup(ctx context.Context, orgID int
 		}
 	}
 
+	if err := service.checkGroupLimits(group); err != nil {
+		return nil, fmt.Errorf("write rejected due to exceeded limits: %w", err)
+	}
+
 	key := models.AlertRuleGroupKey{
-		OrgID:        orgID,
+		OrgID:        user.GetOrgID(),
 		NamespaceUID: group.FolderUID,
 		RuleGroup:    group.Title,
 	}
-	rules := make([]*models.AlertRuleWithOptionals, len(group.Rules))
-	group = *syncGroupRuleFields(&group, orgID)
+	rules := make([]*models.AlertRuleWithOptionals, 0, len(group.Rules))
+	group = *syncGroupRuleFields(&group, user.GetOrgID())
 	for i := range group.Rules {
 		if err := group.Rules[i].SetDashboardAndPanelFromAnnotations(); err != nil {
-			return err
+			return nil, err
 		}
 		rules = append(rules, &models.AlertRuleWithOptionals{AlertRule: group.Rules[i], HasPause: true})
 	}
 	delta, err := store.CalculateChanges(ctx, service.ruleStore, key, rules)
 	if err != nil {
-		return fmt.Errorf("failed to calculate diff for alert rules: %w", err)
+		return nil, fmt.Errorf("failed to calculate diff for alert rules: %w", err)
 	}
 
 	// Refresh all calculated fields across all rules.
-	delta = store.UpdateCalculatedRuleFields(delta)
-
-	if len(delta.New) == 0 && len(delta.Update) == 0 && len(delta.Delete) == 0 {
-		return nil
-	}
+	return store.UpdateCalculatedRuleFields(delta), nil
+}
 
+func (service *AlertRuleService) persistDelta(ctx context.Context, user identity.Requester, delta *store.GroupDelta, provenance models.Provenance) error {
 	return service.xact.InTransaction(ctx, func(ctx context.Context) error {
 		// Delete first as this could prevent future unique constraint violations.
 		if len(delta.Delete) > 0 {
 			for _, del := range delta.Delete {
 				// check that provenance is not changed in an invalid way
-				storedProvenance, err := service.provenanceStore.GetProvenance(ctx, del, orgID)
+				storedProvenance, err := service.provenanceStore.GetProvenance(ctx, del, user.GetOrgID())
 				if err != nil {
 					return err
 				}
 				if canUpdate := canUpdateProvenanceInRuleGroup(storedProvenance, provenance); !canUpdate {
-					return fmt.Errorf("cannot update with provided provenance '%s', needs '%s'", provenance, storedProvenance)
+					return fmt.Errorf("cannot delete with provided provenance '%s', needs '%s'", provenance, storedProvenance)
 				}
 			}
-			if err := service.deleteRules(ctx, orgID, delta.Delete...); err != nil {
+			if err := service.deleteRules(ctx, user.GetOrgID(), delta.Delete...); err != nil {
 				return err
 			}
 		}
@@ -295,7 +528,7 @@ func (service *AlertRuleService) ReplaceRuleGroup(ctx context.Context, orgID int
 			updates := make([]models.UpdateRule, 0, len(delta.Update))
 			for _, update := range delta.Update {
 				// check that provenance is not changed in an invalid way
-				storedProvenance, err := service.provenanceStore.GetProvenance(ctx, update.New, orgID)
+				storedProvenance, err := service.provenanceStore.GetProvenance(ctx, update.New, user.GetOrgID())
 				if err != nil {
 					return err
 				}
@@ -307,11 +540,11 @@ func (service *AlertRuleService) ReplaceRuleGroup(ctx context.Context, orgID int
 					New:      *update.New,
 				})
 			}
-			if err = service.ruleStore.UpdateAlertRules(ctx, updates); err != nil {
+			if err := service.ruleStore.UpdateAlertRules(ctx, updates); err != nil {
 				return fmt.Errorf("failed to update alert rules: %w", err)
 			}
 			for _, update := range delta.Update {
-				if err := service.provenanceStore.SetProvenance(ctx, update.New, orgID, provenance); err != nil {
+				if err := service.provenanceStore.SetProvenance(ctx, update.New, user.GetOrgID(), provenance); err != nil {
 					return err
 				}
 			}
@@ -323,13 +556,13 @@ func (service *AlertRuleService) ReplaceRuleGroup(ctx context.Context, orgID int
 				return fmt.Errorf("failed to insert alert rules: %w", err)
 			}
 			for _, key := range uids {
-				if err := service.provenanceStore.SetProvenance(ctx, &models.AlertRule{UID: key.UID}, orgID, provenance); err != nil {
+				if err := service.provenanceStore.SetProvenance(ctx, &models.AlertRule{UID: key.UID}, user.GetOrgID(), provenance); err != nil {
 					return err
 				}
 			}
 		}
 
-		if err = service.checkLimitsTransactionCtx(ctx, orgID, userID); err != nil {
+		if err := service.checkLimitsTransactionCtx(ctx, user); err != nil {
 			return err
 		}
 
@@ -338,14 +571,59 @@ func (service *AlertRuleService) ReplaceRuleGroup(ctx context.Context, orgID int
 }
 
 // UpdateAlertRule updates an alert rule.
-func (service *AlertRuleService) UpdateAlertRule(ctx context.Context, rule models.AlertRule, provenance models.Provenance) (models.AlertRule, error) {
-	storedRule, storedProvenance, err := service.GetAlertRule(ctx, rule.OrgID, rule.UID)
+func (service *AlertRuleService) UpdateAlertRule(ctx context.Context, user identity.Requester, rule models.AlertRule, provenance models.Provenance) (models.AlertRule, error) {
+	var storedRule *models.AlertRule
+	// check if the user has full access to all rules and can bypass the regular authorization validations.
+	// If it cannot, calculate the changes to the group caused by this update and authorize them.
+	canWriteAllRules, err := service.authz.CanWriteAllRules(ctx, user)
+	if err != nil {
+		return models.AlertRule{}, err
+	}
+	if canWriteAllRules {
+		query := &models.GetAlertRuleByUIDQuery{
+			OrgID: rule.OrgID,
+			UID:   rule.UID,
+		}
+		existing, err := service.ruleStore.GetAlertRuleByUID(ctx, query)
+		if err != nil {
+			return models.AlertRule{}, err
+		}
+		storedRule = existing
+	} else {
+		delta, err := store.CalculateRuleUpdate(ctx, service.ruleStore, &models.AlertRuleWithOptionals{AlertRule: rule})
+		if err != nil {
+			return models.AlertRule{}, err
+		}
+		if err = service.authz.AuthorizeRuleGroupWrite(ctx, user, delta); err != nil {
+			return models.AlertRule{}, err
+		}
+		for _, d := range delta.Update {
+			if d.Existing.GetKey() == rule.GetKey() {
+				storedRule = d.Existing
+			}
+		}
+		if storedRule == nil { // this should not happen but we better catch it to avoid panic
+			return models.AlertRule{}, fmt.Errorf("cannot find rule in the delta")
+		}
+	}
+	storedProvenance, err := service.provenanceStore.GetProvenance(ctx, storedRule, storedRule.OrgID)
 	if err != nil {
 		return models.AlertRule{}, err
 	}
 	if storedProvenance != provenance && storedProvenance != models.ProvenanceNone {
 		return models.AlertRule{}, fmt.Errorf("cannot change provenance from '%s' to '%s'", storedProvenance, provenance)
 	}
+	if len(rule.NotificationSettings) > 0 {
+		validator, err := service.nsValidatorProvider.Validator(ctx, rule.OrgID)
+		if err != nil {
+			return models.AlertRule{}, err
+		}
+		for _, setting := range rule.NotificationSettings {
+			if err := validator.Validate(setting); err != nil {
+				return models.AlertRule{}, err
+			}
+		}
+	}
 	rule.Updated = time.Now()
 	rule.ID = storedRule.ID
 	rule.IntervalSeconds = storedRule.IntervalSeconds
@@ -356,7 +634,7 @@ func (service *AlertRuleService) UpdateAlertRule(ctx context.Context, rule model
 	err = service.xact.InTransaction(ctx, func(ctx context.Context) error {
 		err := service.ruleStore.UpdateAlertRules(ctx, []models.UpdateRule{
 			{
-				Existing: &storedRule,
+				Existing: storedRule,
 				New:      rule,
 			},
 		})
@@ -371,9 +649,9 @@ func (service *AlertRuleService) UpdateAlertRule(ctx context.Context, rule model
 	return rule, err
 }
 
-func (service *AlertRuleService) DeleteAlertRule(ctx context.Context, orgID int64, ruleUID string, provenance models.Provenance) error {
+func (service *AlertRuleService) DeleteAlertRule(ctx context.Context, user identity.Requester, ruleUID string, provenance models.Provenance) error {
 	rule := &models.AlertRule{
-		OrgID: orgID,
+		OrgID: user.GetOrgID(),
 		UID:   ruleUID,
 	}
 	// check that provenance is not changed in an invalid way
@@ -384,15 +662,41 @@ func (service *AlertRuleService) DeleteAlertRule(ctx context.Context, orgID int6
 	if storedProvenance != provenance && storedProvenance != models.ProvenanceNone {
 		return fmt.Errorf("cannot delete with provided provenance '%s', needs '%s'", provenance, storedProvenance)
 	}
+
+	can, err := service.authz.CanWriteAllRules(ctx, user)
+	if err != nil {
+		return err
+	}
+	if !can {
+		delta, err := store.CalculateRuleDelete(ctx, service.ruleStore, rule.GetKey())
+		if err != nil {
+			return err
+		}
+		if err = service.authz.AuthorizeRuleGroupWrite(ctx, user, delta); err != nil {
+			return err
+		}
+	}
+
+	// The single delete is idempotent, and doesn't error when deleting a group that already doesn't exist.
+	// This is different from deleting groups. We delete the rules directly rather than persisting a delta here to keep the semantics the same.
+	// TODO: Either persist a delta here as a breaking change, or deprecate this endpoint in favor of the group endpoint.
 	return service.xact.InTransaction(ctx, func(ctx context.Context) error {
-		return service.deleteRules(ctx, orgID, rule)
+		return service.deleteRules(ctx, user.GetOrgID(), rule)
 	})
 }
 
 // checkLimitsTransactionCtx checks whether the current transaction (as identified by the ctx) breaches configured alert rule limits.
-func (service *AlertRuleService) checkLimitsTransactionCtx(ctx context.Context, orgID, userID int64) error {
+func (service *AlertRuleService) checkLimitsTransactionCtx(ctx context.Context, user identity.Requester) error {
+	// default to 0 if there is no user
+	userID := int64(0)
+	u, err := identity.UserIdentifier(user.GetNamespacedID())
+	if err != nil {
+		return fmt.Errorf("failed to check alert rule quota: %w", err)
+	}
+	userID = u
+
 	limitReached, err := service.quotas.CheckQuotaReached(ctx, models.QuotaTargetSrv, &quota.ScopeParameters{
-		OrgID:  orgID,
+		OrgID:  user.GetOrgID(),
 		UserID: userID,
 	})
 	if err != nil {
@@ -425,22 +729,14 @@ func (service *AlertRuleService) deleteRules(ctx context.Context, orgID int64, t
 }
 
 // GetAlertRuleGroupWithFolderTitle returns the alert rule group with folder title.
-func (service *AlertRuleService) GetAlertRuleGroupWithFolderTitle(ctx context.Context, orgID int64, namespaceUID, group string) (models.AlertRuleGroupWithFolderTitle, error) {
-	q := models.ListAlertRulesQuery{
-		OrgID:         orgID,
-		NamespaceUIDs: []string{namespaceUID},
-		RuleGroup:     group,
-	}
-	ruleList, err := service.ruleStore.ListAlertRules(ctx, &q)
+func (service *AlertRuleService) GetAlertRuleGroupWithFolderTitle(ctx context.Context, user identity.Requester, namespaceUID, group string) (models.AlertRuleGroupWithFolderTitle, error) {
+	ruleList, err := service.GetRuleGroup(ctx, user, namespaceUID, group)
 	if err != nil {
 		return models.AlertRuleGroupWithFolderTitle{}, err
 	}
-	if len(ruleList) == 0 {
-		return models.AlertRuleGroupWithFolderTitle{}, store.ErrAlertRuleGroupNotFound
-	}
 
 	dq := dashboards.GetDashboardQuery{
-		OrgID: orgID,
+		OrgID: user.GetOrgID(),
 		UID:   namespaceUID,
 	}
 	dash, err := service.dashboardService.GetDashboard(ctx, &dq)
@@ -448,14 +744,14 @@ func (service *AlertRuleService) GetAlertRuleGroupWithFolderTitle(ctx context.Co
 		return models.AlertRuleGroupWithFolderTitle{}, err
 	}
 
-	res := models.NewAlertRuleGroupWithFolderTitleFromRulesGroup(ruleList[0].GetGroupKey(), ruleList, dash.Title)
+	res := models.NewAlertRuleGroupWithFolderTitle(ruleList.Rules[0].GetGroupKey(), ruleList.Rules, dash.Title)
 	return res, nil
 }
 
 // GetAlertGroupsWithFolderTitle returns all groups with folder title in the folders identified by folderUID that have at least one alert. If argument folderUIDs is nil or empty - returns groups in all folders.
-func (service *AlertRuleService) GetAlertGroupsWithFolderTitle(ctx context.Context, orgID int64, folderUIDs []string) ([]models.AlertRuleGroupWithFolderTitle, error) {
+func (service *AlertRuleService) GetAlertGroupsWithFolderTitle(ctx context.Context, user identity.Requester, folderUIDs []string) ([]models.AlertRuleGroupWithFolderTitle, error) {
 	q := models.ListAlertRulesQuery{
-		OrgID: orgID,
+		OrgID: user.GetOrgID(),
 	}
 
 	if len(folderUIDs) > 0 {
@@ -466,16 +762,28 @@ func (service *AlertRuleService) GetAlertGroupsWithFolderTitle(ctx context.Conte
 	if err != nil {
 		return nil, err
 	}
+	groups := models.GroupByAlertRuleGroupKey(ruleList)
 
-	groups := make(map[models.AlertRuleGroupKey][]models.AlertRule)
-	namespaces := make(map[string][]*models.AlertRuleGroupKey)
-	for _, r := range ruleList {
-		groupKey := r.GetGroupKey()
-		group := groups[groupKey]
-		group = append(group, *r)
-		groups[groupKey] = group
+	can, err := service.authz.CanReadAllRules(ctx, user)
+	if err != nil {
+		return nil, err
+	}
+	if !can {
+		// if user cannot read all rules, check read access to each group and remove groups that the user does not have access to
+		for key, group := range groups {
+			if err := service.authz.AuthorizeRuleGroupRead(ctx, user, group); err != nil {
+				if errors.Is(err, accesscontrol.ErrAuthorizationBase) {
+					delete(groups, key)
+					continue
+				}
+				return nil, err
+			}
+		}
+	}
 
-		namespaces[r.NamespaceUID] = append(namespaces[r.NamespaceUID], &groupKey)
+	namespaces := make(map[string][]*models.AlertRuleGroupKey)
+	for groupKey := range groups {
+		namespaces[groupKey.NamespaceUID] = append(namespaces[groupKey.NamespaceUID], util.Pointer(groupKey))
 	}
 
 	if len(namespaces) == 0 {
@@ -505,7 +813,7 @@ func (service *AlertRuleService) GetAlertGroupsWithFolderTitle(ctx context.Conte
 		if !ok {
 			return nil, fmt.Errorf("cannot find title for folder with uid '%s'", groupKey.NamespaceUID)
 		}
-		result = append(result, models.NewAlertRuleGroupWithFolderTitle(groupKey, rules, title))
+		result = append(result, models.NewAlertRuleGroupWithFolderTitleFromRulesGroup(groupKey, rules, title))
 	}
 
 	// Return results in a stable manner.
@@ -533,3 +841,44 @@ func withoutNilAlertRules(ptrs []*models.AlertRule) []models.AlertRule {
 	}
 	return result
 }
+
+func (service *AlertRuleService) checkGroupLimits(group models.AlertRuleGroup) error {
+	if service.rulesPerRuleGroupLimit > 0 && int64(len(group.Rules)) > service.rulesPerRuleGroupLimit {
+		service.log.Warn("Large rule group was edited. Large groups are discouraged and may be rejected in the future.",
+			"limit", service.rulesPerRuleGroupLimit,
+			"actual", len(group.Rules),
+			"group", group.Title,
+		)
+	}
+
+	return nil
+}
+
+// ensureRuleNamespace ensures that the rule has a valid namespace UID.
+// If the rule does not have a namespace UID or the namespace (folder) does not exist it will return an error.
+func (service *AlertRuleService) ensureRuleNamespace(ctx context.Context, user identity.Requester, rule models.AlertRule) error {
+	if rule.NamespaceUID == "" {
+		return fmt.Errorf("%w: folderUID must be set", models.ErrAlertRuleFailedValidation)
+	}
+
+	if service.folderService == nil {
+		// folder service is nil when this is called during file provisioning,
+		// which already creates the folder if it does not exist
+		return nil
+	}
+
+	// ensure the namespace exists
+	_, err := service.folderService.Get(ctx, &folder.GetFolderQuery{
+		OrgID:        rule.OrgID,
+		UID:          &rule.NamespaceUID,
+		SignedInUser: user,
+	})
+	if err != nil {
+		if errors.Is(err, dashboards.ErrFolderNotFound) {
+			return fmt.Errorf("%w: folder does not exist", models.ErrAlertRuleFailedValidation)
+		}
+		return err
+	}
+
+	return nil
+}
diff --git a/pkg/services/ngalert/provisioning/alert_rules_test.go b/pkg/services/ngalert/provisioning/alert_rules_test.go
index be924adef9199..fea81b1905315 100644
--- a/pkg/services/ngalert/provisioning/alert_rules_test.go
+++ b/pkg/services/ngalert/provisioning/alert_rules_test.go
@@ -3,18 +3,27 @@ package provisioning
 import (
 	"context"
 	"encoding/json"
+	"errors"
+	"math/rand"
 	"strconv"
 	"strings"
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/expr"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/ngalert/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/ngalert/tests/fakes"
+	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/util"
 
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/folder"
+	"github.com/grafana/grafana/pkg/services/folder/foldertest"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/store"
 	"github.com/grafana/grafana/pkg/setting"
@@ -23,17 +32,21 @@ import (
 func TestAlertRuleService(t *testing.T) {
 	ruleService := createAlertRuleService(t)
 	var orgID int64 = 1
+	u := &user.SignedInUser{
+		UserID: 1,
+		OrgID:  orgID,
+	}
 
 	t.Run("group creation should set the right provenance", func(t *testing.T) {
 		group := createDummyGroup("group-test-1", orgID)
-		err := ruleService.ReplaceRuleGroup(context.Background(), orgID, group, 0, models.ProvenanceAPI)
+		err := ruleService.ReplaceRuleGroup(context.Background(), u, group, models.ProvenanceAPI)
 		require.NoError(t, err)
 
-		readGroup, err := ruleService.GetRuleGroup(context.Background(), orgID, "my-namespace", "group-test-1")
+		readGroup, err := ruleService.GetRuleGroup(context.Background(), u, "my-namespace", "group-test-1")
 		require.NoError(t, err)
 		require.NotEmpty(t, readGroup.Rules)
 		for _, rule := range readGroup.Rules {
-			_, provenance, err := ruleService.GetAlertRule(context.Background(), orgID, rule.UID)
+			_, provenance, err := ruleService.GetAlertRule(context.Background(), u, rule.UID)
 			require.NoError(t, err)
 			require.Equal(t, models.ProvenanceAPI, provenance)
 		}
@@ -42,15 +55,15 @@ func TestAlertRuleService(t *testing.T) {
 	t.Run("alert rule group should be updated correctly", func(t *testing.T) {
 		rule := dummyRule("test#3", orgID)
 		rule.RuleGroup = "a"
-		rule, err := ruleService.CreateAlertRule(context.Background(), rule, models.ProvenanceNone, 0)
+		rule, err := ruleService.CreateAlertRule(context.Background(), u, rule, models.ProvenanceNone)
 		require.NoError(t, err)
 		require.Equal(t, int64(60), rule.IntervalSeconds)
 
 		var interval int64 = 120
-		err = ruleService.UpdateRuleGroup(context.Background(), orgID, rule.NamespaceUID, rule.RuleGroup, 120)
+		err = ruleService.UpdateRuleGroup(context.Background(), u, rule.NamespaceUID, rule.RuleGroup, 120)
 		require.NoError(t, err)
 
-		rule, _, err = ruleService.GetAlertRule(context.Background(), orgID, rule.UID)
+		rule, _, err = ruleService.GetAlertRule(context.Background(), u, rule.UID)
 		require.NoError(t, err)
 		require.Equal(t, interval, rule.IntervalSeconds)
 	})
@@ -59,23 +72,37 @@ func TestAlertRuleService(t *testing.T) {
 		var orgID int64 = 2
 		rule := dummyRule("test#1", orgID)
 		rule.NamespaceUID = "123abc"
-		rule, err := ruleService.CreateAlertRule(context.Background(), rule, models.ProvenanceNone, 0)
+		u := &user.SignedInUser{OrgID: orgID}
+		rule, err := ruleService.CreateAlertRule(context.Background(), u, rule, models.ProvenanceNone)
 		require.NoError(t, err)
 
 		rule.NamespaceUID = "abc123"
-		_, err = ruleService.UpdateAlertRule(context.Background(),
-			rule, models.ProvenanceNone)
+		_, err = ruleService.UpdateAlertRule(context.Background(), u, rule, models.ProvenanceNone)
 		require.NoError(t, err)
 	})
 
+	t.Run("group update should propagate folderUID from group to rules", func(t *testing.T) {
+		ruleService := createAlertRuleService(t)
+		group := createDummyGroup("namespace-test", orgID)
+		group.Rules[0].NamespaceUID = ""
+
+		err := ruleService.ReplaceRuleGroup(context.Background(), u, group, models.ProvenanceAPI)
+		require.NoError(t, err)
+
+		readGroup, err := ruleService.GetRuleGroup(context.Background(), u, "my-namespace", "namespace-test")
+		require.NoError(t, err)
+		require.NotEmpty(t, readGroup.Rules)
+		require.Equal(t, "my-namespace", readGroup.Rules[0].NamespaceUID)
+	})
+
 	t.Run("group creation should propagate group title correctly", func(t *testing.T) {
 		group := createDummyGroup("group-test-3", orgID)
 		group.Rules[0].RuleGroup = "something different"
 
-		err := ruleService.ReplaceRuleGroup(context.Background(), orgID, group, 0, models.ProvenanceAPI)
+		err := ruleService.ReplaceRuleGroup(context.Background(), u, group, models.ProvenanceAPI)
 		require.NoError(t, err)
 
-		readGroup, err := ruleService.GetRuleGroup(context.Background(), orgID, "my-namespace", "group-test-3")
+		readGroup, err := ruleService.GetRuleGroup(context.Background(), u, "my-namespace", "group-test-3")
 		require.NoError(t, err)
 		require.NotEmpty(t, readGroup.Rules)
 		for _, rule := range readGroup.Rules {
@@ -86,16 +113,16 @@ func TestAlertRuleService(t *testing.T) {
 	t.Run("alert rule should get interval from existing rule group", func(t *testing.T) {
 		rule := dummyRule("test#4", orgID)
 		rule.RuleGroup = "b"
-		rule, err := ruleService.CreateAlertRule(context.Background(), rule, models.ProvenanceNone, 0)
+		rule, err := ruleService.CreateAlertRule(context.Background(), u, rule, models.ProvenanceNone)
 		require.NoError(t, err)
 
 		var interval int64 = 120
-		err = ruleService.UpdateRuleGroup(context.Background(), orgID, rule.NamespaceUID, rule.RuleGroup, 120)
+		err = ruleService.UpdateRuleGroup(context.Background(), u, rule.NamespaceUID, rule.RuleGroup, 120)
 		require.NoError(t, err)
 
 		rule = dummyRule("test#4-1", orgID)
 		rule.RuleGroup = "b"
-		rule, err = ruleService.CreateAlertRule(context.Background(), rule, models.ProvenanceNone, 0)
+		rule, err = ruleService.CreateAlertRule(context.Background(), u, rule, models.ProvenanceNone)
 		require.NoError(t, err)
 		require.Equal(t, interval, rule.IntervalSeconds)
 	})
@@ -108,22 +135,23 @@ func TestAlertRuleService(t *testing.T) {
 			ruleGroup          = "abc"
 			newInterval  int64 = 120
 		)
+		u := &user.SignedInUser{OrgID: orgID}
 		rule := dummyRule("my_rule", orgID)
 		rule.UID = ruleUID
 		rule.RuleGroup = ruleGroup
 		rule.NamespaceUID = namespaceUID
-		_, err := ruleService.CreateAlertRule(context.Background(), rule, models.ProvenanceNone, 0)
+		_, err := ruleService.CreateAlertRule(context.Background(), u, rule, models.ProvenanceNone)
 		require.NoError(t, err)
 
-		rule, _, err = ruleService.GetAlertRule(context.Background(), orgID, ruleUID)
+		rule, _, err = ruleService.GetAlertRule(context.Background(), u, ruleUID)
 		require.NoError(t, err)
 		require.Equal(t, int64(1), rule.Version)
 		require.Equal(t, int64(60), rule.IntervalSeconds)
 
-		err = ruleService.UpdateRuleGroup(context.Background(), orgID, namespaceUID, ruleGroup, newInterval)
+		err = ruleService.UpdateRuleGroup(context.Background(), u, namespaceUID, ruleGroup, newInterval)
 		require.NoError(t, err)
 
-		rule, _, err = ruleService.GetAlertRule(context.Background(), orgID, ruleUID)
+		rule, _, err = ruleService.GetAlertRule(context.Background(), u, ruleUID)
 		require.NoError(t, err)
 		require.Equal(t, int64(2), rule.Version)
 		require.Equal(t, newInterval, rule.IntervalSeconds)
@@ -131,16 +159,16 @@ func TestAlertRuleService(t *testing.T) {
 
 	t.Run("updating a group by updating a rule should bump that rule's data and version number", func(t *testing.T) {
 		group := createDummyGroup("group-test-5", orgID)
-		err := ruleService.ReplaceRuleGroup(context.Background(), orgID, group, 0, models.ProvenanceAPI)
+		err := ruleService.ReplaceRuleGroup(context.Background(), u, group, models.ProvenanceAPI)
 		require.NoError(t, err)
-		updatedGroup, err := ruleService.GetRuleGroup(context.Background(), orgID, "my-namespace", "group-test-5")
+		updatedGroup, err := ruleService.GetRuleGroup(context.Background(), u, "my-namespace", "group-test-5")
 		require.NoError(t, err)
 
 		updatedGroup.Rules[0].Title = "some-other-title-asdf"
-		err = ruleService.ReplaceRuleGroup(context.Background(), orgID, updatedGroup, 0, models.ProvenanceAPI)
+		err = ruleService.ReplaceRuleGroup(context.Background(), u, updatedGroup, models.ProvenanceAPI)
 		require.NoError(t, err)
 
-		readGroup, err := ruleService.GetRuleGroup(context.Background(), orgID, "my-namespace", "group-test-5")
+		readGroup, err := ruleService.GetRuleGroup(context.Background(), u, "my-namespace", "group-test-5")
 		require.NoError(t, err)
 		require.NotEmpty(t, readGroup.Rules)
 		require.Len(t, readGroup.Rules, 1)
@@ -159,17 +187,17 @@ func TestAlertRuleService(t *testing.T) {
 				dummyRule("overlap-test-rule-2", orgID),
 			},
 		}
-		err := ruleService.ReplaceRuleGroup(context.Background(), orgID, group, 0, models.ProvenanceAPI)
+		err := ruleService.ReplaceRuleGroup(context.Background(), u, group, models.ProvenanceAPI)
 		require.NoError(t, err)
-		updatedGroup, err := ruleService.GetRuleGroup(context.Background(), orgID, "my-namespace", "overlap-test")
+		updatedGroup, err := ruleService.GetRuleGroup(context.Background(), u, "my-namespace", "overlap-test")
 		require.NoError(t, err)
 
 		updatedGroup.Rules[0].Title = "overlap-test-rule-2"
 		updatedGroup.Rules[1].Title = "overlap-test-rule-3"
-		err = ruleService.ReplaceRuleGroup(context.Background(), orgID, updatedGroup, 0, models.ProvenanceAPI)
+		err = ruleService.ReplaceRuleGroup(context.Background(), u, updatedGroup, models.ProvenanceAPI)
 		require.NoError(t, err)
 
-		readGroup, err := ruleService.GetRuleGroup(context.Background(), orgID, "my-namespace", "overlap-test")
+		readGroup, err := ruleService.GetRuleGroup(context.Background(), u, "my-namespace", "overlap-test")
 		require.NoError(t, err)
 		require.NotEmpty(t, readGroup.Rules)
 		require.Len(t, readGroup.Rules, 2)
@@ -190,17 +218,17 @@ func TestAlertRuleService(t *testing.T) {
 				dummyRule("swap-test-rule-2", orgID),
 			},
 		}
-		err := ruleService.ReplaceRuleGroup(context.Background(), orgID, group, 0, models.ProvenanceAPI)
+		err := ruleService.ReplaceRuleGroup(context.Background(), u, group, models.ProvenanceAPI)
 		require.NoError(t, err)
-		updatedGroup, err := ruleService.GetRuleGroup(context.Background(), orgID, "my-namespace", "swap-test")
+		updatedGroup, err := ruleService.GetRuleGroup(context.Background(), u, "my-namespace", "swap-test")
 		require.NoError(t, err)
 
 		updatedGroup.Rules[0].Title = "swap-test-rule-2"
 		updatedGroup.Rules[1].Title = "swap-test-rule-1"
-		err = ruleService.ReplaceRuleGroup(context.Background(), orgID, updatedGroup, 0, models.ProvenanceAPI)
+		err = ruleService.ReplaceRuleGroup(context.Background(), u, updatedGroup, models.ProvenanceAPI)
 		require.NoError(t, err)
 
-		readGroup, err := ruleService.GetRuleGroup(context.Background(), orgID, "my-namespace", "swap-test")
+		readGroup, err := ruleService.GetRuleGroup(context.Background(), u, "my-namespace", "swap-test")
 		require.NoError(t, err)
 		require.NotEmpty(t, readGroup.Rules)
 		require.Len(t, readGroup.Rules, 2)
@@ -222,18 +250,18 @@ func TestAlertRuleService(t *testing.T) {
 				dummyRule("cycle-test-rule-3", orgID),
 			},
 		}
-		err := ruleService.ReplaceRuleGroup(context.Background(), orgID, group, 0, models.ProvenanceAPI)
+		err := ruleService.ReplaceRuleGroup(context.Background(), u, group, models.ProvenanceAPI)
 		require.NoError(t, err)
-		updatedGroup, err := ruleService.GetRuleGroup(context.Background(), orgID, "my-namespace", "cycle-test")
+		updatedGroup, err := ruleService.GetRuleGroup(context.Background(), u, "my-namespace", "cycle-test")
 		require.NoError(t, err)
 
 		updatedGroup.Rules[0].Title = "cycle-test-rule-2"
 		updatedGroup.Rules[1].Title = "cycle-test-rule-3"
 		updatedGroup.Rules[2].Title = "cycle-test-rule-1"
-		err = ruleService.ReplaceRuleGroup(context.Background(), orgID, updatedGroup, 0, models.ProvenanceAPI)
+		err = ruleService.ReplaceRuleGroup(context.Background(), u, updatedGroup, models.ProvenanceAPI)
 		require.NoError(t, err)
 
-		readGroup, err := ruleService.GetRuleGroup(context.Background(), orgID, "my-namespace", "cycle-test")
+		readGroup, err := ruleService.GetRuleGroup(context.Background(), u, "my-namespace", "cycle-test")
 		require.NoError(t, err)
 		require.NotEmpty(t, readGroup.Rules)
 		require.Len(t, readGroup.Rules, 3)
@@ -260,9 +288,9 @@ func TestAlertRuleService(t *testing.T) {
 				dummyRule("multi-cycle-test-rule-5", orgID),
 			},
 		}
-		err := ruleService.ReplaceRuleGroup(context.Background(), orgID, group, 0, models.ProvenanceAPI)
+		err := ruleService.ReplaceRuleGroup(context.Background(), u, group, models.ProvenanceAPI)
 		require.NoError(t, err)
-		updatedGroup, err := ruleService.GetRuleGroup(context.Background(), orgID, "my-namespace", "multi-cycle-test")
+		updatedGroup, err := ruleService.GetRuleGroup(context.Background(), u, "my-namespace", "multi-cycle-test")
 		require.NoError(t, err)
 
 		updatedGroup.Rules[0].Title = "multi-cycle-test-rule-2"
@@ -272,10 +300,10 @@ func TestAlertRuleService(t *testing.T) {
 		updatedGroup.Rules[3].Title = "multi-cycle-test-rule-5"
 		updatedGroup.Rules[4].Title = "multi-cycle-test-rule-3"
 
-		err = ruleService.ReplaceRuleGroup(context.Background(), orgID, updatedGroup, 0, models.ProvenanceAPI)
+		err = ruleService.ReplaceRuleGroup(context.Background(), u, updatedGroup, models.ProvenanceAPI)
 		require.NoError(t, err)
 
-		readGroup, err := ruleService.GetRuleGroup(context.Background(), orgID, "my-namespace", "multi-cycle-test")
+		readGroup, err := ruleService.GetRuleGroup(context.Background(), u, "my-namespace", "multi-cycle-test")
 		require.NoError(t, err)
 		require.NotEmpty(t, readGroup.Rules)
 		require.Len(t, readGroup.Rules, 5)
@@ -301,7 +329,7 @@ func TestAlertRuleService(t *testing.T) {
 				dummyRule("recreate-test-rule-1", orgID),
 			},
 		}
-		err := ruleService.ReplaceRuleGroup(context.Background(), orgID, group, 0, models.ProvenanceAPI)
+		err := ruleService.ReplaceRuleGroup(context.Background(), u, group, models.ProvenanceAPI)
 		require.NoError(t, err)
 		updatedGroup := models.AlertRuleGroup{
 			Title:     "recreate-test",
@@ -311,10 +339,10 @@ func TestAlertRuleService(t *testing.T) {
 				dummyRule("recreate-test-rule-1", orgID),
 			},
 		}
-		err = ruleService.ReplaceRuleGroup(context.Background(), orgID, updatedGroup, 0, models.ProvenanceAPI)
+		err = ruleService.ReplaceRuleGroup(context.Background(), u, updatedGroup, models.ProvenanceAPI)
 		require.NoError(t, err)
 
-		readGroup, err := ruleService.GetRuleGroup(context.Background(), orgID, "my-namespace", "recreate-test")
+		readGroup, err := ruleService.GetRuleGroup(context.Background(), u, "my-namespace", "recreate-test")
 		require.NoError(t, err)
 		require.NotEmpty(t, readGroup.Rules)
 		require.Len(t, readGroup.Rules, 1)
@@ -332,17 +360,17 @@ func TestAlertRuleService(t *testing.T) {
 				dummyRule("create-overlap-test-rule-1", orgID),
 			},
 		}
-		err := ruleService.ReplaceRuleGroup(context.Background(), orgID, group, 0, models.ProvenanceAPI)
+		err := ruleService.ReplaceRuleGroup(context.Background(), u, group, models.ProvenanceAPI)
 		require.NoError(t, err)
-		updatedGroup, err := ruleService.GetRuleGroup(context.Background(), orgID, "my-namespace", "create-overlap-test")
+		updatedGroup, err := ruleService.GetRuleGroup(context.Background(), u, "my-namespace", "create-overlap-test")
 		require.NoError(t, err)
 		updatedGroup.Rules[0].Title = "create-overlap-test-rule-2"
 		updatedGroup.Rules = append(updatedGroup.Rules, dummyRule("create-overlap-test-rule-1", orgID))
 
-		err = ruleService.ReplaceRuleGroup(context.Background(), orgID, updatedGroup, 0, models.ProvenanceAPI)
+		err = ruleService.ReplaceRuleGroup(context.Background(), u, updatedGroup, models.ProvenanceAPI)
 		require.NoError(t, err)
 
-		readGroup, err := ruleService.GetRuleGroup(context.Background(), orgID, "my-namespace", "create-overlap-test")
+		readGroup, err := ruleService.GetRuleGroup(context.Background(), u, "my-namespace", "create-overlap-test")
 		require.NoError(t, err)
 		require.NotEmpty(t, readGroup.Rules)
 		require.Len(t, readGroup.Rules, 2)
@@ -361,9 +389,9 @@ func TestAlertRuleService(t *testing.T) {
 			models.PanelIDAnnotation:      strconv.FormatInt(panelId, 10),
 		}
 
-		err := ruleService.ReplaceRuleGroup(context.Background(), orgID, group, 0, models.ProvenanceAPI)
+		err := ruleService.ReplaceRuleGroup(context.Background(), u, group, models.ProvenanceAPI)
 		require.NoError(t, err)
-		updatedGroup, err := ruleService.GetRuleGroup(context.Background(), orgID, "my-namespace", "group-test-5")
+		updatedGroup, err := ruleService.GetRuleGroup(context.Background(), u, "my-namespace", "group-test-5")
 		require.NoError(t, err)
 
 		require.NotNil(t, updatedGroup.Rules[0].DashboardUID)
@@ -418,12 +446,11 @@ func TestAlertRuleService(t *testing.T) {
 		}
 		for _, test := range tests {
 			t.Run(test.name, func(t *testing.T) {
-				var orgID int64 = 1
 				rule := dummyRule(t.Name(), orgID)
-				rule, err := ruleService.CreateAlertRule(context.Background(), rule, test.from, 0)
+				rule, err := ruleService.CreateAlertRule(context.Background(), u, rule, test.from)
 				require.NoError(t, err)
 
-				_, err = ruleService.UpdateAlertRule(context.Background(), rule, test.to)
+				_, err = ruleService.UpdateAlertRule(context.Background(), u, rule, test.to)
 				if test.errNil {
 					require.NoError(t, err)
 				} else {
@@ -481,11 +508,11 @@ func TestAlertRuleService(t *testing.T) {
 			t.Run(test.name, func(t *testing.T) {
 				var orgID int64 = 1
 				group := createDummyGroup(t.Name(), orgID)
-				err := ruleService.ReplaceRuleGroup(context.Background(), 1, group, 0, test.from)
+				err := ruleService.ReplaceRuleGroup(context.Background(), u, group, test.from)
 				require.NoError(t, err)
 
 				group.Rules[0].Title = t.Name()
-				err = ruleService.ReplaceRuleGroup(context.Background(), 1, group, 0, test.to)
+				err = ruleService.ReplaceRuleGroup(context.Background(), u, group, test.to)
 				if test.errNil {
 					require.NoError(t, err)
 				} else {
@@ -501,7 +528,7 @@ func TestAlertRuleService(t *testing.T) {
 		checker.EXPECT().LimitExceeded()
 		ruleService.quotas = checker
 
-		_, err := ruleService.CreateAlertRule(context.Background(), dummyRule("test#1", orgID), models.ProvenanceNone, 0)
+		_, err := ruleService.CreateAlertRule(context.Background(), u, dummyRule("test#1", orgID), models.ProvenanceNone)
 
 		require.ErrorIs(t, err, models.ErrQuotaReached)
 	})
@@ -512,28 +539,235 @@ func TestAlertRuleService(t *testing.T) {
 		checker.EXPECT().LimitExceeded()
 		ruleService.quotas = checker
 
-		group := createDummyGroup("quota-reached", 1)
-		err := ruleService.ReplaceRuleGroup(context.Background(), 1, group, 0, models.ProvenanceAPI)
+		group := createDummyGroup("quota-reached", orgID)
+		err := ruleService.ReplaceRuleGroup(context.Background(), u, group, models.ProvenanceAPI)
 
 		require.ErrorIs(t, err, models.ErrQuotaReached)
 	})
 }
 
 func TestCreateAlertRule(t *testing.T) {
-	ruleService := createAlertRuleService(t)
-	var orgID int64 = 1
+	orgID := rand.Int63()
+	u := &user.SignedInUser{OrgID: orgID}
+	groupKey := models.GenerateGroupKey(orgID)
+	groupIntervalSeconds := int64(30)
+	rules := models.GenerateAlertRules(3, models.AlertRuleGen(models.WithGroupKey(groupKey), models.WithInterval(time.Duration(groupIntervalSeconds)*time.Second)))
+	groupProvenance := models.ProvenanceAPI
+
+	initServiceWithData := func(t *testing.T) (*AlertRuleService, *fakes.RuleStore, *fakes.FakeProvisioningStore, *fakeRuleAccessControlService) {
+		service, ruleStore, provenanceStore, ac := initService(t)
+		ruleStore.Rules = map[int64][]*models.AlertRule{
+			orgID: rules,
+		}
+		for _, rule := range rules {
+			require.NoError(t, provenanceStore.SetProvenance(context.Background(), rule, orgID, groupProvenance))
+		}
+		return service, ruleStore, provenanceStore, ac
+	}
+
+	t.Run("when user can write all rules", func(t *testing.T) {
+		t.Run("and a new rule creates a new group", func(t *testing.T) {
+			rule := models.AlertRuleGen(models.WithOrgID(orgID))()
+			service, ruleStore, provenanceStore, ac := initServiceWithData(t)
+
+			ac.CanWriteAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+				return true, nil
+			}
+
+			actualRule, err := service.CreateAlertRule(context.Background(), u, *rule, models.ProvenanceFile)
+			require.NoError(t, err)
+
+			require.Len(t, ac.Calls, 1)
+			assert.Equal(t, "CanWriteAllRules", ac.Calls[0].Method)
+
+			t.Run("it should assign default interval", func(t *testing.T) {
+				require.Equal(t, service.defaultIntervalSeconds, actualRule.IntervalSeconds)
+			})
+
+			t.Run("inserts to database", func(t *testing.T) {
+				inserts := ruleStore.GetRecordedCommands(func(cmd any) (any, bool) {
+					a, ok := cmd.([]models.AlertRule)
+					return a, ok
+				})
+				require.Len(t, inserts, 1)
+				cmd := inserts[0].([]models.AlertRule)
+				require.Len(t, cmd, 1)
+			})
+
+			t.Run("set correct provenance", func(t *testing.T) {
+				p, err := provenanceStore.GetProvenance(context.Background(), &actualRule, orgID)
+				require.NoError(t, err)
+				require.Equal(t, models.ProvenanceFile, p)
+			})
+		})
+		t.Run("and it adds a rule to a group", func(t *testing.T) {
+			rule := models.AlertRuleGen(models.WithGroupKey(groupKey))()
+			service, ruleStore, provenanceStore, ac := initServiceWithData(t)
+
+			ac.CanWriteAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+				return true, nil
+			}
+
+			actualRule, err := service.CreateAlertRule(context.Background(), u, *rule, models.ProvenanceNone)
+			require.NoError(t, err)
+
+			require.Len(t, ac.Calls, 1)
+			assert.Equal(t, "CanWriteAllRules", ac.Calls[0].Method)
+
+			t.Run("it should assign group interval", func(t *testing.T) {
+				require.Equal(t, groupIntervalSeconds, actualRule.IntervalSeconds)
+			})
 
+			t.Run("inserts to database", func(t *testing.T) {
+				inserts := ruleStore.GetRecordedCommands(func(cmd any) (any, bool) {
+					a, ok := cmd.([]models.AlertRule)
+					return a, ok
+				})
+				require.Len(t, inserts, 1)
+				cmd := inserts[0].([]models.AlertRule)
+				require.Len(t, cmd, 1)
+			})
+
+			t.Run("set correct provenance", func(t *testing.T) {
+				p, err := provenanceStore.GetProvenance(context.Background(), &actualRule, orgID)
+				require.NoError(t, err)
+				require.Equal(t, models.ProvenanceNone, p)
+			})
+		})
+	})
+	t.Run("when user cannot write all rules", func(t *testing.T) {
+		t.Run("and it creates a new group", func(t *testing.T) {
+			rule := models.AlertRuleGen(models.WithOrgID(orgID))()
+			t.Run("it should authorize the change", func(t *testing.T) {
+				service, ruleStore, provenanceStore, ac := initServiceWithData(t)
+
+				ac.CanWriteAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+					return false, nil
+				}
+				ac.AuthorizeRuleChangesFunc = func(ctx context.Context, user identity.Requester, change *store.GroupDelta) error {
+					assert.Equal(t, u, user)
+					assert.Equal(t, rule.GetGroupKey(), change.GroupKey)
+					assert.Len(t, change.New, 1)
+					assert.Empty(t, change.Update)
+					assert.Empty(t, change.Delete)
+					assert.Empty(t, change.AffectedGroups)
+					return nil
+				}
+
+				actualRule, err := service.CreateAlertRule(context.Background(), u, *rule, models.ProvenanceFile)
+				require.NoError(t, err)
+
+				require.Len(t, ac.Calls, 2)
+				assert.Equal(t, "CanWriteAllRules", ac.Calls[0].Method)
+				assert.Equal(t, "AuthorizeRuleGroupWrite", ac.Calls[1].Method)
+
+				t.Run("it should assign default interval", func(t *testing.T) {
+					require.Equal(t, service.defaultIntervalSeconds, actualRule.IntervalSeconds)
+				})
+
+				t.Run("inserts to database", func(t *testing.T) {
+					inserts := ruleStore.GetRecordedCommands(func(cmd any) (any, bool) {
+						a, ok := cmd.([]models.AlertRule)
+						return a, ok
+					})
+					require.Len(t, inserts, 1)
+					cmd := inserts[0].([]models.AlertRule)
+					require.Len(t, cmd, 1)
+				})
+
+				t.Run("set correct provenance", func(t *testing.T) {
+					p, err := provenanceStore.GetProvenance(context.Background(), &actualRule, orgID)
+					require.NoError(t, err)
+					require.Equal(t, models.ProvenanceFile, p)
+				})
+			})
+		})
+		t.Run("and it adds a rule to a group", func(t *testing.T) {
+			rule := models.AlertRuleGen(models.WithGroupKey(groupKey))()
+			t.Run("it should authorize the change to whole group", func(t *testing.T) {
+				service, ruleStore, provenanceStore, ac := initServiceWithData(t)
+
+				ac.CanWriteAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+					return false, nil
+				}
+				ac.AuthorizeRuleChangesFunc = func(ctx context.Context, user identity.Requester, change *store.GroupDelta) error {
+					assert.Equal(t, u, user)
+					assert.Equal(t, rule.GetGroupKey(), change.GroupKey)
+					assert.Contains(t, change.AffectedGroups, change.GroupKey)
+					assert.EqualValues(t, change.AffectedGroups[change.GroupKey], rules)
+					assert.Len(t, change.New, 1)
+					assert.Empty(t, change.Update)
+					assert.Empty(t, change.Delete)
+					return nil
+				}
+
+				actualRule, err := service.CreateAlertRule(context.Background(), u, *rule, models.ProvenanceNone)
+				require.NoError(t, err)
+
+				require.Len(t, ac.Calls, 2)
+				assert.Equal(t, "CanWriteAllRules", ac.Calls[0].Method)
+				assert.Equal(t, "AuthorizeRuleGroupWrite", ac.Calls[1].Method)
+
+				t.Run("it should assign group interval", func(t *testing.T) {
+					require.Equal(t, groupIntervalSeconds, actualRule.IntervalSeconds)
+				})
+
+				t.Run("inserts to database", func(t *testing.T) {
+					inserts := ruleStore.GetRecordedCommands(func(cmd any) (any, bool) {
+						a, ok := cmd.([]models.AlertRule)
+						return a, ok
+					})
+					require.Len(t, inserts, 1)
+					cmd := inserts[0].([]models.AlertRule)
+					require.Len(t, cmd, 1)
+				})
+
+				t.Run("set correct provenance", func(t *testing.T) {
+					p, err := provenanceStore.GetProvenance(context.Background(), &actualRule, orgID)
+					require.NoError(t, err)
+					require.Equal(t, models.ProvenanceNone, p)
+				})
+			})
+		})
+		t.Run("it should not insert if not authorized", func(t *testing.T) {
+			rule := models.AlertRuleGen(models.WithGroupKey(groupKey))()
+			service, ruleStore, _, ac := initServiceWithData(t)
+
+			ac.CanWriteAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+				return false, nil
+			}
+			expectedErr := errors.New("test error")
+			ac.AuthorizeRuleChangesFunc = func(ctx context.Context, user identity.Requester, change *store.GroupDelta) error {
+				return expectedErr
+			}
+
+			_, err := service.CreateAlertRule(context.Background(), u, *rule, models.ProvenanceFile)
+			require.ErrorIs(t, expectedErr, err)
+
+			require.Len(t, ac.Calls, 2)
+			assert.Equal(t, "CanWriteAllRules", ac.Calls[0].Method)
+			assert.Equal(t, "AuthorizeRuleGroupWrite", ac.Calls[1].Method)
+
+			inserts := ruleStore.GetRecordedCommands(func(cmd any) (any, bool) {
+				a, ok := cmd.([]models.AlertRule)
+				return a, ok
+			})
+			require.Empty(t, inserts)
+		})
+	})
+
+	ruleService := createAlertRuleService(t)
 	t.Run("should return the created id", func(t *testing.T) {
-		rule, err := ruleService.CreateAlertRule(context.Background(), dummyRule("test#1", orgID), models.ProvenanceNone, 0)
+		rule, err := ruleService.CreateAlertRule(context.Background(), u, dummyRule("test#1", orgID), models.ProvenanceNone)
 		require.NoError(t, err)
 		require.NotEqual(t, 0, rule.ID, "expected to get the created id and not the zero value")
 	})
 
 	t.Run("should set the right provenance", func(t *testing.T) {
-		rule, err := ruleService.CreateAlertRule(context.Background(), dummyRule("test#2", orgID), models.ProvenanceAPI, 0)
+		rule, err := ruleService.CreateAlertRule(context.Background(), u, dummyRule("test#2", orgID), models.ProvenanceAPI)
 		require.NoError(t, err)
 
-		_, provenance, err := ruleService.GetAlertRule(context.Background(), orgID, rule.UID)
+		_, provenance, err := ruleService.GetAlertRule(context.Background(), u, rule.UID)
 		require.NoError(t, err)
 		require.Equal(t, models.ProvenanceAPI, provenance)
 	})
@@ -542,32 +776,781 @@ func TestCreateAlertRule(t *testing.T) {
 		t.Run("return error if it is not valid UID", func(t *testing.T) {
 			rule := dummyRule("test#3", orgID)
 			rule.UID = strings.Repeat("1", util.MaxUIDLength+1)
-			rule, err := ruleService.CreateAlertRule(context.Background(), rule, models.ProvenanceNone, 0)
+			rule, err := ruleService.CreateAlertRule(context.Background(), u, rule, models.ProvenanceNone)
 			require.ErrorIs(t, err, models.ErrAlertRuleFailedValidation)
 		})
 		t.Run("should create a new rule with this UID", func(t *testing.T) {
 			rule := dummyRule("test#3", orgID)
 			uid := util.GenerateShortUID()
 			rule.UID = uid
-			created, err := ruleService.CreateAlertRule(context.Background(), rule, models.ProvenanceNone, 0)
+			created, err := ruleService.CreateAlertRule(context.Background(), u, rule, models.ProvenanceNone)
 			require.NoError(t, err)
 			require.Equal(t, uid, created.UID)
-			_, _, err = ruleService.GetAlertRule(context.Background(), orgID, uid)
+			_, _, err = ruleService.GetAlertRule(context.Background(), u, uid)
+			require.NoError(t, err)
+		})
+	})
+}
+
+func TestUpdateAlertRule(t *testing.T) {
+	orgID := rand.Int63()
+	u := &user.SignedInUser{OrgID: orgID}
+	groupKey := models.GenerateGroupKey(orgID)
+	groupIntervalSeconds := int64(30)
+	rules := models.GenerateAlertRules(3, models.AlertRuleGen(models.WithGroupKey(groupKey), models.WithInterval(time.Duration(groupIntervalSeconds)*time.Second)))
+	groupProvenance := models.ProvenanceAPI
+
+	initServiceWithData := func(t *testing.T) (*AlertRuleService, *fakes.RuleStore, *fakes.FakeProvisioningStore, *fakeRuleAccessControlService) {
+		service, ruleStore, provenanceStore, ac := initService(t)
+		ruleStore.Rules = map[int64][]*models.AlertRule{
+			orgID: rules,
+		}
+		for _, rule := range rules {
+			require.NoError(t, provenanceStore.SetProvenance(context.Background(), rule, orgID, groupProvenance))
+		}
+		return service, ruleStore, provenanceStore, ac
+	}
+
+	t.Run("when user can write all rules", func(t *testing.T) {
+		rule := models.CopyRule(rules[0])
+		rule.RuleGroup = rule.RuleGroup + "_new"
+		rule.Title = rule.Title + "_new"
+		service, ruleStore, _, ac := initServiceWithData(t)
+
+		ac.CanWriteAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+			return true, nil
+		}
+
+		_, err := service.UpdateAlertRule(context.Background(), u, *rule, models.ProvenanceAPI)
+		require.NoError(t, err)
+
+		require.Len(t, ac.Calls, 1)
+		assert.Equal(t, "CanWriteAllRules", ac.Calls[0].Method)
+
+		updates := ruleStore.GetRecordedCommands(func(cmd any) (any, bool) {
+			a, ok := cmd.([]models.UpdateRule)
+			return a, ok
+		})
+		require.Len(t, updates, 1)
+	})
+	t.Run("when user cannot write all rules", func(t *testing.T) {
+		rule := models.CopyRule(rules[0])
+		rule.Title = rule.Title + "_new"
+
+		t.Run("it should authorize the change to whole group", func(t *testing.T) {
+			service, ruleStore, _, ac := initServiceWithData(t)
+
+			ac.CanWriteAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+				return false, nil
+			}
+			ac.AuthorizeRuleChangesFunc = func(ctx context.Context, user identity.Requester, change *store.GroupDelta) error {
+				assert.Equal(t, u, user)
+				assert.Equal(t, groupKey, change.GroupKey)
+				assert.Contains(t, change.AffectedGroups, groupKey)
+				assert.EqualValues(t, rules, change.AffectedGroups[groupKey])
+				assert.Len(t, change.Update, 1)
+				assert.Empty(t, change.New)
+				assert.Empty(t, change.Delete)
+				return nil
+			}
+
+			_, err := service.UpdateAlertRule(context.Background(), u, *rule, groupProvenance)
+			require.NoError(t, err)
+
+			require.Len(t, ac.Calls, 2)
+			assert.Equal(t, "CanWriteAllRules", ac.Calls[0].Method)
+			assert.Equal(t, "AuthorizeRuleGroupWrite", ac.Calls[1].Method)
+
+			updates := ruleStore.GetRecordedCommands(func(cmd any) (any, bool) {
+				a, ok := cmd.([]models.UpdateRule)
+				return a, ok
+			})
+			require.Len(t, updates, 1)
+		})
+		t.Run("it should not update if not authorized", func(t *testing.T) {
+			service, ruleStore, _, ac := initServiceWithData(t)
+
+			ac.CanWriteAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+				return false, nil
+			}
+			expectedErr := errors.New("test error")
+			ac.AuthorizeRuleChangesFunc = func(ctx context.Context, user identity.Requester, change *store.GroupDelta) error {
+				return expectedErr
+			}
+
+			_, err := service.UpdateAlertRule(context.Background(), u, *rule, groupProvenance)
+			require.ErrorIs(t, expectedErr, err)
+
+			require.Len(t, ac.Calls, 2)
+			assert.Equal(t, "CanWriteAllRules", ac.Calls[0].Method)
+			assert.Equal(t, "AuthorizeRuleGroupWrite", ac.Calls[1].Method)
+
+			updates := ruleStore.GetRecordedCommands(func(cmd any) (any, bool) {
+				a, ok := cmd.([]models.UpdateRule)
+				return a, ok
+			})
+			require.Empty(t, updates)
+		})
+	})
+}
+
+func TestDeleteAlertRule(t *testing.T) {
+	orgID := rand.Int63()
+	u := &user.SignedInUser{OrgID: orgID}
+	groupKey := models.GenerateGroupKey(orgID)
+	groupIntervalSeconds := int64(30)
+	rules := models.GenerateAlertRules(3, models.AlertRuleGen(models.WithGroupKey(groupKey), models.WithInterval(time.Duration(groupIntervalSeconds)*time.Second)))
+	groupProvenance := models.ProvenanceAPI
+
+	initServiceWithData := func(t *testing.T) (*AlertRuleService, *fakes.RuleStore, *fakes.FakeProvisioningStore, *fakeRuleAccessControlService) {
+		service, ruleStore, provenanceStore, ac := initService(t)
+		ruleStore.Rules = map[int64][]*models.AlertRule{
+			orgID: rules,
+		}
+		for _, rule := range rules {
+			require.NoError(t, provenanceStore.SetProvenance(context.Background(), rule, orgID, groupProvenance))
+		}
+		return service, ruleStore, provenanceStore, ac
+	}
+
+	t.Run("when user can write all rules", func(t *testing.T) {
+		rule := rules[0]
+		service, ruleStore, _, ac := initServiceWithData(t)
+
+		ac.CanWriteAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+			return true, nil
+		}
+
+		err := service.DeleteAlertRule(context.Background(), u, rule.UID, groupProvenance)
+		require.NoError(t, err)
+
+		require.Len(t, ac.Calls, 1)
+		assert.Equal(t, "CanWriteAllRules", ac.Calls[0].Method)
+
+		deletes := getDeleteQueries(ruleStore)
+		require.Len(t, deletes, 1)
+	})
+	t.Run("when user cannot write all rules", func(t *testing.T) {
+		rule := models.CopyRule(rules[0])
+		rule.Title = rule.Title + "_new"
+
+		t.Run("it should authorize the change to whole group", func(t *testing.T) {
+			rule := rules[0]
+			service, ruleStore, _, ac := initServiceWithData(t)
+
+			ac.CanWriteAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+				return false, nil
+			}
+			ac.AuthorizeRuleChangesFunc = func(ctx context.Context, user identity.Requester, change *store.GroupDelta) error {
+				assert.Equal(t, u, user)
+				assert.Equal(t, groupKey, change.GroupKey)
+				assert.Contains(t, change.AffectedGroups, groupKey)
+				assert.EqualValues(t, rules, change.AffectedGroups[groupKey])
+				assert.Empty(t, change.Update)
+				assert.Empty(t, change.New)
+				assert.Len(t, change.Delete, 1)
+				return nil
+			}
+
+			err := service.DeleteAlertRule(context.Background(), u, rule.UID, groupProvenance)
+			require.NoError(t, err)
+
+			require.Len(t, ac.Calls, 2)
+			assert.Equal(t, "CanWriteAllRules", ac.Calls[0].Method)
+			assert.Equal(t, "AuthorizeRuleGroupWrite", ac.Calls[1].Method)
+
+			deletes := getDeleteQueries(ruleStore)
+			require.Len(t, deletes, 1)
+		})
+		t.Run("it should not delete if not authorized", func(t *testing.T) {
+			service, ruleStore, _, ac := initServiceWithData(t)
+
+			ac.CanWriteAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+				return false, nil
+			}
+			expectedErr := errors.New("test error")
+			ac.AuthorizeRuleChangesFunc = func(ctx context.Context, user identity.Requester, change *store.GroupDelta) error {
+				return expectedErr
+			}
+
+			_, err := service.UpdateAlertRule(context.Background(), u, *rule, groupProvenance)
+			require.ErrorIs(t, expectedErr, err)
+
+			require.Len(t, ac.Calls, 2)
+			assert.Equal(t, "CanWriteAllRules", ac.Calls[0].Method)
+			assert.Equal(t, "AuthorizeRuleGroupWrite", ac.Calls[1].Method)
+
+			deletes := getDeleteQueries(ruleStore)
+			require.Empty(t, deletes)
+		})
+	})
+}
+
+func TestGetAlertRule(t *testing.T) {
+	orgID := rand.Int63()
+	u := &user.SignedInUser{OrgID: orgID}
+	groupKey := models.GenerateGroupKey(orgID)
+	rules := models.GenerateAlertRules(3, models.AlertRuleGen(models.WithGroupKey(groupKey)))
+	rule := rules[0]
+	expectedProvenance := models.ProvenanceAPI
+
+	initServiceWithData := func(t *testing.T) (*AlertRuleService, *fakes.RuleStore, *fakes.FakeProvisioningStore, *fakeRuleAccessControlService) {
+		service, ruleStore, provenanceStore, ac := initService(t)
+		ruleStore.Rules = map[int64][]*models.AlertRule{
+			orgID: rules,
+		}
+		require.NoError(t, provenanceStore.SetProvenance(context.Background(), rule, orgID, expectedProvenance))
+
+		return service, ruleStore, provenanceStore, ac
+	}
+
+	t.Run("when user cannot read all rules", func(t *testing.T) {
+		t.Run("should authorize access to entire group", func(t *testing.T) {
+			service, _, _, ac := initServiceWithData(t)
+
+			ac.CanReadAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+				return false, nil
+			}
+
+			expected := errors.New("test")
+			ac.AuthorizeAccessToRuleGroupFunc = func(ctx context.Context, user identity.Requester, r models.RulesGroup) error {
+				assert.Equal(t, u, user)
+				assert.EqualValues(t, rules, r)
+				return expected
+			}
+
+			_, _, err := service.GetAlertRule(context.Background(), u, rule.UID)
+			require.Error(t, err)
+			require.Equal(t, expected, err)
+
+			assert.Len(t, ac.Calls, 2)
+			assert.Equal(t, "CanReadAllRules", ac.Calls[0].Method)
+			assert.Equal(t, "AuthorizeRuleGroupRead", ac.Calls[1].Method)
+
+			ac.Calls = nil
+			ac.AuthorizeAccessToRuleGroupFunc = func(ctx context.Context, user identity.Requester, rules models.RulesGroup) error {
+				return nil
+			}
+
+			actual, provenance, err := service.GetAlertRule(context.Background(), u, rule.UID)
+			require.NoError(t, err)
+			assert.Equal(t, *rule, actual)
+			assert.Equal(t, expectedProvenance, provenance)
+		})
+
+		t.Run("should return ErrAlertRuleNotFound if rule does not exist", func(t *testing.T) {
+			service, ruleStore, _, ac := initServiceWithData(t)
+			ac.CanReadAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+				return false, nil
+			}
+
+			_, _, err := service.GetAlertRule(context.Background(), u, "no-rule-uid")
+			require.ErrorIs(t, err, models.ErrAlertRuleNotFound)
+
+			assert.Len(t, ac.Calls, 1)
+			assert.Equal(t, "CanReadAllRules", ac.Calls[0].Method)
+			require.IsType(t, ruleStore.RecordedOps[0], models.GetAlertRulesGroupByRuleUIDQuery{})
+			query := ruleStore.RecordedOps[0].(models.GetAlertRulesGroupByRuleUIDQuery)
+			assert.Equal(t, models.GetAlertRulesGroupByRuleUIDQuery{
+				OrgID: orgID,
+				UID:   "no-rule-uid",
+			}, query)
+		})
+	})
+
+	t.Run("when user can read all rules", func(t *testing.T) {
+		t.Run("should query rule by UID and do not check any permissions", func(t *testing.T) {
+			service, ruleStore, _, ac := initServiceWithData(t)
+			ac.CanReadAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+				assert.Equal(t, u, user)
+				return true, nil
+			}
+
+			actual, provenance, err := service.GetAlertRule(context.Background(), u, rule.UID)
+			require.NoError(t, err)
+			assert.Equal(t, *rule, actual)
+			assert.Equal(t, expectedProvenance, provenance)
+
+			assert.Len(t, ac.Calls, 1)
+			assert.Equal(t, "CanReadAllRules", ac.Calls[0].Method)
+
+			require.Len(t, ruleStore.RecordedOps, 1)
+			require.IsType(t, ruleStore.RecordedOps[0], models.GetAlertRuleByUIDQuery{})
+			query := ruleStore.RecordedOps[0].(models.GetAlertRuleByUIDQuery)
+			assert.Equal(t, models.GetAlertRuleByUIDQuery{
+				OrgID: rule.OrgID,
+				UID:   rule.UID,
+			}, query)
+		})
+
+		t.Run("should return ErrAlertRuleNotFound if rule does not exist", func(t *testing.T) {
+			service, _, _, ac := initServiceWithData(t)
+			ac.CanReadAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+				return true, nil
+			}
+
+			_, _, err := service.GetAlertRule(context.Background(), u, "no-rule-uid")
+			require.ErrorIs(t, err, models.ErrAlertRuleNotFound)
+		})
+	})
+
+	t.Run("return error immediately when CanReadAllRules returns error", func(t *testing.T) {
+		service, ruleStore, _, ac := initServiceWithData(t)
+
+		expectedErr := errors.New("test")
+		ac.CanReadAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+			return false, expectedErr
+		}
+
+		_, _, err := service.GetAlertRule(context.Background(), u, rule.UID)
+		require.Error(t, err)
+		require.Equal(t, expectedErr, err)
+
+		assert.Len(t, ac.Calls, 1)
+		assert.Equal(t, "CanReadAllRules", ac.Calls[0].Method)
+
+		assert.Empty(t, ruleStore.RecordedOps)
+	})
+}
+
+func TestGetRuleGroup(t *testing.T) {
+	orgID := rand.Int63()
+	u := &user.SignedInUser{OrgID: orgID}
+	groupKey := models.GenerateGroupKey(orgID)
+	intervalSeconds := int64(30)
+	rules := models.GenerateAlertRules(3, models.AlertRuleGen(models.WithGroupKey(groupKey), models.WithInterval(time.Duration(intervalSeconds)*time.Second)))
+	derefRules := make([]models.AlertRule, 0, len(rules))
+	for _, rule := range rules {
+		derefRules = append(derefRules, *rule)
+	}
+	expectedProvenance := models.ProvenanceAPI
+
+	initServiceWithData := func(t *testing.T) (*AlertRuleService, *fakes.RuleStore, *fakes.FakeProvisioningStore, *fakeRuleAccessControlService) {
+		service, ruleStore, provenanceStore, ac := initService(t)
+		ruleStore.Rules = map[int64][]*models.AlertRule{
+			orgID: rules,
+		}
+		for _, rule := range rules {
+			require.NoError(t, provenanceStore.SetProvenance(context.Background(), rule, orgID, expectedProvenance))
+		}
+
+		return service, ruleStore, provenanceStore, ac
+	}
+
+	t.Run("return ErrAlertRuleGroupNotFound when rule group does not exist", func(t *testing.T) {
+		service, _, _, ac := initServiceWithData(t)
+
+		_, err := service.GetRuleGroup(context.Background(), u, groupKey.NamespaceUID, "no-rule-group")
+		require.ErrorIs(t, err, models.ErrAlertRuleGroupNotFound)
+		require.Empty(t, ac.Calls)
+	})
+
+	t.Run("when user cannot read all rules", func(t *testing.T) {
+		t.Run("it should authorize access to entire group", func(t *testing.T) {
+			service, _, _, ac := initServiceWithData(t)
+
+			ac.CanReadAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+				assert.Equal(t, u, user)
+				return false, nil
+			}
+			expectedErr := errors.New("error")
+			ac.AuthorizeAccessToRuleGroupFunc = func(ctx context.Context, user identity.Requester, r models.RulesGroup) error {
+				assert.Equal(t, u, user)
+				assert.EqualValues(t, rules, r)
+				return expectedErr
+			}
+
+			_, err := service.GetRuleGroup(context.Background(), u, groupKey.NamespaceUID, groupKey.RuleGroup)
+			require.Error(t, err)
+			require.Equal(t, expectedErr, err)
+
+			assert.Len(t, ac.Calls, 2)
+			assert.Equal(t, "CanReadAllRules", ac.Calls[0].Method)
+			assert.Equal(t, "AuthorizeRuleGroupRead", ac.Calls[1].Method)
+
+			ac.AuthorizeAccessToRuleGroupFunc = func(ctx context.Context, user identity.Requester, rules models.RulesGroup) error {
+				return nil
+			}
+
+			group, err := service.GetRuleGroup(context.Background(), u, groupKey.NamespaceUID, groupKey.RuleGroup)
+			require.NoError(t, err)
+
+			assert.Equal(t, groupKey.RuleGroup, group.Title)
+			assert.Equal(t, groupKey.NamespaceUID, group.FolderUID)
+			assert.Equal(t, intervalSeconds, group.Interval)
+			assert.Equal(t, derefRules, group.Rules)
+		})
+	})
+
+	t.Run("when user can read all rules", func(t *testing.T) {
+		t.Run("it should skip AuthorizeRuleGroupRead", func(t *testing.T) {
+			service, _, _, ac := initServiceWithData(t)
+
+			ac.CanReadAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+				assert.Equal(t, u, user)
+				return true, nil
+			}
+
+			group, err := service.GetRuleGroup(context.Background(), u, groupKey.NamespaceUID, groupKey.RuleGroup)
+			require.NoError(t, err)
+
+			assert.Len(t, ac.Calls, 1)
+			assert.Equal(t, "CanReadAllRules", ac.Calls[0].Method)
+
+			assert.Equal(t, groupKey.RuleGroup, group.Title)
+			assert.Equal(t, groupKey.NamespaceUID, group.FolderUID)
+			assert.Equal(t, intervalSeconds, group.Interval)
+			assert.Equal(t, derefRules, group.Rules)
+		})
+	})
+
+	t.Run("return error immediately when CanReadAllRules returns error", func(t *testing.T) {
+		service, _, _, ac := initServiceWithData(t)
+
+		expectedErr := errors.New("test")
+		ac.CanReadAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+			return false, expectedErr
+		}
+
+		_, err := service.GetRuleGroup(context.Background(), u, groupKey.NamespaceUID, groupKey.RuleGroup)
+		require.Error(t, err)
+		require.Equal(t, expectedErr, err)
+
+		assert.Len(t, ac.Calls, 1)
+		assert.Equal(t, "CanReadAllRules", ac.Calls[0].Method)
+	})
+}
+
+func TestGetAlertRules(t *testing.T) {
+	orgID := rand.Int63()
+	u := &user.SignedInUser{OrgID: orgID}
+	groupKey1 := models.GenerateGroupKey(orgID)
+	groupKey2 := models.GenerateGroupKey(orgID)
+	rules1 := models.GenerateAlertRules(3, models.AlertRuleGen(models.WithGroupKey(groupKey1)))
+	models.RulesGroup(rules1).SortByGroupIndex()
+	rules2 := models.GenerateAlertRules(4, models.AlertRuleGen(models.WithGroupKey(groupKey2)))
+	models.RulesGroup(rules2).SortByGroupIndex()
+	allRules := append(rules1, rules2...)
+	expectedProvenance := models.ProvenanceAPI
+
+	initServiceWithData := func(t *testing.T) (*AlertRuleService, *fakes.RuleStore, *fakes.FakeProvisioningStore, *fakeRuleAccessControlService) {
+		service, ruleStore, provenanceStore, ac := initService(t)
+		ruleStore.Rules = map[int64][]*models.AlertRule{
+			orgID: allRules,
+		}
+		for _, rule := range rules1 {
+			require.NoError(t, provenanceStore.SetProvenance(context.Background(), rule, orgID, expectedProvenance))
+		}
+
+		return service, ruleStore, provenanceStore, ac
+	}
+
+	t.Run("return error when CanReadAllRules return error", func(t *testing.T) {
+		service, _, _, ac := initServiceWithData(t)
+		expectedErr := errors.New("test")
+		ac.CanReadAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+			return false, expectedErr
+		}
+
+		_, _, err := service.GetAlertRules(context.Background(), u)
+		require.ErrorIs(t, err, expectedErr)
+	})
+
+	t.Run("when user can read all rules", func(t *testing.T) {
+		t.Run("should skip AuthorizeRuleGroupRead and return all rules", func(t *testing.T) {
+			service, _, _, ac := initServiceWithData(t)
+			ac.CanReadAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+				return true, nil
+			}
+
+			rules, provenance, err := service.GetAlertRules(context.Background(), u)
+			require.NoError(t, err)
+			require.Equal(t, allRules, rules)
+			require.Len(t, provenance, len(rules1))
+
+			assert.Len(t, ac.Calls, 1)
+			assert.Equal(t, "CanReadAllRules", ac.Calls[0].Method)
+		})
+	})
+
+	t.Run("when user cannot read all rules", func(t *testing.T) {
+		t.Run("should group rules and check AuthorizeRuleGroupRead and return only available rules", func(t *testing.T) {
+			t.Run("should remove group from output if AuthorizeRuleGroupRead returns authorization error", func(t *testing.T) {
+				service, _, _, ac := initServiceWithData(t)
+				ac.CanReadAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+					return false, nil
+				}
+				ac.AuthorizeAccessToRuleGroupFunc = func(ctx context.Context, user identity.Requester, rules models.RulesGroup) error {
+					if rules[0].GetGroupKey() == groupKey1 {
+						return accesscontrol.NewAuthorizationErrorGeneric("test")
+					}
+					return nil
+				}
+
+				rules, provenance, err := service.GetAlertRules(context.Background(), u)
+				require.NoError(t, err)
+
+				assert.Equal(t, rules2, rules)
+				assert.Empty(t, provenance)
+
+				assert.Len(t, ac.Calls, 3)
+				assert.Equal(t, "CanReadAllRules", ac.Calls[0].Method)
+				assert.Equal(t, "AuthorizeRuleGroupRead", ac.Calls[1].Method)
+				assert.Equal(t, "AuthorizeRuleGroupRead", ac.Calls[2].Method)
+
+				group1 := ac.Calls[1].Args[2].(models.RulesGroup)
+				group2 := ac.Calls[2].Args[2].(models.RulesGroup)
+				require.Len(t, append(group1, group2...), len(allRules))
+			})
+
+			t.Run("should immediately exist if AuthorizeRuleGroupRead returns another error", func(t *testing.T) {
+				service, _, _, ac := initServiceWithData(t)
+				ac.CanReadAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+					return false, nil
+				}
+				expectedErr := errors.New("test")
+				ac.AuthorizeAccessToRuleGroupFunc = func(ctx context.Context, user identity.Requester, rules models.RulesGroup) error {
+					return expectedErr
+				}
+
+				_, _, err := service.GetAlertRules(context.Background(), u)
+				require.ErrorIs(t, err, expectedErr)
+			})
+		})
+	})
+}
+
+func TestReplaceGroup(t *testing.T) {
+	orgID := rand.Int63()
+	u := &user.SignedInUser{OrgID: orgID}
+	groupKey := models.GenerateGroupKey(orgID)
+	groupIntervalSeconds := int64(30)
+	rules := models.GenerateAlertRules(3, models.AlertRuleGen(models.WithGroupKey(groupKey), models.WithInterval(time.Duration(groupIntervalSeconds)*time.Second)))
+	groupProvenance := models.ProvenanceAPI
+
+	initServiceWithData := func(t *testing.T) (*AlertRuleService, *fakes.RuleStore, *fakes.FakeProvisioningStore, *fakeRuleAccessControlService) {
+		service, ruleStore, provenanceStore, ac := initService(t)
+		ruleStore.Rules = map[int64][]*models.AlertRule{
+			orgID: rules,
+		}
+		for _, rule := range rules {
+			require.NoError(t, provenanceStore.SetProvenance(context.Background(), rule, orgID, groupProvenance))
+		}
+		return service, ruleStore, provenanceStore, ac
+	}
+
+	t.Run("when user can write all rules", func(t *testing.T) {
+		group := models.AlertRuleGroup{
+			Title:      groupKey.RuleGroup,
+			FolderUID:  groupKey.NamespaceUID,
+			Interval:   groupIntervalSeconds,
+			Provenance: groupProvenance,
+		}
+		for _, rule := range rules {
+			r := models.CopyRule(rule)
+			r.Title = r.Title + "_new"
+			group.Rules = append(group.Rules, *r)
+		}
+
+		service, ruleStore, _, ac := initServiceWithData(t)
+
+		ac.CanWriteAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+			return true, nil
+		}
+
+		err := service.ReplaceRuleGroup(context.Background(), u, group, models.ProvenanceAPI)
+		require.NoError(t, err)
+
+		require.Len(t, ac.Calls, 1)
+		assert.Equal(t, "CanWriteAllRules", ac.Calls[0].Method)
+
+		updates := ruleStore.GetRecordedCommands(func(cmd any) (any, bool) {
+			a, ok := cmd.([]models.UpdateRule)
+			return a, ok
+		})
+		require.Len(t, updates, 1)
+	})
+	t.Run("when user cannot write all rules", func(t *testing.T) {
+		group := models.AlertRuleGroup{
+			Title:      groupKey.RuleGroup,
+			FolderUID:  groupKey.NamespaceUID,
+			Interval:   groupIntervalSeconds,
+			Provenance: groupProvenance,
+		}
+		for _, rule := range rules {
+			r := models.CopyRule(rule)
+			r.Title = r.Title + "_new"
+			group.Rules = append(group.Rules, *r)
+		}
+
+		t.Run("it should not update if not authorized", func(t *testing.T) {
+			service, ruleStore, _, ac := initServiceWithData(t)
+
+			ac.CanWriteAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+				return false, nil
+			}
+			expectedErr := errors.New("test error")
+			ac.AuthorizeRuleChangesFunc = func(ctx context.Context, user identity.Requester, change *store.GroupDelta) error {
+				return expectedErr
+			}
+
+			err := service.ReplaceRuleGroup(context.Background(), u, group, models.ProvenanceAPI)
+			require.ErrorIs(t, err, expectedErr)
+
+			require.Len(t, ac.Calls, 2)
+			assert.Equal(t, "CanWriteAllRules", ac.Calls[0].Method)
+			assert.Equal(t, "AuthorizeRuleGroupWrite", ac.Calls[1].Method)
+
+			updates := ruleStore.GetRecordedCommands(func(cmd any) (any, bool) {
+				a, ok := cmd.([]models.UpdateRule)
+				return a, ok
+			})
+			require.Empty(t, updates)
+		})
+		t.Run("it should update if authorized", func(t *testing.T) {
+			service, ruleStore, _, ac := initServiceWithData(t)
+
+			ac.CanWriteAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+				return false, nil
+			}
+			ac.AuthorizeRuleChangesFunc = func(ctx context.Context, user identity.Requester, change *store.GroupDelta) error {
+				return nil
+			}
+
+			err := service.ReplaceRuleGroup(context.Background(), u, group, models.ProvenanceAPI)
+			require.NoError(t, err)
+
+			require.Len(t, ac.Calls, 2)
+			assert.Equal(t, "CanWriteAllRules", ac.Calls[0].Method)
+			assert.Equal(t, "AuthorizeRuleGroupWrite", ac.Calls[1].Method)
+
+			updates := ruleStore.GetRecordedCommands(func(cmd any) (any, bool) {
+				a, ok := cmd.([]models.UpdateRule)
+				return a, ok
+			})
+			require.Len(t, updates, 1)
+		})
+	})
+}
+
+func TestDeleteRuleGroup(t *testing.T) {
+	orgID := rand.Int63()
+	u := &user.SignedInUser{OrgID: orgID}
+	groupKey := models.GenerateGroupKey(orgID)
+	groupIntervalSeconds := int64(30)
+	rules := models.GenerateAlertRules(3, models.AlertRuleGen(models.WithGroupKey(groupKey), models.WithInterval(time.Duration(groupIntervalSeconds)*time.Second)))
+	groupProvenance := models.ProvenanceAPI
+
+	initServiceWithData := func(t *testing.T) (*AlertRuleService, *fakes.RuleStore, *fakes.FakeProvisioningStore, *fakeRuleAccessControlService) {
+		service, ruleStore, provenanceStore, ac := initService(t)
+		ruleStore.Rules = map[int64][]*models.AlertRule{
+			orgID: rules,
+		}
+		for _, rule := range rules {
+			require.NoError(t, provenanceStore.SetProvenance(context.Background(), rule, orgID, groupProvenance))
+		}
+		return service, ruleStore, provenanceStore, ac
+	}
+
+	t.Run("when user can write all rules", func(t *testing.T) {
+		service, ruleStore, _, ac := initServiceWithData(t)
+
+		ac.CanWriteAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+			return true, nil
+		}
+
+		err := service.DeleteRuleGroup(context.Background(), u, groupKey.NamespaceUID, groupKey.RuleGroup, groupProvenance)
+		require.NoError(t, err)
+
+		require.Len(t, ac.Calls, 1)
+		assert.Equal(t, "CanWriteAllRules", ac.Calls[0].Method)
+
+		deletes := getDeleteQueries(ruleStore)
+		require.Len(t, deletes, 1)
+	})
+	t.Run("when user cannot write all rules", func(t *testing.T) {
+		t.Run("it should not update if not authorized", func(t *testing.T) {
+			service, ruleStore, _, ac := initServiceWithData(t)
+
+			ac.CanWriteAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+				return false, nil
+			}
+			expectedErr := errors.New("test error")
+			ac.AuthorizeRuleChangesFunc = func(ctx context.Context, user identity.Requester, change *store.GroupDelta) error {
+				return expectedErr
+			}
+
+			err := service.DeleteRuleGroup(context.Background(), u, groupKey.NamespaceUID, groupKey.RuleGroup, groupProvenance)
+			require.ErrorIs(t, err, expectedErr)
+
+			require.Len(t, ac.Calls, 2)
+			assert.Equal(t, "CanWriteAllRules", ac.Calls[0].Method)
+			assert.Equal(t, "AuthorizeRuleGroupWrite", ac.Calls[1].Method)
+
+			deletes := getDeleteQueries(ruleStore)
+			require.Empty(t, deletes)
+		})
+		t.Run("it should update if authorized", func(t *testing.T) {
+			service, ruleStore, _, ac := initServiceWithData(t)
+
+			ac.CanWriteAllRulesFunc = func(ctx context.Context, user identity.Requester) (bool, error) {
+				return false, nil
+			}
+			ac.AuthorizeRuleChangesFunc = func(ctx context.Context, user identity.Requester, change *store.GroupDelta) error {
+				assert.Equal(t, u, user)
+				assert.Equal(t, groupKey, change.GroupKey)
+				assert.Contains(t, change.AffectedGroups, groupKey)
+				assert.EqualValues(t, rules, change.AffectedGroups[groupKey])
+				assert.Empty(t, change.Update)
+				assert.Empty(t, change.New)
+				assert.Len(t, change.Delete, len(rules))
+				return nil
+			}
+
+			err := service.DeleteRuleGroup(context.Background(), u, groupKey.NamespaceUID, groupKey.RuleGroup, groupProvenance)
 			require.NoError(t, err)
+
+			require.Len(t, ac.Calls, 2)
+			assert.Equal(t, "CanWriteAllRules", ac.Calls[0].Method)
+			assert.Equal(t, "AuthorizeRuleGroupWrite", ac.Calls[1].Method)
+
+			deletes := getDeleteQueries(ruleStore)
+			require.Len(t, deletes, 1)
 		})
 	})
 }
 
+func getDeleteQueries(ruleStore *fakes.RuleStore) []fakes.GenericRecordedQuery {
+	generic := ruleStore.GetRecordedCommands(func(cmd any) (any, bool) {
+		a, ok := cmd.(fakes.GenericRecordedQuery)
+		if !ok || a.Name != "DeleteAlertRulesByUID" {
+			return nil, false
+		}
+		return a, ok
+	})
+	result := make([]fakes.GenericRecordedQuery, 0, len(generic))
+	for _, g := range generic {
+		result = append(result, g.(fakes.GenericRecordedQuery))
+	}
+	return result
+}
+
 func createAlertRuleService(t *testing.T) AlertRuleService {
 	t.Helper()
 	sqlStore := db.InitTestDB(t)
+	folderService := foldertest.NewFakeService()
+	folderService.ExpectedFolder = &folder.Folder{
+		UID: "default-namespace",
+	}
 	store := store.DBstore{
 		SQLStore: sqlStore,
 		Cfg: setting.UnifiedAlertingSettings{
 			BaseInterval: time.Second * 10,
 		},
-		Logger: log.NewNopLogger(),
+		Logger:        log.NewNopLogger(),
+		FolderService: folderService,
 	}
+	// store := fakes.NewRuleStore(t)
 	quotas := MockQuotaChecker{}
 	quotas.EXPECT().LimitOK()
 	return AlertRuleService{
@@ -578,6 +1561,9 @@ func createAlertRuleService(t *testing.T) AlertRuleService {
 		log:                    log.New("testing"),
 		baseIntervalSeconds:    10,
 		defaultIntervalSeconds: 60,
+		folderService:          folderService,
+		authz:                  &fakeRuleAccessControlService{},
+		nsValidatorProvider:    &NotificationSettingsValidatorProviderFake{},
 	}
 }
 
@@ -621,3 +1607,30 @@ func createDummyGroup(title string, orgID int64) models.AlertRuleGroup {
 		},
 	}
 }
+
+func initService(t *testing.T) (*AlertRuleService, *fakes.RuleStore, *fakes.FakeProvisioningStore, *fakeRuleAccessControlService) {
+	t.Helper()
+
+	ac := &fakeRuleAccessControlService{}
+	ruleStore := fakes.NewRuleStore(t)
+	provenanceStore := fakes.NewFakeProvisioningStore()
+	folderService := foldertest.NewFakeService()
+
+	quotas := MockQuotaChecker{}
+	quotas.EXPECT().LimitOK()
+
+	service := &AlertRuleService{
+		folderService:          folderService,
+		ruleStore:              ruleStore,
+		provenanceStore:        provenanceStore,
+		quotas:                 &quotas,
+		xact:                   newNopTransactionManager(),
+		log:                    log.New("testing"),
+		baseIntervalSeconds:    10,
+		defaultIntervalSeconds: 60,
+		authz:                  ac,
+		nsValidatorProvider:    &NotificationSettingsValidatorProviderFake{},
+	}
+
+	return service, ruleStore, provenanceStore, ac
+}
diff --git a/pkg/services/ngalert/provisioning/compat.go b/pkg/services/ngalert/provisioning/compat.go
index 621ce88b4f521..0502d921d8d17 100644
--- a/pkg/services/ngalert/provisioning/compat.go
+++ b/pkg/services/ngalert/provisioning/compat.go
@@ -45,3 +45,25 @@ func PostableGrafanaReceiverToEmbeddedContactPoint(contactPoint *definitions.Pos
 	}
 	return embeddedContactPoint, nil
 }
+
+func GettableGrafanaReceiverToEmbeddedContactPoint(r *definitions.GettableGrafanaReceiver) (definitions.EmbeddedContactPoint, error) {
+	settingJson, err := simplejson.NewJson(r.Settings)
+	if err != nil {
+		return definitions.EmbeddedContactPoint{}, err
+	}
+
+	for k := range r.SecureFields {
+		if settingJson.Get(k).MustString() == "" {
+			settingJson.Set(k, definitions.RedactedValue)
+		}
+	}
+
+	return definitions.EmbeddedContactPoint{
+		UID:                   r.UID,
+		Name:                  r.Name,
+		Type:                  r.Type,
+		DisableResolveMessage: r.DisableResolveMessage,
+		Settings:              settingJson,
+		Provenance:            string(r.Provenance),
+	}, nil
+}
diff --git a/pkg/services/ngalert/provisioning/config.go b/pkg/services/ngalert/provisioning/config.go
index 40c7c5c88f548..f711b02d71856 100644
--- a/pkg/services/ngalert/provisioning/config.go
+++ b/pkg/services/ngalert/provisioning/config.go
@@ -3,7 +3,6 @@ package provisioning
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 
 	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
@@ -12,7 +11,7 @@ import (
 func deserializeAlertmanagerConfig(config []byte) (*definitions.PostableUserConfig, error) {
 	result := definitions.PostableUserConfig{}
 	if err := json.Unmarshal(config, &result); err != nil {
-		return nil, fmt.Errorf("failed to deserialize alertmanager configuration: %w", err)
+		return nil, makeErrBadAlertmanagerConfiguration(err)
 	}
 	return &result, nil
 }
@@ -28,16 +27,13 @@ type cfgRevision struct {
 }
 
 func getLastConfiguration(ctx context.Context, orgID int64, store AMConfigStore) (*cfgRevision, error) {
-	q := models.GetLatestAlertmanagerConfigurationQuery{
-		OrgID: orgID,
-	}
-	alertManagerConfig, err := store.GetLatestAlertmanagerConfiguration(ctx, &q)
+	alertManagerConfig, err := store.GetLatestAlertmanagerConfiguration(ctx, orgID)
 	if err != nil {
 		return nil, err
 	}
 
 	if alertManagerConfig == nil {
-		return nil, fmt.Errorf("no alertmanager configuration present in this org")
+		return nil, ErrNoAlertmanagerConfiguration.Errorf("")
 	}
 
 	concurrencyToken := alertManagerConfig.ConfigurationHash
@@ -52,3 +48,31 @@ func getLastConfiguration(ctx context.Context, orgID int64, store AMConfigStore)
 		version:          alertManagerConfig.ConfigurationVersion,
 	}, nil
 }
+
+type alertmanagerConfigStore interface {
+	Get(ctx context.Context, orgID int64) (*cfgRevision, error)
+	Save(ctx context.Context, revision *cfgRevision, orgID int64) error
+}
+
+type alertmanagerConfigStoreImpl struct {
+	store AMConfigStore
+}
+
+func (a alertmanagerConfigStoreImpl) Get(ctx context.Context, orgID int64) (*cfgRevision, error) {
+	return getLastConfiguration(ctx, orgID, a.store)
+}
+
+func (a alertmanagerConfigStoreImpl) Save(ctx context.Context, revision *cfgRevision, orgID int64) error {
+	serialized, err := serializeAlertmanagerConfig(*revision.cfg)
+	if err != nil {
+		return err
+	}
+	cmd := models.SaveAlertmanagerConfigurationCmd{
+		AlertmanagerConfiguration: string(serialized),
+		ConfigurationVersion:      revision.version,
+		FetchedConfigurationHash:  revision.concurrencyToken,
+		Default:                   false,
+		OrgID:                     orgID,
+	}
+	return PersistConfig(ctx, a.store, &cmd)
+}
diff --git a/pkg/services/ngalert/provisioning/config_test.go b/pkg/services/ngalert/provisioning/config_test.go
new file mode 100644
index 0000000000000..454f7921098be
--- /dev/null
+++ b/pkg/services/ngalert/provisioning/config_test.go
@@ -0,0 +1,127 @@
+package provisioning
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+)
+
+func TestAlertmanagerConfigStoreGet(t *testing.T) {
+	orgID := int64(1)
+
+	t.Run("should read the latest config for giving organization", func(t *testing.T) {
+		storeMock := &MockAMConfigStore{}
+		store := &alertmanagerConfigStoreImpl{store: storeMock}
+
+		expected := models.AlertConfiguration{
+			ID:                        1,
+			AlertmanagerConfiguration: defaultConfig,
+			ConfigurationHash:         "config-hash-123",
+			ConfigurationVersion:      "123",
+			CreatedAt:                 time.Now().Unix(),
+			Default:                   false,
+			OrgID:                     orgID,
+		}
+
+		expectedCfg := definitions.PostableUserConfig{}
+		require.NoError(t, json.Unmarshal([]byte(defaultConfig), &expectedCfg))
+
+		storeMock.EXPECT().GetLatestAlertmanagerConfiguration(mock.Anything, mock.Anything).Return(&expected, nil)
+
+		revision, err := store.Get(context.Background(), orgID)
+		require.NoError(t, err)
+
+		require.Equal(t, expected.ConfigurationVersion, revision.version)
+		require.Equal(t, expected.ConfigurationHash, revision.concurrencyToken)
+		require.Equal(t, expectedCfg, *revision.cfg)
+
+		storeMock.AssertCalled(t, "GetLatestAlertmanagerConfiguration", mock.Anything, orgID)
+	})
+
+	t.Run("propagate errors", func(t *testing.T) {
+		t.Run("when underlying store fails", func(t *testing.T) {
+			storeMock := &MockAMConfigStore{}
+			store := &alertmanagerConfigStoreImpl{store: storeMock}
+			expectedErr := errors.New("test=err")
+			storeMock.EXPECT().GetLatestAlertmanagerConfiguration(mock.Anything, mock.Anything).Return(nil, expectedErr)
+
+			_, err := store.Get(context.Background(), orgID)
+			require.ErrorIs(t, err, expectedErr)
+		})
+
+		t.Run("return ErrNoAlertmanagerConfiguration config does not exist", func(t *testing.T) {
+			storeMock := &MockAMConfigStore{}
+			store := &alertmanagerConfigStoreImpl{store: storeMock}
+			storeMock.EXPECT().GetLatestAlertmanagerConfiguration(mock.Anything, mock.Anything).Return(nil, nil)
+
+			_, err := store.Get(context.Background(), orgID)
+			require.Truef(t, ErrNoAlertmanagerConfiguration.Is(err), "expected ErrNoAlertmanagerConfiguration but got %s", err.Error())
+		})
+
+		t.Run("when config cannot be unmarshalled", func(t *testing.T) {
+			storeMock := &MockAMConfigStore{}
+			store := &alertmanagerConfigStoreImpl{store: storeMock}
+			storeMock.EXPECT().GetLatestAlertmanagerConfiguration(mock.Anything, mock.Anything).Return(&models.AlertConfiguration{
+				AlertmanagerConfiguration: "invalid-json",
+			}, nil)
+
+			_, err := store.Get(context.Background(), orgID)
+			require.Truef(t, ErrBadAlertmanagerConfiguration.Base.Is(err), "expected ErrBadAlertmanagerConfiguration but got %s", err.Error())
+		})
+	})
+}
+
+func TestAlertmanagerConfigStoreSave(t *testing.T) {
+	orgID := int64(1)
+
+	cfg := definitions.PostableUserConfig{}
+	require.NoError(t, json.Unmarshal([]byte(defaultConfig), &cfg))
+	expectedCfg, err := serializeAlertmanagerConfig(cfg)
+	require.NoError(t, err)
+
+	revision := cfgRevision{
+		cfg:              &cfg,
+		concurrencyToken: "config-hash-123",
+		version:          "123",
+	}
+
+	t.Run("should save the config to store", func(t *testing.T) {
+		storeMock := &MockAMConfigStore{}
+		store := &alertmanagerConfigStoreImpl{store: storeMock}
+
+		storeMock.EXPECT().UpdateAlertmanagerConfiguration(mock.Anything, mock.Anything).RunAndReturn(func(ctx context.Context, cmd *models.SaveAlertmanagerConfigurationCmd) error {
+			assert.Equal(t, string(expectedCfg), cmd.AlertmanagerConfiguration)
+			assert.Equal(t, orgID, cmd.OrgID)
+			assert.Equal(t, revision.version, cmd.ConfigurationVersion)
+			assert.Equal(t, false, cmd.Default)
+			assert.Equal(t, revision.concurrencyToken, cmd.FetchedConfigurationHash)
+			return nil
+		})
+
+		err := store.Save(context.Background(), &revision, orgID)
+		require.NoError(t, err)
+
+		storeMock.AssertCalled(t, "UpdateAlertmanagerConfiguration", mock.Anything, mock.Anything)
+	})
+
+	t.Run("propagates errors when underlying storage returns error", func(t *testing.T) {
+		storeMock := &MockAMConfigStore{}
+		store := &alertmanagerConfigStoreImpl{store: storeMock}
+
+		expectedErr := errors.New("test-err")
+		storeMock.EXPECT().UpdateAlertmanagerConfiguration(mock.Anything, mock.Anything).Return(expectedErr)
+
+		err := store.Save(context.Background(), &revision, orgID)
+
+		require.ErrorIs(t, err, expectedErr)
+	})
+}
diff --git a/pkg/services/ngalert/provisioning/contactpoints.go b/pkg/services/ngalert/provisioning/contactpoints.go
index 7695c6df58de7..02eeb66978d60 100644
--- a/pkg/services/ngalert/provisioning/contactpoints.go
+++ b/pkg/services/ngalert/provisioning/contactpoints.go
@@ -3,7 +3,6 @@ package provisioning
 import (
 	"context"
 	"encoding/base64"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"sort"
@@ -13,33 +12,48 @@ import (
 	"github.com/prometheus/alertmanager/config"
 
 	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/notifier"
 	"github.com/grafana/grafana/pkg/services/ngalert/notifier/channels_config"
+	"github.com/grafana/grafana/pkg/services/ngalert/store"
 	"github.com/grafana/grafana/pkg/services/secrets"
-	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/util"
 )
 
+type AlertRuleNotificationSettingsStore interface {
+	RenameReceiverInNotificationSettings(ctx context.Context, orgID int64, oldReceiver, newReceiver string) (int, error)
+	ListNotificationSettings(ctx context.Context, q models.ListNotificationSettingsQuery) (map[models.AlertRuleKey][]models.NotificationSettings, error)
+}
+
 type ContactPointService struct {
-	amStore           AMConfigStore
-	encryptionService secrets.Service
-	provenanceStore   ProvisioningStore
-	xact              TransactionManager
-	log               log.Logger
-	ac                accesscontrol.AccessControl
+	configStore               *alertmanagerConfigStoreImpl
+	encryptionService         secrets.Service
+	provenanceStore           ProvisioningStore
+	notificationSettingsStore AlertRuleNotificationSettingsStore
+	xact                      TransactionManager
+	receiverService           receiverService
+	log                       log.Logger
+}
+
+type receiverService interface {
+	GetReceivers(ctx context.Context, query models.GetReceiversQuery, user identity.Requester) ([]apimodels.GettableApiReceiver, error)
 }
 
 func NewContactPointService(store AMConfigStore, encryptionService secrets.Service,
-	provenanceStore ProvisioningStore, xact TransactionManager, log log.Logger, ac accesscontrol.AccessControl) *ContactPointService {
+	provenanceStore ProvisioningStore, xact TransactionManager, receiverService receiverService, log log.Logger,
+	nsStore AlertRuleNotificationSettingsStore) *ContactPointService {
 	return &ContactPointService{
-		amStore:           store,
-		encryptionService: encryptionService,
-		provenanceStore:   provenanceStore,
-		xact:              xact,
-		log:               log,
-		ac:                ac,
+		configStore: &alertmanagerConfigStoreImpl{
+			store: store,
+		},
+		receiverService:           receiverService,
+		encryptionService:         encryptionService,
+		provenanceStore:           provenanceStore,
+		xact:                      xact,
+		log:                       log,
+		notificationSettingsStore: nsStore,
 	}
 }
 
@@ -51,48 +65,38 @@ type ContactPointQuery struct {
 	Decrypt bool
 }
 
-func (ecp *ContactPointService) canDecryptSecrets(ctx context.Context, u *user.SignedInUser) bool {
-	if u == nil {
-		return false
-	}
-	permitted, err := ecp.ac.Evaluate(ctx, u, accesscontrol.EvalPermission(accesscontrol.ActionAlertingProvisioningReadSecrets))
-	if err != nil {
-		ecp.log.Error("Failed to evaluate user permissions", "error", err)
-		permitted = false
-	}
-	return permitted
-}
-
 // GetContactPoints returns contact points. If q.Decrypt is true and the user is an OrgAdmin, decrypted secure settings are included instead of redacted ones.
-func (ecp *ContactPointService) GetContactPoints(ctx context.Context, q ContactPointQuery, u *user.SignedInUser) ([]apimodels.EmbeddedContactPoint, error) {
-	if q.Decrypt && !ecp.canDecryptSecrets(ctx, u) {
-		return nil, fmt.Errorf("%w: user requires Admin role or alert.provisioning.secrets:read permission to view decrypted secure settings", ErrPermissionDenied)
+func (ecp *ContactPointService) GetContactPoints(ctx context.Context, q ContactPointQuery, u identity.Requester) ([]apimodels.EmbeddedContactPoint, error) {
+	receiverQuery := models.GetReceiversQuery{
+		OrgID:   q.OrgID,
+		Decrypt: q.Decrypt,
 	}
-	revision, err := getLastConfiguration(ctx, q.OrgID, ecp.amStore)
-	if err != nil {
-		return nil, err
+	if q.Name != "" {
+		receiverQuery.Names = []string{q.Name}
 	}
-	provenances, err := ecp.provenanceStore.GetProvenances(ctx, q.OrgID, "contactPoint")
-	if err != nil {
-		return nil, err
-	}
-	var contactPoints []apimodels.EmbeddedContactPoint
 
-	for _, contactPoint := range revision.cfg.GetGrafanaReceiverMap() {
-		if q.Name != "" && contactPoint.Name != q.Name {
-			continue
+	res, err := ecp.receiverService.GetReceivers(ctx, receiverQuery, u)
+	if err != nil {
+		return nil, convertRecSvcErr(err)
+	}
+	grafanaReceivers := []*apimodels.GettableGrafanaReceiver{}
+	if q.Name != "" && len(res) > 0 {
+		grafanaReceivers = res[0].GettableGrafanaReceivers.GrafanaManagedReceivers // we only expect one receiver group
+	} else {
+		for _, r := range res {
+			grafanaReceivers = append(grafanaReceivers, r.GettableGrafanaReceivers.GrafanaManagedReceivers...)
 		}
+	}
 
-		embeddedContactPoint, err := PostableGrafanaReceiverToEmbeddedContactPoint(
-			contactPoint,
-			provenances[contactPoint.UID],
-			ecp.decryptValueOrRedacted(q.Decrypt, contactPoint.UID),
-		)
+	var contactPoints []apimodels.EmbeddedContactPoint
+	for _, gr := range grafanaReceivers {
+		contactPoint, err := GettableGrafanaReceiverToEmbeddedContactPoint(gr)
 		if err != nil {
 			return nil, err
 		}
-		contactPoints = append(contactPoints, embeddedContactPoint)
+		contactPoints = append(contactPoints, contactPoint)
 	}
+
 	sort.SliceStable(contactPoints, func(i, j int) bool {
 		switch strings.Compare(contactPoints[i].Name, contactPoints[j].Name) {
 		case -1:
@@ -102,13 +106,14 @@ func (ecp *ContactPointService) GetContactPoints(ctx context.Context, q ContactP
 		}
 		return contactPoints[i].UID < contactPoints[j].UID
 	})
+
 	return contactPoints, nil
 }
 
 // getContactPointDecrypted is an internal-only function that gets full contact point info, included encrypted fields.
 // nil is returned if no matching contact point exists.
 func (ecp *ContactPointService) getContactPointDecrypted(ctx context.Context, orgID int64, uid string) (apimodels.EmbeddedContactPoint, error) {
-	revision, err := getLastConfiguration(ctx, orgID, ecp.amStore)
+	revision, err := ecp.configStore.Get(ctx, orgID)
 	if err != nil {
 		return apimodels.EmbeddedContactPoint{}, err
 	}
@@ -118,7 +123,7 @@ func (ecp *ContactPointService) getContactPointDecrypted(ctx context.Context, or
 		}
 		embeddedContactPoint, err := PostableGrafanaReceiverToEmbeddedContactPoint(
 			receiver,
-			models.ProvenanceNone,
+			models.ProvenanceNone, // TODO should be correct provenance?
 			ecp.decryptValueOrRedacted(true, receiver.UID),
 		)
 		if err != nil {
@@ -135,7 +140,7 @@ func (ecp *ContactPointService) CreateContactPoint(ctx context.Context, orgID in
 		return apimodels.EmbeddedContactPoint{}, fmt.Errorf("%w: %s", ErrValidation, err.Error())
 	}
 
-	revision, err := getLastConfiguration(ctx, orgID, ecp.amStore)
+	revision, err := ecp.configStore.Get(ctx, orgID)
 	if err != nil {
 		return apimodels.EmbeddedContactPoint{}, err
 	}
@@ -201,28 +206,11 @@ func (ecp *ContactPointService) CreateContactPoint(ctx context.Context, orgID in
 		})
 	}
 
-	data, err := json.Marshal(revision.cfg)
-	if err != nil {
-		return apimodels.EmbeddedContactPoint{}, err
-	}
-
 	err = ecp.xact.InTransaction(ctx, func(ctx context.Context) error {
-		err = PersistConfig(ctx, ecp.amStore, &models.SaveAlertmanagerConfigurationCmd{
-			AlertmanagerConfiguration: string(data),
-			FetchedConfigurationHash:  revision.concurrencyToken,
-			ConfigurationVersion:      revision.version,
-			Default:                   false,
-			OrgID:                     orgID,
-		})
-		if err != nil {
+		if err := ecp.configStore.Save(ctx, revision, orgID); err != nil {
 			return err
 		}
-		err = ecp.provenanceStore.SetProvenance(ctx, &contactPoint, orgID, provenance)
-		if err != nil {
-			return err
-		}
-		contactPoint.Provenance = string(provenance)
-		return nil
+		return ecp.provenanceStore.SetProvenance(ctx, &contactPoint, orgID, provenance)
 	})
 	if err != nil {
 		return apimodels.EmbeddedContactPoint{}, err
@@ -292,42 +280,39 @@ func (ecp *ContactPointService) UpdateContactPoint(ctx context.Context, orgID in
 		SecureSettings:        extractedSecrets,
 	}
 	// save to store
-	revision, err := getLastConfiguration(ctx, orgID, ecp.amStore)
+	revision, err := ecp.configStore.Get(ctx, orgID)
 	if err != nil {
 		return err
 	}
 
-	configModified := stitchReceiver(revision.cfg, mergedReceiver)
+	configModified, renamedReceiver := stitchReceiver(revision.cfg, mergedReceiver)
 	if !configModified {
 		return fmt.Errorf("contact point with uid '%s' not found", mergedReceiver.UID)
 	}
 
-	data, err := json.Marshal(revision.cfg)
-	if err != nil {
-		return err
-	}
-	return ecp.xact.InTransaction(ctx, func(ctx context.Context) error {
-		err = PersistConfig(ctx, ecp.amStore, &models.SaveAlertmanagerConfigurationCmd{
-			AlertmanagerConfiguration: string(data),
-			FetchedConfigurationHash:  revision.concurrencyToken,
-			ConfigurationVersion:      revision.version,
-			Default:                   false,
-			OrgID:                     orgID,
-		})
-		if err != nil {
+	err = ecp.xact.InTransaction(ctx, func(ctx context.Context) error {
+		if err := ecp.configStore.Save(ctx, revision, orgID); err != nil {
 			return err
 		}
-		err = ecp.provenanceStore.SetProvenance(ctx, &contactPoint, orgID, provenance)
-		if err != nil {
-			return err
+		if renamedReceiver != "" && renamedReceiver != mergedReceiver.Name {
+			affected, err := ecp.notificationSettingsStore.RenameReceiverInNotificationSettings(ctx, orgID, renamedReceiver, mergedReceiver.Name)
+			if err != nil {
+				return err
+			}
+			if affected > 0 {
+				ecp.log.Info("Renamed receiver in notification settings", "oldName", renamedReceiver, "newName", mergedReceiver.Name, "affectedSettings", affected)
+			}
 		}
-		contactPoint.Provenance = string(provenance)
-		return nil
+		return ecp.provenanceStore.SetProvenance(ctx, &contactPoint, orgID, provenance)
 	})
+	if err != nil {
+		return err
+	}
+	return nil
 }
 
 func (ecp *ContactPointService) DeleteContactPoint(ctx context.Context, orgID int64, uid string) error {
-	revision, err := getLastConfiguration(ctx, orgID, ecp.amStore)
+	revision, err := ecp.configStore.Get(ctx, orgID)
 	if err != nil {
 		return err
 	}
@@ -353,27 +338,32 @@ func (ecp *ContactPointService) DeleteContactPoint(ctx context.Context, orgID in
 		}
 	}
 	if fullRemoval && isContactPointInUse(name, []*apimodels.Route{revision.cfg.AlertmanagerConfig.Route}) {
-		return fmt.Errorf("contact point '%s' is currently used by a notification policy", name)
-	}
-	data, err := json.Marshal(revision.cfg)
-	if err != nil {
-		return err
+		return ErrContactPointReferenced
 	}
+
 	return ecp.xact.InTransaction(ctx, func(ctx context.Context) error {
-		target := &apimodels.EmbeddedContactPoint{
-			UID: uid,
+		if fullRemoval {
+			used, err := ecp.notificationSettingsStore.ListNotificationSettings(ctx, models.ListNotificationSettingsQuery{OrgID: orgID, ReceiverName: name})
+			if err != nil {
+				return fmt.Errorf("failed to query alert rules for reference to the contact point '%s': %w", name, err)
+			}
+			if len(used) > 0 {
+				uids := make([]string, 0, len(used))
+				for key := range used {
+					uids = append(uids, key.UID)
+				}
+				ecp.log.Error("Cannot delete contact point because it is used in rule's notification settings", "receiverName", name, "rulesUid", strings.Join(uids, ","))
+				return fmt.Errorf("contact point '%s' is currently used in notification settings by one or many alert rules", name)
+			}
 		}
-		err := ecp.provenanceStore.DeleteProvenance(ctx, target, orgID)
-		if err != nil {
+
+		if err := ecp.configStore.Save(ctx, revision, orgID); err != nil {
 			return err
 		}
-		return PersistConfig(ctx, ecp.amStore, &models.SaveAlertmanagerConfigurationCmd{
-			AlertmanagerConfiguration: string(data),
-			FetchedConfigurationHash:  revision.concurrencyToken,
-			ConfigurationVersion:      revision.version,
-			Default:                   false,
-			OrgID:                     orgID,
-		})
+		target := &apimodels.EmbeddedContactPoint{
+			UID: uid,
+		}
+		return ecp.provenanceStore.DeleteProvenance(ctx, target, orgID)
 	})
 }
 
@@ -423,12 +413,14 @@ func (ecp *ContactPointService) encryptValue(value string) (string, error) {
 	return base64.StdEncoding.EncodeToString(encryptedData), nil
 }
 
-// stitchReceiver modifies a receiver, target, in an alertmanager config. It modifies the given config in-place.
-// Returns true if the config was altered in any way, and false otherwise.
-func stitchReceiver(cfg *apimodels.PostableUserConfig, target *apimodels.PostableGrafanaReceiver) bool {
+// stitchReceiver modifies a receiver, target, in an alertmanager configStore. It modifies the given configStore in-place.
+// Returns true if the configStore was altered in any way, and false otherwise.
+// If integration was moved to another group and it was the last in the previous group, the second parameter contains the name of the old group that is gone
+func stitchReceiver(cfg *apimodels.PostableUserConfig, target *apimodels.PostableGrafanaReceiver) (bool, string) {
 	// Algorithm to fix up receivers. Receivers are very complex and depend heavily on internal consistency.
 	// All receivers in a given receiver group have the same name. We must maintain this across renames.
 	configModified := false
+	renamedReceiver := ""
 groupLoop:
 	for groupIdx, receiverGroup := range cfg.AlertmanagerConfig.Receivers {
 		// Does the current group contain the grafana receiver we're interested in?
@@ -453,6 +445,7 @@ groupLoop:
 					replaceReferences(receiverGroup.Name, target.Name, cfg.AlertmanagerConfig.Route)
 					receiverGroup.Name = target.Name
 					receiverGroup.GrafanaManagedReceivers[i] = target
+					renamedReceiver = receiverGroup.Name
 				}
 
 				// Otherwise, we only want to rename the receiver we are touching... NOT all of them.
@@ -494,7 +487,7 @@ groupLoop:
 		}
 	}
 
-	return configModified
+	return configModified, renamedReceiver
 }
 
 func replaceReferences(oldName, newName string, routes ...*apimodels.Route) {
@@ -545,3 +538,23 @@ func RemoveSecretsForContactPoint(e *apimodels.EmbeddedContactPoint) (map[string
 	}
 	return s, nil
 }
+
+// handleWrappedError unwraps an error and wraps it with a new expected error type. If the error is not wrapped, it returns just the expected error.
+func handleWrappedError(err error, expected error) error {
+	err = errors.Unwrap(err)
+	if err == nil {
+		return expected
+	}
+	return fmt.Errorf("%w: %s", expected, err.Error())
+}
+
+// convertRecSvcErr converts errors from notifier.ReceiverService to errors expected from ContactPointService.
+func convertRecSvcErr(err error) error {
+	if errors.Is(err, notifier.ErrPermissionDenied) {
+		return handleWrappedError(err, ErrPermissionDenied)
+	}
+	if errors.Is(err, store.ErrNoAlertmanagerConfiguration) {
+		return ErrNoAlertmanagerConfiguration.Errorf("")
+	}
+	return err
+}
diff --git a/pkg/services/ngalert/provisioning/contactpoints_test.go b/pkg/services/ngalert/provisioning/contactpoints_test.go
index 7385d9c053b33..12081f1ba5d1c 100644
--- a/pkg/services/ngalert/provisioning/contactpoints_test.go
+++ b/pkg/services/ngalert/provisioning/contactpoints_test.go
@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/prometheus/alertmanager/config"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
@@ -19,6 +20,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/notifier"
+	"github.com/grafana/grafana/pkg/services/ngalert/tests/fakes"
 	"github.com/grafana/grafana/pkg/services/secrets"
 	"github.com/grafana/grafana/pkg/services/secrets/database"
 	"github.com/grafana/grafana/pkg/services/secrets/manager"
@@ -36,27 +38,30 @@ func TestContactPointService(t *testing.T) {
 		cps, err := sut.GetContactPoints(context.Background(), cpsQuery(1), nil)
 		require.NoError(t, err)
 
-		require.Len(t, cps, 1)
-		require.Equal(t, "slack receiver", cps[0].Name)
+		require.Len(t, cps, 2)
+		require.Equal(t, "grafana-default-email", cps[0].Name)
+		require.Equal(t, "slack receiver", cps[1].Name)
 	})
 
 	t.Run("service filters contact points by name", func(t *testing.T) {
 		sut := createContactPointServiceSut(t, secretsService)
-		newCp := createTestContactPoint()
-		_, err := sut.CreateContactPoint(context.Background(), 1, newCp, models.ProvenanceAPI)
-		require.NoError(t, err)
 
-		q := ContactPointQuery{
-			OrgID: 1,
-			Name:  "slack receiver",
-		}
-		cps, err := sut.GetContactPoints(context.Background(), q, nil)
+		cps, err := sut.GetContactPoints(context.Background(), cpsQueryWithName(1, "slack receiver"), nil)
 		require.NoError(t, err)
 
 		require.Len(t, cps, 1)
 		require.Equal(t, "slack receiver", cps[0].Name)
 	})
 
+	t.Run("service filters contact points by name, returns empty when no match", func(t *testing.T) {
+		sut := createContactPointServiceSut(t, secretsService)
+
+		cps, err := sut.GetContactPoints(context.Background(), cpsQueryWithName(1, "unknown"), nil)
+		require.NoError(t, err)
+
+		require.Len(t, cps, 0)
+	})
+
 	t.Run("service stitches contact point into org's AM config", func(t *testing.T) {
 		sut := createContactPointServiceSut(t, secretsService)
 		newCp := createTestContactPoint()
@@ -66,9 +71,9 @@ func TestContactPointService(t *testing.T) {
 
 		cps, err := sut.GetContactPoints(context.Background(), cpsQuery(1), nil)
 		require.NoError(t, err)
-		require.Len(t, cps, 2)
-		require.Equal(t, "test-contact-point", cps[1].Name)
-		require.Equal(t, "slack", cps[1].Type)
+		require.Len(t, cps, 3)
+		require.Equal(t, "test-contact-point", cps[2].Name)
+		require.Equal(t, "slack", cps[2].Type)
 	})
 
 	t.Run("it's possible to use a custom uid", func(t *testing.T) {
@@ -80,10 +85,10 @@ func TestContactPointService(t *testing.T) {
 		_, err := sut.CreateContactPoint(context.Background(), 1, newCp, models.ProvenanceAPI)
 		require.NoError(t, err)
 
-		cps, err := sut.GetContactPoints(context.Background(), cpsQuery(1), nil)
+		cps, err := sut.GetContactPoints(context.Background(), cpsQueryWithName(1, newCp.Name), nil)
 		require.NoError(t, err)
-		require.Len(t, cps, 2)
-		require.Equal(t, customUID, cps[1].UID)
+		require.Len(t, cps, 1)
+		require.Equal(t, customUID, cps[0].UID)
 	})
 
 	t.Run("it's not possible to use invalid UID", func(t *testing.T) {
@@ -216,19 +221,19 @@ func TestContactPointService(t *testing.T) {
 				newCp, err := sut.CreateContactPoint(context.Background(), 1, newCp, test.from)
 				require.NoError(t, err)
 
-				cps, err := sut.GetContactPoints(context.Background(), cpsQuery(1), nil)
+				cps, err := sut.GetContactPoints(context.Background(), cpsQueryWithName(1, newCp.Name), nil)
 				require.NoError(t, err)
-				require.Equal(t, newCp.UID, cps[1].UID)
-				require.Equal(t, test.from, models.Provenance(cps[1].Provenance))
+				require.Equal(t, newCp.UID, cps[0].UID)
+				require.Equal(t, test.from, models.Provenance(cps[0].Provenance))
 
 				err = sut.UpdateContactPoint(context.Background(), 1, newCp, test.to)
 				if test.errNil {
 					require.NoError(t, err)
 
-					cps, err = sut.GetContactPoints(context.Background(), cpsQuery(1), nil)
+					cps, err = sut.GetContactPoints(context.Background(), cpsQueryWithName(1, newCp.Name), nil)
 					require.NoError(t, err)
-					require.Equal(t, newCp.UID, cps[1].UID)
-					require.Equal(t, test.to, models.Provenance(cps[1].Provenance))
+					require.Equal(t, newCp.UID, cps[0].UID)
+					require.Equal(t, test.to, models.Provenance(cps[0].Provenance))
 				} else {
 					require.Error(t, err, fmt.Sprintf("cannot change provenance from '%s' to '%s'", test.from, test.to))
 				}
@@ -239,48 +244,56 @@ func TestContactPointService(t *testing.T) {
 	t.Run("service respects concurrency token when updating", func(t *testing.T) {
 		sut := createContactPointServiceSut(t, secretsService)
 		newCp := createTestContactPoint()
-		q := models.GetLatestAlertmanagerConfigurationQuery{
-			OrgID: 1,
-		}
-		config, err := sut.amStore.GetLatestAlertmanagerConfiguration(context.Background(), &q)
+		config, err := sut.configStore.store.GetLatestAlertmanagerConfiguration(context.Background(), 1)
 		require.NoError(t, err)
 		expectedConcurrencyToken := config.ConfigurationHash
 
 		_, err = sut.CreateContactPoint(context.Background(), 1, newCp, models.ProvenanceAPI)
 		require.NoError(t, err)
 
-		fake := sut.amStore.(*fakeAMConfigStore)
-		intercepted := fake.lastSaveCommand
+		fake := sut.configStore.store.(*fakes.FakeAlertmanagerConfigStore)
+		intercepted := fake.LastSaveCommand
 		require.Equal(t, expectedConcurrencyToken, intercepted.FetchedConfigurationHash)
 	})
 }
 
 func TestContactPointServiceDecryptRedact(t *testing.T) {
-	sqlStore := db.InitTestDB(t)
-	secretsService := manager.SetupTestService(t, database.ProvideSecretsStore(sqlStore))
-	ac := acimpl.ProvideAccessControl(setting.NewCfg())
+	secretsService := manager.SetupTestService(t, database.ProvideSecretsStore(db.InitTestDB(t)))
+	receiverServiceWithAC := func(ecp *ContactPointService) *notifier.ReceiverService {
+		return notifier.NewReceiverService(
+			acimpl.ProvideAccessControl(setting.NewCfg()),
+			// Get won't use the sut's config store, so we can use a different one here.
+			fakes.NewFakeAlertmanagerConfigStore(createEncryptedConfig(t, secretsService)),
+			ecp.provenanceStore,
+			ecp.encryptionService,
+			ecp.xact,
+			log.NewNopLogger(),
+		)
+	}
+
 	t.Run("GetContactPoints gets redacted contact points by default", func(t *testing.T) {
 		sut := createContactPointServiceSut(t, secretsService)
 
 		cps, err := sut.GetContactPoints(context.Background(), cpsQuery(1), nil)
 		require.NoError(t, err)
 
-		require.Len(t, cps, 1)
-		require.Equal(t, "slack receiver", cps[0].Name)
-		require.Equal(t, definitions.RedactedValue, cps[0].Settings.Get("url").MustString())
+		require.Len(t, cps, 2)
+		require.Equal(t, "slack receiver", cps[1].Name)
+		require.Equal(t, definitions.RedactedValue, cps[1].Settings.Get("url").MustString())
 	})
+
 	t.Run("GetContactPoints errors when Decrypt = true and user does not have permissions", func(t *testing.T) {
 		sut := createContactPointServiceSut(t, secretsService)
-		sut.ac = ac
+		sut.receiverService = receiverServiceWithAC(sut)
 
 		q := cpsQuery(1)
 		q.Decrypt = true
-		_, err := sut.GetContactPoints(context.Background(), q, &user.SignedInUser{})
+		_, err := sut.GetContactPoints(context.Background(), q, nil)
 		require.ErrorIs(t, err, ErrPermissionDenied)
 	})
 	t.Run("GetContactPoints errors when Decrypt = true and user is nil", func(t *testing.T) {
 		sut := createContactPointServiceSut(t, secretsService)
-		sut.ac = ac
+		sut.receiverService = receiverServiceWithAC(sut)
 
 		q := cpsQuery(1)
 		q.Decrypt = true
@@ -290,9 +303,10 @@ func TestContactPointServiceDecryptRedact(t *testing.T) {
 
 	t.Run("GetContactPoints gets decrypted contact points when Decrypt = true and user has permissions", func(t *testing.T) {
 		sut := createContactPointServiceSut(t, secretsService)
-		sut.ac = ac
+		sut.receiverService = receiverServiceWithAC(sut)
 
-		q := cpsQuery(1)
+		expectedName := "slack receiver"
+		q := cpsQueryWithName(1, expectedName)
 		q.Decrypt = true
 		cps, err := sut.GetContactPoints(context.Background(), q, &user.SignedInUser{OrgID: 1, Permissions: map[int64]map[string][]string{
 			1: {
@@ -302,7 +316,7 @@ func TestContactPointServiceDecryptRedact(t *testing.T) {
 		require.NoError(t, err)
 
 		require.Len(t, cps, 1)
-		require.Equal(t, "slack receiver", cps[0].Name)
+		require.Equal(t, expectedName, cps[0].Name)
 		require.Equal(t, "secure url", cps[0].Settings.Get("url").MustString())
 	})
 }
@@ -340,24 +354,27 @@ func TestContactPointInUse(t *testing.T) {
 
 func createContactPointServiceSut(t *testing.T, secretService secrets.Service) *ContactPointService {
 	// Encrypt secure settings.
-	c := &definitions.PostableUserConfig{}
-	err := json.Unmarshal([]byte(defaultAlertmanagerConfigJSON), c)
-	require.NoError(t, err)
-	err = notifier.EncryptReceiverConfigs(c.AlertmanagerConfig.Receivers, func(ctx context.Context, payload []byte) ([]byte, error) {
-		return secretService.Encrypt(ctx, payload, secrets.WithoutScope())
-	})
-	require.NoError(t, err)
-
-	raw, err := json.Marshal(c)
-	require.NoError(t, err)
+	cfg := createEncryptedConfig(t, secretService)
+	store := fakes.NewFakeAlertmanagerConfigStore(cfg)
+	xact := newNopTransactionManager()
+	provisioningStore := fakes.NewFakeProvisioningStore()
+
+	receiverService := notifier.NewReceiverService(
+		actest.FakeAccessControl{},
+		store,
+		provisioningStore,
+		secretService,
+		xact,
+		log.NewNopLogger(),
+	)
 
 	return &ContactPointService{
-		amStore:           newFakeAMConfigStore(string(raw)),
-		provenanceStore:   NewFakeProvisioningStore(),
-		xact:              newNopTransactionManager(),
+		configStore:       &alertmanagerConfigStoreImpl{store: store},
+		provenanceStore:   provisioningStore,
+		receiverService:   receiverService,
+		xact:              xact,
 		encryptionService: secretService,
 		log:               log.NewNopLogger(),
-		ac:                actest.FakeAccessControl{},
 	}
 }
 
@@ -376,13 +393,34 @@ func cpsQuery(orgID int64) ContactPointQuery {
 	}
 }
 
+func cpsQueryWithName(orgID int64, name string) ContactPointQuery {
+	return ContactPointQuery{
+		OrgID: orgID,
+		Name:  name,
+	}
+}
+
+func createEncryptedConfig(t *testing.T, secretService secrets.Service) string {
+	c := &definitions.PostableUserConfig{}
+	err := json.Unmarshal([]byte(defaultAlertmanagerConfigJSON), c)
+	require.NoError(t, err)
+	err = notifier.EncryptReceiverConfigs(c.AlertmanagerConfig.Receivers, func(ctx context.Context, payload []byte) ([]byte, error) {
+		return secretService.Encrypt(ctx, payload, secrets.WithoutScope())
+	})
+	require.NoError(t, err)
+	bytes, err := json.Marshal(c)
+	require.NoError(t, err)
+	return string(bytes)
+}
+
 func TestStitchReceivers(t *testing.T) {
 	type testCase struct {
-		name        string
-		initial     *definitions.PostableUserConfig
-		new         *definitions.PostableGrafanaReceiver
-		expModified bool
-		expCfg      definitions.PostableApiAlertingConfig
+		name               string
+		initial            *definitions.PostableUserConfig
+		new                *definitions.PostableGrafanaReceiver
+		expModified        bool
+		expCfg             definitions.PostableApiAlertingConfig
+		expRenamedReceiver string
 	}
 
 	cases := []testCase{
@@ -462,7 +500,8 @@ func TestStitchReceivers(t *testing.T) {
 				Name: "new-receiver",
 				Type: "slack",
 			},
-			expModified: true,
+			expModified:        true,
+			expRenamedReceiver: "new-receiver",
 			expCfg: definitions.PostableApiAlertingConfig{
 				Config: definitions.Config{
 					Route: &definitions.Route{
@@ -1063,7 +1102,8 @@ func TestStitchReceivers(t *testing.T) {
 				Name: "receiver-1",
 				Type: "slack",
 			},
-			expModified: true,
+			expModified:        true,
+			expRenamedReceiver: "receiver-1",
 			expCfg: definitions.PostableApiAlertingConfig{
 				Config: definitions.Config{
 					Route: &definitions.Route{
@@ -1115,8 +1155,12 @@ func TestStitchReceivers(t *testing.T) {
 				cfg = c.initial
 			}
 
-			modified := stitchReceiver(cfg, c.new)
-
+			modified, renamedReceiver := stitchReceiver(cfg, c.new)
+			if c.expRenamedReceiver != "" {
+				assert.Equal(t, c.expRenamedReceiver, renamedReceiver)
+			} else {
+				assert.Empty(t, renamedReceiver)
+			}
 			require.Equal(t, c.expModified, modified)
 			require.Equal(t, c.expCfg, cfg.AlertmanagerConfig)
 		})
diff --git a/pkg/services/ngalert/provisioning/errors.go b/pkg/services/ngalert/provisioning/errors.go
index 1ca9f708dd421..33ab23544e656 100644
--- a/pkg/services/ngalert/provisioning/errors.go
+++ b/pkg/services/ngalert/provisioning/errors.go
@@ -3,8 +3,44 @@ package provisioning
 import (
 	"errors"
 	"fmt"
+
+	"github.com/grafana/grafana/pkg/util/errutil"
 )
 
 var ErrValidation = fmt.Errorf("invalid object specification")
 var ErrNotFound = fmt.Errorf("object not found")
 var ErrPermissionDenied = errors.New("permission denied")
+
+var (
+	ErrNoAlertmanagerConfiguration  = errutil.Internal("alerting.notification.configMissing", errutil.WithPublicMessage("No alertmanager configuration present in this organization"))
+	ErrBadAlertmanagerConfiguration = errutil.Internal("alerting.notification.configCorrupted").MustTemplate("Failed to unmarshal the Alertmanager configuration", errutil.WithPublic("Current Alertmanager configuration in the storage is corrupted. Reset the configuration or rollback to a recent valid one."))
+
+	ErrTimeIntervalNotFound = errutil.NotFound("alerting.notifications.time-intervals.notFound")
+	ErrTimeIntervalExists   = errutil.BadRequest("alerting.notifications.time-intervals.nameExists", errutil.WithPublicMessage("Time interval with this name already exists. Use a different name or update existing one."))
+	ErrTimeIntervalInvalid  = errutil.BadRequest("alerting.notifications.time-intervals.invalidFormat").MustTemplate("Invalid format of the submitted time interval", errutil.WithPublic("Time interval is in invalid format. Correct the payload and try again."))
+	ErrTimeIntervalInUse    = errutil.Conflict("alerting.notifications.time-intervals.used", errutil.WithPublicMessage("Time interval is used by one or many notification policies"))
+
+	ErrContactPointReferenced = errutil.BadRequest("alerting.notifications.contact-points.referenced", errutil.WithPublicMessage("Contact point is currently referenced by a notification policy."))
+)
+
+func makeErrBadAlertmanagerConfiguration(err error) error {
+	data := errutil.TemplateData{
+		Public: map[string]interface{}{
+			"Error": err.Error(),
+		},
+		Error: err,
+	}
+	return ErrBadAlertmanagerConfiguration.Build(data)
+}
+
+// MakeErrTimeIntervalInvalid creates an error with the ErrTimeIntervalInvalid template
+func MakeErrTimeIntervalInvalid(err error) error {
+	data := errutil.TemplateData{
+		Public: map[string]interface{}{
+			"Error": err.Error(),
+		},
+		Error: err,
+	}
+
+	return ErrTimeIntervalInvalid.Build(data)
+}
diff --git a/pkg/services/ngalert/provisioning/mute_timings.go b/pkg/services/ngalert/provisioning/mute_timings.go
index 54d4b7d4294c9..bb02c8b0c851e 100644
--- a/pkg/services/ngalert/provisioning/mute_timings.go
+++ b/pkg/services/ngalert/provisioning/mute_timings.go
@@ -2,7 +2,6 @@ package provisioning
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/prometheus/alertmanager/config"
 
@@ -12,24 +11,24 @@ import (
 )
 
 type MuteTimingService struct {
-	config AMConfigStore
-	prov   ProvisioningStore
-	xact   TransactionManager
-	log    log.Logger
+	configStore     alertmanagerConfigStore
+	provenanceStore ProvisioningStore
+	xact            TransactionManager
+	log             log.Logger
 }
 
 func NewMuteTimingService(config AMConfigStore, prov ProvisioningStore, xact TransactionManager, log log.Logger) *MuteTimingService {
 	return &MuteTimingService{
-		config: config,
-		prov:   prov,
-		xact:   xact,
-		log:    log,
+		configStore:     &alertmanagerConfigStoreImpl{store: config},
+		provenanceStore: prov,
+		xact:            xact,
+		log:             log,
 	}
 }
 
 // GetMuteTimings returns a slice of all mute timings within the specified org.
 func (svc *MuteTimingService) GetMuteTimings(ctx context.Context, orgID int64) ([]definitions.MuteTimeInterval, error) {
-	rev, err := getLastConfiguration(ctx, orgID, svc.config)
+	rev, err := svc.configStore.Get(ctx, orgID)
 	if err != nil {
 		return nil, err
 	}
@@ -38,22 +37,55 @@ func (svc *MuteTimingService) GetMuteTimings(ctx context.Context, orgID int64) (
 		return []definitions.MuteTimeInterval{}, nil
 	}
 
+	provenances, err := svc.provenanceStore.GetProvenances(ctx, orgID, (&definitions.MuteTimeInterval{}).ResourceType())
+	if err != nil {
+		return nil, err
+	}
+
 	result := make([]definitions.MuteTimeInterval, 0, len(rev.cfg.AlertmanagerConfig.MuteTimeIntervals))
 	for _, interval := range rev.cfg.AlertmanagerConfig.MuteTimeIntervals {
-		result = append(result, definitions.MuteTimeInterval{MuteTimeInterval: interval})
+		def := definitions.MuteTimeInterval{MuteTimeInterval: interval}
+		if prov, ok := provenances[def.ResourceID()]; ok {
+			def.Provenance = definitions.Provenance(prov)
+		}
+		result = append(result, def)
+	}
+	return result, nil
+}
+
+// GetMuteTiming returns a mute timing by name
+func (svc *MuteTimingService) GetMuteTiming(ctx context.Context, name string, orgID int64) (definitions.MuteTimeInterval, error) {
+	rev, err := svc.configStore.Get(ctx, orgID)
+	if err != nil {
+		return definitions.MuteTimeInterval{}, err
+	}
+
+	mt, _, err := getMuteTiming(rev, name)
+	if err != nil {
+		return definitions.MuteTimeInterval{}, err
+	}
+
+	result := definitions.MuteTimeInterval{
+		MuteTimeInterval: mt,
+	}
+
+	prov, err := svc.provenanceStore.GetProvenance(ctx, &result, orgID)
+	if err != nil {
+		return definitions.MuteTimeInterval{}, err
 	}
+	result.Provenance = definitions.Provenance(prov)
 	return result, nil
 }
 
 // CreateMuteTiming adds a new mute timing within the specified org. The created mute timing is returned.
-func (svc *MuteTimingService) CreateMuteTiming(ctx context.Context, mt definitions.MuteTimeInterval, orgID int64) (*definitions.MuteTimeInterval, error) {
+func (svc *MuteTimingService) CreateMuteTiming(ctx context.Context, mt definitions.MuteTimeInterval, orgID int64) (definitions.MuteTimeInterval, error) {
 	if err := mt.Validate(); err != nil {
-		return nil, fmt.Errorf("%w: %s", ErrValidation, err.Error())
+		return definitions.MuteTimeInterval{}, MakeErrTimeIntervalInvalid(err)
 	}
 
-	revision, err := getLastConfiguration(ctx, orgID, svc.config)
+	revision, err := svc.configStore.Get(ctx, orgID)
 	if err != nil {
-		return nil, err
+		return definitions.MuteTimeInterval{}, err
 	}
 
 	if revision.cfg.AlertmanagerConfig.MuteTimeIntervals == nil {
@@ -61,98 +93,61 @@ func (svc *MuteTimingService) CreateMuteTiming(ctx context.Context, mt definitio
 	}
 	for _, existing := range revision.cfg.AlertmanagerConfig.MuteTimeIntervals {
 		if mt.Name == existing.Name {
-			return nil, fmt.Errorf("%w: %s", ErrValidation, "a mute timing with this name already exists")
+			return definitions.MuteTimeInterval{}, ErrTimeIntervalExists.Errorf("")
 		}
 	}
 	revision.cfg.AlertmanagerConfig.MuteTimeIntervals = append(revision.cfg.AlertmanagerConfig.MuteTimeIntervals, mt.MuteTimeInterval)
 
-	serialized, err := serializeAlertmanagerConfig(*revision.cfg)
-	if err != nil {
-		return nil, err
-	}
-	cmd := models.SaveAlertmanagerConfigurationCmd{
-		AlertmanagerConfiguration: string(serialized),
-		ConfigurationVersion:      revision.version,
-		FetchedConfigurationHash:  revision.concurrencyToken,
-		Default:                   false,
-		OrgID:                     orgID,
-	}
 	err = svc.xact.InTransaction(ctx, func(ctx context.Context) error {
-		err = PersistConfig(ctx, svc.config, &cmd)
-		if err != nil {
-			return err
-		}
-		err = svc.prov.SetProvenance(ctx, &mt, orgID, models.Provenance(mt.Provenance))
-		if err != nil {
+		if err := svc.configStore.Save(ctx, revision, orgID); err != nil {
 			return err
 		}
-		return nil
+		return svc.provenanceStore.SetProvenance(ctx, &mt, orgID, models.Provenance(mt.Provenance))
 	})
 	if err != nil {
-		return nil, err
+		return definitions.MuteTimeInterval{}, err
 	}
-
-	return &mt, nil
+	return mt, nil
 }
 
-// UpdateMuteTiming replaces an existing mute timing within the specified org. The replaced mute timing is returned. If the mute timing does not exist, nil is returned and no action is taken.
-func (svc *MuteTimingService) UpdateMuteTiming(ctx context.Context, mt definitions.MuteTimeInterval, orgID int64) (*definitions.MuteTimeInterval, error) {
+// UpdateMuteTiming replaces an existing mute timing within the specified org. The replaced mute timing is returned. If the mute timing does not exist, ErrMuteTimingsNotFound is returned.
+func (svc *MuteTimingService) UpdateMuteTiming(ctx context.Context, mt definitions.MuteTimeInterval, orgID int64) (definitions.MuteTimeInterval, error) {
 	if err := mt.Validate(); err != nil {
-		return nil, fmt.Errorf("%w: %s", ErrValidation, err.Error())
+		return definitions.MuteTimeInterval{}, MakeErrTimeIntervalInvalid(err)
 	}
 
-	revision, err := getLastConfiguration(ctx, orgID, svc.config)
+	revision, err := svc.configStore.Get(ctx, orgID)
 	if err != nil {
-		return nil, err
+		return definitions.MuteTimeInterval{}, err
 	}
 
 	if revision.cfg.AlertmanagerConfig.MuteTimeIntervals == nil {
-		return nil, nil
-	}
-	updated := false
-	for i, existing := range revision.cfg.AlertmanagerConfig.MuteTimeIntervals {
-		if mt.Name == existing.Name {
-			revision.cfg.AlertmanagerConfig.MuteTimeIntervals[i] = mt.MuteTimeInterval
-			updated = true
-			break
-		}
-	}
-	if !updated {
-		return nil, nil
+		return definitions.MuteTimeInterval{}, nil
 	}
 
-	serialized, err := serializeAlertmanagerConfig(*revision.cfg)
+	_, idx, err := getMuteTiming(revision, mt.Name)
 	if err != nil {
-		return nil, err
-	}
-	cmd := models.SaveAlertmanagerConfigurationCmd{
-		AlertmanagerConfiguration: string(serialized),
-		ConfigurationVersion:      revision.version,
-		FetchedConfigurationHash:  revision.concurrencyToken,
-		Default:                   false,
-		OrgID:                     orgID,
+		return definitions.MuteTimeInterval{}, err
 	}
+	revision.cfg.AlertmanagerConfig.MuteTimeIntervals[idx] = mt.MuteTimeInterval
+
+	// TODO add diff and noop detection
+	// TODO add fail if different provenance
 	err = svc.xact.InTransaction(ctx, func(ctx context.Context) error {
-		err = PersistConfig(ctx, svc.config, &cmd)
-		if err != nil {
-			return err
-		}
-		err = svc.prov.SetProvenance(ctx, &mt, orgID, models.Provenance(mt.Provenance))
-		if err != nil {
+		if err := svc.configStore.Save(ctx, revision, orgID); err != nil {
 			return err
 		}
-		return nil
+		return svc.provenanceStore.SetProvenance(ctx, &mt, orgID, models.Provenance(mt.Provenance))
 	})
 	if err != nil {
-		return nil, err
+		return definitions.MuteTimeInterval{}, err
 	}
-
-	return &mt, err
+	return mt, err
 }
 
 // DeleteMuteTiming deletes the mute timing with the given name in the given org. If the mute timing does not exist, no error is returned.
 func (svc *MuteTimingService) DeleteMuteTiming(ctx context.Context, name string, orgID int64) error {
-	revision, err := getLastConfiguration(ctx, orgID, svc.config)
+	revision, err := svc.configStore.Get(ctx, orgID)
 	if err != nil {
 		return err
 	}
@@ -161,7 +156,7 @@ func (svc *MuteTimingService) DeleteMuteTiming(ctx context.Context, name string,
 		return nil
 	}
 	if isMuteTimeInUse(name, []*definitions.Route{revision.cfg.AlertmanagerConfig.Route}) {
-		return fmt.Errorf("mute time '%s' is currently used by a notification policy", name)
+		return ErrTimeIntervalInUse.Errorf("")
 	}
 	for i, existing := range revision.cfg.AlertmanagerConfig.MuteTimeIntervals {
 		if name == existing.Name {
@@ -170,28 +165,12 @@ func (svc *MuteTimingService) DeleteMuteTiming(ctx context.Context, name string,
 		}
 	}
 
-	serialized, err := serializeAlertmanagerConfig(*revision.cfg)
-	if err != nil {
-		return err
-	}
-	cmd := models.SaveAlertmanagerConfigurationCmd{
-		AlertmanagerConfiguration: string(serialized),
-		ConfigurationVersion:      revision.version,
-		FetchedConfigurationHash:  revision.concurrencyToken,
-		Default:                   false,
-		OrgID:                     orgID,
-	}
 	return svc.xact.InTransaction(ctx, func(ctx context.Context) error {
-		err = PersistConfig(ctx, svc.config, &cmd)
-		if err != nil {
+		if err := svc.configStore.Save(ctx, revision, orgID); err != nil {
 			return err
 		}
 		target := definitions.MuteTimeInterval{MuteTimeInterval: config.MuteTimeInterval{Name: name}}
-		err := svc.prov.DeleteProvenance(ctx, &target, orgID)
-		if err != nil {
-			return err
-		}
-		return nil
+		return svc.provenanceStore.DeleteProvenance(ctx, &target, orgID)
 	})
 }
 
@@ -211,3 +190,15 @@ func isMuteTimeInUse(name string, routes []*definitions.Route) bool {
 	}
 	return false
 }
+
+func getMuteTiming(rev *cfgRevision, name string) (config.MuteTimeInterval, int, error) {
+	if rev.cfg.AlertmanagerConfig.MuteTimeIntervals == nil {
+		return config.MuteTimeInterval{}, -1, ErrTimeIntervalNotFound.Errorf("")
+	}
+	for idx, mt := range rev.cfg.AlertmanagerConfig.MuteTimeIntervals {
+		if mt.Name == name {
+			return mt, idx, nil
+		}
+	}
+	return config.MuteTimeInterval{}, -1, ErrTimeIntervalNotFound.Errorf("")
+}
diff --git a/pkg/services/ngalert/provisioning/mute_timings_test.go b/pkg/services/ngalert/provisioning/mute_timings_test.go
index 242012c249781..0eb46eea084ac 100644
--- a/pkg/services/ngalert/provisioning/mute_timings_test.go
+++ b/pkg/services/ngalert/provisioning/mute_timings_test.go
@@ -2,11 +2,14 @@ package provisioning
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"slices"
 	"testing"
 
 	"github.com/prometheus/alertmanager/config"
-	mock "github.com/stretchr/testify/mock"
+	"github.com/prometheus/alertmanager/timeinterval"
+	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/infra/log"
@@ -14,27 +17,67 @@ import (
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 )
 
-func TestMuteTimingService(t *testing.T) {
+func TestGetMuteTimings(t *testing.T) {
+	orgID := int64(1)
+	revision := &cfgRevision{
+		cfg: &definitions.PostableUserConfig{
+			AlertmanagerConfig: definitions.PostableApiAlertingConfig{
+				Config: definitions.Config{
+					MuteTimeIntervals: []config.MuteTimeInterval{
+						{
+							Name:          "Test1",
+							TimeIntervals: nil,
+						},
+						{
+							Name:          "Test2",
+							TimeIntervals: nil,
+						},
+						{
+							Name:          "Test3",
+							TimeIntervals: nil,
+						},
+					},
+				},
+			},
+		},
+	}
+
+	provenances := map[string]models.Provenance{
+		"Test1": models.ProvenanceFile,
+		"Test2": models.ProvenanceAPI,
+	}
+
 	t.Run("service returns timings from config file", func(t *testing.T) {
-		sut := createMuteTimingSvcSut()
-		sut.config.(*MockAMConfigStore).EXPECT().
-			GetsConfig(models.AlertConfiguration{
-				AlertmanagerConfiguration: configWithMuteTimings,
-			})
+		sut, store, prov := createMuteTimingSvcSut()
+		store.GetFn = func(ctx context.Context, orgID int64) (*cfgRevision, error) {
+			return revision, nil
+		}
+
+		prov.EXPECT().GetProvenances(mock.Anything, mock.Anything, mock.Anything).Return(provenances, nil)
 
 		result, err := sut.GetMuteTimings(context.Background(), 1)
 
 		require.NoError(t, err)
-		require.Len(t, result, 1)
-		require.Equal(t, "asdf", result[0].Name)
+		require.Len(t, result, len(revision.cfg.AlertmanagerConfig.MuteTimeIntervals))
+		require.Equal(t, "Test1", result[0].Name)
+		require.EqualValues(t, provenances["Test1"], result[0].Provenance)
+		require.Equal(t, "Test2", result[1].Name)
+		require.EqualValues(t, provenances["Test2"], result[1].Provenance)
+		require.Equal(t, "Test3", result[2].Name)
+		require.EqualValues(t, "", result[2].Provenance)
+
+		require.Len(t, store.Calls, 1)
+		require.Equal(t, "Get", store.Calls[0].Method)
+		require.Equal(t, orgID, store.Calls[0].Args[1])
+
+		prov.AssertCalled(t, "GetProvenances", mock.Anything, orgID, (&definitions.MuteTimeInterval{}).ResourceType())
 	})
 
 	t.Run("service returns empty list when config file contains no mute timings", func(t *testing.T) {
-		sut := createMuteTimingSvcSut()
-		sut.config.(*MockAMConfigStore).EXPECT().
-			GetsConfig(models.AlertConfiguration{
-				AlertmanagerConfiguration: defaultConfig,
-			})
+		sut, store, _ := createMuteTimingSvcSut()
+		store.GetFn = func(ctx context.Context, orgID int64) (*cfgRevision, error) {
+			return &cfgRevision{cfg: &definitions.PostableUserConfig{}}, nil
+		}
 
 		result, err := sut.GetMuteTimings(context.Background(), 1)
 
@@ -44,418 +87,594 @@ func TestMuteTimingService(t *testing.T) {
 
 	t.Run("service propagates errors", func(t *testing.T) {
 		t.Run("when unable to read config", func(t *testing.T) {
-			sut := createMuteTimingSvcSut()
-			sut.config.(*MockAMConfigStore).EXPECT().
-				GetLatestAlertmanagerConfiguration(mock.Anything, mock.Anything).
-				Return(nil, fmt.Errorf("failed"))
+			sut, store, _ := createMuteTimingSvcSut()
+			expected := fmt.Errorf("failed")
+			store.GetFn = func(ctx context.Context, orgID int64) (*cfgRevision, error) {
+				return nil, expected
+			}
 
-			_, err := sut.GetMuteTimings(context.Background(), 1)
+			_, err := sut.GetMuteTimings(context.Background(), orgID)
 
-			require.Error(t, err)
+			require.ErrorIs(t, err, expected)
 		})
 
-		t.Run("when config is invalid", func(t *testing.T) {
-			sut := createMuteTimingSvcSut()
-			sut.config.(*MockAMConfigStore).EXPECT().
-				GetsConfig(models.AlertConfiguration{
-					AlertmanagerConfiguration: brokenConfig,
-				})
+		t.Run("when unable to read provenance", func(t *testing.T) {
+			sut, store, prov := createMuteTimingSvcSut()
+			store.GetFn = func(ctx context.Context, orgID int64) (*cfgRevision, error) {
+				return revision, nil
+			}
+			expected := fmt.Errorf("failed")
+			prov.EXPECT().GetProvenances(mock.Anything, mock.Anything, mock.Anything).Return(nil, expected)
 
-			_, err := sut.GetMuteTimings(context.Background(), 1)
+			_, err := sut.GetMuteTimings(context.Background(), orgID)
 
-			require.ErrorContains(t, err, "failed to deserialize")
+			require.ErrorIs(t, err, expected)
 		})
+	})
+}
 
-		t.Run("when no AM config in current org", func(t *testing.T) {
-			sut := createMuteTimingSvcSut()
-			sut.config.(*MockAMConfigStore).EXPECT().
-				GetLatestAlertmanagerConfiguration(mock.Anything, mock.Anything).
-				Return(nil, nil)
+func TestGetMuteTiming(t *testing.T) {
+	orgID := int64(1)
+	revision := &cfgRevision{
+		cfg: &definitions.PostableUserConfig{
+			AlertmanagerConfig: definitions.PostableApiAlertingConfig{
+				Config: definitions.Config{
+					MuteTimeIntervals: []config.MuteTimeInterval{
+						{
+							Name:          "Test1",
+							TimeIntervals: nil,
+						},
+					},
+				},
+			},
+		},
+	}
 
-			_, err := sut.GetMuteTimings(context.Background(), 1)
+	t.Run("service returns timing by name", func(t *testing.T) {
+		sut, store, prov := createMuteTimingSvcSut()
+		store.GetFn = func(ctx context.Context, orgID int64) (*cfgRevision, error) {
+			return revision, nil
+		}
+		prov.EXPECT().GetProvenance(mock.Anything, mock.Anything, mock.Anything).Return(models.ProvenanceAPI, nil)
 
-			require.ErrorContains(t, err, "no alertmanager configuration")
-		})
+		result, err := sut.GetMuteTiming(context.Background(), "Test1", orgID)
+
+		require.NoError(t, err)
+
+		require.Equal(t, "Test1", result.Name)
+		require.EqualValues(t, models.ProvenanceAPI, result.Provenance)
+
+		require.Len(t, store.Calls, 1)
+		require.Equal(t, "Get", store.Calls[0].Method)
+		require.Equal(t, orgID, store.Calls[0].Args[1])
+
+		prov.AssertCalled(t, "GetProvenance", mock.Anything, &result, orgID)
 	})
 
-	t.Run("creating mute timings", func(t *testing.T) {
-		t.Run("rejects mute timings that fail validation", func(t *testing.T) {
-			sut := createMuteTimingSvcSut()
-			timing := definitions.MuteTimeInterval{
-				MuteTimeInterval: config.MuteTimeInterval{
-					Name: "",
-				},
+	t.Run("service returns ErrTimeIntervalNotFound if no mute timings", func(t *testing.T) {
+		sut, store, _ := createMuteTimingSvcSut()
+		store.GetFn = func(ctx context.Context, orgID int64) (*cfgRevision, error) {
+			return &cfgRevision{cfg: &definitions.PostableUserConfig{}}, nil
+		}
+
+		_, err := sut.GetMuteTiming(context.Background(), "Test1", orgID)
+
+		require.Truef(t, ErrTimeIntervalNotFound.Is(err), "expected ErrTimeIntervalNotFound but got %s", err)
+	})
+
+	t.Run("service returns ErrTimeIntervalNotFound if no mute timing by name", func(t *testing.T) {
+		sut, store, _ := createMuteTimingSvcSut()
+		store.GetFn = func(ctx context.Context, orgID int64) (*cfgRevision, error) {
+			return revision, nil
+		}
+
+		_, err := sut.GetMuteTiming(context.Background(), "Test123", orgID)
+
+		require.Truef(t, ErrTimeIntervalNotFound.Is(err), "expected ErrTimeIntervalNotFound but got %s", err)
+	})
+
+	t.Run("service propagates errors", func(t *testing.T) {
+		t.Run("when unable to read config", func(t *testing.T) {
+			sut, store, _ := createMuteTimingSvcSut()
+			expected := fmt.Errorf("failed")
+			store.GetFn = func(ctx context.Context, orgID int64) (*cfgRevision, error) {
+				return nil, expected
 			}
 
-			_, err := sut.CreateMuteTiming(context.Background(), timing, 1)
+			_, err := sut.GetMuteTiming(context.Background(), "Test1", orgID)
 
-			require.ErrorIs(t, err, ErrValidation)
+			require.ErrorIs(t, err, expected)
 		})
 
-		t.Run("propagates errors", func(t *testing.T) {
-			t.Run("when unable to read config", func(t *testing.T) {
-				sut := createMuteTimingSvcSut()
-				timing := createMuteTiming()
-				sut.config.(*MockAMConfigStore).EXPECT().
-					GetLatestAlertmanagerConfiguration(mock.Anything, mock.Anything).
-					Return(nil, fmt.Errorf("failed"))
+		t.Run("when unable to read provenance", func(t *testing.T) {
+			sut, store, prov := createMuteTimingSvcSut()
+			store.GetFn = func(ctx context.Context, orgID int64) (*cfgRevision, error) {
+				return revision, nil
+			}
+			expected := fmt.Errorf("failed")
+			prov.EXPECT().GetProvenance(mock.Anything, mock.Anything, mock.Anything).Return("", expected)
 
-				_, err := sut.CreateMuteTiming(context.Background(), timing, 1)
+			_, err := sut.GetMuteTiming(context.Background(), "Test1", orgID)
 
-				require.Error(t, err)
-			})
+			require.ErrorIs(t, err, expected)
+		})
+	})
+}
 
-			t.Run("when config is invalid", func(t *testing.T) {
-				sut := createMuteTimingSvcSut()
-				timing := createMuteTiming()
-				sut.config.(*MockAMConfigStore).EXPECT().
-					GetsConfig(models.AlertConfiguration{
-						AlertmanagerConfiguration: brokenConfig,
-					})
+func TestCreateMuteTimings(t *testing.T) {
+	orgID := int64(1)
+
+	initialConfig := func() *definitions.PostableUserConfig {
+		return &definitions.PostableUserConfig{
+			TemplateFiles: nil,
+			AlertmanagerConfig: definitions.PostableApiAlertingConfig{
+				Config: definitions.Config{
+					MuteTimeIntervals: []config.MuteTimeInterval{
+						{
+							Name: "TEST",
+						},
+					},
+				},
+				Receivers: nil,
+			},
+		}
+	}
 
-				_, err := sut.CreateMuteTiming(context.Background(), timing, 1)
+	expected := config.MuteTimeInterval{
+		Name: "Test",
+		TimeIntervals: []timeinterval.TimeInterval{
+			{
+				Times: []timeinterval.TimeRange{
+					{
+						StartMinute: 10, EndMinute: 60,
+					},
+				},
+			},
+		},
+	}
+	expectedProvenance := models.ProvenanceAPI
+	timing := definitions.MuteTimeInterval{
+		MuteTimeInterval: expected,
+		Provenance:       definitions.Provenance(expectedProvenance),
+	}
 
-				require.ErrorContains(t, err, "failed to deserialize")
-			})
+	t.Run("returns ErrTimeIntervalInvalid if mute timings fail validation", func(t *testing.T) {
+		sut, _, _ := createMuteTimingSvcSut()
+		timing := definitions.MuteTimeInterval{
+			MuteTimeInterval: config.MuteTimeInterval{
+				Name: "",
+			},
+			Provenance: definitions.Provenance(models.ProvenanceFile),
+		}
 
-			t.Run("when no AM config in current org", func(t *testing.T) {
-				sut := createMuteTimingSvcSut()
-				timing := createMuteTiming()
-				sut.config.(*MockAMConfigStore).EXPECT().
-					GetLatestAlertmanagerConfiguration(mock.Anything, mock.Anything).
-					Return(nil, nil)
+		_, err := sut.CreateMuteTiming(context.Background(), timing, orgID)
 
-				_, err := sut.CreateMuteTiming(context.Background(), timing, 1)
+		require.Truef(t, ErrTimeIntervalInvalid.Base.Is(err), "expected ErrTimeIntervalInvalid but got %s", err)
+	})
 
-				require.ErrorContains(t, err, "no alertmanager configuration")
-			})
+	t.Run("returns ErrTimeIntervalExists if mute timing with the name exists", func(t *testing.T) {
+		sut, store, _ := createMuteTimingSvcSut()
+		store.GetFn = func(ctx context.Context, orgID int64) (*cfgRevision, error) {
+			return &cfgRevision{cfg: initialConfig()}, nil
+		}
 
-			t.Run("when provenance fails to save", func(t *testing.T) {
-				sut := createMuteTimingSvcSut()
-				timing := createMuteTiming()
-				sut.config.(*MockAMConfigStore).EXPECT().
-					GetsConfig(models.AlertConfiguration{
-						AlertmanagerConfiguration: configWithMuteTimings,
-					})
-				sut.config.(*MockAMConfigStore).EXPECT().SaveSucceeds()
-				sut.prov.(*MockProvisioningStore).EXPECT().
-					SetProvenance(mock.Anything, mock.Anything, mock.Anything, mock.Anything).
-					Return(fmt.Errorf("failed to save provenance"))
-
-				_, err := sut.CreateMuteTiming(context.Background(), timing, 1)
-
-				require.ErrorContains(t, err, "failed to save provenance")
-			})
+		existing := initialConfig().AlertmanagerConfig.MuteTimeIntervals[0]
+		timing := definitions.MuteTimeInterval{
+			MuteTimeInterval: existing,
+			Provenance:       definitions.Provenance(models.ProvenanceFile),
+		}
 
-			t.Run("when AM config fails to save", func(t *testing.T) {
-				sut := createMuteTimingSvcSut()
-				timing := createMuteTiming()
-				sut.config.(*MockAMConfigStore).EXPECT().
-					GetsConfig(models.AlertConfiguration{
-						AlertmanagerConfiguration: configWithMuteTimings,
-					})
-				sut.config.(*MockAMConfigStore).EXPECT().
-					UpdateAlertmanagerConfiguration(mock.Anything, mock.Anything).
-					Return(fmt.Errorf("failed to save config"))
-				sut.prov.(*MockProvisioningStore).EXPECT().SaveSucceeds()
-
-				_, err := sut.CreateMuteTiming(context.Background(), timing, 1)
-
-				require.ErrorContains(t, err, "failed to save config")
+		_, err := sut.CreateMuteTiming(context.Background(), timing, orgID)
+
+		require.Truef(t, ErrTimeIntervalExists.Is(err), "expected ErrTimeIntervalExists but got %s", err)
+	})
+
+	t.Run("saves mute timing and provenance in a transaction", func(t *testing.T) {
+		sut, store, prov := createMuteTimingSvcSut()
+		store.GetFn = func(ctx context.Context, orgID int64) (*cfgRevision, error) {
+			return &cfgRevision{cfg: initialConfig()}, nil
+		}
+		store.SaveFn = func(ctx context.Context, revision *cfgRevision) error {
+			assertInTransaction(t, ctx)
+			return nil
+		}
+		prov.EXPECT().SetProvenance(mock.Anything, mock.Anything, mock.Anything, mock.Anything).RunAndReturn(
+			func(ctx context.Context, _ models.Provisionable, _ int64, _ models.Provenance) error {
+				assertInTransaction(t, ctx)
+				return nil
 			})
-		})
+
+		result, err := sut.CreateMuteTiming(context.Background(), timing, orgID)
+		require.NoError(t, err)
+
+		require.EqualValues(t, expected, result.MuteTimeInterval)
+		require.EqualValues(t, expectedProvenance, result.Provenance)
+
+		require.Len(t, store.Calls, 2)
+		require.Equal(t, "Get", store.Calls[0].Method)
+		require.Equal(t, orgID, store.Calls[0].Args[1])
+
+		require.Equal(t, "Save", store.Calls[1].Method)
+		require.Equal(t, orgID, store.Calls[1].Args[2])
+		revision := store.Calls[1].Args[1].(*cfgRevision)
+
+		expectedTimings := append(initialConfig().AlertmanagerConfig.MuteTimeIntervals, expected)
+		require.EqualValues(t, expectedTimings, revision.cfg.AlertmanagerConfig.MuteTimeIntervals)
+
+		prov.AssertCalled(t, "SetProvenance", mock.Anything, &timing, orgID, expectedProvenance)
 	})
 
-	t.Run("updating mute timings", func(t *testing.T) {
-		t.Run("rejects mute timings that fail validation", func(t *testing.T) {
-			sut := createMuteTimingSvcSut()
-			timing := definitions.MuteTimeInterval{
-				MuteTimeInterval: config.MuteTimeInterval{
-					Name: "",
-				},
+	t.Run("propagates errors", func(t *testing.T) {
+		t.Run("when unable to read config", func(t *testing.T) {
+			sut, store, _ := createMuteTimingSvcSut()
+			expectedErr := errors.New("test-err")
+			store.GetFn = func(ctx context.Context, orgID int64) (*cfgRevision, error) {
+				return nil, expectedErr
 			}
+			_, err := sut.CreateMuteTiming(context.Background(), timing, orgID)
+			require.ErrorIs(t, err, expectedErr)
+		})
+
+		t.Run("when provenance fails to save", func(t *testing.T) {
+			sut, store, _ := createMuteTimingSvcSut()
+			store.GetFn = func(ctx context.Context, orgID int64) (*cfgRevision, error) {
+				return &cfgRevision{cfg: initialConfig()}, nil
+			}
+			expectedErr := fmt.Errorf("failed to save provenance")
+			sut.provenanceStore.(*MockProvisioningStore).EXPECT().
+				SetProvenance(mock.Anything, mock.Anything, mock.Anything, mock.Anything).
+				Return(expectedErr)
+
+			_, err := sut.CreateMuteTiming(context.Background(), timing, orgID)
+
+			require.ErrorIs(t, err, expectedErr)
 
-			_, err := sut.UpdateMuteTiming(context.Background(), timing, 1)
+			require.Len(t, store.Calls, 2)
+			require.Equal(t, "Get", store.Calls[0].Method)
+			require.Equal(t, orgID, store.Calls[0].Args[1])
 
-			require.ErrorIs(t, err, ErrValidation)
+			require.Equal(t, "Save", store.Calls[1].Method)
 		})
 
-		t.Run("returns nil if timing does not exist", func(t *testing.T) {
-			sut := createMuteTimingSvcSut()
-			timing := createMuteTiming()
-			timing.Name = "does not exist"
-			sut.config.(*MockAMConfigStore).EXPECT().
-				GetsConfig(models.AlertConfiguration{
-					AlertmanagerConfiguration: configWithMuteTimings,
-				})
-			sut.config.(*MockAMConfigStore).EXPECT().SaveSucceeds()
-			sut.prov.(*MockProvisioningStore).EXPECT().SaveSucceeds()
-
-			updated, err := sut.UpdateMuteTiming(context.Background(), timing, 1)
-
-			require.NoError(t, err)
-			require.Nil(t, updated)
+		t.Run("when AM config fails to save", func(t *testing.T) {
+			sut, store, _ := createMuteTimingSvcSut()
+			store.GetFn = func(ctx context.Context, orgID int64) (*cfgRevision, error) {
+				return &cfgRevision{cfg: initialConfig()}, nil
+			}
+			expectedErr := errors.New("test-err")
+			store.SaveFn = func(ctx context.Context, revision *cfgRevision) error {
+				return expectedErr
+			}
+
+			_, err := sut.CreateMuteTiming(context.Background(), timing, orgID)
+
+			require.ErrorIs(t, err, expectedErr)
+
+			require.Len(t, store.Calls, 2)
+			require.Equal(t, "Get", store.Calls[0].Method)
+			require.Equal(t, orgID, store.Calls[0].Args[1])
+
+			require.Equal(t, "Save", store.Calls[1].Method)
 		})
+	})
+}
 
-		t.Run("propagates errors", func(t *testing.T) {
-			t.Run("when unable to read config", func(t *testing.T) {
-				sut := createMuteTimingSvcSut()
-				timing := createMuteTiming()
-				timing.Name = "asdf"
-				sut.config.(*MockAMConfigStore).EXPECT().
-					GetLatestAlertmanagerConfiguration(mock.Anything, mock.Anything).
-					Return(nil, fmt.Errorf("failed"))
+func TestUpdateMuteTimings(t *testing.T) {
+	orgID := int64(1)
+
+	initialConfig := func() *definitions.PostableUserConfig {
+		return &definitions.PostableUserConfig{
+			TemplateFiles: nil,
+			AlertmanagerConfig: definitions.PostableApiAlertingConfig{
+				Config: definitions.Config{
+					MuteTimeIntervals: []config.MuteTimeInterval{
+						{
+							Name: "Test",
+						},
+					},
+				},
+				Receivers: nil,
+			},
+		}
+	}
 
-				_, err := sut.UpdateMuteTiming(context.Background(), timing, 1)
+	expected := config.MuteTimeInterval{
+		Name: "Test",
+		TimeIntervals: []timeinterval.TimeInterval{
+			{
+				Times: []timeinterval.TimeRange{
+					{
+						StartMinute: 10, EndMinute: 60,
+					},
+				},
+			},
+		},
+	}
+	expectedProvenance := models.ProvenanceAPI
+	timing := definitions.MuteTimeInterval{
+		MuteTimeInterval: expected,
+		Provenance:       definitions.Provenance(expectedProvenance),
+	}
 
-				require.Error(t, err)
-			})
+	t.Run("rejects mute timings that fail validation", func(t *testing.T) {
+		sut, _, _ := createMuteTimingSvcSut()
+		timing := definitions.MuteTimeInterval{
+			MuteTimeInterval: config.MuteTimeInterval{
+				Name: "",
+			},
+			Provenance: definitions.Provenance(models.ProvenanceFile),
+		}
 
-			t.Run("when config is invalid", func(t *testing.T) {
-				sut := createMuteTimingSvcSut()
-				timing := createMuteTiming()
-				timing.Name = "asdf"
-				sut.config.(*MockAMConfigStore).EXPECT().
-					GetsConfig(models.AlertConfiguration{
-						AlertmanagerConfiguration: brokenConfig,
-					})
+		_, err := sut.UpdateMuteTiming(context.Background(), timing, orgID)
 
-				_, err := sut.UpdateMuteTiming(context.Background(), timing, 1)
+		require.Truef(t, ErrTimeIntervalInvalid.Base.Is(err), "expected ErrTimeIntervalInvalid but got %s", err)
+	})
 
-				require.ErrorContains(t, err, "failed to deserialize")
-			})
+	t.Run("returns ErrMuteTimingsNotFound if mute timing does not exist", func(t *testing.T) {
+		sut, store, _ := createMuteTimingSvcSut()
+		store.GetFn = func(ctx context.Context, orgID int64) (*cfgRevision, error) {
+			return &cfgRevision{cfg: initialConfig()}, nil
+		}
 
-			t.Run("when no AM config in current org", func(t *testing.T) {
-				sut := createMuteTimingSvcSut()
-				timing := createMuteTiming()
-				timing.Name = "asdf"
-				sut.config.(*MockAMConfigStore).EXPECT().
-					GetLatestAlertmanagerConfiguration(mock.Anything, mock.Anything).
-					Return(nil, nil)
+		timing := definitions.MuteTimeInterval{
+			MuteTimeInterval: config.MuteTimeInterval{
+				Name: "No-timing",
+			},
+			Provenance: definitions.Provenance(models.ProvenanceFile),
+		}
 
-				_, err := sut.UpdateMuteTiming(context.Background(), timing, 1)
+		_, err := sut.UpdateMuteTiming(context.Background(), timing, orgID)
 
-				require.ErrorContains(t, err, "no alertmanager configuration")
-			})
+		require.Truef(t, ErrTimeIntervalNotFound.Is(err), "expected ErrTimeIntervalNotFound but got %s", err)
+	})
 
-			t.Run("when provenance fails to save", func(t *testing.T) {
-				sut := createMuteTimingSvcSut()
-				timing := createMuteTiming()
-				timing.Name = "asdf"
-				sut.config.(*MockAMConfigStore).EXPECT().
-					GetsConfig(models.AlertConfiguration{
-						AlertmanagerConfiguration: configWithMuteTimings,
-					})
-				sut.config.(*MockAMConfigStore).EXPECT().SaveSucceeds()
-				sut.prov.(*MockProvisioningStore).EXPECT().
-					SetProvenance(mock.Anything, mock.Anything, mock.Anything, mock.Anything).
-					Return(fmt.Errorf("failed to save provenance"))
-
-				_, err := sut.UpdateMuteTiming(context.Background(), timing, 1)
-
-				require.ErrorContains(t, err, "failed to save provenance")
+	t.Run("saves mute timing and provenance in a transaction", func(t *testing.T) {
+		sut, store, prov := createMuteTimingSvcSut()
+		store.GetFn = func(ctx context.Context, orgID int64) (*cfgRevision, error) {
+			return &cfgRevision{cfg: initialConfig()}, nil
+		}
+		store.SaveFn = func(ctx context.Context, revision *cfgRevision) error {
+			assertInTransaction(t, ctx)
+			return nil
+		}
+		prov.EXPECT().SetProvenance(mock.Anything, mock.Anything, mock.Anything, mock.Anything).RunAndReturn(
+			func(ctx context.Context, _ models.Provisionable, _ int64, _ models.Provenance) error {
+				assertInTransaction(t, ctx)
+				return nil
 			})
 
-			t.Run("when AM config fails to save", func(t *testing.T) {
-				sut := createMuteTimingSvcSut()
-				timing := createMuteTiming()
-				timing.Name = "asdf"
-				sut.config.(*MockAMConfigStore).EXPECT().
-					GetsConfig(models.AlertConfiguration{
-						AlertmanagerConfiguration: configWithMuteTimings,
-					})
-				sut.config.(*MockAMConfigStore).EXPECT().
-					UpdateAlertmanagerConfiguration(mock.Anything, mock.Anything).
-					Return(fmt.Errorf("failed to save config"))
-				sut.prov.(*MockProvisioningStore).EXPECT().SaveSucceeds()
-
-				_, err := sut.UpdateMuteTiming(context.Background(), timing, 1)
-
-				require.ErrorContains(t, err, "failed to save config")
-			})
-		})
+		result, err := sut.UpdateMuteTiming(context.Background(), timing, orgID)
+		require.NoError(t, err)
+
+		require.EqualValues(t, expected, result.MuteTimeInterval)
+		require.EqualValues(t, expectedProvenance, result.Provenance)
+
+		require.Len(t, store.Calls, 2)
+		require.Equal(t, "Get", store.Calls[0].Method)
+		require.Equal(t, orgID, store.Calls[0].Args[1])
+
+		require.Equal(t, "Save", store.Calls[1].Method)
+		require.Equal(t, orgID, store.Calls[1].Args[2])
+		revision := store.Calls[1].Args[1].(*cfgRevision)
+
+		require.EqualValues(t, []config.MuteTimeInterval{expected}, revision.cfg.AlertmanagerConfig.MuteTimeIntervals)
+
+		prov.AssertCalled(t, "SetProvenance", mock.Anything, &timing, orgID, expectedProvenance)
 	})
 
-	t.Run("deleting mute timings", func(t *testing.T) {
-		t.Run("returns nil if timing does not exist", func(t *testing.T) {
-			sut := createMuteTimingSvcSut()
-			sut.config.(*MockAMConfigStore).EXPECT().
-				GetsConfig(models.AlertConfiguration{
-					AlertmanagerConfiguration: configWithMuteTimings,
-				})
-			sut.config.(*MockAMConfigStore).EXPECT().SaveSucceeds()
-			sut.prov.(*MockProvisioningStore).EXPECT().SaveSucceeds()
+	t.Run("propagates errors", func(t *testing.T) {
+		t.Run("when unable to read config", func(t *testing.T) {
+			sut, store, _ := createMuteTimingSvcSut()
+			expectedErr := errors.New("test-err")
+			store.GetFn = func(ctx context.Context, orgID int64) (*cfgRevision, error) {
+				return nil, expectedErr
+			}
+			_, err := sut.UpdateMuteTiming(context.Background(), timing, orgID)
+			require.ErrorIs(t, err, expectedErr)
+		})
+
+		t.Run("when provenance fails to save", func(t *testing.T) {
+			sut, store, _ := createMuteTimingSvcSut()
+			store.GetFn = func(ctx context.Context, orgID int64) (*cfgRevision, error) {
+				return &cfgRevision{cfg: initialConfig()}, nil
+			}
+			expectedErr := fmt.Errorf("failed to save provenance")
+			sut.provenanceStore.(*MockProvisioningStore).EXPECT().
+				SetProvenance(mock.Anything, mock.Anything, mock.Anything, mock.Anything).
+				Return(expectedErr)
+
+			_, err := sut.UpdateMuteTiming(context.Background(), timing, orgID)
 
-			err := sut.DeleteMuteTiming(context.Background(), "does not exist", 1)
+			require.ErrorIs(t, err, expectedErr)
 
-			require.NoError(t, err)
+			require.Len(t, store.Calls, 2)
+			require.Equal(t, "Get", store.Calls[0].Method)
+			require.Equal(t, orgID, store.Calls[0].Args[1])
+
+			require.Equal(t, "Save", store.Calls[1].Method)
 		})
 
-		t.Run("propagates errors", func(t *testing.T) {
-			t.Run("when unable to read config", func(t *testing.T) {
-				sut := createMuteTimingSvcSut()
-				sut.config.(*MockAMConfigStore).EXPECT().
-					GetLatestAlertmanagerConfiguration(mock.Anything, mock.Anything).
-					Return(nil, fmt.Errorf("failed"))
+		t.Run("when AM config fails to save", func(t *testing.T) {
+			sut, store, _ := createMuteTimingSvcSut()
+			store.GetFn = func(ctx context.Context, orgID int64) (*cfgRevision, error) {
+				return &cfgRevision{cfg: initialConfig()}, nil
+			}
+			expectedErr := errors.New("test-err")
+			store.SaveFn = func(ctx context.Context, revision *cfgRevision) error {
+				return expectedErr
+			}
 
-				err := sut.DeleteMuteTiming(context.Background(), "asdf", 1)
+			_, err := sut.UpdateMuteTiming(context.Background(), timing, orgID)
 
-				require.Error(t, err)
-			})
+			require.ErrorIs(t, err, expectedErr)
 
-			t.Run("when config is invalid", func(t *testing.T) {
-				sut := createMuteTimingSvcSut()
-				sut.config.(*MockAMConfigStore).EXPECT().
-					GetsConfig(models.AlertConfiguration{
-						AlertmanagerConfiguration: brokenConfig,
-					})
+			require.Len(t, store.Calls, 2)
+			require.Equal(t, "Get", store.Calls[0].Method)
+			require.Equal(t, orgID, store.Calls[0].Args[1])
 
-				err := sut.DeleteMuteTiming(context.Background(), "asdf", 1)
+			require.Equal(t, "Save", store.Calls[1].Method)
+		})
+	})
+}
 
-				require.ErrorContains(t, err, "failed to deserialize")
-			})
+func TestDeleteMuteTimings(t *testing.T) {
+	orgID := int64(1)
+
+	timingToDelete := config.MuteTimeInterval{Name: "unused-timing"}
+	usedTiming := "used-timing"
+	initialConfig := func() *definitions.PostableUserConfig {
+		return &definitions.PostableUserConfig{
+			TemplateFiles: nil,
+			AlertmanagerConfig: definitions.PostableApiAlertingConfig{
+				Config: definitions.Config{
+					Route: &definitions.Route{
+						MuteTimeIntervals: []string{usedTiming},
+					},
+					MuteTimeIntervals: []config.MuteTimeInterval{
+						{
+							Name: usedTiming,
+						},
+						timingToDelete,
+					},
+				},
+				Receivers: nil,
+			},
+		}
+	}
 
-			t.Run("when no AM config in current org", func(t *testing.T) {
-				sut := createMuteTimingSvcSut()
-				sut.config.(*MockAMConfigStore).EXPECT().
-					GetLatestAlertmanagerConfiguration(mock.Anything, mock.Anything).
-					Return(nil, nil)
+	t.Run("re-saves config and deletes provenance if mute timing does not exist", func(t *testing.T) {
+		sut, store, prov := createMuteTimingSvcSut()
+		store.GetFn = func(ctx context.Context, orgID int64) (*cfgRevision, error) {
+			return &cfgRevision{cfg: initialConfig()}, nil
+		}
+		prov.EXPECT().DeleteProvenance(mock.Anything, mock.Anything, mock.Anything).Return(nil)
 
-				err := sut.DeleteMuteTiming(context.Background(), "asdf", 1)
+		err := sut.DeleteMuteTiming(context.Background(), "no-timing", orgID)
+		require.NoError(t, err)
 
-				require.ErrorContains(t, err, "no alertmanager configuration")
-			})
+		require.Len(t, store.Calls, 2)
+		require.Equal(t, "Get", store.Calls[0].Method)
+		require.Equal(t, orgID, store.Calls[0].Args[1])
 
-			t.Run("when provenance fails to save", func(t *testing.T) {
-				sut := createMuteTimingSvcSut()
-				sut.config.(*MockAMConfigStore).EXPECT().
-					GetsConfig(models.AlertConfiguration{
-						AlertmanagerConfiguration: configWithMuteTimings,
-					})
-				sut.config.(*MockAMConfigStore).EXPECT().SaveSucceeds()
-				sut.prov.(*MockProvisioningStore).EXPECT().
-					DeleteProvenance(mock.Anything, mock.Anything, mock.Anything).
-					Return(fmt.Errorf("failed to save provenance"))
+		require.Equal(t, "Save", store.Calls[1].Method)
+		require.Equal(t, orgID, store.Calls[1].Args[2])
+		revision := store.Calls[1].Args[1].(*cfgRevision)
 
-				err := sut.DeleteMuteTiming(context.Background(), "asdf", 1)
+		require.EqualValues(t, initialConfig().AlertmanagerConfig.MuteTimeIntervals, revision.cfg.AlertmanagerConfig.MuteTimeIntervals)
 
-				require.ErrorContains(t, err, "failed to save provenance")
-			})
+		prov.AssertCalled(t, "DeleteProvenance", mock.Anything, &definitions.MuteTimeInterval{MuteTimeInterval: config.MuteTimeInterval{Name: "no-timing"}}, orgID)
+	})
+
+	t.Run("returns ErrTimeIntervalInUse if mute timing is used", func(t *testing.T) {
+		sut, store, _ := createMuteTimingSvcSut()
+		store.GetFn = func(ctx context.Context, orgID int64) (*cfgRevision, error) {
+			return &cfgRevision{cfg: initialConfig()}, nil
+		}
 
-			t.Run("when AM config fails to save", func(t *testing.T) {
-				sut := createMuteTimingSvcSut()
-				sut.config.(*MockAMConfigStore).EXPECT().
-					GetsConfig(models.AlertConfiguration{
-						AlertmanagerConfiguration: configWithMuteTimings,
-					})
-				sut.config.(*MockAMConfigStore).EXPECT().
-					UpdateAlertmanagerConfiguration(mock.Anything, mock.Anything).
-					Return(fmt.Errorf("failed to save config"))
-				sut.prov.(*MockProvisioningStore).EXPECT().SaveSucceeds()
+		err := sut.DeleteMuteTiming(context.Background(), usedTiming, orgID)
 
-				err := sut.DeleteMuteTiming(context.Background(), "asdf", 1)
+		require.Len(t, store.Calls, 1)
+		require.Equal(t, "Get", store.Calls[0].Method)
+		require.Equal(t, orgID, store.Calls[0].Args[1])
+		require.Truef(t, ErrTimeIntervalInUse.Is(err), "expected ErrTimeIntervalInUse but got %s", err)
+	})
 
-				require.ErrorContains(t, err, "failed to save config")
+	t.Run("deletes mute timing and provenance in transaction", func(t *testing.T) {
+		sut, store, prov := createMuteTimingSvcSut()
+		store.GetFn = func(ctx context.Context, orgID int64) (*cfgRevision, error) {
+			return &cfgRevision{cfg: initialConfig()}, nil
+		}
+		store.SaveFn = func(ctx context.Context, revision *cfgRevision) error {
+			assertInTransaction(t, ctx)
+			return nil
+		}
+		prov.EXPECT().DeleteProvenance(mock.Anything, mock.Anything, mock.Anything).RunAndReturn(
+			func(ctx context.Context, _ models.Provisionable, _ int64) error {
+				assertInTransaction(t, ctx)
+				return nil
 			})
 
-			t.Run("when mute timing is used in route", func(t *testing.T) {
-				sut := createMuteTimingSvcSut()
-				sut.config.(*MockAMConfigStore).EXPECT().
-					GetsConfig(models.AlertConfiguration{
-						AlertmanagerConfiguration: configWithMuteTimingsInRoute,
-					})
+		err := sut.DeleteMuteTiming(context.Background(), timingToDelete.Name, orgID)
+		require.NoError(t, err)
 
-				err := sut.DeleteMuteTiming(context.Background(), "asdf", 1)
+		require.Len(t, store.Calls, 2)
+		require.Equal(t, "Get", store.Calls[0].Method)
+		require.Equal(t, orgID, store.Calls[0].Args[1])
 
-				require.Error(t, err)
-			})
+		require.Equal(t, "Save", store.Calls[1].Method)
+		require.Equal(t, orgID, store.Calls[1].Args[2])
+		revision := store.Calls[1].Args[1].(*cfgRevision)
+
+		expectedMuteTimings := slices.DeleteFunc(initialConfig().AlertmanagerConfig.MuteTimeIntervals, func(interval config.MuteTimeInterval) bool {
+			return interval.Name == timingToDelete.Name
 		})
+		require.EqualValues(t, expectedMuteTimings, revision.cfg.AlertmanagerConfig.MuteTimeIntervals)
+
+		prov.AssertCalled(t, "DeleteProvenance", mock.Anything, &definitions.MuteTimeInterval{MuteTimeInterval: timingToDelete}, orgID)
 	})
-}
 
-func createMuteTimingSvcSut() *MuteTimingService {
-	return &MuteTimingService{
-		config: &MockAMConfigStore{},
-		prov:   &MockProvisioningStore{},
-		xact:   newNopTransactionManager(),
-		log:    log.NewNopLogger(),
-	}
-}
+	t.Run("propagates errors", func(t *testing.T) {
+		t.Run("when unable to read config", func(t *testing.T) {
+			sut, store, _ := createMuteTimingSvcSut()
+			expectedErr := errors.New("test-err")
+			store.GetFn = func(ctx context.Context, orgID int64) (*cfgRevision, error) {
+				return nil, expectedErr
+			}
+			err := sut.DeleteMuteTiming(context.Background(), timingToDelete.Name, orgID)
+			require.ErrorIs(t, err, expectedErr)
+		})
 
-func createMuteTiming() definitions.MuteTimeInterval {
-	return definitions.MuteTimeInterval{
-		MuteTimeInterval: config.MuteTimeInterval{
-			Name: "interval",
-		},
-	}
-}
+		t.Run("when provenance fails to save", func(t *testing.T) {
+			sut, store, _ := createMuteTimingSvcSut()
+			store.GetFn = func(ctx context.Context, orgID int64) (*cfgRevision, error) {
+				return &cfgRevision{cfg: initialConfig()}, nil
+			}
+			expectedErr := fmt.Errorf("failed to save provenance")
+			sut.provenanceStore.(*MockProvisioningStore).EXPECT().
+				DeleteProvenance(mock.Anything, mock.Anything, mock.Anything).
+				Return(expectedErr)
 
-var configWithMuteTimings = `
-{
-	"template_files": {
-		"a": "template"
-	},
-	"alertmanager_config": {
-		"route": {
-			"receiver": "grafana-default-email"
-		},
-		"mute_time_intervals": [{
-			"name": "asdf",
-			"time_intervals": [{
-				"times": [],
-				"weekdays": ["monday"]
-			}]
-		}],
-		"receivers": [{
-			"name": "grafana-default-email",
-			"grafana_managed_receiver_configs": [{
-				"uid": "",
-				"name": "email receiver",
-				"type": "email",
-				"isDefault": true,
-				"settings": {
-					"addresses": "<example@email.com>"
-				}
-			}]
-		}]
-	}
+			err := sut.DeleteMuteTiming(context.Background(), timingToDelete.Name, orgID)
+
+			require.ErrorIs(t, err, expectedErr)
+
+			require.Len(t, store.Calls, 2)
+			require.Equal(t, "Get", store.Calls[0].Method)
+			require.Equal(t, orgID, store.Calls[0].Args[1])
+
+			require.Equal(t, "Save", store.Calls[1].Method)
+		})
+
+		t.Run("when AM config fails to save", func(t *testing.T) {
+			sut, store, _ := createMuteTimingSvcSut()
+			store.GetFn = func(ctx context.Context, orgID int64) (*cfgRevision, error) {
+				return &cfgRevision{cfg: initialConfig()}, nil
+			}
+			expectedErr := errors.New("test-err")
+			store.SaveFn = func(ctx context.Context, revision *cfgRevision) error {
+				return expectedErr
+			}
+
+			err := sut.DeleteMuteTiming(context.Background(), timingToDelete.Name, orgID)
+
+			require.ErrorIs(t, err, expectedErr)
+
+			require.Len(t, store.Calls, 2)
+			require.Equal(t, "Get", store.Calls[0].Method)
+			require.Equal(t, orgID, store.Calls[0].Args[1])
+
+			require.Equal(t, "Save", store.Calls[1].Method)
+		})
+	})
 }
-`
-
-var configWithMuteTimingsInRoute = `
-{
-	"template_files": {
-		"a": "template"
-	},
-	"alertmanager_config": {
-		"route": {
-			"receiver": "grafana-default-email",
-			"routes": [
-				{
-					"receiver": "grafana-default-email",
-					"mute_time_intervals": ["asdf"]
-				}
-			]
-		},
-		"mute_time_intervals": [{
-			"name": "asdf",
-			"time_intervals": [{
-				"times": [],
-				"weekdays": ["monday"]
-			}]
-		}],
-		"receivers": [{
-			"name": "grafana-default-email",
-			"grafana_managed_receiver_configs": [{
-				"uid": "",
-				"name": "email receiver",
-				"type": "email",
-				"isDefault": true,
-				"settings": {
-					"addresses": "<example@email.com>"
-				}
-			}]
-		}]
-	}
+
+func createMuteTimingSvcSut() (*MuteTimingService, *alertmanagerConfigStoreFake, *MockProvisioningStore) {
+	store := &alertmanagerConfigStoreFake{}
+	prov := &MockProvisioningStore{}
+	return &MuteTimingService{
+		configStore:     store,
+		provenanceStore: prov,
+		xact:            newNopTransactionManager(),
+		log:             log.NewNopLogger(),
+	}, store, prov
 }
-`
diff --git a/pkg/services/ngalert/provisioning/notification_policies.go b/pkg/services/ngalert/provisioning/notification_policies.go
index ac3096a4020f2..eeea63c4f295b 100644
--- a/pkg/services/ngalert/provisioning/notification_policies.go
+++ b/pkg/services/ngalert/provisioning/notification_policies.go
@@ -11,7 +11,7 @@ import (
 )
 
 type NotificationPolicyService struct {
-	amStore         AMConfigStore
+	configStore     *alertmanagerConfigStoreImpl
 	provenanceStore ProvisioningStore
 	xact            TransactionManager
 	log             log.Logger
@@ -21,7 +21,7 @@ type NotificationPolicyService struct {
 func NewNotificationPolicyService(am AMConfigStore, prov ProvisioningStore,
 	xact TransactionManager, settings setting.UnifiedAlertingSettings, log log.Logger) *NotificationPolicyService {
 	return &NotificationPolicyService{
-		amStore:         am,
+		configStore:     &alertmanagerConfigStoreImpl{store: am},
 		provenanceStore: prov,
 		xact:            xact,
 		log:             log,
@@ -30,33 +30,25 @@ func NewNotificationPolicyService(am AMConfigStore, prov ProvisioningStore,
 }
 
 func (nps *NotificationPolicyService) GetAMConfigStore() AMConfigStore {
-	return nps.amStore
+	return nps.configStore.store
 }
 
 func (nps *NotificationPolicyService) GetPolicyTree(ctx context.Context, orgID int64) (definitions.Route, error) {
-	q := models.GetLatestAlertmanagerConfigurationQuery{
-		OrgID: orgID,
-	}
-	alertManagerConfig, err := nps.amStore.GetLatestAlertmanagerConfiguration(ctx, &q)
-	if err != nil {
-		return definitions.Route{}, err
-	}
-
-	cfg, err := deserializeAlertmanagerConfig([]byte(alertManagerConfig.AlertmanagerConfiguration))
+	rev, err := nps.configStore.Get(ctx, orgID)
 	if err != nil {
 		return definitions.Route{}, err
 	}
 
-	if cfg.AlertmanagerConfig.Config.Route == nil {
+	if rev.cfg.AlertmanagerConfig.Config.Route == nil {
 		return definitions.Route{}, fmt.Errorf("no route present in current alertmanager config")
 	}
 
-	provenance, err := nps.provenanceStore.GetProvenance(ctx, cfg.AlertmanagerConfig.Route, orgID)
+	provenance, err := nps.provenanceStore.GetProvenance(ctx, rev.cfg.AlertmanagerConfig.Route, orgID)
 	if err != nil {
 		return definitions.Route{}, err
 	}
 
-	result := *cfg.AlertmanagerConfig.Route
+	result := *rev.cfg.AlertmanagerConfig.Route
 	result.Provenance = definitions.Provenance(provenance)
 
 	return result, nil
@@ -68,7 +60,7 @@ func (nps *NotificationPolicyService) UpdatePolicyTree(ctx context.Context, orgI
 		return fmt.Errorf("%w: %s", ErrValidation, err.Error())
 	}
 
-	revision, err := getLastConfiguration(ctx, orgID, nps.amStore)
+	revision, err := nps.configStore.Get(ctx, orgID)
 	if err != nil {
 		return err
 	}
@@ -78,6 +70,7 @@ func (nps *NotificationPolicyService) UpdatePolicyTree(ctx context.Context, orgI
 		return err
 	}
 
+	receivers[""] = struct{}{} // Allow empty receiver (inheriting from parent)
 	err = tree.ValidateReceivers(receivers)
 	if err != nil {
 		return fmt.Errorf("%w: %s", ErrValidation, err.Error())
@@ -94,33 +87,12 @@ func (nps *NotificationPolicyService) UpdatePolicyTree(ctx context.Context, orgI
 
 	revision.cfg.AlertmanagerConfig.Config.Route = &tree
 
-	serialized, err := serializeAlertmanagerConfig(*revision.cfg)
-	if err != nil {
-		return err
-	}
-	cmd := models.SaveAlertmanagerConfigurationCmd{
-		AlertmanagerConfiguration: string(serialized),
-		ConfigurationVersion:      revision.version,
-		FetchedConfigurationHash:  revision.concurrencyToken,
-		Default:                   false,
-		OrgID:                     orgID,
-	}
-	err = nps.xact.InTransaction(ctx, func(ctx context.Context) error {
-		err = PersistConfig(ctx, nps.amStore, &cmd)
-		if err != nil {
-			return err
-		}
-		err = nps.provenanceStore.SetProvenance(ctx, &tree, orgID, p)
-		if err != nil {
+	return nps.xact.InTransaction(ctx, func(ctx context.Context) error {
+		if err := nps.configStore.Save(ctx, revision, orgID); err != nil {
 			return err
 		}
-		return nil
+		return nps.provenanceStore.SetProvenance(ctx, &tree, orgID, p)
 	})
-	if err != nil {
-		return err
-	}
-
-	return nil
 }
 
 func (nps *NotificationPolicyService) ResetPolicyTree(ctx context.Context, orgID int64) (definitions.Route, error) {
@@ -131,7 +103,7 @@ func (nps *NotificationPolicyService) ResetPolicyTree(ctx context.Context, orgID
 	}
 	route := defaultCfg.AlertmanagerConfig.Route
 
-	revision, err := getLastConfiguration(ctx, orgID, nps.amStore)
+	revision, err := nps.configStore.Get(ctx, orgID)
 	if err != nil {
 		return definitions.Route{}, err
 	}
@@ -141,31 +113,16 @@ func (nps *NotificationPolicyService) ResetPolicyTree(ctx context.Context, orgID
 		return definitions.Route{}, err
 	}
 
-	serialized, err := serializeAlertmanagerConfig(*revision.cfg)
-	if err != nil {
-		return definitions.Route{}, err
-	}
-	cmd := models.SaveAlertmanagerConfigurationCmd{
-		AlertmanagerConfiguration: string(serialized),
-		ConfigurationVersion:      revision.version,
-		FetchedConfigurationHash:  revision.concurrencyToken,
-		Default:                   false,
-		OrgID:                     orgID,
-	}
 	err = nps.xact.InTransaction(ctx, func(ctx context.Context) error {
-		err := PersistConfig(ctx, nps.amStore, &cmd)
-		if err != nil {
-			return err
-		}
-		err = nps.provenanceStore.DeleteProvenance(ctx, route, orgID)
-		if err != nil {
+		if err := nps.configStore.Save(ctx, revision, orgID); err != nil {
 			return err
 		}
-		return nil
+		return nps.provenanceStore.DeleteProvenance(ctx, route, orgID)
 	})
+
 	if err != nil {
 		return definitions.Route{}, nil
-	}
+	} // TODO should be error?
 
 	return *route, nil
 }
diff --git a/pkg/services/ngalert/provisioning/notification_policies_test.go b/pkg/services/ngalert/provisioning/notification_policies_test.go
index 7fbb6ea1699c3..95b319e5b2df9 100644
--- a/pkg/services/ngalert/provisioning/notification_policies_test.go
+++ b/pkg/services/ngalert/provisioning/notification_policies_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/tests/fakes"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
@@ -28,7 +29,7 @@ func TestNotificationPolicyService(t *testing.T) {
 
 	t.Run("error if referenced mute time interval is not existing", func(t *testing.T) {
 		sut := createNotificationPolicyServiceSut()
-		sut.amStore = &MockAMConfigStore{}
+		sut.configStore.store = &MockAMConfigStore{}
 		cfg := createTestAlertingConfig()
 		cfg.AlertmanagerConfig.MuteTimeIntervals = []config.MuteTimeInterval{
 			{
@@ -37,14 +38,14 @@ func TestNotificationPolicyService(t *testing.T) {
 			},
 		}
 		data, _ := serializeAlertmanagerConfig(*cfg)
-		sut.amStore.(*MockAMConfigStore).On("GetLatestAlertmanagerConfiguration", mock.Anything, mock.Anything).
+		sut.configStore.store.(*MockAMConfigStore).On("GetLatestAlertmanagerConfiguration", mock.Anything, mock.Anything).
 			Return(&models.AlertConfiguration{AlertmanagerConfiguration: string(data)}, nil)
-		sut.amStore.(*MockAMConfigStore).EXPECT().
+		sut.configStore.store.(*MockAMConfigStore).EXPECT().
 			UpdateAlertmanagerConfiguration(mock.Anything, mock.Anything).
 			Return(nil)
 		newRoute := createTestRoutingTree()
 		newRoute.Routes = append(newRoute.Routes, &definitions.Route{
-			Receiver:          "a new receiver",
+			Receiver:          "slack receiver",
 			MuteTimeIntervals: []string{"not-existing"},
 		})
 
@@ -54,7 +55,7 @@ func TestNotificationPolicyService(t *testing.T) {
 
 	t.Run("pass if referenced mute time interval is existing", func(t *testing.T) {
 		sut := createNotificationPolicyServiceSut()
-		sut.amStore = &MockAMConfigStore{}
+		sut.configStore.store = &MockAMConfigStore{}
 		cfg := createTestAlertingConfig()
 		cfg.AlertmanagerConfig.MuteTimeIntervals = []config.MuteTimeInterval{
 			{
@@ -63,14 +64,14 @@ func TestNotificationPolicyService(t *testing.T) {
 			},
 		}
 		data, _ := serializeAlertmanagerConfig(*cfg)
-		sut.amStore.(*MockAMConfigStore).On("GetLatestAlertmanagerConfiguration", mock.Anything, mock.Anything).
+		sut.configStore.store.(*MockAMConfigStore).On("GetLatestAlertmanagerConfiguration", mock.Anything, mock.Anything).
 			Return(&models.AlertConfiguration{AlertmanagerConfiguration: string(data)}, nil)
-		sut.amStore.(*MockAMConfigStore).EXPECT().
+		sut.configStore.store.(*MockAMConfigStore).EXPECT().
 			UpdateAlertmanagerConfiguration(mock.Anything, mock.Anything).
 			Return(nil)
 		newRoute := createTestRoutingTree()
 		newRoute.Routes = append(newRoute.Routes, &definitions.Route{
-			Receiver:          "a new receiver",
+			Receiver:          "slack receiver",
 			MuteTimeIntervals: []string{"existing"},
 		})
 
@@ -88,7 +89,32 @@ func TestNotificationPolicyService(t *testing.T) {
 
 		updated, err := sut.GetPolicyTree(context.Background(), 1)
 		require.NoError(t, err)
-		require.Equal(t, "a new receiver", updated.Receiver)
+		require.Equal(t, "slack receiver", updated.Receiver)
+	})
+
+	t.Run("no root receiver will error", func(t *testing.T) {
+		sut := createNotificationPolicyServiceSut()
+
+		newRoute := createTestRoutingTree()
+		newRoute.Receiver = ""
+		newRoute.Routes = append(newRoute.Routes, &definitions.Route{
+			Receiver: "",
+		})
+
+		err := sut.UpdatePolicyTree(context.Background(), 1, newRoute, models.ProvenanceNone)
+		require.EqualError(t, err, "invalid object specification: root route must specify a default receiver")
+	})
+
+	t.Run("allow receiver inheritance", func(t *testing.T) {
+		sut := createNotificationPolicyServiceSut()
+
+		newRoute := createTestRoutingTree()
+		newRoute.Routes = append(newRoute.Routes, &definitions.Route{
+			Receiver: "",
+		})
+
+		err := sut.UpdatePolicyTree(context.Background(), 1, newRoute, models.ProvenanceNone)
+		require.NoError(t, err)
 	})
 
 	t.Run("not existing receiver reference will error", func(t *testing.T) {
@@ -105,12 +131,12 @@ func TestNotificationPolicyService(t *testing.T) {
 
 	t.Run("existing receiver reference will pass", func(t *testing.T) {
 		sut := createNotificationPolicyServiceSut()
-		sut.amStore = &MockAMConfigStore{}
+		sut.configStore.store = &MockAMConfigStore{}
 		cfg := createTestAlertingConfig()
 		data, _ := serializeAlertmanagerConfig(*cfg)
-		sut.amStore.(*MockAMConfigStore).On("GetLatestAlertmanagerConfiguration", mock.Anything, mock.Anything).
+		sut.configStore.store.(*MockAMConfigStore).On("GetLatestAlertmanagerConfiguration", mock.Anything, mock.Anything).
 			Return(&models.AlertConfiguration{AlertmanagerConfiguration: string(data)}, nil)
-		sut.amStore.(*MockAMConfigStore).EXPECT().
+		sut.configStore.store.(*MockAMConfigStore).EXPECT().
 			UpdateAlertmanagerConfiguration(mock.Anything, mock.Anything).
 			Return(nil)
 		newRoute := createTestRoutingTree()
@@ -146,18 +172,15 @@ func TestNotificationPolicyService(t *testing.T) {
 	t.Run("service respects concurrency token when updating", func(t *testing.T) {
 		sut := createNotificationPolicyServiceSut()
 		newRoute := createTestRoutingTree()
-		q := models.GetLatestAlertmanagerConfigurationQuery{
-			OrgID: 1,
-		}
-		config, err := sut.GetAMConfigStore().GetLatestAlertmanagerConfiguration(context.Background(), &q)
+		config, err := sut.GetAMConfigStore().GetLatestAlertmanagerConfiguration(context.Background(), 1)
 		require.NoError(t, err)
 		expectedConcurrencyToken := config.ConfigurationHash
 
 		err = sut.UpdatePolicyTree(context.Background(), 1, newRoute, models.ProvenanceAPI)
 		require.NoError(t, err)
 
-		fake := sut.GetAMConfigStore().(*fakeAMConfigStore)
-		intercepted := fake.lastSaveCommand
+		fake := sut.GetAMConfigStore().(*fakes.FakeAlertmanagerConfigStore)
+		intercepted := fake.LastSaveCommand
 		require.Equal(t, expectedConcurrencyToken, intercepted.FetchedConfigurationHash)
 	})
 
@@ -186,31 +209,31 @@ func TestNotificationPolicyService(t *testing.T) {
 
 	t.Run("deleting route with missing default receiver restores receiver", func(t *testing.T) {
 		sut := createNotificationPolicyServiceSut()
-		sut.amStore = &MockAMConfigStore{}
+		sut.configStore.store = &MockAMConfigStore{}
 		cfg := createTestAlertingConfig()
 		cfg.AlertmanagerConfig.Route = &definitions.Route{
-			Receiver: "a new receiver",
+			Receiver: "slack receiver",
 		}
 		cfg.AlertmanagerConfig.Receivers = []*definitions.PostableApiReceiver{
 			{
 				Receiver: config.Receiver{
-					Name: "a new receiver",
+					Name: "slack receiver",
 				},
 			},
 			// No default receiver! Only our custom one.
 		}
 		data, _ := serializeAlertmanagerConfig(*cfg)
-		sut.amStore.(*MockAMConfigStore).On("GetLatestAlertmanagerConfiguration", mock.Anything, mock.Anything).
+		sut.configStore.store.(*MockAMConfigStore).On("GetLatestAlertmanagerConfiguration", mock.Anything, mock.Anything).
 			Return(&models.AlertConfiguration{AlertmanagerConfiguration: string(data)}, nil)
 		var interceptedSave = models.SaveAlertmanagerConfigurationCmd{}
-		sut.amStore.(*MockAMConfigStore).EXPECT().SaveSucceedsIntercept(&interceptedSave)
+		sut.configStore.store.(*MockAMConfigStore).EXPECT().SaveSucceedsIntercept(&interceptedSave)
 
 		tree, err := sut.ResetPolicyTree(context.Background(), 1)
 
 		require.NoError(t, err)
 		require.Equal(t, "grafana-default-email", tree.Receiver)
 		require.NotEmpty(t, interceptedSave.AlertmanagerConfiguration)
-		// Deserializing with no error asserts that the saved config is semantically valid.
+		// Deserializing with no error asserts that the saved configStore is semantically valid.
 		newCfg, err := deserializeAlertmanagerConfig([]byte(interceptedSave.AlertmanagerConfiguration))
 		require.NoError(t, err)
 		require.Len(t, newCfg.AlertmanagerConfig.Receivers, 2)
@@ -219,8 +242,8 @@ func TestNotificationPolicyService(t *testing.T) {
 
 func createNotificationPolicyServiceSut() *NotificationPolicyService {
 	return &NotificationPolicyService{
-		amStore:         newFakeAMConfigStore(defaultAlertmanagerConfigJSON),
-		provenanceStore: NewFakeProvisioningStore(),
+		configStore:     &alertmanagerConfigStoreImpl{store: fakes.NewFakeAlertmanagerConfigStore(defaultAlertmanagerConfigJSON)},
+		provenanceStore: fakes.NewFakeProvisioningStore(),
 		xact:            newNopTransactionManager(),
 		log:             log.NewNopLogger(),
 		settings: setting.UnifiedAlertingSettings{
@@ -231,7 +254,7 @@ func createNotificationPolicyServiceSut() *NotificationPolicyService {
 
 func createTestRoutingTree() definitions.Route {
 	return definitions.Route{
-		Receiver: "a new receiver",
+		Receiver: "slack receiver",
 	}
 }
 
@@ -241,7 +264,7 @@ func createTestAlertingConfig() *definitions.PostableUserConfig {
 		&definitions.PostableApiReceiver{
 			Receiver: config.Receiver{
 				// default one from createTestRoutingTree()
-				Name: "a new receiver",
+				Name: "slack receiver",
 			},
 		})
 	cfg.AlertmanagerConfig.Receivers = append(cfg.AlertmanagerConfig.Receivers,
diff --git a/pkg/services/ngalert/provisioning/persist.go b/pkg/services/ngalert/provisioning/persist.go
index 67daf360b68d3..80af4f24eb1ed 100644
--- a/pkg/services/ngalert/provisioning/persist.go
+++ b/pkg/services/ngalert/provisioning/persist.go
@@ -14,7 +14,7 @@ import (
 //
 //go:generate mockery --name AMConfigStore --structname MockAMConfigStore --inpackage --filename persist_mock.go --with-expecter
 type AMConfigStore interface {
-	GetLatestAlertmanagerConfiguration(ctx context.Context, query *models.GetLatestAlertmanagerConfigurationQuery) (*models.AlertConfiguration, error)
+	GetLatestAlertmanagerConfiguration(ctx context.Context, orgID int64) (*models.AlertConfiguration, error)
 	UpdateAlertmanagerConfiguration(ctx context.Context, cmd *models.SaveAlertmanagerConfigurationCmd) error
 }
 
diff --git a/pkg/services/ngalert/provisioning/persist_mock.go b/pkg/services/ngalert/provisioning/persist_mock.go
index cafcd67963f34..53cd220762b0c 100644
--- a/pkg/services/ngalert/provisioning/persist_mock.go
+++ b/pkg/services/ngalert/provisioning/persist_mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.16.0. DO NOT EDIT.
+// Code generated by mockery v2.34.2. DO NOT EDIT.
 
 package provisioning
 
@@ -22,22 +22,25 @@ func (_m *MockAMConfigStore) EXPECT() *MockAMConfigStore_Expecter {
 	return &MockAMConfigStore_Expecter{mock: &_m.Mock}
 }
 
-// GetLatestAlertmanagerConfiguration provides a mock function with given fields: ctx, query
-func (_m *MockAMConfigStore) GetLatestAlertmanagerConfiguration(ctx context.Context, query *models.GetLatestAlertmanagerConfigurationQuery) (*models.AlertConfiguration, error) {
-	ret := _m.Called(ctx, query)
+// GetLatestAlertmanagerConfiguration provides a mock function with given fields: ctx, orgID
+func (_m *MockAMConfigStore) GetLatestAlertmanagerConfiguration(ctx context.Context, orgID int64) (*models.AlertConfiguration, error) {
+	ret := _m.Called(ctx, orgID)
 
 	var r0 *models.AlertConfiguration
-	if rf, ok := ret.Get(0).(func(context.Context, *models.GetLatestAlertmanagerConfigurationQuery) *models.AlertConfiguration); ok {
-		r0 = rf(ctx, query)
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, int64) (*models.AlertConfiguration, error)); ok {
+		return rf(ctx, orgID)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, int64) *models.AlertConfiguration); ok {
+		r0 = rf(ctx, orgID)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).(*models.AlertConfiguration)
 		}
 	}
 
-	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, *models.GetLatestAlertmanagerConfigurationQuery) error); ok {
-		r1 = rf(ctx, query)
+	if rf, ok := ret.Get(1).(func(context.Context, int64) error); ok {
+		r1 = rf(ctx, orgID)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -52,14 +55,14 @@ type MockAMConfigStore_GetLatestAlertmanagerConfiguration_Call struct {
 
 // GetLatestAlertmanagerConfiguration is a helper method to define mock.On call
 //   - ctx context.Context
-//   - query *models.GetLatestAlertmanagerConfigurationQuery
-func (_e *MockAMConfigStore_Expecter) GetLatestAlertmanagerConfiguration(ctx any, query any) *MockAMConfigStore_GetLatestAlertmanagerConfiguration_Call {
-	return &MockAMConfigStore_GetLatestAlertmanagerConfiguration_Call{Call: _e.mock.On("GetLatestAlertmanagerConfiguration", ctx, query)}
+//   - orgID int64
+func (_e *MockAMConfigStore_Expecter) GetLatestAlertmanagerConfiguration(ctx interface{}, orgID interface{}) *MockAMConfigStore_GetLatestAlertmanagerConfiguration_Call {
+	return &MockAMConfigStore_GetLatestAlertmanagerConfiguration_Call{Call: _e.mock.On("GetLatestAlertmanagerConfiguration", ctx, orgID)}
 }
 
-func (_c *MockAMConfigStore_GetLatestAlertmanagerConfiguration_Call) Run(run func(ctx context.Context, query *models.GetLatestAlertmanagerConfigurationQuery)) *MockAMConfigStore_GetLatestAlertmanagerConfiguration_Call {
+func (_c *MockAMConfigStore_GetLatestAlertmanagerConfiguration_Call) Run(run func(ctx context.Context, orgID int64)) *MockAMConfigStore_GetLatestAlertmanagerConfiguration_Call {
 	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(context.Context), args[1].(*models.GetLatestAlertmanagerConfigurationQuery))
+		run(args[0].(context.Context), args[1].(int64))
 	})
 	return _c
 }
@@ -69,6 +72,11 @@ func (_c *MockAMConfigStore_GetLatestAlertmanagerConfiguration_Call) Return(_a0
 	return _c
 }
 
+func (_c *MockAMConfigStore_GetLatestAlertmanagerConfiguration_Call) RunAndReturn(run func(context.Context, int64) (*models.AlertConfiguration, error)) *MockAMConfigStore_GetLatestAlertmanagerConfiguration_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // UpdateAlertmanagerConfiguration provides a mock function with given fields: ctx, cmd
 func (_m *MockAMConfigStore) UpdateAlertmanagerConfiguration(ctx context.Context, cmd *models.SaveAlertmanagerConfigurationCmd) error {
 	ret := _m.Called(ctx, cmd)
@@ -91,7 +99,7 @@ type MockAMConfigStore_UpdateAlertmanagerConfiguration_Call struct {
 // UpdateAlertmanagerConfiguration is a helper method to define mock.On call
 //   - ctx context.Context
 //   - cmd *models.SaveAlertmanagerConfigurationCmd
-func (_e *MockAMConfigStore_Expecter) UpdateAlertmanagerConfiguration(ctx any, cmd any) *MockAMConfigStore_UpdateAlertmanagerConfiguration_Call {
+func (_e *MockAMConfigStore_Expecter) UpdateAlertmanagerConfiguration(ctx interface{}, cmd interface{}) *MockAMConfigStore_UpdateAlertmanagerConfiguration_Call {
 	return &MockAMConfigStore_UpdateAlertmanagerConfiguration_Call{Call: _e.mock.On("UpdateAlertmanagerConfiguration", ctx, cmd)}
 }
 
@@ -107,13 +115,17 @@ func (_c *MockAMConfigStore_UpdateAlertmanagerConfiguration_Call) Return(_a0 err
 	return _c
 }
 
-type mockConstructorTestingTNewMockAMConfigStore interface {
-	mock.TestingT
-	Cleanup(func())
+func (_c *MockAMConfigStore_UpdateAlertmanagerConfiguration_Call) RunAndReturn(run func(context.Context, *models.SaveAlertmanagerConfigurationCmd) error) *MockAMConfigStore_UpdateAlertmanagerConfiguration_Call {
+	_c.Call.Return(run)
+	return _c
 }
 
 // NewMockAMConfigStore creates a new instance of MockAMConfigStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewMockAMConfigStore(t mockConstructorTestingTNewMockAMConfigStore) *MockAMConfigStore {
+// The first argument is typically a *testing.T value.
+func NewMockAMConfigStore(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *MockAMConfigStore {
 	mock := &MockAMConfigStore{}
 	mock.Mock.Test(t)
 
diff --git a/pkg/services/ngalert/provisioning/provisioning_store_mock.go b/pkg/services/ngalert/provisioning/provisioning_store_mock.go
index 050e2837db624..65df0062a8a35 100644
--- a/pkg/services/ngalert/provisioning/provisioning_store_mock.go
+++ b/pkg/services/ngalert/provisioning/provisioning_store_mock.go
@@ -1,14 +1,12 @@
-// Code generated by mockery v2.12.0. DO NOT EDIT.
+// Code generated by mockery v2.34.2. DO NOT EDIT.
 
 package provisioning
 
 import (
 	context "context"
-	testing "testing"
-
-	mock "github.com/stretchr/testify/mock"
 
 	models "github.com/grafana/grafana/pkg/services/ngalert/models"
+	mock "github.com/stretchr/testify/mock"
 )
 
 // MockProvisioningStore is an autogenerated mock type for the ProvisioningStore type
@@ -47,7 +45,7 @@ type MockProvisioningStore_DeleteProvenance_Call struct {
 //   - ctx context.Context
 //   - o models.Provisionable
 //   - org int64
-func (_e *MockProvisioningStore_Expecter) DeleteProvenance(ctx any, o any, org any) *MockProvisioningStore_DeleteProvenance_Call {
+func (_e *MockProvisioningStore_Expecter) DeleteProvenance(ctx interface{}, o interface{}, org interface{}) *MockProvisioningStore_DeleteProvenance_Call {
 	return &MockProvisioningStore_DeleteProvenance_Call{Call: _e.mock.On("DeleteProvenance", ctx, o, org)}
 }
 
@@ -63,18 +61,26 @@ func (_c *MockProvisioningStore_DeleteProvenance_Call) Return(_a0 error) *MockPr
 	return _c
 }
 
+func (_c *MockProvisioningStore_DeleteProvenance_Call) RunAndReturn(run func(context.Context, models.Provisionable, int64) error) *MockProvisioningStore_DeleteProvenance_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // GetProvenance provides a mock function with given fields: ctx, o, org
 func (_m *MockProvisioningStore) GetProvenance(ctx context.Context, o models.Provisionable, org int64) (models.Provenance, error) {
 	ret := _m.Called(ctx, o, org)
 
 	var r0 models.Provenance
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, models.Provisionable, int64) (models.Provenance, error)); ok {
+		return rf(ctx, o, org)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, models.Provisionable, int64) models.Provenance); ok {
 		r0 = rf(ctx, o, org)
 	} else {
 		r0 = ret.Get(0).(models.Provenance)
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, models.Provisionable, int64) error); ok {
 		r1 = rf(ctx, o, org)
 	} else {
@@ -93,7 +99,7 @@ type MockProvisioningStore_GetProvenance_Call struct {
 //   - ctx context.Context
 //   - o models.Provisionable
 //   - org int64
-func (_e *MockProvisioningStore_Expecter) GetProvenance(ctx any, o any, org any) *MockProvisioningStore_GetProvenance_Call {
+func (_e *MockProvisioningStore_Expecter) GetProvenance(ctx interface{}, o interface{}, org interface{}) *MockProvisioningStore_GetProvenance_Call {
 	return &MockProvisioningStore_GetProvenance_Call{Call: _e.mock.On("GetProvenance", ctx, o, org)}
 }
 
@@ -109,11 +115,20 @@ func (_c *MockProvisioningStore_GetProvenance_Call) Return(_a0 models.Provenance
 	return _c
 }
 
+func (_c *MockProvisioningStore_GetProvenance_Call) RunAndReturn(run func(context.Context, models.Provisionable, int64) (models.Provenance, error)) *MockProvisioningStore_GetProvenance_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // GetProvenances provides a mock function with given fields: ctx, org, resourceType
 func (_m *MockProvisioningStore) GetProvenances(ctx context.Context, org int64, resourceType string) (map[string]models.Provenance, error) {
 	ret := _m.Called(ctx, org, resourceType)
 
 	var r0 map[string]models.Provenance
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, int64, string) (map[string]models.Provenance, error)); ok {
+		return rf(ctx, org, resourceType)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, int64, string) map[string]models.Provenance); ok {
 		r0 = rf(ctx, org, resourceType)
 	} else {
@@ -122,7 +137,6 @@ func (_m *MockProvisioningStore) GetProvenances(ctx context.Context, org int64,
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, int64, string) error); ok {
 		r1 = rf(ctx, org, resourceType)
 	} else {
@@ -141,7 +155,7 @@ type MockProvisioningStore_GetProvenances_Call struct {
 //   - ctx context.Context
 //   - org int64
 //   - resourceType string
-func (_e *MockProvisioningStore_Expecter) GetProvenances(ctx any, org any, resourceType any) *MockProvisioningStore_GetProvenances_Call {
+func (_e *MockProvisioningStore_Expecter) GetProvenances(ctx interface{}, org interface{}, resourceType interface{}) *MockProvisioningStore_GetProvenances_Call {
 	return &MockProvisioningStore_GetProvenances_Call{Call: _e.mock.On("GetProvenances", ctx, org, resourceType)}
 }
 
@@ -157,6 +171,11 @@ func (_c *MockProvisioningStore_GetProvenances_Call) Return(_a0 map[string]model
 	return _c
 }
 
+func (_c *MockProvisioningStore_GetProvenances_Call) RunAndReturn(run func(context.Context, int64, string) (map[string]models.Provenance, error)) *MockProvisioningStore_GetProvenances_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // SetProvenance provides a mock function with given fields: ctx, o, org, p
 func (_m *MockProvisioningStore) SetProvenance(ctx context.Context, o models.Provisionable, org int64, p models.Provenance) error {
 	ret := _m.Called(ctx, o, org, p)
@@ -181,7 +200,7 @@ type MockProvisioningStore_SetProvenance_Call struct {
 //   - o models.Provisionable
 //   - org int64
 //   - p models.Provenance
-func (_e *MockProvisioningStore_Expecter) SetProvenance(ctx any, o any, org any, p any) *MockProvisioningStore_SetProvenance_Call {
+func (_e *MockProvisioningStore_Expecter) SetProvenance(ctx interface{}, o interface{}, org interface{}, p interface{}) *MockProvisioningStore_SetProvenance_Call {
 	return &MockProvisioningStore_SetProvenance_Call{Call: _e.mock.On("SetProvenance", ctx, o, org, p)}
 }
 
@@ -197,8 +216,17 @@ func (_c *MockProvisioningStore_SetProvenance_Call) Return(_a0 error) *MockProvi
 	return _c
 }
 
-// NewMockProvisioningStore creates a new instance of MockProvisioningStore. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations.
-func NewMockProvisioningStore(t testing.TB) *MockProvisioningStore {
+func (_c *MockProvisioningStore_SetProvenance_Call) RunAndReturn(run func(context.Context, models.Provisionable, int64, models.Provenance) error) *MockProvisioningStore_SetProvenance_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// NewMockProvisioningStore creates a new instance of MockProvisioningStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewMockProvisioningStore(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *MockProvisioningStore {
 	mock := &MockProvisioningStore{}
 	mock.Mock.Test(t)
 
diff --git a/pkg/services/ngalert/provisioning/provisioning_test.go b/pkg/services/ngalert/provisioning/provisioning_test.go
new file mode 100644
index 0000000000000..f274f08b8697d
--- /dev/null
+++ b/pkg/services/ngalert/provisioning/provisioning_test.go
@@ -0,0 +1,11 @@
+package provisioning
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana/pkg/tests/testsuite"
+)
+
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
diff --git a/pkg/services/ngalert/provisioning/quota_checker_mock.go b/pkg/services/ngalert/provisioning/quota_checker_mock.go
index 368e52bd3de3f..596e6c92d614e 100644
--- a/pkg/services/ngalert/provisioning/quota_checker_mock.go
+++ b/pkg/services/ngalert/provisioning/quota_checker_mock.go
@@ -1,13 +1,12 @@
-// Code generated by mockery v2.14.0. DO NOT EDIT.
+// Code generated by mockery v2.34.2. DO NOT EDIT.
 
 package provisioning
 
 import (
 	context "context"
 
-	mock "github.com/stretchr/testify/mock"
-
 	quota "github.com/grafana/grafana/pkg/services/quota"
+	mock "github.com/stretchr/testify/mock"
 )
 
 // MockQuotaChecker is an autogenerated mock type for the QuotaChecker type
@@ -28,13 +27,16 @@ func (_m *MockQuotaChecker) CheckQuotaReached(ctx context.Context, target quota.
 	ret := _m.Called(ctx, target, scopeParams)
 
 	var r0 bool
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, quota.TargetSrv, *quota.ScopeParameters) (bool, error)); ok {
+		return rf(ctx, target, scopeParams)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, quota.TargetSrv, *quota.ScopeParameters) bool); ok {
 		r0 = rf(ctx, target, scopeParams)
 	} else {
 		r0 = ret.Get(0).(bool)
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, quota.TargetSrv, *quota.ScopeParameters) error); ok {
 		r1 = rf(ctx, target, scopeParams)
 	} else {
@@ -53,7 +55,7 @@ type MockQuotaChecker_CheckQuotaReached_Call struct {
 //   - ctx context.Context
 //   - target quota.TargetSrv
 //   - scopeParams *quota.ScopeParameters
-func (_e *MockQuotaChecker_Expecter) CheckQuotaReached(ctx any, target any, scopeParams any) *MockQuotaChecker_CheckQuotaReached_Call {
+func (_e *MockQuotaChecker_Expecter) CheckQuotaReached(ctx interface{}, target interface{}, scopeParams interface{}) *MockQuotaChecker_CheckQuotaReached_Call {
 	return &MockQuotaChecker_CheckQuotaReached_Call{Call: _e.mock.On("CheckQuotaReached", ctx, target, scopeParams)}
 }
 
@@ -69,13 +71,17 @@ func (_c *MockQuotaChecker_CheckQuotaReached_Call) Return(_a0 bool, _a1 error) *
 	return _c
 }
 
-type mockConstructorTestingTNewMockQuotaChecker interface {
-	mock.TestingT
-	Cleanup(func())
+func (_c *MockQuotaChecker_CheckQuotaReached_Call) RunAndReturn(run func(context.Context, quota.TargetSrv, *quota.ScopeParameters) (bool, error)) *MockQuotaChecker_CheckQuotaReached_Call {
+	_c.Call.Return(run)
+	return _c
 }
 
 // NewMockQuotaChecker creates a new instance of MockQuotaChecker. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewMockQuotaChecker(t mockConstructorTestingTNewMockQuotaChecker) *MockQuotaChecker {
+// The first argument is typically a *testing.T value.
+func NewMockQuotaChecker(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *MockQuotaChecker {
 	mock := &MockQuotaChecker{}
 	mock.Mock.Test(t)
 
diff --git a/pkg/services/ngalert/provisioning/templates.go b/pkg/services/ngalert/provisioning/templates.go
index 0e655224eb107..2ed37ae37230b 100644
--- a/pkg/services/ngalert/provisioning/templates.go
+++ b/pkg/services/ngalert/provisioning/templates.go
@@ -10,32 +10,42 @@ import (
 )
 
 type TemplateService struct {
-	config AMConfigStore
-	prov   ProvisioningStore
-	xact   TransactionManager
-	log    log.Logger
+	configStore     *alertmanagerConfigStoreImpl
+	provenanceStore ProvisioningStore
+	xact            TransactionManager
+	log             log.Logger
 }
 
 func NewTemplateService(config AMConfigStore, prov ProvisioningStore, xact TransactionManager, log log.Logger) *TemplateService {
 	return &TemplateService{
-		config: config,
-		prov:   prov,
-		xact:   xact,
-		log:    log,
+		configStore:     &alertmanagerConfigStoreImpl{store: config},
+		provenanceStore: prov,
+		xact:            xact,
+		log:             log,
 	}
 }
 
-func (t *TemplateService) GetTemplates(ctx context.Context, orgID int64) (map[string]string, error) {
-	revision, err := getLastConfiguration(ctx, orgID, t.config)
+func (t *TemplateService) GetTemplates(ctx context.Context, orgID int64) ([]definitions.NotificationTemplate, error) {
+	revision, err := t.configStore.Get(ctx, orgID)
 	if err != nil {
 		return nil, err
 	}
 
-	if revision.cfg.TemplateFiles == nil {
-		return map[string]string{}, nil
+	var templates []definitions.NotificationTemplate
+	for name, tmpl := range revision.cfg.TemplateFiles {
+		tmpl := definitions.NotificationTemplate{
+			Name:     name,
+			Template: tmpl,
+		}
+		provenance, err := t.provenanceStore.GetProvenance(ctx, &tmpl, orgID)
+		if err != nil {
+			return nil, err
+		}
+		tmpl.Provenance = definitions.Provenance(provenance)
+		templates = append(templates, tmpl)
 	}
 
-	return revision.cfg.TemplateFiles, nil
+	return templates, nil
 }
 
 func (t *TemplateService) SetTemplate(ctx context.Context, orgID int64, tmpl definitions.NotificationTemplate) (definitions.NotificationTemplate, error) {
@@ -44,7 +54,7 @@ func (t *TemplateService) SetTemplate(ctx context.Context, orgID int64, tmpl def
 		return definitions.NotificationTemplate{}, fmt.Errorf("%w: %s", ErrValidation, err.Error())
 	}
 
-	revision, err := getLastConfiguration(ctx, orgID, t.config)
+	revision, err := t.configStore.Get(ctx, orgID)
 	if err != nil {
 		return definitions.NotificationTemplate{}, err
 	}
@@ -53,33 +63,12 @@ func (t *TemplateService) SetTemplate(ctx context.Context, orgID int64, tmpl def
 		revision.cfg.TemplateFiles = map[string]string{}
 	}
 	revision.cfg.TemplateFiles[tmpl.Name] = tmpl.Template
-	tmpls := make([]string, 0, len(revision.cfg.TemplateFiles))
-	for name := range revision.cfg.TemplateFiles {
-		tmpls = append(tmpls, name)
-	}
-	revision.cfg.AlertmanagerConfig.Templates = tmpls
 
-	serialized, err := serializeAlertmanagerConfig(*revision.cfg)
-	if err != nil {
-		return definitions.NotificationTemplate{}, err
-	}
-	cmd := models.SaveAlertmanagerConfigurationCmd{
-		AlertmanagerConfiguration: string(serialized),
-		ConfigurationVersion:      revision.version,
-		FetchedConfigurationHash:  revision.concurrencyToken,
-		Default:                   false,
-		OrgID:                     orgID,
-	}
 	err = t.xact.InTransaction(ctx, func(ctx context.Context) error {
-		err = PersistConfig(ctx, t.config, &cmd)
-		if err != nil {
+		if err := t.configStore.Save(ctx, revision, orgID); err != nil {
 			return err
 		}
-		err = t.prov.SetProvenance(ctx, &tmpl, orgID, models.Provenance(tmpl.Provenance))
-		if err != nil {
-			return err
-		}
-		return nil
+		return t.provenanceStore.SetProvenance(ctx, &tmpl, orgID, models.Provenance(tmpl.Provenance))
 	})
 	if err != nil {
 		return definitions.NotificationTemplate{}, err
@@ -89,42 +78,20 @@ func (t *TemplateService) SetTemplate(ctx context.Context, orgID int64, tmpl def
 }
 
 func (t *TemplateService) DeleteTemplate(ctx context.Context, orgID int64, name string) error {
-	revision, err := getLastConfiguration(ctx, orgID, t.config)
+	revision, err := t.configStore.Get(ctx, orgID)
 	if err != nil {
 		return err
 	}
 
 	delete(revision.cfg.TemplateFiles, name)
 
-	serialized, err := serializeAlertmanagerConfig(*revision.cfg)
-	if err != nil {
-		return err
-	}
-
-	cmd := models.SaveAlertmanagerConfigurationCmd{
-		AlertmanagerConfiguration: string(serialized),
-		ConfigurationVersion:      revision.version,
-		FetchedConfigurationHash:  revision.concurrencyToken,
-		Default:                   false,
-		OrgID:                     orgID,
-	}
-	err = t.xact.InTransaction(ctx, func(ctx context.Context) error {
-		err = PersistConfig(ctx, t.config, &cmd)
-		if err != nil {
+	return t.xact.InTransaction(ctx, func(ctx context.Context) error {
+		if err := t.configStore.Save(ctx, revision, orgID); err != nil {
 			return err
 		}
 		tgt := definitions.NotificationTemplate{
 			Name: name,
 		}
-		err = t.prov.DeleteProvenance(ctx, &tgt, orgID)
-		if err != nil {
-			return err
-		}
-		return nil
+		return t.provenanceStore.DeleteProvenance(ctx, &tgt, orgID)
 	})
-	if err != nil {
-		return err
-	}
-
-	return nil
 }
diff --git a/pkg/services/ngalert/provisioning/templates_test.go b/pkg/services/ngalert/provisioning/templates_test.go
index 40bde70e0c6ad..6bbe9b2ca43ad 100644
--- a/pkg/services/ngalert/provisioning/templates_test.go
+++ b/pkg/services/ngalert/provisioning/templates_test.go
@@ -17,10 +17,11 @@ import (
 func TestTemplateService(t *testing.T) {
 	t.Run("service returns templates from config file", func(t *testing.T) {
 		sut := createTemplateServiceSut()
-		sut.config.(*MockAMConfigStore).EXPECT().
+		sut.configStore.store.(*MockAMConfigStore).EXPECT().
 			GetsConfig(models.AlertConfiguration{
 				AlertmanagerConfiguration: configWithTemplates,
 			})
+		sut.provenanceStore.(*MockProvisioningStore).EXPECT().GetProvenance(mock.Anything, mock.Anything, mock.Anything).Return(models.ProvenanceAPI, nil)
 
 		result, err := sut.GetTemplates(context.Background(), 1)
 
@@ -30,7 +31,7 @@ func TestTemplateService(t *testing.T) {
 
 	t.Run("service returns empty map when config file contains no templates", func(t *testing.T) {
 		sut := createTemplateServiceSut()
-		sut.config.(*MockAMConfigStore).EXPECT().
+		sut.configStore.store.(*MockAMConfigStore).EXPECT().
 			GetsConfig(models.AlertConfiguration{
 				AlertmanagerConfiguration: defaultConfig,
 			})
@@ -44,7 +45,7 @@ func TestTemplateService(t *testing.T) {
 	t.Run("service propagates errors", func(t *testing.T) {
 		t.Run("when unable to read config", func(t *testing.T) {
 			sut := createTemplateServiceSut()
-			sut.config.(*MockAMConfigStore).EXPECT().
+			sut.configStore.store.(*MockAMConfigStore).EXPECT().
 				GetLatestAlertmanagerConfiguration(mock.Anything, mock.Anything).
 				Return(nil, fmt.Errorf("failed"))
 
@@ -55,25 +56,25 @@ func TestTemplateService(t *testing.T) {
 
 		t.Run("when config is invalid", func(t *testing.T) {
 			sut := createTemplateServiceSut()
-			sut.config.(*MockAMConfigStore).EXPECT().
+			sut.configStore.store.(*MockAMConfigStore).EXPECT().
 				GetsConfig(models.AlertConfiguration{
 					AlertmanagerConfiguration: brokenConfig,
 				})
 
 			_, err := sut.GetTemplates(context.Background(), 1)
 
-			require.ErrorContains(t, err, "failed to deserialize")
+			require.Truef(t, ErrBadAlertmanagerConfiguration.Base.Is(err), "expected ErrBadAlertmanagerConfiguration but got %s", err.Error())
 		})
 
 		t.Run("when no AM config in current org", func(t *testing.T) {
 			sut := createTemplateServiceSut()
-			sut.config.(*MockAMConfigStore).EXPECT().
+			sut.configStore.store.(*MockAMConfigStore).EXPECT().
 				GetLatestAlertmanagerConfiguration(mock.Anything, mock.Anything).
 				Return(nil, nil)
 
 			_, err := sut.GetTemplates(context.Background(), 1)
 
-			require.ErrorContains(t, err, "no alertmanager configuration")
+			require.Truef(t, ErrNoAlertmanagerConfiguration.Is(err), "expected ErrNoAlertmanagerConfiguration but got %s", err.Error())
 		})
 	})
 
@@ -94,7 +95,7 @@ func TestTemplateService(t *testing.T) {
 			t.Run("when unable to read config", func(t *testing.T) {
 				sut := createTemplateServiceSut()
 				tmpl := createNotificationTemplate()
-				sut.config.(*MockAMConfigStore).EXPECT().
+				sut.configStore.store.(*MockAMConfigStore).EXPECT().
 					GetLatestAlertmanagerConfiguration(mock.Anything, mock.Anything).
 					Return(nil, fmt.Errorf("failed"))
 
@@ -106,37 +107,37 @@ func TestTemplateService(t *testing.T) {
 			t.Run("when config is invalid", func(t *testing.T) {
 				sut := createTemplateServiceSut()
 				tmpl := createNotificationTemplate()
-				sut.config.(*MockAMConfigStore).EXPECT().
+				sut.configStore.store.(*MockAMConfigStore).EXPECT().
 					GetsConfig(models.AlertConfiguration{
 						AlertmanagerConfiguration: brokenConfig,
 					})
 
 				_, err := sut.SetTemplate(context.Background(), 1, tmpl)
 
-				require.ErrorContains(t, err, "failed to deserialize")
+				require.Truef(t, ErrBadAlertmanagerConfiguration.Base.Is(err), "expected ErrBadAlertmanagerConfiguration but got %s", err.Error())
 			})
 
 			t.Run("when no AM config in current org", func(t *testing.T) {
 				sut := createTemplateServiceSut()
 				tmpl := createNotificationTemplate()
-				sut.config.(*MockAMConfigStore).EXPECT().
+				sut.configStore.store.(*MockAMConfigStore).EXPECT().
 					GetLatestAlertmanagerConfiguration(mock.Anything, mock.Anything).
 					Return(nil, nil)
 
 				_, err := sut.SetTemplate(context.Background(), 1, tmpl)
 
-				require.ErrorContains(t, err, "no alertmanager configuration")
+				require.Truef(t, ErrNoAlertmanagerConfiguration.Is(err), "expected ErrNoAlertmanagerConfiguration but got %s", err.Error())
 			})
 
 			t.Run("when provenance fails to save", func(t *testing.T) {
 				sut := createTemplateServiceSut()
 				tmpl := createNotificationTemplate()
-				sut.config.(*MockAMConfigStore).EXPECT().
+				sut.configStore.store.(*MockAMConfigStore).EXPECT().
 					GetsConfig(models.AlertConfiguration{
 						AlertmanagerConfiguration: configWithTemplates,
 					})
-				sut.config.(*MockAMConfigStore).EXPECT().SaveSucceeds()
-				sut.prov.(*MockProvisioningStore).EXPECT().
+				sut.configStore.store.(*MockAMConfigStore).EXPECT().SaveSucceeds()
+				sut.provenanceStore.(*MockProvisioningStore).EXPECT().
 					SetProvenance(mock.Anything, mock.Anything, mock.Anything, mock.Anything).
 					Return(fmt.Errorf("failed to save provenance"))
 
@@ -148,14 +149,14 @@ func TestTemplateService(t *testing.T) {
 			t.Run("when AM config fails to save", func(t *testing.T) {
 				sut := createTemplateServiceSut()
 				tmpl := createNotificationTemplate()
-				sut.config.(*MockAMConfigStore).EXPECT().
+				sut.configStore.store.(*MockAMConfigStore).EXPECT().
 					GetsConfig(models.AlertConfiguration{
 						AlertmanagerConfiguration: configWithTemplates,
 					})
-				sut.config.(*MockAMConfigStore).EXPECT().
+				sut.configStore.store.(*MockAMConfigStore).EXPECT().
 					UpdateAlertmanagerConfiguration(mock.Anything, mock.Anything).
 					Return(fmt.Errorf("failed to save config"))
-				sut.prov.(*MockProvisioningStore).EXPECT().SaveSucceeds()
+				sut.provenanceStore.(*MockProvisioningStore).EXPECT().SaveSucceeds()
 
 				_, err := sut.SetTemplate(context.Background(), 1, tmpl)
 
@@ -166,12 +167,12 @@ func TestTemplateService(t *testing.T) {
 		t.Run("adds new template to config file on success", func(t *testing.T) {
 			sut := createTemplateServiceSut()
 			tmpl := createNotificationTemplate()
-			sut.config.(*MockAMConfigStore).EXPECT().
+			sut.configStore.store.(*MockAMConfigStore).EXPECT().
 				GetsConfig(models.AlertConfiguration{
 					AlertmanagerConfiguration: configWithTemplates,
 				})
-			sut.config.(*MockAMConfigStore).EXPECT().SaveSucceeds()
-			sut.prov.(*MockProvisioningStore).EXPECT().SaveSucceeds()
+			sut.configStore.store.(*MockAMConfigStore).EXPECT().SaveSucceeds()
+			sut.provenanceStore.(*MockProvisioningStore).EXPECT().SaveSucceeds()
 
 			_, err := sut.SetTemplate(context.Background(), 1, tmpl)
 
@@ -181,12 +182,12 @@ func TestTemplateService(t *testing.T) {
 		t.Run("succeeds when stitching config file with no templates", func(t *testing.T) {
 			sut := createTemplateServiceSut()
 			tmpl := createNotificationTemplate()
-			sut.config.(*MockAMConfigStore).EXPECT().
+			sut.configStore.store.(*MockAMConfigStore).EXPECT().
 				GetsConfig(models.AlertConfiguration{
 					AlertmanagerConfiguration: defaultConfig,
 				})
-			sut.config.(*MockAMConfigStore).EXPECT().SaveSucceeds()
-			sut.prov.(*MockProvisioningStore).EXPECT().SaveSucceeds()
+			sut.configStore.store.(*MockAMConfigStore).EXPECT().SaveSucceeds()
+			sut.provenanceStore.(*MockProvisioningStore).EXPECT().SaveSucceeds()
 
 			_, err := sut.SetTemplate(context.Background(), 1, tmpl)
 
@@ -199,12 +200,12 @@ func TestTemplateService(t *testing.T) {
 				Name:     "name",
 				Template: "content",
 			}
-			sut.config.(*MockAMConfigStore).EXPECT().
+			sut.configStore.store.(*MockAMConfigStore).EXPECT().
 				GetsConfig(models.AlertConfiguration{
 					AlertmanagerConfiguration: defaultConfig,
 				})
-			sut.config.(*MockAMConfigStore).EXPECT().SaveSucceeds()
-			sut.prov.(*MockProvisioningStore).EXPECT().SaveSucceeds()
+			sut.configStore.store.(*MockAMConfigStore).EXPECT().SaveSucceeds()
+			sut.provenanceStore.(*MockProvisioningStore).EXPECT().SaveSucceeds()
 
 			result, _ := sut.SetTemplate(context.Background(), 1, tmpl)
 
@@ -218,12 +219,12 @@ func TestTemplateService(t *testing.T) {
 				Name:     "name",
 				Template: "{{define \"name\"}}content{{end}}",
 			}
-			sut.config.(*MockAMConfigStore).EXPECT().
+			sut.configStore.store.(*MockAMConfigStore).EXPECT().
 				GetsConfig(models.AlertConfiguration{
 					AlertmanagerConfiguration: defaultConfig,
 				})
-			sut.config.(*MockAMConfigStore).EXPECT().SaveSucceeds()
-			sut.prov.(*MockProvisioningStore).EXPECT().SaveSucceeds()
+			sut.configStore.store.(*MockAMConfigStore).EXPECT().SaveSucceeds()
+			sut.provenanceStore.(*MockProvisioningStore).EXPECT().SaveSucceeds()
 
 			result, _ := sut.SetTemplate(context.Background(), 1, tmpl)
 
@@ -236,12 +237,12 @@ func TestTemplateService(t *testing.T) {
 				Name:     "name",
 				Template: "{{ .MyField }",
 			}
-			sut.config.(*MockAMConfigStore).EXPECT().
+			sut.configStore.store.(*MockAMConfigStore).EXPECT().
 				GetsConfig(models.AlertConfiguration{
 					AlertmanagerConfiguration: defaultConfig,
 				})
-			sut.config.(*MockAMConfigStore).EXPECT().SaveSucceeds()
-			sut.prov.(*MockProvisioningStore).EXPECT().SaveSucceeds()
+			sut.configStore.store.(*MockAMConfigStore).EXPECT().SaveSucceeds()
+			sut.provenanceStore.(*MockProvisioningStore).EXPECT().SaveSucceeds()
 
 			_, err := sut.SetTemplate(context.Background(), 1, tmpl)
 
@@ -254,12 +255,12 @@ func TestTemplateService(t *testing.T) {
 				Name:     "name",
 				Template: "{{ .NotAField }}",
 			}
-			sut.config.(*MockAMConfigStore).EXPECT().
+			sut.configStore.store.(*MockAMConfigStore).EXPECT().
 				GetsConfig(models.AlertConfiguration{
 					AlertmanagerConfiguration: defaultConfig,
 				})
-			sut.config.(*MockAMConfigStore).EXPECT().SaveSucceeds()
-			sut.prov.(*MockProvisioningStore).EXPECT().SaveSucceeds()
+			sut.configStore.store.(*MockAMConfigStore).EXPECT().SaveSucceeds()
+			sut.provenanceStore.(*MockProvisioningStore).EXPECT().SaveSucceeds()
 
 			_, err := sut.SetTemplate(context.Background(), 1, tmpl)
 
@@ -271,7 +272,7 @@ func TestTemplateService(t *testing.T) {
 		t.Run("propagates errors", func(t *testing.T) {
 			t.Run("when unable to read config", func(t *testing.T) {
 				sut := createTemplateServiceSut()
-				sut.config.(*MockAMConfigStore).EXPECT().
+				sut.configStore.store.(*MockAMConfigStore).EXPECT().
 					GetLatestAlertmanagerConfiguration(mock.Anything, mock.Anything).
 					Return(nil, fmt.Errorf("failed"))
 
@@ -282,35 +283,35 @@ func TestTemplateService(t *testing.T) {
 
 			t.Run("when config is invalid", func(t *testing.T) {
 				sut := createTemplateServiceSut()
-				sut.config.(*MockAMConfigStore).EXPECT().
+				sut.configStore.store.(*MockAMConfigStore).EXPECT().
 					GetsConfig(models.AlertConfiguration{
 						AlertmanagerConfiguration: brokenConfig,
 					})
 
 				err := sut.DeleteTemplate(context.Background(), 1, "template")
 
-				require.ErrorContains(t, err, "failed to deserialize")
+				require.Truef(t, ErrBadAlertmanagerConfiguration.Base.Is(err), "expected ErrBadAlertmanagerConfiguration but got %s", err.Error())
 			})
 
 			t.Run("when no AM config in current org", func(t *testing.T) {
 				sut := createTemplateServiceSut()
-				sut.config.(*MockAMConfigStore).EXPECT().
+				sut.configStore.store.(*MockAMConfigStore).EXPECT().
 					GetLatestAlertmanagerConfiguration(mock.Anything, mock.Anything).
 					Return(nil, nil)
 
 				err := sut.DeleteTemplate(context.Background(), 1, "template")
 
-				require.ErrorContains(t, err, "no alertmanager configuration")
+				require.Truef(t, ErrNoAlertmanagerConfiguration.Is(err), "expected ErrNoAlertmanagerConfiguration but got %s", err.Error())
 			})
 
 			t.Run("when provenance fails to save", func(t *testing.T) {
 				sut := createTemplateServiceSut()
-				sut.config.(*MockAMConfigStore).EXPECT().
+				sut.configStore.store.(*MockAMConfigStore).EXPECT().
 					GetsConfig(models.AlertConfiguration{
 						AlertmanagerConfiguration: configWithTemplates,
 					})
-				sut.config.(*MockAMConfigStore).EXPECT().SaveSucceeds()
-				sut.prov.(*MockProvisioningStore).EXPECT().
+				sut.configStore.store.(*MockAMConfigStore).EXPECT().SaveSucceeds()
+				sut.provenanceStore.(*MockProvisioningStore).EXPECT().
 					DeleteProvenance(mock.Anything, mock.Anything, mock.Anything).
 					Return(fmt.Errorf("failed to save provenance"))
 
@@ -321,14 +322,14 @@ func TestTemplateService(t *testing.T) {
 
 			t.Run("when AM config fails to save", func(t *testing.T) {
 				sut := createTemplateServiceSut()
-				sut.config.(*MockAMConfigStore).EXPECT().
+				sut.configStore.store.(*MockAMConfigStore).EXPECT().
 					GetsConfig(models.AlertConfiguration{
 						AlertmanagerConfiguration: configWithTemplates,
 					})
-				sut.config.(*MockAMConfigStore).EXPECT().
+				sut.configStore.store.(*MockAMConfigStore).EXPECT().
 					UpdateAlertmanagerConfiguration(mock.Anything, mock.Anything).
 					Return(fmt.Errorf("failed to save config"))
-				sut.prov.(*MockProvisioningStore).EXPECT().SaveSucceeds()
+				sut.provenanceStore.(*MockProvisioningStore).EXPECT().SaveSucceeds()
 
 				err := sut.DeleteTemplate(context.Background(), 1, "template")
 
@@ -338,12 +339,12 @@ func TestTemplateService(t *testing.T) {
 
 		t.Run("deletes template from config file on success", func(t *testing.T) {
 			sut := createTemplateServiceSut()
-			sut.config.(*MockAMConfigStore).EXPECT().
+			sut.configStore.store.(*MockAMConfigStore).EXPECT().
 				GetsConfig(models.AlertConfiguration{
 					AlertmanagerConfiguration: configWithTemplates,
 				})
-			sut.config.(*MockAMConfigStore).EXPECT().SaveSucceeds()
-			sut.prov.(*MockProvisioningStore).EXPECT().SaveSucceeds()
+			sut.configStore.store.(*MockAMConfigStore).EXPECT().SaveSucceeds()
+			sut.provenanceStore.(*MockProvisioningStore).EXPECT().SaveSucceeds()
 
 			err := sut.DeleteTemplate(context.Background(), 1, "a")
 
@@ -352,12 +353,12 @@ func TestTemplateService(t *testing.T) {
 
 		t.Run("does not error when deleting templates that do not exist", func(t *testing.T) {
 			sut := createTemplateServiceSut()
-			sut.config.(*MockAMConfigStore).EXPECT().
+			sut.configStore.store.(*MockAMConfigStore).EXPECT().
 				GetsConfig(models.AlertConfiguration{
 					AlertmanagerConfiguration: configWithTemplates,
 				})
-			sut.config.(*MockAMConfigStore).EXPECT().SaveSucceeds()
-			sut.prov.(*MockProvisioningStore).EXPECT().SaveSucceeds()
+			sut.configStore.store.(*MockAMConfigStore).EXPECT().SaveSucceeds()
+			sut.provenanceStore.(*MockProvisioningStore).EXPECT().SaveSucceeds()
 
 			err := sut.DeleteTemplate(context.Background(), 1, "does not exist")
 
@@ -366,12 +367,12 @@ func TestTemplateService(t *testing.T) {
 
 		t.Run("succeeds when deleting from config file with no template section", func(t *testing.T) {
 			sut := createTemplateServiceSut()
-			sut.config.(*MockAMConfigStore).EXPECT().
+			sut.configStore.store.(*MockAMConfigStore).EXPECT().
 				GetsConfig(models.AlertConfiguration{
 					AlertmanagerConfiguration: defaultConfig,
 				})
-			sut.config.(*MockAMConfigStore).EXPECT().SaveSucceeds()
-			sut.prov.(*MockProvisioningStore).EXPECT().SaveSucceeds()
+			sut.configStore.store.(*MockAMConfigStore).EXPECT().SaveSucceeds()
+			sut.provenanceStore.(*MockProvisioningStore).EXPECT().SaveSucceeds()
 
 			err := sut.DeleteTemplate(context.Background(), 1, "a")
 
@@ -382,10 +383,10 @@ func TestTemplateService(t *testing.T) {
 
 func createTemplateServiceSut() *TemplateService {
 	return &TemplateService{
-		config: &MockAMConfigStore{},
-		prov:   &MockProvisioningStore{},
-		xact:   newNopTransactionManager(),
-		log:    log.NewNopLogger(),
+		configStore:     &alertmanagerConfigStoreImpl{store: &MockAMConfigStore{}},
+		provenanceStore: &MockProvisioningStore{},
+		xact:            newNopTransactionManager(),
+		log:             log.NewNopLogger(),
 	}
 }
 
diff --git a/pkg/services/ngalert/provisioning/testing.go b/pkg/services/ngalert/provisioning/testing.go
index 62eef7a319665..62e6128319eb8 100644
--- a/pkg/services/ngalert/provisioning/testing.go
+++ b/pkg/services/ngalert/provisioning/testing.go
@@ -2,13 +2,16 @@ package provisioning
 
 import (
 	"context"
-	"crypto/md5"
-	"fmt"
-	"strings"
+	"sync"
+	"testing"
 
+	"github.com/stretchr/testify/assert"
 	mock "github.com/stretchr/testify/mock"
 
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/notifier"
+	"github.com/grafana/grafana/pkg/services/ngalert/store"
 )
 
 const defaultAlertmanagerConfigJSON = `
@@ -29,8 +32,8 @@ const defaultAlertmanagerConfigJSON = `
 		"receivers": [{
 			"name": "grafana-default-email",
 			"grafana_managed_receiver_configs": [{
-				"uid": "",
-				"name": "email receiver",
+				"uid": "UID1",
+				"name": "grafana-default-email",
 				"type": "email",
 				"disableResolveMessage": false,
 				"settings": {
@@ -39,9 +42,9 @@ const defaultAlertmanagerConfigJSON = `
 				"secureFields": {}
 			}]
 		}, {
-			"name": "a new receiver",
+			"name": "slack receiver",
 			"grafana_managed_receiver_configs": [{
-				"uid": "",
+				"uid": "UID2",
 				"name": "slack receiver",
 				"type": "slack",
 				"disableResolveMessage": false,
@@ -53,96 +56,18 @@ const defaultAlertmanagerConfigJSON = `
 }
 `
 
-type fakeAMConfigStore struct {
-	config          models.AlertConfiguration
-	lastSaveCommand *models.SaveAlertmanagerConfigurationCmd
-}
-
-func newFakeAMConfigStore(config string) *fakeAMConfigStore {
-	return &fakeAMConfigStore{
-		config: models.AlertConfiguration{
-			AlertmanagerConfiguration: config,
-			ConfigurationVersion:      "v1",
-			Default:                   true,
-			OrgID:                     1,
-		},
-		lastSaveCommand: nil,
-	}
-}
-
-func (f *fakeAMConfigStore) GetLatestAlertmanagerConfiguration(ctx context.Context, query *models.GetLatestAlertmanagerConfigurationQuery) (*models.AlertConfiguration, error) {
-	result := &f.config
-	result.OrgID = query.OrgID
-	result.ConfigurationHash = fmt.Sprintf("%x", md5.Sum([]byte(f.config.AlertmanagerConfiguration)))
-	return result, nil
-}
-
-func (f *fakeAMConfigStore) UpdateAlertmanagerConfiguration(ctx context.Context, cmd *models.SaveAlertmanagerConfigurationCmd) error {
-	f.config = models.AlertConfiguration{
-		AlertmanagerConfiguration: cmd.AlertmanagerConfiguration,
-		ConfigurationVersion:      cmd.ConfigurationVersion,
-		Default:                   cmd.Default,
-		OrgID:                     cmd.OrgID,
-	}
-	f.lastSaveCommand = cmd
-	return nil
-}
-
-type fakeProvisioningStore struct {
-	records map[int64]map[string]models.Provenance
-}
-
-func NewFakeProvisioningStore() *fakeProvisioningStore {
-	return &fakeProvisioningStore{
-		records: map[int64]map[string]models.Provenance{},
-	}
-}
-
-func (f *fakeProvisioningStore) GetProvenance(ctx context.Context, o models.Provisionable, org int64) (models.Provenance, error) {
-	if val, ok := f.records[org]; ok {
-		if prov, ok := val[o.ResourceID()+o.ResourceType()]; ok {
-			return prov, nil
-		}
-	}
-	return models.ProvenanceNone, nil
-}
-
-func (f *fakeProvisioningStore) GetProvenances(ctx context.Context, orgID int64, resourceType string) (map[string]models.Provenance, error) {
-	results := make(map[string]models.Provenance)
-	if val, ok := f.records[orgID]; ok {
-		for k, v := range val {
-			if strings.HasSuffix(k, resourceType) {
-				results[strings.TrimSuffix(k, resourceType)] = v
-			}
-		}
-	}
-	return results, nil
-}
-
-func (f *fakeProvisioningStore) SetProvenance(ctx context.Context, o models.Provisionable, org int64, p models.Provenance) error {
-	if _, ok := f.records[org]; !ok {
-		f.records[org] = map[string]models.Provenance{}
-	}
-	_ = f.DeleteProvenance(ctx, o, org) // delete old entries first
-	f.records[org][o.ResourceID()+o.ResourceType()] = p
-	return nil
-}
-
-func (f *fakeProvisioningStore) DeleteProvenance(ctx context.Context, o models.Provisionable, org int64) error {
-	if val, ok := f.records[org]; ok {
-		delete(val, o.ResourceID()+o.ResourceType())
-	}
-	return nil
-}
-
 type NopTransactionManager struct{}
 
 func newNopTransactionManager() *NopTransactionManager {
 	return &NopTransactionManager{}
 }
 
+func assertInTransaction(t *testing.T, ctx context.Context) {
+	assert.Truef(t, ctx.Value(NopTransactionManager{}) != nil, "Expected to be executed in transaction but there is none")
+}
+
 func (n *NopTransactionManager) InTransaction(ctx context.Context, work func(ctx context.Context) error) error {
-	return work(ctx)
+	return work(context.WithValue(ctx, NopTransactionManager{}, struct{}{}))
 }
 
 func (m *MockAMConfigStore_Expecter) GetsConfig(ac models.AlertConfiguration) *MockAMConfigStore_Expecter {
@@ -185,3 +110,101 @@ func (m *MockQuotaChecker_Expecter) LimitExceeded() *MockQuotaChecker_Expecter {
 	m.CheckQuotaReached(mock.Anything, mock.Anything, mock.Anything).Return(true, nil)
 	return m
 }
+
+type methodCall struct {
+	Method string
+	Args   []interface{}
+}
+
+type alertmanagerConfigStoreFake struct {
+	Calls  []methodCall
+	GetFn  func(ctx context.Context, orgID int64) (*cfgRevision, error)
+	SaveFn func(ctx context.Context, revision *cfgRevision) error
+}
+
+func (a *alertmanagerConfigStoreFake) Get(ctx context.Context, orgID int64) (*cfgRevision, error) {
+	a.Calls = append(a.Calls, methodCall{
+		Method: "Get",
+		Args:   []interface{}{ctx, orgID},
+	})
+	if a.GetFn != nil {
+		return a.GetFn(ctx, orgID)
+	}
+	return nil, nil
+}
+
+func (a *alertmanagerConfigStoreFake) Save(ctx context.Context, revision *cfgRevision, orgID int64) error {
+	a.Calls = append(a.Calls, methodCall{
+		Method: "Save",
+		Args:   []interface{}{ctx, revision, orgID},
+	})
+	if a.SaveFn != nil {
+		return a.SaveFn(ctx, revision)
+	}
+	return nil
+}
+
+type NotificationSettingsValidatorProviderFake struct {
+}
+
+func (n *NotificationSettingsValidatorProviderFake) Validator(ctx context.Context, orgID int64) (notifier.NotificationSettingsValidator, error) {
+	return notifier.NoValidation{}, nil
+}
+
+type call struct {
+	Method string
+	Args   []interface{}
+}
+
+type fakeRuleAccessControlService struct {
+	mu                             sync.Mutex
+	Calls                          []call
+	AuthorizeAccessToRuleGroupFunc func(ctx context.Context, user identity.Requester, rules models.RulesGroup) error
+	AuthorizeRuleChangesFunc       func(ctx context.Context, user identity.Requester, change *store.GroupDelta) error
+	CanReadAllRulesFunc            func(ctx context.Context, user identity.Requester) (bool, error)
+	CanWriteAllRulesFunc           func(ctx context.Context, user identity.Requester) (bool, error)
+}
+
+func (s *fakeRuleAccessControlService) RecordCall(method string, args ...interface{}) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
+	call := call{
+		Method: method,
+		Args:   args,
+	}
+
+	s.Calls = append(s.Calls, call)
+}
+
+func (s *fakeRuleAccessControlService) AuthorizeRuleGroupRead(ctx context.Context, user identity.Requester, rules models.RulesGroup) error {
+	s.RecordCall("AuthorizeRuleGroupRead", ctx, user, rules)
+	if s.AuthorizeAccessToRuleGroupFunc != nil {
+		return s.AuthorizeAccessToRuleGroupFunc(ctx, user, rules)
+	}
+	return nil
+}
+
+func (s *fakeRuleAccessControlService) AuthorizeRuleGroupWrite(ctx context.Context, user identity.Requester, change *store.GroupDelta) error {
+	s.RecordCall("AuthorizeRuleGroupWrite", ctx, user, change)
+	if s.AuthorizeRuleChangesFunc != nil {
+		return s.AuthorizeRuleChangesFunc(ctx, user, change)
+	}
+	return nil
+}
+
+func (s *fakeRuleAccessControlService) CanReadAllRules(ctx context.Context, user identity.Requester) (bool, error) {
+	s.RecordCall("CanReadAllRules", ctx, user)
+	if s.CanReadAllRulesFunc != nil {
+		return s.CanReadAllRulesFunc(ctx, user)
+	}
+	return false, nil
+}
+
+func (s *fakeRuleAccessControlService) CanWriteAllRules(ctx context.Context, user identity.Requester) (bool, error) {
+	s.RecordCall("CanWriteAllRules", ctx, user)
+	if s.CanWriteAllRulesFunc != nil {
+		return s.CanWriteAllRulesFunc(ctx, user)
+	}
+	return false, nil
+}
diff --git a/pkg/services/ngalert/remote/alertmanager.go b/pkg/services/ngalert/remote/alertmanager.go
index cd31e04024b99..74f29a363af4a 100644
--- a/pkg/services/ngalert/remote/alertmanager.go
+++ b/pkg/services/ngalert/remote/alertmanager.go
@@ -2,141 +2,246 @@ package remote
 
 import (
 	"context"
+	"crypto/md5"
+	"encoding/base64"
+	"encoding/json"
 	"fmt"
-	"io"
 	"net/http"
 	"net/url"
-	"strings"
-	"time"
 
-	httptransport "github.com/go-openapi/runtime/client"
 	"github.com/go-openapi/strfmt"
+	amalert "github.com/prometheus/alertmanager/api/v2/client/alert"
+	amalertgroup "github.com/prometheus/alertmanager/api/v2/client/alertgroup"
+	amreceiver "github.com/prometheus/alertmanager/api/v2/client/receiver"
+	amsilence "github.com/prometheus/alertmanager/api/v2/client/silence"
+
 	"github.com/grafana/grafana/pkg/infra/log"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/notifier"
+	remoteClient "github.com/grafana/grafana/pkg/services/ngalert/remote/client"
 	"github.com/grafana/grafana/pkg/services/ngalert/sender"
-	amclient "github.com/prometheus/alertmanager/api/v2/client"
-	amalert "github.com/prometheus/alertmanager/api/v2/client/alert"
-	amalertgroup "github.com/prometheus/alertmanager/api/v2/client/alertgroup"
-	amreceiver "github.com/prometheus/alertmanager/api/v2/client/receiver"
-	amsilence "github.com/prometheus/alertmanager/api/v2/client/silence"
+
+	alertingClusterPB "github.com/grafana/alerting/cluster/clusterpb"
 )
 
-const readyPath = "/-/ready"
+type stateStore interface {
+	GetSilences(ctx context.Context) (string, error)
+	GetNotificationLog(ctx context.Context) (string, error)
+}
+
+// DecryptFn is a function that takes in an encrypted value and returns it decrypted.
+type DecryptFn func(ctx context.Context, payload []byte) ([]byte, error)
 
 type Alertmanager struct {
+	decrypt  DecryptFn
 	log      log.Logger
+	metrics  *metrics.RemoteAlertmanager
 	orgID    int64
+	ready    bool
+	sender   *sender.ExternalAlertmanager
+	state    stateStore
 	tenantID string
 	url      string
 
-	amClient   *amclient.AlertmanagerAPI
-	httpClient *http.Client
-	ready      bool
-	sender     *sender.ExternalAlertmanager
+	amClient    *remoteClient.Alertmanager
+	mimirClient remoteClient.MimirClient
 }
 
 type AlertmanagerConfig struct {
+	OrgID             int64
 	URL               string
 	TenantID          string
 	BasicAuthPassword string
 }
 
-func NewAlertmanager(cfg AlertmanagerConfig, orgID int64) (*Alertmanager, error) {
-	client := http.Client{
-		Transport: &roundTripper{
-			tenantID:          cfg.TenantID,
-			basicAuthPassword: cfg.BasicAuthPassword,
-			next:              http.DefaultTransport,
-		},
+func (cfg *AlertmanagerConfig) Validate() error {
+	if cfg.OrgID == 0 {
+		return fmt.Errorf("orgID for remote Alertmanager not set")
+	}
+
+	if cfg.TenantID == "" {
+		return fmt.Errorf("empty remote Alertmanager tenantID")
 	}
 
 	if cfg.URL == "" {
-		return nil, fmt.Errorf("empty URL for tenant %s", cfg.TenantID)
+		return fmt.Errorf("empty remote Alertmanager URL for tenant '%s'", cfg.TenantID)
+	}
+	return nil
+}
+
+func NewAlertmanager(cfg AlertmanagerConfig, store stateStore, decryptFn DecryptFn, metrics *metrics.RemoteAlertmanager) (*Alertmanager, error) {
+	if err := cfg.Validate(); err != nil {
+		return nil, err
 	}
 
 	u, err := url.Parse(cfg.URL)
+	if err != nil {
+		return nil, fmt.Errorf("unable to parse remote Alertmanager URL: %w", err)
+	}
+	logger := log.New("ngalert.remote.alertmanager")
+
+	mcCfg := &remoteClient.Config{
+		URL:      u,
+		TenantID: cfg.TenantID,
+		Password: cfg.BasicAuthPassword,
+		Logger:   logger,
+	}
+	mc, err := remoteClient.New(mcCfg, metrics)
 	if err != nil {
 		return nil, err
 	}
 
-	u = u.JoinPath(amclient.DefaultBasePath)
-	transport := httptransport.NewWithClient(u.Host, u.Path, []string{u.Scheme}, &client)
+	amcCfg := &remoteClient.AlertmanagerConfig{
+		URL:      u,
+		TenantID: cfg.TenantID,
+		Password: cfg.BasicAuthPassword,
+		Logger:   logger,
+	}
+	amc, err := remoteClient.NewAlertmanager(amcCfg, metrics)
+	if err != nil {
+		return nil, err
+	}
 
-	// Using our client with custom headers and basic auth credentials.
+	// Configure and start the components that sends alerts.
+	c := amc.GetAuthedClient()
 	doFunc := func(ctx context.Context, _ *http.Client, req *http.Request) (*http.Response, error) {
-		return client.Do(req.WithContext(ctx))
+		return c.Do(req.WithContext(ctx))
 	}
 	s := sender.NewExternalAlertmanagerSender(sender.WithDoFunc(doFunc))
 	s.Run()
-
-	err = s.ApplyConfig(orgID, 0, []sender.ExternalAMcfg{{
-		URL: cfg.URL,
-	}})
+	err = s.ApplyConfig(cfg.OrgID, 0, []sender.ExternalAMcfg{{URL: cfg.URL + "/alertmanager"}})
 	if err != nil {
 		return nil, err
 	}
 
+	// Initialize LastReadinessCheck so it's present even if the check fails.
+	metrics.LastReadinessCheck.Set(0)
+
 	return &Alertmanager{
-		amClient:   amclient.New(transport, nil),
-		httpClient: &client,
-		log:        log.New("ngalert.remote.alertmanager"),
-		sender:     s,
-		orgID:      orgID,
-		tenantID:   cfg.TenantID,
-		url:        cfg.URL,
+		amClient:    amc,
+		decrypt:     decryptFn,
+		log:         logger,
+		metrics:     metrics,
+		mimirClient: mc,
+		orgID:       cfg.OrgID,
+		state:       store,
+		sender:      s,
+		tenantID:    cfg.TenantID,
+		url:         cfg.URL,
 	}, nil
 }
 
+// ApplyConfig is called everytime we've determined we need to apply an existing configuration to the Alertmanager,
+// including the first time the Alertmanager is started. In the context of a "remote Alertmanager" it's as good of a heuristic,
+// for "a function that gets called when the Alertmanager starts". As a result we do two things:
+// 1. Execute a readiness check to make sure the remote Alertmanager we're about to communicate with is up and ready.
+// 2. Upload the configuration and state we currently hold.
 func (am *Alertmanager) ApplyConfig(ctx context.Context, config *models.AlertConfiguration) error {
 	if am.ready {
+		am.log.Debug("Alertmanager previously marked as ready, skipping readiness check and config + state update")
 		return nil
 	}
 
-	return am.checkReadiness(ctx)
+	// First, execute a readiness check to make sure the remote Alertmanager is ready.
+	am.log.Debug("Start readiness check for remote Alertmanager", "url", am.url)
+	if err := am.checkReadiness(ctx); err != nil {
+		am.log.Error("Unable to pass the readiness check", "err", err)
+		return err
+	}
+	am.log.Debug("Completed readiness check for remote Alertmanager", "url", am.url)
+
+	// Send configuration and base64-encoded state if necessary.
+	am.log.Debug("Start configuration upload to remote Alertmanager", "url", am.url)
+	if err := am.CompareAndSendConfiguration(ctx, config); err != nil {
+		am.log.Error("Unable to upload the configuration to the remote Alertmanager", "err", err)
+	}
+	am.log.Debug("Completed configuration upload to remote Alertmanager", "url", am.url)
+
+	am.log.Debug("Start state upload to remote Alertmanager", "url", am.url)
+	if err := am.CompareAndSendState(ctx); err != nil {
+		am.log.Error("Unable to upload the state to the remote Alertmanager", "err", err)
+	}
+	am.log.Debug("Completed state upload to remote Alertmanager", "url", am.url)
+
+	return nil
 }
 
 func (am *Alertmanager) checkReadiness(ctx context.Context) error {
-	readyURL := strings.TrimSuffix(am.url, "/") + readyPath
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, readyURL, nil)
+	ready, err := am.amClient.IsReadyWithBackoff(ctx)
+	if err != nil {
+		return err
+	}
+
+	if ready {
+		am.log.Debug("Alertmanager readiness check successful")
+		am.metrics.LastReadinessCheck.SetToCurrentTime()
+		am.ready = true
+		return nil
+	}
+
+	return notifier.ErrAlertmanagerNotReady
+}
+
+// CompareAndSendConfiguration checks whether a given configuration is being used by the remote Alertmanager.
+// If not, it sends the configuration to the remote Alertmanager.
+func (am *Alertmanager) CompareAndSendConfiguration(ctx context.Context, config *models.AlertConfiguration) error {
+	c, err := notifier.Load([]byte(config.AlertmanagerConfiguration))
 	if err != nil {
-		return fmt.Errorf("error creating readiness request: %w", err)
+		return err
 	}
 
-	res, err := am.httpClient.Do(req)
+	// Decrypt the configuration before comparing.
+	fn := func(payload []byte) ([]byte, error) {
+		return am.decrypt(ctx, payload)
+	}
+	decrypted, err := c.Decrypt(fn)
 	if err != nil {
-		return fmt.Errorf("error performing readiness check: %w", err)
+		return err
+	}
+	rawDecrypted, err := json.Marshal(decrypted)
+	if err != nil {
+		return err
 	}
 
-	defer func() {
-		if err := res.Body.Close(); err != nil {
-			am.log.Warn("Error closing response body", "err", err)
-		}
-	}()
+	// Send the configuration only if we need to.
+	if !am.shouldSendConfig(ctx, rawDecrypted) {
+		return nil
+	}
+
+	am.metrics.ConfigSyncsTotal.Inc()
+	if err := am.mimirClient.CreateGrafanaAlertmanagerConfig(
+		ctx,
+		string(rawDecrypted),
+		config.ConfigurationHash,
+		config.CreatedAt,
+		config.Default,
+	); err != nil {
+		am.metrics.ConfigSyncErrorsTotal.Inc()
+		return err
+	}
+	am.metrics.LastConfigSync.SetToCurrentTime()
+	return nil
+}
+
+// CompareAndSendState gets the Alertmanager's internal state and compares it with the remote Alertmanager's one.
+// If the states are different, it updates the remote Alertmanager's state with that of the internal Alertmanager.
+func (am *Alertmanager) CompareAndSendState(ctx context.Context) error {
+	state, err := am.getFullState(ctx)
+	if err != nil {
+		return err
+	}
 
-	if res.StatusCode != http.StatusOK {
-		return fmt.Errorf("%w, status code: %d", notifier.ErrAlertmanagerNotReady, res.StatusCode)
-	}
-
-	// Wait for active senders.
-	var attempts int
-	ticker := time.NewTicker(100 * time.Millisecond)
-	defer ticker.Stop()
-
-	for {
-		select {
-		case <-ticker.C:
-			attempts++
-			if len(am.sender.Alertmanagers()) > 0 {
-				am.log.Debug("Alertmanager readiness check successful", "attempts", attempts)
-				am.ready = true
-				return nil
-			}
-		case <-time.After(10 * time.Second):
-			return notifier.ErrAlertmanagerNotReady
+	if am.shouldSendState(ctx, state) {
+		am.metrics.StateSyncsTotal.Inc()
+		if err := am.mimirClient.CreateGrafanaAlertmanagerState(ctx, state); err != nil {
+			am.metrics.StateSyncErrorsTotal.Inc()
+			return err
 		}
+		am.metrics.LastStateSync.SetToCurrentTime()
 	}
+	return nil
 }
 
 func (am *Alertmanager) SaveAndApplyConfig(ctx context.Context, cfg *apimodels.PostableUserConfig) error {
@@ -286,6 +391,8 @@ func (am *Alertmanager) TestTemplate(ctx context.Context, c apimodels.TestTempla
 	return &notifier.TestTemplatesResults{}, nil
 }
 
+// StopAndWait is called when the grafana server is instructed to shut down or an org is deleted.
+// In the context of a "remote Alertmanager" it is a good heuristic for Grafana is about to shut down or we no longer need you.
 func (am *Alertmanager) StopAndWait() {
 	am.sender.Stop()
 }
@@ -294,60 +401,58 @@ func (am *Alertmanager) Ready() bool {
 	return am.ready
 }
 
-// We don't have files on disk, no-op.
+// CleanUp does not have an equivalent in a "remote Alertmanager" context, we don't have files on disk, no-op.
 func (am *Alertmanager) CleanUp() {}
 
-func (am *Alertmanager) OrgID() int64 {
-	return am.orgID
-}
+// getFullState returns a base64-encoded protobuf message representing the Alertmanager's internal state.
+func (am *Alertmanager) getFullState(ctx context.Context) (string, error) {
+	var parts []alertingClusterPB.Part
 
-type roundTripper struct {
-	tenantID          string
-	basicAuthPassword string
-	next              http.RoundTripper
-}
-
-// RoundTrip implements the http.RoundTripper interface
-// while adding the `X-Scope-OrgID` header and basic auth credentials.
-func (r *roundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
-	req.Header.Set("X-Scope-OrgID", r.tenantID)
-	if r.tenantID != "" && r.basicAuthPassword != "" {
-		req.SetBasicAuth(r.tenantID, r.basicAuthPassword)
+	silences, err := am.state.GetSilences(ctx)
+	if err != nil {
+		return "", fmt.Errorf("error getting silences: %w", err)
 	}
+	parts = append(parts, alertingClusterPB.Part{Key: notifier.SilencesFilename, Data: []byte(silences)})
 
-	return r.next.RoundTrip(req)
-}
-
-// TODO: change implementation, this is only useful for testing other methods.
-func (am *Alertmanager) postConfig(ctx context.Context, rawConfig string) error {
-	alertsURL := strings.TrimSuffix(am.url, "/alertmanager") + "/api/v1/alerts"
-	req, err := http.NewRequestWithContext(ctx, http.MethodPost, alertsURL, strings.NewReader(rawConfig))
+	notificationLog, err := am.state.GetNotificationLog(ctx)
 	if err != nil {
-		return fmt.Errorf("error creating request: %v", err)
+		return "", fmt.Errorf("error getting notification log: %w", err)
 	}
+	parts = append(parts, alertingClusterPB.Part{Key: notifier.NotificationLogFilename, Data: []byte(notificationLog)})
 
-	res, err := am.httpClient.Do(req)
+	fs := alertingClusterPB.FullState{
+		Parts: parts,
+	}
+	b, err := fs.Marshal()
 	if err != nil {
-		return err
+		return "", fmt.Errorf("error marshaling full state: %w", err)
 	}
 
-	if res.StatusCode == http.StatusNotFound {
-		return fmt.Errorf("config not found")
+	return base64.StdEncoding.EncodeToString(b), nil
+}
+
+// shouldSendConfig compares the remote Alertmanager configuration with our local one.
+// It returns true if the configurations are different.
+func (am *Alertmanager) shouldSendConfig(ctx context.Context, rawConfig []byte) bool {
+	rc, err := am.mimirClient.GetGrafanaAlertmanagerConfig(ctx)
+	if err != nil {
+		// Log the error and return true so we try to upload our config anyway.
+		am.log.Error("Unable to get the remote Alertmanager Configuration for comparison", "err", err)
+		return true
 	}
 
-	defer func() {
-		if err := res.Body.Close(); err != nil {
-			am.log.Warn("Error while closing body", "err", err)
-		}
-	}()
+	return md5.Sum([]byte(rc.GrafanaAlertmanagerConfig)) != md5.Sum(rawConfig)
+}
 
-	_, err = io.ReadAll(res.Body)
+// shouldSendState compares the remote Alertmanager state with our local one.
+// It returns true if the states are different.
+func (am *Alertmanager) shouldSendState(ctx context.Context, state string) bool {
+	rs, err := am.mimirClient.GetGrafanaAlertmanagerState(ctx)
 	if err != nil {
-		return fmt.Errorf("error reading request response: %w", err)
+		// Log the error and return true so we try to upload our state anyway.
+		am.log.Error("Unable to get the remote Alertmanager state for comparison", "err", err)
+		return true
 	}
 
-	if res.StatusCode != http.StatusCreated {
-		return fmt.Errorf("setting config failed with status code %d", res.StatusCode)
-	}
-	return nil
+	return rs.State != state
 }
diff --git a/pkg/services/ngalert/remote/alertmanager_test.go b/pkg/services/ngalert/remote/alertmanager_test.go
index 822c2c6f05a6e..bfd6deef0af76 100644
--- a/pkg/services/ngalert/remote/alertmanager_test.go
+++ b/pkg/services/ngalert/remote/alertmanager_test.go
@@ -2,20 +2,47 @@ package remote
 
 import (
 	"context"
+	"crypto/md5"
+	"encoding/base64"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
 	"math/rand"
+	"net/http"
+	"net/http/httptest"
 	"os"
+	"strings"
 	"testing"
 	"time"
 
 	"github.com/go-openapi/strfmt"
-	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
-	"github.com/grafana/grafana/pkg/util"
 	amv2 "github.com/prometheus/alertmanager/api/v2/models"
+	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/infra/db"
+	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
+	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/notifier"
+	"github.com/grafana/grafana/pkg/services/ngalert/remote/client"
+	ngfakes "github.com/grafana/grafana/pkg/services/ngalert/tests/fakes"
+	"github.com/grafana/grafana/pkg/services/secrets"
+	"github.com/grafana/grafana/pkg/services/secrets/database"
+	"github.com/grafana/grafana/pkg/services/secrets/fakes"
+	secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
+	"github.com/grafana/grafana/pkg/util"
 )
 
-// Valid config for Cloud AM, no `grafana_managed_receievers` field.
-const upstreamConfig = `{"template_files": {}, "alertmanager_config": "{\"global\": {\"smtp_from\": \"test@test.com\"}, \"route\": {\"receiver\": \"discord\"}, \"receivers\": [{\"name\": \"discord\", \"discord_configs\": [{\"webhook_url\": \"http://localhost:1234\"}]}]}"}`
+// Valid Grafana Alertmanager configurations.
+const testGrafanaConfig = `{"template_files":{},"alertmanager_config":{"route":{"receiver":"grafana-default-email","group_by":["grafana_folder","alertname"]},"templates":null,"receivers":[{"name":"grafana-default-email","grafana_managed_receiver_configs":[{"uid":"","name":"some other name","type":"email","disableResolveMessage":false,"settings":{"addresses":"\u003cexample@email.com\u003e"},"secureSettings":null}]}]}}`
+const testGrafanaConfigWithSecret = `{"template_files":{},"alertmanager_config":{"route":{"receiver":"grafana-default-email","group_by":["grafana_folder","alertname"]},"templates":null,"receivers":[{"name":"grafana-default-email","grafana_managed_receiver_configs":[{"uid":"dde6ntuob69dtf","name":"WH","type":"webhook","disableResolveMessage":false,"settings":{"url":"http://localhost:8080","username":"test"},"secureSettings":{"password":"test"}}]}]}}`
+
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
 
 func TestNewAlertmanager(t *testing.T) {
 	tests := []struct {
@@ -32,7 +59,15 @@ func TestNewAlertmanager(t *testing.T) {
 			tenantID: "1234",
 			password: "test",
 			orgID:    1,
-			expErr:   "empty URL for tenant 1234",
+			expErr:   "empty remote Alertmanager URL for tenant '1234'",
+		},
+		{
+			name:     "invalid URL",
+			url:      "asdasd%sasdsd",
+			tenantID: "1234",
+			password: "test",
+			orgID:    1,
+			expErr:   "unable to parse remote Alertmanager URL: parse \"asdasd%sasdsd\": invalid URL escape \"%sa\"",
 		},
 		{
 			name:     "valid parameters",
@@ -43,14 +78,17 @@ func TestNewAlertmanager(t *testing.T) {
 		},
 	}
 
+	secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore())
 	for _, test := range tests {
 		t.Run(test.name, func(tt *testing.T) {
 			cfg := AlertmanagerConfig{
+				OrgID:             test.orgID,
 				URL:               test.url,
 				TenantID:          test.tenantID,
 				BasicAuthPassword: test.password,
 			}
-			am, err := NewAlertmanager(cfg, test.orgID)
+			m := metrics.NewRemoteAlertmanagerMetrics(prometheus.NewRegistry())
+			am, err := NewAlertmanager(cfg, nil, secretsService.Decrypt, m)
 			if test.expErr != "" {
 				require.EqualError(tt, err, test.expErr)
 				return
@@ -59,13 +97,280 @@ func TestNewAlertmanager(t *testing.T) {
 			require.NoError(tt, err)
 			require.Equal(tt, am.tenantID, test.tenantID)
 			require.Equal(tt, am.url, test.url)
-			require.Equal(tt, am.OrgID(), test.orgID)
+			require.Equal(tt, am.orgID, test.orgID)
 			require.NotNil(tt, am.amClient)
-			require.NotNil(tt, am.httpClient)
 		})
 	}
 }
 
+func TestApplyConfig(t *testing.T) {
+	errorHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusInternalServerError)
+	})
+
+	var configSent string
+	okHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.Method == http.MethodPost && strings.Contains(r.URL.Path, "/config") {
+			var c client.UserGrafanaConfig
+			require.NoError(t, json.NewDecoder(r.Body).Decode(&c))
+			configSent = c.GrafanaAlertmanagerConfig
+		}
+
+		w.WriteHeader(http.StatusOK)
+	})
+
+	// Encrypt receivers to save secrets in the database.
+	var c apimodels.PostableUserConfig
+	require.NoError(t, json.Unmarshal([]byte(testGrafanaConfigWithSecret), &c))
+	secretsService := secretsManager.SetupTestService(t, database.ProvideSecretsStore(db.InitTestDB(t)))
+	err := notifier.EncryptReceiverConfigs(c.AlertmanagerConfig.Receivers, func(ctx context.Context, payload []byte) ([]byte, error) {
+		return secretsService.Encrypt(ctx, payload, secrets.WithoutScope())
+	})
+	require.NoError(t, err)
+
+	// The encrypted configuration should be different than the one we will send.
+	encryptedConfig, err := json.Marshal(c)
+	require.NoError(t, err)
+	require.NotEqual(t, testGrafanaConfig, encryptedConfig)
+
+	// ApplyConfig performs a readiness check at startup.
+	// A non-200 response should result in an error.
+	server := httptest.NewServer(errorHandler)
+	cfg := AlertmanagerConfig{
+		OrgID:    1,
+		TenantID: "test",
+		URL:      server.URL,
+	}
+
+	ctx := context.Background()
+	store := ngfakes.NewFakeKVStore(t)
+	fstore := notifier.NewFileStore(1, store)
+	require.NoError(t, store.Set(ctx, cfg.OrgID, "alertmanager", notifier.SilencesFilename, "test"))
+	require.NoError(t, store.Set(ctx, cfg.OrgID, "alertmanager", notifier.NotificationLogFilename, "test"))
+
+	// An error response from the remote Alertmanager should result in the readiness check failing.
+	m := metrics.NewRemoteAlertmanagerMetrics(prometheus.NewRegistry())
+	am, err := NewAlertmanager(cfg, fstore, secretsService.Decrypt, m)
+	require.NoError(t, err)
+
+	config := &ngmodels.AlertConfiguration{
+		AlertmanagerConfiguration: string(encryptedConfig),
+	}
+	require.Error(t, am.ApplyConfig(ctx, config))
+	require.False(t, am.Ready())
+
+	// A 200 status code response should make the check succeed.
+	server.Config.Handler = okHandler
+	require.NoError(t, am.ApplyConfig(ctx, config))
+	require.True(t, am.Ready())
+
+	// Secrets in the sent configuration should be unencrypted.
+	require.JSONEq(t, testGrafanaConfigWithSecret, configSent)
+
+	// If we already got a 200 status code response, we shouldn't make the HTTP request again.
+	server.Config.Handler = errorHandler
+	require.NoError(t, am.ApplyConfig(ctx, config))
+	require.True(t, am.Ready())
+}
+
+func TestCompareAndSendConfiguration(t *testing.T) {
+	testValue := []byte("test")
+	testErr := errors.New("test error")
+	decryptFn := func(_ context.Context, payload []byte) ([]byte, error) {
+		if string(payload) == string(testValue) {
+			return testValue, nil
+		}
+		return nil, testErr
+	}
+
+	var got string
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Add("content-type", "application/json")
+
+		b, err := io.ReadAll(r.Body)
+		require.NoError(t, err)
+		require.NoError(t, r.Body.Close())
+		got = string(b)
+
+		_, err = w.Write([]byte(`{"status": "success"}`))
+		require.NoError(t, err)
+	}))
+
+	fstore := notifier.NewFileStore(1, ngfakes.NewFakeKVStore(t))
+	m := metrics.NewRemoteAlertmanagerMetrics(prometheus.NewRegistry())
+	cfg := AlertmanagerConfig{
+		OrgID:    1,
+		TenantID: "test",
+		URL:      server.URL,
+	}
+	am, err := NewAlertmanager(cfg,
+		fstore,
+		decryptFn,
+		m,
+	)
+	require.NoError(t, err)
+
+	tests := []struct {
+		name   string
+		config string
+		expCfg *client.UserGrafanaConfig
+		expErr string
+	}{
+		{
+			"invalid config",
+			"{}",
+			nil,
+			"unable to parse Alertmanager configuration: no route provided in config",
+		},
+		{
+			"invalid base-64 in key",
+			strings.Replace(testGrafanaConfigWithSecret, `"password":"test"`, `"password":"!"`, 1),
+			nil,
+			"failed to decode value for key 'password': illegal base64 data at input byte 0",
+		},
+		{
+			"decrypt error",
+			testGrafanaConfigWithSecret,
+			nil,
+			fmt.Sprintf("failed to decrypt value for key 'password': %s", testErr.Error()),
+		},
+		{
+			"no error",
+			strings.Replace(testGrafanaConfigWithSecret, `"password":"test"`, fmt.Sprintf("%q:%q", "password", base64.StdEncoding.EncodeToString(testValue)), 1),
+			&client.UserGrafanaConfig{
+				GrafanaAlertmanagerConfig: testGrafanaConfigWithSecret,
+			},
+			"",
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(tt *testing.T) {
+			cfg := ngmodels.AlertConfiguration{
+				AlertmanagerConfiguration: test.config,
+			}
+			err = am.CompareAndSendConfiguration(context.Background(), &cfg)
+			if test.expErr == "" {
+				require.NoError(tt, err)
+				rawCfg, err := json.Marshal(test.expCfg)
+				require.NoError(tt, err)
+				require.JSONEq(tt, string(rawCfg), got)
+				return
+			}
+			require.Equal(tt, test.expErr, err.Error())
+		})
+	}
+}
+
+func TestIntegrationRemoteAlertmanagerApplyConfigOnlyUploadsOnce(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	amURL, ok := os.LookupEnv("AM_URL")
+	if !ok {
+		t.Skip("No Alertmanager URL provided")
+	}
+	tenantID := os.Getenv("AM_TENANT_ID")
+	password := os.Getenv("AM_PASSWORD")
+
+	// ApplyConfig performs a readiness check.
+	cfg := AlertmanagerConfig{
+		OrgID:             1,
+		URL:               amURL,
+		TenantID:          tenantID,
+		BasicAuthPassword: password,
+	}
+
+	fakeConfigHash := fmt.Sprintf("%x", md5.Sum([]byte(testGrafanaConfig)))
+	fakeConfigCreatedAt := time.Date(2020, 6, 5, 12, 6, 0, 0, time.UTC).Unix()
+	fakeConfig := &ngmodels.AlertConfiguration{
+		AlertmanagerConfiguration: testGrafanaConfig,
+		ConfigurationHash:         fakeConfigHash,
+		ConfigurationVersion:      "v2",
+		CreatedAt:                 fakeConfigCreatedAt,
+		Default:                   true,
+		OrgID:                     1,
+	}
+
+	silences := []byte("test-silences")
+	nflog := []byte("test-notifications")
+	store := ngfakes.NewFakeKVStore(t)
+	fstore := notifier.NewFileStore(cfg.OrgID, store)
+
+	ctx := context.Background()
+	require.NoError(t, store.Set(ctx, cfg.OrgID, "alertmanager", notifier.SilencesFilename, base64.StdEncoding.EncodeToString(silences)))
+	require.NoError(t, store.Set(ctx, cfg.OrgID, "alertmanager", notifier.NotificationLogFilename, base64.StdEncoding.EncodeToString(nflog)))
+
+	secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore())
+	m := metrics.NewRemoteAlertmanagerMetrics(prometheus.NewRegistry())
+	am, err := NewAlertmanager(cfg, fstore, secretsService.Decrypt, m)
+	require.NoError(t, err)
+
+	encodedFullState, err := am.getFullState(ctx)
+	require.NoError(t, err)
+
+	// We should have no configuration or state at first.
+	{
+		_, err := am.mimirClient.GetGrafanaAlertmanagerConfig(ctx)
+		require.Error(t, err)
+		require.Equal(t, "Error response from the Mimir API: alertmanager storage object not found", err.Error())
+
+		_, err = am.mimirClient.GetGrafanaAlertmanagerState(ctx)
+		require.Error(t, err)
+		require.Equal(t, "Error response from the Mimir API: alertmanager storage object not found", err.Error())
+	}
+
+	// Using `ApplyConfig` as a heuristic of a function that gets called when the Alertmanager starts
+	// We call it as if the Alertmanager were starting.
+	{
+		require.NoError(t, am.ApplyConfig(ctx, fakeConfig))
+
+		// First, we need to verify that the readiness check passes.
+		require.True(t, am.Ready())
+
+		// Next, we need to verify that Mimir received both the configuration and state.
+		config, err := am.mimirClient.GetGrafanaAlertmanagerConfig(ctx)
+		require.NoError(t, err)
+		require.Equal(t, testGrafanaConfig, config.GrafanaAlertmanagerConfig)
+		require.Equal(t, fakeConfigHash, config.Hash)
+		require.Equal(t, fakeConfigCreatedAt, config.CreatedAt)
+		require.Equal(t, true, config.Default)
+
+		state, err := am.mimirClient.GetGrafanaAlertmanagerState(ctx)
+		require.NoError(t, err)
+		require.Equal(t, encodedFullState, state.State)
+	}
+
+	// Calling `ApplyConfig` again with a changed configuration and state yields no effect.
+	{
+		require.NoError(t, store.Set(ctx, cfg.OrgID, "alertmanager", "silences", base64.StdEncoding.EncodeToString([]byte("abc123"))))
+		require.NoError(t, store.Set(ctx, cfg.OrgID, "alertmanager", "notifications", base64.StdEncoding.EncodeToString([]byte("abc123"))))
+		fakeConfig.ID = 30000000000000000
+		require.NoError(t, am.ApplyConfig(ctx, fakeConfig))
+
+		// The remote Alertmanager continues to be ready.
+		require.True(t, am.Ready())
+
+		// Next, we need to verify that the config that was uploaded remains the same.
+		config, err := am.mimirClient.GetGrafanaAlertmanagerConfig(ctx)
+		require.NoError(t, err)
+		require.Equal(t, testGrafanaConfig, config.GrafanaAlertmanagerConfig)
+		require.Equal(t, fakeConfigHash, config.Hash)
+		require.Equal(t, fakeConfigCreatedAt, config.CreatedAt)
+		require.Equal(t, true, config.Default)
+
+		// Check that the state is the same as before.
+		state, err := am.mimirClient.GetGrafanaAlertmanagerState(ctx)
+		require.NoError(t, err)
+		require.Equal(t, encodedFullState, state.State)
+	}
+
+	// TODO: Now, shutdown the Alertmanager and we expect the latest configuration to be uploaded.
+	{
+	}
+}
+
 func TestIntegrationRemoteAlertmanagerSilences(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
@@ -79,11 +384,15 @@ func TestIntegrationRemoteAlertmanagerSilences(t *testing.T) {
 	password := os.Getenv("AM_PASSWORD")
 
 	cfg := AlertmanagerConfig{
-		URL:               amURL + "/alertmanager",
+		OrgID:             1,
+		URL:               amURL,
 		TenantID:          tenantID,
 		BasicAuthPassword: password,
 	}
-	am, err := NewAlertmanager(cfg, 1)
+
+	secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore())
+	m := metrics.NewRemoteAlertmanagerMetrics(prometheus.NewRegistry())
+	am, err := NewAlertmanager(cfg, nil, secretsService.Decrypt, m)
 	require.NoError(t, err)
 
 	// We should have no silences at first.
@@ -158,16 +467,23 @@ func TestIntegrationRemoteAlertmanagerAlerts(t *testing.T) {
 	password := os.Getenv("AM_PASSWORD")
 
 	cfg := AlertmanagerConfig{
-		URL:               amURL + "/alertmanager",
+		OrgID:             1,
+		URL:               amURL,
 		TenantID:          tenantID,
 		BasicAuthPassword: password,
 	}
-	am, err := NewAlertmanager(cfg, 1)
+
+	secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore())
+	m := metrics.NewRemoteAlertmanagerMetrics(prometheus.NewRegistry())
+	am, err := NewAlertmanager(cfg, nil, secretsService.Decrypt, m)
 	require.NoError(t, err)
 
 	// Wait until the Alertmanager is ready to send alerts.
 	require.NoError(t, am.checkReadiness(context.Background()))
 	require.True(t, am.Ready())
+	require.Eventually(t, func() bool {
+		return len(am.sender.Alertmanagers()) > 0
+	}, 10*time.Second, 500*time.Millisecond)
 
 	// We should have no alerts and no groups at first.
 	alerts, err := am.GetAlerts(context.Background(), true, true, true, []string{}, "")
@@ -219,26 +535,21 @@ func TestIntegrationRemoteAlertmanagerReceivers(t *testing.T) {
 	password := os.Getenv("AM_PASSWORD")
 
 	cfg := AlertmanagerConfig{
-		URL:               amURL + "/alertmanager",
+		OrgID:             1,
+		URL:               amURL,
 		TenantID:          tenantID,
 		BasicAuthPassword: password,
 	}
 
-	am, err := NewAlertmanager(cfg, 1)
+	secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore())
+	m := metrics.NewRemoteAlertmanagerMetrics(prometheus.NewRegistry())
+	am, err := NewAlertmanager(cfg, nil, secretsService.Decrypt, m)
 	require.NoError(t, err)
 
 	// We should start with the default config.
 	rcvs, err := am.GetReceivers(context.Background())
 	require.NoError(t, err)
 	require.Equal(t, "empty-receiver", *rcvs[0].Name)
-
-	// After changing the configuration, we should have a new `discord` receiver.
-	require.NoError(t, am.postConfig(context.Background(), upstreamConfig))
-	require.Eventually(t, func() bool {
-		rcvs, err = am.GetReceivers(context.Background())
-		require.NoError(t, err)
-		return *rcvs[0].Name == "discord"
-	}, 16*time.Second, 1*time.Second)
 }
 
 func genSilence(createdBy string) apimodels.PostableSilence {
diff --git a/pkg/services/ngalert/remote/client/alertmanager.go b/pkg/services/ngalert/remote/client/alertmanager.go
new file mode 100644
index 0000000000000..88a7ca7638b31
--- /dev/null
+++ b/pkg/services/ngalert/remote/client/alertmanager.go
@@ -0,0 +1,124 @@
+package client
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"net/url"
+	"time"
+
+	httptransport "github.com/go-openapi/runtime/client"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/ngalert/client"
+	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
+	amclient "github.com/prometheus/alertmanager/api/v2/client"
+)
+
+const alertmanagerAPIMountPath = "/alertmanager"
+const alertmanagerReadyPath = "/-/ready"
+
+type AlertmanagerConfig struct {
+	TenantID string
+	Password string
+	URL      *url.URL
+	Logger   log.Logger
+}
+
+type Alertmanager struct {
+	*amclient.AlertmanagerAPI
+	httpClient client.Requester
+	url        *url.URL
+	logger     log.Logger
+}
+
+func NewAlertmanager(cfg *AlertmanagerConfig, metrics *metrics.RemoteAlertmanager) (*Alertmanager, error) {
+	// First, add the authentication middleware.
+	c := &http.Client{Transport: &MimirAuthRoundTripper{
+		TenantID: cfg.TenantID,
+		Password: cfg.Password,
+		Next:     http.DefaultTransport,
+	}}
+
+	tc := client.NewTimedClient(c, metrics.RequestLatency)
+	apiEndpoint := *cfg.URL
+
+	// Next, make sure you set the right path.
+	u := apiEndpoint.JoinPath(alertmanagerAPIMountPath, amclient.DefaultBasePath)
+
+	// Create an Alertmanager client using the timed client as the transport.
+	r := httptransport.New(u.Host, u.Path, []string{u.Scheme})
+	r.Transport = tc
+
+	return &Alertmanager{
+		logger:          cfg.Logger,
+		url:             cfg.URL,
+		AlertmanagerAPI: amclient.New(r, nil),
+		httpClient:      tc,
+	}, nil
+}
+
+// GetAuthedClient returns a client.Requester that includes a configured MimirAuthRoundTripper.
+// Requests using this client are fully authenticated.
+func (am *Alertmanager) GetAuthedClient() client.Requester {
+	return am.httpClient
+}
+
+// IsReadyWithBackoff executes a readiness check against the `/-/ready` Alertmanager endpoint.
+// If it takes more than 10s to get a response back - we abort the check.
+func (am *Alertmanager) IsReadyWithBackoff(ctx context.Context) (bool, error) {
+	ctx, cancel := context.WithCancel(ctx)
+	defer cancel()
+
+	readyURL := am.url.JoinPath(am.url.Path, alertmanagerAPIMountPath, alertmanagerReadyPath)
+
+	attempt := func() (int, error) {
+		req, err := http.NewRequestWithContext(ctx, http.MethodGet, readyURL.String(), nil)
+		if err != nil {
+			return 0, fmt.Errorf("error creating the readiness request: %w", err)
+		}
+
+		res, err := am.httpClient.Do(req)
+		if err != nil {
+			return 0, fmt.Errorf("error performing the readiness check: %w", err)
+		}
+
+		defer func() {
+			if err := res.Body.Close(); err != nil {
+				am.logger.Warn("Error closing response body", "err", err)
+			}
+		}()
+
+		return res.StatusCode, nil
+	}
+
+	var attempts int
+	ticker := time.NewTicker(100 * time.Millisecond)
+	deadlineCh := time.After(10 * time.Second)
+	defer ticker.Stop()
+
+	for {
+		select {
+		case <-ticker.C:
+			attempts++
+			status, err := attempt()
+			if err != nil {
+				am.logger.Debug("Ready check attempt failed", "attempt", attempts, "err", err)
+				continue
+			}
+
+			if status != http.StatusOK {
+				if status >= 400 && status < 500 {
+					am.logger.Debug("Ready check failed with non-retriable status code", "attempt", attempts, "status", status)
+					return false, fmt.Errorf("ready check failed with non-retriable status code %d", status)
+				}
+				am.logger.Debug("Ready check failed, status code is not 200", "attempt", attempts, "status", status, "err", err)
+				continue
+			}
+
+			return true, nil
+		case <-deadlineCh:
+			cancel()
+			return false, fmt.Errorf("ready check timed out after %d attempts", attempts)
+		}
+	}
+}
diff --git a/pkg/services/ngalert/remote/client/alertmanager_configuration.go b/pkg/services/ngalert/remote/client/alertmanager_configuration.go
new file mode 100644
index 0000000000000..6ddf6dfdaaedc
--- /dev/null
+++ b/pkg/services/ngalert/remote/client/alertmanager_configuration.go
@@ -0,0 +1,57 @@
+package client
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+)
+
+const (
+	grafanaAlertmanagerConfigPath = "/api/v1/grafana/config"
+)
+
+type UserGrafanaConfig struct {
+	GrafanaAlertmanagerConfig string `json:"configuration"`
+	Hash                      string `json:"configuration_hash"`
+	CreatedAt                 int64  `json:"created"`
+	Default                   bool   `json:"default"`
+}
+
+func (mc *Mimir) GetGrafanaAlertmanagerConfig(ctx context.Context) (*UserGrafanaConfig, error) {
+	gc := &UserGrafanaConfig{}
+	response := successResponse{
+		Data: gc,
+	}
+	// nolint:bodyclose
+	// closed within `do`
+	_, err := mc.do(ctx, grafanaAlertmanagerConfigPath, http.MethodGet, nil, &response)
+	if err != nil {
+		return nil, err
+	}
+
+	if response.Status != "success" {
+		return nil, fmt.Errorf("returned non-success `status` from the MimirAPI: %s", response.Status)
+	}
+
+	return gc, nil
+}
+
+func (mc *Mimir) CreateGrafanaAlertmanagerConfig(ctx context.Context, cfg, hash string, createdAt int64, isDefault bool) error {
+	payload, err := json.Marshal(&UserGrafanaConfig{
+		GrafanaAlertmanagerConfig: cfg,
+		Hash:                      hash,
+		CreatedAt:                 createdAt,
+		Default:                   isDefault,
+	})
+	if err != nil {
+		return err
+	}
+
+	return mc.doOK(ctx, grafanaAlertmanagerConfigPath, http.MethodPost, bytes.NewBuffer(payload))
+}
+
+func (mc *Mimir) DeleteGrafanaAlertmanagerConfig(ctx context.Context) error {
+	return mc.doOK(ctx, grafanaAlertmanagerConfigPath, http.MethodDelete, nil)
+}
diff --git a/pkg/services/ngalert/remote/client/alertmanager_state.go b/pkg/services/ngalert/remote/client/alertmanager_state.go
new file mode 100644
index 0000000000000..cac59c0119217
--- /dev/null
+++ b/pkg/services/ngalert/remote/client/alertmanager_state.go
@@ -0,0 +1,51 @@
+package client
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+)
+
+const (
+	grafanaAlertmanagerStatePath = "/api/v1/grafana/state"
+)
+
+type UserGrafanaState struct {
+	State string `json:"state"`
+}
+
+func (mc *Mimir) GetGrafanaAlertmanagerState(ctx context.Context) (*UserGrafanaState, error) {
+	gs := &UserGrafanaState{}
+	response := successResponse{
+		Data: gs,
+	}
+	// nolint:bodyclose
+	// closed within `do`
+	_, err := mc.do(ctx, grafanaAlertmanagerStatePath, http.MethodGet, nil, &response)
+	if err != nil {
+		return nil, err
+	}
+
+	if response.Status != "success" {
+		return nil, fmt.Errorf("returned non-success `status` from the MimirAPI: %s", response.Status)
+	}
+
+	return gs, nil
+}
+
+func (mc *Mimir) CreateGrafanaAlertmanagerState(ctx context.Context, state string) error {
+	payload, err := json.Marshal(&UserGrafanaState{
+		State: state,
+	})
+	if err != nil {
+		return err
+	}
+
+	return mc.doOK(ctx, grafanaAlertmanagerStatePath, http.MethodPost, bytes.NewBuffer(payload))
+}
+
+func (mc *Mimir) DeleteGrafanaAlertmanagerState(ctx context.Context) error {
+	return mc.doOK(ctx, grafanaAlertmanagerStatePath, http.MethodDelete, nil)
+}
diff --git a/pkg/services/ngalert/remote/client/mimir.go b/pkg/services/ngalert/remote/client/mimir.go
new file mode 100644
index 0000000000000..b74d1df91fe85
--- /dev/null
+++ b/pkg/services/ngalert/remote/client/mimir.go
@@ -0,0 +1,178 @@
+package client
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"path"
+	"strings"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/ngalert/client"
+	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
+)
+
+// MimirClient contains all the methods to query the migration critical endpoints of Mimir instance, it's an interface to allow multiple implementations.
+type MimirClient interface {
+	GetGrafanaAlertmanagerState(ctx context.Context) (*UserGrafanaState, error)
+	CreateGrafanaAlertmanagerState(ctx context.Context, state string) error
+	DeleteGrafanaAlertmanagerState(ctx context.Context) error
+
+	GetGrafanaAlertmanagerConfig(ctx context.Context) (*UserGrafanaConfig, error)
+	CreateGrafanaAlertmanagerConfig(ctx context.Context, configuration, hash string, createdAt int64, isDefault bool) error
+	DeleteGrafanaAlertmanagerConfig(ctx context.Context) error
+}
+
+type Mimir struct {
+	client   client.Requester
+	endpoint *url.URL
+	logger   log.Logger
+	metrics  *metrics.RemoteAlertmanager
+}
+
+type Config struct {
+	URL      *url.URL
+	TenantID string
+	Password string
+
+	Logger log.Logger
+}
+
+// successResponse represents a successful response from the Mimir API.
+type successResponse struct {
+	Status string `json:"status"`
+	Data   any    `json:"data"`
+}
+
+// errorResponse represents an error from the Mimir API.
+type errorResponse struct {
+	Status string `json:"status"`
+	Error1 string `json:"error"`
+	Error2 string `json:"Error"`
+}
+
+func (e *errorResponse) Error() string {
+	if e.Error1 != "" {
+		return e.Error1
+	}
+
+	return e.Error2
+}
+
+func New(cfg *Config, metrics *metrics.RemoteAlertmanager) (*Mimir, error) {
+	rt := &MimirAuthRoundTripper{
+		TenantID: cfg.TenantID,
+		Password: cfg.Password,
+		Next:     http.DefaultTransport,
+	}
+
+	c := &http.Client{
+		Transport: rt,
+	}
+
+	return &Mimir{
+		endpoint: cfg.URL,
+		client:   client.NewTimedClient(c, metrics.RequestLatency),
+		logger:   cfg.Logger,
+		metrics:  metrics,
+	}, nil
+}
+
+// do execute an HTTP requests against the specified path and method using the specified payload.
+// It returns the HTTP response.
+func (mc *Mimir) do(ctx context.Context, p, method string, payload io.Reader, out any) (*http.Response, error) {
+	pathURL, err := url.Parse(p)
+	if err != nil {
+		return nil, err
+	}
+
+	endpoint := *mc.endpoint
+	endpoint.Path = path.Join(endpoint.Path, pathURL.Path)
+
+	r, err := http.NewRequestWithContext(ctx, method, endpoint.String(), payload)
+	if err != nil {
+		return nil, err
+	}
+
+	r.Header.Set("Accept", "application/json")
+	r.Header.Set("Content-Type", "application/json")
+
+	resp, err := mc.client.Do(r)
+	if err != nil {
+		msg := "Unable to fulfill request to the Mimir API"
+		mc.logger.Error(msg, "err", err, "url", r.URL.String(), "method", r.Method)
+		return nil, fmt.Errorf("%s: %w", msg, err)
+	}
+	defer func() {
+		if err := resp.Body.Close(); err != nil {
+			mc.logger.Error("Error closing HTTP body", "err", err, "url", r.URL.String(), "method", r.Method)
+		}
+	}()
+
+	ct := resp.Header.Get("Content-Type")
+	if !strings.HasPrefix(ct, "application/json") {
+		msg := "Response content-type is not application/json"
+		mc.logger.Error(msg, "content-type", "url", r.URL.String(), "method", r.Method, ct, "status", resp.StatusCode)
+		return nil, fmt.Errorf("%s: %s", msg, ct)
+	}
+
+	if out == nil {
+		return resp, nil
+	}
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		msg := "Failed to read the request body"
+		mc.logger.Error(msg, "err", err, "url", r.URL.String(), "method", r.Method, "status", resp.StatusCode)
+		return nil, fmt.Errorf("%s: %w", msg, err)
+	}
+
+	if resp.StatusCode/100 != 2 {
+		errResponse := &errorResponse{}
+		err = json.Unmarshal(body, errResponse)
+
+		if err == nil && errResponse.Error() != "" {
+			msg := "Error response from the Mimir API"
+			mc.logger.Error(msg, "err", errResponse, "url", r.URL.String(), "method", r.Method, "status", resp.StatusCode)
+			return nil, fmt.Errorf("%s: %w", msg, errResponse)
+		}
+
+		msg := "Failed to decode non-2xx JSON response"
+		mc.logger.Error(msg, "err", err, "url", r.URL.String(), "method", r.Method, "status", resp.StatusCode)
+		return nil, fmt.Errorf("%s: %w", msg, err)
+	}
+
+	if err = json.Unmarshal(body, out); err != nil {
+		msg := "Failed to decode 2xx JSON response"
+		mc.logger.Error(msg, "err", err, "url", r.URL.String(), "method", r.Method, "status", resp.StatusCode)
+		return nil, fmt.Errorf("%s: %w", msg, err)
+	}
+
+	return resp, nil
+}
+
+func (mc *Mimir) doOK(ctx context.Context, p, method string, payload io.Reader) error {
+	var sr successResponse
+	resp, err := mc.do(ctx, p, method, payload, &sr)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		if err := resp.Body.Close(); err != nil {
+			mc.logger.Error("Error closing HTTP body", "err", err)
+		}
+	}()
+
+	switch sr.Status {
+	case "success":
+		return nil
+	case "error":
+		return errors.New("received an 2xx status code but the request body reflected an error")
+	default:
+		return fmt.Errorf("received an unknown status from the request body: %s", sr.Status)
+	}
+}
diff --git a/pkg/services/ngalert/remote/client/mimir_auth_round_tripper.go b/pkg/services/ngalert/remote/client/mimir_auth_round_tripper.go
new file mode 100644
index 0000000000000..821eabd58ee17
--- /dev/null
+++ b/pkg/services/ngalert/remote/client/mimir_auth_round_tripper.go
@@ -0,0 +1,28 @@
+package client
+
+import (
+	"net/http"
+)
+
+const mimirTenantHeader = "X-Scope-OrgID"
+
+type MimirAuthRoundTripper struct {
+	TenantID string
+	Password string
+	Next     http.RoundTripper
+}
+
+// RoundTrip implements the http.RoundTripper interface
+// It adds an `X-Scope-OrgID` header with the TenantID if only provided with a tenantID or sets HTTP Basic Authentication if both
+// a tenantID and a password are provided.
+func (r *MimirAuthRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
+	if r.TenantID != "" && r.Password == "" {
+		req.Header.Set(mimirTenantHeader, r.TenantID)
+	}
+
+	if r.TenantID != "" && r.Password != "" {
+		req.SetBasicAuth(r.TenantID, r.Password)
+	}
+
+	return r.Next.RoundTrip(req)
+}
diff --git a/pkg/services/ngalert/remote/forked_alertmanager_test.go b/pkg/services/ngalert/remote/forked_alertmanager_test.go
new file mode 100644
index 0000000000000..b9ae3d28b6679
--- /dev/null
+++ b/pkg/services/ngalert/remote/forked_alertmanager_test.go
@@ -0,0 +1,659 @@
+package remote
+
+import (
+	"context"
+	"errors"
+	"testing"
+	"time"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/notifier"
+	"github.com/grafana/grafana/pkg/services/ngalert/notifier/alertmanager_mock"
+	remote_alertmanager_mock "github.com/grafana/grafana/pkg/services/ngalert/remote/mock"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+)
+
+const (
+	modeRemoteSecondary = iota
+	modeRemotePrimary
+)
+
+func TestForkedAlertmanager_ModeRemoteSecondary(t *testing.T) {
+	ctx := context.Background()
+	expErr := errors.New("test error")
+
+	t.Run("ApplyConfig", func(tt *testing.T) {
+		{
+			// If the remote Alertmanager is not ready, ApplyConfig should be called on both Alertmanagers.
+			internal, remote, forked := genTestAlertmanagersWithSyncInterval(tt, modeRemoteSecondary, 10*time.Minute)
+			internal.EXPECT().ApplyConfig(ctx, mock.Anything).Return(nil).Once()
+			readyCall := remote.EXPECT().Ready().Return(false).Once()
+			remote.EXPECT().ApplyConfig(ctx, mock.Anything).Return(nil).Once().NotBefore(readyCall)
+			require.NoError(tt, forked.ApplyConfig(ctx, &models.AlertConfiguration{}))
+
+			// Calling ApplyConfig again with a ready remote Alertmanager before the sync interval is elapsed
+			// should result in the forked Alertmanager calling ApplyConfig on the internal Alertmanager.
+			internal.EXPECT().ApplyConfig(ctx, mock.Anything).Return(nil).Once()
+			remote.EXPECT().Ready().Return(true).Once()
+			require.NoError(tt, forked.ApplyConfig(ctx, &models.AlertConfiguration{}))
+		}
+
+		{
+			// If the remote Alertmanager is ready and the sync interval has elapsed,
+			// the forked Alertmanager should sync state and configuration on the remote Alertmanager
+			// and call ApplyConfig only on the internal Alertmanager.
+			internal, remote, forked := genTestAlertmanagersWithSyncInterval(tt, modeRemoteSecondary, 0)
+			internal.EXPECT().ApplyConfig(ctx, mock.Anything).Return(nil).Twice()
+			remote.EXPECT().Ready().Return(true).Twice()
+			remote.EXPECT().CompareAndSendConfiguration(ctx, mock.Anything).Return(nil).Twice()
+			remote.EXPECT().CompareAndSendState(ctx).Return(nil).Twice()
+			require.NoError(tt, forked.ApplyConfig(ctx, &models.AlertConfiguration{}))
+			require.NoError(tt, forked.ApplyConfig(ctx, &models.AlertConfiguration{}))
+		}
+
+		{
+			// An error in the remote Alertmanager should not be returned,
+			// but it should result in the forked Alertmanager trying to sync
+			// configuration and state in the next call to ApplyConfig, regardless of the sync interval.
+			internal, remote, forked := genTestAlertmanagersWithSyncInterval(tt, modeRemoteSecondary, 10*time.Minute)
+			internal.EXPECT().ApplyConfig(ctx, mock.Anything).Return(nil).Twice()
+			remote.EXPECT().Ready().Return(false).Twice()
+			remote.EXPECT().ApplyConfig(ctx, mock.Anything).Return(expErr).Twice()
+			require.NoError(tt, forked.ApplyConfig(ctx, &models.AlertConfiguration{}))
+			require.NoError(tt, forked.ApplyConfig(ctx, &models.AlertConfiguration{}))
+
+			// Let's try the same thing but starting from a ready Alertmanager.
+			internal, remote, forked = genTestAlertmanagersWithSyncInterval(tt, modeRemoteSecondary, 10*time.Minute)
+			internal.EXPECT().ApplyConfig(ctx, mock.Anything).Return(nil).Twice()
+			remote.EXPECT().Ready().Return(true).Twice()
+			remote.EXPECT().CompareAndSendConfiguration(ctx, mock.Anything).Return(expErr).Twice()
+			remote.EXPECT().CompareAndSendState(ctx).Return(nil).Twice()
+			require.NoError(tt, forked.ApplyConfig(ctx, &models.AlertConfiguration{}))
+			require.NoError(tt, forked.ApplyConfig(ctx, &models.AlertConfiguration{}))
+
+			internal, remote, forked = genTestAlertmanagersWithSyncInterval(tt, modeRemoteSecondary, 10*time.Minute)
+			internal.EXPECT().ApplyConfig(ctx, mock.Anything).Return(nil).Twice()
+			remote.EXPECT().Ready().Return(true).Twice()
+			remote.EXPECT().CompareAndSendConfiguration(ctx, mock.Anything).Return(nil).Twice()
+			remote.EXPECT().CompareAndSendState(ctx).Return(expErr).Twice()
+			require.NoError(tt, forked.ApplyConfig(ctx, &models.AlertConfiguration{}))
+			require.NoError(tt, forked.ApplyConfig(ctx, &models.AlertConfiguration{}))
+		}
+
+		{
+			// An error in the internal Alertmanager should be returned.
+			internal, remote, forked := genTestAlertmanagers(tt, modeRemoteSecondary)
+			internal.EXPECT().ApplyConfig(ctx, mock.Anything).Return(expErr).Once()
+			readyCall := remote.EXPECT().Ready().Return(false).Once()
+			remote.EXPECT().ApplyConfig(ctx, mock.Anything).Return(nil).Once().NotBefore(readyCall)
+			require.ErrorIs(tt, forked.ApplyConfig(ctx, &models.AlertConfiguration{}), expErr)
+		}
+	})
+
+	t.Run("SaveAndApplyConfig", func(tt *testing.T) {
+		// SaveAndApplyConfig should only be called on the remote Alertmanager.
+		// State and configuration are updated on an interval.
+		internal, _, forked := genTestAlertmanagers(tt, modeRemoteSecondary)
+		internal.EXPECT().SaveAndApplyConfig(ctx, mock.Anything).Return(nil).Once()
+		require.NoError(tt, forked.SaveAndApplyConfig(ctx, &apimodels.PostableUserConfig{}))
+
+		// If there's an error, it should be returned.
+		internal, _, forked = genTestAlertmanagers(tt, modeRemoteSecondary)
+		internal.EXPECT().SaveAndApplyConfig(ctx, mock.Anything).Return(expErr).Once()
+		require.ErrorIs(tt, forked.SaveAndApplyConfig(ctx, &apimodels.PostableUserConfig{}), expErr)
+	})
+
+	t.Run("SaveAndApplyDefaultConfig", func(tt *testing.T) {
+		// SaveAndApplyDefaultConfig should only be called on the remote Alertmanager.
+		// State and configuration are updated on an interval.
+		internal, _, forked := genTestAlertmanagers(tt, modeRemoteSecondary)
+		internal.EXPECT().SaveAndApplyDefaultConfig(ctx).Return(nil).Once()
+		require.NoError(tt, forked.SaveAndApplyDefaultConfig(ctx))
+
+		// If there's an error, it should be returned.
+		internal, _, forked = genTestAlertmanagers(tt, modeRemoteSecondary)
+		internal.EXPECT().SaveAndApplyDefaultConfig(ctx).Return(expErr).Once()
+		require.ErrorIs(tt, forked.SaveAndApplyDefaultConfig(ctx), expErr)
+	})
+
+	t.Run("GetStatus", func(tt *testing.T) {
+		// We care about the status of the internal Alertmanager.
+		internal, _, forked := genTestAlertmanagers(tt, modeRemoteSecondary)
+		status := apimodels.GettableStatus{}
+		internal.EXPECT().GetStatus().Return(status).Once()
+		require.Equal(tt, status, forked.GetStatus())
+	})
+
+	t.Run("CreateSilence", func(tt *testing.T) {
+		// We should create the silence in the internal Alertmanager.
+		internal, _, forked := genTestAlertmanagers(tt, modeRemoteSecondary)
+
+		expID := "test-id"
+		internal.EXPECT().CreateSilence(mock.Anything, mock.Anything).Return(expID, nil).Once()
+		id, err := forked.CreateSilence(ctx, nil)
+		require.NoError(tt, err)
+		require.Equal(tt, expID, id)
+
+		// If there's an error in the internal Alertmanager, it should be returned.
+		internal, _, forked = genTestAlertmanagers(tt, modeRemoteSecondary)
+		internal.EXPECT().CreateSilence(mock.Anything, mock.Anything).Return("", expErr).Once()
+		_, err = forked.CreateSilence(ctx, nil)
+		require.ErrorIs(tt, expErr, err)
+	})
+
+	t.Run("DeleteSilence", func(tt *testing.T) {
+		// We should delete the silence in the internal Alertmanager.
+		internal, _, forked := genTestAlertmanagers(tt, modeRemoteSecondary)
+		internal.EXPECT().DeleteSilence(mock.Anything, mock.Anything).Return(nil).Once()
+		require.NoError(tt, forked.DeleteSilence(ctx, ""))
+
+		// If there's an error in the internal Alertmanager, it should be returned.
+		internal, _, forked = genTestAlertmanagers(tt, modeRemoteSecondary)
+		internal.EXPECT().DeleteSilence(mock.Anything, mock.Anything).Return(expErr).Once()
+		require.ErrorIs(tt, expErr, forked.DeleteSilence(ctx, ""))
+	})
+
+	t.Run("GetSilence", func(tt *testing.T) {
+		// We should get the silence from the internal Alertmanager.
+		internal, _, forked := genTestAlertmanagers(tt, modeRemoteSecondary)
+
+		expSilence := apimodels.GettableSilence{}
+		internal.EXPECT().GetSilence(mock.Anything, mock.Anything).Return(expSilence, nil).Once()
+		silence, err := forked.GetSilence(ctx, "")
+		require.NoError(tt, err)
+		require.Equal(tt, expSilence, silence)
+
+		// If there's an error in the internal Alertmanager, it should be returned.
+		internal, _, forked = genTestAlertmanagers(tt, modeRemoteSecondary)
+		internal.EXPECT().GetSilence(mock.Anything, mock.Anything).Return(apimodels.GettableSilence{}, expErr).Once()
+		_, err = forked.GetSilence(ctx, "")
+		require.ErrorIs(tt, expErr, err)
+	})
+
+	t.Run("ListSilences", func(tt *testing.T) {
+		// We should get the silences from the internal Alertmanager.
+		internal, _, forked := genTestAlertmanagers(tt, modeRemoteSecondary)
+
+		expSilences := apimodels.GettableSilences{}
+		internal.EXPECT().ListSilences(mock.Anything, mock.Anything).Return(expSilences, nil).Once()
+		silences, err := forked.ListSilences(ctx, []string{})
+		require.NoError(tt, err)
+		require.Equal(tt, expSilences, silences)
+
+		// If there's an error in the internal Alertmanager, it should be returned.
+		internal, _, forked = genTestAlertmanagers(tt, modeRemoteSecondary)
+		internal.EXPECT().ListSilences(mock.Anything, mock.Anything).Return(apimodels.GettableSilences{}, expErr).Once()
+		_, err = forked.ListSilences(ctx, []string{})
+		require.ErrorIs(tt, expErr, err)
+	})
+
+	t.Run("GetAlerts", func(tt *testing.T) {
+		// We should get alerts from the internal Alertmanager.
+		internal, _, forked := genTestAlertmanagers(tt, modeRemoteSecondary)
+
+		expAlerts := apimodels.GettableAlerts{}
+		internal.EXPECT().GetAlerts(
+			mock.Anything,
+			true,
+			true,
+			true,
+			[]string{"test"},
+			"test",
+		).Return(expAlerts, nil).Once()
+
+		alerts, err := forked.GetAlerts(ctx, true, true, true, []string{"test"}, "test")
+		require.NoError(tt, err)
+		require.Equal(tt, expAlerts, alerts)
+
+		// If there's an error in the internal Alertmanager, it should be returned.
+		internal, _, forked = genTestAlertmanagers(tt, modeRemoteSecondary)
+
+		internal.EXPECT().GetAlerts(
+			mock.Anything,
+			true,
+			true,
+			true,
+			[]string{"test"},
+			"test",
+		).Return(apimodels.GettableAlerts{}, expErr).Once()
+
+		_, err = forked.GetAlerts(ctx, true, true, true, []string{"test"}, "test")
+		require.ErrorIs(tt, expErr, err)
+	})
+
+	t.Run("GetAlertGroups", func(tt *testing.T) {
+		// We should get alert groups from the internal Alertmanager.
+		internal, _, forked := genTestAlertmanagers(tt, modeRemoteSecondary)
+
+		expAlertGroups := apimodels.AlertGroups{}
+		internal.EXPECT().GetAlertGroups(
+			mock.Anything,
+			true,
+			true,
+			true,
+			[]string{"test"},
+			"test",
+		).Return(expAlertGroups, nil).Once()
+
+		alertGroups, err := forked.GetAlertGroups(ctx, true, true, true, []string{"test"}, "test")
+		require.NoError(tt, err)
+		require.Equal(tt, expAlertGroups, alertGroups)
+
+		// If there's an error in the internal Alertmanager, it should be returned.
+		internal, _, forked = genTestAlertmanagers(tt, modeRemoteSecondary)
+
+		internal.EXPECT().GetAlertGroups(
+			mock.Anything,
+			true,
+			true,
+			true,
+			[]string{"test"},
+			"test",
+		).Return(apimodels.AlertGroups{}, expErr).Once()
+
+		_, err = forked.GetAlertGroups(ctx, true, true, true, []string{"test"}, "test")
+		require.ErrorIs(tt, expErr, err)
+	})
+
+	t.Run("PutAlerts", func(tt *testing.T) {
+		// We should send alerts to the internal Alertmanager only.
+		internal, _, forked := genTestAlertmanagers(tt, modeRemoteSecondary)
+		internal.EXPECT().PutAlerts(mock.Anything, mock.Anything).Return(nil).Once()
+		require.NoError(tt, forked.PutAlerts(ctx, apimodels.PostableAlerts{}))
+
+		// If there's an error in the internal Alertmanager, it should be returned.
+		internal, _, forked = genTestAlertmanagers(tt, modeRemoteSecondary)
+		internal.EXPECT().PutAlerts(mock.Anything, mock.Anything).Return(expErr).Once()
+		require.ErrorIs(tt, expErr, forked.PutAlerts(ctx, apimodels.PostableAlerts{}))
+	})
+
+	t.Run("GetReceivers", func(tt *testing.T) {
+		// We should retrieve the receivers from the internal Alertmanager.
+		internal, _, forked := genTestAlertmanagers(tt, modeRemoteSecondary)
+		expReceivers := []apimodels.Receiver{}
+		internal.EXPECT().GetReceivers(mock.Anything).Return(expReceivers, nil).Once()
+		receivers, err := forked.GetReceivers(ctx)
+		require.NoError(tt, err)
+		require.Equal(tt, expReceivers, receivers)
+
+		// If there's an error in the internal Alertmanager, it should be returned.
+		internal, _, forked = genTestAlertmanagers(tt, modeRemoteSecondary)
+		internal.EXPECT().GetReceivers(mock.Anything).Return([]apimodels.Receiver{}, expErr).Once()
+		_, err = forked.GetReceivers(ctx)
+		require.ErrorIs(tt, expErr, err)
+	})
+
+	t.Run("TestReceivers", func(tt *testing.T) {
+		// TestReceivers should be called only in the internal Alertmanager.
+		internal, _, forked := genTestAlertmanagers(tt, modeRemoteSecondary)
+		internal.EXPECT().TestReceivers(mock.Anything, mock.Anything).Return(nil, nil).Once()
+		_, err := forked.TestReceivers(ctx, apimodels.TestReceiversConfigBodyParams{})
+		require.NoError(tt, err)
+
+		// If there's an error in the internal Alertmanager, it should be returned.
+		internal, _, forked = genTestAlertmanagers(tt, modeRemoteSecondary)
+		internal.EXPECT().TestReceivers(mock.Anything, mock.Anything).Return(nil, expErr).Once()
+		_, err = forked.TestReceivers(ctx, apimodels.TestReceiversConfigBodyParams{})
+		require.ErrorIs(tt, expErr, err)
+	})
+
+	t.Run("TestTemplate", func(tt *testing.T) {
+		// TestTemplate should be called only in the internal Alertmanager.
+		internal, _, forked := genTestAlertmanagers(tt, modeRemoteSecondary)
+		internal.EXPECT().TestTemplate(mock.Anything, mock.Anything).Return(nil, nil).Once()
+		_, err := forked.TestTemplate(ctx, apimodels.TestTemplatesConfigBodyParams{})
+		require.NoError(tt, err)
+
+		// If there's an error in the internal Alertmanager, it should be returned.
+		internal, _, forked = genTestAlertmanagers(tt, modeRemoteSecondary)
+		internal.EXPECT().TestTemplate(mock.Anything, mock.Anything).Return(nil, expErr).Once()
+		_, err = forked.TestTemplate(ctx, apimodels.TestTemplatesConfigBodyParams{})
+		require.ErrorIs(tt, expErr, err)
+	})
+
+	t.Run("CleanUp", func(tt *testing.T) {
+		// CleanUp should be called only in the internal Alertmanager,
+		// there's no cleanup to do in the remote one.
+		internal, _, forked := genTestAlertmanagers(tt, modeRemoteSecondary)
+		internal.EXPECT().CleanUp().Once()
+		forked.CleanUp()
+	})
+
+	t.Run("StopAndWait", func(tt *testing.T) {
+		{
+			// StopAndWait should be called in both Alertmanagers.
+			// Methods to sync the Alertmanagers should be called on the remote Alertmanager.
+			internal, remote, forked := genTestAlertmanagers(tt, modeRemoteSecondary)
+			internal.EXPECT().StopAndWait().Once()
+			remote.EXPECT().StopAndWait().Once()
+			remote.EXPECT().CompareAndSendConfiguration(mock.Anything, mock.Anything).Return(nil).Once()
+			remote.EXPECT().CompareAndSendState(mock.Anything).Return(nil).Once()
+			forked.StopAndWait()
+		}
+
+		{
+			// An error in the remote Alertmanager should't be a problem.
+			// These errors are caught and logged.
+			internal, remote, forked := genTestAlertmanagers(tt, modeRemoteSecondary)
+			internal.EXPECT().StopAndWait().Once()
+			remote.EXPECT().StopAndWait().Once()
+			remote.EXPECT().CompareAndSendConfiguration(mock.Anything, mock.Anything).Return(expErr).Once()
+			remote.EXPECT().CompareAndSendState(mock.Anything).Return(expErr).Once()
+			forked.StopAndWait()
+		}
+
+		{
+			// An error when retrieving the configuration should cause
+			// CompareAndSendConfiguration not to be called.
+			internal, remote, forked := genTestAlertmanagers(tt, modeRemoteSecondary)
+			secondaryForked, ok := forked.(*RemoteSecondaryForkedAlertmanager)
+			require.True(t, ok)
+			secondaryForked.store = &errConfigStore{}
+
+			internal.EXPECT().StopAndWait().Once()
+			remote.EXPECT().StopAndWait().Once()
+			remote.EXPECT().CompareAndSendState(mock.Anything).Return(expErr).Once()
+			forked.StopAndWait()
+		}
+	})
+
+	t.Run("Ready", func(tt *testing.T) {
+		// Ready should be called only on the internal Alertmanager.
+		internal, _, forked := genTestAlertmanagers(tt, modeRemoteSecondary)
+		internal.EXPECT().Ready().Return(true).Once()
+		require.True(tt, forked.Ready())
+
+		internal.EXPECT().Ready().Return(false).Maybe()
+		require.False(tt, forked.Ready())
+	})
+}
+
+func TestForkedAlertmanager_ModeRemotePrimary(t *testing.T) {
+	ctx := context.Background()
+	expErr := errors.New("test error")
+
+	t.Run("ApplyConfig", func(tt *testing.T) {
+		{
+			// If the remote Alertmanager is not ready, ApplyConfig should be called on both Alertmanagers,
+			// first on the remote, then on the internal.
+			internal, remote, forked := genTestAlertmanagers(tt, modeRemotePrimary)
+			remoteCall := remote.EXPECT().ApplyConfig(ctx, mock.Anything).Return(nil).Once()
+			internal.EXPECT().ApplyConfig(ctx, mock.Anything).Return(nil).Once().NotBefore(remoteCall)
+			require.NoError(tt, forked.ApplyConfig(ctx, &models.AlertConfiguration{}))
+
+			// An error in the remote Alertmanager should be returned.
+			_, remote, forked = genTestAlertmanagers(tt, modeRemotePrimary)
+			remote.EXPECT().ApplyConfig(ctx, mock.Anything).Return(expErr).Once()
+			require.ErrorIs(tt, forked.ApplyConfig(ctx, &models.AlertConfiguration{}), expErr)
+
+			// An error in the internal Alertmanager should not be returned.
+			internal, remote, forked = genTestAlertmanagers(tt, modeRemotePrimary)
+			remote.EXPECT().ApplyConfig(ctx, mock.Anything).Return(nil).Once()
+			internal.EXPECT().ApplyConfig(ctx, mock.Anything).Return(expErr).Once()
+			require.NoError(tt, forked.ApplyConfig(ctx, &models.AlertConfiguration{}))
+		}
+	})
+
+	t.Run("GetStatus", func(tt *testing.T) {
+		// We care about the status of the remote Alertmanager.
+		_, remote, forked := genTestAlertmanagers(tt, modeRemotePrimary)
+		status := apimodels.GettableStatus{}
+		remote.EXPECT().GetStatus().Return(status).Once()
+		require.Equal(tt, status, forked.GetStatus())
+	})
+
+	t.Run("CreateSilence", func(tt *testing.T) {
+		// We should create the silence in the remote Alertmanager.
+		_, remote, forked := genTestAlertmanagers(tt, modeRemotePrimary)
+
+		expID := "test-id"
+		remote.EXPECT().CreateSilence(mock.Anything, mock.Anything).Return(expID, nil).Once()
+		id, err := forked.CreateSilence(ctx, nil)
+		require.NoError(tt, err)
+		require.Equal(tt, expID, id)
+
+		// If there's an error in the remote Alertmanager, the error should be returned.
+		remote.EXPECT().CreateSilence(mock.Anything, mock.Anything).Return("", expErr).Maybe()
+		_, err = forked.CreateSilence(ctx, nil)
+		require.ErrorIs(tt, expErr, err)
+	})
+
+	t.Run("DeleteSilence", func(tt *testing.T) {
+		// We should delete the silence in the remote Alertmanager.
+		_, remote, forked := genTestAlertmanagers(tt, modeRemotePrimary)
+		remote.EXPECT().DeleteSilence(mock.Anything, mock.Anything).Return(nil).Once()
+		require.NoError(tt, forked.DeleteSilence(ctx, ""))
+
+		// If there's an error in the remote Alertmanager, the error should be returned.
+		_, remote, forked = genTestAlertmanagers(tt, modeRemotePrimary)
+		remote.EXPECT().DeleteSilence(mock.Anything, mock.Anything).Return(expErr).Maybe()
+		require.ErrorIs(tt, expErr, forked.DeleteSilence(ctx, ""))
+	})
+
+	t.Run("GetSilence", func(tt *testing.T) {
+		// We should get the silence from the remote Alertmanager.
+		_, remote, forked := genTestAlertmanagers(tt, modeRemotePrimary)
+		expSilence := apimodels.GettableSilence{}
+		remote.EXPECT().GetSilence(mock.Anything, mock.Anything).Return(expSilence, nil).Once()
+		silence, err := forked.GetSilence(ctx, "")
+		require.NoError(tt, err)
+		require.Equal(tt, expSilence, silence)
+
+		// If there's an error in the remote Alertmanager, the error should be returned.
+		_, remote, forked = genTestAlertmanagers(tt, modeRemotePrimary)
+		remote.EXPECT().GetSilence(mock.Anything, mock.Anything).Return(apimodels.GettableSilence{}, expErr).Once()
+		_, err = forked.GetSilence(ctx, "")
+		require.ErrorIs(tt, expErr, err)
+	})
+
+	t.Run("ListSilences", func(tt *testing.T) {
+		// We should get the silences from the remote Alertmanager.
+		_, remote, forked := genTestAlertmanagers(tt, modeRemotePrimary)
+		expSilences := apimodels.GettableSilences{}
+		remote.EXPECT().ListSilences(mock.Anything, mock.Anything).Return(expSilences, nil).Once()
+		silences, err := forked.ListSilences(ctx, []string{})
+		require.NoError(tt, err)
+		require.Equal(tt, expSilences, silences)
+
+		// If there's an error in the remote Alertmanager, the error should be returned.
+		_, remote, forked = genTestAlertmanagers(tt, modeRemotePrimary)
+		remote.EXPECT().ListSilences(mock.Anything, mock.Anything).Return(apimodels.GettableSilences{}, expErr).Once()
+		_, err = forked.ListSilences(ctx, []string{})
+		require.ErrorIs(tt, expErr, err)
+	})
+
+	t.Run("GetAlerts", func(tt *testing.T) {
+		// We should get alerts from the remote Alertmanager.
+		_, remote, forked := genTestAlertmanagers(tt, modeRemotePrimary)
+
+		expAlerts := apimodels.GettableAlerts{}
+		remote.EXPECT().GetAlerts(
+			mock.Anything,
+			true,
+			true,
+			true,
+			[]string{"test"},
+			"test",
+		).Return(expAlerts, nil).Once()
+
+		alerts, err := forked.GetAlerts(ctx, true, true, true, []string{"test"}, "test")
+		require.NoError(tt, err)
+		require.Equal(tt, expAlerts, alerts)
+
+		// If there's an error in the remote Alertmanager, it should be returned.
+		_, remote, forked = genTestAlertmanagers(tt, modeRemotePrimary)
+
+		remote.EXPECT().GetAlerts(
+			mock.Anything,
+			true,
+			true,
+			true,
+			[]string{"test"},
+			"test",
+		).Return(apimodels.GettableAlerts{}, expErr).Once()
+
+		_, err = forked.GetAlerts(ctx, true, true, true, []string{"test"}, "test")
+		require.ErrorIs(tt, expErr, err)
+	})
+
+	t.Run("GetAlertGroups", func(tt *testing.T) {
+		// We should get alert groups from the remote Alertmanager.
+		_, remote, forked := genTestAlertmanagers(tt, modeRemotePrimary)
+
+		expAlertGroups := apimodels.AlertGroups{}
+		remote.EXPECT().GetAlertGroups(
+			mock.Anything,
+			true,
+			true,
+			true,
+			[]string{"test"},
+			"test",
+		).Return(expAlertGroups, nil).Once()
+
+		alertGroups, err := forked.GetAlertGroups(ctx, true, true, true, []string{"test"}, "test")
+		require.NoError(tt, err)
+		require.Equal(tt, expAlertGroups, alertGroups)
+
+		// If there's an error in the remote Alertmanager, it should be returned.
+		_, remote, forked = genTestAlertmanagers(tt, modeRemotePrimary)
+
+		remote.EXPECT().GetAlertGroups(
+			mock.Anything,
+			true,
+			true,
+			true,
+			[]string{"test"},
+			"test",
+		).Return(apimodels.AlertGroups{}, expErr).Once()
+
+		_, err = forked.GetAlertGroups(ctx, true, true, true, []string{"test"}, "test")
+		require.ErrorIs(tt, expErr, err)
+	})
+
+	t.Run("PutAlerts", func(tt *testing.T) {
+		// We should send alerts to the remote Alertmanager only.
+		_, remote, forked := genTestAlertmanagers(tt, modeRemotePrimary)
+		remote.EXPECT().PutAlerts(mock.Anything, mock.Anything).Return(nil).Once()
+		require.NoError(tt, forked.PutAlerts(ctx, apimodels.PostableAlerts{}))
+
+		// If there's an error in the remote Alertmanager, it should be returned.
+		_, remote, forked = genTestAlertmanagers(tt, modeRemotePrimary)
+		remote.EXPECT().PutAlerts(mock.Anything, mock.Anything).Return(expErr).Once()
+		require.ErrorIs(tt, expErr, forked.PutAlerts(ctx, apimodels.PostableAlerts{}))
+	})
+
+	t.Run("GetReceivers", func(tt *testing.T) {
+		// We should retrieve the receivers from the remote Alertmanager.
+		_, remote, forked := genTestAlertmanagers(tt, modeRemotePrimary)
+		expReceivers := []apimodels.Receiver{}
+		remote.EXPECT().GetReceivers(mock.Anything).Return(expReceivers, nil).Once()
+		receivers, err := forked.GetReceivers(ctx)
+		require.NoError(tt, err)
+		require.Equal(tt, expReceivers, receivers)
+
+		// If there's an error in the remote Alertmanager, it should be returned.
+		_, remote, forked = genTestAlertmanagers(tt, modeRemotePrimary)
+		remote.EXPECT().GetReceivers(mock.Anything).Return([]apimodels.Receiver{}, expErr).Once()
+		_, err = forked.GetReceivers(ctx)
+		require.ErrorIs(tt, expErr, err)
+	})
+
+	t.Run("TestReceivers", func(tt *testing.T) {
+		// TestReceivers should be called only in the remote Alertmanager.
+		_, remote, forked := genTestAlertmanagers(tt, modeRemotePrimary)
+		remote.EXPECT().TestReceivers(mock.Anything, mock.Anything).Return(nil, nil).Once()
+		_, err := forked.TestReceivers(ctx, apimodels.TestReceiversConfigBodyParams{})
+		require.NoError(tt, err)
+
+		// If there's an error in the remote Alertmanager, it should be returned.
+		_, remote, forked = genTestAlertmanagers(tt, modeRemotePrimary)
+		remote.EXPECT().TestReceivers(mock.Anything, mock.Anything).Return(nil, expErr).Once()
+		_, err = forked.TestReceivers(ctx, apimodels.TestReceiversConfigBodyParams{})
+		require.ErrorIs(tt, expErr, err)
+	})
+
+	t.Run("TestTemplate", func(tt *testing.T) {
+		// TestTemplate should be called only in the remote Alertmanager.
+		_, remote, forked := genTestAlertmanagers(tt, modeRemotePrimary)
+		remote.EXPECT().TestTemplate(mock.Anything, mock.Anything).Return(nil, nil).Once()
+		_, err := forked.TestTemplate(ctx, apimodels.TestTemplatesConfigBodyParams{})
+		require.NoError(tt, err)
+
+		// If there's an error in the remote Alertmanager, it should be returned.
+		_, remote, forked = genTestAlertmanagers(tt, modeRemotePrimary)
+		remote.EXPECT().TestTemplate(mock.Anything, mock.Anything).Return(nil, expErr).Once()
+		_, err = forked.TestTemplate(ctx, apimodels.TestTemplatesConfigBodyParams{})
+		require.ErrorIs(tt, expErr, err)
+	})
+
+	t.Run("CleanUp", func(tt *testing.T) {
+		// CleanUp should be called only in the internal Alertmanager,
+		// there's no cleanup to do in the remote one.
+		internal, _, forked := genTestAlertmanagers(tt, modeRemotePrimary)
+		internal.EXPECT().CleanUp().Once()
+		forked.CleanUp()
+	})
+
+	t.Run("StopAndWait", func(tt *testing.T) {
+		// StopAndWait should be called on both Alertmanagers.
+		internal, remote, forked := genTestAlertmanagers(tt, modeRemotePrimary)
+		internal.EXPECT().StopAndWait().Once()
+		remote.EXPECT().StopAndWait().Once()
+		forked.StopAndWait()
+	})
+
+	t.Run("Ready", func(tt *testing.T) {
+		// Ready should be called on both Alertmanagers
+		internal, remote, forked := genTestAlertmanagers(tt, modeRemotePrimary)
+		internal.EXPECT().Ready().Return(true).Once()
+		remote.EXPECT().Ready().Return(true).Once()
+		require.True(tt, forked.Ready())
+
+		// If one of the two Alertmanagers is not ready, it returns false.
+		internal, remote, forked = genTestAlertmanagers(tt, modeRemotePrimary)
+		internal.EXPECT().Ready().Return(false).Maybe()
+		remote.EXPECT().Ready().Return(true).Maybe()
+		require.False(tt, forked.Ready())
+
+		internal, remote, forked = genTestAlertmanagers(tt, modeRemotePrimary)
+		internal.EXPECT().Ready().Return(true).Maybe()
+		remote.EXPECT().Ready().Return(false).Maybe()
+		require.False(tt, forked.Ready())
+	})
+}
+func genTestAlertmanagers(t *testing.T, mode int) (*alertmanager_mock.AlertmanagerMock, *remote_alertmanager_mock.RemoteAlertmanagerMock, notifier.Alertmanager) {
+	t.Helper()
+	return genTestAlertmanagersWithSyncInterval(t, mode, 0)
+}
+
+func genTestAlertmanagersWithSyncInterval(t *testing.T, mode int, syncInterval time.Duration) (*alertmanager_mock.AlertmanagerMock, *remote_alertmanager_mock.RemoteAlertmanagerMock, notifier.Alertmanager) {
+	t.Helper()
+	internal := alertmanager_mock.NewAlertmanagerMock(t)
+	remote := remote_alertmanager_mock.NewRemoteAlertmanagerMock(t)
+
+	if mode == modeRemoteSecondary {
+		configs := map[int64]*models.AlertConfiguration{
+			1: {},
+		}
+		cfg := RemoteSecondaryConfig{
+			Logger:       log.NewNopLogger(),
+			SyncInterval: syncInterval,
+			OrgID:        1,
+			Store:        notifier.NewFakeConfigStore(t, configs),
+		}
+		forked, err := NewRemoteSecondaryForkedAlertmanager(cfg, internal, remote)
+		require.NoError(t, err)
+		return internal, remote, forked
+	}
+	return internal, remote, NewRemotePrimaryForkedAlertmanager(log.NewNopLogger(), internal, remote)
+}
+
+// errConfigStore returns an error when a method is called.
+type errConfigStore struct{}
+
+func (s *errConfigStore) GetLatestAlertmanagerConfiguration(context.Context, int64) (*models.AlertConfiguration, error) {
+	return nil, errors.New("test error")
+}
diff --git a/pkg/services/ngalert/remote/mock/remoteAlertmanager.go b/pkg/services/ngalert/remote/mock/remoteAlertmanager.go
new file mode 100644
index 0000000000000..7c05ffe306d7c
--- /dev/null
+++ b/pkg/services/ngalert/remote/mock/remoteAlertmanager.go
@@ -0,0 +1,933 @@
+// Code generated by mockery v2.34.2. DO NOT EDIT.
+
+package alertmanager_mock
+
+import (
+	context "context"
+
+	definitions "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	mock "github.com/stretchr/testify/mock"
+
+	models "github.com/grafana/grafana/pkg/services/ngalert/models"
+
+	notifier "github.com/grafana/grafana/pkg/services/ngalert/notifier"
+
+	notify "github.com/grafana/alerting/notify"
+
+	v2models "github.com/prometheus/alertmanager/api/v2/models"
+)
+
+// RemoteAlertmanagerMock is an autogenerated mock type for the remoteAlertmanager type
+type RemoteAlertmanagerMock struct {
+	mock.Mock
+}
+
+type RemoteAlertmanagerMock_Expecter struct {
+	mock *mock.Mock
+}
+
+func (_m *RemoteAlertmanagerMock) EXPECT() *RemoteAlertmanagerMock_Expecter {
+	return &RemoteAlertmanagerMock_Expecter{mock: &_m.Mock}
+}
+
+// ApplyConfig provides a mock function with given fields: _a0, _a1
+func (_m *RemoteAlertmanagerMock) ApplyConfig(_a0 context.Context, _a1 *models.AlertConfiguration) error {
+	ret := _m.Called(_a0, _a1)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, *models.AlertConfiguration) error); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// RemoteAlertmanagerMock_ApplyConfig_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ApplyConfig'
+type RemoteAlertmanagerMock_ApplyConfig_Call struct {
+	*mock.Call
+}
+
+// ApplyConfig is a helper method to define mock.On call
+//   - _a0 context.Context
+//   - _a1 *models.AlertConfiguration
+func (_e *RemoteAlertmanagerMock_Expecter) ApplyConfig(_a0 interface{}, _a1 interface{}) *RemoteAlertmanagerMock_ApplyConfig_Call {
+	return &RemoteAlertmanagerMock_ApplyConfig_Call{Call: _e.mock.On("ApplyConfig", _a0, _a1)}
+}
+
+func (_c *RemoteAlertmanagerMock_ApplyConfig_Call) Run(run func(_a0 context.Context, _a1 *models.AlertConfiguration)) *RemoteAlertmanagerMock_ApplyConfig_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*models.AlertConfiguration))
+	})
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_ApplyConfig_Call) Return(_a0 error) *RemoteAlertmanagerMock_ApplyConfig_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_ApplyConfig_Call) RunAndReturn(run func(context.Context, *models.AlertConfiguration) error) *RemoteAlertmanagerMock_ApplyConfig_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// CleanUp provides a mock function with given fields:
+func (_m *RemoteAlertmanagerMock) CleanUp() {
+	_m.Called()
+}
+
+// RemoteAlertmanagerMock_CleanUp_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CleanUp'
+type RemoteAlertmanagerMock_CleanUp_Call struct {
+	*mock.Call
+}
+
+// CleanUp is a helper method to define mock.On call
+func (_e *RemoteAlertmanagerMock_Expecter) CleanUp() *RemoteAlertmanagerMock_CleanUp_Call {
+	return &RemoteAlertmanagerMock_CleanUp_Call{Call: _e.mock.On("CleanUp")}
+}
+
+func (_c *RemoteAlertmanagerMock_CleanUp_Call) Run(run func()) *RemoteAlertmanagerMock_CleanUp_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_CleanUp_Call) Return() *RemoteAlertmanagerMock_CleanUp_Call {
+	_c.Call.Return()
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_CleanUp_Call) RunAndReturn(run func()) *RemoteAlertmanagerMock_CleanUp_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// CompareAndSendConfiguration provides a mock function with given fields: _a0, _a1
+func (_m *RemoteAlertmanagerMock) CompareAndSendConfiguration(_a0 context.Context, _a1 *models.AlertConfiguration) error {
+	ret := _m.Called(_a0, _a1)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, *models.AlertConfiguration) error); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// RemoteAlertmanagerMock_CompareAndSendConfiguration_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CompareAndSendConfiguration'
+type RemoteAlertmanagerMock_CompareAndSendConfiguration_Call struct {
+	*mock.Call
+}
+
+// CompareAndSendConfiguration is a helper method to define mock.On call
+//   - _a0 context.Context
+//   - _a1 *models.AlertConfiguration
+func (_e *RemoteAlertmanagerMock_Expecter) CompareAndSendConfiguration(_a0 interface{}, _a1 interface{}) *RemoteAlertmanagerMock_CompareAndSendConfiguration_Call {
+	return &RemoteAlertmanagerMock_CompareAndSendConfiguration_Call{Call: _e.mock.On("CompareAndSendConfiguration", _a0, _a1)}
+}
+
+func (_c *RemoteAlertmanagerMock_CompareAndSendConfiguration_Call) Run(run func(_a0 context.Context, _a1 *models.AlertConfiguration)) *RemoteAlertmanagerMock_CompareAndSendConfiguration_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*models.AlertConfiguration))
+	})
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_CompareAndSendConfiguration_Call) Return(_a0 error) *RemoteAlertmanagerMock_CompareAndSendConfiguration_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_CompareAndSendConfiguration_Call) RunAndReturn(run func(context.Context, *models.AlertConfiguration) error) *RemoteAlertmanagerMock_CompareAndSendConfiguration_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// CompareAndSendState provides a mock function with given fields: _a0
+func (_m *RemoteAlertmanagerMock) CompareAndSendState(_a0 context.Context) error {
+	ret := _m.Called(_a0)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
+		r0 = rf(_a0)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// RemoteAlertmanagerMock_CompareAndSendState_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CompareAndSendState'
+type RemoteAlertmanagerMock_CompareAndSendState_Call struct {
+	*mock.Call
+}
+
+// CompareAndSendState is a helper method to define mock.On call
+//   - _a0 context.Context
+func (_e *RemoteAlertmanagerMock_Expecter) CompareAndSendState(_a0 interface{}) *RemoteAlertmanagerMock_CompareAndSendState_Call {
+	return &RemoteAlertmanagerMock_CompareAndSendState_Call{Call: _e.mock.On("CompareAndSendState", _a0)}
+}
+
+func (_c *RemoteAlertmanagerMock_CompareAndSendState_Call) Run(run func(_a0 context.Context)) *RemoteAlertmanagerMock_CompareAndSendState_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context))
+	})
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_CompareAndSendState_Call) Return(_a0 error) *RemoteAlertmanagerMock_CompareAndSendState_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_CompareAndSendState_Call) RunAndReturn(run func(context.Context) error) *RemoteAlertmanagerMock_CompareAndSendState_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// CreateSilence provides a mock function with given fields: _a0, _a1
+func (_m *RemoteAlertmanagerMock) CreateSilence(_a0 context.Context, _a1 *v2models.PostableSilence) (string, error) {
+	ret := _m.Called(_a0, _a1)
+
+	var r0 string
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *v2models.PostableSilence) (string, error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *v2models.PostableSilence) string); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		r0 = ret.Get(0).(string)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *v2models.PostableSilence) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// RemoteAlertmanagerMock_CreateSilence_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CreateSilence'
+type RemoteAlertmanagerMock_CreateSilence_Call struct {
+	*mock.Call
+}
+
+// CreateSilence is a helper method to define mock.On call
+//   - _a0 context.Context
+//   - _a1 *v2models.PostableSilence
+func (_e *RemoteAlertmanagerMock_Expecter) CreateSilence(_a0 interface{}, _a1 interface{}) *RemoteAlertmanagerMock_CreateSilence_Call {
+	return &RemoteAlertmanagerMock_CreateSilence_Call{Call: _e.mock.On("CreateSilence", _a0, _a1)}
+}
+
+func (_c *RemoteAlertmanagerMock_CreateSilence_Call) Run(run func(_a0 context.Context, _a1 *v2models.PostableSilence)) *RemoteAlertmanagerMock_CreateSilence_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*v2models.PostableSilence))
+	})
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_CreateSilence_Call) Return(_a0 string, _a1 error) *RemoteAlertmanagerMock_CreateSilence_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_CreateSilence_Call) RunAndReturn(run func(context.Context, *v2models.PostableSilence) (string, error)) *RemoteAlertmanagerMock_CreateSilence_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// DeleteSilence provides a mock function with given fields: _a0, _a1
+func (_m *RemoteAlertmanagerMock) DeleteSilence(_a0 context.Context, _a1 string) error {
+	ret := _m.Called(_a0, _a1)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, string) error); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// RemoteAlertmanagerMock_DeleteSilence_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'DeleteSilence'
+type RemoteAlertmanagerMock_DeleteSilence_Call struct {
+	*mock.Call
+}
+
+// DeleteSilence is a helper method to define mock.On call
+//   - _a0 context.Context
+//   - _a1 string
+func (_e *RemoteAlertmanagerMock_Expecter) DeleteSilence(_a0 interface{}, _a1 interface{}) *RemoteAlertmanagerMock_DeleteSilence_Call {
+	return &RemoteAlertmanagerMock_DeleteSilence_Call{Call: _e.mock.On("DeleteSilence", _a0, _a1)}
+}
+
+func (_c *RemoteAlertmanagerMock_DeleteSilence_Call) Run(run func(_a0 context.Context, _a1 string)) *RemoteAlertmanagerMock_DeleteSilence_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(string))
+	})
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_DeleteSilence_Call) Return(_a0 error) *RemoteAlertmanagerMock_DeleteSilence_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_DeleteSilence_Call) RunAndReturn(run func(context.Context, string) error) *RemoteAlertmanagerMock_DeleteSilence_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// GetAlertGroups provides a mock function with given fields: ctx, active, silenced, inhibited, filter, receiver
+func (_m *RemoteAlertmanagerMock) GetAlertGroups(ctx context.Context, active bool, silenced bool, inhibited bool, filter []string, receiver string) (v2models.AlertGroups, error) {
+	ret := _m.Called(ctx, active, silenced, inhibited, filter, receiver)
+
+	var r0 v2models.AlertGroups
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, bool, bool, bool, []string, string) (v2models.AlertGroups, error)); ok {
+		return rf(ctx, active, silenced, inhibited, filter, receiver)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, bool, bool, bool, []string, string) v2models.AlertGroups); ok {
+		r0 = rf(ctx, active, silenced, inhibited, filter, receiver)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(v2models.AlertGroups)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, bool, bool, bool, []string, string) error); ok {
+		r1 = rf(ctx, active, silenced, inhibited, filter, receiver)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// RemoteAlertmanagerMock_GetAlertGroups_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetAlertGroups'
+type RemoteAlertmanagerMock_GetAlertGroups_Call struct {
+	*mock.Call
+}
+
+// GetAlertGroups is a helper method to define mock.On call
+//   - ctx context.Context
+//   - active bool
+//   - silenced bool
+//   - inhibited bool
+//   - filter []string
+//   - receiver string
+func (_e *RemoteAlertmanagerMock_Expecter) GetAlertGroups(ctx interface{}, active interface{}, silenced interface{}, inhibited interface{}, filter interface{}, receiver interface{}) *RemoteAlertmanagerMock_GetAlertGroups_Call {
+	return &RemoteAlertmanagerMock_GetAlertGroups_Call{Call: _e.mock.On("GetAlertGroups", ctx, active, silenced, inhibited, filter, receiver)}
+}
+
+func (_c *RemoteAlertmanagerMock_GetAlertGroups_Call) Run(run func(ctx context.Context, active bool, silenced bool, inhibited bool, filter []string, receiver string)) *RemoteAlertmanagerMock_GetAlertGroups_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(bool), args[2].(bool), args[3].(bool), args[4].([]string), args[5].(string))
+	})
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_GetAlertGroups_Call) Return(_a0 v2models.AlertGroups, _a1 error) *RemoteAlertmanagerMock_GetAlertGroups_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_GetAlertGroups_Call) RunAndReturn(run func(context.Context, bool, bool, bool, []string, string) (v2models.AlertGroups, error)) *RemoteAlertmanagerMock_GetAlertGroups_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// GetAlerts provides a mock function with given fields: ctx, active, silenced, inhibited, filter, receiver
+func (_m *RemoteAlertmanagerMock) GetAlerts(ctx context.Context, active bool, silenced bool, inhibited bool, filter []string, receiver string) (v2models.GettableAlerts, error) {
+	ret := _m.Called(ctx, active, silenced, inhibited, filter, receiver)
+
+	var r0 v2models.GettableAlerts
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, bool, bool, bool, []string, string) (v2models.GettableAlerts, error)); ok {
+		return rf(ctx, active, silenced, inhibited, filter, receiver)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, bool, bool, bool, []string, string) v2models.GettableAlerts); ok {
+		r0 = rf(ctx, active, silenced, inhibited, filter, receiver)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(v2models.GettableAlerts)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, bool, bool, bool, []string, string) error); ok {
+		r1 = rf(ctx, active, silenced, inhibited, filter, receiver)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// RemoteAlertmanagerMock_GetAlerts_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetAlerts'
+type RemoteAlertmanagerMock_GetAlerts_Call struct {
+	*mock.Call
+}
+
+// GetAlerts is a helper method to define mock.On call
+//   - ctx context.Context
+//   - active bool
+//   - silenced bool
+//   - inhibited bool
+//   - filter []string
+//   - receiver string
+func (_e *RemoteAlertmanagerMock_Expecter) GetAlerts(ctx interface{}, active interface{}, silenced interface{}, inhibited interface{}, filter interface{}, receiver interface{}) *RemoteAlertmanagerMock_GetAlerts_Call {
+	return &RemoteAlertmanagerMock_GetAlerts_Call{Call: _e.mock.On("GetAlerts", ctx, active, silenced, inhibited, filter, receiver)}
+}
+
+func (_c *RemoteAlertmanagerMock_GetAlerts_Call) Run(run func(ctx context.Context, active bool, silenced bool, inhibited bool, filter []string, receiver string)) *RemoteAlertmanagerMock_GetAlerts_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(bool), args[2].(bool), args[3].(bool), args[4].([]string), args[5].(string))
+	})
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_GetAlerts_Call) Return(_a0 v2models.GettableAlerts, _a1 error) *RemoteAlertmanagerMock_GetAlerts_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_GetAlerts_Call) RunAndReturn(run func(context.Context, bool, bool, bool, []string, string) (v2models.GettableAlerts, error)) *RemoteAlertmanagerMock_GetAlerts_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// GetReceivers provides a mock function with given fields: ctx
+func (_m *RemoteAlertmanagerMock) GetReceivers(ctx context.Context) ([]v2models.Receiver, error) {
+	ret := _m.Called(ctx)
+
+	var r0 []v2models.Receiver
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context) ([]v2models.Receiver, error)); ok {
+		return rf(ctx)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context) []v2models.Receiver); ok {
+		r0 = rf(ctx)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]v2models.Receiver)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context) error); ok {
+		r1 = rf(ctx)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// RemoteAlertmanagerMock_GetReceivers_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetReceivers'
+type RemoteAlertmanagerMock_GetReceivers_Call struct {
+	*mock.Call
+}
+
+// GetReceivers is a helper method to define mock.On call
+//   - ctx context.Context
+func (_e *RemoteAlertmanagerMock_Expecter) GetReceivers(ctx interface{}) *RemoteAlertmanagerMock_GetReceivers_Call {
+	return &RemoteAlertmanagerMock_GetReceivers_Call{Call: _e.mock.On("GetReceivers", ctx)}
+}
+
+func (_c *RemoteAlertmanagerMock_GetReceivers_Call) Run(run func(ctx context.Context)) *RemoteAlertmanagerMock_GetReceivers_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context))
+	})
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_GetReceivers_Call) Return(_a0 []v2models.Receiver, _a1 error) *RemoteAlertmanagerMock_GetReceivers_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_GetReceivers_Call) RunAndReturn(run func(context.Context) ([]v2models.Receiver, error)) *RemoteAlertmanagerMock_GetReceivers_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// GetSilence provides a mock function with given fields: _a0, _a1
+func (_m *RemoteAlertmanagerMock) GetSilence(_a0 context.Context, _a1 string) (v2models.GettableSilence, error) {
+	ret := _m.Called(_a0, _a1)
+
+	var r0 v2models.GettableSilence
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, string) (v2models.GettableSilence, error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, string) v2models.GettableSilence); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		r0 = ret.Get(0).(v2models.GettableSilence)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, string) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// RemoteAlertmanagerMock_GetSilence_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetSilence'
+type RemoteAlertmanagerMock_GetSilence_Call struct {
+	*mock.Call
+}
+
+// GetSilence is a helper method to define mock.On call
+//   - _a0 context.Context
+//   - _a1 string
+func (_e *RemoteAlertmanagerMock_Expecter) GetSilence(_a0 interface{}, _a1 interface{}) *RemoteAlertmanagerMock_GetSilence_Call {
+	return &RemoteAlertmanagerMock_GetSilence_Call{Call: _e.mock.On("GetSilence", _a0, _a1)}
+}
+
+func (_c *RemoteAlertmanagerMock_GetSilence_Call) Run(run func(_a0 context.Context, _a1 string)) *RemoteAlertmanagerMock_GetSilence_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(string))
+	})
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_GetSilence_Call) Return(_a0 v2models.GettableSilence, _a1 error) *RemoteAlertmanagerMock_GetSilence_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_GetSilence_Call) RunAndReturn(run func(context.Context, string) (v2models.GettableSilence, error)) *RemoteAlertmanagerMock_GetSilence_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// GetStatus provides a mock function with given fields:
+func (_m *RemoteAlertmanagerMock) GetStatus() definitions.GettableStatus {
+	ret := _m.Called()
+
+	var r0 definitions.GettableStatus
+	if rf, ok := ret.Get(0).(func() definitions.GettableStatus); ok {
+		r0 = rf()
+	} else {
+		r0 = ret.Get(0).(definitions.GettableStatus)
+	}
+
+	return r0
+}
+
+// RemoteAlertmanagerMock_GetStatus_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetStatus'
+type RemoteAlertmanagerMock_GetStatus_Call struct {
+	*mock.Call
+}
+
+// GetStatus is a helper method to define mock.On call
+func (_e *RemoteAlertmanagerMock_Expecter) GetStatus() *RemoteAlertmanagerMock_GetStatus_Call {
+	return &RemoteAlertmanagerMock_GetStatus_Call{Call: _e.mock.On("GetStatus")}
+}
+
+func (_c *RemoteAlertmanagerMock_GetStatus_Call) Run(run func()) *RemoteAlertmanagerMock_GetStatus_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_GetStatus_Call) Return(_a0 definitions.GettableStatus) *RemoteAlertmanagerMock_GetStatus_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_GetStatus_Call) RunAndReturn(run func() definitions.GettableStatus) *RemoteAlertmanagerMock_GetStatus_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ListSilences provides a mock function with given fields: _a0, _a1
+func (_m *RemoteAlertmanagerMock) ListSilences(_a0 context.Context, _a1 []string) (v2models.GettableSilences, error) {
+	ret := _m.Called(_a0, _a1)
+
+	var r0 v2models.GettableSilences
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, []string) (v2models.GettableSilences, error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, []string) v2models.GettableSilences); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(v2models.GettableSilences)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, []string) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// RemoteAlertmanagerMock_ListSilences_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ListSilences'
+type RemoteAlertmanagerMock_ListSilences_Call struct {
+	*mock.Call
+}
+
+// ListSilences is a helper method to define mock.On call
+//   - _a0 context.Context
+//   - _a1 []string
+func (_e *RemoteAlertmanagerMock_Expecter) ListSilences(_a0 interface{}, _a1 interface{}) *RemoteAlertmanagerMock_ListSilences_Call {
+	return &RemoteAlertmanagerMock_ListSilences_Call{Call: _e.mock.On("ListSilences", _a0, _a1)}
+}
+
+func (_c *RemoteAlertmanagerMock_ListSilences_Call) Run(run func(_a0 context.Context, _a1 []string)) *RemoteAlertmanagerMock_ListSilences_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].([]string))
+	})
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_ListSilences_Call) Return(_a0 v2models.GettableSilences, _a1 error) *RemoteAlertmanagerMock_ListSilences_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_ListSilences_Call) RunAndReturn(run func(context.Context, []string) (v2models.GettableSilences, error)) *RemoteAlertmanagerMock_ListSilences_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// PutAlerts provides a mock function with given fields: _a0, _a1
+func (_m *RemoteAlertmanagerMock) PutAlerts(_a0 context.Context, _a1 definitions.PostableAlerts) error {
+	ret := _m.Called(_a0, _a1)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, definitions.PostableAlerts) error); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// RemoteAlertmanagerMock_PutAlerts_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'PutAlerts'
+type RemoteAlertmanagerMock_PutAlerts_Call struct {
+	*mock.Call
+}
+
+// PutAlerts is a helper method to define mock.On call
+//   - _a0 context.Context
+//   - _a1 definitions.PostableAlerts
+func (_e *RemoteAlertmanagerMock_Expecter) PutAlerts(_a0 interface{}, _a1 interface{}) *RemoteAlertmanagerMock_PutAlerts_Call {
+	return &RemoteAlertmanagerMock_PutAlerts_Call{Call: _e.mock.On("PutAlerts", _a0, _a1)}
+}
+
+func (_c *RemoteAlertmanagerMock_PutAlerts_Call) Run(run func(_a0 context.Context, _a1 definitions.PostableAlerts)) *RemoteAlertmanagerMock_PutAlerts_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(definitions.PostableAlerts))
+	})
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_PutAlerts_Call) Return(_a0 error) *RemoteAlertmanagerMock_PutAlerts_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_PutAlerts_Call) RunAndReturn(run func(context.Context, definitions.PostableAlerts) error) *RemoteAlertmanagerMock_PutAlerts_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Ready provides a mock function with given fields:
+func (_m *RemoteAlertmanagerMock) Ready() bool {
+	ret := _m.Called()
+
+	var r0 bool
+	if rf, ok := ret.Get(0).(func() bool); ok {
+		r0 = rf()
+	} else {
+		r0 = ret.Get(0).(bool)
+	}
+
+	return r0
+}
+
+// RemoteAlertmanagerMock_Ready_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Ready'
+type RemoteAlertmanagerMock_Ready_Call struct {
+	*mock.Call
+}
+
+// Ready is a helper method to define mock.On call
+func (_e *RemoteAlertmanagerMock_Expecter) Ready() *RemoteAlertmanagerMock_Ready_Call {
+	return &RemoteAlertmanagerMock_Ready_Call{Call: _e.mock.On("Ready")}
+}
+
+func (_c *RemoteAlertmanagerMock_Ready_Call) Run(run func()) *RemoteAlertmanagerMock_Ready_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_Ready_Call) Return(_a0 bool) *RemoteAlertmanagerMock_Ready_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_Ready_Call) RunAndReturn(run func() bool) *RemoteAlertmanagerMock_Ready_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// SaveAndApplyConfig provides a mock function with given fields: ctx, config
+func (_m *RemoteAlertmanagerMock) SaveAndApplyConfig(ctx context.Context, config *definitions.PostableUserConfig) error {
+	ret := _m.Called(ctx, config)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, *definitions.PostableUserConfig) error); ok {
+		r0 = rf(ctx, config)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// RemoteAlertmanagerMock_SaveAndApplyConfig_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SaveAndApplyConfig'
+type RemoteAlertmanagerMock_SaveAndApplyConfig_Call struct {
+	*mock.Call
+}
+
+// SaveAndApplyConfig is a helper method to define mock.On call
+//   - ctx context.Context
+//   - config *definitions.PostableUserConfig
+func (_e *RemoteAlertmanagerMock_Expecter) SaveAndApplyConfig(ctx interface{}, config interface{}) *RemoteAlertmanagerMock_SaveAndApplyConfig_Call {
+	return &RemoteAlertmanagerMock_SaveAndApplyConfig_Call{Call: _e.mock.On("SaveAndApplyConfig", ctx, config)}
+}
+
+func (_c *RemoteAlertmanagerMock_SaveAndApplyConfig_Call) Run(run func(ctx context.Context, config *definitions.PostableUserConfig)) *RemoteAlertmanagerMock_SaveAndApplyConfig_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*definitions.PostableUserConfig))
+	})
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_SaveAndApplyConfig_Call) Return(_a0 error) *RemoteAlertmanagerMock_SaveAndApplyConfig_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_SaveAndApplyConfig_Call) RunAndReturn(run func(context.Context, *definitions.PostableUserConfig) error) *RemoteAlertmanagerMock_SaveAndApplyConfig_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// SaveAndApplyDefaultConfig provides a mock function with given fields: ctx
+func (_m *RemoteAlertmanagerMock) SaveAndApplyDefaultConfig(ctx context.Context) error {
+	ret := _m.Called(ctx)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
+		r0 = rf(ctx)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// RemoteAlertmanagerMock_SaveAndApplyDefaultConfig_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SaveAndApplyDefaultConfig'
+type RemoteAlertmanagerMock_SaveAndApplyDefaultConfig_Call struct {
+	*mock.Call
+}
+
+// SaveAndApplyDefaultConfig is a helper method to define mock.On call
+//   - ctx context.Context
+func (_e *RemoteAlertmanagerMock_Expecter) SaveAndApplyDefaultConfig(ctx interface{}) *RemoteAlertmanagerMock_SaveAndApplyDefaultConfig_Call {
+	return &RemoteAlertmanagerMock_SaveAndApplyDefaultConfig_Call{Call: _e.mock.On("SaveAndApplyDefaultConfig", ctx)}
+}
+
+func (_c *RemoteAlertmanagerMock_SaveAndApplyDefaultConfig_Call) Run(run func(ctx context.Context)) *RemoteAlertmanagerMock_SaveAndApplyDefaultConfig_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context))
+	})
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_SaveAndApplyDefaultConfig_Call) Return(_a0 error) *RemoteAlertmanagerMock_SaveAndApplyDefaultConfig_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_SaveAndApplyDefaultConfig_Call) RunAndReturn(run func(context.Context) error) *RemoteAlertmanagerMock_SaveAndApplyDefaultConfig_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// StopAndWait provides a mock function with given fields:
+func (_m *RemoteAlertmanagerMock) StopAndWait() {
+	_m.Called()
+}
+
+// RemoteAlertmanagerMock_StopAndWait_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'StopAndWait'
+type RemoteAlertmanagerMock_StopAndWait_Call struct {
+	*mock.Call
+}
+
+// StopAndWait is a helper method to define mock.On call
+func (_e *RemoteAlertmanagerMock_Expecter) StopAndWait() *RemoteAlertmanagerMock_StopAndWait_Call {
+	return &RemoteAlertmanagerMock_StopAndWait_Call{Call: _e.mock.On("StopAndWait")}
+}
+
+func (_c *RemoteAlertmanagerMock_StopAndWait_Call) Run(run func()) *RemoteAlertmanagerMock_StopAndWait_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_StopAndWait_Call) Return() *RemoteAlertmanagerMock_StopAndWait_Call {
+	_c.Call.Return()
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_StopAndWait_Call) RunAndReturn(run func()) *RemoteAlertmanagerMock_StopAndWait_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// TestReceivers provides a mock function with given fields: ctx, c
+func (_m *RemoteAlertmanagerMock) TestReceivers(ctx context.Context, c definitions.TestReceiversConfigBodyParams) (*notifier.TestReceiversResult, error) {
+	ret := _m.Called(ctx, c)
+
+	var r0 *notifier.TestReceiversResult
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, definitions.TestReceiversConfigBodyParams) (*notifier.TestReceiversResult, error)); ok {
+		return rf(ctx, c)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, definitions.TestReceiversConfigBodyParams) *notifier.TestReceiversResult); ok {
+		r0 = rf(ctx, c)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*notifier.TestReceiversResult)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, definitions.TestReceiversConfigBodyParams) error); ok {
+		r1 = rf(ctx, c)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// RemoteAlertmanagerMock_TestReceivers_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'TestReceivers'
+type RemoteAlertmanagerMock_TestReceivers_Call struct {
+	*mock.Call
+}
+
+// TestReceivers is a helper method to define mock.On call
+//   - ctx context.Context
+//   - c definitions.TestReceiversConfigBodyParams
+func (_e *RemoteAlertmanagerMock_Expecter) TestReceivers(ctx interface{}, c interface{}) *RemoteAlertmanagerMock_TestReceivers_Call {
+	return &RemoteAlertmanagerMock_TestReceivers_Call{Call: _e.mock.On("TestReceivers", ctx, c)}
+}
+
+func (_c *RemoteAlertmanagerMock_TestReceivers_Call) Run(run func(ctx context.Context, c definitions.TestReceiversConfigBodyParams)) *RemoteAlertmanagerMock_TestReceivers_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(definitions.TestReceiversConfigBodyParams))
+	})
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_TestReceivers_Call) Return(_a0 *notifier.TestReceiversResult, _a1 error) *RemoteAlertmanagerMock_TestReceivers_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_TestReceivers_Call) RunAndReturn(run func(context.Context, definitions.TestReceiversConfigBodyParams) (*notifier.TestReceiversResult, error)) *RemoteAlertmanagerMock_TestReceivers_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// TestTemplate provides a mock function with given fields: ctx, c
+func (_m *RemoteAlertmanagerMock) TestTemplate(ctx context.Context, c definitions.TestTemplatesConfigBodyParams) (*notify.TestTemplatesResults, error) {
+	ret := _m.Called(ctx, c)
+
+	var r0 *notify.TestTemplatesResults
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, definitions.TestTemplatesConfigBodyParams) (*notify.TestTemplatesResults, error)); ok {
+		return rf(ctx, c)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, definitions.TestTemplatesConfigBodyParams) *notify.TestTemplatesResults); ok {
+		r0 = rf(ctx, c)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*notify.TestTemplatesResults)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, definitions.TestTemplatesConfigBodyParams) error); ok {
+		r1 = rf(ctx, c)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// RemoteAlertmanagerMock_TestTemplate_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'TestTemplate'
+type RemoteAlertmanagerMock_TestTemplate_Call struct {
+	*mock.Call
+}
+
+// TestTemplate is a helper method to define mock.On call
+//   - ctx context.Context
+//   - c definitions.TestTemplatesConfigBodyParams
+func (_e *RemoteAlertmanagerMock_Expecter) TestTemplate(ctx interface{}, c interface{}) *RemoteAlertmanagerMock_TestTemplate_Call {
+	return &RemoteAlertmanagerMock_TestTemplate_Call{Call: _e.mock.On("TestTemplate", ctx, c)}
+}
+
+func (_c *RemoteAlertmanagerMock_TestTemplate_Call) Run(run func(ctx context.Context, c definitions.TestTemplatesConfigBodyParams)) *RemoteAlertmanagerMock_TestTemplate_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(definitions.TestTemplatesConfigBodyParams))
+	})
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_TestTemplate_Call) Return(_a0 *notify.TestTemplatesResults, _a1 error) *RemoteAlertmanagerMock_TestTemplate_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *RemoteAlertmanagerMock_TestTemplate_Call) RunAndReturn(run func(context.Context, definitions.TestTemplatesConfigBodyParams) (*notify.TestTemplatesResults, error)) *RemoteAlertmanagerMock_TestTemplate_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// NewRemoteAlertmanagerMock creates a new instance of RemoteAlertmanagerMock. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewRemoteAlertmanagerMock(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *RemoteAlertmanagerMock {
+	mock := &RemoteAlertmanagerMock{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/pkg/services/ngalert/remote/remote_primary_forked_alertmanager.go b/pkg/services/ngalert/remote/remote_primary_forked_alertmanager.go
new file mode 100644
index 0000000000000..a10a2c4139776
--- /dev/null
+++ b/pkg/services/ngalert/remote/remote_primary_forked_alertmanager.go
@@ -0,0 +1,110 @@
+package remote
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/notifier"
+)
+
+type RemotePrimaryForkedAlertmanager struct {
+	log log.Logger
+
+	internal notifier.Alertmanager
+	remote   remoteAlertmanager
+}
+
+func NewRemotePrimaryForkedAlertmanager(log log.Logger, internal notifier.Alertmanager, remote remoteAlertmanager) *RemotePrimaryForkedAlertmanager {
+	return &RemotePrimaryForkedAlertmanager{
+		log:      log,
+		internal: internal,
+		remote:   remote,
+	}
+}
+
+// ApplyConfig will send the configuration to the remote Alertmanager on startup.
+func (fam *RemotePrimaryForkedAlertmanager) ApplyConfig(ctx context.Context, config *models.AlertConfiguration) error {
+	if err := fam.remote.ApplyConfig(ctx, config); err != nil {
+		return fmt.Errorf("failed to call ApplyConfig on the remote Alertmanager: %w", err)
+	}
+
+	if err := fam.internal.ApplyConfig(ctx, config); err != nil {
+		fam.log.Error("Error applying config to the internal Alertmanager", "err", err)
+	}
+	return nil
+}
+
+// TODO: save the new configuration hash in memory.
+func (fam *RemotePrimaryForkedAlertmanager) SaveAndApplyConfig(ctx context.Context, config *apimodels.PostableUserConfig) error {
+	return nil
+}
+
+// TODO: save the new configuration hash in memory.
+func (fam *RemotePrimaryForkedAlertmanager) SaveAndApplyDefaultConfig(ctx context.Context) error {
+	return nil
+}
+
+func (fam *RemotePrimaryForkedAlertmanager) GetStatus() apimodels.GettableStatus {
+	return fam.remote.GetStatus()
+}
+
+func (fam *RemotePrimaryForkedAlertmanager) CreateSilence(ctx context.Context, silence *apimodels.PostableSilence) (string, error) {
+	return fam.remote.CreateSilence(ctx, silence)
+}
+
+func (fam *RemotePrimaryForkedAlertmanager) DeleteSilence(ctx context.Context, id string) error {
+	return fam.remote.DeleteSilence(ctx, id)
+}
+
+func (fam *RemotePrimaryForkedAlertmanager) GetSilence(ctx context.Context, id string) (apimodels.GettableSilence, error) {
+	return fam.remote.GetSilence(ctx, id)
+}
+
+func (fam *RemotePrimaryForkedAlertmanager) ListSilences(ctx context.Context, filter []string) (apimodels.GettableSilences, error) {
+	return fam.remote.ListSilences(ctx, filter)
+}
+
+func (fam *RemotePrimaryForkedAlertmanager) GetAlerts(ctx context.Context, active, silenced, inhibited bool, filter []string, receiver string) (apimodels.GettableAlerts, error) {
+	return fam.remote.GetAlerts(ctx, active, silenced, inhibited, filter, receiver)
+}
+
+func (fam *RemotePrimaryForkedAlertmanager) GetAlertGroups(ctx context.Context, active, silenced, inhibited bool, filter []string, receiver string) (apimodels.AlertGroups, error) {
+	return fam.remote.GetAlertGroups(ctx, active, silenced, inhibited, filter, receiver)
+}
+
+func (fam *RemotePrimaryForkedAlertmanager) PutAlerts(ctx context.Context, alerts apimodels.PostableAlerts) error {
+	return fam.remote.PutAlerts(ctx, alerts)
+}
+
+func (fam *RemotePrimaryForkedAlertmanager) GetReceivers(ctx context.Context) ([]apimodels.Receiver, error) {
+	return fam.remote.GetReceivers(ctx)
+}
+
+func (fam *RemotePrimaryForkedAlertmanager) TestReceivers(ctx context.Context, c apimodels.TestReceiversConfigBodyParams) (*notifier.TestReceiversResult, error) {
+	return fam.remote.TestReceivers(ctx, c)
+}
+
+func (fam *RemotePrimaryForkedAlertmanager) TestTemplate(ctx context.Context, c apimodels.TestTemplatesConfigBodyParams) (*notifier.TestTemplatesResults, error) {
+	return fam.remote.TestTemplate(ctx, c)
+}
+
+func (fam *RemotePrimaryForkedAlertmanager) CleanUp() {
+	// No cleanup to do in the remote Alertmanager.
+	fam.internal.CleanUp()
+}
+
+func (fam *RemotePrimaryForkedAlertmanager) StopAndWait() {
+	fam.internal.StopAndWait()
+	fam.remote.StopAndWait()
+}
+
+func (fam *RemotePrimaryForkedAlertmanager) Ready() bool {
+	// Both Alertmanagers must be ready.
+	if ready := fam.remote.Ready(); !ready {
+		return false
+	}
+	return fam.internal.Ready()
+}
diff --git a/pkg/services/ngalert/remote/remote_secondary_forked_alertmanager.go b/pkg/services/ngalert/remote/remote_secondary_forked_alertmanager.go
new file mode 100644
index 0000000000000..7e46e01de6201
--- /dev/null
+++ b/pkg/services/ngalert/remote/remote_secondary_forked_alertmanager.go
@@ -0,0 +1,199 @@
+package remote
+
+import (
+	"context"
+	"fmt"
+	"sync"
+	"time"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/notifier"
+)
+
+type configStore interface {
+	GetLatestAlertmanagerConfiguration(ctx context.Context, orgID int64) (*models.AlertConfiguration, error)
+}
+
+//go:generate mockery --name remoteAlertmanager --structname RemoteAlertmanagerMock --with-expecter --output mock --outpkg alertmanager_mock
+type remoteAlertmanager interface {
+	notifier.Alertmanager
+	CompareAndSendConfiguration(context.Context, *models.AlertConfiguration) error
+	CompareAndSendState(context.Context) error
+}
+
+type RemoteSecondaryForkedAlertmanager struct {
+	log   log.Logger
+	orgID int64
+	store configStore
+
+	internal notifier.Alertmanager
+	remote   remoteAlertmanager
+
+	lastSync     time.Time
+	syncInterval time.Duration
+}
+
+type RemoteSecondaryConfig struct {
+	Logger log.Logger
+	OrgID  int64
+	Store  configStore
+
+	// SyncInterval determines how often we should attempt to synchronize
+	// state and configuration on the external Alertmanager.
+	SyncInterval time.Duration
+}
+
+func (c *RemoteSecondaryConfig) Validate() error {
+	if c.Logger == nil {
+		return fmt.Errorf("logger cannot be nil")
+	}
+	return nil
+}
+
+func NewRemoteSecondaryForkedAlertmanager(cfg RemoteSecondaryConfig, internal notifier.Alertmanager, remote remoteAlertmanager) (*RemoteSecondaryForkedAlertmanager, error) {
+	if err := cfg.Validate(); err != nil {
+		return nil, err
+	}
+	return &RemoteSecondaryForkedAlertmanager{
+		log:          cfg.Logger,
+		orgID:        cfg.OrgID,
+		store:        cfg.Store,
+		internal:     internal,
+		remote:       remote,
+		syncInterval: cfg.SyncInterval,
+	}, nil
+}
+
+// ApplyConfig will only log errors for the remote Alertmanager and ensure we delegate the call to the internal Alertmanager.
+// We don't care about errors in the remote Alertmanager in remote secondary mode.
+func (fam *RemoteSecondaryForkedAlertmanager) ApplyConfig(ctx context.Context, config *models.AlertConfiguration) error {
+	var wg sync.WaitGroup
+	wg.Add(1)
+	// Figure out if we need to sync the external Alertmanager in another goroutine.
+	go func() {
+		defer wg.Done()
+		// If the Alertmanager has not been marked as "ready" yet, delegate the call to the remote Alertmanager.
+		// This will perform a readiness check and sync the Alertmanagers.
+		if !fam.remote.Ready() {
+			if err := fam.remote.ApplyConfig(ctx, config); err != nil {
+				fam.log.Error("Error applying config to the remote Alertmanager", "err", err)
+				return
+			}
+			fam.lastSync = time.Now()
+			return
+		}
+
+		// If the Alertmanager was marked as ready but the sync interval has elapsed, sync the Alertmanagers.
+		if time.Since(fam.lastSync) >= fam.syncInterval {
+			fam.log.Debug("Syncing configuration and state with the remote Alertmanager", "lastSync", fam.lastSync)
+			cfgErr := fam.remote.CompareAndSendConfiguration(ctx, config)
+			if cfgErr != nil {
+				fam.log.Error("Unable to upload the configuration to the remote Alertmanager", "err", cfgErr)
+			}
+
+			stateErr := fam.remote.CompareAndSendState(ctx)
+			if stateErr != nil {
+				fam.log.Error("Unable to upload the state to the remote Alertmanager", "err", stateErr)
+			}
+			fam.log.Debug("Finished syncing configuration and state with the remote Alertmanager")
+
+			if cfgErr == nil && stateErr == nil {
+				fam.lastSync = time.Now()
+			}
+		}
+	}()
+
+	// Call ApplyConfig on the internal Alertmanager - we only care about errors for this one.
+	err := fam.internal.ApplyConfig(ctx, config)
+	wg.Wait()
+	return err
+}
+
+// SaveAndApplyConfig is only called on the internal Alertmanager when running in remote secondary mode.
+func (fam *RemoteSecondaryForkedAlertmanager) SaveAndApplyConfig(ctx context.Context, config *apimodels.PostableUserConfig) error {
+	return fam.internal.SaveAndApplyConfig(ctx, config)
+}
+
+// SaveAndApplyDefaultConfig is only called on the internal Alertmanager when running in remote secondary mode.
+func (fam *RemoteSecondaryForkedAlertmanager) SaveAndApplyDefaultConfig(ctx context.Context) error {
+	return fam.internal.SaveAndApplyDefaultConfig(ctx)
+}
+
+func (fam *RemoteSecondaryForkedAlertmanager) GetStatus() apimodels.GettableStatus {
+	return fam.internal.GetStatus()
+}
+
+func (fam *RemoteSecondaryForkedAlertmanager) CreateSilence(ctx context.Context, silence *apimodels.PostableSilence) (string, error) {
+	return fam.internal.CreateSilence(ctx, silence)
+}
+
+func (fam *RemoteSecondaryForkedAlertmanager) DeleteSilence(ctx context.Context, id string) error {
+	return fam.internal.DeleteSilence(ctx, id)
+}
+
+func (fam *RemoteSecondaryForkedAlertmanager) GetSilence(ctx context.Context, id string) (apimodels.GettableSilence, error) {
+	return fam.internal.GetSilence(ctx, id)
+}
+
+func (fam *RemoteSecondaryForkedAlertmanager) ListSilences(ctx context.Context, filter []string) (apimodels.GettableSilences, error) {
+	return fam.internal.ListSilences(ctx, filter)
+}
+
+func (fam *RemoteSecondaryForkedAlertmanager) GetAlerts(ctx context.Context, active, silenced, inhibited bool, filter []string, receiver string) (apimodels.GettableAlerts, error) {
+	return fam.internal.GetAlerts(ctx, active, silenced, inhibited, filter, receiver)
+}
+
+func (fam *RemoteSecondaryForkedAlertmanager) GetAlertGroups(ctx context.Context, active, silenced, inhibited bool, filter []string, receiver string) (apimodels.AlertGroups, error) {
+	return fam.internal.GetAlertGroups(ctx, active, silenced, inhibited, filter, receiver)
+}
+
+func (fam *RemoteSecondaryForkedAlertmanager) PutAlerts(ctx context.Context, alerts apimodels.PostableAlerts) error {
+	return fam.internal.PutAlerts(ctx, alerts)
+}
+
+func (fam *RemoteSecondaryForkedAlertmanager) GetReceivers(ctx context.Context) ([]apimodels.Receiver, error) {
+	return fam.internal.GetReceivers(ctx)
+}
+
+func (fam *RemoteSecondaryForkedAlertmanager) TestReceivers(ctx context.Context, c apimodels.TestReceiversConfigBodyParams) (*notifier.TestReceiversResult, error) {
+	return fam.internal.TestReceivers(ctx, c)
+}
+
+func (fam *RemoteSecondaryForkedAlertmanager) TestTemplate(ctx context.Context, c apimodels.TestTemplatesConfigBodyParams) (*notifier.TestTemplatesResults, error) {
+	return fam.internal.TestTemplate(ctx, c)
+}
+
+func (fam *RemoteSecondaryForkedAlertmanager) CleanUp() {
+	// No cleanup to do in the remote Alertmanager.
+	fam.internal.CleanUp()
+}
+
+func (fam *RemoteSecondaryForkedAlertmanager) StopAndWait() {
+	// Stop the internal Alertmanager.
+	fam.internal.StopAndWait()
+	// Stop our alert senders.
+	fam.remote.StopAndWait()
+
+	// Send config and state to the remote Alertmanager.
+	// Using context.TODO() here as we think we want to allow this operation to finish regardless of time.
+	ctx := context.TODO()
+	if err := fam.remote.CompareAndSendState(ctx); err != nil {
+		fam.log.Error("Error sending state to the remote Alertmanager while stopping", "err", err)
+	}
+
+	config, err := fam.store.GetLatestAlertmanagerConfiguration(ctx, fam.orgID)
+	if err != nil {
+		fam.log.Error("Error getting latest Alertmanager configuration while stopping", "err", err)
+		return
+	}
+	if err := fam.remote.CompareAndSendConfiguration(ctx, config); err != nil {
+		fam.log.Error("Error sending configuration to the remote Alertmanager while stopping", "err", err)
+	}
+}
+
+func (fam *RemoteSecondaryForkedAlertmanager) Ready() bool {
+	// We only care about the internal Alertmanager being ready.
+	return fam.internal.Ready()
+}
diff --git a/pkg/services/ngalert/schedule/alert_rule.go b/pkg/services/ngalert/schedule/alert_rule.go
new file mode 100644
index 0000000000000..6ba1d57d9ef00
--- /dev/null
+++ b/pkg/services/ngalert/schedule/alert_rule.go
@@ -0,0 +1,474 @@
+package schedule
+
+import (
+	context "context"
+	"errors"
+	"fmt"
+	"net/url"
+	"time"
+
+	"github.com/benbjohnson/clock"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/ngalert/eval"
+	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
+	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/state"
+	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/util"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/codes"
+	"go.opentelemetry.io/otel/trace"
+)
+
+// Rule represents a single piece of work that is executed periodically by the ruler.
+type Rule interface {
+	// Run creates the resources that will perform the rule's work, and starts it. It blocks indefinitely, until Stop is called or another signal is sent.
+	Run(key ngmodels.AlertRuleKey) error
+	// Stop shuts down the rule's execution with an optional reason. It has no effect if the rule has not yet been Run.
+	Stop(reason error)
+	// Eval sends a signal to execute the work represented by the rule, exactly one time.
+	// It has no effect if the rule has not yet been Run, or if the rule is Stopped.
+	Eval(eval *Evaluation) (bool, *Evaluation)
+	// Update sends a singal to change the definition of the rule.
+	Update(lastVersion RuleVersionAndPauseStatus) bool
+}
+
+type ruleFactoryFunc func(context.Context) Rule
+
+func (f ruleFactoryFunc) new(ctx context.Context) Rule {
+	return f(ctx)
+}
+
+func newRuleFactory(
+	appURL *url.URL,
+	disableGrafanaFolder bool,
+	maxAttempts int64,
+	sender AlertsSender,
+	stateManager *state.Manager,
+	evalFactory eval.EvaluatorFactory,
+	ruleProvider ruleProvider,
+	clock clock.Clock,
+	met *metrics.Scheduler,
+	logger log.Logger,
+	tracer tracing.Tracer,
+	evalAppliedHook evalAppliedFunc,
+	stopAppliedHook stopAppliedFunc,
+) ruleFactoryFunc {
+	return func(ctx context.Context) Rule {
+		return newAlertRule(
+			ctx,
+			appURL,
+			disableGrafanaFolder,
+			maxAttempts,
+			sender,
+			stateManager,
+			evalFactory,
+			ruleProvider,
+			clock,
+			met,
+			logger,
+			tracer,
+			evalAppliedHook,
+			stopAppliedHook,
+		)
+	}
+}
+
+type evalAppliedFunc = func(ngmodels.AlertRuleKey, time.Time)
+type stopAppliedFunc = func(ngmodels.AlertRuleKey)
+
+type ruleProvider interface {
+	get(ngmodels.AlertRuleKey) *ngmodels.AlertRule
+}
+
+type alertRule struct {
+	evalCh   chan *Evaluation
+	updateCh chan RuleVersionAndPauseStatus
+	ctx      context.Context
+	stopFn   util.CancelCauseFunc
+
+	appURL               *url.URL
+	disableGrafanaFolder bool
+	maxAttempts          int64
+
+	clock        clock.Clock
+	sender       AlertsSender
+	stateManager *state.Manager
+	evalFactory  eval.EvaluatorFactory
+	ruleProvider ruleProvider
+
+	// Event hooks that are only used in tests.
+	evalAppliedHook evalAppliedFunc
+	stopAppliedHook stopAppliedFunc
+
+	metrics *metrics.Scheduler
+	logger  log.Logger
+	tracer  tracing.Tracer
+}
+
+func newAlertRule(
+	parent context.Context,
+	appURL *url.URL,
+	disableGrafanaFolder bool,
+	maxAttempts int64,
+	sender AlertsSender,
+	stateManager *state.Manager,
+	evalFactory eval.EvaluatorFactory,
+	ruleProvider ruleProvider,
+	clock clock.Clock,
+	met *metrics.Scheduler,
+	logger log.Logger,
+	tracer tracing.Tracer,
+	evalAppliedHook func(ngmodels.AlertRuleKey, time.Time),
+	stopAppliedHook func(ngmodels.AlertRuleKey),
+) *alertRule {
+	ctx, stop := util.WithCancelCause(parent)
+	return &alertRule{
+		evalCh:               make(chan *Evaluation),
+		updateCh:             make(chan RuleVersionAndPauseStatus),
+		ctx:                  ctx,
+		stopFn:               stop,
+		appURL:               appURL,
+		disableGrafanaFolder: disableGrafanaFolder,
+		maxAttempts:          maxAttempts,
+		clock:                clock,
+		sender:               sender,
+		stateManager:         stateManager,
+		evalFactory:          evalFactory,
+		ruleProvider:         ruleProvider,
+		evalAppliedHook:      evalAppliedHook,
+		stopAppliedHook:      stopAppliedHook,
+		metrics:              met,
+		logger:               logger,
+		tracer:               tracer,
+	}
+}
+
+// eval signals the rule evaluation routine to perform the evaluation of the rule. Does nothing if the loop is stopped.
+// Before sending a message into the channel, it does non-blocking read to make sure that there is no concurrent send operation.
+// Returns a tuple where first element is
+//   - true when message was sent
+//   - false when the send operation is stopped
+//
+// the second element contains a dropped message that was sent by a concurrent sender.
+func (a *alertRule) Eval(eval *Evaluation) (bool, *Evaluation) {
+	// read the channel in unblocking manner to make sure that there is no concurrent send operation.
+	var droppedMsg *Evaluation
+	select {
+	case droppedMsg = <-a.evalCh:
+	default:
+	}
+
+	select {
+	case a.evalCh <- eval:
+		return true, droppedMsg
+	case <-a.ctx.Done():
+		return false, droppedMsg
+	}
+}
+
+// update sends an instruction to the rule evaluation routine to update the scheduled rule to the specified version. The specified version must be later than the current version, otherwise no update will happen.
+func (a *alertRule) Update(lastVersion RuleVersionAndPauseStatus) bool {
+	// check if the channel is not empty.
+	select {
+	case <-a.updateCh:
+	case <-a.ctx.Done():
+		return false
+	default:
+	}
+
+	select {
+	case a.updateCh <- lastVersion:
+		return true
+	case <-a.ctx.Done():
+		return false
+	}
+}
+
+// stop sends an instruction to the rule evaluation routine to shut down. an optional shutdown reason can be given.
+func (a *alertRule) Stop(reason error) {
+	if a.stopFn != nil {
+		a.stopFn(reason)
+	}
+}
+
+func (a *alertRule) Run(key ngmodels.AlertRuleKey) error {
+	grafanaCtx := ngmodels.WithRuleKey(a.ctx, key)
+	logger := a.logger.FromContext(grafanaCtx)
+	logger.Debug("Alert rule routine started")
+
+	evalRunning := false
+	var currentFingerprint fingerprint
+	defer a.stopApplied(key)
+	for {
+		select {
+		// used by external services (API) to notify that rule is updated.
+		case ctx := <-a.updateCh:
+			if currentFingerprint == ctx.Fingerprint {
+				logger.Info("Rule's fingerprint has not changed. Skip resetting the state", "currentFingerprint", currentFingerprint)
+				continue
+			}
+
+			logger.Info("Clearing the state of the rule because it was updated", "isPaused", ctx.IsPaused, "fingerprint", ctx.Fingerprint)
+			// clear the state. So the next evaluation will start from the scratch.
+			a.resetState(grafanaCtx, key, ctx.IsPaused)
+			currentFingerprint = ctx.Fingerprint
+		// evalCh - used by the scheduler to signal that evaluation is needed.
+		case ctx, ok := <-a.evalCh:
+			if !ok {
+				logger.Debug("Evaluation channel has been closed. Exiting")
+				return nil
+			}
+			if evalRunning {
+				continue
+			}
+
+			func() {
+				orgID := fmt.Sprint(key.OrgID)
+				evalDuration := a.metrics.EvalDuration.WithLabelValues(orgID)
+				evalTotal := a.metrics.EvalTotal.WithLabelValues(orgID)
+
+				evalRunning = true
+				evalStart := a.clock.Now()
+				defer func() {
+					evalRunning = false
+					a.evalApplied(key, ctx.scheduledAt)
+					evalDuration.Observe(a.clock.Now().Sub(evalStart).Seconds())
+				}()
+
+				for attempt := int64(1); attempt <= a.maxAttempts; attempt++ {
+					isPaused := ctx.rule.IsPaused
+					f := ruleWithFolder{ctx.rule, ctx.folderTitle}.Fingerprint()
+					// Do not clean up state if the eval loop has just started.
+					var needReset bool
+					if currentFingerprint != 0 && currentFingerprint != f {
+						logger.Debug("Got a new version of alert rule. Clear up the state", "fingerprint", f)
+						needReset = true
+					}
+					// We need to reset state if the loop has started and the alert is already paused. It can happen,
+					// if we have an alert with state and we do file provision with stateful Grafana, that state
+					// lingers in DB and won't be cleaned up until next alert rule update.
+					needReset = needReset || (currentFingerprint == 0 && isPaused)
+					if needReset {
+						a.resetState(grafanaCtx, key, isPaused)
+					}
+					currentFingerprint = f
+					if isPaused {
+						logger.Debug("Skip rule evaluation because it is paused")
+						return
+					}
+
+					// Only increment evaluation counter once, not per-retry.
+					if attempt == 1 {
+						evalTotal.Inc()
+					}
+
+					fpStr := currentFingerprint.String()
+					utcTick := ctx.scheduledAt.UTC().Format(time.RFC3339Nano)
+					tracingCtx, span := a.tracer.Start(grafanaCtx, "alert rule execution", trace.WithAttributes(
+						attribute.String("rule_uid", ctx.rule.UID),
+						attribute.Int64("org_id", ctx.rule.OrgID),
+						attribute.Int64("rule_version", ctx.rule.Version),
+						attribute.String("rule_fingerprint", fpStr),
+						attribute.String("tick", utcTick),
+					))
+
+					// Check before any execution if the context was cancelled so that we don't do any evaluations.
+					if tracingCtx.Err() != nil {
+						span.SetStatus(codes.Error, "rule evaluation cancelled")
+						span.End()
+						logger.Error("Skip evaluation and updating the state because the context has been cancelled", "version", ctx.rule.Version, "fingerprint", f, "attempt", attempt, "now", ctx.scheduledAt)
+						return
+					}
+
+					retry := attempt < a.maxAttempts
+					err := a.evaluate(tracingCtx, key, f, attempt, ctx, span, retry)
+					// This is extremely confusing - when we exhaust all retry attempts, or we have no retryable errors
+					// we return nil - so technically, this is meaningless to know whether the evaluation has errors or not.
+					span.End()
+					if err == nil {
+						return
+					}
+
+					logger.Error("Failed to evaluate rule", "version", ctx.rule.Version, "fingerprint", f, "attempt", attempt, "now", ctx.scheduledAt, "error", err)
+					select {
+					case <-tracingCtx.Done():
+						logger.Error("Context has been cancelled while backing off", "version", ctx.rule.Version, "fingerprint", f, "attempt", attempt, "now", ctx.scheduledAt)
+						return
+					case <-time.After(retryDelay):
+						continue
+					}
+				}
+			}()
+
+		case <-grafanaCtx.Done():
+			// clean up the state only if the reason for stopping the evaluation loop is that the rule was deleted
+			if errors.Is(grafanaCtx.Err(), errRuleDeleted) {
+				// We do not want a context to be unbounded which could potentially cause a go routine running
+				// indefinitely. 1 minute is an almost randomly chosen timeout, big enough to cover the majority of the
+				// cases.
+				ctx, cancelFunc := context.WithTimeout(context.Background(), time.Minute)
+				defer cancelFunc()
+				states := a.stateManager.DeleteStateByRuleUID(ngmodels.WithRuleKey(ctx, key), key, ngmodels.StateReasonRuleDeleted)
+				a.notify(grafanaCtx, key, states)
+			}
+			logger.Debug("Stopping alert rule routine")
+			return nil
+		}
+	}
+}
+
+func (a *alertRule) evaluate(ctx context.Context, key ngmodels.AlertRuleKey, f fingerprint, attempt int64, e *Evaluation, span trace.Span, retry bool) error {
+	orgID := fmt.Sprint(key.OrgID)
+	evalAttemptTotal := a.metrics.EvalAttemptTotal.WithLabelValues(orgID)
+	evalAttemptFailures := a.metrics.EvalAttemptFailures.WithLabelValues(orgID)
+	evalTotalFailures := a.metrics.EvalFailures.WithLabelValues(orgID)
+	processDuration := a.metrics.ProcessDuration.WithLabelValues(orgID)
+	sendDuration := a.metrics.SendDuration.WithLabelValues(orgID)
+
+	logger := a.logger.FromContext(ctx).New("version", e.rule.Version, "fingerprint", f, "attempt", attempt, "now", e.scheduledAt).FromContext(ctx)
+	start := a.clock.Now()
+
+	evalCtx := eval.NewContextWithPreviousResults(ctx, SchedulerUserFor(e.rule.OrgID), a.newLoadedMetricsReader(e.rule))
+	ruleEval, err := a.evalFactory.Create(evalCtx, e.rule.GetEvalCondition())
+	var results eval.Results
+	var dur time.Duration
+	if err != nil {
+		dur = a.clock.Now().Sub(start)
+		logger.Error("Failed to build rule evaluator", "error", err)
+	} else {
+		results, err = ruleEval.Evaluate(ctx, e.scheduledAt)
+		dur = a.clock.Now().Sub(start)
+		if err != nil {
+			logger.Error("Failed to evaluate rule", "error", err, "duration", dur)
+		}
+	}
+
+	evalAttemptTotal.Inc()
+
+	if ctx.Err() != nil { // check if the context is not cancelled. The evaluation can be a long-running task.
+		span.SetStatus(codes.Error, "rule evaluation cancelled")
+		logger.Debug("Skip updating the state because the context has been cancelled")
+		return nil
+	}
+
+	if err != nil || results.HasErrors() {
+		evalAttemptFailures.Inc()
+
+		// Only retry (return errors) if this isn't the last attempt, otherwise skip these return operations.
+		if retry {
+			// The only thing that can return non-nil `err` from ruleEval.Evaluate is the server side expression pipeline.
+			// This includes transport errors such as transient network errors.
+			if err != nil {
+				span.SetStatus(codes.Error, "rule evaluation failed")
+				span.RecordError(err)
+				return fmt.Errorf("server side expressions pipeline returned an error: %w", err)
+			}
+
+			// If the pipeline executed successfully but have other types of errors that can be retryable, we should do so.
+			if !results.HasNonRetryableErrors() {
+				span.SetStatus(codes.Error, "rule evaluation failed")
+				span.RecordError(err)
+				return fmt.Errorf("the result-set has errors that can be retried: %w", results.Error())
+			}
+		} else {
+			// Only count the final attempt as a failure.
+			evalTotalFailures.Inc()
+		}
+
+		// If results is nil, we assume that the error must be from the SSE pipeline (ruleEval.Evaluate) which is the only code that can actually return an `err`.
+		if results == nil {
+			results = append(results, eval.NewResultFromError(err, e.scheduledAt, dur))
+		}
+
+		// If err is nil, we assume that the SSS pipeline succeeded and that the error must be embedded in the results.
+		if err == nil {
+			err = results.Error()
+		}
+
+		span.SetStatus(codes.Error, "rule evaluation failed")
+		span.RecordError(err)
+	} else {
+		logger.Debug("Alert rule evaluated", "results", results, "duration", dur)
+		span.AddEvent("rule evaluated", trace.WithAttributes(
+			attribute.Int64("results", int64(len(results))),
+		))
+	}
+	start = a.clock.Now()
+	processedStates := a.stateManager.ProcessEvalResults(
+		ctx,
+		e.scheduledAt,
+		e.rule,
+		results,
+		state.GetRuleExtraLabels(logger, e.rule, e.folderTitle, !a.disableGrafanaFolder),
+	)
+	processDuration.Observe(a.clock.Now().Sub(start).Seconds())
+
+	start = a.clock.Now()
+	alerts := state.FromStateTransitionToPostableAlerts(processedStates, a.stateManager, a.appURL)
+	span.AddEvent("results processed", trace.WithAttributes(
+		attribute.Int64("state_transitions", int64(len(processedStates))),
+		attribute.Int64("alerts_to_send", int64(len(alerts.PostableAlerts))),
+	))
+	if len(alerts.PostableAlerts) > 0 {
+		a.sender.Send(ctx, key, alerts)
+	}
+	sendDuration.Observe(a.clock.Now().Sub(start).Seconds())
+
+	return nil
+}
+
+func (a *alertRule) notify(ctx context.Context, key ngmodels.AlertRuleKey, states []state.StateTransition) {
+	expiredAlerts := state.FromAlertsStateToStoppedAlert(states, a.appURL, a.clock)
+	if len(expiredAlerts.PostableAlerts) > 0 {
+		a.sender.Send(ctx, key, expiredAlerts)
+	}
+}
+
+func (a *alertRule) resetState(ctx context.Context, key ngmodels.AlertRuleKey, isPaused bool) {
+	rule := a.ruleProvider.get(key)
+	reason := ngmodels.StateReasonUpdated
+	if isPaused {
+		reason = ngmodels.StateReasonPaused
+	}
+	states := a.stateManager.ResetStateByRuleUID(ctx, rule, reason)
+	a.notify(ctx, key, states)
+}
+
+// evalApplied is only used on tests.
+func (a *alertRule) evalApplied(alertDefKey ngmodels.AlertRuleKey, now time.Time) {
+	if a.evalAppliedHook == nil {
+		return
+	}
+
+	a.evalAppliedHook(alertDefKey, now)
+}
+
+// stopApplied is only used on tests.
+func (a *alertRule) stopApplied(alertDefKey ngmodels.AlertRuleKey) {
+	if a.stopAppliedHook == nil {
+		return
+	}
+
+	a.stopAppliedHook(alertDefKey)
+}
+
+func SchedulerUserFor(orgID int64) *user.SignedInUser {
+	return &user.SignedInUser{
+		UserID:           -1,
+		IsServiceAccount: true,
+		Login:            "grafana_scheduler",
+		OrgID:            orgID,
+		OrgRole:          org.RoleAdmin,
+		Permissions: map[int64]map[string][]string{
+			orgID: {
+				datasources.ActionQuery: []string{
+					datasources.ScopeAll,
+				},
+			},
+		},
+	}
+}
diff --git a/pkg/services/ngalert/schedule/alert_rule_test.go b/pkg/services/ngalert/schedule/alert_rule_test.go
new file mode 100644
index 0000000000000..f910376cfba78
--- /dev/null
+++ b/pkg/services/ngalert/schedule/alert_rule_test.go
@@ -0,0 +1,748 @@
+package schedule
+
+import (
+	"bytes"
+	context "context"
+	"fmt"
+	"math"
+	"math/rand"
+	"runtime"
+	"sync"
+	"testing"
+	"time"
+
+	alertingModels "github.com/grafana/alerting/models"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	definitions "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/services/ngalert/eval"
+	models "github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/state"
+	"github.com/grafana/grafana/pkg/util"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/testutil"
+	prometheusModel "github.com/prometheus/common/model"
+	"github.com/stretchr/testify/assert"
+	mock "github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+)
+
+func TestAlertRule(t *testing.T) {
+	type evalResponse struct {
+		success     bool
+		droppedEval *Evaluation
+	}
+
+	t.Run("when rule evaluation is not stopped", func(t *testing.T) {
+		t.Run("update should send to updateCh", func(t *testing.T) {
+			r := blankRuleForTests(context.Background())
+			resultCh := make(chan bool)
+			go func() {
+				resultCh <- r.Update(RuleVersionAndPauseStatus{fingerprint(rand.Uint64()), false})
+			}()
+			select {
+			case <-r.updateCh:
+				require.True(t, <-resultCh)
+			case <-time.After(5 * time.Second):
+				t.Fatal("No message was received on update channel")
+			}
+		})
+		t.Run("update should drop any concurrent sending to updateCh", func(t *testing.T) {
+			r := blankRuleForTests(context.Background())
+			version1 := RuleVersionAndPauseStatus{fingerprint(rand.Uint64()), false}
+			version2 := RuleVersionAndPauseStatus{fingerprint(rand.Uint64()), false}
+
+			wg := sync.WaitGroup{}
+			wg.Add(1)
+			go func() {
+				wg.Done()
+				r.Update(version1)
+				wg.Done()
+			}()
+			wg.Wait()
+			wg.Add(2) // one when time1 is sent, another when go-routine for time2 has started
+			go func() {
+				wg.Done()
+				r.Update(version2)
+			}()
+			wg.Wait() // at this point tick 1 has already been dropped
+			select {
+			case version := <-r.updateCh:
+				require.Equal(t, version2, version)
+			case <-time.After(5 * time.Second):
+				t.Fatal("No message was received on eval channel")
+			}
+		})
+		t.Run("eval should send to evalCh", func(t *testing.T) {
+			r := blankRuleForTests(context.Background())
+			expected := time.Now()
+			resultCh := make(chan evalResponse)
+			data := &Evaluation{
+				scheduledAt: expected,
+				rule:        models.AlertRuleGen()(),
+				folderTitle: util.GenerateShortUID(),
+			}
+			go func() {
+				result, dropped := r.Eval(data)
+				resultCh <- evalResponse{result, dropped}
+			}()
+			select {
+			case ctx := <-r.evalCh:
+				require.Equal(t, data, ctx)
+				result := <-resultCh
+				require.True(t, result.success)
+				require.Nilf(t, result.droppedEval, "expected no dropped evaluations but got one")
+			case <-time.After(5 * time.Second):
+				t.Fatal("No message was received on eval channel")
+			}
+		})
+		t.Run("eval should drop any concurrent sending to evalCh", func(t *testing.T) {
+			r := blankRuleForTests(context.Background())
+			time1 := time.UnixMilli(rand.Int63n(math.MaxInt64))
+			time2 := time.UnixMilli(rand.Int63n(math.MaxInt64))
+			resultCh1 := make(chan evalResponse)
+			resultCh2 := make(chan evalResponse)
+			data := &Evaluation{
+				scheduledAt: time1,
+				rule:        models.AlertRuleGen()(),
+				folderTitle: util.GenerateShortUID(),
+			}
+			data2 := &Evaluation{
+				scheduledAt: time2,
+				rule:        data.rule,
+				folderTitle: data.folderTitle,
+			}
+			wg := sync.WaitGroup{}
+			wg.Add(1)
+			go func() {
+				wg.Done()
+				result, dropped := r.Eval(data)
+				wg.Done()
+				resultCh1 <- evalResponse{result, dropped}
+			}()
+			wg.Wait()
+			wg.Add(2) // one when time1 is sent, another when go-routine for time2 has started
+			go func() {
+				wg.Done()
+				result, dropped := r.Eval(data2)
+				resultCh2 <- evalResponse{result, dropped}
+			}()
+			wg.Wait() // at this point tick 1 has already been dropped
+			select {
+			case ctx := <-r.evalCh:
+				require.Equal(t, time2, ctx.scheduledAt)
+				result := <-resultCh1
+				require.True(t, result.success)
+				require.Nilf(t, result.droppedEval, "expected no dropped evaluations but got one")
+				result = <-resultCh2
+				require.True(t, result.success)
+				require.NotNil(t, result.droppedEval, "expected no dropped evaluations but got one")
+				require.Equal(t, time1, result.droppedEval.scheduledAt)
+			case <-time.After(5 * time.Second):
+				t.Fatal("No message was received on eval channel")
+			}
+		})
+		t.Run("eval should exit when context is cancelled", func(t *testing.T) {
+			r := blankRuleForTests(context.Background())
+			resultCh := make(chan evalResponse)
+			data := &Evaluation{
+				scheduledAt: time.Now(),
+				rule:        models.AlertRuleGen()(),
+				folderTitle: util.GenerateShortUID(),
+			}
+			go func() {
+				result, dropped := r.Eval(data)
+				resultCh <- evalResponse{result, dropped}
+			}()
+			runtime.Gosched()
+			r.Stop(nil)
+			select {
+			case result := <-resultCh:
+				require.False(t, result.success)
+				require.Nilf(t, result.droppedEval, "expected no dropped evaluations but got one")
+			case <-time.After(5 * time.Second):
+				t.Fatal("No message was received on eval channel")
+			}
+		})
+	})
+	t.Run("when rule evaluation is stopped", func(t *testing.T) {
+		t.Run("Update should do nothing", func(t *testing.T) {
+			r := blankRuleForTests(context.Background())
+			r.Stop(errRuleDeleted)
+			require.ErrorIs(t, r.ctx.Err(), errRuleDeleted)
+			require.False(t, r.Update(RuleVersionAndPauseStatus{fingerprint(rand.Uint64()), false}))
+		})
+		t.Run("eval should do nothing", func(t *testing.T) {
+			r := blankRuleForTests(context.Background())
+			r.Stop(nil)
+			data := &Evaluation{
+				scheduledAt: time.Now(),
+				rule:        models.AlertRuleGen()(),
+				folderTitle: util.GenerateShortUID(),
+			}
+			success, dropped := r.Eval(data)
+			require.False(t, success)
+			require.Nilf(t, dropped, "expected no dropped evaluations but got one")
+		})
+		t.Run("stop should do nothing", func(t *testing.T) {
+			r := blankRuleForTests(context.Background())
+			r.Stop(nil)
+			r.Stop(nil)
+		})
+		t.Run("stop should do nothing if parent context stopped", func(t *testing.T) {
+			ctx, cancelFn := context.WithCancel(context.Background())
+			r := blankRuleForTests(ctx)
+			cancelFn()
+			r.Stop(nil)
+		})
+	})
+	t.Run("should be thread-safe", func(t *testing.T) {
+		r := blankRuleForTests(context.Background())
+		wg := sync.WaitGroup{}
+		go func() {
+			for {
+				select {
+				case <-r.evalCh:
+					time.Sleep(time.Microsecond)
+				case <-r.updateCh:
+					time.Sleep(time.Microsecond)
+				case <-r.ctx.Done():
+					return
+				}
+			}
+		}()
+
+		for i := 0; i < 10; i++ {
+			wg.Add(1)
+			go func() {
+				for i := 0; i < 20; i++ {
+					max := 3
+					if i <= 10 {
+						max = 2
+					}
+					switch rand.Intn(max) + 1 {
+					case 1:
+						r.Update(RuleVersionAndPauseStatus{fingerprint(rand.Uint64()), false})
+					case 2:
+						r.Eval(&Evaluation{
+							scheduledAt: time.Now(),
+							rule:        models.AlertRuleGen()(),
+							folderTitle: util.GenerateShortUID(),
+						})
+					case 3:
+						r.Stop(nil)
+					}
+				}
+				wg.Done()
+			}()
+		}
+
+		wg.Wait()
+	})
+}
+
+func blankRuleForTests(ctx context.Context) *alertRule {
+	return newAlertRule(context.Background(), nil, false, 0, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil)
+}
+
+func TestRuleRoutine(t *testing.T) {
+	createSchedule := func(
+		evalAppliedChan chan time.Time,
+		senderMock *SyncAlertsSenderMock,
+	) (*schedule, *fakeRulesStore, *state.FakeInstanceStore, prometheus.Gatherer) {
+		ruleStore := newFakeRulesStore()
+		instanceStore := &state.FakeInstanceStore{}
+
+		registry := prometheus.NewPedanticRegistry()
+		sch := setupScheduler(t, ruleStore, instanceStore, registry, senderMock, nil)
+		sch.evalAppliedFunc = func(key models.AlertRuleKey, t time.Time) {
+			evalAppliedChan <- t
+		}
+		return sch, ruleStore, instanceStore, registry
+	}
+
+	// normal states do not include NoData and Error because currently it is not possible to perform any sensible test
+	normalStates := []eval.State{eval.Normal, eval.Alerting, eval.Pending}
+	allStates := [...]eval.State{eval.Normal, eval.Alerting, eval.Pending, eval.NoData, eval.Error}
+
+	for _, evalState := range normalStates {
+		// TODO rewrite when we are able to mock/fake state manager
+		t.Run(fmt.Sprintf("when rule evaluation happens (evaluation state %s)", evalState), func(t *testing.T) {
+			evalAppliedChan := make(chan time.Time)
+			sch, ruleStore, instanceStore, reg := createSchedule(evalAppliedChan, nil)
+
+			rule := models.AlertRuleGen(withQueryForState(t, evalState))()
+			ruleStore.PutRule(context.Background(), rule)
+			folderTitle := ruleStore.getNamespaceTitle(rule.NamespaceUID)
+			factory := ruleFactoryFromScheduler(sch)
+			ctx, cancel := context.WithCancel(context.Background())
+			t.Cleanup(cancel)
+			ruleInfo := factory.new(ctx)
+			go func() {
+				_ = ruleInfo.Run(rule.GetKey())
+			}()
+
+			expectedTime := time.UnixMicro(rand.Int63())
+
+			ruleInfo.Eval(&Evaluation{
+				scheduledAt: expectedTime,
+				rule:        rule,
+				folderTitle: folderTitle,
+			})
+
+			actualTime := waitForTimeChannel(t, evalAppliedChan)
+			require.Equal(t, expectedTime, actualTime)
+
+			t.Run("it should add extra labels", func(t *testing.T) {
+				states := sch.stateManager.GetStatesForRuleUID(rule.OrgID, rule.UID)
+				for _, s := range states {
+					assert.Equal(t, rule.UID, s.Labels[alertingModels.RuleUIDLabel])
+					assert.Equal(t, rule.NamespaceUID, s.Labels[alertingModels.NamespaceUIDLabel])
+					assert.Equal(t, rule.Title, s.Labels[prometheusModel.AlertNameLabel])
+					assert.Equal(t, folderTitle, s.Labels[models.FolderTitleLabel])
+				}
+			})
+
+			t.Run("it should process evaluation results via state manager", func(t *testing.T) {
+				// TODO rewrite when we are able to mock/fake state manager
+				states := sch.stateManager.GetStatesForRuleUID(rule.OrgID, rule.UID)
+				require.Len(t, states, 1)
+				s := states[0]
+				require.Equal(t, rule.UID, s.AlertRuleUID)
+				require.Len(t, s.Results, 1)
+				var expectedStatus = evalState
+				if evalState == eval.Pending {
+					expectedStatus = eval.Alerting
+				}
+				require.Equal(t, expectedStatus.String(), s.Results[0].EvaluationState.String())
+				require.Equal(t, expectedTime, s.Results[0].EvaluationTime)
+			})
+			t.Run("it should save alert instances to storage", func(t *testing.T) {
+				// TODO rewrite when we are able to mock/fake state manager
+				states := sch.stateManager.GetStatesForRuleUID(rule.OrgID, rule.UID)
+				require.Len(t, states, 1)
+				s := states[0]
+
+				var cmd *models.AlertInstance
+				for _, op := range instanceStore.RecordedOps() {
+					switch q := op.(type) {
+					case models.AlertInstance:
+						cmd = &q
+					}
+					if cmd != nil {
+						break
+					}
+				}
+
+				require.NotNil(t, cmd)
+				t.Logf("Saved alert instances: %v", cmd)
+				require.Equal(t, rule.OrgID, cmd.RuleOrgID)
+				require.Equal(t, expectedTime, cmd.LastEvalTime)
+				require.Equal(t, rule.UID, cmd.RuleUID)
+				require.Equal(t, evalState.String(), string(cmd.CurrentState))
+				require.Equal(t, s.Labels, data.Labels(cmd.Labels))
+			})
+
+			t.Run("it reports metrics", func(t *testing.T) {
+				// duration metric has 0 values because of mocked clock that do not advance
+				expectedMetric := fmt.Sprintf(
+					`# HELP grafana_alerting_rule_evaluation_duration_seconds The time to evaluate a rule.
+        	            	# TYPE grafana_alerting_rule_evaluation_duration_seconds histogram
+        	            	grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="0.01"} 1
+        	            	grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="0.1"} 1
+        	            	grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="0.5"} 1
+        	            	grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="1"} 1
+        	            	grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="5"} 1
+        	            	grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="10"} 1
+        	            	grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="15"} 1
+        	            	grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="30"} 1
+							grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="60"} 1
+							grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="120"} 1
+							grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="180"} 1
+							grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="240"} 1
+							grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="300"} 1
+        	            	grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="+Inf"} 1
+        	            	grafana_alerting_rule_evaluation_duration_seconds_sum{org="%[1]d"} 0
+        	            	grafana_alerting_rule_evaluation_duration_seconds_count{org="%[1]d"} 1
+							# HELP grafana_alerting_rule_evaluation_failures_total The total number of rule evaluation failures.
+        	            	# TYPE grafana_alerting_rule_evaluation_failures_total counter
+        	            	grafana_alerting_rule_evaluation_failures_total{org="%[1]d"} 0
+        	            	# HELP grafana_alerting_rule_evaluations_total The total number of rule evaluations.
+        	            	# TYPE grafana_alerting_rule_evaluations_total counter
+        	            	grafana_alerting_rule_evaluations_total{org="%[1]d"} 1
+        	            	# HELP grafana_alerting_rule_evaluation_attempt_failures_total The total number of rule evaluation attempt failures.
+        	            	# TYPE grafana_alerting_rule_evaluation_attempt_failures_total counter
+        	            	grafana_alerting_rule_evaluation_attempt_failures_total{org="%[1]d"} 0
+        	            	# HELP grafana_alerting_rule_evaluation_attempts_total The total number of rule evaluation attempts.
+        	            	# TYPE grafana_alerting_rule_evaluation_attempts_total counter
+        	            	grafana_alerting_rule_evaluation_attempts_total{org="%[1]d"} 1
+
+							# HELP grafana_alerting_rule_process_evaluation_duration_seconds The time to process the evaluation results for a rule.
+							# TYPE grafana_alerting_rule_process_evaluation_duration_seconds histogram
+							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="0.01"} 1
+							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="0.1"} 1
+							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="0.5"} 1
+							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="1"} 1
+							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="5"} 1
+							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="10"} 1
+							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="15"} 1
+							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="30"} 1
+							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="60"} 1
+							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="120"} 1
+							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="180"} 1
+							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="240"} 1
+							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="300"} 1
+							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="+Inf"} 1
+							grafana_alerting_rule_process_evaluation_duration_seconds_sum{org="%[1]d"} 0
+							grafana_alerting_rule_process_evaluation_duration_seconds_count{org="%[1]d"} 1
+							# HELP grafana_alerting_rule_send_alerts_duration_seconds The time to send the alerts to Alertmanager.
+							# TYPE grafana_alerting_rule_send_alerts_duration_seconds histogram
+							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="0.01"} 1
+							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="0.1"} 1
+							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="0.5"} 1
+							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="1"} 1
+							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="5"} 1
+							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="10"} 1
+							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="15"} 1
+							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="30"} 1
+							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="60"} 1
+							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="120"} 1
+							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="180"} 1
+							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="240"} 1
+							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="300"} 1
+							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="+Inf"} 1
+							grafana_alerting_rule_send_alerts_duration_seconds_sum{org="%[1]d"} 0
+							grafana_alerting_rule_send_alerts_duration_seconds_count{org="%[1]d"} 1
+				`, rule.OrgID)
+
+				err := testutil.GatherAndCompare(reg, bytes.NewBufferString(expectedMetric),
+					"grafana_alerting_rule_evaluation_duration_seconds",
+					"grafana_alerting_rule_evaluations_total",
+					"grafana_alerting_rule_evaluation_failures_total",
+					"grafana_alerting_rule_evaluation_attempts_total",
+					"grafana_alerting_rule_evaluation_attempt_failures_total",
+					"grafana_alerting_rule_process_evaluation_duration_seconds",
+					"grafana_alerting_rule_send_alerts_duration_seconds")
+				require.NoError(t, err)
+			})
+		})
+	}
+
+	t.Run("should exit", func(t *testing.T) {
+		t.Run("and not clear the state if parent context is cancelled", func(t *testing.T) {
+			stoppedChan := make(chan error)
+			sch, _, _, _ := createSchedule(make(chan time.Time), nil)
+
+			rule := models.AlertRuleGen()()
+			_ = sch.stateManager.ProcessEvalResults(context.Background(), sch.clock.Now(), rule, eval.GenerateResults(rand.Intn(5)+1, eval.ResultGen(eval.WithEvaluatedAt(sch.clock.Now()))), nil)
+			expectedStates := sch.stateManager.GetStatesForRuleUID(rule.OrgID, rule.UID)
+			require.NotEmpty(t, expectedStates)
+
+			factory := ruleFactoryFromScheduler(sch)
+			ctx, cancel := context.WithCancel(context.Background())
+			ruleInfo := factory.new(ctx)
+			go func() {
+				err := ruleInfo.Run(models.AlertRuleKey{})
+				stoppedChan <- err
+			}()
+
+			cancel()
+			err := waitForErrChannel(t, stoppedChan)
+			require.NoError(t, err)
+			require.Equal(t, len(expectedStates), len(sch.stateManager.GetStatesForRuleUID(rule.OrgID, rule.UID)))
+		})
+		t.Run("and clean up the state if delete is cancellation reason for inner context", func(t *testing.T) {
+			stoppedChan := make(chan error)
+			sch, _, _, _ := createSchedule(make(chan time.Time), nil)
+
+			rule := models.AlertRuleGen()()
+			_ = sch.stateManager.ProcessEvalResults(context.Background(), sch.clock.Now(), rule, eval.GenerateResults(rand.Intn(5)+1, eval.ResultGen(eval.WithEvaluatedAt(sch.clock.Now()))), nil)
+			require.NotEmpty(t, sch.stateManager.GetStatesForRuleUID(rule.OrgID, rule.UID))
+
+			factory := ruleFactoryFromScheduler(sch)
+			ruleInfo := factory.new(context.Background())
+			go func() {
+				err := ruleInfo.Run(rule.GetKey())
+				stoppedChan <- err
+			}()
+
+			ruleInfo.Stop(errRuleDeleted)
+			err := waitForErrChannel(t, stoppedChan)
+			require.NoError(t, err)
+
+			require.Empty(t, sch.stateManager.GetStatesForRuleUID(rule.OrgID, rule.UID))
+		})
+	})
+
+	t.Run("when a message is sent to update channel", func(t *testing.T) {
+		rule := models.AlertRuleGen(withQueryForState(t, eval.Normal))()
+		folderTitle := "folderName"
+		ruleFp := ruleWithFolder{rule, folderTitle}.Fingerprint()
+
+		evalAppliedChan := make(chan time.Time)
+
+		sender := NewSyncAlertsSenderMock()
+		sender.EXPECT().Send(mock.Anything, rule.GetKey(), mock.Anything).Return()
+
+		sch, ruleStore, _, _ := createSchedule(evalAppliedChan, sender)
+		ruleStore.PutRule(context.Background(), rule)
+		sch.schedulableAlertRules.set([]*models.AlertRule{rule}, map[models.FolderKey]string{rule.GetFolderKey(): folderTitle})
+		factory := ruleFactoryFromScheduler(sch)
+		ctx, cancel := context.WithCancel(context.Background())
+		t.Cleanup(cancel)
+		ruleInfo := factory.new(ctx)
+
+		go func() {
+			_ = ruleInfo.Run(rule.GetKey())
+		}()
+
+		// init evaluation loop so it got the rule version
+		ruleInfo.Eval(&Evaluation{
+			scheduledAt: sch.clock.Now(),
+			rule:        rule,
+			folderTitle: folderTitle,
+		})
+
+		waitForTimeChannel(t, evalAppliedChan)
+
+		// define some state
+		states := make([]*state.State, 0, len(allStates))
+		for _, s := range allStates {
+			for i := 0; i < 2; i++ {
+				states = append(states, &state.State{
+					AlertRuleUID: rule.UID,
+					CacheID:      util.GenerateShortUID(),
+					OrgID:        rule.OrgID,
+					State:        s,
+					StartsAt:     sch.clock.Now(),
+					EndsAt:       sch.clock.Now().Add(time.Duration(rand.Intn(25)+5) * time.Second),
+					Labels:       rule.Labels,
+				})
+			}
+		}
+		sch.stateManager.Put(states)
+
+		states = sch.stateManager.GetStatesForRuleUID(rule.OrgID, rule.UID)
+		expectedToBeSent := 0
+		for _, s := range states {
+			if s.State == eval.Normal || s.State == eval.Pending {
+				continue
+			}
+			expectedToBeSent++
+		}
+		require.Greaterf(t, expectedToBeSent, 0, "State manager was expected to return at least one state that can be expired")
+
+		t.Run("should do nothing if version in channel is the same", func(t *testing.T) {
+			ruleInfo.Update(RuleVersionAndPauseStatus{ruleFp, false})
+			ruleInfo.Update(RuleVersionAndPauseStatus{ruleFp, false}) // second time just to make sure that previous messages were handled
+
+			actualStates := sch.stateManager.GetStatesForRuleUID(rule.OrgID, rule.UID)
+			require.Len(t, actualStates, len(states))
+
+			sender.AssertNotCalled(t, "Send", mock.Anything, mock.Anything)
+		})
+
+		t.Run("should clear the state and expire firing alerts if version in channel is greater", func(t *testing.T) {
+			ruleInfo.Update(RuleVersionAndPauseStatus{ruleFp + 1, false})
+
+			require.Eventually(t, func() bool {
+				return len(sender.Calls()) > 0
+			}, 5*time.Second, 100*time.Millisecond)
+
+			require.Empty(t, sch.stateManager.GetStatesForRuleUID(rule.OrgID, rule.UID))
+			sender.AssertNumberOfCalls(t, "Send", 1)
+			args, ok := sender.Calls()[0].Arguments[2].(definitions.PostableAlerts)
+			require.Truef(t, ok, fmt.Sprintf("expected argument of function was supposed to be 'definitions.PostableAlerts' but got %T", sender.Calls()[0].Arguments[2]))
+			require.Len(t, args.PostableAlerts, expectedToBeSent)
+		})
+	})
+
+	t.Run("when evaluation fails", func(t *testing.T) {
+		rule := models.AlertRuleGen(withQueryForState(t, eval.Error))()
+		rule.ExecErrState = models.ErrorErrState
+
+		evalAppliedChan := make(chan time.Time)
+
+		sender := NewSyncAlertsSenderMock()
+		sender.EXPECT().Send(mock.Anything, rule.GetKey(), mock.Anything).Return()
+
+		sch, ruleStore, _, reg := createSchedule(evalAppliedChan, sender)
+		sch.maxAttempts = 3
+		ruleStore.PutRule(context.Background(), rule)
+		factory := ruleFactoryFromScheduler(sch)
+		ctx, cancel := context.WithCancel(context.Background())
+		t.Cleanup(cancel)
+		ruleInfo := factory.new(ctx)
+
+		go func() {
+			_ = ruleInfo.Run(rule.GetKey())
+		}()
+
+		ruleInfo.Eval(&Evaluation{
+			scheduledAt: sch.clock.Now(),
+			rule:        rule,
+		})
+
+		waitForTimeChannel(t, evalAppliedChan)
+
+		t.Run("it should increase failure counter by 1 and attempt failure counter by 3", func(t *testing.T) {
+			// duration metric has 0 values because of mocked clock that do not advance
+			expectedMetric := fmt.Sprintf(
+				`# HELP grafana_alerting_rule_evaluation_duration_seconds The time to evaluate a rule.
+        	            # TYPE grafana_alerting_rule_evaluation_duration_seconds histogram
+        	            grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="0.01"} 1
+        	            grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="0.1"} 1
+        	            grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="0.5"} 1
+        	            grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="1"} 1
+        	            grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="5"} 1
+        	            grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="10"} 1
+        	            grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="15"} 1
+        	            grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="30"} 1
+						grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="60"} 1
+						grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="120"} 1
+						grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="180"} 1
+						grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="240"} 1
+						grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="300"} 1
+        	            grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="+Inf"} 1
+        	            grafana_alerting_rule_evaluation_duration_seconds_sum{org="%[1]d"} 0
+        	            grafana_alerting_rule_evaluation_duration_seconds_count{org="%[1]d"} 1
+						# HELP grafana_alerting_rule_evaluation_failures_total The total number of rule evaluation failures.
+        	            # TYPE grafana_alerting_rule_evaluation_failures_total counter
+        	            grafana_alerting_rule_evaluation_failures_total{org="%[1]d"} 1
+        	            # HELP grafana_alerting_rule_evaluations_total The total number of rule evaluations.
+        	            # TYPE grafana_alerting_rule_evaluations_total counter
+        	            grafana_alerting_rule_evaluations_total{org="%[1]d"} 1
+        	            # HELP grafana_alerting_rule_evaluation_attempt_failures_total The total number of rule evaluation attempt failures.
+        	            # TYPE grafana_alerting_rule_evaluation_attempt_failures_total counter
+        	            grafana_alerting_rule_evaluation_attempt_failures_total{org="%[1]d"} 3
+        	            # HELP grafana_alerting_rule_evaluation_attempts_total The total number of rule evaluation attempts.
+        	            # TYPE grafana_alerting_rule_evaluation_attempts_total counter
+        	            grafana_alerting_rule_evaluation_attempts_total{org="%[1]d"} 3
+						# HELP grafana_alerting_rule_process_evaluation_duration_seconds The time to process the evaluation results for a rule.
+						# TYPE grafana_alerting_rule_process_evaluation_duration_seconds histogram
+						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="0.01"} 1
+						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="0.1"} 1
+						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="0.5"} 1
+						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="1"} 1
+						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="5"} 1
+						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="10"} 1
+						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="15"} 1
+						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="30"} 1
+						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="60"} 1
+						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="120"} 1
+						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="180"} 1
+						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="240"} 1
+						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="300"} 1
+						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="+Inf"} 1
+						grafana_alerting_rule_process_evaluation_duration_seconds_sum{org="%[1]d"} 0
+						grafana_alerting_rule_process_evaluation_duration_seconds_count{org="%[1]d"} 1
+						# HELP grafana_alerting_rule_send_alerts_duration_seconds The time to send the alerts to Alertmanager.
+						# TYPE grafana_alerting_rule_send_alerts_duration_seconds histogram
+						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="0.01"} 1
+						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="0.1"} 1
+						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="0.5"} 1
+						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="1"} 1
+						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="5"} 1
+						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="10"} 1
+						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="15"} 1
+						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="30"} 1
+						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="60"} 1
+						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="120"} 1
+						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="180"} 1
+						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="240"} 1
+						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="300"} 1
+						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="+Inf"} 1
+						grafana_alerting_rule_send_alerts_duration_seconds_sum{org="%[1]d"} 0
+						grafana_alerting_rule_send_alerts_duration_seconds_count{org="%[1]d"} 1
+				`, rule.OrgID)
+
+			err := testutil.GatherAndCompare(reg, bytes.NewBufferString(expectedMetric),
+				"grafana_alerting_rule_evaluation_duration_seconds",
+				"grafana_alerting_rule_evaluations_total",
+				"grafana_alerting_rule_evaluation_failures_total",
+				"grafana_alerting_rule_evaluation_attempts_total",
+				"grafana_alerting_rule_evaluation_attempt_failures_total",
+				"grafana_alerting_rule_process_evaluation_duration_seconds",
+				"grafana_alerting_rule_send_alerts_duration_seconds")
+			require.NoError(t, err)
+		})
+
+		t.Run("it should send special alert DatasourceError", func(t *testing.T) {
+			sender.AssertNumberOfCalls(t, "Send", 1)
+			args, ok := sender.Calls()[0].Arguments[2].(definitions.PostableAlerts)
+			require.Truef(t, ok, fmt.Sprintf("expected argument of function was supposed to be 'definitions.PostableAlerts' but got %T", sender.Calls()[0].Arguments[2]))
+			assert.Len(t, args.PostableAlerts, 1)
+			assert.Equal(t, state.ErrorAlertName, args.PostableAlerts[0].Labels[prometheusModel.AlertNameLabel])
+		})
+	})
+
+	t.Run("when there are alerts that should be firing", func(t *testing.T) {
+		t.Run("it should call sender", func(t *testing.T) {
+			// eval.Alerting makes state manager to create notifications for alertmanagers
+			rule := models.AlertRuleGen(withQueryForState(t, eval.Alerting))()
+
+			evalAppliedChan := make(chan time.Time)
+
+			sender := NewSyncAlertsSenderMock()
+			sender.EXPECT().Send(mock.Anything, rule.GetKey(), mock.Anything).Return()
+
+			sch, ruleStore, _, _ := createSchedule(evalAppliedChan, sender)
+			ruleStore.PutRule(context.Background(), rule)
+			factory := ruleFactoryFromScheduler(sch)
+			ctx, cancel := context.WithCancel(context.Background())
+			t.Cleanup(cancel)
+			ruleInfo := factory.new(ctx)
+
+			go func() {
+				_ = ruleInfo.Run(rule.GetKey())
+			}()
+
+			ruleInfo.Eval(&Evaluation{
+				scheduledAt: sch.clock.Now(),
+				rule:        rule,
+			})
+
+			waitForTimeChannel(t, evalAppliedChan)
+
+			sender.AssertNumberOfCalls(t, "Send", 1)
+			args, ok := sender.Calls()[0].Arguments[2].(definitions.PostableAlerts)
+			require.Truef(t, ok, fmt.Sprintf("expected argument of function was supposed to be 'definitions.PostableAlerts' but got %T", sender.Calls()[0].Arguments[2]))
+
+			require.Len(t, args.PostableAlerts, 1)
+		})
+	})
+
+	t.Run("when there are no alerts to send it should not call notifiers", func(t *testing.T) {
+		rule := models.AlertRuleGen(withQueryForState(t, eval.Normal))()
+
+		evalAppliedChan := make(chan time.Time)
+
+		sender := NewSyncAlertsSenderMock()
+		sender.EXPECT().Send(mock.Anything, rule.GetKey(), mock.Anything).Return()
+
+		sch, ruleStore, _, _ := createSchedule(evalAppliedChan, sender)
+		ruleStore.PutRule(context.Background(), rule)
+		factory := ruleFactoryFromScheduler(sch)
+		ctx, cancel := context.WithCancel(context.Background())
+		t.Cleanup(cancel)
+		ruleInfo := factory.new(ctx)
+
+		go func() {
+			_ = ruleInfo.Run(rule.GetKey())
+		}()
+
+		ruleInfo.Eval(&Evaluation{
+			scheduledAt: sch.clock.Now(),
+			rule:        rule,
+		})
+
+		waitForTimeChannel(t, evalAppliedChan)
+
+		sender.AssertNotCalled(t, "Send", mock.Anything, mock.Anything)
+
+		require.NotEmpty(t, sch.stateManager.GetStatesForRuleUID(rule.OrgID, rule.UID))
+	})
+}
+
+func ruleFactoryFromScheduler(sch *schedule) ruleFactory {
+	return newRuleFactory(sch.appURL, sch.disableGrafanaFolder, sch.maxAttempts, sch.alertsSender, sch.stateManager, sch.evaluatorFactory, &sch.schedulableAlertRules, sch.clock, sch.metrics, sch.log, sch.tracer, sch.evalAppliedFunc, sch.stopAppliedFunc)
+}
diff --git a/pkg/services/ngalert/schedule/fetcher.go b/pkg/services/ngalert/schedule/fetcher.go
index 1db61e9ad9a27..fba2831d48f6a 100644
--- a/pkg/services/ngalert/schedule/fetcher.go
+++ b/pkg/services/ngalert/schedule/fetcher.go
@@ -3,36 +3,11 @@ package schedule
 import (
 	"context"
 	"fmt"
-	"hash/fnv"
-	"sort"
 	"time"
 
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 )
 
-// hashUIDs returns a fnv64 hash of the UIDs for all alert rules.
-// The order of the alert rules does not matter as hashUIDs sorts
-// the UIDs in increasing order.
-func hashUIDs(alertRules []*models.AlertRule) uint64 {
-	h := fnv.New64()
-	for _, uid := range sortedUIDs(alertRules) {
-		// We can ignore err as fnv64 does not return an error
-		// nolint:errcheck,gosec
-		h.Write([]byte(uid))
-	}
-	return h.Sum64()
-}
-
-// sortedUIDs returns a slice of sorted UIDs.
-func sortedUIDs(alertRules []*models.AlertRule) []string {
-	uids := make([]string, 0, len(alertRules))
-	for _, alertRule := range alertRules {
-		uids = append(uids, alertRule.UID)
-	}
-	sort.Strings(uids)
-	return uids
-}
-
 // updateSchedulableAlertRules updates the alert rules for the scheduler.
 // It returns diff that contains rule keys that were updated since the last poll,
 // and an error if the database query encountered problems.
diff --git a/pkg/services/ngalert/schedule/fetcher_test.go b/pkg/services/ngalert/schedule/fetcher_test.go
deleted file mode 100644
index 6d93c4237af83..0000000000000
--- a/pkg/services/ngalert/schedule/fetcher_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package schedule
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/grafana/grafana/pkg/services/ngalert/models"
-)
-
-func TestHashUIDs(t *testing.T) {
-	r := []*models.AlertRule{{UID: "foo"}, {UID: "bar"}}
-	assert.Equal(t, uint64(0xade76f55c76a1c48), hashUIDs(r))
-	// expect the same hash irrespective of order
-	r = []*models.AlertRule{{UID: "bar"}, {UID: "foo"}}
-	assert.Equal(t, uint64(0xade76f55c76a1c48), hashUIDs(r))
-	// expect a different hash
-	r = []*models.AlertRule{{UID: "bar"}}
-	assert.Equal(t, uint64(0xd8d9a5186bad3880), hashUIDs(r))
-	// slice with no items
-	r = []*models.AlertRule{}
-	assert.Equal(t, uint64(0xcbf29ce484222325), hashUIDs(r))
-	// a different slice with no items should have the same hash
-	r = []*models.AlertRule{}
-	assert.Equal(t, uint64(0xcbf29ce484222325), hashUIDs(r))
-}
diff --git a/pkg/services/ngalert/schedule/jitter.go b/pkg/services/ngalert/schedule/jitter.go
new file mode 100644
index 0000000000000..61adadb1286fe
--- /dev/null
+++ b/pkg/services/ngalert/schedule/jitter.go
@@ -0,0 +1,70 @@
+package schedule
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+// JitterStrategy represents a modifier to alert rule timing that affects how evaluations are distributed.
+type JitterStrategy int
+
+const (
+	JitterNever JitterStrategy = iota
+	JitterByGroup
+	JitterByRule
+)
+
+// JitterStrategyFrom returns the JitterStrategy indicated by the current Grafana feature toggles.
+func JitterStrategyFrom(cfg setting.UnifiedAlertingSettings, toggles featuremgmt.FeatureToggles) JitterStrategy {
+	strategy := JitterByGroup
+	if cfg.DisableJitter {
+		return JitterNever
+	}
+	if toggles == nil {
+		return strategy
+	}
+	if toggles.IsEnabledGlobally(featuremgmt.FlagJitterAlertRulesWithinGroups) {
+		strategy = JitterByRule
+	}
+	return strategy
+}
+
+// jitterOffsetInTicks gives the jitter offset for a rule, in terms of a number of ticks relative to its interval and a base interval.
+// The resulting number of ticks is non-negative. We assume the rule is well-formed and has an IntervalSeconds greater to or equal than baseInterval.
+func jitterOffsetInTicks(r *ngmodels.AlertRule, baseInterval time.Duration, strategy JitterStrategy) int64 {
+	if strategy == JitterNever {
+		return 0
+	}
+
+	itemFrequency := r.IntervalSeconds / int64(baseInterval.Seconds())
+	offset := jitterHash(r, strategy) % uint64(itemFrequency)
+	// Offset is always nonnegative and less than int64.max, because above we mod by itemFrequency which fits in the positive half of int64.
+	// offset <= itemFrequency <= int64.max
+	// So, this will not overflow and produce a negative offset.
+	res := int64(offset)
+
+	// Regardless, take an absolute value anyway for an extra layer of safety in case the above logic ever changes.
+	// Our contract requires that the result is nonnegative and less than int64.max.
+	if res < 0 {
+		return -res
+	}
+	return res
+}
+
+func jitterHash(r *ngmodels.AlertRule, strategy JitterStrategy) uint64 {
+	ls := data.Labels{
+		"name":  r.RuleGroup,
+		"file":  r.NamespaceUID,
+		"orgId": fmt.Sprint(r.OrgID),
+	}
+
+	if strategy == JitterByRule {
+		ls["uid"] = r.UID
+	}
+	return uint64(ls.Fingerprint())
+}
diff --git a/pkg/services/ngalert/schedule/jitter_test.go b/pkg/services/ngalert/schedule/jitter_test.go
new file mode 100644
index 0000000000000..ae7ead86fe798
--- /dev/null
+++ b/pkg/services/ngalert/schedule/jitter_test.go
@@ -0,0 +1,100 @@
+package schedule
+
+import (
+	"testing"
+	"time"
+
+	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/stretchr/testify/require"
+)
+
+func TestJitter(t *testing.T) {
+	t.Run("when strategy is JitterNever", func(t *testing.T) {
+		t.Run("offset is always zero", func(t *testing.T) {
+			rules := createTestRules(100, ngmodels.WithIntervalBetween(10, 600))
+			baseInterval := 10 * time.Second
+
+			for _, r := range rules {
+				offset := jitterOffsetInTicks(r, baseInterval, JitterNever)
+				require.Zero(t, offset, "unexpected offset, should be zero with jitter disabled; got %d", offset)
+			}
+		})
+	})
+
+	t.Run("when strategy is JitterByGroup", func(t *testing.T) {
+		t.Run("offset is stable for the same rule", func(t *testing.T) {
+			rule := ngmodels.AlertRuleGen(ngmodels.WithIntervalBetween(10, 600))()
+			baseInterval := 10 * time.Second
+			original := jitterOffsetInTicks(rule, baseInterval, JitterByGroup)
+
+			for i := 0; i < 100; i++ {
+				offset := jitterOffsetInTicks(rule, baseInterval, JitterByGroup)
+				require.Equal(t, original, offset, "jitterOffsetInTicks should return the same value for the same rule")
+			}
+		})
+
+		t.Run("offset is on the interval [0, interval/baseInterval)", func(t *testing.T) {
+			baseInterval := 10 * time.Second
+			rules := createTestRules(1000, ngmodels.WithIntervalBetween(10, 600))
+
+			for _, r := range rules {
+				offset := jitterOffsetInTicks(r, baseInterval, JitterByGroup)
+				require.GreaterOrEqual(t, offset, int64(0), "offset cannot be negative, got %d for rule with interval %d", offset, r.IntervalSeconds)
+				upperLimit := r.IntervalSeconds / int64(baseInterval.Seconds())
+				require.Less(t, offset, upperLimit, "offset cannot be equal to or greater than interval/baseInterval of %d", upperLimit)
+			}
+		})
+
+		t.Run("offset for any rule in the same group is always the same", func(t *testing.T) {
+			baseInterval := 10 * time.Second
+			group1 := ngmodels.AlertRuleGroupKey{}
+			group2 := ngmodels.AlertRuleGroupKey{}
+			rules1 := createTestRules(1000, ngmodels.WithInterval(60*time.Second), ngmodels.WithGroupKey(group1))
+			rules2 := createTestRules(1000, ngmodels.WithInterval(1*time.Hour), ngmodels.WithGroupKey(group2))
+
+			group1Offset := jitterOffsetInTicks(rules1[0], baseInterval, JitterByGroup)
+			for _, r := range rules1 {
+				offset := jitterOffsetInTicks(r, baseInterval, JitterByGroup)
+				require.Equal(t, group1Offset, offset)
+			}
+			group2Offset := jitterOffsetInTicks(rules2[0], baseInterval, JitterByGroup)
+			for _, r := range rules2 {
+				offset := jitterOffsetInTicks(r, baseInterval, JitterByGroup)
+				require.Equal(t, group2Offset, offset)
+			}
+		})
+	})
+
+	t.Run("when strategy is JitterByRule", func(t *testing.T) {
+		t.Run("offset is stable for the same rule", func(t *testing.T) {
+			rule := ngmodels.AlertRuleGen(ngmodels.WithIntervalBetween(10, 600))()
+			baseInterval := 10 * time.Second
+			original := jitterOffsetInTicks(rule, baseInterval, JitterByRule)
+
+			for i := 0; i < 100; i++ {
+				offset := jitterOffsetInTicks(rule, baseInterval, JitterByRule)
+				require.Equal(t, original, offset, "jitterOffsetInTicks should return the same value for the same rule")
+			}
+		})
+
+		t.Run("offset is on the interval [0, interval/baseInterval)", func(t *testing.T) {
+			baseInterval := 10 * time.Second
+			rules := createTestRules(1000, ngmodels.WithIntervalBetween(10, 600))
+
+			for _, r := range rules {
+				offset := jitterOffsetInTicks(r, baseInterval, JitterByRule)
+				require.GreaterOrEqual(t, offset, int64(0), "offset cannot be negative, got %d for rule with interval %d", offset, r.IntervalSeconds)
+				upperLimit := r.IntervalSeconds / int64(baseInterval.Seconds())
+				require.Less(t, offset, upperLimit, "offset cannot be equal to or greater than interval/baseInterval of %d", upperLimit)
+			}
+		})
+	})
+}
+
+func createTestRules(n int, mutators ...ngmodels.AlertRuleMutator) []*ngmodels.AlertRule {
+	result := make([]*ngmodels.AlertRule, 0, n)
+	for i := 0; i < n; i++ {
+		result = append(result, ngmodels.AlertRuleGen(mutators...)())
+	}
+	return result
+}
diff --git a/pkg/services/ngalert/schedule/loaded_metrics_reader.go b/pkg/services/ngalert/schedule/loaded_metrics_reader.go
new file mode 100644
index 0000000000000..b407f4d615edb
--- /dev/null
+++ b/pkg/services/ngalert/schedule/loaded_metrics_reader.go
@@ -0,0 +1,44 @@
+package schedule
+
+import (
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+
+	"github.com/grafana/grafana/pkg/services/ngalert/eval"
+	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/state"
+)
+
+var _ eval.AlertingResultsReader = AlertingResultsFromRuleState{}
+
+func (a *alertRule) newLoadedMetricsReader(rule *ngmodels.AlertRule) eval.AlertingResultsReader {
+	return &AlertingResultsFromRuleState{
+		Manager: a.stateManager,
+		Rule:    rule,
+	}
+}
+
+type RuleStateProvider interface {
+	GetStatesForRuleUID(orgID int64, alertRuleUID string) []*state.State
+}
+
+// AlertingResultsFromRuleState implements eval.AlertingResultsReader that gets the data from state manager.
+// It returns results fingerprints only for Alerting and Pending states that have empty StateReason.
+type AlertingResultsFromRuleState struct {
+	Manager RuleStateProvider
+	Rule    *ngmodels.AlertRule
+}
+
+func (n AlertingResultsFromRuleState) Read() map[data.Fingerprint]struct{} {
+	states := n.Manager.GetStatesForRuleUID(n.Rule.OrgID, n.Rule.UID)
+
+	active := map[data.Fingerprint]struct{}{}
+	for _, st := range states {
+		if st.StateReason != "" {
+			continue
+		}
+		if st.State == eval.Alerting || st.State == eval.Pending {
+			active[st.ResultFingerprint] = struct{}{}
+		}
+	}
+	return active
+}
diff --git a/pkg/services/ngalert/schedule/loaded_metrics_reader_test.go b/pkg/services/ngalert/schedule/loaded_metrics_reader_test.go
new file mode 100644
index 0000000000000..14648031c8a4f
--- /dev/null
+++ b/pkg/services/ngalert/schedule/loaded_metrics_reader_test.go
@@ -0,0 +1,65 @@
+package schedule
+
+import (
+	"testing"
+
+	"github.com/google/uuid"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/services/ngalert/eval"
+	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/state"
+)
+
+func TestLoadedResultsFromRuleState(t *testing.T) {
+	rule := ngmodels.AlertRuleGen()()
+	p := &FakeRuleStateProvider{
+		map[ngmodels.AlertRuleKey][]*state.State{
+			rule.GetKey(): {
+				{State: eval.Alerting, ResultFingerprint: data.Fingerprint(1)},
+				{State: eval.Pending, ResultFingerprint: data.Fingerprint(2)},
+				{State: eval.Normal, ResultFingerprint: data.Fingerprint(3)},
+				{State: eval.NoData, ResultFingerprint: data.Fingerprint(4)},
+				{State: eval.Error, ResultFingerprint: data.Fingerprint(5)},
+			},
+		},
+	}
+
+	reader := AlertingResultsFromRuleState{
+		Manager: p,
+		Rule:    rule,
+	}
+
+	t.Run("should return pending and alerting states", func(t *testing.T) {
+		loaded := reader.Read()
+		require.Len(t, loaded, 2)
+		require.Contains(t, loaded, data.Fingerprint(1))
+		require.Contains(t, loaded, data.Fingerprint(2))
+	})
+
+	t.Run("should not return any states with reason", func(t *testing.T) {
+		for _, s := range p.states[rule.GetKey()] {
+			s.StateReason = uuid.NewString()
+		}
+		loaded := reader.Read()
+		require.Empty(t, loaded)
+	})
+
+	t.Run("empty if no states", func(t *testing.T) {
+		p.states[rule.GetKey()] = nil
+		loaded := reader.Read()
+		require.Empty(t, loaded)
+	})
+}
+
+type FakeRuleStateProvider struct {
+	states map[ngmodels.AlertRuleKey][]*state.State
+}
+
+func (f FakeRuleStateProvider) GetStatesForRuleUID(orgID int64, UID string) []*state.State {
+	return f.states[ngmodels.AlertRuleKey{
+		OrgID: orgID,
+		UID:   UID,
+	}]
+}
diff --git a/pkg/services/ngalert/schedule/metrics.go b/pkg/services/ngalert/schedule/metrics.go
new file mode 100644
index 0000000000000..62e9e59079479
--- /dev/null
+++ b/pkg/services/ngalert/schedule/metrics.go
@@ -0,0 +1,75 @@
+package schedule
+
+import (
+	"fmt"
+	"hash/fnv"
+	"sort"
+
+	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
+	models "github.com/grafana/grafana/pkg/services/ngalert/models"
+)
+
+// hashUIDs returns a fnv64 hash of the UIDs for all alert rules.
+// The order of the alert rules does not matter as hashUIDs sorts
+// the UIDs in increasing order.
+func hashUIDs(alertRules []*models.AlertRule) uint64 {
+	h := fnv.New64()
+	for _, uid := range sortedUIDs(alertRules) {
+		// We can ignore err as fnv64 does not return an error
+		// nolint:errcheck,gosec
+		h.Write([]byte(uid))
+	}
+	return h.Sum64()
+}
+
+// sortedUIDs returns a slice of sorted UIDs.
+func sortedUIDs(alertRules []*models.AlertRule) []string {
+	uids := make([]string, 0, len(alertRules))
+	for _, alertRule := range alertRules {
+		uids = append(uids, alertRule.UID)
+	}
+	sort.Strings(uids)
+	return uids
+}
+
+func (sch *schedule) updateRulesMetrics(alertRules []*models.AlertRule) {
+	rulesPerOrg := make(map[int64]int64)                // orgID -> count
+	orgsPaused := make(map[int64]int64)                 // orgID -> count
+	orgsNfSettings := make(map[int64]int64)             // orgID -> count
+	groupsPerOrg := make(map[int64]map[string]struct{}) // orgID -> set of groups
+	for _, rule := range alertRules {
+		rulesPerOrg[rule.OrgID]++
+
+		if rule.IsPaused {
+			orgsPaused[rule.OrgID]++
+		}
+
+		if len(rule.NotificationSettings) > 0 {
+			orgsNfSettings[rule.OrgID]++
+		}
+
+		orgGroups, ok := groupsPerOrg[rule.OrgID]
+		if !ok {
+			orgGroups = make(map[string]struct{})
+			groupsPerOrg[rule.OrgID] = orgGroups
+		}
+		orgGroups[rule.RuleGroup] = struct{}{}
+	}
+
+	for orgID, numRules := range rulesPerOrg {
+		numRulesPaused := orgsPaused[orgID]
+		numRulesNfSettings := orgsNfSettings[orgID]
+		sch.metrics.GroupRules.WithLabelValues(fmt.Sprint(orgID), metrics.AlertRuleActiveLabelValue).Set(float64(numRules - numRulesPaused))
+		sch.metrics.GroupRules.WithLabelValues(fmt.Sprint(orgID), metrics.AlertRulePausedLabelValue).Set(float64(numRulesPaused))
+		sch.metrics.SimpleNotificationRules.WithLabelValues(fmt.Sprint(orgID)).Set(float64(numRulesNfSettings))
+	}
+
+	for orgID, groups := range groupsPerOrg {
+		sch.metrics.Groups.WithLabelValues(fmt.Sprint(orgID)).Set(float64(len(groups)))
+	}
+
+	// While these are the rules that we iterate over, at the moment there's no 100% guarantee that they'll be
+	// scheduled as rules could be removed before we get a chance to evaluate them.
+	sch.metrics.SchedulableAlertRules.Set(float64(len(alertRules)))
+	sch.metrics.SchedulableAlertRulesHash.Set(float64(hashUIDs(alertRules)))
+}
diff --git a/pkg/services/ngalert/schedule/metrics_test.go b/pkg/services/ngalert/schedule/metrics_test.go
new file mode 100644
index 0000000000000..6f924535cd53d
--- /dev/null
+++ b/pkg/services/ngalert/schedule/metrics_test.go
@@ -0,0 +1,25 @@
+package schedule
+
+import (
+	"testing"
+
+	models "github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestHashUIDs(t *testing.T) {
+	r := []*models.AlertRule{{UID: "foo"}, {UID: "bar"}}
+	assert.Equal(t, uint64(0xade76f55c76a1c48), hashUIDs(r))
+	// expect the same hash irrespective of order
+	r = []*models.AlertRule{{UID: "bar"}, {UID: "foo"}}
+	assert.Equal(t, uint64(0xade76f55c76a1c48), hashUIDs(r))
+	// expect a different hash
+	r = []*models.AlertRule{{UID: "bar"}}
+	assert.Equal(t, uint64(0xd8d9a5186bad3880), hashUIDs(r))
+	// slice with no items
+	r = []*models.AlertRule{}
+	assert.Equal(t, uint64(0xcbf29ce484222325), hashUIDs(r))
+	// a different slice with no items should have the same hash
+	r = []*models.AlertRule{}
+	assert.Equal(t, uint64(0xcbf29ce484222325), hashUIDs(r))
+}
diff --git a/pkg/services/ngalert/schedule/registry.go b/pkg/services/ngalert/schedule/registry.go
index 202b645d312b9..6a8ec87f19a9a 100644
--- a/pkg/services/ngalert/schedule/registry.go
+++ b/pkg/services/ngalert/schedule/registry.go
@@ -13,120 +13,74 @@ import (
 	"unsafe"
 
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
-	"github.com/grafana/grafana/pkg/util"
 )
 
 var errRuleDeleted = errors.New("rule deleted")
 
-type alertRuleInfoRegistry struct {
-	mu            sync.Mutex
-	alertRuleInfo map[models.AlertRuleKey]*alertRuleInfo
+type ruleFactory interface {
+	new(context.Context) Rule
 }
 
-// getOrCreateInfo gets rule routine information from registry by the key. If it does not exist, it creates a new one.
-// Returns a pointer to the rule routine information and a flag that indicates whether it is a new struct or not.
-func (r *alertRuleInfoRegistry) getOrCreateInfo(context context.Context, key models.AlertRuleKey) (*alertRuleInfo, bool) {
+type ruleRegistry struct {
+	mu    sync.Mutex
+	rules map[models.AlertRuleKey]Rule
+}
+
+func newRuleRegistry() ruleRegistry {
+	return ruleRegistry{rules: make(map[models.AlertRuleKey]Rule)}
+}
+
+// getOrCreate gets rule routine from registry by the key. If it does not exist, it creates a new one.
+// Returns a pointer to the rule routine and a flag that indicates whether it is a new struct or not.
+func (r *ruleRegistry) getOrCreate(context context.Context, key models.AlertRuleKey, factory ruleFactory) (Rule, bool) {
 	r.mu.Lock()
 	defer r.mu.Unlock()
 
-	info, ok := r.alertRuleInfo[key]
+	rule, ok := r.rules[key]
 	if !ok {
-		info = newAlertRuleInfo(context)
-		r.alertRuleInfo[key] = info
+		rule = factory.new(context)
+		r.rules[key] = rule
 	}
-	return info, !ok
+	return rule, !ok
 }
 
-func (r *alertRuleInfoRegistry) exists(key models.AlertRuleKey) bool {
+func (r *ruleRegistry) exists(key models.AlertRuleKey) bool {
 	r.mu.Lock()
 	defer r.mu.Unlock()
 
-	_, ok := r.alertRuleInfo[key]
+	_, ok := r.rules[key]
 	return ok
 }
 
-// del removes pair that has specific key from alertRuleInfo.
+// del removes pair that has specific key from the registry.
 // Returns 2-tuple where the first element is value of the removed pair
 // and the second element indicates whether element with the specified key existed.
-func (r *alertRuleInfoRegistry) del(key models.AlertRuleKey) (*alertRuleInfo, bool) {
+func (r *ruleRegistry) del(key models.AlertRuleKey) (Rule, bool) {
 	r.mu.Lock()
 	defer r.mu.Unlock()
-	info, ok := r.alertRuleInfo[key]
+	rule, ok := r.rules[key]
 	if ok {
-		delete(r.alertRuleInfo, key)
+		delete(r.rules, key)
 	}
-	return info, ok
+	return rule, ok
 }
 
-func (r *alertRuleInfoRegistry) keyMap() map[models.AlertRuleKey]struct{} {
+func (r *ruleRegistry) keyMap() map[models.AlertRuleKey]struct{} {
 	r.mu.Lock()
 	defer r.mu.Unlock()
-	definitionsIDs := make(map[models.AlertRuleKey]struct{}, len(r.alertRuleInfo))
-	for k := range r.alertRuleInfo {
+	definitionsIDs := make(map[models.AlertRuleKey]struct{}, len(r.rules))
+	for k := range r.rules {
 		definitionsIDs[k] = struct{}{}
 	}
 	return definitionsIDs
 }
 
-type ruleVersionAndPauseStatus struct {
+type RuleVersionAndPauseStatus struct {
 	Fingerprint fingerprint
 	IsPaused    bool
 }
 
-type alertRuleInfo struct {
-	evalCh   chan *evaluation
-	updateCh chan ruleVersionAndPauseStatus
-	ctx      context.Context
-	stop     func(reason error)
-}
-
-func newAlertRuleInfo(parent context.Context) *alertRuleInfo {
-	ctx, stop := util.WithCancelCause(parent)
-	return &alertRuleInfo{evalCh: make(chan *evaluation), updateCh: make(chan ruleVersionAndPauseStatus), ctx: ctx, stop: stop}
-}
-
-// eval signals the rule evaluation routine to perform the evaluation of the rule. Does nothing if the loop is stopped.
-// Before sending a message into the channel, it does non-blocking read to make sure that there is no concurrent send operation.
-// Returns a tuple where first element is
-//   - true when message was sent
-//   - false when the send operation is stopped
-//
-// the second element contains a dropped message that was sent by a concurrent sender.
-func (a *alertRuleInfo) eval(eval *evaluation) (bool, *evaluation) {
-	// read the channel in unblocking manner to make sure that there is no concurrent send operation.
-	var droppedMsg *evaluation
-	select {
-	case droppedMsg = <-a.evalCh:
-	default:
-	}
-
-	select {
-	case a.evalCh <- eval:
-		return true, droppedMsg
-	case <-a.ctx.Done():
-		return false, droppedMsg
-	}
-}
-
-// update sends an instruction to the rule evaluation routine to update the scheduled rule to the specified version. The specified version must be later than the current version, otherwise no update will happen.
-func (a *alertRuleInfo) update(lastVersion ruleVersionAndPauseStatus) bool {
-	// check if the channel is not empty.
-	select {
-	case <-a.updateCh:
-	case <-a.ctx.Done():
-		return false
-	default:
-	}
-
-	select {
-	case a.updateCh <- lastVersion:
-		return true
-	case <-a.ctx.Done():
-		return false
-	}
-}
-
-type evaluation struct {
+type Evaluation struct {
 	scheduledAt time.Time
 	rule        *models.AlertRule
 	folderTitle string
@@ -134,12 +88,12 @@ type evaluation struct {
 
 type alertRulesRegistry struct {
 	rules        map[models.AlertRuleKey]*models.AlertRule
-	folderTitles map[string]string
+	folderTitles map[models.FolderKey]string
 	mu           sync.Mutex
 }
 
 // all returns all rules in the registry.
-func (r *alertRulesRegistry) all() ([]*models.AlertRule, map[string]string) {
+func (r *alertRulesRegistry) all() ([]*models.AlertRule, map[models.FolderKey]string) {
 	r.mu.Lock()
 	defer r.mu.Unlock()
 	result := make([]*models.AlertRule, 0, len(r.rules))
@@ -156,7 +110,7 @@ func (r *alertRulesRegistry) get(k models.AlertRuleKey) *models.AlertRule {
 }
 
 // set replaces all rules in the registry. Returns difference between previous and the new current version of the registry
-func (r *alertRulesRegistry) set(rules []*models.AlertRule, folders map[string]string) diff {
+func (r *alertRulesRegistry) set(rules []*models.AlertRule, folders map[models.FolderKey]string) diff {
 	r.mu.Lock()
 	defer r.mu.Unlock()
 	rulesMap := make(map[models.AlertRuleKey]*models.AlertRule)
@@ -263,6 +217,7 @@ func (r ruleWithFolder) Fingerprint() fingerprint {
 			writeBytes(nil)
 			return
 		}
+		// #nosec G103
 		// avoid allocation when converting string to byte slice
 		writeBytes(unsafe.Slice(unsafe.StringData(s), len(s)))
 	}
@@ -336,13 +291,16 @@ func (r ruleWithFolder) Fingerprint() fingerprint {
 		writeInt(0)
 	}
 
+	for _, setting := range rule.NotificationSettings {
+		binary.LittleEndian.PutUint64(tmp, uint64(setting.Fingerprint()))
+		writeBytes(tmp)
+	}
+
 	// fields that do not affect the state.
 	// TODO consider removing fields below from the fingerprint
 	writeInt(rule.ID)
 	writeInt(rule.OrgID)
-	writeInt(rule.IntervalSeconds)
 	writeInt(int64(rule.For))
-	writeLabels(rule.Annotations)
 	if rule.DashboardUID != nil {
 		writeString(*rule.DashboardUID)
 	}
diff --git a/pkg/services/ngalert/schedule/registry_test.go b/pkg/services/ngalert/schedule/registry_test.go
index 5b70b6b797820..c617d91a56230 100644
--- a/pkg/services/ngalert/schedule/registry_test.go
+++ b/pkg/services/ngalert/schedule/registry_test.go
@@ -1,13 +1,9 @@
 package schedule
 
 import (
-	"context"
 	"encoding/json"
-	"math"
 	"math/rand"
 	"reflect"
-	"runtime"
-	"sync"
 	"testing"
 	"time"
 
@@ -16,230 +12,15 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
-	"github.com/grafana/grafana/pkg/util"
 )
 
-func TestSchedule_alertRuleInfo(t *testing.T) {
-	type evalResponse struct {
-		success     bool
-		droppedEval *evaluation
-	}
-
-	t.Run("when rule evaluation is not stopped", func(t *testing.T) {
-		t.Run("update should send to updateCh", func(t *testing.T) {
-			r := newAlertRuleInfo(context.Background())
-			resultCh := make(chan bool)
-			go func() {
-				resultCh <- r.update(ruleVersionAndPauseStatus{fingerprint(rand.Uint64()), false})
-			}()
-			select {
-			case <-r.updateCh:
-				require.True(t, <-resultCh)
-			case <-time.After(5 * time.Second):
-				t.Fatal("No message was received on update channel")
-			}
-		})
-		t.Run("update should drop any concurrent sending to updateCh", func(t *testing.T) {
-			r := newAlertRuleInfo(context.Background())
-			version1 := ruleVersionAndPauseStatus{fingerprint(rand.Uint64()), false}
-			version2 := ruleVersionAndPauseStatus{fingerprint(rand.Uint64()), false}
-
-			wg := sync.WaitGroup{}
-			wg.Add(1)
-			go func() {
-				wg.Done()
-				r.update(version1)
-				wg.Done()
-			}()
-			wg.Wait()
-			wg.Add(2) // one when time1 is sent, another when go-routine for time2 has started
-			go func() {
-				wg.Done()
-				r.update(version2)
-			}()
-			wg.Wait() // at this point tick 1 has already been dropped
-			select {
-			case version := <-r.updateCh:
-				require.Equal(t, version2, version)
-			case <-time.After(5 * time.Second):
-				t.Fatal("No message was received on eval channel")
-			}
-		})
-		t.Run("eval should send to evalCh", func(t *testing.T) {
-			r := newAlertRuleInfo(context.Background())
-			expected := time.Now()
-			resultCh := make(chan evalResponse)
-			data := &evaluation{
-				scheduledAt: expected,
-				rule:        models.AlertRuleGen()(),
-				folderTitle: util.GenerateShortUID(),
-			}
-			go func() {
-				result, dropped := r.eval(data)
-				resultCh <- evalResponse{result, dropped}
-			}()
-			select {
-			case ctx := <-r.evalCh:
-				require.Equal(t, data, ctx)
-				result := <-resultCh
-				require.True(t, result.success)
-				require.Nilf(t, result.droppedEval, "expected no dropped evaluations but got one")
-			case <-time.After(5 * time.Second):
-				t.Fatal("No message was received on eval channel")
-			}
-		})
-		t.Run("eval should drop any concurrent sending to evalCh", func(t *testing.T) {
-			r := newAlertRuleInfo(context.Background())
-			time1 := time.UnixMilli(rand.Int63n(math.MaxInt64))
-			time2 := time.UnixMilli(rand.Int63n(math.MaxInt64))
-			resultCh1 := make(chan evalResponse)
-			resultCh2 := make(chan evalResponse)
-			data := &evaluation{
-				scheduledAt: time1,
-				rule:        models.AlertRuleGen()(),
-				folderTitle: util.GenerateShortUID(),
-			}
-			data2 := &evaluation{
-				scheduledAt: time2,
-				rule:        data.rule,
-				folderTitle: data.folderTitle,
-			}
-			wg := sync.WaitGroup{}
-			wg.Add(1)
-			go func() {
-				wg.Done()
-				result, dropped := r.eval(data)
-				wg.Done()
-				resultCh1 <- evalResponse{result, dropped}
-			}()
-			wg.Wait()
-			wg.Add(2) // one when time1 is sent, another when go-routine for time2 has started
-			go func() {
-				wg.Done()
-				result, dropped := r.eval(data2)
-				resultCh2 <- evalResponse{result, dropped}
-			}()
-			wg.Wait() // at this point tick 1 has already been dropped
-			select {
-			case ctx := <-r.evalCh:
-				require.Equal(t, time2, ctx.scheduledAt)
-				result := <-resultCh1
-				require.True(t, result.success)
-				require.Nilf(t, result.droppedEval, "expected no dropped evaluations but got one")
-				result = <-resultCh2
-				require.True(t, result.success)
-				require.NotNil(t, result.droppedEval, "expected no dropped evaluations but got one")
-				require.Equal(t, time1, result.droppedEval.scheduledAt)
-			case <-time.After(5 * time.Second):
-				t.Fatal("No message was received on eval channel")
-			}
-		})
-		t.Run("eval should exit when context is cancelled", func(t *testing.T) {
-			r := newAlertRuleInfo(context.Background())
-			resultCh := make(chan evalResponse)
-			data := &evaluation{
-				scheduledAt: time.Now(),
-				rule:        models.AlertRuleGen()(),
-				folderTitle: util.GenerateShortUID(),
-			}
-			go func() {
-				result, dropped := r.eval(data)
-				resultCh <- evalResponse{result, dropped}
-			}()
-			runtime.Gosched()
-			r.stop(nil)
-			select {
-			case result := <-resultCh:
-				require.False(t, result.success)
-				require.Nilf(t, result.droppedEval, "expected no dropped evaluations but got one")
-			case <-time.After(5 * time.Second):
-				t.Fatal("No message was received on eval channel")
-			}
-		})
-	})
-	t.Run("when rule evaluation is stopped", func(t *testing.T) {
-		t.Run("Update should do nothing", func(t *testing.T) {
-			r := newAlertRuleInfo(context.Background())
-			r.stop(errRuleDeleted)
-			require.ErrorIs(t, r.ctx.Err(), errRuleDeleted)
-			require.False(t, r.update(ruleVersionAndPauseStatus{fingerprint(rand.Uint64()), false}))
-		})
-		t.Run("eval should do nothing", func(t *testing.T) {
-			r := newAlertRuleInfo(context.Background())
-			r.stop(nil)
-			data := &evaluation{
-				scheduledAt: time.Now(),
-				rule:        models.AlertRuleGen()(),
-				folderTitle: util.GenerateShortUID(),
-			}
-			success, dropped := r.eval(data)
-			require.False(t, success)
-			require.Nilf(t, dropped, "expected no dropped evaluations but got one")
-		})
-		t.Run("stop should do nothing", func(t *testing.T) {
-			r := newAlertRuleInfo(context.Background())
-			r.stop(nil)
-			r.stop(nil)
-		})
-		t.Run("stop should do nothing if parent context stopped", func(t *testing.T) {
-			ctx, cancelFn := context.WithCancel(context.Background())
-			r := newAlertRuleInfo(ctx)
-			cancelFn()
-			r.stop(nil)
-		})
-	})
-	t.Run("should be thread-safe", func(t *testing.T) {
-		r := newAlertRuleInfo(context.Background())
-		wg := sync.WaitGroup{}
-		go func() {
-			for {
-				select {
-				case <-r.evalCh:
-					time.Sleep(time.Microsecond)
-				case <-r.updateCh:
-					time.Sleep(time.Microsecond)
-				case <-r.ctx.Done():
-					return
-				}
-			}
-		}()
-
-		for i := 0; i < 10; i++ {
-			wg.Add(1)
-			go func() {
-				for i := 0; i < 20; i++ {
-					max := 3
-					if i <= 10 {
-						max = 2
-					}
-					switch rand.Intn(max) + 1 {
-					case 1:
-						r.update(ruleVersionAndPauseStatus{fingerprint(rand.Uint64()), false})
-					case 2:
-						r.eval(&evaluation{
-							scheduledAt: time.Now(),
-							rule:        models.AlertRuleGen()(),
-							folderTitle: util.GenerateShortUID(),
-						})
-					case 3:
-						r.stop(nil)
-					}
-				}
-				wg.Done()
-			}()
-		}
-
-		wg.Wait()
-	})
-}
-
 func TestSchedulableAlertRulesRegistry(t *testing.T) {
 	r := alertRulesRegistry{rules: make(map[models.AlertRuleKey]*models.AlertRule)}
 	rules, folders := r.all()
 	assert.Len(t, rules, 0)
 	assert.Len(t, folders, 0)
 
-	expectedFolders := map[string]string{"test-uid": "test-title"}
+	expectedFolders := map[models.FolderKey]string{{OrgID: 1, UID: "test-uid"}: "test-title"}
 	// replace all rules in the registry with foo
 	r.set([]*models.AlertRule{{OrgID: 1, UID: "foo", Version: 1}}, expectedFolders)
 	rules, folders = r.all()
@@ -308,7 +89,7 @@ func TestSchedulableAlertRulesRegistry_set(t *testing.T) {
 		for _, rule := range initialRules {
 			newRules = append(newRules, models.CopyRule(rule))
 		}
-		diff := r.set(newRules, map[string]string{})
+		diff := r.set(newRules, map[models.FolderKey]string{})
 		require.Truef(t, diff.IsEmpty(), "Diff is not empty. Probably we check something else than key + version")
 	})
 	t.Run("should return empty diff if version does not change", func(t *testing.T) {
@@ -324,7 +105,7 @@ func TestSchedulableAlertRulesRegistry_set(t *testing.T) {
 			newRules = append(newRules, rule)
 		}
 
-		diff := r.set(newRules, map[string]string{})
+		diff := r.set(newRules, map[models.FolderKey]string{})
 		require.Truef(t, diff.IsEmpty(), "Diff is not empty. Probably we check something else than key + version")
 	})
 	t.Run("should return key in diff if version changes", func(t *testing.T) {
@@ -340,7 +121,7 @@ func TestSchedulableAlertRulesRegistry_set(t *testing.T) {
 		}
 		require.NotEmptyf(t, expectedUpdated, "Input parameters have changed. Nothing to assert")
 
-		diff := r.set(newRules, map[string]string{})
+		diff := r.set(newRules, map[models.FolderKey]string{})
 		require.Falsef(t, diff.IsEmpty(), "Diff is empty but should not be")
 		require.Equal(t, expectedUpdated, diff.updated)
 	})
@@ -369,10 +150,13 @@ func TestRuleWithFolderFingerprint(t *testing.T) {
 		f2 := ruleWithFolder{rule: rule, folderTitle: uuid.NewString()}.Fingerprint()
 		require.NotEqual(t, f, f2)
 	})
-	t.Run("Version and Updated should be excluded from fingerprint", func(t *testing.T) {
+	t.Run("Version, Updated, IntervalSeconds and Annotations should be excluded from fingerprint", func(t *testing.T) {
 		cp := models.CopyRule(rule)
 		cp.Version++
 		cp.Updated = cp.Updated.Add(1 * time.Second)
+		cp.IntervalSeconds++
+		cp.Annotations = make(map[string]string)
+		cp.Annotations["test"] = "test"
 
 		f2 := ruleWithFolder{rule: cp, folderTitle: title}.Fingerprint()
 		require.Equal(t, f, f2)
@@ -415,6 +199,9 @@ func TestRuleWithFolderFingerprint(t *testing.T) {
 				"key-label": "value-label",
 			},
 			IsPaused: false,
+			NotificationSettings: []models.NotificationSettings{
+				models.NotificationSettingsGen()(),
+			},
 		}
 		r2 := &models.AlertRule{
 			ID:        2,
@@ -450,11 +237,16 @@ func TestRuleWithFolderFingerprint(t *testing.T) {
 				"key-label": "value-label23",
 			},
 			IsPaused: true,
+			NotificationSettings: []models.NotificationSettings{
+				models.NotificationSettingsGen()(),
+			},
 		}
 
 		excludedFields := map[string]struct{}{
-			"Version": {},
-			"Updated": {},
+			"Version":         {},
+			"Updated":         {},
+			"IntervalSeconds": {},
+			"Annotations":     {},
 		}
 
 		tp := reflect.TypeOf(rule).Elem()
diff --git a/pkg/services/ngalert/schedule/schedule.go b/pkg/services/ngalert/schedule/schedule.go
index 13ac4d048192d..a2ccbe53c7fa2 100644
--- a/pkg/services/ngalert/schedule/schedule.go
+++ b/pkg/services/ngalert/schedule/schedule.go
@@ -2,27 +2,20 @@ package schedule
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"net/url"
 	"time"
 
 	"github.com/benbjohnson/clock"
-	"go.opentelemetry.io/otel/attribute"
-	"go.opentelemetry.io/otel/codes"
-	"go.opentelemetry.io/otel/trace"
 	"golang.org/x/sync/errgroup"
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
-	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/ngalert/eval"
 	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
 	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/state"
-	"github.com/grafana/grafana/pkg/services/org"
-	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/util/ticker"
 )
 
@@ -34,6 +27,9 @@ type ScheduleService interface {
 	Run(context.Context) error
 }
 
+// retryDelay represents how long to wait between each failed rule evaluation.
+const retryDelay = 1 * time.Second
+
 // AlertsSender is an interface for a service that is responsible for sending notifications to the end-user.
 //
 //go:generate mockery --name AlertsSender --structname AlertsSenderMock --inpackage --filename alerts_sender_mock.go --with-expecter
@@ -51,8 +47,8 @@ type schedule struct {
 	// base tick rate (fastest possible configured check)
 	baseInterval time.Duration
 
-	// each alert rule gets its own channel and routine
-	registry alertRuleInfoRegistry
+	// each rule gets its own channel and routine
+	registry ruleRegistry
 
 	maxAttempts int64
 
@@ -78,6 +74,7 @@ type schedule struct {
 
 	appURL               *url.URL
 	disableGrafanaFolder bool
+	jitterEvaluations    JitterStrategy
 
 	metrics *metrics.Scheduler
 
@@ -101,6 +98,7 @@ type SchedulerCfg struct {
 	MinRuleInterval      time.Duration
 	DisableGrafanaFolder bool
 	AppURL               *url.URL
+	JitterEvaluations    JitterStrategy
 	EvaluatorFactory     eval.EvaluatorFactory
 	RuleStore            RulesStore
 	Metrics              *metrics.Scheduler
@@ -109,10 +107,16 @@ type SchedulerCfg struct {
 	Log                  log.Logger
 }
 
-// NewScheduler returns a new schedule.
+// NewScheduler returns a new scheduler.
 func NewScheduler(cfg SchedulerCfg, stateManager *state.Manager) *schedule {
+	const minMaxAttempts = int64(1)
+	if cfg.MaxAttempts < minMaxAttempts {
+		cfg.Log.Warn("Invalid scheduler maxAttempts, using a safe minimum", "configured", cfg.MaxAttempts, "actual", minMaxAttempts)
+		cfg.MaxAttempts = minMaxAttempts
+	}
+
 	sch := schedule{
-		registry:              alertRuleInfoRegistry{alertRuleInfo: make(map[ngmodels.AlertRuleKey]*alertRuleInfo)},
+		registry:              newRuleRegistry(),
 		maxAttempts:           cfg.MaxAttempts,
 		clock:                 cfg.C,
 		baseInterval:          cfg.BaseInterval,
@@ -122,6 +126,7 @@ func NewScheduler(cfg SchedulerCfg, stateManager *state.Manager) *schedule {
 		metrics:               cfg.Metrics,
 		appURL:                cfg.AppURL,
 		disableGrafanaFolder:  cfg.DisableGrafanaFolder,
+		jitterEvaluations:     cfg.JitterEvaluations,
 		stateManager:          stateManager,
 		minRuleInterval:       cfg.MinRuleInterval,
 		schedulableAlertRules: alertRulesRegistry{rules: make(map[ngmodels.AlertRuleKey]*ngmodels.AlertRule)},
@@ -133,7 +138,7 @@ func NewScheduler(cfg SchedulerCfg, stateManager *state.Manager) *schedule {
 }
 
 func (sch *schedule) Run(ctx context.Context) error {
-	sch.log.Info("Starting scheduler", "tickInterval", sch.baseInterval)
+	sch.log.Info("Starting scheduler", "tickInterval", sch.baseInterval, "maxAttempts", sch.maxAttempts)
 	t := ticker.New(sch.clock, sch.baseInterval, sch.metrics.Ticker)
 	defer t.Stop()
 
@@ -143,6 +148,13 @@ func (sch *schedule) Run(ctx context.Context) error {
 	return nil
 }
 
+// Rules fetches the entire set of rules considered for evaluation by the scheduler on the next tick.
+// Such rules are not guaranteed to have been evaluated by the scheduler.
+// Rules returns all supplementary metadata for the rules that is stored by the scheduler - namely, the set of folder titles.
+func (sch *schedule) Rules() ([]*ngmodels.AlertRule, map[ngmodels.FolderKey]string) {
+	return sch.schedulableAlertRules.all()
+}
+
 // deleteAlertRule stops evaluation of the rule, deletes it from active rules, and cleans up state cache.
 func (sch *schedule) deleteAlertRule(keys ...ngmodels.AlertRuleKey) {
 	for _, key := range keys {
@@ -153,13 +165,13 @@ func (sch *schedule) deleteAlertRule(keys ...ngmodels.AlertRuleKey) {
 			sch.log.Info("Alert rule cannot be removed from the scheduler as it is not scheduled", key.LogContext()...)
 		}
 		// Delete the rule routine
-		ruleInfo, ok := sch.registry.del(key)
+		ruleRoutine, ok := sch.registry.del(key)
 		if !ok {
 			sch.log.Info("Alert rule cannot be stopped as it is not running", key.LogContext()...)
 			continue
 		}
 		// stop rule evaluation
-		ruleInfo.stop(errRuleDeleted)
+		ruleRoutine.Stop(errRuleDeleted)
 	}
 	// Our best bet at this point is that we update the metrics with what we hope to schedule in the next tick.
 	alertRules, _ := sch.schedulableAlertRules.all()
@@ -190,30 +202,8 @@ func (sch *schedule) schedulePeriodic(ctx context.Context, t *ticker.T) error {
 }
 
 type readyToRunItem struct {
-	ruleInfo *alertRuleInfo
-	evaluation
-}
-
-func (sch *schedule) updateRulesMetrics(alertRules []*ngmodels.AlertRule) {
-	orgs := make(map[int64]int64, len(alertRules))
-	orgsPaused := make(map[int64]int64, len(alertRules))
-	for _, rule := range alertRules {
-		orgs[rule.OrgID]++
-		if rule.IsPaused {
-			orgsPaused[rule.OrgID]++
-		}
-	}
-
-	for orgID, numRules := range orgs {
-		numRulesPaused := orgsPaused[orgID]
-		sch.metrics.GroupRules.WithLabelValues(fmt.Sprint(orgID), metrics.AlertRuleActiveLabelValue).Set(float64(numRules - numRulesPaused))
-		sch.metrics.GroupRules.WithLabelValues(fmt.Sprint(orgID), metrics.AlertRulePausedLabelValue).Set(float64(numRulesPaused))
-	}
-
-	// While these are the rules that we iterate over, at the moment there's no 100% guarantee that they'll be
-	// scheduled as rules could be removed before we get a chance to evaluate them.
-	sch.metrics.SchedulableAlertRules.Set(float64(len(alertRules)))
-	sch.metrics.SchedulableAlertRulesHash.Set(float64(hashUIDs(alertRules)))
+	ruleRoutine Rule
+	Evaluation
 }
 
 // TODO refactor to accept a callback for tests that will be called with things that are returned currently, and return nothing.
@@ -245,9 +235,24 @@ func (sch *schedule) processTick(ctx context.Context, dispatcherGroup *errgroup.
 	readyToRun := make([]readyToRunItem, 0)
 	updatedRules := make([]ngmodels.AlertRuleKeyWithVersion, 0, len(updated)) // this is needed for tests only
 	missingFolder := make(map[string][]string)
+	ruleFactory := newRuleFactory(
+		sch.appURL,
+		sch.disableGrafanaFolder,
+		sch.maxAttempts,
+		sch.alertsSender,
+		sch.stateManager,
+		sch.evaluatorFactory,
+		&sch.schedulableAlertRules,
+		sch.clock,
+		sch.metrics,
+		sch.log,
+		sch.tracer,
+		sch.evalAppliedFunc,
+		sch.stopAppliedFunc,
+	)
 	for _, item := range alertRules {
 		key := item.GetKey()
-		ruleInfo, newRoutine := sch.registry.getOrCreateInfo(ctx, key)
+		ruleRoutine, newRoutine := sch.registry.getOrCreate(ctx, key, ruleFactory)
 
 		// enforce minimum evaluation interval
 		if item.IntervalSeconds < int64(sch.minRuleInterval.Seconds()) {
@@ -259,7 +264,7 @@ func (sch *schedule) processTick(ctx context.Context, dispatcherGroup *errgroup.
 
 		if newRoutine && !invalidInterval {
 			dispatcherGroup.Go(func() error {
-				return sch.ruleRoutine(ruleInfo.ctx, key, ruleInfo.evalCh, ruleInfo.updateCh)
+				return ruleRoutine.Run(key)
 			})
 		}
 
@@ -271,11 +276,12 @@ func (sch *schedule) processTick(ctx context.Context, dispatcherGroup *errgroup.
 		}
 
 		itemFrequency := item.IntervalSeconds / int64(sch.baseInterval.Seconds())
-		isReadyToRun := item.IntervalSeconds != 0 && tickNum%itemFrequency == 0
+		offset := jitterOffsetInTicks(item, sch.baseInterval, sch.jitterEvaluations)
+		isReadyToRun := item.IntervalSeconds != 0 && (tickNum%itemFrequency)-offset == 0
 
 		var folderTitle string
 		if !sch.disableGrafanaFolder {
-			title, ok := folderTitles[item.NamespaceUID]
+			title, ok := folderTitles[item.GetFolderKey()]
 			if ok {
 				folderTitle = title
 			} else {
@@ -284,7 +290,8 @@ func (sch *schedule) processTick(ctx context.Context, dispatcherGroup *errgroup.
 		}
 
 		if isReadyToRun {
-			readyToRun = append(readyToRun, readyToRunItem{ruleInfo: ruleInfo, evaluation: evaluation{
+			sch.log.Debug("Rule is ready to run on the current tick", "uid", item.UID, "tick", tickNum, "frequency", itemFrequency, "offset", offset)
+			readyToRun = append(readyToRun, readyToRunItem{ruleRoutine: ruleRoutine, Evaluation: Evaluation{
 				scheduledAt: tick,
 				rule:        item,
 				folderTitle: folderTitle,
@@ -293,12 +300,12 @@ func (sch *schedule) processTick(ctx context.Context, dispatcherGroup *errgroup.
 		if _, isUpdated := updated[key]; isUpdated && !isReadyToRun {
 			// if we do not need to eval the rule, check the whether rule was just updated and if it was, notify evaluation routine about that
 			sch.log.Debug("Rule has been updated. Notifying evaluation routine", key.LogContext()...)
-			go func(ri *alertRuleInfo, rule *ngmodels.AlertRule) {
-				ri.update(ruleVersionAndPauseStatus{
+			go func(routine Rule, rule *ngmodels.AlertRule) {
+				routine.Update(RuleVersionAndPauseStatus{
 					Fingerprint: ruleWithFolder{rule: rule, folderTitle: folderTitle}.Fingerprint(),
 					IsPaused:    rule.IsPaused,
 				})
-			}(ruleInfo, item)
+			}(ruleRoutine, item)
 			updatedRules = append(updatedRules, ngmodels.AlertRuleKeyWithVersion{
 				Version:      item.Version,
 				AlertRuleKey: item.GetKey(),
@@ -323,7 +330,7 @@ func (sch *schedule) processTick(ctx context.Context, dispatcherGroup *errgroup.
 
 		time.AfterFunc(time.Duration(int64(i)*step), func() {
 			key := item.rule.GetKey()
-			success, dropped := item.ruleInfo.eval(&item.evaluation)
+			success, dropped := item.ruleRoutine.Eval(&item.Evaluation)
 			if !success {
 				sch.log.Debug("Scheduled evaluation was canceled because evaluation routine was stopped", append(key.LogContext(), "time", tick)...)
 				return
@@ -344,237 +351,3 @@ func (sch *schedule) processTick(ctx context.Context, dispatcherGroup *errgroup.
 	sch.deleteAlertRule(toDelete...)
 	return readyToRun, registeredDefinitions, updatedRules
 }
-
-func (sch *schedule) ruleRoutine(grafanaCtx context.Context, key ngmodels.AlertRuleKey, evalCh <-chan *evaluation, updateCh <-chan ruleVersionAndPauseStatus) error {
-	grafanaCtx = ngmodels.WithRuleKey(grafanaCtx, key)
-	logger := sch.log.FromContext(grafanaCtx)
-	logger.Debug("Alert rule routine started")
-
-	orgID := fmt.Sprint(key.OrgID)
-	evalTotal := sch.metrics.EvalTotal.WithLabelValues(orgID)
-	evalDuration := sch.metrics.EvalDuration.WithLabelValues(orgID)
-	evalTotalFailures := sch.metrics.EvalFailures.WithLabelValues(orgID)
-	processDuration := sch.metrics.ProcessDuration.WithLabelValues(orgID)
-	sendDuration := sch.metrics.SendDuration.WithLabelValues(orgID)
-
-	notify := func(states []state.StateTransition) {
-		expiredAlerts := state.FromAlertsStateToStoppedAlert(states, sch.appURL, sch.clock)
-		if len(expiredAlerts.PostableAlerts) > 0 {
-			sch.alertsSender.Send(grafanaCtx, key, expiredAlerts)
-		}
-	}
-
-	resetState := func(ctx context.Context, isPaused bool) {
-		rule := sch.schedulableAlertRules.get(key)
-		reason := ngmodels.StateReasonUpdated
-		if isPaused {
-			reason = ngmodels.StateReasonPaused
-		}
-		states := sch.stateManager.ResetStateByRuleUID(ctx, rule, reason)
-		notify(states)
-	}
-
-	evaluate := func(ctx context.Context, f fingerprint, attempt int64, e *evaluation, span trace.Span) {
-		logger := logger.New("version", e.rule.Version, "fingerprint", f, "attempt", attempt, "now", e.scheduledAt).FromContext(ctx)
-		start := sch.clock.Now()
-
-		evalCtx := eval.NewContext(ctx, SchedulerUserFor(e.rule.OrgID))
-		ruleEval, err := sch.evaluatorFactory.Create(evalCtx, e.rule.GetEvalCondition())
-		var results eval.Results
-		var dur time.Duration
-		if err != nil {
-			dur = sch.clock.Now().Sub(start)
-			logger.Error("Failed to build rule evaluator", "error", err)
-		} else {
-			results, err = ruleEval.Evaluate(ctx, e.scheduledAt)
-			dur = sch.clock.Now().Sub(start)
-			if err != nil {
-				logger.Error("Failed to evaluate rule", "error", err, "duration", dur)
-			}
-		}
-
-		evalTotal.Inc()
-		evalDuration.Observe(dur.Seconds())
-
-		if err != nil || results.HasErrors() {
-			evalTotalFailures.Inc()
-			if results == nil {
-				results = append(results, eval.NewResultFromError(err, e.scheduledAt, dur))
-			}
-			if err == nil {
-				for _, result := range results {
-					if result.Error != nil {
-						err = errors.Join(err, result.Error)
-					}
-				}
-			}
-			span.SetStatus(codes.Error, "rule evaluation failed")
-			span.RecordError(err)
-		} else {
-			logger.Debug("Alert rule evaluated", "results", results, "duration", dur)
-			span.AddEvent("rule evaluated", trace.WithAttributes(
-				attribute.Int64("results", int64(len(results))),
-			))
-		}
-		if ctx.Err() != nil { // check if the context is not cancelled. The evaluation can be a long-running task.
-			logger.Debug("Skip updating the state because the context has been cancelled")
-			return
-		}
-		start = sch.clock.Now()
-		processedStates := sch.stateManager.ProcessEvalResults(
-			ctx,
-			e.scheduledAt,
-			e.rule,
-			results,
-			state.GetRuleExtraLabels(e.rule, e.folderTitle, !sch.disableGrafanaFolder),
-		)
-		processDuration.Observe(sch.clock.Now().Sub(start).Seconds())
-
-		start = sch.clock.Now()
-		alerts := state.FromStateTransitionToPostableAlerts(processedStates, sch.stateManager, sch.appURL)
-		span.AddEvent("results processed", trace.WithAttributes(
-			attribute.Int64("state_transitions", int64(len(processedStates))),
-			attribute.Int64("alerts_to_send", int64(len(alerts.PostableAlerts))),
-		))
-		if len(alerts.PostableAlerts) > 0 {
-			sch.alertsSender.Send(ctx, key, alerts)
-		}
-		sendDuration.Observe(sch.clock.Now().Sub(start).Seconds())
-	}
-
-	retryIfError := func(f func(attempt int64) error) error {
-		var attempt int64
-		var err error
-		for attempt = 0; attempt < sch.maxAttempts; attempt++ {
-			err = f(attempt)
-			if err == nil {
-				return nil
-			}
-		}
-		return err
-	}
-
-	evalRunning := false
-	var currentFingerprint fingerprint
-	defer sch.stopApplied(key)
-	for {
-		select {
-		// used by external services (API) to notify that rule is updated.
-		case ctx := <-updateCh:
-			if currentFingerprint == ctx.Fingerprint {
-				logger.Info("Rule's fingerprint has not changed. Skip resetting the state", "currentFingerprint", currentFingerprint)
-				continue
-			}
-
-			logger.Info("Clearing the state of the rule because it was updated", "isPaused", ctx.IsPaused, "fingerprint", ctx.Fingerprint)
-			// clear the state. So the next evaluation will start from the scratch.
-			resetState(grafanaCtx, ctx.IsPaused)
-			currentFingerprint = ctx.Fingerprint
-		// evalCh - used by the scheduler to signal that evaluation is needed.
-		case ctx, ok := <-evalCh:
-			if !ok {
-				logger.Debug("Evaluation channel has been closed. Exiting")
-				return nil
-			}
-			if evalRunning {
-				continue
-			}
-
-			func() {
-				evalRunning = true
-				defer func() {
-					evalRunning = false
-					sch.evalApplied(key, ctx.scheduledAt)
-				}()
-
-				err := retryIfError(func(attempt int64) error {
-					isPaused := ctx.rule.IsPaused
-					f := ruleWithFolder{ctx.rule, ctx.folderTitle}.Fingerprint()
-					// Do not clean up state if the eval loop has just started.
-					var needReset bool
-					if currentFingerprint != 0 && currentFingerprint != f {
-						logger.Debug("Got a new version of alert rule. Clear up the state", "fingerprint", f)
-						needReset = true
-					}
-					// We need to reset state if the loop has started and the alert is already paused. It can happen,
-					// if we have an alert with state and we do file provision with stateful Grafana, that state
-					// lingers in DB and won't be cleaned up until next alert rule update.
-					needReset = needReset || (currentFingerprint == 0 && isPaused)
-					if needReset {
-						resetState(grafanaCtx, isPaused)
-					}
-					currentFingerprint = f
-					if isPaused {
-						logger.Debug("Skip rule evaluation because it is paused")
-						return nil
-					}
-
-					fpStr := currentFingerprint.String()
-					utcTick := ctx.scheduledAt.UTC().Format(time.RFC3339Nano)
-					tracingCtx, span := sch.tracer.Start(grafanaCtx, "alert rule execution", trace.WithAttributes(
-						attribute.String("rule_uid", ctx.rule.UID),
-						attribute.Int64("org_id", ctx.rule.OrgID),
-						attribute.Int64("rule_version", ctx.rule.Version),
-						attribute.String("rule_fingerprint", fpStr),
-						attribute.String("tick", utcTick),
-					))
-					defer span.End()
-
-					evaluate(tracingCtx, f, attempt, ctx, span)
-					return nil
-				})
-				if err != nil {
-					logger.Error("Evaluation failed after all retries", "error", err)
-				}
-			}()
-		case <-grafanaCtx.Done():
-			// clean up the state only if the reason for stopping the evaluation loop is that the rule was deleted
-			if errors.Is(grafanaCtx.Err(), errRuleDeleted) {
-				// We do not want a context to be unbounded which could potentially cause a go routine running
-				// indefinitely. 1 minute is an almost randomly chosen timeout, big enough to cover the majority of the
-				// cases.
-				ctx, cancelFunc := context.WithTimeout(context.Background(), time.Minute)
-				defer cancelFunc()
-				states := sch.stateManager.DeleteStateByRuleUID(ngmodels.WithRuleKey(ctx, key), key, ngmodels.StateReasonRuleDeleted)
-				notify(states)
-			}
-			logger.Debug("Stopping alert rule routine")
-			return nil
-		}
-	}
-}
-
-// evalApplied is only used on tests.
-func (sch *schedule) evalApplied(alertDefKey ngmodels.AlertRuleKey, now time.Time) {
-	if sch.evalAppliedFunc == nil {
-		return
-	}
-
-	sch.evalAppliedFunc(alertDefKey, now)
-}
-
-// stopApplied is only used on tests.
-func (sch *schedule) stopApplied(alertDefKey ngmodels.AlertRuleKey) {
-	if sch.stopAppliedFunc == nil {
-		return
-	}
-
-	sch.stopAppliedFunc(alertDefKey)
-}
-
-func SchedulerUserFor(orgID int64) *user.SignedInUser {
-	return &user.SignedInUser{
-		UserID:           -1,
-		IsServiceAccount: true,
-		Login:            "grafana_scheduler",
-		OrgID:            orgID,
-		OrgRole:          org.RoleAdmin,
-		Permissions: map[int64]map[string][]string{
-			orgID: {
-				datasources.ActionQuery: []string{
-					datasources.ScopeAll,
-				},
-			},
-		},
-	}
-}
diff --git a/pkg/services/ngalert/schedule/schedule_unit_test.go b/pkg/services/ngalert/schedule/schedule_unit_test.go
index 5e362580d1ea6..c30b54d390116 100644
--- a/pkg/services/ngalert/schedule/schedule_unit_test.go
+++ b/pkg/services/ngalert/schedule/schedule_unit_test.go
@@ -11,11 +11,8 @@ import (
 	"time"
 
 	"github.com/benbjohnson/clock"
-	alertingModels "github.com/grafana/alerting/models"
-	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/testutil"
-	prometheusModel "github.com/prometheus/common/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
@@ -24,15 +21,14 @@ import (
 	"github.com/grafana/grafana/pkg/expr"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
+	datasources "github.com/grafana/grafana/pkg/services/datasources/fakes"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/ngalert/eval"
 	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/state"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/util"
 )
 
 type evalAppliedInfo struct {
@@ -58,7 +54,7 @@ func TestProcessTicks(t *testing.T) {
 
 	mockedClock := clock.NewMock()
 
-	notifier := &AlertsSenderMock{}
+	notifier := NewSyncAlertsSenderMock()
 	notifier.EXPECT().Send(mock.Anything, mock.Anything, mock.Anything).Return()
 
 	appUrl := &url.URL{
@@ -66,28 +62,31 @@ func TestProcessTicks(t *testing.T) {
 		Host:   "localhost",
 	}
 
+	cacheServ := &datasources.FakeCacheService{}
+	evaluator := eval.NewEvaluatorFactory(setting.UnifiedAlertingSettings{}, cacheServ, expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, nil, nil, &featuremgmt.FeatureManager{}, nil, tracing.InitializeTracerForTest()), &pluginstore.FakePluginStore{})
+
 	schedCfg := SchedulerCfg{
-		BaseInterval: cfg.BaseInterval,
-		C:            mockedClock,
-		AppURL:       appUrl,
-		RuleStore:    ruleStore,
-		Metrics:      testMetrics.GetSchedulerMetrics(),
-		AlertSender:  notifier,
-		Tracer:       testTracer,
-		Log:          log.New("ngalert.scheduler"),
+		BaseInterval:     cfg.BaseInterval,
+		C:                mockedClock,
+		AppURL:           appUrl,
+		EvaluatorFactory: evaluator,
+		RuleStore:        ruleStore,
+		Metrics:          testMetrics.GetSchedulerMetrics(),
+		AlertSender:      notifier,
+		Tracer:           testTracer,
+		Log:              log.New("ngalert.scheduler"),
 	}
 	managerCfg := state.ManagerCfg{
-		Metrics:                 testMetrics.GetStateMetrics(),
-		ExternalURL:             nil,
-		InstanceStore:           nil,
-		Images:                  &state.NoopImageService{},
-		Clock:                   mockedClock,
-		Historian:               &state.FakeHistorian{},
-		MaxStateSaveConcurrency: 1,
-		Tracer:                  testTracer,
-		Log:                     log.New("ngalert.state.manager"),
+		Metrics:       testMetrics.GetStateMetrics(),
+		ExternalURL:   nil,
+		InstanceStore: nil,
+		Images:        &state.NoopImageService{},
+		Clock:         mockedClock,
+		Historian:     &state.FakeHistorian{},
+		Tracer:        testTracer,
+		Log:           log.New("ngalert.state.manager"),
 	}
-	st := state.NewManager(managerCfg)
+	st := state.NewManager(managerCfg, state.NewNoopPersister())
 
 	sched := NewScheduler(schedCfg, st)
 
@@ -357,479 +356,16 @@ func TestProcessTicks(t *testing.T) {
 	})
 }
 
-func TestSchedule_ruleRoutine(t *testing.T) {
-	createSchedule := func(
-		evalAppliedChan chan time.Time,
-		senderMock *AlertsSenderMock,
-	) (*schedule, *fakeRulesStore, *state.FakeInstanceStore, prometheus.Gatherer) {
-		ruleStore := newFakeRulesStore()
-		instanceStore := &state.FakeInstanceStore{}
-
-		registry := prometheus.NewPedanticRegistry()
-		sch := setupScheduler(t, ruleStore, instanceStore, registry, senderMock, nil)
-		sch.evalAppliedFunc = func(key models.AlertRuleKey, t time.Time) {
-			evalAppliedChan <- t
-		}
-		return sch, ruleStore, instanceStore, registry
-	}
-
-	// normal states do not include NoData and Error because currently it is not possible to perform any sensible test
-	normalStates := []eval.State{eval.Normal, eval.Alerting, eval.Pending}
-	allStates := [...]eval.State{eval.Normal, eval.Alerting, eval.Pending, eval.NoData, eval.Error}
-
-	for _, evalState := range normalStates {
-		// TODO rewrite when we are able to mock/fake state manager
-		t.Run(fmt.Sprintf("when rule evaluation happens (evaluation state %s)", evalState), func(t *testing.T) {
-			evalChan := make(chan *evaluation)
-			evalAppliedChan := make(chan time.Time)
-			sch, ruleStore, instanceStore, reg := createSchedule(evalAppliedChan, nil)
-
-			rule := models.AlertRuleGen(withQueryForState(t, evalState))()
-			ruleStore.PutRule(context.Background(), rule)
-			folderTitle := ruleStore.getNamespaceTitle(rule.NamespaceUID)
-			go func() {
-				ctx, cancel := context.WithCancel(context.Background())
-				t.Cleanup(cancel)
-				_ = sch.ruleRoutine(ctx, rule.GetKey(), evalChan, make(chan ruleVersionAndPauseStatus))
-			}()
-
-			expectedTime := time.UnixMicro(rand.Int63())
-
-			evalChan <- &evaluation{
-				scheduledAt: expectedTime,
-				rule:        rule,
-				folderTitle: folderTitle,
-			}
-
-			actualTime := waitForTimeChannel(t, evalAppliedChan)
-			require.Equal(t, expectedTime, actualTime)
-
-			t.Run("it should add extra labels", func(t *testing.T) {
-				states := sch.stateManager.GetStatesForRuleUID(rule.OrgID, rule.UID)
-				for _, s := range states {
-					assert.Equal(t, rule.UID, s.Labels[alertingModels.RuleUIDLabel])
-					assert.Equal(t, rule.NamespaceUID, s.Labels[alertingModels.NamespaceUIDLabel])
-					assert.Equal(t, rule.Title, s.Labels[prometheusModel.AlertNameLabel])
-					assert.Equal(t, folderTitle, s.Labels[models.FolderTitleLabel])
-				}
-			})
-
-			t.Run("it should process evaluation results via state manager", func(t *testing.T) {
-				// TODO rewrite when we are able to mock/fake state manager
-				states := sch.stateManager.GetStatesForRuleUID(rule.OrgID, rule.UID)
-				require.Len(t, states, 1)
-				s := states[0]
-				require.Equal(t, rule.UID, s.AlertRuleUID)
-				require.Len(t, s.Results, 1)
-				var expectedStatus = evalState
-				if evalState == eval.Pending {
-					expectedStatus = eval.Alerting
-				}
-				require.Equal(t, expectedStatus.String(), s.Results[0].EvaluationState.String())
-				require.Equal(t, expectedTime, s.Results[0].EvaluationTime)
-			})
-			t.Run("it should save alert instances to storage", func(t *testing.T) {
-				// TODO rewrite when we are able to mock/fake state manager
-				states := sch.stateManager.GetStatesForRuleUID(rule.OrgID, rule.UID)
-				require.Len(t, states, 1)
-				s := states[0]
-
-				var cmd *models.AlertInstance
-				for _, op := range instanceStore.RecordedOps {
-					switch q := op.(type) {
-					case models.AlertInstance:
-						cmd = &q
-					}
-					if cmd != nil {
-						break
-					}
-				}
-
-				require.NotNil(t, cmd)
-				t.Logf("Saved alert instances: %v", cmd)
-				require.Equal(t, rule.OrgID, cmd.RuleOrgID)
-				require.Equal(t, expectedTime, cmd.LastEvalTime)
-				require.Equal(t, rule.UID, cmd.RuleUID)
-				require.Equal(t, evalState.String(), string(cmd.CurrentState))
-				require.Equal(t, s.Labels, data.Labels(cmd.Labels))
-			})
-
-			t.Run("it reports metrics", func(t *testing.T) {
-				// duration metric has 0 values because of mocked clock that do not advance
-				expectedMetric := fmt.Sprintf(
-					`# HELP grafana_alerting_rule_evaluation_duration_seconds The time to evaluate a rule.
-        	            	# TYPE grafana_alerting_rule_evaluation_duration_seconds histogram
-        	            	grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="0.01"} 1
-        	            	grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="0.1"} 1
-        	            	grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="0.5"} 1
-        	            	grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="1"} 1
-        	            	grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="5"} 1
-        	            	grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="10"} 1
-        	            	grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="15"} 1
-        	            	grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="30"} 1
-							grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="60"} 1
-							grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="120"} 1
-							grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="180"} 1
-							grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="240"} 1
-							grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="300"} 1
-        	            	grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="+Inf"} 1
-        	            	grafana_alerting_rule_evaluation_duration_seconds_sum{org="%[1]d"} 0
-        	            	grafana_alerting_rule_evaluation_duration_seconds_count{org="%[1]d"} 1
-							# HELP grafana_alerting_rule_evaluation_failures_total The total number of rule evaluation failures.
-        	            	# TYPE grafana_alerting_rule_evaluation_failures_total counter
-        	            	grafana_alerting_rule_evaluation_failures_total{org="%[1]d"} 0
-        	            	# HELP grafana_alerting_rule_evaluations_total The total number of rule evaluations.
-        	            	# TYPE grafana_alerting_rule_evaluations_total counter
-        	            	grafana_alerting_rule_evaluations_total{org="%[1]d"} 1
-							# HELP grafana_alerting_rule_process_evaluation_duration_seconds The time to process the evaluation results for a rule.
-							# TYPE grafana_alerting_rule_process_evaluation_duration_seconds histogram
-							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="0.01"} 1
-							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="0.1"} 1
-							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="0.5"} 1
-							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="1"} 1
-							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="5"} 1
-							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="10"} 1
-							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="15"} 1
-							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="30"} 1
-							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="60"} 1
-							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="120"} 1
-							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="180"} 1
-							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="240"} 1
-							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="300"} 1
-							grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="+Inf"} 1
-							grafana_alerting_rule_process_evaluation_duration_seconds_sum{org="%[1]d"} 0
-							grafana_alerting_rule_process_evaluation_duration_seconds_count{org="%[1]d"} 1
-							# HELP grafana_alerting_rule_send_alerts_duration_seconds The time to send the alerts to Alertmanager.
-							# TYPE grafana_alerting_rule_send_alerts_duration_seconds histogram
-							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="0.01"} 1
-							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="0.1"} 1
-							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="0.5"} 1
-							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="1"} 1
-							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="5"} 1
-							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="10"} 1
-							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="15"} 1
-							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="30"} 1
-							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="60"} 1
-							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="120"} 1
-							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="180"} 1
-							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="240"} 1
-							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="300"} 1
-							grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="+Inf"} 1
-							grafana_alerting_rule_send_alerts_duration_seconds_sum{org="%[1]d"} 0
-							grafana_alerting_rule_send_alerts_duration_seconds_count{org="%[1]d"} 1
-				`, rule.OrgID)
-
-				err := testutil.GatherAndCompare(reg, bytes.NewBufferString(expectedMetric), "grafana_alerting_rule_evaluation_duration_seconds", "grafana_alerting_rule_evaluations_total", "grafana_alerting_rule_evaluation_failures_total", "grafana_alerting_rule_process_evaluation_duration_seconds", "grafana_alerting_rule_send_alerts_duration_seconds")
-				require.NoError(t, err)
-			})
-		})
-	}
-
-	t.Run("should exit", func(t *testing.T) {
-		t.Run("and not clear the state if parent context is cancelled", func(t *testing.T) {
-			stoppedChan := make(chan error)
-			sch, _, _, _ := createSchedule(make(chan time.Time), nil)
-
-			rule := models.AlertRuleGen()()
-			_ = sch.stateManager.ProcessEvalResults(context.Background(), sch.clock.Now(), rule, eval.GenerateResults(rand.Intn(5)+1, eval.ResultGen(eval.WithEvaluatedAt(sch.clock.Now()))), nil)
-			expectedStates := sch.stateManager.GetStatesForRuleUID(rule.OrgID, rule.UID)
-			require.NotEmpty(t, expectedStates)
-
-			ctx, cancel := context.WithCancel(context.Background())
-			go func() {
-				err := sch.ruleRoutine(ctx, models.AlertRuleKey{}, make(chan *evaluation), make(chan ruleVersionAndPauseStatus))
-				stoppedChan <- err
-			}()
-
-			cancel()
-			err := waitForErrChannel(t, stoppedChan)
-			require.NoError(t, err)
-			require.Equal(t, len(expectedStates), len(sch.stateManager.GetStatesForRuleUID(rule.OrgID, rule.UID)))
-		})
-		t.Run("and clean up the state if delete is cancellation reason ", func(t *testing.T) {
-			stoppedChan := make(chan error)
-			sch, _, _, _ := createSchedule(make(chan time.Time), nil)
-
-			rule := models.AlertRuleGen()()
-			_ = sch.stateManager.ProcessEvalResults(context.Background(), sch.clock.Now(), rule, eval.GenerateResults(rand.Intn(5)+1, eval.ResultGen(eval.WithEvaluatedAt(sch.clock.Now()))), nil)
-			require.NotEmpty(t, sch.stateManager.GetStatesForRuleUID(rule.OrgID, rule.UID))
-
-			ctx, cancel := util.WithCancelCause(context.Background())
-			go func() {
-				err := sch.ruleRoutine(ctx, rule.GetKey(), make(chan *evaluation), make(chan ruleVersionAndPauseStatus))
-				stoppedChan <- err
-			}()
-
-			cancel(errRuleDeleted)
-			err := waitForErrChannel(t, stoppedChan)
-			require.NoError(t, err)
-
-			require.Empty(t, sch.stateManager.GetStatesForRuleUID(rule.OrgID, rule.UID))
-		})
-	})
-
-	t.Run("when a message is sent to update channel", func(t *testing.T) {
-		rule := models.AlertRuleGen(withQueryForState(t, eval.Normal))()
-		folderTitle := "folderName"
-		ruleFp := ruleWithFolder{rule, folderTitle}.Fingerprint()
-
-		evalChan := make(chan *evaluation)
-		evalAppliedChan := make(chan time.Time)
-		updateChan := make(chan ruleVersionAndPauseStatus)
-
-		sender := AlertsSenderMock{}
-		sender.EXPECT().Send(mock.Anything, rule.GetKey(), mock.Anything).Return()
-
-		sch, ruleStore, _, _ := createSchedule(evalAppliedChan, &sender)
-		ruleStore.PutRule(context.Background(), rule)
-		sch.schedulableAlertRules.set([]*models.AlertRule{rule}, map[string]string{rule.NamespaceUID: folderTitle})
-
-		go func() {
-			ctx, cancel := context.WithCancel(context.Background())
-			t.Cleanup(cancel)
-			_ = sch.ruleRoutine(ctx, rule.GetKey(), evalChan, updateChan)
-		}()
-
-		// init evaluation loop so it got the rule version
-		evalChan <- &evaluation{
-			scheduledAt: sch.clock.Now(),
-			rule:        rule,
-			folderTitle: folderTitle,
-		}
-
-		waitForTimeChannel(t, evalAppliedChan)
-
-		// define some state
-		states := make([]*state.State, 0, len(allStates))
-		for _, s := range allStates {
-			for i := 0; i < 2; i++ {
-				states = append(states, &state.State{
-					AlertRuleUID: rule.UID,
-					CacheID:      util.GenerateShortUID(),
-					OrgID:        rule.OrgID,
-					State:        s,
-					StartsAt:     sch.clock.Now(),
-					EndsAt:       sch.clock.Now().Add(time.Duration(rand.Intn(25)+5) * time.Second),
-					Labels:       rule.Labels,
-				})
-			}
-		}
-		sch.stateManager.Put(states)
-
-		states = sch.stateManager.GetStatesForRuleUID(rule.OrgID, rule.UID)
-		expectedToBeSent := 0
-		for _, s := range states {
-			if s.State == eval.Normal || s.State == eval.Pending {
-				continue
-			}
-			expectedToBeSent++
-		}
-		require.Greaterf(t, expectedToBeSent, 0, "State manager was expected to return at least one state that can be expired")
-
-		t.Run("should do nothing if version in channel is the same", func(t *testing.T) {
-			updateChan <- ruleVersionAndPauseStatus{ruleFp, false}
-			updateChan <- ruleVersionAndPauseStatus{ruleFp, false} // second time just to make sure that previous messages were handled
-
-			actualStates := sch.stateManager.GetStatesForRuleUID(rule.OrgID, rule.UID)
-			require.Len(t, actualStates, len(states))
-
-			sender.AssertNotCalled(t, "Send", mock.Anything, mock.Anything)
-		})
-
-		t.Run("should clear the state and expire firing alerts if version in channel is greater", func(t *testing.T) {
-			updateChan <- ruleVersionAndPauseStatus{ruleFp + 1, false}
-
-			require.Eventually(t, func() bool {
-				return len(sender.Calls) > 0
-			}, 5*time.Second, 100*time.Millisecond)
-
-			require.Empty(t, sch.stateManager.GetStatesForRuleUID(rule.OrgID, rule.UID))
-			sender.AssertNumberOfCalls(t, "Send", 1)
-			args, ok := sender.Calls[0].Arguments[2].(definitions.PostableAlerts)
-			require.Truef(t, ok, fmt.Sprintf("expected argument of function was supposed to be 'definitions.PostableAlerts' but got %T", sender.Calls[0].Arguments[2]))
-			require.Len(t, args.PostableAlerts, expectedToBeSent)
-		})
-	})
-
-	t.Run("when evaluation fails", func(t *testing.T) {
-		rule := models.AlertRuleGen(withQueryForState(t, eval.Error))()
-		rule.ExecErrState = models.ErrorErrState
-
-		evalChan := make(chan *evaluation)
-		evalAppliedChan := make(chan time.Time)
-
-		sender := AlertsSenderMock{}
-		sender.EXPECT().Send(mock.Anything, rule.GetKey(), mock.Anything).Return()
-
-		sch, ruleStore, _, reg := createSchedule(evalAppliedChan, &sender)
-		ruleStore.PutRule(context.Background(), rule)
-
-		go func() {
-			ctx, cancel := context.WithCancel(context.Background())
-			t.Cleanup(cancel)
-			_ = sch.ruleRoutine(ctx, rule.GetKey(), evalChan, make(chan ruleVersionAndPauseStatus))
-		}()
-
-		evalChan <- &evaluation{
-			scheduledAt: sch.clock.Now(),
-			rule:        rule,
-		}
-
-		waitForTimeChannel(t, evalAppliedChan)
-
-		t.Run("it should increase failure counter", func(t *testing.T) {
-			// duration metric has 0 values because of mocked clock that do not advance
-			expectedMetric := fmt.Sprintf(
-				`# HELP grafana_alerting_rule_evaluation_duration_seconds The time to evaluate a rule.
-        	            # TYPE grafana_alerting_rule_evaluation_duration_seconds histogram
-        	            grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="0.01"} 1
-        	            grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="0.1"} 1
-        	            grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="0.5"} 1
-        	            grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="1"} 1
-        	            grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="5"} 1
-        	            grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="10"} 1
-        	            grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="15"} 1
-        	            grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="30"} 1
-						grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="60"} 1
-						grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="120"} 1
-						grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="180"} 1
-						grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="240"} 1
-						grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="300"} 1
-        	            grafana_alerting_rule_evaluation_duration_seconds_bucket{org="%[1]d",le="+Inf"} 1
-        	            grafana_alerting_rule_evaluation_duration_seconds_sum{org="%[1]d"} 0
-        	            grafana_alerting_rule_evaluation_duration_seconds_count{org="%[1]d"} 1
-						# HELP grafana_alerting_rule_evaluation_failures_total The total number of rule evaluation failures.
-        	            # TYPE grafana_alerting_rule_evaluation_failures_total counter
-        	            grafana_alerting_rule_evaluation_failures_total{org="%[1]d"} 1
-        	            # HELP grafana_alerting_rule_evaluations_total The total number of rule evaluations.
-        	            # TYPE grafana_alerting_rule_evaluations_total counter
-        	            grafana_alerting_rule_evaluations_total{org="%[1]d"} 1
-						# HELP grafana_alerting_rule_process_evaluation_duration_seconds The time to process the evaluation results for a rule.
-						# TYPE grafana_alerting_rule_process_evaluation_duration_seconds histogram
-						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="0.01"} 1
-						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="0.1"} 1
-						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="0.5"} 1
-						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="1"} 1
-						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="5"} 1
-						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="10"} 1
-						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="15"} 1
-						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="30"} 1
-						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="60"} 1
-						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="120"} 1
-						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="180"} 1
-						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="240"} 1
-						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="300"} 1
-						grafana_alerting_rule_process_evaluation_duration_seconds_bucket{org="%[1]d",le="+Inf"} 1
-						grafana_alerting_rule_process_evaluation_duration_seconds_sum{org="%[1]d"} 0
-						grafana_alerting_rule_process_evaluation_duration_seconds_count{org="%[1]d"} 1
-						# HELP grafana_alerting_rule_send_alerts_duration_seconds The time to send the alerts to Alertmanager.
-						# TYPE grafana_alerting_rule_send_alerts_duration_seconds histogram
-						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="0.01"} 1
-						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="0.1"} 1
-						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="0.5"} 1
-						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="1"} 1
-						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="5"} 1
-						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="10"} 1
-						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="15"} 1
-						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="30"} 1
-						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="60"} 1
-						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="120"} 1
-						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="180"} 1
-						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="240"} 1
-						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="300"} 1
-						grafana_alerting_rule_send_alerts_duration_seconds_bucket{org="%[1]d",le="+Inf"} 1
-						grafana_alerting_rule_send_alerts_duration_seconds_sum{org="%[1]d"} 0
-						grafana_alerting_rule_send_alerts_duration_seconds_count{org="%[1]d"} 1
-				`, rule.OrgID)
-
-			err := testutil.GatherAndCompare(reg, bytes.NewBufferString(expectedMetric), "grafana_alerting_rule_evaluation_duration_seconds", "grafana_alerting_rule_evaluations_total", "grafana_alerting_rule_evaluation_failures_total", "grafana_alerting_rule_process_evaluation_duration_seconds", "grafana_alerting_rule_send_alerts_duration_seconds")
-			require.NoError(t, err)
-		})
-
-		t.Run("it should send special alert DatasourceError", func(t *testing.T) {
-			sender.AssertNumberOfCalls(t, "Send", 1)
-			args, ok := sender.Calls[0].Arguments[2].(definitions.PostableAlerts)
-			require.Truef(t, ok, fmt.Sprintf("expected argument of function was supposed to be 'definitions.PostableAlerts' but got %T", sender.Calls[0].Arguments[2]))
-			assert.Len(t, args.PostableAlerts, 1)
-			assert.Equal(t, state.ErrorAlertName, args.PostableAlerts[0].Labels[prometheusModel.AlertNameLabel])
-		})
-	})
-
-	t.Run("when there are alerts that should be firing", func(t *testing.T) {
-		t.Run("it should call sender", func(t *testing.T) {
-			// eval.Alerting makes state manager to create notifications for alertmanagers
-			rule := models.AlertRuleGen(withQueryForState(t, eval.Alerting))()
-
-			evalChan := make(chan *evaluation)
-			evalAppliedChan := make(chan time.Time)
-
-			sender := AlertsSenderMock{}
-			sender.EXPECT().Send(mock.Anything, rule.GetKey(), mock.Anything).Return()
-
-			sch, ruleStore, _, _ := createSchedule(evalAppliedChan, &sender)
-			ruleStore.PutRule(context.Background(), rule)
-
-			go func() {
-				ctx, cancel := context.WithCancel(context.Background())
-				t.Cleanup(cancel)
-				_ = sch.ruleRoutine(ctx, rule.GetKey(), evalChan, make(chan ruleVersionAndPauseStatus))
-			}()
-
-			evalChan <- &evaluation{
-				scheduledAt: sch.clock.Now(),
-				rule:        rule,
-			}
-
-			waitForTimeChannel(t, evalAppliedChan)
-
-			sender.AssertNumberOfCalls(t, "Send", 1)
-			args, ok := sender.Calls[0].Arguments[2].(definitions.PostableAlerts)
-			require.Truef(t, ok, fmt.Sprintf("expected argument of function was supposed to be 'definitions.PostableAlerts' but got %T", sender.Calls[0].Arguments[2]))
-
-			require.Len(t, args.PostableAlerts, 1)
-		})
-	})
-
-	t.Run("when there are no alerts to send it should not call notifiers", func(t *testing.T) {
-		rule := models.AlertRuleGen(withQueryForState(t, eval.Normal))()
-
-		evalChan := make(chan *evaluation)
-		evalAppliedChan := make(chan time.Time)
-
-		sender := AlertsSenderMock{}
-		sender.EXPECT().Send(mock.Anything, rule.GetKey(), mock.Anything).Return()
-
-		sch, ruleStore, _, _ := createSchedule(evalAppliedChan, &sender)
-		ruleStore.PutRule(context.Background(), rule)
-
-		go func() {
-			ctx, cancel := context.WithCancel(context.Background())
-			t.Cleanup(cancel)
-			_ = sch.ruleRoutine(ctx, rule.GetKey(), evalChan, make(chan ruleVersionAndPauseStatus))
-		}()
-
-		evalChan <- &evaluation{
-			scheduledAt: sch.clock.Now(),
-			rule:        rule,
-		}
-
-		waitForTimeChannel(t, evalAppliedChan)
-
-		sender.AssertNotCalled(t, "Send", mock.Anything, mock.Anything)
-
-		require.NotEmpty(t, sch.stateManager.GetStatesForRuleUID(rule.OrgID, rule.UID))
-	})
-}
-
 func TestSchedule_deleteAlertRule(t *testing.T) {
 	t.Run("when rule exists", func(t *testing.T) {
 		t.Run("it should stop evaluation loop and remove the controller from registry", func(t *testing.T) {
 			sch := setupScheduler(t, nil, nil, nil, nil, nil)
+			ruleFactory := ruleFactoryFromScheduler(sch)
 			rule := models.AlertRuleGen()()
 			key := rule.GetKey()
-			info, _ := sch.registry.getOrCreateInfo(context.Background(), key)
+			info, _ := sch.registry.getOrCreate(context.Background(), key, ruleFactory)
 			sch.deleteAlertRule(key)
-			require.ErrorIs(t, info.ctx.Err(), errRuleDeleted)
+			require.ErrorIs(t, info.(*alertRule).ctx.Err(), errRuleDeleted)
 			require.False(t, sch.registry.exists(key))
 		})
 	})
@@ -842,7 +378,7 @@ func TestSchedule_deleteAlertRule(t *testing.T) {
 	})
 }
 
-func setupScheduler(t *testing.T, rs *fakeRulesStore, is *state.FakeInstanceStore, registry *prometheus.Registry, senderMock *AlertsSenderMock, evalMock eval.EvaluatorFactory) *schedule {
+func setupScheduler(t *testing.T, rs *fakeRulesStore, is *state.FakeInstanceStore, registry *prometheus.Registry, senderMock *SyncAlertsSenderMock, evalMock eval.EvaluatorFactory) *schedule {
 	t.Helper()
 	testTracer := tracing.InitializeTracerForTest()
 
@@ -872,7 +408,7 @@ func setupScheduler(t *testing.T, rs *fakeRulesStore, is *state.FakeInstanceStor
 	}
 
 	if senderMock == nil {
-		senderMock = &AlertsSenderMock{}
+		senderMock = NewSyncAlertsSenderMock()
 		senderMock.EXPECT().Send(mock.Anything, mock.Anything, mock.Anything).Return()
 	}
 
@@ -900,11 +436,12 @@ func setupScheduler(t *testing.T, rs *fakeRulesStore, is *state.FakeInstanceStor
 		Images:                  &state.NoopImageService{},
 		Clock:                   mockedClock,
 		Historian:               &state.FakeHistorian{},
-		MaxStateSaveConcurrency: 1,
 		Tracer:                  testTracer,
 		Log:                     log.New("ngalert.state.manager"),
+		MaxStateSaveConcurrency: 1,
 	}
-	st := state.NewManager(managerCfg)
+	syncStatePersister := state.NewSyncStatePersisiter(log.New("ngalert.state.manager.perist"), managerCfg)
+	st := state.NewManager(managerCfg, syncStatePersister)
 
 	return NewScheduler(schedCfg, st)
 }
diff --git a/pkg/services/ngalert/schedule/testing.go b/pkg/services/ngalert/schedule/testing.go
index 803f084825c8d..2f00c213ac3b2 100644
--- a/pkg/services/ngalert/schedule/testing.go
+++ b/pkg/services/ngalert/schedule/testing.go
@@ -2,10 +2,14 @@ package schedule
 
 import (
 	"context"
+	"slices"
+	"sync"
 	"testing"
 	"time"
 
+	definitions "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	mock "github.com/stretchr/testify/mock"
 )
 
 // waitForTimeChannel blocks the execution until either the channel ch has some data or a timeout of 10 second expires.
@@ -57,10 +61,11 @@ func (f *fakeRulesStore) GetAlertRulesKeysForScheduling(ctx context.Context) ([]
 }
 
 func (f *fakeRulesStore) GetAlertRulesForScheduling(ctx context.Context, query *models.GetAlertRulesForSchedulingQuery) error {
-	query.ResultFoldersTitles = map[string]string{}
+	query.ResultFoldersTitles = map[models.FolderKey]string{}
 	for _, rule := range f.rules {
 		query.ResultRules = append(query.ResultRules, rule)
-		query.ResultFoldersTitles[rule.NamespaceUID] = f.getNamespaceTitle(rule.NamespaceUID)
+		key := models.FolderKey{OrgID: rule.OrgID, UID: rule.UID}
+		query.ResultFoldersTitles[key] = f.getNamespaceTitle(rule.NamespaceUID)
 	}
 	return nil
 }
@@ -80,3 +85,26 @@ func (f *fakeRulesStore) DeleteRule(rules ...*models.AlertRule) {
 func (f *fakeRulesStore) getNamespaceTitle(uid string) string {
 	return "TEST-FOLDER-" + uid
 }
+
+type SyncAlertsSenderMock struct {
+	*AlertsSenderMock
+	mu sync.Mutex
+}
+
+func NewSyncAlertsSenderMock() *SyncAlertsSenderMock {
+	return &SyncAlertsSenderMock{
+		AlertsSenderMock: new(AlertsSenderMock),
+	}
+}
+
+func (m *SyncAlertsSenderMock) Send(ctx context.Context, key models.AlertRuleKey, alerts definitions.PostableAlerts) {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	m.AlertsSenderMock.Send(ctx, key, alerts)
+}
+
+func (m *SyncAlertsSenderMock) Calls() []mock.Call {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	return slices.Clone(m.AlertsSenderMock.Calls)
+}
diff --git a/pkg/services/ngalert/sender/notifier.go b/pkg/services/ngalert/sender/notifier.go
index d8066fd16e433..22f82099e7a54 100644
--- a/pkg/services/ngalert/sender/notifier.go
+++ b/pkg/services/ngalert/sender/notifier.go
@@ -336,7 +336,7 @@ func (n *Manager) Send(alerts ...*Alert) {
 			}
 		})
 
-		a.Labels = lb.Labels(a.Labels)
+		a.Labels = lb.Labels()
 	}
 
 	alerts = n.relabelAlerts(alerts)
diff --git a/pkg/services/ngalert/sender/notifier_ext.go b/pkg/services/ngalert/sender/notifier_ext.go
index 27effd18913df..544ed4ae0724c 100644
--- a/pkg/services/ngalert/sender/notifier_ext.go
+++ b/pkg/services/ngalert/sender/notifier_ext.go
@@ -24,7 +24,7 @@ import (
 
 // ApplyConfig updates the status state as the new config requires.
 // Extension: add new parameter headers.
-func (n *Manager) ApplyConfig(conf *config.Config, headers map[string]map[string]string) error {
+func (n *Manager) ApplyConfig(conf *config.Config, headers map[string]http.Header) error {
 	n.mtx.Lock()
 	defer n.mtx.Unlock()
 
@@ -57,7 +57,7 @@ type alertmanagerSet struct {
 	client *http.Client
 
 	// Extension: headers that should be used for the http requests to the alertmanagers.
-	headers map[string]string
+	headers http.Header
 
 	metrics *alertMetrics
 
@@ -144,7 +144,7 @@ func (n *Manager) sendAll(alerts ...*Alert) bool {
 			defer cancel()
 
 			// Extension: added headers parameter.
-			go func(client *http.Client, url string, headers map[string]string) {
+			go func(client *http.Client, url string, headers http.Header) {
 				if err := n.sendOne(ctx, client, url, payload, headers); err != nil {
 					level.Error(n.logger).Log("alertmanager", url, "count", len(alerts), "msg", "Error sending alert", "err", err)
 					n.metrics.errors.WithLabelValues(url).Inc()
@@ -167,7 +167,7 @@ func (n *Manager) sendAll(alerts ...*Alert) bool {
 }
 
 // Extension: added headers parameter.
-func (n *Manager) sendOne(ctx context.Context, c *http.Client, url string, b []byte, headers map[string]string) error {
+func (n *Manager) sendOne(ctx context.Context, c *http.Client, url string, b []byte, headers http.Header) error {
 	req, err := http.NewRequest("POST", url, bytes.NewReader(b))
 	if err != nil {
 		return err
@@ -176,7 +176,9 @@ func (n *Manager) sendOne(ctx context.Context, c *http.Client, url string, b []b
 	req.Header.Set("Content-Type", contentTypeJSON)
 	// Extension: set headers.
 	for k, v := range headers {
-		req.Header.Set(k, v)
+		for _, vv := range v {
+			req.Header.Set(k, vv)
+		}
 	}
 	resp, err := n.opts.Do(ctx, c, req)
 	if err != nil {
diff --git a/pkg/services/ngalert/sender/router.go b/pkg/services/ngalert/sender/router.go
index 6cac839f3cbe2..077901d96137c 100644
--- a/pkg/services/ngalert/sender/router.go
+++ b/pkg/services/ngalert/sender/router.go
@@ -275,17 +275,16 @@ func (d *AlertsRouter) buildExternalURL(ds *datasources.DataSource) (string, err
 		}
 	}
 
-	// if basic auth is enabled we need to build the url with basic auth baked in
-	if !ds.BasicAuth {
-		return parsed.String(), nil
+	// If basic auth is enabled we need to build the url with basic auth baked in.
+	if ds.BasicAuth {
+		password := d.secretService.GetDecryptedValue(context.Background(), ds.SecureJsonData, "basicAuthPassword", "")
+		if password == "" {
+			return "", fmt.Errorf("basic auth enabled but no password set")
+		}
+		parsed.User = url.UserPassword(ds.BasicAuthUser, password)
 	}
 
-	password := d.secretService.GetDecryptedValue(context.Background(), ds.SecureJsonData, "basicAuthPassword", "")
-	if password == "" {
-		return "", fmt.Errorf("basic auth enabled but no password set")
-	}
-	return fmt.Sprintf("%s://%s:%s@%s%s%s", parsed.Scheme, ds.BasicAuthUser,
-		password, parsed.Host, parsed.Path, parsed.RawQuery), nil
+	return parsed.String(), nil
 }
 
 func (d *AlertsRouter) Send(ctx context.Context, key models.AlertRuleKey, alerts definitions.PostableAlerts) {
diff --git a/pkg/services/ngalert/sender/router_test.go b/pkg/services/ngalert/sender/router_test.go
index e9cfafeed8fa8..7fa5a9ae76d4c 100644
--- a/pkg/services/ngalert/sender/router_test.go
+++ b/pkg/services/ngalert/sender/router_test.go
@@ -19,11 +19,11 @@ import (
 	"github.com/grafana/grafana/pkg/infra/log/logtest"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	fake_ds "github.com/grafana/grafana/pkg/services/datasources/fakes"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/notifier"
-	"github.com/grafana/grafana/pkg/services/ngalert/provisioning"
 	"github.com/grafana/grafana/pkg/services/ngalert/store"
 	"github.com/grafana/grafana/pkg/services/ngalert/tests/fakes"
 	fake_secrets "github.com/grafana/grafana/pkg/services/secrets/fakes"
@@ -411,7 +411,7 @@ func createMultiOrgAlertmanager(t *testing.T, orgs []int64) *notifier.MultiOrgAl
 	m := metrics.NewNGAlert(registry)
 	secretsService := secretsManager.SetupTestService(t, fake_secrets.NewFakeSecretsStore())
 	decryptFn := secretsService.GetDecryptedValue
-	moa, err := notifier.NewMultiOrgAlertmanager(cfg, cfgStore, &orgStore, kvStore, provisioning.NewFakeProvisioningStore(), decryptFn, m.GetMultiOrgAlertmanagerMetrics(), nil, log.New("testlogger"), secretsService)
+	moa, err := notifier.NewMultiOrgAlertmanager(cfg, cfgStore, orgStore, kvStore, fakes.NewFakeProvisioningStore(), decryptFn, m.GetMultiOrgAlertmanagerMetrics(), nil, log.New("testlogger"), secretsService, &featuremgmt.FeatureManager{})
 	require.NoError(t, err)
 	require.NoError(t, moa.LoadAndSyncAlertmanagersForOrgs(context.Background()))
 	require.Eventually(t, func() bool {
@@ -461,6 +461,18 @@ func TestBuildExternalURL(t *testing.T) {
 			},
 			expectedURL: "https://johndoe:123@localhost:9000",
 		},
+		{
+			name: "datasource with auth that needs escaping",
+			ds: &datasources.DataSource{
+				URL:           "https://localhost:9000",
+				BasicAuth:     true,
+				BasicAuthUser: "johndoe",
+				SecureJsonData: map[string][]byte{
+					"basicAuthPassword": []byte("123#!"),
+				},
+			},
+			expectedURL: "https://johndoe:123%23%21@localhost:9000",
+		},
 		{
 			name: "datasource with auth and path",
 			ds: &datasources.DataSource{
diff --git a/pkg/services/ngalert/sender/sender.go b/pkg/services/ngalert/sender/sender.go
index eef29402c0591..60d609243813a 100644
--- a/pkg/services/ngalert/sender/sender.go
+++ b/pkg/services/ngalert/sender/sender.go
@@ -43,7 +43,7 @@ type ExternalAlertmanager struct {
 
 type ExternalAMcfg struct {
 	URL     string
-	Headers map[string]string
+	Headers http.Header
 }
 
 type Option func(*ExternalAlertmanager)
@@ -127,13 +127,14 @@ func (s *ExternalAlertmanager) ApplyConfig(orgId, id int64, alertmanagers []Exte
 }
 
 func (s *ExternalAlertmanager) Run() {
+	logger := s.logger
 	s.wg.Add(2)
 
 	go func() {
-		s.logger.Info("Initiating communication with a group of external Alertmanagers")
+		logger.Info("Initiating communication with a group of external Alertmanagers")
 
 		if err := s.sdManager.Run(); err != nil {
-			s.logger.Error("Failed to start the sender service discovery manager", "error", err)
+			logger.Error("Failed to start the sender service discovery manager", "error", err)
 		}
 		s.wg.Done()
 	}()
@@ -176,9 +177,9 @@ func (s *ExternalAlertmanager) DroppedAlertmanagers() []*url.URL {
 	return s.manager.DroppedAlertmanagers()
 }
 
-func buildNotifierConfig(alertmanagers []ExternalAMcfg) (*config.Config, map[string]map[string]string, error) {
+func buildNotifierConfig(alertmanagers []ExternalAMcfg) (*config.Config, map[string]http.Header, error) {
 	amConfigs := make([]*config.AlertmanagerConfig, 0, len(alertmanagers))
-	headers := map[string]map[string]string{}
+	headers := map[string]http.Header{}
 	for i, am := range alertmanagers {
 		u, err := url.Parse(am.URL)
 		if err != nil {
diff --git a/pkg/services/ngalert/state/cache.go b/pkg/services/ngalert/state/cache.go
index 7f7e7f510f51c..ae82381310eed 100644
--- a/pkg/services/ngalert/state/cache.go
+++ b/pkg/services/ngalert/state/cache.go
@@ -121,9 +121,36 @@ func (rs *ruleStates) getOrAdd(stateCandidate State) *State {
 }
 
 func calculateState(ctx context.Context, log log.Logger, alertRule *ngModels.AlertRule, result eval.Result, extraLabels data.Labels, externalURL *url.URL) State {
+	var reserved []string
+	resultLabels := result.Instance
+	if len(resultLabels) > 0 {
+		for key := range ngModels.LabelsUserCannotSpecify {
+			if value, ok := resultLabels[key]; ok {
+				if reserved == nil { // make a copy of labels if we are going to modify it
+					resultLabels = result.Instance.Copy()
+				}
+				reserved = append(reserved, key)
+				delete(resultLabels, key)
+				// we cannot delete the reserved label completely because it can cause alert instances to collide (when this label is only unique across results)
+				// so we just rename it to something that does not collide with reserved labels
+				newKey := strings.TrimSuffix(strings.TrimPrefix(key, "__"), "__")
+				if _, ok = resultLabels[newKey]; newKey == "" || newKey == key || ok { // in the case if in the future the LabelsUserCannotSpecify contains labels that do not have double underscore
+					newKey = key + "_user"
+				}
+				if _, ok = resultLabels[newKey]; !ok { // if it still collides with another existing label, we just drop the label
+					resultLabels[newKey] = value
+				} else {
+					log.Warn("Result contains reserved label, and, after renaming, a new label collides with an existing one. Removing the label completely", "deletedLabel", key, "renamedLabel", newKey)
+				}
+			}
+		}
+		if len(reserved) > 0 {
+			log.Debug("Found collision of result labels and system reserved. Renamed labels with suffix '_user'", "renamedLabels", strings.Join(reserved, ","))
+		}
+	}
 	// Merge both the extra labels and the labels from the evaluation into a common set
 	// of labels that can be expanded in custom labels and annotations.
-	templateData := template.NewData(mergeLabels(extraLabels, result.Instance), result)
+	templateData := template.NewData(mergeLabels(extraLabels, resultLabels), result)
 
 	// For now, do nothing with these errors as they are already logged in expand.
 	// In the future, we want to show these errors to the user somehow.
@@ -139,7 +166,7 @@ func calculateState(ctx context.Context, log log.Logger, alertRule *ngModels.Ale
 		}
 	}
 
-	lbs := make(data.Labels, len(extraLabels)+len(labels)+len(result.Instance))
+	lbs := make(data.Labels, len(extraLabels)+len(labels)+len(resultLabels))
 	dupes := make(data.Labels)
 	for key, val := range extraLabels {
 		lbs[key] = val
@@ -159,7 +186,7 @@ func calculateState(ctx context.Context, log log.Logger, alertRule *ngModels.Ale
 		log.Warn("Rule declares one or many reserved labels. Those rules labels will be ignored", "labels", dupes)
 	}
 	dupes = make(data.Labels)
-	for key, val := range result.Instance {
+	for key, val := range resultLabels {
 		_, ok := lbs[key]
 		// if duplicate labels exist, reserved or alert rule label will take precedence
 		if ok {
@@ -190,6 +217,7 @@ func calculateState(ctx context.Context, log log.Logger, alertRule *ngModels.Ale
 		Values:             values,
 		StartsAt:           result.EvaluatedAt,
 		EndsAt:             result.EvaluatedAt,
+		ResultFingerprint:  result.Instance.Fingerprint(), // remember original result fingerprint
 	}
 	return newState
 }
@@ -329,6 +357,37 @@ func (c *cache) removeByRuleUID(orgID int64, uid string) []*State {
 	return states
 }
 
+// asInstances returns the whole content of the cache as a slice of AlertInstance.
+func (c *cache) asInstances(skipNormalState bool) []ngModels.AlertInstance {
+	var states []ngModels.AlertInstance
+	c.mtxStates.RLock()
+	defer c.mtxStates.RUnlock()
+	for _, orgStates := range c.states {
+		for _, v1 := range orgStates {
+			for _, v2 := range v1.states {
+				if skipNormalState && IsNormalStateWithNoReason(v2) {
+					continue
+				}
+				key, err := v2.GetAlertInstanceKey()
+				if err != nil {
+					continue
+				}
+				states = append(states, ngModels.AlertInstance{
+					AlertInstanceKey:  key,
+					Labels:            ngModels.InstanceLabels(v2.Labels),
+					CurrentState:      ngModels.InstanceStateType(v2.State.String()),
+					CurrentReason:     v2.StateReason,
+					LastEvalTime:      v2.LastEvaluationTime,
+					CurrentStateSince: v2.StartsAt,
+					CurrentStateEnd:   v2.EndsAt,
+					ResultFingerprint: v2.ResultFingerprint.String(),
+				})
+			}
+		}
+	}
+	return states
+}
+
 // if duplicate labels exist, keep the value from the first set
 func mergeLabels(a, b data.Labels) data.Labels {
 	newLbs := make(data.Labels, len(a)+len(b))
diff --git a/pkg/services/ngalert/state/cache_test.go b/pkg/services/ngalert/state/cache_test.go
index 95e81513b381f..58a0adbfafdf1 100644
--- a/pkg/services/ngalert/state/cache_test.go
+++ b/pkg/services/ngalert/state/cache_test.go
@@ -8,6 +8,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -263,6 +264,61 @@ func Test_getOrCreate(t *testing.T) {
 		state := c.getOrCreate(context.Background(), l, rule, result, nil, url)
 		assert.Equal(t, map[string]float64{"B0": 1, "B1": 2}, state.Values)
 	})
+
+	t.Run("when result labels collide with system labels from LabelsUserCannotSpecify", func(t *testing.T) {
+		result := eval.Result{
+			Instance: models.GenerateAlertLabels(5, "result-"),
+		}
+		m := models.LabelsUserCannotSpecify
+		t.Cleanup(func() {
+			models.LabelsUserCannotSpecify = m
+		})
+
+		models.LabelsUserCannotSpecify = map[string]struct{}{
+			"__label1__": {},
+			"label2__":   {},
+			"__label3":   {},
+			"label4":     {},
+		}
+		result.Instance["__label1__"] = uuid.NewString()
+		result.Instance["label2__"] = uuid.NewString()
+		result.Instance["__label3"] = uuid.NewString()
+		result.Instance["label4"] = uuid.NewString()
+
+		rule := generateRule()
+
+		state := c.getOrCreate(context.Background(), l, rule, result, nil, url)
+
+		for key := range models.LabelsUserCannotSpecify {
+			assert.NotContains(t, state.Labels, key)
+		}
+		assert.Contains(t, state.Labels, "label1")
+		assert.Equal(t, state.Labels["label1"], result.Instance["__label1__"])
+
+		assert.Contains(t, state.Labels, "label2")
+		assert.Equal(t, state.Labels["label2"], result.Instance["label2__"])
+
+		assert.Contains(t, state.Labels, "label3")
+		assert.Equal(t, state.Labels["label3"], result.Instance["__label3"])
+
+		assert.Contains(t, state.Labels, "label4_user")
+		assert.Equal(t, state.Labels["label4_user"], result.Instance["label4"])
+
+		t.Run("should drop label if renamed collides with existing", func(t *testing.T) {
+			result.Instance["label1"] = uuid.NewString()
+			result.Instance["label1_user"] = uuid.NewString()
+			result.Instance["label4_user"] = uuid.NewString()
+
+			state = c.getOrCreate(context.Background(), l, rule, result, nil, url)
+			assert.NotContains(t, state.Labels, "__label1__")
+			assert.Contains(t, state.Labels, "label1")
+			assert.Equal(t, state.Labels["label1"], result.Instance["label1"])
+			assert.Equal(t, state.Labels["label1_user"], result.Instance["label1_user"])
+
+			assert.NotContains(t, state.Labels, "label4")
+			assert.Equal(t, state.Labels["label4_user"], result.Instance["label4_user"])
+		})
+	})
 }
 
 func Test_mergeLabels(t *testing.T) {
diff --git a/pkg/services/ngalert/state/compat.go b/pkg/services/ngalert/state/compat.go
index e660b3b232cd1..a17b6637a0217 100644
--- a/pkg/services/ngalert/state/compat.go
+++ b/pkg/services/ngalert/state/compat.go
@@ -33,7 +33,8 @@ const (
 // - if evaluation state is either NoData or Error, the resulting set of labels is changed:
 //   - original alert name (label: model.AlertNameLabel) is backed up to OriginalAlertName
 //   - label model.AlertNameLabel is overwritten to either NoDataAlertName or ErrorAlertName
-func StateToPostableAlert(alertState *State, appURL *url.URL) *models.PostableAlert {
+func StateToPostableAlert(transition StateTransition, appURL *url.URL) *models.PostableAlert {
+	alertState := transition.State
 	nL := alertState.Labels.Copy()
 	nA := data.Labels(alertState.Annotations).Copy()
 
@@ -71,11 +72,19 @@ func StateToPostableAlert(alertState *State, appURL *url.URL) *models.PostableAl
 		urlStr = ""
 	}
 
-	if alertState.State == eval.NoData {
+	state := alertState.State
+	if alertState.Resolved {
+		// If this is a resolved alert, we need to send an alert with the correct labels such that they will expire the previous alert.
+		// In most cases the labels on the state will be correct, however when the previous alert was a NoData or Error alert, we need to
+		// ensure to modify it appropriately.
+		state = transition.PreviousState
+	}
+
+	if state == eval.NoData {
 		return noDataAlert(nL, nA, alertState, urlStr)
 	}
 
-	if alertState.State == eval.Error {
+	if state == eval.Error {
 		return errorAlert(nL, nA, alertState, urlStr)
 	}
 
@@ -139,7 +148,7 @@ func FromStateTransitionToPostableAlerts(firingStates []StateTransition, stateMa
 		if !alertState.NeedsSending(stateManager.ResendDelay) {
 			continue
 		}
-		alert := StateToPostableAlert(alertState.State, appURL)
+		alert := StateToPostableAlert(alertState, appURL)
 		alerts.PostableAlerts = append(alerts.PostableAlerts, *alert)
 		if alertState.StateReason == ngModels.StateReasonMissingSeries { // do not put stale state back to state manager
 			continue
@@ -160,7 +169,7 @@ func FromAlertsStateToStoppedAlert(firingStates []StateTransition, appURL *url.U
 		if transition.PreviousState == eval.Normal || transition.PreviousState == eval.Pending {
 			continue
 		}
-		postableAlert := StateToPostableAlert(transition.State, appURL)
+		postableAlert := StateToPostableAlert(transition, appURL)
 		postableAlert.EndsAt = strfmt.DateTime(ts)
 		alerts.PostableAlerts = append(alerts.PostableAlerts, *postableAlert)
 	}
diff --git a/pkg/services/ngalert/state/compat_test.go b/pkg/services/ngalert/state/compat_test.go
index 21de47f026a67..e0f889a96ea94 100644
--- a/pkg/services/ngalert/state/compat_test.go
+++ b/pkg/services/ngalert/state/compat_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/benbjohnson/clock"
 	"github.com/go-openapi/strfmt"
 	alertingModels "github.com/grafana/alerting/models"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/prometheus/alertmanager/api/v2/models"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/require"
@@ -56,7 +57,7 @@ func Test_StateToPostableAlert(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Run("it generates proper URL", func(t *testing.T) {
 				t.Run("to alert rule", func(t *testing.T) {
-					alertState := randomState(tc.state)
+					alertState := randomTransition(eval.Normal, tc.state)
 					alertState.Labels[alertingModels.RuleUIDLabel] = alertState.AlertRuleUID
 					result := StateToPostableAlert(alertState, appURL)
 					u := *appURL
@@ -65,7 +66,7 @@ func Test_StateToPostableAlert(t *testing.T) {
 				})
 
 				t.Run("app URL as is if rule UID is not specified", func(t *testing.T) {
-					alertState := randomState(tc.state)
+					alertState := randomTransition(eval.Normal, tc.state)
 					alertState.Labels[alertingModels.RuleUIDLabel] = ""
 					result := StateToPostableAlert(alertState, appURL)
 					require.Equal(t, appURL.String(), result.Alert.GeneratorURL.String())
@@ -76,7 +77,7 @@ func Test_StateToPostableAlert(t *testing.T) {
 				})
 
 				t.Run("empty string if app URL is not provided", func(t *testing.T) {
-					alertState := randomState(tc.state)
+					alertState := randomTransition(eval.Normal, tc.state)
 					alertState.Labels[alertingModels.RuleUIDLabel] = alertState.AlertRuleUID
 					result := StateToPostableAlert(alertState, nil)
 					require.Equal(t, "", result.Alert.GeneratorURL.String())
@@ -84,20 +85,20 @@ func Test_StateToPostableAlert(t *testing.T) {
 			})
 
 			t.Run("Start and End timestamps should be the same", func(t *testing.T) {
-				alertState := randomState(tc.state)
+				alertState := randomTransition(eval.Normal, tc.state)
 				result := StateToPostableAlert(alertState, appURL)
 				require.Equal(t, strfmt.DateTime(alertState.StartsAt), result.StartsAt)
 				require.Equal(t, strfmt.DateTime(alertState.EndsAt), result.EndsAt)
 			})
 
 			t.Run("should copy annotations", func(t *testing.T) {
-				alertState := randomState(tc.state)
+				alertState := randomTransition(eval.Normal, tc.state)
 				alertState.Annotations = randomMapOfStrings()
 				result := StateToPostableAlert(alertState, appURL)
 				require.Equal(t, models.LabelSet(alertState.Annotations), result.Annotations)
 
 				t.Run("add __value_string__ if it has results", func(t *testing.T) {
-					alertState := randomState(tc.state)
+					alertState := randomTransition(eval.Normal, tc.state)
 					alertState.Annotations = randomMapOfStrings()
 					expectedValueString := util.GenerateShortUID()
 					alertState.LastEvaluationString = expectedValueString
@@ -119,7 +120,7 @@ func Test_StateToPostableAlert(t *testing.T) {
 				})
 
 				t.Run("add __alertImageToken__ if there is an image token", func(t *testing.T) {
-					alertState := randomState(tc.state)
+					alertState := randomTransition(eval.Normal, tc.state)
 					alertState.Annotations = randomMapOfStrings()
 					alertState.Image = &ngModels.Image{Token: "test_token"}
 
@@ -135,7 +136,7 @@ func Test_StateToPostableAlert(t *testing.T) {
 				})
 
 				t.Run("don't add __alertImageToken__ if there's no image token", func(t *testing.T) {
-					alertState := randomState(tc.state)
+					alertState := randomTransition(eval.Normal, tc.state)
 					alertState.Annotations = randomMapOfStrings()
 					alertState.Image = &ngModels.Image{}
 
@@ -151,7 +152,7 @@ func Test_StateToPostableAlert(t *testing.T) {
 			})
 
 			t.Run("should add state reason annotation if not empty", func(t *testing.T) {
-				alertState := randomState(tc.state)
+				alertState := randomTransition(eval.Normal, tc.state)
 				alertState.StateReason = "TEST_STATE_REASON"
 				result := StateToPostableAlert(alertState, appURL)
 				require.Equal(t, alertState.StateReason, result.Annotations[ngModels.StateReasonAnnotation])
@@ -160,7 +161,7 @@ func Test_StateToPostableAlert(t *testing.T) {
 			switch tc.state {
 			case eval.NoData:
 				t.Run("should keep existing labels and change name", func(t *testing.T) {
-					alertState := randomState(tc.state)
+					alertState := randomTransition(eval.Normal, tc.state)
 					alertState.Labels = randomMapOfStrings()
 					alertName := util.GenerateShortUID()
 					alertState.Labels[model.AlertNameLabel] = alertName
@@ -177,7 +178,7 @@ func Test_StateToPostableAlert(t *testing.T) {
 					require.Equal(t, expected, result.Labels)
 
 					t.Run("should not backup original alert name if it does not exist", func(t *testing.T) {
-						alertState := randomState(tc.state)
+						alertState := randomTransition(eval.Normal, tc.state)
 						alertState.Labels = randomMapOfStrings()
 						delete(alertState.Labels, model.AlertNameLabel)
 
@@ -189,7 +190,7 @@ func Test_StateToPostableAlert(t *testing.T) {
 				})
 			case eval.Error:
 				t.Run("should keep existing labels and change name", func(t *testing.T) {
-					alertState := randomState(tc.state)
+					alertState := randomTransition(eval.Normal, tc.state)
 					alertState.Labels = randomMapOfStrings()
 					alertName := util.GenerateShortUID()
 					alertState.Labels[model.AlertNameLabel] = alertName
@@ -206,7 +207,7 @@ func Test_StateToPostableAlert(t *testing.T) {
 					require.Equal(t, expected, result.Labels)
 
 					t.Run("should not backup original alert name if it does not exist", func(t *testing.T) {
-						alertState := randomState(tc.state)
+						alertState := randomTransition(eval.Normal, tc.state)
 						alertState.Labels = randomMapOfStrings()
 						delete(alertState.Labels, model.AlertNameLabel)
 
@@ -218,7 +219,7 @@ func Test_StateToPostableAlert(t *testing.T) {
 				})
 			default:
 				t.Run("should copy labels as is", func(t *testing.T) {
-					alertState := randomState(tc.state)
+					alertState := randomTransition(eval.Normal, tc.state)
 					alertState.Labels = randomMapOfStrings()
 					result := StateToPostableAlert(alertState, appURL)
 					require.Equal(t, models.LabelSet(alertState.Labels), result.Labels)
@@ -228,6 +229,52 @@ func Test_StateToPostableAlert(t *testing.T) {
 	}
 }
 
+func TestStateToPostableAlertFromNodataError(t *testing.T) {
+	appURL := &url.URL{
+		Scheme: "http:",
+		Host:   fmt.Sprintf("host-%d", rand.Int()),
+		Path:   fmt.Sprintf("path-%d", rand.Int()),
+	}
+
+	standardLabels := models.LabelSet{model.AlertNameLabel: "name"}
+	noDataLabels := models.LabelSet{Rulename: "name", model.AlertNameLabel: NoDataAlertName}
+	errorLabels := models.LabelSet{Rulename: "name", model.AlertNameLabel: ErrorAlertName}
+
+	testCases := []struct {
+		name           string
+		resolved       bool
+		from           eval.State
+		to             eval.State
+		expectedLabels models.LabelSet
+	}{
+		// These are the important cases.
+		{name: "from NoData to Normal resolved", resolved: true, from: eval.NoData, to: eval.Normal, expectedLabels: noDataLabels},
+		{name: "from Error  to Normal resolved", resolved: true, from: eval.Error, to: eval.Normal, expectedLabels: errorLabels},
+
+		// Regressions.
+		{name: "from NoData to Normal unresolved", resolved: false, from: eval.NoData, to: eval.Normal, expectedLabels: standardLabels},
+		{name: "from Error  to Normal unresolved", resolved: false, from: eval.Error, to: eval.Normal, expectedLabels: standardLabels},
+		{name: "from NoData to Alerting unresolved", resolved: false, from: eval.NoData, to: eval.Alerting, expectedLabels: standardLabels},
+		{name: "from Error  to Alerting unresolved", resolved: false, from: eval.Error, to: eval.Alerting, expectedLabels: standardLabels},
+		{name: "from NoData to Pending unresolved", resolved: false, from: eval.NoData, to: eval.Pending, expectedLabels: standardLabels},
+		{name: "from Error  to Pending unresolved", resolved: false, from: eval.Error, to: eval.Pending, expectedLabels: standardLabels},
+		{name: "from NoData to NoData unresolved", resolved: false, from: eval.NoData, to: eval.NoData, expectedLabels: noDataLabels},
+		{name: "from Error  to NoData unresolved", resolved: false, from: eval.Error, to: eval.NoData, expectedLabels: noDataLabels},
+		{name: "from NoData to Error unresolved", resolved: false, from: eval.NoData, to: eval.Error, expectedLabels: errorLabels},
+		{name: "from Error  to Error unresolved", resolved: false, from: eval.Error, to: eval.Error, expectedLabels: errorLabels},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			alertState := randomTransition(tc.from, tc.to)
+			alertState.Resolved = tc.resolved
+			alertState.Labels = data.Labels(standardLabels)
+			result := StateToPostableAlert(alertState, appURL)
+			require.Equal(t, tc.expectedLabels, result.Labels)
+		})
+	}
+}
+
 func Test_FromAlertsStateToStoppedAlert(t *testing.T) {
 	appURL := &url.URL{
 		Scheme: "http:",
@@ -239,10 +286,7 @@ func Test_FromAlertsStateToStoppedAlert(t *testing.T) {
 	states := make([]StateTransition, 0, len(evalStates)*len(evalStates))
 	for _, to := range evalStates {
 		for _, from := range evalStates {
-			states = append(states, StateTransition{
-				State:         randomState(to),
-				PreviousState: from,
-			})
+			states = append(states, randomTransition(from, to))
 		}
 	}
 
@@ -254,7 +298,7 @@ func Test_FromAlertsStateToStoppedAlert(t *testing.T) {
 		if !(s.PreviousState == eval.Alerting || s.PreviousState == eval.Error || s.PreviousState == eval.NoData) {
 			continue
 		}
-		alert := StateToPostableAlert(s.State, appURL)
+		alert := StateToPostableAlert(s, appURL)
 		alert.EndsAt = strfmt.DateTime(clk.Now())
 		expected = append(expected, *alert)
 	}
@@ -285,17 +329,20 @@ func randomTimeInPast() time.Time {
 	return time.Now().Add(-randomDuration())
 }
 
-func randomState(evalState eval.State) *State {
-	return &State{
-		State:              evalState,
-		AlertRuleUID:       util.GenerateShortUID(),
-		StartsAt:           time.Now(),
-		EndsAt:             randomTimeInFuture(),
-		LastEvaluationTime: randomTimeInPast(),
-		EvaluationDuration: randomDuration(),
-		LastSentAt:         randomTimeInPast(),
-		Annotations:        make(map[string]string),
-		Labels:             make(map[string]string),
-		Values:             make(map[string]float64),
+func randomTransition(from, to eval.State) StateTransition {
+	return StateTransition{
+		PreviousState: from,
+		State: &State{
+			State:              to,
+			AlertRuleUID:       util.GenerateShortUID(),
+			StartsAt:           time.Now(),
+			EndsAt:             randomTimeInFuture(),
+			LastEvaluationTime: randomTimeInPast(),
+			EvaluationDuration: randomDuration(),
+			LastSentAt:         randomTimeInPast(),
+			Annotations:        make(map[string]string),
+			Labels:             make(map[string]string),
+			Values:             make(map[string]float64),
+		},
 	}
 }
diff --git a/pkg/services/ngalert/state/historian/annotation.go b/pkg/services/ngalert/state/historian/annotation.go
index 573a50194bef1..a9a2efd63f3f7 100644
--- a/pkg/services/ngalert/state/historian/annotation.go
+++ b/pkg/services/ngalert/state/historian/annotation.go
@@ -111,8 +111,8 @@ func (h *AnnotationBackend) Query(ctx context.Context, query ngmodels.HistoryQue
 	q := annotations.ItemQuery{
 		AlertID:      rule.ID,
 		OrgID:        query.OrgID,
-		From:         query.From.Unix(),
-		To:           query.To.Unix(),
+		From:         query.From.UnixMilli(),
+		To:           query.To.UnixMilli(),
 		SignedInUser: query.SignedInUser,
 	}
 	items, err := h.store.Find(ctx, &q)
@@ -173,12 +173,12 @@ func (h *AnnotationBackend) Query(ctx context.Context, query ngmodels.HistoryQue
 func buildAnnotations(rule history_model.RuleMeta, states []state.StateTransition, logger log.Logger) []annotations.Item {
 	items := make([]annotations.Item, 0, len(states))
 	for _, state := range states {
-		if !shouldRecord(state) {
+		if !ShouldRecordAnnotation(state) {
 			continue
 		}
 		logger.Debug("Alert state changed creating annotation", "newState", state.Formatted(), "oldState", state.PreviousFormatted())
 
-		annotationText, annotationData := buildAnnotationTextAndData(rule, state.State)
+		annotationText, annotationData := BuildAnnotationTextAndData(rule, state.State)
 
 		item := annotations.Item{
 			AlertID:   rule.ID,
@@ -195,7 +195,7 @@ func buildAnnotations(rule history_model.RuleMeta, states []state.StateTransitio
 	return items
 }
 
-func buildAnnotationTextAndData(rule history_model.RuleMeta, currentState *state.State) (string, *simplejson.Json) {
+func BuildAnnotationTextAndData(rule history_model.RuleMeta, currentState *state.State) (string, *simplejson.Json) {
 	jsonData := simplejson.New()
 	var value string
 
diff --git a/pkg/services/ngalert/state/historian/annotation_test.go b/pkg/services/ngalert/state/historian/annotation_test.go
index bf2e59074aab5..0192d3216590b 100644
--- a/pkg/services/ngalert/state/historian/annotation_test.go
+++ b/pkg/services/ngalert/state/historian/annotation_test.go
@@ -47,6 +47,25 @@ func TestAnnotationHistorian(t *testing.T) {
 		}
 	})
 
+	t.Run("annotation queries send expected item query", func(t *testing.T) {
+		store := &interceptingAnnotationStore{}
+		anns := createTestAnnotationSutWithStore(t, store)
+		now := time.Now().UTC()
+
+		q := models.HistoryQuery{
+			RuleUID: "my-rule",
+			OrgID:   1,
+			From:    now.Add(-10 * time.Second),
+			To:      now,
+		}
+		_, err := anns.Query(context.Background(), q)
+
+		require.NoError(t, err)
+		query := store.lastQuery
+		require.Equal(t, now.UnixMilli(), query.To)
+		require.Equal(t, now.Add(-10*time.Second).UnixMilli(), query.From)
+	})
+
 	t.Run("writing state transitions as annotations succeeds", func(t *testing.T) {
 		anns := createTestAnnotationBackendSut(t)
 		rule := createTestRule()
@@ -62,7 +81,7 @@ func TestAnnotationHistorian(t *testing.T) {
 
 	t.Run("emits expected write metrics", func(t *testing.T) {
 		reg := prometheus.NewRegistry()
-		met := metrics.NewHistorianMetrics(reg)
+		met := metrics.NewHistorianMetrics(reg, metrics.Subsystem)
 		anns := createTestAnnotationBackendSutWithMetrics(t, met)
 		errAnns := createFailingAnnotationSut(t, met)
 		rule := createTestRule()
@@ -101,7 +120,17 @@ grafana_alerting_state_history_writes_total{backend="annotations",org="1"} 2
 }
 
 func createTestAnnotationBackendSut(t *testing.T) *AnnotationBackend {
-	return createTestAnnotationBackendSutWithMetrics(t, metrics.NewHistorianMetrics(prometheus.NewRegistry()))
+	return createTestAnnotationBackendSutWithMetrics(t, metrics.NewHistorianMetrics(prometheus.NewRegistry(), metrics.Subsystem))
+}
+
+func createTestAnnotationSutWithStore(t *testing.T, annotations AnnotationStore) *AnnotationBackend {
+	t.Helper()
+	met := metrics.NewHistorianMetrics(prometheus.NewRegistry(), metrics.Subsystem)
+	rules := fakes.NewRuleStore(t)
+	rules.Rules[1] = []*models.AlertRule{
+		models.AlertRuleGen(withOrgID(1), withUID("my-rule"))(),
+	}
+	return NewAnnotationBackend(annotations, rules, met)
 }
 
 func createTestAnnotationBackendSutWithMetrics(t *testing.T, met *metrics.Historian) *AnnotationBackend {
@@ -213,3 +242,16 @@ func assertValidJSON(t *testing.T, j *simplejson.Json) string {
 	require.NoError(t, err)
 	return string(ser)
 }
+
+type interceptingAnnotationStore struct {
+	lastQuery *annotations.ItemQuery
+}
+
+func (i *interceptingAnnotationStore) Find(ctx context.Context, query *annotations.ItemQuery) ([]*annotations.ItemDTO, error) {
+	i.lastQuery = query
+	return []*annotations.ItemDTO{}, nil
+}
+
+func (i *interceptingAnnotationStore) Save(ctx context.Context, panel *PanelKey, annotations []annotations.Item, orgID int64, logger log.Logger) error {
+	return nil
+}
diff --git a/pkg/services/ngalert/state/historian/core.go b/pkg/services/ngalert/state/historian/core.go
index cf6c3e5cc78cd..cbeb4f4520538 100644
--- a/pkg/services/ngalert/state/historian/core.go
+++ b/pkg/services/ngalert/state/historian/core.go
@@ -34,6 +34,30 @@ func shouldRecord(transition state.StateTransition) bool {
 	return true
 }
 
+// ShouldRecordAnnotation returns true if an annotation should be created for a given state transition.
+// This is stricter than shouldRecord to avoid cluttering panels with state transitions.
+func ShouldRecordAnnotation(t state.StateTransition) bool {
+	if !shouldRecord(t) {
+		return false
+	}
+
+	// Do not log transitions when keeping last state
+	toKeepLast := strings.Contains(t.StateReason, models.StateReasonKeepLast) && !strings.Contains(t.PreviousStateReason, models.StateReasonKeepLast)
+	if toKeepLast {
+		return false
+	}
+
+	// Do not record transitions between Normal and Normal (NoData)
+	if t.State.State == eval.Normal && t.PreviousState == eval.Normal {
+		if (t.State.StateReason == "" && t.PreviousStateReason == models.StateReasonNoData) ||
+			(t.State.StateReason == models.StateReasonNoData && t.PreviousStateReason == "") {
+			return false
+		}
+	}
+
+	return true
+}
+
 func removePrivateLabels(labels data.Labels) data.Labels {
 	result := make(data.Labels)
 	for k, v := range labels {
diff --git a/pkg/services/ngalert/state/historian/core_test.go b/pkg/services/ngalert/state/historian/core_test.go
index d88bb192721e1..f798bd26cef46 100644
--- a/pkg/services/ngalert/state/historian/core_test.go
+++ b/pkg/services/ngalert/state/historian/core_test.go
@@ -97,6 +97,58 @@ func TestShouldRecord(t *testing.T) {
 	}
 }
 
+func TestShouldRecordAnnotation(t *testing.T) {
+	transition := func(from eval.State, fromReason string, to eval.State, toReason string) state.StateTransition {
+		return state.StateTransition{
+			PreviousState:       from,
+			PreviousStateReason: fromReason,
+			State:               &state.State{State: to, StateReason: toReason},
+		}
+	}
+
+	t.Run("transitions between Normal and Normal(NoData) not recorded", func(t *testing.T) {
+		forward := transition(eval.Normal, "", eval.Normal, models.StateReasonNoData)
+		backward := transition(eval.Normal, models.StateReasonNoData, eval.Normal, "")
+
+		require.False(t, ShouldRecordAnnotation(forward), "Normal -> Normal(NoData) should be false")
+		require.False(t, ShouldRecordAnnotation(backward), "Normal(NoData) -> Normal should be false")
+	})
+
+	t.Run("other Normal transitions involving NoData still recorded", func(t *testing.T) {
+		pauseForward := transition(eval.Normal, models.StateReasonNoData, eval.Normal, models.StateReasonPaused)
+		pauseBackward := transition(eval.Normal, models.StateReasonPaused, eval.Normal, models.StateReasonNoData)
+		errorForward := transition(eval.Normal, models.StateReasonNoData, eval.Normal, models.StateReasonError)
+		errorBackward := transition(eval.Normal, models.StateReasonError, eval.Normal, models.StateReasonNoData)
+		missingSeriesBackward := transition(eval.Normal, models.StateReasonMissingSeries, eval.Normal, models.StateReasonNoData)
+
+		require.True(t, ShouldRecordAnnotation(pauseForward), "Normal(NoData) -> Normal(Paused) should be true")
+		require.True(t, ShouldRecordAnnotation(pauseBackward), "Normal(Paused) -> Normal(NoData) should be true")
+		require.True(t, ShouldRecordAnnotation(errorForward), "Normal(NoData) -> Normal(Error) should be true")
+		require.True(t, ShouldRecordAnnotation(errorBackward), "Normal(Error) -> Normal(NoData) should be true")
+		require.True(t, ShouldRecordAnnotation(missingSeriesBackward), "Normal(MissingSeries) -> Normal(NoData) should be true")
+	})
+
+	t.Run("respects filters in shouldRecord()", func(t *testing.T) {
+		missingSeries := transition(eval.Normal, "", eval.Normal, models.StateReasonMissingSeries)
+		unpause := transition(eval.Normal, models.StateReasonPaused, eval.Normal, "")
+		afterUpdate := transition(eval.Normal, models.StateReasonUpdated, eval.Normal, "")
+
+		require.False(t, ShouldRecordAnnotation(missingSeries), "Normal -> Normal(MissingSeries) should be false")
+		require.False(t, ShouldRecordAnnotation(unpause), "Normal(Paused) -> Normal should be false")
+		require.False(t, ShouldRecordAnnotation(afterUpdate), "Normal(Updated) -> Normal should be false")
+
+		// Smoke test a few basic ones, exhaustive tests for shouldRecord() already exist elsewhere.
+		basicPending := transition(eval.Normal, "", eval.Pending, "")
+		basicAlerting := transition(eval.Pending, "", eval.Alerting, "")
+		basicResolve := transition(eval.Alerting, "", eval.Normal, "")
+		basicError := transition(eval.Normal, "", eval.Error, "")
+		require.True(t, ShouldRecordAnnotation(basicPending), "Normal -> Pending should be true")
+		require.True(t, ShouldRecordAnnotation(basicAlerting), "Pending -> Alerting should be true")
+		require.True(t, ShouldRecordAnnotation(basicResolve), "Alerting -> Normal should be true")
+		require.True(t, ShouldRecordAnnotation(basicError), "Normal -> Error should be true")
+	})
+}
+
 func TestRemovePrivateLabels(t *testing.T) {
 	type testCase struct {
 		name string
diff --git a/pkg/services/ngalert/state/historian/encode.go b/pkg/services/ngalert/state/historian/encode.go
index e2feec2fe09d5..18a551c31b810 100644
--- a/pkg/services/ngalert/state/historian/encode.go
+++ b/pkg/services/ngalert/state/historian/encode.go
@@ -3,21 +3,22 @@ package historian
 import (
 	"encoding/json"
 	"fmt"
+	"slices"
 	"strconv"
 	"strings"
 
 	"github.com/gogo/protobuf/proto"
 	"github.com/golang/snappy"
-	"github.com/grafana/grafana/pkg/components/loki/logproto"
 	"github.com/prometheus/common/model"
-	"golang.org/x/exp/slices"
+
+	"github.com/grafana/grafana/pkg/components/loki/logproto"
 )
 
 type JsonEncoder struct{}
 
-func (e JsonEncoder) encode(s []stream) ([]byte, error) {
+func (e JsonEncoder) encode(s []Stream) ([]byte, error) {
 	body := struct {
-		Streams []stream `json:"streams"`
+		Streams []Stream `json:"streams"`
 	}{Streams: s}
 	enc, err := json.Marshal(body)
 	if err != nil {
@@ -34,7 +35,7 @@ func (e JsonEncoder) headers() map[string]string {
 
 type SnappyProtoEncoder struct{}
 
-func (e SnappyProtoEncoder) encode(s []stream) ([]byte, error) {
+func (e SnappyProtoEncoder) encode(s []Stream) ([]byte, error) {
 	body := logproto.PushRequest{
 		Streams: make([]logproto.Stream, 0, len(s)),
 	}
diff --git a/pkg/services/ngalert/state/historian/loki.go b/pkg/services/ngalert/state/historian/loki.go
index 117a9d151c5af..1c4c8b071bb02 100644
--- a/pkg/services/ngalert/state/historian/loki.go
+++ b/pkg/services/ngalert/state/historian/loki.go
@@ -10,11 +10,11 @@ import (
 
 	"github.com/benbjohnson/clock"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
-	"github.com/weaveworks/common/http/client"
 	"go.opentelemetry.io/otel/trace"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/ngalert/client"
 	"github.com/grafana/grafana/pkg/services/ngalert/eval"
 	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
@@ -41,9 +41,9 @@ const (
 const defaultQueryRange = 6 * time.Hour
 
 type remoteLokiClient interface {
-	ping(context.Context) error
-	push(context.Context, []stream) error
-	rangeQuery(ctx context.Context, logQL string, start, end, limit int64) (queryRes, error)
+	Ping(context.Context) error
+	Push(context.Context, []Stream) error
+	RangeQuery(ctx context.Context, logQL string, start, end, limit int64) (QueryRes, error)
 }
 
 // RemoteLokibackend is a state.Historian that records state history to an external Loki instance.
@@ -58,7 +58,7 @@ type RemoteLokiBackend struct {
 func NewRemoteLokiBackend(cfg LokiConfig, req client.Requester, metrics *metrics.Historian) *RemoteLokiBackend {
 	logger := log.New("ngalert.state.historian", "backend", "loki")
 	return &RemoteLokiBackend{
-		client:         newLokiClient(cfg, req, metrics, logger),
+		client:         NewLokiClient(cfg, req, metrics, logger),
 		externalLabels: cfg.ExternalLabels,
 		clock:          clock.New(),
 		metrics:        metrics,
@@ -67,13 +67,13 @@ func NewRemoteLokiBackend(cfg LokiConfig, req client.Requester, metrics *metrics
 }
 
 func (h *RemoteLokiBackend) TestConnection(ctx context.Context) error {
-	return h.client.ping(ctx)
+	return h.client.Ping(ctx)
 }
 
 // Record writes a number of state transitions for a given rule to an external Loki instance.
 func (h *RemoteLokiBackend) Record(ctx context.Context, rule history_model.RuleMeta, states []state.StateTransition) <-chan error {
 	logger := h.log.FromContext(ctx)
-	logStream := statesToStream(rule, states, h.externalLabels, logger)
+	logStream := StatesToStream(rule, states, h.externalLabels, logger)
 
 	errCh := make(chan error, 1)
 	if len(logStream.Values) == 0 {
@@ -100,7 +100,7 @@ func (h *RemoteLokiBackend) Record(ctx context.Context, rule history_model.RuleM
 		h.metrics.WritesTotal.WithLabelValues(org, "loki").Inc()
 		h.metrics.TransitionsTotal.WithLabelValues(org).Add(float64(len(logStream.Values)))
 
-		if err := h.recordStreams(ctx, []stream{logStream}, logger); err != nil {
+		if err := h.recordStreams(ctx, []Stream{logStream}, logger); err != nil {
 			logger.Error("Failed to save alert state history batch", "error", err)
 			h.metrics.WritesFailed.WithLabelValues(org, "loki").Inc()
 			h.metrics.TransitionsFailed.WithLabelValues(org).Add(float64(len(logStream.Values)))
@@ -112,7 +112,7 @@ func (h *RemoteLokiBackend) Record(ctx context.Context, rule history_model.RuleM
 
 // Query retrieves state history entries from an external Loki instance and formats the results into a dataframe.
 func (h *RemoteLokiBackend) Query(ctx context.Context, query models.HistoryQuery) (*data.Frame, error) {
-	logQL, err := buildLogQuery(query)
+	logQL, err := BuildLogQuery(query)
 	if err != nil {
 		return nil, err
 	}
@@ -126,7 +126,7 @@ func (h *RemoteLokiBackend) Query(ctx context.Context, query models.HistoryQuery
 	}
 
 	// Timestamps are expected in RFC3339Nano.
-	res, err := h.client.rangeQuery(ctx, logQL, query.From.UnixNano(), query.To.UnixNano(), int64(query.Limit))
+	res, err := h.client.RangeQuery(ctx, logQL, query.From.UnixNano(), query.To.UnixNano(), int64(query.Limit))
 	if err != nil {
 		return nil, err
 	}
@@ -155,7 +155,7 @@ func buildSelectors(query models.HistoryQuery) ([]Selector, error) {
 }
 
 // merge will put all the results in one array sorted by timestamp.
-func merge(res queryRes, ruleUID string) (*data.Frame, error) {
+func merge(res QueryRes, ruleUID string) (*data.Frame, error) {
 	// Find the total number of elements in all arrays.
 	totalLen := 0
 	for _, arr := range res.Data.Result {
@@ -181,7 +181,7 @@ func merge(res queryRes, ruleUID string) (*data.Frame, error) {
 	pointers := make([]int, len(res.Data.Result))
 	for {
 		minTime := int64(math.MaxInt64)
-		minEl := sample{}
+		minEl := Sample{}
 		minElStreamIdx := -1
 		// Find the element with the earliest time among all arrays.
 		for i, stream := range res.Data.Result {
@@ -200,7 +200,7 @@ func merge(res queryRes, ruleUID string) (*data.Frame, error) {
 		if minElStreamIdx == -1 {
 			break
 		}
-		var entry lokiEntry
+		var entry LokiEntry
 		err := json.Unmarshal([]byte(minEl.V), &entry)
 		if err != nil {
 			return nil, fmt.Errorf("failed to unmarshal entry: %w", err)
@@ -231,7 +231,7 @@ func merge(res queryRes, ruleUID string) (*data.Frame, error) {
 	return frame, nil
 }
 
-func statesToStream(rule history_model.RuleMeta, states []state.StateTransition, externalLabels map[string]string, logger log.Logger) stream {
+func StatesToStream(rule history_model.RuleMeta, states []state.StateTransition, externalLabels map[string]string, logger log.Logger) Stream {
 	labels := mergeLabels(make(map[string]string), externalLabels)
 	// System-defined labels take precedence over user-defined external labels.
 	labels[StateHistoryLabelKey] = StateHistoryLabelValue
@@ -239,14 +239,14 @@ func statesToStream(rule history_model.RuleMeta, states []state.StateTransition,
 	labels[GroupLabel] = fmt.Sprint(rule.Group)
 	labels[FolderUIDLabel] = fmt.Sprint(rule.NamespaceUID)
 
-	samples := make([]sample, 0, len(states))
+	samples := make([]Sample, 0, len(states))
 	for _, state := range states {
 		if !shouldRecord(state) {
 			continue
 		}
 
 		sanitizedLabels := removePrivateLabels(state.Labels)
-		entry := lokiEntry{
+		entry := LokiEntry{
 			SchemaVersion:  1,
 			Previous:       state.PreviousFormatted(),
 			Current:        state.Formatted(),
@@ -255,6 +255,8 @@ func statesToStream(rule history_model.RuleMeta, states []state.StateTransition,
 			DashboardUID:   rule.DashboardUID,
 			PanelID:        rule.PanelID,
 			Fingerprint:    labelFingerprint(sanitizedLabels),
+			RuleTitle:      rule.Title,
+			RuleID:         rule.ID,
 			RuleUID:        rule.UID,
 			InstanceLabels: sanitizedLabels,
 		}
@@ -269,20 +271,20 @@ func statesToStream(rule history_model.RuleMeta, states []state.StateTransition,
 		}
 		line := string(jsn)
 
-		samples = append(samples, sample{
+		samples = append(samples, Sample{
 			T: state.State.LastEvaluationTime,
 			V: line,
 		})
 	}
 
-	return stream{
+	return Stream{
 		Stream: labels,
 		Values: samples,
 	}
 }
 
-func (h *RemoteLokiBackend) recordStreams(ctx context.Context, streams []stream, logger log.Logger) error {
-	if err := h.client.push(ctx, streams); err != nil {
+func (h *RemoteLokiBackend) recordStreams(ctx context.Context, streams []Stream, logger log.Logger) error {
+	if err := h.client.Push(ctx, streams); err != nil {
 		return err
 	}
 
@@ -290,7 +292,7 @@ func (h *RemoteLokiBackend) recordStreams(ctx context.Context, streams []stream,
 	return nil
 }
 
-type lokiEntry struct {
+type LokiEntry struct {
 	SchemaVersion int              `json:"schemaVersion"`
 	Previous      string           `json:"previous"`
 	Current       string           `json:"current"`
@@ -300,6 +302,8 @@ type lokiEntry struct {
 	DashboardUID  string           `json:"dashboardUID"`
 	PanelID       int64            `json:"panelID"`
 	Fingerprint   string           `json:"fingerprint"`
+	RuleTitle     string           `json:"ruleTitle"`
+	RuleID        int64            `json:"ruleID"`
 	RuleUID       string           `json:"ruleUID"`
 	// InstanceLabels is exactly the set of labels associated with the alert instance in Alertmanager.
 	// These should not be conflated with labels associated with log streams.
@@ -318,7 +322,7 @@ func jsonifyRow(line string) (json.RawMessage, error) {
 	// Ser/deser to validate the contents of the log line before shipping it forward.
 	// TODO: We may want to remove this in the future, as we already have the value in the form of a []byte, and json.RawMessage is also a []byte.
 	// TODO: Though, if the log line does not contain valid JSON, this can cause problems later on when rendering the dataframe.
-	var entry lokiEntry
+	var entry LokiEntry
 	if err := json.Unmarshal([]byte(line), &entry); err != nil {
 		return nil, err
 	}
@@ -362,7 +366,7 @@ func isValidOperator(op string) bool {
 	return false
 }
 
-func buildLogQuery(query models.HistoryQuery) (string, error) {
+func BuildLogQuery(query models.HistoryQuery) (string, error) {
 	selectors, err := buildSelectors(query)
 	if err != nil {
 		return "", fmt.Errorf("failed to build the provided selectors: %w", err)
diff --git a/pkg/services/ngalert/state/historian/loki_http.go b/pkg/services/ngalert/state/historian/loki_http.go
index 399707d541f78..44a7c0044eb37 100644
--- a/pkg/services/ngalert/state/historian/loki_http.go
+++ b/pkg/services/ngalert/state/historian/loki_http.go
@@ -12,9 +12,9 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/ngalert/client"
 	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
 	"github.com/grafana/grafana/pkg/setting"
-	"github.com/weaveworks/common/http/client"
 )
 
 const defaultPageSize = 1000
@@ -27,7 +27,7 @@ func NewRequester() client.Requester {
 // encoder serializes log streams to some byte format.
 type encoder interface {
 	// encode serializes a set of log streams to bytes.
-	encode(s []stream) ([]byte, error)
+	encode(s []Stream) ([]byte, error)
 	// headers returns a set of HTTP-style headers that describes the encoding scheme used.
 	headers() map[string]string
 }
@@ -40,6 +40,7 @@ type LokiConfig struct {
 	TenantID          string
 	ExternalLabels    map[string]string
 	Encoder           encoder
+	MaxQueryLength    time.Duration
 }
 
 func NewLokiConfig(cfg setting.UnifiedAlertingStateHistorySettings) (LokiConfig, error) {
@@ -74,12 +75,13 @@ func NewLokiConfig(cfg setting.UnifiedAlertingStateHistorySettings) (LokiConfig,
 		BasicAuthPassword: cfg.LokiBasicAuthPassword,
 		TenantID:          cfg.LokiTenantID,
 		ExternalLabels:    cfg.ExternalLabels,
+		MaxQueryLength:    cfg.LokiMaxQueryLength,
 		// Snappy-compressed protobuf is the default, same goes for Promtail.
 		Encoder: SnappyProtoEncoder{},
 	}, nil
 }
 
-type httpLokiClient struct {
+type HttpLokiClient struct {
 	client  client.Requester
 	encoder encoder
 	cfg     LokiConfig
@@ -101,9 +103,9 @@ const (
 	NeqRegEx Operator = "!~"
 )
 
-func newLokiClient(cfg LokiConfig, req client.Requester, metrics *metrics.Historian, logger log.Logger) *httpLokiClient {
+func NewLokiClient(cfg LokiConfig, req client.Requester, metrics *metrics.Historian, logger log.Logger) *HttpLokiClient {
 	tc := client.NewTimedClient(req, metrics.WriteDuration)
-	return &httpLokiClient{
+	return &HttpLokiClient{
 		client:  tc,
 		encoder: cfg.Encoder,
 		cfg:     cfg,
@@ -112,7 +114,7 @@ func newLokiClient(cfg LokiConfig, req client.Requester, metrics *metrics.Histor
 	}
 }
 
-func (c *httpLokiClient) ping(ctx context.Context) error {
+func (c *HttpLokiClient) Ping(ctx context.Context) error {
 	uri := c.cfg.ReadPathURL.JoinPath("/loki/api/v1/labels")
 	req, err := http.NewRequest(http.MethodGet, uri.String(), nil)
 	if err != nil {
@@ -140,23 +142,23 @@ func (c *httpLokiClient) ping(ctx context.Context) error {
 	return nil
 }
 
-type stream struct {
+type Stream struct {
 	Stream map[string]string `json:"stream"`
-	Values []sample          `json:"values"`
+	Values []Sample          `json:"values"`
 }
 
-type sample struct {
+type Sample struct {
 	T time.Time
 	V string
 }
 
-func (r *sample) MarshalJSON() ([]byte, error) {
+func (r *Sample) MarshalJSON() ([]byte, error) {
 	return json.Marshal([2]string{
 		fmt.Sprintf("%d", r.T.UnixNano()), r.V,
 	})
 }
 
-func (r *sample) UnmarshalJSON(b []byte) error {
+func (r *Sample) UnmarshalJSON(b []byte) error {
 	// A Loki stream sample is formatted like a list with two elements, [At, Val]
 	// At is a string wrapping a timestamp, in nanosecond unix epoch.
 	// Val is a string containing the log line.
@@ -173,7 +175,7 @@ func (r *sample) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-func (c *httpLokiClient) push(ctx context.Context, s []stream) error {
+func (c *HttpLokiClient) Push(ctx context.Context, s []Stream) error {
 	enc, err := c.encoder.encode(s)
 	if err != nil {
 		return err
@@ -193,30 +195,24 @@ func (c *httpLokiClient) push(ctx context.Context, s []stream) error {
 	c.metrics.BytesWritten.Add(float64(len(enc)))
 	req = req.WithContext(ctx)
 	resp, err := c.client.Do(req)
-	if resp != nil {
-		defer func() {
-			if err := resp.Body.Close(); err != nil {
-				c.log.Warn("Failed to close response body", "err", err)
-			}
-		}()
-	}
 	if err != nil {
 		return fmt.Errorf("failed to send request: %w", err)
 	}
-
-	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-		byt, _ := io.ReadAll(resp.Body)
-		if len(byt) > 0 {
-			c.log.Error("Error response from Loki", "response", string(byt), "status", resp.StatusCode)
-		} else {
-			c.log.Error("Error response from Loki with an empty body", "status", resp.StatusCode)
+	defer func() {
+		if err := resp.Body.Close(); err != nil {
+			c.log.Warn("Failed to close response body", "err", err)
 		}
-		return fmt.Errorf("received a non-200 response from loki, status: %d", resp.StatusCode)
+	}()
+
+	_, err = c.handleLokiResponse(resp)
+	if err != nil {
+		return err
 	}
+
 	return nil
 }
 
-func (c *httpLokiClient) setAuthAndTenantHeaders(req *http.Request) {
+func (c *HttpLokiClient) setAuthAndTenantHeaders(req *http.Request) {
 	if c.cfg.BasicAuthUser != "" || c.cfg.BasicAuthPassword != "" {
 		req.SetBasicAuth(c.cfg.BasicAuthUser, c.cfg.BasicAuthPassword)
 	}
@@ -226,11 +222,12 @@ func (c *httpLokiClient) setAuthAndTenantHeaders(req *http.Request) {
 	}
 }
 
-func (c *httpLokiClient) rangeQuery(ctx context.Context, logQL string, start, end, limit int64) (queryRes, error) {
+func (c *HttpLokiClient) RangeQuery(ctx context.Context, logQL string, start, end, limit int64) (QueryRes, error) {
 	// Run the pre-flight checks for the query.
 	if start > end {
-		return queryRes{}, fmt.Errorf("start time cannot be after end time")
+		return QueryRes{}, fmt.Errorf("start time cannot be after end time")
 	}
+	start, end = ClampRange(start, end, c.cfg.MaxQueryLength.Nanoseconds())
 	if limit < 1 {
 		limit = defaultPageSize
 	}
@@ -251,7 +248,7 @@ func (c *httpLokiClient) rangeQuery(ctx context.Context, logQL string, start, en
 	req, err := http.NewRequest(http.MethodGet,
 		queryURL.String(), nil)
 	if err != nil {
-		return queryRes{}, fmt.Errorf("error creating request: %w", err)
+		return QueryRes{}, fmt.Errorf("error creating request: %w", err)
 	}
 
 	req = req.WithContext(ctx)
@@ -259,16 +256,45 @@ func (c *httpLokiClient) rangeQuery(ctx context.Context, logQL string, start, en
 
 	res, err := c.client.Do(req)
 	if err != nil {
-		return queryRes{}, fmt.Errorf("error executing request: %w", err)
+		return QueryRes{}, fmt.Errorf("error executing request: %w", err)
 	}
-
 	defer func() {
-		_ = res.Body.Close()
+		if err := res.Body.Close(); err != nil {
+			c.log.Warn("Failed to close response body", "err", err)
+		}
 	}()
 
+	data, err := c.handleLokiResponse(res)
+	if err != nil {
+		return QueryRes{}, err
+	}
+
+	result := QueryRes{}
+	err = json.Unmarshal(data, &result)
+	if err != nil {
+		fmt.Println(string(data))
+		return QueryRes{}, fmt.Errorf("error parsing request response: %w", err)
+	}
+
+	return result, nil
+}
+
+type QueryRes struct {
+	Data QueryData `json:"data"`
+}
+
+type QueryData struct {
+	Result []Stream `json:"result"`
+}
+
+func (c *HttpLokiClient) handleLokiResponse(res *http.Response) ([]byte, error) {
+	if res == nil {
+		return nil, fmt.Errorf("response is nil")
+	}
+
 	data, err := io.ReadAll(res.Body)
 	if err != nil {
-		return queryRes{}, fmt.Errorf("error reading request response: %w", err)
+		return nil, fmt.Errorf("error reading request response: %w", err)
 	}
 
 	if res.StatusCode < 200 || res.StatusCode >= 300 {
@@ -277,23 +303,19 @@ func (c *httpLokiClient) rangeQuery(ctx context.Context, logQL string, start, en
 		} else {
 			c.log.Error("Error response from Loki with an empty body", "status", res.StatusCode)
 		}
-		return queryRes{}, fmt.Errorf("received a non-200 response from loki, status: %d", res.StatusCode)
-	}
-
-	result := queryRes{}
-	err = json.Unmarshal(data, &result)
-	if err != nil {
-		fmt.Println(string(data))
-		return queryRes{}, fmt.Errorf("error parsing request response: %w", err)
+		return nil, fmt.Errorf("received a non-200 response from loki, status: %d", res.StatusCode)
 	}
 
-	return result, nil
+	return data, nil
 }
 
-type queryRes struct {
-	Data queryData `json:"data"`
-}
+// ClampRange ensures that the time range is within the configured maximum query length.
+func ClampRange(start, end, maxTimeRange int64) (newStart int64, newEnd int64) {
+	newStart, newEnd = start, end
+
+	if maxTimeRange != 0 && end-start > maxTimeRange {
+		newStart = end - maxTimeRange
+	}
 
-type queryData struct {
-	Result []stream `json:"result"`
+	return newStart, newEnd
 }
diff --git a/pkg/services/ngalert/state/historian/loki_http_test.go b/pkg/services/ngalert/state/historian/loki_http_test.go
index d47313e5c46e6..961f323809784 100644
--- a/pkg/services/ngalert/state/historian/loki_http_test.go
+++ b/pkg/services/ngalert/state/historian/loki_http_test.go
@@ -11,11 +11,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/grafana/grafana/pkg/services/ngalert/client"
 	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/http/client"
 
 	"github.com/grafana/grafana/pkg/infra/log"
 )
@@ -111,10 +111,10 @@ func TestLokiHTTPClient(t *testing.T) {
 		req := NewFakeRequester()
 		client := createTestLokiClient(req)
 		now := time.Now().UTC()
-		data := []stream{
+		data := []Stream{
 			{
 				Stream: map[string]string{},
-				Values: []sample{
+				Values: []Sample{
 					{
 						T: now,
 						V: "some line",
@@ -123,7 +123,7 @@ func TestLokiHTTPClient(t *testing.T) {
 			},
 		}
 
-		err := client.push(context.Background(), data)
+		err := client.Push(context.Background(), data)
 
 		require.NoError(t, err)
 		require.Contains(t, "/loki/api/v1/push", req.lastRequest.URL.Path)
@@ -145,7 +145,7 @@ func TestLokiHTTPClient(t *testing.T) {
 			now := time.Now().UTC().UnixNano()
 			q := `{from="state-history"}`
 
-			_, err := client.rangeQuery(context.Background(), q, now-100, now, 1100)
+			_, err := client.RangeQuery(context.Background(), q, now-100, now, 1100)
 
 			require.NoError(t, err)
 			params := req.lastRequest.URL.Query()
@@ -165,7 +165,7 @@ func TestLokiHTTPClient(t *testing.T) {
 			now := time.Now().UTC().UnixNano()
 			q := `{from="state-history"}`
 
-			_, err := client.rangeQuery(context.Background(), q, now-100, now, 0)
+			_, err := client.RangeQuery(context.Background(), q, now-100, now, 0)
 
 			require.NoError(t, err)
 			params := req.lastRequest.URL.Query()
@@ -185,7 +185,7 @@ func TestLokiHTTPClient(t *testing.T) {
 			now := time.Now().UTC().UnixNano()
 			q := `{from="state-history"}`
 
-			_, err := client.rangeQuery(context.Background(), q, now-100, now, -100)
+			_, err := client.RangeQuery(context.Background(), q, now-100, now, -100)
 
 			require.NoError(t, err)
 			params := req.lastRequest.URL.Query()
@@ -205,7 +205,7 @@ func TestLokiHTTPClient(t *testing.T) {
 			now := time.Now().UTC().UnixNano()
 			q := `{from="state-history"}`
 
-			_, err := client.rangeQuery(context.Background(), q, now-100, now, maximumPageSize+1000)
+			_, err := client.RangeQuery(context.Background(), q, now-100, now, maximumPageSize+1000)
 
 			require.NoError(t, err)
 			params := req.lastRequest.URL.Query()
@@ -223,14 +223,14 @@ func TestLokiHTTPClient_Manual(t *testing.T) {
 		url, err := url.Parse("https://logs-prod-eu-west-0.grafana.net")
 		require.NoError(t, err)
 
-		client := newLokiClient(LokiConfig{
+		client := NewLokiClient(LokiConfig{
 			ReadPathURL:  url,
 			WritePathURL: url,
 			Encoder:      JsonEncoder{},
-		}, NewRequester(), metrics.NewHistorianMetrics(prometheus.NewRegistry()), log.NewNopLogger())
+		}, NewRequester(), metrics.NewHistorianMetrics(prometheus.NewRegistry(), metrics.Subsystem), log.NewNopLogger())
 
 		// Unauthorized request should fail against Grafana Cloud.
-		err = client.ping(context.Background())
+		err = client.Ping(context.Background())
 		require.Error(t, err)
 
 		client.cfg.BasicAuthUser = "<your_username>"
@@ -241,7 +241,7 @@ func TestLokiHTTPClient_Manual(t *testing.T) {
 		// client.cfg.TenantID = "<your_tenant_id>"
 
 		// Authorized request should not fail against Grafana Cloud.
-		err = client.ping(context.Background())
+		err = client.Ping(context.Background())
 		require.NoError(t, err)
 	})
 
@@ -249,13 +249,13 @@ func TestLokiHTTPClient_Manual(t *testing.T) {
 		url, err := url.Parse("https://logs-prod-eu-west-0.grafana.net")
 		require.NoError(t, err)
 
-		client := newLokiClient(LokiConfig{
+		client := NewLokiClient(LokiConfig{
 			ReadPathURL:       url,
 			WritePathURL:      url,
 			BasicAuthUser:     "<your_username>",
 			BasicAuthPassword: "<your_password>",
 			Encoder:           JsonEncoder{},
-		}, NewRequester(), metrics.NewHistorianMetrics(prometheus.NewRegistry()), log.NewNopLogger())
+		}, NewRequester(), metrics.NewHistorianMetrics(prometheus.NewRegistry(), metrics.Subsystem), log.NewNopLogger())
 
 		// When running on prem, you might need to set the tenant id,
 		// so the x-scope-orgid header is set.
@@ -268,7 +268,7 @@ func TestLokiHTTPClient_Manual(t *testing.T) {
 		end := time.Now().UnixNano()
 
 		// Authorized request should not fail against Grafana Cloud.
-		res, err := client.rangeQuery(context.Background(), logQL, start, end, defaultPageSize)
+		res, err := client.RangeQuery(context.Background(), logQL, start, end, defaultPageSize)
 		require.NoError(t, err)
 		require.NotNil(t, res)
 	})
@@ -276,7 +276,7 @@ func TestLokiHTTPClient_Manual(t *testing.T) {
 
 func TestRow(t *testing.T) {
 	t.Run("marshal", func(t *testing.T) {
-		row := sample{
+		row := Sample{
 			T: time.Unix(0, 1234),
 			V: "some sample",
 		}
@@ -290,7 +290,7 @@ func TestRow(t *testing.T) {
 	t.Run("unmarshal", func(t *testing.T) {
 		jsn := []byte(`["1234", "some sample"]`)
 
-		row := sample{}
+		row := Sample{}
 		err := json.Unmarshal(jsn, &row)
 
 		require.NoError(t, err)
@@ -301,7 +301,7 @@ func TestRow(t *testing.T) {
 	t.Run("unmarshal invalid", func(t *testing.T) {
 		jsn := []byte(`{"key": "wrong shape"}`)
 
-		row := sample{}
+		row := Sample{}
 		err := json.Unmarshal(jsn, &row)
 
 		require.ErrorContains(t, err, "failed to deserialize sample")
@@ -310,7 +310,7 @@ func TestRow(t *testing.T) {
 	t.Run("unmarshal bad timestamp", func(t *testing.T) {
 		jsn := []byte(`["not-unix-nano", "some sample"]`)
 
-		row := sample{}
+		row := Sample{}
 		err := json.Unmarshal(jsn, &row)
 
 		require.ErrorContains(t, err, "timestamp in Loki sample")
@@ -319,9 +319,9 @@ func TestRow(t *testing.T) {
 
 func TestStream(t *testing.T) {
 	t.Run("marshal", func(t *testing.T) {
-		stream := stream{
+		stream := Stream{
 			Stream: map[string]string{"a": "b"},
-			Values: []sample{
+			Values: []Sample{
 				{T: time.Unix(0, 1), V: "one"},
 				{T: time.Unix(0, 2), V: "two"},
 			},
@@ -338,15 +338,58 @@ func TestStream(t *testing.T) {
 	})
 }
 
-func createTestLokiClient(req client.Requester) *httpLokiClient {
+func TestClampRange(t *testing.T) {
+	tc := []struct {
+		name     string
+		oldRange []int64
+		max      int64
+		newRange []int64
+	}{
+		{
+			name:     "clamps start value if max is smaller than range",
+			oldRange: []int64{5, 10},
+			max:      1,
+			newRange: []int64{9, 10},
+		},
+		{
+			name:     "returns same values if max is greater than range",
+			oldRange: []int64{5, 10},
+			max:      20,
+			newRange: []int64{5, 10},
+		},
+		{
+			name:     "returns same values if max is equal to range",
+			oldRange: []int64{5, 10},
+			max:      5,
+			newRange: []int64{5, 10},
+		},
+		{
+			name:     "returns same values if max is zero",
+			oldRange: []int64{5, 10},
+			max:      0,
+			newRange: []int64{5, 10},
+		},
+	}
+
+	for _, c := range tc {
+		t.Run(c.name, func(t *testing.T) {
+			start, end := ClampRange(c.oldRange[0], c.oldRange[1], c.max)
+
+			require.Equal(t, c.newRange[0], start)
+			require.Equal(t, c.newRange[1], end)
+		})
+	}
+}
+
+func createTestLokiClient(req client.Requester) *HttpLokiClient {
 	url, _ := url.Parse("http://some.url")
 	cfg := LokiConfig{
 		WritePathURL: url,
 		ReadPathURL:  url,
 		Encoder:      JsonEncoder{},
 	}
-	met := metrics.NewHistorianMetrics(prometheus.NewRegistry())
-	return newLokiClient(cfg, req, met, log.NewNopLogger())
+	met := metrics.NewHistorianMetrics(prometheus.NewRegistry(), metrics.Subsystem)
+	return NewLokiClient(cfg, req, met, log.NewNopLogger())
 }
 
 func reqBody(t *testing.T, req *http.Request) string {
diff --git a/pkg/services/ngalert/state/historian/loki_test.go b/pkg/services/ngalert/state/historian/loki_test.go
index a6abc4176c8fc..caa0db0aa4d56 100644
--- a/pkg/services/ngalert/state/historian/loki_test.go
+++ b/pkg/services/ngalert/state/historian/loki_test.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/ngalert/client"
 	"github.com/grafana/grafana/pkg/services/ngalert/eval"
 	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
@@ -21,7 +22,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/testutil"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/http/client"
 )
 
 func TestRemoteLokiBackend(t *testing.T) {
@@ -31,7 +31,7 @@ func TestRemoteLokiBackend(t *testing.T) {
 			l := log.NewNopLogger()
 			states := singleFromNormal(&state.State{State: eval.Normal})
 
-			res := statesToStream(rule, states, nil, l)
+			res := StatesToStream(rule, states, nil, l)
 
 			require.Empty(t, res.Values)
 		})
@@ -41,7 +41,7 @@ func TestRemoteLokiBackend(t *testing.T) {
 			l := log.NewNopLogger()
 			states := singleFromNormal(&state.State{State: eval.Error, Error: fmt.Errorf("oh no")})
 
-			res := statesToStream(rule, states, nil, l)
+			res := StatesToStream(rule, states, nil, l)
 
 			entry := requireSingleEntry(t, res)
 			require.Contains(t, entry.Error, "oh no")
@@ -52,7 +52,7 @@ func TestRemoteLokiBackend(t *testing.T) {
 			l := log.NewNopLogger()
 			states := singleFromNormal(&state.State{State: eval.NoData})
 
-			res := statesToStream(rule, states, nil, l)
+			res := StatesToStream(rule, states, nil, l)
 
 			_ = requireSingleEntry(t, res)
 		})
@@ -65,7 +65,7 @@ func TestRemoteLokiBackend(t *testing.T) {
 				Labels: data.Labels{"a": "b"},
 			})
 
-			res := statesToStream(rule, states, nil, l)
+			res := StatesToStream(rule, states, nil, l)
 
 			exp := map[string]string{
 				StateHistoryLabelKey: StateHistoryLabelValue,
@@ -84,12 +84,12 @@ func TestRemoteLokiBackend(t *testing.T) {
 				Labels: data.Labels{"__private__": "b"},
 			})
 
-			res := statesToStream(rule, states, nil, l)
+			res := StatesToStream(rule, states, nil, l)
 
 			require.NotContains(t, res.Stream, "__private__")
 		})
 
-		t.Run("includes ruleUID in log line", func(t *testing.T) {
+		t.Run("includes rule data in log line", func(t *testing.T) {
 			rule := createTestRule()
 			l := log.NewNopLogger()
 			states := singleFromNormal(&state.State{
@@ -97,9 +97,12 @@ func TestRemoteLokiBackend(t *testing.T) {
 				Labels: data.Labels{"a": "b"},
 			})
 
-			res := statesToStream(rule, states, nil, l)
+			res := StatesToStream(rule, states, nil, l)
 
 			entry := requireSingleEntry(t, res)
+
+			require.Equal(t, rule.Title, entry.RuleTitle)
+			require.Equal(t, rule.ID, entry.RuleID)
 			require.Equal(t, rule.UID, entry.RuleUID)
 		})
 
@@ -111,7 +114,7 @@ func TestRemoteLokiBackend(t *testing.T) {
 				Labels: data.Labels{"statelabel": "labelvalue"},
 			})
 
-			res := statesToStream(rule, states, nil, l)
+			res := StatesToStream(rule, states, nil, l)
 
 			entry := requireSingleEntry(t, res)
 			require.Contains(t, entry.InstanceLabels, "statelabel")
@@ -129,7 +132,7 @@ func TestRemoteLokiBackend(t *testing.T) {
 				},
 			})
 
-			res := statesToStream(rule, states, nil, l)
+			res := StatesToStream(rule, states, nil, l)
 
 			entry := requireSingleEntry(t, res)
 			require.Len(t, entry.InstanceLabels, 3)
@@ -143,7 +146,7 @@ func TestRemoteLokiBackend(t *testing.T) {
 				Values: map[string]float64{"A": 2.0, "B": 5.5},
 			})
 
-			res := statesToStream(rule, states, nil, l)
+			res := StatesToStream(rule, states, nil, l)
 
 			entry := requireSingleEntry(t, res)
 			require.NotNil(t, entry.Values)
@@ -162,7 +165,7 @@ func TestRemoteLokiBackend(t *testing.T) {
 				Labels: data.Labels{"a": "b"},
 			})
 
-			res := statesToStream(rule, states, nil, l)
+			res := StatesToStream(rule, states, nil, l)
 
 			entry := requireSingleEntry(t, res)
 			require.Equal(t, rule.Condition, entry.Condition)
@@ -180,7 +183,7 @@ func TestRemoteLokiBackend(t *testing.T) {
 				},
 			})
 
-			res := statesToStream(rule, states, nil, l)
+			res := StatesToStream(rule, states, nil, l)
 
 			entry := requireSingleEntry(t, res)
 			exp := labelFingerprint(states[0].Labels)
@@ -279,7 +282,7 @@ func TestRemoteLokiBackend(t *testing.T) {
 
 		for _, tc := range cases {
 			t.Run(tc.name, func(t *testing.T) {
-				res, err := buildLogQuery(tc.query)
+				res, err := BuildLogQuery(tc.query)
 				require.NoError(t, err)
 				require.Equal(t, tc.exp, res)
 			})
@@ -290,20 +293,20 @@ func TestRemoteLokiBackend(t *testing.T) {
 func TestMerge(t *testing.T) {
 	testCases := []struct {
 		name         string
-		res          queryRes
+		res          QueryRes
 		ruleID       string
 		expectedTime []time.Time
 	}{
 		{
 			name: "Should return values from multiple streams in right order",
-			res: queryRes{
-				Data: queryData{
-					Result: []stream{
+			res: QueryRes{
+				Data: QueryData{
+					Result: []Stream{
 						{
 							Stream: map[string]string{
 								"current": "pending",
 							},
-							Values: []sample{
+							Values: []Sample{
 								{time.Unix(0, 1), `{"schemaVersion": 1, "previous": "normal", "current": "pending", "values":{"a": "b"}}`},
 							},
 						},
@@ -311,7 +314,7 @@ func TestMerge(t *testing.T) {
 							Stream: map[string]string{
 								"current": "firing",
 							},
-							Values: []sample{
+							Values: []Sample{
 								{time.Unix(0, 2), `{"schemaVersion": 1, "previous": "pending", "current": "firing", "values":{"a": "b"}}`},
 							},
 						},
@@ -326,14 +329,14 @@ func TestMerge(t *testing.T) {
 		},
 		{
 			name: "Should handle empty values",
-			res: queryRes{
-				Data: queryData{
-					Result: []stream{
+			res: QueryRes{
+				Data: QueryData{
+					Result: []Stream{
 						{
 							Stream: map[string]string{
 								"current": "normal",
 							},
-							Values: []sample{},
+							Values: []Sample{},
 						},
 					},
 				},
@@ -343,14 +346,14 @@ func TestMerge(t *testing.T) {
 		},
 		{
 			name: "Should handle multiple values in one stream",
-			res: queryRes{
-				Data: queryData{
-					Result: []stream{
+			res: QueryRes{
+				Data: QueryData{
+					Result: []Stream{
 						{
 							Stream: map[string]string{
 								"current": "normal",
 							},
-							Values: []sample{
+							Values: []Sample{
 								{time.Unix(0, 1), `{"schemaVersion": 1, "previous": "firing", "current": "normal", "values":{"a": "b"}}`},
 								{time.Unix(0, 2), `{"schemaVersion": 1, "previous": "firing", "current": "normal", "values":{"a": "b"}}`},
 							},
@@ -359,7 +362,7 @@ func TestMerge(t *testing.T) {
 							Stream: map[string]string{
 								"current": "firing",
 							},
-							Values: []sample{
+							Values: []Sample{
 								{time.Unix(0, 3), `{"schemaVersion": 1, "previous": "pending", "current": "firing", "values":{"a": "b"}}`},
 							},
 						},
@@ -399,7 +402,7 @@ func TestMerge(t *testing.T) {
 func TestRecordStates(t *testing.T) {
 	t.Run("writes state transitions to loki", func(t *testing.T) {
 		req := NewFakeRequester()
-		loki := createTestLokiBackend(req, metrics.NewHistorianMetrics(prometheus.NewRegistry()))
+		loki := createTestLokiBackend(req, metrics.NewHistorianMetrics(prometheus.NewRegistry(), metrics.Subsystem))
 		rule := createTestRule()
 		states := singleFromNormal(&state.State{
 			State:  eval.Alerting,
@@ -414,7 +417,7 @@ func TestRecordStates(t *testing.T) {
 
 	t.Run("emits expected write metrics", func(t *testing.T) {
 		reg := prometheus.NewRegistry()
-		met := metrics.NewHistorianMetrics(reg)
+		met := metrics.NewHistorianMetrics(reg, metrics.Subsystem)
 		loki := createTestLokiBackend(NewFakeRequester(), met)
 		errLoki := createTestLokiBackend(NewFakeRequester().WithResponse(badResponse()), met) //nolint:bodyclose
 		rule := createTestRule()
@@ -451,7 +454,7 @@ grafana_alerting_state_history_writes_total{backend="loki",org="1"} 2
 
 	t.Run("elides request if nothing to send", func(t *testing.T) {
 		req := NewFakeRequester()
-		loki := createTestLokiBackend(req, metrics.NewHistorianMetrics(prometheus.NewRegistry()))
+		loki := createTestLokiBackend(req, metrics.NewHistorianMetrics(prometheus.NewRegistry(), metrics.Subsystem))
 		rule := createTestRule()
 		states := []state.StateTransition{}
 
@@ -463,7 +466,7 @@ grafana_alerting_state_history_writes_total{backend="loki",org="1"} 2
 
 	t.Run("succeeds with special chars in labels", func(t *testing.T) {
 		req := NewFakeRequester()
-		loki := createTestLokiBackend(req, metrics.NewHistorianMetrics(prometheus.NewRegistry()))
+		loki := createTestLokiBackend(req, metrics.NewHistorianMetrics(prometheus.NewRegistry(), metrics.Subsystem))
 		rule := createTestRule()
 		states := singleFromNormal(&state.State{
 			State: eval.Alerting,
@@ -486,7 +489,7 @@ grafana_alerting_state_history_writes_total{backend="loki",org="1"} 2
 
 	t.Run("adds external labels to log lines", func(t *testing.T) {
 		req := NewFakeRequester()
-		loki := createTestLokiBackend(req, metrics.NewHistorianMetrics(prometheus.NewRegistry()))
+		loki := createTestLokiBackend(req, metrics.NewHistorianMetrics(prometheus.NewRegistry(), metrics.Subsystem))
 		rule := createTestRule()
 		states := singleFromNormal(&state.State{
 			State: eval.Alerting,
@@ -525,23 +528,25 @@ func singleFromNormal(st *state.State) []state.StateTransition {
 func createTestRule() history_model.RuleMeta {
 	return history_model.RuleMeta{
 		OrgID:        1,
+		ID:           123,
 		UID:          "rule-uid",
 		Group:        "my-group",
 		NamespaceUID: "my-folder",
 		DashboardUID: "dash-uid",
 		PanelID:      123,
+		Title:        "my-title",
 	}
 }
 
-func requireSingleEntry(t *testing.T, res stream) lokiEntry {
+func requireSingleEntry(t *testing.T, res Stream) LokiEntry {
 	require.Len(t, res.Values, 1)
 	return requireEntry(t, res.Values[0])
 }
 
-func requireEntry(t *testing.T, row sample) lokiEntry {
+func requireEntry(t *testing.T, row Sample) LokiEntry {
 	t.Helper()
 
-	var entry lokiEntry
+	var entry LokiEntry
 	err := json.Unmarshal([]byte(row.V), &entry)
 	require.NoError(t, err)
 	return entry
diff --git a/pkg/services/ngalert/state/manager.go b/pkg/services/ngalert/state/manager.go
index 19add64d5a1b0..da6d614ff5ef5 100644
--- a/pkg/services/ngalert/state/manager.go
+++ b/pkg/services/ngalert/state/manager.go
@@ -3,10 +3,10 @@ package state
 import (
 	"context"
 	"net/url"
+	"strconv"
 	"time"
 
 	"github.com/benbjohnson/clock"
-	"github.com/grafana/dskit/concurrency"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
@@ -29,6 +29,11 @@ type AlertInstanceManager interface {
 	GetStatesForRuleUID(orgID int64, alertRuleUID string) []*State
 }
 
+type StatePersister interface {
+	Async(ctx context.Context, cache *cache)
+	Sync(ctx context.Context, span trace.Span, states, staleStates []StateTransition)
+}
+
 type Manager struct {
 	log     log.Logger
 	metrics *metrics.State
@@ -44,8 +49,10 @@ type Manager struct {
 	externalURL   *url.URL
 
 	doNotSaveNormalState           bool
-	maxStateSaveConcurrency        int
 	applyNoDataAndErrorToAllStates bool
+	rulesPerRuleGroupLimit         int64
+
+	persister StatePersister
 }
 
 type ManagerCfg struct {
@@ -59,16 +66,16 @@ type ManagerCfg struct {
 	DoNotSaveNormalState bool
 	// MaxStateSaveConcurrency controls the number of goroutines (per rule) that can save alert state in parallel.
 	MaxStateSaveConcurrency int
-
 	// ApplyNoDataAndErrorToAllStates makes state manager to apply exceptional results (NoData and Error)
 	// to all states when corresponding execution in the rule definition is set to either `Alerting` or `OK`
 	ApplyNoDataAndErrorToAllStates bool
+	RulesPerRuleGroupLimit         int64
 
 	Tracer tracing.Tracer
 	Log    log.Logger
 }
 
-func NewManager(cfg ManagerCfg) *Manager {
+func NewManager(cfg ManagerCfg, statePersister StatePersister) *Manager {
 	// Metrics for the cache use a collector, so they need access to the register directly.
 	c := newCache()
 	if cfg.Metrics != nil {
@@ -86,8 +93,9 @@ func NewManager(cfg ManagerCfg) *Manager {
 		clock:                          cfg.Clock,
 		externalURL:                    cfg.ExternalURL,
 		doNotSaveNormalState:           cfg.DoNotSaveNormalState,
-		maxStateSaveConcurrency:        cfg.MaxStateSaveConcurrency,
 		applyNoDataAndErrorToAllStates: cfg.ApplyNoDataAndErrorToAllStates,
+		rulesPerRuleGroupLimit:         cfg.RulesPerRuleGroupLimit,
+		persister:                      statePersister,
 		tracer:                         cfg.Tracer,
 	}
 
@@ -98,6 +106,11 @@ func NewManager(cfg ManagerCfg) *Manager {
 	return m
 }
 
+func (st *Manager) Run(ctx context.Context) error {
+	st.persister.Async(ctx, st.cache)
+	return nil
+}
+
 func (st *Manager) Warm(ctx context.Context, rulesReader RuleReader) {
 	if st.instanceStore == nil {
 		st.log.Info("Skip warming the state because instance store is not configured")
@@ -124,8 +137,23 @@ func (st *Manager) Warm(ctx context.Context, rulesReader RuleReader) {
 		}
 
 		ruleByUID := make(map[string]*ngModels.AlertRule, len(alertRules))
+		groupSizes := make(map[string]int64)
 		for _, rule := range alertRules {
 			ruleByUID[rule.UID] = rule
+			groupSizes[rule.RuleGroup] += 1
+		}
+
+		// Emit a warning if we detect a large group.
+		// We will not enforce this here, but it's convenient to emit the warning here as we load up all the rules.
+		for name, size := range groupSizes {
+			if st.rulesPerRuleGroupLimit > 0 && size > st.rulesPerRuleGroupLimit {
+				st.log.Warn(
+					"Large rule group was loaded. Large groups are discouraged and changes to them may be disallowed in the future.",
+					"limit", st.rulesPerRuleGroupLimit,
+					"actual", size,
+					"group", name,
+				)
+			}
 		}
 
 		orgStates := make(map[string]*ruleStates, len(ruleByUID))
@@ -158,6 +186,14 @@ func (st *Manager) Warm(ctx context.Context, rulesReader RuleReader) {
 			if err != nil {
 				st.log.Error("Error getting cacheId for entry", "error", err)
 			}
+			var resultFp data.Fingerprint
+			if entry.ResultFingerprint != "" {
+				fp, err := strconv.ParseUint(entry.ResultFingerprint, 16, 64)
+				if err != nil {
+					st.log.Error("Failed to parse result fingerprint of alert instance", "error", err, "ruleUID", entry.RuleUID)
+				}
+				resultFp = data.Fingerprint(fp)
+			}
 			rulesStates.states[cacheID] = &State{
 				AlertRuleUID:         entry.RuleUID,
 				OrgID:                entry.RuleOrgID,
@@ -170,6 +206,7 @@ func (st *Manager) Warm(ctx context.Context, rulesReader RuleReader) {
 				EndsAt:               entry.CurrentStateEnd,
 				LastEvaluationTime:   entry.LastEvalTime,
 				Annotations:          ruleForEntry.Annotations,
+				ResultFingerprint:    resultFp,
 			}
 			statesCount++
 		}
@@ -207,7 +244,7 @@ func (st *Manager) DeleteStateByRuleUID(ctx context.Context, ruleKey ngModels.Al
 		s.SetNormal(reason, startsAt, now)
 		// Set Resolved property so the scheduler knows to send a postable alert
 		// to Alertmanager.
-		s.Resolved = oldState == eval.Alerting
+		s.Resolved = oldState == eval.Alerting || oldState == eval.Error || oldState == eval.NoData
 		s.LastEvaluationTime = now
 		s.Values = map[string]float64{}
 		transitions = append(transitions, StateTransition{
@@ -269,16 +306,7 @@ func (st *Manager) ProcessEvalResults(ctx context.Context, evaluatedAt time.Time
 	))
 
 	staleStates := st.deleteStaleStatesFromCache(ctx, logger, evaluatedAt, alertRule)
-	st.deleteAlertStates(tracingCtx, logger, staleStates)
-
-	if len(staleStates) > 0 {
-		span.AddEvent("deleted stale states", trace.WithAttributes(
-			attribute.Int64("state_transitions", int64(len(staleStates))),
-		))
-	}
-
-	st.saveAlertStates(tracingCtx, logger, states...)
-	span.AddEvent("updated database")
+	st.persister.Sync(tracingCtx, span, states, staleStates)
 
 	allChanges := append(states, staleStates...)
 	if st.historian != nil {
@@ -288,14 +316,14 @@ func (st *Manager) ProcessEvalResults(ctx context.Context, evaluatedAt time.Time
 }
 
 func (st *Manager) setNextStateForRule(ctx context.Context, alertRule *ngModels.AlertRule, results eval.Results, extraLabels data.Labels, logger log.Logger) []StateTransition {
-	if st.applyNoDataAndErrorToAllStates && results.IsNoData() && (alertRule.NoDataState == ngModels.Alerting || alertRule.NoDataState == ngModels.OK) { // If it is no data, check the mapping and switch all results to the new state
+	if st.applyNoDataAndErrorToAllStates && results.IsNoData() && (alertRule.NoDataState == ngModels.Alerting || alertRule.NoDataState == ngModels.OK || alertRule.NoDataState == ngModels.KeepLast) { // If it is no data, check the mapping and switch all results to the new state
 		// TODO aggregate UID of datasources that returned NoData into one and provide as auxiliary info, probably annotation
 		transitions := st.setNextStateForAll(ctx, alertRule, results[0], logger)
 		if len(transitions) > 0 {
 			return transitions // if there are no current states for the rule. Create ones for each result
 		}
 	}
-	if st.applyNoDataAndErrorToAllStates && results.IsError() && (alertRule.ExecErrState == ngModels.AlertingErrState || alertRule.ExecErrState == ngModels.OkErrState) {
+	if st.applyNoDataAndErrorToAllStates && results.IsError() && (alertRule.ExecErrState == ngModels.AlertingErrState || alertRule.ExecErrState == ngModels.OkErrState || alertRule.ExecErrState == ngModels.KeepLastErrState) {
 		// TODO squash all errors into one, and provide as annotation
 		transitions := st.setNextStateForAll(ctx, alertRule, results[0], logger)
 		if len(transitions) > 0 {
@@ -324,6 +352,7 @@ func (st *Manager) setNextStateForAll(ctx context.Context, alertRule *ngModels.A
 // Set the current state based on evaluation results
 func (st *Manager) setNextState(ctx context.Context, alertRule *ngModels.AlertRule, currentState *State, result eval.Result, logger log.Logger) StateTransition {
 	start := st.clock.Now()
+
 	currentState.LastEvaluationTime = result.EvaluatedAt
 	currentState.EvaluationDuration = result.EvaluationDuration
 	currentState.Results = append(currentState.Results, Evaluation{
@@ -364,10 +393,10 @@ func (st *Manager) setNextState(ctx context.Context, alertRule *ngModels.AlertRu
 	switch result.State {
 	case eval.Normal:
 		logger.Debug("Setting next state", "handler", "resultNormal")
-		resultNormal(currentState, alertRule, result, logger)
+		resultNormal(currentState, alertRule, result, logger, "")
 	case eval.Alerting:
 		logger.Debug("Setting next state", "handler", "resultAlerting")
-		resultAlerting(currentState, alertRule, result, logger)
+		resultAlerting(currentState, alertRule, result, logger, "")
 	case eval.Error:
 		logger.Debug("Setting next state", "handler", "resultError")
 		resultError(currentState, alertRule, result, logger)
@@ -384,7 +413,7 @@ func (st *Manager) setNextState(ctx context.Context, alertRule *ngModels.AlertRu
 	if currentState.State != result.State &&
 		result.State != eval.Normal &&
 		result.State != eval.Alerting {
-		currentState.StateReason = result.State.String()
+		currentState.StateReason = resultStateReason(result, alertRule)
 	}
 
 	// Set Resolved property so the scheduler knows to send a postable alert
@@ -418,6 +447,14 @@ func (st *Manager) setNextState(ctx context.Context, alertRule *ngModels.AlertRu
 	return nextState
 }
 
+func resultStateReason(result eval.Result, rule *ngModels.AlertRule) string {
+	if rule.ExecErrState == ngModels.KeepLastErrState || rule.NoDataState == ngModels.KeepLast {
+		return ngModels.ConcatReasons(result.State.String(), ngModels.StateReasonKeepLast)
+	}
+
+	return result.State.String()
+}
+
 func (st *Manager) GetAll(orgID int64) []*State {
 	allStates := st.cache.getAll(orgID, st.doNotSaveNormalState)
 	return allStates
@@ -432,71 +469,6 @@ func (st *Manager) Put(states []*State) {
 	}
 }
 
-// TODO: Is the `State` type necessary? Should it embed the instance?
-func (st *Manager) saveAlertStates(ctx context.Context, logger log.Logger, states ...StateTransition) {
-	if st.instanceStore == nil || len(states) == 0 {
-		return
-	}
-
-	saveState := func(ctx context.Context, idx int) error {
-		s := states[idx]
-		// Do not save normal state to database and remove transition to Normal state but keep mapped states
-		if st.doNotSaveNormalState && IsNormalStateWithNoReason(s.State) && !s.Changed() {
-			return nil
-		}
-
-		key, err := s.GetAlertInstanceKey()
-		if err != nil {
-			logger.Error("Failed to create a key for alert state to save it to database. The state will be ignored ", "cacheID", s.CacheID, "error", err, "labels", s.Labels.String())
-			return nil
-		}
-		instance := ngModels.AlertInstance{
-			AlertInstanceKey:  key,
-			Labels:            ngModels.InstanceLabels(s.Labels),
-			CurrentState:      ngModels.InstanceStateType(s.State.State.String()),
-			CurrentReason:     s.StateReason,
-			LastEvalTime:      s.LastEvaluationTime,
-			CurrentStateSince: s.StartsAt,
-			CurrentStateEnd:   s.EndsAt,
-		}
-
-		err = st.instanceStore.SaveAlertInstance(ctx, instance)
-		if err != nil {
-			logger.Error("Failed to save alert state", "labels", s.Labels.String(), "state", s.State, "error", err)
-			return nil
-		}
-		return nil
-	}
-
-	start := time.Now()
-	logger.Debug("Saving alert states", "count", len(states), "max_state_save_concurrency", st.maxStateSaveConcurrency)
-	_ = concurrency.ForEachJob(ctx, len(states), st.maxStateSaveConcurrency, saveState)
-	logger.Debug("Saving alert states done", "count", len(states), "max_state_save_concurrency", st.maxStateSaveConcurrency, "duration", time.Since(start))
-}
-
-func (st *Manager) deleteAlertStates(ctx context.Context, logger log.Logger, states []StateTransition) {
-	if st.instanceStore == nil || len(states) == 0 {
-		return
-	}
-
-	logger.Debug("Deleting alert states", "count", len(states))
-	toDelete := make([]ngModels.AlertInstanceKey, 0, len(states))
-
-	for _, s := range states {
-		key, err := s.GetAlertInstanceKey()
-		if err != nil {
-			logger.Error("Failed to delete alert instance with invalid labels", "cacheID", s.CacheID, "error", err)
-			continue
-		}
-		toDelete = append(toDelete, key)
-	}
-
-	err := st.instanceStore.DeleteAlertInstances(ctx, toDelete...)
-	if err != nil {
-		logger.Error("Failed to delete stale states", "error", err)
-	}
-}
-
 func translateInstanceState(state ngModels.InstanceStateType) eval.State {
 	switch state {
 	case ngModels.InstanceStateFiring:
diff --git a/pkg/services/ngalert/state/manager_bench_test.go b/pkg/services/ngalert/state/manager_bench_test.go
index c47d04770329a..24543e296cef3 100644
--- a/pkg/services/ngalert/state/manager_bench_test.go
+++ b/pkg/services/ngalert/state/manager_bench_test.go
@@ -22,16 +22,15 @@ import (
 func BenchmarkProcessEvalResults(b *testing.B) {
 	as := annotations.FakeAnnotationsRepo{}
 	as.On("SaveMany", mock.Anything, mock.Anything).Return(nil)
-	metrics := metrics.NewHistorianMetrics(prometheus.NewRegistry())
+	metrics := metrics.NewHistorianMetrics(prometheus.NewRegistry(), metrics.Subsystem)
 	store := historian.NewAnnotationStore(&as, nil, metrics)
 	hist := historian.NewAnnotationBackend(store, nil, metrics)
 	cfg := state.ManagerCfg{
-		Historian:               hist,
-		MaxStateSaveConcurrency: 1,
-		Tracer:                  tracing.InitializeTracerForTest(),
-		Log:                     log.New("ngalert.state.manager"),
+		Historian: hist,
+		Tracer:    tracing.InitializeTracerForTest(),
+		Log:       log.New("ngalert.state.manager"),
 	}
-	sut := state.NewManager(cfg)
+	sut := state.NewManager(cfg, state.NewNoopPersister())
 	now := time.Now().UTC()
 	rule := makeBenchRule()
 	results := makeBenchResults(100)
diff --git a/pkg/services/ngalert/state/manager_private_test.go b/pkg/services/ngalert/state/manager_private_test.go
index 4293f92dd18b4..798b37a0720bd 100644
--- a/pkg/services/ngalert/state/manager_private_test.go
+++ b/pkg/services/ngalert/state/manager_private_test.go
@@ -19,13 +19,10 @@ import (
 
 	"github.com/grafana/grafana/pkg/expr"
 	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/infra/log/logtest"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/services/ngalert/eval"
 	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
 	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
-
-	"github.com/grafana/grafana/pkg/util"
 )
 
 // Not for parallel tests.
@@ -82,84 +79,6 @@ func TestStateIsStale(t *testing.T) {
 	}
 }
 
-func TestManager_saveAlertStates(t *testing.T) {
-	type stateWithReason struct {
-		State  eval.State
-		Reason string
-	}
-	create := func(s eval.State, r string) stateWithReason {
-		return stateWithReason{
-			State:  s,
-			Reason: r,
-		}
-	}
-	allStates := [...]stateWithReason{
-		create(eval.Normal, ""),
-		create(eval.Normal, eval.NoData.String()),
-		create(eval.Normal, eval.Error.String()),
-		create(eval.Normal, util.GenerateShortUID()),
-		create(eval.Alerting, ""),
-		create(eval.Pending, ""),
-		create(eval.NoData, ""),
-		create(eval.Error, ""),
-	}
-
-	transitionToKey := map[ngmodels.AlertInstanceKey]StateTransition{}
-	transitions := make([]StateTransition, 0)
-	for _, fromState := range allStates {
-		for i, toState := range allStates {
-			tr := StateTransition{
-				State: &State{
-					State:       toState.State,
-					StateReason: toState.Reason,
-					Labels:      ngmodels.GenerateAlertLabels(5, fmt.Sprintf("%d--", i)),
-				},
-				PreviousState:       fromState.State,
-				PreviousStateReason: fromState.Reason,
-			}
-			key, err := tr.GetAlertInstanceKey()
-			require.NoError(t, err)
-			transitionToKey[key] = tr
-			transitions = append(transitions, tr)
-		}
-	}
-
-	t.Run("should save all transitions if doNotSaveNormalState is false", func(t *testing.T) {
-		st := &FakeInstanceStore{}
-		m := Manager{instanceStore: st, doNotSaveNormalState: false, maxStateSaveConcurrency: 1}
-		m.saveAlertStates(context.Background(), &logtest.Fake{}, transitions...)
-
-		savedKeys := map[ngmodels.AlertInstanceKey]ngmodels.AlertInstance{}
-		for _, op := range st.RecordedOps {
-			saved := op.(ngmodels.AlertInstance)
-			savedKeys[saved.AlertInstanceKey] = saved
-		}
-		assert.Len(t, transitionToKey, len(savedKeys))
-
-		for key, tr := range transitionToKey {
-			assert.Containsf(t, savedKeys, key, "state %s (%s) was not saved but should be", tr.State.State, tr.StateReason)
-		}
-	})
-
-	t.Run("should not save Normal->Normal if doNotSaveNormalState is true", func(t *testing.T) {
-		st := &FakeInstanceStore{}
-		m := Manager{instanceStore: st, doNotSaveNormalState: true, maxStateSaveConcurrency: 1}
-		m.saveAlertStates(context.Background(), &logtest.Fake{}, transitions...)
-
-		savedKeys := map[ngmodels.AlertInstanceKey]ngmodels.AlertInstance{}
-		for _, op := range st.RecordedOps {
-			saved := op.(ngmodels.AlertInstance)
-			savedKeys[saved.AlertInstanceKey] = saved
-		}
-		for key, tr := range transitionToKey {
-			if tr.State.State == eval.Normal && tr.StateReason == "" && tr.PreviousState == eval.Normal && tr.PreviousStateReason == "" {
-				continue
-			}
-			assert.Containsf(t, savedKeys, key, "state %s (%s) was not saved but should be", tr.State.State, tr.StateReason)
-		}
-	})
-}
-
 // TestProcessEvalResults_StateTransitions tests how state.Manager's ProcessEvalResults processes results and creates or changes states.
 // In other words, it tests the state transition.
 //
@@ -286,6 +205,15 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 		"system + rule + datasource-error": mergeLabels(mergeLabels(expectedDatasourceErrorLabels, baseRule.Labels), systemLabels),
 	}
 
+	resultFingerprints := map[string]data.Fingerprint{
+		"system + rule":                    data.Labels{}.Fingerprint(),
+		"system + rule + labels1":          labels1.Fingerprint(),
+		"system + rule + labels2":          labels2.Fingerprint(),
+		"system + rule + labels3":          labels3.Fingerprint(),
+		"system + rule + no-data":          noDataLabels.Fingerprint(),
+		"system + rule + datasource-error": data.Labels{}.Fingerprint(),
+	}
+
 	patchState := func(r *ngmodels.AlertRule, s *State) {
 		// patch all optional fields of the expected state
 		setCacheID(s)
@@ -304,6 +232,14 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 		if s.Values == nil {
 			s.Values = make(map[string]float64)
 		}
+		if s.ResultFingerprint == data.Fingerprint(0) {
+			for key, set := range labels {
+				if set.Fingerprint() == s.Labels.Fingerprint() {
+					s.ResultFingerprint = resultFingerprints[key]
+					break
+				}
+			}
+		}
 	}
 
 	executeTest := func(t *testing.T, alertRule *ngmodels.AlertRule, resultsAtTime map[time.Time]eval.Results, expectedTransitionsAtTime map[time.Time][]StateTransition, applyNoDataErrorToAllStates bool) {
@@ -311,19 +247,18 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 
 		testMetrics := metrics.NewNGAlert(prometheus.NewPedanticRegistry()).GetStateMetrics()
 		cfg := ManagerCfg{
-			Metrics:                 testMetrics,
-			Tracer:                  tracing.InitializeTracerForTest(),
-			Log:                     log.New("ngalert.state.manager"),
-			ExternalURL:             nil,
-			InstanceStore:           &FakeInstanceStore{},
-			Images:                  &NotAvailableImageService{},
-			Clock:                   clk,
-			Historian:               &FakeHistorian{},
-			MaxStateSaveConcurrency: 1,
+			Metrics:       testMetrics,
+			Tracer:        tracing.InitializeTracerForTest(),
+			Log:           log.New("ngalert.state.manager"),
+			ExternalURL:   nil,
+			InstanceStore: &FakeInstanceStore{},
+			Images:        &NotAvailableImageService{},
+			Clock:         clk,
+			Historian:     &FakeHistorian{},
 
 			ApplyNoDataAndErrorToAllStates: applyNoDataErrorToAllStates,
 		}
-		st := NewManager(cfg)
+		st := NewManager(cfg, NewNoopPersister())
 
 		tss := make([]time.Time, 0, len(resultsAtTime))
 		for ts, results := range resultsAtTime {
@@ -877,6 +812,7 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 			ngmodels.NoData:   baseRuleWith(ngmodels.WithNoDataExecAs(ngmodels.NoData)),
 			ngmodels.Alerting: baseRuleWith(ngmodels.WithNoDataExecAs(ngmodels.Alerting)),
 			ngmodels.OK:       baseRuleWith(ngmodels.WithNoDataExecAs(ngmodels.OK)),
+			ngmodels.KeepLast: baseRuleWith(ngmodels.WithNoDataExecAs(ngmodels.KeepLast)),
 		}
 
 		type noDataTestCase struct {
@@ -984,6 +920,24 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLast: {
+						t1: {
+							{
+								PreviousState: eval.Normal,
+								State: &State{
+									Labels:      labels["system + rule + no-data"],
+									State:       eval.Normal,
+									StateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t1, eval.NoData),
+									},
+									StartsAt:           t1,
+									EndsAt:             t1,
+									LastEvaluationTime: t1,
+								},
+							},
+						},
+					},
 				},
 			},
 			{
@@ -1050,6 +1004,24 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLast: {
+						t2: {
+							{
+								PreviousState: eval.Normal,
+								State: &State{
+									Labels:      labels["system + rule + no-data"],
+									State:       eval.Normal,
+									StateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t2, eval.NoData),
+									},
+									StartsAt:           t2,
+									EndsAt:             t2,
+									LastEvaluationTime: t2,
+								},
+							},
+						},
+					},
 				},
 				expectedTransitionsApplyNoDataErrorToAllStates: map[ngmodels.NoDataState]map[time.Time][]StateTransition{
 					ngmodels.Alerting: {
@@ -1090,6 +1062,25 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLast: {
+						t2: {
+							{
+								PreviousState: eval.Normal,
+								State: &State{
+									Labels:      labels["system + rule + labels1"],
+									State:       eval.Normal,
+									StateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t1, eval.Normal),
+										newEvaluation(t2, eval.NoData),
+									},
+									StartsAt:           t1,
+									EndsAt:             t1,
+									LastEvaluationTime: t2,
+								},
+							},
+						},
+					},
 				},
 			},
 			{
@@ -1267,6 +1258,55 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLast: {
+						t3: {
+							{
+								PreviousState: eval.Normal,
+								State: &State{
+									Labels:      labels["system + rule + labels1"],
+									State:       eval.Normal,
+									StateReason: ngmodels.StateReasonMissingSeries,
+									Results: []Evaluation{
+										newEvaluation(t1, eval.Normal),
+									},
+									StartsAt:           t1,
+									EndsAt:             t3,
+									LastEvaluationTime: t3,
+								},
+							},
+							{
+								PreviousState: eval.Alerting,
+								State: &State{
+									Labels:      labels["system + rule + labels2"],
+									State:       eval.Normal,
+									StateReason: ngmodels.StateReasonMissingSeries,
+									Results: []Evaluation{
+										newEvaluation(t1, eval.Alerting),
+									},
+									StartsAt:           t1,
+									EndsAt:             t3,
+									LastEvaluationTime: t3,
+									Resolved:           true,
+								},
+							},
+							{
+								PreviousState:       eval.Normal,
+								PreviousStateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+								State: &State{
+									Labels:      labels["system + rule + no-data"],
+									State:       eval.Normal,
+									StateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t2, eval.NoData),
+										newEvaluation(t3, eval.NoData),
+									},
+									StartsAt:           t2,
+									EndsAt:             t2,
+									LastEvaluationTime: t3,
+								},
+							},
+						},
+					},
 				},
 				expectedTransitionsApplyNoDataErrorToAllStates: map[ngmodels.NoDataState]map[time.Time][]StateTransition{
 					ngmodels.Alerting: {
@@ -1410,6 +1450,76 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLast: {
+						t2: {
+							{
+								PreviousState: eval.Normal,
+								State: &State{
+									Labels:      labels["system + rule + labels1"],
+									State:       eval.Normal,
+									StateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t1, eval.Normal),
+										newEvaluation(t2, eval.NoData),
+									},
+									StartsAt:           t1,
+									EndsAt:             t1,
+									LastEvaluationTime: t2,
+								},
+							},
+							{
+								PreviousState: eval.Alerting,
+								State: &State{
+									Labels:      labels["system + rule + labels2"],
+									State:       eval.Alerting,
+									StateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t1, eval.Alerting),
+										newEvaluation(t2, eval.NoData),
+									},
+									StartsAt:           t1,
+									EndsAt:             t2.Add(ResendDelay * 4),
+									LastEvaluationTime: t2,
+								},
+							},
+						},
+						t3: {
+							{
+								PreviousState:       eval.Normal,
+								PreviousStateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+								State: &State{
+									Labels:      labels["system + rule + labels1"],
+									State:       eval.Normal,
+									StateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t1, eval.Normal),
+										newEvaluation(t2, eval.NoData),
+										newEvaluation(t3, eval.NoData),
+									},
+									StartsAt:           t1,
+									EndsAt:             t1,
+									LastEvaluationTime: t3,
+								},
+							},
+							{
+								PreviousState:       eval.Alerting,
+								PreviousStateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+								State: &State{
+									Labels:      labels["system + rule + labels2"],
+									State:       eval.Alerting,
+									StateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t1, eval.Alerting),
+										newEvaluation(t2, eval.NoData),
+										newEvaluation(t3, eval.NoData),
+									},
+									StartsAt:           t1,
+									EndsAt:             t3.Add(ResendDelay * 4),
+									LastEvaluationTime: t3,
+								},
+							},
+						},
+					},
 				},
 			},
 			{
@@ -1598,6 +1708,53 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLast: {
+						t3: {
+							{
+								PreviousState: eval.Normal,
+								State: &State{
+									Labels:      labels["system + rule + labels1"],
+									State:       eval.Normal,
+									StateReason: ngmodels.StateReasonMissingSeries,
+									Results: []Evaluation{
+										newEvaluation(t1, eval.Normal),
+									},
+									StartsAt:           t1,
+									EndsAt:             t3,
+									LastEvaluationTime: t3,
+								},
+							},
+							{
+								PreviousState: eval.Pending,
+								State: &State{
+									Labels:      labels["system + rule + labels2"],
+									State:       eval.Normal,
+									StateReason: ngmodels.StateReasonMissingSeries,
+									Results: []Evaluation{
+										newEvaluation(t1, eval.Alerting),
+									},
+									StartsAt:           t1,
+									EndsAt:             t3,
+									LastEvaluationTime: t3,
+								},
+							},
+							{
+								PreviousState:       eval.Normal,
+								PreviousStateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+								State: &State{
+									Labels:      labels["system + rule + no-data"],
+									State:       eval.Normal,
+									StateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t3, eval.NoData),
+									},
+									StartsAt:           t2,
+									EndsAt:             t2,
+									LastEvaluationTime: t3,
+								},
+							},
+						},
+					},
 				},
 				expectedTransitionsApplyNoDataErrorToAllStates: map[ngmodels.NoDataState]map[time.Time][]StateTransition{
 					ngmodels.Alerting: {
@@ -1728,31 +1885,95 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
-				},
-			},
-			{
-				desc:         "t1[1:alerting] t2[NoData] t3[1:alerting] and 'for'=2 at t3",
-				ruleMutators: []ngmodels.AlertRuleMutator{ngmodels.WithForNTimes(2)},
-				results: map[time.Time]eval.Results{
-					t1: {
-						newResult(eval.WithState(eval.Alerting), eval.WithLabels(labels1)),
-					},
-					t2: {
-						newResult(eval.WithState(eval.NoData), eval.WithLabels(noDataLabels)),
-					},
-					t3: {
-						newResult(eval.WithState(eval.Alerting), eval.WithLabels(labels1)),
-					},
-				},
-				expectedTransitions: map[ngmodels.NoDataState]map[time.Time][]StateTransition{
-					ngmodels.NoData: {
-						t3: {
+					ngmodels.KeepLast: {
+						t2: {
 							{
-								PreviousState: eval.Pending,
+								PreviousState: eval.Normal,
 								State: &State{
-									Labels: labels["system + rule + labels1"],
-									State:  eval.Alerting,
-									Results: []Evaluation{
+									Labels:      labels["system + rule + labels1"],
+									State:       eval.Normal,
+									StateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t2, eval.NoData),
+									},
+									StartsAt:           t1,
+									EndsAt:             t1,
+									LastEvaluationTime: t2,
+								},
+							},
+							{
+								PreviousState: eval.Pending,
+								State: &State{
+									Labels:      labels["system + rule + labels2"],
+									State:       eval.Alerting,
+									StateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t2, eval.NoData),
+									},
+									StartsAt:           t2,
+									EndsAt:             t2.Add(ResendDelay * 4),
+									LastEvaluationTime: t2,
+								},
+							},
+						},
+						t3: {
+							{
+								PreviousState:       eval.Normal,
+								PreviousStateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+								State: &State{
+									Labels:      labels["system + rule + labels1"],
+									State:       eval.Normal,
+									StateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t3, eval.NoData),
+									},
+									StartsAt:           t1,
+									EndsAt:             t1,
+									LastEvaluationTime: t3,
+								},
+							},
+							{
+								PreviousState:       eval.Alerting,
+								PreviousStateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+								State: &State{
+									Labels:      labels["system + rule + labels2"],
+									State:       eval.Alerting,
+									StateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t3, eval.NoData),
+									},
+									StartsAt:           t2,
+									EndsAt:             t3.Add(ResendDelay * 4),
+									LastEvaluationTime: t3,
+								},
+							},
+						},
+					},
+				},
+			},
+			{
+				desc:         "t1[1:alerting] t2[NoData] t3[1:alerting] and 'for'=2 at t3",
+				ruleMutators: []ngmodels.AlertRuleMutator{ngmodels.WithForNTimes(2)},
+				results: map[time.Time]eval.Results{
+					t1: {
+						newResult(eval.WithState(eval.Alerting), eval.WithLabels(labels1)),
+					},
+					t2: {
+						newResult(eval.WithState(eval.NoData), eval.WithLabels(noDataLabels)),
+					},
+					t3: {
+						newResult(eval.WithState(eval.Alerting), eval.WithLabels(labels1)),
+					},
+				},
+				expectedTransitions: map[ngmodels.NoDataState]map[time.Time][]StateTransition{
+					ngmodels.NoData: {
+						t3: {
+							{
+								PreviousState: eval.Pending,
+								State: &State{
+									Labels: labels["system + rule + labels1"],
+									State:  eval.Alerting,
+									Results: []Evaluation{
 										newEvaluation(t1, eval.Alerting),
 										newEvaluation(t3, eval.Alerting),
 									},
@@ -1799,6 +2020,24 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLast: {
+						t3: {
+							{
+								PreviousState: eval.Pending,
+								State: &State{
+									Labels: labels["system + rule + labels1"],
+									State:  eval.Alerting,
+									Results: []Evaluation{
+										newEvaluation(t1, eval.Alerting),
+										newEvaluation(t3, eval.Alerting),
+									},
+									StartsAt:           t3,
+									EndsAt:             t3.Add(ResendDelay * 4),
+									LastEvaluationTime: t3,
+								},
+							},
+						},
+					},
 				},
 				expectedTransitionsApplyNoDataErrorToAllStates: map[ngmodels.NoDataState]map[time.Time][]StateTransition{
 					ngmodels.Alerting: {
@@ -1839,6 +2078,25 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLast: {
+						t3: {
+							{
+								PreviousState:       eval.Pending,
+								PreviousStateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+								State: &State{
+									Labels: labels["system + rule + labels1"],
+									State:  eval.Alerting,
+									Results: []Evaluation{
+										newEvaluation(t2, eval.NoData),
+										newEvaluation(t3, eval.Alerting),
+									},
+									StartsAt:           t3,
+									EndsAt:             t3.Add(ResendDelay * 4),
+									LastEvaluationTime: t3,
+								},
+							},
+						},
+					},
 				},
 			},
 			{
@@ -1954,6 +2212,39 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLast: {
+						t3: {
+							{
+								PreviousState: eval.Normal,
+								State: &State{
+									Labels: labels["system + rule + labels1"],
+									State:  eval.Normal,
+									Results: []Evaluation{
+										newEvaluation(t2, eval.Normal),
+										newEvaluation(t3, eval.Normal),
+									},
+									StartsAt:           t2,
+									EndsAt:             t2,
+									LastEvaluationTime: t3,
+								},
+							},
+							{
+								PreviousState:       eval.Normal,
+								PreviousStateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+								State: &State{
+									Labels:      labels["system + rule + no-data"],
+									State:       eval.Normal,
+									StateReason: ngmodels.StateReasonMissingSeries,
+									Results: []Evaluation{
+										newEvaluation(t1, eval.NoData),
+									},
+									StartsAt:           t1,
+									EndsAt:             t3,
+									LastEvaluationTime: t3,
+								},
+							},
+						},
+					},
 				},
 			},
 			{
@@ -2020,6 +2311,24 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLast: {
+						t2: {
+							{
+								PreviousState: eval.Normal,
+								State: &State{
+									Labels:      labels["system + rule + no-data"],
+									State:       eval.Normal,
+									StateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t2, eval.NoData),
+									},
+									StartsAt:           t2,
+									EndsAt:             t2,
+									LastEvaluationTime: t2,
+								},
+							},
+						},
+					},
 				},
 				expectedTransitionsApplyNoDataErrorToAllStates: map[ngmodels.NoDataState]map[time.Time][]StateTransition{
 					ngmodels.Alerting: {
@@ -2060,10 +2369,29 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLast: {
+						t2: {
+							{
+								PreviousState: eval.Normal,
+								State: &State{
+									Labels:      labels["system + rule"],
+									State:       eval.Normal,
+									StateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t1, eval.Normal),
+										newEvaluation(t2, eval.NoData),
+									},
+									StartsAt:           t1,
+									EndsAt:             t1,
+									LastEvaluationTime: t2,
+								},
+							},
+						},
+					},
 				},
 			},
 			{
-				desc: "t1[{}:alerting] t2[NoData] t3[NoData] at t3",
+				desc: "t1[{}:alerting] t2[NoData] t3[NoData] at t2,t3",
 				results: map[time.Time]eval.Results{
 					t1: {
 						newResult(eval.WithState(eval.Alerting)),
@@ -2194,6 +2522,41 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLast: {
+						t3: {
+							{
+								PreviousState: eval.Alerting,
+								State: &State{
+									Labels:      labels["system + rule"],
+									State:       eval.Normal,
+									StateReason: ngmodels.StateReasonMissingSeries,
+									Results: []Evaluation{
+										newEvaluation(t1, eval.Alerting),
+									},
+									StartsAt:           t1,
+									EndsAt:             t3,
+									LastEvaluationTime: t3,
+									Resolved:           true,
+								},
+							},
+							{
+								PreviousState:       eval.Normal,
+								PreviousStateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+								State: &State{
+									Labels:      labels["system + rule + no-data"],
+									State:       eval.Normal,
+									StateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t2, eval.NoData),
+										newEvaluation(t3, eval.NoData),
+									},
+									StartsAt:           t2,
+									EndsAt:             t2,
+									LastEvaluationTime: t3,
+								},
+							},
+						},
+					},
 				},
 				expectedTransitionsApplyNoDataErrorToAllStates: map[ngmodels.NoDataState]map[time.Time][]StateTransition{
 					ngmodels.Alerting: {
@@ -2273,6 +2636,44 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLast: {
+						t2: {
+							{
+								PreviousState: eval.Alerting,
+								State: &State{
+									Labels:      labels["system + rule"],
+									State:       eval.Alerting,
+									StateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t1, eval.Alerting),
+										newEvaluation(t2, eval.NoData),
+									},
+									StartsAt:           t1,
+									EndsAt:             t2.Add(ResendDelay * 4),
+									LastEvaluationTime: t2,
+								},
+							},
+						},
+						t3: {
+							{
+								PreviousState:       eval.Alerting,
+								PreviousStateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+								State: &State{
+									Labels:      labels["system + rule"],
+									State:       eval.Alerting,
+									StateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t1, eval.Alerting),
+										newEvaluation(t2, eval.NoData),
+										newEvaluation(t3, eval.NoData),
+									},
+									StartsAt:           t1,
+									EndsAt:             t3.Add(ResendDelay * 4),
+									LastEvaluationTime: t3,
+								},
+							},
+						},
+					},
 				},
 			},
 			{
@@ -2359,6 +2760,24 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLast: {
+						t3: {
+							{
+								PreviousState: eval.Pending,
+								State: &State{
+									Labels: labels["system + rule"],
+									State:  eval.Alerting,
+									Results: []Evaluation{
+										newEvaluation(t1, eval.Alerting),
+										newEvaluation(t3, eval.Alerting),
+									},
+									StartsAt:           t3,
+									EndsAt:             t3.Add(ResendDelay * 4),
+									LastEvaluationTime: t3,
+								},
+							},
+						},
+					},
 				},
 				expectedTransitionsApplyNoDataErrorToAllStates: map[ngmodels.NoDataState]map[time.Time][]StateTransition{
 					ngmodels.Alerting: {
@@ -2399,6 +2818,25 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLast: {
+						t3: {
+							{
+								PreviousState:       eval.Pending,
+								PreviousStateReason: ngmodels.ConcatReasons(eval.NoData.String(), ngmodels.StateReasonKeepLast),
+								State: &State{
+									Labels: labels["system + rule"],
+									State:  eval.Alerting,
+									Results: []Evaluation{
+										newEvaluation(t2, eval.NoData),
+										newEvaluation(t3, eval.Alerting),
+									},
+									StartsAt:           t3,
+									EndsAt:             t3.Add(ResendDelay * 4),
+									LastEvaluationTime: t3,
+								},
+							},
+						},
+					},
 				},
 			},
 		}
@@ -2415,6 +2853,7 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 			ngmodels.ErrorErrState:    baseRuleWith(ngmodels.WithErrorExecAs(ngmodels.ErrorErrState)),
 			ngmodels.AlertingErrState: baseRuleWith(ngmodels.WithErrorExecAs(ngmodels.AlertingErrState)),
 			ngmodels.OkErrState:       baseRuleWith(ngmodels.WithErrorExecAs(ngmodels.OkErrState)),
+			ngmodels.KeepLastErrState: baseRuleWith(ngmodels.WithErrorExecAs(ngmodels.KeepLastErrState)),
 		}
 
 		cacheID := func(lbls data.Labels) string {
@@ -2537,6 +2976,24 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLastErrState: {
+						t1: {
+							{
+								PreviousState: eval.Normal,
+								State: &State{
+									Labels:      labels["system + rule"],
+									State:       eval.Normal,
+									StateReason: ngmodels.ConcatReasons(eval.Error.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t1, eval.Error),
+									},
+									StartsAt:           t1,
+									EndsAt:             t1,
+									LastEvaluationTime: t1,
+								},
+							},
+						},
+					},
 				},
 			},
 			{
@@ -2605,6 +3062,24 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLastErrState: {
+						t1: {
+							{
+								PreviousState: eval.Normal,
+								State: &State{
+									Labels:      labels["system + rule"],
+									State:       eval.Normal,
+									StateReason: ngmodels.ConcatReasons(eval.Error.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t1, eval.Error),
+									},
+									StartsAt:           t1,
+									EndsAt:             t1,
+									LastEvaluationTime: t1,
+								},
+							},
+						},
+					},
 				},
 			},
 			{
@@ -2678,6 +3153,24 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLastErrState: {
+						t2: {
+							{
+								PreviousState: eval.Normal,
+								State: &State{
+									Labels:      labels["system + rule"],
+									State:       eval.Normal,
+									StateReason: ngmodels.ConcatReasons(eval.Error.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t2, eval.Error),
+									},
+									StartsAt:           t2,
+									EndsAt:             t2,
+									LastEvaluationTime: t2,
+								},
+							},
+						},
+					},
 				},
 				expectedTransitionsApplyNoDataErrorToAllStates: map[ngmodels.ExecutionErrorState]map[time.Time][]StateTransition{
 					ngmodels.AlertingErrState: {
@@ -2717,6 +3210,24 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLastErrState: {
+						t2: {
+							{
+								PreviousState: eval.Pending,
+								State: &State{
+									Labels:      labels["system + rule + labels1"],
+									State:       eval.Alerting,
+									StateReason: ngmodels.ConcatReasons(eval.Error.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t2, eval.Error),
+									},
+									StartsAt:           t2,
+									EndsAt:             t2.Add(ResendDelay * 4),
+									LastEvaluationTime: t2,
+								},
+							},
+						},
+					},
 				},
 			},
 			{
@@ -2789,6 +3300,24 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLastErrState: {
+						t2: {
+							{
+								PreviousState: eval.Normal,
+								State: &State{
+									Labels:      labels["system + rule"],
+									State:       eval.Normal,
+									StateReason: ngmodels.ConcatReasons(eval.Error.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t2, eval.Error),
+									},
+									StartsAt:           t2,
+									EndsAt:             t2,
+									LastEvaluationTime: t2,
+								},
+							},
+						},
+					},
 				},
 				expectedTransitionsApplyNoDataErrorToAllStates: map[ngmodels.ExecutionErrorState]map[time.Time][]StateTransition{
 					ngmodels.AlertingErrState: {
@@ -2830,6 +3359,25 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLastErrState: {
+						t2: {
+							{
+								PreviousState: eval.Normal,
+								State: &State{
+									Labels:      labels["system + rule + labels1"],
+									State:       eval.Normal,
+									StateReason: ngmodels.ConcatReasons(eval.Error.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t1, eval.Normal),
+										newEvaluation(t2, eval.Error),
+									},
+									StartsAt:           t1,
+									EndsAt:             t1,
+									LastEvaluationTime: t2,
+								},
+							},
+						},
+					},
 				},
 			},
 			{
@@ -2951,6 +3499,39 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLastErrState: {
+						t3: {
+							{
+								PreviousState: eval.Normal,
+								State: &State{
+									Labels: labels["system + rule + labels1"],
+									State:  eval.Normal,
+									Results: []Evaluation{
+										newEvaluation(t2, eval.Normal),
+										newEvaluation(t3, eval.Normal),
+									},
+									StartsAt:           t2,
+									EndsAt:             t2,
+									LastEvaluationTime: t3,
+								},
+							},
+							{
+								PreviousState:       eval.Normal,
+								PreviousStateReason: ngmodels.ConcatReasons(eval.Error.String(), ngmodels.StateReasonKeepLast),
+								State: &State{
+									Labels:      labels["system + rule"],
+									State:       eval.Normal,
+									StateReason: ngmodels.StateReasonMissingSeries,
+									Results: []Evaluation{
+										newEvaluation(t1, eval.Error),
+									},
+									StartsAt:           t1,
+									EndsAt:             t3,
+									LastEvaluationTime: t3,
+								},
+							},
+						},
+					},
 				},
 			},
 			{
@@ -3026,6 +3607,25 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLastErrState: {
+						t2: {
+							{
+								PreviousState: eval.Normal,
+								State: &State{
+									Labels:      labels["system + rule"],
+									State:       eval.Normal,
+									StateReason: ngmodels.ConcatReasons(eval.Error.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t1, eval.Normal),
+										newEvaluation(t2, eval.Error),
+									},
+									StartsAt:           t1,
+									EndsAt:             t1,
+									LastEvaluationTime: t2,
+								},
+							},
+						},
+					},
 				},
 			},
 			{
@@ -3114,6 +3714,24 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLastErrState: {
+						t2: {
+							{
+								PreviousState: eval.Pending,
+								State: &State{
+									Labels:      labels["system + rule"],
+									State:       eval.Alerting,
+									StateReason: ngmodels.ConcatReasons(eval.Error.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t2, eval.Error),
+									},
+									StartsAt:           t2,
+									EndsAt:             t2.Add(ResendDelay * 4),
+									LastEvaluationTime: t2,
+								},
+							},
+						},
+					},
 				},
 			},
 			{
@@ -3243,6 +3861,42 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLastErrState: {
+						t2: {
+							{
+								PreviousState: eval.Pending,
+								State: &State{
+									Labels:      labels["system + rule"],
+									State:       eval.Pending,
+									StateReason: ngmodels.ConcatReasons(eval.Error.String(), ngmodels.StateReasonKeepLast),
+									Results: []Evaluation{
+										newEvaluation(t1, eval.Alerting),
+										newEvaluation(t2, eval.Error),
+									},
+									StartsAt:           t1,
+									EndsAt:             t1.Add(ResendDelay * 4),
+									LastEvaluationTime: t2,
+								},
+							},
+						},
+						t3: {
+							{
+								PreviousState:       eval.Pending,
+								PreviousStateReason: ngmodels.ConcatReasons(eval.Error.String(), ngmodels.StateReasonKeepLast),
+								State: &State{
+									Labels: labels["system + rule"],
+									State:  eval.Alerting,
+									Results: []Evaluation{
+										newEvaluation(t2, eval.Error),
+										newEvaluation(t3, eval.Alerting),
+									},
+									StartsAt:           t3,
+									EndsAt:             t3.Add(ResendDelay * 4),
+									LastEvaluationTime: t3,
+								},
+							},
+						},
+					},
 				},
 			},
 			{
@@ -3313,6 +3967,25 @@ func TestProcessEvalResults_StateTransitions(t *testing.T) {
 							},
 						},
 					},
+					ngmodels.KeepLastErrState: {
+						t2: {
+							{
+								PreviousState:       eval.Normal,
+								PreviousStateReason: ngmodels.ConcatReasons(eval.Error.String(), ngmodels.StateReasonKeepLast),
+								State: &State{
+									Labels: labels["system + rule"],
+									State:  eval.Normal,
+									Results: []Evaluation{
+										newEvaluation(t1, eval.Error),
+										newEvaluation(t2, eval.Normal),
+									},
+									StartsAt:           t1,
+									EndsAt:             t1,
+									LastEvaluationTime: t2,
+								},
+							},
+						},
+					},
 				},
 			},
 		}
diff --git a/pkg/services/ngalert/state/manager_test.go b/pkg/services/ngalert/state/manager_test.go
index e24934a6376db..38a7519f84688 100644
--- a/pkg/services/ngalert/state/manager_test.go
+++ b/pkg/services/ngalert/state/manager_test.go
@@ -5,6 +5,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"math"
 	"math/rand"
 	"sort"
 	"strings"
@@ -33,9 +34,14 @@ import (
 	"github.com/grafana/grafana/pkg/services/ngalert/state"
 	"github.com/grafana/grafana/pkg/services/ngalert/state/historian"
 	"github.com/grafana/grafana/pkg/services/ngalert/tests"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 	"github.com/grafana/grafana/pkg/util"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestWarmStateCache(t *testing.T) {
 	evaluationTime, err := time.Parse("2006-01-02", "2021-03-25")
 	require.NoError(t, err)
@@ -58,6 +64,7 @@ func TestWarmStateCache(t *testing.T) {
 			EndsAt:             evaluationTime.Add(1 * time.Minute),
 			LastEvaluationTime: evaluationTime,
 			Annotations:        map[string]string{"testAnnoKey": "testAnnoValue"},
+			ResultFingerprint:  data.Fingerprint(math.MaxUint64),
 		}, {
 			AlertRuleUID: rule.UID,
 			OrgID:        rule.OrgID,
@@ -70,6 +77,7 @@ func TestWarmStateCache(t *testing.T) {
 			EndsAt:             evaluationTime.Add(1 * time.Minute),
 			LastEvaluationTime: evaluationTime,
 			Annotations:        map[string]string{"testAnnoKey": "testAnnoValue"},
+			ResultFingerprint:  data.Fingerprint(math.MaxUint64 - 1),
 		},
 		{
 			AlertRuleUID: rule.UID,
@@ -83,6 +91,7 @@ func TestWarmStateCache(t *testing.T) {
 			EndsAt:             evaluationTime.Add(1 * time.Minute),
 			LastEvaluationTime: evaluationTime,
 			Annotations:        map[string]string{"testAnnoKey": "testAnnoValue"},
+			ResultFingerprint:  data.Fingerprint(0),
 		},
 		{
 			AlertRuleUID: rule.UID,
@@ -96,6 +105,7 @@ func TestWarmStateCache(t *testing.T) {
 			EndsAt:             evaluationTime.Add(1 * time.Minute),
 			LastEvaluationTime: evaluationTime,
 			Annotations:        map[string]string{"testAnnoKey": "testAnnoValue"},
+			ResultFingerprint:  data.Fingerprint(1),
 		},
 		{
 			AlertRuleUID: rule.UID,
@@ -109,6 +119,7 @@ func TestWarmStateCache(t *testing.T) {
 			EndsAt:             evaluationTime.Add(1 * time.Minute),
 			LastEvaluationTime: evaluationTime,
 			Annotations:        map[string]string{"testAnnoKey": "testAnnoValue"},
+			ResultFingerprint:  data.Fingerprint(2),
 		},
 	}
 
@@ -127,6 +138,7 @@ func TestWarmStateCache(t *testing.T) {
 		CurrentStateSince: evaluationTime.Add(-1 * time.Minute),
 		CurrentStateEnd:   evaluationTime.Add(1 * time.Minute),
 		Labels:            labels,
+		ResultFingerprint: data.Fingerprint(math.MaxUint64).String(),
 	})
 
 	labels = models.InstanceLabels{"test2": "testValue2"}
@@ -142,6 +154,7 @@ func TestWarmStateCache(t *testing.T) {
 		CurrentStateSince: evaluationTime.Add(-1 * time.Minute),
 		CurrentStateEnd:   evaluationTime.Add(1 * time.Minute),
 		Labels:            labels,
+		ResultFingerprint: data.Fingerprint(math.MaxUint64 - 1).String(),
 	})
 
 	labels = models.InstanceLabels{"test3": "testValue3"}
@@ -157,6 +170,7 @@ func TestWarmStateCache(t *testing.T) {
 		CurrentStateSince: evaluationTime.Add(-1 * time.Minute),
 		CurrentStateEnd:   evaluationTime.Add(1 * time.Minute),
 		Labels:            labels,
+		ResultFingerprint: data.Fingerprint(0).String(),
 	})
 
 	labels = models.InstanceLabels{"test4": "testValue4"}
@@ -172,6 +186,7 @@ func TestWarmStateCache(t *testing.T) {
 		CurrentStateSince: evaluationTime.Add(-1 * time.Minute),
 		CurrentStateEnd:   evaluationTime.Add(1 * time.Minute),
 		Labels:            labels,
+		ResultFingerprint: data.Fingerprint(1).String(),
 	})
 
 	labels = models.InstanceLabels{"test5": "testValue5"}
@@ -187,23 +202,23 @@ func TestWarmStateCache(t *testing.T) {
 		CurrentStateSince: evaluationTime.Add(-1 * time.Minute),
 		CurrentStateEnd:   evaluationTime.Add(1 * time.Minute),
 		Labels:            labels,
+		ResultFingerprint: data.Fingerprint(2).String(),
 	})
 	for _, instance := range instances {
 		_ = dbstore.SaveAlertInstance(ctx, instance)
 	}
 
 	cfg := state.ManagerCfg{
-		Metrics:                 metrics.NewNGAlert(prometheus.NewPedanticRegistry()).GetStateMetrics(),
-		ExternalURL:             nil,
-		InstanceStore:           dbstore,
-		Images:                  &state.NoopImageService{},
-		Clock:                   clock.NewMock(),
-		Historian:               &state.FakeHistorian{},
-		MaxStateSaveConcurrency: 1,
-		Tracer:                  tracing.InitializeTracerForTest(),
-		Log:                     log.New("ngalert.state.manager"),
+		Metrics:       metrics.NewNGAlert(prometheus.NewPedanticRegistry()).GetStateMetrics(),
+		ExternalURL:   nil,
+		InstanceStore: dbstore,
+		Images:        &state.NoopImageService{},
+		Clock:         clock.NewMock(),
+		Historian:     &state.FakeHistorian{},
+		Tracer:        tracing.InitializeTracerForTest(),
+		Log:           log.New("ngalert.state.manager"),
 	}
-	st := state.NewManager(cfg)
+	st := state.NewManager(cfg, state.NewNoopPersister())
 	st.Warm(ctx, dbstore)
 
 	t.Run("instance cache has expected entries", func(t *testing.T) {
@@ -227,21 +242,20 @@ func TestDashboardAnnotations(t *testing.T) {
 	_, dbstore := tests.SetupTestEnv(t, 1)
 
 	fakeAnnoRepo := annotationstest.NewFakeAnnotationsRepo()
-	historianMetrics := metrics.NewHistorianMetrics(prometheus.NewRegistry())
+	historianMetrics := metrics.NewHistorianMetrics(prometheus.NewRegistry(), metrics.Subsystem)
 	store := historian.NewAnnotationStore(fakeAnnoRepo, &dashboards.FakeDashboardService{}, historianMetrics)
 	hist := historian.NewAnnotationBackend(store, nil, historianMetrics)
 	cfg := state.ManagerCfg{
-		Metrics:                 metrics.NewNGAlert(prometheus.NewPedanticRegistry()).GetStateMetrics(),
-		ExternalURL:             nil,
-		InstanceStore:           dbstore,
-		Images:                  &state.NoopImageService{},
-		Clock:                   clock.New(),
-		Historian:               hist,
-		MaxStateSaveConcurrency: 1,
-		Tracer:                  tracing.InitializeTracerForTest(),
-		Log:                     log.New("ngalert.state.manager"),
+		Metrics:       metrics.NewNGAlert(prometheus.NewPedanticRegistry()).GetStateMetrics(),
+		ExternalURL:   nil,
+		InstanceStore: dbstore,
+		Images:        &state.NoopImageService{},
+		Clock:         clock.New(),
+		Historian:     hist,
+		Tracer:        tracing.InitializeTracerForTest(),
+		Log:           log.New("ngalert.state.manager"),
 	}
-	st := state.NewManager(cfg)
+	st := state.NewManager(cfg, state.NewNoopPersister())
 
 	const mainOrgID int64 = 1
 
@@ -384,8 +398,9 @@ func TestProcessEvalResults(t *testing.T) {
 			},
 			expectedStates: []*state.State{
 				{
-					Labels: labels["system + rule + labels1"],
-					State:  eval.Normal,
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.Normal,
 					Results: []state.Evaluation{
 						newEvaluation(t1, eval.Normal),
 					},
@@ -407,8 +422,9 @@ func TestProcessEvalResults(t *testing.T) {
 			expectedAnnotations: 1,
 			expectedStates: []*state.State{
 				{
-					Labels: labels["system + rule + labels1"],
-					State:  eval.Normal,
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.Normal,
 					Results: []state.Evaluation{
 						newEvaluation(t1, eval.Normal),
 					},
@@ -417,8 +433,9 @@ func TestProcessEvalResults(t *testing.T) {
 					LastEvaluationTime: t1,
 				},
 				{
-					Labels: labels["system + rule + labels2"],
-					State:  eval.Alerting,
+					Labels:            labels["system + rule + labels2"],
+					ResultFingerprint: labels2.Fingerprint(),
+					State:             eval.Alerting,
 					Results: []state.Evaluation{
 						newEvaluation(t1, eval.Alerting),
 					},
@@ -441,8 +458,9 @@ func TestProcessEvalResults(t *testing.T) {
 			},
 			expectedStates: []*state.State{
 				{
-					Labels: labels["system + rule + labels1"],
-					State:  eval.Normal,
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.Normal,
 					Results: []state.Evaluation{
 						newEvaluation(t1, eval.Normal),
 						newEvaluation(tn(6), eval.Normal),
@@ -467,8 +485,9 @@ func TestProcessEvalResults(t *testing.T) {
 			expectedAnnotations: 1,
 			expectedStates: []*state.State{
 				{
-					Labels: labels["system + rule + labels1"],
-					State:  eval.Alerting,
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.Alerting,
 					Results: []state.Evaluation{
 						newEvaluation(t1, eval.Normal),
 						newEvaluation(t2, eval.Alerting),
@@ -499,8 +518,9 @@ func TestProcessEvalResults(t *testing.T) {
 			expectedAnnotations: 2,
 			expectedStates: []*state.State{
 				{
-					Labels: labels["system + rule + labels1"],
-					State:  eval.Alerting,
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.Alerting,
 					Results: []state.Evaluation{
 						newEvaluation(t3, eval.Alerting),
 						newEvaluation(tn(4), eval.Alerting),
@@ -534,8 +554,9 @@ func TestProcessEvalResults(t *testing.T) {
 			expectedAnnotations: 3, // Normal -> Pending, Pending -> NoData, NoData -> Pending
 			expectedStates: []*state.State{
 				{
-					Labels: labels["system + rule + labels1"],
-					State:  eval.Pending,
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.Pending,
 					Results: []state.Evaluation{
 						newEvaluation(tn(4), eval.Alerting),
 						newEvaluation(tn(5), eval.Alerting),
@@ -566,8 +587,9 @@ func TestProcessEvalResults(t *testing.T) {
 			expectedAnnotations: 3,
 			expectedStates: []*state.State{
 				{
-					Labels: labels["system + rule + labels1"],
-					State:  eval.NoData,
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.NoData,
 					Results: []state.Evaluation{
 						newEvaluation(t3, eval.Alerting),
 						newEvaluation(tn(4), eval.NoData),
@@ -592,7 +614,8 @@ func TestProcessEvalResults(t *testing.T) {
 			expectedAnnotations: 1,
 			expectedStates: []*state.State{
 				{
-					Labels: labels["system + rule + labels1"],
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
 
 					State: eval.Pending,
 					Results: []state.Evaluation{
@@ -619,8 +642,9 @@ func TestProcessEvalResults(t *testing.T) {
 			expectedAnnotations: 1,
 			expectedStates: []*state.State{
 				{
-					Labels: labels["system + rule + labels1"],
-					State:  eval.Pending,
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.Pending,
 					Results: []state.Evaluation{
 						newEvaluation(t1, eval.Alerting),
 						newEvaluation(t2, eval.Alerting),
@@ -645,9 +669,10 @@ func TestProcessEvalResults(t *testing.T) {
 			expectedAnnotations: 1,
 			expectedStates: []*state.State{
 				{
-					Labels:      labels["system + rule + labels1"],
-					State:       eval.Pending,
-					StateReason: eval.NoData.String(),
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.Pending,
+					StateReason:       eval.NoData.String(),
 					Results: []state.Evaluation{
 						newEvaluation(t1, eval.Normal),
 						newEvaluation(t2, eval.NoData),
@@ -681,9 +706,10 @@ func TestProcessEvalResults(t *testing.T) {
 			expectedAnnotations: 2,
 			expectedStates: []*state.State{
 				{
-					Labels:      labels["system + rule + labels1"],
-					State:       eval.Alerting,
-					StateReason: eval.NoData.String(),
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.Alerting,
+					StateReason:       eval.NoData.String(),
 					Results: []state.Evaluation{
 						newEvaluation(t3, eval.NoData),
 						newEvaluation(tn(4), eval.NoData),
@@ -709,8 +735,9 @@ func TestProcessEvalResults(t *testing.T) {
 			expectedAnnotations: 1,
 			expectedStates: []*state.State{
 				{
-					Labels: labels["system + rule + labels1"],
-					State:  eval.NoData,
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.NoData,
 					Results: []state.Evaluation{
 						newEvaluation(t1, eval.Normal),
 						newEvaluation(t2, eval.NoData),
@@ -735,8 +762,9 @@ func TestProcessEvalResults(t *testing.T) {
 			expectedAnnotations: 1,
 			expectedStates: []*state.State{
 				{
-					Labels: labels["system + rule + labels1"],
-					State:  eval.Normal,
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.Normal,
 					Results: []state.Evaluation{
 						newEvaluation(t1, eval.Normal),
 					},
@@ -745,8 +773,9 @@ func TestProcessEvalResults(t *testing.T) {
 					LastEvaluationTime: t1,
 				},
 				{
-					Labels: labels["system + rule"],
-					State:  eval.NoData,
+					Labels:            labels["system + rule"],
+					ResultFingerprint: data.Labels{}.Fingerprint(),
+					State:             eval.NoData,
 					Results: []state.Evaluation{
 						newEvaluation(t2, eval.NoData),
 					},
@@ -771,8 +800,9 @@ func TestProcessEvalResults(t *testing.T) {
 			expectedAnnotations: 1,
 			expectedStates: []*state.State{
 				{
-					Labels: labels["system + rule + labels1"],
-					State:  eval.Normal,
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.Normal,
 					Results: []state.Evaluation{
 						newEvaluation(t1, eval.Normal),
 					},
@@ -781,8 +811,9 @@ func TestProcessEvalResults(t *testing.T) {
 					LastEvaluationTime: t1,
 				},
 				{
-					Labels: labels["system + rule + labels2"],
-					State:  eval.Normal,
+					Labels:            labels["system + rule + labels2"],
+					ResultFingerprint: labels2.Fingerprint(),
+					State:             eval.Normal,
 					Results: []state.Evaluation{
 						newEvaluation(t1, eval.Normal),
 					},
@@ -791,8 +822,9 @@ func TestProcessEvalResults(t *testing.T) {
 					LastEvaluationTime: t1,
 				},
 				{
-					Labels: labels["system + rule"],
-					State:  eval.NoData,
+					Labels:            labels["system + rule"],
+					ResultFingerprint: data.Labels{}.Fingerprint(),
+					State:             eval.NoData,
 					Results: []state.Evaluation{
 						newEvaluation(t2, eval.NoData),
 					},
@@ -819,8 +851,9 @@ func TestProcessEvalResults(t *testing.T) {
 			expectedAnnotations: 1,
 			expectedStates: []*state.State{
 				{
-					Labels: labels["system + rule + labels1"],
-					State:  eval.Normal,
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.Normal,
 					Results: []state.Evaluation{
 						newEvaluation(t1, eval.Normal),
 						newEvaluation(t3, eval.Normal),
@@ -830,8 +863,9 @@ func TestProcessEvalResults(t *testing.T) {
 					LastEvaluationTime: t3,
 				},
 				{
-					Labels: labels["system + rule + no-data"],
-					State:  eval.NoData,
+					Labels:            labels["system + rule + no-data"],
+					ResultFingerprint: noDataLabels.Fingerprint(),
+					State:             eval.NoData,
 					Results: []state.Evaluation{
 						newEvaluation(t2, eval.NoData),
 					},
@@ -841,6 +875,76 @@ func TestProcessEvalResults(t *testing.T) {
 				},
 			},
 		},
+		{
+			desc:      "normal -> normal (NoData, KeepLastState) -> alerting -> alerting (NoData, KeepLastState) - keeps last state when result is NoData and NoDataState is KeepLast",
+			alertRule: baseRuleWith(models.WithForNTimes(0), models.WithNoDataExecAs(models.KeepLast)),
+			evalResults: map[time.Time]eval.Results{
+				t1: {
+					newResult(eval.WithState(eval.Normal), eval.WithLabels(labels1)),
+				},
+				t2: {
+					newResult(eval.WithState(eval.NoData), eval.WithLabels(labels1)), // TODO fix it because NoData does not have same labels
+				},
+				t3: {
+					newResult(eval.WithState(eval.Alerting), eval.WithLabels(labels1)),
+				},
+				tn(4): {
+					newResult(eval.WithState(eval.NoData), eval.WithLabels(labels1)), // TODO fix it because NoData does not have same labels
+				},
+			},
+			expectedAnnotations: 1,
+			expectedStates: []*state.State{
+				{
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.Alerting,
+					StateReason:       models.ConcatReasons(eval.NoData.String(), models.StateReasonKeepLast),
+					Results: []state.Evaluation{
+						newEvaluation(t1, eval.Normal),
+						newEvaluation(t2, eval.NoData),
+						newEvaluation(t3, eval.Alerting),
+						newEvaluation(tn(4), eval.NoData),
+					},
+					StartsAt:           t3,
+					EndsAt:             tn(4).Add(state.ResendDelay * 4),
+					LastEvaluationTime: tn(4),
+				},
+			},
+		},
+		{
+			desc:      "normal -> pending -> pending (NoData, KeepLastState) -> alerting (NoData, KeepLastState) - keep last state respects For when result is NoData",
+			alertRule: baseRuleWith(models.WithForNTimes(2), models.WithNoDataExecAs(models.KeepLast)),
+			evalResults: map[time.Time]eval.Results{
+				t1: {
+					newResult(eval.WithState(eval.Normal), eval.WithLabels(labels1)),
+				},
+				t2: {
+					newResult(eval.WithState(eval.Alerting), eval.WithLabels(labels1)),
+				},
+				t3: {
+					newResult(eval.WithState(eval.NoData), eval.WithLabels(labels1)), // TODO fix it because NoData does not have same labels
+				},
+				tn(4): {
+					newResult(eval.WithState(eval.NoData), eval.WithLabels(labels1)), // TODO fix it because NoData does not have same labels
+				},
+			},
+			expectedAnnotations: 2,
+			expectedStates: []*state.State{
+				{
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.Alerting,
+					StateReason:       models.ConcatReasons(eval.NoData.String(), models.StateReasonKeepLast),
+					Results: []state.Evaluation{
+						newEvaluation(t3, eval.NoData),
+						newEvaluation(tn(4), eval.NoData),
+					},
+					StartsAt:           tn(4),
+					EndsAt:             tn(4).Add(state.ResendDelay * 4),
+					LastEvaluationTime: tn(4),
+				},
+			},
+		},
 		{
 			desc:      "normal -> normal when result is NoData and NoDataState is ok",
 			alertRule: baseRuleWith(models.WithNoDataExecAs(models.OK)),
@@ -852,12 +956,13 @@ func TestProcessEvalResults(t *testing.T) {
 					newResult(eval.WithState(eval.NoData), eval.WithLabels(labels1)), // TODO fix it because NoData does not have same labels
 				},
 			},
-			expectedAnnotations: 1,
+			expectedAnnotations: 0,
 			expectedStates: []*state.State{
 				{
-					Labels:      labels["system + rule + labels1"],
-					State:       eval.Normal,
-					StateReason: eval.NoData.String(),
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.Normal,
+					StateReason:       eval.NoData.String(),
 					Results: []state.Evaluation{
 						newEvaluation(t1, eval.Normal),
 						newEvaluation(t2, eval.NoData),
@@ -882,10 +987,11 @@ func TestProcessEvalResults(t *testing.T) {
 			expectedAnnotations: 1,
 			expectedStates: []*state.State{
 				{
-					Labels:      labels["system + rule + labels1"],
-					State:       eval.Pending,
-					StateReason: eval.Error.String(),
-					Error:       errors.New("with_state_error"),
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.Pending,
+					StateReason:       eval.Error.String(),
+					Error:             errors.New("with_state_error"),
 					Results: []state.Evaluation{
 						newEvaluation(t1, eval.Normal),
 						newEvaluation(t2, eval.Error),
@@ -919,10 +1025,11 @@ func TestProcessEvalResults(t *testing.T) {
 			expectedAnnotations: 2,
 			expectedStates: []*state.State{
 				{
-					Labels:      labels["system + rule + labels1"],
-					State:       eval.Alerting,
-					StateReason: eval.Error.String(),
-					Error:       errors.New("with_state_error"),
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.Alerting,
+					StateReason:       eval.Error.String(),
+					Error:             errors.New("with_state_error"),
 					Results: []state.Evaluation{
 						newEvaluation(t3, eval.Error),
 						newEvaluation(tn(4), eval.Error),
@@ -960,8 +1067,9 @@ func TestProcessEvalResults(t *testing.T) {
 						"datasource_uid": "datasource_uid_1",
 						"ref_id":         "A",
 					}),
-					State: eval.Error,
-					Error: expr.MakeQueryError("A", "datasource_uid_1", errors.New("this is an error")),
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.Error,
+					Error:             expr.MakeQueryError("A", "datasource_uid_1", errors.New("this is an error")),
 					Results: []state.Evaluation{
 						newEvaluation(t1, eval.Normal),
 						newEvaluation(t2, eval.Error),
@@ -974,6 +1082,76 @@ func TestProcessEvalResults(t *testing.T) {
 				},
 			},
 		},
+		{
+			desc:      "normal -> normal (Error, KeepLastState) -> alerting -> alerting (Error, KeepLastState) - keeps last state when result is Error and ExecErrState is KeepLast",
+			alertRule: baseRuleWith(models.WithForNTimes(0), models.WithErrorExecAs(models.KeepLastErrState)),
+			evalResults: map[time.Time]eval.Results{
+				t1: {
+					newResult(eval.WithState(eval.Normal), eval.WithLabels(labels1)),
+				},
+				t2: {
+					newResult(eval.WithError(expr.MakeQueryError("A", "datasource_uid_1", errors.New("this is an error"))), eval.WithLabels(labels1)), // TODO fix it because error labels are different
+				},
+				t3: {
+					newResult(eval.WithState(eval.Alerting), eval.WithLabels(labels1)),
+				},
+				tn(4): {
+					newResult(eval.WithError(expr.MakeQueryError("A", "datasource_uid_1", errors.New("this is an error"))), eval.WithLabels(labels1)), // TODO fix it because error labels are different
+				},
+			},
+			expectedAnnotations: 1,
+			expectedStates: []*state.State{
+				{
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.Alerting,
+					StateReason:       models.ConcatReasons(eval.Error.String(), models.StateReasonKeepLast),
+					Results: []state.Evaluation{
+						newEvaluation(t1, eval.Normal),
+						newEvaluation(t2, eval.Error),
+						newEvaluation(t3, eval.Alerting),
+						newEvaluation(tn(4), eval.Error),
+					},
+					StartsAt:           t3,
+					EndsAt:             tn(4).Add(state.ResendDelay * 4),
+					LastEvaluationTime: tn(4),
+				},
+			},
+		},
+		{
+			desc:      "normal -> pending -> pending (Error, KeepLastState) -> alerting (Error, KeepLastState) - keep last state respects For when result is Error",
+			alertRule: baseRuleWith(models.WithForNTimes(2), models.WithErrorExecAs(models.KeepLastErrState)),
+			evalResults: map[time.Time]eval.Results{
+				t1: {
+					newResult(eval.WithState(eval.Normal), eval.WithLabels(labels1)),
+				},
+				t2: {
+					newResult(eval.WithState(eval.Alerting), eval.WithLabels(labels1)),
+				},
+				t3: {
+					newResult(eval.WithError(expr.MakeQueryError("A", "datasource_uid_1", errors.New("this is an error"))), eval.WithLabels(labels1)), // TODO fix it because error labels are different
+				},
+				tn(4): {
+					newResult(eval.WithError(expr.MakeQueryError("A", "datasource_uid_1", errors.New("this is an error"))), eval.WithLabels(labels1)), // TODO fix it because error labels are different
+				},
+			},
+			expectedAnnotations: 2,
+			expectedStates: []*state.State{
+				{
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.Alerting,
+					StateReason:       models.ConcatReasons(eval.Error.String(), models.StateReasonKeepLast),
+					Results: []state.Evaluation{
+						newEvaluation(t3, eval.Error),
+						newEvaluation(tn(4), eval.Error),
+					},
+					StartsAt:           tn(4),
+					EndsAt:             tn(4).Add(state.ResendDelay * 4),
+					LastEvaluationTime: tn(4),
+				},
+			},
+		},
 		{
 			desc:      "normal -> normal when result is Error and ExecErrState is OK",
 			alertRule: baseRuleWith(models.WithForNTimes(6), models.WithErrorExecAs(models.OkErrState)),
@@ -988,9 +1166,10 @@ func TestProcessEvalResults(t *testing.T) {
 			expectedAnnotations: 1,
 			expectedStates: []*state.State{
 				{
-					Labels:      labels["system + rule + labels1"],
-					State:       eval.Normal,
-					StateReason: eval.Error.String(),
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.Normal,
+					StateReason:       eval.Error.String(),
 					Results: []state.Evaluation{
 						newEvaluation(t1, eval.Normal),
 						newEvaluation(t2, eval.Error),
@@ -1015,9 +1194,10 @@ func TestProcessEvalResults(t *testing.T) {
 			expectedAnnotations: 2,
 			expectedStates: []*state.State{
 				{
-					Labels:      labels["system + rule + labels1"],
-					State:       eval.Normal,
-					StateReason: eval.Error.String(),
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.Normal,
+					StateReason:       eval.Error.String(),
 					Results: []state.Evaluation{
 						newEvaluation(t1, eval.Alerting),
 						newEvaluation(t2, eval.Error),
@@ -1054,9 +1234,10 @@ func TestProcessEvalResults(t *testing.T) {
 			expectedAnnotations: 3,
 			expectedStates: []*state.State{
 				{
-					Labels: labels["system + rule + labels1"],
-					State:  eval.Error,
-					Error:  fmt.Errorf("with_state_error"),
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.Error,
+					Error:             fmt.Errorf("with_state_error"),
 					Results: []state.Evaluation{
 						newEvaluation(tn(5), eval.Error),
 						newEvaluation(tn(6), eval.Error),
@@ -1087,8 +1268,9 @@ func TestProcessEvalResults(t *testing.T) {
 			expectedAnnotations: 3,
 			expectedStates: []*state.State{
 				{
-					Labels: labels["system + rule + labels1"],
-					State:  eval.Pending,
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.Pending,
 					Results: []state.Evaluation{
 						newEvaluation(tn(4), eval.Alerting),
 						newEvaluation(tn(5), eval.Error),
@@ -1120,8 +1302,9 @@ func TestProcessEvalResults(t *testing.T) {
 			expectedAnnotations: 3,
 			expectedStates: []*state.State{
 				{
-					Labels: labels["system + rule + labels1"],
-					State:  eval.NoData,
+					Labels:            labels["system + rule + labels1"],
+					ResultFingerprint: labels1.Fingerprint(),
+					State:             eval.NoData,
 					Results: []state.Evaluation{
 						newEvaluation(tn(4), eval.Alerting),
 						newEvaluation(tn(5), eval.Error),
@@ -1166,6 +1349,11 @@ func TestProcessEvalResults(t *testing.T) {
 					LastEvaluationTime: t1,
 					EvaluationDuration: evaluationDuration,
 					Annotations:        map[string]string{"summary": "grafana is down in us-central-1 cluster -> prod namespace"},
+					ResultFingerprint: data.Labels{
+						"cluster":   "us-central-1",
+						"namespace": "prod",
+						"pod":       "grafana",
+					}.Fingerprint(),
 				},
 			},
 		},
@@ -1186,8 +1374,9 @@ func TestProcessEvalResults(t *testing.T) {
 			},
 			expectedStates: []*state.State{
 				{
-					Labels: labels["system + rule"],
-					State:  eval.Alerting,
+					Labels:            labels["system + rule"],
+					ResultFingerprint: data.Labels{}.Fingerprint(),
+					State:             eval.Alerting,
 					Results: []state.Evaluation{
 						newEvaluation(t1, eval.Alerting),
 						newEvaluation(t2, eval.Error),
@@ -1206,29 +1395,28 @@ func TestProcessEvalResults(t *testing.T) {
 			fakeAnnoRepo := annotationstest.NewFakeAnnotationsRepo()
 			reg := prometheus.NewPedanticRegistry()
 			stateMetrics := metrics.NewStateMetrics(reg)
-			m := metrics.NewHistorianMetrics(prometheus.NewRegistry())
+			m := metrics.NewHistorianMetrics(prometheus.NewRegistry(), metrics.Subsystem)
 			store := historian.NewAnnotationStore(fakeAnnoRepo, &dashboards.FakeDashboardService{}, m)
 			hist := historian.NewAnnotationBackend(store, nil, m)
 			clk := clock.NewMock()
 			cfg := state.ManagerCfg{
-				Metrics:                 stateMetrics,
-				ExternalURL:             nil,
-				InstanceStore:           &state.FakeInstanceStore{},
-				Images:                  &state.NotAvailableImageService{},
-				Clock:                   clk,
-				Historian:               hist,
-				MaxStateSaveConcurrency: 1,
-				Tracer:                  tracing.InitializeTracerForTest(),
-				Log:                     log.New("ngalert.state.manager"),
+				Metrics:       stateMetrics,
+				ExternalURL:   nil,
+				InstanceStore: &state.FakeInstanceStore{},
+				Images:        &state.NotAvailableImageService{},
+				Clock:         clk,
+				Historian:     hist,
+				Tracer:        tracing.InitializeTracerForTest(),
+				Log:           log.New("ngalert.state.manager"),
 			}
-			st := state.NewManager(cfg)
+			st := state.NewManager(cfg, state.NewNoopPersister())
 
 			evals := make([]time.Time, 0, len(tc.evalResults))
 			for evalTime := range tc.evalResults {
 				evals = append(evals, evalTime)
 			}
-			slices.SortFunc(evals, func(a, b time.Time) bool {
-				return a.Before(b)
+			slices.SortFunc(evals, func(a, b time.Time) int {
+				return a.Compare(b)
 			})
 			results := 0
 			for _, evalTime := range evals {
@@ -1318,11 +1506,12 @@ func TestProcessEvalResults(t *testing.T) {
 			Images:                  &state.NotAvailableImageService{},
 			Clock:                   clk,
 			Historian:               &state.FakeHistorian{},
-			MaxStateSaveConcurrency: 1,
 			Tracer:                  tracing.InitializeTracerForTest(),
 			Log:                     log.New("ngalert.state.manager"),
+			MaxStateSaveConcurrency: 1,
 		}
-		st := state.NewManager(cfg)
+		statePersister := state.NewSyncStatePersisiter(log.New("ngalert.state.manager.persist"), cfg)
+		st := state.NewManager(cfg, statePersister)
 		rule := models.AlertRuleGen()()
 		var results = eval.GenerateResults(rand.Intn(4)+1, eval.ResultGen(eval.WithEvaluatedAt(clk.Now())))
 
@@ -1331,7 +1520,7 @@ func TestProcessEvalResults(t *testing.T) {
 		require.NotEmpty(t, states)
 
 		savedStates := make(map[string]models.AlertInstance)
-		for _, op := range instanceStore.RecordedOps {
+		for _, op := range instanceStore.RecordedOps() {
 			switch q := op.(type) {
 			case models.AlertInstance:
 				cacheId, err := q.Labels.StringKey()
@@ -1454,6 +1643,7 @@ func TestStaleResultsHandler(t *testing.T) {
 					LastEvaluationTime: evaluationTime,
 					EvaluationDuration: 0,
 					Annotations:        map[string]string{"testAnnoKey": "testAnnoValue"},
+					ResultFingerprint:  data.Labels{"test1": "testValue1"}.Fingerprint(),
 				},
 			},
 			startingStateCount: 2,
@@ -1464,17 +1654,16 @@ func TestStaleResultsHandler(t *testing.T) {
 	for _, tc := range testCases {
 		ctx := context.Background()
 		cfg := state.ManagerCfg{
-			Metrics:                 metrics.NewNGAlert(prometheus.NewPedanticRegistry()).GetStateMetrics(),
-			ExternalURL:             nil,
-			InstanceStore:           dbstore,
-			Images:                  &state.NoopImageService{},
-			Clock:                   clock.New(),
-			Historian:               &state.FakeHistorian{},
-			MaxStateSaveConcurrency: 1,
-			Tracer:                  tracing.InitializeTracerForTest(),
-			Log:                     log.New("ngalert.state.manager"),
+			Metrics:       metrics.NewNGAlert(prometheus.NewPedanticRegistry()).GetStateMetrics(),
+			ExternalURL:   nil,
+			InstanceStore: dbstore,
+			Images:        &state.NoopImageService{},
+			Clock:         clock.New(),
+			Historian:     &state.FakeHistorian{},
+			Tracer:        tracing.InitializeTracerForTest(),
+			Log:           log.New("ngalert.state.manager"),
 		}
-		st := state.NewManager(cfg)
+		st := state.NewManager(cfg, state.NewNoopPersister())
 		st.Warm(ctx, dbstore)
 		existingStatesForRule := st.GetStatesForRuleUID(rule.OrgID, rule.UID)
 
@@ -1547,17 +1736,16 @@ func TestStaleResults(t *testing.T) {
 	store := &state.FakeInstanceStore{}
 
 	cfg := state.ManagerCfg{
-		Metrics:                 metrics.NewNGAlert(prometheus.NewPedanticRegistry()).GetStateMetrics(),
-		ExternalURL:             nil,
-		InstanceStore:           store,
-		Images:                  &state.NoopImageService{},
-		Clock:                   clk,
-		Historian:               &state.FakeHistorian{},
-		MaxStateSaveConcurrency: 1,
-		Tracer:                  tracing.InitializeTracerForTest(),
-		Log:                     log.New("ngalert.state.manager"),
+		Metrics:       metrics.NewNGAlert(prometheus.NewPedanticRegistry()).GetStateMetrics(),
+		ExternalURL:   nil,
+		InstanceStore: store,
+		Images:        &state.NoopImageService{},
+		Clock:         clk,
+		Historian:     &state.FakeHistorian{},
+		Tracer:        tracing.InitializeTracerForTest(),
+		Log:           log.New("ngalert.state.manager"),
 	}
-	st := state.NewManager(cfg)
+	st := state.NewManager(cfg, state.NewNoopPersister())
 
 	rule := models.AlertRuleGen(models.WithFor(0))()
 
@@ -1621,7 +1809,7 @@ func TestStaleResults(t *testing.T) {
 	})
 
 	t.Run("should delete stale states from the database", func(t *testing.T) {
-		for _, op := range store.RecordedOps {
+		for _, op := range store.RecordedOps() {
 			switch q := op.(type) {
 			case state.FakeInstanceStoreOp:
 				keys, ok := q.Args[1].([]models.AlertInstanceKey)
@@ -1721,17 +1909,16 @@ func TestDeleteStateByRuleUID(t *testing.T) {
 			clk := clock.NewMock()
 			clk.Set(time.Now())
 			cfg := state.ManagerCfg{
-				Metrics:                 metrics.NewNGAlert(prometheus.NewPedanticRegistry()).GetStateMetrics(),
-				ExternalURL:             nil,
-				InstanceStore:           dbstore,
-				Images:                  &state.NoopImageService{},
-				Clock:                   clk,
-				Historian:               &state.FakeHistorian{},
-				MaxStateSaveConcurrency: 1,
-				Tracer:                  tracing.InitializeTracerForTest(),
-				Log:                     log.New("ngalert.state.manager"),
+				Metrics:       metrics.NewNGAlert(prometheus.NewPedanticRegistry()).GetStateMetrics(),
+				ExternalURL:   nil,
+				InstanceStore: dbstore,
+				Images:        &state.NoopImageService{},
+				Clock:         clk,
+				Historian:     &state.FakeHistorian{},
+				Tracer:        tracing.InitializeTracerForTest(),
+				Log:           log.New("ngalert.state.manager"),
 			}
-			st := state.NewManager(cfg)
+			st := state.NewManager(cfg, state.NewNoopPersister())
 			st.Warm(ctx, dbstore)
 			q := &models.ListAlertInstancesQuery{RuleOrgID: rule.OrgID, RuleUID: rule.UID}
 			alerts, _ := dbstore.ListAlertInstances(ctx, q)
@@ -1863,17 +2050,16 @@ func TestResetStateByRuleUID(t *testing.T) {
 			clk := clock.NewMock()
 			clk.Set(time.Now())
 			cfg := state.ManagerCfg{
-				Metrics:                 metrics.NewNGAlert(prometheus.NewPedanticRegistry()).GetStateMetrics(),
-				ExternalURL:             nil,
-				InstanceStore:           dbstore,
-				Images:                  &state.NoopImageService{},
-				Clock:                   clk,
-				Historian:               fakeHistorian,
-				MaxStateSaveConcurrency: 1,
-				Tracer:                  tracing.InitializeTracerForTest(),
-				Log:                     log.New("ngalert.state.manager"),
+				Metrics:       metrics.NewNGAlert(prometheus.NewPedanticRegistry()).GetStateMetrics(),
+				ExternalURL:   nil,
+				InstanceStore: dbstore,
+				Images:        &state.NoopImageService{},
+				Clock:         clk,
+				Historian:     fakeHistorian,
+				Tracer:        tracing.InitializeTracerForTest(),
+				Log:           log.New("ngalert.state.manager"),
 			}
-			st := state.NewManager(cfg)
+			st := state.NewManager(cfg, state.NewNoopPersister())
 			st.Warm(ctx, dbstore)
 			q := &models.ListAlertInstancesQuery{RuleOrgID: rule.OrgID, RuleUID: rule.UID}
 			alerts, _ := dbstore.ListAlertInstances(ctx, q)
diff --git a/pkg/services/ngalert/state/persist.go b/pkg/services/ngalert/state/persist.go
index b12deba5af6a3..b3e237a4fb7ef 100644
--- a/pkg/services/ngalert/state/persist.go
+++ b/pkg/services/ngalert/state/persist.go
@@ -14,6 +14,7 @@ type InstanceStore interface {
 	SaveAlertInstance(ctx context.Context, instance models.AlertInstance) error
 	DeleteAlertInstances(ctx context.Context, keys ...models.AlertInstanceKey) error
 	DeleteAlertInstancesByRule(ctx context.Context, key models.AlertRuleKey) error
+	FullSync(ctx context.Context, instances []models.AlertInstance) error
 }
 
 // RuleReader represents the ability to fetch alert rules.
diff --git a/pkg/services/ngalert/state/persister_async.go b/pkg/services/ngalert/state/persister_async.go
new file mode 100644
index 0000000000000..a0118b92df8b9
--- /dev/null
+++ b/pkg/services/ngalert/state/persister_async.go
@@ -0,0 +1,69 @@
+package state
+
+import (
+	"context"
+	"time"
+
+	"github.com/benbjohnson/clock"
+	"go.opentelemetry.io/otel/trace"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
+)
+
+type AsyncStatePersister struct {
+	log log.Logger
+	// doNotSaveNormalState controls whether eval.Normal state is persisted to the database and returned by get methods.
+	doNotSaveNormalState bool
+	store                InstanceStore
+	ticker               *clock.Ticker
+	metrics              *metrics.State
+}
+
+func NewAsyncStatePersister(log log.Logger, ticker *clock.Ticker, cfg ManagerCfg) StatePersister {
+	return &AsyncStatePersister{
+		log:                  log,
+		store:                cfg.InstanceStore,
+		ticker:               ticker,
+		doNotSaveNormalState: cfg.DoNotSaveNormalState,
+		metrics:              cfg.Metrics,
+	}
+}
+
+func (a *AsyncStatePersister) Async(ctx context.Context, cache *cache) {
+	for {
+		select {
+		case <-a.ticker.C:
+			if err := a.fullSync(ctx, cache); err != nil {
+				a.log.Error("Failed to do a full state sync to database", "err", err)
+			}
+		case <-ctx.Done():
+			a.log.Info("Scheduler is shutting down, doing a final state sync.")
+			if err := a.fullSync(context.Background(), cache); err != nil {
+				a.log.Error("Failed to do a full state sync to database", "err", err)
+			}
+			a.ticker.Stop()
+			a.log.Info("State async worker is shut down.")
+			return
+		}
+	}
+}
+
+func (a *AsyncStatePersister) fullSync(ctx context.Context, cache *cache) error {
+	startTime := time.Now()
+	a.log.Debug("Full state sync start")
+	instances := cache.asInstances(a.doNotSaveNormalState)
+	if err := a.store.FullSync(ctx, instances); err != nil {
+		a.log.Error("Full state sync failed", "duration", time.Since(startTime), "instances", len(instances))
+		return err
+	}
+	a.log.Debug("Full state sync done", "duration", time.Since(startTime), "instances", len(instances))
+	if a.metrics != nil {
+		a.metrics.StateFullSyncDuration.Observe(time.Since(startTime).Seconds())
+	}
+	return nil
+}
+
+func (a *AsyncStatePersister) Sync(_ context.Context, _ trace.Span, _, _ []StateTransition) {
+	a.log.Debug("Sync: No-Op")
+}
diff --git a/pkg/services/ngalert/state/persister_async_test.go b/pkg/services/ngalert/state/persister_async_test.go
new file mode 100644
index 0000000000000..63705c01f47aa
--- /dev/null
+++ b/pkg/services/ngalert/state/persister_async_test.go
@@ -0,0 +1,77 @@
+package state
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/benbjohnson/clock"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/ngalert/eval"
+)
+
+func TestAsyncStatePersister_Async(t *testing.T) {
+	t.Run("It should save on tick", func(t *testing.T) {
+		mockClock := clock.NewMock()
+		store := &FakeInstanceStore{}
+		logger := log.New("async.test")
+
+		persister := NewAsyncStatePersister(logger, mockClock.Ticker(1*time.Second), ManagerCfg{
+			InstanceStore: store,
+		})
+
+		ctx, cancel := context.WithCancel(context.Background())
+
+		defer func() {
+			cancel()
+		}()
+
+		cache := newCache()
+
+		go persister.Async(ctx, cache)
+
+		cache.set(&State{
+			OrgID:        1,
+			State:        eval.Alerting,
+			AlertRuleUID: "1",
+		})
+		// Let one tick pass
+		mockClock.Add(1 * time.Second)
+
+		// Check if the state was saved
+		require.Eventually(t, func() bool {
+			return len(store.RecordedOps()) == 1
+		}, time.Second*5, time.Second)
+	})
+	t.Run("It should save on context done", func(t *testing.T) {
+		mockClock := clock.NewMock()
+		store := &FakeInstanceStore{}
+		logger := log.New("async.test")
+
+		persister := NewAsyncStatePersister(logger, mockClock.Ticker(1*time.Second), ManagerCfg{
+			InstanceStore: store,
+		})
+
+		ctx, cancel := context.WithCancel(context.Background())
+
+		cache := newCache()
+
+		go persister.Async(ctx, cache)
+
+		cache.set(&State{
+			OrgID:        1,
+			State:        eval.Alerting,
+			AlertRuleUID: "1",
+		})
+
+		// Now we cancel the context
+		cancel()
+
+		// Check if the context cancellation was handled correctly
+		require.Eventually(t, func() bool {
+			return len(store.RecordedOps()) == 1
+		}, time.Second*5, time.Second)
+	})
+}
diff --git a/pkg/services/ngalert/state/persister_noop.go b/pkg/services/ngalert/state/persister_noop.go
new file mode 100644
index 0000000000000..a500f34eeadf6
--- /dev/null
+++ b/pkg/services/ngalert/state/persister_noop.go
@@ -0,0 +1,16 @@
+package state
+
+import (
+	"context"
+
+	"go.opentelemetry.io/otel/trace"
+)
+
+type NoopPersister struct{}
+
+func (n *NoopPersister) Async(_ context.Context, _ *cache)                            {}
+func (n *NoopPersister) Sync(_ context.Context, _ trace.Span, _, _ []StateTransition) {}
+
+func NewNoopPersister() StatePersister {
+	return &NoopPersister{}
+}
diff --git a/pkg/services/ngalert/state/persister_sync.go b/pkg/services/ngalert/state/persister_sync.go
new file mode 100644
index 0000000000000..bc8c5cf16736a
--- /dev/null
+++ b/pkg/services/ngalert/state/persister_sync.go
@@ -0,0 +1,110 @@
+package state
+
+import (
+	"context"
+	"time"
+
+	"github.com/grafana/dskit/concurrency"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/trace"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	ngModels "github.com/grafana/grafana/pkg/services/ngalert/models"
+)
+
+type SyncStatePersister struct {
+	log   log.Logger
+	store InstanceStore
+	// doNotSaveNormalState controls whether eval.Normal state is persisted to the database and returned by get methods.
+	doNotSaveNormalState bool
+	// maxStateSaveConcurrency controls the number of goroutines (per rule) that can save alert state in parallel.
+	maxStateSaveConcurrency int
+}
+
+func NewSyncStatePersisiter(log log.Logger, cfg ManagerCfg) StatePersister {
+	return &SyncStatePersister{
+		log:                     log,
+		store:                   cfg.InstanceStore,
+		doNotSaveNormalState:    cfg.DoNotSaveNormalState,
+		maxStateSaveConcurrency: cfg.MaxStateSaveConcurrency,
+	}
+}
+
+func (a *SyncStatePersister) Async(_ context.Context, _ *cache) {
+	a.log.Debug("Async: No-Op")
+}
+func (a *SyncStatePersister) Sync(ctx context.Context, span trace.Span, states, staleStates []StateTransition) {
+	a.deleteAlertStates(ctx, staleStates)
+	if len(staleStates) > 0 {
+		span.AddEvent("deleted stale states", trace.WithAttributes(
+			attribute.Int64("state_transitions", int64(len(staleStates))),
+		))
+	}
+
+	a.saveAlertStates(ctx, states...)
+	span.AddEvent("updated database")
+}
+
+func (a *SyncStatePersister) deleteAlertStates(ctx context.Context, states []StateTransition) {
+	if a.store == nil || len(states) == 0 {
+		return
+	}
+
+	a.log.Debug("Deleting alert states", "count", len(states))
+	toDelete := make([]ngModels.AlertInstanceKey, 0, len(states))
+
+	for _, s := range states {
+		key, err := s.GetAlertInstanceKey()
+		if err != nil {
+			a.log.Error("Failed to delete alert instance with invalid labels", "cacheID", s.CacheID, "error", err)
+			continue
+		}
+		toDelete = append(toDelete, key)
+	}
+
+	err := a.store.DeleteAlertInstances(ctx, toDelete...)
+	if err != nil {
+		a.log.Error("Failed to delete stale states", "error", err)
+	}
+}
+
+func (a *SyncStatePersister) saveAlertStates(ctx context.Context, states ...StateTransition) {
+	if a.store == nil || len(states) == 0 {
+		return
+	}
+
+	saveState := func(ctx context.Context, idx int) error {
+		s := states[idx]
+		// Do not save normal state to database and remove transition to Normal state but keep mapped states
+		if a.doNotSaveNormalState && IsNormalStateWithNoReason(s.State) && !s.Changed() {
+			return nil
+		}
+
+		key, err := s.GetAlertInstanceKey()
+		if err != nil {
+			a.log.Error("Failed to create a key for alert state to save it to database. The state will be ignored ", "cacheID", s.CacheID, "error", err, "labels", s.Labels.String())
+			return nil
+		}
+		instance := ngModels.AlertInstance{
+			AlertInstanceKey:  key,
+			Labels:            ngModels.InstanceLabels(s.Labels),
+			CurrentState:      ngModels.InstanceStateType(s.State.State.String()),
+			CurrentReason:     s.StateReason,
+			LastEvalTime:      s.LastEvaluationTime,
+			CurrentStateSince: s.StartsAt,
+			CurrentStateEnd:   s.EndsAt,
+		}
+
+		err = a.store.SaveAlertInstance(ctx, instance)
+		if err != nil {
+			a.log.Error("Failed to save alert state", "labels", s.Labels.String(), "state", s.State, "error", err)
+			return nil
+		}
+		return nil
+	}
+
+	start := time.Now()
+	a.log.Debug("Saving alert states", "count", len(states), "max_state_save_concurrency", a.maxStateSaveConcurrency)
+	_ = concurrency.ForEachJob(ctx, len(states), a.maxStateSaveConcurrency, saveState)
+	a.log.Debug("Saving alert states done", "count", len(states), "max_state_save_concurrency", a.maxStateSaveConcurrency, "duration", time.Since(start))
+}
diff --git a/pkg/services/ngalert/state/persister_sync_test.go b/pkg/services/ngalert/state/persister_sync_test.go
new file mode 100644
index 0000000000000..4465cebdb1e1e
--- /dev/null
+++ b/pkg/services/ngalert/state/persister_sync_test.go
@@ -0,0 +1,103 @@
+package state
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"k8s.io/component-base/tracing"
+
+	"github.com/grafana/grafana/pkg/infra/log/logtest"
+	"github.com/grafana/grafana/pkg/services/ngalert/eval"
+	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/util"
+)
+
+func TestSyncPersister_saveAlertStates(t *testing.T) {
+	type stateWithReason struct {
+		State  eval.State
+		Reason string
+	}
+	create := func(s eval.State, r string) stateWithReason {
+		return stateWithReason{
+			State:  s,
+			Reason: r,
+		}
+	}
+	allStates := [...]stateWithReason{
+		create(eval.Normal, ""),
+		create(eval.Normal, eval.NoData.String()),
+		create(eval.Normal, eval.Error.String()),
+		create(eval.Normal, util.GenerateShortUID()),
+		create(eval.Alerting, ""),
+		create(eval.Pending, ""),
+		create(eval.NoData, ""),
+		create(eval.Error, ""),
+	}
+
+	transitionToKey := map[ngmodels.AlertInstanceKey]StateTransition{}
+	transitions := make([]StateTransition, 0)
+	for _, fromState := range allStates {
+		for i, toState := range allStates {
+			tr := StateTransition{
+				State: &State{
+					State:       toState.State,
+					StateReason: toState.Reason,
+					Labels:      ngmodels.GenerateAlertLabels(5, fmt.Sprintf("%d--", i)),
+				},
+				PreviousState:       fromState.State,
+				PreviousStateReason: fromState.Reason,
+			}
+			key, err := tr.GetAlertInstanceKey()
+			require.NoError(t, err)
+			transitionToKey[key] = tr
+			transitions = append(transitions, tr)
+		}
+	}
+
+	t.Run("should save all transitions if doNotSaveNormalState is false", func(t *testing.T) {
+		trace := tracing.NewNoopTracerProvider().Tracer("test")
+		_, span := trace.Start(context.Background(), "")
+		st := &FakeInstanceStore{}
+		syncStatePersister := NewSyncStatePersisiter(&logtest.Fake{}, ManagerCfg{
+			InstanceStore:           st,
+			MaxStateSaveConcurrency: 1,
+		})
+		syncStatePersister.Sync(context.Background(), span, transitions, nil)
+		savedKeys := map[ngmodels.AlertInstanceKey]ngmodels.AlertInstance{}
+		for _, op := range st.RecordedOps() {
+			saved := op.(ngmodels.AlertInstance)
+			savedKeys[saved.AlertInstanceKey] = saved
+		}
+		assert.Len(t, transitionToKey, len(savedKeys))
+
+		for key, tr := range transitionToKey {
+			assert.Containsf(t, savedKeys, key, "state %s (%s) was not saved but should be", tr.State.State, tr.StateReason)
+		}
+	})
+
+	t.Run("should not save Normal->Normal if doNotSaveNormalState is true", func(t *testing.T) {
+		trace := tracing.NewNoopTracerProvider().Tracer("test")
+		_, span := trace.Start(context.Background(), "")
+		st := &FakeInstanceStore{}
+		syncStatePersister := NewSyncStatePersisiter(&logtest.Fake{}, ManagerCfg{
+			InstanceStore:           st,
+			MaxStateSaveConcurrency: 1,
+		})
+		syncStatePersister.Sync(context.Background(), span, transitions, nil)
+
+		savedKeys := map[ngmodels.AlertInstanceKey]ngmodels.AlertInstance{}
+		for _, op := range st.RecordedOps() {
+			saved := op.(ngmodels.AlertInstance)
+			savedKeys[saved.AlertInstanceKey] = saved
+		}
+		for key, tr := range transitionToKey {
+			if tr.State.State == eval.Normal && tr.StateReason == "" && tr.PreviousState == eval.Normal && tr.PreviousStateReason == "" {
+				continue
+			}
+			assert.Containsf(t, savedKeys, key, "state %s (%s) was not saved but should be", tr.State.State, tr.StateReason)
+		}
+	})
+}
diff --git a/pkg/services/ngalert/state/state.go b/pkg/services/ngalert/state/state.go
index 89ad132cac60c..11c86f6b10e41 100644
--- a/pkg/services/ngalert/state/state.go
+++ b/pkg/services/ngalert/state/state.go
@@ -2,6 +2,7 @@ package state
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"math"
@@ -34,6 +35,9 @@ type State struct {
 	// StateReason is a textual description to explain why the state has its current state.
 	StateReason string
 
+	// ResultFingerprint is a hash of labels of the result before it is processed by
+	ResultFingerprint data.Fingerprint
+
 	// Results contains the result of the current and previous evaluations.
 	Results []Evaluation
 
@@ -187,7 +191,7 @@ func NewEvaluationValues(m map[string]eval.NumberValueCapture) map[string]*float
 	return result
 }
 
-func resultNormal(state *State, _ *models.AlertRule, result eval.Result, logger log.Logger) {
+func resultNormal(state *State, _ *models.AlertRule, result eval.Result, logger log.Logger, reason string) {
 	if state.State == eval.Normal {
 		logger.Debug("Keeping state", "state", state.State)
 	} else {
@@ -202,11 +206,11 @@ func resultNormal(state *State, _ *models.AlertRule, result eval.Result, logger
 			"next_ends_at",
 			nextEndsAt)
 		// Normal states have the same start and end timestamps
-		state.SetNormal("", nextEndsAt, nextEndsAt)
+		state.SetNormal(reason, nextEndsAt, nextEndsAt)
 	}
 }
 
-func resultAlerting(state *State, rule *models.AlertRule, result eval.Result, logger log.Logger) {
+func resultAlerting(state *State, rule *models.AlertRule, result eval.Result, logger log.Logger, reason string) {
 	switch state.State {
 	case eval.Alerting:
 		prevEndsAt := state.EndsAt
@@ -231,7 +235,7 @@ func resultAlerting(state *State, rule *models.AlertRule, result eval.Result, lo
 				state.EndsAt,
 				"next_ends_at",
 				nextEndsAt)
-			state.SetAlerting("", result.EvaluatedAt, nextEndsAt)
+			state.SetAlerting(reason, result.EvaluatedAt, nextEndsAt)
 		}
 	default:
 		nextEndsAt := nextEndsTime(rule.IntervalSeconds, result.EvaluatedAt)
@@ -246,7 +250,7 @@ func resultAlerting(state *State, rule *models.AlertRule, result eval.Result, lo
 				state.EndsAt,
 				"next_ends_at",
 				nextEndsAt)
-			state.SetPending("", result.EvaluatedAt, nextEndsAt)
+			state.SetPending(reason, result.EvaluatedAt, nextEndsAt)
 		} else {
 			logger.Debug("Changing state",
 				"previous_state",
@@ -257,18 +261,20 @@ func resultAlerting(state *State, rule *models.AlertRule, result eval.Result, lo
 				state.EndsAt,
 				"next_ends_at",
 				nextEndsAt)
-			state.SetAlerting("", result.EvaluatedAt, nextEndsAt)
+			state.SetAlerting(reason, result.EvaluatedAt, nextEndsAt)
 		}
 	}
 }
+
 func resultError(state *State, rule *models.AlertRule, result eval.Result, logger log.Logger) {
+	handlerStr := "resultError"
+
 	switch rule.ExecErrState {
 	case models.AlertingErrState:
-		logger.Debug("Execution error state is Alerting", "handler", "resultAlerting", "previous_handler", "resultError")
-		resultAlerting(state, rule, result, logger)
+		logger.Debug("Execution error state is Alerting", "handler", "resultAlerting", "previous_handler", handlerStr)
+		resultAlerting(state, rule, result, logger, models.StateReasonError)
 		// This is a special case where Alerting and Pending should also have an error and reason
 		state.Error = result.Error
-		state.StateReason = models.StateReasonError
 	case models.ErrorErrState:
 		if state.State == eval.Error {
 			prevEndsAt := state.EndsAt
@@ -312,8 +318,11 @@ func resultError(state *State, rule *models.AlertRule, result eval.Result, logge
 			}
 		}
 	case models.OkErrState:
-		logger.Debug("Execution error state is Normal", "handler", "resultNormal", "previous_handler", "resultError")
-		resultNormal(state, rule, result, logger)
+		logger.Debug("Execution error state is Normal", "handler", "resultNormal", "previous_handler", handlerStr)
+		resultNormal(state, rule, result, logger, "") // TODO: Should we add a reason?
+	case models.KeepLastErrState:
+		logger := logger.New("previous_handler", handlerStr)
+		resultKeepLast(state, rule, result, logger)
 	default:
 		err := fmt.Errorf("unsupported execution error state: %s", rule.ExecErrState)
 		state.SetError(err, state.StartsAt, nextEndsTime(rule.IntervalSeconds, result.EvaluatedAt))
@@ -322,11 +331,12 @@ func resultError(state *State, rule *models.AlertRule, result eval.Result, logge
 }
 
 func resultNoData(state *State, rule *models.AlertRule, result eval.Result, logger log.Logger) {
+	handlerStr := "resultNoData"
+
 	switch rule.NoDataState {
 	case models.Alerting:
-		logger.Debug("Execution no data state is Alerting", "handler", "resultAlerting", "previous_handler", "resultNoData")
-		resultAlerting(state, rule, result, logger)
-		state.StateReason = models.StateReasonNoData
+		logger.Debug("Execution no data state is Alerting", "handler", "resultAlerting", "previous_handler", handlerStr)
+		resultAlerting(state, rule, result, logger, models.StateReasonNoData)
 	case models.NoData:
 		if state.State == eval.NoData {
 			prevEndsAt := state.EndsAt
@@ -353,9 +363,11 @@ func resultNoData(state *State, rule *models.AlertRule, result eval.Result, logg
 			state.SetNoData("", result.EvaluatedAt, nextEndsAt)
 		}
 	case models.OK:
-		logger.Debug("Execution no data state is Normal", "handler", "resultNormal", "previous_handler", "resultNoData")
-		resultNormal(state, rule, result, logger)
-		state.StateReason = models.StateReasonNoData
+		logger.Debug("Execution no data state is Normal", "handler", "resultNormal", "previous_handler", handlerStr)
+		resultNormal(state, rule, result, logger, models.StateReasonNoData)
+	case models.KeepLast:
+		logger := logger.New("previous_handler", handlerStr)
+		resultKeepLast(state, rule, result, logger)
 	default:
 		err := fmt.Errorf("unsupported no data state: %s", rule.NoDataState)
 		state.SetError(err, state.StartsAt, nextEndsTime(rule.IntervalSeconds, result.EvaluatedAt))
@@ -363,6 +375,31 @@ func resultNoData(state *State, rule *models.AlertRule, result eval.Result, logg
 	}
 }
 
+func resultKeepLast(state *State, rule *models.AlertRule, result eval.Result, logger log.Logger) {
+	reason := models.ConcatReasons(result.State.String(), models.StateReasonKeepLast)
+
+	switch state.State {
+	case eval.Alerting:
+		logger.Debug("Execution keep last state is Alerting", "handler", "resultAlerting")
+		resultAlerting(state, rule, result, logger, reason)
+	case eval.Pending:
+		// respect 'for' setting on rule
+		if result.EvaluatedAt.Sub(state.StartsAt) >= rule.For {
+			logger.Debug("Execution keep last state is Pending", "handler", "resultAlerting")
+			resultAlerting(state, rule, result, logger, reason)
+		} else {
+			logger.Debug("Ignoring set next state to pending")
+		}
+	case eval.Normal:
+		logger.Debug("Execution keep last state is Normal", "handler", "resultNormal")
+		resultNormal(state, rule, result, logger, reason)
+	default:
+		// this should not happen, add as failsafe
+		logger.Debug("Reverting invalid state to normal", "handler", "resultNormal")
+		resultNormal(state, rule, result, logger, reason)
+	}
+}
+
 func (a *State) NeedsSending(resendDelay time.Duration) bool {
 	switch a.State {
 	case eval.Pending:
@@ -479,8 +516,36 @@ func FormatStateAndReason(state eval.State, reason string) string {
 	return s
 }
 
+// ParseFormattedState parses a state string in the format "state (reason)"
+// and returns the state and reason separately.
+func ParseFormattedState(stateStr string) (eval.State, string, error) {
+	p := 0
+	// walk string until we find a space
+	for i, c := range stateStr {
+		if c == ' ' {
+			p = i
+			break
+		}
+	}
+	if p == 0 {
+		p = len(stateStr)
+	}
+
+	state, err := eval.ParseStateString(stateStr[:p])
+	if err != nil {
+		return -1, "", err
+	}
+
+	if p == len(stateStr) {
+		return state, "", nil
+	}
+
+	reason := strings.Trim(stateStr[p+1:], "()")
+	return state, reason, nil
+}
+
 // GetRuleExtraLabels returns a map of built-in labels that should be added to an alert before it is sent to the Alertmanager or its state is cached.
-func GetRuleExtraLabels(rule *models.AlertRule, folderTitle string, includeFolder bool) map[string]string {
+func GetRuleExtraLabels(l log.Logger, rule *models.AlertRule, folderTitle string, includeFolder bool) map[string]string {
 	extraLabels := make(map[string]string, 4)
 
 	extraLabels[alertingModels.NamespaceUIDLabel] = rule.NamespaceUID
@@ -490,5 +555,15 @@ func GetRuleExtraLabels(rule *models.AlertRule, folderTitle string, includeFolde
 	if includeFolder {
 		extraLabels[models.FolderTitleLabel] = folderTitle
 	}
+
+	if len(rule.NotificationSettings) > 0 {
+		// Notification settings are defined as a slice to workaround xorm behavior.
+		// Any items past the first should not exist so we ignore them.
+		if len(rule.NotificationSettings) > 1 {
+			ignored, _ := json.Marshal(rule.NotificationSettings[1:])
+			l.Error("Detected multiple notification settings, which is not supported. Only the first will be applied", "ignored_settings", string(ignored))
+		}
+		return mergeLabels(extraLabels, rule.NotificationSettings[0].ToLabels())
+	}
 	return extraLabels
 }
diff --git a/pkg/services/ngalert/state/state_test.go b/pkg/services/ngalert/state/state_test.go
index 03e72d76e31db..1684b7036c17f 100644
--- a/pkg/services/ngalert/state/state_test.go
+++ b/pkg/services/ngalert/state/state_test.go
@@ -10,9 +10,13 @@ import (
 
 	"github.com/benbjohnson/clock"
 	"github.com/golang/mock/gomock"
+	"github.com/google/uuid"
+	"github.com/grafana/alerting/models"
+	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/ngalert/eval"
 	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/screenshot"
@@ -666,3 +670,112 @@ func TestTakeImage(t *testing.T) {
 		assert.Equal(t, ngmodels.Image{Path: "foo.png"}, *image)
 	})
 }
+
+func TestParseFormattedState(t *testing.T) {
+	t.Run("should parse formatted state", func(t *testing.T) {
+		stateStr := "Normal (MissingSeries)"
+		s, reason, err := ParseFormattedState(stateStr)
+		require.NoError(t, err)
+
+		require.Equal(t, eval.Normal, s)
+		require.Equal(t, ngmodels.StateReasonMissingSeries, reason)
+	})
+
+	t.Run("should parse formatted state with concatenated reasons", func(t *testing.T) {
+		stateStr := "Normal (Error, KeepLast)"
+		s, reason, err := ParseFormattedState(stateStr)
+		require.NoError(t, err)
+
+		require.Equal(t, eval.Normal, s)
+		require.Equal(t, ngmodels.ConcatReasons(ngmodels.StateReasonError, ngmodels.StateReasonKeepLast), reason)
+	})
+
+	t.Run("should error on empty string", func(t *testing.T) {
+		stateStr := ""
+		_, _, err := ParseFormattedState(stateStr)
+		require.Error(t, err)
+	})
+
+	t.Run("should error on invalid string content", func(t *testing.T) {
+		stateStr := "NotAState"
+		_, _, err := ParseFormattedState(stateStr)
+		require.Error(t, err)
+	})
+}
+
+func TestGetRuleExtraLabels(t *testing.T) {
+	logger := log.New()
+
+	rule := ngmodels.AlertRuleGen()()
+	rule.NotificationSettings = nil
+	folderTitle := uuid.NewString()
+
+	ns := ngmodels.NotificationSettings{
+		Receiver:  "Test",
+		GroupBy:   []string{"alertname"},
+		GroupWait: util.Pointer(model.Duration(1 * time.Second)),
+	}
+
+	testCases := map[string]struct {
+		rule          *ngmodels.AlertRule
+		includeFolder bool
+		expected      map[string]string
+	}{
+		"no_folder_no_notification": {
+			rule:          ngmodels.CopyRule(rule),
+			includeFolder: false,
+			expected: map[string]string{
+				models.NamespaceUIDLabel: rule.NamespaceUID,
+				model.AlertNameLabel:     rule.Title,
+				models.RuleUIDLabel:      rule.UID,
+			},
+		},
+		"with_folder_no_notification": {
+			rule:          ngmodels.CopyRule(rule),
+			includeFolder: true,
+			expected: map[string]string{
+				models.NamespaceUIDLabel: rule.NamespaceUID,
+				model.AlertNameLabel:     rule.Title,
+				models.RuleUIDLabel:      rule.UID,
+				models.FolderTitleLabel:  folderTitle,
+			},
+		},
+		"with_notification": {
+			rule: func() *ngmodels.AlertRule {
+				r := ngmodels.CopyRule(rule)
+				r.NotificationSettings = []ngmodels.NotificationSettings{ns}
+				return r
+			}(),
+			expected: map[string]string{
+				models.NamespaceUIDLabel:                     rule.NamespaceUID,
+				model.AlertNameLabel:                         rule.Title,
+				models.RuleUIDLabel:                          rule.UID,
+				ngmodels.AutogeneratedRouteLabel:             "true",
+				ngmodels.AutogeneratedRouteReceiverNameLabel: ns.Receiver,
+				ngmodels.AutogeneratedRouteSettingsHashLabel: ns.Fingerprint().String(),
+			},
+		},
+		"ignore_multiple_notifications": {
+			rule: func() *ngmodels.AlertRule {
+				r := ngmodels.CopyRule(rule)
+				r.NotificationSettings = []ngmodels.NotificationSettings{ns, ngmodels.NotificationSettingsGen()(), ngmodels.NotificationSettingsGen()()}
+				return r
+			}(),
+			expected: map[string]string{
+				models.NamespaceUIDLabel:                     rule.NamespaceUID,
+				model.AlertNameLabel:                         rule.Title,
+				models.RuleUIDLabel:                          rule.UID,
+				ngmodels.AutogeneratedRouteLabel:             "true",
+				ngmodels.AutogeneratedRouteReceiverNameLabel: ns.Receiver,
+				ngmodels.AutogeneratedRouteSettingsHashLabel: ns.Fingerprint().String(),
+			},
+		},
+	}
+
+	for name, tc := range testCases {
+		t.Run(name, func(t *testing.T) {
+			result := GetRuleExtraLabels(logger, tc.rule, folderTitle, tc.includeFolder)
+			require.Equal(t, tc.expected, result)
+		})
+	}
+}
diff --git a/pkg/services/ngalert/state/template/funcs.go b/pkg/services/ngalert/state/template/funcs.go
index 348664610109a..29f89d7accbf0 100644
--- a/pkg/services/ngalert/state/template/funcs.go
+++ b/pkg/services/ngalert/state/template/funcs.go
@@ -5,10 +5,9 @@ import (
 	"fmt"
 	"net/url"
 	"regexp"
+	"slices"
 	"strings"
 	"text/template"
-
-	"golang.org/x/exp/slices"
 )
 
 type query struct {
diff --git a/pkg/services/ngalert/state/testing.go b/pkg/services/ngalert/state/testing.go
index 2809f0ca6e70a..07c05aa6b356d 100644
--- a/pkg/services/ngalert/state/testing.go
+++ b/pkg/services/ngalert/state/testing.go
@@ -2,6 +2,7 @@ package state
 
 import (
 	"context"
+	"slices"
 	"sync"
 
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
@@ -13,7 +14,7 @@ var _ InstanceStore = &FakeInstanceStore{}
 
 type FakeInstanceStore struct {
 	mtx         sync.Mutex
-	RecordedOps []any
+	recordedOps []any
 }
 
 type FakeInstanceStoreOp struct {
@@ -21,17 +22,23 @@ type FakeInstanceStoreOp struct {
 	Args []any
 }
 
+func (f *FakeInstanceStore) RecordedOps() []any {
+	f.mtx.Lock()
+	defer f.mtx.Unlock()
+	return slices.Clone(f.recordedOps)
+}
+
 func (f *FakeInstanceStore) ListAlertInstances(_ context.Context, q *models.ListAlertInstancesQuery) ([]*models.AlertInstance, error) {
 	f.mtx.Lock()
 	defer f.mtx.Unlock()
-	f.RecordedOps = append(f.RecordedOps, *q)
+	f.recordedOps = append(f.recordedOps, *q)
 	return nil, nil
 }
 
 func (f *FakeInstanceStore) SaveAlertInstance(_ context.Context, q models.AlertInstance) error {
 	f.mtx.Lock()
 	defer f.mtx.Unlock()
-	f.RecordedOps = append(f.RecordedOps, q)
+	f.recordedOps = append(f.recordedOps, q)
 	return nil
 }
 
@@ -40,7 +47,7 @@ func (f *FakeInstanceStore) FetchOrgIds(_ context.Context) ([]int64, error) { re
 func (f *FakeInstanceStore) DeleteAlertInstances(ctx context.Context, q ...models.AlertInstanceKey) error {
 	f.mtx.Lock()
 	defer f.mtx.Unlock()
-	f.RecordedOps = append(f.RecordedOps, FakeInstanceStoreOp{
+	f.recordedOps = append(f.recordedOps, FakeInstanceStoreOp{
 		Name: "DeleteAlertInstances", Args: []any{
 			ctx,
 			q,
@@ -53,6 +60,16 @@ func (f *FakeInstanceStore) DeleteAlertInstancesByRule(ctx context.Context, key
 	return nil
 }
 
+func (f *FakeInstanceStore) FullSync(ctx context.Context, instances []models.AlertInstance) error {
+	f.mtx.Lock()
+	defer f.mtx.Unlock()
+	f.recordedOps = []any{}
+	for _, instance := range instances {
+		f.recordedOps = append(f.recordedOps, instance)
+	}
+	return nil
+}
+
 type FakeRuleReader struct{}
 
 func (f *FakeRuleReader) ListAlertRules(_ context.Context, q *models.ListAlertRulesQuery) (models.RulesGroup, error) {
diff --git a/pkg/services/ngalert/store/alert_rule.go b/pkg/services/ngalert/store/alert_rule.go
index a88d5258619ab..2570657ea01eb 100644
--- a/pkg/services/ngalert/store/alert_rule.go
+++ b/pkg/services/ngalert/store/alert_rule.go
@@ -2,23 +2,28 @@ package store
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"strings"
 
 	"github.com/google/uuid"
+	"golang.org/x/exp/maps"
+	"golang.org/x/exp/slices"
 
 	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/folder"
 	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
-	"github.com/grafana/grafana/pkg/services/search/model"
+	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
-	"github.com/grafana/grafana/pkg/services/sqlstore/searchstore"
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 	"github.com/grafana/grafana/pkg/services/store/entity"
-	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/util"
+	"xorm.io/xorm"
 )
 
 // AlertRuleMaxTitleLength is the maximum length of the alert rule title
@@ -28,8 +33,7 @@ const AlertRuleMaxTitleLength = 190
 const AlertRuleMaxRuleGroupNameLength = 190
 
 var (
-	ErrAlertRuleGroupNotFound = errors.New("rulegroup not found")
-	ErrOptimisticLock         = errors.New("version conflict while updating a record in the database with optimistic locking")
+	ErrOptimisticLock = errors.New("version conflict while updating a record in the database with optimistic locking")
 )
 
 func getAlertRuleByUID(sess *db.Session, alertRuleUID string, orgID int64) (*ngmodels.AlertRule, error) {
@@ -71,8 +75,8 @@ func (st DBstore) DeleteAlertRulesByUID(ctx context.Context, orgID int64, ruleUI
 }
 
 // IncreaseVersionForAllRulesInNamespace Increases version for all rules that have specified namespace. Returns all rules that belong to the namespace
-func (st DBstore) IncreaseVersionForAllRulesInNamespace(ctx context.Context, orgID int64, namespaceUID string) ([]ngmodels.AlertRuleKeyWithVersionAndPauseStatus, error) {
-	var keys []ngmodels.AlertRuleKeyWithVersionAndPauseStatus
+func (st DBstore) IncreaseVersionForAllRulesInNamespace(ctx context.Context, orgID int64, namespaceUID string) ([]ngmodels.AlertRuleKeyWithVersion, error) {
+	var keys []ngmodels.AlertRuleKeyWithVersion
 	err := st.SQLStore.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
 		now := TimeNow()
 		_, err := sess.Exec("UPDATE alert_rule SET version = version + 1, updated = ? WHERE namespace_uid = ? AND org_id = ?", now, namespaceUID, orgID)
@@ -140,22 +144,23 @@ func (st DBstore) InsertAlertRules(ctx context.Context, rules []ngmodels.AlertRu
 			}
 			newRules = append(newRules, r)
 			ruleVersions = append(ruleVersions, ngmodels.AlertRuleVersion{
-				RuleUID:          r.UID,
-				RuleOrgID:        r.OrgID,
-				RuleNamespaceUID: r.NamespaceUID,
-				RuleGroup:        r.RuleGroup,
-				ParentVersion:    0,
-				Version:          r.Version,
-				Created:          r.Updated,
-				Condition:        r.Condition,
-				Title:            r.Title,
-				Data:             r.Data,
-				IntervalSeconds:  r.IntervalSeconds,
-				NoDataState:      r.NoDataState,
-				ExecErrState:     r.ExecErrState,
-				For:              r.For,
-				Annotations:      r.Annotations,
-				Labels:           r.Labels,
+				RuleUID:              r.UID,
+				RuleOrgID:            r.OrgID,
+				RuleNamespaceUID:     r.NamespaceUID,
+				RuleGroup:            r.RuleGroup,
+				ParentVersion:        0,
+				Version:              r.Version,
+				Created:              r.Updated,
+				Condition:            r.Condition,
+				Title:                r.Title,
+				Data:                 r.Data,
+				IntervalSeconds:      r.IntervalSeconds,
+				NoDataState:          r.NoDataState,
+				ExecErrState:         r.ExecErrState,
+				For:                  r.For,
+				Annotations:          r.Annotations,
+				Labels:               r.Labels,
+				NotificationSettings: r.NotificationSettings,
 			})
 		}
 		if len(newRules) > 0 {
@@ -164,7 +169,7 @@ func (st DBstore) InsertAlertRules(ctx context.Context, rules []ngmodels.AlertRu
 			for i := range newRules {
 				if _, err := sess.Insert(&newRules[i]); err != nil {
 					if st.SQLStore.GetDialect().IsUniqueConstraintViolation(err) {
-						return ngmodels.ErrAlertRuleUniqueConstraintViolation
+						return ngmodels.ErrAlertRuleConflict(newRules[i], ngmodels.ErrAlertRuleUniqueConstraintViolation)
 					}
 					return fmt.Errorf("failed to create new rules: %w", err)
 				}
@@ -193,7 +198,10 @@ func (st DBstore) UpdateAlertRules(ctx context.Context, rules []ngmodels.UpdateR
 		}
 
 		ruleVersions := make([]ngmodels.AlertRuleVersion, 0, len(rules))
-		for _, r := range rules {
+		for i := range rules {
+			// We do indexed access way to avoid "G601: Implicit memory aliasing in for loop."
+			// Doing this will be unnecessary with go 1.22 https://stackoverflow.com/a/68247837/767660
+			r := rules[i]
 			var parentVersion int64
 			r.New.ID = r.Existing.ID
 			r.New.Version = r.Existing.Version // xorm will take care of increasing it (see https://xorm.io/docs/chapter-06/1.lock/)
@@ -207,7 +215,7 @@ func (st DBstore) UpdateAlertRules(ctx context.Context, rules []ngmodels.UpdateR
 			if updated, err := sess.ID(r.Existing.ID).AllCols().Update(r.New); err != nil || updated == 0 {
 				if err != nil {
 					if st.SQLStore.GetDialect().IsUniqueConstraintViolation(err) {
-						return ngmodels.ErrAlertRuleUniqueConstraintViolation
+						return ngmodels.ErrAlertRuleConflict(r.New, ngmodels.ErrAlertRuleUniqueConstraintViolation)
 					}
 					return fmt.Errorf("failed to update rule [%s] %s: %w", r.New.UID, r.New.Title, err)
 				}
@@ -215,23 +223,24 @@ func (st DBstore) UpdateAlertRules(ctx context.Context, rules []ngmodels.UpdateR
 			}
 			parentVersion = r.Existing.Version
 			ruleVersions = append(ruleVersions, ngmodels.AlertRuleVersion{
-				RuleOrgID:        r.New.OrgID,
-				RuleUID:          r.New.UID,
-				RuleNamespaceUID: r.New.NamespaceUID,
-				RuleGroup:        r.New.RuleGroup,
-				RuleGroupIndex:   r.New.RuleGroupIndex,
-				ParentVersion:    parentVersion,
-				Version:          r.New.Version + 1,
-				Created:          r.New.Updated,
-				Condition:        r.New.Condition,
-				Title:            r.New.Title,
-				Data:             r.New.Data,
-				IntervalSeconds:  r.New.IntervalSeconds,
-				NoDataState:      r.New.NoDataState,
-				ExecErrState:     r.New.ExecErrState,
-				For:              r.New.For,
-				Annotations:      r.New.Annotations,
-				Labels:           r.New.Labels,
+				RuleOrgID:            r.New.OrgID,
+				RuleUID:              r.New.UID,
+				RuleNamespaceUID:     r.New.NamespaceUID,
+				RuleGroup:            r.New.RuleGroup,
+				RuleGroupIndex:       r.New.RuleGroupIndex,
+				ParentVersion:        parentVersion,
+				Version:              r.New.Version + 1,
+				Created:              r.New.Updated,
+				Condition:            r.New.Condition,
+				Title:                r.New.Title,
+				Data:                 r.New.Data,
+				IntervalSeconds:      r.New.IntervalSeconds,
+				NoDataState:          r.New.NoDataState,
+				ExecErrState:         r.New.ExecErrState,
+				For:                  r.New.For,
+				Annotations:          r.New.Annotations,
+				Labels:               r.New.Labels,
+				NotificationSettings: r.New.NotificationSettings,
 			})
 		}
 		if len(ruleVersions) > 0 {
@@ -316,11 +325,18 @@ func newTitlesOverlapExisting(rules []ngmodels.UpdateRule) bool {
 
 // CountInFolder is a handler for retrieving the number of alert rules of
 // specific organisation associated with a given namespace (parent folder).
-func (st DBstore) CountInFolder(ctx context.Context, orgID int64, folderUID string, u identity.Requester) (int64, error) {
+func (st DBstore) CountInFolders(ctx context.Context, orgID int64, folderUIDs []string, u identity.Requester) (int64, error) {
+	if len(folderUIDs) == 0 {
+		return 0, nil
+	}
 	var count int64
 	var err error
 	err = st.SQLStore.WithDbSession(ctx, func(sess *db.Session) error {
-		q := sess.Table("alert_rule").Where("org_id = ?", orgID).Where("namespace_uid = ?", folderUID)
+		args := make([]any, 0, len(folderUIDs))
+		for _, folderUID := range folderUIDs {
+			args = append(args, folderUID)
+		}
+		q := sess.Table("alert_rule").Where("org_id = ?", orgID).Where(fmt.Sprintf("namespace_uid IN (%s)", strings.Repeat("?,", len(folderUIDs)-1)+"?"), args...)
 		count, err = q.Count()
 		return err
 	})
@@ -357,6 +373,13 @@ func (st DBstore) ListAlertRules(ctx context.Context, query *ngmodels.ListAlertR
 			q = q.Where("rule_group = ?", query.RuleGroup)
 		}
 
+		if query.ReceiverName != "" {
+			q, err = st.filterByReceiverName(query.ReceiverName, q)
+			if err != nil {
+				return err
+			}
+		}
+
 		q = q.Asc("namespace_uid", "rule_group", "rule_group_idx", "id")
 
 		alertRules := make([]*ngmodels.AlertRule, 0)
@@ -377,6 +400,13 @@ func (st DBstore) ListAlertRules(ctx context.Context, query *ngmodels.ListAlertR
 				st.Logger.Error("Invalid rule found in DB store, ignoring it", "func", "ListAlertRules", "error", err)
 				continue
 			}
+			if query.ReceiverName != "" { // remove false-positive hits from the result
+				if !slices.ContainsFunc(rule.NotificationSettings, func(settings ngmodels.NotificationSettings) bool {
+					return settings.Receiver == query.ReceiverName
+				}) {
+					continue
+				}
+			}
 			alertRules = append(alertRules, rule)
 		}
 
@@ -418,75 +448,41 @@ func (st DBstore) GetRuleGroupInterval(ctx context.Context, orgID int64, namespa
 			ngmodels.AlertRule{OrgID: orgID, RuleGroup: ruleGroup, NamespaceUID: namespaceUID},
 		)
 		if len(ruleGroups) == 0 {
-			return ErrAlertRuleGroupNotFound
+			return ngmodels.ErrAlertRuleGroupNotFound.Errorf("")
 		}
 		interval = ruleGroups[0].IntervalSeconds
 		return err
 	})
 }
 
-// GetUserVisibleNamespaces returns the folders that are visible to the user and have at least one alert in it
-func (st DBstore) GetUserVisibleNamespaces(ctx context.Context, orgID int64, user *user.SignedInUser) (map[string]*folder.Folder, error) {
-	namespaceMap := make(map[string]*folder.Folder)
-
-	searchQuery := dashboards.FindPersistedDashboardsQuery{
-		OrgId:        orgID,
+// GetUserVisibleNamespaces returns the folders that are visible to the user
+func (st DBstore) GetUserVisibleNamespaces(ctx context.Context, orgID int64, user identity.Requester) (map[string]*folder.Folder, error) {
+	folders, err := st.FolderService.GetFolders(ctx, folder.GetFoldersQuery{
+		OrgID:        orgID,
+		WithFullpath: true,
 		SignedInUser: user,
-		Type:         searchstore.TypeAlertFolder,
-		Limit:        -1,
-		Permission:   dashboards.PERMISSION_VIEW,
-		Sort:         model.SortOption{},
-		Filters: []any{
-			searchstore.FolderWithAlertsFilter{},
-		},
-	}
-
-	var page int64 = 1
-	for {
-		query := searchQuery
-		query.Page = page
-		proj, err := st.DashboardService.FindDashboards(ctx, &query)
-		if err != nil {
-			return nil, err
-		}
-
-		if len(proj) == 0 {
-			break
-		}
-
-		for _, hit := range proj {
-			if !hit.IsFolder {
-				continue
-			}
-			namespaceMap[hit.UID] = &folder.Folder{
-				ID:    hit.ID,
-				UID:   hit.UID,
-				Title: hit.Title,
-			}
-		}
-		page += 1
-	}
-	return namespaceMap, nil
-}
-
-// GetNamespaceByTitle is a handler for retrieving a namespace by its title. Alerting rules follow a Grafana folder-like structure which we call namespaces.
-func (st DBstore) GetNamespaceByTitle(ctx context.Context, namespace string, orgID int64, user *user.SignedInUser) (*folder.Folder, error) {
-	folder, err := st.FolderService.Get(ctx, &folder.GetFolderQuery{OrgID: orgID, Title: &namespace, SignedInUser: user})
+	})
 	if err != nil {
 		return nil, err
 	}
 
-	return folder, nil
+	namespaceMap := make(map[string]*folder.Folder)
+	for _, f := range folders {
+		namespaceMap[f.UID] = f
+	}
+	return namespaceMap, nil
 }
 
 // GetNamespaceByUID is a handler for retrieving a namespace by its UID. Alerting rules follow a Grafana folder-like structure which we call namespaces.
-func (st DBstore) GetNamespaceByUID(ctx context.Context, uid string, orgID int64, user *user.SignedInUser) (*folder.Folder, error) {
-	folder, err := st.FolderService.Get(ctx, &folder.GetFolderQuery{OrgID: orgID, UID: &uid, SignedInUser: user})
+func (st DBstore) GetNamespaceByUID(ctx context.Context, uid string, orgID int64, user identity.Requester) (*folder.Folder, error) {
+	f, err := st.FolderService.GetFolders(ctx, folder.GetFoldersQuery{OrgID: orgID, UIDs: []string{uid}, WithFullpath: true, SignedInUser: user})
 	if err != nil {
 		return nil, err
 	}
-
-	return folder, nil
+	if len(f) == 0 {
+		return nil, dashboards.ErrFolderAccessDenied
+	}
+	return f[0], nil
 }
 
 func (st DBstore) GetAlertRulesKeysForScheduling(ctx context.Context) ([]ngmodels.AlertRuleKeyWithVersion, error) {
@@ -514,10 +510,6 @@ func (st DBstore) GetAlertRulesKeysForScheduling(ctx context.Context) ([]ngmodel
 
 // GetAlertRulesForScheduling returns a short version of all alert rules except those that belong to an excluded list of organizations
 func (st DBstore) GetAlertRulesForScheduling(ctx context.Context, query *ngmodels.GetAlertRulesForSchedulingQuery) error {
-	var folders []struct {
-		Uid   string
-		Title string
-	}
 	var rules []*ngmodels.AlertRule
 	return st.SQLStore.WithDbSession(ctx, func(sess *db.Session) error {
 		var disabledOrgs []int64
@@ -552,14 +544,10 @@ func (st DBstore) GetAlertRulesForScheduling(ctx context.Context, query *ngmodel
 				st.Logger.Error("Invalid rule found in DB store, ignoring it", "func", "GetAlertRulesForScheduling", "error", err)
 				continue
 			}
-			// This was added to mitigate the high load that could be created by loki range queries.
-			// In previous versions of Grafana, Loki datasources would default to range queries
-			// instead of instant queries, sometimes creating unnecessary load. This is only
-			// done for Grafana Cloud.
-			if optimizations, migratable := canBeInstant(rule); migratable {
-				if err := migrateToInstant(rule, optimizations); err != nil {
+			if st.FeatureToggles.IsEnabled(ctx, featuremgmt.FlagAlertingQueryOptimization) {
+				if optimizations, err := OptimizeAlertQueries(rule.Data); err != nil {
 					st.Logger.Error("Could not migrate rule from range to instant query", "rule", rule.UID, "err", err)
-				} else {
+				} else if len(optimizations) > 0 {
 					st.Logger.Info("Migrated rule from range to instant query", "rule", rule.UID, "migrated_queries", len(optimizations))
 				}
 			}
@@ -569,19 +557,36 @@ func (st DBstore) GetAlertRulesForScheduling(ctx context.Context, query *ngmodel
 		query.ResultRules = rules
 
 		if query.PopulateFolders {
-			foldersSql := sess.Table("dashboard").Alias("d").Select("d.uid, d.title").
-				Where("is_folder = ?", st.SQLStore.GetDialect().BooleanStr(true)).
-				And(`EXISTS (SELECT 1 FROM alert_rule a WHERE d.uid = a.namespace_uid)`)
-			if len(disabledOrgs) > 0 {
-				foldersSql.NotIn("org_id", disabledOrgs)
-			}
-
-			if err := foldersSql.Find(&folders); err != nil {
-				return fmt.Errorf("failed to fetch a list of folders that contain alert rules: %w", err)
+			query.ResultFoldersTitles = map[ngmodels.FolderKey]string{}
+			uids := map[int64]map[string]struct{}{}
+			for _, r := range rules {
+				om, ok := uids[r.OrgID]
+				if !ok {
+					om = make(map[string]struct{})
+					uids[r.OrgID] = om
+				}
+				om[r.NamespaceUID] = struct{}{}
 			}
-			query.ResultFoldersTitles = make(map[string]string, len(folders))
-			for _, folder := range folders {
-				query.ResultFoldersTitles[folder.Uid] = folder.Title
+			for orgID, uids := range uids {
+				schedulerUser := accesscontrol.BackgroundUser("grafana_scheduler", orgID, org.RoleAdmin,
+					[]accesscontrol.Permission{
+						{
+							Action: dashboards.ActionFoldersRead, Scope: dashboards.ScopeFoldersAll,
+						},
+					})
+
+				folders, err := st.FolderService.GetFolders(ctx, folder.GetFoldersQuery{
+					OrgID:        orgID,
+					UIDs:         maps.Keys(uids),
+					WithFullpath: true,
+					SignedInUser: schedulerUser,
+				})
+				if err != nil {
+					return fmt.Errorf("failed to fetch a list of folders that contain alert rules: %w", err)
+				}
+				for _, f := range folders {
+					query.ResultFoldersTitles[ngmodels.FolderKey{OrgID: f.OrgID, UID: f.UID}] = f.Fullpath
+				}
 			}
 		}
 		return nil
@@ -589,24 +594,37 @@ func (st DBstore) GetAlertRulesForScheduling(ctx context.Context, query *ngmodel
 }
 
 // DeleteInFolder deletes the rules contained in a given folder along with their associated data.
-func (st DBstore) DeleteInFolder(ctx context.Context, orgID int64, folderUID string, user identity.Requester) error {
-	rules, err := st.ListAlertRules(ctx, &ngmodels.ListAlertRulesQuery{
-		OrgID:         orgID,
-		NamespaceUIDs: []string{folderUID},
-	})
-	if err != nil {
-		return err
-	}
+func (st DBstore) DeleteInFolders(ctx context.Context, orgID int64, folderUIDs []string, user identity.Requester) error {
+	for _, folderUID := range folderUIDs {
+		evaluator := accesscontrol.EvalPermission(accesscontrol.ActionAlertingRuleDelete, dashboards.ScopeFoldersProvider.GetResourceScopeUID(folderUID))
+		canSave, err := st.AccessControl.Evaluate(ctx, user, evaluator)
+		if err != nil {
+			st.Logger.Error("Failed to evaluate access control", "error", err)
+			return err
+		}
+		if !canSave {
+			st.Logger.Error("user is not allowed to delete alert rules in folder", "folder", folderUID, "user")
+			return dashboards.ErrFolderAccessDenied
+		}
 
-	uids := make([]string, 0, len(rules))
-	for _, tgt := range rules {
-		if tgt != nil {
-			uids = append(uids, tgt.UID)
+		rules, err := st.ListAlertRules(ctx, &ngmodels.ListAlertRulesQuery{
+			OrgID:         orgID,
+			NamespaceUIDs: []string{folderUID},
+		})
+		if err != nil {
+			return err
 		}
-	}
 
-	if err := st.DeleteAlertRulesByUID(ctx, orgID, uids...); err != nil {
-		return err
+		uids := make([]string, 0, len(rules))
+		for _, tgt := range rules {
+			if tgt != nil {
+				uids = append(uids, tgt.UID)
+			}
+		}
+
+		if err := st.DeleteAlertRulesByUID(ctx, orgID, uids...); err != nil {
+			return err
+		}
 	}
 	return nil
 }
@@ -634,48 +652,109 @@ var GenerateNewAlertRuleUID = func(sess *db.Session, orgID int64, ruleTitle stri
 	return "", ngmodels.ErrAlertRuleFailedGenerateUniqueUID
 }
 
-// validateAlertRule validates the alert rule interval and organisation.
+// validateAlertRule validates the alert rule including db-level restrictions on field lengths.
 func (st DBstore) validateAlertRule(alertRule ngmodels.AlertRule) error {
-	if len(alertRule.Data) == 0 {
-		return fmt.Errorf("%w: no queries or expressions are found", ngmodels.ErrAlertRuleFailedValidation)
-	}
-
-	if alertRule.Title == "" {
-		return fmt.Errorf("%w: title is empty", ngmodels.ErrAlertRuleFailedValidation)
-	}
-
-	if err := ngmodels.ValidateRuleGroupInterval(alertRule.IntervalSeconds, int64(st.Cfg.BaseInterval.Seconds())); err != nil {
+	if err := alertRule.ValidateAlertRule(st.Cfg); err != nil {
 		return err
 	}
 
-	// enfore max name length in SQLite
+	// enforce max name length.
 	if len(alertRule.Title) > AlertRuleMaxTitleLength {
 		return fmt.Errorf("%w: name length should not be greater than %d", ngmodels.ErrAlertRuleFailedValidation, AlertRuleMaxTitleLength)
 	}
 
-	// enfore max rule group name length in SQLite
+	// enforce max rule group name length.
 	if len(alertRule.RuleGroup) > AlertRuleMaxRuleGroupNameLength {
 		return fmt.Errorf("%w: rule group name length should not be greater than %d", ngmodels.ErrAlertRuleFailedValidation, AlertRuleMaxRuleGroupNameLength)
 	}
 
-	if alertRule.OrgID == 0 {
-		return fmt.Errorf("%w: no organisation is found", ngmodels.ErrAlertRuleFailedValidation)
-	}
+	return nil
+}
 
-	if alertRule.DashboardUID == nil && alertRule.PanelID != nil {
-		return fmt.Errorf("%w: cannot have Panel ID without a Dashboard UID", ngmodels.ErrAlertRuleFailedValidation)
+// ListNotificationSettings fetches all notification settings for given organization
+func (st DBstore) ListNotificationSettings(ctx context.Context, q ngmodels.ListNotificationSettingsQuery) (map[ngmodels.AlertRuleKey][]ngmodels.NotificationSettings, error) {
+	var rules []ngmodels.AlertRule
+	err := st.SQLStore.WithDbSession(ctx, func(sess *db.Session) error {
+		query := sess.Table(ngmodels.AlertRule{}).Select("uid, notification_settings").Where("org_id = ?", q.OrgID)
+		if q.ReceiverName != "" {
+			var err error
+			query, err = st.filterByReceiverName(q.ReceiverName, query)
+			if err != nil {
+				return err
+			}
+		} else {
+			query = query.And("notification_settings IS NOT NULL AND notification_settings <> 'null'")
+		}
+		return query.Find(&rules)
+	})
+	if err != nil {
+		return nil, err
 	}
-
-	if _, err := ngmodels.ErrStateFromString(string(alertRule.ExecErrState)); err != nil {
-		return err
+	result := make(map[ngmodels.AlertRuleKey][]ngmodels.NotificationSettings, len(rules))
+	for _, rule := range rules {
+		var ns []ngmodels.NotificationSettings
+		if q.ReceiverName != "" { // if filter by receiver name is specified, perform fine filtering on client to avoid false-positives
+			for _, setting := range rule.NotificationSettings {
+				if q.ReceiverName == setting.Receiver { // currently, there can be only one setting. If in future there are more, we will return all settings of a rule that has a setting with receiver
+					ns = rule.NotificationSettings
+					break
+				}
+			}
+		} else {
+			ns = rule.NotificationSettings
+		}
+		if len(ns) > 0 {
+			key := ngmodels.AlertRuleKey{
+				OrgID: q.OrgID,
+				UID:   rule.UID,
+			}
+			result[key] = rule.NotificationSettings
+		}
 	}
+	return result, nil
+}
 
-	if _, err := ngmodels.NoDataStateFromString(string(alertRule.NoDataState)); err != nil {
-		return err
+func (st DBstore) filterByReceiverName(receiver string, sess *xorm.Session) (*xorm.Session, error) {
+	if receiver == "" {
+		return sess, nil
 	}
+	// marshall string according to JSON rules so we follow escaping rules.
+	b, err := json.Marshal(receiver)
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshall receiver name query: %w", err)
+	}
+	var search = string(b)
+	if st.SQLStore.GetDialect().DriverName() != migrator.SQLite {
+		// this escapes escaped double quote (\") to \\\"
+		search = strings.ReplaceAll(strings.ReplaceAll(search, `\`, `\\`), `"`, `\"`)
+	}
+	return sess.And(fmt.Sprintf("notification_settings %s ?", st.SQLStore.GetDialect().LikeStr()), "%"+search+"%"), nil
+}
 
-	if alertRule.For < 0 {
-		return fmt.Errorf("%w: field `for` cannot be negative", ngmodels.ErrAlertRuleFailedValidation)
+func (st DBstore) RenameReceiverInNotificationSettings(ctx context.Context, orgID int64, oldReceiver, newReceiver string) (int, error) {
+	// fetch entire rules because Update method requires it because it copies rules to version table
+	rules, err := st.ListAlertRules(ctx, &ngmodels.ListAlertRulesQuery{
+		OrgID:        orgID,
+		ReceiverName: oldReceiver,
+	})
+	if err != nil {
+		return 0, err
 	}
-	return nil
+	if len(rules) == 0 {
+		return 0, nil
+	}
+	var updates []ngmodels.UpdateRule
+	for _, rule := range rules {
+		r := ngmodels.CopyRule(rule)
+		for idx := range r.NotificationSettings {
+			if r.NotificationSettings[idx].Receiver == oldReceiver {
+				r.NotificationSettings[idx].Receiver = newReceiver
+			}
+		}
+		updates = append(updates, ngmodels.UpdateRule{
+			Existing: rule,
+			New:      *r,
+		})
+	}
+	return len(updates), st.UpdateAlertRules(ctx, updates)
 }
diff --git a/pkg/services/ngalert/store/alert_rule_test.go b/pkg/services/ngalert/store/alert_rule_test.go
index b53f112fa83f2..ca0e0765b9237 100644
--- a/pkg/services/ngalert/store/alert_rule_test.go
+++ b/pkg/services/ngalert/store/alert_rule_test.go
@@ -5,15 +5,20 @@ import (
 	"errors"
 	"fmt"
 	"strings"
+	"sync"
 	"testing"
 	"time"
 
 	"github.com/google/uuid"
+	"github.com/stretchr/testify/assert"
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/log/logtest"
 	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/folder/folderimpl"
@@ -26,6 +31,7 @@ import (
 	"golang.org/x/exp/rand"
 
 	"github.com/grafana/grafana/pkg/infra/db"
+	acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
@@ -41,7 +47,7 @@ func TestIntegrationUpdateAlertRules(t *testing.T) {
 	store := &DBstore{
 		SQLStore:      sqlStore,
 		Cfg:           cfg.UnifiedAlerting,
-		FolderService: setupFolderService(t, sqlStore, cfg),
+		FolderService: setupFolderService(t, sqlStore, cfg, featuremgmt.WithFeatures()),
 		Logger:        &logtest.Fake{},
 	}
 	generator := models.AlertRuleGen(withIntervalMatching(store.Cfg.BaseInterval), models.WithUniqueID())
@@ -95,7 +101,7 @@ func TestIntegrationUpdateAlertRulesWithUniqueConstraintViolation(t *testing.T)
 	store := &DBstore{
 		SQLStore:      sqlStore,
 		Cfg:           cfg.UnifiedAlerting,
-		FolderService: setupFolderService(t, sqlStore, cfg),
+		FolderService: setupFolderService(t, sqlStore, cfg, featuremgmt.WithFeatures()),
 		Logger:        &logtest.Fake{},
 	}
 
@@ -313,6 +319,28 @@ func TestIntegrationUpdateAlertRulesWithUniqueConstraintViolation(t *testing.T)
 		require.Equal(t, newRule3.Title, dbrule3.Title)
 		require.Equal(t, newRule4.Title, dbrule4.Title)
 	})
+
+	t.Run("should fail with unique constraint violation", func(t *testing.T) {
+		rule1 := createRuleInFolder("unique-rule1", 1, "my-namespace")
+		rule2 := createRuleInFolder("unique-rule2", 1, "my-namespace")
+
+		newRule1 := models.CopyRule(rule1)
+		newRule2 := models.CopyRule(rule2)
+		newRule2.Title = newRule1.Title
+
+		err := store.UpdateAlertRules(context.Background(), []models.UpdateRule{{
+			Existing: rule2,
+			New:      *newRule2,
+		},
+		})
+		require.ErrorIs(t, err, models.ErrAlertRuleUniqueConstraintViolation)
+		require.NotEqual(t, newRule2.UID, "")
+		require.NotEqual(t, newRule2.Title, "")
+		require.NotEqual(t, newRule2.NamespaceUID, "")
+		require.ErrorContains(t, err, newRule2.UID)
+		require.ErrorContains(t, err, newRule2.Title)
+		require.ErrorContains(t, err, newRule2.NamespaceUID)
+	})
 }
 
 func TestIntegration_GetAlertRulesForScheduling(t *testing.T) {
@@ -329,22 +357,31 @@ func TestIntegration_GetAlertRulesForScheduling(t *testing.T) {
 	store := &DBstore{
 		SQLStore:       sqlStore,
 		Cfg:            cfg.UnifiedAlerting,
-		FolderService:  setupFolderService(t, sqlStore, cfg),
+		FolderService:  setupFolderService(t, sqlStore, cfg, featuremgmt.WithFeatures()),
 		FeatureToggles: featuremgmt.WithFeatures(),
 	}
 
 	generator := models.AlertRuleGen(withIntervalMatching(store.Cfg.BaseInterval), models.WithUniqueID(), models.WithUniqueOrgID())
 	rule1 := createRule(t, store, generator)
 	rule2 := createRule(t, store, generator)
-	createFolder(t, store, rule1.NamespaceUID, rule1.Title, rule1.OrgID)
-	createFolder(t, store, rule2.NamespaceUID, rule2.Title, rule2.OrgID)
+
+	parentFolderUid := uuid.NewString()
+	parentFolderTitle := "Very Parent Folder"
+	createFolder(t, store, parentFolderUid, parentFolderTitle, rule1.OrgID, "")
+	rule1FolderTitle := "folder-" + rule1.Title
+	rule2FolderTitle := "folder-" + rule2.Title
+	createFolder(t, store, rule1.NamespaceUID, rule1FolderTitle, rule1.OrgID, parentFolderUid)
+	createFolder(t, store, rule2.NamespaceUID, rule2FolderTitle, rule2.OrgID, "")
+
+	createFolder(t, store, rule2.NamespaceUID, "same UID folder", generator().OrgID, "") // create a folder with the same UID but in the different org
 
 	tc := []struct {
 		name         string
 		rules        []string
 		ruleGroups   []string
 		disabledOrgs []int64
-		folders      map[string]string
+		folders      map[models.FolderKey]string
+		flags        []string
 	}{
 		{
 			name:  "without a rule group filter, it returns all created rules",
@@ -363,13 +400,13 @@ func TestIntegration_GetAlertRulesForScheduling(t *testing.T) {
 		{
 			name:    "with populate folders enabled, it returns them",
 			rules:   []string{rule1.Title, rule2.Title},
-			folders: map[string]string{rule1.NamespaceUID: rule1.Title, rule2.NamespaceUID: rule2.Title},
+			folders: map[models.FolderKey]string{rule1.GetFolderKey(): rule1FolderTitle, rule2.GetFolderKey(): rule2FolderTitle},
 		},
 		{
 			name:         "with populate folders enabled and a filter on orgs, it only returns selected information",
 			rules:        []string{rule1.Title},
 			disabledOrgs: []int64{rule2.OrgID},
-			folders:      map[string]string{rule1.NamespaceUID: rule1.Title},
+			folders:      map[models.FolderKey]string{rule1.GetFolderKey(): rule1FolderTitle},
 		},
 	}
 
@@ -406,6 +443,20 @@ func TestIntegration_GetAlertRulesForScheduling(t *testing.T) {
 			}
 		})
 	}
+
+	t.Run("when nested folders are enabled folders should contain full path", func(t *testing.T) {
+		store.FolderService = setupFolderService(t, sqlStore, cfg, featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders))
+		query := &models.GetAlertRulesForSchedulingQuery{
+			PopulateFolders: true,
+		}
+		require.NoError(t, store.GetAlertRulesForScheduling(context.Background(), query))
+
+		expected := map[models.FolderKey]string{
+			rule1.GetFolderKey(): parentFolderTitle + "/" + rule1FolderTitle,
+			rule2.GetFolderKey(): rule2FolderTitle,
+		}
+		require.Equal(t, expected, query.ResultFoldersTitles)
+	})
 }
 
 func withIntervalMatching(baseInterval time.Duration) func(*models.AlertRule) {
@@ -422,7 +473,7 @@ func TestIntegration_CountAlertRules(t *testing.T) {
 
 	sqlStore := db.InitTestDB(t)
 	cfg := setting.NewCfg()
-	store := &DBstore{SQLStore: sqlStore, FolderService: setupFolderService(t, sqlStore, cfg)}
+	store := &DBstore{SQLStore: sqlStore, FolderService: setupFolderService(t, sqlStore, cfg, featuremgmt.WithFeatures())}
 	rule := createRule(t, store, nil)
 
 	tests := map[string]struct {
@@ -450,8 +501,8 @@ func TestIntegration_CountAlertRules(t *testing.T) {
 
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
-			count, err := store.CountInFolder(context.Background(),
-				test.query.OrgID, test.query.NamespaceUID, nil)
+			count, err := store.CountInFolders(context.Background(),
+				test.query.OrgID, []string{test.query.NamespaceUID}, nil)
 			if test.expectErr {
 				require.Error(t, err)
 			} else {
@@ -471,17 +522,28 @@ func TestIntegration_DeleteInFolder(t *testing.T) {
 	cfg := setting.NewCfg()
 	store := &DBstore{
 		SQLStore:      sqlStore,
-		FolderService: setupFolderService(t, sqlStore, cfg),
+		FolderService: setupFolderService(t, sqlStore, cfg, featuremgmt.WithFeatures()),
 		Logger:        log.New("test-dbstore"),
 	}
 	rule := createRule(t, store, nil)
 
-	err := store.DeleteInFolder(context.Background(), rule.OrgID, rule.NamespaceUID, nil)
-	require.NoError(t, err)
+	t.Run("should not be able to delete folder without permissions to delete rules", func(t *testing.T) {
+		store.AccessControl = acmock.New()
+		err := store.DeleteInFolders(context.Background(), rule.OrgID, []string{rule.NamespaceUID}, &user.SignedInUser{})
+		require.ErrorIs(t, err, dashboards.ErrFolderAccessDenied)
+	})
 
-	c, err := store.CountInFolder(context.Background(), rule.OrgID, rule.NamespaceUID, nil)
-	require.NoError(t, err)
-	require.Equal(t, int64(0), c)
+	t.Run("should be able to delete folder with permissions to delete rules", func(t *testing.T) {
+		store.AccessControl = acmock.New().WithPermissions([]accesscontrol.Permission{
+			{Action: accesscontrol.ActionAlertingRuleDelete, Scope: dashboards.ScopeFoldersAll},
+		})
+		err := store.DeleteInFolders(context.Background(), rule.OrgID, []string{rule.NamespaceUID}, &user.SignedInUser{})
+		require.NoError(t, err)
+
+		c, err := store.CountInFolders(context.Background(), rule.OrgID, []string{rule.NamespaceUID}, &user.SignedInUser{})
+		require.NoError(t, err)
+		require.Equal(t, int64(0), c)
+	})
 }
 
 func TestIntegration_GetNamespaceByUID(t *testing.T) {
@@ -493,7 +555,7 @@ func TestIntegration_GetNamespaceByUID(t *testing.T) {
 	cfg := setting.NewCfg()
 	store := &DBstore{
 		SQLStore:      sqlStore,
-		FolderService: setupFolderService(t, sqlStore, cfg),
+		FolderService: setupFolderService(t, sqlStore, cfg, featuremgmt.WithFeatures()),
 		Logger:        log.New("test-dbstore"),
 	}
 
@@ -505,13 +567,36 @@ func TestIntegration_GetNamespaceByUID(t *testing.T) {
 	}
 
 	uid := uuid.NewString()
-	title := "folder-title"
-	createFolder(t, store, uid, title, 1)
+	parentUid := uuid.NewString()
+	title := "folder/title"
+	parentTitle := "parent-title"
+	createFolder(t, store, parentUid, parentTitle, 1, "")
+	createFolder(t, store, uid, title, 1, parentUid)
 
 	actual, err := store.GetNamespaceByUID(context.Background(), uid, 1, u)
 	require.NoError(t, err)
 	require.Equal(t, title, actual.Title)
 	require.Equal(t, uid, actual.UID)
+	require.Equal(t, title, actual.Fullpath)
+
+	t.Run("error when user does not have permissions", func(t *testing.T) {
+		someUser := &user.SignedInUser{
+			UserID:  2,
+			OrgID:   1,
+			OrgRole: org.RoleViewer,
+		}
+		_, err = store.GetNamespaceByUID(context.Background(), uid, 1, someUser)
+		require.ErrorIs(t, err, dashboards.ErrFolderAccessDenied)
+	})
+
+	t.Run("when nested folders are enabled full path should be populated with correct value", func(t *testing.T) {
+		store.FolderService = setupFolderService(t, sqlStore, cfg, featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders))
+		actual, err := store.GetNamespaceByUID(context.Background(), uid, 1, u)
+		require.NoError(t, err)
+		require.Equal(t, title, actual.Title)
+		require.Equal(t, uid, actual.UID)
+		require.Equal(t, "parent-title/folder\\/title", actual.Fullpath)
+	})
 }
 
 func TestIntegrationInsertAlertRules(t *testing.T) {
@@ -524,7 +609,7 @@ func TestIntegrationInsertAlertRules(t *testing.T) {
 	cfg.UnifiedAlerting.BaseInterval = 1 * time.Second
 	store := &DBstore{
 		SQLStore:      sqlStore,
-		FolderService: setupFolderService(t, sqlStore, cfg),
+		FolderService: setupFolderService(t, sqlStore, cfg, featuremgmt.WithFeatures()),
 		Logger:        log.New("test-dbstore"),
 		Cfg:           cfg.UnifiedAlerting,
 	}
@@ -556,12 +641,185 @@ func TestIntegrationInsertAlertRules(t *testing.T) {
 		}
 		require.Truef(t, found, "Rule with key %#v was not found in database", keyWithID)
 	}
+
+	_, err = store.InsertAlertRules(context.Background(), []models.AlertRule{deref[0]})
+	require.ErrorIs(t, err, models.ErrAlertRuleUniqueConstraintViolation)
+	require.NotEqual(t, deref[0].UID, "")
+	require.NotEqual(t, deref[0].Title, "")
+	require.NotEqual(t, deref[0].NamespaceUID, "")
+	require.ErrorContains(t, err, deref[0].UID)
+	require.ErrorContains(t, err, deref[0].Title)
+	require.ErrorContains(t, err, deref[0].NamespaceUID)
+}
+
+func TestIntegrationAlertRulesNotificationSettings(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	sqlStore := db.InitTestDB(t)
+	cfg := setting.NewCfg()
+	cfg.UnifiedAlerting.BaseInterval = 1 * time.Second
+	store := &DBstore{
+		SQLStore:      sqlStore,
+		FolderService: setupFolderService(t, sqlStore, cfg, featuremgmt.WithFeatures()),
+		Logger:        log.New("test-dbstore"),
+		Cfg:           cfg.UnifiedAlerting,
+	}
+
+	uniqueUids := &sync.Map{}
+	receiverName := "receiver\"-" + uuid.NewString()
+	rules := models.GenerateAlertRules(3, models.AlertRuleGen(models.WithOrgID(1), withIntervalMatching(store.Cfg.BaseInterval), models.WithUniqueUID(uniqueUids)))
+	receiveRules := models.GenerateAlertRules(3,
+		models.AlertRuleGen(
+			models.WithOrgID(1),
+			withIntervalMatching(store.Cfg.BaseInterval),
+			models.WithUniqueUID(uniqueUids),
+			models.WithNotificationSettingsGen(models.NotificationSettingsGen(models.NSMuts.WithReceiver(receiverName)))))
+	noise := models.GenerateAlertRules(3,
+		models.AlertRuleGen(
+			models.WithOrgID(1),
+			withIntervalMatching(store.Cfg.BaseInterval),
+			models.WithUniqueUID(uniqueUids),
+			models.WithNotificationSettingsGen(models.NotificationSettingsGen(models.NSMuts.WithMuteTimeIntervals(receiverName))))) // simulate collision of names of receiver and mute timing
+	deref := make([]models.AlertRule, 0, len(rules)+len(receiveRules)+len(noise))
+	for _, rule := range append(append(rules, receiveRules...), noise...) {
+		r := *rule
+		r.ID = 0
+		deref = append(deref, r)
+	}
+
+	_, err := store.InsertAlertRules(context.Background(), deref)
+	require.NoError(t, err)
+
+	t.Run("should find rules by receiver name", func(t *testing.T) {
+		expectedUIDs := map[string]struct{}{}
+		for _, rule := range receiveRules {
+			expectedUIDs[rule.UID] = struct{}{}
+		}
+		actual, err := store.ListAlertRules(context.Background(), &models.ListAlertRulesQuery{
+			OrgID:        1,
+			ReceiverName: receiverName,
+		})
+		require.NoError(t, err)
+		assert.Len(t, actual, len(expectedUIDs))
+		for _, rule := range actual {
+			assert.Contains(t, expectedUIDs, rule.UID)
+		}
+	})
+
+	t.Run("RenameReceiverInNotificationSettings should update all rules that refer to the old receiver", func(t *testing.T) {
+		newName := "new-receiver"
+		affected, err := store.RenameReceiverInNotificationSettings(context.Background(), 1, receiverName, newName)
+		require.NoError(t, err)
+		require.Equal(t, len(receiveRules), affected)
+
+		expectedUIDs := map[string]struct{}{}
+		for _, rule := range receiveRules {
+			expectedUIDs[rule.UID] = struct{}{}
+		}
+		actual, err := store.ListAlertRules(context.Background(), &models.ListAlertRulesQuery{
+			OrgID:        1,
+			ReceiverName: newName,
+		})
+		require.NoError(t, err)
+		assert.Len(t, actual, len(expectedUIDs))
+		for _, rule := range actual {
+			assert.Contains(t, expectedUIDs, rule.UID)
+		}
+
+		actual, err = store.ListAlertRules(context.Background(), &models.ListAlertRulesQuery{
+			OrgID:        1,
+			ReceiverName: receiverName,
+		})
+		require.NoError(t, err)
+		require.Empty(t, actual)
+	})
+}
+
+func TestIntegrationListNotificationSettings(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	sqlStore := db.InitTestDB(t)
+	cfg := setting.NewCfg()
+	cfg.UnifiedAlerting.BaseInterval = 1 * time.Second
+	store := &DBstore{
+		SQLStore:      sqlStore,
+		FolderService: setupFolderService(t, sqlStore, cfg, featuremgmt.WithFeatures()),
+		Logger:        log.New("test-dbstore"),
+		Cfg:           cfg.UnifiedAlerting,
+	}
+
+	uids := &sync.Map{}
+	titles := &sync.Map{}
+	receiverName := `receiver%"-👍'test`
+	rulesWithNotifications := models.GenerateAlertRules(5, models.AlertRuleGen(
+		models.WithOrgID(1),
+		models.WithUniqueUID(uids),
+		models.WithUniqueTitle(titles),
+		withIntervalMatching(store.Cfg.BaseInterval),
+		models.WithNotificationSettingsGen(models.NotificationSettingsGen(models.NSMuts.WithReceiver(receiverName))),
+	))
+	rulesInOtherOrg := models.GenerateAlertRules(5, models.AlertRuleGen(
+		models.WithOrgID(2),
+		models.WithUniqueUID(uids),
+		models.WithUniqueTitle(titles),
+		withIntervalMatching(store.Cfg.BaseInterval),
+		models.WithNotificationSettingsGen(models.NotificationSettingsGen()),
+	))
+	rulesWithNoNotifications := models.GenerateAlertRules(5, models.AlertRuleGen(
+		models.WithOrgID(1),
+		models.WithUniqueUID(uids),
+		models.WithUniqueTitle(titles),
+		withIntervalMatching(store.Cfg.BaseInterval),
+		models.WithNoNotificationSettings(),
+	))
+	deref := make([]models.AlertRule, 0, len(rulesWithNotifications)+len(rulesWithNoNotifications)+len(rulesInOtherOrg))
+	for _, rule := range append(append(rulesWithNotifications, rulesWithNoNotifications...), rulesInOtherOrg...) {
+		r := *rule
+		r.ID = 0
+		deref = append(deref, r)
+	}
+
+	_, err := store.InsertAlertRules(context.Background(), deref)
+	require.NoError(t, err)
+
+	result, err := store.ListNotificationSettings(context.Background(), models.ListNotificationSettingsQuery{OrgID: 1})
+	require.NoError(t, err)
+	require.Len(t, result, len(rulesWithNotifications))
+	for _, rule := range rulesWithNotifications {
+		if !assert.Contains(t, result, rule.GetKey()) {
+			continue
+		}
+		assert.EqualValues(t, rule.NotificationSettings, result[rule.GetKey()])
+	}
+
+	t.Run("should list notification settings by receiver name", func(t *testing.T) {
+		expectedUIDs := map[models.AlertRuleKey]struct{}{}
+		for _, rule := range rulesWithNotifications {
+			expectedUIDs[rule.GetKey()] = struct{}{}
+		}
+
+		actual, err := store.ListNotificationSettings(context.Background(), models.ListNotificationSettingsQuery{
+			OrgID:        1,
+			ReceiverName: receiverName,
+		})
+		require.NoError(t, err)
+		assert.Len(t, actual, len(expectedUIDs))
+		for ruleKey := range actual {
+			assert.Contains(t, expectedUIDs, ruleKey)
+		}
+	})
 }
 
+// createAlertRule creates an alert rule in the database and returns it.
+// If a generator is not specified, uniqueness of primary key is not guaranteed.
 func createRule(t *testing.T, store *DBstore, generate func() *models.AlertRule) *models.AlertRule {
 	t.Helper()
 	if generate == nil {
-		generate = models.AlertRuleGen(withIntervalMatching(store.Cfg.BaseInterval), models.WithUniqueID())
+		generate = models.AlertRuleGen(withIntervalMatching(store.Cfg.BaseInterval))
 	}
 	rule := generate()
 	err := store.SQLStore.WithDbSession(context.Background(), func(sess *db.Session) error {
@@ -588,7 +846,7 @@ func createRule(t *testing.T, store *DBstore, generate func() *models.AlertRule)
 	return rule
 }
 
-func createFolder(t *testing.T, store *DBstore, uid, title string, orgID int64) {
+func createFolder(t *testing.T, store *DBstore, uid, title string, orgID int64, parentUID string) {
 	t.Helper()
 	u := &user.SignedInUser{
 		UserID:         1,
@@ -603,16 +861,17 @@ func createFolder(t *testing.T, store *DBstore, uid, title string, orgID int64)
 		Title:        title,
 		Description:  "",
 		SignedInUser: u,
+		ParentUID:    parentUID,
 	})
 
 	require.NoError(t, err)
 }
 
-func setupFolderService(t *testing.T, sqlStore *sqlstore.SQLStore, cfg *setting.Cfg) folder.Service {
+func setupFolderService(t *testing.T, sqlStore *sqlstore.SQLStore, cfg *setting.Cfg, features featuremgmt.FeatureToggles) folder.Service {
 	tracer := tracing.InitializeTracerForTest()
 	inProcBus := bus.ProvideBus(tracer)
 	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
 	_, dashboardStore := testutil.SetupDashboardService(t, sqlStore, folderStore, cfg)
 
-	return testutil.SetupFolderService(t, cfg, sqlStore, dashboardStore, folderStore, inProcBus)
+	return testutil.SetupFolderService(t, cfg, sqlStore, dashboardStore, folderStore, inProcBus, features, &actest.FakeAccessControl{})
 }
diff --git a/pkg/services/ngalert/store/alertmanager.go b/pkg/services/ngalert/store/alertmanager.go
index 4f40662a38188..fc07e7a5f359b 100644
--- a/pkg/services/ngalert/store/alertmanager.go
+++ b/pkg/services/ngalert/store/alertmanager.go
@@ -24,11 +24,11 @@ var (
 
 // GetLatestAlertmanagerConfiguration returns the lastest version of the alertmanager configuration.
 // It returns ErrNoAlertmanagerConfiguration if no configuration is found.
-func (st *DBstore) GetLatestAlertmanagerConfiguration(ctx context.Context, query *models.GetLatestAlertmanagerConfigurationQuery) (result *models.AlertConfiguration, err error) {
+func (st *DBstore) GetLatestAlertmanagerConfiguration(ctx context.Context, orgID int64) (result *models.AlertConfiguration, err error) {
 	err = st.SQLStore.WithDbSession(ctx, func(sess *db.Session) error {
 		c := &models.AlertConfiguration{}
 		// The ID is already an auto incremental column, using the ID as an order should guarantee the latest.
-		ok, err := sess.Table("alert_configuration").Where("org_id = ?", query.OrgID).Get(c)
+		ok, err := sess.Table("alert_configuration").Where("org_id = ?", orgID).Get(c)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/services/ngalert/store/alertmanager_test.go b/pkg/services/ngalert/store/alertmanager_test.go
index 306bbbc243fef..4433760c8e171 100644
--- a/pkg/services/ngalert/store/alertmanager_test.go
+++ b/pkg/services/ngalert/store/alertmanager_test.go
@@ -13,8 +13,13 @@ import (
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationAlertmanagerStore(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
@@ -27,11 +32,7 @@ func TestIntegrationAlertmanagerStore(t *testing.T) {
 
 	t.Run("GetLatestAlertmanagerConfiguration for org that doesn't exist returns error", func(t *testing.T) {
 		_, _ = setupConfig(t, "my-config", store)
-		req := &models.GetLatestAlertmanagerConfigurationQuery{
-			OrgID: 1234,
-		}
-
-		config, err := store.GetLatestAlertmanagerConfiguration(context.Background(), req)
+		config, err := store.GetLatestAlertmanagerConfiguration(context.Background(), 1234)
 
 		require.ErrorIs(t, err, ErrNoAlertmanagerConfiguration)
 		require.Nil(t, config)
@@ -39,11 +40,7 @@ func TestIntegrationAlertmanagerStore(t *testing.T) {
 
 	t.Run("GetLatestAlertmanagerConfiguration return the right config", func(t *testing.T) {
 		_, configMD5 := setupConfig(t, "my-config", store)
-		req := &models.GetLatestAlertmanagerConfigurationQuery{
-			OrgID: 1,
-		}
-
-		config, err := store.GetLatestAlertmanagerConfiguration(context.Background(), req)
+		config, err := store.GetLatestAlertmanagerConfiguration(context.Background(), 1)
 
 		require.NoError(t, err)
 		require.NotNil(t, config)
@@ -55,11 +52,7 @@ func TestIntegrationAlertmanagerStore(t *testing.T) {
 		_, _ = setupConfig(t, "my-config1", store)
 		_, _ = setupConfig(t, "my-config2", store)
 		_, configMD5 := setupConfig(t, "my-config3", store)
-		req := &models.GetLatestAlertmanagerConfigurationQuery{
-			OrgID: 1,
-		}
-
-		config, err := store.GetLatestAlertmanagerConfiguration(context.Background(), req)
+		config, err := store.GetLatestAlertmanagerConfiguration(context.Background(), 1)
 
 		require.NoError(t, err)
 		require.NotNil(t, config)
@@ -109,8 +102,7 @@ func TestIntegrationAlertmanagerStore(t *testing.T) {
 
 		require.ErrorContains(t, err, "callback failed")
 		// Assert that we rolled back the transaction.
-		get := &models.GetLatestAlertmanagerConfigurationQuery{OrgID: 1}
-		config, err := store.GetLatestAlertmanagerConfiguration(context.Background(), get)
+		config, err := store.GetLatestAlertmanagerConfiguration(context.Background(), 1)
 		require.NoError(t, err)
 		require.Equal(t, config.AlertmanagerConfiguration, "my-config")
 	})
@@ -136,10 +128,7 @@ func TestIntegrationAlertmanagerHash(t *testing.T) {
 
 	t.Run("When passing the right hash the config should be updated", func(t *testing.T) {
 		_, configMD5 := setupConfig(t, "my-config", store)
-		req := &models.GetLatestAlertmanagerConfigurationQuery{
-			OrgID: 1,
-		}
-		config, err := store.GetLatestAlertmanagerConfiguration(context.Background(), req)
+		config, err := store.GetLatestAlertmanagerConfiguration(context.Background(), 1)
 		require.NoError(t, err)
 		require.Equal(t, configMD5, config.ConfigurationHash)
 		newConfig, newConfigMD5 := "my-config-new", fmt.Sprintf("%x", md5.Sum([]byte("my-config-new")))
@@ -151,7 +140,7 @@ func TestIntegrationAlertmanagerHash(t *testing.T) {
 			OrgID:                     1,
 		})
 		require.NoError(t, err)
-		config, err = store.GetLatestAlertmanagerConfiguration(context.Background(), req)
+		config, err = store.GetLatestAlertmanagerConfiguration(context.Background(), 1)
 		require.NoError(t, err)
 		require.Equal(t, newConfig, config.AlertmanagerConfiguration)
 		require.Equal(t, newConfigMD5, config.ConfigurationHash)
@@ -159,10 +148,7 @@ func TestIntegrationAlertmanagerHash(t *testing.T) {
 
 	t.Run("When passing the wrong hash the update should error", func(t *testing.T) {
 		config, configMD5 := setupConfig(t, "my-config", store)
-		req := &models.GetLatestAlertmanagerConfigurationQuery{
-			OrgID: 1,
-		}
-		amConfig, err := store.GetLatestAlertmanagerConfiguration(context.Background(), req)
+		amConfig, err := store.GetLatestAlertmanagerConfiguration(context.Background(), 1)
 		require.NoError(t, err)
 		require.Equal(t, configMD5, amConfig.ConfigurationHash)
 		err = store.UpdateAlertmanagerConfiguration(context.Background(), &models.SaveAlertmanagerConfigurationCmd{
@@ -219,10 +205,7 @@ func TestIntegrationAlertmanagerConfigCleanup(t *testing.T) {
 		require.Equal(t, int64(0), rowsAffected)
 		require.NoError(t, err)
 
-		req := &models.GetLatestAlertmanagerConfigurationQuery{
-			OrgID: orgID,
-		}
-		amConfig, err := store.GetLatestAlertmanagerConfiguration(context.Background(), req)
+		amConfig, err := store.GetLatestAlertmanagerConfiguration(context.Background(), orgID)
 		require.NoError(t, err)
 		require.Equal(t, "newest-record", amConfig.AlertmanagerConfiguration)
 	})
@@ -259,10 +242,7 @@ func TestIntegrationAlertmanagerConfigCleanup(t *testing.T) {
 		require.Equal(t, int64(2), rowsAffacted)
 		require.NoError(t, err)
 
-		req := &models.GetLatestAlertmanagerConfigurationQuery{
-			OrgID: orgID,
-		}
-		amConfig, err := store.GetLatestAlertmanagerConfiguration(context.Background(), req)
+		amConfig, err := store.GetLatestAlertmanagerConfiguration(context.Background(), orgID)
 		require.NoError(t, err)
 		require.Equal(t, "newest-record", amConfig.AlertmanagerConfiguration)
 	})
@@ -314,10 +294,7 @@ func TestIntegrationMarkConfigurationAsApplied(t *testing.T) {
 		require.NoError(tt, err)
 		require.Len(tt, configs, 0)
 
-		query := models.GetLatestAlertmanagerConfigurationQuery{
-			OrgID: orgID,
-		}
-		amConfig, err := store.GetLatestAlertmanagerConfiguration(ctx, &query)
+		amConfig, err := store.GetLatestAlertmanagerConfiguration(ctx, orgID)
 		require.NoError(tt, err)
 
 		cmd := models.MarkConfigurationAsAppliedCmd{
diff --git a/pkg/services/ngalert/store/database.go b/pkg/services/ngalert/store/database.go
index faf3f09f28791..0470cbb925197 100644
--- a/pkg/services/ngalert/store/database.go
+++ b/pkg/services/ngalert/store/database.go
@@ -22,7 +22,7 @@ const AlertDefinitionMaxTitleLength = 190
 
 // AlertingStore is the database interface used by the Alertmanager service.
 type AlertingStore interface {
-	GetLatestAlertmanagerConfiguration(ctx context.Context, query *models.GetLatestAlertmanagerConfigurationQuery) (*models.AlertConfiguration, error)
+	GetLatestAlertmanagerConfiguration(ctx context.Context, orgID int64) (*models.AlertConfiguration, error)
 	GetAllLatestAlertmanagerConfiguration(ctx context.Context) ([]*models.AlertConfiguration, error)
 	SaveAlertmanagerConfiguration(ctx context.Context, cmd *models.SaveAlertmanagerConfigurationCmd) error
 	SaveAlertmanagerConfigurationWithCallback(ctx context.Context, cmd *models.SaveAlertmanagerConfigurationCmd, callback SaveCallback) error
@@ -39,21 +39,20 @@ type DBstore struct {
 	SQLStore         db.DB
 	Logger           log.Logger
 	FolderService    folder.Service
-	AccessControl    accesscontrol.AccessControl
 	DashboardService dashboards.DashboardService
+	AccessControl    accesscontrol.AccessControl
 }
 
 func ProvideDBStore(
-	cfg *setting.Cfg, featureToggles featuremgmt.FeatureToggles, sqlstore db.DB, folderService folder.Service,
-	access accesscontrol.AccessControl, dashboards dashboards.DashboardService) (*DBstore, error) {
+	cfg *setting.Cfg, featureToggles featuremgmt.FeatureToggles, sqlstore db.DB, folderService folder.Service, dashboards dashboards.DashboardService, ac accesscontrol.AccessControl) (*DBstore, error) {
 	store := DBstore{
 		Cfg:              cfg.UnifiedAlerting,
 		FeatureToggles:   featureToggles,
 		SQLStore:         sqlstore,
 		Logger:           log.New("ngalert.dbstore"),
 		FolderService:    folderService,
-		AccessControl:    access,
 		DashboardService: dashboards,
+		AccessControl:    ac,
 	}
 	if err := folderService.RegisterService(store); err != nil {
 		return nil, err
diff --git a/pkg/services/ngalert/store/deltas.go b/pkg/services/ngalert/store/deltas.go
index 15184da809fb4..2b24bf52ea1ea 100644
--- a/pkg/services/ngalert/store/deltas.go
+++ b/pkg/services/ngalert/store/deltas.go
@@ -31,6 +31,27 @@ func (c *GroupDelta) IsEmpty() bool {
 	return len(c.Update)+len(c.New)+len(c.Delete) == 0
 }
 
+// NewOrUpdatedNotificationSettings returns a list of notification settings that are either new or updated in the group.
+func (c *GroupDelta) NewOrUpdatedNotificationSettings() []models.NotificationSettings {
+	var settings []models.NotificationSettings
+	for _, rule := range c.New {
+		if len(rule.NotificationSettings) > 0 {
+			settings = append(settings, rule.NotificationSettings...)
+		}
+	}
+	for _, delta := range c.Update {
+		if len(delta.New.NotificationSettings) == 0 {
+			continue
+		}
+		d := delta.Diff.GetDiffsForField("NotificationSettings")
+		if len(d) == 0 {
+			continue
+		}
+		settings = append(settings, delta.New.NotificationSettings...)
+	}
+	return settings
+}
+
 type RuleReader interface {
 	ListAlertRules(ctx context.Context, query *models.ListAlertRulesQuery) (models.RulesGroup, error)
 	GetAlertRulesGroupByRuleUID(ctx context.Context, query *models.GetAlertRulesGroupByRuleUIDQuery) ([]*models.AlertRule, error)
@@ -39,7 +60,6 @@ type RuleReader interface {
 // CalculateChanges calculates the difference between rules in the group in the database and the submitted rules. If a submitted rule has UID it tries to find it in the database (in other groups).
 // returns a list of rules that need to be added, updated and deleted. Deleted considered rules in the database that belong to the group but do not exist in the list of submitted rules.
 func CalculateChanges(ctx context.Context, ruleReader RuleReader, groupKey models.AlertRuleGroupKey, submittedRules []*models.AlertRuleWithOptionals) (*GroupDelta, error) {
-	affectedGroups := make(map[models.AlertRuleGroupKey]models.RulesGroup)
 	q := &models.ListAlertRulesQuery{
 		OrgID:         groupKey.OrgID,
 		NamespaceUIDs: []string{groupKey.NamespaceUID},
@@ -49,6 +69,13 @@ func CalculateChanges(ctx context.Context, ruleReader RuleReader, groupKey model
 	if err != nil {
 		return nil, fmt.Errorf("failed to query database for rules in the group %s: %w", groupKey, err)
 	}
+
+	return calculateChanges(ctx, ruleReader, groupKey, existingGroupRules, submittedRules)
+}
+
+func calculateChanges(ctx context.Context, ruleReader RuleReader, groupKey models.AlertRuleGroupKey, existingGroupRules []*models.AlertRule, submittedRules []*models.AlertRuleWithOptionals) (*GroupDelta, error) {
+	affectedGroups := make(map[models.AlertRuleGroupKey]models.RulesGroup)
+
 	if len(existingGroupRules) > 0 {
 		affectedGroups[groupKey] = existingGroupRules
 	}
@@ -170,3 +197,114 @@ func UpdateCalculatedRuleFields(ch *GroupDelta) *GroupDelta {
 		Delete:         ch.Delete,
 	}
 }
+
+// CalculateRuleUpdate calculates GroupDelta for rule update operation
+func CalculateRuleUpdate(ctx context.Context, ruleReader RuleReader, rule *models.AlertRuleWithOptionals) (*GroupDelta, error) {
+	q := &models.ListAlertRulesQuery{
+		OrgID:         rule.OrgID,
+		NamespaceUIDs: []string{rule.NamespaceUID},
+		RuleGroup:     rule.RuleGroup,
+	}
+	existingGroupRules, err := ruleReader.ListAlertRules(ctx, q)
+	if err != nil {
+		return nil, err
+	}
+
+	newGroup := make([]*models.AlertRuleWithOptionals, 0, len(existingGroupRules)+1)
+	added := false
+	for _, alertRule := range existingGroupRules {
+		if alertRule.GetKey() == rule.GetKey() {
+			newGroup = append(newGroup, rule)
+			added = true
+		}
+		newGroup = append(newGroup, &models.AlertRuleWithOptionals{AlertRule: *alertRule})
+	}
+	if !added {
+		newGroup = append(newGroup, rule)
+	}
+
+	return calculateChanges(ctx, ruleReader, rule.GetGroupKey(), existingGroupRules, newGroup)
+}
+
+// CalculateRuleGroupDelete calculates GroupDelta that reflects an operation of removing entire group
+func CalculateRuleGroupDelete(ctx context.Context, ruleReader RuleReader, groupKey models.AlertRuleGroupKey) (*GroupDelta, error) {
+	// List all rules in the group.
+	q := models.ListAlertRulesQuery{
+		OrgID:         groupKey.OrgID,
+		NamespaceUIDs: []string{groupKey.NamespaceUID},
+		RuleGroup:     groupKey.RuleGroup,
+	}
+	ruleList, err := ruleReader.ListAlertRules(ctx, &q)
+	if err != nil {
+		return nil, err
+	}
+	if len(ruleList) == 0 {
+		return nil, models.ErrAlertRuleGroupNotFound.Errorf("")
+	}
+
+	delta := &GroupDelta{
+		GroupKey: groupKey,
+		Delete:   ruleList,
+		AffectedGroups: map[models.AlertRuleGroupKey]models.RulesGroup{
+			groupKey: ruleList,
+		},
+	}
+	return delta, nil
+}
+
+// CalculateRuleDelete calculates GroupDelta that reflects an operation of removing a rule from the group.
+func CalculateRuleDelete(ctx context.Context, ruleReader RuleReader, ruleKey models.AlertRuleKey) (*GroupDelta, error) {
+	q := &models.GetAlertRulesGroupByRuleUIDQuery{
+		UID:   ruleKey.UID,
+		OrgID: ruleKey.OrgID,
+	}
+	group, err := ruleReader.GetAlertRulesGroupByRuleUID(ctx, q)
+	if err != nil {
+		return nil, err
+	}
+	var toDelete *models.AlertRule
+	for _, rule := range group {
+		if rule.GetKey() == ruleKey {
+			toDelete = rule
+			break
+		}
+	}
+	if toDelete == nil { // should not happen if rule exists.
+		return nil, models.ErrAlertRuleNotFound
+	}
+	groupKey := group[0].GetGroupKey()
+	delta := &GroupDelta{
+		GroupKey: groupKey,
+		Delete:   []*models.AlertRule{toDelete},
+		AffectedGroups: map[models.AlertRuleGroupKey]models.RulesGroup{
+			groupKey: group,
+		},
+	}
+	return delta, nil
+}
+
+// CalculateRuleCreate calculates GroupDelta that reflects an operation of adding a new rule to the group.
+func CalculateRuleCreate(ctx context.Context, ruleReader RuleReader, rule *models.AlertRule) (*GroupDelta, error) {
+	q := &models.ListAlertRulesQuery{
+		OrgID:         rule.OrgID,
+		NamespaceUIDs: []string{rule.NamespaceUID},
+		RuleGroup:     rule.RuleGroup,
+	}
+	group, err := ruleReader.ListAlertRules(ctx, q)
+	if err != nil {
+		return nil, err
+	}
+
+	delta := &GroupDelta{
+		GroupKey:       rule.GetGroupKey(),
+		AffectedGroups: make(map[models.AlertRuleGroupKey]models.RulesGroup),
+		New:            []*models.AlertRule{rule},
+		Update:         nil,
+		Delete:         nil,
+	}
+
+	if len(group) > 0 {
+		delta.AffectedGroups[rule.GetGroupKey()] = group
+	}
+	return delta, nil
+}
diff --git a/pkg/services/ngalert/store/deltas_test.go b/pkg/services/ngalert/store/deltas_test.go
index 53a603bfdca5f..5a39e4cc787fb 100644
--- a/pkg/services/ngalert/store/deltas_test.go
+++ b/pkg/services/ngalert/store/deltas_test.go
@@ -416,6 +416,174 @@ func TestCalculateAutomaticChanges(t *testing.T) {
 	})
 }
 
+func TestCalculateRuleGroupDelete(t *testing.T) {
+	fakeStore := fakes.NewRuleStore(t)
+	groupKey := models.GenerateGroupKey(1)
+	otherRules := models.GenerateAlertRules(3, models.AlertRuleGen(models.WithOrgID(groupKey.OrgID), models.WithNamespaceUIDNotIn(groupKey.NamespaceUID)))
+	fakeStore.Rules[groupKey.OrgID] = otherRules
+
+	t.Run("NotFound when group does not exist", func(t *testing.T) {
+		delta, err := CalculateRuleGroupDelete(context.Background(), fakeStore, groupKey)
+		require.ErrorIs(t, err, models.ErrAlertRuleGroupNotFound, "expected ErrAlertRuleGroupNotFound but got %s", err)
+		require.Nil(t, delta)
+	})
+
+	t.Run("set AffectedGroups when a rule refers to an existing group", func(t *testing.T) {
+		groupRules := models.GenerateAlertRules(3, models.AlertRuleGen(models.WithGroupKey(groupKey)))
+		fakeStore.Rules[groupKey.OrgID] = append(fakeStore.Rules[groupKey.OrgID], groupRules...)
+
+		delta, err := CalculateRuleGroupDelete(context.Background(), fakeStore, groupKey)
+		require.NoError(t, err)
+
+		assert.Equal(t, groupKey, delta.GroupKey)
+		assert.EqualValues(t, groupRules, delta.Delete)
+
+		assert.Empty(t, delta.Update)
+		assert.Empty(t, delta.New)
+
+		assert.Len(t, delta.AffectedGroups, 1)
+		assert.Equal(t, models.RulesGroup(groupRules), delta.AffectedGroups[delta.GroupKey])
+	})
+}
+
+func TestCalculateRuleDelete(t *testing.T) {
+	fakeStore := fakes.NewRuleStore(t)
+	rule := models.AlertRuleGen()()
+	otherRules := models.GenerateAlertRules(3, models.AlertRuleGen(models.WithOrgID(rule.OrgID), models.WithNamespaceUIDNotIn(rule.NamespaceUID)))
+	fakeStore.Rules[rule.OrgID] = otherRules
+
+	t.Run("nil when a rule does not exist", func(t *testing.T) {
+		delta, err := CalculateRuleDelete(context.Background(), fakeStore, rule.GetKey())
+		require.ErrorIs(t, err, models.ErrAlertRuleNotFound)
+		require.Nil(t, delta)
+	})
+
+	t.Run("set AffectedGroups when a rule refers to an existing group", func(t *testing.T) {
+		groupRules := models.GenerateAlertRules(3, models.AlertRuleGen(models.WithGroupKey(rule.GetGroupKey())))
+		groupRules = append(groupRules, rule)
+		fakeStore.Rules[rule.OrgID] = append(fakeStore.Rules[rule.OrgID], groupRules...)
+
+		delta, err := CalculateRuleDelete(context.Background(), fakeStore, rule.GetKey())
+		require.NoError(t, err)
+
+		assert.Equal(t, rule.GetGroupKey(), delta.GroupKey)
+		assert.Len(t, delta.Delete, 1)
+		assert.Equal(t, rule, delta.Delete[0])
+
+		assert.Empty(t, delta.Update)
+		assert.Empty(t, delta.New)
+
+		assert.Len(t, delta.AffectedGroups, 1)
+		assert.Equal(t, models.RulesGroup(groupRules), delta.AffectedGroups[delta.GroupKey])
+	})
+}
+
+func TestCalculateRuleUpdate(t *testing.T) {
+	fakeStore := fakes.NewRuleStore(t)
+	rule := models.AlertRuleGen()()
+	otherRules := models.GenerateAlertRules(3, models.AlertRuleGen(models.WithOrgID(rule.OrgID), models.WithNamespaceUIDNotIn(rule.NamespaceUID)))
+	groupRules := models.GenerateAlertRules(3, models.AlertRuleGen(models.WithGroupKey(rule.GetGroupKey())))
+	groupRules = append(groupRules, rule)
+	fakeStore.Rules[rule.OrgID] = append(otherRules, groupRules...)
+
+	t.Run("when a rule is not changed", func(t *testing.T) {
+		cp := models.CopyRule(rule)
+		delta, err := CalculateRuleUpdate(context.Background(), fakeStore, &models.AlertRuleWithOptionals{
+			AlertRule: *cp,
+			HasPause:  false,
+		})
+		require.NoError(t, err)
+		require.True(t, delta.IsEmpty())
+	})
+
+	t.Run("when a rule is updated", func(t *testing.T) {
+		cp := models.CopyRule(rule)
+		cp.For = cp.For + 1*time.Minute // cause any diff
+
+		delta, err := CalculateRuleUpdate(context.Background(), fakeStore, &models.AlertRuleWithOptionals{
+			AlertRule: *cp,
+			HasPause:  false,
+		})
+		require.NoError(t, err)
+
+		assert.Equal(t, rule.GetGroupKey(), delta.GroupKey)
+		assert.Empty(t, delta.New)
+		assert.Empty(t, delta.Delete)
+		assert.Len(t, delta.Update, 1)
+		assert.Equal(t, cp, delta.Update[0].New)
+		assert.Equal(t, rule, delta.Update[0].Existing)
+
+		require.Contains(t, delta.AffectedGroups, delta.GroupKey)
+		assert.Equal(t, models.RulesGroup(groupRules), delta.AffectedGroups[delta.GroupKey])
+	})
+
+	t.Run("when a rule is moved between groups", func(t *testing.T) {
+		sourceGroupKey := rule.GetGroupKey()
+		targetGroupKey := models.GenerateGroupKey(rule.OrgID)
+		targetGroup := models.GenerateAlertRules(3, models.AlertRuleGen(models.WithGroupKey(targetGroupKey)))
+		fakeStore.Rules[rule.OrgID] = append(fakeStore.Rules[rule.OrgID], targetGroup...)
+
+		cp := models.CopyRule(rule)
+		cp.NamespaceUID = targetGroupKey.NamespaceUID
+		cp.RuleGroup = targetGroupKey.RuleGroup
+
+		delta, err := CalculateRuleUpdate(context.Background(), fakeStore, &models.AlertRuleWithOptionals{
+			AlertRule: *cp,
+			HasPause:  false,
+		})
+		require.NoError(t, err)
+
+		assert.Equal(t, targetGroupKey, delta.GroupKey)
+		assert.Empty(t, delta.New)
+		assert.Empty(t, delta.Delete)
+		assert.Len(t, delta.Update, 1)
+		assert.Equal(t, cp, delta.Update[0].New)
+		assert.Equal(t, rule, delta.Update[0].Existing)
+
+		require.Contains(t, delta.AffectedGroups, sourceGroupKey)
+		assert.Equal(t, models.RulesGroup(groupRules), delta.AffectedGroups[sourceGroupKey])
+		require.Contains(t, delta.AffectedGroups, targetGroupKey)
+		assert.Equal(t, models.RulesGroup(targetGroup), delta.AffectedGroups[targetGroupKey])
+	})
+}
+
+func TestCalculateRuleCreate(t *testing.T) {
+	t.Run("when a rule refers to a new group", func(t *testing.T) {
+		fakeStore := fakes.NewRuleStore(t)
+		rule := models.AlertRuleGen()()
+
+		delta, err := CalculateRuleCreate(context.Background(), fakeStore, rule)
+		require.NoError(t, err)
+
+		assert.Equal(t, rule.GetGroupKey(), delta.GroupKey)
+		assert.Empty(t, delta.AffectedGroups)
+		assert.Empty(t, delta.Delete)
+		assert.Empty(t, delta.Update)
+		assert.Len(t, delta.New, 1)
+		assert.Equal(t, rule, delta.New[0])
+	})
+
+	t.Run("when a rule refers to an existing group", func(t *testing.T) {
+		fakeStore := fakes.NewRuleStore(t)
+		rule := models.AlertRuleGen()()
+
+		groupRules := models.GenerateAlertRules(3, models.AlertRuleGen(models.WithGroupKey(rule.GetGroupKey())))
+		otherRules := models.GenerateAlertRules(3, models.AlertRuleGen(models.WithOrgID(rule.OrgID), models.WithNamespaceUIDNotIn(rule.NamespaceUID)))
+		fakeStore.Rules[rule.OrgID] = append(groupRules, otherRules...)
+
+		delta, err := CalculateRuleCreate(context.Background(), fakeStore, rule)
+		require.NoError(t, err)
+
+		assert.Equal(t, rule.GetGroupKey(), delta.GroupKey)
+		assert.Len(t, delta.AffectedGroups, 1)
+		assert.Equal(t, models.RulesGroup(groupRules), delta.AffectedGroups[delta.GroupKey])
+		assert.Empty(t, delta.Delete)
+		assert.Empty(t, delta.Update)
+		assert.Len(t, delta.New, 1)
+		assert.Equal(t, rule, delta.New[0])
+	})
+}
+
 // simulateSubmitted resets some fields of the structure that are not populated by API model to model conversion
 func simulateSubmitted(rule *models.AlertRule) {
 	rule.ID = 0
@@ -457,7 +625,6 @@ func withUIDs(uids map[string]*models.AlertRule) func(rule *models.AlertRule) {
 
 func randFolder() *folder.Folder {
 	return &folder.Folder{
-		ID:        rand.Int63(),
 		UID:       util.GenerateShortUID(),
 		Title:     "TEST-FOLDER-" + util.GenerateShortUID(),
 		URL:       "",
diff --git a/pkg/services/ngalert/store/instance_database.go b/pkg/services/ngalert/store/instance_database.go
index 5e6a3274724e2..57766b9f6f2a4 100644
--- a/pkg/services/ngalert/store/instance_database.go
+++ b/pkg/services/ngalert/store/instance_database.go
@@ -9,6 +9,7 @@ import (
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
 )
 
 // ListAlertInstances is a handler for retrieving alert instances within specific organisation
@@ -30,7 +31,7 @@ func (st DBstore) ListAlertInstances(ctx context.Context, cmd *models.ListAlertI
 		if cmd.RuleUID != "" {
 			addToQuery(` AND rule_uid = ?`, cmd.RuleUID)
 		}
-		if st.FeatureToggles.IsEnabled(featuremgmt.FlagAlertingNoNormalState) {
+		if st.FeatureToggles.IsEnabled(ctx, featuremgmt.FlagAlertingNoNormalState) {
 			s.WriteString(fmt.Sprintf(" AND NOT (current_state = '%s' AND current_reason = '')", models.InstanceStateNormal))
 		}
 		if err := sess.SQL(s.String(), params...).Find(&alertInstances); err != nil {
@@ -54,12 +55,12 @@ func (st DBstore) SaveAlertInstance(ctx context.Context, alertInstance models.Al
 		if err != nil {
 			return err
 		}
-		params := append(make([]any, 0), alertInstance.RuleOrgID, alertInstance.RuleUID, labelTupleJSON, alertInstance.LabelsHash, alertInstance.CurrentState, alertInstance.CurrentReason, alertInstance.CurrentStateSince.Unix(), alertInstance.CurrentStateEnd.Unix(), alertInstance.LastEvalTime.Unix())
+		params := append(make([]any, 0), alertInstance.RuleOrgID, alertInstance.RuleUID, labelTupleJSON, alertInstance.LabelsHash, alertInstance.CurrentState, alertInstance.CurrentReason, alertInstance.CurrentStateSince.Unix(), alertInstance.CurrentStateEnd.Unix(), alertInstance.LastEvalTime.Unix(), alertInstance.ResultFingerprint)
 
 		upsertSQL := st.SQLStore.GetDialect().UpsertSQL(
 			"alert_instance",
 			[]string{"rule_org_id", "rule_uid", "labels_hash"},
-			[]string{"rule_org_id", "rule_uid", "labels", "labels_hash", "current_state", "current_reason", "current_state_since", "current_state_end", "last_eval_time"})
+			[]string{"rule_org_id", "rule_uid", "labels", "labels_hash", "current_state", "current_reason", "current_state_since", "current_state_end", "last_eval_time", "result_fingerprint"})
 		_, err = sess.SQL(upsertSQL, params...).Query()
 		if err != nil {
 			return err
@@ -197,3 +198,36 @@ func (st DBstore) DeleteAlertInstancesByRule(ctx context.Context, key models.Ale
 		return err
 	})
 }
+
+func (st DBstore) FullSync(ctx context.Context, instances []models.AlertInstance) error {
+	if len(instances) == 0 {
+		return nil
+	}
+	return st.SQLStore.WithTransactionalDbSession(ctx, func(sess *sqlstore.DBSession) error {
+		// First we delete all records from the table
+		if _, err := sess.Exec("DELETE FROM alert_instance"); err != nil {
+			return fmt.Errorf("failed to delete alert_instance table: %w", err)
+		}
+		for _, alertInstance := range instances {
+			if err := models.ValidateAlertInstance(alertInstance); err != nil {
+				st.Logger.Warn("Failed to validate alert instance, skipping", "err", err, "rule_uid", alertInstance.RuleUID)
+				continue
+			}
+			labelTupleJSON, err := alertInstance.Labels.StringKey()
+			if err != nil {
+				st.Logger.Warn("Failed to generate alert instance labels key, skipping", "err", err, "rule_uid", alertInstance.RuleUID)
+				continue
+			}
+
+			_, err = sess.Exec("INSERT INTO alert_instance (rule_org_id, rule_uid, labels, labels_hash, current_state, current_reason, current_state_since, current_state_end, last_eval_time) VALUES (?,?,?,?,?,?,?,?,?)",
+				alertInstance.RuleOrgID, alertInstance.RuleUID, labelTupleJSON, alertInstance.LabelsHash, alertInstance.CurrentState, alertInstance.CurrentReason, alertInstance.CurrentStateSince.Unix(), alertInstance.CurrentStateEnd.Unix(), alertInstance.LastEvalTime.Unix())
+			if err != nil {
+				return fmt.Errorf("failed to insert into alert_instance table: %w", err)
+			}
+		}
+		if err := sess.Commit(); err != nil {
+			return fmt.Errorf("failed to commit alert_instance table: %w", err)
+		}
+		return nil
+	})
+}
diff --git a/pkg/services/ngalert/store/instance_database_test.go b/pkg/services/ngalert/store/instance_database_test.go
index 3a055dab3cc3a..bfe44560cc71b 100644
--- a/pkg/services/ngalert/store/instance_database_test.go
+++ b/pkg/services/ngalert/store/instance_database_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 
@@ -294,3 +295,97 @@ func TestIntegrationAlertInstanceOperations(t *testing.T) {
 		require.Equal(t, instance2.CurrentState, alerts[0].CurrentState)
 	})
 }
+
+func TestIntegrationFullSync(t *testing.T) {
+	ctx := context.Background()
+	_, dbstore := tests.SetupTestEnv(t, baseIntervalSeconds)
+
+	orgID := int64(1)
+
+	ruleUIDs := []string{"a", "b", "c", "d"}
+
+	instances := make([]models.AlertInstance, len(ruleUIDs))
+	for i, ruleUID := range ruleUIDs {
+		instances[i] = generateTestAlertInstance(orgID, ruleUID)
+	}
+
+	t.Run("Should do a proper full sync", func(t *testing.T) {
+		err := dbstore.FullSync(ctx, instances)
+		require.NoError(t, err)
+
+		res, err := dbstore.ListAlertInstances(ctx, &models.ListAlertInstancesQuery{
+			RuleOrgID: orgID,
+		})
+		require.NoError(t, err)
+		require.Len(t, res, len(instances))
+		for _, ruleUID := range ruleUIDs {
+			found := false
+			for _, instance := range res {
+				if instance.RuleUID == ruleUID {
+					found = true
+					continue
+				}
+			}
+			if !found {
+				t.Errorf("Instance with RuleUID '%s' not found", ruleUID)
+			}
+		}
+	})
+	t.Run("Should remove non existing entries on sync", func(t *testing.T) {
+		err := dbstore.FullSync(ctx, instances[1:])
+		require.NoError(t, err)
+
+		res, err := dbstore.ListAlertInstances(ctx, &models.ListAlertInstancesQuery{
+			RuleOrgID: orgID,
+		})
+		require.NoError(t, err)
+		require.Len(t, res, len(instances)-1)
+		for _, instance := range res {
+			if instance.RuleUID == "a" {
+				t.Error("Instance with RuleUID 'a' should not be exist anymore")
+			}
+		}
+	})
+	t.Run("Should add new entries on sync", func(t *testing.T) {
+		newRuleUID := "y"
+		err := dbstore.FullSync(ctx, append(instances, generateTestAlertInstance(orgID, newRuleUID)))
+		require.NoError(t, err)
+
+		res, err := dbstore.ListAlertInstances(ctx, &models.ListAlertInstancesQuery{
+			RuleOrgID: orgID,
+		})
+		require.NoError(t, err)
+		require.Len(t, res, len(instances)+1)
+		for _, ruleUID := range append(ruleUIDs, newRuleUID) {
+			found := false
+			for _, instance := range res {
+				if instance.RuleUID == ruleUID {
+					found = true
+					continue
+				}
+			}
+			if !found {
+				t.Errorf("Instance with RuleUID '%s' not found", ruleUID)
+			}
+		}
+	})
+}
+
+func generateTestAlertInstance(orgID int64, ruleID string) models.AlertInstance {
+	return models.AlertInstance{
+		AlertInstanceKey: models.AlertInstanceKey{
+			RuleOrgID:  orgID,
+			RuleUID:    ruleID,
+			LabelsHash: "abc",
+		},
+		CurrentState: models.InstanceStateFiring,
+		Labels: map[string]string{
+			"hello": "world",
+		},
+		ResultFingerprint: "abc",
+		CurrentStateEnd:   time.Now(),
+		CurrentStateSince: time.Now(),
+		LastEvalTime:      time.Now(),
+		CurrentReason:     "abc",
+	}
+}
diff --git a/pkg/services/ngalert/store/range_to_instant.go b/pkg/services/ngalert/store/range_to_instant.go
index 7269084a0cf55..6d3a426e0cb46 100644
--- a/pkg/services/ngalert/store/range_to_instant.go
+++ b/pkg/services/ngalert/store/range_to_instant.go
@@ -14,6 +14,21 @@ const (
 	grafanaCloudUsage = "grafanacloud-usage"
 )
 
+// OptimizeAlertQueries was added to mitigate the high load that could be created by loki range queries.
+// In previous versions of Grafana, Loki datasources would default to range queries
+// instead of instant queries, sometimes creating unnecessary load. This is only
+// done for Grafana Cloud.
+func OptimizeAlertQueries(queries []models.AlertQuery) ([]Optimization, error) {
+	if optimizations, migratable := canBeInstant(queries); migratable {
+		err := migrateToInstant(queries, optimizations)
+		if err != nil {
+			return nil, err
+		}
+		return optimizations, nil
+	}
+	return nil, nil
+}
+
 // DSType can be used to check the datasource type if it's set in the model.
 type dsType struct {
 	DS struct {
@@ -22,7 +37,9 @@ type dsType struct {
 	Range bool `json:"range"`
 }
 
-type optimization struct {
+type Optimization struct {
+	// RefID of the query that can be optimized
+	RefID string
 	// Index of the query that can be optimized
 	i int
 	// Type of the query that ca be optimized (loki,prometheus)
@@ -31,19 +48,19 @@ type optimization struct {
 
 // canBeInstant checks if any of the query nodes that are loki or prometheus range queries can be migrated to instant queries.
 // If any are migratable, those indices are returned.
-func canBeInstant(r *models.AlertRule) ([]optimization, bool) {
-	if len(r.Data) < 2 {
+func canBeInstant(queries []models.AlertQuery) ([]Optimization, bool) {
+	if len(queries) < 2 {
 		return nil, false
 	}
 	var (
-		optimizableIndices []optimization
+		optimizableIndices []Optimization
 		canBeOptimized     = false
 	)
 	// Loop over query nodes to find all range queries.
-	for i := range r.Data {
+	for i := range queries {
 		var t dsType
 		// We can ignore the error here, the query just won't be optimized.
-		_ = json.Unmarshal(r.Data[i].Model, &t)
+		_ = json.Unmarshal(queries[i].Model, &t)
 
 		switch t.DS.Type {
 		case datasources.DS_PROMETHEUS:
@@ -51,13 +68,13 @@ func canBeInstant(r *models.AlertRule) ([]optimization, bool) {
 				continue
 			}
 		case datasources.DS_LOKI:
-			if r.Data[i].QueryType != "range" {
+			if queries[i].QueryType != "range" {
 				continue
 			}
 		default:
 			// The default datasource is not saved as datasource, this is why we need to check for the datasource name.
 			// Here we check the well-known grafana cloud datasources.
-			if r.Data[i].DatasourceUID != grafanaCloudProm && r.Data[i].DatasourceUID != grafanaCloudUsage {
+			if queries[i].DatasourceUID != grafanaCloudProm && queries[i].DatasourceUID != grafanaCloudUsage {
 				continue
 			}
 			if !t.Range {
@@ -68,17 +85,17 @@ func canBeInstant(r *models.AlertRule) ([]optimization, bool) {
 
 		var validReducers bool
 		// Loop over all query nodes to find the reduce node.
-		for ii := range r.Data {
+		for ii := range queries {
 			// Second query part should be and expression.
-			if !expr.IsDataSource(r.Data[ii].DatasourceUID) {
+			if !expr.IsDataSource(queries[ii].DatasourceUID) {
 				continue
 			}
 			exprRaw := make(map[string]any)
-			if err := json.Unmarshal(r.Data[ii].Model, &exprRaw); err != nil {
+			if err := json.Unmarshal(queries[ii].Model, &exprRaw); err != nil {
 				continue
 			}
 			// Second query part should use first query part as expression.
-			if ref, ok := exprRaw["expression"].(string); !ok || ref != r.Data[i].RefID {
+			if ref, ok := exprRaw["expression"].(string); !ok || ref != queries[i].RefID {
 				continue
 			}
 			// Second query part should be "last()"
@@ -91,9 +108,10 @@ func canBeInstant(r *models.AlertRule) ([]optimization, bool) {
 		// If we found a reduce node that uses last, we can add the query to the optimizations.
 		if validReducers {
 			canBeOptimized = true
-			optimizableIndices = append(optimizableIndices, optimization{
-				i: i,
-				t: t.DS.Type,
+			optimizableIndices = append(optimizableIndices, Optimization{
+				RefID: queries[i].RefID,
+				i:     i,
+				t:     t.DS.Type,
 			})
 		}
 	}
@@ -101,10 +119,10 @@ func canBeInstant(r *models.AlertRule) ([]optimization, bool) {
 }
 
 // migrateToInstant will move the provided indices from a range-query to an instant query.
-func migrateToInstant(r *models.AlertRule, optimizations []optimization) error {
+func migrateToInstant(queries []models.AlertQuery, optimizations []Optimization) error {
 	for _, opti := range optimizations {
 		modelRaw := make(map[string]any)
-		if err := json.Unmarshal(r.Data[opti.i].Model, &modelRaw); err != nil {
+		if err := json.Unmarshal(queries[opti.i].Model, &modelRaw); err != nil {
 			return err
 		}
 		switch opti.t {
@@ -115,15 +133,15 @@ func migrateToInstant(r *models.AlertRule, optimizations []optimization) error {
 			if err != nil {
 				return err
 			}
-			r.Data[opti.i].Model = model
+			queries[opti.i].Model = model
 		case datasources.DS_LOKI:
 			modelRaw["queryType"] = "instant"
 			model, err := json.Marshal(modelRaw)
 			if err != nil {
 				return err
 			}
-			r.Data[opti.i].Model = model
-			r.Data[opti.i].QueryType = "instant"
+			queries[opti.i].Model = model
+			queries[opti.i].QueryType = "instant"
 		default:
 			return fmt.Errorf("optimization for datasource of type %s not possible", opti.t)
 		}
diff --git a/pkg/services/ngalert/store/range_to_instant_test.go b/pkg/services/ngalert/store/range_to_instant_test.go
index cb669ff2e00fa..d2852eebe3154 100644
--- a/pkg/services/ngalert/store/range_to_instant_test.go
+++ b/pkg/services/ngalert/store/range_to_instant_test.go
@@ -21,25 +21,25 @@ func TestCanBeInstant(t *testing.T) {
 	tcs := []struct {
 		name                  string
 		expected              bool
-		expectedOptimizations []optimization
+		expectedOptimizations []Optimization
 		rule                  *models.AlertRule
 	}{
 		{
 			name:                  "valid loki rule that can be migrated from range to instant",
 			expected:              true,
-			expectedOptimizations: []optimization{{i: 0, t: datasources.DS_LOKI}},
+			expectedOptimizations: []Optimization{{i: 0, t: datasources.DS_LOKI, RefID: "A"}},
 			rule:                  createMigrateableLokiRule(t),
 		},
 		{
 			name:                  "valid prom rule that can be migrated from range to instant",
 			expected:              true,
-			expectedOptimizations: []optimization{{i: 0, t: datasources.DS_PROMETHEUS}},
+			expectedOptimizations: []Optimization{{i: 0, t: datasources.DS_PROMETHEUS, RefID: "A"}},
 			rule:                  createMigratablePromRule(t),
 		},
 		{
 			name:                  "valid loki rule with external loki datasource",
 			expected:              true,
-			expectedOptimizations: []optimization{{i: 0, t: datasources.DS_LOKI}},
+			expectedOptimizations: []Optimization{{i: 0, t: datasources.DS_LOKI, RefID: "A"}},
 			rule: createMigrateableLokiRule(t, func(r *models.AlertRule) {
 				r.Data[0].DatasourceUID = "something-external"
 			}),
@@ -47,7 +47,7 @@ func TestCanBeInstant(t *testing.T) {
 		{
 			name:                  "valid prom rule with external prometheus datasource",
 			expected:              true,
-			expectedOptimizations: []optimization{{i: 0, t: datasources.DS_PROMETHEUS}},
+			expectedOptimizations: []Optimization{{i: 0, t: datasources.DS_PROMETHEUS, RefID: "A"}},
 			rule: createMigratablePromRule(t, func(r *models.AlertRule) {
 				r.Data[0].DatasourceUID = "something-external"
 			}),
@@ -55,7 +55,7 @@ func TestCanBeInstant(t *testing.T) {
 		{
 			name:                  "valid prom rule with missing datasource",
 			expected:              true,
-			expectedOptimizations: []optimization{{i: 0, t: datasources.DS_PROMETHEUS}},
+			expectedOptimizations: []Optimization{{i: 0, t: datasources.DS_PROMETHEUS, RefID: "A"}},
 			rule:                  createMigratablePromRuleWithDefaultDS(t),
 		},
 		{
@@ -73,18 +73,18 @@ func TestCanBeInstant(t *testing.T) {
 		{
 			name:     "valid loki multi query rule with loki datasources",
 			expected: true,
-			expectedOptimizations: []optimization{
-				{i: 0, t: datasources.DS_LOKI},
-				{i: 1, t: datasources.DS_LOKI},
+			expectedOptimizations: []Optimization{
+				{i: 0, t: datasources.DS_LOKI, RefID: "TotalRequests"},
+				{i: 1, t: datasources.DS_LOKI, RefID: "TotalErrors"},
 			},
 			rule: createMultiQueryMigratableLokiRule(t),
 		},
 		{
 			name:     "valid prom multi query rule with prom datasources",
 			expected: true,
-			expectedOptimizations: []optimization{
-				{i: 0, t: datasources.DS_PROMETHEUS},
-				{i: 1, t: datasources.DS_PROMETHEUS},
+			expectedOptimizations: []Optimization{
+				{i: 0, t: datasources.DS_PROMETHEUS, RefID: "TotalRequests"},
+				{i: 1, t: datasources.DS_PROMETHEUS, RefID: "TotalErrors"},
 			},
 			rule: createMultiQueryMigratablePromRule(t),
 		},
@@ -138,7 +138,7 @@ func TestCanBeInstant(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.name, func(t *testing.T) {
-			optimizations, canBe := canBeInstant(tc.rule)
+			optimizations, canBe := canBeInstant(tc.rule.Data)
 			require.Equal(t, tc.expected, canBe)
 			require.Equal(t, tc.expectedOptimizations, optimizations)
 		})
@@ -147,106 +147,116 @@ func TestCanBeInstant(t *testing.T) {
 
 func TestMigrateLokiQueryToInstant(t *testing.T) {
 	original := createMigrateableLokiRule(t)
-	mirgrated := createMigrateableLokiRule(t, func(r *models.AlertRule) {
+	migrated := createMigrateableLokiRule(t, func(r *models.AlertRule) {
 		r.Data[0] = lokiQuery(t, "A", "instant", "grafanacloud-logs")
 	})
 
-	optimizableIndices, canBeOptimized := canBeInstant(original)
+	optimizableIndices, canBeOptimized := canBeInstant(original.Data)
 	require.True(t, canBeOptimized)
-	require.NoError(t, migrateToInstant(original, optimizableIndices))
+	require.NoError(t, migrateToInstant(original.Data, optimizableIndices))
 
-	require.Equal(t, mirgrated.Data[0].QueryType, original.Data[0].QueryType)
+	require.Equal(t, migrated.Data[0].QueryType, original.Data[0].QueryType)
 
 	originalModel := make(map[string]any)
 	require.NoError(t, json.Unmarshal(original.Data[0].Model, &originalModel))
 	migratedModel := make(map[string]any)
-	require.NoError(t, json.Unmarshal(mirgrated.Data[0].Model, &migratedModel))
+	require.NoError(t, json.Unmarshal(migrated.Data[0].Model, &migratedModel))
 
 	require.Equal(t, migratedModel, originalModel)
 
-	_, canBeOptimized = canBeInstant(original)
+	_, canBeOptimized = canBeInstant(original.Data)
 	require.False(t, canBeOptimized)
 }
 
 func TestMigrateMultiLokiQueryToInstant(t *testing.T) {
 	original := createMultiQueryMigratableLokiRule(t)
-	mirgrated := createMultiQueryMigratableLokiRule(t, func(r *models.AlertRule) {
+	migrated := createMultiQueryMigratableLokiRule(t, func(r *models.AlertRule) {
 		r.Data[0] = lokiQuery(t, "TotalRequests", "instant", "grafanacloud-logs")
 		r.Data[1] = lokiQuery(t, "TotalErrors", "instant", "grafanacloud-logs")
 	})
 
-	optimizableIndices, canBeOptimized := canBeInstant(original)
+	_, canBeOptimized := canBeInstant(original.Data)
 	require.True(t, canBeOptimized)
-	require.NoError(t, migrateToInstant(original, optimizableIndices))
 
-	require.Equal(t, mirgrated.Data[0].QueryType, original.Data[0].QueryType)
-	require.Equal(t, mirgrated.Data[1].QueryType, original.Data[1].QueryType)
+	optimizations, err := OptimizeAlertQueries(original.Data)
+	require.NoError(t, err)
+
+	require.Equal(t, optimizations[0].RefID, original.Data[0].RefID)
+	require.Equal(t, optimizations[1].RefID, original.Data[1].RefID)
+
+	require.Equal(t, migrated.Data[0].QueryType, original.Data[0].QueryType)
+	require.Equal(t, migrated.Data[1].QueryType, original.Data[1].QueryType)
 
 	originalModel := make(map[string]any)
 	require.NoError(t, json.Unmarshal(original.Data[0].Model, &originalModel))
 	migratedModel := make(map[string]any)
-	require.NoError(t, json.Unmarshal(mirgrated.Data[0].Model, &migratedModel))
+	require.NoError(t, json.Unmarshal(migrated.Data[0].Model, &migratedModel))
 
 	require.Equal(t, migratedModel, originalModel)
 
 	originalModel = make(map[string]any)
 	require.NoError(t, json.Unmarshal(original.Data[1].Model, &originalModel))
 	migratedModel = make(map[string]any)
-	require.NoError(t, json.Unmarshal(mirgrated.Data[1].Model, &migratedModel))
+	require.NoError(t, json.Unmarshal(migrated.Data[1].Model, &migratedModel))
 
 	require.Equal(t, migratedModel, originalModel)
 
-	_, canBeOptimized = canBeInstant(original)
+	_, canBeOptimized = canBeInstant(original.Data)
 	require.False(t, canBeOptimized)
 }
 
 func TestMigratePromQueryToInstant(t *testing.T) {
 	original := createMigratablePromRule(t)
-	mirgrated := createMigratablePromRule(t, func(r *models.AlertRule) {
+	migrated := createMigratablePromRule(t, func(r *models.AlertRule) {
 		r.Data[0] = prometheusQuery(t, "A", promExternalDS, promIsInstant)
 	})
 
-	optimizableIndices, canBeOptimized := canBeInstant(original)
+	optimizableIndices, canBeOptimized := canBeInstant(original.Data)
 	require.True(t, canBeOptimized)
-	require.NoError(t, migrateToInstant(original, optimizableIndices))
+	require.NoError(t, migrateToInstant(original.Data, optimizableIndices))
 
 	originalModel := make(map[string]any)
 	require.NoError(t, json.Unmarshal(original.Data[0].Model, &originalModel))
 	migratedModel := make(map[string]any)
-	require.NoError(t, json.Unmarshal(mirgrated.Data[0].Model, &migratedModel))
+	require.NoError(t, json.Unmarshal(migrated.Data[0].Model, &migratedModel))
 
 	require.Equal(t, migratedModel, originalModel)
 
-	_, canBeOptimized = canBeInstant(original)
+	_, canBeOptimized = canBeInstant(original.Data)
 	require.False(t, canBeOptimized)
 }
 
 func TestMigrateMultiPromQueryToInstant(t *testing.T) {
 	original := createMultiQueryMigratablePromRule(t)
-	mirgrated := createMultiQueryMigratablePromRule(t, func(r *models.AlertRule) {
+	migrated := createMultiQueryMigratablePromRule(t, func(r *models.AlertRule) {
 		r.Data[0] = prometheusQuery(t, "TotalRequests", promExternalDS, promIsInstant)
 		r.Data[1] = prometheusQuery(t, "TotalErrors", promExternalDS, promIsInstant)
 	})
 
-	optimizableIndices, canBeOptimized := canBeInstant(original)
+	_, canBeOptimized := canBeInstant(original.Data)
 	require.True(t, canBeOptimized)
-	require.NoError(t, migrateToInstant(original, optimizableIndices))
+
+	optimizations, err := OptimizeAlertQueries(original.Data)
+	require.NoError(t, err)
+
+	require.Equal(t, optimizations[0].RefID, original.Data[0].RefID)
+	require.Equal(t, optimizations[1].RefID, original.Data[1].RefID)
 
 	originalModel := make(map[string]any)
 	require.NoError(t, json.Unmarshal(original.Data[0].Model, &originalModel))
 	migratedModel := make(map[string]any)
-	require.NoError(t, json.Unmarshal(mirgrated.Data[0].Model, &migratedModel))
+	require.NoError(t, json.Unmarshal(migrated.Data[0].Model, &migratedModel))
 
 	require.Equal(t, migratedModel, originalModel)
 
 	originalModel = make(map[string]any)
 	require.NoError(t, json.Unmarshal(original.Data[1].Model, &originalModel))
 	migratedModel = make(map[string]any)
-	require.NoError(t, json.Unmarshal(mirgrated.Data[1].Model, &migratedModel))
+	require.NoError(t, json.Unmarshal(migrated.Data[1].Model, &migratedModel))
 
 	require.Equal(t, migratedModel, originalModel)
 
-	_, canBeOptimized = canBeInstant(original)
+	_, canBeOptimized = canBeInstant(original.Data)
 	require.False(t, canBeOptimized)
 }
 
@@ -326,44 +336,12 @@ func createMultiQueryMigratablePromRule(t *testing.T, muts ...func(*models.Alert
 
 func lokiQuery(t *testing.T, refID, queryType, datasourceUID string) models.AlertQuery {
 	t.Helper()
-	return models.AlertQuery{
-		RefID:         refID,
-		QueryType:     queryType,
-		DatasourceUID: datasourceUID,
-		Model: []byte(fmt.Sprintf(`{
-					"datasource": {
-						"type": "loki",
-						"uid": "%s"
-					},
-					"editorMode": "code",
-					"expr": "1",
-					"intervalMs": 1000,
-					"maxDataPoints": 43200,
-					"queryType": "%s",
-					"refId": "%s"
-				}`, datasourceUID, queryType, refID)),
-	}
+	return models.CreateLokiQuery(refID, "1", 1000, 43200, queryType, datasourceUID)
 }
 
 func prometheusQuery(t *testing.T, refID, datasourceUID string, isInstant bool) models.AlertQuery {
 	t.Helper()
-	return models.AlertQuery{
-		RefID:         refID,
-		DatasourceUID: datasourceUID,
-		Model: []byte(fmt.Sprintf(`{
-					"datasource": {
-						"type": "prometheus",
-						"uid": "%s"
-					},
-					"instant": %t,
-					"range": %t,
-					"editorMode": "code",
-					"expr": "1",
-					"intervalMs": 1000,
-					"maxDataPoints": 43200,
-					"refId": "%s"
-				}`, datasourceUID, isInstant, !isInstant, refID)),
-	}
+	return models.CreatePrometheusQuery(refID, "1", 1000, 43200, isInstant, datasourceUID)
 }
 
 func prometheusQueryWithoutDS(t *testing.T, refID, datasourceUID string, isInstant bool) models.AlertQuery {
@@ -385,42 +363,5 @@ func prometheusQueryWithoutDS(t *testing.T, refID, datasourceUID string, isInsta
 
 func reducer(t *testing.T, refID, exp, op string) models.AlertQuery {
 	t.Helper()
-	return models.AlertQuery{
-		RefID:         refID,
-		DatasourceUID: "__expr__",
-		Model: []byte(fmt.Sprintf(`{
-					"conditions": [
-						{
-							"evaluator": {
-								"params": [],
-								"type": "gt"
-							},
-							"operator": {
-								"type": "and"
-							},
-							"query": {
-								"params": [
-									"B"
-								]
-							},
-							"reducer": {
-								"params": [],
-								"type": "%s"
-							},
-							"type": "query"
-						}
-					],
-					"datasource": {
-						"type": "__expr__",
-						"uid": "__expr__"
-					},
-					"expression": "%s",
-					"hide": false,
-					"intervalMs": 1000,
-					"maxDataPoints": 43200,
-					"reducer": "%s",
-					"refId": "%s",
-					"type": "reduce"
-				}`, op, exp, op, refID)),
-	}
+	return models.CreateReduceExpression(refID, exp, op)
 }
diff --git a/pkg/services/ngalert/tests/fakes/config.go b/pkg/services/ngalert/tests/fakes/config.go
new file mode 100644
index 0000000000000..c77450f6ca50e
--- /dev/null
+++ b/pkg/services/ngalert/tests/fakes/config.go
@@ -0,0 +1,58 @@
+package fakes
+
+import (
+	"context"
+	"crypto/md5"
+	"fmt"
+
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+)
+
+type FakeAlertmanagerConfigStore struct {
+	Config models.AlertConfiguration
+	// GetFn is an optional function that can be set to mock the GetLatestAlertmanagerConfiguration method
+	GetFn func(ctx context.Context, orgID int64) (*models.AlertConfiguration, error)
+	// UpdateFn is an optional function that can be set to mock the UpdateAlertmanagerConfiguration method
+	UpdateFn func(ctx context.Context, cmd *models.SaveAlertmanagerConfigurationCmd) error
+	// LastSaveCommand is the last command that was passed to UpdateAlertmanagerConfiguration
+	LastSaveCommand *models.SaveAlertmanagerConfigurationCmd
+}
+
+func NewFakeAlertmanagerConfigStore(config string) *FakeAlertmanagerConfigStore {
+	return &FakeAlertmanagerConfigStore{
+		Config: models.AlertConfiguration{
+			AlertmanagerConfiguration: config,
+			ConfigurationVersion:      "v1",
+			Default:                   true,
+			OrgID:                     1,
+		},
+		LastSaveCommand: nil,
+	}
+}
+
+func (f *FakeAlertmanagerConfigStore) GetLatestAlertmanagerConfiguration(ctx context.Context, orgID int64) (*models.AlertConfiguration, error) {
+	if f.GetFn != nil {
+		return f.GetFn(ctx, orgID)
+	}
+
+	result := &f.Config
+	result.OrgID = orgID
+	result.ConfigurationHash = fmt.Sprintf("%x", md5.Sum([]byte(f.Config.AlertmanagerConfiguration)))
+	result.ConfigurationVersion = f.Config.ConfigurationVersion
+	return result, nil
+}
+
+func (f *FakeAlertmanagerConfigStore) UpdateAlertmanagerConfiguration(ctx context.Context, cmd *models.SaveAlertmanagerConfigurationCmd) error {
+	if f.UpdateFn != nil {
+		return f.UpdateFn(ctx, cmd)
+	}
+
+	f.Config = models.AlertConfiguration{
+		AlertmanagerConfiguration: cmd.AlertmanagerConfiguration,
+		ConfigurationVersion:      cmd.ConfigurationVersion,
+		Default:                   cmd.Default,
+		OrgID:                     cmd.OrgID,
+	}
+	f.LastSaveCommand = cmd
+	return nil
+}
diff --git a/pkg/services/ngalert/tests/fakes/kvstore.go b/pkg/services/ngalert/tests/fakes/kvstore.go
index 7ef60184b8349..ecf569554d2ea 100644
--- a/pkg/services/ngalert/tests/fakes/kvstore.go
+++ b/pkg/services/ngalert/tests/fakes/kvstore.go
@@ -98,5 +98,25 @@ func (fkv *FakeKVStore) Keys(ctx context.Context, orgID int64, namespace string,
 }
 
 func (fkv *FakeKVStore) GetAll(ctx context.Context, orgId int64, namespace string) (map[int64]map[string]string, error) {
-	return nil, nil
+	fkv.Mtx.Lock()
+	defer fkv.Mtx.Unlock()
+
+	all := map[int64]map[string]string{
+		orgId: make(map[string]string),
+	}
+
+	org, ok := fkv.Store[orgId]
+	if !ok {
+		return nil, nil
+	}
+
+	values, ok := org[namespace]
+	if !ok {
+		return all, nil
+	}
+
+	for k, v := range values {
+		all[orgId][k] = v
+	}
+	return all, nil
 }
diff --git a/pkg/services/ngalert/tests/fakes/provisioning.go b/pkg/services/ngalert/tests/fakes/provisioning.go
new file mode 100644
index 0000000000000..1274fa42ff638
--- /dev/null
+++ b/pkg/services/ngalert/tests/fakes/provisioning.go
@@ -0,0 +1,55 @@
+package fakes
+
+import (
+	"context"
+	"strings"
+
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+)
+
+type FakeProvisioningStore struct {
+	Records map[int64]map[string]models.Provenance
+}
+
+func NewFakeProvisioningStore() *FakeProvisioningStore {
+	return &FakeProvisioningStore{
+		Records: map[int64]map[string]models.Provenance{},
+	}
+}
+
+func (f *FakeProvisioningStore) GetProvenance(ctx context.Context, o models.Provisionable, org int64) (models.Provenance, error) {
+	if val, ok := f.Records[org]; ok {
+		if prov, ok := val[o.ResourceID()+o.ResourceType()]; ok {
+			return prov, nil
+		}
+	}
+	return models.ProvenanceNone, nil
+}
+
+func (f *FakeProvisioningStore) GetProvenances(ctx context.Context, orgID int64, resourceType string) (map[string]models.Provenance, error) {
+	results := make(map[string]models.Provenance)
+	if val, ok := f.Records[orgID]; ok {
+		for k, v := range val {
+			if strings.HasSuffix(k, resourceType) {
+				results[strings.TrimSuffix(k, resourceType)] = v
+			}
+		}
+	}
+	return results, nil
+}
+
+func (f *FakeProvisioningStore) SetProvenance(ctx context.Context, o models.Provisionable, org int64, p models.Provenance) error {
+	if _, ok := f.Records[org]; !ok {
+		f.Records[org] = map[string]models.Provenance{}
+	}
+	_ = f.DeleteProvenance(ctx, o, org) // delete old entries first
+	f.Records[org][o.ResourceID()+o.ResourceType()] = p
+	return nil
+}
+
+func (f *FakeProvisioningStore) DeleteProvenance(ctx context.Context, o models.Provisionable, org int64) error {
+	if val, ok := f.Records[org]; ok {
+		delete(val, o.ResourceID()+o.ResourceType())
+	}
+	return nil
+}
diff --git a/pkg/services/ngalert/tests/fakes/receivers.go b/pkg/services/ngalert/tests/fakes/receivers.go
new file mode 100644
index 0000000000000..0840e100f9068
--- /dev/null
+++ b/pkg/services/ngalert/tests/fakes/receivers.go
@@ -0,0 +1,60 @@
+package fakes
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+)
+
+type ReceiverServiceMethodCall struct {
+	Method string
+	Args   []interface{}
+}
+
+type FakeReceiverService struct {
+	MethodCalls    []ReceiverServiceMethodCall
+	GetReceiverFn  func(ctx context.Context, q models.GetReceiverQuery, u identity.Requester) (definitions.GettableApiReceiver, error)
+	GetReceiversFn func(ctx context.Context, q models.GetReceiversQuery, u identity.Requester) ([]definitions.GettableApiReceiver, error)
+}
+
+func NewFakeReceiverService() *FakeReceiverService {
+	return &FakeReceiverService{
+		GetReceiverFn:  defaultReceiverFn,
+		GetReceiversFn: defaultReceiversFn,
+	}
+}
+
+func (f *FakeReceiverService) GetReceiver(ctx context.Context, q models.GetReceiverQuery, u identity.Requester) (definitions.GettableApiReceiver, error) {
+	f.MethodCalls = append(f.MethodCalls, ReceiverServiceMethodCall{Method: "GetReceiver", Args: []interface{}{ctx, q}})
+	return f.GetReceiverFn(ctx, q, u)
+}
+
+func (f *FakeReceiverService) GetReceivers(ctx context.Context, q models.GetReceiversQuery, u identity.Requester) ([]definitions.GettableApiReceiver, error) {
+	f.MethodCalls = append(f.MethodCalls, ReceiverServiceMethodCall{Method: "GetReceivers", Args: []interface{}{ctx, q}})
+	return f.GetReceiversFn(ctx, q, u)
+}
+
+func (f *FakeReceiverService) PopMethodCall() ReceiverServiceMethodCall {
+	if len(f.MethodCalls) == 0 {
+		return ReceiverServiceMethodCall{}
+	}
+	call := f.MethodCalls[len(f.MethodCalls)-1]
+	f.MethodCalls = f.MethodCalls[:len(f.MethodCalls)-1]
+	return call
+}
+
+func (f *FakeReceiverService) Reset() {
+	f.MethodCalls = nil
+	f.GetReceiverFn = defaultReceiverFn
+	f.GetReceiversFn = defaultReceiversFn
+}
+
+func defaultReceiverFn(ctx context.Context, q models.GetReceiverQuery, u identity.Requester) (definitions.GettableApiReceiver, error) {
+	return definitions.GettableApiReceiver{}, nil
+}
+
+func defaultReceiversFn(ctx context.Context, q models.GetReceiversQuery, u identity.Requester) ([]definitions.GettableApiReceiver, error) {
+	return nil, nil
+}
diff --git a/pkg/services/ngalert/tests/fakes/rules.go b/pkg/services/ngalert/tests/fakes/rules.go
index df5d691c85ca5..1714011d0bf6f 100644
--- a/pkg/services/ngalert/tests/fakes/rules.go
+++ b/pkg/services/ngalert/tests/fakes/rules.go
@@ -2,17 +2,16 @@ package fakes
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"math/rand"
 	"sync"
 	"testing"
 	"time"
 
+	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
-	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/util"
 )
 
@@ -68,8 +67,9 @@ mainloop:
 			}
 		}
 		if existing == nil {
+			metrics.MFolderIDsServiceCount.WithLabelValues(metrics.NGAlerts).Inc()
 			folders = append(folders, &folder.Folder{
-				ID:    rand.Int63(),
+				ID:    rand.Int63(), // nolint:staticcheck
 				UID:   r.NamespaceUID,
 				Title: "TEST-FOLDER-" + util.GenerateShortUID(),
 			})
@@ -229,7 +229,7 @@ func (f *RuleStore) ListAlertRules(_ context.Context, q *models.ListAlertRulesQu
 	return ruleList, nil
 }
 
-func (f *RuleStore) GetUserVisibleNamespaces(_ context.Context, orgID int64, _ *user.SignedInUser) (map[string]*folder.Folder, error) {
+func (f *RuleStore) GetUserVisibleNamespaces(_ context.Context, orgID int64, _ identity.Requester) (map[string]*folder.Folder, error) {
 	f.mtx.Lock()
 	defer f.mtx.Unlock()
 
@@ -246,22 +246,18 @@ func (f *RuleStore) GetUserVisibleNamespaces(_ context.Context, orgID int64, _ *
 	return namespacesMap, nil
 }
 
-func (f *RuleStore) GetNamespaceByTitle(_ context.Context, title string, orgID int64, _ *user.SignedInUser) (*folder.Folder, error) {
-	folders := f.Folders[orgID]
-	for _, folder := range folders {
-		if folder.Title == title {
-			return folder, nil
-		}
-	}
-	return nil, fmt.Errorf("not found")
-}
-
-func (f *RuleStore) GetNamespaceByUID(_ context.Context, uid string, orgID int64, _ *user.SignedInUser) (*folder.Folder, error) {
-	f.RecordedOps = append(f.RecordedOps, GenericRecordedQuery{
+func (f *RuleStore) GetNamespaceByUID(_ context.Context, uid string, orgID int64, user identity.Requester) (*folder.Folder, error) {
+	q := GenericRecordedQuery{
 		Name:   "GetNamespaceByUID",
-		Params: []any{orgID, uid},
-	})
-
+		Params: []any{orgID, uid, user},
+	}
+	defer func() {
+		f.RecordedOps = append(f.RecordedOps, q)
+	}()
+	err := f.Hook(q)
+	if err != nil {
+		return nil, err
+	}
 	folders := f.Folders[orgID]
 	for _, folder := range folders {
 		if folder.UID == uid {
@@ -286,6 +282,12 @@ func (f *RuleStore) InsertAlertRules(_ context.Context, q []models.AlertRule) ([
 	defer f.mtx.Unlock()
 	f.RecordedOps = append(f.RecordedOps, q)
 	ids := make([]models.AlertRuleKeyWithId, 0, len(q))
+	for _, rule := range q {
+		ids = append(ids, models.AlertRuleKeyWithId{
+			AlertRuleKey: rule.GetKey(),
+			ID:           rand.Int63(),
+		})
+	}
 	if err := f.Hook(q); err != nil {
 		return ids, err
 	}
@@ -299,12 +301,16 @@ func (f *RuleStore) InTransaction(ctx context.Context, fn func(c context.Context
 func (f *RuleStore) GetRuleGroupInterval(ctx context.Context, orgID int64, namespaceUID string, ruleGroup string) (int64, error) {
 	f.mtx.Lock()
 	defer f.mtx.Unlock()
+	f.RecordedOps = append(f.RecordedOps, GenericRecordedQuery{
+		Name:   "GetRuleGroupInterval",
+		Params: []any{orgID, namespaceUID, ruleGroup},
+	})
 	for _, rule := range f.Rules[orgID] {
 		if rule.RuleGroup == ruleGroup && rule.NamespaceUID == namespaceUID {
 			return rule.IntervalSeconds, nil
 		}
 	}
-	return 0, errors.New("rule group not found")
+	return 0, models.ErrAlertRuleGroupNotFound.Errorf("")
 }
 
 func (f *RuleStore) UpdateRuleGroup(ctx context.Context, orgID int64, namespaceUID string, ruleGroup string, interval int64) error {
@@ -318,7 +324,7 @@ func (f *RuleStore) UpdateRuleGroup(ctx context.Context, orgID int64, namespaceU
 	return nil
 }
 
-func (f *RuleStore) IncreaseVersionForAllRulesInNamespace(_ context.Context, orgID int64, namespaceUID string) ([]models.AlertRuleKeyWithVersionAndPauseStatus, error) {
+func (f *RuleStore) IncreaseVersionForAllRulesInNamespace(_ context.Context, orgID int64, namespaceUID string) ([]models.AlertRuleKeyWithVersion, error) {
 	f.mtx.Lock()
 	defer f.mtx.Unlock()
 
@@ -327,28 +333,21 @@ func (f *RuleStore) IncreaseVersionForAllRulesInNamespace(_ context.Context, org
 		Params: []any{orgID, namespaceUID},
 	})
 
-	var result []models.AlertRuleKeyWithVersionAndPauseStatus
+	var result []models.AlertRuleKeyWithVersion
 
 	for _, rule := range f.Rules[orgID] {
 		if rule.NamespaceUID == namespaceUID && rule.OrgID == orgID {
 			rule.Version++
 			rule.Updated = time.Now()
-			result = append(result, models.AlertRuleKeyWithVersionAndPauseStatus{
-				IsPaused: rule.IsPaused,
-				AlertRuleKeyWithVersion: models.AlertRuleKeyWithVersion{
-					Version:      rule.Version,
-					AlertRuleKey: rule.GetKey(),
-				},
+			result = append(result, models.AlertRuleKeyWithVersion{
+				Version:      rule.Version,
+				AlertRuleKey: rule.GetKey(),
 			})
 		}
 	}
 	return result, nil
 }
 
-func (f *RuleStore) Count(ctx context.Context, orgID int64) (int64, error) {
-	return 0, nil
-}
-
-func (f *RuleStore) CountInFolder(ctx context.Context, orgID int64, folderUID string, u identity.Requester) (int64, error) {
+func (f *RuleStore) CountInFolders(ctx context.Context, orgID int64, folderUIDs []string, u identity.Requester) (int64, error) {
 	return 0, nil
 }
diff --git a/pkg/services/ngalert/tests/util.go b/pkg/services/ngalert/tests/util.go
index d63b06b126ef4..1e24685f3b981 100644
--- a/pkg/services/ngalert/tests/util.go
+++ b/pkg/services/ngalert/tests/util.go
@@ -15,6 +15,7 @@ import (
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/infra/appcontext"
 	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/infra/kvstore"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
@@ -25,7 +26,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/folder/folderimpl"
 	"github.com/grafana/grafana/pkg/services/ngalert"
 	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
-	"github.com/grafana/grafana/pkg/services/ngalert/migration"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/store"
 	"github.com/grafana/grafana/pkg/services/ngalert/testutil"
@@ -44,7 +44,6 @@ func SetupTestEnv(tb testing.TB, baseInterval time.Duration) (*ngalert.AlertNG,
 	tb.Helper()
 
 	cfg := setting.NewCfg()
-	cfg.IsFeatureToggleEnabled = featuremgmt.WithFeatures().IsEnabled
 	cfg.UnifiedAlerting = setting.UnifiedAlertingSettings{
 		BaseInterval: setting.SchedulerBaseInterval,
 	}
@@ -62,18 +61,18 @@ func SetupTestEnv(tb testing.TB, baseInterval time.Duration) (*ngalert.AlertNG,
 	bus := bus.ProvideBus(tracer)
 	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
 	dashboardService, dashboardStore := testutil.SetupDashboardService(tb, sqlStore, folderStore, cfg)
-	folderService := testutil.SetupFolderService(tb, cfg, sqlStore, dashboardStore, folderStore, bus)
-	ruleStore, err := store.ProvideDBStore(cfg, featuremgmt.WithFeatures(), sqlStore, folderService,
-		ac, &dashboards.FakeDashboardService{})
+	features := featuremgmt.WithFeatures()
+	folderService := testutil.SetupFolderService(tb, cfg, sqlStore, dashboardStore, folderStore, bus, features, ac)
+	ruleStore, err := store.ProvideDBStore(cfg, featuremgmt.WithFeatures(), sqlStore, folderService, &dashboards.FakeDashboardService{}, ac)
 	require.NoError(tb, err)
 	ng, err := ngalert.ProvideService(
-		cfg, featuremgmt.WithFeatures(), nil, nil, routing.NewRouteRegister(), sqlStore, nil, nil, nil, quotatest.New(false, nil),
+		cfg, features, nil, nil, routing.NewRouteRegister(), sqlStore, kvstore.NewFakeKVStore(), nil, nil, quotatest.New(false, nil),
 		secretsService, nil, m, folderService, ac, &dashboards.FakeDashboardService{}, nil, bus, ac,
-		annotationstest.NewFakeAnnotationsRepo(), &pluginstore.FakePluginStore{}, tracer, ruleStore, migration.NewFakeMigrationService(tb), nil,
+		annotationstest.NewFakeAnnotationsRepo(), &pluginstore.FakePluginStore{}, tracer, ruleStore,
 	)
 	require.NoError(tb, err)
 	return ng, &store.DBstore{
-		FeatureToggles: ng.FeatureToggles,
+		FeatureToggles: features,
 		SQLStore:       ng.SQLStore,
 		Cfg: setting.UnifiedAlertingSettings{
 			BaseInterval: baseInterval * time.Second,
diff --git a/pkg/services/ngalert/testutil/testutil.go b/pkg/services/ngalert/testutil/testutil.go
index 09b6e568c7127..1a4acf5e610db 100644
--- a/pkg/services/ngalert/testutil/testutil.go
+++ b/pkg/services/ngalert/testutil/testutil.go
@@ -3,6 +3,9 @@ package testutil
 import (
 	"testing"
 
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
@@ -17,19 +20,14 @@ import (
 	"github.com/grafana/grafana/pkg/services/guardian"
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
 	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
 	"github.com/grafana/grafana/pkg/setting"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
 )
 
-func SetupFolderService(tb testing.TB, cfg *setting.Cfg, db db.DB, dashboardStore dashboards.Store, folderStore *folderimpl.DashboardFolderStoreImpl, bus *bus.InProcBus) folder.Service {
+func SetupFolderService(tb testing.TB, cfg *setting.Cfg, db db.DB, dashboardStore dashboards.Store, folderStore *folderimpl.DashboardFolderStoreImpl, bus *bus.InProcBus, features featuremgmt.FeatureToggles, ac accesscontrol.AccessControl) folder.Service {
 	tb.Helper()
-
-	ac := acmock.New()
-	features := featuremgmt.WithFeatures()
-
-	return folderimpl.ProvideService(ac, bus, cfg, dashboardStore, folderStore, db, features)
+	return folderimpl.ProvideService(ac, bus, cfg, dashboardStore, folderStore, db, features, supportbundlestest.NewFakeBundleService(), nil)
 }
 
 func SetupDashboardService(tb testing.TB, sqlStore *sqlstore.SQLStore, fs *folderimpl.DashboardFolderStoreImpl, cfg *setting.Cfg) (*dashboardservice.DashboardServiceImpl, dashboards.Store) {
@@ -53,13 +51,14 @@ func SetupDashboardService(tb testing.TB, sqlStore *sqlstore.SQLStore, fs *folde
 	features := featuremgmt.WithFeatures()
 	quotaService := quotatest.New(false, nil)
 
-	dashboardStore, err := database.ProvideDashboardStore(sqlStore, sqlStore.Cfg, features, tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
+	dashboardStore, err := database.ProvideDashboardStore(sqlStore, sqlStore.Cfg, features, tagimpl.ProvideService(sqlStore), quotaService)
 	require.NoError(tb, err)
 
 	dashboardService, err := dashboardservice.ProvideDashboardServiceImpl(
-		cfg, dashboardStore, fs, nil,
+		cfg, dashboardStore, fs,
 		features, folderPermissions, dashboardPermissions, ac,
 		foldertest.NewFakeService(),
+		nil,
 	)
 	require.NoError(tb, err)
 
diff --git a/pkg/services/notifications/codes.go b/pkg/services/notifications/codes.go
index d345755191ef9..1b2df44c9743a 100644
--- a/pkg/services/notifications/codes.go
+++ b/pkg/services/notifications/codes.go
@@ -19,7 +19,7 @@ const timeLimitCodeLength = timeLimitStartDateLength + timeLimitMinutesLength +
 
 // create a time limit code
 // code format: 12 length date time string + 6 minutes string + 64 HMAC-SHA256 encoded string
-func createTimeLimitCode(payload string, minutes int, startStr string) (string, error) {
+func createTimeLimitCode(secretKey string, payload string, minutes int, startStr string) (string, error) {
 	format := "200601021504"
 
 	var start, end time.Time
@@ -42,7 +42,7 @@ func createTimeLimitCode(payload string, minutes int, startStr string) (string,
 	endStr = end.Format(format)
 
 	// create HMAC-SHA256 encoded string
-	key := []byte(setting.SecretKey)
+	key := []byte(secretKey)
 	h := hmac.New(sha256.New, key)
 	if _, err := h.Write([]byte(payload + startStr + endStr)); err != nil {
 		return "", fmt.Errorf("cannot create hmac: %v", err)
@@ -70,8 +70,8 @@ func validateUserEmailCode(cfg *setting.Cfg, user *user.User, code string) (bool
 	}
 
 	// right active code
-	payload := strconv.FormatInt(user.ID, 10) + user.Email + user.Login + user.Password + user.Rands
-	expectedCode, err := createTimeLimitCode(payload, minutes, startStr)
+	payload := strconv.FormatInt(user.ID, 10) + user.Email + user.Login + string(user.Password) + user.Rands
+	expectedCode, err := createTimeLimitCode(cfg.SecretKey, payload, minutes, startStr)
 	if err != nil {
 		return false, err
 	}
@@ -103,8 +103,8 @@ func getLoginForEmailCode(code string) string {
 
 func createUserEmailCode(cfg *setting.Cfg, user *user.User, startStr string) (string, error) {
 	minutes := cfg.EmailCodeValidMinutes
-	payload := strconv.FormatInt(user.ID, 10) + user.Email + user.Login + user.Password + user.Rands
-	code, err := createTimeLimitCode(payload, minutes, startStr)
+	payload := strconv.FormatInt(user.ID, 10) + user.Email + user.Login + string(user.Password) + user.Rands
+	code, err := createTimeLimitCode(cfg.SecretKey, payload, minutes, startStr)
 	if err != nil {
 		return "", err
 	}
diff --git a/pkg/services/notifications/codes_test.go b/pkg/services/notifications/codes_test.go
index fbcfce51e197b..36105c7545f7c 100644
--- a/pkg/services/notifications/codes_test.go
+++ b/pkg/services/notifications/codes_test.go
@@ -18,7 +18,7 @@ func TestTimeLimitCodes(t *testing.T) {
 	user := &user.User{ID: 10, Email: "t@a.com", Login: "asd", Password: "1", Rands: "2"}
 
 	format := "200601021504"
-	mailPayload := strconv.FormatInt(user.ID, 10) + user.Email + user.Login + user.Password + user.Rands
+	mailPayload := strconv.FormatInt(user.ID, 10) + user.Email + user.Login + string(user.Password) + user.Rands
 	tenMinutesAgo := time.Now().Add(-time.Minute * 10)
 
 	tests := []struct {
@@ -76,7 +76,7 @@ func TestTimeLimitCodes(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.desc, func(t *testing.T) {
-			code, err := createTimeLimitCode(test.payload, test.minutes, test.start.Format(format))
+			code, err := createTimeLimitCode(cfg.SecretKey, test.payload, test.minutes, test.start.Format(format))
 			require.NoError(t, err)
 
 			isValid, err := validateUserEmailCode(cfg, user, code)
@@ -86,7 +86,7 @@ func TestTimeLimitCodes(t *testing.T) {
 	}
 
 	t.Run("tampered minutes", func(t *testing.T) {
-		code, err := createTimeLimitCode(mailPayload, 5, tenMinutesAgo.Format(format))
+		code, err := createTimeLimitCode(cfg.SecretKey, mailPayload, 5, tenMinutesAgo.Format(format))
 		require.NoError(t, err)
 
 		// code is expired
@@ -102,7 +102,7 @@ func TestTimeLimitCodes(t *testing.T) {
 	})
 
 	t.Run("tampered start string", func(t *testing.T) {
-		code, err := createTimeLimitCode(mailPayload, 5, tenMinutesAgo.Format(format))
+		code, err := createTimeLimitCode(cfg.SecretKey, mailPayload, 5, tenMinutesAgo.Format(format))
 		require.NoError(t, err)
 
 		// code is expired
diff --git a/pkg/services/notifications/email.go b/pkg/services/notifications/email.go
index 2b2fa0fce6494..e50646b966234 100644
--- a/pkg/services/notifications/email.go
+++ b/pkg/services/notifications/email.go
@@ -25,7 +25,7 @@ type Message struct {
 }
 
 func setDefaultTemplateData(cfg *setting.Cfg, data map[string]any, u *user.User) {
-	data["AppUrl"] = setting.AppUrl
+	data["AppUrl"] = cfg.AppURL
 	data["BuildVersion"] = setting.BuildVersion
 	data["BuildStamp"] = setting.BuildStamp
 	data["EmailCodeValidHours"] = cfg.EmailCodeValidMinutes / 60
diff --git a/pkg/services/notifications/mailer.go b/pkg/services/notifications/mailer.go
index 2627fc412a2c1..7382454751f08 100644
--- a/pkg/services/notifications/mailer.go
+++ b/pkg/services/notifications/mailer.go
@@ -6,6 +6,7 @@ package notifications
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"html/template"
 	"net/mail"
@@ -34,10 +35,10 @@ func init() {
 }
 
 type Mailer interface {
-	Send(messages ...*Message) (int, error)
+	Send(ctx context.Context, messages ...*Message) (int, error)
 }
 
-func (ns *NotificationService) Send(msg *Message) (int, error) {
+func (ns *NotificationService) Send(ctx context.Context, msg *Message) (int, error) {
 	messages := []*Message{}
 
 	if msg.SingleEmail {
@@ -50,7 +51,7 @@ func (ns *NotificationService) Send(msg *Message) (int, error) {
 		}
 	}
 
-	return ns.mailer.Send(messages...)
+	return ns.mailer.Send(ctx, messages...)
 }
 
 func (ns *NotificationService) buildEmailMessage(cmd *SendEmailCommand) (*Message, error) {
diff --git a/pkg/services/notifications/mock.go b/pkg/services/notifications/mock.go
index 2e874ad6570c7..89240b26bcb05 100644
--- a/pkg/services/notifications/mock.go
+++ b/pkg/services/notifications/mock.go
@@ -2,13 +2,17 @@ package notifications
 
 import (
 	"context"
+
+	"github.com/grafana/grafana/pkg/services/user"
 )
 
 type NotificationServiceMock struct {
-	Webhook     SendWebhookSync
-	EmailSync   SendEmailCommandSync
-	Email       SendEmailCommand
-	ShouldError error
+	Webhook           SendWebhookSync
+	EmailSync         SendEmailCommandSync
+	Email             SendEmailCommand
+	EmailVerified     bool
+	EmailVerification SendVerifyEmailCommand
+	ShouldError       error
 
 	WebhookHandler   func(context.Context, *SendWebhookSync) error
 	EmailHandlerSync func(context.Context, *SendEmailCommandSync) error
@@ -39,4 +43,20 @@ func (ns *NotificationServiceMock) SendEmailCommandHandler(ctx context.Context,
 	return ns.ShouldError
 }
 
+func (ns *NotificationServiceMock) SendResetPasswordEmail(ctx context.Context, cmd *SendResetPasswordEmailCommand) error {
+	// TODO: Implement if needed
+	return ns.ShouldError
+}
+
+func (ns *NotificationServiceMock) ValidateResetPasswordCode(ctx context.Context, query *ValidateResetPasswordCodeQuery, userByLogin GetUserByLoginFunc) (*user.User, error) {
+	// TODO: Implement if needed
+	return nil, ns.ShouldError
+}
+
+func (ns *NotificationServiceMock) SendVerificationEmail(ctx context.Context, cmd *SendVerifyEmailCommand) error {
+	ns.EmailVerified = true
+	ns.EmailVerification = *cmd
+	return ns.ShouldError
+}
+
 func MockNotificationService() *NotificationServiceMock { return &NotificationServiceMock{} }
diff --git a/pkg/services/notifications/models.go b/pkg/services/notifications/models.go
index 1b266a6ed6ba2..289b2566c2713 100644
--- a/pkg/services/notifications/models.go
+++ b/pkg/services/notifications/models.go
@@ -51,3 +51,9 @@ type SendResetPasswordEmailCommand struct {
 type ValidateResetPasswordCodeQuery struct {
 	Code string
 }
+
+type SendVerifyEmailCommand struct {
+	User  *user.User
+	Code  string
+	Email string
+}
diff --git a/pkg/services/notifications/notifications.go b/pkg/services/notifications/notifications.go
index 17d66f6450563..b69b43f01c874 100644
--- a/pkg/services/notifications/notifications.go
+++ b/pkg/services/notifications/notifications.go
@@ -28,15 +28,28 @@ type EmailSender interface {
 	SendEmailCommandHandlerSync(ctx context.Context, cmd *SendEmailCommandSync) error
 	SendEmailCommandHandler(ctx context.Context, cmd *SendEmailCommand) error
 }
+type PasswordResetMailer interface {
+	SendResetPasswordEmail(ctx context.Context, cmd *SendResetPasswordEmailCommand) error
+	ValidateResetPasswordCode(ctx context.Context, query *ValidateResetPasswordCodeQuery, userByLogin GetUserByLoginFunc) (*user.User, error)
+}
+type EmailVerificationMailer interface {
+	SendVerificationEmail(ctx context.Context, cmd *SendVerifyEmailCommand) error
+}
 type Service interface {
 	WebhookSender
 	EmailSender
+	PasswordResetMailer
+	EmailVerificationMailer
 }
 
 var mailTemplates *template.Template
-var tmplResetPassword = "reset_password"
-var tmplSignUpStarted = "signup_started"
-var tmplWelcomeOnSignUp = "welcome_on_signup"
+
+const (
+	tmplResetPassword   = "reset_password"
+	tmplSignUpStarted   = "signup_started"
+	tmplWelcomeOnSignUp = "welcome_on_signup"
+	tmplVerifyEmail     = "verify_email"
+)
 
 func ProvideService(bus bus.Bus, cfg *setting.Cfg, mailer Mailer, store TempUserStore) (*NotificationService, error) {
 	ns := &NotificationService{
@@ -112,7 +125,7 @@ func (ns *NotificationService) Run(ctx context.Context) error {
 				ns.log.Error("Failed to send webrequest ", "error", err)
 			}
 		case msg := <-ns.mailQueue:
-			num, err := ns.Send(msg)
+			num, err := ns.Send(ctx, msg)
 			tos := strings.Join(msg.To, "; ")
 			info := ""
 			if err != nil {
@@ -203,7 +216,7 @@ func (ns *NotificationService) SendEmailCommandHandlerSync(ctx context.Context,
 		return err
 	}
 
-	_, err = ns.Send(message)
+	_, err = ns.Send(ctx, message)
 	return err
 }
 
@@ -257,8 +270,22 @@ func (ns *NotificationService) ValidateResetPasswordCode(ctx context.Context, qu
 	return user, nil
 }
 
+func (ns *NotificationService) SendVerificationEmail(ctx context.Context, cmd *SendVerifyEmailCommand) error {
+	return ns.SendEmailCommandHandlerSync(ctx, &SendEmailCommandSync{
+		SendEmailCommand: SendEmailCommand{
+			To:       []string{cmd.Email},
+			Template: tmplVerifyEmail,
+			Data: map[string]any{
+				"Code":                           url.QueryEscape(cmd.Code),
+				"Name":                           cmd.User.Name,
+				"VerificationEmailLifetimeHours": int(ns.Cfg.VerificationEmailMaxLifetime.Hours()),
+			},
+		},
+	})
+}
+
 func (ns *NotificationService) signUpStartedHandler(ctx context.Context, evt *events.SignUpStarted) error {
-	if !setting.VerifyEmailEnabled {
+	if !ns.Cfg.VerifyEmailEnabled {
 		return nil
 	}
 
diff --git a/pkg/services/notifications/smtp.go b/pkg/services/notifications/smtp.go
index c012a11d5c076..2c46982b352ef 100644
--- a/pkg/services/notifications/smtp.go
+++ b/pkg/services/notifications/smtp.go
@@ -1,18 +1,29 @@
 package notifications
 
 import (
+	"bufio"
+	"bytes"
+	"context"
 	"crypto/tls"
 	"fmt"
 	"io"
 	"net"
+	"net/textproto"
 	"strconv"
 	"strings"
 
+	"go.opentelemetry.io/otel"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/codes"
+	"go.opentelemetry.io/otel/propagation"
+	"go.opentelemetry.io/otel/trace"
 	gomail "gopkg.in/mail.v2"
 
 	"github.com/grafana/grafana/pkg/setting"
 )
 
+var tracer = otel.Tracer("github.com/grafana/grafana/pkg/services/notifications")
+
 type SmtpClient struct {
 	cfg setting.SmtpSettings
 }
@@ -29,7 +40,12 @@ func NewSmtpClient(cfg setting.SmtpSettings) (*SmtpClient, error) {
 	return client, nil
 }
 
-func (sc *SmtpClient) Send(messages ...*Message) (int, error) {
+func (sc *SmtpClient) Send(ctx context.Context, messages ...*Message) (int, error) {
+	ctx, span := tracer.Start(ctx, "notifications.SmtpClient.Send",
+		trace.WithAttributes(attribute.Int("messages", len(messages))),
+	)
+	defer span.End()
+
 	sentEmailsCount := 0
 	dialer, err := sc.createDialer()
 	if err != nil {
@@ -37,7 +53,12 @@ func (sc *SmtpClient) Send(messages ...*Message) (int, error) {
 	}
 
 	for _, msg := range messages {
-		m := sc.buildEmail(msg)
+		span.SetAttributes(
+			attribute.String("smtp.sender", msg.From),
+			attribute.StringSlice("smtp.recipients", msg.To),
+		)
+
+		m := sc.buildEmail(ctx, msg)
 
 		innerError := dialer.DialAndSend(m)
 		emailsSentTotal.Inc()
@@ -50,6 +71,9 @@ func (sc *SmtpClient) Send(messages ...*Message) (int, error) {
 			}
 
 			err = fmt.Errorf("failed to send notification to email addresses: %s: %w", strings.Join(msg.To, ";"), innerError)
+			span.RecordError(err)
+			span.SetStatus(codes.Error, err.Error())
+
 			continue
 		}
 
@@ -60,11 +84,20 @@ func (sc *SmtpClient) Send(messages ...*Message) (int, error) {
 }
 
 // buildEmail converts the Message DTO to a gomail message.
-func (sc *SmtpClient) buildEmail(msg *Message) *gomail.Message {
+func (sc *SmtpClient) buildEmail(ctx context.Context, msg *Message) *gomail.Message {
 	m := gomail.NewMessage()
+	// add all static headers to the email message
+	for h, val := range sc.cfg.StaticHeaders {
+		m.SetHeader(h, val)
+	}
 	m.SetHeader("From", msg.From)
 	m.SetHeader("To", msg.To...)
 	m.SetHeader("Subject", msg.Subject)
+
+	if sc.cfg.EnableTracing {
+		otel.GetTextMapPropagator().Inject(ctx, gomailHeaderCarrier{m})
+	}
+
 	sc.setFiles(m, msg)
 	for _, replyTo := range msg.ReplyTo {
 		m.SetAddressHeader("Reply-To", replyTo, "")
@@ -126,12 +159,8 @@ func (sc *SmtpClient) createDialer() (*gomail.Dialer, error) {
 	d := gomail.NewDialer(host, iPort, sc.cfg.User, sc.cfg.Password)
 	d.TLSConfig = tlsconfig
 	d.StartTLSPolicy = getStartTLSPolicy(sc.cfg.StartTLSPolicy)
+	d.LocalName = sc.cfg.EhloIdentity
 
-	if sc.cfg.EhloIdentity != "" {
-		d.LocalName = sc.cfg.EhloIdentity
-	} else {
-		d.LocalName = setting.InstanceName
-	}
 	return d, nil
 }
 
@@ -145,3 +174,36 @@ func getStartTLSPolicy(policy string) gomail.StartTLSPolicy {
 		return 0
 	}
 }
+
+type gomailHeaderCarrier struct {
+	*gomail.Message
+}
+
+var _ propagation.TextMapCarrier = (*gomailHeaderCarrier)(nil)
+
+func (c gomailHeaderCarrier) Get(key string) string {
+	if hdr := c.Message.GetHeader(key); len(hdr) > 0 {
+		return hdr[0]
+	}
+
+	return ""
+}
+
+func (c gomailHeaderCarrier) Set(key string, value string) {
+	c.Message.SetHeader(key, value)
+}
+
+func (c gomailHeaderCarrier) Keys() []string {
+	// there's no way to get all the header keys directly from a gomail.Message,
+	// but we can encode the whole message and re-parse. This is not ideal, but
+	// this function shouldn't be used in the hot path.
+	buf := bytes.Buffer{}
+	_, _ = c.Message.WriteTo(&buf)
+	hdr, _ := textproto.NewReader(bufio.NewReader(&buf)).ReadMIMEHeader()
+	keys := make([]string, 0, len(hdr))
+	for k := range hdr {
+		keys = append(keys, k)
+	}
+
+	return keys
+}
diff --git a/pkg/services/notifications/smtp_test.go b/pkg/services/notifications/smtp_test.go
index fe2edd6cc6bc4..6a6d8fb8ca36a 100644
--- a/pkg/services/notifications/smtp_test.go
+++ b/pkg/services/notifications/smtp_test.go
@@ -2,18 +2,21 @@ package notifications
 
 import (
 	"bytes"
+	"context"
 	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
 func TestBuildMail(t *testing.T) {
 	cfg := setting.NewCfg()
 	cfg.Smtp.ContentTypes = []string{"text/html", "text/plain"}
+	cfg.Smtp.StaticHeaders = map[string]string{"Foo-Header": "foo_value", "From": "malicious_value"}
 
 	sc, err := NewSmtpClient(cfg.Smtp)
 	require.NoError(t, err)
@@ -29,20 +32,52 @@ func TestBuildMail(t *testing.T) {
 		ReplyTo: []string{"from@address.com"},
 	}
 
-	t.Run("When building email", func(t *testing.T) {
-		email := sc.buildEmail(message)
+	ctx := context.Background()
+
+	t.Run("Can successfully build mail", func(t *testing.T) {
+		email := sc.buildEmail(ctx, message)
+		staticHeader := email.GetHeader("Foo-Header")[0]
+		assert.Equal(t, staticHeader, "foo_value")
 
 		buf := new(bytes.Buffer)
 		_, err := email.WriteTo(buf)
 		require.NoError(t, err)
 
+		assert.Contains(t, buf.String(), "Foo-Header: foo_value")
+		assert.Contains(t, buf.String(), "From: from@address.com")
 		assert.Contains(t, buf.String(), "Some HTML body")
 		assert.Contains(t, buf.String(), "Some plain text body")
 		assert.Less(t, strings.Index(buf.String(), "Some plain text body"), strings.Index(buf.String(), "Some HTML body"))
 	})
+
+	t.Run("Skips trace headers when context has no span", func(t *testing.T) {
+		cfg.Smtp.EnableTracing = true
+
+		sc, err := NewSmtpClient(cfg.Smtp)
+		require.NoError(t, err)
+
+		email := sc.buildEmail(ctx, message)
+		assert.Empty(t, email.GetHeader("traceparent"))
+	})
+
+	t.Run("Adds trace headers when context has span", func(t *testing.T) {
+		cfg.Smtp.EnableTracing = true
+
+		sc, err := NewSmtpClient(cfg.Smtp)
+		require.NoError(t, err)
+
+		tracer := tracing.InitializeTracerForTest()
+		ctx, span := tracer.Start(ctx, "notifications.SmtpClient.SendContext")
+		defer span.End()
+
+		email := sc.buildEmail(ctx, message)
+		assert.NotEmpty(t, email.GetHeader("traceparent"))
+	})
 }
 
 func TestSmtpDialer(t *testing.T) {
+	ctx := context.Background()
+
 	t.Run("When SMTP hostname is invalid", func(t *testing.T) {
 		cfg := createSmtpConfig()
 		cfg.Smtp.Host = "invalid%hostname:123:456"
@@ -58,7 +93,7 @@ func TestSmtpDialer(t *testing.T) {
 			},
 		}
 
-		count, err := client.Send(message)
+		count, err := client.Send(ctx, message)
 
 		require.Equal(t, 0, count)
 		require.EqualError(t, err, "address invalid%hostname:123:456: too many colons in address")
@@ -79,7 +114,7 @@ func TestSmtpDialer(t *testing.T) {
 			},
 		}
 
-		count, err := client.Send(message)
+		count, err := client.Send(ctx, message)
 
 		require.Equal(t, 0, count)
 		require.EqualError(t, err, "strconv.Atoi: parsing \"123a\": invalid syntax")
@@ -101,7 +136,7 @@ func TestSmtpDialer(t *testing.T) {
 			},
 		}
 
-		count, err := client.Send(message)
+		count, err := client.Send(ctx, message)
 
 		require.Equal(t, 0, count)
 		require.EqualError(t, err, "could not load cert or key file: open /var/certs/does-not-exist.pem: no such file or directory")
diff --git a/pkg/services/notifications/testing.go b/pkg/services/notifications/testing.go
index ad06b2bef1adf..f632bef503851 100644
--- a/pkg/services/notifications/testing.go
+++ b/pkg/services/notifications/testing.go
@@ -1,6 +1,9 @@
 package notifications
 
-import "fmt"
+import (
+	"context"
+	"fmt"
+)
 
 type FakeMailer struct {
 	Sent []*Message
@@ -12,7 +15,7 @@ func NewFakeMailer() *FakeMailer {
 	}
 }
 
-func (fm *FakeMailer) Send(messages ...*Message) (int, error) {
+func (fm *FakeMailer) Send(ctx context.Context, messages ...*Message) (int, error) {
 	sentEmailsCount := 0
 	for _, msg := range messages {
 		fm.Sent = append(fm.Sent, msg)
@@ -27,7 +30,7 @@ func NewFakeDisconnectedMailer() *FakeDisconnectedMailer {
 	return &FakeDisconnectedMailer{}
 }
 
-func (fdm *FakeDisconnectedMailer) Send(messages ...*Message) (int, error) {
+func (fdm *FakeDisconnectedMailer) Send(ctx context.Context, messages ...*Message) (int, error) {
 	return 0, fmt.Errorf("connect: connection refused")
 }
 
diff --git a/pkg/services/oauthtoken/oauth_token.go b/pkg/services/oauthtoken/oauth_token.go
index b7670c7525e57..632b252b3530f 100644
--- a/pkg/services/oauthtoken/oauth_token.go
+++ b/pkg/services/oauthtoken/oauth_token.go
@@ -7,10 +7,12 @@ import (
 	"strings"
 	"time"
 
+	"github.com/go-jose/go-jose/v3/jwt"
 	"github.com/prometheus/client_golang/prometheus"
 	"golang.org/x/oauth2"
 	"golang.org/x/sync/singleflight"
 
+	"github.com/grafana/grafana/pkg/infra/localcache"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/login/social"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
@@ -29,28 +31,33 @@ var (
 	ErrNotAnOAuthProvider  = errors.New("not an oauth provider")
 )
 
+const maxOAuthTokenCacheTTL = 10 * time.Minute
+
 type Service struct {
 	Cfg               *setting.Cfg
 	SocialService     social.Service
 	AuthInfoService   login.AuthInfoService
 	singleFlightGroup *singleflight.Group
+	cache             *localcache.CacheService
 
 	tokenRefreshDuration *prometheus.HistogramVec
 }
 
+//go:generate mockery --name OAuthTokenService --structname MockService --outpkg oauthtokentest --filename service_mock.go --output ./oauthtokentest/
 type OAuthTokenService interface {
 	GetCurrentOAuthToken(context.Context, identity.Requester) *oauth2.Token
 	IsOAuthPassThruEnabled(*datasources.DataSource) bool
 	HasOAuthEntry(context.Context, identity.Requester) (*login.UserAuth, bool, error)
-	TryTokenRefresh(context.Context, *login.UserAuth) error
+	TryTokenRefresh(context.Context, identity.Requester) error
 	InvalidateOAuthTokens(context.Context, *login.UserAuth) error
 }
 
 func ProvideService(socialService social.Service, authInfoService login.AuthInfoService, cfg *setting.Cfg, registerer prometheus.Registerer) *Service {
 	return &Service{
+		AuthInfoService:      authInfoService,
 		Cfg:                  cfg,
 		SocialService:        socialService,
-		AuthInfoService:      authInfoService,
+		cache:                localcache.New(maxOAuthTokenCacheTTL, 15*time.Minute),
 		singleFlightGroup:    new(singleflight.Group),
 		tokenRefreshDuration: newTokenRefreshDurationMetric(registerer),
 	}
@@ -58,36 +65,12 @@ func ProvideService(socialService social.Service, authInfoService login.AuthInfo
 
 // GetCurrentOAuthToken returns the OAuth token, if any, for the authenticated user. Will try to refresh the token if it has expired.
 func (o *Service) GetCurrentOAuthToken(ctx context.Context, usr identity.Requester) *oauth2.Token {
-	if usr == nil || usr.IsNil() {
-		// No user, therefore no token
-		return nil
-	}
-
-	namespace, id := usr.GetNamespacedID()
-	if namespace != identity.NamespaceUser {
-		// Not a user, therefore no token.
-		return nil
-	}
-
-	userID, err := identity.IntIdentifier(namespace, id)
-	if err != nil {
-		logger.Error("Failed to convert user id to int", "namespace", namespace, "userId", id, "error", err)
+	authInfo, ok, _ := o.HasOAuthEntry(ctx, usr)
+	if !ok {
 		return nil
 	}
 
-	authInfoQuery := &login.GetAuthInfoQuery{UserId: userID}
-	authInfo, err := o.AuthInfoService.GetAuthInfo(ctx, authInfoQuery)
-	if err != nil {
-		if errors.Is(err, user.ErrUserNotFound) {
-			// Not necessarily an error.  User may be logged in another way.
-			logger.Debug("No oauth token for user found", "userId", userID, "username", usr.GetLogin())
-		} else {
-			logger.Error("Failed to get oauth token for user", "userId", userID, "username", usr.GetLogin(), "error", err)
-		}
-		return nil
-	}
-
-	token, err := o.tryGetOrRefreshAccessToken(ctx, authInfo)
+	token, err := o.tryGetOrRefreshOAuthToken(ctx, authInfo)
 	if err != nil {
 		if errors.Is(err, ErrNoRefreshTokenFound) {
 			return buildOAuthTokenFromAuthInfo(authInfo)
@@ -119,6 +102,7 @@ func (o *Service) HasOAuthEntry(ctx context.Context, usr identity.Requester) (*l
 
 	userID, err := identity.IntIdentifier(namespace, id)
 	if err != nil {
+		logger.Error("Failed to convert user id to int", "namespace", namespace, "userId", id, "error", err)
 		return nil, false, err
 	}
 
@@ -127,6 +111,7 @@ func (o *Service) HasOAuthEntry(ctx context.Context, usr identity.Requester) (*l
 	if err != nil {
 		if errors.Is(err, user.ErrUserNotFound) {
 			// Not necessarily an error.  User may be logged in another way.
+			logger.Debug("No oauth token found for user", "userId", userID, "username", usr.GetLogin())
 			return nil, false, nil
 		}
 		logger.Error("Failed to fetch oauth token for user", "userId", userID, "username", usr.GetLogin(), "error", err)
@@ -140,13 +125,72 @@ func (o *Service) HasOAuthEntry(ctx context.Context, usr identity.Requester) (*l
 
 // TryTokenRefresh returns an error in case the OAuth token refresh was unsuccessful
 // It uses a singleflight.Group to prevent getting the Refresh Token multiple times for a given User
-func (o *Service) TryTokenRefresh(ctx context.Context, usr *login.UserAuth) error {
-	lockKey := fmt.Sprintf("oauth-refresh-token-%d", usr.UserId)
-	_, err, _ := o.singleFlightGroup.Do(lockKey, func() (any, error) {
+func (o *Service) TryTokenRefresh(ctx context.Context, usr identity.Requester) error {
+	if usr == nil || usr.IsNil() {
+		logger.Warn("Can only refresh OAuth tokens for existing users", "user", "nil")
+		// Not user, no token.
+		return nil
+	}
+
+	namespace, id := usr.GetNamespacedID()
+	if namespace != identity.NamespaceUser {
+		// Not a user, therefore no token.
+		logger.Warn("Can only refresh OAuth tokens for users", "namespace", namespace, "userId", id)
+		return nil
+	}
+
+	userID, err := identity.IntIdentifier(namespace, id)
+	if err != nil {
+		logger.Warn("Failed to convert user id to int", "namespace", namespace, "userId", id, "error", err)
+		return nil
+	}
+
+	lockKey := fmt.Sprintf("oauth-refresh-token-%d", userID)
+	if _, ok := o.cache.Get(lockKey); ok {
+		logger.Debug("Expiration check has been cached, no need to refresh", "userID", userID)
+		return nil
+	}
+	_, err, _ = o.singleFlightGroup.Do(lockKey, func() (any, error) {
 		logger.Debug("Singleflight request for getting a new access token", "key", lockKey)
 
-		return o.tryGetOrRefreshAccessToken(ctx, usr)
+		authInfo, exists, err := o.HasOAuthEntry(ctx, usr)
+		if !exists {
+			if err != nil {
+				logger.Debug("Failed to fetch oauth entry", "id", userID, "error", err)
+			} else {
+				// User is not logged in via OAuth no need to check
+				o.cache.Set(lockKey, struct{}{}, maxOAuthTokenCacheTTL)
+			}
+			return nil, nil
+		}
+
+		_, needRefresh, ttl := needTokenRefresh(authInfo)
+		if !needRefresh {
+			o.cache.Set(lockKey, struct{}{}, ttl)
+			return nil, nil
+		}
+
+		// get the token's auth provider (f.e. azuread)
+		provider := strings.TrimPrefix(authInfo.AuthModule, "oauth_")
+		currentOAuthInfo := o.SocialService.GetOAuthInfoProvider(provider)
+		if currentOAuthInfo == nil {
+			logger.Warn("OAuth provider not found", "provider", provider)
+			return nil, nil
+		}
+
+		// if refresh token handling is disabled for this provider, we can skip the refresh
+		if !currentOAuthInfo.UseRefreshToken {
+			logger.Debug("Skipping token refresh", "provider", provider)
+			return nil, nil
+		}
+
+		return o.tryGetOrRefreshOAuthToken(ctx, authInfo)
 	})
+	// Silence ErrNoRefreshTokenFound
+	if errors.Is(err, ErrNoRefreshTokenFound) {
+		return nil
+	}
+
 	return err
 }
 
@@ -195,11 +239,23 @@ func (o *Service) InvalidateOAuthTokens(ctx context.Context, usr *login.UserAuth
 	})
 }
 
-func (o *Service) tryGetOrRefreshAccessToken(ctx context.Context, usr *login.UserAuth) (*oauth2.Token, error) {
+func (o *Service) tryGetOrRefreshOAuthToken(ctx context.Context, usr *login.UserAuth) (*oauth2.Token, error) {
+	key := getCheckCacheKey(usr.UserId)
+	if _, ok := o.cache.Get(key); ok {
+		logger.Debug("Expiration check has been cached", "userID", usr.UserId)
+		return buildOAuthTokenFromAuthInfo(usr), nil
+	}
+
 	if err := checkOAuthRefreshToken(usr); err != nil {
 		return nil, err
 	}
 
+	persistedToken, refreshNeeded, ttl := needTokenRefresh(usr)
+	if !refreshNeeded {
+		o.cache.Set(key, struct{}{}, ttl)
+		return persistedToken, nil
+	}
+
 	authProvider := usr.AuthModule
 	connect, err := o.SocialService.GetConnector(authProvider)
 	if err != nil {
@@ -214,8 +270,6 @@ func (o *Service) tryGetOrRefreshAccessToken(ctx context.Context, usr *login.Use
 	}
 	ctx = context.WithValue(ctx, oauth2.HTTPClient, client)
 
-	persistedToken := buildOAuthTokenFromAuthInfo(usr)
-
 	start := time.Now()
 	// TokenSource handles refreshing the token if it has expired
 	token, err := connect.TokenSource(ctx, persistedToken).Token()
@@ -278,8 +332,91 @@ func newTokenRefreshDurationMetric(registerer prometheus.Registerer) *prometheus
 
 // tokensEq checks for OAuth2 token equivalence given the fields of the struct Grafana is interested in
 func tokensEq(t1, t2 *oauth2.Token) bool {
+	t1IdToken, ok1 := t1.Extra("id_token").(string)
+	t2IdToken, ok2 := t2.Extra("id_token").(string)
+
 	return t1.AccessToken == t2.AccessToken &&
 		t1.RefreshToken == t2.RefreshToken &&
 		t1.Expiry.Equal(t2.Expiry) &&
-		t1.TokenType == t2.TokenType
+		t1.TokenType == t2.TokenType &&
+		ok1 == ok2 &&
+		t1IdToken == t2IdToken
+}
+
+func needTokenRefresh(usr *login.UserAuth) (*oauth2.Token, bool, time.Duration) {
+	var accessTokenExpires, idTokenExpires time.Time
+	var hasAccessTokenExpired, hasIdTokenExpired bool
+
+	persistedToken := buildOAuthTokenFromAuthInfo(usr)
+	idTokenExp, err := getIDTokenExpiry(usr)
+	if err != nil {
+		logger.Warn("Could not get ID Token expiry", "error", err)
+	}
+	if !persistedToken.Expiry.IsZero() {
+		accessTokenExpires, hasAccessTokenExpired = getExpiryWithSkew(persistedToken.Expiry)
+	}
+	if !idTokenExp.IsZero() {
+		idTokenExpires, hasIdTokenExpired = getExpiryWithSkew(idTokenExp)
+	}
+	if !hasAccessTokenExpired && !hasIdTokenExpired {
+		logger.Debug("Neither access nor id token have expired yet", "id", usr.Id)
+		return persistedToken, false, getOAuthTokenCacheTTL(accessTokenExpires, idTokenExpires)
+	}
+	if hasIdTokenExpired {
+		// Force refreshing token when id token is expired
+		persistedToken.AccessToken = ""
+	}
+	return persistedToken, true, time.Second
+}
+
+func getCheckCacheKey(usrID int64) string {
+	return fmt.Sprintf("token-check-%d", usrID)
+}
+
+func getOAuthTokenCacheTTL(accessTokenExpiry, idTokenExpiry time.Time) time.Duration {
+	min := maxOAuthTokenCacheTTL
+	if !accessTokenExpiry.IsZero() {
+		d := time.Until(accessTokenExpiry)
+		if d < min {
+			min = d
+		}
+	}
+	if !idTokenExpiry.IsZero() {
+		d := time.Until(idTokenExpiry)
+		if d < min {
+			min = d
+		}
+	}
+	if accessTokenExpiry.IsZero() && idTokenExpiry.IsZero() {
+		return maxOAuthTokenCacheTTL
+	}
+	return min
+}
+
+// getIDTokenExpiry extracts the expiry time from the ID token
+func getIDTokenExpiry(usr *login.UserAuth) (time.Time, error) {
+	if usr.OAuthIdToken == "" {
+		return time.Time{}, nil
+	}
+
+	parsedToken, err := jwt.ParseSigned(usr.OAuthIdToken)
+	if err != nil {
+		return time.Time{}, fmt.Errorf("error parsing id token: %w", err)
+	}
+
+	type Claims struct {
+		Exp int64 `json:"exp"`
+	}
+	var claims Claims
+	if err := parsedToken.UnsafeClaimsWithoutVerification(&claims); err != nil {
+		return time.Time{}, fmt.Errorf("error getting claims from id token: %w", err)
+	}
+
+	return time.Unix(claims.Exp, 0), nil
+}
+
+func getExpiryWithSkew(expiry time.Time) (adjustedExpiry time.Time, hasTokenExpired bool) {
+	adjustedExpiry = expiry.Round(0).Add(-ExpiryDelta)
+	hasTokenExpired = adjustedExpiry.Before(time.Now())
+	return
 }
diff --git a/pkg/services/oauthtoken/oauth_token_test.go b/pkg/services/oauthtoken/oauth_token_test.go
index 5f41ac0499de3..ebcbb76fb3fce 100644
--- a/pkg/services/oauthtoken/oauth_token_test.go
+++ b/pkg/services/oauthtoken/oauth_token_test.go
@@ -13,14 +13,23 @@ import (
 	"golang.org/x/oauth2"
 	"golang.org/x/sync/singleflight"
 
-	"github.com/grafana/grafana/pkg/infra/usagestats"
-	"github.com/grafana/grafana/pkg/login/socialtest"
+	"github.com/grafana/grafana/pkg/infra/localcache"
+	"github.com/grafana/grafana/pkg/infra/remotecache"
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/login/social/socialtest"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/authn"
 	"github.com/grafana/grafana/pkg/services/login"
-	"github.com/grafana/grafana/pkg/services/login/authinfoservice"
+	"github.com/grafana/grafana/pkg/services/login/authinfoimpl"
+	"github.com/grafana/grafana/pkg/services/login/authinfotest"
+	"github.com/grafana/grafana/pkg/services/secrets/fakes"
+	secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
+var EXPIRED_JWT = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIn0.dozjgNryP4J3jVmNHl0w5N_XgL0n3I9PlFUP0THsR8U"
+
 func TestService_HasOAuthEntry(t *testing.T) {
 	testCases := []struct {
 		name            string
@@ -66,10 +75,10 @@ func TestService_HasOAuthEntry(t *testing.T) {
 		{
 			name:            "returns true when the auth entry is found",
 			user:            &user.SignedInUser{UserID: 1},
-			want:            &login.UserAuth{AuthModule: "oauth_generic_oauth"},
+			want:            &login.UserAuth{AuthModule: login.GenericOAuthModule},
 			wantExist:       true,
 			wantErr:         false,
-			getAuthInfoUser: login.UserAuth{AuthModule: "oauth_generic_oauth"},
+			getAuthInfoUser: login.UserAuth{AuthModule: login.GenericOAuthModule},
 		},
 	}
 	for _, tc := range testCases {
@@ -93,165 +102,33 @@ func TestService_HasOAuthEntry(t *testing.T) {
 	}
 }
 
-func TestService_TryTokenRefresh_ValidToken(t *testing.T) {
-	srv, authInfoStore, socialConnector := setupOAuthTokenService(t)
-	ctx := context.Background()
-	token := &oauth2.Token{
-		AccessToken:  "testaccess",
-		RefreshToken: "testrefresh",
-		Expiry:       time.Now(),
-		TokenType:    "Bearer",
-	}
-	usr := &login.UserAuth{
-		AuthModule:        "oauth_generic_oauth",
-		OAuthAccessToken:  token.AccessToken,
-		OAuthRefreshToken: token.RefreshToken,
-		OAuthExpiry:       token.Expiry,
-		OAuthTokenType:    token.TokenType,
-	}
-
-	authInfoStore.ExpectedOAuth = usr
-
-	socialConnector.On("TokenSource", mock.Anything, mock.Anything).Return(oauth2.StaticTokenSource(token))
-
-	err := srv.TryTokenRefresh(ctx, usr)
-	assert.Nil(t, err)
-	socialConnector.AssertNumberOfCalls(t, "TokenSource", 1)
-
-	authInfoQuery := &login.GetAuthInfoQuery{}
-	resultUsr, err := srv.AuthInfoService.GetAuthInfo(ctx, authInfoQuery)
-
-	assert.Nil(t, err)
-
-	// User's token data had not been updated
-	assert.Equal(t, resultUsr.OAuthAccessToken, token.AccessToken)
-	assert.Equal(t, resultUsr.OAuthExpiry, token.Expiry)
-	assert.Equal(t, resultUsr.OAuthRefreshToken, token.RefreshToken)
-	assert.Equal(t, resultUsr.OAuthTokenType, token.TokenType)
-}
-
-func TestService_TryTokenRefresh_NoRefreshToken(t *testing.T) {
-	srv, _, socialConnector := setupOAuthTokenService(t)
-	ctx := context.Background()
-	token := &oauth2.Token{
-		AccessToken:  "testaccess",
-		RefreshToken: "",
-		Expiry:       time.Now().Add(-time.Hour),
-		TokenType:    "Bearer",
-	}
-	usr := &login.UserAuth{
-		AuthModule:        "oauth_generic_oauth",
-		OAuthAccessToken:  token.AccessToken,
-		OAuthRefreshToken: token.RefreshToken,
-		OAuthExpiry:       token.Expiry,
-		OAuthTokenType:    token.TokenType,
-	}
-
-	socialConnector.On("TokenSource", mock.Anything, mock.Anything).Return(oauth2.StaticTokenSource(token))
-
-	err := srv.TryTokenRefresh(ctx, usr)
-
-	assert.NotNil(t, err)
-	assert.ErrorIs(t, err, ErrNoRefreshTokenFound)
-
-	socialConnector.AssertNotCalled(t, "TokenSource")
-}
-
-func TestService_TryTokenRefresh_ExpiredToken(t *testing.T) {
-	srv, authInfoStore, socialConnector := setupOAuthTokenService(t)
-	ctx := context.Background()
-	token := &oauth2.Token{
-		AccessToken:  "testaccess",
-		RefreshToken: "testrefresh",
-		Expiry:       time.Now().Add(-time.Hour),
-		TokenType:    "Bearer",
-	}
-
-	newToken := &oauth2.Token{
-		AccessToken:  "testaccess_new",
-		RefreshToken: "testrefresh_new",
-		Expiry:       time.Now().Add(time.Hour),
-		TokenType:    "Bearer",
-	}
-
-	usr := &login.UserAuth{
-		AuthModule:        "oauth_generic_oauth",
-		OAuthAccessToken:  token.AccessToken,
-		OAuthRefreshToken: token.RefreshToken,
-		OAuthExpiry:       token.Expiry,
-		OAuthTokenType:    token.TokenType,
-	}
-
-	authInfoStore.ExpectedOAuth = usr
-
-	socialConnector.On("TokenSource", mock.Anything, mock.Anything).Return(oauth2.ReuseTokenSource(token, oauth2.StaticTokenSource(newToken)), nil)
-
-	err := srv.TryTokenRefresh(ctx, usr)
-
-	assert.Nil(t, err)
-	socialConnector.AssertNumberOfCalls(t, "TokenSource", 1)
-
-	authInfoQuery := &login.GetAuthInfoQuery{}
-	authInfo, err := srv.AuthInfoService.GetAuthInfo(ctx, authInfoQuery)
-
-	assert.Nil(t, err)
-
-	// newToken should be returned after the .Token() call, therefore the User had to be updated
-	assert.Equal(t, authInfo.OAuthAccessToken, newToken.AccessToken)
-	assert.Equal(t, authInfo.OAuthExpiry, newToken.Expiry)
-	assert.Equal(t, authInfo.OAuthRefreshToken, newToken.RefreshToken)
-	assert.Equal(t, authInfo.OAuthTokenType, newToken.TokenType)
-}
-
-func TestService_TryTokenRefresh_DifferentAuthModuleForUser(t *testing.T) {
-	srv, _, socialConnector := setupOAuthTokenService(t)
-	ctx := context.Background()
-	token := &oauth2.Token{}
-	usr := &login.UserAuth{
-		AuthModule: "auth.saml",
-	}
-
-	socialConnector.On("TokenSource", mock.Anything, mock.Anything).Return(oauth2.StaticTokenSource(token))
-
-	err := srv.TryTokenRefresh(ctx, usr)
-
-	assert.NotNil(t, err)
-	assert.ErrorIs(t, err, ErrNotAnOAuthProvider)
-
-	socialConnector.AssertNotCalled(t, "TokenSource")
-}
-
 func setupOAuthTokenService(t *testing.T) (*Service, *FakeAuthInfoStore, *socialtest.MockSocialConnector) {
 	t.Helper()
 
 	socialConnector := &socialtest.MockSocialConnector{}
 	socialService := &socialtest.FakeSocialService{
 		ExpectedConnector: socialConnector,
+		ExpectedAuthInfoProvider: &social.OAuthInfo{
+			UseRefreshToken: true,
+		},
 	}
 
-	authInfoStore := &FakeAuthInfoStore{}
-	authInfoService := authinfoservice.ProvideAuthInfoService(nil, authInfoStore, &usagestats.UsageStatsMock{})
+	authInfoStore := &FakeAuthInfoStore{ExpectedOAuth: &login.UserAuth{}}
+	authInfoService := authinfoimpl.ProvideService(authInfoStore, remotecache.NewFakeCacheStorage(), secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore()))
 	return &Service{
 		Cfg:                  setting.NewCfg(),
 		SocialService:        socialService,
 		AuthInfoService:      authInfoService,
 		singleFlightGroup:    &singleflight.Group{},
 		tokenRefreshDuration: newTokenRefreshDurationMetric(prometheus.NewRegistry()),
+		cache:                localcache.New(maxOAuthTokenCacheTTL, 15*time.Minute),
 	}, authInfoStore, socialConnector
 }
 
 type FakeAuthInfoStore struct {
 	login.Store
-	ExpectedError                   error
-	ExpectedUser                    *user.User
-	ExpectedOAuth                   *login.UserAuth
-	ExpectedDuplicateUserEntries    int
-	ExpectedHasDuplicateUserEntries int
-	ExpectedLoginStats              login.LoginStats
-}
-
-func (f *FakeAuthInfoStore) GetExternalUserInfoByLogin(ctx context.Context, query *login.GetExternalUserInfoByLoginQuery) (*login.ExternalUserInfo, error) {
-	return nil, f.ExpectedError
+	ExpectedError error
+	ExpectedOAuth *login.UserAuth
 }
 
 func (f *FakeAuthInfoStore) GetAuthInfo(ctx context.Context, query *login.GetAuthInfoQuery) (*login.UserAuth, error) {
@@ -262,10 +139,6 @@ func (f *FakeAuthInfoStore) SetAuthInfo(ctx context.Context, cmd *login.SetAuthI
 	return f.ExpectedError
 }
 
-func (f *FakeAuthInfoStore) UpdateAuthInfoDate(ctx context.Context, authInfo *login.UserAuth) error {
-	return f.ExpectedError
-}
-
 func (f *FakeAuthInfoStore) UpdateAuthInfo(ctx context.Context, cmd *login.UpdateAuthInfoCommand) error {
 	f.ExpectedOAuth.OAuthAccessToken = cmd.OAuthToken.AccessToken
 	f.ExpectedOAuth.OAuthExpiry = cmd.OAuthToken.Expiry
@@ -278,34 +151,460 @@ func (f *FakeAuthInfoStore) DeleteAuthInfo(ctx context.Context, cmd *login.Delet
 	return f.ExpectedError
 }
 
-func (f *FakeAuthInfoStore) GetUserById(ctx context.Context, id int64) (*user.User, error) {
-	return f.ExpectedUser, f.ExpectedError
-}
+func TestService_TryTokenRefresh(t *testing.T) {
+	type environment struct {
+		authInfoService *authinfotest.FakeService
+		cache           *localcache.CacheService
+		identity        identity.Requester
+		socialConnector *socialtest.MockSocialConnector
+		socialService   *socialtest.FakeSocialService
 
-func (f *FakeAuthInfoStore) GetUserByLogin(ctx context.Context, login string) (*user.User, error) {
-	return f.ExpectedUser, f.ExpectedError
-}
+		service *Service
+	}
+	type testCase struct {
+		desc        string
+		expectedErr error
+		setup       func(env *environment)
+	}
 
-func (f *FakeAuthInfoStore) GetUserByEmail(ctx context.Context, email string) (*user.User, error) {
-	return f.ExpectedUser, f.ExpectedError
+	tests := []testCase{
+		{
+			desc: "should skip sync when identity is nil",
+		},
+		{
+			desc: "should skip sync when identity is not a user",
+			setup: func(env *environment) {
+				env.identity = &authn.Identity{ID: "service-account:1"}
+			},
+		},
+		{
+			desc: "should skip token refresh and return nil if namespace and id cannot be converted to user ID",
+			setup: func(env *environment) {
+				env.identity = &authn.Identity{ID: "user:invalidIdentifierFormat"}
+			},
+		},
+		{
+			desc: "should skip token refresh since the token is still valid",
+			setup: func(env *environment) {
+				token := &oauth2.Token{
+					AccessToken:  "testaccess",
+					RefreshToken: "testrefresh",
+					Expiry:       time.Now().Add(time.Hour),
+					TokenType:    "Bearer",
+				}
+
+				env.authInfoService.ExpectedUserAuth = &login.UserAuth{
+					AuthModule:        login.GenericOAuthModule,
+					OAuthAccessToken:  token.AccessToken,
+					OAuthRefreshToken: token.RefreshToken,
+					OAuthExpiry:       token.Expiry,
+					OAuthTokenType:    token.TokenType,
+				}
+
+				env.identity = &authn.Identity{
+					AuthenticatedBy: login.GenericOAuthModule,
+					ID:              "user:1234",
+				}
+			},
+		},
+		{
+			desc: "should skip token refresh if the expiration check has already been cached",
+			setup: func(env *environment) {
+				env.identity = &authn.Identity{ID: "user:1234"}
+				env.cache.Set("oauth-refresh-token-1234", true, 1*time.Minute)
+			},
+		},
+		{
+			desc: "should skip token refresh if there's an unexpected error while looking up the user oauth entry, additionally, no error should be returned",
+			setup: func(env *environment) {
+				env.identity = &authn.Identity{ID: "user:1234"}
+				env.authInfoService.ExpectedError = errors.New("some error")
+			},
+		},
+		{
+			desc: "should skip token refresh if the user doesn't have an oauth entry",
+			setup: func(env *environment) {
+				env.identity = &authn.Identity{ID: "user:1234"}
+				env.authInfoService.ExpectedUserAuth = &login.UserAuth{
+					AuthModule: login.SAMLAuthModule,
+				}
+			},
+		},
+		{
+			desc: "should do token refresh if access token or id token have not expired yet",
+			setup: func(env *environment) {
+				env.identity = &authn.Identity{ID: "user:1234"}
+				env.authInfoService.ExpectedUserAuth = &login.UserAuth{
+					AuthModule: login.GenericOAuthModule,
+				}
+			},
+		},
+		{
+			desc: "should skip token refresh when no oauth provider was found",
+			setup: func(env *environment) {
+				env.identity = &authn.Identity{ID: "user:1234"}
+				env.authInfoService.ExpectedUserAuth = &login.UserAuth{
+					AuthModule:   login.GenericOAuthModule,
+					OAuthIdToken: EXPIRED_JWT,
+				}
+			},
+		},
+		{
+			desc: "should skip token refresh when oauth provider token handling is disabled (UseRefreshToken is false)",
+			setup: func(env *environment) {
+				env.identity = &authn.Identity{ID: "user:1234"}
+				env.authInfoService.ExpectedUserAuth = &login.UserAuth{
+					AuthModule:   login.GenericOAuthModule,
+					OAuthIdToken: EXPIRED_JWT,
+				}
+				env.socialService.ExpectedAuthInfoProvider = &social.OAuthInfo{
+					UseRefreshToken: false,
+				}
+			},
+		},
+		{
+			desc: "should skip token refresh when there is no refresh token",
+			setup: func(env *environment) {
+				env.identity = &authn.Identity{ID: "user:1234"}
+				env.authInfoService.ExpectedUserAuth = &login.UserAuth{
+					AuthModule:        login.GenericOAuthModule,
+					OAuthIdToken:      EXPIRED_JWT,
+					OAuthRefreshToken: "",
+				}
+				env.socialService.ExpectedAuthInfoProvider = &social.OAuthInfo{
+					UseRefreshToken: true,
+				}
+			},
+		},
+		{
+			desc: "should do token refresh when the token is expired",
+			setup: func(env *environment) {
+				token := &oauth2.Token{
+					AccessToken:  "testaccess",
+					RefreshToken: "testrefresh",
+					Expiry:       time.Now().Add(-time.Hour),
+					TokenType:    "Bearer",
+				}
+				env.identity = &authn.Identity{ID: "user:1234"}
+				env.socialService.ExpectedAuthInfoProvider = &social.OAuthInfo{
+					UseRefreshToken: true,
+				}
+				env.authInfoService.ExpectedUserAuth = &login.UserAuth{
+					AuthModule:        login.GenericOAuthModule,
+					AuthId:            "subject",
+					UserId:            1,
+					OAuthAccessToken:  token.AccessToken,
+					OAuthRefreshToken: token.RefreshToken,
+					OAuthExpiry:       token.Expiry,
+					OAuthTokenType:    token.TokenType,
+				}
+				env.socialConnector.On("TokenSource", mock.Anything, mock.Anything).Return(oauth2.StaticTokenSource(token)).Once()
+			},
+		},
+		{
+			desc: "should refresh token when the id token is expired",
+			setup: func(env *environment) {
+				token := &oauth2.Token{
+					AccessToken:  "testaccess",
+					RefreshToken: "testrefresh",
+					Expiry:       time.Now().Add(time.Hour),
+					TokenType:    "Bearer",
+				}
+				env.identity = &authn.Identity{ID: "user:1234"}
+				env.socialService.ExpectedAuthInfoProvider = &social.OAuthInfo{
+					UseRefreshToken: true,
+				}
+				env.authInfoService.ExpectedUserAuth = &login.UserAuth{
+					AuthModule:        login.GenericOAuthModule,
+					AuthId:            "subject",
+					UserId:            1,
+					OAuthAccessToken:  token.AccessToken,
+					OAuthRefreshToken: token.RefreshToken,
+					OAuthExpiry:       token.Expiry,
+					OAuthTokenType:    token.TokenType,
+					OAuthIdToken:      EXPIRED_JWT,
+				}
+				env.socialConnector.On("TokenSource", mock.Anything, mock.Anything).Return(oauth2.StaticTokenSource(token)).Once()
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.desc, func(t *testing.T) {
+			socialConnector := &socialtest.MockSocialConnector{}
+
+			env := environment{
+				authInfoService: &authinfotest.FakeService{},
+				cache:           localcache.New(maxOAuthTokenCacheTTL, 15*time.Minute),
+				socialConnector: socialConnector,
+				socialService: &socialtest.FakeSocialService{
+					ExpectedConnector: socialConnector,
+				},
+			}
+
+			if tt.setup != nil {
+				tt.setup(&env)
+			}
+
+			env.service = &Service{
+				AuthInfoService:      env.authInfoService,
+				Cfg:                  setting.NewCfg(),
+				cache:                env.cache,
+				singleFlightGroup:    &singleflight.Group{},
+				SocialService:        env.socialService,
+				tokenRefreshDuration: newTokenRefreshDurationMetric(prometheus.NewRegistry()),
+			}
+
+			// token refresh
+			err := env.service.TryTokenRefresh(context.Background(), env.identity)
+
+			// test and validations
+			assert.ErrorIs(t, err, tt.expectedErr)
+			socialConnector.AssertExpectations(t)
+		})
+	}
 }
 
-func (f *FakeAuthInfoStore) CollectLoginStats(ctx context.Context) (map[string]interface{}, error) {
-	var res = make(map[string]interface{})
-	res["stats.users.duplicate_user_entries"] = f.ExpectedDuplicateUserEntries
-	res["stats.users.has_duplicate_user_entries"] = f.ExpectedHasDuplicateUserEntries
-	res["stats.users.duplicate_user_entries_by_login"] = 0
-	res["stats.users.has_duplicate_user_entries_by_login"] = 0
-	res["stats.users.duplicate_user_entries_by_email"] = 0
-	res["stats.users.has_duplicate_user_entries_by_email"] = 0
-	res["stats.users.mixed_cased_users"] = f.ExpectedLoginStats.MixedCasedUsers
-	return res, f.ExpectedError
+func TestOAuthTokenSync_getOAuthTokenCacheTTL(t *testing.T) {
+	defaultTime := time.Now()
+	tests := []struct {
+		name              string
+		accessTokenExpiry time.Time
+		idTokenExpiry     time.Time
+		want              time.Duration
+	}{
+		{
+			name:              "should return maxOAuthTokenCacheTTL when no expiry is given",
+			accessTokenExpiry: time.Time{},
+			idTokenExpiry:     time.Time{},
+
+			want: maxOAuthTokenCacheTTL,
+		},
+		{
+			name:              "should return maxOAuthTokenCacheTTL when access token is not given and id token expiry is greater than max cache ttl",
+			accessTokenExpiry: time.Time{},
+			idTokenExpiry:     defaultTime.Add(5*time.Minute + maxOAuthTokenCacheTTL),
+
+			want: maxOAuthTokenCacheTTL,
+		},
+		{
+			name:              "should return idTokenExpiry when access token is not given and id token expiry is less than max cache ttl",
+			accessTokenExpiry: time.Time{},
+			idTokenExpiry:     defaultTime.Add(-5*time.Minute + maxOAuthTokenCacheTTL),
+			want:              time.Until(defaultTime.Add(-5*time.Minute + maxOAuthTokenCacheTTL)),
+		},
+		{
+			name:              "should return maxOAuthTokenCacheTTL when access token expiry is greater than max cache ttl and id token is not given",
+			accessTokenExpiry: defaultTime.Add(5*time.Minute + maxOAuthTokenCacheTTL),
+			idTokenExpiry:     time.Time{},
+			want:              maxOAuthTokenCacheTTL,
+		},
+		{
+			name:              "should return accessTokenExpiry when access token expiry is less than max cache ttl and id token is not given",
+			accessTokenExpiry: defaultTime.Add(-5*time.Minute + maxOAuthTokenCacheTTL),
+			idTokenExpiry:     time.Time{},
+			want:              time.Until(defaultTime.Add(-5*time.Minute + maxOAuthTokenCacheTTL)),
+		},
+		{
+			name:              "should return accessTokenExpiry when access token expiry is less than max cache ttl and less than id token expiry",
+			accessTokenExpiry: defaultTime.Add(-5*time.Minute + maxOAuthTokenCacheTTL),
+			idTokenExpiry:     defaultTime.Add(5*time.Minute + maxOAuthTokenCacheTTL),
+			want:              time.Until(defaultTime.Add(-5*time.Minute + maxOAuthTokenCacheTTL)),
+		},
+		{
+			name:              "should return idTokenExpiry when id token expiry is less than max cache ttl and less than access token expiry",
+			accessTokenExpiry: defaultTime.Add(5*time.Minute + maxOAuthTokenCacheTTL),
+			idTokenExpiry:     defaultTime.Add(-3*time.Minute + maxOAuthTokenCacheTTL),
+			want:              time.Until(defaultTime.Add(-3*time.Minute + maxOAuthTokenCacheTTL)),
+		},
+		{
+			name:              "should return maxOAuthTokenCacheTTL when access token expiry is greater than max cache ttl and id token expiry is greater than max cache ttl",
+			accessTokenExpiry: defaultTime.Add(5*time.Minute + maxOAuthTokenCacheTTL),
+			idTokenExpiry:     defaultTime.Add(5*time.Minute + maxOAuthTokenCacheTTL),
+			want:              maxOAuthTokenCacheTTL,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := getOAuthTokenCacheTTL(tt.accessTokenExpiry, tt.idTokenExpiry)
+
+			assert.Equal(t, tt.want.Round(time.Second), got.Round(time.Second))
+		})
+	}
 }
 
-func (f *FakeAuthInfoStore) RunMetricsCollection(ctx context.Context) error {
-	return f.ExpectedError
+func TestOAuthTokenSync_needTokenRefresh(t *testing.T) {
+	tests := []struct {
+		name                     string
+		usr                      *login.UserAuth
+		expectedTokenRefreshFlag bool
+		expectedTokenDuration    time.Duration
+	}{
+		{
+			name:                     "should not need token refresh when token has no expiration date",
+			usr:                      &login.UserAuth{},
+			expectedTokenRefreshFlag: false,
+			expectedTokenDuration:    maxOAuthTokenCacheTTL,
+		},
+		{
+			name: "should not need token refresh with an invalid jwt token that might result in an error when parsing",
+			usr: &login.UserAuth{
+				OAuthIdToken: "invalid_jwt_format",
+			},
+			expectedTokenRefreshFlag: false,
+			expectedTokenDuration:    maxOAuthTokenCacheTTL,
+		},
+		{
+			name: "should flag token refresh with id token is expired",
+			usr: &login.UserAuth{
+				OAuthIdToken: EXPIRED_JWT,
+			},
+			expectedTokenRefreshFlag: true,
+			expectedTokenDuration:    time.Second,
+		},
+		{
+			name: "should flag token refresh when expiry date is zero",
+			usr: &login.UserAuth{
+				OAuthExpiry: time.Unix(0, 0),
+			},
+			expectedTokenRefreshFlag: true,
+			expectedTokenDuration:    time.Second,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			token, needsTokenRefresh, tokenDuration := needTokenRefresh(tt.usr)
+
+			assert.NotNil(t, token)
+			assert.Equal(t, tt.expectedTokenRefreshFlag, needsTokenRefresh)
+			assert.Equal(t, tt.expectedTokenDuration, tokenDuration)
+		})
+	}
 }
 
-func (f *FakeAuthInfoStore) GetLoginStats(ctx context.Context) (login.LoginStats, error) {
-	return f.ExpectedLoginStats, f.ExpectedError
+func TestOAuthTokenSync_tryGetOrRefreshOAuthToken(t *testing.T) {
+	timeNow := time.Now()
+	token := &oauth2.Token{
+		AccessToken:  "oauth_access_token",
+		RefreshToken: "refresh_token_found",
+		Expiry:       timeNow,
+		TokenType:    "Bearer",
+	}
+	type environment struct {
+		authInfoService *authinfotest.FakeService
+		cache           *localcache.CacheService
+		socialConnector *socialtest.MockSocialConnector
+		socialService   *socialtest.FakeSocialService
+
+		service *Service
+	}
+	tests := []struct {
+		desc          string
+		expectedErr   error
+		expectedToken *oauth2.Token
+		usr           *login.UserAuth
+		setup         func(env *environment)
+	}{
+		{
+			desc: "should find and retrieve token from cache",
+			usr: &login.UserAuth{
+				UserId:           int64(1234),
+				OAuthAccessToken: "new_access_token",
+				OAuthExpiry:      timeNow,
+			},
+			setup: func(env *environment) {
+				env.cache.Set("token-check-1234", token, 1*time.Minute)
+			},
+			expectedToken: &oauth2.Token{
+				AccessToken: "new_access_token",
+				Expiry:      timeNow,
+			},
+		},
+		{
+			desc: "should return ErrNotAnOAuthProvider error when the user is not an oauth provider",
+			usr: &login.UserAuth{
+				UserId:     int64(1234),
+				AuthModule: login.SAMLAuthModule,
+			},
+			expectedErr: ErrNotAnOAuthProvider,
+		},
+		{
+			desc: "should return ErrNoRefreshTokenFound error when the no refresh token was found",
+			usr: &login.UserAuth{
+				UserId:     int64(1234),
+				AuthModule: login.GenericOAuthModule,
+			},
+			expectedErr: ErrNoRefreshTokenFound,
+		},
+		{
+			desc: "should not refresh token if the token is not expired",
+			usr: &login.UserAuth{
+				UserId:            int64(1234),
+				AuthModule:        login.GenericOAuthModule,
+				OAuthAccessToken:  token.AccessToken,
+				OAuthRefreshToken: token.RefreshToken,
+				OAuthExpiry:       timeNow.Add(time.Hour),
+				OAuthTokenType:    "Bearer",
+			},
+			expectedToken: &oauth2.Token{
+				AccessToken:  token.AccessToken,
+				RefreshToken: token.RefreshToken,
+				Expiry:       timeNow.Add(time.Hour),
+				TokenType:    "Bearer",
+			},
+		},
+		{
+			desc: "should update saved token if the user auth has new access/refresh tokens",
+			usr: &login.UserAuth{
+				UserId:            int64(1234),
+				AuthModule:        login.GenericOAuthModule,
+				OAuthAccessToken:  "new_oauth_access_token",
+				OAuthRefreshToken: "new_refresh_token_found",
+				OAuthExpiry:       timeNow,
+			},
+			expectedToken: &oauth2.Token{
+				AccessToken:  "oauth_access_token",
+				RefreshToken: "refresh_token_found",
+				Expiry:       timeNow,
+				TokenType:    "Bearer",
+			},
+			setup: func(env *environment) {
+				env.socialConnector.On("TokenSource", mock.Anything, mock.Anything).Return(oauth2.StaticTokenSource(token)).Once()
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.desc, func(t *testing.T) {
+			socialConnector := &socialtest.MockSocialConnector{}
+
+			env := environment{
+				authInfoService: &authinfotest.FakeService{},
+				cache:           localcache.New(maxOAuthTokenCacheTTL, 15*time.Minute),
+				socialConnector: socialConnector,
+				socialService: &socialtest.FakeSocialService{
+					ExpectedConnector: socialConnector,
+				},
+			}
+
+			if tt.setup != nil {
+				tt.setup(&env)
+			}
+
+			env.service = &Service{
+				AuthInfoService:      env.authInfoService,
+				Cfg:                  setting.NewCfg(),
+				cache:                env.cache,
+				singleFlightGroup:    &singleflight.Group{},
+				SocialService:        env.socialService,
+				tokenRefreshDuration: newTokenRefreshDurationMetric(prometheus.NewRegistry()),
+			}
+
+			token, err := env.service.tryGetOrRefreshOAuthToken(context.Background(), tt.usr)
+
+			if tt.expectedToken != nil {
+				assert.Equal(t, tt.expectedToken, token)
+			}
+			assert.ErrorIs(t, tt.expectedErr, err)
+			socialConnector.AssertExpectations(t)
+		})
+	}
 }
diff --git a/pkg/services/oauthtoken/oauthtokentest/mock.go b/pkg/services/oauthtoken/oauthtokentest/mock.go
index 17c97665c4fc6..c273b86b0d8d2 100644
--- a/pkg/services/oauthtoken/oauthtokentest/mock.go
+++ b/pkg/services/oauthtoken/oauthtokentest/mock.go
@@ -15,7 +15,7 @@ type MockOauthTokenService struct {
 	IsOAuthPassThruEnabledFunc func(ds *datasources.DataSource) bool
 	HasOAuthEntryFunc          func(ctx context.Context, usr identity.Requester) (*login.UserAuth, bool, error)
 	InvalidateOAuthTokensFunc  func(ctx context.Context, usr *login.UserAuth) error
-	TryTokenRefreshFunc        func(ctx context.Context, usr *login.UserAuth) error
+	TryTokenRefreshFunc        func(ctx context.Context, usr identity.Requester) error
 }
 
 func (m *MockOauthTokenService) GetCurrentOAuthToken(ctx context.Context, usr identity.Requester) *oauth2.Token {
@@ -46,7 +46,7 @@ func (m *MockOauthTokenService) InvalidateOAuthTokens(ctx context.Context, usr *
 	return nil
 }
 
-func (m *MockOauthTokenService) TryTokenRefresh(ctx context.Context, usr *login.UserAuth) error {
+func (m *MockOauthTokenService) TryTokenRefresh(ctx context.Context, usr identity.Requester) error {
 	if m.TryTokenRefreshFunc != nil {
 		return m.TryTokenRefreshFunc(ctx, usr)
 	}
diff --git a/pkg/services/oauthtoken/oauthtokentest/oauthtokentest.go b/pkg/services/oauthtoken/oauthtokentest/oauthtokentest.go
index 1fe14dc8ed93b..c2ecb12d105e3 100644
--- a/pkg/services/oauthtoken/oauthtokentest/oauthtokentest.go
+++ b/pkg/services/oauthtoken/oauthtokentest/oauthtokentest.go
@@ -33,7 +33,7 @@ func (s *Service) HasOAuthEntry(context.Context, identity.Requester) (*login.Use
 	return nil, false, nil
 }
 
-func (s *Service) TryTokenRefresh(context.Context, *login.UserAuth) error {
+func (s *Service) TryTokenRefresh(context.Context, identity.Requester) error {
 	return nil
 }
 
diff --git a/pkg/services/oauthtoken/oauthtokentest/service_mock.go b/pkg/services/oauthtoken/oauthtokentest/service_mock.go
new file mode 100644
index 0000000000000..7b4d8943bafad
--- /dev/null
+++ b/pkg/services/oauthtoken/oauthtokentest/service_mock.go
@@ -0,0 +1,146 @@
+// Code generated by mockery v2.40.1. DO NOT EDIT.
+
+package oauthtokentest
+
+import (
+	context "context"
+
+	identity "github.com/grafana/grafana/pkg/services/auth/identity"
+	datasources "github.com/grafana/grafana/pkg/services/datasources"
+
+	login "github.com/grafana/grafana/pkg/services/login"
+
+	mock "github.com/stretchr/testify/mock"
+
+	oauth2 "golang.org/x/oauth2"
+)
+
+// MockService is an autogenerated mock type for the OAuthTokenService type
+type MockService struct {
+	mock.Mock
+}
+
+// GetCurrentOAuthToken provides a mock function with given fields: _a0, _a1
+func (_m *MockService) GetCurrentOAuthToken(_a0 context.Context, _a1 identity.Requester) *oauth2.Token {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetCurrentOAuthToken")
+	}
+
+	var r0 *oauth2.Token
+	if rf, ok := ret.Get(0).(func(context.Context, identity.Requester) *oauth2.Token); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*oauth2.Token)
+		}
+	}
+
+	return r0
+}
+
+// HasOAuthEntry provides a mock function with given fields: _a0, _a1
+func (_m *MockService) HasOAuthEntry(_a0 context.Context, _a1 identity.Requester) (*login.UserAuth, bool, error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for HasOAuthEntry")
+	}
+
+	var r0 *login.UserAuth
+	var r1 bool
+	var r2 error
+	if rf, ok := ret.Get(0).(func(context.Context, identity.Requester) (*login.UserAuth, bool, error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, identity.Requester) *login.UserAuth); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*login.UserAuth)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, identity.Requester) bool); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Get(1).(bool)
+	}
+
+	if rf, ok := ret.Get(2).(func(context.Context, identity.Requester) error); ok {
+		r2 = rf(_a0, _a1)
+	} else {
+		r2 = ret.Error(2)
+	}
+
+	return r0, r1, r2
+}
+
+// InvalidateOAuthTokens provides a mock function with given fields: _a0, _a1
+func (_m *MockService) InvalidateOAuthTokens(_a0 context.Context, _a1 *login.UserAuth) error {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for InvalidateOAuthTokens")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, *login.UserAuth) error); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// IsOAuthPassThruEnabled provides a mock function with given fields: _a0
+func (_m *MockService) IsOAuthPassThruEnabled(_a0 *datasources.DataSource) bool {
+	ret := _m.Called(_a0)
+
+	if len(ret) == 0 {
+		panic("no return value specified for IsOAuthPassThruEnabled")
+	}
+
+	var r0 bool
+	if rf, ok := ret.Get(0).(func(*datasources.DataSource) bool); ok {
+		r0 = rf(_a0)
+	} else {
+		r0 = ret.Get(0).(bool)
+	}
+
+	return r0
+}
+
+// TryTokenRefresh provides a mock function with given fields: _a0, _a1
+func (_m *MockService) TryTokenRefresh(_a0 context.Context, _a1 identity.Requester) error {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for TryTokenRefresh")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, identity.Requester) error); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// NewMockService creates a new instance of MockService. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewMockService(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *MockService {
+	mock := &MockService{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/pkg/services/org/orgimpl/store_test.go b/pkg/services/org/orgimpl/store_test.go
index bc9d04521839d..292c08d033549 100644
--- a/pkg/services/org/orgimpl/store_test.go
+++ b/pkg/services/org/orgimpl/store_test.go
@@ -21,8 +21,13 @@ import (
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/user/userimpl"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationOrgDataAccess(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
diff --git a/pkg/services/playlist/model.go b/pkg/services/playlist/model.go
index 178bd7c83f803..b5016c426a1f8 100644
--- a/pkg/services/playlist/model.go
+++ b/pkg/services/playlist/model.go
@@ -28,7 +28,7 @@ type Playlist struct {
 type PlaylistDTO struct {
 	// Unique playlist identifier. Generated on creation, either by the
 	// creator of the playlist of by the application.
-	Uid string `json:"uid"`
+	Uid string `json:"uid" db:"uid"`
 
 	// Name of the playlist.
 	Name string `json:"name"`
@@ -40,13 +40,16 @@ type PlaylistDTO struct {
 	Items []PlaylistItemDTO `json:"items,omitempty"`
 
 	// Returned for k8s
-	CreatedAt int64 `json:"-"`
+	CreatedAt int64 `json:"-" db:"created_at"`
 
 	// Returned for k8s
-	UpdatedAt int64 `json:"-"`
+	UpdatedAt int64 `json:"-" db:"updated_at"`
 
 	// Returned for k8s
-	OrgID int64 `json:"-"`
+	OrgID int64 `json:"-" db:"org_id"`
+
+	// Returned for k8s and added as an annotation
+	Id int64 `json:"-" db:"id"`
 }
 
 type PlaylistItemDTO struct {
diff --git a/pkg/services/playlist/playlist.go b/pkg/services/playlist/playlist.go
index d7fabd627198a..c7c9e02ffb0a5 100644
--- a/pkg/services/playlist/playlist.go
+++ b/pkg/services/playlist/playlist.go
@@ -11,4 +11,7 @@ type Service interface {
 	Get(context.Context, *GetPlaylistByUidQuery) (*PlaylistDTO, error)
 	Search(context.Context, *GetPlaylistsQuery) (Playlists, error)
 	Delete(ctx context.Context, cmd *DeletePlaylistCommand) error
+
+	// This is optimized for the kubernetes list command that returns full bodies in the list
+	List(ctx context.Context, orgId int64) ([]PlaylistDTO, error)
 }
diff --git a/pkg/services/playlist/playlistimpl/playlist.go b/pkg/services/playlist/playlistimpl/playlist.go
index 65dbdd359871b..f81fa18784862 100644
--- a/pkg/services/playlist/playlistimpl/playlist.go
+++ b/pkg/services/playlist/playlistimpl/playlist.go
@@ -68,6 +68,7 @@ func (s *Service) Get(ctx context.Context, q *playlist.GetPlaylistByUidQuery) (*
 		}
 	}
 	return &playlist.PlaylistDTO{
+		Id:        v.Id,
 		Uid:       v.UID,
 		Name:      v.Name,
 		Interval:  v.Interval,
@@ -89,3 +90,9 @@ func (s *Service) Delete(ctx context.Context, cmd *playlist.DeletePlaylistComman
 	defer span.End()
 	return s.store.Delete(ctx, cmd)
 }
+
+func (s *Service) List(ctx context.Context, orgId int64) ([]playlist.PlaylistDTO, error) {
+	ctx, span := s.tracer.Start(ctx, "playlists.List")
+	defer span.End()
+	return s.store.ListAll(ctx, orgId)
+}
diff --git a/pkg/services/playlist/playlistimpl/store.go b/pkg/services/playlist/playlistimpl/store.go
index e3f86109efed2..890b729bc11da 100644
--- a/pkg/services/playlist/playlistimpl/store.go
+++ b/pkg/services/playlist/playlistimpl/store.go
@@ -13,4 +13,7 @@ type store interface {
 	GetItems(context.Context, *playlist.GetPlaylistItemsByUidQuery) ([]playlist.PlaylistItem, error)
 	List(context.Context, *playlist.GetPlaylistsQuery) (playlist.Playlists, error)
 	Update(context.Context, *playlist.UpdatePlaylistCommand) (*playlist.PlaylistDTO, error)
+
+	// This is optimized for the kubernetes list command that returns full bodies in the list
+	ListAll(ctx context.Context, orgId int64) ([]playlist.PlaylistDTO, error)
 }
diff --git a/pkg/services/playlist/playlistimpl/store_test.go b/pkg/services/playlist/playlistimpl/store_test.go
index b2d79b59c83d3..9eb8c57f76714 100644
--- a/pkg/services/playlist/playlistimpl/store_test.go
+++ b/pkg/services/playlist/playlistimpl/store_test.go
@@ -2,6 +2,8 @@ package playlistimpl
 
 import (
 	"context"
+	"encoding/json"
+	"fmt"
 	"testing"
 	"time"
 
@@ -9,8 +11,13 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/services/playlist"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 type getStore func(db.DB) store
 
 func testIntegrationPlaylistDataAccess(t *testing.T, fn getStore) {
@@ -104,6 +111,9 @@ func testIntegrationPlaylistDataAccess(t *testing.T, fn getStore) {
 	})
 
 	t.Run("Search playlist", func(t *testing.T) {
+		startTime := time.Now().UnixMilli()
+		time.Sleep(time.Millisecond * 20)
+
 		items := []playlist.PlaylistItem{
 			{Title: "graphite", Value: "graphite", Type: "dashboard_by_tag"},
 			{Title: "Backend response times", Value: "3", Type: "dashboard_by_id"},
@@ -113,10 +123,13 @@ func testIntegrationPlaylistDataAccess(t *testing.T, fn getStore) {
 		pl3 := playlist.CreatePlaylistCommand{Name: "NICE office", Interval: "10m", OrgId: 2, Items: items}
 		_, err := playlistStore.Insert(context.Background(), &pl1)
 		require.NoError(t, err)
+		time.Sleep(time.Millisecond * 20)
 		_, err = playlistStore.Insert(context.Background(), &pl2)
 		require.NoError(t, err)
+		time.Sleep(time.Millisecond * 20)
 		_, err = playlistStore.Insert(context.Background(), &pl3)
 		require.NoError(t, err)
+		time.Sleep(time.Millisecond * 20)
 
 		t.Run("With Org ID", func(t *testing.T) {
 			qr := playlist.GetPlaylistsQuery{Limit: 100, OrgId: 1}
@@ -137,6 +150,60 @@ func testIntegrationPlaylistDataAccess(t *testing.T, fn getStore) {
 			require.NoError(t, err)
 			require.Equal(t, 2, len(res))
 		})
+
+		t.Run("With FullList support", func(t *testing.T) {
+			res, err := playlistStore.ListAll(context.Background(), 1)
+			require.NoError(t, err)
+
+			// Make sure the timestamps came through OK (the risk with SQLX)
+			offsetTime := startTime
+			for id, v := range res {
+				res[id].Uid = fmt.Sprintf("ROW:%d", id) // normalize for JSON test
+
+				elapsed := v.CreatedAt - offsetTime
+				require.Greater(t, v.CreatedAt, startTime)
+				require.Greater(t, elapsed, int64(10)) // sleeps 20ms
+				offsetTime = v.CreatedAt
+			}
+
+			jj, err := json.MarshalIndent(res, "", "  ")
+			require.NoError(t, err)
+			//fmt.Printf("OUT:%s\n", string(jj))
+
+			// Each row has a full payload
+			require.JSONEq(t, `[
+				{
+				  "uid": "ROW:0",
+				  "name": "NYC office",
+				  "interval": "10m",
+				  "items": [
+					{
+					  "type": "dashboard_by_tag",
+					  "value": "graphite"
+					},
+					{
+					  "type": "dashboard_by_id",
+					  "value": "3"
+					}
+				  ]
+				},
+				{
+				  "uid": "ROW:1",
+				  "name": "NICE office",
+				  "interval": "10m",
+				  "items": [
+					{
+					  "type": "dashboard_by_tag",
+					  "value": "graphite"
+					},
+					{
+					  "type": "dashboard_by_id",
+					  "value": "3"
+					}
+				  ]
+				}
+			  ]`, string(jj))
+		})
 	})
 
 	t.Run("Delete playlist that doesn't exist, should not return error", func(t *testing.T) {
diff --git a/pkg/services/playlist/playlistimpl/xorm_store.go b/pkg/services/playlist/playlistimpl/xorm_store.go
index 871252d3a65c9..3b3a1998eb66c 100644
--- a/pkg/services/playlist/playlistimpl/xorm_store.go
+++ b/pkg/services/playlist/playlistimpl/xorm_store.go
@@ -2,6 +2,7 @@ package playlistimpl
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/grafana/grafana/pkg/infra/db"
@@ -180,6 +181,51 @@ func (s *sqlStore) List(ctx context.Context, query *playlist.GetPlaylistsQuery)
 	return playlists, err
 }
 
+func (s *sqlStore) ListAll(ctx context.Context, orgId int64) ([]playlist.PlaylistDTO, error) {
+	db := s.db.GetSqlxSession() // OK because dates are numbers!
+
+	playlists := []playlist.PlaylistDTO{}
+	err := db.Select(ctx, &playlists, "SELECT * FROM playlist WHERE org_id=? ORDER BY created_at asc", orgId)
+	if err != nil {
+		return nil, err
+	}
+
+	// Create a map that links playlist id to the playlist array index
+	lookup := map[int64]int{}
+	for i, v := range playlists {
+		lookup[v.Id] = i
+	}
+
+	var playlistId int64
+	var itemType string
+	var itemValue string
+
+	rows, err := db.Query(ctx, `SELECT playlist.id,playlist_item.type,playlist_item.value
+		FROM playlist_item 
+		JOIN playlist ON playlist_item.playlist_id = playlist.id
+		WHERE playlist.org_id = ?
+		ORDER BY playlist_id asc, `+s.db.Quote("order")+` asc`, orgId)
+	if err != nil {
+		return nil, err
+	}
+	for rows.Next() {
+		err = rows.Scan(&playlistId, &itemType, &itemValue)
+		if err != nil {
+			return nil, err
+		}
+		idx, ok := lookup[playlistId]
+		if !ok {
+			return nil, fmt.Errorf("could not find playlist by id")
+		}
+		items := append(playlists[idx].Items, playlist.PlaylistItemDTO{
+			Type:  itemType,
+			Value: itemValue,
+		})
+		playlists[idx].Items = items
+	}
+	return playlists, err
+}
+
 func (s *sqlStore) GetItems(ctx context.Context, query *playlist.GetPlaylistItemsByUidQuery) ([]playlist.PlaylistItem, error) {
 	var playlistItems = make([]playlist.PlaylistItem, 0)
 	if query.PlaylistUID == "" || query.OrgId == 0 {
diff --git a/pkg/services/plugindashboards/plugindashboards.go b/pkg/services/plugindashboards/plugindashboards.go
index 04373f9ad81a3..086d23fca5f7b 100644
--- a/pkg/services/plugindashboards/plugindashboards.go
+++ b/pkg/services/plugindashboards/plugindashboards.go
@@ -16,7 +16,6 @@ type PluginDashboard struct {
 	ImportedUrl      string `json:"importedUrl"`
 	Slug             string `json:"slug"`
 	DashboardId      int64  `json:"dashboardId"`
-	FolderId         int64  `json:"folderId"`
 	ImportedRevision int64  `json:"importedRevision"`
 	Revision         int64  `json:"revision"`
 	Description      string `json:"description"`
diff --git a/pkg/services/plugindashboards/service/dashboard_updater.go b/pkg/services/plugindashboards/service/dashboard_updater.go
index ce35611c30a08..3f04666175ca0 100644
--- a/pkg/services/plugindashboards/service/dashboard_updater.go
+++ b/pkg/services/plugindashboards/service/dashboard_updater.go
@@ -177,7 +177,6 @@ func (du *DashboardUpdater) autoUpdateAppDashboard(ctx context.Context, pluginDa
 			{Action: dashboards.ActionDashboardsWrite, Scope: dashboards.ScopeFoldersAll},
 		}),
 		Path:      pluginDashInfo.Reference,
-		FolderId:  0,
 		Dashboard: resp.Dashboard.Data,
 		Overwrite: true,
 		Inputs:    nil,
diff --git a/pkg/services/plugindashboards/service/dashboard_updater_test.go b/pkg/services/plugindashboards/service/dashboard_updater_test.go
index aff8bac7512f4..16170c7ae26d7 100644
--- a/pkg/services/plugindashboards/service/dashboard_updater_test.go
+++ b/pkg/services/plugindashboards/service/dashboard_updater_test.go
@@ -195,7 +195,7 @@ func TestDashboardUpdater(t *testing.T) {
 				require.Equal(t, "updated.json", ctx.importDashboardArgs[0].Path)
 				require.Equal(t, int64(2), ctx.importDashboardArgs[0].User.GetOrgID())
 				require.Equal(t, org.RoleAdmin, ctx.importDashboardArgs[0].User.GetOrgRole())
-				require.Equal(t, int64(0), ctx.importDashboardArgs[0].FolderId)
+				require.Equal(t, string(""), ctx.importDashboardArgs[0].FolderUid)
 				require.True(t, ctx.importDashboardArgs[0].Overwrite)
 			})
 	})
@@ -322,21 +322,21 @@ func TestDashboardUpdater(t *testing.T) {
 			require.Equal(t, "dashboard1.json", ctx.importDashboardArgs[0].Path)
 			require.Equal(t, int64(2), ctx.importDashboardArgs[0].User.GetOrgID())
 			require.Equal(t, org.RoleAdmin, ctx.importDashboardArgs[0].User.GetOrgRole())
-			require.Equal(t, int64(0), ctx.importDashboardArgs[0].FolderId)
+			require.Equal(t, string(""), ctx.importDashboardArgs[0].FolderUid)
 			require.True(t, ctx.importDashboardArgs[0].Overwrite)
 
 			require.Equal(t, "test", ctx.importDashboardArgs[1].PluginId)
 			require.Equal(t, "dashboard2.json", ctx.importDashboardArgs[1].Path)
 			require.Equal(t, int64(2), ctx.importDashboardArgs[1].User.GetOrgID())
 			require.Equal(t, org.RoleAdmin, ctx.importDashboardArgs[1].User.GetOrgRole())
-			require.Equal(t, int64(0), ctx.importDashboardArgs[1].FolderId)
+			require.Equal(t, string(""), ctx.importDashboardArgs[0].FolderUid)
 			require.True(t, ctx.importDashboardArgs[1].Overwrite)
 
 			require.Equal(t, "test", ctx.importDashboardArgs[2].PluginId)
 			require.Equal(t, "dashboard3.json", ctx.importDashboardArgs[2].Path)
 			require.Equal(t, int64(2), ctx.importDashboardArgs[2].User.GetOrgID())
 			require.Equal(t, org.RoleAdmin, ctx.importDashboardArgs[2].User.GetOrgRole())
-			require.Equal(t, int64(0), ctx.importDashboardArgs[2].FolderId)
+			require.Equal(t, string(""), ctx.importDashboardArgs[0].FolderUid)
 			require.True(t, ctx.importDashboardArgs[2].Overwrite)
 		})
 }
diff --git a/pkg/services/pluginsintegration/angulardetectorsprovider/dynamic.go b/pkg/services/pluginsintegration/angulardetectorsprovider/dynamic.go
index a04a33b4cf31e..977d5fedbfa0e 100644
--- a/pkg/services/pluginsintegration/angulardetectorsprovider/dynamic.go
+++ b/pkg/services/pluginsintegration/angulardetectorsprovider/dynamic.go
@@ -12,18 +12,21 @@ import (
 	"sync"
 	"time"
 
-	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/log"
 	"github.com/grafana/grafana/pkg/plugins/manager/loader/angular/angulardetector"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/angularpatternsstore"
+	"github.com/grafana/grafana/pkg/setting"
 )
 
 var errNotModified = errors.New("not modified")
 
-// backgroundJobInterval is the interval that passes between background job runs.
-// It can be overwritten in tests.
-var backgroundJobInterval = time.Hour * 1
+// Intervals that passes between background job runs.
+// Can be overwritten in tests.
+var (
+	backgroundJobIntervalOnPrem = time.Hour * 24
+	backgroundJobIntervalCloud  = time.Hour * 1
+)
 
 // Dynamic is an angulardetector.DetectorsProvider that calls GCOM to get Angular detection patterns,
 // converts them to detectors and caches them for all future calls.
@@ -45,20 +48,32 @@ type Dynamic struct {
 
 	// mux is the mutex used to read/write the cached detectors in a concurrency-safe way.
 	mux sync.RWMutex
+
+	// backgroundJobInterval is the interval that passes between background job runs.
+	backgroundJobInterval time.Duration
 }
 
-func ProvideDynamic(cfg *config.Cfg, store angularpatternsstore.Service, features featuremgmt.FeatureToggles) (*Dynamic, error) {
+func ProvideDynamic(cfg *setting.Cfg, store angularpatternsstore.Service, features featuremgmt.FeatureToggles) (*Dynamic, error) {
+	backgroundJobInterval := backgroundJobIntervalOnPrem
+	if cfg.StackID != "" {
+		// Use a shorter interval for cloud.
+		// (in cloud, cfg.StackID is always set).
+		backgroundJobInterval = backgroundJobIntervalCloud
+	}
+
 	d := &Dynamic{
-		log:        log.New("plugin.angulardetectorsprovider.dynamic"),
-		features:   features,
-		store:      store,
-		httpClient: makeHttpClient(),
-		baseURL:    cfg.GrafanaComURL,
+		log:                   log.New("plugin.angulardetectorsprovider.dynamic"),
+		features:              features,
+		store:                 store,
+		httpClient:            makeHttpClient(),
+		baseURL:               cfg.GrafanaComURL,
+		backgroundJobInterval: backgroundJobInterval,
 	}
 	if d.IsDisabled() {
 		// Do not attempt to restore if the background service is disabled (no feature flag)
 		return d, nil
 	}
+	d.log.Debug("Providing dynamic angular detection patterns", "baseURL", d.baseURL, "interval", d.backgroundJobInterval)
 
 	// Perform the initial restore from db
 	st := time.Now()
@@ -220,11 +235,11 @@ func (d *Dynamic) setDetectorsFromCache(ctx context.Context) error {
 
 // IsDisabled returns true if FlagPluginsDynamicAngularDetectionPatterns is not enabled.
 func (d *Dynamic) IsDisabled() bool {
-	return !d.features.IsEnabled(featuremgmt.FlagPluginsDynamicAngularDetectionPatterns)
+	return !d.features.IsEnabledGlobally(featuremgmt.FlagPluginsDynamicAngularDetectionPatterns)
 }
 
 // randomSkew returns a random time.Duration between 0 and maxSkew.
-// This can be added to backgroundJobInterval to skew it by a random amount.
+// This can be added to d.backgroundJobInterval to skew it by a random amount.
 func (d *Dynamic) randomSkew(maxSkew time.Duration) time.Duration {
 	return time.Duration(rand.Float64() * float64(maxSkew))
 }
@@ -242,15 +257,15 @@ func (d *Dynamic) Run(ctx context.Context) error {
 	// Offset the background job interval a bit to skew GCOM calls from all instances,
 	// so GCOM is not overwhelmed with lots of requests all at the same time.
 	// Important when lots of HG instances restart at the same time.
-	skew := d.randomSkew(backgroundJobInterval / 4)
-	backgroundJobInterval += skew
+	skew := d.randomSkew(d.backgroundJobInterval / 4)
+	d.backgroundJobInterval += skew
 	d.log.Debug(
 		"Applied background job skew",
-		"skew", backgroundJobInterval, "interval", backgroundJobInterval,
+		"skew", d.backgroundJobInterval, "interval", d.backgroundJobInterval,
 	)
 
-	nextRunUntil := time.Until(lastUpdate.Add(backgroundJobInterval))
-	ticker := time.NewTicker(backgroundJobInterval)
+	nextRunUntil := time.Until(lastUpdate.Add(d.backgroundJobInterval))
+	ticker := time.NewTicker(d.backgroundJobInterval)
 	defer ticker.Stop()
 
 	var tick <-chan time.Time
@@ -286,7 +301,7 @@ func (d *Dynamic) Run(ctx context.Context) error {
 			d.log.Info("Patterns update finished", "duration", time.Since(st))
 
 			// Restore default ticker if we run with a shorter interval the first time
-			ticker.Reset(backgroundJobInterval)
+			ticker.Reset(d.backgroundJobInterval)
 			tick = ticker.C
 		case <-ctx.Done():
 			return ctx.Err()
diff --git a/pkg/services/pluginsintegration/angulardetectorsprovider/dynamic_test.go b/pkg/services/pluginsintegration/angulardetectorsprovider/dynamic_test.go
index 9ffbfc409a87e..43eee584c5f25 100644
--- a/pkg/services/pluginsintegration/angulardetectorsprovider/dynamic_test.go
+++ b/pkg/services/pluginsintegration/angulardetectorsprovider/dynamic_test.go
@@ -14,10 +14,10 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/infra/kvstore"
-	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/manager/loader/angular/angulardetector"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/angularpatternsstore"
+	"github.com/grafana/grafana/pkg/setting"
 )
 
 func TestDynamicAngularDetectorsProvider(t *testing.T) {
@@ -314,6 +314,22 @@ func TestDynamicAngularDetectorsProvider(t *testing.T) {
 	})
 }
 
+func TestDynamicAngularDetectorsProviderCloudVsOnPrem(t *testing.T) {
+	gcom := newDefaultGCOMScenario()
+	srv := gcom.newHTTPTestServer()
+	t.Cleanup(srv.Close)
+
+	t.Run("should use cloud interval if stack_id is set", func(t *testing.T) {
+		svc := provideDynamic(t, srv.URL, provideDynamicOpts{cfg: &setting.Cfg{StackID: "1234"}})
+		require.Equal(t, backgroundJobIntervalCloud, svc.backgroundJobInterval)
+	})
+
+	t.Run("should use on-prem interval if stack_id is not set", func(t *testing.T) {
+		svc := provideDynamic(t, srv.URL, provideDynamicOpts{cfg: &setting.Cfg{StackID: ""}})
+		require.Equal(t, backgroundJobIntervalOnPrem, svc.backgroundJobInterval)
+	})
+}
+
 func TestDynamicAngularDetectorsProviderBackgroundService(t *testing.T) {
 	mockGCOMPatterns := newMockGCOMPatterns()
 	gcom := newDefaultGCOMScenario()
@@ -321,10 +337,10 @@ func TestDynamicAngularDetectorsProviderBackgroundService(t *testing.T) {
 	t.Cleanup(srv.Close)
 
 	t.Run("background service", func(t *testing.T) {
-		oldBackgroundJobInterval := backgroundJobInterval
-		backgroundJobInterval = time.Millisecond * 500
+		oldBackgroundJobInterval := backgroundJobIntervalOnPrem
+		backgroundJobIntervalOnPrem = time.Millisecond * 500
 		t.Cleanup(func() {
-			backgroundJobInterval = oldBackgroundJobInterval
+			backgroundJobIntervalOnPrem = oldBackgroundJobInterval
 		})
 
 		t.Run("is disabled if feature flag is not present", func(t *testing.T) {
@@ -563,6 +579,7 @@ func newError500GCOMScenario() *gcomScenario {
 
 type provideDynamicOpts struct {
 	store angularpatternsstore.Service
+	cfg   *setting.Cfg
 }
 
 func provideDynamic(t *testing.T, gcomURL string, opts ...provideDynamicOpts) *Dynamic {
@@ -573,8 +590,12 @@ func provideDynamic(t *testing.T, gcomURL string, opts ...provideDynamicOpts) *D
 	if opt.store == nil {
 		opt.store = angularpatternsstore.ProvideService(kvstore.NewFakeKVStore())
 	}
+	if opt.cfg == nil {
+		opt.cfg = setting.NewCfg()
+	}
+	opt.cfg.GrafanaComURL = gcomURL
 	d, err := ProvideDynamic(
-		&config.Cfg{GrafanaComURL: gcomURL},
+		opt.cfg,
 		opt.store,
 		featuremgmt.WithFeatures(featuremgmt.FlagPluginsDynamicAngularDetectionPatterns),
 	)
diff --git a/pkg/services/pluginsintegration/angularinspector/angularinspector.go b/pkg/services/pluginsintegration/angularinspector/angularinspector.go
index 3ac8734df5df7..1fd9f67101912 100644
--- a/pkg/services/pluginsintegration/angularinspector/angularinspector.go
+++ b/pkg/services/pluginsintegration/angularinspector/angularinspector.go
@@ -1,7 +1,6 @@
 package angularinspector
 
 import (
-	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/manager/loader/angular/angulardetector"
 	"github.com/grafana/grafana/pkg/plugins/manager/loader/angular/angularinspector"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
@@ -12,11 +11,11 @@ type Service struct {
 	angularinspector.Inspector
 }
 
-func ProvideService(cfg *config.Cfg, dynamic *angulardetectorsprovider.Dynamic) (*Service, error) {
+func ProvideService(features featuremgmt.FeatureToggles, dynamic *angulardetectorsprovider.Dynamic) (*Service, error) {
 	var detectorsProvider angulardetector.DetectorsProvider
 	var err error
 	static := angularinspector.NewDefaultStaticDetectorsProvider()
-	if cfg.Features != nil && cfg.Features.IsEnabled(featuremgmt.FlagPluginsDynamicAngularDetectionPatterns) {
+	if features.IsEnabledGlobally(featuremgmt.FlagPluginsDynamicAngularDetectionPatterns) {
 		detectorsProvider = angulardetector.SequenceDetectorsProvider{dynamic, static}
 	} else {
 		detectorsProvider = static
diff --git a/pkg/services/pluginsintegration/angularinspector/angularinspector_test.go b/pkg/services/pluginsintegration/angularinspector/angularinspector_test.go
index de98c2f8382ce..987b278856436 100644
--- a/pkg/services/pluginsintegration/angularinspector/angularinspector_test.go
+++ b/pkg/services/pluginsintegration/angularinspector/angularinspector_test.go
@@ -7,24 +7,24 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/infra/kvstore"
-	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/manager/loader/angular/angulardetector"
 	"github.com/grafana/grafana/pkg/plugins/manager/loader/angular/angularinspector"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/angulardetectorsprovider"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/angularpatternsstore"
+	"github.com/grafana/grafana/pkg/setting"
 )
 
 func TestProvideService(t *testing.T) {
 	t.Run("uses hardcoded inspector if feature flag is not present", func(t *testing.T) {
-		pCfg := &config.Cfg{Features: featuremgmt.WithFeatures()}
+		features := featuremgmt.WithFeatures()
 		dynamic, err := angulardetectorsprovider.ProvideDynamic(
-			pCfg,
+			setting.NewCfg(),
 			angularpatternsstore.ProvideService(kvstore.NewFakeKVStore()),
-			featuremgmt.WithFeatures(featuremgmt.FlagPluginsDynamicAngularDetectionPatterns),
+			features,
 		)
 		require.NoError(t, err)
-		inspector, err := ProvideService(pCfg, dynamic)
+		inspector, err := ProvideService(features, dynamic)
 		require.NoError(t, err)
 		require.IsType(t, inspector.Inspector, &angularinspector.PatternsListInspector{})
 		patternsListInspector := inspector.Inspector.(*angularinspector.PatternsListInspector)
@@ -33,16 +33,16 @@ func TestProvideService(t *testing.T) {
 	})
 
 	t.Run("uses dynamic inspector with hardcoded fallback if feature flag is present", func(t *testing.T) {
-		pCfg := &config.Cfg{Features: featuremgmt.WithFeatures(
+		features := featuremgmt.WithFeatures(
 			featuremgmt.FlagPluginsDynamicAngularDetectionPatterns,
-		)}
+		)
 		dynamic, err := angulardetectorsprovider.ProvideDynamic(
-			pCfg,
+			setting.NewCfg(),
 			angularpatternsstore.ProvideService(kvstore.NewFakeKVStore()),
-			featuremgmt.WithFeatures(),
+			features,
 		)
 		require.NoError(t, err)
-		inspector, err := ProvideService(pCfg, dynamic)
+		inspector, err := ProvideService(features, dynamic)
 		require.NoError(t, err)
 		require.IsType(t, inspector.Inspector, &angularinspector.PatternsListInspector{})
 		require.IsType(t, inspector.Inspector.(*angularinspector.PatternsListInspector).DetectorsProvider, angulardetector.SequenceDetectorsProvider{})
diff --git a/pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go b/pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go
index ffbf17bcac823..f77b8f100bb85 100644
--- a/pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go
+++ b/pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go
@@ -7,12 +7,13 @@ import (
 
 	"github.com/grafana/grafana-aws-sdk/pkg/awsds"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/prometheus/client_golang/prometheus"
+
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/services/caching"
 	"github.com/grafana/grafana/pkg/services/contexthandler"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/prometheus/client_golang/prometheus"
 )
 
 // needed to mock the function for testing
@@ -26,7 +27,7 @@ func NewCachingMiddleware(cachingService caching.CachingService) plugins.ClientM
 
 // NewCachingMiddlewareWithFeatureManager creates a new plugins.ClientMiddleware that will
 // attempt to read and write query results to the cache with a feature manager
-func NewCachingMiddlewareWithFeatureManager(cachingService caching.CachingService, features *featuremgmt.FeatureManager) plugins.ClientMiddleware {
+func NewCachingMiddlewareWithFeatureManager(cachingService caching.CachingService, features featuremgmt.FeatureToggles) plugins.ClientMiddleware {
 	log := log.New("caching_middleware")
 	if err := prometheus.Register(QueryCachingRequestHistogram); err != nil {
 		log.Error("Error registering prometheus collector 'QueryRequestHistogram'", "error", err)
@@ -48,7 +49,7 @@ type CachingMiddleware struct {
 	next     plugins.Client
 	caching  caching.CachingService
 	log      log.Logger
-	features *featuremgmt.FeatureManager
+	features featuremgmt.FeatureToggles
 }
 
 // QueryData receives a data request and attempts to access results already stored in the cache for that request.
@@ -93,7 +94,7 @@ func (m *CachingMiddleware) QueryData(ctx context.Context, req *backend.QueryDat
 	// Update the query cache with the result for this metrics request
 	if err == nil && cr.UpdateCacheFn != nil {
 		// If AWS async caching is not enabled, use the old code path
-		if m.features == nil || !m.features.IsEnabled(featuremgmt.FlagAwsAsyncQueryCaching) {
+		if m.features == nil || !m.features.IsEnabled(ctx, featuremgmt.FlagAwsAsyncQueryCaching) {
 			cr.UpdateCacheFn(ctx, resp)
 		} else {
 			// time how long shouldCacheQuery takes
diff --git a/pkg/services/pluginsintegration/clientmiddleware/forward_id_middleware.go b/pkg/services/pluginsintegration/clientmiddleware/forward_id_middleware.go
index 9e7f9269b3f6f..71989ebe86718 100644
--- a/pkg/services/pluginsintegration/clientmiddleware/forward_id_middleware.go
+++ b/pkg/services/pluginsintegration/clientmiddleware/forward_id_middleware.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/services/contexthandler"
 )
@@ -27,7 +28,7 @@ type ForwardIDMiddleware struct {
 
 func (m *ForwardIDMiddleware) applyToken(ctx context.Context, pCtx backend.PluginContext, req backend.ForwardHTTPHeaders) error {
 	reqCtx := contexthandler.FromContext(ctx)
-	// if request not for a datasource or no HTTP request context skip middleware
+	// no HTTP request context => skip middleware
 	if req == nil || reqCtx == nil || reqCtx.SignedInUser == nil {
 		return nil
 	}
diff --git a/pkg/services/pluginsintegration/clientmiddleware/forward_id_middleware_test.go b/pkg/services/pluginsintegration/clientmiddleware/forward_id_middleware_test.go
index 6ca5773256e04..2972c612a92da 100644
--- a/pkg/services/pluginsintegration/clientmiddleware/forward_id_middleware_test.go
+++ b/pkg/services/pluginsintegration/clientmiddleware/forward_id_middleware_test.go
@@ -6,16 +6,20 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana/pkg/web"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/plugins/manager/client/clienttest"
 	"github.com/grafana/grafana/pkg/services/contexthandler/ctxkey"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/web"
 )
 
 func TestForwardIDMiddleware(t *testing.T) {
+	pluginContext := backend.PluginContext{
+		DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{},
+	}
+
 	t.Run("Should set forwarded id header if present", func(t *testing.T) {
 		cdt := clienttest.NewClientDecoratorTest(t, clienttest.WithMiddlewares(NewForwardIDMiddleware()))
 
@@ -25,7 +29,7 @@ func TestForwardIDMiddleware(t *testing.T) {
 		})
 
 		err := cdt.Decorator.CallResource(ctx, &backend.CallResourceRequest{
-			PluginContext: backend.PluginContext{},
+			PluginContext: pluginContext,
 		}, nopCallResourceSender)
 		require.NoError(t, err)
 
@@ -41,10 +45,30 @@ func TestForwardIDMiddleware(t *testing.T) {
 		})
 
 		err := cdt.Decorator.CallResource(ctx, &backend.CallResourceRequest{
-			PluginContext: backend.PluginContext{},
+			PluginContext: pluginContext,
 		}, nopCallResourceSender)
 		require.NoError(t, err)
 
 		require.Len(t, cdt.CallResourceReq.Headers[forwardIDHeaderName], 0)
 	})
+
+	pluginContext = backend.PluginContext{
+		AppInstanceSettings: &backend.AppInstanceSettings{},
+	}
+
+	t.Run("Should set forwarded id header to app plugin if present", func(t *testing.T) {
+		cdt := clienttest.NewClientDecoratorTest(t, clienttest.WithMiddlewares(NewForwardIDMiddleware()))
+
+		ctx := context.WithValue(context.Background(), ctxkey.Key{}, &contextmodel.ReqContext{
+			Context:      &web.Context{Req: &http.Request{}},
+			SignedInUser: &user.SignedInUser{IDToken: "some-token"},
+		})
+
+		err := cdt.Decorator.CallResource(ctx, &backend.CallResourceRequest{
+			PluginContext: pluginContext,
+		}, nopCallResourceSender)
+		require.NoError(t, err)
+
+		require.Equal(t, "some-token", cdt.CallResourceReq.Headers[forwardIDHeaderName][0])
+	})
 }
diff --git a/pkg/services/pluginsintegration/clientmiddleware/grafana_request_id_header_middleware.go b/pkg/services/pluginsintegration/clientmiddleware/grafana_request_id_header_middleware.go
new file mode 100644
index 0000000000000..15c2a1c1ccc51
--- /dev/null
+++ b/pkg/services/pluginsintegration/clientmiddleware/grafana_request_id_header_middleware.go
@@ -0,0 +1,162 @@
+package clientmiddleware
+
+import (
+	"context"
+	"crypto/hmac"
+	"crypto/sha256"
+	"encoding/hex"
+	"net/http"
+	"net/url"
+
+	"github.com/google/uuid"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/services/contexthandler"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/web"
+)
+
+const GrafanaRequestID = "X-Grafana-Request-Id"
+const GrafanaSignedRequestID = "X-Grafana-Signed-Request-Id"
+const XRealIPHeader = "X-Real-Ip"
+const GrafanaInternalRequest = "X-Grafana-Internal-Request"
+
+// NewHostedGrafanaACHeaderMiddleware creates a new plugins.ClientMiddleware that will
+// generate a random request ID, sign it using internal key and populate X-Grafana-Request-ID with the request ID
+// and X-Grafana-Signed-Request-ID with signed request ID. We can then use this to verify that the request
+// is coming from hosted Grafana and is not an external request. This is used for IP range access control.
+func NewHostedGrafanaACHeaderMiddleware(cfg *setting.Cfg) plugins.ClientMiddleware {
+	return plugins.ClientMiddlewareFunc(func(next plugins.Client) plugins.Client {
+		return &HostedGrafanaACHeaderMiddleware{
+			next: next,
+			log:  log.New("ip_header_middleware"),
+			cfg:  cfg,
+		}
+	})
+}
+
+type HostedGrafanaACHeaderMiddleware struct {
+	next plugins.Client
+	log  log.Logger
+	cfg  *setting.Cfg
+}
+
+func (m *HostedGrafanaACHeaderMiddleware) applyGrafanaRequestIDHeader(ctx context.Context, pCtx backend.PluginContext, h backend.ForwardHTTPHeaders) {
+	// if request is not for a datasource, skip the middleware
+	if h == nil || pCtx.DataSourceInstanceSettings == nil {
+		return
+	}
+
+	// Check if the request is for a datasource that is allowed to have the header
+	dsURL := pCtx.DataSourceInstanceSettings.URL
+	dsBaseURL, err := url.Parse(dsURL)
+	if err != nil {
+		m.log.Debug("Failed to parse data source URL", "error", err)
+		return
+	}
+	if !IsRequestURLInAllowList(dsBaseURL, m.cfg) {
+		m.log.Debug("Data source URL not among the allow-listed URLs", "url", dsBaseURL.String())
+		return
+	}
+
+	var req *http.Request
+	reqCtx := contexthandler.FromContext(ctx)
+	if reqCtx != nil {
+		req = reqCtx.Req
+	}
+	for k, v := range GetGrafanaRequestIDHeaders(req, m.cfg, m.log) {
+		h.SetHTTPHeader(k, v)
+	}
+}
+
+func IsRequestURLInAllowList(url *url.URL, cfg *setting.Cfg) bool {
+	for _, allowedURL := range cfg.IPRangeACAllowedURLs {
+		// Only look at the scheme and host, ignore the path
+		if allowedURL.Host == url.Host && allowedURL.Scheme == url.Scheme {
+			return true
+		}
+	}
+	return false
+}
+
+func GetGrafanaRequestIDHeaders(req *http.Request, cfg *setting.Cfg, logger log.Logger) map[string]string {
+	// Generate a new Grafana request ID and sign it with the secret key
+	uid, err := uuid.NewRandom()
+	if err != nil {
+		logger.Debug("Failed to generate Grafana request ID", "error", err)
+		return nil
+	}
+	grafanaRequestID := uid.String()
+
+	hmac := hmac.New(sha256.New, []byte(cfg.IPRangeACSecretKey))
+	if _, err := hmac.Write([]byte(grafanaRequestID)); err != nil {
+		logger.Debug("Failed to sign IP range access control header", "error", err)
+		return nil
+	}
+	signedGrafanaRequestID := hex.EncodeToString(hmac.Sum(nil))
+
+	headers := make(map[string]string)
+	headers[GrafanaRequestID] = grafanaRequestID
+	headers[GrafanaSignedRequestID] = signedGrafanaRequestID
+
+	// If the remote address is not specified, treat the request as internal
+	remoteAddress := ""
+	if req != nil {
+		remoteAddress = web.RemoteAddr(req)
+	}
+	if remoteAddress != "" {
+		headers[XRealIPHeader] = remoteAddress
+	} else {
+		headers[GrafanaInternalRequest] = "true"
+	}
+
+	return headers
+}
+
+func (m *HostedGrafanaACHeaderMiddleware) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+	if req == nil {
+		return m.next.QueryData(ctx, req)
+	}
+
+	m.applyGrafanaRequestIDHeader(ctx, req.PluginContext, req)
+
+	return m.next.QueryData(ctx, req)
+}
+
+func (m *HostedGrafanaACHeaderMiddleware) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	if req == nil {
+		return m.next.CallResource(ctx, req, sender)
+	}
+
+	m.applyGrafanaRequestIDHeader(ctx, req.PluginContext, req)
+
+	return m.next.CallResource(ctx, req, sender)
+}
+
+func (m *HostedGrafanaACHeaderMiddleware) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
+	if req == nil {
+		return m.next.CheckHealth(ctx, req)
+	}
+
+	m.applyGrafanaRequestIDHeader(ctx, req.PluginContext, req)
+
+	return m.next.CheckHealth(ctx, req)
+}
+
+func (m *HostedGrafanaACHeaderMiddleware) CollectMetrics(ctx context.Context, req *backend.CollectMetricsRequest) (*backend.CollectMetricsResult, error) {
+	return m.next.CollectMetrics(ctx, req)
+}
+
+func (m *HostedGrafanaACHeaderMiddleware) SubscribeStream(ctx context.Context, req *backend.SubscribeStreamRequest) (*backend.SubscribeStreamResponse, error) {
+	return m.next.SubscribeStream(ctx, req)
+}
+
+func (m *HostedGrafanaACHeaderMiddleware) PublishStream(ctx context.Context, req *backend.PublishStreamRequest) (*backend.PublishStreamResponse, error) {
+	return m.next.PublishStream(ctx, req)
+}
+
+func (m *HostedGrafanaACHeaderMiddleware) RunStream(ctx context.Context, req *backend.RunStreamRequest, sender *backend.StreamSender) error {
+	return m.next.RunStream(ctx, req, sender)
+}
diff --git a/pkg/services/pluginsintegration/clientmiddleware/grafana_request_id_header_middleware_test.go b/pkg/services/pluginsintegration/clientmiddleware/grafana_request_id_header_middleware_test.go
new file mode 100644
index 0000000000000..3c389edea1dfe
--- /dev/null
+++ b/pkg/services/pluginsintegration/clientmiddleware/grafana_request_id_header_middleware_test.go
@@ -0,0 +1,138 @@
+package clientmiddleware
+
+import (
+	"context"
+	"crypto/hmac"
+	"crypto/sha256"
+	"encoding/hex"
+	"net/http"
+	"net/url"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana/pkg/plugins/manager/client/clienttest"
+	"github.com/grafana/grafana/pkg/services/contexthandler/ctxkey"
+	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/web"
+)
+
+func Test_HostedGrafanaACHeaderMiddleware(t *testing.T) {
+	t.Run("Should set Grafana request ID headers if the data source URL is in the allow list", func(t *testing.T) {
+		cfg := setting.NewCfg()
+		allowedURL := &url.URL{Scheme: "https", Host: "logs.grafana.net"}
+		cfg.IPRangeACAllowedURLs = []*url.URL{allowedURL}
+		cfg.IPRangeACSecretKey = "secret"
+		cdt := clienttest.NewClientDecoratorTest(t, clienttest.WithMiddlewares(NewHostedGrafanaACHeaderMiddleware(cfg)))
+
+		ctx := context.WithValue(context.Background(), ctxkey.Key{}, &contextmodel.ReqContext{
+			Context: &web.Context{Req: &http.Request{
+				Header: map[string][]string{"X-Real-Ip": {"1.2.3.4"}},
+			}},
+			SignedInUser: &user.SignedInUser{},
+		})
+
+		err := cdt.Decorator.CallResource(ctx, &backend.CallResourceRequest{
+			PluginContext: backend.PluginContext{
+				DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{
+					URL: "https://logs.grafana.net",
+				},
+			},
+		}, nopCallResourceSender)
+		require.NoError(t, err)
+
+		require.Len(t, cdt.CallResourceReq.Headers[GrafanaRequestID], 1)
+		require.Len(t, cdt.CallResourceReq.Headers[GrafanaSignedRequestID], 1)
+
+		requestID := cdt.CallResourceReq.Headers[GrafanaRequestID][0]
+
+		instance := hmac.New(sha256.New, []byte(cfg.IPRangeACSecretKey))
+		_, err = instance.Write([]byte(requestID))
+		require.NoError(t, err)
+		computed := hex.EncodeToString(instance.Sum(nil))
+
+		require.Equal(t, cdt.CallResourceReq.Headers[GrafanaSignedRequestID][0], computed)
+
+		require.Len(t, cdt.CallResourceReq.Headers[XRealIPHeader], 1)
+		require.Equal(t, cdt.CallResourceReq.Headers[XRealIPHeader][0], "1.2.3.4")
+
+		// Internal header should not be set
+		require.Len(t, cdt.CallResourceReq.Headers[GrafanaInternalRequest], 0)
+	})
+
+	t.Run("Should not set Grafana request ID headers if the data source URL is not in the allow list", func(t *testing.T) {
+		cfg := setting.NewCfg()
+		allowedURL := &url.URL{Scheme: "https", Host: "logs.grafana.net"}
+		cfg.IPRangeACAllowedURLs = []*url.URL{allowedURL}
+		cfg.IPRangeACSecretKey = "secret"
+		cdt := clienttest.NewClientDecoratorTest(t, clienttest.WithMiddlewares(NewHostedGrafanaACHeaderMiddleware(cfg)))
+
+		ctx := context.WithValue(context.Background(), ctxkey.Key{}, &contextmodel.ReqContext{
+			Context:      &web.Context{Req: &http.Request{}},
+			SignedInUser: &user.SignedInUser{},
+		})
+
+		err := cdt.Decorator.CallResource(ctx, &backend.CallResourceRequest{
+			PluginContext: backend.PluginContext{
+				DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{
+					URL: "https://logs.not-grafana.net",
+				},
+			},
+		}, nopCallResourceSender)
+		require.NoError(t, err)
+
+		require.Len(t, cdt.CallResourceReq.Headers[GrafanaRequestID], 0)
+		require.Len(t, cdt.CallResourceReq.Headers[GrafanaSignedRequestID], 0)
+	})
+
+	t.Run("Should set Grafana request ID headers if URL scheme and host match a URL from the allow list", func(t *testing.T) {
+		cfg := setting.NewCfg()
+		allowedURL := &url.URL{Scheme: "https", Host: "logs.grafana.net"}
+		cfg.IPRangeACAllowedURLs = []*url.URL{allowedURL}
+		cfg.IPRangeACSecretKey = "secret"
+		cdt := clienttest.NewClientDecoratorTest(t, clienttest.WithMiddlewares(NewHostedGrafanaACHeaderMiddleware(cfg)))
+
+		ctx := context.WithValue(context.Background(), ctxkey.Key{}, &contextmodel.ReqContext{
+			Context:      &web.Context{Req: &http.Request{}},
+			SignedInUser: &user.SignedInUser{},
+		})
+
+		err := cdt.Decorator.CallResource(ctx, &backend.CallResourceRequest{
+			PluginContext: backend.PluginContext{
+				DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{
+					URL: "https://logs.grafana.net/abc/../some/path",
+				},
+			},
+		}, nopCallResourceSender)
+		require.NoError(t, err)
+
+		require.Len(t, cdt.CallResourceReq.Headers[GrafanaRequestID], 1)
+		require.Len(t, cdt.CallResourceReq.Headers[GrafanaSignedRequestID], 1)
+	})
+
+	t.Run("Should set Grafana internal request header if the request is internal (doesn't have X-Real-IP header set)", func(t *testing.T) {
+		cfg := setting.NewCfg()
+		allowedURL := &url.URL{Scheme: "https", Host: "logs.grafana.net"}
+		cfg.IPRangeACAllowedURLs = []*url.URL{allowedURL}
+		cfg.IPRangeACSecretKey = "secret"
+		cdt := clienttest.NewClientDecoratorTest(t, clienttest.WithMiddlewares(NewHostedGrafanaACHeaderMiddleware(cfg)))
+
+		ctx := context.WithValue(context.Background(), ctxkey.Key{}, &contextmodel.ReqContext{
+			Context:      &web.Context{Req: &http.Request{}},
+			SignedInUser: &user.SignedInUser{},
+		})
+
+		err := cdt.Decorator.CallResource(ctx, &backend.CallResourceRequest{
+			PluginContext: backend.PluginContext{
+				DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{
+					URL: "https://logs.grafana.net",
+				},
+			},
+		}, nopCallResourceSender)
+		require.NoError(t, err)
+		require.Equal(t, cdt.CallResourceReq.Headers[GrafanaInternalRequest][0], "true")
+	})
+}
diff --git a/pkg/services/pluginsintegration/clientmiddleware/httpclient_middleware.go b/pkg/services/pluginsintegration/clientmiddleware/httpclient_middleware.go
index f107c21cbeeaf..008ea33b2258e 100644
--- a/pkg/services/pluginsintegration/clientmiddleware/httpclient_middleware.go
+++ b/pkg/services/pluginsintegration/clientmiddleware/httpclient_middleware.go
@@ -50,7 +50,10 @@ func (m *HTTPClientMiddleware) applyHeaders(ctx context.Context, pReq any) conte
 
 			if h, ok := pReq.(backend.ForwardHTTPHeaders); ok {
 				for k, v := range h.GetHTTPHeaders() {
-					req.Header[k] = v
+					// Only set a header if it is not already set.
+					if req.Header.Get(k) == "" {
+						req.Header[k] = v
+					}
 				}
 			}
 
diff --git a/pkg/services/pluginsintegration/clientmiddleware/httpclient_middleware_test.go b/pkg/services/pluginsintegration/clientmiddleware/httpclient_middleware_test.go
index 691a96d1b4e6e..58f3faf3c9998 100644
--- a/pkg/services/pluginsintegration/clientmiddleware/httpclient_middleware_test.go
+++ b/pkg/services/pluginsintegration/clientmiddleware/httpclient_middleware_test.go
@@ -276,6 +276,36 @@ func TestHTTPClientMiddleware(t *testing.T) {
 				require.Equal(t, "cookie2", reqClone.Cookies()[1].Name)
 				require.Equal(t, "cookie3", reqClone.Cookies()[2].Name)
 			})
+
+			t.Run("Should not overwrite an existing header", func(t *testing.T) {
+				_, err = cdt.Decorator.CheckHealth(req.Context(), &backend.CheckHealthRequest{
+					PluginContext: pluginCtx,
+					Headers:       headers,
+				})
+				require.NoError(t, err)
+				require.NotNil(t, cdt.CheckHealthReq)
+				require.Len(t, cdt.CheckHealthReq.Headers, 6)
+
+				middlewares := httpclient.ContextualMiddlewareFromContext(cdt.QueryDataCtx)
+				require.Len(t, middlewares, 1)
+				require.Equal(t, forwardPluginRequestHTTPHeaders, middlewares[0].(httpclient.MiddlewareName).MiddlewareName())
+
+				reqClone := req.Clone(req.Context())
+				// Create a header on the request as if it had been set by some other logic e.g. preceding middleware
+				reqClone.Header.Set(backend.OAuthIdentityTokenHeaderName, "bearer test-token")
+				res, err := middlewares[0].CreateMiddleware(httpclient.Options{}, finalRoundTripper).RoundTrip(reqClone)
+				require.NoError(t, err)
+				require.NoError(t, res.Body.Close())
+				require.Len(t, reqClone.Header, 5)
+				require.Equal(t, "true", reqClone.Header.Get(ngalertmodels.FromAlertHeaderName))
+				require.Equal(t, "bearer test-token", reqClone.Header.Get(backend.OAuthIdentityTokenHeaderName))
+				require.Equal(t, "id-token", reqClone.Header.Get(backend.OAuthIdentityIDTokenHeaderName))
+				require.Equal(t, "uname", reqClone.Header.Get(proxyutil.UserHeaderName))
+				require.Len(t, reqClone.Cookies(), 3)
+				require.Equal(t, "cookie1", reqClone.Cookies()[0].Name)
+				require.Equal(t, "cookie2", reqClone.Cookies()[1].Name)
+				require.Equal(t, "cookie3", reqClone.Cookies()[2].Name)
+			})
 		})
 	})
 }
diff --git a/pkg/services/pluginsintegration/clientmiddleware/logger_middleware.go b/pkg/services/pluginsintegration/clientmiddleware/logger_middleware.go
index 74dc492fc8a25..2a8c6e6538839 100644
--- a/pkg/services/pluginsintegration/clientmiddleware/logger_middleware.go
+++ b/pkg/services/pluginsintegration/clientmiddleware/logger_middleware.go
@@ -2,7 +2,6 @@ package clientmiddleware
 
 import (
 	"context"
-	"errors"
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
@@ -11,57 +10,48 @@ import (
 	"github.com/grafana/grafana/pkg/plugins"
 	plog "github.com/grafana/grafana/pkg/plugins/log"
 	"github.com/grafana/grafana/pkg/plugins/pluginrequestmeta"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/setting"
 )
 
 // NewLoggerMiddleware creates a new plugins.ClientMiddleware that will
 // log requests.
-func NewLoggerMiddleware(cfg *setting.Cfg, logger plog.Logger, features featuremgmt.FeatureToggles) plugins.ClientMiddleware {
+func NewLoggerMiddleware(logger plog.Logger) plugins.ClientMiddleware {
 	return plugins.ClientMiddlewareFunc(func(next plugins.Client) plugins.Client {
-		if !cfg.PluginLogBackendRequests {
-			return next
-		}
-
 		return &LoggerMiddleware{
-			next:     next,
-			logger:   logger,
-			features: features,
+			next:   next,
+			logger: logger,
 		}
 	})
 }
 
 type LoggerMiddleware struct {
-	next     plugins.Client
-	logger   plog.Logger
-	features featuremgmt.FeatureToggles
+	next   plugins.Client
+	logger plog.Logger
 }
 
-func (m *LoggerMiddleware) logRequest(ctx context.Context, fn func(ctx context.Context) error) error {
-	status := statusOK
+func (m *LoggerMiddleware) logRequest(ctx context.Context, fn func(ctx context.Context) (requestStatus, error)) error {
 	start := time.Now()
 	timeBeforePluginRequest := log.TimeSinceStart(ctx, start)
 
-	err := fn(ctx)
-	if err != nil {
-		status = statusError
-		if errors.Is(err, context.Canceled) {
-			status = statusCancelled
-		}
-	}
+	status, err := fn(ctx)
 	logParams := []any{
 		"status", status,
 		"duration", time.Since(start),
 		"eventName", "grafana-data-egress",
 		"time_before_plugin_request", timeBeforePluginRequest,
 	}
-	if status == statusError {
+	if err != nil {
 		logParams = append(logParams, "error", err)
 	}
-	if m.features.IsEnabled(featuremgmt.FlagPluginsInstrumentationStatusSource) {
-		logParams = append(logParams, "status_source", pluginrequestmeta.StatusSourceFromContext(ctx))
+	logParams = append(logParams, "statusSource", pluginrequestmeta.StatusSourceFromContext(ctx))
+
+	ctxLogger := m.logger.FromContext(ctx)
+	logFunc := ctxLogger.Info
+	if status > requestStatusOK {
+		logFunc = ctxLogger.Error
 	}
-	m.logger.FromContext(ctx).Info("Plugin Request Completed", logParams...)
+
+	logFunc("Plugin Request Completed", logParams...)
+
 	return err
 }
 
@@ -71,21 +61,27 @@ func (m *LoggerMiddleware) QueryData(ctx context.Context, req *backend.QueryData
 	}
 
 	var resp *backend.QueryDataResponse
-	err := m.logRequest(ctx, func(ctx context.Context) (innerErr error) {
+	err := m.logRequest(ctx, func(ctx context.Context) (status requestStatus, innerErr error) {
 		resp, innerErr = m.next.QueryData(ctx, req)
 
 		if innerErr != nil {
-			return innerErr
+			return requestStatusFromError(innerErr), innerErr
 		}
 
 		ctxLogger := m.logger.FromContext(ctx)
 		for refID, dr := range resp.Responses {
 			if dr.Error != nil {
-				ctxLogger.Error("Partial data response error", "refID", refID, "error", dr.Error)
+				logParams := []any{
+					"refID", refID,
+					"status", int(dr.Status),
+					"error", dr.Error,
+					"statusSource", pluginrequestmeta.StatusSourceFromPluginErrorSource(dr.ErrorSource),
+				}
+				ctxLogger.Error("Partial data response error", logParams...)
 			}
 		}
 
-		return nil
+		return requestStatusFromQueryDataResponse(resp, innerErr), innerErr
 	})
 
 	return resp, err
@@ -96,9 +92,9 @@ func (m *LoggerMiddleware) CallResource(ctx context.Context, req *backend.CallRe
 		return m.next.CallResource(ctx, req, sender)
 	}
 
-	err := m.logRequest(ctx, func(ctx context.Context) (innerErr error) {
+	err := m.logRequest(ctx, func(ctx context.Context) (status requestStatus, innerErr error) {
 		innerErr = m.next.CallResource(ctx, req, sender)
-		return innerErr
+		return requestStatusFromError(innerErr), innerErr
 	})
 
 	return err
@@ -110,9 +106,9 @@ func (m *LoggerMiddleware) CheckHealth(ctx context.Context, req *backend.CheckHe
 	}
 
 	var resp *backend.CheckHealthResult
-	err := m.logRequest(ctx, func(ctx context.Context) (innerErr error) {
+	err := m.logRequest(ctx, func(ctx context.Context) (status requestStatus, innerErr error) {
 		resp, innerErr = m.next.CheckHealth(ctx, req)
-		return innerErr
+		return requestStatusFromError(innerErr), innerErr
 	})
 
 	return resp, err
@@ -124,9 +120,9 @@ func (m *LoggerMiddleware) CollectMetrics(ctx context.Context, req *backend.Coll
 	}
 
 	var resp *backend.CollectMetricsResult
-	err := m.logRequest(ctx, func(ctx context.Context) (innerErr error) {
+	err := m.logRequest(ctx, func(ctx context.Context) (status requestStatus, innerErr error) {
 		resp, innerErr = m.next.CollectMetrics(ctx, req)
-		return innerErr
+		return requestStatusFromError(innerErr), innerErr
 	})
 
 	return resp, err
diff --git a/pkg/services/pluginsintegration/clientmiddleware/metrics_middleware.go b/pkg/services/pluginsintegration/clientmiddleware/metrics_middleware.go
index e293711320683..08274d8248bb0 100644
--- a/pkg/services/pluginsintegration/clientmiddleware/metrics_middleware.go
+++ b/pkg/services/pluginsintegration/clientmiddleware/metrics_middleware.go
@@ -2,8 +2,6 @@ package clientmiddleware
 
 import (
 	"context"
-	"errors"
-	"fmt"
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
@@ -13,7 +11,6 @@ import (
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/manager/registry"
 	"github.com/grafana/grafana/pkg/plugins/pluginrequestmeta"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 )
 
 // pluginMetrics contains the prometheus metrics used by the MetricsMiddleware.
@@ -29,15 +26,11 @@ type pluginMetrics struct {
 type MetricsMiddleware struct {
 	pluginMetrics
 	pluginRegistry registry.Service
-	features       featuremgmt.FeatureToggles
 	next           plugins.Client
 }
 
-func newMetricsMiddleware(promRegisterer prometheus.Registerer, pluginRegistry registry.Service, features featuremgmt.FeatureToggles) *MetricsMiddleware {
-	var additionalLabels []string
-	if features.IsEnabled(featuremgmt.FlagPluginsInstrumentationStatusSource) {
-		additionalLabels = []string{"status_source"}
-	}
+func newMetricsMiddleware(promRegisterer prometheus.Registerer, pluginRegistry registry.Service) *MetricsMiddleware {
+	additionalLabels := []string{"status_source"}
 	pluginRequestCounter := prometheus.NewCounterVec(prometheus.CounterOpts{
 		Namespace: "grafana",
 		Name:      "plugin_request_total",
@@ -77,13 +70,12 @@ func newMetricsMiddleware(promRegisterer prometheus.Registerer, pluginRegistry r
 			pluginRequestDurationSeconds: pluginRequestDurationSeconds,
 		},
 		pluginRegistry: pluginRegistry,
-		features:       features,
 	}
 }
 
 // NewMetricsMiddleware returns a new MetricsMiddleware.
-func NewMetricsMiddleware(promRegisterer prometheus.Registerer, pluginRegistry registry.Service, features featuremgmt.FeatureToggles) plugins.ClientMiddleware {
-	imw := newMetricsMiddleware(promRegisterer, pluginRegistry, features)
+func NewMetricsMiddleware(promRegisterer prometheus.Registerer, pluginRegistry registry.Service) plugins.ClientMiddleware {
+	imw := newMetricsMiddleware(promRegisterer, pluginRegistry)
 	return plugins.ClientMiddlewareFunc(func(next plugins.Client) plugins.Client {
 		imw.next = next
 		return imw
@@ -91,8 +83,8 @@ func NewMetricsMiddleware(promRegisterer prometheus.Registerer, pluginRegistry r
 }
 
 // pluginTarget returns the value for the "target" Prometheus label for the given plugin ID.
-func (m *MetricsMiddleware) pluginTarget(ctx context.Context, pluginID string) (string, error) {
-	p, exists := m.pluginRegistry.Plugin(ctx, pluginID)
+func (m *MetricsMiddleware) pluginTarget(ctx context.Context, pluginID, pluginVersion string) (string, error) {
+	p, exists := m.pluginRegistry.Plugin(ctx, pluginID, pluginVersion)
 	if !exists {
 		return "", plugins.ErrPluginNotRegistered
 	}
@@ -101,7 +93,7 @@ func (m *MetricsMiddleware) pluginTarget(ctx context.Context, pluginID string) (
 
 // instrumentPluginRequestSize tracks the size of the given request in the m.pluginRequestSize metric.
 func (m *MetricsMiddleware) instrumentPluginRequestSize(ctx context.Context, pluginCtx backend.PluginContext, endpoint string, requestSize float64) error {
-	target, err := m.pluginTarget(ctx, pluginCtx.PluginID)
+	target, err := m.pluginTarget(ctx, pluginCtx.PluginID, pluginCtx.PluginVersion)
 	if err != nil {
 		return err
 	}
@@ -110,37 +102,22 @@ func (m *MetricsMiddleware) instrumentPluginRequestSize(ctx context.Context, plu
 }
 
 // instrumentPluginRequest increments the m.pluginRequestCounter metric and tracks the duration of the given request.
-func (m *MetricsMiddleware) instrumentPluginRequest(ctx context.Context, pluginCtx backend.PluginContext, endpoint string, fn func(context.Context) error) error {
-	target, err := m.pluginTarget(ctx, pluginCtx.PluginID)
+func (m *MetricsMiddleware) instrumentPluginRequest(ctx context.Context, pluginCtx backend.PluginContext, endpoint string, fn func(context.Context) (requestStatus, error)) error {
+	target, err := m.pluginTarget(ctx, pluginCtx.PluginID, pluginCtx.PluginVersion)
 	if err != nil {
 		return err
 	}
 
-	status := statusOK
 	start := time.Now()
 
-	err = fn(ctx)
-	if err != nil {
-		status = statusError
-		if errors.Is(err, context.Canceled) {
-			status = statusCancelled
-		}
-	}
+	status, err := fn(ctx)
 	elapsed := time.Since(start)
 
-	pluginRequestDurationLabels := []string{pluginCtx.PluginID, endpoint, target}
-	pluginRequestCounterLabels := []string{pluginCtx.PluginID, endpoint, status, target}
-	pluginRequestDurationSecondsLabels := []string{"grafana-backend", pluginCtx.PluginID, endpoint, status, target}
-	if m.features.IsEnabled(featuremgmt.FlagPluginsInstrumentationStatusSource) {
-		statusSource := pluginrequestmeta.StatusSourceFromContext(ctx)
-		pluginRequestDurationLabels = append(pluginRequestDurationLabels, string(statusSource))
-		pluginRequestCounterLabels = append(pluginRequestCounterLabels, string(statusSource))
-		pluginRequestDurationSecondsLabels = append(pluginRequestDurationSecondsLabels, string(statusSource))
-	}
+	statusSource := pluginrequestmeta.StatusSourceFromContext(ctx)
 
-	pluginRequestDurationWithLabels := m.pluginRequestDuration.WithLabelValues(pluginRequestDurationLabels...)
-	pluginRequestCounterWithLabels := m.pluginRequestCounter.WithLabelValues(pluginRequestCounterLabels...)
-	pluginRequestDurationSecondsWithLabels := m.pluginRequestDurationSeconds.WithLabelValues(pluginRequestDurationSecondsLabels...)
+	pluginRequestDurationWithLabels := m.pluginRequestDuration.WithLabelValues(pluginCtx.PluginID, endpoint, target, string(statusSource))
+	pluginRequestCounterWithLabels := m.pluginRequestCounter.WithLabelValues(pluginCtx.PluginID, endpoint, status.String(), target, string(statusSource))
+	pluginRequestDurationSecondsWithLabels := m.pluginRequestDurationSeconds.WithLabelValues("grafana-backend", pluginCtx.PluginID, endpoint, status.String(), target, string(statusSource))
 
 	if traceID := tracing.TraceIDFromContext(ctx, true); traceID != "" {
 		pluginRequestDurationWithLabels.(prometheus.ExemplarObserver).ObserveWithExemplar(
@@ -160,47 +137,21 @@ func (m *MetricsMiddleware) instrumentPluginRequest(ctx context.Context, pluginC
 }
 
 func (m *MetricsMiddleware) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
-	// Setup plugin request status source
-	ctx = pluginrequestmeta.WithStatusSource(ctx, pluginrequestmeta.StatusSourcePlugin)
-
 	var requestSize float64
 	for _, v := range req.Queries {
 		requestSize += float64(len(v.JSON))
 	}
+
 	if err := m.instrumentPluginRequestSize(ctx, req.PluginContext, endpointQueryData, requestSize); err != nil {
 		return nil, err
 	}
+
 	var resp *backend.QueryDataResponse
-	err := m.instrumentPluginRequest(ctx, req.PluginContext, endpointQueryData, func(ctx context.Context) (innerErr error) {
+	err := m.instrumentPluginRequest(ctx, req.PluginContext, endpointQueryData, func(ctx context.Context) (status requestStatus, innerErr error) {
 		resp, innerErr = m.next.QueryData(ctx, req)
-		if resp == nil || resp.Responses == nil || !m.features.IsEnabled(featuremgmt.FlagPluginsInstrumentationStatusSource) {
-			return innerErr
-		}
-
-		// Set downstream status source in the context if there's at least one response with downstream status source,
-		// and if there's no plugin error
-		var hasPluginError bool
-		var hasDownstreamError bool
-		for _, r := range resp.Responses {
-			if r.Error == nil {
-				continue
-			}
-			if r.ErrorSource == backend.ErrorSourceDownstream {
-				hasDownstreamError = true
-			} else {
-				hasPluginError = true
-			}
-		}
-		// A plugin error has higher priority than a downstream error,
-		// so set to downstream only if there's no plugin error
-		if hasDownstreamError && !hasPluginError {
-			if err := pluginrequestmeta.WithDownstreamStatusSource(ctx); err != nil {
-				return fmt.Errorf("failed to set downstream status source: %w", err)
-			}
-		}
-
-		return innerErr
+		return requestStatusFromQueryDataResponse(resp, innerErr), innerErr
 	})
+
 	return resp, err
 }
 
@@ -208,25 +159,27 @@ func (m *MetricsMiddleware) CallResource(ctx context.Context, req *backend.CallR
 	if err := m.instrumentPluginRequestSize(ctx, req.PluginContext, endpointCallResource, float64(len(req.Body))); err != nil {
 		return err
 	}
-	return m.instrumentPluginRequest(ctx, req.PluginContext, endpointCallResource, func(ctx context.Context) error {
-		return m.next.CallResource(ctx, req, sender)
+	return m.instrumentPluginRequest(ctx, req.PluginContext, endpointCallResource, func(ctx context.Context) (requestStatus, error) {
+		innerErr := m.next.CallResource(ctx, req, sender)
+		return requestStatusFromError(innerErr), innerErr
 	})
 }
 
 func (m *MetricsMiddleware) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
 	var result *backend.CheckHealthResult
-	err := m.instrumentPluginRequest(ctx, req.PluginContext, endpointCheckHealth, func(ctx context.Context) (innerErr error) {
+	err := m.instrumentPluginRequest(ctx, req.PluginContext, endpointCheckHealth, func(ctx context.Context) (status requestStatus, innerErr error) {
 		result, innerErr = m.next.CheckHealth(ctx, req)
-		return
+		return requestStatusFromError(innerErr), innerErr
 	})
+
 	return result, err
 }
 
 func (m *MetricsMiddleware) CollectMetrics(ctx context.Context, req *backend.CollectMetricsRequest) (*backend.CollectMetricsResult, error) {
 	var result *backend.CollectMetricsResult
-	err := m.instrumentPluginRequest(ctx, req.PluginContext, endpointCollectMetrics, func(ctx context.Context) (innerErr error) {
+	err := m.instrumentPluginRequest(ctx, req.PluginContext, endpointCollectMetrics, func(ctx context.Context) (status requestStatus, innerErr error) {
 		result, innerErr = m.next.CollectMetrics(ctx, req)
-		return
+		return requestStatusFromError(innerErr), innerErr
 	})
 	return result, err
 }
diff --git a/pkg/services/pluginsintegration/clientmiddleware/metrics_middleware_test.go b/pkg/services/pluginsintegration/clientmiddleware/metrics_middleware_test.go
index eaae2c58fdbf9..6fe03743b1204 100644
--- a/pkg/services/pluginsintegration/clientmiddleware/metrics_middleware_test.go
+++ b/pkg/services/pluginsintegration/clientmiddleware/metrics_middleware_test.go
@@ -17,7 +17,6 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/manager/client/clienttest"
 	"github.com/grafana/grafana/pkg/plugins/manager/fakes"
 	"github.com/grafana/grafana/pkg/plugins/pluginrequestmeta"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 )
 
 const (
@@ -76,7 +75,7 @@ func TestInstrumentationMiddleware(t *testing.T) {
 					JSONData: plugins.JSONData{ID: pluginID, Backend: true},
 				}))
 
-				mw := newMetricsMiddleware(promRegistry, pluginsRegistry, featuremgmt.WithFeatures())
+				mw := newMetricsMiddleware(promRegistry, pluginsRegistry)
 				cdt := clienttest.NewClientDecoratorTest(t, clienttest.WithMiddlewares(
 					plugins.ClientMiddlewareFunc(func(next plugins.Client) plugins.Client {
 						mw.next = next
@@ -90,7 +89,7 @@ func TestInstrumentationMiddleware(t *testing.T) {
 				require.Equal(t, 1, testutil.CollectAndCount(promRegistry, metricRequestDurationMs))
 				require.Equal(t, 1, testutil.CollectAndCount(promRegistry, metricRequestDurationS))
 
-				counter := mw.pluginMetrics.pluginRequestCounter.WithLabelValues(pluginID, tc.expEndpoint, statusOK, string(backendplugin.TargetUnknown))
+				counter := mw.pluginMetrics.pluginRequestCounter.WithLabelValues(pluginID, tc.expEndpoint, requestStatusOK.String(), string(backendplugin.TargetUnknown), string(pluginrequestmeta.DefaultStatusSource))
 				require.Equal(t, 1.0, testutil.ToFloat64(counter))
 				for _, m := range []string{metricRequestDurationMs, metricRequestDurationS} {
 					require.NoError(t, checkHistogram(promRegistry, m, map[string]string{
@@ -115,10 +114,10 @@ func TestInstrumentationMiddleware(t *testing.T) {
 
 func TestInstrumentationMiddlewareStatusSource(t *testing.T) {
 	const labelStatusSource = "status_source"
-	queryDataCounterLabels := prometheus.Labels{
+	queryDataErrorCounterLabels := prometheus.Labels{
 		"plugin_id": pluginID,
 		"endpoint":  endpointQueryData,
-		"status":    statusOK,
+		"status":    requestStatusError.String(),
 		"target":    string(backendplugin.TargetUnknown),
 	}
 	downstreamErrorResponse := backend.DataResponse{
@@ -153,63 +152,32 @@ func TestInstrumentationMiddlewareStatusSource(t *testing.T) {
 	require.NoError(t, pluginsRegistry.Add(context.Background(), &plugins.Plugin{
 		JSONData: plugins.JSONData{ID: pluginID, Backend: true},
 	}))
-	features := featuremgmt.WithFeatures(featuremgmt.FlagPluginsInstrumentationStatusSource)
-	metricsMw := newMetricsMiddleware(promRegistry, pluginsRegistry, features)
+	metricsMw := newMetricsMiddleware(promRegistry, pluginsRegistry)
 	cdt := clienttest.NewClientDecoratorTest(t, clienttest.WithMiddlewares(
+		NewPluginRequestMetaMiddleware(),
 		plugins.ClientMiddlewareFunc(func(next plugins.Client) plugins.Client {
 			metricsMw.next = next
 			return metricsMw
 		}),
+		NewStatusSourceMiddleware(),
 	))
 
 	t.Run("Metrics", func(t *testing.T) {
-		t.Run("Should ignore ErrorSource if feature flag is disabled", func(t *testing.T) {
-			// Use different middleware without feature flag
-			metricsMw := newMetricsMiddleware(prometheus.NewRegistry(), pluginsRegistry, featuremgmt.WithFeatures())
-			cdt := clienttest.NewClientDecoratorTest(t, clienttest.WithMiddlewares(
-				plugins.ClientMiddlewareFunc(func(next plugins.Client) plugins.Client {
-					metricsMw.next = next
-					return metricsMw
-				}),
-			))
+		metricsMw.pluginMetrics.pluginRequestCounter.Reset()
 
-			cdt.TestClient.QueryDataFunc = func(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
-				return &backend.QueryDataResponse{Responses: map[string]backend.DataResponse{"A": downstreamErrorResponse}}, nil
-			}
-			_, err := cdt.Decorator.QueryData(context.Background(), &backend.QueryDataRequest{PluginContext: pCtx})
-			require.NoError(t, err)
-			counter, err := metricsMw.pluginMetrics.pluginRequestCounter.GetMetricWith(newLabels(queryDataCounterLabels, nil))
-			require.NoError(t, err)
-			require.Equal(t, 1.0, testutil.ToFloat64(counter))
-
-			// error_source should not be defined at all
-			_, err = metricsMw.pluginMetrics.pluginRequestCounter.GetMetricWith(newLabels(
-				queryDataCounterLabels,
-				prometheus.Labels{
-					labelStatusSource: string(backend.ErrorSourceDownstream),
-				}),
-			)
-			require.Error(t, err)
-			require.ErrorContains(t, err, "inconsistent label cardinality")
-		})
-
-		t.Run("Should add error_source label if feature flag is enabled", func(t *testing.T) {
-			metricsMw.pluginMetrics.pluginRequestCounter.Reset()
-
-			cdt.TestClient.QueryDataFunc = func(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
-				return &backend.QueryDataResponse{Responses: map[string]backend.DataResponse{"A": downstreamErrorResponse}}, nil
-			}
-			_, err := cdt.Decorator.QueryData(context.Background(), &backend.QueryDataRequest{PluginContext: pCtx})
-			require.NoError(t, err)
-			counter, err := metricsMw.pluginMetrics.pluginRequestCounter.GetMetricWith(newLabels(
-				queryDataCounterLabels,
-				prometheus.Labels{
-					labelStatusSource: string(backend.ErrorSourceDownstream),
-				}),
-			)
-			require.NoError(t, err)
-			require.Equal(t, 1.0, testutil.ToFloat64(counter))
-		})
+		cdt.TestClient.QueryDataFunc = func(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+			return &backend.QueryDataResponse{Responses: map[string]backend.DataResponse{"A": downstreamErrorResponse}}, nil
+		}
+		_, err := cdt.Decorator.QueryData(context.Background(), &backend.QueryDataRequest{PluginContext: pCtx})
+		require.NoError(t, err)
+		counter, err := metricsMw.pluginMetrics.pluginRequestCounter.GetMetricWith(newLabels(
+			queryDataErrorCounterLabels,
+			prometheus.Labels{
+				labelStatusSource: string(backend.ErrorSourceDownstream),
+			}),
+		)
+		require.NoError(t, err)
+		require.Equal(t, 1.0, testutil.ToFloat64(counter))
 	})
 
 	t.Run("Priority", func(t *testing.T) {
diff --git a/pkg/services/pluginsintegration/clientmiddleware/plugin_request_meta_middleware.go b/pkg/services/pluginsintegration/clientmiddleware/plugin_request_meta_middleware.go
new file mode 100644
index 0000000000000..d11093f7bb206
--- /dev/null
+++ b/pkg/services/pluginsintegration/clientmiddleware/plugin_request_meta_middleware.go
@@ -0,0 +1,69 @@
+package clientmiddleware
+
+import (
+	"context"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/pluginrequestmeta"
+)
+
+// NewPluginRequestMetaMiddleware returns a new plugins.ClientMiddleware that sets up the default
+// values for the plugin request meta in the context.Context. All middlewares that are executed
+// after this one are be able to access plugin request meta via the pluginrequestmeta package.
+func NewPluginRequestMetaMiddleware() plugins.ClientMiddleware {
+	return plugins.ClientMiddlewareFunc(func(next plugins.Client) plugins.Client {
+		return &PluginRequestMetaMiddleware{
+			next:                next,
+			defaultStatusSource: pluginrequestmeta.DefaultStatusSource,
+		}
+	})
+}
+
+type PluginRequestMetaMiddleware struct {
+	next                plugins.Client
+	defaultStatusSource pluginrequestmeta.StatusSource
+}
+
+func (m *PluginRequestMetaMiddleware) withDefaultPluginRequestMeta(ctx context.Context) context.Context {
+	// Setup plugin request status source
+	ctx = pluginrequestmeta.WithStatusSource(ctx, m.defaultStatusSource)
+
+	return ctx
+}
+
+func (m *PluginRequestMetaMiddleware) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+	ctx = m.withDefaultPluginRequestMeta(ctx)
+	return m.next.QueryData(ctx, req)
+}
+
+func (m *PluginRequestMetaMiddleware) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	ctx = m.withDefaultPluginRequestMeta(ctx)
+	return m.next.CallResource(ctx, req, sender)
+}
+
+func (m *PluginRequestMetaMiddleware) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
+	ctx = m.withDefaultPluginRequestMeta(ctx)
+	return m.next.CheckHealth(ctx, req)
+}
+
+func (m *PluginRequestMetaMiddleware) CollectMetrics(ctx context.Context, req *backend.CollectMetricsRequest) (*backend.CollectMetricsResult, error) {
+	ctx = m.withDefaultPluginRequestMeta(ctx)
+	return m.next.CollectMetrics(ctx, req)
+}
+
+func (m *PluginRequestMetaMiddleware) SubscribeStream(ctx context.Context, req *backend.SubscribeStreamRequest) (*backend.SubscribeStreamResponse, error) {
+	ctx = m.withDefaultPluginRequestMeta(ctx)
+	return m.next.SubscribeStream(ctx, req)
+}
+
+func (m *PluginRequestMetaMiddleware) PublishStream(ctx context.Context, req *backend.PublishStreamRequest) (*backend.PublishStreamResponse, error) {
+	ctx = m.withDefaultPluginRequestMeta(ctx)
+	return m.next.PublishStream(ctx, req)
+}
+
+func (m *PluginRequestMetaMiddleware) RunStream(ctx context.Context, req *backend.RunStreamRequest, sender *backend.StreamSender) error {
+	ctx = m.withDefaultPluginRequestMeta(ctx)
+	return m.next.RunStream(ctx, req, sender)
+}
diff --git a/pkg/services/pluginsintegration/clientmiddleware/plugin_request_meta_middleware_test.go b/pkg/services/pluginsintegration/clientmiddleware/plugin_request_meta_middleware_test.go
new file mode 100644
index 0000000000000..79adb858313e5
--- /dev/null
+++ b/pkg/services/pluginsintegration/clientmiddleware/plugin_request_meta_middleware_test.go
@@ -0,0 +1,40 @@
+package clientmiddleware
+
+import (
+	"context"
+	"testing"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/manager/client/clienttest"
+	"github.com/grafana/grafana/pkg/plugins/pluginrequestmeta"
+)
+
+func TestPluginRequestMetaMiddleware(t *testing.T) {
+	t.Run("default", func(t *testing.T) {
+		cdt := clienttest.NewClientDecoratorTest(t,
+			clienttest.WithMiddlewares(NewPluginRequestMetaMiddleware()),
+		)
+		_, err := cdt.Decorator.QueryData(context.Background(), &backend.QueryDataRequest{})
+		require.NoError(t, err)
+		ss := pluginrequestmeta.StatusSourceFromContext(cdt.QueryDataCtx)
+		require.Equal(t, pluginrequestmeta.StatusSourcePlugin, ss)
+	})
+
+	t.Run("other value", func(t *testing.T) {
+		cdt := clienttest.NewClientDecoratorTest(t,
+			clienttest.WithMiddlewares(plugins.ClientMiddlewareFunc(func(next plugins.Client) plugins.Client {
+				return &PluginRequestMetaMiddleware{
+					next:                next,
+					defaultStatusSource: "test",
+				}
+			})),
+		)
+		_, err := cdt.Decorator.QueryData(context.Background(), &backend.QueryDataRequest{})
+		require.NoError(t, err)
+		ss := pluginrequestmeta.StatusSourceFromContext(cdt.QueryDataCtx)
+		require.Equal(t, pluginrequestmeta.StatusSource("test"), ss)
+	})
+}
diff --git a/pkg/services/pluginsintegration/clientmiddleware/status_source_middleware.go b/pkg/services/pluginsintegration/clientmiddleware/status_source_middleware.go
new file mode 100644
index 0000000000000..f2496db5d92b7
--- /dev/null
+++ b/pkg/services/pluginsintegration/clientmiddleware/status_source_middleware.go
@@ -0,0 +1,83 @@
+package clientmiddleware
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/pluginrequestmeta"
+)
+
+// NewStatusSourceMiddleware returns a new plugins.ClientMiddleware that sets the status source in the
+// plugin request meta stored in the context.Context, according to the query data responses returned by QueryError.
+// If at least one query data response has a "downstream" status source and there isn't one with a "plugin" status source,
+// the plugin request meta in the context is set to "downstream".
+func NewStatusSourceMiddleware() plugins.ClientMiddleware {
+	return plugins.ClientMiddlewareFunc(func(next plugins.Client) plugins.Client {
+		return &StatusSourceMiddleware{
+			next: next,
+		}
+	})
+}
+
+type StatusSourceMiddleware struct {
+	next plugins.Client
+}
+
+func (m *StatusSourceMiddleware) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+	resp, err := m.next.QueryData(ctx, req)
+	if resp == nil || len(resp.Responses) == 0 {
+		return resp, err
+	}
+
+	// Set downstream status source in the context if there's at least one response with downstream status source,
+	// and if there's no plugin error
+	var hasPluginError bool
+	var hasDownstreamError bool
+	for _, r := range resp.Responses {
+		if r.Error == nil {
+			continue
+		}
+		if r.ErrorSource == backend.ErrorSourceDownstream {
+			hasDownstreamError = true
+		} else {
+			hasPluginError = true
+		}
+	}
+
+	// A plugin error has higher priority than a downstream error,
+	// so set to downstream only if there's no plugin error
+	if hasDownstreamError && !hasPluginError {
+		if err := pluginrequestmeta.WithDownstreamStatusSource(ctx); err != nil {
+			return resp, fmt.Errorf("failed to set downstream status source: %w", err)
+		}
+	}
+
+	return resp, err
+}
+
+func (m *StatusSourceMiddleware) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	return m.next.CallResource(ctx, req, sender)
+}
+
+func (m *StatusSourceMiddleware) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
+	return m.next.CheckHealth(ctx, req)
+}
+
+func (m *StatusSourceMiddleware) CollectMetrics(ctx context.Context, req *backend.CollectMetricsRequest) (*backend.CollectMetricsResult, error) {
+	return m.next.CollectMetrics(ctx, req)
+}
+
+func (m *StatusSourceMiddleware) SubscribeStream(ctx context.Context, req *backend.SubscribeStreamRequest) (*backend.SubscribeStreamResponse, error) {
+	return m.next.SubscribeStream(ctx, req)
+}
+
+func (m *StatusSourceMiddleware) PublishStream(ctx context.Context, req *backend.PublishStreamRequest) (*backend.PublishStreamResponse, error) {
+	return m.next.PublishStream(ctx, req)
+}
+
+func (m *StatusSourceMiddleware) RunStream(ctx context.Context, req *backend.RunStreamRequest, sender *backend.StreamSender) error {
+	return m.next.RunStream(ctx, req, sender)
+}
diff --git a/pkg/services/pluginsintegration/clientmiddleware/status_source_middleware_test.go b/pkg/services/pluginsintegration/clientmiddleware/status_source_middleware_test.go
new file mode 100644
index 0000000000000..88d5e7f0534e5
--- /dev/null
+++ b/pkg/services/pluginsintegration/clientmiddleware/status_source_middleware_test.go
@@ -0,0 +1,88 @@
+package clientmiddleware
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/plugins/manager/client/clienttest"
+	"github.com/grafana/grafana/pkg/plugins/pluginrequestmeta"
+)
+
+func TestStatusSourceMiddleware(t *testing.T) {
+	someErr := errors.New("oops")
+
+	for _, tc := range []struct {
+		name string
+
+		queryDataResponse *backend.QueryDataResponse
+
+		expStatusSource pluginrequestmeta.StatusSource
+	}{
+		{
+			name:              `no error should be "plugin" status source`,
+			queryDataResponse: nil,
+			expStatusSource:   pluginrequestmeta.StatusSourcePlugin,
+		},
+		{
+			name: `single downstream error should be "downstream" status source`,
+			queryDataResponse: &backend.QueryDataResponse{
+				Responses: map[string]backend.DataResponse{
+					"A": {Error: someErr, ErrorSource: backend.ErrorSourceDownstream},
+				},
+			},
+			expStatusSource: pluginrequestmeta.StatusSourceDownstream,
+		},
+		{
+			name: `single plugin error should be "plugin" status source`,
+			queryDataResponse: &backend.QueryDataResponse{
+				Responses: map[string]backend.DataResponse{
+					"A": {Error: someErr, ErrorSource: backend.ErrorSourcePlugin},
+				},
+			},
+			expStatusSource: pluginrequestmeta.StatusSourcePlugin,
+		},
+		{
+			name: `multiple downstream errors should be "downstream" status source`,
+			queryDataResponse: &backend.QueryDataResponse{
+				Responses: map[string]backend.DataResponse{
+					"A": {Error: someErr, ErrorSource: backend.ErrorSourceDownstream},
+					"B": {Error: someErr, ErrorSource: backend.ErrorSourceDownstream},
+				},
+			},
+			expStatusSource: pluginrequestmeta.StatusSourceDownstream,
+		},
+		{
+			name: `single plugin error mixed with downstream errors should be "plugin" status source`,
+			queryDataResponse: &backend.QueryDataResponse{
+				Responses: map[string]backend.DataResponse{
+					"A": {Error: someErr, ErrorSource: backend.ErrorSourceDownstream},
+					"B": {Error: someErr, ErrorSource: backend.ErrorSourcePlugin},
+					"C": {Error: someErr, ErrorSource: backend.ErrorSourceDownstream},
+				},
+			},
+			expStatusSource: pluginrequestmeta.StatusSourcePlugin,
+		},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			cdt := clienttest.NewClientDecoratorTest(t,
+				clienttest.WithMiddlewares(
+					NewPluginRequestMetaMiddleware(),
+					NewStatusSourceMiddleware(),
+				),
+			)
+			cdt.TestClient.QueryDataFunc = func(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+				cdt.QueryDataCtx = ctx
+				return tc.queryDataResponse, nil
+			}
+
+			_, _ = cdt.Decorator.QueryData(context.Background(), &backend.QueryDataRequest{})
+
+			ss := pluginrequestmeta.StatusSourceFromContext(cdt.QueryDataCtx)
+			require.Equal(t, tc.expStatusSource, ss)
+		})
+	}
+}
diff --git a/pkg/services/pluginsintegration/clientmiddleware/tracing_header_middleware.go b/pkg/services/pluginsintegration/clientmiddleware/tracing_header_middleware.go
index 2c75be1b0e6b3..06003fe502d46 100644
--- a/pkg/services/pluginsintegration/clientmiddleware/tracing_header_middleware.go
+++ b/pkg/services/pluginsintegration/clientmiddleware/tracing_header_middleware.go
@@ -34,7 +34,7 @@ func (m *TracingHeaderMiddleware) applyHeaders(ctx context.Context, req backend.
 		return
 	}
 
-	var headersList = []string{query.HeaderQueryGroupID, query.HeaderPanelID, query.HeaderDashboardUID, query.HeaderDatasourceUID, query.HeaderFromExpression, `X-Grafana-Org-Id`}
+	var headersList = []string{query.HeaderQueryGroupID, query.HeaderPanelID, query.HeaderDashboardUID, query.HeaderDatasourceUID, query.HeaderFromExpression, `X-Grafana-Org-Id`, query.HeaderPanelPluginId}
 
 	for _, headerName := range headersList {
 		gotVal := reqCtx.Req.Header.Get(headerName)
diff --git a/pkg/services/pluginsintegration/clientmiddleware/user_header_middleware.go b/pkg/services/pluginsintegration/clientmiddleware/user_header_middleware.go
index ddce870d0b28e..0dd1926764228 100644
--- a/pkg/services/pluginsintegration/clientmiddleware/user_header_middleware.go
+++ b/pkg/services/pluginsintegration/clientmiddleware/user_header_middleware.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/contexthandler"
 	"github.com/grafana/grafana/pkg/util/proxyutil"
 )
@@ -31,8 +32,9 @@ func (m *UserHeaderMiddleware) applyUserHeader(ctx context.Context, h backend.Fo
 	}
 
 	h.DeleteHTTPHeader(proxyutil.UserHeaderName)
-	if !reqCtx.IsAnonymous {
-		h.SetHTTPHeader(proxyutil.UserHeaderName, reqCtx.Login)
+	namespace, _ := reqCtx.SignedInUser.GetNamespacedID()
+	if namespace != identity.NamespaceAnonymous {
+		h.SetHTTPHeader(proxyutil.UserHeaderName, reqCtx.SignedInUser.GetLogin())
 	}
 }
 
diff --git a/pkg/services/pluginsintegration/clientmiddleware/utils.go b/pkg/services/pluginsintegration/clientmiddleware/utils.go
index 462d4250f1a2d..dc6342295cc6a 100644
--- a/pkg/services/pluginsintegration/clientmiddleware/utils.go
+++ b/pkg/services/pluginsintegration/clientmiddleware/utils.go
@@ -1,14 +1,30 @@
 package clientmiddleware
 
 import (
+	"context"
+	"errors"
+
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 )
 
+type requestStatus int
+
 const (
-	statusOK        = "ok"
-	statusError     = "error"
-	statusCancelled = "cancelled"
+	requestStatusOK requestStatus = iota
+	requestStatusCancelled
+	requestStatusError
+)
+
+func (status requestStatus) String() string {
+	names := [...]string{"ok", "cancelled", "error"}
+	if status < requestStatusOK || status > requestStatusError {
+		return ""
+	}
 
+	return names[status]
+}
+
+const (
 	endpointCallResource    = "callResource"
 	endpointCheckHealth     = "checkHealth"
 	endpointCollectMetrics  = "collectMetrics"
@@ -23,3 +39,40 @@ type callResourceResponseSenderFunc func(res *backend.CallResourceResponse) erro
 func (fn callResourceResponseSenderFunc) Send(res *backend.CallResourceResponse) error {
 	return fn(res)
 }
+
+func requestStatusFromError(err error) requestStatus {
+	status := requestStatusOK
+	if err != nil {
+		status = requestStatusError
+		if errors.Is(err, context.Canceled) {
+			status = requestStatusCancelled
+		}
+	}
+
+	return status
+}
+
+func requestStatusFromQueryDataResponse(res *backend.QueryDataResponse, err error) requestStatus {
+	if err != nil {
+		return requestStatusFromError(err)
+	}
+
+	status := requestStatusOK
+
+	if res != nil {
+		for _, dr := range res.Responses {
+			if dr.Error != nil {
+				s := requestStatusFromError(dr.Error)
+				if s > status {
+					status = s
+				}
+
+				if status == requestStatusError {
+					break
+				}
+			}
+		}
+	}
+
+	return status
+}
diff --git a/pkg/services/pluginsintegration/clientmiddleware/utils_test.go b/pkg/services/pluginsintegration/clientmiddleware/utils_test.go
new file mode 100644
index 0000000000000..818a52b4ca5be
--- /dev/null
+++ b/pkg/services/pluginsintegration/clientmiddleware/utils_test.go
@@ -0,0 +1,137 @@
+package clientmiddleware
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"testing"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/stretchr/testify/require"
+)
+
+func TestRequestStatus(t *testing.T) {
+	tcs := []struct {
+		s             requestStatus
+		expectedLabel string
+	}{
+		{
+			s:             requestStatusOK,
+			expectedLabel: "ok",
+		},
+		{
+			s:             requestStatusError,
+			expectedLabel: "error",
+		},
+		{
+			s:             requestStatusCancelled,
+			expectedLabel: "cancelled",
+		},
+	}
+
+	for _, tc := range tcs {
+		t.Run(tc.s.String(), func(t *testing.T) {
+			require.Equal(t, tc.expectedLabel, tc.s.String())
+			require.Equal(t, tc.expectedLabel, fmt.Sprint(tc.s))
+		})
+	}
+}
+
+func TestRequestStatusFromError(t *testing.T) {
+	tcs := []struct {
+		desc           string
+		err            error
+		expectedStatus requestStatus
+	}{
+		{
+			desc:           "no error should be status ok",
+			err:            nil,
+			expectedStatus: requestStatusOK,
+		},
+		{
+			desc:           "error should be status error",
+			err:            errors.New("boom"),
+			expectedStatus: requestStatusError,
+		},
+		{
+			desc:           "context canceled should be status cancelled",
+			err:            context.Canceled,
+			expectedStatus: requestStatusCancelled,
+		},
+	}
+
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			status := requestStatusFromError(tc.err)
+			require.Equal(t, tc.expectedStatus, status)
+		})
+	}
+}
+
+func TestRequestStatusFromQueryDataResponse(t *testing.T) {
+	responseWithoutError := backend.NewQueryDataResponse()
+	responseWithoutError.Responses["A"] = backend.DataResponse{
+		Frames: data.Frames{data.NewFrame("test")},
+	}
+
+	responseWithError := backend.NewQueryDataResponse()
+	responseWithError.Responses["A"] = backend.DataResponse{
+		Error: errors.New("boom"),
+	}
+	responseWithMultipleErrors := backend.NewQueryDataResponse()
+	responseWithMultipleErrors.Responses["A"] = backend.DataResponse{
+		Error: context.Canceled,
+	}
+	responseWithMultipleErrors.Responses["B"] = backend.DataResponse{
+		Frames: data.Frames{data.NewFrame("test")},
+	}
+	responseWithMultipleErrors.Responses["C"] = backend.DataResponse{
+		Error: errors.New("boom"),
+	}
+
+	tcs := []struct {
+		desc           string
+		resp           *backend.QueryDataResponse
+		err            error
+		expectedStatus requestStatus
+	}{
+		{
+			desc:           "no error should be status ok",
+			err:            nil,
+			expectedStatus: requestStatusOK,
+		},
+		{
+			desc:           "error should be status error",
+			err:            errors.New("boom"),
+			expectedStatus: requestStatusError,
+		},
+		{
+			desc:           "context canceled should be status cancelled",
+			err:            context.Canceled,
+			expectedStatus: requestStatusCancelled,
+		},
+		{
+			desc:           "response without error should be status ok",
+			resp:           responseWithoutError,
+			expectedStatus: requestStatusOK,
+		},
+		{
+			desc:           "response with error should be status error",
+			resp:           responseWithError,
+			expectedStatus: requestStatusError,
+		},
+		{
+			desc:           "response with multiple error should pick the highest status cancelled",
+			resp:           responseWithMultipleErrors,
+			expectedStatus: requestStatusError,
+		},
+	}
+
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			status := requestStatusFromQueryDataResponse(tc.resp, tc.err)
+			require.Equal(t, tc.expectedStatus, status)
+		})
+	}
+}
diff --git a/pkg/services/pluginsintegration/config/config.go b/pkg/services/pluginsintegration/config/config.go
deleted file mode 100644
index 823e8f89ebfdb..0000000000000
--- a/pkg/services/pluginsintegration/config/config.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package config
-
-import (
-	"fmt"
-	"strings"
-
-	pCfg "github.com/grafana/grafana/pkg/plugins/config"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func ProvideConfig(settingProvider setting.Provider, grafanaCfg *setting.Cfg, features *featuremgmt.FeatureManager) (*pCfg.Cfg, error) {
-	plugins := settingProvider.Section("plugins")
-	allowedUnsigned := grafanaCfg.PluginsAllowUnsigned
-	if len(plugins.KeyValue("allow_loading_unsigned_plugins").Value()) > 0 {
-		allowedUnsigned = strings.Split(plugins.KeyValue("allow_loading_unsigned_plugins").Value(), ",")
-	}
-
-	aws := settingProvider.Section("aws")
-	allowedAuth := grafanaCfg.AWSAllowedAuthProviders
-	if len(aws.KeyValue("allowed_auth_providers").Value()) > 0 {
-		allowedUnsigned = strings.Split(settingProvider.KeyValue("plugins", "allow_loading_unsigned_plugins").Value(), ",")
-	}
-
-	tracingCfg, err := newTracingCfg(grafanaCfg)
-	if err != nil {
-		return nil, fmt.Errorf("new opentelemetry cfg: %w", err)
-	}
-
-	return pCfg.NewCfg(
-		settingProvider.KeyValue("", "app_mode").MustBool(grafanaCfg.Env == setting.Dev),
-		grafanaCfg.PluginsPath,
-		extractPluginSettings(settingProvider),
-		allowedUnsigned,
-		allowedAuth,
-		aws.KeyValue("assume_role_enabled").MustBool(grafanaCfg.AWSAssumeRoleEnabled),
-		aws.KeyValue("external_id").Value(),
-		grafanaCfg.Azure,
-		grafanaCfg.SecureSocksDSProxy,
-		grafanaCfg.BuildVersion,
-		grafanaCfg.PluginLogBackendRequests,
-		grafanaCfg.PluginsCDNURLTemplate,
-		grafanaCfg.AppURL,
-		grafanaCfg.AppSubURL,
-		tracingCfg,
-		features,
-		grafanaCfg.AngularSupportEnabled,
-		grafanaCfg.GrafanaComURL,
-		grafanaCfg.DisablePlugins,
-	), nil
-}
-
-func extractPluginSettings(settingProvider setting.Provider) setting.PluginSettings {
-	ps := setting.PluginSettings{}
-	for sectionName, sectionCopy := range settingProvider.Current() {
-		if !strings.HasPrefix(sectionName, "plugin.") {
-			continue
-		}
-		// Calling Current() returns a redacted version of section. We need to replace the map values with the unredacted values.
-		section := settingProvider.Section(sectionName)
-		for k := range sectionCopy {
-			sectionCopy[k] = section.KeyValue(k).MustString("")
-		}
-		pluginID := strings.Replace(sectionName, "plugin.", "", 1)
-		ps[pluginID] = sectionCopy
-	}
-
-	return ps
-}
diff --git a/pkg/services/pluginsintegration/config/config_test.go b/pkg/services/pluginsintegration/config/config_test.go
deleted file mode 100644
index 3ee6eddf2cd96..0000000000000
--- a/pkg/services/pluginsintegration/config/config_test.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package config
-
-import (
-	"testing"
-
-	"gopkg.in/ini.v1"
-
-	"github.com/grafana/grafana/pkg/setting"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestPluginSettings(t *testing.T) {
-	raw, err := ini.Load([]byte(`
-		[plugins]
-		test_key = 123
-
-		[plugin.test-datasource]
-		foo = 5m
-		bar = something
-		
-		[plugin.secret-plugin]
-		secret_key = secret
-		normal_key = not a secret`))
-	require.NoError(t, err)
-
-	cfg := &setting.Cfg{Raw: raw}
-	settings := &setting.OSSImpl{Cfg: cfg}
-
-	ps := extractPluginSettings(settings)
-	require.Len(t, ps, 2)
-	require.Len(t, ps["test-datasource"], 2)
-	require.Equal(t, ps["test-datasource"]["foo"], "5m")
-	require.Equal(t, ps["test-datasource"]["bar"], "something")
-	require.Len(t, ps["secret-plugin"], 2)
-	require.Equal(t, ps["secret-plugin"]["secret_key"], "secret")
-	require.Equal(t, ps["secret-plugin"]["normal_key"], "not a secret")
-}
diff --git a/pkg/services/pluginsintegration/config/tracing.go b/pkg/services/pluginsintegration/config/tracing.go
deleted file mode 100644
index 24e3230bd2b17..0000000000000
--- a/pkg/services/pluginsintegration/config/tracing.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package config
-
-import (
-	"fmt"
-
-	"github.com/grafana/grafana/pkg/infra/tracing"
-	pCfg "github.com/grafana/grafana/pkg/plugins/config"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-// newTracingCfg creates a plugins tracing configuration based on the provided Grafana tracing config.
-// If OpenTelemetry (OTLP) is disabled, a zero-value OpenTelemetryCfg is returned.
-func newTracingCfg(grafanaCfg *setting.Cfg) (pCfg.Tracing, error) {
-	ots, err := tracing.ParseSettings(grafanaCfg)
-	if err != nil {
-		return pCfg.Tracing{}, fmt.Errorf("parse settings: %w", err)
-	}
-	if !ots.OTelExporterEnabled() {
-		return pCfg.Tracing{}, nil
-	}
-	return pCfg.Tracing{
-		OpenTelemetry: pCfg.OpenTelemetryCfg{
-			Address:     ots.Address,
-			Propagation: ots.Propagation,
-		},
-	}, nil
-}
diff --git a/pkg/services/pluginsintegration/dashboards/filestore.go b/pkg/services/pluginsintegration/dashboards/filestore.go
index 988650e2a4252..e854e6e13401c 100644
--- a/pkg/services/pluginsintegration/dashboards/filestore.go
+++ b/pkg/services/pluginsintegration/dashboards/filestore.go
@@ -24,8 +24,8 @@ func ProvideFileStoreManager(pluginStore pluginstore.Store, pluginFileStore plug
 	}
 }
 
-var openDashboardFile = func(ctx context.Context, pluginFileStore plugins.FileStore, pluginID, name string) (*plugins.File, error) {
-	f, err := pluginFileStore.File(ctx, pluginID, name)
+var openDashboardFile = func(ctx context.Context, pluginFileStore plugins.FileStore, pluginID, pluginVersion, name string) (*plugins.File, error) {
+	f, err := pluginFileStore.File(ctx, pluginID, pluginVersion, name)
 	if err != nil {
 		return &plugins.File{}, err
 	}
@@ -93,7 +93,7 @@ func (m *FileStoreManager) GetPluginDashboardFileContents(ctx context.Context, a
 		return nil, err
 	}
 
-	file, err := openDashboardFile(ctx, m.pluginFileStore, plugin.ID, cleanPath)
+	file, err := openDashboardFile(ctx, m.pluginFileStore, plugin.ID, plugin.Info.Version, cleanPath)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/services/pluginsintegration/dashboards/filestore_test.go b/pkg/services/pluginsintegration/dashboards/filestore_test.go
index 9981e768d02f5..8f8a76252d444 100644
--- a/pkg/services/pluginsintegration/dashboards/filestore_test.go
+++ b/pkg/services/pluginsintegration/dashboards/filestore_test.go
@@ -132,7 +132,7 @@ func TestDashboardFileStore(t *testing.T) {
 					Data: []byte("dash2"),
 				},
 			}
-			openDashboardFile = func(ctx context.Context, pluginFiles plugins.FileStore, pluginID, name string) (*plugins.File, error) {
+			openDashboardFile = func(ctx context.Context, pluginFiles plugins.FileStore, pluginID, _, name string) (*plugins.File, error) {
 				f, err := mapFs.Open(name)
 				require.NoError(t, err)
 
diff --git a/pkg/services/pluginsintegration/loader/loader_test.go b/pkg/services/pluginsintegration/loader/loader_test.go
index 553ccbc4e5d17..a844289c97cfc 100644
--- a/pkg/services/pluginsintegration/loader/loader_test.go
+++ b/pkg/services/pluginsintegration/loader/loader_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/auth"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin"
@@ -24,9 +25,8 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/manager/registry"
 	"github.com/grafana/grafana/pkg/plugins/manager/signature"
 	"github.com/grafana/grafana/pkg/plugins/manager/sources"
-	"github.com/grafana/grafana/pkg/plugins/plugindef"
+	"github.com/grafana/grafana/pkg/plugins/pfs"
 	"github.com/grafana/grafana/pkg/plugins/pluginscdn"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pipeline"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginerrs"
@@ -60,7 +60,7 @@ func TestLoader_Load(t *testing.T) {
 	tests := []struct {
 		name         string
 		class        plugins.Class
-		cfg          *config.Cfg
+		cfg          *config.PluginManagementCfg
 		pluginPaths  []string
 		want         []*plugins.Plugin
 		pluginErrors map[string]*plugins.SignatureError
@@ -68,7 +68,7 @@ func TestLoader_Load(t *testing.T) {
 		{
 			name:        "Load a Core plugin",
 			class:       plugins.ClassCore,
-			cfg:         &config.Cfg{},
+			cfg:         &config.PluginManagementCfg{},
 			pluginPaths: []string{filepath.Join(corePluginDir(t), "app/plugins/datasource/cloudwatch")},
 			want: []*plugins.Plugin{
 				{
@@ -83,8 +83,8 @@ func TestLoader_Load(t *testing.T) {
 							},
 							Description: "Data source for Amazon AWS monitoring service",
 							Logos: plugins.Logos{
-								Small: "/public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png",
-								Large: "/public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png",
+								Small: "public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png",
+								Large: "public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png",
 							},
 						},
 						Includes: []*plugins.Includes{
@@ -106,9 +106,8 @@ func TestLoader_Load(t *testing.T) {
 						Backend:      true,
 						QueryOptions: map[string]bool{"minInterval": true},
 					},
-					Module:  "core:plugin/cloudwatch",
-					BaseURL: "/public/app/plugins/datasource/cloudwatch",
-
+					Module:    "core:plugin/cloudwatch",
+					BaseURL:   "public/app/plugins/datasource/cloudwatch",
 					FS:        mustNewStaticFSForTests(t, filepath.Join(corePluginDir(t), "app/plugins/datasource/cloudwatch")),
 					Signature: plugins.SignatureStatusInternal,
 					Class:     plugins.ClassCore,
@@ -118,7 +117,7 @@ func TestLoader_Load(t *testing.T) {
 		{
 			name:        "Load a Bundled plugin",
 			class:       plugins.ClassBundled,
-			cfg:         &config.Cfg{},
+			cfg:         &config.PluginManagementCfg{},
 			pluginPaths: []string{filepath.Join(testDataDir(t), "valid-v2-signature")},
 			want: []*plugins.Plugin{
 				{
@@ -133,8 +132,8 @@ func TestLoader_Load(t *testing.T) {
 							},
 							Version: "1.0.0",
 							Logos: plugins.Logos{
-								Small: "/public/img/icn-datasource.svg",
-								Large: "/public/img/icn-datasource.svg",
+								Small: "public/img/icn-datasource.svg",
+								Large: "public/img/icn-datasource.svg",
 							},
 							Description: "Test",
 						},
@@ -146,8 +145,8 @@ func TestLoader_Load(t *testing.T) {
 						Backend:    true,
 						State:      "alpha",
 					},
-					Module:        "/public/plugins/test-datasource/module.js",
-					BaseURL:       "/public/plugins/test-datasource",
+					Module:        "public/plugins/test-datasource/module.js",
+					BaseURL:       "public/plugins/test-datasource",
 					FS:            mustNewStaticFSForTests(t, filepath.Join(testDataDir(t), "valid-v2-signature/plugin/")),
 					Signature:     "valid",
 					SignatureType: plugins.SignatureTypeGrafana,
@@ -155,10 +154,11 @@ func TestLoader_Load(t *testing.T) {
 					Class:         plugins.ClassBundled,
 				},
 			},
-		}, {
+		},
+		{
 			name:        "Load plugin with symbolic links",
 			class:       plugins.ClassExternal,
-			cfg:         &config.Cfg{},
+			cfg:         &config.PluginManagementCfg{},
 			pluginPaths: []string{filepath.Join(testDataDir(t), "symbolic-plugin-dirs")},
 			want: []*plugins.Plugin{
 				{
@@ -172,8 +172,8 @@ func TestLoader_Load(t *testing.T) {
 								URL:  "http://test.com",
 							},
 							Logos: plugins.Logos{
-								Small: "/public/plugins/test-app/img/logo_small.png",
-								Large: "/public/plugins/test-app/img/logo_large.png",
+								Small: "public/plugins/test-app/img/logo_small.png",
+								Large: "public/plugins/test-app/img/logo_large.png",
 							},
 							Links: []plugins.InfoLink{
 								{Name: "Project site", URL: "http://project.com"},
@@ -181,11 +181,12 @@ func TestLoader_Load(t *testing.T) {
 							},
 							Description: "Official Grafana Test App & Dashboard bundle",
 							Screenshots: []plugins.Screenshots{
-								{Path: "/public/plugins/test-app/img/screenshot1.png", Name: "img1"},
-								{Path: "/public/plugins/test-app/img/screenshot2.png", Name: "img2"},
+								{Path: "public/plugins/test-app/img/screenshot1.png", Name: "img1"},
+								{Path: "public/plugins/test-app/img/screenshot2.png", Name: "img2"},
 							},
-							Version: "1.0.0",
-							Updated: "2015-02-10",
+							Version:  "1.0.0",
+							Updated:  "2015-02-10",
+							Keywords: []string{"test"},
 						},
 						Dependencies: plugins.Dependencies{
 							GrafanaVersion: "3.x.x",
@@ -213,7 +214,8 @@ func TestLoader_Load(t *testing.T) {
 								Name: "Nginx Panel",
 								Type: string(plugins.TypePanel),
 								Role: org.RoleViewer,
-								Slug: "nginx-panel"},
+								Slug: "nginx-panel",
+							},
 							{
 								Name: "Nginx Datasource",
 								Type: string(plugins.TypeDataSource),
@@ -223,18 +225,19 @@ func TestLoader_Load(t *testing.T) {
 						},
 					},
 					Class:         plugins.ClassExternal,
-					Module:        "/public/plugins/test-app/module.js",
-					BaseURL:       "/public/plugins/test-app",
+					Module:        "public/plugins/test-app/module.js",
+					BaseURL:       "public/plugins/test-app",
 					FS:            mustNewStaticFSForTests(t, filepath.Join(testDataDir(t), "includes-symlinks")),
 					Signature:     "valid",
 					SignatureType: plugins.SignatureTypeGrafana,
 					SignatureOrg:  "Grafana Labs",
 				},
 			},
-		}, {
+		},
+		{
 			name:  "Load an unsigned plugin (development)",
 			class: plugins.ClassExternal,
-			cfg: &config.Cfg{
+			cfg: &config.PluginManagementCfg{
 				DevMode: true,
 			},
 			pluginPaths: []string{filepath.Join(testDataDir(t), "unsigned-datasource")},
@@ -250,8 +253,8 @@ func TestLoader_Load(t *testing.T) {
 								URL:  "https://grafana.com",
 							},
 							Logos: plugins.Logos{
-								Small: "/public/img/icn-datasource.svg",
-								Large: "/public/img/icn-datasource.svg",
+								Small: "public/img/icn-datasource.svg",
+								Large: "public/img/icn-datasource.svg",
 							},
 							Description: "Test",
 						},
@@ -263,16 +266,17 @@ func TestLoader_Load(t *testing.T) {
 						State:   plugins.ReleaseStateAlpha,
 					},
 					Class:     plugins.ClassExternal,
-					Module:    "/public/plugins/test-datasource/module.js",
-					BaseURL:   "/public/plugins/test-datasource",
+					Module:    "public/plugins/test-datasource/module.js",
+					BaseURL:   "public/plugins/test-datasource",
 					FS:        mustNewStaticFSForTests(t, filepath.Join(testDataDir(t), "unsigned-datasource/plugin")),
 					Signature: "unsigned",
 				},
 			},
-		}, {
+		},
+		{
 			name:        "Load an unsigned plugin (production)",
 			class:       plugins.ClassExternal,
-			cfg:         &config.Cfg{},
+			cfg:         &config.PluginManagementCfg{},
 			pluginPaths: []string{filepath.Join(testDataDir(t), "unsigned-datasource")},
 			want:        []*plugins.Plugin{},
 			pluginErrors: map[string]*plugins.SignatureError{
@@ -285,7 +289,7 @@ func TestLoader_Load(t *testing.T) {
 		{
 			name:  "Load an unsigned plugin using PluginsAllowUnsigned config (production)",
 			class: plugins.ClassExternal,
-			cfg: &config.Cfg{
+			cfg: &config.PluginManagementCfg{
 				PluginsAllowUnsigned: []string{"test-datasource"},
 			},
 			pluginPaths: []string{filepath.Join(testDataDir(t), "unsigned-datasource")},
@@ -301,8 +305,8 @@ func TestLoader_Load(t *testing.T) {
 								URL:  "https://grafana.com",
 							},
 							Logos: plugins.Logos{
-								Small: "/public/img/icn-datasource.svg",
-								Large: "/public/img/icn-datasource.svg",
+								Small: "public/img/icn-datasource.svg",
+								Large: "public/img/icn-datasource.svg",
 							},
 							Description: "Test",
 						},
@@ -314,8 +318,8 @@ func TestLoader_Load(t *testing.T) {
 						State:   plugins.ReleaseStateAlpha,
 					},
 					Class:     plugins.ClassExternal,
-					Module:    "/public/plugins/test-datasource/module.js",
-					BaseURL:   "/public/plugins/test-datasource",
+					Module:    "public/plugins/test-datasource/module.js",
+					BaseURL:   "public/plugins/test-datasource",
 					FS:        mustNewStaticFSForTests(t, filepath.Join(testDataDir(t), "unsigned-datasource/plugin")),
 					Signature: plugins.SignatureStatusUnsigned,
 				},
@@ -324,7 +328,7 @@ func TestLoader_Load(t *testing.T) {
 		{
 			name:        "Load a plugin with v1 manifest should return signatureInvalid",
 			class:       plugins.ClassExternal,
-			cfg:         &config.Cfg{},
+			cfg:         &config.PluginManagementCfg{},
 			pluginPaths: []string{filepath.Join(testDataDir(t), "lacking-files")},
 			want:        []*plugins.Plugin{},
 			pluginErrors: map[string]*plugins.SignatureError{
@@ -337,7 +341,7 @@ func TestLoader_Load(t *testing.T) {
 		{
 			name:  "Load a plugin with v1 manifest using PluginsAllowUnsigned config (production) should return signatureInvalid",
 			class: plugins.ClassExternal,
-			cfg: &config.Cfg{
+			cfg: &config.PluginManagementCfg{
 				PluginsAllowUnsigned: []string{"test-datasource"},
 			},
 			pluginPaths: []string{filepath.Join(testDataDir(t), "lacking-files")},
@@ -352,7 +356,7 @@ func TestLoader_Load(t *testing.T) {
 		{
 			name:  "Load a plugin with manifest which has a file not found in plugin folder",
 			class: plugins.ClassExternal,
-			cfg: &config.Cfg{
+			cfg: &config.PluginManagementCfg{
 				PluginsAllowUnsigned: []string{"test-datasource"},
 			},
 			pluginPaths: []string{filepath.Join(testDataDir(t), "invalid-v2-missing-file")},
@@ -367,7 +371,7 @@ func TestLoader_Load(t *testing.T) {
 		{
 			name:  "Load a plugin with file which is missing from the manifest",
 			class: plugins.ClassExternal,
-			cfg: &config.Cfg{
+			cfg: &config.PluginManagementCfg{
 				PluginsAllowUnsigned: []string{"test-datasource"},
 			},
 			pluginPaths: []string{filepath.Join(testDataDir(t), "invalid-v2-extra-file")},
@@ -382,89 +386,51 @@ func TestLoader_Load(t *testing.T) {
 		{
 			name:  "Load an app with includes",
 			class: plugins.ClassExternal,
-			cfg: &config.Cfg{
+			cfg: &config.PluginManagementCfg{
 				PluginsAllowUnsigned: []string{"test-app"},
 			},
 			pluginPaths: []string{filepath.Join(testDataDir(t), "test-app-with-includes")},
-			want: []*plugins.Plugin{
-				{JSONData: plugins.JSONData{
-					ID:   "test-app",
-					Type: plugins.TypeApp,
-					Name: "Test App",
-					Info: plugins.Info{
-						Author: plugins.InfoLink{
-							Name: "Test Inc.",
-							URL:  "http://test.com",
-						},
-						Description: "Official Grafana Test App & Dashboard bundle",
-						Version:     "1.0.0",
-						Links: []plugins.InfoLink{
-							{Name: "Project site", URL: "http://project.com"},
-							{Name: "License & Terms", URL: "http://license.com"},
-						},
-						Logos: plugins.Logos{
-							Small: "/public/img/icn-app.svg",
-							Large: "/public/img/icn-app.svg",
-						},
-						Updated: "2015-02-10",
-					},
-					Dependencies: plugins.Dependencies{
-						GrafanaDependency: ">=8.0.0",
-						GrafanaVersion:    "*",
-						Plugins:           []plugins.Dependency{},
-					},
-					Includes: []*plugins.Includes{
-						{Name: "Nginx Memory", Path: "dashboards/memory.json", Type: "dashboard", Role: org.RoleViewer, Slug: "nginx-memory"},
-						{Name: "Root Page (react)", Type: "page", Role: org.RoleViewer, Path: "/a/my-simple-app", DefaultNav: true, AddToNav: true, Slug: "root-page-react"},
-					},
-					Backend: false,
-				},
-					DefaultNavURL: "/plugins/test-app/page/root-page-react",
-					FS:            mustNewStaticFSForTests(t, filepath.Join(testDataDir(t), "test-app-with-includes")),
-					Class:         plugins.ClassExternal,
-					Signature:     plugins.SignatureStatusUnsigned,
-					Module:        "/public/plugins/test-app/module.js",
-					BaseURL:       "/public/plugins/test-app",
-				},
-			},
-		},
-		{
-			name:  "Load a plugin with app sub url set",
-			class: plugins.ClassExternal,
-			cfg: &config.Cfg{
-				DevMode:          true,
-				GrafanaAppSubURL: "grafana",
-			},
-			pluginPaths: []string{filepath.Join(testDataDir(t), "unsigned-datasource")},
 			want: []*plugins.Plugin{
 				{
 					JSONData: plugins.JSONData{
-						ID:   "test-datasource",
-						Type: plugins.TypeDataSource,
-						Name: "Test",
+						ID:   "test-app",
+						Type: plugins.TypeApp,
+						Name: "Test App",
 						Info: plugins.Info{
 							Author: plugins.InfoLink{
-								Name: "Grafana Labs",
-								URL:  "https://grafana.com",
+								Name: "Test Inc.",
+								URL:  "http://test.com",
+							},
+							Description: "Official Grafana Test App & Dashboard bundle",
+							Version:     "1.0.0",
+							Links: []plugins.InfoLink{
+								{Name: "Project site", URL: "http://project.com"},
+								{Name: "License & Terms", URL: "http://license.com"},
 							},
 							Logos: plugins.Logos{
-								Small: "/grafana/public/img/icn-datasource.svg",
-								Large: "/grafana/public/img/icn-datasource.svg",
+								Small: "public/img/icn-app.svg",
+								Large: "public/img/icn-app.svg",
 							},
-							Description: "Test",
+							Updated:  "2015-02-10",
+							Keywords: []string{"test"},
 						},
 						Dependencies: plugins.Dependencies{
-							GrafanaVersion: "*",
-							Plugins:        []plugins.Dependency{},
+							GrafanaDependency: ">=8.0.0",
+							GrafanaVersion:    "*",
+							Plugins:           []plugins.Dependency{},
 						},
-						Backend: true,
-						State:   plugins.ReleaseStateAlpha,
+						Includes: []*plugins.Includes{
+							{Name: "Nginx Memory", Path: "dashboards/memory.json", Type: "dashboard", Role: org.RoleViewer, Slug: "nginx-memory"},
+							{Name: "Root Page (react)", Type: "page", Role: org.RoleViewer, Path: "/a/my-simple-app", DefaultNav: true, AddToNav: true, Slug: "root-page-react"},
+						},
+						Backend: false,
 					},
-					Class:     plugins.ClassExternal,
-					Module:    "/grafana/public/plugins/test-datasource/module.js",
-					BaseURL:   "/grafana/public/plugins/test-datasource",
-					FS:        mustNewStaticFSForTests(t, filepath.Join(testDataDir(t), "unsigned-datasource/plugin")),
-					Signature: plugins.SignatureStatusUnsigned,
+					DefaultNavURL: "/plugins/test-app/page/root-page-react",
+					FS:            mustNewStaticFSForTests(t, filepath.Join(testDataDir(t), "test-app-with-includes")),
+					Class:         plugins.ClassExternal,
+					Signature:     plugins.SignatureStatusUnsigned,
+					Module:        "public/plugins/test-app/module.js",
+					BaseURL:       "public/plugins/test-app",
 				},
 			},
 		},
@@ -495,155 +461,52 @@ func TestLoader_Load(t *testing.T) {
 }
 
 func TestLoader_Load_ExternalRegistration(t *testing.T) {
-	boolPtr := func(b bool) *bool { return &b }
 	stringPtr := func(s string) *string { return &s }
 
-	t.Run("Load a plugin with oauth client registration", func(t *testing.T) {
-		cfg := &config.Cfg{
-			Features:             fakes.NewFakeFeatureToggles(featuremgmt.FlagExternalServiceAuth),
+	t.Run("Load a plugin with service account registration", func(t *testing.T) {
+		cfg := &config.PluginManagementCfg{
 			PluginsAllowUnsigned: []string{"grafana-test-datasource"},
 		}
-		pluginPaths := []string{filepath.Join(testDataDir(t), "oauth-external-registration")}
+		pluginPaths := []string{filepath.Join(testDataDir(t), "external-registration")}
 		expected := []*plugins.Plugin{
-			{JSONData: plugins.JSONData{
-				ID:         "grafana-test-datasource",
-				Type:       plugins.TypeDataSource,
-				Name:       "Test",
-				Backend:    true,
-				Executable: "gpx_test_datasource",
-				Info: plugins.Info{
-					Author: plugins.InfoLink{
-						Name: "Grafana Labs",
-						URL:  "https://grafana.com",
+			{
+				JSONData: plugins.JSONData{
+					ID:         "grafana-test-datasource",
+					Type:       plugins.TypeDataSource,
+					Name:       "Test",
+					Backend:    true,
+					Executable: "gpx_test_datasource",
+					Info: plugins.Info{
+						Author: plugins.InfoLink{
+							Name: "Grafana Labs",
+							URL:  "https://grafana.com",
+						},
+						Version: "1.0.0",
+						Logos: plugins.Logos{
+							Small: "public/plugins/grafana-test-datasource/img/ds.svg",
+							Large: "public/plugins/grafana-test-datasource/img/ds.svg",
+						},
+						Updated:     "2023-08-03",
+						Screenshots: []plugins.Screenshots{},
 					},
-					Version: "1.0.0",
-					Logos: plugins.Logos{
-						Small: "/public/plugins/grafana-test-datasource/img/ds.svg",
-						Large: "/public/plugins/grafana-test-datasource/img/ds.svg",
+					Dependencies: plugins.Dependencies{
+						GrafanaVersion: "*",
+						Plugins:        []plugins.Dependency{},
 					},
-					Updated:     "2023-08-03",
-					Screenshots: []plugins.Screenshots{},
-				},
-				Dependencies: plugins.Dependencies{
-					GrafanaVersion: "*",
-					Plugins:        []plugins.Dependency{},
-				},
-				ExternalServiceRegistration: &plugindef.ExternalServiceRegistration{
-					Impersonation: &plugindef.Impersonation{
-						Enabled: boolPtr(true),
-						Groups:  boolPtr(true),
-						Permissions: []plugindef.Permission{
+					IAM: &pfs.IAM{
+						Permissions: []pfs.Permission{
 							{
 								Action: "read",
 								Scope:  stringPtr("datasource"),
 							},
 						},
 					},
-					Permissions: []plugindef.Permission{
-						{
-							Action: "read",
-							Scope:  stringPtr("datasource"),
-						},
-					},
-				},
-			},
-				FS:        mustNewStaticFSForTests(t, pluginPaths[0]),
-				Class:     plugins.ClassExternal,
-				Signature: plugins.SignatureStatusUnsigned,
-				Module:    "/public/plugins/grafana-test-datasource/module.js",
-				BaseURL:   "/public/plugins/grafana-test-datasource",
-				ExternalService: &auth.ExternalService{
-					ClientID:     "client-id",
-					ClientSecret: "secretz",
-					PrivateKey:   "priv@t3",
-				},
-			},
-		}
-
-		backendFactoryProvider := fakes.NewFakeBackendProcessProvider()
-		backendFactoryProvider.BackendFactoryFunc = func(ctx context.Context, plugin *plugins.Plugin) backendplugin.PluginFactoryFunc {
-			return func(pluginID string, logger log.Logger, env func() []string) (backendplugin.Plugin, error) {
-				require.Equal(t, "grafana-test-datasource", pluginID)
-				require.Equal(t, []string{"GF_VERSION=", "GF_EDITION=", "GF_ENTERPRISE_LICENSE_PATH=",
-					"GF_ENTERPRISE_APP_URL=", "GF_ENTERPRISE_LICENSE_TEXT=", "GF_APP_URL=",
-					"GF_PLUGIN_APP_CLIENT_ID=client-id", "GF_PLUGIN_APP_CLIENT_SECRET=secretz",
-					"GF_PLUGIN_APP_PRIVATE_KEY=priv@t3", "GF_INSTANCE_FEATURE_TOGGLES_ENABLE=externalServiceAuth"}, env())
-				return &fakes.FakeBackendPlugin{}, nil
-			}
-		}
-
-		l := newLoaderWithOpts(t, cfg, loaderDepOpts{
-			authServiceRegistry: &fakes.FakeAuthService{
-				Result: &auth.ExternalService{
-					ClientID:     "client-id",
-					ClientSecret: "secretz",
-					PrivateKey:   "priv@t3",
-				},
-			},
-			backendFactoryProvider: backendFactoryProvider,
-		})
-		got, err := l.Load(context.Background(), &fakes.FakePluginSource{
-			PluginClassFunc: func(ctx context.Context) plugins.Class {
-				return plugins.ClassExternal
-			},
-			PluginURIsFunc: func(ctx context.Context) []string {
-				return pluginPaths
-			},
-			DefaultSignatureFunc: func(ctx context.Context) (plugins.Signature, bool) {
-				return plugins.Signature{}, false
-			},
-		})
-
-		require.NoError(t, err)
-		if !cmp.Equal(got, expected, compareOpts...) {
-			t.Fatalf("Result mismatch (-want +got):\n%s", cmp.Diff(got, expected, compareOpts...))
-		}
-	})
-
-	t.Run("Load a plugin with service account registration", func(t *testing.T) {
-		cfg := &config.Cfg{
-			Features:             fakes.NewFakeFeatureToggles(featuremgmt.FlagExternalServiceAuth),
-			PluginsAllowUnsigned: []string{"grafana-test-datasource"},
-		}
-		pluginPaths := []string{filepath.Join(testDataDir(t), "external-registration")}
-		expected := []*plugins.Plugin{
-			{JSONData: plugins.JSONData{
-				ID:         "grafana-test-datasource",
-				Type:       plugins.TypeDataSource,
-				Name:       "Test",
-				Backend:    true,
-				Executable: "gpx_test_datasource",
-				Info: plugins.Info{
-					Author: plugins.InfoLink{
-						Name: "Grafana Labs",
-						URL:  "https://grafana.com",
-					},
-					Version: "1.0.0",
-					Logos: plugins.Logos{
-						Small: "/public/plugins/grafana-test-datasource/img/ds.svg",
-						Large: "/public/plugins/grafana-test-datasource/img/ds.svg",
-					},
-					Updated:     "2023-08-03",
-					Screenshots: []plugins.Screenshots{},
-				},
-				Dependencies: plugins.Dependencies{
-					GrafanaVersion: "*",
-					Plugins:        []plugins.Dependency{},
-				},
-				ExternalServiceRegistration: &plugindef.ExternalServiceRegistration{
-					Permissions: []plugindef.Permission{
-						{
-							Action: "read",
-							Scope:  stringPtr("datasource"),
-						},
-					},
 				},
-			},
 				FS:        mustNewStaticFSForTests(t, pluginPaths[0]),
 				Class:     plugins.ClassExternal,
 				Signature: plugins.SignatureStatusUnsigned,
-				Module:    "/public/plugins/grafana-test-datasource/module.js",
-				BaseURL:   "/public/plugins/grafana-test-datasource",
+				Module:    "public/plugins/grafana-test-datasource/module.js",
+				BaseURL:   "public/plugins/grafana-test-datasource",
 				ExternalService: &auth.ExternalService{
 					ClientID:     "client-id",
 					ClientSecret: "secretz",
@@ -655,10 +518,6 @@ func TestLoader_Load_ExternalRegistration(t *testing.T) {
 		backendFactoryProvider.BackendFactoryFunc = func(ctx context.Context, plugin *plugins.Plugin) backendplugin.PluginFactoryFunc {
 			return func(pluginID string, logger log.Logger, env func() []string) (backendplugin.Plugin, error) {
 				require.Equal(t, "grafana-test-datasource", pluginID)
-				require.Equal(t, []string{"GF_VERSION=", "GF_EDITION=", "GF_ENTERPRISE_LICENSE_PATH=",
-					"GF_ENTERPRISE_APP_URL=", "GF_ENTERPRISE_LICENSE_TEXT=", "GF_APP_URL=",
-					"GF_PLUGIN_APP_CLIENT_ID=client-id", "GF_PLUGIN_APP_CLIENT_SECRET=secretz",
-					"GF_INSTANCE_FEATURE_TOGGLES_ENABLE=externalServiceAuth"}, env())
 				return &fakes.FakeBackendPlugin{}, nil
 			}
 		}
@@ -693,7 +552,7 @@ func TestLoader_Load_ExternalRegistration(t *testing.T) {
 
 func TestLoader_Load_CustomSource(t *testing.T) {
 	t.Run("Load a plugin", func(t *testing.T) {
-		cfg := &config.Cfg{
+		cfg := &config.PluginManagementCfg{
 			PluginsCDNURLTemplate: "https://cdn.example.com",
 			PluginSettings: setting.PluginSettings{
 				"grafana-worldmap-panel": {"cdn": "true"},
@@ -770,7 +629,7 @@ func TestLoader_Load_MultiplePlugins(t *testing.T) {
 	t.Run("Load multiple", func(t *testing.T) {
 		tests := []struct {
 			name            string
-			cfg             *config.Cfg
+			cfg             *config.PluginManagementCfg
 			pluginPaths     []string
 			existingPlugins map[string]struct{}
 			want            []*plugins.Plugin
@@ -778,7 +637,7 @@ func TestLoader_Load_MultiplePlugins(t *testing.T) {
 		}{
 			{
 				name: "Load multiple plugins (broken, valid, unsigned)",
-				cfg: &config.Cfg{
+				cfg: &config.PluginManagementCfg{
 					GrafanaAppURL: "http://localhost:3000",
 				},
 				pluginPaths: []string{
@@ -798,8 +657,8 @@ func TestLoader_Load_MultiplePlugins(t *testing.T) {
 									URL:  "https://willbrowne.com",
 								},
 								Logos: plugins.Logos{
-									Small: "/public/img/icn-datasource.svg",
-									Large: "/public/img/icn-datasource.svg",
+									Small: "public/img/icn-datasource.svg",
+									Large: "public/img/icn-datasource.svg",
 								},
 								Description: "Test",
 								Version:     "1.0.0",
@@ -813,8 +672,8 @@ func TestLoader_Load_MultiplePlugins(t *testing.T) {
 							State:      plugins.ReleaseStateAlpha,
 						},
 						Class:         plugins.ClassExternal,
-						Module:        "/public/plugins/test-datasource/module.js",
-						BaseURL:       "/public/plugins/test-datasource",
+						Module:        "public/plugins/test-datasource/module.js",
+						BaseURL:       "public/plugins/test-datasource",
 						FS:            mustNewStaticFSForTests(t, filepath.Join(testDataDir(t), "valid-v2-pvt-signature/plugin")),
 						Signature:     "valid",
 						SignatureType: plugins.SignatureTypePrivate,
@@ -867,14 +726,14 @@ func TestLoader_Load_MultiplePlugins(t *testing.T) {
 func TestLoader_Load_RBACReady(t *testing.T) {
 	tests := []struct {
 		name            string
-		cfg             *config.Cfg
+		cfg             *config.PluginManagementCfg
 		pluginPaths     []string
 		existingPlugins map[string]struct{}
 		want            []*plugins.Plugin
 	}{
 		{
 			name: "Load plugin defining one RBAC role",
-			cfg: &config.Cfg{
+			cfg: &config.PluginManagementCfg{
 				GrafanaAppURL: "http://localhost:3000",
 			},
 			pluginPaths: []string{filepath.Join(testDataDir(t), "test-app-with-roles")},
@@ -893,10 +752,11 @@ func TestLoader_Load_RBACReady(t *testing.T) {
 							Version:     "1.0.0",
 							Links:       []plugins.InfoLink{},
 							Logos: plugins.Logos{
-								Small: "/public/img/icn-app.svg",
-								Large: "/public/img/icn-app.svg",
+								Small: "public/img/icn-app.svg",
+								Large: "public/img/icn-app.svg",
 							},
-							Updated: "2015-02-10",
+							Updated:  "2015-02-10",
+							Keywords: []string{"test"},
 						},
 						Dependencies: plugins.Dependencies{
 							GrafanaVersion:    "*",
@@ -925,8 +785,8 @@ func TestLoader_Load_RBACReady(t *testing.T) {
 					Signature:     plugins.SignatureStatusValid,
 					SignatureType: plugins.SignatureTypePrivate,
 					SignatureOrg:  "gabrielmabille",
-					Module:        "/public/plugins/test-app/module.js",
-					BaseURL:       "/public/plugins/test-app",
+					Module:        "public/plugins/test-app/module.js",
+					BaseURL:       "public/plugins/test-app",
 				},
 			},
 		},
@@ -970,8 +830,8 @@ func TestLoader_Load_Signature_RootURL(t *testing.T) {
 						Author:      plugins.InfoLink{Name: "Will Browne", URL: "https://willbrowne.com"},
 						Description: "Test",
 						Logos: plugins.Logos{
-							Small: "/public/img/icn-datasource.svg",
-							Large: "/public/img/icn-datasource.svg",
+							Small: "public/img/icn-datasource.svg",
+							Large: "public/img/icn-datasource.svg",
 						},
 						Version: "1.0.0",
 					},
@@ -985,15 +845,15 @@ func TestLoader_Load_Signature_RootURL(t *testing.T) {
 				Signature:     plugins.SignatureStatusValid,
 				SignatureType: plugins.SignatureTypePrivate,
 				SignatureOrg:  "Will Browne",
-				Module:        "/public/plugins/test-datasource/module.js",
-				BaseURL:       "/public/plugins/test-datasource",
+				Module:        "public/plugins/test-datasource/module.js",
+				BaseURL:       "public/plugins/test-datasource",
 			},
 		}
 
 		reg := fakes.NewFakePluginRegistry()
 		procPrvdr := fakes.NewFakeBackendProcessProvider()
 		procMgr := fakes.NewFakeProcessManager()
-		cfg := &config.Cfg{GrafanaAppURL: defaultAppURL}
+		cfg := &config.PluginManagementCfg{GrafanaAppURL: defaultAppURL}
 		l := newLoader(t, cfg, reg, procMgr, procPrvdr, newFakeSignatureErrorTracker())
 		got, err := l.Load(context.Background(), &fakes.FakePluginSource{
 			PluginClassFunc: func(ctx context.Context) plugins.Class {
@@ -1032,14 +892,15 @@ func TestLoader_Load_DuplicatePlugins(t *testing.T) {
 							{Name: "License & Terms", URL: "http://license.com"},
 						},
 						Logos: plugins.Logos{
-							Small: "/public/plugins/test-app/img/logo_small.png",
-							Large: "/public/plugins/test-app/img/logo_large.png",
+							Small: "public/plugins/test-app/img/logo_small.png",
+							Large: "public/plugins/test-app/img/logo_large.png",
 						},
 						Screenshots: []plugins.Screenshots{
-							{Path: "/public/plugins/test-app/img/screenshot1.png", Name: "img1"},
-							{Path: "/public/plugins/test-app/img/screenshot2.png", Name: "img2"},
+							{Path: "public/plugins/test-app/img/screenshot1.png", Name: "img1"},
+							{Path: "public/plugins/test-app/img/screenshot2.png", Name: "img2"},
 						},
-						Updated: "2015-02-10",
+						Updated:  "2015-02-10",
+						Keywords: []string{"test"},
 					},
 					Dependencies: plugins.Dependencies{
 						GrafanaVersion: "3.x.x",
@@ -1061,15 +922,15 @@ func TestLoader_Load_DuplicatePlugins(t *testing.T) {
 				Signature:     plugins.SignatureStatusValid,
 				SignatureType: plugins.SignatureTypeGrafana,
 				SignatureOrg:  "Grafana Labs",
-				Module:        "/public/plugins/test-app/module.js",
-				BaseURL:       "/public/plugins/test-app",
+				Module:        "public/plugins/test-app/module.js",
+				BaseURL:       "public/plugins/test-app",
 			},
 		}
 
 		reg := fakes.NewFakePluginRegistry()
 		procPrvdr := fakes.NewFakeBackendProcessProvider()
 		procMgr := fakes.NewFakeProcessManager()
-		cfg := &config.Cfg{}
+		cfg := &config.PluginManagementCfg{}
 		l := newLoader(t, cfg, reg, procMgr, procPrvdr, newFakeSignatureErrorTracker())
 		got, err := l.Load(context.Background(), &fakes.FakePluginSource{
 			PluginClassFunc: func(ctx context.Context) plugins.Class {
@@ -1112,14 +973,15 @@ func TestLoader_Load_SkipUninitializedPlugins(t *testing.T) {
 							{Name: "License & Terms", URL: "http://license.com"},
 						},
 						Logos: plugins.Logos{
-							Small: "/public/plugins/test-app/img/logo_small.png",
-							Large: "/public/plugins/test-app/img/logo_large.png",
+							Small: "public/plugins/test-app/img/logo_small.png",
+							Large: "public/plugins/test-app/img/logo_large.png",
 						},
 						Screenshots: []plugins.Screenshots{
-							{Path: "/public/plugins/test-app/img/screenshot1.png", Name: "img1"},
-							{Path: "/public/plugins/test-app/img/screenshot2.png", Name: "img2"},
+							{Path: "public/plugins/test-app/img/screenshot1.png", Name: "img1"},
+							{Path: "public/plugins/test-app/img/screenshot2.png", Name: "img2"},
 						},
-						Updated: "2015-02-10",
+						Updated:  "2015-02-10",
+						Keywords: []string{"test"},
 					},
 					Dependencies: plugins.Dependencies{
 						GrafanaVersion: "3.x.x",
@@ -1141,8 +1003,8 @@ func TestLoader_Load_SkipUninitializedPlugins(t *testing.T) {
 				Signature:     plugins.SignatureStatusValid,
 				SignatureType: plugins.SignatureTypeGrafana,
 				SignatureOrg:  "Grafana Labs",
-				Module:        "/public/plugins/test-app/module.js",
-				BaseURL:       "/public/plugins/test-app",
+				Module:        "public/plugins/test-app/module.js",
+				BaseURL:       "public/plugins/test-app",
 			},
 		}
 
@@ -1158,7 +1020,7 @@ func TestLoader_Load_SkipUninitializedPlugins(t *testing.T) {
 			}
 		}
 		procMgr := fakes.NewFakeProcessManager()
-		cfg := &config.Cfg{}
+		cfg := &config.PluginManagementCfg{}
 		l := newLoader(t, cfg, reg, procMgr, procPrvdr, newFakeSignatureErrorTracker())
 		got, err := l.Load(context.Background(), &fakes.FakePluginSource{
 			PluginClassFunc: func(ctx context.Context) plugins.Class {
@@ -1215,16 +1077,16 @@ func TestLoader_AngularClass(t *testing.T) {
 				},
 			}
 			// if angularDetected = true, it means that the detection has run
-			l := newLoaderWithOpts(t, &config.Cfg{AngularSupportEnabled: true}, loaderDepOpts{
+			l := newLoaderWithOpts(t, &config.PluginManagementCfg{AngularSupportEnabled: true}, loaderDepOpts{
 				angularInspector: angularinspector.AlwaysAngularFakeInspector,
 			})
 			p, err := l.Load(context.Background(), fakePluginSource)
 			require.NoError(t, err)
 			require.Len(t, p, 1, "should load 1 plugin")
 			if tc.expAngularDetectionRun {
-				require.True(t, p[0].AngularDetected, "angular detection should run")
+				require.True(t, p[0].Angular.Detected, "angular detection should run")
 			} else {
-				require.False(t, p[0].AngularDetected, "angular detection should not run")
+				require.False(t, p[0].Angular.Detected, "angular detection should not run")
 			}
 		})
 	}
@@ -1241,10 +1103,10 @@ func TestLoader_Load_Angular(t *testing.T) {
 	}
 	for _, cfgTc := range []struct {
 		name string
-		cfg  *config.Cfg
+		cfg  *config.PluginManagementCfg
 	}{
-		{name: "angular support enabled", cfg: &config.Cfg{AngularSupportEnabled: true}},
-		{name: "angular support disabled", cfg: &config.Cfg{AngularSupportEnabled: false}},
+		{name: "angular support enabled", cfg: &config.PluginManagementCfg{AngularSupportEnabled: true}},
+		{name: "angular support disabled", cfg: &config.PluginManagementCfg{AngularSupportEnabled: false}},
 	} {
 		t.Run(cfgTc.name, func(t *testing.T) {
 			for _, tc := range []struct {
@@ -1280,6 +1142,45 @@ func TestLoader_Load_Angular(t *testing.T) {
 	}
 }
 
+func TestLoader_HideAngularDeprecation(t *testing.T) {
+	fakePluginSource := &fakes.FakePluginSource{
+		PluginClassFunc: func(ctx context.Context) plugins.Class {
+			return plugins.ClassExternal
+		},
+		PluginURIsFunc: func(ctx context.Context) []string {
+			return []string{filepath.Join(testDataDir(t), "valid-v2-signature")}
+		},
+	}
+	for _, tc := range []struct {
+		name                      string
+		cfg                       *config.PluginManagementCfg
+		expHideAngularDeprecation bool
+	}{
+		{name: "with plugin id in HideAngularDeprecation list", cfg: &config.PluginManagementCfg{
+			AngularSupportEnabled:  true,
+			HideAngularDeprecation: []string{"one-app", "two-panel", "test-datasource", "three-datasource"},
+		}, expHideAngularDeprecation: true},
+		{name: "without plugin id in HideAngularDeprecation list", cfg: &config.PluginManagementCfg{
+			AngularSupportEnabled:  true,
+			HideAngularDeprecation: []string{"one-app", "two-panel", "three-datasource"},
+		}, expHideAngularDeprecation: false},
+		{name: "with empty HideAngularDeprecation", cfg: &config.PluginManagementCfg{
+			AngularSupportEnabled:  true,
+			HideAngularDeprecation: nil,
+		}, expHideAngularDeprecation: false},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			l := newLoaderWithOpts(t, tc.cfg, loaderDepOpts{
+				angularInspector: angularinspector.AlwaysAngularFakeInspector,
+			})
+			p, err := l.Load(context.Background(), fakePluginSource)
+			require.NoError(t, err)
+			require.Len(t, p, 1, "should load 1 plugin")
+			require.Equal(t, tc.expHideAngularDeprecation, p[0].Angular.HideDeprecation)
+		})
+	}
+}
+
 func TestLoader_Load_NestedPlugins(t *testing.T) {
 	parent := &plugins.Plugin{
 		JSONData: plugins.JSONData{
@@ -1292,8 +1193,8 @@ func TestLoader_Load_NestedPlugins(t *testing.T) {
 					URL:  "http://grafana.com",
 				},
 				Logos: plugins.Logos{
-					Small: "/public/img/icn-datasource.svg",
-					Large: "/public/img/icn-datasource.svg",
+					Small: "public/img/icn-datasource.svg",
+					Large: "public/img/icn-datasource.svg",
 				},
 				Description: "Parent plugin",
 				Version:     "1.0.0",
@@ -1305,8 +1206,8 @@ func TestLoader_Load_NestedPlugins(t *testing.T) {
 			},
 			Backend: true,
 		},
-		Module:        "/public/plugins/test-datasource/module.js",
-		BaseURL:       "/public/plugins/test-datasource",
+		Module:        "public/plugins/test-datasource/module.js",
+		BaseURL:       "public/plugins/test-datasource",
 		FS:            mustNewStaticFSForTests(t, filepath.Join(testDataDir(t), "nested-plugins/parent")),
 		Signature:     plugins.SignatureStatusValid,
 		SignatureType: plugins.SignatureTypeGrafana,
@@ -1325,8 +1226,8 @@ func TestLoader_Load_NestedPlugins(t *testing.T) {
 					URL:  "http://grafana.com",
 				},
 				Logos: plugins.Logos{
-					Small: "/public/img/icn-panel.svg",
-					Large: "/public/img/icn-panel.svg",
+					Small: "public/img/icn-panel.svg",
+					Large: "public/img/icn-panel.svg",
 				},
 				Description: "Child plugin",
 				Version:     "1.0.1",
@@ -1337,8 +1238,8 @@ func TestLoader_Load_NestedPlugins(t *testing.T) {
 				Plugins:        []plugins.Dependency{},
 			},
 		},
-		Module:        "/public/plugins/test-panel/module.js",
-		BaseURL:       "/public/plugins/test-panel",
+		Module:        "public/plugins/test-panel/module.js",
+		BaseURL:       "public/plugins/test-panel",
 		FS:            mustNewStaticFSForTests(t, filepath.Join(testDataDir(t), "nested-plugins/parent/nested")),
 		Signature:     plugins.SignatureStatusValid,
 		SignatureType: plugins.SignatureTypeGrafana,
@@ -1353,7 +1254,7 @@ func TestLoader_Load_NestedPlugins(t *testing.T) {
 		procPrvdr := fakes.NewFakeBackendProcessProvider()
 		procMgr := fakes.NewFakeProcessManager()
 		reg := fakes.NewFakePluginRegistry()
-		cfg := &config.Cfg{}
+		cfg := &config.PluginManagementCfg{}
 		l := newLoader(t, cfg, reg, procMgr, procPrvdr, newFakeSignatureErrorTracker())
 
 		got, err := l.Load(context.Background(), &fakes.FakePluginSource{
@@ -1417,13 +1318,14 @@ func TestLoader_Load_NestedPlugins(t *testing.T) {
 						{Name: "License", URL: "https://github.com/grafana/grafana-starter-app/blob/master/LICENSE"},
 					},
 					Logos: plugins.Logos{
-						Small: "/public/plugins/myorgid-simple-app/img/logo.svg",
-						Large: "/public/plugins/myorgid-simple-app/img/logo.svg",
+						Small: "public/plugins/myorgid-simple-app/img/logo.svg",
+						Large: "public/plugins/myorgid-simple-app/img/logo.svg",
 					},
 					Screenshots: []plugins.Screenshots{},
 					Description: "Grafana App Plugin Template",
 					Version:     "",
 					Updated:     "",
+					Keywords:    []string{"panel", "template"},
 				},
 				Dependencies: plugins.Dependencies{
 					GrafanaVersion:    "7.0.0",
@@ -1473,8 +1375,8 @@ func TestLoader_Load_NestedPlugins(t *testing.T) {
 				},
 				Backend: false,
 			},
-			Module:        "/public/plugins/myorgid-simple-app/module.js",
-			BaseURL:       "/public/plugins/myorgid-simple-app",
+			Module:        "public/plugins/myorgid-simple-app/module.js",
+			BaseURL:       "public/plugins/myorgid-simple-app",
 			FS:            mustNewStaticFSForTests(t, filepath.Join(testDataDir(t), "app-with-child/dist")),
 			DefaultNavURL: "/plugins/myorgid-simple-app/page/root-page-react",
 			Signature:     plugins.SignatureStatusValid,
@@ -1497,13 +1399,14 @@ func TestLoader_Load_NestedPlugins(t *testing.T) {
 						{Name: "License", URL: "https://github.com/grafana/grafana-starter-panel/blob/master/LICENSE"},
 					},
 					Logos: plugins.Logos{
-						Small: "/public/plugins/myorgid-simple-panel/img/logo.svg",
-						Large: "/public/plugins/myorgid-simple-panel/img/logo.svg",
+						Small: "public/plugins/myorgid-simple-panel/img/logo.svg",
+						Large: "public/plugins/myorgid-simple-panel/img/logo.svg",
 					},
 					Screenshots: []plugins.Screenshots{},
 					Description: "Grafana Panel Plugin Template",
 					Version:     "",
 					Updated:     "",
+					Keywords:    []string{"panel", "template"},
 				},
 				Dependencies: plugins.Dependencies{
 					GrafanaDependency: ">=7.0.0",
@@ -1511,8 +1414,8 @@ func TestLoader_Load_NestedPlugins(t *testing.T) {
 					Plugins:           []plugins.Dependency{},
 				},
 			},
-			Module:          "/public/plugins/myorgid-simple-app/child/module.js",
-			BaseURL:         "/public/plugins/myorgid-simple-app",
+			Module:          "public/plugins/myorgid-simple-app/child/module.js",
+			BaseURL:         "public/plugins/myorgid-simple-app",
 			FS:              mustNewStaticFSForTests(t, filepath.Join(testDataDir(t), "app-with-child/dist/child")),
 			IncludedInAppID: parent.ID,
 			Signature:       plugins.SignatureStatusValid,
@@ -1528,7 +1431,7 @@ func TestLoader_Load_NestedPlugins(t *testing.T) {
 		reg := fakes.NewFakePluginRegistry()
 		procPrvdr := fakes.NewFakeBackendProcessProvider()
 		procMgr := fakes.NewFakeProcessManager()
-		cfg := &config.Cfg{}
+		cfg := &config.PluginManagementCfg{}
 		l := newLoader(t, cfg, reg, procMgr, procPrvdr, newFakeSignatureErrorTracker())
 		got, err := l.Load(context.Background(), &fakes.FakePluginSource{
 			PluginClassFunc: func(ctx context.Context) plugins.Class {
@@ -1559,25 +1462,25 @@ type loaderDepOpts struct {
 	backendFactoryProvider plugins.BackendFactoryProvider
 }
 
-func newLoader(t *testing.T, cfg *config.Cfg, reg registry.Service, proc process.Manager,
-	backendFactory plugins.BackendFactoryProvider, sigErrTracker pluginerrs.SignatureErrorTracker) *Loader {
+func newLoader(t *testing.T, cfg *config.PluginManagementCfg, reg registry.Service, proc process.Manager,
+	backendFactory plugins.BackendFactoryProvider, sigErrTracker pluginerrs.SignatureErrorTracker,
+) *Loader {
 	assets := assetpath.ProvideService(cfg, pluginscdn.ProvideService(cfg))
-	lic := fakes.NewFakeLicensingService()
 	angularInspector := angularinspector.NewStaticInspector()
 
 	terminate, err := pipeline.ProvideTerminationStage(cfg, reg, proc)
 	require.NoError(t, err)
 
-	return ProvideService(pipeline.ProvideDiscoveryStage(cfg, finder.NewLocalFinder(false), reg),
+	return ProvideService(pipeline.ProvideDiscoveryStage(cfg,
+		finder.NewLocalFinder(false), reg),
 		pipeline.ProvideBootstrapStage(cfg, signature.DefaultCalculator(cfg), assets),
 		pipeline.ProvideValidationStage(cfg, signature.NewValidator(signature.NewUnsignedAuthorizer(cfg)), angularInspector, sigErrTracker),
-		pipeline.ProvideInitializationStage(cfg, reg, lic, backendFactory, proc, &fakes.FakeAuthService{}, fakes.NewFakeRoleRegistry()),
+		pipeline.ProvideInitializationStage(cfg, reg, backendFactory, proc, &fakes.FakeAuthService{}, fakes.NewFakeRoleRegistry(), fakes.NewFakePluginEnvProvider(), tracing.InitializeTracerForTest()),
 		terminate)
 }
 
-func newLoaderWithOpts(t *testing.T, cfg *config.Cfg, opts loaderDepOpts) *Loader {
+func newLoaderWithOpts(t *testing.T, cfg *config.PluginManagementCfg, opts loaderDepOpts) *Loader {
 	assets := assetpath.ProvideService(cfg, pluginscdn.ProvideService(cfg))
-	lic := fakes.NewFakeLicensingService()
 	reg := fakes.NewFakePluginRegistry()
 	proc := fakes.NewFakeProcessManager()
 
@@ -1600,19 +1503,21 @@ func newLoaderWithOpts(t *testing.T, cfg *config.Cfg, opts loaderDepOpts) *Loade
 		backendFactoryProvider = fakes.NewFakeBackendProcessProvider()
 	}
 
-	return ProvideService(pipeline.ProvideDiscoveryStage(cfg, finder.NewLocalFinder(false), reg),
+	return ProvideService(pipeline.ProvideDiscoveryStage(cfg,
+		finder.NewLocalFinder(false), reg),
 		pipeline.ProvideBootstrapStage(cfg, signature.DefaultCalculator(cfg), assets),
 		pipeline.ProvideValidationStage(cfg, signature.NewValidator(signature.NewUnsignedAuthorizer(cfg)), angularInspector, sigErrTracker),
-		pipeline.ProvideInitializationStage(cfg, reg, lic, backendFactoryProvider, proc, authServiceRegistry, fakes.NewFakeRoleRegistry()),
+		pipeline.ProvideInitializationStage(cfg, reg, backendFactoryProvider, proc, authServiceRegistry, fakes.NewFakeRoleRegistry(), fakes.NewFakePluginEnvProvider(), tracing.InitializeTracerForTest()),
 		terminate)
 }
 
 func verifyState(t *testing.T, ps []*plugins.Plugin, reg registry.Service,
-	procPrvdr *fakes.FakeBackendProcessProvider, procMngr *fakes.FakeProcessManager) {
+	procPrvdr *fakes.FakeBackendProcessProvider, procMngr *fakes.FakeProcessManager,
+) {
 	t.Helper()
 
 	for _, p := range ps {
-		regP, exists := reg.Plugin(context.Background(), p.ID)
+		regP, exists := reg.Plugin(context.Background(), p.ID, p.Info.Version)
 		require.True(t, exists)
 		if !cmp.Equal(p, regP, compareOpts...) {
 			t.Fatalf("Result mismatch (-want +got):\n%s", cmp.Diff(p, regP, compareOpts...))
diff --git a/pkg/services/pluginsintegration/pipeline/pipeline.go b/pkg/services/pluginsintegration/pipeline/pipeline.go
index 2ac5b3ac0685e..7b3e9cf3d084e 100644
--- a/pkg/services/pluginsintegration/pipeline/pipeline.go
+++ b/pkg/services/pluginsintegration/pipeline/pipeline.go
@@ -3,6 +3,7 @@ package pipeline
 import (
 	"context"
 
+	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/auth"
 	"github.com/grafana/grafana/pkg/plugins/config"
@@ -21,14 +22,15 @@ import (
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginerrs"
 )
 
-func ProvideDiscoveryStage(cfg *config.Cfg, pf finder.Finder, pr registry.Service) *discovery.Discovery {
+func ProvideDiscoveryStage(cfg *config.PluginManagementCfg, pf finder.Finder, pr registry.Service) *discovery.Discovery {
 	return discovery.New(cfg, discovery.Opts{
-		FindFunc: func(ctx context.Context, src plugins.PluginSource) ([]*plugins.FoundBundle, error) {
-			return pf.Find(ctx, src)
-		},
+		FindFunc: pf.Find,
 		FindFilterFuncs: []discovery.FindFilterFunc{
+			discovery.NewPermittedPluginTypesFilterStep([]plugins.Type{
+				plugins.TypeDataSource, plugins.TypeApp, plugins.TypePanel, plugins.TypeSecretsManager,
+			}),
 			func(ctx context.Context, _ plugins.Class, b []*plugins.FoundBundle) ([]*plugins.FoundBundle, error) {
-				return discovery.NewDuplicatePluginFilterStep(pr).Filter(ctx, b)
+				return NewDuplicatePluginIDFilterStep(pr).Filter(ctx, b)
 			},
 			func(_ context.Context, _ plugins.Class, b []*plugins.FoundBundle) ([]*plugins.FoundBundle, error) {
 				return NewDisablePluginsStep(cfg).Filter(b)
@@ -40,14 +42,14 @@ func ProvideDiscoveryStage(cfg *config.Cfg, pf finder.Finder, pr registry.Servic
 	})
 }
 
-func ProvideBootstrapStage(cfg *config.Cfg, sc plugins.SignatureCalculator, a *assetpath.Service) *bootstrap.Bootstrap {
+func ProvideBootstrapStage(cfg *config.PluginManagementCfg, sc plugins.SignatureCalculator, a *assetpath.Service) *bootstrap.Bootstrap {
 	return bootstrap.New(cfg, bootstrap.Opts{
 		ConstructFunc: bootstrap.DefaultConstructFunc(sc, a),
 		DecorateFuncs: bootstrap.DefaultDecorateFuncs(cfg),
 	})
 }
 
-func ProvideValidationStage(cfg *config.Cfg, sv signature.Validator, ai angularinspector.Inspector,
+func ProvideValidationStage(cfg *config.PluginManagementCfg, sv signature.Validator, ai angularinspector.Inspector,
 	et pluginerrs.SignatureErrorTracker) *validation.Validate {
 	return validation.New(cfg, validation.Opts{
 		ValidateFuncs: []validation.ValidateFunc{
@@ -58,13 +60,13 @@ func ProvideValidationStage(cfg *config.Cfg, sv signature.Validator, ai angulari
 	})
 }
 
-func ProvideInitializationStage(cfg *config.Cfg, pr registry.Service, l plugins.Licensing,
-	bp plugins.BackendFactoryProvider, pm process.Manager, externalServiceRegistry auth.ExternalServiceRegistry,
-	roleRegistry plugins.RoleRegistry) *initialization.Initialize {
+func ProvideInitializationStage(cfg *config.PluginManagementCfg, pr registry.Service, bp plugins.BackendFactoryProvider,
+	pm process.Manager, externalServiceRegistry auth.ExternalServiceRegistry,
+	roleRegistry plugins.RoleRegistry, pluginEnvProvider envvars.Provider, tracer tracing.Tracer) *initialization.Initialize {
 	return initialization.New(cfg, initialization.Opts{
 		InitializeFuncs: []initialization.InitializeFunc{
-			ExternalServiceRegistrationStep(cfg, externalServiceRegistry),
-			initialization.BackendClientInitStep(envvars.NewProvider(cfg, l), bp),
+			ExternalServiceRegistrationStep(cfg, externalServiceRegistry, tracer),
+			initialization.BackendClientInitStep(pluginEnvProvider, bp),
 			initialization.PluginRegistrationStep(pr),
 			initialization.BackendProcessStartStep(pm),
 			RegisterPluginRolesStep(roleRegistry),
@@ -73,7 +75,7 @@ func ProvideInitializationStage(cfg *config.Cfg, pr registry.Service, l plugins.
 	})
 }
 
-func ProvideTerminationStage(cfg *config.Cfg, pr registry.Service, pm process.Manager) (*termination.Terminate, error) {
+func ProvideTerminationStage(cfg *config.PluginManagementCfg, pr registry.Service, pm process.Manager) (*termination.Terminate, error) {
 	return termination.New(cfg, termination.Opts{
 		TerminateFuncs: []termination.TerminateFunc{
 			termination.BackendProcessTerminatorStep(pm),
diff --git a/pkg/services/pluginsintegration/pipeline/steps.go b/pkg/services/pluginsintegration/pipeline/steps.go
index 44bd572dba3f2..0ac7dd69c088f 100644
--- a/pkg/services/pluginsintegration/pipeline/steps.go
+++ b/pkg/services/pluginsintegration/pipeline/steps.go
@@ -3,50 +3,68 @@ package pipeline
 import (
 	"context"
 	"errors"
+	"fmt"
+	"slices"
+
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/codes"
 
 	"github.com/grafana/grafana/pkg/infra/metrics"
+	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/auth"
 	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/log"
 	"github.com/grafana/grafana/pkg/plugins/manager/pipeline/initialization"
 	"github.com/grafana/grafana/pkg/plugins/manager/pipeline/validation"
+	"github.com/grafana/grafana/pkg/plugins/manager/registry"
 	"github.com/grafana/grafana/pkg/plugins/manager/signature"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/plugins/pfs"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginerrs"
 )
 
 // ExternalServiceRegistration implements an InitializeFunc for registering external services.
 type ExternalServiceRegistration struct {
-	cfg                     *config.Cfg
+	cfg                     *config.PluginManagementCfg
 	externalServiceRegistry auth.ExternalServiceRegistry
 	log                     log.Logger
+	tracer                  tracing.Tracer
 }
 
 // ExternalServiceRegistrationStep returns an InitializeFunc for registering external services.
-func ExternalServiceRegistrationStep(cfg *config.Cfg, externalServiceRegistry auth.ExternalServiceRegistry) initialization.InitializeFunc {
-	return newExternalServiceRegistration(cfg, externalServiceRegistry).Register
+func ExternalServiceRegistrationStep(cfg *config.PluginManagementCfg, externalServiceRegistry auth.ExternalServiceRegistry, tracer tracing.Tracer) initialization.InitializeFunc {
+	return newExternalServiceRegistration(cfg, externalServiceRegistry, tracer).Register
 }
 
-func newExternalServiceRegistration(cfg *config.Cfg, serviceRegistry auth.ExternalServiceRegistry) *ExternalServiceRegistration {
+func newExternalServiceRegistration(cfg *config.PluginManagementCfg, serviceRegistry auth.ExternalServiceRegistry, tracer tracing.Tracer) *ExternalServiceRegistration {
 	return &ExternalServiceRegistration{
 		cfg:                     cfg,
 		externalServiceRegistry: serviceRegistry,
 		log:                     log.New("plugins.external.registration"),
+		tracer:                  tracer,
 	}
 }
 
 // Register registers the external service with the external service registry, if the feature is enabled.
 func (r *ExternalServiceRegistration) Register(ctx context.Context, p *plugins.Plugin) (*plugins.Plugin, error) {
-	if p.ExternalServiceRegistration != nil &&
-		(r.cfg.Features.IsEnabled(featuremgmt.FlagExternalServiceAuth) || r.cfg.Features.IsEnabled(featuremgmt.FlagExternalServiceAccounts)) {
-		s, err := r.externalServiceRegistry.RegisterExternalService(ctx, p.ID, p.ExternalServiceRegistration)
-		if err != nil {
-			r.log.Error("Could not register an external service. Initialization skipped", "pluginId", p.ID, "error", err)
-			return nil, err
-		}
-		p.ExternalService = s
+	if p.IAM == nil {
+		return p, nil
+	}
+
+	ctx, span := r.tracer.Start(ctx, "ExternalServiceRegistration.Register")
+	span.SetAttributes(attribute.String("register.pluginId", p.ID))
+	defer span.End()
+
+	ctxLogger := r.log.FromContext(ctx)
+
+	s, err := r.externalServiceRegistry.RegisterExternalService(ctx, p.ID, pfs.Type(p.Type), p.IAM)
+	if err != nil {
+		ctxLogger.Error("Could not register an external service. Initialization skipped", "pluginId", p.ID, "error", err)
+		span.SetStatus(codes.Error, fmt.Sprintf("could not register external service: %v", err))
+		return nil, err
 	}
+	p.ExternalService = s
+
 	return p, nil
 }
 
@@ -126,11 +144,11 @@ func (v *SignatureValidation) Validate(ctx context.Context, p *plugins.Plugin) e
 // DisablePlugins is a filter step that will filter out any configured plugins
 type DisablePlugins struct {
 	log log.Logger
-	cfg *config.Cfg
+	cfg *config.PluginManagementCfg
 }
 
 // NewDisablePluginsStep returns a new DisablePlugins.
-func NewDisablePluginsStep(cfg *config.Cfg) *DisablePlugins {
+func NewDisablePluginsStep(cfg *config.PluginManagementCfg) *DisablePlugins {
 	return &DisablePlugins{
 		cfg: cfg,
 		log: log.New("plugins.disable"),
@@ -162,11 +180,11 @@ func (c *DisablePlugins) Filter(bundles []*plugins.FoundBundle) ([]*plugins.Foun
 // AsExternal is a filter step that will skip loading a core plugin to use an external one.
 type AsExternal struct {
 	log log.Logger
-	cfg *config.Cfg
+	cfg *config.PluginManagementCfg
 }
 
-// NewDisablePluginsStep returns a new DisablePlugins.
-func NewAsExternalStep(cfg *config.Cfg) *AsExternal {
+// NewAsExternalStep returns a new DisablePlugins.
+func NewAsExternalStep(cfg *config.PluginManagementCfg) *AsExternal {
 	return &AsExternal{
 		cfg: cfg,
 		log: log.New("plugins.asExternal"),
@@ -175,7 +193,7 @@ func NewAsExternalStep(cfg *config.Cfg) *AsExternal {
 
 // Filter will filter out any plugins that are marked to be disabled.
 func (c *AsExternal) Filter(cl plugins.Class, bundles []*plugins.FoundBundle) ([]*plugins.FoundBundle, error) {
-	if c.cfg.Features == nil || !c.cfg.Features.IsEnabled(featuremgmt.FlagExternalCorePlugins) {
+	if !c.cfg.Features.ExternalCorePluginsEnabled {
 		return bundles, nil
 	}
 
@@ -193,26 +211,56 @@ func (c *AsExternal) Filter(cl plugins.Class, bundles []*plugins.FoundBundle) ([
 		}
 		return res, nil
 	}
+	return bundles, nil
+}
 
-	if cl == plugins.ClassExternal {
-		// Warn if the plugin is not found in the external plugins directory.
-		asExternal := map[string]bool{}
-		for pluginID, pluginCfg := range c.cfg.PluginSettings {
-			if pluginCfg["as_external"] == "true" {
-				asExternal[pluginID] = true
-			}
+// DuplicatePluginIDValidation is a filter step that will filter out any plugins that are already registered with the same
+// plugin ID. This includes both the primary plugin and child plugins, which are matched using the plugin.json plugin
+// ID field.
+type DuplicatePluginIDValidation struct {
+	registry registry.Service
+	log      log.Logger
+}
+
+// NewDuplicatePluginIDFilterStep returns a new DuplicatePluginIDValidation.
+func NewDuplicatePluginIDFilterStep(registry registry.Service) *DuplicatePluginIDValidation {
+	return &DuplicatePluginIDValidation{
+		registry: registry,
+		log:      log.New("plugins.dedupe"),
+	}
+}
+
+// Filter will filter out any plugins that have already been registered under the same plugin ID.
+func (d *DuplicatePluginIDValidation) Filter(ctx context.Context, bundles []*plugins.FoundBundle) ([]*plugins.FoundBundle, error) {
+	res := make([]*plugins.FoundBundle, 0, len(bundles))
+
+	var matchesPluginIDFunc = func(fp plugins.FoundPlugin) func(p *plugins.Plugin) bool {
+		return func(p *plugins.Plugin) bool {
+			return p.ID == fp.JSONData.ID
 		}
-		for _, bundle := range bundles {
-			if asExternal[bundle.Primary.JSONData.ID] {
-				delete(asExternal, bundle.Primary.JSONData.ID)
-			}
+	}
+
+	for _, b := range bundles {
+		ps := d.registry.Plugins(ctx)
+
+		if slices.ContainsFunc(ps, matchesPluginIDFunc(b.Primary)) {
+			d.log.Warn("Skipping loading of plugin as it's a duplicate", "pluginId", b.Primary.JSONData.ID)
+			continue
 		}
-		if len(asExternal) > 0 {
-			for p := range asExternal {
-				c.log.Error("Core plugin expected to be loaded as external, but it is missing", "pluginID", p)
+
+		var nonDupeChildren []*plugins.FoundPlugin
+		for _, child := range b.Children {
+			if slices.ContainsFunc(ps, matchesPluginIDFunc(*child)) {
+				d.log.Warn("Skipping loading of child plugin as it's a duplicate", "pluginId", child.JSONData.ID)
+				continue
 			}
+			nonDupeChildren = append(nonDupeChildren, child)
 		}
+		res = append(res, &plugins.FoundBundle{
+			Primary:  b.Primary,
+			Children: nonDupeChildren,
+		})
 	}
 
-	return bundles, nil
+	return res, nil
 }
diff --git a/pkg/services/pluginsintegration/pipeline/steps_test.go b/pkg/services/pluginsintegration/pipeline/steps_test.go
index 98c665d0d1053..24b7def7bde78 100644
--- a/pkg/services/pluginsintegration/pipeline/steps_test.go
+++ b/pkg/services/pluginsintegration/pipeline/steps_test.go
@@ -1,18 +1,19 @@
 package pipeline
 
 import (
+	"context"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/config"
-	"github.com/grafana/grafana/pkg/plugins/log"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/plugins/manager/registry"
 	"github.com/grafana/grafana/pkg/setting"
-	"github.com/stretchr/testify/require"
 )
 
 func TestSkipPlugins(t *testing.T) {
-	cfg := &config.Cfg{
+	cfg := &config.PluginManagementCfg{
 		DisablePlugins: []string{"plugin1", "plugin2"},
 	}
 	s := NewDisablePluginsStep(cfg)
@@ -66,8 +67,10 @@ func TestAsExternal(t *testing.T) {
 	}
 
 	t.Run("should skip a core plugin", func(t *testing.T) {
-		cfg := &config.Cfg{
-			Features: featuremgmt.WithFeatures(featuremgmt.FlagExternalCorePlugins),
+		cfg := &config.PluginManagementCfg{
+			Features: config.Features{
+				ExternalCorePluginsEnabled: true,
+			},
 			PluginSettings: setting.PluginSettings{
 				"plugin1": map[string]string{
 					"as_external": "true",
@@ -81,24 +84,99 @@ func TestAsExternal(t *testing.T) {
 		require.Len(t, filtered, 1)
 		require.Equal(t, filtered[0].Primary.JSONData.ID, "plugin2")
 	})
+}
 
-	t.Run("should log an error if an external plugin is not available", func(t *testing.T) {
-		cfg := &config.Cfg{
-			Features: featuremgmt.WithFeatures(featuremgmt.FlagExternalCorePlugins),
-			PluginSettings: setting.PluginSettings{
-				"plugin3": map[string]string{
-					"as_external": "true",
+func TestDuplicatePluginIDValidation(t *testing.T) {
+	tcs := []struct {
+		name              string
+		registeredPlugins []string
+		in                []*plugins.FoundBundle
+		out               []*plugins.FoundBundle
+	}{
+		{
+			name:              "should filter out a plugin if it already exists in the plugin registry",
+			registeredPlugins: []string{"foobar-datasource"},
+			in: []*plugins.FoundBundle{
+				{
+					Primary: plugins.FoundPlugin{
+						JSONData: plugins.JSONData{
+							ID: "foobar-datasource",
+						},
+					},
 				},
 			},
-		}
+			out: []*plugins.FoundBundle{},
+		},
+		{
+			name:              "should not filter out a plugin if it doesn't exist in the plugin registry",
+			registeredPlugins: []string{"foobar-datasource"},
+			in: []*plugins.FoundBundle{
+				{
+					Primary: plugins.FoundPlugin{
+						JSONData: plugins.JSONData{
+							ID: "test-datasource",
+						},
+					},
+				},
+			},
+			out: []*plugins.FoundBundle{
+				{
+					Primary: plugins.FoundPlugin{
+						JSONData: plugins.JSONData{
+							ID: "test-datasource",
+						},
+					},
+				},
+			},
+		},
+		{
+			name:              "should filter out child plugins if they are already registered",
+			registeredPlugins: []string{"foobar-datasource"},
+			in: []*plugins.FoundBundle{
+				{
+					Primary: plugins.FoundPlugin{
+						JSONData: plugins.JSONData{
+							ID: "test-datasource",
+						},
+					},
+					Children: []*plugins.FoundPlugin{
+						{
+							JSONData: plugins.JSONData{
+								ID: "foobar-datasource",
+							},
+						},
+					},
+				},
+			},
+			out: []*plugins.FoundBundle{
+				{
+					Primary: plugins.FoundPlugin{
+						JSONData: plugins.JSONData{
+							ID: "test-datasource",
+						},
+					},
+				},
+			},
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.name, func(t *testing.T) {
+			r := registry.NewInMemory()
+			s := NewDuplicatePluginIDFilterStep(r)
 
-		fakeLogger := log.NewTestLogger()
-		s := NewAsExternalStep(cfg)
-		s.log = fakeLogger
+			ctx := context.Background()
+			for _, pluginID := range tc.registeredPlugins {
+				err := r.Add(ctx, &plugins.Plugin{
+					JSONData: plugins.JSONData{
+						ID: pluginID,
+					},
+				})
+				require.NoError(t, err)
+			}
 
-		filtered, err := s.Filter(plugins.ClassExternal, bundles)
-		require.NoError(t, err)
-		require.Len(t, filtered, 2)
-		require.Equal(t, fakeLogger.ErrorLogs.Calls, 1)
-	})
+			res, err := s.Filter(ctx, tc.in)
+			require.NoError(t, err)
+			require.Equal(t, tc.out, res)
+		})
+	}
 }
diff --git a/pkg/services/pluginsintegration/pluginaccesscontrol/accesscontrol.go b/pkg/services/pluginsintegration/pluginaccesscontrol/accesscontrol.go
index bb0b0aa4a9535..1a7840d545ca3 100644
--- a/pkg/services/pluginsintegration/pluginaccesscontrol/accesscontrol.go
+++ b/pkg/services/pluginsintegration/pluginaccesscontrol/accesscontrol.go
@@ -3,6 +3,7 @@ package pluginaccesscontrol
 import (
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -29,7 +30,7 @@ func ReqCanAdminPlugins(cfg *setting.Cfg) func(rc *contextmodel.ReqContext) bool
 	}
 }
 
-func DeclareRBACRoles(service ac.Service, cfg *setting.Cfg) error {
+func DeclareRBACRoles(service ac.Service, cfg *setting.Cfg, features featuremgmt.FeatureToggles) error {
 	AppPluginsReader := ac.RoleRegistration{
 		Role: ac.RoleDTO{
 			Name:        ac.FixedRolePrefix + "plugins.app:reader",
@@ -58,7 +59,7 @@ func DeclareRBACRoles(service ac.Service, cfg *setting.Cfg) error {
 		Role: ac.RoleDTO{
 			Name:        ac.FixedRolePrefix + "plugins:maintainer",
 			DisplayName: "Plugin Maintainer",
-			Description: "Install, uninstall plugins",
+			Description: "Install, uninstall plugins. Needs to be assigned globally.",
 			Group:       "Plugins",
 			Permissions: []ac.Permission{
 				{Action: ActionInstall},
@@ -67,7 +68,8 @@ func DeclareRBACRoles(service ac.Service, cfg *setting.Cfg) error {
 		Grants: []string{ac.RoleGrafanaAdmin},
 	}
 
-	if !cfg.PluginAdminEnabled || cfg.PluginAdminExternalManageEnabled {
+	if !cfg.PluginAdminEnabled ||
+		(cfg.PluginAdminExternalManageEnabled && !features.IsEnabledGlobally(featuremgmt.FlagManagedPluginsInstall)) {
 		PluginsMaintainer.Grants = []string{}
 	}
 
diff --git a/pkg/services/pluginsintegration/pluginconfig/config.go b/pkg/services/pluginsintegration/pluginconfig/config.go
new file mode 100644
index 0000000000000..cfc32a0377dd3
--- /dev/null
+++ b/pkg/services/pluginsintegration/pluginconfig/config.go
@@ -0,0 +1,147 @@
+package pluginconfig
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/grafana/grafana/pkg/util"
+
+	"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
+
+	"github.com/grafana/grafana/pkg/plugins/config"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+// ProvidePluginManagementConfig returns a new config.PluginManagementCfg.
+// It is used to provide configuration to Grafana's implementation of the plugin management system.
+func ProvidePluginManagementConfig(cfg *setting.Cfg, settingProvider setting.Provider, features featuremgmt.FeatureToggles) (*config.PluginManagementCfg, error) {
+	plugins := settingProvider.Section("plugins")
+	allowedUnsigned := cfg.PluginsAllowUnsigned
+	if len(plugins.KeyValue("allow_loading_unsigned_plugins").Value()) > 0 {
+		allowedUnsigned = strings.Split(plugins.KeyValue("allow_loading_unsigned_plugins").Value(), ",")
+	}
+
+	return config.NewPluginManagementCfg(
+		settingProvider.KeyValue("", "app_mode").MustBool(cfg.Env == setting.Dev),
+		cfg.PluginsPath,
+		extractPluginSettings(settingProvider),
+		allowedUnsigned,
+		cfg.PluginsCDNURLTemplate,
+		cfg.AppURL,
+		config.Features{
+			ExternalCorePluginsEnabled: features.IsEnabledGlobally(featuremgmt.FlagExternalCorePlugins),
+			SkipHostEnvVarsEnabled:     features.IsEnabledGlobally(featuremgmt.FlagPluginsSkipHostEnvVars),
+		},
+		cfg.AngularSupportEnabled,
+		cfg.GrafanaComURL,
+		cfg.DisablePlugins,
+		cfg.HideAngularDeprecation,
+		cfg.ForwardHostEnvVars,
+	), nil
+}
+
+// PluginInstanceCfg contains the configuration for a plugin instance.
+// It is used to provide configuration to the plugin instance either via env vars or via each plugin request.
+type PluginInstanceCfg struct {
+	GrafanaAppURL string
+	Features      featuremgmt.FeatureToggles
+
+	Tracing config.Tracing
+
+	PluginSettings setting.PluginSettings
+
+	AWSAllowedAuthProviders   []string
+	AWSAssumeRoleEnabled      bool
+	AWSExternalId             string
+	AWSSessionDuration        string
+	AWSListMetricsPageLimit   string
+	AWSForwardSettingsPlugins []string
+
+	Azure            *azsettings.AzureSettings
+	AzureAuthEnabled bool
+
+	ProxySettings setting.SecureSocksDSProxySettings
+
+	GrafanaVersion string
+
+	ConcurrentQueryCount int
+	ResponseLimit        int64
+
+	UserFacingDefaultError string
+
+	DataProxyRowLimit int64
+
+	SQLDatasourceMaxOpenConnsDefault    int
+	SQLDatasourceMaxIdleConnsDefault    int
+	SQLDatasourceMaxConnLifetimeDefault int
+
+	SigV4AuthEnabled    bool
+	SigV4VerboseLogging bool
+}
+
+// ProvidePluginInstanceConfig returns a new PluginInstanceCfg.
+func ProvidePluginInstanceConfig(cfg *setting.Cfg, settingProvider setting.Provider, features featuremgmt.FeatureToggles) (*PluginInstanceCfg, error) {
+	aws := settingProvider.Section("aws")
+	allowedAuth := cfg.AWSAllowedAuthProviders
+	if len(aws.KeyValue("allowed_auth_providers").Value()) > 0 {
+		allowedAuth = util.SplitString(aws.KeyValue("allowed_auth_providers").Value())
+	}
+	awsForwardSettingsPlugins := cfg.AWSForwardSettingsPlugins
+	if len(aws.KeyValue("forward_settings_to_plugins").Value()) > 0 {
+		awsForwardSettingsPlugins = util.SplitString(aws.KeyValue("forward_settings_to_plugins").Value())
+	}
+
+	tracingCfg, err := newTracingCfg(cfg)
+	if err != nil {
+		return nil, fmt.Errorf("new opentelemetry cfg: %w", err)
+	}
+
+	if cfg.Azure == nil {
+		cfg.Azure = &azsettings.AzureSettings{}
+	}
+
+	return &PluginInstanceCfg{
+		GrafanaAppURL:                       cfg.AppURL,
+		Features:                            features,
+		Tracing:                             tracingCfg,
+		PluginSettings:                      extractPluginSettings(settingProvider),
+		AWSAllowedAuthProviders:             allowedAuth,
+		AWSAssumeRoleEnabled:                aws.KeyValue("assume_role_enabled").MustBool(cfg.AWSAssumeRoleEnabled),
+		AWSExternalId:                       aws.KeyValue("external_id").Value(),
+		AWSSessionDuration:                  aws.KeyValue("session_duration").Value(),
+		AWSListMetricsPageLimit:             aws.KeyValue("list_metrics_page_limit").Value(),
+		AWSForwardSettingsPlugins:           awsForwardSettingsPlugins,
+		Azure:                               cfg.Azure,
+		AzureAuthEnabled:                    cfg.Azure.AzureAuthEnabled,
+		ProxySettings:                       cfg.SecureSocksDSProxy,
+		GrafanaVersion:                      cfg.BuildVersion,
+		ConcurrentQueryCount:                cfg.ConcurrentQueryCount,
+		UserFacingDefaultError:              cfg.UserFacingDefaultError,
+		DataProxyRowLimit:                   cfg.DataProxyRowLimit,
+		SQLDatasourceMaxOpenConnsDefault:    cfg.SqlDatasourceMaxOpenConnsDefault,
+		SQLDatasourceMaxIdleConnsDefault:    cfg.SqlDatasourceMaxIdleConnsDefault,
+		SQLDatasourceMaxConnLifetimeDefault: cfg.SqlDatasourceMaxConnLifetimeDefault,
+		ResponseLimit:                       cfg.ResponseLimit,
+		SigV4AuthEnabled:                    cfg.SigV4AuthEnabled,
+		SigV4VerboseLogging:                 cfg.SigV4VerboseLogging,
+	}, nil
+}
+
+func extractPluginSettings(settingProvider setting.Provider) setting.PluginSettings {
+	ps := setting.PluginSettings{}
+	for sectionName, sectionCopy := range settingProvider.Current() {
+		if !strings.HasPrefix(sectionName, "plugin.") {
+			continue
+		}
+		// Calling Current() returns a redacted version of section. We need to replace the map values with the unredacted values.
+		section := settingProvider.Section(sectionName)
+		for k := range sectionCopy {
+			sectionCopy[k] = section.KeyValue(k).MustString("")
+		}
+		pluginID := strings.Replace(sectionName, "plugin.", "", 1)
+		ps[pluginID] = sectionCopy
+	}
+
+	return ps
+}
diff --git a/pkg/services/pluginsintegration/pluginconfig/config_test.go b/pkg/services/pluginsintegration/pluginconfig/config_test.go
new file mode 100644
index 0000000000000..e5bebbc93aa2a
--- /dev/null
+++ b/pkg/services/pluginsintegration/pluginconfig/config_test.go
@@ -0,0 +1,38 @@
+package pluginconfig
+
+import (
+	"testing"
+
+	"gopkg.in/ini.v1"
+
+	"github.com/grafana/grafana/pkg/setting"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestPluginSettings(t *testing.T) {
+	raw, err := ini.Load([]byte(`
+		[plugins]
+		test_key = 123
+
+		[plugin.test-datasource]
+		foo = 5m
+		bar = something
+
+		[plugin.secret-plugin]
+		secret_key = secret
+		normal_key = not a secret`))
+	require.NoError(t, err)
+
+	cfg := &setting.Cfg{Raw: raw}
+	settings := &setting.OSSImpl{Cfg: cfg}
+
+	ps := extractPluginSettings(settings)
+	require.Len(t, ps, 2)
+	require.Len(t, ps["test-datasource"], 2)
+	require.Equal(t, ps["test-datasource"]["foo"], "5m")
+	require.Equal(t, ps["test-datasource"]["bar"], "something")
+	require.Len(t, ps["secret-plugin"], 2)
+	require.Equal(t, ps["secret-plugin"]["secret_key"], "secret")
+	require.Equal(t, ps["secret-plugin"]["normal_key"], "not a secret")
+}
diff --git a/pkg/services/pluginsintegration/pluginconfig/envvars.go b/pkg/services/pluginsintegration/pluginconfig/envvars.go
new file mode 100644
index 0000000000000..cca911ebfa571
--- /dev/null
+++ b/pkg/services/pluginsintegration/pluginconfig/envvars.go
@@ -0,0 +1,185 @@
+package pluginconfig
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"slices"
+	"strconv"
+	"strings"
+
+	"github.com/grafana/grafana-aws-sdk/pkg/awsds"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/proxy"
+
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/envvars"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+)
+
+var _ envvars.Provider = (*EnvVarsProvider)(nil)
+
+type EnvVarsProvider struct {
+	cfg     *PluginInstanceCfg
+	license plugins.Licensing
+}
+
+func NewEnvVarsProvider(cfg *PluginInstanceCfg, license plugins.Licensing) *EnvVarsProvider {
+	return &EnvVarsProvider{
+		cfg:     cfg,
+		license: license,
+	}
+}
+
+func (p *EnvVarsProvider) PluginEnvVars(ctx context.Context, plugin *plugins.Plugin) []string {
+	hostEnv := []string{
+		envVar("GF_VERSION", p.cfg.GrafanaVersion),
+	}
+
+	if p.license != nil {
+		hostEnv = append(
+			hostEnv,
+			envVar("GF_EDITION", p.license.Edition()),
+			envVar("GF_ENTERPRISE_LICENSE_PATH", p.license.Path()),
+			envVar("GF_ENTERPRISE_APP_URL", p.license.AppURL()),
+		)
+		hostEnv = append(hostEnv, p.license.Environment()...)
+	}
+
+	if plugin.ExternalService != nil {
+		hostEnv = append(
+			hostEnv,
+			envVar("GF_APP_URL", p.cfg.GrafanaAppURL),
+			envVar("GF_PLUGIN_APP_CLIENT_ID", plugin.ExternalService.ClientID),
+			envVar("GF_PLUGIN_APP_CLIENT_SECRET", plugin.ExternalService.ClientSecret),
+		)
+		if plugin.ExternalService.PrivateKey != "" {
+			hostEnv = append(hostEnv, envVar("GF_PLUGIN_APP_PRIVATE_KEY", plugin.ExternalService.PrivateKey))
+		}
+	}
+
+	hostEnv = append(hostEnv, p.featureToggleEnableVars(ctx)...)
+	hostEnv = append(hostEnv, p.awsEnvVars(plugin.PluginID())...)
+	hostEnv = append(hostEnv, p.secureSocksProxyEnvVars()...)
+	hostEnv = append(hostEnv, azsettings.WriteToEnvStr(p.cfg.Azure)...)
+	hostEnv = append(hostEnv, p.tracingEnvVars(plugin)...)
+	hostEnv = append(hostEnv, p.pluginSettingsEnvVars(plugin.PluginID())...)
+
+	// If SkipHostEnvVars is enabled, get some allowed variables from the current process and pass
+	// them down to the plugin. If the flag is not set, do not add anything else because ALL env vars
+	// from the current process (os.Environ()) will be forwarded to the plugin's process by go-plugin
+	if plugin.SkipHostEnvVars {
+		hostEnv = append(hostEnv, envvars.PermittedHostEnvVars()...)
+	}
+
+	return hostEnv
+}
+
+func (p *EnvVarsProvider) featureToggleEnableVars(ctx context.Context) []string {
+	var variables []string // an array is used for consistency and keep the logic simpler for no features case
+
+	if p.cfg.Features == nil {
+		return variables
+	}
+
+	enabledFeatures := p.cfg.Features.GetEnabled(ctx)
+	if len(enabledFeatures) > 0 {
+		features := make([]string, 0, len(enabledFeatures))
+		for feat := range enabledFeatures {
+			features = append(features, feat)
+		}
+		variables = append(variables, envVar("GF_INSTANCE_FEATURE_TOGGLES_ENABLE", strings.Join(features, ",")))
+	}
+
+	return variables
+}
+
+func (p *EnvVarsProvider) awsEnvVars(pluginID string) []string {
+	if !slices.Contains[[]string, string](p.cfg.AWSForwardSettingsPlugins, pluginID) {
+		return []string{}
+	}
+
+	var variables []string
+	if !p.cfg.AWSAssumeRoleEnabled {
+		variables = append(variables, envVar(awsds.AssumeRoleEnabledEnvVarKeyName, "false"))
+	}
+	if len(p.cfg.AWSAllowedAuthProviders) > 0 {
+		variables = append(variables, envVar(awsds.AllowedAuthProvidersEnvVarKeyName, strings.Join(p.cfg.AWSAllowedAuthProviders, ",")))
+	}
+	if p.cfg.AWSExternalId != "" {
+		variables = append(variables, envVar(awsds.GrafanaAssumeRoleExternalIdKeyName, p.cfg.AWSExternalId))
+	}
+	if p.cfg.AWSSessionDuration != "" {
+		variables = append(variables, envVar(awsds.SessionDurationEnvVarKeyName, p.cfg.AWSSessionDuration))
+	}
+	if p.cfg.AWSListMetricsPageLimit != "" {
+		variables = append(variables, envVar(awsds.ListMetricsPageLimitKeyName, p.cfg.AWSListMetricsPageLimit))
+	}
+
+	return variables
+}
+
+func (p *EnvVarsProvider) secureSocksProxyEnvVars() []string {
+	if p.cfg.ProxySettings.Enabled {
+		return []string{
+			// nolint:staticcheck
+			envVar(proxy.PluginSecureSocksProxyClientCertFilePathEnvVarName, p.cfg.ProxySettings.ClientCertFilePath),
+			// nolint:staticcheck
+			envVar(proxy.PluginSecureSocksProxyClientKeyFilePathEnvVarName, p.cfg.ProxySettings.ClientKeyFilePath),
+			// nolint:staticcheck
+			envVar(proxy.PluginSecureSocksProxyRootCACertFilePathsEnvVarName, strings.Join(p.cfg.ProxySettings.RootCAFilePaths, " ")),
+			// nolint:staticcheck
+			envVar(proxy.PluginSecureSocksProxyAddressEnvVarName, p.cfg.ProxySettings.ProxyAddress),
+			// nolint:staticcheck
+			envVar(proxy.PluginSecureSocksProxyServerNameEnvVarName, p.cfg.ProxySettings.ServerName),
+			// nolint:staticcheck
+			envVar(proxy.PluginSecureSocksProxyEnabledEnvVarName, strconv.FormatBool(p.cfg.ProxySettings.Enabled)),
+			// nolint:staticcheck
+			envVar(proxy.PluginSecureSocksProxyAllowInsecureEnvVarName, strconv.FormatBool(p.cfg.ProxySettings.AllowInsecure)),
+		}
+	}
+	return nil
+}
+
+func (p *EnvVarsProvider) tracingEnvVars(plugin *plugins.Plugin) []string {
+	pluginTracingEnabled := p.cfg.Features.IsEnabledGlobally(featuremgmt.FlagEnablePluginsTracingByDefault)
+	if v, exists := p.cfg.PluginSettings[plugin.ID]["tracing"]; exists && !pluginTracingEnabled {
+		pluginTracingEnabled = v == "true"
+	}
+
+	if !p.cfg.Tracing.IsEnabled() || !pluginTracingEnabled {
+		return nil
+	}
+
+	vars := []string{
+		envVar("GF_INSTANCE_OTLP_ADDRESS", p.cfg.Tracing.OpenTelemetry.Address),
+		envVar("GF_INSTANCE_OTLP_PROPAGATION", p.cfg.Tracing.OpenTelemetry.Propagation),
+		envVar("GF_INSTANCE_OTLP_SAMPLER_TYPE", p.cfg.Tracing.OpenTelemetry.Sampler),
+		fmt.Sprintf("GF_INSTANCE_OTLP_SAMPLER_PARAM=%.6f", p.cfg.Tracing.OpenTelemetry.SamplerParam),
+		envVar("GF_INSTANCE_OTLP_SAMPLER_REMOTE_URL", p.cfg.Tracing.OpenTelemetry.SamplerRemoteURL),
+	}
+	if plugin.Info.Version != "" {
+		vars = append(vars, fmt.Sprintf("GF_PLUGIN_VERSION=%s", plugin.Info.Version))
+	}
+	return vars
+}
+
+func (p *EnvVarsProvider) pluginSettingsEnvVars(pluginID string) []string {
+	const customConfigPrefix = "GF_PLUGIN"
+	var env []string
+	for k, v := range p.cfg.PluginSettings[pluginID] {
+		if k == "path" || strings.ToLower(k) == "id" {
+			continue
+		}
+		key := fmt.Sprintf("%s_%s", customConfigPrefix, strings.ToUpper(k))
+		if value := os.Getenv(key); value != "" {
+			v = value
+		}
+		env = append(env, fmt.Sprintf("%s=%s", key, v))
+	}
+	return env
+}
+
+func envVar(key, value string) string {
+	return fmt.Sprintf("%s=%s", key, value)
+}
diff --git a/pkg/services/pluginsintegration/pluginconfig/envvars_test.go b/pkg/services/pluginsintegration/pluginconfig/envvars_test.go
new file mode 100644
index 0000000000000..da6172b4a352f
--- /dev/null
+++ b/pkg/services/pluginsintegration/pluginconfig/envvars_test.go
@@ -0,0 +1,745 @@
+package pluginconfig
+
+import (
+	"context"
+	"strings"
+	"testing"
+
+	"gopkg.in/ini.v1"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
+
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/auth"
+	"github.com/grafana/grafana/pkg/plugins/config"
+	"github.com/grafana/grafana/pkg/plugins/envvars"
+	"github.com/grafana/grafana/pkg/plugins/manager/fakes"
+	"github.com/grafana/grafana/pkg/plugins/pfs"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+func TestPluginEnvVarsProvider_PluginEnvVars(t *testing.T) {
+	t.Run("backend datasource with license", func(t *testing.T) {
+		p := &plugins.Plugin{
+			JSONData: plugins.JSONData{
+				ID: "test",
+			},
+		}
+
+		licensing := &fakes.FakeLicensingService{
+			LicenseEdition: "test",
+			TokenRaw:       "token",
+			LicensePath:    "/path/to/ent/license",
+			LicenseAppURL:  "https://myorg.com/",
+		}
+
+		cfg := &PluginInstanceCfg{
+			PluginSettings: map[string]map[string]string{
+				"test": {
+					"custom_env_var": "customVal",
+				},
+			},
+			AWSAssumeRoleEnabled: true,
+			Features:             featuremgmt.WithFeatures(),
+		}
+
+		provider := NewEnvVarsProvider(cfg, licensing)
+		envVars := provider.PluginEnvVars(context.Background(), p)
+		assert.Len(t, envVars, 6)
+		assert.Equal(t, "GF_VERSION=", envVars[0])
+		assert.Equal(t, "GF_EDITION=test", envVars[1])
+		assert.Equal(t, "GF_ENTERPRISE_LICENSE_PATH=/path/to/ent/license", envVars[2])
+		assert.Equal(t, "GF_ENTERPRISE_APP_URL=https://myorg.com/", envVars[3])
+		assert.Equal(t, "GF_ENTERPRISE_LICENSE_TEXT=token", envVars[4])
+		assert.Equal(t, "GF_PLUGIN_CUSTOM_ENV_VAR=customVal", envVars[5])
+	})
+}
+
+func TestPluginEnvVarsProvider_skipHostEnvVars(t *testing.T) {
+	const (
+		envVarName  = "HTTP_PROXY"
+		envVarValue = "lorem ipsum"
+	)
+
+	t.Setenv(envVarName, envVarValue)
+
+	p := &plugins.Plugin{
+		JSONData: plugins.JSONData{
+			ID: "test",
+		},
+	}
+
+	t.Run("without FlagPluginsSkipHostEnvVars should not populate host env vars", func(t *testing.T) {
+		cfg := setting.NewCfg()
+		pCfg, err := ProvidePluginInstanceConfig(cfg, setting.ProvideProvider(cfg), featuremgmt.WithFeatures())
+		require.NoError(t, err)
+
+		provider := NewEnvVarsProvider(pCfg, nil)
+		envVars := provider.PluginEnvVars(context.Background(), p)
+
+		// We want to test that the envvars.Provider does not add any of the host env vars.
+		// When starting the plugin via go-plugin, ALL host env vars will be added by go-plugin,
+		// but we are testing the envvars.Provider here, so that's outside the scope of this test.
+		_, ok := getEnvVarWithExists(envVars, envVarName)
+		require.False(t, ok, "host env var should not be present")
+	})
+
+	t.Run("with SkipHostEnvVars = true", func(t *testing.T) {
+		p.SkipHostEnvVars = true
+
+		cfg := setting.NewCfg()
+		pCfg, err := ProvidePluginInstanceConfig(cfg, setting.ProvideProvider(cfg), featuremgmt.WithFeatures())
+		require.NoError(t, err)
+		provider := NewEnvVarsProvider(pCfg, nil)
+
+		t.Run("should populate allowed host env vars", func(t *testing.T) {
+			// Set all allowed variables
+			for _, ev := range envvars.PermittedHostEnvVarNames() {
+				t.Setenv(ev, envVarValue)
+			}
+			envVars := provider.PluginEnvVars(context.Background(), p)
+
+			// Test against each variable
+			for _, expEvName := range envvars.PermittedHostEnvVarNames() {
+				gotEvValue, ok := getEnvVarWithExists(envVars, expEvName)
+				require.True(t, ok, "host env var should be present")
+				require.Equal(t, envVarValue, gotEvValue)
+			}
+		})
+
+		t.Run("should not populate host env vars that aren't allowed", func(t *testing.T) {
+			// Set all allowed variables
+			for _, ev := range envvars.PermittedHostEnvVarNames() {
+				t.Setenv(ev, envVarValue)
+			}
+			// ...and an extra one, which should not leak
+			const superSecretEnvVariableName = "SUPER_SECRET_VALUE"
+			t.Setenv(superSecretEnvVariableName, "01189998819991197253")
+			envVars := provider.PluginEnvVars(context.Background(), p)
+
+			// Super secret should not leak
+			_, ok := getEnvVarWithExists(envVars, superSecretEnvVariableName)
+			require.False(t, ok, "super secret env var should not be leaked")
+
+			// Everything else should be present
+			for _, expEvName := range envvars.PermittedHostEnvVarNames() {
+				var gotEvValue string
+				gotEvValue, ok = getEnvVarWithExists(envVars, expEvName)
+				require.True(t, ok, "host env var should be present")
+				require.Equal(t, envVarValue, gotEvValue)
+			}
+		})
+	})
+}
+
+func TestPluginEnvVarsProvider_tracingEnvironmentVariables(t *testing.T) {
+	const pluginID = "plugin_id"
+
+	defaultPlugin := &plugins.Plugin{
+		JSONData: plugins.JSONData{
+			ID:   pluginID,
+			Info: plugins.Info{Version: "1.0.0"},
+		},
+	}
+	pluginWithoutVersion := &plugins.Plugin{
+		JSONData: plugins.JSONData{ID: pluginID},
+	}
+
+	defaultOTelCfg := config.OpenTelemetryCfg{
+		Address:     "127.0.0.1:4317",
+		Propagation: "",
+	}
+
+	expDefaultOtlp := func(t *testing.T, envVars []string) {
+		found := map[string]bool{
+			"address":        false,
+			"plugin_version": false,
+			"propagation":    false,
+		}
+		setFound := func(v string) {
+			require.False(t, found[v], "duplicate env var found")
+			found[v] = true
+		}
+		for _, v := range envVars {
+			switch v {
+			case "GF_PLUGIN_VERSION=1.0.0":
+				setFound("plugin_version")
+			case "GF_INSTANCE_OTLP_ADDRESS=127.0.0.1:4317":
+				setFound("address")
+			case "GF_INSTANCE_OTLP_PROPAGATION=":
+				setFound("propagation")
+			}
+		}
+		for k, f := range found {
+			require.Truef(t, f, "%q env var not found: %+v", k, envVars)
+		}
+	}
+	expNoTracing := func(t *testing.T, envVars []string) {
+		for _, v := range envVars {
+			assert.False(t, strings.HasPrefix(v, "GF_TRACING"), "should not have tracing env var")
+			assert.False(
+				t,
+				strings.HasPrefix(v, "GF_PLUGIN_VERSION"),
+				"GF_PLUGIN_VERSION is tracing-only and should not be present when tracing is disabled",
+			)
+		}
+	}
+	expGfPluginVersionNotPresent := func(t *testing.T, envVars []string) {
+		for _, e := range envVars {
+			assert.False(t, strings.HasPrefix("GF_PLUGIN_VERSION=", e), "GF_PLUGIN_VERSION shouldn't be present")
+		}
+	}
+	expGfPluginVersionPresent := func(t *testing.T, envVars []string) {
+		var found bool
+		for _, e := range envVars {
+			if e != "GF_PLUGIN_VERSION=1.0.0" {
+				continue
+			}
+			assert.False(t, found, "GF_PLUGIN_VERSION is present multiple times")
+			found = true
+		}
+		assert.Truef(t, found, "GF_PLUGIN_VERSION is not present: %+v", envVars)
+	}
+
+	for _, tc := range []struct {
+		name   string
+		cfg    *PluginInstanceCfg
+		plugin *plugins.Plugin
+		exp    func(t *testing.T, envVars []string)
+	}{
+		{
+			name: "otel not configured",
+			cfg: &PluginInstanceCfg{
+				AWSAssumeRoleEnabled: false,
+				Tracing:              config.Tracing{},
+				Features:             featuremgmt.WithFeatures(),
+			},
+			plugin: defaultPlugin,
+			exp:    expNoTracing,
+		},
+		{
+			name: "otel not configured but plugin-tracing enabled",
+			cfg: &PluginInstanceCfg{
+				PluginSettings: map[string]map[string]string{pluginID: {"tracing": "true"}},
+				Tracing:        config.Tracing{},
+				Features:       featuremgmt.WithFeatures(),
+			},
+			plugin: defaultPlugin,
+			exp:    expNoTracing,
+		},
+		{
+			name: "otlp no propagation plugin enabled",
+			cfg: &PluginInstanceCfg{
+				PluginSettings: map[string]map[string]string{
+					pluginID: {"tracing": "true"},
+				},
+				Tracing: config.Tracing{
+					OpenTelemetry: defaultOTelCfg,
+				},
+				Features: featuremgmt.WithFeatures(),
+			},
+
+			plugin: defaultPlugin,
+			exp:    expDefaultOtlp,
+		},
+		{
+			name: "otlp no propagation disabled by default",
+			cfg: &PluginInstanceCfg{
+				Tracing: config.Tracing{
+					OpenTelemetry: defaultOTelCfg,
+				},
+				Features: featuremgmt.WithFeatures(),
+			},
+			plugin: defaultPlugin,
+			exp:    expNoTracing,
+		},
+		{
+			name: "otlp propagation plugin enabled",
+			cfg: &PluginInstanceCfg{
+				PluginSettings: map[string]map[string]string{
+					pluginID: {"tracing": "true"},
+				},
+				AWSAssumeRoleEnabled: true,
+				Tracing: config.Tracing{
+					OpenTelemetry: config.OpenTelemetryCfg{
+						Address:     "127.0.0.1:4317",
+						Propagation: "w3c",
+
+						// Sensible default values for the sampler set by pkg/infra/tracing while reading config.ini
+						Sampler:          "",
+						SamplerParam:     1.0,
+						SamplerRemoteURL: "",
+					},
+				},
+				Features: featuremgmt.WithFeatures(),
+			},
+			plugin: defaultPlugin,
+			exp: func(t *testing.T, envVars []string) {
+				assert.Len(t, envVars, 8)
+				assert.Equal(t, "GF_VERSION=", envVars[0])
+				assert.Equal(t, "GF_INSTANCE_OTLP_ADDRESS=127.0.0.1:4317", envVars[1])
+				assert.Equal(t, "GF_INSTANCE_OTLP_PROPAGATION=w3c", envVars[2])
+				assert.Equal(t, "GF_INSTANCE_OTLP_SAMPLER_TYPE=", envVars[3])
+				assert.Equal(t, "GF_INSTANCE_OTLP_SAMPLER_PARAM=1.000000", envVars[4])
+				assert.Equal(t, "GF_INSTANCE_OTLP_SAMPLER_REMOTE_URL=", envVars[5])
+				assert.Equal(t, "GF_PLUGIN_VERSION=1.0.0", envVars[6])
+				assert.Equal(t, "GF_PLUGIN_TRACING=true", envVars[7])
+			},
+		},
+		{
+			name: "otlp enabled composite propagation",
+			cfg: &PluginInstanceCfg{
+				PluginSettings: map[string]map[string]string{
+					pluginID: {"tracing": "true"},
+				},
+				AWSAssumeRoleEnabled: true,
+				Tracing: config.Tracing{
+					OpenTelemetry: config.OpenTelemetryCfg{
+						Address:     "127.0.0.1:4317",
+						Propagation: "w3c,jaeger",
+
+						// Sensible default values for the sampler set by pkg/infra/tracing while reading config.ini
+						Sampler:          "",
+						SamplerParam:     1.0,
+						SamplerRemoteURL: "",
+					},
+				},
+				Features: featuremgmt.WithFeatures(),
+			},
+			plugin: defaultPlugin,
+			exp: func(t *testing.T, envVars []string) {
+				assert.Len(t, envVars, 8)
+				assert.Equal(t, "GF_VERSION=", envVars[0])
+				assert.Equal(t, "GF_INSTANCE_OTLP_ADDRESS=127.0.0.1:4317", envVars[1])
+				assert.Equal(t, "GF_INSTANCE_OTLP_PROPAGATION=w3c,jaeger", envVars[2])
+				assert.Equal(t, "GF_INSTANCE_OTLP_SAMPLER_TYPE=", envVars[3])
+				assert.Equal(t, "GF_INSTANCE_OTLP_SAMPLER_PARAM=1.000000", envVars[4])
+				assert.Equal(t, "GF_INSTANCE_OTLP_SAMPLER_REMOTE_URL=", envVars[5])
+				assert.Equal(t, "GF_PLUGIN_VERSION=1.0.0", envVars[6])
+				assert.Equal(t, "GF_PLUGIN_TRACING=true", envVars[7])
+			},
+		},
+		{
+			name: "otlp no propagation disabled by default",
+			cfg: &PluginInstanceCfg{
+				Tracing: config.Tracing{
+					OpenTelemetry: config.OpenTelemetryCfg{
+						Address:     "127.0.0.1:4317",
+						Propagation: "w3c",
+					},
+				},
+				Features: featuremgmt.WithFeatures(),
+			},
+			plugin: defaultPlugin,
+			exp:    expNoTracing,
+		},
+		{
+			name: "disabled on plugin",
+			cfg: &PluginInstanceCfg{
+				PluginSettings: setting.PluginSettings{
+					pluginID: map[string]string{"tracing": "false"},
+				},
+				Tracing: config.Tracing{
+					OpenTelemetry: defaultOTelCfg,
+				},
+				Features: featuremgmt.WithFeatures(),
+			},
+			plugin: defaultPlugin,
+			exp:    expNoTracing,
+		},
+		{
+			name: "disabled on plugin with other plugin settings",
+			cfg: &PluginInstanceCfg{
+				PluginSettings: map[string]map[string]string{
+					pluginID: {"some_other_option": "true"},
+				},
+				AWSAssumeRoleEnabled: true,
+				Tracing: config.Tracing{
+					OpenTelemetry: defaultOTelCfg,
+				},
+				Features: featuremgmt.WithFeatures(),
+			},
+			plugin: defaultPlugin,
+			exp:    expNoTracing,
+		},
+		{
+			name: "enabled on plugin with other plugin settings",
+			cfg: &PluginInstanceCfg{
+				PluginSettings: map[string]map[string]string{
+					pluginID: {"some_other_option": "true", "tracing": "true"},
+				},
+				Tracing: config.Tracing{
+					OpenTelemetry: defaultOTelCfg,
+				},
+				Features: featuremgmt.WithFeatures(),
+			},
+			plugin: defaultPlugin,
+			exp:    expDefaultOtlp,
+		},
+		{
+			name: `enabled on plugin with no "tracing" plugin setting but with enablePluginsTracingByDefault feature flag`,
+			cfg: &PluginInstanceCfg{
+				PluginSettings: map[string]map[string]string{pluginID: {}},
+				Tracing: config.Tracing{
+					OpenTelemetry: defaultOTelCfg,
+				},
+				Features: featuremgmt.WithFeatures(featuremgmt.FlagEnablePluginsTracingByDefault),
+			},
+			plugin: defaultPlugin,
+			exp:    expDefaultOtlp,
+		},
+		{
+			name: `enabled on plugin with plugin setting "tracing=false" but with enablePluginsTracingByDefault feature flag`,
+			cfg: &PluginInstanceCfg{
+				PluginSettings: map[string]map[string]string{pluginID: {"tracing": "false"}},
+				Tracing: config.Tracing{
+					OpenTelemetry: defaultOTelCfg,
+				},
+				Features: featuremgmt.WithFeatures(featuremgmt.FlagEnablePluginsTracingByDefault),
+			},
+			plugin: defaultPlugin,
+			exp:    expDefaultOtlp,
+		},
+		{
+			name: "GF_PLUGIN_VERSION is not present if tracing is disabled",
+			cfg: &PluginInstanceCfg{
+				PluginSettings: map[string]map[string]string{pluginID: {"tracing": "true"}},
+				Tracing: config.Tracing{
+					OpenTelemetry: config.OpenTelemetryCfg{},
+				},
+				Features: featuremgmt.WithFeatures(),
+			},
+			plugin: defaultPlugin,
+			exp:    expGfPluginVersionNotPresent,
+		},
+		{
+			name: "GF_PLUGIN_VERSION is present if tracing is enabled and plugin has version",
+			cfg: &PluginInstanceCfg{
+				PluginSettings: map[string]map[string]string{pluginID: {"tracing": "true"}},
+				Tracing: config.Tracing{
+					OpenTelemetry: defaultOTelCfg,
+				},
+				Features: featuremgmt.WithFeatures(),
+			},
+			plugin: defaultPlugin,
+			exp:    expGfPluginVersionPresent,
+		},
+		{
+			name: "GF_PLUGIN_VERSION is not present if tracing is enabled but plugin doesn't have a version",
+			cfg: &PluginInstanceCfg{
+				PluginSettings: map[string]map[string]string{pluginID: {"tracing": "true"}},
+				Tracing: config.Tracing{
+					OpenTelemetry: config.OpenTelemetryCfg{},
+				},
+				Features: featuremgmt.WithFeatures(),
+			},
+			plugin: pluginWithoutVersion,
+			exp:    expGfPluginVersionNotPresent,
+		},
+		{
+			name: "no sampling (neversample)",
+			cfg: &PluginInstanceCfg{
+				PluginSettings: map[string]map[string]string{pluginID: {"tracing": "true"}},
+				Tracing: config.Tracing{
+					OpenTelemetry: config.OpenTelemetryCfg{
+						Address:          "127.0.0.1:4317",
+						Propagation:      "jaeger",
+						Sampler:          "",
+						SamplerParam:     0.0,
+						SamplerRemoteURL: "",
+					},
+				},
+				Features: featuremgmt.WithFeatures(),
+			},
+			plugin: defaultPlugin,
+			exp: func(t *testing.T, envVars []string) {
+				require.Empty(t, getEnvVar(envVars, "GF_INSTANCE_OTLP_SAMPLER_TYPE"))
+				require.Equal(t, "0.000000", getEnvVar(envVars, "GF_INSTANCE_OTLP_SAMPLER_PARAM"))
+				require.Empty(t, getEnvVar(envVars, "GF_INSTANCE_OTLP_SAMPLER_REMOTE_URL"))
+			},
+		},
+		{
+			name: "empty sampler with param",
+			cfg: &PluginInstanceCfg{
+				PluginSettings: map[string]map[string]string{pluginID: {"tracing": "true"}},
+				Tracing: config.Tracing{
+					OpenTelemetry: config.OpenTelemetryCfg{
+						Address:          "127.0.0.1:4317",
+						Propagation:      "jaeger",
+						Sampler:          "",
+						SamplerParam:     0.5,
+						SamplerRemoteURL: "",
+					},
+				},
+				Features: featuremgmt.WithFeatures(),
+			},
+			plugin: defaultPlugin,
+			exp: func(t *testing.T, envVars []string) {
+				require.Equal(t, "", getEnvVar(envVars, "GF_INSTANCE_OTLP_SAMPLER_TYPE"))
+				require.Equal(t, "0.500000", getEnvVar(envVars, "GF_INSTANCE_OTLP_SAMPLER_PARAM"))
+				require.Equal(t, "", getEnvVar(envVars, "GF_INSTANCE_OTLP_SAMPLER_REMOTE_URL"))
+			},
+		},
+		{
+			name: "const sampler with param",
+			cfg: &PluginInstanceCfg{
+				PluginSettings: map[string]map[string]string{pluginID: {"tracing": "true"}},
+				Tracing: config.Tracing{
+					OpenTelemetry: config.OpenTelemetryCfg{
+						Address:          "127.0.0.1:4317",
+						Propagation:      "jaeger",
+						Sampler:          "const",
+						SamplerParam:     0.5,
+						SamplerRemoteURL: "",
+					},
+				},
+				Features: featuremgmt.WithFeatures(),
+			},
+			plugin: defaultPlugin,
+			exp: func(t *testing.T, envVars []string) {
+				require.Equal(t, "const", getEnvVar(envVars, "GF_INSTANCE_OTLP_SAMPLER_TYPE"))
+				require.Equal(t, "0.500000", getEnvVar(envVars, "GF_INSTANCE_OTLP_SAMPLER_PARAM"))
+				require.Equal(t, "", getEnvVar(envVars, "GF_INSTANCE_OTLP_SAMPLER_REMOTE_URL"))
+			},
+		},
+		{
+			name: "rateLimiting sampler",
+			cfg: &PluginInstanceCfg{
+				PluginSettings: map[string]map[string]string{pluginID: {"tracing": "true"}},
+				Tracing: config.Tracing{
+					OpenTelemetry: config.OpenTelemetryCfg{
+						Address:          "127.0.0.1:4317",
+						Propagation:      "jaeger",
+						Sampler:          "rateLimiting",
+						SamplerParam:     0.5,
+						SamplerRemoteURL: "",
+					},
+				},
+				Features: featuremgmt.WithFeatures(),
+			},
+			plugin: defaultPlugin,
+			exp: func(t *testing.T, envVars []string) {
+				require.Equal(t, "rateLimiting", getEnvVar(envVars, "GF_INSTANCE_OTLP_SAMPLER_TYPE"))
+				require.Equal(t, "0.500000", getEnvVar(envVars, "GF_INSTANCE_OTLP_SAMPLER_PARAM"))
+				require.Equal(t, "", getEnvVar(envVars, "GF_INSTANCE_OTLP_SAMPLER_REMOTE_URL"))
+			},
+		},
+		{
+			name: "remote sampler",
+			cfg: &PluginInstanceCfg{
+				PluginSettings: map[string]map[string]string{pluginID: {"tracing": "true"}},
+				Features:       featuremgmt.WithFeatures(),
+				Tracing: config.Tracing{
+					OpenTelemetry: config.OpenTelemetryCfg{
+						Address:          "127.0.0.1:4317",
+						Propagation:      "jaeger",
+						Sampler:          "remote",
+						SamplerParam:     0.5,
+						SamplerRemoteURL: "127.0.0.1:10001",
+					},
+				},
+			},
+			plugin: defaultPlugin,
+			exp: func(t *testing.T, envVars []string) {
+				require.Equal(t, "remote", getEnvVar(envVars, "GF_INSTANCE_OTLP_SAMPLER_TYPE"))
+				require.Equal(t, "0.500000", getEnvVar(envVars, "GF_INSTANCE_OTLP_SAMPLER_PARAM"))
+				require.Equal(t, "127.0.0.1:10001", getEnvVar(envVars, "GF_INSTANCE_OTLP_SAMPLER_REMOTE_URL"))
+			},
+		},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			p := NewEnvVarsProvider(tc.cfg, nil)
+			envVars := p.PluginEnvVars(context.Background(), tc.plugin)
+			tc.exp(t, envVars)
+		})
+	}
+}
+
+// getEnvVarWithExists takes a slice of strings in this format: "K=V" (env vars), and returns the "V" where K = wanted.
+// If there's no such key, it returns false as the second argument.
+func getEnvVarWithExists(vars []string, wanted string) (string, bool) {
+	for _, v := range vars {
+		parts := strings.SplitN(v, "=", 2)
+		if parts[0] != wanted {
+			continue
+		}
+		var r string
+		if len(parts) < 2 {
+			r = ""
+		} else {
+			r = parts[1]
+		}
+		return r, true
+	}
+	return "", false
+}
+
+// getEnvVar is like getEnvVarWithExists, but it returns just one string, without the boolean "ok" value.
+// If the wanted environment variable does not exist, it returns an empty string.
+func getEnvVar(vars []string, wanted string) string {
+	v, _ := getEnvVarWithExists(vars, wanted)
+	return v
+}
+
+func TestPluginEnvVarsProvider_authEnvVars(t *testing.T) {
+	t.Run("backend datasource with auth registration", func(t *testing.T) {
+		p := &plugins.Plugin{
+			JSONData: plugins.JSONData{
+				ID:  "test",
+				IAM: &pfs.IAM{},
+			},
+			ExternalService: &auth.ExternalService{
+				ClientID:     "clientID",
+				ClientSecret: "clientSecret",
+				PrivateKey:   "privatePem",
+			},
+		}
+
+		cfg := &setting.Cfg{
+			Raw:    ini.Empty(),
+			AppURL: "https://myorg.com/",
+		}
+
+		pCfg, err := ProvidePluginInstanceConfig(cfg, setting.ProvideProvider(cfg), featuremgmt.WithFeatures())
+		require.NoError(t, err)
+
+		provider := NewEnvVarsProvider(pCfg, nil)
+		envVars := provider.PluginEnvVars(context.Background(), p)
+		assert.Equal(t, "GF_VERSION=", envVars[0])
+		assert.Equal(t, "GF_APP_URL=https://myorg.com/", envVars[1])
+		assert.Equal(t, "GF_PLUGIN_APP_CLIENT_ID=clientID", envVars[2])
+		assert.Equal(t, "GF_PLUGIN_APP_CLIENT_SECRET=clientSecret", envVars[3])
+		assert.Equal(t, "GF_PLUGIN_APP_PRIVATE_KEY=privatePem", envVars[4])
+	})
+}
+
+func TestPluginEnvVarsProvider_awsEnvVars(t *testing.T) {
+	t.Run("backend datasource with aws settings", func(t *testing.T) {
+		tcs := []struct {
+			name             string
+			pluginID         string
+			forwardToPlugins []string
+			expected         []string
+		}{
+			{
+				name:             "Will generate AWS env vars for plugin as long as is in the forwardToPlugins list",
+				forwardToPlugins: []string{"foobar-datasource", "cloudwatch", "prometheus"},
+				pluginID:         "cloudwatch",
+				expected:         []string{"GF_VERSION=", "AWS_AUTH_AssumeRoleEnabled=false", "AWS_AUTH_AllowedAuthProviders=grafana_assume_role,keys", "AWS_AUTH_EXTERNAL_ID=mock_external_id", "AWS_AUTH_SESSION_DURATION=10m", "AWS_CW_LIST_METRICS_PAGE_LIMIT=100"},
+			},
+			{
+				name:             "Will not generate AWS env vars for plugin as long as is in not the forwardToPlugins list",
+				forwardToPlugins: []string{"cloudwatch", "foobar-datasource"},
+				pluginID:         "prometheus",
+				expected:         []string{"GF_VERSION="},
+			},
+		}
+
+		for _, tc := range tcs {
+			p := &plugins.Plugin{
+				JSONData: plugins.JSONData{
+					ID: tc.pluginID,
+				},
+			}
+			cfg := &PluginInstanceCfg{
+				AWSAssumeRoleEnabled:      false,
+				AWSAllowedAuthProviders:   []string{"grafana_assume_role", "keys"},
+				AWSExternalId:             "mock_external_id",
+				AWSSessionDuration:        "10m",
+				AWSListMetricsPageLimit:   "100",
+				AWSForwardSettingsPlugins: tc.forwardToPlugins,
+				Features:                  featuremgmt.WithFeatures(),
+			}
+
+			provider := NewEnvVarsProvider(cfg, nil)
+			envVars := provider.PluginEnvVars(context.Background(), p)
+			assert.ElementsMatch(t, tc.expected, envVars)
+		}
+	})
+}
+
+func TestPluginEnvVarsProvider_featureToggleEnvVar(t *testing.T) {
+	t.Run("backend datasource with feature toggle", func(t *testing.T) {
+		expectedFeatures := []string{"feat-1", "feat-2"}
+		featuresLookup := map[string]bool{
+			expectedFeatures[0]: true,
+			expectedFeatures[1]: true,
+		}
+
+		cfg := &PluginInstanceCfg{
+			Features: featuremgmt.WithFeatures(expectedFeatures[0], true, expectedFeatures[1], true),
+		}
+
+		p := NewEnvVarsProvider(cfg, nil)
+		envVars := p.PluginEnvVars(context.Background(), &plugins.Plugin{})
+		assert.Equal(t, 2, len(envVars))
+
+		toggleExpression := strings.Split(envVars[1], "=")
+		assert.Equal(t, 2, len(toggleExpression))
+
+		assert.Equal(t, "GF_INSTANCE_FEATURE_TOGGLES_ENABLE", toggleExpression[0])
+
+		toggleArgs := toggleExpression[1]
+		features := strings.Split(toggleArgs, ",")
+
+		assert.Equal(t, len(expectedFeatures), len(features))
+
+		// this is necessary because the features are not returned in the order they are provided
+		for _, f := range features {
+			_, ok := featuresLookup[f]
+			assert.True(t, ok)
+		}
+	})
+}
+
+func TestPluginEnvVarsProvider_azureEnvVars(t *testing.T) {
+	t.Run("backend datasource with azure settings", func(t *testing.T) {
+		cfg := &setting.Cfg{
+			Raw: ini.Empty(),
+			Azure: &azsettings.AzureSettings{
+				AzureAuthEnabled:        true,
+				Cloud:                   azsettings.AzurePublic,
+				ManagedIdentityEnabled:  true,
+				ManagedIdentityClientId: "mock_managed_identity_client_id",
+				WorkloadIdentityEnabled: true,
+				WorkloadIdentitySettings: &azsettings.WorkloadIdentitySettings{
+					TenantId:  "mock_workload_identity_tenant_id",
+					ClientId:  "mock_workload_identity_client_id",
+					TokenFile: "mock_workload_identity_token_file",
+				},
+				UserIdentityEnabled:                    true,
+				UserIdentityFallbackCredentialsEnabled: true,
+				UserIdentityTokenEndpoint: &azsettings.TokenEndpointSettings{
+					TokenUrl:          "mock_user_identity_token_url",
+					ClientId:          "mock_user_identity_client_id",
+					ClientSecret:      "mock_user_identity_client_secret",
+					UsernameAssertion: true,
+				},
+			},
+		}
+
+		pCfg, err := ProvidePluginInstanceConfig(cfg, setting.ProvideProvider(cfg), featuremgmt.WithFeatures())
+		require.NoError(t, err)
+
+		provider := NewEnvVarsProvider(pCfg, nil)
+		envVars := provider.PluginEnvVars(context.Background(), &plugins.Plugin{})
+		assert.ElementsMatch(t, []string{"GF_VERSION=", "GFAZPL_AZURE_CLOUD=AzureCloud", "GFAZPL_AZURE_AUTH_ENABLED=true",
+			"GFAZPL_MANAGED_IDENTITY_ENABLED=true",
+			"GFAZPL_MANAGED_IDENTITY_CLIENT_ID=mock_managed_identity_client_id",
+			"GFAZPL_WORKLOAD_IDENTITY_ENABLED=true",
+			"GFAZPL_WORKLOAD_IDENTITY_TENANT_ID=mock_workload_identity_tenant_id",
+			"GFAZPL_WORKLOAD_IDENTITY_CLIENT_ID=mock_workload_identity_client_id",
+			"GFAZPL_WORKLOAD_IDENTITY_TOKEN_FILE=mock_workload_identity_token_file",
+			"GFAZPL_USER_IDENTITY_ENABLED=true",
+			"GFAZPL_USER_IDENTITY_FALLBACK_SERVICE_CREDENTIALS_ENABLED=true",
+			"GFAZPL_USER_IDENTITY_TOKEN_URL=mock_user_identity_token_url",
+			"GFAZPL_USER_IDENTITY_CLIENT_ID=mock_user_identity_client_id",
+			"GFAZPL_USER_IDENTITY_CLIENT_SECRET=mock_user_identity_client_secret",
+			"GFAZPL_USER_IDENTITY_ASSERTION=username",
+		}, envVars)
+	})
+}
diff --git a/pkg/services/pluginsintegration/pluginconfig/fakes.go b/pkg/services/pluginsintegration/pluginconfig/fakes.go
new file mode 100644
index 0000000000000..c58a8443801a2
--- /dev/null
+++ b/pkg/services/pluginsintegration/pluginconfig/fakes.go
@@ -0,0 +1,16 @@
+package pluginconfig
+
+import "context"
+
+var _ PluginRequestConfigProvider = (*FakePluginRequestConfigProvider)(nil)
+
+type FakePluginRequestConfigProvider struct{}
+
+func NewFakePluginRequestConfigProvider() *FakePluginRequestConfigProvider {
+	return &FakePluginRequestConfigProvider{}
+}
+
+// PluginRequestConfig returns a map of configuration that should be passed in a plugin request.
+func (s *FakePluginRequestConfigProvider) PluginRequestConfig(ctx context.Context, pluginID string) map[string]string {
+	return map[string]string{}
+}
diff --git a/pkg/services/pluginsintegration/pluginconfig/request.go b/pkg/services/pluginsintegration/pluginconfig/request.go
new file mode 100644
index 0000000000000..c70725b59c9d5
--- /dev/null
+++ b/pkg/services/pluginsintegration/pluginconfig/request.go
@@ -0,0 +1,164 @@
+package pluginconfig
+
+import (
+	"context"
+	"slices"
+	"sort"
+	"strconv"
+	"strings"
+
+	"github.com/grafana/grafana-aws-sdk/pkg/awsds"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/proxy"
+	"github.com/grafana/grafana-plugin-sdk-go/experimental/featuretoggles"
+)
+
+var _ PluginRequestConfigProvider = (*RequestConfigProvider)(nil)
+
+type PluginRequestConfigProvider interface {
+	PluginRequestConfig(ctx context.Context, pluginID string) map[string]string
+}
+
+type RequestConfigProvider struct {
+	cfg *PluginInstanceCfg
+}
+
+func NewRequestConfigProvider(cfg *PluginInstanceCfg) *RequestConfigProvider {
+	return &RequestConfigProvider{
+		cfg: cfg,
+	}
+}
+
+// PluginRequestConfig returns a map of configuration that should be passed in a plugin request.
+// nolint:gocyclo
+func (s *RequestConfigProvider) PluginRequestConfig(ctx context.Context, pluginID string) map[string]string {
+	m := make(map[string]string)
+
+	if s.cfg.GrafanaAppURL != "" {
+		m[backend.AppURL] = s.cfg.GrafanaAppURL
+	}
+	if s.cfg.ConcurrentQueryCount != 0 {
+		m[backend.ConcurrentQueryCount] = strconv.Itoa(s.cfg.ConcurrentQueryCount)
+	}
+
+	enabledFeatures := s.cfg.Features.GetEnabled(ctx)
+	if len(enabledFeatures) > 0 {
+		features := make([]string, 0, len(enabledFeatures))
+		for feat := range enabledFeatures {
+			features = append(features, feat)
+		}
+		sort.Strings(features)
+		m[featuretoggles.EnabledFeatures] = strings.Join(features, ",")
+	}
+
+	if slices.Contains[[]string, string](s.cfg.AWSForwardSettingsPlugins, pluginID) {
+		if !s.cfg.AWSAssumeRoleEnabled {
+			m[awsds.AssumeRoleEnabledEnvVarKeyName] = "false"
+		}
+		if len(s.cfg.AWSAllowedAuthProviders) > 0 {
+			m[awsds.AllowedAuthProvidersEnvVarKeyName] = strings.Join(s.cfg.AWSAllowedAuthProviders, ",")
+		}
+		if s.cfg.AWSExternalId != "" {
+			m[awsds.GrafanaAssumeRoleExternalIdKeyName] = s.cfg.AWSExternalId
+		}
+		if s.cfg.AWSSessionDuration != "" {
+			m[awsds.SessionDurationEnvVarKeyName] = s.cfg.AWSSessionDuration
+		}
+		if s.cfg.AWSListMetricsPageLimit != "" {
+			m[awsds.ListMetricsPageLimitKeyName] = s.cfg.AWSListMetricsPageLimit
+		}
+	}
+
+	if s.cfg.ProxySettings.Enabled {
+		m[proxy.PluginSecureSocksProxyEnabled] = "true"
+		m[proxy.PluginSecureSocksProxyClientCert] = s.cfg.ProxySettings.ClientCertFilePath
+		m[proxy.PluginSecureSocksProxyClientCertContents] = s.cfg.ProxySettings.ClientCert
+		m[proxy.PluginSecureSocksProxyClientKey] = s.cfg.ProxySettings.ClientKeyFilePath
+		m[proxy.PluginSecureSocksProxyClientKeyContents] = s.cfg.ProxySettings.ClientKey
+		m[proxy.PluginSecureSocksProxyRootCAs] = strings.Join(s.cfg.ProxySettings.RootCAFilePaths, " ")
+		m[proxy.PluginSecureSocksProxyRootCAsContents] = strings.Join(s.cfg.ProxySettings.RootCAs, ",")
+		m[proxy.PluginSecureSocksProxyProxyAddress] = s.cfg.ProxySettings.ProxyAddress
+		m[proxy.PluginSecureSocksProxyServerName] = s.cfg.ProxySettings.ServerName
+		m[proxy.PluginSecureSocksProxyAllowInsecure] = strconv.FormatBool(s.cfg.ProxySettings.AllowInsecure)
+	}
+
+	// Settings here will be extracted by grafana-azure-sdk-go from the plugin context
+	if s.cfg.AzureAuthEnabled {
+		m[azsettings.AzureAuthEnabled] = strconv.FormatBool(s.cfg.AzureAuthEnabled)
+	}
+	azureSettings := s.cfg.Azure
+	if azureSettings != nil && slices.Contains[[]string, string](azureSettings.ForwardSettingsPlugins, pluginID) {
+		if azureSettings.Cloud != "" {
+			m[azsettings.AzureCloud] = azureSettings.Cloud
+		}
+
+		if azureSettings.ManagedIdentityEnabled {
+			m[azsettings.ManagedIdentityEnabled] = "true"
+
+			if azureSettings.ManagedIdentityClientId != "" {
+				m[azsettings.ManagedIdentityClientID] = azureSettings.ManagedIdentityClientId
+			}
+		}
+
+		if azureSettings.UserIdentityEnabled {
+			m[azsettings.UserIdentityEnabled] = "true"
+			m[azsettings.UserIdentityFallbackCredentialsEnabled] = strconv.FormatBool(azureSettings.UserIdentityFallbackCredentialsEnabled)
+
+			if azureSettings.UserIdentityTokenEndpoint != nil {
+				if azureSettings.UserIdentityTokenEndpoint.TokenUrl != "" {
+					m[azsettings.UserIdentityTokenURL] = azureSettings.UserIdentityTokenEndpoint.TokenUrl
+				}
+				if azureSettings.UserIdentityTokenEndpoint.ClientId != "" {
+					m[azsettings.UserIdentityClientID] = azureSettings.UserIdentityTokenEndpoint.ClientId
+				}
+				if azureSettings.UserIdentityTokenEndpoint.ClientSecret != "" {
+					m[azsettings.UserIdentityClientSecret] = azureSettings.UserIdentityTokenEndpoint.ClientSecret
+				}
+				if azureSettings.UserIdentityTokenEndpoint.UsernameAssertion {
+					m[azsettings.UserIdentityAssertion] = "username"
+				}
+			}
+		}
+
+		if azureSettings.WorkloadIdentityEnabled {
+			m[azsettings.WorkloadIdentityEnabled] = "true"
+
+			if azureSettings.WorkloadIdentitySettings != nil {
+				if azureSettings.WorkloadIdentitySettings.ClientId != "" {
+					m[azsettings.WorkloadIdentityClientID] = azureSettings.WorkloadIdentitySettings.ClientId
+				}
+				if azureSettings.WorkloadIdentitySettings.TenantId != "" {
+					m[azsettings.WorkloadIdentityTenantID] = azureSettings.WorkloadIdentitySettings.TenantId
+				}
+				if azureSettings.WorkloadIdentitySettings.TokenFile != "" {
+					m[azsettings.WorkloadIdentityTokenFile] = azureSettings.WorkloadIdentitySettings.TokenFile
+				}
+			}
+		}
+	}
+
+	if s.cfg.UserFacingDefaultError != "" {
+		m[backend.UserFacingDefaultError] = s.cfg.UserFacingDefaultError
+	}
+
+	if s.cfg.DataProxyRowLimit != 0 {
+		m[backend.SQLRowLimit] = strconv.FormatInt(s.cfg.DataProxyRowLimit, 10)
+	}
+
+	m[backend.SQLMaxOpenConnsDefault] = strconv.Itoa(s.cfg.SQLDatasourceMaxOpenConnsDefault)
+	m[backend.SQLMaxIdleConnsDefault] = strconv.Itoa(s.cfg.SQLDatasourceMaxIdleConnsDefault)
+	m[backend.SQLMaxConnLifetimeSecondsDefault] = strconv.Itoa(s.cfg.SQLDatasourceMaxConnLifetimeDefault)
+
+	if s.cfg.ResponseLimit > 0 {
+		m[backend.ResponseLimit] = strconv.FormatInt(s.cfg.ResponseLimit, 10)
+	}
+
+	if s.cfg.SigV4AuthEnabled {
+		m[awsds.SigV4AuthEnabledEnvVarKeyName] = "true"
+		m[awsds.SigV4VerboseLoggingEnvVarKeyName] = strconv.FormatBool(s.cfg.SigV4VerboseLogging)
+	}
+
+	return m
+}
diff --git a/pkg/services/pluginsintegration/pluginconfig/request_test.go b/pkg/services/pluginsintegration/pluginconfig/request_test.go
new file mode 100644
index 0000000000000..f21d2c0de1987
--- /dev/null
+++ b/pkg/services/pluginsintegration/pluginconfig/request_test.go
@@ -0,0 +1,431 @@
+package pluginconfig
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
+
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+func TestRequestConfigProvider_PluginRequestConfig_Defaults(t *testing.T) {
+	cfg := setting.NewCfg()
+	pCfg, err := ProvidePluginInstanceConfig(cfg, setting.ProvideProvider(cfg), featuremgmt.WithFeatures())
+	require.NoError(t, err)
+
+	p := NewRequestConfigProvider(pCfg)
+	require.Equal(t, map[string]string{
+		"GF_SQL_MAX_OPEN_CONNS_DEFAULT":            "0",
+		"GF_SQL_MAX_IDLE_CONNS_DEFAULT":            "0",
+		"GF_SQL_MAX_CONN_LIFETIME_SECONDS_DEFAULT": "0",
+	}, p.PluginRequestConfig(context.Background(), ""))
+}
+
+func TestRequestConfigProvider_PluginRequestConfig(t *testing.T) {
+	tcs := []struct {
+		name     string
+		cfg      *PluginInstanceCfg
+		expected map[string]string
+	}{
+		{
+			name: "Both features and proxy settings enabled",
+			cfg: &PluginInstanceCfg{
+				ProxySettings: setting.SecureSocksDSProxySettings{
+					Enabled:            true,
+					ShowUI:             true,
+					ClientCert:         "c3rt",
+					ClientCertFilePath: "./c3rt",
+					ClientKey:          "k3y",
+					ClientKeyFilePath:  "./k3y",
+					RootCAFilePaths:    []string{"./ca"},
+					RootCAs:            []string{"ca"},
+					ProxyAddress:       "https://proxy.grafana.com",
+					ServerName:         "secureProxy",
+					AllowInsecure:      true,
+				},
+				Features: featuremgmt.WithFeatures("feat-2", "feat-500", "feat-1"),
+			},
+			expected: map[string]string{
+				"GF_INSTANCE_FEATURE_TOGGLES_ENABLE":                 "feat-1,feat-2,feat-500",
+				"GF_SECURE_SOCKS_DATASOURCE_PROXY_SERVER_ENABLED":    "true",
+				"GF_SECURE_SOCKS_DATASOURCE_PROXY_CLIENT_CERT":       "./c3rt",
+				"GF_SECURE_SOCKS_DATASOURCE_PROXY_CLIENT_CERT_VAL":   "c3rt",
+				"GF_SECURE_SOCKS_DATASOURCE_PROXY_CLIENT_KEY":        "./k3y",
+				"GF_SECURE_SOCKS_DATASOURCE_PROXY_CLIENT_KEY_VAL":    "k3y",
+				"GF_SECURE_SOCKS_DATASOURCE_PROXY_ROOT_CA_CERT":      "./ca",
+				"GF_SECURE_SOCKS_DATASOURCE_PROXY_ROOT_CA_CERT_VALS": "ca",
+				"GF_SECURE_SOCKS_DATASOURCE_PROXY_PROXY_ADDRESS":     "https://proxy.grafana.com",
+				"GF_SECURE_SOCKS_DATASOURCE_PROXY_SERVER_NAME":       "secureProxy",
+				"GF_SECURE_SOCKS_DATASOURCE_PROXY_ALLOW_INSECURE":    "true",
+			},
+		},
+		{
+			name: "Features enabled but proxy settings disabled",
+			cfg: &PluginInstanceCfg{
+				ProxySettings: setting.SecureSocksDSProxySettings{
+					Enabled:      false,
+					ShowUI:       true,
+					ClientCert:   "c3rt",
+					ClientKey:    "k3y",
+					RootCAs:      []string{"ca"},
+					ProxyAddress: "https://proxy.grafana.com",
+					ServerName:   "secureProxy",
+				},
+				Features: featuremgmt.WithFeatures("feat-2", "feat-500", "feat-1"),
+			},
+			expected: map[string]string{
+				"GF_INSTANCE_FEATURE_TOGGLES_ENABLE": "feat-1,feat-2,feat-500",
+			},
+		},
+		{
+			name: "Both features and proxy settings disabled",
+			cfg: &PluginInstanceCfg{
+				ProxySettings: setting.SecureSocksDSProxySettings{
+					Enabled:      false,
+					ShowUI:       true,
+					ClientCert:   "c3rt",
+					ClientKey:    "k3y",
+					RootCAs:      []string{"ca"},
+					ProxyAddress: "https://proxy.grafana.com",
+					ServerName:   "secureProxy",
+				},
+				Features: featuremgmt.WithFeatures("feat-2", false),
+			},
+			expected: map[string]string{},
+		},
+		{
+			name: "Both features and proxy settings empty",
+			cfg: &PluginInstanceCfg{
+				ProxySettings: setting.SecureSocksDSProxySettings{},
+				Features:      featuremgmt.WithFeatures(),
+			},
+			expected: map[string]string{},
+		},
+		{
+			name: "Multiple Root CA certs in proxy settings are supported",
+			cfg: &PluginInstanceCfg{
+				ProxySettings: setting.SecureSocksDSProxySettings{
+					Enabled:         true,
+					ShowUI:          true,
+					RootCAFilePaths: []string{"./ca", "./ca2"},
+					RootCAs:         []string{"ca", "ca2"},
+					ProxyAddress:    "https://proxy.grafana.com",
+					ServerName:      "secureProxy",
+					AllowInsecure:   true,
+				},
+				Features: featuremgmt.WithFeatures(),
+			},
+			expected: map[string]string{
+				"GF_SECURE_SOCKS_DATASOURCE_PROXY_SERVER_ENABLED":    "true",
+				"GF_SECURE_SOCKS_DATASOURCE_PROXY_ROOT_CA_CERT":      "./ca ./ca2",
+				"GF_SECURE_SOCKS_DATASOURCE_PROXY_ROOT_CA_CERT_VALS": "ca,ca2",
+				"GF_SECURE_SOCKS_DATASOURCE_PROXY_PROXY_ADDRESS":     "https://proxy.grafana.com",
+				"GF_SECURE_SOCKS_DATASOURCE_PROXY_SERVER_NAME":       "secureProxy",
+				"GF_SECURE_SOCKS_DATASOURCE_PROXY_ALLOW_INSECURE":    "true",
+			},
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.name, func(t *testing.T) {
+			p := NewRequestConfigProvider(tc.cfg)
+			require.Subset(t, p.PluginRequestConfig(context.Background(), ""), tc.expected)
+		})
+	}
+}
+
+func TestRequestConfigProvider_PluginRequestConfig_featureToggles(t *testing.T) {
+	t.Run("Feature toggles list is deterministic", func(t *testing.T) {
+		tcs := []struct {
+			features       featuremgmt.FeatureToggles
+			expectedConfig map[string]string
+		}{
+			{
+				features:       featuremgmt.WithFeatures(),
+				expectedConfig: map[string]string{},
+			},
+			{
+				features:       featuremgmt.WithFeatures("A", "B", "C"),
+				expectedConfig: map[string]string{"GF_INSTANCE_FEATURE_TOGGLES_ENABLE": "A,B,C"},
+			},
+			{
+				features:       featuremgmt.WithFeatures("C", "B", "A"),
+				expectedConfig: map[string]string{"GF_INSTANCE_FEATURE_TOGGLES_ENABLE": "A,B,C"},
+			},
+			{
+				features:       featuremgmt.WithFeatures("b", "a", "c", "d"),
+				expectedConfig: map[string]string{"GF_INSTANCE_FEATURE_TOGGLES_ENABLE": "a,b,c,d"},
+			},
+		}
+
+		for _, tc := range tcs {
+			cfg := setting.NewCfg()
+			pCfg, err := ProvidePluginInstanceConfig(cfg, setting.ProvideProvider(cfg), tc.features)
+			require.NoError(t, err)
+
+			p := NewRequestConfigProvider(pCfg)
+			require.Subset(t, p.PluginRequestConfig(context.Background(), ""), tc.expectedConfig)
+		}
+	})
+}
+
+func TestRequestConfigProvider_PluginRequestConfig_appURL(t *testing.T) {
+	t.Run("Uses the configured app URL", func(t *testing.T) {
+		cfg := setting.NewCfg()
+		cfg.AppURL = "https://myorg.com/"
+
+		pCfg, err := ProvidePluginInstanceConfig(cfg, setting.ProvideProvider(cfg), featuremgmt.WithFeatures())
+		require.NoError(t, err)
+
+		p := NewRequestConfigProvider(pCfg)
+		require.Subset(t, p.PluginRequestConfig(context.Background(), ""), map[string]string{"GF_APP_URL": "https://myorg.com/"})
+	})
+}
+
+func TestRequestConfigProvider_PluginRequestConfig_SQL(t *testing.T) {
+	t.Run("Uses the configured values", func(t *testing.T) {
+		cfg := setting.NewCfg()
+		cfg.DataProxyRowLimit = 23
+		cfg.SqlDatasourceMaxOpenConnsDefault = 24
+		cfg.SqlDatasourceMaxIdleConnsDefault = 25
+		cfg.SqlDatasourceMaxConnLifetimeDefault = 26
+
+		pCfg, err := ProvidePluginInstanceConfig(cfg, setting.ProvideProvider(cfg), featuremgmt.WithFeatures())
+		require.NoError(t, err)
+
+		p := NewRequestConfigProvider(pCfg)
+		require.Subset(t, p.PluginRequestConfig(context.Background(), ""), map[string]string{
+			"GF_SQL_ROW_LIMIT":                         "23",
+			"GF_SQL_MAX_OPEN_CONNS_DEFAULT":            "24",
+			"GF_SQL_MAX_IDLE_CONNS_DEFAULT":            "25",
+			"GF_SQL_MAX_CONN_LIFETIME_SECONDS_DEFAULT": "26",
+		})
+	})
+
+	t.Run("Uses the configured max-default-values, even when they are zero", func(t *testing.T) {
+		cfg := setting.NewCfg()
+		cfg.SqlDatasourceMaxOpenConnsDefault = 0
+		cfg.SqlDatasourceMaxIdleConnsDefault = 0
+		cfg.SqlDatasourceMaxConnLifetimeDefault = 0
+
+		pCfg, err := ProvidePluginInstanceConfig(cfg, setting.ProvideProvider(cfg), featuremgmt.WithFeatures())
+		require.NoError(t, err)
+
+		p := NewRequestConfigProvider(pCfg)
+		require.Equal(t, map[string]string{
+			"GF_SQL_MAX_OPEN_CONNS_DEFAULT":            "0",
+			"GF_SQL_MAX_IDLE_CONNS_DEFAULT":            "0",
+			"GF_SQL_MAX_CONN_LIFETIME_SECONDS_DEFAULT": "0",
+		}, p.PluginRequestConfig(context.Background(), ""))
+	})
+}
+
+func TestRequestConfigProvider_PluginRequestConfig_concurrentQueryCount(t *testing.T) {
+	t.Run("Uses the configured concurrent query count", func(t *testing.T) {
+		cfg := setting.NewCfg()
+		cfg.ConcurrentQueryCount = 42
+
+		pCfg, err := ProvidePluginInstanceConfig(cfg, setting.ProvideProvider(cfg), featuremgmt.WithFeatures())
+		require.NoError(t, err)
+
+		p := NewRequestConfigProvider(pCfg)
+		require.Subset(t, p.PluginRequestConfig(context.Background(), ""), map[string]string{"GF_CONCURRENT_QUERY_COUNT": "42"})
+	})
+
+	t.Run("Doesn't set the concurrent query count if it is not in the config", func(t *testing.T) {
+		cfg := setting.NewCfg()
+		pCfg, err := ProvidePluginInstanceConfig(cfg, setting.ProvideProvider(cfg), featuremgmt.WithFeatures())
+		require.NoError(t, err)
+
+		p := NewRequestConfigProvider(pCfg)
+		require.NotContains(t, p.PluginRequestConfig(context.Background(), ""), "GF_CONCURRENT_QUERY_COUNT")
+	})
+
+	t.Run("Doesn't set the concurrent query count if it is zero", func(t *testing.T) {
+		cfg := setting.NewCfg()
+		cfg.ConcurrentQueryCount = 0
+
+		pCfg, err := ProvidePluginInstanceConfig(cfg, setting.ProvideProvider(cfg), featuremgmt.WithFeatures())
+		require.NoError(t, err)
+
+		p := NewRequestConfigProvider(pCfg)
+		require.NotContains(t, p.PluginRequestConfig(context.Background(), ""), "GF_CONCURRENT_QUERY_COUNT")
+	})
+}
+
+func TestRequestConfigProvider_PluginRequestConfig_azureAuthEnabled(t *testing.T) {
+	t.Run("Uses the configured azureAuthEnabled", func(t *testing.T) {
+		cfg := &PluginInstanceCfg{
+			AzureAuthEnabled: true,
+			Features:         featuremgmt.WithFeatures(),
+		}
+
+		p := NewRequestConfigProvider(cfg)
+		require.Subset(t, p.PluginRequestConfig(context.Background(), ""), map[string]string{"GFAZPL_AZURE_AUTH_ENABLED": "true"})
+	})
+
+	t.Run("Doesn't set the azureAuthEnabled if it is not in the config", func(t *testing.T) {
+		cfg := &PluginInstanceCfg{
+			Features: featuremgmt.WithFeatures(),
+		}
+
+		p := NewRequestConfigProvider(cfg)
+		require.NotContains(t, p.PluginRequestConfig(context.Background(), ""), "GFAZPL_AZURE_AUTH_ENABLED")
+	})
+
+	t.Run("Doesn't set the azureAuthEnabled if it is false", func(t *testing.T) {
+		cfg := &PluginInstanceCfg{
+			AzureAuthEnabled: false,
+			Features:         featuremgmt.WithFeatures(),
+		}
+
+		p := NewRequestConfigProvider(cfg)
+		require.NotContains(t, p.PluginRequestConfig(context.Background(), ""), "GFAZPL_AZURE_AUTH_ENABLED")
+	})
+}
+
+func TestRequestConfigProvider_PluginRequestConfig_azure(t *testing.T) {
+	azSettings := &azsettings.AzureSettings{
+		Cloud:                   azsettings.AzurePublic,
+		ManagedIdentityEnabled:  true,
+		ManagedIdentityClientId: "mock_managed_identity_client_id",
+		WorkloadIdentityEnabled: true,
+		WorkloadIdentitySettings: &azsettings.WorkloadIdentitySettings{
+			TenantId:  "mock_workload_identity_tenant_id",
+			ClientId:  "mock_workload_identity_client_id",
+			TokenFile: "mock_workload_identity_token_file",
+		},
+		UserIdentityEnabled: true,
+		UserIdentityTokenEndpoint: &azsettings.TokenEndpointSettings{
+			TokenUrl:          "mock_user_identity_token_url",
+			ClientId:          "mock_user_identity_client_id",
+			ClientSecret:      "mock_user_identity_client_secret",
+			UsernameAssertion: true,
+		},
+		UserIdentityFallbackCredentialsEnabled: true,
+		ForwardSettingsPlugins:                 []string{"grafana-azure-monitor-datasource", "prometheus", "grafana-azure-data-explorer-datasource", "mssql"},
+	}
+
+	t.Run("uses the azure settings for an Azure plugin", func(t *testing.T) {
+		cfg := setting.NewCfg()
+		cfg.Azure = azSettings
+
+		pCfg, err := ProvidePluginInstanceConfig(cfg, setting.ProvideProvider(cfg), featuremgmt.WithFeatures())
+		require.NoError(t, err)
+
+		p := NewRequestConfigProvider(pCfg)
+		require.Subset(t, p.PluginRequestConfig(context.Background(), "grafana-azure-monitor-datasource"), map[string]string{
+			"GFAZPL_AZURE_CLOUD": "AzureCloud", "GFAZPL_MANAGED_IDENTITY_ENABLED": "true",
+			"GFAZPL_MANAGED_IDENTITY_CLIENT_ID":                         "mock_managed_identity_client_id",
+			"GFAZPL_WORKLOAD_IDENTITY_ENABLED":                          "true",
+			"GFAZPL_WORKLOAD_IDENTITY_TENANT_ID":                        "mock_workload_identity_tenant_id",
+			"GFAZPL_WORKLOAD_IDENTITY_CLIENT_ID":                        "mock_workload_identity_client_id",
+			"GFAZPL_WORKLOAD_IDENTITY_TOKEN_FILE":                       "mock_workload_identity_token_file",
+			"GFAZPL_USER_IDENTITY_ENABLED":                              "true",
+			"GFAZPL_USER_IDENTITY_FALLBACK_SERVICE_CREDENTIALS_ENABLED": "true",
+			"GFAZPL_USER_IDENTITY_TOKEN_URL":                            "mock_user_identity_token_url",
+			"GFAZPL_USER_IDENTITY_CLIENT_ID":                            "mock_user_identity_client_id",
+			"GFAZPL_USER_IDENTITY_CLIENT_SECRET":                        "mock_user_identity_client_secret",
+			"GFAZPL_USER_IDENTITY_ASSERTION":                            "username",
+		})
+	})
+
+	t.Run("does not use the azure settings for a non-Azure plugin", func(t *testing.T) {
+		cfg := setting.NewCfg()
+		cfg.Azure = azSettings
+
+		pCfg, err := ProvidePluginInstanceConfig(cfg, setting.ProvideProvider(cfg), featuremgmt.WithFeatures())
+		require.NoError(t, err)
+
+		p := NewRequestConfigProvider(pCfg)
+		m := p.PluginRequestConfig(context.Background(), "")
+		require.NotContains(t, m, "GFAZPL_AZURE_CLOUD")
+		require.NotContains(t, m, "GFAZPL_MANAGED_IDENTITY_ENABLED")
+		require.NotContains(t, m, "GFAZPL_MANAGED_IDENTITY_CLIENT_ID")
+		require.NotContains(t, m, "GFAZPL_WORKLOAD_IDENTITY_ENABLED")
+		require.NotContains(t, m, "GFAZPL_WORKLOAD_IDENTITY_TENANT_ID")
+		require.NotContains(t, m, "GFAZPL_WORKLOAD_IDENTITY_CLIENT_ID")
+		require.NotContains(t, m, "GFAZPL_WORKLOAD_IDENTITY_TOKEN_FILE")
+		require.NotContains(t, m, "GFAZPL_USER_IDENTITY_ENABLED")
+		require.NotContains(t, m, "GFAZPL_USER_IDENTITY_FALLBACK_SERVICE_CREDENTIALS_ENABLED")
+		require.NotContains(t, m, "GFAZPL_USER_IDENTITY_TOKEN_URL")
+		require.NotContains(t, m, "GFAZPL_USER_IDENTITY_CLIENT_ID")
+		require.NotContains(t, m, "GFAZPL_USER_IDENTITY_CLIENT_SECRET")
+		require.NotContains(t, m, "GFAZPL_USER_IDENTITY_ASSERTION")
+	})
+
+	t.Run("uses the azure settings for a non-Azure user-specified plugin", func(t *testing.T) {
+		azSettings.ForwardSettingsPlugins = append(azSettings.ForwardSettingsPlugins, "test-datasource")
+		cfg := setting.NewCfg()
+		cfg.Azure = azSettings
+
+		pCfg, err := ProvidePluginInstanceConfig(cfg, setting.ProvideProvider(cfg), featuremgmt.WithFeatures())
+		require.NoError(t, err)
+
+		p := NewRequestConfigProvider(pCfg)
+		require.Subset(t, p.PluginRequestConfig(context.Background(), "test-datasource"), map[string]string{
+			"GFAZPL_AZURE_CLOUD": "AzureCloud", "GFAZPL_MANAGED_IDENTITY_ENABLED": "true",
+			"GFAZPL_MANAGED_IDENTITY_CLIENT_ID":                         "mock_managed_identity_client_id",
+			"GFAZPL_WORKLOAD_IDENTITY_ENABLED":                          "true",
+			"GFAZPL_WORKLOAD_IDENTITY_TENANT_ID":                        "mock_workload_identity_tenant_id",
+			"GFAZPL_WORKLOAD_IDENTITY_CLIENT_ID":                        "mock_workload_identity_client_id",
+			"GFAZPL_WORKLOAD_IDENTITY_TOKEN_FILE":                       "mock_workload_identity_token_file",
+			"GFAZPL_USER_IDENTITY_ENABLED":                              "true",
+			"GFAZPL_USER_IDENTITY_FALLBACK_SERVICE_CREDENTIALS_ENABLED": "true",
+			"GFAZPL_USER_IDENTITY_TOKEN_URL":                            "mock_user_identity_token_url",
+			"GFAZPL_USER_IDENTITY_CLIENT_ID":                            "mock_user_identity_client_id",
+			"GFAZPL_USER_IDENTITY_CLIENT_SECRET":                        "mock_user_identity_client_secret",
+			"GFAZPL_USER_IDENTITY_ASSERTION":                            "username",
+		})
+	})
+}
+
+func TestRequestConfigProvider_PluginRequestConfig_aws(t *testing.T) {
+	cfg := &PluginInstanceCfg{
+		Features: featuremgmt.WithFeatures(),
+	}
+
+	cfg.AWSAssumeRoleEnabled = false
+	cfg.AWSAllowedAuthProviders = []string{"grafana_assume_role", "keys"}
+	cfg.AWSExternalId = "mock_external_id"
+	cfg.AWSSessionDuration = "10m"
+	cfg.AWSListMetricsPageLimit = "100"
+	cfg.AWSForwardSettingsPlugins = []string{"cloudwatch", "prometheus", "elasticsearch"}
+
+	p := NewRequestConfigProvider(cfg)
+
+	t.Run("uses the aws settings for an AWS plugin", func(t *testing.T) {
+		require.Subset(t, p.PluginRequestConfig(context.Background(), "cloudwatch"), map[string]string{
+			"AWS_AUTH_AssumeRoleEnabled":     "false",
+			"AWS_AUTH_AllowedAuthProviders":  "grafana_assume_role,keys",
+			"AWS_AUTH_EXTERNAL_ID":           "mock_external_id",
+			"AWS_AUTH_SESSION_DURATION":      "10m",
+			"AWS_CW_LIST_METRICS_PAGE_LIMIT": "100",
+		})
+	})
+
+	t.Run("does not use the aws settings for a non-aws plugin", func(t *testing.T) {
+		m := p.PluginRequestConfig(context.Background(), "")
+		require.NotContains(t, m, "AWS_AUTH_AssumeRoleEnabled")
+		require.NotContains(t, m, "AWS_AUTH_AllowedAuthProviders")
+		require.NotContains(t, m, "AWS_AUTH_EXTERNAL_ID")
+		require.NotContains(t, m, "AWS_AUTH_SESSION_DURATION")
+		require.NotContains(t, m, "AWS_CW_LIST_METRICS_PAGE_LIMIT")
+	})
+
+	t.Run("uses the aws settings for a non-aws user-specified plugin", func(t *testing.T) {
+		cfg.AWSForwardSettingsPlugins = append(cfg.AWSForwardSettingsPlugins, "test-datasource")
+
+		p = NewRequestConfigProvider(cfg)
+		require.Subset(t, p.PluginRequestConfig(context.Background(), "test-datasource"), map[string]string{
+			"AWS_AUTH_AssumeRoleEnabled":     "false",
+			"AWS_AUTH_AllowedAuthProviders":  "grafana_assume_role,keys",
+			"AWS_AUTH_EXTERNAL_ID":           "mock_external_id",
+			"AWS_AUTH_SESSION_DURATION":      "10m",
+			"AWS_CW_LIST_METRICS_PAGE_LIMIT": "100",
+		})
+	})
+}
diff --git a/pkg/services/pluginsintegration/pluginconfig/tracing.go b/pkg/services/pluginsintegration/pluginconfig/tracing.go
new file mode 100644
index 0000000000000..025cd5318ebee
--- /dev/null
+++ b/pkg/services/pluginsintegration/pluginconfig/tracing.go
@@ -0,0 +1,30 @@
+package pluginconfig
+
+import (
+	"fmt"
+
+	"github.com/grafana/grafana/pkg/infra/tracing"
+	pCfg "github.com/grafana/grafana/pkg/plugins/config"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+// newTracingCfg creates a plugins tracing configuration based on the provided Grafana tracing config.
+// If OpenTelemetry (OTLP) is disabled, a zero-value OpenTelemetryCfg is returned.
+func newTracingCfg(grafanaCfg *setting.Cfg) (pCfg.Tracing, error) {
+	tracingCfg, err := tracing.ParseTracingConfig(grafanaCfg)
+	if err != nil {
+		return pCfg.Tracing{}, fmt.Errorf("parse settings: %w", err)
+	}
+	if !tracingCfg.OTelExporterEnabled() {
+		return pCfg.Tracing{}, nil
+	}
+	return pCfg.Tracing{
+		OpenTelemetry: pCfg.OpenTelemetryCfg{
+			Address:          tracingCfg.Address,
+			Propagation:      tracingCfg.Propagation,
+			Sampler:          tracingCfg.Sampler,
+			SamplerParam:     tracingCfg.SamplerParam,
+			SamplerRemoteURL: tracingCfg.SamplerRemoteURL,
+		},
+	}, nil
+}
diff --git a/pkg/services/pluginsintegration/config/tracing_test.go b/pkg/services/pluginsintegration/pluginconfig/tracing_test.go
similarity index 98%
rename from pkg/services/pluginsintegration/config/tracing_test.go
rename to pkg/services/pluginsintegration/pluginconfig/tracing_test.go
index 6f5367da02c23..b7ad8333eff10 100644
--- a/pkg/services/pluginsintegration/config/tracing_test.go
+++ b/pkg/services/pluginsintegration/pluginconfig/tracing_test.go
@@ -1,4 +1,4 @@
-package config
+package pluginconfig
 
 import (
 	"testing"
diff --git a/pkg/services/pluginsintegration/plugincontext/plugincontext.go b/pkg/services/pluginsintegration/plugincontext/plugincontext.go
index 924c1795ae906..4d601b7b34f8d 100644
--- a/pkg/services/pluginsintegration/plugincontext/plugincontext.go
+++ b/pkg/services/pluginsintegration/plugincontext/plugincontext.go
@@ -11,14 +11,14 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/useragent"
 
+	"github.com/grafana/grafana/pkg/infra/appcontext"
 	"github.com/grafana/grafana/pkg/infra/localcache"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/plugins"
-	"github.com/grafana/grafana/pkg/plugins/config"
-	"github.com/grafana/grafana/pkg/plugins/envvars"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/adapters"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginconfig"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 	"github.com/grafana/grafana/pkg/setting"
@@ -30,32 +30,34 @@ const (
 )
 
 func ProvideService(cfg *setting.Cfg, cacheService *localcache.CacheService, pluginStore pluginstore.Store,
-	dataSourceService datasources.DataSourceService, pluginSettingsService pluginsettings.Service,
-	licensing plugins.Licensing, pCfg *config.Cfg) *Provider {
+	dataSourceCache datasources.CacheService, dataSourceService datasources.DataSourceService,
+	pluginSettingsService pluginsettings.Service, pluginRequestConfigProvider pluginconfig.PluginRequestConfigProvider) *Provider {
 	return &Provider{
-		cfg:                   cfg,
-		cacheService:          cacheService,
-		pluginStore:           pluginStore,
-		dataSourceService:     dataSourceService,
-		pluginSettingsService: pluginSettingsService,
-		pluginEnvVars:         envvars.NewProvider(pCfg, licensing),
-		logger:                log.New("plugin.context"),
+		cfg:                         cfg,
+		cacheService:                cacheService,
+		pluginStore:                 pluginStore,
+		dataSourceCache:             dataSourceCache,
+		dataSourceService:           dataSourceService,
+		pluginSettingsService:       pluginSettingsService,
+		pluginRequestConfigProvider: pluginRequestConfigProvider,
+		logger:                      log.New("plugin.context"),
 	}
 }
 
 type Provider struct {
-	cfg                   *setting.Cfg
-	pluginEnvVars         *envvars.Service
-	cacheService          *localcache.CacheService
-	pluginStore           pluginstore.Store
-	dataSourceService     datasources.DataSourceService
-	pluginSettingsService pluginsettings.Service
-	logger                log.Logger
+	cfg                         *setting.Cfg
+	pluginRequestConfigProvider pluginconfig.PluginRequestConfigProvider
+	cacheService                *localcache.CacheService
+	pluginStore                 pluginstore.Store
+	dataSourceCache             datasources.CacheService
+	dataSourceService           datasources.DataSourceService
+	pluginSettingsService       pluginsettings.Service
+	logger                      log.Logger
 }
 
-// Get allows getting plugin context by its ID. If datasourceUID is not empty string
-// then PluginContext.DataSourceInstanceSettings will be resolved and appended to
-// returned context.
+// Get will retrieve plugin context by the provided pluginID and orgID.
+// This is intended to be used for app plugin requests.
+// PluginContext.AppInstanceSettings will be resolved and appended to the returned context.
 // Note: identity.Requester can be nil.
 func (p *Provider) Get(ctx context.Context, pluginID string, user identity.Requester, orgID int64) (backend.PluginContext, error) {
 	plugin, exists := p.pluginStore.Plugin(ctx, pluginID)
@@ -64,7 +66,7 @@ func (p *Provider) Get(ctx context.Context, pluginID string, user identity.Reque
 	}
 
 	pCtx := backend.PluginContext{
-		PluginID:      pluginID,
+		PluginID:      plugin.ID,
 		PluginVersion: plugin.Info.Version,
 	}
 	if user != nil && !user.IsNil() {
@@ -80,6 +82,9 @@ func (p *Provider) Get(ctx context.Context, pluginID string, user identity.Reque
 		pCtx.AppInstanceSettings = appSettings
 	}
 
+	settings := p.pluginRequestConfigProvider.PluginRequestConfig(ctx, pluginID)
+	pCtx.GrafanaConfig = backend.NewGrafanaCfg(settings)
+
 	ua, err := useragent.New(p.cfg.BuildVersion, runtime.GOOS, runtime.GOARCH)
 	if err != nil {
 		p.logger.Warn("Could not create user agent", "error", err)
@@ -89,9 +94,10 @@ func (p *Provider) Get(ctx context.Context, pluginID string, user identity.Reque
 	return pCtx, nil
 }
 
-// GetWithDataSource allows getting plugin context by its ID and PluginContext.DataSourceInstanceSettings will be
-// resolved and appended to the returned context.
-// Note: *user.SignedInUser can be nil.
+// GetWithDataSource will retrieve plugin context by the provided pluginID and datasource.
+// This is intended to be used for datasource plugin requests.
+// PluginContext.DataSourceInstanceSettings will be resolved and appended to the returned context.
+// Note: identity.Requester can be nil.
 func (p *Provider) GetWithDataSource(ctx context.Context, pluginID string, user identity.Requester, ds *datasources.DataSource) (backend.PluginContext, error) {
 	plugin, exists := p.pluginStore.Plugin(ctx, pluginID)
 	if !exists {
@@ -99,7 +105,7 @@ func (p *Provider) GetWithDataSource(ctx context.Context, pluginID string, user
 	}
 
 	pCtx := backend.PluginContext{
-		PluginID:      pluginID,
+		PluginID:      plugin.ID,
 		PluginVersion: plugin.Info.Version,
 	}
 	if user != nil && !user.IsNil() {
@@ -113,7 +119,55 @@ func (p *Provider) GetWithDataSource(ctx context.Context, pluginID string, user
 	}
 	pCtx.DataSourceInstanceSettings = datasourceSettings
 
-	settings := p.pluginEnvVars.GetConfigMap(ctx, pluginID, plugin.ExternalService)
+	settings := p.pluginRequestConfigProvider.PluginRequestConfig(ctx, pluginID)
+	pCtx.GrafanaConfig = backend.NewGrafanaCfg(settings)
+
+	ua, err := useragent.New(p.cfg.BuildVersion, runtime.GOOS, runtime.GOARCH)
+	if err != nil {
+		p.logger.Warn("Could not create user agent", "error", err)
+	}
+	pCtx.UserAgent = ua
+
+	return pCtx, nil
+}
+
+func (p *Provider) GetDataSourceInstanceSettings(ctx context.Context, uid string) (*backend.DataSourceInstanceSettings, error) {
+	user, err := appcontext.User(ctx)
+	if err != nil {
+		return nil, err
+	}
+	ds, err := p.dataSourceCache.GetDatasourceByUID(ctx, uid, user, false)
+	if err != nil {
+		return nil, err
+	}
+	return adapters.ModelToInstanceSettings(ds, p.decryptSecureJsonDataFn(ctx))
+}
+
+// PluginContextForDataSource will retrieve plugin context by the provided pluginID and datasource UID / K8s name.
+// This is intended to be used for datasource API server plugin requests.
+func (p *Provider) PluginContextForDataSource(ctx context.Context, datasourceSettings *backend.DataSourceInstanceSettings) (backend.PluginContext, error) {
+	pluginID := datasourceSettings.Type
+	plugin, exists := p.pluginStore.Plugin(ctx, pluginID)
+	if !exists {
+		return backend.PluginContext{}, plugins.ErrPluginNotRegistered
+	}
+
+	user, err := appcontext.User(ctx)
+	if err != nil {
+		return backend.PluginContext{}, err
+	}
+	pCtx := backend.PluginContext{
+		PluginID:      plugin.ID,
+		PluginVersion: plugin.Info.Version,
+	}
+	if user != nil && !user.IsNil() {
+		pCtx.OrgID = user.GetOrgID()
+		pCtx.User = adapters.BackendUserFromSignedInUser(user)
+	}
+
+	pCtx.DataSourceInstanceSettings = datasourceSettings
+
+	settings := p.pluginRequestConfigProvider.PluginRequestConfig(ctx, pluginID)
 	pCtx.GrafanaConfig = backend.NewGrafanaCfg(settings)
 
 	ua, err := useragent.New(p.cfg.BuildVersion, runtime.GOOS, runtime.GOARCH)
diff --git a/pkg/services/pluginsintegration/plugincontext/plugincontext_test.go b/pkg/services/pluginsintegration/plugincontext/plugincontext_test.go
new file mode 100644
index 0000000000000..feec2e53db072
--- /dev/null
+++ b/pkg/services/pluginsintegration/plugincontext/plugincontext_test.go
@@ -0,0 +1,79 @@
+package plugincontext_test
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/infra/db/dbtest"
+	"github.com/grafana/grafana/pkg/infra/localcache"
+	"github.com/grafana/grafana/pkg/plugins"
+	pluginFakes "github.com/grafana/grafana/pkg/plugins/manager/fakes"
+	"github.com/grafana/grafana/pkg/plugins/manager/registry"
+	"github.com/grafana/grafana/pkg/services/datasources"
+	fakeDatasources "github.com/grafana/grafana/pkg/services/datasources/fakes"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginconfig"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
+	pluginSettings "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings/service"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
+	secretstest "github.com/grafana/grafana/pkg/services/secrets/fakes"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+func TestGet(t *testing.T) {
+	const (
+		pluginID = "plugin-id"
+		alias    = "alias"
+	)
+
+	preg := registry.NewInMemory()
+	require.NoError(t, preg.Add(context.Background(), &plugins.Plugin{
+		JSONData: plugins.JSONData{
+			ID:       pluginID,
+			AliasIDs: []string{alias},
+		},
+	}))
+
+	cfg := setting.NewCfg()
+	ds := &fakeDatasources.FakeDataSourceService{}
+	db := &dbtest.FakeDB{ExpectedError: pluginsettings.ErrPluginSettingNotFound}
+	pcp := plugincontext.ProvideService(cfg, localcache.ProvideService(),
+		pluginstore.New(preg, &pluginFakes.FakeLoader{}), &fakeDatasources.FakeCacheService{},
+		ds, pluginSettings.ProvideService(db, secretstest.NewFakeSecretsService()), pluginconfig.NewFakePluginRequestConfigProvider(),
+	)
+	identity := &user.SignedInUser{OrgID: int64(1), Login: "admin"}
+
+	for _, tc := range []struct {
+		name  string
+		input string
+	}{
+		{"with id", pluginID},
+		{"with alias", alias},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			t.Run("Get", func(t *testing.T) {
+				pCtx, err := pcp.Get(context.Background(), tc.input, identity, identity.OrgID)
+				require.NoError(t, err)
+				require.Equal(t, pluginID, pCtx.PluginID)
+				require.NotNil(t, pCtx.GrafanaConfig)
+			})
+
+			t.Run("GetWithDataSource", func(t *testing.T) {
+				pCtx, err := pcp.GetWithDataSource(context.Background(), tc.input, identity, &datasources.DataSource{
+					ID:       1,
+					OrgID:    1,
+					Name:     "test",
+					Type:     pluginID,
+					JsonData: simplejson.New(),
+				})
+				require.NoError(t, err)
+				require.Equal(t, pluginID, pCtx.PluginID)
+				require.NotNil(t, pCtx.GrafanaConfig)
+			})
+		})
+	}
+}
diff --git a/pkg/services/pluginsintegration/pluginexternal/check.go b/pkg/services/pluginsintegration/pluginexternal/check.go
new file mode 100644
index 0000000000000..f96f60653b20a
--- /dev/null
+++ b/pkg/services/pluginsintegration/pluginexternal/check.go
@@ -0,0 +1,43 @@
+package pluginexternal
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/plugins/log"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+type Service struct {
+	cfg         *setting.Cfg
+	logger      log.Logger
+	pluginStore pluginstore.Store
+}
+
+func ProvideService(
+	cfg *setting.Cfg, pluginStore pluginstore.Store,
+) (*Service, error) {
+	logger := log.New("datasources")
+	s := &Service{
+		cfg:         cfg,
+		logger:      logger,
+		pluginStore: pluginStore,
+	}
+	return s, nil
+}
+
+func (s *Service) Run(ctx context.Context) error {
+	s.validateExternal()
+	return ctx.Err()
+}
+
+func (s *Service) validateExternal() {
+	for pluginID, pluginCfg := range s.cfg.PluginSettings {
+		if pluginCfg["as_external"] == "true" {
+			_, exists := s.pluginStore.Plugin(context.Background(), pluginID)
+			if !exists {
+				s.logger.Error("Core plugin expected to be loaded as external, but it is missing", "pluginID", pluginID)
+			}
+		}
+	}
+}
diff --git a/pkg/services/pluginsintegration/pluginexternal/check_test.go b/pkg/services/pluginsintegration/pluginexternal/check_test.go
new file mode 100644
index 0000000000000..68cfb68dcfb5e
--- /dev/null
+++ b/pkg/services/pluginsintegration/pluginexternal/check_test.go
@@ -0,0 +1,53 @@
+package pluginexternal
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/log"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/stretchr/testify/require"
+)
+
+func TestService_validateExternal(t *testing.T) {
+	cfg := setting.NewCfg()
+	cfg.PluginSettings = setting.PluginSettings{
+		"grafana-testdata-datasource": map[string]string{
+			"as_external": "true",
+		},
+	}
+
+	t.Run("should not log error if core plugin is loaded as external", func(t *testing.T) {
+		l := log.NewTestLogger()
+		s := &Service{
+			cfg:    cfg,
+			logger: l,
+			pluginStore: &pluginstore.FakePluginStore{
+				PluginList: []pluginstore.Plugin{
+					{
+						JSONData: plugins.JSONData{
+							ID: "grafana-testdata-datasource",
+						},
+					},
+				},
+			},
+		}
+		s.validateExternal()
+		require.Equal(t, l.ErrorLogs.Calls, 0)
+	})
+
+	t.Run("should log error if a core plugin is missing", func(t *testing.T) {
+		l := log.NewTestLogger()
+		s := &Service{
+			cfg:    cfg,
+			logger: l,
+			pluginStore: &pluginstore.FakePluginStore{
+				PluginList: []pluginstore.Plugin{},
+			},
+		}
+		s.validateExternal()
+		require.Equal(t, l.ErrorLogs.Calls, 1)
+		require.Contains(t, l.ErrorLogs.Message, "Core plugin expected to be loaded as external")
+	})
+}
diff --git a/pkg/services/pluginsintegration/plugins_integration_test.go b/pkg/services/pluginsintegration/plugins_integration_test.go
index c0d75900477c8..f574bff08ab2e 100644
--- a/pkg/services/pluginsintegration/plugins_integration_test.go
+++ b/pkg/services/pluginsintegration/plugins_integration_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/grafana/grafana-azure-sdk-go/azsettings"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/stretchr/testify/require"
@@ -17,16 +17,16 @@ import (
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin/coreplugin"
-	"github.com/grafana/grafana/pkg/plugins/manager/registry"
-	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 	"github.com/grafana/grafana/pkg/services/searchV2"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor"
 	cloudmonitoring "github.com/grafana/grafana/pkg/tsdb/cloud-monitoring"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch"
 	"github.com/grafana/grafana/pkg/tsdb/elasticsearch"
+	postgres "github.com/grafana/grafana/pkg/tsdb/grafana-postgresql-datasource"
 	pyroscope "github.com/grafana/grafana/pkg/tsdb/grafana-pyroscope-datasource"
 	testdatasource "github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource"
 	"github.com/grafana/grafana/pkg/tsdb/grafanads"
@@ -37,11 +37,14 @@ import (
 	"github.com/grafana/grafana/pkg/tsdb/mysql"
 	"github.com/grafana/grafana/pkg/tsdb/opentsdb"
 	"github.com/grafana/grafana/pkg/tsdb/parca"
-	"github.com/grafana/grafana/pkg/tsdb/postgres"
 	"github.com/grafana/grafana/pkg/tsdb/prometheus"
 	"github.com/grafana/grafana/pkg/tsdb/tempo"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationPluginManager(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
@@ -52,50 +55,42 @@ func TestIntegrationPluginManager(t *testing.T) {
 	bundledPluginsPath, err := filepath.Abs("../../../plugins-bundled/internal")
 	require.NoError(t, err)
 
-	// We use the raw config here as it forms the basis for the setting.Provider implementation
-	// The plugin manager also relies directly on the setting.Cfg struct to provide Grafana specific
-	// properties such as the loading paths
-	raw, err := ini.Load([]byte(`
-		app_mode = production
-
-		[plugin.test-app]
-		path=../../plugins/manager/testdata/test-app
-
-		[plugin.test-panel]
-		not=included
-		`),
-	)
-	require.NoError(t, err)
-
+	features := featuremgmt.WithFeatures()
 	cfg := &setting.Cfg{
-		Raw:                    raw,
-		StaticRootPath:         staticRootPath,
-		BundledPluginsPath:     bundledPluginsPath,
-		Azure:                  &azsettings.AzureSettings{},
-		IsFeatureToggleEnabled: func(_ string) bool { return false },
+		Raw:                ini.Empty(),
+		StaticRootPath:     staticRootPath,
+		BundledPluginsPath: bundledPluginsPath,
+		Azure:              &azsettings.AzureSettings{},
+		PluginSettings: map[string]map[string]string{
+			"test-app": {
+				"path": "../../plugins/manager/testdata/test-app",
+			},
+			"test-panel": {
+				"not": "included",
+			},
+		},
 	}
 
 	tracer := tracing.InitializeTracerForTest()
-	features := featuremgmt.WithFeatures()
 
 	hcp := httpclient.NewProvider()
-	am := azuremonitor.ProvideService(cfg, hcp, features)
-	cw := cloudwatch.ProvideService(cfg, hcp, features)
-	cm := cloudmonitoring.ProvideService(hcp, tracer)
+	am := azuremonitor.ProvideService(hcp)
+	cw := cloudwatch.ProvideService(hcp)
+	cm := cloudmonitoring.ProvideService(hcp)
 	es := elasticsearch.ProvideService(hcp, tracer)
 	grap := graphite.ProvideService(hcp, tracer)
-	idb := influxdb.ProvideService(hcp)
+	idb := influxdb.ProvideService(hcp, features)
 	lk := loki.ProvideService(hcp, features, tracer)
 	otsdb := opentsdb.ProvideService(hcp)
-	pr := prometheus.ProvideService(hcp, cfg, features)
+	pr := prometheus.ProvideService(hcp)
 	tmpo := tempo.ProvideService(hcp)
 	td := testdatasource.ProvideService()
 	pg := postgres.ProvideService(cfg)
-	my := mysql.ProvideService(cfg, hcp)
+	my := mysql.ProvideService()
 	ms := mssql.ProvideService(cfg)
 	sv2 := searchV2.ProvideService(cfg, db.InitTestDB(t), nil, nil, tracer, features, nil, nil, nil)
 	graf := grafanads.ProvideService(sv2, nil)
-	pyroscope := pyroscope.ProvideService(hcp, acimpl.ProvideAccessControl(cfg))
+	pyroscope := pyroscope.ProvideService(hcp)
 	parca := parca.ProvideService(hcp)
 	coreRegistry := coreplugin.ProvideCoreRegistry(tracing.InitializeTracerForTest(), am, cw, cm, es, grap, idb, lk, otsdb, pr, tmpo, td, pg, my, ms, graf, pyroscope, parca)
 
@@ -103,8 +98,7 @@ func TestIntegrationPluginManager(t *testing.T) {
 
 	ctx := context.Background()
 	verifyCorePluginCatalogue(t, ctx, testCtx.PluginStore)
-	verifyBundledPlugins(t, ctx, testCtx.PluginStore)
-	verifyPluginStaticRoutes(t, ctx, testCtx.PluginStore, testCtx.PluginRegistry)
+	verifyPluginStaticRoutes(t, ctx, testCtx.PluginStore, testCtx.PluginStore)
 	verifyBackendProcesses(t, testCtx.PluginRegistry.Plugins(ctx))
 	verifyPluginQuery(t, ctx, testCtx.PluginClient)
 }
@@ -138,7 +132,6 @@ func verifyCorePluginCatalogue(t *testing.T, ctx context.Context, ps *pluginstor
 	t.Helper()
 
 	expPanels := map[string]struct{}{
-		"alertGroups":    {},
 		"alertlist":      {},
 		"annolist":       {},
 		"barchart":       {},
@@ -175,8 +168,8 @@ func verifyCorePluginCatalogue(t *testing.T, ctx context.Context, ps *pluginstor
 
 	expDataSources := map[string]struct{}{
 		"cloudwatch":                       {},
-		"stackdriver":                      {},
 		"grafana-azure-monitor-datasource": {},
+		"stackdriver":                      {},
 		"elasticsearch":                    {},
 		"graphite":                         {},
 		"influxdb":                         {},
@@ -185,13 +178,12 @@ func verifyCorePluginCatalogue(t *testing.T, ctx context.Context, ps *pluginstor
 		"prometheus":                       {},
 		"tempo":                            {},
 		"grafana-testdata-datasource":      {},
-		"postgres":                         {},
+		"grafana-postgresql-datasource":    {},
 		"mysql":                            {},
 		"mssql":                            {},
 		"grafana":                          {},
 		"alertmanager":                     {},
 		"dashboard":                        {},
-		"input":                            {},
 		"jaeger":                           {},
 		"mixed":                            {},
 		"zipkin":                           {},
@@ -233,45 +225,17 @@ func verifyCorePluginCatalogue(t *testing.T, ctx context.Context, ps *pluginstor
 	require.Equal(t, len(expPanels)+len(expDataSources)+len(expApps), len(ps.Plugins(ctx)))
 }
 
-func verifyBundledPlugins(t *testing.T, ctx context.Context, ps *pluginstore.Service) {
-	t.Helper()
-
-	dsPlugins := make(map[string]struct{})
-	for _, p := range ps.Plugins(ctx, plugins.TypeDataSource) {
-		dsPlugins[p.ID] = struct{}{}
-	}
-
-	inputPlugin, exists := ps.Plugin(ctx, "input")
-	require.True(t, exists)
-	require.NotEqual(t, pluginstore.Plugin{}, inputPlugin)
-	require.NotNil(t, dsPlugins["input"])
-
-	pluginRoutes := make(map[string]*plugins.StaticRoute)
-	for _, r := range ps.Routes(ctx) {
-		pluginRoutes[r.PluginID] = r
-	}
-
-	for _, pluginID := range []string{"input"} {
-		require.Contains(t, pluginRoutes, pluginID)
-		require.Equal(t, pluginRoutes[pluginID].Directory, inputPlugin.Base())
-	}
-}
-
-func verifyPluginStaticRoutes(t *testing.T, ctx context.Context, rr plugins.StaticRouteResolver, reg registry.Service) {
+func verifyPluginStaticRoutes(t *testing.T, ctx context.Context, rr plugins.StaticRouteResolver, ps *pluginstore.Service) {
 	routes := make(map[string]*plugins.StaticRoute)
 	for _, route := range rr.Routes(ctx) {
 		routes[route.PluginID] = route
 	}
 
-	require.Len(t, routes, 2)
-
-	inputPlugin, _ := reg.Plugin(ctx, "input")
-	require.NotNil(t, routes["input"])
-	require.Equal(t, routes["input"].Directory, inputPlugin.FS.Base())
+	require.Len(t, routes, 1)
 
-	testAppPlugin, _ := reg.Plugin(ctx, "test-app")
+	testAppPlugin, _ := ps.Plugin(ctx, "test-app")
 	require.Contains(t, routes, "test-app")
-	require.Equal(t, routes["test-app"].Directory, testAppPlugin.FS.Base())
+	require.Equal(t, routes["test-app"].Directory, testAppPlugin.Base())
 }
 
 func verifyBackendProcesses(t *testing.T, ps []*plugins.Plugin) {
diff --git a/pkg/services/pluginsintegration/pluginsettings/service/service_test.go b/pkg/services/pluginsintegration/pluginsettings/service/service_test.go
index e76d1aedf2829..44b7ccea597fb 100644
--- a/pkg/services/pluginsintegration/pluginsettings/service/service_test.go
+++ b/pkg/services/pluginsintegration/pluginsettings/service/service_test.go
@@ -12,8 +12,13 @@ import (
 	"github.com/grafana/grafana/pkg/services/secrets"
 	"github.com/grafana/grafana/pkg/services/secrets/fakes"
 	secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestService_DecryptedValuesCache(t *testing.T) {
 	t.Run("When plugin settings hasn't been updated, encrypted JSON should be fetched from cache", func(t *testing.T) {
 		ctx := context.Background()
diff --git a/pkg/services/pluginsintegration/pluginsintegration.go b/pkg/services/pluginsintegration/pluginsintegration.go
index 3ba43f36c76bc..5c67ebf1eabd5 100644
--- a/pkg/services/pluginsintegration/pluginsintegration.go
+++ b/pkg/services/pluginsintegration/pluginsintegration.go
@@ -2,6 +2,7 @@ package pluginsintegration
 
 import (
 	"github.com/google/wire"
+
 	"github.com/prometheus/client_golang/prometheus"
 
 	"github.com/grafana/grafana/pkg/infra/tracing"
@@ -9,7 +10,7 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/auth"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin/coreplugin"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin/provider"
-	pCfg "github.com/grafana/grafana/pkg/plugins/config"
+	"github.com/grafana/grafana/pkg/plugins/envvars"
 	"github.com/grafana/grafana/pkg/plugins/log"
 	"github.com/grafana/grafana/pkg/plugins/manager/client"
 	"github.com/grafana/grafana/pkg/plugins/manager/filestore"
@@ -35,28 +36,34 @@ import (
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/angularinspector"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/angularpatternsstore"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/clientmiddleware"
-	"github.com/grafana/grafana/pkg/services/pluginsintegration/config"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/keyretriever"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/keyretriever/dynamic"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/keystore"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/licensing"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/loader"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pipeline"
-	"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginconfig"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginerrs"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginexternal"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
 	pluginSettings "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings/service"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/renderer"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/serviceregistration"
+	"github.com/grafana/grafana/pkg/services/rendering"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
 // WireSet provides a wire.ProviderSet of plugin providers.
 var WireSet = wire.NewSet(
-	config.ProvideConfig,
+	pluginconfig.ProvidePluginManagementConfig,
+	pluginconfig.ProvidePluginInstanceConfig,
+	pluginconfig.NewEnvVarsProvider,
+	wire.Bind(new(envvars.Provider), new(*pluginconfig.EnvVarsProvider)),
+	pluginconfig.NewRequestConfigProvider,
+	wire.Bind(new(pluginconfig.PluginRequestConfigProvider), new(*pluginconfig.RequestConfigProvider)),
 	pluginstore.ProvideService,
 	wire.Bind(new(pluginstore.Store), new(*pluginstore.Service)),
-	wire.Bind(new(plugins.RendererManager), new(*pluginstore.Service)),
 	wire.Bind(new(plugins.SecretsPluginManager), new(*pluginstore.Service)),
 	wire.Bind(new(plugins.StaticRouteResolver), new(*pluginstore.Service)),
 	process.ProvideService,
@@ -93,7 +100,6 @@ var WireSet = wire.NewSet(
 	wire.Bind(new(registry.Service), new(*registry.InMemory)),
 	repo.ProvideService,
 	wire.Bind(new(repo.Service), new(*repo.Manager)),
-	plugincontext.ProvideService,
 	licensing.ProvideLicensing,
 	wire.Bind(new(plugins.Licensing), new(*licensing.Service)),
 	wire.Bind(new(sources.Registry), new(*sources.Service)),
@@ -111,6 +117,9 @@ var WireSet = wire.NewSet(
 	dynamic.ProvideService,
 	serviceregistration.ProvideService,
 	wire.Bind(new(auth.ExternalServiceRegistry), new(*serviceregistration.Service)),
+	renderer.ProvideService,
+	wire.Bind(new(rendering.PluginManager), new(*renderer.Manager)),
+	pluginexternal.ProvideService,
 )
 
 // WireExtensionSet provides a wire.ProviderSet of plugin providers that can be
@@ -127,7 +136,7 @@ var WireExtensionSet = wire.NewSet(
 )
 
 func ProvideClientDecorator(
-	cfg *setting.Cfg, pCfg *pCfg.Cfg,
+	cfg *setting.Cfg,
 	pluginRegistry registry.Service,
 	oAuthTokenService oauthtoken.OAuthTokenService,
 	tracer tracing.Tracer,
@@ -135,40 +144,44 @@ func ProvideClientDecorator(
 	features *featuremgmt.FeatureManager,
 	promRegisterer prometheus.Registerer,
 ) (*client.Decorator, error) {
-	return NewClientDecorator(cfg, pCfg, pluginRegistry, oAuthTokenService, tracer, cachingService, features, promRegisterer, pluginRegistry)
+	return NewClientDecorator(cfg, pluginRegistry, oAuthTokenService, tracer, cachingService, features, promRegisterer, pluginRegistry)
 }
 
 func NewClientDecorator(
-	cfg *setting.Cfg, pCfg *pCfg.Cfg,
+	cfg *setting.Cfg,
 	pluginRegistry registry.Service, oAuthTokenService oauthtoken.OAuthTokenService,
 	tracer tracing.Tracer, cachingService caching.CachingService, features *featuremgmt.FeatureManager,
 	promRegisterer prometheus.Registerer, registry registry.Service,
 ) (*client.Decorator, error) {
-	c := client.ProvideService(pluginRegistry, pCfg)
+	c := client.ProvideService(pluginRegistry)
 	middlewares := CreateMiddlewares(cfg, oAuthTokenService, tracer, cachingService, features, promRegisterer, registry)
 	return client.NewDecorator(c, middlewares...)
 }
 
 func CreateMiddlewares(cfg *setting.Cfg, oAuthTokenService oauthtoken.OAuthTokenService, tracer tracing.Tracer, cachingService caching.CachingService, features *featuremgmt.FeatureManager, promRegisterer prometheus.Registerer, registry registry.Service) []plugins.ClientMiddleware {
-	skipCookiesNames := []string{cfg.LoginCookieName}
 	middlewares := []plugins.ClientMiddleware{
+		clientmiddleware.NewPluginRequestMetaMiddleware(),
 		clientmiddleware.NewTracingMiddleware(tracer),
-		clientmiddleware.NewMetricsMiddleware(promRegisterer, registry, features),
+		clientmiddleware.NewMetricsMiddleware(promRegisterer, registry),
 		clientmiddleware.NewContextualLoggerMiddleware(),
-		clientmiddleware.NewLoggerMiddleware(cfg, log.New("plugin.instrumentation"), features),
+	}
+
+	if cfg.PluginLogBackendRequests {
+		middlewares = append(middlewares, clientmiddleware.NewLoggerMiddleware(log.New("plugin.instrumentation")))
+	}
+
+	skipCookiesNames := []string{cfg.LoginCookieName}
+
+	middlewares = append(middlewares,
 		clientmiddleware.NewTracingHeaderMiddleware(),
 		clientmiddleware.NewClearAuthHeadersMiddleware(),
 		clientmiddleware.NewOAuthTokenMiddleware(oAuthTokenService),
 		clientmiddleware.NewCookiesMiddleware(skipCookiesNames),
 		clientmiddleware.NewResourceResponseMiddleware(),
-	}
-
-	// Placing the new service implementation behind a feature flag until it is known to be stable
-	if features.IsEnabled(featuremgmt.FlagUseCachingService) {
-		middlewares = append(middlewares, clientmiddleware.NewCachingMiddlewareWithFeatureManager(cachingService, features))
-	}
+		clientmiddleware.NewCachingMiddlewareWithFeatureManager(cachingService, features),
+	)
 
-	if features.IsEnabled(featuremgmt.FlagIdForwarding) {
+	if features.IsEnabledGlobally(featuremgmt.FlagIdForwarding) {
 		middlewares = append(middlewares, clientmiddleware.NewForwardIDMiddleware())
 	}
 
@@ -176,7 +189,15 @@ func CreateMiddlewares(cfg *setting.Cfg, oAuthTokenService oauthtoken.OAuthToken
 		middlewares = append(middlewares, clientmiddleware.NewUserHeaderMiddleware())
 	}
 
+	if cfg.IPRangeACEnabled {
+		middlewares = append(middlewares, clientmiddleware.NewHostedGrafanaACHeaderMiddleware(cfg))
+	}
+
 	middlewares = append(middlewares, clientmiddleware.NewHTTPClientMiddleware())
 
+	// StatusSourceMiddleware should be at the very bottom, or any middlewares below it won't see the
+	// correct status source in their context.Context
+	middlewares = append(middlewares, clientmiddleware.NewStatusSourceMiddleware())
+
 	return middlewares
 }
diff --git a/pkg/services/pluginsintegration/pluginstore/fake.go b/pkg/services/pluginsintegration/pluginstore/fake.go
index 7c09fb15c67ca..ec85fb7b9372f 100644
--- a/pkg/services/pluginsintegration/pluginstore/fake.go
+++ b/pkg/services/pluginsintegration/pluginstore/fake.go
@@ -10,6 +10,12 @@ type FakePluginStore struct {
 	PluginList []Plugin
 }
 
+func NewFakePluginStore(ps ...Plugin) *FakePluginStore {
+	return &FakePluginStore{
+		PluginList: ps,
+	}
+}
+
 func (pr *FakePluginStore) Plugin(_ context.Context, pluginID string) (Plugin, bool) {
 	for _, v := range pr.PluginList {
 		if v.ID == pluginID {
diff --git a/pkg/services/pluginsintegration/pluginstore/plugins.go b/pkg/services/pluginsintegration/pluginstore/plugins.go
index 7ead33b9ab64b..45bd6fb106156 100644
--- a/pkg/services/pluginsintegration/pluginstore/plugins.go
+++ b/pkg/services/pluginsintegration/pluginstore/plugins.go
@@ -30,7 +30,7 @@ type Plugin struct {
 	Module  string
 	BaseURL string
 
-	AngularDetected bool
+	Angular plugins.AngularMeta
 
 	ExternalService *auth.ExternalService
 }
@@ -72,7 +72,8 @@ func ToGrafanaDTO(p *plugins.Plugin) Plugin {
 		SignatureError:    p.SignatureError,
 		Module:            p.Module,
 		BaseURL:           p.BaseURL,
-		AngularDetected:   p.AngularDetected,
 		ExternalService:   p.ExternalService,
+
+		Angular: p.Angular,
 	}
 }
diff --git a/pkg/services/pluginsintegration/pluginstore/store.go b/pkg/services/pluginsintegration/pluginstore/store.go
index 3fd4cadec5989..e4d188572d27b 100644
--- a/pkg/services/pluginsintegration/pluginstore/store.go
+++ b/pkg/services/pluginsintegration/pluginstore/store.go
@@ -18,6 +18,7 @@ var _ Store = (*Service)(nil)
 // Store is the publicly accessible storage for plugins.
 type Store interface {
 	// Plugin finds a plugin by its ID.
+	// Note: version is not required since Grafana only supports single versions of a plugin.
 	Plugin(ctx context.Context, pluginID string) (Plugin, bool)
 	// Plugins returns plugins by their requested type.
 	Plugins(ctx context.Context, pluginTypes ...plugins.Type) []Plugin
@@ -93,15 +94,6 @@ func (s *Service) Plugins(ctx context.Context, pluginTypes ...plugins.Type) []Pl
 	return pluginsList
 }
 
-func (s *Service) Renderer(ctx context.Context) *plugins.Plugin {
-	for _, p := range s.availablePlugins(ctx) {
-		if p.IsRenderer() {
-			return p
-		}
-	}
-	return nil
-}
-
 func (s *Service) SecretsManager(ctx context.Context) *plugins.Plugin {
 	for _, p := range s.availablePlugins(ctx) {
 		if p.IsSecretsManager() {
@@ -113,7 +105,7 @@ func (s *Service) SecretsManager(ctx context.Context) *plugins.Plugin {
 
 // plugin finds a plugin with `pluginID` from the registry that is not decommissioned
 func (s *Service) plugin(ctx context.Context, pluginID string) (*plugins.Plugin, bool) {
-	p, exists := s.pluginRegistry.Plugin(ctx, pluginID)
+	p, exists := s.pluginRegistry.Plugin(ctx, pluginID, "") // version is not required since Grafana only supports single versions of a plugin
 	if !exists {
 		return nil, false
 	}
diff --git a/pkg/services/pluginsintegration/pluginstore/store_test.go b/pkg/services/pluginsintegration/pluginstore/store_test.go
index 46890aa6fc55b..f6817b13d0060 100644
--- a/pkg/services/pluginsintegration/pluginstore/store_test.go
+++ b/pkg/services/pluginsintegration/pluginstore/store_test.go
@@ -146,25 +146,6 @@ func TestStore_Routes(t *testing.T) {
 	})
 }
 
-func TestStore_Renderer(t *testing.T) {
-	t.Run("Renderer returns a single (non-decommissioned) renderer plugin", func(t *testing.T) {
-		p1 := &plugins.Plugin{JSONData: plugins.JSONData{ID: "test-renderer", Type: plugins.TypeRenderer}}
-		p2 := &plugins.Plugin{JSONData: plugins.JSONData{ID: "test-panel", Type: plugins.TypePanel}}
-		p3 := &plugins.Plugin{JSONData: plugins.JSONData{ID: "test-app", Type: plugins.TypeApp}}
-
-		ps := New(&fakes.FakePluginRegistry{
-			Store: map[string]*plugins.Plugin{
-				p1.ID: p1,
-				p2.ID: p2,
-				p3.ID: p3,
-			},
-		}, &fakes.FakeLoader{})
-
-		r := ps.Renderer(context.Background())
-		require.Equal(t, p1, r)
-	})
-}
-
 func TestStore_SecretsManager(t *testing.T) {
 	t.Run("Renderer returns a single (non-decommissioned) secrets manager plugin", func(t *testing.T) {
 		p1 := &plugins.Plugin{JSONData: plugins.JSONData{ID: "test-renderer", Type: plugins.TypeRenderer}}
diff --git a/pkg/services/pluginsintegration/renderer/renderer.go b/pkg/services/pluginsintegration/renderer/renderer.go
new file mode 100644
index 0000000000000..178c37740be39
--- /dev/null
+++ b/pkg/services/pluginsintegration/renderer/renderer.go
@@ -0,0 +1,140 @@
+package renderer
+
+import (
+	"context"
+	"errors"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/backendplugin/pluginextensionv2"
+	"github.com/grafana/grafana/pkg/plugins/backendplugin/provider"
+	"github.com/grafana/grafana/pkg/plugins/config"
+	"github.com/grafana/grafana/pkg/plugins/envvars"
+	"github.com/grafana/grafana/pkg/plugins/manager/loader"
+	"github.com/grafana/grafana/pkg/plugins/manager/pipeline/bootstrap"
+	"github.com/grafana/grafana/pkg/plugins/manager/pipeline/discovery"
+	"github.com/grafana/grafana/pkg/plugins/manager/pipeline/initialization"
+	"github.com/grafana/grafana/pkg/plugins/manager/pipeline/termination"
+	"github.com/grafana/grafana/pkg/plugins/manager/pipeline/validation"
+	"github.com/grafana/grafana/pkg/plugins/manager/registry"
+	"github.com/grafana/grafana/pkg/plugins/manager/signature"
+	"github.com/grafana/grafana/pkg/plugins/manager/sources"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pipeline"
+	"github.com/grafana/grafana/pkg/services/rendering"
+)
+
+func ProvideService(cfg *config.PluginManagementCfg, pluginEnvProvider envvars.Provider,
+	registry registry.Service) (*Manager, error) {
+	l, err := createLoader(cfg, pluginEnvProvider, registry)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewManager(cfg, l), nil
+}
+
+type Manager struct {
+	cfg    *config.PluginManagementCfg
+	loader loader.Service
+	log    log.Logger
+
+	renderer *Plugin
+}
+
+func NewManager(cfg *config.PluginManagementCfg, loader loader.Service) *Manager {
+	return &Manager{
+		cfg:    cfg,
+		loader: loader,
+		log:    log.New("renderer.manager"),
+	}
+}
+
+type Plugin struct {
+	plugin *plugins.Plugin
+
+	started bool
+}
+
+func (p *Plugin) Client() (pluginextensionv2.RendererPlugin, error) {
+	if !p.started {
+		return nil, errors.New("renderer plugin not started")
+	}
+
+	if p.plugin.Renderer == nil {
+		return nil, errors.New("renderer client not available")
+	}
+
+	return p.plugin.Renderer, nil
+}
+
+func (p *Plugin) Start(ctx context.Context) error {
+	p.started = true
+	return p.plugin.Start(ctx)
+}
+
+func (p *Plugin) Version() string {
+	return p.plugin.JSONData.Info.Version
+}
+
+func (m *Manager) Renderer(ctx context.Context) (rendering.Plugin, bool) {
+	if m.renderer != nil {
+		return m.renderer, true
+	}
+
+	srcs, err := sources.DirAsLocalSources(m.cfg.PluginsPath, plugins.ClassExternal)
+	if err != nil {
+		m.log.Error("Failed to get renderer plugin sources", "error", err)
+		return nil, false
+	}
+
+	for _, src := range srcs {
+		ps, err := m.loader.Load(ctx, src)
+		if err != nil {
+			m.log.Error("Failed to load renderer plugin", "error", err)
+			return nil, false
+		}
+
+		if len(ps) >= 1 {
+			m.renderer = &Plugin{plugin: ps[0]}
+			return m.renderer, true
+		}
+	}
+
+	return nil, false
+}
+
+func createLoader(cfg *config.PluginManagementCfg, pluginEnvProvider envvars.Provider,
+	pr registry.Service) (loader.Service, error) {
+	d := discovery.New(cfg, discovery.Opts{
+		FindFilterFuncs: []discovery.FindFilterFunc{
+			discovery.NewPermittedPluginTypesFilterStep([]plugins.Type{plugins.TypeRenderer}),
+			func(ctx context.Context, class plugins.Class, bundles []*plugins.FoundBundle) ([]*plugins.FoundBundle, error) {
+				return pipeline.NewDuplicatePluginIDFilterStep(pr).Filter(ctx, bundles)
+			},
+		},
+	})
+	b := bootstrap.New(cfg, bootstrap.Opts{
+		DecorateFuncs: []bootstrap.DecorateFunc{}, // no decoration required
+	})
+	v := validation.New(cfg, validation.Opts{
+		ValidateFuncs: []validation.ValidateFunc{
+			validation.SignatureValidationStep(signature.NewValidator(signature.NewUnsignedAuthorizer(cfg))),
+		},
+	})
+	i := initialization.New(cfg, initialization.Opts{
+		InitializeFuncs: []initialization.InitializeFunc{
+			initialization.BackendClientInitStep(pluginEnvProvider, provider.New(provider.RendererProvider)),
+			initialization.PluginRegistrationStep(pr),
+		},
+	})
+	t, err := termination.New(cfg, termination.Opts{
+		TerminateFuncs: []termination.TerminateFunc{
+			termination.DeregisterStep(pr),
+		},
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return loader.New(d, b, v, i, t), nil
+}
diff --git a/pkg/services/pluginsintegration/renderer/renderer_test.go b/pkg/services/pluginsintegration/renderer/renderer_test.go
new file mode 100644
index 0000000000000..2f7f5d0c91337
--- /dev/null
+++ b/pkg/services/pluginsintegration/renderer/renderer_test.go
@@ -0,0 +1,78 @@
+package renderer
+
+import (
+	"context"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/config"
+	"github.com/grafana/grafana/pkg/plugins/manager/fakes"
+)
+
+func TestRenderer(t *testing.T) {
+	t.Run("Test Renderer will treat directories under plugins path as individual sources", func(t *testing.T) {
+		testdataDir := filepath.Join("testdata", "plugins")
+
+		numLoaded := 0
+		numUnloaded := 0
+		loader := &fakes.FakeLoader{
+			LoadFunc: func(ctx context.Context, src plugins.PluginSource) ([]*plugins.Plugin, error) {
+				require.True(t, src.PluginClass(ctx) == plugins.ClassExternal)
+				require.Len(t, src.PluginURIs(ctx), 1)
+				require.True(t, strings.HasPrefix(src.PluginURIs(ctx)[0], testdataDir))
+
+				numLoaded++
+				return []*plugins.Plugin{}, nil
+			},
+			UnloadFunc: func(_ context.Context, _ *plugins.Plugin) (*plugins.Plugin, error) {
+				numUnloaded++
+				return nil, nil
+			},
+		}
+		cfg := &config.PluginManagementCfg{PluginsPath: filepath.Join(testdataDir)}
+
+		m := NewManager(cfg, loader)
+
+		r, exists := m.Renderer(context.Background())
+		require.False(t, exists)
+		require.Equal(t, 4, numLoaded)
+		require.Equal(t, 0, numUnloaded)
+		require.Nil(t, r)
+	})
+
+	t.Run("Test Renderer load all directories until a plugin is returned", func(t *testing.T) {
+		testdataDir := filepath.Join("testdata", "plugins")
+
+		numLoaded := 0
+		numUnloaded := 0
+		p := &plugins.Plugin{
+			JSONData: plugins.JSONData{ID: "test"},
+		}
+		loader := &fakes.FakeLoader{
+			LoadFunc: func(ctx context.Context, src plugins.PluginSource) ([]*plugins.Plugin, error) {
+				numLoaded++
+				if strings.HasPrefix(src.PluginURIs(ctx)[0], filepath.Join(testdataDir, "renderer")) {
+					return []*plugins.Plugin{p}, nil
+				}
+				return []*plugins.Plugin{}, nil
+			},
+			UnloadFunc: func(_ context.Context, _ *plugins.Plugin) (*plugins.Plugin, error) {
+				numUnloaded++
+				return nil, nil
+			},
+		}
+		cfg := &config.PluginManagementCfg{PluginsPath: filepath.Join(testdataDir)}
+
+		m := NewManager(cfg, loader)
+
+		r, exists := m.Renderer(context.Background())
+		require.True(t, exists)
+		require.Equal(t, 3, numLoaded)
+		require.Equal(t, 0, numUnloaded)
+		require.NotNil(t, r)
+	})
+}
diff --git a/pkg/services/pluginsintegration/renderer/testdata/plugins/app/plugin.json b/pkg/services/pluginsintegration/renderer/testdata/plugins/app/plugin.json
new file mode 100644
index 0000000000000..14dfb7655afe8
--- /dev/null
+++ b/pkg/services/pluginsintegration/renderer/testdata/plugins/app/plugin.json
@@ -0,0 +1,3 @@
+{
+  "type": "app"
+}
diff --git a/pkg/services/pluginsintegration/renderer/testdata/plugins/datasource/plugin.json b/pkg/services/pluginsintegration/renderer/testdata/plugins/datasource/plugin.json
new file mode 100644
index 0000000000000..5c57cba8286a5
--- /dev/null
+++ b/pkg/services/pluginsintegration/renderer/testdata/plugins/datasource/plugin.json
@@ -0,0 +1,3 @@
+{
+  "type": "datasource"
+}
diff --git a/pkg/services/pluginsintegration/renderer/testdata/plugins/renderer/plugin.json b/pkg/services/pluginsintegration/renderer/testdata/plugins/renderer/plugin.json
new file mode 100644
index 0000000000000..6d423963a4b48
--- /dev/null
+++ b/pkg/services/pluginsintegration/renderer/testdata/plugins/renderer/plugin.json
@@ -0,0 +1,3 @@
+{
+  "type": "renderer"
+}
diff --git a/pkg/services/pluginsintegration/renderer/testdata/plugins/secrets-manager/plugin.json b/pkg/services/pluginsintegration/renderer/testdata/plugins/secrets-manager/plugin.json
new file mode 100644
index 0000000000000..635a3ff47b94b
--- /dev/null
+++ b/pkg/services/pluginsintegration/renderer/testdata/plugins/secrets-manager/plugin.json
@@ -0,0 +1,3 @@
+{
+  "type": "secretsmanager"
+}
diff --git a/pkg/services/pluginsintegration/serviceregistration/serviceregistration.go b/pkg/services/pluginsintegration/serviceregistration/serviceregistration.go
index 396e43f2565f0..f80ca8213bc8a 100644
--- a/pkg/services/pluginsintegration/serviceregistration/serviceregistration.go
+++ b/pkg/services/pluginsintegration/serviceregistration/serviceregistration.go
@@ -2,61 +2,76 @@ package serviceregistration
 
 import (
 	"context"
+	"errors"
 
 	"github.com/grafana/grafana/pkg/plugins/auth"
-	"github.com/grafana/grafana/pkg/plugins/plugindef"
+	"github.com/grafana/grafana/pkg/plugins/log"
+	"github.com/grafana/grafana/pkg/plugins/pfs"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/extsvcauth"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
 )
 
 type Service struct {
-	os extsvcauth.ExternalServiceRegistry
+	featureEnabled bool
+	log            log.Logger
+	reg            extsvcauth.ExternalServiceRegistry
+	settingsSvc    pluginsettings.Service
 }
 
-func ProvideService(os extsvcauth.ExternalServiceRegistry) *Service {
+func ProvideService(features featuremgmt.FeatureToggles, reg extsvcauth.ExternalServiceRegistry, settingsSvc pluginsettings.Service) *Service {
 	s := &Service{
-		os: os,
+		featureEnabled: features.IsEnabledGlobally(featuremgmt.FlagExternalServiceAccounts),
+		log:            log.New("plugins.external.registration"),
+		reg:            reg,
+		settingsSvc:    settingsSvc,
 	}
 	return s
 }
 
+func (s *Service) HasExternalService(ctx context.Context, pluginID string) (bool, error) {
+	if !s.featureEnabled {
+		s.log.Debug("Skipping HasExternalService call. The feature is behind a feature toggle and needs to be enabled.")
+		return false, nil
+	}
+
+	return s.reg.HasExternalService(ctx, pluginID)
+}
+
 // RegisterExternalService is a simplified wrapper around SaveExternalService for the plugin use case.
-func (s *Service) RegisterExternalService(ctx context.Context, svcName string, svc *plugindef.ExternalServiceRegistration) (*auth.ExternalService, error) {
-	impersonation := extsvcauth.ImpersonationCfg{}
-	if svc.Impersonation != nil {
-		impersonation.Permissions = toAccessControlPermissions(svc.Impersonation.Permissions)
-		if svc.Impersonation.Enabled != nil {
-			impersonation.Enabled = *svc.Impersonation.Enabled
-		} else {
-			impersonation.Enabled = true
-		}
-		if svc.Impersonation.Groups != nil {
-			impersonation.Groups = *svc.Impersonation.Groups
-		} else {
-			impersonation.Groups = true
-		}
+func (s *Service) RegisterExternalService(ctx context.Context, pluginID string, pType pfs.Type, svc *pfs.IAM) (*auth.ExternalService, error) {
+	ctxLogger := s.log.FromContext(ctx)
+
+	if !s.featureEnabled {
+		ctxLogger.Warn("Skipping External Service Registration. The feature is behind a feature toggle and needs to be enabled.")
+		return nil, nil
 	}
 
+	// Datasource plugins can only be enabled
+	enabled := true
+	// App plugins can be disabled
+	if pType == pfs.TypeApp {
+		settings, err := s.settingsSvc.GetPluginSettingByPluginID(ctx, &pluginsettings.GetByPluginIDArgs{PluginID: pluginID})
+		if err != nil && !errors.Is(err, pluginsettings.ErrPluginSettingNotFound) {
+			return nil, err
+		}
+
+		enabled = (settings != nil) && settings.Enabled
+	}
 	self := extsvcauth.SelfCfg{}
+	self.Enabled = enabled
 	if len(svc.Permissions) > 0 {
 		self.Permissions = toAccessControlPermissions(svc.Permissions)
-		self.Enabled = true
 	}
 
 	registration := &extsvcauth.ExternalServiceRegistration{
-		Name:          svcName,
-		Impersonation: impersonation,
-		Self:          self,
-	}
-
-	// Default authProvider now is ServiceAccounts
-	registration.AuthProvider = extsvcauth.ServiceAccounts
-	if svc.Impersonation != nil {
-		registration.AuthProvider = extsvcauth.OAuth2Server
-		registration.OAuthProviderCfg = &extsvcauth.OAuthProviderCfg{Key: &extsvcauth.KeyOption{Generate: true}}
+		Name:         pluginID,
+		Self:         self,
+		AuthProvider: extsvcauth.ServiceAccounts,
 	}
 
-	extSvc, err := s.os.SaveExternalService(ctx, registration)
+	extSvc, err := s.reg.SaveExternalService(ctx, registration)
 	if err != nil || extSvc == nil {
 		return nil, err
 	}
@@ -72,7 +87,7 @@ func (s *Service) RegisterExternalService(ctx context.Context, svcName string, s
 		PrivateKey:   privateKey}, nil
 }
 
-func toAccessControlPermissions(ps []plugindef.Permission) []accesscontrol.Permission {
+func toAccessControlPermissions(ps []pfs.Permission) []accesscontrol.Permission {
 	res := make([]accesscontrol.Permission, 0, len(ps))
 	for _, p := range ps {
 		scope := ""
@@ -86,3 +101,13 @@ func toAccessControlPermissions(ps []plugindef.Permission) []accesscontrol.Permi
 	}
 	return res
 }
+
+// RemoveExternalService removes the external service account associated to a plugin
+func (s *Service) RemoveExternalService(ctx context.Context, pluginID string) error {
+	if !s.featureEnabled {
+		s.log.Debug("Skipping External Service Removal. The feature is behind a feature toggle and needs to be enabled.")
+		return nil
+	}
+
+	return s.reg.RemoveExternalService(ctx, pluginID)
+}
diff --git a/pkg/services/pluginsintegration/test_helper.go b/pkg/services/pluginsintegration/test_helper.go
index b958b05681c84..2048eb0a7977e 100644
--- a/pkg/services/pluginsintegration/test_helper.go
+++ b/pkg/services/pluginsintegration/test_helper.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin/coreplugin"
@@ -28,8 +29,8 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/manager/sources"
 	"github.com/grafana/grafana/pkg/plugins/pluginscdn"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/services/pluginsintegration/config"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pipeline"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginconfig"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginerrs"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 	"github.com/grafana/grafana/pkg/setting"
@@ -42,7 +43,7 @@ type IntegrationTestCtx struct {
 }
 
 func CreateIntegrationTestCtx(t *testing.T, cfg *setting.Cfg, coreRegistry *coreplugin.Registry) *IntegrationTestCtx {
-	pCfg, err := config.ProvideConfig(setting.ProvideProvider(cfg), cfg, featuremgmt.WithFeatures())
+	pCfg, err := pluginconfig.ProvidePluginManagementConfig(cfg, setting.ProvideProvider(cfg), featuremgmt.WithFeatures())
 	require.NoError(t, err)
 
 	cdn := pluginscdn.ProvideService(pCfg)
@@ -54,7 +55,7 @@ func CreateIntegrationTestCtx(t *testing.T, cfg *setting.Cfg, coreRegistry *core
 	disc := pipeline.ProvideDiscoveryStage(pCfg, finder.NewLocalFinder(true), reg)
 	boot := pipeline.ProvideBootstrapStage(pCfg, signature.ProvideService(pCfg, statickey.New()), assetpath.ProvideService(pCfg, cdn))
 	valid := pipeline.ProvideValidationStage(pCfg, signature.NewValidator(signature.NewUnsignedAuthorizer(pCfg)), angularInspector, errTracker)
-	init := pipeline.ProvideInitializationStage(pCfg, reg, fakes.NewFakeLicensingService(), provider.ProvideService(coreRegistry), proc, &fakes.FakeAuthService{}, fakes.NewFakeRoleRegistry())
+	init := pipeline.ProvideInitializationStage(pCfg, reg, provider.ProvideService(coreRegistry), proc, &fakes.FakeAuthService{}, fakes.NewFakeRoleRegistry(), nil, tracing.InitializeTracerForTest())
 	term, err := pipeline.ProvideTerminationStage(pCfg, reg, proc)
 	require.NoError(t, err)
 
@@ -66,11 +67,11 @@ func CreateIntegrationTestCtx(t *testing.T, cfg *setting.Cfg, coreRegistry *core
 		Terminator:   term,
 	})
 
-	ps, err := pluginstore.ProvideService(reg, sources.ProvideService(cfg, pCfg), l)
+	ps, err := pluginstore.ProvideService(reg, sources.ProvideService(cfg), l)
 	require.NoError(t, err)
 
 	return &IntegrationTestCtx{
-		PluginClient:   client.ProvideService(reg, pCfg),
+		PluginClient:   client.ProvideService(reg),
 		PluginStore:    ps,
 		PluginRegistry: reg,
 	}
@@ -84,7 +85,7 @@ type LoaderOpts struct {
 	Initializer  initialization.Initializer
 }
 
-func CreateTestLoader(t *testing.T, cfg *pluginsCfg.Cfg, opts LoaderOpts) *loader.Loader {
+func CreateTestLoader(t *testing.T, cfg *pluginsCfg.PluginManagementCfg, opts LoaderOpts) *loader.Loader {
 	if opts.Discoverer == nil {
 		opts.Discoverer = pipeline.ProvideDiscoveryStage(cfg, finder.NewLocalFinder(cfg.DevMode), registry.ProvideService())
 	}
@@ -100,7 +101,7 @@ func CreateTestLoader(t *testing.T, cfg *pluginsCfg.Cfg, opts LoaderOpts) *loade
 	if opts.Initializer == nil {
 		reg := registry.ProvideService()
 		coreRegistry := coreplugin.NewRegistry(make(map[string]backendplugin.PluginFactoryFunc))
-		opts.Initializer = pipeline.ProvideInitializationStage(cfg, reg, fakes.NewFakeLicensingService(), provider.ProvideService(coreRegistry), process.ProvideService(), &fakes.FakeAuthService{}, fakes.NewFakeRoleRegistry())
+		opts.Initializer = pipeline.ProvideInitializationStage(cfg, reg, provider.ProvideService(coreRegistry), process.ProvideService(), &fakes.FakeAuthService{}, fakes.NewFakeRoleRegistry(), nil, tracing.InitializeTracerForTest())
 	}
 
 	if opts.Terminator == nil {
diff --git a/pkg/services/preference/prefimpl/pref.go b/pkg/services/preference/prefimpl/pref.go
index 976a01802a378..cf3bc80a9dc41 100644
--- a/pkg/services/preference/prefimpl/pref.go
+++ b/pkg/services/preference/prefimpl/pref.go
@@ -6,32 +6,34 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	pref "github.com/grafana/grafana/pkg/services/preference"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
 type Service struct {
 	store    store
-	cfg      *setting.Cfg
-	features *featuremgmt.FeatureManager
+	defaults pref.Preference
 }
 
-func ProvideService(db db.DB, cfg *setting.Cfg, features *featuremgmt.FeatureManager) pref.Service {
-	service := &Service{
-		cfg:      cfg,
-		features: features,
-	}
-	if features.IsEnabled(featuremgmt.FlagNewDBLibrary) {
-		service.store = &sqlxStore{
-			sess: db.GetSqlxSession(),
-		}
-	} else {
-		service.store = &sqlStore{
+func ProvideService(db db.DB, cfg *setting.Cfg) pref.Service {
+	return &Service{
+		store: &sqlStore{
 			db: db,
-		}
+		},
+		defaults: prefsFromConfig(cfg),
+	}
+}
+
+func prefsFromConfig(cfg *setting.Cfg) pref.Preference {
+	return pref.Preference{
+		Theme:           cfg.DefaultTheme,
+		Timezone:        cfg.DateFormats.DefaultTimezone,
+		WeekStart:       &cfg.DateFormats.DefaultWeekStart,
+		HomeDashboardID: 0,
+		JSONData: &pref.PreferenceJSONData{
+			Language: cfg.DefaultLanguage,
+		},
 	}
-	return service
 }
 
 func (s *Service) GetWithDefaults(ctx context.Context, query *pref.GetPreferenceWithDefaultsQuery) (*pref.Preference, error) {
@@ -217,16 +219,15 @@ func (s *Service) Patch(ctx context.Context, cmd *pref.PatchPreferenceCommand) e
 }
 
 func (s *Service) GetDefaults() *pref.Preference {
-	defaults := &pref.Preference{
-		Theme:           s.cfg.DefaultTheme,
-		Timezone:        s.cfg.DateFormats.DefaultTimezone,
-		WeekStart:       &s.cfg.DateFormats.DefaultWeekStart,
+	return &pref.Preference{
+		Theme:           s.defaults.Theme,
+		Timezone:        s.defaults.Timezone,
+		WeekStart:       s.defaults.WeekStart,
 		HomeDashboardID: 0,
-		JSONData:        &pref.PreferenceJSONData{},
+		JSONData: &pref.PreferenceJSONData{
+			Language: s.defaults.JSONData.Language,
+		},
 	}
-	defaults.JSONData.Language = s.cfg.DefaultLanguage
-
-	return defaults
 }
 
 func (s *Service) DeleteByUser(ctx context.Context, userID int64) error {
diff --git a/pkg/services/preference/prefimpl/pref_test.go b/pkg/services/preference/prefimpl/pref_test.go
index de666af5be28a..aea709d16cf1c 100644
--- a/pkg/services/preference/prefimpl/pref_test.go
+++ b/pkg/services/preference/prefimpl/pref_test.go
@@ -8,16 +8,15 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	pref "github.com/grafana/grafana/pkg/services/preference"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
 func TestGet_empty(t *testing.T) {
+	cfg := setting.NewCfg()
 	prefService := &Service{
 		store:    newFake(),
-		cfg:      setting.NewCfg(),
-		features: featuremgmt.WithFeatures(),
+		defaults: prefsFromConfig(cfg),
 	}
 	preference, err := prefService.Get(context.Background(), &pref.GetPreferenceQuery{})
 	require.NoError(t, err)
@@ -28,14 +27,15 @@ func TestGet_empty(t *testing.T) {
 }
 
 func TestGetDefaults(t *testing.T) {
+	cfg := setting.NewCfg()
+	cfg.DefaultLanguage = "en-US"
+	cfg.DefaultTheme = "light"
+	cfg.DateFormats.DefaultTimezone = "UTC"
 	prefService := &Service{
 		store:    newFake(),
-		cfg:      setting.NewCfg(),
-		features: featuremgmt.WithFeatures(),
+		defaults: prefsFromConfig(cfg),
 	}
-	prefService.cfg.DefaultLanguage = "en-US"
-	prefService.cfg.DefaultTheme = "light"
-	prefService.cfg.DateFormats.DefaultTimezone = "UTC"
+
 	weekStart := ""
 
 	t.Run("GetDefaults", func(t *testing.T) {
@@ -74,12 +74,12 @@ func TestGetDefaults(t *testing.T) {
 }
 
 func TestGetWithDefaults_withUserAndOrgPrefs(t *testing.T) {
+	cfg := setting.NewCfg()
+	cfg.DefaultLanguage = "en-US"
 	prefService := &Service{
 		store:    newFake(),
-		cfg:      setting.NewCfg(),
-		features: featuremgmt.WithFeatures(),
+		defaults: prefsFromConfig(cfg),
 	}
-	prefService.cfg.DefaultLanguage = "en-US"
 
 	weekStartOne := "1"
 	weekStartTwo := "2"
@@ -163,8 +163,7 @@ func TestGetDefaults_JSONData(t *testing.T) {
 	t.Run("users have precedence over org", func(t *testing.T) {
 		prefService := &Service{
 			store:    newFake(),
-			cfg:      setting.NewCfg(),
-			features: featuremgmt.WithFeatures(),
+			defaults: prefsFromConfig(setting.NewCfg()),
 		}
 
 		insertPrefs(t, prefService.store,
@@ -191,8 +190,7 @@ func TestGetDefaults_JSONData(t *testing.T) {
 	t.Run("user JSONData with missing language does not override org preference", func(t *testing.T) {
 		prefService := &Service{
 			store:    newFake(),
-			cfg:      setting.NewCfg(),
-			features: featuremgmt.WithFeatures(),
+			defaults: prefsFromConfig(setting.NewCfg()),
 		}
 
 		insertPrefs(t, prefService.store,
@@ -222,8 +220,7 @@ func TestGetDefaults_JSONData(t *testing.T) {
 	t.Run("teams have precedence over org and are read in ascending order", func(t *testing.T) {
 		prefService := &Service{
 			store:    newFake(),
-			cfg:      setting.NewCfg(),
-			features: featuremgmt.WithFeatures(),
+			defaults: prefsFromConfig(setting.NewCfg()),
 		}
 
 		insertPrefs(t, prefService.store,
@@ -260,8 +257,7 @@ func TestGetWithDefaults_teams(t *testing.T) {
 	weekStartTwo := "2"
 	prefService := &Service{
 		store:    newFake(),
-		cfg:      setting.NewCfg(),
-		features: featuremgmt.WithFeatures(),
+		defaults: prefsFromConfig(setting.NewCfg()),
 	}
 	insertPrefs(t, prefService.store,
 		pref.Preference{
@@ -307,8 +303,7 @@ func TestGetWithDefaults_teams(t *testing.T) {
 func TestPatch_toCreate(t *testing.T) {
 	prefService := &Service{
 		store:    newFake(),
-		cfg:      setting.NewCfg(),
-		features: featuremgmt.WithFeatures(),
+		defaults: prefsFromConfig(setting.NewCfg()),
 	}
 
 	themeValue := "light"
@@ -328,8 +323,7 @@ func TestPatch_toCreate(t *testing.T) {
 func TestSave(t *testing.T) {
 	prefService := &Service{
 		store:    newFake(),
-		cfg:      setting.NewCfg(),
-		features: featuremgmt.WithFeatures(),
+		defaults: prefsFromConfig(setting.NewCfg()),
 	}
 
 	t.Run("insert", func(t *testing.T) {
diff --git a/pkg/services/preference/prefimpl/sqlx_store.go b/pkg/services/preference/prefimpl/sqlx_store.go
deleted file mode 100644
index 224537e430fb5..0000000000000
--- a/pkg/services/preference/prefimpl/sqlx_store.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package prefimpl
-
-import (
-	"context"
-	"database/sql"
-	"errors"
-	"fmt"
-	"strings"
-
-	pref "github.com/grafana/grafana/pkg/services/preference"
-	"github.com/grafana/grafana/pkg/services/sqlstore/session"
-)
-
-type sqlxStore struct {
-	sess *session.SessionDB
-}
-
-func (s *sqlxStore) Get(ctx context.Context, query *pref.Preference) (*pref.Preference, error) {
-	var prefs pref.Preference
-	err := s.sess.Get(ctx, &prefs, "SELECT * from preferences WHERE org_id=? AND user_id=? AND team_id=?", query.OrgID, query.UserID, query.TeamID)
-	if err != nil && errors.Is(err, sql.ErrNoRows) {
-		return nil, pref.ErrPrefNotFound
-	}
-	return &prefs, err
-}
-
-func (s *sqlxStore) List(ctx context.Context, query *pref.Preference) ([]*pref.Preference, error) {
-	prefs := make([]*pref.Preference, 0)
-	params := make([]any, 0)
-	filter := ""
-
-	if len(query.Teams) > 0 {
-		filter = "(org_id=? AND team_id IN (?" + strings.Repeat(",?", len(query.Teams)-1) + ")) OR "
-		params = append(params, query.OrgID)
-		for _, v := range query.Teams {
-			params = append(params, v)
-		}
-	}
-
-	filter += "(org_id=? AND user_id=? AND team_id=0) OR (org_id=? AND team_id=0 AND user_id=0)"
-	params = append(params, query.OrgID)
-	params = append(params, query.UserID)
-	params = append(params, query.OrgID)
-	err := s.sess.Select(ctx, &prefs, fmt.Sprintf("SELECT * FROM preferences WHERE %s ORDER BY user_id ASC, team_id ASC", filter), params...)
-	return prefs, err
-}
-
-func (s *sqlxStore) Update(ctx context.Context, cmd *pref.Preference) error {
-	query := "UPDATE preferences SET org_id=:org_id, user_id=:user_id, team_id=:team_id, version=:version, home_dashboard_id=:home_dashboard_id, " +
-		"timezone=:timezone, week_start=:week_start, theme=:theme, created=:created, updated=:updated, json_data=:json_data WHERE id=:id"
-	_, err := s.sess.NamedExec(ctx, query, cmd)
-	return err
-}
-
-func (s *sqlxStore) Insert(ctx context.Context, cmd *pref.Preference) (int64, error) {
-	var ID int64
-	query := "INSERT INTO preferences (org_id, user_id, team_id, version, home_dashboard_id, timezone, week_start, theme, created, updated, json_data) VALUES " +
-		"(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"
-	ID, err := s.sess.ExecWithReturningId(
-		ctx, query, cmd.OrgID, cmd.UserID, cmd.TeamID, cmd.Version, cmd.HomeDashboardID,
-		cmd.Timezone, cmd.WeekStart, cmd.Theme, cmd.Created, cmd.Updated, cmd.JSONData)
-	return ID, err
-}
-
-func (s *sqlxStore) DeleteByUser(ctx context.Context, userID int64) error {
-	_, err := s.sess.Exec(ctx, "DELETE FROM preferences WHERE user_id=?", userID)
-	return err
-}
diff --git a/pkg/services/preference/prefimpl/sqlx_store_test.go b/pkg/services/preference/prefimpl/sqlx_store_test.go
deleted file mode 100644
index df6027e84ce47..0000000000000
--- a/pkg/services/preference/prefimpl/sqlx_store_test.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package prefimpl
-
-import (
-	"testing"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-)
-
-func TestIntegrationSQLxPreferencesDataAccess(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	testIntegrationPreferencesDataAccess(t, func(ss db.DB) store {
-		return &sqlxStore{sess: ss.GetSqlxSession()}
-	})
-}
diff --git a/pkg/services/preference/prefimpl/store_test.go b/pkg/services/preference/prefimpl/store_test.go
index 43d56d4c97f94..afbfea8624047 100644
--- a/pkg/services/preference/prefimpl/store_test.go
+++ b/pkg/services/preference/prefimpl/store_test.go
@@ -11,8 +11,13 @@ import (
 	"github.com/grafana/grafana/pkg/infra/db"
 	pref "github.com/grafana/grafana/pkg/services/preference"
 	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 type getStore func(db.DB) store
 
 func testIntegrationPreferencesDataAccess(t *testing.T, fn getStore) {
diff --git a/pkg/services/provisioning/alerting/provisioner.go b/pkg/services/provisioning/alerting/provisioner.go
index bff80ce870638..1555de96f0582 100644
--- a/pkg/services/provisioning/alerting/provisioner.go
+++ b/pkg/services/provisioning/alerting/provisioner.go
@@ -29,15 +29,6 @@ func Provision(ctx context.Context, cfg ProvisionerConfig) error {
 	}
 	logger.Info("starting to provision alerting")
 	logger.Debug("read all alerting files", "file_count", len(files))
-	ruleProvisioner := NewAlertRuleProvisioner(
-		logger,
-		cfg.DashboardService,
-		cfg.DashboardProvService,
-		cfg.RuleService)
-	err = ruleProvisioner.Provision(ctx, files)
-	if err != nil {
-		return fmt.Errorf("alert rules: %w", err)
-	}
 	cpProvisioner := NewContactPointProvisoner(logger, cfg.ContactPointService)
 	err = cpProvisioner.Provision(ctx, files)
 	if err != nil {
@@ -62,10 +53,6 @@ func Provision(ctx context.Context, cfg ProvisionerConfig) error {
 	if err != nil {
 		return fmt.Errorf("notification policies: %w", err)
 	}
-	err = cpProvisioner.Unprovision(ctx, files)
-	if err != nil {
-		return fmt.Errorf("contact points: %w", err)
-	}
 	err = mtProvisioner.Unprovision(ctx, files)
 	if err != nil {
 		return fmt.Errorf("mute times: %w", err)
@@ -74,6 +61,19 @@ func Provision(ctx context.Context, cfg ProvisionerConfig) error {
 	if err != nil {
 		return fmt.Errorf("text templates: %w", err)
 	}
+	ruleProvisioner := NewAlertRuleProvisioner(
+		logger,
+		cfg.DashboardService,
+		cfg.DashboardProvService,
+		cfg.RuleService)
+	err = ruleProvisioner.Provision(ctx, files)
+	if err != nil {
+		return fmt.Errorf("alert rules: %w", err)
+	}
+	err = cpProvisioner.Unprovision(ctx, files) // Unprovision contact points after rules to make sure all references in rules are updated
+	if err != nil {
+		return fmt.Errorf("contact points: %w", err)
+	}
 	logger.Info("finished to provision alerting")
 	return nil
 }
diff --git a/pkg/services/provisioning/alerting/rules_provisioner.go b/pkg/services/provisioning/alerting/rules_provisioner.go
index 7abc00f37e2d9..f975d6f729bbb 100644
--- a/pkg/services/provisioning/alerting/rules_provisioner.go
+++ b/pkg/services/provisioning/alerting/rules_provisioner.go
@@ -6,9 +6,14 @@ import (
 	"fmt"
 
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/metrics"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/folder"
 	alert_models "github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/provisioning"
+	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/util"
 )
 
@@ -40,6 +45,7 @@ func (prov *defaultAlertRuleProvisioner) Provision(ctx context.Context,
 	files []*AlertingFile) error {
 	for _, file := range files {
 		for _, group := range file.Groups {
+			u := provisionerUser(group.OrgID)
 			folderUID, err := prov.getOrCreateFolderUID(ctx, group.FolderTitle, group.OrgID)
 			if err != nil {
 				return err
@@ -52,19 +58,18 @@ func (prov *defaultAlertRuleProvisioner) Provision(ctx context.Context,
 			for _, rule := range group.Rules {
 				rule.NamespaceUID = folderUID
 				rule.RuleGroup = group.Title
-				err = prov.provisionRule(ctx, group.OrgID, rule)
+				err = prov.provisionRule(ctx, u, rule)
 				if err != nil {
 					return err
 				}
 			}
-			err = prov.ruleService.UpdateRuleGroup(ctx, group.OrgID, folderUID, group.Title, group.Interval)
+			err = prov.ruleService.UpdateRuleGroup(ctx, u, folderUID, group.Title, group.Interval)
 			if err != nil {
 				return err
 			}
 		}
 		for _, deleteRule := range file.DeleteRules {
-			err := prov.ruleService.DeleteAlertRule(ctx, deleteRule.OrgID,
-				deleteRule.UID, alert_models.ProvenanceFile)
+			err := prov.ruleService.DeleteAlertRule(ctx, provisionerUser(deleteRule.OrgID), deleteRule.UID, alert_models.ProvenanceFile)
 			if err != nil {
 				return err
 			}
@@ -75,29 +80,30 @@ func (prov *defaultAlertRuleProvisioner) Provision(ctx context.Context,
 
 func (prov *defaultAlertRuleProvisioner) provisionRule(
 	ctx context.Context,
-	orgID int64,
+	user identity.Requester,
 	rule alert_models.AlertRule) error {
 	prov.logger.Debug("provisioning alert rule", "uid", rule.UID, "org", rule.OrgID)
-	_, _, err := prov.ruleService.GetAlertRule(ctx, orgID, rule.UID)
+	_, _, err := prov.ruleService.GetAlertRule(ctx, user, rule.UID)
 	if err != nil && !errors.Is(err, alert_models.ErrAlertRuleNotFound) {
 		return err
 	} else if err != nil {
 		prov.logger.Debug("creating rule", "uid", rule.UID, "org", rule.OrgID)
-		// 0 is passed as userID as then the quota logic will only check for
-		// the organization quota, as we don't have any user scope here.
-		_, err = prov.ruleService.CreateAlertRule(ctx, rule, alert_models.ProvenanceFile, 0)
+		// a nil user is passed in as then the quota logic will only check for
+		// the organization quota since we don't have any user scope here.
+		_, err = prov.ruleService.CreateAlertRule(ctx, user, rule, alert_models.ProvenanceFile)
 	} else {
 		prov.logger.Debug("updating rule", "uid", rule.UID, "org", rule.OrgID)
-		_, err = prov.ruleService.UpdateAlertRule(ctx, rule, alert_models.ProvenanceFile)
+		_, err = prov.ruleService.UpdateAlertRule(ctx, user, rule, alert_models.ProvenanceFile)
 	}
 	return err
 }
 
 func (prov *defaultAlertRuleProvisioner) getOrCreateFolderUID(
 	ctx context.Context, folderName string, orgID int64) (string, error) {
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Provisioning).Inc()
 	cmd := &dashboards.GetDashboardQuery{
 		Title:    &folderName,
-		FolderID: util.Pointer(int64(0)),
+		FolderID: util.Pointer(int64(0)), // nolint:staticcheck
 		OrgID:    orgID,
 	}
 	cmdResult, err := prov.dashboardService.GetDashboard(ctx, cmd)
@@ -107,13 +113,12 @@ func (prov *defaultAlertRuleProvisioner) getOrCreateFolderUID(
 
 	// dashboard folder not found. create one.
 	if errors.Is(err, dashboards.ErrDashboardNotFound) {
-		dash := &dashboards.SaveDashboardDTO{}
-		dash.Dashboard = dashboards.NewDashboardFolder(folderName)
-		dash.Dashboard.IsFolder = true
-		dash.Overwrite = true
-		dash.OrgID = orgID
-		dash.Dashboard.SetUID(util.GenerateShortUID())
-		dbDash, err := prov.dashboardProvService.SaveFolderForProvisionedDashboards(ctx, dash)
+		createCmd := &folder.CreateFolderCommand{
+			OrgID: orgID,
+			UID:   util.GenerateShortUID(),
+			Title: folderName,
+		}
+		dbDash, err := prov.dashboardProvService.SaveFolderForProvisionedDashboards(ctx, createCmd)
 		if err != nil {
 			return "", err
 		}
@@ -127,3 +132,17 @@ func (prov *defaultAlertRuleProvisioner) getOrCreateFolderUID(
 
 	return cmdResult.UID, nil
 }
+
+var provisionerUser = func(orgID int64) identity.Requester {
+	// this user has 0 ID and therefore, organization wide quota will be applied
+	return accesscontrol.BackgroundUser(
+		"alert_provisioner",
+		orgID,
+		org.RoleAdmin,
+		[]accesscontrol.Permission{
+			{Action: dashboards.ActionFoldersRead, Scope: dashboards.ScopeFoldersAll},
+			{Action: accesscontrol.ActionAlertingProvisioningReadSecrets, Scope: dashboards.ScopeFoldersAll},
+			{Action: accesscontrol.ActionAlertingProvisioningWrite, Scope: dashboards.ScopeFoldersAll},
+		},
+	)
+}
diff --git a/pkg/services/provisioning/alerting/rules_types.go b/pkg/services/provisioning/alerting/rules_types.go
index 8c245d0ee9a81..5e72156b2262d 100644
--- a/pkg/services/provisioning/alerting/rules_types.go
+++ b/pkg/services/provisioning/alerting/rules_types.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/provisioning/values"
+	"github.com/grafana/grafana/pkg/util"
 )
 
 type RuleDelete struct {
@@ -61,18 +62,19 @@ func (ruleGroupV1 *AlertRuleGroupV1) MapToModel() (models.AlertRuleGroupWithFold
 }
 
 type AlertRuleV1 struct {
-	UID          values.StringValue    `json:"uid" yaml:"uid"`
-	Title        values.StringValue    `json:"title" yaml:"title"`
-	Condition    values.StringValue    `json:"condition" yaml:"condition"`
-	Data         []QueryV1             `json:"data" yaml:"data"`
-	DashboardUID values.StringValue    `json:"dasboardUid" yaml:"dashboardUid"`
-	PanelID      values.Int64Value     `json:"panelId" yaml:"panelId"`
-	NoDataState  values.StringValue    `json:"noDataState" yaml:"noDataState"`
-	ExecErrState values.StringValue    `json:"execErrState" yaml:"execErrState"`
-	For          values.StringValue    `json:"for" yaml:"for"`
-	Annotations  values.StringMapValue `json:"annotations" yaml:"annotations"`
-	Labels       values.StringMapValue `json:"labels" yaml:"labels"`
-	IsPaused     values.BoolValue      `json:"isPaused" yaml:"isPaused"`
+	UID                  values.StringValue      `json:"uid" yaml:"uid"`
+	Title                values.StringValue      `json:"title" yaml:"title"`
+	Condition            values.StringValue      `json:"condition" yaml:"condition"`
+	Data                 []QueryV1               `json:"data" yaml:"data"`
+	DashboardUID         values.StringValue      `json:"dasboardUid" yaml:"dashboardUid"`
+	PanelID              values.Int64Value       `json:"panelId" yaml:"panelId"`
+	NoDataState          values.StringValue      `json:"noDataState" yaml:"noDataState"`
+	ExecErrState         values.StringValue      `json:"execErrState" yaml:"execErrState"`
+	For                  values.StringValue      `json:"for" yaml:"for"`
+	Annotations          values.StringMapValue   `json:"annotations" yaml:"annotations"`
+	Labels               values.StringMapValue   `json:"labels" yaml:"labels"`
+	IsPaused             values.BoolValue        `json:"isPaused" yaml:"isPaused"`
+	NotificationSettings *NotificationSettingsV1 `json:"notification_settings" yaml:"notification_settings"`
 }
 
 func (rule *AlertRuleV1) mapToModel(orgID int64) (models.AlertRule, error) {
@@ -130,6 +132,13 @@ func (rule *AlertRuleV1) mapToModel(orgID int64) (models.AlertRule, error) {
 		return models.AlertRule{}, fmt.Errorf("rule '%s' failed to parse: no data set", alertRule.Title)
 	}
 	alertRule.IsPaused = rule.IsPaused.Value()
+	if rule.NotificationSettings != nil {
+		ns, err := rule.NotificationSettings.mapToModel()
+		if err != nil {
+			return models.AlertRule{}, fmt.Errorf("rule '%s' failed to parse: %w", alertRule.Title, err)
+		}
+		alertRule.NotificationSettings = append(alertRule.NotificationSettings, ns)
+	}
 	return alertRule, nil
 }
 
@@ -169,3 +178,71 @@ func (queryV1 *QueryV1) mapToModel() (models.AlertQuery, error) {
 		Model:             rawMessage,
 	}, nil
 }
+
+type NotificationSettingsV1 struct {
+	Receiver          values.StringValue   `json:"receiver" yaml:"receiver"`
+	GroupBy           []values.StringValue `json:"group_by,omitempty" yaml:"group_by"`
+	GroupWait         values.StringValue   `json:"group_wait,omitempty" yaml:"group_wait"`
+	GroupInterval     values.StringValue   `json:"group_interval,omitempty" yaml:"group_interval"`
+	RepeatInterval    values.StringValue   `json:"repeat_interval,omitempty" yaml:"repeat_interval"`
+	MuteTimeIntervals []values.StringValue `json:"mute_time_intervals,omitempty" yaml:"mute_time_intervals"`
+}
+
+func (nsV1 *NotificationSettingsV1) mapToModel() (models.NotificationSettings, error) {
+	if nsV1.Receiver.Value() == "" {
+		return models.NotificationSettings{}, fmt.Errorf("receiver must not be empty")
+	}
+	var gw, gi, ri *model.Duration
+	if nsV1.GroupWait.Value() != "" {
+		dur, err := model.ParseDuration(nsV1.GroupWait.Value())
+		if err != nil {
+			return models.NotificationSettings{}, fmt.Errorf("failed to parse group wait: %w", err)
+		}
+		gw = util.Pointer(dur)
+	}
+	if nsV1.GroupInterval.Value() != "" {
+		dur, err := model.ParseDuration(nsV1.GroupInterval.Value())
+		if err != nil {
+			return models.NotificationSettings{}, fmt.Errorf("failed to parse group interval: %w", err)
+		}
+		gi = util.Pointer(dur)
+	}
+	if nsV1.RepeatInterval.Value() != "" {
+		dur, err := model.ParseDuration(nsV1.RepeatInterval.Value())
+		if err != nil {
+			return models.NotificationSettings{}, fmt.Errorf("failed to parse repeat interval: %w", err)
+		}
+		ri = util.Pointer(dur)
+	}
+
+	var groupBy []string
+	if len(nsV1.GroupBy) > 0 {
+		groupBy = make([]string, 0, len(nsV1.GroupBy))
+		for _, value := range nsV1.GroupBy {
+			if value.Value() == "" {
+				continue
+			}
+			groupBy = append(groupBy, value.Value())
+		}
+	}
+
+	var mute []string
+	if len(nsV1.MuteTimeIntervals) > 0 {
+		mute = make([]string, 0, len(nsV1.MuteTimeIntervals))
+		for _, value := range nsV1.MuteTimeIntervals {
+			if value.Value() == "" {
+				continue
+			}
+			mute = append(mute, value.Value())
+		}
+	}
+
+	return models.NotificationSettings{
+		Receiver:          nsV1.Receiver.Value(),
+		GroupBy:           groupBy,
+		GroupWait:         gw,
+		GroupInterval:     gi,
+		RepeatInterval:    ri,
+		MuteTimeIntervals: mute,
+	}, nil
+}
diff --git a/pkg/services/provisioning/alerting/rules_types_test.go b/pkg/services/provisioning/alerting/rules_types_test.go
index dcca42e0574ad..fda8947cf8b5d 100644
--- a/pkg/services/provisioning/alerting/rules_types_test.go
+++ b/pkg/services/provisioning/alerting/rules_types_test.go
@@ -4,11 +4,13 @@ import (
 	"testing"
 	"time"
 
+	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/yaml.v3"
 
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/provisioning/values"
+	"github.com/grafana/grafana/pkg/util"
 )
 
 func TestRuleGroup(t *testing.T) {
@@ -187,6 +189,109 @@ func TestRules(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, ruleMapped.NoDataState, models.NoData)
 	})
+	t.Run("a rule with notification settings should map it correctly", func(t *testing.T) {
+		rule := validRuleV1(t)
+		rule.NotificationSettings = &NotificationSettingsV1{
+			Receiver: stringToStringValue("test-receiver"),
+		}
+		ruleMapped, err := rule.mapToModel(1)
+		require.NoError(t, err)
+		require.Len(t, ruleMapped.NotificationSettings, 1)
+		require.Equal(t, models.NotificationSettings{Receiver: "test-receiver"}, ruleMapped.NotificationSettings[0])
+	})
+}
+
+func TestNotificationsSettingsV1MapToModel(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    NotificationSettingsV1
+		expected models.NotificationSettings
+		wantErr  bool
+	}{
+		{
+			name: "Valid Input",
+			input: NotificationSettingsV1{
+				Receiver:          stringToStringValue("test-receiver"),
+				GroupBy:           []values.StringValue{stringToStringValue("test-group_by")},
+				GroupWait:         stringToStringValue("1s"),
+				GroupInterval:     stringToStringValue("2s"),
+				RepeatInterval:    stringToStringValue("3s"),
+				MuteTimeIntervals: []values.StringValue{stringToStringValue("test-mute")},
+			},
+			expected: models.NotificationSettings{
+				Receiver:          "test-receiver",
+				GroupBy:           []string{"test-group_by"},
+				GroupWait:         util.Pointer(model.Duration(1 * time.Second)),
+				GroupInterval:     util.Pointer(model.Duration(2 * time.Second)),
+				RepeatInterval:    util.Pointer(model.Duration(3 * time.Second)),
+				MuteTimeIntervals: []string{"test-mute"},
+			},
+		},
+		{
+			name: "Skips empty elements in group_by",
+			input: NotificationSettingsV1{
+				Receiver: stringToStringValue("test-receiver"),
+				GroupBy:  []values.StringValue{stringToStringValue("test-group_by1"), stringToStringValue(""), stringToStringValue("test-group_by2")},
+			},
+			expected: models.NotificationSettings{
+				Receiver: "test-receiver",
+				GroupBy:  []string{"test-group_by1", "test-group_by2"},
+			},
+		},
+		{
+			name: "Skips empty elements in mute timings",
+			input: NotificationSettingsV1{
+				Receiver:          stringToStringValue("test-receiver"),
+				MuteTimeIntervals: []values.StringValue{stringToStringValue("test-mute1"), stringToStringValue(""), stringToStringValue("test-mute2")},
+			},
+			expected: models.NotificationSettings{
+				Receiver:          "test-receiver",
+				MuteTimeIntervals: []string{"test-mute1", "test-mute2"},
+			},
+		},
+		{
+			name: "Empty Receiver",
+			input: NotificationSettingsV1{
+				Receiver: stringToStringValue(""),
+			},
+			wantErr: true,
+		},
+		{
+			name: "Invalid GroupWait Duration",
+			input: NotificationSettingsV1{
+				Receiver:  stringToStringValue("test-receiver"),
+				GroupWait: stringToStringValue("invalidDuration"),
+			},
+			wantErr: true,
+		},
+		{
+			name: "Invalid GroupInterval Duration",
+			input: NotificationSettingsV1{
+				Receiver:      stringToStringValue("test-receiver"),
+				GroupInterval: stringToStringValue("invalidDuration"),
+			},
+			wantErr: true,
+		},
+		{
+			name: "Invalid RepeatInterval Duration",
+			input: NotificationSettingsV1{
+				Receiver:      stringToStringValue("test-receiver"),
+				GroupInterval: stringToStringValue("invalidDuration"),
+			},
+			wantErr: true,
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			got, err := tc.input.mapToModel()
+			if tc.wantErr {
+				require.Error(t, err)
+				return
+			}
+			require.Equal(t, tc.expected, got)
+		})
+	}
 }
 
 func validRuleGroupV1(t *testing.T) AlertRuleGroupV1 {
@@ -238,3 +343,12 @@ func validRuleV1(t *testing.T) AlertRuleV1 {
 		Data:      []QueryV1{{}},
 	}
 }
+
+func stringToStringValue(s string) values.StringValue {
+	result := values.StringValue{}
+	err := yaml.Unmarshal([]byte(s), &result)
+	if err != nil {
+		panic(err)
+	}
+	return result
+}
diff --git a/pkg/services/provisioning/dashboards/dashboard.go b/pkg/services/provisioning/dashboards/dashboard.go
index b9c6c69095b96..0a689d2e2951d 100644
--- a/pkg/services/provisioning/dashboards/dashboard.go
+++ b/pkg/services/provisioning/dashboards/dashboard.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/provisioning/utils"
 )
@@ -23,7 +24,7 @@ type DashboardProvisioner interface {
 }
 
 // DashboardProvisionerFactory creates DashboardProvisioners based on input
-type DashboardProvisionerFactory func(context.Context, string, dashboards.DashboardProvisioningService, org.Service, utils.DashboardStore) (DashboardProvisioner, error)
+type DashboardProvisionerFactory func(context.Context, string, dashboards.DashboardProvisioningService, org.Service, utils.DashboardStore, folder.Service) (DashboardProvisioner, error)
 
 // Provisioner is responsible for syncing dashboard from disk to Grafana's database.
 type Provisioner struct {
@@ -39,7 +40,7 @@ func (provider *Provisioner) HasDashboardSources() bool {
 }
 
 // New returns a new DashboardProvisioner
-func New(ctx context.Context, configDirectory string, provisioner dashboards.DashboardProvisioningService, orgService org.Service, dashboardStore utils.DashboardStore) (DashboardProvisioner, error) {
+func New(ctx context.Context, configDirectory string, provisioner dashboards.DashboardProvisioningService, orgService org.Service, dashboardStore utils.DashboardStore, folderService folder.Service) (DashboardProvisioner, error) {
 	logger := log.New("provisioning.dashboard")
 	cfgReader := &configReader{path: configDirectory, log: logger, orgService: orgService}
 	configs, err := cfgReader.readConfig(ctx)
@@ -47,7 +48,7 @@ func New(ctx context.Context, configDirectory string, provisioner dashboards.Das
 		return nil, fmt.Errorf("%v: %w", "Failed to read dashboards config", err)
 	}
 
-	fileReaders, err := getFileReaders(configs, logger, provisioner, dashboardStore)
+	fileReaders, err := getFileReaders(configs, logger, provisioner, dashboardStore, folderService)
 	if err != nil {
 		return nil, fmt.Errorf("%v: %w", "Failed to initialize file readers", err)
 	}
@@ -66,6 +67,8 @@ func New(ctx context.Context, configDirectory string, provisioner dashboards.Das
 // Provision scans the disk for dashboards and updates
 // the database with the latest versions of those dashboards.
 func (provider *Provisioner) Provision(ctx context.Context) error {
+	provider.log.Info("starting to provision dashboards")
+
 	for _, reader := range provider.fileReaders {
 		if err := reader.walkDisk(ctx); err != nil {
 			if os.IsNotExist(err) {
@@ -79,6 +82,7 @@ func (provider *Provisioner) Provision(ctx context.Context) error {
 	}
 
 	provider.duplicateValidator.validate()
+	provider.log.Info("finished to provision dashboards")
 	return nil
 }
 
@@ -127,14 +131,24 @@ func (provider *Provisioner) GetAllowUIUpdatesFromConfig(name string) bool {
 }
 
 func getFileReaders(
-	configs []*config, logger log.Logger, service dashboards.DashboardProvisioningService, store utils.DashboardStore,
+	configs []*config,
+	logger log.Logger,
+	service dashboards.DashboardProvisioningService,
+	store utils.DashboardStore,
+	folderService folder.Service,
 ) ([]*FileReader, error) {
 	var readers []*FileReader
 
 	for _, config := range configs {
 		switch config.Type {
 		case "file":
-			fileReader, err := NewDashboardFileReader(config, logger.New("type", config.Type, "name", config.Name), service, store)
+			fileReader, err := NewDashboardFileReader(
+				config,
+				logger.New("type", config.Type, "name", config.Name),
+				service,
+				store,
+				folderService,
+			)
 			if err != nil {
 				return nil, fmt.Errorf("failed to create file reader for config %v: %w", config.Name, err)
 			}
diff --git a/pkg/services/provisioning/dashboards/file_reader.go b/pkg/services/provisioning/dashboards/file_reader.go
index 26d00d18e5114..9f66aa6cd185b 100644
--- a/pkg/services/provisioning/dashboards/file_reader.go
+++ b/pkg/services/provisioning/dashboards/file_reader.go
@@ -13,8 +13,10 @@ import (
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/provisioning/utils"
 	"github.com/grafana/grafana/pkg/util"
 )
@@ -34,6 +36,7 @@ type FileReader struct {
 	dashboardProvisioningService dashboards.DashboardProvisioningService
 	dashboardStore               utils.DashboardStore
 	FoldersFromFilesStructure    bool
+	folderService                folder.Service
 
 	mux                     sync.RWMutex
 	usageTracker            *usageTracker
@@ -41,7 +44,8 @@ type FileReader struct {
 }
 
 // NewDashboardFileReader returns a new filereader based on `config`
-func NewDashboardFileReader(cfg *config, log log.Logger, service dashboards.DashboardProvisioningService, dashboardStore utils.DashboardStore) (*FileReader, error) {
+func NewDashboardFileReader(cfg *config, log log.Logger, service dashboards.DashboardProvisioningService,
+	dashboardStore utils.DashboardStore, folderService folder.Service) (*FileReader, error) {
 	var path string
 	path, ok := cfg.Options["path"].(string)
 	if !ok {
@@ -64,6 +68,7 @@ func NewDashboardFileReader(cfg *config, log log.Logger, service dashboards.Dash
 		log:                          log,
 		dashboardProvisioningService: service,
 		dashboardStore:               dashboardStore,
+		folderService:                folderService,
 		FoldersFromFilesStructure:    foldersFromFilesStructure,
 		usageTracker:                 newUsageTracker(),
 	}, nil
@@ -140,14 +145,14 @@ func (fr *FileReader) isDatabaseAccessRestricted() bool {
 // storeDashboardsInFolder saves dashboards from the filesystem on disk to the folder from config
 func (fr *FileReader) storeDashboardsInFolder(ctx context.Context, filesFoundOnDisk map[string]os.FileInfo,
 	dashboardRefs map[string]*dashboards.DashboardProvisioning, usageTracker *usageTracker) error {
-	folderID, err := fr.getOrCreateFolderID(ctx, fr.Cfg, fr.dashboardProvisioningService, fr.Cfg.Folder)
+	folderID, folderUID, err := fr.getOrCreateFolder(ctx, fr.Cfg, fr.dashboardProvisioningService, fr.Cfg.Folder)
 	if err != nil && !errors.Is(err, ErrFolderNameMissing) {
 		return err
 	}
 
 	// save dashboards based on json files
 	for path, fileInfo := range filesFoundOnDisk {
-		provisioningMetadata, err := fr.saveDashboard(ctx, path, folderID, fileInfo, dashboardRefs)
+		provisioningMetadata, err := fr.saveDashboard(ctx, path, folderID, folderUID, fileInfo, dashboardRefs)
 		if err != nil {
 			fr.log.Error("failed to save dashboard", "file", path, "error", err)
 			continue
@@ -170,12 +175,12 @@ func (fr *FileReader) storeDashboardsInFoldersFromFileStructure(ctx context.Cont
 			folderName = filepath.Base(dashboardsFolder)
 		}
 
-		folderID, err := fr.getOrCreateFolderID(ctx, fr.Cfg, fr.dashboardProvisioningService, folderName)
+		folderID, folderUID, err := fr.getOrCreateFolder(ctx, fr.Cfg, fr.dashboardProvisioningService, folderName)
 		if err != nil && !errors.Is(err, ErrFolderNameMissing) {
 			return fmt.Errorf("can't provision folder %q from file system structure: %w", folderName, err)
 		}
 
-		provisioningMetadata, err := fr.saveDashboard(ctx, path, folderID, fileInfo, dashboardRefs)
+		provisioningMetadata, err := fr.saveDashboard(ctx, path, folderID, folderUID, fileInfo, dashboardRefs)
 		usageTracker.track(provisioningMetadata)
 		if err != nil {
 			fr.log.Error("failed to save dashboard", "file", path, "error", err)
@@ -219,7 +224,7 @@ func (fr *FileReader) handleMissingDashboardFiles(ctx context.Context, provision
 }
 
 // saveDashboard saves or updates the dashboard provisioning file at path.
-func (fr *FileReader) saveDashboard(ctx context.Context, path string, folderID int64, fileInfo os.FileInfo,
+func (fr *FileReader) saveDashboard(ctx context.Context, path string, folderID int64, folderUID string, fileInfo os.FileInfo,
 	provisionedDashboardRefs map[string]*dashboards.DashboardProvisioning) (provisioningMetadata, error) {
 	provisioningMetadata := provisioningMetadata{}
 	resolvedFileInfo, err := resolveSymlink(fileInfo, path)
@@ -229,7 +234,7 @@ func (fr *FileReader) saveDashboard(ctx context.Context, path string, folderID i
 
 	provisionedData, alreadyProvisioned := provisionedDashboardRefs[path]
 
-	jsonFile, err := fr.readDashboardFromFile(path, resolvedFileInfo.ModTime(), folderID)
+	jsonFile, err := fr.readDashboardFromFile(path, resolvedFileInfo.ModTime(), folderID, folderUID)
 	if err != nil {
 		fr.log.Error("failed to load dashboard from ", "file", path, "error", err)
 		return provisioningMetadata, nil
@@ -243,9 +248,39 @@ func (fr *FileReader) saveDashboard(ctx context.Context, path string, folderID i
 	// keeps track of which UIDs and titles we have already provisioned
 	dash := jsonFile.dashboard
 	provisioningMetadata.uid = dash.Dashboard.UID
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Provisioning).Inc()
+	// nolint:staticcheck
 	provisioningMetadata.identity = dashboardIdentity{title: dash.Dashboard.Title, folderID: dash.Dashboard.FolderID}
 
+	// fix empty folder_uid from already provisioned dashboards
+	if upToDate && folderUID != "" {
+		// search for root dashboard with the specified uid or title
+		d, err := fr.dashboardStore.GetDashboard(
+			ctx,
+			&dashboards.GetDashboardQuery{
+				OrgID:     jsonFile.dashboard.OrgID,
+				UID:       jsonFile.dashboard.Dashboard.UID,
+				Title:     &jsonFile.dashboard.Dashboard.Title,
+				FolderUID: util.Pointer(""),
+			},
+		)
+		if err != nil {
+			// if no problematic entry is found it's safe to ignore
+			if !errors.Is(err, dashboards.ErrDashboardNotFound) {
+				return provisioningMetadata, err
+			}
+		} else {
+			// inconsistency is detected so force updating the dashboard
+			if d.FolderUID != folderUID {
+				upToDate = false
+			}
+		}
+	}
+
 	if upToDate {
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Provisioning).Inc()
+		// nolint:staticcheck
+		fr.log.Debug("provisioned dashboard is up to date", "provisioner", fr.Cfg.Name, "file", path, "folderId", dash.Dashboard.FolderID, "folderUid", dash.Dashboard.FolderUID)
 		return provisioningMetadata, nil
 	}
 
@@ -259,7 +294,9 @@ func (fr *FileReader) saveDashboard(ctx context.Context, path string, folderID i
 	}
 
 	if !fr.isDatabaseAccessRestricted() {
-		fr.log.Debug("saving new dashboard", "provisioner", fr.Cfg.Name, "file", path, "folderId", dash.Dashboard.FolderID)
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Provisioning).Inc()
+		// nolint:staticcheck
+		fr.log.Debug("saving new dashboard", "provisioner", fr.Cfg.Name, "file", path, "folderId", dash.Dashboard.FolderID, "folderUid", dash.Dashboard.FolderUID)
 		dp := &dashboards.DashboardProvisioning{
 			ExternalID: path,
 			Name:       fr.Cfg.Name,
@@ -271,6 +308,8 @@ func (fr *FileReader) saveDashboard(ctx context.Context, path string, folderID i
 			return provisioningMetadata, err
 		}
 	} else {
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Provisioning).Inc()
+		// nolint:staticcheck
 		fr.log.Warn("Not saving new dashboard due to restricted database access", "provisioner", fr.Cfg.Name,
 			"file", path, "folderId", dash.Dashboard.FolderID)
 	}
@@ -293,47 +332,56 @@ func getProvisionedDashboardsByPath(ctx context.Context, service dashboards.Dash
 	return byPath, nil
 }
 
-func (fr *FileReader) getOrCreateFolderID(ctx context.Context, cfg *config, service dashboards.DashboardProvisioningService, folderName string) (int64, error) {
+func (fr *FileReader) getOrCreateFolder(ctx context.Context, cfg *config, service dashboards.DashboardProvisioningService, folderName string) (int64, string, error) {
 	if folderName == "" {
-		return 0, ErrFolderNameMissing
+		return 0, "", ErrFolderNameMissing
 	}
 
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Provisioning).Inc()
 	cmd := &dashboards.GetDashboardQuery{
-		Title:    &folderName,
-		FolderID: util.Pointer(int64(0)),
+		FolderID: util.Pointer(int64(0)), // nolint:staticcheck
 		OrgID:    cfg.OrgID,
 	}
+
+	if cfg.FolderUID != "" {
+		cmd.UID = cfg.FolderUID
+	} else {
+		cmd.Title = &folderName
+	}
+
 	result, err := fr.dashboardStore.GetDashboard(ctx, cmd)
 
 	if err != nil && !errors.Is(err, dashboards.ErrDashboardNotFound) {
-		return 0, err
+		return 0, "", err
 	}
 
 	// dashboard folder not found. create one.
 	if errors.Is(err, dashboards.ErrDashboardNotFound) {
-		dash := &dashboards.SaveDashboardDTO{}
-		dash.Dashboard = dashboards.NewDashboardFolder(folderName)
-		dash.Dashboard.IsFolder = true
-		dash.Overwrite = true
-		dash.OrgID = cfg.OrgID
 		// set dashboard folderUid if given
 		if cfg.FolderUID == accesscontrol.GeneralFolderUID {
-			return 0, dashboards.ErrFolderInvalidUID
+			return 0, "", dashboards.ErrFolderInvalidUID
 		}
-		dash.Dashboard.SetUID(cfg.FolderUID)
-		dbDash, err := service.SaveFolderForProvisionedDashboards(ctx, dash)
-		if err != nil {
-			return 0, err
+
+		createCmd := &folder.CreateFolderCommand{
+			OrgID: cfg.OrgID,
+			UID:   cfg.FolderUID,
+			Title: folderName,
 		}
 
-		return dbDash.ID, nil
+		f, err := service.SaveFolderForProvisionedDashboards(ctx, createCmd)
+		if err != nil {
+			return 0, "", err
+		}
+		metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Provisioning).Inc()
+		// nolint:staticcheck
+		return f.ID, f.UID, nil
 	}
 
 	if !result.IsFolder {
-		return 0, fmt.Errorf("got invalid response. expected folder, found dashboard")
+		return 0, "", fmt.Errorf("got invalid response. expected folder, found dashboard")
 	}
 
-	return result.ID, nil
+	return result.ID, result.UID, nil
 }
 
 func resolveSymlink(fileinfo os.FileInfo, path string) (os.FileInfo, error) {
@@ -387,7 +435,7 @@ type dashboardJSONFile struct {
 	lastModified time.Time
 }
 
-func (fr *FileReader) readDashboardFromFile(path string, lastModified time.Time, folderID int64) (*dashboardJSONFile, error) {
+func (fr *FileReader) readDashboardFromFile(path string, lastModified time.Time, folderID int64, folderUID string) (*dashboardJSONFile, error) {
 	// nolint:gosec
 	// We can ignore the gosec G304 warning on this one because `path` comes from the provisioning configuration file.
 	reader, err := os.Open(path)
@@ -415,7 +463,7 @@ func (fr *FileReader) readDashboardFromFile(path string, lastModified time.Time,
 		return nil, err
 	}
 
-	dash, err := createDashboardJSON(data, lastModified, fr.Cfg, folderID)
+	dash, err := createDashboardJSON(data, lastModified, fr.Cfg, folderID, folderUID)
 	if err != nil {
 		return nil, err
 	}
@@ -462,8 +510,10 @@ type provisioningMetadata struct {
 }
 
 type dashboardIdentity struct {
-	folderID int64
-	title    string
+	// Deprecated: use folderUID instead
+	folderID  int64
+	folderUID string
+	title     string
 }
 
 func (d *dashboardIdentity) Exists() bool {
diff --git a/pkg/services/provisioning/dashboards/file_reader_symlink_test.go b/pkg/services/provisioning/dashboards/file_reader_symlink_test.go
index 911d09a953bbc..3085da3cd75d6 100644
--- a/pkg/services/provisioning/dashboards/file_reader_symlink_test.go
+++ b/pkg/services/provisioning/dashboards/file_reader_symlink_test.go
@@ -26,7 +26,7 @@ func TestProvisionedSymlinkedFolder(t *testing.T) {
 		Options: map[string]any{"path": symlinkedFolder},
 	}
 
-	reader, err := NewDashboardFileReader(cfg, log.New("test-logger"), nil, nil)
+	reader, err := NewDashboardFileReader(cfg, log.New("test-logger"), nil, nil, nil)
 	if err != nil {
 		t.Error("expected err to be nil")
 	}
diff --git a/pkg/services/provisioning/dashboards/file_reader_test.go b/pkg/services/provisioning/dashboards/file_reader_test.go
index d1ce737b4ea09..ac55b38e8515f 100644
--- a/pkg/services/provisioning/dashboards/file_reader_test.go
+++ b/pkg/services/provisioning/dashboards/file_reader_test.go
@@ -14,6 +14,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/util"
 )
 
@@ -41,7 +42,7 @@ func TestCreatingNewDashboardFileReader(t *testing.T) {
 	t.Run("using path parameter", func(t *testing.T) {
 		cfg := setup()
 		cfg.Options["path"] = defaultDashboards
-		reader, err := NewDashboardFileReader(cfg, log.New("test-logger"), nil, nil)
+		reader, err := NewDashboardFileReader(cfg, log.New("test-logger"), nil, nil, nil)
 		require.NoError(t, err)
 		require.NotEqual(t, reader.Path, "")
 	})
@@ -49,7 +50,7 @@ func TestCreatingNewDashboardFileReader(t *testing.T) {
 	t.Run("using folder as options", func(t *testing.T) {
 		cfg := setup()
 		cfg.Options["folder"] = defaultDashboards
-		reader, err := NewDashboardFileReader(cfg, log.New("test-logger"), nil, nil)
+		reader, err := NewDashboardFileReader(cfg, log.New("test-logger"), nil, nil, nil)
 		require.NoError(t, err)
 		require.NotEqual(t, reader.Path, "")
 	})
@@ -58,7 +59,7 @@ func TestCreatingNewDashboardFileReader(t *testing.T) {
 		cfg := setup()
 		cfg.Options["path"] = foldersFromFilesStructure
 		cfg.Options["foldersFromFilesStructure"] = true
-		reader, err := NewDashboardFileReader(cfg, log.New("test-logger"), nil, nil)
+		reader, err := NewDashboardFileReader(cfg, log.New("test-logger"), nil, nil, nil)
 		require.NoError(t, err)
 		require.NotEqual(t, reader.Path, "")
 	})
@@ -71,7 +72,7 @@ func TestCreatingNewDashboardFileReader(t *testing.T) {
 		}
 
 		cfg.Options["folder"] = fullPath
-		reader, err := NewDashboardFileReader(cfg, log.New("test-logger"), nil, nil)
+		reader, err := NewDashboardFileReader(cfg, log.New("test-logger"), nil, nil, nil)
 		require.NoError(t, err)
 
 		require.Equal(t, reader.Path, fullPath)
@@ -81,7 +82,7 @@ func TestCreatingNewDashboardFileReader(t *testing.T) {
 	t.Run("using relative path", func(t *testing.T) {
 		cfg := setup()
 		cfg.Options["folder"] = defaultDashboards
-		reader, err := NewDashboardFileReader(cfg, log.New("test-logger"), nil, nil)
+		reader, err := NewDashboardFileReader(cfg, log.New("test-logger"), nil, nil, nil)
 		require.NoError(t, err)
 
 		resolvedPath := reader.resolvedPath()
@@ -113,10 +114,10 @@ func TestDashboardFileReader(t *testing.T) {
 			cfg.Folder = "Team A"
 
 			fakeService.On("GetProvisionedDashboardData", mock.Anything, configName).Return(nil, nil).Once()
-			fakeService.On("SaveFolderForProvisionedDashboards", mock.Anything, mock.Anything).Return(&dashboards.Dashboard{ID: 1}, nil).Once()
+			fakeService.On("SaveFolderForProvisionedDashboards", mock.Anything, mock.Anything).Return(&folder.Folder{}, nil).Once()
 			fakeService.On("SaveProvisionedDashboard", mock.Anything, mock.Anything, mock.Anything).Return(&dashboards.Dashboard{ID: 2}, nil).Times(2)
 
-			reader, err := NewDashboardFileReader(cfg, logger, nil, fakeStore)
+			reader, err := NewDashboardFileReader(cfg, logger, nil, fakeStore, nil)
 			reader.dashboardProvisioningService = fakeService
 			require.NoError(t, err)
 
@@ -136,7 +137,7 @@ func TestDashboardFileReader(t *testing.T) {
 					inserted++
 				})
 
-			reader, err := NewDashboardFileReader(cfg, logger, nil, fakeStore)
+			reader, err := NewDashboardFileReader(cfg, logger, nil, fakeStore, nil)
 			reader.dashboardProvisioningService = fakeService
 			require.NoError(t, err)
 
@@ -173,7 +174,7 @@ func TestDashboardFileReader(t *testing.T) {
 
 			fakeService.On("GetProvisionedDashboardData", mock.Anything, configName).Return(provisionedDashboard, nil).Once()
 
-			reader, err := NewDashboardFileReader(cfg, logger, nil, fakeStore)
+			reader, err := NewDashboardFileReader(cfg, logger, nil, fakeStore, nil)
 			reader.dashboardProvisioningService = fakeService
 			require.NoError(t, err)
 
@@ -201,7 +202,7 @@ func TestDashboardFileReader(t *testing.T) {
 			fakeService.On("GetProvisionedDashboardData", mock.Anything, configName).Return(provisionedDashboard, nil).Once()
 			fakeService.On("SaveProvisionedDashboard", mock.Anything, mock.Anything, mock.Anything).Return(&dashboards.Dashboard{}, nil).Once()
 
-			reader, err := NewDashboardFileReader(cfg, logger, nil, fakeStore)
+			reader, err := NewDashboardFileReader(cfg, logger, nil, fakeStore, nil)
 			reader.dashboardProvisioningService = fakeService
 			require.NoError(t, err)
 
@@ -236,7 +237,7 @@ func TestDashboardFileReader(t *testing.T) {
 
 			fakeService.On("GetProvisionedDashboardData", mock.Anything, configName).Return(provisionedDashboard, nil).Once()
 
-			reader, err := NewDashboardFileReader(cfg, logger, nil, fakeStore)
+			reader, err := NewDashboardFileReader(cfg, logger, nil, fakeStore, nil)
 			reader.dashboardProvisioningService = fakeService
 			require.NoError(t, err)
 
@@ -264,7 +265,7 @@ func TestDashboardFileReader(t *testing.T) {
 			fakeService.On("GetProvisionedDashboardData", mock.Anything, configName).Return(provisionedDashboard, nil).Once()
 			fakeService.On("SaveProvisionedDashboard", mock.Anything, mock.Anything, mock.Anything).Return(&dashboards.Dashboard{}, nil).Once()
 
-			reader, err := NewDashboardFileReader(cfg, logger, nil, fakeStore)
+			reader, err := NewDashboardFileReader(cfg, logger, nil, fakeStore, nil)
 			reader.dashboardProvisioningService = fakeService
 			require.NoError(t, err)
 
@@ -279,7 +280,7 @@ func TestDashboardFileReader(t *testing.T) {
 			fakeService.On("GetProvisionedDashboardData", mock.Anything, configName).Return(nil, nil).Once()
 			fakeService.On("SaveProvisionedDashboard", mock.Anything, mock.Anything, mock.Anything).Return(&dashboards.Dashboard{}, nil).Once()
 
-			reader, err := NewDashboardFileReader(cfg, logger, nil, fakeStore)
+			reader, err := NewDashboardFileReader(cfg, logger, nil, fakeStore, nil)
 			reader.dashboardProvisioningService = fakeService
 			require.NoError(t, err)
 
@@ -293,10 +294,10 @@ func TestDashboardFileReader(t *testing.T) {
 			cfg.Options["foldersFromFilesStructure"] = true
 
 			fakeService.On("GetProvisionedDashboardData", mock.Anything, configName).Return(nil, nil).Once()
-			fakeService.On("SaveFolderForProvisionedDashboards", mock.Anything, mock.Anything).Return(&dashboards.Dashboard{}, nil).Times(2)
+			fakeService.On("SaveFolderForProvisionedDashboards", mock.Anything, mock.Anything).Return(&folder.Folder{}, nil).Times(2)
 			fakeService.On("SaveProvisionedDashboard", mock.Anything, mock.Anything, mock.Anything).Return(&dashboards.Dashboard{}, nil).Times(3)
 
-			reader, err := NewDashboardFileReader(cfg, logger, nil, fakeStore)
+			reader, err := NewDashboardFileReader(cfg, logger, nil, fakeStore, nil)
 			reader.dashboardProvisioningService = fakeService
 			require.NoError(t, err)
 
@@ -313,7 +314,7 @@ func TestDashboardFileReader(t *testing.T) {
 				Folder: "",
 			}
 
-			_, err := NewDashboardFileReader(cfg, logger, nil, nil)
+			_, err := NewDashboardFileReader(cfg, logger, nil, nil, nil)
 			require.NotNil(t, err)
 		})
 
@@ -321,7 +322,7 @@ func TestDashboardFileReader(t *testing.T) {
 			setup()
 			cfg.Options["path"] = brokenDashboards
 
-			_, err := NewDashboardFileReader(cfg, logger, nil, nil)
+			_, err := NewDashboardFileReader(cfg, logger, nil, nil, nil)
 			require.NoError(t, err)
 		})
 
@@ -331,17 +332,17 @@ func TestDashboardFileReader(t *testing.T) {
 			cfg2 := &config{Name: "2", Type: "file", OrgID: 1, Folder: "f2", Options: map[string]any{"path": containingID}}
 
 			fakeService.On("GetProvisionedDashboardData", mock.Anything, mock.AnythingOfType("string")).Return(nil, nil).Times(2)
-			fakeService.On("SaveFolderForProvisionedDashboards", mock.Anything, mock.Anything).Return(&dashboards.Dashboard{}, nil).Times(2)
+			fakeService.On("SaveFolderForProvisionedDashboards", mock.Anything, mock.Anything).Return(&folder.Folder{}, nil).Times(2)
 			fakeService.On("SaveProvisionedDashboard", mock.Anything, mock.Anything, mock.Anything).Return(&dashboards.Dashboard{}, nil).Times(2)
 
-			reader1, err := NewDashboardFileReader(cfg1, logger, nil, fakeStore)
+			reader1, err := NewDashboardFileReader(cfg1, logger, nil, fakeStore, nil)
 			reader1.dashboardProvisioningService = fakeService
 			require.NoError(t, err)
 
 			err = reader1.walkDisk(context.Background())
 			require.NoError(t, err)
 
-			reader2, err := NewDashboardFileReader(cfg2, logger, nil, fakeStore)
+			reader2, err := NewDashboardFileReader(cfg2, logger, nil, fakeStore, nil)
 			reader2.dashboardProvisioningService = fakeService
 			require.NoError(t, err)
 
@@ -361,10 +362,10 @@ func TestDashboardFileReader(t *testing.T) {
 				"folder": defaultDashboards,
 			},
 		}
-		r, err := NewDashboardFileReader(cfg, logger, nil, nil)
+		r, err := NewDashboardFileReader(cfg, logger, nil, nil, nil)
 		require.NoError(t, err)
 
-		_, err = r.getOrCreateFolderID(context.Background(), cfg, fakeService, cfg.Folder)
+		_, _, err = r.getOrCreateFolder(context.Background(), cfg, fakeService, cfg.Folder)
 		require.Equal(t, err, ErrFolderNameMissing)
 	})
 
@@ -379,12 +380,12 @@ func TestDashboardFileReader(t *testing.T) {
 				"folder": defaultDashboards,
 			},
 		}
-		fakeService.On("SaveFolderForProvisionedDashboards", mock.Anything, mock.Anything).Return(&dashboards.Dashboard{ID: 1}, nil).Once()
+		fakeService.On("SaveFolderForProvisionedDashboards", mock.Anything, mock.Anything).Return(&folder.Folder{}, nil).Once()
 
-		r, err := NewDashboardFileReader(cfg, logger, nil, fakeStore)
+		r, err := NewDashboardFileReader(cfg, logger, nil, fakeStore, nil)
 		require.NoError(t, err)
 
-		_, err = r.getOrCreateFolderID(context.Background(), cfg, fakeService, cfg.Folder)
+		_, _, err = r.getOrCreateFolder(context.Background(), cfg, fakeService, cfg.Folder)
 		require.NoError(t, err)
 	})
 
@@ -401,10 +402,10 @@ func TestDashboardFileReader(t *testing.T) {
 			},
 		}
 
-		r, err := NewDashboardFileReader(cfg, logger, nil, fakeStore)
+		r, err := NewDashboardFileReader(cfg, logger, nil, fakeStore, nil)
 		require.NoError(t, err)
 
-		_, err = r.getOrCreateFolderID(context.Background(), cfg, fakeService, cfg.Folder)
+		_, _, err = r.getOrCreateFolder(context.Background(), cfg, fakeService, cfg.Folder)
 		require.ErrorIs(t, err, dashboards.ErrFolderInvalidUID)
 	})
 
@@ -456,7 +457,7 @@ func TestDashboardFileReader(t *testing.T) {
 
 			cfg.DisableDeletion = true
 
-			reader, err := NewDashboardFileReader(cfg, logger, nil, fakeStore)
+			reader, err := NewDashboardFileReader(cfg, logger, nil, fakeStore, nil)
 			require.NoError(t, err)
 			reader.dashboardProvisioningService = fakeService
 
@@ -471,7 +472,7 @@ func TestDashboardFileReader(t *testing.T) {
 			fakeService.On("SaveProvisionedDashboard", mock.Anything, mock.Anything, mock.Anything).Return(&dashboards.Dashboard{}, nil).Once()
 			fakeService.On("DeleteProvisionedDashboard", mock.Anything, mock.Anything, mock.Anything).Return(nil).Once()
 
-			reader, err := NewDashboardFileReader(cfg, logger, nil, fakeStore)
+			reader, err := NewDashboardFileReader(cfg, logger, nil, fakeStore, nil)
 			reader.dashboardProvisioningService = fakeService
 			require.NoError(t, err)
 
diff --git a/pkg/services/provisioning/dashboards/types.go b/pkg/services/provisioning/dashboards/types.go
index e19808b89f9fa..18e58c1ce7fb4 100644
--- a/pkg/services/provisioning/dashboards/types.go
+++ b/pkg/services/provisioning/dashboards/types.go
@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/provisioning/values"
 )
@@ -56,14 +57,17 @@ type configs struct {
 	AllowUIUpdates        values.BoolValue   `json:"allowUiUpdates" yaml:"allowUiUpdates"`
 }
 
-func createDashboardJSON(data *simplejson.Json, lastModified time.Time, cfg *config, folderID int64) (*dashboards.SaveDashboardDTO, error) {
+func createDashboardJSON(data *simplejson.Json, lastModified time.Time, cfg *config, folderID int64, folderUID string) (*dashboards.SaveDashboardDTO, error) {
 	dash := &dashboards.SaveDashboardDTO{}
 	dash.Dashboard = dashboards.NewDashboardFromJson(data)
 	dash.UpdatedAt = lastModified
 	dash.Overwrite = true
 	dash.OrgID = cfg.OrgID
 	dash.Dashboard.OrgID = cfg.OrgID
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Provisioning).Inc()
+	// nolint:staticcheck
 	dash.Dashboard.FolderID = folderID
+	dash.Dashboard.FolderUID = folderUID
 
 	if dash.Dashboard.Title == "" {
 		return nil, dashboards.ErrDashboardTitleEmpty
diff --git a/pkg/services/provisioning/dashboards/validator.go b/pkg/services/provisioning/dashboards/validator.go
index bfd39d4e7ae91..dd3aa5b092740 100644
--- a/pkg/services/provisioning/dashboards/validator.go
+++ b/pkg/services/provisioning/dashboards/validator.go
@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/metrics"
 )
 
 type duplicate struct {
@@ -102,6 +103,8 @@ func (c *duplicateValidator) logWarnings(duplicatesByOrg map[int64]duplicateEntr
 
 		for id, usage := range duplicates.Titles {
 			if usage.Sum > 1 {
+				metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Provisioning).Inc()
+				// nolint:staticcheck
 				c.logger.Warn("dashboard title is not unique in folder", "orgId", orgID, "title", id.title, "folderID", id.folderID, "times",
 					usage.Sum, "providers", keysToSlice(usage.InvolvedReaders))
 			}
diff --git a/pkg/services/provisioning/dashboards/validator_test.go b/pkg/services/provisioning/dashboards/validator_test.go
index bc2bc494beac9..de8d438d02f14 100644
--- a/pkg/services/provisioning/dashboards/validator_test.go
+++ b/pkg/services/provisioning/dashboards/validator_test.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/folder"
 )
 
 const (
@@ -34,15 +35,15 @@ func TestDuplicatesValidator(t *testing.T) {
 		const folderName = "duplicates-validator-folder"
 
 		fakeStore := &fakeDashboardStore{}
-		r, err := NewDashboardFileReader(cfg, logger, nil, fakeStore)
+		r, err := NewDashboardFileReader(cfg, logger, nil, fakeStore, nil)
 		require.NoError(t, err)
-		fakeService.On("SaveFolderForProvisionedDashboards", mock.Anything, mock.Anything).Return(&dashboards.Dashboard{}, nil).Times(6)
+		fakeService.On("SaveFolderForProvisionedDashboards", mock.Anything, mock.Anything).Return(&folder.Folder{}, nil).Times(6)
 		fakeService.On("GetProvisionedDashboardData", mock.Anything, mock.AnythingOfType("string")).Return([]*dashboards.DashboardProvisioning{}, nil).Times(4)
 		fakeService.On("SaveProvisionedDashboard", mock.Anything, mock.Anything, mock.Anything).Return(&dashboards.Dashboard{}, nil).Times(5)
-		folderID, err := r.getOrCreateFolderID(context.Background(), cfg, fakeService, folderName)
+		_, folderUID, err := r.getOrCreateFolder(context.Background(), cfg, fakeService, folderName)
 		require.NoError(t, err)
 
-		identity := dashboardIdentity{folderID: folderID, title: "Grafana"}
+		identity := dashboardIdentity{folderUID: folderUID, title: "Grafana"}
 
 		cfg1 := &config{
 			Name: "first", Type: "file", OrgID: 1, Folder: folderName,
@@ -53,11 +54,11 @@ func TestDuplicatesValidator(t *testing.T) {
 			Options: map[string]any{"path": dashboardContainingUID},
 		}
 
-		reader1, err := NewDashboardFileReader(cfg1, logger, nil, fakeStore)
+		reader1, err := NewDashboardFileReader(cfg1, logger, nil, fakeStore, nil)
 		reader1.dashboardProvisioningService = fakeService
 		require.NoError(t, err)
 
-		reader2, err := NewDashboardFileReader(cfg2, logger, nil, fakeStore)
+		reader2, err := NewDashboardFileReader(cfg2, logger, nil, fakeStore, nil)
 		reader2.dashboardProvisioningService = fakeService
 		require.NoError(t, err)
 
@@ -90,12 +91,12 @@ func TestDuplicatesValidator(t *testing.T) {
 		const folderName = "duplicates-validator-folder"
 
 		fakeStore := &fakeDashboardStore{}
-		r, err := NewDashboardFileReader(cfg, logger, nil, fakeStore)
+		r, err := NewDashboardFileReader(cfg, logger, nil, fakeStore, nil)
 		require.NoError(t, err)
-		folderID, err := r.getOrCreateFolderID(context.Background(), cfg, fakeService, folderName)
+		_, folderUID, err := r.getOrCreateFolder(context.Background(), cfg, fakeService, folderName)
 		require.NoError(t, err)
 
-		identity := dashboardIdentity{folderID: folderID, title: "Grafana"}
+		identity := dashboardIdentity{folderUID: folderUID, title: "Grafana"}
 
 		cfg1 := &config{
 			Name: "first", Type: "file", OrgID: 1, Folder: folderName,
@@ -106,11 +107,11 @@ func TestDuplicatesValidator(t *testing.T) {
 			Options: map[string]any{"path": dashboardContainingUID},
 		}
 
-		reader1, err := NewDashboardFileReader(cfg1, logger, nil, fakeStore)
+		reader1, err := NewDashboardFileReader(cfg1, logger, nil, fakeStore, nil)
 		reader1.dashboardProvisioningService = fakeService
 		require.NoError(t, err)
 
-		reader2, err := NewDashboardFileReader(cfg2, logger, nil, fakeStore)
+		reader2, err := NewDashboardFileReader(cfg2, logger, nil, fakeStore, nil)
 		reader2.dashboardProvisioningService = fakeService
 		require.NoError(t, err)
 
@@ -150,7 +151,7 @@ func TestDuplicatesValidator(t *testing.T) {
 	})
 
 	t.Run("Duplicates validator should restrict write access only for readers with duplicates", func(t *testing.T) {
-		fakeService.On("SaveFolderForProvisionedDashboards", mock.Anything, mock.Anything).Return(&dashboards.Dashboard{}, nil).Times(5)
+		fakeService.On("SaveFolderForProvisionedDashboards", mock.Anything, mock.Anything).Return(&folder.Folder{}, nil).Times(5)
 		fakeService.On("GetProvisionedDashboardData", mock.Anything, mock.AnythingOfType("string")).Return([]*dashboards.DashboardProvisioning{}, nil).Times(3)
 		fakeService.On("SaveProvisionedDashboard", mock.Anything, mock.Anything, mock.Anything).Return(&dashboards.Dashboard{}, nil).Times(5)
 		fakeStore := &fakeDashboardStore{}
@@ -167,15 +168,15 @@ func TestDuplicatesValidator(t *testing.T) {
 			Name: "third", Type: "file", OrgID: 2, Folder: "duplicates-validator-folder",
 			Options: map[string]any{"path": twoDashboardsWithUID},
 		}
-		reader1, err := NewDashboardFileReader(cfg1, logger, nil, fakeStore)
+		reader1, err := NewDashboardFileReader(cfg1, logger, nil, fakeStore, nil)
 		reader1.dashboardProvisioningService = fakeService
 		require.NoError(t, err)
 
-		reader2, err := NewDashboardFileReader(cfg2, logger, nil, fakeStore)
+		reader2, err := NewDashboardFileReader(cfg2, logger, nil, fakeStore, nil)
 		reader2.dashboardProvisioningService = fakeService
 		require.NoError(t, err)
 
-		reader3, err := NewDashboardFileReader(cfg3, logger, nil, fakeStore)
+		reader3, err := NewDashboardFileReader(cfg3, logger, nil, fakeStore, nil)
 		reader3.dashboardProvisioningService = fakeService
 		require.NoError(t, err)
 
@@ -192,12 +193,12 @@ func TestDuplicatesValidator(t *testing.T) {
 
 		duplicates := duplicateValidator.getDuplicates()
 
-		r, err := NewDashboardFileReader(cfg, logger, nil, fakeStore)
+		r, err := NewDashboardFileReader(cfg, logger, nil, fakeStore, nil)
 		require.NoError(t, err)
-		folderID, err := r.getOrCreateFolderID(context.Background(), cfg, fakeService, cfg1.Folder)
+		_, folderUID, err := r.getOrCreateFolder(context.Background(), cfg, fakeService, cfg1.Folder)
 		require.NoError(t, err)
 
-		identity := dashboardIdentity{folderID: folderID, title: "Grafana"}
+		identity := dashboardIdentity{folderUID: folderUID, title: "Grafana"}
 
 		require.Equal(t, uint8(2), duplicates[1].UIDs["Z-phNqGmz"].Sum)
 		uidUsageReaders := keysToSlice(duplicates[1].UIDs["Z-phNqGmz"].InvolvedReaders)
@@ -209,12 +210,12 @@ func TestDuplicatesValidator(t *testing.T) {
 		sort.Strings(titleUsageReaders)
 		require.Equal(t, []string{"first"}, titleUsageReaders)
 
-		r, err = NewDashboardFileReader(cfg3, logger, nil, fakeStore)
+		r, err = NewDashboardFileReader(cfg3, logger, nil, fakeStore, nil)
 		require.NoError(t, err)
-		folderID, err = r.getOrCreateFolderID(context.Background(), cfg3, fakeService, cfg3.Folder)
+		_, folderUID, err = r.getOrCreateFolder(context.Background(), cfg3, fakeService, cfg3.Folder)
 		require.NoError(t, err)
 
-		identity = dashboardIdentity{folderID: folderID, title: "Grafana"}
+		identity = dashboardIdentity{folderUID: folderUID, title: "Grafana"}
 
 		require.Equal(t, uint8(2), duplicates[2].UIDs["Z-phNqGmz"].Sum)
 		uidUsageReaders = keysToSlice(duplicates[2].UIDs["Z-phNqGmz"].InvolvedReaders)
diff --git a/pkg/services/provisioning/datasources/datasources.go b/pkg/services/provisioning/datasources/datasources.go
index 3093e39db1b82..147d32e9e9f30 100644
--- a/pkg/services/provisioning/datasources/datasources.go
+++ b/pkg/services/provisioning/datasources/datasources.go
@@ -71,7 +71,7 @@ func (dc *DatasourceProvisioner) provisionDataSources(ctx context.Context, cfg *
 
 		if errors.Is(err, datasources.ErrDataSourceNotFound) {
 			insertCmd := createInsertCommand(ds)
-			dc.log.Info("inserting datasource from configuration ", "name", insertCmd.Name, "uid", insertCmd.UID)
+			dc.log.Info("inserting datasource from configuration", "name", insertCmd.Name, "uid", insertCmd.UID)
 			_, err = dc.store.AddDataSource(ctx, insertCmd)
 			if err != nil {
 				return err
@@ -80,7 +80,11 @@ func (dc *DatasourceProvisioner) provisionDataSources(ctx context.Context, cfg *
 			updateCmd := createUpdateCommand(ds, dataSource.ID)
 			dc.log.Debug("updating datasource from configuration", "name", updateCmd.Name, "uid", updateCmd.UID)
 			if _, err := dc.store.UpdateDataSource(ctx, updateCmd); err != nil {
-				return err
+				if errors.Is(err, datasources.ErrDataSourceUpdatingOldVersion) {
+					dc.log.Debug("ignoring old version of datasource", "name", updateCmd.Name, "uid", updateCmd.UID)
+				} else {
+					return err
+				}
 			}
 		}
 	}
diff --git a/pkg/services/provisioning/datasources/types.go b/pkg/services/provisioning/datasources/types.go
index 2e58df3a01684..5088278cc8536 100644
--- a/pkg/services/provisioning/datasources/types.go
+++ b/pkg/services/provisioning/datasources/types.go
@@ -243,6 +243,7 @@ func createUpdateCommand(ds *upsertDataSourceFromConfig, id int64) *datasources.
 
 	return &datasources.UpdateDataSourceCommand{
 		ID:                      id,
+		Version:                 ds.Version,
 		UID:                     ds.UID,
 		OrgID:                   ds.OrgID,
 		Name:                    ds.Name,
diff --git a/pkg/services/provisioning/datasources/types_test.go b/pkg/services/provisioning/datasources/types_test.go
index 75820d6b12890..5cf0592f6b749 100644
--- a/pkg/services/provisioning/datasources/types_test.go
+++ b/pkg/services/provisioning/datasources/types_test.go
@@ -13,3 +13,11 @@ func TestUIDFromNames(t *testing.T) {
 		require.Equal(t, safeUIDFromName("AAA"), "PCB1AD2119D8FAFB6")
 	})
 }
+
+func TestCreateUpdateCommand(t *testing.T) {
+	t.Run("includes the version in the command", func(t *testing.T) {
+		ds := &upsertDataSourceFromConfig{OrgID: 1, Version: 1, Name: "test"}
+		cmd := createUpdateCommand(ds, 1)
+		require.Equal(t, 1, cmd.Version)
+	})
+}
diff --git a/pkg/services/provisioning/notifiers/alert_notifications.go b/pkg/services/provisioning/notifiers/alert_notifications.go
deleted file mode 100644
index a7baedb8a4aae..0000000000000
--- a/pkg/services/provisioning/notifiers/alert_notifications.go
+++ /dev/null
@@ -1,176 +0,0 @@
-package notifiers
-
-import (
-	"context"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/encryption"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/services/org"
-)
-
-type Manager interface {
-	GetAlertNotifications(ctx context.Context, query *models.GetAlertNotificationsQuery) (*models.AlertNotification, error)
-	CreateAlertNotificationCommand(ctx context.Context, cmd *models.CreateAlertNotificationCommand) (*models.AlertNotification, error)
-	UpdateAlertNotification(ctx context.Context, cmd *models.UpdateAlertNotificationCommand) (*models.AlertNotification, error)
-	DeleteAlertNotification(ctx context.Context, cmd *models.DeleteAlertNotificationCommand) error
-	GetAllAlertNotifications(ctx context.Context, query *models.GetAllAlertNotificationsQuery) ([]*models.AlertNotification, error)
-	GetOrCreateAlertNotificationState(ctx context.Context, cmd *models.GetOrCreateNotificationStateQuery) (*models.AlertNotificationState, error)
-	SetAlertNotificationStateToCompleteCommand(ctx context.Context, cmd *models.SetAlertNotificationStateToCompleteCommand) error
-	SetAlertNotificationStateToPendingCommand(ctx context.Context, cmd *models.SetAlertNotificationStateToPendingCommand) error
-	GetAlertNotificationsWithUid(ctx context.Context, query *models.GetAlertNotificationsWithUidQuery) (*models.AlertNotification, error)
-	DeleteAlertNotificationWithUid(ctx context.Context, cmd *models.DeleteAlertNotificationWithUidCommand) error
-	GetAlertNotificationsWithUidToSend(ctx context.Context, query *models.GetAlertNotificationsWithUidToSendQuery) ([]*models.AlertNotification, error)
-	UpdateAlertNotificationWithUid(ctx context.Context, cmd *models.UpdateAlertNotificationWithUidCommand) (*models.AlertNotification, error)
-}
-
-// Provision alert notifiers
-func Provision(ctx context.Context, configDirectory string, alertingService Manager, orgService org.Service, encryptionService encryption.Internal, notificationService *notifications.NotificationService) error {
-	dc := newNotificationProvisioner(orgService, alertingService, encryptionService, notificationService, log.New("provisioning.notifiers"))
-	return dc.applyChanges(ctx, configDirectory)
-}
-
-// NotificationProvisioner is responsible for provsioning alert notifiers
-type NotificationProvisioner struct {
-	log             log.Logger
-	cfgProvider     *configReader
-	alertingManager Manager
-	orgService      org.Service
-}
-
-func newNotificationProvisioner(orgService org.Service, alertingManager Manager, encryptionService encryption.Internal, notifiationService *notifications.NotificationService, log log.Logger) NotificationProvisioner {
-	return NotificationProvisioner{
-		log:             log,
-		alertingManager: alertingManager,
-		cfgProvider: &configReader{
-			encryptionService:   encryptionService,
-			notificationService: notifiationService,
-			log:                 log,
-			orgService:          orgService,
-		},
-		orgService: orgService,
-	}
-}
-
-func (dc *NotificationProvisioner) apply(ctx context.Context, cfg *notificationsAsConfig) error {
-	if err := dc.deleteNotifications(ctx, cfg.DeleteNotifications); err != nil {
-		return err
-	}
-
-	if err := dc.mergeNotifications(ctx, cfg.Notifications); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (dc *NotificationProvisioner) deleteNotifications(ctx context.Context, notificationToDelete []*deleteNotificationConfig) error {
-	for _, notification := range notificationToDelete {
-		dc.log.Info("Deleting alert notification", "name", notification.Name, "uid", notification.UID)
-
-		if notification.OrgID == 0 && notification.OrgName != "" {
-			getOrg := org.GetOrgByNameQuery{Name: notification.OrgName}
-			res, err := dc.orgService.GetByName(ctx, &getOrg)
-			if err != nil {
-				return err
-			}
-			notification.OrgID = res.ID
-		} else if notification.OrgID < 0 {
-			notification.OrgID = 1
-		}
-
-		getNotification := &models.GetAlertNotificationsWithUidQuery{UID: notification.UID, OrgID: notification.OrgID}
-
-		res, err := dc.alertingManager.GetAlertNotificationsWithUid(ctx, getNotification)
-		if err != nil {
-			return err
-		}
-
-		if res != nil {
-			cmd := &models.DeleteAlertNotificationWithUidCommand{UID: res.UID, OrgID: getNotification.OrgID}
-			if err := dc.alertingManager.DeleteAlertNotificationWithUid(ctx, cmd); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-func (dc *NotificationProvisioner) mergeNotifications(ctx context.Context, notificationToMerge []*notificationFromConfig) error {
-	for _, notification := range notificationToMerge {
-		if notification.OrgID == 0 && notification.OrgName != "" {
-			getOrg := org.GetOrgByNameQuery{Name: notification.OrgName}
-			res, err := dc.orgService.GetByName(ctx, &getOrg)
-			if err != nil {
-				return err
-			}
-			notification.OrgID = res.ID
-		} else if notification.OrgID < 0 {
-			notification.OrgID = 1
-		}
-
-		cmd := &models.GetAlertNotificationsWithUidQuery{OrgID: notification.OrgID, UID: notification.UID}
-		res, err := dc.alertingManager.GetAlertNotificationsWithUid(ctx, cmd)
-		if err != nil {
-			return err
-		}
-
-		if res == nil {
-			dc.log.Debug("inserting alert notification from configuration", "name", notification.Name, "uid", notification.UID)
-			insertCmd := &models.CreateAlertNotificationCommand{
-				UID:                   notification.UID,
-				Name:                  notification.Name,
-				Type:                  notification.Type,
-				IsDefault:             notification.IsDefault,
-				Settings:              notification.SettingsToJSON(),
-				SecureSettings:        notification.SecureSettings,
-				OrgID:                 notification.OrgID,
-				DisableResolveMessage: notification.DisableResolveMessage,
-				Frequency:             notification.Frequency,
-				SendReminder:          notification.SendReminder,
-			}
-
-			_, err := dc.alertingManager.CreateAlertNotificationCommand(ctx, insertCmd)
-			if err != nil {
-				return err
-			}
-		} else {
-			dc.log.Debug("updating alert notification from configuration", "name", notification.Name)
-			updateCmd := &models.UpdateAlertNotificationWithUidCommand{
-				UID:                   notification.UID,
-				Name:                  notification.Name,
-				Type:                  notification.Type,
-				IsDefault:             notification.IsDefault,
-				Settings:              notification.SettingsToJSON(),
-				SecureSettings:        notification.SecureSettings,
-				OrgID:                 notification.OrgID,
-				DisableResolveMessage: notification.DisableResolveMessage,
-				Frequency:             notification.Frequency,
-				SendReminder:          notification.SendReminder,
-			}
-
-			if _, err := dc.alertingManager.UpdateAlertNotificationWithUid(ctx, updateCmd); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-func (dc *NotificationProvisioner) applyChanges(ctx context.Context, configPath string) error {
-	configs, err := dc.cfgProvider.readConfig(ctx, configPath)
-	if err != nil {
-		return err
-	}
-
-	for _, cfg := range configs {
-		if err := dc.apply(ctx, cfg); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/pkg/services/provisioning/notifiers/config_reader.go b/pkg/services/provisioning/notifiers/config_reader.go
deleted file mode 100644
index 7e87891a932ca..0000000000000
--- a/pkg/services/provisioning/notifiers/config_reader.go
+++ /dev/null
@@ -1,192 +0,0 @@
-package notifiers
-
-import (
-	"context"
-	"fmt"
-	"io/fs"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"gopkg.in/yaml.v3"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/encryption"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/services/org"
-	"github.com/grafana/grafana/pkg/services/provisioning/utils"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-type configReader struct {
-	encryptionService   encryption.Internal
-	notificationService *notifications.NotificationService
-	orgService          org.Service
-	log                 log.Logger
-}
-
-func (cr *configReader) readConfig(ctx context.Context, path string) ([]*notificationsAsConfig, error) {
-	var notifications []*notificationsAsConfig
-	cr.log.Debug("Looking for alert notification provisioning files", "path", path)
-
-	files, err := os.ReadDir(path)
-	if err != nil {
-		cr.log.Error("Can't read alert notification provisioning files from directory", "path", path, "error", err)
-		return notifications, nil
-	}
-
-	for _, file := range files {
-		if strings.HasSuffix(file.Name(), ".yaml") || strings.HasSuffix(file.Name(), ".yml") {
-			cr.log.Debug("Parsing alert notifications provisioning file", "path", path, "file.Name", file.Name())
-			notifs, err := cr.parseNotificationConfig(path, file)
-			if err != nil {
-				return nil, err
-			}
-
-			if notifs != nil {
-				notifications = append(notifications, notifs)
-			}
-		}
-	}
-
-	cr.log.Debug("Validating alert notifications")
-	if err = cr.validateRequiredField(notifications); err != nil {
-		return nil, err
-	}
-
-	if err := cr.checkOrgIDAndOrgName(ctx, notifications); err != nil {
-		return nil, err
-	}
-
-	if err := cr.validateNotifications(notifications); err != nil {
-		return nil, err
-	}
-
-	return notifications, nil
-}
-
-func (cr *configReader) parseNotificationConfig(path string, file fs.DirEntry) (*notificationsAsConfig, error) {
-	filename, _ := filepath.Abs(filepath.Join(path, file.Name()))
-
-	// nolint:gosec
-	// We can ignore the gosec G304 warning on this one because `filename` comes from ps.Cfg.ProvisioningPath
-	yamlFile, err := os.ReadFile(filename)
-	if err != nil {
-		return nil, err
-	}
-
-	var cfg *notificationsAsConfigV0
-	err = yaml.Unmarshal(yamlFile, &cfg)
-	if err != nil {
-		return nil, err
-	}
-
-	return cfg.mapToNotificationFromConfig(), nil
-}
-
-func (cr *configReader) checkOrgIDAndOrgName(ctx context.Context, notifications []*notificationsAsConfig) error {
-	for i := range notifications {
-		for _, notification := range notifications[i].Notifications {
-			if notification.OrgID < 1 {
-				if notification.OrgName == "" {
-					notification.OrgID = 1
-				} else {
-					notification.OrgID = 0
-				}
-			} else {
-				if err := utils.CheckOrgExists(ctx, cr.orgService, notification.OrgID); err != nil {
-					return fmt.Errorf("failed to provision %q notification: %w", notification.Name, err)
-				}
-			}
-		}
-
-		for _, notification := range notifications[i].DeleteNotifications {
-			if notification.OrgID < 1 {
-				if notification.OrgName == "" {
-					notification.OrgID = 1
-				} else {
-					notification.OrgID = 0
-				}
-			}
-		}
-	}
-	return nil
-}
-
-func (cr *configReader) validateRequiredField(notifications []*notificationsAsConfig) error {
-	for i := range notifications {
-		var errStrings []string
-		for index, notification := range notifications[i].Notifications {
-			if notification.Name == "" {
-				errStrings = append(
-					errStrings,
-					fmt.Sprintf("Added alert notification item %d in configuration doesn't contain required field name", index+1),
-				)
-			}
-
-			if notification.UID == "" {
-				errStrings = append(
-					errStrings,
-					fmt.Sprintf("Added alert notification item %d in configuration doesn't contain required field uid", index+1),
-				)
-			}
-		}
-
-		for index, notification := range notifications[i].DeleteNotifications {
-			if notification.Name == "" {
-				errStrings = append(
-					errStrings,
-					fmt.Sprintf("Deleted alert notification item %d in configuration doesn't contain required field name", index+1),
-				)
-			}
-
-			if notification.UID == "" {
-				errStrings = append(
-					errStrings,
-					fmt.Sprintf("Deleted alert notification item %d in configuration doesn't contain required field uid", index+1),
-				)
-			}
-		}
-
-		if len(errStrings) != 0 {
-			return fmt.Errorf(strings.Join(errStrings, "\n"))
-		}
-	}
-
-	return nil
-}
-
-func (cr *configReader) validateNotifications(notifications []*notificationsAsConfig) error {
-	for i := range notifications {
-		if notifications[i].Notifications == nil {
-			continue
-		}
-
-		for _, notification := range notifications[i].Notifications {
-			encryptedSecureSettings, err := cr.encryptionService.EncryptJsonData(
-				context.Background(),
-				notification.SecureSettings,
-				setting.SecretKey,
-			)
-
-			if err != nil {
-				return err
-			}
-
-			_, err = alerting.InitNotifier(&models.AlertNotification{
-				Name:           notification.Name,
-				Settings:       notification.SettingsToJSON(),
-				SecureSettings: encryptedSecureSettings,
-				Type:           notification.Type,
-			}, cr.encryptionService.GetDecryptedValue, cr.notificationService)
-
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
diff --git a/pkg/services/provisioning/notifiers/config_reader_test.go b/pkg/services/provisioning/notifiers/config_reader_test.go
deleted file mode 100644
index 8f0bd71bb6733..0000000000000
--- a/pkg/services/provisioning/notifiers/config_reader_test.go
+++ /dev/null
@@ -1,369 +0,0 @@
-package notifiers
-
-import (
-	"context"
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/alerting/models"
-	"github.com/grafana/grafana/pkg/services/alerting/notifiers"
-	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
-	"github.com/grafana/grafana/pkg/services/notifications"
-	"github.com/grafana/grafana/pkg/services/org"
-	"github.com/grafana/grafana/pkg/services/org/orgimpl"
-	"github.com/grafana/grafana/pkg/services/quota/quotatest"
-	"github.com/grafana/grafana/pkg/services/sqlstore"
-)
-
-var (
-	correctProperties            = "./testdata/test-configs/correct-properties"
-	incorrectSettings            = "./testdata/test-configs/incorrect-settings"
-	noRequiredFields             = "./testdata/test-configs/no-required-fields"
-	correctPropertiesWithOrgName = "./testdata/test-configs/correct-properties-with-orgName"
-	brokenYaml                   = "./testdata/test-configs/broken-yaml"
-	doubleNotificationsConfig    = "./testdata/test-configs/double-default"
-	emptyFolder                  = "./testdata/test-configs/empty_folder"
-	emptyFile                    = "./testdata/test-configs/empty"
-	twoNotificationsConfig       = "./testdata/test-configs/two-notifications"
-	unknownNotifier              = "./testdata/test-configs/unknown-notifier"
-)
-
-func TestNotificationAsConfig(t *testing.T) {
-	var sqlStore *sqlstore.SQLStore
-	var orgService org.Service
-	var ns *alerting.AlertNotificationService
-	logger := log.New("fake.log")
-
-	encryptionService := encryptionservice.SetupTestService(t)
-
-	t.Run("Testing notification as configuration", func(t *testing.T) {
-		setup := func() {
-			sqlStore = db.InitTestDB(t)
-			orgService, _ = orgimpl.ProvideService(sqlStore, sqlStore.Cfg, quotatest.New(false, nil))
-			nm := &notifications.NotificationService{}
-			ns = alerting.ProvideService(sqlStore, encryptionService, nm)
-
-			for i := 1; i < 5; i++ {
-				orgCommand := org.CreateOrgCommand{Name: fmt.Sprintf("Main Org. %v", i)}
-				_, err := orgService.CreateWithMember(context.Background(), &orgCommand)
-				require.NoError(t, err)
-			}
-
-			alerting.RegisterNotifier(&alerting.NotifierPlugin{
-				Type:    "slack",
-				Name:    "slack",
-				Factory: notifiers.NewSlackNotifier,
-			})
-
-			alerting.RegisterNotifier(&alerting.NotifierPlugin{
-				Type:    "email",
-				Name:    "email",
-				Factory: notifiers.NewEmailNotifier,
-			})
-		}
-
-		t.Run("Can read correct properties", func(t *testing.T) {
-			setup()
-			t.Setenv("TEST_VAR", "default")
-			cfgProvider := &configReader{
-				orgService:        orgService,
-				encryptionService: encryptionService,
-				log:               log.New("test logger"),
-			}
-
-			cfg, err := cfgProvider.readConfig(context.Background(), correctProperties)
-			if err != nil {
-				t.Fatalf("readConfig return an error %v", err)
-			}
-			require.Equal(t, len(cfg), 1)
-
-			ntCfg := cfg[0]
-			nts := ntCfg.Notifications
-			require.Equal(t, len(nts), 4)
-
-			nt := nts[0]
-			require.Equal(t, nt.Name, "default-slack-notification")
-			require.Equal(t, nt.Type, "slack")
-			require.Equal(t, nt.OrgID, int64(2))
-			require.Equal(t, nt.UID, "notifier1")
-			require.True(t, nt.IsDefault)
-			require.Equal(t, nt.Settings, map[string]any{
-				"recipient": "XXX", "token": "xoxb", "uploadImage": true, "url": "https://slack.com",
-			})
-			require.Equal(t, nt.SecureSettings, map[string]string{
-				"token": "xoxbsecure", "url": "https://slack.com/secure",
-			})
-			require.True(t, nt.SendReminder)
-			require.Equal(t, nt.Frequency, "1h")
-
-			nt = nts[1]
-			require.Equal(t, nt.Name, "another-not-default-notification")
-			require.Equal(t, nt.Type, "email")
-			require.Equal(t, nt.OrgID, int64(3))
-			require.Equal(t, nt.UID, "notifier2")
-			require.False(t, nt.IsDefault)
-
-			nt = nts[2]
-			require.Equal(t, nt.Name, "check-unset-is_default-is-false")
-			require.Equal(t, nt.Type, "slack")
-			require.Equal(t, nt.OrgID, int64(3))
-			require.Equal(t, nt.UID, "notifier3")
-			require.False(t, nt.IsDefault)
-
-			nt = nts[3]
-			require.Equal(t, nt.Name, "Added notification with whitespaces in name")
-			require.Equal(t, nt.Type, "email")
-			require.Equal(t, nt.UID, "notifier4")
-			require.Equal(t, nt.OrgID, int64(3))
-
-			deleteNts := ntCfg.DeleteNotifications
-			require.Equal(t, len(deleteNts), 4)
-
-			deleteNt := deleteNts[0]
-			require.Equal(t, deleteNt.Name, "default-slack-notification")
-			require.Equal(t, deleteNt.UID, "notifier1")
-			require.Equal(t, deleteNt.OrgID, int64(2))
-
-			deleteNt = deleteNts[1]
-			require.Equal(t, deleteNt.Name, "deleted-notification-without-orgId")
-			require.Equal(t, deleteNt.OrgID, int64(1))
-			require.Equal(t, deleteNt.UID, "notifier2")
-
-			deleteNt = deleteNts[2]
-			require.Equal(t, deleteNt.Name, "deleted-notification-with-0-orgId")
-			require.Equal(t, deleteNt.OrgID, int64(1))
-			require.Equal(t, deleteNt.UID, "notifier3")
-
-			deleteNt = deleteNts[3]
-			require.Equal(t, deleteNt.Name, "Deleted notification with whitespaces in name")
-			require.Equal(t, deleteNt.OrgID, int64(1))
-			require.Equal(t, deleteNt.UID, "notifier4")
-		})
-
-		t.Run("One configured notification", func(t *testing.T) {
-			t.Run("no notification in database", func(t *testing.T) {
-				setup()
-				fakeAlertNotification := &fakeAlertNotification{}
-				fakeAlertNotification.ExpectedAlertNotification = &models.AlertNotification{OrgID: 1}
-				dc := newNotificationProvisioner(orgService, fakeAlertNotification, encryptionService, nil, logger)
-
-				err := dc.applyChanges(context.Background(), twoNotificationsConfig)
-				if err != nil {
-					t.Fatalf("applyChanges return an error %v", err)
-				}
-			})
-
-			t.Run("One notification in database with same name and uid", func(t *testing.T) {
-				setup()
-				existingNotificationCmd := models.CreateAlertNotificationCommand{
-					Name:  "channel1",
-					OrgID: 1,
-					UID:   "notifier1",
-					Type:  "slack",
-				}
-				res, err := ns.SQLStore.CreateAlertNotificationCommand(context.Background(), &existingNotificationCmd)
-				require.NoError(t, err)
-				require.NotNil(t, res)
-				notificationsQuery := models.GetAllAlertNotificationsQuery{OrgID: 1}
-				results, err := ns.SQLStore.GetAllAlertNotifications(context.Background(), &notificationsQuery)
-				require.NoError(t, err)
-				require.NotNil(t, results)
-				require.Equal(t, len(results), 1)
-
-				t.Run("should update one notification", func(t *testing.T) {
-					dc := newNotificationProvisioner(orgService, &fakeAlertNotification{}, encryptionService, nil, logger)
-					err = dc.applyChanges(context.Background(), twoNotificationsConfig)
-					if err != nil {
-						t.Fatalf("applyChanges return an error %v", err)
-					}
-				})
-			})
-
-			t.Run("Two notifications with is_default", func(t *testing.T) {
-				setup()
-				dc := newNotificationProvisioner(orgService, &fakeAlertNotification{}, encryptionService, nil, logger)
-				err := dc.applyChanges(context.Background(), doubleNotificationsConfig)
-				t.Run("should both be inserted", func(t *testing.T) {
-					require.NoError(t, err)
-				})
-			})
-		})
-
-		t.Run("Two configured notification", func(t *testing.T) {
-			t.Run("two other notifications in database", func(t *testing.T) {
-				setup()
-				existingNotificationCmd := models.CreateAlertNotificationCommand{
-					Name:  "channel0",
-					OrgID: 1,
-					UID:   "notifier0",
-					Type:  "slack",
-				}
-				_, err := ns.SQLStore.CreateAlertNotificationCommand(context.Background(), &existingNotificationCmd)
-				require.NoError(t, err)
-				existingNotificationCmd = models.CreateAlertNotificationCommand{
-					Name:  "channel3",
-					OrgID: 1,
-					UID:   "notifier3",
-					Type:  "slack",
-				}
-				_, err = ns.SQLStore.CreateAlertNotificationCommand(context.Background(), &existingNotificationCmd)
-				require.NoError(t, err)
-
-				notificationsQuery := models.GetAllAlertNotificationsQuery{OrgID: 1}
-				res, err := ns.GetAllAlertNotifications(context.Background(), &notificationsQuery)
-				require.NoError(t, err)
-				require.NotNil(t, res)
-				require.Equal(t, len(res), 2)
-
-				t.Run("should have two new notifications", func(t *testing.T) {
-					dc := newNotificationProvisioner(orgService, &fakeAlertNotification{}, encryptionService, nil, logger)
-					err := dc.applyChanges(context.Background(), twoNotificationsConfig)
-					if err != nil {
-						t.Fatalf("applyChanges return an error %v", err)
-					}
-				})
-			})
-		})
-
-		t.Run("Can read correct properties with orgName instead of orgId", func(t *testing.T) {
-			setup()
-
-			existingNotificationCmd := models.CreateAlertNotificationCommand{
-				Name:  "default-notification-delete",
-				OrgID: 1,
-				UID:   "notifier2",
-				Type:  "slack",
-			}
-			_, err := ns.SQLStore.CreateAlertNotificationCommand(context.Background(), &existingNotificationCmd)
-			require.NoError(t, err)
-
-			dc := newNotificationProvisioner(orgService, &fakeAlertNotification{}, encryptionService, nil, logger)
-			err = dc.applyChanges(context.Background(), correctPropertiesWithOrgName)
-			if err != nil {
-				t.Fatalf("applyChanges return an error %v", err)
-			}
-		})
-
-		t.Run("Config doesn't contain required field", func(t *testing.T) {
-			setup()
-			dc := newNotificationProvisioner(orgService, &fakeAlertNotification{}, encryptionService, nil, logger)
-			err := dc.applyChanges(context.Background(), noRequiredFields)
-			require.NotNil(t, err)
-
-			errString := err.Error()
-			require.Contains(t, errString, "Deleted alert notification item 1 in configuration doesn't contain required field uid")
-			require.Contains(t, errString, "Deleted alert notification item 2 in configuration doesn't contain required field name")
-			require.Contains(t, errString, "Added alert notification item 1 in configuration doesn't contain required field name")
-			require.Contains(t, errString, "Added alert notification item 2 in configuration doesn't contain required field uid")
-		})
-
-		t.Run("Empty yaml file", func(t *testing.T) {
-			t.Run("should have not changed repo", func(t *testing.T) {
-				setup()
-				dc := newNotificationProvisioner(orgService, &fakeAlertNotification{}, encryptionService, nil, logger)
-				err := dc.applyChanges(context.Background(), emptyFile)
-				if err != nil {
-					t.Fatalf("applyChanges return an error %v", err)
-				}
-				notificationsQuery := models.GetAllAlertNotificationsQuery{OrgID: 1}
-				res, err := ns.GetAllAlertNotifications(context.Background(), &notificationsQuery)
-				require.NoError(t, err)
-				require.Empty(t, res)
-			})
-		})
-
-		t.Run("Broken yaml should return error", func(t *testing.T) {
-			reader := &configReader{
-				orgService:        orgService,
-				encryptionService: encryptionService,
-				log:               log.New("test logger"),
-			}
-
-			_, err := reader.readConfig(context.Background(), brokenYaml)
-			require.NotNil(t, err)
-		})
-
-		t.Run("Skip invalid directory", func(t *testing.T) {
-			cfgProvider := &configReader{
-				orgService:        orgService,
-				encryptionService: encryptionService,
-				log:               log.New("test logger"),
-			}
-
-			cfg, err := cfgProvider.readConfig(context.Background(), emptyFolder)
-			if err != nil {
-				t.Fatalf("readConfig return an error %v", err)
-			}
-			require.Equal(t, len(cfg), 0)
-		})
-
-		t.Run("Unknown notifier should return error", func(t *testing.T) {
-			cfgProvider := &configReader{
-				orgService:        orgService,
-				encryptionService: encryptionService,
-				log:               log.New("test logger"),
-			}
-			_, err := cfgProvider.readConfig(context.Background(), unknownNotifier)
-			require.NotNil(t, err)
-			require.Equal(t, err.Error(), `unsupported notification type "nonexisting"`)
-		})
-
-		t.Run("Read incorrect properties", func(t *testing.T) {
-			cfgProvider := &configReader{
-				orgService:        orgService,
-				encryptionService: encryptionService,
-				log:               log.New("test logger"),
-			}
-			_, err := cfgProvider.readConfig(context.Background(), incorrectSettings)
-			require.NotNil(t, err)
-			require.Equal(t, err.Error(), "alert validation error: token must be specified when using the Slack chat API")
-		})
-	})
-}
-
-type fakeAlertNotification struct {
-	ExpectedAlertNotification *models.AlertNotification
-}
-
-func (f *fakeAlertNotification) GetAlertNotifications(ctx context.Context, query *models.GetAlertNotificationsQuery) (*models.AlertNotification, error) {
-	return f.ExpectedAlertNotification, nil
-}
-func (f *fakeAlertNotification) CreateAlertNotificationCommand(ctx context.Context, cmd *models.CreateAlertNotificationCommand) (*models.AlertNotification, error) {
-	return nil, nil
-}
-func (f *fakeAlertNotification) UpdateAlertNotification(ctx context.Context, cmd *models.UpdateAlertNotificationCommand) (*models.AlertNotification, error) {
-	return nil, nil
-}
-func (f *fakeAlertNotification) DeleteAlertNotification(ctx context.Context, cmd *models.DeleteAlertNotificationCommand) error {
-	return nil
-}
-func (f *fakeAlertNotification) GetAllAlertNotifications(ctx context.Context, query *models.GetAllAlertNotificationsQuery) ([]*models.AlertNotification, error) {
-	return nil, nil
-}
-func (f *fakeAlertNotification) GetOrCreateAlertNotificationState(ctx context.Context, cmd *models.GetOrCreateNotificationStateQuery) (*models.AlertNotificationState, error) {
-	return nil, nil
-}
-func (f *fakeAlertNotification) SetAlertNotificationStateToCompleteCommand(ctx context.Context, cmd *models.SetAlertNotificationStateToCompleteCommand) error {
-	return nil
-}
-func (f *fakeAlertNotification) SetAlertNotificationStateToPendingCommand(ctx context.Context, cmd *models.SetAlertNotificationStateToPendingCommand) error {
-	return nil
-}
-func (f *fakeAlertNotification) GetAlertNotificationsWithUid(ctx context.Context, query *models.GetAlertNotificationsWithUidQuery) (*models.AlertNotification, error) {
-	return nil, nil
-}
-func (f *fakeAlertNotification) DeleteAlertNotificationWithUid(ctx context.Context, cmd *models.DeleteAlertNotificationWithUidCommand) error {
-	return nil
-}
-func (f *fakeAlertNotification) GetAlertNotificationsWithUidToSend(ctx context.Context, query *models.GetAlertNotificationsWithUidToSendQuery) ([]*models.AlertNotification, error) {
-	return nil, nil
-}
-
-func (f *fakeAlertNotification) UpdateAlertNotificationWithUid(ctx context.Context, cmd *models.UpdateAlertNotificationWithUidCommand) (*models.AlertNotification, error) {
-	return nil, nil
-}
diff --git a/pkg/services/provisioning/notifiers/testdata/test-configs/broken-yaml/broken.yaml b/pkg/services/provisioning/notifiers/testdata/test-configs/broken-yaml/broken.yaml
deleted file mode 100644
index 72f2fbdbf635f..0000000000000
--- a/pkg/services/provisioning/notifiers/testdata/test-configs/broken-yaml/broken.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-notifiers:
-  - name: notification-channel-1
-     type: slack
-    org_id: 2
-     is_default: true
-   settings:
-      recipient: "XXX"
-      token: "xoxb"
-      uploadImage: true
\ No newline at end of file
diff --git a/pkg/services/provisioning/notifiers/testdata/test-configs/broken-yaml/not.yaml.text b/pkg/services/provisioning/notifiers/testdata/test-configs/broken-yaml/not.yaml.text
deleted file mode 100644
index 9050f543cefdf..0000000000000
--- a/pkg/services/provisioning/notifiers/testdata/test-configs/broken-yaml/not.yaml.text
+++ /dev/null
@@ -1,6 +0,0 @@
-#sfxzgnsxzcvnbzcvn
-cvbn
-cvbn
-c
-vbn
-cvbncvbn
\ No newline at end of file
diff --git a/pkg/services/provisioning/notifiers/testdata/test-configs/correct-properties-with-orgName/correct-properties-with-orgName.yaml b/pkg/services/provisioning/notifiers/testdata/test-configs/correct-properties-with-orgName/correct-properties-with-orgName.yaml
deleted file mode 100644
index 25c4536d1f397..0000000000000
--- a/pkg/services/provisioning/notifiers/testdata/test-configs/correct-properties-with-orgName/correct-properties-with-orgName.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-notifiers:
-  - name: default-notification-create
-    type: email
-    uid: notifier2
-    settings:
-      addresses: example@example.com
-    org_name: Main Org. 2
-    is_default: false  
-delete_notifiers:
-  - name: default-notification-delete
-    org_name: Main Org. 2
-    uid: notifier2
\ No newline at end of file
diff --git a/pkg/services/provisioning/notifiers/testdata/test-configs/correct-properties/correct-properties.yaml b/pkg/services/provisioning/notifiers/testdata/test-configs/correct-properties/correct-properties.yaml
deleted file mode 100644
index 417455ff85782..0000000000000
--- a/pkg/services/provisioning/notifiers/testdata/test-configs/correct-properties/correct-properties.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-notifiers:
-  - name: $TEST_VAR-slack-notification
-    type: slack
-    uid: notifier1
-    org_id: 2
-    is_default: true
-    send_reminder: true
-    frequency: 1h
-    settings:
-      recipient: "XXX"
-      token: "xoxb"
-      uploadImage: true
-      url: https://slack.com
-    secure_settings:
-      url: https://slack.com/secure
-      token: "xoxbsecure"
-  - name: another-not-default-notification
-    type: email
-    settings:
-      addresses: example@example.com
-    org_id: 3
-    uid: "notifier2"
-    is_default: false
-  - name: check-unset-is_default-is-false
-    type: slack
-    org_id: 3
-    uid: "notifier3"
-    settings:
-      url: https://slack.com
-  - name: Added notification with whitespaces in name
-    type: email
-    org_id: 3
-    uid: "notifier4"
-    settings:
-      addresses: example@example.com
-delete_notifiers:
-  - name: default-slack-notification
-    org_id: 2
-    uid: notifier1
-  - name: deleted-notification-without-orgId
-    uid: "notifier2"
-  - name: deleted-notification-with-0-orgId
-    org_id: 0
-    uid: "notifier3"
-  - name: Deleted notification with whitespaces in name
-    uid: "notifier4"
diff --git a/pkg/services/provisioning/notifiers/testdata/test-configs/double-default/default-1.yml b/pkg/services/provisioning/notifiers/testdata/test-configs/double-default/default-1.yml
deleted file mode 100644
index d9d2fe6608117..0000000000000
--- a/pkg/services/provisioning/notifiers/testdata/test-configs/double-default/default-1.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-notifiers:
-  - name: first-default
-    type: slack
-    uid: notifier1
-    is_default: true
-    settings:
-      url: https://slack.com
\ No newline at end of file
diff --git a/pkg/services/provisioning/notifiers/testdata/test-configs/double-default/default-2.yaml b/pkg/services/provisioning/notifiers/testdata/test-configs/double-default/default-2.yaml
deleted file mode 100644
index 878f8b48aa56e..0000000000000
--- a/pkg/services/provisioning/notifiers/testdata/test-configs/double-default/default-2.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-notifiers:
-  - name: second-default
-    type: email
-    uid: notifier2
-    is_default: true
-    settings:
-      addresses: example@example.com
\ No newline at end of file
diff --git a/pkg/services/provisioning/notifiers/testdata/test-configs/empty_folder/.gitignore b/pkg/services/provisioning/notifiers/testdata/test-configs/empty_folder/.gitignore
deleted file mode 100644
index 86d0cb2726c6c..0000000000000
--- a/pkg/services/provisioning/notifiers/testdata/test-configs/empty_folder/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
\ No newline at end of file
diff --git a/pkg/services/provisioning/notifiers/testdata/test-configs/incorrect-settings/incorrect-settings.yaml b/pkg/services/provisioning/notifiers/testdata/test-configs/incorrect-settings/incorrect-settings.yaml
deleted file mode 100644
index b79c6e9761c92..0000000000000
--- a/pkg/services/provisioning/notifiers/testdata/test-configs/incorrect-settings/incorrect-settings.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-notifiers:
-  - name: slack-notification-without-token-in-settings
-    type: slack
-    org_id: 2
-    uid: notifier1
-    is_default: true
-    settings:
-      recipient: "XXX"
-      uploadImage: true
diff --git a/pkg/services/provisioning/notifiers/testdata/test-configs/no-required-fields/no-required-fields.yaml b/pkg/services/provisioning/notifiers/testdata/test-configs/no-required-fields/no-required-fields.yaml
deleted file mode 100644
index 55ff545525e05..0000000000000
--- a/pkg/services/provisioning/notifiers/testdata/test-configs/no-required-fields/no-required-fields.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-notifiers:
-  - type: slack
-    org_id: 2
-    uid: no-name_added-notification
-    is_default: true
-    settings:
-      recipient: "XXX"
-      token: "xoxb"
-      uploadImage: true
-  - name: no-uid 
-    type: slack
-    org_id: 2    
-    is_default: true
-    settings:
-      recipient: "XXX"
-      token: "xoxb"
-      uploadImage: true
-delete_notifiers:
-  - name: no-uid 
-    type: slack
-    org_id: 2    
-    is_default: true
-    settings:
-      recipient: "XXX"
-      token: "xoxb"
-      uploadImage: true
-  - type: slack
-    org_id: 2
-    uid: no-name_added-notification
-    is_default: true
-    settings:
-      recipient: "XXX"
-      token: "xoxb"
-      uploadImage: true
-      
\ No newline at end of file
diff --git a/pkg/services/provisioning/notifiers/testdata/test-configs/two-notifications/two-notifications.yaml b/pkg/services/provisioning/notifiers/testdata/test-configs/two-notifications/two-notifications.yaml
deleted file mode 100644
index aeeb718e6debd..0000000000000
--- a/pkg/services/provisioning/notifiers/testdata/test-configs/two-notifications/two-notifications.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-notifiers:  
-  - name: channel1
-    type: email
-    uid: notifier1
-    org_id: 1
-    settings:
-      addresses: example@example.com
-  - name: channel2
-    type: slack
-    uid: notifier2
-    settings:
-      url: http://slack.com
diff --git a/pkg/services/provisioning/notifiers/testdata/test-configs/unknown-notifier/notification.yaml b/pkg/services/provisioning/notifiers/testdata/test-configs/unknown-notifier/notification.yaml
deleted file mode 100644
index ca0d3fa3c754b..0000000000000
--- a/pkg/services/provisioning/notifiers/testdata/test-configs/unknown-notifier/notification.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-notifiers:
-  - name: unknown-notifier
-    type: nonexisting
-    uid: notifier1
\ No newline at end of file
diff --git a/pkg/services/provisioning/notifiers/types.go b/pkg/services/provisioning/notifiers/types.go
deleted file mode 100644
index 9353dc67ded27..0000000000000
--- a/pkg/services/provisioning/notifiers/types.go
+++ /dev/null
@@ -1,107 +0,0 @@
-package notifiers
-
-import (
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/services/provisioning/values"
-)
-
-// notificationsAsConfig is normalized data object for notifications config data. Any config version should be mappable
-// to this type.
-type notificationsAsConfig struct {
-	Notifications       []*notificationFromConfig
-	DeleteNotifications []*deleteNotificationConfig
-}
-
-type deleteNotificationConfig struct {
-	UID     string
-	Name    string
-	OrgID   int64
-	OrgName string
-}
-
-type notificationFromConfig struct {
-	UID                   string
-	OrgID                 int64
-	OrgName               string
-	Name                  string
-	Type                  string
-	SendReminder          bool
-	DisableResolveMessage bool
-	Frequency             string
-	IsDefault             bool
-	Settings              map[string]any
-	SecureSettings        map[string]string
-}
-
-// notificationsAsConfigV0 is mapping for zero version configs. This is mapped to its normalised version.
-type notificationsAsConfigV0 struct {
-	Notifications       []*notificationFromConfigV0   `json:"notifiers" yaml:"notifiers"`
-	DeleteNotifications []*deleteNotificationConfigV0 `json:"delete_notifiers" yaml:"delete_notifiers"`
-}
-
-type deleteNotificationConfigV0 struct {
-	UID     values.StringValue `json:"uid" yaml:"uid"`
-	Name    values.StringValue `json:"name" yaml:"name"`
-	OrgID   values.Int64Value  `json:"org_id" yaml:"org_id"`
-	OrgName values.StringValue `json:"org_name" yaml:"org_name"`
-}
-
-type notificationFromConfigV0 struct {
-	UID                   values.StringValue    `json:"uid" yaml:"uid"`
-	OrgID                 values.Int64Value     `json:"org_id" yaml:"org_id"`
-	OrgName               values.StringValue    `json:"org_name" yaml:"org_name"`
-	Name                  values.StringValue    `json:"name" yaml:"name"`
-	Type                  values.StringValue    `json:"type" yaml:"type"`
-	SendReminder          values.BoolValue      `json:"send_reminder" yaml:"send_reminder"`
-	DisableResolveMessage values.BoolValue      `json:"disable_resolve_message" yaml:"disable_resolve_message"`
-	Frequency             values.StringValue    `json:"frequency" yaml:"frequency"`
-	IsDefault             values.BoolValue      `json:"is_default" yaml:"is_default"`
-	Settings              values.JSONValue      `json:"settings" yaml:"settings"`
-	SecureSettings        values.StringMapValue `json:"secure_settings" yaml:"secure_settings"`
-}
-
-func (notification notificationFromConfig) SettingsToJSON() *simplejson.Json {
-	settings := simplejson.New()
-	if len(notification.Settings) > 0 {
-		for k, v := range notification.Settings {
-			settings.Set(k, v)
-		}
-	}
-	return settings
-}
-
-// mapToNotificationFromConfig maps config syntax to normalized notificationsAsConfig object. Every version
-// of the config syntax should have this function.
-func (cfg *notificationsAsConfigV0) mapToNotificationFromConfig() *notificationsAsConfig {
-	r := &notificationsAsConfig{}
-	if cfg == nil {
-		return r
-	}
-
-	for _, notification := range cfg.Notifications {
-		r.Notifications = append(r.Notifications, &notificationFromConfig{
-			UID:                   notification.UID.Value(),
-			OrgID:                 notification.OrgID.Value(),
-			OrgName:               notification.OrgName.Value(),
-			Name:                  notification.Name.Value(),
-			Type:                  notification.Type.Value(),
-			IsDefault:             notification.IsDefault.Value(),
-			Settings:              notification.Settings.Value(),
-			DisableResolveMessage: notification.DisableResolveMessage.Value(),
-			Frequency:             notification.Frequency.Value(),
-			SendReminder:          notification.SendReminder.Value(),
-			SecureSettings:        notification.SecureSettings.Value(),
-		})
-	}
-
-	for _, notification := range cfg.DeleteNotifications {
-		r.DeleteNotifications = append(r.DeleteNotifications, &deleteNotificationConfig{
-			UID:     notification.UID.Value(),
-			OrgID:   notification.OrgID.Value(),
-			OrgName: notification.OrgName.Value(),
-			Name:    notification.Name.Value(),
-		})
-	}
-
-	return r
-}
diff --git a/pkg/services/provisioning/provisioning.go b/pkg/services/provisioning/provisioning.go
index f1b1ffb0b640c..a0f60d0b2f684 100644
--- a/pkg/services/provisioning/provisioning.go
+++ b/pkg/services/provisioning/provisioning.go
@@ -10,12 +10,13 @@ import (
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/registry"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/services/correlations"
 	dashboardservice "github.com/grafana/grafana/pkg/services/dashboards"
 	datasourceservice "github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/encryption"
 	"github.com/grafana/grafana/pkg/services/folder"
+	alertingauthz "github.com/grafana/grafana/pkg/services/ngalert/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/ngalert/notifier"
 	"github.com/grafana/grafana/pkg/services/ngalert/provisioning"
 	"github.com/grafana/grafana/pkg/services/ngalert/store"
 	"github.com/grafana/grafana/pkg/services/notifications"
@@ -25,7 +26,6 @@ import (
 	prov_alerting "github.com/grafana/grafana/pkg/services/provisioning/alerting"
 	"github.com/grafana/grafana/pkg/services/provisioning/dashboards"
 	"github.com/grafana/grafana/pkg/services/provisioning/datasources"
-	"github.com/grafana/grafana/pkg/services/provisioning/notifiers"
 	"github.com/grafana/grafana/pkg/services/provisioning/plugins"
 	"github.com/grafana/grafana/pkg/services/quota"
 	"github.com/grafana/grafana/pkg/services/searchV2"
@@ -45,7 +45,6 @@ func ProvideService(
 	correlationsService correlations.Service,
 	dashboardService dashboardservice.DashboardService,
 	folderService folder.Service,
-	alertingService *alerting.AlertNotificationService,
 	pluginSettings pluginsettings.Service,
 	searchService searchV2.SearchService,
 	quotaService quota.Service,
@@ -60,7 +59,6 @@ func ProvideService(
 		EncryptionService:            encryptionService,
 		NotificationService:          notificatonService,
 		newDashboardProvisioner:      dashboards.New,
-		provisionNotifiers:           notifiers.Provision,
 		provisionDatasources:         datasources.Provision,
 		provisionPlugins:             plugins.Provision,
 		provisionAlerting:            prov_alerting.Provision,
@@ -68,23 +66,38 @@ func ProvideService(
 		dashboardService:             dashboardService,
 		datasourceService:            datasourceService,
 		correlationsService:          correlationsService,
-		alertingService:              alertingService,
 		pluginsSettings:              pluginSettings,
 		searchService:                searchService,
 		quotaService:                 quotaService,
 		secretService:                secrectService,
 		log:                          log.New("provisioning"),
 		orgService:                   orgService,
+		folderService:                folderService,
 	}
+
+	err := s.setDashboardProvisioner()
+	if err != nil {
+		return nil, fmt.Errorf("%v: %w", "Failed to create provisioner", err)
+	}
+
 	return s, nil
 }
 
+func (ps *ProvisioningServiceImpl) setDashboardProvisioner() error {
+	dashboardPath := filepath.Join(ps.Cfg.ProvisioningPath, "dashboards")
+	dashProvisioner, err := ps.newDashboardProvisioner(context.Background(), dashboardPath, ps.dashboardProvisioningService, ps.orgService, ps.dashboardService, ps.folderService)
+	if err != nil {
+		return fmt.Errorf("%v: %w", "Failed to create provisioner", err)
+	}
+	ps.dashboardProvisioner = dashProvisioner
+	return nil
+}
+
 type ProvisioningService interface {
 	registry.BackgroundService
 	RunInitProvisioners(ctx context.Context) error
 	ProvisionDatasources(ctx context.Context) error
 	ProvisionPlugins(ctx context.Context) error
-	ProvisionNotifications(ctx context.Context) error
 	ProvisionDashboards(ctx context.Context) error
 	ProvisionAlerting(ctx context.Context) error
 	GetDashboardProvisionerResolvedPath(name string) string
@@ -97,7 +110,6 @@ func NewProvisioningServiceImpl() *ProvisioningServiceImpl {
 	return &ProvisioningServiceImpl{
 		log:                     logger,
 		newDashboardProvisioner: dashboards.New,
-		provisionNotifiers:      notifiers.Provision,
 		provisionDatasources:    datasources.Provision,
 		provisionPlugins:        plugins.Provision,
 	}
@@ -106,16 +118,15 @@ func NewProvisioningServiceImpl() *ProvisioningServiceImpl {
 // Used for testing purposes
 func newProvisioningServiceImpl(
 	newDashboardProvisioner dashboards.DashboardProvisionerFactory,
-	provisionNotifiers func(context.Context, string, notifiers.Manager, org.Service, encryption.Internal, *notifications.NotificationService) error,
 	provisionDatasources func(context.Context, string, datasources.Store, datasources.CorrelationsStore, org.Service) error,
 	provisionPlugins func(context.Context, string, pluginstore.Store, pluginsettings.Service, org.Service) error,
 ) *ProvisioningServiceImpl {
 	return &ProvisioningServiceImpl{
 		log:                     log.New("provisioning"),
 		newDashboardProvisioner: newDashboardProvisioner,
-		provisionNotifiers:      provisionNotifiers,
 		provisionDatasources:    provisionDatasources,
 		provisionPlugins:        provisionPlugins,
+		Cfg:                     setting.NewCfg(),
 	}
 }
 
@@ -131,7 +142,6 @@ type ProvisioningServiceImpl struct {
 	pollingCtxCancel             context.CancelFunc
 	newDashboardProvisioner      dashboards.DashboardProvisionerFactory
 	dashboardProvisioner         dashboards.DashboardProvisioner
-	provisionNotifiers           func(context.Context, string, notifiers.Manager, org.Service, encryption.Internal, *notifications.NotificationService) error
 	provisionDatasources         func(context.Context, string, datasources.Store, datasources.CorrelationsStore, org.Service) error
 	provisionPlugins             func(context.Context, string, pluginstore.Store, pluginsettings.Service, org.Service) error
 	provisionAlerting            func(context.Context, prov_alerting.ProvisionerConfig) error
@@ -140,11 +150,11 @@ type ProvisioningServiceImpl struct {
 	dashboardService             dashboardservice.DashboardService
 	datasourceService            datasourceservice.DataSourceService
 	correlationsService          correlations.Service
-	alertingService              *alerting.AlertNotificationService
 	pluginsSettings              pluginsettings.Service
 	searchService                searchV2.SearchService
 	quotaService                 quota.Service
 	secretService                secrets.Service
+	folderService                folder.Service
 }
 
 func (ps *ProvisioningServiceImpl) RunInitProvisioners(ctx context.Context) error {
@@ -160,12 +170,6 @@ func (ps *ProvisioningServiceImpl) RunInitProvisioners(ctx context.Context) erro
 		return err
 	}
 
-	err = ps.ProvisionNotifications(ctx)
-	if err != nil {
-		ps.log.Error("Failed to provision alert notifications", "error", err)
-		return err
-	}
-
 	err = ps.ProvisionAlerting(ctx)
 	if err != nil {
 		ps.log.Error("Failed to provision alerting", "error", err)
@@ -227,36 +231,19 @@ func (ps *ProvisioningServiceImpl) ProvisionPlugins(ctx context.Context) error {
 	return nil
 }
 
-func (ps *ProvisioningServiceImpl) ProvisionNotifications(ctx context.Context) error {
-	alertNotificationsPath := filepath.Join(ps.Cfg.ProvisioningPath, "notifiers")
-	if err := ps.provisionNotifiers(ctx, alertNotificationsPath, ps.alertingService, ps.orgService, ps.EncryptionService, ps.NotificationService); err != nil {
-		err = fmt.Errorf("%v: %w", "Alert notification provisioning error", err)
-		ps.log.Error("Failed to provision alert notifications", "error", err)
-		return err
-	}
-	return nil
-}
-
 func (ps *ProvisioningServiceImpl) ProvisionDashboards(ctx context.Context) error {
-	dashboardPath := filepath.Join(ps.Cfg.ProvisioningPath, "dashboards")
-	dashProvisioner, err := ps.newDashboardProvisioner(ctx, dashboardPath, ps.dashboardProvisioningService, ps.orgService, ps.dashboardService)
-	if err != nil {
-		return fmt.Errorf("%v: %w", "Failed to create provisioner", err)
-	}
-
 	ps.mutex.Lock()
 	defer ps.mutex.Unlock()
 
 	ps.cancelPolling()
-	dashProvisioner.CleanUpOrphanedDashboards(ctx)
+	ps.dashboardProvisioner.CleanUpOrphanedDashboards(ctx)
 
-	err = dashProvisioner.Provision(ctx)
+	err := ps.dashboardProvisioner.Provision(ctx)
 	if err != nil {
 		// If we fail to provision with the new provisioner, the mutex will unlock and the polling will restart with the
 		// old provisioner as we did not switch them yet.
 		return fmt.Errorf("%v: %w", "Failed to provision dashboards", err)
 	}
-	ps.dashboardProvisioner = dashProvisioner
 	return nil
 }
 
@@ -267,20 +254,25 @@ func (ps *ProvisioningServiceImpl) ProvisionAlerting(ctx context.Context) error
 		SQLStore:         ps.SQLStore,
 		Logger:           ps.log,
 		FolderService:    nil, // we don't use it yet
-		AccessControl:    ps.ac,
 		DashboardService: ps.dashboardService,
 	}
 	ruleService := provisioning.NewAlertRuleService(
 		st,
 		st,
+		nil,
 		ps.dashboardService,
 		ps.quotaService,
 		ps.SQLStore,
 		int64(ps.Cfg.UnifiedAlerting.DefaultRuleEvaluationInterval.Seconds()),
 		int64(ps.Cfg.UnifiedAlerting.BaseInterval.Seconds()),
-		ps.log)
+		ps.Cfg.UnifiedAlerting.RulesPerRuleGroupLimit,
+		ps.log,
+		notifier.NewCachedNotificationSettingsValidationService(&st),
+		alertingauthz.NewRuleService(ps.ac),
+	)
+	receiverSvc := notifier.NewReceiverService(ps.ac, &st, st, ps.secretService, ps.SQLStore, ps.log)
 	contactPointService := provisioning.NewContactPointService(&st, ps.secretService,
-		st, ps.SQLStore, ps.log, ps.ac)
+		st, ps.SQLStore, receiverSvc, ps.log, &st)
 	notificationPolicyService := provisioning.NewNotificationPolicyService(&st,
 		st, ps.SQLStore, ps.Cfg.UnifiedAlerting, ps.log)
 	mutetimingsService := provisioning.NewMuteTimingService(&st, st, &st, ps.log)
diff --git a/pkg/services/provisioning/provisioning_mock.go b/pkg/services/provisioning/provisioning_mock.go
index 8c2aaa7cd6171..d094821f36e6e 100644
--- a/pkg/services/provisioning/provisioning_mock.go
+++ b/pkg/services/provisioning/provisioning_mock.go
@@ -6,7 +6,6 @@ type Calls struct {
 	RunInitProvisioners                 []any
 	ProvisionDatasources                []any
 	ProvisionPlugins                    []any
-	ProvisionNotifications              []any
 	ProvisionDashboards                 []any
 	ProvisionAlerting                   []any
 	GetDashboardProvisionerResolvedPath []any
@@ -19,7 +18,6 @@ type ProvisioningServiceMock struct {
 	RunInitProvisionersFunc                 func(ctx context.Context) error
 	ProvisionDatasourcesFunc                func(ctx context.Context) error
 	ProvisionPluginsFunc                    func() error
-	ProvisionNotificationsFunc              func() error
 	ProvisionDashboardsFunc                 func() error
 	GetDashboardProvisionerResolvedPathFunc func(name string) string
 	GetAllowUIUpdatesFromConfigFunc         func(name string) bool
@@ -56,14 +54,6 @@ func (mock *ProvisioningServiceMock) ProvisionPlugins(ctx context.Context) error
 	return nil
 }
 
-func (mock *ProvisioningServiceMock) ProvisionNotifications(ctx context.Context) error {
-	mock.Calls.ProvisionNotifications = append(mock.Calls.ProvisionNotifications, nil)
-	if mock.ProvisionNotificationsFunc != nil {
-		return mock.ProvisionNotificationsFunc()
-	}
-	return nil
-}
-
 func (mock *ProvisioningServiceMock) ProvisionDashboards(ctx context.Context) error {
 	mock.Calls.ProvisionDashboards = append(mock.Calls.ProvisionDashboards, nil)
 	if mock.ProvisionDashboardsFunc != nil {
diff --git a/pkg/services/provisioning/provisioning_test.go b/pkg/services/provisioning/provisioning_test.go
index e7626af9d3744..93691f7b12a8e 100644
--- a/pkg/services/provisioning/provisioning_test.go
+++ b/pkg/services/provisioning/provisioning_test.go
@@ -7,17 +7,18 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	dashboardstore "github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/provisioning/dashboards"
 	"github.com/grafana/grafana/pkg/services/provisioning/utils"
-	"github.com/grafana/grafana/pkg/setting"
 )
 
 func TestProvisioningServiceImpl(t *testing.T) {
 	t.Run("Restart dashboard provisioning and stop service", func(t *testing.T) {
-		serviceTest := setup()
+		serviceTest := setup(t)
 		err := serviceTest.service.ProvisionDashboards(context.Background())
 		assert.Nil(t, err)
 		serviceTest.startService()
@@ -44,7 +45,7 @@ func TestProvisioningServiceImpl(t *testing.T) {
 	})
 
 	t.Run("Failed reloading does not stop polling with old provisioned", func(t *testing.T) {
-		serviceTest := setup()
+		serviceTest := setup(t)
 		err := serviceTest.service.ProvisionDashboards(context.Background())
 		assert.Nil(t, err)
 		serviceTest.startService()
@@ -82,7 +83,7 @@ type serviceTestStruct struct {
 	service *ProvisioningServiceImpl
 }
 
-func setup() *serviceTestStruct {
+func setup(t *testing.T) *serviceTestStruct {
 	serviceTest := &serviceTestStruct{}
 	serviceTest.waitTimeout = time.Second
 
@@ -95,14 +96,14 @@ func setup() *serviceTestStruct {
 	}
 
 	serviceTest.service = newProvisioningServiceImpl(
-		func(context.Context, string, dashboardstore.DashboardProvisioningService, org.Service, utils.DashboardStore) (dashboards.DashboardProvisioner, error) {
+		func(context.Context, string, dashboardstore.DashboardProvisioningService, org.Service, utils.DashboardStore, folder.Service) (dashboards.DashboardProvisioner, error) {
 			return serviceTest.mock, nil
 		},
 		nil,
 		nil,
-		nil,
 	)
-	serviceTest.service.Cfg = setting.NewCfg()
+	err := serviceTest.service.setDashboardProvisioner()
+	require.NoError(t, err)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	serviceTest.cancel = cancel
diff --git a/pkg/services/publicdashboards/api/api.go b/pkg/services/publicdashboards/api/api.go
index 8ab2b0172e721..2aa8dea58d9a5 100644
--- a/pkg/services/publicdashboards/api/api.go
+++ b/pkg/services/publicdashboards/api/api.go
@@ -1,9 +1,11 @@
 package api
 
 import (
+	"context"
 	"net/http"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/api/routing"
 	"github.com/grafana/grafana/pkg/infra/log"
@@ -12,39 +14,55 @@ import (
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/licensing"
 	"github.com/grafana/grafana/pkg/services/publicdashboards"
 	. "github.com/grafana/grafana/pkg/services/publicdashboards/models"
 	"github.com/grafana/grafana/pkg/services/publicdashboards/validation"
+	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/web"
 )
 
 type Api struct {
 	PublicDashboardService publicdashboards.Service
-	RouteRegister          routing.RouteRegister
-	AccessControl          accesscontrol.AccessControl
-	Features               *featuremgmt.FeatureManager
-	Log                    log.Logger
+	Middleware             publicdashboards.Middleware
+
+	accessControl accesscontrol.AccessControl
+	cfg           *setting.Cfg
+	features      featuremgmt.FeatureToggles
+	license       licensing.Licensing
+	log           log.Logger
+	routeRegister routing.RouteRegister
 }
 
 func ProvideApi(
 	pd publicdashboards.Service,
 	rr routing.RouteRegister,
 	ac accesscontrol.AccessControl,
-	features *featuremgmt.FeatureManager,
+	features featuremgmt.FeatureToggles,
+	md publicdashboards.Middleware,
+	cfg *setting.Cfg,
+	license licensing.Licensing,
 ) *Api {
 	api := &Api{
 		PublicDashboardService: pd,
-		RouteRegister:          rr,
-		AccessControl:          ac,
-		Features:               features,
-		Log:                    log.New("publicdashboards.api"),
+		Middleware:             md,
+		accessControl:          ac,
+		cfg:                    cfg,
+		features:               features,
+		license:                license,
+		log:                    log.New("publicdashboards.api"),
+		routeRegister:          rr,
 	}
 
-	// attach api if PublicDashboards feature flag is enabled
-	if features.IsEnabled(featuremgmt.FlagPublicDashboards) {
+	// register endpoints if the feature is enabled
+	if features.IsEnabledGlobally(featuremgmt.FlagPublicDashboards) && cfg.PublicDashboardsEnabled {
 		api.RegisterAPIEndpoints()
 	}
 
+	if !features.IsEnabledGlobally(featuremgmt.FlagPublicDashboards) {
+		api.log.Warn("[Deprecated] The publicDashboards feature toggle will be removed in Grafana v11. To disable the public dashboards feature, use the public_dashboards.enabled setting.")
+	}
+
 	return api
 }
 
@@ -54,41 +72,48 @@ func (api *Api) RegisterAPIEndpoints() {
 	// Anonymous access to public dashboard route is configured in pkg/api/api.go
 	// because it is deeply dependent on the HTTPServer.Index() method and would result in a
 	// circular dependency
-
-	api.RouteRegister.Get("/api/public/dashboards/:accessToken", routing.Wrap(api.ViewPublicDashboard))
-	api.RouteRegister.Post("/api/public/dashboards/:accessToken/panels/:panelId/query", routing.Wrap(api.QueryPublicDashboard))
-	api.RouteRegister.Get("/api/public/dashboards/:accessToken/annotations", routing.Wrap(api.GetAnnotations))
+	api.routeRegister.Group("/api/public/dashboards/:accessToken", func(apiRoute routing.RouteRegister) {
+		apiRoute.Get("/", routing.Wrap(api.ViewPublicDashboard))
+		apiRoute.Get("/annotations", routing.Wrap(api.GetPublicAnnotations))
+		apiRoute.Post("/panels/:panelId/query", routing.Wrap(api.QueryPublicDashboard))
+	}, api.Middleware.HandleApi)
 
 	// Auth endpoints
-	auth := accesscontrol.Middleware(api.AccessControl)
+	auth := accesscontrol.Middleware(api.accessControl)
 	uidScope := dashboards.ScopeDashboardsProvider.GetResourceScopeUID(accesscontrol.Parameter(":dashboardUid"))
 
 	// List public dashboards for org
-	api.RouteRegister.Get("/api/dashboards/public-dashboards", middleware.ReqSignedIn, routing.Wrap(api.ListPublicDashboards))
-
+	api.routeRegister.Get("/api/dashboards/public-dashboards", middleware.ReqSignedIn, routing.Wrap(api.ListPublicDashboards))
 	// Get public dashboard
-	api.RouteRegister.Get("/api/dashboards/uid/:dashboardUid/public-dashboards",
+	api.routeRegister.Get("/api/dashboards/uid/:dashboardUid/public-dashboards",
 		auth(accesscontrol.EvalPermission(dashboards.ActionDashboardsRead, uidScope)),
 		routing.Wrap(api.GetPublicDashboard))
 
 	// Create Public Dashboard
-	api.RouteRegister.Post("/api/dashboards/uid/:dashboardUid/public-dashboards",
+	api.routeRegister.Post("/api/dashboards/uid/:dashboardUid/public-dashboards",
 		auth(accesscontrol.EvalPermission(dashboards.ActionDashboardsPublicWrite, uidScope)),
 		routing.Wrap(api.CreatePublicDashboard))
 
 	// Update Public Dashboard
-	api.RouteRegister.Patch("/api/dashboards/uid/:dashboardUid/public-dashboards/:uid",
+	api.routeRegister.Patch("/api/dashboards/uid/:dashboardUid/public-dashboards/:uid",
 		auth(accesscontrol.EvalPermission(dashboards.ActionDashboardsPublicWrite, uidScope)),
 		routing.Wrap(api.UpdatePublicDashboard))
 
 	// Delete Public dashboard
-	api.RouteRegister.Delete("/api/dashboards/uid/:dashboardUid/public-dashboards/:uid",
+	api.routeRegister.Delete("/api/dashboards/uid/:dashboardUid/public-dashboards/:uid",
 		auth(accesscontrol.EvalPermission(dashboards.ActionDashboardsPublicWrite, uidScope)),
 		routing.Wrap(api.DeletePublicDashboard))
 }
 
-// ListPublicDashboards Gets list of public dashboards by orgId
-// GET /api/dashboards/public-dashboards
+// swagger:route GET /dashboards/public-dashboards dashboard_public listPublicDashboards
+//
+//	Get list of public dashboards
+//
+// Responses:
+// 200: listPublicDashboardsResponse
+// 401: unauthorisedPublicError
+// 403: forbiddenPublicError
+// 500: internalServerPublicError
 func (api *Api) ListPublicDashboards(c *contextmodel.ReqContext) response.Response {
 	perPage := c.QueryInt("perpage")
 	if perPage <= 0 {
@@ -114,8 +139,17 @@ func (api *Api) ListPublicDashboards(c *contextmodel.ReqContext) response.Respon
 	return response.JSON(http.StatusOK, resp)
 }
 
-// GetPublicDashboard Gets public dashboard for dashboard
-// GET /api/dashboards/uid/:dashboardUid/public-dashboards
+// swagger:route GET /dashboards/uid/{dashboardUid}/public-dashboards dashboard_public getPublicDashboard
+//
+//	Get public dashboard by dashboardUid
+//
+// Responses:
+// 200: getPublicDashboardResponse
+// 400: badRequestPublicError
+// 401: unauthorisedPublicError
+// 403: forbiddenPublicError
+// 404: notFoundPublicError
+// 500: internalServerPublicError
 func (api *Api) GetPublicDashboard(c *contextmodel.ReqContext) response.Response {
 	// exit if we don't have a valid dashboardUid
 	dashboardUid := web.Params(c.Req)[":dashboardUid"]
@@ -128,15 +162,26 @@ func (api *Api) GetPublicDashboard(c *contextmodel.ReqContext) response.Response
 		return response.Err(err)
 	}
 
-	if pd == nil {
-		response.Err(ErrPublicDashboardNotFound.Errorf("GetPublicDashboard: public dashboard not found"))
+	if pd == nil || (!api.license.FeatureEnabled(FeaturePublicDashboardsEmailSharing) && pd.Share == EmailShareType) {
+		return response.Err(ErrPublicDashboardNotFound.Errorf("GetPublicDashboard: public dashboard not found"))
 	}
 
 	return response.JSON(http.StatusOK, pd)
 }
 
-// CreatePublicDashboard Sets public dashboard for dashboard
-// POST /api/dashboards/uid/:dashboardUid/public-dashboards
+// swagger:route POST /dashboards/uid/{dashboardUid}/public-dashboards dashboard_public createPublicDashboard
+//
+//	Create public dashboard for a dashboard
+//
+// Produces:
+// - application/json
+//
+// Responses:
+// 200: createPublicDashboardResponse
+// 400: badRequestPublicError
+// 401: unauthorisedPublicError
+// 403: forbiddenPublicError
+// 500: internalServerPublicError
 func (api *Api) CreatePublicDashboard(c *contextmodel.ReqContext) response.Response {
 	// exit if we don't have a valid dashboardUid
 	dashboardUid := web.Params(c.Req)[":dashboardUid"]
@@ -178,8 +223,19 @@ func (api *Api) CreatePublicDashboard(c *contextmodel.ReqContext) response.Respo
 	return response.JSON(http.StatusOK, pd)
 }
 
-// UpdatePublicDashboard Sets public dashboard for dashboard
-// PATCH /api/dashboards/uid/:dashboardUid/public-dashboards/:uid
+// swagger:route PATCH /dashboards/uid/{dashboardUid}/public-dashboards/{uid} dashboard_public updatePublicDashboard
+//
+//	Update public dashboard for a dashboard
+//
+// Produces:
+// - application/json
+//
+// Responses:
+// 200: updatePublicDashboardResponse
+// 400: badRequestPublicError
+// 401: unauthorisedPublicError
+// 403: forbiddenPublicError
+// 500: internalServerPublicError
 func (api *Api) UpdatePublicDashboard(c *contextmodel.ReqContext) response.Response {
 	// exit if we don't have a valid dashboardUid
 	dashboardUid := web.Params(c.Req)[":dashboardUid"]
@@ -215,8 +271,16 @@ func (api *Api) UpdatePublicDashboard(c *contextmodel.ReqContext) response.Respo
 	return response.JSON(http.StatusOK, pd)
 }
 
-// Delete a public dashboard
-// DELETE /api/dashboards/uid/:dashboardUid/public-dashboards/:uid
+// swagger:route DELETE /dashboards/uid/{dashboardUid}/public-dashboards/{uid} dashboard_public deletePublicDashboard
+//
+//	Delete public dashboard for a dashboard
+//
+// Responses:
+// 200: okResponse
+// 400: badRequestPublicError
+// 401: unauthorisedPublicError
+// 403: forbiddenPublicError
+// 500: internalServerPublicError
 func (api *Api) DeletePublicDashboard(c *contextmodel.ReqContext) response.Response {
 	uid := web.Params(c.Req)[":uid"]
 	if !validation.IsValidShortUID(uid) {
@@ -237,9 +301,9 @@ func (api *Api) DeletePublicDashboard(c *contextmodel.ReqContext) response.Respo
 }
 
 // Copied from pkg/api/metrics.go
-func toJsonStreamingResponse(features *featuremgmt.FeatureManager, qdr *backend.QueryDataResponse) response.Response {
+func toJsonStreamingResponse(ctx context.Context, features featuremgmt.FeatureToggles, qdr *backend.QueryDataResponse) response.Response {
 	statusWhenError := http.StatusBadRequest
-	if features.IsEnabled(featuremgmt.FlagDatasourceQueryMultiStatus) {
+	if features.IsEnabled(ctx, featuremgmt.FlagDatasourceQueryMultiStatus) {
 		statusWhenError = http.StatusMultiStatus
 	}
 
@@ -252,3 +316,66 @@ func toJsonStreamingResponse(features *featuremgmt.FeatureManager, qdr *backend.
 
 	return response.JSONStreaming(statusCode, qdr)
 }
+
+// swagger:response listPublicDashboardsResponse
+type ListPublicDashboardsResponse struct {
+	// in: body
+	Body PublicDashboardListResponseWithPagination `json:"body"`
+}
+
+// swagger:parameters getPublicDashboard
+type GetPublicDashboardParams struct {
+	// in:path
+	DashboardUid string `json:"dashboardUid"`
+}
+
+// swagger:response getPublicDashboardResponse
+type GetPublicDashboardResponse struct {
+	// in: body
+	Body PublicDashboard `json:"body"`
+}
+
+// swagger:parameters createPublicDashboard
+type CreatePublicDashboardParams struct {
+	// in:path
+	// required:true
+	DashboardUid string `json:"dashboardUid"`
+	// in:body
+	// required:true
+	Body PublicDashboardDTO
+}
+
+// swagger:response createPublicDashboardResponse
+type CreatePublicDashboardResponse struct {
+	// in: body
+	Body PublicDashboard `json:"body"`
+}
+
+// swagger:parameters updatePublicDashboard
+type UpdatePublicDashboardParams struct {
+	// in:path
+	// required:true
+	DashboardUid string `json:"dashboardUid"`
+	// in:path
+	// required:true
+	Uid string `json:"uid"`
+	// in:body
+	// required:true
+	Body PublicDashboardDTO
+}
+
+// swagger:response updatePublicDashboardResponse
+type UpdatePublicDashboardResponse struct {
+	// in: body
+	Body PublicDashboard `json:"body"`
+}
+
+// swagger:parameters deletePublicDashboard
+type DeletePublicDashboardParams struct {
+	// in:path
+	// required:true
+	DashboardUid string `json:"dashboardUid"`
+	// in:path
+	// required:true
+	Uid string `json:"uid"`
+}
diff --git a/pkg/services/publicdashboards/api/api_test.go b/pkg/services/publicdashboards/api/api_test.go
index 176bacd7aed2c..1984e7de1da17 100644
--- a/pkg/services/publicdashboards/api/api_test.go
+++ b/pkg/services/publicdashboards/api/api_test.go
@@ -13,7 +13,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/publicdashboards"
 	. "github.com/grafana/grafana/pkg/services/publicdashboards/models"
@@ -27,7 +26,7 @@ var userAdmin = &user.SignedInUser{UserID: 2, OrgID: 1, OrgRole: org.RoleAdmin,
 var userViewer = &user.SignedInUser{UserID: 4, OrgID: 1, OrgRole: org.RoleViewer, Login: "testViewerUserRBAC", Permissions: map[int64]map[string][]string{1: {dashboards.ActionDashboardsRead: {dashboards.ScopeDashboardsAll}}}}
 var anonymousUser = &user.SignedInUser{IsAnonymous: true}
 
-func TestAPIFeatureFlag(t *testing.T) {
+func TestAPIFeatureDisabled(t *testing.T) {
 	testCases := []struct {
 		Name   string
 		Method string
@@ -71,11 +70,18 @@ func TestAPIFeatureFlag(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		t.Run(test.Name, func(t *testing.T) {
+		t.Run(test.Name+" - setting disabled", func(t *testing.T) {
 			cfg := setting.NewCfg()
+			cfg.PublicDashboardsEnabled = false
+			service := publicdashboards.NewFakePublicDashboardService(t)
+			testServer := setupTestServer(t, cfg, service, userAdmin, true)
+			response := callAPI(testServer, test.Method, test.Path, nil, t)
+			assert.Equal(t, http.StatusNotFound, response.Code)
+		})
+
+		t.Run(test.Name+" - feature flag disabled", func(t *testing.T) {
 			service := publicdashboards.NewFakePublicDashboardService(t)
-			features := featuremgmt.WithFeatures()
-			testServer := setupTestServer(t, cfg, features, service, nil, userAdmin)
+			testServer := setupTestServer(t, nil, service, userAdmin, false)
 			response := callAPI(testServer, test.Method, test.Path, nil, t)
 			assert.Equal(t, http.StatusNotFound, response.Code)
 		})
@@ -130,9 +136,7 @@ func TestAPIListPublicDashboard(t *testing.T) {
 			service.On("FindAllWithPagination", mock.Anything, mock.Anything, mock.Anything).
 				Return(test.Response, test.ResponseErr).Maybe()
 
-			cfg := setting.NewCfg()
-			features := featuremgmt.WithFeatures(featuremgmt.FlagPublicDashboards)
-			testServer := setupTestServer(t, cfg, features, service, nil, test.User)
+			testServer := setupTestServer(t, nil, service, test.User, true)
 
 			response := callAPI(testServer, http.MethodGet, "/api/dashboards/public-dashboards", nil, t)
 			assert.Equal(t, test.ExpectedHttpResponse, response.Code)
@@ -259,19 +263,13 @@ func TestAPIDeletePublicDashboard(t *testing.T) {
 					Return(test.ResponseErr)
 			}
 
-			cfg := setting.NewCfg()
-
-			features := featuremgmt.WithFeatures(featuremgmt.FlagPublicDashboards)
-			testServer := setupTestServer(t, cfg, features, service, nil, test.User)
+			testServer := setupTestServer(t, nil, service, test.User, true)
 
 			response := callAPI(testServer, http.MethodDelete, fmt.Sprintf("/api/dashboards/uid/%s/public-dashboards/%s", test.DashboardUid, test.PublicDashboardUid), nil, t)
 			assert.Equal(t, test.ExpectedHttpResponse, response.Code)
 
 			if test.ExpectedHttpResponse == http.StatusOK {
-				var jsonResp any
-				err := json.Unmarshal(response.Body.Bytes(), &jsonResp)
-				require.NoError(t, err)
-				assert.Equal(t, jsonResp, nil)
+				assert.Equal(t, []byte(nil), response.Body.Bytes())
 			}
 
 			if !test.ShouldCallService {
@@ -347,16 +345,7 @@ func TestAPIGetPublicDashboard(t *testing.T) {
 					Return(test.PublicDashboardResult, test.PublicDashboardErr)
 			}
 
-			cfg := setting.NewCfg()
-
-			testServer := setupTestServer(
-				t,
-				cfg,
-				featuremgmt.WithFeatures(featuremgmt.FlagPublicDashboards),
-				service,
-				nil,
-				test.User,
-			)
+			testServer := setupTestServer(t, nil, service, test.User, true)
 
 			response := callAPI(
 				testServer,
@@ -474,16 +463,7 @@ func TestApiCreatePublicDashboard(t *testing.T) {
 					Return(&PublicDashboard{IsEnabled: true}, test.SaveDashboardErr)
 			}
 
-			cfg := setting.NewCfg()
-
-			testServer := setupTestServer(
-				t,
-				cfg,
-				featuremgmt.WithFeatures(featuremgmt.FlagPublicDashboards),
-				service,
-				nil,
-				test.User,
-			)
+			testServer := setupTestServer(t, nil, service, test.User, true)
 
 			response := callAPI(
 				testServer,
@@ -609,9 +589,6 @@ func TestAPIUpdatePublicDashboard(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		cfg := setting.NewCfg()
-		features := featuremgmt.WithFeatures(featuremgmt.FlagPublicDashboards)
-
 		t.Run(test.Name, func(t *testing.T) {
 			service := publicdashboards.NewFakePublicDashboardService(t)
 
@@ -620,7 +597,7 @@ func TestAPIUpdatePublicDashboard(t *testing.T) {
 					Return(test.ExpectedResponse, test.ExpectedError)
 			}
 
-			testServer := setupTestServer(t, cfg, features, service, nil, test.User)
+			testServer := setupTestServer(t, nil, service, test.User, true)
 			url := fmt.Sprintf("/api/dashboards/uid/%s/public-dashboards/%s", test.DashboardUid, test.PublicDashboardUid)
 			body := strings.NewReader(test.Body)
 
diff --git a/pkg/services/publicdashboards/api/common_test.go b/pkg/services/publicdashboards/api/common_test.go
index 5a7993d9be3f4..e4ea82ea5d813 100644
--- a/pkg/services/publicdashboards/api/common_test.go
+++ b/pkg/services/publicdashboards/api/common_test.go
@@ -16,8 +16,6 @@ import (
 	"github.com/grafana/grafana/pkg/infra/localcache"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/plugins"
-	"github.com/grafana/grafana/pkg/plugins/config"
-	"github.com/grafana/grafana/pkg/plugins/manager/fakes"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
 	"github.com/grafana/grafana/pkg/services/contexthandler/ctxkey"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
@@ -26,25 +24,34 @@ import (
 	"github.com/grafana/grafana/pkg/services/datasources/guardian"
 	datasourceService "github.com/grafana/grafana/pkg/services/datasources/service"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/licensing/licensingtest"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginconfig"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
 	pluginSettings "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings/service"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 	"github.com/grafana/grafana/pkg/services/publicdashboards"
+	publicdashboardModels "github.com/grafana/grafana/pkg/services/publicdashboards/models"
 	"github.com/grafana/grafana/pkg/services/query"
 	fakeSecrets "github.com/grafana/grafana/pkg/services/secrets/fakes"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 	"github.com/grafana/grafana/pkg/web"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func setupTestServer(
 	t *testing.T,
 	cfg *setting.Cfg,
-	features *featuremgmt.FeatureManager,
 	service publicdashboards.Service,
-	db db.DB,
 	user *user.SignedInUser,
+	ffEnabled bool,
 ) *web.Mux {
+	t.Helper()
+
 	// build router to register routes
 	rr := routing.NewRouteRegister()
 
@@ -56,9 +63,20 @@ func setupTestServer(
 	// set initial context
 	m.Use(contextProvider(&testContext{user}))
 
-	// build api, this will mount the routes at the same time if
-	// featuremgmt.FlagPublicDashboard is enabled
-	ProvideApi(service, rr, ac, features)
+	features := featuremgmt.WithFeatures()
+	if ffEnabled {
+		features = featuremgmt.WithFeatures(featuremgmt.FlagPublicDashboards)
+	}
+
+	if cfg == nil {
+		cfg = setting.NewCfg()
+		cfg.PublicDashboardsEnabled = true
+	}
+
+	// build api, this will mount the routes at the same time if the feature is enabled
+	license := licensingtest.NewFakeLicensing()
+	license.On("FeatureEnabled", publicdashboardModels.FeaturePublicDashboardsEmailSharing).Return(false)
+	ProvideApi(service, rr, ac, features, &Middleware{}, cfg, license)
 
 	// connect routes to mux
 	rr.Register(m.Router)
@@ -130,8 +148,8 @@ func buildQueryDataService(t *testing.T, cs datasources.CacheService, fpc *fakeP
 					},
 				},
 			},
-		}, ds, pluginSettings.ProvideService(store, fakeSecrets.NewFakeSecretsService()), fakes.NewFakeLicensingService(),
-		&config.Cfg{})
+		}, &fakeDatasources.FakeCacheService{}, ds,
+		pluginSettings.ProvideService(store, fakeSecrets.NewFakeSecretsService()), pluginconfig.NewFakePluginRequestConfigProvider())
 
 	return query.ProvideService(
 		setting.NewCfg(),
diff --git a/pkg/services/publicdashboards/api/middleware.go b/pkg/services/publicdashboards/api/middleware.go
index cac27ffbc7971..32582a37ba763 100644
--- a/pkg/services/publicdashboards/api/middleware.go
+++ b/pkg/services/publicdashboards/api/middleware.go
@@ -67,3 +67,22 @@ func CountPublicDashboardRequest() func(c *contextmodel.ReqContext) {
 		metrics.MPublicDashboardRequestCount.Inc()
 	}
 }
+
+// Empty middleware created in order to bind the enterprise one
+type Middleware struct {
+}
+
+var _ publicdashboards.Middleware = (*Middleware)(nil)
+
+func ProvideMiddleware() *Middleware {
+	return &Middleware{}
+}
+func (m *Middleware) HandleApi(c *contextmodel.ReqContext) {
+}
+func (m *Middleware) HandleView(c *contextmodel.ReqContext) {
+}
+func (m *Middleware) HandleAccessView(c *contextmodel.ReqContext) {
+}
+func (m *Middleware) HandleConfirmAccessView(c *contextmodel.ReqContext) {
+
+}
diff --git a/pkg/services/publicdashboards/api/query.go b/pkg/services/publicdashboards/api/query.go
index 0e3b29eb67134..1f43b1234125e 100644
--- a/pkg/services/publicdashboards/api/query.go
+++ b/pkg/services/publicdashboards/api/query.go
@@ -4,6 +4,9 @@ import (
 	"net/http"
 	"strconv"
 
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+
+	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/api/response"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	. "github.com/grafana/grafana/pkg/services/publicdashboards/models"
@@ -11,8 +14,17 @@ import (
 	"github.com/grafana/grafana/pkg/web"
 )
 
-// ViewPublicDashboard Gets public dashboard
-// GET /api/public/dashboards/:accessToken
+// swagger:route GET /public/dashboards/{accessToken} dashboard_public viewPublicDashboard
+//
+//	Get public dashboard for view
+//
+// Responses:
+// 200: viewPublicDashboardResponse
+// 400: badRequestPublicError
+// 401: unauthorisedPublicError
+// 403: forbiddenPublicError
+// 404: notFoundPublicError
+// 500: internalServerPublicError
 func (api *Api) ViewPublicDashboard(c *contextmodel.ReqContext) response.Response {
 	accessToken := web.Params(c.Req)[":accessToken"]
 	if !validation.IsValidAccessToken(accessToken) {
@@ -27,8 +39,18 @@ func (api *Api) ViewPublicDashboard(c *contextmodel.ReqContext) response.Respons
 	return response.JSON(http.StatusOK, dto)
 }
 
-// QueryPublicDashboard returns all results for a given panel on a public dashboard
-// POST /api/public/dashboard/:accessToken/panels/:panelId/query
+// swagger:route POST /public/dashboards/{accessToken}/panels/{panelId}/query dashboard_public queryPublicDashboard
+//
+//	Get results for a given panel on a public dashboard
+//
+// Responses:
+// 200: queryPublicDashboardResponse
+// 400: badRequestPublicError
+// 401: unauthorisedPublicError
+// 404: panelNotFoundPublicError
+// 404: notFoundPublicError
+// 403: forbiddenPublicError
+// 500: internalServerPublicError
 func (api *Api) QueryPublicDashboard(c *contextmodel.ReqContext) response.Response {
 	accessToken := web.Params(c.Req)[":accessToken"]
 	if !validation.IsValidAccessToken(accessToken) {
@@ -50,15 +72,24 @@ func (api *Api) QueryPublicDashboard(c *contextmodel.ReqContext) response.Respon
 		return response.Err(err)
 	}
 
-	return toJsonStreamingResponse(api.Features, resp)
+	return toJsonStreamingResponse(c.Req.Context(), api.features, resp)
 }
 
-// GetAnnotations returns annotations for a public dashboard
-// GET /api/public/dashboards/:accessToken/annotations
-func (api *Api) GetAnnotations(c *contextmodel.ReqContext) response.Response {
+// swagger:route GET /public/dashboards/{accessToken}/annotations dashboard_public getPublicAnnotations
+//
+//	Get annotations for a public dashboard
+//
+// Responses:
+// 200: getPublicAnnotationsResponse
+// 400: badRequestPublicError
+// 404: notFoundPublicError
+// 401: unauthorisedPublicError
+// 403: forbiddenPublicError
+// 500: internalServerPublicError
+func (api *Api) GetPublicAnnotations(c *contextmodel.ReqContext) response.Response {
 	accessToken := web.Params(c.Req)[":accessToken"]
 	if !validation.IsValidAccessToken(accessToken) {
-		return response.Err(ErrInvalidAccessToken.Errorf("GetAnnotations: invalid access token"))
+		return response.Err(ErrInvalidAccessToken.Errorf("GetPublicAnnotations: invalid access token"))
 	}
 
 	reqDTO := AnnotationsQueryDTO{
@@ -73,3 +104,41 @@ func (api *Api) GetAnnotations(c *contextmodel.ReqContext) response.Response {
 
 	return response.JSON(http.StatusOK, annotations)
 }
+
+// swagger:response viewPublicDashboardResponse
+type ViewPublicDashboardResponse struct {
+	// in: body
+	Body dtos.DashboardFullWithMeta `json:"body"`
+}
+
+// swagger:parameters viewPublicDashboard
+type ViewPublicDashboardParams struct {
+	// in: path
+	AccessToken string `json:"accessToken"`
+}
+
+// swagger:response queryPublicDashboardResponse
+type QueryPublicDashboardResponse struct {
+	// in: body
+	Body backend.QueryDataResponse `json:"body"`
+}
+
+// swagger:parameters queryPublicDashboard
+type QueryPublicDashboardParams struct {
+	// in: path
+	AccessToken string `json:"accessToken"`
+	// in: path
+	PanelId int64 `json:"panelId"`
+}
+
+// swagger:response getPublicAnnotationsResponse
+type GetPublicAnnotationsResponse struct {
+	// in: body
+	Body []AnnotationEvent `json:"body"`
+}
+
+// swagger:parameters getPublicAnnotations
+type GetPublicAnnotationsParams struct {
+	// in: path
+	AccessToken string `json:"accessToken"`
+}
diff --git a/pkg/services/publicdashboards/api/query_test.go b/pkg/services/publicdashboards/api/query_test.go
index 51d823d0048d2..b92f142a1e076 100644
--- a/pkg/services/publicdashboards/api/query_test.go
+++ b/pkg/services/publicdashboards/api/query_test.go
@@ -12,6 +12,10 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/db"
@@ -21,10 +25,14 @@ import (
 	"github.com/grafana/grafana/pkg/services/annotations/annotationstest"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	dashboardStore "github.com/grafana/grafana/pkg/services/dashboards/database"
+	"github.com/grafana/grafana/pkg/services/dashboards/service"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/datasources/guardian"
 	datasourcesService "github.com/grafana/grafana/pkg/services/datasources/service"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/folder/folderimpl"
+	"github.com/grafana/grafana/pkg/services/folder/foldertest"
+	"github.com/grafana/grafana/pkg/services/licensing/licensingtest"
 	"github.com/grafana/grafana/pkg/services/publicdashboards"
 	publicdashboardsStore "github.com/grafana/grafana/pkg/services/publicdashboards/database"
 	. "github.com/grafana/grafana/pkg/services/publicdashboards/models"
@@ -35,9 +43,6 @@ import (
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util/errutil"
 	"github.com/grafana/grafana/pkg/web"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
 )
 
 func TestAPIViewPublicDashboard(t *testing.T) {
@@ -97,16 +102,7 @@ func TestAPIViewPublicDashboard(t *testing.T) {
 			service.On("GetPublicDashboardForView", mock.Anything, mock.AnythingOfType("string")).
 				Return(test.DashboardResult, test.Err).Maybe()
 
-			cfg := setting.NewCfg()
-
-			testServer := setupTestServer(
-				t,
-				cfg,
-				featuremgmt.WithFeatures(featuremgmt.FlagPublicDashboards),
-				service,
-				nil,
-				anonymousUser,
-			)
+			testServer := setupTestServer(t, nil, service, anonymousUser, true)
 
 			response := callAPI(testServer, http.MethodGet,
 				fmt.Sprintf("/api/public/dashboards/%s", test.AccessToken),
@@ -198,16 +194,7 @@ func TestAPIQueryPublicDashboard(t *testing.T) {
 
 	setup := func(enabled bool) (*web.Mux, *publicdashboards.FakePublicDashboardService) {
 		service := publicdashboards.NewFakePublicDashboardService(t)
-		cfg := setting.NewCfg()
-
-		testServer := setupTestServer(
-			t,
-			cfg,
-			featuremgmt.WithFeatures(featuremgmt.FlagPublicDashboards, enabled),
-			service,
-			nil,
-			anonymousUser,
-		)
+		testServer := setupTestServer(t, nil, service, anonymousUser, true)
 
 		return testServer, service
 	}
@@ -290,7 +277,6 @@ func TestIntegrationUnauthenticatedUserCanGetPubdashPanelQueryData(t *testing.T)
 	// Create Dashboard
 	saveDashboardCmd := dashboards.SaveDashboardCommand{
 		OrgID:     1,
-		FolderID:  1,
 		FolderUID: "1",
 		IsFolder:  false,
 		Dashboard: simplejson.NewFromAny(map[string]any{
@@ -314,7 +300,7 @@ func TestIntegrationUnauthenticatedUserCanGetPubdashPanelQueryData(t *testing.T)
 	}
 
 	// create dashboard
-	dashboardStoreService, err := dashboardStore.ProvideDashboardStore(db, db.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(db, db.Cfg), quotatest.New(false, nil))
+	dashboardStoreService, err := dashboardStore.ProvideDashboardStore(db, db.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(db), quotatest.New(false, nil))
 	require.NoError(t, err)
 	dashboard, err := dashboardStoreService.SaveDashboard(context.Background(), saveDashboardCmd)
 	require.NoError(t, err)
@@ -334,20 +320,26 @@ func TestIntegrationUnauthenticatedUserCanGetPubdashPanelQueryData(t *testing.T)
 	// create public dashboard
 	store := publicdashboardsStore.ProvideStore(db, db.Cfg, featuremgmt.WithFeatures())
 	cfg := setting.NewCfg()
+	cfg.PublicDashboardsEnabled = true
 	ac := acmock.New()
 	ws := publicdashboardsService.ProvideServiceWrapper(store)
-	service := publicdashboardsService.ProvideService(cfg, store, qds, annotationsService, ac, ws)
-	pubdash, err := service.Create(context.Background(), &user.SignedInUser{}, savePubDashboardCmd)
+	folderStore := folderimpl.ProvideDashboardFolderStore(db)
+	dashPermissionService := acmock.NewMockedPermissionsService()
+	dashService, err := service.ProvideDashboardServiceImpl(
+		cfg, dashboardStoreService, folderStore,
+		featuremgmt.WithFeatures(), acmock.NewMockedPermissionsService(), dashPermissionService, ac,
+		foldertest.NewFakeService(), nil,
+	)
+	require.NoError(t, err)
+
+	license := licensingtest.NewFakeLicensing()
+	license.On("FeatureEnabled", FeaturePublicDashboardsEmailSharing).Return(false)
+	pds := publicdashboardsService.ProvideService(cfg, featuremgmt.WithFeatures(), store, qds, annotationsService, ac, ws, dashService, license)
+	pubdash, err := pds.Create(context.Background(), &user.SignedInUser{}, savePubDashboardCmd)
 	require.NoError(t, err)
 
 	// setup test server
-	server := setupTestServer(t,
-		cfg,
-		featuremgmt.WithFeatures(featuremgmt.FlagPublicDashboards),
-		service,
-		db,
-		anonymousUser,
-	)
+	server := setupTestServer(t, cfg, pds, anonymousUser, true)
 
 	resp := callAPI(server, http.MethodPost,
 		fmt.Sprintf("/api/public/dashboards/%s/panels/1/query", pubdash.AccessToken),
@@ -423,7 +415,6 @@ func TestAPIGetAnnotations(t *testing.T) {
 	}
 	for _, test := range testCases {
 		t.Run(test.Name, func(t *testing.T) {
-			cfg := setting.NewCfg()
 			service := publicdashboards.NewFakePublicDashboardService(t)
 
 			if test.ExpectedServiceCalled {
@@ -431,7 +422,7 @@ func TestAPIGetAnnotations(t *testing.T) {
 					Return(test.Annotations, test.ServiceError).Once()
 			}
 
-			testServer := setupTestServer(t, cfg, featuremgmt.WithFeatures(featuremgmt.FlagPublicDashboards), service, nil, anonymousUser)
+			testServer := setupTestServer(t, nil, service, anonymousUser, true)
 
 			path := fmt.Sprintf("/api/public/dashboards/%s/annotations?from=%s&to=%s", test.AccessToken, test.From, test.To)
 			response := callAPI(testServer, http.MethodGet, path, nil, t)
diff --git a/pkg/services/publicdashboards/commands/generate_datasources/generate.go b/pkg/services/publicdashboards/commands/generate_datasources/generate.go
index 072fc9f21e774..68a9c48070765 100644
--- a/pkg/services/publicdashboards/commands/generate_datasources/generate.go
+++ b/pkg/services/publicdashboards/commands/generate_datasources/generate.go
@@ -13,9 +13,8 @@ import (
 var grafanaDatasources = []string{expr.DatasourceType, "datasource"}
 
 // there are some datasources that have backend flag as true but don't call /ds/query endpoint
-var unsupportedDataSourcesMap = map[string]bool{
-	"cloudwatch": true,
-}
+// through DataSourceWithBackend class
+var unsupportedDataSourcesMap = map[string]bool{}
 
 type listPluginResponse struct {
 	Items []struct {
diff --git a/pkg/services/publicdashboards/commands/generate_datasources/main.go b/pkg/services/publicdashboards/commands/generate_datasources/main.go
index 1bdda91f4df43..67b49268fe2b2 100644
--- a/pkg/services/publicdashboards/commands/generate_datasources/main.go
+++ b/pkg/services/publicdashboards/commands/generate_datasources/main.go
@@ -26,7 +26,7 @@ func main() {
 	tsTemplate := template.Must(template.New("").Parse(tsDatasourcesTemplate))
 
 	// Generate supported datasources for Typescript
-	tsFile, err := os.Create("./../../../public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SupportedPubdashDatasources.ts")
+	tsFile, err := os.Create("./../../../../../public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SupportedPubdashDatasources.ts")
 	if err != nil {
 		fmt.Println(err)
 	}
diff --git a/pkg/services/publicdashboards/database/database.go b/pkg/services/publicdashboards/database/database.go
index d4a214d7364d8..4e1fee501073a 100644
--- a/pkg/services/publicdashboards/database/database.go
+++ b/pkg/services/publicdashboards/database/database.go
@@ -7,6 +7,7 @@ import (
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/publicdashboards"
@@ -54,12 +55,12 @@ func (d *PublicDashboardStoreImpl) FindAllWithPagination(ctx context.Context, qu
 	}
 
 	pubdashBuilder := db.NewSqlBuilder(d.cfg, d.features, d.sqlStore.GetDialect(), recursiveQueriesAreSupported)
-	pubdashBuilder.Write("SELECT dashboard_public.uid, dashboard_public.access_token, dashboard.uid as dashboard_uid, dashboard_public.is_enabled, dashboard.title")
+	pubdashBuilder.Write("SELECT dashboard_public.uid, dashboard_public.access_token, dashboard.uid as dashboard_uid, dashboard_public.is_enabled, dashboard.title, dashboard.slug")
 	pubdashBuilder.Write(" FROM dashboard_public")
 	pubdashBuilder.Write(" JOIN dashboard ON dashboard.uid = dashboard_public.dashboard_uid AND dashboard.org_id = dashboard_public.org_id")
 	pubdashBuilder.Write(` WHERE dashboard_public.org_id = ?`, query.OrgID)
 	if query.User.OrgRole != org.RoleAdmin {
-		pubdashBuilder.WriteDashboardPermissionFilter(query.User, dashboards.PERMISSION_VIEW, searchstore.TypeDashboard)
+		pubdashBuilder.WriteDashboardPermissionFilter(query.User, dashboardaccess.PERMISSION_VIEW, searchstore.TypeDashboard)
 	}
 	pubdashBuilder.Write(" ORDER BY dashboard.title")
 	pubdashBuilder.Write(d.sqlStore.GetDialect().LimitOffset(int64(query.Limit), int64(query.Offset)))
@@ -70,7 +71,7 @@ func (d *PublicDashboardStoreImpl) FindAllWithPagination(ctx context.Context, qu
 	counterBuilder.Write(" JOIN dashboard ON dashboard.uid = dashboard_public.dashboard_uid AND dashboard.org_id = dashboard_public.org_id")
 	counterBuilder.Write(` WHERE dashboard_public.org_id = ?`, query.OrgID)
 	if query.User.OrgRole != org.RoleAdmin {
-		counterBuilder.WriteDashboardPermissionFilter(query.User, dashboards.PERMISSION_VIEW, searchstore.TypeDashboard)
+		counterBuilder.WriteDashboardPermissionFilter(query.User, dashboardaccess.PERMISSION_VIEW, searchstore.TypeDashboard)
 	}
 
 	err = d.sqlStore.WithDbSession(ctx, func(sess *db.Session) error {
@@ -90,28 +91,6 @@ func (d *PublicDashboardStoreImpl) FindAllWithPagination(ctx context.Context, qu
 	return resp, nil
 }
 
-// FindDashboard returns a dashboard by orgId and dashboardUid
-func (d *PublicDashboardStoreImpl) FindDashboard(ctx context.Context, orgId int64, dashboardUid string) (*dashboards.Dashboard, error) {
-	dashboard := &dashboards.Dashboard{OrgID: orgId, UID: dashboardUid}
-
-	var found bool
-	err := d.sqlStore.WithDbSession(ctx, func(sess *db.Session) error {
-		var err error
-		found, err = sess.Get(dashboard)
-		return err
-	})
-
-	if err != nil {
-		return nil, err
-	}
-
-	if !found {
-		return nil, nil
-	}
-
-	return dashboard, nil
-}
-
 // Find Returns public dashboard by Uid or nil if not found
 func (d *PublicDashboardStoreImpl) Find(ctx context.Context, uid string) (*PublicDashboard, error) {
 	if uid == "" {
@@ -304,15 +283,11 @@ func (d *PublicDashboardStoreImpl) Delete(ctx context.Context, uid string) (int6
 	return affectedRows, err
 }
 
-func (d *PublicDashboardStoreImpl) FindByDashboardFolder(ctx context.Context, dashboard *dashboards.Dashboard) ([]*PublicDashboard, error) {
-	if dashboard == nil || !dashboard.IsFolder {
-		return nil, nil
-	}
-
+func (d *PublicDashboardStoreImpl) FindByFolder(ctx context.Context, orgId int64, folderUid string) ([]*PublicDashboard, error) {
 	var pubdashes []*PublicDashboard
 
 	err := d.sqlStore.WithDbSession(ctx, func(sess *sqlstore.DBSession) error {
-		return sess.SQL("SELECT * from dashboard_public WHERE (dashboard_uid, org_id) IN (SELECT uid, org_id FROM dashboard WHERE folder_id = ?)", dashboard.ID).Find(&pubdashes)
+		return sess.SQL("SELECT * from dashboard_public WHERE (dashboard_uid, org_id) IN (SELECT uid, org_id FROM dashboard WHERE org_id = ? AND folder_uid = ?)", orgId, folderUid).Find(&pubdashes)
 	})
 	if err != nil {
 		return nil, err
diff --git a/pkg/services/publicdashboards/database/database_test.go b/pkg/services/publicdashboards/database/database_test.go
index 2379b99a795fb..a76ca6d315423 100644
--- a/pkg/services/publicdashboards/database/database_test.go
+++ b/pkg/services/publicdashboards/database/database_test.go
@@ -7,6 +7,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
@@ -21,9 +24,8 @@ import (
 	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 	"github.com/grafana/grafana/pkg/util"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 // This is what the db sets empty time settings to
@@ -32,6 +34,11 @@ var DefaultTimeSettings = &TimeSettings{}
 // Default time to pass in with seconds rounded
 var DefaultTime = time.Now().UTC().Round(time.Second)
 
+// run tests with cleanup
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestLogPrefix(t *testing.T) {
 	assert.Equal(t, LogPrefix, "publicdashboards.store")
 }
@@ -57,15 +64,15 @@ func TestIntegrationListPublicDashboard(t *testing.T) {
 	var publicdashboardStore *PublicDashboardStoreImpl
 
 	setup := func() {
-		sqlStore, cfg = db.InitTestDBwithCfg(t, db.InitTestDBOpt{FeatureFlags: []string{featuremgmt.FlagPublicDashboards}})
+		sqlStore, cfg = db.InitTestDBwithCfg(t, db.InitTestDBOpt{})
 		quotaService := quotatest.New(false, nil)
-		dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
+		dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotaService)
 		require.NoError(t, err)
 		publicdashboardStore = ProvideStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures())
 
-		bDash = insertTestDashboard(t, dashboardStore, "b", orgId, 0, "", false)
-		aDash = insertTestDashboard(t, dashboardStore, "a", orgId, 0, "", false)
-		cDash = insertTestDashboard(t, dashboardStore, "c", orgId, 0, "", false)
+		bDash = insertTestDashboard(t, dashboardStore, "b", orgId, "", false)
+		aDash = insertTestDashboard(t, dashboardStore, "a", orgId, "", false)
+		cDash = insertTestDashboard(t, dashboardStore, "c", orgId, "", false)
 
 		// these are in order of how they should be returned from ListPUblicDashboards
 		aPublicDash = insertPublicDashboard(t, publicdashboardStore, aDash.UID, orgId, false, PublicShareType)
@@ -161,36 +168,6 @@ func TestIntegrationListPublicDashboard(t *testing.T) {
 	})
 }
 
-func TestIntegrationFindDashboard(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	var sqlStore db.DB
-	var cfg *setting.Cfg
-	var dashboardStore dashboards.Store
-	var publicdashboardStore *PublicDashboardStoreImpl
-	var savedDashboard *dashboards.Dashboard
-
-	setup := func() {
-		sqlStore, cfg = db.InitTestDBwithCfg(t)
-		quotaService := quotatest.New(false, nil)
-		store, err := dashboardsDB.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
-		require.NoError(t, err)
-		dashboardStore = store
-		publicdashboardStore = ProvideStore(sqlStore, cfg, featuremgmt.WithFeatures())
-		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, "", true)
-	}
-
-	t.Run("FindDashboard can get original dashboard by uid", func(t *testing.T) {
-		setup()
-
-		dashboard, err := publicdashboardStore.FindDashboard(context.Background(), savedDashboard.OrgID, savedDashboard.UID)
-
-		require.NoError(t, err)
-		require.Equal(t, savedDashboard.UID, dashboard.UID)
-	})
-}
-
 func TestIntegrationExistsEnabledByAccessToken(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
@@ -204,11 +181,11 @@ func TestIntegrationExistsEnabledByAccessToken(t *testing.T) {
 	setup := func() {
 		sqlStore, cfg = db.InitTestDBwithCfg(t)
 		quotaService := quotatest.New(false, nil)
-		store, err := dashboardsDB.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
+		store, err := dashboardsDB.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotaService)
 		require.NoError(t, err)
 		dashboardStore = store
 		publicdashboardStore = ProvideStore(sqlStore, cfg, featuremgmt.WithFeatures())
-		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, "", true)
+		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, "", true)
 	}
 	t.Run("ExistsEnabledByAccessToken will return true when at least one public dashboard has a matching access token", func(t *testing.T) {
 		setup()
@@ -277,11 +254,11 @@ func TestIntegrationExistsEnabledByDashboardUid(t *testing.T) {
 	setup := func() {
 		sqlStore, cfg = db.InitTestDBwithCfg(t)
 		quotaService := quotatest.New(false, nil)
-		store, err := dashboardsDB.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
+		store, err := dashboardsDB.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotaService)
 		require.NoError(t, err)
 		dashboardStore = store
 		publicdashboardStore = ProvideStore(sqlStore, cfg, featuremgmt.WithFeatures())
-		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, "", true)
+		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, "", true)
 	}
 
 	t.Run("ExistsEnabledByDashboardUid Will return true when dashboard has at least one enabled public dashboard", func(t *testing.T) {
@@ -342,11 +319,11 @@ func TestIntegrationFindByDashboardUid(t *testing.T) {
 	setup := func() {
 		sqlStore, cfg = db.InitTestDBwithCfg(t)
 		quotaService := quotatest.New(false, nil)
-		store, err := dashboardsDB.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
+		store, err := dashboardsDB.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotaService)
 		require.NoError(t, err)
 		dashboardStore = store
 		publicdashboardStore = ProvideStore(sqlStore, cfg, featuremgmt.WithFeatures())
-		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, "", true)
+		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, "", true)
 	}
 
 	t.Run("returns public dashboard by dashboardUid", func(t *testing.T) {
@@ -410,10 +387,10 @@ func TestIntegrationFindByAccessToken(t *testing.T) {
 
 	setup := func() {
 		sqlStore, cfg = db.InitTestDBwithCfg(t)
-		dashboardStore, err = dashboardsDB.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotatest.New(false, nil))
+		dashboardStore, err = dashboardsDB.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotatest.New(false, nil))
 		require.NoError(t, err)
 		publicdashboardStore = ProvideStore(sqlStore, cfg, featuremgmt.WithFeatures())
-		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, "", true)
+		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, "", true)
 	}
 
 	t.Run("returns public dashboard by accessToken", func(t *testing.T) {
@@ -477,14 +454,14 @@ func TestIntegrationCreatePublicDashboard(t *testing.T) {
 	var savedDashboard2 *dashboards.Dashboard
 
 	setup := func() {
-		sqlStore, cfg = db.InitTestDBwithCfg(t, db.InitTestDBOpt{FeatureFlags: []string{featuremgmt.FlagPublicDashboards}})
+		sqlStore, cfg = db.InitTestDBwithCfg(t, db.InitTestDBOpt{})
 		quotaService := quotatest.New(false, nil)
-		store, err := dashboardsDB.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
+		store, err := dashboardsDB.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotaService)
 		require.NoError(t, err)
 		dashboardStore = store
 		publicdashboardStore = ProvideStore(sqlStore, cfg, featuremgmt.WithFeatures())
-		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, "", true)
-		savedDashboard2 = insertTestDashboard(t, dashboardStore, "testDashie2", 1, 0, "", true)
+		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, "", true)
+		savedDashboard2 = insertTestDashboard(t, dashboardStore, "testDashie2", 1, "", true)
 		insertPublicDashboard(t, publicdashboardStore, savedDashboard2.UID, savedDashboard2.OrgID, false, PublicShareType)
 	}
 
@@ -557,13 +534,13 @@ func TestIntegrationUpdatePublicDashboard(t *testing.T) {
 	var err error
 
 	setup := func() {
-		sqlStore, cfg = db.InitTestDBwithCfg(t, db.InitTestDBOpt{FeatureFlags: []string{featuremgmt.FlagPublicDashboards}})
+		sqlStore, cfg = db.InitTestDBwithCfg(t, db.InitTestDBOpt{})
 		quotaService := quotatest.New(false, nil)
-		dashboardStore, err = dashboardsDB.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
+		dashboardStore, err = dashboardsDB.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotaService)
 		require.NoError(t, err)
 		publicdashboardStore = ProvideStore(sqlStore, cfg, featuremgmt.WithFeatures())
-		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, "", true)
-		anotherSavedDashboard = insertTestDashboard(t, dashboardStore, "test another Dashie", 1, 0, "", true)
+		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, "", true)
+		anotherSavedDashboard = insertTestDashboard(t, dashboardStore, "test another Dashie", 1, "", true)
 	}
 
 	t.Run("updates an existing dashboard", func(t *testing.T) {
@@ -663,10 +640,10 @@ func TestIntegrationGetOrgIdByAccessToken(t *testing.T) {
 	setup := func() {
 		sqlStore, cfg = db.InitTestDBwithCfg(t)
 		quotaService := quotatest.New(false, nil)
-		dashboardStore, err = dashboardsDB.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
+		dashboardStore, err = dashboardsDB.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotaService)
 		require.NoError(t, err)
 		publicdashboardStore = ProvideStore(sqlStore, cfg, featuremgmt.WithFeatures())
-		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, "", true)
+		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, "", true)
 	}
 	t.Run("GetOrgIdByAccessToken will OrgId when enabled", func(t *testing.T) {
 		setup()
@@ -735,10 +712,10 @@ func TestIntegrationDelete(t *testing.T) {
 
 	setup := func() {
 		sqlStore, cfg = db.InitTestDBwithCfg(t)
-		dashboardStore, err = dashboardsDB.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotatest.New(false, nil))
+		dashboardStore, err = dashboardsDB.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotatest.New(false, nil))
 		require.NoError(t, err)
 		publicdashboardStore = ProvideStore(sqlStore, cfg, featuremgmt.WithFeatures())
-		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, "", true)
+		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, "", true)
 		savedPublicDashboard = insertPublicDashboard(t, publicdashboardStore, savedDashboard.UID, savedDashboard.OrgID, true, PublicShareType)
 	}
 
@@ -764,38 +741,45 @@ func TestIntegrationDelete(t *testing.T) {
 	})
 }
 
-func TestGetDashboardByFolder(t *testing.T) {
+func TestFindByFolder(t *testing.T) {
 	t.Run("returns nil when dashboard is not a folder", func(t *testing.T) {
 		sqlStore, _ := db.InitTestDBwithCfg(t)
-		dashboard := &dashboards.Dashboard{IsFolder: false}
+		dashboard := &dashboards.Dashboard{OrgID: 1, UID: "dashboarduid", IsFolder: false}
 		store := ProvideStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures())
-		pubdashes, err := store.FindByDashboardFolder(context.Background(), dashboard)
+		pubdashes, err := store.FindByFolder(context.Background(), dashboard.OrgID, dashboard.UID)
 
 		require.NoError(t, err)
 		assert.Nil(t, pubdashes)
 	})
 
-	t.Run("returns nil when dashboard is nil", func(t *testing.T) {
+	t.Run("returns nil when parameters are empty", func(t *testing.T) {
 		sqlStore, _ := db.InitTestDBwithCfg(t)
 		store := ProvideStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures())
-		pubdashes, err := store.FindByDashboardFolder(context.Background(), nil)
+		pubdashes, err := store.FindByFolder(context.Background(), 0, "")
 
 		require.NoError(t, err)
 		assert.Nil(t, pubdashes)
 	})
 
 	t.Run("can get all pubdashes for dashboard folder and org", func(t *testing.T) {
-		sqlStore, cfg := db.InitTestDBwithCfg(t)
+		sqlStore, _ := db.InitTestDBwithCfg(t)
 		quotaService := quotatest.New(false, nil)
-		dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
-		require.NoError(t, err)
-		pubdashStore := ProvideStore(sqlStore, cfg, featuremgmt.WithFeatures())
-		dashboard := insertTestDashboard(t, dashboardStore, "title", 1, 1, "1", true, PublicShareType)
+		dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotaService)
+		require.NoError(t, err)
+		pubdashStore := ProvideStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures())
+		// insert folders
+		folder := insertTestDashboard(t, dashboardStore, "This is a folder", 1, "", true, PublicShareType)
+		folder2 := insertTestDashboard(t, dashboardStore, "This is another folder", 1, "", true, PublicShareType)
+		// insert dashboard in a folder
+		dashboard := insertTestDashboard(t, dashboardStore, "Dashboard in a folder", 1, folder.UID, false, PublicShareType)
+		// insert a dashboard in a different folder
+		dashboard2 := insertTestDashboard(t, dashboardStore, "Another Dashboard in a different folder", 1, folder2.UID, false, PublicShareType)
+
+		// create 2 public dashboards
 		pubdash := insertPublicDashboard(t, pubdashStore, dashboard.UID, dashboard.OrgID, true, PublicShareType)
-		dashboard2 := insertTestDashboard(t, dashboardStore, "title", 1, 2, "2", true, PublicShareType)
 		_ = insertPublicDashboard(t, pubdashStore, dashboard2.UID, dashboard2.OrgID, true, PublicShareType)
 
-		pubdashes, err := pubdashStore.FindByDashboardFolder(context.Background(), dashboard)
+		pubdashes, err := pubdashStore.FindByFolder(context.Background(), folder.OrgID, folder.UID)
 
 		require.NoError(t, err)
 		assert.Len(t, pubdashes, 1)
@@ -817,16 +801,16 @@ func TestGetMetrics(t *testing.T) {
 	var savedDashboard4 *dashboards.Dashboard
 
 	setup := func() {
-		sqlStore, cfg = db.InitTestDBwithCfg(t, db.InitTestDBOpt{FeatureFlags: []string{featuremgmt.FlagPublicDashboards}})
+		sqlStore, cfg = db.InitTestDBwithCfg(t, db.InitTestDBOpt{})
 		quotaService := quotatest.New(false, nil)
-		store, err := dashboardsDB.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
+		store, err := dashboardsDB.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotaService)
 		require.NoError(t, err)
 		dashboardStore = store
 		publicdashboardStore = ProvideStore(sqlStore, cfg, featuremgmt.WithFeatures())
-		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, "", false)
-		savedDashboard2 = insertTestDashboard(t, dashboardStore, "testDashie2", 1, 0, "", false)
-		savedDashboard3 = insertTestDashboard(t, dashboardStore, "testDashie3", 2, 0, "", false)
-		savedDashboard4 = insertTestDashboard(t, dashboardStore, "testDashie4", 2, 0, "", false)
+		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, "", false)
+		savedDashboard2 = insertTestDashboard(t, dashboardStore, "testDashie2", 1, "", false)
+		savedDashboard3 = insertTestDashboard(t, dashboardStore, "testDashie3", 2, "", false)
+		savedDashboard4 = insertTestDashboard(t, dashboardStore, "testDashie4", 2, "", false)
 		insertPublicDashboard(t, publicdashboardStore, savedDashboard.UID, savedDashboard.OrgID, true, PublicShareType)
 		insertPublicDashboard(t, publicdashboardStore, savedDashboard2.UID, savedDashboard2.OrgID, true, PublicShareType)
 		insertPublicDashboard(t, publicdashboardStore, savedDashboard3.UID, savedDashboard3.OrgID, true, EmailShareType)
@@ -867,12 +851,11 @@ func TestGetMetrics(t *testing.T) {
 }
 
 // helper function to insert a dashboard
-func insertTestDashboard(t *testing.T, dashboardStore dashboards.Store, title string, orgId int64,
-	folderId int64, folderUID string, isFolder bool, tags ...any) *dashboards.Dashboard {
+func insertTestDashboard(t *testing.T, dashboardStore dashboards.Store, title string, orgID int64,
+	folderUID string, isFolder bool, tags ...any) *dashboards.Dashboard {
 	t.Helper()
 	cmd := dashboards.SaveDashboardCommand{
-		OrgID:     orgId,
-		FolderID:  folderId,
+		OrgID:     orgID,
 		FolderUID: folderUID,
 		IsFolder:  isFolder,
 		Dashboard: simplejson.NewFromAny(map[string]any{
diff --git a/pkg/services/publicdashboards/models/models.go b/pkg/services/publicdashboards/models/models.go
index 55407d9a561db..676eb96c96608 100644
--- a/pkg/services/publicdashboards/models/models.go
+++ b/pkg/services/publicdashboards/models/models.go
@@ -24,10 +24,11 @@ func (e PublicDashboardErr) Error() string {
 }
 
 const (
-	QuerySuccess              = "success"
-	QueryFailure              = "failure"
-	EmailShareType  ShareType = "email"
-	PublicShareType ShareType = "public"
+	QuerySuccess                                  = "success"
+	QueryFailure                                  = "failure"
+	EmailShareType                      ShareType = "email"
+	PublicShareType                     ShareType = "public"
+	FeaturePublicDashboardsEmailSharing           = "publicDashboardsEmailSharing"
 )
 
 var (
@@ -117,6 +118,7 @@ type PublicDashboardListResponse struct {
 	Title        string `json:"title" xorm:"title"`
 	DashboardUid string `json:"dashboardUid" xorm:"dashboard_uid"`
 	IsEnabled    bool   `json:"isEnabled" xorm:"is_enabled"`
+	Slug         string `json:"slug" xorm:"slug"`
 }
 
 type TimeSettings struct {
diff --git a/pkg/services/publicdashboards/public_dashboard_middleware_mock.go b/pkg/services/publicdashboards/public_dashboard_middleware_mock.go
new file mode 100644
index 0000000000000..f47e99dc0e2a2
--- /dev/null
+++ b/pkg/services/publicdashboards/public_dashboard_middleware_mock.go
@@ -0,0 +1,47 @@
+// Code generated by mockery v2.36.1. DO NOT EDIT.
+
+package publicdashboards
+
+import (
+	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	mock "github.com/stretchr/testify/mock"
+)
+
+// FakePublicDashboardMiddleware is an autogenerated mock type for the Middleware type
+type FakePublicDashboardMiddleware struct {
+	mock.Mock
+}
+
+// HandleAccessView provides a mock function with given fields: c
+func (_m *FakePublicDashboardMiddleware) HandleAccessView(c *contextmodel.ReqContext) {
+	_m.Called(c)
+}
+
+// HandleApi provides a mock function with given fields: c
+func (_m *FakePublicDashboardMiddleware) HandleApi(c *contextmodel.ReqContext) {
+	_m.Called(c)
+}
+
+// HandleConfirmAccessView provides a mock function with given fields: c
+func (_m *FakePublicDashboardMiddleware) HandleConfirmAccessView(c *contextmodel.ReqContext) {
+	_m.Called(c)
+}
+
+// HandleView provides a mock function with given fields: c
+func (_m *FakePublicDashboardMiddleware) HandleView(c *contextmodel.ReqContext) {
+	_m.Called(c)
+}
+
+// NewFakePublicDashboardMiddleware creates a new instance of FakePublicDashboardMiddleware. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewFakePublicDashboardMiddleware(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *FakePublicDashboardMiddleware {
+	mock := &FakePublicDashboardMiddleware{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/pkg/services/publicdashboards/public_dashboard_service_mock.go b/pkg/services/publicdashboards/public_dashboard_service_mock.go
index 949e0d9b3d3f7..5b5bc8fbd6398 100644
--- a/pkg/services/publicdashboards/public_dashboard_service_mock.go
+++ b/pkg/services/publicdashboards/public_dashboard_service_mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.32.0. DO NOT EDIT.
+// Code generated by mockery v2.36.1. DO NOT EDIT.
 
 package publicdashboards
 
diff --git a/pkg/services/publicdashboards/public_dashboard_service_wrapper_mock.go b/pkg/services/publicdashboards/public_dashboard_service_wrapper_mock.go
index f257f713c81c6..93a19a225d863 100644
--- a/pkg/services/publicdashboards/public_dashboard_service_wrapper_mock.go
+++ b/pkg/services/publicdashboards/public_dashboard_service_wrapper_mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.32.0. DO NOT EDIT.
+// Code generated by mockery v2.36.1. DO NOT EDIT.
 
 package publicdashboards
 
diff --git a/pkg/services/publicdashboards/public_dashboard_store_mock.go b/pkg/services/publicdashboards/public_dashboard_store_mock.go
index 677ea5c5798ed..b33c1172a44aa 100644
--- a/pkg/services/publicdashboards/public_dashboard_store_mock.go
+++ b/pkg/services/publicdashboards/public_dashboard_store_mock.go
@@ -1,14 +1,12 @@
-// Code generated by mockery v2.32.0. DO NOT EDIT.
+// Code generated by mockery v2.36.1. DO NOT EDIT.
 
 package publicdashboards
 
 import (
 	context "context"
 
-	dashboards "github.com/grafana/grafana/pkg/services/dashboards"
-	mock "github.com/stretchr/testify/mock"
-
 	models "github.com/grafana/grafana/pkg/services/publicdashboards/models"
+	mock "github.com/stretchr/testify/mock"
 )
 
 // FakePublicDashboardStore is an autogenerated mock type for the Store type
@@ -190,32 +188,6 @@ func (_m *FakePublicDashboardStore) FindByAccessToken(ctx context.Context, acces
 	return r0, r1
 }
 
-// FindByDashboardFolder provides a mock function with given fields: ctx, dashboard
-func (_m *FakePublicDashboardStore) FindByDashboardFolder(ctx context.Context, dashboard *dashboards.Dashboard) ([]*models.PublicDashboard, error) {
-	ret := _m.Called(ctx, dashboard)
-
-	var r0 []*models.PublicDashboard
-	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, *dashboards.Dashboard) ([]*models.PublicDashboard, error)); ok {
-		return rf(ctx, dashboard)
-	}
-	if rf, ok := ret.Get(0).(func(context.Context, *dashboards.Dashboard) []*models.PublicDashboard); ok {
-		r0 = rf(ctx, dashboard)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]*models.PublicDashboard)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(context.Context, *dashboards.Dashboard) error); ok {
-		r1 = rf(ctx, dashboard)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
 // FindByDashboardUid provides a mock function with given fields: ctx, orgId, dashboardUid
 func (_m *FakePublicDashboardStore) FindByDashboardUid(ctx context.Context, orgId int64, dashboardUid string) (*models.PublicDashboard, error) {
 	ret := _m.Called(ctx, orgId, dashboardUid)
@@ -242,25 +214,25 @@ func (_m *FakePublicDashboardStore) FindByDashboardUid(ctx context.Context, orgI
 	return r0, r1
 }
 
-// FindDashboard provides a mock function with given fields: ctx, orgId, dashboardUid
-func (_m *FakePublicDashboardStore) FindDashboard(ctx context.Context, orgId int64, dashboardUid string) (*dashboards.Dashboard, error) {
-	ret := _m.Called(ctx, orgId, dashboardUid)
+// FindByFolder provides a mock function with given fields: ctx, orgId, folderUid
+func (_m *FakePublicDashboardStore) FindByFolder(ctx context.Context, orgId int64, folderUid string) ([]*models.PublicDashboard, error) {
+	ret := _m.Called(ctx, orgId, folderUid)
 
-	var r0 *dashboards.Dashboard
+	var r0 []*models.PublicDashboard
 	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, int64, string) (*dashboards.Dashboard, error)); ok {
-		return rf(ctx, orgId, dashboardUid)
+	if rf, ok := ret.Get(0).(func(context.Context, int64, string) ([]*models.PublicDashboard, error)); ok {
+		return rf(ctx, orgId, folderUid)
 	}
-	if rf, ok := ret.Get(0).(func(context.Context, int64, string) *dashboards.Dashboard); ok {
-		r0 = rf(ctx, orgId, dashboardUid)
+	if rf, ok := ret.Get(0).(func(context.Context, int64, string) []*models.PublicDashboard); ok {
+		r0 = rf(ctx, orgId, folderUid)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*dashboards.Dashboard)
+			r0 = ret.Get(0).([]*models.PublicDashboard)
 		}
 	}
 
 	if rf, ok := ret.Get(1).(func(context.Context, int64, string) error); ok {
-		r1 = rf(ctx, orgId, dashboardUid)
+		r1 = rf(ctx, orgId, folderUid)
 	} else {
 		r1 = ret.Error(1)
 	}
diff --git a/pkg/services/publicdashboards/publicdashboard.go b/pkg/services/publicdashboards/publicdashboard.go
index d6fe478c87b0c..a0acb6786cf28 100644
--- a/pkg/services/publicdashboards/publicdashboard.go
+++ b/pkg/services/publicdashboards/publicdashboard.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana/pkg/api/dtos"
+	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	. "github.com/grafana/grafana/pkg/services/publicdashboards/models"
 	"github.com/grafana/grafana/pkg/services/user"
@@ -52,15 +53,22 @@ type Store interface {
 	Find(ctx context.Context, uid string) (*PublicDashboard, error)
 	FindByAccessToken(ctx context.Context, accessToken string) (*PublicDashboard, error)
 	FindByDashboardUid(ctx context.Context, orgId int64, dashboardUid string) (*PublicDashboard, error)
-	FindDashboard(ctx context.Context, orgId int64, dashboardUid string) (*dashboards.Dashboard, error)
 	FindAllWithPagination(ctx context.Context, query *PublicDashboardListQuery) (*PublicDashboardListResponseWithPagination, error)
 	Create(ctx context.Context, cmd SavePublicDashboardCommand) (int64, error)
 	Update(ctx context.Context, cmd SavePublicDashboardCommand) (int64, error)
 	Delete(ctx context.Context, uid string) (int64, error)
 
 	GetOrgIdByAccessToken(ctx context.Context, accessToken string) (int64, error)
-	FindByDashboardFolder(ctx context.Context, dashboard *dashboards.Dashboard) ([]*PublicDashboard, error)
+	FindByFolder(ctx context.Context, orgId int64, folderUid string) ([]*PublicDashboard, error)
 	ExistsEnabledByAccessToken(ctx context.Context, accessToken string) (bool, error)
 	ExistsEnabledByDashboardUid(ctx context.Context, dashboardUid string) (bool, error)
 	GetMetrics(ctx context.Context) (*Metrics, error)
 }
+
+//go:generate mockery --name Middleware --structname FakePublicDashboardMiddleware --inpackage --filename public_dashboard_middleware_mock.go
+type Middleware interface {
+	HandleApi(c *contextmodel.ReqContext)
+	HandleView(c *contextmodel.ReqContext)
+	HandleAccessView(c *contextmodel.ReqContext)
+	HandleConfirmAccessView(c *contextmodel.ReqContext)
+}
diff --git a/pkg/services/publicdashboards/service/common_test.go b/pkg/services/publicdashboards/service/common_test.go
new file mode 100644
index 0000000000000..f5492324dde37
--- /dev/null
+++ b/pkg/services/publicdashboards/service/common_test.go
@@ -0,0 +1,52 @@
+package service
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/annotations"
+	"github.com/grafana/grafana/pkg/services/annotations/annotationsimpl"
+	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/licensing/licensingtest"
+	"github.com/grafana/grafana/pkg/services/publicdashboards"
+	"github.com/grafana/grafana/pkg/services/publicdashboards/database"
+	. "github.com/grafana/grafana/pkg/services/publicdashboards/models"
+	"github.com/grafana/grafana/pkg/services/publicdashboards/service/intervalv2"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
+)
+
+func newPublicDashboardServiceImpl(
+	t *testing.T,
+	publicDashboardStore publicdashboards.Store,
+	dashboardService dashboards.DashboardService,
+	annotationsRepo annotations.Repository,
+) (*PublicDashboardServiceImpl, *sqlstore.SQLStore) {
+	t.Helper()
+
+	sqlStore := sqlstore.InitTestDB(t)
+	tagService := tagimpl.ProvideService(sqlStore)
+	if annotationsRepo == nil {
+		annotationsRepo = annotationsimpl.ProvideService(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagService)
+	}
+
+	if publicDashboardStore == nil {
+		publicDashboardStore = database.ProvideStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures())
+	}
+	serviceWrapper := ProvideServiceWrapper(publicDashboardStore)
+
+	license := licensingtest.NewFakeLicensing()
+	license.On("FeatureEnabled", FeaturePublicDashboardsEmailSharing).Return(false)
+
+	return &PublicDashboardServiceImpl{
+		AnnotationsRepo:    annotationsRepo,
+		log:                log.New("test.logger"),
+		intervalCalculator: intervalv2.NewCalculator(),
+		dashboardService:   dashboardService,
+		store:              publicDashboardStore,
+		serviceWrapper:     serviceWrapper,
+		license:            license,
+		features:           featuremgmt.WithFeatures(),
+	}, sqlStore
+}
diff --git a/pkg/services/publicdashboards/service/intervalv2/intervalv2.go b/pkg/services/publicdashboards/service/intervalv2/intervalv2.go
new file mode 100644
index 0000000000000..b20defc27f691
--- /dev/null
+++ b/pkg/services/publicdashboards/service/intervalv2/intervalv2.go
@@ -0,0 +1,77 @@
+package intervalv2
+
+import (
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
+)
+
+var (
+	DefaultRes         int64 = 1500
+	defaultMinInterval       = time.Millisecond * 1
+)
+
+type Interval struct {
+	Text  string
+	Value time.Duration
+}
+
+type intervalCalculator struct {
+	minInterval time.Duration
+}
+
+type Calculator interface {
+	Calculate(timerange backend.TimeRange, minInterval time.Duration, maxDataPoints int64) Interval
+	CalculateSafeInterval(timerange backend.TimeRange, resolution int64) Interval
+}
+
+type CalculatorOptions struct {
+	MinInterval time.Duration
+}
+
+func NewCalculator(opts ...CalculatorOptions) *intervalCalculator {
+	calc := &intervalCalculator{}
+
+	for _, o := range opts {
+		if o.MinInterval == 0 {
+			calc.minInterval = defaultMinInterval
+		} else {
+			calc.minInterval = o.MinInterval
+		}
+	}
+
+	return calc
+}
+
+func (i *Interval) Milliseconds() int64 {
+	return i.Value.Nanoseconds() / int64(time.Millisecond)
+}
+
+func (ic *intervalCalculator) Calculate(timerange backend.TimeRange, minInterval time.Duration, maxDataPoints int64) Interval {
+	to := timerange.To.UnixNano()
+	from := timerange.From.UnixNano()
+	resolution := maxDataPoints
+	if resolution == 0 {
+		resolution = DefaultRes
+	}
+
+	calculatedInterval := time.Duration((to - from) / resolution)
+
+	if calculatedInterval < minInterval {
+		return Interval{Text: gtime.FormatInterval(minInterval), Value: minInterval}
+	}
+
+	rounded := gtime.RoundInterval(calculatedInterval)
+
+	return Interval{Text: gtime.FormatInterval(rounded), Value: rounded}
+}
+
+func (ic *intervalCalculator) CalculateSafeInterval(timerange backend.TimeRange, safeRes int64) Interval {
+	to := timerange.To.UnixNano()
+	from := timerange.From.UnixNano()
+	safeInterval := time.Duration((to - from) / safeRes)
+
+	rounded := gtime.RoundInterval(safeInterval)
+	return Interval{Text: gtime.FormatInterval(rounded), Value: rounded}
+}
diff --git a/pkg/services/publicdashboards/service/intervalv2/intervalv2_test.go b/pkg/services/publicdashboards/service/intervalv2/intervalv2_test.go
new file mode 100644
index 0000000000000..fe9900d90afb3
--- /dev/null
+++ b/pkg/services/publicdashboards/service/intervalv2/intervalv2_test.go
@@ -0,0 +1,63 @@
+package intervalv2
+
+import (
+	"testing"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestIntervalCalculator_Calculate(t *testing.T) {
+	calculator := NewCalculator(CalculatorOptions{})
+
+	timeNow := time.Now()
+
+	testCases := []struct {
+		name       string
+		timeRange  backend.TimeRange
+		resolution int64
+		expected   string
+	}{
+		{"from 5m to now and default resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(5 * time.Minute)}, 0, "200ms"},
+		{"from 5m to now and 500 resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(5 * time.Minute)}, 500, "500ms"},
+		{"from 15m to now and default resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(15 * time.Minute)}, 0, "500ms"},
+		{"from 15m to now and 100 resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(15 * time.Minute)}, 100, "10s"},
+		{"from 30m to now and default resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(30 * time.Minute)}, 0, "1s"},
+		{"from 30m to now and 3000 resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(30 * time.Minute)}, 3000, "500ms"},
+		{"from 1h to now and default resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(time.Hour)}, 0, "2s"},
+		{"from 1h to now and 1000 resoluion", backend.TimeRange{From: timeNow, To: timeNow.Add(time.Hour)}, 1000, "5s"},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			interval := calculator.Calculate(tc.timeRange, time.Millisecond*1, tc.resolution)
+			assert.Equal(t, tc.expected, interval.Text)
+		})
+	}
+}
+
+func TestIntervalCalculator_CalculateSafeInterval(t *testing.T) {
+	calculator := NewCalculator(CalculatorOptions{})
+
+	timeNow := time.Now()
+
+	testCases := []struct {
+		name           string
+		timeRange      backend.TimeRange
+		safeResolution int64
+		expected       string
+	}{
+		{"from 5m to now", backend.TimeRange{From: timeNow, To: timeNow.Add(5 * time.Minute)}, 11000, "20ms"},
+		{"from 15m to now", backend.TimeRange{From: timeNow, To: timeNow.Add(15 * time.Minute)}, 11000, "100ms"},
+		{"from 30m to now", backend.TimeRange{From: timeNow, To: timeNow.Add(30 * time.Minute)}, 11000, "200ms"},
+		{"from 24h to now", backend.TimeRange{From: timeNow, To: timeNow.Add(1440 * time.Minute)}, 11000, "10s"},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			interval := calculator.CalculateSafeInterval(tc.timeRange, tc.safeResolution)
+			assert.Equal(t, tc.expected, interval.Text)
+		})
+	}
+}
diff --git a/pkg/services/publicdashboards/service/query.go b/pkg/services/publicdashboards/service/query.go
index 1857d33c23696..5c9465e279f35 100644
--- a/pkg/services/publicdashboards/service/query.go
+++ b/pkg/services/publicdashboards/service/query.go
@@ -13,6 +13,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/annotations"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/publicdashboards/models"
 	"github.com/grafana/grafana/pkg/services/publicdashboards/validation"
 	"github.com/grafana/grafana/pkg/services/user"
@@ -36,7 +37,7 @@ func (pd *PublicDashboardServiceImpl) FindAnnotations(ctx context.Context, reqDT
 		return nil, models.ErrInternalServerError.Errorf("FindAnnotations: failed to unmarshal dashboard annotations: %w", err)
 	}
 
-	anonymousUser := buildAnonymousUser(ctx, dash)
+	anonymousUser := buildAnonymousUser(ctx, dash, pd.features)
 
 	uniqueEvents := make(map[int64]models.AnnotationEvent, 0)
 	for _, anno := range annoDto.Annotations.List {
@@ -138,7 +139,7 @@ func (pd *PublicDashboardServiceImpl) GetQueryDataResponse(ctx context.Context,
 		return nil, models.ErrPanelQueriesNotFound.Errorf("GetQueryDataResponse: failed to extract queries from panel")
 	}
 
-	anonymousUser := buildAnonymousUser(ctx, dashboard)
+	anonymousUser := buildAnonymousUser(ctx, dashboard, pd.features)
 	res, err := pd.QueryDataService.QueryData(ctx, anonymousUser, skipDSCache, metricReq)
 
 	reqDatasources := metricReq.GetUniqueDatasourceTypes()
@@ -180,7 +181,7 @@ func (pd *PublicDashboardServiceImpl) buildMetricRequest(dashboard *dashboards.D
 }
 
 // buildAnonymousUser creates a user with permissions to read from all datasources used in the dashboard
-func buildAnonymousUser(ctx context.Context, dashboard *dashboards.Dashboard) *user.SignedInUser {
+func buildAnonymousUser(ctx context.Context, dashboard *dashboards.Dashboard, features featuremgmt.FeatureToggles) *user.SignedInUser {
 	datasourceUids := getUniqueDashboardDatasourceUids(dashboard.Data)
 
 	// Create a user with blank permissions
@@ -204,8 +205,12 @@ func buildAnonymousUser(ctx context.Context, dashboard *dashboards.Dashboard) *u
 	permissions := make(map[string][]string)
 	permissions[datasources.ActionQuery] = queryScopes
 	permissions[datasources.ActionRead] = readScopes
-	permissions[accesscontrol.ActionAnnotationsRead] = annotationScopes
 	permissions[dashboards.ActionDashboardsRead] = dashboardScopes
+	permissions[accesscontrol.ActionAnnotationsRead] = annotationScopes
+
+	if features.IsEnabled(ctx, featuremgmt.FlagAnnotationPermissionUpdate) {
+		permissions[accesscontrol.ActionAnnotationsRead] = dashboardScopes
+	}
 
 	anonymousUser.Permissions[dashboard.OrgID] = permissions
 
diff --git a/pkg/services/publicdashboards/service/query_test.go b/pkg/services/publicdashboards/service/query_test.go
index 05ab7194513f8..8901213837518 100644
--- a/pkg/services/publicdashboards/service/query_test.go
+++ b/pkg/services/publicdashboards/service/query_test.go
@@ -9,25 +9,20 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
+
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/infra/log"
 	dashboard2 "github.com/grafana/grafana/pkg/kinds/dashboard"
 	"github.com/grafana/grafana/pkg/services/annotations"
-	"github.com/grafana/grafana/pkg/services/annotations/annotationsimpl"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	dashboardsDB "github.com/grafana/grafana/pkg/services/dashboards/database"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	. "github.com/grafana/grafana/pkg/services/publicdashboards"
-	"github.com/grafana/grafana/pkg/services/publicdashboards/database"
 	"github.com/grafana/grafana/pkg/services/publicdashboards/internal"
 	. "github.com/grafana/grafana/pkg/services/publicdashboards/models"
 	"github.com/grafana/grafana/pkg/services/query"
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
-	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/tsdb/intervalv2"
 	"github.com/grafana/grafana/pkg/tsdb/legacydata"
 	"github.com/grafana/grafana/pkg/util"
 
@@ -681,21 +676,14 @@ const (
 )
 
 func TestGetQueryDataResponse(t *testing.T) {
-	sqlStore := sqlstore.InitTestDB(t)
-	dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotatest.New(false, nil))
-	require.NoError(t, err)
-	publicdashboardStore := database.ProvideStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures())
-	serviceWrapper := ProvideServiceWrapper(publicdashboardStore)
+	fakeDashboardService := &dashboards.FakeDashboardService{}
+	service, sqlStore := newPublicDashboardServiceImpl(t, nil, fakeDashboardService, nil)
 	fakeQueryService := &query.FakeQueryService{}
 	fakeQueryService.On("QueryData", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(&backend.QueryDataResponse{}, nil)
+	service.QueryDataService = fakeQueryService
 
-	service := &PublicDashboardServiceImpl{
-		log:                log.New("test.logger"),
-		store:              publicdashboardStore,
-		intervalCalculator: intervalv2.NewCalculator(),
-		QueryDataService:   fakeQueryService,
-		serviceWrapper:     serviceWrapper,
-	}
+	dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotatest.New(false, nil))
+	require.NoError(t, err)
 
 	publicDashboardQueryDTO := PublicDashboardQueryDTO{
 		IntervalMs:    int64(1),
@@ -722,6 +710,8 @@ func TestGetQueryDataResponse(t *testing.T) {
 			}}
 
 		dashboard := insertTestDashboard(t, dashboardStore, "testDashWithHiddenQuery", 1, 0, "", true, []map[string]interface{}{}, customPanels)
+		fakeDashboardService.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dashboard, nil)
+
 		isEnabled := true
 		dto := &SavePublicDashboardDTO{
 			DashboardUid: dashboard.UID,
@@ -742,21 +732,14 @@ func TestGetQueryDataResponse(t *testing.T) {
 func TestFindAnnotations(t *testing.T) {
 	color := "red"
 	name := "annoName"
+	features := featuremgmt.WithFeatures(featuremgmt.FlagAnnotationPermissionUpdate)
 	t.Run("will build anonymous user with correct permissions to get annotations", func(t *testing.T) {
-		sqlStore := sqlstore.InitTestDB(t)
-		config := setting.NewCfg()
-		tagService := tagimpl.ProvideService(sqlStore, sqlStore.Cfg)
-		annotationsRepo := annotationsimpl.ProvideService(sqlStore, config, featuremgmt.WithFeatures(), tagService)
-		fakeStore := FakePublicDashboardStore{}
-		service := &PublicDashboardServiceImpl{
-			log:             log.New("test.logger"),
-			store:           &fakeStore,
-			AnnotationsRepo: annotationsRepo,
-		}
+		fakeStore := &FakePublicDashboardStore{}
 		fakeStore.On("FindByAccessToken", mock.Anything, mock.AnythingOfType("string")).
 			Return(&PublicDashboard{Uid: "uid1", IsEnabled: true}, nil)
-		fakeStore.On("FindDashboard", mock.Anything, mock.Anything, mock.AnythingOfType("string")).
-			Return(dashboards.NewDashboard("dash1"), nil)
+		fakeDashboardService := &dashboards.FakeDashboardService{}
+		fakeDashboardService.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dashboards.NewDashboard("dash1"), nil)
+		service, _ := newPublicDashboardServiceImpl(t, fakeStore, fakeDashboardService, nil)
 
 		reqDTO := AnnotationsQueryDTO{
 			From: 1,
@@ -765,7 +748,7 @@ func TestFindAnnotations(t *testing.T) {
 		dash := dashboards.NewDashboard("testDashboard")
 
 		items, _ := service.FindAnnotations(context.Background(), reqDTO, "abc123")
-		anonUser := buildAnonymousUser(context.Background(), dash)
+		anonUser := buildAnonymousUser(context.Background(), dash, features)
 
 		assert.Equal(t, "dashboards:*", anonUser.Permissions[0]["dashboards:read"][0])
 		assert.Len(t, items, 0)
@@ -801,17 +784,15 @@ func TestFindAnnotations(t *testing.T) {
 		annos := []DashAnnotation{grafanaAnnotation, grafanaTagAnnotation}
 		dashboard := AddAnnotationsToDashboard(t, dash, annos)
 
-		annotationsRepo := annotations.FakeAnnotationsRepo{}
-		fakeStore := FakePublicDashboardStore{}
-		service := &PublicDashboardServiceImpl{
-			log:             log.New("test.logger"),
-			store:           &fakeStore,
-			AnnotationsRepo: &annotationsRepo,
-		}
 		pubdash := &PublicDashboard{Uid: "uid1", IsEnabled: true, OrgId: 1, DashboardUid: dashboard.UID, AnnotationsEnabled: true}
 
+		annotationsRepo := &annotations.FakeAnnotationsRepo{}
+		fakeStore := &FakePublicDashboardStore{}
 		fakeStore.On("FindByAccessToken", mock.Anything, mock.AnythingOfType("string")).Return(pubdash, nil)
-		fakeStore.On("FindDashboard", mock.Anything, mock.Anything, mock.AnythingOfType("string")).Return(dashboard, nil)
+		fakeDashboardService := &dashboards.FakeDashboardService{}
+		fakeDashboardService.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dashboard, nil)
+
+		service, _ := newPublicDashboardServiceImpl(t, fakeStore, fakeDashboardService, annotationsRepo)
 
 		annotationsRepo.On("Find", mock.Anything, mock.Anything).Return([]*annotations.ItemDTO{
 			{
@@ -861,17 +842,14 @@ func TestFindAnnotations(t *testing.T) {
 		annos := []DashAnnotation{grafanaAnnotation}
 		dashboard := AddAnnotationsToDashboard(t, dash, annos)
 
-		annotationsRepo := annotations.FakeAnnotationsRepo{}
-		fakeStore := FakePublicDashboardStore{}
-		service := &PublicDashboardServiceImpl{
-			log:             log.New("test.logger"),
-			store:           &fakeStore,
-			AnnotationsRepo: &annotationsRepo,
-		}
+		annotationsRepo := &annotations.FakeAnnotationsRepo{}
+		fakeStore := &FakePublicDashboardStore{}
 		pubdash := &PublicDashboard{Uid: "uid1", IsEnabled: true, OrgId: 1, DashboardUid: dashboard.UID, AnnotationsEnabled: true}
-
 		fakeStore.On("FindByAccessToken", mock.Anything, mock.AnythingOfType("string")).Return(pubdash, nil)
-		fakeStore.On("FindDashboard", mock.Anything, mock.Anything, mock.AnythingOfType("string")).Return(dashboard, nil)
+		fakeDashboardService := &dashboards.FakeDashboardService{}
+		fakeDashboardService.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dashboard, nil)
+
+		service, _ := newPublicDashboardServiceImpl(t, fakeStore, fakeDashboardService, annotationsRepo)
 
 		annotationsRepo.On("Find", mock.Anything, mock.Anything).Return([]*annotations.ItemDTO{
 			{
@@ -933,17 +911,14 @@ func TestFindAnnotations(t *testing.T) {
 		annos := []DashAnnotation{grafanaAnnotation, queryAnnotation, disabledGrafanaAnnotation}
 		dashboard := AddAnnotationsToDashboard(t, dash, annos)
 
-		annotationsRepo := annotations.FakeAnnotationsRepo{}
-		fakeStore := FakePublicDashboardStore{}
-		service := &PublicDashboardServiceImpl{
-			log:             log.New("test.logger"),
-			store:           &fakeStore,
-			AnnotationsRepo: &annotationsRepo,
-		}
+		annotationsRepo := &annotations.FakeAnnotationsRepo{}
 		pubdash := &PublicDashboard{Uid: "uid1", IsEnabled: true, OrgId: 1, DashboardUid: dashboard.UID, AnnotationsEnabled: true}
-
+		fakeStore := &FakePublicDashboardStore{}
 		fakeStore.On("FindByAccessToken", mock.Anything, mock.AnythingOfType("string")).Return(pubdash, nil)
-		fakeStore.On("FindDashboard", mock.Anything, mock.Anything, mock.AnythingOfType("string")).Return(dashboard, nil)
+		fakeDashboardService := &dashboards.FakeDashboardService{}
+		fakeDashboardService.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dashboard, nil)
+
+		service, _ := newPublicDashboardServiceImpl(t, fakeStore, fakeDashboardService, annotationsRepo)
 
 		annotationsRepo.On("Find", mock.Anything, mock.Anything).Return([]*annotations.ItemDTO{
 			{
@@ -977,18 +952,13 @@ func TestFindAnnotations(t *testing.T) {
 	})
 
 	t.Run("test will return nothing when dashboard has no annotations", func(t *testing.T) {
-		annotationsRepo := annotations.FakeAnnotationsRepo{}
-		fakeStore := FakePublicDashboardStore{}
-		service := &PublicDashboardServiceImpl{
-			log:             log.New("test.logger"),
-			store:           &fakeStore,
-			AnnotationsRepo: &annotationsRepo,
-		}
 		dashboard := dashboards.NewDashboard("dashWithNoAnnotations")
 		pubdash := &PublicDashboard{Uid: "uid1", IsEnabled: true, OrgId: 1, DashboardUid: dashboard.UID, AnnotationsEnabled: true}
-
+		fakeStore := &FakePublicDashboardStore{}
 		fakeStore.On("FindByAccessToken", mock.Anything, mock.AnythingOfType("string")).Return(pubdash, nil)
-		fakeStore.On("FindDashboard", mock.Anything, mock.Anything, mock.AnythingOfType("string")).Return(dashboard, nil)
+		fakeDashboardService := &dashboards.FakeDashboardService{}
+		fakeDashboardService.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dashboard, nil)
+		service, _ := newPublicDashboardServiceImpl(t, fakeStore, fakeDashboardService, nil)
 
 		items, err := service.FindAnnotations(context.Background(), AnnotationsQueryDTO{}, "abc123")
 
@@ -997,13 +967,6 @@ func TestFindAnnotations(t *testing.T) {
 	})
 
 	t.Run("test will return nothing when pubdash annotations are disabled", func(t *testing.T) {
-		annotationsRepo := annotations.FakeAnnotationsRepo{}
-		fakeStore := FakePublicDashboardStore{}
-		service := &PublicDashboardServiceImpl{
-			log:             log.New("test.logger"),
-			store:           &fakeStore,
-			AnnotationsRepo: &annotationsRepo,
-		}
 		dash := dashboards.NewDashboard("test")
 		grafanaAnnotation := DashAnnotation{
 			Datasource: CreateDatasource("grafana", "grafana"),
@@ -1021,9 +984,11 @@ func TestFindAnnotations(t *testing.T) {
 		annos := []DashAnnotation{grafanaAnnotation}
 		dashboard := AddAnnotationsToDashboard(t, dash, annos)
 		pubdash := &PublicDashboard{Uid: "uid1", IsEnabled: true, OrgId: 1, DashboardUid: dashboard.UID, AnnotationsEnabled: false}
-
+		fakeStore := &FakePublicDashboardStore{}
 		fakeStore.On("FindByAccessToken", mock.Anything, mock.AnythingOfType("string")).Return(pubdash, nil)
-		fakeStore.On("FindDashboard", mock.Anything, mock.Anything, mock.AnythingOfType("string")).Return(dashboard, nil)
+		fakeDashboardService := &dashboards.FakeDashboardService{}
+		fakeDashboardService.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dashboard, nil)
+		service, _ := newPublicDashboardServiceImpl(t, fakeStore, fakeDashboardService, nil)
 
 		items, err := service.FindAnnotations(context.Background(), AnnotationsQueryDTO{}, "abc123")
 
@@ -1032,14 +997,6 @@ func TestFindAnnotations(t *testing.T) {
 	})
 
 	t.Run("test will error when annotations repo returns an error", func(t *testing.T) {
-		annotationsRepo := annotations.FakeAnnotationsRepo{}
-		fakeStore := FakePublicDashboardStore{}
-		service := &PublicDashboardServiceImpl{
-			log:             log.New("test.logger"),
-			store:           &fakeStore,
-			AnnotationsRepo: &annotationsRepo,
-		}
-		dash := dashboards.NewDashboard("test")
 		grafanaAnnotation := DashAnnotation{
 			Datasource: CreateDatasource("grafana", "grafana"),
 			Enable:     true,
@@ -1052,14 +1009,18 @@ func TestFindAnnotations(t *testing.T) {
 				Type:     "tags",
 			},
 		}
+		dash := dashboards.NewDashboard("test")
+		annotationsRepo := &annotations.FakeAnnotationsRepo{}
+		annotationsRepo.On("Find", mock.Anything, mock.Anything).Return(nil, errors.New("failed")).Maybe()
 		annos := []DashAnnotation{grafanaAnnotation}
 		dash = AddAnnotationsToDashboard(t, dash, annos)
 		pubdash := &PublicDashboard{Uid: "uid1", IsEnabled: true, OrgId: 1, DashboardUid: dash.UID, AnnotationsEnabled: true}
-
+		fakeStore := &FakePublicDashboardStore{}
 		fakeStore.On("FindByAccessToken", mock.Anything, mock.AnythingOfType("string")).Return(pubdash, nil)
-		fakeStore.On("FindDashboard", mock.Anything, mock.Anything, mock.AnythingOfType("string")).Return(dash, nil)
+		fakeDashboardService := &dashboards.FakeDashboardService{}
+		fakeDashboardService.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dash, nil)
 
-		annotationsRepo.On("Find", mock.Anything, mock.Anything).Return(nil, errors.New("failed")).Maybe()
+		service, _ := newPublicDashboardServiceImpl(t, fakeStore, fakeDashboardService, annotationsRepo)
 
 		items, err := service.FindAnnotations(context.Background(), AnnotationsQueryDTO{}, "abc123")
 
@@ -1080,19 +1041,14 @@ func TestFindAnnotations(t *testing.T) {
 
 		annos := []DashAnnotation{grafanaAnnotation}
 		dashboard := AddAnnotationsToDashboard(t, dash, annos)
-
-		annotationsRepo := annotations.FakeAnnotationsRepo{}
-		fakeStore := FakePublicDashboardStore{}
-		service := &PublicDashboardServiceImpl{
-			log:             log.New("test.logger"),
-			store:           &fakeStore,
-			AnnotationsRepo: &annotationsRepo,
-		}
 		pubdash := &PublicDashboard{Uid: "uid1", IsEnabled: true, OrgId: 1, DashboardUid: dashboard.UID, AnnotationsEnabled: true}
 
+		fakeStore := &FakePublicDashboardStore{}
 		fakeStore.On("FindByAccessToken", mock.Anything, mock.AnythingOfType("string")).Return(pubdash, nil)
-		fakeStore.On("FindDashboard", mock.Anything, mock.Anything, mock.AnythingOfType("string")).Return(dashboard, nil)
-
+		fakeStore.On("FindByAccessToken", mock.Anything, mock.AnythingOfType("string")).Return(pubdash, nil)
+		fakeDashboardService := &dashboards.FakeDashboardService{}
+		fakeDashboardService.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dashboard, nil)
+		annotationsRepo := &annotations.FakeAnnotationsRepo{}
 		annotationsRepo.On("Find", mock.Anything, mock.Anything).Return([]*annotations.ItemDTO{
 			{
 				ID:          1,
@@ -1105,6 +1061,8 @@ func TestFindAnnotations(t *testing.T) {
 			},
 		}, nil).Maybe()
 
+		service, _ := newPublicDashboardServiceImpl(t, fakeStore, fakeDashboardService, annotationsRepo)
+
 		items, err := service.FindAnnotations(context.Background(), AnnotationsQueryDTO{}, "abc123")
 
 		expected := AnnotationEvent{
@@ -1126,22 +1084,17 @@ func TestFindAnnotations(t *testing.T) {
 }
 
 func TestGetMetricRequest(t *testing.T) {
-	sqlStore := db.InitTestDB(t)
-	dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotatest.New(false, nil))
+	service, sqlStore := newPublicDashboardServiceImpl(t, nil, nil, nil)
+	dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotatest.New(false, nil))
 	require.NoError(t, err)
-	publicdashboardStore := database.ProvideStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures())
 	dashboard := insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, "", true, []map[string]interface{}{}, nil)
+
 	publicDashboard := &PublicDashboard{
 		Uid:          "1",
 		DashboardUid: dashboard.UID,
 		IsEnabled:    true,
 		AccessToken:  "abc123",
 	}
-	service := &PublicDashboardServiceImpl{
-		log:                log.New("test.logger"),
-		store:              publicdashboardStore,
-		intervalCalculator: intervalv2.NewCalculator(),
-	}
 
 	t.Run("will return an error when validation fails", func(t *testing.T) {
 		publicDashboardQueryDTO := PublicDashboardQueryDTO{
@@ -1211,21 +1164,16 @@ func TestGetUniqueDashboardDatasourceUids(t *testing.T) {
 }
 
 func TestBuildMetricRequest(t *testing.T) {
-	sqlStore := db.InitTestDB(t)
-	dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotatest.New(false, nil))
+	fakeDashboardService := &dashboards.FakeDashboardService{}
+	service, sqlStore := newPublicDashboardServiceImpl(t, nil, fakeDashboardService, nil)
+
+	dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotatest.New(false, nil))
 	require.NoError(t, err)
-	publicdashboardStore := database.ProvideStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures())
-	serviceWrapper := ProvideServiceWrapper(publicdashboardStore)
 	publicDashboard := insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, "", true, []map[string]interface{}{}, nil)
 	nonPublicDashboard := insertTestDashboard(t, dashboardStore, "testNonPublicDashie", 1, 0, "", true, []map[string]interface{}{}, nil)
 	from, to := internal.GetTimeRangeFromDashboard(t, publicDashboard.Data)
 
-	service := &PublicDashboardServiceImpl{
-		log:                log.New("test.logger"),
-		store:              publicdashboardStore,
-		intervalCalculator: intervalv2.NewCalculator(),
-		serviceWrapper:     serviceWrapper,
-	}
+	fakeDashboardService.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(publicDashboard, nil)
 
 	publicDashboardQueryDTO := PublicDashboardQueryDTO{
 		IntervalMs:    int64(10000000),
@@ -1373,12 +1321,13 @@ func TestBuildMetricRequest(t *testing.T) {
 
 func TestBuildAnonymousUser(t *testing.T) {
 	sqlStore := db.InitTestDB(t)
-	dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotatest.New(false, nil))
+	dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotatest.New(false, nil))
 	require.NoError(t, err)
 	dashboard := insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, "", true, []map[string]interface{}{}, nil)
+	features := featuremgmt.WithFeatures()
 
 	t.Run("will add datasource read and query permissions to user for each datasource in dashboard", func(t *testing.T) {
-		user := buildAnonymousUser(context.Background(), dashboard)
+		user := buildAnonymousUser(context.Background(), dashboard, features)
 
 		require.Equal(t, dashboard.OrgID, user.OrgID)
 		require.Equal(t, "datasources:uid:ds1", user.Permissions[user.OrgID]["datasources:query"][0])
@@ -1387,12 +1336,20 @@ func TestBuildAnonymousUser(t *testing.T) {
 		require.Equal(t, "datasources:uid:ds3", user.Permissions[user.OrgID]["datasources:read"][1])
 	})
 	t.Run("will add dashboard and annotation permissions needed for getting annotations", func(t *testing.T) {
-		user := buildAnonymousUser(context.Background(), dashboard)
+		user := buildAnonymousUser(context.Background(), dashboard, features)
 
 		require.Equal(t, dashboard.OrgID, user.OrgID)
 		require.Equal(t, "annotations:type:dashboard", user.Permissions[user.OrgID]["annotations:read"][0])
 		require.Equal(t, "dashboards:*", user.Permissions[user.OrgID]["dashboards:read"][0])
 	})
+	t.Run("will add dashboard and annotation permissions needed for getting annotations when FlagAnnotationPermissionUpdate is enabled", func(t *testing.T) {
+		features = featuremgmt.WithFeatures(featuremgmt.FlagAnnotationPermissionUpdate)
+		user := buildAnonymousUser(context.Background(), dashboard, features)
+
+		require.Equal(t, dashboard.OrgID, user.OrgID)
+		require.Equal(t, "dashboards:*", user.Permissions[user.OrgID]["annotations:read"][0])
+		require.Equal(t, "dashboards:*", user.Permissions[user.OrgID]["dashboards:read"][0])
+	})
 }
 
 func TestGroupQueriesByPanelId(t *testing.T) {
diff --git a/pkg/services/publicdashboards/service/service.go b/pkg/services/publicdashboards/service/service.go
index b67c9b2a2cc90..4df8e849cd179 100644
--- a/pkg/services/publicdashboards/service/service.go
+++ b/pkg/services/publicdashboards/service/service.go
@@ -8,18 +8,22 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/annotations"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/licensing"
 	"github.com/grafana/grafana/pkg/services/publicdashboards"
 	. "github.com/grafana/grafana/pkg/services/publicdashboards/models"
+	"github.com/grafana/grafana/pkg/services/publicdashboards/service/intervalv2"
 	"github.com/grafana/grafana/pkg/services/publicdashboards/validation"
 	"github.com/grafana/grafana/pkg/services/query"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/tsdb/intervalv2"
 	"github.com/grafana/grafana/pkg/tsdb/legacydata"
 	"github.com/grafana/grafana/pkg/util"
 )
@@ -29,12 +33,15 @@ import (
 type PublicDashboardServiceImpl struct {
 	log                log.Logger
 	cfg                *setting.Cfg
+	features           featuremgmt.FeatureToggles
 	store              publicdashboards.Store
 	intervalCalculator intervalv2.Calculator
 	QueryDataService   query.Service
 	AnnotationsRepo    annotations.Repository
 	ac                 accesscontrol.AccessControl
 	serviceWrapper     publicdashboards.ServiceWrapper
+	dashboardService   dashboards.DashboardService
+	license            licensing.Licensing
 }
 
 var LogPrefix = "publicdashboards.service"
@@ -47,21 +54,27 @@ var _ publicdashboards.Service = (*PublicDashboardServiceImpl)(nil)
 // builds the service, and api, and configures routes
 func ProvideService(
 	cfg *setting.Cfg,
+	features featuremgmt.FeatureToggles,
 	store publicdashboards.Store,
 	qds query.Service,
 	anno annotations.Repository,
 	ac accesscontrol.AccessControl,
 	serviceWrapper publicdashboards.ServiceWrapper,
+	dashboardService dashboards.DashboardService,
+	license licensing.Licensing,
 ) *PublicDashboardServiceImpl {
 	return &PublicDashboardServiceImpl{
 		log:                log.New(LogPrefix),
 		cfg:                cfg,
+		features:           features,
 		store:              store,
 		intervalCalculator: intervalv2.NewCalculator(),
 		QueryDataService:   qds,
 		AnnotationsRepo:    anno,
 		ac:                 ac,
 		serviceWrapper:     serviceWrapper,
+		dashboardService:   dashboardService,
+		license:            license,
 	}
 }
 
@@ -71,6 +84,7 @@ func (pd *PublicDashboardServiceImpl) GetPublicDashboardForView(ctx context.Cont
 		return nil, err
 	}
 
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.PublicDashboards).Inc()
 	meta := dtos.DashboardMeta{
 		Slug:                   dash.Slug,
 		Type:                   dashboards.DashTypeDB,
@@ -83,7 +97,8 @@ func (pd *PublicDashboardServiceImpl) GetPublicDashboardForView(ctx context.Cont
 		Updated:                dash.Updated,
 		Version:                dash.Version,
 		IsFolder:               false,
-		FolderId:               dash.FolderID,
+		FolderId:               dash.FolderID, // nolint:staticcheck
+		FolderUid:              dash.FolderUID,
 		PublicDashboardEnabled: pubdash.IsEnabled,
 	}
 	dash.Data.Get("timepicker").Set("hidden", !pubdash.TimeSelectionEnabled)
@@ -108,15 +123,17 @@ func (pd *PublicDashboardServiceImpl) Find(ctx context.Context, uid string) (*Pu
 
 // FindDashboard Gets a dashboard by Uid
 func (pd *PublicDashboardServiceImpl) FindDashboard(ctx context.Context, orgId int64, dashboardUid string) (*dashboards.Dashboard, error) {
-	dash, err := pd.store.FindDashboard(ctx, orgId, dashboardUid)
+	dash, err := pd.dashboardService.GetDashboard(ctx, &dashboards.GetDashboardQuery{UID: dashboardUid, OrgID: orgId})
 	if err != nil {
+		var dashboardErr dashboards.DashboardErr
+		if ok := errors.As(err, &dashboardErr); ok {
+			if dashboardErr.StatusCode == 404 {
+				return nil, ErrDashboardNotFound.Errorf("FindDashboard: dashboard not found by orgId: %d and dashboardUid: %s", orgId, dashboardUid)
+			}
+		}
 		return nil, ErrInternalServerError.Errorf("FindDashboard: failed to find dashboard by orgId: %d and dashboardUid: %s: %w", orgId, dashboardUid, err)
 	}
 
-	if dash == nil {
-		return nil, ErrDashboardNotFound.Errorf("FindDashboard: dashboard not found by orgId: %d and dashboardUid: %s", orgId, dashboardUid)
-	}
-
 	return dash, nil
 }
 
@@ -145,6 +162,10 @@ func (pd *PublicDashboardServiceImpl) FindEnabledPublicDashboardAndDashboardByAc
 		return nil, nil, ErrPublicDashboardNotEnabled.Errorf("FindEnabledPublicDashboardAndDashboardByAccessToken: Public dashboard is not enabled accessToken: %s", accessToken)
 	}
 
+	if !pd.license.FeatureEnabled(FeaturePublicDashboardsEmailSharing) && pubdash.Share == EmailShareType {
+		return nil, nil, ErrPublicDashboardNotFound.Errorf("FindEnabledPublicDashboardAndDashboardByAccessToken: Dashboard not found accessToken: %s", accessToken)
+	}
+
 	return pubdash, dash, err
 }
 
@@ -155,7 +176,7 @@ func (pd *PublicDashboardServiceImpl) FindPublicDashboardAndDashboardByAccessTok
 		return nil, nil, err
 	}
 
-	dash, err := pd.store.FindDashboard(ctx, pubdash.OrgId, pubdash.DashboardUid)
+	dash, err := pd.FindDashboard(ctx, pubdash.OrgId, pubdash.DashboardUid)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -188,6 +209,12 @@ func (pd *PublicDashboardServiceImpl) Create(ctx context.Context, u *user.Signed
 	}
 
 	if existingPubdash != nil {
+		// If there is no license and the public dashboard was email-shared, we should update it to public
+		if !pd.license.FeatureEnabled(FeaturePublicDashboardsEmailSharing) && existingPubdash.Share == EmailShareType {
+			dto.Uid = existingPubdash.Uid
+			dto.PublicDashboard.Share = PublicShareType
+			return pd.Update(ctx, u, dto)
+		}
 		return nil, ErrDashboardIsPublic.Errorf("Create: public dashboard for dashboard %s already exists", dto.DashboardUid)
 	}
 
@@ -352,7 +379,7 @@ func (pd *PublicDashboardServiceImpl) Delete(ctx context.Context, uid string, da
 func (pd *PublicDashboardServiceImpl) DeleteByDashboard(ctx context.Context, dashboard *dashboards.Dashboard) error {
 	if dashboard.IsFolder {
 		// get all pubdashes for the folder
-		pubdashes, err := pd.store.FindByDashboardFolder(ctx, dashboard)
+		pubdashes, err := pd.store.FindByFolder(ctx, dashboard.OrgID, dashboard.UID)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/services/publicdashboards/service/service_test.go b/pkg/services/publicdashboards/service/service_test.go
index 2643d3aca936f..6216e926adbfa 100644
--- a/pkg/services/publicdashboards/service/service_test.go
+++ b/pkg/services/publicdashboards/service/service_test.go
@@ -16,21 +16,19 @@ import (
 
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	dashboardsDB "github.com/grafana/grafana/pkg/services/dashboards/database"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	. "github.com/grafana/grafana/pkg/services/publicdashboards"
-	"github.com/grafana/grafana/pkg/services/publicdashboards/database"
 	. "github.com/grafana/grafana/pkg/services/publicdashboards/models"
+	"github.com/grafana/grafana/pkg/services/publicdashboards/service/intervalv2"
 	"github.com/grafana/grafana/pkg/services/publicdashboards/validation"
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
 	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/tsdb/intervalv2"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 	"github.com/grafana/grafana/pkg/util"
 	"github.com/grafana/grafana/pkg/util/errutil"
 )
@@ -40,6 +38,10 @@ var defaultPubdashTimeSettings = &TimeSettings{}
 var dashboardData = simplejson.NewFromAny(map[string]any{"time": map[string]any{"from": "now-8h", "to": "now"}})
 var SignedInUser = &user.SignedInUser{UserID: 1234, Login: "user@login.com"}
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestLogPrefix(t *testing.T) {
 	assert.Equal(t, LogPrefix, "publicdashboards.service")
 }
@@ -312,7 +314,7 @@ func TestGetPublicDashboardForView(t *testing.T) {
 
 	// #nosec G101 -- This is dummy/test token
 	accessToken := "c54b1c4dd2b143a1a7a43005264d256d"
-	d := &dashboards.Dashboard{UID: "mydashboard", Data: data, Slug: "dashboardSlug", Created: now, Updated: now, Version: 1, FolderID: 1}
+	d := &dashboards.Dashboard{UID: "mydashboard", OrgID: 0, Data: data, Slug: "dashboardSlug", Created: now, Updated: now, Version: 1, FolderUID: "myFolder"}
 
 	testCases := []struct {
 		Name        string
@@ -344,7 +346,7 @@ func TestGetPublicDashboardForView(t *testing.T) {
 					Updated:                d.Updated,
 					Version:                d.Version,
 					IsFolder:               false,
-					FolderId:               d.FolderID,
+					FolderUid:              d.FolderUID,
 					PublicDashboardEnabled: true,
 				},
 			},
@@ -372,7 +374,7 @@ func TestGetPublicDashboardForView(t *testing.T) {
 					Updated:                d.Updated,
 					Version:                d.Version,
 					IsFolder:               false,
-					FolderId:               d.FolderID,
+					FolderUid:              d.FolderUID,
 					PublicDashboardEnabled: true,
 				},
 			},
@@ -381,14 +383,11 @@ func TestGetPublicDashboardForView(t *testing.T) {
 
 	for _, test := range testCases {
 		t.Run(test.Name, func(t *testing.T) {
-			fakeStore := FakePublicDashboardStore{}
-			service := &PublicDashboardServiceImpl{
-				log:   log.New("test.logger"),
-				store: &fakeStore,
-			}
-
+			fakeStore := &FakePublicDashboardStore{}
 			fakeStore.On("FindByAccessToken", mock.Anything, mock.Anything).Return(test.StoreResp.pd, test.StoreResp.err)
-			fakeStore.On("FindDashboard", mock.Anything, mock.Anything, mock.Anything).Return(test.StoreResp.d, test.StoreResp.err)
+			fakeDashboardService := &dashboards.FakeDashboardService{}
+			fakeDashboardService.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(test.StoreResp.d, test.StoreResp.err)
+			service, _ := newPublicDashboardServiceImpl(t, fakeStore, fakeDashboardService, nil)
 
 			dashboardFullWithMeta, err := service.GetPublicDashboardForView(context.Background(), test.AccessToken)
 			if test.ErrResp != nil {
@@ -411,7 +410,7 @@ func TestGetPublicDashboardForView(t *testing.T) {
 				assert.Equal(t, test.DashResp.Meta.Updated, dashboardFullWithMeta.Meta.Updated)
 				assert.Equal(t, test.DashResp.Meta.Version, dashboardFullWithMeta.Meta.Version)
 				assert.Equal(t, false, dashboardFullWithMeta.Meta.IsFolder)
-				assert.Equal(t, test.DashResp.Meta.FolderId, dashboardFullWithMeta.Meta.FolderId)
+				assert.Equal(t, test.DashResp.Meta.FolderUid, dashboardFullWithMeta.Meta.FolderUid)
 				assert.Equal(t, test.DashResp.Meta.PublicDashboardEnabled, dashboardFullWithMeta.Meta.PublicDashboardEnabled)
 
 				// hide the timepicker if the time selection is disabled
@@ -493,14 +492,11 @@ func TestGetPublicDashboard(t *testing.T) {
 
 	for _, test := range testCases {
 		t.Run(test.Name, func(t *testing.T) {
-			fakeStore := FakePublicDashboardStore{}
-			service := &PublicDashboardServiceImpl{
-				log:   log.New("test.logger"),
-				store: &fakeStore,
-			}
-
+			fakeDashboardService := &dashboards.FakeDashboardService{}
+			fakeDashboardService.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(test.StoreResp.d, test.StoreResp.err)
+			fakeStore := &FakePublicDashboardStore{}
 			fakeStore.On("FindByAccessToken", mock.Anything, mock.Anything).Return(test.StoreResp.pd, test.StoreResp.err)
-			fakeStore.On("FindDashboard", mock.Anything, mock.Anything, mock.Anything).Return(test.StoreResp.d, test.StoreResp.err)
+			service, _ := newPublicDashboardServiceImpl(t, fakeStore, fakeDashboardService, nil)
 
 			pdc, dash, err := service.FindPublicDashboardAndDashboardByAccessToken(context.Background(), test.AccessToken)
 			if test.ErrResp != nil {
@@ -559,14 +555,11 @@ func TestGetEnabledPublicDashboard(t *testing.T) {
 
 	for _, test := range testCases {
 		t.Run(test.Name, func(t *testing.T) {
-			fakeStore := FakePublicDashboardStore{}
-			service := &PublicDashboardServiceImpl{
-				log:   log.New("test.logger"),
-				store: &fakeStore,
-			}
-
+			fakeStore := &FakePublicDashboardStore{}
 			fakeStore.On("FindByAccessToken", mock.Anything, mock.Anything).Return(test.StoreResp.pd, test.StoreResp.err)
-			fakeStore.On("FindDashboard", mock.Anything, mock.Anything, mock.Anything).Return(test.StoreResp.d, test.StoreResp.err)
+			fakeDashboardService := &dashboards.FakeDashboardService{}
+			fakeDashboardService.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(test.StoreResp.d, test.StoreResp.err)
+			service, _ := newPublicDashboardServiceImpl(t, fakeStore, fakeDashboardService, nil)
 
 			pdc, dash, err := service.FindEnabledPublicDashboardAndDashboardByAccessToken(context.Background(), test.AccessToken)
 			if test.ErrResp != nil {
@@ -589,19 +582,14 @@ func TestGetEnabledPublicDashboard(t *testing.T) {
 // the correct order is convoluted.
 func TestCreatePublicDashboard(t *testing.T) {
 	t.Run("Create public dashboard", func(t *testing.T) {
-		sqlStore := db.InitTestDB(t)
+		fakeDashboardService := &dashboards.FakeDashboardService{}
+		service, sqlStore := newPublicDashboardServiceImpl(t, nil, fakeDashboardService, nil)
+
 		quotaService := quotatest.New(false, nil)
-		dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
+		dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotaService)
 		require.NoError(t, err)
-		publicdashboardStore := database.ProvideStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures())
 		dashboard := insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, "", true, []map[string]any{}, nil)
-		serviceWrapper := ProvideServiceWrapper(publicdashboardStore)
-
-		service := &PublicDashboardServiceImpl{
-			log:            log.New("test.logger"),
-			store:          publicdashboardStore,
-			serviceWrapper: serviceWrapper,
-		}
+		fakeDashboardService.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dashboard, nil)
 
 		isEnabled, annotationsEnabled, timeSelectionEnabled := true, false, true
 
@@ -675,19 +663,13 @@ func TestCreatePublicDashboard(t *testing.T) {
 
 	for _, tt := range testCases {
 		t.Run(fmt.Sprintf("Create public dashboard with %s null boolean fields stores them as false", tt.Name), func(t *testing.T) {
-			sqlStore := db.InitTestDB(t)
+			fakeDashboardService := &dashboards.FakeDashboardService{}
+			service, sqlStore := newPublicDashboardServiceImpl(t, nil, fakeDashboardService, nil)
 			quotaService := quotatest.New(false, nil)
-			dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
+			dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotaService)
 			require.NoError(t, err)
-			publicdashboardStore := database.ProvideStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures())
 			dashboard := insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, "", true, []map[string]any{}, nil)
-			serviceWrapper := ProvideServiceWrapper(publicdashboardStore)
-
-			service := &PublicDashboardServiceImpl{
-				log:            log.New("test.logger"),
-				store:          publicdashboardStore,
-				serviceWrapper: serviceWrapper,
-			}
+			fakeDashboardService.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dashboard, nil)
 
 			dto := &SavePublicDashboardDTO{
 				DashboardUid: dashboard.UID,
@@ -713,19 +695,13 @@ func TestCreatePublicDashboard(t *testing.T) {
 	}
 
 	t.Run("Validate pubdash has default time setting value", func(t *testing.T) {
-		sqlStore := db.InitTestDB(t)
+		fakeDashboardService := &dashboards.FakeDashboardService{}
+		service, sqlStore := newPublicDashboardServiceImpl(t, nil, fakeDashboardService, nil)
 		quotaService := quotatest.New(false, nil)
-		dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
+		dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotaService)
 		require.NoError(t, err)
-		publicdashboardStore := database.ProvideStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures())
 		dashboard := insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, "", true, []map[string]any{}, nil)
-		serviceWrapper := ProvideServiceWrapper(publicdashboardStore)
-
-		service := &PublicDashboardServiceImpl{
-			log:            log.New("test.logger"),
-			store:          publicdashboardStore,
-			serviceWrapper: serviceWrapper,
-		}
+		fakeDashboardService.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dashboard, nil)
 
 		isEnabled := true
 		dto := &SavePublicDashboardDTO{
@@ -746,20 +722,15 @@ func TestCreatePublicDashboard(t *testing.T) {
 	})
 
 	t.Run("Creates pubdash whose dashboard has template variables successfully", func(t *testing.T) {
-		sqlStore := db.InitTestDB(t)
+		fakeDashboardService := &dashboards.FakeDashboardService{}
+		service, sqlStore := newPublicDashboardServiceImpl(t, nil, fakeDashboardService, nil)
 		quotaService := quotatest.New(false, nil)
-		dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
+		dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotaService)
 		require.NoError(t, err)
-		publicdashboardStore := database.ProvideStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures())
+
 		templateVars := make([]map[string]any, 1)
 		dashboard := insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, "", true, templateVars, nil)
-		serviceWrapper := ProvideServiceWrapper(publicdashboardStore)
-
-		service := &PublicDashboardServiceImpl{
-			log:            log.New("test.logger"),
-			store:          publicdashboardStore,
-			serviceWrapper: serviceWrapper,
-		}
+		fakeDashboardService.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dashboard, nil)
 
 		isEnabled := true
 		dto := &SavePublicDashboardDTO{
@@ -793,17 +764,12 @@ func TestCreatePublicDashboard(t *testing.T) {
 		}
 
 		publicDashboardStore := &FakePublicDashboardStore{}
-		publicDashboardStore.On("FindDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dashboard, nil)
 		publicDashboardStore.On("Find", mock.Anything, "ExistingUid").Return(pubdash, nil)
 		publicDashboardStore.On("FindByDashboardUid", mock.Anything, mock.Anything, mock.Anything).Return(nil, ErrPublicDashboardNotFound.Errorf(""))
+		fakeDashboardService := &dashboards.FakeDashboardService{}
+		fakeDashboardService.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dashboard, nil)
 
-		serviceWrapper := ProvideServiceWrapper(publicDashboardStore)
-
-		service := &PublicDashboardServiceImpl{
-			log:            log.New("test.logger"),
-			store:          publicDashboardStore,
-			serviceWrapper: serviceWrapper,
-		}
+		service, _ := newPublicDashboardServiceImpl(t, publicDashboardStore, fakeDashboardService, nil)
 
 		isEnabled := true
 		dto := &SavePublicDashboardDTO{
@@ -822,19 +788,13 @@ func TestCreatePublicDashboard(t *testing.T) {
 	})
 
 	t.Run("Create public dashboard with given pubdash uid", func(t *testing.T) {
-		sqlStore := db.InitTestDB(t)
+		fakeDashboardService := &dashboards.FakeDashboardService{}
+		service, sqlStore := newPublicDashboardServiceImpl(t, nil, fakeDashboardService, nil)
 		quotaService := quotatest.New(false, nil)
-		dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
+		dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotaService)
 		require.NoError(t, err)
-		publicdashboardStore := database.ProvideStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures())
 		dashboard := insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, "", true, []map[string]any{}, nil)
-		serviceWrapper := ProvideServiceWrapper(publicdashboardStore)
-
-		service := &PublicDashboardServiceImpl{
-			log:            log.New("test.logger"),
-			store:          publicdashboardStore,
-			serviceWrapper: serviceWrapper,
-		}
+		fakeDashboardService.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dashboard, nil)
 
 		isEnabled := true
 
@@ -870,18 +830,12 @@ func TestCreatePublicDashboard(t *testing.T) {
 		}
 
 		publicDashboardStore := &FakePublicDashboardStore{}
-		publicDashboardStore.On("FindDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dashboard, nil)
 		publicDashboardStore.On("Find", mock.Anything, mock.Anything).Return(nil, nil)
 		publicDashboardStore.On("FindByAccessToken", mock.Anything, "ExistingAccessToken").Return(pubdash, nil)
 		publicDashboardStore.On("FindByDashboardUid", mock.Anything, mock.Anything, mock.Anything).Return(nil, ErrPublicDashboardNotFound.Errorf(""))
-
-		serviceWrapper := ProvideServiceWrapper(publicDashboardStore)
-
-		service := &PublicDashboardServiceImpl{
-			log:            log.New("test.logger"),
-			store:          publicDashboardStore,
-			serviceWrapper: serviceWrapper,
-		}
+		fakeDashboardService := &dashboards.FakeDashboardService{}
+		fakeDashboardService.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dashboard, nil)
+		service, _ := newPublicDashboardServiceImpl(t, publicDashboardStore, fakeDashboardService, nil)
 
 		isEnabled := true
 		dto := &SavePublicDashboardDTO{
@@ -900,19 +854,13 @@ func TestCreatePublicDashboard(t *testing.T) {
 	})
 
 	t.Run("Create public dashboard with given pubdash access token", func(t *testing.T) {
-		sqlStore := db.InitTestDB(t)
+		fakeDashboardService := &dashboards.FakeDashboardService{}
+		service, sqlStore := newPublicDashboardServiceImpl(t, nil, fakeDashboardService, nil)
 		quotaService := quotatest.New(false, nil)
-		dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
+		dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotaService)
 		require.NoError(t, err)
-		publicdashboardStore := database.ProvideStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures())
 		dashboard := insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, "", true, []map[string]interface{}{}, nil)
-		serviceWrapper := ProvideServiceWrapper(publicdashboardStore)
-
-		service := &PublicDashboardServiceImpl{
-			log:            log.New("test.logger"),
-			store:          publicdashboardStore,
-			serviceWrapper: serviceWrapper,
-		}
+		fakeDashboardService.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dashboard, nil)
 
 		isEnabled := true
 
@@ -947,14 +895,7 @@ func TestCreatePublicDashboard(t *testing.T) {
 
 		publicDashboardStore := &FakePublicDashboardStore{}
 		publicDashboardStore.On("FindByAccessToken", mock.Anything, mock.Anything).Return(pubdash, nil)
-
-		serviceWrapper := ProvideServiceWrapper(publicDashboardStore)
-
-		service := &PublicDashboardServiceImpl{
-			log:            log.New("test.logger"),
-			store:          publicDashboardStore,
-			serviceWrapper: serviceWrapper,
-		}
+		service, _ := newPublicDashboardServiceImpl(t, publicDashboardStore, nil, nil)
 
 		_, err := service.NewPublicDashboardAccessToken(context.Background())
 		require.Error(t, err)
@@ -962,24 +903,16 @@ func TestCreatePublicDashboard(t *testing.T) {
 	})
 
 	t.Run("Returns error if public dashboard exists", func(t *testing.T) {
-		sqlStore := db.InitTestDB(t)
-		dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotatest.New(false, nil))
-		require.NoError(t, err)
-
-		dashboard := insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, "", true, []map[string]any{}, nil)
-
 		publicdashboardStore := &FakePublicDashboardStore{}
 		publicdashboardStore.On("FindByDashboardUid", mock.Anything, mock.Anything, mock.Anything).Return(&PublicDashboard{Uid: "newPubdashUid"}, nil)
-		publicdashboardStore.On("FindDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dashboard, nil)
 		publicdashboardStore.On("Find", mock.Anything, mock.Anything).Return(nil, nil)
+		fakeDashboardService := &dashboards.FakeDashboardService{}
+		service, sqlStore := newPublicDashboardServiceImpl(t, publicdashboardStore, fakeDashboardService, nil)
 
-		serviceWrapper := ProvideServiceWrapper(publicdashboardStore)
-
-		service := &PublicDashboardServiceImpl{
-			log:            log.New("test.logger"),
-			store:          publicdashboardStore,
-			serviceWrapper: serviceWrapper,
-		}
+		dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotatest.New(false, nil))
+		require.NoError(t, err)
+		dashboard := insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, "", true, []map[string]any{}, nil)
+		fakeDashboardService.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dashboard, nil)
 
 		isEnabled, annotationsEnabled := true, false
 		dto := &SavePublicDashboardDTO{
@@ -998,19 +931,14 @@ func TestCreatePublicDashboard(t *testing.T) {
 	})
 
 	t.Run("Validate pubdash has default share value", func(t *testing.T) {
-		sqlStore := db.InitTestDB(t)
+		fakeDashboardService := &dashboards.FakeDashboardService{}
+		service, sqlStore := newPublicDashboardServiceImpl(t, nil, fakeDashboardService, nil)
+
 		quotaService := quotatest.New(false, nil)
-		dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
+		dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotaService)
 		require.NoError(t, err)
-		publicdashboardStore := database.ProvideStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures())
 		dashboard := insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, "", true, []map[string]any{}, nil)
-		serviceWrapper := ProvideServiceWrapper(publicdashboardStore)
-
-		service := &PublicDashboardServiceImpl{
-			log:            log.New("test.logger"),
-			store:          publicdashboardStore,
-			serviceWrapper: serviceWrapper,
-		}
+		fakeDashboardService.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dashboard, nil)
 
 		isEnabled := true
 		dto := &SavePublicDashboardDTO{
@@ -1041,20 +969,15 @@ func assertFalseIfNull(t *testing.T, expectedValue bool, nullableValue *bool) {
 }
 
 func TestUpdatePublicDashboard(t *testing.T) {
-	sqlStore := db.InitTestDB(t)
+	fakeDashboardService := &dashboards.FakeDashboardService{}
+	service, sqlStore := newPublicDashboardServiceImpl(t, nil, fakeDashboardService, nil)
+
 	quotaService := quotatest.New(false, nil)
-	dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
+	dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotaService)
 	require.NoError(t, err)
-	publicdashboardStore := database.ProvideStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures())
-	serviceWrapper := ProvideServiceWrapper(publicdashboardStore)
 	dashboard := insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, "", true, []map[string]any{}, nil)
 	dashboard2 := insertTestDashboard(t, dashboardStore, "testDashie2", 1, 0, "", true, []map[string]any{}, nil)
-
-	service := &PublicDashboardServiceImpl{
-		log:            log.New("test.logger"),
-		store:          publicdashboardStore,
-		serviceWrapper: serviceWrapper,
-	}
+	fakeDashboardService.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dashboard, nil)
 
 	t.Run("Updating public dashboard", func(t *testing.T) {
 		isEnabled, annotationsEnabled, timeSelectionEnabled := true, false, false
@@ -1168,7 +1091,9 @@ func TestUpdatePublicDashboard(t *testing.T) {
 			UserId:          7,
 			PublicDashboard: &PublicDashboardDTO{},
 		}
-
+		fds := &dashboards.FakeDashboardService{}
+		fds.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(nil, dashboards.ErrDashboardNotFound)
+		service.dashboardService = fds
 		updatedPubdash, err := service.Update(context.Background(), SignedInUser, dto)
 		assert.Error(t, err)
 
@@ -1227,19 +1152,14 @@ func TestUpdatePublicDashboard(t *testing.T) {
 
 	for _, tt := range testCases {
 		t.Run(fmt.Sprintf("Update public dashboard with %s null boolean fields let those fields with old persisted value", tt.Name), func(t *testing.T) {
-			sqlStore := db.InitTestDB(t)
+			fakeDashboardService := &dashboards.FakeDashboardService{}
+			service, sqlStore := newPublicDashboardServiceImpl(t, nil, fakeDashboardService, nil)
+
 			quotaService := quotatest.New(false, nil)
-			dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
+			dashboardStore, err := dashboardsDB.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotaService)
 			require.NoError(t, err)
-			publicdashboardStore := database.ProvideStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures())
-			serviceWrapper := ProvideServiceWrapper(publicdashboardStore)
 			dashboard := insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, "", true, []map[string]any{}, nil)
-
-			service := &PublicDashboardServiceImpl{
-				log:            log.New("test.logger"),
-				store:          publicdashboardStore,
-				serviceWrapper: serviceWrapper,
-			}
+			fakeDashboardService.On("GetDashboard", mock.Anything, mock.Anything, mock.Anything).Return(dashboard, nil)
 
 			isEnabled, annotationsEnabled, timeSelectionEnabled := true, true, false
 
@@ -1353,15 +1273,7 @@ func TestDeletePublicDashboard(t *testing.T) {
 			if tt.ExpectedErrResp == nil || tt.mockDeleteStore.StoreRespErr != nil {
 				store.On("Delete", mock.Anything, mock.Anything).Return(tt.mockDeleteStore.AffectedRowsResp, tt.mockDeleteStore.StoreRespErr)
 			}
-			serviceWrapper := &PublicDashboardServiceWrapperImpl{
-				log:   log.New("test.logger"),
-				store: store,
-			}
-			service := &PublicDashboardServiceImpl{
-				log:            log.New("test.logger"),
-				store:          store,
-				serviceWrapper: serviceWrapper,
-			}
+			service, _ := newPublicDashboardServiceImpl(t, store, nil, nil)
 
 			err := service.Delete(context.Background(), "pubdashUID", "uid")
 			if tt.ExpectedErrResp != nil {
@@ -1578,12 +1490,8 @@ func TestPublicDashboardServiceImpl_ListPublicDashboards(t *testing.T) {
 			store := NewFakePublicDashboardStore(t)
 			store.On("FindAllWithPagination", mock.Anything, mock.Anything).
 				Return(tt.mockResponse.PublicDashboardListResponseWithPagination, tt.mockResponse.Err)
-
-			pd := &PublicDashboardServiceImpl{
-				log:   log.New("test.logger"),
-				store: store,
-				ac:    ac,
-			}
+			pd, _ := newPublicDashboardServiceImpl(t, store, nil, nil)
+			pd.ac = ac
 
 			got, err := pd.FindAllWithPagination(tt.args.ctx, tt.args.query)
 			if !tt.wantErr(t, err, fmt.Sprintf("FindAllWithPagination(%v, %v)", tt.args.ctx, tt.args.query)) {
@@ -1750,8 +1658,7 @@ func TestDeleteByDashboard(t *testing.T) {
 		dashboard := &dashboards.Dashboard{UID: "1", OrgID: 1, IsFolder: true}
 		pubdash1 := &PublicDashboard{Uid: "2", OrgId: 1, DashboardUid: dashboard.UID}
 		pubdash2 := &PublicDashboard{Uid: "3", OrgId: 1, DashboardUid: dashboard.UID}
-		store.On("FindByDashboardFolder", mock.Anything, mock.Anything).Return([]*PublicDashboard{pubdash1, pubdash2}, nil)
-		store.On("Delete", mock.Anything, mock.Anything, mock.Anything).Return(int64(1), nil)
+		store.On("FindByFolder", mock.Anything, mock.Anything, mock.Anything).Return([]*PublicDashboard{pubdash1, pubdash2}, nil)
 		store.On("Delete", mock.Anything, mock.Anything, mock.Anything).Return(int64(1), nil)
 
 		err := pd.DeleteByDashboard(context.Background(), dashboard)
@@ -1853,7 +1760,6 @@ func insertTestDashboard(t *testing.T, dashboardStore dashboards.Store, title st
 
 	cmd := dashboards.SaveDashboardCommand{
 		OrgID:     orgId,
-		FolderID:  folderId,
 		FolderUID: folderUID,
 		IsFolder:  isFolder,
 		Dashboard: simplejson.NewFromAny(map[string]any{
diff --git a/pkg/services/query/query.go b/pkg/services/query/query.go
index 4ba73e9135435..34f2fabdee731 100644
--- a/pkg/services/query/query.go
+++ b/pkg/services/query/query.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"net/http"
 	"runtime"
+	"slices"
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"golang.org/x/exp/slices"
 	"golang.org/x/sync/errgroup"
 
 	"github.com/grafana/grafana/pkg/api/dtos"
@@ -28,10 +28,11 @@ import (
 )
 
 const (
-	HeaderPluginID       = "X-Plugin-Id"         // can be used for routing
-	HeaderDatasourceUID  = "X-Datasource-Uid"    // can be used for routing/ load balancing
-	HeaderDashboardUID   = "X-Dashboard-Uid"     // mainly useful for debugging slow queries
-	HeaderPanelID        = "X-Panel-Id"          // mainly useful for debugging slow queries
+	HeaderPluginID       = "X-Plugin-Id"      // can be used for routing
+	HeaderDatasourceUID  = "X-Datasource-Uid" // can be used for routing/ load balancing
+	HeaderDashboardUID   = "X-Dashboard-Uid"  // mainly useful for debugging slow queries
+	HeaderPanelID        = "X-Panel-Id"       // mainly useful for debugging slow queries
+	HeaderPanelPluginId  = "X-Panel-Plugin-Id"
 	HeaderQueryGroupID   = "X-Query-Group-Id"    // mainly useful for finding related queries with query chunking
 	HeaderFromExpression = "X-Grafana-From-Expr" // used by datasources to identify expression queries
 )
@@ -305,14 +306,12 @@ func (s *ServiceImpl) parseMetricRequest(ctx context.Context, user identity.Requ
 			req.parsedQueries[ds.UID] = []parsedQuery{}
 		}
 
-		s.log.Debug("Processing metrics query", "query", query)
-
 		modelJSON, err := query.MarshalJSON()
 		if err != nil {
 			return nil, err
 		}
 
-		req.parsedQueries[ds.UID] = append(req.parsedQueries[ds.UID], parsedQuery{
+		pq := parsedQuery{
 			datasource: ds,
 			query: backend.DataQuery{
 				TimeRange: backend.TimeRange{
@@ -326,7 +325,16 @@ func (s *ServiceImpl) parseMetricRequest(ctx context.Context, user identity.Requ
 				JSON:          modelJSON,
 			},
 			rawQuery: query,
-		})
+		}
+		req.parsedQueries[ds.UID] = append(req.parsedQueries[ds.UID], pq)
+
+		s.log.Debug("Processed metrics query",
+			"ref_id", pq.query.RefID,
+			"from", timeRange.GetFromAsMsEpoch(),
+			"to", timeRange.GetToAsMsEpoch(),
+			"interval", pq.query.Interval.Milliseconds(),
+			"max_data_points", pq.query.MaxDataPoints,
+			"query", string(modelJSON))
 	}
 
 	return req, req.validateRequest(ctx)
diff --git a/pkg/services/query/query_test.go b/pkg/services/query/query_test.go
index c1cd5166b6f3a..486529466f28a 100644
--- a/pkg/services/query/query_test.go
+++ b/pkg/services/query/query_test.go
@@ -24,8 +24,6 @@ import (
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/models/roletype"
 	"github.com/grafana/grafana/pkg/plugins"
-	"github.com/grafana/grafana/pkg/plugins/config"
-	pluginFakes "github.com/grafana/grafana/pkg/plugins/manager/fakes"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/contexthandler"
 	"github.com/grafana/grafana/pkg/services/contexthandler/ctxkey"
@@ -33,6 +31,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/datasources"
 	fakeDatasources "github.com/grafana/grafana/pkg/services/datasources/fakes"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginconfig"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
 	pluginSettings "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings/service"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
@@ -41,9 +40,14 @@ import (
 	secretsmng "github.com/grafana/grafana/pkg/services/secrets/manager"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 	"github.com/grafana/grafana/pkg/web"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestParseMetricRequest(t *testing.T) {
 	t.Run("Test a simple single datasource query", func(t *testing.T) {
 		tc := setup(t)
@@ -476,8 +480,8 @@ func setup(t *testing.T) *testContext {
 				{JSONData: plugins.JSONData{ID: "testdata"}},
 				{JSONData: plugins.JSONData{ID: "mysql"}},
 			},
-		}, fakeDatasourceService,
-		pluginSettings.ProvideService(sqlStore, secretsService), pluginFakes.NewFakeLicensingService(), &config.Cfg{},
+		}, &fakeDatasources.FakeCacheService{}, fakeDatasourceService,
+		pluginSettings.ProvideService(sqlStore, secretsService), pluginconfig.NewFakePluginRequestConfigProvider(),
 	)
 	exprService := expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, pc, pCtxProvider,
 		&featuremgmt.FeatureManager{}, nil, tracing.InitializeTracerForTest())
diff --git a/pkg/services/queryhistory/database.go b/pkg/services/queryhistory/database.go
index 3d780481a0180..a6357d48014ad 100644
--- a/pkg/services/queryhistory/database.go
+++ b/pkg/services/queryhistory/database.go
@@ -45,7 +45,7 @@ func (s QueryHistoryService) createQuery(ctx context.Context, user *user.SignedI
 // searchQueries searches for queries in query history based on provided parameters
 func (s QueryHistoryService) searchQueries(ctx context.Context, user *user.SignedInUser, query SearchInQueryHistoryQuery) (QueryHistorySearchResult, error) {
 	var dtos []QueryHistoryDTO
-	var allQueries []any
+	var totalCount int
 
 	if query.To <= 0 {
 		query.To = s.now().Unix()
@@ -73,7 +73,7 @@ func (s QueryHistoryService) searchQueries(ctx context.Context, user *user.Signe
 			query_history.comment,
 			query_history.queries,
 		`)
-		writeStarredSQL(query, s.store, &dtosBuilder)
+		writeStarredSQL(query, s.store, &dtosBuilder, false)
 		writeFiltersSQL(query, user, s.store, &dtosBuilder)
 		writeSortSQL(query, s.store, &dtosBuilder)
 		writeLimitSQL(query, s.store, &dtosBuilder)
@@ -87,9 +87,9 @@ func (s QueryHistoryService) searchQueries(ctx context.Context, user *user.Signe
 		countBuilder := db.SQLBuilder{}
 		countBuilder.Write(`SELECT
 		`)
-		writeStarredSQL(query, s.store, &countBuilder)
+		writeStarredSQL(query, s.store, &countBuilder, true)
 		writeFiltersSQL(query, user, s.store, &countBuilder)
-		err = session.SQL(countBuilder.GetSQLString(), countBuilder.GetParams()...).Find(&allQueries)
+		_, err = session.SQL(countBuilder.GetSQLString(), countBuilder.GetParams()...).Get(&totalCount)
 		return err
 	})
 
@@ -99,7 +99,7 @@ func (s QueryHistoryService) searchQueries(ctx context.Context, user *user.Signe
 
 	response := QueryHistorySearchResult{
 		QueryHistory: dtos,
-		TotalCount:   len(allQueries),
+		TotalCount:   totalCount,
 		Page:         query.Page,
 		PerPage:      query.Limit,
 	}
diff --git a/pkg/services/queryhistory/queryhistory_test.go b/pkg/services/queryhistory/queryhistory_test.go
index 203ae361eef74..80535378d860f 100644
--- a/pkg/services/queryhistory/queryhistory_test.go
+++ b/pkg/services/queryhistory/queryhistory_test.go
@@ -23,6 +23,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/user/userimpl"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 	"github.com/grafana/grafana/pkg/web"
 )
 
@@ -33,6 +34,10 @@ var (
 	testDsUID2 = "ABch1a1"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 type scenarioContext struct {
 	ctx           *web.Context
 	service       *QueryHistoryService
diff --git a/pkg/services/queryhistory/writers.go b/pkg/services/queryhistory/writers.go
index 00199f4716450..b1b6806b648f4 100644
--- a/pkg/services/queryhistory/writers.go
+++ b/pkg/services/queryhistory/writers.go
@@ -8,18 +8,29 @@ import (
 	"github.com/grafana/grafana/pkg/services/user"
 )
 
-func writeStarredSQL(query SearchInQueryHistoryQuery, sqlStore db.DB, builder *db.SQLBuilder) {
+func writeStarredSQL(query SearchInQueryHistoryQuery, sqlStore db.DB, builder *db.SQLBuilder, isCount bool) {
+	var sql bytes.Buffer
+	if isCount {
+		sql.WriteString(`COUNT(`)
+	}
+	if query.OnlyStarred {
+		sql.WriteString(sqlStore.GetDialect().BooleanStr(true))
+	} else {
+		sql.WriteString(`CASE WHEN query_history_star.query_uid IS NULL THEN ` + sqlStore.GetDialect().BooleanStr(false) + ` ELSE ` + sqlStore.GetDialect().BooleanStr(true) + ` END`)
+	}
+	if isCount {
+		sql.WriteString(`)`)
+	}
+	sql.WriteString(` AS starred FROM query_history `)
+
 	if query.OnlyStarred {
-		builder.Write(sqlStore.GetDialect().BooleanStr(true) + ` AS starred
-				FROM query_history
-				INNER JOIN query_history_star ON query_history_star.query_uid = query_history.uid 
-				`)
+		sql.WriteString(`INNER`)
 	} else {
-		builder.Write(` CASE WHEN query_history_star.query_uid IS NULL THEN ` + sqlStore.GetDialect().BooleanStr(false) + ` ELSE ` + sqlStore.GetDialect().BooleanStr(true) + ` END AS starred
-				FROM query_history
-				LEFT JOIN query_history_star ON query_history_star.query_uid = query_history.uid 
-				`)
+		sql.WriteString(`LEFT`)
 	}
+
+	sql.WriteString(` JOIN query_history_star ON query_history_star.query_uid = query_history.uid `)
+	builder.Write(sql.String())
 }
 
 func writeFiltersSQL(query SearchInQueryHistoryQuery, user *user.SignedInUser, sqlStore db.DB, builder *db.SQLBuilder) {
diff --git a/pkg/services/quota/quotaimpl/quota_test.go b/pkg/services/quota/quotaimpl/quota_test.go
index c866797c3fd42..6d4bf88bb4804 100644
--- a/pkg/services/quota/quotaimpl/quota_test.go
+++ b/pkg/services/quota/quotaimpl/quota_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
 	acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
 	"github.com/grafana/grafana/pkg/services/annotations/annotationstest"
 	"github.com/grafana/grafana/pkg/services/apikey"
@@ -26,9 +27,9 @@ import (
 	"github.com/grafana/grafana/pkg/services/folder/foldertest"
 	"github.com/grafana/grafana/pkg/services/ngalert"
 	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
-	"github.com/grafana/grafana/pkg/services/ngalert/migration"
 	ngalertmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
 	ngstore "github.com/grafana/grafana/pkg/services/ngalert/store"
+	ngalertfakes "github.com/grafana/grafana/pkg/services/ngalert/tests/fakes"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/org/orgimpl"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
@@ -473,20 +474,21 @@ func setupEnv(t *testing.T, sqlStore *sqlstore.SQLStore, b bus.Bus, quotaService
 	require.NoError(t, err)
 	_, err = authimpl.ProvideUserAuthTokenService(sqlStore, nil, quotaService, sqlStore.Cfg)
 	require.NoError(t, err)
-	_, err = dashboardStore.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
+	_, err = dashboardStore.ProvideDashboardStore(sqlStore, sqlStore.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore), quotaService)
 	require.NoError(t, err)
 	secretsService := secretsmng.SetupTestService(t, fakes.NewFakeSecretsStore())
 	secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
 	_, err = dsservice.ProvideService(sqlStore, secretsService, secretsStore, sqlStore.Cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService, &pluginstore.FakePluginStore{})
 	require.NoError(t, err)
 	m := metrics.NewNGAlert(prometheus.NewRegistry())
-	ruleStore, err := ngstore.ProvideDBStore(sqlStore.Cfg, featuremgmt.WithFeatures(), sqlStore, &foldertest.FakeService{},
-		&acmock.Mock{}, &dashboards.FakeDashboardService{})
+
+	ac := acimpl.ProvideAccessControl(sqlStore.Cfg)
+	ruleStore, err := ngstore.ProvideDBStore(sqlStore.Cfg, featuremgmt.WithFeatures(), sqlStore, &foldertest.FakeService{}, &dashboards.FakeDashboardService{}, ac)
 	require.NoError(t, err)
 	_, err = ngalert.ProvideService(
-		sqlStore.Cfg, featuremgmt.WithFeatures(), nil, nil, routing.NewRouteRegister(), sqlStore, nil, nil, nil, quotaService,
+		sqlStore.Cfg, featuremgmt.WithFeatures(), nil, nil, routing.NewRouteRegister(), sqlStore, ngalertfakes.NewFakeKVStore(t), nil, nil, quotaService,
 		secretsService, nil, m, &foldertest.FakeService{}, &acmock.Mock{}, &dashboards.FakeDashboardService{}, nil, b, &acmock.Mock{},
-		annotationstest.NewFakeAnnotationsRepo(), &pluginstore.FakePluginStore{}, tracer, ruleStore, migration.NewFakeMigrationService(t), nil,
+		annotationstest.NewFakeAnnotationsRepo(), &pluginstore.FakePluginStore{}, tracer, ruleStore,
 	)
 	require.NoError(t, err)
 	_, err = storesrv.ProvideService(sqlStore, featuremgmt.WithFeatures(), sqlStore.Cfg, quotaService, storesrv.ProvideSystemUsersService())
diff --git a/pkg/services/quota/quotaimpl/store_test.go b/pkg/services/quota/quotaimpl/store_test.go
index d332ab97851d1..2e8211871d147 100644
--- a/pkg/services/quota/quotaimpl/store_test.go
+++ b/pkg/services/quota/quotaimpl/store_test.go
@@ -8,8 +8,13 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/services/quota"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationQuotaDataAccess(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
diff --git a/pkg/services/rendering/auth.go b/pkg/services/rendering/auth.go
index 73c43c3b002a5..450d99d241cb1 100644
--- a/pkg/services/rendering/auth.go
+++ b/pkg/services/rendering/auth.go
@@ -37,7 +37,7 @@ func (rs *RenderingService) GetRenderUser(ctx context.Context, key string) (*Ren
 
 	var renderUser *RenderUser
 
-	if looksLikeJWT(key) && rs.features.IsEnabled(featuremgmt.FlagRenderAuthJWT) {
+	if looksLikeJWT(key) && rs.features.IsEnabled(ctx, featuremgmt.FlagRenderAuthJWT) {
 		from = "jwt"
 		renderUser = rs.getRenderUserFromJWT(key)
 	} else {
diff --git a/pkg/services/rendering/capabilities.go b/pkg/services/rendering/capabilities.go
index f4eaa4eddcd86..855422aece4e9 100644
--- a/pkg/services/rendering/capabilities.go
+++ b/pkg/services/rendering/capabilities.go
@@ -3,6 +3,7 @@ package rendering
 import (
 	"context"
 	"errors"
+	"fmt"
 
 	"github.com/Masterminds/semver"
 )
@@ -17,7 +18,8 @@ type CapabilityName string
 const (
 	ScalingDownImages CapabilityName = "ScalingDownImages"
 	FullHeightImages  CapabilityName = "FullHeightImages"
-	SvgSanitization   CapabilityName = "SvgSanitization"
+	SVGSanitization   CapabilityName = "SvgSanitization"
+	PDFRendering      CapabilityName = "PdfRendering"
 )
 
 var ErrUnknownCapability = errors.New("unknown capability")
@@ -55,3 +57,16 @@ func (rs *RenderingService) HasCapability(ctx context.Context, capability Capabi
 
 	return CapabilitySupportRequestResult{IsSupported: compiledSemverConstraint.Check(compiledImageRendererVersion), SemverConstraint: semverConstraint}, nil
 }
+
+func (rs *RenderingService) IsCapabilitySupported(ctx context.Context, capabilityName CapabilityName) error {
+	capability, err := rs.HasCapability(ctx, capabilityName)
+	if err != nil {
+		return err
+	}
+
+	if !capability.IsSupported {
+		return fmt.Errorf("%s unsupported, requires image renderer version: %s", capabilityName, capability.SemverConstraint)
+	}
+
+	return nil
+}
diff --git a/pkg/services/rendering/capabilities_test.go b/pkg/services/rendering/capabilities_test.go
index f0faab7c6a599..e9b4989dbbf2c 100644
--- a/pkg/services/rendering/capabilities_test.go
+++ b/pkg/services/rendering/capabilities_test.go
@@ -7,14 +7,13 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
 type dummyPluginManager struct{}
 
-func (d *dummyPluginManager) Renderer(_ context.Context) *plugins.Plugin {
-	return nil
+func (d *dummyPluginManager) Renderer(_ context.Context) (Plugin, bool) {
+	return nil, false
 }
 
 var dummyRendererUrl = "http://dummyurl.com"
diff --git a/pkg/services/rendering/http_mode.go b/pkg/services/rendering/http_mode.go
index 6e5677f48e498..7140ef17aa0d5 100644
--- a/pkg/services/rendering/http_mode.go
+++ b/pkg/services/rendering/http_mode.go
@@ -36,8 +36,12 @@ var (
 	remoteVersionRefreshInterval               = time.Minute * 15
 )
 
-func (rs *RenderingService) renderViaHTTP(ctx context.Context, renderKey string, opts Opts) (*RenderResult, error) {
-	filePath, err := rs.getNewFilePath(RenderPNG)
+func (rs *RenderingService) renderViaHTTP(ctx context.Context, renderType RenderType, renderKey string, opts Opts) (*RenderResult, error) {
+	if renderType == RenderPDF {
+		opts.Encoding = "pdf"
+	}
+
+	filePath, err := rs.getNewFilePath(renderType)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/services/rendering/interface.go b/pkg/services/rendering/interface.go
index 1748a37248e65..3fa172487af00 100644
--- a/pkg/services/rendering/interface.go
+++ b/pkg/services/rendering/interface.go
@@ -20,6 +20,7 @@ type RenderType string
 const (
 	RenderCSV RenderType = "csv"
 	RenderPNG RenderType = "png"
+	RenderPDF RenderType = "pdf"
 )
 
 type TimeoutOpts struct {
@@ -93,7 +94,7 @@ type RenderCSVResult struct {
 	FileName string
 }
 
-type renderFunc func(ctx context.Context, renderKey string, options Opts) (*RenderResult, error)
+type renderFunc func(ctx context.Context, renderType RenderType, renderKey string, options Opts) (*RenderResult, error)
 type renderCSVFunc func(ctx context.Context, renderKey string, options CSVOpts) (*RenderCSVResult, error)
 type sanitizeFunc func(ctx context.Context, req *SanitizeSVGRequest) (*SanitizeSVGResponse, error)
 
@@ -121,11 +122,12 @@ type CapabilitySupportRequestResult struct {
 type Service interface {
 	IsAvailable(ctx context.Context) bool
 	Version() string
-	Render(ctx context.Context, opts Opts, session Session) (*RenderResult, error)
+	Render(ctx context.Context, renderType RenderType, opts Opts, session Session) (*RenderResult, error)
 	RenderCSV(ctx context.Context, opts CSVOpts, session Session) (*RenderCSVResult, error)
 	RenderErrorImage(theme models.Theme, error error) (*RenderResult, error)
 	GetRenderUser(ctx context.Context, key string) (*RenderUser, bool)
 	HasCapability(ctx context.Context, capability CapabilityName) (CapabilitySupportRequestResult, error)
+	IsCapabilitySupported(ctx context.Context, capability CapabilityName) error
 	CreateRenderingSession(ctx context.Context, authOpts AuthOpts, sessionOpts SessionOpts) (Session, error)
 	SanitizeSVG(ctx context.Context, req *SanitizeSVGRequest) (*SanitizeSVGResponse, error)
 }
diff --git a/pkg/services/rendering/mock.go b/pkg/services/rendering/mock.go
index 9404b30ec4649..4dfe3d71bea8c 100644
--- a/pkg/services/rendering/mock.go
+++ b/pkg/services/rendering/mock.go
@@ -1,7 +1,6 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: github.com/grafana/grafana/pkg/services/rendering (interfaces: Service)
 
-// Package rendering is a generated GoMock package.
 package rendering
 
 import (
@@ -37,122 +36,136 @@ func (m *MockService) EXPECT() *MockServiceMockRecorder {
 }
 
 // CreateRenderingSession mocks base method.
-func (m *MockService) CreateRenderingSession(arg0 context.Context, arg1 AuthOpts, arg2 SessionOpts) (Session, error) {
+func (m *MockService) CreateRenderingSession(ctx context.Context, authOpts AuthOpts, sessionOpts SessionOpts) (Session, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "CreateRenderingSession", arg0, arg1, arg2)
+	ret := m.ctrl.Call(m, "CreateRenderingSession", ctx, authOpts, sessionOpts)
 	ret0, _ := ret[0].(Session)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // CreateRenderingSession indicates an expected call of CreateRenderingSession.
-func (mr *MockServiceMockRecorder) CreateRenderingSession(arg0, arg1, arg2 any) *gomock.Call {
+func (mr *MockServiceMockRecorder) CreateRenderingSession(ctx, authOpts, sessionOpts interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateRenderingSession", reflect.TypeOf((*MockService)(nil).CreateRenderingSession), arg0, arg1, arg2)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateRenderingSession", reflect.TypeOf((*MockService)(nil).CreateRenderingSession), ctx, authOpts, sessionOpts)
 }
 
 // GetRenderUser mocks base method.
-func (m *MockService) GetRenderUser(arg0 context.Context, arg1 string) (*RenderUser, bool) {
+func (m *MockService) GetRenderUser(ctx context.Context, key string) (*RenderUser, bool) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "GetRenderUser", arg0, arg1)
+	ret := m.ctrl.Call(m, "GetRenderUser", ctx, key)
 	ret0, _ := ret[0].(*RenderUser)
 	ret1, _ := ret[1].(bool)
 	return ret0, ret1
 }
 
 // GetRenderUser indicates an expected call of GetRenderUser.
-func (mr *MockServiceMockRecorder) GetRenderUser(arg0, arg1 any) *gomock.Call {
+func (mr *MockServiceMockRecorder) GetRenderUser(ctx, key interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRenderUser", reflect.TypeOf((*MockService)(nil).GetRenderUser), arg0, arg1)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRenderUser", reflect.TypeOf((*MockService)(nil).GetRenderUser), ctx, key)
 }
 
 // HasCapability mocks base method.
-func (m *MockService) HasCapability(arg0 context.Context, arg1 CapabilityName) (CapabilitySupportRequestResult, error) {
+func (m *MockService) HasCapability(ctx context.Context, capability CapabilityName) (CapabilitySupportRequestResult, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "HasCapability", arg0, arg1)
+	ret := m.ctrl.Call(m, "HasCapability", ctx, capability)
 	ret0, _ := ret[0].(CapabilitySupportRequestResult)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // HasCapability indicates an expected call of HasCapability.
-func (mr *MockServiceMockRecorder) HasCapability(arg0, arg1 any) *gomock.Call {
+func (mr *MockServiceMockRecorder) HasCapability(ctx, capability interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasCapability", reflect.TypeOf((*MockService)(nil).HasCapability), arg0, arg1)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasCapability", reflect.TypeOf((*MockService)(nil).HasCapability), ctx, capability)
+}
+
+// IsCapabilitySupported mocks base method.
+func (m *MockService) IsCapabilitySupported(ctx context.Context, capability CapabilityName) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "IsCapabilitySupported", ctx, capability)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// IsCapabilitySupported indicates an expected call of IsCapabilitySupported.
+func (mr *MockServiceMockRecorder) IsCapabilitySupported(ctx, capability interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsCapabilitySupported", reflect.TypeOf((*MockService)(nil).IsCapabilitySupported), ctx, capability)
 }
 
 // IsAvailable mocks base method.
-func (m *MockService) IsAvailable(arg0 context.Context) bool {
+func (m *MockService) IsAvailable(ctx context.Context) bool {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "IsAvailable", arg0)
+	ret := m.ctrl.Call(m, "IsAvailable", ctx)
 	ret0, _ := ret[0].(bool)
 	return ret0
 }
 
 // IsAvailable indicates an expected call of IsAvailable.
-func (mr *MockServiceMockRecorder) IsAvailable(arg0 any) *gomock.Call {
+func (mr *MockServiceMockRecorder) IsAvailable(ctx interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsAvailable", reflect.TypeOf((*MockService)(nil).IsAvailable), arg0)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsAvailable", reflect.TypeOf((*MockService)(nil).IsAvailable), ctx)
 }
 
 // Render mocks base method.
-func (m *MockService) Render(arg0 context.Context, arg1 Opts, arg2 Session) (*RenderResult, error) {
+func (m *MockService) Render(ctx context.Context, renderType RenderType, opts Opts, session Session) (*RenderResult, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Render", arg0, arg1, arg2)
+	ret := m.ctrl.Call(m, "Render", ctx, renderType, opts, session)
 	ret0, _ := ret[0].(*RenderResult)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // Render indicates an expected call of Render.
-func (mr *MockServiceMockRecorder) Render(arg0, arg1, arg2 any) *gomock.Call {
+func (mr *MockServiceMockRecorder) Render(ctx, renderType, opts, session interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Render", reflect.TypeOf((*MockService)(nil).Render), arg0, arg1, arg2)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Render", reflect.TypeOf((*MockService)(nil).Render), ctx, renderType, opts, session)
 }
 
 // RenderCSV mocks base method.
-func (m *MockService) RenderCSV(arg0 context.Context, arg1 CSVOpts, arg2 Session) (*RenderCSVResult, error) {
+func (m *MockService) RenderCSV(ctx context.Context, opts CSVOpts, session Session) (*RenderCSVResult, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "RenderCSV", arg0, arg1, arg2)
+	ret := m.ctrl.Call(m, "RenderCSV", ctx, opts, session)
 	ret0, _ := ret[0].(*RenderCSVResult)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // RenderCSV indicates an expected call of RenderCSV.
-func (mr *MockServiceMockRecorder) RenderCSV(arg0, arg1, arg2 any) *gomock.Call {
+func (mr *MockServiceMockRecorder) RenderCSV(ctx, opts, session interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RenderCSV", reflect.TypeOf((*MockService)(nil).RenderCSV), arg0, arg1, arg2)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RenderCSV", reflect.TypeOf((*MockService)(nil).RenderCSV), ctx, opts, session)
 }
 
 // RenderErrorImage mocks base method.
-func (m *MockService) RenderErrorImage(arg0 models.Theme, arg1 error) (*RenderResult, error) {
+func (m *MockService) RenderErrorImage(theme models.Theme, err error) (*RenderResult, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "RenderErrorImage", arg0, arg1)
+	ret := m.ctrl.Call(m, "RenderErrorImage", theme, err)
 	ret0, _ := ret[0].(*RenderResult)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // RenderErrorImage indicates an expected call of RenderErrorImage.
-func (mr *MockServiceMockRecorder) RenderErrorImage(arg0, arg1 any) *gomock.Call {
+func (mr *MockServiceMockRecorder) RenderErrorImage(theme, error interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RenderErrorImage", reflect.TypeOf((*MockService)(nil).RenderErrorImage), arg0, arg1)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RenderErrorImage", reflect.TypeOf((*MockService)(nil).RenderErrorImage), theme, error)
 }
 
 // SanitizeSVG mocks base method.
-func (m *MockService) SanitizeSVG(arg0 context.Context, arg1 *SanitizeSVGRequest) (*SanitizeSVGResponse, error) {
+func (m *MockService) SanitizeSVG(ctx context.Context, req *SanitizeSVGRequest) (*SanitizeSVGResponse, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "SanitizeSVG", arg0, arg1)
+	ret := m.ctrl.Call(m, "SanitizeSVG", ctx, req)
 	ret0, _ := ret[0].(*SanitizeSVGResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // SanitizeSVG indicates an expected call of SanitizeSVG.
-func (mr *MockServiceMockRecorder) SanitizeSVG(arg0, arg1 any) *gomock.Call {
+func (mr *MockServiceMockRecorder) SanitizeSVG(ctx, req interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SanitizeSVG", reflect.TypeOf((*MockService)(nil).SanitizeSVG), arg0, arg1)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SanitizeSVG", reflect.TypeOf((*MockService)(nil).SanitizeSVG), ctx, req)
 }
 
 // Version mocks base method.
diff --git a/pkg/services/rendering/plugin_mode.go b/pkg/services/rendering/plugin_mode.go
index 443dcd7df6ddf..3b448551c3640 100644
--- a/pkg/services/rendering/plugin_mode.go
+++ b/pkg/services/rendering/plugin_mode.go
@@ -8,16 +8,16 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/backendplugin/pluginextensionv2"
 )
 
-func (rs *RenderingService) startPlugin(ctx context.Context) error {
-	return rs.pluginInfo.Start(ctx)
-}
+func (rs *RenderingService) renderViaPlugin(ctx context.Context, renderType RenderType, renderKey string, opts Opts) (*RenderResult, error) {
+	if renderType == RenderPDF {
+		opts.Encoding = "pdf"
+	}
 
-func (rs *RenderingService) renderViaPlugin(ctx context.Context, renderKey string, opts Opts) (*RenderResult, error) {
 	// gives plugin some additional time to timeout and return possible errors.
 	ctx, cancel := context.WithTimeout(ctx, getRequestTimeout(opts.TimeoutOpts))
 	defer cancel()
 
-	filePath, err := rs.getNewFilePath(RenderPNG)
+	filePath, err := rs.getNewFilePath(renderType)
 	if err != nil {
 		return nil, err
 	}
@@ -42,10 +42,15 @@ func (rs *RenderingService) renderViaPlugin(ctx context.Context, renderKey strin
 		Domain:            rs.domain,
 		Headers:           headers,
 		AuthToken:         rs.Cfg.RendererAuthToken,
+		Encoding:          opts.Encoding,
 	}
 	rs.log.Debug("Calling renderer plugin", "req", req)
 
-	rsp, err := rs.pluginInfo.Renderer.Render(ctx, req)
+	rc, err := rs.plugin.Client()
+	if err != nil {
+		return nil, err
+	}
+	rsp, err := rc.Render(ctx, req)
 	if errors.Is(ctx.Err(), context.DeadlineExceeded) {
 		rs.log.Info("Rendering timed out")
 		return nil, ErrTimeout
@@ -89,7 +94,12 @@ func (rs *RenderingService) renderCSVViaPlugin(ctx context.Context, renderKey st
 	}
 	rs.log.Debug("Calling renderer plugin", "req", req)
 
-	rsp, err := rs.pluginInfo.Renderer.RenderCSV(ctx, req)
+	rc, err := rs.plugin.Client()
+	if err != nil {
+		return nil, err
+	}
+
+	rsp, err := rc.RenderCSV(ctx, req)
 	if err != nil {
 		if errors.Is(ctx.Err(), context.DeadlineExceeded) {
 			rs.log.Info("Rendering timed out")
diff --git a/pkg/services/rendering/rendering.go b/pkg/services/rendering/rendering.go
index 930c452dc66c0..5918b013fec33 100644
--- a/pkg/services/rendering/rendering.go
+++ b/pkg/services/rendering/rendering.go
@@ -18,7 +18,7 @@ import (
 	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/infra/remotecache"
 	"github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/backendplugin/pluginextensionv2"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
@@ -28,7 +28,7 @@ var _ Service = (*RenderingService)(nil)
 
 type RenderingService struct {
 	log               log.Logger
-	pluginInfo        *plugins.Plugin
+	plugin            Plugin
 	renderAction      renderFunc
 	renderCSVAction   renderCSVFunc
 	sanitizeSVGAction sanitizeFunc
@@ -38,25 +38,38 @@ type RenderingService struct {
 	version           string
 	versionMutex      sync.RWMutex
 	capabilities      []Capability
+	pluginAvailable   bool
 
 	perRequestRenderKeyProvider renderKeyProvider
 	Cfg                         *setting.Cfg
 	features                    *featuremgmt.FeatureManager
 	RemoteCacheService          *remotecache.RemoteCache
-	RendererPluginManager       plugins.RendererManager
+	RendererPluginManager       PluginManager
 }
 
-func ProvideService(cfg *setting.Cfg, features *featuremgmt.FeatureManager, remoteCache *remotecache.RemoteCache, rm plugins.RendererManager) (*RenderingService, error) {
-	// ensure ImagesDir exists
-	err := os.MkdirAll(cfg.ImagesDir, 0700)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create images directory %q: %w", cfg.ImagesDir, err)
+type PluginManager interface {
+	Renderer(ctx context.Context) (Plugin, bool)
+}
+
+type Plugin interface {
+	Client() (pluginextensionv2.RendererPlugin, error)
+	Start(ctx context.Context) error
+	Version() string
+}
+
+func ProvideService(cfg *setting.Cfg, features *featuremgmt.FeatureManager, remoteCache *remotecache.RemoteCache, rm PluginManager) (*RenderingService, error) {
+	folders := []string{
+		cfg.ImagesDir,
+		cfg.CSVsDir,
+		cfg.PDFsDir,
 	}
 
-	// ensure CSVsDir exists
-	err = os.MkdirAll(cfg.CSVsDir, 0700)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create CSVs directory %q: %w", cfg.CSVsDir, err)
+	// ensure folders exists
+	for _, f := range folders {
+		err := os.MkdirAll(f, 0700)
+		if err != nil {
+			return nil, fmt.Errorf("failed to create directory %q: %w", f, err)
+		}
 	}
 
 	logger := log.New("rendering")
@@ -84,7 +97,7 @@ func ProvideService(cfg *setting.Cfg, features *featuremgmt.FeatureManager, remo
 	}
 
 	var renderKeyProvider renderKeyProvider
-	if features.IsEnabled(featuremgmt.FlagRenderAuthJWT) {
+	if features.IsEnabledGlobally(featuremgmt.FlagRenderAuthJWT) {
 		renderKeyProvider = &jwtRenderKeyProvider{
 			log:       logger,
 			authToken: []byte(cfg.RendererAuthToken),
@@ -98,6 +111,8 @@ func ProvideService(cfg *setting.Cfg, features *featuremgmt.FeatureManager, remo
 		}
 	}
 
+	_, exists := rm.Renderer(context.Background())
+
 	s := &RenderingService{
 		perRequestRenderKeyProvider: renderKeyProvider,
 		capabilities: []Capability{
@@ -110,9 +125,13 @@ func ProvideService(cfg *setting.Cfg, features *featuremgmt.FeatureManager, remo
 				semverConstraint: ">= 3.4.0",
 			},
 			{
-				name:             SvgSanitization,
+				name:             SVGSanitization,
 				semverConstraint: ">= 3.5.0",
 			},
+			{
+				name:             PDFRendering,
+				semverConstraint: ">= 3.10.0",
+			},
 		},
 		Cfg:                   cfg,
 		features:              features,
@@ -121,6 +140,7 @@ func ProvideService(cfg *setting.Cfg, features *featuremgmt.FeatureManager, remo
 		log:                   logger,
 		domain:                domain,
 		sanitizeURL:           sanitizeURL,
+		pluginAvailable:       exists,
 	}
 
 	gob.Register(&RenderUser{})
@@ -167,15 +187,13 @@ func (rs *RenderingService) Run(ctx context.Context) error {
 		}
 	}
 
-	if rs.pluginAvailable(ctx) {
+	if rp, exists := rs.RendererPluginManager.Renderer(ctx); exists {
 		rs.log = rs.log.New("renderer", "plugin")
-		rs.pluginInfo = rs.RendererPluginManager.Renderer(ctx)
-
-		if err := rs.startPlugin(ctx); err != nil {
+		rs.plugin = rp
+		if err := rs.plugin.Start(ctx); err != nil {
 			return err
 		}
-
-		rs.version = rs.pluginInfo.Info.Version
+		rs.version = rp.Version()
 		rs.renderAction = rs.renderViaPlugin
 		rs.renderCSVAction = rs.renderCSVViaPlugin
 		rs.sanitizeSVGAction = rs.sanitizeSVGViaPlugin
@@ -192,16 +210,12 @@ func (rs *RenderingService) Run(ctx context.Context) error {
 	return nil
 }
 
-func (rs *RenderingService) pluginAvailable(ctx context.Context) bool {
-	return rs.RendererPluginManager.Renderer(ctx) != nil
-}
-
 func (rs *RenderingService) remoteAvailable() bool {
 	return rs.Cfg.RendererUrl != ""
 }
 
 func (rs *RenderingService) IsAvailable(ctx context.Context) bool {
-	return rs.remoteAvailable() || rs.pluginAvailable(ctx)
+	return rs.remoteAvailable() || rs.pluginAvailable
 }
 
 func (rs *RenderingService) Version() string {
@@ -236,18 +250,18 @@ func (rs *RenderingService) renderUnavailableImage() *RenderResult {
 	imgPath := "public/img/rendering_plugin_not_installed.png"
 
 	return &RenderResult{
-		FilePath: filepath.Join(setting.HomePath, imgPath),
+		FilePath: filepath.Join(rs.Cfg.HomePath, imgPath),
 	}
 }
 
-func (rs *RenderingService) Render(ctx context.Context, opts Opts, session Session) (*RenderResult, error) {
+func (rs *RenderingService) Render(ctx context.Context, renderType RenderType, opts Opts, session Session) (*RenderResult, error) {
 	startTime := time.Now()
 
 	renderKeyProvider := rs.perRequestRenderKeyProvider
 	if session != nil {
 		renderKeyProvider = session
 	}
-	result, err := rs.render(ctx, opts, renderKeyProvider)
+	result, err := rs.render(ctx, renderType, opts, renderKeyProvider)
 
 	elapsedTime := time.Since(startTime).Milliseconds()
 	saveMetrics(elapsedTime, err, RenderPNG)
@@ -255,7 +269,7 @@ func (rs *RenderingService) Render(ctx context.Context, opts Opts, session Sessi
 	return result, err
 }
 
-func (rs *RenderingService) render(ctx context.Context, opts Opts, renderKeyProvider renderKeyProvider) (*RenderResult, error) {
+func (rs *RenderingService) render(ctx context.Context, renderType RenderType, opts Opts, renderKeyProvider renderKeyProvider) (*RenderResult, error) {
 	if int(atomic.LoadInt32(&rs.inProgressCount)) > opts.ConcurrentLimit {
 		rs.log.Warn("Could not render image, hit the currency limit", "concurrencyLimit", opts.ConcurrentLimit, "path", opts.Path)
 		if opts.ErrorConcurrentLimitReached {
@@ -282,6 +296,16 @@ func (rs *RenderingService) render(ctx context.Context, opts Opts, renderKeyProv
 		return rs.renderUnavailableImage(), nil
 	}
 
+	if renderType == RenderPDF || opts.Encoding == "pdf" {
+		if !rs.features.IsEnabled(ctx, featuremgmt.FlagNewPDFRendering) {
+			return nil, fmt.Errorf("feature 'newPDFRendering' disabled")
+		}
+
+		if err := rs.IsCapabilitySupported(ctx, PDFRendering); err != nil {
+			return nil, err
+		}
+	}
+
 	rs.log.Info("Rendering", "path", opts.Path)
 	if math.IsInf(opts.DeviceScaleFactor, 0) || math.IsNaN(opts.DeviceScaleFactor) || opts.DeviceScaleFactor == 0 {
 		opts.DeviceScaleFactor = 1
@@ -298,7 +322,7 @@ func (rs *RenderingService) render(ctx context.Context, opts Opts, renderKeyProv
 	}()
 
 	metrics.MRenderingQueue.Set(float64(atomic.AddInt32(&rs.inProgressCount, 1)))
-	return rs.renderAction(ctx, renderKey, opts)
+	return rs.renderAction(ctx, renderType, renderKey, opts)
 }
 
 func (rs *RenderingService) RenderCSV(ctx context.Context, opts CSVOpts, session Session) (*RenderCSVResult, error) {
@@ -317,7 +341,7 @@ func (rs *RenderingService) RenderCSV(ctx context.Context, opts CSVOpts, session
 }
 
 func (rs *RenderingService) SanitizeSVG(ctx context.Context, req *SanitizeSVGRequest) (*SanitizeSVGResponse, error) {
-	capability, err := rs.HasCapability(ctx, SvgSanitization)
+	capability, err := rs.HasCapability(ctx, SVGSanitization)
 	if err != nil {
 		return nil, err
 	}
@@ -365,11 +389,18 @@ func (rs *RenderingService) getNewFilePath(rt RenderType) (string, error) {
 		return "", err
 	}
 
-	ext := "png"
-	folder := rs.Cfg.ImagesDir
-	if rt == RenderCSV {
+	var ext string
+	var folder string
+	switch rt {
+	case RenderCSV:
 		ext = "csv"
 		folder = rs.Cfg.CSVsDir
+	case RenderPDF:
+		ext = "pdf"
+		folder = rs.Cfg.PDFsDir
+	default:
+		ext = "png"
+		folder = rs.Cfg.ImagesDir
 	}
 
 	return filepath.Abs(filepath.Join(folder, fmt.Sprintf("%s.%s", rand, ext)))
diff --git a/pkg/services/rendering/rendering_test.go b/pkg/services/rendering/rendering_test.go
index 0cb8edd2a8e73..36e78f36644f0 100644
--- a/pkg/services/rendering/rendering_test.go
+++ b/pkg/services/rendering/rendering_test.go
@@ -14,7 +14,6 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
@@ -104,18 +103,14 @@ func TestRenderErrorImage(t *testing.T) {
 	})
 }
 
-type unavailableRendererManager struct{}
-
-func (m unavailableRendererManager) Renderer(_ context.Context) *plugins.Plugin { return nil }
-
 func TestRenderUnavailableError(t *testing.T) {
 	rs := RenderingService{
 		Cfg:                   &setting.Cfg{},
 		log:                   log.New("test"),
-		RendererPluginManager: unavailableRendererManager{},
+		RendererPluginManager: &dummyPluginManager{},
 	}
 	opts := Opts{ErrorOpts: ErrorOpts{ErrorRenderUnavailable: true}}
-	result, err := rs.Render(context.Background(), opts, nil)
+	result, err := rs.Render(context.Background(), RenderPNG, opts, nil)
 	assert.Equal(t, ErrRenderUnavailable, err)
 	assert.Nil(t, result)
 }
@@ -157,7 +152,7 @@ func TestRenderLimitImage(t *testing.T) {
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
 			opts := Opts{Theme: tc.theme, ConcurrentLimit: 1}
-			result, err := rs.Render(context.Background(), opts, nil)
+			result, err := rs.Render(context.Background(), RenderPNG, opts, nil)
 			assert.NoError(t, err)
 			assert.Equal(t, tc.expected, result.FilePath)
 		})
@@ -175,7 +170,7 @@ func TestRenderLimitImageError(t *testing.T) {
 		ConcurrentLimit: 1,
 		Theme:           models.ThemeDark,
 	}
-	result, err := rs.Render(context.Background(), opts, nil)
+	result, err := rs.Render(context.Background(), RenderPNG, opts, nil)
 	assert.Equal(t, ErrConcurrentLimitReached, err)
 	assert.Nil(t, result)
 }
diff --git a/pkg/services/rendering/svgSanitizer.go b/pkg/services/rendering/svgSanitizer.go
index f4245f60347d6..9a87992e1042b 100644
--- a/pkg/services/rendering/svgSanitizer.go
+++ b/pkg/services/rendering/svgSanitizer.go
@@ -160,7 +160,11 @@ func (rs *RenderingService) sanitizeSVGViaPlugin(ctx context.Context, req *Sanit
 	}
 	rs.log.Debug("Sanitizer - plugin: calling", "filename", req.Filename, "contentLength", len(req.Content))
 
-	rsp, err := rs.pluginInfo.Renderer.Sanitize(ctx, grpcReq)
+	rc, err := rs.plugin.Client()
+	if err != nil {
+		return nil, err
+	}
+	rsp, err := rc.Sanitize(ctx, grpcReq)
 	if err != nil {
 		if errors.Is(ctx.Err(), context.DeadlineExceeded) {
 			rs.log.Info("Sanitizer - plugin: time out")
diff --git a/pkg/services/screenshot/screenshot.go b/pkg/services/screenshot/screenshot.go
index da3fd5b2166d9..5824196110669 100644
--- a/pkg/services/screenshot/screenshot.go
+++ b/pkg/services/screenshot/screenshot.go
@@ -43,18 +43,20 @@ type ScreenshotService interface {
 
 // HeadlessScreenshotService takes screenshots using a headless browser.
 type HeadlessScreenshotService struct {
-	ds dashboards.DashboardService
-	rs rendering.Service
+	cfg *setting.Cfg
+	ds  dashboards.DashboardService
+	rs  rendering.Service
 
 	duration  prometheus.Histogram
 	failures  *prometheus.CounterVec
 	successes prometheus.Counter
 }
 
-func NewHeadlessScreenshotService(ds dashboards.DashboardService, rs rendering.Service, r prometheus.Registerer) ScreenshotService {
+func NewHeadlessScreenshotService(cfg *setting.Cfg, ds dashboards.DashboardService, rs rendering.Service, r prometheus.Registerer) ScreenshotService {
 	return &HeadlessScreenshotService{
-		ds: ds,
-		rs: rs,
+		cfg: cfg,
+		ds:  ds,
+		rs:  rs,
 		duration: promauto.With(r).NewHistogram(prometheus.HistogramOpts{
 			Name:      "duration_seconds",
 			Buckets:   []float64{0.1, 0.25, 0.5, 1, 2, 5, 10, 15},
@@ -120,32 +122,32 @@ func (s *HeadlessScreenshotService) Take(ctx context.Context, opts ScreenshotOpt
 		Width:           opts.Width,
 		Height:          opts.Height,
 		Theme:           opts.Theme,
-		ConcurrentLimit: setting.AlertingRenderLimit,
+		ConcurrentLimit: s.cfg.RendererConcurrentRequestLimit,
 		Path:            u.String(),
 	}
 
-	result, err := s.rs.Render(ctx, renderOpts, nil)
+	result, err := s.rs.Render(ctx, rendering.RenderPNG, renderOpts, nil)
 	if err != nil {
 		s.instrumentError(err)
 		return nil, fmt.Errorf("failed to take screenshot: %w", err)
 	}
 
-	defer s.successes.Inc()
+	s.successes.Inc()
 	screenshot := Screenshot{Path: result.FilePath}
 	return &screenshot, nil
 }
 
 func (s *HeadlessScreenshotService) instrumentError(err error) {
 	if errors.Is(err, dashboards.ErrDashboardNotFound) {
-		defer s.failures.With(prometheus.Labels{
+		s.failures.With(prometheus.Labels{
 			"reason": "dashboard_not_found",
 		}).Inc()
 	} else if errors.Is(err, context.Canceled) {
-		defer s.failures.With(prometheus.Labels{
+		s.failures.With(prometheus.Labels{
 			"reason": "context_canceled",
 		}).Inc()
 	} else {
-		defer s.failures.With(prometheus.Labels{
+		s.failures.With(prometheus.Labels{
 			"reason": "error",
 		}).Inc()
 	}
diff --git a/pkg/services/screenshot/screenshot_test.go b/pkg/services/screenshot/screenshot_test.go
index 24794ea85271b..392c45482e5bc 100644
--- a/pkg/services/screenshot/screenshot_test.go
+++ b/pkg/services/screenshot/screenshot_test.go
@@ -23,7 +23,8 @@ func TestHeadlessScreenshotService(t *testing.T) {
 
 	d := dashboards.FakeDashboardService{}
 	r := rendering.NewMockService(c)
-	s := NewHeadlessScreenshotService(&d, r, prometheus.NewRegistry())
+	cfg := setting.NewCfg()
+	s := NewHeadlessScreenshotService(cfg, &d, r, prometheus.NewRegistry())
 
 	// a non-existent dashboard should return error
 	d.On("GetDashboard", mock.Anything, mock.AnythingOfType("*dashboards.GetDashboardQuery")).Return(nil, dashboards.ErrDashboardNotFound).Once()
@@ -53,7 +54,7 @@ func TestHeadlessScreenshotService(t *testing.T) {
 		Height:          DefaultHeight,
 		Theme:           DefaultTheme,
 		Path:            "d-solo/foo/bar?from=now-6h&orgId=2&panelId=4&to=now-2h",
-		ConcurrentLimit: setting.AlertingRenderLimit,
+		ConcurrentLimit: cfg.RendererConcurrentRequestLimit,
 	}
 
 	opts.From = "now-6h"
@@ -61,7 +62,7 @@ func TestHeadlessScreenshotService(t *testing.T) {
 	opts.DashboardUID = "foo"
 	opts.PanelID = 4
 	r.EXPECT().
-		Render(ctx, renderOpts, nil).
+		Render(ctx, rendering.RenderPNG, renderOpts, nil).
 		Return(&rendering.RenderResult{FilePath: "panel.png"}, nil)
 	screenshot, err = s.Take(ctx, opts)
 	require.NoError(t, err)
@@ -69,7 +70,7 @@ func TestHeadlessScreenshotService(t *testing.T) {
 
 	// a timeout should return error
 	r.EXPECT().
-		Render(ctx, renderOpts, nil).
+		Render(ctx, rendering.RenderPNG, renderOpts, nil).
 		Return(nil, rendering.ErrTimeout)
 	screenshot, err = s.Take(ctx, opts)
 	assert.EqualError(t, err, fmt.Sprintf("failed to take screenshot: %s", rendering.ErrTimeout))
diff --git a/pkg/services/search/model/model.go b/pkg/services/search/model/model.go
index 619af0c653145..1d87154dee079 100644
--- a/pkg/services/search/model/model.go
+++ b/pkg/services/search/model/model.go
@@ -62,21 +62,22 @@ const (
 )
 
 type Hit struct {
-	ID           int64    `json:"id"`
-	UID          string   `json:"uid"`
-	Title        string   `json:"title"`
-	URI          string   `json:"uri"`
-	URL          string   `json:"url"`
-	Slug         string   `json:"slug"`
-	Type         HitType  `json:"type"`
-	Tags         []string `json:"tags"`
-	IsStarred    bool     `json:"isStarred"`
-	FolderID     int64    `json:"folderId,omitempty"`
-	FolderUID    string   `json:"folderUid,omitempty"`
-	FolderTitle  string   `json:"folderTitle,omitempty"`
-	FolderURL    string   `json:"folderUrl,omitempty"`
-	SortMeta     int64    `json:"sortMeta"`
-	SortMetaName string   `json:"sortMetaName,omitempty"`
+	ID        int64    `json:"id"`
+	UID       string   `json:"uid"`
+	Title     string   `json:"title"`
+	URI       string   `json:"uri"`
+	URL       string   `json:"url"`
+	Slug      string   `json:"slug"`
+	Type      HitType  `json:"type"`
+	Tags      []string `json:"tags"`
+	IsStarred bool     `json:"isStarred"`
+	// Deprecated: use FolderUID instead
+	FolderID     int64  `json:"folderId,omitempty"`
+	FolderUID    string `json:"folderUid,omitempty"`
+	FolderTitle  string `json:"folderTitle,omitempty"`
+	FolderURL    string `json:"folderUrl,omitempty"`
+	SortMeta     int64  `json:"sortMeta"`
+	SortMetaName string `json:"sortMetaName,omitempty"`
 }
 
 type HitList []*Hit
diff --git a/pkg/services/search/service.go b/pkg/services/search/service.go
index a30f4008faf88..9b5d9e0bbe659 100644
--- a/pkg/services/search/service.go
+++ b/pkg/services/search/service.go
@@ -5,7 +5,9 @@ import (
 	"sort"
 
 	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/search/model"
 	"github.com/grafana/grafana/pkg/services/star"
 	"github.com/grafana/grafana/pkg/services/user"
@@ -37,10 +39,11 @@ type Query struct {
 	Type          string
 	DashboardUIDs []string
 	DashboardIds  []int64
-	FolderIds     []int64
-	FolderUIDs    []string
-	Permission    dashboards.PermissionType
-	Sort          string
+	// Deprecated: use FolderUID instead
+	FolderIds  []int64
+	FolderUIDs []string
+	Permission dashboardaccess.PermissionType
+	Sort       string
 }
 
 type Service interface {
@@ -77,13 +80,14 @@ func (s *SearchService) SearchHandler(ctx context.Context, query *Query) (model.
 		}
 	}
 
+	metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Search).Inc()
 	dashboardQuery := dashboards.FindPersistedDashboardsQuery{
 		Title:         query.Title,
 		SignedInUser:  query.SignedInUser,
 		DashboardUIDs: query.DashboardUIDs,
 		DashboardIds:  query.DashboardIds,
 		Type:          query.Type,
-		FolderIds:     query.FolderIds,
+		FolderIds:     query.FolderIds, // nolint:staticcheck
 		FolderUIDs:    query.FolderUIDs,
 		Tags:          query.Tags,
 		Limit:         query.Limit,
diff --git a/pkg/services/searchV2/bluge.go b/pkg/services/searchV2/bluge.go
index db0b94b5ee183..dd290a2ed8ad3 100644
--- a/pkg/services/searchV2/bluge.go
+++ b/pkg/services/searchV2/bluge.go
@@ -435,6 +435,12 @@ func doSearchQuery(
 		hasConstraints = true
 	}
 
+	// DatasourceType
+	if q.DatasourceType != "" {
+		fullQuery.AddMust(bluge.NewTermQuery(q.DatasourceType).SetField(documentFieldDSType))
+		hasConstraints = true
+	}
+
 	// Folder
 	if q.Location != "" {
 		fullQuery.AddMust(bluge.NewTermQuery(q.Location).SetField(documentFieldLocation))
diff --git a/pkg/services/searchV2/http.go b/pkg/services/searchV2/http.go
index 8751da74eda8e..0b58e134695a4 100644
--- a/pkg/services/searchV2/http.go
+++ b/pkg/services/searchV2/http.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"io"
+	"net/http"
 
 	"github.com/prometheus/client_golang/prometheus"
 
@@ -39,7 +40,7 @@ func (s *searchHTTPService) doQuery(c *contextmodel.ReqContext) response.Respons
 			"reason": searchReadinessCheckResp.Reason,
 		}).Inc()
 
-		return response.JSON(200, &backend.DataResponse{
+		return response.JSON(http.StatusOK, &backend.DataResponse{
 			Frames: []*data.Frame{{
 				Name: "Loading",
 			}},
@@ -49,30 +50,30 @@ func (s *searchHTTPService) doQuery(c *contextmodel.ReqContext) response.Respons
 
 	body, err := io.ReadAll(c.Req.Body)
 	if err != nil {
-		return response.Error(500, "error reading bytes", err)
+		return response.Error(http.StatusInternalServerError, "error reading bytes", err)
 	}
 
 	query := &DashboardQuery{}
 	err = json.Unmarshal(body, query)
 	if err != nil {
-		return response.Error(400, "error parsing body", err)
+		return response.Error(http.StatusBadRequest, "error parsing body", err)
 	}
 
 	resp := s.search.doDashboardQuery(c.Req.Context(), c.SignedInUser, c.SignedInUser.GetOrgID(), *query)
 
 	if resp.Error != nil {
-		return response.Error(500, "error handling search request", resp.Error)
+		return response.Error(http.StatusInternalServerError, "error handling search request", resp.Error)
 	}
 
 	if len(resp.Frames) == 0 {
 		msg := "invalid search response"
-		return response.Error(500, msg, errors.New(msg))
+		return response.Error(http.StatusInternalServerError, msg, errors.New(msg))
 	}
 
 	bytes, err := resp.MarshalJSON()
 	if err != nil {
-		return response.Error(500, "error marshalling response", err)
+		return response.Error(http.StatusInternalServerError, "error marshalling response", err)
 	}
 
-	return response.JSON(200, bytes)
+	return response.JSON(http.StatusOK, bytes)
 }
diff --git a/pkg/services/searchV2/service.go b/pkg/services/searchV2/service.go
index 65822e432f5c9..0b2c0e63867eb 100644
--- a/pkg/services/searchV2/service.go
+++ b/pkg/services/searchV2/service.go
@@ -116,10 +116,7 @@ func ProvideService(cfg *setting.Cfg, sql db.DB, entityEventStore store.EntityEv
 }
 
 func (s *StandardSearchService) IsDisabled() bool {
-	if s.cfg == nil {
-		return true
-	}
-	return !s.cfg.IsFeatureToggleEnabled(featuremgmt.FlagPanelTitleSearch)
+	return !s.features.IsEnabledGlobally(featuremgmt.FlagPanelTitleSearch)
 }
 
 func (s *StandardSearchService) Run(ctx context.Context) error {
diff --git a/pkg/services/searchV2/service_bench_test.go b/pkg/services/searchV2/service_bench_test.go
index 01e4ca4be4dc2..7c9c8e55b78d3 100644
--- a/pkg/services/searchV2/service_bench_test.go
+++ b/pkg/services/searchV2/service_bench_test.go
@@ -19,8 +19,13 @@ import (
 	"github.com/grafana/grafana/pkg/services/store"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 // setupBenchEnv will set up a database with folderCount folders and dashboardsPerFolder dashboards per folder
 // It will also set up and run the search service
 // and create a signed in user object with explicit permissions on each dashboard and folder.
@@ -134,16 +139,16 @@ func populateDB(folderCount, dashboardsPerFolder int, sqlStore *sqlstore.SQLStor
 
 		for u := start; u < end; u++ {
 			dashID := int64(u + offset)
-			folderID := int64((u+offset)%folderCount + 1)
+			folderUID := fmt.Sprintf("folder%v", int64((u+offset)%folderCount+1))
 			dbs = append(dbs, dashboards.Dashboard{
-				ID:       dashID,
-				UID:      fmt.Sprintf("dashboard%v", dashID),
-				Title:    fmt.Sprintf("dashboard%v", dashID),
-				IsFolder: false,
-				FolderID: folderID,
-				OrgID:    1,
-				Created:  now,
-				Updated:  now,
+				ID:        dashID,
+				UID:       fmt.Sprintf("dashboard%v", dashID),
+				Title:     fmt.Sprintf("dashboard%v", dashID),
+				IsFolder:  false,
+				FolderUID: folderUID,
+				OrgID:     1,
+				Created:   now,
+				Updated:   now,
 			})
 		}
 
diff --git a/pkg/services/searchV2/types.go b/pkg/services/searchV2/types.go
index 2c6b7fcd72686..f66c7702b4796 100644
--- a/pkg/services/searchV2/types.go
+++ b/pkg/services/searchV2/types.go
@@ -18,7 +18,7 @@ type DashboardQuery struct {
 	Query              string       `json:"query"`
 	Location           string       `json:"location,omitempty"` // parent folder ID
 	Sort               string       `json:"sort,omitempty"`     // field ASC/DESC
-	Datasource         string       `json:"ds_uid,omitempty"`   // "datasource" collides with the JSON value at the same leel :()
+	Datasource         string       `json:"ds_uid,omitempty"`   // "datasource" collides with the JSON value at the same level :()
 	DatasourceType     string       `json:"ds_type,omitempty"`
 	Tags               []string     `json:"tags,omitempty"`
 	Kind               []string     `json:"kind,omitempty"`
diff --git a/pkg/services/searchusers/searchusers.go b/pkg/services/searchusers/searchusers.go
index efddf8fe51d99..b912fbecc97b8 100644
--- a/pkg/services/searchusers/searchusers.go
+++ b/pkg/services/searchusers/searchusers.go
@@ -9,6 +9,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/login"
 	"github.com/grafana/grafana/pkg/services/searchusers/sortopts"
 	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
 )
 
 type Service interface {
@@ -17,13 +18,15 @@ type Service interface {
 }
 
 type OSSService struct {
+	cfg              *setting.Cfg
 	searchUserFilter user.SearchUserFilter
 	userService      user.Service
 }
 
-func ProvideUsersService(searchUserFilter user.SearchUserFilter, userService user.Service,
+func ProvideUsersService(cfg *setting.Cfg, searchUserFilter user.SearchUserFilter, userService user.Service,
 ) *OSSService {
 	return &OSSService{
+		cfg:              cfg,
 		searchUserFilter: searchUserFilter,
 		userService:      userService,
 	}
@@ -43,7 +46,7 @@ func ProvideUsersService(searchUserFilter user.SearchUserFilter, userService use
 func (s *OSSService) SearchUsers(c *contextmodel.ReqContext) response.Response {
 	result, err := s.SearchUser(c)
 	if err != nil {
-		return response.ErrOrFallback(500, "Failed to fetch users", err)
+		return response.ErrOrFallback(http.StatusInternalServerError, "Failed to fetch users", err)
 	}
 
 	return response.JSON(http.StatusOK, result.Users)
@@ -62,7 +65,7 @@ func (s *OSSService) SearchUsers(c *contextmodel.ReqContext) response.Response {
 func (s *OSSService) SearchUsersWithPaging(c *contextmodel.ReqContext) response.Response {
 	result, err := s.SearchUser(c)
 	if err != nil {
-		return response.ErrOrFallback(500, "Failed to fetch users", err)
+		return response.ErrOrFallback(http.StatusInternalServerError, "Failed to fetch users", err)
 	}
 
 	return response.JSON(http.StatusOK, result)
@@ -108,7 +111,7 @@ func (s *OSSService) SearchUser(c *contextmodel.ReqContext) (*user.SearchUserQue
 	}
 
 	for _, user := range res.Users {
-		user.AvatarURL = dtos.GetGravatarUrl(user.Email)
+		user.AvatarURL = dtos.GetGravatarUrl(s.cfg, user.Email)
 		user.AuthLabels = make([]string, 0)
 		if user.AuthModule != nil && len(user.AuthModule) > 0 {
 			for _, authModule := range user.AuthModule {
diff --git a/pkg/services/secrets/database/database.go b/pkg/services/secrets/database/database.go
index 5511d4832c7a7..89eb3520d691b 100644
--- a/pkg/services/secrets/database/database.go
+++ b/pkg/services/secrets/database/database.go
@@ -11,29 +11,35 @@ import (
 	"github.com/grafana/grafana/pkg/services/secrets"
 )
 
-const dataKeysTable = "data_keys"
-
 type SecretsStoreImpl struct {
-	db  db.DB
-	log log.Logger
+	db    db.DB
+	log   log.Logger
+	table string
 }
 
 func ProvideSecretsStore(db db.DB) *SecretsStoreImpl {
 	store := &SecretsStoreImpl{
-		db:  db,
-		log: log.New("secrets.store"),
+		db:    db,
+		log:   log.New("secrets.store"),
+		table: "data_keys",
 	}
 
 	return store
 }
 
+func NewSecretsStoreForTable(db db.DB, table string) *SecretsStoreImpl {
+	store := ProvideSecretsStore(db)
+	store.table = table
+	return store
+}
+
 func (ss *SecretsStoreImpl) GetDataKey(ctx context.Context, id string) (*secrets.DataKey, error) {
 	dataKey := &secrets.DataKey{}
 	var exists bool
 
 	err := ss.db.WithDbSession(ctx, func(sess *db.Session) error {
 		var err error
-		exists, err = sess.Table(dataKeysTable).
+		exists, err = sess.Table(ss.table).
 			Where("name = ?", id).
 			Get(dataKey)
 		return err
@@ -56,7 +62,7 @@ func (ss *SecretsStoreImpl) GetCurrentDataKey(ctx context.Context, label string)
 
 	err := ss.db.WithDbSession(ctx, func(sess *db.Session) error {
 		var err error
-		exists, err = sess.Table(dataKeysTable).
+		exists, err = sess.Table(ss.table).
 			Where("label = ? AND active = ?", label, ss.db.GetDialect().BooleanStr(true)).
 			Get(dataKey)
 		return err
@@ -76,7 +82,7 @@ func (ss *SecretsStoreImpl) GetCurrentDataKey(ctx context.Context, label string)
 func (ss *SecretsStoreImpl) GetAllDataKeys(ctx context.Context) ([]*secrets.DataKey, error) {
 	result := make([]*secrets.DataKey, 0)
 	err := ss.db.WithDbSession(ctx, func(sess *db.Session) error {
-		err := sess.Table(dataKeysTable).Find(&result)
+		err := sess.Table(ss.table).Find(&result)
 		return err
 	})
 	return result, err
@@ -91,7 +97,7 @@ func (ss *SecretsStoreImpl) CreateDataKey(ctx context.Context, dataKey *secrets.
 	dataKey.Updated = dataKey.Created
 
 	return ss.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		_, err := sess.Table(dataKeysTable).Insert(dataKey)
+		_, err := sess.Table(ss.table).Insert(dataKey)
 		if err != nil {
 			return err
 		}
@@ -102,7 +108,7 @@ func (ss *SecretsStoreImpl) CreateDataKey(ctx context.Context, dataKey *secrets.
 
 func (ss *SecretsStoreImpl) DisableDataKeys(ctx context.Context) error {
 	return ss.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
-		_, err := sess.Table(dataKeysTable).
+		_, err := sess.Table(ss.table).
 			Where("active = ?", ss.db.GetDialect().BooleanStr(true)).
 			UseBool("active").Update(&secrets.DataKey{Active: false})
 		return err
@@ -115,7 +121,7 @@ func (ss *SecretsStoreImpl) DeleteDataKey(ctx context.Context, id string) error
 	}
 
 	return ss.db.WithDbSession(ctx, func(sess *db.Session) error {
-		_, err := sess.Table(dataKeysTable).Delete(&secrets.DataKey{Id: id})
+		_, err := sess.Table(ss.table).Delete(&secrets.DataKey{Id: id})
 
 		return err
 	})
@@ -128,7 +134,7 @@ func (ss *SecretsStoreImpl) ReEncryptDataKeys(
 ) error {
 	keys := make([]*secrets.DataKey, 0)
 	if err := ss.db.WithDbSession(ctx, func(sess *db.Session) error {
-		return sess.Table(dataKeysTable).Find(&keys)
+		return sess.Table(ss.table).Find(&keys)
 	}); err != nil {
 		return err
 	}
@@ -175,7 +181,7 @@ func (ss *SecretsStoreImpl) ReEncryptDataKeys(
 				return nil
 			}
 
-			if _, err := sess.Table(dataKeysTable).Where("name = ?", k.Id).Update(k); err != nil {
+			if _, err := sess.Table(ss.table).Where("name = ?", k.Id).Update(k); err != nil {
 				ss.log.Warn(
 					"Error while re-encrypting data encryption key",
 					"id", k.Id,
diff --git a/pkg/services/secrets/fakes/mock_service.go b/pkg/services/secrets/fakes/mock_service.go
new file mode 100644
index 0000000000000..30ac162865383
--- /dev/null
+++ b/pkg/services/secrets/fakes/mock_service.go
@@ -0,0 +1,175 @@
+// Code generated by mockery v2.37.1. DO NOT EDIT.
+
+package fakes
+
+import (
+	context "context"
+
+	secrets "github.com/grafana/grafana/pkg/services/secrets"
+	mock "github.com/stretchr/testify/mock"
+)
+
+// MockService is an autogenerated mock type for the Service type
+type MockService struct {
+	mock.Mock
+}
+
+// Decrypt provides a mock function with given fields: ctx, payload
+func (_m *MockService) Decrypt(ctx context.Context, payload []byte) ([]byte, error) {
+	ret := _m.Called(ctx, payload)
+
+	var r0 []byte
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, []byte) ([]byte, error)); ok {
+		return rf(ctx, payload)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, []byte) []byte); ok {
+		r0 = rf(ctx, payload)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]byte)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, []byte) error); ok {
+		r1 = rf(ctx, payload)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// DecryptJsonData provides a mock function with given fields: ctx, sjd
+func (_m *MockService) DecryptJsonData(ctx context.Context, sjd map[string][]byte) (map[string]string, error) {
+	ret := _m.Called(ctx, sjd)
+
+	var r0 map[string]string
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, map[string][]byte) (map[string]string, error)); ok {
+		return rf(ctx, sjd)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, map[string][]byte) map[string]string); ok {
+		r0 = rf(ctx, sjd)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(map[string]string)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, map[string][]byte) error); ok {
+		r1 = rf(ctx, sjd)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Encrypt provides a mock function with given fields: ctx, payload, opt
+func (_m *MockService) Encrypt(ctx context.Context, payload []byte, opt secrets.EncryptionOptions) ([]byte, error) {
+	ret := _m.Called(ctx, payload, opt)
+
+	var r0 []byte
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, []byte, secrets.EncryptionOptions) ([]byte, error)); ok {
+		return rf(ctx, payload, opt)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, []byte, secrets.EncryptionOptions) []byte); ok {
+		r0 = rf(ctx, payload, opt)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]byte)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, []byte, secrets.EncryptionOptions) error); ok {
+		r1 = rf(ctx, payload, opt)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// EncryptJsonData provides a mock function with given fields: ctx, kv, opt
+func (_m *MockService) EncryptJsonData(ctx context.Context, kv map[string]string, opt secrets.EncryptionOptions) (map[string][]byte, error) {
+	ret := _m.Called(ctx, kv, opt)
+
+	var r0 map[string][]byte
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, map[string]string, secrets.EncryptionOptions) (map[string][]byte, error)); ok {
+		return rf(ctx, kv, opt)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, map[string]string, secrets.EncryptionOptions) map[string][]byte); ok {
+		r0 = rf(ctx, kv, opt)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(map[string][]byte)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, map[string]string, secrets.EncryptionOptions) error); ok {
+		r1 = rf(ctx, kv, opt)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetDecryptedValue provides a mock function with given fields: ctx, sjd, key, fallback
+func (_m *MockService) GetDecryptedValue(ctx context.Context, sjd map[string][]byte, key string, fallback string) string {
+	ret := _m.Called(ctx, sjd, key, fallback)
+
+	var r0 string
+	if rf, ok := ret.Get(0).(func(context.Context, map[string][]byte, string, string) string); ok {
+		r0 = rf(ctx, sjd, key, fallback)
+	} else {
+		r0 = ret.Get(0).(string)
+	}
+
+	return r0
+}
+
+// ReEncryptDataKeys provides a mock function with given fields: ctx
+func (_m *MockService) ReEncryptDataKeys(ctx context.Context) error {
+	ret := _m.Called(ctx)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
+		r0 = rf(ctx)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// RotateDataKeys provides a mock function with given fields: ctx
+func (_m *MockService) RotateDataKeys(ctx context.Context) error {
+	ret := _m.Called(ctx)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
+		r0 = rf(ctx)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// NewMockService creates a new instance of MockService. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewMockService(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *MockService {
+	mock := &MockService{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/pkg/services/secrets/kvstore/migrations/datasource_mig.go b/pkg/services/secrets/kvstore/migrations/datasource_mig.go
index 3953fe0b60dd4..de09f26bc9ae3 100644
--- a/pkg/services/secrets/kvstore/migrations/datasource_mig.go
+++ b/pkg/services/secrets/kvstore/migrations/datasource_mig.go
@@ -44,7 +44,7 @@ func (s *DataSourceSecretMigrationService) Migrate(ctx context.Context) error {
 	}
 	logger.Debug(fmt.Sprint("secret migration status is ", migrationStatus))
 	// If this flag is true, delete secrets from the legacy secrets store as they are migrated
-	disableSecretsCompatibility := s.features.IsEnabled(featuremgmt.FlagDisableSecretsCompatibility)
+	disableSecretsCompatibility := s.features.IsEnabled(ctx, featuremgmt.FlagDisableSecretsCompatibility)
 	// If migration hasn't happened, migrate to unified secrets and keep copy in legacy
 	// If a complete migration happened and now backwards compatibility is enabled, copy secrets back to legacy
 	needCompatibility := migrationStatus != compatibleSecretMigrationValue && !disableSecretsCompatibility
diff --git a/pkg/services/secrets/kvstore/migrations/datasource_mig_test.go b/pkg/services/secrets/kvstore/migrations/datasource_mig_test.go
index 275c7391a515a..608c7cde49ff3 100644
--- a/pkg/services/secrets/kvstore/migrations/datasource_mig_test.go
+++ b/pkg/services/secrets/kvstore/migrations/datasource_mig_test.go
@@ -20,8 +20,13 @@ import (
 	secretskvs "github.com/grafana/grafana/pkg/services/secrets/kvstore"
 	secretsmng "github.com/grafana/grafana/pkg/services/secrets/manager"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func SetupTestDataSourceSecretMigrationService(t *testing.T, sqlStore db.DB, kvStore kvstore.KVStore, secretsStore secretskvs.SecretsKVStore, compatibility bool) *DataSourceSecretMigrationService {
 	t.Helper()
 	cfg := &setting.Cfg{}
diff --git a/pkg/services/secrets/kvstore/plugin.go b/pkg/services/secrets/kvstore/plugin.go
index d1b967710072e..a944da822f2fd 100644
--- a/pkg/services/secrets/kvstore/plugin.go
+++ b/pkg/services/secrets/kvstore/plugin.go
@@ -48,7 +48,7 @@ func NewPluginSecretsKVStore(
 		secretsService:                 secretsService,
 		log:                            logger,
 		kvstore:                        kvstore,
-		backwardsCompatibilityDisabled: features.IsEnabled(featuremgmt.FlagDisableSecretsCompatibility),
+		backwardsCompatibilityDisabled: features.IsEnabledGlobally(featuremgmt.FlagDisableSecretsCompatibility),
 		fallbackStore:                  fallback,
 	}
 }
diff --git a/pkg/services/secrets/kvstore/plugin_test.go b/pkg/services/secrets/kvstore/plugin_test.go
index 460adea650dba..8cd70129df6f6 100644
--- a/pkg/services/secrets/kvstore/plugin_test.go
+++ b/pkg/services/secrets/kvstore/plugin_test.go
@@ -8,8 +8,13 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/plugins/backendplugin/secretsmanagerplugin"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 // Set fatal flag to true, then simulate a plugin start failure
 // Should result in an error from the secret store provider
 func TestFatalPluginErr_PluginFailsToStartWithFatalFlagSet(t *testing.T) {
diff --git a/pkg/services/secrets/kvstore/test_helpers.go b/pkg/services/secrets/kvstore/test_helpers.go
index 726760c426b79..768a94d7085b1 100644
--- a/pkg/services/secrets/kvstore/test_helpers.go
+++ b/pkg/services/secrets/kvstore/test_helpers.go
@@ -147,10 +147,18 @@ func NewFakeFeatureToggles(t *testing.T, returnValue bool) featuremgmt.FeatureTo
 	}
 }
 
-func (f fakeFeatureToggles) IsEnabled(feature string) bool {
+func (f fakeFeatureToggles) IsEnabledGlobally(feature string) bool {
 	return f.returnValue
 }
 
+func (f fakeFeatureToggles) IsEnabled(ctx context.Context, feature string) bool {
+	return f.returnValue
+}
+
+func (f fakeFeatureToggles) GetEnabled(ctx context.Context) map[string]bool {
+	return map[string]bool{}
+}
+
 // Fake grpc secrets plugin impl
 type fakeGRPCSecretsPlugin struct {
 	kv map[Key]string
diff --git a/pkg/services/secrets/manager/helpers.go b/pkg/services/secrets/manager/helpers.go
index aacbb636e13fc..9633bde3508d8 100644
--- a/pkg/services/secrets/manager/helpers.go
+++ b/pkg/services/secrets/manager/helpers.go
@@ -23,12 +23,9 @@ func SetupDisabledTestService(tb testing.TB, store secrets.Store) *SecretsServic
 	return setupTestService(tb, store, featuremgmt.WithFeatures(featuremgmt.FlagDisableEnvelopeEncryption))
 }
 
-func setupTestService(tb testing.TB, store secrets.Store, features *featuremgmt.FeatureManager) *SecretsService {
+func setupTestService(tb testing.TB, store secrets.Store, features featuremgmt.FeatureToggles) *SecretsService {
 	tb.Helper()
 	defaultKey := "SdlklWklckeLS"
-	if len(setting.SecretKey) > 0 {
-		defaultKey = setting.SecretKey
-	}
 	raw, err := ini.Load([]byte(`
 		[security]
 		secret_key = ` + defaultKey + `
diff --git a/pkg/services/secrets/manager/manager.go b/pkg/services/secrets/manager/manager.go
index c60c74075914c..eb8179ece191e 100644
--- a/pkg/services/secrets/manager/manager.go
+++ b/pkg/services/secrets/manager/manager.go
@@ -79,7 +79,7 @@ func ProvideSecretsService(
 		log:                 log.New("secrets"),
 	}
 
-	enabled := !features.IsEnabled(featuremgmt.FlagDisableEnvelopeEncryption)
+	enabled := !features.IsEnabledGlobally(featuremgmt.FlagDisableEnvelopeEncryption)
 
 	if enabled {
 		err := s.InitProviders()
@@ -112,12 +112,12 @@ func (s *SecretsService) InitProviders() (err error) {
 }
 
 func (s *SecretsService) registerUsageMetrics() {
-	s.usageStats.RegisterMetricsFunc(func(context.Context) (map[string]any, error) {
+	s.usageStats.RegisterMetricsFunc(func(ctx context.Context) (map[string]any, error) {
 		usageMetrics := make(map[string]any)
 
 		// Enabled / disabled
 		usageMetrics["stats.encryption.envelope_encryption_enabled.count"] = 0
-		if !s.features.IsEnabled(featuremgmt.FlagDisableEnvelopeEncryption) {
+		if !s.features.IsEnabled(ctx, featuremgmt.FlagDisableEnvelopeEncryption) {
 			usageMetrics["stats.encryption.envelope_encryption_enabled.count"] = 1
 		}
 
@@ -159,8 +159,8 @@ var b64 = base64.RawStdEncoding
 
 func (s *SecretsService) Encrypt(ctx context.Context, payload []byte, opt secrets.EncryptionOptions) ([]byte, error) {
 	// Use legacy encryption service if featuremgmt.FlagDisableEnvelopeEncryption toggle is on
-	if s.features.IsEnabled(featuremgmt.FlagDisableEnvelopeEncryption) {
-		return s.enc.Encrypt(ctx, payload, setting.SecretKey)
+	if s.features.IsEnabled(ctx, featuremgmt.FlagDisableEnvelopeEncryption) {
+		return s.enc.Encrypt(ctx, payload, s.cfg.SecretKey)
 	}
 
 	var err error
@@ -333,7 +333,7 @@ func (s *SecretsService) Decrypt(ctx context.Context, payload []byte) ([]byte, e
 	// If encrypted with envelope encryption, the feature is disabled and
 	// no provider is initialized, then we throw an error.
 	if s.encryptedWithEnvelopeEncryption(payload) &&
-		s.features.IsEnabled(featuremgmt.FlagDisableEnvelopeEncryption) &&
+		s.features.IsEnabled(ctx, featuremgmt.FlagDisableEnvelopeEncryption) &&
 		!s.providersInitialized() {
 		err = fmt.Errorf("failed to decrypt a secret encrypted with envelope encryption: envelope encryption is disabled")
 		return nil, err
@@ -469,7 +469,7 @@ func (s *SecretsService) RotateDataKeys(ctx context.Context) error {
 func (s *SecretsService) ReEncryptDataKeys(ctx context.Context) error {
 	s.log.Info("Data keys re-encryption triggered")
 
-	if s.features.IsEnabled(featuremgmt.FlagDisableEnvelopeEncryption) {
+	if s.features.IsEnabled(ctx, featuremgmt.FlagDisableEnvelopeEncryption) {
 		s.log.Info("Envelope encryption is not enabled but trying to init providers anyway...")
 
 		if err := s.InitProviders(); err != nil {
diff --git a/pkg/services/secrets/manager/manager_test.go b/pkg/services/secrets/manager/manager_test.go
index 7b83dc45ef9f2..50396397e07f0 100644
--- a/pkg/services/secrets/manager/manager_test.go
+++ b/pkg/services/secrets/manager/manager_test.go
@@ -20,9 +20,14 @@ import (
 	"github.com/grafana/grafana/pkg/services/secrets/database"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 	"github.com/grafana/grafana/pkg/util"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestSecretsService_EnvelopeEncryption(t *testing.T) {
 	testDB := db.InitTestDB(t)
 	store := database.ProvideSecretsStore(testDB)
diff --git a/pkg/services/secrets/migrator/migrator.go b/pkg/services/secrets/migrator/migrator.go
index 75ff7de755c9e..02872935b9f51 100644
--- a/pkg/services/secrets/migrator/migrator.go
+++ b/pkg/services/secrets/migrator/migrator.go
@@ -45,6 +45,7 @@ func ProvideSecretsMigrator(
 		jsonSecret{tableName: "plugin_setting"},
 		b64Secret{simpleSecret: simpleSecret{tableName: "signing_key", columnName: "private_key"}, encoding: base64.StdEncoding},
 		alertingSecret{},
+		ssoSettingsSecret{},
 	}
 
 	return &SecretsMigrator{
@@ -114,7 +115,7 @@ func (m *SecretsMigrator) RollBackSecrets(ctx context.Context) (bool, error) {
 }
 
 func (m *SecretsMigrator) initProvidersIfNeeded() error {
-	if m.features.IsEnabled(featuremgmt.FlagDisableEnvelopeEncryption) {
+	if m.features.IsEnabledGlobally(featuremgmt.FlagDisableEnvelopeEncryption) {
 		logger.Info("Envelope encryption is not enabled but trying to init providers anyway...")
 
 		if err := m.secretsSrv.InitProviders(); err != nil {
@@ -157,6 +158,8 @@ type jsonSecret struct {
 
 type alertingSecret struct{}
 
+type ssoSettingsSecret struct{}
+
 func nowInUTC() string {
 	return time.Now().UTC().Format("2006-01-02 15:04:05")
 }
diff --git a/pkg/services/secrets/migrator/reencrypt.go b/pkg/services/secrets/migrator/reencrypt.go
index 990774e6b86d2..6c1271277a4d9 100644
--- a/pkg/services/secrets/migrator/reencrypt.go
+++ b/pkg/services/secrets/migrator/reencrypt.go
@@ -11,6 +11,8 @@ import (
 	"github.com/grafana/grafana/pkg/services/secrets"
 	"github.com/grafana/grafana/pkg/services/secrets/manager"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/services/ssosettings/models"
+	"github.com/grafana/grafana/pkg/services/ssosettings/ssosettingsimpl"
 )
 
 func (s simpleSecret) ReEncrypt(ctx context.Context, secretsSrv *manager.SecretsService, sqlStore db.DB) bool {
@@ -289,3 +291,90 @@ func (s alertingSecret) ReEncrypt(ctx context.Context, secretsSrv *manager.Secre
 
 	return !anyFailure
 }
+
+func (s ssoSettingsSecret) ReEncrypt(ctx context.Context, secretsSrv *manager.SecretsService, sqlStore db.DB) bool {
+	results := make([]*models.SSOSettings, 0)
+
+	err := sqlStore.WithDbSession(ctx, func(sess *db.Session) error {
+		return sess.Find(&results)
+	})
+
+	if err != nil {
+		logger.Warn("Failed to fetch SSO settings to re-encrypt", "err", err)
+		return false
+	}
+
+	var anyFailure bool
+
+	for _, result := range results {
+		err := sqlStore.InTransaction(ctx, func(ctx context.Context) error {
+			for field, value := range result.Settings {
+				if ssosettingsimpl.IsSecretField(field) {
+					decrypted, err := s.decryptValue(ctx, value, secretsSrv)
+					if err != nil {
+						logger.Warn("Could not decrypt SSO settings secret", "id", result.ID, "field", field, "error", err)
+						return err
+					}
+
+					if decrypted == nil {
+						continue
+					}
+
+					reencrypted, err := secretsSrv.Encrypt(ctx, decrypted, secrets.WithoutScope())
+					if err != nil {
+						logger.Warn("Could not re-encrypt SSO settings secret", "id", result.ID, "field", field, "error", err)
+						return err
+					}
+
+					result.Settings[field] = base64.RawStdEncoding.EncodeToString(reencrypted)
+				}
+			}
+
+			err = sqlStore.WithDbSession(ctx, func(sess *db.Session) error {
+				_, err := sess.Where("id = ?", result.ID).Update(result)
+				return err
+			})
+			if err != nil {
+				logger.Warn("Could not update SSO settings secrets while re-encrypting it", "id", result.ID, "error", err)
+				return err
+			}
+
+			return nil
+		})
+
+		if err != nil {
+			anyFailure = true
+		}
+	}
+
+	if anyFailure {
+		logger.Warn("SSO settings secrets have been re-encrypted with errors")
+	} else {
+		logger.Info("SSO settings secrets have been re-encrypted successfully")
+	}
+
+	return !anyFailure
+}
+
+func (s ssoSettingsSecret) decryptValue(ctx context.Context, value any, secretsSrv *manager.SecretsService) ([]byte, error) {
+	strValue, ok := value.(string)
+	if !ok {
+		return nil, fmt.Errorf("SSO secret value is not a string")
+	}
+
+	if strValue == "" {
+		return nil, nil
+	}
+
+	decoded, err := base64.RawStdEncoding.DecodeString(strValue)
+	if err != nil {
+		return nil, fmt.Errorf("could not decode base64-encoded SSO settings secret: %w", err)
+	}
+
+	decrypted, err := secretsSrv.Decrypt(ctx, decoded)
+	if err != nil {
+		return nil, fmt.Errorf("could not decrypt SSO settings secret: %w", err)
+	}
+
+	return decrypted, nil
+}
diff --git a/pkg/services/secrets/migrator/rollback.go b/pkg/services/secrets/migrator/rollback.go
index c68c0962771a8..8a8838c0f961c 100644
--- a/pkg/services/secrets/migrator/rollback.go
+++ b/pkg/services/secrets/migrator/rollback.go
@@ -10,6 +10,8 @@ import (
 	"github.com/grafana/grafana/pkg/services/encryption"
 	"github.com/grafana/grafana/pkg/services/ngalert/notifier"
 	"github.com/grafana/grafana/pkg/services/secrets/manager"
+	"github.com/grafana/grafana/pkg/services/ssosettings/models"
+	"github.com/grafana/grafana/pkg/services/ssosettings/ssosettingsimpl"
 )
 
 func (s simpleSecret) Rollback(
@@ -294,3 +296,71 @@ func (s alertingSecret) Rollback(
 
 	return anyFailure
 }
+
+func (s ssoSettingsSecret) Rollback(
+	ctx context.Context,
+	secretsSrv *manager.SecretsService,
+	encryptionSrv encryption.Internal,
+	sqlStore db.DB,
+	secretKey string,
+) (anyFailure bool) {
+	results := make([]*models.SSOSettings, 0)
+
+	err := sqlStore.WithDbSession(ctx, func(sess *db.Session) error {
+		return sess.Find(&results)
+	})
+
+	if err != nil {
+		logger.Warn("Failed to fetch SSO settings to roll back")
+		return true
+	}
+
+	for _, result := range results {
+		err := sqlStore.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
+			for field, value := range result.Settings {
+				if ssosettingsimpl.IsSecretField(field) {
+					decrypted, err := s.decryptValue(ctx, value, secretsSrv)
+					if err != nil {
+						logger.Warn("Could not decrypt SSO settings secret", "id", result.ID, "field", field, "error", err)
+						return err
+					}
+
+					if decrypted == nil {
+						continue
+					}
+
+					reencrypted, err := encryptionSrv.Encrypt(ctx, decrypted, secretKey)
+					if err != nil {
+						logger.Warn("Could not re-encrypt SSO settings secret", "id", result.ID, "field", field, "error", err)
+						return err
+					}
+
+					result.Settings[field] = base64.RawStdEncoding.EncodeToString(reencrypted)
+				}
+			}
+
+			err = sqlStore.WithDbSession(ctx, func(sess *db.Session) error {
+				_, err := sess.Where("id = ?", result.ID).Update(result)
+				return err
+			})
+			if err != nil {
+				logger.Warn("Could not update SSO settings secrets while re-encrypting it", "id", result.ID, "error", err)
+				return err
+			}
+
+			return nil
+		})
+
+		if err != nil {
+			anyFailure = true
+		}
+	}
+
+	if anyFailure {
+		logger.Warn("SSO settings secrets have been rolled back with errors")
+	} else {
+		logger.Info("SSO settings secrets have been rolled back successfully")
+	}
+
+	return anyFailure
+}
diff --git a/pkg/services/secrets/secrets.go b/pkg/services/secrets/secrets.go
index e3fb098732e48..c54535a1d0a15 100644
--- a/pkg/services/secrets/secrets.go
+++ b/pkg/services/secrets/secrets.go
@@ -9,6 +9,8 @@ import (
 
 // Service is an envelope encryption service in charge of encrypting/decrypting secrets.
 // It is a replacement for encryption.Service
+//
+//go:generate mockery --name Service --structname MockService --outpkg fakes --filename mock_service.go --output ./fakes/
 type Service interface {
 	// Encrypt MUST NOT be used within database transactions, it may cause database locks.
 	// For those specific use cases where the encryption operation cannot be moved outside
diff --git a/pkg/services/serviceaccounts/api/api.go b/pkg/services/serviceaccounts/api/api.go
index bf9d8ed3b548d..e76a5c29ca29f 100644
--- a/pkg/services/serviceaccounts/api/api.go
+++ b/pkg/services/serviceaccounts/api/api.go
@@ -12,6 +12,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts"
 	"github.com/grafana/grafana/pkg/setting"
@@ -27,6 +28,7 @@ type ServiceAccountsAPI struct {
 	RouterRegister       routing.RouteRegister
 	log                  log.Logger
 	permissionService    accesscontrol.ServiceAccountPermissionsService
+	isExternalSAEnabled  bool
 }
 
 func NewServiceAccountsAPI(
@@ -36,6 +38,7 @@ func NewServiceAccountsAPI(
 	accesscontrolService accesscontrol.Service,
 	routerRegister routing.RouteRegister,
 	permissionService accesscontrol.ServiceAccountPermissionsService,
+	features *featuremgmt.FeatureManager,
 ) *ServiceAccountsAPI {
 	return &ServiceAccountsAPI{
 		cfg:                  cfg,
@@ -45,6 +48,7 @@ func NewServiceAccountsAPI(
 		RouterRegister:       routerRegister,
 		log:                  log.New("serviceaccounts.api"),
 		permissionService:    permissionService,
+		isExternalSAEnabled:  features.IsEnabledGlobally(featuremgmt.FlagExternalServiceAccounts),
 	}
 }
 
@@ -143,7 +147,7 @@ func (api *ServiceAccountsAPI) RetrieveServiceAccount(ctx *contextmodel.ReqConte
 
 	saIDString := strconv.FormatInt(serviceAccount.Id, 10)
 	metadata := api.getAccessControlMetadata(ctx, map[string]bool{saIDString: true})
-	serviceAccount.AvatarUrl = dtos.GetGravatarUrlWithDefault("", serviceAccount.Name)
+	serviceAccount.AvatarUrl = dtos.GetGravatarUrlWithDefault(api.cfg, "", serviceAccount.Name)
 	serviceAccount.AccessControl = metadata[saIDString]
 
 	tokens, err := api.service.ListTokens(ctx.Req.Context(), &serviceaccounts.GetSATokensQuery{
@@ -194,7 +198,7 @@ func (api *ServiceAccountsAPI) UpdateServiceAccount(c *contextmodel.ReqContext)
 
 	saIDString := strconv.FormatInt(resp.Id, 10)
 	metadata := api.getAccessControlMetadata(c, map[string]bool{saIDString: true})
-	resp.AvatarUrl = dtos.GetGravatarUrlWithDefault("", resp.Name)
+	resp.AvatarUrl = dtos.GetGravatarUrlWithDefault(api.cfg, "", resp.Name)
 	resp.AccessControl = metadata[saIDString]
 
 	return response.JSON(http.StatusOK, util.DynMap{
@@ -265,10 +269,14 @@ func (api *ServiceAccountsAPI) SearchOrgServiceAccountsWithPaging(c *contextmode
 	// its okay that it fails, it is only filtering that might be weird, but to safe quard against any weird incoming query param
 	onlyWithExpiredTokens := c.QueryBool("expiredTokens")
 	onlyDisabled := c.QueryBool("disabled")
+	onlyExternal := c.QueryBool("external")
 	filter := serviceaccounts.FilterIncludeAll
 	if onlyWithExpiredTokens {
 		filter = serviceaccounts.FilterOnlyExpiredTokens
 	}
+	if api.isExternalSAEnabled && onlyExternal {
+		filter = serviceaccounts.FilterOnlyExternal
+	}
 	if onlyDisabled {
 		filter = serviceaccounts.FilterOnlyDisabled
 	}
@@ -288,7 +296,7 @@ func (api *ServiceAccountsAPI) SearchOrgServiceAccountsWithPaging(c *contextmode
 	saIDs := map[string]bool{}
 	for i := range serviceAccountSearch.ServiceAccounts {
 		sa := serviceAccountSearch.ServiceAccounts[i]
-		sa.AvatarUrl = dtos.GetGravatarUrlWithDefault("", sa.Name)
+		sa.AvatarUrl = dtos.GetGravatarUrlWithDefault(api.cfg, "", sa.Name)
 
 		saIDString := strconv.FormatInt(sa.Id, 10)
 		saIDs[saIDString] = true
diff --git a/pkg/services/serviceaccounts/api/token.go b/pkg/services/serviceaccounts/api/token.go
index d486882acd2cf..851b61ed6d73c 100644
--- a/pkg/services/serviceaccounts/api/token.go
+++ b/pkg/services/serviceaccounts/api/token.go
@@ -246,7 +246,7 @@ type DeleteTokenParams struct {
 // swagger:response listTokensResponse
 type ListTokensResponse struct {
 	// in:body
-	Body *TokenDTO
+	Body []TokenDTO
 }
 
 // swagger:response createTokenResponse
diff --git a/pkg/services/serviceaccounts/database/store.go b/pkg/services/serviceaccounts/database/store.go
index 5790b755baa0d..b99925c9978a7 100644
--- a/pkg/services/serviceaccounts/database/store.go
+++ b/pkg/services/serviceaccounts/database/store.go
@@ -42,10 +42,22 @@ func ProvideServiceAccountsStore(cfg *setting.Cfg, store db.DB, apiKeyService ap
 	}
 }
 
+// generateLogin makes a generated string to have a ID for the service account across orgs and it's name
+// this causes you to create a service account with the same name in different orgs
+// not the same name in the same org
+// -- WARNING:
+// -- if you change this function you need to change the ExtSvcLoginPrefix as well
+// -- to make sure they are not considered as regular service accounts
+func generateLogin(prefix string, orgId int64, name string) string {
+	generatedLogin := fmt.Sprintf("%v-%v-%v", prefix, orgId, strings.ToLower(name))
+	// in case the name has multiple spaces or dashes in the prefix or otherwise, replace them with a single dash
+	generatedLogin = strings.Replace(generatedLogin, "--", "-", 1)
+	return strings.Replace(generatedLogin, " ", "-", -1)
+}
+
 // CreateServiceAccount creates service account
 func (s *ServiceAccountsStoreImpl) CreateServiceAccount(ctx context.Context, orgId int64, saForm *serviceaccounts.CreateServiceAccountForm) (*serviceaccounts.ServiceAccountDTO, error) {
-	generatedLogin := serviceaccounts.ServiceAccountPrefix + strings.ToLower(saForm.Name)
-	generatedLogin = strings.ReplaceAll(generatedLogin, " ", "-")
+	login := generateLogin(serviceaccounts.ServiceAccountPrefix, orgId, saForm.Name)
 	isDisabled := false
 	role := org.RoleViewer
 	if saForm.IsDisabled != nil {
@@ -56,7 +68,7 @@ func (s *ServiceAccountsStoreImpl) CreateServiceAccount(ctx context.Context, org
 	}
 
 	newSA, err := s.userService.CreateServiceAccount(ctx, &user.CreateUserCommand{
-		Login:            generatedLogin,
+		Login:            login,
 		OrgID:            orgId,
 		Name:             saForm.Name,
 		IsDisabled:       isDisabled,
@@ -171,6 +183,15 @@ func (s *ServiceAccountsStoreImpl) deleteServiceAccount(sess *db.Session, orgId,
 	return nil
 }
 
+// EnableServiceAccount enable/disable service account
+func (s *ServiceAccountsStoreImpl) EnableServiceAccount(ctx context.Context, orgID, serviceAccountID int64, enable bool) error {
+	return s.sqlStore.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
+		query := "UPDATE " + s.sqlStore.GetDialect().Quote("user") + " SET is_disabled = ? WHERE id = ? AND is_service_account = ?"
+		_, err := sess.Exec(query, !enable, serviceAccountID, true)
+		return err
+	})
+}
+
 // RetrieveServiceAccount returns a service account by its ID
 func (s *ServiceAccountsStoreImpl) RetrieveServiceAccount(ctx context.Context, orgId, serviceAccountId int64) (*serviceaccounts.ServiceAccountProfileDTO, error) {
 	serviceAccount := &serviceaccounts.ServiceAccountProfileDTO{}
@@ -313,7 +334,7 @@ func (s *ServiceAccountsStoreImpl) SearchOrgServiceAccounts(ctx context.Context,
 			whereConditions = append(
 				whereConditions,
 				"login "+s.sqlStore.GetDialect().LikeStr()+" ?")
-			whereParams = append(whereParams, serviceaccounts.ServiceAccountPrefix+serviceaccounts.ExtSvcPrefix+"%")
+			whereParams = append(whereParams, serviceaccounts.ExtSvcLoginPrefix+"%")
 		default:
 			s.log.Warn("Invalid filter user for service account filtering", "service account search filtering", query.Filter)
 		}
@@ -426,7 +447,7 @@ func (s *ServiceAccountsStoreImpl) MigrateApiKey(ctx context.Context, orgId int6
 func (s *ServiceAccountsStoreImpl) CreateServiceAccountFromApikey(ctx context.Context, key *apikey.APIKey) error {
 	prefix := "sa-autogen"
 	cmd := user.CreateUserCommand{
-		Login:            fmt.Sprintf("%v-%v-%v", prefix, key.OrgID, key.Name),
+		Login:            generateLogin(prefix, key.OrgID, key.Name),
 		Name:             fmt.Sprintf("%v-%v", prefix, key.Name),
 		OrgID:            key.OrgID,
 		DefaultOrgRole:   string(key.Role),
@@ -447,7 +468,6 @@ func serviceAccountDeletions(dialect migrator.Dialect) []string {
 		"DELETE FROM star WHERE user_id = ?",
 		"DELETE FROM " + dialect.Quote("user") + " WHERE id = ?",
 		"DELETE FROM org_user WHERE user_id = ?",
-		"DELETE FROM dashboard_acl WHERE user_id = ?",
 		"DELETE FROM preferences WHERE user_id = ?",
 		"DELETE FROM team_member WHERE user_id = ?",
 		"DELETE FROM user_auth WHERE user_id = ?",
diff --git a/pkg/services/serviceaccounts/database/store_test.go b/pkg/services/serviceaccounts/database/store_test.go
index e9e11d5f3ba5d..038971d33d053 100644
--- a/pkg/services/serviceaccounts/database/store_test.go
+++ b/pkg/services/serviceaccounts/database/store_test.go
@@ -20,13 +20,18 @@ import (
 	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/user/userimpl"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 // Service Account should not create an org on its own
 func TestStore_CreateServiceAccountOrgNonExistant(t *testing.T) {
 	_, store := setupTestDatabase(t)
+	serviceAccountName := "new Service Account"
 	t.Run("create service account", func(t *testing.T) {
-		serviceAccountName := "new Service Account"
 		serviceAccountOrgId := int64(1)
 		serviceAccountRole := org.RoleAdmin
 		isDisabled := true
@@ -42,13 +47,78 @@ func TestStore_CreateServiceAccountOrgNonExistant(t *testing.T) {
 }
 
 func TestStore_CreateServiceAccount(t *testing.T) {
-	_, store := setupTestDatabase(t)
-	orgQuery := &org.CreateOrgCommand{Name: orgimpl.MainOrgName}
-	orgResult, err := store.orgService.CreateWithMember(context.Background(), orgQuery)
-	require.NoError(t, err)
-
+	serviceAccountName := "new Service Account"
 	t.Run("create service account", func(t *testing.T) {
-		serviceAccountName := "new Service Account"
+		_, store := setupTestDatabase(t)
+		orgQuery := &org.CreateOrgCommand{Name: orgimpl.MainOrgName}
+		orgResult, err := store.orgService.CreateWithMember(context.Background(), orgQuery)
+		require.NoError(t, err)
+		serviceAccountOrgId := orgResult.ID
+		serviceAccountRole := org.RoleAdmin
+		isDisabled := true
+		saForm := serviceaccounts.CreateServiceAccountForm{
+			Name:       serviceAccountName,
+			Role:       &serviceAccountRole,
+			IsDisabled: &isDisabled,
+		}
+
+		saDTO, err := store.CreateServiceAccount(context.Background(), serviceAccountOrgId, &saForm)
+		require.NoError(t, err)
+		assert.Equal(t, serviceAccountName, saDTO.Name)
+		assert.Equal(t, 0, int(saDTO.Tokens))
+
+		retrieved, err := store.RetrieveServiceAccount(context.Background(), serviceAccountOrgId, saDTO.Id)
+		require.NoError(t, err)
+		assert.Equal(t, serviceAccountName, retrieved.Name)
+		assert.Equal(t, serviceAccountOrgId, retrieved.OrgId)
+		assert.Equal(t, string(serviceAccountRole), retrieved.Role)
+		assert.True(t, retrieved.IsDisabled)
+
+		retrievedId, err := store.RetrieveServiceAccountIdByName(context.Background(), serviceAccountOrgId, serviceAccountName)
+		require.NoError(t, err)
+		assert.Equal(t, saDTO.Id, retrievedId)
+	})
+
+	t.Run("create service account twice same org, error", func(t *testing.T) {
+		_, store := setupTestDatabase(t)
+		orgQuery := &org.CreateOrgCommand{Name: orgimpl.MainOrgName}
+		orgResult, err := store.orgService.CreateWithMember(context.Background(), orgQuery)
+		require.NoError(t, err)
+		serviceAccountOrgId := orgResult.ID
+		serviceAccountRole := org.RoleAdmin
+		isDisabled := true
+		saForm := serviceaccounts.CreateServiceAccountForm{
+			Name:       serviceAccountName,
+			Role:       &serviceAccountRole,
+			IsDisabled: &isDisabled,
+		}
+
+		saDTO, err := store.CreateServiceAccount(context.Background(), serviceAccountOrgId, &saForm)
+		require.NoError(t, err)
+		assert.Equal(t, serviceAccountName, saDTO.Name)
+		assert.Equal(t, 0, int(saDTO.Tokens))
+
+		retrieved, err := store.RetrieveServiceAccount(context.Background(), serviceAccountOrgId, saDTO.Id)
+		require.NoError(t, err)
+		assert.Equal(t, serviceAccountName, retrieved.Name)
+		assert.Equal(t, serviceAccountOrgId, retrieved.OrgId)
+		assert.Equal(t, string(serviceAccountRole), retrieved.Role)
+		assert.True(t, retrieved.IsDisabled)
+
+		retrievedId, err := store.RetrieveServiceAccountIdByName(context.Background(), serviceAccountOrgId, serviceAccountName)
+		require.NoError(t, err)
+		assert.Equal(t, saDTO.Id, retrievedId)
+
+		// should not b able to create the same service account twice in the same org
+		_, err = store.CreateServiceAccount(context.Background(), serviceAccountOrgId, &saForm)
+		require.Error(t, err)
+	})
+
+	t.Run("create service account twice different orgs should work", func(t *testing.T) {
+		_, store := setupTestDatabase(t)
+		orgQuery := &org.CreateOrgCommand{Name: orgimpl.MainOrgName}
+		orgResult, err := store.orgService.CreateWithMember(context.Background(), orgQuery)
+		require.NoError(t, err)
 		serviceAccountOrgId := orgResult.ID
 		serviceAccountRole := org.RoleAdmin
 		isDisabled := true
@@ -60,13 +130,11 @@ func TestStore_CreateServiceAccount(t *testing.T) {
 
 		saDTO, err := store.CreateServiceAccount(context.Background(), serviceAccountOrgId, &saForm)
 		require.NoError(t, err)
-		assert.Equal(t, "sa-new-service-account", saDTO.Login)
 		assert.Equal(t, serviceAccountName, saDTO.Name)
 		assert.Equal(t, 0, int(saDTO.Tokens))
 
 		retrieved, err := store.RetrieveServiceAccount(context.Background(), serviceAccountOrgId, saDTO.Id)
 		require.NoError(t, err)
-		assert.Equal(t, "sa-new-service-account", retrieved.Login)
 		assert.Equal(t, serviceAccountName, retrieved.Name)
 		assert.Equal(t, serviceAccountOrgId, retrieved.OrgId)
 		assert.Equal(t, string(serviceAccountRole), retrieved.Role)
@@ -75,6 +143,16 @@ func TestStore_CreateServiceAccount(t *testing.T) {
 		retrievedId, err := store.RetrieveServiceAccountIdByName(context.Background(), serviceAccountOrgId, serviceAccountName)
 		require.NoError(t, err)
 		assert.Equal(t, saDTO.Id, retrievedId)
+
+		orgQuerySecond := &org.CreateOrgCommand{Name: "Second Org name"}
+		orgResultSecond, err := store.orgService.CreateWithMember(context.Background(), orgQuerySecond)
+		require.NoError(t, err)
+		serviceAccountOrgIdSecond := orgResultSecond.ID
+		// should not b able to create the same service account twice in the same org
+		saDTOSecond, err := store.CreateServiceAccount(context.Background(), serviceAccountOrgIdSecond, &saForm)
+		require.NoError(t, err)
+		assert.Equal(t, serviceAccountName, saDTOSecond.Name)
+		assert.Equal(t, 0, int(saDTOSecond.Tokens))
 	})
 }
 
@@ -95,13 +173,11 @@ func TestStore_CreateServiceAccountRoleNone(t *testing.T) {
 
 	saDTO, err := store.CreateServiceAccount(context.Background(), serviceAccountOrgId, &saForm)
 	require.NoError(t, err)
-	assert.Equal(t, "sa-new-service-account", saDTO.Login)
 	assert.Equal(t, serviceAccountName, saDTO.Name)
 	assert.Equal(t, 0, int(saDTO.Tokens))
 
 	retrieved, err := store.RetrieveServiceAccount(context.Background(), serviceAccountOrgId, saDTO.Id)
 	require.NoError(t, err)
-	assert.Equal(t, "sa-new-service-account", retrieved.Login)
 	assert.Equal(t, serviceAccountName, retrieved.Name)
 	assert.Equal(t, serviceAccountOrgId, retrieved.OrgId)
 	assert.Equal(t, string(serviceAccountRole), retrieved.Role)
@@ -371,14 +447,14 @@ func TestStore_MigrateAllApiKeys(t *testing.T) {
 }
 func TestServiceAccountsStoreImpl_SearchOrgServiceAccounts(t *testing.T) {
 	initUsers := []tests.TestUser{
-		{Name: "satest-1", Role: string(org.RoleViewer), Login: "sa-satest-1", IsServiceAccount: true},
+		{Name: "satest-1", Role: string(org.RoleViewer), Login: "sa-1-satest-1", IsServiceAccount: true},
 		{Name: "usertest-2", Role: string(org.RoleEditor), Login: "usertest-2", IsServiceAccount: false},
-		{Name: "satest-3", Role: string(org.RoleEditor), Login: "sa-satest-3", IsServiceAccount: true},
-		{Name: "satest-4", Role: string(org.RoleAdmin), Login: "sa-satest-4", IsServiceAccount: true},
-		{Name: "extsvc-test-5", Role: string(org.RoleNone), Login: "sa-extsvc-test-5", IsServiceAccount: true},
-		{Name: "extsvc-test-6", Role: string(org.RoleNone), Login: "sa-extsvc-test-6", IsServiceAccount: true},
-		{Name: "extsvc-test-7", Role: string(org.RoleNone), Login: "sa-extsvc-test-7", IsServiceAccount: true},
-		{Name: "extsvc-test-8", Role: string(org.RoleNone), Login: "sa-extsvc-test-8", IsServiceAccount: true},
+		{Name: "satest-3", Role: string(org.RoleEditor), Login: "sa-1-satest-3", IsServiceAccount: true},
+		{Name: "satest-4", Role: string(org.RoleAdmin), Login: "sa-1-satest-4", IsServiceAccount: true},
+		{Name: "extsvc-test-5", Role: string(org.RoleNone), Login: "sa-1-extsvc-test-5", IsServiceAccount: true},
+		{Name: "extsvc-test-6", Role: string(org.RoleNone), Login: "sa-1-extsvc-test-6", IsServiceAccount: true},
+		{Name: "extsvc-test-7", Role: string(org.RoleNone), Login: "sa-1-extsvc-test-7", IsServiceAccount: true},
+		{Name: "extsvc-test-8", Role: string(org.RoleNone), Login: "sa-1-extsvc-test-8", IsServiceAccount: true},
 	}
 
 	db, store := setupTestDatabase(t)
@@ -446,10 +522,10 @@ func TestServiceAccountsStoreImpl_SearchOrgServiceAccounts(t *testing.T) {
 			expectedCount: 4,
 		},
 		{
-			desc: "should return service accounts with sa-satest login",
+			desc: "should return service accounts with sa-1-satest login",
 			query: &serviceaccounts.SearchOrgServiceAccountsQuery{
 				OrgID:        orgID,
-				Query:        "sa-satest",
+				Query:        "sa-1-satest",
 				SignedInUser: userWithPerm,
 				Filter:       serviceaccounts.FilterIncludeAll,
 			},
@@ -495,3 +571,66 @@ func TestServiceAccountsStoreImpl_SearchOrgServiceAccounts(t *testing.T) {
 		})
 	}
 }
+
+func TestServiceAccountsStoreImpl_EnableServiceAccounts(t *testing.T) {
+	ctx := context.Background()
+
+	initUsers := []tests.TestUser{
+		{Name: "satest-1", Role: string(org.RoleViewer), Login: "sa-satest-1", IsServiceAccount: true},
+		{Name: "satest-2", Role: string(org.RoleEditor), Login: "sa-satest-2", IsServiceAccount: true},
+		{Name: "usertest-3", Role: string(org.RoleEditor), Login: "usertest-3", IsServiceAccount: false},
+	}
+
+	db, store := setupTestDatabase(t)
+	orgID := tests.SetupUsersServiceAccounts(t, db, initUsers)
+
+	fetchStates := func() map[int64]bool {
+		sa1, err := store.RetrieveServiceAccount(ctx, orgID, 1)
+		require.NoError(t, err)
+		sa2, err := store.RetrieveServiceAccount(ctx, orgID, 2)
+		require.NoError(t, err)
+		user, err := store.userService.GetByID(ctx, &user.GetUserByIDQuery{ID: 3})
+		require.NoError(t, err)
+		return map[int64]bool{1: !sa1.IsDisabled, 2: !sa2.IsDisabled, 3: !user.IsDisabled}
+	}
+
+	tt := []struct {
+		desc       string
+		id         int64
+		enable     bool
+		wantStates map[int64]bool
+	}{
+		{
+			desc:       "should disable service account",
+			id:         1,
+			enable:     false,
+			wantStates: map[int64]bool{1: false, 2: true, 3: true},
+		},
+		{
+			desc:       "should disable service account again",
+			id:         1,
+			enable:     false,
+			wantStates: map[int64]bool{1: false, 2: true, 3: true},
+		},
+		{
+			desc:       "should enable service account",
+			id:         1,
+			enable:     true,
+			wantStates: map[int64]bool{1: true, 2: true, 3: true},
+		},
+		{
+			desc:       "should not disable user",
+			id:         3,
+			enable:     false,
+			wantStates: map[int64]bool{1: true, 2: true, 3: true},
+		},
+	}
+	for _, tc := range tt {
+		t.Run(tc.desc, func(t *testing.T) {
+			err := store.EnableServiceAccount(ctx, orgID, tc.id, tc.enable)
+			require.NoError(t, err)
+
+			require.Equal(t, tc.wantStates, fetchStates())
+		})
+	}
+}
diff --git a/pkg/services/serviceaccounts/extsvcaccounts/metrics.go b/pkg/services/serviceaccounts/extsvcaccounts/metrics.go
index b0da11e64f112..0e2942a50fda6 100644
--- a/pkg/services/serviceaccounts/extsvcaccounts/metrics.go
+++ b/pkg/services/serviceaccounts/extsvcaccounts/metrics.go
@@ -7,7 +7,6 @@ import (
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/extsvcauth"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts"
-	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -30,15 +29,10 @@ func newMetrics(reg prometheus.Registerer, saSvc serviceaccounts.Service, logger
 			ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 			defer cancel()
 			res, err := saSvc.SearchOrgServiceAccounts(ctx, &serviceaccounts.SearchOrgServiceAccountsQuery{
-				OrgID:     extsvcauth.TmpOrgID,
-				Filter:    serviceaccounts.FilterOnlyExternal,
-				CountOnly: true,
-				SignedInUser: &user.SignedInUser{
-					OrgID: extsvcauth.TmpOrgID,
-					Permissions: map[int64]map[string][]string{
-						extsvcauth.TmpOrgID: {serviceaccounts.ActionRead: {"serviceaccounts:id:*"}},
-					},
-				},
+				OrgID:        extsvcauth.TmpOrgID,
+				Filter:       serviceaccounts.FilterOnlyExternal,
+				CountOnly:    true,
+				SignedInUser: extsvcuser,
 			})
 			if err != nil {
 				logger.Error("Could not compute extsvc_total metric", "error", err)
diff --git a/pkg/services/serviceaccounts/extsvcaccounts/models.go b/pkg/services/serviceaccounts/extsvcaccounts/models.go
index 94154cddc0d5b..f6ab4ee463697 100644
--- a/pkg/services/serviceaccounts/extsvcaccounts/models.go
+++ b/pkg/services/serviceaccounts/extsvcaccounts/models.go
@@ -3,6 +3,9 @@ package extsvcaccounts
 import (
 	"github.com/grafana/grafana/pkg/models/roletype"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/extsvcauth"
+	"github.com/grafana/grafana/pkg/services/serviceaccounts"
+	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/util/errutil"
 )
 
@@ -22,6 +25,13 @@ var (
 	ErrCannotListTokens    = errutil.BadRequest("extsvcaccounts.ErrCannotListTokens", errutil.WithPublicMessage("cannot list external service account tokens"))
 	ErrCredentialsNotFound = errutil.NotFound("extsvcaccounts.credentials-not-found")
 	ErrInvalidName         = errutil.BadRequest("extsvcaccounts.ErrInvalidName", errutil.WithPublicMessage("only external service account names can be prefixed with 'extsvc-'"))
+
+	extsvcuser = &user.SignedInUser{
+		OrgID: extsvcauth.TmpOrgID,
+		Permissions: map[int64]map[string][]string{
+			extsvcauth.TmpOrgID: {serviceaccounts.ActionRead: {"serviceaccounts:id:*"}},
+		},
+	}
 )
 
 // Credentials represents the credentials associated to an external service
@@ -36,6 +46,7 @@ type SaveCredentialsCmd struct {
 }
 
 type saveCmd struct {
+	Enabled     bool
 	ExtSvcSlug  string
 	OrgID       int64
 	Permissions []ac.Permission
diff --git a/pkg/services/serviceaccounts/extsvcaccounts/service.go b/pkg/services/serviceaccounts/extsvcaccounts/service.go
index ae29ccaedab4e..bb3e17126f41e 100644
--- a/pkg/services/serviceaccounts/extsvcaccounts/service.go
+++ b/pkg/services/serviceaccounts/extsvcaccounts/service.go
@@ -3,17 +3,21 @@ package extsvcaccounts
 import (
 	"context"
 	"errors"
+	"strings"
 
 	"github.com/prometheus/client_golang/prometheus"
 
+	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/satokengen"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/slugify"
+	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/models/roletype"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/extsvcauth"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
 	"github.com/grafana/grafana/pkg/services/secrets"
 	"github.com/grafana/grafana/pkg/services/secrets/kvstore"
 	sa "github.com/grafana/grafana/pkg/services/serviceaccounts"
@@ -22,14 +26,15 @@ import (
 
 type ExtSvcAccountsService struct {
 	acSvc    ac.Service
-	features *featuremgmt.FeatureManager
+	features featuremgmt.FeatureToggles
 	logger   log.Logger
 	metrics  *metrics
 	saSvc    sa.Service
 	skvStore kvstore.SecretsKVStore
+	tracer   tracing.Tracer
 }
 
-func ProvideExtSvcAccountsService(acSvc ac.Service, db db.DB, features *featuremgmt.FeatureManager, reg prometheus.Registerer, saSvc *manager.ServiceAccountsService, secretsSvc secrets.Service) *ExtSvcAccountsService {
+func ProvideExtSvcAccountsService(acSvc ac.Service, bus bus.Bus, db db.DB, features *featuremgmt.FeatureManager, reg prometheus.Registerer, saSvc *manager.ServiceAccountsService, secretsSvc secrets.Service, tracer tracing.Tracer) *ExtSvcAccountsService {
 	logger := log.New("serviceauth.extsvcaccounts")
 	esa := &ExtSvcAccountsService{
 		acSvc:    acSvc,
@@ -37,18 +42,55 @@ func ProvideExtSvcAccountsService(acSvc ac.Service, db db.DB, features *featurem
 		saSvc:    saSvc,
 		features: features,
 		skvStore: kvstore.NewSQLSecretsKVStore(db, secretsSvc, logger), // Using SQL store to avoid a cyclic dependency
+		tracer:   tracer,
 	}
 
-	// Register the metrics
-	if features.IsEnabled(featuremgmt.FlagExternalServiceAccounts) || features.IsEnabled(featuremgmt.FlagExternalServiceAuth) {
+	if features.IsEnabledGlobally(featuremgmt.FlagExternalServiceAccounts) {
+		// Register the metrics
 		esa.metrics = newMetrics(reg, saSvc, logger)
+
+		// Register a listener to enable/disable service accounts
+		bus.AddEventListener(esa.handlePluginStateChanged)
 	}
 
 	return esa
 }
 
+// EnableExtSvcAccount enables or disables the service account associated to an external service
+func (esa *ExtSvcAccountsService) EnableExtSvcAccount(ctx context.Context, cmd *sa.EnableExtSvcAccountCmd) error {
+	ctx, span := esa.tracer.Start(ctx, "ExtSvcAccountsService.EnableExtSvcAccount")
+	defer span.End()
+
+	saName := sa.ExtSvcPrefix + slugify.Slugify(cmd.ExtSvcSlug)
+
+	saID, errRetrieve := esa.saSvc.RetrieveServiceAccountIdByName(ctx, cmd.OrgID, saName)
+	if errRetrieve != nil {
+		return errRetrieve
+	}
+
+	return esa.saSvc.EnableServiceAccount(ctx, cmd.OrgID, saID, cmd.Enabled)
+}
+
+// HasExternalService returns whether an external service has been saved with that name.
+func (esa *ExtSvcAccountsService) HasExternalService(ctx context.Context, name string) (bool, error) {
+	ctx, span := esa.tracer.Start(ctx, "ExtSvcAccountsService.HasExternalService")
+	defer span.End()
+
+	saName := sa.ExtSvcPrefix + slugify.Slugify(name)
+
+	saID, errRetrieve := esa.saSvc.RetrieveServiceAccountIdByName(ctx, extsvcauth.TmpOrgID, saName)
+	if errRetrieve != nil && !errors.Is(errRetrieve, sa.ErrServiceAccountNotFound) {
+		return false, errRetrieve
+	}
+
+	return saID > 0, nil
+}
+
 // RetrieveExtSvcAccount fetches an external service account by ID
 func (esa *ExtSvcAccountsService) RetrieveExtSvcAccount(ctx context.Context, orgID, saID int64) (*sa.ExtSvcAccount, error) {
+	ctx, span := esa.tracer.Start(ctx, "ExtSvcAccountsService.RetrieveExtSvcAccount")
+	defer span.End()
+
 	svcAcc, err := esa.saSvc.RetrieveServiceAccount(ctx, orgID, saID)
 	if err != nil {
 		return nil, err
@@ -63,25 +105,53 @@ func (esa *ExtSvcAccountsService) RetrieveExtSvcAccount(ctx context.Context, org
 	}, nil
 }
 
+// GetExternalServiceNames get the names of External Service in store
+func (esa *ExtSvcAccountsService) GetExternalServiceNames(ctx context.Context) ([]string, error) {
+	ctx, span := esa.tracer.Start(ctx, "ExtSvcAccountsService.GetExternalServiceNames")
+	defer span.End()
+
+	ctxLogger := esa.logger.FromContext(ctx)
+
+	ctxLogger.Debug("Get external service names from store")
+	sas, err := esa.saSvc.SearchOrgServiceAccounts(ctx, &sa.SearchOrgServiceAccountsQuery{
+		OrgID:        extsvcauth.TmpOrgID,
+		Filter:       sa.FilterOnlyExternal,
+		SignedInUser: extsvcuser,
+	})
+	if err != nil {
+		ctxLogger.Error("Could not fetch external service accounts from store", "error", err.Error())
+		return nil, err
+	}
+	if sas == nil {
+		return []string{}, nil
+	}
+	res := make([]string, len(sas.ServiceAccounts))
+	for i := range sas.ServiceAccounts {
+		res[i] = strings.TrimPrefix(sas.ServiceAccounts[i].Name, sa.ExtSvcPrefix)
+	}
+	return res, nil
+}
+
 // SaveExternalService creates, updates or delete a service account (and its token) with the requested permissions.
 func (esa *ExtSvcAccountsService) SaveExternalService(ctx context.Context, cmd *extsvcauth.ExternalServiceRegistration) (*extsvcauth.ExternalService, error) {
 	// This is double proofing, we should never reach here anyway the flags have already been checked.
-	if !esa.features.IsEnabled(featuremgmt.FlagExternalServiceAccounts) && !esa.features.IsEnabled(featuremgmt.FlagExternalServiceAuth) {
-		esa.logger.Warn("This feature is behind a feature flag, please set it if you want to save external services")
+	if !esa.features.IsEnabled(ctx, featuremgmt.FlagExternalServiceAccounts) {
+		esa.logger.FromContext(ctx).Warn("This feature is behind a feature flag, please set it if you want to save external services")
 		return nil, nil
 	}
 
+	ctx, span := esa.tracer.Start(ctx, "ExtSvcAccountsService.SaveExternalService")
+	defer span.End()
+
+	ctxLogger := esa.logger.FromContext(ctx)
+
 	if cmd == nil {
-		esa.logger.Warn("Received no input")
+		ctxLogger.Warn("Received no input")
 		return nil, nil
 	}
 
 	slug := slugify.Slugify(cmd.Name)
 
-	if cmd.Impersonation.Enabled {
-		esa.logger.Warn("Impersonation setup skipped. It is not possible to impersonate with a service account token.", "service", slug)
-	}
-
 	saID, err := esa.ManageExtSvcAccount(ctx, &sa.ManageExtSvcAccountCmd{
 		ExtSvcSlug:  slug,
 		Enabled:     cmd.Self.Enabled,
@@ -94,31 +164,76 @@ func (esa *ExtSvcAccountsService) SaveExternalService(ctx context.Context, cmd *
 
 	// No need for a token if we don't have a service account
 	if saID <= 0 {
-		esa.logger.Debug("Skipping service account token creation", "service", slug)
+		ctxLogger.Debug("Skipping service account token creation", "service", slug)
 		return nil, nil
 	}
 
 	token, err := esa.getExtSvcAccountToken(ctx, extsvcauth.TmpOrgID, saID, slug)
 	if err != nil {
-		esa.logger.Error("Could not get the external svc token",
+		ctxLogger.Error("Could not get the external svc token",
 			"service", slug,
 			"saID", saID,
 			"error", err.Error())
 		return nil, err
 	}
-	return &extsvcauth.ExternalService{Name: cmd.Name, ID: slug, Secret: token}, nil
+	return &extsvcauth.ExternalService{Name: slug, ID: slug, Secret: token}, nil
+}
+
+func (esa *ExtSvcAccountsService) RemoveExternalService(ctx context.Context, name string) error {
+	// This is double proofing, we should never reach here anyway the flags have already been checked.
+	if !esa.features.IsEnabled(ctx, featuremgmt.FlagExternalServiceAccounts) {
+		esa.logger.Warn("This feature is behind a feature flag, please set it if you want to save external services")
+		return nil
+	}
+
+	ctx, span := esa.tracer.Start(ctx, "ExtSvcAccountsService.RemoveExternalService")
+	defer span.End()
+
+	return esa.RemoveExtSvcAccount(ctx, extsvcauth.TmpOrgID, slugify.Slugify(name))
+}
+
+func (esa *ExtSvcAccountsService) RemoveExtSvcAccount(ctx context.Context, orgID int64, extSvcSlug string) error {
+	ctx, span := esa.tracer.Start(ctx, "ExtSvcAccountsService.RemoveExtSvcAccount")
+	defer span.End()
+
+	ctxLogger := esa.logger.FromContext(ctx)
+
+	saID, errRetrieve := esa.saSvc.RetrieveServiceAccountIdByName(ctx, orgID, sa.ExtSvcPrefix+extSvcSlug)
+	if errRetrieve != nil && !errors.Is(errRetrieve, sa.ErrServiceAccountNotFound) {
+		return errRetrieve
+	}
+
+	if saID <= 0 {
+		ctxLogger.Debug("No external service account associated with this service", "service", extSvcSlug, "orgID", orgID)
+		return nil
+	}
+
+	if err := esa.deleteExtSvcAccount(ctx, orgID, extSvcSlug, saID); err != nil {
+		ctxLogger.Error("Error occurred while deleting service account",
+			"service", extSvcSlug,
+			"saID", saID,
+			"error", err.Error())
+		return err
+	}
+	esa.logger.Info("Deleted external service account", "service", extSvcSlug, "orgID", orgID)
+	return nil
 }
 
 // ManageExtSvcAccount creates, updates or deletes the service account associated with an external service
 func (esa *ExtSvcAccountsService) ManageExtSvcAccount(ctx context.Context, cmd *sa.ManageExtSvcAccountCmd) (int64, error) {
 	// This is double proofing, we should never reach here anyway the flags have already been checked.
-	if !esa.features.IsEnabled(featuremgmt.FlagExternalServiceAccounts) && !esa.features.IsEnabled(featuremgmt.FlagExternalServiceAuth) {
-		esa.logger.Warn("This feature is behind a feature flag, please set it if you want to save external services")
+	if !esa.features.IsEnabled(ctx, featuremgmt.FlagExternalServiceAccounts) {
+		esa.logger.FromContext(ctx).Warn("This feature is behind a feature flag, please set it if you want to save external services")
 		return 0, nil
 	}
 
+	ctx, span := esa.tracer.Start(ctx, "ExtSvcAccountsService.ManageExtSvcAccount")
+	defer span.End()
+
+	ctxLogger := esa.logger.FromContext(ctx)
+
 	if cmd == nil {
-		esa.logger.Warn("Received no input")
+		ctxLogger.Warn("Received no input")
 		return 0, nil
 	}
 
@@ -127,45 +242,47 @@ func (esa *ExtSvcAccountsService) ManageExtSvcAccount(ctx context.Context, cmd *
 		return 0, errRetrieve
 	}
 
-	if !cmd.Enabled || len(cmd.Permissions) == 0 {
+	if len(cmd.Permissions) == 0 {
 		if saID > 0 {
 			if err := esa.deleteExtSvcAccount(ctx, cmd.OrgID, cmd.ExtSvcSlug, saID); err != nil {
-				esa.logger.Error("Error occurred while deleting service account",
+				ctxLogger.Error("Error occurred while deleting service account",
 					"service", cmd.ExtSvcSlug,
 					"saID", saID,
 					"error", err.Error())
 				return 0, err
 			}
-			esa.metrics.deletedCount.Inc()
 		}
-		esa.logger.Info("Skipping service account creation",
+		ctxLogger.Info("Skipping service account creation, no permission",
 			"service", cmd.ExtSvcSlug,
-			"enabled", cmd.Enabled,
 			"permission count", len(cmd.Permissions),
 			"saID", saID)
 		return 0, nil
 	}
 
 	saID, errSave := esa.saveExtSvcAccount(ctx, &saveCmd{
+		Enabled:     cmd.Enabled,
 		ExtSvcSlug:  cmd.ExtSvcSlug,
 		OrgID:       cmd.OrgID,
 		Permissions: cmd.Permissions,
 		SaID:        saID,
 	})
 	if errSave != nil {
-		esa.logger.Error("Could not save service account", "service", cmd.ExtSvcSlug, "error", errSave.Error())
+		ctxLogger.Error("Could not save service account", "service", cmd.ExtSvcSlug, "error", errSave.Error())
 		return 0, errSave
 	}
-	esa.metrics.savedCount.Inc()
-
 	return saID, nil
 }
 
 // saveExtSvcAccount creates or updates the service account associated with an external service
 func (esa *ExtSvcAccountsService) saveExtSvcAccount(ctx context.Context, cmd *saveCmd) (int64, error) {
+	ctx, span := esa.tracer.Start(ctx, "ExtSvcAccountsService.saveExtSvcAccount")
+	defer span.End()
+
+	ctxLogger := esa.logger.FromContext(ctx)
+
 	if cmd.SaID <= 0 {
 		// Create a service account
-		esa.logger.Debug("Create service account", "service", cmd.ExtSvcSlug, "orgID", cmd.OrgID)
+		ctxLogger.Info("Create service account", "service", cmd.ExtSvcSlug, "orgID", cmd.OrgID)
 		sa, err := esa.saSvc.CreateServiceAccount(ctx, cmd.OrgID, &sa.CreateServiceAccountForm{
 			Name:       sa.ExtSvcPrefix + cmd.ExtSvcSlug,
 			Role:       newRole(roletype.RoleNone),
@@ -177,11 +294,16 @@ func (esa *ExtSvcAccountsService) saveExtSvcAccount(ctx context.Context, cmd *sa
 		cmd.SaID = sa.Id
 	}
 
+	// Enable or disable the service account
+	ctxLogger.Debug("Set service account state", "service", cmd.ExtSvcSlug, "saID", cmd.SaID, "enabled", cmd.Enabled)
+	if err := esa.saSvc.EnableServiceAccount(ctx, cmd.OrgID, cmd.SaID, cmd.Enabled); err != nil {
+		return 0, err
+	}
+
 	// update the service account's permissions
-	esa.logger.Debug("Update role permissions", "service", cmd.ExtSvcSlug, "saID", cmd.SaID)
+	ctxLogger.Debug("Update role permissions", "service", cmd.ExtSvcSlug, "saID", cmd.SaID)
 	if err := esa.acSvc.SaveExternalServiceRole(ctx, ac.SaveExternalServiceRoleCommand{
-		OrgID:             ac.GlobalOrgID,
-		Global:            true,
+		AssignmentOrgID:   cmd.OrgID,
 		ExternalServiceID: cmd.ExtSvcSlug,
 		ServiceAccountID:  cmd.SaID,
 		Permissions:       cmd.Permissions,
@@ -189,23 +311,39 @@ func (esa *ExtSvcAccountsService) saveExtSvcAccount(ctx context.Context, cmd *sa
 		return 0, err
 	}
 
+	esa.metrics.savedCount.Inc()
+
 	return cmd.SaID, nil
 }
 
 // deleteExtSvcAccount deletes a service account by ID and removes its associated role
 func (esa *ExtSvcAccountsService) deleteExtSvcAccount(ctx context.Context, orgID int64, slug string, saID int64) error {
-	esa.logger.Info("Delete service account", "service", slug, "orgID", orgID, "saID", saID)
+	ctx, span := esa.tracer.Start(ctx, "ExtSvcAccountsService.deleteExtSvcAccount")
+	defer span.End()
+
+	ctxLogger := esa.logger.FromContext(ctx)
+
+	ctxLogger.Info("Delete service account", "service", slug, "orgID", orgID, "saID", saID)
 	if err := esa.saSvc.DeleteServiceAccount(ctx, orgID, saID); err != nil {
 		return err
 	}
 	if err := esa.acSvc.DeleteExternalServiceRole(ctx, slug); err != nil {
 		return err
 	}
-	return esa.DeleteExtSvcCredentials(ctx, orgID, slug)
+	if err := esa.DeleteExtSvcCredentials(ctx, orgID, slug); err != nil {
+		return err
+	}
+	esa.metrics.deletedCount.Inc()
+	return nil
 }
 
 // getExtSvcAccountToken get or create the token of an External Service
 func (esa *ExtSvcAccountsService) getExtSvcAccountToken(ctx context.Context, orgID, saID int64, extSvcSlug string) (string, error) {
+	ctx, span := esa.tracer.Start(ctx, "ExtSvcAccountsService.getExtSvcAccountToken")
+	defer span.End()
+
+	ctxLogger := esa.logger.FromContext(ctx)
+
 	// Get credentials from store
 	credentials, err := esa.GetExtSvcCredentials(ctx, orgID, extSvcSlug)
 	if err != nil && !errors.Is(err, ErrCredentialsNotFound) {
@@ -216,13 +354,13 @@ func (esa *ExtSvcAccountsService) getExtSvcAccountToken(ctx context.Context, org
 	}
 
 	// Generate token
-	esa.logger.Info("Generate new service account token", "service", extSvcSlug, "orgID", orgID)
+	ctxLogger.Info("Generate new service account token", "service", extSvcSlug, "orgID", orgID)
 	newKeyInfo, err := satokengen.New(extSvcSlug)
 	if err != nil {
 		return "", err
 	}
 
-	esa.logger.Debug("Add service account token", "service", extSvcSlug, "orgID", orgID)
+	ctxLogger.Debug("Add service account token", "service", extSvcSlug, "orgID", orgID)
 	if _, err := esa.saSvc.AddServiceAccountToken(ctx, saID, &sa.AddServiceAccountTokenCommand{
 		Name:  tokenNamePrefix + "-" + extSvcSlug,
 		OrgId: orgID,
@@ -244,7 +382,8 @@ func (esa *ExtSvcAccountsService) getExtSvcAccountToken(ctx context.Context, org
 
 // GetExtSvcCredentials get the credentials of an External Service from an encrypted storage
 func (esa *ExtSvcAccountsService) GetExtSvcCredentials(ctx context.Context, orgID int64, extSvcSlug string) (*Credentials, error) {
-	esa.logger.Debug("Get service account token from skv", "service", extSvcSlug, "orgID", orgID)
+	ctxLogger := esa.logger.FromContext(ctx)
+	ctxLogger.Debug("Get service account token from skv", "service", extSvcSlug, "orgID", orgID)
 	token, ok, err := esa.skvStore.Get(ctx, orgID, extSvcSlug, kvStoreType)
 	if err != nil {
 		return nil, err
@@ -257,12 +396,32 @@ func (esa *ExtSvcAccountsService) GetExtSvcCredentials(ctx context.Context, orgI
 
 // SaveExtSvcCredentials stores the credentials of an External Service in an encrypted storage
 func (esa *ExtSvcAccountsService) SaveExtSvcCredentials(ctx context.Context, cmd *SaveCredentialsCmd) error {
-	esa.logger.Debug("Save service account token in skv", "service", cmd.ExtSvcSlug, "orgID", cmd.OrgID)
+	ctxLogger := esa.logger.FromContext(ctx)
+	ctxLogger.Debug("Save service account token in skv", "service", cmd.ExtSvcSlug, "orgID", cmd.OrgID)
 	return esa.skvStore.Set(ctx, cmd.OrgID, cmd.ExtSvcSlug, kvStoreType, cmd.Secret)
 }
 
 // DeleteExtSvcCredentials removes the credentials of an External Service from an encrypted storage
 func (esa *ExtSvcAccountsService) DeleteExtSvcCredentials(ctx context.Context, orgID int64, extSvcSlug string) error {
-	esa.logger.Debug("Delete service account token from skv", "service", extSvcSlug, "orgID", orgID)
+	ctxLogger := esa.logger.FromContext(ctx)
+	ctxLogger.Debug("Delete service account token from skv", "service", extSvcSlug, "orgID", orgID)
 	return esa.skvStore.Del(ctx, orgID, extSvcSlug, kvStoreType)
 }
+
+func (esa *ExtSvcAccountsService) handlePluginStateChanged(ctx context.Context, event *pluginsettings.PluginStateChangedEvent) error {
+	ctxLogger := esa.logger.FromContext(ctx)
+	ctxLogger.Debug("Plugin state changed", "pluginId", event.PluginId, "enabled", event.Enabled)
+
+	errEnable := esa.EnableExtSvcAccount(ctx, &sa.EnableExtSvcAccountCmd{
+		ExtSvcSlug: event.PluginId,
+		Enabled:    event.Enabled,
+		OrgID:      event.OrgId,
+	})
+
+	// Ignore service account not found error
+	if errors.Is(errEnable, sa.ErrServiceAccountNotFound) {
+		ctxLogger.Debug("No ext svc account with this plugin", "pluginId", event.PluginId, "orgId", event.OrgId)
+		return nil
+	}
+	return errEnable
+}
diff --git a/pkg/services/serviceaccounts/extsvcaccounts/service_test.go b/pkg/services/serviceaccounts/extsvcaccounts/service_test.go
index 4adfd06f3aec8..e715dc49a20c0 100644
--- a/pkg/services/serviceaccounts/extsvcaccounts/service_test.go
+++ b/pkg/services/serviceaccounts/extsvcaccounts/service_test.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/localcache"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/models/roletype"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
@@ -48,6 +49,7 @@ func setupTestEnv(t *testing.T) *TestEnv {
 		metrics:  newMetrics(nil, env.SaSvc, logger),
 		saSvc:    env.SaSvc,
 		skvStore: env.SkvStore,
+		tracer:   tracing.InitializeTracerForTest(),
 	}
 	return env
 }
@@ -70,17 +72,23 @@ func TestExtSvcAccountsService_ManageExtSvcAccount(t *testing.T) {
 		name    string
 		init    func(env *TestEnv)
 		cmd     sa.ManageExtSvcAccountCmd
-		checks  func(t *testing.T, env *TestEnv)
 		want    int64
 		wantErr bool
 	}{
 		{
-			name: "should remove service account when disabled",
+			name: "should disable service account",
 			init: func(env *TestEnv) {
 				// A previous service account was attached to this slug
-				env.SaSvc.On("RetrieveServiceAccountIdByName", mock.Anything, mock.Anything, mock.Anything).Return(extSvcAccID, nil)
-				env.SaSvc.On("DeleteServiceAccount", mock.Anything, mock.Anything, mock.Anything).Return(nil)
-				env.AcStore.On("DeleteExternalServiceRole", mock.Anything, mock.Anything).Return(nil)
+				env.SaSvc.On("RetrieveServiceAccountIdByName", mock.Anything, extSvcOrgID, sa.ExtSvcPrefix+extSvcSlug).Return(extSvcAccID, nil)
+				env.SaSvc.On("EnableServiceAccount", mock.Anything, extSvcOrgID, extSvcAccID, false).Return(nil)
+				env.AcStore.On("SaveExternalServiceRole",
+					mock.Anything,
+					mock.MatchedBy(func(cmd ac.SaveExternalServiceRoleCommand) bool {
+						return cmd.ServiceAccountID == extSvcAccID && cmd.ExternalServiceID == extSvcSlug &&
+							cmd.AssignmentOrgID == extSvcOrgID && len(cmd.Permissions) == 1 &&
+							cmd.Permissions[0] == extSvcPerms[0]
+					})).
+					Return(nil)
 			},
 			cmd: sa.ManageExtSvcAccountCmd{
 				ExtSvcSlug:  extSvcSlug,
@@ -88,26 +96,16 @@ func TestExtSvcAccountsService_ManageExtSvcAccount(t *testing.T) {
 				OrgID:       extSvcOrgID,
 				Permissions: extSvcPerms,
 			},
-			checks: func(t *testing.T, env *TestEnv) {
-				env.SaSvc.AssertCalled(t, "RetrieveServiceAccountIdByName", mock.Anything,
-					mock.MatchedBy(func(orgID int64) bool { return orgID == extSvcOrgID }),
-					mock.MatchedBy(func(slug string) bool { return slug == sa.ExtSvcPrefix+extSvcSlug }))
-				env.SaSvc.AssertCalled(t, "DeleteServiceAccount", mock.Anything,
-					mock.MatchedBy(func(orgID int64) bool { return orgID == extSvcOrgID }),
-					mock.MatchedBy(func(saID int64) bool { return saID == extSvcAccID }))
-				env.AcStore.AssertCalled(t, "DeleteExternalServiceRole", mock.Anything,
-					mock.MatchedBy(func(slug string) bool { return slug == extSvcSlug }))
-			},
-			want:    0,
+			want:    extSvcAccID,
 			wantErr: false,
 		},
 		{
 			name: "should remove service account when no permission",
 			init: func(env *TestEnv) {
 				// A previous service account was attached to this slug
-				env.SaSvc.On("RetrieveServiceAccountIdByName", mock.Anything, mock.Anything, mock.Anything).Return(extSvcAccID, nil)
-				env.SaSvc.On("DeleteServiceAccount", mock.Anything, mock.Anything, mock.Anything).Return(nil)
-				env.AcStore.On("DeleteExternalServiceRole", mock.Anything, mock.Anything).Return(nil)
+				env.SaSvc.On("RetrieveServiceAccountIdByName", mock.Anything, extSvcOrgID, sa.ExtSvcPrefix+extSvcSlug).Return(extSvcAccID, nil)
+				env.SaSvc.On("DeleteServiceAccount", mock.Anything, extSvcOrgID, extSvcAccID).Return(nil)
+				env.AcStore.On("DeleteExternalServiceRole", mock.Anything, extSvcSlug).Return(nil)
 			},
 			cmd: sa.ManageExtSvcAccountCmd{
 				ExtSvcSlug:  extSvcSlug,
@@ -115,16 +113,6 @@ func TestExtSvcAccountsService_ManageExtSvcAccount(t *testing.T) {
 				OrgID:       extSvcOrgID,
 				Permissions: []ac.Permission{},
 			},
-			checks: func(t *testing.T, env *TestEnv) {
-				env.SaSvc.AssertCalled(t, "RetrieveServiceAccountIdByName", mock.Anything,
-					mock.MatchedBy(func(orgID int64) bool { return orgID == extSvcOrgID }),
-					mock.MatchedBy(func(slug string) bool { return slug == sa.ExtSvcPrefix+extSvcSlug }))
-				env.SaSvc.AssertCalled(t, "DeleteServiceAccount", mock.Anything,
-					mock.MatchedBy(func(orgID int64) bool { return orgID == extSvcOrgID }),
-					mock.MatchedBy(func(saID int64) bool { return saID == extSvcAccID }))
-				env.AcStore.AssertCalled(t, "DeleteExternalServiceRole", mock.Anything,
-					mock.MatchedBy(func(slug string) bool { return slug == extSvcSlug }))
-			},
 			want:    0,
 			wantErr: false,
 		},
@@ -132,11 +120,24 @@ func TestExtSvcAccountsService_ManageExtSvcAccount(t *testing.T) {
 			name: "should create new service account",
 			init: func(env *TestEnv) {
 				// No previous service account was attached to this slug
-				env.SaSvc.On("RetrieveServiceAccountIdByName", mock.Anything, mock.Anything, mock.Anything).
+				env.SaSvc.On("RetrieveServiceAccountIdByName", mock.Anything, extSvcOrgID, sa.ExtSvcPrefix+extSvcSlug).
 					Return(int64(0), sa.ErrServiceAccountNotFound.Errorf("mock"))
-				env.SaSvc.On("CreateServiceAccount", mock.Anything, mock.Anything, mock.Anything).
+				env.SaSvc.On("CreateServiceAccount",
+					mock.Anything,
+					extSvcOrgID,
+					mock.MatchedBy(func(cmd *sa.CreateServiceAccountForm) bool {
+						return cmd.Name == sa.ExtSvcPrefix+extSvcSlug && *cmd.Role == roletype.RoleNone
+					})).
 					Return(extSvcAccount, nil)
-				env.AcStore.On("SaveExternalServiceRole", mock.Anything, mock.Anything).Return(nil)
+				env.SaSvc.On("EnableServiceAccount", mock.Anything, extSvcOrgID, extSvcAccount.Id, true).Return(nil)
+				env.AcStore.On("SaveExternalServiceRole",
+					mock.Anything,
+					mock.MatchedBy(func(cmd ac.SaveExternalServiceRoleCommand) bool {
+						return cmd.ServiceAccountID == extSvcAccount.Id && cmd.ExternalServiceID == extSvcSlug &&
+							cmd.AssignmentOrgID == extSvcOrgID && len(cmd.Permissions) == 1 &&
+							cmd.Permissions[0] == extSvcPerms[0]
+					})).
+					Return(nil)
 			},
 			cmd: sa.ManageExtSvcAccountCmd{
 				ExtSvcSlug:  extSvcSlug,
@@ -144,23 +145,6 @@ func TestExtSvcAccountsService_ManageExtSvcAccount(t *testing.T) {
 				OrgID:       extSvcOrgID,
 				Permissions: extSvcPerms,
 			},
-			checks: func(t *testing.T, env *TestEnv) {
-				env.SaSvc.AssertCalled(t, "RetrieveServiceAccountIdByName", mock.Anything,
-					mock.MatchedBy(func(orgID int64) bool { return orgID == extSvcOrgID }),
-					mock.MatchedBy(func(slug string) bool { return slug == sa.ExtSvcPrefix+extSvcSlug }))
-				env.SaSvc.AssertCalled(t, "CreateServiceAccount", mock.Anything,
-					mock.MatchedBy(func(orgID int64) bool { return orgID == extSvcOrgID }),
-					mock.MatchedBy(func(cmd *sa.CreateServiceAccountForm) bool {
-						return cmd.Name == sa.ExtSvcPrefix+extSvcSlug && *cmd.Role == roletype.RoleNone
-					}),
-				)
-				env.AcStore.AssertCalled(t, "SaveExternalServiceRole", mock.Anything,
-					mock.MatchedBy(func(cmd ac.SaveExternalServiceRoleCommand) bool {
-						return cmd.ServiceAccountID == extSvcAccount.Id && cmd.ExternalServiceID == extSvcSlug &&
-							cmd.OrgID == int64(ac.GlobalOrgID) && len(cmd.Permissions) == 1 &&
-							cmd.Permissions[0] == extSvcPerms[0]
-					}))
-			},
 			want:    extSvcAccID,
 			wantErr: false,
 		},
@@ -168,9 +152,17 @@ func TestExtSvcAccountsService_ManageExtSvcAccount(t *testing.T) {
 			name: "should update service account",
 			init: func(env *TestEnv) {
 				// A previous service account was attached to this slug
-				env.SaSvc.On("RetrieveServiceAccountIdByName", mock.Anything, mock.Anything, mock.Anything).
+				env.SaSvc.On("RetrieveServiceAccountIdByName", mock.Anything, extSvcOrgID, sa.ExtSvcPrefix+extSvcSlug).
 					Return(int64(11), nil)
-				env.AcStore.On("SaveExternalServiceRole", mock.Anything, mock.Anything).Return(nil)
+				env.SaSvc.On("EnableServiceAccount", mock.Anything, extSvcOrgID, int64(11), true).Return(nil)
+				env.AcStore.On("SaveExternalServiceRole",
+					mock.Anything,
+					mock.MatchedBy(func(cmd ac.SaveExternalServiceRoleCommand) bool {
+						return cmd.ServiceAccountID == int64(11) && cmd.ExternalServiceID == extSvcSlug &&
+							cmd.AssignmentOrgID == extSvcOrgID && len(cmd.Permissions) == 1 &&
+							cmd.Permissions[0] == extSvcPerms[0]
+					})).
+					Return(nil)
 			},
 			cmd: sa.ManageExtSvcAccountCmd{
 				ExtSvcSlug:  extSvcSlug,
@@ -178,17 +170,6 @@ func TestExtSvcAccountsService_ManageExtSvcAccount(t *testing.T) {
 				OrgID:       extSvcOrgID,
 				Permissions: extSvcPerms,
 			},
-			checks: func(t *testing.T, env *TestEnv) {
-				env.SaSvc.AssertCalled(t, "RetrieveServiceAccountIdByName", mock.Anything,
-					mock.MatchedBy(func(orgID int64) bool { return orgID == extSvcOrgID }),
-					mock.MatchedBy(func(slug string) bool { return slug == sa.ExtSvcPrefix+extSvcSlug }))
-				env.AcStore.AssertCalled(t, "SaveExternalServiceRole", mock.Anything,
-					mock.MatchedBy(func(cmd ac.SaveExternalServiceRoleCommand) bool {
-						return cmd.ServiceAccountID == int64(11) && cmd.ExternalServiceID == extSvcSlug &&
-							cmd.OrgID == int64(ac.GlobalOrgID) && len(cmd.Permissions) == 1 &&
-							cmd.Permissions[0] == extSvcPerms[0]
-					}))
-			},
 			want:    11,
 			wantErr: false,
 		},
@@ -210,10 +191,6 @@ func TestExtSvcAccountsService_ManageExtSvcAccount(t *testing.T) {
 			}
 			require.NoError(t, err)
 
-			if tt.checks != nil {
-				tt.checks(t, env)
-			}
-
 			require.Equal(t, tt.want, got)
 		})
 	}
@@ -242,12 +219,20 @@ func TestExtSvcAccountsService_SaveExternalService(t *testing.T) {
 		wantErr bool
 	}{
 		{
-			name: "should remove service account when disabled",
+			name: "should disable service account",
 			init: func(env *TestEnv) {
 				// A previous service account was attached to this slug
-				env.SaSvc.On("RetrieveServiceAccountIdByName", mock.Anything, mock.Anything, mock.Anything).Return(extSvcAccID, nil)
-				env.SaSvc.On("DeleteServiceAccount", mock.Anything, mock.Anything, mock.Anything).Return(nil)
-				env.AcStore.On("DeleteExternalServiceRole", mock.Anything, mock.Anything).Return(nil)
+				env.SaSvc.On("RetrieveServiceAccountIdByName", mock.Anything, tmpOrgID, sa.ExtSvcPrefix+extSvcSlug).
+					Return(extSvcAccID, nil)
+				env.SaSvc.On("EnableServiceAccount", mock.Anything, tmpOrgID, extSvcAccID, false).Return(nil)
+				env.AcStore.On("SaveExternalServiceRole",
+					mock.Anything,
+					mock.MatchedBy(func(cmd ac.SaveExternalServiceRoleCommand) bool {
+						return cmd.ServiceAccountID == extSvcAccID && cmd.ExternalServiceID == extSvcSlug &&
+							cmd.AssignmentOrgID == tmpOrgID && len(cmd.Permissions) == 1 &&
+							cmd.Permissions[0] == extSvcPerms[0]
+					})).
+					Return(nil)
 				// A token was previously stored in the secret store
 				_ = env.SkvStore.Set(context.Background(), tmpOrgID, extSvcSlug, kvStoreType, "ExtSvcSecretToken")
 			},
@@ -259,27 +244,26 @@ func TestExtSvcAccountsService_SaveExternalService(t *testing.T) {
 				},
 			},
 			checks: func(t *testing.T, env *TestEnv) {
-				env.SaSvc.AssertCalled(t, "RetrieveServiceAccountIdByName", mock.Anything,
-					mock.MatchedBy(func(orgID int64) bool { return orgID == tmpOrgID }),
-					mock.MatchedBy(func(slug string) bool { return slug == sa.ExtSvcPrefix+extSvcSlug }))
-				env.SaSvc.AssertCalled(t, "DeleteServiceAccount", mock.Anything,
-					mock.MatchedBy(func(orgID int64) bool { return orgID == tmpOrgID }),
-					mock.MatchedBy(func(saID int64) bool { return saID == extSvcAccID }))
-				env.AcStore.AssertCalled(t, "DeleteExternalServiceRole", mock.Anything,
-					mock.MatchedBy(func(slug string) bool { return slug == extSvcSlug }))
 				_, ok, _ := env.SkvStore.Get(context.Background(), tmpOrgID, extSvcSlug, kvStoreType)
-				require.False(t, ok, "secret should have been removed from store")
+				require.True(t, ok, "secret should have been kept in store")
+			},
+			want: &extsvcauth.ExternalService{
+				Name:   extSvcSlug,
+				ID:     extSvcSlug,
+				Secret: "not empty",
 			},
-			want:    nil,
 			wantErr: false,
 		},
 		{
 			name: "should remove service account when no permission",
 			init: func(env *TestEnv) {
 				// A previous service account was attached to this slug
-				env.SaSvc.On("RetrieveServiceAccountIdByName", mock.Anything, mock.Anything, mock.Anything).Return(extSvcAccID, nil)
-				env.SaSvc.On("DeleteServiceAccount", mock.Anything, mock.Anything, mock.Anything).Return(nil)
-				env.AcStore.On("DeleteExternalServiceRole", mock.Anything, mock.Anything).Return(nil)
+				env.SaSvc.On("RetrieveServiceAccountIdByName", mock.Anything, tmpOrgID, sa.ExtSvcPrefix+extSvcSlug).
+					Return(extSvcAccID, nil)
+				env.SaSvc.On("DeleteServiceAccount", mock.Anything, tmpOrgID, extSvcAccID).Return(nil)
+				env.AcStore.On("DeleteExternalServiceRole", mock.Anything, extSvcSlug).Return(nil)
+				// A token was previously stored in the secret store
+				_ = env.SkvStore.Set(context.Background(), tmpOrgID, extSvcSlug, kvStoreType, "ExtSvcSecretToken")
 			},
 			cmd: extsvcauth.ExternalServiceRegistration{
 				Name: extSvcSlug,
@@ -289,14 +273,8 @@ func TestExtSvcAccountsService_SaveExternalService(t *testing.T) {
 				},
 			},
 			checks: func(t *testing.T, env *TestEnv) {
-				env.SaSvc.AssertCalled(t, "RetrieveServiceAccountIdByName", mock.Anything,
-					mock.MatchedBy(func(orgID int64) bool { return orgID == tmpOrgID }),
-					mock.MatchedBy(func(slug string) bool { return slug == sa.ExtSvcPrefix+extSvcSlug }))
-				env.SaSvc.AssertCalled(t, "DeleteServiceAccount", mock.Anything,
-					mock.MatchedBy(func(orgID int64) bool { return orgID == tmpOrgID }),
-					mock.MatchedBy(func(saID int64) bool { return saID == extSvcAccID }))
-				env.AcStore.AssertCalled(t, "DeleteExternalServiceRole", mock.Anything,
-					mock.MatchedBy(func(slug string) bool { return slug == extSvcSlug }))
+				_, ok, _ := env.SkvStore.Get(context.Background(), tmpOrgID, extSvcSlug, kvStoreType)
+				require.False(t, ok, "secret should have been removed from store")
 			},
 			want:    nil,
 			wantErr: false,
@@ -305,13 +283,26 @@ func TestExtSvcAccountsService_SaveExternalService(t *testing.T) {
 			name: "should create new service account",
 			init: func(env *TestEnv) {
 				// No previous service account was attached to this slug
-				env.SaSvc.On("RetrieveServiceAccountIdByName", mock.Anything, mock.Anything, mock.Anything).
+				env.SaSvc.On("RetrieveServiceAccountIdByName", mock.Anything, tmpOrgID, sa.ExtSvcPrefix+extSvcSlug).
 					Return(int64(0), sa.ErrServiceAccountNotFound.Errorf("mock"))
-				env.SaSvc.On("CreateServiceAccount", mock.Anything, mock.Anything, mock.Anything).
+				env.SaSvc.On("CreateServiceAccount",
+					mock.Anything,
+					tmpOrgID,
+					mock.MatchedBy(func(cmd *sa.CreateServiceAccountForm) bool {
+						return cmd.Name == sa.ExtSvcPrefix+extSvcSlug && *cmd.Role == roletype.RoleNone
+					})).
 					Return(extSvcAccount, nil)
+				env.SaSvc.On("EnableServiceAccount", mock.Anything, tmpOrgID, extSvcAccID, true).Return(nil)
 				// Api Key was added without problem
 				env.SaSvc.On("AddServiceAccountToken", mock.Anything, mock.Anything, mock.Anything).Return(&apikey.APIKey{}, nil)
-				env.AcStore.On("SaveExternalServiceRole", mock.Anything, mock.Anything).Return(nil)
+				env.AcStore.On("SaveExternalServiceRole",
+					mock.Anything,
+					mock.MatchedBy(func(cmd ac.SaveExternalServiceRoleCommand) bool {
+						return cmd.ServiceAccountID == extSvcAccount.Id && cmd.ExternalServiceID == extSvcSlug &&
+							cmd.AssignmentOrgID == tmpOrgID && len(cmd.Permissions) == 1 &&
+							cmd.Permissions[0] == extSvcPerms[0]
+					})).
+					Return(nil)
 			},
 			cmd: extsvcauth.ExternalServiceRegistration{
 				Name: extSvcSlug,
@@ -320,23 +311,6 @@ func TestExtSvcAccountsService_SaveExternalService(t *testing.T) {
 					Permissions: extSvcPerms,
 				},
 			},
-			checks: func(t *testing.T, env *TestEnv) {
-				env.SaSvc.AssertCalled(t, "RetrieveServiceAccountIdByName", mock.Anything,
-					mock.MatchedBy(func(orgID int64) bool { return orgID == tmpOrgID }),
-					mock.MatchedBy(func(slug string) bool { return slug == sa.ExtSvcPrefix+extSvcSlug }))
-				env.SaSvc.AssertCalled(t, "CreateServiceAccount", mock.Anything,
-					mock.MatchedBy(func(orgID int64) bool { return orgID == tmpOrgID }),
-					mock.MatchedBy(func(cmd *sa.CreateServiceAccountForm) bool {
-						return cmd.Name == sa.ExtSvcPrefix+extSvcSlug && *cmd.Role == roletype.RoleNone
-					}),
-				)
-				env.AcStore.AssertCalled(t, "SaveExternalServiceRole", mock.Anything,
-					mock.MatchedBy(func(cmd ac.SaveExternalServiceRoleCommand) bool {
-						return cmd.ServiceAccountID == extSvcAccount.Id && cmd.ExternalServiceID == extSvcSlug &&
-							cmd.OrgID == int64(ac.GlobalOrgID) && len(cmd.Permissions) == 1 &&
-							cmd.Permissions[0] == extSvcPerms[0]
-					}))
-			},
 			want: &extsvcauth.ExternalService{
 				Name:   extSvcSlug,
 				ID:     extSvcSlug,
@@ -348,9 +322,17 @@ func TestExtSvcAccountsService_SaveExternalService(t *testing.T) {
 			name: "should update service account",
 			init: func(env *TestEnv) {
 				// A previous service account was attached to this slug
-				env.SaSvc.On("RetrieveServiceAccountIdByName", mock.Anything, mock.Anything, mock.Anything).
+				env.SaSvc.On("RetrieveServiceAccountIdByName", mock.Anything, tmpOrgID, sa.ExtSvcPrefix+extSvcSlug).
 					Return(int64(11), nil)
-				env.AcStore.On("SaveExternalServiceRole", mock.Anything, mock.Anything).Return(nil)
+				env.AcStore.On("SaveExternalServiceRole",
+					mock.Anything,
+					mock.MatchedBy(func(cmd ac.SaveExternalServiceRoleCommand) bool {
+						return cmd.ServiceAccountID == int64(11) && cmd.ExternalServiceID == extSvcSlug &&
+							cmd.AssignmentOrgID == tmpOrgID && len(cmd.Permissions) == 1 &&
+							cmd.Permissions[0] == extSvcPerms[0]
+					})).
+					Return(nil)
+				env.SaSvc.On("EnableServiceAccount", mock.Anything, extsvcauth.TmpOrgID, int64(11), true).Return(nil)
 				// This time we don't add a token but rely on the secret store
 				_ = env.SkvStore.Set(context.Background(), tmpOrgID, extSvcSlug, kvStoreType, "ExtSvcSecretToken")
 			},
@@ -361,17 +343,6 @@ func TestExtSvcAccountsService_SaveExternalService(t *testing.T) {
 					Permissions: extSvcPerms,
 				},
 			},
-			checks: func(t *testing.T, env *TestEnv) {
-				env.SaSvc.AssertCalled(t, "RetrieveServiceAccountIdByName", mock.Anything,
-					mock.MatchedBy(func(orgID int64) bool { return orgID == tmpOrgID }),
-					mock.MatchedBy(func(slug string) bool { return slug == sa.ExtSvcPrefix+extSvcSlug }))
-				env.AcStore.AssertCalled(t, "SaveExternalServiceRole", mock.Anything,
-					mock.MatchedBy(func(cmd ac.SaveExternalServiceRoleCommand) bool {
-						return cmd.ServiceAccountID == int64(11) && cmd.ExternalServiceID == extSvcSlug &&
-							cmd.OrgID == int64(ac.GlobalOrgID) && len(cmd.Permissions) == 1 &&
-							cmd.Permissions[0] == extSvcPerms[0]
-					}))
-			},
 			want: &extsvcauth.ExternalService{
 				Name:   extSvcSlug,
 				ID:     extSvcSlug,
@@ -411,3 +382,129 @@ func TestExtSvcAccountsService_SaveExternalService(t *testing.T) {
 		})
 	}
 }
+
+func TestExtSvcAccountsService_RemoveExtSvcAccount(t *testing.T) {
+	extSvcSlug := "grafana-test-app"
+	tmpOrgID := int64(1)
+	extSvcAccID := int64(10)
+	tests := []struct {
+		name   string
+		init   func(env *TestEnv)
+		slug   string
+		checks func(t *testing.T, env *TestEnv)
+		want   *extsvcauth.ExternalService
+	}{
+		{
+			name: "should not fail if the service account does not exist",
+			init: func(env *TestEnv) {
+				// No previous service account was attached to this slug
+				env.SaSvc.On("RetrieveServiceAccountIdByName", mock.Anything, tmpOrgID, sa.ExtSvcPrefix+extSvcSlug).
+					Return(int64(0), sa.ErrServiceAccountNotFound.Errorf("not found"))
+			},
+			slug: extSvcSlug,
+			want: nil,
+		},
+		{
+			name: "should remove service account",
+			init: func(env *TestEnv) {
+				// A previous service account was attached to this slug
+				env.SaSvc.On("RetrieveServiceAccountIdByName", mock.Anything, tmpOrgID, sa.ExtSvcPrefix+extSvcSlug).
+					Return(extSvcAccID, nil)
+				env.SaSvc.On("DeleteServiceAccount", mock.Anything, tmpOrgID, extSvcAccID).Return(nil)
+				env.AcStore.On("DeleteExternalServiceRole", mock.Anything, extSvcSlug).Return(nil)
+				// A token was previously stored in the secret store
+				_ = env.SkvStore.Set(context.Background(), tmpOrgID, extSvcSlug, kvStoreType, "ExtSvcSecretToken")
+			},
+			slug: extSvcSlug,
+			checks: func(t *testing.T, env *TestEnv) {
+				_, ok, _ := env.SkvStore.Get(context.Background(), tmpOrgID, extSvcSlug, kvStoreType)
+				require.False(t, ok, "secret should have been removed from store")
+			},
+			want: nil,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ctx := context.Background()
+
+			env := setupTestEnv(t)
+			if tt.init != nil {
+				tt.init(env)
+			}
+
+			err := env.S.RemoveExtSvcAccount(ctx, tmpOrgID, tt.slug)
+			require.NoError(t, err)
+
+			if tt.checks != nil {
+				tt.checks(t, env)
+			}
+			env.SaSvc.AssertExpectations(t)
+			env.AcStore.AssertExpectations(t)
+		})
+	}
+}
+
+func TestExtSvcAccountsService_GetExternalServiceNames(t *testing.T) {
+	sa1 := sa.ServiceAccountDTO{
+		Id:    1,
+		Name:  sa.ExtSvcPrefix + "sa-svc-1",
+		Login: sa.ExtSvcLoginPrefix + "sa-svc-1",
+		OrgId: extsvcauth.TmpOrgID,
+	}
+	sa2 := sa.ServiceAccountDTO{
+		Id:    2,
+		Name:  sa.ExtSvcPrefix + "sa-svc-2",
+		Login: sa.ExtSvcLoginPrefix + "sa-svc-2",
+		OrgId: extsvcauth.TmpOrgID,
+	}
+	tests := []struct {
+		name string
+		init func(env *TestEnv)
+		want []string
+	}{
+		{
+			name: "should return names",
+			init: func(env *TestEnv) {
+				env.SaSvc.On("SearchOrgServiceAccounts", mock.Anything, mock.MatchedBy(func(cmd *sa.SearchOrgServiceAccountsQuery) bool {
+					return cmd.OrgID == extsvcauth.TmpOrgID &&
+						cmd.Filter == sa.FilterOnlyExternal &&
+						len(cmd.SignedInUser.GetPermissions()[sa.ActionRead]) > 0
+				})).Return(&sa.SearchOrgServiceAccountsResult{
+					TotalCount:      2,
+					ServiceAccounts: []*sa.ServiceAccountDTO{&sa1, &sa2},
+					Page:            1,
+					PerPage:         2,
+				}, nil)
+			},
+			want: []string{"sa-svc-1", "sa-svc-2"},
+		},
+		{
+			name: "should handle nil search",
+			init: func(env *TestEnv) {
+				env.SaSvc.On("SearchOrgServiceAccounts", mock.Anything, mock.MatchedBy(func(cmd *sa.SearchOrgServiceAccountsQuery) bool {
+					return cmd.OrgID == extsvcauth.TmpOrgID &&
+						cmd.Filter == sa.FilterOnlyExternal &&
+						len(cmd.SignedInUser.GetPermissions()[sa.ActionRead]) > 0
+				})).Return(nil, nil)
+			},
+			want: []string{},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ctx := context.Background()
+
+			env := setupTestEnv(t)
+			if tt.init != nil {
+				tt.init(env)
+			}
+
+			got, err := env.S.GetExternalServiceNames(ctx)
+			require.NoError(t, err)
+
+			require.ElementsMatch(t, tt.want, got)
+			env.SaSvc.AssertExpectations(t)
+			env.AcStore.AssertExpectations(t)
+		})
+	}
+}
diff --git a/pkg/services/serviceaccounts/manager/service.go b/pkg/services/serviceaccounts/manager/service.go
index 0d037f230e2ec..0f9f7a8fc68ca 100644
--- a/pkg/services/serviceaccounts/manager/service.go
+++ b/pkg/services/serviceaccounts/manager/service.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/grafana/grafana/pkg/api/routing"
 	"github.com/grafana/grafana/pkg/infra/kvstore"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/usagestats"
@@ -14,7 +13,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/apikey"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts"
-	"github.com/grafana/grafana/pkg/services/serviceaccounts/api"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts/database"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts/secretscan"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
@@ -28,6 +26,7 @@ const (
 )
 
 type ServiceAccountsService struct {
+	acService         accesscontrol.Service
 	store             store
 	log               log.Logger
 	backgroundLog     log.Logger
@@ -39,15 +38,12 @@ type ServiceAccountsService struct {
 
 func ProvideServiceAccountsService(
 	cfg *setting.Cfg,
-	ac accesscontrol.AccessControl,
-	routeRegister routing.RouteRegister,
 	usageStats usagestats.Service,
 	store *sqlstore.SQLStore,
 	apiKeyService apikey.Service,
 	kvStore kvstore.KVStore,
 	userService user.Service,
 	orgService org.Service,
-	permissionService accesscontrol.ServiceAccountPermissionsService,
 	accesscontrolService accesscontrol.Service,
 ) (*ServiceAccountsService, error) {
 	serviceAccountsStore := database.ProvideServiceAccountsStore(
@@ -59,6 +55,7 @@ func ProvideServiceAccountsService(
 		orgService,
 	)
 	s := &ServiceAccountsService{
+		acService:     accesscontrolService,
 		store:         serviceAccountsStore,
 		log:           log.New("serviceaccounts"),
 		backgroundLog: log.New("serviceaccounts.background"),
@@ -70,9 +67,6 @@ func ProvideServiceAccountsService(
 
 	usageStats.RegisterMetricsFunc(s.getUsageMetrics)
 
-	serviceaccountsAPI := api.NewServiceAccountsAPI(cfg, s, ac, accesscontrolService, routeRegister, permissionService)
-	serviceaccountsAPI.RegisterAPIEndpoints()
-
 	s.secretScanEnabled = cfg.SectionWithEnvOverrides("secretscan").Key("enabled").MustBool(false)
 	s.secretScanInterval = cfg.SectionWithEnvOverrides("secretscan").
 		Key("interval").MustDuration(defaultSecretScanInterval)
@@ -146,6 +140,8 @@ func (sa *ServiceAccountsService) Run(ctx context.Context) error {
 	}
 }
 
+var _ serviceaccounts.Service = (*ServiceAccountsService)(nil)
+
 func (sa *ServiceAccountsService) CreateServiceAccount(ctx context.Context, orgID int64, saForm *serviceaccounts.CreateServiceAccountForm) (*serviceaccounts.ServiceAccountDTO, error) {
 	if err := validOrgID(orgID); err != nil {
 		return nil, err
@@ -180,7 +176,20 @@ func (sa *ServiceAccountsService) DeleteServiceAccount(ctx context.Context, orgI
 	if err := validServiceAccountID(serviceAccountID); err != nil {
 		return err
 	}
-	return sa.store.DeleteServiceAccount(ctx, orgID, serviceAccountID)
+	if err := sa.store.DeleteServiceAccount(ctx, orgID, serviceAccountID); err != nil {
+		return err
+	}
+	return sa.acService.DeleteUserPermissions(ctx, orgID, serviceAccountID)
+}
+
+func (sa *ServiceAccountsService) EnableServiceAccount(ctx context.Context, orgID, serviceAccountID int64, enable bool) error {
+	if err := validOrgID(orgID); err != nil {
+		return err
+	}
+	if err := validServiceAccountID(serviceAccountID); err != nil {
+		return err
+	}
+	return sa.store.EnableServiceAccount(ctx, orgID, serviceAccountID, enable)
 }
 
 func (sa *ServiceAccountsService) UpdateServiceAccount(ctx context.Context, orgID int64, serviceAccountID int64, saForm *serviceaccounts.UpdateServiceAccountForm) (*serviceaccounts.ServiceAccountProfileDTO, error) {
diff --git a/pkg/services/serviceaccounts/manager/service_test.go b/pkg/services/serviceaccounts/manager/service_test.go
index 31dce8ef1c4f7..c7175f480c87b 100644
--- a/pkg/services/serviceaccounts/manager/service_test.go
+++ b/pkg/services/serviceaccounts/manager/service_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"testing"
 
+	"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/infra/log"
@@ -25,6 +26,8 @@ type FakeServiceAccountStore struct {
 	ExpectedError                           error
 }
 
+var _ store = (*FakeServiceAccountStore)(nil)
+
 func newServiceAccountStoreFake() *FakeServiceAccountStore {
 	return &FakeServiceAccountStore{}
 }
@@ -44,6 +47,11 @@ func (f *FakeServiceAccountStore) CreateServiceAccount(ctx context.Context, orgI
 	return f.ExpectedServiceAccountDTO, f.ExpectedError
 }
 
+// EnableServiceAccount implements store.
+func (f *FakeServiceAccountStore) EnableServiceAccount(ctx context.Context, orgID int64, serviceAccountID int64, enable bool) error {
+	return f.ExpectedError
+}
+
 // SearchOrgServiceAccounts is a fake searching for service accounts.
 func (f *FakeServiceAccountStore) SearchOrgServiceAccounts(ctx context.Context, query *serviceaccounts.SearchOrgServiceAccountsQuery) (*serviceaccounts.SearchOrgServiceAccountsResult, error) {
 	return f.ExpectedSearchServiceAccountQueryResult, f.ExpectedError
@@ -110,7 +118,8 @@ func (f *SecretsCheckerFake) CheckTokens(ctx context.Context) error {
 
 func TestProvideServiceAccount_DeleteServiceAccount(t *testing.T) {
 	storeMock := newServiceAccountStoreFake()
-	svc := ServiceAccountsService{storeMock, log.New("test"), log.New("background.test"), &SecretsCheckerFake{}, false, 0}
+	acSvc := actest.FakeService{}
+	svc := ServiceAccountsService{acSvc, storeMock, log.New("test"), log.New("background.test"), &SecretsCheckerFake{}, false, 0}
 	testOrgId := 1
 
 	t.Run("should create service account", func(t *testing.T) {
diff --git a/pkg/services/serviceaccounts/manager/stats_test.go b/pkg/services/serviceaccounts/manager/stats_test.go
index 3f9099a6f4624..e85e9adb12912 100644
--- a/pkg/services/serviceaccounts/manager/stats_test.go
+++ b/pkg/services/serviceaccounts/manager/stats_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"testing"
 
+	"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -12,8 +13,9 @@ import (
 )
 
 func Test_UsageStats(t *testing.T) {
+	acSvc := actest.FakeService{}
 	storeMock := newServiceAccountStoreFake()
-	svc := ServiceAccountsService{storeMock, log.New("test"), log.New("background-test"), &SecretsCheckerFake{}, true, 5}
+	svc := ServiceAccountsService{acSvc, storeMock, log.New("test"), log.New("background-test"), &SecretsCheckerFake{}, true, 5}
 	err := svc.DeleteServiceAccount(context.Background(), 1, 1)
 	require.NoError(t, err)
 
diff --git a/pkg/services/serviceaccounts/manager/store.go b/pkg/services/serviceaccounts/manager/store.go
index 187ed7e0d86f3..b64e67d75220e 100644
--- a/pkg/services/serviceaccounts/manager/store.go
+++ b/pkg/services/serviceaccounts/manager/store.go
@@ -8,18 +8,19 @@ import (
 )
 
 type store interface {
+	AddServiceAccountToken(ctx context.Context, serviceAccountID int64, cmd *serviceaccounts.AddServiceAccountTokenCommand) (*apikey.APIKey, error)
 	CreateServiceAccount(ctx context.Context, orgID int64, saForm *serviceaccounts.CreateServiceAccountForm) (*serviceaccounts.ServiceAccountDTO, error)
-	SearchOrgServiceAccounts(ctx context.Context, query *serviceaccounts.SearchOrgServiceAccountsQuery) (*serviceaccounts.SearchOrgServiceAccountsResult, error)
-	UpdateServiceAccount(ctx context.Context, orgID, serviceAccountID int64,
-		saForm *serviceaccounts.UpdateServiceAccountForm) (*serviceaccounts.ServiceAccountProfileDTO, error)
-	RetrieveServiceAccount(ctx context.Context, orgID, serviceAccountID int64) (*serviceaccounts.ServiceAccountProfileDTO, error)
-	RetrieveServiceAccountIdByName(ctx context.Context, orgID int64, name string) (int64, error)
 	DeleteServiceAccount(ctx context.Context, orgID, serviceAccountID int64) error
-	MigrateApiKeysToServiceAccounts(ctx context.Context, orgID int64) (*serviceaccounts.MigrationResult, error)
-	MigrateApiKey(ctx context.Context, orgID int64, keyId int64) error
-	ListTokens(ctx context.Context, query *serviceaccounts.GetSATokensQuery) ([]apikey.APIKey, error)
-	RevokeServiceAccountToken(ctx context.Context, orgId, serviceAccountId, tokenId int64) error
-	AddServiceAccountToken(ctx context.Context, serviceAccountID int64, cmd *serviceaccounts.AddServiceAccountTokenCommand) (*apikey.APIKey, error)
 	DeleteServiceAccountToken(ctx context.Context, orgID, serviceAccountID, tokenID int64) error
+	EnableServiceAccount(ctx context.Context, orgID, serviceAccountID int64, enable bool) error
 	GetUsageMetrics(ctx context.Context) (*serviceaccounts.Stats, error)
+	ListTokens(ctx context.Context, query *serviceaccounts.GetSATokensQuery) ([]apikey.APIKey, error)
+	MigrateApiKey(ctx context.Context, orgID int64, keyId int64) error
+	MigrateApiKeysToServiceAccounts(ctx context.Context, orgID int64) (*serviceaccounts.MigrationResult, error)
+	RetrieveServiceAccount(ctx context.Context, orgID, serviceAccountID int64) (*serviceaccounts.ServiceAccountProfileDTO, error)
+	RetrieveServiceAccountIdByName(ctx context.Context, orgID int64, name string) (int64, error)
+	RevokeServiceAccountToken(ctx context.Context, orgId, serviceAccountId, tokenId int64) error
+	SearchOrgServiceAccounts(ctx context.Context, query *serviceaccounts.SearchOrgServiceAccountsQuery) (*serviceaccounts.SearchOrgServiceAccountsResult, error)
+	UpdateServiceAccount(ctx context.Context, orgID, serviceAccountID int64,
+		saForm *serviceaccounts.UpdateServiceAccountForm) (*serviceaccounts.ServiceAccountProfileDTO, error)
 }
diff --git a/pkg/services/serviceaccounts/models.go b/pkg/services/serviceaccounts/models.go
index 595818bc0e077..d83d298ea8818 100644
--- a/pkg/services/serviceaccounts/models.go
+++ b/pkg/services/serviceaccounts/models.go
@@ -6,6 +6,7 @@ import (
 	"github.com/grafana/grafana/pkg/models/roletype"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/extsvcauth"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/util/errutil"
 )
@@ -18,6 +19,7 @@ var (
 const (
 	ServiceAccountPrefix = "sa-"
 	ExtSvcPrefix         = "extsvc-"
+	ExtSvcLoginPrefix    = ServiceAccountPrefix + extsvcauth.TmpOrgIDStr + "-" + ExtSvcPrefix
 )
 
 const (
@@ -158,6 +160,8 @@ type ServiceAccountProfileDTO struct {
 	Teams []string `json:"teams" xorm:"-"`
 	// example: false
 	IsExternal bool `json:"isExternal,omitempty" xorm:"-"`
+	// example: grafana-app
+	RequiredBy string `json:"requiredBy,omitempty" xorm:"-"`
 
 	Tokens        int64           `json:"tokens,omitempty"`
 	AccessControl map[string]bool `json:"accessControl,omitempty" xorm:"-"`
@@ -191,11 +195,17 @@ type ExtSvcAccount struct {
 
 type ManageExtSvcAccountCmd struct {
 	ExtSvcSlug  string
-	Enabled     bool // disabled: the service account and its permissions will be deleted
+	Enabled     bool
 	OrgID       int64
 	Permissions []accesscontrol.Permission
 }
 
+type EnableExtSvcAccountCmd struct {
+	ExtSvcSlug string
+	Enabled    bool
+	OrgID      int64
+}
+
 // AccessEvaluator is used to protect the "Configuration > Service accounts" page access
 var AccessEvaluator = accesscontrol.EvalAny(
 	accesscontrol.EvalPermission(ActionRead),
diff --git a/pkg/services/serviceaccounts/proxy/service.go b/pkg/services/serviceaccounts/proxy/service.go
index 312fa8c2990d6..10f2a601dcd7b 100644
--- a/pkg/services/serviceaccounts/proxy/service.go
+++ b/pkg/services/serviceaccounts/proxy/service.go
@@ -4,12 +4,16 @@ import (
 	"context"
 	"strings"
 
+	"github.com/grafana/grafana/pkg/api/routing"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/apikey"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts"
+	"github.com/grafana/grafana/pkg/services/serviceaccounts/api"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts/extsvcaccounts"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts/manager"
+	"github.com/grafana/grafana/pkg/setting"
 )
 
 // ServiceAccountsProxy is a proxy for the serviceaccounts.Service interface
@@ -23,14 +27,23 @@ type ServiceAccountsProxy struct {
 }
 
 func ProvideServiceAccountsProxy(
+	cfg *setting.Cfg,
+	ac accesscontrol.AccessControl,
+	accesscontrolService accesscontrol.Service,
 	features *featuremgmt.FeatureManager,
+	permissionService accesscontrol.ServiceAccountPermissionsService,
 	proxiedService *manager.ServiceAccountsService,
+	routeRegister routing.RouteRegister,
 ) (*ServiceAccountsProxy, error) {
 	s := &ServiceAccountsProxy{
 		log:            log.New("serviceaccounts.proxy"),
 		proxiedService: proxiedService,
-		isProxyEnabled: features.IsEnabled(featuremgmt.FlagExternalServiceAccounts) || features.IsEnabled(featuremgmt.FlagExternalServiceAuth),
+		isProxyEnabled: features.IsEnabledGlobally(featuremgmt.FlagExternalServiceAccounts),
 	}
+
+	serviceaccountsAPI := api.NewServiceAccountsAPI(cfg, s, ac, accesscontrolService, routeRegister, permissionService, features)
+	serviceaccountsAPI.RegisterAPIEndpoints()
+
 	return s, nil
 }
 
@@ -92,6 +105,20 @@ func (s *ServiceAccountsProxy) DeleteServiceAccountToken(ctx context.Context, or
 	return s.proxiedService.DeleteServiceAccountToken(ctx, orgID, serviceAccountID, tokenID)
 }
 
+func (s *ServiceAccountsProxy) EnableServiceAccount(ctx context.Context, orgID int64, serviceAccountID int64, enable bool) error {
+	if s.isProxyEnabled {
+		sa, err := s.proxiedService.RetrieveServiceAccount(ctx, orgID, serviceAccountID)
+		if err != nil {
+			return err
+		}
+		if isExternalServiceAccount(sa.Login) {
+			s.log.Error("unable to enable/disable external service accounts", "serviceAccountID", serviceAccountID)
+			return extsvcaccounts.ErrCannotBeUpdated
+		}
+	}
+	return s.proxiedService.EnableServiceAccount(ctx, orgID, serviceAccountID, enable)
+}
+
 func (s *ServiceAccountsProxy) ListTokens(ctx context.Context, query *serviceaccounts.GetSATokensQuery) ([]apikey.APIKey, error) {
 	return s.proxiedService.ListTokens(ctx, query)
 }
@@ -112,6 +139,7 @@ func (s *ServiceAccountsProxy) RetrieveServiceAccount(ctx context.Context, orgID
 
 	if s.isProxyEnabled {
 		sa.IsExternal = isExternalServiceAccount(sa.Login)
+		sa.RequiredBy = strings.ReplaceAll(sa.Name, serviceaccounts.ExtSvcPrefix, "")
 	}
 
 	return sa, nil
@@ -159,5 +187,5 @@ func isNameValid(name string) bool {
 }
 
 func isExternalServiceAccount(login string) bool {
-	return strings.HasPrefix(login, serviceaccounts.ServiceAccountPrefix+serviceaccounts.ExtSvcPrefix)
+	return strings.HasPrefix(login, serviceaccounts.ExtSvcLoginPrefix)
 }
diff --git a/pkg/services/serviceaccounts/proxy/service_test.go b/pkg/services/serviceaccounts/proxy/service_test.go
index db0325a2172f8..45e1875adef58 100644
--- a/pkg/services/serviceaccounts/proxy/service_test.go
+++ b/pkg/services/serviceaccounts/proxy/service_test.go
@@ -8,12 +8,12 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/serviceaccounts"
+	sa "github.com/grafana/grafana/pkg/services/serviceaccounts"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts/extsvcaccounts"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts/tests"
 )
 
-var _ serviceaccounts.Service = (*tests.FakeServiceAccountService)(nil)
+var _ sa.Service = (*tests.FakeServiceAccountService)(nil)
 
 func TestProvideServiceAccount_crudServiceAccount(t *testing.T) {
 	testOrgId := int64(1)
@@ -29,19 +29,19 @@ func TestProvideServiceAccount_crudServiceAccount(t *testing.T) {
 	t.Run("should create service account", func(t *testing.T) {
 		testCases := []struct {
 			description   string
-			form          serviceaccounts.CreateServiceAccountForm
+			form          sa.CreateServiceAccountForm
 			expectedError error
 		}{
 			{
 				description: "should create service account and not return error",
-				form: serviceaccounts.CreateServiceAccountForm{
+				form: sa.CreateServiceAccountForm{
 					Name: "my-service-account",
 				},
 				expectedError: nil,
 			},
 			{
 				description: "should not allow to create a service account with extsvc prefix",
-				form: serviceaccounts.CreateServiceAccountForm{
+				form: sa.CreateServiceAccountForm{
 					Name: "extsvc-my-service-account",
 				},
 				expectedError: extsvcaccounts.ErrInvalidName,
@@ -61,20 +61,20 @@ func TestProvideServiceAccount_crudServiceAccount(t *testing.T) {
 		testCases := []struct {
 			description            string
 			expectedError          error
-			expectedServiceAccount *serviceaccounts.ServiceAccountProfileDTO
+			expectedServiceAccount *sa.ServiceAccountProfileDTO
 		}{
 			{
 				description:   "should allow to delete a service account",
 				expectedError: nil,
-				expectedServiceAccount: &serviceaccounts.ServiceAccountProfileDTO{
+				expectedServiceAccount: &sa.ServiceAccountProfileDTO{
 					Login: "my-service-account",
 				},
 			},
 			{
-				description:   "should not allow to delete a service account with sa-extsvc prefix",
+				description:   "should not allow to delete a service account with " + sa.ExtSvcLoginPrefix + " prefix",
 				expectedError: extsvcaccounts.ErrCannotBeDeleted,
-				expectedServiceAccount: &serviceaccounts.ServiceAccountProfileDTO{
-					Login: "sa-extsvc-my-service-account",
+				expectedServiceAccount: &sa.ServiceAccountProfileDTO{
+					Login: sa.ExtSvcLoginPrefix + "my-service-account",
 				},
 			},
 		}
@@ -88,24 +88,24 @@ func TestProvideServiceAccount_crudServiceAccount(t *testing.T) {
 		}
 	})
 
-	t.Run("should delete service account", func(t *testing.T) {
+	t.Run("should delete service account token", func(t *testing.T) {
 		testCases := []struct {
 			description            string
 			expectedError          error
-			expectedServiceAccount *serviceaccounts.ServiceAccountProfileDTO
+			expectedServiceAccount *sa.ServiceAccountProfileDTO
 		}{
 			{
 				description:   "should allow to delete a service account token",
 				expectedError: nil,
-				expectedServiceAccount: &serviceaccounts.ServiceAccountProfileDTO{
+				expectedServiceAccount: &sa.ServiceAccountProfileDTO{
 					Login: "my-service-account",
 				},
 			},
 			{
 				description:   "should not allow to delete a external service account token",
 				expectedError: extsvcaccounts.ErrCannotDeleteToken,
-				expectedServiceAccount: &serviceaccounts.ServiceAccountProfileDTO{
-					Login: "sa-extsvc-my-service-account",
+				expectedServiceAccount: &sa.ServiceAccountProfileDTO{
+					Login: sa.ExtSvcLoginPrefix + "my-service-account",
 				},
 			},
 		}
@@ -122,20 +122,20 @@ func TestProvideServiceAccount_crudServiceAccount(t *testing.T) {
 	t.Run("should retrieve service account with IsExternal field", func(t *testing.T) {
 		testCases := []struct {
 			description            string
-			expectedServiceAccount *serviceaccounts.ServiceAccountProfileDTO
+			expectedServiceAccount *sa.ServiceAccountProfileDTO
 			expectedIsExternal     bool
 		}{
 			{
 				description: "should not mark as external",
-				expectedServiceAccount: &serviceaccounts.ServiceAccountProfileDTO{
+				expectedServiceAccount: &sa.ServiceAccountProfileDTO{
 					Login: "my-service-account",
 				},
 				expectedIsExternal: false,
 			},
 			{
 				description: "should mark as external",
-				expectedServiceAccount: &serviceaccounts.ServiceAccountProfileDTO{
-					Login: "sa-extsvc-my-service-account",
+				expectedServiceAccount: &sa.ServiceAccountProfileDTO{
+					Login: sa.ExtSvcLoginPrefix + "my-service-account",
 				},
 				expectedIsExternal: true,
 			},
@@ -151,17 +151,17 @@ func TestProvideServiceAccount_crudServiceAccount(t *testing.T) {
 		}
 	})
 
-	t.Run("should mark external service accounts correctly", func(t *testing.T) {
-		serviceMock.ExpectedSearchOrgServiceAccountsResult = &serviceaccounts.SearchOrgServiceAccountsResult{
+	t.Run("should flag external service accounts correctly", func(t *testing.T) {
+		serviceMock.ExpectedSearchOrgServiceAccountsResult = &sa.SearchOrgServiceAccountsResult{
 			TotalCount: 2,
-			ServiceAccounts: []*serviceaccounts.ServiceAccountDTO{
+			ServiceAccounts: []*sa.ServiceAccountDTO{
 				{Login: "test"},
-				{Login: serviceaccounts.ServiceAccountPrefix + serviceaccounts.ExtSvcPrefix + "test"},
+				{Login: sa.ExtSvcLoginPrefix + "test"},
 			},
 			Page:    1,
 			PerPage: 2,
 		}
-		res, err := svc.SearchOrgServiceAccounts(context.Background(), &serviceaccounts.SearchOrgServiceAccountsQuery{OrgID: 1})
+		res, err := svc.SearchOrgServiceAccounts(context.Background(), &sa.SearchOrgServiceAccountsQuery{OrgID: 1})
 		require.Len(t, res.ServiceAccounts, 2)
 		require.NoError(t, err)
 		require.False(t, res.ServiceAccounts[0].IsExternal)
@@ -173,47 +173,47 @@ func TestProvideServiceAccount_crudServiceAccount(t *testing.T) {
 		nameWithProtectedPrefix := "extsvc-my-updated-service-account"
 		testCases := []struct {
 			description            string
-			form                   serviceaccounts.UpdateServiceAccountForm
-			expectedServiceAccount *serviceaccounts.ServiceAccountProfileDTO
+			form                   sa.UpdateServiceAccountForm
+			expectedServiceAccount *sa.ServiceAccountProfileDTO
 			expectedError          error
 		}{
 			{
 				description: "should update a non-external service account with a valid name",
-				form: serviceaccounts.UpdateServiceAccountForm{
+				form: sa.UpdateServiceAccountForm{
 					Name: &nameWithoutProtectedPrefix,
 				},
-				expectedServiceAccount: &serviceaccounts.ServiceAccountProfileDTO{
+				expectedServiceAccount: &sa.ServiceAccountProfileDTO{
 					Login: "my-service-account",
 				},
 				expectedError: nil,
 			},
 			{
 				description: "should not allow to update a non-external service account with extsvc prefix",
-				form: serviceaccounts.UpdateServiceAccountForm{
+				form: sa.UpdateServiceAccountForm{
 					Name: &nameWithProtectedPrefix,
 				},
-				expectedServiceAccount: &serviceaccounts.ServiceAccountProfileDTO{
+				expectedServiceAccount: &sa.ServiceAccountProfileDTO{
 					Login: "my-service-account",
 				},
 				expectedError: extsvcaccounts.ErrInvalidName,
 			},
 			{
 				description: "should not allow to update an external service account with a valid name",
-				form: serviceaccounts.UpdateServiceAccountForm{
+				form: sa.UpdateServiceAccountForm{
 					Name: &nameWithoutProtectedPrefix,
 				},
-				expectedServiceAccount: &serviceaccounts.ServiceAccountProfileDTO{
-					Login: "sa-extsvc-my-service-account",
+				expectedServiceAccount: &sa.ServiceAccountProfileDTO{
+					Login: sa.ExtSvcLoginPrefix + "my-service-account",
 				},
 				expectedError: extsvcaccounts.ErrCannotBeUpdated,
 			},
 			{
 				description: "should not allow to update an external service account with a extsvc prefix",
-				form: serviceaccounts.UpdateServiceAccountForm{
+				form: sa.UpdateServiceAccountForm{
 					Name: &nameWithProtectedPrefix,
 				},
-				expectedServiceAccount: &serviceaccounts.ServiceAccountProfileDTO{
-					Login: "sa-extsvc-my-service-account",
+				expectedServiceAccount: &sa.ServiceAccountProfileDTO{
+					Login: sa.ExtSvcLoginPrefix + "my-service-account",
 				},
 				expectedError: extsvcaccounts.ErrInvalidName,
 			},
@@ -232,27 +232,27 @@ func TestProvideServiceAccount_crudServiceAccount(t *testing.T) {
 	t.Run("should add service account tokens", func(t *testing.T) {
 		testCases := []struct {
 			description            string
-			cmd                    serviceaccounts.AddServiceAccountTokenCommand
-			expectedServiceAccount *serviceaccounts.ServiceAccountProfileDTO
+			cmd                    sa.AddServiceAccountTokenCommand
+			expectedServiceAccount *sa.ServiceAccountProfileDTO
 			expectedError          error
 		}{
 			{
 				description: "should allow to create a service account token",
-				cmd: serviceaccounts.AddServiceAccountTokenCommand{
+				cmd: sa.AddServiceAccountTokenCommand{
 					OrgId: testOrgId,
 				},
-				expectedServiceAccount: &serviceaccounts.ServiceAccountProfileDTO{
+				expectedServiceAccount: &sa.ServiceAccountProfileDTO{
 					Login: "my-service-account",
 				},
 				expectedError: nil,
 			},
 			{
 				description: "should not allow to create a service account token",
-				cmd: serviceaccounts.AddServiceAccountTokenCommand{
+				cmd: sa.AddServiceAccountTokenCommand{
 					OrgId: testOrgId,
 				},
-				expectedServiceAccount: &serviceaccounts.ServiceAccountProfileDTO{
-					Login: "sa-extsvc-my-service-account",
+				expectedServiceAccount: &sa.ServiceAccountProfileDTO{
+					Login: sa.ExtSvcLoginPrefix + "my-service-account",
 				},
 				expectedError: extsvcaccounts.ErrCannotCreateToken,
 			},
@@ -271,7 +271,7 @@ func TestProvideServiceAccount_crudServiceAccount(t *testing.T) {
 	t.Run("should identify service account logins for being external or not", func(t *testing.T) {
 		assert.False(t, isExternalServiceAccount("my-service-account"))
 		assert.False(t, isExternalServiceAccount("sa-my-service-account"))
-		assert.False(t, isExternalServiceAccount("extsvc-my-service-account"))
-		assert.True(t, isExternalServiceAccount("sa-extsvc-my-service-account"))
+		assert.False(t, isExternalServiceAccount(sa.ExtSvcPrefix+"my-service-account")) // It's not a external service account login
+		assert.True(t, isExternalServiceAccount(sa.ExtSvcLoginPrefix+"my-service-account"))
 	})
 }
diff --git a/pkg/services/serviceaccounts/serviceaccounts.go b/pkg/services/serviceaccounts/serviceaccounts.go
index 535e2b50625e7..046e6df265784 100644
--- a/pkg/services/serviceaccounts/serviceaccounts.go
+++ b/pkg/services/serviceaccounts/serviceaccounts.go
@@ -12,12 +12,15 @@ ServiceAccountService is the service that manages service accounts.
 Service accounts are used to authenticate API requests. They are not users and
 do not have a password.
 */
+
+//go:generate mockery --name Service --structname MockServiceAccountService --output tests --outpkg tests --filename mocks.go
 type Service interface {
 	CreateServiceAccount(ctx context.Context, orgID int64, saForm *CreateServiceAccountForm) (*ServiceAccountDTO, error)
 	DeleteServiceAccount(ctx context.Context, orgID, serviceAccountID int64) error
 	RetrieveServiceAccount(ctx context.Context, orgID, serviceAccountID int64) (*ServiceAccountProfileDTO, error)
 	RetrieveServiceAccountIdByName(ctx context.Context, orgID int64, name string) (int64, error)
 	SearchOrgServiceAccounts(ctx context.Context, query *SearchOrgServiceAccountsQuery) (*SearchOrgServiceAccountsResult, error)
+	EnableServiceAccount(ctx context.Context, orgID, serviceAccountID int64, enable bool) error
 	UpdateServiceAccount(ctx context.Context, orgID, serviceAccountID int64,
 		saForm *UpdateServiceAccountForm) (*ServiceAccountProfileDTO, error)
 
@@ -34,8 +37,12 @@ type Service interface {
 
 //go:generate mockery --name ExtSvcAccountsService --structname MockExtSvcAccountsService --output tests --outpkg tests --filename extsvcaccmock.go
 type ExtSvcAccountsService interface {
+	// EnableExtSvcAccount enables or disables the service account associated to an external service
+	EnableExtSvcAccount(ctx context.Context, cmd *EnableExtSvcAccountCmd) error
 	// ManageExtSvcAccount creates, updates or deletes the service account associated with an external service
 	ManageExtSvcAccount(ctx context.Context, cmd *ManageExtSvcAccountCmd) (int64, error)
+	// RemoveExtSvcAccount removes the external service account associated with an external service
+	RemoveExtSvcAccount(ctx context.Context, orgID int64, extSvcSlug string) error
 	// RetrieveExtSvcAccount fetches an external service account by ID
 	RetrieveExtSvcAccount(ctx context.Context, orgID, saID int64) (*ExtSvcAccount, error)
 }
diff --git a/pkg/services/serviceaccounts/tests/extsvcaccmock.go b/pkg/services/serviceaccounts/tests/extsvcaccmock.go
index 62dd0ef4abffb..a81afeb50a828 100644
--- a/pkg/services/serviceaccounts/tests/extsvcaccmock.go
+++ b/pkg/services/serviceaccounts/tests/extsvcaccmock.go
@@ -14,6 +14,20 @@ type MockExtSvcAccountsService struct {
 	mock.Mock
 }
 
+// EnableExtSvcAccount provides a mock function with given fields: ctx, cmd
+func (_m *MockExtSvcAccountsService) EnableExtSvcAccount(ctx context.Context, cmd *serviceaccounts.EnableExtSvcAccountCmd) error {
+	ret := _m.Called(ctx, cmd)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, *serviceaccounts.EnableExtSvcAccountCmd) error); ok {
+		r0 = rf(ctx, cmd)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
 // ManageExtSvcAccount provides a mock function with given fields: ctx, cmd
 func (_m *MockExtSvcAccountsService) ManageExtSvcAccount(ctx context.Context, cmd *serviceaccounts.ManageExtSvcAccountCmd) (int64, error) {
 	ret := _m.Called(ctx, cmd)
@@ -38,6 +52,20 @@ func (_m *MockExtSvcAccountsService) ManageExtSvcAccount(ctx context.Context, cm
 	return r0, r1
 }
 
+// RemoveExtSvcAccount provides a mock function with given fields: ctx, orgID, extSvcSlug
+func (_m *MockExtSvcAccountsService) RemoveExtSvcAccount(ctx context.Context, orgID int64, extSvcSlug string) error {
+	ret := _m.Called(ctx, orgID, extSvcSlug)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, int64, string) error); ok {
+		r0 = rf(ctx, orgID, extSvcSlug)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
 // RetrieveExtSvcAccount provides a mock function with given fields: ctx, orgID, saID
 func (_m *MockExtSvcAccountsService) RetrieveExtSvcAccount(ctx context.Context, orgID int64, saID int64) (*serviceaccounts.ExtSvcAccount, error) {
 	ret := _m.Called(ctx, orgID, saID)
diff --git a/pkg/services/serviceaccounts/tests/fakes.go b/pkg/services/serviceaccounts/tests/fakes.go
index 016c1ec95852e..df067ad5ae1bd 100644
--- a/pkg/services/serviceaccounts/tests/fakes.go
+++ b/pkg/services/serviceaccounts/tests/fakes.go
@@ -33,6 +33,10 @@ func (f *FakeServiceAccountService) DeleteServiceAccount(ctx context.Context, or
 	return f.ExpectedErr
 }
 
+func (f *FakeServiceAccountService) EnableServiceAccount(ctx context.Context, orgID int64, serviceAccountID int64, enable bool) error {
+	return f.ExpectedErr
+}
+
 func (f *FakeServiceAccountService) RetrieveServiceAccount(ctx context.Context, orgID, id int64) (*serviceaccounts.ServiceAccountProfileDTO, error) {
 	return f.ExpectedServiceAccountProfile, f.ExpectedErr
 }
diff --git a/pkg/services/serviceaccounts/tests/mocks.go b/pkg/services/serviceaccounts/tests/mocks.go
index 3e310802f9df8..5cd884fcf8ddc 100644
--- a/pkg/services/serviceaccounts/tests/mocks.go
+++ b/pkg/services/serviceaccounts/tests/mocks.go
@@ -1,82 +1,294 @@
+// Code generated by mockery v2.35.2. DO NOT EDIT.
+
 package tests
 
 import (
-	"context"
+	context "context"
 
-	"github.com/stretchr/testify/mock"
+	apikey "github.com/grafana/grafana/pkg/services/apikey"
 
-	"github.com/grafana/grafana/pkg/services/apikey"
-	"github.com/grafana/grafana/pkg/services/serviceaccounts"
-)
+	mock "github.com/stretchr/testify/mock"
 
-var _ serviceaccounts.Service = &MockServiceAccountService{}
+	serviceaccounts "github.com/grafana/grafana/pkg/services/serviceaccounts"
+)
 
+// MockServiceAccountService is an autogenerated mock type for the Service type
 type MockServiceAccountService struct {
 	mock.Mock
 }
 
-// AddServiceAccountToken implements serviceaccounts.Service
-func (s *MockServiceAccountService) AddServiceAccountToken(ctx context.Context, serviceAccountID int64, cmd *serviceaccounts.AddServiceAccountTokenCommand) (*apikey.APIKey, error) {
-	mockedArgs := s.Called(ctx, serviceAccountID, cmd)
-	return mockedArgs.Get(0).(*apikey.APIKey), mockedArgs.Error(1)
+// AddServiceAccountToken provides a mock function with given fields: ctx, serviceAccountID, cmd
+func (_m *MockServiceAccountService) AddServiceAccountToken(ctx context.Context, serviceAccountID int64, cmd *serviceaccounts.AddServiceAccountTokenCommand) (*apikey.APIKey, error) {
+	ret := _m.Called(ctx, serviceAccountID, cmd)
+
+	var r0 *apikey.APIKey
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, int64, *serviceaccounts.AddServiceAccountTokenCommand) (*apikey.APIKey, error)); ok {
+		return rf(ctx, serviceAccountID, cmd)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, int64, *serviceaccounts.AddServiceAccountTokenCommand) *apikey.APIKey); ok {
+		r0 = rf(ctx, serviceAccountID, cmd)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*apikey.APIKey)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, int64, *serviceaccounts.AddServiceAccountTokenCommand) error); ok {
+		r1 = rf(ctx, serviceAccountID, cmd)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
 }
 
-// CreateServiceAccount implements serviceaccounts.Service
-func (s *MockServiceAccountService) CreateServiceAccount(ctx context.Context, orgID int64, saForm *serviceaccounts.CreateServiceAccountForm) (*serviceaccounts.ServiceAccountDTO, error) {
-	mockedArgs := s.Called(ctx, orgID, saForm)
-	return mockedArgs.Get(0).(*serviceaccounts.ServiceAccountDTO), mockedArgs.Error(1)
+// CreateServiceAccount provides a mock function with given fields: ctx, orgID, saForm
+func (_m *MockServiceAccountService) CreateServiceAccount(ctx context.Context, orgID int64, saForm *serviceaccounts.CreateServiceAccountForm) (*serviceaccounts.ServiceAccountDTO, error) {
+	ret := _m.Called(ctx, orgID, saForm)
+
+	var r0 *serviceaccounts.ServiceAccountDTO
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, int64, *serviceaccounts.CreateServiceAccountForm) (*serviceaccounts.ServiceAccountDTO, error)); ok {
+		return rf(ctx, orgID, saForm)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, int64, *serviceaccounts.CreateServiceAccountForm) *serviceaccounts.ServiceAccountDTO); ok {
+		r0 = rf(ctx, orgID, saForm)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*serviceaccounts.ServiceAccountDTO)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, int64, *serviceaccounts.CreateServiceAccountForm) error); ok {
+		r1 = rf(ctx, orgID, saForm)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
 }
 
-// DeleteServiceAccount implements serviceaccounts.Service
-func (s *MockServiceAccountService) DeleteServiceAccount(ctx context.Context, orgID int64, serviceAccountID int64) error {
-	mockedArgs := s.Called(ctx, orgID, serviceAccountID)
-	return mockedArgs.Error(0)
+// DeleteServiceAccount provides a mock function with given fields: ctx, orgID, serviceAccountID
+func (_m *MockServiceAccountService) DeleteServiceAccount(ctx context.Context, orgID int64, serviceAccountID int64) error {
+	ret := _m.Called(ctx, orgID, serviceAccountID)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, int64, int64) error); ok {
+		r0 = rf(ctx, orgID, serviceAccountID)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
 }
 
-// DeleteServiceAccountToken implements serviceaccounts.Service
-func (s *MockServiceAccountService) DeleteServiceAccountToken(ctx context.Context, orgID, serviceAccountID, tokenID int64) error {
-	mockedArgs := s.Called(ctx, orgID, serviceAccountID, tokenID)
-	return mockedArgs.Error(0)
+// DeleteServiceAccountToken provides a mock function with given fields: ctx, orgID, serviceAccountID, tokenID
+func (_m *MockServiceAccountService) DeleteServiceAccountToken(ctx context.Context, orgID int64, serviceAccountID int64, tokenID int64) error {
+	ret := _m.Called(ctx, orgID, serviceAccountID, tokenID)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, int64, int64, int64) error); ok {
+		r0 = rf(ctx, orgID, serviceAccountID, tokenID)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
 }
 
-// ListTokens implements serviceaccounts.Service
-func (s *MockServiceAccountService) ListTokens(ctx context.Context, query *serviceaccounts.GetSATokensQuery) ([]apikey.APIKey, error) {
-	mockedArgs := s.Called(ctx, query)
-	return mockedArgs.Get(0).([]apikey.APIKey), mockedArgs.Error(1)
+// EnableServiceAccount provides a mock function with given fields: ctx, orgID, serviceAccountID, enable
+func (_m *MockServiceAccountService) EnableServiceAccount(ctx context.Context, orgID int64, serviceAccountID int64, enable bool) error {
+	ret := _m.Called(ctx, orgID, serviceAccountID, enable)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, int64, int64, bool) error); ok {
+		r0 = rf(ctx, orgID, serviceAccountID, enable)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
 }
 
-// MigrateApiKey implements serviceaccounts.Service
-func (s *MockServiceAccountService) MigrateApiKey(ctx context.Context, orgID int64, keyId int64) error {
-	mockedArgs := s.Called(ctx, orgID, keyId)
-	return mockedArgs.Error(0)
+// ListTokens provides a mock function with given fields: ctx, query
+func (_m *MockServiceAccountService) ListTokens(ctx context.Context, query *serviceaccounts.GetSATokensQuery) ([]apikey.APIKey, error) {
+	ret := _m.Called(ctx, query)
+
+	var r0 []apikey.APIKey
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *serviceaccounts.GetSATokensQuery) ([]apikey.APIKey, error)); ok {
+		return rf(ctx, query)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *serviceaccounts.GetSATokensQuery) []apikey.APIKey); ok {
+		r0 = rf(ctx, query)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]apikey.APIKey)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *serviceaccounts.GetSATokensQuery) error); ok {
+		r1 = rf(ctx, query)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
 }
 
-// MigrateApiKeysToServiceAccounts implements serviceaccounts.Service
-func (s *MockServiceAccountService) MigrateApiKeysToServiceAccounts(ctx context.Context, orgID int64) (*serviceaccounts.MigrationResult, error) {
-	mockedArgs := s.Called(ctx, orgID)
-	return mockedArgs.Get(0).(*serviceaccounts.MigrationResult), mockedArgs.Error(1)
+// MigrateApiKey provides a mock function with given fields: ctx, orgID, keyId
+func (_m *MockServiceAccountService) MigrateApiKey(ctx context.Context, orgID int64, keyId int64) error {
+	ret := _m.Called(ctx, orgID, keyId)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, int64, int64) error); ok {
+		r0 = rf(ctx, orgID, keyId)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
 }
 
-// RetrieveServiceAccount implements serviceaccounts.Service
-func (s *MockServiceAccountService) RetrieveServiceAccount(ctx context.Context, orgID int64, serviceAccountID int64) (*serviceaccounts.ServiceAccountProfileDTO, error) {
-	mockedArgs := s.Called(ctx, orgID, serviceAccountID)
-	return mockedArgs.Get(0).(*serviceaccounts.ServiceAccountProfileDTO), mockedArgs.Error(1)
+// MigrateApiKeysToServiceAccounts provides a mock function with given fields: ctx, orgID
+func (_m *MockServiceAccountService) MigrateApiKeysToServiceAccounts(ctx context.Context, orgID int64) (*serviceaccounts.MigrationResult, error) {
+	ret := _m.Called(ctx, orgID)
+
+	var r0 *serviceaccounts.MigrationResult
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, int64) (*serviceaccounts.MigrationResult, error)); ok {
+		return rf(ctx, orgID)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, int64) *serviceaccounts.MigrationResult); ok {
+		r0 = rf(ctx, orgID)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*serviceaccounts.MigrationResult)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, int64) error); ok {
+		r1 = rf(ctx, orgID)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// RetrieveServiceAccount provides a mock function with given fields: ctx, orgID, serviceAccountID
+func (_m *MockServiceAccountService) RetrieveServiceAccount(ctx context.Context, orgID int64, serviceAccountID int64) (*serviceaccounts.ServiceAccountProfileDTO, error) {
+	ret := _m.Called(ctx, orgID, serviceAccountID)
+
+	var r0 *serviceaccounts.ServiceAccountProfileDTO
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, int64, int64) (*serviceaccounts.ServiceAccountProfileDTO, error)); ok {
+		return rf(ctx, orgID, serviceAccountID)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, int64, int64) *serviceaccounts.ServiceAccountProfileDTO); ok {
+		r0 = rf(ctx, orgID, serviceAccountID)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*serviceaccounts.ServiceAccountProfileDTO)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, int64, int64) error); ok {
+		r1 = rf(ctx, orgID, serviceAccountID)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// RetrieveServiceAccountIdByName provides a mock function with given fields: ctx, orgID, name
+func (_m *MockServiceAccountService) RetrieveServiceAccountIdByName(ctx context.Context, orgID int64, name string) (int64, error) {
+	ret := _m.Called(ctx, orgID, name)
+
+	var r0 int64
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, int64, string) (int64, error)); ok {
+		return rf(ctx, orgID, name)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, int64, string) int64); ok {
+		r0 = rf(ctx, orgID, name)
+	} else {
+		r0 = ret.Get(0).(int64)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, int64, string) error); ok {
+		r1 = rf(ctx, orgID, name)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
 }
 
-// RetrieveServiceAccountIdByName implements serviceaccounts.Service
-func (s *MockServiceAccountService) RetrieveServiceAccountIdByName(ctx context.Context, orgID int64, name string) (int64, error) {
-	mockedArgs := s.Called(ctx, orgID, name)
-	return mockedArgs.Get(0).(int64), mockedArgs.Error(1)
+// SearchOrgServiceAccounts provides a mock function with given fields: ctx, query
+func (_m *MockServiceAccountService) SearchOrgServiceAccounts(ctx context.Context, query *serviceaccounts.SearchOrgServiceAccountsQuery) (*serviceaccounts.SearchOrgServiceAccountsResult, error) {
+	ret := _m.Called(ctx, query)
+
+	var r0 *serviceaccounts.SearchOrgServiceAccountsResult
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *serviceaccounts.SearchOrgServiceAccountsQuery) (*serviceaccounts.SearchOrgServiceAccountsResult, error)); ok {
+		return rf(ctx, query)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *serviceaccounts.SearchOrgServiceAccountsQuery) *serviceaccounts.SearchOrgServiceAccountsResult); ok {
+		r0 = rf(ctx, query)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*serviceaccounts.SearchOrgServiceAccountsResult)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *serviceaccounts.SearchOrgServiceAccountsQuery) error); ok {
+		r1 = rf(ctx, query)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
 }
 
-// SearchOrgServiceAccounts implements serviceaccounts.Service
-func (s *MockServiceAccountService) SearchOrgServiceAccounts(ctx context.Context, query *serviceaccounts.SearchOrgServiceAccountsQuery) (*serviceaccounts.SearchOrgServiceAccountsResult, error) {
-	mockedArgs := s.Called(ctx, query)
-	return mockedArgs.Get(0).(*serviceaccounts.SearchOrgServiceAccountsResult), mockedArgs.Error(1)
+// UpdateServiceAccount provides a mock function with given fields: ctx, orgID, serviceAccountID, saForm
+func (_m *MockServiceAccountService) UpdateServiceAccount(ctx context.Context, orgID int64, serviceAccountID int64, saForm *serviceaccounts.UpdateServiceAccountForm) (*serviceaccounts.ServiceAccountProfileDTO, error) {
+	ret := _m.Called(ctx, orgID, serviceAccountID, saForm)
+
+	var r0 *serviceaccounts.ServiceAccountProfileDTO
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, int64, int64, *serviceaccounts.UpdateServiceAccountForm) (*serviceaccounts.ServiceAccountProfileDTO, error)); ok {
+		return rf(ctx, orgID, serviceAccountID, saForm)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, int64, int64, *serviceaccounts.UpdateServiceAccountForm) *serviceaccounts.ServiceAccountProfileDTO); ok {
+		r0 = rf(ctx, orgID, serviceAccountID, saForm)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*serviceaccounts.ServiceAccountProfileDTO)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, int64, int64, *serviceaccounts.UpdateServiceAccountForm) error); ok {
+		r1 = rf(ctx, orgID, serviceAccountID, saForm)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
 }
 
-// UpdateServiceAccount implements serviceaccounts.Service
-func (s *MockServiceAccountService) UpdateServiceAccount(ctx context.Context, orgID int64, serviceAccountID int64, saForm *serviceaccounts.UpdateServiceAccountForm) (*serviceaccounts.ServiceAccountProfileDTO, error) {
-	mockedArgs := s.Called(ctx, orgID, serviceAccountID)
-	return mockedArgs.Get(0).(*serviceaccounts.ServiceAccountProfileDTO), mockedArgs.Error(1)
+// NewMockServiceAccountService creates a new instance of MockServiceAccountService. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewMockServiceAccountService(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *MockServiceAccountService {
+	mock := &MockServiceAccountService{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
 }
diff --git a/pkg/services/shorturls/shorturlimpl/shorturl_test.go b/pkg/services/shorturls/shorturlimpl/shorturl_test.go
index 37913f1833ece..e55804bfceae1 100644
--- a/pkg/services/shorturls/shorturlimpl/shorturl_test.go
+++ b/pkg/services/shorturls/shorturlimpl/shorturl_test.go
@@ -10,8 +10,13 @@ import (
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/services/shorturls"
 	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestShortURLService(t *testing.T) {
 	user := &user.SignedInUser{UserID: 1}
 	store := db.InitTestDB(t)
diff --git a/pkg/services/signingkeys/signingkeysimpl/service.go b/pkg/services/signingkeys/signingkeysimpl/service.go
index 500f0606dd9bb..7c7d0f718f427 100644
--- a/pkg/services/signingkeys/signingkeysimpl/service.go
+++ b/pkg/services/signingkeys/signingkeysimpl/service.go
@@ -177,12 +177,14 @@ func (s *Service) addPrivateKey(ctx context.Context, keyID string, alg jose.Sign
 		return nil, err
 	}
 
-	expiry := time.Now().Add(30 * 24 * time.Hour)
+	now := time.Now()
+	expiry := now.Add(30 * 24 * time.Hour)
 	key, err := s.store.Add(ctx, &signingkeys.SigningKey{
 		KeyID:      keyID,
 		PrivateKey: encoded,
 		ExpiresAt:  &expiry,
 		Alg:        alg,
+		AddedAt:    now,
 	}, force)
 
 	if err != nil && !errors.Is(err, signingkeys.ErrSigningKeyAlreadyExists) {
diff --git a/pkg/services/signingkeys/signingkeystore/store_test.go b/pkg/services/signingkeys/signingkeystore/store_test.go
index 2ddebe006cb1b..2cb8cadc60ce5 100644
--- a/pkg/services/signingkeys/signingkeystore/store_test.go
+++ b/pkg/services/signingkeys/signingkeystore/store_test.go
@@ -10,8 +10,13 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/services/signingkeys"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationSigningKeyStore(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
diff --git a/pkg/services/sqlstore/database_config.go b/pkg/services/sqlstore/database_config.go
new file mode 100644
index 0000000000000..332078ae5e3a7
--- /dev/null
+++ b/pkg/services/sqlstore/database_config.go
@@ -0,0 +1,230 @@
+package sqlstore
+
+import (
+	"errors"
+	"fmt"
+	"net/url"
+	"os"
+	"path"
+	"path/filepath"
+	"strings"
+
+	"github.com/go-sql-driver/mysql"
+
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util"
+)
+
+type DatabaseConfig struct {
+	Type                        string
+	Host                        string
+	Name                        string
+	User                        string
+	Pwd                         string
+	Path                        string
+	SslMode                     string
+	SSLSNI                      string
+	CaCertPath                  string
+	ClientKeyPath               string
+	ClientCertPath              string
+	ServerCertName              string
+	ConnectionString            string
+	IsolationLevel              string
+	MaxOpenConn                 int
+	MaxIdleConn                 int
+	ConnMaxLifetime             int
+	CacheMode                   string
+	WALEnabled                  bool
+	UrlQueryParams              map[string][]string
+	SkipMigrations              bool
+	MigrationLock               bool
+	MigrationLockAttemptTimeout int
+	LogQueries                  bool
+	// SQLite only
+	QueryRetries int
+	// SQLite only
+	TransactionRetries int
+}
+
+func NewDatabaseConfig(cfg *setting.Cfg, features featuremgmt.FeatureToggles) (*DatabaseConfig, error) {
+	if cfg == nil {
+		return nil, errors.New("cfg cannot be nil")
+	}
+
+	dbCfg := &DatabaseConfig{}
+	if err := dbCfg.readConfig(cfg); err != nil {
+		return nil, err
+	}
+
+	if err := dbCfg.buildConnectionString(cfg, features); err != nil {
+		return nil, err
+	}
+
+	return dbCfg, nil
+}
+
+func (dbCfg *DatabaseConfig) readConfig(cfg *setting.Cfg) error {
+	sec := cfg.Raw.Section("database")
+
+	cfgURL := sec.Key("url").String()
+	if len(cfgURL) != 0 {
+		dbURL, err := url.Parse(cfgURL)
+		if err != nil {
+			return err
+		}
+		dbCfg.Type = dbURL.Scheme
+		dbCfg.Host = dbURL.Host
+
+		pathSplit := strings.Split(dbURL.Path, "/")
+		if len(pathSplit) > 1 {
+			dbCfg.Name = pathSplit[1]
+		}
+
+		userInfo := dbURL.User
+		if userInfo != nil {
+			dbCfg.User = userInfo.Username()
+			dbCfg.Pwd, _ = userInfo.Password()
+		}
+
+		dbCfg.UrlQueryParams = dbURL.Query()
+	} else {
+		dbCfg.Type = sec.Key("type").String()
+		dbCfg.Host = sec.Key("host").String()
+		dbCfg.Name = sec.Key("name").String()
+		dbCfg.User = sec.Key("user").String()
+		dbCfg.ConnectionString = sec.Key("connection_string").String()
+		dbCfg.Pwd = sec.Key("password").String()
+	}
+
+	dbCfg.MaxOpenConn = sec.Key("max_open_conn").MustInt(0)
+	dbCfg.MaxIdleConn = sec.Key("max_idle_conn").MustInt(2)
+	dbCfg.ConnMaxLifetime = sec.Key("conn_max_lifetime").MustInt(14400)
+
+	dbCfg.SslMode = sec.Key("ssl_mode").String()
+	dbCfg.SSLSNI = sec.Key("ssl_sni").String()
+	dbCfg.CaCertPath = sec.Key("ca_cert_path").String()
+	dbCfg.ClientKeyPath = sec.Key("client_key_path").String()
+	dbCfg.ClientCertPath = sec.Key("client_cert_path").String()
+	dbCfg.ServerCertName = sec.Key("server_cert_name").String()
+	dbCfg.Path = sec.Key("path").MustString("data/grafana.db")
+	dbCfg.IsolationLevel = sec.Key("isolation_level").String()
+
+	dbCfg.CacheMode = sec.Key("cache_mode").MustString("private")
+	dbCfg.WALEnabled = sec.Key("wal").MustBool(false)
+	dbCfg.SkipMigrations = sec.Key("skip_migrations").MustBool()
+	dbCfg.MigrationLock = sec.Key("migration_locking").MustBool(true)
+	dbCfg.MigrationLockAttemptTimeout = sec.Key("locking_attempt_timeout_sec").MustInt()
+
+	dbCfg.QueryRetries = sec.Key("query_retries").MustInt()
+	dbCfg.TransactionRetries = sec.Key("transaction_retries").MustInt(5)
+
+	dbCfg.LogQueries = sec.Key("log_queries").MustBool(false)
+
+	return nil
+}
+
+func (dbCfg *DatabaseConfig) buildConnectionString(cfg *setting.Cfg, features featuremgmt.FeatureToggles) error {
+	if dbCfg.ConnectionString != "" {
+		return nil
+	}
+
+	cnnstr := ""
+
+	switch dbCfg.Type {
+	case migrator.MySQL:
+		protocol := "tcp"
+		if strings.HasPrefix(dbCfg.Host, "/") {
+			protocol = "unix"
+		}
+
+		cnnstr = fmt.Sprintf("%s:%s@%s(%s)/%s?collation=utf8mb4_unicode_ci&allowNativePasswords=true&clientFoundRows=true",
+			dbCfg.User, dbCfg.Pwd, protocol, dbCfg.Host, dbCfg.Name)
+
+		if dbCfg.SslMode == "true" || dbCfg.SslMode == "skip-verify" {
+			tlsCert, err := makeCert(dbCfg)
+			if err != nil {
+				return err
+			}
+			if err := mysql.RegisterTLSConfig("custom", tlsCert); err != nil {
+				return err
+			}
+
+			cnnstr += "&tls=custom"
+		}
+
+		if isolation := dbCfg.IsolationLevel; isolation != "" {
+			val := url.QueryEscape(fmt.Sprintf("'%s'", isolation))
+			cnnstr += fmt.Sprintf("&transaction_isolation=%s", val)
+		}
+
+		if features != nil && features.IsEnabledGlobally(featuremgmt.FlagMysqlAnsiQuotes) {
+			cnnstr += "&sql_mode='ANSI_QUOTES'"
+		}
+
+		cnnstr += buildExtraConnectionString('&', dbCfg.UrlQueryParams)
+	case migrator.Postgres:
+		addr, err := util.SplitHostPortDefault(dbCfg.Host, "127.0.0.1", "5432")
+		if err != nil {
+			return fmt.Errorf("invalid host specifier '%s': %w", dbCfg.Host, err)
+		}
+
+		args := []any{dbCfg.User, addr.Host, addr.Port, dbCfg.Name, dbCfg.SslMode, dbCfg.ClientCertPath,
+			dbCfg.ClientKeyPath, dbCfg.CaCertPath}
+
+		for i, arg := range args {
+			if arg == "" {
+				args[i] = "''"
+			}
+		}
+		cnnstr = fmt.Sprintf("user=%s host=%s port=%s dbname=%s sslmode=%s sslcert=%s sslkey=%s sslrootcert=%s", args...)
+		if dbCfg.SSLSNI != "" {
+			cnnstr += fmt.Sprintf(" sslsni=%s", dbCfg.SSLSNI)
+		}
+		if dbCfg.Pwd != "" {
+			cnnstr += fmt.Sprintf(" password=%s", dbCfg.Pwd)
+		}
+
+		cnnstr += buildExtraConnectionString(' ', dbCfg.UrlQueryParams)
+	case migrator.SQLite:
+		// special case for tests
+		if !filepath.IsAbs(dbCfg.Path) {
+			dbCfg.Path = filepath.Join(cfg.DataPath, dbCfg.Path)
+		}
+		if err := os.MkdirAll(path.Dir(dbCfg.Path), os.ModePerm); err != nil {
+			return err
+		}
+
+		cnnstr = fmt.Sprintf("file:%s?cache=%s&mode=rwc", dbCfg.Path, dbCfg.CacheMode)
+
+		if dbCfg.WALEnabled {
+			cnnstr += "&_journal_mode=WAL"
+		}
+
+		cnnstr += buildExtraConnectionString('&', dbCfg.UrlQueryParams)
+	default:
+		return fmt.Errorf("unknown database type: %s", dbCfg.Type)
+	}
+
+	dbCfg.ConnectionString = cnnstr
+
+	return nil
+}
+
+func buildExtraConnectionString(sep rune, urlQueryParams map[string][]string) string {
+	if urlQueryParams == nil {
+		return ""
+	}
+
+	var sb strings.Builder
+	for key, values := range urlQueryParams {
+		for _, value := range values {
+			sb.WriteRune(sep)
+			sb.WriteString(key)
+			sb.WriteRune('=')
+			sb.WriteString(value)
+		}
+	}
+	return sb.String()
+}
diff --git a/pkg/services/sqlstore/database_config_test.go b/pkg/services/sqlstore/database_config_test.go
new file mode 100644
index 0000000000000..cd13fc3b8faf1
--- /dev/null
+++ b/pkg/services/sqlstore/database_config_test.go
@@ -0,0 +1,223 @@
+package sqlstore
+
+import (
+	"errors"
+	"net/url"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+type databaseConfigTest struct {
+	name       string
+	dbType     string
+	dbHost     string
+	dbURL      string
+	dbUser     string
+	dbPwd      string
+	expConnStr string
+	features   featuremgmt.FeatureToggles
+	err        error
+}
+
+var databaseConfigTestCases = []databaseConfigTest{
+	{
+		name:       "MySQL IPv4",
+		dbType:     "mysql",
+		dbHost:     "1.2.3.4:5678",
+		expConnStr: ":@tcp(1.2.3.4:5678)/test_db?collation=utf8mb4_unicode_ci&allowNativePasswords=true&clientFoundRows=true",
+	},
+	{
+		name:       "Postgres IPv4",
+		dbType:     "postgres",
+		dbHost:     "1.2.3.4:5678",
+		expConnStr: "user='' host=1.2.3.4 port=5678 dbname=test_db sslmode='' sslcert='' sslkey='' sslrootcert=''",
+	},
+	{
+		name:       "Postgres IPv4 (Default Port)",
+		dbType:     "postgres",
+		dbHost:     "1.2.3.4",
+		expConnStr: "user='' host=1.2.3.4 port=5432 dbname=test_db sslmode='' sslcert='' sslkey='' sslrootcert=''",
+	},
+	{
+		name:       "Postgres username and password",
+		dbType:     "postgres",
+		dbHost:     "1.2.3.4",
+		dbUser:     "grafana",
+		dbPwd:      "password",
+		expConnStr: "user=grafana host=1.2.3.4 port=5432 dbname=test_db sslmode='' sslcert='' sslkey='' sslrootcert='' password=password",
+	},
+	{
+		name:       "Postgres username no password",
+		dbType:     "postgres",
+		dbHost:     "1.2.3.4",
+		dbUser:     "grafana",
+		dbPwd:      "",
+		expConnStr: "user=grafana host=1.2.3.4 port=5432 dbname=test_db sslmode='' sslcert='' sslkey='' sslrootcert=''",
+	},
+	{
+		name:       "MySQL IPv4 (Default Port)",
+		dbType:     "mysql",
+		dbHost:     "1.2.3.4",
+		expConnStr: ":@tcp(1.2.3.4)/test_db?collation=utf8mb4_unicode_ci&allowNativePasswords=true&clientFoundRows=true",
+	},
+	{
+		name:       "MySQL IPv6",
+		dbType:     "mysql",
+		dbHost:     "[fe80::24e8:31b2:91df:b177]:1234",
+		expConnStr: ":@tcp([fe80::24e8:31b2:91df:b177]:1234)/test_db?collation=utf8mb4_unicode_ci&allowNativePasswords=true&clientFoundRows=true",
+	},
+	{
+		name:       "Postgres IPv6",
+		dbType:     "postgres",
+		dbHost:     "[fe80::24e8:31b2:91df:b177]:1234",
+		expConnStr: "user='' host=fe80::24e8:31b2:91df:b177 port=1234 dbname=test_db sslmode='' sslcert='' sslkey='' sslrootcert=''",
+	},
+	{
+		name:       "MySQL IPv6 (Default Port)",
+		dbType:     "mysql",
+		dbHost:     "[::1]",
+		expConnStr: ":@tcp([::1])/test_db?collation=utf8mb4_unicode_ci&allowNativePasswords=true&clientFoundRows=true",
+	},
+	{
+		name:       "Postgres IPv6 (Default Port)",
+		dbType:     "postgres",
+		dbHost:     "[::1]",
+		expConnStr: "user='' host=::1 port=5432 dbname=test_db sslmode='' sslcert='' sslkey='' sslrootcert=''",
+	},
+	{
+		name:  "Invalid database URL",
+		dbURL: "://invalid.com/",
+		err:   &url.Error{Op: "parse", URL: "://invalid.com/", Err: errors.New("missing protocol scheme")},
+	},
+	{
+		name:       "MySQL with ANSI_QUOTES mode",
+		dbType:     "mysql",
+		dbHost:     "[::1]",
+		features:   featuremgmt.WithFeatures(featuremgmt.FlagMysqlAnsiQuotes),
+		expConnStr: ":@tcp([::1])/test_db?collation=utf8mb4_unicode_ci&allowNativePasswords=true&clientFoundRows=true&sql_mode='ANSI_QUOTES'",
+	},
+}
+
+func TestIntegrationSQLConnectionString(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+	for _, testCase := range databaseConfigTestCases {
+		t.Run(testCase.name, func(t *testing.T) {
+			cfg := makeDatabaseTestConfig(t, testCase)
+			dbCfg, err := NewDatabaseConfig(cfg, testCase.features)
+			require.Equal(t, testCase.err, err)
+			if testCase.expConnStr != "" {
+				assert.Equal(t, testCase.expConnStr, dbCfg.ConnectionString)
+			}
+		})
+	}
+}
+
+func makeDatabaseTestConfig(t *testing.T, tc databaseConfigTest) *setting.Cfg {
+	t.Helper()
+
+	if tc.features == nil {
+		tc.features = featuremgmt.WithFeatures()
+	}
+	// nolint:staticcheck
+	cfg := setting.NewCfgWithFeatures(tc.features.IsEnabledGlobally)
+
+	sec, err := cfg.Raw.NewSection("database")
+	require.NoError(t, err)
+	_, err = sec.NewKey("type", tc.dbType)
+	require.NoError(t, err)
+	_, err = sec.NewKey("host", tc.dbHost)
+	require.NoError(t, err)
+	_, err = sec.NewKey("url", tc.dbURL)
+	require.NoError(t, err)
+	_, err = sec.NewKey("user", tc.dbUser)
+	require.NoError(t, err)
+	_, err = sec.NewKey("name", "test_db")
+	require.NoError(t, err)
+	_, err = sec.NewKey("password", tc.dbPwd)
+	require.NoError(t, err)
+
+	return cfg
+}
+func TestBuildConnectionStringPostgres(t *testing.T) {
+	testCases := []struct {
+		name            string
+		dbCfg           *DatabaseConfig
+		expectedConnStr string
+	}{
+		{
+			name: "Postgres with sslmode disable",
+			dbCfg: &DatabaseConfig{
+				Type:    migrator.Postgres,
+				User:    "grafana",
+				Pwd:     "password",
+				Host:    "127.0.0.1:5432",
+				Name:    "grafana_test",
+				SslMode: "disable",
+			},
+			expectedConnStr: "user=grafana host=127.0.0.1 port=5432 dbname=grafana_test sslmode=disable sslcert='' sslkey='' sslrootcert='' password=password",
+		},
+		{
+			name: "Postgres with sslmode verify-ca",
+			dbCfg: &DatabaseConfig{
+				Type:           migrator.Postgres,
+				User:           "grafana",
+				Pwd:            "password",
+				Host:           "127.0.0.1:5432",
+				Name:           "grafana_test",
+				SslMode:        "verify-ca",
+				CaCertPath:     "/path/to/ca_cert",
+				ClientKeyPath:  "/path/to/client_key",
+				ClientCertPath: "/path/to/client_cert",
+			},
+			expectedConnStr: "user=grafana host=127.0.0.1 port=5432 dbname=grafana_test sslmode=verify-ca sslcert=/path/to/client_cert sslkey=/path/to/client_key sslrootcert=/path/to/ca_cert password=password",
+		},
+		{
+			name: "Postgres with sslmode verify-ca without SNI",
+			dbCfg: &DatabaseConfig{
+				Type:           migrator.Postgres,
+				User:           "grafana",
+				Pwd:            "password",
+				Host:           "127.0.0.1:5432",
+				Name:           "grafana_test",
+				SslMode:        "verify-ca",
+				CaCertPath:     "/path/to/ca_cert",
+				ClientKeyPath:  "/path/to/client_key",
+				ClientCertPath: "/path/to/client_cert",
+				SSLSNI:         "0",
+			},
+			expectedConnStr: "user=grafana host=127.0.0.1 port=5432 dbname=grafana_test sslmode=verify-ca sslcert=/path/to/client_cert sslkey=/path/to/client_key sslrootcert=/path/to/ca_cert sslsni=0 password=password",
+		},
+		{
+			name: "Postgres with sslmode verify-ca with SNI",
+			dbCfg: &DatabaseConfig{
+				Type:           migrator.Postgres,
+				User:           "grafana",
+				Pwd:            "password",
+				Host:           "127.0.0.1:5432",
+				Name:           "grafana_test",
+				SslMode:        "verify-ca",
+				CaCertPath:     "/path/to/ca_cert",
+				ClientKeyPath:  "/path/to/client_key",
+				ClientCertPath: "/path/to/client_cert",
+				SSLSNI:         "1",
+			},
+			expectedConnStr: "user=grafana host=127.0.0.1 port=5432 dbname=grafana_test sslmode=verify-ca sslcert=/path/to/client_cert sslkey=/path/to/client_key sslrootcert=/path/to/ca_cert sslsni=1 password=password",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			err := tc.dbCfg.buildConnectionString(&setting.Cfg{}, nil)
+			assert.NoError(t, err)
+			assert.Equal(t, tc.expectedConnStr, tc.dbCfg.ConnectionString)
+		})
+	}
+}
diff --git a/pkg/services/sqlstore/logger.go b/pkg/services/sqlstore/logger.go
index e8132a97c43c5..818652f44aa87 100644
--- a/pkg/services/sqlstore/logger.go
+++ b/pkg/services/sqlstore/logger.go
@@ -100,7 +100,6 @@ func (s *XormLogger) SetLevel(l core.LogLevel) {
 
 // ShowSQL implement core.ILogger
 func (s *XormLogger) ShowSQL(show ...bool) {
-	s.grafanaLog.Error("ShowSQL", "show", "show")
 	if len(show) == 0 {
 		s.showSQL = true
 		return
diff --git a/pkg/services/sqlstore/migrations/accesscontrol/dashboard_permissions.go b/pkg/services/sqlstore/migrations/accesscontrol/dashboard_permissions.go
index 083a6fe219663..9a2aeda12873f 100644
--- a/pkg/services/sqlstore/migrations/accesscontrol/dashboard_permissions.go
+++ b/pkg/services/sqlstore/migrations/accesscontrol/dashboard_permissions.go
@@ -10,19 +10,20 @@ import (
 
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 )
 
-var dashboardPermissionTranslation = map[dashboards.PermissionType][]string{
-	dashboards.PERMISSION_VIEW: {
+var dashboardPermissionTranslation = map[dashboardaccess.PermissionType][]string{
+	dashboardaccess.PERMISSION_VIEW: {
 		dashboards.ActionDashboardsRead,
 	},
-	dashboards.PERMISSION_EDIT: {
+	dashboardaccess.PERMISSION_EDIT: {
 		dashboards.ActionDashboardsRead,
 		dashboards.ActionDashboardsWrite,
 		dashboards.ActionDashboardsDelete,
 	},
-	dashboards.PERMISSION_ADMIN: {
+	dashboardaccess.PERMISSION_ADMIN: {
 		dashboards.ActionDashboardsRead,
 		dashboards.ActionDashboardsWrite,
 		dashboards.ActionDashboardsCreate,
@@ -32,17 +33,17 @@ var dashboardPermissionTranslation = map[dashboards.PermissionType][]string{
 	},
 }
 
-var folderPermissionTranslation = map[dashboards.PermissionType][]string{
-	dashboards.PERMISSION_VIEW: append(dashboardPermissionTranslation[dashboards.PERMISSION_VIEW], []string{
+var folderPermissionTranslation = map[dashboardaccess.PermissionType][]string{
+	dashboardaccess.PERMISSION_VIEW: append(dashboardPermissionTranslation[dashboardaccess.PERMISSION_VIEW], []string{
 		dashboards.ActionFoldersRead,
 	}...),
-	dashboards.PERMISSION_EDIT: append(dashboardPermissionTranslation[dashboards.PERMISSION_EDIT], []string{
+	dashboardaccess.PERMISSION_EDIT: append(dashboardPermissionTranslation[dashboardaccess.PERMISSION_EDIT], []string{
 		dashboards.ActionDashboardsCreate,
 		dashboards.ActionFoldersRead,
 		dashboards.ActionFoldersWrite,
 		dashboards.ActionFoldersDelete,
 	}...),
-	dashboards.PERMISSION_ADMIN: append(dashboardPermissionTranslation[dashboards.PERMISSION_ADMIN], []string{
+	dashboardaccess.PERMISSION_ADMIN: append(dashboardPermissionTranslation[dashboardaccess.PERMISSION_ADMIN], []string{
 		dashboards.ActionFoldersRead,
 		dashboards.ActionFoldersWrite,
 		dashboards.ActionFoldersDelete,
@@ -111,11 +112,11 @@ func (m dashboardPermissionsMigrator) migratePermissions(dashes []dashboard, acl
 		if (d.IsFolder || d.FolderID == 0) && len(acls) == 0 && !d.HasAcl {
 			permissionMap[d.OrgID]["managed:builtins:editor:permissions"] = append(
 				permissionMap[d.OrgID]["managed:builtins:editor:permissions"],
-				m.mapPermission(d.ID, dashboards.PERMISSION_EDIT, d.IsFolder)...,
+				m.mapPermission(d.ID, dashboardaccess.PERMISSION_EDIT, d.IsFolder)...,
 			)
 			permissionMap[d.OrgID]["managed:builtins:viewer:permissions"] = append(
 				permissionMap[d.OrgID]["managed:builtins:viewer:permissions"],
-				m.mapPermission(d.ID, dashboards.PERMISSION_VIEW, d.IsFolder)...,
+				m.mapPermission(d.ID, dashboardaccess.PERMISSION_VIEW, d.IsFolder)...,
 			)
 		} else {
 			for _, a := range deduplicateAcl(acls) {
@@ -192,7 +193,7 @@ func (m dashboardPermissionsMigrator) setPermissions(allRoles []*ac.Role, permis
 	return nil
 }
 
-func (m dashboardPermissionsMigrator) mapPermission(id int64, p dashboards.PermissionType, isFolder bool) []*ac.Permission {
+func (m dashboardPermissionsMigrator) mapPermission(id int64, p dashboardaccess.PermissionType, isFolder bool) []*ac.Permission {
 	if isFolder {
 		actions := folderPermissionTranslation[p]
 		scope := dashboards.ScopeFoldersProvider.GetResourceScope(strconv.FormatInt(id, 10))
@@ -660,16 +661,198 @@ func (m *managedFolderLibraryPanelActionsMigrator) Exec(sess *xorm.Session, mg *
 	return nil
 }
 
+const ManagedDashboardAnnotationActionsMigratorID = "managed dashboard permissions annotation actions migration"
+
+func AddManagedDashboardAnnotationActionsMigration(mg *migrator.Migrator) {
+	mg.AddMigration(ManagedDashboardAnnotationActionsMigratorID, &managedDashboardAnnotationActionsMigrator{})
+}
+
+type managedDashboardAnnotationActionsMigrator struct {
+	migrator.MigrationBase
+}
+
+func (m *managedDashboardAnnotationActionsMigrator) SQL(dialect migrator.Dialect) string {
+	return CodeMigrationSQL
+}
+
+func (m *managedDashboardAnnotationActionsMigrator) Exec(sess *xorm.Session, mg *migrator.Migrator) error {
+	// Check if roles have been populated and return early if they haven't - this avoids logging a warning from hasDefaultAnnotationPermissions
+	roleCount := 0
+	_, err := sess.SQL(`SELECT COUNT( DISTINCT r.uid ) FROM role AS r INNER JOIN permission AS p ON r.id = p.role_id WHERE r.uid IN (?, ?, ?)`, "basic_viewer", "basic_editor", "basic_admin").Get(&roleCount)
+	if err != nil {
+		return fmt.Errorf("failed to check if basic roles have been populated: %w", err)
+	}
+	// Role count will be 0 either for new Grafana installations (in that case no managed roles will exist either, and the next conditional will return nil)
+	// or for OSS instances, for which basic role permissions can't be changed, so we don't need to run the default permission check in that case.
+	if roleCount != 0 {
+		// Check that default annotation permissions are assigned to basic roles. If that is not the case, skip the migration.
+		if hasDefaultPerms, err := m.hasDefaultAnnotationPermissions(sess, mg); err != nil || !hasDefaultPerms {
+			return err
+		}
+	}
+
+	var ids []any
+	if err := sess.SQL("SELECT id FROM role WHERE name LIKE 'managed:%'").Find(&ids); err != nil {
+		return err
+	}
+
+	if len(ids) == 0 {
+		return nil
+	}
+
+	var permissions []ac.Permission
+	roleQueryBatchSize := 100
+	err = batch(len(ids), roleQueryBatchSize, func(start, end int) error {
+		var batchPermissions []ac.Permission
+		if err := sess.SQL("SELECT role_id, action, scope FROM permission WHERE role_id IN(?"+strings.Repeat(" ,?", len(ids[start:end])-1)+") AND (scope LIKE 'folders:%' or scope LIKE 'dashboards:%')", ids[start:end]...).Find(&batchPermissions); err != nil {
+			return err
+		}
+		permissions = append(permissions, batchPermissions...)
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	mapped := make(map[int64]map[string]map[string]bool, len(ids)-1)
+	for _, p := range permissions {
+		if mapped[p.RoleID] == nil {
+			mapped[p.RoleID] = make(map[string]map[string]bool)
+		}
+		if mapped[p.RoleID][p.Scope] == nil {
+			mapped[p.RoleID][p.Scope] = make(map[string]bool)
+		}
+		mapped[p.RoleID][p.Scope][p.Action] = true
+	}
+
+	var toAdd []ac.Permission
+	now := time.Now()
+
+	for roleId, mappedPermissions := range mapped {
+		for scope, roleActions := range mappedPermissions {
+			// Create a temporary permission to split the scope into kind, attribute and identifier
+			tempPerm := ac.Permission{
+				Scope: scope,
+			}
+			kind, attribute, identifier := tempPerm.SplitScope()
+			if roleActions[dashboards.ActionDashboardsRead] {
+				if !roleActions[ac.ActionAnnotationsRead] {
+					toAdd = append(toAdd, ac.Permission{
+						RoleID:     roleId,
+						Updated:    now,
+						Created:    now,
+						Scope:      scope,
+						Action:     ac.ActionAnnotationsRead,
+						Kind:       kind,
+						Attribute:  attribute,
+						Identifier: identifier,
+					})
+				}
+			}
+
+			if roleActions[dashboards.ActionDashboardsWrite] {
+				if !roleActions[ac.ActionAnnotationsCreate] {
+					toAdd = append(toAdd, ac.Permission{
+						RoleID:     roleId,
+						Updated:    now,
+						Created:    now,
+						Scope:      scope,
+						Action:     ac.ActionAnnotationsCreate,
+						Kind:       kind,
+						Attribute:  attribute,
+						Identifier: identifier,
+					})
+				}
+				if !roleActions[ac.ActionAnnotationsDelete] {
+					toAdd = append(toAdd, ac.Permission{
+						RoleID:     roleId,
+						Updated:    now,
+						Created:    now,
+						Scope:      scope,
+						Action:     ac.ActionAnnotationsDelete,
+						Kind:       kind,
+						Attribute:  attribute,
+						Identifier: identifier,
+					})
+				}
+				if !roleActions[ac.ActionAnnotationsWrite] {
+					toAdd = append(toAdd, ac.Permission{
+						RoleID:     roleId,
+						Updated:    now,
+						Created:    now,
+						Scope:      scope,
+						Action:     ac.ActionAnnotationsWrite,
+						Kind:       kind,
+						Attribute:  attribute,
+						Identifier: identifier,
+					})
+				}
+			}
+		}
+	}
+
+	if len(toAdd) == 0 {
+		return nil
+	}
+
+	return batch(len(toAdd), batchSize, func(start, end int) error {
+		_, err := sess.InsertMulti(toAdd[start:end])
+		return err
+	})
+}
+
+func (m *managedDashboardAnnotationActionsMigrator) hasDefaultAnnotationPermissions(sess *xorm.Session, mg *migrator.Migrator) (bool, error) {
+	type basicRolePermission struct {
+		Uid    string
+		Action string
+		Scope  string
+	}
+
+	var basicRolePermissions []basicRolePermission
+	basicRoleUIDs := []any{"basic_viewer", "basic_editor", "basic_admin"}
+	query := `SELECT r.uid, p.action, p.scope FROM role r
+LEFT OUTER JOIN permission p ON p.role_id = r.id
+WHERE r.uid IN (?, ?, ?) AND p.action LIKE 'annotations:%' AND p.scope IN ('*', 'annotations:*', 'annotations:type:*', 'annotations:type:dashboard')
+`
+	if err := sess.SQL(query, basicRoleUIDs...).Find(&basicRolePermissions); err != nil {
+		return false, fmt.Errorf("failed to list basic role permissions: %w", err)
+	}
+
+	mappedBasicRolePerms := make(map[string]map[string]bool, 0)
+	for _, p := range basicRolePermissions {
+		if mappedBasicRolePerms[p.Uid] == nil {
+			mappedBasicRolePerms[p.Uid] = make(map[string]bool)
+		}
+		mappedBasicRolePerms[p.Uid][p.Action] = true
+	}
+
+	expectedAnnotationActions := []string{ac.ActionAnnotationsRead, ac.ActionAnnotationsCreate, ac.ActionAnnotationsDelete, ac.ActionAnnotationsWrite}
+
+	for _, uid := range basicRoleUIDs {
+		if mappedBasicRolePerms[uid.(string)] == nil {
+			mg.Logger.Warn("basic role permissions missing annotation permissions, skipping annotation permission migration", "uid", uid)
+			return false, nil
+		}
+		for _, action := range expectedAnnotationActions {
+			if !mappedBasicRolePerms[uid.(string)][action] {
+				mg.Logger.Warn("basic role permissions missing annotation permissions, skipping annotation permission migration", "uid", uid, "action", action)
+				return false, nil
+			}
+		}
+	}
+	return true, nil
+}
+
 func hasFolderAdmin(permissions []ac.Permission) bool {
-	return hasActions(folderPermissionTranslation[dashboards.PERMISSION_ADMIN], permissions)
+	return hasActions(folderPermissionTranslation[dashboardaccess.PERMISSION_ADMIN], permissions)
 }
 
 func hasFolderEdit(permissions []ac.Permission) bool {
-	return hasActions(folderPermissionTranslation[dashboards.PERMISSION_EDIT], permissions)
+	return hasActions(folderPermissionTranslation[dashboardaccess.PERMISSION_EDIT], permissions)
 }
 
 func hasFolderView(permissions []ac.Permission) bool {
-	return hasActions(folderPermissionTranslation[dashboards.PERMISSION_VIEW], permissions)
+	return hasActions(folderPermissionTranslation[dashboardaccess.PERMISSION_VIEW], permissions)
 }
 
 func hasActions(actions []string, permissions []ac.Permission) bool {
diff --git a/pkg/services/sqlstore/migrations/accesscontrol/migrations.go b/pkg/services/sqlstore/migrations/accesscontrol/migrations.go
index a7819085f718b..da3c021dee06c 100644
--- a/pkg/services/sqlstore/migrations/accesscontrol/migrations.go
+++ b/pkg/services/sqlstore/migrations/accesscontrol/migrations.go
@@ -186,4 +186,14 @@ func AddMigration(mg *migrator.Migrator) {
 	mg.AddMigration("add permission identifier index", migrator.NewAddIndexMigration(permissionV1, &migrator.Index{
 		Cols: []string{"identifier"},
 	}))
+
+	mg.AddMigration("add permission action scope role_id index", migrator.NewAddIndexMigration(permissionV1, &migrator.Index{
+		Type: migrator.UniqueIndex,
+		Cols: []string{"action", "scope", "role_id"},
+	}))
+
+	mg.AddMigration("remove permission role_id action scope index", migrator.NewDropIndexMigration(permissionV1, &migrator.Index{
+		Type: migrator.UniqueIndex,
+		Cols: []string{"role_id", "action", "scope"},
+	}))
 }
diff --git a/pkg/services/sqlstore/migrations/accesscontrol/scope_migrator.go b/pkg/services/sqlstore/migrations/accesscontrol/scope_migrator.go
new file mode 100644
index 0000000000000..18af932028022
--- /dev/null
+++ b/pkg/services/sqlstore/migrations/accesscontrol/scope_migrator.go
@@ -0,0 +1,33 @@
+package accesscontrol
+
+import (
+	"xorm.io/xorm"
+
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+)
+
+const (
+	AlertingScopeRemovalMigrationID = "removing scope from alert.instances:read action migration"
+)
+
+func AddAlertingScopeRemovalMigration(mg *migrator.Migrator) {
+	mg.AddMigration(AlertingScopeRemovalMigrationID, &alertingScopeRemovalMigrator{})
+}
+
+var _ migrator.CodeMigration = new(alertingScopeRemovalMigrator)
+
+type alertingScopeRemovalMigrator struct {
+	permissionMigrator
+}
+
+func (p *alertingScopeRemovalMigrator) SQL(dialect migrator.Dialect) string {
+	return CodeMigrationSQL
+}
+
+func (p *alertingScopeRemovalMigrator) Exec(sess *xorm.Session, migrator *migrator.Migrator) error {
+	p.sess = sess
+	p.dialect = migrator.Dialect
+	_, err := p.sess.Exec("UPDATE permission SET `scope` = '', `kind` = '', `attribute` = '', `identifier` = '' WHERE action = ?", accesscontrol.ActionAlertingInstanceRead)
+	return err
+}
diff --git a/pkg/services/sqlstore/migrations/accesscontrol/seed_assignment.go b/pkg/services/sqlstore/migrations/accesscontrol/seed_assignment.go
index 7f6ce47e8e439..c6307ce9f75cd 100644
--- a/pkg/services/sqlstore/migrations/accesscontrol/seed_assignment.go
+++ b/pkg/services/sqlstore/migrations/accesscontrol/seed_assignment.go
@@ -6,6 +6,8 @@ import (
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 )
 
+const PreventSeedingOnCallAccessID = "prevent seeding OnCall access"
+
 const migSQLITERoleNameNullable = `ALTER TABLE seed_assignment ADD COLUMN tmp_role_name VARCHAR(190) DEFAULT NULL;
 UPDATE seed_assignment SET tmp_role_name = role_name;
 ALTER TABLE seed_assignment DROP COLUMN role_name;
@@ -41,6 +43,13 @@ func AddSeedAssignmentMigrations(mg *migrator.Migrator) {
 			&migrator.Index{Cols: []string{"builtin_role", "action", "scope"}, Type: migrator.UniqueIndex}))
 
 	mg.AddMigration("add primary key to seed_assigment", &seedAssignmentPrimaryKeyMigrator{})
+
+	mg.AddMigration("add origin column to seed_assignment",
+		migrator.NewAddColumnMigration(seedAssignmentTable,
+			&migrator.Column{Name: "origin", Type: migrator.DB_Varchar, Length: 190, Nullable: true}))
+
+	mg.AddMigration("add origin to plugin seed_assignment", &seedAssignmentOnCallMigrator{})
+	mg.AddMigration(PreventSeedingOnCallAccessID, &SeedAssignmentOnCallAccessMigrator{})
 }
 
 type seedAssignmentPrimaryKeyMigrator struct {
@@ -119,3 +128,77 @@ func (m *seedAssignmentPrimaryKeyMigrator) Exec(sess *xorm.Session, mig *migrato
 
 	return nil
 }
+
+type seedAssignmentOnCallMigrator struct {
+	migrator.MigrationBase
+}
+
+func (m *seedAssignmentOnCallMigrator) SQL(dialect migrator.Dialect) string {
+	return CodeMigrationSQL
+}
+
+func (m *seedAssignmentOnCallMigrator) Exec(sess *xorm.Session, mig *migrator.Migrator) error {
+	_, err := sess.Exec(
+		`UPDATE seed_assignment SET origin = ? WHERE action LIKE ? OR scope = ?`,
+		"grafana-oncall-app",
+		"grafana-oncall-app%",
+		"plugins:id:grafana-oncall-app",
+	)
+	return err
+}
+
+type SeedAssignmentOnCallAccessMigrator struct {
+	migrator.MigrationBase
+}
+
+func (m *SeedAssignmentOnCallAccessMigrator) SQL(dialect migrator.Dialect) string {
+	return CodeMigrationSQL
+}
+
+func (m *SeedAssignmentOnCallAccessMigrator) Exec(sess *xorm.Session, mig *migrator.Migrator) error {
+	// Check if the migration is necessary
+	hasEntry := 0
+	if _, err := sess.SQL(`SELECT 1 FROM seed_assignment LIMIT 1`).Get(&hasEntry); err != nil {
+		return err
+	}
+	if hasEntry == 0 {
+		// Skip migration the seed assignment table has not been populated
+		// Hence the oncall access permission can be granted without any risk
+		return nil
+	}
+
+	// Check if the permission has not already been seeded
+	// This is the case for instances that activated the accessControlOnCall feature already.
+	type SeedAssignment struct {
+		BuiltinRole, Action, Scope, Origin string
+	}
+	assigns := []SeedAssignment{}
+	err := sess.SQL(`SELECT builtin_role, action, scope, origin FROM seed_assignment WHERE action = ? AND scope = ?`,
+		"plugins.app:access", "plugins:id:grafana-oncall-app").
+		Find(&assigns)
+	if err != nil {
+		return err
+	}
+
+	basicRoles := map[string]bool{"Viewer": true, "Editor": true, "Admin": true, "Grafana Admin": true}
+	for i := range assigns {
+		delete(basicRoles, assigns[i].BuiltinRole)
+	}
+	if len(basicRoles) == 0 {
+		return nil
+	}
+
+	// By default, basic roles have access to all app plugins; no need for extra permission.
+	// Mark OnCall Access permission as already seeded to prevent it from being added to basic roles.
+	toSeed := []SeedAssignment{}
+	for br := range basicRoles {
+		toSeed = append(toSeed, SeedAssignment{
+			BuiltinRole: br,
+			Action:      "plugins.app:access",
+			Scope:       "plugins:id:grafana-oncall-app",
+			Origin:      "grafana-oncall-app",
+		})
+	}
+	_, err = sess.Table("seed_assignment").InsertMulti(&toSeed)
+	return err
+}
diff --git a/pkg/services/sqlstore/migrations/accesscontrol/team_membership.go b/pkg/services/sqlstore/migrations/accesscontrol/team_membership.go
index c2252b17860d6..aa3e108048ec6 100644
--- a/pkg/services/sqlstore/migrations/accesscontrol/team_membership.go
+++ b/pkg/services/sqlstore/migrations/accesscontrol/team_membership.go
@@ -8,7 +8,7 @@ import (
 	"xorm.io/xorm"
 
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 	"github.com/grafana/grafana/pkg/services/team"
@@ -64,12 +64,12 @@ func (p *teamPermissionMigrator) setRolePermissions(roleID int64, permissions []
 }
 
 // mapPermissionToRBAC translates the legacy membership (Member or Admin) into RBAC permissions
-func (p *teamPermissionMigrator) mapPermissionToRBAC(permission dashboards.PermissionType, teamID int64) []accesscontrol.Permission {
+func (p *teamPermissionMigrator) mapPermissionToRBAC(permission dashboardaccess.PermissionType, teamID int64) []accesscontrol.Permission {
 	teamIDScope := accesscontrol.Scope("teams", "id", strconv.FormatInt(teamID, 10))
 	switch permission {
 	case 0:
 		return []accesscontrol.Permission{{Action: "teams:read", Scope: teamIDScope}}
-	case dashboards.PERMISSION_ADMIN:
+	case dashboardaccess.PERMISSION_ADMIN:
 		return []accesscontrol.Permission{
 			{Action: "teams:delete", Scope: teamIDScope},
 			{Action: "teams:read", Scope: teamIDScope},
@@ -210,7 +210,7 @@ func (p *teamPermissionMigrator) generateAssociatedPermissions(teamMemberships [
 		// Downgrade team permissions if needed:
 		// only admins or editors (when editorsCanAdmin option is enabled)
 		// can access team administration endpoints
-		if m.Permission == dashboards.PERMISSION_ADMIN {
+		if m.Permission == dashboardaccess.PERMISSION_ADMIN {
 			if userRolesByOrg[m.OrgID][m.UserID] == string(org.RoleViewer) || (userRolesByOrg[m.OrgID][m.UserID] == string(org.RoleEditor) && !p.editorsCanAdmin) {
 				m.Permission = 0
 
diff --git a/pkg/services/sqlstore/migrations/accesscontrol/test/ac_test.go b/pkg/services/sqlstore/migrations/accesscontrol/test/ac_test.go
index abcf5548625b6..f145a5b7b650c 100644
--- a/pkg/services/sqlstore/migrations/accesscontrol/test/ac_test.go
+++ b/pkg/services/sqlstore/migrations/accesscontrol/test/ac_test.go
@@ -2,7 +2,6 @@ package test
 
 import (
 	"fmt"
-	"os"
 	"testing"
 	"time"
 
@@ -13,7 +12,8 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrations"
 	acmig "github.com/grafana/grafana/pkg/services/sqlstore/migrations/accesscontrol"
@@ -45,6 +45,7 @@ var (
 	users = []user.User{
 		{
 			ID:      1,
+			UID:     "u1",
 			Email:   "viewer1@example.org",
 			Name:    "viewer1",
 			Login:   "viewer1",
@@ -54,6 +55,7 @@ var (
 		},
 		{
 			ID:      2,
+			UID:     "u2",
 			Email:   "viewer2@example.org",
 			Name:    "viewer2",
 			Login:   "viewer2",
@@ -63,6 +65,7 @@ var (
 		},
 		{
 			ID:      3,
+			UID:     "u3",
 			Email:   "editor1@example.org",
 			Name:    "editor1",
 			Login:   "editor1",
@@ -72,6 +75,7 @@ var (
 		},
 		{
 			ID:      4,
+			UID:     "u4",
 			Email:   "admin1@example.org",
 			Name:    "admin1",
 			Login:   "admin1",
@@ -81,6 +85,7 @@ var (
 		},
 		{
 			ID:      5,
+			UID:     "u5",
 			Email:   "editor2@example.org",
 			Name:    "editor2",
 			Login:   "editor2",
@@ -99,37 +104,6 @@ func convertToRawPermissions(permissions []accesscontrol.Permission) []rawPermis
 	return raw
 }
 
-func getDBType() string {
-	dbType := migrator.SQLite
-
-	// environment variable present for test db?
-	if db, present := os.LookupEnv("GRAFANA_TEST_DB"); present {
-		dbType = db
-	}
-	return dbType
-}
-
-func getTestDB(t *testing.T, dbType string) sqlutil.TestDB {
-	switch dbType {
-	case "mysql":
-		return sqlutil.MySQLTestDB()
-	case "postgres":
-		return sqlutil.PostgresTestDB()
-	default:
-		f, err := os.CreateTemp(".", "grafana-test-db-")
-		require.NoError(t, err)
-		t.Cleanup(func() {
-			err := os.Remove(f.Name())
-			require.NoError(t, err)
-		})
-
-		return sqlutil.TestDB{
-			DriverName: "sqlite3",
-			ConnStr:    f.Name(),
-		}
-	}
-}
-
 func TestMigrations(t *testing.T) {
 	// Run initial migration to have a working DB
 	x := setupTestDB(t)
@@ -152,9 +126,8 @@ func TestMigrations(t *testing.T) {
 		{
 			desc: "with editors can admin",
 			config: &setting.Cfg{
-				EditorsCanAdmin:        true,
-				IsFeatureToggleEnabled: func(key string) bool { return key == "accesscontrol" },
-				Raw:                    ini.Empty(),
+				EditorsCanAdmin: true,
+				Raw:             ini.Empty(),
 			},
 			expectedRolePerms: map[string][]rawPermission{
 				"managed:users:1:permissions": {{Action: "teams:read", Scope: team1Scope}},
@@ -181,10 +154,8 @@ func TestMigrations(t *testing.T) {
 		},
 		{
 			desc: "without editors can admin",
-			config: &setting.Cfg{
-				IsFeatureToggleEnabled: func(key string) bool { return key == "accesscontrol" },
-				Raw:                    ini.Empty(),
-			},
+			// nolint:staticcheck
+			config: setting.NewCfgWithFeatures(featuremgmt.WithFeatures("accesscontrol").IsEnabledGlobally),
 			expectedRolePerms: map[string][]rawPermission{
 				"managed:users:1:permissions": {{Action: "teams:read", Scope: team1Scope}},
 				"managed:users:2:permissions": {{Action: "teams:read", Scope: team1Scope}},
@@ -250,12 +221,21 @@ func TestMigrations(t *testing.T) {
 
 func setupTestDB(t *testing.T) *xorm.Engine {
 	t.Helper()
-	dbType := getDBType()
-	testDB := getTestDB(t, dbType)
+	dbType := sqlutil.GetTestDBType()
+	testDB, err := sqlutil.GetTestDB(dbType)
+	require.NoError(t, err)
+
+	t.Cleanup(testDB.Cleanup)
 
 	x, err := xorm.NewEngine(testDB.DriverName, testDB.ConnStr)
 	require.NoError(t, err)
 
+	t.Cleanup(func() {
+		if err := x.Close(); err != nil {
+			fmt.Printf("failed to close xorm engine: %v", err)
+		}
+	})
+
 	err = migrator.NewDialect(x.DriverName()).CleanDB(x)
 	require.NoError(t, err)
 
@@ -358,7 +338,7 @@ func setupTeams(t *testing.T, x *xorm.Engine) {
 			TeamID:     1,
 			UserID:     2,
 			External:   false,
-			Permission: dashboards.PERMISSION_ADMIN,
+			Permission: dashboardaccess.PERMISSION_ADMIN,
 			Created:    now,
 			Updated:    now,
 		},
@@ -368,7 +348,7 @@ func setupTeams(t *testing.T, x *xorm.Engine) {
 			TeamID:     1,
 			UserID:     3,
 			External:   false,
-			Permission: dashboards.PERMISSION_ADMIN,
+			Permission: dashboardaccess.PERMISSION_ADMIN,
 			Created:    now,
 			Updated:    now,
 		},
@@ -378,7 +358,7 @@ func setupTeams(t *testing.T, x *xorm.Engine) {
 			TeamID:     1,
 			UserID:     4,
 			External:   false,
-			Permission: dashboards.PERMISSION_ADMIN,
+			Permission: dashboardaccess.PERMISSION_ADMIN,
 			Created:    now,
 			Updated:    now,
 		},
diff --git a/pkg/services/sqlstore/migrations/accesscontrol/test/dashbord_permission_migrator_test.go b/pkg/services/sqlstore/migrations/accesscontrol/test/dashbord_permission_migrator_test.go
new file mode 100644
index 0000000000000..935977ebc59da
--- /dev/null
+++ b/pkg/services/sqlstore/migrations/accesscontrol/test/dashbord_permission_migrator_test.go
@@ -0,0 +1,335 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/dashboards"
+	acmig "github.com/grafana/grafana/pkg/services/sqlstore/migrations/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+type testCase struct {
+	desc          string
+	putRolePerms  map[int64]map[string][]rawPermission
+	wantRolePerms map[int64]map[string][]rawPermission
+}
+
+func testCases() []testCase {
+	allAnnotationPermissions := []rawPermission{
+		{Action: accesscontrol.ActionAnnotationsRead, Scope: accesscontrol.ScopeAnnotationsTypeDashboard},
+		{Action: accesscontrol.ActionAnnotationsCreate, Scope: accesscontrol.ScopeAnnotationsTypeDashboard},
+		{Action: accesscontrol.ActionAnnotationsDelete, Scope: accesscontrol.ScopeAnnotationsTypeDashboard},
+		{Action: accesscontrol.ActionAnnotationsWrite, Scope: accesscontrol.ScopeAnnotationsTypeDashboard},
+	}
+
+	onlyOrgAnnotations := []rawPermission{
+		{Action: accesscontrol.ActionAnnotationsRead, Scope: accesscontrol.ScopeAnnotationsTypeOrganization},
+		{Action: accesscontrol.ActionAnnotationsCreate, Scope: accesscontrol.ScopeAnnotationsTypeOrganization},
+		{Action: accesscontrol.ActionAnnotationsDelete, Scope: accesscontrol.ScopeAnnotationsTypeOrganization},
+		{Action: accesscontrol.ActionAnnotationsWrite, Scope: accesscontrol.ScopeAnnotationsTypeOrganization},
+	}
+
+	wildcardAnnotationPermissions := []rawPermission{
+		{Action: accesscontrol.ActionAnnotationsRead, Scope: "*"},
+		{Action: accesscontrol.ActionAnnotationsCreate, Scope: "annotations:*"},
+		{Action: accesscontrol.ActionAnnotationsDelete, Scope: "annotations:type:*"},
+		{Action: accesscontrol.ActionAnnotationsWrite, Scope: accesscontrol.ScopeAnnotationsAll},
+	}
+
+	return []testCase{
+		{
+			desc:          "empty permissions lead to empty permissions",
+			putRolePerms:  map[int64]map[string][]rawPermission{},
+			wantRolePerms: map[int64]map[string][]rawPermission{},
+		},
+		{
+			desc: "adds new permissions for instances without basic roles (should only be OSS instances)",
+			putRolePerms: map[int64]map[string][]rawPermission{
+				1: {
+					"managed:users:1:permissions": {{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:test"}},
+				},
+			},
+			wantRolePerms: map[int64]map[string][]rawPermission{
+				1: {
+					"managed:users:1:permissions": {
+						{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:test"},
+						{Action: accesscontrol.ActionAnnotationsRead, Scope: "dashboards:uid:test"},
+					},
+				},
+			},
+		},
+		{
+			desc: "doesn't add any new permissions if has default annotation permissions on basic roles but no dashboard or folder permissions",
+			putRolePerms: map[int64]map[string][]rawPermission{
+				1: {
+					"basic:viewer": allAnnotationPermissions,
+					"basic:editor": allAnnotationPermissions,
+					"basic:admin":  allAnnotationPermissions,
+				},
+			},
+			wantRolePerms: map[int64]map[string][]rawPermission{
+				1: {
+					"basic:viewer": allAnnotationPermissions,
+					"basic:editor": allAnnotationPermissions,
+					"basic:admin":  allAnnotationPermissions,
+				},
+			},
+		},
+		{
+			desc: "adds new permissions if has default annotation permissions on basic roles and dashboard read permissions",
+			putRolePerms: map[int64]map[string][]rawPermission{
+				1: {
+					"basic:viewer":                allAnnotationPermissions,
+					"basic:editor":                allAnnotationPermissions,
+					"basic:admin":                 allAnnotationPermissions,
+					"managed:users:1:permissions": {{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:test"}},
+				},
+			},
+			wantRolePerms: map[int64]map[string][]rawPermission{
+				1: {
+					"basic:viewer": allAnnotationPermissions,
+					"basic:editor": allAnnotationPermissions,
+					"basic:admin":  allAnnotationPermissions,
+					"managed:users:1:permissions": {
+						{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:test"},
+						{Action: accesscontrol.ActionAnnotationsRead, Scope: "dashboards:uid:test"},
+					},
+				},
+			},
+		},
+		{
+			desc: "adds new permissions if has default annotation permissions on basic roles and dashboard write permissions",
+			putRolePerms: map[int64]map[string][]rawPermission{
+				1: {
+					"basic:viewer": allAnnotationPermissions,
+					"basic:editor": allAnnotationPermissions,
+					"basic:admin":  allAnnotationPermissions,
+					"managed:users:1:permissions": {
+						{Action: dashboards.ActionDashboardsWrite, Scope: "dashboards:uid:test"},
+						{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:test"},
+					},
+				},
+			},
+			wantRolePerms: map[int64]map[string][]rawPermission{
+				1: {
+					"basic:viewer": allAnnotationPermissions,
+					"basic:editor": allAnnotationPermissions,
+					"basic:admin":  allAnnotationPermissions,
+					"managed:users:1:permissions": {
+						{Action: dashboards.ActionDashboardsWrite, Scope: "dashboards:uid:test"},
+						{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:test"},
+						{Action: accesscontrol.ActionAnnotationsRead, Scope: "dashboards:uid:test"},
+						{Action: accesscontrol.ActionAnnotationsWrite, Scope: "dashboards:uid:test"},
+						{Action: accesscontrol.ActionAnnotationsDelete, Scope: "dashboards:uid:test"},
+						{Action: accesscontrol.ActionAnnotationsCreate, Scope: "dashboards:uid:test"},
+					},
+				},
+			},
+		},
+		{
+			desc: "adds new permissions if has default annotation permissions on basic roles and folder read permissions",
+			putRolePerms: map[int64]map[string][]rawPermission{
+				1: {
+					"basic:viewer":                allAnnotationPermissions,
+					"basic:editor":                allAnnotationPermissions,
+					"basic:admin":                 allAnnotationPermissions,
+					"managed:users:1:permissions": {{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:test"}},
+				},
+			},
+			wantRolePerms: map[int64]map[string][]rawPermission{
+				1: {
+					"basic:viewer": allAnnotationPermissions,
+					"basic:editor": allAnnotationPermissions,
+					"basic:admin":  allAnnotationPermissions,
+					"managed:users:1:permissions": {
+						{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:test"},
+						{Action: accesscontrol.ActionAnnotationsRead, Scope: "folders:uid:test"},
+					},
+				},
+			},
+		},
+		{
+			desc: "adds new permissions if has default annotation permissions on basic roles and folder write permissions",
+			putRolePerms: map[int64]map[string][]rawPermission{
+				1: {
+					"basic:viewer": allAnnotationPermissions,
+					"basic:editor": allAnnotationPermissions,
+					"basic:admin":  allAnnotationPermissions,
+					"managed:users:1:permissions": {
+						{Action: dashboards.ActionDashboardsWrite, Scope: "folders:uid:test"},
+						{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:test"},
+					},
+				},
+			},
+			wantRolePerms: map[int64]map[string][]rawPermission{
+				1: {
+					"basic:viewer": allAnnotationPermissions,
+					"basic:editor": allAnnotationPermissions,
+					"basic:admin":  allAnnotationPermissions,
+					"managed:users:1:permissions": {
+						{Action: dashboards.ActionDashboardsWrite, Scope: "folders:uid:test"},
+						{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:test"},
+						{Action: accesscontrol.ActionAnnotationsRead, Scope: "folders:uid:test"},
+						{Action: accesscontrol.ActionAnnotationsWrite, Scope: "folders:uid:test"},
+						{Action: accesscontrol.ActionAnnotationsDelete, Scope: "folders:uid:test"},
+						{Action: accesscontrol.ActionAnnotationsCreate, Scope: "folders:uid:test"},
+					},
+				},
+			},
+		},
+		{
+			desc: "adds new permissions to several managed roles if has default annotation permissions on basic roles and dashboard read permissions",
+			putRolePerms: map[int64]map[string][]rawPermission{
+				1: {
+					"basic:viewer":                allAnnotationPermissions,
+					"basic:editor":                allAnnotationPermissions,
+					"basic:admin":                 allAnnotationPermissions,
+					"managed:users:1:permissions": {{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:test"}},
+					"managed:teams:1:permissions": {{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:test2"}},
+				},
+			},
+			wantRolePerms: map[int64]map[string][]rawPermission{
+				1: {
+					"basic:viewer": allAnnotationPermissions,
+					"basic:editor": allAnnotationPermissions,
+					"basic:admin":  allAnnotationPermissions,
+					"managed:users:1:permissions": {
+						{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:test"},
+						{Action: accesscontrol.ActionAnnotationsRead, Scope: "dashboards:uid:test"},
+					},
+					"managed:teams:1:permissions": {
+						{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:test2"},
+						{Action: accesscontrol.ActionAnnotationsRead, Scope: "dashboards:uid:test2"},
+					},
+				},
+			},
+		},
+		{
+			desc: "doesn't add any new permissions if annotation permissions are missing from the basic roles",
+			putRolePerms: map[int64]map[string][]rawPermission{
+				1: {
+					"basic:editor": allAnnotationPermissions,
+					"basic:admin":  allAnnotationPermissions,
+					"managed:users:1:permissions": {
+						{Action: dashboards.ActionDashboardsWrite, Scope: "dashboards:uid:test"},
+						{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:test"},
+					},
+				},
+			},
+			wantRolePerms: map[int64]map[string][]rawPermission{
+				1: {
+					"basic:editor": allAnnotationPermissions,
+					"basic:admin":  allAnnotationPermissions,
+				},
+			},
+		},
+		{
+			desc: "doesn't add any new permissions if annotation permissions from the basic roles don't have the dashboard scope",
+			putRolePerms: map[int64]map[string][]rawPermission{
+				1: {
+					"basic:viewer": onlyOrgAnnotations,
+					"basic:editor": allAnnotationPermissions,
+					"basic:admin":  allAnnotationPermissions,
+					"managed:users:1:permissions": {
+						{Action: dashboards.ActionDashboardsWrite, Scope: "dashboards:uid:test"},
+						{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:test"},
+					},
+				},
+			},
+			wantRolePerms: map[int64]map[string][]rawPermission{
+				1: {
+					"basic:viewer": onlyOrgAnnotations,
+					"basic:editor": allAnnotationPermissions,
+					"basic:admin":  allAnnotationPermissions,
+				},
+			},
+		},
+		{
+			desc: "adds new permissions if has default annotation permissions with different wildcard scopes",
+			putRolePerms: map[int64]map[string][]rawPermission{
+				1: {
+					"basic:viewer":                wildcardAnnotationPermissions,
+					"basic:editor":                wildcardAnnotationPermissions,
+					"basic:admin":                 wildcardAnnotationPermissions,
+					"managed:users:1:permissions": {{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:test"}},
+				},
+			},
+			wantRolePerms: map[int64]map[string][]rawPermission{
+				1: {
+					"basic:viewer": wildcardAnnotationPermissions,
+					"basic:editor": wildcardAnnotationPermissions,
+					"basic:admin":  wildcardAnnotationPermissions,
+					"managed:users:1:permissions": {
+						{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:test"},
+						{Action: accesscontrol.ActionAnnotationsRead, Scope: "dashboards:uid:test"},
+					},
+				},
+			},
+		},
+	}
+}
+
+func TestAnnotationActionMigration(t *testing.T) {
+	// Run initial migration to have a working DB
+	x := setupTestDB(t)
+
+	for _, tc := range testCases() {
+		t.Run(tc.desc, func(t *testing.T) {
+			// Remove migration
+			_, errDeleteMig := x.Exec(`DELETE FROM migration_log WHERE migration_id LIKE ?`, acmig.ManagedDashboardAnnotationActionsMigratorID)
+			require.NoError(t, errDeleteMig)
+			_, errDeletePerm := x.Exec(`DELETE FROM permission`)
+			require.NoError(t, errDeletePerm)
+			_, errDeleteRole := x.Exec(`DELETE FROM role`)
+			require.NoError(t, errDeleteRole)
+
+			// Test running the migrations twice to make sure they don't conflict
+			for i := 0; i < 2; i++ {
+				if i == 0 {
+					// put permissions
+					putTestPermissions(t, x, tc.putRolePerms)
+				}
+
+				// Run accesscontrol migration (permissions insertion should not have conflicted)
+				acmigrator := migrator.NewMigrator(x, &setting.Cfg{Logger: log.New("acmigration.test")})
+				acmig.AddManagedDashboardAnnotationActionsMigration(acmigrator)
+
+				errRunningMig := acmigrator.Start(false, 0)
+				require.NoError(t, errRunningMig)
+
+				// verify got == want
+				for orgID, roles := range tc.wantRolePerms {
+					for roleName := range roles {
+						// Check managed roles exist
+						role := accesscontrol.Role{}
+						hasRole, errRoleSearch := x.Table("role").Where("org_id = ? AND name = ?", orgID, roleName).Get(&role)
+
+						require.NoError(t, errRoleSearch)
+						require.True(t, hasRole, "expected role to exist", "orgID", orgID, "role", roleName)
+
+						// Check permissions associated with each role
+						perms := []accesscontrol.Permission{}
+						count, errManagedPermsSearch := x.Table("permission").Where("role_id = ?", role.ID).FindAndCount(&perms)
+
+						require.NoError(t, errManagedPermsSearch)
+						require.Equal(t, int64(len(tc.wantRolePerms[orgID][roleName])), count, "expected role to be tied to permissions", "orgID", orgID, "role", roleName)
+
+						gotRawPerms := convertToRawPermissions(perms)
+						require.ElementsMatch(t, gotRawPerms, tc.wantRolePerms[orgID][roleName], "expected role to have permissions", "orgID", orgID, "role", roleName)
+
+						// Check assignment of the roles
+						br := accesscontrol.BuiltinRole{}
+						has, errAssignmentSearch := x.Table("builtin_role").Where("role_id = ? AND role = ? AND org_id = ?", role.ID, acmig.ParseRoleFromName(roleName), orgID).Get(&br)
+						require.NoError(t, errAssignmentSearch)
+						require.True(t, has, "expected assignment of role to builtin role", "orgID", orgID, "role", roleName)
+					}
+				}
+			}
+		})
+	}
+}
diff --git a/pkg/services/sqlstore/migrations/accesscontrol/test/managed_permission_migrator_test.go b/pkg/services/sqlstore/migrations/accesscontrol/test/managed_permission_migrator_test.go
index 94ce65f9ee712..4d8c820958e39 100644
--- a/pkg/services/sqlstore/migrations/accesscontrol/test/managed_permission_migrator_test.go
+++ b/pkg/services/sqlstore/migrations/accesscontrol/test/managed_permission_migrator_test.go
@@ -2,7 +2,6 @@ package test
 
 import (
 	"fmt"
-	"strconv"
 	"strings"
 	"testing"
 
@@ -256,7 +255,10 @@ func TestManagedPermissionsMigrationRunTwice(t *testing.T) {
 func putTestPermissions(t *testing.T, x *xorm.Engine, rolePerms map[int64]map[string][]rawPermission) {
 	for orgID, roles := range rolePerms {
 		for roleName, perms := range roles {
-			uid := strconv.FormatInt(orgID, 10) + strings.ReplaceAll(roleName, ":", "_")
+			uid := strings.ReplaceAll(roleName, ":", "_")
+			if !strings.HasPrefix(roleName, "basic") {
+				uid = fmt.Sprintf("%d_%s", orgID, uid)
+			}
 			role := accesscontrol.Role{
 				OrgID:   orgID,
 				Version: 1,
diff --git a/pkg/services/sqlstore/migrations/accesscontrol/test/scope_migrator_test.go b/pkg/services/sqlstore/migrations/accesscontrol/test/scope_migrator_test.go
new file mode 100644
index 0000000000000..9b747b27f32e5
--- /dev/null
+++ b/pkg/services/sqlstore/migrations/accesscontrol/test/scope_migrator_test.go
@@ -0,0 +1,145 @@
+package test
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/datasources"
+	acmig "github.com/grafana/grafana/pkg/services/sqlstore/migrations/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+func TestScopeMigration(t *testing.T) {
+	// Run initial migration to have a working DB
+	x := setupTestDB(t)
+
+	type migrationTestCase struct {
+		desc            string
+		permissionSeed  []*accesscontrol.Permission
+		wantPermissions []*accesscontrol.Permission
+	}
+	testCases := []migrationTestCase{
+		{
+			desc:            "empty perms",
+			permissionSeed:  []*accesscontrol.Permission{},
+			wantPermissions: []*accesscontrol.Permission{},
+		},
+		{
+			desc: "no permissions with alerting instance read action",
+			permissionSeed: []*accesscontrol.Permission{
+				{
+					RoleID:    1,
+					Action:    accesscontrol.ActionAlertingInstancesExternalRead,
+					Scope:     datasources.ScopeAll,
+					Kind:      "datasources",
+					Attribute: "*",
+					Created:   now,
+					Updated:   now,
+				},
+			},
+			wantPermissions: []*accesscontrol.Permission{
+				{
+					RoleID:    1,
+					Action:    accesscontrol.ActionAlertingInstancesExternalRead,
+					Scope:     datasources.ScopeAll,
+					Kind:      "datasources",
+					Attribute: "*",
+				},
+			},
+		},
+		{
+			desc: "has permission with alerting instance read action and folder scope",
+			permissionSeed: []*accesscontrol.Permission{
+				{
+					RoleID:     1,
+					Action:     accesscontrol.ActionAlertingInstanceRead,
+					Scope:      dashboards.ScopeFoldersAll,
+					Kind:       "folders",
+					Attribute:  "uid",
+					Identifier: "*",
+					Created:    now,
+					Updated:    now,
+				},
+			},
+			wantPermissions: []*accesscontrol.Permission{
+				{
+					RoleID: 1,
+					Action: accesscontrol.ActionAlertingInstanceRead,
+				},
+			},
+		},
+		{
+			desc: "has permission with alerting instance read action and no scope",
+			permissionSeed: []*accesscontrol.Permission{
+				{
+					RoleID:  1,
+					Action:  accesscontrol.ActionAlertingInstanceRead,
+					Created: now,
+					Updated: now,
+				},
+			},
+			wantPermissions: []*accesscontrol.Permission{
+				{
+					RoleID: 1,
+					Action: accesscontrol.ActionAlertingInstanceRead,
+				},
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.desc, func(t *testing.T) {
+			// Remove migration and permissions
+			_, errDeleteMig := x.Exec(`DELETE FROM migration_log WHERE migration_id = ?`, acmig.AlertingScopeRemovalMigrationID)
+			require.NoError(t, errDeleteMig)
+			_, errDeletePerms := x.Exec(`DELETE FROM permission`)
+			require.NoError(t, errDeletePerms)
+
+			// seed DB with permissions
+			if len(tc.permissionSeed) != 0 {
+				permissionsCount, err := x.Insert(tc.permissionSeed)
+				require.NoError(t, err)
+				require.Equal(t, int64(len(tc.permissionSeed)), permissionsCount)
+			}
+
+			// Run RBAC action name migration
+			acmigrator := migrator.NewMigrator(x, &setting.Cfg{Logger: log.New("acmigration.test")})
+			acmig.AddAlertingScopeRemovalMigration(acmigrator)
+
+			errRunningMig := acmigrator.Start(false, 0)
+			require.NoError(t, errRunningMig)
+
+			// Check permissions
+			resultingPermissions := []accesscontrol.Permission{}
+			err := x.Table("permission").Find(&resultingPermissions)
+			require.NoError(t, err)
+
+			// verify got == want
+			assert.Equal(t, len(tc.wantPermissions), len(resultingPermissions))
+			for _, wantPermission := range tc.wantPermissions {
+				foundMatch := false
+				for _, resultingPermission := range resultingPermissions {
+					if wantPermission.Action == resultingPermission.Action &&
+						wantPermission.Scope == resultingPermission.Scope &&
+						wantPermission.Kind == resultingPermission.Kind &&
+						wantPermission.Attribute == resultingPermission.Attribute &&
+						wantPermission.Identifier == resultingPermission.Identifier &&
+						wantPermission.RoleID == resultingPermission.RoleID {
+						assert.NotEmpty(t, resultingPermission.Updated)
+						assert.NotEmpty(t, resultingPermission.Created)
+						foundMatch = true
+						continue
+					}
+				}
+				assert.True(t, foundMatch, fmt.Sprintf("there should be a permission with action %s in the DB after the migration", wantPermission.Action))
+			}
+		})
+	}
+}
diff --git a/pkg/services/sqlstore/migrations/accesscontrol/test/seed_assign_mig_test.go b/pkg/services/sqlstore/migrations/accesscontrol/test/seed_assign_mig_test.go
new file mode 100644
index 0000000000000..e95c5990854f7
--- /dev/null
+++ b/pkg/services/sqlstore/migrations/accesscontrol/test/seed_assign_mig_test.go
@@ -0,0 +1,79 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	acmig "github.com/grafana/grafana/pkg/services/sqlstore/migrations/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+func TestPreventOnCallAccessSeed(t *testing.T) {
+	// Run initial migration to have a working DB
+	x := setupTestDB(t)
+
+	type SeedAssignment struct {
+		BuiltinRole, Action, Scope, Origin string
+	}
+
+	want := []SeedAssignment{
+		{BuiltinRole: "Admin", Action: "plugins.app:access", Scope: "plugins:id:grafana-oncall-app", Origin: "grafana-oncall-app"},
+		{BuiltinRole: "Editor", Action: "plugins.app:access", Scope: "plugins:id:grafana-oncall-app", Origin: "grafana-oncall-app"},
+		{BuiltinRole: "Viewer", Action: "plugins.app:access", Scope: "plugins:id:grafana-oncall-app", Origin: "grafana-oncall-app"},
+		{BuiltinRole: "Grafana Admin", Action: "plugins.app:access", Scope: "plugins:id:grafana-oncall-app", Origin: "grafana-oncall-app"},
+	}
+
+	type testCase struct {
+		desc string
+		init []SeedAssignment
+		want []SeedAssignment
+	}
+	tt := []testCase{
+		{
+			desc: "fresh table skip migration",
+			want: []SeedAssignment{},
+		},
+		{
+			desc: "seeded with an OnCall access already",
+			init: []SeedAssignment{
+				{BuiltinRole: "Admin", Action: "plugins.app:access", Scope: "plugins:id:grafana-oncall-app", Origin: "grafana-oncall-app"},
+			},
+			want: want,
+		},
+		{
+			desc: "seeded without any OnCall access",
+			init: []SeedAssignment{{BuiltinRole: "Admin", Action: "plugins.app:access", Scope: "plugins:id:*"}},
+			want: append(want, SeedAssignment{BuiltinRole: "Admin", Action: "plugins.app:access", Scope: "plugins:id:*"}),
+		},
+	}
+
+	for _, tc := range tt {
+		t.Run(tc.desc, func(t *testing.T) {
+			// Remove migration
+			_, errDeleteMig := x.Exec(`DELETE FROM migration_log WHERE migration_id LIKE ?`, acmig.PreventSeedingOnCallAccessID+"%")
+			require.NoError(t, errDeleteMig)
+			_, errDeleteAssigns := x.Exec(`DELETE FROM seed_assignment`)
+			require.NoError(t, errDeleteAssigns)
+
+			if len(tc.init) > 0 {
+				_, errInsertAssign := x.Table("seed_assignment").InsertMulti(tc.init)
+				require.NoError(t, errInsertAssign)
+			}
+
+			// Run accesscontrol migration
+			acmigrator := migrator.NewMigrator(x, &setting.Cfg{Logger: log.New("acmigration.test")})
+			acmigrator.AddMigration(acmig.PreventSeedingOnCallAccessID, &acmig.SeedAssignmentOnCallAccessMigrator{})
+
+			errRunningMig := acmigrator.Start(false, 0)
+			require.NoError(t, errRunningMig)
+
+			got := []SeedAssignment{}
+			errFind := x.Table("seed_assignment").Find(&got)
+			require.NoError(t, errFind)
+			require.ElementsMatch(t, tc.want, got)
+		})
+	}
+}
diff --git a/pkg/services/sqlstore/migrations/cloud_migrations.go b/pkg/services/sqlstore/migrations/cloud_migrations.go
new file mode 100644
index 0000000000000..231e687b0ac23
--- /dev/null
+++ b/pkg/services/sqlstore/migrations/cloud_migrations.go
@@ -0,0 +1,40 @@
+package migrations
+
+import (
+	. "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+)
+
+func addCloudMigrationsMigrations(mg *Migrator) {
+	migrationTable := Table{
+		Name: "cloud_migration",
+		Columns: []*Column{
+			{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
+			{Name: "auth_token", Type: DB_Text, Nullable: true}, // encrypted
+			{Name: "stack", Type: DB_Text},
+			{Name: "created", Type: DB_DateTime, Nullable: false},
+			{Name: "updated", Type: DB_DateTime, Nullable: false},
+		},
+	}
+	migrationRunTable := Table{
+		Name: "cloud_migration_run",
+		Columns: []*Column{
+			{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
+			{Name: "cloud_migration_uid", Type: DB_NVarchar, Length: 40, Nullable: true}, // get from the cloud service
+			{Name: "result", Type: DB_Text, Nullable: false},
+			{Name: "created", Type: DB_DateTime, Nullable: false},
+			{Name: "updated", Type: DB_DateTime, Nullable: false},
+			{Name: "finished", Type: DB_DateTime, Nullable: true},
+		},
+	}
+
+	mg.AddMigration("create cloud_migration table v1", NewAddTableMigration(migrationTable))
+	mg.AddMigration("create cloud_migration_run table v1", NewAddTableMigration(migrationRunTable))
+
+	stackIDColumn := Column{Name: "stack_id", Type: DB_BigInt, Nullable: false}
+	regionSlugColumn := Column{Name: "region_slug", Type: DB_Text, Nullable: false}
+	clusterSlugColumn := Column{Name: "cluster_slug", Type: DB_Text, Nullable: false}
+
+	mg.AddMigration("add stack_id column", NewAddColumnMigration(migrationTable, &stackIDColumn))
+	mg.AddMigration("add region_slug column", NewAddColumnMigration(migrationTable, &regionSlugColumn))
+	mg.AddMigration("add cluster_slug column", NewAddColumnMigration(migrationTable, &clusterSlugColumn))
+}
diff --git a/pkg/services/sqlstore/migrations/external_alertmanagers.go b/pkg/services/sqlstore/migrations/external_alertmanagers.go
index 78d91192a9d69..067feee3a178a 100644
--- a/pkg/services/sqlstore/migrations/external_alertmanagers.go
+++ b/pkg/services/sqlstore/migrations/external_alertmanagers.go
@@ -77,7 +77,7 @@ func (e externalAlertmanagerToDatasources) Exec(sess *xorm.Session, mg *migrator
 				ds.BasicAuth = true
 				ds.BasicAuthUser = u.User.Username()
 				if password, ok := u.User.Password(); ok {
-					ds.SecureJsonData = getEncryptedJsonData(map[string]string{
+					ds.SecureJsonData = getEncryptedJsonData(mg.Cfg, map[string]string{
 						"basicAuthPassword": password,
 					}, log.New("securejsondata"))
 				}
@@ -132,10 +132,10 @@ func generateNewDatasourceUid(sess *xorm.Session, orgId int64) (string, error) {
 type secureJsonData map[string][]byte
 
 // getEncryptedJsonData returns map where all keys are encrypted.
-func getEncryptedJsonData(sjd map[string]string, log log.Logger) secureJsonData {
+func getEncryptedJsonData(cfg *setting.Cfg, sjd map[string]string, log log.Logger) secureJsonData {
 	encrypted := make(secureJsonData)
 	for key, data := range sjd {
-		encryptedData, err := util.Encrypt([]byte(data), setting.SecretKey)
+		encryptedData, err := util.Encrypt([]byte(data), cfg.SecretKey)
 		if err != nil {
 			log.Error(err.Error())
 			os.Exit(1)
diff --git a/pkg/services/sqlstore/migrations/folder_mig.go b/pkg/services/sqlstore/migrations/folder_mig.go
index 5d28313df0057..b107afea97290 100644
--- a/pkg/services/sqlstore/migrations/folder_mig.go
+++ b/pkg/services/sqlstore/migrations/folder_mig.go
@@ -35,6 +35,51 @@ func addFolderMigrations(mg *migrator.Migrator) {
 		Type: migrator.UniqueIndex,
 		Cols: []string{"title", "parent_uid", "org_id"},
 	}))
+
+	mg.AddMigration("Sync dashboard and folder table", migrator.NewRawSQLMigration("").
+		Mysql(`
+			INSERT INTO folder (uid, org_id, title, created, updated)
+			SELECT * FROM (SELECT uid, org_id, title, created, updated FROM dashboard WHERE is_folder = 1) AS derived
+			ON DUPLICATE KEY UPDATE title=derived.title, updated=derived.updated
+		`).Postgres(`
+			INSERT INTO folder (uid, org_id, title, created, updated)
+			SELECT uid, org_id, title, created, updated FROM dashboard WHERE is_folder = true
+			ON CONFLICT(uid, org_id) DO UPDATE SET title=excluded.title, updated=excluded.updated
+		`).SQLite(`
+			INSERT INTO folder (uid, org_id, title, created, updated)
+			SELECT uid, org_id, title, created, updated FROM dashboard WHERE is_folder = 1
+			ON CONFLICT DO UPDATE SET title=excluded.title, updated=excluded.updated
+		`))
+
+	mg.AddMigration("Remove ghost folders from the folder table", migrator.NewRawSQLMigration(`
+			DELETE FROM folder WHERE NOT EXISTS
+				(SELECT 1 FROM dashboard WHERE dashboard.uid = folder.uid AND dashboard.org_id = folder.org_id AND dashboard.is_folder = true)
+	`))
+
+	mg.AddMigration("Remove unique index UQE_folder_uid_org_id", migrator.NewDropIndexMigration(folderv1(), &migrator.Index{
+		Type: migrator.UniqueIndex,
+		Cols: []string{"uid", "org_id"},
+	}))
+
+	mg.AddMigration("Add unique index UQE_folder_org_id_uid", migrator.NewAddIndexMigration(folderv1(), &migrator.Index{
+		Type: migrator.UniqueIndex,
+		Cols: []string{"org_id", "uid"},
+	}))
+
+	mg.AddMigration("Remove unique index UQE_folder_title_parent_uid_org_id", migrator.NewDropIndexMigration(folderv1(), &migrator.Index{
+		Type: migrator.UniqueIndex,
+		Cols: []string{"title", "parent_uid", "org_id"},
+	}))
+
+	mg.AddMigration("Add unique index UQE_folder_org_id_parent_uid_title", migrator.NewAddIndexMigration(folderv1(), &migrator.Index{
+		Type: migrator.UniqueIndex,
+		Cols: []string{"org_id", "parent_uid", "title"},
+	}))
+
+	// No need to introduce IDX_folder_org_id_parent_uid because is covered by UQE_folder_org_id_parent_uid_title
+	mg.AddMigration("Remove index IDX_folder_parent_uid_org_id", migrator.NewDropIndexMigration(folderv1(), &migrator.Index{
+		Cols: []string{"parent_uid", "org_id"},
+	}))
 }
 
 func folderv1() migrator.Table {
diff --git a/pkg/services/sqlstore/migrations/kv_store_mig.go b/pkg/services/sqlstore/migrations/kv_store_mig.go
index 3bdd39335a20f..252daf0a13452 100644
--- a/pkg/services/sqlstore/migrations/kv_store_mig.go
+++ b/pkg/services/sqlstore/migrations/kv_store_mig.go
@@ -25,3 +25,10 @@ func addKVStoreMigrations(mg *Migrator) {
 
 	mg.AddMigration("add index kv_store.org_id-namespace-key", NewAddIndexMigration(kvStoreV1, kvStoreV1.Indices[0]))
 }
+
+// addKVStoreMySQLValueTypeLongTextMigration adds a migration to change the column type of kv_store.value to LONGTEXT for
+// MySQL to be more inline size-wise with PSQL (TEXT) and SQLite.
+func addKVStoreMySQLValueTypeLongTextMigration(mg *Migrator) {
+	mg.AddMigration("alter kv_store.value to longtext", NewRawSQLMigration("").
+		Mysql("ALTER TABLE kv_store MODIFY value LONGTEXT NOT NULL;"))
+}
diff --git a/pkg/services/sqlstore/migrations/libraryelements.go b/pkg/services/sqlstore/migrations/libraryelements.go
index 3215cb085bb3b..903411997ac12 100644
--- a/pkg/services/sqlstore/migrations/libraryelements.go
+++ b/pkg/services/sqlstore/migrations/libraryelements.go
@@ -61,4 +61,26 @@ func addLibraryElementsMigrations(mg *migrator.Migrator) {
 
 	mg.AddMigration("alter library_element model to mediumtext", migrator.NewRawSQLMigration("").
 		Mysql("ALTER TABLE library_element MODIFY model MEDIUMTEXT NOT NULL;"))
+
+	q := `UPDATE library_element
+	SET folder_uid = dashboard.uid
+	FROM dashboard
+	WHERE library_element.folder_id = dashboard.id AND library_element.org_id = dashboard.org_id`
+
+	if mg.Dialect.DriverName() == migrator.MySQL {
+		q = `UPDATE library_element
+		SET folder_uid = (
+			SELECT dashboard.uid
+			FROM dashboard
+			WHERE library_element.folder_id = dashboard.id AND library_element.org_id = dashboard.org_id
+		)`
+	}
+
+	mg.AddMigration("add library_element folder uid", migrator.NewAddColumnMigration(libraryElementsV1, &migrator.Column{
+		Name: "folder_uid", Type: migrator.DB_NVarchar, Length: 40, Nullable: true,
+	}))
+
+	mg.AddMigration("populate library_element folder_uid", migrator.NewRawSQLMigration(q))
+
+	mg.AddMigration("add index library_element org_id-folder_uid-name-kind", migrator.NewAddIndexMigration(libraryElementsV1, &migrator.Index{Cols: []string{"org_id", "folder_uid", "name", "kind"}, Type: migrator.UniqueIndex}))
 }
diff --git a/pkg/services/sqlstore/migrations/migrations.go b/pkg/services/sqlstore/migrations/migrations.go
index e16117c5df583..a9e1de52193b5 100644
--- a/pkg/services/sqlstore/migrations/migrations.go
+++ b/pkg/services/sqlstore/migrations/migrations.go
@@ -5,8 +5,8 @@ import (
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrations/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrations/anonservice"
-	"github.com/grafana/grafana/pkg/services/sqlstore/migrations/oauthserver"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrations/signingkeys"
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrations/ssosettings"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrations/ualert"
 	. "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 )
@@ -20,13 +20,14 @@ import (
 //    specifically added
 
 type OSSMigrations struct {
+	features featuremgmt.FeatureToggles
 }
 
-func ProvideOSSMigrations() *OSSMigrations {
-	return &OSSMigrations{}
+func ProvideOSSMigrations(features featuremgmt.FeatureToggles) *OSSMigrations {
+	return &OSSMigrations{features}
 }
 
-func (*OSSMigrations) AddMigration(mg *Migrator) {
+func (oss *OSSMigrations) AddMigration(mg *Migrator) {
 	mg.AddCreateMigration()
 	addUserMigrations(mg)
 	addTempUserMigrations(mg)
@@ -93,11 +94,6 @@ func (*OSSMigrations) AddMigration(mg *Migrator) {
 	AddExternalAlertmanagerToDatasourceMigration(mg)
 
 	addFolderMigrations(mg)
-	if mg.Cfg != nil && mg.Cfg.IsFeatureToggleEnabled != nil {
-		if mg.Cfg.IsFeatureToggleEnabled(featuremgmt.FlagExternalServiceAuth) {
-			oauthserver.AddMigration(mg)
-		}
-	}
 
 	anonservice.AddMigration(mg)
 	signingkeys.AddMigration(mg)
@@ -106,6 +102,23 @@ func (*OSSMigrations) AddMigration(mg *Migrator) {
 	ualert.CreatedFoldersMigration(mg)
 
 	dashboardFolderMigrations.AddDashboardFolderMigrations(mg)
+
+	ssosettings.AddMigration(mg)
+
+	ualert.CreateOrgMigratedKVStoreEntries(mg)
+
+	// https://github.com/grafana/identity-access-team/issues/546: tracks removal of the feature toggle from the annotation permission migration
+	if oss.features != nil && oss.features.IsEnabledGlobally(featuremgmt.FlagAnnotationPermissionUpdate) {
+		accesscontrol.AddManagedDashboardAnnotationActionsMigration(mg)
+	}
+
+	addCloudMigrationsMigrations(mg)
+
+	addKVStoreMySQLValueTypeLongTextMigration(mg)
+
+	ualert.AddRuleNotificationSettingsColumns(mg)
+
+	accesscontrol.AddAlertingScopeRemovalMigration(mg)
 }
 
 func addStarMigrations(mg *Migrator) {
diff --git a/pkg/services/sqlstore/migrations/migrations_test.go b/pkg/services/sqlstore/migrations/migrations_test.go
index 4479e8c95bc74..a37e64f13597d 100644
--- a/pkg/services/sqlstore/migrations/migrations_test.go
+++ b/pkg/services/sqlstore/migrations/migrations_test.go
@@ -3,13 +3,13 @@ package migrations
 import (
 	"errors"
 	"fmt"
-	"os"
 	"strings"
 	"sync"
 	"sync/atomic"
 	"testing"
 
 	"github.com/go-sql-driver/mysql"
+	"github.com/golang-migrate/migrate/v4/database"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/ini.v1"
@@ -21,13 +21,23 @@ import (
 )
 
 func TestMigrations(t *testing.T) {
-	testDB := sqlutil.SQLite3TestDB()
+	testDB, err := sqlutil.GetTestDB(SQLite)
+	require.NoError(t, err)
+
+	t.Cleanup(testDB.Cleanup)
+
 	const query = `select count(*) as count from migration_log`
 	result := struct{ Count int }{}
 
 	x, err := xorm.NewEngine(testDB.DriverName, testDB.ConnStr)
 	require.NoError(t, err)
 
+	t.Cleanup(func() {
+		if err := x.Close(); err != nil {
+			fmt.Printf("failed to close xorm engine: %v", err)
+		}
+	})
+
 	err = NewDialect(x.DriverName()).CleanDB(x)
 	require.NoError(t, err)
 
@@ -60,17 +70,30 @@ func TestMigrations(t *testing.T) {
 	checkStepsAndDatabaseMatch(t, mg, expectedMigrations)
 }
 
-func TestMigrationLock(t *testing.T) {
-	dbType := getDBType()
+func TestIntegrationMigrationLock(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	dbType := sqlutil.GetTestDBType()
 	if dbType == SQLite {
 		t.Skip()
 	}
 
-	testDB := getTestDB(t, dbType)
+	testDB, err := sqlutil.GetTestDB(dbType)
+	require.NoError(t, err)
+
+	t.Cleanup(testDB.Cleanup)
 
 	x, err := xorm.NewEngine(testDB.DriverName, testDB.ConnStr)
 	require.NoError(t, err)
 
+	t.Cleanup(func() {
+		if err := x.Close(); err != nil {
+			fmt.Printf("failed to close xorm engine: %v", err)
+		}
+	})
+
 	dialect := NewDialect(x.DriverName())
 
 	sess := x.NewSession()
@@ -78,9 +101,12 @@ func TestMigrationLock(t *testing.T) {
 		sess.Close()
 	})
 
+	key, err := database.GenerateAdvisoryLockId("test")
+	require.NoError(t, err)
+
 	cfg := LockCfg{
 		Session: sess,
-		Key:     "test",
+		Key:     key,
 	}
 
 	t.Run("obtaining lock should succeed", func(t *testing.T) {
@@ -125,7 +151,7 @@ func TestMigrationLock(t *testing.T) {
 		err = dialect.Lock(cfg)
 		require.NoError(t, err)
 
-		err = d2.Lock(LockCfg{Session: sess2})
+		err = d2.Lock(LockCfg{Session: sess2, Key: key})
 		require.Error(t, err)
 		assert.ErrorIs(t, err, ErrLockDB)
 
@@ -157,17 +183,28 @@ func TestMigrationLock(t *testing.T) {
 }
 
 func TestMigratorLocking(t *testing.T) {
-	dbType := getDBType()
-	testDB := getTestDB(t, dbType)
+	dbType := sqlutil.GetTestDBType()
+
 	// skip for SQLite for now since it occasionally fails for not clear reason
 	// anyway starting migrations concurretly for the same migrator is impossible use case
 	if dbType == SQLite {
 		t.Skip()
 	}
 
+	testDB, err := sqlutil.GetTestDB(dbType)
+	require.NoError(t, err)
+
+	t.Cleanup(testDB.Cleanup)
+
 	x, err := xorm.NewEngine(testDB.DriverName, testDB.ConnStr)
 	require.NoError(t, err)
 
+	t.Cleanup(func() {
+		if err := x.Close(); err != nil {
+			fmt.Printf("failed to close xorm engine: %v", err)
+		}
+	})
+
 	err = NewDialect(x.DriverName()).CleanDB(x)
 	require.NoError(t, err)
 
@@ -194,17 +231,27 @@ func TestMigratorLocking(t *testing.T) {
 }
 
 func TestDatabaseLocking(t *testing.T) {
-	dbType := getDBType()
+	dbType := sqlutil.GetTestDBType()
+
 	// skip for SQLite since there is no database locking (only migrator locking)
 	if dbType == SQLite {
 		t.Skip()
 	}
 
-	testDB := getTestDB(t, dbType)
+	testDB, err := sqlutil.GetTestDB(dbType)
+	require.NoError(t, err)
+
+	t.Cleanup(testDB.Cleanup)
 
 	x, err := xorm.NewEngine(testDB.DriverName, testDB.ConnStr)
 	require.NoError(t, err)
 
+	t.Cleanup(func() {
+		if err := x.Close(); err != nil {
+			fmt.Printf("failed to close xorm engine: %v", err)
+		}
+	})
+
 	err = NewDialect(x.DriverName()).CleanDB(x)
 	require.NoError(t, err)
 
@@ -280,37 +327,6 @@ func checkStepsAndDatabaseMatch(t *testing.T, mg *Migrator, expected []string) {
 	require.Failf(t, "the number of migrations does not match log in database", msg)
 }
 
-func getDBType() string {
-	dbType := SQLite
-
-	// environment variable present for test db?
-	if db, present := os.LookupEnv("GRAFANA_TEST_DB"); present {
-		dbType = db
-	}
-	return dbType
-}
-
-func getTestDB(t *testing.T, dbType string) sqlutil.TestDB {
-	switch dbType {
-	case "mysql":
-		return sqlutil.MySQLTestDB()
-	case "postgres":
-		return sqlutil.PostgresTestDB()
-	default:
-		f, err := os.CreateTemp(".", "grafana-test-db-")
-		require.NoError(t, err)
-		t.Cleanup(func() {
-			err := os.Remove(f.Name())
-			require.NoError(t, err)
-		})
-
-		return sqlutil.TestDB{
-			DriverName: "sqlite3",
-			ConnStr:    f.Name(),
-		}
-	}
-}
-
 func replaceDBName(t *testing.T, connStr, dbType string) string {
 	switch dbType {
 	case "mysql":
diff --git a/pkg/services/sqlstore/migrations/oauthserver/migrations.go b/pkg/services/sqlstore/migrations/oauthserver/migrations.go
deleted file mode 100644
index b47590e7b259a..0000000000000
--- a/pkg/services/sqlstore/migrations/oauthserver/migrations.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package oauthserver
-
-import "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
-
-func AddMigration(mg *migrator.Migrator) {
-	impersonatePermissionsTable := migrator.Table{
-		Name: "oauth_impersonate_permission",
-		Columns: []*migrator.Column{
-			{Name: "id", Type: migrator.DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
-			{Name: "client_id", Type: migrator.DB_Varchar, Length: 190, Nullable: false},
-			{Name: "action", Type: migrator.DB_Varchar, Length: 190, Nullable: false},
-			{Name: "scope", Type: migrator.DB_Varchar, Length: 190, Nullable: true},
-		},
-		Indices: []*migrator.Index{
-			{Cols: []string{"client_id", "action", "scope"}, Type: migrator.UniqueIndex},
-		},
-	}
-
-	clientTable := migrator.Table{
-		Name: "oauth_client",
-		Columns: []*migrator.Column{
-			{Name: "id", Type: migrator.DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
-			{Name: "name", Type: migrator.DB_Varchar, Length: 190, Nullable: true},
-			{Name: "client_id", Type: migrator.DB_Varchar, Length: 190, Nullable: false},
-			{Name: "secret", Type: migrator.DB_Varchar, Length: 190, Nullable: false},
-			{Name: "grant_types", Type: migrator.DB_Text, Nullable: true},
-			{Name: "audiences", Type: migrator.DB_Varchar, Length: 190, Nullable: true},
-			{Name: "service_account_id", Type: migrator.DB_BigInt, Nullable: true},
-			{Name: "public_pem", Type: migrator.DB_Text, Nullable: true},
-			{Name: "redirect_uri", Type: migrator.DB_Varchar, Length: 190, Nullable: true},
-		},
-		Indices: []*migrator.Index{
-			{Cols: []string{"client_id"}, Type: migrator.UniqueIndex},
-			{Cols: []string{"client_id", "service_account_id"}, Type: migrator.UniqueIndex},
-			{Cols: []string{"name"}, Type: migrator.UniqueIndex},
-		},
-	}
-
-	// Impersonate Permission
-	mg.AddMigration("create impersonate permissions table", migrator.NewAddTableMigration(impersonatePermissionsTable))
-
-	//-------  indexes ------------------
-	mg.AddMigration("add unique index client_id action scope", migrator.NewAddIndexMigration(impersonatePermissionsTable, impersonatePermissionsTable.Indices[0]))
-
-	// Client
-	mg.AddMigration("create client table", migrator.NewAddTableMigration(clientTable))
-
-	//-------  indexes ------------------
-	mg.AddMigration("add unique index client_id", migrator.NewAddIndexMigration(clientTable, clientTable.Indices[0]))
-	mg.AddMigration("add unique index client_id service_account_id", migrator.NewAddIndexMigration(clientTable, clientTable.Indices[1]))
-	mg.AddMigration("add unique index name", migrator.NewAddIndexMigration(clientTable, clientTable.Indices[2]))
-}
diff --git a/pkg/services/sqlstore/migrations/ssosettings/migrations.go b/pkg/services/sqlstore/migrations/ssosettings/migrations.go
new file mode 100644
index 0000000000000..822c441d60412
--- /dev/null
+++ b/pkg/services/sqlstore/migrations/ssosettings/migrations.go
@@ -0,0 +1,19 @@
+package ssosettings
+
+import "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+
+func AddMigration(mg *migrator.Migrator) {
+	var ssoSettingV1 = migrator.Table{
+		Name: "sso_setting",
+		Columns: []*migrator.Column{
+			{Name: "id", Type: migrator.DB_NVarchar, Length: 40, IsPrimaryKey: true}, // Store uuidv4
+			{Name: "provider", Type: migrator.DB_NVarchar, Length: 255, Nullable: false},
+			{Name: "settings", Type: migrator.DB_Text, Nullable: false},
+			{Name: "created", Type: migrator.DB_DateTime, Nullable: false},
+			{Name: "updated", Type: migrator.DB_DateTime, Nullable: false},
+			{Name: "is_deleted", Type: migrator.DB_Bool, Nullable: false, Default: "0"},
+		},
+	}
+
+	mg.AddMigration("create sso_setting table", migrator.NewAddTableMigration(ssoSettingV1))
+}
diff --git a/pkg/services/sqlstore/migrations/ualert/org_upgrade_state_mig.go b/pkg/services/sqlstore/migrations/ualert/org_upgrade_state_mig.go
new file mode 100644
index 0000000000000..7c4c26e4487d4
--- /dev/null
+++ b/pkg/services/sqlstore/migrations/ualert/org_upgrade_state_mig.go
@@ -0,0 +1,161 @@
+package ualert
+
+import (
+	"fmt"
+	"time"
+
+	"xorm.io/xorm"
+
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+)
+
+// typeKey is a vendored migration.typeKey.
+var typeKey = "currentAlertingType"
+
+// AlertingType is a vendored migration.store.AlertingType.
+type alertingType string
+
+const (
+	Legacy          alertingType = "Legacy"
+	UnifiedAlerting alertingType = "UnifiedAlerting"
+)
+
+// CreateOrgMigratedKVStoreEntries creates kv store entries for each organization if the migration has been run.
+// This is needed now that we've changed the semantics of data loss when upgrading / rolling back. If a user who previously
+// upgraded were to rollback and upgrade again without clean_upgrade, then since they don't have org-level migrated states
+// it will attempt to upgrade their orgs as if they had never upgraded before. This will almost definitely fail with
+// duplicate key errors.
+//
+// In addition, this changes the entry for orgId=0 to be better named as it no longer tracks whether the
+// migration has been run, but rather the current alerting type of Grafana; Legacy or UnifiedAlerting. This is used to
+// detect transitions between Legacy and UnifiedAlerting by comparing to the desired type in the configuration.
+func CreateOrgMigratedKVStoreEntries(mg *migrator.Migrator) {
+	mg.AddMigration("copy kvstore migration status to each org", &createOrgMigratedKVStoreEntries{})
+
+	// Adds back the entry for orgId=0 if it doesn't exist. This is not strictly necessary, but
+	// helps to cover some issues with createOrgMigratedKVStoreEntries if a grafana instance on UA is downgraded to before
+	// the split for org-specific migrated statuses.
+	mg.AddMigration("add back entry for orgid=0 migrated status", &addBackAnyOrgMigratedEntry{})
+}
+
+type createOrgMigratedKVStoreEntries struct {
+	migrator.MigrationBase
+}
+
+func (c createOrgMigratedKVStoreEntries) SQL(migrator.Dialect) string {
+	return codeMigration
+}
+
+func (c createOrgMigratedKVStoreEntries) Exec(sess *xorm.Session, mg *migrator.Migrator) error {
+	var anyOrg int64 = 0
+	migrated := kvStoreV1Entry{
+		OrgID:     &anyOrg,
+		Namespace: &KVNamespace,
+		Key:       &migratedKey,
+	}
+	has, err := sess.Table("kv_store").Get(&migrated)
+	if err != nil {
+		return err
+	}
+
+	if !has {
+		mg.Logger.Debug("No migrated status in kvstore, nothing to set")
+		return nil
+	}
+
+	// Rename old entry key and value.
+	val := Legacy
+	if migrated.Value == "true" {
+		val = UnifiedAlerting
+	}
+	if _, err := sess.Table("kv_store").Where("id = ?", migrated.ID).Update(&kvStoreV1Entry{
+		Key:   &typeKey,
+		Value: string(val),
+	}); err != nil {
+		mg.Logger.Error("failed to rename org migrated status in kvstore", "err", err)
+		return err
+	}
+
+	var orgs []struct {
+		ID int64 `xorm:"id"`
+	}
+	if err := sess.SQL("select id from org").Find(&orgs); err != nil {
+		return err
+	}
+
+	if len(orgs) == 0 {
+		mg.Logger.Debug("no orgs, nothing to set in kvstore")
+		return nil
+	}
+
+	for _, org := range orgs {
+		id := org.ID
+		entry := kvStoreV1Entry{
+			OrgID:     &id,
+			Namespace: &KVNamespace,
+			Key:       &migratedKey,
+			Value:     migrated.Value,
+			Created:   migrated.Created,
+			Updated:   migrated.Updated,
+		}
+		if _, errCreate := sess.Table("kv_store").Insert(&entry); errCreate != nil {
+			mg.Logger.Error("failed to insert org migration status to kvstore", "err", errCreate)
+			return fmt.Errorf("failed to insert org migration status to kvstore: %w", errCreate)
+		}
+	}
+
+	return nil
+}
+
+type addBackAnyOrgMigratedEntry struct {
+	migrator.MigrationBase
+}
+
+func (c addBackAnyOrgMigratedEntry) SQL(migrator.Dialect) string {
+	return codeMigration
+}
+
+func (c addBackAnyOrgMigratedEntry) Exec(sess *xorm.Session, mg *migrator.Migrator) error {
+	var anyOrg int64 = 0
+	migratedEntries := make([]kvStoreV1Entry, 0)
+	cond := kvStoreV1Entry{
+		Namespace: &KVNamespace,
+		Key:       &migratedKey,
+	}
+	err := sess.Table("kv_store").Find(&migratedEntries, &cond)
+	if err != nil {
+		return err
+	}
+
+	if len(migratedEntries) == 0 {
+		mg.Logger.Debug("No migrated orgs in kvstore, nothing to set")
+		return nil
+	}
+
+	migratedStatus := "false"
+	for _, migrated := range migratedEntries {
+		if migrated.OrgID != nil && *migrated.OrgID == anyOrg {
+			mg.Logger.Debug("Already have migrated status for orgid=0, nothing to set")
+			return nil
+		}
+		// All org entries should have the same value. If, somehow, they don't, we set it to true if any orgs are migrated.
+		// This is because assuming an org is migrated when it isn't is less bad as force_migration check exists.
+		if migrated.Value == "true" {
+			migratedStatus = "true"
+		}
+	}
+
+	now := time.Now()
+	if _, err := sess.Table("kv_store").Insert(&kvStoreV1Entry{
+		OrgID:     &anyOrg,
+		Namespace: &KVNamespace,
+		Key:       &migratedKey,
+		Value:     migratedStatus,
+		Created:   now,
+		Updated:   now,
+	}); err != nil {
+		mg.Logger.Error("failed to insert orgid=0 migrated status in kvstore", "err", err)
+		return err
+	}
+	return nil
+}
diff --git a/pkg/services/sqlstore/migrations/ualert/rule_notification_settings_mig.go b/pkg/services/sqlstore/migrations/ualert/rule_notification_settings_mig.go
new file mode 100644
index 0000000000000..7c5eb2a6ebbda
--- /dev/null
+++ b/pkg/services/sqlstore/migrations/ualert/rule_notification_settings_mig.go
@@ -0,0 +1,20 @@
+package ualert
+
+import (
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+)
+
+// AddRuleNotificationSettingsColumns creates a column for notification settings in the alert_rule and alert_rule_version tables.
+func AddRuleNotificationSettingsColumns(mg *migrator.Migrator) {
+	mg.AddMigration("add notification_settings column to alert_rule table", migrator.NewAddColumnMigration(migrator.Table{Name: "alert_rule"}, &migrator.Column{
+		Name:     "notification_settings",
+		Type:     migrator.DB_Text,
+		Nullable: true,
+	}))
+
+	mg.AddMigration("add notification_settings column to alert_rule_version table", migrator.NewAddColumnMigration(migrator.Table{Name: "alert_rule_version"}, &migrator.Column{
+		Name:     "notification_settings",
+		Type:     migrator.DB_Text,
+		Nullable: true,
+	}))
+}
diff --git a/pkg/services/sqlstore/migrations/ualert/tables.go b/pkg/services/sqlstore/migrations/ualert/tables.go
index b6babe3409d4d..1ef0587efe384 100644
--- a/pkg/services/sqlstore/migrations/ualert/tables.go
+++ b/pkg/services/sqlstore/migrations/ualert/tables.go
@@ -189,6 +189,10 @@ func alertInstanceMigration(mg *migrator.Migrator) {
 		migrator.NewAddColumnMigration(alertInstance, &migrator.Column{
 			Name: "current_reason", Type: migrator.DB_NVarchar, Length: DefaultFieldMaxLength, Nullable: true,
 		}))
+
+	mg.AddMigration("add result_fingerprint column to alert_instance", migrator.NewAddColumnMigration(alertInstance, &migrator.Column{
+		Name: "result_fingerprint", Type: migrator.DB_NVarchar, Length: 16, Nullable: true,
+	}))
 }
 
 func addAlertRuleMigrations(mg *migrator.Migrator, defaultIntervalSeconds int64) {
diff --git a/pkg/services/sqlstore/migrations/user_mig.go b/pkg/services/sqlstore/migrations/user_mig.go
index 6edf5161f47ba..8603314a3d196 100644
--- a/pkg/services/sqlstore/migrations/user_mig.go
+++ b/pkg/services/sqlstore/migrations/user_mig.go
@@ -5,6 +5,7 @@ import (
 
 	"xorm.io/xorm"
 
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrations/usermig"
 	. "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 	"github.com/grafana/grafana/pkg/util"
 )
@@ -140,6 +141,26 @@ func addUserMigrations(mg *Migrator) {
 			SQLite(migSQLITEisServiceAccountNullable).
 			Postgres("ALTER TABLE `user` ALTER COLUMN is_service_account DROP NOT NULL;").
 			Mysql("ALTER TABLE user MODIFY is_service_account BOOLEAN DEFAULT 0;"))
+
+	mg.AddMigration("Add uid column to user", NewAddColumnMigration(userV2, &Column{
+		Name: "uid", Type: DB_NVarchar, Length: 40, Nullable: true,
+	}))
+
+	mg.AddMigration("Update uid column values for users", NewRawSQLMigration("").
+		SQLite("UPDATE user SET uid=printf('u%09d',id) WHERE uid IS NULL;").
+		Postgres("UPDATE `user` SET uid='u' || lpad('' || id::text,9,'0') WHERE uid IS NULL;").
+		Mysql("UPDATE user SET uid=concat('u',lpad(id,9,'0')) WHERE uid IS NULL;"))
+
+	mg.AddMigration("Add unique index user_uid", NewAddIndexMigration(userV2, &Index{
+		Cols: []string{"uid"}, Type: UniqueIndex,
+	}))
+
+	// Service accounts login were not unique per org. this migration is part of making it unique per org
+	// to be able to create service accounts that are unique per org
+	mg.AddMigration(usermig.AllowSameLoginCrossOrgs, &usermig.ServiceAccountsSameLoginCrossOrgs{})
+
+	// Users login and email should be in lower case
+	mg.AddMigration(usermig.LowerCaseUserLoginAndEmail, &usermig.UsersLowerCaseLoginAndEmail{})
 }
 
 const migSQLITEisServiceAccountNullable = `ALTER TABLE user ADD COLUMN tmp_service_account BOOLEAN DEFAULT 0;
diff --git a/pkg/services/sqlstore/migrations/usermig/service_account_multiple_org_login_migrator.go b/pkg/services/sqlstore/migrations/usermig/service_account_multiple_org_login_migrator.go
new file mode 100644
index 0000000000000..1d60a4f7f2858
--- /dev/null
+++ b/pkg/services/sqlstore/migrations/usermig/service_account_multiple_org_login_migrator.go
@@ -0,0 +1,68 @@
+package usermig
+
+import (
+	"fmt"
+
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+	"xorm.io/xorm"
+)
+
+const (
+	AllowSameLoginCrossOrgs = "update login field with orgid to allow for multiple service accounts with same name across orgs"
+)
+
+// Service accounts login were not unique per org. this migration is part of making it unique per org
+// to be able to create service accounts that are unique per org
+func AddServiceAccountsAllowSameLoginCrossOrgs(mg *migrator.Migrator) {
+	mg.AddMigration(AllowSameLoginCrossOrgs, &ServiceAccountsSameLoginCrossOrgs{})
+}
+
+var _ migrator.CodeMigration = new(ServiceAccountsSameLoginCrossOrgs)
+
+type ServiceAccountsSameLoginCrossOrgs struct {
+	sess    *xorm.Session
+	dialect migrator.Dialect
+	migrator.MigrationBase
+}
+
+func (p *ServiceAccountsSameLoginCrossOrgs) SQL(dialect migrator.Dialect) string {
+	return "code migration"
+}
+
+func (p *ServiceAccountsSameLoginCrossOrgs) Exec(sess *xorm.Session, mg *migrator.Migrator) error {
+	p.sess = sess
+	p.dialect = mg.Dialect
+	var err error
+	switch p.dialect.DriverName() {
+	case migrator.Postgres:
+		_, err = p.sess.Exec(`UPDATE "user"
+		SET login = 'sa-' || org_id::text || '-' || 
+		CASE 
+		  WHEN login LIKE 'sa-%' THEN SUBSTRING(login FROM 4) 
+		  ELSE login 
+		END 
+		WHERE login IS NOT NULL AND is_service_account = true;`,
+		)
+	case migrator.MySQL:
+		_, err = p.sess.Exec(`UPDATE user
+		SET login = CONCAT('sa-', CAST(org_id AS CHAR), '-',
+		CASE
+		  WHEN login LIKE 'sa-%' THEN SUBSTRING(login, 4)
+		  ELSE login
+		END)
+		WHERE login IS NOT NULL AND is_service_account = 1;`,
+		)
+	case migrator.SQLite:
+		_, err = p.sess.Exec(`Update ` + p.dialect.Quote("user") + `
+		SET login = 'sa-' || CAST(org_id AS TEXT) || '-' ||
+		CASE
+			WHEN SUBSTR(login, 1, 3) = 'sa-' THEN SUBSTR(login, 4)
+			ELSE login
+		END
+		WHERE login IS NOT NULL AND is_service_account = 1;`,
+		)
+	default:
+		return fmt.Errorf("dialect not supported: %s", p.dialect)
+	}
+	return err
+}
diff --git a/pkg/services/sqlstore/migrations/usermig/test/service_account_test.go b/pkg/services/sqlstore/migrations/usermig/test/service_account_test.go
new file mode 100644
index 0000000000000..043c98522453a
--- /dev/null
+++ b/pkg/services/sqlstore/migrations/usermig/test/service_account_test.go
@@ -0,0 +1,247 @@
+package test
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrations/usermig"
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+func TestIntegrationServiceAccountMigration(t *testing.T) {
+	// Run initial migration to have a working DB
+	x := setupTestDB(t)
+
+	orgId := 1
+
+	type migrationTestCase struct {
+		desc                string
+		serviceAccounts     []*user.User
+		wantServiceAccounts []*user.User
+	}
+	testCases := []migrationTestCase{
+		{
+			desc: "basic case",
+			serviceAccounts: []*user.User{
+				{
+					ID:               1,
+					UID:              "u1",
+					Name:             "sa-basic",
+					Login:            "sa-basic",
+					Email:            "sa-basic",
+					OrgID:            1,
+					Created:          now,
+					Updated:          now,
+					IsServiceAccount: true,
+				},
+				{
+					ID:               2,
+					UID:              "u2",
+					Name:             "sa-basic-admin",
+					Login:            "sa-basic-admin",
+					Email:            "sa-basic-admin",
+					OrgID:            1,
+					Created:          now,
+					Updated:          now,
+					IsServiceAccount: true,
+				},
+			},
+			wantServiceAccounts: []*user.User{
+				{
+					ID:    1,
+					Login: fmt.Sprintf("sa-%d-basic", orgId),
+				},
+				{
+					ID:    2,
+					Login: fmt.Sprintf("sa-%d-basic-admin", orgId),
+				},
+			},
+		},
+		{
+			desc: "should be able to handle multiple sa",
+			serviceAccounts: []*user.User{
+				{
+					ID:               3,
+					UID:              "u3",
+					Name:             "sa-doan",
+					Login:            "sa-doan",
+					Email:            "sa-doan",
+					OrgID:            1,
+					Created:          now,
+					Updated:          now,
+					IsServiceAccount: true,
+				},
+				{
+					ID:               4,
+					UID:              "u4",
+					Name:             "sa-admin-doan",
+					Login:            "sa-admin-doan",
+					Email:            "sa-admin-doan",
+					OrgID:            1,
+					Created:          now,
+					Updated:          now,
+					IsServiceAccount: true,
+				},
+			},
+			wantServiceAccounts: []*user.User{
+				{
+					ID:    3,
+					Login: fmt.Sprintf("sa-%d-doan", orgId),
+				},
+				{
+					ID:    4,
+					Login: fmt.Sprintf("sa-%d-admin-doan", orgId),
+				},
+			},
+		},
+		{
+			desc: "duplicate logins across different orgs",
+			serviceAccounts: []*user.User{
+				{
+					ID:               5,
+					UID:              "u5",
+					Name:             "sa-common",
+					Login:            "sa-common@org1.com",
+					Email:            "sa-common@org1.com",
+					OrgID:            1,
+					Created:          now,
+					Updated:          now,
+					IsServiceAccount: true,
+				},
+				{
+					ID:               6,
+					UID:              "u6",
+					Name:             "sa-common",
+					Login:            "sa-common@org2.com",
+					Email:            "sa-common@org2.com",
+					OrgID:            2,
+					Created:          now,
+					Updated:          now,
+					IsServiceAccount: true,
+				},
+			},
+			wantServiceAccounts: []*user.User{
+				{
+					ID:    5,
+					Login: "sa-1-common@org1.com",
+				},
+				{
+					ID:    6,
+					Login: "sa-2-common@org2.com",
+				},
+			},
+		},
+		{
+			desc: "pre-existing sa- prefix",
+			serviceAccounts: []*user.User{
+				{
+					ID:               7,
+					UID:              "u7",
+					Name:             "sa-preexisting",
+					Login:            "sa-preexisting",
+					Email:            "sa-preexisting@org.com",
+					OrgID:            1,
+					Created:          now,
+					Updated:          now,
+					IsServiceAccount: true,
+				},
+				{
+					ID:               8,
+					UID:              "u8",
+					Name:             "sa-sa-preexisting",
+					Login:            "sa-sa-preexisting",
+					Email:            "sa-sa-preexisting@org.com",
+					OrgID:            1,
+					Created:          now,
+					Updated:          now,
+					IsServiceAccount: true,
+				},
+			},
+			wantServiceAccounts: []*user.User{
+				{
+					ID:    7,
+					Login: "sa-1-preexisting",
+				},
+				{
+					ID:    8,
+					Login: "sa-1-sa-preexisting", // Ensuring only the first 'sa-' is handled
+				},
+			},
+		},
+		{
+			desc: "extSrv accounts also renamed",
+			serviceAccounts: []*user.User{
+				{
+					ID:               9,
+					UID:              "u9",
+					Name:             "sa-extsvc-slug",
+					Login:            "sa-extsvc-slug",
+					Email:            "sa-extsvc-slug@org.com",
+					OrgID:            1,
+					Created:          now,
+					Updated:          now,
+					IsServiceAccount: true,
+				},
+				{
+					ID:               10,
+					UID:              "u10",
+					Name:             "sa-extsvc-slug2",
+					Login:            "sa-extsvc-slug2",
+					Email:            "sa-extsvc-slug2@org.com",
+					OrgID:            2,
+					Created:          now,
+					Updated:          now,
+					IsServiceAccount: true,
+				},
+			},
+			wantServiceAccounts: []*user.User{
+				{
+					ID:    9,
+					Login: "sa-1-extsvc-slug",
+				},
+				{
+					ID:    10,
+					Login: "sa-2-extsvc-slug2",
+				},
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.desc, func(t *testing.T) {
+			// Remove migration and permissions
+			_, errDeleteMig := x.Exec(`DELETE FROM migration_log WHERE migration_id = ?`, usermig.AllowSameLoginCrossOrgs)
+			require.NoError(t, errDeleteMig)
+
+			// insert service accounts
+			serviceAccoutsCount, err := x.Insert(tc.serviceAccounts)
+			require.NoError(t, err)
+			require.Equal(t, int64(len(tc.serviceAccounts)), serviceAccoutsCount)
+
+			// run the migration
+			usermigrator := migrator.NewMigrator(x, &setting.Cfg{Logger: log.New("usermigration.test")})
+			usermig.AddServiceAccountsAllowSameLoginCrossOrgs(usermigrator)
+			errRunningMig := usermigrator.Start(false, 0)
+			require.NoError(t, errRunningMig)
+
+			// Check service accounts
+			resultingServiceAccounts := []user.User{}
+			err = x.Table("user").Find(&resultingServiceAccounts)
+			require.NoError(t, err)
+
+			for i := range tc.wantServiceAccounts {
+				for _, sa := range resultingServiceAccounts {
+					if sa.ID == tc.wantServiceAccounts[i].ID {
+						assert.Equal(t, tc.wantServiceAccounts[i].Login, sa.Login)
+					}
+				}
+			}
+		})
+	}
+}
diff --git a/pkg/services/sqlstore/migrations/usermig/test/user_lowercase_login_and_email_test.go b/pkg/services/sqlstore/migrations/usermig/test/user_lowercase_login_and_email_test.go
new file mode 100644
index 0000000000000..33e206ca38c35
--- /dev/null
+++ b/pkg/services/sqlstore/migrations/usermig/test/user_lowercase_login_and_email_test.go
@@ -0,0 +1,253 @@
+package test
+
+import (
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrations/usermig"
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+func TestLowerCaseMigration(t *testing.T) {
+	type migrationTestCase struct {
+		desc      string
+		users     []*user.User
+		wantUsers []*user.User
+	}
+	testCases := []migrationTestCase{
+		{
+			desc: "basic case updates login and email to lowercase",
+			users: []*user.User{
+				{
+					ID:      1,
+					UID:     "u1",
+					Login:   "User1",
+					Email:   "USER1@domain.com",
+					Name:    "user1",
+					OrgID:   1,
+					Created: now,
+					Updated: now,
+				},
+				{
+					ID:      2,
+					UID:     "u2",
+					Login:   "User2",
+					Email:   "USER2@domain.com",
+					Name:    "user2",
+					OrgID:   1,
+					Created: now,
+					Updated: now,
+				},
+			},
+			wantUsers: []*user.User{
+				{
+					ID:    1,
+					Login: "user1",
+					Email: "user1@domain.com",
+				},
+				{
+					ID:    2,
+					Login: "user2",
+					Email: "user2@domain.com",
+				},
+			},
+		},
+		// "2 users - same login, one already lowercase"
+		{
+			desc: "2 users with same login one already has lowercase so we keep both",
+			users: []*user.User{
+				{
+					ID:      1,
+					UID:     "u1",
+					Login:   "user1",
+					Email:   "user1@email.com",
+					Name:    "user1",
+					OrgID:   1,
+					Created: now,
+					Updated: now,
+				},
+				{
+					ID:      2,
+					UID:     "u2",
+					Login:   "User1",
+					Email:   "user1-new@email.com",
+					Name:    "user2",
+					OrgID:   1,
+					Created: now,
+					Updated: now,
+				},
+			},
+			wantUsers: []*user.User{
+				{
+					ID:    1,
+					Login: "user1",
+					Email: "user1@email.com",
+				},
+				{
+					ID:    2,
+					Login: "User1",
+					Email: "user1-new@email.com",
+				},
+			},
+		},
+		// "2 users - same login, one already lowercase"
+		{
+			desc: "2 users with same login one already has lowercase so we keep both case for uppercasing comes first in our loop",
+			users: []*user.User{
+				{
+					ID:      1,
+					UID:     "u1",
+					Login:   "User1",
+					Email:   "user1@email.com",
+					Name:    "user1",
+					OrgID:   1,
+					Created: now,
+					Updated: now,
+				},
+				{
+					ID:      2,
+					UID:     "u2",
+					Login:   "user1",
+					Email:   "user1-new@email.com",
+					Name:    "user2",
+					OrgID:   1,
+					Created: now,
+					Updated: now,
+				},
+			},
+			wantUsers: []*user.User{
+				{
+					ID:    1,
+					Login: "User1",
+					Email: "user1@email.com",
+				},
+				{
+					ID:    2,
+					Login: "user1",
+					Email: "user1-new@email.com",
+				},
+			},
+		},
+		// "2 users - same email, one already lowercase"
+		{
+			desc: "2 users with same email one already has lowercase so we keep both",
+			users: []*user.User{
+				{
+					ID:      1,
+					UID:     "u1",
+					Login:   "user1",
+					Email:   "USER1@email.com",
+					Name:    "user1",
+					OrgID:   1,
+					Created: now,
+					Updated: now,
+				},
+				{
+					ID:      2,
+					UID:     "u2",
+					Login:   "user1-new-login",
+					Email:   "user1@email.com",
+					Name:    "user2",
+					OrgID:   1,
+					Created: now,
+					Updated: now,
+				},
+			},
+			wantUsers: []*user.User{
+				{
+					ID:    1,
+					Login: "user1",
+					Email: "USER1@email.com",
+				},
+				{
+					ID:    2,
+					Login: "user1-new-login",
+					Email: "user1@email.com",
+				},
+			},
+		},
+
+		// "2 users - same login, none lowercase"
+		{
+			desc: "2 users with same login noone is lowercased we pick the most recent user to lowercase",
+			users: []*user.User{
+				{
+					ID:      1,
+					UID:     "u1",
+					Login:   "USER1",
+					Email:   "user1@mail.com",
+					Name:    "user1",
+					OrgID:   1,
+					Created: now.Add(-1 * time.Hour),
+					Updated: now.Add(-1 * time.Hour),
+				},
+				{
+					ID:      2,
+					UID:     "u2",
+					Login:   "User1",
+					Email:   "user1-new@mail.com",
+					Name:    "user2",
+					OrgID:   1,
+					Created: now,
+					Updated: now,
+				},
+			},
+			wantUsers: []*user.User{
+				{
+					ID:    1,
+					Login: "user1",
+					Email: "user1@mail.com",
+				},
+				{
+					ID:    2,
+					Login: "User1",
+					Email: "user1-new@mail.com",
+				},
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.desc, func(t *testing.T) {
+			// Run initial migration to have a working DB
+			x := setupTestDB(t)
+			// Remove migration
+			_, errDeleteMig := x.Exec(`DELETE FROM migration_log WHERE migration_id = ?`, usermig.LowerCaseUserLoginAndEmail)
+			require.NoError(t, errDeleteMig)
+
+			// insert users
+			usersCount, err := x.Insert(tc.users)
+			require.NoError(t, err)
+			require.Equal(t, int64(len(tc.users)), usersCount)
+
+			// run the migration
+			usermigrator := migrator.NewMigrator(x, &setting.Cfg{Logger: log.New("usermigration.test")})
+			usermig.AddLowerCaseUserLoginAndEmail(usermigrator)
+			errRunningMig := usermigrator.Start(false, 0)
+			require.NoError(t, errRunningMig)
+
+			// Check users
+			resultingUsers := []user.User{}
+			err = x.Table("user").Find(&resultingUsers)
+			require.NoError(t, err)
+
+			// Check that the users have been updated
+			require.Equal(t, len(tc.wantUsers), len(resultingUsers))
+
+			for i := range tc.wantUsers {
+				for _, u := range resultingUsers {
+					if u.ID == tc.wantUsers[i].ID {
+						assert.Equal(t, tc.wantUsers[i].Login, u.Login)
+						assert.Equal(t, tc.wantUsers[i].Email, u.Email)
+					}
+				}
+			}
+		})
+	}
+}
diff --git a/pkg/services/sqlstore/migrations/usermig/test/user_test.go b/pkg/services/sqlstore/migrations/usermig/test/user_test.go
new file mode 100644
index 0000000000000..ab7b34e1287c7
--- /dev/null
+++ b/pkg/services/sqlstore/migrations/usermig/test/user_test.go
@@ -0,0 +1,55 @@
+package test
+
+import (
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+	"gopkg.in/ini.v1"
+	"xorm.io/xorm"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrations"
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+	"github.com/grafana/grafana/pkg/services/sqlstore/sqlutil"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+// Setup users
+var (
+	now = time.Now()
+)
+
+func setupTestDB(t *testing.T) *xorm.Engine {
+	t.Helper()
+	dbType := sqlutil.GetTestDBType()
+	testDB, err := sqlutil.GetTestDB(dbType)
+	require.NoError(t, err)
+
+	t.Cleanup(testDB.Cleanup)
+
+	x, err := xorm.NewEngine(testDB.DriverName, testDB.ConnStr)
+	require.NoError(t, err)
+
+	t.Cleanup(func() {
+		if err := x.Close(); err != nil {
+			fmt.Printf("failed to close xorm engine: %v", err)
+		}
+	})
+
+	err = migrator.NewDialect(x.DriverName()).CleanDB(x)
+	require.NoError(t, err)
+
+	mg := migrator.NewMigrator(x, &setting.Cfg{
+		Logger: log.New("users.test"),
+		Raw:    ini.Empty(),
+	})
+	migrations := &migrations.OSSMigrations{}
+	migrations.AddMigration(mg)
+
+	err = mg.Start(false, 0)
+	require.NoError(t, err)
+
+	return x
+}
diff --git a/pkg/services/sqlstore/migrations/usermig/user_lowercase_login_and_email.go b/pkg/services/sqlstore/migrations/usermig/user_lowercase_login_and_email.go
new file mode 100644
index 0000000000000..570b79ba52e91
--- /dev/null
+++ b/pkg/services/sqlstore/migrations/usermig/user_lowercase_login_and_email.go
@@ -0,0 +1,97 @@
+package usermig
+
+import (
+	"strings"
+
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+	"github.com/grafana/grafana/pkg/services/user"
+	"xorm.io/xorm"
+)
+
+const (
+	LowerCaseUserLoginAndEmail = "update login and email fields to lowercase"
+)
+
+// AddLowerCaseUserLoginAndEmail adds a migration that updates the login and email fields of all users to be in lower case.
+func AddLowerCaseUserLoginAndEmail(mg *migrator.Migrator) {
+	mg.AddMigration(LowerCaseUserLoginAndEmail, &UsersLowerCaseLoginAndEmail{})
+}
+
+var _ migrator.CodeMigration = new(UsersLowerCaseLoginAndEmail)
+
+type UsersLowerCaseLoginAndEmail struct {
+	migrator.MigrationBase
+}
+
+func (p *UsersLowerCaseLoginAndEmail) SQL(dialect migrator.Dialect) string {
+	return "code migration"
+}
+
+func (p *UsersLowerCaseLoginAndEmail) Exec(sess *xorm.Session, mg *migrator.Migrator) error {
+	// Get all users
+	users := make([]*user.User, 0)
+	err := sess.Table("user").Find(&users)
+	if err != nil {
+		return err
+	}
+	processedLogins := make(map[string]bool)
+	processedEmails := make(map[string]bool)
+
+	for _, usr := range users {
+		/*
+			LOGIN
+		*/
+		lowerLogin := strings.ToLower(usr.Login)
+		// only work through if login is not already in lower case
+		if usr.Login != lowerLogin && !processedLogins[lowerLogin] {
+			// Check if lower login exists
+			existingLowerCasedUserLogin := &user.User{}
+
+			// lowercaseexists in database
+			hasLowerCasedLogin, err := sess.Table("user").Where("login = ?", lowerLogin).Get(existingLowerCasedUserLogin)
+			if err != nil {
+				return err
+			}
+
+			// If exact login does not exist and lower case login does not exist, update the user's login to be in lower case
+			if !hasLowerCasedLogin {
+				uLogin := user.User{
+					Name:  usr.Name,
+					Login: lowerLogin,
+				}
+				_, err := sess.ID(usr.ID).Update(&uLogin)
+				if err != nil {
+					return err
+				}
+			}
+		}
+		processedLogins[lowerLogin] = true
+
+		/*
+			EMAIL
+		*/
+		lowerEmail := strings.ToLower(usr.Email)
+		// only work through if email is not already in lower case
+		if usr.Email != lowerEmail && !processedEmails[lowerEmail] {
+			// Check if lower case email exists
+			existingUserEmail := &user.User{}
+			hasLowerCasedEmail, err := sess.Table("user").Where("email = ?", lowerEmail).Get(existingUserEmail)
+			if err != nil {
+				return err
+			}
+			// If lower case email does not exist, update the user's email to be in lower case
+			if !hasLowerCasedEmail {
+				uEmail := user.User{
+					Name:  usr.Name,
+					Email: lowerEmail,
+				}
+				_, err := sess.ID(usr.ID).Update(&uEmail)
+				if err != nil {
+					return err
+				}
+			}
+		}
+		processedEmails[lowerEmail] = true
+	}
+	return nil
+}
diff --git a/pkg/services/sqlstore/migrator/dialect.go b/pkg/services/sqlstore/migrator/dialect.go
index a284c47b13444..5aae742b6ca99 100644
--- a/pkg/services/sqlstore/migrator/dialect.go
+++ b/pkg/services/sqlstore/migrator/dialect.go
@@ -1,10 +1,13 @@
 package migrator
 
 import (
+	"context"
 	"fmt"
 	"strconv"
 	"strings"
 
+	"github.com/grafana/grafana/pkg/services/sqlstore/session"
+	"golang.org/x/exp/slices"
 	"xorm.io/xorm"
 )
 
@@ -73,6 +76,25 @@ type Dialect interface {
 	Unlock(LockCfg) error
 
 	GetDBName(string) (string, error)
+
+	// InsertQuery accepts a table name and a map of column names to values to insert.
+	// It returns a query string and a slice of parameters that can be executed against the database.
+	InsertQuery(tableName string, row map[string]any) (string, []any, error)
+	// UpdateQuery accepts a table name, a map of column names to values to update, and a map of
+	// column names to values to use in the where clause.
+	// It returns a query string and a slice of parameters that can be executed against the database.
+	UpdateQuery(tableName string, row map[string]any, where map[string]any) (string, []any, error)
+	// Insert accepts a table name and a map of column names to insert.
+	// The insert is executed as part of the provided session.
+	Insert(ctx context.Context, tx *session.SessionTx, tableName string, row map[string]any) error
+	// Update accepts a table name, a map of column names to values to update, and a map of
+	// column names to values to use in the where clause.
+	// The update is executed as part of the provided session.
+	Update(ctx context.Context, tx *session.SessionTx, tableName string, row map[string]any, where map[string]any) error
+	// Concat returns the sql statement for concating multiple strings
+	// Implementations are not expected to quote the arguments
+	// therefore any callers should take care to quote arguments as necessary
+	Concat(...string) string
 }
 
 type LockCfg struct {
@@ -344,3 +366,95 @@ func (b *BaseDialect) OrderBy(order string) string {
 func (b *BaseDialect) GetDBName(_ string) (string, error) {
 	return "", nil
 }
+
+func (b *BaseDialect) InsertQuery(tableName string, row map[string]any) (string, []any, error) {
+	if len(row) < 1 {
+		return "", nil, fmt.Errorf("no columns provided")
+	}
+
+	// allocate slices
+	cols := make([]string, 0, len(row))
+	vals := make([]any, 0, len(row))
+	keys := make([]string, 0, len(row))
+
+	// create sorted list of columns
+	for col := range row {
+		keys = append(keys, col)
+	}
+	slices.Sort(keys)
+
+	// build query and values
+	for _, col := range keys {
+		cols = append(cols, b.dialect.Quote(col))
+		vals = append(vals, row[col])
+	}
+
+	return fmt.Sprintf("INSERT INTO %s (%s) VALUES (%s)", b.dialect.Quote(tableName), strings.Join(cols, ", "), strings.Repeat("?, ", len(row)-1)+"?"), vals, nil
+}
+
+func (b *BaseDialect) UpdateQuery(tableName string, row map[string]any, where map[string]any) (string, []any, error) {
+	if len(row) < 1 {
+		return "", nil, fmt.Errorf("no columns provided")
+	}
+
+	if len(where) < 1 {
+		return "", nil, fmt.Errorf("no where clause provided")
+	}
+
+	// allocate slices
+	cols := make([]string, 0, len(row))
+	whereCols := make([]string, 0, len(where))
+	vals := make([]any, 0, len(row)+len(where))
+	keys := make([]string, 0, len(row))
+
+	// create sorted list of columns to update
+	for col := range row {
+		keys = append(keys, col)
+	}
+	slices.Sort(keys)
+
+	// build update query and values
+	for _, col := range keys {
+		cols = append(cols, b.dialect.Quote(col)+"=?")
+		vals = append(vals, row[col])
+	}
+
+	// create sorted list of columns for where clause
+	keys = make([]string, 0, len(where))
+	for col := range where {
+		keys = append(keys, col)
+	}
+	slices.Sort(keys)
+
+	// build where clause and values
+	for _, col := range keys {
+		whereCols = append(whereCols, b.dialect.Quote(col)+"=?")
+		vals = append(vals, where[col])
+	}
+
+	return fmt.Sprintf("UPDATE %s SET %s WHERE %s", b.dialect.Quote(tableName), strings.Join(cols, ", "), strings.Join(whereCols, " AND ")), vals, nil
+}
+
+func (b *BaseDialect) Insert(ctx context.Context, tx *session.SessionTx, tableName string, row map[string]any) error {
+	query, args, err := b.InsertQuery(tableName, row)
+	if err != nil {
+		return err
+	}
+
+	_, err = tx.Exec(ctx, query, args...)
+	return err
+}
+
+func (b *BaseDialect) Update(ctx context.Context, tx *session.SessionTx, tableName string, row map[string]any, where map[string]any) error {
+	query, args, err := b.UpdateQuery(tableName, row, where)
+	if err != nil {
+		return err
+	}
+
+	_, err = tx.Exec(ctx, query, args...)
+	return err
+}
+
+func (b *BaseDialect) Concat(strs ...string) string {
+	return fmt.Sprintf("CONCAT(%s)", strings.Join(strs, ", "))
+}
diff --git a/pkg/services/sqlstore/migrator/dialect_test.go b/pkg/services/sqlstore/migrator/dialect_test.go
new file mode 100644
index 0000000000000..7558e5f41a937
--- /dev/null
+++ b/pkg/services/sqlstore/migrator/dialect_test.go
@@ -0,0 +1,117 @@
+package migrator
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestInsertQuery(t *testing.T) {
+	tests := []struct {
+		name                  string
+		tableName             string
+		values                map[string]any
+		expectedErr           bool
+		expectedPostgresQuery string
+		expectedPostgresArgs  []any
+		expectedMySQLQuery    string
+		expectedMySQLArgs     []any
+		expectedSQLiteQuery   string
+		expectedSQLiteArgs    []any
+	}{
+		{
+			"insert one",
+			"some_table",
+			map[string]any{"col1": "val1", "col2": "val2", "col3": "val3"},
+			false,
+			"INSERT INTO \"some_table\" (\"col1\", \"col2\", \"col3\") VALUES (?, ?, ?)",
+			[]any{"val1", "val2", "val3"},
+			"INSERT INTO `some_table` (`col1`, `col2`, `col3`) VALUES (?, ?, ?)",
+			[]any{"val1", "val2", "val3"},
+			"INSERT INTO `some_table` (`col1`, `col2`, `col3`) VALUES (?, ?, ?)",
+			[]any{"val1", "val2", "val3"},
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			var db Dialect
+			db = NewPostgresDialect()
+			q, args, err := db.InsertQuery(tc.tableName, tc.values)
+
+			require.True(t, (err != nil) == tc.expectedErr)
+			require.Equal(t, tc.expectedPostgresQuery, q, "Postgres query incorrect")
+			require.Equal(t, tc.expectedPostgresArgs, args, "Postgres args incorrect")
+
+			db = NewMysqlDialect()
+			q, args, err = db.InsertQuery(tc.tableName, tc.values)
+
+			require.True(t, (err != nil) == tc.expectedErr)
+			require.Equal(t, tc.expectedMySQLQuery, q, "MySQL query incorrect")
+			require.Equal(t, tc.expectedMySQLArgs, args, "MySQL args incorrect")
+
+			db = NewSQLite3Dialect()
+			q, args, err = db.InsertQuery(tc.tableName, tc.values)
+
+			require.True(t, (err != nil) == tc.expectedErr)
+			require.Equal(t, tc.expectedSQLiteQuery, q, "SQLite query incorrect")
+			require.Equal(t, tc.expectedSQLiteArgs, args, "SQLite args incorrect")
+		})
+	}
+}
+
+func TestUpdateQuery(t *testing.T) {
+	tests := []struct {
+		name                  string
+		tableName             string
+		values                map[string]any
+		where                 map[string]any
+		expectedErr           bool
+		expectedPostgresQuery string
+		expectedPostgresArgs  []any
+		expectedMySQLQuery    string
+		expectedMySQLArgs     []any
+		expectedSQLiteQuery   string
+		expectedSQLiteArgs    []any
+	}{
+		{
+			"insert one",
+			"some_table",
+			map[string]any{"col1": "val1", "col2": "val2", "col3": "val3"},
+			map[string]any{"key1": 10},
+			false,
+			"UPDATE \"some_table\" SET \"col1\"=?, \"col2\"=?, \"col3\"=? WHERE \"key1\"=?",
+			[]any{"val1", "val2", "val3", 10},
+			"UPDATE `some_table` SET `col1`=?, `col2`=?, `col3`=? WHERE `key1`=?",
+			[]any{"val1", "val2", "val3", 10},
+			"UPDATE `some_table` SET `col1`=?, `col2`=?, `col3`=? WHERE `key1`=?",
+			[]any{"val1", "val2", "val3", 10},
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			var db Dialect
+			db = NewPostgresDialect()
+			q, args, err := db.UpdateQuery(tc.tableName, tc.values, tc.where)
+
+			require.True(t, (err != nil) == tc.expectedErr)
+			require.Equal(t, tc.expectedPostgresQuery, q, "Postgres query incorrect")
+			require.Equal(t, tc.expectedPostgresArgs, args, "Postgres args incorrect")
+
+			db = NewMysqlDialect()
+			q, args, err = db.UpdateQuery(tc.tableName, tc.values, tc.where)
+
+			require.True(t, (err != nil) == tc.expectedErr)
+			require.Equal(t, tc.expectedMySQLQuery, q, "MySQL query incorrect")
+			require.Equal(t, tc.expectedMySQLArgs, args, "MySQL args incorrect")
+
+			db = NewSQLite3Dialect()
+			q, args, err = db.UpdateQuery(tc.tableName, tc.values, tc.where)
+
+			require.True(t, (err != nil) == tc.expectedErr)
+			require.Equal(t, tc.expectedSQLiteQuery, q, "SQLite query incorrect")
+			require.Equal(t, tc.expectedSQLiteArgs, args, "SQLite args incorrect")
+		})
+	}
+}
diff --git a/pkg/services/sqlstore/migrator/migrator.go b/pkg/services/sqlstore/migrator/migrator.go
index e32a768364462..c58da4729b233 100644
--- a/pkg/services/sqlstore/migrator/migrator.go
+++ b/pkg/services/sqlstore/migrator/migrator.go
@@ -1,13 +1,14 @@
 package migrator
 
 import (
+	"errors"
 	"fmt"
 	"time"
 
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/golang-migrate/migrate/v4/database"
 	_ "github.com/lib/pq"
-	_ "github.com/mattn/go-sqlite3"
+	"github.com/mattn/go-sqlite3"
 	"go.uber.org/atomic"
 	"xorm.io/xorm"
 
@@ -59,7 +60,7 @@ func NewScopedMigrator(engine *xorm.Engine, cfg *setting.Cfg, scope string) *Mig
 		mg.Logger = log.New("migrator")
 	} else {
 		mg.tableName = scope + "_migration_log"
-		mg.Logger = log.New(scope + " migrator")
+		mg.Logger = log.New(scope + "-migrator")
 	}
 	return mg
 }
@@ -208,6 +209,13 @@ func (mg *Migrator) run() (err error) {
 
 		err := mg.InTransaction(func(sess *xorm.Session) error {
 			err := mg.exec(m, sess)
+			// if we get an sqlite busy/locked error, sleep 100ms and try again
+			if errors.Is(err, sqlite3.ErrLocked) || errors.Is(err, sqlite3.ErrBusy) {
+				mg.Logger.Debug("Database locked, sleeping then retrying", "error", err, "sql", sql)
+				time.Sleep(100 * time.Millisecond)
+				err = mg.exec(m, sess)
+			}
+
 			if err != nil {
 				mg.Logger.Error("Exec failed", "error", err, "sql", sql)
 				record.Error = err.Error()
diff --git a/pkg/services/sqlstore/migrator/mysql_dialect.go b/pkg/services/sqlstore/migrator/mysql_dialect.go
index 76433c142e518..d9a2f79e0cf3d 100644
--- a/pkg/services/sqlstore/migrator/mysql_dialect.go
+++ b/pkg/services/sqlstore/migrator/mysql_dialect.go
@@ -69,6 +69,9 @@ func (db *MySQLDialect) SQLType(c *Column) string {
 		c.Length = 64
 	case DB_NVarchar:
 		res = DB_Varchar
+	case DB_Uuid:
+		res = DB_Char
+		c.Length = 36
 	default:
 		res = c.Type
 	}
diff --git a/pkg/services/sqlstore/migrator/sqlite_dialect.go b/pkg/services/sqlstore/migrator/sqlite_dialect.go
index 17bb097e19971..c2979ea1925d4 100644
--- a/pkg/services/sqlstore/migrator/sqlite_dialect.go
+++ b/pkg/services/sqlstore/migrator/sqlite_dialect.go
@@ -209,3 +209,7 @@ func (db *SQLite3) UpsertMultipleSQL(tableName string, keyCols, updateCols []str
 	)
 	return s, nil
 }
+
+func (db *SQLite3) Concat(strs ...string) string {
+	return strings.Join(strs, " || ")
+}
diff --git a/pkg/services/sqlstore/permissions/dashboard.go b/pkg/services/sqlstore/permissions/dashboard.go
index cf12f5bcd0567..38f8ad92a6017 100644
--- a/pkg/services/sqlstore/permissions/dashboard.go
+++ b/pkg/services/sqlstore/permissions/dashboard.go
@@ -3,13 +3,13 @@ package permissions
 import (
 	"bytes"
 	"fmt"
+	"slices"
 	"strings"
 
-	"golang.org/x/exp/slices"
-
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/login"
@@ -42,14 +42,14 @@ type PermissionsFilter interface {
 	Where() (string, []any)
 
 	buildClauses()
-	nestedFoldersSelectors(permSelector string, permSelectorArgs []any, leftTableCol string, rightTableCol string) (string, []any)
+	nestedFoldersSelectors(permSelector string, permSelectorArgs []any, leftTable string, Col string, rightTableCol string, orgID int64) (string, []any)
 }
 
-// NewAccessControlDashboardPermissionFilter creates a new AccessControlDashboardPermissionFilter that is configured with specific actions calculated based on the dashboards.PermissionType and query type
+// NewAccessControlDashboardPermissionFilter creates a new AccessControlDashboardPermissionFilter that is configured with specific actions calculated based on the dashboardaccess.PermissionType and query type
 // The filter is configured to use the new permissions filter (without subqueries) if the feature flag is enabled
 // The filter is configured to use the old permissions filter (with subqueries) if the feature flag is disabled
-func NewAccessControlDashboardPermissionFilter(user identity.Requester, permissionLevel dashboards.PermissionType, queryType string, features featuremgmt.FeatureToggles, recursiveQueriesAreSupported bool) PermissionsFilter {
-	needEdit := permissionLevel > dashboards.PERMISSION_VIEW
+func NewAccessControlDashboardPermissionFilter(user identity.Requester, permissionLevel dashboardaccess.PermissionType, queryType string, features featuremgmt.FeatureToggles, recursiveQueriesAreSupported bool) PermissionsFilter {
+	needEdit := permissionLevel > dashboardaccess.PERMISSION_VIEW
 
 	var folderActions []string
 	var dashboardActions []string
@@ -75,6 +75,8 @@ func NewAccessControlDashboardPermissionFilter(user identity.Requester, permissi
 				accesscontrol.ActionAlertingRuleCreate,
 			)
 		}
+	} else if queryType == searchstore.TypeAnnotation {
+		dashboardActions = append(dashboardActions, accesscontrol.ActionAnnotationsRead)
 	} else {
 		folderActions = append(folderActions, dashboards.ActionFoldersRead)
 		dashboardActions = append(dashboardActions, dashboards.ActionDashboardsRead)
@@ -85,7 +87,7 @@ func NewAccessControlDashboardPermissionFilter(user identity.Requester, permissi
 	}
 
 	var f PermissionsFilter
-	if features.IsEnabled(featuremgmt.FlagPermissionsFilterRemoveSubquery) {
+	if features.IsEnabledGlobally(featuremgmt.FlagPermissionsFilterRemoveSubquery) {
 		f = &accessControlDashboardPermissionFilterNoFolderSubquery{
 			accessControlDashboardPermissionFilter: accessControlDashboardPermissionFilter{
 				user: user, folderActions: folderActions, dashboardActions: dashboardActions, features: features,
@@ -127,7 +129,8 @@ func (f *accessControlDashboardPermissionFilter) buildClauses() {
 		userID, _ = identity.IntIdentifier(namespaceID, identifier)
 	}
 
-	filter, params := accesscontrol.UserRolesFilter(f.user.GetOrgID(), userID, f.user.GetTeams(), accesscontrol.GetOrgRoles(f.user))
+	orgID := f.user.GetOrgID()
+	filter, params := accesscontrol.UserRolesFilter(orgID, userID, f.user.GetTeams(), accesscontrol.GetOrgRoles(f.user))
 	rolesFilter := " AND role_id IN(SELECT id FROM role " + filter + ") "
 	var args []any
 	builder := strings.Builder{}
@@ -138,14 +141,14 @@ func (f *accessControlDashboardPermissionFilter) buildClauses() {
 
 	// useSelfContainedPermissions is true if the user's permissions are stored and set from the JWT token
 	// currently it's used for the extended JWT module (when the user is authenticated via a JWT token generated by Grafana)
-	useSelfContainedPermissions := f.user.GetAuthenticatedBy() == login.ExtendedJWTModule
+	useSelfContainedPermissions := f.user.IsAuthenticatedBy(login.ExtendedJWTModule)
 
 	if len(f.dashboardActions) > 0 {
 		toCheck := actionsToCheck(f.dashboardActions, f.user.GetPermissions(), dashWildcards, folderWildcards)
 
 		if len(toCheck) > 0 {
 			if !useSelfContainedPermissions {
-				builder.WriteString("(dashboard.uid IN (SELECT substr(scope, 16) FROM permission WHERE scope LIKE 'dashboards:uid:%'")
+				builder.WriteString("(dashboard.uid IN (SELECT identifier FROM permission WHERE kind = 'dashboards' AND attribute = 'uid'")
 				builder.WriteString(rolesFilter)
 				args = append(args, params...)
 
@@ -153,7 +156,7 @@ func (f *accessControlDashboardPermissionFilter) buildClauses() {
 					builder.WriteString(" AND action = ?")
 					args = append(args, toCheck[0])
 				} else {
-					builder.WriteString(" AND action IN (?" + strings.Repeat(", ?", len(toCheck)-1) + ") GROUP BY role_id, scope HAVING COUNT(action) = ?")
+					builder.WriteString(" AND action IN (?" + strings.Repeat(", ?", len(toCheck)-1) + ") GROUP BY role_id, scope, identifier HAVING COUNT(action) = ?")
 					args = append(args, toCheck...)
 					args = append(args, len(toCheck))
 				}
@@ -175,7 +178,7 @@ func (f *accessControlDashboardPermissionFilter) buildClauses() {
 			builder.WriteString(" OR ")
 
 			if !useSelfContainedPermissions {
-				permSelector.WriteString("(SELECT substr(scope, 13) FROM permission WHERE scope LIKE 'folders:uid:%' ")
+				permSelector.WriteString("(SELECT identifier FROM permission WHERE kind = 'folders' AND attribute = 'uid'")
 				permSelector.WriteString(rolesFilter)
 				permSelectorArgs = append(permSelectorArgs, params...)
 
@@ -183,7 +186,7 @@ func (f *accessControlDashboardPermissionFilter) buildClauses() {
 					permSelector.WriteString(" AND action = ?")
 					permSelectorArgs = append(permSelectorArgs, toCheck[0])
 				} else {
-					permSelector.WriteString(" AND action IN (?" + strings.Repeat(", ?", len(toCheck)-1) + ") GROUP BY role_id, scope HAVING COUNT(action) = ?")
+					permSelector.WriteString(" AND action IN (?" + strings.Repeat(", ?", len(toCheck)-1) + ") GROUP BY role_id, scope, identifier HAVING COUNT(action) = ?")
 					permSelectorArgs = append(permSelectorArgs, toCheck...)
 					permSelectorArgs = append(permSelectorArgs, len(toCheck))
 				}
@@ -201,17 +204,18 @@ func (f *accessControlDashboardPermissionFilter) buildClauses() {
 			}
 			permSelector.WriteRune(')')
 
-			switch f.features.IsEnabled(featuremgmt.FlagNestedFolders) {
+			switch f.features.IsEnabledGlobally(featuremgmt.FlagNestedFolders) {
 			case true:
 				if len(permSelectorArgs) > 0 {
 					switch f.recursiveQueriesAreSupported {
 					case true:
 						builder.WriteString("(dashboard.folder_id IN (SELECT d.id FROM dashboard as d ")
 						recQueryName := fmt.Sprintf("RecQry%d", len(f.recQueries))
-						f.addRecQry(recQueryName, permSelector.String(), permSelectorArgs)
-						builder.WriteString(fmt.Sprintf("WHERE d.uid IN (SELECT uid FROM %s)", recQueryName))
+						f.addRecQry(recQueryName, permSelector.String(), permSelectorArgs, orgID)
+						builder.WriteString(fmt.Sprintf("WHERE d.org_id = ? AND d.uid IN (SELECT uid FROM %s)", recQueryName))
+						args = append(args, orgID)
 					default:
-						nestedFoldersSelectors, nestedFoldersArgs := f.nestedFoldersSelectors(permSelector.String(), permSelectorArgs, "dashboard.folder_id", "d.id")
+						nestedFoldersSelectors, nestedFoldersArgs := f.nestedFoldersSelectors(permSelector.String(), permSelectorArgs, "dashboard", "folder_id", "d.id", orgID)
 						builder.WriteRune('(')
 						builder.WriteString(nestedFoldersSelectors)
 						args = append(args, nestedFoldersArgs...)
@@ -223,7 +227,8 @@ func (f *accessControlDashboardPermissionFilter) buildClauses() {
 			default:
 				builder.WriteString("(dashboard.folder_id IN (SELECT d.id FROM dashboard as d ")
 				if len(permSelectorArgs) > 0 {
-					builder.WriteString("WHERE d.uid IN ")
+					builder.WriteString("WHERE d.org_id = ? AND d.uid IN ")
+					args = append(args, orgID)
 					builder.WriteString(permSelector.String())
 					args = append(args, permSelectorArgs...)
 				} else {
@@ -253,14 +258,14 @@ func (f *accessControlDashboardPermissionFilter) buildClauses() {
 		toCheck := actionsToCheck(f.folderActions, f.user.GetPermissions(), folderWildcards)
 		if len(toCheck) > 0 {
 			if !useSelfContainedPermissions {
-				permSelector.WriteString("(SELECT substr(scope, 13) FROM permission WHERE scope LIKE 'folders:uid:%'")
+				permSelector.WriteString("(SELECT identifier FROM permission WHERE kind = 'folders' AND attribute = 'uid'")
 				permSelector.WriteString(rolesFilter)
 				permSelectorArgs = append(permSelectorArgs, params...)
 				if len(toCheck) == 1 {
 					permSelector.WriteString(" AND action = ?")
 					permSelectorArgs = append(permSelectorArgs, toCheck[0])
 				} else {
-					permSelector.WriteString(" AND action IN (?" + strings.Repeat(", ?", len(toCheck)-1) + ") GROUP BY role_id, scope HAVING COUNT(action) = ?")
+					permSelector.WriteString(" AND action IN (?" + strings.Repeat(", ?", len(toCheck)-1) + ") GROUP BY role_id, scope, identifier HAVING COUNT(action) = ?")
 					permSelectorArgs = append(permSelectorArgs, toCheck...)
 					permSelectorArgs = append(permSelectorArgs, len(toCheck))
 				}
@@ -278,17 +283,17 @@ func (f *accessControlDashboardPermissionFilter) buildClauses() {
 
 			permSelector.WriteRune(')')
 
-			switch f.features.IsEnabled(featuremgmt.FlagNestedFolders) {
+			switch f.features.IsEnabledGlobally(featuremgmt.FlagNestedFolders) {
 			case true:
 				if len(permSelectorArgs) > 0 {
 					switch f.recursiveQueriesAreSupported {
 					case true:
 						recQueryName := fmt.Sprintf("RecQry%d", len(f.recQueries))
-						f.addRecQry(recQueryName, permSelector.String(), permSelectorArgs)
+						f.addRecQry(recQueryName, permSelector.String(), permSelectorArgs, orgID)
 						builder.WriteString("(dashboard.uid IN ")
 						builder.WriteString(fmt.Sprintf("(SELECT uid FROM %s)", recQueryName))
 					default:
-						nestedFoldersSelectors, nestedFoldersArgs := f.nestedFoldersSelectors(permSelector.String(), permSelectorArgs, "dashboard.uid", "d.uid")
+						nestedFoldersSelectors, nestedFoldersArgs := f.nestedFoldersSelectors(permSelector.String(), permSelectorArgs, "dashboard", "uid", "d.uid", orgID)
 						builder.WriteRune('(')
 						builder.WriteString(nestedFoldersSelectors)
 						builder.WriteRune(')')
@@ -335,15 +340,17 @@ func (f *accessControlDashboardPermissionFilter) With() (string, []any) {
 	return sb.String(), params
 }
 
-func (f *accessControlDashboardPermissionFilter) addRecQry(queryName string, whereUIDSelect string, whereParams []any) {
+func (f *accessControlDashboardPermissionFilter) addRecQry(queryName string, whereUIDSelect string, whereParams []any, orgID int64) {
 	if f.recQueries == nil {
 		f.recQueries = make([]clause, 0, maximumRecursiveQueries)
 	}
 	c := make([]any, len(whereParams))
 	copy(c, whereParams)
+	c = append([]any{orgID}, c...)
 	f.recQueries = append(f.recQueries, clause{
+		// covered by UQE_folder_org_id_uid and UQE_folder_org_id_parent_uid_title
 		string: fmt.Sprintf(`%s AS (
-			SELECT uid, parent_uid, org_id FROM folder WHERE uid IN %s
+			SELECT uid, parent_uid, org_id FROM folder WHERE org_id = ? AND uid IN %s
 			UNION ALL SELECT f.uid, f.parent_uid, f.org_id FROM folder f INNER JOIN %s r ON f.parent_uid = r.uid and f.org_id = r.org_id
 		)`, queryName, whereUIDSelect, queryName),
 		params: c,
@@ -373,12 +380,13 @@ func actionsToCheck(actions []string, permissions map[string][]string, wildcards
 	return toCheck
 }
 
-func (f *accessControlDashboardPermissionFilter) nestedFoldersSelectors(permSelector string, permSelectorArgs []any, leftTableCol string, rightTableCol string) (string, []any) {
+func (f *accessControlDashboardPermissionFilter) nestedFoldersSelectors(permSelector string, permSelectorArgs []any, leftTable string, leftCol string, rightTableCol string, orgID int64) (string, []any) {
 	wheres := make([]string, 0, folder.MaxNestedFolderDepth+1)
 	args := make([]any, 0, len(permSelectorArgs)*(folder.MaxNestedFolderDepth+1))
 
 	joins := make([]string, 0, folder.MaxNestedFolderDepth+2)
 
+	// covered by UQE_folder_org_id_uid
 	tmpl := "INNER JOIN folder %s ON %s.%s = %s.uid AND %s.org_id = %s.org_id "
 
 	prev := "d"
@@ -388,7 +396,9 @@ func (f *accessControlDashboardPermissionFilter) nestedFoldersSelectors(permSele
 		s := fmt.Sprintf(tmpl, t, prev, onCol, t, prev, t)
 		joins = append(joins, s)
 
-		wheres = append(wheres, fmt.Sprintf("(%s IN (SELECT %s FROM dashboard d %s WHERE %s.uid IN %s)", leftTableCol, rightTableCol, strings.Join(joins, " "), t, permSelector))
+		// covered by UQE_folder_org_id_uid
+		wheres = append(wheres, fmt.Sprintf("(%s.org_id = ? AND %s.%s IN (SELECT %s FROM dashboard d %s WHERE %s.org_id = ? AND %s.uid IN %s)", leftTable, leftTable, leftCol, rightTableCol, strings.Join(joins, " "), t, t, permSelector))
+		args = append(args, orgID, orgID)
 		args = append(args, permSelectorArgs...)
 
 		prev = t
diff --git a/pkg/services/sqlstore/permissions/dashboard_filter_no_subquery.go b/pkg/services/sqlstore/permissions/dashboard_filter_no_subquery.go
index 2507c21fba932..120b432a57e96 100644
--- a/pkg/services/sqlstore/permissions/dashboard_filter_no_subquery.go
+++ b/pkg/services/sqlstore/permissions/dashboard_filter_no_subquery.go
@@ -40,7 +40,8 @@ func (f *accessControlDashboardPermissionFilterNoFolderSubquery) buildClauses()
 		userID, _ = identity.IntIdentifier(namespaceID, identifier)
 	}
 
-	filter, params := accesscontrol.UserRolesFilter(f.user.GetOrgID(), userID, f.user.GetTeams(), accesscontrol.GetOrgRoles(f.user))
+	orgID := f.user.GetOrgID()
+	filter, params := accesscontrol.UserRolesFilter(orgID, userID, f.user.GetTeams(), accesscontrol.GetOrgRoles(f.user))
 	rolesFilter := " AND role_id IN(SELECT id FROM role " + filter + ") "
 	var args []any
 	builder := strings.Builder{}
@@ -58,7 +59,7 @@ func (f *accessControlDashboardPermissionFilterNoFolderSubquery) buildClauses()
 
 		if len(toCheck) > 0 {
 			if !useSelfContainedPermissions {
-				builder.WriteString("(dashboard.uid IN (SELECT substr(scope, 16) FROM permission WHERE scope LIKE 'dashboards:uid:%'")
+				builder.WriteString("(dashboard.uid IN (SELECT identifier FROM permission WHERE kind = 'dashboards' AND attribute = 'uid'")
 				builder.WriteString(rolesFilter)
 				args = append(args, params...)
 
@@ -66,7 +67,7 @@ func (f *accessControlDashboardPermissionFilterNoFolderSubquery) buildClauses()
 					builder.WriteString(" AND action = ?")
 					args = append(args, toCheck[0])
 				} else {
-					builder.WriteString(" AND action IN (?" + strings.Repeat(", ?", len(toCheck)-1) + ") GROUP BY role_id, scope HAVING COUNT(action) = ?")
+					builder.WriteString(" AND action IN (?" + strings.Repeat(", ?", len(toCheck)-1) + ") GROUP BY role_id, scope, identifier HAVING COUNT(action) = ?")
 					args = append(args, toCheck...)
 					args = append(args, len(toCheck))
 				}
@@ -88,7 +89,7 @@ func (f *accessControlDashboardPermissionFilterNoFolderSubquery) buildClauses()
 			builder.WriteString(" OR ")
 
 			if !useSelfContainedPermissions {
-				permSelector.WriteString("(SELECT substr(scope, 13) FROM permission WHERE scope LIKE 'folders:uid:%' ")
+				permSelector.WriteString("(SELECT identifier FROM permission WHERE kind = 'folders' AND attribute = 'uid'")
 				permSelector.WriteString(rolesFilter)
 				permSelectorArgs = append(permSelectorArgs, params...)
 
@@ -96,7 +97,7 @@ func (f *accessControlDashboardPermissionFilterNoFolderSubquery) buildClauses()
 					permSelector.WriteString(" AND action = ?")
 					permSelectorArgs = append(permSelectorArgs, toCheck[0])
 				} else {
-					permSelector.WriteString(" AND action IN (?" + strings.Repeat(", ?", len(toCheck)-1) + ") GROUP BY role_id, scope HAVING COUNT(action) = ?")
+					permSelector.WriteString(" AND action IN (?" + strings.Repeat(", ?", len(toCheck)-1) + ") GROUP BY role_id, scope, identifier HAVING COUNT(action) = ?")
 					permSelectorArgs = append(permSelectorArgs, toCheck...)
 					permSelectorArgs = append(permSelectorArgs, len(toCheck))
 				}
@@ -115,16 +116,16 @@ func (f *accessControlDashboardPermissionFilterNoFolderSubquery) buildClauses()
 
 			permSelector.WriteRune(')')
 
-			switch f.features.IsEnabled(featuremgmt.FlagNestedFolders) {
+			switch f.features.IsEnabledGlobally(featuremgmt.FlagNestedFolders) {
 			case true:
 				if len(permSelectorArgs) > 0 {
 					switch f.recursiveQueriesAreSupported {
 					case true:
 						recQueryName := fmt.Sprintf("RecQry%d", len(f.recQueries))
-						f.addRecQry(recQueryName, permSelector.String(), permSelectorArgs)
+						f.addRecQry(recQueryName, permSelector.String(), permSelectorArgs, orgID)
 						builder.WriteString("(folder.uid IN (SELECT uid FROM " + recQueryName)
 					default:
-						nestedFoldersSelectors, nestedFoldersArgs := f.nestedFoldersSelectors(permSelector.String(), permSelectorArgs, "folder.uid", "")
+						nestedFoldersSelectors, nestedFoldersArgs := f.nestedFoldersSelectors(permSelector.String(), permSelectorArgs, "folder", "uid", "", orgID)
 						builder.WriteRune('(')
 						builder.WriteString(nestedFoldersSelectors)
 						args = append(args, nestedFoldersArgs...)
@@ -168,14 +169,14 @@ func (f *accessControlDashboardPermissionFilterNoFolderSubquery) buildClauses()
 		toCheck := actionsToCheck(f.folderActions, f.user.GetPermissions(), folderWildcards)
 		if len(toCheck) > 0 {
 			if !useSelfContainedPermissions {
-				permSelector.WriteString("(SELECT substr(scope, 13) FROM permission WHERE scope LIKE 'folders:uid:%'")
+				permSelector.WriteString("(SELECT identifier FROM permission WHERE kind = 'folders' AND attribute = 'uid'")
 				permSelector.WriteString(rolesFilter)
 				permSelectorArgs = append(permSelectorArgs, params...)
 				if len(toCheck) == 1 {
 					permSelector.WriteString(" AND action = ?")
 					permSelectorArgs = append(permSelectorArgs, toCheck[0])
 				} else {
-					permSelector.WriteString(" AND action IN (?" + strings.Repeat(", ?", len(toCheck)-1) + ") GROUP BY role_id, scope HAVING COUNT(action) = ?")
+					permSelector.WriteString(" AND action IN (?" + strings.Repeat(", ?", len(toCheck)-1) + ") GROUP BY role_id, scope, identifier HAVING COUNT(action) = ?")
 					permSelectorArgs = append(permSelectorArgs, toCheck...)
 					permSelectorArgs = append(permSelectorArgs, len(toCheck))
 				}
@@ -192,17 +193,17 @@ func (f *accessControlDashboardPermissionFilterNoFolderSubquery) buildClauses()
 			}
 			permSelector.WriteRune(')')
 
-			switch f.features.IsEnabled(featuremgmt.FlagNestedFolders) {
+			switch f.features.IsEnabledGlobally(featuremgmt.FlagNestedFolders) {
 			case true:
 				if len(permSelectorArgs) > 0 {
 					switch f.recursiveQueriesAreSupported {
 					case true:
 						recQueryName := fmt.Sprintf("RecQry%d", len(f.recQueries))
-						f.addRecQry(recQueryName, permSelector.String(), permSelectorArgs)
+						f.addRecQry(recQueryName, permSelector.String(), permSelectorArgs, orgID)
 						builder.WriteString("(dashboard.uid IN ")
 						builder.WriteString(fmt.Sprintf("(SELECT uid FROM %s)", recQueryName))
 					default:
-						nestedFoldersSelectors, nestedFoldersArgs := f.nestedFoldersSelectors(permSelector.String(), permSelectorArgs, "dashboard.uid", "")
+						nestedFoldersSelectors, nestedFoldersArgs := f.nestedFoldersSelectors(permSelector.String(), permSelectorArgs, "dashboard", "uid", "", orgID)
 						builder.WriteRune('(')
 						builder.WriteString(nestedFoldersSelectors)
 						builder.WriteRune(')')
@@ -230,15 +231,18 @@ func (f *accessControlDashboardPermissionFilterNoFolderSubquery) buildClauses()
 	f.where = clause{string: builder.String(), params: args}
 }
 
-func (f *accessControlDashboardPermissionFilterNoFolderSubquery) nestedFoldersSelectors(permSelector string, permSelectorArgs []any, leftTableCol string, _ string) (string, []any) {
+func (f *accessControlDashboardPermissionFilterNoFolderSubquery) nestedFoldersSelectors(permSelector string, permSelectorArgs []any, leftTable string, leftCol string, _ string, orgID int64) (string, []any) {
 	wheres := make([]string, 0, folder.MaxNestedFolderDepth+1)
 	args := make([]any, 0, len(permSelectorArgs)*(folder.MaxNestedFolderDepth+1))
 
 	joins := make([]string, 0, folder.MaxNestedFolderDepth+2)
 
+	// covered by UQE_folder_org_id_parent_uid_title
 	tmpl := "INNER JOIN folder %s ON %s.parent_uid = %s.uid AND %s.org_id = %s.org_id "
 
-	wheres = append(wheres, fmt.Sprintf("(%s IN (SELECT f1.uid FROM folder f1 WHERE f1.uid IN %s)", leftTableCol, permSelector))
+	// covered by UQE_folder_org_id_uid
+	wheres = append(wheres, fmt.Sprintf("(%s.org_id = ? AND %s.%s IN (SELECT f1.uid FROM folder f1 WHERE f1.org_id = ? AND f1.uid IN %s)", leftTable, leftTable, leftCol, permSelector))
+	args = append(args, orgID, orgID)
 	args = append(args, permSelectorArgs...)
 
 	prev := "f1"
@@ -247,7 +251,9 @@ func (f *accessControlDashboardPermissionFilterNoFolderSubquery) nestedFoldersSe
 		s := fmt.Sprintf(tmpl, t, prev, t, prev, t)
 		joins = append(joins, s)
 
-		wheres = append(wheres, fmt.Sprintf("(%s IN (SELECT f1.uid FROM folder f1 %s WHERE %s.uid IN %s)", leftTableCol, strings.Join(joins, " "), t, permSelector))
+		// covered by UQE_folder_org_id_uid
+		wheres = append(wheres, fmt.Sprintf("(%s.org_id = ? AND %s.%s IN (SELECT f1.uid FROM folder f1 %s WHERE %s.org_id = ? AND %s.uid IN %s)", leftTable, leftTable, leftCol, strings.Join(joins, " "), t, t, permSelector))
+		args = append(args, orgID, orgID)
 		args = append(args, permSelectorArgs...)
 
 		prev = t
diff --git a/pkg/services/sqlstore/permissions/dashboard_test.go b/pkg/services/sqlstore/permissions/dashboard_test.go
index a47c31821901d..00a77a7964e5e 100644
--- a/pkg/services/sqlstore/permissions/dashboard_test.go
+++ b/pkg/services/sqlstore/permissions/dashboard_test.go
@@ -17,6 +17,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/mock"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/dashboards/database"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/folder"
@@ -28,10 +29,16 @@ import (
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/services/sqlstore/permissions"
 	"github.com/grafana/grafana/pkg/services/sqlstore/searchstore"
+	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
 	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
 	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegration_DashboardPermissionFilter(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
@@ -40,7 +47,7 @@ func TestIntegration_DashboardPermissionFilter(t *testing.T) {
 	type testCase struct {
 		desc           string
 		queryType      string
-		permission     dashboards.PermissionType
+		permission     dashboardaccess.PermissionType
 		permissions    []accesscontrol.Permission
 		expectedResult int
 	}
@@ -48,7 +55,7 @@ func TestIntegration_DashboardPermissionFilter(t *testing.T) {
 	tests := []testCase{
 		{
 			desc:       "Should be able to view all dashboards with wildcard scope",
-			permission: dashboards.PERMISSION_VIEW,
+			permission: dashboardaccess.PERMISSION_VIEW,
 			permissions: []accesscontrol.Permission{
 				{Action: dashboards.ActionDashboardsRead, Scope: dashboards.ScopeDashboardsAll},
 			},
@@ -56,62 +63,36 @@ func TestIntegration_DashboardPermissionFilter(t *testing.T) {
 		},
 		{
 			desc:       "Should be able to view all dashboards with folder wildcard scope",
-			permission: dashboards.PERMISSION_VIEW,
+			permission: dashboardaccess.PERMISSION_VIEW,
 			permissions: []accesscontrol.Permission{
 				{Action: dashboards.ActionDashboardsRead, Scope: dashboards.ScopeFoldersAll},
 			},
 			expectedResult: 110,
 		},
-		{
-			desc:       "Should be able to view dashboards under the root with folders:uid:general scope",
-			permission: dashboards.PERMISSION_VIEW,
-			permissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionDashboardsRead, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID(folder.GeneralFolderUID)},
-			},
-			expectedResult: 10,
-		},
 		{
 			desc:       "Should not be able to view editable dashboards under the root with folders:uid:general scope if missing write action",
-			permission: dashboards.PERMISSION_EDIT,
+			permission: dashboardaccess.PERMISSION_EDIT,
 			permissions: []accesscontrol.Permission{
 				{Action: dashboards.ActionDashboardsRead, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID(folder.GeneralFolderUID)},
 			},
 			expectedResult: 0,
 		},
-		{
-			desc:       "Should be able to view editable dashboards under the root with folders:uid:general scope if has write action",
-			permission: dashboards.PERMISSION_EDIT,
-			permissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionDashboardsRead, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID(folder.GeneralFolderUID)},
-				{Action: dashboards.ActionDashboardsWrite, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID(folder.GeneralFolderUID)},
-			},
-			expectedResult: 10,
-		},
 		{
 			desc:       "Should be able to view a subset of dashboards with dashboard scopes",
-			permission: dashboards.PERMISSION_VIEW,
+			permission: dashboardaccess.PERMISSION_VIEW,
 			permissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:110"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:40"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:22"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:13"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:55"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:99"},
+				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:110", Kind: "dashboards", Identifier: "110"},
+				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:40", Kind: "dashboards", Identifier: "40"},
+				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:22", Kind: "dashboards", Identifier: "22"},
+				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:13", Kind: "dashboards", Identifier: "13"},
+				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:55", Kind: "dashboards", Identifier: "55"},
+				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:99", Kind: "dashboards", Identifier: "99"},
 			},
 			expectedResult: 6,
 		},
-		{
-			desc:       "Should be able to view a subset of dashboards with dashboard action and folder scope",
-			permission: dashboards.PERMISSION_VIEW,
-			permissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:8"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:10"},
-			},
-			expectedResult: 20,
-		},
 		{
 			desc:       "Should be able to view all folders with folder wildcard",
-			permission: dashboards.PERMISSION_VIEW,
+			permission: dashboardaccess.PERMISSION_VIEW,
 			permissions: []accesscontrol.Permission{
 				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:*"},
 			},
@@ -119,69 +100,69 @@ func TestIntegration_DashboardPermissionFilter(t *testing.T) {
 		},
 		{
 			desc:       "Should be able to view a subset folders",
-			permission: dashboards.PERMISSION_VIEW,
+			permission: dashboardaccess.PERMISSION_VIEW,
 			permissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:3"},
-				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:6"},
-				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:9"},
+				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:3", Kind: "folders", Identifier: "3"},
+				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:6", Kind: "folders", Identifier: "6"},
+				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:9", Kind: "folders", Identifier: "9"},
 			},
 			expectedResult: 3,
 		},
 		{
 			desc:       "Should return folders and dashboard with 'edit' permission",
-			permission: dashboards.PERMISSION_EDIT,
+			permission: dashboardaccess.PERMISSION_EDIT,
 			permissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:3"},
-				{Action: dashboards.ActionDashboardsCreate, Scope: "folders:uid:3"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:33"},
-				{Action: dashboards.ActionDashboardsWrite, Scope: "dashboards:uid:33"},
+				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:3", Kind: "folders", Identifier: "3"},
+				{Action: dashboards.ActionDashboardsCreate, Scope: "folders:uid:3", Kind: "folders", Identifier: "3"},
+				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:33", Kind: "dashboards", Identifier: "33"},
+				{Action: dashboards.ActionDashboardsWrite, Scope: "dashboards:uid:33", Kind: "dashboards", Identifier: "33"},
 			},
 			expectedResult: 2,
 		},
 		{
 			desc:       "Should return the dashboards that the User has dashboards:write permission on in case of 'edit' permission",
-			permission: dashboards.PERMISSION_EDIT,
+			permission: dashboardaccess.PERMISSION_EDIT,
 			permissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:3"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:31"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:32"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:33"},
-				{Action: dashboards.ActionDashboardsWrite, Scope: "dashboards:uid:33"},
+				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:3", Kind: "folders", Identifier: "3"},
+				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:31", Kind: "dashboards", Identifier: "31"},
+				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:32", Kind: "dashboards", Identifier: "32"},
+				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:33", Kind: "dashboards", Identifier: "33"},
+				{Action: dashboards.ActionDashboardsWrite, Scope: "dashboards:uid:33", Kind: "dashboards", Identifier: "33"},
 			},
 			expectedResult: 1,
 		},
 		{
 			desc:       "Should return the folders that the User has dashboards:create permission on in case of 'edit' permission",
-			permission: dashboards.PERMISSION_EDIT,
+			permission: dashboardaccess.PERMISSION_EDIT,
 			permissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:3"},
-				{Action: dashboards.ActionDashboardsCreate, Scope: "folders:uid:3"},
-				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:4"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:32"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:33"},
+				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:3", Kind: "folders", Identifier: "3"},
+				{Action: dashboards.ActionDashboardsCreate, Scope: "folders:uid:3", Kind: "folders", Identifier: "3"},
+				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:4", Kind: "folders", Identifier: "4"},
+				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:32", Kind: "dashboards", Identifier: "32"},
+				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:33", Kind: "dashboards", Identifier: "33"},
 			},
 			expectedResult: 1,
 		},
 		{
 			desc:       "Should return folders that users can read alerts from",
-			permission: dashboards.PERMISSION_VIEW,
+			permission: dashboardaccess.PERMISSION_VIEW,
 			queryType:  searchstore.TypeAlertFolder,
 			permissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:3"},
-				{Action: accesscontrol.ActionAlertingRuleRead, Scope: "folders:uid:3"},
-				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:8"},
-				{Action: accesscontrol.ActionAlertingRuleRead, Scope: "folders:uid:8"},
+				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:3", Kind: "folders", Identifier: "3"},
+				{Action: accesscontrol.ActionAlertingRuleRead, Scope: "folders:uid:3", Kind: "folders", Identifier: "3"},
+				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:8", Kind: "folders", Identifier: "8"},
+				{Action: accesscontrol.ActionAlertingRuleRead, Scope: "folders:uid:8", Kind: "folders", Identifier: "8"},
 			},
 			expectedResult: 2,
 		},
 		{
 			desc:       "Should return folders that users can read alerts when user has read wildcard",
-			permission: dashboards.PERMISSION_VIEW,
+			permission: dashboardaccess.PERMISSION_VIEW,
 			queryType:  searchstore.TypeAlertFolder,
 			permissions: []accesscontrol.Permission{
 				{Action: dashboards.ActionFoldersRead, Scope: "*"},
-				{Action: accesscontrol.ActionAlertingRuleRead, Scope: "folders:uid:3"},
-				{Action: accesscontrol.ActionAlertingRuleRead, Scope: "folders:uid:8"},
+				{Action: accesscontrol.ActionAlertingRuleRead, Scope: "folders:uid:3", Kind: "folders", Identifier: "3"},
+				{Action: accesscontrol.ActionAlertingRuleRead, Scope: "folders:uid:8", Kind: "folders", Identifier: "8"},
 			},
 			expectedResult: 2,
 		},
@@ -194,7 +175,7 @@ func TestIntegration_DashboardPermissionFilter(t *testing.T) {
 
 		usr := &user.SignedInUser{OrgID: 1, OrgRole: org.RoleViewer, Permissions: map[int64]map[string][]string{1: accesscontrol.GroupScopesByAction(tt.permissions)}}
 
-		for _, features := range []*featuremgmt.FeatureManager{featuremgmt.WithFeatures(), featuremgmt.WithFeatures(featuremgmt.FlagPermissionsFilterRemoveSubquery)} {
+		for _, features := range []featuremgmt.FeatureToggles{featuremgmt.WithFeatures(), featuremgmt.WithFeatures(featuremgmt.FlagPermissionsFilterRemoveSubquery)} {
 			m := features.GetEnabled(context.Background())
 			keys := make([]string, 0, len(m))
 			for k := range m {
@@ -232,7 +213,7 @@ func TestIntegration_DashboardPermissionFilter_WithSelfContainedPermissions(t *t
 	type testCase struct {
 		desc                    string
 		queryType               string
-		permission              dashboards.PermissionType
+		permission              dashboardaccess.PermissionType
 		signedInUserPermissions []accesscontrol.Permission
 		expectedResult          int
 	}
@@ -240,7 +221,7 @@ func TestIntegration_DashboardPermissionFilter_WithSelfContainedPermissions(t *t
 	tests := []testCase{
 		{
 			desc:       "Should be able to view all dashboards with wildcard scope",
-			permission: dashboards.PERMISSION_VIEW,
+			permission: dashboardaccess.PERMISSION_VIEW,
 			signedInUserPermissions: []accesscontrol.Permission{
 				{Action: dashboards.ActionDashboardsRead, Scope: dashboards.ScopeDashboardsAll},
 			},
@@ -248,7 +229,7 @@ func TestIntegration_DashboardPermissionFilter_WithSelfContainedPermissions(t *t
 		},
 		{
 			desc:       "Should be able to view all dashboards with folder wildcard scope",
-			permission: dashboards.PERMISSION_VIEW,
+			permission: dashboardaccess.PERMISSION_VIEW,
 			signedInUserPermissions: []accesscontrol.Permission{
 				{Action: dashboards.ActionDashboardsRead, Scope: dashboards.ScopeFoldersAll},
 			},
@@ -256,13 +237,13 @@ func TestIntegration_DashboardPermissionFilter_WithSelfContainedPermissions(t *t
 		},
 		{
 			desc:                    "Should not be able to view any dashboards or folders without any permissions",
-			permission:              dashboards.PERMISSION_VIEW,
+			permission:              dashboardaccess.PERMISSION_VIEW,
 			signedInUserPermissions: []accesscontrol.Permission{},
 			expectedResult:          0,
 		},
 		{
 			desc:       "Should be able to view a subset of dashboards with dashboard scopes",
-			permission: dashboards.PERMISSION_VIEW,
+			permission: dashboardaccess.PERMISSION_VIEW,
 			signedInUserPermissions: []accesscontrol.Permission{
 				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:110"},
 				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:40"},
@@ -273,44 +254,17 @@ func TestIntegration_DashboardPermissionFilter_WithSelfContainedPermissions(t *t
 			},
 			expectedResult: 6,
 		},
-		{
-			desc:       "Should be able to view a subset of dashboards with dashboard action and folder scope",
-			permission: dashboards.PERMISSION_VIEW,
-
-			signedInUserPermissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:8"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:10"},
-			},
-			expectedResult: 20,
-		},
-		{
-			desc:       "Should be able to view dashboards under the root with folders:uid:general scope",
-			permission: dashboards.PERMISSION_VIEW,
-			signedInUserPermissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionDashboardsRead, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID(folder.GeneralFolderUID)},
-			},
-			expectedResult: 10,
-		},
 		{
 			desc:       "Should not be able to view editable dashboards under the root with folders:uid:general scope if missing write action",
-			permission: dashboards.PERMISSION_EDIT,
+			permission: dashboardaccess.PERMISSION_EDIT,
 			signedInUserPermissions: []accesscontrol.Permission{
 				{Action: dashboards.ActionDashboardsRead, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID(folder.GeneralFolderUID)},
 			},
 			expectedResult: 0,
 		},
-		{
-			desc:       "Should be able to view editable dashboards under the root with folders:uid:general scope if has write action",
-			permission: dashboards.PERMISSION_EDIT,
-			signedInUserPermissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionDashboardsRead, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID(folder.GeneralFolderUID)},
-				{Action: dashboards.ActionDashboardsWrite, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID(folder.GeneralFolderUID)},
-			},
-			expectedResult: 10,
-		},
 		{
 			desc:       "Should be able to view all folders with folder wildcard",
-			permission: dashboards.PERMISSION_VIEW,
+			permission: dashboardaccess.PERMISSION_VIEW,
 			signedInUserPermissions: []accesscontrol.Permission{
 				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:*"},
 			},
@@ -318,7 +272,7 @@ func TestIntegration_DashboardPermissionFilter_WithSelfContainedPermissions(t *t
 		},
 		{
 			desc:       "Should be able to view a subset folders",
-			permission: dashboards.PERMISSION_VIEW,
+			permission: dashboardaccess.PERMISSION_VIEW,
 			signedInUserPermissions: []accesscontrol.Permission{
 				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:3"},
 				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:6"},
@@ -328,7 +282,7 @@ func TestIntegration_DashboardPermissionFilter_WithSelfContainedPermissions(t *t
 		},
 		{
 			desc:       "Should return folders and dashboard with 'edit' permission",
-			permission: dashboards.PERMISSION_EDIT,
+			permission: dashboardaccess.PERMISSION_EDIT,
 			signedInUserPermissions: []accesscontrol.Permission{
 				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:3"},
 				{Action: dashboards.ActionDashboardsCreate, Scope: "folders:uid:3"},
@@ -339,7 +293,7 @@ func TestIntegration_DashboardPermissionFilter_WithSelfContainedPermissions(t *t
 		},
 		{
 			desc:       "Should return the dashboards that the User has dashboards:write permission on in case of 'edit' permission",
-			permission: dashboards.PERMISSION_EDIT,
+			permission: dashboardaccess.PERMISSION_EDIT,
 			signedInUserPermissions: []accesscontrol.Permission{
 				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:3"},
 				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:31"},
@@ -351,7 +305,7 @@ func TestIntegration_DashboardPermissionFilter_WithSelfContainedPermissions(t *t
 		},
 		{
 			desc:       "Should return the folders that the User has dashboards:create permission on in case of 'edit' permission",
-			permission: dashboards.PERMISSION_EDIT,
+			permission: dashboardaccess.PERMISSION_EDIT,
 			signedInUserPermissions: []accesscontrol.Permission{
 				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:3"},
 				{Action: dashboards.ActionDashboardsCreate, Scope: "folders:uid:3"},
@@ -363,7 +317,7 @@ func TestIntegration_DashboardPermissionFilter_WithSelfContainedPermissions(t *t
 		},
 		{
 			desc:       "Should return folders that users can read alerts from",
-			permission: dashboards.PERMISSION_VIEW,
+			permission: dashboardaccess.PERMISSION_VIEW,
 			queryType:  searchstore.TypeAlertFolder,
 			signedInUserPermissions: []accesscontrol.Permission{
 				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:3"},
@@ -375,7 +329,7 @@ func TestIntegration_DashboardPermissionFilter_WithSelfContainedPermissions(t *t
 		},
 		{
 			desc:       "Should return folders that users can read alerts when user has read wildcard",
-			permission: dashboards.PERMISSION_VIEW,
+			permission: dashboardaccess.PERMISSION_VIEW,
 			queryType:  searchstore.TypeAlertFolder,
 			signedInUserPermissions: []accesscontrol.Permission{
 				{Action: dashboards.ActionFoldersRead, Scope: "*"},
@@ -393,7 +347,7 @@ func TestIntegration_DashboardPermissionFilter_WithSelfContainedPermissions(t *t
 
 		usr := &user.SignedInUser{OrgID: 1, OrgRole: org.RoleViewer, AuthenticatedBy: login.ExtendedJWTModule, Permissions: map[int64]map[string][]string{1: accesscontrol.GroupScopesByAction(tt.signedInUserPermissions)}}
 
-		for _, features := range []*featuremgmt.FeatureManager{featuremgmt.WithFeatures(), featuremgmt.WithFeatures(featuremgmt.FlagPermissionsFilterRemoveSubquery)} {
+		for _, features := range []featuremgmt.FeatureToggles{featuremgmt.WithFeatures(), featuremgmt.WithFeatures(featuremgmt.FlagPermissionsFilterRemoveSubquery)} {
 			m := features.GetEnabled(context.Background())
 			keys := make([]string, 0, len(m))
 			for k := range m {
@@ -427,7 +381,7 @@ func TestIntegration_DashboardNestedPermissionFilter(t *testing.T) {
 	testCases := []struct {
 		desc           string
 		queryType      string
-		permission     dashboards.PermissionType
+		permission     dashboardaccess.PermissionType
 		permissions    []accesscontrol.Permission
 		expectedResult []string
 		features       []any
@@ -435,7 +389,7 @@ func TestIntegration_DashboardNestedPermissionFilter(t *testing.T) {
 		{
 			desc:           "Should not be able to view dashboards under inherited folders with no permissions if nested folders are enabled",
 			queryType:      searchstore.TypeDashboard,
-			permission:     dashboards.PERMISSION_VIEW,
+			permission:     dashboardaccess.PERMISSION_VIEW,
 			permissions:    nil,
 			features:       []any{featuremgmt.FlagNestedFolders},
 			expectedResult: nil,
@@ -443,14 +397,14 @@ func TestIntegration_DashboardNestedPermissionFilter(t *testing.T) {
 		{
 			desc:           "Should not be able to view inherited folders with no permissions if nested folders are enabled",
 			queryType:      searchstore.TypeFolder,
-			permission:     dashboards.PERMISSION_VIEW,
+			permission:     dashboardaccess.PERMISSION_VIEW,
 			permissions:    nil,
 			features:       []any{featuremgmt.FlagNestedFolders},
 			expectedResult: nil,
 		},
 		{
 			desc:           "Should not be able to view inherited dashboards and folders with no permissions if nested folders are enabled",
-			permission:     dashboards.PERMISSION_VIEW,
+			permission:     dashboardaccess.PERMISSION_VIEW,
 			permissions:    nil,
 			features:       []any{featuremgmt.FlagNestedFolders},
 			expectedResult: nil,
@@ -458,39 +412,19 @@ func TestIntegration_DashboardNestedPermissionFilter(t *testing.T) {
 		{
 			desc:       "Should be able to view dashboards under inherited folders with wildcard scope if nested folders are enabled",
 			queryType:  searchstore.TypeDashboard,
-			permission: dashboards.PERMISSION_VIEW,
+			permission: dashboardaccess.PERMISSION_VIEW,
 			permissions: []accesscontrol.Permission{
 				{Action: dashboards.ActionDashboardsRead, Scope: dashboards.ScopeFoldersAll},
 			},
 			features:       []any{featuremgmt.FlagNestedFolders},
 			expectedResult: []string{"dashboard under parent folder", "dashboard under subfolder"},
 		},
-		{
-			desc:       "Should be able to view dashboards under inherited folders if nested folders are enabled",
-			queryType:  searchstore.TypeDashboard,
-			permission: dashboards.PERMISSION_VIEW,
-			permissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:parent"},
-			},
-			features:       []any{featuremgmt.FlagNestedFolders},
-			expectedResult: []string{"dashboard under parent folder", "dashboard under subfolder"},
-		},
-		{
-			desc:       "Should not be able to view dashboards under inherited folders if nested folders are not enabled",
-			queryType:  searchstore.TypeDashboard,
-			permission: dashboards.PERMISSION_VIEW,
-			permissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:parent"},
-			},
-			features:       []any{},
-			expectedResult: []string{"dashboard under parent folder"},
-		},
 		{
 			desc:       "Should be able to view inherited folders if nested folders are enabled",
 			queryType:  searchstore.TypeFolder,
-			permission: dashboards.PERMISSION_VIEW,
+			permission: dashboardaccess.PERMISSION_VIEW,
 			permissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:parent"},
+				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:parent", Kind: "folders", Identifier: "parent"},
 			},
 			features:       []any{featuremgmt.FlagNestedFolders},
 			expectedResult: []string{"parent", "subfolder"},
@@ -498,33 +432,13 @@ func TestIntegration_DashboardNestedPermissionFilter(t *testing.T) {
 		{
 			desc:       "Should not be able to view inherited folders if nested folders are not enabled",
 			queryType:  searchstore.TypeFolder,
-			permission: dashboards.PERMISSION_VIEW,
+			permission: dashboardaccess.PERMISSION_VIEW,
 			permissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:parent"},
+				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:parent", Kind: "folders", Identifier: "parent"},
 			},
 			features:       []any{},
 			expectedResult: []string{"parent"},
 		},
-		{
-			desc:       "Should be able to view inherited dashboards and folders if nested folders are enabled",
-			permission: dashboards.PERMISSION_VIEW,
-			permissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:parent"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:parent"},
-			},
-			features:       []any{featuremgmt.FlagNestedFolders},
-			expectedResult: []string{"parent", "subfolder", "dashboard under parent folder", "dashboard under subfolder"},
-		},
-		{
-			desc:       "Should not be able to view inherited dashboards and folders if nested folders are not enabled",
-			permission: dashboards.PERMISSION_VIEW,
-			permissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:parent"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:parent"},
-			},
-			features:       []any{},
-			expectedResult: []string{"parent", "dashboard under parent folder"},
-		},
 	}
 
 	origNewGuardian := guardian.New
@@ -544,7 +458,7 @@ func TestIntegration_DashboardNestedPermissionFilter(t *testing.T) {
 		})
 		usr := &user.SignedInUser{OrgID: orgID, OrgRole: org.RoleViewer, Permissions: map[int64]map[string][]string{orgID: accesscontrol.GroupScopesByAction(tc.permissions)}}
 
-		for _, features := range []*featuremgmt.FeatureManager{featuremgmt.WithFeatures(tc.features...), featuremgmt.WithFeatures(append(tc.features, featuremgmt.FlagPermissionsFilterRemoveSubquery)...)} {
+		for _, features := range []featuremgmt.FeatureToggles{featuremgmt.WithFeatures(tc.features...), featuremgmt.WithFeatures(append(tc.features, featuremgmt.FlagPermissionsFilterRemoveSubquery)...)} {
 			m := features.GetEnabled(context.Background())
 			keys := make([]string, 0, len(m))
 			for k := range m {
@@ -580,7 +494,7 @@ func TestIntegration_DashboardNestedPermissionFilter_WithSelfContainedPermission
 	testCases := []struct {
 		desc                    string
 		queryType               string
-		permission              dashboards.PermissionType
+		permission              dashboardaccess.PermissionType
 		signedInUserPermissions []accesscontrol.Permission
 		expectedResult          []string
 		features                []any
@@ -588,7 +502,7 @@ func TestIntegration_DashboardNestedPermissionFilter_WithSelfContainedPermission
 		{
 			desc:                    "Should not be able to view dashboards under inherited folders with no permissions if nested folders are enabled",
 			queryType:               searchstore.TypeDashboard,
-			permission:              dashboards.PERMISSION_VIEW,
+			permission:              dashboardaccess.PERMISSION_VIEW,
 			signedInUserPermissions: nil,
 			features:                []any{featuremgmt.FlagNestedFolders},
 			expectedResult:          nil,
@@ -596,14 +510,14 @@ func TestIntegration_DashboardNestedPermissionFilter_WithSelfContainedPermission
 		{
 			desc:                    "Should not be able to view inherited folders with no permissions if nested folders are enabled",
 			queryType:               searchstore.TypeFolder,
-			permission:              dashboards.PERMISSION_VIEW,
+			permission:              dashboardaccess.PERMISSION_VIEW,
 			signedInUserPermissions: nil,
 			features:                []any{featuremgmt.FlagNestedFolders},
 			expectedResult:          nil,
 		},
 		{
 			desc:                    "Should not be able to view inherited dashboards and folders with no permissions if nested folders are enabled",
-			permission:              dashboards.PERMISSION_VIEW,
+			permission:              dashboardaccess.PERMISSION_VIEW,
 			signedInUserPermissions: nil,
 			features:                []any{featuremgmt.FlagNestedFolders},
 			expectedResult:          nil,
@@ -611,37 +525,17 @@ func TestIntegration_DashboardNestedPermissionFilter_WithSelfContainedPermission
 		{
 			desc:       "Should be able to view dashboards under inherited folders with wildcard scope if nested folders are enabled",
 			queryType:  searchstore.TypeDashboard,
-			permission: dashboards.PERMISSION_VIEW,
+			permission: dashboardaccess.PERMISSION_VIEW,
 			signedInUserPermissions: []accesscontrol.Permission{
 				{Action: dashboards.ActionDashboardsRead, Scope: dashboards.ScopeFoldersAll},
 			},
 			features:       []any{featuremgmt.FlagNestedFolders},
 			expectedResult: []string{"dashboard under parent folder", "dashboard under subfolder"},
 		},
-		{
-			desc:       "Should be able to view dashboards under inherited folders if nested folders are enabled",
-			queryType:  searchstore.TypeDashboard,
-			permission: dashboards.PERMISSION_VIEW,
-			signedInUserPermissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:parent"},
-			},
-			features:       []any{featuremgmt.FlagNestedFolders},
-			expectedResult: []string{"dashboard under parent folder", "dashboard under subfolder"},
-		},
-		{
-			desc:       "Should not be able to view dashboards under inherited folders if nested folders are not enabled",
-			queryType:  searchstore.TypeDashboard,
-			permission: dashboards.PERMISSION_VIEW,
-			signedInUserPermissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:parent"},
-			},
-			features:       []any{},
-			expectedResult: []string{"dashboard under parent folder"},
-		},
 		{
 			desc:       "Should be able to view inherited folders if nested folders are enabled",
 			queryType:  searchstore.TypeFolder,
-			permission: dashboards.PERMISSION_VIEW,
+			permission: dashboardaccess.PERMISSION_VIEW,
 			signedInUserPermissions: []accesscontrol.Permission{
 				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:parent"},
 			},
@@ -651,47 +545,13 @@ func TestIntegration_DashboardNestedPermissionFilter_WithSelfContainedPermission
 		{
 			desc:       "Should not be able to view inherited folders if nested folders are not enabled",
 			queryType:  searchstore.TypeFolder,
-			permission: dashboards.PERMISSION_VIEW,
+			permission: dashboardaccess.PERMISSION_VIEW,
 			signedInUserPermissions: []accesscontrol.Permission{
 				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:parent"},
 			},
 			features:       []any{},
 			expectedResult: []string{"parent"},
 		},
-		{
-			desc:       "Should be able to view inherited dashboards and folders if nested folders are enabled",
-			permission: dashboards.PERMISSION_VIEW,
-			signedInUserPermissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:parent"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:parent"},
-			},
-			features:       []any{featuremgmt.FlagNestedFolders},
-			expectedResult: []string{"parent", "subfolder", "dashboard under parent folder", "dashboard under subfolder"},
-		},
-		{
-			desc:       "Should not be able to view inherited dashboards and folders if nested folders are not enabled",
-			permission: dashboards.PERMISSION_VIEW,
-			signedInUserPermissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:parent"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:parent"},
-			},
-			features:       []any{},
-			expectedResult: []string{"parent", "dashboard under parent folder"},
-		},
-		{
-			desc:       "Should be able to edit inherited dashboards and folders if nested folders are enabled",
-			permission: dashboards.PERMISSION_EDIT,
-			signedInUserPermissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:subfolder"},
-				{Action: dashboards.ActionDashboardsCreate, Scope: "folders:uid:subfolder"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:subfolder"},
-				{Action: dashboards.ActionDashboardsWrite, Scope: "folders:uid:subfolder"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:parent"},
-				{Action: dashboards.ActionDashboardsWrite, Scope: "folders:uid:parent"},
-			},
-			features:       []any{featuremgmt.FlagNestedFolders},
-			expectedResult: []string{"subfolder", "dashboard under parent folder", "dashboard under subfolder"},
-		},
 	}
 
 	origNewGuardian := guardian.New
@@ -715,7 +575,7 @@ func TestIntegration_DashboardNestedPermissionFilter_WithSelfContainedPermission
 			}),
 			},
 		}
-		for _, features := range []*featuremgmt.FeatureManager{featuremgmt.WithFeatures(tc.features...), featuremgmt.WithFeatures(append(tc.features, featuremgmt.FlagPermissionsFilterRemoveSubquery)...)} {
+		for _, features := range []featuremgmt.FeatureToggles{featuremgmt.WithFeatures(tc.features...), featuremgmt.WithFeatures(append(tc.features, featuremgmt.FlagPermissionsFilterRemoveSubquery)...)} {
 			m := features.GetEnabled(context.Background())
 			keys := make([]string, 0, len(m))
 			for k := range m {
@@ -775,15 +635,15 @@ func setupTest(t *testing.T, numFolders, numDashboards int, permissions []access
 				folderID = i % (numFolders + 1)
 			}
 			dashes = append(dashes, dashboards.Dashboard{
-				OrgID:    1,
-				IsFolder: false,
-				FolderID: int64(folderID),
-				UID:      str,
-				Slug:     str,
-				Title:    str,
-				Data:     simplejson.New(),
-				Created:  time.Now(),
-				Updated:  time.Now(),
+				OrgID:     1,
+				IsFolder:  false,
+				FolderUID: strconv.Itoa(folderID),
+				UID:       str,
+				Slug:      str,
+				Title:     str,
+				Data:      simplejson.New(),
+				Created:   time.Now(),
+				Updated:   time.Now(),
 			})
 		}
 
@@ -819,6 +679,7 @@ func setupTest(t *testing.T, numFolders, numDashboards int, permissions []access
 			permissions[i].RoleID = role.ID
 			permissions[i].Created = time.Now()
 			permissions[i].Updated = time.Now()
+			permissions[i].Kind, permissions[i].Attribute, permissions[i].Identifier = permissions[i].SplitScope()
 		}
 		if len(permissions) > 0 {
 			_, err = sess.InsertMulti(&permissions)
@@ -839,10 +700,10 @@ func setupNestedTest(t *testing.T, usr *user.SignedInUser, perms []accesscontrol
 	db := sqlstore.InitTestDB(t)
 
 	// dashboard store commands that should be called.
-	dashStore, err := database.ProvideDashboardStore(db, db.Cfg, features, tagimpl.ProvideService(db, db.Cfg), quotatest.New(false, nil))
+	dashStore, err := database.ProvideDashboardStore(db, db.Cfg, features, tagimpl.ProvideService(db), quotatest.New(false, nil))
 	require.NoError(t, err)
 
-	folderSvc := folderimpl.ProvideService(mock.New(), bus.ProvideBus(tracing.InitializeTracerForTest()), db.Cfg, dashStore, folderimpl.ProvideDashboardFolderStore(db), db, features)
+	folderSvc := folderimpl.ProvideService(mock.New(), bus.ProvideBus(tracing.InitializeTracerForTest()), db.Cfg, dashStore, folderimpl.ProvideDashboardFolderStore(db), db, features, supportbundlestest.NewFakeBundleService(), nil)
 
 	// create parent folder
 	parent, err := folderSvc.Create(context.Background(), &folder.CreateFolderCommand{
@@ -866,7 +727,6 @@ func setupNestedTest(t *testing.T, usr *user.SignedInUser, perms []accesscontrol
 	// create dashboard under parent folder
 	_, err = dashStore.SaveDashboard(context.Background(), dashboards.SaveDashboardCommand{
 		OrgID:     orgID,
-		FolderID:  parent.ID,
 		FolderUID: parent.UID,
 		Dashboard: simplejson.NewFromAny(map[string]any{
 			"title": "dashboard under parent folder",
@@ -877,7 +737,6 @@ func setupNestedTest(t *testing.T, usr *user.SignedInUser, perms []accesscontrol
 	// create dashboard under subfolder
 	_, err = dashStore.SaveDashboard(context.Background(), dashboards.SaveDashboardCommand{
 		OrgID:     orgID,
-		FolderID:  subfolder.ID,
 		FolderUID: subfolder.UID,
 		Dashboard: simplejson.NewFromAny(map[string]any{
 			"title": "dashboard under subfolder",
@@ -912,6 +771,7 @@ func setupNestedTest(t *testing.T, usr *user.SignedInUser, perms []accesscontrol
 			perms[i].RoleID = role.ID
 			perms[i].Created = time.Now()
 			perms[i].Updated = time.Now()
+			perms[i].Kind, perms[i].Attribute, perms[i].Identifier = perms[i].SplitScope()
 		}
 		if len(perms) > 0 {
 			_, err = sess.InsertMulti(&perms)
diff --git a/pkg/services/sqlstore/permissions/dashboards_bench_test.go b/pkg/services/sqlstore/permissions/dashboards_bench_test.go
index 84e8cb947184e..ca804da246223 100644
--- a/pkg/services/sqlstore/permissions/dashboards_bench_test.go
+++ b/pkg/services/sqlstore/permissions/dashboards_bench_test.go
@@ -17,6 +17,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/mock"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/dashboards/database"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/folder"
@@ -26,6 +27,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/services/sqlstore/permissions"
+	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
 	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
 	"github.com/grafana/grafana/pkg/services/user"
 )
@@ -56,7 +58,7 @@ func benchmarkDashboardPermissionFilter(b *testing.B, numUsers, numDashboards, n
 
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		filter := permissions.NewAccessControlDashboardPermissionFilter(&usr, dashboards.PERMISSION_VIEW, "", features, recursiveQueriesAreSupported)
+		filter := permissions.NewAccessControlDashboardPermissionFilter(&usr, dashboardaccess.PERMISSION_VIEW, "", features, recursiveQueriesAreSupported)
 		var result int
 		err := store.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
 			q, params := filter.Where()
@@ -79,10 +81,10 @@ func setupBenchMark(b *testing.B, usr user.SignedInUser, features featuremgmt.Fe
 
 	quotaService := quotatest.New(false, nil)
 
-	dashboardWriteStore, err := database.ProvideDashboardStore(store, store.Cfg, features, tagimpl.ProvideService(store, store.Cfg), quotaService)
+	dashboardWriteStore, err := database.ProvideDashboardStore(store, store.Cfg, features, tagimpl.ProvideService(store), quotaService)
 	require.NoError(b, err)
 
-	folderSvc := folderimpl.ProvideService(mock.New(), bus.ProvideBus(tracing.InitializeTracerForTest()), store.Cfg, dashboardWriteStore, folderimpl.ProvideDashboardFolderStore(store), store, features)
+	folderSvc := folderimpl.ProvideService(mock.New(), bus.ProvideBus(tracing.InitializeTracerForTest()), store.Cfg, dashboardWriteStore, folderimpl.ProvideDashboardFolderStore(store), store, features, supportbundlestest.NewFakeBundleService(), nil)
 
 	origNewGuardian := guardian.New
 	guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanViewValue: true, CanSaveValue: true})
@@ -124,15 +126,15 @@ func setupBenchMark(b *testing.B, usr user.SignedInUser, features featuremgmt.Fe
 		str := fmt.Sprintf("dashboard under folder %s", leaf.Title)
 		now := time.Now()
 		dashes = append(dashes, dashboards.Dashboard{
-			OrgID:    usr.OrgID,
-			IsFolder: false,
-			UID:      str,
-			Slug:     str,
-			Title:    str,
-			Data:     simplejson.New(),
-			Created:  now,
-			Updated:  now,
-			FolderID: leaf.ID,
+			OrgID:     usr.OrgID,
+			IsFolder:  false,
+			UID:       str,
+			Slug:      str,
+			Title:     str,
+			Data:      simplejson.New(),
+			Created:   now,
+			Updated:   now,
+			FolderUID: leaf.UID,
 		})
 	}
 
@@ -176,7 +178,7 @@ func setupBenchMark(b *testing.B, usr user.SignedInUser, features featuremgmt.Fe
 			})
 			for _, dash := range dashes {
 				// add permission to read dashboards under the general
-				if dash.FolderID == 0 {
+				if dash.FolderUID == "" {
 					permissions = append(permissions, accesscontrol.Permission{
 						RoleID:  int64(i),
 						Action:  dashboards.ActionDashboardsRead,
diff --git a/pkg/services/sqlstore/searchstore/builder.go b/pkg/services/sqlstore/searchstore/builder.go
index 38c4ec0fa94a5..d086b97a4b5ff 100644
--- a/pkg/services/sqlstore/searchstore/builder.go
+++ b/pkg/services/sqlstore/searchstore/builder.go
@@ -37,7 +37,8 @@ func (b *Builder) ToSQL(limit, page int64) (string, []any) {
 		INNER JOIN dashboard ON ids.id = dashboard.id`)
 	b.sql.WriteString("\n")
 
-	if b.Features.IsEnabled(featuremgmt.FlagNestedFolders) {
+	if b.Features.IsEnabledGlobally(featuremgmt.FlagNestedFolders) {
+		// covered by UQE_folder_org_id_uid
 		b.sql.WriteString(
 			`LEFT OUTER JOIN folder ON folder.uid = dashboard.folder_uid AND folder.org_id = dashboard.org_id`)
 	} else {
@@ -67,7 +68,7 @@ func (b *Builder) buildSelect() {
 			dashboard.folder_id,
 			folder.uid AS folder_uid,
 		`)
-	if b.Features.IsEnabled(featuremgmt.FlagNestedFolders) {
+	if b.Features.IsEnabledGlobally(featuremgmt.FlagNestedFolders) {
 		b.sql.WriteString(`
 			folder.title AS folder_slug,`)
 	} else {
diff --git a/pkg/services/sqlstore/searchstore/filters.go b/pkg/services/sqlstore/searchstore/filters.go
index 49cd2c1496ca1..8ba509e71699a 100644
--- a/pkg/services/sqlstore/searchstore/filters.go
+++ b/pkg/services/sqlstore/searchstore/filters.go
@@ -13,6 +13,7 @@ const (
 	TypeFolder      = "dash-folder"
 	TypeDashboard   = "dash-db"
 	TypeAlertFolder = "dash-folder-alerting"
+	TypeAnnotation  = "dash-annotation"
 )
 
 type TypeFilter struct {
diff --git a/pkg/services/sqlstore/searchstore/search_test.go b/pkg/services/sqlstore/searchstore/search_test.go
index b36b0323b0f53..7b60949d3a7a2 100644
--- a/pkg/services/sqlstore/searchstore/search_test.go
+++ b/pkg/services/sqlstore/searchstore/search_test.go
@@ -3,7 +3,6 @@ package searchstore_test
 
 import (
 	"context"
-	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -13,11 +12,13 @@ import (
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/sqlstore/permissions"
 	"github.com/grafana/grafana/pkg/services/sqlstore/searchstore"
 	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 	"github.com/grafana/grafana/pkg/util"
 )
 
@@ -26,6 +27,10 @@ const (
 	page  int64 = 1
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestBuilder_EqualResults_Basic(t *testing.T) {
 	user := &user.SignedInUser{
 		UserID:  1,
@@ -120,12 +125,12 @@ func TestBuilder_RBAC(t *testing.T) {
 	testsCases := []struct {
 		desc            string
 		userPermissions []accesscontrol.Permission
-		features        []any
+		features        featuremgmt.FeatureToggles
 		expectedParams  []any
 	}{
 		{
 			desc:     "no user permissions",
-			features: []any{},
+			features: featuremgmt.WithFeatures(),
 			expectedParams: []any{
 				int64(1),
 			},
@@ -135,7 +140,7 @@ func TestBuilder_RBAC(t *testing.T) {
 			userPermissions: []accesscontrol.Permission{
 				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:1"},
 			},
-			features: []any{},
+			features: featuremgmt.WithFeatures(),
 			expectedParams: []any{
 				int64(1),
 				int64(1),
@@ -149,6 +154,7 @@ func TestBuilder_RBAC(t *testing.T) {
 				2,
 				int64(1),
 				int64(1),
+				int64(1),
 				0,
 				"Viewer",
 				int64(1),
@@ -172,8 +178,9 @@ func TestBuilder_RBAC(t *testing.T) {
 			userPermissions: []accesscontrol.Permission{
 				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:1"},
 			},
-			features: []any{featuremgmt.FlagNestedFolders},
+			features: featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders),
 			expectedParams: []any{
+				int64(1),
 				int64(1),
 				int64(1),
 				0,
@@ -185,6 +192,84 @@ func TestBuilder_RBAC(t *testing.T) {
 				2,
 				int64(1),
 				int64(1),
+				int64(1),
+				0,
+				"Viewer",
+				int64(1),
+				0,
+				"folders:read",
+				"dashboards:create",
+				2,
+				int64(1),
+				int64(1),
+				int64(1),
+				0,
+				"Viewer",
+				int64(1),
+				0,
+				"dashboards:read",
+				"dashboards:write",
+				2,
+				int64(1),
+			},
+		},
+		{
+			desc: "user with view permission with remove subquery",
+			userPermissions: []accesscontrol.Permission{
+				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:1"},
+			},
+			features: featuremgmt.WithFeatures(featuremgmt.FlagPermissionsFilterRemoveSubquery),
+			expectedParams: []any{
+				int64(1),
+				int64(1),
+				int64(1),
+				0,
+				"Viewer",
+				int64(1),
+				0,
+				"dashboards:read",
+				"dashboards:write",
+				2,
+				int64(1),
+				int64(1),
+				0,
+				"Viewer",
+				int64(1),
+				0,
+				"dashboards:read",
+				"dashboards:write",
+				2,
+				int64(1),
+				int64(1),
+				0,
+				"Viewer",
+				int64(1),
+				0,
+				"folders:read",
+				"dashboards:create",
+				2,
+			},
+		},
+		{
+			desc: "user with view permission with nesting and remove subquery",
+			userPermissions: []accesscontrol.Permission{
+				{Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:1"},
+			},
+			features: featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders, featuremgmt.FlagPermissionsFilterRemoveSubquery),
+			expectedParams: []any{
+				int64(1),
+				int64(1),
+				int64(1),
+				0,
+				"Viewer",
+				int64(1),
+				0,
+				"dashboards:read",
+				"dashboards:write",
+				2,
+				int64(1),
+				int64(1),
+				int64(1),
 				0,
 				"Viewer",
 				int64(1),
@@ -219,48 +304,39 @@ func TestBuilder_RBAC(t *testing.T) {
 	require.NoError(t, err)
 
 	for _, tc := range testsCases {
-		for _, features := range []*featuremgmt.FeatureManager{featuremgmt.WithFeatures(tc.features...), featuremgmt.WithFeatures(append(tc.features, featuremgmt.FlagPermissionsFilterRemoveSubquery)...)} {
-			m := features.GetEnabled(context.Background())
-			keys := make([]string, 0, len(m))
-			for k := range m {
-				keys = append(keys, k)
+		t.Run(tc.desc, func(t *testing.T) {
+			if len(tc.userPermissions) > 0 {
+				user.Permissions = map[int64]map[string][]string{1: accesscontrol.GroupScopesByAction(tc.userPermissions)}
 			}
 
-			t.Run(tc.desc+" with features "+strings.Join(keys, ","), func(t *testing.T) {
-				if len(tc.userPermissions) > 0 {
-					user.Permissions = map[int64]map[string][]string{1: accesscontrol.GroupScopesByAction(tc.userPermissions)}
-				}
-
-				level := dashboards.PERMISSION_EDIT
-
-				builder := &searchstore.Builder{
-					Filters: []any{
-						searchstore.OrgFilter{OrgId: user.OrgID},
-						searchstore.TitleSorter{},
-						permissions.NewAccessControlDashboardPermissionFilter(
-							user,
-							level,
-							"",
-							features,
-							recursiveQueriesAreSupported,
-						),
-					},
-					Dialect:  store.GetDialect(),
-					Features: features,
-				}
-
-				res := []dashboards.DashboardSearchProjection{}
-				err := store.WithDbSession(context.Background(), func(sess *db.Session) error {
-					sql, params := builder.ToSQL(limit, page)
-					// TODO: replace with a proper test
-					assert.Equal(t, tc.expectedParams, params)
-					return sess.SQL(sql, params...).Find(&res)
-				})
-				require.NoError(t, err)
+			level := dashboardaccess.PERMISSION_EDIT
+
+			builder := &searchstore.Builder{
+				Filters: []any{
+					searchstore.OrgFilter{OrgId: user.OrgID},
+					searchstore.TitleSorter{},
+					permissions.NewAccessControlDashboardPermissionFilter(
+						user,
+						level,
+						"",
+						tc.features,
+						recursiveQueriesAreSupported,
+					),
+				},
+				Dialect:  store.GetDialect(),
+				Features: tc.features,
+			}
 
-				assert.Len(t, res, 0)
+			res := []dashboards.DashboardSearchProjection{}
+			err := store.WithDbSession(context.Background(), func(sess *db.Session) error {
+				sql, params := builder.ToSQL(limit, page)
+				assert.Equal(t, tc.expectedParams, params)
+				return sess.SQL(sql, params...).Find(&res)
 			})
-		}
+			require.NoError(t, err)
+
+			assert.Len(t, res, 0)
+		})
 	}
 }
 
diff --git a/pkg/services/sqlstore/session/session.go b/pkg/services/sqlstore/session/session.go
index efde384b77b1f..b585925c75382 100644
--- a/pkg/services/sqlstore/session/session.go
+++ b/pkg/services/sqlstore/session/session.go
@@ -42,7 +42,7 @@ func (gs *SessionDB) NamedExec(ctx context.Context, query string, arg any) (sql.
 	return gs.sqlxdb.NamedExecContext(ctx, gs.sqlxdb.Rebind(query), arg)
 }
 
-func (gs *SessionDB) driverName() string {
+func (gs *SessionDB) DriverName() string {
 	return gs.sqlxdb.DriverName()
 }
 
@@ -69,7 +69,7 @@ func (gs *SessionDB) WithTransaction(ctx context.Context, callback func(*Session
 }
 
 func (gs *SessionDB) ExecWithReturningId(ctx context.Context, query string, args ...any) (int64, error) {
-	return execWithReturningId(ctx, gs.driverName(), query, gs, args...)
+	return execWithReturningId(ctx, gs.DriverName(), query, gs, args...)
 }
 
 type SessionTx struct {
@@ -125,3 +125,10 @@ func execWithReturningId(ctx context.Context, driverName string, query string, s
 	}
 	return id, nil
 }
+
+type SessionQuerier interface {
+	Query(ctx context.Context, query string, args ...any) (*sql.Rows, error)
+}
+
+var _ SessionQuerier = &SessionDB{}
+var _ SessionQuerier = &SessionTx{}
diff --git a/pkg/services/sqlstore/sqlstore.go b/pkg/services/sqlstore/sqlstore.go
index e8e00e3a92def..8642375afe8db 100644
--- a/pkg/services/sqlstore/sqlstore.go
+++ b/pkg/services/sqlstore/sqlstore.go
@@ -4,10 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"net/url"
 	"os"
-	"path"
-	"path/filepath"
 	"strings"
 	"sync"
 	"time"
@@ -23,7 +20,6 @@ import (
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/infra/fs"
-	"github.com/grafana/grafana/pkg/infra/localcache"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/registry"
@@ -35,19 +31,18 @@ import (
 	"github.com/grafana/grafana/pkg/services/stats"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/util"
 )
 
 // ContextSessionKey is used as key to save values in `context.Context`
 type ContextSessionKey struct{}
 
 type SQLStore struct {
-	Cfg          *setting.Cfg
-	sqlxsession  *session.SessionDB
-	CacheService *localcache.CacheService
+	Cfg         *setting.Cfg
+	features    featuremgmt.FeatureToggles
+	sqlxsession *session.SessionDB
 
 	bus                          bus.Bus
-	dbCfg                        DatabaseConfig
+	dbCfg                        *DatabaseConfig
 	engine                       *xorm.Engine
 	log                          log.Logger
 	Dialect                      migrator.Dialect
@@ -58,17 +53,21 @@ type SQLStore struct {
 	recursiveQueriesMu           sync.Mutex
 }
 
-func ProvideService(cfg *setting.Cfg, cacheService *localcache.CacheService, migrations registry.DatabaseMigrator, bus bus.Bus, tracer tracing.Tracer) (*SQLStore, error) {
+func ProvideService(cfg *setting.Cfg,
+	features featuremgmt.FeatureToggles,
+	migrations registry.DatabaseMigrator,
+	bus bus.Bus, tracer tracing.Tracer) (*SQLStore, error) {
 	// This change will make xorm use an empty default schema for postgres and
 	// by that mimic the functionality of how it was functioning before
 	// xorm's changes above.
 	xorm.DefaultPostgresSchema = ""
-	s, err := newSQLStore(cfg, cacheService, nil, migrations, bus, tracer)
+	s, err := newSQLStore(cfg, nil, migrations, bus, tracer)
 	if err != nil {
 		return nil, err
 	}
+	s.features = features
 
-	if err := s.Migrate(cfg.IsFeatureToggleEnabled(featuremgmt.FlagMigrationLocking)); err != nil {
+	if err := s.Migrate(s.dbCfg.MigrationLock); err != nil {
 		return nil, err
 	}
 
@@ -92,15 +91,30 @@ func ProvideService(cfg *setting.Cfg, cacheService *localcache.CacheService, mig
 	return s, nil
 }
 
-func ProvideServiceForTests(cfg *setting.Cfg, migrations registry.DatabaseMigrator) (*SQLStore, error) {
-	return initTestDB(cfg, migrations, InitTestDBOpt{EnsureDefaultOrgAndUser: true})
+func ProvideServiceForTests(t sqlutil.ITestDB, cfg *setting.Cfg, features featuremgmt.FeatureToggles, migrations registry.DatabaseMigrator) (*SQLStore, error) {
+	return initTestDB(t, cfg, features, migrations, InitTestDBOpt{EnsureDefaultOrgAndUser: true})
 }
 
-func newSQLStore(cfg *setting.Cfg, cacheService *localcache.CacheService, engine *xorm.Engine,
+// NewSQLStoreWithoutSideEffects creates a new *SQLStore without side-effects such as
+// running database migrations and/or ensuring main org and admin user exists.
+func NewSQLStoreWithoutSideEffects(cfg *setting.Cfg,
+	features featuremgmt.FeatureToggles,
+	bus bus.Bus, tracer tracing.Tracer) (*SQLStore, error) {
+	s, err := newSQLStore(cfg, nil, nil, bus, tracer)
+	if err != nil {
+		return nil, err
+	}
+
+	s.features = features
+	s.tracer = tracer
+
+	return s, nil
+}
+
+func newSQLStore(cfg *setting.Cfg, engine *xorm.Engine,
 	migrations registry.DatabaseMigrator, bus bus.Bus, tracer tracing.Tracer, opts ...InitTestDBOpt) (*SQLStore, error) {
 	ss := &SQLStore{
 		Cfg:                         cfg,
-		CacheService:                cacheService,
 		log:                         log.New("sqlstore"),
 		skipEnsureDefaultOrgAndUser: false,
 		migrations:                  migrations,
@@ -147,11 +161,6 @@ func (ss *SQLStore) Migrate(isDatabaseLockingEnabled bool) error {
 	return migrator.Start(isDatabaseLockingEnabled, ss.dbCfg.MigrationLockAttemptTimeout)
 }
 
-// Sync syncs changes to the database.
-func (ss *SQLStore) Sync() error {
-	return ss.engine.Sync2()
-}
-
 // Reset resets database state.
 // If default org and user creation is enabled, it will be ensured they exist in the database.
 func (ss *SQLStore) Reset() error {
@@ -162,18 +171,6 @@ func (ss *SQLStore) Reset() error {
 	return ss.ensureMainOrgAndAdminUser(false)
 }
 
-// TestReset resets database state. If default org and user creation is enabled,
-// it will be ensured they exist in the database. TestReset() is more permissive
-// than Reset in that it will create the user and org whether or not there are
-// already users in the database.
-func (ss *SQLStore) TestReset() error {
-	if ss.skipEnsureDefaultOrgAndUser {
-		return nil
-	}
-
-	return ss.ensureMainOrgAndAdminUser(true)
-}
-
 // Quote quotes the value in the used SQL dialect
 func (ss *SQLStore) Quote(value string) string {
 	return ss.engine.Quote(value)
@@ -229,7 +226,7 @@ func (ss *SQLStore) ensureMainOrgAndAdminUser(test bool) error {
 			if _, err := ss.createUser(ctx, sess, user.CreateUserCommand{
 				Login:    ss.Cfg.AdminUser,
 				Email:    ss.Cfg.AdminEmail,
-				Password: ss.Cfg.AdminPassword,
+				Password: user.Password(ss.Cfg.AdminPassword),
 				IsAdmin:  true,
 			}); err != nil {
 				return fmt.Errorf("failed to create admin user: %s", err)
@@ -250,113 +247,6 @@ func (ss *SQLStore) ensureMainOrgAndAdminUser(test bool) error {
 	return err
 }
 
-func (ss *SQLStore) buildExtraConnectionString(sep rune) string {
-	if ss.dbCfg.UrlQueryParams == nil {
-		return ""
-	}
-
-	var sb strings.Builder
-	for key, values := range ss.dbCfg.UrlQueryParams {
-		for _, value := range values {
-			sb.WriteRune(sep)
-			sb.WriteString(key)
-			sb.WriteRune('=')
-			sb.WriteString(value)
-		}
-	}
-	return sb.String()
-}
-
-func (ss *SQLStore) buildConnectionString() (string, error) {
-	if err := ss.readConfig(); err != nil {
-		return "", err
-	}
-
-	cnnstr := ss.dbCfg.ConnectionString
-
-	// special case used by integration tests
-	if cnnstr != "" {
-		return cnnstr, nil
-	}
-
-	switch ss.dbCfg.Type {
-	case migrator.MySQL:
-		protocol := "tcp"
-		if strings.HasPrefix(ss.dbCfg.Host, "/") {
-			protocol = "unix"
-		}
-
-		cnnstr = fmt.Sprintf("%s:%s@%s(%s)/%s?collation=utf8mb4_unicode_ci&allowNativePasswords=true&clientFoundRows=true",
-			ss.dbCfg.User, ss.dbCfg.Pwd, protocol, ss.dbCfg.Host, ss.dbCfg.Name)
-
-		if ss.dbCfg.SslMode == "true" || ss.dbCfg.SslMode == "skip-verify" {
-			tlsCert, err := makeCert(ss.dbCfg)
-			if err != nil {
-				return "", err
-			}
-			if err := mysql.RegisterTLSConfig("custom", tlsCert); err != nil {
-				return "", err
-			}
-
-			cnnstr += "&tls=custom"
-		}
-
-		if isolation := ss.dbCfg.IsolationLevel; isolation != "" {
-			val := url.QueryEscape(fmt.Sprintf("'%s'", isolation))
-			cnnstr += fmt.Sprintf("&transaction_isolation=%s", val)
-		}
-
-		if ss.Cfg.IsFeatureToggleEnabled(featuremgmt.FlagMysqlAnsiQuotes) || ss.Cfg.IsFeatureToggleEnabled(featuremgmt.FlagNewDBLibrary) {
-			cnnstr += "&sql_mode='ANSI_QUOTES'"
-		}
-
-		if ss.Cfg.IsFeatureToggleEnabled(featuremgmt.FlagNewDBLibrary) {
-			cnnstr += "&parseTime=true"
-		}
-
-		cnnstr += ss.buildExtraConnectionString('&')
-	case migrator.Postgres:
-		addr, err := util.SplitHostPortDefault(ss.dbCfg.Host, "127.0.0.1", "5432")
-		if err != nil {
-			return "", fmt.Errorf("invalid host specifier '%s': %w", ss.dbCfg.Host, err)
-		}
-
-		args := []any{ss.dbCfg.User, addr.Host, addr.Port, ss.dbCfg.Name, ss.dbCfg.SslMode, ss.dbCfg.ClientCertPath,
-			ss.dbCfg.ClientKeyPath, ss.dbCfg.CaCertPath}
-		for i, arg := range args {
-			if arg == "" {
-				args[i] = "''"
-			}
-		}
-		cnnstr = fmt.Sprintf("user=%s host=%s port=%s dbname=%s sslmode=%s sslcert=%s sslkey=%s sslrootcert=%s", args...)
-		if ss.dbCfg.Pwd != "" {
-			cnnstr += fmt.Sprintf(" password=%s", ss.dbCfg.Pwd)
-		}
-
-		cnnstr += ss.buildExtraConnectionString(' ')
-	case migrator.SQLite:
-		// special case for tests
-		if !filepath.IsAbs(ss.dbCfg.Path) {
-			ss.dbCfg.Path = filepath.Join(ss.Cfg.DataPath, ss.dbCfg.Path)
-		}
-		if err := os.MkdirAll(path.Dir(ss.dbCfg.Path), os.ModePerm); err != nil {
-			return "", err
-		}
-
-		cnnstr = fmt.Sprintf("file:%s?cache=%s&mode=rwc", ss.dbCfg.Path, ss.dbCfg.CacheMode)
-
-		if ss.dbCfg.WALEnabled {
-			cnnstr += "&_journal_mode=WAL"
-		}
-
-		cnnstr += ss.buildExtraConnectionString('&')
-	default:
-		return "", fmt.Errorf("unknown database type: %s", ss.dbCfg.Type)
-	}
-
-	return cnnstr, nil
-}
-
 // initEngine initializes ss.engine.
 func (ss *SQLStore) initEngine(engine *xorm.Engine) error {
 	if ss.engine != nil {
@@ -364,18 +254,20 @@ func (ss *SQLStore) initEngine(engine *xorm.Engine) error {
 		return nil
 	}
 
-	connectionString, err := ss.buildConnectionString()
+	dbCfg, err := NewDatabaseConfig(ss.Cfg, ss.features)
 	if err != nil {
 		return err
 	}
 
+	ss.dbCfg = dbCfg
+
 	if ss.Cfg.DatabaseInstrumentQueries {
 		ss.dbCfg.Type = WrapDatabaseDriverWithHooks(ss.dbCfg.Type, ss.tracer)
 	}
 
 	ss.log.Info("Connecting to DB", "dbtype", ss.dbCfg.Type)
-	if ss.dbCfg.Type == migrator.SQLite && strings.HasPrefix(connectionString, "file:") &&
-		!strings.HasPrefix(connectionString, "file::memory:") {
+	if ss.dbCfg.Type == migrator.SQLite && strings.HasPrefix(ss.dbCfg.ConnectionString, "file:") &&
+		!strings.HasPrefix(ss.dbCfg.ConnectionString, "file::memory:") {
 		exists, err := fs.Exists(ss.dbCfg.Path)
 		if err != nil {
 			return fmt.Errorf("can't check for existence of %q: %w", ss.dbCfg.Path, err)
@@ -405,14 +297,14 @@ func (ss *SQLStore) initEngine(engine *xorm.Engine) error {
 	}
 	if engine == nil {
 		var err error
-		engine, err = xorm.NewEngine(ss.dbCfg.Type, connectionString)
+		engine, err = xorm.NewEngine(ss.dbCfg.Type, ss.dbCfg.ConnectionString)
 		if err != nil {
 			return err
 		}
 		// Only for MySQL or MariaDB, verify we can connect with the current connection string's system var for transaction isolation.
 		// If not, create a new engine with a compatible connection string.
 		if ss.dbCfg.Type == migrator.MySQL {
-			engine, err = ss.ensureTransactionIsolationCompatibility(engine, connectionString)
+			engine, err = ss.ensureTransactionIsolationCompatibility(engine, ss.dbCfg.ConnectionString)
 			if err != nil {
 				return err
 			}
@@ -464,62 +356,6 @@ func (ss *SQLStore) ensureTransactionIsolationCompatibility(engine *xorm.Engine,
 	return engine, nil
 }
 
-// readConfig initializes the SQLStore from its configuration.
-func (ss *SQLStore) readConfig() error {
-	sec := ss.Cfg.Raw.Section("database")
-
-	cfgURL := sec.Key("url").String()
-	if len(cfgURL) != 0 {
-		dbURL, err := url.Parse(cfgURL)
-		if err != nil {
-			return err
-		}
-		ss.dbCfg.Type = dbURL.Scheme
-		ss.dbCfg.Host = dbURL.Host
-
-		pathSplit := strings.Split(dbURL.Path, "/")
-		if len(pathSplit) > 1 {
-			ss.dbCfg.Name = pathSplit[1]
-		}
-
-		userInfo := dbURL.User
-		if userInfo != nil {
-			ss.dbCfg.User = userInfo.Username()
-			ss.dbCfg.Pwd, _ = userInfo.Password()
-		}
-
-		ss.dbCfg.UrlQueryParams = dbURL.Query()
-	} else {
-		ss.dbCfg.Type = sec.Key("type").String()
-		ss.dbCfg.Host = sec.Key("host").String()
-		ss.dbCfg.Name = sec.Key("name").String()
-		ss.dbCfg.User = sec.Key("user").String()
-		ss.dbCfg.ConnectionString = sec.Key("connection_string").String()
-		ss.dbCfg.Pwd = sec.Key("password").String()
-	}
-
-	ss.dbCfg.MaxOpenConn = sec.Key("max_open_conn").MustInt(0)
-	ss.dbCfg.MaxIdleConn = sec.Key("max_idle_conn").MustInt(2)
-	ss.dbCfg.ConnMaxLifetime = sec.Key("conn_max_lifetime").MustInt(14400)
-
-	ss.dbCfg.SslMode = sec.Key("ssl_mode").String()
-	ss.dbCfg.CaCertPath = sec.Key("ca_cert_path").String()
-	ss.dbCfg.ClientKeyPath = sec.Key("client_key_path").String()
-	ss.dbCfg.ClientCertPath = sec.Key("client_cert_path").String()
-	ss.dbCfg.ServerCertName = sec.Key("server_cert_name").String()
-	ss.dbCfg.Path = sec.Key("path").MustString("data/grafana.db")
-	ss.dbCfg.IsolationLevel = sec.Key("isolation_level").String()
-
-	ss.dbCfg.CacheMode = sec.Key("cache_mode").MustString("private")
-	ss.dbCfg.WALEnabled = sec.Key("wal").MustBool(false)
-	ss.dbCfg.SkipMigrations = sec.Key("skip_migrations").MustBool()
-	ss.dbCfg.MigrationLockAttemptTimeout = sec.Key("locking_attempt_timeout_sec").MustInt()
-
-	ss.dbCfg.QueryRetries = sec.Key("query_retries").MustInt()
-	ss.dbCfg.TransactionRetries = sec.Key("transaction_retries").MustInt(5)
-	return nil
-}
-
 func (ss *SQLStore) GetMigrationLockAttemptTimeout() int {
 	return ss.dbCfg.MigrationLockAttemptTimeout
 }
@@ -563,16 +399,10 @@ func (ss *SQLStore) RecursiveQueriesAreSupported() (bool, error) {
 	return *ss.recursiveQueriesAreSupported, nil
 }
 
-// ITestDB is an interface of arguments for testing db
-type ITestDB interface {
-	Helper()
-	Fatalf(format string, args ...any)
-	Logf(format string, args ...any)
-	Log(args ...any)
-}
-
+var testSQLStoreSetup = false
 var testSQLStore *SQLStore
 var testSQLStoreMutex sync.Mutex
+var testSQLStoreCleanup []func()
 
 // InitTestDBOpt contains options for InitTestDB.
 type InitTestDBOpt struct {
@@ -581,15 +411,11 @@ type InitTestDBOpt struct {
 	FeatureFlags            []string
 }
 
-var featuresEnabledDuringTests = []string{
-	featuremgmt.FlagPanelTitleSearch,
-	featuremgmt.FlagEntityStore,
-}
-
 // InitTestDBWithMigration initializes the test DB given custom migrations.
-func InitTestDBWithMigration(t ITestDB, migration registry.DatabaseMigrator, opts ...InitTestDBOpt) *SQLStore {
+func InitTestDBWithMigration(t sqlutil.ITestDB, migration registry.DatabaseMigrator, opts ...InitTestDBOpt) *SQLStore {
 	t.Helper()
-	store, err := initTestDB(setting.NewCfg(), migration, opts...)
+	features := getFeaturesForTesting(opts...)
+	store, err := initTestDB(t, setting.NewCfg(), features, migration, opts...)
 	if err != nil {
 		t.Fatalf("failed to initialize sql store: %s", err)
 	}
@@ -597,55 +423,106 @@ func InitTestDBWithMigration(t ITestDB, migration registry.DatabaseMigrator, opt
 }
 
 // InitTestDB initializes the test DB.
-func InitTestDB(t ITestDB, opts ...InitTestDBOpt) *SQLStore {
+func InitTestDB(t sqlutil.ITestDB, opts ...InitTestDBOpt) *SQLStore {
 	t.Helper()
-	store, err := initTestDB(setting.NewCfg(), &migrations.OSSMigrations{}, opts...)
+	features := getFeaturesForTesting(opts...)
+
+	store, err := initTestDB(t, setting.NewCfg(), features, migrations.ProvideOSSMigrations(features), opts...)
 	if err != nil {
 		t.Fatalf("failed to initialize sql store: %s", err)
 	}
 	return store
 }
 
-func InitTestDBWithCfg(t ITestDB, opts ...InitTestDBOpt) (*SQLStore, *setting.Cfg) {
-	store := InitTestDB(t, opts...)
-	return store, store.Cfg
+func SetupTestDB() {
+	testSQLStoreMutex.Lock()
+	defer testSQLStoreMutex.Unlock()
+	if testSQLStoreSetup {
+		fmt.Printf("ERROR: Test DB already set up, SetupTestDB called twice\n")
+		os.Exit(1)
+	}
+	testSQLStoreSetup = true
 }
 
-//nolint:gocyclo
-func initTestDB(testCfg *setting.Cfg, migration registry.DatabaseMigrator, opts ...InitTestDBOpt) (*SQLStore, error) {
+func CleanupTestDB() {
 	testSQLStoreMutex.Lock()
 	defer testSQLStoreMutex.Unlock()
+	if !testSQLStoreSetup {
+		fmt.Printf("ERROR: Test DB not set up, SetupTestDB not called\n")
+		os.Exit(1)
+	}
+	if testSQLStore != nil {
+		if err := testSQLStore.GetEngine().Close(); err != nil {
+			fmt.Printf("Failed to close testSQLStore engine: %s\n", err)
+		}
 
-	if len(opts) == 0 {
-		opts = []InitTestDBOpt{{EnsureDefaultOrgAndUser: false, FeatureFlags: []string{}}}
+		for _, cleanup := range testSQLStoreCleanup {
+			cleanup()
+		}
+
+		testSQLStoreCleanup = []func(){}
+		testSQLStore = nil
 	}
+}
 
-	features := make([]string, len(featuresEnabledDuringTests))
-	copy(features, featuresEnabledDuringTests)
+func getFeaturesForTesting(opts ...InitTestDBOpt) featuremgmt.FeatureToggles {
+	featureKeys := []any{
+		featuremgmt.FlagPanelTitleSearch,
+		featuremgmt.FlagUnifiedStorage,
+	}
 	for _, opt := range opts {
 		if len(opt.FeatureFlags) > 0 {
-			features = append(features, opt.FeatureFlags...)
+			for _, f := range opt.FeatureFlags {
+				featureKeys = append(featureKeys, f)
+			}
 		}
 	}
+	return featuremgmt.WithFeatures(featureKeys...)
+}
 
-	if testSQLStore == nil {
-		dbType := migrator.SQLite
+//nolint:gocyclo
+func initTestDB(t sqlutil.ITestDB, testCfg *setting.Cfg,
+	features featuremgmt.FeatureToggles,
+	migration registry.DatabaseMigrator,
+	opts ...InitTestDBOpt) (*SQLStore, error) {
+	testSQLStoreMutex.Lock()
+	defer testSQLStoreMutex.Unlock()
+	if !testSQLStoreSetup {
+		t.Fatalf(`
 
-		// environment variable present for test db?
-		if db, present := os.LookupEnv("GRAFANA_TEST_DB"); present {
-			dbType = db
-		}
+ERROR: Test DB not set up, are you missing TestMain?
+
+https://github.com/grafana/grafana/blob/main/contribute/backend/style-guide.md
+
+Example:
+
+package mypkg
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana/pkg/tests/testsuite"
+)
+
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
+`)
+		os.Exit(1)
+	}
+
+	if len(opts) == 0 {
+		opts = []InitTestDBOpt{{EnsureDefaultOrgAndUser: false, FeatureFlags: []string{}}}
+	}
+
+	if testSQLStore == nil {
+		dbType := sqlutil.GetTestDBType()
 
 		// set test db config
 		cfg := setting.NewCfg()
-		cfg.IsFeatureToggleEnabled = func(key string) bool {
-			for _, enabledFeature := range features {
-				if enabledFeature == key {
-					return true
-				}
-			}
-			return false
-		}
+		// nolint:staticcheck
+		cfg.IsFeatureToggleEnabled = features.IsEnabledGlobally
 
 		sec, err := cfg.Raw.NewSection("database")
 		if err != nil {
@@ -655,21 +532,21 @@ func initTestDB(testCfg *setting.Cfg, migration registry.DatabaseMigrator, opts
 		if _, err := sec.NewKey("type", dbType); err != nil {
 			return nil, err
 		}
-		switch dbType {
-		case "mysql":
-			if _, err := sec.NewKey("connection_string", sqlutil.MySQLTestDB().ConnStr); err != nil {
-				return nil, err
-			}
-		case "postgres":
-			if _, err := sec.NewKey("connection_string", sqlutil.PostgresTestDB().ConnStr); err != nil {
-				return nil, err
-			}
-		default:
-			if _, err := sec.NewKey("connection_string", sqlutil.SQLite3TestDB().ConnStr); err != nil {
-				return nil, err
-			}
+
+		testDB, err := sqlutil.GetTestDB(dbType)
+		if err != nil {
+			return nil, err
+		}
+
+		if _, err := sec.NewKey("connection_string", testDB.ConnStr); err != nil {
+			return nil, err
+		}
+		if _, err := sec.NewKey("path", testDB.Path); err != nil {
+			return nil, err
 		}
 
+		testSQLStoreCleanup = append(testSQLStoreCleanup, testDB.Cleanup)
+
 		// useful if you already have a database that you want to use for tests.
 		// cannot just set it on testSQLStore as it overrides the config in Init
 		if _, present := os.LookupEnv("SKIP_MIGRATIONS"); present {
@@ -704,7 +581,7 @@ func initTestDB(testCfg *setting.Cfg, migration registry.DatabaseMigrator, opts
 
 		tracer := tracing.InitializeTracerForTest()
 		bus := bus.ProvideBus(tracer)
-		testSQLStore, err = newSQLStore(cfg, localcache.New(5*time.Minute, 10*time.Minute), engine, migration, bus, tracer, opts...)
+		testSQLStore, err = newSQLStore(cfg, engine, migration, bus, tracer, opts...)
 		if err != nil {
 			return nil, err
 		}
@@ -712,34 +589,10 @@ func initTestDB(testCfg *setting.Cfg, migration registry.DatabaseMigrator, opts
 		if err := testSQLStore.Migrate(false); err != nil {
 			return nil, err
 		}
-
-		if err := testSQLStore.Dialect.TruncateDBTables(engine); err != nil {
-			return nil, err
-		}
-
-		if err := testSQLStore.Reset(); err != nil {
-			return nil, err
-		}
-
-		// Make sure the changes are synced, so they get shared with eventual other DB connections
-		// XXX: Why is this only relevant when not skipping migrations?
-		if !testSQLStore.dbCfg.SkipMigrations {
-			if err := testSQLStore.Sync(); err != nil {
-				return nil, err
-			}
-		}
-
-		return testSQLStore, nil
 	}
 
-	testSQLStore.Cfg.IsFeatureToggleEnabled = func(key string) bool {
-		for _, enabledFeature := range features {
-			if enabledFeature == key {
-				return true
-			}
-		}
-		return false
-	}
+	// nolint:staticcheck
+	testSQLStore.Cfg.IsFeatureToggleEnabled = features.IsEnabledGlobally
 
 	if err := testSQLStore.Dialect.TruncateDBTables(testSQLStore.GetEngine()); err != nil {
 		return nil, err
@@ -750,55 +603,3 @@ func initTestDB(testCfg *setting.Cfg, migration registry.DatabaseMigrator, opts
 
 	return testSQLStore, nil
 }
-
-func IsTestDbMySQL() bool {
-	if db, present := os.LookupEnv("GRAFANA_TEST_DB"); present {
-		return db == migrator.MySQL
-	}
-
-	return false
-}
-
-func IsTestDbPostgres() bool {
-	if db, present := os.LookupEnv("GRAFANA_TEST_DB"); present {
-		return db == migrator.Postgres
-	}
-
-	return false
-}
-
-func IsTestDBMSSQL() bool {
-	if db, present := os.LookupEnv("GRAFANA_TEST_DB"); present {
-		return db == migrator.MSSQL
-	}
-
-	return false
-}
-
-type DatabaseConfig struct {
-	Type                        string
-	Host                        string
-	Name                        string
-	User                        string
-	Pwd                         string
-	Path                        string
-	SslMode                     string
-	CaCertPath                  string
-	ClientKeyPath               string
-	ClientCertPath              string
-	ServerCertName              string
-	ConnectionString            string
-	IsolationLevel              string
-	MaxOpenConn                 int
-	MaxIdleConn                 int
-	ConnMaxLifetime             int
-	CacheMode                   string
-	WALEnabled                  bool
-	UrlQueryParams              map[string][]string
-	SkipMigrations              bool
-	MigrationLockAttemptTimeout int
-	// SQLite only
-	QueryRetries int
-	// SQLite only
-	TransactionRetries int
-}
diff --git a/pkg/services/sqlstore/sqlstore_test.go b/pkg/services/sqlstore/sqlstore_test.go
index 5a99bc14bd83b..54da359d9f00b 100644
--- a/pkg/services/sqlstore/sqlstore_test.go
+++ b/pkg/services/sqlstore/sqlstore_test.go
@@ -2,131 +2,21 @@ package sqlstore
 
 import (
 	"context"
-	"errors"
-	"net/url"
+	"os"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/org"
-	"github.com/grafana/grafana/pkg/setting"
 )
 
-type sqlStoreTest struct {
-	name       string
-	dbType     string
-	dbHost     string
-	dbURL      string
-	dbUser     string
-	dbPwd      string
-	expConnStr string
-	features   []string
-	err        error
-}
-
-var sqlStoreTestCases = []sqlStoreTest{
-	{
-		name:       "MySQL IPv4",
-		dbType:     "mysql",
-		dbHost:     "1.2.3.4:5678",
-		expConnStr: ":@tcp(1.2.3.4:5678)/test_db?collation=utf8mb4_unicode_ci&allowNativePasswords=true&clientFoundRows=true",
-	},
-	{
-		name:       "Postgres IPv4",
-		dbType:     "postgres",
-		dbHost:     "1.2.3.4:5678",
-		expConnStr: "user='' host=1.2.3.4 port=5678 dbname=test_db sslmode='' sslcert='' sslkey='' sslrootcert=''",
-	},
-	{
-		name:       "Postgres IPv4 (Default Port)",
-		dbType:     "postgres",
-		dbHost:     "1.2.3.4",
-		expConnStr: "user='' host=1.2.3.4 port=5432 dbname=test_db sslmode='' sslcert='' sslkey='' sslrootcert=''",
-	},
-	{
-		name:       "Postgres username and password",
-		dbType:     "postgres",
-		dbHost:     "1.2.3.4",
-		dbUser:     "grafana",
-		dbPwd:      "password",
-		expConnStr: "user=grafana host=1.2.3.4 port=5432 dbname=test_db sslmode='' sslcert='' sslkey='' sslrootcert='' password=password",
-	},
-	{
-		name:       "Postgres username no password",
-		dbType:     "postgres",
-		dbHost:     "1.2.3.4",
-		dbUser:     "grafana",
-		dbPwd:      "",
-		expConnStr: "user=grafana host=1.2.3.4 port=5432 dbname=test_db sslmode='' sslcert='' sslkey='' sslrootcert=''",
-	},
-	{
-		name:       "MySQL IPv4 (Default Port)",
-		dbType:     "mysql",
-		dbHost:     "1.2.3.4",
-		expConnStr: ":@tcp(1.2.3.4)/test_db?collation=utf8mb4_unicode_ci&allowNativePasswords=true&clientFoundRows=true",
-	},
-	{
-		name:       "MySQL IPv6",
-		dbType:     "mysql",
-		dbHost:     "[fe80::24e8:31b2:91df:b177]:1234",
-		expConnStr: ":@tcp([fe80::24e8:31b2:91df:b177]:1234)/test_db?collation=utf8mb4_unicode_ci&allowNativePasswords=true&clientFoundRows=true",
-	},
-	{
-		name:       "Postgres IPv6",
-		dbType:     "postgres",
-		dbHost:     "[fe80::24e8:31b2:91df:b177]:1234",
-		expConnStr: "user='' host=fe80::24e8:31b2:91df:b177 port=1234 dbname=test_db sslmode='' sslcert='' sslkey='' sslrootcert=''",
-	},
-	{
-		name:       "MySQL IPv6 (Default Port)",
-		dbType:     "mysql",
-		dbHost:     "[::1]",
-		expConnStr: ":@tcp([::1])/test_db?collation=utf8mb4_unicode_ci&allowNativePasswords=true&clientFoundRows=true",
-	},
-	{
-		name:       "Postgres IPv6 (Default Port)",
-		dbType:     "postgres",
-		dbHost:     "[::1]",
-		expConnStr: "user='' host=::1 port=5432 dbname=test_db sslmode='' sslcert='' sslkey='' sslrootcert=''",
-	},
-	{
-		name:  "Invalid database URL",
-		dbURL: "://invalid.com/",
-		err:   &url.Error{Op: "parse", URL: "://invalid.com/", Err: errors.New("missing protocol scheme")},
-	},
-	{
-		name:       "MySQL with ANSI_QUOTES mode",
-		dbType:     "mysql",
-		dbHost:     "[::1]",
-		features:   []string{featuremgmt.FlagMysqlAnsiQuotes},
-		expConnStr: ":@tcp([::1])/test_db?collation=utf8mb4_unicode_ci&allowNativePasswords=true&clientFoundRows=true&sql_mode='ANSI_QUOTES'",
-	},
-	{
-		name:       "New DB library",
-		dbType:     "mysql",
-		dbHost:     "[::1]",
-		features:   []string{featuremgmt.FlagNewDBLibrary},
-		expConnStr: ":@tcp([::1])/test_db?collation=utf8mb4_unicode_ci&allowNativePasswords=true&clientFoundRows=true&sql_mode='ANSI_QUOTES'&parseTime=true",
-	},
-}
-
-func TestIntegrationSQLConnectionString(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	for _, testCase := range sqlStoreTestCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			sqlstore := &SQLStore{}
-			sqlstore.Cfg = makeSQLStoreTestConfig(t, testCase)
-			connStr, err := sqlstore.buildConnectionString()
-			require.Equal(t, testCase.err, err)
-
-			assert.Equal(t, testCase.expConnStr, connStr)
-		})
-	}
+func TestMain(m *testing.M) {
+	SetupTestDB()
+	code := m.Run()
+	CleanupTestDB()
+	os.Exit(code)
 }
 
 func TestIntegrationIsUniqueConstraintViolation(t *testing.T) {
@@ -176,35 +66,3 @@ func TestIntegrationIsUniqueConstraintViolation(t *testing.T) {
 		})
 	}
 }
-
-func makeSQLStoreTestConfig(t *testing.T, tc sqlStoreTest) *setting.Cfg {
-	t.Helper()
-
-	cfg := setting.NewCfg()
-
-	sec, err := cfg.Raw.NewSection("database")
-	require.NoError(t, err)
-	_, err = sec.NewKey("type", tc.dbType)
-	require.NoError(t, err)
-	_, err = sec.NewKey("host", tc.dbHost)
-	require.NoError(t, err)
-	_, err = sec.NewKey("url", tc.dbURL)
-	require.NoError(t, err)
-	_, err = sec.NewKey("user", tc.dbUser)
-	require.NoError(t, err)
-	_, err = sec.NewKey("name", "test_db")
-	require.NoError(t, err)
-	_, err = sec.NewKey("password", tc.dbPwd)
-	require.NoError(t, err)
-
-	cfg.IsFeatureToggleEnabled = func(key string) bool {
-		for _, f := range tc.features {
-			if f == key {
-				return true
-			}
-		}
-		return false
-	}
-
-	return cfg
-}
diff --git a/pkg/services/sqlstore/sqlutil/sqlutil.go b/pkg/services/sqlstore/sqlutil/sqlutil.go
index 2207bdd1450e6..38bf06b2476a0 100644
--- a/pkg/services/sqlstore/sqlutil/sqlutil.go
+++ b/pkg/services/sqlstore/sqlutil/sqlutil.go
@@ -1,25 +1,123 @@
 package sqlutil
 
 import (
+	"errors"
 	"fmt"
+	"io/fs"
 	"os"
+	"path/filepath"
 )
 
+// ITestDB is an interface of arguments for testing db
+type ITestDB interface {
+	Helper()
+	Fatalf(format string, args ...any)
+	Logf(format string, args ...any)
+	Log(args ...any)
+	Cleanup(func())
+}
+
 type TestDB struct {
 	DriverName string
 	ConnStr    string
+	Path       string
+	Cleanup    func()
 }
 
-func SQLite3TestDB() TestDB {
-	// To run all tests in a local test database, set ConnStr to "grafana_test.db"
-	return TestDB{
+func GetTestDBType() string {
+	dbType := "sqlite3"
+
+	// environment variable present for test db?
+	if db, present := os.LookupEnv("GRAFANA_TEST_DB"); present {
+		dbType = db
+	}
+	return dbType
+}
+
+func GetTestDB(dbType string) (*TestDB, error) {
+	switch dbType {
+	case "mysql":
+		return mySQLTestDB()
+	case "postgres":
+		return postgresTestDB()
+	case "sqlite3":
+		return sqLite3TestDB()
+	}
+
+	return nil, fmt.Errorf("unknown test db type: %s", dbType)
+}
+
+func sqLite3TestDB() (*TestDB, error) {
+	if os.Getenv("SQLITE_INMEMORY") == "true" {
+		return &TestDB{
+			DriverName: "sqlite3",
+			ConnStr:    "file::memory:",
+			Cleanup:    func() {},
+		}, nil
+	}
+
+	ret := &TestDB{
 		DriverName: "sqlite3",
-		// ConnStr specifies an In-memory database shared between connections.
-		ConnStr: "file::memory:?cache=shared",
+		Cleanup:    func() {},
 	}
+
+	sqliteDb := os.Getenv("SQLITE_TEST_DB")
+	if sqliteDb == "" {
+		// try to create a database file in the user's cache directory
+		dir, err := os.UserCacheDir()
+		if err != nil {
+			return nil, err
+		}
+
+		// if cache dir doesn't exist, fall back to temp dir
+		if _, err := os.Stat(dir); errors.Is(err, fs.ErrNotExist) {
+			dir = os.TempDir()
+			if _, err := os.Stat(dir); err != nil {
+				return nil, err
+			}
+		}
+
+		err = os.Mkdir(filepath.Join(dir, "grafana-test"), 0750)
+		if err != nil && !errors.Is(err, fs.ErrExist) {
+			return nil, err
+		}
+
+		f, err := os.CreateTemp(filepath.Join(dir, "grafana-test"), "grafana-test-*.db")
+		if err != nil {
+			return nil, err
+		}
+
+		sqliteDb = f.Name()
+
+		ret.Cleanup = func() {
+			// remove db file if it exists
+			err := os.Remove(sqliteDb)
+			if err != nil && !errors.Is(err, fs.ErrNotExist) {
+				fmt.Printf("Error removing sqlite db file %s: %v\n", sqliteDb, err)
+			}
+
+			// remove wal & shm files if they exist
+			err = os.Remove(sqliteDb + "-wal")
+			if err != nil && !errors.Is(err, fs.ErrNotExist) {
+				fmt.Printf("Error removing sqlite wal file %s: %v\n", sqliteDb+"-wal", err)
+			}
+			err = os.Remove(sqliteDb + "-shm")
+			if err != nil && !errors.Is(err, fs.ErrNotExist) {
+				fmt.Printf("Error removing sqlite shm file %s: %v\n", sqliteDb+"-shm", err)
+			}
+		}
+	}
+
+	ret.ConnStr = "file:" + sqliteDb + "?cache=private&mode=rwc"
+	if os.Getenv("SQLITE_JOURNAL_MODE") != "false" {
+		ret.ConnStr += "&_journal_mode=WAL"
+	}
+	ret.Path = sqliteDb
+
+	return ret, nil
 }
 
-func MySQLTestDB() TestDB {
+func mySQLTestDB() (*TestDB, error) {
 	host := os.Getenv("MYSQL_HOST")
 	if host == "" {
 		host = "localhost"
@@ -29,13 +127,14 @@ func MySQLTestDB() TestDB {
 		port = "3306"
 	}
 	conn_str := fmt.Sprintf("grafana:password@tcp(%s:%s)/grafana_tests?collation=utf8mb4_unicode_ci&sql_mode='ANSI_QUOTES'&parseTime=true", host, port)
-	return TestDB{
+	return &TestDB{
 		DriverName: "mysql",
 		ConnStr:    conn_str,
-	}
+		Cleanup:    func() {},
+	}, nil
 }
 
-func PostgresTestDB() TestDB {
+func postgresTestDB() (*TestDB, error) {
 	host := os.Getenv("POSTGRES_HOST")
 	if host == "" {
 		host = "localhost"
@@ -44,25 +143,10 @@ func PostgresTestDB() TestDB {
 	if port == "" {
 		port = "5432"
 	}
-	connStr := fmt.Sprintf("user=grafanatest password=grafanatest host=%s port=%s dbname=grafanatest sslmode=disable",
-		host, port)
-	return TestDB{
+	connStr := fmt.Sprintf("user=grafanatest password=grafanatest host=%s port=%s dbname=grafanatest sslmode=disable", host, port)
+	return &TestDB{
 		DriverName: "postgres",
 		ConnStr:    connStr,
-	}
-}
-
-func MSSQLTestDB() TestDB {
-	host := os.Getenv("MSSQL_HOST")
-	if host == "" {
-		host = "localhost"
-	}
-	port := os.Getenv("MSSQL_PORT")
-	if port == "" {
-		port = "1433"
-	}
-	return TestDB{
-		DriverName: "mssql",
-		ConnStr:    fmt.Sprintf("server=%s;port=%s;database=grafanatest;user id=grafana;password=Password!", host, port),
-	}
+		Cleanup:    func() {},
+	}, nil
 }
diff --git a/pkg/services/sqlstore/tls_mysql.go b/pkg/services/sqlstore/tls_mysql.go
index bb7baf2f4e648..d54b065da1e28 100644
--- a/pkg/services/sqlstore/tls_mysql.go
+++ b/pkg/services/sqlstore/tls_mysql.go
@@ -11,7 +11,7 @@ import (
 
 var tlslog = log.New("tls_mysql")
 
-func makeCert(config DatabaseConfig) (*tls.Config, error) {
+func makeCert(config *DatabaseConfig) (*tls.Config, error) {
 	rootCertPool := x509.NewCertPool()
 	pem, err := os.ReadFile(config.CaCertPath)
 	if err != nil {
diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go
index 591b485482e3f..1b2a9249bd373 100644
--- a/pkg/services/sqlstore/user.go
+++ b/pkg/services/sqlstore/user.go
@@ -50,12 +50,9 @@ func (ss *SQLStore) createUser(ctx context.Context, sess *DBSession, args user.C
 		args.Email = args.Login
 	}
 
-	where := "email=? OR login=?"
-	if ss.Cfg.CaseInsensitiveLogin {
-		where = "LOWER(email)=LOWER(?) OR LOWER(login)=LOWER(?)"
-		args.Login = strings.ToLower(args.Login)
-		args.Email = strings.ToLower(args.Email)
-	}
+	where := "LOWER(email)=LOWER(?) OR LOWER(login)=LOWER(?)"
+	args.Login = strings.ToLower(args.Login)
+	args.Email = strings.ToLower(args.Email)
 
 	exists, err := sess.Where(where, args.Email, args.Login).Get(&user.User{})
 	if err != nil {
@@ -88,11 +85,11 @@ func (ss *SQLStore) createUser(ctx context.Context, sess *DBSession, args user.C
 	usr.Rands = rands
 
 	if len(args.Password) > 0 {
-		encodedPassword, err := util.EncodePassword(args.Password, usr.Salt)
+		encodedPassword, err := util.EncodePassword(string(args.Password), usr.Salt)
 		if err != nil {
 			return usr, err
 		}
-		usr.Password = encodedPassword
+		usr.Password = user.Password(encodedPassword)
 	}
 
 	sess.UseBool("is_admin")
diff --git a/pkg/services/ssosettings/api/api.go b/pkg/services/ssosettings/api/api.go
new file mode 100644
index 0000000000000..d45c2d0db577b
--- /dev/null
+++ b/pkg/services/ssosettings/api/api.go
@@ -0,0 +1,270 @@
+package api
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"hash/fnv"
+	"net/http"
+
+	"github.com/grafana/grafana/pkg/api/response"
+	"github.com/grafana/grafana/pkg/api/routing"
+	"github.com/grafana/grafana/pkg/infra/log"
+	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	"github.com/grafana/grafana/pkg/services/ssosettings/models"
+	"github.com/grafana/grafana/pkg/web"
+)
+
+type Api struct {
+	Log                log.Logger
+	RouteRegister      routing.RouteRegister
+	AccessControl      ac.AccessControl
+	Features           *featuremgmt.FeatureManager
+	SSOSettingsService ssosettings.Service
+}
+
+func ProvideApi(
+	ssoSettingsSvc ssosettings.Service,
+	routeRegister routing.RouteRegister,
+	ac ac.AccessControl,
+) *Api {
+	api := &Api{
+		SSOSettingsService: ssoSettingsSvc,
+		RouteRegister:      routeRegister,
+		AccessControl:      ac,
+		Log:                log.New("ssosettings.api"),
+	}
+
+	return api
+}
+
+// generateFNVETag computes a FNV hash-based ETag for the SSOSettings struct
+func generateFNVETag(input any) (string, error) {
+	hasher := fnv.New64()
+	data, err := json.Marshal(input)
+	if err != nil {
+		return "", err
+	}
+
+	_, err = hasher.Write(data)
+	if err != nil {
+		return "", err
+	}
+
+	return fmt.Sprintf("%x", hasher.Sum(nil)), nil
+}
+
+// RegisterAPIEndpoints Registers Endpoints on Grafana Router
+func (api *Api) RegisterAPIEndpoints() {
+	api.RouteRegister.Group("/api/v1/sso-settings", func(router routing.RouteRegister) {
+		auth := ac.Middleware(api.AccessControl)
+
+		scopeKey := ac.Parameter(":key")
+		settingsScope := ac.ScopeSettingsOAuth(scopeKey)
+
+		reqWriteAccess := auth(ac.EvalPermission(ac.ActionSettingsWrite, settingsScope))
+
+		router.Get("/", auth(ac.EvalPermission(ac.ActionSettingsRead)), routing.Wrap(api.listAllProvidersSettings))
+		router.Get("/:key", auth(ac.EvalPermission(ac.ActionSettingsRead, settingsScope)), routing.Wrap(api.getProviderSettings))
+		router.Put("/:key", reqWriteAccess, routing.Wrap(api.updateProviderSettings))
+		router.Delete("/:key", reqWriteAccess, routing.Wrap(api.removeProviderSettings))
+	})
+}
+
+// swagger:route GET /v1/sso-settings sso_settings listAllProvidersSettings
+//
+// # List all SSO Settings entries
+//
+// You need to have a permission with action `settings:read` with scope `settings:auth.<provider>:*`.
+//
+// Responses:
+// 200: listSSOSettingsResponse
+// 400: badRequestError
+// 401: unauthorisedError
+// 403: forbiddenError
+func (api *Api) listAllProvidersSettings(c *contextmodel.ReqContext) response.Response {
+	providers, err := api.getAuthorizedList(c.Req.Context(), c.SignedInUser)
+	if err != nil {
+		return response.Error(http.StatusInternalServerError, "Failed to list all providers settings", err)
+	}
+
+	return response.JSON(http.StatusOK, providers)
+}
+
+func (api *Api) getAuthorizedList(ctx context.Context, identity identity.Requester) ([]*models.SSOSettings, error) {
+	allProviders, err := api.SSOSettingsService.ListWithRedactedSecrets(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	var authorizedProviders []*models.SSOSettings
+	for _, provider := range allProviders {
+		ev := ac.EvalPermission(ac.ActionSettingsRead, ac.Scope("settings", "auth."+provider.Provider, "*"))
+		hasAccess, err := api.AccessControl.Evaluate(ctx, identity, ev)
+		if err != nil {
+			api.Log.FromContext(ctx).Error("Failed to evaluate permissions", "error", err)
+			return nil, err
+		}
+
+		if !hasAccess {
+			continue
+		}
+
+		authorizedProviders = append(authorizedProviders, provider)
+	}
+
+	return authorizedProviders, nil
+}
+
+// swagger:route GET /v1/sso-settings/{key} sso_settings getProviderSettings
+//
+// # Get an SSO Settings entry by Key
+//
+// You need to have a permission with action `settings:read` with scope `settings:auth.<provider>:*`.
+//
+// Responses:
+// 200: getSSOSettingsResponse
+// 400: badRequestError
+// 401: unauthorisedError
+// 403: forbiddenError
+// 404: notFoundError
+func (api *Api) getProviderSettings(c *contextmodel.ReqContext) response.Response {
+	key, ok := web.Params(c.Req)[":key"]
+	if !ok {
+		return response.Error(http.StatusBadRequest, "Missing key", nil)
+	}
+
+	provider, err := api.SSOSettingsService.GetForProviderWithRedactedSecrets(c.Req.Context(), key)
+	if err != nil {
+		return response.ErrOrFallback(http.StatusInternalServerError, "Failed to get provider settings", err)
+	}
+
+	etag, err := generateFNVETag(provider)
+	if err != nil {
+		return response.Error(http.StatusInternalServerError, "Failed to get provider settings", err)
+	}
+
+	return response.JSON(http.StatusOK, provider).SetHeader("ETag", etag)
+}
+
+// swagger:route PUT /v1/sso-settings/{key} sso_settings updateProviderSettings
+//
+// # Update SSO Settings
+//
+// Inserts or updates the SSO Settings for a provider.
+//
+// You need to have a permission with action `settings:write` and scope `settings:auth.<provider>:*`.
+//
+// Responses:
+// 204: okResponse
+// 400: badRequestError
+// 401: unauthorisedError
+// 403: forbiddenError
+// 500: internalServerError
+func (api *Api) updateProviderSettings(c *contextmodel.ReqContext) response.Response {
+	key, ok := web.Params(c.Req)[":key"]
+	if !ok {
+		return response.Error(http.StatusBadRequest, "Missing key", nil)
+	}
+
+	var settings models.SSOSettings
+	if err := web.Bind(c.Req, &settings); err != nil {
+		return response.Error(http.StatusBadRequest, "Failed to parse request body", err)
+	}
+
+	settings.Provider = key
+
+	err := api.SSOSettingsService.Upsert(c.Req.Context(), &settings, c.SignedInUser)
+	if err != nil {
+		return response.ErrOrFallback(http.StatusInternalServerError, "Failed to update provider settings", err)
+	}
+
+	return response.Empty(http.StatusNoContent)
+}
+
+// swagger:route DELETE /v1/sso-settings/{key} sso_settings removeProviderSettings
+//
+// # Remove SSO Settings
+//
+// Removes the SSO Settings for a provider.
+//
+// You need to have a permission with action `settings:write` and scope `settings:auth.<provider>:*`.
+//
+// Responses:
+// 204: okResponse
+// 400: badRequestError
+// 401: unauthorisedError
+// 403: forbiddenError
+// 404: notFoundError
+// 500: internalServerError
+func (api *Api) removeProviderSettings(c *contextmodel.ReqContext) response.Response {
+	key, ok := web.Params(c.Req)[":key"]
+	if !ok {
+		return response.Error(http.StatusBadRequest, "Missing key", nil)
+	}
+
+	err := api.SSOSettingsService.Delete(c.Req.Context(), key)
+	if err != nil {
+		return response.ErrOrFallback(http.StatusInternalServerError, "Failed to delete provider settings", err)
+	}
+
+	return response.Empty(http.StatusNoContent)
+}
+
+// swagger:parameters listAllProvidersSettings
+type ListAllProvidersSettingsParams struct {
+}
+
+// swagger:parameters getProviderSettings
+type GetProviderSettingsParams struct {
+	// in:path
+	// required:true
+	Provider string `json:"key"`
+}
+
+// swagger:parameters updateProviderSettings
+type UpdateProviderSettingsParams struct {
+	// in:path
+	// required:true
+	Provider string `json:"key"`
+	// in:body
+	// required:true
+	Body struct {
+		ID       string         `json:"id"`
+		Provider string         `json:"provider"`
+		Settings map[string]any `json:"settings"`
+	} `json:"body"`
+}
+
+// swagger:parameters removeProviderSettings
+type RemoveProviderSettingsParams struct {
+	// in:path
+	// required:true
+	Provider string `json:"key"`
+}
+
+// swagger:response listSSOSettingsResponse
+type ListSSOSettingsResponse struct {
+	// in: body
+	Body []struct {
+		ID       string         `json:"id"`
+		Provider string         `json:"provider"`
+		Settings map[string]any `json:"settings"`
+		Source   string         `json:"source"`
+	} `json:"body"`
+}
+
+// swagger:response getSSOSettingsResponse
+type GetSSOSettingsResponse struct {
+	// in: body
+	Body struct {
+		ID       string         `json:"id"`
+		Provider string         `json:"provider"`
+		Settings map[string]any `json:"settings"`
+		Source   string         `json:"source"`
+	} `json:"body"`
+}
diff --git a/pkg/services/ssosettings/api/api_test.go b/pkg/services/ssosettings/api/api_test.go
new file mode 100644
index 0000000000000..2530f3cf0aa72
--- /dev/null
+++ b/pkg/services/ssosettings/api/api_test.go
@@ -0,0 +1,575 @@
+package api
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/api/routing"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
+	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	"github.com/grafana/grafana/pkg/services/ssosettings/models"
+	"github.com/grafana/grafana/pkg/services/ssosettings/ssosettingstests"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/web/webtest"
+)
+
+func TestSSOSettingsAPI_Update(t *testing.T) {
+	type TestCase struct {
+		desc                string
+		key                 string
+		body                string
+		action              string
+		scope               string
+		expectedError       error
+		expectedServiceCall bool
+		expectedStatusCode  int
+	}
+
+	tests := []TestCase{
+		{
+			desc:                "successfully updates SSO settings",
+			key:                 social.GitHubProviderName,
+			body:                `{"settings": {"enabled": true}}`,
+			action:              "settings:write",
+			scope:               "settings:auth.github:*",
+			expectedError:       nil,
+			expectedServiceCall: true,
+			expectedStatusCode:  http.StatusNoContent,
+		},
+		{
+			desc:                "fails when action doesn't match",
+			key:                 social.GitHubProviderName,
+			body:                `{"settings": {"enabled": true}}`,
+			action:              "settings:read",
+			scope:               "settings:auth.github:*",
+			expectedError:       nil,
+			expectedServiceCall: false,
+			expectedStatusCode:  http.StatusForbidden,
+		},
+		{
+			desc:                "fails when scope doesn't match",
+			key:                 social.GitHubProviderName,
+			body:                `{"settings": {"enabled": true}}`,
+			action:              "settings:write",
+			scope:               "settings:auth.github:read",
+			expectedError:       nil,
+			expectedServiceCall: false,
+			expectedStatusCode:  http.StatusForbidden,
+		},
+		{
+			desc:                "fails when scope contains another provider",
+			key:                 social.GitHubProviderName,
+			body:                `{"settings": {"enabled": true}}`,
+			action:              "settings:write",
+			scope:               "settings:auth.okta:*",
+			expectedError:       nil,
+			expectedServiceCall: false,
+			expectedStatusCode:  http.StatusForbidden,
+		},
+		{
+			desc:                "fails with not found when key is empty",
+			key:                 "",
+			body:                `{"settings": {"enabled": true}}`,
+			action:              "settings:write",
+			scope:               "settings:auth.github:*",
+			expectedError:       nil,
+			expectedServiceCall: false,
+			expectedStatusCode:  http.StatusNotFound,
+		},
+		{
+			desc:                "fails with bad request when body contains invalid json",
+			key:                 social.GitHubProviderName,
+			body:                `{ invalid json }`,
+			action:              "settings:write",
+			scope:               "settings:auth.github:*",
+			expectedError:       nil,
+			expectedServiceCall: false,
+			expectedStatusCode:  http.StatusBadRequest,
+		},
+		{
+			desc:                "fails with bad request when key was not found",
+			key:                 social.GitHubProviderName,
+			body:                `{"settings": {"enabled": true}}`,
+			action:              "settings:write",
+			scope:               "settings:auth.github:*",
+			expectedError:       ssosettings.ErrInvalidProvider.Errorf("invalid provider"),
+			expectedServiceCall: true,
+			expectedStatusCode:  http.StatusBadRequest,
+		},
+		{
+			desc:                "fails with internal server error when service returns an error",
+			key:                 social.GitHubProviderName,
+			body:                `{"settings": {"enabled": true}}`,
+			action:              "settings:write",
+			scope:               "settings:auth.github:*",
+			expectedError:       errors.New("something went wrong"),
+			expectedServiceCall: true,
+			expectedStatusCode:  http.StatusInternalServerError,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.desc, func(t *testing.T) {
+			var input models.SSOSettings
+			_ = json.Unmarshal([]byte(tt.body), &input)
+
+			settings := models.SSOSettings{
+				Provider: tt.key,
+				Settings: input.Settings,
+			}
+
+			signedInUser := &user.SignedInUser{
+				OrgRole:     org.RoleAdmin,
+				OrgID:       1,
+				Permissions: getPermissionsForActionAndScope(tt.action, tt.scope),
+			}
+
+			service := ssosettingstests.NewMockService(t)
+			if tt.expectedServiceCall {
+				service.On("Upsert", mock.Anything, &settings, signedInUser).Return(tt.expectedError).Once()
+			}
+			server := setupTests(t, service)
+
+			path := fmt.Sprintf("/api/v1/sso-settings/%s", tt.key)
+			req := server.NewRequest(http.MethodPut, path, bytes.NewBufferString(tt.body))
+			webtest.RequestWithSignedInUser(req, signedInUser)
+			res, err := server.SendJSON(req)
+			require.NoError(t, err)
+
+			require.Equal(t, tt.expectedStatusCode, res.StatusCode)
+			require.NoError(t, res.Body.Close())
+		})
+	}
+}
+
+func TestSSOSettingsAPI_Delete(t *testing.T) {
+	type TestCase struct {
+		desc                string
+		key                 string
+		action              string
+		scope               string
+		expectedError       error
+		expectedServiceCall bool
+		expectedStatusCode  int
+	}
+
+	tests := []TestCase{
+		{
+			desc:                "successfully deletes SSO settings",
+			key:                 social.AzureADProviderName,
+			action:              "settings:write",
+			scope:               "settings:auth.azuread:*",
+			expectedError:       nil,
+			expectedServiceCall: true,
+			expectedStatusCode:  http.StatusNoContent,
+		},
+		{
+			desc:                "fails when action doesn't match",
+			key:                 social.AzureADProviderName,
+			action:              "settings:read",
+			scope:               "settings:auth.azuread:*",
+			expectedError:       nil,
+			expectedServiceCall: false,
+			expectedStatusCode:  http.StatusForbidden,
+		},
+		{
+			desc:                "fails when scope doesn't match",
+			key:                 social.AzureADProviderName,
+			action:              "settings:write",
+			scope:               "settings:auth.azuread:read",
+			expectedError:       nil,
+			expectedServiceCall: false,
+			expectedStatusCode:  http.StatusForbidden,
+		},
+		{
+			desc:                "fails when scope contains another provider",
+			key:                 social.AzureADProviderName,
+			action:              "settings:write",
+			scope:               "settings:auth.github:*",
+			expectedError:       nil,
+			expectedServiceCall: false,
+			expectedStatusCode:  http.StatusForbidden,
+		},
+		{
+			desc:                "fails with not found when key is empty",
+			key:                 "",
+			action:              "settings:write",
+			scope:               "settings:auth.azuread:*",
+			expectedError:       nil,
+			expectedServiceCall: false,
+			expectedStatusCode:  http.StatusNotFound,
+		},
+		{
+			desc:                "fails with not found when key was not found",
+			key:                 social.AzureADProviderName,
+			action:              "settings:write",
+			scope:               "settings:auth.azuread:*",
+			expectedError:       ssosettings.ErrNotFound,
+			expectedServiceCall: true,
+			expectedStatusCode:  http.StatusNotFound,
+		},
+		{
+			desc:                "fails with internal server error when service returns an error",
+			key:                 social.AzureADProviderName,
+			action:              "settings:write",
+			scope:               "settings:auth.azuread:*",
+			expectedError:       errors.New("something went wrong"),
+			expectedServiceCall: true,
+			expectedStatusCode:  http.StatusInternalServerError,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.desc, func(t *testing.T) {
+			service := ssosettingstests.NewMockService(t)
+			if tt.expectedServiceCall {
+				service.On("Delete", mock.Anything, tt.key).Return(tt.expectedError).Once()
+			}
+			server := setupTests(t, service)
+
+			path := fmt.Sprintf("/api/v1/sso-settings/%s", tt.key)
+			req := server.NewRequest(http.MethodDelete, path, nil)
+			webtest.RequestWithSignedInUser(req, &user.SignedInUser{
+				OrgRole:     org.RoleEditor,
+				OrgID:       1,
+				Permissions: getPermissionsForActionAndScope(tt.action, tt.scope),
+			})
+			res, err := server.SendJSON(req)
+			require.NoError(t, err)
+
+			require.Equal(t, tt.expectedStatusCode, res.StatusCode)
+			require.NoError(t, res.Body.Close())
+		})
+	}
+}
+
+func TestSSOSettingsAPI_GetForProvider(t *testing.T) {
+	type TestCase struct {
+		desc                string
+		key                 string
+		action              string
+		scope               string
+		expectedResult      *models.SSOSettings
+		expectedError       error
+		expectedServiceCall bool
+		expectedStatusCode  int
+	}
+
+	tests := []TestCase{
+		{
+			desc:   "successfully gets SSO settings",
+			key:    "azuread",
+			action: "settings:read",
+			scope:  "settings:auth.azuread:*",
+			expectedResult: &models.SSOSettings{
+				ID:        "1",
+				Provider:  "azuread",
+				Settings:  make(map[string]interface{}),
+				Created:   time.Now(),
+				Updated:   time.Now(),
+				IsDeleted: false,
+				Source:    models.DB,
+			},
+			expectedError:       nil,
+			expectedServiceCall: true,
+			expectedStatusCode:  http.StatusOK,
+		},
+		{
+			desc:                "fails when action doesn't match",
+			key:                 "azuread",
+			action:              "settings:write",
+			scope:               "settings:auth.azuread:*",
+			expectedResult:      nil,
+			expectedError:       nil,
+			expectedServiceCall: false,
+			expectedStatusCode:  http.StatusForbidden,
+		},
+		{
+			desc:                "fails when scope doesn't match",
+			key:                 "azuread",
+			action:              "settings:read",
+			scope:               "settings:auth.azuread:write",
+			expectedResult:      nil,
+			expectedError:       nil,
+			expectedServiceCall: false,
+			expectedStatusCode:  http.StatusForbidden,
+		},
+		{
+			desc:                "fails when scope contains another provider",
+			key:                 "azuread",
+			action:              "settings:read",
+			scope:               "settings:auth.github:*",
+			expectedResult:      nil,
+			expectedError:       nil,
+			expectedServiceCall: false,
+			expectedStatusCode:  http.StatusForbidden,
+		},
+		{
+			desc:                "fails with not found when key was not found",
+			key:                 "nonexistant",
+			action:              "settings:read",
+			scope:               "settings:auth.nonexistant:*",
+			expectedResult:      nil,
+			expectedError:       ssosettings.ErrNotFound,
+			expectedServiceCall: true,
+			expectedStatusCode:  http.StatusNotFound,
+		},
+		{
+			desc:                "fails with internal server error when service returns an error",
+			key:                 "azuread",
+			action:              "settings:read",
+			scope:               "settings:auth.azuread:*",
+			expectedResult:      nil,
+			expectedError:       errors.New("something went wrong"),
+			expectedServiceCall: true,
+			expectedStatusCode:  http.StatusInternalServerError,
+		},
+		{
+			desc:                "fails with not found error when the provider is not configurable",
+			key:                 "grafana_com",
+			action:              "settings:read",
+			scope:               "settings:*",
+			expectedResult:      nil,
+			expectedError:       ssosettings.ErrNotConfigurable,
+			expectedServiceCall: true,
+			expectedStatusCode:  http.StatusNotFound,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.desc, func(t *testing.T) {
+			service := ssosettingstests.NewMockService(t)
+			if tt.expectedServiceCall {
+				service.On("GetForProviderWithRedactedSecrets", mock.AnythingOfType("*context.valueCtx"), tt.key).Return(tt.expectedResult, tt.expectedError).Once()
+			}
+			server := setupTests(t, service)
+
+			path := fmt.Sprintf("/api/v1/sso-settings/%s", tt.key)
+			req := server.NewRequest(http.MethodGet, path, nil)
+			webtest.RequestWithSignedInUser(req, &user.SignedInUser{
+				OrgRole:     org.RoleEditor,
+				OrgID:       1,
+				Permissions: getPermissionsForActionAndScope(tt.action, tt.scope),
+			})
+			res, err := server.SendJSON(req)
+			require.NoError(t, err)
+
+			require.Equal(t, tt.expectedStatusCode, res.StatusCode)
+
+			if tt.expectedError == nil {
+				var data models.SSOSettings
+				require.NoError(t, json.NewDecoder(res.Body).Decode(&data))
+			}
+
+			require.NoError(t, res.Body.Close())
+		})
+	}
+}
+
+func TestSSOSettingsAPI_List(t *testing.T) {
+	type TestCase struct {
+		desc                string
+		action              string
+		scope               string
+		expectedResult      []*models.SSOSettings
+		errFromService      error
+		wantErr             bool
+		expectedErrMessage  string
+		expectedServiceCall bool
+		expectedStatusCode  int
+	}
+
+	tests := []TestCase{
+		{
+			desc:   "successfully lists SSO settings",
+			action: "settings:read",
+			scope:  "settings:auth.azuread:*",
+			expectedResult: []*models.SSOSettings{
+				{
+					ID:       "1",
+					Provider: "azuread",
+					Settings: make(map[string]interface{}),
+					Source:   models.DB,
+				},
+			},
+			expectedServiceCall: true,
+			expectedStatusCode:  http.StatusOK,
+		},
+		{
+			desc:                "returns empty list when the user has the action but the scope doesn't match any of the providerss scope",
+			action:              "settings:read",
+			scope:               "settings:auth.saml:write",
+			expectedResult:      []*models.SSOSettings{},
+			expectedServiceCall: true,
+			expectedStatusCode:  http.StatusOK,
+		},
+		{
+			desc:   "successfully lists SSO settings when scope contains wildcard",
+			action: "settings:read",
+			scope:  "settings:*",
+			expectedResult: []*models.SSOSettings{
+				{
+					ID:       "1",
+					Provider: "azuread",
+					Settings: make(map[string]interface{}),
+					Source:   models.DB,
+				},
+				{
+					ID:       "2",
+					Provider: "github",
+					Settings: make(map[string]interface{}),
+					Source:   models.DB,
+				},
+				{
+					ID:       "3",
+					Provider: "okta",
+					Settings: make(map[string]interface{}),
+					Source:   models.System,
+				},
+			},
+			expectedServiceCall: true,
+			expectedStatusCode:  http.StatusOK,
+		},
+		{
+			desc:                "fails when action doesn't match",
+			action:              "madeupaction:read",
+			scope:               "madeupscope:*",
+			wantErr:             true,
+			expectedErrMessage:  "You'll need additional permissions to perform this action. Permissions needed: settings:read",
+			expectedResult:      nil,
+			expectedServiceCall: false,
+			expectedStatusCode:  http.StatusForbidden,
+		},
+		{
+			desc:                "fails with internal server error when service returns an error",
+			action:              "settings:read",
+			scope:               "settings:auth.azuread:*",
+			errFromService:      errors.New("something went wrong"),
+			expectedResult:      nil,
+			wantErr:             true,
+			expectedErrMessage:  "Failed to list all providers settings",
+			expectedServiceCall: true,
+			expectedStatusCode:  http.StatusInternalServerError,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.desc, func(t *testing.T) {
+			service := ssosettingstests.NewMockService(t)
+
+			serviceResult := []*models.SSOSettings{
+				{
+					ID:        "1",
+					Provider:  "azuread",
+					Settings:  make(map[string]interface{}),
+					Created:   time.Now(),
+					Updated:   time.Now(),
+					IsDeleted: false,
+					Source:    models.DB,
+				},
+				{
+					ID:        "2",
+					Provider:  "github",
+					Settings:  make(map[string]interface{}),
+					Created:   time.Now(),
+					Updated:   time.Now(),
+					IsDeleted: false,
+					Source:    models.DB,
+				},
+				{
+					ID:        "3",
+					Provider:  "okta",
+					Settings:  make(map[string]interface{}),
+					Created:   time.Now(),
+					Updated:   time.Now(),
+					IsDeleted: false,
+					Source:    models.System,
+				},
+			}
+			if tt.expectedServiceCall {
+				service.On("ListWithRedactedSecrets", mock.AnythingOfType("*context.valueCtx")).Return(serviceResult, tt.errFromService).Once()
+			}
+			server := setupTests(t, service)
+
+			path := "/api/v1/sso-settings"
+			req := server.NewRequest(http.MethodGet, path, nil)
+			webtest.RequestWithSignedInUser(req, &user.SignedInUser{
+				OrgRole:     org.RoleEditor,
+				OrgID:       1,
+				Permissions: getPermissionsForActionAndScope(tt.action, tt.scope),
+			})
+			res, err := server.SendJSON(req)
+			require.NoError(t, err)
+
+			require.Equal(t, tt.expectedStatusCode, res.StatusCode)
+
+			bodyBytes, err := io.ReadAll(res.Body)
+			if err != nil {
+				t.Fatalf("Failed to read response body: %v", err)
+			}
+
+			if tt.wantErr {
+				var accessErrorResponse struct {
+					AccessErrorID string `json:"accessErrorId"`
+					Message       string `json:"message"`
+					Title         string `json:"title"`
+				}
+				err = json.Unmarshal(bodyBytes, &accessErrorResponse)
+				if err != nil {
+					t.Fatalf("Failed to unmarshal response body into accessErrorResponse: %v", err)
+				}
+
+				require.Equal(t, tt.expectedErrMessage, accessErrorResponse.Message)
+				return
+			}
+
+			var actual []*models.SSOSettings
+			err = json.Unmarshal(bodyBytes, &actual)
+			require.NoError(t, err)
+
+			require.ElementsMatch(t, tt.expectedResult, actual)
+			err = res.Body.Close()
+			require.NoError(t, err)
+		})
+	}
+}
+
+func getPermissionsForActionAndScope(action, scope string) map[int64]map[string][]string {
+	return map[int64]map[string][]string{
+		1: accesscontrol.GroupScopesByAction([]accesscontrol.Permission{{
+			Action: action, Scope: scope,
+		}}),
+	}
+}
+
+func setupTests(t *testing.T, service ssosettings.Service) *webtest.Server {
+	t.Helper()
+
+	cfg := setting.NewCfg()
+	logger := log.NewNopLogger()
+
+	api := &Api{
+		Log:                logger,
+		RouteRegister:      routing.NewRouteRegister(),
+		AccessControl:      acimpl.ProvideAccessControl(cfg),
+		SSOSettingsService: service,
+	}
+
+	api.RegisterAPIEndpoints()
+
+	return webtest.NewServer(t, api.RouteRegister)
+}
diff --git a/pkg/services/ssosettings/database/database.go b/pkg/services/ssosettings/database/database.go
new file mode 100644
index 0000000000000..320c248a07de4
--- /dev/null
+++ b/pkg/services/ssosettings/database/database.go
@@ -0,0 +1,149 @@
+package database
+
+import (
+	"context"
+	"time"
+
+	"github.com/google/uuid"
+
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	"github.com/grafana/grafana/pkg/services/ssosettings/models"
+)
+
+const (
+	isDeletedColumn = "is_deleted"
+	updatedColumn   = "updated"
+)
+
+type SSOSettingsStore struct {
+	sqlStore db.DB
+	log      log.Logger
+}
+
+func ProvideStore(sqlStore db.DB) *SSOSettingsStore {
+	return &SSOSettingsStore{
+		sqlStore: sqlStore,
+		log:      log.New("ssosettings.store"),
+	}
+}
+
+var _ ssosettings.Store = (*SSOSettingsStore)(nil)
+
+func (s *SSOSettingsStore) Get(ctx context.Context, provider string) (*models.SSOSettings, error) {
+	if provider == "" {
+		return nil, ssosettings.ErrNotFound
+	}
+
+	result := models.SSOSettings{
+		Provider:  provider,
+		IsDeleted: false,
+	}
+
+	err := s.sqlStore.WithDbSession(ctx, func(sess *db.Session) error {
+		found, err := sess.UseBool(isDeletedColumn).Get(&result)
+		if err != nil {
+			return err
+		}
+
+		if !found {
+			return ssosettings.ErrNotFound
+		}
+
+		return nil
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}
+
+func (s *SSOSettingsStore) List(ctx context.Context) ([]*models.SSOSettings, error) {
+	result := make([]*models.SSOSettings, 0)
+
+	err := s.sqlStore.WithDbSession(ctx, func(sess *db.Session) error {
+		condition := &models.SSOSettings{
+			IsDeleted: false,
+		}
+
+		err := sess.UseBool(isDeletedColumn).Find(&result, condition)
+		if err != nil {
+			return err
+		}
+
+		return nil
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	return result, nil
+}
+
+func (s *SSOSettingsStore) Upsert(ctx context.Context, settings *models.SSOSettings) error {
+	if settings.Provider == "" {
+		return ssosettings.ErrNotFound
+	}
+
+	return s.sqlStore.WithDbSession(ctx, func(sess *db.Session) error {
+		existing := &models.SSOSettings{
+			Provider:  settings.Provider,
+			IsDeleted: false,
+		}
+
+		found, err := sess.UseBool(isDeletedColumn).Exist(existing)
+		if err != nil {
+			return err
+		}
+
+		now := time.Now().UTC()
+
+		if found {
+			updated := &models.SSOSettings{
+				Settings:  settings.Settings,
+				Updated:   now,
+				IsDeleted: false,
+			}
+			_, err = sess.UseBool(isDeletedColumn).Update(updated, existing)
+		} else {
+			settings.ID = uuid.New().String()
+			settings.Created = now
+			settings.Updated = now
+			_, err = sess.Insert(settings)
+		}
+
+		return err
+	})
+}
+
+func (s *SSOSettingsStore) Delete(ctx context.Context, provider string) error {
+	if provider == "" {
+		return ssosettings.ErrNotFound
+	}
+
+	return s.sqlStore.WithDbSession(ctx, func(sess *db.Session) error {
+		existing := &models.SSOSettings{
+			Provider:  provider,
+			IsDeleted: false,
+		}
+
+		found, err := sess.UseBool(isDeletedColumn).Get(existing)
+		if err != nil {
+			return err
+		}
+
+		if !found {
+			return ssosettings.ErrNotFound
+		}
+
+		existing.Updated = time.Now().UTC()
+		existing.IsDeleted = true
+
+		_, err = sess.ID(existing.ID).MustCols(updatedColumn, isDeletedColumn).Update(existing)
+		return err
+	})
+}
diff --git a/pkg/services/ssosettings/database/database_test.go b/pkg/services/ssosettings/database/database_test.go
new file mode 100644
index 0000000000000..cc937721b035e
--- /dev/null
+++ b/pkg/services/ssosettings/database/database_test.go
@@ -0,0 +1,508 @@
+package database
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/google/uuid"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	"github.com/grafana/grafana/pkg/services/ssosettings/models"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
+)
+
+const (
+	withinDuration = 5 * time.Minute
+)
+
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
+func TestIntegrationGetSSOSettings(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	var sqlStore *sqlstore.SQLStore
+	var ssoSettingsStore *SSOSettingsStore
+
+	setup := func() {
+		sqlStore = db.InitTestDB(t)
+		ssoSettingsStore = ProvideStore(sqlStore)
+
+		template := models.SSOSettings{
+			Settings: map[string]any{"enabled": true},
+		}
+		err := populateSSOSettings(sqlStore, template, "azuread", "github", "google")
+		require.NoError(t, err)
+	}
+
+	t.Run("returns existing SSO settings", func(t *testing.T) {
+		setup()
+
+		expected := &models.SSOSettings{
+			Provider: "azuread",
+			Settings: map[string]any{"enabled": true},
+		}
+
+		actual, err := ssoSettingsStore.Get(context.Background(), "azuread")
+		require.NoError(t, err)
+
+		require.EqualValues(t, expected.Settings, actual.Settings)
+	})
+
+	t.Run("returns not found if the SSO setting is missing for the specified provider", func(t *testing.T) {
+		setup()
+
+		_, err := ssoSettingsStore.Get(context.Background(), "okta")
+		require.ErrorAs(t, err, &ssosettings.ErrNotFound)
+	})
+
+	t.Run("returns not found if the SSO setting is soft deleted for the specified provider", func(t *testing.T) {
+		setup()
+
+		provider := "okta"
+		template := models.SSOSettings{
+			Settings:  map[string]any{"enabled": true},
+			IsDeleted: true,
+		}
+		err := populateSSOSettings(sqlStore, template, provider)
+		require.NoError(t, err)
+
+		_, err = ssoSettingsStore.Get(context.Background(), provider)
+		require.ErrorAs(t, err, &ssosettings.ErrNotFound)
+	})
+
+	t.Run("returns not found if the specified provider is empty", func(t *testing.T) {
+		setup()
+
+		_, err := ssoSettingsStore.Get(context.Background(), "")
+		require.ErrorAs(t, err, &ssosettings.ErrNotFound)
+	})
+}
+
+func TestIntegrationUpsertSSOSettings(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	var sqlStore *sqlstore.SQLStore
+	var ssoSettingsStore *SSOSettingsStore
+
+	setup := func() {
+		sqlStore = db.InitTestDB(t)
+		ssoSettingsStore = ProvideStore(sqlStore)
+	}
+
+	t.Run("insert a new SSO setting successfully", func(t *testing.T) {
+		setup()
+
+		settings := models.SSOSettings{
+			Provider: "azuread",
+			Settings: map[string]any{
+				"enabled":   true,
+				"client_id": "azuread-client",
+			},
+		}
+
+		err := ssoSettingsStore.Upsert(context.Background(), &settings)
+		require.NoError(t, err)
+
+		actual, err := getSSOSettingsByProvider(sqlStore, settings.Provider, false)
+		require.NoError(t, err)
+		require.EqualValues(t, settings.Settings, actual.Settings)
+		require.NotEmpty(t, actual.ID)
+		require.WithinDuration(t, time.Now().UTC(), actual.Created, withinDuration)
+		require.WithinDuration(t, time.Now().UTC(), actual.Updated, withinDuration)
+
+		deleted, notDeleted, err := getSSOSettingsCountByDeleted(sqlStore)
+		require.NoError(t, err)
+		require.EqualValues(t, 0, deleted)
+		require.EqualValues(t, 1, notDeleted)
+	})
+
+	t.Run("replaces an existing SSO setting for the specified provider", func(t *testing.T) {
+		setup()
+
+		provider := "github"
+		template := models.SSOSettings{
+			Settings: map[string]any{
+				"enabled":       true,
+				"client_id":     "github-client",
+				"client_secret": "this-is-a-secret",
+			},
+		}
+		err := populateSSOSettings(sqlStore, template, provider)
+		require.NoError(t, err)
+
+		newSettings := models.SSOSettings{
+			Provider: provider,
+			Settings: map[string]any{
+				"enabled":       true,
+				"client_id":     "new-github-client",
+				"client_secret": "this-is-a-new-secret",
+			},
+		}
+		err = ssoSettingsStore.Upsert(context.Background(), &newSettings)
+		require.NoError(t, err)
+
+		actual, err := getSSOSettingsByProvider(sqlStore, provider, false)
+		require.NoError(t, err)
+		require.EqualValues(t, newSettings.Settings, actual.Settings)
+		require.WithinDuration(t, time.Now().UTC(), actual.Updated, withinDuration)
+
+		deleted, notDeleted, err := getSSOSettingsCountByDeleted(sqlStore)
+		require.NoError(t, err)
+		require.EqualValues(t, 0, deleted)
+		require.EqualValues(t, 1, notDeleted)
+	})
+
+	t.Run("trying to update a deleted SSO Settings will insert a new record", func(t *testing.T) {
+		setup()
+
+		provider := "azuread"
+		template := models.SSOSettings{
+			Settings: map[string]any{
+				"enabled":       true,
+				"client_id":     "azuread-client",
+				"client_secret": "this-is-a-secret",
+			},
+			IsDeleted: true,
+		}
+		err := populateSSOSettings(sqlStore, template, provider)
+		require.NoError(t, err)
+
+		newSettings := models.SSOSettings{
+			Provider: provider,
+			Settings: map[string]any{
+				"enabled":       true,
+				"client_id":     "new-azuread-client",
+				"client_secret": "this-is-a-new-secret",
+			},
+		}
+
+		err = ssoSettingsStore.Upsert(context.Background(), &newSettings)
+		require.NoError(t, err)
+
+		actual, err := getSSOSettingsByProvider(sqlStore, provider, false)
+		require.NoError(t, err)
+		require.EqualValues(t, newSettings.Settings, actual.Settings)
+		require.WithinDuration(t, time.Now().UTC(), actual.Created, withinDuration)
+		require.WithinDuration(t, time.Now().UTC(), actual.Updated, withinDuration)
+
+		old, err := getSSOSettingsByProvider(sqlStore, provider, true)
+		require.NoError(t, err)
+		require.EqualValues(t, template.Settings, old.Settings)
+	})
+
+	t.Run("replaces the settings only for the specified provider leaving the other provider's settings unchanged", func(t *testing.T) {
+		setup()
+
+		providers := []string{"github", "gitlab", "google"}
+		template := models.SSOSettings{
+			Settings: map[string]any{
+				"enabled":       true,
+				"client_id":     "my-client",
+				"client_secret": "this-is-a-secret",
+			},
+		}
+		err := populateSSOSettings(sqlStore, template, providers...)
+		require.NoError(t, err)
+
+		newSettings := models.SSOSettings{
+			Provider: providers[0],
+			Settings: map[string]any{
+				"enabled":       true,
+				"client_id":     "my-new-client",
+				"client_secret": "this-is-my-new-secret",
+			},
+		}
+		err = ssoSettingsStore.Upsert(context.Background(), &newSettings)
+		require.NoError(t, err)
+
+		actual, err := getSSOSettingsByProvider(sqlStore, providers[0], false)
+		require.NoError(t, err)
+		require.EqualValues(t, newSettings.Settings, actual.Settings)
+		require.WithinDuration(t, time.Now().UTC(), actual.Updated, withinDuration)
+
+		for index := 1; index < len(providers); index++ {
+			existing, err := getSSOSettingsByProvider(sqlStore, providers[index], false)
+			require.NoError(t, err)
+			require.EqualValues(t, template.Settings, existing.Settings)
+		}
+	})
+
+	t.Run("fails if the provider is empty", func(t *testing.T) {
+		setup()
+
+		template := models.SSOSettings{
+			Settings: map[string]any{
+				"enabled":       true,
+				"client_id":     "azuread-client",
+				"client_secret": "this-is-a-secret",
+			},
+			IsDeleted: true,
+		}
+		err := populateSSOSettings(sqlStore, template, "azuread")
+		require.NoError(t, err)
+
+		settings := models.SSOSettings{
+			Provider: "",
+			Settings: map[string]any{
+				"enabled":   true,
+				"client_id": "new-client",
+			},
+		}
+
+		err = ssoSettingsStore.Upsert(context.Background(), &settings)
+		require.Error(t, err)
+		require.ErrorIs(t, err, ssosettings.ErrNotFound)
+	})
+}
+
+func TestIntegrationListSSOSettings(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	var sqlStore *sqlstore.SQLStore
+	var ssoSettingsStore *SSOSettingsStore
+
+	setup := func() {
+		sqlStore = db.InitTestDB(t)
+		ssoSettingsStore = ProvideStore(sqlStore)
+	}
+
+	t.Run("returns every SSO settings successfully", func(t *testing.T) {
+		setup()
+
+		providers := []string{"azuread", "okta", "github"}
+		settings := models.SSOSettings{
+			Settings: map[string]any{
+				"enabled":   true,
+				"client_id": "the_client_id",
+			},
+			IsDeleted: false,
+		}
+		err := populateSSOSettings(sqlStore, settings, providers...)
+		require.NoError(t, err)
+
+		deleted := models.SSOSettings{
+			Settings: map[string]any{
+				"enabled": false,
+			},
+			IsDeleted: true,
+		}
+		err = populateSSOSettings(sqlStore, deleted, "google", "gitlab", "okta")
+		require.NoError(t, err)
+
+		list, err := ssoSettingsStore.List(context.Background())
+
+		require.NoError(t, err)
+		require.Len(t, list, len(providers))
+
+		for _, item := range list {
+			require.Contains(t, providers, item.Provider)
+			require.EqualValues(t, settings.Settings, item.Settings)
+		}
+	})
+
+	t.Run("returns empty list if no settings are found", func(t *testing.T) {
+		setup()
+
+		deleted := models.SSOSettings{
+			Settings: map[string]any{
+				"enabled": false,
+			},
+			IsDeleted: true,
+		}
+		err := populateSSOSettings(sqlStore, deleted, "google", "gitlab", "okta")
+		require.NoError(t, err)
+
+		list, err := ssoSettingsStore.List(context.Background())
+
+		require.NoError(t, err)
+		require.Len(t, list, 0)
+	})
+}
+
+func TestIntegrationDeleteSSOSettings(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	var sqlStore *sqlstore.SQLStore
+	var ssoSettingsStore *SSOSettingsStore
+
+	setup := func() {
+		sqlStore = db.InitTestDB(t)
+		ssoSettingsStore = ProvideStore(sqlStore)
+	}
+
+	t.Run("soft deletes the settings successfully", func(t *testing.T) {
+		setup()
+
+		providers := []string{"azuread", "github", "google"}
+		template := models.SSOSettings{
+			Settings: map[string]any{
+				"enabled": true,
+			},
+		}
+		err := populateSSOSettings(sqlStore, template, providers...)
+		require.NoError(t, err)
+
+		err = ssoSettingsStore.Delete(context.Background(), providers[0])
+		require.NoError(t, err)
+
+		deleted, notDeleted, err := getSSOSettingsCountByDeleted(sqlStore)
+		require.NoError(t, err)
+		require.EqualValues(t, 1, deleted)
+		require.EqualValues(t, len(providers)-1, notDeleted)
+	})
+
+	t.Run("return not found if the provider doesn't exist in db", func(t *testing.T) {
+		setup()
+
+		providers := []string{"github", "google", "okta"}
+		invalidProvider := "azuread"
+		template := models.SSOSettings{
+			Settings: map[string]any{
+				"enabled": true,
+			},
+		}
+		err := populateSSOSettings(sqlStore, template, providers...)
+		require.NoError(t, err)
+
+		err = ssoSettingsStore.Delete(context.Background(), invalidProvider)
+		require.Error(t, err)
+		require.ErrorIs(t, err, ssosettings.ErrNotFound)
+
+		deleted, notDeleted, err := getSSOSettingsCountByDeleted(sqlStore)
+		require.NoError(t, err)
+		require.EqualValues(t, 0, deleted)
+		require.EqualValues(t, len(providers), notDeleted)
+	})
+
+	t.Run("return not found if the provider sso settings are already deleted", func(t *testing.T) {
+		setup()
+
+		providers := []string{"azuread", "github", "google"}
+		template := models.SSOSettings{
+			Settings: map[string]any{
+				"enabled": true,
+			},
+			IsDeleted: true,
+		}
+		err := populateSSOSettings(sqlStore, template, providers...)
+		require.NoError(t, err)
+
+		err = ssoSettingsStore.Delete(context.Background(), providers[0])
+		require.Error(t, err)
+		require.ErrorIs(t, err, ssosettings.ErrNotFound)
+
+		deleted, notDeleted, err := getSSOSettingsCountByDeleted(sqlStore)
+		require.NoError(t, err)
+		require.EqualValues(t, len(providers), deleted)
+		require.EqualValues(t, 0, notDeleted)
+	})
+
+	t.Run("delete one record if more valid sso settings are available for a provider", func(t *testing.T) {
+		setup()
+
+		provider := "azuread"
+		template := models.SSOSettings{
+			Settings: map[string]any{
+				"enabled": true,
+			},
+		}
+		// insert sso for the same provider 2 times in the database
+		err := populateSSOSettings(sqlStore, template, provider)
+		require.NoError(t, err)
+		err = populateSSOSettings(sqlStore, template, provider)
+		require.NoError(t, err)
+
+		err = ssoSettingsStore.Delete(context.Background(), provider)
+		require.NoError(t, err)
+
+		deleted, notDeleted, err := getSSOSettingsCountByDeleted(sqlStore)
+		require.NoError(t, err)
+		require.EqualValues(t, 1, deleted)
+		require.EqualValues(t, 1, notDeleted)
+	})
+
+	t.Run("return not found if the provider is empty", func(t *testing.T) {
+		setup()
+
+		providers := []string{"github", "google", "okta"}
+		template := models.SSOSettings{
+			Settings: map[string]any{
+				"enabled": true,
+			},
+		}
+		err := populateSSOSettings(sqlStore, template, providers...)
+		require.NoError(t, err)
+
+		err = ssoSettingsStore.Delete(context.Background(), "")
+		require.Error(t, err)
+		require.ErrorIs(t, err, ssosettings.ErrNotFound)
+
+		deleted, notDeleted, err := getSSOSettingsCountByDeleted(sqlStore)
+		require.NoError(t, err)
+		require.EqualValues(t, 0, deleted)
+		require.EqualValues(t, len(providers), notDeleted)
+	})
+}
+
+func populateSSOSettings(sqlStore *sqlstore.SQLStore, template models.SSOSettings, providers ...string) error {
+	return sqlStore.WithDbSession(context.Background(), func(sess *db.Session) error {
+		for _, provider := range providers {
+			settings := models.SSOSettings{
+				ID:        uuid.New().String(),
+				Provider:  provider,
+				Settings:  template.Settings,
+				Created:   time.Now().UTC(),
+				IsDeleted: template.IsDeleted,
+			}
+
+			_, err := sess.Insert(settings)
+			if err != nil {
+				return err
+			}
+		}
+		return nil
+	})
+}
+
+func getSSOSettingsCountByDeleted(sqlStore *sqlstore.SQLStore) (deleted, notDeleted int64, err error) {
+	err = sqlStore.WithDbSession(context.Background(), func(sess *db.Session) error {
+		deleted, err = sess.Table("sso_setting").Where("is_deleted = ?", sqlStore.GetDialect().BooleanStr(true)).Count()
+		if err != nil {
+			return err
+		}
+		notDeleted, err = sess.Table("sso_setting").Where("is_deleted = ?", sqlStore.GetDialect().BooleanStr(false)).Count()
+		return err
+	})
+
+	return
+}
+
+func getSSOSettingsByProvider(sqlStore *sqlstore.SQLStore, provider string, deleted bool) (*models.SSOSettings, error) {
+	var model models.SSOSettings
+	var err error
+
+	err = sqlStore.WithDbSession(context.Background(), func(sess *db.Session) error {
+		_, err = sess.Table("sso_setting").Where("provider = ? AND is_deleted = ?", provider, sqlStore.GetDialect().BooleanStr(deleted)).Get(&model)
+		return err
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &model, err
+}
diff --git a/pkg/services/ssosettings/errors.go b/pkg/services/ssosettings/errors.go
new file mode 100644
index 0000000000000..9e1169d1a1716
--- /dev/null
+++ b/pkg/services/ssosettings/errors.go
@@ -0,0 +1,24 @@
+package ssosettings
+
+import (
+	"github.com/grafana/grafana/pkg/util/errutil"
+)
+
+var (
+	errNotFoundBase = errutil.NotFound("sso.notFound", errutil.WithPublicMessage("The provider was not found."))
+	ErrNotFound     = errNotFoundBase.Errorf("not found")
+
+	ErrNotConfigurable = errNotFoundBase.Errorf("not configurable")
+
+	ErrBaseInvalidOAuthConfig = errutil.ValidationFailed("sso.invalidOauthConfig")
+
+	ErrInvalidOAuthConfig = func(msg string) error {
+		base := ErrBaseInvalidOAuthConfig.Errorf("OAuth settings are invalid")
+		base.PublicMessage = msg
+		return base
+	}
+
+	ErrInvalidProvider = errutil.ValidationFailed("sso.invalidProvider", errutil.WithPublicMessage("Provider is invalid"))
+	ErrInvalidSettings = errutil.ValidationFailed("sso.settings", errutil.WithPublicMessage("Settings field is invalid"))
+	ErrEmptyClientId   = errutil.ValidationFailed("sso.emptyClientId", errutil.WithPublicMessage("ClientId cannot be empty"))
+)
diff --git a/pkg/services/ssosettings/models/models.go b/pkg/services/ssosettings/models/models.go
new file mode 100644
index 0000000000000..3dd364de52a7a
--- /dev/null
+++ b/pkg/services/ssosettings/models/models.go
@@ -0,0 +1,99 @@
+package models
+
+import (
+	"encoding/json"
+	"fmt"
+	"time"
+
+	"github.com/grafana/grafana/pkg/services/featuremgmt/strcase"
+)
+
+type SettingsSource int
+
+const (
+	DB = iota
+	System
+)
+
+func (s SettingsSource) MarshalJSON() ([]byte, error) {
+	switch s {
+	case DB:
+		return json.Marshal("database")
+	case System:
+		return json.Marshal("system")
+	default:
+		return nil, fmt.Errorf("unknown source: %d", s)
+	}
+}
+
+func (s *SettingsSource) UnmarshalJSON(data []byte) error {
+	var source string
+	if err := json.Unmarshal(data, &source); err != nil {
+		return err
+	}
+
+	switch source {
+	case "database":
+		*s = DB
+	case "system":
+		*s = System
+	default:
+		return fmt.Errorf("unknown source: %s", source)
+	}
+	return nil
+}
+
+type SSOSettings struct {
+	ID        string         `xorm:"id pk" json:"id"`
+	Provider  string         `xorm:"provider" json:"provider"`
+	Settings  map[string]any `xorm:"settings" json:"settings"`
+	Created   time.Time      `xorm:"created" json:"-"`
+	Updated   time.Time      `xorm:"updated" json:"-"`
+	IsDeleted bool           `xorm:"is_deleted" json:"-"`
+	Source    SettingsSource `xorm:"-" json:"source"`
+}
+
+// TableName returns the table name (needed for Xorm)
+func (s SSOSettings) TableName() string {
+	return "sso_setting"
+}
+
+// MarshalJSON implements the json.Marshaler interface and converts the s.Settings from map[string]any in snake_case to map[string]any in camelCase
+func (s SSOSettings) MarshalJSON() ([]byte, error) {
+	type Alias SSOSettings
+	aux := &struct {
+		*Alias
+	}{
+		Alias: (*Alias)(&s),
+	}
+
+	settings := make(map[string]any)
+	for k, v := range aux.Settings {
+		settings[strcase.ToLowerCamel(k)] = v
+	}
+
+	aux.Settings = settings
+	return json.Marshal(aux)
+}
+
+// UnmarshalJSON implements the json.Unmarshaler interface and converts the settings from map[string]any camelCase to map[string]interface{} snake_case
+func (s *SSOSettings) UnmarshalJSON(data []byte) error {
+	type Alias SSOSettings
+	aux := &struct {
+		*Alias
+	}{
+		Alias: (*Alias)(s),
+	}
+
+	if err := json.Unmarshal(data, &aux); err != nil {
+		return err
+	}
+
+	settings := make(map[string]any)
+	for k, v := range aux.Settings {
+		settings[strcase.ToSnake(k)] = v
+	}
+
+	s.Settings = settings
+	return nil
+}
diff --git a/pkg/services/ssosettings/ssosettings.go b/pkg/services/ssosettings/ssosettings.go
new file mode 100644
index 0000000000000..56e79e58bfe04
--- /dev/null
+++ b/pkg/services/ssosettings/ssosettings.go
@@ -0,0 +1,66 @@
+package ssosettings
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/ssosettings/models"
+)
+
+var (
+	AllOAuthProviders = []string{social.GitHubProviderName, social.GitlabProviderName, social.GoogleProviderName, social.GenericOAuthProviderName, social.GrafanaComProviderName, social.AzureADProviderName, social.OktaProviderName}
+)
+
+// Service is a SSO settings service
+//
+//go:generate mockery --name Service --structname MockService --outpkg ssosettingstests --filename service_mock.go --output ./ssosettingstests/
+type Service interface {
+	// List returns all SSO settings from DB and config files
+	List(ctx context.Context) ([]*models.SSOSettings, error)
+	// ListWithRedactedSecrets returns all SSO settings from DB and config files with secret values redacted
+	ListWithRedactedSecrets(ctx context.Context) ([]*models.SSOSettings, error)
+	// GetForProvider returns the SSO settings for a given provider (DB or config file)
+	GetForProvider(ctx context.Context, provider string) (*models.SSOSettings, error)
+	// GetForProviderWithRedactedSecrets returns the SSO settings for a given provider (DB or config file) with secret values redacted
+	GetForProviderWithRedactedSecrets(ctx context.Context, provider string) (*models.SSOSettings, error)
+	// Upsert creates or updates the SSO settings for a given provider
+	Upsert(ctx context.Context, settings *models.SSOSettings, requester identity.Requester) error
+	// Delete deletes the SSO settings for a given provider (soft delete)
+	Delete(ctx context.Context, provider string) error
+	// Patch updates the specified SSO settings (key-value pairs) for a given provider
+	Patch(ctx context.Context, provider string, data map[string]any) error
+	// RegisterReloadable registers a reloadable for a given provider
+	RegisterReloadable(provider string, reloadable Reloadable)
+	// Reload reloads the settings for a given provider
+	Reload(ctx context.Context, provider string)
+}
+
+// Reloadable is an interface that can be implemented by a provider to allow it to be validated and reloaded
+//
+//go:generate mockery --name Reloadable --structname MockReloadable --outpkg ssosettingstests --filename reloadable_mock.go --output ./ssosettingstests/
+type Reloadable interface {
+	Reload(ctx context.Context, settings models.SSOSettings) error
+	Validate(ctx context.Context, settings models.SSOSettings, requester identity.Requester) error
+}
+
+// FallbackStrategy is an interface that can be implemented to allow a provider to load settings from a different source
+// than the database. This is useful for providers that are not configured in the database, but instead are configured
+// using the config file and/or environment variables. Used mostly for backwards compatibility.
+type FallbackStrategy interface {
+	IsMatch(provider string) bool
+	// TODO: check if GetProviderConfig can return an error
+	GetProviderConfig(ctx context.Context, provider string) (map[string]any, error)
+}
+
+// Store is a SSO settings store
+//
+//go:generate mockery --name Store --structname MockStore --outpkg ssosettingstests --filename store_mock.go --output ./ssosettingstests/
+type Store interface {
+	Get(ctx context.Context, provider string) (*models.SSOSettings, error)
+	List(ctx context.Context) ([]*models.SSOSettings, error)
+	Upsert(ctx context.Context, settings *models.SSOSettings) error
+	Delete(ctx context.Context, provider string) error
+}
+
+type ValidateFunc[T any] func(input *T, requester identity.Requester) error
diff --git a/pkg/services/ssosettings/ssosettingsimpl/metrics.go b/pkg/services/ssosettings/ssosettingsimpl/metrics.go
new file mode 100644
index 0000000000000..229abf9d431f5
--- /dev/null
+++ b/pkg/services/ssosettings/ssosettingsimpl/metrics.go
@@ -0,0 +1,31 @@
+package ssosettingsimpl
+
+import "github.com/prometheus/client_golang/prometheus"
+
+const (
+	metricsNamespace = "grafana"
+	metricsSubSystem = "ssosettings"
+)
+
+type metrics struct {
+	reloadFailures *prometheus.CounterVec
+}
+
+func newMetrics(reg prometheus.Registerer) *metrics {
+	m := &metrics{
+		reloadFailures: prometheus.NewCounterVec(prometheus.CounterOpts{
+			Namespace: metricsNamespace,
+			Subsystem: metricsSubSystem,
+			Name:      "setting_reload_failures_total",
+			Help:      "Number of SSO Setting reload failures.",
+		}, []string{"provider"}),
+	}
+
+	if reg != nil {
+		reg.MustRegister(
+			m.reloadFailures,
+		)
+	}
+
+	return m
+}
diff --git a/pkg/services/ssosettings/ssosettingsimpl/service.go b/pkg/services/ssosettings/ssosettingsimpl/service.go
new file mode 100644
index 0000000000000..e950fe8bd2b2a
--- /dev/null
+++ b/pkg/services/ssosettings/ssosettingsimpl/service.go
@@ -0,0 +1,526 @@
+package ssosettingsimpl
+
+import (
+	"context"
+	"encoding/base64"
+	"errors"
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/grafana/grafana/pkg/api/routing"
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/usagestats"
+	"github.com/grafana/grafana/pkg/login/social"
+	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/licensing"
+	"github.com/grafana/grafana/pkg/services/secrets"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	"github.com/grafana/grafana/pkg/services/ssosettings/api"
+	"github.com/grafana/grafana/pkg/services/ssosettings/database"
+	"github.com/grafana/grafana/pkg/services/ssosettings/models"
+	"github.com/grafana/grafana/pkg/services/ssosettings/strategies"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+var _ ssosettings.Service = (*Service)(nil)
+
+type Service struct {
+	logger  log.Logger
+	cfg     *setting.Cfg
+	store   ssosettings.Store
+	ac      ac.AccessControl
+	secrets secrets.Service
+	metrics *metrics
+
+	fbStrategies  []ssosettings.FallbackStrategy
+	providersList []string
+	reloadables   map[string]ssosettings.Reloadable
+}
+
+func ProvideService(cfg *setting.Cfg, sqlStore db.DB, ac ac.AccessControl,
+	routeRegister routing.RouteRegister, features featuremgmt.FeatureToggles,
+	secrets secrets.Service, usageStats usagestats.Service, registerer prometheus.Registerer,
+	settingsProvider setting.Provider, licensing licensing.Licensing) *Service {
+	fbStrategies := []ssosettings.FallbackStrategy{
+		strategies.NewOAuthStrategy(cfg),
+	}
+
+	providersList := ssosettings.AllOAuthProviders
+	if licensing.FeatureEnabled(social.SAMLProviderName) {
+		fbStrategies = append(fbStrategies, strategies.NewSAMLStrategy(settingsProvider))
+
+		if cfg.SSOSettingsConfigurableProviders[social.SAMLProviderName] {
+			providersList = append(providersList, social.SAMLProviderName)
+		}
+	}
+
+	store := database.ProvideStore(sqlStore)
+
+	svc := &Service{
+		logger:        log.New("ssosettings.service"),
+		cfg:           cfg,
+		store:         store,
+		ac:            ac,
+		fbStrategies:  fbStrategies,
+		secrets:       secrets,
+		metrics:       newMetrics(registerer),
+		providersList: providersList,
+		reloadables:   make(map[string]ssosettings.Reloadable),
+	}
+
+	usageStats.RegisterMetricsFunc(svc.getUsageStats)
+
+	if features.IsEnabledGlobally(featuremgmt.FlagSsoSettingsApi) {
+		ssoSettingsApi := api.ProvideApi(svc, routeRegister, ac)
+		ssoSettingsApi.RegisterAPIEndpoints()
+	}
+
+	return svc
+}
+
+var _ ssosettings.Service = (*Service)(nil)
+
+func (s *Service) GetForProvider(ctx context.Context, provider string) (*models.SSOSettings, error) {
+	dbSettings, err := s.store.Get(ctx, provider)
+	if err != nil && !errors.Is(err, ssosettings.ErrNotFound) {
+		return nil, err
+	}
+
+	if dbSettings != nil {
+		// Settings are coming from the database thus secrets are encrypted
+		dbSettings.Settings, err = s.decryptSecrets(ctx, dbSettings.Settings)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	systemSettings, err := s.loadSettingsUsingFallbackStrategy(ctx, provider)
+	if err != nil {
+		return nil, err
+	}
+
+	return s.mergeSSOSettings(dbSettings, systemSettings), nil
+}
+
+func (s *Service) GetForProviderWithRedactedSecrets(ctx context.Context, provider string) (*models.SSOSettings, error) {
+	if !s.isProviderConfigurable(provider) {
+		return nil, ssosettings.ErrNotConfigurable
+	}
+
+	storeSettings, err := s.GetForProvider(ctx, provider)
+	if err != nil {
+		return nil, err
+	}
+
+	for k, v := range storeSettings.Settings {
+		if strVal, ok := v.(string); ok {
+			storeSettings.Settings[k] = setting.RedactedValue(k, strVal)
+		}
+	}
+
+	return storeSettings, nil
+}
+
+func (s *Service) List(ctx context.Context) ([]*models.SSOSettings, error) {
+	result := make([]*models.SSOSettings, 0, len(s.providersList))
+	storedSettings, err := s.store.List(ctx)
+
+	if err != nil {
+		return nil, err
+	}
+
+	for _, provider := range s.providersList {
+		dbSettings := getSettingByProvider(provider, storedSettings)
+		if dbSettings != nil {
+			// Settings are coming from the database thus secrets are encrypted
+			dbSettings.Settings, err = s.decryptSecrets(ctx, dbSettings.Settings)
+			if err != nil {
+				return nil, err
+			}
+		}
+		fallbackSettings, err := s.loadSettingsUsingFallbackStrategy(ctx, provider)
+		if err != nil {
+			return nil, err
+		}
+
+		result = append(result, s.mergeSSOSettings(dbSettings, fallbackSettings))
+	}
+
+	return result, nil
+}
+
+func (s *Service) ListWithRedactedSecrets(ctx context.Context) ([]*models.SSOSettings, error) {
+	storeSettings, err := s.List(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	configurableSettings := make([]*models.SSOSettings, 0, len(s.cfg.SSOSettingsConfigurableProviders))
+	for _, provider := range storeSettings {
+		if s.isProviderConfigurable(provider.Provider) {
+			configurableSettings = append(configurableSettings, provider)
+		}
+	}
+
+	for _, storeSetting := range configurableSettings {
+		for k, v := range storeSetting.Settings {
+			if strVal, ok := v.(string); ok {
+				storeSetting.Settings[k] = setting.RedactedValue(k, strVal)
+			}
+		}
+	}
+
+	return configurableSettings, nil
+}
+
+func (s *Service) Upsert(ctx context.Context, settings *models.SSOSettings, requester identity.Requester) error {
+	if !s.isProviderConfigurable(settings.Provider) {
+		return ssosettings.ErrNotConfigurable
+	}
+
+	social, ok := s.reloadables[settings.Provider]
+	if !ok {
+		return ssosettings.ErrInvalidProvider.Errorf("provider %s not found in reloadables", settings.Provider)
+	}
+
+	err := social.Validate(ctx, *settings, requester)
+	if err != nil {
+		return err
+	}
+
+	storedSettings, err := s.GetForProvider(ctx, settings.Provider)
+	if err != nil {
+		return err
+	}
+
+	secrets := collectSecrets(settings, storedSettings)
+
+	settings.Settings, err = s.encryptSecrets(ctx, settings.Settings, storedSettings.Settings)
+	if err != nil {
+		return err
+	}
+
+	err = s.store.Upsert(ctx, settings)
+	if err != nil {
+		return err
+	}
+
+	// make a copy of current settings for reload operation and apply overrides
+	reloadSettings := *settings
+	reloadSettings.Settings = overrideMaps(storedSettings.Settings, settings.Settings, secrets)
+
+	go s.reload(social, settings.Provider, reloadSettings)
+
+	return nil
+}
+
+func (s *Service) Patch(ctx context.Context, provider string, data map[string]any) error {
+	panic("not implemented") // TODO: Implement
+}
+
+func (s *Service) Delete(ctx context.Context, provider string) error {
+	if !s.isProviderConfigurable(provider) {
+		return ssosettings.ErrNotConfigurable
+	}
+
+	social, ok := s.reloadables[provider]
+	if !ok {
+		return ssosettings.ErrInvalidProvider.Errorf("provider %s not found in reloadables", provider)
+	}
+
+	err := s.store.Delete(ctx, provider)
+	if err != nil {
+		return err
+	}
+
+	currentSettings, err := s.GetForProvider(ctx, provider)
+	if err != nil {
+		s.logger.Error("failed to get current settings, skipping reload", "provider", provider, "error", err)
+		return nil
+	}
+
+	go s.reload(social, provider, *currentSettings)
+
+	return nil
+}
+
+func (s *Service) reload(reloadable ssosettings.Reloadable, provider string, currentSettings models.SSOSettings) {
+	err := reloadable.Reload(context.Background(), currentSettings)
+	if err != nil {
+		s.metrics.reloadFailures.WithLabelValues(provider).Inc()
+		s.logger.Error("failed to reload the provider", "provider", provider, "error", err)
+	}
+}
+
+func (s *Service) Reload(ctx context.Context, provider string) {
+	panic("not implemented") // TODO: Implement
+}
+
+func (s *Service) RegisterReloadable(provider string, reloadable ssosettings.Reloadable) {
+	if s.reloadables == nil {
+		s.reloadables = make(map[string]ssosettings.Reloadable)
+	}
+	s.reloadables[provider] = reloadable
+}
+
+func (s *Service) RegisterFallbackStrategy(providerRegex string, strategy ssosettings.FallbackStrategy) {
+	s.fbStrategies = append(s.fbStrategies, strategy)
+}
+
+func (s *Service) loadSettingsUsingFallbackStrategy(ctx context.Context, provider string) (*models.SSOSettings, error) {
+	loadStrategy, ok := s.getFallbackStrategyFor(provider)
+	if !ok {
+		return nil, errors.New("no fallback strategy found for provider: " + provider)
+	}
+
+	settingsFromSystem, err := loadStrategy.GetProviderConfig(ctx, provider)
+	if err != nil {
+		return nil, err
+	}
+
+	return &models.SSOSettings{
+		Provider: provider,
+		Source:   models.System,
+		Settings: settingsFromSystem,
+	}, nil
+}
+
+func getSettingByProvider(provider string, settings []*models.SSOSettings) *models.SSOSettings {
+	for _, item := range settings {
+		if item.Provider == provider {
+			return item
+		}
+	}
+	return nil
+}
+
+func (s *Service) getFallbackStrategyFor(provider string) (ssosettings.FallbackStrategy, bool) {
+	for _, strategy := range s.fbStrategies {
+		if strategy.IsMatch(provider) {
+			return strategy, true
+		}
+	}
+	return nil, false
+}
+
+func (s *Service) encryptSecrets(ctx context.Context, settings, storedSettings map[string]any) (map[string]any, error) {
+	result := make(map[string]any)
+	for k, v := range settings {
+		if IsSecretField(k) && v != "" {
+			strValue, ok := v.(string)
+			if !ok {
+				return result, fmt.Errorf("failed to encrypt %s setting because it is not a string: %v", k, v)
+			}
+
+			if !isNewSecretValue(strValue) {
+				strValue = storedSettings[k].(string)
+			}
+
+			encryptedSecret, err := s.secrets.Encrypt(ctx, []byte(strValue), secrets.WithoutScope())
+			if err != nil {
+				return result, err
+			}
+			result[k] = base64.RawStdEncoding.EncodeToString(encryptedSecret)
+		} else {
+			result[k] = v
+		}
+	}
+
+	return result, nil
+}
+
+func (s *Service) Run(ctx context.Context) error {
+	interval := s.cfg.SSOSettingsReloadInterval
+	if interval == 0 {
+		return nil
+	}
+
+	ticker := time.NewTicker(interval)
+
+	// start a background process for reloading the SSO settings for all providers at a fixed interval
+	// it is useful for high availability setups running multiple Grafana instances
+	for {
+		select {
+		case <-ticker.C:
+			s.doReload(ctx)
+
+		case <-ctx.Done():
+			return ctx.Err()
+		}
+	}
+}
+
+func (s *Service) doReload(ctx context.Context) {
+	s.logger.Debug("reloading SSO Settings for all providers")
+
+	settingsList, err := s.List(ctx)
+	if err != nil {
+		s.logger.Error("failed to fetch SSO Settings for all providers", "err", err)
+		return
+	}
+
+	for provider, connector := range s.reloadables {
+		settings := getSettingByProvider(provider, settingsList)
+
+		if settings == nil || len(settings.Settings) == 0 {
+			s.logger.Warn("SSO Settings is empty", "provider", provider)
+			continue
+		}
+
+		err = connector.Reload(ctx, *settings)
+		if err != nil {
+			s.metrics.reloadFailures.WithLabelValues(provider).Inc()
+			s.logger.Error("failed to reload SSO Settings", "provider", provider, "err", err)
+			continue
+		}
+	}
+}
+
+// mergeSSOSettings merges the settings from the database with the system settings
+// Required because it is possible that the user has configured some of the settings (current Advanced OAuth settings)
+// and the rest of the settings have to be loaded from the system settings
+func (s *Service) mergeSSOSettings(dbSettings, systemSettings *models.SSOSettings) *models.SSOSettings {
+	if dbSettings == nil {
+		s.logger.Debug("No SSO Settings found in the database, using system settings")
+		return systemSettings
+	}
+
+	s.logger.Debug("Merging SSO Settings", "dbSettings", removeSecrets(dbSettings.Settings), "systemSettings", removeSecrets(systemSettings.Settings))
+
+	result := &models.SSOSettings{
+		Provider: dbSettings.Provider,
+		Source:   dbSettings.Source,
+		Settings: mergeSettings(dbSettings.Settings, systemSettings.Settings),
+		Created:  dbSettings.Created,
+		Updated:  dbSettings.Updated,
+	}
+
+	return result
+}
+
+func (s *Service) decryptSecrets(ctx context.Context, settings map[string]any) (map[string]any, error) {
+	for k, v := range settings {
+		if IsSecretField(k) && v != "" {
+			strValue, ok := v.(string)
+			if !ok {
+				s.logger.Error("Failed to parse secret value, it is not a string", "key", k)
+				return nil, fmt.Errorf("secret value is not a string")
+			}
+
+			decoded, err := base64.RawStdEncoding.DecodeString(strValue)
+			if err != nil {
+				s.logger.Error("Failed to decode secret string", "err", err, "value")
+				return nil, err
+			}
+
+			decrypted, err := s.secrets.Decrypt(ctx, decoded)
+			if err != nil {
+				s.logger.Error("Failed to decrypt secret", "err", err)
+				return nil, err
+			}
+
+			settings[k] = string(decrypted)
+		}
+	}
+	return settings, nil
+}
+
+func (s *Service) isProviderConfigurable(provider string) bool {
+	_, ok := s.cfg.SSOSettingsConfigurableProviders[provider]
+	return ok
+}
+
+// removeSecrets removes all the secrets from the map and replaces them with a redacted password
+// and returns a new map
+func removeSecrets(settings map[string]any) map[string]any {
+	result := make(map[string]any)
+	for k, v := range settings {
+		if IsSecretField(k) {
+			result[k] = setting.RedactedPassword
+			continue
+		}
+		result[k] = v
+	}
+	return result
+}
+
+// mergeSettings merges two maps in a way that the values from the first map are preserved
+// and the values from the second map are added only if they don't exist in the first map
+// or if they contain empty URLs.
+func mergeSettings(storedSettings, systemSettings map[string]any) map[string]any {
+	settings := make(map[string]any)
+
+	for k, v := range storedSettings {
+		settings[k] = v
+	}
+
+	for k, v := range systemSettings {
+		if _, ok := settings[k]; !ok {
+			settings[k] = v
+		} else if isURL(k) && isEmptyString(settings[k]) {
+			// Overwrite all URL settings from the DB containing an empty string with their value
+			// from the system settings. This fixes an issue with empty auth_url, api_url and token_url
+			// from the DB not being replaced with their values defined in the system settings for
+			// the Google provider.
+			settings[k] = v
+		}
+	}
+
+	return settings
+}
+
+// collectSecrets collects all the secrets from the request and the currently stored settings
+// and returns a new map
+func collectSecrets(settings *models.SSOSettings, storedSettings *models.SSOSettings) map[string]any {
+	secrets := map[string]any{}
+	for k, v := range settings.Settings {
+		if IsSecretField(k) {
+			if isNewSecretValue(v.(string)) {
+				secrets[k] = v.(string) // use the new value
+				continue
+			}
+			secrets[k] = storedSettings.Settings[k] // keep the currently stored value
+		}
+	}
+	return secrets
+}
+
+func overrideMaps(maps ...map[string]any) map[string]any {
+	result := make(map[string]any)
+	for _, m := range maps {
+		for k, v := range m {
+			result[k] = v
+		}
+	}
+	return result
+}
+
+// IsSecretField returns true if the SSO settings field provided is a secret
+func IsSecretField(fieldName string) bool {
+	secretFieldPatterns := []string{"secret"}
+
+	for _, v := range secretFieldPatterns {
+		if strings.Contains(strings.ToLower(fieldName), strings.ToLower(v)) {
+			return true
+		}
+	}
+	return false
+}
+
+func isURL(fieldName string) bool {
+	return strings.HasSuffix(fieldName, "_url")
+}
+
+func isEmptyString(val any) bool {
+	_, ok := val.(string)
+	return ok && val == ""
+}
+
+func isNewSecretValue(value string) bool {
+	return value != setting.RedactedPassword
+}
diff --git a/pkg/services/ssosettings/ssosettingsimpl/service_test.go b/pkg/services/ssosettings/ssosettingsimpl/service_test.go
new file mode 100644
index 0000000000000..6bd7206c71948
--- /dev/null
+++ b/pkg/services/ssosettings/ssosettingsimpl/service_test.go
@@ -0,0 +1,1542 @@
+package ssosettingsimpl
+
+import (
+	"context"
+	"encoding/base64"
+	"errors"
+	"fmt"
+	"maps"
+	"sync"
+	"testing"
+	"time"
+
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+	"gopkg.in/ini.v1"
+
+	"github.com/grafana/grafana/pkg/api/routing"
+	"github.com/grafana/grafana/pkg/infra/db/dbtest"
+	"github.com/grafana/grafana/pkg/infra/usagestats"
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/licensing/licensingtest"
+	secretsFakes "github.com/grafana/grafana/pkg/services/secrets/fakes"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	"github.com/grafana/grafana/pkg/services/ssosettings/models"
+	"github.com/grafana/grafana/pkg/services/ssosettings/ssosettingstests"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
+)
+
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
+func TestService_GetForProvider(t *testing.T) {
+	t.Parallel()
+
+	testCases := []struct {
+		name    string
+		setup   func(env testEnv)
+		want    *models.SSOSettings
+		wantErr bool
+	}{
+		{
+			name: "should return successfully",
+			setup: func(env testEnv) {
+				env.store.ExpectedSSOSetting = &models.SSOSettings{
+					Provider: "github",
+					Settings: map[string]any{"enabled": true},
+					Source:   models.DB,
+				}
+				env.fallbackStrategy.ExpectedIsMatch = true
+				env.fallbackStrategy.ExpectedConfigs = map[string]map[string]any{
+					"github": {
+						"client_id":     "client_id",
+						"client_secret": "secret",
+					},
+				}
+			},
+			want: &models.SSOSettings{
+				Provider: "github",
+				Settings: map[string]any{
+					"enabled":       true,
+					"client_id":     "client_id",
+					"client_secret": "secret",
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name:    "should return error if store returns an error different than not found",
+			setup:   func(env testEnv) { env.store.ExpectedError = fmt.Errorf("error") },
+			want:    nil,
+			wantErr: true,
+		},
+		{
+			name: "should fallback to the system settings if store returns not found",
+			setup: func(env testEnv) {
+				env.store.ExpectedError = ssosettings.ErrNotFound
+				env.fallbackStrategy.ExpectedIsMatch = true
+				env.fallbackStrategy.ExpectedConfigs = map[string]map[string]any{
+					"github": {
+						"enabled":   true,
+						"client_id": "client_id",
+					},
+				}
+			},
+			want: &models.SSOSettings{
+				Provider: "github",
+				Settings: map[string]any{
+					"enabled":   true,
+					"client_id": "client_id"},
+				Source: models.System,
+			},
+			wantErr: false,
+		},
+		{
+			name: "should return error if the fallback strategy was not found",
+			setup: func(env testEnv) {
+				env.store.ExpectedError = ssosettings.ErrNotFound
+				env.fallbackStrategy.ExpectedIsMatch = false
+			},
+			want:    nil,
+			wantErr: true,
+		},
+		{
+			name: "should return error if fallback strategy returns error",
+			setup: func(env testEnv) {
+				env.store.ExpectedError = ssosettings.ErrNotFound
+				env.fallbackStrategy.ExpectedIsMatch = true
+				env.fallbackStrategy.ExpectedError = fmt.Errorf("error")
+			},
+			want:    nil,
+			wantErr: true,
+		},
+		{
+			name: "should decrypt secrets if data is coming from store",
+			setup: func(env testEnv) {
+				env.store.ExpectedSSOSetting = &models.SSOSettings{
+					Provider: "github",
+					Settings: map[string]any{
+						"enabled":       true,
+						"client_secret": base64.RawStdEncoding.EncodeToString([]byte("client_secret")),
+						"other_secret":  base64.RawStdEncoding.EncodeToString([]byte("other_secret")),
+					},
+					Source: models.DB,
+				}
+				env.fallbackStrategy.ExpectedIsMatch = true
+				env.fallbackStrategy.ExpectedConfigs = map[string]map[string]any{
+					"github": {
+						"client_id": "client_id",
+					},
+				}
+
+				env.secrets.On("Decrypt", mock.Anything, []byte("client_secret"), mock.Anything).Return([]byte("decrypted-client-secret"), nil).Once()
+				env.secrets.On("Decrypt", mock.Anything, []byte("other_secret"), mock.Anything).Return([]byte("decrypted-other-secret"), nil).Once()
+			},
+			want: &models.SSOSettings{
+				Provider: "github",
+				Settings: map[string]any{
+					"enabled":       true,
+					"client_id":     "client_id",
+					"client_secret": "decrypted-client-secret",
+					"other_secret":  "decrypted-other-secret",
+				},
+				Source: models.DB,
+			},
+			wantErr: false,
+		},
+		{
+			name: "should not decrypt secrets if data is coming from the fallback strategy",
+			setup: func(env testEnv) {
+				env.store.ExpectedError = ssosettings.ErrNotFound
+				env.fallbackStrategy.ExpectedIsMatch = true
+				env.fallbackStrategy.ExpectedConfigs = map[string]map[string]any{
+					"github": {
+						"enabled":       true,
+						"client_id":     "client_id",
+						"client_secret": "client_secret",
+					},
+				}
+			},
+			want: &models.SSOSettings{
+				Provider: "github",
+				Settings: map[string]any{
+					"enabled":       true,
+					"client_id":     "client_id",
+					"client_secret": "client_secret",
+				},
+				Source: models.System,
+			},
+			wantErr: false,
+		},
+		{
+			name: "should return an error if the data in the store is invalid",
+			setup: func(env testEnv) {
+				env.store.ExpectedSSOSetting = &models.SSOSettings{
+					Provider: "github",
+					Settings: map[string]any{
+						"enabled":       true,
+						"client_secret": "not a valid base64 string",
+					},
+					Source: models.DB,
+				}
+				env.fallbackStrategy.ExpectedIsMatch = true
+				env.fallbackStrategy.ExpectedConfigs = map[string]map[string]any{
+					"github": {
+						"client_id": "client_id",
+					},
+				}
+			},
+			wantErr: true,
+		},
+		{
+			name: "correctly merge the DB and system settings",
+			setup: func(env testEnv) {
+				env.store.ExpectedSSOSetting = &models.SSOSettings{
+					Provider: "github",
+					Settings: map[string]any{
+						"enabled":  true,
+						"auth_url": "",
+						"api_url":  "https://overwritten-api.com/user",
+						"team_ids": "",
+					},
+					Source: models.DB,
+				}
+				env.fallbackStrategy.ExpectedIsMatch = true
+				env.fallbackStrategy.ExpectedConfigs = map[string]map[string]any{
+					"github": {
+						"auth_url":  "https://github.com/login/oauth/authorize",
+						"token_url": "https://github.com/login/oauth/access_token",
+						"api_url":   "https://api.github.com/user",
+						"team_ids":  "10,11,12",
+					},
+				}
+			},
+			want: &models.SSOSettings{
+				Provider: "github",
+				Settings: map[string]any{
+					"enabled":   true,
+					"auth_url":  "https://github.com/login/oauth/authorize",
+					"token_url": "https://github.com/login/oauth/access_token",
+					"api_url":   "https://overwritten-api.com/user",
+					"team_ids":  "",
+				},
+				Source: models.DB,
+			},
+			wantErr: false,
+		},
+	}
+
+	for _, tc := range testCases {
+		// create a local copy of "tc" to allow concurrent access within tests to the different items of testCases,
+		// otherwise it would be like a moving pointer while tests run in parallel
+		tc := tc
+
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+
+			env := setupTestEnv(t, false, false, nil)
+			if tc.setup != nil {
+				tc.setup(env)
+			}
+
+			actual, err := env.service.GetForProvider(context.Background(), "github")
+
+			if tc.wantErr {
+				require.Error(t, err)
+				return
+			}
+
+			require.NoError(t, err)
+			require.Equal(t, tc.want, actual)
+
+			env.secrets.AssertExpectations(t)
+		})
+	}
+}
+
+func TestService_GetForProviderWithRedactedSecrets(t *testing.T) {
+	t.Parallel()
+
+	testCases := []struct {
+		name    string
+		setup   func(env testEnv)
+		want    *models.SSOSettings
+		wantErr bool
+	}{
+		{
+			name: "should return successfully and redact secrets",
+			setup: func(env testEnv) {
+				env.store.ExpectedSSOSetting = &models.SSOSettings{
+					Provider: "github",
+					Settings: map[string]any{
+						"enabled":       true,
+						"secret":        base64.RawStdEncoding.EncodeToString([]byte("secret")),
+						"client_secret": base64.RawStdEncoding.EncodeToString([]byte("client_secret")),
+						"client_id":     "client_id",
+					},
+					Source: models.DB,
+				}
+				env.secrets.On("Decrypt", mock.Anything, []byte("client_secret"), mock.Anything).Return([]byte("decrypted-client-secret"), nil).Once()
+				env.secrets.On("Decrypt", mock.Anything, []byte("secret"), mock.Anything).Return([]byte("decrypted-secret"), nil).Once()
+			},
+			want: &models.SSOSettings{
+				Provider: "github",
+				Settings: map[string]any{
+					"enabled":       true,
+					"secret":        "*********",
+					"client_secret": "*********",
+					"client_id":     "client_id",
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name:    "should return error if store returns an error different than not found",
+			setup:   func(env testEnv) { env.store.ExpectedError = fmt.Errorf("error") },
+			want:    nil,
+			wantErr: true,
+		},
+		{
+			name: "should fallback to strategy if store returns not found",
+			setup: func(env testEnv) {
+				env.store.ExpectedError = ssosettings.ErrNotFound
+				env.fallbackStrategy.ExpectedIsMatch = true
+				env.fallbackStrategy.ExpectedConfigs = map[string]map[string]any{
+					"github": {
+						"enabled": true,
+					},
+				}
+			},
+			want: &models.SSOSettings{
+				Provider: "github",
+				Settings: map[string]any{"enabled": true},
+				Source:   models.System,
+			},
+			wantErr: false,
+		},
+		{
+			name: "should return error if the fallback strategy was not found",
+			setup: func(env testEnv) {
+				env.store.ExpectedError = ssosettings.ErrNotFound
+				env.fallbackStrategy.ExpectedIsMatch = false
+			},
+			want:    nil,
+			wantErr: true,
+		},
+		{
+			name: "should return error if fallback strategy returns error",
+			setup: func(env testEnv) {
+				env.store.ExpectedError = ssosettings.ErrNotFound
+				env.fallbackStrategy.ExpectedIsMatch = true
+				env.fallbackStrategy.ExpectedError = fmt.Errorf("error")
+			},
+			want:    nil,
+			wantErr: true,
+		},
+	}
+
+	for _, tc := range testCases {
+		// create a local copy of "tc" to allow concurrent access within tests to the different items of testCases,
+		// otherwise it would be like a moving pointer while tests run in parallel
+		tc := tc
+
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+
+			env := setupTestEnv(t, false, false, nil)
+			if tc.setup != nil {
+				tc.setup(env)
+			}
+
+			actual, err := env.service.GetForProviderWithRedactedSecrets(context.Background(), "github")
+
+			if tc.wantErr {
+				require.Error(t, err)
+				return
+			}
+
+			require.NoError(t, err)
+			require.Equal(t, tc.want, actual)
+		})
+	}
+}
+
+func TestService_List(t *testing.T) {
+	t.Parallel()
+
+	testCases := []struct {
+		name    string
+		setup   func(env testEnv)
+		want    []*models.SSOSettings
+		wantErr bool
+	}{
+		{
+			name: "should return all oauth providers successfully without saml",
+			setup: func(env testEnv) {
+				env.store.ExpectedSSOSettings = []*models.SSOSettings{
+					{
+						Provider: "github",
+						Settings: map[string]any{
+							"enabled":       true,
+							"client_secret": base64.RawStdEncoding.EncodeToString([]byte("client_secret")),
+						},
+						Source: models.DB,
+					},
+					{
+						Provider: "okta",
+						Settings: map[string]any{
+							"enabled":      false,
+							"other_secret": base64.RawStdEncoding.EncodeToString([]byte("other_secret")),
+						},
+						Source: models.DB,
+					},
+				}
+				env.secrets.On("Decrypt", mock.Anything, []byte("client_secret"), mock.Anything).Return([]byte("decrypted-client-secret"), nil).Once()
+				env.secrets.On("Decrypt", mock.Anything, []byte("other_secret"), mock.Anything).Return([]byte("decrypted-other-secret"), nil).Once()
+
+				env.fallbackStrategy.ExpectedIsMatch = true
+				env.fallbackStrategy.ExpectedConfigs = map[string]map[string]any{
+					"github": {
+						"enabled":       false,
+						"client_id":     "client_id",
+						"client_secret": "secret1",
+						"token_url":     "token_url",
+					},
+					"okta": {
+						"enabled":       false,
+						"client_id":     "client_id",
+						"client_secret": "coming-from-system",
+						"other_secret":  "secret2",
+						"token_url":     "token_url",
+					},
+					"gitlab": {
+						"enabled": false,
+					},
+					"generic_oauth": {
+						"enabled": false,
+					},
+					"google": {
+						"enabled": false,
+					},
+					"azuread": {
+						"enabled": false,
+					},
+					"grafana_com": {
+						"enabled": false,
+					},
+				}
+			},
+			want: []*models.SSOSettings{
+				{
+					Provider: "github",
+					Settings: map[string]any{
+						"enabled":       true,
+						"client_id":     "client_id",
+						"client_secret": "decrypted-client-secret", // client_secret is coming from the database, must be decrypted first
+						"token_url":     "token_url",
+					},
+					Source: models.DB,
+				},
+				{
+					Provider: "okta",
+					Settings: map[string]any{
+						"enabled":       false,
+						"client_id":     "client_id",
+						"client_secret": "coming-from-system", // client_secret is coming from the system, must not be decrypted
+						"other_secret":  "decrypted-other-secret",
+						"token_url":     "token_url",
+					},
+					Source: models.DB,
+				},
+				{
+					Provider: "gitlab",
+					Settings: map[string]any{"enabled": false},
+					Source:   models.System,
+				},
+				{
+					Provider: "generic_oauth",
+					Settings: map[string]any{"enabled": false},
+					Source:   models.System,
+				},
+				{
+					Provider: "google",
+					Settings: map[string]any{"enabled": false},
+					Source:   models.System,
+				},
+				{
+					Provider: "azuread",
+					Settings: map[string]any{"enabled": false},
+					Source:   models.System,
+				},
+				{
+					Provider: "grafana_com",
+					Settings: map[string]any{"enabled": false},
+					Source:   models.System,
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "should return error if any of the fallback strategies was not found",
+			setup: func(env testEnv) {
+				env.store.ExpectedSSOSettings = []*models.SSOSettings{}
+				env.fallbackStrategy.ExpectedIsMatch = false
+			},
+			want:    nil,
+			wantErr: true,
+		},
+	}
+	for _, tc := range testCases {
+		// create a local copy of "tc" to allow concurrent access within tests to the different items of testCases,
+		// otherwise it would be like a moving pointer while tests run in parallel
+		tc := tc
+
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+
+			env := setupTestEnv(t, false, false, nil)
+			if tc.setup != nil {
+				tc.setup(env)
+			}
+
+			actual, err := env.service.List(context.Background())
+
+			if tc.wantErr {
+				require.Error(t, err)
+				return
+			}
+
+			require.NoError(t, err)
+			require.ElementsMatch(t, tc.want, actual)
+		})
+	}
+}
+
+func TestService_ListWithRedactedSecrets(t *testing.T) {
+	t.Parallel()
+
+	testCases := []struct {
+		name    string
+		setup   func(env testEnv)
+		want    []*models.SSOSettings
+		wantErr bool
+	}{
+		{
+			name: "should return successfully",
+			setup: func(env testEnv) {
+				env.store.ExpectedSSOSettings = []*models.SSOSettings{
+					{
+						Provider: "github",
+						Settings: map[string]any{
+							"enabled":       true,
+							"client_secret": base64.RawStdEncoding.EncodeToString([]byte("client_secret")),
+							"client_id":     "client_id",
+						},
+						Source: models.DB,
+					},
+					{
+						Provider: "okta",
+						Settings: map[string]any{
+							"enabled":      false,
+							"other_secret": base64.RawStdEncoding.EncodeToString([]byte("other_secret")),
+							"client_id":    "client_id",
+						},
+						Source: models.DB,
+					},
+				}
+				env.secrets.On("Decrypt", mock.Anything, []byte("client_secret"), mock.Anything).Return([]byte("decrypted-client-secret"), nil).Once()
+				env.secrets.On("Decrypt", mock.Anything, []byte("other_secret"), mock.Anything).Return([]byte("decrypted-other-secret"), nil).Once()
+
+				env.fallbackStrategy.ExpectedIsMatch = true
+				env.fallbackStrategy.ExpectedConfigs = map[string]map[string]any{
+					"github": {
+						"enabled":       true,
+						"secret":        "secret",
+						"client_secret": "client_secret",
+						"client_id":     "client_id",
+					},
+					"okta": {
+						"enabled":       true,
+						"secret":        "secret",
+						"client_secret": "client_secret",
+						"client_id":     "client_id",
+					},
+					"gitlab": {
+						"enabled":       true,
+						"secret":        "secret",
+						"client_secret": "client_secret",
+						"client_id":     "client_id",
+					},
+					"generic_oauth": {
+						"enabled":       true,
+						"secret":        "secret",
+						"client_secret": "client_secret",
+						"client_id":     "client_id",
+					},
+					"google": {
+						"enabled":       true,
+						"secret":        "secret",
+						"client_secret": "client_secret",
+						"client_id":     "client_id",
+					},
+					"azuread": {
+						"enabled":       true,
+						"secret":        "secret",
+						"client_secret": "client_secret",
+						"client_id":     "client_id",
+					},
+					"grafana_com": {
+						"enabled":       true,
+						"secret":        "secret",
+						"client_secret": "client_secret",
+						"client_id":     "client_id",
+					},
+				}
+			},
+			want: []*models.SSOSettings{
+				{
+					Provider: "github",
+					Settings: map[string]any{
+						"enabled":       true,
+						"secret":        "*********",
+						"client_secret": "*********",
+						"client_id":     "client_id",
+					},
+					Source: models.DB,
+				},
+				{
+					Provider: "okta",
+					Settings: map[string]any{
+						"enabled":       false,
+						"secret":        "*********",
+						"client_secret": "*********",
+						"client_id":     "client_id",
+						"other_secret":  "*********",
+					},
+					Source: models.DB,
+				},
+				{
+					Provider: "gitlab",
+					Settings: map[string]any{
+						"enabled":       true,
+						"secret":        "*********",
+						"client_secret": "*********",
+						"client_id":     "client_id",
+					},
+					Source: models.System,
+				},
+				{
+					Provider: "generic_oauth",
+					Settings: map[string]any{
+						"enabled":       true,
+						"secret":        "*********",
+						"client_secret": "*********",
+						"client_id":     "client_id",
+					},
+					Source: models.System,
+				},
+				{
+					Provider: "google",
+					Settings: map[string]any{
+						"enabled":       true,
+						"secret":        "*********",
+						"client_secret": "*********",
+						"client_id":     "client_id",
+					},
+					Source: models.System,
+				},
+				{
+					Provider: "azuread",
+					Settings: map[string]any{
+						"enabled":       true,
+						"secret":        "*********",
+						"client_secret": "*********",
+						"client_id":     "client_id",
+					},
+					Source: models.System,
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name:    "should return error if store returns an error",
+			setup:   func(env testEnv) { env.store.ExpectedError = fmt.Errorf("error") },
+			want:    nil,
+			wantErr: true,
+		},
+		{
+			name: "should use the fallback strategy if store returns empty list",
+			setup: func(env testEnv) {
+				env.store.ExpectedSSOSettings = []*models.SSOSettings{}
+				env.fallbackStrategy.ExpectedIsMatch = true
+				env.fallbackStrategy.ExpectedConfigs = map[string]map[string]any{
+					"github": {
+						"enabled":       false,
+						"secret":        "secret",
+						"client_secret": "client_secret",
+						"client_id":     "client_id",
+					},
+					"okta": {
+						"enabled":       false,
+						"secret":        "secret",
+						"client_secret": "client_secret",
+						"client_id":     "client_id",
+					},
+					"gitlab": {
+						"enabled":       false,
+						"secret":        "secret",
+						"client_secret": "client_secret",
+						"client_id":     "client_id",
+					},
+					"generic_oauth": {
+						"enabled":       false,
+						"secret":        "secret",
+						"client_secret": "client_secret",
+						"client_id":     "client_id",
+					},
+					"google": {
+						"enabled":       false,
+						"secret":        "secret",
+						"client_secret": "client_secret",
+						"client_id":     "client_id",
+					},
+					"azuread": {
+						"enabled":       false,
+						"secret":        "secret",
+						"client_secret": "client_secret",
+						"client_id":     "client_id",
+					},
+					"grafana_com": {
+						"enabled":       false,
+						"secret":        "secret",
+						"client_secret": "client_secret",
+						"client_id":     "client_id",
+					},
+				}
+			},
+			want: []*models.SSOSettings{
+				{
+					Provider: "github",
+					Settings: map[string]any{
+						"enabled":       false,
+						"secret":        "*********",
+						"client_secret": "*********",
+						"client_id":     "client_id",
+					},
+					Source: models.System,
+				},
+				{
+					Provider: "okta",
+					Settings: map[string]any{
+						"enabled":       false,
+						"secret":        "*********",
+						"client_secret": "*********",
+						"client_id":     "client_id",
+					},
+					Source: models.System,
+				},
+				{
+					Provider: "gitlab",
+					Settings: map[string]any{
+						"enabled":       false,
+						"secret":        "*********",
+						"client_secret": "*********",
+						"client_id":     "client_id",
+					},
+					Source: models.System,
+				},
+				{
+					Provider: "generic_oauth",
+					Settings: map[string]any{
+						"enabled":       false,
+						"secret":        "*********",
+						"client_secret": "*********",
+						"client_id":     "client_id",
+					},
+					Source: models.System,
+				},
+				{
+					Provider: "google",
+					Settings: map[string]any{
+						"enabled":       false,
+						"secret":        "*********",
+						"client_secret": "*********",
+						"client_id":     "client_id",
+					},
+					Source: models.System,
+				},
+				{
+					Provider: "azuread",
+					Settings: map[string]any{
+						"enabled":       false,
+						"secret":        "*********",
+						"client_secret": "*********",
+						"client_id":     "client_id",
+					},
+					Source: models.System,
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "should return error if any of the fallback strategies was not found",
+			setup: func(env testEnv) {
+				env.store.ExpectedSSOSettings = []*models.SSOSettings{}
+				env.fallbackStrategy.ExpectedIsMatch = false
+			},
+			want:    nil,
+			wantErr: true,
+		},
+	}
+	for _, tc := range testCases {
+		// create a local copy of "tc" to allow concurrent access within tests to the different items of testCases,
+		// otherwise it would be like a moving pointer while tests run in parallel
+		tc := tc
+
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+
+			env := setupTestEnv(t, false, false, nil)
+			if tc.setup != nil {
+				tc.setup(env)
+			}
+
+			actual, err := env.service.ListWithRedactedSecrets(context.Background())
+
+			if tc.wantErr {
+				require.Error(t, err)
+				return
+			}
+
+			require.NoError(t, err)
+			require.ElementsMatch(t, tc.want, actual)
+		})
+	}
+}
+
+func TestService_Upsert(t *testing.T) {
+	t.Parallel()
+
+	t.Run("successfully upsert SSO settings", func(t *testing.T) {
+		t.Parallel()
+
+		env := setupTestEnv(t, false, false, nil)
+
+		provider := social.AzureADProviderName
+		settings := models.SSOSettings{
+			Provider: provider,
+			Settings: map[string]any{
+				"client_id":     "client-id",
+				"client_secret": "client-secret",
+				"enabled":       true,
+			},
+			IsDeleted: false,
+		}
+		var wg sync.WaitGroup
+		wg.Add(1)
+
+		reloadable := ssosettingstests.NewMockReloadable(t)
+		reloadable.On("Validate", mock.Anything, settings, mock.Anything).Return(nil)
+		reloadable.On("Reload", mock.Anything, mock.MatchedBy(func(settings models.SSOSettings) bool {
+			defer wg.Done()
+			return settings.Provider == provider &&
+				settings.ID == "someid" &&
+				maps.Equal(settings.Settings, map[string]any{
+					"client_id":     "client-id",
+					"client_secret": "client-secret",
+					"enabled":       true,
+				})
+		})).Return(nil).Once()
+		env.reloadables[provider] = reloadable
+		env.secrets.On("Encrypt", mock.Anything, []byte(settings.Settings["client_secret"].(string)), mock.Anything).Return([]byte("encrypted-client-secret"), nil).Once()
+		env.secrets.On("Decrypt", mock.Anything, []byte("encrypted-current-client-secret"), mock.Anything).Return([]byte("current-client-secret"), nil).Once()
+
+		env.store.UpsertFn = func(ctx context.Context, settings *models.SSOSettings) error {
+			currentTime := time.Now()
+			settings.ID = "someid"
+			settings.Created = currentTime
+			settings.Updated = currentTime
+
+			env.store.ActualSSOSettings = *settings
+			return nil
+		}
+
+		env.store.GetFn = func(ctx context.Context, provider string) (*models.SSOSettings, error) {
+			return &models.SSOSettings{
+				ID:       "someid",
+				Provider: provider,
+				Settings: map[string]any{
+					"client_secret": base64.RawStdEncoding.EncodeToString([]byte("encrypted-current-client-secret")),
+				},
+			}, nil
+		}
+		err := env.service.Upsert(context.Background(), &settings, &user.SignedInUser{})
+		require.NoError(t, err)
+
+		// Wait for the goroutine first to assert the Reload call
+		wg.Wait()
+
+		settings.Settings["client_secret"] = base64.RawStdEncoding.EncodeToString([]byte("encrypted-client-secret"))
+		require.EqualValues(t, settings, env.store.ActualSSOSettings)
+	})
+
+	t.Run("returns error if provider is not configurable", func(t *testing.T) {
+		t.Parallel()
+
+		env := setupTestEnv(t, false, false, nil)
+
+		provider := social.GrafanaComProviderName
+		settings := &models.SSOSettings{
+			Provider: provider,
+			Settings: map[string]any{
+				"client_id":     "client-id",
+				"client_secret": "client-secret",
+				"enabled":       true,
+			},
+			IsDeleted: false,
+		}
+
+		reloadable := ssosettingstests.NewMockReloadable(t)
+		env.reloadables[provider] = reloadable
+
+		err := env.service.Upsert(context.Background(), settings, &user.SignedInUser{})
+		require.Error(t, err)
+	})
+
+	t.Run("returns error if provider was not found in reloadables", func(t *testing.T) {
+		t.Parallel()
+
+		env := setupTestEnv(t, false, false, nil)
+
+		provider := social.AzureADProviderName
+		settings := &models.SSOSettings{
+			Provider: provider,
+			Settings: map[string]any{
+				"client_id":     "client-id",
+				"client_secret": "client-secret",
+				"enabled":       true,
+			},
+			IsDeleted: false,
+		}
+
+		reloadable := ssosettingstests.NewMockReloadable(t)
+		// the reloadable is available for other provider
+		env.reloadables["github"] = reloadable
+
+		err := env.service.Upsert(context.Background(), settings, &user.SignedInUser{})
+		require.Error(t, err)
+	})
+
+	t.Run("returns error if validation fails", func(t *testing.T) {
+		t.Parallel()
+
+		env := setupTestEnv(t, false, false, nil)
+
+		provider := social.AzureADProviderName
+		settings := models.SSOSettings{
+			Provider: provider,
+			Settings: map[string]any{
+				"client_id":     "client-id",
+				"client_secret": "client-secret",
+				"enabled":       true,
+			},
+			IsDeleted: false,
+		}
+
+		reloadable := ssosettingstests.NewMockReloadable(t)
+		reloadable.On("Validate", mock.Anything, settings, mock.Anything).Return(errors.New("validation failed"))
+		env.reloadables[provider] = reloadable
+
+		err := env.service.Upsert(context.Background(), &settings, &user.SignedInUser{})
+		require.Error(t, err)
+	})
+
+	t.Run("returns error if a fallback strategy is not available for the provider", func(t *testing.T) {
+		t.Parallel()
+
+		env := setupTestEnv(t, false, false, nil)
+
+		settings := &models.SSOSettings{
+			Provider: social.AzureADProviderName,
+			Settings: map[string]any{
+				"client_id":     "client-id",
+				"client_secret": "client-secret",
+				"enabled":       true,
+			},
+			IsDeleted: false,
+		}
+
+		env.fallbackStrategy.ExpectedIsMatch = false
+
+		err := env.service.Upsert(context.Background(), settings, &user.SignedInUser{})
+		require.Error(t, err)
+	})
+
+	t.Run("returns error if secrets encryption failed", func(t *testing.T) {
+		t.Parallel()
+
+		env := setupTestEnv(t, false, false, nil)
+
+		provider := social.OktaProviderName
+		settings := models.SSOSettings{
+			Provider: provider,
+			Settings: map[string]any{
+				"client_id":     "client-id",
+				"client_secret": "client-secret",
+				"enabled":       true,
+			},
+			IsDeleted: false,
+		}
+
+		reloadable := ssosettingstests.NewMockReloadable(t)
+		reloadable.On("Validate", mock.Anything, settings, mock.Anything).Return(nil)
+		env.reloadables[provider] = reloadable
+		env.secrets.On("Encrypt", mock.Anything, []byte(settings.Settings["client_secret"].(string)), mock.Anything).Return(nil, errors.New("encryption failed")).Once()
+
+		err := env.service.Upsert(context.Background(), &settings, &user.SignedInUser{})
+		require.Error(t, err)
+	})
+
+	t.Run("should not update the current secret if the secret has not been updated", func(t *testing.T) {
+		t.Parallel()
+
+		env := setupTestEnv(t, false, false, nil)
+
+		provider := social.AzureADProviderName
+		settings := models.SSOSettings{
+			Provider: provider,
+			Settings: map[string]any{
+				"client_id":     "client-id",
+				"client_secret": setting.RedactedPassword,
+				"enabled":       true,
+			},
+			IsDeleted: false,
+		}
+
+		env.store.ExpectedSSOSetting = &models.SSOSettings{
+			Provider: provider,
+			Settings: map[string]any{
+				"client_secret": base64.RawStdEncoding.EncodeToString([]byte("current-client-secret")),
+			},
+		}
+
+		reloadable := ssosettingstests.NewMockReloadable(t)
+		reloadable.On("Validate", mock.Anything, settings, mock.Anything).Return(nil)
+		reloadable.On("Reload", mock.Anything, mock.Anything).Return(nil).Maybe()
+		env.reloadables[provider] = reloadable
+		env.secrets.On("Decrypt", mock.Anything, []byte("current-client-secret"), mock.Anything).Return([]byte("encrypted-client-secret"), nil).Once()
+		env.secrets.On("Encrypt", mock.Anything, []byte("encrypted-client-secret"), mock.Anything).Return([]byte("current-client-secret"), nil).Once()
+
+		err := env.service.Upsert(context.Background(), &settings, &user.SignedInUser{})
+		require.NoError(t, err)
+
+		settings.Settings["client_secret"] = base64.RawStdEncoding.EncodeToString([]byte("current-client-secret"))
+		require.EqualValues(t, settings, env.store.ActualSSOSettings)
+	})
+
+	t.Run("returns error if store failed to upsert settings", func(t *testing.T) {
+		t.Parallel()
+
+		env := setupTestEnv(t, false, false, nil)
+
+		provider := social.AzureADProviderName
+		settings := models.SSOSettings{
+			Provider: provider,
+			Settings: map[string]any{
+				"client_id":     "client-id",
+				"client_secret": "client-secret",
+				"enabled":       true,
+			},
+			IsDeleted: false,
+		}
+
+		reloadable := ssosettingstests.NewMockReloadable(t)
+		reloadable.On("Validate", mock.Anything, settings, mock.Anything).Return(nil)
+		env.reloadables[provider] = reloadable
+		env.secrets.On("Encrypt", mock.Anything, []byte(settings.Settings["client_secret"].(string)), mock.Anything).Return([]byte("encrypted-client-secret"), nil).Once()
+		env.store.GetFn = func(ctx context.Context, provider string) (*models.SSOSettings, error) {
+			return &models.SSOSettings{}, nil
+		}
+
+		env.store.UpsertFn = func(ctx context.Context, settings *models.SSOSettings) error {
+			return errors.New("failed to upsert settings")
+		}
+
+		err := env.service.Upsert(context.Background(), &settings, &user.SignedInUser{})
+		require.Error(t, err)
+	})
+
+	t.Run("successfully upsert SSO settings if reload fails", func(t *testing.T) {
+		t.Parallel()
+
+		env := setupTestEnv(t, false, false, nil)
+
+		provider := social.AzureADProviderName
+		settings := models.SSOSettings{
+			Provider: provider,
+			Settings: map[string]any{
+				"client_id":     "client-id",
+				"client_secret": "client-secret",
+				"enabled":       true,
+			},
+			IsDeleted: false,
+		}
+
+		reloadable := ssosettingstests.NewMockReloadable(t)
+		reloadable.On("Validate", mock.Anything, settings, mock.Anything).Return(nil)
+		reloadable.On("Reload", mock.Anything, mock.Anything).Return(errors.New("failed reloading new settings")).Maybe()
+		env.reloadables[provider] = reloadable
+		env.secrets.On("Encrypt", mock.Anything, []byte(settings.Settings["client_secret"].(string)), mock.Anything).Return([]byte("encrypted-client-secret"), nil).Once()
+
+		err := env.service.Upsert(context.Background(), &settings, &user.SignedInUser{})
+		require.NoError(t, err)
+
+		settings.Settings["client_secret"] = base64.RawStdEncoding.EncodeToString([]byte("encrypted-client-secret"))
+		require.EqualValues(t, settings, env.store.ActualSSOSettings)
+	})
+}
+
+func TestService_Delete(t *testing.T) {
+	t.Parallel()
+
+	t.Run("successfully delete SSO settings", func(t *testing.T) {
+		t.Parallel()
+
+		env := setupTestEnv(t, false, false, nil)
+
+		var wg sync.WaitGroup
+		wg.Add(1)
+
+		provider := social.AzureADProviderName
+		reloadable := ssosettingstests.NewMockReloadable(t)
+		env.reloadables[provider] = reloadable
+
+		env.fallbackStrategy.ExpectedConfigs = map[string]map[string]any{
+			provider: {
+				"client_id":     "client-id",
+				"client_secret": "client-secret",
+				"enabled":       true,
+			},
+		}
+
+		reloadable.On("Reload", mock.Anything, mock.MatchedBy(func(settings models.SSOSettings) bool {
+			wg.Done()
+			return settings.Provider == provider &&
+				settings.ID == "" &&
+				maps.Equal(settings.Settings, map[string]any{
+					"client_id":     "client-id",
+					"client_secret": "client-secret",
+					"enabled":       true,
+				})
+		})).Return(nil).Once()
+
+		err := env.service.Delete(context.Background(), provider)
+		require.NoError(t, err)
+
+		// wait for the goroutine first to assert the Reload call
+		wg.Wait()
+	})
+
+	t.Run("return error if SSO setting was not found for the specified provider", func(t *testing.T) {
+		t.Parallel()
+
+		env := setupTestEnv(t, false, false, nil)
+
+		provider := social.AzureADProviderName
+		reloadable := ssosettingstests.NewMockReloadable(t)
+		env.reloadables[provider] = reloadable
+		env.store.ExpectedError = ssosettings.ErrNotFound
+
+		err := env.service.Delete(context.Background(), provider)
+		require.Error(t, err)
+
+		require.ErrorIs(t, err, ssosettings.ErrNotFound)
+	})
+
+	t.Run("should not delete the SSO settings if the provider is not configurable", func(t *testing.T) {
+		t.Parallel()
+
+		env := setupTestEnv(t, false, false, nil)
+		env.cfg.SSOSettingsConfigurableProviders = map[string]bool{social.AzureADProviderName: true}
+
+		provider := social.GrafanaComProviderName
+		env.store.ExpectedError = nil
+
+		err := env.service.Delete(context.Background(), provider)
+		require.ErrorIs(t, err, ssosettings.ErrNotConfigurable)
+	})
+
+	t.Run("return error when store fails to delete the SSO settings for the specified provider", func(t *testing.T) {
+		t.Parallel()
+
+		env := setupTestEnv(t, false, false, nil)
+
+		provider := social.AzureADProviderName
+		env.store.ExpectedError = errors.New("delete sso settings failed")
+
+		err := env.service.Delete(context.Background(), provider)
+		require.Error(t, err)
+		require.NotErrorIs(t, err, ssosettings.ErrNotFound)
+	})
+
+	t.Run("return successfully when the deletion was successful but reloading the settings fail", func(t *testing.T) {
+		t.Parallel()
+
+		env := setupTestEnv(t, false, false, nil)
+
+		provider := social.AzureADProviderName
+		reloadable := ssosettingstests.NewMockReloadable(t)
+		env.reloadables[provider] = reloadable
+
+		env.store.GetFn = func(ctx context.Context, provider string) (*models.SSOSettings, error) {
+			return nil, errors.New("failed to get sso settings")
+		}
+
+		err := env.service.Delete(context.Background(), provider)
+
+		require.NoError(t, err)
+	})
+}
+
+func TestService_DoReload(t *testing.T) {
+	t.Parallel()
+
+	t.Run("successfully reload settings", func(t *testing.T) {
+		t.Parallel()
+
+		env := setupTestEnv(t, false, false, nil)
+
+		settingsList := []*models.SSOSettings{
+			{
+				Provider: "github",
+				Settings: map[string]any{
+					"enabled":   true,
+					"client_id": "github_client_id",
+				},
+			},
+			{
+				Provider: "google",
+				Settings: map[string]any{
+					"enabled":   true,
+					"client_id": "google_client_id",
+				},
+			},
+			{
+				Provider: "azuread",
+				Settings: map[string]any{
+					"enabled":   true,
+					"client_id": "azuread_client_id",
+				},
+			},
+		}
+		env.store.ExpectedSSOSettings = settingsList
+
+		reloadable := ssosettingstests.NewMockReloadable(t)
+
+		for _, settings := range settingsList {
+			reloadable.On("Reload", mock.Anything, *settings).Return(nil).Once()
+			env.reloadables[settings.Provider] = reloadable
+		}
+
+		env.service.doReload(context.Background())
+	})
+
+	t.Run("successfully reload settings when some providers have empty settings", func(t *testing.T) {
+		t.Parallel()
+
+		env := setupTestEnv(t, false, false, nil)
+
+		settingsList := []*models.SSOSettings{
+			{
+				Provider: "azuread",
+				Settings: map[string]any{
+					"enabled":   true,
+					"client_id": "azuread_client_id",
+				},
+			},
+			{
+				Provider: "google",
+				Settings: map[string]any{},
+			},
+		}
+		env.store.ExpectedSSOSettings = settingsList
+
+		reloadable := ssosettingstests.NewMockReloadable(t)
+		reloadable.On("Reload", mock.Anything, *settingsList[0]).Return(nil).Once()
+		env.reloadables["azuread"] = reloadable
+
+		// registers a provider with empty settings
+		env.reloadables["github"] = nil
+
+		env.service.doReload(context.Background())
+	})
+
+	t.Run("failed fetching the SSO settings", func(t *testing.T) {
+		t.Parallel()
+
+		env := setupTestEnv(t, false, false, nil)
+
+		provider := "github"
+
+		env.store.ExpectedError = errors.New("failed fetching the settings")
+
+		reloadable := ssosettingstests.NewMockReloadable(t)
+		env.reloadables[provider] = reloadable
+
+		env.service.doReload(context.Background())
+	})
+}
+
+func TestService_decryptSecrets(t *testing.T) {
+	t.Parallel()
+
+	testCases := []struct {
+		name     string
+		setup    func(env testEnv)
+		settings map[string]any
+		want     map[string]any
+		wantErr  bool
+	}{
+		{
+			name: "should decrypt secrets successfully",
+			setup: func(env testEnv) {
+				env.secrets.On("Decrypt", mock.Anything, []byte("client_secret"), mock.Anything).Return([]byte("decrypted-client-secret"), nil).Once()
+				env.secrets.On("Decrypt", mock.Anything, []byte("other_secret"), mock.Anything).Return([]byte("decrypted-other-secret"), nil).Once()
+			},
+			settings: map[string]any{
+				"enabled":       true,
+				"client_secret": base64.RawStdEncoding.EncodeToString([]byte("client_secret")),
+				"other_secret":  base64.RawStdEncoding.EncodeToString([]byte("other_secret")),
+			},
+			want: map[string]any{
+				"enabled":       true,
+				"client_secret": "decrypted-client-secret",
+				"other_secret":  "decrypted-other-secret",
+			},
+		},
+		{
+			name: "should not decrypt when a secret is empty",
+			setup: func(env testEnv) {
+				env.secrets.On("Decrypt", mock.Anything, []byte("other_secret"), mock.Anything).Return([]byte("decrypted-other-secret"), nil).Once()
+			},
+			settings: map[string]any{
+				"enabled":       true,
+				"client_secret": "",
+				"other_secret":  base64.RawStdEncoding.EncodeToString([]byte("other_secret")),
+			},
+			want: map[string]any{
+				"enabled":       true,
+				"client_secret": "",
+				"other_secret":  "decrypted-other-secret",
+			},
+		},
+		{
+			name: "should return an error if data is not a string",
+			settings: map[string]any{
+				"enabled":       true,
+				"client_secret": 2,
+				"other_secret":  2,
+			},
+			wantErr: true,
+		},
+		{
+			name: "should return an error if data is not a valid base64 string",
+			settings: map[string]any{
+				"enabled":       true,
+				"client_secret": "client_secret",
+				"other_secret":  "other_secret",
+			},
+			wantErr: true,
+		},
+		{
+			name: "should return an error decryption fails",
+			setup: func(env testEnv) {
+				env.secrets.On("Decrypt", mock.Anything, []byte("client_secret"), mock.Anything).Return(nil, errors.New("decryption failed")).Once()
+			},
+			settings: map[string]any{
+				"enabled":       true,
+				"client_secret": base64.RawStdEncoding.EncodeToString([]byte("client_secret")),
+			},
+			wantErr: true,
+		},
+	}
+
+	for _, tc := range testCases {
+		// create a local copy of "tc" to allow concurrent access within tests to the different items of testCases,
+		// otherwise it would be like a moving pointer while tests run in parallel
+		tc := tc
+
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+
+			env := setupTestEnv(t, false, false, nil)
+
+			if tc.setup != nil {
+				tc.setup(env)
+			}
+
+			actual, err := env.service.decryptSecrets(context.Background(), tc.settings)
+
+			if tc.wantErr {
+				require.Error(t, err)
+				return
+			}
+
+			require.NoError(t, err)
+			require.Equal(t, tc.want, actual)
+
+			env.secrets.AssertExpectations(t)
+		})
+	}
+}
+
+func Test_ProviderService(t *testing.T) {
+	tests := []struct {
+		name                  string
+		isLicenseEnabled      bool
+		configurableProviders map[string]bool
+		expectedProvidersList []string
+		strategiesLength      int
+	}{
+		{
+			name:             "should return all OAuth providers but not saml because the licensing feature is not enabled",
+			isLicenseEnabled: false,
+			expectedProvidersList: []string{
+				"github",
+				"gitlab",
+				"google",
+				"generic_oauth",
+				"grafana_com",
+				"azuread",
+				"okta",
+			},
+			strategiesLength: 1,
+		},
+		{
+			name:             "should return all fallback strategies and it should return all OAuth providers but not saml because the licensing feature is enabled but the configurable provider is not setup",
+			isLicenseEnabled: true,
+			expectedProvidersList: []string{
+				"github",
+				"gitlab",
+				"google",
+				"generic_oauth",
+				"grafana_com",
+				"azuread",
+				"okta",
+			},
+			strategiesLength: 2,
+		},
+		{
+			name:                  "should return all fallback strategies and it should return all OAuth providers and saml because the licensing feature is enabled and the provider is setup",
+			isLicenseEnabled:      true,
+			configurableProviders: map[string]bool{"saml": true},
+			expectedProvidersList: []string{
+				"github",
+				"gitlab",
+				"google",
+				"generic_oauth",
+				"grafana_com",
+				"azuread",
+				"okta",
+				"saml",
+			},
+			strategiesLength: 2,
+		},
+	}
+	for _, tc := range tests {
+		tc := tc
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+
+			env := setupTestEnv(t, tc.isLicenseEnabled, true, tc.configurableProviders)
+
+			require.Equal(t, tc.expectedProvidersList, env.service.providersList)
+			require.Equal(t, tc.strategiesLength, len(env.service.fbStrategies))
+		})
+	}
+}
+
+func setupTestEnv(t *testing.T, isLicensingEnabled, keepFallbackStratergies bool, extraConfigurableProviders map[string]bool) testEnv {
+	t.Helper()
+
+	store := ssosettingstests.NewFakeStore()
+	fallbackStrategy := ssosettingstests.NewFakeFallbackStrategy()
+	secrets := secretsFakes.NewMockService(t)
+	accessControl := acimpl.ProvideAccessControl(setting.NewCfg())
+	reloadables := make(map[string]ssosettings.Reloadable)
+
+	fallbackStrategy.ExpectedIsMatch = true
+
+	iniFile, _ := ini.Load([]byte(""))
+
+	configurableProviders := map[string]bool{
+		"github":        true,
+		"okta":          true,
+		"azuread":       true,
+		"google":        true,
+		"generic_oauth": true,
+		"gitlab":        true,
+	}
+
+	for k, v := range extraConfigurableProviders {
+		configurableProviders[k] = v
+	}
+
+	cfg := &setting.Cfg{
+		SSOSettingsConfigurableProviders: configurableProviders,
+		Raw:                              iniFile,
+	}
+
+	licensing := licensingtest.NewFakeLicensing()
+	licensing.On("FeatureEnabled", "saml").Return(isLicensingEnabled)
+
+	svc := ProvideService(
+		cfg,
+		&dbtest.FakeDB{},
+		accessControl,
+		routing.NewRouteRegister(),
+		featuremgmt.WithManager(nil),
+		secretsFakes.NewMockService(t),
+		&usagestats.UsageStatsMock{},
+		prometheus.NewRegistry(),
+		&setting.OSSImpl{Cfg: cfg},
+		licensing,
+	)
+
+	// overriding values for exposed fields
+	svc.store = store
+	if !keepFallbackStratergies {
+		svc.fbStrategies = []ssosettings.FallbackStrategy{
+			fallbackStrategy,
+		}
+	}
+	svc.secrets = secrets
+	svc.reloadables = reloadables
+
+	return testEnv{
+		cfg:              cfg,
+		service:          svc,
+		store:            store,
+		ac:               accessControl,
+		fallbackStrategy: fallbackStrategy,
+		secrets:          secrets,
+		reloadables:      reloadables,
+	}
+}
+
+type testEnv struct {
+	cfg              *setting.Cfg
+	service          *Service
+	store            *ssosettingstests.FakeStore
+	ac               accesscontrol.AccessControl
+	fallbackStrategy *ssosettingstests.FakeFallbackStrategy
+	secrets          *secretsFakes.MockService
+	reloadables      map[string]ssosettings.Reloadable
+}
diff --git a/pkg/services/ssosettings/ssosettingsimpl/usage_stats.go b/pkg/services/ssosettings/ssosettingsimpl/usage_stats.go
new file mode 100644
index 0000000000000..747415d2d7553
--- /dev/null
+++ b/pkg/services/ssosettings/ssosettingsimpl/usage_stats.go
@@ -0,0 +1,30 @@
+package ssosettingsimpl
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/services/ssosettings/models"
+)
+
+func (s *Service) getUsageStats(ctx context.Context) (map[string]any, error) {
+	m := map[string]any{}
+
+	settings, err := s.store.List(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	configuredInDbCounter := 0
+	for _, setting := range settings {
+		enabledValue := 0
+		if setting.Source == models.DB {
+			configuredInDbCounter++
+			enabledValue = 1
+		}
+		m["stats.sso."+setting.Provider+".config.database.count"] = enabledValue
+	}
+
+	m["stats.sso.configured_in_db.count"] = configuredInDbCounter
+
+	return m, nil
+}
diff --git a/pkg/services/ssosettings/ssosettingsimpl/usage_stats_test.go b/pkg/services/ssosettings/ssosettingsimpl/usage_stats_test.go
new file mode 100644
index 0000000000000..bd7d633ffddc9
--- /dev/null
+++ b/pkg/services/ssosettings/ssosettingsimpl/usage_stats_test.go
@@ -0,0 +1,68 @@
+package ssosettingsimpl
+
+import (
+	"context"
+	"testing"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/ssosettings/models"
+	"github.com/grafana/grafana/pkg/services/ssosettings/ssosettingstests"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/stretchr/testify/require"
+)
+
+func TestService_getUsageStats(t *testing.T) {
+	fakeStore := &ssosettingstests.FakeStore{
+		ExpectedSSOSettings: []*models.SSOSettings{
+			{
+				Provider: "google",
+				Source:   models.DB,
+			},
+			{
+				Provider: "github",
+				Source:   models.System,
+			},
+			{
+				Provider: "grafana_com",
+				Source:   models.System,
+			},
+			{
+				Provider: "generic_oauth",
+				Source:   models.DB,
+			},
+			{
+				Provider: "okta",
+				Source:   models.DB,
+			},
+			{
+				Provider: "azuread",
+				Source:   models.DB,
+			},
+			{
+				Provider: "gitlab",
+				Source:   models.DB,
+			},
+		},
+	}
+	svc := &Service{
+		logger: log.New("test"),
+		store:  fakeStore,
+		cfg:    &setting.Cfg{},
+	}
+
+	actual, err := svc.getUsageStats(context.Background())
+	require.NoError(t, err)
+
+	expected := map[string]any{
+		"stats.sso.configured_in_db.count":              5,
+		"stats.sso.azuread.config.database.count":       1,
+		"stats.sso.gitlab.config.database.count":        1,
+		"stats.sso.google.config.database.count":        1,
+		"stats.sso.okta.config.database.count":          1,
+		"stats.sso.generic_oauth.config.database.count": 1,
+		"stats.sso.grafana_com.config.database.count":   0,
+		"stats.sso.github.config.database.count":        0,
+	}
+
+	require.EqualValues(t, expected, actual)
+}
diff --git a/pkg/services/ssosettings/ssosettingstests/fallback_strategy_fake.go b/pkg/services/ssosettings/ssosettingstests/fallback_strategy_fake.go
new file mode 100644
index 0000000000000..ed514f9a99074
--- /dev/null
+++ b/pkg/services/ssosettings/ssosettingstests/fallback_strategy_fake.go
@@ -0,0 +1,22 @@
+package ssosettingstests
+
+import context "context"
+
+type FakeFallbackStrategy struct {
+	ExpectedIsMatch bool
+	ExpectedConfigs map[string]map[string]any
+
+	ExpectedError error
+}
+
+func NewFakeFallbackStrategy() *FakeFallbackStrategy {
+	return &FakeFallbackStrategy{}
+}
+
+func (f *FakeFallbackStrategy) IsMatch(provider string) bool {
+	return f.ExpectedIsMatch
+}
+
+func (f *FakeFallbackStrategy) GetProviderConfig(ctx context.Context, provider string) (map[string]any, error) {
+	return f.ExpectedConfigs[provider], f.ExpectedError
+}
diff --git a/pkg/services/ssosettings/ssosettingstests/reloadable_mock.go b/pkg/services/ssosettings/ssosettingstests/reloadable_mock.go
new file mode 100644
index 0000000000000..599fe1c5c19e1
--- /dev/null
+++ b/pkg/services/ssosettings/ssosettingstests/reloadable_mock.go
@@ -0,0 +1,67 @@
+// Code generated by mockery v2.40.1. DO NOT EDIT.
+
+package ssosettingstests
+
+import (
+	context "context"
+
+	identity "github.com/grafana/grafana/pkg/services/auth/identity"
+	mock "github.com/stretchr/testify/mock"
+
+	models "github.com/grafana/grafana/pkg/services/ssosettings/models"
+)
+
+// MockReloadable is an autogenerated mock type for the Reloadable type
+type MockReloadable struct {
+	mock.Mock
+}
+
+// Reload provides a mock function with given fields: ctx, settings
+func (_m *MockReloadable) Reload(ctx context.Context, settings models.SSOSettings) error {
+	ret := _m.Called(ctx, settings)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Reload")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, models.SSOSettings) error); ok {
+		r0 = rf(ctx, settings)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// Validate provides a mock function with given fields: ctx, settings, requester
+func (_m *MockReloadable) Validate(ctx context.Context, settings models.SSOSettings, requester identity.Requester) error {
+	ret := _m.Called(ctx, settings, requester)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Validate")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, models.SSOSettings, identity.Requester) error); ok {
+		r0 = rf(ctx, settings, requester)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// NewMockReloadable creates a new instance of MockReloadable. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewMockReloadable(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *MockReloadable {
+	mock := &MockReloadable{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/pkg/services/ssosettings/ssosettingstests/service_mock.go b/pkg/services/ssosettings/ssosettingstests/service_mock.go
new file mode 100644
index 0000000000000..02837917856fa
--- /dev/null
+++ b/pkg/services/ssosettings/ssosettingstests/service_mock.go
@@ -0,0 +1,217 @@
+// Code generated by mockery v2.40.1. DO NOT EDIT.
+
+package ssosettingstests
+
+import (
+	context "context"
+
+	identity "github.com/grafana/grafana/pkg/services/auth/identity"
+	mock "github.com/stretchr/testify/mock"
+
+	models "github.com/grafana/grafana/pkg/services/ssosettings/models"
+
+	ssosettings "github.com/grafana/grafana/pkg/services/ssosettings"
+)
+
+// MockService is an autogenerated mock type for the Service type
+type MockService struct {
+	mock.Mock
+}
+
+// Delete provides a mock function with given fields: ctx, provider
+func (_m *MockService) Delete(ctx context.Context, provider string) error {
+	ret := _m.Called(ctx, provider)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, string) error); ok {
+		r0 = rf(ctx, provider)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// GetForProvider provides a mock function with given fields: ctx, provider
+func (_m *MockService) GetForProvider(ctx context.Context, provider string) (*models.SSOSettings, error) {
+	ret := _m.Called(ctx, provider)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetForProvider")
+	}
+
+	var r0 *models.SSOSettings
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, string) (*models.SSOSettings, error)); ok {
+		return rf(ctx, provider)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, string) *models.SSOSettings); ok {
+		r0 = rf(ctx, provider)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*models.SSOSettings)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, string) error); ok {
+		r1 = rf(ctx, provider)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetForProviderWithRedactedSecrets provides a mock function with given fields: ctx, provider
+func (_m *MockService) GetForProviderWithRedactedSecrets(ctx context.Context, provider string) (*models.SSOSettings, error) {
+	ret := _m.Called(ctx, provider)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetForProviderWithRedactedSecrets")
+	}
+
+	var r0 *models.SSOSettings
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, string) (*models.SSOSettings, error)); ok {
+		return rf(ctx, provider)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, string) *models.SSOSettings); ok {
+		r0 = rf(ctx, provider)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*models.SSOSettings)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, string) error); ok {
+		r1 = rf(ctx, provider)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// List provides a mock function with given fields: ctx
+func (_m *MockService) List(ctx context.Context) ([]*models.SSOSettings, error) {
+	ret := _m.Called(ctx)
+
+	if len(ret) == 0 {
+		panic("no return value specified for List")
+	}
+
+	var r0 []*models.SSOSettings
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context) ([]*models.SSOSettings, error)); ok {
+		return rf(ctx)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context) []*models.SSOSettings); ok {
+		r0 = rf(ctx)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]*models.SSOSettings)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context) error); ok {
+		r1 = rf(ctx)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// ListWithRedactedSecrets provides a mock function with given fields: ctx
+func (_m *MockService) ListWithRedactedSecrets(ctx context.Context) ([]*models.SSOSettings, error) {
+	ret := _m.Called(ctx)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ListWithRedactedSecrets")
+	}
+
+	var r0 []*models.SSOSettings
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context) ([]*models.SSOSettings, error)); ok {
+		return rf(ctx)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context) []*models.SSOSettings); ok {
+		r0 = rf(ctx)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]*models.SSOSettings)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context) error); ok {
+		r1 = rf(ctx)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Patch provides a mock function with given fields: ctx, provider, data
+func (_m *MockService) Patch(ctx context.Context, provider string, data map[string]interface{}) error {
+	ret := _m.Called(ctx, provider, data)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Patch")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, string, map[string]interface{}) error); ok {
+		r0 = rf(ctx, provider, data)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// RegisterReloadable provides a mock function with given fields: provider, reloadable
+func (_m *MockService) RegisterReloadable(provider string, reloadable ssosettings.Reloadable) {
+	_m.Called(provider, reloadable)
+}
+
+// Reload provides a mock function with given fields: ctx, provider
+func (_m *MockService) Reload(ctx context.Context, provider string) {
+	_m.Called(ctx, provider)
+}
+
+// Upsert provides a mock function with given fields: ctx, settings, requester
+func (_m *MockService) Upsert(ctx context.Context, settings *models.SSOSettings, requester identity.Requester) error {
+	ret := _m.Called(ctx, settings, requester)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Upsert")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, *models.SSOSettings, identity.Requester) error); ok {
+		r0 = rf(ctx, settings, requester)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// NewMockService creates a new instance of MockService. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewMockService(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *MockService {
+	mock := &MockService{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/pkg/services/ssosettings/ssosettingstests/store_fake.go b/pkg/services/ssosettings/ssosettingstests/store_fake.go
new file mode 100644
index 0000000000000..016263ce8b53b
--- /dev/null
+++ b/pkg/services/ssosettings/ssosettingstests/store_fake.go
@@ -0,0 +1,54 @@
+package ssosettingstests
+
+import (
+	context "context"
+
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	models "github.com/grafana/grafana/pkg/services/ssosettings/models"
+)
+
+var _ ssosettings.Store = (*FakeStore)(nil)
+
+type FakeStore struct {
+	ExpectedSSOSetting  *models.SSOSettings
+	ExpectedSSOSettings []*models.SSOSettings
+	ExpectedError       error
+
+	ActualSSOSettings models.SSOSettings
+
+	GetFn    func(ctx context.Context, provider string) (*models.SSOSettings, error)
+	UpsertFn func(ctx context.Context, settings *models.SSOSettings) error
+}
+
+func NewFakeStore() *FakeStore {
+	return &FakeStore{}
+}
+
+func (f *FakeStore) Get(ctx context.Context, provider string) (*models.SSOSettings, error) {
+	if f.GetFn != nil {
+		return f.GetFn(ctx, provider)
+	}
+	return f.ExpectedSSOSetting, f.ExpectedError
+}
+
+func (f *FakeStore) List(ctx context.Context) ([]*models.SSOSettings, error) {
+	return f.ExpectedSSOSettings, f.ExpectedError
+}
+
+func (f *FakeStore) Upsert(ctx context.Context, settings *models.SSOSettings) error {
+	if f.UpsertFn != nil {
+		return f.UpsertFn(ctx, settings)
+	}
+
+	f.ActualSSOSettings = *settings
+
+	return f.ExpectedError
+}
+
+func (f *FakeStore) Patch(ctx context.Context, provider string, data map[string]any) error {
+	return f.ExpectedError
+}
+
+func (f *FakeStore) Delete(ctx context.Context, provider string) error {
+	return f.ExpectedError
+}
diff --git a/pkg/services/ssosettings/ssosettingstests/store_mock.go b/pkg/services/ssosettings/ssosettingstests/store_mock.go
new file mode 100644
index 0000000000000..009660cd3e619
--- /dev/null
+++ b/pkg/services/ssosettings/ssosettingstests/store_mock.go
@@ -0,0 +1,125 @@
+// Code generated by mockery v2.40.1. DO NOT EDIT.
+
+package ssosettingstests
+
+import (
+	context "context"
+
+	models "github.com/grafana/grafana/pkg/services/ssosettings/models"
+	mock "github.com/stretchr/testify/mock"
+)
+
+// MockStore is an autogenerated mock type for the Store type
+type MockStore struct {
+	mock.Mock
+}
+
+// Delete provides a mock function with given fields: ctx, provider
+func (_m *MockStore) Delete(ctx context.Context, provider string) error {
+	ret := _m.Called(ctx, provider)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, string) error); ok {
+		r0 = rf(ctx, provider)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// Get provides a mock function with given fields: ctx, provider
+func (_m *MockStore) Get(ctx context.Context, provider string) (*models.SSOSettings, error) {
+	ret := _m.Called(ctx, provider)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
+	var r0 *models.SSOSettings
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, string) (*models.SSOSettings, error)); ok {
+		return rf(ctx, provider)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, string) *models.SSOSettings); ok {
+		r0 = rf(ctx, provider)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*models.SSOSettings)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, string) error); ok {
+		r1 = rf(ctx, provider)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// List provides a mock function with given fields: ctx
+func (_m *MockStore) List(ctx context.Context) ([]*models.SSOSettings, error) {
+	ret := _m.Called(ctx)
+
+	if len(ret) == 0 {
+		panic("no return value specified for List")
+	}
+
+	var r0 []*models.SSOSettings
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context) ([]*models.SSOSettings, error)); ok {
+		return rf(ctx)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context) []*models.SSOSettings); ok {
+		r0 = rf(ctx)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]*models.SSOSettings)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context) error); ok {
+		r1 = rf(ctx)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Upsert provides a mock function with given fields: ctx, settings
+func (_m *MockStore) Upsert(ctx context.Context, settings *models.SSOSettings) error {
+	ret := _m.Called(ctx, settings)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Upsert")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, *models.SSOSettings) error); ok {
+		r0 = rf(ctx, settings)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// NewMockStore creates a new instance of MockStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewMockStore(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *MockStore {
+	mock := &MockStore{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/pkg/services/ssosettings/strategies/oauth_strategy.go b/pkg/services/ssosettings/strategies/oauth_strategy.go
new file mode 100644
index 0000000000000..578e80e31f7e1
--- /dev/null
+++ b/pkg/services/ssosettings/strategies/oauth_strategy.go
@@ -0,0 +1,122 @@
+package strategies
+
+import (
+	"context"
+	"maps"
+
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/login/social/connectors"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+type OAuthStrategy struct {
+	cfg                *setting.Cfg
+	settingsByProvider map[string]map[string]any
+}
+
+var extraKeysByProvider = map[string]map[string]connectors.ExtraKeyInfo{
+	social.AzureADProviderName:      connectors.ExtraAzureADSettingKeys,
+	social.GenericOAuthProviderName: connectors.ExtraGenericOAuthSettingKeys,
+	social.GitHubProviderName:       connectors.ExtraGithubSettingKeys,
+	social.GoogleProviderName:       connectors.ExtraGoogleSettingKeys,
+	social.GrafanaComProviderName:   connectors.ExtraGrafanaComSettingKeys,
+	social.GrafanaNetProviderName:   connectors.ExtraGrafanaComSettingKeys,
+}
+
+var _ ssosettings.FallbackStrategy = (*OAuthStrategy)(nil)
+
+func NewOAuthStrategy(cfg *setting.Cfg) *OAuthStrategy {
+	oauthStrategy := &OAuthStrategy{
+		cfg:                cfg,
+		settingsByProvider: make(map[string]map[string]any),
+	}
+
+	oauthStrategy.loadAllSettings()
+	return oauthStrategy
+}
+
+func (s *OAuthStrategy) IsMatch(provider string) bool {
+	_, ok := s.settingsByProvider[provider]
+	return ok
+}
+
+func (s *OAuthStrategy) GetProviderConfig(_ context.Context, provider string) (map[string]any, error) {
+	providerConfig := s.settingsByProvider[provider]
+	result := make(map[string]any, len(providerConfig))
+	maps.Copy(result, providerConfig)
+	return result, nil
+}
+
+func (s *OAuthStrategy) loadAllSettings() {
+	allProviders := append(ssosettings.AllOAuthProviders, social.GrafanaNetProviderName)
+	for _, provider := range allProviders {
+		settings := s.loadSettingsForProvider(provider)
+		// This is required to support the legacy settings for the provider (auth.grafananet section)
+		// It will use the settings (and overwrite the current grafana_com settings) from auth.grafananet if
+		// the auth.grafananet section is enabled and the auth.grafana_com section is disabled.
+		if provider == social.GrafanaNetProviderName && s.shouldUseGrafanaNetSettings() && settings["enabled"] == true {
+			provider = social.GrafanaComProviderName
+		}
+		s.settingsByProvider[provider] = settings
+	}
+}
+
+func (s *OAuthStrategy) shouldUseGrafanaNetSettings() bool {
+	return s.settingsByProvider[social.GrafanaComProviderName]["enabled"] == false
+}
+
+func (s *OAuthStrategy) loadSettingsForProvider(provider string) map[string]any {
+	section := s.cfg.Raw.Section("auth." + provider)
+
+	result := map[string]any{
+		"client_id":                  section.Key("client_id").Value(),
+		"client_secret":              section.Key("client_secret").Value(),
+		"scopes":                     section.Key("scopes").Value(),
+		"empty_scopes":               section.Key("empty_scopes").MustBool(false),
+		"auth_style":                 section.Key("auth_style").Value(),
+		"auth_url":                   section.Key("auth_url").Value(),
+		"token_url":                  section.Key("token_url").Value(),
+		"api_url":                    section.Key("api_url").Value(),
+		"teams_url":                  section.Key("teams_url").Value(),
+		"enabled":                    section.Key("enabled").MustBool(false),
+		"email_attribute_name":       section.Key("email_attribute_name").Value(),
+		"email_attribute_path":       section.Key("email_attribute_path").Value(),
+		"role_attribute_path":        section.Key("role_attribute_path").Value(),
+		"role_attribute_strict":      section.Key("role_attribute_strict").MustBool(false),
+		"groups_attribute_path":      section.Key("groups_attribute_path").Value(),
+		"team_ids_attribute_path":    section.Key("team_ids_attribute_path").Value(),
+		"allowed_domains":            section.Key("allowed_domains").Value(),
+		"hosted_domain":              section.Key("hosted_domain").Value(),
+		"allow_sign_up":              section.Key("allow_sign_up").MustBool(false),
+		"name":                       section.Key("name").Value(),
+		"icon":                       section.Key("icon").Value(),
+		"skip_org_role_sync":         section.Key("skip_org_role_sync").MustBool(false),
+		"tls_client_cert":            section.Key("tls_client_cert").Value(),
+		"tls_client_key":             section.Key("tls_client_key").Value(),
+		"tls_client_ca":              section.Key("tls_client_ca").Value(),
+		"tls_skip_verify_insecure":   section.Key("tls_skip_verify_insecure").MustBool(false),
+		"use_pkce":                   section.Key("use_pkce").MustBool(false),
+		"use_refresh_token":          section.Key("use_refresh_token").MustBool(false),
+		"allow_assign_grafana_admin": section.Key("allow_assign_grafana_admin").MustBool(false),
+		"auto_login":                 section.Key("auto_login").MustBool(false),
+		"allowed_groups":             section.Key("allowed_groups").Value(),
+		"signout_redirect_url":       section.Key("signout_redirect_url").Value(),
+	}
+
+	extraKeys := extraKeysByProvider[provider]
+	for key, keyInfo := range extraKeys {
+		switch keyInfo.Type {
+		case connectors.Bool:
+			result[key] = section.Key(key).MustBool(keyInfo.DefaultValue.(bool))
+		default:
+			if _, ok := keyInfo.DefaultValue.(string); !ok {
+				result[key] = section.Key(key).Value()
+			} else {
+				result[key] = section.Key(key).MustString(keyInfo.DefaultValue.(string))
+			}
+		}
+	}
+
+	return result
+}
diff --git a/pkg/services/ssosettings/strategies/oauth_strategy_test.go b/pkg/services/ssosettings/strategies/oauth_strategy_test.go
new file mode 100644
index 0000000000000..2d5a91bb548fe
--- /dev/null
+++ b/pkg/services/ssosettings/strategies/oauth_strategy_test.go
@@ -0,0 +1,277 @@
+package strategies
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"gopkg.in/ini.v1"
+
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+var (
+	iniContent = `
+	[auth.generic_oauth]
+	name = OAuth
+	icon = signin
+	enabled = true
+	allow_sign_up = false
+	auto_login = true
+	client_id = test_client_id
+	client_secret = test_client_secret
+	scopes = openid, profile, email
+	empty_scopes = false
+	email_attribute_name = email:primary
+	email_attribute_path = email
+	login_attribute_path = login
+	name_attribute_path = name
+	role_attribute_path = role
+	role_attribute_strict = true
+	groups_attribute_path = groups
+	id_token_attribute_name = id_token
+	team_ids_attribute_path = team_ids
+	auth_style = inheader
+	auth_url = test_auth_url
+	token_url = test_token_url
+	api_url = test_api_url
+	teams_url = test_teams_url
+	allowed_domains = domain1.com
+	allowed_groups =
+	team_ids = first, second
+	allowed_organizations = org1, org2
+	tls_skip_verify_insecure = true
+	tls_client_cert =
+	tls_client_key =
+	tls_client_ca =
+	use_pkce = false
+	allow_assign_grafana_admin = true
+	skip_org_role_sync = true
+	use_refresh_token = true
+	empty_scopes =
+	hosted_domain = test_hosted_domain
+	signout_redirect_url = test_signout_redirect_url
+	`
+
+	expectedOAuthInfo = map[string]any{
+		"name":                       "OAuth",
+		"icon":                       "signin",
+		"enabled":                    true,
+		"allow_sign_up":              false,
+		"auto_login":                 true,
+		"client_id":                  "test_client_id",
+		"client_secret":              "test_client_secret",
+		"scopes":                     "openid, profile, email",
+		"empty_scopes":               false,
+		"email_attribute_name":       "email:primary",
+		"email_attribute_path":       "email",
+		"role_attribute_path":        "role",
+		"role_attribute_strict":      true,
+		"groups_attribute_path":      "groups",
+		"team_ids_attribute_path":    "team_ids",
+		"auth_url":                   "test_auth_url",
+		"token_url":                  "test_token_url",
+		"api_url":                    "test_api_url",
+		"teams_url":                  "test_teams_url",
+		"allowed_domains":            "domain1.com",
+		"allowed_groups":             "",
+		"tls_skip_verify_insecure":   true,
+		"tls_client_cert":            "",
+		"tls_client_key":             "",
+		"tls_client_ca":              "",
+		"use_pkce":                   false,
+		"auth_style":                 "inheader",
+		"allow_assign_grafana_admin": true,
+		"use_refresh_token":          true,
+		"hosted_domain":              "test_hosted_domain",
+		"skip_org_role_sync":         true,
+		"signout_redirect_url":       "test_signout_redirect_url",
+		"allowed_organizations":      "org1, org2",
+		"id_token_attribute_name":    "id_token",
+		"login_attribute_path":       "login",
+		"name_attribute_path":        "name",
+		"team_ids":                   "first, second",
+	}
+)
+
+func TestGetProviderConfig(t *testing.T) {
+	iniFile, err := ini.Load([]byte(iniContent))
+	require.NoError(t, err)
+
+	cfg := setting.NewCfg()
+	cfg.Raw = iniFile
+
+	strategy := NewOAuthStrategy(cfg)
+
+	result, err := strategy.GetProviderConfig(context.Background(), "generic_oauth")
+	require.NoError(t, err)
+
+	require.Equal(t, expectedOAuthInfo, result)
+}
+
+func TestGetProviderConfig_ExtraFields(t *testing.T) {
+	iniWithExtraFields := `
+	[auth.azuread]
+	force_use_graph_api = true
+	allowed_organizations = org1, org2
+
+	[auth.github]
+	team_ids = first, second
+	allowed_organizations = org1, org2
+
+	[auth.generic_oauth]
+	name_attribute_path = name
+	login_attribute_path = login
+	id_token_attribute_name = id_token
+	team_ids = first, second
+	allowed_organizations = org1, org2
+
+	[auth.grafana_com]
+	enabled = true
+	allowed_organizations = org1, org2
+
+	[auth.google]
+	validate_hd = true
+	`
+
+	iniFile, err := ini.Load([]byte(iniWithExtraFields))
+	require.NoError(t, err)
+
+	cfg := setting.NewCfg()
+	cfg.Raw = iniFile
+
+	strategy := NewOAuthStrategy(cfg)
+
+	t.Run(social.AzureADProviderName, func(t *testing.T) {
+		result, err := strategy.GetProviderConfig(context.Background(), social.AzureADProviderName)
+		require.NoError(t, err)
+
+		require.Equal(t, true, result["force_use_graph_api"])
+		require.Equal(t, "org1, org2", result["allowed_organizations"])
+	})
+
+	t.Run(social.GitHubProviderName, func(t *testing.T) {
+		result, err := strategy.GetProviderConfig(context.Background(), social.GitHubProviderName)
+		require.NoError(t, err)
+
+		require.Equal(t, "first, second", result["team_ids"])
+		require.Equal(t, "org1, org2", result["allowed_organizations"])
+	})
+
+	t.Run(social.GenericOAuthProviderName, func(t *testing.T) {
+		result, err := strategy.GetProviderConfig(context.Background(), social.GenericOAuthProviderName)
+		require.NoError(t, err)
+
+		require.Equal(t, "first, second", result["team_ids"])
+		require.Equal(t, "org1, org2", result["allowed_organizations"])
+		require.Equal(t, "name", result["name_attribute_path"])
+		require.Equal(t, "login", result["login_attribute_path"])
+		require.Equal(t, "id_token", result["id_token_attribute_name"])
+	})
+
+	t.Run(social.GrafanaComProviderName, func(t *testing.T) {
+		result, err := strategy.GetProviderConfig(context.Background(), social.GrafanaComProviderName)
+		require.NoError(t, err)
+
+		require.Equal(t, "org1, org2", result["allowed_organizations"])
+	})
+
+	t.Run(social.GoogleProviderName, func(t *testing.T) {
+		result, err := strategy.GetProviderConfig(context.Background(), social.GoogleProviderName)
+		require.NoError(t, err)
+
+		require.Equal(t, true, result["validate_hd"])
+	})
+}
+
+// TestGetProviderConfig_GrafanaComGrafanaNet tests that the connector is setup using the correct section and it supports
+// the legacy settings for the provider (auth.grafananet section). The test cases are based on the current behavior of the
+// SocialService's ProvideService method (TestSocialService_ProvideService_GrafanaComGrafanaNet).
+func TestGetProviderConfig_GrafanaComGrafanaNet(t *testing.T) {
+	testCases := []struct {
+		name                       string
+		rawIniContent              string
+		expectedGrafanaComSettings map[string]any
+	}{
+		{
+			name: "should setup the connector using auth.grafana_com section if it is enabled",
+			rawIniContent: `
+			[auth.grafana_com]
+			enabled = true
+			client_id = grafanaComClientId
+			
+			[auth.grafananet]
+			enabled = false
+			client_id = grafanaNetClientId`,
+			expectedGrafanaComSettings: map[string]any{
+				"enabled":   true,
+				"client_id": "grafanaComClientId",
+			},
+		},
+		{
+			name: "should setup the connector using auth.grafananet section if it is enabled",
+			rawIniContent: `
+			[auth.grafana_com]
+			enabled = false
+			client_id = grafanaComClientId
+			
+			[auth.grafananet]
+			enabled = true
+			client_id = grafanaNetClientId`,
+			expectedGrafanaComSettings: map[string]any{
+				"enabled":   true,
+				"client_id": "grafanaNetClientId",
+			},
+		},
+		{
+			name: "should setup the connector using auth.grafana_com section if both are enabled",
+			rawIniContent: `
+			[auth.grafana_com]
+			enabled = true
+			client_id = grafanaComClientId
+			
+			[auth.grafananet]
+			enabled = true
+			client_id = grafanaNetClientId`,
+			expectedGrafanaComSettings: map[string]any{
+				"enabled":   true,
+				"client_id": "grafanaComClientId",
+			},
+		},
+		{
+			name: "should not setup the connector when both are disabled",
+			rawIniContent: `
+			[auth.grafana_com]
+			enabled = false
+			client_id = grafanaComClientId
+			
+			[auth.grafananet]
+			enabled = false
+			client_id = grafanaNetClientId`,
+			expectedGrafanaComSettings: map[string]any{
+				"enabled":   false,
+				"client_id": "grafanaComClientId",
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			iniFile, err := ini.Load([]byte(tc.rawIniContent))
+			require.NoError(t, err)
+
+			cfg := setting.NewCfg()
+			cfg.Raw = iniFile
+
+			strategy := NewOAuthStrategy(cfg)
+
+			actualConfig, err := strategy.GetProviderConfig(context.Background(), "grafana_com")
+			require.NoError(t, err)
+
+			for key, value := range tc.expectedGrafanaComSettings {
+				require.Equal(t, value, actualConfig[key], "Difference in key: %s. Expected: %v, got: %v", key, value, actualConfig[key])
+			}
+		})
+	}
+}
diff --git a/pkg/services/ssosettings/strategies/saml_strategy.go b/pkg/services/ssosettings/strategies/saml_strategy.go
new file mode 100644
index 0000000000000..3a96367406618
--- /dev/null
+++ b/pkg/services/ssosettings/strategies/saml_strategy.go
@@ -0,0 +1,67 @@
+package strategies
+
+import (
+	"context"
+	"time"
+
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+type SAMLStrategy struct {
+	settingsProvider setting.Provider
+}
+
+var _ ssosettings.FallbackStrategy = (*SAMLStrategy)(nil)
+
+func NewSAMLStrategy(settingsProvider setting.Provider) *SAMLStrategy {
+	return &SAMLStrategy{
+		settingsProvider: settingsProvider,
+	}
+}
+
+func (s *SAMLStrategy) IsMatch(provider string) bool {
+	return provider == social.SAMLProviderName
+}
+
+func (s *SAMLStrategy) GetProviderConfig(_ context.Context, provider string) (map[string]any, error) {
+	return s.loadSAMLSettings(), nil
+}
+
+func (s *SAMLStrategy) loadSAMLSettings() map[string]any {
+	section := s.settingsProvider.Section("auth.saml")
+	result := map[string]any{
+		"enabled":                    section.KeyValue("enabled").MustBool(false),
+		"single_logout":              section.KeyValue("single_logout").MustBool(false),
+		"allow_sign_up":              section.KeyValue("allow_sign_up").MustBool(false),
+		"auto_login":                 section.KeyValue("auto_login").MustBool(false),
+		"certificate":                section.KeyValue("certificate").MustString(""),
+		"certificate_path":           section.KeyValue("certificate_path").MustString(""),
+		"private_key":                section.KeyValue("private_key").MustString(""),
+		"private_key_path":           section.KeyValue("private_key_path").MustString(""),
+		"signature_algorithm":        section.KeyValue("signature_algorithm").MustString(""),
+		"idp_metadata":               section.KeyValue("idp_metadata").MustString(""),
+		"idp_metadata_path":          section.KeyValue("idp_metadata_path").MustString(""),
+		"idp_metadata_url":           section.KeyValue("idp_metadata_url").MustString(""),
+		"max_issue_delay":            section.KeyValue("max_issue_delay").MustDuration(90 * time.Second),
+		"metadata_valid_duration":    section.KeyValue("metadata_valid_duration").MustDuration(48 * time.Hour),
+		"allow_idp_initiated":        section.KeyValue("allow_idp_initiated").MustBool(false),
+		"relay_state":                section.KeyValue("relay_state").MustString(""),
+		"assertion_attribute_name":   section.KeyValue("assertion_attribute_name").MustString(""),
+		"assertion_attribute_login":  section.KeyValue("assertion_attribute_login").MustString(""),
+		"assertion_attribute_email":  section.KeyValue("assertion_attribute_email").MustString(""),
+		"assertion_attribute_groups": section.KeyValue("assertion_attribute_groups").MustString(""),
+		"assertion_attribute_role":   section.KeyValue("assertion_attribute_role").MustString(""),
+		"assertion_attribute_org":    section.KeyValue("assertion_attribute_org").MustString(""),
+		"allowed_organizations":      section.KeyValue("allowed_organizations").MustString(""),
+		"org_mapping":                section.KeyValue("org_mapping").MustString(""),
+		"role_values_editor":         section.KeyValue("role_values_editor").MustString(""),
+		"role_values_admin":          section.KeyValue("role_values_admin").MustString(""),
+		"role_values_grafana_admin":  section.KeyValue("role_values_grafana_admin").MustString(""),
+		"name_id_format":             section.KeyValue("name_id_format").MustString(""),
+		"skip_org_role_sync":         section.KeyValue("skip_org_role_sync").MustBool(false),
+		"role_values_none":           section.KeyValue("role_values_none").MustString(""),
+	}
+	return result
+}
diff --git a/pkg/services/ssosettings/strategies/saml_strategy_test.go b/pkg/services/ssosettings/strategies/saml_strategy_test.go
new file mode 100644
index 0000000000000..974561949c671
--- /dev/null
+++ b/pkg/services/ssosettings/strategies/saml_strategy_test.go
@@ -0,0 +1,103 @@
+package strategies
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"gopkg.in/ini.v1"
+
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/stretchr/testify/require"
+)
+
+var (
+	iniSAMLContent = `
+	[auth.saml]
+	enabled = true
+	single_logout = true
+	allow_sign_up = true
+	auto_login = false
+	certificate = devenv/docker/blocks/auth/saml-enterprise/cert.crt
+	certificate_path = /path/to/cert
+	private_key = dGhpcyBpcyBteSBwcml2YXRlIGtleSB0aGF0IEkgd2FudCB0byBnZXQgZW5jb2RlZCBpbiBiYXNlIDY0
+	private_key_path = devenv/docker/blocks/auth/saml-enterprise/key.pem
+	signature_algorithm = rsa-sha256
+	idp_metadata = dGhpcyBpcyBteSBwcml2YXRlIGtleSB0aGF0IEkgd2FudCB0byBnZXQgZW5jb2RlZCBpbiBiYXNlIDY0
+	idp_metadata_path = /path/to/metadata
+	idp_metadata_url = http://localhost:8086/realms/grafana/protocol/saml/descriptor
+	max_issue_delay = 90s
+	metadata_valid_duration = 48h
+	allow_idp_initiated = false
+	relay_state = relay_state
+	assertion_attribute_name = name
+	assertion_attribute_login = login
+	assertion_attribute_email = email
+	assertion_attribute_groups = groups
+	assertion_attribute_role = roles
+	assertion_attribute_org = orgs
+	allowed_organizations = org1 org2
+	org_mapping = org1:1:editor, *:2:viewer
+	role_values_editor = editor
+	role_values_admin = admin
+	role_values_grafana_admin = serveradmin
+	name_id_format = urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress
+	skip_org_role_sync = false
+	role_values_none = guest disabled
+	`
+
+	expectedSAMLInfo = map[string]any{
+		"enabled":                    true,
+		"single_logout":              true,
+		"allow_sign_up":              true,
+		"auto_login":                 false,
+		"certificate":                "devenv/docker/blocks/auth/saml-enterprise/cert.crt",
+		"certificate_path":           "/path/to/cert",
+		"private_key":                "dGhpcyBpcyBteSBwcml2YXRlIGtleSB0aGF0IEkgd2FudCB0byBnZXQgZW5jb2RlZCBpbiBiYXNlIDY0",
+		"private_key_path":           "devenv/docker/blocks/auth/saml-enterprise/key.pem",
+		"signature_algorithm":        "rsa-sha256",
+		"idp_metadata":               "dGhpcyBpcyBteSBwcml2YXRlIGtleSB0aGF0IEkgd2FudCB0byBnZXQgZW5jb2RlZCBpbiBiYXNlIDY0",
+		"idp_metadata_path":          "/path/to/metadata",
+		"idp_metadata_url":           "http://localhost:8086/realms/grafana/protocol/saml/descriptor",
+		"max_issue_delay":            90 * time.Second,
+		"metadata_valid_duration":    48 * time.Hour,
+		"allow_idp_initiated":        false,
+		"relay_state":                "relay_state",
+		"assertion_attribute_name":   "name",
+		"assertion_attribute_login":  "login",
+		"assertion_attribute_email":  "email",
+		"assertion_attribute_groups": "groups",
+		"assertion_attribute_role":   "roles",
+		"assertion_attribute_org":    "orgs",
+		"allowed_organizations":      "org1 org2",
+		"org_mapping":                "org1:1:editor, *:2:viewer",
+		"role_values_editor":         "editor",
+		"role_values_admin":          "admin",
+		"role_values_grafana_admin":  "serveradmin",
+		"name_id_format":             "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress",
+		"skip_org_role_sync":         false,
+		"role_values_none":           "guest disabled",
+	}
+)
+
+func TestSAMLIsMatch(t *testing.T) {
+	cfg := setting.NewCfg()
+	strategy := NewSAMLStrategy(&setting.OSSImpl{Cfg: cfg})
+	require.True(t, strategy.IsMatch("saml"))
+	require.False(t, strategy.IsMatch("oauth"))
+}
+
+func TestSAMLGetProviderConfig(t *testing.T) {
+	configurationFile, err := ini.Load([]byte(iniSAMLContent))
+	require.NoError(t, err)
+
+	cfg := setting.NewCfg()
+	cfg.Raw = configurationFile
+
+	strategy := NewSAMLStrategy(&setting.OSSImpl{Cfg: cfg})
+
+	result, err := strategy.GetProviderConfig(context.Background(), "saml")
+	require.NoError(t, err)
+
+	require.Equal(t, expectedSAMLInfo, result)
+}
diff --git a/pkg/services/ssosettings/validation/oauth_validators.go b/pkg/services/ssosettings/validation/oauth_validators.go
new file mode 100644
index 0000000000000..23c8b25660123
--- /dev/null
+++ b/pkg/services/ssosettings/validation/oauth_validators.go
@@ -0,0 +1,69 @@
+package validation
+
+import (
+	"fmt"
+	"net/url"
+	"strings"
+
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+)
+
+func AllowAssignGrafanaAdminValidator(info *social.OAuthInfo, requester identity.Requester) error {
+	if info.AllowAssignGrafanaAdmin && !requester.GetIsGrafanaAdmin() {
+		return ssosettings.ErrInvalidOAuthConfig("Allow assign Grafana Admin can only be updated by Grafana Server Admins.")
+	}
+	return nil
+}
+
+func SkipOrgRoleSyncAllowAssignGrafanaAdminValidator(info *social.OAuthInfo, requester identity.Requester) error {
+	if info.AllowAssignGrafanaAdmin && info.SkipOrgRoleSync {
+		return ssosettings.ErrInvalidOAuthConfig("Allow assign Grafana Admin and Skip org role sync are both set thus Grafana Admin role will not be synced. Consider setting one or the other.")
+	}
+	return nil
+}
+
+func RequiredValidator(value string, name string) ssosettings.ValidateFunc[social.OAuthInfo] {
+	return func(info *social.OAuthInfo, requester identity.Requester) error {
+		if value == "" {
+			return ssosettings.ErrInvalidOAuthConfig(fmt.Sprintf("%s is required.", name))
+		}
+		return nil
+	}
+}
+
+func UrlValidator(value string, name string) ssosettings.ValidateFunc[social.OAuthInfo] {
+	return func(info *social.OAuthInfo, requester identity.Requester) error {
+		if !isValidUrl(value) {
+			return ssosettings.ErrInvalidOAuthConfig(fmt.Sprintf("%s is an invalid URL.", name))
+		}
+		return nil
+	}
+}
+
+func RequiredUrlValidator(value string, name string) ssosettings.ValidateFunc[social.OAuthInfo] {
+	return func(info *social.OAuthInfo, requester identity.Requester) error {
+		if err := RequiredValidator(value, name)(info, requester); err != nil {
+			return err
+		}
+		return UrlValidator(value, name)(info, requester)
+	}
+}
+
+func MustBeEmptyValidator(value string, name string) ssosettings.ValidateFunc[social.OAuthInfo] {
+	return func(info *social.OAuthInfo, requester identity.Requester) error {
+		if value != "" {
+			return ssosettings.ErrInvalidOAuthConfig(fmt.Sprintf("%s must be empty.", name))
+		}
+		return nil
+	}
+}
+
+func isValidUrl(actual string) bool {
+	parsed, err := url.ParseRequestURI(actual)
+	if err != nil {
+		return false
+	}
+	return strings.HasPrefix(parsed.Scheme, "http") && parsed.Host != ""
+}
diff --git a/pkg/services/ssosettings/validation/oauth_validators_test.go b/pkg/services/ssosettings/validation/oauth_validators_test.go
new file mode 100644
index 0000000000000..1435fa110b974
--- /dev/null
+++ b/pkg/services/ssosettings/validation/oauth_validators_test.go
@@ -0,0 +1,154 @@
+package validation
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/stretchr/testify/require"
+)
+
+type testCase struct {
+	name      string
+	input     *social.OAuthInfo
+	requester identity.Requester
+	wantErr   error
+}
+
+func TestUrlValidator(t *testing.T) {
+	tc := []testCase{
+		{
+			name: "passes when url is valid",
+			input: &social.OAuthInfo{
+				AuthUrl: "https://example.com/auth",
+			},
+			wantErr: nil,
+		},
+		{
+			name: "fails when url is invalid",
+			input: &social.OAuthInfo{
+				AuthUrl: "file://etc",
+			},
+			wantErr: ssosettings.ErrInvalidOAuthConfig("Auth URL is an invalid URL."),
+		},
+	}
+
+	for _, tt := range tc {
+		t.Run(tt.name, func(t *testing.T) {
+			err := UrlValidator(tt.input.AuthUrl, "Auth URL")(tt.input, tt.requester)
+			if tt.wantErr != nil {
+				require.ErrorIs(t, err, tt.wantErr)
+				return
+			}
+			require.NoError(t, err)
+		})
+	}
+}
+
+func TestRequiredValidator(t *testing.T) {
+	tc := []testCase{
+		{
+			name: "passes when client id is not empty",
+			input: &social.OAuthInfo{
+				ClientId: "client-id",
+			},
+			wantErr: nil,
+		},
+		{
+			name: "fails when client id is empty",
+			input: &social.OAuthInfo{
+				ClientId: "",
+			},
+			wantErr: ssosettings.ErrInvalidOAuthConfig("Client Id is required."),
+		},
+	}
+
+	for _, tt := range tc {
+		t.Run(tt.name, func(t *testing.T) {
+			err := RequiredValidator(tt.input.ClientId, "Client Id")(tt.input, tt.requester)
+			if tt.wantErr != nil {
+				require.ErrorIs(t, err, tt.wantErr)
+				return
+			}
+			require.NoError(t, err)
+		})
+	}
+}
+
+func TestAllowAssignGrafanaAdminValidator(t *testing.T) {
+	tc := []testCase{
+		{
+			name: "passes when user is grafana admin and allow assign grafana admin is true",
+			input: &social.OAuthInfo{
+				AllowAssignGrafanaAdmin: true,
+			},
+			requester: &user.SignedInUser{
+				IsGrafanaAdmin: true,
+			},
+			wantErr: nil,
+		},
+		{
+			name: "fails when user is not grafana admin and allow assign grafana admin is true",
+			input: &social.OAuthInfo{
+				AllowAssignGrafanaAdmin: true,
+			},
+			requester: &user.SignedInUser{
+				IsGrafanaAdmin: false,
+			},
+			wantErr: ssosettings.ErrInvalidOAuthConfig("Allow assign Grafana Admin can only be updated by Grafana Server Admins."),
+		},
+	}
+
+	for _, tt := range tc {
+		t.Run(tt.name, func(t *testing.T) {
+			err := AllowAssignGrafanaAdminValidator(tt.input, tt.requester)
+			if tt.wantErr != nil {
+				require.ErrorIs(t, err, tt.wantErr)
+				return
+			}
+			require.NoError(t, err)
+		})
+	}
+}
+
+func TestSkipOrgRoleSyncAllowAssignGrafanaAdminValidator(t *testing.T) {
+	tc := []testCase{
+		{
+			name: "passes when allow assign grafana admin is set, but skip org role sync is not set",
+			input: &social.OAuthInfo{
+				AllowAssignGrafanaAdmin: true,
+				SkipOrgRoleSync:         false,
+			},
+			wantErr: nil,
+		},
+		{
+			name: "passes when allow assign grafana admin is not set, but skip org role sync is set",
+			input: &social.OAuthInfo{
+				AllowAssignGrafanaAdmin: false,
+				SkipOrgRoleSync:         true,
+			},
+			wantErr: nil,
+		},
+		{
+			name: "fails when both allow assign grafana admin and skip org role sync is set",
+			input: &social.OAuthInfo{
+				AllowAssignGrafanaAdmin: true,
+				SkipOrgRoleSync:         true,
+			},
+			wantErr: ssosettings.ErrInvalidOAuthConfig("Allow assign Grafana Admin and Skip org role sync are both set thus Grafana Admin role will not be synced. Consider setting one or the other."),
+		},
+	}
+
+	for _, tt := range tc {
+		t.Run(tt.name, func(t *testing.T) {
+			err := SkipOrgRoleSyncAllowAssignGrafanaAdminValidator(tt.input, nil)
+			if tt.wantErr != nil {
+				require.ErrorIs(t, err, tt.wantErr)
+				return
+			}
+			require.NoError(t, err)
+		})
+	}
+}
diff --git a/pkg/services/ssosettings/validation/validator.go b/pkg/services/ssosettings/validation/validator.go
new file mode 100644
index 0000000000000..b235f7f41cb7a
--- /dev/null
+++ b/pkg/services/ssosettings/validation/validator.go
@@ -0,0 +1,16 @@
+package validation
+
+import (
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/ssosettings"
+)
+
+func Validate(info *social.OAuthInfo, requester identity.Requester, validators ...ssosettings.ValidateFunc[social.OAuthInfo]) error {
+	for _, validatorFunc := range validators {
+		if err := validatorFunc(info, requester); err != nil {
+			return err
+		}
+	}
+	return nil
+}
diff --git a/pkg/services/star/starimpl/sqlx_store.go b/pkg/services/star/starimpl/sqlx_store.go
deleted file mode 100644
index 305229fe3e05e..0000000000000
--- a/pkg/services/star/starimpl/sqlx_store.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package starimpl
-
-import (
-	"context"
-	"database/sql"
-	"errors"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/sqlstore/session"
-	"github.com/grafana/grafana/pkg/services/star"
-)
-
-type sqlxStore struct {
-	sess *session.SessionDB
-	db   db.DB
-}
-
-func (s *sqlxStore) Get(ctx context.Context, query *star.IsStarredByUserQuery) (bool, error) {
-	var star_res star.Star
-	err := s.sess.Get(ctx, &star_res, "SELECT * from star where user_id=? and dashboard_id=?", query.UserID, query.DashboardID)
-	if err != nil {
-		if errors.Is(err, sql.ErrNoRows) {
-			return false, nil
-		}
-		return false, err
-	}
-	return true, nil
-}
-
-func (s *sqlxStore) Insert(ctx context.Context, cmd *star.StarDashboardCommand) error {
-	entity := star.Star{
-		UserID:      cmd.UserID,
-		DashboardID: cmd.DashboardID,
-	}
-	_, err := s.sess.NamedExec(ctx, `INSERT INTO star (user_id, dashboard_id) VALUES (:user_id, :dashboard_id)`, entity)
-	if s.db.GetDialect().IsUniqueConstraintViolation(err) {
-		return nil
-	}
-	if err != nil {
-		return err
-	}
-	return err
-}
-
-func (s *sqlxStore) Delete(ctx context.Context, cmd *star.UnstarDashboardCommand) error {
-	_, err := s.sess.Exec(ctx, "DELETE FROM star WHERE user_id=? and dashboard_id=?", cmd.UserID, cmd.DashboardID)
-	return err
-}
-
-func (s *sqlxStore) DeleteByUser(ctx context.Context, userID int64) error {
-	_, err := s.sess.Exec(ctx, "DELETE FROM star WHERE user_id = ?", userID)
-	return err
-}
-
-func (s *sqlxStore) List(ctx context.Context, query *star.GetUserStarsQuery) (*star.GetUserStarsResult, error) {
-	userStars := make(map[int64]bool)
-	var stars = make([]star.Star, 0)
-	err := s.sess.Select(ctx, &stars, "SELECT * FROM star WHERE user_id=?", query.UserID)
-	if err != nil {
-		return nil, err
-	}
-	for _, star := range stars {
-		userStars[star.DashboardID] = true
-	}
-
-	return &star.GetUserStarsResult{UserStars: userStars}, err
-}
diff --git a/pkg/services/star/starimpl/sqlx_store_test.go b/pkg/services/star/starimpl/sqlx_store_test.go
deleted file mode 100644
index edff42ea5f479..0000000000000
--- a/pkg/services/star/starimpl/sqlx_store_test.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package starimpl
-
-import (
-	"testing"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-)
-
-func TestIntegrationSQLxUserStarsDataAccess(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	testIntegrationUserStarsDataAccess(t, func(ss db.DB) store {
-		return &sqlxStore{sess: ss.GetSqlxSession(), db: ss}
-	})
-}
diff --git a/pkg/services/star/starimpl/star.go b/pkg/services/star/starimpl/star.go
index adc49002c4730..fe1d593af618d 100644
--- a/pkg/services/star/starimpl/star.go
+++ b/pkg/services/star/starimpl/star.go
@@ -4,24 +4,14 @@ import (
 	"context"
 
 	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/star"
-	"github.com/grafana/grafana/pkg/setting"
 )
 
 type Service struct {
 	store store
 }
 
-func ProvideService(db db.DB, cfg *setting.Cfg) star.Service {
-	if cfg.IsFeatureToggleEnabled(featuremgmt.FlagNewDBLibrary) {
-		return &Service{
-			store: &sqlxStore{
-				sess: db.GetSqlxSession(),
-				db:   db,
-			},
-		}
-	}
+func ProvideService(db db.DB) star.Service {
 	return &Service{
 		store: &sqlStore{
 			db: db,
diff --git a/pkg/services/star/starimpl/store_test.go b/pkg/services/star/starimpl/store_test.go
index 52bb12cfde493..1b725ca522499 100644
--- a/pkg/services/star/starimpl/store_test.go
+++ b/pkg/services/star/starimpl/store_test.go
@@ -8,8 +8,13 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/services/star"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 type getStore func(db.DB) store
 
 func testIntegrationUserStarsDataAccess(t *testing.T, fn getStore) {
diff --git a/pkg/services/stats/models.go b/pkg/services/stats/models.go
index ea6ae9eecb36c..bf1531d95c2f1 100644
--- a/pkg/services/stats/models.go
+++ b/pkg/services/stats/models.go
@@ -26,6 +26,7 @@ type SystemStats struct {
 	DashboardVersions         int64
 	Annotations               int64
 	AlertRules                int64
+	RuleGroups                int64
 	LibraryPanels             int64
 	LibraryVariables          int64
 	DashboardsViewersCanEdit  int64
@@ -77,6 +78,9 @@ type NotifierUsageStats struct {
 
 type GetAlertNotifierUsageStatsQuery struct{}
 
+type AnonymousStats struct {
+	ActiveDevices int64 `json:"activeDevices"`
+}
 type AdminStats struct {
 	Orgs                int64 `json:"orgs"`
 	Dashboards          int64 `json:"dashboards"`
@@ -101,6 +105,7 @@ type AdminStats struct {
 	DailyActiveViewers  int64 `json:"dailyActiveViewers"`
 	DailyActiveSessions int64 `json:"dailyActiveSessions"`
 	MonthlyActiveUsers  int64 `json:"monthlyActiveUsers"`
+	AnonymousStats
 }
 
 type GetAdminStatsQuery struct{}
diff --git a/pkg/services/stats/statsimpl/stats.go b/pkg/services/stats/statsimpl/stats.go
index 1377dc8932c5a..e2139c80b57df 100644
--- a/pkg/services/stats/statsimpl/stats.go
+++ b/pkg/services/stats/statsimpl/stats.go
@@ -7,7 +7,6 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/libraryelements/model"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
@@ -93,27 +92,6 @@ func (ss *sqlStatsService) GetSystemStats(ctx context.Context, query *stats.GetS
 		sb.Write(`(SELECT MAX(LENGTH(data)) FROM `+dialect.Quote("dashboard")+` WHERE is_folder = ?) AS dashboard_bytes_max,`, dialect.BooleanStr(false))
 		sb.Write(`(SELECT COUNT(id) FROM `+dialect.Quote("dashboard")+` WHERE is_folder = ?) AS folders,`, dialect.BooleanStr(true))
 
-		sb.Write(`(
-		SELECT COUNT(acl.id)
-		FROM `+dialect.Quote("dashboard_acl")+` AS acl
-			INNER JOIN `+dialect.Quote("dashboard")+` AS d
-			ON d.id = acl.dashboard_id
-		WHERE d.is_folder = ?
-	) AS dashboard_permissions,`, dialect.BooleanStr(false))
-
-		sb.Write(`(
-		SELECT COUNT(acl.id)
-		FROM `+dialect.Quote("dashboard_acl")+` AS acl
-			INNER JOIN `+dialect.Quote("dashboard")+` AS d
-			ON d.id = acl.dashboard_id
-		WHERE d.is_folder = ?
-	) AS folder_permissions,`, dialect.BooleanStr(true))
-
-		sb.Write(viewersPermissionsCounterSQL(ss.db, "dashboards_viewers_can_edit", false, dashboards.PERMISSION_EDIT))
-		sb.Write(viewersPermissionsCounterSQL(ss.db, "dashboards_viewers_can_admin", false, dashboards.PERMISSION_ADMIN))
-		sb.Write(viewersPermissionsCounterSQL(ss.db, "folders_viewers_can_edit", true, dashboards.PERMISSION_EDIT))
-		sb.Write(viewersPermissionsCounterSQL(ss.db, "folders_viewers_can_admin", true, dashboards.PERMISSION_ADMIN))
-
 		sb.Write(`(SELECT COUNT(id) FROM ` + dialect.Quote("dashboard_provisioning") + `) AS provisioned_dashboards,`)
 		sb.Write(`(SELECT COUNT(id) FROM ` + dialect.Quote("dashboard_snapshot") + `) AS snapshots,`)
 		sb.Write(`(SELECT COUNT(id) FROM ` + dialect.Quote("dashboard_version") + `) AS dashboard_versions,`)
@@ -128,6 +106,9 @@ func (ss *sqlStatsService) GetSystemStats(ctx context.Context, query *stats.GetS
 		sb.Write(`(SELECT COUNT(*) FROM ` + dialect.Quote("data_keys") + `WHERE active = true) AS active_data_keys,`)
 		sb.Write(`(SELECT COUNT(*) FROM ` + dialect.Quote("dashboard_public") + `) AS public_dashboards,`)
 		sb.Write(`(SELECT MIN(timestamp) FROM ` + dialect.Quote("migration_log") + `) AS database_created_time,`)
+		if ss.IsUnifiedAlertingEnabled() {
+			sb.Write(`(SELECT COUNT(DISTINCT (` + dialect.Quote("rule_group") + `)) FROM ` + dialect.Quote("alert_rule") + `) AS rule_groups,`)
+		}
 
 		sb.Write(ss.roleCounterSQL(ctx))
 
@@ -166,19 +147,6 @@ func (ss *sqlStatsService) roleCounterSQL(ctx context.Context) string {
 	return sqlQuery
 }
 
-func viewersPermissionsCounterSQL(db db.DB, statName string, isFolder bool, permission dashboards.PermissionType) string {
-	dialect := db.GetDialect()
-	return `(
-		SELECT COUNT(*)
-		FROM ` + dialect.Quote("dashboard_acl") + ` AS acl
-			INNER JOIN ` + dialect.Quote("dashboard") + ` AS d
-			ON d.id = acl.dashboard_id
-		WHERE acl.role = '` + string(org.RoleViewer) + `'
-			AND d.is_folder = ` + dialect.BooleanStr(isFolder) + `
-			AND acl.permission = ` + strconv.FormatInt(int64(permission), 10) + `
-	) AS ` + statName + `, `
-}
-
 func (ss *sqlStatsService) GetAdminStats(ctx context.Context, query *stats.GetAdminStatsQuery) (result *stats.AdminStats, err error) {
 	err = ss.db.WithDbSession(ctx, func(dbSession *db.Session) error {
 		dialect := ss.db.GetDialect()
diff --git a/pkg/services/stats/statsimpl/stats_test.go b/pkg/services/stats/statsimpl/stats_test.go
index 6b32590ed1866..de191803ac531 100644
--- a/pkg/services/stats/statsimpl/stats_test.go
+++ b/pkg/services/stats/statsimpl/stats_test.go
@@ -19,8 +19,13 @@ import (
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/user/userimpl"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationStatsDataAccess(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
diff --git a/pkg/services/stats/statstest/stats.go b/pkg/services/stats/statstest/stats.go
index 679a5d6878849..89245d6125158 100644
--- a/pkg/services/stats/statstest/stats.go
+++ b/pkg/services/stats/statstest/stats.go
@@ -7,6 +7,7 @@ import (
 )
 
 type FakeService struct {
+	ExpectedAdminStats             *stats.AdminStats
 	ExpectedSystemStats            *stats.SystemStats
 	ExpectedDataSourceStats        []*stats.DataSourceStats
 	ExpectedDataSourcesAccessStats []*stats.DataSourceAccessStats
@@ -20,7 +21,7 @@ func NewFakeService() *FakeService {
 }
 
 func (s *FakeService) GetAdminStats(ctx context.Context, query *stats.GetAdminStatsQuery) (*stats.AdminStats, error) {
-	return nil, s.ExpectedError
+	return s.ExpectedAdminStats, s.ExpectedError
 }
 
 func (s *FakeService) GetAlertNotifiersUsageStats(ctx context.Context, query *stats.GetAlertNotifierUsageStatsQuery) ([]*stats.NotifierUsageStats, error) {
diff --git a/pkg/services/store/config.go b/pkg/services/store/config.go
index 7fc6737f0c989..d2f86616702da 100644
--- a/pkg/services/store/config.go
+++ b/pkg/services/store/config.go
@@ -52,7 +52,7 @@ func LoadStorageConfig(cfg *setting.Cfg, features featuremgmt.FeatureToggles) (*
 	}
 
 	// Save a template version in config
-	if changed && setting.Env != setting.Prod {
+	if changed && cfg.Env != setting.Prod {
 		return g, g.save()
 	}
 	return g, nil
@@ -130,8 +130,6 @@ func newStorage(cfg RootStorageConfig, localWorkCache string) (storageRuntime, e
 	switch cfg.Type {
 	case rootStorageTypeDisk:
 		return newDiskStorage(RootStorageMeta{}, cfg), nil
-	case rootStorageTypeGit:
-		return newGitStorage(RootStorageMeta{}, cfg, localWorkCache), nil
 	}
 
 	return nil, fmt.Errorf("unsupported store: " + cfg.Type)
diff --git a/pkg/services/store/entity/README.md b/pkg/services/store/entity/README.md
new file mode 100644
index 0000000000000..6370ca6a803c4
--- /dev/null
+++ b/pkg/services/store/entity/README.md
@@ -0,0 +1,196 @@
+# Unified Storage
+
+The unified storage projects aims to provide a simple and extensible backend to unify the way we store different objects within the Grafana app platform.
+
+It provides generic storage for k8s objects, and can store data either within dedicated tables in the main Grafana database, or in separate storage.
+
+By default it runs in-process within Grafana, but it can also be run as a standalone GRPC service (`storage-server`).
+
+## Storage Overview
+
+There are 2 main tables, the `entity` table stores a "current" view of the objects, and the `entity_history` table stores a record of each revision of a given object.
+
+## Running Unified Storage
+
+### Baseline configuration
+
+The minimum config settings required are:
+
+```ini
+; dev mode is required
+app_mode = development
+; need to specify target here for override to work later
+target = all
+
+[server]
+; https is required for kubectl
+protocol = https
+
+[feature_toggles]
+; enable unified storage
+unifiedStorage = true
+; enable k8s apiserver
+grafanaAPIServer = true
+; store playlists in k8s
+kubernetesPlaylists = true
+; store json id token in context
+idForwarding = true
+
+[grafana-apiserver]
+; use unified storage for k8s apiserver
+storage_type = unified
+```
+
+With this configuration, you can run everything in-process. Run the Grafana backend with:
+
+```sh
+bra run
+```
+
+or 
+
+```sh
+make run
+```
+
+The default kubeconfig sends requests directly to the apiserver, to authenticate as a grafana user, create `grafana.kubeconfig`:
+```yaml
+apiVersion: v1
+clusters:
+- cluster:
+    insecure-skip-tls-verify: true
+    server: https://127.0.0.1:3000
+  name: default-cluster
+contexts:
+- context:
+    cluster: default-cluster
+    namespace: default
+    user: default
+  name: default-context
+current-context: default-context
+kind: Config
+preferences: {}
+users:
+- name: default
+  user:
+    username: <username>
+    password: <password>
+```
+Where `<username>` and `<password>` are credentials for basic auth against Grafana. For example, with the [default credentials](https://github.com/grafana/grafana/blob/HEAD/contribute/developer-guide.md#backend):
+```yaml
+    username: admin
+    password: admin
+```
+
+In this mode, you can interact with the k8s api. Make sure you are in the directory where you created `grafana.kubeconfig`. Then run:
+```sh
+kubectl --kubeconfig=./grafana.kubeconfig get playlist
+```
+
+If this is your first time running the command, a successful response would be:
+```sh
+No resources found in default namespace.
+```
+
+To create a playlist, create a file `playlist-generate.yaml`:
+```yaml
+apiVersion: playlist.grafana.app/v0alpha1
+kind: Playlist
+metadata:
+  generateName: x # anything is ok here... except yes or true -- they become boolean!
+  labels:
+    foo: bar
+spec:
+  title: Playlist with auto generated UID
+  interval: 5m
+  items:
+  - type: dashboard_by_tag
+    value: panel-tests
+  - type: dashboard_by_uid
+    value: vmie2cmWz # dashboard from devenv
+```
+then run:
+```sh
+kubectl --kubeconfig=./grafana.kubeconfig create -f playlist-generate.yaml
+```
+
+For example, a successful response would be:
+```sh
+playlist.playlist.grafana.app/u394j4d3-s63j-2d74-g8hf-958773jtybf2 created
+```
+
+When running 
+```sh
+kubectl --kubeconfig=./grafana.kubeconfig get playlist
+```
+you should now see something like:
+```sh
+NAME                                   TITLE                              INTERVAL   CREATED AT
+u394j4d3-s63j-2d74-g8hf-958773jtybf2   Playlist with auto generated UID   5m         2023-12-14T13:53:35Z 
+```
+
+### Use a separate database
+
+By default Unified Storage uses the Grafana database. To run against a separate database, update `custom.ini` by adding the following section to it:
+
+```
+[entity_api]
+db_type = mysql
+db_host = localhost:3306
+db_name = grafana
+db_user = <username>
+db_pass = <password>
+```
+
+MySQL and Postgres are both supported. The `<username>` and `<password>` values can be found in the following devenv docker compose files: [MySQL](https://github.com/grafana/grafana/blob/main/devenv/docker/blocks/mysql/docker-compose.yaml#L6-L7) and [Postgres](https://github.com/grafana/grafana/blob/main/devenv/docker/blocks/postgres/docker-compose.yaml#L4-L5).
+
+Then, run
+```sh
+make devenv sources=<source>
+```
+where source is either `mysql` or `postgres`.
+
+Finally, run the Grafana backend with
+
+```sh
+bra run
+```
+or
+```sh
+make run
+```
+
+### Run as a GRPC service
+
+#### Start GRPC storage-server
+
+This currently only works with a separate database configuration (see previous section).
+
+Start the storage-server with:
+```sh
+GF_DEFAULT_TARGET=storage-server ./bin/grafana server target
+```
+
+The GRPC service will listen on port 10000
+
+#### Use GRPC server
+
+To run grafana against the storage-server, override the `storage_type` setting:
+```sh
+GF_GRAFANA_APISERVER_STORAGE_TYPE=unified-grpc ./bin/grafana server
+```
+
+You can then list the previously-created playlists with:
+```sh
+kubectl --kubeconfig=./grafana.kubeconfig get playlist
+```
+
+## Changing protobuf interface
+
+- install [protoc](https://grpc.io/docs/protoc-installation/)
+- install the protocol compiler plugin for Go
+```sh
+go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
+```
+- make changes in `.proto` file
+- to compile all protobuf files in the repository run `make protobuf` at its top level
diff --git a/pkg/services/store/entity/client_wrapper.go b/pkg/services/store/entity/client_wrapper.go
new file mode 100644
index 0000000000000..18d151e985180
--- /dev/null
+++ b/pkg/services/store/entity/client_wrapper.go
@@ -0,0 +1,30 @@
+package entity
+
+import (
+	"github.com/fullstorydev/grpchan"
+	"github.com/fullstorydev/grpchan/inprocgrpc"
+	grpcAuth "github.com/grpc-ecosystem/go-grpc-middleware/auth"
+	"google.golang.org/grpc"
+
+	grpcUtils "github.com/grafana/grafana/pkg/services/store/entity/grpc"
+)
+
+func NewEntityStoreClientLocal(server EntityStoreServer) EntityStoreClient {
+	channel := &inprocgrpc.Channel{}
+
+	auth := &grpcUtils.Authenticator{}
+
+	channel.RegisterService(
+		grpchan.InterceptServer(
+			&EntityStore_ServiceDesc,
+			grpcAuth.UnaryServerInterceptor(auth.Authenticate),
+			grpcAuth.StreamServerInterceptor(auth.Authenticate),
+		),
+		server,
+	)
+	return NewEntityStoreClient(grpchan.InterceptClientConn(channel, grpcUtils.UnaryClientInterceptor, grpcUtils.StreamClientInterceptor))
+}
+
+func NewEntityStoreClientGRPC(channel *grpc.ClientConn) EntityStoreClient {
+	return NewEntityStoreClient(grpchan.InterceptClientConn(channel, grpcUtils.UnaryClientInterceptor, grpcUtils.StreamClientInterceptor))
+}
diff --git a/pkg/services/store/entity/db/dbimpl/dbimpl.go b/pkg/services/store/entity/db/dbimpl/dbimpl.go
new file mode 100644
index 0000000000000..ff623fe999e97
--- /dev/null
+++ b/pkg/services/store/entity/db/dbimpl/dbimpl.go
@@ -0,0 +1,155 @@
+package dbimpl
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/sqlstore/session"
+	entitydb "github.com/grafana/grafana/pkg/services/store/entity/db"
+	"github.com/grafana/grafana/pkg/services/store/entity/db/migrations"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util"
+	"github.com/jmoiron/sqlx"
+	"xorm.io/xorm"
+)
+
+var _ entitydb.EntityDBInterface = (*EntityDB)(nil)
+
+func ProvideEntityDB(db db.DB, cfg *setting.Cfg, features featuremgmt.FeatureToggles) (*EntityDB, error) {
+	return &EntityDB{
+		db:       db,
+		cfg:      cfg,
+		features: features,
+		log:      log.New("entity-db"),
+	}, nil
+}
+
+type EntityDB struct {
+	db       db.DB
+	features featuremgmt.FeatureToggles
+	engine   *xorm.Engine
+	cfg      *setting.Cfg
+	log      log.Logger
+}
+
+func (db *EntityDB) Init() error {
+	_, err := db.GetEngine()
+	return err
+}
+
+func (db *EntityDB) GetEngine() (*xorm.Engine, error) {
+	if db.engine != nil {
+		return db.engine, nil
+	}
+
+	var engine *xorm.Engine
+	var err error
+
+	cfgSection := db.cfg.SectionWithEnvOverrides("entity_api")
+	dbType := cfgSection.Key("db_type").MustString("")
+
+	// if explicit connection settings are provided, use them
+	if dbType != "" {
+		dbHost := cfgSection.Key("db_host").MustString("")
+		dbName := cfgSection.Key("db_name").MustString("")
+		dbUser := cfgSection.Key("db_user").MustString("")
+		dbPass := cfgSection.Key("db_pass").MustString("")
+
+		if dbType == "postgres" {
+			// TODO: support all postgres connection options
+			dbSslMode := cfgSection.Key("db_sslmode").MustString("disable")
+
+			addr, err := util.SplitHostPortDefault(dbHost, "127.0.0.1", "5432")
+			if err != nil {
+				return nil, fmt.Errorf("invalid host specifier '%s': %w", dbHost, err)
+			}
+
+			connectionString := fmt.Sprintf(
+				"user=%s password=%s host=%s port=%s dbname=%s sslmode=%s", // sslcert=%s sslkey=%s sslrootcert=%s",
+				dbUser, dbPass, addr.Host, addr.Port, dbName, dbSslMode, // ss.dbCfg.ClientCertPath, ss.dbCfg.ClientKeyPath, ss.dbCfg.CaCertPath
+			)
+
+			engine, err = xorm.NewEngine("postgres", connectionString)
+			if err != nil {
+				return nil, err
+			}
+
+			// FIXME: this config option is cockroachdb-specific, it's not supported by postgres
+			_, err = engine.Exec("SET SESSION enable_experimental_alter_column_type_general=true")
+			if err != nil {
+				db.log.Error("error connecting to postgres", "msg", err.Error())
+				// FIXME: return nil, err
+			}
+		} else if dbType == "mysql" {
+			// TODO: support all mysql connection options
+			protocol := "tcp"
+			if strings.HasPrefix(dbHost, "/") {
+				protocol = "unix"
+			}
+
+			connectionString := fmt.Sprintf("%s:%s@%s(%s)/%s?collation=utf8mb4_unicode_ci&allowNativePasswords=true&clientFoundRows=true",
+				dbUser, dbPass, protocol, dbHost, dbName)
+
+			engine, err = xorm.NewEngine("mysql", connectionString)
+			if err != nil {
+				return nil, err
+			}
+
+			engine.SetMaxOpenConns(0)
+			engine.SetMaxIdleConns(2)
+			engine.SetConnMaxLifetime(time.Second * time.Duration(14400))
+
+			_, err = engine.Exec("SELECT 1")
+			if err != nil {
+				return nil, err
+			}
+		} else {
+			// TODO: sqlite support
+			return nil, fmt.Errorf("invalid db type specified: %s", dbType)
+		}
+
+		// configure sql logging
+		debugSQL := cfgSection.Key("log_queries").MustBool(false)
+		if !debugSQL {
+			engine.SetLogger(&xorm.DiscardLogger{})
+		} else {
+			// add stack to database calls to be able to see what repository initiated queries. Top 7 items from the stack as they are likely in the xorm library.
+			// engine.SetLogger(sqlstore.NewXormLogger(log.LvlInfo, log.WithSuffix(log.New("sqlstore.xorm"), log.CallerContextKey, log.StackCaller(log.DefaultCallerDepth))))
+			engine.ShowSQL(true)
+			engine.ShowExecTime(true)
+		}
+		// otherwise, try to use the grafana db connection
+	} else {
+		if db.db == nil {
+			return nil, fmt.Errorf("no db connection provided")
+		}
+
+		engine = db.db.GetEngine()
+	}
+
+	db.engine = engine
+
+	if err := migrations.MigrateEntityStore(db, db.features); err != nil {
+		db.engine = nil
+		return nil, err
+	}
+
+	return db.engine, nil
+}
+
+func (db *EntityDB) GetSession() (*session.SessionDB, error) {
+	engine, err := db.GetEngine()
+	if err != nil {
+		return nil, err
+	}
+
+	return session.GetSession(sqlx.NewDb(engine.DB().DB, engine.DriverName())), nil
+}
+
+func (db *EntityDB) GetCfg() *setting.Cfg {
+	return db.cfg
+}
diff --git a/pkg/services/store/entity/db/migrations/entity_store_mig.go b/pkg/services/store/entity/db/migrations/entity_store_mig.go
new file mode 100644
index 0000000000000..81f194562a585
--- /dev/null
+++ b/pkg/services/store/entity/db/migrations/entity_store_mig.go
@@ -0,0 +1,200 @@
+package migrations
+
+import (
+	"fmt"
+
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+)
+
+func initEntityTables(mg *migrator.Migrator) string {
+	marker := "Initialize entity tables (v15)" // changing this key wipe+rewrite everything
+	mg.AddMigration(marker, &migrator.RawSQLMigration{})
+
+	tables := []migrator.Table{}
+	tables = append(tables, migrator.Table{
+		Name: "entity",
+		Columns: []*migrator.Column{
+			// primary identifier
+			{Name: "guid", Type: migrator.DB_NVarchar, Length: 36, Nullable: false, IsPrimaryKey: true},
+			{Name: "resource_version", Type: migrator.DB_BigInt, Nullable: false},
+
+			// The entity identifier (TODO: remove -- this is a duplicate)
+			{Name: "key", Type: migrator.DB_Text, Nullable: false},
+
+			// K8s Identity group+(version)+namespace+resource+name
+			{Name: "group", Type: migrator.DB_NVarchar, Length: 190, Nullable: false},
+			{Name: "group_version", Type: migrator.DB_NVarchar, Length: 190, Nullable: false},
+			{Name: "resource", Type: migrator.DB_NVarchar, Length: 190, Nullable: false},
+			{Name: "namespace", Type: migrator.DB_NVarchar, Length: 63, Nullable: false},
+			{Name: "name", Type: migrator.DB_NVarchar, Length: 190, Nullable: false},
+
+			{Name: "folder", Type: migrator.DB_NVarchar, Length: 190, Nullable: false}, // uid of folder
+
+			// The raw entity body (any byte array)
+			{Name: "meta", Type: migrator.DB_Text, Nullable: true},     // raw meta object from k8s (with standard stuff removed)
+			{Name: "body", Type: migrator.DB_LongText, Nullable: true}, // null when nested or remote
+			{Name: "status", Type: migrator.DB_Text, Nullable: true},   // raw status object
+
+			{Name: "size", Type: migrator.DB_BigInt, Nullable: false},
+			{Name: "etag", Type: migrator.DB_NVarchar, Length: 32, Nullable: false, IsLatin: true}, // md5(body)
+
+			// Who changed what when
+			{Name: "created_at", Type: migrator.DB_BigInt, Nullable: false},
+			{Name: "created_by", Type: migrator.DB_NVarchar, Length: 190, Nullable: false},
+			{Name: "updated_at", Type: migrator.DB_BigInt, Nullable: false},
+			{Name: "updated_by", Type: migrator.DB_NVarchar, Length: 190, Nullable: false},
+
+			// Mark objects with origin metadata
+			{Name: "origin", Type: migrator.DB_NVarchar, Length: 40, Nullable: false},
+			{Name: "origin_key", Type: migrator.DB_Text, Nullable: false},
+			{Name: "origin_ts", Type: migrator.DB_BigInt, Nullable: false},
+
+			// Metadata
+			{Name: "title", Type: migrator.DB_NVarchar, Length: 190, Nullable: false},
+			{Name: "slug", Type: migrator.DB_NVarchar, Length: 190, Nullable: false}, // from title
+			{Name: "description", Type: migrator.DB_Text, Nullable: true},
+
+			// Commit message
+			{Name: "message", Type: migrator.DB_Text, Nullable: false}, // defaults to empty string
+			{Name: "labels", Type: migrator.DB_Text, Nullable: true},   // JSON object
+			{Name: "fields", Type: migrator.DB_Text, Nullable: true},   // JSON object
+			{Name: "errors", Type: migrator.DB_Text, Nullable: true},   // JSON object
+
+			{Name: "action", Type: migrator.DB_Int, Nullable: false}, // 1: create, 2: update, 3: delete
+		},
+		Indices: []*migrator.Index{
+			// The keys are ordered for efficiency in mysql queries, not URL consistency
+			{Cols: []string{"namespace", "group", "resource", "name"}, Type: migrator.UniqueIndex}, // == key
+			{Cols: []string{"folder"}, Type: migrator.IndexType},
+		},
+	})
+
+	tables = append(tables, migrator.Table{
+		Name: "entity_history",
+		Columns: []*migrator.Column{
+			// only difference from entity table is that we store multiple versions of the same entity
+			// so we have a unique index on guid+version instead of guid as primary key
+			{Name: "guid", Type: migrator.DB_NVarchar, Length: 36, Nullable: false},
+			{Name: "resource_version", Type: migrator.DB_BigInt, Nullable: false},
+
+			// The entity identifier (TODO: remove -- this is a duplicate)
+			{Name: "key", Type: migrator.DB_Text, Nullable: false},
+
+			// K8s Identity group+(version)+namespace+resource+name
+			{Name: "group", Type: migrator.DB_NVarchar, Length: 190, Nullable: false},
+			{Name: "group_version", Type: migrator.DB_NVarchar, Length: 190, Nullable: false},
+			{Name: "resource", Type: migrator.DB_NVarchar, Length: 190, Nullable: false},
+			{Name: "namespace", Type: migrator.DB_NVarchar, Length: 63, Nullable: false},
+			{Name: "name", Type: migrator.DB_NVarchar, Length: 190, Nullable: false},
+
+			{Name: "folder", Type: migrator.DB_NVarchar, Length: 190, Nullable: false}, // uid of folder
+			{Name: "access", Type: migrator.DB_Text, Nullable: true},                   // JSON object
+
+			// The raw entity body (any byte array)
+			{Name: "meta", Type: migrator.DB_Text, Nullable: true},     // raw meta object from k8s (with standard stuff removed)
+			{Name: "body", Type: migrator.DB_LongText, Nullable: true}, // null when nested or remote
+			{Name: "status", Type: migrator.DB_Text, Nullable: true},   // raw status object
+
+			{Name: "size", Type: migrator.DB_BigInt, Nullable: false},
+			{Name: "etag", Type: migrator.DB_NVarchar, Length: 32, Nullable: false, IsLatin: true}, // md5(body)
+
+			// Who changed what when
+			{Name: "created_at", Type: migrator.DB_BigInt, Nullable: false},
+			{Name: "created_by", Type: migrator.DB_NVarchar, Length: 190, Nullable: false},
+			{Name: "updated_at", Type: migrator.DB_BigInt, Nullable: false},
+			{Name: "updated_by", Type: migrator.DB_NVarchar, Length: 190, Nullable: false},
+
+			// Mark objects with origin metadata
+			{Name: "origin", Type: migrator.DB_NVarchar, Length: 40, Nullable: false},
+			{Name: "origin_key", Type: migrator.DB_Text, Nullable: false},
+			{Name: "origin_ts", Type: migrator.DB_BigInt, Nullable: false},
+
+			// Metadata
+			{Name: "title", Type: migrator.DB_NVarchar, Length: 190, Nullable: false},
+			{Name: "slug", Type: migrator.DB_NVarchar, Length: 190, Nullable: false}, // from title
+			{Name: "description", Type: migrator.DB_Text, Nullable: true},
+
+			// Commit message
+			{Name: "message", Type: migrator.DB_Text, Nullable: false}, // defaults to empty string
+			{Name: "labels", Type: migrator.DB_Text, Nullable: true},   // JSON object
+			{Name: "fields", Type: migrator.DB_Text, Nullable: true},   // JSON object
+			{Name: "errors", Type: migrator.DB_Text, Nullable: true},   // JSON object
+
+			{Name: "action", Type: migrator.DB_Int, Nullable: false}, // 1: create, 2: update, 3: delete
+		},
+		Indices: []*migrator.Index{
+			{Cols: []string{"guid", "resource_version"}, Type: migrator.UniqueIndex},
+			{
+				Cols: []string{"namespace", "group", "resource", "name", "resource_version"},
+				Type: migrator.UniqueIndex,
+				Name: "UQE_entity_history_namespace_group_name_version",
+			},
+			// index to support watch poller
+			{Cols: []string{"resource_version"}, Type: migrator.IndexType},
+		},
+	})
+
+	// when saving a folder, keep a path version cached (all info is derived from entity table)
+	tables = append(tables, migrator.Table{
+		Name: "entity_folder",
+		Columns: []*migrator.Column{
+			{Name: "guid", Type: migrator.DB_NVarchar, Length: 36, Nullable: false, IsPrimaryKey: true},
+			{Name: "namespace", Type: migrator.DB_NVarchar, Length: 63, Nullable: false},
+			{Name: "name", Type: migrator.DB_NVarchar, Length: 190, Nullable: false},
+			{Name: "slug_path", Type: migrator.DB_Text, Nullable: false}, // /slug/slug/slug/
+			{Name: "tree", Type: migrator.DB_Text, Nullable: false},      // JSON []{uid, title}
+			{Name: "depth", Type: migrator.DB_Int, Nullable: false},      // starts at 1
+			{Name: "lft", Type: migrator.DB_Int, Nullable: false},        // MPTT
+			{Name: "rgt", Type: migrator.DB_Int, Nullable: false},        // MPTT
+			{Name: "detached", Type: migrator.DB_Bool, Nullable: false},  // a parent folder was not found
+		},
+	})
+
+	tables = append(tables, migrator.Table{
+		Name: "entity_labels",
+		Columns: []*migrator.Column{
+			{Name: "guid", Type: migrator.DB_NVarchar, Length: 36, Nullable: false},
+			{Name: "label", Type: migrator.DB_NVarchar, Length: 190, Nullable: false},
+			{Name: "value", Type: migrator.DB_Text, Nullable: false},
+		},
+		Indices: []*migrator.Index{
+			{Cols: []string{"guid", "label"}, Type: migrator.UniqueIndex},
+		},
+	})
+
+	tables = append(tables, migrator.Table{
+		Name: "entity_ref",
+		Columns: []*migrator.Column{
+			// Source:
+			{Name: "guid", Type: migrator.DB_NVarchar, Length: 36, Nullable: false},
+
+			// Address (defined in the body, not resolved, may be invalid and change)
+			{Name: "namespace", Type: migrator.DB_NVarchar, Length: 63, Nullable: false},
+			{Name: "group", Type: migrator.DB_NVarchar, Length: 190, Nullable: false},
+			{Name: "resource", Type: migrator.DB_NVarchar, Length: 190, Nullable: true},
+			{Name: "name", Type: migrator.DB_NVarchar, Length: 190, Nullable: true},
+
+			// Runtime calcs (will depend on the system state)
+			{Name: "resolved_ok", Type: migrator.DB_Bool, Nullable: false},
+			{Name: "resolved_to", Type: migrator.DB_NVarchar, Length: 36, Nullable: false},
+			{Name: "resolved_warning", Type: migrator.DB_Text, Nullable: false},
+			{Name: "resolved_time", Type: migrator.DB_DateTime, Nullable: false}, // resolution cache timestamp
+		},
+		Indices: []*migrator.Index{
+			{Cols: []string{"guid"}, Type: migrator.IndexType},
+			{Cols: []string{"namespace", "group", "resource", "name"}, Type: migrator.IndexType},
+			{Cols: []string{"resolved_to"}, Type: migrator.IndexType},
+		},
+	})
+
+	// Initialize all tables
+	for t := range tables {
+		mg.AddMigration("drop table "+tables[t].Name, migrator.NewDropTableMigration(tables[t].Name))
+		mg.AddMigration("create table "+tables[t].Name, migrator.NewAddTableMigration(tables[t]))
+		for i := range tables[t].Indices {
+			mg.AddMigration(fmt.Sprintf("create table %s, index: %d", tables[t].Name, i), migrator.NewAddIndexMigration(tables[t], tables[t].Indices[i]))
+		}
+	}
+
+	return marker
+}
diff --git a/pkg/services/store/entity/db/migrations/migrator.go b/pkg/services/store/entity/db/migrations/migrator.go
new file mode 100644
index 0000000000000..145ac9d2240df
--- /dev/null
+++ b/pkg/services/store/entity/db/migrations/migrator.go
@@ -0,0 +1,75 @@
+package migrations
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+	"github.com/grafana/grafana/pkg/services/sqlstore/session"
+	"github.com/grafana/grafana/pkg/services/store/entity/db"
+)
+
+func MigrateEntityStore(db db.EntityDBInterface, features featuremgmt.FeatureToggles) error {
+	// Skip if feature flag is not enabled
+	if !features.IsEnabledGlobally(featuremgmt.FlagUnifiedStorage) {
+		return nil
+	}
+
+	engine, err := db.GetEngine()
+	if err != nil {
+		return err
+	}
+
+	mg := migrator.NewScopedMigrator(engine, db.GetCfg(), "entity")
+	mg.AddCreateMigration()
+
+	marker := initEntityTables(mg)
+
+	// While this feature is under development, we can completly wipe and recreate
+	// The initial plan is to keep the source of truth in existing SQL tables, and mirrot it
+	// to a kubernetes model.  Once the kubernetes model needs to be preserved,
+	// this code should be removed
+	exists, err := engine.IsTableExist("entity_migration_log")
+	if err != nil {
+		return err
+	}
+	if exists {
+		log, err := mg.GetMigrationLog()
+		if err != nil {
+			return err
+		}
+		_, found := log[marker]
+		if !found && len(log) > 0 {
+			// Remove the migration log (and potential other orphan tables)
+			tables := []string{"entity_migration_log"}
+
+			ctx := context.Background()
+			sess, err := db.GetSession()
+			if err != nil {
+				return err
+			}
+
+			err = sess.WithTransaction(ctx, func(tx *session.SessionTx) error {
+				for _, t := range tables {
+					_, err := tx.Exec(ctx, fmt.Sprintf("DROP TABLE IF EXISTS %s", t))
+					if err != nil {
+						return err
+					}
+				}
+				return nil
+			})
+			if err != nil {
+				return err
+			}
+
+			// remove old entries from in-memory log
+			for id := range log {
+				mg.RemoveMigrationLogs(id)
+			}
+		}
+	}
+
+	// since it's a new feature enable migration locking by default
+	return mg.Start(true, 0)
+}
diff --git a/pkg/services/store/entity/db/service.go b/pkg/services/store/entity/db/service.go
new file mode 100755
index 0000000000000..7a5414dacd60c
--- /dev/null
+++ b/pkg/services/store/entity/db/service.go
@@ -0,0 +1,16 @@
+package db
+
+import (
+	"xorm.io/xorm"
+
+	// "github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/services/sqlstore/session"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+type EntityDBInterface interface {
+	Init() error
+	GetSession() (*session.SessionDB, error)
+	GetEngine() (*xorm.Engine, error)
+	GetCfg() *setting.Cfg
+}
diff --git a/pkg/services/store/entity/dummy/fake_store.go b/pkg/services/store/entity/dummy/fake_store.go
index 85ed811eed210..d0410e4da8082 100644
--- a/pkg/services/store/entity/dummy/fake_store.go
+++ b/pkg/services/store/entity/dummy/fake_store.go
@@ -9,7 +9,6 @@ import (
 
 // Make sure we implement both store + admin
 var _ entity.EntityStoreServer = &fakeEntityStore{}
-var _ entity.EntityStoreAdminServer = &fakeEntityStore{}
 
 func ProvideFakeEntityServer() entity.EntityStoreServer {
 	return &fakeEntityStore{}
@@ -17,11 +16,11 @@ func ProvideFakeEntityServer() entity.EntityStoreServer {
 
 type fakeEntityStore struct{}
 
-func (i fakeEntityStore) AdminWrite(ctx context.Context, r *entity.AdminWriteEntityRequest) (*entity.WriteEntityResponse, error) {
+func (i fakeEntityStore) Create(ctx context.Context, r *entity.CreateEntityRequest) (*entity.CreateEntityResponse, error) {
 	return nil, fmt.Errorf("unimplemented")
 }
 
-func (i fakeEntityStore) Write(ctx context.Context, r *entity.WriteEntityRequest) (*entity.WriteEntityResponse, error) {
+func (i fakeEntityStore) Update(ctx context.Context, r *entity.UpdateEntityRequest) (*entity.UpdateEntityResponse, error) {
 	return nil, fmt.Errorf("unimplemented")
 }
 
@@ -41,10 +40,14 @@ func (i fakeEntityStore) History(ctx context.Context, r *entity.EntityHistoryReq
 	return nil, fmt.Errorf("unimplemented")
 }
 
-func (i fakeEntityStore) Search(ctx context.Context, r *entity.EntitySearchRequest) (*entity.EntitySearchResponse, error) {
+func (i fakeEntityStore) List(ctx context.Context, r *entity.EntityListRequest) (*entity.EntityListResponse, error) {
 	return nil, fmt.Errorf("unimplemented")
 }
 
 func (i fakeEntityStore) Watch(*entity.EntityWatchRequest, entity.EntityStore_WatchServer) error {
 	return fmt.Errorf("unimplemented")
 }
+
+func (i fakeEntityStore) FindReferences(ctx context.Context, r *entity.ReferenceRequest) (*entity.EntityListResponse, error) {
+	return nil, fmt.Errorf("unimplemented")
+}
diff --git a/pkg/services/store/entity/entity.pb.go b/pkg/services/store/entity/entity.pb.go
index 1201b7f71fc24..333d7c998fe12 100644
--- a/pkg/services/store/entity/entity.pb.go
+++ b/pkg/services/store/entity/entity.pb.go
@@ -1,13 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        v4.23.4
+// 	protoc-gen-go v1.32.0
+// 	protoc        v4.25.2
 // source: entity.proto
 
 package entity
 
 import (
-	grn "github.com/grafana/grafana/pkg/infra/grn"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
@@ -22,106 +21,206 @@ const (
 )
 
 // Status enumeration
-type WriteEntityResponse_Status int32
+type Entity_Action int32
 
 const (
-	WriteEntityResponse_ERROR     WriteEntityResponse_Status = 0
-	WriteEntityResponse_CREATED   WriteEntityResponse_Status = 1
-	WriteEntityResponse_UPDATED   WriteEntityResponse_Status = 2
-	WriteEntityResponse_UNCHANGED WriteEntityResponse_Status = 3
+	Entity_UNKNOWN Entity_Action = 0
+	Entity_CREATED Entity_Action = 1
+	Entity_UPDATED Entity_Action = 2
+	Entity_DELETED Entity_Action = 3
+	Entity_ERROR   Entity_Action = 4
 )
 
-// Enum value maps for WriteEntityResponse_Status.
+// Enum value maps for Entity_Action.
 var (
-	WriteEntityResponse_Status_name = map[int32]string{
-		0: "ERROR",
+	Entity_Action_name = map[int32]string{
+		0: "UNKNOWN",
 		1: "CREATED",
 		2: "UPDATED",
-		3: "UNCHANGED",
+		3: "DELETED",
+		4: "ERROR",
 	}
-	WriteEntityResponse_Status_value = map[string]int32{
-		"ERROR":     0,
-		"CREATED":   1,
-		"UPDATED":   2,
-		"UNCHANGED": 3,
+	Entity_Action_value = map[string]int32{
+		"UNKNOWN": 0,
+		"CREATED": 1,
+		"UPDATED": 2,
+		"DELETED": 3,
+		"ERROR":   4,
 	}
 )
 
-func (x WriteEntityResponse_Status) Enum() *WriteEntityResponse_Status {
-	p := new(WriteEntityResponse_Status)
+func (x Entity_Action) Enum() *Entity_Action {
+	p := new(Entity_Action)
 	*p = x
 	return p
 }
 
-func (x WriteEntityResponse_Status) String() string {
+func (x Entity_Action) String() string {
 	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
 }
 
-func (WriteEntityResponse_Status) Descriptor() protoreflect.EnumDescriptor {
+func (Entity_Action) Descriptor() protoreflect.EnumDescriptor {
 	return file_entity_proto_enumTypes[0].Descriptor()
 }
 
-func (WriteEntityResponse_Status) Type() protoreflect.EnumType {
+func (Entity_Action) Type() protoreflect.EnumType {
 	return &file_entity_proto_enumTypes[0]
 }
 
-func (x WriteEntityResponse_Status) Number() protoreflect.EnumNumber {
+func (x Entity_Action) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use WriteEntityResponse_Status.Descriptor instead.
-func (WriteEntityResponse_Status) EnumDescriptor() ([]byte, []int) {
-	return file_entity_proto_rawDescGZIP(), []int{9, 0}
+// Deprecated: Use Entity_Action.Descriptor instead.
+func (Entity_Action) EnumDescriptor() ([]byte, []int) {
+	return file_entity_proto_rawDescGZIP(), []int{0, 0}
 }
 
 // Status enumeration
-type EntityWatchResponse_Action int32
+type CreateEntityResponse_Status int32
 
 const (
-	EntityWatchResponse_UNKNOWN EntityWatchResponse_Action = 0
-	EntityWatchResponse_UPDATED EntityWatchResponse_Action = 1
-	EntityWatchResponse_DELETED EntityWatchResponse_Action = 2
+	CreateEntityResponse_ERROR   CreateEntityResponse_Status = 0
+	CreateEntityResponse_CREATED CreateEntityResponse_Status = 1
 )
 
-// Enum value maps for EntityWatchResponse_Action.
+// Enum value maps for CreateEntityResponse_Status.
 var (
-	EntityWatchResponse_Action_name = map[int32]string{
-		0: "UNKNOWN",
-		1: "UPDATED",
-		2: "DELETED",
+	CreateEntityResponse_Status_name = map[int32]string{
+		0: "ERROR",
+		1: "CREATED",
 	}
-	EntityWatchResponse_Action_value = map[string]int32{
-		"UNKNOWN": 0,
-		"UPDATED": 1,
-		"DELETED": 2,
+	CreateEntityResponse_Status_value = map[string]int32{
+		"ERROR":   0,
+		"CREATED": 1,
 	}
 )
 
-func (x EntityWatchResponse_Action) Enum() *EntityWatchResponse_Action {
-	p := new(EntityWatchResponse_Action)
+func (x CreateEntityResponse_Status) Enum() *CreateEntityResponse_Status {
+	p := new(CreateEntityResponse_Status)
 	*p = x
 	return p
 }
 
-func (x EntityWatchResponse_Action) String() string {
+func (x CreateEntityResponse_Status) String() string {
 	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
 }
 
-func (EntityWatchResponse_Action) Descriptor() protoreflect.EnumDescriptor {
+func (CreateEntityResponse_Status) Descriptor() protoreflect.EnumDescriptor {
 	return file_entity_proto_enumTypes[1].Descriptor()
 }
 
-func (EntityWatchResponse_Action) Type() protoreflect.EnumType {
+func (CreateEntityResponse_Status) Type() protoreflect.EnumType {
 	return &file_entity_proto_enumTypes[1]
 }
 
-func (x EntityWatchResponse_Action) Number() protoreflect.EnumNumber {
+func (x CreateEntityResponse_Status) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use CreateEntityResponse_Status.Descriptor instead.
+func (CreateEntityResponse_Status) EnumDescriptor() ([]byte, []int) {
+	return file_entity_proto_rawDescGZIP(), []int{7, 0}
+}
+
+// Status enumeration
+type UpdateEntityResponse_Status int32
+
+const (
+	UpdateEntityResponse_ERROR     UpdateEntityResponse_Status = 0
+	UpdateEntityResponse_UPDATED   UpdateEntityResponse_Status = 1
+	UpdateEntityResponse_UNCHANGED UpdateEntityResponse_Status = 2
+)
+
+// Enum value maps for UpdateEntityResponse_Status.
+var (
+	UpdateEntityResponse_Status_name = map[int32]string{
+		0: "ERROR",
+		1: "UPDATED",
+		2: "UNCHANGED",
+	}
+	UpdateEntityResponse_Status_value = map[string]int32{
+		"ERROR":     0,
+		"UPDATED":   1,
+		"UNCHANGED": 2,
+	}
+)
+
+func (x UpdateEntityResponse_Status) Enum() *UpdateEntityResponse_Status {
+	p := new(UpdateEntityResponse_Status)
+	*p = x
+	return p
+}
+
+func (x UpdateEntityResponse_Status) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (UpdateEntityResponse_Status) Descriptor() protoreflect.EnumDescriptor {
+	return file_entity_proto_enumTypes[2].Descriptor()
+}
+
+func (UpdateEntityResponse_Status) Type() protoreflect.EnumType {
+	return &file_entity_proto_enumTypes[2]
+}
+
+func (x UpdateEntityResponse_Status) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use EntityWatchResponse_Action.Descriptor instead.
-func (EntityWatchResponse_Action) EnumDescriptor() ([]byte, []int) {
-	return file_entity_proto_rawDescGZIP(), []int{18, 0}
+// Deprecated: Use UpdateEntityResponse_Status.Descriptor instead.
+func (UpdateEntityResponse_Status) EnumDescriptor() ([]byte, []int) {
+	return file_entity_proto_rawDescGZIP(), []int{9, 0}
+}
+
+// Status enumeration
+type DeleteEntityResponse_Status int32
+
+const (
+	DeleteEntityResponse_ERROR    DeleteEntityResponse_Status = 0
+	DeleteEntityResponse_DELETED  DeleteEntityResponse_Status = 1
+	DeleteEntityResponse_NOTFOUND DeleteEntityResponse_Status = 2
+)
+
+// Enum value maps for DeleteEntityResponse_Status.
+var (
+	DeleteEntityResponse_Status_name = map[int32]string{
+		0: "ERROR",
+		1: "DELETED",
+		2: "NOTFOUND",
+	}
+	DeleteEntityResponse_Status_value = map[string]int32{
+		"ERROR":    0,
+		"DELETED":  1,
+		"NOTFOUND": 2,
+	}
+)
+
+func (x DeleteEntityResponse_Status) Enum() *DeleteEntityResponse_Status {
+	p := new(DeleteEntityResponse_Status)
+	*p = x
+	return p
+}
+
+func (x DeleteEntityResponse_Status) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (DeleteEntityResponse_Status) Descriptor() protoreflect.EnumDescriptor {
+	return file_entity_proto_enumTypes[3].Descriptor()
+}
+
+func (DeleteEntityResponse_Status) Type() protoreflect.EnumType {
+	return &file_entity_proto_enumTypes[3]
+}
+
+func (x DeleteEntityResponse_Status) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use DeleteEntityResponse_Status.Descriptor instead.
+func (DeleteEntityResponse_Status) EnumDescriptor() ([]byte, []int) {
+	return file_entity_proto_rawDescGZIP(), []int{11, 0}
 }
 
 // The canonical entity/document data -- this represents the raw bytes and storage level metadata
@@ -130,30 +229,62 @@ type Entity struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Entity identifier -- tenant_id, kind, uid
-	GRN *grn.GRN `protobuf:"bytes,1,opt,name=GRN,proto3" json:"GRN,omitempty"`
-	// The version will change when the entity is saved. It is not necessarily sortable
-	Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
+	// Globally unique ID set by the system.  This can not be set explicitly
+	Guid string `protobuf:"bytes,1,opt,name=guid,proto3" json:"guid,omitempty"`
+	// The resource version, this is a snowflake id controlled by storage
+	ResourceVersion int64 `protobuf:"varint,2,opt,name=resource_version,json=resourceVersion,proto3" json:"resource_version,omitempty"`
+	// group
+	Group string `protobuf:"bytes,24,opt,name=group,proto3" json:"group,omitempty"`
+	// kind resource
+	Resource string `protobuf:"bytes,25,opt,name=resource,proto3" json:"resource,omitempty"`
+	// namespace
+	Namespace string `protobuf:"bytes,26,opt,name=namespace,proto3" json:"namespace,omitempty"`
+	// k8s name
+	Name string `protobuf:"bytes,27,opt,name=name,proto3" json:"name,omitempty"`
+	// subresource
+	Subresource string `protobuf:"bytes,28,opt,name=subresource,proto3" json:"subresource,omitempty"`
+	// group version
+	GroupVersion string `protobuf:"bytes,23,opt,name=group_version,json=groupVersion,proto3" json:"group_version,omitempty"`
+	// k8s key value (TODO remove -- it is duplicate of group+resource+version)
+	Key string `protobuf:"bytes,22,opt,name=key,proto3" json:"key,omitempty"`
+	// The folder k8s name
+	Folder string `protobuf:"bytes,4,opt,name=folder,proto3" json:"folder,omitempty"`
+	// Raw meta from k8s
+	Meta []byte `protobuf:"bytes,5,opt,name=meta,proto3" json:"meta,omitempty"`
+	// Raw bytes of the storage entity.  The kind will determine what is a valid payload
+	Body []byte `protobuf:"bytes,6,opt,name=body,proto3" json:"body,omitempty"`
+	// k8s style status (ignored for now)
+	Status []byte `protobuf:"bytes,7,opt,name=status,proto3" json:"status,omitempty"`
+	// the friendly name of the entity
+	Title string `protobuf:"bytes,8,opt,name=title,proto3" json:"title,omitempty"`
+	// Content Length
+	Size int64 `protobuf:"varint,9,opt,name=size,proto3" json:"size,omitempty"`
+	// MD5 digest of the body
+	ETag string `protobuf:"bytes,10,opt,name=ETag,proto3" json:"ETag,omitempty"`
 	// Time in epoch milliseconds that the entity was created
-	CreatedAt int64 `protobuf:"varint,3,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
-	// Time in epoch milliseconds that the entity was updated
-	UpdatedAt int64 `protobuf:"varint,4,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
+	CreatedAt int64 `protobuf:"varint,11,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
 	// Who created the entity
-	CreatedBy string `protobuf:"bytes,5,opt,name=created_by,json=createdBy,proto3" json:"created_by,omitempty"`
+	CreatedBy string `protobuf:"bytes,12,opt,name=created_by,json=createdBy,proto3" json:"created_by,omitempty"`
+	// Time in epoch milliseconds that the entity was updated
+	UpdatedAt int64 `protobuf:"varint,13,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
 	// Who updated the entity
-	UpdatedBy string `protobuf:"bytes,6,opt,name=updated_by,json=updatedBy,proto3" json:"updated_by,omitempty"`
-	// The folder UID (not stored in the body)
-	Folder string `protobuf:"bytes,7,opt,name=folder,proto3" json:"folder,omitempty"`
-	// MD5 digest of the body
-	ETag string `protobuf:"bytes,8,opt,name=ETag,proto3" json:"ETag,omitempty"`
-	// Content Length
-	Size int64 `protobuf:"varint,9,opt,name=size,proto3" json:"size,omitempty"`
-	// Raw bytes of the storage entity.  The kind will determine what is a valid payload
-	Body []byte `protobuf:"bytes,10,opt,name=body,proto3" json:"body,omitempty"`
-	// Entity summary as JSON
-	SummaryJson []byte `protobuf:"bytes,11,opt,name=summary_json,json=summaryJson,proto3" json:"summary_json,omitempty"`
+	UpdatedBy string `protobuf:"bytes,14,opt,name=updated_by,json=updatedBy,proto3" json:"updated_by,omitempty"`
 	// External location info
-	Origin *EntityOriginInfo `protobuf:"bytes,12,opt,name=origin,proto3" json:"origin,omitempty"`
+	Origin *EntityOriginInfo `protobuf:"bytes,15,opt,name=origin,proto3" json:"origin,omitempty"`
+	// human-readable description of the entity
+	Description string `protobuf:"bytes,16,opt,name=description,proto3" json:"description,omitempty"`
+	// URL safe version of the name.  It will be unique within the folder
+	Slug string `protobuf:"bytes,17,opt,name=slug,proto3" json:"slug,omitempty"`
+	// Commit message (optional)
+	Message string `protobuf:"bytes,18,opt,name=message,proto3" json:"message,omitempty"`
+	// Key value pairs.  Tags are are represented as keys with empty values
+	Labels map[string]string `protobuf:"bytes,19,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// Optional field values.  The schema will define and document possible values for a given kind
+	Fields map[string]string `protobuf:"bytes,20,rep,name=fields,proto3" json:"fields,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// When errors exist
+	Errors []*EntityErrorInfo `protobuf:"bytes,21,rep,name=errors,proto3" json:"errors,omitempty"`
+	// Action code
+	Action Entity_Action `protobuf:"varint,3,opt,name=action,proto3,enum=entity.Entity_Action" json:"action,omitempty"`
 }
 
 func (x *Entity) Reset() {
@@ -188,30 +319,121 @@ func (*Entity) Descriptor() ([]byte, []int) {
 	return file_entity_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *Entity) GetGRN() *grn.GRN {
+func (x *Entity) GetGuid() string {
 	if x != nil {
-		return x.GRN
+		return x.Guid
+	}
+	return ""
+}
+
+func (x *Entity) GetResourceVersion() int64 {
+	if x != nil {
+		return x.ResourceVersion
+	}
+	return 0
+}
+
+func (x *Entity) GetGroup() string {
+	if x != nil {
+		return x.Group
+	}
+	return ""
+}
+
+func (x *Entity) GetResource() string {
+	if x != nil {
+		return x.Resource
+	}
+	return ""
+}
+
+func (x *Entity) GetNamespace() string {
+	if x != nil {
+		return x.Namespace
+	}
+	return ""
+}
+
+func (x *Entity) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *Entity) GetSubresource() string {
+	if x != nil {
+		return x.Subresource
+	}
+	return ""
+}
+
+func (x *Entity) GetGroupVersion() string {
+	if x != nil {
+		return x.GroupVersion
+	}
+	return ""
+}
+
+func (x *Entity) GetKey() string {
+	if x != nil {
+		return x.Key
+	}
+	return ""
+}
+
+func (x *Entity) GetFolder() string {
+	if x != nil {
+		return x.Folder
+	}
+	return ""
+}
+
+func (x *Entity) GetMeta() []byte {
+	if x != nil {
+		return x.Meta
+	}
+	return nil
+}
+
+func (x *Entity) GetBody() []byte {
+	if x != nil {
+		return x.Body
 	}
 	return nil
 }
 
-func (x *Entity) GetVersion() string {
+func (x *Entity) GetStatus() []byte {
 	if x != nil {
-		return x.Version
+		return x.Status
+	}
+	return nil
+}
+
+func (x *Entity) GetTitle() string {
+	if x != nil {
+		return x.Title
 	}
 	return ""
 }
 
-func (x *Entity) GetCreatedAt() int64 {
+func (x *Entity) GetSize() int64 {
 	if x != nil {
-		return x.CreatedAt
+		return x.Size
 	}
 	return 0
 }
 
-func (x *Entity) GetUpdatedAt() int64 {
+func (x *Entity) GetETag() string {
 	if x != nil {
-		return x.UpdatedAt
+		return x.ETag
+	}
+	return ""
+}
+
+func (x *Entity) GetCreatedAt() int64 {
+	if x != nil {
+		return x.CreatedAt
 	}
 	return 0
 }
@@ -223,6 +445,13 @@ func (x *Entity) GetCreatedBy() string {
 	return ""
 }
 
+func (x *Entity) GetUpdatedAt() int64 {
+	if x != nil {
+		return x.UpdatedAt
+	}
+	return 0
+}
+
 func (x *Entity) GetUpdatedBy() string {
 	if x != nil {
 		return x.UpdatedBy
@@ -230,48 +459,62 @@ func (x *Entity) GetUpdatedBy() string {
 	return ""
 }
 
-func (x *Entity) GetFolder() string {
+func (x *Entity) GetOrigin() *EntityOriginInfo {
 	if x != nil {
-		return x.Folder
+		return x.Origin
+	}
+	return nil
+}
+
+func (x *Entity) GetDescription() string {
+	if x != nil {
+		return x.Description
 	}
 	return ""
 }
 
-func (x *Entity) GetETag() string {
+func (x *Entity) GetSlug() string {
 	if x != nil {
-		return x.ETag
+		return x.Slug
 	}
 	return ""
 }
 
-func (x *Entity) GetSize() int64 {
+func (x *Entity) GetMessage() string {
 	if x != nil {
-		return x.Size
+		return x.Message
 	}
-	return 0
+	return ""
 }
 
-func (x *Entity) GetBody() []byte {
+func (x *Entity) GetLabels() map[string]string {
 	if x != nil {
-		return x.Body
+		return x.Labels
 	}
 	return nil
 }
 
-func (x *Entity) GetSummaryJson() []byte {
+func (x *Entity) GetFields() map[string]string {
 	if x != nil {
-		return x.SummaryJson
+		return x.Fields
 	}
 	return nil
 }
 
-func (x *Entity) GetOrigin() *EntityOriginInfo {
+func (x *Entity) GetErrors() []*EntityErrorInfo {
 	if x != nil {
-		return x.Origin
+		return x.Errors
 	}
 	return nil
 }
 
+func (x *Entity) GetAction() Entity_Action {
+	if x != nil {
+		return x.Action
+	}
+	return Entity_UNKNOWN
+}
+
 // This stores additional metadata for items entities that were synced from external systmes
 type EntityOriginInfo struct {
 	state         protoimpl.MessageState
@@ -407,30 +650,23 @@ func (x *EntityErrorInfo) GetDetailsJson() []byte {
 	return nil
 }
 
-// This is a subset of Entity that does not include body or sync info
-type EntityVersionInfo struct {
+type ReadEntityRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// The version will change when the entity is saved. It is not necessarily sortable
-	Version string `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"`
-	// Time in epoch milliseconds that the entity was updated
-	UpdatedAt int64 `protobuf:"varint,2,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
-	// Who updated the entity
-	UpdatedBy string `protobuf:"bytes,3,opt,name=updated_by,json=updatedBy,proto3" json:"updated_by,omitempty"`
-	// Content Length
-	Size int64 `protobuf:"varint,4,opt,name=size,proto3" json:"size,omitempty"`
-	// MD5 digest of the body
-	ETag string `protobuf:"bytes,5,opt,name=ETag,proto3" json:"ETag,omitempty"`
-	// optional "save" or "commit" message
-	//
-	// NOTE: currently managed by the dashboard_version table, and will be returned from a "history" command
-	Comment string `protobuf:"bytes,6,opt,name=comment,proto3" json:"comment,omitempty"`
+	// Entity identifier
+	Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
+	// Fetch an explicit version (default is latest)
+	ResourceVersion int64 `protobuf:"varint,2,opt,name=resource_version,json=resourceVersion,proto3" json:"resource_version,omitempty"`
+	// Include the full body
+	WithBody bool `protobuf:"varint,4,opt,name=with_body,json=withBody,proto3" json:"with_body,omitempty"`
+	// Include the status
+	WithStatus bool `protobuf:"varint,5,opt,name=with_status,json=withStatus,proto3" json:"with_status,omitempty"`
 }
 
-func (x *EntityVersionInfo) Reset() {
-	*x = EntityVersionInfo{}
+func (x *ReadEntityRequest) Reset() {
+	*x = ReadEntityRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_entity_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -438,13 +674,13 @@ func (x *EntityVersionInfo) Reset() {
 	}
 }
 
-func (x *EntityVersionInfo) String() string {
+func (x *ReadEntityRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*EntityVersionInfo) ProtoMessage() {}
+func (*ReadEntityRequest) ProtoMessage() {}
 
-func (x *EntityVersionInfo) ProtoReflect() protoreflect.Message {
+func (x *ReadEntityRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_entity_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -456,70 +692,49 @@ func (x *EntityVersionInfo) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use EntityVersionInfo.ProtoReflect.Descriptor instead.
-func (*EntityVersionInfo) Descriptor() ([]byte, []int) {
+// Deprecated: Use ReadEntityRequest.ProtoReflect.Descriptor instead.
+func (*ReadEntityRequest) Descriptor() ([]byte, []int) {
 	return file_entity_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *EntityVersionInfo) GetVersion() string {
-	if x != nil {
-		return x.Version
-	}
-	return ""
-}
-
-func (x *EntityVersionInfo) GetUpdatedAt() int64 {
+func (x *ReadEntityRequest) GetKey() string {
 	if x != nil {
-		return x.UpdatedAt
-	}
-	return 0
-}
-
-func (x *EntityVersionInfo) GetUpdatedBy() string {
-	if x != nil {
-		return x.UpdatedBy
+		return x.Key
 	}
 	return ""
 }
 
-func (x *EntityVersionInfo) GetSize() int64 {
+func (x *ReadEntityRequest) GetResourceVersion() int64 {
 	if x != nil {
-		return x.Size
+		return x.ResourceVersion
 	}
 	return 0
 }
 
-func (x *EntityVersionInfo) GetETag() string {
+func (x *ReadEntityRequest) GetWithBody() bool {
 	if x != nil {
-		return x.ETag
+		return x.WithBody
 	}
-	return ""
+	return false
 }
 
-func (x *EntityVersionInfo) GetComment() string {
+func (x *ReadEntityRequest) GetWithStatus() bool {
 	if x != nil {
-		return x.Comment
+		return x.WithStatus
 	}
-	return ""
+	return false
 }
 
-type ReadEntityRequest struct {
+type BatchReadEntityRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Entity identifier
-	GRN *grn.GRN `protobuf:"bytes,1,opt,name=GRN,proto3" json:"GRN,omitempty"`
-	// Fetch an explicit version
-	Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
-	// Include the full body bytes
-	WithBody bool `protobuf:"varint,3,opt,name=with_body,json=withBody,proto3" json:"with_body,omitempty"`
-	// Include derived summary metadata
-	WithSummary bool `protobuf:"varint,4,opt,name=with_summary,json=withSummary,proto3" json:"with_summary,omitempty"`
+	Batch []*ReadEntityRequest `protobuf:"bytes,1,rep,name=batch,proto3" json:"batch,omitempty"`
 }
 
-func (x *ReadEntityRequest) Reset() {
-	*x = ReadEntityRequest{}
+func (x *BatchReadEntityRequest) Reset() {
+	*x = BatchReadEntityRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_entity_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -527,13 +742,13 @@ func (x *ReadEntityRequest) Reset() {
 	}
 }
 
-func (x *ReadEntityRequest) String() string {
+func (x *BatchReadEntityRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*ReadEntityRequest) ProtoMessage() {}
+func (*BatchReadEntityRequest) ProtoMessage() {}
 
-func (x *ReadEntityRequest) ProtoReflect() protoreflect.Message {
+func (x *BatchReadEntityRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_entity_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -545,49 +760,28 @@ func (x *ReadEntityRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ReadEntityRequest.ProtoReflect.Descriptor instead.
-func (*ReadEntityRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use BatchReadEntityRequest.ProtoReflect.Descriptor instead.
+func (*BatchReadEntityRequest) Descriptor() ([]byte, []int) {
 	return file_entity_proto_rawDescGZIP(), []int{4}
 }
 
-func (x *ReadEntityRequest) GetGRN() *grn.GRN {
+func (x *BatchReadEntityRequest) GetBatch() []*ReadEntityRequest {
 	if x != nil {
-		return x.GRN
+		return x.Batch
 	}
 	return nil
 }
 
-func (x *ReadEntityRequest) GetVersion() string {
-	if x != nil {
-		return x.Version
-	}
-	return ""
-}
-
-func (x *ReadEntityRequest) GetWithBody() bool {
-	if x != nil {
-		return x.WithBody
-	}
-	return false
-}
-
-func (x *ReadEntityRequest) GetWithSummary() bool {
-	if x != nil {
-		return x.WithSummary
-	}
-	return false
-}
-
-type BatchReadEntityRequest struct {
+type BatchReadEntityResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Batch []*ReadEntityRequest `protobuf:"bytes,1,rep,name=batch,proto3" json:"batch,omitempty"`
+	Results []*Entity `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
 }
 
-func (x *BatchReadEntityRequest) Reset() {
-	*x = BatchReadEntityRequest{}
+func (x *BatchReadEntityResponse) Reset() {
+	*x = BatchReadEntityResponse{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_entity_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -595,13 +789,13 @@ func (x *BatchReadEntityRequest) Reset() {
 	}
 }
 
-func (x *BatchReadEntityRequest) String() string {
+func (x *BatchReadEntityResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*BatchReadEntityRequest) ProtoMessage() {}
+func (*BatchReadEntityResponse) ProtoMessage() {}
 
-func (x *BatchReadEntityRequest) ProtoReflect() protoreflect.Message {
+func (x *BatchReadEntityResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_entity_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -613,28 +807,29 @@ func (x *BatchReadEntityRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use BatchReadEntityRequest.ProtoReflect.Descriptor instead.
-func (*BatchReadEntityRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use BatchReadEntityResponse.ProtoReflect.Descriptor instead.
+func (*BatchReadEntityResponse) Descriptor() ([]byte, []int) {
 	return file_entity_proto_rawDescGZIP(), []int{5}
 }
 
-func (x *BatchReadEntityRequest) GetBatch() []*ReadEntityRequest {
+func (x *BatchReadEntityResponse) GetResults() []*Entity {
 	if x != nil {
-		return x.Batch
+		return x.Results
 	}
 	return nil
 }
 
-type BatchReadEntityResponse struct {
+type CreateEntityRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Results []*Entity `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
+	// Entity details
+	Entity *Entity `protobuf:"bytes,1,opt,name=entity,proto3" json:"entity,omitempty"`
 }
 
-func (x *BatchReadEntityResponse) Reset() {
-	*x = BatchReadEntityResponse{}
+func (x *CreateEntityRequest) Reset() {
+	*x = CreateEntityRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_entity_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -642,13 +837,13 @@ func (x *BatchReadEntityResponse) Reset() {
 	}
 }
 
-func (x *BatchReadEntityResponse) String() string {
+func (x *CreateEntityRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*BatchReadEntityResponse) ProtoMessage() {}
+func (*CreateEntityRequest) ProtoMessage() {}
 
-func (x *BatchReadEntityResponse) ProtoReflect() protoreflect.Message {
+func (x *CreateEntityRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_entity_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -660,37 +855,33 @@ func (x *BatchReadEntityResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use BatchReadEntityResponse.ProtoReflect.Descriptor instead.
-func (*BatchReadEntityResponse) Descriptor() ([]byte, []int) {
+// Deprecated: Use CreateEntityRequest.ProtoReflect.Descriptor instead.
+func (*CreateEntityRequest) Descriptor() ([]byte, []int) {
 	return file_entity_proto_rawDescGZIP(), []int{6}
 }
 
-func (x *BatchReadEntityResponse) GetResults() []*Entity {
+func (x *CreateEntityRequest) GetEntity() *Entity {
 	if x != nil {
-		return x.Results
+		return x.Entity
 	}
 	return nil
 }
 
-type WriteEntityRequest struct {
+type CreateEntityResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Entity identifier
-	GRN *grn.GRN `protobuf:"bytes,1,opt,name=GRN,proto3" json:"GRN,omitempty"`
-	// Where to save the entity (empty will leave it unchanged)
-	Folder string `protobuf:"bytes,2,opt,name=folder,proto3" json:"folder,omitempty"`
-	// The raw entity body
-	Body []byte `protobuf:"bytes,3,opt,name=body,proto3" json:"body,omitempty"`
-	// Message that can be seen when exploring entity history
-	Comment string `protobuf:"bytes,4,opt,name=comment,proto3" json:"comment,omitempty"`
-	// Used for optimistic locking.  If missing, the previous version will be replaced regardless
-	PreviousVersion string `protobuf:"bytes,5,opt,name=previous_version,json=previousVersion,proto3" json:"previous_version,omitempty"`
+	// Error info -- if exists, the save did not happen
+	Error *EntityErrorInfo `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
+	// Entity details
+	Entity *Entity `protobuf:"bytes,2,opt,name=entity,proto3" json:"entity,omitempty"`
+	// Status code
+	Status CreateEntityResponse_Status `protobuf:"varint,3,opt,name=status,proto3,enum=entity.CreateEntityResponse_Status" json:"status,omitempty"`
 }
 
-func (x *WriteEntityRequest) Reset() {
-	*x = WriteEntityRequest{}
+func (x *CreateEntityResponse) Reset() {
+	*x = CreateEntityResponse{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_entity_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -698,13 +889,13 @@ func (x *WriteEntityRequest) Reset() {
 	}
 }
 
-func (x *WriteEntityRequest) String() string {
+func (x *CreateEntityResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*WriteEntityRequest) ProtoMessage() {}
+func (*CreateEntityResponse) ProtoMessage() {}
 
-func (x *WriteEntityRequest) ProtoReflect() protoreflect.Message {
+func (x *CreateEntityResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_entity_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -716,89 +907,45 @@ func (x *WriteEntityRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use WriteEntityRequest.ProtoReflect.Descriptor instead.
-func (*WriteEntityRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use CreateEntityResponse.ProtoReflect.Descriptor instead.
+func (*CreateEntityResponse) Descriptor() ([]byte, []int) {
 	return file_entity_proto_rawDescGZIP(), []int{7}
 }
 
-func (x *WriteEntityRequest) GetGRN() *grn.GRN {
+func (x *CreateEntityResponse) GetError() *EntityErrorInfo {
 	if x != nil {
-		return x.GRN
+		return x.Error
 	}
 	return nil
 }
 
-func (x *WriteEntityRequest) GetFolder() string {
+func (x *CreateEntityResponse) GetEntity() *Entity {
 	if x != nil {
-		return x.Folder
-	}
-	return ""
-}
-
-func (x *WriteEntityRequest) GetBody() []byte {
-	if x != nil {
-		return x.Body
+		return x.Entity
 	}
 	return nil
 }
 
-func (x *WriteEntityRequest) GetComment() string {
+func (x *CreateEntityResponse) GetStatus() CreateEntityResponse_Status {
 	if x != nil {
-		return x.Comment
-	}
-	return ""
-}
-
-func (x *WriteEntityRequest) GetPreviousVersion() string {
-	if x != nil {
-		return x.PreviousVersion
+		return x.Status
 	}
-	return ""
+	return CreateEntityResponse_ERROR
 }
 
-// This operation is useful when syncing a resource from external sources
-// that have more accurate metadata information (git, or an archive).
-// This process can bypass the forced checks that
-type AdminWriteEntityRequest struct {
+type UpdateEntityRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Entity identifier
-	GRN *grn.GRN `protobuf:"bytes,1,opt,name=GRN,proto3" json:"GRN,omitempty"`
-	// Where to save the entity (empty will leave it unchanged)
-	Folder string `protobuf:"bytes,2,opt,name=folder,proto3" json:"folder,omitempty"`
-	// The raw entity body
-	Body []byte `protobuf:"bytes,3,opt,name=body,proto3" json:"body,omitempty"`
-	// Message that can be seen when exploring entity history
-	Comment string `protobuf:"bytes,4,opt,name=comment,proto3" json:"comment,omitempty"`
-	// Time in epoch milliseconds that the entity was created
-	// Optional, if 0 it will use the current time
-	CreatedAt int64 `protobuf:"varint,5,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
-	// Time in epoch milliseconds that the entity was updated
-	// Optional, if empty it will use the current user
-	UpdatedAt int64 `protobuf:"varint,6,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
-	// Who created the entity
-	// Optional, if 0 it will use the current time
-	CreatedBy string `protobuf:"bytes,7,opt,name=created_by,json=createdBy,proto3" json:"created_by,omitempty"`
-	// Who updated the entity
-	// Optional, if empty it will use the current user
-	UpdatedBy string `protobuf:"bytes,8,opt,name=updated_by,json=updatedBy,proto3" json:"updated_by,omitempty"`
-	// An explicit version identifier
-	// Optional, if set, this will overwrite/define an explicit version
-	Version string `protobuf:"bytes,9,opt,name=version,proto3" json:"version,omitempty"`
+	// Entity details
+	Entity *Entity `protobuf:"bytes,1,opt,name=entity,proto3" json:"entity,omitempty"`
 	// Used for optimistic locking.  If missing, the previous version will be replaced regardless
-	// This may not be used along with an explicit version in the request
-	PreviousVersion string `protobuf:"bytes,10,opt,name=previous_version,json=previousVersion,proto3" json:"previous_version,omitempty"`
-	// Request that all previous versions are removed from the history
-	// This will make sense for systems that manage history explicitly externallay
-	ClearHistory bool `protobuf:"varint,11,opt,name=clear_history,json=clearHistory,proto3" json:"clear_history,omitempty"`
-	// Optionally define where the entity came from
-	Origin *EntityOriginInfo `protobuf:"bytes,12,opt,name=origin,proto3" json:"origin,omitempty"`
+	PreviousVersion int64 `protobuf:"varint,2,opt,name=previous_version,json=previousVersion,proto3" json:"previous_version,omitempty"`
 }
 
-func (x *AdminWriteEntityRequest) Reset() {
-	*x = AdminWriteEntityRequest{}
+func (x *UpdateEntityRequest) Reset() {
+	*x = UpdateEntityRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_entity_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -806,13 +953,13 @@ func (x *AdminWriteEntityRequest) Reset() {
 	}
 }
 
-func (x *AdminWriteEntityRequest) String() string {
+func (x *UpdateEntityRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*AdminWriteEntityRequest) ProtoMessage() {}
+func (*UpdateEntityRequest) ProtoMessage() {}
 
-func (x *AdminWriteEntityRequest) ProtoReflect() protoreflect.Message {
+func (x *UpdateEntityRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_entity_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -824,114 +971,40 @@ func (x *AdminWriteEntityRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use AdminWriteEntityRequest.ProtoReflect.Descriptor instead.
-func (*AdminWriteEntityRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use UpdateEntityRequest.ProtoReflect.Descriptor instead.
+func (*UpdateEntityRequest) Descriptor() ([]byte, []int) {
 	return file_entity_proto_rawDescGZIP(), []int{8}
 }
 
-func (x *AdminWriteEntityRequest) GetGRN() *grn.GRN {
+func (x *UpdateEntityRequest) GetEntity() *Entity {
 	if x != nil {
-		return x.GRN
-	}
-	return nil
-}
-
-func (x *AdminWriteEntityRequest) GetFolder() string {
-	if x != nil {
-		return x.Folder
-	}
-	return ""
-}
-
-func (x *AdminWriteEntityRequest) GetBody() []byte {
-	if x != nil {
-		return x.Body
+		return x.Entity
 	}
 	return nil
 }
 
-func (x *AdminWriteEntityRequest) GetComment() string {
-	if x != nil {
-		return x.Comment
-	}
-	return ""
-}
-
-func (x *AdminWriteEntityRequest) GetCreatedAt() int64 {
-	if x != nil {
-		return x.CreatedAt
-	}
-	return 0
-}
-
-func (x *AdminWriteEntityRequest) GetUpdatedAt() int64 {
-	if x != nil {
-		return x.UpdatedAt
-	}
-	return 0
-}
-
-func (x *AdminWriteEntityRequest) GetCreatedBy() string {
-	if x != nil {
-		return x.CreatedBy
-	}
-	return ""
-}
-
-func (x *AdminWriteEntityRequest) GetUpdatedBy() string {
-	if x != nil {
-		return x.UpdatedBy
-	}
-	return ""
-}
-
-func (x *AdminWriteEntityRequest) GetVersion() string {
-	if x != nil {
-		return x.Version
-	}
-	return ""
-}
-
-func (x *AdminWriteEntityRequest) GetPreviousVersion() string {
+func (x *UpdateEntityRequest) GetPreviousVersion() int64 {
 	if x != nil {
 		return x.PreviousVersion
 	}
-	return ""
-}
-
-func (x *AdminWriteEntityRequest) GetClearHistory() bool {
-	if x != nil {
-		return x.ClearHistory
-	}
-	return false
-}
-
-func (x *AdminWriteEntityRequest) GetOrigin() *EntityOriginInfo {
-	if x != nil {
-		return x.Origin
-	}
-	return nil
+	return 0
 }
 
-type WriteEntityResponse struct {
+type UpdateEntityResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
 	// Error info -- if exists, the save did not happen
 	Error *EntityErrorInfo `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
-	// Entity identifier
-	GRN *grn.GRN `protobuf:"bytes,2,opt,name=GRN,proto3" json:"GRN,omitempty"`
-	// Entity details with the body removed
-	Entity *EntityVersionInfo `protobuf:"bytes,3,opt,name=entity,proto3" json:"entity,omitempty"`
-	// Entity summary as JSON
-	SummaryJson []byte `protobuf:"bytes,4,opt,name=summary_json,json=summaryJson,proto3" json:"summary_json,omitempty"`
+	// Entity details
+	Entity *Entity `protobuf:"bytes,2,opt,name=entity,proto3" json:"entity,omitempty"`
 	// Status code
-	Status WriteEntityResponse_Status `protobuf:"varint,5,opt,name=status,proto3,enum=entity.WriteEntityResponse_Status" json:"status,omitempty"`
+	Status UpdateEntityResponse_Status `protobuf:"varint,3,opt,name=status,proto3,enum=entity.UpdateEntityResponse_Status" json:"status,omitempty"`
 }
 
-func (x *WriteEntityResponse) Reset() {
-	*x = WriteEntityResponse{}
+func (x *UpdateEntityResponse) Reset() {
+	*x = UpdateEntityResponse{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_entity_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -939,13 +1012,13 @@ func (x *WriteEntityResponse) Reset() {
 	}
 }
 
-func (x *WriteEntityResponse) String() string {
+func (x *UpdateEntityResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*WriteEntityResponse) ProtoMessage() {}
+func (*UpdateEntityResponse) ProtoMessage() {}
 
-func (x *WriteEntityResponse) ProtoReflect() protoreflect.Message {
+func (x *UpdateEntityResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_entity_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -957,44 +1030,30 @@ func (x *WriteEntityResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use WriteEntityResponse.ProtoReflect.Descriptor instead.
-func (*WriteEntityResponse) Descriptor() ([]byte, []int) {
+// Deprecated: Use UpdateEntityResponse.ProtoReflect.Descriptor instead.
+func (*UpdateEntityResponse) Descriptor() ([]byte, []int) {
 	return file_entity_proto_rawDescGZIP(), []int{9}
 }
 
-func (x *WriteEntityResponse) GetError() *EntityErrorInfo {
+func (x *UpdateEntityResponse) GetError() *EntityErrorInfo {
 	if x != nil {
 		return x.Error
 	}
 	return nil
 }
 
-func (x *WriteEntityResponse) GetGRN() *grn.GRN {
-	if x != nil {
-		return x.GRN
-	}
-	return nil
-}
-
-func (x *WriteEntityResponse) GetEntity() *EntityVersionInfo {
+func (x *UpdateEntityResponse) GetEntity() *Entity {
 	if x != nil {
 		return x.Entity
 	}
 	return nil
 }
 
-func (x *WriteEntityResponse) GetSummaryJson() []byte {
-	if x != nil {
-		return x.SummaryJson
-	}
-	return nil
-}
-
-func (x *WriteEntityResponse) GetStatus() WriteEntityResponse_Status {
+func (x *UpdateEntityResponse) GetStatus() UpdateEntityResponse_Status {
 	if x != nil {
 		return x.Status
 	}
-	return WriteEntityResponse_ERROR
+	return UpdateEntityResponse_ERROR
 }
 
 type DeleteEntityRequest struct {
@@ -1003,9 +1062,9 @@ type DeleteEntityRequest struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Entity identifier
-	GRN *grn.GRN `protobuf:"bytes,1,opt,name=GRN,proto3" json:"GRN,omitempty"`
-	// Used for optimistic locking.  If missing, the previous version will be replaced regardless
-	PreviousVersion string `protobuf:"bytes,3,opt,name=previous_version,json=previousVersion,proto3" json:"previous_version,omitempty"`
+	Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
+	// Used for optimistic locking.  If missing, the current version will be deleted regardless
+	PreviousVersion int64 `protobuf:"varint,2,opt,name=previous_version,json=previousVersion,proto3" json:"previous_version,omitempty"`
 }
 
 func (x *DeleteEntityRequest) Reset() {
@@ -1040,18 +1099,18 @@ func (*DeleteEntityRequest) Descriptor() ([]byte, []int) {
 	return file_entity_proto_rawDescGZIP(), []int{10}
 }
 
-func (x *DeleteEntityRequest) GetGRN() *grn.GRN {
+func (x *DeleteEntityRequest) GetKey() string {
 	if x != nil {
-		return x.GRN
+		return x.Key
 	}
-	return nil
+	return ""
 }
 
-func (x *DeleteEntityRequest) GetPreviousVersion() string {
+func (x *DeleteEntityRequest) GetPreviousVersion() int64 {
 	if x != nil {
 		return x.PreviousVersion
 	}
-	return ""
+	return 0
 }
 
 type DeleteEntityResponse struct {
@@ -1059,7 +1118,12 @@ type DeleteEntityResponse struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	OK bool `protobuf:"varint,1,opt,name=OK,proto3" json:"OK,omitempty"`
+	// Error info -- if exists, the delete did not happen
+	Error *EntityErrorInfo `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
+	// Entity details
+	Entity *Entity `protobuf:"bytes,2,opt,name=entity,proto3" json:"entity,omitempty"`
+	// Status code
+	Status DeleteEntityResponse_Status `protobuf:"varint,3,opt,name=status,proto3,enum=entity.DeleteEntityResponse_Status" json:"status,omitempty"`
 }
 
 func (x *DeleteEntityResponse) Reset() {
@@ -1094,11 +1158,25 @@ func (*DeleteEntityResponse) Descriptor() ([]byte, []int) {
 	return file_entity_proto_rawDescGZIP(), []int{11}
 }
 
-func (x *DeleteEntityResponse) GetOK() bool {
+func (x *DeleteEntityResponse) GetError() *EntityErrorInfo {
 	if x != nil {
-		return x.OK
+		return x.Error
 	}
-	return false
+	return nil
+}
+
+func (x *DeleteEntityResponse) GetEntity() *Entity {
+	if x != nil {
+		return x.Entity
+	}
+	return nil
+}
+
+func (x *DeleteEntityResponse) GetStatus() DeleteEntityResponse_Status {
+	if x != nil {
+		return x.Status
+	}
+	return DeleteEntityResponse_ERROR
 }
 
 type EntityHistoryRequest struct {
@@ -1107,11 +1185,17 @@ type EntityHistoryRequest struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Entity identifier
-	GRN *grn.GRN `protobuf:"bytes,1,opt,name=GRN,proto3" json:"GRN,omitempty"`
+	Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
 	// Maximum number of items to return
 	Limit int64 `protobuf:"varint,3,opt,name=limit,proto3" json:"limit,omitempty"`
 	// Starting from the requested page
 	NextPageToken string `protobuf:"bytes,5,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	// Sorting instructions `field ASC/DESC`
+	Sort []string `protobuf:"bytes,7,rep,name=sort,proto3" json:"sort,omitempty"`
+	// Return the full body in each payload
+	WithBody bool `protobuf:"varint,8,opt,name=with_body,json=withBody,proto3" json:"with_body,omitempty"`
+	// Return the full body in each payload
+	WithStatus bool `protobuf:"varint,10,opt,name=with_status,json=withStatus,proto3" json:"with_status,omitempty"`
 }
 
 func (x *EntityHistoryRequest) Reset() {
@@ -1146,11 +1230,11 @@ func (*EntityHistoryRequest) Descriptor() ([]byte, []int) {
 	return file_entity_proto_rawDescGZIP(), []int{12}
 }
 
-func (x *EntityHistoryRequest) GetGRN() *grn.GRN {
+func (x *EntityHistoryRequest) GetKey() string {
 	if x != nil {
-		return x.GRN
+		return x.Key
 	}
-	return nil
+	return ""
 }
 
 func (x *EntityHistoryRequest) GetLimit() int64 {
@@ -1167,17 +1251,40 @@ func (x *EntityHistoryRequest) GetNextPageToken() string {
 	return ""
 }
 
+func (x *EntityHistoryRequest) GetSort() []string {
+	if x != nil {
+		return x.Sort
+	}
+	return nil
+}
+
+func (x *EntityHistoryRequest) GetWithBody() bool {
+	if x != nil {
+		return x.WithBody
+	}
+	return false
+}
+
+func (x *EntityHistoryRequest) GetWithStatus() bool {
+	if x != nil {
+		return x.WithStatus
+	}
+	return false
+}
+
 type EntityHistoryResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
 	// Entity identifier
-	GRN *grn.GRN `protobuf:"bytes,1,opt,name=GRN,proto3" json:"GRN,omitempty"`
+	Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
 	// Entity metadata without the raw bytes
-	Versions []*EntityVersionInfo `protobuf:"bytes,2,rep,name=versions,proto3" json:"versions,omitempty"`
+	Versions []*Entity `protobuf:"bytes,2,rep,name=versions,proto3" json:"versions,omitempty"`
 	// More results exist... pass this in the next request
 	NextPageToken string `protobuf:"bytes,3,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	// ResourceVersion of the response
+	ResourceVersion int64 `protobuf:"varint,4,opt,name=resource_version,json=resourceVersion,proto3" json:"resource_version,omitempty"`
 }
 
 func (x *EntityHistoryResponse) Reset() {
@@ -1212,28 +1319,35 @@ func (*EntityHistoryResponse) Descriptor() ([]byte, []int) {
 	return file_entity_proto_rawDescGZIP(), []int{13}
 }
 
-func (x *EntityHistoryResponse) GetGRN() *grn.GRN {
+func (x *EntityHistoryResponse) GetKey() string {
 	if x != nil {
-		return x.GRN
+		return x.Key
 	}
-	return nil
+	return ""
 }
 
-func (x *EntityHistoryResponse) GetVersions() []*EntityVersionInfo {
+func (x *EntityHistoryResponse) GetVersions() []*Entity {
 	if x != nil {
 		return x.Versions
 	}
 	return nil
 }
 
-func (x *EntityHistoryResponse) GetNextPageToken() string {
+func (x *EntityHistoryResponse) GetNextPageToken() string {
+	if x != nil {
+		return x.NextPageToken
+	}
+	return ""
+}
+
+func (x *EntityHistoryResponse) GetResourceVersion() int64 {
 	if x != nil {
-		return x.NextPageToken
+		return x.ResourceVersion
 	}
-	return ""
+	return 0
 }
 
-type EntitySearchRequest struct {
+type EntityListRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -1244,8 +1358,12 @@ type EntitySearchRequest struct {
 	Limit int64 `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"`
 	// Free text query string -- mileage may vary :)
 	Query string `protobuf:"bytes,3,opt,name=query,proto3" json:"query,omitempty"`
-	// limit to a specific kind (empty is all)
-	Kind []string `protobuf:"bytes,4,rep,name=kind,proto3" json:"kind,omitempty"`
+	// limit to a specific group (empty is all)
+	Group []string `protobuf:"bytes,9,rep,name=group,proto3" json:"group,omitempty"`
+	// limit to a specific resource (empty is all)
+	Resource []string `protobuf:"bytes,4,rep,name=resource,proto3" json:"resource,omitempty"`
+	// limit to a specific key
+	Key []string `protobuf:"bytes,11,rep,name=key,proto3" json:"key,omitempty"`
 	// Limit results to items in a specific folder
 	Folder string `protobuf:"bytes,5,opt,name=folder,proto3" json:"folder,omitempty"`
 	// Must match all labels
@@ -1255,13 +1373,13 @@ type EntitySearchRequest struct {
 	// Return the full body in each payload
 	WithBody bool `protobuf:"varint,8,opt,name=with_body,json=withBody,proto3" json:"with_body,omitempty"`
 	// Return the full body in each payload
-	WithLabels bool `protobuf:"varint,9,opt,name=with_labels,json=withLabels,proto3" json:"with_labels,omitempty"`
-	// Return the full body in each payload
-	WithFields bool `protobuf:"varint,10,opt,name=with_fields,json=withFields,proto3" json:"with_fields,omitempty"`
+	WithStatus bool `protobuf:"varint,10,opt,name=with_status,json=withStatus,proto3" json:"with_status,omitempty"`
+	// list deleted entities instead of active ones
+	Deleted bool `protobuf:"varint,12,opt,name=deleted,proto3" json:"deleted,omitempty"`
 }
 
-func (x *EntitySearchRequest) Reset() {
-	*x = EntitySearchRequest{}
+func (x *EntityListRequest) Reset() {
+	*x = EntityListRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_entity_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1269,13 +1387,13 @@ func (x *EntitySearchRequest) Reset() {
 	}
 }
 
-func (x *EntitySearchRequest) String() string {
+func (x *EntityListRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*EntitySearchRequest) ProtoMessage() {}
+func (*EntityListRequest) ProtoMessage() {}
 
-func (x *EntitySearchRequest) ProtoReflect() protoreflect.Message {
+func (x *EntityListRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_entity_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1287,117 +1405,114 @@ func (x *EntitySearchRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use EntitySearchRequest.ProtoReflect.Descriptor instead.
-func (*EntitySearchRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use EntityListRequest.ProtoReflect.Descriptor instead.
+func (*EntityListRequest) Descriptor() ([]byte, []int) {
 	return file_entity_proto_rawDescGZIP(), []int{14}
 }
 
-func (x *EntitySearchRequest) GetNextPageToken() string {
+func (x *EntityListRequest) GetNextPageToken() string {
 	if x != nil {
 		return x.NextPageToken
 	}
 	return ""
 }
 
-func (x *EntitySearchRequest) GetLimit() int64 {
+func (x *EntityListRequest) GetLimit() int64 {
 	if x != nil {
 		return x.Limit
 	}
 	return 0
 }
 
-func (x *EntitySearchRequest) GetQuery() string {
+func (x *EntityListRequest) GetQuery() string {
 	if x != nil {
 		return x.Query
 	}
 	return ""
 }
 
-func (x *EntitySearchRequest) GetKind() []string {
+func (x *EntityListRequest) GetGroup() []string {
 	if x != nil {
-		return x.Kind
+		return x.Group
+	}
+	return nil
+}
+
+func (x *EntityListRequest) GetResource() []string {
+	if x != nil {
+		return x.Resource
+	}
+	return nil
+}
+
+func (x *EntityListRequest) GetKey() []string {
+	if x != nil {
+		return x.Key
 	}
 	return nil
 }
 
-func (x *EntitySearchRequest) GetFolder() string {
+func (x *EntityListRequest) GetFolder() string {
 	if x != nil {
 		return x.Folder
 	}
 	return ""
 }
 
-func (x *EntitySearchRequest) GetLabels() map[string]string {
+func (x *EntityListRequest) GetLabels() map[string]string {
 	if x != nil {
 		return x.Labels
 	}
 	return nil
 }
 
-func (x *EntitySearchRequest) GetSort() []string {
+func (x *EntityListRequest) GetSort() []string {
 	if x != nil {
 		return x.Sort
 	}
 	return nil
 }
 
-func (x *EntitySearchRequest) GetWithBody() bool {
+func (x *EntityListRequest) GetWithBody() bool {
 	if x != nil {
 		return x.WithBody
 	}
 	return false
 }
 
-func (x *EntitySearchRequest) GetWithLabels() bool {
+func (x *EntityListRequest) GetWithStatus() bool {
 	if x != nil {
-		return x.WithLabels
+		return x.WithStatus
 	}
 	return false
 }
 
-func (x *EntitySearchRequest) GetWithFields() bool {
+func (x *EntityListRequest) GetDeleted() bool {
 	if x != nil {
-		return x.WithFields
+		return x.Deleted
 	}
 	return false
 }
 
-// Search result metadata for each entity
-type EntitySearchResult struct {
+type ReferenceRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Entity identifier
-	GRN *grn.GRN `protobuf:"bytes,1,opt,name=GRN,proto3" json:"GRN,omitempty"`
-	// The current version of this entity
-	Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
-	// Content Length
-	Size int64 `protobuf:"varint,3,opt,name=size,proto3" json:"size,omitempty"`
-	// Time in epoch milliseconds that the entity was updated
-	UpdatedAt int64 `protobuf:"varint,4,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
-	// Who updated the entity
-	UpdatedBy string `protobuf:"bytes,5,opt,name=updated_by,json=updatedBy,proto3" json:"updated_by,omitempty"`
-	// Optionally include the full entity body
-	Body []byte `protobuf:"bytes,6,opt,name=body,proto3" json:"body,omitempty"`
-	// Always included
-	Name string `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"`
-	// Always included
-	Description string `protobuf:"bytes,8,opt,name=description,proto3" json:"description,omitempty"`
-	// The structured labels
-	Labels map[string]string `protobuf:"bytes,9,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// Folder UID
-	Folder string `protobuf:"bytes,10,opt,name=folder,proto3" json:"folder,omitempty"`
-	// Slugified name
-	Slug string `protobuf:"bytes,11,opt,name=slug,proto3" json:"slug,omitempty"`
-	// Optionally include extracted JSON
-	FieldsJson []byte `protobuf:"bytes,12,opt,name=fields_json,json=fieldsJson,proto3" json:"fields_json,omitempty"`
-	// EntityErrorInfo in json
-	ErrorJson []byte `protobuf:"bytes,13,opt,name=error_json,json=errorJson,proto3" json:"error_json,omitempty"`
-}
-
-func (x *EntitySearchResult) Reset() {
-	*x = EntitySearchResult{}
+	// Starting from the requested page (other query parameters must match!)
+	NextPageToken string `protobuf:"bytes,1,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	// Maximum number of items to return
+	Limit int64 `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"`
+	// Free text query string -- mileage may vary :)
+	Namespace string `protobuf:"bytes,5,opt,name=namespace,proto3" json:"namespace,omitempty"`
+	Group     string `protobuf:"bytes,6,opt,name=group,proto3" json:"group,omitempty"`
+	Resource  string `protobuf:"bytes,3,opt,name=resource,proto3" json:"resource,omitempty"`
+	// Free text query string -- mileage may vary :)
+	Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
+}
+
+func (x *ReferenceRequest) Reset() {
+	*x = ReferenceRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_entity_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1405,13 +1520,13 @@ func (x *EntitySearchResult) Reset() {
 	}
 }
 
-func (x *EntitySearchResult) String() string {
+func (x *ReferenceRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*EntitySearchResult) ProtoMessage() {}
+func (*ReferenceRequest) ProtoMessage() {}
 
-func (x *EntitySearchResult) ProtoReflect() protoreflect.Message {
+func (x *ReferenceRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_entity_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1423,114 +1538,67 @@ func (x *EntitySearchResult) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use EntitySearchResult.ProtoReflect.Descriptor instead.
-func (*EntitySearchResult) Descriptor() ([]byte, []int) {
+// Deprecated: Use ReferenceRequest.ProtoReflect.Descriptor instead.
+func (*ReferenceRequest) Descriptor() ([]byte, []int) {
 	return file_entity_proto_rawDescGZIP(), []int{15}
 }
 
-func (x *EntitySearchResult) GetGRN() *grn.GRN {
-	if x != nil {
-		return x.GRN
-	}
-	return nil
-}
-
-func (x *EntitySearchResult) GetVersion() string {
+func (x *ReferenceRequest) GetNextPageToken() string {
 	if x != nil {
-		return x.Version
+		return x.NextPageToken
 	}
 	return ""
 }
 
-func (x *EntitySearchResult) GetSize() int64 {
-	if x != nil {
-		return x.Size
-	}
-	return 0
-}
-
-func (x *EntitySearchResult) GetUpdatedAt() int64 {
+func (x *ReferenceRequest) GetLimit() int64 {
 	if x != nil {
-		return x.UpdatedAt
+		return x.Limit
 	}
 	return 0
 }
 
-func (x *EntitySearchResult) GetUpdatedBy() string {
-	if x != nil {
-		return x.UpdatedBy
-	}
-	return ""
-}
-
-func (x *EntitySearchResult) GetBody() []byte {
-	if x != nil {
-		return x.Body
-	}
-	return nil
-}
-
-func (x *EntitySearchResult) GetName() string {
+func (x *ReferenceRequest) GetNamespace() string {
 	if x != nil {
-		return x.Name
+		return x.Namespace
 	}
 	return ""
 }
 
-func (x *EntitySearchResult) GetDescription() string {
+func (x *ReferenceRequest) GetGroup() string {
 	if x != nil {
-		return x.Description
+		return x.Group
 	}
 	return ""
 }
 
-func (x *EntitySearchResult) GetLabels() map[string]string {
-	if x != nil {
-		return x.Labels
-	}
-	return nil
-}
-
-func (x *EntitySearchResult) GetFolder() string {
+func (x *ReferenceRequest) GetResource() string {
 	if x != nil {
-		return x.Folder
+		return x.Resource
 	}
 	return ""
 }
 
-func (x *EntitySearchResult) GetSlug() string {
+func (x *ReferenceRequest) GetName() string {
 	if x != nil {
-		return x.Slug
+		return x.Name
 	}
 	return ""
 }
 
-func (x *EntitySearchResult) GetFieldsJson() []byte {
-	if x != nil {
-		return x.FieldsJson
-	}
-	return nil
-}
-
-func (x *EntitySearchResult) GetErrorJson() []byte {
-	if x != nil {
-		return x.ErrorJson
-	}
-	return nil
-}
-
-type EntitySearchResponse struct {
+type EntityListResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Results []*EntitySearchResult `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
+	Results []*Entity `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
 	// More results exist... pass this in the next request
 	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	// ResourceVersion of the list response
+	ResourceVersion int64 `protobuf:"varint,3,opt,name=resource_version,json=resourceVersion,proto3" json:"resource_version,omitempty"`
 }
 
-func (x *EntitySearchResponse) Reset() {
-	*x = EntitySearchResponse{}
+func (x *EntityListResponse) Reset() {
+	*x = EntityListResponse{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_entity_proto_msgTypes[16]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1538,13 +1606,13 @@ func (x *EntitySearchResponse) Reset() {
 	}
 }
 
-func (x *EntitySearchResponse) String() string {
+func (x *EntityListResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*EntitySearchResponse) ProtoMessage() {}
+func (*EntityListResponse) ProtoMessage() {}
 
-func (x *EntitySearchResponse) ProtoReflect() protoreflect.Message {
+func (x *EntityListResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_entity_proto_msgTypes[16]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1556,46 +1624,51 @@ func (x *EntitySearchResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use EntitySearchResponse.ProtoReflect.Descriptor instead.
-func (*EntitySearchResponse) Descriptor() ([]byte, []int) {
+// Deprecated: Use EntityListResponse.ProtoReflect.Descriptor instead.
+func (*EntityListResponse) Descriptor() ([]byte, []int) {
 	return file_entity_proto_rawDescGZIP(), []int{16}
 }
 
-func (x *EntitySearchResponse) GetResults() []*EntitySearchResult {
+func (x *EntityListResponse) GetResults() []*Entity {
 	if x != nil {
 		return x.Results
 	}
 	return nil
 }
 
-func (x *EntitySearchResponse) GetNextPageToken() string {
+func (x *EntityListResponse) GetNextPageToken() string {
 	if x != nil {
 		return x.NextPageToken
 	}
 	return ""
 }
 
+func (x *EntityListResponse) GetResourceVersion() int64 {
+	if x != nil {
+		return x.ResourceVersion
+	}
+	return 0
+}
+
 type EntityWatchRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Timestamp of last changes. Empty will default to
+	// ResourceVersion of last changes. Empty will default to full history
 	Since int64 `protobuf:"varint,1,opt,name=since,proto3" json:"since,omitempty"`
-	// Watch sppecific entities
-	GRN []*grn.GRN `protobuf:"bytes,2,rep,name=GRN,proto3" json:"GRN,omitempty"`
-	// limit to a specific kind (empty is all)
-	Kind []string `protobuf:"bytes,3,rep,name=kind,proto3" json:"kind,omitempty"`
+	// Watch specific entities
+	Key []string `protobuf:"bytes,2,rep,name=key,proto3" json:"key,omitempty"`
+	// limit to a specific resource (empty is all)
+	Resource []string `protobuf:"bytes,3,rep,name=resource,proto3" json:"resource,omitempty"`
 	// Limit results to items in a specific folder
 	Folder string `protobuf:"bytes,4,opt,name=folder,proto3" json:"folder,omitempty"`
 	// Must match all labels
 	Labels map[string]string `protobuf:"bytes,5,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Return the full body in each payload
 	WithBody bool `protobuf:"varint,6,opt,name=with_body,json=withBody,proto3" json:"with_body,omitempty"`
-	// Return the full body in each payload
-	WithLabels bool `protobuf:"varint,7,opt,name=with_labels,json=withLabels,proto3" json:"with_labels,omitempty"`
-	// Return the full body in each payload
-	WithFields bool `protobuf:"varint,8,opt,name=with_fields,json=withFields,proto3" json:"with_fields,omitempty"`
+	// Return the full status in each payload
+	WithStatus bool `protobuf:"varint,7,opt,name=with_status,json=withStatus,proto3" json:"with_status,omitempty"`
 }
 
 func (x *EntityWatchRequest) Reset() {
@@ -1637,16 +1710,16 @@ func (x *EntityWatchRequest) GetSince() int64 {
 	return 0
 }
 
-func (x *EntityWatchRequest) GetGRN() []*grn.GRN {
+func (x *EntityWatchRequest) GetKey() []string {
 	if x != nil {
-		return x.GRN
+		return x.Key
 	}
 	return nil
 }
 
-func (x *EntityWatchRequest) GetKind() []string {
+func (x *EntityWatchRequest) GetResource() []string {
 	if x != nil {
-		return x.Kind
+		return x.Resource
 	}
 	return nil
 }
@@ -1672,16 +1745,9 @@ func (x *EntityWatchRequest) GetWithBody() bool {
 	return false
 }
 
-func (x *EntityWatchRequest) GetWithLabels() bool {
-	if x != nil {
-		return x.WithLabels
-	}
-	return false
-}
-
-func (x *EntityWatchRequest) GetWithFields() bool {
+func (x *EntityWatchRequest) GetWithStatus() bool {
 	if x != nil {
-		return x.WithFields
+		return x.WithStatus
 	}
 	return false
 }
@@ -1693,10 +1759,8 @@ type EntityWatchResponse struct {
 
 	// Timestamp the event was sent
 	Timestamp int64 `protobuf:"varint,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
-	// List of entities with the same action
-	Entity []*Entity `protobuf:"bytes,2,rep,name=entity,proto3" json:"entity,omitempty"`
-	// Action code
-	Action EntityWatchResponse_Action `protobuf:"varint,3,opt,name=action,proto3,enum=entity.EntityWatchResponse_Action" json:"action,omitempty"`
+	// Entity that was created, updated, or deleted
+	Entity *Entity `protobuf:"bytes,2,opt,name=entity,proto3" json:"entity,omitempty"`
 }
 
 func (x *EntityWatchResponse) Reset() {
@@ -1738,263 +1802,510 @@ func (x *EntityWatchResponse) GetTimestamp() int64 {
 	return 0
 }
 
-func (x *EntityWatchResponse) GetEntity() []*Entity {
+func (x *EntityWatchResponse) GetEntity() *Entity {
 	if x != nil {
 		return x.Entity
 	}
 	return nil
 }
 
-func (x *EntityWatchResponse) GetAction() EntityWatchResponse_Action {
+type EntitySummary struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	UID         string `protobuf:"bytes,1,opt,name=UID,proto3" json:"UID,omitempty"`
+	Kind        string `protobuf:"bytes,2,opt,name=kind,proto3" json:"kind,omitempty"`
+	Name        string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	Description string `protobuf:"bytes,4,opt,name=description,proto3" json:"description,omitempty"`
+	// Key value pairs.  Tags are are represented as keys with empty values
+	Labels map[string]string `protobuf:"bytes,5,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// Parent folder UID
+	Folder string `protobuf:"bytes,6,opt,name=folder,proto3" json:"folder,omitempty"`
+	// URL safe version of the name.  It will be unique within the folder
+	Slug string `protobuf:"bytes,7,opt,name=slug,proto3" json:"slug,omitempty"`
+	// When errors exist
+	Error *EntityErrorInfo `protobuf:"bytes,8,opt,name=error,proto3" json:"error,omitempty"`
+	// Optional field values.  The schema will define and document possible values for a given kind
+	Fields map[string]string `protobuf:"bytes,9,rep,name=fields,proto3" json:"fields,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// eg: panels within dashboard
+	Nested []*EntitySummary `protobuf:"bytes,10,rep,name=nested,proto3" json:"nested,omitempty"`
+	// Optional references to external things
+	References []*EntityExternalReference `protobuf:"bytes,11,rep,name=references,proto3" json:"references,omitempty"`
+}
+
+func (x *EntitySummary) Reset() {
+	*x = EntitySummary{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_entity_proto_msgTypes[19]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *EntitySummary) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*EntitySummary) ProtoMessage() {}
+
+func (x *EntitySummary) ProtoReflect() protoreflect.Message {
+	mi := &file_entity_proto_msgTypes[19]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use EntitySummary.ProtoReflect.Descriptor instead.
+func (*EntitySummary) Descriptor() ([]byte, []int) {
+	return file_entity_proto_rawDescGZIP(), []int{19}
+}
+
+func (x *EntitySummary) GetUID() string {
 	if x != nil {
-		return x.Action
+		return x.UID
+	}
+	return ""
+}
+
+func (x *EntitySummary) GetKind() string {
+	if x != nil {
+		return x.Kind
+	}
+	return ""
+}
+
+func (x *EntitySummary) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *EntitySummary) GetDescription() string {
+	if x != nil {
+		return x.Description
+	}
+	return ""
+}
+
+func (x *EntitySummary) GetLabels() map[string]string {
+	if x != nil {
+		return x.Labels
+	}
+	return nil
+}
+
+func (x *EntitySummary) GetFolder() string {
+	if x != nil {
+		return x.Folder
+	}
+	return ""
+}
+
+func (x *EntitySummary) GetSlug() string {
+	if x != nil {
+		return x.Slug
+	}
+	return ""
+}
+
+func (x *EntitySummary) GetError() *EntityErrorInfo {
+	if x != nil {
+		return x.Error
+	}
+	return nil
+}
+
+func (x *EntitySummary) GetFields() map[string]string {
+	if x != nil {
+		return x.Fields
+	}
+	return nil
+}
+
+func (x *EntitySummary) GetNested() []*EntitySummary {
+	if x != nil {
+		return x.Nested
+	}
+	return nil
+}
+
+func (x *EntitySummary) GetReferences() []*EntityExternalReference {
+	if x != nil {
+		return x.References
+	}
+	return nil
+}
+
+type EntityExternalReference struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Category of dependency
+	// eg: datasource, plugin, runtime
+	Family string `protobuf:"bytes,1,opt,name=family,proto3" json:"family,omitempty"`
+	// datasource > prometheus|influx|...
+	// plugin > panel | datasource
+	// runtime > transformer
+	Type string `protobuf:"bytes,2,opt,name=type,proto3" json:"type,omitempty"`
+	// datasource > UID
+	// plugin > plugin identifier
+	// runtime > name lookup
+	Identifier string `protobuf:"bytes,3,opt,name=identifier,proto3" json:"identifier,omitempty"`
+}
+
+func (x *EntityExternalReference) Reset() {
+	*x = EntityExternalReference{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_entity_proto_msgTypes[20]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *EntityExternalReference) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*EntityExternalReference) ProtoMessage() {}
+
+func (x *EntityExternalReference) ProtoReflect() protoreflect.Message {
+	mi := &file_entity_proto_msgTypes[20]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use EntityExternalReference.ProtoReflect.Descriptor instead.
+func (*EntityExternalReference) Descriptor() ([]byte, []int) {
+	return file_entity_proto_rawDescGZIP(), []int{20}
+}
+
+func (x *EntityExternalReference) GetFamily() string {
+	if x != nil {
+		return x.Family
+	}
+	return ""
+}
+
+func (x *EntityExternalReference) GetType() string {
+	if x != nil {
+		return x.Type
+	}
+	return ""
+}
+
+func (x *EntityExternalReference) GetIdentifier() string {
+	if x != nil {
+		return x.Identifier
 	}
-	return EntityWatchResponse_UNKNOWN
+	return ""
 }
 
 var File_entity_proto protoreflect.FileDescriptor
 
 var file_entity_proto_rawDesc = []byte{
 	0x0a, 0x0c, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06,
-	0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x1a, 0x17, 0x70, 0x6b, 0x67, 0x2f, 0x69, 0x6e, 0x66, 0x72,
-	0x61, 0x2f, 0x67, 0x72, 0x6e, 0x2f, 0x67, 0x72, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
-	0xe3, 0x02, 0x0a, 0x06, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x1a, 0x0a, 0x03, 0x47, 0x52,
-	0x4e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x67, 0x72, 0x6e, 0x2e, 0x47, 0x52,
-	0x4e, 0x52, 0x03, 0x47, 0x52, 0x4e, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f,
-	0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
-	0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12,
-	0x1d, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1d,
-	0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x42, 0x79, 0x12, 0x1d, 0x0a,
-	0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x42, 0x79, 0x12, 0x16, 0x0a, 0x06,
-	0x66, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x6f,
-	0x6c, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x45, 0x54, 0x61, 0x67, 0x18, 0x08, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x45, 0x54, 0x61, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x7a, 0x65,
-	0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x12, 0x12, 0x0a, 0x04,
-	0x62, 0x6f, 0x64, 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79,
-	0x12, 0x21, 0x0a, 0x0c, 0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x5f, 0x6a, 0x73, 0x6f, 0x6e,
-	0x18, 0x0b, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0b, 0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x4a,
-	0x73, 0x6f, 0x6e, 0x12, 0x30, 0x0a, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x18, 0x0c, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74,
-	0x69, 0x74, 0x79, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x6f,
-	0x72, 0x69, 0x67, 0x69, 0x6e, 0x22, 0x50, 0x0a, 0x10, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x4f,
-	0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x6b, 0x65, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x62, 0x0a, 0x0f, 0x45, 0x6e, 0x74, 0x69, 0x74,
-	0x79, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f,
-	0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18,
-	0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x64, 0x65, 0x74, 0x61,
-	0x69, 0x6c, 0x73, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0b,
-	0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x4a, 0x73, 0x6f, 0x6e, 0x22, 0xad, 0x01, 0x0a, 0x11,
-	0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66,
-	0x6f, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1d, 0x0a, 0x0a, 0x75,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x75, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
-	0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x42, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x7a,
-	0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x12, 0x12, 0x0a,
-	0x04, 0x45, 0x54, 0x61, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x45, 0x54, 0x61,
-	0x67, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x89, 0x01, 0x0a, 0x11,
-	0x52, 0x65, 0x61, 0x64, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x12, 0x1a, 0x0a, 0x03, 0x47, 0x52, 0x4e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08,
-	0x2e, 0x67, 0x72, 0x6e, 0x2e, 0x47, 0x52, 0x4e, 0x52, 0x03, 0x47, 0x52, 0x4e, 0x12, 0x18, 0x0a,
-	0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
-	0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1b, 0x0a, 0x09, 0x77, 0x69, 0x74, 0x68, 0x5f,
-	0x62, 0x6f, 0x64, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x77, 0x69, 0x74, 0x68,
-	0x42, 0x6f, 0x64, 0x79, 0x12, 0x21, 0x0a, 0x0c, 0x77, 0x69, 0x74, 0x68, 0x5f, 0x73, 0x75, 0x6d,
-	0x6d, 0x61, 0x72, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x77, 0x69, 0x74, 0x68,
-	0x53, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x22, 0x49, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x63, 0x68,
-	0x52, 0x65, 0x61, 0x64, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x12, 0x2f, 0x0a, 0x05, 0x62, 0x61, 0x74, 0x63, 0x68, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x19, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x52, 0x65, 0x61, 0x64, 0x45, 0x6e,
-	0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x05, 0x62, 0x61, 0x74,
-	0x63, 0x68, 0x22, 0x43, 0x0a, 0x17, 0x42, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x61, 0x64, 0x45,
-	0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a,
-	0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e,
-	0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x07,
-	0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x22, 0xa1, 0x01, 0x0a, 0x12, 0x57, 0x72, 0x69, 0x74,
-	0x65, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a,
-	0x0a, 0x03, 0x47, 0x52, 0x4e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x67, 0x72,
-	0x6e, 0x2e, 0x47, 0x52, 0x4e, 0x52, 0x03, 0x47, 0x52, 0x4e, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f,
-	0x6c, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x6f, 0x6c, 0x64,
-	0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c,
-	0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e,
-	0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74,
-	0x12, 0x29, 0x0a, 0x10, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x5f, 0x76, 0x65, 0x72,
-	0x73, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x70, 0x72, 0x65, 0x76,
-	0x69, 0x6f, 0x75, 0x73, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x93, 0x03, 0x0a, 0x17,
-	0x41, 0x64, 0x6d, 0x69, 0x6e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x03, 0x47, 0x52, 0x4e, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x67, 0x72, 0x6e, 0x2e, 0x47, 0x52, 0x4e, 0x52, 0x03,
-	0x47, 0x52, 0x4e, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x62,
-	0x6f, 0x64, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12,
-	0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x72, 0x65,
-	0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63,
-	0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x75, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74,
-	0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x72, 0x65,
-	0x61, 0x74, 0x65, 0x64, 0x42, 0x79, 0x12, 0x1d, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x64, 0x5f, 0x62, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x64, 0x42, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
-	0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12,
-	0x29, 0x0a, 0x10, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x5f, 0x76, 0x65, 0x72, 0x73,
-	0x69, 0x6f, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x70, 0x72, 0x65, 0x76, 0x69,
-	0x6f, 0x75, 0x73, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x6c,
-	0x65, 0x61, 0x72, 0x5f, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x0c, 0x63, 0x6c, 0x65, 0x61, 0x72, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x12,
-	0x30, 0x0a, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x22, 0x9f, 0x08, 0x0a, 0x06, 0x45, 0x6e, 0x74, 0x69, 0x74,
+	0x79, 0x12, 0x12, 0x0a, 0x04, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x67, 0x75, 0x69, 0x64, 0x12, 0x29, 0x0a, 0x10, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x0f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
+	0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x18, 0x19, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18,
+	0x1a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65,
+	0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x75, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x75, 0x62, 0x72, 0x65,
+	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f,
+	0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x67,
+	0x72, 0x6f, 0x75, 0x70, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+	0x65, 0x79, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x16, 0x0a,
+	0x06, 0x66, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66,
+	0x6f, 0x6c, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x0c, 0x52, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x6f, 0x64,
+	0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12, 0x16, 0x0a,
+	0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x73,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x08,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x73,
+	0x69, 0x7a, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x12,
+	0x12, 0x0a, 0x04, 0x45, 0x54, 0x61, 0x67, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x45,
+	0x54, 0x61, 0x67, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61,
+	0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64,
+	0x41, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79,
+	0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x42,
+	0x79, 0x12, 0x1d, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18,
+	0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74,
+	0x12, 0x1d, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x0e,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x42, 0x79, 0x12,
+	0x30, 0x0a, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32,
 	0x18, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x4f,
 	0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69,
-	0x6e, 0x22, 0xb0, 0x02, 0x0a, 0x13, 0x57, 0x72, 0x69, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x69, 0x74,
-	0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2d, 0x0a, 0x05, 0x65, 0x72, 0x72,
-	0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74,
-	0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x49, 0x6e, 0x66,
-	0x6f, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x1a, 0x0a, 0x03, 0x47, 0x52, 0x4e, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x67, 0x72, 0x6e, 0x2e, 0x47, 0x52, 0x4e, 0x52,
-	0x03, 0x47, 0x52, 0x4e, 0x12, 0x31, 0x0a, 0x06, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e,
-	0x74, 0x69, 0x74, 0x79, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52,
-	0x06, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x21, 0x0a, 0x0c, 0x73, 0x75, 0x6d, 0x6d, 0x61,
-	0x72, 0x79, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0b, 0x73,
-	0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x4a, 0x73, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x06, 0x73, 0x74,
-	0x61, 0x74, 0x75, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x74,
-	0x69, 0x74, 0x79, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52,
+	0x6e, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
+	0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x6c, 0x75, 0x67, 0x18, 0x11, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x73, 0x6c, 0x75, 0x67, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61,
+	0x67, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
+	0x65, 0x12, 0x32, 0x0a, 0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x18, 0x13, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x1a, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74,
+	0x79, 0x2e, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x6c,
+	0x61, 0x62, 0x65, 0x6c, 0x73, 0x12, 0x32, 0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18,
+	0x14, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45,
+	0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72,
+	0x79, 0x52, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x12, 0x2f, 0x0a, 0x06, 0x65, 0x72, 0x72,
+	0x6f, 0x72, 0x73, 0x18, 0x15, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x65, 0x6e, 0x74, 0x69,
+	0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x49, 0x6e,
+	0x66, 0x6f, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x12, 0x2d, 0x0a, 0x06, 0x61, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x15, 0x2e, 0x65, 0x6e, 0x74,
+	0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x39, 0x0a, 0x0b, 0x4c, 0x61, 0x62,
+	0x65, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x45, 0x6e,
+	0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
+	0x47, 0x0a, 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b,
+	0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x43, 0x52, 0x45, 0x41, 0x54, 0x45,
+	0x44, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x44, 0x10, 0x02,
+	0x12, 0x0b, 0x0a, 0x07, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x44, 0x10, 0x03, 0x12, 0x09, 0x0a,
+	0x05, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x04, 0x22, 0x50, 0x0a, 0x10, 0x45, 0x6e, 0x74, 0x69,
+	0x74, 0x79, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06,
+	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x62, 0x0a, 0x0f, 0x45, 0x6e,
+	0x74, 0x69, 0x74, 0x79, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a,
+	0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x63, 0x6f, 0x64,
+	0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x64,
+	0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x0c, 0x52, 0x0b, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x4a, 0x73, 0x6f, 0x6e, 0x22, 0x8e,
+	0x01, 0x0a, 0x11, 0x52, 0x65, 0x61, 0x64, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x29, 0x0a, 0x10, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x0f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f,
+	0x6e, 0x12, 0x1b, 0x0a, 0x09, 0x77, 0x69, 0x74, 0x68, 0x5f, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x77, 0x69, 0x74, 0x68, 0x42, 0x6f, 0x64, 0x79, 0x12, 0x1f,
+	0x0a, 0x0b, 0x77, 0x69, 0x74, 0x68, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x0a, 0x77, 0x69, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22,
+	0x49, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x61, 0x64, 0x45, 0x6e, 0x74, 0x69,
+	0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2f, 0x0a, 0x05, 0x62, 0x61, 0x74,
+	0x63, 0x68, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74,
+	0x79, 0x2e, 0x52, 0x65, 0x61, 0x64, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x52, 0x05, 0x62, 0x61, 0x74, 0x63, 0x68, 0x22, 0x43, 0x0a, 0x17, 0x42, 0x61,
+	0x74, 0x63, 0x68, 0x52, 0x65, 0x61, 0x64, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e,
+	0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x22,
+	0x3d, 0x0a, 0x13, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x06, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e,
+	0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x06, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x22, 0xcc,
+	0x01, 0x0a, 0x14, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2d, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e,
+	0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52,
+	0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x26, 0x0a, 0x06, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e,
+	0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x06, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x3b,
+	0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x23,
+	0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6e,
+	0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x53, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x20, 0x0a, 0x06, 0x53,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x00,
+	0x12, 0x0b, 0x0a, 0x07, 0x43, 0x52, 0x45, 0x41, 0x54, 0x45, 0x44, 0x10, 0x01, 0x22, 0x68, 0x0a,
+	0x13, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x06, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e,
+	0x74, 0x69, 0x74, 0x79, 0x52, 0x06, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x29, 0x0a, 0x10,
+	0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73,
+	0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0xdb, 0x01, 0x0a, 0x14, 0x55, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x12, 0x2d, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x17, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x45,
+	0x72, 0x72, 0x6f, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12,
+	0x26, 0x0a, 0x06, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x0e, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52,
+	0x06, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x3b, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75,
+	0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79,
+	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74,
+	0x61, 0x74, 0x75, 0x73, 0x22, 0x2f, 0x0a, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x09,
+	0x0a, 0x05, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x50, 0x44,
+	0x41, 0x54, 0x45, 0x44, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x55, 0x4e, 0x43, 0x48, 0x41, 0x4e,
+	0x47, 0x45, 0x44, 0x10, 0x02, 0x22, 0x52, 0x0a, 0x13, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x45,
+	0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03,
+	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x29,
+	0x0a, 0x10, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69,
+	0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f,
+	0x75, 0x73, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0xda, 0x01, 0x0a, 0x14, 0x44, 0x65,
+	0x6c, 0x65, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x2d, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x17, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74,
+	0x79, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f,
+	0x72, 0x12, 0x26, 0x0a, 0x06, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x0e, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74,
+	0x79, 0x52, 0x06, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x3b, 0x0a, 0x06, 0x73, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x74, 0x69,
+	0x74, 0x79, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52,
 	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06,
-	0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x3c, 0x0a, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x12, 0x09, 0x0a, 0x05, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x43,
-	0x52, 0x45, 0x41, 0x54, 0x45, 0x44, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x50, 0x44, 0x41,
-	0x54, 0x45, 0x44, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x55, 0x4e, 0x43, 0x48, 0x41, 0x4e, 0x47,
-	0x45, 0x44, 0x10, 0x03, 0x22, 0x5c, 0x0a, 0x13, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x45, 0x6e,
-	0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x03, 0x47,
-	0x52, 0x4e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x67, 0x72, 0x6e, 0x2e, 0x47,
-	0x52, 0x4e, 0x52, 0x03, 0x47, 0x52, 0x4e, 0x12, 0x29, 0x0a, 0x10, 0x70, 0x72, 0x65, 0x76, 0x69,
-	0x6f, 0x75, 0x73, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0f, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x56, 0x65, 0x72, 0x73, 0x69,
-	0x6f, 0x6e, 0x22, 0x26, 0x0a, 0x14, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x69,
-	0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x4f, 0x4b,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x02, 0x4f, 0x4b, 0x22, 0x70, 0x0a, 0x14, 0x45, 0x6e,
-	0x74, 0x69, 0x74, 0x79, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x12, 0x1a, 0x0a, 0x03, 0x47, 0x52, 0x4e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x08, 0x2e, 0x67, 0x72, 0x6e, 0x2e, 0x47, 0x52, 0x4e, 0x52, 0x03, 0x47, 0x52, 0x4e, 0x12, 0x14,
-	0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6c,
-	0x69, 0x6d, 0x69, 0x74, 0x12, 0x26, 0x0a, 0x0f, 0x6e, 0x65, 0x78, 0x74, 0x5f, 0x70, 0x61, 0x67,
-	0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6e,
-	0x65, 0x78, 0x74, 0x50, 0x61, 0x67, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x22, 0x92, 0x01, 0x0a,
-	0x15, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x03, 0x47, 0x52, 0x4e, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x67, 0x72, 0x6e, 0x2e, 0x47, 0x52, 0x4e, 0x52, 0x03, 0x47,
-	0x52, 0x4e, 0x12, 0x35, 0x0a, 0x08, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e,
-	0x74, 0x69, 0x74, 0x79, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52,
+	0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x2e, 0x0a, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
+	0x12, 0x09, 0x0a, 0x05, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x44,
+	0x45, 0x4c, 0x45, 0x54, 0x45, 0x44, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x4e, 0x4f, 0x54, 0x46,
+	0x4f, 0x55, 0x4e, 0x44, 0x10, 0x02, 0x22, 0xb8, 0x01, 0x0a, 0x14, 0x45, 0x6e, 0x74, 0x69, 0x74,
+	0x79, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
+	0x79, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x26, 0x0a, 0x0f, 0x6e, 0x65, 0x78, 0x74, 0x5f,
+	0x70, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0d, 0x6e, 0x65, 0x78, 0x74, 0x50, 0x61, 0x67, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12,
+	0x12, 0x0a, 0x04, 0x73, 0x6f, 0x72, 0x74, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x73,
+	0x6f, 0x72, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x77, 0x69, 0x74, 0x68, 0x5f, 0x62, 0x6f, 0x64, 0x79,
+	0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x77, 0x69, 0x74, 0x68, 0x42, 0x6f, 0x64, 0x79,
+	0x12, 0x1f, 0x0a, 0x0b, 0x77, 0x69, 0x74, 0x68, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18,
+	0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x77, 0x69, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x75,
+	0x73, 0x22, 0xa8, 0x01, 0x0a, 0x15, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x48, 0x69, 0x73, 0x74,
+	0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2a, 0x0a,
+	0x08, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x0e, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52,
 	0x08, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x26, 0x0a, 0x0f, 0x6e, 0x65, 0x78,
 	0x74, 0x5f, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x03, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x0d, 0x6e, 0x65, 0x78, 0x74, 0x50, 0x61, 0x67, 0x65, 0x54, 0x6f, 0x6b, 0x65,
-	0x6e, 0x22, 0x84, 0x03, 0x0a, 0x13, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x53, 0x65, 0x61, 0x72,
-	0x63, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x0f, 0x6e, 0x65, 0x78,
-	0x74, 0x5f, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0d, 0x6e, 0x65, 0x78, 0x74, 0x50, 0x61, 0x67, 0x65, 0x54, 0x6f, 0x6b, 0x65,
-	0x6e, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x12, 0x0a,
-	0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x6b, 0x69, 0x6e,
-	0x64, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x06, 0x66, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x12, 0x3f, 0x0a, 0x06, 0x6c, 0x61, 0x62,
-	0x65, 0x6c, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x65, 0x6e, 0x74, 0x69,
-	0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x52, 0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x6f,
-	0x72, 0x74, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x73, 0x6f, 0x72, 0x74, 0x12, 0x1b,
-	0x0a, 0x09, 0x77, 0x69, 0x74, 0x68, 0x5f, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x08, 0x77, 0x69, 0x74, 0x68, 0x42, 0x6f, 0x64, 0x79, 0x12, 0x1f, 0x0a, 0x0b, 0x77,
-	0x69, 0x74, 0x68, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x0a, 0x77, 0x69, 0x74, 0x68, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x12, 0x1f, 0x0a, 0x0b,
-	0x77, 0x69, 0x74, 0x68, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x0a, 0x77, 0x69, 0x74, 0x68, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x1a, 0x39, 0x0a,
-	0x0b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
-	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
-	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xcd, 0x03, 0x0a, 0x12, 0x45, 0x6e, 0x74,
-	0x69, 0x74, 0x79, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12,
-	0x1a, 0x0a, 0x03, 0x47, 0x52, 0x4e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x67,
-	0x72, 0x6e, 0x2e, 0x47, 0x52, 0x4e, 0x52, 0x03, 0x47, 0x52, 0x4e, 0x12, 0x18, 0x0a, 0x07, 0x76,
-	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65,
-	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x75, 0x70, 0x64,
-	0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x75,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x75, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x64, 0x42, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18,
-	0x06, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12,
-	0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x08,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x12, 0x3e, 0x0a, 0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x26, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74,
-	0x79, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x2e, 0x4c, 0x61,
+	0x6e, 0x12, 0x29, 0x0a, 0x10, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x76, 0x65,
+	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x72, 0x65, 0x73,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0xa9, 0x03, 0x0a,
+	0x11, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x26, 0x0a, 0x0f, 0x6e, 0x65, 0x78, 0x74, 0x5f, 0x70, 0x61, 0x67, 0x65, 0x5f,
+	0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6e, 0x65, 0x78,
+	0x74, 0x50, 0x61, 0x67, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x69,
+	0x6d, 0x69, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74,
+	0x12, 0x14, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18,
+	0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x1a, 0x0a, 0x08,
+	0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08,
+	0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
+	0x0b, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f,
+	0x6c, 0x64, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x6f, 0x6c, 0x64,
+	0x65, 0x72, 0x12, 0x3d, 0x0a, 0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x18, 0x06, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x25, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69,
+	0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x4c, 0x61,
 	0x62, 0x65, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c,
-	0x73, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x18, 0x0a, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x06, 0x66, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x6c, 0x75,
-	0x67, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x6c, 0x75, 0x67, 0x12, 0x1f, 0x0a,
-	0x0b, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x18, 0x0c, 0x20, 0x01,
-	0x28, 0x0c, 0x52, 0x0a, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x4a, 0x73, 0x6f, 0x6e, 0x12, 0x1d,
-	0x0a, 0x0a, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x18, 0x0d, 0x20, 0x01,
-	0x28, 0x0c, 0x52, 0x09, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x4a, 0x73, 0x6f, 0x6e, 0x1a, 0x39, 0x0a,
+	0x73, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x6f, 0x72, 0x74, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52,
+	0x04, 0x73, 0x6f, 0x72, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x77, 0x69, 0x74, 0x68, 0x5f, 0x62, 0x6f,
+	0x64, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x77, 0x69, 0x74, 0x68, 0x42, 0x6f,
+	0x64, 0x79, 0x12, 0x1f, 0x0a, 0x0b, 0x77, 0x69, 0x74, 0x68, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75,
+	0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x77, 0x69, 0x74, 0x68, 0x53, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x18, 0x0c,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x1a, 0x39, 0x0a,
 	0x0b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
 	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
 	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x74, 0x0a, 0x14, 0x45, 0x6e, 0x74, 0x69,
-	0x74, 0x79, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x12, 0x34, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x1a, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74,
-	0x79, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x07, 0x72,
-	0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x26, 0x0a, 0x0f, 0x6e, 0x65, 0x78, 0x74, 0x5f, 0x70,
-	0x61, 0x67, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0d, 0x6e, 0x65, 0x78, 0x74, 0x50, 0x61, 0x67, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x22, 0xcc,
-	0x02, 0x0a, 0x12, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x03, 0x47,
-	0x52, 0x4e, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x67, 0x72, 0x6e, 0x2e, 0x47,
-	0x52, 0x4e, 0x52, 0x03, 0x47, 0x52, 0x4e, 0x12, 0x12, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18,
-	0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x66,
-	0x6f, 0x6c, 0x64, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x6f, 0x6c,
-	0x64, 0x65, 0x72, 0x12, 0x3e, 0x0a, 0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x18, 0x05, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74,
-	0x69, 0x74, 0x79, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e,
-	0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x6c, 0x61, 0x62,
-	0x65, 0x6c, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x77, 0x69, 0x74, 0x68, 0x5f, 0x62, 0x6f, 0x64, 0x79,
-	0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x77, 0x69, 0x74, 0x68, 0x42, 0x6f, 0x64, 0x79,
-	0x12, 0x1f, 0x0a, 0x0b, 0x77, 0x69, 0x74, 0x68, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x18,
-	0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x77, 0x69, 0x74, 0x68, 0x4c, 0x61, 0x62, 0x65, 0x6c,
-	0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x77, 0x69, 0x74, 0x68, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73,
-	0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x77, 0x69, 0x74, 0x68, 0x46, 0x69, 0x65, 0x6c,
-	0x64, 0x73, 0x1a, 0x39, 0x0a, 0x0b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xc8, 0x01,
-	0x0a, 0x13, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
-	0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74,
-	0x61, 0x6d, 0x70, 0x12, 0x26, 0x0a, 0x06, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x02, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74,
-	0x69, 0x74, 0x79, 0x52, 0x06, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x3a, 0x0a, 0x06, 0x61,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x22, 0x2e, 0x65, 0x6e,
-	0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x57, 0x61, 0x74, 0x63, 0x68,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x2f, 0x0a, 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x0b,
-	0x0a, 0x07, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x44, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x44,
-	0x45, 0x4c, 0x45, 0x54, 0x45, 0x44, 0x10, 0x02, 0x32, 0xb2, 0x04, 0x0a, 0x0b, 0x45, 0x6e, 0x74,
+	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb4, 0x01, 0x0a, 0x10, 0x52, 0x65, 0x66,
+	0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x26, 0x0a,
+	0x0f, 0x6e, 0x65, 0x78, 0x74, 0x5f, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6e, 0x65, 0x78, 0x74, 0x50, 0x61, 0x67, 0x65,
+	0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x6e,
+	0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
+	0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f,
+	0x75, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12,
+	0x1a, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e,
+	0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22,
+	0x91, 0x01, 0x0a, 0x12, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79,
+	0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73,
+	0x12, 0x26, 0x0a, 0x0f, 0x6e, 0x65, 0x78, 0x74, 0x5f, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x6f,
+	0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6e, 0x65, 0x78, 0x74, 0x50,
+	0x61, 0x67, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x29, 0x0a, 0x10, 0x72, 0x65, 0x73, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x0f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x56, 0x65, 0x72, 0x73,
+	0x69, 0x6f, 0x6e, 0x22, 0xa9, 0x02, 0x0a, 0x12, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x57, 0x61,
+	0x74, 0x63, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x69,
+	0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65,
+	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x6b,
+	0x65, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x03,
+	0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x16,
+	0x0a, 0x06, 0x66, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
+	0x66, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x12, 0x3e, 0x0a, 0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73,
+	0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e,
+	0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x2e, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06,
+	0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x77, 0x69, 0x74, 0x68, 0x5f, 0x62,
+	0x6f, 0x64, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x77, 0x69, 0x74, 0x68, 0x42,
+	0x6f, 0x64, 0x79, 0x12, 0x1f, 0x0a, 0x0b, 0x77, 0x69, 0x74, 0x68, 0x5f, 0x73, 0x74, 0x61, 0x74,
+	0x75, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x77, 0x69, 0x74, 0x68, 0x53, 0x74,
+	0x61, 0x74, 0x75, 0x73, 0x1a, 0x39, 0x0a, 0x0b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x45, 0x6e,
+	0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
+	0x5b, 0x0a, 0x13, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74,
+	0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73,
+	0x74, 0x61, 0x6d, 0x70, 0x12, 0x26, 0x0a, 0x06, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e,
+	0x74, 0x69, 0x74, 0x79, 0x52, 0x06, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x22, 0xa2, 0x04, 0x0a,
+	0x0d, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x53, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x10,
+	0x0a, 0x03, 0x55, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x49, 0x44,
+	0x12, 0x12, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+	0x6b, 0x69, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63,
+	0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64,
+	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x39, 0x0a, 0x06, 0x6c, 0x61,
+	0x62, 0x65, 0x6c, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x74,
+	0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x53, 0x75, 0x6d, 0x6d, 0x61, 0x72,
+	0x79, 0x2e, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x6c,
+	0x61, 0x62, 0x65, 0x6c, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x18,
+	0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a,
+	0x04, 0x73, 0x6c, 0x75, 0x67, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x6c, 0x75,
+	0x67, 0x12, 0x2d, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x17, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79,
+	0x45, 0x72, 0x72, 0x6f, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72,
+	0x12, 0x39, 0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x21, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79,
+	0x53, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x45, 0x6e,
+	0x74, 0x72, 0x79, 0x52, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x12, 0x2d, 0x0a, 0x06, 0x6e,
+	0x65, 0x73, 0x74, 0x65, 0x64, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x65, 0x6e,
+	0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x53, 0x75, 0x6d, 0x6d, 0x61,
+	0x72, 0x79, 0x52, 0x06, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x12, 0x3f, 0x0a, 0x0a, 0x72, 0x65,
+	0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f,
+	0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x45, 0x78,
+	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52,
+	0x0a, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x1a, 0x39, 0x0a, 0x0b, 0x4c,
+	0x61, 0x62, 0x65, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
+	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
+	0x01, 0x22, 0x65, 0x0a, 0x17, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x45, 0x78, 0x74, 0x65, 0x72,
+	0x6e, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x06,
+	0x66, 0x61, 0x6d, 0x69, 0x6c, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x61,
+	0x6d, 0x69, 0x6c, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x64, 0x65, 0x6e,
+	0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x64,
+	0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x32, 0xa8, 0x04, 0x0a, 0x0b, 0x45, 0x6e, 0x74,
 	0x69, 0x74, 0x79, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x12, 0x31, 0x0a, 0x04, 0x52, 0x65, 0x61, 0x64,
 	0x12, 0x19, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x52, 0x65, 0x61, 0x64, 0x45, 0x6e,
 	0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0e, 0x2e, 0x65, 0x6e,
@@ -2003,43 +2314,37 @@ var file_entity_proto_rawDesc = []byte{
 	0x79, 0x2e, 0x42, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x61, 0x64, 0x45, 0x6e, 0x74, 0x69, 0x74,
 	0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74,
 	0x79, 0x2e, 0x42, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x61, 0x64, 0x45, 0x6e, 0x74, 0x69, 0x74,
-	0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x40, 0x0a, 0x05, 0x57, 0x72, 0x69,
-	0x74, 0x65, 0x12, 0x1a, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x57, 0x72, 0x69, 0x74,
-	0x65, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b,
-	0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x45, 0x6e, 0x74,
-	0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x43, 0x0a, 0x06, 0x44,
-	0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x1b, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x44,
-	0x65, 0x6c, 0x65, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x44, 0x65, 0x6c, 0x65,
-	0x74, 0x65, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x12, 0x46, 0x0a, 0x07, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x1c, 0x2e, 0x65, 0x6e,
-	0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x48, 0x69, 0x73, 0x74, 0x6f,
-	0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x65, 0x6e, 0x74, 0x69,
-	0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x43, 0x0a, 0x06, 0x53, 0x65, 0x61, 0x72,
-	0x63, 0x68, 0x12, 0x1b, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69,
-	0x74, 0x79, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x1c, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x53,
-	0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x42, 0x0a,
-	0x05, 0x57, 0x61, 0x74, 0x63, 0x68, 0x12, 0x1a, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e,
-	0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69,
-	0x74, 0x79, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x30,
-	0x01, 0x12, 0x4a, 0x0a, 0x0a, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x12,
-	0x1f, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x57, 0x72,
-	0x69, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x1b, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x45,
-	0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0x5e, 0x0a,
-	0x10, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x41, 0x64, 0x6d, 0x69,
-	0x6e, 0x12, 0x4a, 0x0a, 0x0a, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x12,
-	0x1f, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x57, 0x72,
-	0x69, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x1b, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x45,
-	0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x36, 0x5a,
-	0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x72, 0x61, 0x66,
-	0x61, 0x6e, 0x61, 0x2f, 0x67, 0x72, 0x61, 0x66, 0x61, 0x6e, 0x61, 0x2f, 0x70, 0x6b, 0x67, 0x2f,
-	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2f, 0x65,
-	0x6e, 0x74, 0x69, 0x74, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x43, 0x0a, 0x06, 0x43, 0x72, 0x65,
+	0x61, 0x74, 0x65, 0x12, 0x1b, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x43, 0x72, 0x65,
+	0x61, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x1c, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
+	0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x43,
+	0x0a, 0x06, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x1b, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74,
+	0x79, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x55,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x12, 0x43, 0x0a, 0x06, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x1b, 0x2e,
+	0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x45, 0x6e, 0x74,
+	0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x65, 0x6e, 0x74,
+	0x69, 0x74, 0x79, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x46, 0x0a, 0x07, 0x48, 0x69, 0x73, 0x74,
+	0x6f, 0x72, 0x79, 0x12, 0x1c, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74,
+	0x69, 0x74, 0x79, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x1a, 0x1d, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74,
+	0x79, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x12, 0x3d, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x19, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74,
+	0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e, 0x74,
+	0x69, 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x42, 0x0a, 0x05, 0x57, 0x61, 0x74, 0x63, 0x68, 0x12, 0x1a, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74,
+	0x79, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x6e,
+	0x74, 0x69, 0x74, 0x79, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x30, 0x01, 0x42, 0x36, 0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x67, 0x72, 0x61, 0x66, 0x61, 0x6e, 0x61, 0x2f, 0x67, 0x72, 0x61, 0x66, 0x61, 0x6e,
+	0x61, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x73,
+	0x74, 0x6f, 0x72, 0x65, 0x2f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2054,83 +2359,91 @@ func file_entity_proto_rawDescGZIP() []byte {
 	return file_entity_proto_rawDescData
 }
 
-var file_entity_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_entity_proto_msgTypes = make([]protoimpl.MessageInfo, 22)
+var file_entity_proto_enumTypes = make([]protoimpl.EnumInfo, 4)
+var file_entity_proto_msgTypes = make([]protoimpl.MessageInfo, 27)
 var file_entity_proto_goTypes = []interface{}{
-	(WriteEntityResponse_Status)(0), // 0: entity.WriteEntityResponse.Status
-	(EntityWatchResponse_Action)(0), // 1: entity.EntityWatchResponse.Action
-	(*Entity)(nil),                  // 2: entity.Entity
-	(*EntityOriginInfo)(nil),        // 3: entity.EntityOriginInfo
-	(*EntityErrorInfo)(nil),         // 4: entity.EntityErrorInfo
-	(*EntityVersionInfo)(nil),       // 5: entity.EntityVersionInfo
-	(*ReadEntityRequest)(nil),       // 6: entity.ReadEntityRequest
-	(*BatchReadEntityRequest)(nil),  // 7: entity.BatchReadEntityRequest
-	(*BatchReadEntityResponse)(nil), // 8: entity.BatchReadEntityResponse
-	(*WriteEntityRequest)(nil),      // 9: entity.WriteEntityRequest
-	(*AdminWriteEntityRequest)(nil), // 10: entity.AdminWriteEntityRequest
-	(*WriteEntityResponse)(nil),     // 11: entity.WriteEntityResponse
-	(*DeleteEntityRequest)(nil),     // 12: entity.DeleteEntityRequest
-	(*DeleteEntityResponse)(nil),    // 13: entity.DeleteEntityResponse
-	(*EntityHistoryRequest)(nil),    // 14: entity.EntityHistoryRequest
-	(*EntityHistoryResponse)(nil),   // 15: entity.EntityHistoryResponse
-	(*EntitySearchRequest)(nil),     // 16: entity.EntitySearchRequest
-	(*EntitySearchResult)(nil),      // 17: entity.EntitySearchResult
-	(*EntitySearchResponse)(nil),    // 18: entity.EntitySearchResponse
-	(*EntityWatchRequest)(nil),      // 19: entity.EntityWatchRequest
-	(*EntityWatchResponse)(nil),     // 20: entity.EntityWatchResponse
-	nil,                             // 21: entity.EntitySearchRequest.LabelsEntry
-	nil,                             // 22: entity.EntitySearchResult.LabelsEntry
-	nil,                             // 23: entity.EntityWatchRequest.LabelsEntry
-	(*grn.GRN)(nil),                 // 24: grn.GRN
+	(Entity_Action)(0),               // 0: entity.Entity.Action
+	(CreateEntityResponse_Status)(0), // 1: entity.CreateEntityResponse.Status
+	(UpdateEntityResponse_Status)(0), // 2: entity.UpdateEntityResponse.Status
+	(DeleteEntityResponse_Status)(0), // 3: entity.DeleteEntityResponse.Status
+	(*Entity)(nil),                   // 4: entity.Entity
+	(*EntityOriginInfo)(nil),         // 5: entity.EntityOriginInfo
+	(*EntityErrorInfo)(nil),          // 6: entity.EntityErrorInfo
+	(*ReadEntityRequest)(nil),        // 7: entity.ReadEntityRequest
+	(*BatchReadEntityRequest)(nil),   // 8: entity.BatchReadEntityRequest
+	(*BatchReadEntityResponse)(nil),  // 9: entity.BatchReadEntityResponse
+	(*CreateEntityRequest)(nil),      // 10: entity.CreateEntityRequest
+	(*CreateEntityResponse)(nil),     // 11: entity.CreateEntityResponse
+	(*UpdateEntityRequest)(nil),      // 12: entity.UpdateEntityRequest
+	(*UpdateEntityResponse)(nil),     // 13: entity.UpdateEntityResponse
+	(*DeleteEntityRequest)(nil),      // 14: entity.DeleteEntityRequest
+	(*DeleteEntityResponse)(nil),     // 15: entity.DeleteEntityResponse
+	(*EntityHistoryRequest)(nil),     // 16: entity.EntityHistoryRequest
+	(*EntityHistoryResponse)(nil),    // 17: entity.EntityHistoryResponse
+	(*EntityListRequest)(nil),        // 18: entity.EntityListRequest
+	(*ReferenceRequest)(nil),         // 19: entity.ReferenceRequest
+	(*EntityListResponse)(nil),       // 20: entity.EntityListResponse
+	(*EntityWatchRequest)(nil),       // 21: entity.EntityWatchRequest
+	(*EntityWatchResponse)(nil),      // 22: entity.EntityWatchResponse
+	(*EntitySummary)(nil),            // 23: entity.EntitySummary
+	(*EntityExternalReference)(nil),  // 24: entity.EntityExternalReference
+	nil,                              // 25: entity.Entity.LabelsEntry
+	nil,                              // 26: entity.Entity.FieldsEntry
+	nil,                              // 27: entity.EntityListRequest.LabelsEntry
+	nil,                              // 28: entity.EntityWatchRequest.LabelsEntry
+	nil,                              // 29: entity.EntitySummary.LabelsEntry
+	nil,                              // 30: entity.EntitySummary.FieldsEntry
 }
 var file_entity_proto_depIdxs = []int32{
-	24, // 0: entity.Entity.GRN:type_name -> grn.GRN
-	3,  // 1: entity.Entity.origin:type_name -> entity.EntityOriginInfo
-	24, // 2: entity.ReadEntityRequest.GRN:type_name -> grn.GRN
-	6,  // 3: entity.BatchReadEntityRequest.batch:type_name -> entity.ReadEntityRequest
-	2,  // 4: entity.BatchReadEntityResponse.results:type_name -> entity.Entity
-	24, // 5: entity.WriteEntityRequest.GRN:type_name -> grn.GRN
-	24, // 6: entity.AdminWriteEntityRequest.GRN:type_name -> grn.GRN
-	3,  // 7: entity.AdminWriteEntityRequest.origin:type_name -> entity.EntityOriginInfo
-	4,  // 8: entity.WriteEntityResponse.error:type_name -> entity.EntityErrorInfo
-	24, // 9: entity.WriteEntityResponse.GRN:type_name -> grn.GRN
-	5,  // 10: entity.WriteEntityResponse.entity:type_name -> entity.EntityVersionInfo
-	0,  // 11: entity.WriteEntityResponse.status:type_name -> entity.WriteEntityResponse.Status
-	24, // 12: entity.DeleteEntityRequest.GRN:type_name -> grn.GRN
-	24, // 13: entity.EntityHistoryRequest.GRN:type_name -> grn.GRN
-	24, // 14: entity.EntityHistoryResponse.GRN:type_name -> grn.GRN
-	5,  // 15: entity.EntityHistoryResponse.versions:type_name -> entity.EntityVersionInfo
-	21, // 16: entity.EntitySearchRequest.labels:type_name -> entity.EntitySearchRequest.LabelsEntry
-	24, // 17: entity.EntitySearchResult.GRN:type_name -> grn.GRN
-	22, // 18: entity.EntitySearchResult.labels:type_name -> entity.EntitySearchResult.LabelsEntry
-	17, // 19: entity.EntitySearchResponse.results:type_name -> entity.EntitySearchResult
-	24, // 20: entity.EntityWatchRequest.GRN:type_name -> grn.GRN
-	23, // 21: entity.EntityWatchRequest.labels:type_name -> entity.EntityWatchRequest.LabelsEntry
-	2,  // 22: entity.EntityWatchResponse.entity:type_name -> entity.Entity
-	1,  // 23: entity.EntityWatchResponse.action:type_name -> entity.EntityWatchResponse.Action
-	6,  // 24: entity.EntityStore.Read:input_type -> entity.ReadEntityRequest
-	7,  // 25: entity.EntityStore.BatchRead:input_type -> entity.BatchReadEntityRequest
-	9,  // 26: entity.EntityStore.Write:input_type -> entity.WriteEntityRequest
-	12, // 27: entity.EntityStore.Delete:input_type -> entity.DeleteEntityRequest
-	14, // 28: entity.EntityStore.History:input_type -> entity.EntityHistoryRequest
-	16, // 29: entity.EntityStore.Search:input_type -> entity.EntitySearchRequest
-	19, // 30: entity.EntityStore.Watch:input_type -> entity.EntityWatchRequest
-	10, // 31: entity.EntityStore.AdminWrite:input_type -> entity.AdminWriteEntityRequest
-	10, // 32: entity.EntityStoreAdmin.AdminWrite:input_type -> entity.AdminWriteEntityRequest
-	2,  // 33: entity.EntityStore.Read:output_type -> entity.Entity
-	8,  // 34: entity.EntityStore.BatchRead:output_type -> entity.BatchReadEntityResponse
-	11, // 35: entity.EntityStore.Write:output_type -> entity.WriteEntityResponse
-	13, // 36: entity.EntityStore.Delete:output_type -> entity.DeleteEntityResponse
-	15, // 37: entity.EntityStore.History:output_type -> entity.EntityHistoryResponse
-	18, // 38: entity.EntityStore.Search:output_type -> entity.EntitySearchResponse
-	20, // 39: entity.EntityStore.Watch:output_type -> entity.EntityWatchResponse
-	11, // 40: entity.EntityStore.AdminWrite:output_type -> entity.WriteEntityResponse
-	11, // 41: entity.EntityStoreAdmin.AdminWrite:output_type -> entity.WriteEntityResponse
-	33, // [33:42] is the sub-list for method output_type
-	24, // [24:33] is the sub-list for method input_type
-	24, // [24:24] is the sub-list for extension type_name
-	24, // [24:24] is the sub-list for extension extendee
-	0,  // [0:24] is the sub-list for field type_name
+	5,  // 0: entity.Entity.origin:type_name -> entity.EntityOriginInfo
+	25, // 1: entity.Entity.labels:type_name -> entity.Entity.LabelsEntry
+	26, // 2: entity.Entity.fields:type_name -> entity.Entity.FieldsEntry
+	6,  // 3: entity.Entity.errors:type_name -> entity.EntityErrorInfo
+	0,  // 4: entity.Entity.action:type_name -> entity.Entity.Action
+	7,  // 5: entity.BatchReadEntityRequest.batch:type_name -> entity.ReadEntityRequest
+	4,  // 6: entity.BatchReadEntityResponse.results:type_name -> entity.Entity
+	4,  // 7: entity.CreateEntityRequest.entity:type_name -> entity.Entity
+	6,  // 8: entity.CreateEntityResponse.error:type_name -> entity.EntityErrorInfo
+	4,  // 9: entity.CreateEntityResponse.entity:type_name -> entity.Entity
+	1,  // 10: entity.CreateEntityResponse.status:type_name -> entity.CreateEntityResponse.Status
+	4,  // 11: entity.UpdateEntityRequest.entity:type_name -> entity.Entity
+	6,  // 12: entity.UpdateEntityResponse.error:type_name -> entity.EntityErrorInfo
+	4,  // 13: entity.UpdateEntityResponse.entity:type_name -> entity.Entity
+	2,  // 14: entity.UpdateEntityResponse.status:type_name -> entity.UpdateEntityResponse.Status
+	6,  // 15: entity.DeleteEntityResponse.error:type_name -> entity.EntityErrorInfo
+	4,  // 16: entity.DeleteEntityResponse.entity:type_name -> entity.Entity
+	3,  // 17: entity.DeleteEntityResponse.status:type_name -> entity.DeleteEntityResponse.Status
+	4,  // 18: entity.EntityHistoryResponse.versions:type_name -> entity.Entity
+	27, // 19: entity.EntityListRequest.labels:type_name -> entity.EntityListRequest.LabelsEntry
+	4,  // 20: entity.EntityListResponse.results:type_name -> entity.Entity
+	28, // 21: entity.EntityWatchRequest.labels:type_name -> entity.EntityWatchRequest.LabelsEntry
+	4,  // 22: entity.EntityWatchResponse.entity:type_name -> entity.Entity
+	29, // 23: entity.EntitySummary.labels:type_name -> entity.EntitySummary.LabelsEntry
+	6,  // 24: entity.EntitySummary.error:type_name -> entity.EntityErrorInfo
+	30, // 25: entity.EntitySummary.fields:type_name -> entity.EntitySummary.FieldsEntry
+	23, // 26: entity.EntitySummary.nested:type_name -> entity.EntitySummary
+	24, // 27: entity.EntitySummary.references:type_name -> entity.EntityExternalReference
+	7,  // 28: entity.EntityStore.Read:input_type -> entity.ReadEntityRequest
+	8,  // 29: entity.EntityStore.BatchRead:input_type -> entity.BatchReadEntityRequest
+	10, // 30: entity.EntityStore.Create:input_type -> entity.CreateEntityRequest
+	12, // 31: entity.EntityStore.Update:input_type -> entity.UpdateEntityRequest
+	14, // 32: entity.EntityStore.Delete:input_type -> entity.DeleteEntityRequest
+	16, // 33: entity.EntityStore.History:input_type -> entity.EntityHistoryRequest
+	18, // 34: entity.EntityStore.List:input_type -> entity.EntityListRequest
+	21, // 35: entity.EntityStore.Watch:input_type -> entity.EntityWatchRequest
+	4,  // 36: entity.EntityStore.Read:output_type -> entity.Entity
+	9,  // 37: entity.EntityStore.BatchRead:output_type -> entity.BatchReadEntityResponse
+	11, // 38: entity.EntityStore.Create:output_type -> entity.CreateEntityResponse
+	13, // 39: entity.EntityStore.Update:output_type -> entity.UpdateEntityResponse
+	15, // 40: entity.EntityStore.Delete:output_type -> entity.DeleteEntityResponse
+	17, // 41: entity.EntityStore.History:output_type -> entity.EntityHistoryResponse
+	20, // 42: entity.EntityStore.List:output_type -> entity.EntityListResponse
+	22, // 43: entity.EntityStore.Watch:output_type -> entity.EntityWatchResponse
+	36, // [36:44] is the sub-list for method output_type
+	28, // [28:36] is the sub-list for method input_type
+	28, // [28:28] is the sub-list for extension type_name
+	28, // [28:28] is the sub-list for extension extendee
+	0,  // [0:28] is the sub-list for field type_name
 }
 
 func init() { file_entity_proto_init() }
@@ -2176,7 +2489,7 @@ func file_entity_proto_init() {
 			}
 		}
 		file_entity_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*EntityVersionInfo); i {
+			switch v := v.(*ReadEntityRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2188,7 +2501,7 @@ func file_entity_proto_init() {
 			}
 		}
 		file_entity_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ReadEntityRequest); i {
+			switch v := v.(*BatchReadEntityRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2200,7 +2513,7 @@ func file_entity_proto_init() {
 			}
 		}
 		file_entity_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BatchReadEntityRequest); i {
+			switch v := v.(*BatchReadEntityResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2212,7 +2525,7 @@ func file_entity_proto_init() {
 			}
 		}
 		file_entity_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BatchReadEntityResponse); i {
+			switch v := v.(*CreateEntityRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2224,7 +2537,7 @@ func file_entity_proto_init() {
 			}
 		}
 		file_entity_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WriteEntityRequest); i {
+			switch v := v.(*CreateEntityResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2236,7 +2549,7 @@ func file_entity_proto_init() {
 			}
 		}
 		file_entity_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AdminWriteEntityRequest); i {
+			switch v := v.(*UpdateEntityRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2248,7 +2561,7 @@ func file_entity_proto_init() {
 			}
 		}
 		file_entity_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WriteEntityResponse); i {
+			switch v := v.(*UpdateEntityResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2308,7 +2621,7 @@ func file_entity_proto_init() {
 			}
 		}
 		file_entity_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*EntitySearchRequest); i {
+			switch v := v.(*EntityListRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2320,7 +2633,7 @@ func file_entity_proto_init() {
 			}
 		}
 		file_entity_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*EntitySearchResult); i {
+			switch v := v.(*ReferenceRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2332,7 +2645,7 @@ func file_entity_proto_init() {
 			}
 		}
 		file_entity_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*EntitySearchResponse); i {
+			switch v := v.(*EntityListResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2367,16 +2680,40 @@ func file_entity_proto_init() {
 				return nil
 			}
 		}
+		file_entity_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*EntitySummary); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_entity_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*EntityExternalReference); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_entity_proto_rawDesc,
-			NumEnums:      2,
-			NumMessages:   22,
+			NumEnums:      4,
+			NumMessages:   27,
 			NumExtensions: 0,
-			NumServices:   2,
+			NumServices:   1,
 		},
 		GoTypes:           file_entity_proto_goTypes,
 		DependencyIndexes: file_entity_proto_depIdxs,
diff --git a/pkg/services/store/entity/entity.proto b/pkg/services/store/entity/entity.proto
index 52682a88806e9..769cc09d6aace 100644
--- a/pkg/services/store/entity/entity.proto
+++ b/pkg/services/store/entity/entity.proto
@@ -3,45 +3,96 @@ package entity;
 
 option go_package = "github.com/grafana/grafana/pkg/services/store/entity";
 
-import "pkg/infra/grn/grn.proto";
-
 // The canonical entity/document data -- this represents the raw bytes and storage level metadata
 message Entity {
-  // Entity identifier -- tenant_id, kind, uid
-  grn.GRN GRN = 1;
+  // Globally unique ID set by the system.  This can not be set explicitly
+  string guid = 1;
+
+  // The resource version, this is a snowflake id controlled by storage
+  int64 resource_version = 2;
+
+  // group
+  string group = 24;
+  // kind resource
+  string resource = 25;
+  // namespace
+  string namespace = 26;
+  // k8s name
+  string name = 27;
+  // subresource
+  string subresource = 28;
+
+  // group version
+  string group_version = 23;
+
+  // k8s key value (TODO remove -- it is duplicate of group+resource+version)
+  string key = 22;
+
+  // The folder k8s name
+  string folder = 4;
 
-  // The version will change when the entity is saved. It is not necessarily sortable
-  string version = 2;
+  // Raw meta from k8s
+  bytes meta = 5;
 
-  // Time in epoch milliseconds that the entity was created
-  int64 created_at = 3;
+  // Raw bytes of the storage entity.  The kind will determine what is a valid payload
+  bytes body = 6;
 
-  // Time in epoch milliseconds that the entity was updated
-  int64 updated_at = 4;
+  // k8s style status (ignored for now)
+  bytes status = 7;
+
+  // the friendly name of the entity
+  string title = 8;
+
+  // Content Length
+  int64 size = 9;
+
+  // MD5 digest of the body
+  string ETag = 10;
+
+  // Time in epoch milliseconds that the entity was created
+  int64 created_at = 11;
 
   // Who created the entity
-  string created_by = 5;
+  string created_by = 12;
+
+  // Time in epoch milliseconds that the entity was updated
+  int64 updated_at = 13;
 
   // Who updated the entity
-  string updated_by = 6;
+  string updated_by = 14;
 
-  // The folder UID (not stored in the body)
-  string folder = 7;
+  // External location info
+  EntityOriginInfo origin = 15;
 
-  // MD5 digest of the body
-  string ETag = 8;
+  // human-readable description of the entity
+  string description = 16;
 
-  // Content Length
-  int64 size = 9;
+  // URL safe version of the name.  It will be unique within the folder
+  string slug = 17;
 
-  // Raw bytes of the storage entity.  The kind will determine what is a valid payload
-  bytes body = 10;
+  // Commit message (optional)
+  string message = 18;
 
-  // Entity summary as JSON
-  bytes summary_json = 11;
+  // Key value pairs.  Tags are are represented as keys with empty values
+  map<string,string> labels = 19;
 
-  // External location info
-  EntityOriginInfo origin = 12;
+  // Optional field values.  The schema will define and document possible values for a given kind
+  map<string, string> fields = 20;
+
+  // When errors exist
+  repeated EntityErrorInfo errors = 21;
+
+  // Action code
+  Action action = 3;
+
+  // Status enumeration
+  enum Action {
+    UNKNOWN = 0;
+    CREATED = 1;
+    UPDATED = 2;
+    DELETED = 3;
+    ERROR = 4;
+  }
 }
 
 // This stores additional metadata for items entities that were synced from external systmes
@@ -69,49 +120,26 @@ message EntityErrorInfo {
   bytes details_json = 3;
 }
 
-// This is a subset of Entity that does not include body or sync info
-message EntityVersionInfo {
-  // The version will change when the entity is saved. It is not necessarily sortable
-  string version = 1;
-
-  // Time in epoch milliseconds that the entity was updated
-  int64 updated_at = 2;
-
-  // Who updated the entity
-  string updated_by = 3;
-
-  // Content Length
-  int64 size = 4;
-
-  // MD5 digest of the body
-  string ETag = 5;
-
-  // optional "save" or "commit" message
-  //
-  // NOTE: currently managed by the dashboard_version table, and will be returned from a "history" command
-  string comment = 6;
-}
-
 //-----------------------------------------------
 // Get request/response
 //-----------------------------------------------
 
 message ReadEntityRequest {
   // Entity identifier
-  grn.GRN GRN = 1;
+  string key = 1;
 
-  // Fetch an explicit version
-  string version = 2;
+  // Fetch an explicit version (default is latest)
+  int64 resource_version = 2;
 
-  // Include the full body bytes
-  bool with_body = 3;
+  // Include the full body
+  bool with_body = 4;
 
-  // Include derived summary metadata
-  bool with_summary = 4;
+  // Include the status
+  bool with_status = 5;
 }
 
 //------------------------------------------------------
-// Make many read requests at once (by Kind+ID+version)
+// Make many read requests at once (by key+version)
 //------------------------------------------------------
 
 message BatchReadEntityRequest {
@@ -123,96 +151,58 @@ message BatchReadEntityResponse {
 }
 
 //-----------------------------------------------
-// Write request/response
+// Create request/response
 //-----------------------------------------------
 
-message WriteEntityRequest {
-  // Entity identifier
-  grn.GRN GRN = 1;
-
-  // Where to save the entity (empty will leave it unchanged)
-  string folder = 2;
-
-  // The raw entity body
-  bytes body = 3;
-
-  // Message that can be seen when exploring entity history
-  string comment = 4;
-
-  // Used for optimistic locking.  If missing, the previous version will be replaced regardless
-  string previous_version = 5;
+message CreateEntityRequest {
+  // Entity details
+  Entity entity = 1;
 }
 
-// This operation is useful when syncing a resource from external sources
-// that have more accurate metadata information (git, or an archive).
-// This process can bypass the forced checks that 
-message AdminWriteEntityRequest {
-  // Entity identifier
-  grn.GRN GRN = 1;
-
-  // Where to save the entity (empty will leave it unchanged)
-  string folder = 2;
-
-  // The raw entity body
-  bytes body = 3;
-
-  // Message that can be seen when exploring entity history
-  string comment = 4;
+message CreateEntityResponse {
+  // Error info -- if exists, the save did not happen
+  EntityErrorInfo error = 1;
 
-  // Time in epoch milliseconds that the entity was created
-  // Optional, if 0 it will use the current time
-  int64 created_at = 5;
+  // Entity details
+  Entity entity = 2;
 
-  // Time in epoch milliseconds that the entity was updated
-  // Optional, if empty it will use the current user
-  int64 updated_at = 6;
+  // Status code
+  Status status = 3;
 
-  // Who created the entity
-  // Optional, if 0 it will use the current time
-  string created_by = 7;
+  // Status enumeration
+  enum Status {
+    ERROR = 0;
+    CREATED = 1;
+  }
+}
 
-  // Who updated the entity
-  // Optional, if empty it will use the current user
-  string updated_by = 8;
+//-----------------------------------------------
+// Update request/response
+//-----------------------------------------------
 
-  // An explicit version identifier
-  // Optional, if set, this will overwrite/define an explicit version
-  string version = 9;
+message UpdateEntityRequest {
+  // Entity details
+  Entity entity = 1;
 
   // Used for optimistic locking.  If missing, the previous version will be replaced regardless
-  // This may not be used along with an explicit version in the request
-  string previous_version = 10;
-
-  // Request that all previous versions are removed from the history
-  // This will make sense for systems that manage history explicitly externallay
-  bool clear_history = 11;
-
-  // Optionally define where the entity came from
-  EntityOriginInfo origin = 12;
+  int64 previous_version = 2;
 }
 
-message WriteEntityResponse {
+message UpdateEntityResponse {
   // Error info -- if exists, the save did not happen
   EntityErrorInfo error = 1;
 
-  // Entity identifier
-  grn.GRN GRN = 2;
-
-  // Entity details with the body removed
-  EntityVersionInfo entity = 3; 
-
-  // Entity summary as JSON
-  bytes summary_json = 4;
+  // Entity details
+  Entity entity = 2;
 
   // Status code
-  Status status = 5;
+  Status status = 3;
 
   // Status enumeration
   enum Status {
     ERROR = 0;
-    CREATED = 1;
-    UPDATED = 2;
-    UNCHANGED = 3;
+    UPDATED = 1;
+    UNCHANGED = 2;
   }
 }
 
@@ -222,14 +212,28 @@ message WriteEntityResponse {
 
 message DeleteEntityRequest {
   // Entity identifier
-  grn.GRN GRN = 1;
+  string key = 1;
 
-  // Used for optimistic locking.  If missing, the previous version will be replaced regardless
-  string previous_version = 3;
+  // Used for optimistic locking.  If missing, the current version will be deleted regardless
+  int64 previous_version = 2;
 }
 
 message DeleteEntityResponse {
-  bool OK = 1;
+  // Error info -- if exists, the delete did not happen
+  EntityErrorInfo error = 1;
+
+  // Entity details
+  Entity entity = 2;
+
+  // Status code
+  Status status = 3;
+
+  // Status enumeration
+  enum Status {
+    ERROR = 0;
+    DELETED = 1;
+    NOTFOUND = 2;
+  }
 }
 
 //-----------------------------------------------
@@ -238,24 +242,36 @@ message DeleteEntityResponse {
 
 message EntityHistoryRequest {
   // Entity identifier
-  grn.GRN GRN = 1;
+  string key = 1;
 
   // Maximum number of items to return
-  int64 limit = 3; 
+  int64 limit = 3;
 
   // Starting from the requested page
   string next_page_token = 5;
+
+  // Sorting instructions `field ASC/DESC`
+  repeated string sort = 7;
+
+  // Return the full body in each payload
+  bool with_body = 8;
+
+  // Return the status in each payload
+  bool with_status = 10;
 }
 
 message EntityHistoryResponse {
   // Entity identifier
-  grn.GRN GRN = 1;
+  string key = 1;
 
   // Entity metadata without the raw bytes
-  repeated EntityVersionInfo versions = 2;
+  repeated Entity versions = 2;
 
   // More results exist... pass this in the next request
   string next_page_token = 3;
+
+  // Resource version of the response
+  int64 resource_version = 4;
 }
 
 
@@ -263,18 +279,24 @@ message EntityHistoryResponse {
 // List request/response
 //-----------------------------------------------
 
-message EntitySearchRequest {
+message EntityListRequest {
   // Starting from the requested page (other query parameters must match!)
   string next_page_token = 1;
 
   // Maximum number of items to return
-  int64 limit = 2; 
+  int64 limit = 2;
 
   // Free text query string -- mileage may vary :)
   string query = 3;
 
-  // limit to a specific kind (empty is all)
-  repeated string kind = 4;
+  // limit to a specific group (empty is all)
+  repeated string group = 9;
+
+  // limit to a specific resource (empty is all)
+  repeated string resource = 4;
+
+  // limit to a specific key
+  repeated string key = 11;
 
   // Limit results to items in a specific folder
   string folder = 5;
@@ -289,63 +311,38 @@ message EntitySearchRequest {
   bool with_body = 8;
 
   // Return the full body in each payload
-  bool with_labels = 9;
+  bool with_status = 10;
 
-  // Return the full body in each payload
-  bool with_fields = 10;
+  // list deleted entities instead of active ones
+  bool deleted = 12;
 }
 
-// Search result metadata for each entity
-message EntitySearchResult {
-  // Entity identifier
-  grn.GRN GRN = 1;
-
-  // The current version of this entity
-  string version = 2;
-
-  // Content Length
-  int64 size = 3;
-
-  // Time in epoch milliseconds that the entity was updated
-  int64 updated_at = 4;
-
-  // Who updated the entity
-  string updated_by = 5;
-
-  // Optionally include the full entity body
-  bytes body = 6;
-
-  //----------------------------------------
-  // Derived from body in the summary
-  //----------------------------------------
-
-  // Always included
-  string name = 7;
-
-  // Always included
-  string description = 8;
+message ReferenceRequest {
+  // Starting from the requested page (other query parameters must match!)
+  string next_page_token = 1;
 
-  // The structured labels
-  map<string,string> labels = 9;
+  // Maximum number of items to return
+  int64 limit = 2;
 
-  // Folder UID
-  string folder = 10;
+  // Free text query string -- mileage may vary :)
+  string namespace = 5;
 
-  // Slugified name
-  string slug = 11;
+  string group = 6;
 
-  // Optionally include extracted JSON
-  bytes fields_json = 12;
+  string resource = 3;
 
-  // EntityErrorInfo in json
-  bytes error_json = 13;
+  // Free text query string -- mileage may vary :)
+  string name = 4;
 }
 
-message EntitySearchResponse {
-  repeated EntitySearchResult results = 1;
+message EntityListResponse {
+  repeated Entity results = 1;
 
   // More results exist... pass this in the next request
   string next_page_token = 2;
+
+  // ResourceVersion of the list response
+  int64 resource_version = 3;
 }
 
 //-----------------------------------------------
@@ -353,14 +350,14 @@ message EntitySearchResponse {
 //-----------------------------------------------
 
 message EntityWatchRequest {
-  // Timestamp of last changes. Empty will default to  
-  int64 since = 1; 
-  
-  // Watch sppecific entities
-  repeated grn.GRN GRN = 2;
+  // ResourceVersion of last changes. Empty will default to full history
+  int64 since = 1;
+
+  // Watch specific entities
+  repeated string key = 2;
 
-  // limit to a specific kind (empty is all)
-  repeated string kind = 3;
+  // limit to a specific resource (empty is all)
+  repeated string resource = 3;
 
   // Limit results to items in a specific folder
   string folder = 4;
@@ -371,29 +368,61 @@ message EntityWatchRequest {
   // Return the full body in each payload
   bool with_body = 6;
 
-  // Return the full body in each payload
-  bool with_labels = 7;
-
-  // Return the full body in each payload
-  bool with_fields = 8;
+  // Return the full status in each payload
+  bool with_status = 7;
 }
 
 message EntityWatchResponse {
   // Timestamp the event was sent
-  int64 timestamp = 1; 
+  int64 timestamp = 1;
 
-  // List of entities with the same action
-  repeated Entity entity = 2;
+  // Entity that was created, updated, or deleted
+  Entity entity = 2;
+}
 
-  // Action code
-  Action action = 3;
+message EntitySummary {
+  string UID = 1;
+  string kind = 2;
 
-  // Status enumeration
-  enum Action {
-    UNKNOWN = 0;
-    UPDATED = 1;
-    DELETED = 2;
-  }
+  string name = 3;
+  string description = 4;
+
+  // Key value pairs.  Tags are are represented as keys with empty values
+  map<string,string> labels = 5;
+
+  // Parent folder UID
+  string folder = 6;
+
+  // URL safe version of the name.  It will be unique within the folder
+  string slug = 7;
+
+  // When errors exist
+  EntityErrorInfo error = 8;
+
+  // Optional field values.  The schema will define and document possible values for a given kind
+  map<string, string> fields = 9;
+
+  // eg: panels within dashboard
+  repeated EntitySummary nested = 10;
+
+  // Optional references to external things
+  repeated EntityExternalReference references = 11;
+}
+
+message EntityExternalReference {
+  // Category of dependency
+  // eg: datasource, plugin, runtime
+  string family = 1;
+
+  // datasource > prometheus|influx|...
+  // plugin > panel | datasource
+  // runtime > transformer
+  string type = 2;
+
+  // datasource > UID
+  // plugin > plugin identifier
+  // runtime > name lookup
+  string identifier = 3;
 }
 
 
@@ -405,18 +434,10 @@ message EntityWatchResponse {
 service EntityStore {
   rpc Read(ReadEntityRequest) returns (Entity);
   rpc BatchRead(BatchReadEntityRequest) returns (BatchReadEntityResponse);
-  rpc Write(WriteEntityRequest) returns (WriteEntityResponse);
+  rpc Create(CreateEntityRequest) returns (CreateEntityResponse);
+  rpc Update(UpdateEntityRequest) returns (UpdateEntityResponse);
   rpc Delete(DeleteEntityRequest) returns (DeleteEntityResponse);
   rpc History(EntityHistoryRequest) returns (EntityHistoryResponse);
-  rpc Search(EntitySearchRequest) returns (EntitySearchResponse);
+  rpc List(EntityListRequest) returns (EntityListResponse);
   rpc Watch(EntityWatchRequest) returns (stream EntityWatchResponse);
-  
-  // TEMPORARY... while we split this into a new service (see below)
-  rpc AdminWrite(AdminWriteEntityRequest) returns (WriteEntityResponse);
-}
-
-// The admin service extends the basic entity store interface, but provides
-// more explicit control that can support bulk operations like efficient git sync
-service EntityStoreAdmin {
-  rpc AdminWrite(AdminWriteEntityRequest) returns (WriteEntityResponse);
 }
diff --git a/pkg/services/store/entity/entity_grpc.pb.go b/pkg/services/store/entity/entity_grpc.pb.go
index b7647be1c4bd9..c1a7f6108d389 100644
--- a/pkg/services/store/entity/entity_grpc.pb.go
+++ b/pkg/services/store/entity/entity_grpc.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.3.0
-// - protoc             v4.23.4
+// - protoc             v4.25.2
 // source: entity.proto
 
 package entity
@@ -19,14 +19,14 @@ import (
 const _ = grpc.SupportPackageIsVersion7
 
 const (
-	EntityStore_Read_FullMethodName       = "/entity.EntityStore/Read"
-	EntityStore_BatchRead_FullMethodName  = "/entity.EntityStore/BatchRead"
-	EntityStore_Write_FullMethodName      = "/entity.EntityStore/Write"
-	EntityStore_Delete_FullMethodName     = "/entity.EntityStore/Delete"
-	EntityStore_History_FullMethodName    = "/entity.EntityStore/History"
-	EntityStore_Search_FullMethodName     = "/entity.EntityStore/Search"
-	EntityStore_Watch_FullMethodName      = "/entity.EntityStore/Watch"
-	EntityStore_AdminWrite_FullMethodName = "/entity.EntityStore/AdminWrite"
+	EntityStore_Read_FullMethodName      = "/entity.EntityStore/Read"
+	EntityStore_BatchRead_FullMethodName = "/entity.EntityStore/BatchRead"
+	EntityStore_Create_FullMethodName    = "/entity.EntityStore/Create"
+	EntityStore_Update_FullMethodName    = "/entity.EntityStore/Update"
+	EntityStore_Delete_FullMethodName    = "/entity.EntityStore/Delete"
+	EntityStore_History_FullMethodName   = "/entity.EntityStore/History"
+	EntityStore_List_FullMethodName      = "/entity.EntityStore/List"
+	EntityStore_Watch_FullMethodName     = "/entity.EntityStore/Watch"
 )
 
 // EntityStoreClient is the client API for EntityStore service.
@@ -35,13 +35,12 @@ const (
 type EntityStoreClient interface {
 	Read(ctx context.Context, in *ReadEntityRequest, opts ...grpc.CallOption) (*Entity, error)
 	BatchRead(ctx context.Context, in *BatchReadEntityRequest, opts ...grpc.CallOption) (*BatchReadEntityResponse, error)
-	Write(ctx context.Context, in *WriteEntityRequest, opts ...grpc.CallOption) (*WriteEntityResponse, error)
+	Create(ctx context.Context, in *CreateEntityRequest, opts ...grpc.CallOption) (*CreateEntityResponse, error)
+	Update(ctx context.Context, in *UpdateEntityRequest, opts ...grpc.CallOption) (*UpdateEntityResponse, error)
 	Delete(ctx context.Context, in *DeleteEntityRequest, opts ...grpc.CallOption) (*DeleteEntityResponse, error)
 	History(ctx context.Context, in *EntityHistoryRequest, opts ...grpc.CallOption) (*EntityHistoryResponse, error)
-	Search(ctx context.Context, in *EntitySearchRequest, opts ...grpc.CallOption) (*EntitySearchResponse, error)
+	List(ctx context.Context, in *EntityListRequest, opts ...grpc.CallOption) (*EntityListResponse, error)
 	Watch(ctx context.Context, in *EntityWatchRequest, opts ...grpc.CallOption) (EntityStore_WatchClient, error)
-	// TEMPORARY... while we split this into a new service (see below)
-	AdminWrite(ctx context.Context, in *AdminWriteEntityRequest, opts ...grpc.CallOption) (*WriteEntityResponse, error)
 }
 
 type entityStoreClient struct {
@@ -70,9 +69,18 @@ func (c *entityStoreClient) BatchRead(ctx context.Context, in *BatchReadEntityRe
 	return out, nil
 }
 
-func (c *entityStoreClient) Write(ctx context.Context, in *WriteEntityRequest, opts ...grpc.CallOption) (*WriteEntityResponse, error) {
-	out := new(WriteEntityResponse)
-	err := c.cc.Invoke(ctx, EntityStore_Write_FullMethodName, in, out, opts...)
+func (c *entityStoreClient) Create(ctx context.Context, in *CreateEntityRequest, opts ...grpc.CallOption) (*CreateEntityResponse, error) {
+	out := new(CreateEntityResponse)
+	err := c.cc.Invoke(ctx, EntityStore_Create_FullMethodName, in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *entityStoreClient) Update(ctx context.Context, in *UpdateEntityRequest, opts ...grpc.CallOption) (*UpdateEntityResponse, error) {
+	out := new(UpdateEntityResponse)
+	err := c.cc.Invoke(ctx, EntityStore_Update_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -97,9 +105,9 @@ func (c *entityStoreClient) History(ctx context.Context, in *EntityHistoryReques
 	return out, nil
 }
 
-func (c *entityStoreClient) Search(ctx context.Context, in *EntitySearchRequest, opts ...grpc.CallOption) (*EntitySearchResponse, error) {
-	out := new(EntitySearchResponse)
-	err := c.cc.Invoke(ctx, EntityStore_Search_FullMethodName, in, out, opts...)
+func (c *entityStoreClient) List(ctx context.Context, in *EntityListRequest, opts ...grpc.CallOption) (*EntityListResponse, error) {
+	out := new(EntityListResponse)
+	err := c.cc.Invoke(ctx, EntityStore_List_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -138,28 +146,18 @@ func (x *entityStoreWatchClient) Recv() (*EntityWatchResponse, error) {
 	return m, nil
 }
 
-func (c *entityStoreClient) AdminWrite(ctx context.Context, in *AdminWriteEntityRequest, opts ...grpc.CallOption) (*WriteEntityResponse, error) {
-	out := new(WriteEntityResponse)
-	err := c.cc.Invoke(ctx, EntityStore_AdminWrite_FullMethodName, in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 // EntityStoreServer is the server API for EntityStore service.
 // All implementations should embed UnimplementedEntityStoreServer
 // for forward compatibility
 type EntityStoreServer interface {
 	Read(context.Context, *ReadEntityRequest) (*Entity, error)
 	BatchRead(context.Context, *BatchReadEntityRequest) (*BatchReadEntityResponse, error)
-	Write(context.Context, *WriteEntityRequest) (*WriteEntityResponse, error)
+	Create(context.Context, *CreateEntityRequest) (*CreateEntityResponse, error)
+	Update(context.Context, *UpdateEntityRequest) (*UpdateEntityResponse, error)
 	Delete(context.Context, *DeleteEntityRequest) (*DeleteEntityResponse, error)
 	History(context.Context, *EntityHistoryRequest) (*EntityHistoryResponse, error)
-	Search(context.Context, *EntitySearchRequest) (*EntitySearchResponse, error)
+	List(context.Context, *EntityListRequest) (*EntityListResponse, error)
 	Watch(*EntityWatchRequest, EntityStore_WatchServer) error
-	// TEMPORARY... while we split this into a new service (see below)
-	AdminWrite(context.Context, *AdminWriteEntityRequest) (*WriteEntityResponse, error)
 }
 
 // UnimplementedEntityStoreServer should be embedded to have forward compatible implementations.
@@ -172,8 +170,11 @@ func (UnimplementedEntityStoreServer) Read(context.Context, *ReadEntityRequest)
 func (UnimplementedEntityStoreServer) BatchRead(context.Context, *BatchReadEntityRequest) (*BatchReadEntityResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method BatchRead not implemented")
 }
-func (UnimplementedEntityStoreServer) Write(context.Context, *WriteEntityRequest) (*WriteEntityResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Write not implemented")
+func (UnimplementedEntityStoreServer) Create(context.Context, *CreateEntityRequest) (*CreateEntityResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Create not implemented")
+}
+func (UnimplementedEntityStoreServer) Update(context.Context, *UpdateEntityRequest) (*UpdateEntityResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Update not implemented")
 }
 func (UnimplementedEntityStoreServer) Delete(context.Context, *DeleteEntityRequest) (*DeleteEntityResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method Delete not implemented")
@@ -181,15 +182,12 @@ func (UnimplementedEntityStoreServer) Delete(context.Context, *DeleteEntityReque
 func (UnimplementedEntityStoreServer) History(context.Context, *EntityHistoryRequest) (*EntityHistoryResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method History not implemented")
 }
-func (UnimplementedEntityStoreServer) Search(context.Context, *EntitySearchRequest) (*EntitySearchResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Search not implemented")
+func (UnimplementedEntityStoreServer) List(context.Context, *EntityListRequest) (*EntityListResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method List not implemented")
 }
 func (UnimplementedEntityStoreServer) Watch(*EntityWatchRequest, EntityStore_WatchServer) error {
 	return status.Errorf(codes.Unimplemented, "method Watch not implemented")
 }
-func (UnimplementedEntityStoreServer) AdminWrite(context.Context, *AdminWriteEntityRequest) (*WriteEntityResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method AdminWrite not implemented")
-}
 
 // UnsafeEntityStoreServer may be embedded to opt out of forward compatibility for this service.
 // Use of this interface is not recommended, as added methods to EntityStoreServer will
@@ -238,20 +236,38 @@ func _EntityStore_BatchRead_Handler(srv interface{}, ctx context.Context, dec fu
 	return interceptor(ctx, in, info, handler)
 }
 
-func _EntityStore_Write_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(WriteEntityRequest)
+func _EntityStore_Create_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateEntityRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(EntityStoreServer).Create(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: EntityStore_Create_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(EntityStoreServer).Create(ctx, req.(*CreateEntityRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _EntityStore_Update_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateEntityRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(EntityStoreServer).Write(ctx, in)
+		return srv.(EntityStoreServer).Update(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: EntityStore_Write_FullMethodName,
+		FullMethod: EntityStore_Update_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(EntityStoreServer).Write(ctx, req.(*WriteEntityRequest))
+		return srv.(EntityStoreServer).Update(ctx, req.(*UpdateEntityRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -292,20 +308,20 @@ func _EntityStore_History_Handler(srv interface{}, ctx context.Context, dec func
 	return interceptor(ctx, in, info, handler)
 }
 
-func _EntityStore_Search_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(EntitySearchRequest)
+func _EntityStore_List_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(EntityListRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(EntityStoreServer).Search(ctx, in)
+		return srv.(EntityStoreServer).List(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: EntityStore_Search_FullMethodName,
+		FullMethod: EntityStore_List_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(EntityStoreServer).Search(ctx, req.(*EntitySearchRequest))
+		return srv.(EntityStoreServer).List(ctx, req.(*EntityListRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -331,24 +347,6 @@ func (x *entityStoreWatchServer) Send(m *EntityWatchResponse) error {
 	return x.ServerStream.SendMsg(m)
 }
 
-func _EntityStore_AdminWrite_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(AdminWriteEntityRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(EntityStoreServer).AdminWrite(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: EntityStore_AdminWrite_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(EntityStoreServer).AdminWrite(ctx, req.(*AdminWriteEntityRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 // EntityStore_ServiceDesc is the grpc.ServiceDesc for EntityStore service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -365,8 +363,12 @@ var EntityStore_ServiceDesc = grpc.ServiceDesc{
 			Handler:    _EntityStore_BatchRead_Handler,
 		},
 		{
-			MethodName: "Write",
-			Handler:    _EntityStore_Write_Handler,
+			MethodName: "Create",
+			Handler:    _EntityStore_Create_Handler,
+		},
+		{
+			MethodName: "Update",
+			Handler:    _EntityStore_Update_Handler,
 		},
 		{
 			MethodName: "Delete",
@@ -377,12 +379,8 @@ var EntityStore_ServiceDesc = grpc.ServiceDesc{
 			Handler:    _EntityStore_History_Handler,
 		},
 		{
-			MethodName: "Search",
-			Handler:    _EntityStore_Search_Handler,
-		},
-		{
-			MethodName: "AdminWrite",
-			Handler:    _EntityStore_AdminWrite_Handler,
+			MethodName: "List",
+			Handler:    _EntityStore_List_Handler,
 		},
 	},
 	Streams: []grpc.StreamDesc{
@@ -394,91 +392,3 @@ var EntityStore_ServiceDesc = grpc.ServiceDesc{
 	},
 	Metadata: "entity.proto",
 }
-
-const (
-	EntityStoreAdmin_AdminWrite_FullMethodName = "/entity.EntityStoreAdmin/AdminWrite"
-)
-
-// EntityStoreAdminClient is the client API for EntityStoreAdmin service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-type EntityStoreAdminClient interface {
-	AdminWrite(ctx context.Context, in *AdminWriteEntityRequest, opts ...grpc.CallOption) (*WriteEntityResponse, error)
-}
-
-type entityStoreAdminClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewEntityStoreAdminClient(cc grpc.ClientConnInterface) EntityStoreAdminClient {
-	return &entityStoreAdminClient{cc}
-}
-
-func (c *entityStoreAdminClient) AdminWrite(ctx context.Context, in *AdminWriteEntityRequest, opts ...grpc.CallOption) (*WriteEntityResponse, error) {
-	out := new(WriteEntityResponse)
-	err := c.cc.Invoke(ctx, EntityStoreAdmin_AdminWrite_FullMethodName, in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// EntityStoreAdminServer is the server API for EntityStoreAdmin service.
-// All implementations should embed UnimplementedEntityStoreAdminServer
-// for forward compatibility
-type EntityStoreAdminServer interface {
-	AdminWrite(context.Context, *AdminWriteEntityRequest) (*WriteEntityResponse, error)
-}
-
-// UnimplementedEntityStoreAdminServer should be embedded to have forward compatible implementations.
-type UnimplementedEntityStoreAdminServer struct {
-}
-
-func (UnimplementedEntityStoreAdminServer) AdminWrite(context.Context, *AdminWriteEntityRequest) (*WriteEntityResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method AdminWrite not implemented")
-}
-
-// UnsafeEntityStoreAdminServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to EntityStoreAdminServer will
-// result in compilation errors.
-type UnsafeEntityStoreAdminServer interface {
-	mustEmbedUnimplementedEntityStoreAdminServer()
-}
-
-func RegisterEntityStoreAdminServer(s grpc.ServiceRegistrar, srv EntityStoreAdminServer) {
-	s.RegisterService(&EntityStoreAdmin_ServiceDesc, srv)
-}
-
-func _EntityStoreAdmin_AdminWrite_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(AdminWriteEntityRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(EntityStoreAdminServer).AdminWrite(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: EntityStoreAdmin_AdminWrite_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(EntityStoreAdminServer).AdminWrite(ctx, req.(*AdminWriteEntityRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-// EntityStoreAdmin_ServiceDesc is the grpc.ServiceDesc for EntityStoreAdmin service.
-// It's only intended for direct use with grpc.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var EntityStoreAdmin_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "entity.EntityStoreAdmin",
-	HandlerType: (*EntityStoreAdminServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "AdminWrite",
-			Handler:    _EntityStoreAdmin_AdminWrite_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "entity.proto",
-}
diff --git a/pkg/services/store/entity/grpc/authenticator.go b/pkg/services/store/entity/grpc/authenticator.go
new file mode 100644
index 0000000000000..c8e52721f922c
--- /dev/null
+++ b/pkg/services/store/entity/grpc/authenticator.go
@@ -0,0 +1,97 @@
+package grpc
+
+import (
+	"context"
+	"fmt"
+	"strconv"
+
+	"github.com/grafana/grafana/pkg/infra/appcontext"
+	"github.com/grafana/grafana/pkg/services/grpcserver/interceptors"
+	"github.com/grafana/grafana/pkg/services/user"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/metadata"
+)
+
+type Authenticator struct{}
+
+func (f *Authenticator) Authenticate(ctx context.Context) (context.Context, error) {
+	md, ok := metadata.FromIncomingContext(ctx)
+	if !ok {
+		return nil, fmt.Errorf("no metadata found")
+	}
+
+	// TODO: use id token instead of these fields
+	login := md.Get("grafana-login")[0]
+	if login == "" {
+		return nil, fmt.Errorf("no login found in context")
+	}
+	userID, err := strconv.ParseInt(md.Get("grafana-userid")[0], 10, 64)
+	if err != nil {
+		return nil, fmt.Errorf("invalid user id: %w", err)
+	}
+	orgID, err := strconv.ParseInt(md.Get("grafana-orgid")[0], 10, 64)
+	if err != nil {
+		return nil, fmt.Errorf("invalid org id: %w", err)
+	}
+
+	// TODO: validate id token
+	/*
+		idToken := md.Get("grafana-idtoken")[0]
+		if idToken == "" {
+			return nil, fmt.Errorf("no id token found in context")
+		}
+		jwtToken, err := jwt.ParseSigned(idToken)
+		if err != nil {
+			return nil, fmt.Errorf("invalid id token: %w", err)
+		}
+		claims := jwt.Claims{}
+		err = jwtToken.UnsafeClaimsWithoutVerification(&claims)
+		if err != nil {
+			return nil, fmt.Errorf("invalid id token: %w", err)
+		}
+		// fmt.Printf("JWT CLAIMS: %+v\n", claims)
+	*/
+
+	return appcontext.WithUser(ctx, &user.SignedInUser{
+		Login:  login,
+		UserID: userID,
+		OrgID:  orgID,
+	}), nil
+}
+
+var _ interceptors.Authenticator = (*Authenticator)(nil)
+
+func UnaryClientInterceptor(ctx context.Context, method string, req, reply interface{}, cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error {
+	ctx, err := WrapContext(ctx)
+	if err != nil {
+		return err
+	}
+	return invoker(ctx, method, req, reply, cc, opts...)
+}
+
+var _ grpc.UnaryClientInterceptor = UnaryClientInterceptor
+
+func StreamClientInterceptor(ctx context.Context, desc *grpc.StreamDesc, cc *grpc.ClientConn, method string, streamer grpc.Streamer, opts ...grpc.CallOption) (grpc.ClientStream, error) {
+	ctx, err := WrapContext(ctx)
+	if err != nil {
+		return nil, err
+	}
+	return streamer(ctx, desc, cc, method, opts...)
+}
+
+var _ grpc.StreamClientInterceptor = StreamClientInterceptor
+
+func WrapContext(ctx context.Context) (context.Context, error) {
+	user, err := appcontext.User(ctx)
+	if err != nil {
+		return ctx, err
+	}
+
+	// set grpc metadata into the context to pass to the grpc server
+	return metadata.NewOutgoingContext(ctx, metadata.Pairs(
+		"grafana-idtoken", user.IDToken,
+		"grafana-userid", strconv.FormatInt(user.UserID, 10),
+		"grafana-orgid", strconv.FormatInt(user.OrgID, 10),
+		"grafana-login", user.Login,
+	)), nil
+}
diff --git a/pkg/services/store/entity/httpentitystore/service.go b/pkg/services/store/entity/httpentitystore/service.go
deleted file mode 100644
index 6b992f50f2eb6..0000000000000
--- a/pkg/services/store/entity/httpentitystore/service.go
+++ /dev/null
@@ -1,357 +0,0 @@
-package httpentitystore
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-
-	"github.com/grafana/grafana/pkg/api/response"
-	"github.com/grafana/grafana/pkg/api/routing"
-	"github.com/grafana/grafana/pkg/infra/grn"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/middleware"
-	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
-	"github.com/grafana/grafana/pkg/services/store/entity"
-	"github.com/grafana/grafana/pkg/services/store/kind"
-	"github.com/grafana/grafana/pkg/util"
-	"github.com/grafana/grafana/pkg/web"
-)
-
-type HTTPEntityStore interface {
-	// Register HTTP Access to the store
-	RegisterHTTPRoutes(routing.RouteRegister)
-}
-
-type httpEntityStore struct {
-	store entity.EntityStoreServer
-	log   log.Logger
-	kinds kind.KindRegistry
-}
-
-func ProvideHTTPEntityStore(store entity.EntityStoreServer, kinds kind.KindRegistry) HTTPEntityStore {
-	return &httpEntityStore{
-		store: store,
-		log:   log.New("http-entity-store"),
-		kinds: kinds,
-	}
-}
-
-// All registered under "api/entity"
-func (s *httpEntityStore) RegisterHTTPRoutes(route routing.RouteRegister) {
-	// For now, require admin for everything
-	reqGrafanaAdmin := middleware.ReqSignedIn //.ReqGrafanaAdmin
-
-	// Every * must parse to a GRN (uid+kind)
-	route.Get("/store/:kind/:uid", reqGrafanaAdmin, routing.Wrap(s.doGetEntity))
-	route.Post("/store/:kind/:uid", reqGrafanaAdmin, routing.Wrap(s.doWriteEntity))
-	route.Delete("/store/:kind/:uid", reqGrafanaAdmin, routing.Wrap(s.doDeleteEntity))
-	route.Get("/raw/:kind/:uid", reqGrafanaAdmin, routing.Wrap(s.doGetRawEntity))
-	route.Get("/history/:kind/:uid", reqGrafanaAdmin, routing.Wrap(s.doGetHistory))
-	route.Get("/list/:uid", reqGrafanaAdmin, routing.Wrap(s.doListFolder)) // Simplified version of search -- path is prefix
-	route.Get("/search", reqGrafanaAdmin, routing.Wrap(s.doSearch))
-
-	// File upload
-	route.Post("/upload", reqGrafanaAdmin, routing.Wrap(s.doUpload))
-}
-
-// This function will extract UID+Kind from the requested path "*" in our router
-// This is far from ideal! but is at least consistent for these endpoints.
-// This will quickly be revisited as we explore how to encode UID+Kind in a "GRN" format
-func (s *httpEntityStore) getGRNFromRequest(c *contextmodel.ReqContext) (*grn.GRN, map[string]string, error) {
-	params := web.Params(c.Req)
-	// Read parameters that are encoded in the URL
-	vals := c.Req.URL.Query()
-	for k, v := range vals {
-		if len(v) > 0 {
-			params[k] = v[0]
-		}
-	}
-	return &grn.GRN{
-		TenantID:           c.SignedInUser.GetOrgID(),
-		ResourceKind:       params[":kind"],
-		ResourceIdentifier: params[":uid"],
-	}, params, nil
-}
-
-func (s *httpEntityStore) doGetEntity(c *contextmodel.ReqContext) response.Response {
-	grn, params, err := s.getGRNFromRequest(c)
-	if err != nil {
-		return response.Error(400, err.Error(), err)
-	}
-	rsp, err := s.store.Read(c.Req.Context(), &entity.ReadEntityRequest{
-		GRN:         grn,
-		Version:     params["version"],           // ?version = XYZ
-		WithBody:    params["body"] != "false",   // default to true
-		WithSummary: params["summary"] == "true", // default to false
-	})
-	if err != nil {
-		return response.Error(500, "error fetching entity", err)
-	}
-	if rsp == nil {
-		return response.Error(404, "not found", nil)
-	}
-
-	// Configure etag support
-	currentEtag := rsp.ETag
-	previousEtag := c.Req.Header.Get("If-None-Match")
-	if previousEtag == currentEtag {
-		return response.CreateNormalResponse(
-			http.Header{
-				"ETag": []string{rsp.ETag},
-			},
-			[]byte{},               // nothing
-			http.StatusNotModified, // 304
-		)
-	}
-
-	c.Resp.Header().Set("ETag", currentEtag)
-	return response.JSON(200, rsp)
-}
-
-func (s *httpEntityStore) doGetRawEntity(c *contextmodel.ReqContext) response.Response {
-	grn, params, err := s.getGRNFromRequest(c)
-	if err != nil {
-		return response.Error(400, err.Error(), err)
-	}
-	rsp, err := s.store.Read(c.Req.Context(), &entity.ReadEntityRequest{
-		GRN:         grn,
-		Version:     params["version"], // ?version = XYZ
-		WithBody:    true,
-		WithSummary: false,
-	})
-	if err != nil {
-		return response.Error(500, "?", err)
-	}
-	info, err := s.kinds.GetInfo(grn.ResourceKind)
-	if err != nil {
-		return response.Error(400, "Unsupported kind", err)
-	}
-
-	if rsp != nil && rsp.Body != nil {
-		// Configure etag support
-		currentEtag := rsp.ETag
-		previousEtag := c.Req.Header.Get("If-None-Match")
-		if previousEtag == currentEtag {
-			return response.CreateNormalResponse(
-				http.Header{
-					"ETag": []string{rsp.ETag},
-				},
-				[]byte{},               // nothing
-				http.StatusNotModified, // 304
-			)
-		}
-		mime := info.MimeType
-		if mime == "" {
-			mime = "application/json"
-		}
-		return response.CreateNormalResponse(
-			http.Header{
-				"Content-Type": []string{mime},
-				"ETag":         []string{currentEtag},
-			},
-			rsp.Body,
-			200,
-		)
-	}
-	return response.JSON(400, rsp) // ???
-}
-
-const MAX_UPLOAD_SIZE = 5 * 1024 * 1024 // 5MB
-
-func (s *httpEntityStore) doWriteEntity(c *contextmodel.ReqContext) response.Response {
-	grn, params, err := s.getGRNFromRequest(c)
-	if err != nil {
-		return response.Error(400, err.Error(), err)
-	}
-
-	// Cap the max size
-	c.Req.Body = http.MaxBytesReader(c.Resp, c.Req.Body, MAX_UPLOAD_SIZE)
-	b, err := io.ReadAll(c.Req.Body)
-	if err != nil {
-		return response.Error(400, "error reading body", err)
-	}
-
-	rsp, err := s.store.Write(c.Req.Context(), &entity.WriteEntityRequest{
-		GRN:             grn,
-		Body:            b,
-		Folder:          params["folder"],
-		Comment:         params["comment"],
-		PreviousVersion: params["previousVersion"],
-	})
-	if err != nil {
-		return response.Error(500, "?", err)
-	}
-	return response.JSON(200, rsp)
-}
-
-func (s *httpEntityStore) doDeleteEntity(c *contextmodel.ReqContext) response.Response {
-	grn, params, err := s.getGRNFromRequest(c)
-	if err != nil {
-		return response.Error(400, err.Error(), err)
-	}
-	rsp, err := s.store.Delete(c.Req.Context(), &entity.DeleteEntityRequest{
-		GRN:             grn,
-		PreviousVersion: params["previousVersion"],
-	})
-	if err != nil {
-		return response.Error(500, "?", err)
-	}
-	return response.JSON(200, rsp)
-}
-
-func (s *httpEntityStore) doGetHistory(c *contextmodel.ReqContext) response.Response {
-	grn, params, err := s.getGRNFromRequest(c)
-	if err != nil {
-		return response.Error(400, err.Error(), err)
-	}
-	limit := int64(20) // params
-	rsp, err := s.store.History(c.Req.Context(), &entity.EntityHistoryRequest{
-		GRN:           grn,
-		Limit:         limit,
-		NextPageToken: params["nextPageToken"],
-	})
-	if err != nil {
-		return response.Error(500, "?", err)
-	}
-	return response.JSON(200, rsp)
-}
-
-func (s *httpEntityStore) doUpload(c *contextmodel.ReqContext) response.Response {
-	c.Req.Body = http.MaxBytesReader(c.Resp, c.Req.Body, MAX_UPLOAD_SIZE)
-	if err := c.Req.ParseMultipartForm(MAX_UPLOAD_SIZE); err != nil {
-		msg := fmt.Sprintf("Please limit file uploaded under %s", util.ByteCountSI(MAX_UPLOAD_SIZE))
-		return response.Error(400, msg, nil)
-	}
-	fileinfo := c.Req.MultipartForm.File
-	if len(fileinfo) < 1 {
-		return response.Error(400, "missing files", nil)
-	}
-
-	var rsp []*entity.WriteEntityResponse
-
-	message := getMultipartFormValue(c.Req, "message")
-	overwriteExistingFile := getMultipartFormValue(c.Req, "overwriteExistingFile") != "false" // must explicitly overwrite
-	folder := getMultipartFormValue(c.Req, "folder")
-	ctx := c.Req.Context()
-
-	for _, fileHeaders := range fileinfo {
-		for _, fileHeader := range fileHeaders {
-			idx := strings.LastIndex(fileHeader.Filename, ".")
-			if idx <= 0 {
-				return response.Error(400, "Expecting file extension: "+fileHeader.Filename, nil)
-			}
-
-			ext := strings.ToLower(fileHeader.Filename[idx+1:])
-			kind, err := s.kinds.GetFromExtension(ext)
-			if err != nil || kind.ID == "" {
-				return response.Error(400, "Unsupported kind: "+fileHeader.Filename, err)
-			}
-			uid := fileHeader.Filename[:idx]
-
-			file, err := fileHeader.Open()
-			if err != nil {
-				return response.Error(500, "Internal Server Error", err)
-			}
-			data, err := io.ReadAll(file)
-			if err != nil {
-				return response.Error(500, "Internal Server Error", err)
-			}
-			err = file.Close()
-			if err != nil {
-				return response.Error(500, "Internal Server Error", err)
-			}
-
-			grn := &grn.GRN{
-				ResourceIdentifier: uid,
-				ResourceKind:       kind.ID,
-				TenantID:           c.SignedInUser.GetOrgID(),
-			}
-
-			if !overwriteExistingFile {
-				result, err := s.store.Read(ctx, &entity.ReadEntityRequest{
-					GRN:         grn,
-					WithBody:    false,
-					WithSummary: false,
-				})
-				if err != nil {
-					return response.Error(500, "Internal Server Error", err)
-				}
-				if result.GRN != nil {
-					return response.Error(400, "File name already in use", err)
-				}
-			}
-
-			result, err := s.store.Write(ctx, &entity.WriteEntityRequest{
-				GRN:     grn,
-				Body:    data,
-				Comment: message,
-				Folder:  folder,
-				//	PreviousVersion: params["previousVersion"],
-			})
-
-			if err != nil {
-				return response.Error(500, err.Error(), err) // TODO, better errors
-			}
-			rsp = append(rsp, result)
-		}
-	}
-
-	return response.JSON(200, rsp)
-}
-
-func (s *httpEntityStore) doListFolder(c *contextmodel.ReqContext) response.Response {
-	return response.JSON(501, "Not implemented yet")
-}
-
-func (s *httpEntityStore) doSearch(c *contextmodel.ReqContext) response.Response {
-	vals := c.Req.URL.Query()
-
-	req := &entity.EntitySearchRequest{
-		WithBody:   asBoolean("body", vals, false),
-		WithLabels: asBoolean("labels", vals, true),
-		WithFields: asBoolean("fields", vals, true),
-		Kind:       vals["kind"],
-		Query:      vals.Get("query"),
-		Folder:     vals.Get("folder"),
-		Sort:       vals["sort"],
-	}
-	if vals.Has("limit") {
-		limit, err := strconv.ParseInt(vals.Get("limit"), 10, 64)
-		if err != nil {
-			return response.Error(400, "bad limit", err)
-		}
-		req.Limit = limit
-	}
-
-	rsp, err := s.store.Search(c.Req.Context(), req)
-	if err != nil {
-		return response.Error(500, "?", err)
-	}
-	return response.JSON(200, rsp)
-}
-
-func asBoolean(key string, vals url.Values, defaultValue bool) bool {
-	v, ok := vals[key]
-	if !ok {
-		return defaultValue
-	}
-	if len(v) == 0 {
-		return true // single boolean parameter
-	}
-	b, err := strconv.ParseBool(v[0])
-	if err != nil {
-		return defaultValue
-	}
-	return b
-}
-
-func getMultipartFormValue(req *http.Request, key string) string {
-	v, ok := req.MultipartForm.Value[key]
-	if !ok || len(v) != 1 {
-		return ""
-	}
-	return v[0]
-}
diff --git a/pkg/services/store/entity/json.go b/pkg/services/store/entity/json.go
deleted file mode 100644
index b79724dc80932..0000000000000
--- a/pkg/services/store/entity/json.go
+++ /dev/null
@@ -1,303 +0,0 @@
-package entity
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"unsafe"
-
-	jsoniter "github.com/json-iterator/go"
-
-	"github.com/grafana/grafana/pkg/infra/grn"
-)
-
-func init() { //nolint:gochecknoinits
-	jsoniter.RegisterTypeEncoder("entity.EntitySearchResult", &searchResultCodec{})
-	jsoniter.RegisterTypeEncoder("entity.WriteEntityResponse", &writeResponseCodec{})
-
-	jsoniter.RegisterTypeEncoder("entity.Entity", &rawEntityCodec{})
-	jsoniter.RegisterTypeDecoder("entity.Entity", &rawEntityCodec{})
-}
-
-func writeRawJson(stream *jsoniter.Stream, val []byte) {
-	if json.Valid(val) {
-		_, _ = stream.Write(val)
-	} else {
-		stream.WriteString(string(val))
-	}
-}
-
-// Unlike the standard JSON marshal, this will write bytes as JSON when it can
-type rawEntityCodec struct{}
-
-func (obj *Entity) MarshalJSON() ([]byte, error) {
-	var json = jsoniter.ConfigCompatibleWithStandardLibrary
-	return json.Marshal(obj)
-}
-
-// UnmarshalJSON will read JSON into a Entity
-func (obj *Entity) UnmarshalJSON(b []byte) error {
-	if obj == nil {
-		return fmt.Errorf("unexpected nil for raw objcet")
-	}
-	iter := jsoniter.ParseBytes(jsoniter.ConfigDefault, b)
-	readEntity(iter, obj)
-	return iter.Error
-}
-
-func (codec *rawEntityCodec) IsEmpty(ptr unsafe.Pointer) bool {
-	f := (*Entity)(ptr)
-	return f.GRN == nil && f.Body == nil
-}
-
-func (codec *rawEntityCodec) Encode(ptr unsafe.Pointer, stream *jsoniter.Stream) {
-	obj := (*Entity)(ptr)
-	stream.WriteObjectStart()
-	stream.WriteObjectField("GRN")
-	stream.WriteVal(obj.GRN)
-
-	if obj.Version != "" {
-		stream.WriteMore()
-		stream.WriteObjectField("version")
-		stream.WriteString(obj.Version)
-	}
-	if obj.CreatedAt > 0 {
-		stream.WriteMore()
-		stream.WriteObjectField("createdAt")
-		stream.WriteInt64(obj.CreatedAt)
-	}
-	if obj.UpdatedAt > 0 {
-		stream.WriteMore()
-		stream.WriteObjectField("updatedAt")
-		stream.WriteInt64(obj.UpdatedAt)
-	}
-	if obj.CreatedBy != "" {
-		stream.WriteMore()
-		stream.WriteObjectField("createdBy")
-		stream.WriteString(obj.CreatedBy)
-	}
-	if obj.UpdatedBy != "" {
-		stream.WriteMore()
-		stream.WriteObjectField("updatedBy")
-		stream.WriteString(obj.UpdatedBy)
-	}
-	if obj.Folder != "" {
-		stream.WriteMore()
-		stream.WriteObjectField("folder")
-		stream.WriteString(obj.Folder)
-	}
-	if obj.Body != nil {
-		stream.WriteMore()
-		if json.Valid(obj.Body) {
-			stream.WriteObjectField("body")
-			stream.WriteRaw(string(obj.Body)) // works for strings
-		} else {
-			sEnc := base64.StdEncoding.EncodeToString(obj.Body)
-			stream.WriteObjectField("body_base64")
-			stream.WriteString(sEnc) // works for strings
-		}
-	}
-	if len(obj.SummaryJson) > 0 {
-		stream.WriteMore()
-		stream.WriteObjectField("summary")
-		writeRawJson(stream, obj.SummaryJson)
-	}
-	if obj.ETag != "" {
-		stream.WriteMore()
-		stream.WriteObjectField("etag")
-		stream.WriteString(obj.ETag)
-	}
-	if obj.Size > 0 {
-		stream.WriteMore()
-		stream.WriteObjectField("size")
-		stream.WriteInt64(obj.Size)
-	}
-	if obj.Origin != nil {
-		stream.WriteMore()
-		stream.WriteObjectField("origin")
-		stream.WriteVal(obj.Origin)
-	}
-	stream.WriteObjectEnd()
-}
-
-func (codec *rawEntityCodec) Decode(ptr unsafe.Pointer, iter *jsoniter.Iterator) {
-	*(*Entity)(ptr) = Entity{}
-	raw := (*Entity)(ptr)
-	readEntity(iter, raw)
-}
-
-func readEntity(iter *jsoniter.Iterator, raw *Entity) {
-	for l1Field := iter.ReadObject(); l1Field != ""; l1Field = iter.ReadObject() {
-		switch l1Field {
-		case "GRN":
-			raw.GRN = &grn.GRN{}
-			iter.ReadVal(raw.GRN)
-		case "updatedAt":
-			raw.UpdatedAt = iter.ReadInt64()
-		case "updatedBy":
-			raw.UpdatedBy = iter.ReadString()
-		case "createdAt":
-			raw.CreatedAt = iter.ReadInt64()
-		case "createdBy":
-			raw.CreatedBy = iter.ReadString()
-		case "size":
-			raw.Size = iter.ReadInt64()
-		case "etag":
-			raw.ETag = iter.ReadString()
-		case "version":
-			raw.Version = iter.ReadString()
-		case "folder":
-			raw.Folder = iter.ReadString()
-		case "origin":
-			raw.Origin = &EntityOriginInfo{}
-			iter.ReadVal(raw.Origin)
-		case "summary":
-			var val interface{}
-			iter.ReadVal(&val) // ??? is there a smarter way to just keep the underlying bytes without read+marshal
-			body, err := json.Marshal(val)
-			if err != nil {
-				iter.ReportError("raw entity", "error reading summary body")
-				return
-			}
-			raw.SummaryJson = body
-
-		case "body":
-			var val interface{}
-			iter.ReadVal(&val) // ??? is there a smarter way to just keep the underlying bytes without read+marshal
-			body, err := json.Marshal(val)
-			if err != nil {
-				iter.ReportError("raw entity", "error creating json from body")
-				return
-			}
-			raw.Body = body
-
-		case "body_base64":
-			val := iter.ReadString()
-			body, err := base64.StdEncoding.DecodeString(val)
-			if err != nil {
-				iter.ReportError("raw entity", "error decoding base64 body")
-				return
-			}
-			raw.Body = body
-
-		default:
-			iter.ReportError("raw object", "unexpected field: "+l1Field)
-			return
-		}
-	}
-}
-
-// Unlike the standard JSON marshal, this will write bytes as JSON when it can
-type searchResultCodec struct{}
-
-func (obj *EntitySearchResult) MarshalJSON() ([]byte, error) {
-	var json = jsoniter.ConfigCompatibleWithStandardLibrary
-	return json.Marshal(obj)
-}
-
-func (codec *searchResultCodec) IsEmpty(ptr unsafe.Pointer) bool {
-	f := (*EntitySearchResult)(ptr)
-	return f.GRN == nil && f.Body == nil
-}
-
-func (codec *searchResultCodec) Encode(ptr unsafe.Pointer, stream *jsoniter.Stream) {
-	obj := (*EntitySearchResult)(ptr)
-	stream.WriteObjectStart()
-	stream.WriteObjectField("GRN")
-	stream.WriteVal(obj.GRN)
-
-	if obj.Name != "" {
-		stream.WriteMore()
-		stream.WriteObjectField("name")
-		stream.WriteString(obj.Name)
-	}
-	if obj.Description != "" {
-		stream.WriteMore()
-		stream.WriteObjectField("description")
-		stream.WriteString(obj.Description)
-	}
-	if obj.Size > 0 {
-		stream.WriteMore()
-		stream.WriteObjectField("size")
-		stream.WriteInt64(obj.Size)
-	}
-	if obj.UpdatedAt > 0 {
-		stream.WriteMore()
-		stream.WriteObjectField("updatedAt")
-		stream.WriteInt64(obj.UpdatedAt)
-	}
-	if obj.UpdatedBy != "" {
-		stream.WriteMore()
-		stream.WriteObjectField("updatedBy")
-		stream.WriteVal(obj.UpdatedBy)
-	}
-	if obj.Body != nil {
-		stream.WriteMore()
-		if json.Valid(obj.Body) {
-			stream.WriteObjectField("body")
-			_, _ = stream.Write(obj.Body) // works for strings
-		} else {
-			stream.WriteObjectField("body_base64")
-			stream.WriteVal(obj.Body) // works for strings
-		}
-	}
-	if obj.Labels != nil {
-		stream.WriteMore()
-		stream.WriteObjectField("labels")
-		stream.WriteVal(obj.Labels)
-	}
-	if obj.ErrorJson != nil {
-		stream.WriteMore()
-		stream.WriteObjectField("error")
-		writeRawJson(stream, obj.ErrorJson)
-	}
-	if obj.FieldsJson != nil {
-		stream.WriteMore()
-		stream.WriteObjectField("fields")
-		writeRawJson(stream, obj.FieldsJson)
-	}
-
-	stream.WriteObjectEnd()
-}
-
-// Unlike the standard JSON marshal, this will write bytes as JSON when it can
-type writeResponseCodec struct{}
-
-func (obj *WriteEntityResponse) MarshalJSON() ([]byte, error) {
-	var json = jsoniter.ConfigCompatibleWithStandardLibrary
-	return json.Marshal(obj)
-}
-
-func (codec *writeResponseCodec) IsEmpty(ptr unsafe.Pointer) bool {
-	f := (*WriteEntityResponse)(ptr)
-	return f == nil
-}
-
-func (codec *writeResponseCodec) Encode(ptr unsafe.Pointer, stream *jsoniter.Stream) {
-	obj := (*WriteEntityResponse)(ptr)
-	stream.WriteObjectStart()
-	stream.WriteObjectField("status")
-	stream.WriteString(obj.Status.String())
-
-	if obj.Error != nil {
-		stream.WriteMore()
-		stream.WriteObjectField("error")
-		stream.WriteVal(obj.Error)
-	}
-	if obj.GRN != nil {
-		stream.WriteMore()
-		stream.WriteObjectField("GRN")
-		stream.WriteVal(obj.GRN)
-	}
-	if obj.Entity != nil {
-		stream.WriteMore()
-		stream.WriteObjectField("entity")
-		stream.WriteVal(obj.Entity)
-	}
-	if len(obj.SummaryJson) > 0 {
-		stream.WriteMore()
-		stream.WriteObjectField("summary")
-		writeRawJson(stream, obj.SummaryJson)
-	}
-	stream.WriteObjectEnd()
-}
diff --git a/pkg/services/store/entity/json_test.go b/pkg/services/store/entity/json_test.go
deleted file mode 100644
index 3e684f75e704e..0000000000000
--- a/pkg/services/store/entity/json_test.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package entity
-
-import (
-	"encoding/json"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/infra/grn"
-)
-
-func TestRawEncoders(t *testing.T) {
-	body, err := json.Marshal(map[string]any{
-		"hello": "world",
-		"field": 1.23,
-	})
-	require.NoError(t, err)
-
-	raw := &Entity{
-		GRN: &grn.GRN{
-			ResourceIdentifier: "a",
-			ResourceKind:       "b",
-		},
-		Version: "c",
-		ETag:    "d",
-		Body:    body,
-	}
-
-	b, err := json.MarshalIndent(raw, "", "  ")
-	require.NoError(t, err)
-
-	str := string(b)
-
-	require.JSONEq(t, `{
-		"GRN": {
-		  "ResourceKind":       "b",
-		  "ResourceIdentifier": "a"
-		},
-		"version": "c",
-		"body": {
-		  "field": 1.23,
-		  "hello": "world"
-		},
-		"etag": "d"
-	  }`, str)
-
-	copy := &Entity{}
-	err = json.Unmarshal(b, copy)
-	require.NoError(t, err)
-}
diff --git a/pkg/services/store/entity/key.go b/pkg/services/store/entity/key.go
new file mode 100644
index 0000000000000..bcd83dd0a71a8
--- /dev/null
+++ b/pkg/services/store/entity/key.go
@@ -0,0 +1,82 @@
+package entity
+
+import (
+	"fmt"
+	"strings"
+)
+
+type Key struct {
+	Group       string
+	Resource    string
+	Namespace   string
+	Name        string
+	Subresource string
+}
+
+func ParseKey(key string) (*Key, error) {
+	// /<group>/<resource>[/namespaces/<namespace>][/<name>[/<subresource>]]
+	parts := strings.Split(key, "/")
+	if len(parts) < 3 {
+		return nil, fmt.Errorf("invalid key (expecting at least 2 parts): %s", key)
+	}
+
+	if parts[0] != "" {
+		return nil, fmt.Errorf("invalid key (expecting leading slash): %s", key)
+	}
+
+	k := &Key{
+		Group:    parts[1],
+		Resource: parts[2],
+	}
+
+	if len(parts) == 3 {
+		return k, nil
+	}
+
+	if parts[3] != "namespaces" {
+		k.Name = parts[3]
+		if len(parts) > 4 {
+			k.Subresource = strings.Join(parts[4:], "/")
+		}
+		return k, nil
+	}
+
+	if len(parts) < 5 {
+		return nil, fmt.Errorf("invalid key (expecting namespace after 'namespaces'): %s", key)
+	}
+
+	k.Namespace = parts[4]
+
+	if len(parts) == 5 {
+		return k, nil
+	}
+
+	k.Name = parts[5]
+	if len(parts) > 6 {
+		k.Subresource = strings.Join(parts[6:], "/")
+	}
+
+	return k, nil
+}
+
+func (k *Key) String() string {
+	s := "/" + k.Group + "/" + k.Resource
+	if len(k.Namespace) > 0 {
+		s += "/namespaces/" + k.Namespace
+	}
+	if len(k.Name) > 0 {
+		s += "/" + k.Name
+		if len(k.Subresource) > 0 {
+			s += "/" + k.Subresource
+		}
+	}
+	return s
+}
+
+func (k *Key) IsEqual(other *Key) bool {
+	return k.Group == other.Group &&
+		k.Resource == other.Resource &&
+		k.Namespace == other.Namespace &&
+		k.Name == other.Name &&
+		k.Subresource == other.Subresource
+}
diff --git a/pkg/services/store/entity/migrations/entity_store_mig.go b/pkg/services/store/entity/migrations/entity_store_mig.go
deleted file mode 100644
index 396e4ca92f38d..0000000000000
--- a/pkg/services/store/entity/migrations/entity_store_mig.go
+++ /dev/null
@@ -1,196 +0,0 @@
-package migrations
-
-import (
-	"fmt"
-
-	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
-)
-
-func getLatinPathColumn(name string) *migrator.Column {
-	return &migrator.Column{
-		Name:     name,
-		Type:     migrator.DB_NVarchar,
-		Length:   1024,
-		Nullable: false,
-		IsLatin:  true, // only used in MySQL
-	}
-}
-
-func initEntityTables(mg *migrator.Migrator) {
-	grnLength := 256 // len(tenant)~8 + len(kind)!16 + len(kind)~128 = 256
-	tables := []migrator.Table{}
-	tables = append(tables, migrator.Table{
-		Name: "entity",
-		Columns: []*migrator.Column{
-			// Object ID (OID) will be unique across all objects/instances
-			// uuid5( tenant_id, kind + uid )
-			{Name: "grn", Type: migrator.DB_NVarchar, Length: grnLength, Nullable: false, IsPrimaryKey: true},
-
-			// The entity identifier
-			{Name: "tenant_id", Type: migrator.DB_BigInt, Nullable: false},
-			{Name: "kind", Type: migrator.DB_NVarchar, Length: 255, Nullable: false},
-			{Name: "uid", Type: migrator.DB_NVarchar, Length: 40, Nullable: false},
-			{Name: "folder", Type: migrator.DB_NVarchar, Length: 40, Nullable: false},
-			{Name: "slug", Type: migrator.DB_NVarchar, Length: 189, Nullable: false}, // from title
-
-			// The raw entity body (any byte array)
-			{Name: "body", Type: migrator.DB_LongBlob, Nullable: true}, // null when nested or remote
-			{Name: "size", Type: migrator.DB_BigInt, Nullable: false},
-			{Name: "etag", Type: migrator.DB_NVarchar, Length: 32, Nullable: false, IsLatin: true}, // md5(body)
-			{Name: "version", Type: migrator.DB_NVarchar, Length: 128, Nullable: false},
-
-			// Who changed what when -- We should avoid JOINs with other tables in the database
-			{Name: "updated_at", Type: migrator.DB_BigInt, Nullable: false},
-			{Name: "created_at", Type: migrator.DB_BigInt, Nullable: false},
-			{Name: "updated_by", Type: migrator.DB_NVarchar, Length: 190, Nullable: false},
-			{Name: "created_by", Type: migrator.DB_NVarchar, Length: 190, Nullable: false},
-
-			// Mark objects with origin metadata
-			{Name: "origin", Type: migrator.DB_NVarchar, Length: 40, Nullable: false},
-			getLatinPathColumn("origin_key"), // index with length 1024
-			{Name: "origin_ts", Type: migrator.DB_BigInt, Nullable: false},
-
-			// Summary data (always extracted from the `body` column)
-			{Name: "name", Type: migrator.DB_NVarchar, Length: 255, Nullable: false},
-			{Name: "description", Type: migrator.DB_NVarchar, Length: 255, Nullable: true},
-			{Name: "labels", Type: migrator.DB_Text, Nullable: true}, // JSON object
-			{Name: "fields", Type: migrator.DB_Text, Nullable: true}, // JSON object
-			{Name: "errors", Type: migrator.DB_Text, Nullable: true}, // JSON object
-		},
-		Indices: []*migrator.Index{
-			{Cols: []string{"kind"}},
-			{Cols: []string{"folder"}},
-			{Cols: []string{"uid"}},
-
-			{Cols: []string{"tenant_id", "kind", "uid"}, Type: migrator.UniqueIndex},
-			// {Cols: []string{"tenant_id", "folder", "slug"}, Type: migrator.UniqueIndex},
-		},
-	})
-
-	// when saving a folder, keep a path version cached (all info is derived from entity table)
-	tables = append(tables, migrator.Table{
-		Name: "entity_folder",
-		Columns: []*migrator.Column{
-			{Name: "grn", Type: migrator.DB_NVarchar, Length: grnLength, Nullable: false, IsPrimaryKey: true},
-			{Name: "tenant_id", Type: migrator.DB_BigInt, Nullable: false},
-			{Name: "uid", Type: migrator.DB_NVarchar, Length: 40, Nullable: false},
-			getLatinPathColumn("slug_path"),                             ///slug/slug/slug/
-			{Name: "tree", Type: migrator.DB_Text, Nullable: false},     // JSON []{uid, title}
-			{Name: "depth", Type: migrator.DB_Int, Nullable: false},     // starts at 1
-			{Name: "left", Type: migrator.DB_Int, Nullable: false},      // MPTT
-			{Name: "right", Type: migrator.DB_Int, Nullable: false},     // MPTT
-			{Name: "detached", Type: migrator.DB_Bool, Nullable: false}, // a parent folder was not found
-		},
-		Indices: []*migrator.Index{
-			{Cols: []string{"tenant_id", "uid"}, Type: migrator.UniqueIndex},
-			//	{Cols: []string{"tenant_id", "slug_path"}, Type: migrator.UniqueIndex},
-		},
-	})
-
-	tables = append(tables, migrator.Table{
-		Name: "entity_labels",
-		Columns: []*migrator.Column{
-			{Name: "grn", Type: migrator.DB_NVarchar, Length: grnLength, Nullable: false},
-			{Name: "label", Type: migrator.DB_NVarchar, Length: 191, Nullable: false},
-			{Name: "value", Type: migrator.DB_NVarchar, Length: 1024, Nullable: false},
-			{Name: "parent_grn", Type: migrator.DB_NVarchar, Length: grnLength, Nullable: true},
-		},
-		Indices: []*migrator.Index{
-			{Cols: []string{"grn", "label"}, Type: migrator.UniqueIndex},
-			{Cols: []string{"parent_grn"}, Type: migrator.IndexType},
-		},
-	})
-
-	tables = append(tables, migrator.Table{
-		Name: "entity_ref",
-		Columns: []*migrator.Column{
-			// Source:
-			{Name: "grn", Type: migrator.DB_NVarchar, Length: grnLength, Nullable: false},
-			{Name: "parent_grn", Type: migrator.DB_NVarchar, Length: grnLength, Nullable: true},
-
-			// Address (defined in the body, not resolved, may be invalid and change)
-			{Name: "family", Type: migrator.DB_NVarchar, Length: 255, Nullable: false},
-			{Name: "type", Type: migrator.DB_NVarchar, Length: 255, Nullable: true},
-			{Name: "id", Type: migrator.DB_NVarchar, Length: 1024, Nullable: true},
-
-			// Runtime calcs (will depend on the system state)
-			{Name: "resolved_ok", Type: migrator.DB_Bool, Nullable: false},
-			{Name: "resolved_to", Type: migrator.DB_NVarchar, Length: 40, Nullable: false},
-			{Name: "resolved_warning", Type: migrator.DB_NVarchar, Length: 255, Nullable: false},
-			{Name: "resolved_time", Type: migrator.DB_DateTime, Nullable: false}, // resolution cache timestamp
-		},
-		Indices: []*migrator.Index{
-			{Cols: []string{"grn"}, Type: migrator.IndexType},
-			{Cols: []string{"family"}, Type: migrator.IndexType},
-			{Cols: []string{"type"}, Type: migrator.IndexType},
-			{Cols: []string{"resolved_to"}, Type: migrator.IndexType},
-			{Cols: []string{"parent_grn"}, Type: migrator.IndexType},
-		},
-	})
-
-	tables = append(tables, migrator.Table{
-		Name: "entity_history",
-		Columns: []*migrator.Column{
-			{Name: "grn", Type: migrator.DB_NVarchar, Length: grnLength, Nullable: false},
-			{Name: "version", Type: migrator.DB_NVarchar, Length: 128, Nullable: false},
-
-			// Raw bytes
-			{Name: "body", Type: migrator.DB_LongBlob, Nullable: false},
-			{Name: "size", Type: migrator.DB_BigInt, Nullable: false},
-			{Name: "etag", Type: migrator.DB_NVarchar, Length: 32, Nullable: false, IsLatin: true}, // md5(body)
-
-			// Who changed what when
-			{Name: "updated_at", Type: migrator.DB_BigInt, Nullable: false},
-			{Name: "updated_by", Type: migrator.DB_NVarchar, Length: 190, Nullable: false},
-
-			// Commit message
-			{Name: "message", Type: migrator.DB_Text, Nullable: false}, // defaults to empty string
-		},
-		Indices: []*migrator.Index{
-			{Cols: []string{"grn", "version"}, Type: migrator.UniqueIndex},
-			{Cols: []string{"updated_by"}, Type: migrator.IndexType},
-		},
-	})
-
-	tables = append(tables, migrator.Table{
-		Name: "entity_nested",
-		Columns: []*migrator.Column{
-			{Name: "grn", Type: migrator.DB_NVarchar, Length: grnLength, Nullable: false, IsPrimaryKey: true},
-			{Name: "parent_grn", Type: migrator.DB_NVarchar, Length: grnLength, Nullable: false},
-
-			// The entity identifier
-			{Name: "tenant_id", Type: migrator.DB_BigInt, Nullable: false},
-			{Name: "kind", Type: migrator.DB_NVarchar, Length: 255, Nullable: false},
-			{Name: "uid", Type: migrator.DB_NVarchar, Length: 40, Nullable: false},
-			{Name: "folder", Type: migrator.DB_NVarchar, Length: 40, Nullable: false},
-
-			// Summary data (always extracted from the `body` column)
-			{Name: "name", Type: migrator.DB_NVarchar, Length: 255, Nullable: false},
-			{Name: "description", Type: migrator.DB_NVarchar, Length: 255, Nullable: true},
-			{Name: "labels", Type: migrator.DB_Text, Nullable: true}, // JSON object
-			{Name: "fields", Type: migrator.DB_Text, Nullable: true}, // JSON object
-			{Name: "errors", Type: migrator.DB_Text, Nullable: true}, // JSON object
-		},
-		Indices: []*migrator.Index{
-			{Cols: []string{"parent_grn"}},
-			{Cols: []string{"kind"}},
-			{Cols: []string{"folder"}},
-			{Cols: []string{"uid"}},
-			{Cols: []string{"tenant_id", "kind", "uid"}, Type: migrator.UniqueIndex},
-		},
-	})
-
-	// Initialize all tables
-	for t := range tables {
-		mg.AddMigration("drop table "+tables[t].Name, migrator.NewDropTableMigration(tables[t].Name))
-		mg.AddMigration("create table "+tables[t].Name, migrator.NewAddTableMigration(tables[t]))
-		for i := range tables[t].Indices {
-			mg.AddMigration(fmt.Sprintf("create table %s, index: %d", tables[t].Name, i), migrator.NewAddIndexMigration(tables[t], tables[t].Indices[i]))
-		}
-	}
-
-	mg.AddMigration("set path collation on entity table", migrator.NewRawSQLMigration("").
-		// MySQL `utf8mb4_unicode_ci` collation is set in `mysql_dialect.go`
-		// SQLite uses a `BINARY` collation by default
-		Postgres("ALTER TABLE entity_folder ALTER COLUMN slug_path TYPE VARCHAR(1024) COLLATE \"C\";")) // Collate C - sorting done based on character code byte values
-}
diff --git a/pkg/services/store/entity/migrations/migrator.go b/pkg/services/store/entity/migrations/migrator.go
deleted file mode 100644
index 7702f38acefa9..0000000000000
--- a/pkg/services/store/entity/migrations/migrator.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package migrations
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/services/sqlstore"
-	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
-	"github.com/grafana/grafana/pkg/services/sqlstore/session"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func MigrateEntityStore(xdb db.DB, features featuremgmt.FeatureToggles) error {
-	// Skip if feature flag is not enabled
-	if !features.IsEnabled(featuremgmt.FlagEntityStore) {
-		return nil
-	}
-
-	// Migrations depend on upstream xorm implementations
-	sql, ok := xdb.(*sqlstore.SQLStore)
-	if !ok {
-		return nil
-	}
-
-	// !!! This should not run in production!
-	// The object store SQL schema is still in active development and this
-	// will only be called when the feature toggle is enabled
-	// this check should not be necessary, but is added as an extra check
-	if setting.Env == setting.Prod {
-		return nil
-	}
-
-	marker := "Initialize entity tables (v0)" // changing this key wipe+rewrite everything
-	mg := migrator.NewScopedMigrator(sql.GetEngine(), sql.Cfg, "entity")
-	mg.AddCreateMigration()
-	mg.AddMigration(marker, &migrator.RawSQLMigration{})
-	initEntityTables(mg)
-
-	// While this feature is under development, we can completly wipe and recreate
-	// The initial plan is to keep the source of truth in existing SQL tables, and mirrot it
-	// to a kubernetes model.  Once the kubernetes model needs to be preserved,
-	// this code should be removed
-	log, err := mg.GetMigrationLog()
-	if err != nil {
-		return err
-	}
-	_, found := log[marker]
-	if !found && len(log) > 0 {
-		// Remove the migration log (and potential other orphan tables)
-		tables := []string{"entity_migration_log"}
-
-		ctx := context.Background()
-		err = sql.GetSqlxSession().WithTransaction(ctx, func(tx *session.SessionTx) error {
-			for _, t := range tables {
-				_, err := tx.Exec(ctx, fmt.Sprintf("DROP TABLE IF EXISTS %s", t))
-				if err != nil {
-					return err
-				}
-			}
-			return nil
-		})
-		if err != nil {
-			return err
-		}
-	}
-
-	return mg.Start(
-		features.IsEnabled(featuremgmt.FlagMigrationLocking),
-		sql.GetMigrationLockAttemptTimeout())
-}
diff --git a/pkg/services/store/entity/models.go b/pkg/services/store/entity/models.go
index 1e8786d39b571..e973282ebeef9 100644
--- a/pkg/services/store/entity/models.go
+++ b/pkg/services/store/entity/models.go
@@ -1,19 +1,15 @@
 package entity
 
+import context "context"
+
 //-----------------------------------------------------------------------------------------------------
 // NOTE: the object store is in heavy development, and the locations will likely continue to move
 //-----------------------------------------------------------------------------------------------------
 
-import (
-	"context"
-)
-
 const (
-	StandardKindDashboard   = "dashboard"
-	StandardKindPlaylist    = "playlist"
-	StandardKindSnapshot    = "snapshot"
-	StandardKindFolder      = "folder"
-	StandardKindPreferences = "preferences"
+	StandardKindDashboard = "dashboard"
+	StandardKindPlaylist  = "playlist"
+	StandardKindFolder    = "folder"
 
 	// StandardKindDataSource: not a real kind yet, but used to define references from dashboards
 	// Types: influx, prometheus, testdata, ...
@@ -23,18 +19,6 @@ const (
 	// Standalone panel is not an object kind yet -- library panel, or nested in dashboard
 	StandardKindPanel = "panel"
 
-	// entity.StandardKindSVG SVG file support
-	StandardKindSVG = "svg"
-
-	// StandardKindPNG PNG file support
-	StandardKindPNG = "png"
-
-	// StandardKindGeoJSON represents spatial data
-	StandardKindGeoJSON = "geojson"
-
-	// StandardKindDataFrame data frame
-	StandardKindDataFrame = "frame"
-
 	// StandardKindJSONObj generic json object
 	StandardKindJSONObj = "jsonobj"
 
@@ -64,81 +48,6 @@ const (
 	ExternalEntityReferenceRuntime_Transformer = "transformer"
 )
 
-// EntityKindInfo describes information needed from the object store
-// All non-raw types will have a schema that can be used to validate
-type EntityKindInfo struct {
-	// Unique short id for this kind
-	ID string `json:"id,omitempty"`
-
-	// Display name (may be equal to the ID)
-	Name string `json:"name,omitempty"`
-
-	// Kind description
-	Description string `json:"description,omitempty"`
-
-	// The format is not controlled by a schema
-	IsRaw bool `json:"isRaw,omitempty"`
-
-	// The preferred save extension (svg, png, parquet, etc) if one exists
-	FileExtension string `json:"fileExtension,omitempty"`
-
-	// The correct mime-type to return for raw objects
-	MimeType string `json:"mimeType,omitempty"`
-}
-
-// EntitySummary represents common data derived from a raw object bytes.
-// The values should not depend on system state, and are derived from the raw object.
-// This summary is used for a unified search and object listing
-type EntitySummary struct {
-	UID         string `json:"uid,omitempty"`
-	Kind        string `json:"kind,omitempty"`
-	Name        string `json:"name,omitempty"`
-	Description string `json:"description,omitempty"`
-
-	// Key value pairs.  Tags are are represented as keys with empty values
-	Labels map[string]string `json:"labels,omitempty"`
-
-	// Parent folder UID
-	Folder string `json:"folder,omitempty"`
-
-	// URL safe version of the name.  It will be unique within the folder
-	Slug string `json:"slug,omitempty"`
-
-	// When errors exist
-	Error *EntityErrorInfo `json:"error,omitempty"`
-
-	// Optional field values.  The schema will define and document possible values for a given kind
-	Fields map[string]any `json:"fields,omitempty"`
-
-	// eg: panels within dashboard
-	Nested []*EntitySummary `json:"nested,omitempty"`
-
-	// Optional references to external things
-	References []*EntityExternalReference `json:"references,omitempty"`
-
-	// The summary can not be extended
-	_ any
-}
-
-// Reference to another object outside itself
-// This message is derived from the object body and can be used to search for references.
-// This does not represent a method to declare a reference to another object.
-type EntityExternalReference struct {
-	// Category of dependency
-	// eg: datasource, plugin, runtime
-	Family string `json:"family,omitempty"`
-
-	// datasource > prometheus|influx|...
-	// plugin > panel | datasource
-	// runtime > transformer
-	Type string `json:"type,omitempty"` // flavor
-
-	// datasource > UID
-	// plugin > plugin identifier
-	// runtime > name lookup
-	Identifier string `json:"ID,omitempty"`
-}
-
 // EntitySummaryBuilder will read an object, validate it, and return a summary, sanitized payload, or an error
 // This should not include values that depend on system state, only the raw object
 type EntitySummaryBuilder = func(ctx context.Context, uid string, body []byte) (*EntitySummary, []byte, error)
diff --git a/pkg/services/store/entity/server/config.go b/pkg/services/store/entity/server/config.go
new file mode 100644
index 0000000000000..22bdba146469f
--- /dev/null
+++ b/pkg/services/store/entity/server/config.go
@@ -0,0 +1,52 @@
+package server
+
+import (
+	"fmt"
+	"net"
+	"strconv"
+
+	// "github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+type config struct {
+	enabled bool
+	devMode bool
+
+	ip     net.IP
+	port   int
+	host   string
+	apiURL string
+
+	logLevel int
+}
+
+func newConfig(cfg *setting.Cfg) *config {
+	defaultLogLevel := 0
+	// TODO
+	ip := net.ParseIP(cfg.HTTPAddr)
+	apiURL := cfg.AppURL
+	port, err := strconv.Atoi(cfg.HTTPPort)
+	if err != nil {
+		port = 3001
+	}
+
+	if cfg.Env == setting.Dev {
+		defaultLogLevel = 10
+		port = 3001
+		ip = net.ParseIP("127.0.0.1")
+		apiURL = fmt.Sprintf("https://%s:%d", ip, port)
+	}
+
+	host := fmt.Sprintf("%s:%d", ip, port)
+
+	return &config{
+		enabled:  true,
+		devMode:  cfg.Env == setting.Dev,
+		ip:       ip,
+		port:     port,
+		host:     host,
+		logLevel: cfg.SectionWithEnvOverrides("storage-server").Key("log_level").MustInt(defaultLogLevel),
+		apiURL:   apiURL,
+	}
+}
diff --git a/pkg/services/store/entity/server/service.go b/pkg/services/store/entity/server/service.go
new file mode 100644
index 0000000000000..f4e4468e40acd
--- /dev/null
+++ b/pkg/services/store/entity/server/service.go
@@ -0,0 +1,149 @@
+package server
+
+import (
+	"context"
+
+	"github.com/grafana/dskit/services"
+	"github.com/prometheus/client_golang/prometheus"
+
+	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/modules"
+	"github.com/grafana/grafana/pkg/registry"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/grpcserver"
+	"github.com/grafana/grafana/pkg/services/grpcserver/interceptors"
+	"github.com/grafana/grafana/pkg/services/store/entity"
+	"github.com/grafana/grafana/pkg/services/store/entity/db/dbimpl"
+	"github.com/grafana/grafana/pkg/services/store/entity/grpc"
+	"github.com/grafana/grafana/pkg/services/store/entity/sqlstash"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+var (
+	_ Service                    = (*service)(nil)
+	_ registry.BackgroundService = (*service)(nil)
+	_ registry.CanBeDisabled     = (*service)(nil)
+)
+
+func init() {
+	// do nothing
+}
+
+type Service interface {
+	services.NamedService
+	registry.BackgroundService
+	registry.CanBeDisabled
+}
+
+type service struct {
+	*services.BasicService
+
+	config *config
+
+	cfg      *setting.Cfg
+	features featuremgmt.FeatureToggles
+
+	stopCh    chan struct{}
+	stoppedCh chan error
+
+	handler grpcserver.Provider
+
+	tracing *tracing.TracingService
+
+	authenticator interceptors.Authenticator
+}
+
+func ProvideService(
+	cfg *setting.Cfg,
+	features featuremgmt.FeatureToggles,
+) (*service, error) {
+	tracingCfg, err := tracing.ProvideTracingConfig(cfg)
+	if err != nil {
+		return nil, err
+	}
+
+	tracing, err := tracing.ProvideService(tracingCfg)
+	if err != nil {
+		return nil, err
+	}
+
+	authn := &grpc.Authenticator{}
+
+	s := &service{
+		config:        newConfig(cfg),
+		cfg:           cfg,
+		features:      features,
+		stopCh:        make(chan struct{}),
+		authenticator: authn,
+		tracing:       tracing,
+	}
+
+	// This will be used when running as a dskit service
+	s.BasicService = services.NewBasicService(s.start, s.running, nil).WithName(modules.StorageServer)
+
+	return s, nil
+}
+
+func (s *service) IsDisabled() bool {
+	return !s.config.enabled
+}
+
+// Run is an adapter for the BackgroundService interface.
+func (s *service) Run(ctx context.Context) error {
+	if err := s.start(ctx); err != nil {
+		return err
+	}
+	return s.running(ctx)
+}
+
+func (s *service) start(ctx context.Context) error {
+	// TODO: use wire
+
+	// TODO: support using grafana db connection?
+	eDB, err := dbimpl.ProvideEntityDB(nil, s.cfg, s.features)
+	if err != nil {
+		return err
+	}
+
+	err = eDB.Init()
+	if err != nil {
+		return err
+	}
+
+	store, err := sqlstash.ProvideSQLEntityServer(eDB)
+	if err != nil {
+		return err
+	}
+
+	s.handler, err = grpcserver.ProvideService(s.cfg, s.features, s.authenticator, s.tracing, prometheus.DefaultRegisterer)
+	if err != nil {
+		return err
+	}
+
+	entity.RegisterEntityStoreServer(s.handler.GetServer(), store)
+
+	err = s.handler.Run(ctx)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (s *service) running(ctx context.Context) error {
+	// skip waiting for the server in prod mode
+	if !s.config.devMode {
+		<-ctx.Done()
+		return nil
+	}
+
+	select {
+	case err := <-s.stoppedCh:
+		if err != nil {
+			return err
+		}
+	case <-ctx.Done():
+		close(s.stopCh)
+	}
+	return nil
+}
diff --git a/pkg/services/store/entity/sqlstash/broadcaster.go b/pkg/services/store/entity/sqlstash/broadcaster.go
new file mode 100644
index 0000000000000..eb5ea6f2b4a3f
--- /dev/null
+++ b/pkg/services/store/entity/sqlstash/broadcaster.go
@@ -0,0 +1,254 @@
+package sqlstash
+
+import (
+	"context"
+	"fmt"
+)
+
+type ConnectFunc[T any] func(chan T) error
+
+type Broadcaster[T any] interface {
+	Subscribe(context.Context) (<-chan T, error)
+	Unsubscribe(chan T)
+}
+
+func NewBroadcaster[T any](ctx context.Context, connect ConnectFunc[T]) (Broadcaster[T], error) {
+	b := &broadcaster[T]{}
+	err := b.start(ctx, connect)
+	if err != nil {
+		return nil, err
+	}
+
+	return b, nil
+}
+
+type broadcaster[T any] struct {
+	running     bool
+	ctx         context.Context
+	subs        map[chan T]struct{}
+	cache       Cache[T]
+	subscribe   chan chan T
+	unsubscribe chan chan T
+}
+
+func (b *broadcaster[T]) Subscribe(ctx context.Context) (<-chan T, error) {
+	if !b.running {
+		return nil, fmt.Errorf("broadcaster not running")
+	}
+
+	sub := make(chan T, 100)
+	b.subscribe <- sub
+	go func() {
+		<-ctx.Done()
+		b.unsubscribe <- sub
+	}()
+
+	return sub, nil
+}
+
+func (b *broadcaster[T]) Unsubscribe(sub chan T) {
+	b.unsubscribe <- sub
+}
+
+func (b *broadcaster[T]) start(ctx context.Context, connect ConnectFunc[T]) error {
+	if b.running {
+		return fmt.Errorf("broadcaster already running")
+	}
+
+	stream := make(chan T, 100)
+
+	err := connect(stream)
+	if err != nil {
+		return err
+	}
+
+	b.ctx = ctx
+
+	b.cache = NewCache[T](ctx, 100)
+	b.subscribe = make(chan chan T, 100)
+	b.unsubscribe = make(chan chan T, 100)
+	b.subs = make(map[chan T]struct{})
+
+	go b.stream(stream)
+
+	b.running = true
+	return nil
+}
+
+func (b *broadcaster[T]) stream(input chan T) {
+	for {
+		select {
+		// context cancelled
+		case <-b.ctx.Done():
+			close(input)
+			for sub := range b.subs {
+				close(sub)
+				delete(b.subs, sub)
+			}
+			b.running = false
+			return
+		// new subscriber
+		case sub := <-b.subscribe:
+			// send initial batch of cached items
+			err := b.cache.ReadInto(sub)
+			if err != nil {
+				close(sub)
+				continue
+			}
+
+			b.subs[sub] = struct{}{}
+		// unsubscribe
+		case sub := <-b.unsubscribe:
+			if _, ok := b.subs[sub]; ok {
+				close(sub)
+				delete(b.subs, sub)
+			}
+		// read item from input
+		case item, ok := <-input:
+			// input closed, drain subscribers and exit
+			if !ok {
+				for sub := range b.subs {
+					close(sub)
+					delete(b.subs, sub)
+				}
+				b.running = false
+				return
+			}
+
+			b.cache.Add(item)
+
+			for sub := range b.subs {
+				select {
+				case sub <- item:
+				default:
+					// Slow consumer, drop
+					b.unsubscribe <- sub
+				}
+			}
+		}
+	}
+}
+
+const DefaultCacheSize = 100
+
+type Cache[T any] interface {
+	Len() int
+	Add(item T)
+	Get(i int) T
+	Range(f func(T) error) error
+	Slice() []T
+	ReadInto(dst chan T) error
+}
+
+type cache[T any] struct {
+	cache     []T
+	size      int
+	cacheZero int
+	cacheLen  int
+	add       chan T
+	read      chan chan T
+	ctx       context.Context
+}
+
+func NewCache[T any](ctx context.Context, size int) Cache[T] {
+	c := &cache[T]{}
+
+	c.ctx = ctx
+	if size <= 0 {
+		size = DefaultCacheSize
+	}
+	c.size = size
+	c.cache = make([]T, c.size)
+
+	c.add = make(chan T)
+	c.read = make(chan chan T)
+
+	go c.run()
+
+	return c
+}
+
+func (c *cache[T]) Len() int {
+	return c.cacheLen
+}
+
+func (c *cache[T]) Add(item T) {
+	c.add <- item
+}
+
+func (c *cache[T]) run() {
+	for {
+		select {
+		case <-c.ctx.Done():
+			return
+		case item := <-c.add:
+			i := (c.cacheZero + c.cacheLen) % len(c.cache)
+			c.cache[i] = item
+			if c.cacheLen < len(c.cache) {
+				c.cacheLen++
+			} else {
+				c.cacheZero = (c.cacheZero + 1) % len(c.cache)
+			}
+		case r := <-c.read:
+		read:
+			for i := 0; i < c.cacheLen; i++ {
+				select {
+				case r <- c.cache[(c.cacheZero+i)%len(c.cache)]:
+				// don't wait for slow consumers
+				default:
+					break read
+				}
+			}
+			close(r)
+		}
+	}
+}
+
+func (c *cache[T]) Get(i int) T {
+	r := make(chan T, c.size)
+	c.read <- r
+	idx := 0
+	for item := range r {
+		if idx == i {
+			return item
+		}
+		idx++
+	}
+	var zero T
+	return zero
+}
+
+func (c *cache[T]) Range(f func(T) error) error {
+	r := make(chan T, c.size)
+	c.read <- r
+	for item := range r {
+		err := f(item)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (c *cache[T]) Slice() []T {
+	s := make([]T, 0, c.size)
+	r := make(chan T, c.size)
+	c.read <- r
+	for item := range r {
+		s = append(s, item)
+	}
+	return s
+}
+
+func (c *cache[T]) ReadInto(dst chan T) error {
+	r := make(chan T, c.size)
+	c.read <- r
+	for item := range r {
+		select {
+		case dst <- item:
+		default:
+			return fmt.Errorf("slow consumer")
+		}
+	}
+	return nil
+}
diff --git a/pkg/services/store/entity/sqlstash/broadcaster_test.go b/pkg/services/store/entity/sqlstash/broadcaster_test.go
new file mode 100644
index 0000000000000..fc6a6369a2da8
--- /dev/null
+++ b/pkg/services/store/entity/sqlstash/broadcaster_test.go
@@ -0,0 +1,106 @@
+package sqlstash
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestCache(t *testing.T) {
+	c := NewCache[int](context.Background(), 10)
+
+	e := []int{}
+	err := c.Range(func(i int) error {
+		e = append(e, i)
+		return nil
+	})
+	require.Nil(t, err)
+	require.Equal(t, 0, len(e))
+
+	c.Add(1)
+
+	e = []int{}
+	err = c.Range(func(i int) error {
+		e = append(e, i)
+		return nil
+	})
+	require.Nil(t, err)
+	require.Equal(t, 1, len(e))
+	require.Equal(t, []int{1}, e)
+	require.Equal(t, 1, c.Get(0))
+
+	c.Add(2)
+	c.Add(3)
+	c.Add(4)
+	c.Add(5)
+	c.Add(6)
+
+	// should be able to range over values
+	e = []int{}
+	err = c.Range(func(i int) error {
+		e = append(e, i)
+		return nil
+	})
+	require.Nil(t, err)
+	require.Equal(t, 6, len(e))
+	require.Equal(t, []int{1, 2, 3, 4, 5, 6}, e)
+
+	// should be able to get length
+	require.Equal(t, 6, c.Len())
+
+	// should be able to get values
+	require.Equal(t, 1, c.Get(0))
+	require.Equal(t, 6, c.Get(5))
+	// zero value beyond cache size
+	require.Equal(t, 0, c.Get(6))
+	require.Equal(t, 0, c.Get(20))
+	require.Equal(t, 0, c.Get(-10))
+
+	// slice should return all values
+	require.Equal(t, []int{1, 2, 3, 4, 5, 6}, c.Slice())
+
+	c.Add(7)
+	c.Add(8)
+	c.Add(9)
+	c.Add(10)
+	c.Add(11)
+
+	// should be able to range over values
+	e = []int{}
+	err = c.Range(func(i int) error {
+		e = append(e, i)
+		return nil
+	})
+	require.Nil(t, err)
+	require.Equal(t, 10, len(e))
+	require.Equal(t, []int{2, 3, 4, 5, 6, 7, 8, 9, 10, 11}, e)
+
+	// should be able to get length
+	require.Equal(t, 10, c.Len())
+
+	// should be able to get values
+	require.Equal(t, 2, c.Get(0))
+	require.Equal(t, 3, c.Get(1))
+
+	// slice should return all values
+	require.Equal(t, []int{2, 3, 4, 5, 6, 7, 8, 9, 10, 11}, c.Slice())
+
+	c.Add(12)
+	c.Add(13)
+
+	// should be able to range over values
+	e = []int{}
+	err = c.Range(func(i int) error {
+		e = append(e, i)
+		return nil
+	})
+	require.Nil(t, err)
+	require.Equal(t, 10, len(e))
+	require.Equal(t, []int{4, 5, 6, 7, 8, 9, 10, 11, 12, 13}, e)
+	require.Equal(t, 4, c.Get(0))
+	require.Equal(t, 5, c.Get(1))
+
+	// slice should return all values
+	require.Equal(t, []int{4, 5, 6, 7, 8, 9, 10, 11, 12, 13}, c.Slice())
+}
diff --git a/pkg/services/store/entity/sqlstash/folder_support.go b/pkg/services/store/entity/sqlstash/folder_support.go
index 2d642422b586b..d56894bba9376 100644
--- a/pkg/services/store/entity/sqlstash/folder_support.go
+++ b/pkg/services/store/entity/sqlstash/folder_support.go
@@ -4,18 +4,19 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/grafana/grafana/pkg/infra/grn"
+	folder "github.com/grafana/grafana/pkg/apis/folder/v0alpha1"
 	"github.com/grafana/grafana/pkg/services/sqlstore/session"
-	"github.com/grafana/grafana/pkg/services/store/entity"
 )
 
 type folderInfo struct {
-	UID  string `json:"uid"`
-	Name string `json:"name"` // original display name
-	Slug string `json:"slug"` // full slug
+	Guid string `json:"guid"`
+
+	UID      string `json:"uid"`
+	Name     string `json:"name"` // original display name
+	SlugPath string `json:"slug"` // full slug path
 
 	// original slug
-	originalSlug string
+	Slug string `json:"-"`
 
 	depth int32
 	left  int32
@@ -33,51 +34,48 @@ type folderInfo struct {
 // This will replace all entries in `entity_folder`
 // This is pretty heavy weight, but it does give us a sorted folder list
 // NOTE: this could be done async with a mutex/lock?  reconciler pattern
-func updateFolderTree(ctx context.Context, tx *session.SessionTx, tenant int64) error {
-	_, err := tx.Exec(ctx, "DELETE FROM entity_folder WHERE tenant_id=?", tenant)
+func (s *sqlEntityServer) updateFolderTree(ctx context.Context, tx *session.SessionTx, namespace string) error {
+	_, err := tx.Exec(ctx, "DELETE FROM entity_folder WHERE namespace=?", namespace)
 	if err != nil {
 		return err
 	}
 
+	query := "SELECT guid,name,folder,name,slug" +
+		" FROM entity" +
+		" WHERE " + s.dialect.Quote("group") + "=? AND resource=? AND namespace=?" +
+		" ORDER BY slug asc"
+	args := []interface{}{folder.GROUP, folder.RESOURCE, namespace}
+
 	all := []*folderInfo{}
-	rows, err := tx.Query(ctx, "SELECT uid,folder,name,slug FROM entity WHERE kind=? AND tenant_id=? ORDER BY slug asc;",
-		entity.StandardKindFolder, tenant)
+	rows, err := tx.Query(ctx, query, args...)
 	if err != nil {
 		return err
 	}
+	defer func() { _ = rows.Close() }()
+
 	for rows.Next() {
 		folder := folderInfo{
 			children: []*folderInfo{},
 		}
-		err = rows.Scan(&folder.UID, &folder.parentUID, &folder.Name, &folder.originalSlug)
+		err = rows.Scan(&folder.Guid, &folder.UID, &folder.parentUID, &folder.Name, &folder.Slug)
 		if err != nil {
-			break
+			return err
 		}
 		all = append(all, &folder)
 	}
-	errClose := rows.Close()
-	// TODO: Use some kind of multi-error.
-	// Until then, we want to prioritize errors coming from the .Scan
-	// over those coming from .Close.
-	if err != nil {
-		return err
-	}
-	if errClose != nil {
-		return errClose
-	}
 
 	root, lost, err := buildFolderTree(all)
 	if err != nil {
 		return err
 	}
 
-	err = insertFolderInfo(ctx, tx, tenant, root, false)
+	err = insertFolderInfo(ctx, tx, namespace, root, false)
 	if err != nil {
 		return err
 	}
 
 	for _, folder := range lost {
-		err = insertFolderInfo(ctx, tx, tenant, folder, true)
+		err = insertFolderInfo(ctx, tx, namespace, folder, true)
 		if err != nil {
 			return err
 		}
@@ -123,9 +121,9 @@ func setMPTTOrder(folder *folderInfo, stack []*folderInfo, idx int32) (int32, er
 	folder.stack = stack
 
 	if folder.depth > 0 {
-		folder.Slug = "/"
+		folder.SlugPath = "/"
 		for _, f := range stack {
-			folder.Slug += f.originalSlug + "/"
+			folder.SlugPath += f.Slug + "/"
 		}
 	}
 
@@ -139,17 +137,16 @@ func setMPTTOrder(folder *folderInfo, stack []*folderInfo, idx int32) (int32, er
 	return folder.right, nil
 }
 
-func insertFolderInfo(ctx context.Context, tx *session.SessionTx, tenant int64, folder *folderInfo, isDetached bool) error {
+func insertFolderInfo(ctx context.Context, tx *session.SessionTx, namespace string, folder *folderInfo, isDetached bool) error {
 	js, _ := json.Marshal(folder.stack)
-	grn2 := grn.GRN{TenantID: tenant, ResourceKind: entity.StandardKindFolder, ResourceIdentifier: folder.UID}
 	_, err := tx.Exec(ctx,
 		`INSERT INTO entity_folder `+
-			"(grn, tenant_id, uid, slug_path, tree, depth, left, right, detached) "+
+			"(guid, namespace, name, slug_path, tree, depth, lft, rgt, detached) "+
 			`VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
-		grn2.ToGRNString(),
-		tenant,
+		folder.Guid,
+		namespace,
 		folder.UID,
-		folder.Slug,
+		folder.SlugPath,
 		string(js),
 		folder.depth,
 		folder.left,
@@ -161,7 +158,7 @@ func insertFolderInfo(ctx context.Context, tx *session.SessionTx, tenant int64,
 	}
 
 	for _, sub := range folder.children {
-		err := insertFolderInfo(ctx, tx, tenant, sub, isDetached)
+		err := insertFolderInfo(ctx, tx, namespace, sub, isDetached)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/services/store/entity/sqlstash/folder_support_test.go b/pkg/services/store/entity/sqlstash/folder_support_test.go
index a85ceaf814dd1..9799ffe192483 100644
--- a/pkg/services/store/entity/sqlstash/folder_support_test.go
+++ b/pkg/services/store/entity/sqlstash/folder_support_test.go
@@ -12,9 +12,9 @@ import (
 
 func TestFolderSupport(t *testing.T) {
 	root, lost, err := buildFolderTree([]*folderInfo{
-		{UID: "A", parentUID: "", Name: "A", originalSlug: "a"},
-		{UID: "AA", parentUID: "A", Name: "AA", originalSlug: "aa"},
-		{UID: "B", parentUID: "", Name: "B", originalSlug: "b"},
+		{Guid: "GA", UID: "A", parentUID: "", Name: "A", Slug: "a"},
+		{Guid: "GAA", UID: "AA", parentUID: "A", Name: "AA", Slug: "aa"},
+		{Guid: "GB", UID: "B", parentUID: "", Name: "B", Slug: "b"},
 	})
 	require.NoError(t, err)
 	require.NotNil(t, root)
@@ -51,7 +51,7 @@ func appendFolder(folder *folderInfo, frame *data.Frame) {
 	frame.AppendRow(
 		folder.UID,
 		folder.Name,
-		folder.Slug,
+		folder.SlugPath,
 		folder.depth,
 		folder.left,
 		folder.right,
diff --git a/pkg/services/store/entity/sqlstash/querybuilder.go b/pkg/services/store/entity/sqlstash/querybuilder.go
index 23b1bb2bef70b..a5da12f6476cc 100644
--- a/pkg/services/store/entity/sqlstash/querybuilder.go
+++ b/pkg/services/store/entity/sqlstash/querybuilder.go
@@ -1,32 +1,62 @@
 package sqlstash
 
-import "strings"
+import (
+	"encoding/json"
+	"strings"
+
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+)
+
+type Direction int
+
+const (
+	Ascending Direction = iota
+	Descending
+)
+
+func (d Direction) String() string {
+	if d == Descending {
+		return "DESC"
+	}
+	return "ASC"
+}
 
 type selectQuery struct {
+	dialect  migrator.Dialect
 	fields   []string // SELECT xyz
 	from     string   // FROM object
+	offset   int64
 	limit    int64
 	oneExtra bool
 
 	where []string
 	args  []any
+
+	orderBy   []string
+	direction []Direction
 }
 
-func (q *selectQuery) addWhere(f string, val any) {
-	q.args = append(q.args, val)
-	q.where = append(q.where, f+"=?")
+func (q *selectQuery) addWhere(f string, val ...any) {
+	q.args = append(q.args, val...)
+	// if the field contains a question mark, we assume it's a raw where clause
+	if strings.Contains(f, "?") {
+		q.where = append(q.where, f)
+		// otherwise we assume it's a field name
+	} else {
+		q.where = append(q.where, q.dialect.Quote(f)+"=?")
+	}
 }
 
 func (q *selectQuery) addWhereInSubquery(f string, subquery string, subqueryArgs []any) {
 	q.args = append(q.args, subqueryArgs...)
-	q.where = append(q.where, f+" IN ("+subquery+")")
+	q.where = append(q.where, q.dialect.Quote(f)+" IN ("+subquery+")")
 }
 
 func (q *selectQuery) addWhereIn(f string, vals []string) {
 	count := len(vals)
 	if count > 1 {
 		sb := strings.Builder{}
-		sb.WriteString(f)
+		sb.WriteString(q.dialect.Quote(f))
 		sb.WriteString(" IN (")
 		for i := 0; i < count; i++ {
 			if i > 0 {
@@ -42,11 +72,40 @@ func (q *selectQuery) addWhereIn(f string, vals []string) {
 	}
 }
 
+const sqlLikeEscape = "#"
+
+var sqlLikeEscapeReplacer = strings.NewReplacer(
+	sqlLikeEscape, sqlLikeEscape+sqlLikeEscape,
+	"%", sqlLikeEscape+"%",
+	"_", sqlLikeEscape+"_",
+)
+
+func escapeJSONStringSQLLike(s string) string {
+	b, _ := json.Marshal(s)
+	return sqlLikeEscapeReplacer.Replace(string(b))
+}
+
+func (q *selectQuery) addWhereJsonContainsKV(field string, key string, value string) {
+	escapedKey := escapeJSONStringSQLLike(key)
+	escapedValue := escapeJSONStringSQLLike(value)
+	q.where = append(q.where, q.dialect.Quote(field)+" LIKE ? ESCAPE ?")
+	q.args = append(q.args, "{%"+escapedKey+":"+escapedValue+"%}", sqlLikeEscape)
+}
+
+func (q *selectQuery) addOrderBy(field string, direction Direction) {
+	q.orderBy = append(q.orderBy, field)
+	q.direction = append(q.direction, direction)
+}
+
 func (q *selectQuery) toQuery() (string, []any) {
 	args := q.args
 	sb := strings.Builder{}
 	sb.WriteString("SELECT ")
-	sb.WriteString(strings.Join(q.fields, ","))
+	quotedFields := make([]string, len(q.fields))
+	for i, f := range q.fields {
+		quotedFields[i] = q.dialect.Quote(f)
+	}
+	sb.WriteString(strings.Join(quotedFields, ","))
 	sb.WriteString(" FROM ")
 	sb.WriteString(q.from)
 
@@ -62,17 +121,27 @@ func (q *selectQuery) toQuery() (string, []any) {
 		}
 	}
 
-	if q.limit > 0 || q.oneExtra {
-		limit := q.limit
-		if limit < 1 {
-			limit = 20
-			q.limit = limit
-		}
-		if q.oneExtra {
-			limit = limit + 1
+	if len(q.orderBy) > 0 && len(q.direction) == len(q.orderBy) {
+		sb.WriteString(" ORDER BY ")
+		for i, f := range q.orderBy {
+			if i > 0 {
+				sb.WriteString(",")
+			}
+			sb.WriteString(q.dialect.Quote(f))
+			sb.WriteString(" ")
+			sb.WriteString(q.direction[i].String())
 		}
-		sb.WriteString(" LIMIT ?")
-		args = append(args, limit)
 	}
+
+	limit := q.limit
+	if limit < 1 {
+		limit = 20
+		q.limit = limit
+	}
+	if q.oneExtra {
+		limit = limit + 1
+	}
+	sb.WriteString(q.dialect.LimitOffset(limit, q.offset))
+
 	return sb.String(), args
 }
diff --git a/pkg/services/store/entity/sqlstash/sql_storage_server.go b/pkg/services/store/entity/sqlstash/sql_storage_server.go
index 343a444b9374a..7e2d87294dc83 100644
--- a/pkg/services/store/entity/sqlstash/sql_storage_server.go
+++ b/pkg/services/store/entity/sqlstash/sql_storage_server.go
@@ -3,84 +3,169 @@ package sqlstash
 import (
 	"context"
 	"database/sql"
+	"encoding/base64"
 	"encoding/json"
+	"errors"
 	"fmt"
-	"strconv"
+	"math/rand"
+	"slices"
 	"strings"
 	"time"
 
+	"github.com/bwmarrin/snowflake"
+	"github.com/google/uuid"
+
+	folder "github.com/grafana/grafana/pkg/apis/folder/v0alpha1"
 	"github.com/grafana/grafana/pkg/infra/appcontext"
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/infra/grn"
 	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/infra/slugify"
-	"github.com/grafana/grafana/pkg/services/grpcserver"
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 	"github.com/grafana/grafana/pkg/services/sqlstore/session"
 	"github.com/grafana/grafana/pkg/services/store"
 	"github.com/grafana/grafana/pkg/services/store/entity"
-	"github.com/grafana/grafana/pkg/services/store/kind"
-	"github.com/grafana/grafana/pkg/services/store/resolver"
-	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/services/store/entity/db"
 )
 
 // Make sure we implement both store + admin
 var _ entity.EntityStoreServer = &sqlEntityServer{}
-var _ entity.EntityStoreAdminServer = &sqlEntityServer{}
 
-func ProvideSQLEntityServer(db db.DB, cfg *setting.Cfg, grpcServerProvider grpcserver.Provider, kinds kind.KindRegistry, resolver resolver.EntityReferenceResolver) entity.EntityStoreServer {
+func ProvideSQLEntityServer(db db.EntityDBInterface /*, cfg *setting.Cfg */) (entity.EntityStoreServer, error) {
 	entityServer := &sqlEntityServer{
-		sess:     db.GetSqlxSession(),
-		log:      log.New("sql-entity-server"),
-		kinds:    kinds,
-		resolver: resolver,
+		db:  db,
+		log: log.New("sql-entity-server"),
+		ctx: context.Background(),
 	}
-	entity.RegisterEntityStoreServer(grpcServerProvider.GetServer(), entityServer)
-	return entityServer
+
+	return entityServer, nil
 }
 
 type sqlEntityServer struct {
-	log      log.Logger
-	sess     *session.SessionDB
-	kinds    kind.KindRegistry
-	resolver resolver.EntityReferenceResolver
+	log         log.Logger
+	db          db.EntityDBInterface // needed to keep xorm engine in scope
+	sess        *session.SessionDB
+	dialect     migrator.Dialect
+	snowflake   *snowflake.Node
+	broadcaster Broadcaster[*entity.Entity]
+	ctx         context.Context
+}
+
+func (s *sqlEntityServer) Init() error {
+	if s.sess != nil {
+		return nil
+	}
+
+	if s.db == nil {
+		return errors.New("missing db")
+	}
+
+	err := s.db.Init()
+	if err != nil {
+		return err
+	}
+
+	sess, err := s.db.GetSession()
+	if err != nil {
+		return err
+	}
+
+	engine, err := s.db.GetEngine()
+	if err != nil {
+		return err
+	}
+
+	s.sess = sess
+	s.dialect = migrator.NewDialect(engine.DriverName())
+
+	// initialize snowflake generator
+	s.snowflake, err = snowflake.NewNode(rand.Int63n(1024))
+	if err != nil {
+		return err
+	}
+
+	// set up the broadcaster
+	s.broadcaster, err = NewBroadcaster(s.ctx, func(stream chan *entity.Entity) error {
+		// start the poller
+		go s.poller(stream)
+
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	return nil
 }
 
-func getReadSelect(r *entity.ReadEntityRequest) string {
+type FieldSelectRequest interface {
+	GetWithBody() bool
+	GetWithStatus() bool
+}
+
+func (s *sqlEntityServer) getReadFields(r FieldSelectRequest) []string {
 	fields := []string{
-		"tenant_id", "kind", "uid", "folder", // GRN + folder
-		"version", "size", "etag", "errors", // errors are always returned
+		"guid",
+		"key",
+		"namespace", "group", "group_version", "resource", "name", "folder",
+		"resource_version", "size", "etag", "errors", // errors are always returned
 		"created_at", "created_by",
 		"updated_at", "updated_by",
-		"origin", "origin_key", "origin_ts"}
+		"origin", "origin_key", "origin_ts",
+		"meta",
+		"title", "slug", "description", "labels", "fields",
+		"message",
+		"action",
+	}
 
-	if r.WithBody {
+	if r.GetWithBody() {
 		fields = append(fields, `body`)
 	}
-	if r.WithSummary {
-		fields = append(fields, "name", "slug", "description", "labels", "fields")
+	if r.GetWithStatus() {
+		fields = append(fields, "status")
+	}
+
+	return fields
+}
+
+func (s *sqlEntityServer) getReadSelect(r FieldSelectRequest) (string, error) {
+	if err := s.Init(); err != nil {
+		return "", err
+	}
+
+	fields := s.getReadFields(r)
+
+	quotedFields := make([]string, len(fields))
+	for i, f := range fields {
+		quotedFields[i] = s.dialect.Quote(f)
 	}
-	return "SELECT " + strings.Join(fields, ",") + " FROM entity WHERE "
+	return "SELECT " + strings.Join(quotedFields, ","), nil
 }
 
-func (s *sqlEntityServer) rowToReadEntityResponse(ctx context.Context, rows *sql.Rows, r *entity.ReadEntityRequest) (*entity.Entity, error) {
+func rowToEntity(rows *sql.Rows, r FieldSelectRequest) (*entity.Entity, error) {
 	raw := &entity.Entity{
-		GRN:    &grn.GRN{},
 		Origin: &entity.EntityOriginInfo{},
 	}
 
-	summaryjson := &summarySupport{}
+	errors := ""
+	labels := ""
+	fields := ""
+
 	args := []any{
-		&raw.GRN.TenantID, &raw.GRN.ResourceKind, &raw.GRN.ResourceIdentifier, &raw.Folder,
-		&raw.Version, &raw.Size, &raw.ETag, &summaryjson.errors,
+		&raw.Guid,
+		&raw.Key,
+		&raw.Namespace, &raw.Group, &raw.GroupVersion, &raw.Resource, &raw.Name, &raw.Folder,
+		&raw.ResourceVersion, &raw.Size, &raw.ETag, &errors,
 		&raw.CreatedAt, &raw.CreatedBy,
 		&raw.UpdatedAt, &raw.UpdatedBy,
 		&raw.Origin.Source, &raw.Origin.Key, &raw.Origin.Time,
+		&raw.Meta,
+		&raw.Title, &raw.Slug, &raw.Description, &labels, &fields,
+		&raw.Message,
+		&raw.Action,
 	}
-	if r.WithBody {
+	if r.GetWithBody() {
 		args = append(args, &raw.Body)
 	}
-	if r.WithSummary {
-		args = append(args, &summaryjson.name, &summaryjson.slug, &summaryjson.description, &summaryjson.labels, &summaryjson.fields)
+	if r.GetWithStatus() {
+		args = append(args, &raw.Status)
 	}
 
 	err := rows.Scan(args...)
@@ -88,137 +173,88 @@ func (s *sqlEntityServer) rowToReadEntityResponse(ctx context.Context, rows *sql
 		return nil, err
 	}
 
-	if raw.Origin.Source == "" {
-		raw.Origin = nil
-	}
-
-	if r.WithSummary || summaryjson.errors != nil {
-		summary, err := summaryjson.toEntitySummary()
-		if err != nil {
-			return nil, err
-		}
-
-		js, err := json.Marshal(summary)
-		if err != nil {
+	// unmarshal json labels
+	if labels != "" {
+		if err := json.Unmarshal([]byte(labels), &raw.Labels); err != nil {
 			return nil, err
 		}
-		raw.SummaryJson = js
 	}
-	return raw, nil
-}
 
-func (s *sqlEntityServer) validateGRN(ctx context.Context, grn *grn.GRN) (*grn.GRN, error) {
-	if grn == nil {
-		return nil, fmt.Errorf("missing GRN")
+	// set empty body, meta or status to nil
+	if raw.Body != nil && len(raw.Body) == 0 {
+		raw.Body = nil
 	}
-	user, err := appcontext.User(ctx)
-	if err != nil {
-		return nil, err
+	if raw.Meta != nil && len(raw.Meta) == 0 {
+		raw.Meta = nil
 	}
-	if grn.TenantID == 0 {
-		grn.TenantID = user.OrgID
-	} else if grn.TenantID != user.OrgID {
-		return nil, fmt.Errorf("tenant ID does not match userID")
+	if raw.Status != nil && len(raw.Status) == 0 {
+		raw.Status = nil
 	}
 
-	if grn.ResourceKind == "" {
-		return nil, fmt.Errorf("GRN missing ResourceKind")
-	}
-	if grn.ResourceIdentifier == "" {
-		return nil, fmt.Errorf("GRN missing ResourceIdentifier")
-	}
-	if len(grn.ResourceIdentifier) > 64 {
-		return nil, fmt.Errorf("GRN ResourceIdentifier is too long (>64)")
-	}
-	if strings.ContainsAny(grn.ResourceIdentifier, "/#$@?") {
-		return nil, fmt.Errorf("invalid character in GRN")
-	}
-	return grn, nil
+	return raw, nil
 }
 
 func (s *sqlEntityServer) Read(ctx context.Context, r *entity.ReadEntityRequest) (*entity.Entity, error) {
-	if r.Version != "" {
-		return s.readFromHistory(ctx, r)
-	}
-	grn, err := s.validateGRN(ctx, r.GRN)
-	if err != nil {
+	if err := s.Init(); err != nil {
 		return nil, err
 	}
 
-	args := []any{grn.ToGRNString()}
-	where := "grn=?"
+	return s.read(ctx, s.sess, r)
+}
 
-	rows, err := s.sess.Query(ctx, getReadSelect(r)+where, args...)
-	if err != nil {
-		return nil, err
-	}
-	defer func() { _ = rows.Close() }()
+func (s *sqlEntityServer) read(ctx context.Context, tx session.SessionQuerier, r *entity.ReadEntityRequest) (*entity.Entity, error) {
+	table := "entity"
+	where := []string{}
+	args := []any{}
 
-	if !rows.Next() {
-		return &entity.Entity{}, nil
+	if r.Key == "" {
+		return nil, fmt.Errorf("missing key")
 	}
 
-	return s.rowToReadEntityResponse(ctx, rows, r)
-}
-
-func (s *sqlEntityServer) readFromHistory(ctx context.Context, r *entity.ReadEntityRequest) (*entity.Entity, error) {
-	grn, err := s.validateGRN(ctx, r.GRN)
+	key, err := entity.ParseKey(r.Key)
 	if err != nil {
 		return nil, err
 	}
-	oid := grn.ToGRNString()
 
-	fields := []string{
-		"body", "size", "etag",
-		"updated_at", "updated_by",
+	where = append(where, s.dialect.Quote("namespace")+"=?", s.dialect.Quote("group")+"=?", s.dialect.Quote("resource")+"=?", s.dialect.Quote("name")+"=?")
+	args = append(args, key.Namespace, key.Group, key.Resource, key.Name)
+
+	if r.ResourceVersion != 0 {
+		table = "entity_history"
+		where = append(where, s.dialect.Quote("resource_version")+">=?")
+		args = append(args, r.ResourceVersion)
 	}
 
-	rows, err := s.sess.Query(ctx,
-		"SELECT "+strings.Join(fields, ",")+
-			" FROM entity_history WHERE grn=? AND version=?", oid, r.Version)
+	query, err := s.getReadSelect(r)
 	if err != nil {
 		return nil, err
 	}
-	defer func() { _ = rows.Close() }()
 
-	// Version or key not found
-	if !rows.Next() {
-		return &entity.Entity{}, nil
+	if false { // TODO, MYSQL/PosgreSQL can lock the row " FOR UPDATE"
+		query += " FOR UPDATE"
 	}
 
-	raw := &entity.Entity{
-		GRN: r.GRN,
+	query += " FROM " + table +
+		" WHERE " + strings.Join(where, " AND ")
+
+	if r.ResourceVersion != 0 {
+		query += " ORDER BY resource_version DESC"
 	}
-	err = rows.Scan(&raw.Body, &raw.Size, &raw.ETag, &raw.UpdatedAt, &raw.UpdatedBy)
+	query += " LIMIT 1"
+
+	s.log.Debug("read", "query", query, "args", args)
+
+	rows, err := tx.Query(ctx, query, args...)
 	if err != nil {
 		return nil, err
 	}
-	// For versioned files, the created+updated are the same
-	raw.CreatedAt = raw.UpdatedAt
-	raw.CreatedBy = raw.UpdatedBy
-	raw.Version = r.Version // from the query
-
-	// Dynamically create the summary
-	if r.WithSummary {
-		builder := s.kinds.GetSummaryBuilder(r.GRN.ResourceKind)
-		if builder != nil {
-			val, out, err := builder(ctx, r.GRN.ResourceIdentifier, raw.Body)
-			if err == nil {
-				raw.Body = out // cleaned up
-				raw.SummaryJson, err = json.Marshal(val)
-				if err != nil {
-					return nil, err
-				}
-			}
-		}
-	}
+	defer func() { _ = rows.Close() }()
 
-	// Clear the body if not requested
-	if !r.WithBody {
-		raw.Body = nil
+	if !rows.Next() {
+		return &entity.Entity{}, nil
 	}
 
-	return raw, err
+	return rowToEntity(rows, r)
 }
 
 func (s *sqlEntityServer) BatchRead(ctx context.Context, b *entity.BatchReadEntityRequest) (*entity.BatchReadEntityResponse, error) {
@@ -231,25 +267,30 @@ func (s *sqlEntityServer) BatchRead(ctx context.Context, b *entity.BatchReadEnti
 	constraints := []string{}
 
 	for _, r := range b.Batch {
-		if r.WithBody != first.WithBody || r.WithSummary != first.WithSummary {
+		if r.WithBody != first.WithBody || r.WithStatus != first.WithStatus {
 			return nil, fmt.Errorf("requests must want the same things")
 		}
 
-		grn, err := s.validateGRN(ctx, r.GRN)
-		if err != nil {
-			return nil, err
+		if r.Key == "" {
+			return nil, fmt.Errorf("missing key")
 		}
 
-		where := "grn=?"
-		args = append(args, grn.ToGRNString())
-		if r.Version != "" {
+		constraints = append(constraints, s.dialect.Quote("key")+"=?")
+		args = append(args, r.Key)
+
+		if r.ResourceVersion != 0 {
 			return nil, fmt.Errorf("version not supported for batch read (yet?)")
 		}
-		constraints = append(constraints, where)
 	}
 
 	req := b.Batch[0]
-	query := getReadSelect(req) + strings.Join(constraints, " OR ")
+	query, err := s.getReadSelect(req)
+	if err != nil {
+		return nil, err
+	}
+
+	query += " FROM entity" +
+		" WHERE (" + strings.Join(constraints, " OR ") + ")"
 	rows, err := s.sess.Query(ctx, query, args...)
 	if err != nil {
 		return nil, err
@@ -259,7 +300,7 @@ func (s *sqlEntityServer) BatchRead(ctx context.Context, b *entity.BatchReadEnti
 	// TODO? make sure the results are in order?
 	rsp := &entity.BatchReadEntityResponse{}
 	for rows.Next() {
-		r, err := s.rowToReadEntityResponse(ctx, rows, req)
+		r, err := rowToEntity(rows, req)
 		if err != nil {
 			return nil, err
 		}
@@ -268,24 +309,19 @@ func (s *sqlEntityServer) BatchRead(ctx context.Context, b *entity.BatchReadEnti
 	return rsp, nil
 }
 
-func (s *sqlEntityServer) Write(ctx context.Context, r *entity.WriteEntityRequest) (*entity.WriteEntityResponse, error) {
-	return s.AdminWrite(ctx, entity.ToAdminWriteEntityRequest(r))
-}
-
 //nolint:gocyclo
-func (s *sqlEntityServer) AdminWrite(ctx context.Context, r *entity.AdminWriteEntityRequest) (*entity.WriteEntityResponse, error) {
-	grn, err := s.validateGRN(ctx, r.GRN)
-	if err != nil {
+func (s *sqlEntityServer) Create(ctx context.Context, r *entity.CreateEntityRequest) (*entity.CreateEntityResponse, error) {
+	if err := s.Init(); err != nil {
 		return nil, err
 	}
-	oid := grn.ToGRNString()
 
-	timestamp := time.Now().UnixMilli()
-	createdAt := r.CreatedAt
-	createdBy := r.CreatedBy
-	updatedAt := r.UpdatedAt
-	updatedBy := r.UpdatedBy
-	if updatedBy == "" {
+	createdAt := r.Entity.CreatedAt
+	if createdAt < 1000 {
+		createdAt = time.Now().UnixMilli()
+	}
+
+	createdBy := r.Entity.CreatedBy
+	if createdBy == "" {
 		modifier, err := appcontext.User(ctx)
 		if err != nil {
 			return nil, err
@@ -293,559 +329,1350 @@ func (s *sqlEntityServer) AdminWrite(ctx context.Context, r *entity.AdminWriteEn
 		if modifier == nil {
 			return nil, fmt.Errorf("can not find user in context")
 		}
-		updatedBy = store.GetUserIDString(modifier)
-	}
-	if updatedAt < 1000 {
-		updatedAt = timestamp
+		createdBy = store.GetUserIDString(modifier)
 	}
 
-	summary, body, err := s.prepare(ctx, r)
-	if err != nil {
-		return nil, err
-	}
+	updatedAt := r.Entity.UpdatedAt
+	updatedBy := r.Entity.UpdatedBy
 
-	etag := createContentsHash(body)
-	rsp := &entity.WriteEntityResponse{
-		GRN:    grn,
-		Status: entity.WriteEntityResponse_CREATED, // Will be changed if not true
+	rsp := &entity.CreateEntityResponse{
+		Entity: &entity.Entity{},
+		Status: entity.CreateEntityResponse_CREATED, // Will be changed if not true
 	}
-	origin := r.Origin
-	if origin == nil {
-		origin = &entity.EntityOriginInfo{}
-	}
-
-	err = s.sess.WithTransaction(ctx, func(tx *session.SessionTx) error {
-		var versionInfo *entity.EntityVersionInfo
-		isUpdate := false
-		if r.ClearHistory {
-			// Optionally keep the original creation time information
-			if createdAt < 1000 || createdBy == "" {
-				err = s.fillCreationInfo(ctx, tx, oid, &createdAt, &createdBy)
-				if err != nil {
-					return err
-				}
-			}
-			_, err = doDelete(ctx, tx, grn)
-			if err != nil {
-				return err
-			}
-			versionInfo = &entity.EntityVersionInfo{}
-		} else {
-			versionInfo, err = s.selectForUpdate(ctx, tx, oid)
-			if err != nil {
-				return err
-			}
-		}
 
-		// Same entity
-		if versionInfo.ETag == etag {
-			rsp.Entity = versionInfo
-			rsp.Status = entity.WriteEntityResponse_UNCHANGED
-			return nil
+	err := s.sess.WithTransaction(ctx, func(tx *session.SessionTx) error {
+		current, err := s.read(ctx, tx, &entity.ReadEntityRequest{
+			Key:        r.Entity.Key,
+			WithBody:   true,
+			WithStatus: true,
+		})
+		if err != nil {
+			return err
 		}
 
-		// Optimistic locking
-		if r.PreviousVersion != "" {
-			if r.PreviousVersion != versionInfo.Version {
-				return fmt.Errorf("optimistic lock failed")
-			}
+		// if we found an existing entity
+		if current.Guid != "" {
+			return fmt.Errorf("entity already exists")
 		}
 
-		// Set the comment on this write
-		versionInfo.Comment = r.Comment
-		if r.Version == "" {
-			if versionInfo.Version == "" {
-				versionInfo.Version = "1"
-			} else {
-				// Increment the version
-				i, _ := strconv.ParseInt(versionInfo.Version, 0, 64)
-				if i < 1 {
-					i = timestamp
-				}
-				versionInfo.Version = fmt.Sprintf("%d", i+1)
-				isUpdate = true
-			}
-		} else {
-			versionInfo.Version = r.Version
-		}
+		// generate guid for new entity
+		current.Guid = uuid.New().String()
 
-		if isUpdate {
-			// Clear the labels+refs
-			if _, err := tx.Exec(ctx, "DELETE FROM entity_labels WHERE grn=? OR parent_grn=?", oid, oid); err != nil {
-				return err
-			}
-			if _, err := tx.Exec(ctx, "DELETE FROM entity_ref WHERE grn=? OR parent_grn=?", oid, oid); err != nil {
-				return err
-			}
-			if _, err := tx.Exec(ctx, "DELETE FROM entity_nested WHERE parent_grn=?", oid); err != nil {
-				return err
-			}
-		}
+		// set created at/by
+		current.CreatedAt = createdAt
+		current.CreatedBy = createdBy
 
-		// 1. Add the `entity_history` values
-		versionInfo.Size = int64(len(body))
-		versionInfo.ETag = etag
-		versionInfo.UpdatedAt = updatedAt
-		versionInfo.UpdatedBy = updatedBy
-		_, err = tx.Exec(ctx, `INSERT INTO entity_history (`+
-			"grn, version, message, "+
-			"size, body, etag, "+
-			"updated_at, updated_by) "+
-			"VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
-			oid, versionInfo.Version, versionInfo.Comment,
-			versionInfo.Size, body, versionInfo.ETag,
-			updatedAt, versionInfo.UpdatedBy,
-		)
+		// parse provided key
+		key, err := entity.ParseKey(r.Entity.Key)
 		if err != nil {
 			return err
 		}
 
-		// 5. Add/update the main `entity` table
-		rsp.Entity = versionInfo
-		if isUpdate {
-			rsp.Status = entity.WriteEntityResponse_UPDATED
-			_, err = tx.Exec(ctx, "UPDATE entity SET "+
-				"body=?, size=?, etag=?, version=?, "+
-				"updated_at=?, updated_by=?,"+
-				"name=?, description=?,"+
-				"labels=?, fields=?, errors=?, "+
-				"origin=?, origin_key=?, origin_ts=? "+
-				"WHERE grn=?",
-				body, versionInfo.Size, etag, versionInfo.Version,
-				updatedAt, versionInfo.UpdatedBy,
-				summary.model.Name, summary.model.Description,
-				summary.labels, summary.fields, summary.errors,
-				origin.Source, origin.Key, timestamp,
-				oid,
-			)
-		} else {
-			if createdAt < 1000 {
-				createdAt = updatedAt
-			}
-			if createdBy == "" {
-				createdBy = updatedBy
-			}
-
-			_, err = tx.Exec(ctx, "INSERT INTO entity ("+
-				"grn, tenant_id, kind, uid, folder, "+
-				"size, body, etag, version, "+
-				"updated_at, updated_by, created_at, created_by, "+
-				"name, description, slug, "+
-				"labels, fields, errors, "+
-				"origin, origin_key, origin_ts) "+
-				"VALUES (?, ?, ?, ?, ?, "+
-				" ?, ?, ?, ?, "+
-				" ?, ?, ?, ?, "+
-				" ?, ?, ?, "+
-				" ?, ?, ?, "+
-				" ?, ?, ?)",
-				oid, grn.TenantID, grn.ResourceKind, grn.ResourceIdentifier, r.Folder,
-				versionInfo.Size, body, etag, versionInfo.Version,
-				updatedAt, createdBy, createdAt, createdBy,
-				summary.model.Name, summary.model.Description, summary.model.Slug,
-				summary.labels, summary.fields, summary.errors,
-				origin.Source, origin.Key, origin.Time,
-			)
-		}
-		if err == nil && entity.StandardKindFolder == r.GRN.ResourceKind {
-			err = updateFolderTree(ctx, tx, grn.TenantID)
-		}
-		if err == nil {
-			summary.folder = r.Folder
-			summary.parent_grn = grn
-			return s.writeSearchInfo(ctx, tx, oid, summary)
-		}
-		return err
-	})
-	rsp.SummaryJson = summary.marshaled
-	if err != nil {
-		rsp.Status = entity.WriteEntityResponse_ERROR
-	}
-	return rsp, err
-}
+		current.Key = r.Entity.Key
+		current.Namespace = key.Namespace
+		current.Group = key.Group
+		current.GroupVersion = r.Entity.GroupVersion
+		current.Resource = key.Resource
+		current.Name = key.Name
 
-func (s *sqlEntityServer) fillCreationInfo(ctx context.Context, tx *session.SessionTx, grn string, createdAt *int64, createdBy *string) error {
-	if *createdAt > 1000 {
-		ignore := int64(0)
-		createdAt = &ignore
-	}
-	if *createdBy == "" {
-		ignore := ""
-		createdBy = &ignore
-	}
+		if r.Entity.Folder != "" {
+			current.Folder = r.Entity.Folder
+		}
+		if r.Entity.Slug != "" {
+			current.Slug = r.Entity.Slug
+		}
 
-	rows, err := tx.Query(ctx, "SELECT created_at,created_by FROM entity WHERE grn=?", grn)
-	if err != nil {
-		return err
-	}
+		if r.Entity.Body != nil {
+			current.Body = r.Entity.Body
+			current.Size = int64(len(current.Body))
+		}
 
-	if rows.Next() {
-		err = rows.Scan(&createdAt, &createdBy)
-	}
+		if r.Entity.Meta != nil {
+			current.Meta = r.Entity.Meta
+		}
 
-	errClose := rows.Close()
-	if err != nil {
-		return err
-	}
-	return errClose
-}
+		if r.Entity.Status != nil {
+			current.Status = r.Entity.Status
+		}
 
-func (s *sqlEntityServer) selectForUpdate(ctx context.Context, tx *session.SessionTx, grn string) (*entity.EntityVersionInfo, error) {
-	q := "SELECT etag,version,updated_at,size FROM entity WHERE grn=?"
-	if false { // TODO, MYSQL/PosgreSQL can lock the row " FOR UPDATE"
-		q += " FOR UPDATE"
-	}
-	rows, err := tx.Query(ctx, q, grn)
-	if err != nil {
-		return nil, err
-	}
-	current := &entity.EntityVersionInfo{}
-	if rows.Next() {
-		err = rows.Scan(&current.ETag, &current.Version, &current.UpdatedAt, &current.Size)
-	}
+		etag := createContentsHash(current.Body, current.Meta, current.Status)
+		current.ETag = etag
 
-	errClose := rows.Close()
-	if err != nil {
-		return nil, err
-	}
+		current.UpdatedAt = updatedAt
+		current.UpdatedBy = updatedBy
 
-	return current, errClose
-}
+		if r.Entity.Title != "" {
+			current.Title = r.Entity.Title
+		}
+		if r.Entity.Description != "" {
+			current.Description = r.Entity.Description
+		}
 
-func (s *sqlEntityServer) writeSearchInfo(
-	ctx context.Context,
-	tx *session.SessionTx,
-	grn2 string,
-	summary *summarySupport,
-) error {
-	parent_grn := summary.getParentGRN()
-
-	// Add the labels rows
-	for k, v := range summary.model.Labels {
-		_, err := tx.Exec(ctx,
-			`INSERT INTO entity_labels `+
-				"(grn, label, value, parent_grn) "+
-				`VALUES (?, ?, ?, ?)`,
-			grn2, k, v, parent_grn,
-		)
+		labels, err := json.Marshal(r.Entity.Labels)
 		if err != nil {
+			s.log.Error("error marshalling labels", "msg", err.Error())
 			return err
 		}
-	}
+		current.Labels = r.Entity.Labels
 
-	// Resolve references
-	for _, ref := range summary.model.References {
-		resolved, err := s.resolver.Resolve(ctx, ref)
+		fields, err := json.Marshal(r.Entity.Fields)
 		if err != nil {
+			s.log.Error("error marshalling fields", "msg", err.Error())
 			return err
 		}
-		_, err = tx.Exec(ctx, `INSERT INTO entity_ref (`+
-			"grn, parent_grn, family, type, id, "+
-			"resolved_ok, resolved_to, resolved_warning, resolved_time) "+
-			`VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
-			grn2, parent_grn, ref.Family, ref.Type, ref.Identifier,
-			resolved.OK, resolved.Key, resolved.Warning, resolved.Timestamp,
-		)
+		current.Fields = r.Entity.Fields
+
+		errors, err := json.Marshal(r.Entity.Errors)
 		if err != nil {
+			s.log.Error("error marshalling errors", "msg", err.Error())
 			return err
 		}
-	}
+		current.Errors = r.Entity.Errors
 
-	// Traverse entities and insert refs
-	if summary.model.Nested != nil {
-		for _, childModel := range summary.model.Nested {
-			grn2 = (&grn.GRN{
-				TenantID:           summary.parent_grn.TenantID,
-				ResourceKind:       childModel.Kind,
-				ResourceIdentifier: childModel.UID, // append???
-			}).ToGRNString()
+		if current.Origin == nil {
+			current.Origin = &entity.EntityOriginInfo{}
+		}
 
-			child, err := newSummarySupport(childModel)
-			if err != nil {
-				return err
+		if r.Entity.Origin != nil {
+			if r.Entity.Origin.Source != "" {
+				current.Origin.Source = r.Entity.Origin.Source
 			}
-			child.isNested = true
-			child.folder = summary.folder
-			child.parent_grn = summary.parent_grn
-			parent_grn := child.getParentGRN()
-
-			_, err = tx.Exec(ctx, "INSERT INTO entity_nested ("+
-				"parent_grn, grn, "+
-				"tenant_id, kind, uid, folder, "+
-				"name, description, "+
-				"labels, fields, errors) "+
-				"VALUES (?, ?,"+
-				" ?, ?, ?, ?,"+
-				" ?, ?,"+
-				" ?, ?, ?)",
-				*parent_grn, grn2,
-				summary.parent_grn.TenantID, childModel.Kind, childModel.UID, summary.folder,
-				child.name, child.description,
-				child.labels, child.fields, child.errors,
-			)
-			if err != nil {
-				return err
+			if r.Entity.Origin.Key != "" {
+				current.Origin.Key = r.Entity.Origin.Key
 			}
-
-			err = s.writeSearchInfo(ctx, tx, grn2, child)
-			if err != nil {
-				return err
+			if r.Entity.Origin.Time > 0 {
+				current.Origin.Time = r.Entity.Origin.Time
 			}
 		}
-	}
 
-	return nil
-}
+		// Set the comment on this write
+		if r.Entity.Message != "" {
+			current.Message = r.Entity.Message
+		}
 
-func (s *sqlEntityServer) prepare(ctx context.Context, r *entity.AdminWriteEntityRequest) (*summarySupport, []byte, error) {
-	builder := s.kinds.GetSummaryBuilder(r.GRN.ResourceKind)
-	if builder == nil {
-		return nil, nil, fmt.Errorf("unsupported kind")
-	}
+		// Update resource version
+		current.ResourceVersion = s.snowflake.Generate().Int64()
+
+		current.Action = entity.Entity_CREATED
+
+		values := map[string]any{
+			"guid":             current.Guid,
+			"key":              current.Key,
+			"namespace":        current.Namespace,
+			"group":            current.Group,
+			"resource":         current.Resource,
+			"name":             current.Name,
+			"created_at":       current.CreatedAt,
+			"created_by":       current.CreatedBy,
+			"group_version":    current.GroupVersion,
+			"folder":           current.Folder,
+			"slug":             current.Slug,
+			"updated_at":       current.UpdatedAt,
+			"updated_by":       current.UpdatedBy,
+			"body":             current.Body,
+			"meta":             current.Meta,
+			"status":           current.Status,
+			"size":             current.Size,
+			"etag":             current.ETag,
+			"resource_version": current.ResourceVersion,
+			"title":            current.Title,
+			"description":      current.Description,
+			"labels":           labels,
+			"fields":           fields,
+			"errors":           errors,
+			"origin":           current.Origin.Source,
+			"origin_key":       current.Origin.Key,
+			"origin_ts":        current.Origin.Time,
+			"message":          current.Message,
+			"action":           current.Action,
+		}
 
-	summary, body, err := builder(ctx, r.GRN.ResourceIdentifier, r.Body)
-	if err != nil {
-		return nil, nil, err
-	}
+		// 1. Add row to the `entity_history` values
+		if err := s.dialect.Insert(ctx, tx, "entity_history", values); err != nil {
+			s.log.Error("error inserting entity history", "msg", err.Error())
+			return err
+		}
 
-	// Update a summary based on the name (unless the root suggested one)
-	if summary.Slug == "" {
-		t := summary.Name
-		if t == "" {
-			t = r.GRN.ResourceIdentifier
+		// 2. Add row to the main `entity` table
+		if err := s.dialect.Insert(ctx, tx, "entity", values); err != nil {
+			s.log.Error("error inserting entity", "msg", err.Error())
+			return err
 		}
-		summary.Slug = slugify.Slugify(t)
-	}
 
-	summaryjson, err := newSummarySupport(summary)
-	if err != nil {
-		return nil, nil, err
-	}
+		switch current.Group {
+		case folder.GROUP:
+			switch current.Resource {
+			case folder.RESOURCE:
+				err = s.updateFolderTree(ctx, tx, current.Namespace)
+				if err != nil {
+					s.log.Error("error updating folder tree", "msg", err.Error())
+					return err
+				}
+			}
+		}
 
-	return summaryjson, body, nil
-}
+		rsp.Entity = current
 
-func (s *sqlEntityServer) Delete(ctx context.Context, r *entity.DeleteEntityRequest) (*entity.DeleteEntityResponse, error) {
-	grn2, err := s.validateGRN(ctx, r.GRN)
+		return s.setLabels(ctx, tx, current.Guid, current.Labels)
+	})
 	if err != nil {
-		return nil, err
+		s.log.Error("error creating entity", "msg", err.Error())
+		rsp.Status = entity.CreateEntityResponse_ERROR
 	}
 
-	rsp := &entity.DeleteEntityResponse{}
-	err = s.sess.WithTransaction(ctx, func(tx *session.SessionTx) error {
-		rsp.OK, err = doDelete(ctx, tx, grn2)
-		return err
-	})
 	return rsp, err
 }
 
-func doDelete(ctx context.Context, tx *session.SessionTx, grn2 *grn.GRN) (bool, error) {
-	str := grn2.ToGRNString()
-	results, err := tx.Exec(ctx, "DELETE FROM entity WHERE grn=?", str)
-	if err != nil {
-		return false, err
-	}
-	rows, err := results.RowsAffected()
-	if err != nil {
-		return false, err
+//nolint:gocyclo
+func (s *sqlEntityServer) Update(ctx context.Context, r *entity.UpdateEntityRequest) (*entity.UpdateEntityResponse, error) {
+	if err := s.Init(); err != nil {
+		return nil, err
 	}
 
-	// TODO: keep history? would need current version bump, and the "write" would have to get from history
-	_, err = tx.Exec(ctx, "DELETE FROM entity_history WHERE grn=?", str)
-	if err != nil {
-		return false, err
-	}
-	_, err = tx.Exec(ctx, "DELETE FROM entity_labels WHERE grn=? OR parent_grn=?", str, str)
-	if err != nil {
-		return false, err
-	}
-	_, err = tx.Exec(ctx, "DELETE FROM entity_ref WHERE grn=? OR parent_grn=?", str, str)
-	if err != nil {
-		return false, err
-	}
-	_, err = tx.Exec(ctx, "DELETE FROM entity_nested WHERE parent_grn=?", str)
-	if err != nil {
-		return false, err
+	updatedAt := r.Entity.UpdatedAt
+	if updatedAt < 1000 {
+		updatedAt = time.Now().UnixMilli()
 	}
 
-	if grn2.ResourceKind == entity.StandardKindFolder {
-		err = updateFolderTree(ctx, tx, grn2.TenantID)
+	updatedBy := r.Entity.UpdatedBy
+	if updatedBy == "" {
+		modifier, err := appcontext.User(ctx)
+		if err != nil {
+			return nil, err
+		}
+		if modifier == nil {
+			return nil, fmt.Errorf("can not find user in context")
+		}
+		updatedBy = store.GetUserIDString(modifier)
 	}
-	return rows > 0, err
-}
 
-func (s *sqlEntityServer) History(ctx context.Context, r *entity.EntityHistoryRequest) (*entity.EntityHistoryResponse, error) {
-	grn2, err := s.validateGRN(ctx, r.GRN)
-	if err != nil {
-		return nil, err
+	rsp := &entity.UpdateEntityResponse{
+		Entity: &entity.Entity{},
+		Status: entity.UpdateEntityResponse_UPDATED, // Will be changed if not true
 	}
-	oid := grn2.ToGRNString()
 
-	page := ""
-	args := []any{oid}
-	if r.NextPageToken != "" {
-		// args = append(args, r.NextPageToken) // TODO, need to get time from the version
-		// page = "AND updated <= ?"
-		return nil, fmt.Errorf("next page not supported yet")
-	}
+	err := s.sess.WithTransaction(ctx, func(tx *session.SessionTx) error {
+		current, err := s.read(ctx, tx, &entity.ReadEntityRequest{
+			Key:        r.Entity.Key,
+			WithBody:   true,
+			WithStatus: true,
+		})
+		if err != nil {
+			return err
+		}
 
-	query := "SELECT version,size,etag,updated_at,updated_by,message \n" +
-		" FROM entity_history \n" +
-		" WHERE grn=? " + page + "\n" +
-		" ORDER BY updated_at DESC LIMIT 100"
+		// Optimistic locking
+		if r.PreviousVersion > 0 && r.PreviousVersion != current.ResourceVersion {
+			return fmt.Errorf("optimistic lock failed")
+		}
 
-	rows, err := s.sess.Query(ctx, query, args...)
-	if err != nil {
+		// if we didn't find an existing entity
+		if current.Guid == "" {
+			return fmt.Errorf("entity not found")
+		}
+
+		rsp.Entity.Guid = current.Guid
+
+		// Clear the refs
+		if _, err := tx.Exec(ctx, "DELETE FROM entity_ref WHERE guid=?", rsp.Entity.Guid); err != nil {
+			return err
+		}
+
+		if r.Entity.GroupVersion != "" {
+			current.GroupVersion = r.Entity.GroupVersion
+		}
+
+		if r.Entity.Folder != "" {
+			current.Folder = r.Entity.Folder
+		}
+		if r.Entity.Slug != "" {
+			current.Slug = r.Entity.Slug
+		}
+
+		if r.Entity.Body != nil {
+			current.Body = r.Entity.Body
+			current.Size = int64(len(current.Body))
+		}
+
+		if r.Entity.Meta != nil {
+			current.Meta = r.Entity.Meta
+		}
+
+		if r.Entity.Status != nil {
+			current.Status = r.Entity.Status
+		}
+
+		etag := createContentsHash(current.Body, current.Meta, current.Status)
+		current.ETag = etag
+
+		current.UpdatedAt = updatedAt
+		current.UpdatedBy = updatedBy
+
+		if r.Entity.Title != "" {
+			current.Title = r.Entity.Title
+		}
+		if r.Entity.Description != "" {
+			current.Description = r.Entity.Description
+		}
+
+		labels, err := json.Marshal(r.Entity.Labels)
+		if err != nil {
+			s.log.Error("error marshalling labels", "msg", err.Error())
+			return err
+		}
+		current.Labels = r.Entity.Labels
+
+		fields, err := json.Marshal(r.Entity.Fields)
+		if err != nil {
+			s.log.Error("error marshalling fields", "msg", err.Error())
+			return err
+		}
+		current.Fields = r.Entity.Fields
+
+		errors, err := json.Marshal(r.Entity.Errors)
+		if err != nil {
+			s.log.Error("error marshalling errors", "msg", err.Error())
+			return err
+		}
+		current.Errors = r.Entity.Errors
+
+		if current.Origin == nil {
+			current.Origin = &entity.EntityOriginInfo{}
+		}
+
+		if r.Entity.Origin != nil {
+			if r.Entity.Origin.Source != "" {
+				current.Origin.Source = r.Entity.Origin.Source
+			}
+			if r.Entity.Origin.Key != "" {
+				current.Origin.Key = r.Entity.Origin.Key
+			}
+			if r.Entity.Origin.Time > 0 {
+				current.Origin.Time = r.Entity.Origin.Time
+			}
+		}
+
+		// Set the comment on this write
+		if r.Entity.Message != "" {
+			current.Message = r.Entity.Message
+		}
+
+		// Update resource version
+		current.ResourceVersion = s.snowflake.Generate().Int64()
+
+		current.Action = entity.Entity_UPDATED
+
+		values := map[string]any{
+			// below are only set in history table
+			"guid":       current.Guid,
+			"key":        current.Key,
+			"namespace":  current.Namespace,
+			"group":      current.Group,
+			"resource":   current.Resource,
+			"name":       current.Name,
+			"created_at": current.CreatedAt,
+			"created_by": current.CreatedBy,
+			// below are updated
+			"group_version":    current.GroupVersion,
+			"folder":           current.Folder,
+			"slug":             current.Slug,
+			"updated_at":       current.UpdatedAt,
+			"updated_by":       current.UpdatedBy,
+			"body":             current.Body,
+			"meta":             current.Meta,
+			"status":           current.Status,
+			"size":             current.Size,
+			"etag":             current.ETag,
+			"resource_version": current.ResourceVersion,
+			"title":            current.Title,
+			"description":      current.Description,
+			"labels":           labels,
+			"fields":           fields,
+			"errors":           errors,
+			"origin":           current.Origin.Source,
+			"origin_key":       current.Origin.Key,
+			"origin_ts":        current.Origin.Time,
+			"message":          current.Message,
+			"action":           current.Action,
+		}
+
+		// 1. Add the `entity_history` values
+		if err := s.dialect.Insert(ctx, tx, "entity_history", values); err != nil {
+			s.log.Error("error inserting entity history", "msg", err.Error())
+			return err
+		}
+
+		// 2. update the main `entity` table
+
+		// remove values that are only set at insert
+		delete(values, "guid")
+		delete(values, "key")
+		delete(values, "namespace")
+		delete(values, "group")
+		delete(values, "resource")
+		delete(values, "name")
+		delete(values, "created_at")
+		delete(values, "created_by")
+
+		err = s.dialect.Update(
+			ctx,
+			tx,
+			"entity",
+			values,
+			map[string]any{
+				"guid": current.Guid,
+			},
+		)
+		if err != nil {
+			s.log.Error("error updating entity", "msg", err.Error())
+			return err
+		}
+
+		switch current.Group {
+		case folder.GROUP:
+			switch current.Resource {
+			case folder.RESOURCE:
+				err = s.updateFolderTree(ctx, tx, current.Namespace)
+				if err != nil {
+					s.log.Error("error updating folder tree", "msg", err.Error())
+					return err
+				}
+			}
+		}
+
+		rsp.Entity = current
+
+		return s.setLabels(ctx, tx, current.Guid, current.Labels)
+	})
+	if err != nil {
+		s.log.Error("error updating entity", "msg", err.Error())
+		rsp.Status = entity.UpdateEntityResponse_ERROR
+	}
+
+	return rsp, err
+}
+
+func (s *sqlEntityServer) setLabels(ctx context.Context, tx *session.SessionTx, guid string, labels map[string]string) error {
+	s.log.Debug("setLabels", "guid", guid, "labels", labels)
+
+	// Clear the old labels
+	if _, err := tx.Exec(ctx, "DELETE FROM entity_labels WHERE guid=?", guid); err != nil {
+		return err
+	}
+
+	// Add the new labels
+	for k, v := range labels {
+		query, args, err := s.dialect.InsertQuery(
+			"entity_labels",
+			map[string]any{
+				"guid":  guid,
+				"label": k,
+				"value": v,
+			},
+		)
+		if err != nil {
+			return err
+		}
+
+		_, err = tx.Exec(ctx, query, args...)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (s *sqlEntityServer) Delete(ctx context.Context, r *entity.DeleteEntityRequest) (*entity.DeleteEntityResponse, error) {
+	if err := s.Init(); err != nil {
+		return nil, err
+	}
+
+	rsp := &entity.DeleteEntityResponse{}
+
+	err := s.sess.WithTransaction(ctx, func(tx *session.SessionTx) error {
+		var err error
+		rsp.Entity, err = s.Read(ctx, &entity.ReadEntityRequest{
+			Key:        r.Key,
+			WithBody:   true,
+			WithStatus: true,
+		})
+		if err != nil {
+			if errors.Is(err, sql.ErrNoRows) {
+				rsp.Status = entity.DeleteEntityResponse_NOTFOUND
+			} else {
+				rsp.Status = entity.DeleteEntityResponse_ERROR
+			}
+			return err
+		}
+
+		if r.PreviousVersion > 0 && r.PreviousVersion != rsp.Entity.ResourceVersion {
+			rsp.Status = entity.DeleteEntityResponse_ERROR
+			return fmt.Errorf("optimistic lock failed")
+		}
+
+		err = s.doDelete(ctx, tx, rsp.Entity)
+		if err != nil {
+			rsp.Status = entity.DeleteEntityResponse_ERROR
+			return err
+		}
+
+		rsp.Status = entity.DeleteEntityResponse_DELETED
+		return nil
+	})
+
+	return rsp, err
+}
+
+func (s *sqlEntityServer) doDelete(ctx context.Context, tx *session.SessionTx, ent *entity.Entity) error {
+	// Update resource version
+	ent.ResourceVersion = s.snowflake.Generate().Int64()
+
+	ent.Action = entity.Entity_DELETED
+
+	// Set updated at/by
+	ent.UpdatedAt = time.Now().UnixMilli()
+	modifier, err := appcontext.User(ctx)
+	if err != nil {
+		return err
+	}
+	if modifier == nil {
+		return fmt.Errorf("can not find user in context")
+	}
+	ent.UpdatedBy = store.GetUserIDString(modifier)
+
+	labels, err := json.Marshal(ent.Labels)
+	if err != nil {
+		s.log.Error("error marshalling labels", "msg", err.Error())
+		return err
+	}
+
+	fields, err := json.Marshal(ent.Fields)
+	if err != nil {
+		s.log.Error("error marshalling fields", "msg", err.Error())
+		return err
+	}
+
+	errors, err := json.Marshal(ent.Errors)
+	if err != nil {
+		s.log.Error("error marshalling errors", "msg", err.Error())
+		return err
+	}
+
+	if ent.Origin == nil {
+		ent.Origin = &entity.EntityOriginInfo{}
+	}
+
+	values := map[string]any{
+		// below are only set in history table
+		"guid":       ent.Guid,
+		"key":        ent.Key,
+		"namespace":  ent.Namespace,
+		"group":      ent.Group,
+		"resource":   ent.Resource,
+		"name":       ent.Name,
+		"created_at": ent.CreatedAt,
+		"created_by": ent.CreatedBy,
+		// below are updated
+		"group_version":    ent.GroupVersion,
+		"folder":           ent.Folder,
+		"slug":             ent.Slug,
+		"updated_at":       ent.UpdatedAt,
+		"updated_by":       ent.UpdatedBy,
+		"body":             ent.Body,
+		"meta":             ent.Meta,
+		"status":           ent.Status,
+		"size":             ent.Size,
+		"etag":             ent.ETag,
+		"resource_version": ent.ResourceVersion,
+		"title":            ent.Title,
+		"description":      ent.Description,
+		"labels":           labels,
+		"fields":           fields,
+		"errors":           errors,
+		"origin":           ent.Origin.Source,
+		"origin_key":       ent.Origin.Key,
+		"origin_ts":        ent.Origin.Time,
+		"message":          ent.Message,
+		"action":           ent.Action,
+	}
+
+	// 1. Add the `entity_history` values
+	if err := s.dialect.Insert(ctx, tx, "entity_history", values); err != nil {
+		s.log.Error("error inserting entity history", "msg", err.Error())
+		return err
+	}
+
+	_, err = tx.Exec(ctx, "DELETE FROM entity WHERE guid=?", ent.Guid)
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec(ctx, "DELETE FROM entity_labels WHERE guid=?", ent.Guid)
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec(ctx, "DELETE FROM entity_ref WHERE guid=?", ent.Guid)
+	if err != nil {
+		return err
+	}
+
+	switch ent.Group {
+	case folder.GROUP:
+		switch ent.Resource {
+		case folder.RESOURCE:
+			err = s.updateFolderTree(ctx, tx, ent.Namespace)
+			if err != nil {
+				s.log.Error("error updating folder tree", "msg", err.Error())
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
+func (s *sqlEntityServer) History(ctx context.Context, r *entity.EntityHistoryRequest) (*entity.EntityHistoryResponse, error) {
+	if err := s.Init(); err != nil {
+		return nil, err
+	}
+
+	user, err := appcontext.User(ctx)
+	if err != nil {
+		return nil, err
+	}
+	if user == nil {
+		return nil, fmt.Errorf("missing user in context")
+	}
+
+	if r.Key == "" {
+		return nil, fmt.Errorf("missing key")
+	}
+
+	key, err := entity.ParseKey(r.Key)
+	if err != nil {
+		return nil, err
+	}
+
+	if key.Name == "" {
+		return nil, fmt.Errorf("missing name")
+	}
+
+	var limit int64 = 100
+	if r.Limit > 0 && r.Limit < 100 {
+		limit = r.Limit
+	}
+
+	fields := s.getReadFields(r)
+
+	entityQuery := selectQuery{
+		dialect:  s.dialect,
+		fields:   fields,
+		from:     "entity_history", // the table
+		args:     []any{},
+		limit:    r.Limit,
+		offset:   0,
+		oneExtra: true, // request one more than the limit (and show next token if it exists)
+	}
+
+	args := []any{key.Group, key.Resource}
+	whereclause := "(" + s.dialect.Quote("group") + "=? AND " + s.dialect.Quote("resource") + "=?"
+	if key.Namespace != "" {
+		args = append(args, key.Namespace)
+		whereclause += " AND " + s.dialect.Quote("namespace") + "=?"
+	}
+	args = append(args, key.Name)
+	whereclause += " AND " + s.dialect.Quote("name") + "=?)"
+
+	entityQuery.addWhere(whereclause, args...)
+
+	// if we have a page token, use that to specify the first record
+	continueToken, err := GetContinueToken(r)
+	if err != nil {
+		return nil, err
+	}
+	if continueToken != nil {
+		entityQuery.offset = continueToken.StartOffset
+	}
+
+	for _, sort := range r.Sort {
+		sortBy, err := ParseSortBy(sort)
+		if err != nil {
+			return nil, err
+		}
+		entityQuery.addOrderBy(sortBy.Field, sortBy.Direction)
+	}
+	entityQuery.addOrderBy("resource_version", Ascending)
+
+	query, args := entityQuery.toQuery()
+
+	s.log.Debug("history", "query", query, "args", args)
+
+	rows, err := s.sess.Query(ctx, query, args...)
+	if err != nil {
 		return nil, err
 	}
 	defer func() { _ = rows.Close() }()
+
 	rsp := &entity.EntityHistoryResponse{
-		GRN: r.GRN,
+		Key:             r.Key,
+		ResourceVersion: s.snowflake.Generate().Int64(),
 	}
 	for rows.Next() {
-		v := &entity.EntityVersionInfo{}
-		err := rows.Scan(&v.Version, &v.Size, &v.ETag, &v.UpdatedAt, &v.UpdatedBy, &v.Comment)
+		v, err := rowToEntity(rows, r)
 		if err != nil {
 			return nil, err
 		}
+
+		// found more than requested
+		if int64(len(rsp.Versions)) >= limit {
+			continueToken := &ContinueToken{
+				Sort:        r.Sort,
+				StartOffset: entityQuery.offset + entityQuery.limit,
+			}
+			rsp.NextPageToken = continueToken.String()
+			break
+		}
+
 		rsp.Versions = append(rsp.Versions, v)
 	}
 	return rsp, err
 }
 
-func (s *sqlEntityServer) Search(ctx context.Context, r *entity.EntitySearchRequest) (*entity.EntitySearchResponse, error) {
-	user, err := appcontext.User(ctx)
+type ContinueRequest interface {
+	GetNextPageToken() string
+	GetSort() []string
+}
+
+type ContinueToken struct {
+	Sort        []string `json:"s"`
+	StartOffset int64    `json:"o"`
+}
+
+func (c *ContinueToken) String() string {
+	b, _ := json.Marshal(c)
+	return base64.StdEncoding.EncodeToString(b)
+}
+
+func GetContinueToken(r ContinueRequest) (*ContinueToken, error) {
+	if r.GetNextPageToken() == "" {
+		return nil, nil
+	}
+
+	continueVal, err := base64.StdEncoding.DecodeString(r.GetNextPageToken())
+	if err != nil {
+		return nil, fmt.Errorf("error decoding continue token")
+	}
+
+	t := &ContinueToken{}
+	err = json.Unmarshal(continueVal, t)
 	if err != nil {
 		return nil, err
 	}
-	if user == nil {
-		return nil, fmt.Errorf("missing user in context")
+
+	if !slices.Equal(t.Sort, r.GetSort()) {
+		return nil, fmt.Errorf("sort order changed")
 	}
 
-	if r.NextPageToken != "" || len(r.Sort) > 0 {
-		return nil, fmt.Errorf("not yet supported")
+	return t, nil
+}
+
+var sortByFields = []string{
+	"guid",
+	"key",
+	"namespace", "group", "group_version", "resource", "name", "folder",
+	"resource_version", "size", "etag",
+	"created_at", "created_by",
+	"updated_at", "updated_by",
+	"origin", "origin_key", "origin_ts",
+	"title", "slug", "description",
+}
+
+type SortBy struct {
+	Field     string
+	Direction Direction
+}
+
+func ParseSortBy(sort string) (*SortBy, error) {
+	sortBy := &SortBy{
+		Field:     "guid",
+		Direction: Ascending,
 	}
 
-	fields := []string{
-		"grn", "tenant_id", "kind", "uid",
-		"version", "folder", "slug", "errors", // errors are always returned
-		"size", "updated_at", "updated_by",
-		"name", "description", // basic summary
+	if strings.HasSuffix(sort, "_desc") {
+		sortBy.Field = sort[:len(sort)-5]
+		sortBy.Direction = Descending
+	} else {
+		sortBy.Field = sort
+	}
+
+	if !slices.Contains(sortByFields, sortBy.Field) {
+		return nil, fmt.Errorf("invalid sort field '%s', valid fields: %v", sortBy.Field, sortByFields)
 	}
 
-	if r.WithBody {
-		fields = append(fields, "body")
+	return sortBy, nil
+}
+
+func (s *sqlEntityServer) List(ctx context.Context, r *entity.EntityListRequest) (*entity.EntityListResponse, error) {
+	if err := s.Init(); err != nil {
+		return nil, err
 	}
 
-	if r.WithLabels {
-		fields = append(fields, "labels")
+	user, err := appcontext.User(ctx)
+	if err != nil {
+		return nil, err
 	}
-	if r.WithFields {
-		fields = append(fields, "fields")
+	if user == nil {
+		return nil, fmt.Errorf("missing user in context")
 	}
 
+	fields := s.getReadFields(r)
+
 	entityQuery := selectQuery{
+		dialect:  s.dialect,
 		fields:   fields,
 		from:     "entity", // the table
 		args:     []any{},
 		limit:    r.Limit,
+		offset:   0,
 		oneExtra: true, // request one more than the limit (and show next token if it exists)
 	}
-	entityQuery.addWhere("tenant_id", user.OrgID)
 
-	if len(r.Kind) > 0 {
-		entityQuery.addWhereIn("kind", r.Kind)
+	// if we are looking for deleted entities, we list "deleted" entries from the entity_history table
+	if r.Deleted {
+		entityQuery.from = "entity_history"
+		entityQuery.addWhere("action", entity.Entity_DELETED)
+	}
+
+	// TODO fix this
+	// entityQuery.addWhere("namespace", user.OrgID)
+
+	if len(r.Group) > 0 {
+		entityQuery.addWhereIn("group", r.Group)
+	}
+
+	if len(r.Resource) > 0 {
+		entityQuery.addWhereIn("resource", r.Resource)
+	}
+
+	if len(r.Key) > 0 {
+		where := []string{}
+		args := []any{}
+		for _, k := range r.Key {
+			key, err := entity.ParseKey(k)
+			if err != nil {
+				return nil, err
+			}
+
+			args = append(args, key.Group, key.Resource)
+			whereclause := "(" + s.dialect.Quote("group") + "=? AND " + s.dialect.Quote("resource") + "=?"
+			if key.Namespace != "" {
+				args = append(args, key.Namespace)
+				whereclause += " AND " + s.dialect.Quote("namespace") + "=?"
+			}
+			if key.Name != "" {
+				args = append(args, key.Name)
+				whereclause += " AND " + s.dialect.Quote("name") + "=?"
+			}
+			whereclause += ")"
+
+			where = append(where, whereclause)
+		}
+
+		entityQuery.addWhere("("+strings.Join(where, " OR ")+")", args...)
 	}
 
-	// Folder UID or OID?
+	// Folder guid
 	if r.Folder != "" {
 		entityQuery.addWhere("folder", r.Folder)
 	}
 
+	// if we have a page token, use that to specify the first record
+	continueToken, err := GetContinueToken(r)
+	if err != nil {
+		return nil, err
+	}
+	if continueToken != nil {
+		entityQuery.offset = continueToken.StartOffset
+	}
+
 	if len(r.Labels) > 0 {
-		var args []any
-		var conditions []string
-		for labelKey, labelValue := range r.Labels {
-			args = append(args, labelKey)
-			args = append(args, labelValue)
-			conditions = append(conditions, "(label = ? AND value = ?)")
+		// if we are looking for deleted entities, we need to use the labels column
+		if r.Deleted {
+			for labelKey, labelValue := range r.Labels {
+				entityQuery.addWhereJsonContainsKV("labels", labelKey, labelValue)
+			}
+			// for active entities, we can use the entity_labels table
+		} else {
+			var args []any
+			var conditions []string
+			for labelKey, labelValue := range r.Labels {
+				args = append(args, labelKey)
+				args = append(args, labelValue)
+				conditions = append(conditions, "(label = ? AND value = ?)")
+			}
+			query := "SELECT guid FROM entity_labels" +
+				" WHERE (" + strings.Join(conditions, " OR ") + ")" +
+				" GROUP BY guid" +
+				" HAVING COUNT(label) = ?"
+			args = append(args, len(r.Labels))
+
+			entityQuery.addWhereInSubquery("guid", query, args)
 		}
-		joinedConditions := strings.Join(conditions, " OR ")
-		query := "SELECT grn FROM entity_labels WHERE " + joinedConditions + " GROUP BY grn HAVING COUNT(label) = ?"
-		args = append(args, len(r.Labels))
+	}
 
-		entityQuery.addWhereInSubquery("grn", query, args)
+	for _, sort := range r.Sort {
+		sortBy, err := ParseSortBy(sort)
+		if err != nil {
+			return nil, err
+		}
+		entityQuery.addOrderBy(sortBy.Field, sortBy.Direction)
 	}
+	entityQuery.addOrderBy("guid", Ascending)
 
 	query, args := entityQuery.toQuery()
 
+	s.log.Debug("listing", "query", query, "args", args)
+
 	rows, err := s.sess.Query(ctx, query, args...)
 	if err != nil {
 		return nil, err
 	}
 	defer func() { _ = rows.Close() }()
-	oid := ""
-	rsp := &entity.EntitySearchResponse{}
+	rsp := &entity.EntityListResponse{
+		ResourceVersion: s.snowflake.Generate().Int64(),
+	}
 	for rows.Next() {
-		result := &entity.EntitySearchResult{
-			GRN: &grn.GRN{},
+		result, err := rowToEntity(rows, r)
+		if err != nil {
+			return rsp, err
 		}
-		summaryjson := summarySupport{}
 
-		args := []any{
-			&oid, &result.GRN.TenantID, &result.GRN.ResourceKind, &result.GRN.ResourceIdentifier,
-			&result.Version, &result.Folder, &result.Slug, &summaryjson.errors,
-			&result.Size, &result.UpdatedAt, &result.UpdatedBy,
-			&result.Name, &summaryjson.description,
+		// found more than requested
+		if int64(len(rsp.Results)) >= entityQuery.limit {
+			continueToken := &ContinueToken{
+				Sort:        r.Sort,
+				StartOffset: entityQuery.offset + entityQuery.limit,
+			}
+			rsp.NextPageToken = continueToken.String()
+			break
 		}
-		if r.WithBody {
-			args = append(args, &result.Body)
+
+		rsp.Results = append(rsp.Results, result)
+	}
+
+	return rsp, err
+}
+
+func (s *sqlEntityServer) Watch(r *entity.EntityWatchRequest, w entity.EntityStore_WatchServer) error {
+	if err := s.Init(); err != nil {
+		return err
+	}
+
+	user, err := appcontext.User(w.Context())
+	if err != nil {
+		return err
+	}
+	if user == nil {
+		return fmt.Errorf("missing user in context")
+	}
+
+	// collect and send any historical events
+	err = s.watchInit(r, w)
+	if err != nil {
+		return err
+	}
+
+	// subscribe to new events
+	err = s.watch(r, w)
+	if err != nil {
+		s.log.Error("watch error", "err", err)
+		return err
+	}
+
+	return nil
+}
+
+// watchInit is a helper function to send the initial set of entities to the client
+func (s *sqlEntityServer) watchInit(r *entity.EntityWatchRequest, w entity.EntityStore_WatchServer) error {
+	fields := s.getReadFields(r)
+
+	entityQuery := selectQuery{
+		dialect:  s.dialect,
+		fields:   fields,
+		from:     "entity", // the table
+		args:     []any{},
+		limit:    100,  // r.Limit,
+		oneExtra: true, // request one more than the limit (and show next token if it exists)
+	}
+
+	// if we got an initial resource version, start from that location in the history
+	fromZero := true
+	if r.Since > 0 {
+		entityQuery.from = "entity_history"
+		entityQuery.addWhere("resource_version > ?", r.Since)
+		fromZero = false
+	}
+
+	// TODO fix this
+	// entityQuery.addWhere("namespace", user.OrgID)
+
+	if len(r.Resource) > 0 {
+		entityQuery.addWhereIn("resource", r.Resource)
+	}
+
+	if len(r.Key) > 0 {
+		where := []string{}
+		args := []any{}
+		for _, k := range r.Key {
+			key, err := entity.ParseKey(k)
+			if err != nil {
+				return err
+			}
+
+			args = append(args, key.Group, key.Resource)
+			whereclause := "(" + s.dialect.Quote("group") + "=? AND " + s.dialect.Quote("resource") + "=?"
+			if key.Namespace != "" {
+				args = append(args, key.Namespace)
+				whereclause += " AND " + s.dialect.Quote("namespace") + "=?"
+			}
+			if key.Name != "" {
+				args = append(args, key.Name)
+				whereclause += " AND " + s.dialect.Quote("name") + "=?"
+			}
+			whereclause += ")"
+
+			where = append(where, whereclause)
 		}
-		if r.WithLabels {
-			args = append(args, &summaryjson.labels)
+
+		entityQuery.addWhere("("+strings.Join(where, " OR ")+")", args...)
+	}
+
+	// Folder guid
+	if r.Folder != "" {
+		entityQuery.addWhere("folder", r.Folder)
+	}
+
+	if len(r.Labels) > 0 {
+		if r.Since > 0 {
+			for labelKey, labelValue := range r.Labels {
+				entityQuery.addWhereJsonContainsKV("labels", labelKey, labelValue)
+			}
+		} else {
+			var args []any
+			var conditions []string
+			for labelKey, labelValue := range r.Labels {
+				args = append(args, labelKey)
+				args = append(args, labelValue)
+				conditions = append(conditions, "(label = ? AND value = ?)")
+			}
+			query := "SELECT guid FROM entity_labels" +
+				" WHERE (" + strings.Join(conditions, " OR ") + ")" +
+				" GROUP BY guid" +
+				" HAVING COUNT(label) = ?"
+			args = append(args, len(r.Labels))
+
+			entityQuery.addWhereInSubquery("guid", query, args)
 		}
-		if r.WithFields {
-			args = append(args, &summaryjson.fields)
+	}
+
+	entityQuery.addOrderBy("resource_version", Ascending)
+
+	var err error
+
+	for hasmore := true; hasmore; {
+		err = func() error {
+			query, args := entityQuery.toQuery()
+
+			s.log.Debug("watch init", "query", query, "args", args)
+
+			rows, err := s.sess.Query(w.Context(), query, args...)
+			if err != nil {
+				return err
+			}
+			defer func() { _ = rows.Close() }()
+
+			found := int64(0)
+
+			for rows.Next() {
+				found++
+				if found > entityQuery.limit {
+					entityQuery.offset += entityQuery.limit
+					return nil
+				}
+
+				result, err := rowToEntity(rows, r)
+				if err != nil {
+					return err
+				}
+
+				if result.ResourceVersion > r.Since {
+					r.Since = result.ResourceVersion
+				}
+
+				if fromZero {
+					result.Action = entity.Entity_CREATED
+				}
+
+				s.log.Debug("sending init event", "guid", result.Guid, "action", result.Action, "rv", result.ResourceVersion)
+				err = w.Send(&entity.EntityWatchResponse{
+					Timestamp: time.Now().UnixMilli(),
+					Entity:    result,
+				})
+				if err != nil {
+					return err
+				}
+			}
+
+			hasmore = false
+			return nil
+		}()
+		if err != nil {
+			return err
 		}
+	}
 
-		err = rows.Scan(args...)
+	return nil
+}
+
+func (s *sqlEntityServer) poller(stream chan *entity.Entity) {
+	var err error
+	since := s.snowflake.Generate().Int64()
+
+	t := time.NewTicker(1 * time.Second)
+	defer t.Stop()
+
+	for range t.C {
+		since, err = s.poll(since, stream)
 		if err != nil {
-			return rsp, err
+			s.log.Error("watch error", "err", err)
 		}
+	}
+}
 
-		// found one more than requested
-		if int64(len(rsp.Results)) >= entityQuery.limit {
-			// TODO? should this encode start+offset?
-			rsp.NextPageToken = oid
-			break
+func (s *sqlEntityServer) poll(since int64, out chan *entity.Entity) (int64, error) {
+	rr := &entity.ReadEntityRequest{
+		WithBody:   true,
+		WithStatus: true,
+	}
+
+	fields := s.getReadFields(rr)
+
+	for hasmore := true; hasmore; {
+		err := func() error {
+			entityQuery := selectQuery{
+				dialect: s.dialect,
+				fields:  fields,
+				from:    "entity_history", // the table
+				args:    []any{},
+				limit:   100, // r.Limit,
+				// offset:   0,
+				oneExtra: true, // request one more than the limit (and show next token if it exists)
+				orderBy:  []string{"resource_version"},
+			}
+
+			entityQuery.addWhere("resource_version > ?", since)
+
+			query, args := entityQuery.toQuery()
+
+			rows, err := s.sess.Query(s.ctx, query, args...)
+			if err != nil {
+				return err
+			}
+			defer func() { _ = rows.Close() }()
+
+			found := int64(0)
+			for rows.Next() {
+				found++
+				if found > entityQuery.limit {
+					return nil
+				}
+
+				result, err := rowToEntity(rows, rr)
+				if err != nil {
+					return err
+				}
+
+				if result.ResourceVersion > since {
+					since = result.ResourceVersion
+				}
+
+				s.log.Debug("sending poll result", "guid", result.Guid, "action", result.Action, "rv", result.ResourceVersion)
+				out <- result
+			}
+
+			hasmore = false
+			return nil
+		}()
+		if err != nil {
+			return since, err
 		}
+	}
 
-		if summaryjson.description != nil {
-			result.Description = *summaryjson.description
+	return since, nil
+}
+
+func watchMatches(r *entity.EntityWatchRequest, result *entity.Entity) bool {
+	// Resource version too old
+	if result.ResourceVersion <= r.Since {
+		return false
+	}
+
+	// Folder guid
+	if r.Folder != "" && r.Folder != result.Folder {
+		return false
+	}
+
+	// must match at least one resource if specified
+	if len(r.Resource) > 0 {
+		matched := false
+		for _, res := range r.Resource {
+			if res == result.Resource {
+				matched = true
+				break
+			}
+		}
+		if !matched {
+			return false
 		}
+	}
 
-		if summaryjson.labels != nil {
-			b := []byte(*summaryjson.labels)
-			err = json.Unmarshal(b, &result.Labels)
+	// must match at least one key if specified
+	if len(r.Key) > 0 {
+		matched := false
+		for _, k := range r.Key {
+			key, err := entity.ParseKey(k)
 			if err != nil {
-				return rsp, err
+				return false
+			}
+
+			if key.Group == result.Group && key.Resource == result.Resource && (key.Namespace == "" || key.Namespace == result.Namespace) && (key.Name == "" || key.Name == result.Name) {
+				matched = true
+				break
 			}
 		}
+		if !matched {
+			return false
+		}
+	}
 
-		if summaryjson.fields != nil {
-			result.FieldsJson = []byte(*summaryjson.fields)
+	// must match all specified label/value pairs
+	if len(r.Labels) > 0 {
+		for labelKey, labelValue := range r.Labels {
+			if result.Labels[labelKey] != labelValue {
+				return false
+			}
+		}
+	}
+
+	return true
+}
+
+// watch is a helper to get the next set of entities and send them to the client
+func (s *sqlEntityServer) watch(r *entity.EntityWatchRequest, w entity.EntityStore_WatchServer) error {
+	s.log.Debug("watch started", "since", r.Since)
+
+	evts, err := s.broadcaster.Subscribe(w.Context())
+	if err != nil {
+		return err
+	}
+
+	for {
+		select {
+		// user closed the connection
+		case <-w.Context().Done():
+			return nil
+		// got a raw result from the broadcaster
+		case result := <-evts:
+			// result doesn't match our watch params, skip it
+			if !watchMatches(r, result) {
+				s.log.Debug("watch result not matched", "guid", result.Guid, "action", result.Action, "rv", result.ResourceVersion)
+				break
+			}
+
+			// remove the body and status if not requested
+			if !r.WithBody {
+				result.Body = nil
+			}
+			if !r.WithStatus {
+				result.Status = nil
+			}
+
+			// update r.Since value so we don't send earlier results again
+			r.Since = result.ResourceVersion
+
+			s.log.Debug("sending watch result", "guid", result.Guid, "action", result.Action, "rv", result.ResourceVersion)
+			err = w.Send(&entity.EntityWatchResponse{
+				Timestamp: time.Now().UnixMilli(),
+				Entity:    result,
+			})
+			if err != nil {
+				return err
+			}
+		}
+	}
+}
+
+func (s *sqlEntityServer) FindReferences(ctx context.Context, r *entity.ReferenceRequest) (*entity.EntityListResponse, error) {
+	if err := s.Init(); err != nil {
+		return nil, err
+	}
+
+	user, err := appcontext.User(ctx)
+	if err != nil {
+		return nil, err
+	}
+	if user == nil {
+		return nil, fmt.Errorf("missing user in context")
+	}
+
+	if r.NextPageToken != "" {
+		return nil, fmt.Errorf("not yet supported")
+	}
+
+	fields := []string{
+		"e.guid", "e.guid",
+		"e.namespace", "e.group", "e.group_version", "e.resource", "e.name",
+		"e.resource_version", "e.folder", "e.slug", "e.errors", // errors are always returned
+		"e.size", "e.updated_at", "e.updated_by",
+		"e.title", "e.description", "e.meta",
+	}
+
+	sql := "SELECT " + strings.Join(fields, ",") +
+		" FROM entity_ref AS er JOIN entity AS e ON er.guid = e.guid" +
+		" WHERE er.namespace=? AND er.group=? AND er.resource=? AND er.resolved_to=?"
+
+	rows, err := s.sess.Query(ctx, sql, r.Namespace, r.Group, r.Resource, r.Name)
+	if err != nil {
+		return nil, err
+	}
+	defer func() { _ = rows.Close() }()
+	token := ""
+	rsp := &entity.EntityListResponse{}
+	for rows.Next() {
+		result := &entity.Entity{}
+
+		args := []any{
+			&token, &result.Guid,
+			&result.Namespace, &result.Group, &result.GroupVersion, &result.Resource, &result.Name,
+			&result.ResourceVersion, &result.Folder, &result.Slug, &result.Errors,
+			&result.Size, &result.UpdatedAt, &result.UpdatedBy,
+			&result.Title, &result.Description, &result.Meta,
 		}
 
-		if summaryjson.errors != nil {
-			result.ErrorJson = []byte(*summaryjson.errors)
+		err = rows.Scan(args...)
+		if err != nil {
+			return rsp, err
 		}
 
+		// // found one more than requested
+		// if int64(len(rsp.Results)) >= entityQuery.limit {
+		// 	// TODO? should this encode start+offset?
+		// 	rsp.NextPageToken = token
+		// 	break
+		// }
+
 		rsp.Results = append(rsp.Results, result)
 	}
 
 	return rsp, err
 }
-
-func (s *sqlEntityServer) Watch(*entity.EntityWatchRequest, entity.EntityStore_WatchServer) error {
-	return fmt.Errorf("unimplemented")
-}
diff --git a/pkg/services/store/entity/sqlstash/sql_storage_server_test.go b/pkg/services/store/entity/sqlstash/sql_storage_server_test.go
new file mode 100644
index 0000000000000..2f193b78bdf01
--- /dev/null
+++ b/pkg/services/store/entity/sqlstash/sql_storage_server_test.go
@@ -0,0 +1,138 @@
+package sqlstash
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/store/entity"
+	"github.com/grafana/grafana/pkg/services/store/entity/db/dbimpl"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
+)
+
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
+func TestCreate(t *testing.T) {
+	s := setUpTestServer(t)
+
+	tests := []struct {
+		name             string
+		ent              *entity.Entity
+		errIsExpected    bool
+		statusIsExpected bool
+	}{
+		{
+			"request with key and entity creator",
+			&entity.Entity{
+				Group:     "playlist.grafana.app",
+				Resource:  "playlists",
+				Namespace: "default",
+				Name:      "set-minimum-uid",
+				Key:       "/playlist.grafana.app/playlists/namespaces/default/set-minimum-uid",
+				CreatedBy: "set-minimum-creator",
+				Origin:    &entity.EntityOriginInfo{},
+			},
+			false,
+			true,
+		},
+		{
+			"request with no entity creator",
+			&entity.Entity{
+				Key: "/playlist.grafana.app/playlists/namespaces/default/set-only-key",
+			},
+			true,
+			false,
+		},
+		{
+			"request with no key",
+			&entity.Entity{
+				CreatedBy: "entity-creator",
+			},
+			true,
+			true,
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			req := entity.CreateEntityRequest{
+				Entity: &entity.Entity{
+					Key:       tc.ent.Key,
+					CreatedBy: tc.ent.CreatedBy,
+				},
+			}
+			resp, err := s.Create(context.Background(), &req)
+
+			if tc.errIsExpected {
+				require.Error(t, err)
+
+				if tc.statusIsExpected {
+					require.Equal(t, entity.CreateEntityResponse_ERROR, resp.Status)
+				}
+
+				return
+			}
+
+			require.Nil(t, err)
+			require.Equal(t, entity.CreateEntityResponse_CREATED, resp.Status)
+			require.NotNil(t, resp)
+			require.Nil(t, resp.Error)
+
+			read, err := s.Read(context.Background(), &entity.ReadEntityRequest{
+				Key: tc.ent.Key,
+			})
+			require.NoError(t, err)
+			require.NotNil(t, read)
+
+			require.Greater(t, len(read.Guid), 0)
+			require.Greater(t, read.ResourceVersion, int64(0))
+
+			expectedETag := createContentsHash(tc.ent.Body, tc.ent.Meta, tc.ent.Status)
+			require.Equal(t, expectedETag, read.ETag)
+			require.Equal(t, tc.ent.Origin, read.Origin)
+			require.Equal(t, tc.ent.Group, read.Group)
+			require.Equal(t, tc.ent.Resource, read.Resource)
+			require.Equal(t, tc.ent.Namespace, read.Namespace)
+			require.Equal(t, tc.ent.Name, read.Name)
+			require.Equal(t, tc.ent.Subresource, read.Subresource)
+			require.Equal(t, tc.ent.GroupVersion, read.GroupVersion)
+			require.Equal(t, tc.ent.Key, read.Key)
+			require.Equal(t, tc.ent.Folder, read.Folder)
+			require.Equal(t, tc.ent.Meta, read.Meta)
+			require.Equal(t, tc.ent.Body, read.Body)
+			require.Equal(t, tc.ent.Status, read.Status)
+			require.Equal(t, tc.ent.Title, read.Title)
+			require.Equal(t, tc.ent.Size, read.Size)
+			require.Greater(t, read.CreatedAt, int64(0))
+			require.Equal(t, tc.ent.CreatedBy, read.CreatedBy)
+			require.Equal(t, tc.ent.UpdatedAt, read.UpdatedAt)
+			require.Equal(t, tc.ent.UpdatedBy, read.UpdatedBy)
+			require.Equal(t, tc.ent.Description, read.Description)
+			require.Equal(t, tc.ent.Slug, read.Slug)
+			require.Equal(t, tc.ent.Message, read.Message)
+			require.Equal(t, tc.ent.Labels, read.Labels)
+			require.Equal(t, tc.ent.Fields, read.Fields)
+			require.Equal(t, tc.ent.Errors, read.Errors)
+		})
+	}
+}
+
+func setUpTestServer(t *testing.T) entity.EntityStoreServer {
+	sqlStore := db.InitTestDB(t)
+
+	entityDB, err := dbimpl.ProvideEntityDB(
+		sqlStore,
+		setting.NewCfg(),
+		featuremgmt.WithFeatures(featuremgmt.FlagUnifiedStorage))
+	require.NoError(t, err)
+
+	s, err := ProvideSQLEntityServer(entityDB)
+	require.NoError(t, err)
+	return s
+}
diff --git a/pkg/services/store/entity/sqlstash/summary_handler.go b/pkg/services/store/entity/sqlstash/summary_handler.go
deleted file mode 100644
index 3b597fe302678..0000000000000
--- a/pkg/services/store/entity/sqlstash/summary_handler.go
+++ /dev/null
@@ -1,116 +0,0 @@
-package sqlstash
-
-import (
-	"encoding/json"
-
-	"github.com/grafana/grafana/pkg/infra/grn"
-	"github.com/grafana/grafana/pkg/services/store/entity"
-)
-
-type summarySupport struct {
-	model       *entity.EntitySummary
-	name        string
-	description *string // null or empty
-	slug        *string // null or empty
-	labels      *string
-	fields      *string
-	errors      *string // should not allow saving with this!
-	marshaled   []byte
-
-	// metadata for nested objects
-	parent_grn *grn.GRN
-	folder     string
-	isNested   bool // set when this is for a nested item
-}
-
-func newSummarySupport(summary *entity.EntitySummary) (*summarySupport, error) {
-	var err error
-	var js []byte
-	s := &summarySupport{
-		model: summary,
-	}
-	if summary != nil {
-		s.marshaled, err = json.Marshal(summary)
-		if err != nil {
-			return s, err
-		}
-
-		s.name = summary.Name
-		if summary.Description != "" {
-			s.description = &summary.Description
-		}
-		if summary.Slug != "" {
-			s.slug = &summary.Slug
-		}
-		if len(summary.Labels) > 0 {
-			js, err = json.Marshal(summary.Labels)
-			if err != nil {
-				return s, err
-			}
-			str := string(js)
-			s.labels = &str
-		}
-
-		if len(summary.Fields) > 0 {
-			js, err = json.Marshal(summary.Fields)
-			if err != nil {
-				return s, err
-			}
-			str := string(js)
-			s.fields = &str
-		}
-
-		if summary.Error != nil {
-			js, err = json.Marshal(summary.Error)
-			if err != nil {
-				return s, err
-			}
-			str := string(js)
-			s.errors = &str
-		}
-	}
-	return s, err
-}
-
-func (s summarySupport) toEntitySummary() (*entity.EntitySummary, error) {
-	var err error
-	summary := &entity.EntitySummary{
-		Name: s.name,
-	}
-	if s.description != nil {
-		summary.Description = *s.description
-	}
-	if s.slug != nil {
-		summary.Slug = *s.slug
-	}
-	if s.labels != nil {
-		b := []byte(*s.labels)
-		err = json.Unmarshal(b, &summary.Labels)
-		if err != nil {
-			return summary, err
-		}
-	}
-	if s.fields != nil {
-		b := []byte(*s.fields)
-		err = json.Unmarshal(b, &summary.Fields)
-		if err != nil {
-			return summary, err
-		}
-	}
-	if s.errors != nil {
-		b := []byte(*s.errors)
-		err = json.Unmarshal(b, &summary.Error)
-		if err != nil {
-			return summary, err
-		}
-	}
-	return summary, err
-}
-
-func (s *summarySupport) getParentGRN() *string {
-	if s.isNested {
-		t := s.parent_grn.ToGRNString()
-		return &t
-	}
-	return nil
-}
diff --git a/pkg/services/store/entity/sqlstash/testdata/simple.jsonc b/pkg/services/store/entity/sqlstash/testdata/simple.jsonc
index 8368cf0ef7842..bbce798da5526 100644
--- a/pkg/services/store/entity/sqlstash/testdata/simple.jsonc
+++ b/pkg/services/store/entity/sqlstash/testdata/simple.jsonc
@@ -3,16 +3,16 @@
 //  Frame[0] 
 //  Name: 
 //  Dimensions: 7 Fields by 4 Rows
-//  +----------------+----------------+----------------+---------------+---------------+---------------+--------------------------------------------------------------------------------+
-//  | Name: UID      | Name: name     | Name: slug     | Name: depth   | Name: left    | Name: right   | Name: tree                                                                     |
-//  | Labels:        | Labels:        | Labels:        | Labels:       | Labels:       | Labels:       | Labels:                                                                        |
-//  | Type: []string | Type: []string | Type: []string | Type: []int32 | Type: []int32 | Type: []int32 | Type: []json.RawMessage                                                        |
-//  +----------------+----------------+----------------+---------------+---------------+---------------+--------------------------------------------------------------------------------+
-//  |                | Root           |                | 0             | 1             | 8             | []                                                                             |
-//  | A              | A              | /a/            | 1             | 2             | 5             | [{"uid":"A","name":"A","slug":"/a/"}]                                          |
-//  | AA             | AA             | /a/aa/         | 2             | 3             | 4             | [{"uid":"A","name":"A","slug":"/a/"},{"uid":"AA","name":"AA","slug":"/a/aa/"}] |
-//  | B              | B              | /b/            | 1             | 6             | 7             | [{"uid":"B","name":"B","slug":"/b/"}]                                          |
-//  +----------------+----------------+----------------+---------------+---------------+---------------+--------------------------------------------------------------------------------+
+//  +----------------+----------------+----------------+---------------+---------------+---------------+---------------------------------------------------------------------------------------------------------+
+//  | Name: UID      | Name: name     | Name: slug     | Name: depth   | Name: left    | Name: right   | Name: tree                                                                                              |
+//  | Labels:        | Labels:        | Labels:        | Labels:       | Labels:       | Labels:       | Labels:                                                                                                 |
+//  | Type: []string | Type: []string | Type: []string | Type: []int32 | Type: []int32 | Type: []int32 | Type: []json.RawMessage                                                                                 |
+//  +----------------+----------------+----------------+---------------+---------------+---------------+---------------------------------------------------------------------------------------------------------+
+//  |                | Root           |                | 0             | 1             | 8             | []                                                                                                      |
+//  | A              | A              | /a/            | 1             | 2             | 5             | [{"guid":"GA","uid":"A","name":"A","slug":"/a/"}]                                                       |
+//  | AA             | AA             | /a/aa/         | 2             | 3             | 4             | [{"guid":"GA","uid":"A","name":"A","slug":"/a/"},{"guid":"GAA","uid":"AA","name":"AA","slug":"/a/aa/"}] |
+//  | B              | B              | /b/            | 1             | 6             | 7             | [{"guid":"GB","uid":"B","name":"B","slug":"/b/"}]                                                       |
+//  +----------------+----------------+----------------+---------------+---------------+---------------+---------------------------------------------------------------------------------------------------------+
 //  
 //  
 //  🌟 This was machine generated.  Do not edit. 🌟
@@ -115,6 +115,7 @@
             [],
             [
               {
+                "guid": "GA",
                 "uid": "A",
                 "name": "A",
                 "slug": "/a/"
@@ -122,11 +123,13 @@
             ],
             [
               {
+                "guid": "GA",
                 "uid": "A",
                 "name": "A",
                 "slug": "/a/"
               },
               {
+                "guid": "GAA",
                 "uid": "AA",
                 "name": "AA",
                 "slug": "/a/aa/"
@@ -134,6 +137,7 @@
             ],
             [
               {
+                "guid": "GB",
                 "uid": "B",
                 "name": "B",
                 "slug": "/b/"
diff --git a/pkg/services/store/entity/sqlstash/utils.go b/pkg/services/store/entity/sqlstash/utils.go
index b400a983e701f..5d2376fa1c3ab 100644
--- a/pkg/services/store/entity/sqlstash/utils.go
+++ b/pkg/services/store/entity/sqlstash/utils.go
@@ -5,7 +5,11 @@ import (
 	"encoding/hex"
 )
 
-func createContentsHash(contents []byte) string {
-	hash := md5.Sum(contents)
+func createContentsHash(body []byte, meta []byte, status []byte) string {
+	h := md5.New()
+	_, _ = h.Write(meta)
+	_, _ = h.Write(body)
+	_, _ = h.Write(status)
+	hash := h.Sum(nil)
 	return hex.EncodeToString(hash[:])
 }
diff --git a/pkg/services/store/entity/tests/common.go b/pkg/services/store/entity/tests/common.go
deleted file mode 100644
index a5f213a6002e0..0000000000000
--- a/pkg/services/store/entity/tests/common.go
+++ /dev/null
@@ -1,91 +0,0 @@
-package entity_server_tests
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-
-	"github.com/grafana/grafana/pkg/components/satokengen"
-	"github.com/grafana/grafana/pkg/infra/appcontext"
-	"github.com/grafana/grafana/pkg/server"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/services/org"
-	saAPI "github.com/grafana/grafana/pkg/services/serviceaccounts/api"
-	saTests "github.com/grafana/grafana/pkg/services/serviceaccounts/tests"
-	"github.com/grafana/grafana/pkg/services/store/entity"
-	"github.com/grafana/grafana/pkg/services/user"
-	"github.com/grafana/grafana/pkg/tests/testinfra"
-)
-
-func createServiceAccountAdminToken(t *testing.T, env *server.TestEnv) (string, *user.SignedInUser) {
-	t.Helper()
-
-	account := saTests.SetupUserServiceAccount(t, env.SQLStore, saTests.TestUser{
-		Name:             "grpc-server-sa",
-		Role:             string(org.RoleAdmin),
-		Login:            "grpc-server-sa",
-		IsServiceAccount: true,
-	})
-
-	keyGen, err := satokengen.New(saAPI.ServiceID)
-	require.NoError(t, err)
-
-	_ = saTests.SetupApiKey(t, env.SQLStore, saTests.TestApiKey{
-		Name:             "grpc-server-test",
-		Role:             org.RoleAdmin,
-		OrgId:            account.OrgID,
-		Key:              keyGen.HashedKey,
-		ServiceAccountID: &account.ID,
-	})
-
-	return keyGen.ClientSecret, &user.SignedInUser{
-		UserID:           account.ID,
-		Email:            account.Email,
-		Name:             account.Name,
-		Login:            account.Login,
-		OrgID:            account.OrgID,
-		IsServiceAccount: account.IsServiceAccount,
-	}
-}
-
-type testContext struct {
-	authToken string
-	client    entity.EntityStoreClient
-	user      *user.SignedInUser
-	ctx       context.Context
-}
-
-func createTestContext(t *testing.T) testContext {
-	t.Helper()
-
-	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
-		EnableFeatureToggles: []string{
-			featuremgmt.FlagGrpcServer,
-			featuremgmt.FlagEntityStore,
-		},
-		AppModeProduction: false,         // required for migrations to run
-		GRPCServerAddress: "127.0.0.1:0", // :0 for choosing the port automatically
-	})
-
-	_, env := testinfra.StartGrafanaEnv(t, dir, path)
-
-	authToken, serviceAccountUser := createServiceAccountAdminToken(t, env)
-
-	conn, err := grpc.Dial(
-		env.GRPCServer.GetAddress(),
-		grpc.WithTransportCredentials(insecure.NewCredentials()),
-	)
-	require.NoError(t, err)
-
-	client := entity.NewEntityStoreClient(conn)
-
-	return testContext{
-		authToken: authToken,
-		client:    client,
-		user:      serviceAccountUser,
-		ctx:       appcontext.WithUser(context.Background(), serviceAccountUser),
-	}
-}
diff --git a/pkg/services/store/entity/tests/common_test.go b/pkg/services/store/entity/tests/common_test.go
new file mode 100644
index 0000000000000..c9bf7fb8177be
--- /dev/null
+++ b/pkg/services/store/entity/tests/common_test.go
@@ -0,0 +1,99 @@
+package entity_server_tests
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/components/satokengen"
+	"github.com/grafana/grafana/pkg/infra/appcontext"
+	"github.com/grafana/grafana/pkg/server"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/org"
+	saAPI "github.com/grafana/grafana/pkg/services/serviceaccounts/api"
+	saTests "github.com/grafana/grafana/pkg/services/serviceaccounts/tests"
+	"github.com/grafana/grafana/pkg/services/store/entity"
+	"github.com/grafana/grafana/pkg/services/store/entity/db/dbimpl"
+	"github.com/grafana/grafana/pkg/services/store/entity/sqlstash"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
+)
+
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
+func createServiceAccountAdminToken(t *testing.T, env *server.TestEnv) (string, *user.SignedInUser) {
+	t.Helper()
+
+	account := saTests.SetupUserServiceAccount(t, env.SQLStore, saTests.TestUser{
+		Name:             "grpc-server-sa",
+		Role:             string(org.RoleAdmin),
+		Login:            "grpc-server-sa",
+		IsServiceAccount: true,
+	})
+
+	keyGen, err := satokengen.New(saAPI.ServiceID)
+	require.NoError(t, err)
+
+	_ = saTests.SetupApiKey(t, env.SQLStore, saTests.TestApiKey{
+		Name:             "grpc-server-test",
+		Role:             org.RoleAdmin,
+		OrgId:            account.OrgID,
+		Key:              keyGen.HashedKey,
+		ServiceAccountID: &account.ID,
+	})
+
+	return keyGen.ClientSecret, &user.SignedInUser{
+		UserID:           account.ID,
+		Email:            account.Email,
+		Name:             account.Name,
+		Login:            account.Login,
+		OrgID:            account.OrgID,
+		IsServiceAccount: account.IsServiceAccount,
+	}
+}
+
+type testContext struct {
+	authToken string
+	client    entity.EntityStoreClient
+	user      *user.SignedInUser
+	ctx       context.Context
+}
+
+func createTestContext(t *testing.T) testContext {
+	t.Helper()
+
+	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
+		EnableFeatureToggles: []string{
+			featuremgmt.FlagGrpcServer,
+			featuremgmt.FlagUnifiedStorage,
+		},
+		AppModeProduction: false,         // required for migrations to run
+		GRPCServerAddress: "127.0.0.1:0", // :0 for choosing the port automatically
+	})
+
+	_, env := testinfra.StartGrafanaEnv(t, dir, path)
+
+	authToken, serviceAccountUser := createServiceAccountAdminToken(t, env)
+
+	eDB, err := dbimpl.ProvideEntityDB(env.SQLStore, env.SQLStore.Cfg, env.FeatureToggles)
+	require.NoError(t, err)
+
+	err = eDB.Init()
+	require.NoError(t, err)
+
+	store, err := sqlstash.ProvideSQLEntityServer(eDB)
+	require.NoError(t, err)
+
+	client := entity.NewEntityStoreClientLocal(store)
+
+	return testContext{
+		authToken: authToken,
+		client:    client,
+		user:      serviceAccountUser,
+		ctx:       appcontext.WithUser(context.Background(), serviceAccountUser),
+	}
+}
diff --git a/pkg/services/store/entity/tests/server_integration_test.go b/pkg/services/store/entity/tests/server_integration_test.go
index b6c365e9ad2d9..44eec13b40142 100644
--- a/pkg/services/store/entity/tests/server_integration_test.go
+++ b/pkg/services/store/entity/tests/server_integration_test.go
@@ -9,12 +9,10 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc/metadata"
 
-	"github.com/grafana/grafana/pkg/infra/grn"
+	"github.com/grafana/grafana/pkg/infra/appcontext"
 	"github.com/grafana/grafana/pkg/services/store"
 	"github.com/grafana/grafana/pkg/services/store/entity"
-	"github.com/grafana/grafana/pkg/util"
 )
 
 var (
@@ -25,19 +23,19 @@ var (
 )
 
 type rawEntityMatcher struct {
-	grn          *grn.GRN
+	key          string
 	createdRange []time.Time
 	updatedRange []time.Time
 	createdBy    string
 	updatedBy    string
 	body         []byte
-	version      *string
+	version      int64
 }
 
 type objectVersionMatcher struct {
 	updatedRange []time.Time
 	updatedBy    string
-	version      *string
+	version      int64
 	etag         *string
 	comment      *string
 }
@@ -53,16 +51,8 @@ func requireEntityMatch(t *testing.T, obj *entity.Entity, m rawEntityMatcher) {
 	require.NotNil(t, obj)
 
 	mismatches := ""
-	if m.grn != nil {
-		if m.grn.TenantID > 0 && m.grn.TenantID != obj.GRN.TenantID {
-			mismatches += fmt.Sprintf("expected tenant: %d, actual: %d\n", m.grn.TenantID, obj.GRN.TenantID)
-		}
-		if m.grn.ResourceKind != "" && m.grn.ResourceKind != obj.GRN.ResourceKind {
-			mismatches += fmt.Sprintf("expected ResourceKind: %s, actual: %s\n", m.grn.ResourceKind, obj.GRN.ResourceKind)
-		}
-		if m.grn.ResourceIdentifier != "" && m.grn.ResourceIdentifier != obj.GRN.ResourceIdentifier {
-			mismatches += fmt.Sprintf("expected ResourceIdentifier: %s, actual: %s\n", m.grn.ResourceIdentifier, obj.GRN.ResourceIdentifier)
-		}
+	if m.key != "" && m.key != obj.Key {
+		mismatches += fmt.Sprintf("expected key: %s, actual: %s\n", m.key, obj.Key)
 	}
 
 	if len(m.createdRange) == 2 && !timestampInRange(obj.CreatedAt, m.createdRange) {
@@ -74,11 +64,11 @@ func requireEntityMatch(t *testing.T, obj *entity.Entity, m rawEntityMatcher) {
 	}
 
 	if m.createdBy != "" && m.createdBy != obj.CreatedBy {
-		mismatches += fmt.Sprintf("createdBy: expected:%s, found:%s\n", m.createdBy, obj.CreatedBy)
+		mismatches += fmt.Sprintf("createdBy: expected: '%s', found: '%s'\n", m.createdBy, obj.CreatedBy)
 	}
 
 	if m.updatedBy != "" && m.updatedBy != obj.UpdatedBy {
-		mismatches += fmt.Sprintf("updatedBy: expected:%s, found:%s\n", m.updatedBy, obj.UpdatedBy)
+		mismatches += fmt.Sprintf("updatedBy: expected: '%s', found: '%s'\n", m.updatedBy, obj.UpdatedBy)
 	}
 
 	if len(m.body) > 0 {
@@ -89,14 +79,14 @@ func requireEntityMatch(t *testing.T, obj *entity.Entity, m rawEntityMatcher) {
 		}
 	}
 
-	if m.version != nil && *m.version != obj.Version {
-		mismatches += fmt.Sprintf("expected version: %s, actual version: %s\n", *m.version, obj.Version)
+	if m.version != 0 && m.version != obj.ResourceVersion {
+		mismatches += fmt.Sprintf("expected version: %d, actual version: %d\n", m.version, obj.ResourceVersion)
 	}
 
 	require.True(t, len(mismatches) == 0, mismatches)
 }
 
-func requireVersionMatch(t *testing.T, obj *entity.EntityVersionInfo, m objectVersionMatcher) {
+func requireVersionMatch(t *testing.T, obj *entity.Entity, m objectVersionMatcher) {
 	t.Helper()
 	mismatches := ""
 
@@ -109,20 +99,20 @@ func requireVersionMatch(t *testing.T, obj *entity.EntityVersionInfo, m objectVe
 	}
 
 	if m.updatedBy != "" && m.updatedBy != obj.UpdatedBy {
-		mismatches += fmt.Sprintf("updatedBy: expected:%s, found:%s\n", m.updatedBy, obj.UpdatedBy)
+		mismatches += fmt.Sprintf("updatedBy: expected: '%s', found: '%s'\n", m.updatedBy, obj.UpdatedBy)
 	}
 
-	if m.version != nil && *m.version != obj.Version {
-		mismatches += fmt.Sprintf("expected version: %s, actual version: %s\n", *m.version, obj.Version)
+	if m.version != 0 && m.version != obj.ResourceVersion {
+		mismatches += fmt.Sprintf("expected version: %d, actual version: %d\n", m.version, obj.ResourceVersion)
 	}
 
 	require.True(t, len(mismatches) == 0, mismatches)
 }
 
 func TestIntegrationEntityServer(t *testing.T) {
+	// TODO figure out why this still runs into sqlite database locked error
 	if true {
-		// FIXME
-		t.Skip()
+		t.Skip("skipping integration test")
 	}
 
 	if testing.Short() {
@@ -130,351 +120,448 @@ func TestIntegrationEntityServer(t *testing.T) {
 	}
 
 	testCtx := createTestContext(t)
-	ctx := metadata.AppendToOutgoingContext(testCtx.ctx, "authorization", fmt.Sprintf("Bearer %s", testCtx.authToken))
+	ctx := appcontext.WithUser(testCtx.ctx, testCtx.user)
 
 	fakeUser := store.GetUserIDString(testCtx.user)
-	firstVersion := "1"
-	kind := entity.StandardKindJSONObj
-	testGrn := &grn.GRN{
-		ResourceKind:       kind,
-		ResourceIdentifier: "my-test-entity",
-	}
+	firstVersion := int64(0)
+	group := "test.grafana.app"
+	resource := "jsonobjs"
+	resource2 := "playlists"
+	namespace := "default"
+	name := "my-test-entity"
+	testKey := "/" + group + "/" + resource + "/" + namespace + "/" + name
+	testKey2 := "/" + group + "/" + resource2 + "/" + namespace + "/" + name
 	body := []byte("{\"name\":\"John\"}")
 
 	t.Run("should not retrieve non-existent objects", func(t *testing.T) {
 		resp, err := testCtx.client.Read(ctx, &entity.ReadEntityRequest{
-			GRN: testGrn,
+			Key: testKey,
 		})
 		require.NoError(t, err)
 
 		require.NotNil(t, resp)
-		require.Nil(t, resp.GRN)
+		require.Empty(t, resp.Key)
 	})
 
 	t.Run("should be able to read persisted objects", func(t *testing.T) {
 		before := time.Now()
-		writeReq := &entity.WriteEntityRequest{
-			GRN:     testGrn,
-			Body:    body,
-			Comment: "first entity!",
+		createReq := &entity.CreateEntityRequest{
+			Entity: &entity.Entity{
+				Key:       testKey,
+				Group:     group,
+				Resource:  resource,
+				Namespace: namespace,
+				Name:      name,
+				Body:      body,
+				Message:   "first entity!",
+			},
 		}
-		writeResp, err := testCtx.client.Write(ctx, writeReq)
+		createResp, err := testCtx.client.Create(ctx, createReq)
 		require.NoError(t, err)
 
+		// clean up in case test fails
+		t.Cleanup(func() {
+			_, _ = testCtx.client.Delete(ctx, &entity.DeleteEntityRequest{
+				Key: testKey,
+			})
+		})
+
 		versionMatcher := objectVersionMatcher{
-			updatedRange: []time.Time{before, time.Now()},
-			updatedBy:    fakeUser,
-			version:      &firstVersion,
-			comment:      &writeReq.Comment,
+			// updatedRange: []time.Time{before, time.Now()},
+			// updatedBy:    fakeUser,
+			version: firstVersion,
+			comment: &createReq.Entity.Message,
 		}
-		requireVersionMatch(t, writeResp.Entity, versionMatcher)
+		requireVersionMatch(t, createResp.Entity, versionMatcher)
 
 		readResp, err := testCtx.client.Read(ctx, &entity.ReadEntityRequest{
-			GRN:      testGrn,
-			Version:  "",
-			WithBody: true,
+			Key:             testKey,
+			ResourceVersion: 0,
+			WithBody:        true,
 		})
 		require.NoError(t, err)
-		require.Nil(t, readResp.SummaryJson)
 		require.NotNil(t, readResp)
 
-		foundGRN := readResp.GRN
-		require.NotNil(t, foundGRN)
-		require.Equal(t, testCtx.user.OrgID, foundGRN.TenantID) // orgId becomes the tenant id when not set
-		require.Equal(t, testGrn.ResourceKind, foundGRN.ResourceKind)
-		require.Equal(t, testGrn.ResourceIdentifier, foundGRN.ResourceIdentifier)
+		require.Equal(t, testKey, readResp.Key)
+		require.Equal(t, namespace, readResp.Namespace) // orgId becomes the tenant id when not set
+		require.Equal(t, resource, readResp.Resource)
+		require.Equal(t, name, readResp.Name)
 
 		objectMatcher := rawEntityMatcher{
-			grn:          testGrn,
+			key:          testKey,
 			createdRange: []time.Time{before, time.Now()},
-			updatedRange: []time.Time{before, time.Now()},
-			createdBy:    fakeUser,
-			updatedBy:    fakeUser,
-			body:         body,
-			version:      &firstVersion,
+			// updatedRange: []time.Time{before, time.Now()},
+			createdBy: fakeUser,
+			// updatedBy:    fakeUser,
+			body:    body,
+			version: firstVersion,
 		}
 		requireEntityMatch(t, readResp, objectMatcher)
 
 		deleteResp, err := testCtx.client.Delete(ctx, &entity.DeleteEntityRequest{
-			GRN:             testGrn,
-			PreviousVersion: writeResp.Entity.Version,
+			Key:             testKey,
+			PreviousVersion: readResp.ResourceVersion,
 		})
 		require.NoError(t, err)
-		require.True(t, deleteResp.OK)
+		require.Equal(t, deleteResp.Status, entity.DeleteEntityResponse_DELETED)
 
 		readRespAfterDelete, err := testCtx.client.Read(ctx, &entity.ReadEntityRequest{
-			GRN:      testGrn,
-			Version:  "",
-			WithBody: true,
+			Key:             testKey,
+			ResourceVersion: 0,
+			WithBody:        true,
 		})
 		require.NoError(t, err)
-		require.Nil(t, readRespAfterDelete.GRN)
+		require.Empty(t, readRespAfterDelete.Key)
 	})
 
 	t.Run("should be able to update an object", func(t *testing.T) {
 		before := time.Now()
-		testGrn := &grn.GRN{
-			ResourceKind:       kind,
-			ResourceIdentifier: util.GenerateShortUID(),
-		}
 
-		writeReq1 := &entity.WriteEntityRequest{
-			GRN:     testGrn,
-			Body:    body,
-			Comment: "first entity!",
+		createReq := &entity.CreateEntityRequest{
+			Entity: &entity.Entity{
+				Key:       testKey,
+				Group:     group,
+				Resource:  resource,
+				Namespace: namespace,
+				Name:      name,
+				Body:      body,
+				Message:   "first entity!",
+			},
 		}
-		writeResp1, err := testCtx.client.Write(ctx, writeReq1)
+		createResp, err := testCtx.client.Create(ctx, createReq)
 		require.NoError(t, err)
-		require.Equal(t, entity.WriteEntityResponse_CREATED, writeResp1.Status)
+
+		// clean up in case test fails
+		t.Cleanup(func() {
+			_, _ = testCtx.client.Delete(ctx, &entity.DeleteEntityRequest{
+				Key: testKey,
+			})
+		})
+
+		require.Equal(t, entity.CreateEntityResponse_CREATED, createResp.Status)
 
 		body2 := []byte("{\"name\":\"John2\"}")
 
-		writeReq2 := &entity.WriteEntityRequest{
-			GRN:     testGrn,
-			Body:    body2,
-			Comment: "update1",
+		updateReq := &entity.UpdateEntityRequest{
+			Entity: &entity.Entity{
+				Key:     testKey,
+				Body:    body2,
+				Message: "update1",
+			},
 		}
-		writeResp2, err := testCtx.client.Write(ctx, writeReq2)
+		updateResp, err := testCtx.client.Update(ctx, updateReq)
 		require.NoError(t, err)
-		require.NotEqual(t, writeResp1.Entity.Version, writeResp2.Entity.Version)
+		require.NotEqual(t, createResp.Entity.ResourceVersion, updateResp.Entity.ResourceVersion)
 
 		// Duplicate write (no change)
-		writeDupRsp, err := testCtx.client.Write(ctx, writeReq2)
-		require.NoError(t, err)
-		require.Nil(t, writeDupRsp.Error)
-		require.Equal(t, entity.WriteEntityResponse_UNCHANGED, writeDupRsp.Status)
-		require.Equal(t, writeResp2.Entity.Version, writeDupRsp.Entity.Version)
-		require.Equal(t, writeResp2.Entity.ETag, writeDupRsp.Entity.ETag)
+		/*
+			writeDupRsp, err := testCtx.client.Update(ctx, updateReq)
+			require.NoError(t, err)
+			require.Nil(t, writeDupRsp.Error)
+			require.Equal(t, entity.UpdateEntityResponse_UNCHANGED, writeDupRsp.Status)
+			require.Equal(t, updateResp.Entity.ResourceVersion, writeDupRsp.Entity.ResourceVersion)
+			require.Equal(t, updateResp.Entity.ETag, writeDupRsp.Entity.ETag)
+		*/
 
 		body3 := []byte("{\"name\":\"John3\"}")
-		writeReq3 := &entity.WriteEntityRequest{
-			GRN:     testGrn,
-			Body:    body3,
-			Comment: "update3",
+		writeReq3 := &entity.UpdateEntityRequest{
+			Entity: &entity.Entity{
+				Key:     testKey,
+				Body:    body3,
+				Message: "update3",
+			},
 		}
-		writeResp3, err := testCtx.client.Write(ctx, writeReq3)
+		writeResp3, err := testCtx.client.Update(ctx, writeReq3)
 		require.NoError(t, err)
-		require.NotEqual(t, writeResp3.Entity.Version, writeResp2.Entity.Version)
+		require.Equal(t, entity.UpdateEntityResponse_UPDATED, writeResp3.Status)
+		require.NotEqual(t, writeResp3.Entity.ResourceVersion, updateResp.Entity.ResourceVersion)
 
 		latestMatcher := rawEntityMatcher{
-			grn:          testGrn,
+			key:          testKey,
 			createdRange: []time.Time{before, time.Now()},
 			updatedRange: []time.Time{before, time.Now()},
 			createdBy:    fakeUser,
 			updatedBy:    fakeUser,
 			body:         body3,
-			version:      &writeResp3.Entity.Version,
+			version:      writeResp3.Entity.ResourceVersion,
 		}
 		readRespLatest, err := testCtx.client.Read(ctx, &entity.ReadEntityRequest{
-			GRN:      testGrn,
-			Version:  "", // latest
-			WithBody: true,
+			Key:             testKey,
+			ResourceVersion: 0, // latest
+			WithBody:        true,
 		})
 		require.NoError(t, err)
-		require.Nil(t, readRespLatest.SummaryJson)
 		requireEntityMatch(t, readRespLatest, latestMatcher)
 
 		readRespFirstVer, err := testCtx.client.Read(ctx, &entity.ReadEntityRequest{
-			GRN:      testGrn,
-			Version:  writeResp1.Entity.Version,
-			WithBody: true,
+			Key:             testKey,
+			ResourceVersion: createResp.Entity.ResourceVersion,
+			WithBody:        true,
 		})
 
 		require.NoError(t, err)
-		require.Nil(t, readRespFirstVer.SummaryJson)
 		require.NotNil(t, readRespFirstVer)
 		requireEntityMatch(t, readRespFirstVer, rawEntityMatcher{
-			grn:          testGrn,
+			key:          testKey,
 			createdRange: []time.Time{before, time.Now()},
-			updatedRange: []time.Time{before, time.Now()},
 			createdBy:    fakeUser,
-			updatedBy:    fakeUser,
 			body:         body,
-			version:      &firstVersion,
+			version:      0,
 		})
 
 		history, err := testCtx.client.History(ctx, &entity.EntityHistoryRequest{
-			GRN: testGrn,
+			Key: testKey,
 		})
 		require.NoError(t, err)
-		require.Equal(t, []*entity.EntityVersionInfo{
+		require.Equal(t, []*entity.Entity{
 			writeResp3.Entity,
-			writeResp2.Entity,
-			writeResp1.Entity,
+			updateResp.Entity,
+			createResp.Entity,
 		}, history.Versions)
 
 		deleteResp, err := testCtx.client.Delete(ctx, &entity.DeleteEntityRequest{
-			GRN:             testGrn,
-			PreviousVersion: writeResp3.Entity.Version,
+			Key:             testKey,
+			PreviousVersion: writeResp3.Entity.ResourceVersion,
 		})
 		require.NoError(t, err)
-		require.True(t, deleteResp.OK)
+		require.Equal(t, deleteResp.Status, entity.DeleteEntityResponse_DELETED)
 	})
 
-	t.Run("should be able to search for objects", func(t *testing.T) {
-		uid2 := "uid2"
-		uid3 := "uid3"
-		uid4 := "uid4"
-		kind2 := entity.StandardKindPlaylist
-		w1, err := testCtx.client.Write(ctx, &entity.WriteEntityRequest{
-			GRN:  testGrn,
-			Body: body,
+	t.Run("should be able to list objects", func(t *testing.T) {
+		w1, err := testCtx.client.Create(ctx, &entity.CreateEntityRequest{
+			Entity: &entity.Entity{
+				Key:  testKey + "1",
+				Body: body,
+			},
 		})
 		require.NoError(t, err)
 
-		w2, err := testCtx.client.Write(ctx, &entity.WriteEntityRequest{
-			GRN: &grn.GRN{
-				ResourceIdentifier: uid2,
-				ResourceKind:       kind,
+		w2, err := testCtx.client.Create(ctx, &entity.CreateEntityRequest{
+			Entity: &entity.Entity{
+				Key:  testKey + "2",
+				Body: body,
 			},
-			Body: body,
 		})
 		require.NoError(t, err)
 
-		w3, err := testCtx.client.Write(ctx, &entity.WriteEntityRequest{
-			GRN: &grn.GRN{
-				ResourceIdentifier: uid3,
-				ResourceKind:       kind2,
+		w3, err := testCtx.client.Create(ctx, &entity.CreateEntityRequest{
+			Entity: &entity.Entity{
+				Key:  testKey2 + "3",
+				Body: body,
 			},
-			Body: body,
 		})
 		require.NoError(t, err)
 
-		w4, err := testCtx.client.Write(ctx, &entity.WriteEntityRequest{
-			GRN: &grn.GRN{
-				ResourceIdentifier: uid4,
-				ResourceKind:       kind2,
+		w4, err := testCtx.client.Create(ctx, &entity.CreateEntityRequest{
+			Entity: &entity.Entity{
+				Key:  testKey2 + "4",
+				Body: body,
 			},
-			Body: body,
 		})
 		require.NoError(t, err)
 
-		search, err := testCtx.client.Search(ctx, &entity.EntitySearchRequest{
-			Kind:     []string{kind, kind2},
+		resp, err := testCtx.client.List(ctx, &entity.EntityListRequest{
+			Resource: []string{resource, resource2},
 			WithBody: false,
 		})
 		require.NoError(t, err)
 
-		require.NotNil(t, search)
-		uids := make([]string, 0, len(search.Results))
-		kinds := make([]string, 0, len(search.Results))
-		version := make([]string, 0, len(search.Results))
-		for _, res := range search.Results {
-			uids = append(uids, res.GRN.ResourceIdentifier)
-			kinds = append(kinds, res.GRN.ResourceKind)
-			version = append(version, res.Version)
+		require.NotNil(t, resp)
+		names := make([]string, 0, len(resp.Results))
+		kinds := make([]string, 0, len(resp.Results))
+		version := make([]int64, 0, len(resp.Results))
+		for _, res := range resp.Results {
+			names = append(names, res.Name)
+			kinds = append(kinds, res.Resource)
+			version = append(version, res.ResourceVersion)
 		}
-		require.Equal(t, []string{"my-test-entity", "uid2", "uid3", "uid4"}, uids)
-		require.Equal(t, []string{"jsonobj", "jsonobj", "playlist", "playlist"}, kinds)
-		require.Equal(t, []string{
-			w1.Entity.Version,
-			w2.Entity.Version,
-			w3.Entity.Version,
-			w4.Entity.Version,
+
+		// default sort is by guid, so we ignore order
+		require.ElementsMatch(t, []string{"my-test-entity1", "my-test-entity2", "my-test-entity3", "my-test-entity4"}, names)
+		require.ElementsMatch(t, []string{"jsonobjs", "jsonobjs", "playlists", "playlists"}, kinds)
+		require.ElementsMatch(t, []int64{
+			w1.Entity.ResourceVersion,
+			w2.Entity.ResourceVersion,
+			w3.Entity.ResourceVersion,
+			w4.Entity.ResourceVersion,
 		}, version)
 
+		// sorted by name
+		resp, err = testCtx.client.List(ctx, &entity.EntityListRequest{
+			Resource: []string{resource, resource2},
+			WithBody: false,
+			Sort:     []string{"name"},
+		})
+		require.NoError(t, err)
+
+		require.NotNil(t, resp)
+		require.Equal(t, 4, len(resp.Results))
+
+		require.Equal(t, "my-test-entity1", resp.Results[0].Name)
+		require.Equal(t, "my-test-entity2", resp.Results[1].Name)
+		require.Equal(t, "my-test-entity3", resp.Results[2].Name)
+		require.Equal(t, "my-test-entity4", resp.Results[3].Name)
+
+		require.Equal(t, "jsonobjs", resp.Results[0].Resource)
+		require.Equal(t, "jsonobjs", resp.Results[1].Resource)
+		require.Equal(t, "playlists", resp.Results[2].Resource)
+		require.Equal(t, "playlists", resp.Results[3].Resource)
+
+		// sorted by name desc
+		resp, err = testCtx.client.List(ctx, &entity.EntityListRequest{
+			Resource: []string{resource, resource2},
+			WithBody: false,
+			Sort:     []string{"name_desc"},
+		})
+		require.NoError(t, err)
+
+		require.NotNil(t, resp)
+		require.Equal(t, 4, len(resp.Results))
+
+		require.Equal(t, "my-test-entity1", resp.Results[3].Name)
+		require.Equal(t, "my-test-entity2", resp.Results[2].Name)
+		require.Equal(t, "my-test-entity3", resp.Results[1].Name)
+		require.Equal(t, "my-test-entity4", resp.Results[0].Name)
+
+		require.Equal(t, "jsonobjs", resp.Results[3].Resource)
+		require.Equal(t, "jsonobjs", resp.Results[2].Resource)
+		require.Equal(t, "playlists", resp.Results[1].Resource)
+		require.Equal(t, "playlists", resp.Results[0].Resource)
+
+		// with limit
+		resp, err = testCtx.client.List(ctx, &entity.EntityListRequest{
+			Resource: []string{resource, resource2},
+			WithBody: false,
+			Limit:    2,
+			Sort:     []string{"name"},
+		})
+		require.NoError(t, err)
+
+		require.NotNil(t, resp)
+		require.Equal(t, 2, len(resp.Results))
+
+		require.Equal(t, "my-test-entity1", resp.Results[0].Name)
+		require.Equal(t, "my-test-entity2", resp.Results[1].Name)
+
+		// with limit & continue
+		resp, err = testCtx.client.List(ctx, &entity.EntityListRequest{
+			Resource:      []string{resource, resource2},
+			WithBody:      false,
+			Limit:         2,
+			NextPageToken: resp.NextPageToken,
+			Sort:          []string{"name"},
+		})
+		require.NoError(t, err)
+
+		require.NotNil(t, resp)
+		require.Equal(t, 2, len(resp.Results))
+
+		require.Equal(t, "my-test-entity3", resp.Results[0].Name)
+		require.Equal(t, "my-test-entity4", resp.Results[1].Name)
+
 		// Again with only one kind
-		searchKind1, err := testCtx.client.Search(ctx, &entity.EntitySearchRequest{
-			Kind: []string{kind},
+		respKind1, err := testCtx.client.List(ctx, &entity.EntityListRequest{
+			Resource: []string{resource},
+			Sort:     []string{"name"},
 		})
 		require.NoError(t, err)
-		uids = make([]string, 0, len(searchKind1.Results))
-		kinds = make([]string, 0, len(searchKind1.Results))
-		version = make([]string, 0, len(searchKind1.Results))
-		for _, res := range searchKind1.Results {
-			uids = append(uids, res.GRN.ResourceIdentifier)
-			kinds = append(kinds, res.GRN.ResourceKind)
-			version = append(version, res.Version)
+		names = make([]string, 0, len(respKind1.Results))
+		kinds = make([]string, 0, len(respKind1.Results))
+		version = make([]int64, 0, len(respKind1.Results))
+		for _, res := range respKind1.Results {
+			names = append(names, res.Name)
+			kinds = append(kinds, res.Resource)
+			version = append(version, res.ResourceVersion)
 		}
-		require.Equal(t, []string{"my-test-entity", "uid2"}, uids)
-		require.Equal(t, []string{"jsonobj", "jsonobj"}, kinds)
-		require.Equal(t, []string{
-			w1.Entity.Version,
-			w2.Entity.Version,
+		require.Equal(t, []string{"my-test-entity1", "my-test-entity2"}, names)
+		require.Equal(t, []string{"jsonobjs", "jsonobjs"}, kinds)
+		require.Equal(t, []int64{
+			w1.Entity.ResourceVersion,
+			w2.Entity.ResourceVersion,
 		}, version)
 	})
 
 	t.Run("should be able to filter objects based on their labels", func(t *testing.T) {
-		kind := entity.StandardKindDashboard
-		_, err := testCtx.client.Write(ctx, &entity.WriteEntityRequest{
-			GRN: &grn.GRN{
-				ResourceKind:       kind,
-				ResourceIdentifier: "blue-green",
+		_, err := testCtx.client.Create(ctx, &entity.CreateEntityRequest{
+			Entity: &entity.Entity{
+				Key:  "/dashboards.grafana.app/dashboards/default/blue-green",
+				Body: []byte(dashboardWithTagsBlueGreen),
+				Labels: map[string]string{
+					"blue":  "",
+					"green": "",
+				},
 			},
-			Body: []byte(dashboardWithTagsBlueGreen),
 		})
 		require.NoError(t, err)
 
-		_, err = testCtx.client.Write(ctx, &entity.WriteEntityRequest{
-			GRN: &grn.GRN{
-				ResourceKind:       kind,
-				ResourceIdentifier: "red-green",
+		_, err = testCtx.client.Create(ctx, &entity.CreateEntityRequest{
+			Entity: &entity.Entity{
+				Key:  "/dashboards.grafana.app/dashboards/default/red-green",
+				Body: []byte(dashboardWithTagsRedGreen),
+				Labels: map[string]string{
+					"red":   "",
+					"green": "",
+				},
 			},
-			Body: []byte(dashboardWithTagsRedGreen),
 		})
 		require.NoError(t, err)
 
-		search, err := testCtx.client.Search(ctx, &entity.EntitySearchRequest{
-			Kind:       []string{kind},
-			WithBody:   false,
-			WithLabels: true,
+		resp, err := testCtx.client.List(ctx, &entity.EntityListRequest{
+			Key:      []string{"/dashboards.grafana.app/dashboards/default"},
+			WithBody: false,
 			Labels: map[string]string{
 				"red": "",
 			},
 		})
 		require.NoError(t, err)
-		require.NotNil(t, search)
-		require.Len(t, search.Results, 1)
-		require.Equal(t, search.Results[0].GRN.ResourceIdentifier, "red-green")
-
-		search, err = testCtx.client.Search(ctx, &entity.EntitySearchRequest{
-			Kind:       []string{kind},
-			WithBody:   false,
-			WithLabels: true,
+		require.NotNil(t, resp)
+		require.Len(t, resp.Results, 1)
+		require.Equal(t, resp.Results[0].Name, "red-green")
+
+		resp, err = testCtx.client.List(ctx, &entity.EntityListRequest{
+			Key:      []string{"/dashboards.grafana.app/dashboards/default"},
+			WithBody: false,
 			Labels: map[string]string{
 				"red":   "",
 				"green": "",
 			},
 		})
 		require.NoError(t, err)
-		require.NotNil(t, search)
-		require.Len(t, search.Results, 1)
-		require.Equal(t, search.Results[0].GRN.ResourceIdentifier, "red-green")
-
-		search, err = testCtx.client.Search(ctx, &entity.EntitySearchRequest{
-			Kind:       []string{kind},
-			WithBody:   false,
-			WithLabels: true,
+		require.NotNil(t, resp)
+		require.Len(t, resp.Results, 1)
+		require.Equal(t, resp.Results[0].Name, "red-green")
+
+		resp, err = testCtx.client.List(ctx, &entity.EntityListRequest{
+			Key:      []string{"/dashboards.grafana.app/dashboards/default"},
+			WithBody: false,
 			Labels: map[string]string{
 				"red": "invalid",
 			},
 		})
 		require.NoError(t, err)
-		require.NotNil(t, search)
-		require.Len(t, search.Results, 0)
+		require.NotNil(t, resp)
+		require.Len(t, resp.Results, 0)
 
-		search, err = testCtx.client.Search(ctx, &entity.EntitySearchRequest{
-			Kind:       []string{kind},
-			WithBody:   false,
-			WithLabels: true,
+		resp, err = testCtx.client.List(ctx, &entity.EntityListRequest{
+			Key:      []string{"/dashboards.grafana.app/dashboards/default"},
+			WithBody: false,
 			Labels: map[string]string{
 				"green": "",
 			},
 		})
 		require.NoError(t, err)
-		require.NotNil(t, search)
-		require.Len(t, search.Results, 2)
+		require.NotNil(t, resp)
+		require.Len(t, resp.Results, 2)
 
-		search, err = testCtx.client.Search(ctx, &entity.EntitySearchRequest{
-			Kind:       []string{kind},
-			WithBody:   false,
-			WithLabels: true,
+		resp, err = testCtx.client.List(ctx, &entity.EntityListRequest{
+			Key:      []string{"/dashboards.grafana.app/dashboards/default"},
+			WithBody: false,
 			Labels: map[string]string{
 				"yellow": "",
 			},
 		})
 		require.NoError(t, err)
-		require.NotNil(t, search)
-		require.Len(t, search.Results, 0)
+		require.NotNil(t, resp)
+		require.Len(t, resp.Results, 0)
 	})
 }
diff --git a/pkg/services/store/entity/utils.go b/pkg/services/store/entity/utils.go
deleted file mode 100644
index 4da3628690689..0000000000000
--- a/pkg/services/store/entity/utils.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package entity
-
-// The admin request is a superset of write request features
-func ToAdminWriteEntityRequest(req *WriteEntityRequest) *AdminWriteEntityRequest {
-	return &AdminWriteEntityRequest{
-		GRN:             req.GRN,
-		Body:            req.Body,
-		Folder:          req.Folder,
-		Comment:         req.Comment,
-		PreviousVersion: req.PreviousVersion,
-	}
-}
diff --git a/pkg/services/store/entity_events.go b/pkg/services/store/entity_events.go
index 6dd2b03a186f5..0d5030c3c6b5a 100644
--- a/pkg/services/store/entity_events.go
+++ b/pkg/services/store/entity_events.go
@@ -70,7 +70,7 @@ type EntityEventsService interface {
 }
 
 func ProvideEntityEventsService(cfg *setting.Cfg, sqlStore db.DB, features featuremgmt.FeatureToggles) EntityEventsService {
-	if !features.IsEnabled(featuremgmt.FlagPanelTitleSearch) {
+	if !features.IsEnabledGlobally(featuremgmt.FlagPanelTitleSearch) {
 		return &dummyEntityEventsService{}
 	}
 
diff --git a/pkg/services/store/github_helper.go b/pkg/services/store/github_helper.go
deleted file mode 100644
index 12b8e0ba9cb9c..0000000000000
--- a/pkg/services/store/github_helper.go
+++ /dev/null
@@ -1,182 +0,0 @@
-package store
-
-import (
-	"context"
-	"fmt"
-	"net/url"
-	"strings"
-	"time"
-
-	"github.com/google/go-github/v45/github"
-	"golang.org/x/oauth2"
-)
-
-type githubHelper struct {
-	repoOwner string
-	repoName  string
-	client    *github.Client
-}
-
-func newGithubHelper(ctx context.Context, uri string, token string) (*githubHelper, error) {
-	v, err := url.Parse(uri)
-	if err != nil {
-		return nil, err
-	}
-
-	path := strings.TrimPrefix(v.Path, "/")
-	path = strings.TrimSuffix(path, ".git")
-	idx := strings.Index(path, "/")
-	if idx < 1 {
-		return nil, fmt.Errorf("invalid url")
-	}
-
-	if token == "" {
-		return nil, fmt.Errorf("unauthorized: No token present")
-	}
-	ts := oauth2.StaticTokenSource(&oauth2.Token{AccessToken: token})
-	tc := oauth2.NewClient(ctx, ts)
-	return &githubHelper{
-		client:    github.NewClient(tc),
-		repoOwner: path[:idx],
-		repoName:  path[idx+1:],
-	}, nil
-}
-
-func (g *githubHelper) getRef(ctx context.Context, branch string) (*github.Reference, *github.Response, error) {
-	return g.client.Git.GetRef(ctx, g.repoOwner, g.repoName, "refs/heads/"+branch)
-}
-
-func (g *githubHelper) createRef(ctx context.Context, base string, branch string) (ref *github.Reference, rsp *github.Response, err error) {
-	var baseRef *github.Reference
-	if baseRef, rsp, err = g.client.Git.GetRef(ctx, g.repoOwner, g.repoName, "refs/heads/"+base); err != nil {
-		return nil, rsp, err
-	}
-	newRef := &github.Reference{
-		Ref:    github.String("refs/heads/" + branch),
-		Object: &github.GitObject{SHA: baseRef.Object.SHA},
-	}
-	return g.client.Git.CreateRef(ctx, g.repoOwner, g.repoName, newRef)
-}
-
-func (g *githubHelper) getRepo(ctx context.Context) (*github.Repository, *github.Response, error) {
-	return g.client.Repositories.Get(ctx, g.repoOwner, g.repoName)
-}
-
-// pushCommit creates the commit in the given reference using the given tree.
-func (g *githubHelper) pushCommit(ctx context.Context, ref *github.Reference, cmd *WriteValueRequest) (err error) {
-	// Create a tree with what to commit.
-	entries := []*github.TreeEntry{
-		{
-			Path:    github.String(cmd.Path),
-			Type:    github.String("blob"),
-			Content: github.String(string(cmd.Body)),
-			Mode:    github.String("100644"),
-		},
-	}
-
-	tree, _, err := g.client.Git.CreateTree(ctx, g.repoOwner, g.repoName, *ref.Object.SHA, entries)
-	if err != nil {
-		return err
-	}
-
-	// Get the parent commit to attach the commit to.
-	parent, _, err := g.client.Repositories.GetCommit(ctx, g.repoOwner, g.repoName, *ref.Object.SHA, nil)
-	if err != nil {
-		return err
-	}
-
-	// This is not always populated, but is needed.
-	parent.Commit.SHA = parent.SHA
-
-	user := cmd.User
-	name := firstRealString(user.Name, user.Login, user.Email, "?")
-	email := firstRealString(user.Email, user.Login, user.Name, "?")
-
-	// Create the commit using the tree.
-	date := time.Now()
-	author := &github.CommitAuthor{
-		Date:  &date,
-		Name:  &name,
-		Email: &email,
-	}
-	commit := &github.Commit{Author: author, Message: &cmd.Message, Tree: tree, Parents: []*github.Commit{parent.Commit}}
-	newCommit, _, err := g.client.Git.CreateCommit(ctx, g.repoOwner, g.repoName, commit)
-	if err != nil {
-		return err
-	}
-
-	// Attach the commit to the main branch.
-	ref.Object.SHA = newCommit.SHA
-	_, _, err = g.client.Git.UpdateRef(ctx, g.repoOwner, g.repoName, ref, false)
-	return err
-}
-
-type makePRCommand struct {
-	title      string
-	body       string
-	headBranch string
-	baseBranch string
-}
-
-func (g *githubHelper) createPR(ctx context.Context, cmd makePRCommand) (*github.PullRequest, *github.Response, error) {
-	newPR := &github.NewPullRequest{
-		Title:               &cmd.title,
-		Head:                &cmd.headBranch,
-		Base:                &cmd.baseBranch,
-		Body:                &cmd.body,
-		MaintainerCanModify: github.Bool(true),
-	}
-
-	return g.client.PullRequests.Create(ctx, g.repoOwner, g.repoName, newPR)
-}
-
-// func (g *githubHelper) getPR(config *Config, prSubject string) (*github.PullRequest, error) {
-
-// 	opts := github.PullRequestListOptions{}
-
-// 	prs, _, err := githubClient.PullRequests.List(ctx, config.RepoOwner, config.RepoName, &opts)
-// 	if err != nil {
-// 		return nil, err
-// 	}
-// 	for _, pr := range prs {
-// 		log.Printf("PR: %s %s", *pr.Title, prSubject)
-// 		if *pr.Title == prSubject {
-// 			return pr, nil
-// 		}
-// 	}
-// 	return nil, nil
-// }
-
-// func (g *githubHelper) pushPR(config *Config, prSubject, prBranch, prFilename, prContent, commitMessage string) error {
-// 	pr, err := getPR(config, prSubject)
-// 	if err != nil {
-// 		return err
-// 	}
-// 	if pr != nil {
-// 		log.Println("Extending Existing PR", *pr.Title)
-// 		ref, err := getRef(config, pr.GetHead().GetRef())
-// 		if err != nil {
-// 			return err
-// 		}
-// 		err = pushCommit(config, ref, prFilename, prContent, commitMessage)
-// 		if err != nil {
-// 			return err
-// 		}
-
-// 	} else {
-// 		log.Println("Creating PR")
-// 		ref, err := createRef(config, prBranch)
-// 		if err != nil {
-// 			return err
-// 		}
-// 		err = pushCommit(config, ref, prFilename, prContent, commitMessage)
-// 		if err != nil {
-// 			return err
-// 		}
-// 		pr, err = createPR(config, prSubject, prBranch)
-// 		if err != nil {
-// 			return err
-// 		}
-// 	}
-// 	return nil
-// }
diff --git a/pkg/services/store/http.go b/pkg/services/store/http.go
index 939995011e829..432e4d872b990 100644
--- a/pkg/services/store/http.go
+++ b/pkg/services/store/http.go
@@ -68,7 +68,7 @@ func (s *standardStorageService) doWrite(c *contextmodel.ReqContext) response.Re
 	if err != nil {
 		return response.Error(http.StatusBadRequest, "save error", err)
 	}
-	return response.JSON(200, rsp)
+	return response.JSON(http.StatusOK, rsp)
 }
 
 func (s *standardStorageService) doUpload(c *contextmodel.ReqContext) response.Response {
@@ -85,7 +85,7 @@ func (s *standardStorageService) doUpload(c *contextmodel.ReqContext) response.R
 	if err := c.Req.ParseMultipartForm(MAX_UPLOAD_SIZE); err != nil {
 		rsp.Message = fmt.Sprintf("Please limit file uploaded under %s", util.ByteCountSI(MAX_UPLOAD_SIZE))
 		rsp.Error = true
-		return response.JSON(400, rsp)
+		return response.JSON(http.StatusBadRequest, rsp)
 	}
 	message := getMultipartFormValue(c.Req, "message")
 	overwriteExistingFile := getMultipartFormValue(c.Req, "overwriteExistingFile") != "false" // must explicitly overwrite
@@ -99,7 +99,7 @@ func (s *standardStorageService) doUpload(c *contextmodel.ReqContext) response.R
 		if path == "" && folder == "" {
 			rsp.Message = "please specify the upload folder or full path"
 			rsp.Error = true
-			return response.JSON(400, rsp)
+			return response.JSON(http.StatusBadRequest, rsp)
 		}
 
 		for _, fileHeader := range fileHeaders {
@@ -107,15 +107,15 @@ func (s *standardStorageService) doUpload(c *contextmodel.ReqContext) response.R
 			// open each file to copy contents
 			file, err := fileHeader.Open()
 			if err != nil {
-				return response.Error(500, "Internal Server Error", err)
+				return response.Error(http.StatusInternalServerError, "Internal Server Error", err)
 			}
 			err = file.Close()
 			if err != nil {
-				return response.Error(500, "Internal Server Error", err)
+				return response.Error(http.StatusInternalServerError, "Internal Server Error", err)
 			}
 			data, err := io.ReadAll(file)
 			if err != nil {
-				return response.Error(500, "Internal Server Error", err)
+				return response.Error(http.StatusInternalServerError, "Internal Server Error", err)
 			}
 
 			if path == "" {
@@ -147,7 +147,7 @@ func (s *standardStorageService) doUpload(c *contextmodel.ReqContext) response.R
 		}
 	}
 
-	return response.JSON(200, rsp)
+	return response.JSON(http.StatusOK, rsp)
 }
 
 func getMultipartFormValue(req *http.Request, key string) string {
@@ -163,11 +163,11 @@ func (s *standardStorageService) read(c *contextmodel.ReqContext) response.Respo
 	scope, path := getPathAndScope(c)
 	file, err := s.Read(c.Req.Context(), c.SignedInUser, scope+"/"+path)
 	if err != nil {
-		return response.Error(400, "cannot call read", err)
+		return response.Error(http.StatusBadRequest, "cannot call read", err)
 	}
 
 	if file == nil || file.Contents == nil {
-		return response.Error(404, "file does not exist", err)
+		return response.Error(http.StatusNotFound, "file does not exist", err)
 	}
 
 	// set the correct content type for svg
@@ -181,9 +181,9 @@ func (s *standardStorageService) getOptions(c *contextmodel.ReqContext) response
 	scope, path := getPathAndScope(c)
 	opts, err := s.getWorkflowOptions(c.Req.Context(), c.SignedInUser, scope+"/"+path)
 	if err != nil {
-		return response.Error(400, err.Error(), err)
+		return response.Error(http.StatusBadRequest, err.Error(), err)
 	}
-	return response.JSON(200, opts)
+	return response.JSON(http.StatusOK, opts)
 }
 
 func (s *standardStorageService) doDelete(c *contextmodel.ReqContext) response.Response {
@@ -192,9 +192,9 @@ func (s *standardStorageService) doDelete(c *contextmodel.ReqContext) response.R
 
 	err := s.Delete(c.Req.Context(), c.SignedInUser, scope+"/"+path)
 	if err != nil {
-		return response.Error(400, "failed to delete the file: "+err.Error(), err)
+		return response.Error(http.StatusBadRequest, "failed to delete the file: "+err.Error(), err)
 	}
-	return response.JSON(200, map[string]any{
+	return response.JSON(http.StatusOK, map[string]any{
 		"message": "Removed file from storage",
 		"success": true,
 		"path":    path,
@@ -204,26 +204,26 @@ func (s *standardStorageService) doDelete(c *contextmodel.ReqContext) response.R
 func (s *standardStorageService) doDeleteFolder(c *contextmodel.ReqContext) response.Response {
 	body, err := io.ReadAll(c.Req.Body)
 	if err != nil {
-		return response.Error(500, "error reading bytes", err)
+		return response.Error(http.StatusInternalServerError, "error reading bytes", err)
 	}
 
 	cmd := &DeleteFolderCmd{}
 	err = json.Unmarshal(body, cmd)
 	if err != nil {
-		return response.Error(400, "error parsing body", err)
+		return response.Error(http.StatusBadRequest, "error parsing body", err)
 	}
 
 	if cmd.Path == "" {
-		return response.Error(400, "empty path", err)
+		return response.Error(http.StatusBadRequest, "empty path", err)
 	}
 
 	// full path is api/storage/delete/upload/example.jpg, but we only want the part after upload
 	_, path := getPathAndScope(c)
 	if err := s.DeleteFolder(c.Req.Context(), c.SignedInUser, cmd); err != nil {
-		return response.Error(400, "failed to delete the folder: "+err.Error(), err)
+		return response.Error(http.StatusBadRequest, "failed to delete the folder: "+err.Error(), err)
 	}
 
-	return response.JSON(200, map[string]any{
+	return response.JSON(http.StatusOK, map[string]any{
 		"message": "Removed folder from storage",
 		"success": true,
 		"path":    path,
@@ -233,24 +233,24 @@ func (s *standardStorageService) doDeleteFolder(c *contextmodel.ReqContext) resp
 func (s *standardStorageService) doCreateFolder(c *contextmodel.ReqContext) response.Response {
 	body, err := io.ReadAll(c.Req.Body)
 	if err != nil {
-		return response.Error(500, "error reading bytes", err)
+		return response.Error(http.StatusInternalServerError, "error reading bytes", err)
 	}
 
 	cmd := &CreateFolderCmd{}
 	err = json.Unmarshal(body, cmd)
 	if err != nil {
-		return response.Error(400, "error parsing body", err)
+		return response.Error(http.StatusBadRequest, "error parsing body", err)
 	}
 
 	if cmd.Path == "" {
-		return response.Error(400, "empty path", err)
+		return response.Error(http.StatusBadRequest, "empty path", err)
 	}
 
 	if err := s.CreateFolder(c.Req.Context(), c.SignedInUser, cmd); err != nil {
-		return response.Error(400, "failed to create the folder: "+err.Error(), err)
+		return response.Error(http.StatusBadRequest, "failed to create the folder: "+err.Error(), err)
 	}
 
-	return response.JSON(200, map[string]any{
+	return response.JSON(http.StatusOK, map[string]any{
 		"message": "Folder created",
 		"success": true,
 		"path":    cmd.Path,
@@ -260,12 +260,13 @@ func (s *standardStorageService) doCreateFolder(c *contextmodel.ReqContext) resp
 func (s *standardStorageService) list(c *contextmodel.ReqContext) response.Response {
 	params := web.Params(c.Req)
 	path := params["*"]
-	frame, err := s.List(c.Req.Context(), c.SignedInUser, path)
+	// maxFiles of 0 will result in default behaviour from wrapper
+	frame, err := s.List(c.Req.Context(), c.SignedInUser, path, 0)
 	if err != nil {
-		return response.Error(400, "error reading path", err)
+		return response.Error(http.StatusBadRequest, "error reading path", err)
 	}
 	if frame == nil {
-		return response.Error(404, "not found", nil)
+		return response.Error(http.StatusNotFound, "not found", nil)
 	}
 	return response.JSONStreaming(http.StatusOK, frame)
 }
@@ -280,5 +281,5 @@ func (s *standardStorageService) getConfig(c *contextmodel.ReqContext) response.
 	for _, s := range storages {
 		roots = append(roots, s.Meta())
 	}
-	return response.JSON(200, roots)
+	return response.JSON(http.StatusOK, roots)
 }
diff --git a/pkg/services/store/kind/dashboard/summary.go b/pkg/services/store/kind/dashboard/summary.go
index 6e7da053503be..7987f1c6c1e46 100644
--- a/pkg/services/store/kind/dashboard/summary.go
+++ b/pkg/services/store/kind/dashboard/summary.go
@@ -4,20 +4,13 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"fmt"
 	"strconv"
 
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/services/store/entity"
 )
 
-func GetEntityKindInfo() entity.EntityKindInfo {
-	return entity.EntityKindInfo{
-		ID:          entity.StandardKindDashboard,
-		Name:        "Dashboard",
-		Description: "Define a grafana dashboard layout",
-	}
-}
-
 // This summary does not resolve old name as UID
 func GetEntitySummaryBuilder() entity.EntitySummaryBuilder {
 	builder := NewStaticDashboardSummaryBuilder(&directLookup{}, true)
@@ -44,7 +37,7 @@ func NewStaticDashboardSummaryBuilder(lookup DatasourceLookup, sanitize bool) en
 
 		summary := &entity.EntitySummary{
 			Labels: make(map[string]string),
-			Fields: make(map[string]any),
+			Fields: make(map[string]string),
 		}
 		stream := bytes.NewBuffer(body)
 		dash, err := readDashboard(stream, lookup)
@@ -62,48 +55,63 @@ func NewStaticDashboardSummaryBuilder(lookup DatasourceLookup, sanitize bool) en
 			summary.Labels[v] = ""
 		}
 		if len(dash.TemplateVars) > 0 {
-			summary.Fields["hasTemplateVars"] = true
+			summary.Fields["hasTemplateVars"] = "true"
 		}
-		summary.Fields["schemaVersion"] = dash.SchemaVersion
+		summary.Fields["schemaVersion"] = fmt.Sprint(dash.SchemaVersion)
 
 		for _, panel := range dash.Panels {
-			panelRefs := NewReferenceAccumulator()
-			p := &entity.EntitySummary{
-				UID:  uid + "#" + strconv.FormatInt(panel.ID, 10),
-				Kind: "panel",
-			}
-			p.Name = panel.Title
-			p.Description = panel.Description
-			p.Fields = make(map[string]any, 0)
-			p.Fields["type"] = panel.Type
-
-			if panel.Type != "row" {
-				panelRefs.Add(entity.ExternalEntityReferencePlugin, string(plugins.TypePanel), panel.Type)
-				dashboardRefs.Add(entity.ExternalEntityReferencePlugin, string(plugins.TypePanel), panel.Type)
-			}
-			if panel.LibraryPanel != "" {
-				panelRefs.Add(entity.StandardKindLibraryPanel, panel.Type, panel.LibraryPanel)
-				dashboardRefs.Add(entity.StandardKindLibraryPanel, panel.Type, panel.LibraryPanel)
-			}
-			for _, v := range panel.Datasource {
-				dashboardRefs.Add(entity.StandardKindDataSource, v.Type, v.UID)
-				panelRefs.Add(entity.StandardKindDataSource, v.Type, v.UID)
-				if v.Type != "" {
-					dashboardRefs.Add(entity.ExternalEntityReferencePlugin, string(plugins.TypeDataSource), v.Type)
-				}
-			}
-			for _, v := range panel.Transformer {
-				panelRefs.Add(entity.ExternalEntityReferenceRuntime, entity.ExternalEntityReferenceRuntime_Transformer, v)
-				dashboardRefs.Add(entity.ExternalEntityReferenceRuntime, entity.ExternalEntityReferenceRuntime_Transformer, v)
-			}
-			p.References = panelRefs.Get()
-			summary.Nested = append(summary.Nested, p)
+			s := panelSummary(panel, uid, dashboardRefs)
+			summary.Nested = append(summary.Nested, s...)
 		}
 
 		summary.References = dashboardRefs.Get()
 		if sanitize {
 			body, err = json.MarshalIndent(parsed, "", "  ")
 		}
+
 		return summary, body, err
 	}
 }
+
+// panelSummary take panel info and returns entity summaries for the given panel and all its collapsed panels.
+func panelSummary(panel panelInfo, uid string, dashboardRefs ReferenceAccumulator) []*entity.EntitySummary {
+	panels := []*entity.EntitySummary{}
+
+	panelRefs := NewReferenceAccumulator()
+	p := &entity.EntitySummary{
+		UID:  uid + "#" + strconv.FormatInt(panel.ID, 10),
+		Kind: "panel",
+	}
+	p.Name = panel.Title
+	p.Description = panel.Description
+	p.Fields = make(map[string]string, 0)
+	p.Fields["type"] = panel.Type
+
+	if panel.Type != "row" {
+		panelRefs.Add(entity.ExternalEntityReferencePlugin, string(plugins.TypePanel), panel.Type)
+		dashboardRefs.Add(entity.ExternalEntityReferencePlugin, string(plugins.TypePanel), panel.Type)
+	}
+	if panel.LibraryPanel != "" {
+		panelRefs.Add(entity.StandardKindLibraryPanel, panel.Type, panel.LibraryPanel)
+		dashboardRefs.Add(entity.StandardKindLibraryPanel, panel.Type, panel.LibraryPanel)
+	}
+	for _, v := range panel.Datasource {
+		dashboardRefs.Add(entity.StandardKindDataSource, v.Type, v.UID)
+		panelRefs.Add(entity.StandardKindDataSource, v.Type, v.UID)
+		if v.Type != "" {
+			dashboardRefs.Add(entity.ExternalEntityReferencePlugin, string(plugins.TypeDataSource), v.Type)
+		}
+	}
+	for _, v := range panel.Transformer {
+		panelRefs.Add(entity.ExternalEntityReferenceRuntime, entity.ExternalEntityReferenceRuntime_Transformer, v)
+		dashboardRefs.Add(entity.ExternalEntityReferenceRuntime, entity.ExternalEntityReferenceRuntime_Transformer, v)
+	}
+	p.References = panelRefs.Get()
+	panels = append(panels, p)
+
+	for _, c := range panel.Collapsed {
+		collapsed := panelSummary(c, uid, dashboardRefs)
+		panels = append(panels, collapsed...)
+	}
+	return panels
+}
diff --git a/pkg/services/store/kind/dashboard/testdata/gdev-walk-graph-gradient-area-fills.json b/pkg/services/store/kind/dashboard/testdata/gdev-walk-graph-gradient-area-fills.json
index 9eb1a26b1a547..3a448b1251dca 100644
--- a/pkg/services/store/kind/dashboard/testdata/gdev-walk-graph-gradient-area-fills.json
+++ b/pkg/services/store/kind/dashboard/testdata/gdev-walk-graph-gradient-area-fills.json
@@ -6,11 +6,11 @@
     "panel-tests": ""
   },
   "fields": {
-    "schemaVersion": 18
+    "schemaVersion": "18"
   },
   "nested": [
     {
-      "uid": "graph-gradient-area-fills.json#2",
+      "UID": "graph-gradient-area-fills.json#2",
       "kind": "panel",
       "name": "Req/s",
       "fields": {
@@ -23,12 +23,12 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph-gradient-area-fills.json#11",
+      "UID": "graph-gradient-area-fills.json#11",
       "kind": "panel",
       "name": "Req/s",
       "fields": {
@@ -41,12 +41,12 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph-gradient-area-fills.json#7",
+      "UID": "graph-gradient-area-fills.json#7",
       "kind": "panel",
       "name": "Memory",
       "fields": {
@@ -59,12 +59,12 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph-gradient-area-fills.json#10",
+      "UID": "graph-gradient-area-fills.json#10",
       "kind": "panel",
       "name": "Req/s",
       "fields": {
@@ -77,7 +77,7 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     }
@@ -89,7 +89,7 @@
     {
       "family": "plugin",
       "type": "panel",
-      "ID": "graph"
+      "identifier": "graph"
     }
   ]
 }
\ No newline at end of file
diff --git a/pkg/services/store/kind/dashboard/testdata/gdev-walk-graph-shared-tooltips.json b/pkg/services/store/kind/dashboard/testdata/gdev-walk-graph-shared-tooltips.json
index 9406933bac239..2acdb5dfbb576 100644
--- a/pkg/services/store/kind/dashboard/testdata/gdev-walk-graph-shared-tooltips.json
+++ b/pkg/services/store/kind/dashboard/testdata/gdev-walk-graph-shared-tooltips.json
@@ -6,11 +6,11 @@
     "panel-tests": ""
   },
   "fields": {
-    "schemaVersion": 28
+    "schemaVersion": "28"
   },
   "nested": [
     {
-      "uid": "graph-shared-tooltips.json#4",
+      "UID": "graph-shared-tooltips.json#4",
       "kind": "panel",
       "name": "two units",
       "fields": {
@@ -23,12 +23,12 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "timeseries"
+          "identifier": "timeseries"
         }
       ]
     },
     {
-      "uid": "graph-shared-tooltips.json#13",
+      "UID": "graph-shared-tooltips.json#13",
       "kind": "panel",
       "name": "Speed vs Temperature (XY)",
       "fields": {
@@ -41,22 +41,22 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "xychart"
+          "identifier": "xychart"
         },
         {
           "family": "runtime",
           "type": "transformer",
-          "ID": "organize"
+          "identifier": "organize"
         },
         {
           "family": "runtime",
           "type": "transformer",
-          "ID": "seriesToColumns"
+          "identifier": "seriesToColumns"
         }
       ]
     },
     {
-      "uid": "graph-shared-tooltips.json#2",
+      "UID": "graph-shared-tooltips.json#2",
       "kind": "panel",
       "name": "Cursor info",
       "fields": {
@@ -69,12 +69,12 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "debug"
+          "identifier": "debug"
         }
       ]
     },
     {
-      "uid": "graph-shared-tooltips.json#5",
+      "UID": "graph-shared-tooltips.json#5",
       "kind": "panel",
       "name": "Only temperature",
       "fields": {
@@ -87,12 +87,12 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "timeseries"
+          "identifier": "timeseries"
         }
       ]
     },
     {
-      "uid": "graph-shared-tooltips.json#9",
+      "UID": "graph-shared-tooltips.json#9",
       "kind": "panel",
       "name": "Only Speed",
       "fields": {
@@ -105,12 +105,12 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "timeseries"
+          "identifier": "timeseries"
         }
       ]
     },
     {
-      "uid": "graph-shared-tooltips.json#11",
+      "UID": "graph-shared-tooltips.json#11",
       "kind": "panel",
       "name": "Panel Title",
       "fields": {
@@ -123,12 +123,12 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "timeseries"
+          "identifier": "timeseries"
         }
       ]
     },
     {
-      "uid": "graph-shared-tooltips.json#8",
+      "UID": "graph-shared-tooltips.json#8",
       "kind": "panel",
       "name": "flot panel (temperature)",
       "fields": {
@@ -141,12 +141,12 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph-shared-tooltips.json#10",
+      "UID": "graph-shared-tooltips.json#10",
       "kind": "panel",
       "name": "flot panel (no units)",
       "fields": {
@@ -159,7 +159,7 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     }
@@ -171,32 +171,32 @@
     {
       "family": "plugin",
       "type": "panel",
-      "ID": "debug"
+      "identifier": "debug"
     },
     {
       "family": "plugin",
       "type": "panel",
-      "ID": "graph"
+      "identifier": "graph"
     },
     {
       "family": "plugin",
       "type": "panel",
-      "ID": "timeseries"
+      "identifier": "timeseries"
     },
     {
       "family": "plugin",
       "type": "panel",
-      "ID": "xychart"
+      "identifier": "xychart"
     },
     {
       "family": "runtime",
       "type": "transformer",
-      "ID": "organize"
+      "identifier": "organize"
     },
     {
       "family": "runtime",
       "type": "transformer",
-      "ID": "seriesToColumns"
+      "identifier": "seriesToColumns"
     }
   ]
 }
\ No newline at end of file
diff --git a/pkg/services/store/kind/dashboard/testdata/gdev-walk-graph-time-regions.json b/pkg/services/store/kind/dashboard/testdata/gdev-walk-graph-time-regions.json
index d91dfe46b88fa..40e15af1cf195 100644
--- a/pkg/services/store/kind/dashboard/testdata/gdev-walk-graph-time-regions.json
+++ b/pkg/services/store/kind/dashboard/testdata/gdev-walk-graph-time-regions.json
@@ -6,11 +6,11 @@
     "panel-tests": ""
   },
   "fields": {
-    "schemaVersion": 18
+    "schemaVersion": "18"
   },
   "nested": [
     {
-      "uid": "graph-time-regions.json#2",
+      "UID": "graph-time-regions.json#2",
       "kind": "panel",
       "name": "Business Hours",
       "fields": {
@@ -19,17 +19,17 @@
       "references": [
         {
           "family": "ds",
-          "ID": "gdev-testdata"
+          "identifier": "gdev-testdata"
         },
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph-time-regions.json#4",
+      "UID": "graph-time-regions.json#4",
       "kind": "panel",
       "name": "Sunday's 20-23",
       "fields": {
@@ -38,17 +38,17 @@
       "references": [
         {
           "family": "ds",
-          "ID": "gdev-testdata"
+          "identifier": "gdev-testdata"
         },
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph-time-regions.json#3",
+      "UID": "graph-time-regions.json#3",
       "kind": "panel",
       "name": "Each day of week",
       "fields": {
@@ -57,17 +57,17 @@
       "references": [
         {
           "family": "ds",
-          "ID": "gdev-testdata"
+          "identifier": "gdev-testdata"
         },
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph-time-regions.json#5",
+      "UID": "graph-time-regions.json#5",
       "kind": "panel",
       "name": "05:00",
       "fields": {
@@ -76,17 +76,17 @@
       "references": [
         {
           "family": "ds",
-          "ID": "gdev-testdata"
+          "identifier": "gdev-testdata"
         },
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph-time-regions.json#7",
+      "UID": "graph-time-regions.json#7",
       "kind": "panel",
       "name": "From 22:00 to 00:30 (crossing midnight)",
       "fields": {
@@ -95,12 +95,12 @@
       "references": [
         {
           "family": "ds",
-          "ID": "gdev-testdata"
+          "identifier": "gdev-testdata"
         },
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     }
@@ -108,12 +108,12 @@
   "references": [
     {
       "family": "ds",
-      "ID": "gdev-testdata"
+      "identifier": "gdev-testdata"
     },
     {
       "family": "plugin",
       "type": "panel",
-      "ID": "graph"
+      "identifier": "graph"
     }
   ]
 }
\ No newline at end of file
diff --git a/pkg/services/store/kind/dashboard/testdata/gdev-walk-graph_tests.json b/pkg/services/store/kind/dashboard/testdata/gdev-walk-graph_tests.json
index 61630217a55b5..44cece55fe986 100644
--- a/pkg/services/store/kind/dashboard/testdata/gdev-walk-graph_tests.json
+++ b/pkg/services/store/kind/dashboard/testdata/gdev-walk-graph_tests.json
@@ -6,11 +6,11 @@
     "panel-tests": ""
   },
   "fields": {
-    "schemaVersion": 16
+    "schemaVersion": "16"
   },
   "nested": [
     {
-      "uid": "graph_tests.json#1",
+      "UID": "graph_tests.json#1",
       "kind": "panel",
       "name": "No Data Points Warning",
       "fields": {
@@ -19,17 +19,17 @@
       "references": [
         {
           "family": "ds",
-          "ID": "gdev-testdata"
+          "identifier": "gdev-testdata"
         },
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph_tests.json#2",
+      "UID": "graph_tests.json#2",
       "kind": "panel",
       "name": "Datapoints Outside Range Warning",
       "fields": {
@@ -38,17 +38,17 @@
       "references": [
         {
           "family": "ds",
-          "ID": "gdev-testdata"
+          "identifier": "gdev-testdata"
         },
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph_tests.json#3",
+      "UID": "graph_tests.json#3",
       "kind": "panel",
       "name": "Random walk series",
       "fields": {
@@ -57,17 +57,17 @@
       "references": [
         {
           "family": "ds",
-          "ID": "gdev-testdata"
+          "identifier": "gdev-testdata"
         },
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph_tests.json#4",
+      "UID": "graph_tests.json#4",
       "kind": "panel",
       "name": "Millisecond res x-axis and tooltip",
       "fields": {
@@ -76,17 +76,17 @@
       "references": [
         {
           "family": "ds",
-          "ID": "gdev-testdata"
+          "identifier": "gdev-testdata"
         },
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph_tests.json#6",
+      "UID": "graph_tests.json#6",
       "kind": "panel",
       "fields": {
         "type": "text"
@@ -98,12 +98,12 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "text"
+          "identifier": "text"
         }
       ]
     },
     {
-      "uid": "graph_tests.json#5",
+      "UID": "graph_tests.json#5",
       "kind": "panel",
       "name": "2 yaxis and axis labels",
       "fields": {
@@ -112,17 +112,17 @@
       "references": [
         {
           "family": "ds",
-          "ID": "gdev-testdata"
+          "identifier": "gdev-testdata"
         },
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph_tests.json#7",
+      "UID": "graph_tests.json#7",
       "kind": "panel",
       "fields": {
         "type": "text"
@@ -134,12 +134,12 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "text"
+          "identifier": "text"
         }
       ]
     },
     {
-      "uid": "graph_tests.json#8",
+      "UID": "graph_tests.json#8",
       "kind": "panel",
       "name": "null value connected",
       "fields": {
@@ -148,17 +148,17 @@
       "references": [
         {
           "family": "ds",
-          "ID": "gdev-testdata"
+          "identifier": "gdev-testdata"
         },
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph_tests.json#10",
+      "UID": "graph_tests.json#10",
       "kind": "panel",
       "name": "null value null as zero",
       "fields": {
@@ -167,17 +167,17 @@
       "references": [
         {
           "family": "ds",
-          "ID": "gdev-testdata"
+          "identifier": "gdev-testdata"
         },
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph_tests.json#13",
+      "UID": "graph_tests.json#13",
       "kind": "panel",
       "fields": {
         "type": "text"
@@ -189,12 +189,12 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "text"
+          "identifier": "text"
         }
       ]
     },
     {
-      "uid": "graph_tests.json#9",
+      "UID": "graph_tests.json#9",
       "kind": "panel",
       "name": "Stacking value ontop of nulls",
       "fields": {
@@ -203,17 +203,17 @@
       "references": [
         {
           "family": "ds",
-          "ID": "gdev-testdata"
+          "identifier": "gdev-testdata"
         },
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph_tests.json#14",
+      "UID": "graph_tests.json#14",
       "kind": "panel",
       "fields": {
         "type": "text"
@@ -225,12 +225,12 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "text"
+          "identifier": "text"
         }
       ]
     },
     {
-      "uid": "graph_tests.json#12",
+      "UID": "graph_tests.json#12",
       "kind": "panel",
       "name": "Stacking all series null segment",
       "fields": {
@@ -239,17 +239,17 @@
       "references": [
         {
           "family": "ds",
-          "ID": "gdev-testdata"
+          "identifier": "gdev-testdata"
         },
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph_tests.json#15",
+      "UID": "graph_tests.json#15",
       "kind": "panel",
       "fields": {
         "type": "text"
@@ -261,12 +261,12 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "text"
+          "identifier": "text"
         }
       ]
     },
     {
-      "uid": "graph_tests.json#21",
+      "UID": "graph_tests.json#21",
       "kind": "panel",
       "name": "Null between points",
       "fields": {
@@ -275,17 +275,17 @@
       "references": [
         {
           "family": "ds",
-          "ID": "gdev-testdata"
+          "identifier": "gdev-testdata"
         },
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph_tests.json#22",
+      "UID": "graph_tests.json#22",
       "kind": "panel",
       "fields": {
         "type": "text"
@@ -297,12 +297,12 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "text"
+          "identifier": "text"
         }
       ]
     },
     {
-      "uid": "graph_tests.json#20",
+      "UID": "graph_tests.json#20",
       "kind": "panel",
       "name": "Legend Table Single Series Should Take Minimum Height",
       "fields": {
@@ -311,17 +311,17 @@
       "references": [
         {
           "family": "ds",
-          "ID": "gdev-testdata"
+          "identifier": "gdev-testdata"
         },
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph_tests.json#16",
+      "UID": "graph_tests.json#16",
       "kind": "panel",
       "name": "Legend Table No Scroll Visible",
       "fields": {
@@ -330,17 +330,17 @@
       "references": [
         {
           "family": "ds",
-          "ID": "gdev-testdata"
+          "identifier": "gdev-testdata"
         },
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph_tests.json#17",
+      "UID": "graph_tests.json#17",
       "kind": "panel",
       "name": "Legend Table Should Scroll",
       "fields": {
@@ -349,17 +349,17 @@
       "references": [
         {
           "family": "ds",
-          "ID": "gdev-testdata"
+          "identifier": "gdev-testdata"
         },
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph_tests.json#18",
+      "UID": "graph_tests.json#18",
       "kind": "panel",
       "name": "Legend Table No Scroll Visible",
       "fields": {
@@ -368,17 +368,17 @@
       "references": [
         {
           "family": "ds",
-          "ID": "gdev-testdata"
+          "identifier": "gdev-testdata"
         },
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph_tests.json#19",
+      "UID": "graph_tests.json#19",
       "kind": "panel",
       "name": "Legend Table No Scroll Visible",
       "fields": {
@@ -387,12 +387,12 @@
       "references": [
         {
           "family": "ds",
-          "ID": "gdev-testdata"
+          "identifier": "gdev-testdata"
         },
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     }
@@ -403,17 +403,17 @@
     },
     {
       "family": "ds",
-      "ID": "gdev-testdata"
+      "identifier": "gdev-testdata"
     },
     {
       "family": "plugin",
       "type": "panel",
-      "ID": "graph"
+      "identifier": "graph"
     },
     {
       "family": "plugin",
       "type": "panel",
-      "ID": "text"
+      "identifier": "text"
     }
   ]
 }
\ No newline at end of file
diff --git a/pkg/services/store/kind/dashboard/testdata/gdev-walk-graph_y_axis.json b/pkg/services/store/kind/dashboard/testdata/gdev-walk-graph_y_axis.json
index 8ee9d10095331..223bc667a4626 100644
--- a/pkg/services/store/kind/dashboard/testdata/gdev-walk-graph_y_axis.json
+++ b/pkg/services/store/kind/dashboard/testdata/gdev-walk-graph_y_axis.json
@@ -5,11 +5,11 @@
     "panel-tests": ""
   },
   "fields": {
-    "schemaVersion": 19
+    "schemaVersion": "19"
   },
   "nested": [
     {
-      "uid": "graph_y_axis.json#7",
+      "UID": "graph_y_axis.json#7",
       "kind": "panel",
       "name": "Data from 0 - 10K (unit short)",
       "fields": {
@@ -22,12 +22,12 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph_y_axis.json#5",
+      "UID": "graph_y_axis.json#5",
       "kind": "panel",
       "name": "Data from 0 - 10K (unit bytes metric)",
       "fields": {
@@ -40,12 +40,12 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph_y_axis.json#4",
+      "UID": "graph_y_axis.json#4",
       "kind": "panel",
       "name": "Data from 0 - 10K (unit bytes IEC)",
       "fields": {
@@ -58,12 +58,12 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph_y_axis.json#2",
+      "UID": "graph_y_axis.json#2",
       "kind": "panel",
       "name": "Data from 0 - 10K (unit short)",
       "fields": {
@@ -76,12 +76,12 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph_y_axis.json#3",
+      "UID": "graph_y_axis.json#3",
       "kind": "panel",
       "name": "Data from 0.0002 - 0.001 (unit short)",
       "fields": {
@@ -94,12 +94,12 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph_y_axis.json#6",
+      "UID": "graph_y_axis.json#6",
       "kind": "panel",
       "name": "Data from 12000 - 30000 (unit ms)",
       "fields": {
@@ -112,12 +112,12 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph_y_axis.json#9",
+      "UID": "graph_y_axis.json#9",
       "kind": "panel",
       "name": "Data from 0 - 1B (unit short)",
       "fields": {
@@ -130,12 +130,12 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph_y_axis.json#10",
+      "UID": "graph_y_axis.json#10",
       "kind": "panel",
       "name": "Data from 0 - 1B (unit bytes)",
       "fields": {
@@ -148,12 +148,12 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     },
     {
-      "uid": "graph_y_axis.json#8",
+      "UID": "graph_y_axis.json#8",
       "kind": "panel",
       "name": "Data from 12000 - 30000 (unit ms)",
       "fields": {
@@ -166,7 +166,7 @@
         {
           "family": "plugin",
           "type": "panel",
-          "ID": "graph"
+          "identifier": "graph"
         }
       ]
     }
@@ -178,7 +178,7 @@
     {
       "family": "plugin",
       "type": "panel",
-      "ID": "graph"
+      "identifier": "graph"
     }
   ]
 }
\ No newline at end of file
diff --git a/pkg/services/store/kind/dashboard/testdata/with-library-panels-info.json b/pkg/services/store/kind/dashboard/testdata/with-library-panels-info.json
index 6e32e91d39ca2..670b69576aa04 100644
--- a/pkg/services/store/kind/dashboard/testdata/with-library-panels-info.json
+++ b/pkg/services/store/kind/dashboard/testdata/with-library-panels-info.json
@@ -1,11 +1,11 @@
 {
   "name": "pppp",
   "fields": {
-    "schemaVersion": 38
+    "schemaVersion": "38"
   },
   "nested": [
     {
-      "uid": "with-library-panels#1",
+      "UID": "with-library-panels#1",
       "kind": "panel",
       "name": "green pie",
       "fields": {
@@ -17,7 +17,7 @@
         },
         {
           "family": "librarypanel",
-          "ID": "a7975b7a-fb53-4ab7-951d-15810953b54f"
+          "identifier": "a7975b7a-fb53-4ab7-951d-15810953b54f"
         },
         {
           "family": "plugin",
@@ -26,7 +26,7 @@
       ]
     },
     {
-      "uid": "with-library-panels#2",
+      "UID": "with-library-panels#2",
       "kind": "panel",
       "name": "green pie",
       "fields": {
@@ -38,7 +38,33 @@
         },
         {
           "family": "librarypanel",
-          "ID": "e1d5f519-dabd-47c6-9ad7-83d181ce1cee"
+          "identifier": "e1d5f519-dabd-47c6-9ad7-83d181ce1cee"
+        },
+        {
+          "family": "plugin",
+          "type": "panel"
+        }
+      ]
+    },
+    {
+      "UID": "with-library-panels#3",
+      "kind": "panel",
+      "name": "collapsed row",
+      "fields": {
+        "type": "row"
+      }
+    },
+    {
+      "UID": "with-library-panels#42",
+      "kind": "panel",
+      "name": "blue pie",
+      "fields": {
+        "type": ""
+      },
+      "references": [
+        {
+          "family": "librarypanel",
+          "identifier": "l3d2s634-fdgf-75u4-3fg3-67j966ii7jur"
         },
         {
           "family": "plugin",
@@ -53,11 +79,15 @@
     },
     {
       "family": "librarypanel",
-      "ID": "a7975b7a-fb53-4ab7-951d-15810953b54f"
+      "identifier": "a7975b7a-fb53-4ab7-951d-15810953b54f"
+    },
+    {
+      "family": "librarypanel",
+      "identifier": "e1d5f519-dabd-47c6-9ad7-83d181ce1cee"
     },
     {
       "family": "librarypanel",
-      "ID": "e1d5f519-dabd-47c6-9ad7-83d181ce1cee"
+      "identifier": "l3d2s634-fdgf-75u4-3fg3-67j966ii7jur"
     },
     {
       "family": "plugin",
diff --git a/pkg/services/store/kind/dashboard/testdata/with-library-panels.json b/pkg/services/store/kind/dashboard/testdata/with-library-panels.json
index 3dd0faeb9a1c3..cecd1c64e6071 100644
--- a/pkg/services/store/kind/dashboard/testdata/with-library-panels.json
+++ b/pkg/services/store/kind/dashboard/testdata/with-library-panels.json
@@ -49,6 +49,34 @@
           "uid": "e1d5f519-dabd-47c6-9ad7-83d181ce1cee"
         },
         "title": "green pie"
+      },
+      {
+        "collapsed": true,
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 9
+        },
+        "id": 3,
+        "panels": [
+          {
+            "gridPos": {
+              "h": 8,
+              "w": 12,
+              "x": 12,
+              "y": 0
+            },
+            "id": 42,
+            "libraryPanel": {
+              "name": "blue pie",
+              "uid": "l3d2s634-fdgf-75u4-3fg3-67j966ii7jur"
+            },
+            "title": "blue pie"
+          }
+        ],
+        "title": "collapsed row",
+        "type": "row"
       }
     ],
     "refresh": "",
diff --git a/pkg/services/store/kind/dataframe/summary.go b/pkg/services/store/kind/dataframe/summary.go
deleted file mode 100644
index 71334361f0636..0000000000000
--- a/pkg/services/store/kind/dataframe/summary.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package dataframe
-
-import (
-	"context"
-	"encoding/json"
-
-	"github.com/grafana/grafana-plugin-sdk-go/data"
-
-	"github.com/grafana/grafana/pkg/services/store"
-	"github.com/grafana/grafana/pkg/services/store/entity"
-)
-
-func GetEntityKindInfo() entity.EntityKindInfo {
-	return entity.EntityKindInfo{
-		ID:          entity.StandardKindDataFrame,
-		Name:        "Data frame",
-		Description: "Data frame",
-	}
-}
-
-func GetEntitySummaryBuilder() entity.EntitySummaryBuilder {
-	return func(ctx context.Context, uid string, body []byte) (*entity.EntitySummary, []byte, error) {
-		df := &data.Frame{}
-		err := json.Unmarshal(body, df)
-		if err != nil {
-			return nil, nil, err
-		}
-		rows, err := df.RowLen()
-		if err != nil {
-			return nil, nil, err
-		}
-
-		out, err := data.FrameToJSON(df, data.IncludeAll)
-		if err != nil {
-			return nil, nil, err
-		}
-		summary := &entity.EntitySummary{
-			Kind: entity.StandardKindDataFrame,
-			Name: df.Name,
-			UID:  uid,
-			Fields: map[string]any{
-				"rows": rows,
-				"cols": len(df.Fields),
-			},
-		}
-		if summary.Name == "" {
-			summary.Name = store.GuessNameFromUID(uid)
-		}
-		return summary, out, err
-	}
-}
diff --git a/pkg/services/store/kind/dataframe/summary_test.go b/pkg/services/store/kind/dataframe/summary_test.go
deleted file mode 100644
index 9efe2c94c96cc..0000000000000
--- a/pkg/services/store/kind/dataframe/summary_test.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package dataframe
-
-import (
-	"context"
-	"encoding/json"
-	"testing"
-	"time"
-
-	"github.com/grafana/grafana-plugin-sdk-go/data"
-	"github.com/stretchr/testify/require"
-)
-
-func TestDataFrameSummary(t *testing.T) {
-	df := data.NewFrame("http_requests_total",
-		data.NewField("timestamp", nil, []time.Time{time.Now(), time.Now(), time.Now()}).SetConfig(&data.FieldConfig{
-			DisplayName: "A time Column.",
-		}),
-		data.NewField("value", data.Labels{"service": "auth"}, []float64{1.0, 2.0, 3.0}),
-		data.NewField("category", data.Labels{"service": "auth"}, []string{"foo", "bar", "test"}),
-		data.NewField("valid", data.Labels{"service": "auth"}, []bool{true, false, true}),
-	)
-
-	in, err := data.FrameToJSON(df, data.IncludeAll)
-	require.NoError(t, err)
-
-	summary, out, err := GetEntitySummaryBuilder()(context.Background(), "somthing", in)
-	require.NoError(t, err)
-	require.Equal(t, in, out) // same json
-
-	asjson, err := json.MarshalIndent(summary, "", "  ")
-	// fmt.Printf(string(asjson))
-	require.NoError(t, err)
-	require.JSONEq(t, `{
-		"uid": "somthing",
-		"kind": "frame",
-		"name": "http_requests_total",
-		"fields": {
-		  "cols": 4,
-		  "rows": 3
-		}
-	  }`, string(asjson))
-}
diff --git a/pkg/services/store/kind/dummy/doc.go b/pkg/services/store/kind/dummy/doc.go
deleted file mode 100644
index 465cba4054018..0000000000000
--- a/pkg/services/store/kind/dummy/doc.go
+++ /dev/null
@@ -1,4 +0,0 @@
-// Package dummy provides a dummy kind useful for testing
-//
-// The dummy kind returns a complicated summary that can exercise most of the storage options
-package dummy
diff --git a/pkg/services/store/kind/dummy/summary.go b/pkg/services/store/kind/dummy/summary.go
deleted file mode 100644
index acc36713ab374..0000000000000
--- a/pkg/services/store/kind/dummy/summary.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package dummy
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/grafana/grafana/pkg/services/store/entity"
-)
-
-func GetEntityKindInfo(kind string) entity.EntityKindInfo {
-	return entity.EntityKindInfo{
-		ID:          kind,
-		Name:        kind,
-		Description: "Dummy kind used for testing.",
-		IsRaw:       true,
-	}
-}
-
-func GetEntitySummaryBuilder(kind string) entity.EntitySummaryBuilder {
-	return func(ctx context.Context, uid string, body []byte) (*entity.EntitySummary, []byte, error) {
-		summary := &entity.EntitySummary{
-			Name:        fmt.Sprintf("Dummy: %s", kind),
-			Kind:        kind,
-			Description: fmt.Sprintf("Wrote at %s", time.Now().Local().String()),
-			Labels: map[string]string{
-				"hello": "world",
-				"tag1":  "",
-				"tag2":  "",
-			},
-			Fields: map[string]any{
-				"field1": "a string",
-				"field2": 1.224,
-				"field4": true,
-			},
-			Error:  nil, // ignore for now
-			Nested: nil, // ignore for now
-			References: []*entity.EntityExternalReference{
-				{
-					Family:     "ds",
-					Type:       "influx",
-					Identifier: "xyz",
-				},
-				{
-					Family: entity.StandardKindPanel,
-					Type:   "heatmap",
-				},
-				{
-					Family: entity.StandardKindPanel,
-					Type:   "timeseries",
-				},
-			},
-		}
-
-		if summary.UID != "" && uid != summary.UID {
-			return summary, nil, fmt.Errorf("internal UID mismatch")
-		}
-
-		return summary, body, nil
-	}
-}
diff --git a/pkg/services/store/kind/folder/summary.go b/pkg/services/store/kind/folder/summary.go
deleted file mode 100644
index a328e139ace38..0000000000000
--- a/pkg/services/store/kind/folder/summary.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package folder
-
-import (
-	"context"
-	"encoding/json"
-
-	"github.com/grafana/grafana/pkg/services/store"
-	"github.com/grafana/grafana/pkg/services/store/entity"
-)
-
-type Model struct {
-	Name        string `json:"name"`
-	Description string `json:"description,omitempty"`
-}
-
-func GetEntityKindInfo() entity.EntityKindInfo {
-	return entity.EntityKindInfo{
-		ID:   entity.StandardKindFolder,
-		Name: "Folder",
-	}
-}
-
-func GetEntitySummaryBuilder() entity.EntitySummaryBuilder {
-	return func(ctx context.Context, uid string, body []byte) (*entity.EntitySummary, []byte, error) {
-		obj := &Model{}
-		err := json.Unmarshal(body, obj)
-		if err != nil {
-			return nil, nil, err // unable to read object
-		}
-
-		if obj.Name == "" {
-			obj.Name = store.GuessNameFromUID(uid)
-		}
-
-		summary := &entity.EntitySummary{
-			Kind:        entity.StandardKindFolder,
-			Name:        obj.Name,
-			Description: obj.Description,
-			UID:         uid,
-		}
-
-		out, err := json.MarshalIndent(obj, "", "  ")
-		return summary, out, err
-	}
-}
diff --git a/pkg/services/store/kind/geojson/summary.go b/pkg/services/store/kind/geojson/summary.go
deleted file mode 100644
index dc253ffaf30a7..0000000000000
--- a/pkg/services/store/kind/geojson/summary.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package geojson
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-
-	"github.com/grafana/grafana/pkg/services/store"
-	"github.com/grafana/grafana/pkg/services/store/entity"
-)
-
-func GetEntityKindInfo() entity.EntityKindInfo {
-	return entity.EntityKindInfo{
-		ID:            entity.StandardKindGeoJSON,
-		Name:          "GeoJSON",
-		Description:   "JSON formatted spatial data",
-		FileExtension: ".geojson",
-		MimeType:      "application/json",
-	}
-}
-
-// Very basic geojson validator
-func GetEntitySummaryBuilder() entity.EntitySummaryBuilder {
-	return func(ctx context.Context, uid string, body []byte) (*entity.EntitySummary, []byte, error) {
-		var geojson map[string]any
-		err := json.Unmarshal(body, &geojson)
-		if err != nil {
-			return nil, nil, err
-		}
-
-		ftype, ok := geojson["type"].(string)
-		if !ok {
-			return nil, nil, fmt.Errorf("missing type")
-		}
-
-		body, err = json.Marshal(geojson)
-		if err != nil {
-			return nil, nil, err
-		}
-
-		summary := &entity.EntitySummary{
-			Kind: entity.StandardKindGeoJSON,
-			Name: store.GuessNameFromUID(uid),
-			UID:  uid,
-			Fields: map[string]any{
-				"type": ftype,
-			},
-		}
-
-		if ftype == "FeatureCollection" {
-			features, ok := geojson["features"].([]any)
-			if ok {
-				summary.Fields["count"] = len(features)
-			}
-		}
-
-		return summary, body, nil
-	}
-}
diff --git a/pkg/services/store/kind/geojson/summary_test.go b/pkg/services/store/kind/geojson/summary_test.go
deleted file mode 100644
index b3dc846b67b45..0000000000000
--- a/pkg/services/store/kind/geojson/summary_test.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package geojson
-
-import (
-	"context"
-	"encoding/json"
-	"os"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestGeoJSONSummary(t *testing.T) {
-	builder := GetEntitySummaryBuilder()
-	geo := []byte(`{"type":"FeatureCo`) // invalid
-	_, _, err := builder(context.Background(), "hello", geo)
-	require.Error(t, err)
-
-	geo = []byte(`{"type":"FeatureCollection","features":[]}`)
-	summary, out, err := builder(context.Background(), "hello", geo)
-	require.NoError(t, err)
-	require.NotEqual(t, geo, out) // wrote json
-
-	asjson, err := json.MarshalIndent(summary, "", "  ")
-	//fmt.Printf(string(asjson))
-	require.NoError(t, err)
-	require.JSONEq(t, `{
-		"uid": "hello",
-		"kind": "geojson",
-		"name": "hello",
-		"fields": {
-			"type": "FeatureCollection",
-			"count": 0
-		}
-	  }`, string(asjson))
-
-	// Ignore gosec warning G304 since it's a test
-	// nolint:gosec
-	airports, err := os.ReadFile("../../../../../public/gazetteer/airports.geojson")
-	require.NoError(t, err)
-	summary, _, err = builder(context.Background(), "gaz/airports.geojson", airports)
-	require.NoError(t, err)
-	asjson, err = json.MarshalIndent(summary, "", "  ")
-	//fmt.Printf(string(asjson))
-	require.NoError(t, err)
-	require.JSONEq(t, `{
-		"uid": "gaz/airports.geojson",
-		"kind": "geojson",
-		"name": "airports",
-		"fields": {
-			"type": "FeatureCollection",
-			"count": 888
-		}
-	  }`, string(asjson))
-}
diff --git a/pkg/services/store/kind/jsonobj/summary.go b/pkg/services/store/kind/jsonobj/summary.go
deleted file mode 100644
index 7d05fdc6bfb20..0000000000000
--- a/pkg/services/store/kind/jsonobj/summary.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package jsonobj
-
-import (
-	"context"
-	"encoding/json"
-
-	"github.com/grafana/grafana/pkg/services/store"
-	"github.com/grafana/grafana/pkg/services/store/entity"
-)
-
-func GetEntityKindInfo() entity.EntityKindInfo {
-	return entity.EntityKindInfo{
-		ID:          entity.StandardKindJSONObj,
-		Name:        "JSON Object",
-		Description: "JSON Object",
-	}
-}
-
-func GetEntitySummaryBuilder() entity.EntitySummaryBuilder {
-	return func(ctx context.Context, uid string, body []byte) (*entity.EntitySummary, []byte, error) {
-		v := make(map[string]any)
-		err := json.Unmarshal(body, &v)
-		if err != nil {
-			return nil, nil, err
-		}
-
-		out, err := json.MarshalIndent(v, "", "  ")
-		if err != nil {
-			return nil, nil, err
-		}
-		return &entity.EntitySummary{
-			Kind: entity.StandardKindJSONObj,
-			Name: store.GuessNameFromUID(uid),
-			UID:  uid,
-		}, out, err
-	}
-}
diff --git a/pkg/services/store/kind/jsonobj/summary_test.go b/pkg/services/store/kind/jsonobj/summary_test.go
deleted file mode 100644
index 9866352b6fe83..0000000000000
--- a/pkg/services/store/kind/jsonobj/summary_test.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package jsonobj
-
-import (
-	"context"
-	"encoding/json"
-	"testing"
-	"time"
-
-	"github.com/grafana/grafana-plugin-sdk-go/data"
-	"github.com/stretchr/testify/require"
-)
-
-func TestDataFrameSummary(t *testing.T) {
-	// Just creating a JSON blob
-	df := data.NewFrame("http_requests_total",
-		data.NewField("timestamp", nil, []time.Time{time.Now(), time.Now(), time.Now()}).SetConfig(&data.FieldConfig{
-			DisplayName: "A time Column.",
-		}),
-		data.NewField("value", data.Labels{"service": "auth"}, []float64{1.0, 2.0, 3.0}),
-		data.NewField("category", data.Labels{"service": "auth"}, []string{"foo", "bar", "test"}),
-		data.NewField("valid", data.Labels{"service": "auth"}, []bool{true, false, true}),
-	)
-	in, err := data.FrameToJSON(df, data.IncludeAll)
-	require.NoError(t, err)
-
-	summary, out, err := GetEntitySummaryBuilder()(context.Background(), "path/to/item", in)
-	require.NoError(t, err)
-	require.JSONEq(t, string(in), string(out)) // same json
-
-	asjson, err := json.MarshalIndent(summary, "", "  ")
-	// fmt.Printf(string(asjson))
-	require.NoError(t, err)
-	require.JSONEq(t, `{
-		"name": "item",
-		"uid": "path/to/item",
-		"kind": "jsonobj"
-	  }`, string(asjson))
-}
diff --git a/pkg/services/store/kind/png/summary.go b/pkg/services/store/kind/png/summary.go
deleted file mode 100644
index 57a615ab1527a..0000000000000
--- a/pkg/services/store/kind/png/summary.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package png
-
-import (
-	"bytes"
-	"context"
-	"image/png"
-
-	"github.com/grafana/grafana/pkg/services/store"
-	"github.com/grafana/grafana/pkg/services/store/entity"
-)
-
-func GetEntityKindInfo() entity.EntityKindInfo {
-	return entity.EntityKindInfo{
-		ID:            entity.StandardKindPNG,
-		Name:          "PNG",
-		Description:   "PNG Image file",
-		IsRaw:         true,
-		FileExtension: "png",
-		MimeType:      "image/png",
-	}
-}
-
-// SVG sanitizer based on the rendering service
-func GetEntitySummaryBuilder() entity.EntitySummaryBuilder {
-	return func(ctx context.Context, uid string, body []byte) (*entity.EntitySummary, []byte, error) {
-		img, err := png.Decode(bytes.NewReader(body))
-		if err != nil {
-			return nil, nil, err
-		}
-
-		size := img.Bounds().Size()
-		summary := &entity.EntitySummary{
-			Kind: entity.StandardKindSVG,
-			Name: store.GuessNameFromUID(uid),
-			UID:  uid,
-			Fields: map[string]any{
-				"width":  int64(size.X),
-				"height": int64(size.Y),
-			},
-		}
-		return summary, body, nil
-	}
-}
diff --git a/pkg/services/store/kind/png/summary_test.go b/pkg/services/store/kind/png/summary_test.go
deleted file mode 100644
index 00bf46271366d..0000000000000
--- a/pkg/services/store/kind/png/summary_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package png
-
-import (
-	"context"
-	"encoding/base64"
-	"encoding/json"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestPNGSummary(t *testing.T) {
-	const gopher = `iVBORw0KGgoAAAANSUhEUgAAAEsAAAA8CAAAAAALAhhPAAAFfUlEQVRYw62XeWwUVRzHf2+OPbo9d7tsWyiyaZti6eWGAhISoIGKECEKCAiJJkYTiUgTMYSIosYYBBIUIxoSPIINEBDi2VhwkQrVsj1ESgu9doHWdrul7ba73WNm3vOPtsseM9MdwvvrzTs+8/t95ze/33sI5BqiabU6m9En8oNjduLnAEDLUsQXFF8tQ5oxK3vmnNmDSMtrncks9Hhtt/qeWZapHb1ha3UqYSWVl2ZmpWgaXMXGohQAvmeop3bjTRtv6SgaK/Pb9/bFzUrYslbFAmHPp+3WhAYdr+7GN/YnpN46Opv55VDsJkoEpMrY/vO2BIYQ6LLvm0ThY3MzDzzeSJeeWNyTkgnIE5ePKsvKlcg/0T9QMzXalwXMlj54z4c0rh/mzEfr+FgWEz2w6uk8dkzFAgcARAgNp1ZYef8bH2AgvuStbc2/i6CiWGj98y2tw2l4FAXKkQBIf+exyRnteY83LfEwDQAYCoK+P6bxkZm/0966LxcAAILHB56kgD95PPxltuYcMtFTWw/FKkY/6Opf3GGd9ZF+Qp6mzJxzuRSractOmJrH1u8XTvWFHINNkLQLMR+XHXvfPPHw967raE1xxwtA36IMRfkAAG29/7mLuQcb2WOnsJReZGfpiHsSBX81cvMKywYZHhX5hFPtOqPGWZCXnhWGAu6lX91ElKXSalcLXu3UaOXVay57ZSe5f6Gpx7J2MXAsi7EqSp09b/MirKSyJfnfEEgeDjl8FgDAfvewP03zZ+AJ0m9aFRM8eEHBDRKjfcreDXnZdQuAxXpT2NRJ7xl3UkLBhuVGU16gZiGOgZmrSbRdqkILuL/yYoSXHHkl9KXgqNu3PB8oRg0geC5vFmLjad6mUyTKLmF3OtraWDIfACyXqmephaDABawfpi6tqqBZytfQMqOz6S09iWXhktrRaB8Xz4Yi/8gyABDm5NVe6qq/3VzPrcjELWrebVuyY2T7ar4zQyybUCtsQ5Es1FGaZVrRVQwAgHGW2ZCRZshI5bGQi7HesyE972pOSeMM0dSktlzxRdrlqb3Osa6CCS8IJoQQQgBAbTAa5l5epO34rJszibJI8rxLfGzcp1dRosutGeb2VDNgqYrwTiPNsLxXiPi3dz7LiS1WBRBDBOnqEjyy3aQb+/bLiJzz9dIkscVBBLxMfSEac7kO4Fpkngi0ruNBeSOal+u8jgOuqPz12nryMLCniEjtOOOmpt+KEIqsEdocJjYXwrh9OZqWJQyPCTo67LNS/TdxLAv6R5ZNK9npEjbYdT33gRo4o5oTqR34R+OmaSzDBWsAIPhuRcgyoteNi9gF0KzNYWVItPf2TLoXEg+7isNC7uJkgo1iQWOfRSP9NR11RtbZZ3OMG/VhL6jvx+J1m87+RCfJChAtEBQkSBX2PnSiihc/Twh3j0h7qdYQAoRVsRGmq7HU2QRbaxVGa1D6nIOqaIWRjyRZpHMQKWKpZM5feA+lzC4ZFultV8S6T0mzQGhQohi5I8iw+CsqBSxhFMuwyLgSwbghGb0AiIKkSDmGZVmJSiKihsiyOAUs70UkywooYP0bii9GdH4sfr1UNysd3fUyLLMQN+rsmo3grHl9VNJHbbwxoa47Vw5gupIqrZcjPh9R4Nye3nRDk199V+aetmvVtDRE8/+cbgAAgMIWGb3UA0MGLE9SCbWX670TDy1y98c3D27eppUjsZ6fql3jcd5rUe7+ZIlLNQny3Rd+E5Tct3WVhTM5RBCEdiEK0b6B+/ca2gYU393nFj/n1AygRQxPIUA043M42u85+z2SnssKrPl8Mx76NL3E6eXc3be7OD+H4WHbJkKI8AU8irbITQjZ+0hQcPEgId/Fn/pl9crKH02+5o2b9T/eMx7pKoskYgAAAABJRU5ErkJggg==`
-	img, err := base64.StdEncoding.DecodeString(gopher)
-	require.NoError(t, err)
-
-	summary, out, err := GetEntitySummaryBuilder()(context.Background(), "hello.png", img)
-	require.NoError(t, err)
-	require.Equal(t, img, out) // same image
-
-	asjson, err := json.MarshalIndent(summary, "", "  ")
-	//fmt.Printf(string(asjson))
-	require.NoError(t, err)
-	require.JSONEq(t, `{
-		"uid": "hello.png",
-		"kind": "svg",
-		"name": "hello",
-		"fields": {
-		  "height": 60,
-		  "width": 75
-		}
-	  }`, string(asjson))
-}
diff --git a/pkg/services/store/kind/preferences/summary.go b/pkg/services/store/kind/preferences/summary.go
deleted file mode 100644
index e837bac219a27..0000000000000
--- a/pkg/services/store/kind/preferences/summary.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package preferences
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"strings"
-
-	"github.com/grafana/grafana/pkg/kinds/preferences"
-	"github.com/grafana/grafana/pkg/services/store/entity"
-)
-
-func GetEntityKindInfo() entity.EntityKindInfo {
-	return entity.EntityKindInfo{
-		ID:   entity.StandardKindPreferences,
-		Name: "Preferences",
-	}
-}
-
-func GetEntitySummaryBuilder() entity.EntitySummaryBuilder {
-	return func(ctx context.Context, uid string, body []byte) (*entity.EntitySummary, []byte, error) {
-		if uid != "default" {
-			if !(strings.HasPrefix(uid, "user-") || strings.HasPrefix(uid, "team-")) {
-				return nil, nil, fmt.Errorf("expecting UID: default, user-{#}, or team-{#}")
-			}
-		}
-
-		obj := &preferences.Spec{}
-		err := json.Unmarshal(body, obj)
-		if err != nil {
-			return nil, nil, err // unable to read object
-		}
-
-		summary := &entity.EntitySummary{
-			Kind: entity.StandardKindPreferences,
-			Name: uid, // team-${id} | user-${id}
-			UID:  uid,
-		}
-
-		if obj.HomeDashboardUID != nil && *obj.HomeDashboardUID != "" {
-			summary.References = append(summary.References, &entity.EntityExternalReference{
-				Family:     entity.StandardKindDashboard,
-				Identifier: *obj.HomeDashboardUID,
-			})
-		}
-
-		out, err := json.MarshalIndent(obj, "", "  ")
-		return summary, out, err
-	}
-}
diff --git a/pkg/services/store/kind/registry.go b/pkg/services/store/kind/registry.go
deleted file mode 100644
index d6c9f6d27a551..0000000000000
--- a/pkg/services/store/kind/registry.go
+++ /dev/null
@@ -1,182 +0,0 @@
-package kind
-
-import (
-	"fmt"
-	"sort"
-	"sync"
-
-	"github.com/grafana/grafana/pkg/services/rendering"
-	"github.com/grafana/grafana/pkg/services/store/entity"
-	"github.com/grafana/grafana/pkg/services/store/kind/dashboard"
-	"github.com/grafana/grafana/pkg/services/store/kind/dataframe"
-	"github.com/grafana/grafana/pkg/services/store/kind/folder"
-	"github.com/grafana/grafana/pkg/services/store/kind/geojson"
-	"github.com/grafana/grafana/pkg/services/store/kind/jsonobj"
-	"github.com/grafana/grafana/pkg/services/store/kind/png"
-	"github.com/grafana/grafana/pkg/services/store/kind/preferences"
-	"github.com/grafana/grafana/pkg/services/store/kind/snapshot"
-	"github.com/grafana/grafana/pkg/services/store/kind/svg"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-type KindRegistry interface {
-	Register(info entity.EntityKindInfo, builder entity.EntitySummaryBuilder) error
-	GetSummaryBuilder(kind string) entity.EntitySummaryBuilder
-	GetInfo(kind string) (entity.EntityKindInfo, error)
-	GetFromExtension(suffix string) (entity.EntityKindInfo, error)
-	GetKinds() []entity.EntityKindInfo
-}
-
-func NewKindRegistry() KindRegistry {
-	kinds := make(map[string]*kindValues)
-	kinds[entity.StandardKindDashboard] = &kindValues{
-		info:    dashboard.GetEntityKindInfo(),
-		builder: dashboard.GetEntitySummaryBuilder(),
-	}
-	kinds[entity.StandardKindSnapshot] = &kindValues{
-		info:    snapshot.GetEntityKindInfo(),
-		builder: snapshot.GetEntitySummaryBuilder(),
-	}
-	kinds[entity.StandardKindFolder] = &kindValues{
-		info:    folder.GetEntityKindInfo(),
-		builder: folder.GetEntitySummaryBuilder(),
-	}
-	kinds[entity.StandardKindPNG] = &kindValues{
-		info:    png.GetEntityKindInfo(),
-		builder: png.GetEntitySummaryBuilder(),
-	}
-	kinds[entity.StandardKindGeoJSON] = &kindValues{
-		info:    geojson.GetEntityKindInfo(),
-		builder: geojson.GetEntitySummaryBuilder(),
-	}
-	kinds[entity.StandardKindDataFrame] = &kindValues{
-		info:    dataframe.GetEntityKindInfo(),
-		builder: dataframe.GetEntitySummaryBuilder(),
-	}
-	kinds[entity.StandardKindJSONObj] = &kindValues{
-		info:    jsonobj.GetEntityKindInfo(),
-		builder: jsonobj.GetEntitySummaryBuilder(),
-	}
-	kinds[entity.StandardKindPreferences] = &kindValues{
-		info:    preferences.GetEntityKindInfo(),
-		builder: preferences.GetEntitySummaryBuilder(),
-	}
-
-	// create a registry
-	reg := &registry{
-		mutex: sync.RWMutex{},
-		kinds: kinds,
-	}
-	reg.updateInfoArray()
-	return reg
-}
-
-// TODO? This could be a zero dependency service that others are responsible for configuring
-func ProvideService(cfg *setting.Cfg, renderer rendering.Service) KindRegistry {
-	reg := NewKindRegistry()
-
-	// Register SVG support
-	//-----------------------
-	info := svg.GetEntityKindInfo()
-	allowUnsanitizedSvgUpload := cfg != nil && cfg.Storage.AllowUnsanitizedSvgUpload
-	support := svg.GetEntitySummaryBuilder(allowUnsanitizedSvgUpload, renderer)
-	_ = reg.Register(info, support)
-
-	return reg
-}
-
-type kindValues struct {
-	info    entity.EntityKindInfo
-	builder entity.EntitySummaryBuilder
-}
-
-type registry struct {
-	mutex  sync.RWMutex
-	kinds  map[string]*kindValues
-	info   []entity.EntityKindInfo
-	suffix map[string]entity.EntityKindInfo
-}
-
-func (r *registry) updateInfoArray() {
-	suffix := make(map[string]entity.EntityKindInfo)
-	info := make([]entity.EntityKindInfo, 0, len(r.kinds))
-	for _, v := range r.kinds {
-		info = append(info, v.info)
-		if v.info.FileExtension != "" {
-			suffix[v.info.FileExtension] = v.info
-		}
-	}
-	sort.Slice(info, func(i, j int) bool {
-		return info[i].ID < info[j].ID
-	})
-	r.info = info
-	r.suffix = suffix
-}
-
-func (r *registry) Register(info entity.EntityKindInfo, builder entity.EntitySummaryBuilder) error {
-	if info.ID == "" || builder == nil {
-		return fmt.Errorf("invalid kind")
-	}
-
-	r.mutex.Lock()
-	defer r.mutex.Unlock()
-
-	if r.kinds[info.ID] != nil {
-		return fmt.Errorf("already exits")
-	}
-
-	r.kinds[info.ID] = &kindValues{
-		info:    info,
-		builder: builder,
-	}
-	r.updateInfoArray()
-	return nil
-}
-
-// GetSummaryBuilder returns a builder or nil if not found
-func (r *registry) GetSummaryBuilder(kind string) entity.EntitySummaryBuilder {
-	r.mutex.RLock()
-	defer r.mutex.RUnlock()
-
-	v, ok := r.kinds[kind]
-	if !ok {
-		// fallback to default
-		v, ok = r.kinds[entity.StandardKindJSONObj]
-	}
-	if ok {
-		return v.builder
-	}
-	return nil
-}
-
-// GetInfo returns the registered info
-func (r *registry) GetInfo(kind string) (entity.EntityKindInfo, error) {
-	r.mutex.RLock()
-	defer r.mutex.RUnlock()
-
-	v, ok := r.kinds[kind]
-	if ok {
-		return v.info, nil
-	}
-	return entity.EntityKindInfo{}, fmt.Errorf("not found")
-}
-
-// GetInfo returns the registered info
-func (r *registry) GetFromExtension(suffix string) (entity.EntityKindInfo, error) {
-	r.mutex.RLock()
-	defer r.mutex.RUnlock()
-
-	v, ok := r.suffix[suffix]
-	if ok {
-		return v, nil
-	}
-	return entity.EntityKindInfo{}, fmt.Errorf("not found")
-}
-
-// GetSummaryBuilder returns a builder or nil if not found
-func (r *registry) GetKinds() []entity.EntityKindInfo {
-	r.mutex.RLock()
-	defer r.mutex.RUnlock()
-
-	return r.info // returns a copy of the array
-}
diff --git a/pkg/services/store/kind/registry_test.go b/pkg/services/store/kind/registry_test.go
deleted file mode 100644
index a9e501ed5f860..0000000000000
--- a/pkg/services/store/kind/registry_test.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package kind
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/services/store/kind/dummy"
-)
-
-func TestKindRegistry(t *testing.T) {
-	registry := NewKindRegistry()
-	err := registry.Register(dummy.GetEntityKindInfo("test"), dummy.GetEntitySummaryBuilder("test"))
-	require.NoError(t, err)
-
-	ids := []string{}
-	for _, k := range registry.GetKinds() {
-		ids = append(ids, k.ID)
-	}
-	require.Equal(t, []string{
-		"dashboard",
-		"folder",
-		"frame",
-		"geojson",
-		"jsonobj",
-		"png",
-		"preferences",
-		"snapshot",
-		"test",
-	}, ids)
-
-	// Check that we registered a test item
-	info, err := registry.GetInfo("test")
-	require.NoError(t, err)
-	require.Equal(t, "test", info.Name)
-	require.True(t, info.IsRaw)
-
-	// Get by suffix
-	info, err = registry.GetFromExtension("png")
-	require.NoError(t, err)
-	require.Equal(t, "PNG", info.Name)
-	require.True(t, info.IsRaw)
-}
diff --git a/pkg/services/store/kind/snapshot/summary.go b/pkg/services/store/kind/snapshot/summary.go
deleted file mode 100644
index d19ed188a1630..0000000000000
--- a/pkg/services/store/kind/snapshot/summary.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package snapshot
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-
-	"github.com/grafana/grafana/pkg/services/store/entity"
-)
-
-// A snapshot is a dashboard with no external queries and a few additional properties
-type Model struct {
-	Name         string          `json:"name"`
-	Description  string          `json:"description,omitempty"`
-	DeleteKey    string          `json:"deleteKey"`
-	ExternalURL  string          `json:"externalURL"`
-	Expires      int64           `json:"expires,omitempty"` // time that this expires
-	DashboardUID string          `json:"dashboard,omitempty"`
-	Snapshot     json.RawMessage `json:"snapshot,omitempty"`
-}
-
-func GetEntityKindInfo() entity.EntityKindInfo {
-	return entity.EntityKindInfo{
-		ID:   entity.StandardKindSnapshot,
-		Name: "Snapshot",
-	}
-}
-
-func GetEntitySummaryBuilder() entity.EntitySummaryBuilder {
-	return func(ctx context.Context, uid string, body []byte) (*entity.EntitySummary, []byte, error) {
-		obj := &Model{}
-		err := json.Unmarshal(body, obj)
-		if err != nil {
-			return nil, nil, err // unable to read object
-		}
-
-		if obj.Name == "" {
-			return nil, nil, fmt.Errorf("expected snapshot name")
-		}
-		if obj.DeleteKey == "" {
-			return nil, nil, fmt.Errorf("expected delete key")
-		}
-
-		summary := &entity.EntitySummary{
-			Kind:        entity.StandardKindFolder,
-			Name:        obj.Name,
-			Description: obj.Description,
-			UID:         uid,
-			Fields: map[string]interface{}{
-				"deleteKey":   obj.DeleteKey,
-				"externalURL": obj.ExternalURL,
-				"expires":     obj.Expires,
-			},
-			References: []*entity.EntityExternalReference{
-				{Family: entity.StandardKindDashboard, Identifier: obj.DashboardUID},
-			},
-		}
-
-		// Keep the original body
-		return summary, body, err
-	}
-}
diff --git a/pkg/services/store/kind/svg/summary.go b/pkg/services/store/kind/svg/summary.go
deleted file mode 100644
index 474a81fb5e2a1..0000000000000
--- a/pkg/services/store/kind/svg/summary.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package svg
-
-import (
-	"context"
-	"fmt"
-	"strings"
-
-	"github.com/grafana/grafana/pkg/services/rendering"
-	"github.com/grafana/grafana/pkg/services/store/entity"
-)
-
-func GetEntityKindInfo() entity.EntityKindInfo {
-	return entity.EntityKindInfo{
-		ID:            entity.StandardKindSVG,
-		Name:          "SVG",
-		Description:   "Scalable Vector Graphics",
-		IsRaw:         true,
-		FileExtension: "svg",
-		MimeType:      "image/svg+xml",
-	}
-}
-
-// SVG sanitizer based on the rendering service
-func GetEntitySummaryBuilder(allowUnsanitizedSvgUpload bool, renderer rendering.Service) entity.EntitySummaryBuilder {
-	return func(ctx context.Context, uid string, body []byte) (*entity.EntitySummary, []byte, error) {
-		if !IsSVG(body) {
-			return nil, nil, fmt.Errorf("invalid svg")
-		}
-
-		// When a renderer exists, we can return a sanitized version
-		var sanitized []byte
-		if renderer != nil {
-			rsp, err := renderer.SanitizeSVG(ctx, &rendering.SanitizeSVGRequest{
-				Content: body,
-			})
-			if err != nil && !allowUnsanitizedSvgUpload {
-				return nil, nil, err
-			}
-			sanitized = rsp.Sanitized
-		}
-		if sanitized == nil {
-			if !allowUnsanitizedSvgUpload {
-				return nil, nil, fmt.Errorf("unable to sanitize svg")
-			}
-			sanitized = body
-		}
-
-		return &entity.EntitySummary{
-			Kind: entity.StandardKindSVG,
-			Name: guessNameFromUID(uid),
-			UID:  uid,
-		}, sanitized, nil
-	}
-}
-
-func guessNameFromUID(uid string) string {
-	sidx := strings.LastIndex(uid, "/") + 1
-	didx := strings.LastIndex(uid, ".")
-	if didx > sidx && didx != sidx {
-		return uid[sidx:didx]
-	}
-	if sidx > 0 {
-		return uid[sidx:]
-	}
-	return uid
-}
diff --git a/pkg/services/store/resolver/service.go b/pkg/services/store/resolver/service.go
index 8adf1c6251e7f..2f9dfa0622401 100644
--- a/pkg/services/store/resolver/service.go
+++ b/pkg/services/store/resolver/service.go
@@ -23,7 +23,7 @@ var getNow = func() time.Time { return time.Now() }
 
 type ResolutionInfo struct {
 	OK        bool      `json:"ok"`
-	Key       string    `json:"key,omitempty"`  // GRN? UID?
+	Key       string    `json:"key,omitempty"`  // k8s key
 	Warning   string    `json:"kind,omitempty"` // old syntax?  (name>uid) references a renamed object?
 	Timestamp time.Time `json:"timestamp,omitempty"`
 }
diff --git a/pkg/services/store/service.go b/pkg/services/store/service.go
index 61bb61a50f012..fe523f80f52d4 100644
--- a/pkg/services/store/service.go
+++ b/pkg/services/store/service.go
@@ -19,7 +19,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/quota"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
-	"github.com/grafana/grafana/pkg/services/store/entity/migrations"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -64,7 +63,7 @@ type StorageService interface {
 	RegisterHTTPRoutes(routing.RouteRegister)
 
 	// List folder contents
-	List(ctx context.Context, user *user.SignedInUser, path string) (*StorageListFrame, error)
+	List(ctx context.Context, user *user.SignedInUser, path string, maxFiles int) (*StorageListFrame, error)
 
 	// Read raw file contents out of the store
 	Read(ctx context.Context, user *user.SignedInUser, path string) (*filestorage.File, error)
@@ -104,10 +103,6 @@ func ProvideService(
 		grafanaStorageLogger.Warn("Error loading storage config", "error", err)
 	}
 
-	if err := migrations.MigrateEntityStore(sql, features); err != nil {
-		return nil, err
-	}
-
 	// always exists
 	globalRoots := []storageRuntime{
 		newDiskStorage(RootStorageMeta{
@@ -130,7 +125,7 @@ func ProvideService(
 	}
 
 	// Development dashboards
-	if settings.AddDevEnv && setting.Env != setting.Prod {
+	if settings.AddDevEnv && cfg.Env != setting.Prod {
 		devenv := filepath.Join(cfg.StaticRootPath, "..", "devenv")
 		if _, err := os.Stat(devenv); !os.IsNotExist(err) {
 			s := newDiskStorage(RootStorageMeta{
@@ -340,9 +335,9 @@ func getOrgId(user *user.SignedInUser) int64 {
 	return user.OrgID
 }
 
-func (s *standardStorageService) List(ctx context.Context, user *user.SignedInUser, path string) (*StorageListFrame, error) {
+func (s *standardStorageService) List(ctx context.Context, user *user.SignedInUser, path string, maxFiles int) (*StorageListFrame, error) {
 	guardian := s.authService.newGuardian(ctx, user, getFirstSegment(path))
-	return s.tree.ListFolder(ctx, getOrgId(user), path, guardian.getPathFilter(ActionFilesRead))
+	return s.tree.ListFolder(ctx, getOrgId(user), path, maxFiles, guardian.getPathFilter(ActionFilesRead))
 }
 
 func (s *standardStorageService) Read(ctx context.Context, user *user.SignedInUser, path string) (*filestorage.File, error) {
@@ -603,21 +598,7 @@ func (s *standardStorageService) getWorkflowOptions(ctx context.Context, user *u
 	}
 
 	meta := root.Meta()
-	if meta.Config.Type == rootStorageTypeGit && meta.Config.Git != nil {
-		cfg := meta.Config.Git
-		options.Workflows = append(options.Workflows, workflowInfo{
-			Type:        WriteValueWorkflow_PR,
-			Label:       "Create pull request",
-			Description: "Create a new upstream pull request",
-		})
-		if !cfg.RequirePullRequest {
-			options.Workflows = append(options.Workflows, workflowInfo{
-				Type:        WriteValueWorkflow_Push,
-				Label:       "Push to " + cfg.Branch,
-				Description: "Push commit to upstrem repository",
-			})
-		}
-	} else if meta.ReadOnly {
+	if meta.ReadOnly {
 		// nothing?
 	} else {
 		options.Workflows = append(options.Workflows, workflowInfo{
diff --git a/pkg/services/store/service_test.go b/pkg/services/store/service_test.go
index 05fe50066d9e2..298d41a0d91d5 100644
--- a/pkg/services/store/service_test.go
+++ b/pkg/services/store/service_test.go
@@ -19,6 +19,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 	testdatasource "github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource"
 )
 
@@ -68,13 +69,17 @@ var (
 			}})
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestListFiles(t *testing.T) {
 	roots := []storageRuntime{publicStaticFilesStorage}
 
 	store := newStandardStorageService(db.InitTestDB(t), roots, func(orgId int64) []storageRuntime {
 		return make([]storageRuntime, 0)
 	}, allowAllAuthService, cfg, nil)
-	frame, err := store.List(context.Background(), dummyUser, "public/maps")
+	frame, err := store.List(context.Background(), dummyUser, "public/maps", 0)
 	require.NoError(t, err)
 
 	experimental.CheckGoldenJSONFrame(t, "testdata", "public_testdata.golden", frame.Frame, true)
@@ -95,7 +100,7 @@ func TestListFilesWithoutPermissions(t *testing.T) {
 	store := newStandardStorageService(db.InitTestDB(t), roots, func(orgId int64) []storageRuntime {
 		return make([]storageRuntime, 0)
 	}, denyAllAuthService, cfg, nil)
-	frame, err := store.List(context.Background(), dummyUser, "public/maps")
+	frame, err := store.List(context.Background(), dummyUser, "public/maps", 0)
 	require.NoError(t, err)
 	rowLen, err := frame.RowLen()
 	require.NoError(t, err)
@@ -371,7 +376,7 @@ func TestContentRootWithNestedStorage(t *testing.T) {
 				Files: []*filestorage.File{},
 			}, nil)
 
-			_, err := store.List(context.Background(), test.user, RootContent+"/"+test.nestedRoot)
+			_, err := store.List(context.Background(), test.user, RootContent+"/"+test.nestedRoot, 0)
 			require.NoError(t, err)
 		})
 
@@ -387,7 +392,7 @@ func TestContentRootWithNestedStorage(t *testing.T) {
 				Files: []*filestorage.File{},
 			}, nil)
 
-			_, err := store.List(context.Background(), test.user, strings.Join([]string{RootContent, test.nestedRoot, "folder1", "folder2"}, "/"))
+			_, err := store.List(context.Background(), test.user, strings.Join([]string{RootContent, test.nestedRoot, "folder1", "folder2"}, "/"), 0)
 			require.NoError(t, err)
 		})
 
@@ -434,16 +439,16 @@ func TestContentRootWithNestedStorage(t *testing.T) {
 				Files: []*filestorage.File{},
 			}, nil)
 
-			_, err := store.List(context.Background(), test.user, strings.Join([]string{RootContent, "not-nested-content"}, "/"))
+			_, err := store.List(context.Background(), test.user, strings.Join([]string{RootContent, "not-nested-content"}, "/"), 0)
 			require.NoError(t, err)
 
-			_, err = store.List(context.Background(), test.user, strings.Join([]string{RootContent, "a", "b", "c"}, "/"))
+			_, err = store.List(context.Background(), test.user, strings.Join([]string{RootContent, "a", "b", "c"}, "/"), 0)
 			require.NoError(t, err)
 
-			_, err = store.List(context.Background(), test.user, strings.Join([]string{RootContent, test.nestedRoot + "a"}, "/"))
+			_, err = store.List(context.Background(), test.user, strings.Join([]string{RootContent, test.nestedRoot + "a"}, "/"), 0)
 			require.NoError(t, err)
 
-			_, err = store.List(context.Background(), test.user, strings.Join([]string{RootContent, test.nestedRoot + "a", "b"}, "/"))
+			_, err = store.List(context.Background(), test.user, strings.Join([]string{RootContent, test.nestedRoot + "a", "b"}, "/"), 0)
 			require.NoError(t, err)
 		})
 
@@ -536,7 +541,7 @@ func TestShadowingExistingFolderByNestedContentRoot(t *testing.T) {
 		AllowUnsanitizedSvgUpload: true,
 	}
 
-	resp, err := store.List(ctx, globalUser, "content/nested")
+	resp, err := store.List(ctx, globalUser, "content/nested", 0)
 	require.NoError(t, err)
 	require.NotNil(t, resp)
 
@@ -544,7 +549,7 @@ func TestShadowingExistingFolderByNestedContentRoot(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, 0, rowLen) // nested storage is empty
 
-	resp, err = store.List(ctx, globalUser, "content")
+	resp, err = store.List(ctx, globalUser, "content", 0)
 	require.NoError(t, err)
 	require.NotNil(t, resp)
 
diff --git a/pkg/services/store/storage_git.go b/pkg/services/store/storage_git.go
deleted file mode 100644
index 803a94649f7f4..0000000000000
--- a/pkg/services/store/storage_git.go
+++ /dev/null
@@ -1,387 +0,0 @@
-package store
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/go-git/go-git/v5"
-	"github.com/go-git/go-git/v5/plumbing/object"
-	"github.com/grafana/grafana-plugin-sdk-go/data"
-	"gocloud.dev/blob"
-
-	"github.com/grafana/grafana/pkg/infra/filestorage"
-	"github.com/grafana/grafana/pkg/services/user"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-const rootStorageTypeGit = "git"
-
-var _ storageRuntime = &rootStorageGit{}
-
-type rootStorageGit struct {
-	settings *StorageGitConfig
-	repo     *git.Repository
-	root     string // repostitory root
-
-	github *githubHelper
-	meta   RootStorageMeta
-	store  filestorage.FileStorage
-}
-
-func newGitStorage(meta RootStorageMeta, scfg RootStorageConfig, localWorkCache string) *rootStorageGit {
-	cfg := scfg.Git
-	if cfg == nil {
-		cfg = &StorageGitConfig{}
-	}
-	scfg.Type = rootStorageTypeGit
-	scfg.GCS = nil
-	scfg.SQL = nil
-	scfg.S3 = nil
-	scfg.Git = cfg
-
-	meta.Config = scfg
-	if scfg.Prefix == "" {
-		meta.Notice = append(meta.Notice, data.Notice{
-			Severity: data.NoticeSeverityError,
-			Text:     "Missing prefix",
-		})
-	}
-	if cfg.Remote == "" {
-		meta.Notice = append(meta.Notice, data.Notice{
-			Severity: data.NoticeSeverityError,
-			Text:     "Missing remote path configuration",
-		})
-	}
-
-	if len(localWorkCache) < 2 {
-		meta.Notice = append(meta.Notice, data.Notice{
-			Severity: data.NoticeSeverityError,
-			Text:     "Invalid local root folder",
-		})
-	}
-
-	s := &rootStorageGit{
-		settings: cfg,
-	}
-	if meta.Notice == nil {
-		err := os.MkdirAll(localWorkCache, 0750)
-		if err != nil {
-			meta.Notice = append(meta.Notice, data.Notice{
-				Severity: data.NoticeSeverityError,
-				Text:     err.Error(),
-			})
-		}
-	}
-
-	if scfg.Disabled {
-		meta.Notice = append(meta.Notice, data.Notice{
-			Severity: data.NoticeSeverityWarning,
-			Text:     "folder is disabled (in configuration)",
-		})
-	} else if setting.Env == setting.Prod {
-		meta.Notice = append(meta.Notice, data.Notice{
-			Severity: data.NoticeSeverityError,
-			Text:     "git is only supported in dev mode (for now)",
-		})
-	}
-
-	if meta.Notice == nil {
-		repo, err := git.PlainOpen(localWorkCache)
-		if errors.Is(err, git.ErrRepositoryNotExists) {
-			repo, err = git.PlainClone(localWorkCache, false, &git.CloneOptions{
-				URL:      cfg.Remote,
-				Progress: os.Stdout,
-				//Depth:    1,
-				//SingleBranch: true,
-			})
-		}
-
-		if err != nil {
-			meta.Notice = append(meta.Notice, data.Notice{
-				Severity: data.NoticeSeverityError,
-				Text:     err.Error(),
-			})
-		}
-
-		if err == nil {
-			p := localWorkCache
-			if cfg.Root != "" {
-				p = filepath.Join(p, cfg.Root)
-			}
-
-			path := fmt.Sprintf("file://%s", p)
-			bucket, err := blob.OpenBucket(context.Background(), path)
-			if err != nil {
-				grafanaStorageLogger.Warn("Error loading storage", "prefix", scfg.Prefix, "err", err)
-				meta.Notice = append(meta.Notice, data.Notice{
-					Severity: data.NoticeSeverityError,
-					Text:     "Failed to initialize storage",
-				})
-			} else {
-				s.store = filestorage.NewCdkBlobStorage(
-					grafanaStorageLogger,
-					bucket, "", nil)
-
-				meta.Ready = true // exists!
-				s.root = p
-
-				token := cfg.AccessToken
-				if strings.HasPrefix(token, "$") {
-					token = os.Getenv(token[1:])
-					if token == "" {
-						meta.Notice = append(meta.Notice, data.Notice{
-							Severity: data.NoticeSeverityError,
-							Text:     "Unable to find token environment variable: " + cfg.AccessToken,
-						})
-					}
-				}
-
-				if token != "" {
-					s.github, err = newGithubHelper(context.Background(), cfg.Remote, token)
-					if err != nil {
-						meta.Notice = append(meta.Notice, data.Notice{
-							Severity: data.NoticeSeverityError,
-							Text:     "error creating github client: " + err.Error(),
-						})
-						s.github = nil
-					} else {
-						ghrepo, _, err := s.github.getRepo(context.Background())
-						if err != nil {
-							meta.Notice = append(meta.Notice, data.Notice{
-								Severity: data.NoticeSeverityError,
-								Text:     err.Error(),
-							})
-							s.github = nil
-						} else {
-							grafanaStorageLogger.Info("Default branch", "branch", *ghrepo.DefaultBranch)
-						}
-					}
-				}
-			}
-		}
-		s.repo = repo
-
-		// Try pulling after init
-		if s.repo != nil && !scfg.Disabled {
-			err = s.Sync()
-			if err != nil {
-				meta.Notice = append(meta.Notice, data.Notice{
-					Severity: data.NoticeSeverityError,
-					Text:     "unable to pull: " + err.Error(),
-				})
-			} else if cfg.PullInterval != "" {
-				t, err := time.ParseDuration(cfg.PullInterval)
-				if err != nil {
-					meta.Notice = append(meta.Notice, data.Notice{
-						Severity: data.NoticeSeverityError,
-						Text:     "Invalid pull interval " + cfg.PullInterval,
-					})
-				} else {
-					ticker := time.NewTicker(t)
-					go func() {
-						for range ticker.C {
-							grafanaStorageLogger.Info("Try git pull", "branch", s.settings.Remote)
-							err = s.Sync()
-							if err != nil {
-								grafanaStorageLogger.Info("Error pulling", "error", err)
-							}
-						}
-					}()
-				}
-			}
-		}
-	}
-
-	s.meta = meta
-	return s
-}
-
-func (s *rootStorageGit) Meta() RootStorageMeta {
-	return s.meta
-}
-
-func (s *rootStorageGit) Store() filestorage.FileStorage {
-	return s.store
-}
-
-func (s *rootStorageGit) Pull() error {
-	w, err := s.repo.Worktree()
-	if err != nil {
-		return err
-	}
-
-	err = w.Pull(&git.PullOptions{
-		// Depth: 1,
-		//SingleBranch: true,
-	})
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (s *rootStorageGit) Write(ctx context.Context, cmd *WriteValueRequest) (*WriteValueResponse, error) {
-	if s.github == nil {
-		return nil, fmt.Errorf("github client not initialized")
-	}
-	// Write to the correct subfolder
-	if s.settings.Root != "" {
-		cmd.Path = s.settings.Root + cmd.Path
-	}
-
-	if cmd.Workflow == WriteValueWorkflow_PR {
-		prcmd := makePRCommand{
-			baseBranch: s.settings.Branch,
-			headBranch: fmt.Sprintf("grafana_ui_%d", time.Now().UnixMilli()),
-			title:      cmd.Title,
-			body:       cmd.Message,
-		}
-		res := &WriteValueResponse{
-			Branch: prcmd.headBranch,
-		}
-
-		ref, _, err := s.github.createRef(ctx, prcmd.baseBranch, prcmd.headBranch)
-		if err != nil {
-			res.Code = 500
-			res.Message = "unable to create branch"
-			return res, nil
-		}
-
-		err = s.github.pushCommit(ctx, ref, cmd)
-		if err != nil {
-			res.Code = 500
-			res.Message = fmt.Sprintf("error creating commit: %s", err.Error())
-			return res, nil
-		}
-
-		if prcmd.title == "" {
-			prcmd.title = "Dashboard save: " + time.Now().String()
-		}
-		if prcmd.body == "" {
-			prcmd.body = "Dashboard save: " + time.Now().String()
-		}
-
-		pr, _, err := s.github.createPR(ctx, prcmd)
-		if err != nil {
-			res.Code = 500
-			res.Message = "error creating PR: " + err.Error()
-			return res, nil
-		}
-
-		res.Code = 200
-		res.URL = pr.GetHTMLURL()
-		res.Pending = true
-		res.Hash = *ref.Object.SHA
-		res.Branch = prcmd.headBranch
-		return res, nil
-	}
-
-	// Push to remote branch (save)
-	if cmd.Workflow == WriteValueWorkflow_Push || true {
-		res := &WriteValueResponse{
-			Branch: s.settings.Branch,
-		}
-		ref, _, err := s.github.getRef(ctx, s.settings.Branch)
-		if err != nil {
-			res.Code = 500
-			res.Message = "unable to create branch"
-			return res, nil
-		}
-		err = s.github.pushCommit(ctx, ref, cmd)
-		if err != nil {
-			res.Code = 500
-			res.Message = "error creating commit"
-			return res, nil
-		}
-		ref, _, _ = s.github.getRef(ctx, s.settings.Branch)
-		if ref != nil {
-			res.Hash = *ref.Object.SHA
-			res.URL = ref.GetURL()
-		}
-
-		err = s.Pull()
-		if err != nil {
-			res.Message = "error pulling: " + err.Error()
-		}
-
-		res.Code = 200
-		return res, nil
-	}
-
-	rel := cmd.Path
-	if s.meta.Config.Git.Root != "" {
-		rel = filepath.Join(s.meta.Config.Git.Root, cmd.Path)
-	}
-
-	fpath := filepath.Join(s.root, rel)
-	err := os.WriteFile(fpath, cmd.Body, 0644)
-	if err != nil {
-		return nil, err
-	}
-
-	w, err := s.repo.Worktree()
-	if err != nil {
-		return nil, err
-	}
-
-	// The file we just wrote
-	_, err = w.Add(rel)
-	if err != nil {
-		return nil, err
-	}
-
-	msg := cmd.Message
-	if msg == "" {
-		msg = "changes from grafana ui"
-	}
-	usr := cmd.User
-	if usr == nil {
-		usr = &user.SignedInUser{}
-	}
-
-	hash, err := w.Commit(msg, &git.CommitOptions{
-		Author: &object.Signature{
-			Name:  firstRealString(usr.Name, usr.Login, usr.Email, "?"),
-			Email: firstRealString(usr.Email, usr.Login, usr.Name, "?"),
-			When:  time.Now(),
-		},
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	grafanaStorageLogger.Info("Made commit", "hash", hash)
-	// err = s.repo.Push(&git.PushOptions{
-	// 	InsecureSkipTLS: true,
-	// })
-
-	return &WriteValueResponse{
-		Hash:    hash.String(),
-		Message: "made commit",
-	}, nil
-}
-
-func (s *rootStorageGit) Sync() error {
-	grafanaStorageLogger.Info("GIT PULL", "remote", s.settings.Remote)
-	err := s.Pull()
-	if err != nil {
-		if err.Error() == "already up-to-date" {
-			return nil
-		}
-	}
-	return err
-}
-
-func firstRealString(vals ...string) string {
-	for _, v := range vals {
-		if v != "" {
-			return v
-		}
-	}
-	return "?"
-}
diff --git a/pkg/services/store/testdata/public_testdata.golden.jsonc b/pkg/services/store/testdata/public_testdata.golden.jsonc
index bb87315815cc5..a37239596c299 100644
--- a/pkg/services/store/testdata/public_testdata.golden.jsonc
+++ b/pkg/services/store/testdata/public_testdata.golden.jsonc
@@ -11,15 +11,16 @@
 //      }
 //  }
 //  Name: 
-//  Dimensions: 3 Fields by 2 Rows
-//  +--------------------+----------------------+---------------+
-//  | Name: name         | Name: mediaType      | Name: size    |
-//  | Labels:            | Labels:              | Labels:       |
-//  | Type: []string     | Type: []string       | Type: []int64 |
-//  +--------------------+----------------------+---------------+
-//  | countries.geojson  | application/geo+json | 255943        |
-//  | usa-states.geojson | application/geo+json | 89263         |
-//  +--------------------+----------------------+---------------+
+//  Dimensions: 3 Fields by 3 Rows
+//  +----------------------------+----------------------+---------------+
+//  | Name: name                 | Name: mediaType      | Name: size    |
+//  | Labels:                    | Labels:              | Labels:       |
+//  | Type: []string             | Type: []string       | Type: []int64 |
+//  +----------------------------+----------------------+---------------+
+//  | countries.geojson          | application/geo+json | 255943        |
+//  | example-with-style.geojson | application/geo+json | 3332          |
+//  | usa-states.geojson         | application/geo+json | 89263         |
+//  +----------------------------+----------------------+---------------+
 //  
 //  
 //  🌟 This was machine generated.  Do not edit. 🌟
@@ -69,14 +70,17 @@
         "values": [
           [
             "countries.geojson",
+            "example-with-style.geojson",
             "usa-states.geojson"
           ],
           [
+            "application/geo+json",
             "application/geo+json",
             "application/geo+json"
           ],
           [
             255943,
+            3332,
             89263
           ]
         ]
diff --git a/pkg/services/store/tree.go b/pkg/services/store/tree.go
index 5f88d48eb341d..fe276c2c1268c 100644
--- a/pkg/services/store/tree.go
+++ b/pkg/services/store/tree.go
@@ -165,7 +165,7 @@ func (t *nestedTree) getStorages(orgId int64) []storageRuntime {
 	return storages
 }
 
-func (t *nestedTree) ListFolder(ctx context.Context, orgId int64, path string, accessFilter filestorage.PathFilter) (*StorageListFrame, error) {
+func (t *nestedTree) ListFolder(ctx context.Context, orgId int64, path string, maxFiles int, accessFilter filestorage.PathFilter) (*StorageListFrame, error) {
 	if path == "" || path == "/" {
 		t.assureOrgIsInitialized(orgId)
 
@@ -224,12 +224,16 @@ func (t *nestedTree) ListFolder(ctx context.Context, orgId int64, path string, a
 		)
 	}
 
-	listResponse, err := store.List(ctx, path, nil, &filestorage.ListOptions{
-		Recursive:   false,
-		WithFolders: true,
-		WithFiles:   true,
-		Filter:      pathFilter,
-	})
+	listResponse, err := store.List(ctx, path,
+		&filestorage.Paging{
+			Limit: maxFiles,
+		},
+		&filestorage.ListOptions{
+			Recursive:   false,
+			WithFolders: true,
+			WithFiles:   true,
+			Filter:      pathFilter,
+		})
 
 	if err != nil {
 		return nil, err
diff --git a/pkg/services/store/types.go b/pkg/services/store/types.go
index 861ddfd54237d..0cde74107b90d 100644
--- a/pkg/services/store/types.go
+++ b/pkg/services/store/types.go
@@ -40,7 +40,7 @@ type WriteValueResponse struct {
 
 type storageTree interface {
 	GetFile(ctx context.Context, orgId int64, path string) (*filestorage.File, error)
-	ListFolder(ctx context.Context, orgId int64, path string, accessFilter filestorage.PathFilter) (*StorageListFrame, error)
+	ListFolder(ctx context.Context, orgId int64, path string, maxFiles int, accessFilter filestorage.PathFilter) (*StorageListFrame, error)
 }
 
 //-------------------------------------------
diff --git a/pkg/services/store/validate.go b/pkg/services/store/validate.go
index 00fa3eef4a9e6..f1c957b8029d6 100644
--- a/pkg/services/store/validate.go
+++ b/pkg/services/store/validate.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 
 	"github.com/grafana/grafana/pkg/infra/filestorage"
-	"github.com/grafana/grafana/pkg/services/store/kind/svg"
 	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/util"
 )
 
 var (
@@ -52,7 +52,7 @@ func fail(reason string) validationResult {
 
 func (s *standardStorageService) detectMimeType(ctx context.Context, user *user.SignedInUser, uploadRequest *UploadRequest) string {
 	if strings.HasSuffix(uploadRequest.Path, ".svg") {
-		if svg.IsSVG(uploadRequest.Contents) {
+		if util.IsSVG(uploadRequest.Contents) {
 			return "image/svg+xml"
 		}
 	}
diff --git a/pkg/services/supportbundles/interface.go b/pkg/services/supportbundles/interface.go
index e876412087be6..89cff6885250e 100644
--- a/pkg/services/supportbundles/interface.go
+++ b/pkg/services/supportbundles/interface.go
@@ -46,6 +46,8 @@ type Collector struct {
 	Default bool `json:"default"`
 	// Fn is the function that collects the support item.
 	Fn CollectorFunc `json:"-"`
+	// EnabledFn is a function that determines if the collector is enabled. If nil, the collector is always enabled.
+	EnabledFn func() bool `json:"-"`
 }
 
 type Service interface {
diff --git a/pkg/services/supportbundles/supportbundlesimpl/service.go b/pkg/services/supportbundles/supportbundlesimpl/service.go
index df569dc408a46..50d5f9f317c51 100644
--- a/pkg/services/supportbundles/supportbundlesimpl/service.go
+++ b/pkg/services/supportbundles/supportbundlesimpl/service.go
@@ -10,6 +10,7 @@ import (
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/kvstore"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/infra/usagestats"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
@@ -34,6 +35,7 @@ type Service struct {
 	pluginSettings pluginsettings.Service
 	pluginStore    pluginstore.Store
 	store          bundleStore
+	tracer         tracing.Tracer
 
 	log                  log.Logger
 	encryptionPublicKeys []string
@@ -55,7 +57,8 @@ func ProvideService(
 	routeRegister routing.RouteRegister,
 	settings setting.Provider,
 	sql db.DB,
-	usageStats usagestats.Service) (*Service, error) {
+	usageStats usagestats.Service,
+	tracer tracing.Tracer) (*Service, error) {
 	section := cfg.SectionWithEnvOverrides("support_bundles")
 	s := &Service{
 		accessControl:        accessControl,
@@ -69,6 +72,7 @@ func ProvideService(
 		pluginStore:          pluginStore,
 		serverAdminOnly:      section.Key("server_admin_only").MustBool(true),
 		store:                newStore(kvStore),
+		tracer:               tracer,
 	}
 
 	usageStats.RegisterMetricsFunc(s.getUsageStats)
diff --git a/pkg/services/supportbundles/supportbundlesimpl/service_bundle.go b/pkg/services/supportbundles/supportbundlesimpl/service_bundle.go
index e978c58472c1c..f6305e78ec764 100644
--- a/pkg/services/supportbundles/supportbundlesimpl/service_bundle.go
+++ b/pkg/services/supportbundles/supportbundlesimpl/service_bundle.go
@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"filippo.io/age"
+	"go.opentelemetry.io/otel/attribute"
 
 	"github.com/grafana/grafana/pkg/services/supportbundles"
 )
@@ -66,6 +67,10 @@ func (s *Service) startBundleWork(ctx context.Context, collectors []string, uid
 }
 
 func (s *Service) bundle(ctx context.Context, collectors []string, uid string) ([]byte, error) {
+	ctxTracer, span := s.tracer.Start(ctx, "SupportBundle.bundle")
+	span.SetAttributes(attribute.String("SupportBundle.bundle.uid", uid))
+	defer span.End()
+
 	lookup := make(map[string]bool, len(collectors))
 	for _, c := range collectors {
 		lookup[c] = true
@@ -74,10 +79,20 @@ func (s *Service) bundle(ctx context.Context, collectors []string, uid string) (
 	files := map[string][]byte{}
 
 	for _, collector := range s.bundleRegistry.Collectors() {
-		if !lookup[collector.UID] && !collector.IncludedByDefault {
+		collectorEnabled := true
+		if collector.EnabledFn != nil {
+			collectorEnabled = collector.EnabledFn()
+		}
+
+		if !(lookup[collector.UID] || collector.IncludedByDefault) || !collectorEnabled {
 			continue
 		}
-		item, err := collector.Fn(ctx)
+
+		// Trace the collector run
+		ctxBundler, span := s.tracer.Start(ctxTracer, "SupportBundle.bundle.collector")
+		span.SetAttributes(attribute.String("SupportBundle.bundle.collector.uid", collector.UID))
+
+		item, err := collector.Fn(ctxBundler)
 		if err != nil {
 			s.log.Warn("Failed to collect support bundle item", "error", err, "collector", collector.UID)
 		}
@@ -86,6 +101,8 @@ func (s *Service) bundle(ctx context.Context, collectors []string, uid string) (
 		if item != nil {
 			files[item.Filename] = item.FileBytes
 		}
+
+		span.End()
 	}
 
 	// create tar.gz file
diff --git a/pkg/services/supportbundles/supportbundlesimpl/service_bundle_test.go b/pkg/services/supportbundles/supportbundlesimpl/service_bundle_test.go
index 0a840addcaefd..5e3891466f04f 100644
--- a/pkg/services/supportbundles/supportbundlesimpl/service_bundle_test.go
+++ b/pkg/services/supportbundles/supportbundlesimpl/service_bundle_test.go
@@ -15,6 +15,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/kvstore"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/services/supportbundles"
 	"github.com/grafana/grafana/pkg/services/supportbundles/bundleregistry"
 	"github.com/grafana/grafana/pkg/services/user"
@@ -33,17 +34,22 @@ func TestService_bundleCreate(t *testing.T) {
 		log:            log.New("test"),
 		bundleRegistry: bundleregistry.ProvideService(),
 		store:          newStore(kvstore.NewFakeKVStore()),
+		tracer:         tracing.InitializeTracerForTest(),
 	}
 
 	cfg := setting.NewCfg()
 
 	collector := basicCollector(cfg)
+	disabledCollector := settingsCollector(setting.ProvideProvider(cfg))
+	disabledCollector.EnabledFn = func() bool { return false }
+
 	s.bundleRegistry.RegisterSupportItemCollector(collector)
+	s.bundleRegistry.RegisterSupportItemCollector(disabledCollector)
 
 	createdBundle, err := s.store.Create(context.Background(), &user.SignedInUser{UserID: 1, Login: "bob"})
 	require.NoError(t, err)
 
-	s.startBundleWork(context.Background(), []string{collector.UID}, createdBundle.UID)
+	s.startBundleWork(context.Background(), []string{collector.UID, disabledCollector.UID}, createdBundle.UID)
 
 	bundle, err := s.get(context.Background(), createdBundle.UID)
 	require.NoError(t, err)
@@ -62,6 +68,7 @@ func TestService_bundleEncryptDecrypt(t *testing.T) {
 		bundleRegistry:       bundleregistry.ProvideService(),
 		store:                newStore(kvstore.NewFakeKVStore()),
 		encryptionPublicKeys: []string{testAgePublicKey},
+		tracer:               tracing.InitializeTracerForTest(),
 	}
 
 	cfg := setting.NewCfg()
@@ -94,6 +101,7 @@ func TestService_bundleEncryptDecryptMultipleRecipients(t *testing.T) {
 		bundleRegistry:       bundleregistry.ProvideService(),
 		store:                newStore(kvstore.NewFakeKVStore()),
 		encryptionPublicKeys: []string{testAgePublicKey, testAgePublicKey2},
+		tracer:               tracing.InitializeTracerForTest(),
 	}
 
 	cfg := setting.NewCfg()
diff --git a/pkg/services/tag/tagimpl/sqlx_store.go b/pkg/services/tag/tagimpl/sqlx_store.go
deleted file mode 100644
index 7c411b2d308e0..0000000000000
--- a/pkg/services/tag/tagimpl/sqlx_store.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package tagimpl
-
-import (
-	"context"
-	"database/sql"
-	"errors"
-
-	"github.com/grafana/grafana/pkg/services/sqlstore/session"
-	"github.com/grafana/grafana/pkg/services/tag"
-)
-
-type sqlxStore struct {
-	sess *session.SessionDB
-}
-
-func (s *sqlxStore) EnsureTagsExist(ctx context.Context, tags []*tag.Tag) ([]*tag.Tag, error) {
-	for _, tagElement := range tags {
-		var existingTag tag.Tag
-		err := s.sess.Get(ctx, &existingTag, `SELECT * FROM tag WHERE "key"=? AND "value"=?`, tagElement.Key, tagElement.Value)
-		if err != nil {
-			if errors.Is(err, sql.ErrNoRows) {
-				tagElement.Id, err = s.sess.ExecWithReturningId(ctx, `INSERT INTO tag ("key", "value") VALUES (?, ?)`, tagElement.Key, tagElement.Value)
-				if err != nil {
-					return tags, err
-				}
-			} else {
-				return tags, err
-			}
-		} else {
-			tagElement.Id = existingTag.Id
-		}
-	}
-	return tags, nil
-}
diff --git a/pkg/services/tag/tagimpl/sqlx_store_test.go b/pkg/services/tag/tagimpl/sqlx_store_test.go
deleted file mode 100644
index b67846a8f58a4..0000000000000
--- a/pkg/services/tag/tagimpl/sqlx_store_test.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package tagimpl
-
-import (
-	"testing"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-)
-
-func TestIntegrationSQLxSavingTags(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	testIntegrationSavingTags(t, func(ss db.DB) store {
-		return &sqlxStore{sess: ss.GetSqlxSession()}
-	})
-}
diff --git a/pkg/services/tag/tagimpl/store_test.go b/pkg/services/tag/tagimpl/store_test.go
index 3d631136d39da..a3bf9c2783e14 100644
--- a/pkg/services/tag/tagimpl/store_test.go
+++ b/pkg/services/tag/tagimpl/store_test.go
@@ -8,8 +8,13 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/services/tag"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 type getStore func(db.DB) store
 
 func testIntegrationSavingTags(t *testing.T, fn getStore) {
diff --git a/pkg/services/tag/tagimpl/tag.go b/pkg/services/tag/tagimpl/tag.go
index cbddc5eed1757..f52d8eb5b5f25 100644
--- a/pkg/services/tag/tagimpl/tag.go
+++ b/pkg/services/tag/tagimpl/tag.go
@@ -4,23 +4,14 @@ import (
 	"context"
 
 	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/tag"
-	"github.com/grafana/grafana/pkg/setting"
 )
 
 type Service struct {
 	store store
 }
 
-func ProvideService(db db.DB, cfg *setting.Cfg) *Service {
-	if cfg.IsFeatureToggleEnabled(featuremgmt.FlagNewDBLibrary) {
-		return &Service{
-			store: &sqlxStore{
-				sess: db.GetSqlxSession(),
-			},
-		}
-	}
+func ProvideService(db db.DB) *Service {
 	return &Service{
 		store: &sqlStore{
 			db: db,
diff --git a/pkg/services/team/model.go b/pkg/services/team/model.go
index 3ab72eace9ae5..a4d4fe0a6a64b 100644
--- a/pkg/services/team/model.go
+++ b/pkg/services/team/model.go
@@ -4,11 +4,8 @@ import (
 	"errors"
 	"time"
 
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	"github.com/grafana/grafana/pkg/kinds/team"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
-	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/search/model"
 )
 
@@ -36,18 +33,6 @@ type Team struct {
 	Updated time.Time `json:"updated"`
 }
 
-func (t *Team) ToResource() team.K8sResource {
-	r := team.NewK8sResource(t.UID, &team.Spec{
-		Name: t.Name,
-	})
-	r.Metadata.CreationTimestamp = v1.NewTime(t.Created)
-	r.Metadata.SetUpdatedTimestamp(&t.Updated)
-	if t.Email != "" {
-		r.Spec.Email = &t.Email
-	}
-	return r
-}
-
 // ---------------------
 // COMMANDS
 
@@ -79,6 +64,11 @@ type GetTeamByIDQuery struct {
 // FilterIgnoreUser is used in a get / search teams query when the caller does not want to filter teams by user ID / membership
 const FilterIgnoreUser int64 = 0
 
+type GetTeamIDsByUserQuery struct {
+	OrgID  int64
+	UserID int64 `json:"userId"`
+}
+
 type GetTeamsByUserQuery struct {
 	OrgID        int64
 	UserID       int64 `json:"userId"`
@@ -92,20 +82,21 @@ type SearchTeamsQuery struct {
 	Page         int
 	OrgID        int64 `xorm:"org_id"`
 	SortOpts     []model.SortOption
+	TeamIds      []int64
 	SignedInUser identity.Requester
 	HiddenUsers  map[string]struct{}
 }
 
 type TeamDTO struct {
-	ID            int64                     `json:"id" xorm:"id"`
-	UID           string                    `json:"uid" xorm:"uid"`
-	OrgID         int64                     `json:"orgId" xorm:"org_id"`
-	Name          string                    `json:"name"`
-	Email         string                    `json:"email"`
-	AvatarURL     string                    `json:"avatarUrl"`
-	MemberCount   int64                     `json:"memberCount"`
-	Permission    dashboards.PermissionType `json:"permission"`
-	AccessControl map[string]bool           `json:"accessControl"`
+	ID            int64                          `json:"id" xorm:"id"`
+	UID           string                         `json:"uid" xorm:"uid"`
+	OrgID         int64                          `json:"orgId" xorm:"org_id"`
+	Name          string                         `json:"name"`
+	Email         string                         `json:"email"`
+	AvatarURL     string                         `json:"avatarUrl"`
+	MemberCount   int64                          `json:"memberCount"`
+	Permission    dashboardaccess.PermissionType `json:"permission"`
+	AccessControl map[string]bool                `json:"accessControl"`
 }
 
 type SearchTeamQueryResult struct {
@@ -122,7 +113,7 @@ type TeamMember struct {
 	TeamID     int64 `xorm:"team_id"`
 	UserID     int64 `xorm:"user_id"`
 	External   bool  // Signals that the membership has been created by an external systems, such as LDAP
-	Permission dashboards.PermissionType
+	Permission dashboardaccess.PermissionType
 
 	Created time.Time
 	Updated time.Time
@@ -132,18 +123,18 @@ type TeamMember struct {
 // COMMANDS
 
 type AddTeamMemberCommand struct {
-	UserID     int64                     `json:"userId" binding:"Required"`
-	OrgID      int64                     `json:"-"`
-	TeamID     int64                     `json:"-"`
-	External   bool                      `json:"-"`
-	Permission dashboards.PermissionType `json:"-"`
+	UserID     int64                          `json:"userId" binding:"Required"`
+	OrgID      int64                          `json:"-"`
+	TeamID     int64                          `json:"-"`
+	External   bool                           `json:"-"`
+	Permission dashboardaccess.PermissionType `json:"-"`
 }
 
 type UpdateTeamMemberCommand struct {
-	UserID     int64                     `json:"-"`
-	OrgID      int64                     `json:"-"`
-	TeamID     int64                     `json:"-"`
-	Permission dashboards.PermissionType `json:"permission"`
+	UserID     int64                          `json:"-"`
+	OrgID      int64                          `json:"-"`
+	TeamID     int64                          `json:"-"`
+	Permission dashboardaccess.PermissionType `json:"permission"`
 }
 
 type RemoveTeamMemberCommand struct {
@@ -168,16 +159,16 @@ type GetTeamMembersQuery struct {
 // Projections and DTOs
 
 type TeamMemberDTO struct {
-	OrgID      int64                     `json:"orgId" xorm:"org_id"`
-	TeamID     int64                     `json:"teamId" xorm:"team_id"`
-	TeamUID    string                    `json:"teamUID" xorm:"uid"`
-	UserID     int64                     `json:"userId" xorm:"user_id"`
-	External   bool                      `json:"-"`
-	AuthModule string                    `json:"auth_module"`
-	Email      string                    `json:"email"`
-	Name       string                    `json:"name"`
-	Login      string                    `json:"login"`
-	AvatarURL  string                    `json:"avatarUrl" xorm:"avatar_url"`
-	Labels     []string                  `json:"labels"`
-	Permission dashboards.PermissionType `json:"permission"`
+	OrgID      int64                          `json:"orgId" xorm:"org_id"`
+	TeamID     int64                          `json:"teamId" xorm:"team_id"`
+	TeamUID    string                         `json:"teamUID" xorm:"uid"`
+	UserID     int64                          `json:"userId" xorm:"user_id"`
+	External   bool                           `json:"-"`
+	AuthModule string                         `json:"auth_module"`
+	Email      string                         `json:"email"`
+	Name       string                         `json:"name"`
+	Login      string                         `json:"login"`
+	AvatarURL  string                         `json:"avatarUrl" xorm:"avatar_url"`
+	Labels     []string                       `json:"labels"`
+	Permission dashboardaccess.PermissionType `json:"permission"`
 }
diff --git a/pkg/services/team/model_test.go b/pkg/services/team/model_test.go
deleted file mode 100644
index e2c61a8e8b5da..0000000000000
--- a/pkg/services/team/model_test.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package team
-
-import (
-	"encoding/json"
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestTeamConversion(t *testing.T) {
-	src := Team{
-		ID:      123,
-		UID:     "abc",
-		Name:    "TeamA",
-		Email:   "team@a.org",
-		OrgID:   11,
-		Created: time.UnixMilli(946713600000).UTC(),  // 2000-01-01
-		Updated: time.UnixMilli(1262332800000).UTC(), // 2010-01-01
-	}
-
-	dst := src.ToResource()
-
-	require.Equal(t, src.Name, dst.Spec.Name)
-
-	out, err := json.MarshalIndent(dst, "", "  ")
-	require.NoError(t, err)
-	fmt.Printf("%s", string(out))
-	require.JSONEq(t, `{
-		"apiVersion": "v0-0-alpha",
-		"kind": "Team",
-		"metadata": {
-		  "name": "abc",
-		  "creationTimestamp": "2000-01-01T08:00:00Z",
-		  "annotations": {
-			"grafana.com/updatedTimestamp": "2010-01-01T08:00:00Z"
-		  }
-		},
-		"spec": {
-		  "email": "team@a.org",
-		  "name": "TeamA"
-		}
-	  }`, string(out))
-}
diff --git a/pkg/services/team/team.go b/pkg/services/team/team.go
index 22e4c77db59e2..5f1bca402447c 100644
--- a/pkg/services/team/team.go
+++ b/pkg/services/team/team.go
@@ -3,7 +3,7 @@ package team
 import (
 	"context"
 
-	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 )
 
 type Service interface {
@@ -13,7 +13,8 @@ type Service interface {
 	SearchTeams(ctx context.Context, query *SearchTeamsQuery) (SearchTeamQueryResult, error)
 	GetTeamByID(ctx context.Context, query *GetTeamByIDQuery) (*TeamDTO, error)
 	GetTeamsByUser(ctx context.Context, query *GetTeamsByUserQuery) ([]*TeamDTO, error)
-	AddTeamMember(userID, orgID, teamID int64, isExternal bool, permission dashboards.PermissionType) error
+	GetTeamIDsByUser(ctx context.Context, query *GetTeamIDsByUserQuery) ([]int64, error)
+	AddTeamMember(ctx context.Context, userID, orgID, teamID int64, isExternal bool, permission dashboardaccess.PermissionType) error
 	UpdateTeamMember(ctx context.Context, cmd *UpdateTeamMemberCommand) error
 	IsTeamMember(orgId int64, teamId int64, userId int64) (bool, error)
 	RemoveTeamMember(ctx context.Context, cmd *RemoveTeamMemberCommand) error
diff --git a/pkg/services/team/teamapi/team.go b/pkg/services/team/teamapi/team.go
index ebcde9222d9e1..70fcc9ae8e48a 100644
--- a/pkg/services/team/teamapi/team.go
+++ b/pkg/services/team/teamapi/team.go
@@ -10,7 +10,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
-	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/preference/prefapi"
 	"github.com/grafana/grafana/pkg/services/team"
 	"github.com/grafana/grafana/pkg/services/team/sortopts"
@@ -58,7 +58,7 @@ func (tapi *TeamAPI) createTeam(c *contextmodel.ReqContext) response.Response {
 			break
 		}
 		if err := addOrUpdateTeamMember(c.Req.Context(), tapi.teamPermissionsService, userID, c.SignedInUser.GetOrgID(),
-			t.ID, dashboards.PERMISSION_ADMIN.String()); err != nil {
+			t.ID, dashboardaccess.PERMISSION_ADMIN.String()); err != nil {
 			c.Logger.Error("Could not add creator to team", "error", err)
 		}
 	default:
@@ -127,6 +127,12 @@ func (tapi *TeamAPI) deleteTeamByID(c *contextmodel.ReqContext) response.Respons
 		}
 		return response.Error(http.StatusInternalServerError, "Failed to delete Team", err)
 	}
+
+	// Clear associated team assignments, managed role and permissions
+	if err := tapi.ac.DeleteTeamPermissions(c.Req.Context(), orgID, teamID); err != nil {
+		return response.Error(http.StatusInternalServerError, "Failed to delete Team permissions", err)
+	}
+
 	return response.Success("Team deleted")
 }
 
@@ -154,10 +160,20 @@ func (tapi *TeamAPI) searchTeams(c *contextmodel.ReqContext) response.Response {
 		return response.Err(err)
 	}
 
+	stringTeamIDs := c.QueryStrings("teamId")
+	queryTeamIDs := make([]int64, 0)
+	for _, id := range stringTeamIDs {
+		teamID, err := strconv.ParseInt(id, 10, 64)
+		if err == nil {
+			queryTeamIDs = append(queryTeamIDs, teamID)
+		}
+	}
+
 	query := team.SearchTeamsQuery{
 		OrgID:        c.SignedInUser.GetOrgID(),
 		Query:        c.Query("query"),
 		Name:         c.Query("name"),
+		TeamIds:      queryTeamIDs,
 		Page:         page,
 		Limit:        perPage,
 		SignedInUser: c.SignedInUser,
@@ -172,7 +188,7 @@ func (tapi *TeamAPI) searchTeams(c *contextmodel.ReqContext) response.Response {
 
 	teamIDs := map[string]bool{}
 	for _, team := range queryResult.Teams {
-		team.AvatarURL = dtos.GetGravatarUrlWithDefault(team.Email, team.Name)
+		team.AvatarURL = dtos.GetGravatarUrlWithDefault(tapi.cfg, team.Email, team.Name)
 		teamIDs[strconv.FormatInt(team.ID, 10)] = true
 	}
 
@@ -224,7 +240,7 @@ func (tapi *TeamAPI) getTeamByID(c *contextmodel.ReqContext) response.Response {
 	// Add accesscontrol metadata
 	queryResult.AccessControl = tapi.getAccessControlMetadata(c, c.SignedInUser.GetOrgID(), "teams:id:", strconv.FormatInt(queryResult.ID, 10))
 
-	queryResult.AvatarURL = dtos.GetGravatarUrlWithDefault(queryResult.Email, queryResult.Name)
+	queryResult.AvatarURL = dtos.GetGravatarUrlWithDefault(tapi.cfg, queryResult.Email, queryResult.Name)
 	return response.JSON(http.StatusOK, &queryResult)
 }
 
diff --git a/pkg/services/team/teamapi/team_members.go b/pkg/services/team/teamapi/team_members.go
index a9f996a8c11e4..89419b8ff09e7 100644
--- a/pkg/services/team/teamapi/team_members.go
+++ b/pkg/services/team/teamapi/team_members.go
@@ -11,7 +11,7 @@ import (
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
-	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/login"
 	"github.com/grafana/grafana/pkg/services/team"
 	"github.com/grafana/grafana/pkg/util"
@@ -47,7 +47,7 @@ func (tapi *TeamAPI) getTeamMembers(c *contextmodel.ReqContext) response.Respons
 			continue
 		}
 
-		member.AvatarURL = dtos.GetGravatarUrl(member.Email)
+		member.AvatarURL = dtos.GetGravatarUrl(tapi.cfg, member.Email)
 		member.Labels = []string{}
 
 		if tapi.license.FeatureEnabled("teamgroupsync") && member.External {
@@ -141,7 +141,7 @@ func (tapi *TeamAPI) updateTeamMember(c *contextmodel.ReqContext) response.Respo
 	return response.Success("Team member updated")
 }
 
-func getPermissionName(permission dashboards.PermissionType) string {
+func getPermissionName(permission dashboardaccess.PermissionType) string {
 	permissionName := permission.String()
 	// Team member permission is 0, which maps to an empty string.
 	// However, we want the team permission service to display "Member" for team members. This is a hack to make it work.
diff --git a/pkg/services/team/teamimpl/store.go b/pkg/services/team/teamimpl/store.go
index c600ecfb443a6..f8a85618d99a3 100644
--- a/pkg/services/team/teamimpl/store.go
+++ b/pkg/services/team/teamimpl/store.go
@@ -10,7 +10,8 @@ import (
 	"github.com/grafana/grafana/pkg/infra/db"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
-	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 	"github.com/grafana/grafana/pkg/services/team"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
@@ -23,8 +24,9 @@ type store interface {
 	Search(ctx context.Context, query *team.SearchTeamsQuery) (team.SearchTeamQueryResult, error)
 	GetByID(ctx context.Context, query *team.GetTeamByIDQuery) (*team.TeamDTO, error)
 	GetByUser(ctx context.Context, query *team.GetTeamsByUserQuery) ([]*team.TeamDTO, error)
+	GetIDsByUser(ctx context.Context, query *team.GetTeamIDsByUserQuery) ([]int64, error)
 	RemoveUsersMemberships(ctx context.Context, userID int64) error
-	AddMember(userID, orgID, teamID int64, isExternal bool, permission dashboards.PermissionType) error
+	AddMember(ctx context.Context, userID, orgID, teamID int64, isExternal bool, permission dashboardaccess.PermissionType) error
 	UpdateMember(ctx context.Context, cmd *team.UpdateTeamMemberCommand) error
 	IsMember(orgId int64, teamId int64, userId int64) (bool, error)
 	RemoveMember(ctx context.Context, cmd *team.RemoveTeamMemberCommand) error
@@ -141,7 +143,6 @@ func (ss *xormStore) Delete(ctx context.Context, cmd *team.DeleteTeamCommand) er
 			"DELETE FROM team_member WHERE org_id=? and team_id = ?",
 			"DELETE FROM team WHERE org_id=? and id = ?",
 			"DELETE FROM dashboard_acl WHERE org_id=? and team_id = ?",
-			"DELETE FROM team_role WHERE org_id=? and team_id = ?",
 		}
 
 		deletes = append(deletes, ss.deletes...)
@@ -152,10 +153,7 @@ func (ss *xormStore) Delete(ctx context.Context, cmd *team.DeleteTeamCommand) er
 				return err
 			}
 		}
-
-		_, err := sess.Exec("DELETE FROM permission WHERE scope=?", ac.Scope("teams", "id", fmt.Sprint(cmd.ID)))
-
-		return err
+		return nil
 	})
 }
 
@@ -212,6 +210,13 @@ func (ss *xormStore) Search(ctx context.Context, query *team.SearchTeamsQuery) (
 			params = append(params, query.Name)
 		}
 
+		if len(query.TeamIds) > 0 {
+			sql.WriteString(` and team.id IN (?` + strings.Repeat(",?", len(query.TeamIds)-1) + ")")
+			for _, id := range query.TeamIds {
+				params = append(params, id)
+			}
+		}
+
 		acFilter, err := ac.Filter(query.SignedInUser, "team.id", "teams:id:", ac.ActionTeamsRead)
 		if err != nil {
 			return err
@@ -329,9 +334,25 @@ func (ss *xormStore) GetByUser(ctx context.Context, query *team.GetTeamsByUserQu
 	return queryResult, nil
 }
 
+// GetIDsByUser returns a list of team IDs for the given user
+func (ss *xormStore) GetIDsByUser(ctx context.Context, query *team.GetTeamIDsByUserQuery) ([]int64, error) {
+	queryResult := make([]int64, 0)
+
+	err := ss.db.WithDbSession(ctx, func(sess *db.Session) error {
+		return sess.SQL(`SELECT tm.team_id
+FROM team_member as tm
+WHERE tm.user_id=? AND tm.org_id=?;`, query.UserID, query.OrgID).Find(&queryResult)
+	})
+	if err != nil {
+		return nil, fmt.Errorf("failed to get team IDs by user: %w", err)
+	}
+
+	return queryResult, nil
+}
+
 // AddTeamMember adds a user to a team
-func (ss *xormStore) AddMember(userID, orgID, teamID int64, isExternal bool, permission dashboards.PermissionType) error {
-	return ss.db.WithTransactionalDbSession(context.Background(), func(sess *db.Session) error {
+func (ss *xormStore) AddMember(ctx context.Context, userID, orgID, teamID int64, isExternal bool, permission dashboardaccess.PermissionType) error {
+	return ss.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
 		if isMember, err := isTeamMember(sess, orgID, teamID, userID); err != nil {
 			return err
 		} else if isMember {
@@ -388,7 +409,7 @@ func isTeamMember(sess *db.Session, orgId int64, teamId int64, userId int64) (bo
 
 // AddOrUpdateTeamMemberHook is called from team resource permission service
 // it adds user to a team or updates user permissions in a team within the given transaction session
-func AddOrUpdateTeamMemberHook(sess *db.Session, userID, orgID, teamID int64, isExternal bool, permission dashboards.PermissionType) error {
+func AddOrUpdateTeamMemberHook(sess *db.Session, userID, orgID, teamID int64, isExternal bool, permission dashboardaccess.PermissionType) error {
 	isMember, err := isTeamMember(sess, orgID, teamID, userID)
 	if err != nil {
 		return err
@@ -403,7 +424,7 @@ func AddOrUpdateTeamMemberHook(sess *db.Session, userID, orgID, teamID int64, is
 	return err
 }
 
-func addTeamMember(sess *db.Session, orgID, teamID, userID int64, isExternal bool, permission dashboards.PermissionType) error {
+func addTeamMember(sess *db.Session, orgID, teamID, userID int64, isExternal bool, permission dashboardaccess.PermissionType) error {
 	if _, err := teamExists(orgID, teamID, sess); err != nil {
 		return err
 	}
@@ -422,13 +443,13 @@ func addTeamMember(sess *db.Session, orgID, teamID, userID int64, isExternal boo
 	return err
 }
 
-func updateTeamMember(sess *db.Session, orgID, teamID, userID int64, permission dashboards.PermissionType) error {
+func updateTeamMember(sess *db.Session, orgID, teamID, userID int64, permission dashboardaccess.PermissionType) error {
 	member, err := getTeamMember(sess, orgID, teamID, userID)
 	if err != nil {
 		return err
 	}
 
-	if permission != dashboards.PERMISSION_ADMIN {
+	if permission != dashboardaccess.PERMISSION_ADMIN {
 		permission = 0 // make sure we don't get invalid permission levels in store
 	}
 
@@ -576,3 +597,25 @@ func (ss *xormStore) getTeamMembers(ctx context.Context, query *team.GetTeamMemb
 func (ss *xormStore) RegisterDelete(query string) {
 	ss.deletes = append(ss.deletes, query)
 }
+
+// This is just to ensure that all teams have a valid uid.
+// To protect against upgrade / downgrade we need to run this for a couple of releases.
+// FIXME: Remove this migration and make uid field required https://github.com/grafana/identity-access-team/issues/552
+func (ss *xormStore) uidMigration() error {
+	return ss.db.WithDbSession(context.Background(), func(sess *db.Session) error {
+		switch ss.db.GetDBType() {
+		case migrator.SQLite:
+			_, err := sess.Exec("UPDATE team SET uid=printf('t%09d',id) WHERE uid IS NULL;")
+			return err
+		case migrator.Postgres:
+			_, err := sess.Exec("UPDATE team SET uid='t' || lpad('' || id::text,9,'0') WHERE uid IS NULL;")
+			return err
+		case migrator.MySQL:
+			_, err := sess.Exec("UPDATE team SET uid=concat('t',lpad(id,9,'0')) WHERE uid IS NULL;")
+			return err
+		default:
+			// this branch should be unreachable
+			return nil
+		}
+	})
+}
diff --git a/pkg/services/team/teamimpl/store_test.go b/pkg/services/team/teamimpl/store_test.go
index 67d0937771754..b78aefa50a986 100644
--- a/pkg/services/team/teamimpl/store_test.go
+++ b/pkg/services/team/teamimpl/store_test.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"strings"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -13,7 +12,7 @@ import (
 	"github.com/grafana/grafana/pkg/infra/db"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
-	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/org/orgimpl"
 	"github.com/grafana/grafana/pkg/services/quota/quotaimpl"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts"
@@ -23,15 +22,21 @@ import (
 	"github.com/grafana/grafana/pkg/services/team/sortopts"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/user/userimpl"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationTeamCommandsAndQueries(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
 	t.Run("Testing Team commands and queries", func(t *testing.T) {
 		sqlStore := db.InitTestDB(t)
-		teamSvc := ProvideService(sqlStore, sqlStore.Cfg)
+		teamSvc, err := ProvideService(sqlStore, sqlStore.Cfg)
+		require.NoError(t, err)
 		testUser := &user.SignedInUser{
 			OrgID: 1,
 			Permissions: map[int64]map[string][]string{
@@ -87,9 +92,9 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) {
 				require.Equal(t, team1.OrgID, testOrgID)
 				require.EqualValues(t, team1.MemberCount, 0)
 
-				err = teamSvc.AddTeamMember(userIds[0], testOrgID, team1.ID, false, 0)
+				err = teamSvc.AddTeamMember(context.Background(), userIds[0], testOrgID, team1.ID, false, 0)
 				require.NoError(t, err)
-				err = teamSvc.AddTeamMember(userIds[1], testOrgID, team1.ID, true, 0)
+				err = teamSvc.AddTeamMember(context.Background(), userIds[1], testOrgID, team1.ID, true, 0)
 				require.NoError(t, err)
 
 				q1 := &team.GetTeamMembersQuery{OrgID: testOrgID, TeamID: team1.ID, SignedInUser: testUser}
@@ -126,6 +131,13 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) {
 				require.Equal(t, team1.Email, "test1@test.com")
 				require.Equal(t, team1.OrgID, testOrgID)
 				require.EqualValues(t, team1.MemberCount, 2)
+
+				getIDsQuery := &team.GetTeamIDsByUserQuery{OrgID: testOrgID, UserID: userIds[0]}
+				getIDResult, err := teamSvc.GetTeamIDsByUser(context.Background(), getIDsQuery)
+				require.NoError(t, err)
+
+				require.Equal(t, len(getIDResult), 1)
+				require.Equal(t, getIDResult[0], team1.ID)
 			})
 
 			t.Run("Should return latest auth module for users when getting team members", func(t *testing.T) {
@@ -140,7 +152,7 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) {
 
 				team1 := teamQueryResult.Teams[0]
 
-				err = teamSvc.AddTeamMember(userId, testOrgID, team1.ID, true, 0)
+				err = teamSvc.AddTeamMember(context.Background(), userId, testOrgID, team1.ID, true, 0)
 				require.NoError(t, err)
 
 				memberQuery := &team.GetTeamMembersQuery{OrgID: testOrgID, TeamID: team1.ID, External: true, SignedInUser: testUser}
@@ -156,7 +168,7 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) {
 			t.Run("Should be able to update users in a team", func(t *testing.T) {
 				userId := userIds[0]
 
-				err = teamSvc.AddTeamMember(userId, testOrgID, team1.ID, false, 0)
+				err = teamSvc.AddTeamMember(context.Background(), userId, testOrgID, team1.ID, false, 0)
 				require.NoError(t, err)
 
 				qBeforeUpdate := &team.GetTeamMembersQuery{OrgID: testOrgID, TeamID: team1.ID, SignedInUser: testUser}
@@ -168,7 +180,7 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) {
 					UserID:     userId,
 					OrgID:      testOrgID,
 					TeamID:     team1.ID,
-					Permission: dashboards.PERMISSION_ADMIN,
+					Permission: dashboardaccess.PERMISSION_ADMIN,
 				})
 
 				require.NoError(t, err)
@@ -176,14 +188,14 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) {
 				qAfterUpdate := &team.GetTeamMembersQuery{OrgID: testOrgID, TeamID: team1.ID, SignedInUser: testUser}
 				qAfterUpdateResult, err := teamSvc.GetTeamMembers(context.Background(), qAfterUpdate)
 				require.NoError(t, err)
-				require.Equal(t, qAfterUpdateResult[0].Permission, dashboards.PERMISSION_ADMIN)
+				require.Equal(t, qAfterUpdateResult[0].Permission, dashboardaccess.PERMISSION_ADMIN)
 			})
 
 			t.Run("Should default to member permission level when updating a user with invalid permission level", func(t *testing.T) {
 				sqlStore = db.InitTestDB(t)
 				setup()
 				userID := userIds[0]
-				err = teamSvc.AddTeamMember(userID, testOrgID, team1.ID, false, 0)
+				err = teamSvc.AddTeamMember(context.Background(), userID, testOrgID, team1.ID, false, 0)
 				require.NoError(t, err)
 
 				qBeforeUpdate := &team.GetTeamMembersQuery{OrgID: testOrgID, TeamID: team1.ID, SignedInUser: testUser}
@@ -191,7 +203,7 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) {
 				require.NoError(t, err)
 				require.EqualValues(t, qBeforeUpdateResult[0].Permission, 0)
 
-				invalidPermissionLevel := dashboards.PERMISSION_EDIT
+				invalidPermissionLevel := dashboardaccess.PERMISSION_EDIT
 				err = teamSvc.UpdateTeamMember(context.Background(), &team.UpdateTeamMemberCommand{
 					UserID:     userID,
 					OrgID:      testOrgID,
@@ -214,7 +226,7 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) {
 					UserID:     1,
 					OrgID:      testOrgID,
 					TeamID:     team1.ID,
-					Permission: dashboards.PERMISSION_ADMIN,
+					Permission: dashboardaccess.PERMISSION_ADMIN,
 				})
 
 				require.Error(t, err, team.ErrTeamMemberNotFound)
@@ -239,7 +251,7 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) {
 				require.NoError(t, err)
 
 				// Add a team member
-				err = teamSvc.AddTeamMember(userIds[0], testOrgID, team2.ID, false, 0)
+				err = teamSvc.AddTeamMember(context.Background(), userIds[0], testOrgID, team2.ID, false, 0)
 				require.NoError(t, err)
 				defer func() {
 					err := teamSvc.RemoveTeamMember(context.Background(),
@@ -268,11 +280,31 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) {
 				require.Equal(t, queryResult.Teams[1].Name, team1.Name)
 			})
 
+			t.Run("Should be able to query teams by ids", func(t *testing.T) {
+				allTeamsQuery := &team.SearchTeamsQuery{OrgID: testOrgID, Query: "", SignedInUser: testUser}
+				allTeamsQueryResult, err := teamSvc.SearchTeams(context.Background(), allTeamsQuery)
+				require.NoError(t, err)
+				require.Equal(t, len(allTeamsQueryResult.Teams), 2)
+
+				teamIds := make([]int64, 0)
+				for _, team := range allTeamsQueryResult.Teams {
+					teamIds = append(teamIds, team.ID)
+				}
+
+				query := &team.SearchTeamsQuery{OrgID: testOrgID, SignedInUser: testUser, TeamIds: teamIds}
+				queryResult, err := teamSvc.SearchTeams(context.Background(), query)
+				require.NoError(t, err)
+				require.Equal(t, len(queryResult.Teams), 2)
+				require.EqualValues(t, queryResult.TotalCount, 2)
+				require.Equal(t, queryResult.Teams[0].ID, teamIds[0])
+				require.Equal(t, queryResult.Teams[1].ID, teamIds[1])
+			})
+
 			t.Run("Should be able to return all teams a user is member of", func(t *testing.T) {
 				sqlStore = db.InitTestDB(t)
 				setup()
 				groupId := team2.ID
-				err := teamSvc.AddTeamMember(userIds[0], testOrgID, groupId, false, 0)
+				err := teamSvc.AddTeamMember(context.Background(), userIds[0], testOrgID, groupId, false, 0)
 				require.NoError(t, err)
 
 				query := &team.GetTeamsByUserQuery{
@@ -291,7 +323,7 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) {
 			})
 
 			t.Run("Should be able to remove users from a group", func(t *testing.T) {
-				err = teamSvc.AddTeamMember(userIds[0], testOrgID, team1.ID, false, 0)
+				err = teamSvc.AddTeamMember(context.Background(), userIds[0], testOrgID, team1.ID, false, 0)
 				require.NoError(t, err)
 
 				err = teamSvc.RemoveTeamMember(context.Background(), &team.RemoveTeamMemberCommand{OrgID: testOrgID, TeamID: team1.ID, UserID: userIds[0]})
@@ -304,7 +336,7 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) {
 			})
 
 			t.Run("Should have empty teams", func(t *testing.T) {
-				err = teamSvc.AddTeamMember(userIds[0], testOrgID, team1.ID, false, dashboards.PERMISSION_ADMIN)
+				err = teamSvc.AddTeamMember(context.Background(), userIds[0], testOrgID, team1.ID, false, dashboardaccess.PERMISSION_ADMIN)
 				require.NoError(t, err)
 
 				t.Run("A user should be able to remove the admin permission for the last admin", func(t *testing.T) {
@@ -321,40 +353,16 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) {
 					sqlStore = db.InitTestDB(t)
 					setup()
 
-					err = teamSvc.AddTeamMember(userIds[0], testOrgID, team1.ID, false, dashboards.PERMISSION_ADMIN)
+					err = teamSvc.AddTeamMember(context.Background(), userIds[0], testOrgID, team1.ID, false, dashboardaccess.PERMISSION_ADMIN)
 					require.NoError(t, err)
 
-					err = teamSvc.AddTeamMember(userIds[1], testOrgID, team1.ID, false, dashboards.PERMISSION_ADMIN)
+					err = teamSvc.AddTeamMember(context.Background(), userIds[1], testOrgID, team1.ID, false, dashboardaccess.PERMISSION_ADMIN)
 					require.NoError(t, err)
 					err = teamSvc.UpdateTeamMember(context.Background(), &team.UpdateTeamMemberCommand{OrgID: testOrgID, TeamID: team1.ID, UserID: userIds[0], Permission: 0})
 					require.NoError(t, err)
 				})
 			})
 
-			t.Run("Should be able to remove a group with users and permissions", func(t *testing.T) {
-				groupID := team2.ID
-				err := teamSvc.AddTeamMember(userIds[1], testOrgID, groupID, false, 0)
-				require.NoError(t, err)
-				err = teamSvc.AddTeamMember(userIds[2], testOrgID, groupID, false, 0)
-				require.NoError(t, err)
-				err = updateDashboardACL(t, sqlStore, 1, &dashboards.DashboardACL{
-					DashboardID: 1, OrgID: testOrgID, Permission: dashboards.PERMISSION_EDIT, TeamID: groupID,
-				})
-				require.NoError(t, err)
-				err = teamSvc.DeleteTeam(context.Background(), &team.DeleteTeamCommand{OrgID: testOrgID, ID: groupID})
-				require.NoError(t, err)
-
-				query := &team.GetTeamByIDQuery{OrgID: testOrgID, ID: groupID}
-				_, err = teamSvc.GetTeamByID(context.Background(), query)
-				require.Equal(t, err, team.ErrTeamNotFound)
-
-				permQuery := &dashboards.GetDashboardACLInfoListQuery{DashboardID: 1, OrgID: testOrgID}
-				permQueryResult, err := getDashboardACLInfoList(sqlStore, permQuery)
-				require.NoError(t, err)
-
-				require.Equal(t, len(permQueryResult), 0)
-			})
-
 			t.Run("Should not return hidden users in team member count", func(t *testing.T) {
 				sqlStore = db.InitTestDB(t)
 				setup()
@@ -371,11 +379,11 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) {
 				hiddenUsers := map[string]struct{}{"loginuser0": {}, "loginuser1": {}}
 
 				teamId := team1.ID
-				err = teamSvc.AddTeamMember(userIds[0], testOrgID, teamId, false, 0)
+				err = teamSvc.AddTeamMember(context.Background(), userIds[0], testOrgID, teamId, false, 0)
 				require.NoError(t, err)
-				err = teamSvc.AddTeamMember(userIds[1], testOrgID, teamId, false, 0)
+				err = teamSvc.AddTeamMember(context.Background(), userIds[1], testOrgID, teamId, false, 0)
 				require.NoError(t, err)
-				err = teamSvc.AddTeamMember(userIds[2], testOrgID, teamId, false, 0)
+				err = teamSvc.AddTeamMember(context.Background(), userIds[2], testOrgID, teamId, false, 0)
 				require.NoError(t, err)
 
 				searchQuery := &team.SearchTeamsQuery{OrgID: testOrgID, Page: 1, Limit: 10, SignedInUser: signedInUser, HiddenUsers: hiddenUsers}
@@ -410,11 +418,11 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) {
 
 				groupId := team2.ID
 				// add service account to team
-				err = teamSvc.AddTeamMember(serviceAccount.ID, testOrgID, groupId, false, 0)
+				err = teamSvc.AddTeamMember(context.Background(), serviceAccount.ID, testOrgID, groupId, false, 0)
 				require.NoError(t, err)
 
 				// add user to team
-				err = teamSvc.AddTeamMember(userIds[0], testOrgID, groupId, false, 0)
+				err = teamSvc.AddTeamMember(context.Background(), userIds[0], testOrgID, groupId, false, 0)
 				require.NoError(t, err)
 
 				teamMembersQuery := &team.GetTeamMembersQuery{
@@ -482,7 +490,8 @@ func TestIntegrationSQLStore_SearchTeams(t *testing.T) {
 	}
 
 	store := db.InitTestDB(t, db.InitTestDBOpt{})
-	teamSvc := ProvideService(store, store.Cfg)
+	teamSvc, err := ProvideService(store, store.Cfg)
+	require.NoError(t, err)
 
 	// Seed 10 teams
 	for i := 1; i <= 10; i++ {
@@ -518,7 +527,8 @@ func TestIntegrationSQLStore_GetTeamMembers_ACFilter(t *testing.T) {
 
 	// Seed 2 teams with 2 members
 	setup := func(store *sqlstore.SQLStore) {
-		teamSvc := ProvideService(store, store.Cfg)
+		teamSvc, err := ProvideService(store, store.Cfg)
+		require.NoError(t, err)
 		team1, errCreateTeam := teamSvc.CreateTeam("group1 name", "test1@example.org", testOrgID)
 		require.NoError(t, errCreateTeam)
 		team2, errCreateTeam := teamSvc.CreateTeam("group2 name", "test2@example.org", testOrgID)
@@ -540,19 +550,20 @@ func TestIntegrationSQLStore_GetTeamMembers_ACFilter(t *testing.T) {
 			userIds[i] = user.ID
 		}
 
-		errAddMember := teamSvc.AddTeamMember(userIds[0], testOrgID, team1.ID, false, 0)
+		errAddMember := teamSvc.AddTeamMember(context.Background(), userIds[0], testOrgID, team1.ID, false, 0)
 		require.NoError(t, errAddMember)
-		errAddMember = teamSvc.AddTeamMember(userIds[1], testOrgID, team1.ID, false, 0)
+		errAddMember = teamSvc.AddTeamMember(context.Background(), userIds[1], testOrgID, team1.ID, false, 0)
 		require.NoError(t, errAddMember)
-		errAddMember = teamSvc.AddTeamMember(userIds[2], testOrgID, team2.ID, false, 0)
+		errAddMember = teamSvc.AddTeamMember(context.Background(), userIds[2], testOrgID, team2.ID, false, 0)
 		require.NoError(t, errAddMember)
-		errAddMember = teamSvc.AddTeamMember(userIds[3], testOrgID, team2.ID, false, 0)
+		errAddMember = teamSvc.AddTeamMember(context.Background(), userIds[3], testOrgID, team2.ID, false, 0)
 		require.NoError(t, errAddMember)
 	}
 
 	store := db.InitTestDB(t, db.InitTestDBOpt{})
 	setup(store)
-	teamSvc := ProvideService(store, store.Cfg)
+	teamSvc, err := ProvideService(store, store.Cfg)
+	require.NoError(t, err)
 
 	type getTeamMembersTestCase struct {
 		desc             string
@@ -626,123 +637,3 @@ func hasWildcardScope(user identity.Requester, action string) bool {
 	}
 	return false
 }
-
-// TODO: Use FakeDashboardStore when org has its own service
-func updateDashboardACL(t *testing.T, sqlStore *sqlstore.SQLStore, dashboardID int64, items ...*dashboards.DashboardACL) error {
-	t.Helper()
-
-	err := sqlStore.WithDbSession(context.Background(), func(sess *db.Session) error {
-		_, err := sess.Exec("DELETE FROM dashboard_acl WHERE dashboard_id=?", dashboardID)
-		if err != nil {
-			return fmt.Errorf("deleting from dashboard_acl failed: %w", err)
-		}
-
-		for _, item := range items {
-			item.Created = time.Now()
-			item.Updated = time.Now()
-			if item.UserID == 0 && item.TeamID == 0 && (item.Role == nil || !item.Role.IsValid()) {
-				return dashboards.ErrDashboardACLInfoMissing
-			}
-
-			if item.DashboardID == 0 {
-				return dashboards.ErrDashboardPermissionDashboardEmpty
-			}
-
-			sess.Nullable("user_id", "team_id")
-			if _, err := sess.Insert(item); err != nil {
-				return err
-			}
-		}
-
-		// Update dashboard HasACL flag
-		dashboard := dashboards.Dashboard{HasACL: true}
-		_, err = sess.Cols("has_acl").Where("id=?", dashboardID).Update(&dashboard)
-		return err
-	})
-	return err
-}
-
-// This function was copied from pkg/services/dashboards/database to circumvent
-// import cycles. When this org-related code is refactored into a service the
-// tests can the real GetDashboardACLInfoList functions
-func getDashboardACLInfoList(s *sqlstore.SQLStore, query *dashboards.GetDashboardACLInfoListQuery) ([]*dashboards.DashboardACLInfoDTO, error) {
-	queryResult := make([]*dashboards.DashboardACLInfoDTO, 0)
-	outerErr := s.WithDbSession(context.Background(), func(dbSession *db.Session) error {
-		falseStr := s.GetDialect().BooleanStr(false)
-
-		if query.DashboardID == 0 {
-			sql := `SELECT
-		da.id,
-		da.org_id,
-		da.dashboard_id,
-		da.user_id,
-		da.team_id,
-		da.permission,
-		da.role,
-		da.created,
-		da.updated,
-		'' as user_login,
-		'' as user_email,
-		'' as team,
-		'' as title,
-		'' as slug,
-		'' as uid,` +
-				falseStr + ` AS is_folder,` +
-				falseStr + ` AS inherited
-		FROM dashboard_acl as da
-		WHERE da.dashboard_id = -1`
-			return dbSession.SQL(sql).Find(&queryResult)
-		}
-
-		rawSQL := `
-			-- get permissions for the dashboard and its parent folder
-			SELECT
-				da.id,
-				da.org_id,
-				da.dashboard_id,
-				da.user_id,
-				da.team_id,
-				da.permission,
-				da.role,
-				da.created,
-				da.updated,
-				u.login AS user_login,
-				u.email AS user_email,
-				ug.name AS team,
-				ug.email AS team_email,
-				d.title,
-				d.slug,
-				d.uid,
-				d.is_folder,
-				CASE WHEN (da.dashboard_id = -1 AND d.folder_id > 0) OR da.dashboard_id = d.folder_id THEN ` + s.GetDialect().BooleanStr(true) + ` ELSE ` + falseStr + ` END AS inherited
-			FROM dashboard as d
-				LEFT JOIN dashboard folder on folder.id = d.folder_id
-				LEFT JOIN dashboard_acl AS da ON
-				da.dashboard_id = d.id OR
-				da.dashboard_id = d.folder_id OR
-				(
-					-- include default permissions -->
-					da.org_id = -1 AND (
-					  (folder.id IS NOT NULL AND folder.has_acl = ` + falseStr + `) OR
-					  (folder.id IS NULL AND d.has_acl = ` + falseStr + `)
-					)
-				)
-				LEFT JOIN ` + s.GetDialect().Quote("user") + ` AS u ON u.id = da.user_id
-				LEFT JOIN team ug on ug.id = da.team_id
-			WHERE d.org_id = ? AND d.id = ? AND da.id IS NOT NULL
-			ORDER BY da.id ASC
-			`
-
-		return dbSession.SQL(rawSQL, query.OrgID, query.DashboardID).Find(&queryResult)
-	})
-
-	if outerErr != nil {
-		return nil, outerErr
-	}
-
-	for _, p := range queryResult {
-		p.PermissionName = p.Permission.String()
-	}
-
-	return queryResult, nil
-}
diff --git a/pkg/services/team/teamimpl/team.go b/pkg/services/team/teamimpl/team.go
index 5895447bc4b4b..11cef2ab58ead 100644
--- a/pkg/services/team/teamimpl/team.go
+++ b/pkg/services/team/teamimpl/team.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/team"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -13,8 +13,13 @@ type Service struct {
 	store store
 }
 
-func ProvideService(db db.DB, cfg *setting.Cfg) team.Service {
-	return &Service{store: &xormStore{db: db, cfg: cfg, deletes: []string{}}}
+func ProvideService(db db.DB, cfg *setting.Cfg) (team.Service, error) {
+	store := &xormStore{db: db, cfg: cfg, deletes: []string{}}
+
+	if err := store.uidMigration(); err != nil {
+		return nil, err
+	}
+	return &Service{store: &xormStore{db: db, cfg: cfg, deletes: []string{}}}, nil
 }
 
 func (s *Service) CreateTeam(name, email string, orgID int64) (team.Team, error) {
@@ -41,8 +46,12 @@ func (s *Service) GetTeamsByUser(ctx context.Context, query *team.GetTeamsByUser
 	return s.store.GetByUser(ctx, query)
 }
 
-func (s *Service) AddTeamMember(userID, orgID, teamID int64, isExternal bool, permission dashboards.PermissionType) error {
-	return s.store.AddMember(userID, orgID, teamID, isExternal, permission)
+func (s *Service) GetTeamIDsByUser(ctx context.Context, query *team.GetTeamIDsByUserQuery) ([]int64, error) {
+	return s.store.GetIDsByUser(ctx, query)
+}
+
+func (s *Service) AddTeamMember(ctx context.Context, userID, orgID, teamID int64, isExternal bool, permission dashboardaccess.PermissionType) error {
+	return s.store.AddMember(ctx, userID, orgID, teamID, isExternal, permission)
 }
 
 func (s *Service) UpdateTeamMember(ctx context.Context, cmd *team.UpdateTeamMemberCommand) error {
diff --git a/pkg/services/team/teamtest/team.go b/pkg/services/team/teamtest/team.go
index 71ae3073036c2..2c6fccdf3338a 100644
--- a/pkg/services/team/teamtest/team.go
+++ b/pkg/services/team/teamtest/team.go
@@ -3,7 +3,7 @@ package teamtest
 import (
 	"context"
 
-	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
 	"github.com/grafana/grafana/pkg/services/team"
 )
 
@@ -45,7 +45,7 @@ func (s *FakeService) GetTeamsByUser(ctx context.Context, query *team.GetTeamsBy
 	return s.ExpectedTeamsByUser, s.ExpectedError
 }
 
-func (s *FakeService) AddTeamMember(userID, orgID, teamID int64, isExternal bool, permission dashboards.PermissionType) error {
+func (s *FakeService) AddTeamMember(ctx context.Context, userID, orgID, teamID int64, isExternal bool, permission dashboardaccess.PermissionType) error {
 	return s.ExpectedError
 }
 
@@ -75,3 +75,12 @@ func (s *FakeService) GetTeamMembers(ctx context.Context, query *team.GetTeamMem
 
 func (s *FakeService) RegisterDelete(query string) {
 }
+
+func (s *FakeService) GetTeamIDsByUser(ctx context.Context, query *team.GetTeamIDsByUserQuery) ([]int64, error) {
+	result := make([]int64, 0)
+	for _, team := range s.ExpectedTeamsByUser {
+		result = append(result, team.ID)
+	}
+
+	return result, s.ExpectedError
+}
diff --git a/pkg/services/temp_user/model.go b/pkg/services/temp_user/model.go
index 1e05d15d83280..dbec94be91482 100644
--- a/pkg/services/temp_user/model.go
+++ b/pkg/services/temp_user/model.go
@@ -15,11 +15,14 @@ var (
 type TempUserStatus string
 
 const (
-	TmpUserSignUpStarted TempUserStatus = "SignUpStarted"
-	TmpUserInvitePending TempUserStatus = "InvitePending"
-	TmpUserCompleted     TempUserStatus = "Completed"
-	TmpUserRevoked       TempUserStatus = "Revoked"
-	TmpUserExpired       TempUserStatus = "Expired"
+	TmpUserSignUpStarted        TempUserStatus = "SignUpStarted"
+	TmpUserInvitePending        TempUserStatus = "InvitePending"
+	TmpUserCompleted            TempUserStatus = "Completed"
+	TmpUserRevoked              TempUserStatus = "Revoked"
+	TmpUserExpired              TempUserStatus = "Expired"
+	TmpUserEmailUpdateStarted   TempUserStatus = "EmailUpdateStarted"
+	TmpUserEmailUpdateCompleted TempUserStatus = "EmailUpdateCompleted"
+	TmpUserEmailUpdateExpired   TempUserStatus = "EmailUpdateExpired"
 )
 
 // TempUser holds data for org invites and unconfirmed sign ups
@@ -67,6 +70,12 @@ type ExpireTempUsersCommand struct {
 	NumExpired int64
 }
 
+type ExpirePreviousVerificationsCommand struct {
+	InvitedByUserID int64
+
+	NumExpired int64
+}
+
 type UpdateTempUserWithEmailSentCommand struct {
 	Code string
 }
@@ -87,6 +96,7 @@ type TempUserDTO struct {
 	Name           string         `json:"name"`
 	Email          string         `json:"email"`
 	Role           org.RoleType   `json:"role"`
+	InvitedByID    int64          `json:"-" xorm:"invited_by_id"`
 	InvitedByLogin string         `json:"invitedByLogin"`
 	InvitedByEmail string         `json:"invitedByEmail"`
 	InvitedByName  string         `json:"invitedByName"`
diff --git a/pkg/services/temp_user/temp_user.go b/pkg/services/temp_user/temp_user.go
index 91b7e49801df0..162e35459cde7 100644
--- a/pkg/services/temp_user/temp_user.go
+++ b/pkg/services/temp_user/temp_user.go
@@ -11,4 +11,6 @@ type Service interface {
 	GetTempUsersQuery(ctx context.Context, query *GetTempUsersQuery) ([]*TempUserDTO, error)
 	GetTempUserByCode(ctx context.Context, query *GetTempUserByCodeQuery) (*TempUserDTO, error)
 	ExpireOldUserInvites(ctx context.Context, cmd *ExpireTempUsersCommand) error
+	ExpireOldVerifications(ctx context.Context, cmd *ExpireTempUsersCommand) error
+	ExpirePreviousVerifications(ctx context.Context, cmd *ExpirePreviousVerificationsCommand) error
 }
diff --git a/pkg/services/temp_user/tempuserimpl/store.go b/pkg/services/temp_user/tempuserimpl/store.go
index a0ac0f6670250..ca6b14dc2b8a9 100644
--- a/pkg/services/temp_user/tempuserimpl/store.go
+++ b/pkg/services/temp_user/tempuserimpl/store.go
@@ -16,6 +16,8 @@ type store interface {
 	GetTempUsersQuery(ctx context.Context, query *tempuser.GetTempUsersQuery) ([]*tempuser.TempUserDTO, error)
 	GetTempUserByCode(ctx context.Context, query *tempuser.GetTempUserByCodeQuery) (*tempuser.TempUserDTO, error)
 	ExpireOldUserInvites(ctx context.Context, cmd *tempuser.ExpireTempUsersCommand) error
+	ExpireOldVerifications(ctx context.Context, cmd *tempuser.ExpireTempUsersCommand) error
+	ExpirePreviousVerifications(ctx context.Context, cmd *tempuser.ExpirePreviousVerificationsCommand) error
 }
 
 type xormStore struct {
@@ -104,11 +106,7 @@ func (ss *xormStore) GetTempUsersQuery(ctx context.Context, query *tempuser.GetT
 		}
 
 		if query.Email != "" {
-			if ss.cfg.CaseInsensitiveLogin {
-				rawSQL += ` AND LOWER(tu.email)=LOWER(?)`
-			} else {
-				rawSQL += ` AND tu.email=?`
-			}
+			rawSQL += ` AND LOWER(tu.email)=LOWER(?)`
 			params = append(params, query.Email)
 		}
 
@@ -131,18 +129,19 @@ func (ss *xormStore) GetTempUserByCode(ctx context.Context, query *tempuser.GetT
 	                tu.id             as id,
 	                tu.org_id         as org_id,
 	                tu.email          as email,
-									tu.name           as name,
-									tu.role           as role,
-									tu.code           as code,
-									tu.status         as status,
-									tu.email_sent     as email_sent,
-									tu.email_sent_on  as email_sent_on,
-									tu.created				as created,
-									u.login						as invited_by_login,
-									u.name						as invited_by_name,
-									u.email						as invited_by_email
+					tu.name           as name,
+					tu.role           as role,
+					tu.code           as code,
+					tu.status         as status,
+					tu.email_sent     as email_sent,
+					tu.email_sent_on  as email_sent_on,
+					tu.created		  as created,
+					tu.invited_by_user_id  as invited_by_id,
+					u.login			  as invited_by_login,
+					u.name		      as invited_by_name,
+					u.email			  as invited_by_email
 	                FROM ` + ss.db.GetDialect().Quote("temp_user") + ` as tu
-									LEFT OUTER JOIN ` + ss.db.GetDialect().Quote("user") + ` as u on u.id = tu.invited_by_user_id
+						LEFT OUTER JOIN ` + ss.db.GetDialect().Quote("user") + ` as u on u.id = tu.invited_by_user_id
 	                WHERE tu.code=?`
 
 		var tempUser tempuser.TempUserDTO
@@ -175,3 +174,27 @@ func (ss *xormStore) ExpireOldUserInvites(ctx context.Context, cmd *tempuser.Exp
 		return nil
 	})
 }
+
+func (ss *xormStore) ExpireOldVerifications(ctx context.Context, cmd *tempuser.ExpireTempUsersCommand) error {
+	return ss.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
+		var rawSQL = "UPDATE temp_user SET status = ?, updated = ? WHERE created <= ? AND status = ?"
+		if result, err := sess.Exec(rawSQL, string(tempuser.TmpUserEmailUpdateExpired), time.Now().Unix(), cmd.OlderThan.Unix(), string(tempuser.TmpUserEmailUpdateStarted)); err != nil {
+			return err
+		} else if cmd.NumExpired, err = result.RowsAffected(); err != nil {
+			return err
+		}
+		return nil
+	})
+}
+
+func (ss *xormStore) ExpirePreviousVerifications(ctx context.Context, cmd *tempuser.ExpirePreviousVerificationsCommand) error {
+	return ss.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
+		var rawSQL = "UPDATE temp_user SET status = ?, updated = ? WHERE invited_by_user_id = ? AND status = ?"
+		if result, err := sess.Exec(rawSQL, string(tempuser.TmpUserEmailUpdateExpired), time.Now().Unix(), cmd.InvitedByUserID, string(tempuser.TmpUserEmailUpdateStarted)); err != nil {
+			return err
+		} else if cmd.NumExpired, err = result.RowsAffected(); err != nil {
+			return err
+		}
+		return nil
+	})
+}
diff --git a/pkg/services/temp_user/tempuserimpl/store_test.go b/pkg/services/temp_user/tempuserimpl/store_test.go
index 7fa636110e5dc..491850afe5102 100644
--- a/pkg/services/temp_user/tempuserimpl/store_test.go
+++ b/pkg/services/temp_user/tempuserimpl/store_test.go
@@ -9,8 +9,13 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/db"
 	tempuser "github.com/grafana/grafana/pkg/services/temp_user"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationTempUserCommandsAndQueries(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
@@ -56,30 +61,14 @@ func TestIntegrationTempUserCommandsAndQueries(t *testing.T) {
 		require.Nil(t, err)
 		require.Equal(t, 1, len(queryResult))
 	})
-	t.Run("Should not be able to get temp users by case-insentive email - case sensitive", func(t *testing.T) {
-		if db.IsTestDbMySQL() {
-			t.Skip("MySQL is case insensitive by default")
-		}
-		setup(t)
-		store.cfg.CaseInsensitiveLogin = false
-		query := tempuser.GetTempUsersQuery{Email: "E@as.co", Status: tempuser.TmpUserInvitePending}
-		queryResult, err := store.GetTempUsersQuery(context.Background(), &query)
-
-		require.Nil(t, err)
-		require.Equal(t, 0, len(queryResult))
-	})
 
 	t.Run("Should be able to get temp users by email - case insensitive", func(t *testing.T) {
 		setup(t)
-		store.cfg.CaseInsensitiveLogin = true
 		query := tempuser.GetTempUsersQuery{Email: "E@as.co", Status: tempuser.TmpUserInvitePending}
 		queryResult, err := store.GetTempUsersQuery(context.Background(), &query)
 
 		require.Nil(t, err)
 		require.Equal(t, 1, len(queryResult))
-		t.Cleanup(func() {
-			store.cfg.CaseInsensitiveLogin = false
-		})
 	})
 
 	t.Run("Should be able to get temp users by code", func(t *testing.T) {
@@ -112,7 +101,32 @@ func TestIntegrationTempUserCommandsAndQueries(t *testing.T) {
 		require.False(t, queryResult[0].EmailSentOn.UTC().Before(queryResult[0].Created.UTC()))
 	})
 
-	t.Run("Should be able expire temp user", func(t *testing.T) {
+	t.Run("Should be able expire all pending verifications from a user", func(t *testing.T) {
+		userID := int64(99)
+		verifications := 5
+		cmd := tempuser.CreateTempUserCommand{
+			OrgID:           -1,
+			Name:            "email-update",
+			Code:            "asd",
+			Email:           "e@as.co",
+			Status:          tempuser.TmpUserEmailUpdateStarted,
+			InvitedByUserID: userID,
+		}
+		db := db.InitTestDB(t)
+		store = &xormStore{db: db, cfg: db.Cfg}
+
+		for i := 0; i < verifications; i++ {
+			tempUser, err = store.CreateTempUser(context.Background(), &cmd)
+			require.Nil(t, err)
+		}
+
+		cmd2 := tempuser.ExpirePreviousVerificationsCommand{InvitedByUserID: userID}
+		err := store.ExpirePreviousVerifications(context.Background(), &cmd2)
+		require.Nil(t, err)
+		require.Equal(t, int64(verifications), cmd2.NumExpired)
+	})
+
+	t.Run("Should be able expire temp user related to org invite", func(t *testing.T) {
 		setup(t)
 		createdAt := time.Unix(tempUser.Created, 0)
 		cmd2 := tempuser.ExpireTempUsersCommand{OlderThan: createdAt.Add(1 * time.Second)}
@@ -128,4 +142,34 @@ func TestIntegrationTempUserCommandsAndQueries(t *testing.T) {
 			require.Equal(t, int64(0), cmd2.NumExpired)
 		})
 	})
+
+	t.Run("Should be able expire temp user related to email verification", func(t *testing.T) {
+		cmd := tempuser.CreateTempUserCommand{
+			OrgID:           2256,
+			Name:            "email-update",
+			Code:            "asd",
+			Email:           "e@as.co",
+			Status:          tempuser.TmpUserEmailUpdateStarted,
+			InvitedByUserID: 99,
+		}
+		db := db.InitTestDB(t)
+		store = &xormStore{db: db, cfg: db.Cfg}
+
+		tempUser, err = store.CreateTempUser(context.Background(), &cmd)
+		require.Nil(t, err)
+
+		createdAt := time.Unix(tempUser.Created, 0)
+		cmd2 := tempuser.ExpireTempUsersCommand{OlderThan: createdAt.Add(1 * time.Second)}
+		err := store.ExpireOldVerifications(context.Background(), &cmd2)
+		require.Nil(t, err)
+		require.Equal(t, int64(1), cmd2.NumExpired)
+
+		t.Run("Should do nothing when no temp users to expire", func(t *testing.T) {
+			createdAt := time.Unix(tempUser.Created, 0)
+			cmd2 := tempuser.ExpireTempUsersCommand{OlderThan: createdAt.Add(1 * time.Second)}
+			err := store.ExpireOldVerifications(context.Background(), &cmd2)
+			require.Nil(t, err)
+			require.Equal(t, int64(0), cmd2.NumExpired)
+		})
+	})
 }
diff --git a/pkg/services/temp_user/tempuserimpl/temp_user.go b/pkg/services/temp_user/tempuserimpl/temp_user.go
index e6dd24fe452c7..89795f1364027 100644
--- a/pkg/services/temp_user/tempuserimpl/temp_user.go
+++ b/pkg/services/temp_user/tempuserimpl/temp_user.go
@@ -68,3 +68,19 @@ func (s *Service) ExpireOldUserInvites(ctx context.Context, cmd *tempuser.Expire
 	}
 	return nil
 }
+
+func (s *Service) ExpireOldVerifications(ctx context.Context, cmd *tempuser.ExpireTempUsersCommand) error {
+	err := s.store.ExpireOldVerifications(ctx, cmd)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (s *Service) ExpirePreviousVerifications(ctx context.Context, cmd *tempuser.ExpirePreviousVerificationsCommand) error {
+	err := s.store.ExpirePreviousVerifications(ctx, cmd)
+	if err != nil {
+		return err
+	}
+	return nil
+}
diff --git a/pkg/services/temp_user/tempusertest/fake.go b/pkg/services/temp_user/tempusertest/fake.go
new file mode 100644
index 0000000000000..0bd9b803a884a
--- /dev/null
+++ b/pkg/services/temp_user/tempusertest/fake.go
@@ -0,0 +1,53 @@
+package tempusertest
+
+import (
+	"context"
+
+	tempuser "github.com/grafana/grafana/pkg/services/temp_user"
+)
+
+var _ tempuser.Service = (*FakeTempUserService)(nil)
+
+type FakeTempUserService struct {
+	tempuser.Service
+	GetTempUserByCodeFN           func(ctx context.Context, query *tempuser.GetTempUserByCodeQuery) (*tempuser.TempUserDTO, error)
+	UpdateTempUserStatusFN        func(ctx context.Context, cmd *tempuser.UpdateTempUserStatusCommand) error
+	CreateTempUserFN              func(ctx context.Context, cmd *tempuser.CreateTempUserCommand) (*tempuser.TempUser, error)
+	ExpirePreviousVerificationsFN func(ctx context.Context, cmd *tempuser.ExpirePreviousVerificationsCommand) error
+	UpdateTempUserWithEmailSentFN func(ctx context.Context, cmd *tempuser.UpdateTempUserWithEmailSentCommand) error
+}
+
+func (f *FakeTempUserService) GetTempUserByCode(ctx context.Context, query *tempuser.GetTempUserByCodeQuery) (*tempuser.TempUserDTO, error) {
+	if f.GetTempUserByCodeFN != nil {
+		return f.GetTempUserByCodeFN(ctx, query)
+	}
+	return nil, nil
+}
+
+func (f *FakeTempUserService) UpdateTempUserStatus(ctx context.Context, cmd *tempuser.UpdateTempUserStatusCommand) error {
+	if f.UpdateTempUserStatusFN != nil {
+		return f.UpdateTempUserStatusFN(ctx, cmd)
+	}
+	return nil
+}
+
+func (f *FakeTempUserService) CreateTempUser(ctx context.Context, cmd *tempuser.CreateTempUserCommand) (*tempuser.TempUser, error) {
+	if f.CreateTempUserFN != nil {
+		return f.CreateTempUserFN(ctx, cmd)
+	}
+	return nil, nil
+}
+
+func (f *FakeTempUserService) ExpirePreviousVerifications(ctx context.Context, cmd *tempuser.ExpirePreviousVerificationsCommand) error {
+	if f.ExpirePreviousVerificationsFN != nil {
+		return f.ExpirePreviousVerificationsFN(ctx, cmd)
+	}
+	return nil
+}
+
+func (f *FakeTempUserService) UpdateTempUserWithEmailSent(ctx context.Context, cmd *tempuser.UpdateTempUserWithEmailSentCommand) error {
+	if f.UpdateTempUserWithEmailSentFN != nil {
+		return f.UpdateTempUserWithEmailSentFN(ctx, cmd)
+	}
+	return nil
+}
diff --git a/pkg/services/updatechecker/grafana.go b/pkg/services/updatechecker/grafana.go
index 006fc0be575a0..3760fe06b1347 100644
--- a/pkg/services/updatechecker/grafana.go
+++ b/pkg/services/updatechecker/grafana.go
@@ -20,7 +20,7 @@ import (
 	"github.com/grafana/grafana/pkg/setting"
 )
 
-const grafanaLatestJSONURL = "https://raw.githubusercontent.com/grafana/grafana/main/latest.json"
+const grafanaStableVersionURL = "https://grafana.com/api/grafana/versions/stable"
 
 type GrafanaService struct {
 	hasUpdate     bool
@@ -60,7 +60,7 @@ func (s *GrafanaService) IsDisabled() bool {
 func (s *GrafanaService) Run(ctx context.Context) error {
 	s.instrumentedCheckForUpdates(ctx)
 
-	ticker := time.NewTicker(time.Minute * 10)
+	ticker := time.NewTicker(time.Hour * 24)
 	run := true
 
 	for run {
@@ -92,13 +92,13 @@ func (s *GrafanaService) instrumentedCheckForUpdates(ctx context.Context) {
 func (s *GrafanaService) checkForUpdates(ctx context.Context) error {
 	ctxLogger := s.log.FromContext(ctx)
 	ctxLogger.Debug("Checking for updates")
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, grafanaLatestJSONURL, nil)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, grafanaStableVersionURL, nil)
 	if err != nil {
 		return err
 	}
 	resp, err := s.httpClient.Do(req)
 	if err != nil {
-		return fmt.Errorf("failed to get latest.json repo from github.com: %w", err)
+		return fmt.Errorf("failed to get stable version from grafana.com: %w", err)
 	}
 	defer func() {
 		if err := resp.Body.Close(); err != nil {
@@ -107,27 +107,24 @@ func (s *GrafanaService) checkForUpdates(ctx context.Context) error {
 	}()
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return fmt.Errorf("update check failed, reading response from github.com: %w", err)
+		return fmt.Errorf("update check failed, reading response from grafana.com: %w", err)
 	}
 
-	type latestJSON struct {
-		Stable  string `json:"stable"`
-		Testing string `json:"testing"`
+	type grafanaVersionJSON struct {
+		Version string `json:"version"`
 	}
-	var latest latestJSON
+	var latest grafanaVersionJSON
 	err = json.Unmarshal(body, &latest)
 	if err != nil {
-		return fmt.Errorf("failed to unmarshal latest.json: %w", err)
+		return fmt.Errorf("failed to unmarshal response from grafana.com: %w", err)
 	}
 
 	s.mutex.Lock()
 	defer s.mutex.Unlock()
-	if strings.Contains(s.grafanaVersion, "-") {
-		s.latestVersion = latest.Testing
-		s.hasUpdate = !strings.HasPrefix(s.grafanaVersion, latest.Testing)
-	} else {
-		s.latestVersion = latest.Stable
-		s.hasUpdate = latest.Stable != s.grafanaVersion
+	// only check for updates in stable versions
+	if !strings.Contains(s.grafanaVersion, "-") {
+		s.latestVersion = latest.Version
+		s.hasUpdate = latest.Version != s.grafanaVersion
 	}
 
 	currVersion, err1 := version.NewVersion(s.grafanaVersion)
diff --git a/pkg/services/user/error.go b/pkg/services/user/error.go
index ba70fd24baf18..8fd192704fb25 100644
--- a/pkg/services/user/error.go
+++ b/pkg/services/user/error.go
@@ -18,6 +18,7 @@ var (
 )
 
 var (
+	ErrEmailConflict         = errutil.Conflict("user.email-conflict", errutil.WithPublicMessage("Email is already being used"))
 	ErrEmptyUsernameAndEmail = errutil.BadRequest(
 		"user.empty-username-and-email", errutil.WithPublicMessage("Need to specify either username or email"),
 	)
diff --git a/pkg/services/user/identity.go b/pkg/services/user/identity.go
index 776c9775b1c57..af7894c3a7c37 100644
--- a/pkg/services/user/identity.go
+++ b/pkg/services/user/identity.go
@@ -2,15 +2,21 @@ package user
 
 import (
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/grafana/grafana/pkg/models/roletype"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 )
 
+const (
+	GlobalOrgID = int64(0)
+)
+
 type SignedInUser struct {
-	UserID           int64 `xorm:"user_id"`
-	OrgID            int64 `xorm:"org_id"`
+	UserID           int64  `xorm:"user_id"`
+	UserUID          string `xorm:"user_uid"`
+	OrgID            int64  `xorm:"org_id"`
 	OrgName          string
 	OrgRole          roletype.RoleType
 	Login            string
@@ -54,6 +60,7 @@ func (u *SignedInUser) NameOrFallback() string {
 func (u *SignedInUser) ToUserDisplayDTO() *UserDisplayDTO {
 	return &UserDisplayDTO{
 		ID:    u.UserID,
+		UID:   u.UserUID,
 		Login: u.Login,
 		Name:  u.Name,
 		// AvatarURL: dtos.GetGravatarUrl(u.GetEmail()),
@@ -113,7 +120,12 @@ func (u *SignedInUser) GetCacheKey() string {
 	if !u.HasUniqueId() {
 		// Hack use the org role as id for identities that do not have a unique id
 		// e.g. anonymous and render key.
-		id = string(u.GetOrgRole())
+		orgRole := u.GetOrgRole()
+		if orgRole == "" {
+			orgRole = roletype.RoleNone
+		}
+
+		id = string(orgRole)
 	}
 
 	return fmt.Sprintf("%d-%s-%s", u.GetOrgID(), namespace, id)
@@ -154,6 +166,19 @@ func (u *SignedInUser) GetPermissions() map[string][]string {
 	return u.Permissions[u.GetOrgID()]
 }
 
+// GetGlobalPermissions returns the permissions of the active entity that are available across all organizations
+func (u *SignedInUser) GetGlobalPermissions() map[string][]string {
+	if u.Permissions == nil {
+		return make(map[string][]string)
+	}
+
+	if u.Permissions[GlobalOrgID] == nil {
+		return make(map[string][]string)
+	}
+
+	return u.Permissions[GlobalOrgID]
+}
+
 // DEPRECATED: GetTeams returns the teams the entity is a member of
 // Retrieve the teams from the team service instead of using this method.
 func (u *SignedInUser) GetTeams() []int64 {
@@ -162,34 +187,43 @@ func (u *SignedInUser) GetTeams() []int64 {
 
 // GetOrgRole returns the role of the active entity in the active organization
 func (u *SignedInUser) GetOrgRole() roletype.RoleType {
-	if u.OrgRole == "" {
-		return roletype.RoleNone
-	}
 	return u.OrgRole
 }
 
-// GetNamespacedID returns the namespace and ID of the active entity
-// The namespace is one of the constants defined in pkg/services/auth/identity
-func (u *SignedInUser) GetNamespacedID() (string, string) {
+// GetID returns namespaced id for the entity
+func (u *SignedInUser) GetID() string {
 	switch {
 	case u.ApiKeyID != 0:
-		return identity.NamespaceAPIKey, fmt.Sprintf("%d", u.ApiKeyID)
+		return namespacedID(identity.NamespaceAPIKey, u.ApiKeyID)
 	case u.IsServiceAccount:
-		return identity.NamespaceServiceAccount, fmt.Sprintf("%d", u.UserID)
+		return namespacedID(identity.NamespaceServiceAccount, u.UserID)
 	case u.UserID > 0:
-		return identity.NamespaceUser, fmt.Sprintf("%d", u.UserID)
+		return namespacedID(identity.NamespaceUser, u.UserID)
 	case u.IsAnonymous:
-		return identity.NamespaceAnonymous, ""
-	case u.AuthenticatedBy == "render": //import cycle render
-		if u.UserID == 0 {
-			return identity.NamespaceRenderService, "0"
-		} else { // this should never happen as u.UserID > 0 already catches this
-			return identity.NamespaceUser, fmt.Sprintf("%d", u.UserID)
-		}
+		return identity.NamespaceAnonymous + ":"
+	case u.AuthenticatedBy == "render" && u.UserID == 0:
+		return namespacedID(identity.NamespaceRenderService, 0)
 	}
 
 	// backwards compatibility
-	return identity.NamespaceUser, fmt.Sprintf("%d", u.UserID)
+	return namespacedID(identity.NamespaceUser, u.UserID)
+}
+
+// GetNamespacedID returns the namespace and ID of the active entity
+// The namespace is one of the constants defined in pkg/services/auth/identity
+func (u *SignedInUser) GetNamespacedID() (string, string) {
+	parts := strings.Split(u.GetID(), ":")
+	// Safety: GetID always returns a ':' separated string
+	return parts[0], parts[1]
+}
+
+func (u *SignedInUser) IsAuthenticatedBy(providers ...string) bool {
+	for _, p := range providers {
+		if u.AuthenticatedBy == p {
+			return true
+		}
+	}
+	return false
 }
 
 // FIXME: remove this method once all services are using an interface
@@ -217,3 +251,7 @@ func (u *SignedInUser) GetAuthenticatedBy() string {
 func (u *SignedInUser) GetIDToken() string {
 	return u.IDToken
 }
+
+func namespacedID(namespace string, id int64) string {
+	return fmt.Sprintf("%s:%d", namespace, id)
+}
diff --git a/pkg/services/user/model.go b/pkg/services/user/model.go
index 81b184286abae..5a51644c9fb4e 100644
--- a/pkg/services/user/model.go
+++ b/pkg/services/user/model.go
@@ -19,13 +19,21 @@ const (
 	HelpFlagDashboardHelp1
 )
 
+type UpdateEmailActionType string
+
+const (
+	EmailUpdateAction UpdateEmailActionType = "email-update"
+	LoginUpdateAction UpdateEmailActionType = "login-update"
+)
+
 type User struct {
-	ID            int64 `xorm:"pk autoincr 'id'"`
+	ID            int64  `xorm:"pk autoincr 'id'"`
+	UID           string `json:"uid" xorm:"uid"`
 	Version       int
 	Email         string
 	Name          string
 	Login         string
-	Password      string
+	Password      Password
 	Salt          string
 	Rands         string
 	Company       string
@@ -44,13 +52,14 @@ type User struct {
 }
 
 type CreateUserCommand struct {
+	UID              string
 	Email            string
 	Login            string
 	Name             string
 	Company          string
 	OrgID            int64
 	OrgName          string
-	Password         string
+	Password         Password
 	EmailVerified    bool
 	IsAdmin          bool
 	IsDisabled       bool
@@ -73,12 +82,13 @@ type UpdateUserCommand struct {
 	Login string `json:"login"`
 	Theme string `json:"theme"`
 
-	UserID int64 `json:"-"`
+	UserID        int64 `json:"-"`
+	EmailVerified *bool `json:"-"`
 }
 
 type ChangeUserPasswordCommand struct {
-	OldPassword string `json:"oldPassword"`
-	NewPassword string `json:"newPassword"`
+	OldPassword Password `json:"oldPassword"`
+	NewPassword Password `json:"newPassword"`
 
 	UserID int64 `json:"-"`
 }
@@ -115,6 +125,7 @@ type SearchUserQueryResult struct {
 
 type UserSearchHitDTO struct {
 	ID            int64                `json:"id" xorm:"id"`
+	UID           string               `json:"uid" xorm:"id"`
 	Name          string               `json:"name"`
 	Login         string               `json:"login"`
 	Email         string               `json:"email"`
@@ -133,6 +144,7 @@ type GetUserProfileQuery struct {
 
 type UserProfileDTO struct {
 	ID                             int64           `json:"id"`
+	UID                            string          `json:"uid"`
 	Email                          string          `json:"email"`
 	Name                           string          `json:"name"`
 	Login                          string          `json:"login"`
@@ -209,12 +221,23 @@ type GetUserByIDQuery struct {
 	ID int64
 }
 
+type StartVerifyEmailCommand struct {
+	User   User
+	Email  string
+	Action UpdateEmailActionType
+}
+
+type CompleteEmailVerifyCommand struct {
+	Code string
+}
+
 type ErrCaseInsensitiveLoginConflict struct {
 	Users []User
 }
 
 type UserDisplayDTO struct {
 	ID        int64  `json:"id,omitempty"`
+	UID       string `json:"uid,omitempty"`
 	Name      string `json:"name,omitempty"`
 	Login     string `json:"login,omitempty"`
 	AvatarURL string `json:"avatarUrl"`
@@ -275,9 +298,3 @@ type AdminCreateUserResponse struct {
 	ID      int64  `json:"id"`
 	Message string `json:"message"`
 }
-
-type Password string
-
-func (p Password) IsWeak() bool {
-	return len(p) <= 4
-}
diff --git a/pkg/services/user/password.go b/pkg/services/user/password.go
new file mode 100644
index 0000000000000..70e0e131e58bf
--- /dev/null
+++ b/pkg/services/user/password.go
@@ -0,0 +1,71 @@
+package user
+
+import (
+	"unicode"
+
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util/errutil"
+)
+
+var (
+	ErrPasswordTooShort       = errutil.BadRequest("password.password-policy-too-short", errutil.WithPublicMessage("New password is too short"))
+	ErrPasswordPolicyInfringe = errutil.BadRequest("password.password-policy-infringe", errutil.WithPublicMessage("New password doesn't comply with the password policy"))
+	MinPasswordLength         = 12
+)
+
+type Password string
+
+func NewPassword(newPassword string, config *setting.Cfg) (Password, error) {
+	if err := ValidatePassword(newPassword, config); err != nil {
+		return "", err
+	}
+	return Password(newPassword), nil
+}
+
+func (p Password) Validate(config *setting.Cfg) error {
+	return ValidatePassword(string(p), config)
+}
+
+// ValidatePassword checks if a new password meets the required criteria based on the given configuration.
+// If BasicAuthStrongPasswordPolicy is disabled, it only checks for password length.
+// Otherwise, it ensures the password meets the minimum length requirement and contains at least one uppercase letter,
+// one lowercase letter, one number, and one symbol.
+func ValidatePassword(newPassword string, config *setting.Cfg) error {
+	if !config.BasicAuthStrongPasswordPolicy {
+		if len(newPassword) <= 4 {
+			return ErrPasswordTooShort.Errorf("new password is too short")
+		}
+		return nil
+	}
+	if len(newPassword) < MinPasswordLength {
+		return ErrPasswordPolicyInfringe.Errorf("new password is too short for the strong password policy")
+	}
+
+	hasUpperCase := false
+	hasLowerCase := false
+	hasNumber := false
+	hasSymbol := false
+
+	for _, r := range newPassword {
+		if !hasLowerCase && unicode.IsLower(r) {
+			hasLowerCase = true
+		}
+
+		if !hasUpperCase && unicode.IsUpper(r) {
+			hasUpperCase = true
+		}
+
+		if !hasNumber && unicode.IsNumber(r) {
+			hasNumber = true
+		}
+
+		if !hasSymbol && !unicode.IsLetter(r) && !unicode.IsNumber(r) {
+			hasSymbol = true
+		}
+
+		if hasUpperCase && hasLowerCase && hasNumber && hasSymbol {
+			return nil
+		}
+	}
+	return ErrPasswordPolicyInfringe.Errorf("new password doesn't comply with the password policy")
+}
diff --git a/pkg/services/user/password_test.go b/pkg/services/user/password_test.go
new file mode 100644
index 0000000000000..1953d1a152902
--- /dev/null
+++ b/pkg/services/user/password_test.go
@@ -0,0 +1,93 @@
+package user
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestPasswowrdService_ValidatePasswordHardcodePolicy(t *testing.T) {
+	LOWERCASE := "lowercase"
+	UPPERCASE := "UPPERCASE"
+	NUMBER := "123"
+	SYMBOLS := "!@#$%"
+	testCases := []struct {
+		expectedError               error
+		name                        string
+		passwordTest                string
+		strongPasswordPolicyEnabled bool
+	}{
+		{
+			name:                        "should return error when the password has less than 4 characters and strong password policy is disabled",
+			passwordTest:                NUMBER,
+			expectedError:               ErrPasswordTooShort.Errorf("new password is too short"),
+			strongPasswordPolicyEnabled: false,
+		},
+		{name: "should not return error when the password has 4 characters and strong password policy is disabled",
+			passwordTest:                LOWERCASE,
+			expectedError:               nil,
+			strongPasswordPolicyEnabled: false,
+		},
+		{
+			name:                        "should return error when the password has less than 12 characters and strong password policy is enabled",
+			passwordTest:                NUMBER,
+			expectedError:               ErrPasswordPolicyInfringe.Errorf("new password is too short for the strong password policy"),
+			strongPasswordPolicyEnabled: true,
+		},
+		{
+			name:                        "should return error when the password is missing an uppercase character and strong password policy is enabled",
+			passwordTest:                LOWERCASE + NUMBER + SYMBOLS,
+			expectedError:               ErrPasswordPolicyInfringe.Errorf("new password doesn't comply with the password policy"),
+			strongPasswordPolicyEnabled: true,
+		},
+		{
+			name:                        "should return error when the password is missing a lowercase character and strong password policy is enabled",
+			passwordTest:                UPPERCASE + NUMBER + SYMBOLS,
+			expectedError:               ErrPasswordPolicyInfringe.Errorf("new password doesn't comply with the password policy"),
+			strongPasswordPolicyEnabled: true,
+		},
+		{
+			name:                        "should return error when the password is missing a number character and strong password policy is enabled",
+			passwordTest:                LOWERCASE + UPPERCASE + SYMBOLS,
+			expectedError:               ErrPasswordPolicyInfringe.Errorf("new password doesn't comply with the password policy"),
+			strongPasswordPolicyEnabled: true,
+		},
+		{
+			name:                        "should return error when the password is missing a symbol characters and strong password policy is enabled",
+			passwordTest:                LOWERCASE + UPPERCASE + NUMBER,
+			expectedError:               ErrPasswordPolicyInfringe.Errorf("new password doesn't comply with the password policy"),
+			strongPasswordPolicyEnabled: true,
+		},
+		{
+			name:                        "should not return error when the password has lowercase, uppercase, number and symbol and strong password policy is enabled",
+			passwordTest:                LOWERCASE + UPPERCASE + NUMBER + SYMBOLS,
+			expectedError:               nil,
+			strongPasswordPolicyEnabled: true,
+		},
+		{
+			name:                        "should not return error when the password has uppercase, number, symbol and lowercase and strong password policy is enabled",
+			passwordTest:                UPPERCASE + NUMBER + SYMBOLS + LOWERCASE,
+			expectedError:               nil,
+			strongPasswordPolicyEnabled: true,
+		},
+		{
+			name:                        "should not return error when the password has number, symbol, lowercase and uppercase and strong password policy is enabled",
+			passwordTest:                NUMBER + SYMBOLS + LOWERCASE + UPPERCASE,
+			expectedError:               nil,
+			strongPasswordPolicyEnabled: true,
+		},
+		{
+			name:                        "should not return error when the password has symbol, lowercase, uppercase and number and strong password policy is enabled",
+			passwordTest:                SYMBOLS + LOWERCASE + UPPERCASE + NUMBER,
+			expectedError:               nil,
+			strongPasswordPolicyEnabled: true,
+		},
+	}
+	for _, tc := range testCases {
+		cfg := setting.NewCfg()
+		cfg.BasicAuthStrongPasswordPolicy = tc.strongPasswordPolicyEnabled
+		err := ValidatePassword(tc.passwordTest, cfg)
+		assert.Equal(t, tc.expectedError, err)
+	}
+}
diff --git a/pkg/services/user/user.go b/pkg/services/user/user.go
index 66008e7cd0176..1282546d67696 100644
--- a/pkg/services/user/user.go
+++ b/pkg/services/user/user.go
@@ -6,6 +6,7 @@ import (
 	"github.com/grafana/grafana/pkg/registry"
 )
 
+//go:generate mockery --name Service --structname MockService --outpkg usertest --filename mock.go --output ./usertest/
 type Service interface {
 	registry.ProvidesUsageStats
 	Create(context.Context, *CreateUserCommand) (*User, error)
@@ -28,3 +29,8 @@ type Service interface {
 	SetUserHelpFlag(context.Context, *SetUserHelpFlagCommand) error
 	GetProfile(context.Context, *GetUserProfileQuery) (*UserProfileDTO, error)
 }
+
+type Verifier interface {
+	Start(ctx context.Context, cmd StartVerifyEmailCommand) error
+	Complete(ctx context.Context, cmd CompleteEmailVerifyCommand) error
+}
diff --git a/pkg/services/user/userimpl/store.go b/pkg/services/user/userimpl/store.go
index cedd27fe3b775..906caa81e51d4 100644
--- a/pkg/services/user/userimpl/store.go
+++ b/pkg/services/user/userimpl/store.go
@@ -23,7 +23,7 @@ type store interface {
 	GetByID(context.Context, int64) (*user.User, error)
 	GetNotServiceAccount(context.Context, int64) (*user.User, error)
 	Delete(context.Context, int64) error
-	LoginConflict(ctx context.Context, login, email string, caseInsensitive bool) error
+	LoginConflict(ctx context.Context, login, email string) error
 	CaseInsensitiveLoginConflict(context.Context, string, string) error
 	GetByLogin(context.Context, *user.GetUserByLoginQuery) (*user.User, error)
 	GetByEmail(context.Context, *user.GetUserByEmailQuery) (*user.User, error)
@@ -63,6 +63,9 @@ func (ss *sqlStore) Insert(ctx context.Context, cmd *user.User) (int64, error) {
 	var err error
 	err = ss.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
 		sess.UseBool("is_admin")
+		if cmd.UID == "" {
+			cmd.UID = util.GenerateShortUID()
+		}
 
 		if _, err = sess.Insert(cmd); err != nil {
 			return err
@@ -80,23 +83,16 @@ func (ss *sqlStore) Insert(ctx context.Context, cmd *user.User) (int64, error) {
 		return 0, err
 	}
 
-	// verify that user was created and cmd.ID was updated with the actual new userID
-	_, err = ss.getAnyUserType(ctx, cmd.ID)
-	if err != nil {
-		return 0, err
-	}
 	return cmd.ID, nil
 }
 
 func (ss *sqlStore) Get(ctx context.Context, usr *user.User) (*user.User, error) {
 	ret := &user.User{}
 	err := ss.db.WithDbSession(ctx, func(sess *db.Session) error {
+		// enforcement of lowercase due to forcement of caseinsensitive login
+		login := strings.ToLower(usr.Login)
+		email := strings.ToLower(usr.Email)
 		where := "email=? OR login=?"
-		login := usr.Login
-		email := usr.Email
-		if ss.cfg.CaseInsensitiveLogin {
-			where = "LOWER(email)=LOWER(?) OR LOWER(login)=LOWER(?)"
-		}
 
 		exists, err := sess.Where(where, email, login).Get(ret)
 		if !exists {
@@ -182,6 +178,9 @@ func (ss *sqlStore) CaseInsensitiveLoginConflict(ctx context.Context, login, ema
 }
 
 func (ss *sqlStore) GetByLogin(ctx context.Context, query *user.GetUserByLoginQuery) (*user.User, error) {
+	// enforcement of lowercase due to forcement of caseinsensitive login
+	query.LoginOrEmail = strings.ToLower(query.LoginOrEmail)
+
 	usr := &user.User{}
 	err := ss.db.WithDbSession(ctx, func(sess *db.Session) error {
 		if query.LoginOrEmail == "" {
@@ -196,9 +195,6 @@ func (ss *sqlStore) GetByLogin(ctx context.Context, query *user.GetUserByLoginQu
 		// first if the login field has the "@" symbol.
 		if strings.Contains(query.LoginOrEmail, "@") {
 			where = "email=?"
-			if ss.cfg.CaseInsensitiveLogin {
-				where = "LOWER(email)=LOWER(?)"
-			}
 			has, err = sess.Where(ss.notServiceAccountFilter()).Where(where, query.LoginOrEmail).Get(usr)
 			if err != nil {
 				return err
@@ -208,9 +204,6 @@ func (ss *sqlStore) GetByLogin(ctx context.Context, query *user.GetUserByLoginQu
 		// Look for the login field instead of email
 		if !has {
 			where = "login=?"
-			if ss.cfg.CaseInsensitiveLogin {
-				where = "LOWER(login)=LOWER(?)"
-			}
 			has, err = sess.Where(ss.notServiceAccountFilter()).Where(where, query.LoginOrEmail).Get(usr)
 		}
 
@@ -219,11 +212,6 @@ func (ss *sqlStore) GetByLogin(ctx context.Context, query *user.GetUserByLoginQu
 		} else if !has {
 			return user.ErrUserNotFound
 		}
-		if ss.cfg.CaseInsensitiveLogin {
-			if err := ss.userCaseInsensitiveLoginConflict(ctx, sess, usr.Login, usr.Email); err != nil {
-				return err
-			}
-		}
 		return nil
 	})
 
@@ -235,6 +223,9 @@ func (ss *sqlStore) GetByLogin(ctx context.Context, query *user.GetUserByLoginQu
 }
 
 func (ss *sqlStore) GetByEmail(ctx context.Context, query *user.GetUserByEmailQuery) (*user.User, error) {
+	// enforcement of lowercase due to forcement of caseinsensitive login
+	query.Email = strings.ToLower(query.Email)
+
 	usr := &user.User{}
 	err := ss.db.WithDbSession(ctx, func(sess *db.Session) error {
 		if query.Email == "" {
@@ -242,10 +233,6 @@ func (ss *sqlStore) GetByEmail(ctx context.Context, query *user.GetUserByEmailQu
 		}
 
 		where := "email=?"
-		if ss.cfg.CaseInsensitiveLogin {
-			where = "LOWER(email)=LOWER(?)"
-		}
-
 		has, err := sess.Where(ss.notServiceAccountFilter()).Where(where, query.Email).Get(usr)
 
 		if err != nil {
@@ -253,12 +240,6 @@ func (ss *sqlStore) GetByEmail(ctx context.Context, query *user.GetUserByEmailQu
 		} else if !has {
 			return user.ErrUserNotFound
 		}
-
-		if ss.cfg.CaseInsensitiveLogin {
-			if err := ss.userCaseInsensitiveLoginConflict(ctx, sess, usr.Login, usr.Email); err != nil {
-				return err
-			}
-		}
 		return nil
 	})
 	if err != nil {
@@ -267,39 +248,21 @@ func (ss *sqlStore) GetByEmail(ctx context.Context, query *user.GetUserByEmailQu
 	return usr, nil
 }
 
-func (ss *sqlStore) userCaseInsensitiveLoginConflict(ctx context.Context, sess *db.Session, login, email string) error {
-	users := make([]user.User, 0)
-
-	if err := sess.Where("LOWER(email)=LOWER(?) OR LOWER(login)=LOWER(?)",
-		email, login).Find(&users); err != nil {
-		return err
-	}
-
-	if len(users) > 1 {
-		return &user.ErrCaseInsensitiveLoginConflict{Users: users}
-	}
-
-	return nil
-}
-
 // LoginConflict returns an error if the provided email or login are already
 // associated with a user. If caseInsensitive is true the search is not case
 // sensitive.
-func (ss *sqlStore) LoginConflict(ctx context.Context, login, email string, caseInsensitive bool) error {
+func (ss *sqlStore) LoginConflict(ctx context.Context, login, email string) error {
 	err := ss.db.WithDbSession(ctx, func(sess *db.Session) error {
-		return ss.loginConflict(ctx, sess, login, email, caseInsensitive)
+		return ss.loginConflict(ctx, sess, login, email)
 	})
 	return err
 }
 
-func (ss *sqlStore) loginConflict(ctx context.Context, sess *db.Session, login, email string, caseInsensitive bool) error {
+func (ss *sqlStore) loginConflict(ctx context.Context, sess *db.Session, login, email string) error {
 	users := make([]user.User, 0)
-	where := "email=? OR login=?"
-	if caseInsensitive {
-		where = "LOWER(email)=LOWER(?) OR LOWER(login)=LOWER(?)"
-		login = strings.ToLower(login)
-		email = strings.ToLower(email)
-	}
+	where := "LOWER(email)=LOWER(?) OR LOWER(login)=LOWER(?)"
+	login = strings.ToLower(login)
+	email = strings.ToLower(email)
 
 	exists, err := sess.Where(where, email, login).Get(&user.User{})
 	if err != nil {
@@ -320,10 +283,9 @@ func (ss *sqlStore) loginConflict(ctx context.Context, sess *db.Session, login,
 }
 
 func (ss *sqlStore) Update(ctx context.Context, cmd *user.UpdateUserCommand) error {
-	if ss.cfg.CaseInsensitiveLogin {
-		cmd.Login = strings.ToLower(cmd.Login)
-		cmd.Email = strings.ToLower(cmd.Email)
-	}
+	// enforcement of lowercase due to forcement of caseinsensitive login
+	cmd.Login = strings.ToLower(cmd.Login)
+	cmd.Email = strings.ToLower(cmd.Email)
 
 	return ss.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
 		user := user.User{
@@ -334,14 +296,15 @@ func (ss *sqlStore) Update(ctx context.Context, cmd *user.UpdateUserCommand) err
 			Updated: time.Now(),
 		}
 
-		if _, err := sess.ID(cmd.UserID).Where(ss.notServiceAccountFilter()).Update(&user); err != nil {
-			return err
+		q := sess.ID(cmd.UserID).Where(ss.notServiceAccountFilter())
+
+		if cmd.EmailVerified != nil {
+			q.UseBool("email_verified")
+			user.EmailVerified = *cmd.EmailVerified
 		}
 
-		if ss.cfg.CaseInsensitiveLogin {
-			if err := ss.userCaseInsensitiveLoginConflict(ctx, sess, user.Login, user.Email); err != nil {
-				return err
-			}
+		if _, err := q.Update(&user); err != nil {
+			return err
 		}
 
 		sess.PublishAfterCommit(&events.UserUpdated{
@@ -393,6 +356,7 @@ func (ss *sqlStore) GetSignedInUser(ctx context.Context, query *user.GetSignedIn
 
 		var rawSQL = `SELECT
 		u.id                  as user_id,
+		u.uid                 as user_uid,
 		u.is_admin            as is_grafana_admin,
 		u.email               as email,
 		u.login               as login,
@@ -414,17 +378,9 @@ func (ss *sqlStore) GetSignedInUser(ctx context.Context, query *user.GetSignedIn
 		case query.UserID > 0:
 			sess.SQL(rawSQL+"WHERE u.id=?", query.UserID)
 		case query.Login != "":
-			if ss.cfg.CaseInsensitiveLogin {
-				sess.SQL(rawSQL+"WHERE LOWER(u.login)=LOWER(?)", query.Login)
-			} else {
-				sess.SQL(rawSQL+"WHERE u.login=?", query.Login)
-			}
+			sess.SQL(rawSQL+"WHERE LOWER(u.login)=LOWER(?)", query.Login)
 		case query.Email != "":
-			if ss.cfg.CaseInsensitiveLogin {
-				sess.SQL(rawSQL+"WHERE LOWER(u.email)=LOWER(?)", query.Email)
-			} else {
-				sess.SQL(rawSQL+"WHERE u.email=?", query.Email)
-			}
+			sess.SQL(rawSQL+"WHERE LOWER(u.email)=LOWER(?)", query.Email)
 		default:
 			return user.ErrNoUniqueID
 		}
@@ -466,6 +422,7 @@ func (ss *sqlStore) GetProfile(ctx context.Context, query *user.GetUserProfileQu
 
 		userProfile = user.UserProfileDTO{
 			ID:             usr.ID,
+			UID:            usr.UID,
 			Name:           usr.Name,
 			Email:          usr.Email,
 			Login:          usr.Login,
@@ -730,19 +687,3 @@ func (ss *sqlStore) Search(ctx context.Context, query *user.SearchUsersQuery) (*
 	})
 	return &result, err
 }
-
-// getAnyUserType searches for a user record by ID. The user account may be a service account.
-func (ss *sqlStore) getAnyUserType(ctx context.Context, userID int64) (*user.User, error) {
-	usr := user.User{ID: userID}
-	err := ss.db.WithDbSession(ctx, func(sess *db.Session) error {
-		has, err := sess.Get(&usr)
-		if err != nil {
-			return err
-		}
-		if !has {
-			return user.ErrUserNotFound
-		}
-		return nil
-	})
-	return &usr, err
-}
diff --git a/pkg/services/user/userimpl/store_test.go b/pkg/services/user/userimpl/store_test.go
index ae6ced18c318c..2fbbb937283af 100644
--- a/pkg/services/user/userimpl/store_test.go
+++ b/pkg/services/user/userimpl/store_test.go
@@ -11,59 +11,52 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
-	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/org/orgimpl"
 	"github.com/grafana/grafana/pkg/services/quota/quotaimpl"
 	"github.com/grafana/grafana/pkg/services/searchusers/sortopts"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationUserGet(t *testing.T) {
 	testCases := []struct {
-		name            string
-		wantErr         error
-		searchLogin     string
-		searchEmail     string
-		caseInsensitive bool
+		name        string
+		wantErr     error
+		searchLogin string
+		searchEmail string
 	}{
 		{
-			name:            "user not found non exact - not case insensitive",
-			wantErr:         user.ErrUserNotFound,
-			searchLogin:     "Test",
-			searchEmail:     "Test@email.com",
-			caseInsensitive: false,
-		},
-		{
-			name:            "user found exact - not case insensitive",
-			wantErr:         nil,
-			searchLogin:     "test",
-			searchEmail:     "test@email.com",
-			caseInsensitive: false,
+			name:        "user found non exact",
+			wantErr:     nil,
+			searchLogin: "test",
+			searchEmail: "Test@email.com",
 		},
 		{
-			name:            "user found non exact - case insensitive",
-			wantErr:         nil,
-			searchLogin:     "Test",
-			searchEmail:     "Test@email.com",
-			caseInsensitive: true,
+			name:        "user found exact",
+			wantErr:     nil,
+			searchLogin: "test",
+			searchEmail: "test@email.com",
 		},
 		{
-			name:            "user found exact - case insensitive",
-			wantErr:         nil,
-			searchLogin:     "Test",
-			searchEmail:     "Test@email.com",
-			caseInsensitive: true,
+			name:        "user found exact - case insensitive",
+			wantErr:     nil,
+			searchLogin: "Test",
+			searchEmail: "Test@email.com",
 		},
 		{
-			name:            "user not found - case insensitive",
-			wantErr:         user.ErrUserNotFound,
-			searchLogin:     "Test_login",
-			searchEmail:     "Test*@email.com",
-			caseInsensitive: true,
+			name:        "user not found - case insensitive",
+			wantErr:     user.ErrUserNotFound,
+			searchLogin: "Test_login",
+			searchEmail: "Test*@email.com",
 		},
 	}
 
@@ -88,10 +81,9 @@ func TestIntegrationUserGet(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			if !tc.caseInsensitive && db.IsTestDbMySQL() {
+			if db.IsTestDbMySQL() {
 				t.Skip("mysql is always case insensitive")
 			}
-			cfg.CaseInsensitiveLogin = tc.caseInsensitive
 			usr, err := userStore.Get(context.Background(),
 				&user.User{
 					Email: tc.searchEmail,
@@ -105,6 +97,7 @@ func TestIntegrationUserGet(t *testing.T) {
 			} else {
 				require.NoError(t, err)
 				require.NotNil(t, usr)
+				require.NotEmpty(t, usr.UID)
 			}
 		})
 	}
@@ -151,6 +144,32 @@ func TestIntegrationUserDataAccess(t *testing.T) {
 		require.NoError(t, err)
 	})
 
+	t.Run("insert user (with known UID)", func(t *testing.T) {
+		ctx := context.Background()
+		id, err := userStore.Insert(ctx,
+			&user.User{
+				UID:     "abcd",
+				Email:   "next-test@email.com",
+				Name:    "next-test1",
+				Login:   "next-test1",
+				Created: time.Now(),
+				Updated: time.Now(),
+			},
+		)
+		require.NoError(t, err)
+
+		found, err := userStore.GetByID(ctx, id)
+		require.NoError(t, err)
+		require.Equal(t, "abcd", found.UID)
+
+		siu, err := userStore.GetSignedInUser(ctx, &user.GetSignedInUserQuery{
+			UserID: id,
+			OrgID:  found.OrgID,
+		})
+		require.NoError(t, err)
+		require.Equal(t, "abcd", siu.UserUID)
+	})
+
 	t.Run("get user", func(t *testing.T) {
 		_, err := userStore.Get(context.Background(),
 			&user.User{
@@ -178,7 +197,7 @@ func TestIntegrationUserDataAccess(t *testing.T) {
 		require.Nil(t, err)
 
 		require.Equal(t, result.Email, "usertest@test.com")
-		require.Equal(t, result.Password, "")
+		require.Equal(t, string(result.Password), "")
 		require.Len(t, result.Rands, 10)
 		require.Len(t, result.Salt, 10)
 		require.False(t, result.IsDisabled)
@@ -187,24 +206,21 @@ func TestIntegrationUserDataAccess(t *testing.T) {
 		require.Nil(t, err)
 
 		require.Equal(t, result.Email, "usertest@test.com")
-		require.Equal(t, result.Password, "")
+		require.Equal(t, string(result.Password), "")
 		require.Len(t, result.Rands, 10)
 		require.Len(t, result.Salt, 10)
 		require.False(t, result.IsDisabled)
 
 		t.Run("Get User by email case insensitive", func(t *testing.T) {
-			userStore.cfg.CaseInsensitiveLogin = true
 			query := user.GetUserByEmailQuery{Email: "USERtest@TEST.COM"}
 			result, err := userStore.GetByEmail(context.Background(), &query)
 			require.Nil(t, err)
 
 			require.Equal(t, result.Email, "usertest@test.com")
-			require.Equal(t, result.Password, "")
+			require.Equal(t, string(result.Password), "")
 			require.Len(t, result.Rands, 10)
 			require.Len(t, result.Salt, 10)
 			require.False(t, result.IsDisabled)
-
-			userStore.cfg.CaseInsensitiveLogin = false
 		})
 
 		t.Run("Testing DB - creates and loads user", func(t *testing.T) {
@@ -212,7 +228,7 @@ func TestIntegrationUserDataAccess(t *testing.T) {
 			require.Nil(t, err)
 
 			require.Equal(t, result.Email, "usertest@test.com")
-			require.Equal(t, result.Password, "")
+			require.Equal(t, string(result.Password), "")
 			require.Len(t, result.Rands, 10)
 			require.Len(t, result.Salt, 10)
 			require.False(t, result.IsDisabled)
@@ -221,11 +237,10 @@ func TestIntegrationUserDataAccess(t *testing.T) {
 			require.Nil(t, err)
 
 			require.Equal(t, result.Email, "usertest@test.com")
-			require.Equal(t, result.Password, "")
+			require.Equal(t, string(result.Password), "")
 			require.Len(t, result.Rands, 10)
 			require.Len(t, result.Salt, 10)
 			require.False(t, result.IsDisabled)
-			ss.Cfg.CaseInsensitiveLogin = false
 		})
 	})
 
@@ -233,73 +248,103 @@ func TestIntegrationUserDataAccess(t *testing.T) {
 		if ss.GetDBType() == migrator.MySQL {
 			t.Skip("Skipping on MySQL due to case insensitive indexes")
 		}
-		userStore.cfg.CaseInsensitiveLogin = true
-		cmd := user.CreateUserCommand{
-			Email: "confusertest@test.com",
-			Name:  "user name",
-			Login: "user_email_conflict",
-		}
-		// userEmailConflict
-		_, err = usrSvc.Create(context.Background(), &cmd)
-		require.NoError(t, err)
-
-		cmd = user.CreateUserCommand{
-			Email: "confusertest@TEST.COM",
-			Name:  "user name",
-			Login: "user_email_conflict_two",
-		}
-		_, err := usrSvc.Create(context.Background(), &cmd)
-		require.NoError(t, err)
-
-		cmd = user.CreateUserCommand{
-			Email: "user_test_login_conflict@test.com",
-			Name:  "user name",
-			Login: "user_test_login_conflict",
-		}
-		// userLoginConflict
-		_, err = usrSvc.Create(context.Background(), &cmd)
-		require.NoError(t, err)
-
-		cmd = user.CreateUserCommand{
-			Email: "user_test_login_conflict_two@test.com",
-			Name:  "user name",
-			Login: "user_test_login_CONFLICT",
-		}
-		_, err = usrSvc.Create(context.Background(), &cmd)
-		require.NoError(t, err)
-
-		ss.Cfg.CaseInsensitiveLogin = true
-
-		t.Run("GetByEmail - email conflict", func(t *testing.T) {
-			query := user.GetUserByEmailQuery{Email: "confusertest@test.com"}
-			_, err = userStore.GetByEmail(context.Background(), &query)
-			require.Error(t, err)
-		})
-
-		t.Run("GetByEmail - login conflict", func(t *testing.T) {
-			query := user.GetUserByEmailQuery{Email: "user_test_login_conflict@test.com"}
-			_, err = userStore.GetByEmail(context.Background(), &query)
-			require.Error(t, err)
+		testOrgID := int64(1)
+		err := ss.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
+			// create a user
+			// add additional user with conflicting login where DOMAIN is upper case
+			cmd := user.User{
+				Email:   "confusertest@test.com",
+				Name:    "user name",
+				Login:   "user_email_conflict",
+				OrgID:   testOrgID,
+				Created: time.Now(),
+				Updated: time.Now(),
+			}
+			rawSQL := fmt.Sprintf(
+				"INSERT INTO %s (email, login, org_id, version, is_admin, created, updated) VALUES (?,?,?,0,%s,?,?)",
+				ss.Quote("user"),
+				ss.GetDialect().BooleanStr(false),
+			)
+			_, err := sess.Exec(rawSQL, cmd.Email, cmd.Login, cmd.OrgID, cmd.Created, cmd.Updated)
+			if err != nil {
+				return err
+			}
+			return nil
 		})
-
-		t.Run("GetByLogin - email conflict", func(t *testing.T) {
-			query := user.GetUserByLoginQuery{LoginOrEmail: "user_email_conflict_two"}
-			_, err = userStore.GetByLogin(context.Background(), &query)
-			require.Error(t, err)
+		require.NoError(t, err)
+		err = ss.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
+			// create a user
+			// add additional user with conflicting login where DOMAIN is upper case
+			cmd := user.User{
+				Email:   "confusertest@TEST.COM",
+				Name:    "user name",
+				Login:   "user_email_conflict_two",
+				OrgID:   testOrgID,
+				Created: time.Now(),
+				Updated: time.Now(),
+			}
+			rawSQL := fmt.Sprintf(
+				"INSERT INTO %s (email, login, org_id, version, is_admin, created, updated) VALUES (?,?,?,0,%s,?,?)",
+				ss.Quote("user"),
+				ss.GetDialect().BooleanStr(false),
+			)
+			_, err := sess.Exec(rawSQL, cmd.Email, cmd.Login, cmd.OrgID, cmd.Created, cmd.Updated)
+			if err != nil {
+				return err
+			}
+			return nil
 		})
+		require.NoError(t, err)
 
-		t.Run("GetByLogin - login conflict", func(t *testing.T) {
-			query := user.GetUserByLoginQuery{LoginOrEmail: "user_test_login_conflict"}
-			_, err = userStore.GetByLogin(context.Background(), &query)
-			require.Error(t, err)
+		err = ss.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
+			// create a user
+			// add additional user with conflicting login where DOMAIN is upper case
+			// userLoginConflict
+			cmd := user.User{
+				Email:   "user_test_login_conflict@test.com",
+				Name:    "user name",
+				Login:   "user_test_login_conflict",
+				OrgID:   testOrgID,
+				Created: time.Now(),
+				Updated: time.Now(),
+			}
+			rawSQL := fmt.Sprintf(
+				"INSERT INTO %s (email, login, org_id, version, is_admin, created, updated) VALUES (?,?,?,0,%s,?,?)",
+				ss.Quote("user"),
+				ss.GetDialect().BooleanStr(false),
+			)
+			_, err := sess.Exec(rawSQL, cmd.Email, cmd.Login, cmd.OrgID, cmd.Created, cmd.Updated)
+			if err != nil {
+				return err
+			}
+			return nil
 		})
+		require.NoError(t, err)
 
-		t.Run("GetByLogin - login conflict by email", func(t *testing.T) {
-			query := user.GetUserByLoginQuery{LoginOrEmail: "user_test_login_conflict@test.com"}
-			_, err = userStore.GetByLogin(context.Background(), &query)
-			require.Error(t, err)
+		err = ss.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
+			// create a user
+			// add additional user with conflicting login where DOMAIN is upper case
+			// userLoginConflict
+			cmd := user.User{
+				Email:   "user_test_login_conflict_two@test.com",
+				Name:    "user name",
+				Login:   "user_test_login_CONFLICT",
+				OrgID:   testOrgID,
+				Created: time.Now(),
+				Updated: time.Now(),
+			}
+			rawSQL := fmt.Sprintf(
+				"INSERT INTO %s (email, login, org_id, version, is_admin, created, updated) VALUES (?,?,?,0,%s,?,?)",
+				ss.Quote("user"),
+				ss.GetDialect().BooleanStr(false),
+			)
+			_, err := sess.Exec(rawSQL, cmd.Email, cmd.Login, cmd.OrgID, cmd.Created, cmd.Updated)
+			if err != nil {
+				return err
+			}
+			return nil
 		})
-
+		require.NoError(t, err)
 		t.Run("GetByLogin - user2 uses user1.email as login", func(t *testing.T) {
 			// create user_1
 			user1 := &user.User{
@@ -340,8 +385,6 @@ func TestIntegrationUserDataAccess(t *testing.T) {
 			require.NotEqual(t, user2.Login, result.Login)
 			require.NotEqual(t, user2.Name, result.Name)
 		})
-
-		ss.Cfg.CaseInsensitiveLogin = false
 	})
 
 	t.Run("Change user password", func(t *testing.T) {
@@ -378,14 +421,6 @@ func TestIntegrationUserDataAccess(t *testing.T) {
 		})
 		require.Nil(t, err)
 
-		err = updateDashboardACL(t, ss, 1, &dashboards.DashboardACL{
-			DashboardID: 1, OrgID: users[0].OrgID, UserID: users[1].ID,
-			Permission: dashboards.PERMISSION_EDIT,
-		})
-		require.Nil(t, err)
-
-		ss.CacheService.Flush()
-
 		query := &user.GetSignedInUserQuery{OrgID: users[1].OrgID, UserID: users[1].ID}
 		result, err := userStore.GetSignedInUser(context.Background(), query)
 		require.NoError(t, err)
@@ -526,22 +561,10 @@ func TestIntegrationUserDataAccess(t *testing.T) {
 		})
 		require.Nil(t, err)
 
-		err = updateDashboardACL(t, ss, 1, &dashboards.DashboardACL{
-			DashboardID: 1, OrgID: users[0].OrgID, UserID: users[1].ID,
-			Permission: dashboards.PERMISSION_EDIT,
-		})
-		require.Nil(t, err)
-
 		// When the user is deleted
 		err = userStore.Delete(context.Background(), users[1].ID)
 		require.Nil(t, err)
 
-		permQuery := &dashboards.GetDashboardACLInfoListQuery{DashboardID: 1, OrgID: users[0].OrgID}
-		permQueryResult, err := userStore.getDashboardACLInfoList(permQuery)
-		require.Nil(t, err)
-
-		require.Len(t, permQueryResult, 0)
-
 		// A user is an org member and has been assigned permissions
 		// Re-init DB
 		ss = db.InitTestDB(t)
@@ -560,14 +583,6 @@ func TestIntegrationUserDataAccess(t *testing.T) {
 		})
 		require.Nil(t, err)
 
-		err = updateDashboardACL(t, ss, 1, &dashboards.DashboardACL{
-			DashboardID: 1, OrgID: users[0].OrgID, UserID: users[1].ID,
-			Permission: dashboards.PERMISSION_EDIT,
-		})
-		require.Nil(t, err)
-
-		ss.CacheService.Flush()
-
 		query3 := &user.GetSignedInUserQuery{OrgID: users[1].OrgID, UserID: users[1].ID}
 		query3Result, err := userStore.GetSignedInUser(context.Background(), query3)
 		require.Nil(t, err)
@@ -591,12 +606,6 @@ func TestIntegrationUserDataAccess(t *testing.T) {
 		// the user is deleted
 		err = userStore.Delete(context.Background(), users[1].ID)
 		require.Nil(t, err)
-
-		permQuery = &dashboards.GetDashboardACLInfoListQuery{DashboardID: 1, OrgID: users[0].OrgID}
-		permQueryResult, err = userStore.getDashboardACLInfoList(permQuery)
-		require.Nil(t, err)
-
-		require.Len(t, permQueryResult, 0)
 	})
 
 	t.Run("Testing DB - return list of users that the SignedInUser has permission to read", func(t *testing.T) {
@@ -883,17 +892,6 @@ func TestIntegrationUserUpdate(t *testing.T) {
 		}
 	})
 
-	userStore.cfg.CaseInsensitiveLogin = true
-
-	t.Run("Testing DB - update generates duplicate user", func(t *testing.T) {
-		err := userStore.Update(context.Background(), &user.UpdateUserCommand{
-			Login:  "loginuser2",
-			UserID: users[0].ID,
-		})
-
-		require.Error(t, err)
-	})
-
 	t.Run("Testing DB - update lowercases existing user", func(t *testing.T) {
 		err := userStore.Update(context.Background(), &user.UpdateUserCommand{
 			Login:  "loginUSER0",
@@ -929,8 +927,6 @@ func TestIntegrationUserUpdate(t *testing.T) {
 		require.Equal(t, "loginUSER3", result.Login)
 		require.Equal(t, "USER3@test.com", result.Email)
 	})
-
-	ss.Cfg.CaseInsensitiveLogin = false
 }
 
 func createFiveTestUsers(t *testing.T, svc user.Service, fn func(i int) *user.CreateUserCommand) []user.User {
@@ -947,41 +943,6 @@ func createFiveTestUsers(t *testing.T, svc user.Service, fn func(i int) *user.Cr
 	return users
 }
 
-// TODO: Use FakeDashboardStore when org has its own service
-func updateDashboardACL(t *testing.T, sqlStore db.DB, dashboardID int64, items ...*dashboards.DashboardACL) error {
-	t.Helper()
-
-	err := sqlStore.WithDbSession(context.Background(), func(sess *db.Session) error {
-		_, err := sess.Exec("DELETE FROM dashboard_acl WHERE dashboard_id=?", dashboardID)
-		if err != nil {
-			return fmt.Errorf("deleting from dashboard_acl failed: %w", err)
-		}
-
-		for _, item := range items {
-			item.Created = time.Now()
-			item.Updated = time.Now()
-			if item.UserID == 0 && item.TeamID == 0 && (item.Role == nil || !item.Role.IsValid()) {
-				return dashboards.ErrDashboardACLInfoMissing
-			}
-
-			if item.DashboardID == 0 {
-				return dashboards.ErrDashboardPermissionDashboardEmpty
-			}
-
-			sess.Nullable("user_id", "team_id")
-			if _, err := sess.Insert(item); err != nil {
-				return err
-			}
-		}
-
-		// Update dashboard HasACL flag
-		dashboard := dashboards.Dashboard{HasACL: true}
-		_, err = sess.Cols("has_acl").Where("id=?", dashboardID).Update(&dashboard)
-		return err
-	})
-	return err
-}
-
 func TestMetricsUsage(t *testing.T) {
 	ss := db.InitTestDB(t)
 	userStore := ProvideStore(ss, setting.NewCfg())
@@ -1029,91 +990,6 @@ func TestMetricsUsage(t *testing.T) {
 	})
 }
 
-// This function was copied from pkg/services/dashboards/database to circumvent
-// import cycles. When this org-related code is refactored into a service the
-// tests can the real GetDashboardACLInfoList functions
-func (ss *sqlStore) getDashboardACLInfoList(query *dashboards.GetDashboardACLInfoListQuery) ([]*dashboards.DashboardACLInfoDTO, error) {
-	queryResult := make([]*dashboards.DashboardACLInfoDTO, 0)
-	outerErr := ss.db.WithDbSession(context.Background(), func(dbSession *db.Session) error {
-		falseStr := ss.dialect.BooleanStr(false)
-
-		if query.DashboardID == 0 {
-			sql := `SELECT
-		da.id,
-		da.org_id,
-		da.dashboard_id,
-		da.user_id,
-		da.team_id,
-		da.permission,
-		da.role,
-		da.created,
-		da.updated,
-		'' as user_login,
-		'' as user_email,
-		'' as team,
-		'' as title,
-		'' as slug,
-		'' as uid,` +
-				falseStr + ` AS is_folder,` +
-				falseStr + ` AS inherited
-		FROM dashboard_acl as da
-		WHERE da.dashboard_id = -1`
-			return dbSession.SQL(sql).Find(&queryResult)
-		}
-
-		rawSQL := `
-			-- get permissions for the dashboard and its parent folder
-			SELECT
-				da.id,
-				da.org_id,
-				da.dashboard_id,
-				da.user_id,
-				da.team_id,
-				da.permission,
-				da.role,
-				da.created,
-				da.updated,
-				u.login AS user_login,
-				u.email AS user_email,
-				ug.name AS team,
-				ug.email AS team_email,
-				d.title,
-				d.slug,
-				d.uid,
-				d.is_folder,
-				CASE WHEN (da.dashboard_id = -1 AND d.folder_id > 0) OR da.dashboard_id = d.folder_id THEN ` + ss.dialect.BooleanStr(true) + ` ELSE ` + falseStr + ` END AS inherited
-			FROM dashboard as d
-				LEFT JOIN dashboard folder on folder.id = d.folder_id
-				LEFT JOIN dashboard_acl AS da ON
-				da.dashboard_id = d.id OR
-				da.dashboard_id = d.folder_id OR
-				(
-					-- include default permissions -->
-					da.org_id = -1 AND (
-					  (folder.id IS NOT NULL AND folder.has_acl = ` + falseStr + `) OR
-					  (folder.id IS NULL AND d.has_acl = ` + falseStr + `)
-					)
-				)
-				LEFT JOIN ` + ss.dialect.Quote("user") + ` AS u ON u.id = da.user_id
-				LEFT JOIN team ug on ug.id = da.team_id
-			WHERE d.org_id = ? AND d.id = ? AND da.id IS NOT NULL
-			ORDER BY da.id ASC
-			`
-
-		return dbSession.SQL(rawSQL, query.OrgID, query.DashboardID).Find(&queryResult)
-	})
-
-	if outerErr != nil {
-		return nil, outerErr
-	}
-
-	for _, p := range queryResult {
-		p.PermissionName = p.Permission.String()
-	}
-
-	return queryResult, nil
-}
-
 func createOrgAndUserSvc(t *testing.T, store db.DB, cfg *setting.Cfg) (org.Service, user.Service) {
 	t.Helper()
 
diff --git a/pkg/services/user/userimpl/user.go b/pkg/services/user/userimpl/user.go
index fced32139d980..4dbe3e4114df6 100644
--- a/pkg/services/user/userimpl/user.go
+++ b/pkg/services/user/userimpl/user.go
@@ -14,6 +14,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/quota"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts"
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 	"github.com/grafana/grafana/pkg/services/supportbundles"
 	"github.com/grafana/grafana/pkg/services/team"
 	"github.com/grafana/grafana/pkg/services/user"
@@ -60,18 +61,22 @@ func ProvideService(
 		return s, err
 	}
 
+	if err := s.uidMigration(db); err != nil {
+		return nil, err
+	}
+
 	bundleRegistry.RegisterSupportItemCollector(s.supportBundleCollector())
 	return s, nil
 }
 
 func (s *Service) GetUsageStats(ctx context.Context) map[string]any {
 	stats := map[string]any{}
-	caseInsensitiveLoginVal := 0
-	if s.cfg.CaseInsensitiveLogin {
-		caseInsensitiveLoginVal = 1
+	basicAuthStrongPasswordPolicyVal := 0
+	if s.cfg.BasicAuthStrongPasswordPolicy {
+		basicAuthStrongPasswordPolicyVal = 1
 	}
 
-	stats["stats.case_insensitive_login.count"] = caseInsensitiveLoginVal
+	stats["stats.password_policy.count"] = basicAuthStrongPasswordPolicyVal
 
 	count, err := s.store.CountUserAccountsWithEmptyRole(ctx)
 	if err != nil {
@@ -122,13 +127,14 @@ func (s *Service) Create(ctx context.Context, cmd *user.CreateUserCommand) (*use
 		cmd.Email = cmd.Login
 	}
 
-	err = s.store.LoginConflict(ctx, cmd.Login, cmd.Email, s.cfg.CaseInsensitiveLogin)
+	err = s.store.LoginConflict(ctx, cmd.Login, cmd.Email)
 	if err != nil {
 		return nil, user.ErrUserAlreadyExists
 	}
 
 	// create user
 	usr := &user.User{
+		UID:              cmd.UID,
 		Email:            cmd.Email,
 		Name:             cmd.Name,
 		Login:            cmd.Login,
@@ -155,11 +161,11 @@ func (s *Service) Create(ctx context.Context, cmd *user.CreateUserCommand) (*use
 	usr.Rands = rands
 
 	if len(cmd.Password) > 0 {
-		encodedPassword, err := util.EncodePassword(cmd.Password, usr.Salt)
+		encodedPassword, err := util.EncodePassword(string(cmd.Password), usr.Salt)
 		if err != nil {
 			return nil, err
 		}
-		usr.Password = encodedPassword
+		usr.Password = user.Password(encodedPassword)
 	}
 
 	_, err = s.store.Insert(ctx, usr)
@@ -207,10 +213,8 @@ func (s *Service) GetByID(ctx context.Context, query *user.GetUserByIDQuery) (*u
 	if err != nil {
 		return nil, err
 	}
-	if s.cfg.CaseInsensitiveLogin {
-		if err := s.store.CaseInsensitiveLoginConflict(ctx, user.Login, user.Email); err != nil {
-			return nil, err
-		}
+	if err := s.store.CaseInsensitiveLoginConflict(ctx, user.Login, user.Email); err != nil {
+		return nil, err
 	}
 	return user, nil
 }
@@ -224,19 +228,8 @@ func (s *Service) GetByEmail(ctx context.Context, query *user.GetUserByEmailQuer
 }
 
 func (s *Service) Update(ctx context.Context, cmd *user.UpdateUserCommand) error {
-	if len(cmd.Login) == 0 {
-		cmd.Login = cmd.Email
-	}
-
-	// if login is still empty both email and login field is missing
-	if len(cmd.Login) == 0 {
-		return user.ErrEmptyUsernameAndEmail.Errorf("user cannot be created with empty username and email")
-	}
-
-	if s.cfg.CaseInsensitiveLogin {
-		cmd.Login = strings.ToLower(cmd.Login)
-		cmd.Email = strings.ToLower(cmd.Email)
-	}
+	cmd.Login = strings.ToLower(cmd.Login)
+	cmd.Email = strings.ToLower(cmd.Email)
 
 	return s.store.Update(ctx, cmd)
 }
@@ -321,29 +314,15 @@ func (s *Service) GetSignedInUser(ctx context.Context, query *user.GetSignedInUs
 		return nil, err
 	}
 
-	// tempUser is used to retrieve the teams for the signed in user for internal use.
-	tempUser := &user.SignedInUser{
-		OrgID: signedInUser.OrgID,
-		Permissions: map[int64]map[string][]string{
-			signedInUser.OrgID: {
-				ac.ActionTeamsRead: {ac.ScopeTeamsAll},
-			},
-		},
-	}
-	getTeamsByUserQuery := &team.GetTeamsByUserQuery{
-		OrgID:        signedInUser.OrgID,
-		UserID:       signedInUser.UserID,
-		SignedInUser: tempUser,
+	getTeamsByUserQuery := &team.GetTeamIDsByUserQuery{
+		OrgID:  signedInUser.OrgID,
+		UserID: signedInUser.UserID,
 	}
-	getTeamsByUserQueryResult, err := s.teamService.GetTeamsByUser(ctx, getTeamsByUserQuery)
+	signedInUser.Teams, err = s.teamService.GetTeamIDsByUser(ctx, getTeamsByUserQuery)
 	if err != nil {
 		return nil, err
 	}
 
-	signedInUser.Teams = make([]int64, len(getTeamsByUserQueryResult))
-	for i, t := range getTeamsByUserQueryResult {
-		signedInUser.Teams[i] = t.ID
-	}
 	return signedInUser, err
 }
 
@@ -416,7 +395,7 @@ func readQuotaConfig(cfg *setting.Cfg) (*quota.Map, error) {
 // CreateServiceAccount creates a service account in the user table and adds service account to an organisation in the org_user table
 func (s *Service) CreateServiceAccount(ctx context.Context, cmd *user.CreateUserCommand) (*user.User, error) {
 	cmd.Email = cmd.Login
-	err := s.store.LoginConflict(ctx, cmd.Login, cmd.Email, s.cfg.CaseInsensitiveLogin)
+	err := s.store.LoginConflict(ctx, cmd.Login, cmd.Email)
 	if err != nil {
 		return nil, serviceaccounts.ErrServiceAccountAlreadyExists.Errorf("service account with login %s already exists", cmd.Login)
 	}
@@ -507,3 +486,25 @@ func (s *Service) supportBundleCollector() supportbundles.Collector {
 		Fn:                collectorFn,
 	}
 }
+
+// This is just to ensure that all users have a valid uid.
+// To protect against upgrade / downgrade we need to run this for a couple of releases.
+// FIXME: Remove this migration and make uid field required https://github.com/grafana/identity-access-team/issues/552
+func (s *Service) uidMigration(store db.DB) error {
+	return store.WithDbSession(context.Background(), func(sess *db.Session) error {
+		switch store.GetDBType() {
+		case migrator.SQLite:
+			_, err := sess.Exec("UPDATE user SET uid=printf('u%09d',id) WHERE uid IS NULL;")
+			return err
+		case migrator.Postgres:
+			_, err := sess.Exec("UPDATE `user` SET uid='u' || lpad('' || id::text,9,'0') WHERE uid IS NULL;")
+			return err
+		case migrator.MySQL:
+			_, err := sess.Exec("UPDATE user SET uid=concat('u',lpad(id,9,'0')) WHERE uid IS NULL;")
+			return err
+		default:
+			// this branch should be unreachable
+			return nil
+		}
+	})
+}
diff --git a/pkg/services/user/userimpl/user_test.go b/pkg/services/user/userimpl/user_test.go
index dc6bcbbc6e11c..7d19e5b66964d 100644
--- a/pkg/services/user/userimpl/user_test.go
+++ b/pkg/services/user/userimpl/user_test.go
@@ -50,18 +50,6 @@ func TestUserService(t *testing.T) {
 
 	t.Run("get user by ID", func(t *testing.T) {
 		userService.cfg = setting.NewCfg()
-		userService.cfg.CaseInsensitiveLogin = false
-		userStore.ExpectedUser = &user.User{ID: 1, Email: "email", Login: "login", Name: "name"}
-		u, err := userService.GetByID(context.Background(), &user.GetUserByIDQuery{ID: 1})
-		require.NoError(t, err)
-		require.Equal(t, "login", u.Login)
-		require.Equal(t, "name", u.Name)
-		require.Equal(t, "email", u.Email)
-	})
-
-	t.Run("get user by ID with case insensitive login", func(t *testing.T) {
-		userService.cfg = setting.NewCfg()
-		userService.cfg.CaseInsensitiveLogin = true
 		userStore.ExpectedUser = &user.User{ID: 1, Email: "email", Login: "login", Name: "name"}
 		u, err := userService.GetByID(context.Background(), &user.GetUserByIDQuery{ID: 1})
 		require.NoError(t, err)
@@ -98,18 +86,7 @@ func TestUserService(t *testing.T) {
 		require.NoError(t, err)
 	})
 
-	t.Run("update user should fail with empty username and password", func(t *testing.T) {
-		err := userService.Update(context.Background(), &user.UpdateUserCommand{
-			Email: "",
-			Login: "",
-			Name:  "name",
-		})
-
-		require.ErrorIs(t, err, user.ErrEmptyUsernameAndEmail)
-	})
-
 	t.Run("GetByID - email conflict", func(t *testing.T) {
-		userService.cfg.CaseInsensitiveLogin = true
 		userStore.ExpectedError = errors.New("email conflict")
 		query := user.GetUserByIDQuery{}
 		_, err := userService.GetByID(context.Background(), &query)
@@ -228,14 +205,14 @@ func TestMetrics(t *testing.T) {
 		userStore.ExpectedCountUserAccountsWithEmptyRoles = int64(1)
 
 		userService.cfg = setting.NewCfg()
-		userService.cfg.CaseInsensitiveLogin = true
+		userService.cfg.BasicAuthStrongPasswordPolicy = true
 
 		stats := userService.GetUsageStats(context.Background())
 		assert.NotEmpty(t, stats)
 
 		assert.Len(t, stats, 2, stats)
-		assert.Equal(t, 1, stats["stats.case_insensitive_login.count"])
 		assert.Equal(t, int64(1), stats["stats.user.role_none.count"])
+		assert.Equal(t, 1, stats["stats.password_policy.count"])
 	})
 }
 
@@ -277,7 +254,7 @@ func (f *FakeUserStore) CaseInsensitiveLoginConflict(context.Context, string, st
 	return f.ExpectedError
 }
 
-func (f *FakeUserStore) LoginConflict(context.Context, string, string, bool) error {
+func (f *FakeUserStore) LoginConflict(context.Context, string, string) error {
 	return f.ExpectedError
 }
 
diff --git a/pkg/services/user/userimpl/verifier.go b/pkg/services/user/userimpl/verifier.go
new file mode 100644
index 0000000000000..d6ab7284a2fab
--- /dev/null
+++ b/pkg/services/user/userimpl/verifier.go
@@ -0,0 +1,149 @@
+package userimpl
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"net/mail"
+	"time"
+
+	"github.com/grafana/grafana/pkg/services/notifications"
+	tempuser "github.com/grafana/grafana/pkg/services/temp_user"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util"
+	"github.com/grafana/grafana/pkg/util/errutil"
+)
+
+var (
+	errInvalidCode = errutil.BadRequest("user.code.invalid", errutil.WithPublicMessage("Invalid verification code"))
+	errExpiredCode = errutil.BadRequest("user.code.expired", errutil.WithPublicMessage("Verification code has expired"))
+)
+
+var _ user.Verifier = (*Verifier)(nil)
+
+func ProvideVerifier(cfg *setting.Cfg, us user.Service, ts tempuser.Service, ns notifications.Service) *Verifier {
+	return &Verifier{cfg, us, ts, ns}
+}
+
+type Verifier struct {
+	cfg *setting.Cfg
+	us  user.Service
+	ts  tempuser.Service
+	ns  notifications.Service
+}
+
+func (s *Verifier) Start(ctx context.Context, cmd user.StartVerifyEmailCommand) error {
+	usr, err := s.us.GetByLogin(ctx, &user.GetUserByLoginQuery{
+		LoginOrEmail: cmd.Email,
+	})
+
+	if err != nil && !errors.Is(err, user.ErrUserNotFound) {
+		return err
+	}
+
+	// if email is already used by another user we stop here
+	if usr != nil && usr.ID != cmd.User.ID {
+		return user.ErrEmailConflict.Errorf("email already used")
+	}
+
+	code, err := util.GetRandomString(20)
+	if err != nil {
+		return fmt.Errorf("failed to generate verification code: %w", err)
+	}
+
+	// invalidate any pending verifications for user
+	if err = s.ts.ExpirePreviousVerifications(
+		ctx, &tempuser.ExpirePreviousVerificationsCommand{InvitedByUserID: cmd.User.ID},
+	); err != nil {
+		return fmt.Errorf("failed to expire previous verifications: %w", err)
+	}
+
+	tmpUsr, err := s.ts.CreateTempUser(ctx, &tempuser.CreateTempUserCommand{
+		OrgID: -1,
+		// used to determine if the user was updating their email or username in the second step of the verification flow
+		Name: string(cmd.Action),
+		// used to fetch the User in the second step of the verification flow
+		InvitedByUserID: cmd.User.ID,
+		Email:           cmd.Email,
+		Code:            code,
+		Status:          tempuser.TmpUserEmailUpdateStarted,
+	})
+
+	if err != nil {
+		return fmt.Errorf("failed to generate temp user for email verification: %w", err)
+	}
+
+	if err := s.ns.SendVerificationEmail(ctx, &notifications.SendVerifyEmailCommand{
+		User:  &cmd.User,
+		Code:  tmpUsr.Code,
+		Email: cmd.Email,
+	}); err != nil {
+		return fmt.Errorf("failed to send verification email: %w", err)
+	}
+
+	if err := s.ts.UpdateTempUserWithEmailSent(ctx, &tempuser.UpdateTempUserWithEmailSentCommand{
+		Code: tmpUsr.Code,
+	}); err != nil {
+		return fmt.Errorf("failed to mark email as sent: %w", err)
+	}
+
+	return nil
+}
+
+func (s *Verifier) Complete(ctx context.Context, cmd user.CompleteEmailVerifyCommand) error {
+	tmpUsr, err := s.ts.GetTempUserByCode(ctx, &tempuser.GetTempUserByCodeQuery{Code: cmd.Code})
+	if err != nil {
+		return errInvalidCode.Errorf("failed to verify code: %w", err)
+	}
+
+	if tmpUsr.Status != tempuser.TmpUserEmailUpdateStarted {
+		return errInvalidCode.Errorf("wrong status for verification code: %s", tmpUsr.Status)
+	}
+
+	if !tmpUsr.EmailSent {
+		return errInvalidCode.Errorf("email was not marked as sent")
+	}
+
+	if tmpUsr.EmailSentOn.Add(s.cfg.VerificationEmailMaxLifetime).Before(time.Now()) {
+		return errExpiredCode.Errorf("verification code has expired")
+	}
+
+	usr, err := s.us.GetByID(ctx, &user.GetUserByIDQuery{ID: tmpUsr.InvitedByID})
+	if err != nil {
+		return err
+	}
+
+	verified := true
+	update := &user.UpdateUserCommand{
+		Email:         tmpUsr.Email,
+		UserID:        tmpUsr.InvitedByID,
+		EmailVerified: &verified,
+	}
+	switch tmpUsr.Name {
+	case string(user.EmailUpdateAction):
+		// User updated the email field
+		if _, err := mail.ParseAddress(usr.Login); err == nil {
+			// If username was also an email, we update it to keep it in sync with the email field
+			update.Login = tmpUsr.Email
+		}
+	case string(user.LoginUpdateAction):
+		// User updated the username field with a new email
+		update.Login = tmpUsr.Email
+	default:
+		return errors.New("trying to update email on unknown field")
+	}
+
+	if err := s.us.Update(ctx, update); err != nil {
+		return err
+	}
+
+	if err := s.ts.UpdateTempUserStatus(
+		ctx,
+		&tempuser.UpdateTempUserStatusCommand{Code: cmd.Code, Status: tempuser.TmpUserEmailUpdateCompleted},
+	); err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/pkg/services/user/userimpl/verifier_test.go b/pkg/services/user/userimpl/verifier_test.go
new file mode 100644
index 0000000000000..0e68088c56b2c
--- /dev/null
+++ b/pkg/services/user/userimpl/verifier_test.go
@@ -0,0 +1,249 @@
+package userimpl
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/grafana/grafana/pkg/services/notifications"
+	tempuser "github.com/grafana/grafana/pkg/services/temp_user"
+	"github.com/grafana/grafana/pkg/services/temp_user/tempusertest"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/services/user/usertest"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+func TestVerifier_Start(t *testing.T) {
+	ts := &tempusertest.FakeTempUserService{}
+	us := &usertest.FakeUserService{}
+	ns := notifications.MockNotificationService()
+
+	type calls struct {
+		expireCalled bool
+		createCalled bool
+		updateCalled bool
+	}
+
+	verifier := ProvideVerifier(setting.NewCfg(), us, ts, ns)
+	t.Run("should error if email already exist for other user", func(t *testing.T) {
+		us.ExpectedUser = &user.User{ID: 1}
+		err := verifier.Start(context.Background(), user.StartVerifyEmailCommand{
+			User:   user.User{ID: 2},
+			Email:  "some@email.com",
+			Action: user.EmailUpdateAction,
+		})
+
+		assert.ErrorIs(t, err, user.ErrEmailConflict)
+	})
+
+	t.Run("should succeed when no user has the email", func(t *testing.T) {
+		us.ExpectedUser = nil
+		var c calls
+		ts.ExpirePreviousVerificationsFN = func(ctx context.Context, cmd *tempuser.ExpirePreviousVerificationsCommand) error {
+			c.expireCalled = true
+			return nil
+		}
+
+		ts.CreateTempUserFN = func(ctx context.Context, cmd *tempuser.CreateTempUserCommand) (*tempuser.TempUser, error) {
+			c.createCalled = true
+			return &tempuser.TempUser{
+				OrgID:           cmd.OrgID,
+				Email:           cmd.Email,
+				Name:            cmd.Name,
+				InvitedByUserID: cmd.InvitedByUserID,
+				Code:            cmd.Code,
+			}, nil
+		}
+
+		ts.UpdateTempUserWithEmailSentFN = func(ctx context.Context, cmd *tempuser.UpdateTempUserWithEmailSentCommand) error {
+			c.updateCalled = true
+			return nil
+		}
+		err := verifier.Start(context.Background(), user.StartVerifyEmailCommand{
+			User:   user.User{ID: 2},
+			Email:  "some@email.com",
+			Action: user.EmailUpdateAction,
+		})
+
+		assert.NoError(t, err)
+		assert.True(t, c.expireCalled)
+		assert.True(t, c.createCalled)
+		assert.True(t, c.updateCalled)
+	})
+
+	t.Run("should succeed when the user holding the email is the same user that want to verify it", func(t *testing.T) {
+		us.ExpectedUser = &user.User{ID: 2}
+		var c calls
+		ts.ExpirePreviousVerificationsFN = func(ctx context.Context, cmd *tempuser.ExpirePreviousVerificationsCommand) error {
+			c.expireCalled = true
+			return nil
+		}
+
+		ts.CreateTempUserFN = func(ctx context.Context, cmd *tempuser.CreateTempUserCommand) (*tempuser.TempUser, error) {
+			c.createCalled = true
+			return &tempuser.TempUser{
+				OrgID:           cmd.OrgID,
+				Email:           cmd.Email,
+				Name:            cmd.Name,
+				InvitedByUserID: cmd.InvitedByUserID,
+				Code:            cmd.Code,
+			}, nil
+		}
+
+		ts.UpdateTempUserWithEmailSentFN = func(ctx context.Context, cmd *tempuser.UpdateTempUserWithEmailSentCommand) error {
+			c.updateCalled = true
+			return nil
+		}
+		err := verifier.Start(context.Background(), user.StartVerifyEmailCommand{
+			User:   user.User{ID: 2},
+			Email:  "some@email.com",
+			Action: user.EmailUpdateAction,
+		})
+
+		assert.ErrorIs(t, err, nil)
+		assert.True(t, c.expireCalled)
+		assert.True(t, c.createCalled)
+		assert.True(t, c.updateCalled)
+	})
+}
+
+func TestVerifier_Complete(t *testing.T) {
+	ts := &tempusertest.FakeTempUserService{}
+	us := &usertest.FakeUserService{}
+	ns := notifications.MockNotificationService()
+
+	type calls struct {
+		updateCalled       bool
+		updateStatusCalled bool
+	}
+
+	cfg := setting.NewCfg()
+	cfg.VerificationEmailMaxLifetime = 1 * time.Hour
+	verifier := ProvideVerifier(cfg, us, ts, ns)
+	t.Run("should return error for invalid code", func(t *testing.T) {
+		ts.GetTempUserByCodeFN = func(ctx context.Context, query *tempuser.GetTempUserByCodeQuery) (*tempuser.TempUserDTO, error) {
+			return nil, tempuser.ErrTempUserNotFound
+		}
+		err := verifier.Complete(context.Background(), user.CompleteEmailVerifyCommand{Code: "some-code"})
+		assert.ErrorIs(t, err, errInvalidCode)
+	})
+
+	t.Run("should return error when verification has wrong status", func(t *testing.T) {
+		ts.GetTempUserByCodeFN = func(ctx context.Context, query *tempuser.GetTempUserByCodeQuery) (*tempuser.TempUserDTO, error) {
+			return &tempuser.TempUserDTO{
+				Status: tempuser.TmpUserEmailUpdateCompleted,
+			}, nil
+		}
+		err := verifier.Complete(context.Background(), user.CompleteEmailVerifyCommand{Code: "some-code"})
+		assert.ErrorIs(t, err, errInvalidCode)
+	})
+
+	t.Run("should return error when verification email was never sent", func(t *testing.T) {
+		ts.GetTempUserByCodeFN = func(ctx context.Context, query *tempuser.GetTempUserByCodeQuery) (*tempuser.TempUserDTO, error) {
+			return &tempuser.TempUserDTO{
+				Status:    tempuser.TmpUserEmailUpdateStarted,
+				EmailSent: false,
+			}, nil
+		}
+		err := verifier.Complete(context.Background(), user.CompleteEmailVerifyCommand{Code: "some-code"})
+		assert.ErrorIs(t, err, errInvalidCode)
+	})
+
+	t.Run("should return error when verification code has expired", func(t *testing.T) {
+		ts.GetTempUserByCodeFN = func(ctx context.Context, query *tempuser.GetTempUserByCodeQuery) (*tempuser.TempUserDTO, error) {
+			return &tempuser.TempUserDTO{
+				Status:      tempuser.TmpUserEmailUpdateStarted,
+				EmailSent:   true,
+				EmailSentOn: time.Now().Add(-10 * time.Hour),
+			}, nil
+		}
+		err := verifier.Complete(context.Background(), user.CompleteEmailVerifyCommand{Code: "some-code"})
+		assert.ErrorIs(t, err, errExpiredCode)
+	})
+
+	t.Run("should return error user connect to code don't exists", func(t *testing.T) {
+		ts.GetTempUserByCodeFN = func(ctx context.Context, query *tempuser.GetTempUserByCodeQuery) (*tempuser.TempUserDTO, error) {
+			return &tempuser.TempUserDTO{
+				Status:      tempuser.TmpUserEmailUpdateStarted,
+				EmailSent:   true,
+				EmailSentOn: time.Now(),
+			}, nil
+		}
+		us.ExpectedError = user.ErrUserNotFound
+
+		err := verifier.Complete(context.Background(), user.CompleteEmailVerifyCommand{Code: "some-code"})
+		assert.ErrorIs(t, err, user.ErrUserNotFound)
+	})
+
+	t.Run("should update user email on valid code", func(t *testing.T) {
+		var c calls
+		ts.GetTempUserByCodeFN = func(ctx context.Context, query *tempuser.GetTempUserByCodeQuery) (*tempuser.TempUserDTO, error) {
+			return &tempuser.TempUserDTO{
+				Status:      tempuser.TmpUserEmailUpdateStarted,
+				Name:        string(user.EmailUpdateAction),
+				InvitedByID: 1,
+				Email:       "updated@email.com",
+				EmailSent:   true,
+				EmailSentOn: time.Now(),
+			}, nil
+		}
+
+		ts.UpdateTempUserStatusFN = func(ctx context.Context, cmd *tempuser.UpdateTempUserStatusCommand) error {
+			c.updateStatusCalled = true
+			return nil
+		}
+
+		us.ExpectedUser = &user.User{Email: "initial@email.com"}
+		us.ExpectedError = nil
+		us.UpdateFn = func(ctx context.Context, cmd *user.UpdateUserCommand) error {
+			c.updateCalled = true
+			assert.True(t, *cmd.EmailVerified)
+			assert.Equal(t, int64(1), cmd.UserID)
+			assert.Equal(t, "", cmd.Login)
+			assert.Equal(t, "updated@email.com", cmd.Email)
+			return nil
+		}
+
+		err := verifier.Complete(context.Background(), user.CompleteEmailVerifyCommand{Code: "some-code"})
+		assert.NoError(t, err)
+		assert.True(t, c.updateCalled)
+		assert.True(t, c.updateStatusCalled)
+	})
+
+	t.Run("should update user email and login if login is an email on valid code", func(t *testing.T) {
+		var c calls
+		ts.GetTempUserByCodeFN = func(ctx context.Context, query *tempuser.GetTempUserByCodeQuery) (*tempuser.TempUserDTO, error) {
+			return &tempuser.TempUserDTO{
+				Status:      tempuser.TmpUserEmailUpdateStarted,
+				Name:        string(user.EmailUpdateAction),
+				InvitedByID: 1,
+				Email:       "updated@email.com",
+				EmailSent:   true,
+				EmailSentOn: time.Now(),
+			}, nil
+		}
+
+		ts.UpdateTempUserStatusFN = func(ctx context.Context, cmd *tempuser.UpdateTempUserStatusCommand) error {
+			c.updateStatusCalled = true
+			return nil
+		}
+
+		us.ExpectedUser = &user.User{Email: "initial@email.com", Login: "other@email.com"}
+		us.ExpectedError = nil
+		us.UpdateFn = func(ctx context.Context, cmd *user.UpdateUserCommand) error {
+			c.updateCalled = true
+			assert.True(t, *cmd.EmailVerified)
+			assert.Equal(t, int64(1), cmd.UserID)
+			assert.Equal(t, "updated@email.com", cmd.Email)
+			assert.Equal(t, "updated@email.com", cmd.Login)
+			return nil
+		}
+
+		err := verifier.Complete(context.Background(), user.CompleteEmailVerifyCommand{Code: "some-code"})
+		assert.NoError(t, err)
+		assert.True(t, c.updateCalled)
+		assert.True(t, c.updateStatusCalled)
+	})
+}
diff --git a/pkg/services/user/usertest/fake.go b/pkg/services/user/usertest/fake.go
index 1a696a3a86ccc..b1e0aa81f3d11 100644
--- a/pkg/services/user/usertest/fake.go
+++ b/pkg/services/user/usertest/fake.go
@@ -16,6 +16,7 @@ type FakeUserService struct {
 	ExpectedUserProfileDTOs  []*user.UserProfileDTO
 	ExpectedUsageStats       map[string]any
 
+	UpdateFn            func(ctx context.Context, cmd *user.UpdateUserCommand) error
 	GetSignedInUserFn   func(ctx context.Context, query *user.GetSignedInUserQuery) (*user.SignedInUser, error)
 	CreateFn            func(ctx context.Context, cmd *user.CreateUserCommand) (*user.User, error)
 	DisableFn           func(ctx context.Context, cmd *user.DisableUserCommand) error
@@ -61,6 +62,9 @@ func (f *FakeUserService) GetByEmail(ctx context.Context, query *user.GetUserByE
 }
 
 func (f *FakeUserService) Update(ctx context.Context, cmd *user.UpdateUserCommand) error {
+	if f.UpdateFn != nil {
+		return f.UpdateFn(ctx, cmd)
+	}
 	return f.ExpectedError
 }
 
diff --git a/pkg/services/user/usertest/mock.go b/pkg/services/user/usertest/mock.go
new file mode 100644
index 0000000000000..590a66c9b08e3
--- /dev/null
+++ b/pkg/services/user/usertest/mock.go
@@ -0,0 +1,511 @@
+// Code generated by mockery v2.40.1. DO NOT EDIT.
+
+package usertest
+
+import (
+	context "context"
+
+	user "github.com/grafana/grafana/pkg/services/user"
+	mock "github.com/stretchr/testify/mock"
+)
+
+// MockService is an autogenerated mock type for the Service type
+type MockService struct {
+	mock.Mock
+}
+
+// BatchDisableUsers provides a mock function with given fields: _a0, _a1
+func (_m *MockService) BatchDisableUsers(_a0 context.Context, _a1 *user.BatchDisableUsersCommand) error {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for BatchDisableUsers")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, *user.BatchDisableUsersCommand) error); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// ChangePassword provides a mock function with given fields: _a0, _a1
+func (_m *MockService) ChangePassword(_a0 context.Context, _a1 *user.ChangeUserPasswordCommand) error {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ChangePassword")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, *user.ChangeUserPasswordCommand) error); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// Create provides a mock function with given fields: _a0, _a1
+func (_m *MockService) Create(_a0 context.Context, _a1 *user.CreateUserCommand) (*user.User, error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
+	var r0 *user.User
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *user.CreateUserCommand) (*user.User, error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *user.CreateUserCommand) *user.User); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*user.User)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *user.CreateUserCommand) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// CreateServiceAccount provides a mock function with given fields: _a0, _a1
+func (_m *MockService) CreateServiceAccount(_a0 context.Context, _a1 *user.CreateUserCommand) (*user.User, error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for CreateServiceAccount")
+	}
+
+	var r0 *user.User
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *user.CreateUserCommand) (*user.User, error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *user.CreateUserCommand) *user.User); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*user.User)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *user.CreateUserCommand) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Delete provides a mock function with given fields: _a0, _a1
+func (_m *MockService) Delete(_a0 context.Context, _a1 *user.DeleteUserCommand) error {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, *user.DeleteUserCommand) error); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// Disable provides a mock function with given fields: _a0, _a1
+func (_m *MockService) Disable(_a0 context.Context, _a1 *user.DisableUserCommand) error {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Disable")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, *user.DisableUserCommand) error); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// GetByEmail provides a mock function with given fields: _a0, _a1
+func (_m *MockService) GetByEmail(_a0 context.Context, _a1 *user.GetUserByEmailQuery) (*user.User, error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetByEmail")
+	}
+
+	var r0 *user.User
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *user.GetUserByEmailQuery) (*user.User, error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *user.GetUserByEmailQuery) *user.User); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*user.User)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *user.GetUserByEmailQuery) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetByID provides a mock function with given fields: _a0, _a1
+func (_m *MockService) GetByID(_a0 context.Context, _a1 *user.GetUserByIDQuery) (*user.User, error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetByID")
+	}
+
+	var r0 *user.User
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *user.GetUserByIDQuery) (*user.User, error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *user.GetUserByIDQuery) *user.User); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*user.User)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *user.GetUserByIDQuery) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetByLogin provides a mock function with given fields: _a0, _a1
+func (_m *MockService) GetByLogin(_a0 context.Context, _a1 *user.GetUserByLoginQuery) (*user.User, error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetByLogin")
+	}
+
+	var r0 *user.User
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *user.GetUserByLoginQuery) (*user.User, error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *user.GetUserByLoginQuery) *user.User); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*user.User)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *user.GetUserByLoginQuery) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetProfile provides a mock function with given fields: _a0, _a1
+func (_m *MockService) GetProfile(_a0 context.Context, _a1 *user.GetUserProfileQuery) (*user.UserProfileDTO, error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetProfile")
+	}
+
+	var r0 *user.UserProfileDTO
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *user.GetUserProfileQuery) (*user.UserProfileDTO, error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *user.GetUserProfileQuery) *user.UserProfileDTO); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*user.UserProfileDTO)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *user.GetUserProfileQuery) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetSignedInUser provides a mock function with given fields: _a0, _a1
+func (_m *MockService) GetSignedInUser(_a0 context.Context, _a1 *user.GetSignedInUserQuery) (*user.SignedInUser, error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetSignedInUser")
+	}
+
+	var r0 *user.SignedInUser
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *user.GetSignedInUserQuery) (*user.SignedInUser, error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *user.GetSignedInUserQuery) *user.SignedInUser); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*user.SignedInUser)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *user.GetSignedInUserQuery) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetSignedInUserWithCacheCtx provides a mock function with given fields: _a0, _a1
+func (_m *MockService) GetSignedInUserWithCacheCtx(_a0 context.Context, _a1 *user.GetSignedInUserQuery) (*user.SignedInUser, error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetSignedInUserWithCacheCtx")
+	}
+
+	var r0 *user.SignedInUser
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *user.GetSignedInUserQuery) (*user.SignedInUser, error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *user.GetSignedInUserQuery) *user.SignedInUser); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*user.SignedInUser)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *user.GetSignedInUserQuery) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetUsageStats provides a mock function with given fields: ctx
+func (_m *MockService) GetUsageStats(ctx context.Context) map[string]interface{} {
+	ret := _m.Called(ctx)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetUsageStats")
+	}
+
+	var r0 map[string]interface{}
+	if rf, ok := ret.Get(0).(func(context.Context) map[string]interface{}); ok {
+		r0 = rf(ctx)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(map[string]interface{})
+		}
+	}
+
+	return r0
+}
+
+// NewAnonymousSignedInUser provides a mock function with given fields: _a0
+func (_m *MockService) NewAnonymousSignedInUser(_a0 context.Context) (*user.SignedInUser, error) {
+	ret := _m.Called(_a0)
+
+	if len(ret) == 0 {
+		panic("no return value specified for NewAnonymousSignedInUser")
+	}
+
+	var r0 *user.SignedInUser
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context) (*user.SignedInUser, error)); ok {
+		return rf(_a0)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context) *user.SignedInUser); ok {
+		r0 = rf(_a0)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*user.SignedInUser)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context) error); ok {
+		r1 = rf(_a0)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Search provides a mock function with given fields: _a0, _a1
+func (_m *MockService) Search(_a0 context.Context, _a1 *user.SearchUsersQuery) (*user.SearchUserQueryResult, error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Search")
+	}
+
+	var r0 *user.SearchUserQueryResult
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *user.SearchUsersQuery) (*user.SearchUserQueryResult, error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *user.SearchUsersQuery) *user.SearchUserQueryResult); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*user.SearchUserQueryResult)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *user.SearchUsersQuery) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// SetUserHelpFlag provides a mock function with given fields: _a0, _a1
+func (_m *MockService) SetUserHelpFlag(_a0 context.Context, _a1 *user.SetUserHelpFlagCommand) error {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for SetUserHelpFlag")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, *user.SetUserHelpFlagCommand) error); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// SetUsingOrg provides a mock function with given fields: _a0, _a1
+func (_m *MockService) SetUsingOrg(_a0 context.Context, _a1 *user.SetUsingOrgCommand) error {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for SetUsingOrg")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, *user.SetUsingOrgCommand) error); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// Update provides a mock function with given fields: _a0, _a1
+func (_m *MockService) Update(_a0 context.Context, _a1 *user.UpdateUserCommand) error {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, *user.UpdateUserCommand) error); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// UpdateLastSeenAt provides a mock function with given fields: _a0, _a1
+func (_m *MockService) UpdateLastSeenAt(_a0 context.Context, _a1 *user.UpdateUserLastSeenAtCommand) error {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateLastSeenAt")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, *user.UpdateUserLastSeenAtCommand) error); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// UpdatePermissions provides a mock function with given fields: _a0, _a1, _a2
+func (_m *MockService) UpdatePermissions(_a0 context.Context, _a1 int64, _a2 bool) error {
+	ret := _m.Called(_a0, _a1, _a2)
+
+	if len(ret) == 0 {
+		panic("no return value specified for UpdatePermissions")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, int64, bool) error); ok {
+		r0 = rf(_a0, _a1, _a2)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// NewMockService creates a new instance of MockService. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewMockService(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *MockService {
+	mock := &MockService{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/pkg/setting/provider.go b/pkg/setting/provider.go
index 81440b728fe47..1978689f40b7d 100644
--- a/pkg/setting/provider.go
+++ b/pkg/setting/provider.go
@@ -85,11 +85,11 @@ type KeyValue interface {
 // service that have support for configuration reloads.
 type ReloadHandler interface {
 	// Reload handles reloading of configuration changes.
-	Reload(section Section) error
+	ReloadSection(section Section) error
 
 	// Validate validates the configuration, if the validation
 	// fails the configuration will not be updated neither reloaded.
-	Validate(section Section) error
+	ValidateSection(section Section) error
 }
 
 type SettingsBag map[string]map[string]string
@@ -144,10 +144,6 @@ func (o *OSSImpl) Section(section string) Section {
 
 func (*OSSImpl) RegisterReloadHandler(string, ReloadHandler) {}
 
-func (o *OSSImpl) IsFeatureToggleEnabled(name string) bool {
-	return o.Cfg.IsFeatureToggleEnabled(name)
-}
-
 type keyValImpl struct {
 	key *ini.Key
 }
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 1983bfbb2f9f9..a76604b19754d 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -26,12 +26,13 @@ import (
 	"gopkg.in/ini.v1"
 
 	"github.com/grafana/grafana-aws-sdk/pkg/awsds"
-	"github.com/grafana/grafana-azure-sdk-go/azsettings"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models/roletype"
 	"github.com/grafana/grafana/pkg/util"
+	"github.com/grafana/grafana/pkg/util/osutil"
 )
 
 type Scheme string
@@ -55,12 +56,12 @@ const (
 const zoneInfo = "ZONEINFO"
 
 var (
+	customInitPath = "conf/custom.ini"
+
 	// App settings.
-	Env              = Dev
-	AppUrl           string
-	AppSubUrl        string
-	ServeFromSubPath bool
-	InstanceName     string
+	Env       = Dev
+	AppUrl    string
+	AppSubUrl string
 
 	// build
 	BuildVersion          string
@@ -73,76 +74,9 @@ var (
 	// packaging
 	Packaging = "unknown"
 
-	// Paths
-	HomePath       string
-	CustomInitPath = "conf/custom.ini"
-
-	// HTTP server options
-	StaticRootPath string
-
-	// Security settings.
-	SecretKey              string
-	DisableGravatar        bool
-	DataProxyWhiteList     map[string]bool
 	CookieSecure           bool
 	CookieSameSiteDisabled bool
 	CookieSameSiteMode     http.SameSite
-
-	// Dashboard history
-	DashboardVersionsToKeep int
-	MinRefreshInterval      string
-
-	// User settings
-	AllowUserSignUp         bool
-	AllowUserOrgCreate      bool
-	VerifyEmailEnabled      bool
-	LoginHint               string
-	PasswordHint            string
-	DisableSignoutMenu      bool
-	ExternalUserMngLinkUrl  string
-	ExternalUserMngLinkName string
-	ExternalUserMngInfo     string
-
-	// HTTP auth
-	SigV4AuthEnabled bool
-	AzureAuthEnabled bool
-
-	// Global setting objects.
-	Raw *ini.File
-
-	// for logging purposes
-	configFiles                  []string
-	appliedCommandLineProperties []string
-	appliedEnvOverrides          []string
-
-	// Alerting
-	AlertingEnabled            *bool
-	ExecuteAlerts              bool
-	AlertingRenderLimit        int
-	AlertingErrorOrTimeout     string
-	AlertingNoDataOrNullValues string
-
-	AlertingEvaluationTimeout   time.Duration
-	AlertingNotificationTimeout time.Duration
-	AlertingMaxAttempts         int
-	AlertingMinInterval         int64
-
-	// Explore UI
-	ExploreEnabled bool
-
-	// Help UI
-	HelpEnabled bool
-
-	// Profile UI
-	ProfileEnabled bool
-
-	// News Feed
-	NewsFeedEnabled bool
-
-	// Grafana.NET URL
-	GrafanaComUrl string
-
-	ImageUploadProvider string
 )
 
 // TODO move all global vars to this struct
@@ -151,26 +85,34 @@ type Cfg struct {
 	Raw    *ini.File
 	Logger log.Logger
 
+	// for logging purposes
+	configFiles                  []string
+	appliedCommandLineProperties []string
+	appliedEnvOverrides          []string
+
 	// HTTP Server Settings
-	CertFile         string
-	KeyFile          string
-	HTTPAddr         string
-	HTTPPort         string
-	AppURL           string
-	AppSubURL        string
-	ServeFromSubPath bool
-	StaticRootPath   string
-	Protocol         Scheme
-	SocketGid        int
-	SocketMode       int
-	SocketPath       string
-	RouterLogging    bool
-	Domain           string
-	CDNRootURL       *url.URL
-	ReadTimeout      time.Duration
-	EnableGzip       bool
-	EnforceDomain    bool
-	MinTLSVersion    string
+	CertFile          string
+	KeyFile           string
+	CertWatchInterval time.Duration
+	HTTPAddr          string
+	HTTPPort          string
+	Env               string
+	AppURL            string
+	AppSubURL         string
+	InstanceName      string
+	ServeFromSubPath  bool
+	StaticRootPath    string
+	Protocol          Scheme
+	SocketGid         int
+	SocketMode        int
+	SocketPath        string
+	RouterLogging     bool
+	Domain            string
+	CDNRootURL        *url.URL
+	ReadTimeout       time.Duration
+	EnableGzip        bool
+	EnforceDomain     bool
+	MinTLSVersion     string
 
 	// Security settings
 	SecretKey             string
@@ -202,11 +144,15 @@ type Cfg struct {
 	// Rendering
 	ImagesDir                      string
 	CSVsDir                        string
+	PDFsDir                        string
 	RendererUrl                    string
 	RendererCallbackUrl            string
 	RendererAuthToken              string
 	RendererConcurrentRequestLimit int
 	RendererRenderKeyLifeTime      time.Duration
+	RendererDefaultImageWidth      int
+	RendererDefaultImageHeight     int
+	RendererDefaultImageScale      float64
 
 	// Security
 	DisableInitAdminCreation          bool
@@ -231,6 +177,8 @@ type Cfg struct {
 	CSPReportOnlyTemplate            string
 	AngularSupportEnabled            bool
 	DisableFrontendSandboxForPlugins []string
+	DisableGravatar                  bool
+	DataProxyWhiteList               map[string]bool
 
 	TempDataLifetime time.Duration
 
@@ -246,7 +194,9 @@ type Cfg struct {
 	PluginForcePublicKeyDownload     bool
 	PluginSkipPublicKeyDownload      bool
 	DisablePlugins                   []string
+	HideAngularDeprecation           []string
 	PluginInstallToken               string
+	ForwardHostEnvVars               []string
 
 	PluginsCDNURLTemplate    string
 	PluginLogBackendRequests bool
@@ -267,76 +217,63 @@ type Cfg struct {
 	MetricsGrafanaEnvironmentInfo    map[string]string
 
 	// Dashboards
+	DashboardVersionsToKeep  int
+	MinRefreshInterval       string
 	DefaultHomeDashboardPath string
 
 	// Auth
-	LoginCookieName              string
-	LoginMaxInactiveLifetime     time.Duration
-	LoginMaxLifetime             time.Duration
-	TokenRotationIntervalMinutes int
-	SigV4AuthEnabled             bool
-	SigV4VerboseLogging          bool
-	AzureAuthEnabled             bool
-	AzureSkipOrgRoleSync         bool
-	BasicAuthEnabled             bool
-	AdminUser                    string
-	AdminPassword                string
-	DisableLogin                 bool
-	AdminEmail                   string
-	DisableLoginForm             bool
-	SignoutRedirectUrl           string
+	LoginCookieName               string
+	LoginMaxInactiveLifetime      time.Duration
+	LoginMaxLifetime              time.Duration
+	TokenRotationIntervalMinutes  int
+	SigV4AuthEnabled              bool
+	SigV4VerboseLogging           bool
+	AzureAuthEnabled              bool
+	AzureSkipOrgRoleSync          bool
+	BasicAuthEnabled              bool
+	BasicAuthStrongPasswordPolicy bool
+	AdminUser                     string
+	AdminPassword                 string
+	DisableLogin                  bool
+	AdminEmail                    string
+	DisableLoginForm              bool
+	SignoutRedirectUrl            string
+	IDResponseHeaderEnabled       bool
+	IDResponseHeaderPrefix        string
+	IDResponseHeaderNamespaces    map[string]struct{}
 	// Not documented & not supported
 	// stand in until a more complete solution is implemented
 	AuthConfigUIAdminAccess bool
 
 	// AWS Plugin Auth
-	AWSAllowedAuthProviders []string
-	AWSAssumeRoleEnabled    bool
-	AWSListMetricsPageLimit int
-	AWSExternalId           string
+	AWSAllowedAuthProviders   []string
+	AWSAssumeRoleEnabled      bool
+	AWSSessionDuration        string
+	AWSExternalId             string
+	AWSListMetricsPageLimit   int
+	AWSForwardSettingsPlugins []string
 
 	// Azure Cloud settings
 	Azure *azsettings.AzureSettings
 
 	// Auth proxy settings
-	AuthProxyEnabled          bool
-	AuthProxyHeaderName       string
-	AuthProxyHeaderProperty   string
-	AuthProxyAutoSignUp       bool
-	AuthProxyEnableLoginToken bool
-	AuthProxyWhitelist        string
-	AuthProxyHeaders          map[string]string
-	AuthProxyHeadersEncoded   bool
-	AuthProxySyncTTL          int
+	AuthProxy AuthProxySettings
 
 	// OAuth
 	OAuthAutoLogin                bool
 	OAuthCookieMaxAge             int
 	OAuthAllowInsecureEmailLookup bool
 
-	// JWT Auth
-	JWTAuthEnabled                 bool
-	JWTAuthHeaderName              string
-	JWTAuthURLLogin                bool
-	JWTAuthEmailClaim              string
-	JWTAuthUsernameClaim           string
-	JWTAuthExpectClaims            string
-	JWTAuthJWKSetURL               string
-	JWTAuthCacheTTL                time.Duration
-	JWTAuthKeyFile                 string
-	JWTAuthKeyID                   string
-	JWTAuthJWKSetFile              string
-	JWTAuthAutoSignUp              bool
-	JWTAuthRoleAttributePath       string
-	JWTAuthRoleAttributeStrict     bool
-	JWTAuthAllowAssignGrafanaAdmin bool
-	JWTAuthSkipOrgRoleSync         bool
-
+	JWTAuth AuthJWTSettings
 	// Extended JWT Auth
 	ExtendedJWTAuthEnabled    bool
 	ExtendedJWTExpectIssuer   string
 	ExtendedJWTExpectAudience string
 
+	// SSO Settings Auth
+	SSOSettingsReloadInterval        time.Duration
+	SSOSettingsConfigurableProviders map[string]bool
+
 	// Dataproxy
 	SendUserHeader                 bool
 	DataProxyLogging               bool
@@ -361,20 +298,22 @@ type Cfg struct {
 	ApiKeyMaxSecondsToLive int64
 
 	// Check if a feature toggle is enabled
-	// @deprecated
+	// Deprecated: use featuremgmt.FeatureFlags
 	IsFeatureToggleEnabled func(key string) bool // filled in dynamically
 
 	AnonymousEnabled     bool
 	AnonymousOrgName     string
 	AnonymousOrgRole     string
 	AnonymousHideVersion bool
+	AnonymousDeviceLimit int64
 
 	DateFormats DateFormats
 
 	// User
-	UserInviteMaxLifetime time.Duration
-	HiddenUsers           map[string]struct{}
-	CaseInsensitiveLogin  bool // Login and Email will be considered case insensitive
+	UserInviteMaxLifetime        time.Duration
+	HiddenUsers                  map[string]struct{}
+	CaseInsensitiveLogin         bool // Login and Email will be considered case insensitive
+	VerificationEmailMaxLifetime time.Duration
 
 	// Service Accounts
 	SATokenExpirationDayLimit int
@@ -391,6 +330,13 @@ type Cfg struct {
 
 	// Data sources
 	DataSourceLimit int
+	// Number of queries to be executed concurrently. Only for the datasource supports concurrency.
+	ConcurrentQueryCount int
+
+	// IP range access control
+	IPRangeACEnabled     bool
+	IPRangeACAllowedURLs []*url.URL
+	IPRangeACSecretKey   string
 
 	// SQL Data sources
 	SqlDatasourceMaxOpenConnsDefault    int
@@ -398,22 +344,22 @@ type Cfg struct {
 	SqlDatasourceMaxConnLifetimeDefault int
 
 	// Snapshots
-	SnapshotEnabled       bool
-	ExternalSnapshotUrl   string
-	ExternalSnapshotName  string
-	ExternalEnabled       bool
+	SnapshotEnabled      bool
+	ExternalSnapshotUrl  string
+	ExternalSnapshotName string
+	ExternalEnabled      bool
+	// Deprecated: setting this to false adds deprecation warnings at runtime
 	SnapShotRemoveExpired bool
 
+	// Only used in https://snapshots.raintank.io/
 	SnapshotPublicMode bool
 
 	ErrTemplateName string
 
-	Env string
-
 	StackID string
 	Slug    string
 
-	ForceMigration bool
+	LocalFileSystemAvailable bool
 
 	// Analytics
 	CheckForGrafanaUpdates              bool
@@ -436,22 +382,6 @@ type Cfg struct {
 	RudderstackIntegrationsURL          string
 	IntercomSecret                      string
 
-	// AzureAD
-	AzureADEnabled         bool
-	AzureADSkipOrgRoleSync bool
-
-	// Google
-	GoogleAuthEnabled     bool
-	GoogleSkipOrgRoleSync bool
-
-	// Gitlab
-	GitLabAuthEnabled     bool
-	GitLabSkipOrgRoleSync bool
-
-	// Generic OAuth
-	GenericOAuthAuthEnabled     bool
-	GenericOAuthSkipOrgRoleSync bool
-
 	// LDAP
 	LDAPAuthEnabled       bool
 	LDAPSkipOrgRoleSync   bool
@@ -466,9 +396,20 @@ type Cfg struct {
 
 	Quota QuotaSettings
 
+	// User settings
+	AllowUserSignUp            bool
+	AllowUserOrgCreate         bool
+	VerifyEmailEnabled         bool
+	LoginHint                  string
+	PasswordHint               string
+	DisableSignoutMenu         bool
+	ExternalUserMngLinkUrl     string
+	ExternalUserMngLinkName    string
+	ExternalUserMngInfo        string
 	AutoAssignOrg              bool
 	AutoAssignOrgId            int
 	AutoAssignOrgRole          string
+	LoginDefaultOrgId          int64
 	OAuthSkipOrgRoleUpdateSync bool
 
 	// ExpressionsEnabled specifies whether expressions are enabled.
@@ -490,25 +431,12 @@ type Cfg struct {
 	// then Live uses AppURL as the only allowed origin.
 	LiveAllowedOrigins []string
 
-	// GitHub OAuth
-	GitHubAuthEnabled     bool
-	GitHubSkipOrgRoleSync bool
-
 	// Grafana.com URL, used for OAuth redirect.
 	GrafanaComURL string
 	// Grafana.com API URL. Can be set separately to GrafanaComURL
 	// in case API is not publicly accessible.
 	// Defaults to GrafanaComURL setting + "/api" if unset.
 	GrafanaComAPIURL string
-	// Grafana.com Auth enabled
-	GrafanaComAuthEnabled bool
-	// GrafanaComSkipOrgRoleSync can be set for
-	// letting users set org roles from within Grafana and
-	// skip the org roles coming from GrafanaCom
-	GrafanaComSkipOrgRoleSync bool
-
-	// Grafana.com Auth enabled through [auth.grafananet] config section
-	GrafanaNetAuthEnabled bool
 
 	// Geomap base layer config
 	GeomapDefaultBaseLayerConfig map[string]any
@@ -531,10 +459,6 @@ type Cfg struct {
 	SAMLSkipOrgRoleSync        bool
 	SAMLRoleValuesGrafanaAdmin string
 
-	// Okta OAuth
-	OktaAuthEnabled     bool
-	OktaSkipOrgRoleSync bool
-
 	// OAuth2 Server
 	OAuth2ServerEnabled bool
 
@@ -548,6 +472,8 @@ type Cfg struct {
 	RBACPermissionValidationEnabled bool
 	// Reset basic roles permissions on start-up
 	RBACResetBasicRoles bool
+	// RBAC single organization. This configuration option is subject to change.
+	RBACSingleOrganization bool
 
 	// GRPC Server.
 	GRPCServerNetwork   string
@@ -565,14 +491,42 @@ type Cfg struct {
 	// sqlstore package and HTTP middlewares.
 	DatabaseInstrumentQueries bool
 
+	// Public dashboards
+	PublicDashboardsEnabled bool
+
+	// Cloud Migration
+	CloudMigration CloudMigrationSettings
+
 	// Feature Management Settings
 	FeatureManagement FeatureMgmtSettings
+
+	// Alerting
+	AlertingEvaluationTimeout   time.Duration
+	AlertingNotificationTimeout time.Duration
+	AlertingMaxAttempts         int
+	AlertingMinInterval         int64
+
+	// Explore UI
+	ExploreEnabled bool
+
+	// Help UI
+	HelpEnabled bool
+
+	// Profile UI
+	ProfileEnabled bool
+
+	// News Feed
+	NewsFeedEnabled bool
+
+	// Experimental scope settings
+	ScopesListScopesURL     string
+	ScopesListDashboardsURL string
 }
 
 // AddChangePasswordLink returns if login form is disabled or not since
 // the same intention can be used to hide both features.
 func (cfg *Cfg) AddChangePasswordLink() bool {
-	return !cfg.DisableLoginForm
+	return !(cfg.DisableLoginForm || cfg.DisableLogin)
 }
 
 type CommandLineArgs struct {
@@ -620,6 +574,8 @@ func RedactedValue(key, value string) string {
 		"ACCOUNT_KEY",
 		"ENCRYPTION_KEY",
 		"VAULT_TOKEN",
+		"CLIENT_SECRET",
+		"ENTERPRISE_LICENSE",
 	} {
 		if match, err := regexp.MatchString(pattern, uppercased); match && err == nil {
 			return RedactedPassword
@@ -676,8 +632,8 @@ func RedactedURL(value string) (string, error) {
 	return strings.Join(chunks, " "), nil
 }
 
-func applyEnvVariableOverrides(file *ini.File) error {
-	appliedEnvOverrides = make([]string, 0)
+func (cfg *Cfg) applyEnvVariableOverrides(file *ini.File) error {
+	cfg.appliedEnvOverrides = make([]string, 0)
 	for _, section := range file.Sections() {
 		for _, key := range section.Keys() {
 			envKey := EnvKey(section.Name(), key.Name())
@@ -685,7 +641,7 @@ func applyEnvVariableOverrides(file *ini.File) error {
 
 			if len(envValue) > 0 {
 				key.SetValue(envValue)
-				appliedEnvOverrides = append(appliedEnvOverrides, fmt.Sprintf("%s=%s", envKey, RedactedValue(envKey, envValue)))
+				cfg.appliedEnvOverrides = append(cfg.appliedEnvOverrides, fmt.Sprintf("%s=%s", envKey, RedactedValue(envKey, envValue)))
 			}
 		}
 	}
@@ -698,6 +654,13 @@ func (cfg *Cfg) readGrafanaEnvironmentMetrics() error {
 	keys := environmentMetricsSection.Keys()
 	cfg.MetricsGrafanaEnvironmentInfo = make(map[string]string, len(keys))
 
+	cfg.MetricsGrafanaEnvironmentInfo["version"] = cfg.BuildVersion
+	cfg.MetricsGrafanaEnvironmentInfo["commit"] = cfg.BuildCommit
+
+	if cfg.EnterpriseBuildCommit != "NA" && cfg.EnterpriseBuildCommit != "" {
+		cfg.MetricsGrafanaEnvironmentInfo["enterprise_commit"] = cfg.EnterpriseBuildCommit
+	}
+
 	for _, key := range keys {
 		labelName := model.LabelName(key.Name())
 		labelValue := model.LabelValue(key.Value())
@@ -733,7 +696,6 @@ func (cfg *Cfg) readAnnotationSettings() error {
 
 	dashboardAnnotation := cfg.Raw.Section("annotations.dashboard")
 	apiIAnnotation := cfg.Raw.Section("annotations.api")
-	alertingSection := cfg.Raw.Section("alerting")
 
 	var newAnnotationCleanupSettings = func(section *ini.Section, maxAgeField string) AnnotationCleanupSettings {
 		maxAge, err := gtime.ParseDuration(section.Key(maxAgeField).MustString(""))
@@ -747,7 +709,20 @@ func (cfg *Cfg) readAnnotationSettings() error {
 		}
 	}
 
-	cfg.AlertingAnnotationCleanupSetting = newAnnotationCleanupSettings(alertingSection, "max_annotation_age")
+	alertingAnnotations := cfg.Raw.Section("unified_alerting.state_history.annotations")
+	if alertingAnnotations.Key("max_age").Value() == "" && section.Key("max_annotations_to_keep").Value() == "" {
+		// Although this section is not documented anymore, we decided to keep it to avoid potential data-loss when user upgrades Grafana and does not change the setting.
+		// TODO delete some time after Grafana 11.
+		alertingSection := cfg.Raw.Section("alerting")
+		cleanup := newAnnotationCleanupSettings(alertingSection, "max_annotation_age")
+		if cleanup.MaxCount > 0 || cleanup.MaxAge > 0 {
+			cfg.Logger.Warn("settings 'max_annotations_to_keep' and 'max_annotation_age' in section [alerting] are deprecated. Please use settings 'max_annotations_to_keep' and 'max_age' in section [unified_alerting.state_history.annotations]")
+		}
+		cfg.AlertingAnnotationCleanupSetting = cleanup
+	} else {
+		cfg.AlertingAnnotationCleanupSetting = newAnnotationCleanupSettings(alertingAnnotations, "max_age")
+	}
+
 	cfg.DashboardAnnotationCleanupSettings = newAnnotationCleanupSettings(dashboardAnnotation, "max_age")
 	cfg.APIAnnotationCleanupSettings = newAnnotationCleanupSettings(apiIAnnotation, "max_age")
 
@@ -772,22 +747,22 @@ func EnvKey(sectionName string, keyName string) string {
 	return envKey
 }
 
-func applyCommandLineDefaultProperties(props map[string]string, file *ini.File) {
-	appliedCommandLineProperties = make([]string, 0)
+func (cfg *Cfg) applyCommandLineDefaultProperties(props map[string]string, file *ini.File) {
+	cfg.appliedCommandLineProperties = make([]string, 0)
 	for _, section := range file.Sections() {
 		for _, key := range section.Keys() {
 			keyString := fmt.Sprintf("default.%s.%s", section.Name(), key.Name())
 			value, exists := props[keyString]
 			if exists {
 				key.SetValue(value)
-				appliedCommandLineProperties = append(appliedCommandLineProperties,
+				cfg.appliedCommandLineProperties = append(cfg.appliedCommandLineProperties,
 					fmt.Sprintf("%s=%s", keyString, RedactedValue(keyString, value)))
 			}
 		}
 	}
 }
 
-func applyCommandLineProperties(props map[string]string, file *ini.File) {
+func (cfg *Cfg) applyCommandLineProperties(props map[string]string, file *ini.File) {
 	for _, section := range file.Sections() {
 		sectionName := section.Name() + "."
 		if section.Name() == ini.DefaultSection {
@@ -797,7 +772,7 @@ func applyCommandLineProperties(props map[string]string, file *ini.File) {
 			keyString := sectionName + key.Name()
 			value, exists := props[keyString]
 			if exists {
-				appliedCommandLineProperties = append(appliedCommandLineProperties, fmt.Sprintf("%s=%s", keyString, value))
+				cfg.appliedCommandLineProperties = append(cfg.appliedCommandLineProperties, fmt.Sprintf("%s=%s", keyString, value))
 				key.SetValue(value)
 			}
 		}
@@ -833,7 +808,7 @@ func makeAbsolute(path string, root string) string {
 
 func (cfg *Cfg) loadSpecifiedConfigFile(configFile string, masterFile *ini.File) error {
 	if configFile == "" {
-		configFile = filepath.Join(cfg.HomePath, CustomInitPath)
+		configFile = filepath.Join(cfg.HomePath, customInitPath)
 		// return without error if custom file does not exist
 		if !pathExists(configFile) {
 			return nil
@@ -845,6 +820,9 @@ func (cfg *Cfg) loadSpecifiedConfigFile(configFile string, masterFile *ini.File)
 		return fmt.Errorf("failed to parse %q: %w", configFile, err)
 	}
 
+	// micro-optimization since we don't need to share this ini file. In
+	// general, prefer to leave this flag as true as it is by default to prevent
+	// data races
 	userConfig.BlockMode = false
 
 	for _, section := range userConfig.Sections() {
@@ -865,14 +843,14 @@ func (cfg *Cfg) loadSpecifiedConfigFile(configFile string, masterFile *ini.File)
 		}
 	}
 
-	configFiles = append(configFiles, configFile)
+	cfg.configFiles = append(cfg.configFiles, configFile)
 	return nil
 }
 
 func (cfg *Cfg) loadConfiguration(args CommandLineArgs) (*ini.File, error) {
 	// load config defaults
-	defaultConfigFile := path.Join(HomePath, "conf/defaults.ini")
-	configFiles = append(configFiles, defaultConfigFile)
+	defaultConfigFile := path.Join(cfg.HomePath, "conf/defaults.ini")
+	cfg.configFiles = append(cfg.configFiles, defaultConfigFile)
 
 	// check if config file exists
 	if _, err := os.Stat(defaultConfigFile); os.IsNotExist(err) {
@@ -888,12 +866,10 @@ func (cfg *Cfg) loadConfiguration(args CommandLineArgs) (*ini.File, error) {
 		return nil, err
 	}
 
-	parsedFile.BlockMode = false
-
 	// command line props
 	commandLineProps := cfg.getCommandLineProperties(args.Args)
 	// load default overrides
-	applyCommandLineDefaultProperties(commandLineProps, parsedFile)
+	cfg.applyCommandLineDefaultProperties(commandLineProps, parsedFile)
 
 	// load specified config file
 	err = cfg.loadSpecifiedConfigFile(args.Config, parsedFile)
@@ -907,13 +883,13 @@ func (cfg *Cfg) loadConfiguration(args CommandLineArgs) (*ini.File, error) {
 	}
 
 	// apply environment overrides
-	err = applyEnvVariableOverrides(parsedFile)
+	err = cfg.applyEnvVariableOverrides(parsedFile)
 	if err != nil {
 		return nil, err
 	}
 
 	// apply command line overrides
-	applyCommandLineProperties(commandLineProps, parsedFile)
+	cfg.applyCommandLineProperties(commandLineProps, parsedFile)
 
 	// evaluate config values containing environment variables
 	err = expandConfig(parsedFile)
@@ -924,7 +900,7 @@ func (cfg *Cfg) loadConfiguration(args CommandLineArgs) (*ini.File, error) {
 	// update data path and logging config
 	dataPath := valueAsString(parsedFile.Section("paths"), "data", "")
 
-	cfg.DataPath = makeAbsolute(dataPath, HomePath)
+	cfg.DataPath = makeAbsolute(dataPath, cfg.HomePath)
 	err = cfg.initLogging(parsedFile)
 	if err != nil {
 		return nil, err
@@ -949,7 +925,6 @@ func pathExists(path string) bool {
 func (cfg *Cfg) setHomePath(args CommandLineArgs) {
 	if args.HomePath != "" {
 		cfg.HomePath = args.HomePath
-		HomePath = cfg.HomePath
 		return
 	}
 
@@ -959,7 +934,6 @@ func (cfg *Cfg) setHomePath(args CommandLineArgs) {
 		panic(err)
 	}
 
-	HomePath = cfg.HomePath
 	// check if homepath is correct
 	if pathExists(filepath.Join(cfg.HomePath, "conf/defaults.ini")) {
 		return
@@ -968,7 +942,6 @@ func (cfg *Cfg) setHomePath(args CommandLineArgs) {
 	// try down one path
 	if pathExists(filepath.Join(cfg.HomePath, "../conf/defaults.ini")) {
 		cfg.HomePath = filepath.Join(cfg.HomePath, "../")
-		HomePath = cfg.HomePath
 	}
 }
 
@@ -976,13 +949,27 @@ var skipStaticRootValidation = false
 
 func NewCfg() *Cfg {
 	return &Cfg{
+		Env:    Dev,
 		Target: []string{"all"},
 		Logger: log.New("settings"),
 		Raw:    ini.Empty(),
 		Azure:  &azsettings.AzureSettings{},
+
+		// Avoid nil pointer
+		IsFeatureToggleEnabled: func(_ string) bool {
+			return false
+		},
 	}
 }
 
+// Deprecated: Avoid using IsFeatureToggleEnabled from settings.  If you need to access
+// feature flags, read them from the FeatureToggle (or FeatureManager) interface
+func NewCfgWithFeatures(features func(string) bool) *Cfg {
+	cfg := NewCfg()
+	cfg.IsFeatureToggleEnabled = features
+	return cfg
+}
+
 func NewCfgFromArgs(args CommandLineArgs) (*Cfg, error) {
 	cfg := NewCfg()
 	if err := cfg.Load(args); err != nil {
@@ -992,12 +979,33 @@ func NewCfgFromArgs(args CommandLineArgs) (*Cfg, error) {
 	return cfg, nil
 }
 
+// NewCfgFromBytes specialized function to create a new Cfg from bytes (INI file).
+func NewCfgFromBytes(bytes []byte) (*Cfg, error) {
+	parsedFile, err := ini.Load(bytes)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse bytes as INI file: %w", err)
+	}
+
+	return NewCfgFromINIFile(parsedFile)
+}
+
+// NewCfgFromINIFile specialized function to create a new Cfg from an ini.File.
+func NewCfgFromINIFile(iniFile *ini.File) (*Cfg, error) {
+	cfg := NewCfg()
+
+	if err := cfg.parseINIFile(iniFile); err != nil {
+		return nil, fmt.Errorf("failed to parse setting from INI file: %w", err)
+	}
+
+	return cfg, nil
+}
+
 func (cfg *Cfg) validateStaticRootPath() error {
 	if skipStaticRootValidation {
 		return nil
 	}
 
-	if _, err := os.Stat(path.Join(StaticRootPath, "build")); err != nil {
+	if _, err := os.Stat(path.Join(cfg.StaticRootPath, "build")); err != nil {
 		cfg.Logger.Error("Failed to detect generated javascript files in public/build")
 	}
 
@@ -1010,7 +1018,7 @@ func (cfg *Cfg) Load(args CommandLineArgs) error {
 	// Fix for missing IANA db on Windows
 	_, zoneInfoSet := os.LookupEnv(zoneInfo)
 	if runtime.GOOS == "windows" && !zoneInfoSet {
-		if err := os.Setenv(zoneInfo, filepath.Join(HomePath, "tools", "zoneinfo.zip")); err != nil {
+		if err := os.Setenv(zoneInfo, filepath.Join(cfg.HomePath, "tools", "zoneinfo.zip")); err != nil {
 			cfg.Logger.Error("Can't set ZONEINFO environment variable", "err", err)
 		}
 	}
@@ -1020,10 +1028,19 @@ func (cfg *Cfg) Load(args CommandLineArgs) error {
 		return err
 	}
 
-	cfg.Raw = iniFile
+	err = cfg.parseINIFile(iniFile)
+	if err != nil {
+		return err
+	}
 
-	// Temporarily keep global, to make refactor in steps
-	Raw = cfg.Raw
+	cfg.LogConfigSources()
+
+	return nil
+}
+
+// nolint:gocyclo
+func (cfg *Cfg) parseINIFile(iniFile *ini.File) error {
+	cfg.Raw = iniFile
 
 	cfg.BuildVersion = BuildVersion
 	cfg.BuildCommit = BuildCommit
@@ -1037,19 +1054,18 @@ func (cfg *Cfg) Load(args CommandLineArgs) error {
 
 	Target := valueAsString(iniFile.Section(""), "target", "all")
 	if Target != "" {
-		cfg.Target = strings.Split(Target, " ")
+		cfg.Target = util.SplitString(Target)
 	}
-	Env = valueAsString(iniFile.Section(""), "app_mode", "development")
-	cfg.Env = Env
+	cfg.Env = valueAsString(iniFile.Section(""), "app_mode", "development")
 	cfg.StackID = valueAsString(iniFile.Section("environment"), "stack_id", "")
 	cfg.Slug = valueAsString(iniFile.Section("environment"), "stack_slug", "")
-	cfg.ForceMigration = iniFile.Section("").Key("force_migration").MustBool(false)
-	InstanceName = valueAsString(iniFile.Section(""), "instance_name", "unknown_instance_name")
+	cfg.LocalFileSystemAvailable = iniFile.Section("environment").Key("local_file_system_available").MustBool(true)
+	cfg.InstanceName = valueAsString(iniFile.Section(""), "instance_name", "unknown_instance_name")
 	plugins := valueAsString(iniFile.Section("paths"), "plugins", "")
-	cfg.PluginsPath = makeAbsolute(plugins, HomePath)
-	cfg.BundledPluginsPath = makeAbsolute("plugins-bundled", HomePath)
+	cfg.PluginsPath = makeAbsolute(plugins, cfg.HomePath)
+	cfg.BundledPluginsPath = makeAbsolute("plugins-bundled", cfg.HomePath)
 	provisioning := valueAsString(iniFile.Section("paths"), "provisioning", "")
-	cfg.ProvisioningPath = makeAbsolute(provisioning, HomePath)
+	cfg.ProvisioningPath = makeAbsolute(provisioning, cfg.HomePath)
 
 	if err := cfg.readServerSettings(iniFile); err != nil {
 		return err
@@ -1073,9 +1089,8 @@ func (cfg *Cfg) Load(args CommandLineArgs) error {
 
 	// read dashboard settings
 	dashboards := iniFile.Section("dashboards")
-	DashboardVersionsToKeep = dashboards.Key("versions_to_keep").MustInt(20)
-	MinRefreshInterval = valueAsString(dashboards, "min_refresh_interval", "5s")
-
+	cfg.DashboardVersionsToKeep = dashboards.Key("versions_to_keep").MustInt(20)
+	cfg.MinRefreshInterval = valueAsString(dashboards, "min_refresh_interval", "5s")
 	cfg.DefaultHomeDashboardPath = dashboards.Key("default_home_dashboard_path").MustString("")
 
 	if err := readUserSettings(iniFile, cfg); err != nil {
@@ -1129,21 +1144,21 @@ func (cfg *Cfg) Load(args CommandLineArgs) error {
 	cfg.ApplicationInsightsEndpointUrl = analytics.Key("application_insights_endpoint_url").String()
 	cfg.FeedbackLinksEnabled = analytics.Key("feedback_links_enabled").MustBool(true)
 
-	if err := readAlertingSettings(iniFile); err != nil {
+	if err := cfg.readAlertingSettings(iniFile); err != nil {
 		return err
 	}
 
 	explore := iniFile.Section("explore")
-	ExploreEnabled = explore.Key("enabled").MustBool(true)
+	cfg.ExploreEnabled = explore.Key("enabled").MustBool(true)
 
 	help := iniFile.Section("help")
-	HelpEnabled = help.Key("enabled").MustBool(true)
+	cfg.HelpEnabled = help.Key("enabled").MustBool(true)
 
 	profile := iniFile.Section("profile")
-	ProfileEnabled = profile.Key("enabled").MustBool(true)
+	cfg.ProfileEnabled = profile.Key("enabled").MustBool(true)
 
 	news := iniFile.Section("news")
-	NewsFeedEnabled = news.Key("news_feed_enabled").MustBool(true)
+	cfg.NewsFeedEnabled = news.Key("news_feed_enabled").MustBool(true)
 
 	queryHistory := iniFile.Section("query_history")
 	cfg.QueryHistoryEnabled = queryHistory.Key("enabled").MustBool(true)
@@ -1155,6 +1170,7 @@ func (cfg *Cfg) Load(args CommandLineArgs) error {
 		return err
 	}
 
+	// nolint:staticcheck
 	if err := cfg.readFeatureToggles(iniFile); err != nil {
 		return err
 	}
@@ -1172,8 +1188,12 @@ func (cfg *Cfg) Load(args CommandLineArgs) error {
 	cfg.readLDAPConfig()
 	cfg.handleAWSConfig()
 	cfg.readAzureSettings()
+	cfg.readAuthJWTSettings()
+	cfg.readAuthProxySettings()
 	cfg.readSessionConfig()
-	cfg.readSmtpSettings()
+	if err := cfg.readSmtpSettings(); err != nil {
+		return err
+	}
 	if err := cfg.readAnnotationSettings(); err != nil {
 		return err
 	}
@@ -1186,11 +1206,13 @@ func (cfg *Cfg) Load(args CommandLineArgs) error {
 	}
 
 	cfg.readDataSourcesSettings()
+	cfg.readDataSourceSecuritySettings()
 	cfg.readSqlDataSourceSettings()
 
 	cfg.Storage = readStorageSettings(iniFile)
 	cfg.Search = readSearchSettings(iniFile)
 
+	var err error
 	cfg.SecureSocksDSProxy, err = readSecureSocksDSProxySettings(iniFile)
 	if err != nil {
 		// if the proxy is misconfigured, disable it rather than crashing
@@ -1198,22 +1220,21 @@ func (cfg *Cfg) Load(args CommandLineArgs) error {
 		cfg.Logger.Error("secure_socks_datasource_proxy unable to start up", "err", err.Error())
 	}
 
-	if VerifyEmailEnabled && !cfg.Smtp.Enabled {
+	if cfg.VerifyEmailEnabled && !cfg.Smtp.Enabled {
 		cfg.Logger.Warn("require_email_validation is enabled but smtp is disabled")
 	}
 
 	// check old key name
-	GrafanaComUrl = valueAsString(iniFile.Section("grafana_net"), "url", "")
-	if GrafanaComUrl == "" {
-		GrafanaComUrl = valueAsString(iniFile.Section("grafana_com"), "url", "https://grafana.com")
+	grafanaComUrl := valueAsString(iniFile.Section("grafana_net"), "url", "")
+	if grafanaComUrl == "" {
+		grafanaComUrl = valueAsString(iniFile.Section("grafana_com"), "url", "https://grafana.com")
 	}
-	cfg.GrafanaComURL = GrafanaComUrl
+	cfg.GrafanaComURL = grafanaComUrl
 
-	cfg.GrafanaComAPIURL = valueAsString(iniFile.Section("grafana_com"), "api_url", GrafanaComUrl+"/api")
+	cfg.GrafanaComAPIURL = valueAsString(iniFile.Section("grafana_com"), "api_url", grafanaComUrl+"/api")
 
 	imageUploadingSection := iniFile.Section("external_image_storage")
 	cfg.ImageUploadProvider = valueAsString(imageUploadingSection, "provider", "")
-	ImageUploadProvider = cfg.ImageUploadProvider
 
 	enterprise := iniFile.Section("enterprise")
 	cfg.EnterpriseLicensePath = valueAsString(enterprise, "license_path", filepath.Join(cfg.DataPath, "license.jwt"))
@@ -1235,7 +1256,7 @@ func (cfg *Cfg) Load(args CommandLineArgs) error {
 	basemapJSON := valueAsString(geomapSection, "default_baselayer_config", "")
 	if basemapJSON != "" {
 		layer := make(map[string]any)
-		err = json.Unmarshal([]byte(basemapJSON), &layer)
+		err := json.Unmarshal([]byte(basemapJSON), &layer)
 		if err != nil {
 			cfg.Logger.Error("Error reading json from default_baselayer_config", "error", err)
 		} else {
@@ -1251,8 +1272,6 @@ func (cfg *Cfg) Load(args CommandLineArgs) error {
 		return err
 	}
 
-	cfg.LogConfigSources()
-
 	databaseSection := iniFile.Section("database")
 	cfg.DatabaseInstrumentQueries = databaseSection.Key("instrument_queries").MustBool(false)
 
@@ -1260,6 +1279,13 @@ func (cfg *Cfg) Load(args CommandLineArgs) error {
 	cfg.UserFacingDefaultError = logSection.Key("user_facing_default_error").MustString("please inspect Grafana server log for details")
 
 	cfg.readFeatureManagementConfig()
+	cfg.readPublicDashboardsSettings()
+	cfg.readCloudMigrationSettings()
+
+	// read experimental scopes settings.
+	scopesSection := iniFile.Section("scopes")
+	cfg.ScopesListScopesURL = scopesSection.Key("list_scopes_endpoint").MustString("")
+	cfg.ScopesListDashboardsURL = scopesSection.Key("list_dashboards_endpoint").MustString("")
 
 	return nil
 }
@@ -1303,6 +1329,10 @@ func (cfg *Cfg) handleAWSConfig() {
 		}
 	}
 	cfg.AWSListMetricsPageLimit = awsPluginSec.Key("list_metrics_page_limit").MustInt(500)
+	cfg.AWSExternalId = awsPluginSec.Key("external_id").Value()
+	cfg.AWSSessionDuration = awsPluginSec.Key("session_duration").Value()
+	cfg.AWSForwardSettingsPlugins = util.SplitString(awsPluginSec.Key("forward_settings_to_plugins").String())
+
 	// Also set environment variables that can be used by core plugins
 	err := os.Setenv(awsds.AssumeRoleEnabledEnvVarKeyName, strconv.FormatBool(cfg.AWSAssumeRoleEnabled))
 	if err != nil {
@@ -1314,11 +1344,20 @@ func (cfg *Cfg) handleAWSConfig() {
 		cfg.Logger.Error(fmt.Sprintf("could not set environment variable '%s'", awsds.AllowedAuthProvidersEnvVarKeyName), err)
 	}
 
-	cfg.AWSExternalId = awsPluginSec.Key("external_id").Value()
+	err = os.Setenv(awsds.ListMetricsPageLimitKeyName, strconv.Itoa(cfg.AWSListMetricsPageLimit))
+	if err != nil {
+		cfg.Logger.Error(fmt.Sprintf("could not set environment variable '%s'", awsds.ListMetricsPageLimitKeyName), err)
+	}
+
 	err = os.Setenv(awsds.GrafanaAssumeRoleExternalIdKeyName, cfg.AWSExternalId)
 	if err != nil {
 		cfg.Logger.Error(fmt.Sprintf("could not set environment variable '%s'", awsds.GrafanaAssumeRoleExternalIdKeyName), err)
 	}
+
+	err = os.Setenv(awsds.SessionDurationEnvVarKeyName, cfg.AWSSessionDuration)
+	if err != nil {
+		cfg.Logger.Error(fmt.Sprintf("could not set environment variable '%s'", awsds.SessionDurationEnvVarKeyName), err)
+	}
 }
 
 func (cfg *Cfg) readSessionConfig() {
@@ -1340,32 +1379,32 @@ func (cfg *Cfg) initLogging(file *ini.File) error {
 		logModes = strings.Split(logModeStr, " ")
 	}
 	logsPath := valueAsString(file.Section("paths"), "logs", "")
-	cfg.LogsPath = makeAbsolute(logsPath, HomePath)
+	cfg.LogsPath = makeAbsolute(logsPath, cfg.HomePath)
 	return log.ReadLoggingConfig(logModes, cfg.LogsPath, file)
 }
 
 func (cfg *Cfg) LogConfigSources() {
 	var text bytes.Buffer
 
-	for _, file := range configFiles {
+	for _, file := range cfg.configFiles {
 		cfg.Logger.Info("Config loaded from", "file", file)
 	}
 
-	if len(appliedCommandLineProperties) > 0 {
-		for _, prop := range appliedCommandLineProperties {
+	if len(cfg.appliedCommandLineProperties) > 0 {
+		for _, prop := range cfg.appliedCommandLineProperties {
 			cfg.Logger.Info("Config overridden from command line", "arg", prop)
 		}
 	}
 
-	if len(appliedEnvOverrides) > 0 {
+	if len(cfg.appliedEnvOverrides) > 0 {
 		text.WriteString("\tEnvironment variables used:\n")
-		for _, prop := range appliedEnvOverrides {
+		for _, prop := range cfg.appliedEnvOverrides {
 			cfg.Logger.Info("Config overridden from Environment variable", "var", prop)
 		}
 	}
 
 	cfg.Logger.Info("Target", "target", cfg.Target)
-	cfg.Logger.Info("Path Home", "path", HomePath)
+	cfg.Logger.Info("Path Home", "path", cfg.HomePath)
 	cfg.Logger.Info("Path Data", "path", cfg.DataPath)
 	cfg.Logger.Info("Path Logs", "path", cfg.LogsPath)
 	cfg.Logger.Info("Path Plugins", "path", cfg.PluginsPath)
@@ -1376,13 +1415,14 @@ func (cfg *Cfg) LogConfigSources() {
 type DynamicSection struct {
 	section *ini.Section
 	Logger  log.Logger
+	env     osutil.Env
 }
 
 // Key dynamically overrides keys with environment variables.
 // As a side effect, the value of the setting key will be updated if an environment variable is present.
 func (s *DynamicSection) Key(k string) *ini.Key {
 	envKey := EnvKey(s.section.Name(), k)
-	envValue := os.Getenv(envKey)
+	envValue := s.env.Getenv(envKey)
 	key := s.section.Key(k)
 
 	if len(envValue) == 0 {
@@ -1395,17 +1435,32 @@ func (s *DynamicSection) Key(k string) *ini.Key {
 	return key
 }
 
+func (s *DynamicSection) KeysHash() map[string]string {
+	hash := s.section.KeysHash()
+	for k := range hash {
+		envKey := EnvKey(s.section.Name(), k)
+		envValue := s.env.Getenv(envKey)
+		if len(envValue) > 0 {
+			hash[k] = envValue
+		}
+	}
+	return hash
+}
+
 // SectionWithEnvOverrides dynamically overrides keys with environment variables.
 // As a side effect, the value of the setting key will be updated if an environment variable is present.
 func (cfg *Cfg) SectionWithEnvOverrides(s string) *DynamicSection {
-	return &DynamicSection{cfg.Raw.Section(s), cfg.Logger}
+	return &DynamicSection{
+		section: cfg.Raw.Section(s),
+		Logger:  cfg.Logger,
+		env:     osutil.RealEnv{},
+	}
 }
 
 func readSecuritySettings(iniFile *ini.File, cfg *Cfg) error {
 	security := iniFile.Section("security")
-	SecretKey = valueAsString(security, "secret_key", "")
-	cfg.SecretKey = SecretKey
-	DisableGravatar = security.Key("disable_gravatar").MustBool(true)
+	cfg.SecretKey = valueAsString(security, "secret_key", "")
+	cfg.DisableGravatar = security.Key("disable_gravatar").MustBool(true)
 	cfg.DisableBruteForceLoginProtection = security.Key("disable_brute_force_login_protection").MustBool(false)
 
 	CookieSecure = security.Key("cookie_secure").MustBool(false)
@@ -1439,13 +1494,13 @@ func readSecuritySettings(iniFile *ini.File, cfg *Cfg) error {
 	cfg.StrictTransportSecurityMaxAge = security.Key("strict_transport_security_max_age_seconds").MustInt(86400)
 	cfg.StrictTransportSecurityPreload = security.Key("strict_transport_security_preload").MustBool(false)
 	cfg.StrictTransportSecuritySubDomains = security.Key("strict_transport_security_subdomains").MustBool(false)
-	cfg.AngularSupportEnabled = security.Key("angular_support_enabled").MustBool(true)
+	cfg.AngularSupportEnabled = security.Key("angular_support_enabled").MustBool(false)
 	cfg.CSPEnabled = security.Key("content_security_policy").MustBool(false)
 	cfg.CSPTemplate = security.Key("content_security_policy_template").MustString("")
 	cfg.CSPReportOnlyEnabled = security.Key("content_security_policy_report_only").MustBool(false)
 	cfg.CSPReportOnlyTemplate = security.Key("content_security_policy_report_only_template").MustString("")
 
-	disableFrontendSandboxForPlugins := security.Key("frontend_sandbox_disable_for_plugins").MustString("")
+	disableFrontendSandboxForPlugins := security.Key("disable_frontend_sandbox_for_plugins").MustString("")
 	for _, plug := range strings.Split(disableFrontendSandboxForPlugins, ",") {
 		plug = strings.TrimSpace(plug)
 		cfg.DisableFrontendSandboxForPlugins = append(cfg.DisableFrontendSandboxForPlugins, plug)
@@ -1460,11 +1515,11 @@ func readSecuritySettings(iniFile *ini.File, cfg *Cfg) error {
 	}
 
 	// read data source proxy whitelist
-	DataProxyWhiteList = make(map[string]bool)
+	cfg.DataProxyWhiteList = make(map[string]bool)
 	securityStr := valueAsString(security, "data_source_proxy_whitelist", "")
 
 	for _, hostAndIP := range util.SplitString(securityStr) {
-		DataProxyWhiteList[hostAndIP] = true
+		cfg.DataProxyWhiteList[hostAndIP] = true
 	}
 
 	// admin
@@ -1475,52 +1530,6 @@ func readSecuritySettings(iniFile *ini.File, cfg *Cfg) error {
 
 	return nil
 }
-func readAuthAzureADSettings(cfg *Cfg) {
-	sec := cfg.SectionWithEnvOverrides("auth.azuread")
-	cfg.AzureADEnabled = sec.Key("enabled").MustBool(false)
-	cfg.AzureADSkipOrgRoleSync = sec.Key("skip_org_role_sync").MustBool(false)
-}
-
-func readAuthGrafanaComSettings(cfg *Cfg) {
-	sec := cfg.SectionWithEnvOverrides("auth.grafana_com")
-	cfg.GrafanaComAuthEnabled = sec.Key("enabled").MustBool(false)
-	cfg.GrafanaComSkipOrgRoleSync = sec.Key("skip_org_role_sync").MustBool(false)
-}
-
-func readAuthGrafanaNetSettings(cfg *Cfg) {
-	sec := cfg.SectionWithEnvOverrides("auth.grafananet")
-	cfg.GrafanaNetAuthEnabled = sec.Key("enabled").MustBool(false)
-}
-
-func readAuthGithubSettings(cfg *Cfg) {
-	sec := cfg.SectionWithEnvOverrides("auth.github")
-	cfg.GitHubAuthEnabled = sec.Key("enabled").MustBool(false)
-	cfg.GitHubSkipOrgRoleSync = sec.Key("skip_org_role_sync").MustBool(false)
-}
-
-func readAuthGoogleSettings(cfg *Cfg) {
-	sec := cfg.SectionWithEnvOverrides("auth.google")
-	cfg.GoogleAuthEnabled = sec.Key("enabled").MustBool(false)
-	cfg.GoogleSkipOrgRoleSync = sec.Key("skip_org_role_sync").MustBool(true)
-}
-
-func readAuthGitlabSettings(cfg *Cfg) {
-	sec := cfg.SectionWithEnvOverrides("auth.gitlab")
-	cfg.GitLabAuthEnabled = sec.Key("enabled").MustBool(false)
-	cfg.GitLabSkipOrgRoleSync = sec.Key("skip_org_role_sync").MustBool(false)
-}
-
-func readGenericOAuthSettings(cfg *Cfg) {
-	sec := cfg.SectionWithEnvOverrides("auth.generic_oauth")
-	cfg.GenericOAuthAuthEnabled = sec.Key("enabled").MustBool(false)
-	cfg.GenericOAuthSkipOrgRoleSync = sec.Key("skip_org_role_sync").MustBool(false)
-}
-
-func readAuthOktaSettings(cfg *Cfg) {
-	sec := cfg.SectionWithEnvOverrides("auth.okta")
-	cfg.OktaAuthEnabled = sec.Key("enabled").MustBool(false)
-	cfg.OktaSkipOrgRoleSync = sec.Key("skip_org_role_sync").MustBool(false)
-}
 
 func readAuthSettings(iniFile *ini.File, cfg *Cfg) (err error) {
 	auth := iniFile.Section("auth")
@@ -1553,7 +1562,7 @@ func readAuthSettings(iniFile *ini.File, cfg *Cfg) (err error) {
 	cfg.AuthConfigUIAdminAccess = auth.Key("config_ui_admin_access").MustBool(false)
 
 	cfg.DisableLoginForm = auth.Key("disable_login_form").MustBool(false)
-	DisableSignoutMenu = auth.Key("disable_signout_menu").MustBool(false)
+	cfg.DisableSignoutMenu = auth.Key("disable_signout_menu").MustBool(false)
 
 	// Deprecated
 	cfg.OAuthAutoLogin = auth.Key("oauth_auto_login").MustBool(false)
@@ -1563,71 +1572,41 @@ func readAuthSettings(iniFile *ini.File, cfg *Cfg) (err error) {
 
 	cfg.OAuthCookieMaxAge = auth.Key("oauth_state_cookie_max_age").MustInt(600)
 	cfg.SignoutRedirectUrl = valueAsString(auth, "signout_redirect_url", "")
+
 	// Deprecated
-	cfg.OAuthSkipOrgRoleUpdateSync = auth.Key("oauth_skip_org_role_update_sync").MustBool(false)
-	if cfg.OAuthSkipOrgRoleUpdateSync {
-		cfg.Logger.Warn("[Deprecated] The oauth_skip_org_role_update_sync configuration setting is deprecated. Please use skip_org_role_sync inside the auth provider section instead.")
-	}
+	cfg.OAuthSkipOrgRoleUpdateSync = false
 
 	cfg.DisableLogin = auth.Key("disable_login").MustBool(false)
 
 	// SigV4
-	SigV4AuthEnabled = auth.Key("sigv4_auth_enabled").MustBool(false)
-	cfg.SigV4AuthEnabled = SigV4AuthEnabled
+	cfg.SigV4AuthEnabled = auth.Key("sigv4_auth_enabled").MustBool(false)
 	cfg.SigV4VerboseLogging = auth.Key("sigv4_verbose_logging").MustBool(false)
 
 	// Azure Auth
-	AzureAuthEnabled = auth.Key("azure_auth_enabled").MustBool(false)
-	cfg.AzureAuthEnabled = AzureAuthEnabled
-	readAuthAzureADSettings(cfg)
-
-	// Google Auth
-	readAuthGoogleSettings(cfg)
-
-	// GitLab Auth
-	readAuthGitlabSettings(cfg)
-
-	// Generic OAuth
-	readGenericOAuthSettings(cfg)
+	cfg.AzureAuthEnabled = auth.Key("azure_auth_enabled").MustBool(false)
 
-	// Okta Auth
-	readAuthOktaSettings(cfg)
+	// ID response header
+	cfg.IDResponseHeaderEnabled = auth.Key("id_response_header_enabled").MustBool(false)
+	cfg.IDResponseHeaderPrefix = auth.Key("id_response_header_prefix").MustString("X-Grafana")
 
-	// GrafanaCom
-	readAuthGrafanaComSettings(cfg)
-	readAuthGrafanaNetSettings(cfg)
-
-	// Github
-	readAuthGithubSettings(cfg)
+	idHeaderNamespaces := util.SplitString(auth.Key("id_response_header_namespaces").MustString(""))
+	cfg.IDResponseHeaderNamespaces = make(map[string]struct{}, len(idHeaderNamespaces))
+	for _, namespace := range idHeaderNamespaces {
+		cfg.IDResponseHeaderNamespaces[namespace] = struct{}{}
+	}
 
 	// anonymous access
-	cfg.AnonymousEnabled = iniFile.Section("auth.anonymous").Key("enabled").MustBool(false)
-	cfg.AnonymousOrgName = valueAsString(iniFile.Section("auth.anonymous"), "org_name", "")
-	cfg.AnonymousOrgRole = valueAsString(iniFile.Section("auth.anonymous"), "org_role", "")
-	cfg.AnonymousHideVersion = iniFile.Section("auth.anonymous").Key("hide_version").MustBool(false)
+	anonSection := iniFile.Section("auth.anonymous")
+	cfg.AnonymousEnabled = anonSection.Key("enabled").MustBool(false)
+	cfg.AnonymousOrgName = valueAsString(anonSection, "org_name", "")
+	cfg.AnonymousOrgRole = valueAsString(anonSection, "org_role", "")
+	cfg.AnonymousHideVersion = anonSection.Key("hide_version").MustBool(false)
+	cfg.AnonymousDeviceLimit = anonSection.Key("device_limit").MustInt64(0)
 
 	// basic auth
 	authBasic := iniFile.Section("auth.basic")
 	cfg.BasicAuthEnabled = authBasic.Key("enabled").MustBool(true)
-
-	// JWT auth
-	authJWT := iniFile.Section("auth.jwt")
-	cfg.JWTAuthEnabled = authJWT.Key("enabled").MustBool(false)
-	cfg.JWTAuthHeaderName = valueAsString(authJWT, "header_name", "")
-	cfg.JWTAuthURLLogin = authJWT.Key("url_login").MustBool(false)
-	cfg.JWTAuthEmailClaim = valueAsString(authJWT, "email_claim", "")
-	cfg.JWTAuthUsernameClaim = valueAsString(authJWT, "username_claim", "")
-	cfg.JWTAuthExpectClaims = valueAsString(authJWT, "expect_claims", "{}")
-	cfg.JWTAuthJWKSetURL = valueAsString(authJWT, "jwk_set_url", "")
-	cfg.JWTAuthCacheTTL = authJWT.Key("cache_ttl").MustDuration(time.Minute * 60)
-	cfg.JWTAuthKeyFile = valueAsString(authJWT, "key_file", "")
-	cfg.JWTAuthKeyID = authJWT.Key("key_id").MustString("")
-	cfg.JWTAuthJWKSetFile = valueAsString(authJWT, "jwk_set_file", "")
-	cfg.JWTAuthAutoSignUp = authJWT.Key("auto_sign_up").MustBool(false)
-	cfg.JWTAuthRoleAttributePath = valueAsString(authJWT, "role_attribute_path", "")
-	cfg.JWTAuthRoleAttributeStrict = authJWT.Key("role_attribute_strict").MustBool(false)
-	cfg.JWTAuthAllowAssignGrafanaAdmin = authJWT.Key("allow_assign_grafana_admin").MustBool(false)
-	cfg.JWTAuthSkipOrgRoleSync = authJWT.Key("skip_org_role_sync").MustBool(false)
+	cfg.BasicAuthStrongPasswordPolicy = authBasic.Key("password_policy").MustBool(false)
 
 	// Extended JWT auth
 	authExtendedJWT := cfg.SectionWithEnvOverrides("auth.extended_jwt")
@@ -1635,31 +1614,15 @@ func readAuthSettings(iniFile *ini.File, cfg *Cfg) (err error) {
 	cfg.ExtendedJWTExpectAudience = authExtendedJWT.Key("expect_audience").MustString("")
 	cfg.ExtendedJWTExpectIssuer = authExtendedJWT.Key("expect_issuer").MustString("")
 
-	// Auth Proxy
-	authProxy := iniFile.Section("auth.proxy")
-	cfg.AuthProxyEnabled = authProxy.Key("enabled").MustBool(false)
-
-	cfg.AuthProxyHeaderName = valueAsString(authProxy, "header_name", "")
-	cfg.AuthProxyHeaderProperty = valueAsString(authProxy, "header_property", "")
-	cfg.AuthProxyAutoSignUp = authProxy.Key("auto_sign_up").MustBool(true)
-	cfg.AuthProxyEnableLoginToken = authProxy.Key("enable_login_token").MustBool(false)
-
-	cfg.AuthProxySyncTTL = authProxy.Key("sync_ttl").MustInt()
-
-	cfg.AuthProxyWhitelist = valueAsString(authProxy, "whitelist", "")
+	// SSO Settings
+	ssoSettings := iniFile.Section("sso_settings")
+	cfg.SSOSettingsReloadInterval = ssoSettings.Key("reload_interval").MustDuration(1 * time.Minute)
+	providers := ssoSettings.Key("configurable_providers").String()
 
-	cfg.AuthProxyHeaders = make(map[string]string)
-	headers := valueAsString(authProxy, "headers", "")
-
-	for _, propertyAndHeader := range util.SplitString(headers) {
-		split := strings.SplitN(propertyAndHeader, ":", 2)
-		if len(split) == 2 {
-			cfg.AuthProxyHeaders[split[0]] = split[1]
-		}
+	cfg.SSOSettingsConfigurableProviders = make(map[string]bool)
+	for _, provider := range util.SplitString(providers) {
+		cfg.SSOSettingsConfigurableProviders[provider] = true
 	}
-
-	cfg.AuthProxyHeadersEncoded = authProxy.Key("headers_encoded").MustBool(false)
-
 	return nil
 }
 
@@ -1668,6 +1631,7 @@ func readAccessControlSettings(iniFile *ini.File, cfg *Cfg) {
 	cfg.RBACPermissionCache = rbac.Key("permission_cache").MustBool(true)
 	cfg.RBACPermissionValidationEnabled = rbac.Key("permission_validation_enabled").MustBool(false)
 	cfg.RBACResetBasicRoles = rbac.Key("reset_basic_roles").MustBool(false)
+	cfg.RBACSingleOrganization = rbac.Key("single_organization").MustBool(false)
 }
 
 func readOAuth2ServerSettings(cfg *Cfg) {
@@ -1679,28 +1643,31 @@ func readOAuth2ServerSettings(cfg *Cfg) {
 
 func readUserSettings(iniFile *ini.File, cfg *Cfg) error {
 	users := iniFile.Section("users")
-	AllowUserSignUp = users.Key("allow_sign_up").MustBool(true)
-	AllowUserOrgCreate = users.Key("allow_org_create").MustBool(true)
+	cfg.AllowUserSignUp = users.Key("allow_sign_up").MustBool(true)
+	cfg.AllowUserOrgCreate = users.Key("allow_org_create").MustBool(true)
 	cfg.AutoAssignOrg = users.Key("auto_assign_org").MustBool(true)
 	cfg.AutoAssignOrgId = users.Key("auto_assign_org_id").MustInt(1)
+	cfg.LoginDefaultOrgId = users.Key("login_default_org_id").MustInt64(-1)
 	cfg.AutoAssignOrgRole = users.Key("auto_assign_org_role").In(
 		string(roletype.RoleViewer), []string{
 			string(roletype.RoleNone),
 			string(roletype.RoleViewer),
 			string(roletype.RoleEditor),
 			string(roletype.RoleAdmin)})
-	VerifyEmailEnabled = users.Key("verify_email_enabled").MustBool(false)
+	cfg.VerifyEmailEnabled = users.Key("verify_email_enabled").MustBool(false)
 
-	cfg.CaseInsensitiveLogin = users.Key("case_insensitive_login").MustBool(true)
+	// Deprecated
+	// cfg.CaseInsensitiveLogin = users.Key("case_insensitive_login").MustBool(true)
+	cfg.CaseInsensitiveLogin = true
 
-	LoginHint = valueAsString(users, "login_hint", "")
-	PasswordHint = valueAsString(users, "password_hint", "")
+	cfg.LoginHint = valueAsString(users, "login_hint", "")
+	cfg.PasswordHint = valueAsString(users, "password_hint", "")
 	cfg.DefaultTheme = valueAsString(users, "default_theme", "")
 	cfg.DefaultLanguage = valueAsString(users, "default_language", "")
 	cfg.HomePage = valueAsString(users, "home_page", "")
-	ExternalUserMngLinkUrl = valueAsString(users, "external_manage_link_url", "")
-	ExternalUserMngLinkName = valueAsString(users, "external_manage_link_name", "")
-	ExternalUserMngInfo = valueAsString(users, "external_manage_info", "")
+	cfg.ExternalUserMngLinkUrl = valueAsString(users, "external_manage_link_url", "")
+	cfg.ExternalUserMngLinkName = valueAsString(users, "external_manage_link_name", "")
+	cfg.ExternalUserMngInfo = valueAsString(users, "external_manage_info", "")
 
 	cfg.ViewersCanEdit = users.Key("viewers_can_edit").MustBool(false)
 	cfg.EditorsCanAdmin = users.Key("editors_can_admin").MustBool(false)
@@ -1725,6 +1692,13 @@ func readUserSettings(iniFile *ini.File, cfg *Cfg) error {
 		}
 	}
 
+	verificationEmailMaxLifetimeVal := valueAsString(users, "verification_email_max_lifetime_duration", "1h")
+	verificationEmailMaxLifetimeDuration, err := gtime.ParseDuration(verificationEmailMaxLifetimeVal)
+	if err != nil {
+		return err
+	}
+	cfg.VerificationEmailMaxLifetime = verificationEmailMaxLifetimeDuration
+
 	return nil
 }
 
@@ -1756,32 +1730,24 @@ func (cfg *Cfg) readRenderingSettings(iniFile *ini.File) error {
 
 	cfg.RendererConcurrentRequestLimit = renderSec.Key("concurrent_render_request_limit").MustInt(30)
 	cfg.RendererRenderKeyLifeTime = renderSec.Key("render_key_lifetime").MustDuration(5 * time.Minute)
+	cfg.RendererDefaultImageWidth = renderSec.Key("default_image_width").MustInt(1000)
+	cfg.RendererDefaultImageHeight = renderSec.Key("default_image_height").MustInt(500)
+	cfg.RendererDefaultImageScale = renderSec.Key("default_image_scale").MustFloat64(1)
 	cfg.ImagesDir = filepath.Join(cfg.DataPath, "png")
 	cfg.CSVsDir = filepath.Join(cfg.DataPath, "csv")
+	cfg.PDFsDir = filepath.Join(cfg.DataPath, "pdf")
 
 	return nil
 }
 
-func readAlertingSettings(iniFile *ini.File) error {
+func (cfg *Cfg) readAlertingSettings(iniFile *ini.File) error {
+	// This check is kept to prevent users that upgrade to Grafana 11 with the legacy alerting enabled. This should prevent them from accidentally upgrading without migration to Unified Alerting.
 	alerting := iniFile.Section("alerting")
 	enabled, err := alerting.Key("enabled").Bool()
-	AlertingEnabled = nil
-	if err == nil {
-		AlertingEnabled = &enabled
+	if err == nil && enabled {
+		cfg.Logger.Error("Option '[alerting].enabled' cannot be true. Legacy Alerting is removed. It is no longer deployed, enhanced, or supported. Delete '[alerting].enabled' and use '[unified_alerting].enabled' to enable Grafana Alerting. For more information, refer to the documentation on upgrading to Grafana Alerting (https://grafana.com/docs/grafana/v10.4/alerting/set-up/migrating-alerts)")
+		return fmt.Errorf("invalid setting [alerting].enabled")
 	}
-	ExecuteAlerts = alerting.Key("execute_alerts").MustBool(true)
-	AlertingRenderLimit = alerting.Key("concurrent_render_limit").MustInt(5)
-
-	AlertingErrorOrTimeout = valueAsString(alerting, "error_or_timeout", "alerting")
-	AlertingNoDataOrNullValues = valueAsString(alerting, "nodata_or_nullvalues", "no_data")
-
-	evaluationTimeoutSeconds := alerting.Key("evaluation_timeout_seconds").MustInt64(30)
-	AlertingEvaluationTimeout = time.Second * time.Duration(evaluationTimeoutSeconds)
-	notificationTimeoutSeconds := alerting.Key("notification_timeout_seconds").MustInt64(30)
-	AlertingNotificationTimeout = time.Second * time.Duration(notificationTimeoutSeconds)
-	AlertingMaxAttempts = alerting.Key("max_attempts").MustInt(3)
-	AlertingMinInterval = alerting.Key("min_interval_seconds").MustInt64(1)
-
 	return nil
 }
 
@@ -1847,12 +1813,6 @@ func readGRPCServerSettings(cfg *Cfg, iniFile *ini.File) error {
 	return nil
 }
 
-// IsLegacyAlertingEnabled returns whether the legacy alerting is enabled or not.
-// It's safe to be used only after readAlertingSettings() and ReadUnifiedAlertingSettings() are executed.
-func IsLegacyAlertingEnabled() bool {
-	return AlertingEnabled != nil && *AlertingEnabled
-}
-
 func readSnapshotsSettings(cfg *Cfg, iniFile *ini.File) error {
 	snapshots := iniFile.Section("snapshots")
 
@@ -1875,12 +1835,12 @@ func (cfg *Cfg) readServerSettings(iniFile *ini.File) error {
 	if err != nil {
 		return err
 	}
-	ServeFromSubPath = server.Key("serve_from_sub_path").MustBool(false)
 
 	cfg.AppURL = AppUrl
 	cfg.AppSubURL = AppSubUrl
-	cfg.ServeFromSubPath = ServeFromSubPath
 	cfg.Protocol = HTTPScheme
+	cfg.ServeFromSubPath = server.Key("serve_from_sub_path").MustBool(false)
+	cfg.CertWatchInterval = server.Key("certs_watch_interval").MustDuration(0)
 
 	protocolStr := valueAsString(server, "protocol", "http")
 
@@ -1914,8 +1874,7 @@ func (cfg *Cfg) readServerSettings(iniFile *ini.File) error {
 	cfg.EnableGzip = server.Key("enable_gzip").MustBool(false)
 	cfg.EnforceDomain = server.Key("enforce_domain").MustBool(false)
 	staticRoot := valueAsString(server, "static_root_path", "")
-	StaticRootPath = makeAbsolute(staticRoot, HomePath)
-	cfg.StaticRootPath = StaticRootPath
+	cfg.StaticRootPath = makeAbsolute(staticRoot, cfg.HomePath)
 
 	if err := cfg.validateStaticRootPath(); err != nil {
 		return err
@@ -1943,21 +1902,42 @@ func (cfg *Cfg) readServerSettings(iniFile *ini.File) error {
 }
 
 // GetContentDeliveryURL returns full content delivery URL with /<edition>/<version> added to URL
-func (cfg *Cfg) GetContentDeliveryURL(prefix string) string {
-	if cfg.CDNRootURL != nil {
-		url := *cfg.CDNRootURL
-		preReleaseFolder := ""
-
-		url.Path = path.Join(url.Path, prefix, preReleaseFolder, cfg.BuildVersion)
-		return url.String() + "/"
+func (cfg *Cfg) GetContentDeliveryURL(prefix string) (string, error) {
+	if cfg.CDNRootURL == nil {
+		return "", nil
 	}
+	if cfg.BuildVersion == "" {
+		return "", errors.New("BuildVersion is not set")
+	}
+	url := *cfg.CDNRootURL
 
-	return ""
+	url.Path = path.Join(url.Path, prefix, cfg.BuildVersion)
+	return url.String() + "/", nil
 }
 
 func (cfg *Cfg) readDataSourcesSettings() {
 	datasources := cfg.Raw.Section("datasources")
 	cfg.DataSourceLimit = datasources.Key("datasource_limit").MustInt(5000)
+	cfg.ConcurrentQueryCount = datasources.Key("concurrent_query_count").MustInt(10)
+}
+
+func (cfg *Cfg) readDataSourceSecuritySettings() {
+	datasources := cfg.Raw.Section("datasources.ip_range_security")
+	cfg.IPRangeACEnabled = datasources.Key("enabled").MustBool(false)
+	cfg.IPRangeACSecretKey = datasources.Key("secret_key").MustString("")
+	if cfg.IPRangeACEnabled && cfg.IPRangeACSecretKey == "" {
+		cfg.Logger.Error("IP range access control is enabled but no secret key is set")
+	}
+	allowedURLString := datasources.Key("allow_list").MustString("")
+	for _, urlString := range util.SplitString(allowedURLString) {
+		allowedURL, err := url.Parse(urlString)
+		if err != nil {
+			cfg.Logger.Error("Error parsing allowed URL for IP range access control", "error", err)
+			continue
+		} else {
+			cfg.IPRangeACAllowedURLs = append(cfg.IPRangeACAllowedURLs, allowedURL)
+		}
+	}
 }
 
 func (cfg *Cfg) readSqlDataSourceSettings() {
@@ -2011,3 +1991,8 @@ func (cfg *Cfg) readLiveSettings(iniFile *ini.File) error {
 	cfg.LiveAllowedOrigins = originPatterns
 	return nil
 }
+
+func (cfg *Cfg) readPublicDashboardsSettings() {
+	publicDashboards := cfg.Raw.Section("public_dashboards")
+	cfg.PublicDashboardsEnabled = publicDashboards.Key("enabled").MustBool(true)
+}
diff --git a/pkg/setting/setting_auth_proxy.go b/pkg/setting/setting_auth_proxy.go
new file mode 100644
index 0000000000000..36d300e78e92a
--- /dev/null
+++ b/pkg/setting/setting_auth_proxy.go
@@ -0,0 +1,45 @@
+package setting
+
+import (
+	"strings"
+
+	"github.com/grafana/grafana/pkg/util"
+)
+
+type AuthProxySettings struct {
+	// Auth Proxy
+	Enabled          bool
+	HeaderName       string
+	HeaderProperty   string
+	AutoSignUp       bool
+	EnableLoginToken bool
+	Whitelist        string
+	Headers          map[string]string
+	HeadersEncoded   bool
+	SyncTTL          int
+}
+
+func (cfg *Cfg) readAuthProxySettings() {
+	authProxySettings := AuthProxySettings{}
+	authProxy := cfg.Raw.Section("auth.proxy")
+	authProxySettings.Enabled = authProxy.Key("enabled").MustBool(false)
+	authProxySettings.HeaderName = valueAsString(authProxy, "header_name", "")
+	authProxySettings.HeaderProperty = valueAsString(authProxy, "header_property", "")
+	authProxySettings.AutoSignUp = authProxy.Key("auto_sign_up").MustBool(true)
+	authProxySettings.EnableLoginToken = authProxy.Key("enable_login_token").MustBool(false)
+	authProxySettings.SyncTTL = authProxy.Key("sync_ttl").MustInt(15)
+	authProxySettings.Whitelist = valueAsString(authProxy, "whitelist", "")
+	authProxySettings.Headers = make(map[string]string)
+	headers := valueAsString(authProxy, "headers", "")
+
+	for _, propertyAndHeader := range util.SplitString(headers) {
+		split := strings.SplitN(propertyAndHeader, ":", 2)
+		if len(split) == 2 {
+			authProxySettings.Headers[split[0]] = split[1]
+		}
+	}
+
+	authProxySettings.HeadersEncoded = authProxy.Key("headers_encoded").MustBool(false)
+
+	cfg.AuthProxy = authProxySettings
+}
diff --git a/pkg/setting/setting_azure.go b/pkg/setting/setting_azure.go
index ec1c079ba535b..dc50750ccdf73 100644
--- a/pkg/setting/setting_azure.go
+++ b/pkg/setting/setting_azure.go
@@ -1,13 +1,18 @@
 package setting
 
 import (
-	"github.com/grafana/grafana-azure-sdk-go/azsettings"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
+	"github.com/grafana/grafana/pkg/util"
 )
 
 func (cfg *Cfg) readAzureSettings() {
 	azureSettings := &azsettings.AzureSettings{}
 
 	azureSection := cfg.Raw.Section("azure")
+	authSection := cfg.Raw.Section("auth")
+
+	// This setting is specific to Prometheus
+	azureSettings.AzureAuthEnabled = authSection.Key("azure_auth_enabled").MustBool(false)
 
 	// Cloud
 	cloudName := azureSection.Key("cloud").MustString(azsettings.AzurePublic)
@@ -61,7 +66,10 @@ func (cfg *Cfg) readAzureSettings() {
 		}
 
 		azureSettings.UserIdentityTokenEndpoint = tokenEndpointSettings
+		azureSettings.UserIdentityFallbackCredentialsEnabled = azureSection.Key("user_identity_fallback_credentials_enabled").MustBool(true)
 	}
 
+	azureSettings.ForwardSettingsPlugins = util.SplitString(azureSection.Key("forward_settings_to_plugins").String())
+
 	cfg.Azure = azureSettings
 }
diff --git a/pkg/setting/setting_azure_test.go b/pkg/setting/setting_azure_test.go
index a7ec9df6f981b..6dd67f7313fb3 100644
--- a/pkg/setting/setting_azure_test.go
+++ b/pkg/setting/setting_azure_test.go
@@ -3,7 +3,7 @@ package setting
 import (
 	"testing"
 
-	"github.com/grafana/grafana-azure-sdk-go/azsettings"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -64,6 +64,27 @@ func TestAzureSettings(t *testing.T) {
 		}
 	})
 
+	t.Run("prometheus", func(t *testing.T) {
+		t.Run("should enable azure auth", func(t *testing.T) {
+			cfg := NewCfg()
+
+			authSection, err := cfg.Raw.NewSection("auth")
+			require.NoError(t, err)
+			_, err = authSection.NewKey("azure_auth_enabled", "true")
+			require.NoError(t, err)
+
+			cfg.readAzureSettings()
+			require.NotNil(t, cfg.Azure.AzureAuthEnabled)
+			assert.True(t, cfg.Azure.AzureAuthEnabled)
+		})
+		t.Run("should default to disabled", func(t *testing.T) {
+			cfg := NewCfg()
+
+			cfg.readAzureSettings()
+			require.NotNil(t, cfg.Azure.AzureAuthEnabled)
+			assert.False(t, cfg.Azure.AzureAuthEnabled)
+		})
+	})
 	t.Run("User Identity", func(t *testing.T) {
 		t.Run("should be disabled by default", func(t *testing.T) {
 			cfg := NewCfg()
@@ -88,6 +109,32 @@ func TestAzureSettings(t *testing.T) {
 
 			assert.True(t, cfg.Azure.UserIdentityEnabled)
 		})
+		t.Run("enables service credentials by default", func(t *testing.T) {
+			cfg := NewCfg()
+
+			azureSection, err := cfg.Raw.NewSection("azure")
+			require.NoError(t, err)
+			_, err = azureSection.NewKey("user_identity_enabled", "true")
+			require.NoError(t, err)
+
+			cfg.readAzureSettings()
+
+			assert.True(t, cfg.Azure.UserIdentityFallbackCredentialsEnabled)
+		})
+		t.Run("disables service credentials", func(t *testing.T) {
+			cfg := NewCfg()
+
+			azureSection, err := cfg.Raw.NewSection("azure")
+			require.NoError(t, err)
+			_, err = azureSection.NewKey("user_identity_enabled", "true")
+			require.NoError(t, err)
+			_, err = azureSection.NewKey("user_identity_fallback_credentials_enabled", "false")
+			require.NoError(t, err)
+
+			cfg.readAzureSettings()
+
+			assert.False(t, cfg.Azure.UserIdentityFallbackCredentialsEnabled)
+		})
 
 		t.Run("should use token endpoint from Azure AD if enabled", func(t *testing.T) {
 			cfg := NewCfg()
@@ -215,4 +262,34 @@ func TestAzureSettings(t *testing.T) {
 			assert.Empty(t, cfg.Azure.UserIdentityTokenEndpoint.ClientSecret)
 		})
 	})
+
+	t.Run("forward settings to plugins", func(t *testing.T) {
+		testCases := []struct {
+			name            string
+			configuredValue string
+			resolvedValue   []string
+		}{
+			{
+				name:            "should be set to user plugins if set",
+				configuredValue: "test-datasource",
+				resolvedValue:   []string{"test-datasource"},
+			},
+		}
+
+		for _, c := range testCases {
+			t.Run(c.name, func(t *testing.T) {
+				cfg := NewCfg()
+
+				azureSection, err := cfg.Raw.NewSection("azure")
+				require.NoError(t, err)
+				_, err = azureSection.NewKey("forward_settings_to_plugins", c.configuredValue)
+				require.NoError(t, err)
+
+				cfg.readAzureSettings()
+				require.NotNil(t, cfg.Azure)
+
+				assert.Equal(t, c.resolvedValue, cfg.Azure.ForwardSettingsPlugins)
+			})
+		}
+	})
 }
diff --git a/pkg/setting/setting_cloud_migration.go b/pkg/setting/setting_cloud_migration.go
new file mode 100644
index 0000000000000..7519ae535b71c
--- /dev/null
+++ b/pkg/setting/setting_cloud_migration.go
@@ -0,0 +1,28 @@
+package setting
+
+import (
+	"time"
+)
+
+type CloudMigrationSettings struct {
+	IsTarget                  bool
+	GcomAPIToken              string
+	FetchInstanceTimeout      time.Duration
+	CreateAccessPolicyTimeout time.Duration
+	FetchAccessPolicyTimeout  time.Duration
+	DeleteAccessPolicyTimeout time.Duration
+	CreateTokenTimeout        time.Duration
+	TokenExpiresAfter         time.Duration
+}
+
+func (cfg *Cfg) readCloudMigrationSettings() {
+	cloudMigration := cfg.Raw.Section("cloud_migration")
+	cfg.CloudMigration.IsTarget = cloudMigration.Key("is_target").MustBool(false)
+	cfg.CloudMigration.GcomAPIToken = cloudMigration.Key("gcom_api_token").MustString("")
+	cfg.CloudMigration.FetchInstanceTimeout = cloudMigration.Key("fetch_instance_timeout").MustDuration(5 * time.Second)
+	cfg.CloudMigration.CreateAccessPolicyTimeout = cloudMigration.Key("create_access_policy_timeout").MustDuration(5 * time.Second)
+	cfg.CloudMigration.FetchAccessPolicyTimeout = cloudMigration.Key("fetch_access_policy_timeout").MustDuration(5 * time.Second)
+	cfg.CloudMigration.DeleteAccessPolicyTimeout = cloudMigration.Key("delete_access_policy_timeout").MustDuration(5 * time.Second)
+	cfg.CloudMigration.CreateTokenTimeout = cloudMigration.Key("create_token_timeout").MustDuration(5 * time.Second)
+	cfg.CloudMigration.TokenExpiresAfter = cloudMigration.Key("token_expires_after").MustDuration(7 * 24 * time.Hour)
+}
diff --git a/pkg/setting/setting_data_proxy.go b/pkg/setting/setting_data_proxy.go
index f86b4089e3edf..5dd31676e7418 100644
--- a/pkg/setting/setting_data_proxy.go
+++ b/pkg/setting/setting_data_proxy.go
@@ -12,8 +12,8 @@ func readDataProxySettings(iniFile *ini.File, cfg *Cfg) error {
 	dataproxy := iniFile.Section("dataproxy")
 	cfg.SendUserHeader = dataproxy.Key("send_user_header").MustBool(false)
 	cfg.DataProxyLogging = dataproxy.Key("logging").MustBool(false)
-	cfg.DataProxyTimeout = dataproxy.Key("timeout").MustInt(10)
-	cfg.DataProxyDialTimeout = dataproxy.Key("dialTimeout").MustInt(30)
+	cfg.DataProxyTimeout = dataproxy.Key("timeout").MustInt(30)
+	cfg.DataProxyDialTimeout = dataproxy.Key("dialTimeout").MustInt(10)
 	cfg.DataProxyKeepAlive = dataproxy.Key("keep_alive_seconds").MustInt(30)
 	cfg.DataProxyTLSHandshakeTimeout = dataproxy.Key("tls_handshake_timeout_seconds").MustInt(10)
 	cfg.DataProxyExpectContinueTimeout = dataproxy.Key("expect_continue_timeout_seconds").MustInt(1)
diff --git a/pkg/setting/setting_feature_toggles.go b/pkg/setting/setting_feature_toggles.go
index a29f24adab362..e09b45e9edb8b 100644
--- a/pkg/setting/setting_feature_toggles.go
+++ b/pkg/setting/setting_feature_toggles.go
@@ -8,13 +8,14 @@ import (
 	"github.com/grafana/grafana/pkg/util"
 )
 
-// @deprecated -- should use `featuremgmt.FeatureToggles`
+// Deprecated: should use `featuremgmt.FeatureToggles`
 func (cfg *Cfg) readFeatureToggles(iniFile *ini.File) error {
 	section := iniFile.Section("feature_toggles")
 	toggles, err := ReadFeatureTogglesFromInitFile(section)
 	if err != nil {
 		return err
 	}
+	// nolint:staticcheck
 	cfg.IsFeatureToggleEnabled = func(key string) bool { return toggles[key] }
 	return nil
 }
diff --git a/pkg/setting/setting_grafana_javascript_agent.go b/pkg/setting/setting_grafana_javascript_agent.go
index cfc04d5136dc9..a623bd242ae14 100644
--- a/pkg/setting/setting_grafana_javascript_agent.go
+++ b/pkg/setting/setting_grafana_javascript_agent.go
@@ -8,6 +8,7 @@ type GrafanaJavascriptAgent struct {
 	ErrorInstrumentalizationEnabled     bool   `json:"errorInstrumentalizationEnabled"`
 	ConsoleInstrumentalizationEnabled   bool   `json:"consoleInstrumentalizationEnabled"`
 	WebVitalsInstrumentalizationEnabled bool   `json:"webVitalsInstrumentalizationEnabled"`
+	InternalLoggerLevel                 int    `json:"internalLoggerLevel"`
 	ApiKey                              string `json:"apiKey"`
 }
 
@@ -21,6 +22,7 @@ func (cfg *Cfg) readGrafanaJavascriptAgentConfig() {
 		ErrorInstrumentalizationEnabled:     raw.Key("instrumentations_errors_enabled").MustBool(true),
 		ConsoleInstrumentalizationEnabled:   raw.Key("instrumentations_console_enabled").MustBool(true),
 		WebVitalsInstrumentalizationEnabled: raw.Key("instrumentations_webvitals_enabled").MustBool(true),
+		InternalLoggerLevel:                 raw.Key("internal_logger_level").MustInt(0),
 		ApiKey:                              raw.Key("api_key").String(),
 	}
 }
diff --git a/pkg/setting/setting_jwt.go b/pkg/setting/setting_jwt.go
new file mode 100644
index 0000000000000..ec645bbc4e7f3
--- /dev/null
+++ b/pkg/setting/setting_jwt.go
@@ -0,0 +1,52 @@
+package setting
+
+import "time"
+
+type AuthJWTSettings struct {
+	// JWT Auth
+	Enabled                 bool
+	HeaderName              string
+	URLLogin                bool
+	EmailClaim              string
+	UsernameClaim           string
+	ExpectClaims            string
+	JWKSetURL               string
+	CacheTTL                time.Duration
+	KeyFile                 string
+	KeyID                   string
+	JWKSetFile              string
+	AutoSignUp              bool
+	RoleAttributePath       string
+	RoleAttributeStrict     bool
+	AllowAssignGrafanaAdmin bool
+	SkipOrgRoleSync         bool
+	GroupsAttributePath     string
+	EmailAttributePath      string
+	UsernameAttributePath   string
+}
+
+func (cfg *Cfg) readAuthJWTSettings() {
+	jwtSettings := AuthJWTSettings{}
+	authJWT := cfg.Raw.Section("auth.jwt")
+	jwtSettings.Enabled = authJWT.Key("enabled").MustBool(false)
+	jwtSettings.HeaderName = valueAsString(authJWT, "header_name", "")
+	jwtSettings.URLLogin = authJWT.Key("url_login").MustBool(false)
+	jwtSettings.EmailClaim = valueAsString(authJWT, "email_claim", "")
+	jwtSettings.UsernameClaim = valueAsString(authJWT, "username_claim", "")
+	jwtSettings.ExpectClaims = valueAsString(authJWT, "expect_claims", "{}")
+	jwtSettings.JWKSetURL = valueAsString(authJWT, "jwk_set_url", "")
+	jwtSettings.CacheTTL = authJWT.Key("cache_ttl").MustDuration(time.Minute * 60)
+	jwtSettings.KeyFile = valueAsString(authJWT, "key_file", "")
+	jwtSettings.KeyID = authJWT.Key("key_id").MustString("")
+	jwtSettings.JWKSetFile = valueAsString(authJWT, "jwk_set_file", "")
+	jwtSettings.AutoSignUp = authJWT.Key("auto_sign_up").MustBool(false)
+	jwtSettings.RoleAttributePath = valueAsString(authJWT, "role_attribute_path", "")
+	jwtSettings.RoleAttributeStrict = authJWT.Key("role_attribute_strict").MustBool(false)
+	jwtSettings.AllowAssignGrafanaAdmin = authJWT.Key("allow_assign_grafana_admin").MustBool(false)
+	jwtSettings.SkipOrgRoleSync = authJWT.Key("skip_org_role_sync").MustBool(false)
+	jwtSettings.GroupsAttributePath = valueAsString(authJWT, "groups_attribute_path", "")
+	jwtSettings.EmailAttributePath = valueAsString(authJWT, "email_attribute_path", "")
+	jwtSettings.UsernameAttributePath = valueAsString(authJWT, "username_attribute_path", "")
+
+	cfg.JWTAuth = jwtSettings
+}
diff --git a/pkg/setting/setting_plugins.go b/pkg/setting/setting_plugins.go
index de2e047289f42..636ad5753f344 100644
--- a/pkg/setting/setting_plugins.go
+++ b/pkg/setting/setting_plugins.go
@@ -4,6 +4,8 @@ import (
 	"strings"
 
 	"gopkg.in/ini.v1"
+
+	"github.com/grafana/grafana/pkg/util"
 )
 
 // PluginSettings maps plugin id to map of key/value settings.
@@ -33,31 +35,17 @@ func (cfg *Cfg) readPluginSettings(iniFile *ini.File) error {
 	cfg.PluginSkipPublicKeyDownload = pluginsSection.Key("public_key_retrieval_disabled").MustBool(false)
 	cfg.PluginForcePublicKeyDownload = pluginsSection.Key("public_key_retrieval_on_startup").MustBool(false)
 
-	pluginsAllowUnsigned := pluginsSection.Key("allow_loading_unsigned_plugins").MustString("")
-
-	for _, plug := range strings.Split(pluginsAllowUnsigned, ",") {
-		plug = strings.TrimSpace(plug)
-		cfg.PluginsAllowUnsigned = append(cfg.PluginsAllowUnsigned, plug)
-	}
-
-	disablePlugins := pluginsSection.Key("disable_plugins").MustString("")
-	for _, plug := range strings.Split(disablePlugins, ",") {
-		plug = strings.TrimSpace(plug)
-		if plug != "" {
-			cfg.DisablePlugins = append(cfg.DisablePlugins, plug)
-		}
-	}
+	cfg.PluginsAllowUnsigned = util.SplitString(pluginsSection.Key("allow_loading_unsigned_plugins").MustString(""))
+	cfg.DisablePlugins = util.SplitString(pluginsSection.Key("disable_plugins").MustString(""))
+	cfg.HideAngularDeprecation = util.SplitString(pluginsSection.Key("hide_angular_deprecation").MustString(""))
+	cfg.ForwardHostEnvVars = util.SplitString(pluginsSection.Key("forward_host_env_vars").MustString(""))
 
 	cfg.PluginCatalogURL = pluginsSection.Key("plugin_catalog_url").MustString("https://grafana.com/grafana/plugins/")
 	cfg.PluginAdminEnabled = pluginsSection.Key("plugin_admin_enabled").MustBool(true)
 	cfg.PluginAdminExternalManageEnabled = pluginsSection.Key("plugin_admin_external_manage_enabled").MustBool(false)
-	catalogHiddenPlugins := pluginsSection.Key("plugin_catalog_hidden_plugins").MustString("")
+	cfg.PluginCatalogHiddenPlugins = util.SplitString(pluginsSection.Key("plugin_catalog_hidden_plugins").MustString(""))
 
-	for _, plug := range strings.Split(catalogHiddenPlugins, ",") {
-		plug = strings.TrimSpace(plug)
-		cfg.PluginCatalogHiddenPlugins = append(cfg.PluginCatalogHiddenPlugins, plug)
-	}
-	// Pull disablep plugins from the catalog
+	// Pull disabled plugins from the catalog
 	cfg.PluginCatalogHiddenPlugins = append(cfg.PluginCatalogHiddenPlugins, cfg.DisablePlugins...)
 
 	// Plugins CDN settings
diff --git a/pkg/setting/setting_plugins_test.go b/pkg/setting/setting_plugins_test.go
index 781cdfbb05e38..6ca5e0cc6925a 100644
--- a/pkg/setting/setting_plugins_test.go
+++ b/pkg/setting/setting_plugins_test.go
@@ -1,6 +1,7 @@
 package setting
 
 import (
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -43,18 +44,55 @@ func TestPluginSettings(t *testing.T) {
 }
 
 func Test_readPluginSettings(t *testing.T) {
-	t.Run("should parse disable_plugins", func(t *testing.T) {
-		cfg := NewCfg()
-		sec, err := cfg.Raw.NewSection("plugins")
-		require.NoError(t, err)
-		_, err = sec.NewKey("disable_plugins", "plugin1,plugin2")
-		require.NoError(t, err)
-		_, err = sec.NewKey("plugin_catalog_hidden_plugins", "plugin3")
-		require.NoError(t, err)
-
-		err = cfg.readPluginSettings(cfg.Raw)
-		require.NoError(t, err)
-		require.Equal(t, []string{"plugin1", "plugin2"}, cfg.DisablePlugins)
-		require.Equal(t, []string{"plugin3", "plugin1", "plugin2"}, cfg.PluginCatalogHiddenPlugins)
+	t.Run("should parse separated plugin ids", func(t *testing.T) {
+		for _, tc := range []struct {
+			name string
+			f    func(ids ...string) string
+		}{
+			{
+				name: "commas",
+				f: func(ids ...string) string {
+					return strings.Join(ids, ",")
+				},
+			},
+			{
+				name: "commas and a space",
+				f: func(ids ...string) string {
+					return strings.Join(ids, ", ")
+				},
+			},
+			{
+				name: "spaces",
+				f: func(ids ...string) string {
+					return strings.Join(ids, " ")
+				},
+			},
+			{
+				name: "json-like",
+				f: func(ids ...string) string {
+					return `["` + strings.Join(ids, `","`) + `"]`
+				},
+			},
+		} {
+			t.Run(tc.name, func(t *testing.T) {
+				cfg := NewCfg()
+				sec, err := cfg.Raw.NewSection("plugins")
+				require.NoError(t, err)
+				_, err = sec.NewKey("disable_plugins", tc.f("plugin1", "plugin2"))
+				require.NoError(t, err)
+
+				_, err = sec.NewKey("plugin_catalog_hidden_plugins", tc.f("plugin3"))
+				require.NoError(t, err)
+
+				_, err = sec.NewKey("hide_angular_deprecation", tc.f("a", "b", "c"))
+				require.NoError(t, err)
+
+				err = cfg.readPluginSettings(cfg.Raw)
+				require.NoError(t, err)
+				require.Equal(t, []string{"plugin1", "plugin2"}, cfg.DisablePlugins)
+				require.Equal(t, []string{"plugin3", "plugin1", "plugin2"}, cfg.PluginCatalogHiddenPlugins)
+				require.Equal(t, []string{"a", "b", "c"}, cfg.HideAngularDeprecation)
+			})
+		}
 	})
 }
diff --git a/pkg/setting/setting_quota.go b/pkg/setting/setting_quota.go
index 5011cd6361fda..f35cb29411c48 100644
--- a/pkg/setting/setting_quota.go
+++ b/pkg/setting/setting_quota.go
@@ -36,19 +36,13 @@ func (cfg *Cfg) readQuotaSettings() {
 	quota := cfg.Raw.Section("quota")
 	cfg.Quota.Enabled = quota.Key("enabled").MustBool(false)
 
-	var alertOrgQuota int64
-	var alertGlobalQuota int64
-	if cfg.UnifiedAlerting.IsEnabled() {
-		alertOrgQuota = quota.Key("org_alert_rule").MustInt64(100)
-		alertGlobalQuota = quota.Key("global_alert_rule").MustInt64(-1)
-	}
 	// per ORG Limits
 	cfg.Quota.Org = OrgQuota{
 		User:       quota.Key("org_user").MustInt64(10),
 		DataSource: quota.Key("org_data_source").MustInt64(10),
 		Dashboard:  quota.Key("org_dashboard").MustInt64(10),
 		ApiKey:     quota.Key("org_api_key").MustInt64(10),
-		AlertRule:  alertOrgQuota,
+		AlertRule:  quota.Key("org_alert_rule").MustInt64(100),
 	}
 
 	// per User limits
@@ -65,7 +59,7 @@ func (cfg *Cfg) readQuotaSettings() {
 		ApiKey:       quota.Key("global_api_key").MustInt64(-1),
 		Session:      quota.Key("global_session").MustInt64(-1),
 		File:         quota.Key("global_file").MustInt64(-1),
-		AlertRule:    alertGlobalQuota,
+		AlertRule:    quota.Key("global_alert_rule").MustInt64(-1),
 		Correlations: quota.Key("global_correlations").MustInt64(-1),
 	}
 }
diff --git a/pkg/setting/setting_secure_socks_proxy.go b/pkg/setting/setting_secure_socks_proxy.go
index 41689d4ef022f..6e034cfa313b7 100644
--- a/pkg/setting/setting_secure_socks_proxy.go
+++ b/pkg/setting/setting_secure_socks_proxy.go
@@ -1,46 +1,97 @@
 package setting
 
 import (
+	"encoding/pem"
 	"errors"
+	"os"
 
 	"gopkg.in/ini.v1"
 )
 
 type SecureSocksDSProxySettings struct {
-	Enabled      bool
-	ShowUI       bool
-	ClientCert   string
-	ClientKey    string
-	RootCA       string
-	ProxyAddress string
-	ServerName   string
+	Enabled            bool
+	ShowUI             bool
+	AllowInsecure      bool
+	ClientCert         string
+	ClientCertFilePath string
+	ClientKey          string
+	ClientKeyFilePath  string
+	RootCAs            []string
+	RootCAFilePaths    []string
+	ProxyAddress       string
+	ServerName         string
 }
 
 func readSecureSocksDSProxySettings(iniFile *ini.File) (SecureSocksDSProxySettings, error) {
-	s := SecureSocksDSProxySettings{}
+	s := SecureSocksDSProxySettings{
+		RootCAs:         []string{},
+		RootCAFilePaths: []string{},
+	}
 	secureSocksProxySection := iniFile.Section("secure_socks_datasource_proxy")
 	s.Enabled = secureSocksProxySection.Key("enabled").MustBool(false)
-	s.ClientCert = secureSocksProxySection.Key("client_cert").MustString("")
-	s.ClientKey = secureSocksProxySection.Key("client_key").MustString("")
-	s.RootCA = secureSocksProxySection.Key("root_ca_cert").MustString("")
 	s.ProxyAddress = secureSocksProxySection.Key("proxy_address").MustString("")
 	s.ServerName = secureSocksProxySection.Key("server_name").MustString("")
 	s.ShowUI = secureSocksProxySection.Key("show_ui").MustBool(true)
+	s.AllowInsecure = secureSocksProxySection.Key("allow_insecure").MustBool(false)
+	s.ClientCertFilePath = secureSocksProxySection.Key("client_cert").MustString("")
+	s.ClientKeyFilePath = secureSocksProxySection.Key("client_key").MustString("")
+	s.RootCAFilePaths = secureSocksProxySection.Key("root_ca_cert").Strings(" ")
 
 	if !s.Enabled {
 		return s, nil
 	}
 
-	// all fields must be specified to use the proxy
-	if s.RootCA == "" {
-		return s, errors.New("rootCA required")
-	} else if s.ClientCert == "" || s.ClientKey == "" {
-		return s, errors.New("client key pair required")
-	} else if s.ServerName == "" {
-		return s, errors.New("server name required")
-	} else if s.ProxyAddress == "" {
+	if s.ProxyAddress == "" {
 		return s, errors.New("proxy address required")
 	}
 
+	// If the proxy is going to use TLS.
+	if !s.AllowInsecure {
+		// all fields must be specified to use the proxy
+		if len(s.RootCAFilePaths) == 0 {
+			return s, errors.New("one or more rootCA required")
+		} else if s.ClientCertFilePath == "" || s.ClientKeyFilePath == "" {
+			return s, errors.New("client key pair required")
+		} else if s.ServerName == "" {
+			return s, errors.New("server name required")
+		}
+	} else {
+		return s, nil
+	}
+
+	if s.ClientCertFilePath != "" {
+		certPEMBlock, err := os.ReadFile(s.ClientCertFilePath)
+		if err != nil {
+			return s, err
+		}
+		s.ClientCert = string(certPEMBlock)
+	}
+
+	if s.ClientKeyFilePath != "" {
+		keyPEMBlock, err := os.ReadFile(s.ClientKeyFilePath)
+		if err != nil {
+			return s, err
+		}
+		s.ClientKey = string(keyPEMBlock)
+	}
+
+	var rootCAs []string
+	for _, rootCAFile := range s.RootCAFilePaths {
+		// nolint:gosec
+		// The gosec G304 warning can be ignored because `rootCAFile` comes from config ini, and we check below if
+		// it's the right file type.
+		pemBytes, err := os.ReadFile(rootCAFile)
+		if err != nil {
+			return s, err
+		}
+
+		pemDecoded, _ := pem.Decode(pemBytes)
+		if pemDecoded == nil || pemDecoded.Type != "CERTIFICATE" {
+			return s, errors.New("root ca is invalid")
+		}
+		rootCAs = append(rootCAs, string(pemBytes))
+	}
+	s.RootCAs = rootCAs
+
 	return s, nil
 }
diff --git a/pkg/setting/setting_secure_socks_proxy_test.go b/pkg/setting/setting_secure_socks_proxy_test.go
new file mode 100644
index 0000000000000..c198f70a556f0
--- /dev/null
+++ b/pkg/setting/setting_secure_socks_proxy_test.go
@@ -0,0 +1,230 @@
+package setting
+
+import (
+	"bytes"
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/x509"
+	"crypto/x509/pkix"
+	"encoding/pem"
+	"errors"
+	"fmt"
+	"math/big"
+	"os"
+	"path/filepath"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"gopkg.in/ini.v1"
+)
+
+func TestReadSecureSocksDSProxySettings(t *testing.T) {
+	t.Parallel()
+
+	tempDir := t.TempDir()
+	testFilePath := filepath.Join(tempDir, "test")
+	testFileData := "foobar"
+	err := os.WriteFile(testFilePath, []byte(testFileData), 0600)
+	require.NoError(t, err)
+
+	rootCACertFilePath := filepath.Join(tempDir, "ca.cert")
+	// nolint:gosec
+	caCertFile, err := os.Create(rootCACertFilePath)
+	require.NoError(t, err)
+	defer func() {
+		err = caCertFile.Close()
+		require.NoError(t, err)
+	}()
+
+	rootCaFileData := createTestRootCAFile(t, rootCACertFilePath)
+	require.NoError(t, err)
+
+	cases := []struct {
+		description      string
+		iniFile          *ini.File
+		expectedSettings SecureSocksDSProxySettings
+		expectedErr      error
+	}{
+		{
+			description: "default values",
+			iniFile: mustNewIniFile(`
+		[secure_socks_datasource_proxy]
+		`),
+			expectedSettings: SecureSocksDSProxySettings{
+				Enabled:            false,
+				ShowUI:             true,
+				AllowInsecure:      false,
+				ClientCertFilePath: "",
+				ClientCert:         "",
+				ClientKey:          "",
+				ClientKeyFilePath:  "",
+				RootCAs:            []string{},
+				RootCAFilePaths:    []string{},
+				ProxyAddress:       "",
+				ServerName:         "",
+			},
+		},
+		{
+			description: "one or more root ca is required",
+			iniFile: mustNewIniFile(`
+[secure_socks_datasource_proxy]
+enabled = true
+proxy_address = address
+`),
+			expectedErr: errors.New("one or more rootCA required"),
+		},
+		{
+			description: "client cert is required",
+			iniFile: mustNewIniFile(`
+[secure_socks_datasource_proxy]
+enabled = true
+proxy_address = address
+root_ca_cert = cert
+`),
+			expectedErr: errors.New("client key pair required"),
+		},
+		{
+			description: "client key is required",
+			iniFile: mustNewIniFile(`
+[secure_socks_datasource_proxy]
+enabled = true
+proxy_address = address
+root_ca_cert = cert1
+client_cert = cert2
+`),
+			expectedErr: errors.New("client key pair required"),
+		},
+		{
+			description: "server name is required",
+			iniFile: mustNewIniFile(`
+[secure_socks_datasource_proxy]
+enabled = true
+proxy_address = address
+root_ca_cert = cert1
+client_cert = cert2
+client_key = key
+`),
+			expectedErr: errors.New("server name required"),
+		},
+		{
+			description: "proxy address is required",
+			iniFile: mustNewIniFile(`
+[secure_socks_datasource_proxy]
+enabled = true
+root_ca_cert = cert1
+client_cert = cert2
+client_key = key
+server_name = name
+`),
+			expectedErr: errors.New("proxy address required"),
+		},
+		{
+			description: "root ca, client cert and client key are not required in insecure more",
+			iniFile: mustNewIniFile(`
+[secure_socks_datasource_proxy]
+enabled = true
+proxy_address = address
+server_name = name
+allow_insecure = true
+`),
+			expectedSettings: SecureSocksDSProxySettings{
+				Enabled:         true,
+				ProxyAddress:    "address",
+				ServerName:      "name",
+				ShowUI:          true,
+				AllowInsecure:   true,
+				RootCAFilePaths: []string{},
+				RootCAs:         []string{},
+			},
+		},
+		{
+			description: "custom values",
+			iniFile: mustNewIniFile(fmt.Sprintf(`
+		[secure_socks_datasource_proxy]
+		enabled = true
+		client_cert = %s
+		client_key = %s
+		root_ca_cert = %s
+		proxy_address = proxy_address
+		server_name = server_name
+		show_ui = false
+		allow_insecure = false
+		`, testFilePath, testFilePath, rootCACertFilePath)),
+			expectedSettings: SecureSocksDSProxySettings{
+				Enabled:            true,
+				ShowUI:             false,
+				AllowInsecure:      false,
+				ClientCert:         testFileData,
+				ClientCertFilePath: testFilePath,
+				ClientKey:          testFileData,
+				ClientKeyFilePath:  testFilePath,
+				RootCAs:            []string{rootCaFileData},
+				RootCAFilePaths:    []string{rootCACertFilePath},
+				ProxyAddress:       "proxy_address",
+				ServerName:         "server_name",
+			},
+		},
+	}
+
+	for _, tt := range cases {
+		t.Run(tt.description, func(t *testing.T) {
+			settings, err := readSecureSocksDSProxySettings(tt.iniFile)
+
+			if tt.expectedErr != nil {
+				assert.Equal(t, tt.expectedErr, err)
+			} else {
+				assert.NoError(t, err)
+				assert.Equal(t, tt.expectedSettings, settings)
+			}
+		})
+	}
+}
+
+func createTestRootCAFile(t *testing.T, path string) string {
+	t.Helper()
+
+	ca := &x509.Certificate{
+		SerialNumber: big.NewInt(2019),
+		Subject: pkix.Name{
+			Organization: []string{"Grafana Labs"},
+			CommonName:   "Grafana",
+		},
+		NotBefore:             time.Now(),
+		NotAfter:              time.Now().AddDate(10, 0, 0),
+		IsCA:                  true,
+		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth},
+		KeyUsage:              x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
+		BasicConstraintsValid: true,
+	}
+	caPrivKey, err := rsa.GenerateKey(rand.Reader, 4096)
+	require.NoError(t, err)
+	caBytes, err := x509.CreateCertificate(rand.Reader, ca, ca, &caPrivKey.PublicKey, caPrivKey)
+	require.NoError(t, err)
+
+	// nolint:gosec
+	caCertFile, err := os.Create(path)
+	require.NoError(t, err)
+
+	block := &pem.Block{
+		Type:  "CERTIFICATE",
+		Bytes: caBytes,
+	}
+	err = pem.Encode(caCertFile, block)
+	require.NoError(t, err)
+
+	buf := new(bytes.Buffer)
+	err = pem.Encode(buf, block)
+	require.NoError(t, err)
+
+	return buf.String()
+}
+
+func mustNewIniFile(fileContents string) *ini.File {
+	file, err := ini.Load([]byte(fileContents))
+	if err != nil {
+		panic(fmt.Sprintf("creating ini file for test: %s", err))
+	}
+	return file
+}
diff --git a/pkg/setting/setting_smtp.go b/pkg/setting/setting_smtp.go
index a2a9a11d27ac1..dfcbe859dd572 100644
--- a/pkg/setting/setting_smtp.go
+++ b/pkg/setting/setting_smtp.go
@@ -1,6 +1,11 @@
 package setting
 
-import "github.com/grafana/grafana/pkg/util"
+import (
+	"fmt"
+	"regexp"
+
+	"github.com/grafana/grafana/pkg/util"
+)
 
 type SmtpSettings struct {
 	Enabled        bool
@@ -14,13 +19,18 @@ type SmtpSettings struct {
 	EhloIdentity   string
 	StartTLSPolicy string
 	SkipVerify     bool
+	StaticHeaders  map[string]string
+	EnableTracing  bool
 
 	SendWelcomeEmailOnSignUp bool
 	TemplatesPatterns        []string
 	ContentTypes             []string
 }
 
-func (cfg *Cfg) readSmtpSettings() {
+// validates mail headers
+var mailHeaderRegex = regexp.MustCompile(`^[A-Z][A-Za-z0-9]*(-[A-Z][A-Za-z0-9]*)*$`)
+
+func (cfg *Cfg) readSmtpSettings() error {
 	sec := cfg.Raw.Section("smtp")
 	cfg.Smtp.Enabled = sec.Key("enabled").MustBool(false)
 	cfg.Smtp.Host = sec.Key("host").String()
@@ -31,6 +41,9 @@ func (cfg *Cfg) readSmtpSettings() {
 	cfg.Smtp.FromAddress = sec.Key("from_address").String()
 	cfg.Smtp.FromName = sec.Key("from_name").String()
 	cfg.Smtp.EhloIdentity = sec.Key("ehlo_identity").String()
+	if cfg.Smtp.EhloIdentity == "" {
+		cfg.Smtp.EhloIdentity = cfg.InstanceName
+	}
 	cfg.Smtp.StartTLSPolicy = sec.Key("startTLS_policy").String()
 	cfg.Smtp.SkipVerify = sec.Key("skip_verify").MustBool(false)
 
@@ -38,4 +51,33 @@ func (cfg *Cfg) readSmtpSettings() {
 	cfg.Smtp.SendWelcomeEmailOnSignUp = emails.Key("welcome_email_on_sign_up").MustBool(false)
 	cfg.Smtp.TemplatesPatterns = util.SplitString(emails.Key("templates_pattern").MustString("emails/*.html, emails/*.txt"))
 	cfg.Smtp.ContentTypes = util.SplitString(emails.Key("content_types").MustString("text/html"))
+
+	// populate static headers
+	if err := cfg.readGrafanaSmtpStaticHeaders(); err != nil {
+		return err
+	}
+
+	cfg.Smtp.EnableTracing = sec.Key("enable_tracing").MustBool(false)
+
+	return nil
+}
+
+func validHeader(header string) bool {
+	return mailHeaderRegex.MatchString(header)
+}
+
+func (cfg *Cfg) readGrafanaSmtpStaticHeaders() error {
+	staticHeadersSection := cfg.Raw.Section("smtp.static_headers")
+	keys := staticHeadersSection.Keys()
+	cfg.Smtp.StaticHeaders = make(map[string]string, len(keys))
+
+	for _, key := range keys {
+		if !validHeader(key.Name()) {
+			return fmt.Errorf("header %q in [smtp.static_headers] configuration: must follow canonical MIME form", key.Name())
+		}
+
+		cfg.Smtp.StaticHeaders[key.Name()] = key.Value()
+	}
+
+	return nil
 }
diff --git a/pkg/setting/setting_smtp_test.go b/pkg/setting/setting_smtp_test.go
new file mode 100644
index 0000000000000..bdc6f3d03d612
--- /dev/null
+++ b/pkg/setting/setting_smtp_test.go
@@ -0,0 +1,93 @@
+package setting
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"gopkg.in/ini.v1"
+)
+
+func TestLoadSmtpStaticHeaders(t *testing.T) {
+	t.Run("will load valid headers", func(t *testing.T) {
+		f := ini.Empty()
+		cfg := NewCfg()
+		s, err := f.NewSection("smtp.static_headers")
+		require.NoError(t, err)
+		cfg.Raw = f
+		_, err = s.NewKey("Foo-Header", "foo_val")
+		require.NoError(t, err)
+		_, err = s.NewKey("Bar", "bar_val")
+		require.NoError(t, err)
+
+		err = cfg.readGrafanaSmtpStaticHeaders()
+		require.NoError(t, err)
+
+		assert.Equal(t, "foo_val", cfg.Smtp.StaticHeaders["Foo-Header"])
+		assert.Equal(t, "bar_val", cfg.Smtp.StaticHeaders["Bar"])
+	})
+
+	t.Run("will load no static headers into smtp config when section is defined but has no keys", func(t *testing.T) {
+		f := ini.Empty()
+		cfg := NewCfg()
+		_, err := f.NewSection("smtp.static_headers")
+		require.NoError(t, err)
+		cfg.Raw = f
+
+		err = cfg.readGrafanaSmtpStaticHeaders()
+		require.NoError(t, err)
+
+		assert.Empty(t, cfg.Smtp.StaticHeaders)
+	})
+
+	t.Run("will load no static headers into smtp config when section is not defined", func(t *testing.T) {
+		f := ini.Empty()
+		cfg := NewCfg()
+		cfg.Raw = f
+
+		err := cfg.readGrafanaSmtpStaticHeaders()
+		require.NoError(t, err)
+
+		assert.Empty(t, cfg.Smtp.StaticHeaders)
+	})
+
+	t.Run("will return error when header label is not in valid format", func(t *testing.T) {
+		f := ini.Empty()
+		cfg := NewCfg()
+		s, err := f.NewSection("smtp.static_headers")
+		require.NoError(t, err)
+		_, err = s.NewKey("header with spaces", "value")
+		require.NoError(t, err)
+		cfg.Raw = f
+
+		err = cfg.readGrafanaSmtpStaticHeaders()
+		require.Error(t, err)
+	})
+}
+
+func TestSmtpHeaderValidation(t *testing.T) {
+	testCases := []struct {
+		input    string
+		expected bool
+	}{
+		//valid
+		{"Foo", true},
+		{"Foo-Bar", true},
+		{"Foo123-Bar123", true},
+
+		//invalid
+		{"foo", false},
+		{"Foo Bar", false},
+		{"123Foo", false},
+		{"Foo.Bar", false},
+		{"foo-bar", false},
+		{"foo-Bar", false},
+		{"Foo-bar", false},
+		{"-Bar", false},
+		{"Foo--", false},
+	}
+
+	for _, tc := range testCases {
+		assert.Equal(t, validHeader(tc.input), tc.expected)
+	}
+}
diff --git a/pkg/setting/setting_test.go b/pkg/setting/setting_test.go
index 370505ed6668b..57bce42da71cc 100644
--- a/pkg/setting/setting_test.go
+++ b/pkg/setting/setting_test.go
@@ -2,19 +2,22 @@ package setting
 
 import (
 	"bufio"
-	"math/rand"
 	"net/url"
 	"os"
 	"path"
 	"path/filepath"
 	"runtime"
 	"strings"
+	"sync"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/ini.v1"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/util/osutil"
 )
 
 const (
@@ -54,13 +57,13 @@ func TestLoadingSettings(t *testing.T) {
 	})
 
 	t.Run("sample.ini should load successfully", func(t *testing.T) {
-		customInitPath := CustomInitPath
-		CustomInitPath = "conf/sample.ini"
+		oldCustomInitPath := customInitPath
+		customInitPath = "conf/sample.ini"
 		cfg := NewCfg()
 		err := cfg.Load(CommandLineArgs{HomePath: "../../"})
 		require.Nil(t, err)
 		// Restore CustomInitPath to avoid side effects.
-		CustomInitPath = customInitPath
+		customInitPath = oldCustomInitPath
 	})
 
 	t.Run("Should be able to override via environment variables", func(t *testing.T) {
@@ -71,10 +74,23 @@ func TestLoadingSettings(t *testing.T) {
 		require.Nil(t, err)
 
 		require.Equal(t, "superduper", cfg.AdminUser)
-		require.Equal(t, filepath.Join(HomePath, "data"), cfg.DataPath)
+		require.Equal(t, filepath.Join(cfg.HomePath, "data"), cfg.DataPath)
 		require.Equal(t, filepath.Join(cfg.DataPath, "log"), cfg.LogsPath)
 	})
 
+	t.Run("Should be able to expand parameter from environment variables", func(t *testing.T) {
+		t.Setenv("DEFAULT_IDP_URL", "grafana.com")
+		t.Setenv("GF_AUTH_GENERIC_OAUTH_AUTH_URL", "${DEFAULT_IDP_URL}/auth")
+
+		cfg := NewCfg()
+		err := cfg.Load(CommandLineArgs{HomePath: "../../"})
+		require.Nil(t, err)
+
+		genericOAuthSection, err := cfg.Raw.GetSection("auth.generic_oauth")
+		require.NoError(t, err)
+		require.Equal(t, "grafana.com/auth", genericOAuthSection.Key("auth_url").Value())
+	})
+
 	t.Run("Should replace password when defined in environment", func(t *testing.T) {
 		t.Setenv("GF_SECURITY_ADMIN_PASSWORD", "supersecret")
 
@@ -82,7 +98,7 @@ func TestLoadingSettings(t *testing.T) {
 		err := cfg.Load(CommandLineArgs{HomePath: "../../"})
 		require.Nil(t, err)
 
-		require.Contains(t, appliedEnvOverrides, "GF_SECURITY_ADMIN_PASSWORD=*********")
+		require.Contains(t, cfg.appliedEnvOverrides, "GF_SECURITY_ADMIN_PASSWORD=*********")
 	})
 
 	t.Run("Should replace password in URL when url environment is defined", func(t *testing.T) {
@@ -92,7 +108,7 @@ func TestLoadingSettings(t *testing.T) {
 		err := cfg.Load(CommandLineArgs{HomePath: "../../"})
 		require.Nil(t, err)
 
-		require.Contains(t, appliedEnvOverrides, "GF_DATABASE_URL=mysql://user:xxxxx@localhost:3306/database")
+		require.Contains(t, cfg.appliedEnvOverrides, "GF_DATABASE_URL=mysql://user:xxxxx@localhost:3306/database")
 	})
 
 	t.Run("Should get property map from command line args array", func(t *testing.T) {
@@ -134,7 +150,7 @@ func TestLoadingSettings(t *testing.T) {
 			Args: []string{
 				"cfg:default.server.domain=test2",
 			},
-			Config: filepath.Join(HomePath, "pkg/setting/testdata/override.ini"),
+			Config: filepath.Join("../../", "pkg/setting/testdata/override.ini"),
 		})
 		require.Nil(t, err)
 
@@ -148,7 +164,7 @@ func TestLoadingSettings(t *testing.T) {
 			Args: []string{
 				"cfg:default.server.min_tls_version=TLS1.3",
 			},
-			Config: filepath.Join(HomePath, "pkg/setting/testdata/override.ini"),
+			Config: filepath.Join("../../", "pkg/setting/testdata/override.ini"),
 		})
 		require.Nil(t, err)
 
@@ -160,7 +176,7 @@ func TestLoadingSettings(t *testing.T) {
 			cfg := NewCfg()
 			err := cfg.Load(CommandLineArgs{
 				HomePath: "../../",
-				Config:   filepath.Join(HomePath, "pkg/setting/testdata/override_windows.ini"),
+				Config:   filepath.Join("../../", "pkg/setting/testdata/override_windows.ini"),
 				Args:     []string{`cfg:default.paths.data=c:\tmp\data`},
 			})
 			require.Nil(t, err)
@@ -170,7 +186,7 @@ func TestLoadingSettings(t *testing.T) {
 			cfg := NewCfg()
 			err := cfg.Load(CommandLineArgs{
 				HomePath: "../../",
-				Config:   filepath.Join(HomePath, "pkg/setting/testdata/override.ini"),
+				Config:   filepath.Join("../../", "pkg/setting/testdata/override.ini"),
 				Args:     []string{"cfg:default.paths.data=/tmp/data"},
 			})
 			require.Nil(t, err)
@@ -184,7 +200,7 @@ func TestLoadingSettings(t *testing.T) {
 			cfg := NewCfg()
 			err := cfg.Load(CommandLineArgs{
 				HomePath: "../../",
-				Config:   filepath.Join(HomePath, "pkg/setting/testdata/override_windows.ini"),
+				Config:   filepath.Join("../../", "pkg/setting/testdata/override_windows.ini"),
 				Args:     []string{`cfg:paths.data=c:\tmp\data`},
 			})
 			require.Nil(t, err)
@@ -194,7 +210,7 @@ func TestLoadingSettings(t *testing.T) {
 			cfg := NewCfg()
 			err := cfg.Load(CommandLineArgs{
 				HomePath: "../../",
-				Config:   filepath.Join(HomePath, "pkg/setting/testdata/override.ini"),
+				Config:   filepath.Join("../../", "pkg/setting/testdata/override.ini"),
 				Args:     []string{"cfg:paths.data=/tmp/data"},
 			})
 			require.Nil(t, err)
@@ -236,7 +252,7 @@ func TestLoadingSettings(t *testing.T) {
 
 		hostname, err := os.Hostname()
 		require.Nil(t, err)
-		require.Equal(t, hostname, InstanceName)
+		require.Equal(t, hostname, cfg.InstanceName)
 	})
 
 	t.Run("Reading callback_url should add trailing slash", func(t *testing.T) {
@@ -258,11 +274,14 @@ func TestLoadingSettings(t *testing.T) {
 		})
 		require.Nil(t, err)
 
-		require.Equal(t, 2, cfg.AuthProxySyncTTL)
+		require.Equal(t, 2, cfg.AuthProxy.SyncTTL)
 	})
 
 	t.Run("Test reading string values from .ini file", func(t *testing.T) {
-		iniFile, err := ini.Load(path.Join(HomePath, "pkg/setting/testdata/invalid.ini"))
+		cfg := NewCfg()
+		err := cfg.Load(CommandLineArgs{HomePath: "../../"})
+		require.Nil(t, err)
+		iniFile, err := ini.Load(path.Join(cfg.HomePath, "pkg/setting/testdata/invalid.ini"))
 		require.Nil(t, err)
 
 		t.Run("If key is found - should return value from ini file", func(t *testing.T) {
@@ -384,19 +403,33 @@ func TestAuthDurationSettings(t *testing.T) {
 }
 
 func TestGetCDNPath(t *testing.T) {
-	var err error
-	cfg := NewCfg()
-	cfg.BuildVersion = "v7.5.0-11124"
-	cfg.CDNRootURL, err = url.Parse("http://cdn.grafana.com")
-	require.NoError(t, err)
+	t.Run("should return CDN url as expected", func(t *testing.T) {
+		var (
+			err    error
+			actual string
+		)
+		cfg := NewCfg()
+		cfg.BuildVersion = "v7.5.0-11124"
+		cfg.CDNRootURL, err = url.Parse("http://cdn.grafana.com")
+		require.NoError(t, err)
 
-	require.Equal(t, "http://cdn.grafana.com/grafana-oss/v7.5.0-11124/", cfg.GetContentDeliveryURL("grafana-oss"))
-	require.Equal(t, "http://cdn.grafana.com/grafana/v7.5.0-11124/", cfg.GetContentDeliveryURL("grafana"))
-}
+		actual, err = cfg.GetContentDeliveryURL("grafana-oss")
+		require.NoError(t, err)
+		require.Equal(t, "http://cdn.grafana.com/grafana-oss/v7.5.0-11124/", actual)
+		actual, err = cfg.GetContentDeliveryURL("grafana")
+		require.NoError(t, err)
+		require.Equal(t, "http://cdn.grafana.com/grafana/v7.5.0-11124/", actual)
+	})
 
-func TestGetContentDeliveryURLWhenNoCDNRootURLIsSet(t *testing.T) {
-	cfg := NewCfg()
-	require.Equal(t, "", cfg.GetContentDeliveryURL("grafana-oss"))
+	t.Run("should error if BuildVersion  is not set", func(t *testing.T) {
+		var err error
+		cfg := NewCfg()
+		cfg.CDNRootURL, err = url.Parse("http://cdn.grafana.com")
+		require.NoError(t, err)
+
+		_, err = cfg.GetContentDeliveryURL("grafana")
+		require.Error(t, err)
+	})
 }
 
 func TestGetCDNPathWithPreReleaseVersionAndSubPath(t *testing.T) {
@@ -405,8 +438,12 @@ func TestGetCDNPathWithPreReleaseVersionAndSubPath(t *testing.T) {
 	cfg.BuildVersion = "v7.5.0-11124pre"
 	cfg.CDNRootURL, err = url.Parse("http://cdn.grafana.com/sub")
 	require.NoError(t, err)
-	require.Equal(t, "http://cdn.grafana.com/sub/grafana-oss/v7.5.0-11124pre/", cfg.GetContentDeliveryURL("grafana-oss"))
-	require.Equal(t, "http://cdn.grafana.com/sub/grafana/v7.5.0-11124pre/", cfg.GetContentDeliveryURL("grafana"))
+	actual, err := cfg.GetContentDeliveryURL("grafana-oss")
+	require.NoError(t, err)
+	require.Equal(t, "http://cdn.grafana.com/sub/grafana-oss/v7.5.0-11124pre/", actual)
+	actual, err = cfg.GetContentDeliveryURL("grafana")
+	require.NoError(t, err)
+	require.Equal(t, "http://cdn.grafana.com/sub/grafana/v7.5.0-11124pre/", actual)
 }
 
 // Adding a case for this in case we switch to proper semver version strings
@@ -416,364 +453,48 @@ func TestGetCDNPathWithAlphaVersion(t *testing.T) {
 	cfg.BuildVersion = "v7.5.0-alpha.11124"
 	cfg.CDNRootURL, err = url.Parse("http://cdn.grafana.com")
 	require.NoError(t, err)
-	require.Equal(t, "http://cdn.grafana.com/grafana-oss/v7.5.0-alpha.11124/", cfg.GetContentDeliveryURL("grafana-oss"))
-	require.Equal(t, "http://cdn.grafana.com/grafana/v7.5.0-alpha.11124/", cfg.GetContentDeliveryURL("grafana"))
+	actual, err := cfg.GetContentDeliveryURL("grafana-oss")
+	require.NoError(t, err)
+	require.Equal(t, "http://cdn.grafana.com/grafana-oss/v7.5.0-alpha.11124/", actual)
+	actual, err = cfg.GetContentDeliveryURL("grafana")
+	require.NoError(t, err)
+	require.Equal(t, "http://cdn.grafana.com/grafana/v7.5.0-alpha.11124/", actual)
 }
 
 func TestAlertingEnabled(t *testing.T) {
-	anyBoolean := func() bool {
-		return rand.Int63()%2 == 0
-	}
+	t.Run("fail if legacy alerting enabled", func(t *testing.T) {
+		f := ini.Empty()
+		cfg := NewCfg()
 
-	testCases := []struct {
-		desc                   string
-		unifiedAlertingEnabled string
-		legacyAlertingEnabled  string
-		featureToggleSet       bool
-		isEnterprise           bool
-		verifyCfg              func(*testing.T, Cfg, *ini.File)
-	}{
-		{
-			desc:                   "when legacy alerting is enabled and unified is disabled",
-			legacyAlertingEnabled:  "true",
-			unifiedAlertingEnabled: "false",
-			isEnterprise:           anyBoolean(),
-			verifyCfg: func(t *testing.T, cfg Cfg, f *ini.File) {
-				err := readAlertingSettings(f)
-				require.NoError(t, err)
-				err = cfg.readFeatureToggles(f)
-				require.NoError(t, err)
-				err = cfg.ReadUnifiedAlertingSettings(f)
-				require.NoError(t, err)
-				assert.NotNil(t, cfg.UnifiedAlerting.Enabled)
-				assert.Equal(t, *cfg.UnifiedAlerting.Enabled, false)
-				assert.NotNil(t, AlertingEnabled)
-				assert.Equal(t, *AlertingEnabled, true)
-			},
-		},
-		{
-			desc:                   "when legacy alerting is disabled and unified is enabled",
-			legacyAlertingEnabled:  "false",
-			unifiedAlertingEnabled: "true",
-			isEnterprise:           anyBoolean(),
-			verifyCfg: func(t *testing.T, cfg Cfg, f *ini.File) {
-				err := readAlertingSettings(f)
-				require.NoError(t, err)
-				err = cfg.readFeatureToggles(f)
-				require.NoError(t, err)
-				err = cfg.ReadUnifiedAlertingSettings(f)
-				require.NoError(t, err)
-				assert.NotNil(t, cfg.UnifiedAlerting.Enabled)
-				assert.Equal(t, *cfg.UnifiedAlerting.Enabled, true)
-				assert.NotNil(t, AlertingEnabled)
-				assert.Equal(t, *AlertingEnabled, false)
-			},
-		},
-		{
-			desc:                   "when both alerting are enabled",
-			legacyAlertingEnabled:  "true",
-			unifiedAlertingEnabled: "true",
-			isEnterprise:           anyBoolean(),
-			verifyCfg: func(t *testing.T, cfg Cfg, f *ini.File) {
-				err := readAlertingSettings(f)
-				require.NoError(t, err)
-				err = cfg.readFeatureToggles(f)
-				require.NoError(t, err)
-				err = cfg.ReadUnifiedAlertingSettings(f)
-				require.Error(t, err)
-			},
-		},
-		{
-			desc:                   "when legacy alerting is invalid (or not defined) and unified is disabled",
-			legacyAlertingEnabled:  "",
-			unifiedAlertingEnabled: "false",
-			isEnterprise:           anyBoolean(),
-			verifyCfg: func(t *testing.T, cfg Cfg, f *ini.File) {
-				err := readAlertingSettings(f)
-				require.NoError(t, err)
-				err = cfg.readFeatureToggles(f)
-				require.NoError(t, err)
-				err = cfg.ReadUnifiedAlertingSettings(f)
-				require.NoError(t, err)
-				assert.NotNil(t, cfg.UnifiedAlerting.Enabled)
-				assert.Equal(t, *cfg.UnifiedAlerting.Enabled, false)
-				assert.NotNil(t, AlertingEnabled)
-				assert.Equal(t, *AlertingEnabled, true)
-			},
-		},
-		{
-			desc:                   "when legacy alerting is invalid (or not defined) and unified is enabled",
-			legacyAlertingEnabled:  "",
-			unifiedAlertingEnabled: "true",
-			isEnterprise:           anyBoolean(),
-			verifyCfg: func(t *testing.T, cfg Cfg, f *ini.File) {
-				err := readAlertingSettings(f)
-				require.NoError(t, err)
-				err = cfg.readFeatureToggles(f)
-				require.NoError(t, err)
-				err = cfg.ReadUnifiedAlertingSettings(f)
-				require.NoError(t, err)
-				assert.NotNil(t, cfg.UnifiedAlerting.Enabled)
-				assert.Equal(t, *cfg.UnifiedAlerting.Enabled, true)
-				assert.NotNil(t, AlertingEnabled)
-				assert.Equal(t, *AlertingEnabled, false)
-			},
-		},
-		{
-			desc:                   "when legacy alerting is enabled and unified is not defined [OSS]",
-			legacyAlertingEnabled:  "true",
-			unifiedAlertingEnabled: "",
-			isEnterprise:           false,
-			verifyCfg: func(t *testing.T, cfg Cfg, f *ini.File) {
-				err := readAlertingSettings(f)
-				require.NoError(t, err)
-				err = cfg.readFeatureToggles(f)
-				require.NoError(t, err)
-				err = cfg.ReadUnifiedAlertingSettings(f)
-				require.NoError(t, err)
-				assert.NotNil(t, cfg.UnifiedAlerting.Enabled)
-				assert.Equal(t, true, *cfg.UnifiedAlerting.Enabled)
-				assert.NotNil(t, AlertingEnabled)
-				assert.Equal(t, false, *AlertingEnabled)
-			},
-		},
-		{
-			desc:                   "when legacy alerting is enabled and unified is invalid [OSS]",
-			legacyAlertingEnabled:  "true",
-			unifiedAlertingEnabled: "invalid",
-			isEnterprise:           false,
-			verifyCfg: func(t *testing.T, cfg Cfg, f *ini.File) {
-				err := readAlertingSettings(f)
-				require.NoError(t, err)
-				err = cfg.readFeatureToggles(f)
-				require.NoError(t, err)
-				err = cfg.ReadUnifiedAlertingSettings(f)
-				assert.EqualError(t, err, "failed to read unified alerting enabled setting: invalid value invalid, should be either true or false")
-				assert.Nil(t, cfg.UnifiedAlerting.Enabled)
-				assert.NotNil(t, AlertingEnabled)
-				assert.Equal(t, false, *AlertingEnabled)
-			},
-		},
-		{
-			desc:                   "when legacy alerting is enabled and unified is not defined [Enterprise]",
-			legacyAlertingEnabled:  "true",
-			unifiedAlertingEnabled: "",
-			isEnterprise:           true,
-			verifyCfg: func(t *testing.T, cfg Cfg, f *ini.File) {
-				err := readAlertingSettings(f)
-				require.NoError(t, err)
-				err = cfg.readFeatureToggles(f)
-				require.NoError(t, err)
-				err = cfg.ReadUnifiedAlertingSettings(f)
-				require.NoError(t, err)
-				assert.NotNil(t, cfg.UnifiedAlerting.Enabled)
-				assert.Equal(t, true, *cfg.UnifiedAlerting.Enabled)
-				assert.NotNil(t, AlertingEnabled)
-				assert.Equal(t, false, *AlertingEnabled)
-			},
-		},
-		{
-			desc:                   "when legacy alerting is enabled and unified is invalid [Enterprise]",
-			legacyAlertingEnabled:  "true",
-			unifiedAlertingEnabled: "invalid",
-			isEnterprise:           false,
-			verifyCfg: func(t *testing.T, cfg Cfg, f *ini.File) {
-				err := readAlertingSettings(f)
-				require.NoError(t, err)
-				err = cfg.readFeatureToggles(f)
-				require.NoError(t, err)
-				err = cfg.ReadUnifiedAlertingSettings(f)
-				assert.EqualError(t, err, "failed to read unified alerting enabled setting: invalid value invalid, should be either true or false")
-				assert.Nil(t, cfg.UnifiedAlerting.Enabled)
-				assert.NotNil(t, AlertingEnabled)
-				assert.Equal(t, false, *AlertingEnabled)
-			},
-		},
-		{
-			desc:                   "when legacy alerting is disabled and unified is not defined [OSS]",
-			legacyAlertingEnabled:  "false",
-			unifiedAlertingEnabled: "",
-			isEnterprise:           false,
-			verifyCfg: func(t *testing.T, cfg Cfg, f *ini.File) {
-				err := readAlertingSettings(f)
-				require.NoError(t, err)
-				err = cfg.readFeatureToggles(f)
-				require.NoError(t, err)
-				err = cfg.ReadUnifiedAlertingSettings(f)
-				require.NoError(t, err)
-				assert.NotNil(t, cfg.UnifiedAlerting.Enabled)
-				assert.Equal(t, *cfg.UnifiedAlerting.Enabled, true)
-				assert.NotNil(t, AlertingEnabled)
-				assert.Equal(t, *AlertingEnabled, false)
-			},
-		},
-		{
-			desc:                   "when legacy alerting is disabled and unified is invalid [OSS]",
-			legacyAlertingEnabled:  "false",
-			unifiedAlertingEnabled: "invalid",
-			isEnterprise:           false,
-			verifyCfg: func(t *testing.T, cfg Cfg, f *ini.File) {
-				err := readAlertingSettings(f)
-				require.NoError(t, err)
-				err = cfg.readFeatureToggles(f)
-				require.NoError(t, err)
-				err = cfg.ReadUnifiedAlertingSettings(f)
-				assert.EqualError(t, err, "failed to read unified alerting enabled setting: invalid value invalid, should be either true or false")
-				assert.Nil(t, cfg.UnifiedAlerting.Enabled)
-				assert.NotNil(t, AlertingEnabled)
-				assert.Equal(t, false, *AlertingEnabled)
-			},
-		},
-		{
-			desc:                   "when legacy alerting is disabled and unified is not defined [Enterprise]",
-			legacyAlertingEnabled:  "false",
-			unifiedAlertingEnabled: "",
-			isEnterprise:           true,
-			verifyCfg: func(t *testing.T, cfg Cfg, f *ini.File) {
-				err := readAlertingSettings(f)
-				require.NoError(t, err)
-				err = cfg.readFeatureToggles(f)
-				require.NoError(t, err)
-				err = cfg.ReadUnifiedAlertingSettings(f)
-				require.NoError(t, err)
-				assert.NotNil(t, cfg.UnifiedAlerting.Enabled)
-				assert.Equal(t, *cfg.UnifiedAlerting.Enabled, true)
-				assert.NotNil(t, AlertingEnabled)
-				assert.Equal(t, *AlertingEnabled, false)
-			},
-		},
-		{
-			desc:                   "when legacy alerting is disabled and unified is invalid [Enterprise]",
-			legacyAlertingEnabled:  "false",
-			unifiedAlertingEnabled: "invalid",
-			isEnterprise:           false,
-			verifyCfg: func(t *testing.T, cfg Cfg, f *ini.File) {
-				err := readAlertingSettings(f)
-				require.NoError(t, err)
-				err = cfg.readFeatureToggles(f)
-				require.NoError(t, err)
-				err = cfg.ReadUnifiedAlertingSettings(f)
-				assert.EqualError(t, err, "failed to read unified alerting enabled setting: invalid value invalid, should be either true or false")
-				assert.Nil(t, cfg.UnifiedAlerting.Enabled)
-				assert.NotNil(t, AlertingEnabled)
-				assert.Equal(t, false, *AlertingEnabled)
-			},
-		},
-		{
-			desc:                   "when both are not defined [OSS]",
-			legacyAlertingEnabled:  "",
-			unifiedAlertingEnabled: "",
-			isEnterprise:           false,
-			verifyCfg: func(t *testing.T, cfg Cfg, f *ini.File) {
-				err := readAlertingSettings(f)
-				require.NoError(t, err)
-				err = cfg.readFeatureToggles(f)
-				require.NoError(t, err)
-				err = cfg.ReadUnifiedAlertingSettings(f)
-				require.NoError(t, err)
-				assert.NotNil(t, cfg.UnifiedAlerting.Enabled)
-				assert.True(t, *cfg.UnifiedAlerting.Enabled)
-				assert.Nil(t, AlertingEnabled)
-			},
-		},
-		{
-			desc:                   "when both are not invalid [OSS]",
-			legacyAlertingEnabled:  "invalid",
-			unifiedAlertingEnabled: "invalid",
-			isEnterprise:           false,
-			verifyCfg: func(t *testing.T, cfg Cfg, f *ini.File) {
-				err := readAlertingSettings(f)
-				require.NoError(t, err)
-				err = cfg.readFeatureToggles(f)
-				require.NoError(t, err)
-				err = cfg.ReadUnifiedAlertingSettings(f)
-				assert.EqualError(t, err, "failed to read unified alerting enabled setting: invalid value invalid, should be either true or false")
-				assert.Nil(t, cfg.UnifiedAlerting.Enabled)
-				assert.NotNil(t, AlertingEnabled)
-				assert.Equal(t, false, *AlertingEnabled)
-			},
-		},
-		{
-			desc:                   "when both are not defined [Enterprise]",
-			legacyAlertingEnabled:  "",
-			unifiedAlertingEnabled: "",
-			isEnterprise:           true,
-			verifyCfg: func(t *testing.T, cfg Cfg, f *ini.File) {
-				err := readAlertingSettings(f)
-				require.NoError(t, err)
-				err = cfg.readFeatureToggles(f)
-				require.NoError(t, err)
-				err = cfg.ReadUnifiedAlertingSettings(f)
-				require.NoError(t, err)
-				assert.NotNil(t, cfg.UnifiedAlerting.Enabled)
-				assert.True(t, *cfg.UnifiedAlerting.Enabled)
-				assert.Nil(t, AlertingEnabled)
-			},
-		},
-		{
-			desc:                   "when both are not invalid [Enterprise]",
-			legacyAlertingEnabled:  "invalid",
-			unifiedAlertingEnabled: "invalid",
-			isEnterprise:           false,
-			verifyCfg: func(t *testing.T, cfg Cfg, f *ini.File) {
-				err := readAlertingSettings(f)
-				require.NoError(t, err)
-				err = cfg.readFeatureToggles(f)
-				require.NoError(t, err)
-				err = cfg.ReadUnifiedAlertingSettings(f)
-				assert.EqualError(t, err, "failed to read unified alerting enabled setting: invalid value invalid, should be either true or false")
-				assert.Nil(t, cfg.UnifiedAlerting.Enabled)
-				assert.NotNil(t, AlertingEnabled)
-				assert.Equal(t, false, *AlertingEnabled)
-			},
-		},
-		{
-			desc:                   "when both are false",
-			legacyAlertingEnabled:  "false",
-			unifiedAlertingEnabled: "false",
-			isEnterprise:           anyBoolean(),
-			verifyCfg: func(t *testing.T, cfg Cfg, f *ini.File) {
-				err := readAlertingSettings(f)
-				require.NoError(t, err)
-				err = cfg.readFeatureToggles(f)
-				require.NoError(t, err)
-				err = cfg.ReadUnifiedAlertingSettings(f)
-				require.NoError(t, err)
-				assert.NotNil(t, cfg.UnifiedAlerting.Enabled)
-				assert.Equal(t, *cfg.UnifiedAlerting.Enabled, false)
-				assert.NotNil(t, AlertingEnabled)
-				assert.Equal(t, *AlertingEnabled, false)
-			},
-		},
-	}
+		alertingSec, err := f.NewSection("alerting")
+		require.NoError(t, err)
+		_, err = alertingSec.NewKey("enabled", "true")
+		require.NoError(t, err)
 
-	var isEnterpriseOld = IsEnterprise
-	t.Cleanup(func() {
-		IsEnterprise = isEnterpriseOld
+		require.Error(t, cfg.readAlertingSettings(f))
 	})
 
-	for _, tc := range testCases {
-		t.Run(tc.desc, func(t *testing.T) {
-			IsEnterprise = tc.isEnterprise
-			t.Cleanup(func() {
-				AlertingEnabled = nil
-			})
+	t.Run("do nothing if it is disabled", func(t *testing.T) {
+		f := ini.Empty()
+		cfg := NewCfg()
 
-			f := ini.Empty()
-			cfg := NewCfg()
-			unifiedAlertingSec, err := f.NewSection("unified_alerting")
-			require.NoError(t, err)
-			_, err = unifiedAlertingSec.NewKey("enabled", tc.unifiedAlertingEnabled)
-			require.NoError(t, err)
+		alertingSec, err := f.NewSection("alerting")
+		require.NoError(t, err)
+		_, err = alertingSec.NewKey("enabled", "false")
+		require.NoError(t, err)
+		require.NoError(t, cfg.readAlertingSettings(f))
+	})
 
-			alertingSec, err := f.NewSection("alerting")
-			require.NoError(t, err)
-			_, err = alertingSec.NewKey("enabled", tc.legacyAlertingEnabled)
-			require.NoError(t, err)
+	t.Run("do nothing if it invalid", func(t *testing.T) {
+		f := ini.Empty()
+		cfg := NewCfg()
 
-			tc.verifyCfg(t, *cfg, f)
-		})
-	}
+		alertingSec, err := f.NewSection("alerting")
+		require.NoError(t, err)
+		_, err = alertingSec.NewKey("enabled", "test")
+		require.NoError(t, err)
+		require.NoError(t, cfg.readAlertingSettings(f))
+	})
 }
 
 func TestRedactedValue(t *testing.T) {
@@ -795,6 +516,12 @@ func TestRedactedValue(t *testing.T) {
 			value:    "/path/to/key",
 			expected: RedactedPassword,
 		},
+		{
+			desc:     "license key with non-empty value",
+			key:      "GF_ENTERPRISE_LICENSE_TEXT",
+			value:    "some_license_key_test",
+			expected: RedactedPassword,
+		},
 		{
 			desc:     "sensitive key with empty value",
 			key:      "private_key_path",
@@ -884,3 +611,73 @@ func TestHandleAWSSettings(t *testing.T) {
 		assert.Equal(t, 400, cfg.AWSListMetricsPageLimit)
 	})
 }
+
+const iniString = `
+app_mode = production
+
+[server]
+domain = test.com
+`
+
+func TestNewCfgFromBytes(t *testing.T) {
+	cfg, err := NewCfgFromBytes([]byte(iniString))
+	require.NoError(t, err)
+	require.NotNil(t, cfg)
+	require.Equal(t, Prod, cfg.Env)
+	require.Equal(t, "test.com", cfg.Domain)
+}
+
+func TestNewCfgFromINIFile(t *testing.T) {
+	parsedFile, err := ini.Load([]byte(iniString))
+	require.NoError(t, err)
+	require.NotNil(t, parsedFile)
+
+	cfg, err := NewCfgFromINIFile(parsedFile)
+	require.NoError(t, err)
+	require.NotNil(t, cfg)
+	require.Equal(t, Prod, cfg.Env)
+	require.Equal(t, "test.com", cfg.Domain)
+}
+
+func TestDynamicSection(t *testing.T) {
+	t.Parallel()
+
+	t.Run("repro #44509 - panic on concurrent map write", func(t *testing.T) {
+		t.Parallel()
+
+		const (
+			goroutines = 10
+			attempts   = 1000
+			section    = "DEFAULT"
+			key        = "TestDynamicSection_repro_44509"
+			value      = "theval"
+		)
+
+		cfg, err := NewCfgFromBytes([]byte(``))
+		require.NoError(t, err)
+
+		ds := &DynamicSection{
+			section: cfg.Raw.Section(section),
+			Logger:  log.NewNopLogger(),
+			env:     osutil.MapEnv{},
+		}
+		osVar := EnvKey(section, key)
+		err = ds.env.Setenv(osVar, value)
+		require.NoError(t, err)
+
+		var wg sync.WaitGroup
+		for i := 0; i < goroutines; i++ {
+			wg.Add(1)
+			go require.NotPanics(t, func() {
+				for i := 0; i < attempts; i++ {
+					ds.section.Key(key).SetValue("")
+					ds.Key(key)
+				}
+				wg.Done()
+			})
+		}
+		wg.Wait()
+
+		assert.Equal(t, value, ds.section.Key(key).String())
+	})
+}
diff --git a/pkg/setting/setting_unified_alerting.go b/pkg/setting/setting_unified_alerting.go
index f8f7477640ddc..eaca5d11afcf9 100644
--- a/pkg/setting/setting_unified_alerting.go
+++ b/pkg/setting/setting_unified_alerting.go
@@ -1,14 +1,13 @@
 package setting
 
 import (
-	"errors"
 	"fmt"
 	"strconv"
 	"strings"
 	"time"
 
+	alertingCluster "github.com/grafana/alerting/cluster"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
-	"github.com/prometheus/alertmanager/cluster"
 	"gopkg.in/ini.v1"
 
 	"github.com/grafana/grafana/pkg/util"
@@ -17,8 +16,8 @@ import (
 const (
 	alertmanagerDefaultClusterAddr        = "0.0.0.0:9094"
 	alertmanagerDefaultPeerTimeout        = 15 * time.Second
-	alertmanagerDefaultGossipInterval     = cluster.DefaultGossipInterval
-	alertmanagerDefaultPushPullInterval   = cluster.DefaultPushPullInterval
+	alertmanagerDefaultGossipInterval     = alertingCluster.DefaultGossipInterval
+	alertmanagerDefaultPushPullInterval   = alertingCluster.DefaultPushPullInterval
 	alertmanagerDefaultConfigPollInterval = time.Minute
 	alertmanagerRedisDefaultMaxConns      = 5
 	// To start, the alertmanager needs at least one route defined.
@@ -46,8 +45,8 @@ const (
 `
 	evaluatorDefaultEvaluationTimeout       = 30 * time.Second
 	schedulerDefaultAdminConfigPollInterval = time.Minute
-	schedulereDefaultExecuteAlerts          = true
-	schedulerDefaultMaxAttempts             = 3
+	schedulerDefaultExecuteAlerts           = true
+	schedulerDefaultMaxAttempts             = 1
 	schedulerDefaultLegacyMinInterval       = 1
 	screenshotsDefaultCapture               = false
 	screenshotsDefaultCaptureTimeout        = 10 * time.Second
@@ -61,6 +60,7 @@ const (
 	// DefaultRuleEvaluationInterval indicates a default interval of for how long a rule should be evaluated to change state from Pending to Alerting
 	DefaultRuleEvaluationInterval = SchedulerBaseInterval * 6 // == 60 seconds
 	stateHistoryDefaultEnabled    = true
+	lokiDefaultMaxQueryLength     = 721 * time.Hour // 30d1h, matches the default value in Loki
 )
 
 type UnifiedAlertingSettings struct {
@@ -83,6 +83,7 @@ type UnifiedAlertingSettings struct {
 	MaxAttempts                    int64
 	MinInterval                    time.Duration
 	EvaluationTimeout              time.Duration
+	DisableJitter                  bool
 	ExecuteAlerts                  bool
 	DefaultConfiguration           string
 	Enabled                        *bool // determines whether unified alerting is enabled. If it is nil then user did not define it and therefore its value will be determined during migration. Services should not use it directly.
@@ -97,16 +98,19 @@ type UnifiedAlertingSettings struct {
 	StateHistory                  UnifiedAlertingStateHistorySettings
 	RemoteAlertmanager            RemoteAlertmanagerSettings
 	// MaxStateSaveConcurrency controls the number of goroutines (per rule) that can save alert state in parallel.
-	MaxStateSaveConcurrency int
+	MaxStateSaveConcurrency   int
+	StatePeriodicSaveInterval time.Duration
+	RulesPerRuleGroupLimit    int64
 }
 
 // RemoteAlertmanagerSettings contains the configuration needed
 // to disable the internal Alertmanager and use an external one instead.
 type RemoteAlertmanagerSettings struct {
-	Enable   bool
-	URL      string
-	TenantID string
-	Password string
+	Enable       bool
+	URL          string
+	TenantID     string
+	Password     string
+	SyncInterval time.Duration
 }
 
 type UnifiedAlertingScreenshotSettings struct {
@@ -131,6 +135,7 @@ type UnifiedAlertingStateHistorySettings struct {
 	// if one of them is set.
 	LokiBasicAuthPassword string
 	LokiBasicAuthUsername string
+	LokiMaxQueryLength    time.Duration
 	MultiPrimary          string
 	MultiSecondaries      []string
 	ExternalLabels        map[string]string
@@ -156,49 +161,13 @@ func (cfg *Cfg) readUnifiedAlertingEnabledSetting(section *ini.Section) (*bool,
 	// At present an invalid value is considered the same as no value. This means that a
 	// spelling mistake in the string "false" could enable unified alerting rather
 	// than disable it. This issue can be found here
-	hasEnabled := section.Key("enabled").Value() != ""
-	if !hasEnabled {
-		// TODO: Remove in Grafana v10
-		if cfg.IsFeatureToggleEnabled("ngalert") {
-			cfg.Logger.Warn("ngalert feature flag is deprecated: use unified alerting enabled setting instead")
-			// feature flag overrides the legacy alerting setting
-			legacyAlerting := false
-			AlertingEnabled = &legacyAlerting
-			unifiedAlerting := true
-			return &unifiedAlerting, nil
-		}
-
-		// if legacy alerting has not been configured then enable unified alerting
-		if AlertingEnabled == nil {
-			unifiedAlerting := true
-			return &unifiedAlerting, nil
-		}
-
-		// enable unified alerting and disable legacy alerting
-		legacyAlerting := false
-		AlertingEnabled = &legacyAlerting
-		unifiedAlerting := true
-		return &unifiedAlerting, nil
+	if section.Key("enabled").Value() == "" {
+		return util.Pointer(true), nil
 	}
-
 	unifiedAlerting, err := section.Key("enabled").Bool()
 	if err != nil {
-		// the value for unified alerting is invalid so disable all alerting
-		legacyAlerting := false
-		AlertingEnabled = &legacyAlerting
 		return nil, fmt.Errorf("invalid value %s, should be either true or false", section.Key("enabled"))
 	}
-
-	// If both legacy and unified alerting are enabled then return an error
-	if AlertingEnabled != nil && *AlertingEnabled && unifiedAlerting {
-		return nil, errors.New("legacy and unified alerting cannot both be enabled at the same time, please disable one of them and restart Grafana")
-	}
-
-	if AlertingEnabled == nil {
-		legacyAlerting := !unifiedAlerting
-		AlertingEnabled = &legacyAlerting
-	}
-
 	return &unifiedAlerting, nil
 }
 
@@ -267,9 +236,9 @@ func (cfg *Cfg) ReadUnifiedAlertingSettings(iniFile *ini.File) error {
 
 	alerting := iniFile.Section("alerting")
 
-	uaExecuteAlerts := ua.Key("execute_alerts").MustBool(schedulereDefaultExecuteAlerts)
+	uaExecuteAlerts := ua.Key("execute_alerts").MustBool(schedulerDefaultExecuteAlerts)
 	if uaExecuteAlerts { // unified option equals the default (true)
-		legacyExecuteAlerts := alerting.Key("execute_alerts").MustBool(schedulereDefaultExecuteAlerts)
+		legacyExecuteAlerts := alerting.Key("execute_alerts").MustBool(schedulerDefaultExecuteAlerts)
 		if !legacyExecuteAlerts {
 			cfg.Logger.Warn("falling back to legacy setting of 'execute_alerts'; please use the configuration option in the `unified_alerting` section if Grafana 8 alerts are enabled.")
 		}
@@ -288,18 +257,14 @@ func (cfg *Cfg) ReadUnifiedAlertingSettings(iniFile *ini.File) error {
 	}
 	uaCfg.EvaluationTimeout = uaEvaluationTimeout
 
-	uaMaxAttempts := ua.Key("max_attempts").MustInt64(schedulerDefaultMaxAttempts)
-	if uaMaxAttempts == schedulerDefaultMaxAttempts { // unified option or equals the default
-		legacyMaxAttempts := alerting.Key("max_attempts").MustInt64(schedulerDefaultMaxAttempts)
-		if legacyMaxAttempts != schedulerDefaultMaxAttempts {
-			cfg.Logger.Warn("falling back to legacy setting of 'max_attempts'; please use the configuration option in the `unified_alerting` section if Grafana 8 alerts are enabled.")
-		}
-		uaMaxAttempts = legacyMaxAttempts
-	}
-	uaCfg.MaxAttempts = uaMaxAttempts
+	uaCfg.MaxAttempts = ua.Key("max_attempts").MustInt64(schedulerDefaultMaxAttempts)
 
 	uaCfg.BaseInterval = SchedulerBaseInterval
 
+	// TODO: This was promoted from a feature toggle and is now the default behavior.
+	// We can consider removing the knob entirely in a release after 10.4.
+	uaCfg.DisableJitter = ua.Key("disable_jitter").MustBool(false)
+
 	// The base interval of the scheduler for evaluating alerts.
 	// 1. It is used by the internal scheduler's timer to tick at this interval.
 	// 2. to spread evaluations of rules that need to be evaluated at the current tick T. In other words, the evaluation of rules at the tick T will be evenly spread in the interval from T to T+scheduler_tick_interval.
@@ -347,6 +312,9 @@ func (cfg *Cfg) ReadUnifiedAlertingSettings(iniFile *ini.File) error {
 		uaCfg.DefaultRuleEvaluationInterval = uaMinInterval
 	}
 
+	quotas := iniFile.Section("quota")
+	uaCfg.RulesPerRuleGroupLimit = quotas.Key("alerting_rule_group_rules").MustInt64(100)
+
 	remoteAlertmanager := iniFile.Section("remote.alertmanager")
 	uaCfgRemoteAM := RemoteAlertmanagerSettings{
 		Enable:   remoteAlertmanager.Key("enabled").MustBool(false),
@@ -354,6 +322,11 @@ func (cfg *Cfg) ReadUnifiedAlertingSettings(iniFile *ini.File) error {
 		TenantID: remoteAlertmanager.Key("tenant").MustString(""),
 		Password: remoteAlertmanager.Key("password").MustString(""),
 	}
+	uaCfgRemoteAM.SyncInterval, err = gtime.ParseDuration(valueAsString(remoteAlertmanager, "sync_interval", (schedulerDefaultAdminConfigPollInterval).String()))
+	if err != nil {
+		return err
+	}
+
 	uaCfg.RemoteAlertmanager = uaCfgRemoteAM
 
 	screenshots := iniFile.Section("unified_alerting.screenshots")
@@ -391,6 +364,7 @@ func (cfg *Cfg) ReadUnifiedAlertingSettings(iniFile *ini.File) error {
 		LokiTenantID:          stateHistory.Key("loki_tenant_id").MustString(""),
 		LokiBasicAuthUsername: stateHistory.Key("loki_basic_auth_username").MustString(""),
 		LokiBasicAuthPassword: stateHistory.Key("loki_basic_auth_password").MustString(""),
+		LokiMaxQueryLength:    stateHistory.Key("loki_max_query_length").MustDuration(lokiDefaultMaxQueryLength),
 		MultiPrimary:          stateHistory.Key("primary").MustString(""),
 		MultiSecondaries:      splitTrim(stateHistory.Key("secondaries").MustString(""), ","),
 		ExternalLabels:        stateHistoryLabels.KeysHash(),
@@ -399,6 +373,11 @@ func (cfg *Cfg) ReadUnifiedAlertingSettings(iniFile *ini.File) error {
 
 	uaCfg.MaxStateSaveConcurrency = ua.Key("max_state_save_concurrency").MustInt(1)
 
+	uaCfg.StatePeriodicSaveInterval, err = gtime.ParseDuration(valueAsString(ua, "state_periodic_save_interval", (time.Minute * 5).String()))
+	if err != nil {
+		return err
+	}
+
 	cfg.UnifiedAlerting = uaCfg
 	return nil
 }
diff --git a/pkg/setting/setting_unified_alerting_test.go b/pkg/setting/setting_unified_alerting_test.go
index af9b73678d637..4e7285203f675 100644
--- a/pkg/setting/setting_unified_alerting_test.go
+++ b/pkg/setting/setting_unified_alerting_test.go
@@ -93,7 +93,7 @@ func TestUnifiedAlertingSettings(t *testing.T) {
 			alertingOptions: map[string]string{
 				"max_attempts":               strconv.FormatInt(schedulerDefaultMaxAttempts, 10),
 				"min_interval_seconds":       strconv.FormatInt(schedulerDefaultLegacyMinInterval, 10),
-				"execute_alerts":             strconv.FormatBool(schedulereDefaultExecuteAlerts),
+				"execute_alerts":             strconv.FormatBool(schedulerDefaultExecuteAlerts),
 				"evaluation_timeout_seconds": strconv.FormatInt(int64(evaluatorDefaultEvaluationTimeout.Seconds()), 10),
 			},
 			verifyCfg: func(t *testing.T, cfg Cfg) {
@@ -110,20 +110,19 @@ func TestUnifiedAlertingSettings(t *testing.T) {
 			desc: "when the unified options equal the defaults, it should apply the legacy ones",
 			unifiedAlertingOptions: map[string]string{
 				"admin_config_poll_interval": "120s",
-				"max_attempts":               strconv.FormatInt(schedulerDefaultMaxAttempts, 10),
 				"min_interval":               SchedulerBaseInterval.String(),
-				"execute_alerts":             strconv.FormatBool(schedulereDefaultExecuteAlerts),
+				"execute_alerts":             strconv.FormatBool(schedulerDefaultExecuteAlerts),
 				"evaluation_timeout":         evaluatorDefaultEvaluationTimeout.String(),
 			},
 			alertingOptions: map[string]string{
-				"max_attempts":               "12",
+				"max_attempts":               "1",
 				"min_interval_seconds":       "120",
 				"execute_alerts":             "true",
 				"evaluation_timeout_seconds": "160",
 			},
 			verifyCfg: func(t *testing.T, cfg Cfg) {
 				require.Equal(t, 120*time.Second, cfg.UnifiedAlerting.AdminConfigPollInterval)
-				require.Equal(t, int64(12), cfg.UnifiedAlerting.MaxAttempts)
+				require.Equal(t, int64(1), cfg.UnifiedAlerting.MaxAttempts)
 				require.Equal(t, 120*time.Second, cfg.UnifiedAlerting.MinInterval)
 				require.Equal(t, true, cfg.UnifiedAlerting.ExecuteAlerts)
 				require.Equal(t, 160*time.Second, cfg.UnifiedAlerting.EvaluationTimeout)
@@ -149,7 +148,7 @@ func TestUnifiedAlertingSettings(t *testing.T) {
 				require.Equal(t, alertmanagerDefaultConfigPollInterval, cfg.UnifiedAlerting.AdminConfigPollInterval)
 				require.Equal(t, int64(schedulerDefaultMaxAttempts), cfg.UnifiedAlerting.MaxAttempts)
 				require.Equal(t, SchedulerBaseInterval, cfg.UnifiedAlerting.MinInterval)
-				require.Equal(t, schedulereDefaultExecuteAlerts, cfg.UnifiedAlerting.ExecuteAlerts)
+				require.Equal(t, schedulerDefaultExecuteAlerts, cfg.UnifiedAlerting.ExecuteAlerts)
 				require.Equal(t, evaluatorDefaultEvaluationTimeout, cfg.UnifiedAlerting.EvaluationTimeout)
 				require.Equal(t, SchedulerBaseInterval, cfg.UnifiedAlerting.BaseInterval)
 				require.Equal(t, DefaultRuleEvaluationInterval, cfg.UnifiedAlerting.DefaultRuleEvaluationInterval)
@@ -164,14 +163,14 @@ func TestUnifiedAlertingSettings(t *testing.T) {
 				"evaluation_timeout": "invalid",
 			},
 			alertingOptions: map[string]string{
-				"max_attempts":               "12",
+				"max_attempts":               "1",
 				"min_interval_seconds":       "120",
 				"execute_alerts":             "false",
 				"evaluation_timeout_seconds": "160",
 			},
 			verifyCfg: func(t *testing.T, cfg Cfg) {
 				require.Equal(t, alertmanagerDefaultConfigPollInterval, cfg.UnifiedAlerting.AdminConfigPollInterval)
-				require.Equal(t, int64(12), cfg.UnifiedAlerting.MaxAttempts)
+				require.Equal(t, int64(1), cfg.UnifiedAlerting.MaxAttempts)
 				require.Equal(t, 120*time.Second, cfg.UnifiedAlerting.MinInterval)
 				require.Equal(t, false, cfg.UnifiedAlerting.ExecuteAlerts)
 				require.Equal(t, 160*time.Second, cfg.UnifiedAlerting.EvaluationTimeout)
diff --git a/pkg/tests/api/alerting/api_admin_configuration_test.go b/pkg/tests/api/alerting/api_admin_configuration_test.go
index 7ceae36e0b05f..ed601c60ff2cc 100644
--- a/pkg/tests/api/alerting/api_admin_configuration_test.go
+++ b/pkg/tests/api/alerting/api_admin_configuration_test.go
@@ -10,11 +10,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/grafana/grafana/pkg/expr"
+	"github.com/prometheus/alertmanager/config"
+	"github.com/prometheus/alertmanager/pkg/labels"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/expr"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
@@ -352,3 +354,49 @@ func TestIntegrationAdminConfiguration_SendingToExternalAlertmanagers(t *testing
 		}, 16*time.Second, 8*time.Second) // the sync interval is 2s so after 8s all alertmanagers (if any) most probably are started
 	}
 }
+
+func TestIntegrationAdminConfiguration_CannotCreateInhibitionRules(t *testing.T) {
+	testinfra.SQLiteIntegrationTest(t)
+	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
+		DisableLegacyAlerting: true,
+		EnableUnifiedAlerting: true,
+		AppModeProduction:     true,
+	})
+	grafanaListedAddr, store := testinfra.StartGrafana(t, dir, path)
+	createUser(t, store, user.CreateUserCommand{
+		DefaultOrgRole: string(org.RoleAdmin),
+		Password:       "admin",
+		Login:          "admin",
+	})
+	client := newAlertingApiClient(grafanaListedAddr, "admin", "admin")
+
+	cfg := apimodels.PostableUserConfig{
+		AlertmanagerConfig: apimodels.PostableApiAlertingConfig{
+			Config: apimodels.Config{
+				Route: &apimodels.Route{
+					Receiver: "test",
+				},
+				InhibitRules: []config.InhibitRule{{
+					SourceMatchers: config.Matchers{{
+						Type:  labels.MatchEqual,
+						Name:  "foo",
+						Value: "bar",
+					}},
+					TargetMatchers: config.Matchers{{
+						Type:  labels.MatchEqual,
+						Name:  "bar",
+						Value: "baz",
+					}},
+				}},
+			},
+			Receivers: []*apimodels.PostableApiReceiver{{
+				Receiver: config.Receiver{
+					Name: "test",
+				},
+			}},
+		},
+	}
+	ok, err := client.PostConfiguration(t, cfg)
+	require.False(t, ok)
+	require.EqualError(t, err, "inhibition rules are not supported")
+}
diff --git a/pkg/tests/api/alerting/api_alertmanager_configuration_test.go b/pkg/tests/api/alerting/api_alertmanager_configuration_test.go
index cc9900e989f6f..52a2ad469418e 100644
--- a/pkg/tests/api/alerting/api_alertmanager_configuration_test.go
+++ b/pkg/tests/api/alerting/api_alertmanager_configuration_test.go
@@ -10,10 +10,14 @@ import (
 	"testing"
 	"time"
 
+	"github.com/prometheus/alertmanager/config"
+	"github.com/prometheus/alertmanager/pkg/labels"
+	"github.com/prometheus/alertmanager/timeinterval"
+	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/org/orgimpl"
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
@@ -21,6 +25,253 @@ import (
 	"github.com/grafana/grafana/pkg/tests/testinfra"
 )
 
+func TestIntegrationAlertmanagerConfiguration(t *testing.T) {
+	testinfra.SQLiteIntegrationTest(t)
+	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
+		DisableLegacyAlerting: true,
+		EnableUnifiedAlerting: true,
+		AppModeProduction:     true,
+	})
+	grafanaListedAddr, store := testinfra.StartGrafana(t, dir, path)
+	createUser(t, store, user.CreateUserCommand{
+		DefaultOrgRole: string(org.RoleAdmin),
+		Password:       "admin",
+		Login:          "admin",
+	})
+	client := newAlertingApiClient(grafanaListedAddr, "admin", "admin")
+
+	cases := []struct {
+		name   string
+		cfg    apimodels.PostableUserConfig
+		expErr string
+	}{{
+		name: "configuration with default route",
+		cfg: apimodels.PostableUserConfig{
+			AlertmanagerConfig: apimodels.PostableApiAlertingConfig{
+				Config: apimodels.Config{
+					Route: &apimodels.Route{
+						Receiver: "test",
+					},
+				},
+				Receivers: []*apimodels.PostableApiReceiver{{
+					Receiver: config.Receiver{
+						Name: "test",
+					},
+				}},
+			},
+		},
+	}, {
+		name: "configuration with UTF-8 matchers",
+		cfg: apimodels.PostableUserConfig{
+			AlertmanagerConfig: apimodels.PostableApiAlertingConfig{
+				Config: apimodels.Config{
+					Route: &apimodels.Route{
+						Receiver: "test",
+						Routes: []*apimodels.Route{{
+							GroupBy: []model.LabelName{"foo🙂"},
+							Matchers: config.Matchers{{
+								Type:  labels.MatchEqual,
+								Name:  "foo🙂",
+								Value: "bar",
+							}, {
+								Type:  labels.MatchNotEqual,
+								Name:  "_bar1",
+								Value: "baz🙂",
+							}, {
+								Type:  labels.MatchRegexp,
+								Name:  "0baz",
+								Value: "[a-zA-Z0-9]+,?",
+							}, {
+								Type:  labels.MatchNotRegexp,
+								Name:  "corge",
+								Value: "^[0-9]+((,[0-9]{3})*(,[0-9]{0,3})?)?$",
+							}, {
+								Type:  labels.MatchEqual,
+								Name:  "Προμηθέας", // Prometheus in Greek
+								Value: "Prom",
+							}, {
+								Type:  labels.MatchNotEqual,
+								Name:  "犬", // Dog in Japanese
+								Value: "Shiba Inu",
+							}},
+						}},
+					},
+				},
+				Receivers: []*apimodels.PostableApiReceiver{{
+					Receiver: config.Receiver{
+						Name: "test",
+					},
+				}},
+			},
+		},
+	}, {
+		name: "configuration with UTF-8 object matchers",
+		cfg: apimodels.PostableUserConfig{
+			AlertmanagerConfig: apimodels.PostableApiAlertingConfig{
+				Config: apimodels.Config{
+					Route: &apimodels.Route{
+						Receiver: "test",
+						Routes: []*apimodels.Route{{
+							GroupBy: []model.LabelName{"foo🙂"},
+							ObjectMatchers: apimodels.ObjectMatchers{{
+								Type:  labels.MatchEqual,
+								Name:  "foo🙂",
+								Value: "bar",
+							}, {
+								Type:  labels.MatchNotEqual,
+								Name:  "_bar1",
+								Value: "baz🙂",
+							}, {
+								Type:  labels.MatchRegexp,
+								Name:  "0baz",
+								Value: "[a-zA-Z0-9]+,?",
+							}, {
+								Type:  labels.MatchNotRegexp,
+								Name:  "corge",
+								Value: "^[0-9]+((,[0-9]{3})*(,[0-9]{0,3})?)?$",
+							}, {
+								Type:  labels.MatchEqual,
+								Name:  "Προμηθέας", // Prometheus in Greek
+								Value: "Prom",
+							}, {
+								Type:  labels.MatchNotEqual,
+								Name:  "犬", // Dog in Japanese
+								Value: "Shiba Inu",
+							}},
+						}},
+					},
+				},
+				Receivers: []*apimodels.PostableApiReceiver{{
+					Receiver: config.Receiver{
+						Name: "test",
+					},
+				}},
+			},
+		},
+	}, {
+		name: "configuration with UTF-8 in both matchers and object matchers",
+		cfg: apimodels.PostableUserConfig{
+			AlertmanagerConfig: apimodels.PostableApiAlertingConfig{
+				Config: apimodels.Config{
+					Route: &apimodels.Route{
+						Receiver: "test",
+						Routes: []*apimodels.Route{{
+							GroupBy: []model.LabelName{"foo🙂"},
+							Matchers: config.Matchers{{
+								Type:  labels.MatchEqual,
+								Name:  "foo🙂",
+								Value: "bar",
+							}, {
+								Type:  labels.MatchNotEqual,
+								Name:  "_bar1",
+								Value: "baz🙂",
+							}, {
+								Type:  labels.MatchRegexp,
+								Name:  "0baz",
+								Value: "[a-zA-Z0-9]+,?",
+							}, {
+								Type:  labels.MatchNotRegexp,
+								Name:  "corge",
+								Value: "^[0-9]+((,[0-9]{3})*(,[0-9]{0,3})?)?$",
+							}},
+							ObjectMatchers: apimodels.ObjectMatchers{{
+								Type:  labels.MatchEqual,
+								Name:  "Προμηθέας", // Prometheus in Greek
+								Value: "Prom",
+							}, {
+								Type:  labels.MatchNotEqual,
+								Name:  "犬", // Dog in Japanese
+								Value: "Shiba Inu",
+							}},
+						}},
+					},
+				},
+				Receivers: []*apimodels.PostableApiReceiver{{
+					Receiver: config.Receiver{
+						Name: "test",
+					},
+				}},
+			},
+		},
+	}, {
+		// TODO: Mute time intervals is deprecated in Alertmanager and scheduled to be
+		// removed before version 1.0. Remove this test when support for mute time
+		// intervals is removed.
+		name: "configuration with mute time intervals",
+		cfg: apimodels.PostableUserConfig{
+			AlertmanagerConfig: apimodels.PostableApiAlertingConfig{
+				Config: apimodels.Config{
+					Route: &apimodels.Route{
+						Receiver: "test",
+						Routes: []*apimodels.Route{{
+							MuteTimeIntervals: []string{"weekends"},
+						}},
+					},
+					MuteTimeIntervals: []config.MuteTimeInterval{{
+						Name: "weekends",
+						TimeIntervals: []timeinterval.TimeInterval{{
+							Weekdays: []timeinterval.WeekdayRange{{
+								InclusiveRange: timeinterval.InclusiveRange{
+									Begin: 1,
+									End:   5,
+								},
+							}},
+						}},
+					}},
+				},
+				Receivers: []*apimodels.PostableApiReceiver{{
+					Receiver: config.Receiver{
+						Name: "test",
+					},
+				}},
+			},
+		},
+	}, {
+		name: "configuration with time intervals",
+		cfg: apimodels.PostableUserConfig{
+			AlertmanagerConfig: apimodels.PostableApiAlertingConfig{
+				Config: apimodels.Config{
+					Route: &apimodels.Route{
+						Receiver: "test",
+						Routes: []*apimodels.Route{{
+							MuteTimeIntervals: []string{"weekends"},
+						}},
+					},
+					TimeIntervals: []config.TimeInterval{{
+						Name: "weekends",
+						TimeIntervals: []timeinterval.TimeInterval{{
+							Weekdays: []timeinterval.WeekdayRange{{
+								InclusiveRange: timeinterval.InclusiveRange{
+									Begin: 1,
+									End:   5,
+								},
+							}},
+						}},
+					}},
+				},
+				Receivers: []*apimodels.PostableApiReceiver{{
+					Receiver: config.Receiver{
+						Name: "test",
+					},
+				}},
+			},
+		},
+	}}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			ok, err := client.PostConfiguration(t, tc.cfg)
+			if tc.expErr != "" {
+				require.EqualError(t, err, tc.expErr)
+				require.False(t, ok)
+			} else {
+				require.NoError(t, err)
+				require.True(t, ok)
+			}
+		})
+	}
+}
+
 func TestIntegrationAlertmanagerConfigurationIsTransactional(t *testing.T) {
 	testinfra.SQLiteIntegrationTest(t)
 
@@ -231,7 +482,7 @@ func TestIntegrationAlertmanagerConfigurationPersistSecrets(t *testing.T) {
 	// The secure settings must be present
 	{
 		resp := getRequest(t, alertConfigURL, http.StatusOK) // nolint
-		var c definitions.GettableUserConfig
+		var c apimodels.GettableUserConfig
 		bb := getBody(t, resp.Body)
 		err := json.Unmarshal([]byte(bb), &c)
 		require.NoError(t, err)
diff --git a/pkg/tests/api/alerting/api_alertmanager_test.go b/pkg/tests/api/alerting/api_alertmanager_test.go
index 7b9f12683166d..8ea5bdfa20fd9 100644
--- a/pkg/tests/api/alerting/api_alertmanager_test.go
+++ b/pkg/tests/api/alerting/api_alertmanager_test.go
@@ -12,12 +12,13 @@ import (
 	"testing"
 	"time"
 
+	"github.com/go-openapi/strfmt"
+	amv2 "github.com/prometheus/alertmanager/api/v2/models"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/expr"
-
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
 	ngstore "github.com/grafana/grafana/pkg/services/ngalert/store"
@@ -30,6 +31,8 @@ import (
 	"github.com/grafana/grafana/pkg/services/user/userimpl"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/util"
+	"github.com/grafana/grafana/pkg/util/errutil"
 )
 
 type Response struct {
@@ -142,13 +145,11 @@ func TestIntegrationAMConfigAccess(t *testing.T) {
 	})
 
 	t.Run("when retrieve alertmanager configuration", func(t *testing.T) {
-		cfgBody := `
+		cfgTemplate := `
 		{
 			"template_files": null,
 			"alertmanager_config": {
-				"route": {
-					"receiver": "grafana-default-email"
-				},
+				"route": %s,
 				"templates": null,
 				"receivers": [{
 					"name": "grafana-default-email",
@@ -166,6 +167,22 @@ func TestIntegrationAMConfigAccess(t *testing.T) {
 			}
 		}
 		`
+		cfgWithoutAutogen := fmt.Sprintf(cfgTemplate, `{
+			"receiver": "grafana-default-email"
+		}`)
+		cfgWithAutogen := fmt.Sprintf(cfgTemplate, `{
+					"receiver": "grafana-default-email",
+					"routes": [{
+						"receiver": "grafana-default-email",
+						"object_matchers": [["__grafana_autogenerated__", "=", "true"]],
+						"routes": [{
+							"receiver": "grafana-default-email",
+							"group_by": ["grafana_folder", "alertname"],
+							"object_matchers": [["__grafana_receiver__", "=", "grafana-default-email"]]
+						}]
+					}]
+				}`)
+
 		testCases := []testCase{
 			{
 				desc:      "un-authenticated request should fail",
@@ -177,19 +194,19 @@ func TestIntegrationAMConfigAccess(t *testing.T) {
 				desc:      "viewer request should succeed",
 				url:       "http://viewer:viewer@%s/api/alertmanager/grafana/config/api/v1/alerts",
 				expStatus: http.StatusOK,
-				expBody:   cfgBody,
+				expBody:   cfgWithoutAutogen,
 			},
 			{
 				desc:      "editor request should succeed",
 				url:       "http://editor:editor@%s/api/alertmanager/grafana/config/api/v1/alerts",
 				expStatus: http.StatusOK,
-				expBody:   cfgBody,
+				expBody:   cfgWithoutAutogen,
 			},
 			{
 				desc:      "admin request should succeed",
 				url:       "http://admin:admin@%s/api/alertmanager/grafana/config/api/v1/alerts",
 				expStatus: http.StatusOK,
-				expBody:   cfgBody,
+				expBody:   cfgWithAutogen,
 			},
 		}
 
@@ -611,7 +628,7 @@ func TestIntegrationRulerAccess(t *testing.T) {
 			desc:            "viewer request should fail",
 			client:          newAlertingApiClient(grafanaListedAddr, "viewer", "viewer"),
 			expStatus:       http.StatusForbidden,
-			expectedMessage: `You'll need additional permissions to perform this action. Permissions needed: any of alert.rules:write, alert.rules:create, alert.rules:delete`,
+			expectedMessage: `You'll need additional permissions to perform this action. Permissions needed: all of alert.rules:read, folders:read, any of alert.rules:write, alert.rules:create, alert.rules:delete`,
 		},
 		{
 			desc:            "editor request should succeed",
@@ -703,7 +720,7 @@ func TestIntegrationDeleteFolderWithRules(t *testing.T) {
 	apiClient := newAlertingApiClient(grafanaListedAddr, "editor", "editor")
 
 	// Create the namespace we'll save our alerts to.
-	namespaceUID := "default"
+	namespaceUID := "default" //nolint:goconst
 	apiClient.CreateFolder(t, namespaceUID, namespaceUID)
 
 	createRule(t, apiClient, "default")
@@ -771,7 +788,6 @@ func TestIntegrationDeleteFolderWithRules(t *testing.T) {
 								"version": 1,
 								"uid": "",
 								"namespace_uid": %q,
-								"namespace_id": 1,
 								"rule_group": "arulegroup",
 								"no_data_state": "NoData",
 								"exec_err_state": "Alerting"
@@ -799,7 +815,10 @@ func TestIntegrationDeleteFolderWithRules(t *testing.T) {
 		b, err := io.ReadAll(resp.Body)
 		require.NoError(t, err)
 		require.Equal(t, http.StatusBadRequest, resp.StatusCode)
-		require.JSONEq(t, `{"message":"folder cannot be deleted: folder contains alert rules"}`, string(b))
+		var errutilErr errutil.PublicError
+		err = json.Unmarshal(b, &errutilErr)
+		require.NoError(t, err)
+		assert.Equal(t, "Folder cannot be deleted: folder is not empty", errutilErr.Message)
 	}
 
 	// Next, the editor can delete the folder if forceDeleteRules is true.
@@ -1045,13 +1064,13 @@ func TestIntegrationAlertRuleCRUD(t *testing.T) {
 				},
 				expectedCode: func() int {
 					if setting.IsEnterprise {
-						return http.StatusUnauthorized
+						return http.StatusForbidden
 					}
 					return http.StatusBadRequest
 				}(),
 				expectedMessage: func() string {
 					if setting.IsEnterprise {
-						return "user is not authorized to create a new alert rule 'AlwaysFiring' because the user does not have read permissions for one or many datasources the rule uses"
+						return "user is not authorized to create a new alert rule 'AlwaysFiring'"
 					}
 					return "failed to update rule group: invalid alert rule 'AlwaysFiring': failed to build query 'A': data source not found"
 				}(),
@@ -1246,7 +1265,6 @@ func TestIntegrationAlertRuleCRUD(t *testing.T) {
 						  "version":1,
 						  "uid":"uid",
 						  "namespace_uid":"nsuid",
-						  "namespace_id":1,
 						  "rule_group":"arulegroup",
 						  "no_data_state":"NoData",
 						  "exec_err_state":"Alerting"
@@ -1283,7 +1301,6 @@ func TestIntegrationAlertRuleCRUD(t *testing.T) {
 						  "version":1,
 						  "uid":"uid",
 						  "namespace_uid":"nsuid",
-						  "namespace_id":1,
 						  "rule_group":"arulegroup",
 						  "no_data_state":"Alerting",
 						  "exec_err_state":"Alerting"
@@ -1592,7 +1609,6 @@ func TestIntegrationAlertRuleCRUD(t *testing.T) {
 		                  "version":2,
 		                  "uid":"uid",
 		                  "namespace_uid":"nsuid",
-		                  "namespace_id":1,
 		                  "rule_group":"arulegroup",
 		                  "no_data_state":"Alerting",
 		                  "exec_err_state":"Alerting"
@@ -1702,7 +1718,6 @@ func TestIntegrationAlertRuleCRUD(t *testing.T) {
 					  "version":3,
 					  "uid":"uid",
 					  "namespace_uid":"nsuid",
-					  "namespace_id":1,
 					  "rule_group":"arulegroup",
 					  "no_data_state":"Alerting",
 					  "exec_err_state":"Alerting"
@@ -1791,7 +1806,6 @@ func TestIntegrationAlertRuleCRUD(t *testing.T) {
 					  "version":3,
 					  "uid":"uid",
 					  "namespace_uid":"nsuid",
-					  "namespace_id":1,
 					  "rule_group":"arulegroup",
 					  "no_data_state":"Alerting",
 					  "exec_err_state":"Alerting"
@@ -1844,6 +1858,155 @@ func TestIntegrationAlertRuleCRUD(t *testing.T) {
 	}
 }
 
+func TestIntegrationAlertmanagerCreateSilence(t *testing.T) {
+	testinfra.SQLiteIntegrationTest(t)
+	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
+		DisableLegacyAlerting: true,
+		EnableUnifiedAlerting: true,
+		AppModeProduction:     true,
+	})
+	grafanaListedAddr, store := testinfra.StartGrafana(t, dir, path)
+	createUser(t, store, user.CreateUserCommand{
+		DefaultOrgRole: string(org.RoleAdmin),
+		Password:       "admin",
+		Login:          "admin",
+	})
+	client := newAlertingApiClient(grafanaListedAddr, "admin", "admin")
+
+	cases := []struct {
+		name    string
+		silence apimodels.PostableSilence
+		expErr  string
+	}{{
+		name: "can create silence for foo=bar",
+		silence: apimodels.PostableSilence{
+			Silence: amv2.Silence{
+				Comment:   util.Pointer("This is a comment"),
+				CreatedBy: util.Pointer("test"),
+				EndsAt:    util.Pointer(strfmt.DateTime(time.Now().Add(time.Minute))),
+				Matchers: amv2.Matchers{{
+					IsEqual: util.Pointer(true),
+					IsRegex: util.Pointer(false),
+					Name:    util.Pointer("foo"),
+					Value:   util.Pointer("bar"),
+				}},
+				StartsAt: util.Pointer(strfmt.DateTime(time.Now())),
+			},
+		},
+	}, {
+		name: "can create silence for _foo1=bar",
+		silence: apimodels.PostableSilence{
+			Silence: amv2.Silence{
+				Comment:   util.Pointer("This is a comment"),
+				CreatedBy: util.Pointer("test"),
+				EndsAt:    util.Pointer(strfmt.DateTime(time.Now().Add(time.Minute))),
+				Matchers: amv2.Matchers{{
+					IsEqual: util.Pointer(true),
+					IsRegex: util.Pointer(false),
+					Name:    util.Pointer("_foo1"),
+					Value:   util.Pointer("bar"),
+				}},
+				StartsAt: util.Pointer(strfmt.DateTime(time.Now())),
+			},
+		},
+	}, {
+		name: "can create silence for 0foo=bar",
+		silence: apimodels.PostableSilence{
+			Silence: amv2.Silence{
+				Comment:   util.Pointer("This is a comment"),
+				CreatedBy: util.Pointer("test"),
+				EndsAt:    util.Pointer(strfmt.DateTime(time.Now().Add(time.Minute))),
+				Matchers: amv2.Matchers{{
+					IsEqual: util.Pointer(true),
+					IsRegex: util.Pointer(false),
+					Name:    util.Pointer("0foo"),
+					Value:   util.Pointer("bar"),
+				}},
+				StartsAt: util.Pointer(strfmt.DateTime(time.Now())),
+			},
+		},
+	}, {
+		name: "can create silence for foo=🙂bar",
+		silence: apimodels.PostableSilence{
+			Silence: amv2.Silence{
+				Comment:   util.Pointer("This is a comment"),
+				CreatedBy: util.Pointer("test"),
+				EndsAt:    util.Pointer(strfmt.DateTime(time.Now().Add(time.Minute))),
+				Matchers: amv2.Matchers{{
+					IsEqual: util.Pointer(true),
+					IsRegex: util.Pointer(false),
+					Name:    util.Pointer("foo"),
+					Value:   util.Pointer("🙂bar"),
+				}},
+				StartsAt: util.Pointer(strfmt.DateTime(time.Now())),
+			},
+		},
+	}, {
+		name: "can create silence for foo🙂=bar",
+		silence: apimodels.PostableSilence{
+			Silence: amv2.Silence{
+				Comment:   util.Pointer("This is a comment"),
+				CreatedBy: util.Pointer("test"),
+				EndsAt:    util.Pointer(strfmt.DateTime(time.Now().Add(time.Minute))),
+				Matchers: amv2.Matchers{{
+					IsEqual: util.Pointer(true),
+					IsRegex: util.Pointer(false),
+					Name:    util.Pointer("foo🙂"),
+					Value:   util.Pointer("bar"),
+				}},
+				StartsAt: util.Pointer(strfmt.DateTime(time.Now())),
+			},
+		},
+	}, {
+		name: "can't create silence for missing label name",
+		silence: apimodels.PostableSilence{
+			Silence: amv2.Silence{
+				Comment:   util.Pointer("This is a comment"),
+				CreatedBy: util.Pointer("test"),
+				EndsAt:    util.Pointer(strfmt.DateTime(time.Now().Add(time.Minute))),
+				Matchers: amv2.Matchers{{
+					IsEqual: util.Pointer(true),
+					IsRegex: util.Pointer(false),
+					Name:    util.Pointer(""),
+					Value:   util.Pointer("bar"),
+				}},
+				StartsAt: util.Pointer(strfmt.DateTime(time.Now())),
+			},
+		},
+		expErr: "unable to save silence: silence invalid: invalid label matcher 0: invalid label name \"\": unable to create silence",
+	}, {
+		name: "can't create silence for missing label value",
+		silence: apimodels.PostableSilence{
+			Silence: amv2.Silence{
+				Comment:   util.Pointer("This is a comment"),
+				CreatedBy: util.Pointer("test"),
+				EndsAt:    util.Pointer(strfmt.DateTime(time.Now().Add(time.Minute))),
+				Matchers: amv2.Matchers{{
+					IsEqual: util.Pointer(true),
+					IsRegex: util.Pointer(false),
+					Name:    util.Pointer("foo"),
+					Value:   util.Pointer(""),
+				}},
+				StartsAt: util.Pointer(strfmt.DateTime(time.Now())),
+			},
+		},
+		expErr: "unable to save silence: silence invalid: at least one matcher must not match the empty string: unable to create silence",
+	}}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			silenceID, err := client.PostSilence(t, tc.silence)
+			if tc.expErr != "" {
+				require.EqualError(t, err, tc.expErr)
+				require.Empty(t, silenceID)
+			} else {
+				require.NoError(t, err)
+				require.NotEmpty(t, silenceID)
+			}
+		})
+	}
+}
+
 func TestIntegrationAlertmanagerStatus(t *testing.T) {
 	testinfra.SQLiteIntegrationTest(t)
 
@@ -1851,35 +2014,44 @@ func TestIntegrationAlertmanagerStatus(t *testing.T) {
 	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
 		DisableLegacyAlerting: true,
 		EnableUnifiedAlerting: true,
+		DisableAnonymous:      true,
 		AppModeProduction:     true,
 	})
 
-	grafanaListedAddr, _ := testinfra.StartGrafana(t, dir, path)
+	grafanaListedAddr, store := testinfra.StartGrafana(t, dir, path)
 
-	// Get the Alertmanager current status.
-	{
-		alertsURL := fmt.Sprintf("http://%s/api/alertmanager/grafana/api/v2/status", grafanaListedAddr)
-		// nolint:gosec
-		resp, err := http.Get(alertsURL)
-		require.NoError(t, err)
-		t.Cleanup(func() {
-			err := resp.Body.Close()
-			require.NoError(t, err)
-		})
-		b, err := io.ReadAll(resp.Body)
-		require.NoError(t, err)
-		require.Equal(t, 200, resp.StatusCode)
-		require.JSONEq(t, `
+	// Create a users to make authenticated requests
+	createUser(t, store, user.CreateUserCommand{
+		DefaultOrgRole: string(org.RoleViewer),
+		Password:       "viewer",
+		Login:          "viewer",
+	})
+	createUser(t, store, user.CreateUserCommand{
+		DefaultOrgRole: string(org.RoleEditor),
+		Password:       "editor",
+		Login:          "editor",
+	})
+	createUser(t, store, user.CreateUserCommand{
+		DefaultOrgRole: string(org.RoleAdmin),
+		Password:       "admin",
+		Login:          "admin",
+	})
+
+	type testCase struct {
+		desc      string
+		url       string
+		expStatus int
+		expBody   string
+	}
+
+	cfgTemplate := `
 {
 	"cluster": {
 		"peers": [],
 		"status": "disabled"
 	},
 	"config": {
-		"route": {
-			"receiver": "grafana-default-email",
-			"group_by": ["grafana_folder", "alertname"]
-		},
+		"route": %s,
 		"templates": null,
 		"receivers": [{
 			"name": "grafana-default-email",
@@ -1905,7 +2077,68 @@ func TestIntegrationAlertmanagerStatus(t *testing.T) {
 		"version": "N/A"
 	}
 }
-`, string(b))
+`
+	cfgWithoutAutogen := fmt.Sprintf(cfgTemplate, `{
+			"receiver": "grafana-default-email",
+			"group_by": ["grafana_folder", "alertname"]
+		}`)
+	cfgWithAutogen := fmt.Sprintf(cfgTemplate, `{
+					"receiver": "grafana-default-email",
+					"routes": [{
+						"receiver": "grafana-default-email",
+						"object_matchers": [["__grafana_autogenerated__", "=", "true"]],
+						"routes": [{
+							"receiver": "grafana-default-email",
+							"group_by": ["grafana_folder", "alertname"],
+							"object_matchers": [["__grafana_receiver__", "=", "grafana-default-email"]]
+						}]
+					}],
+					"group_by": ["grafana_folder", "alertname"]
+				}`)
+
+	testCases := []testCase{
+		{
+			desc:      "un-authenticated request should fail",
+			url:       "http://%s/api/alertmanager/grafana/api/v2/status",
+			expStatus: http.StatusUnauthorized,
+			expBody:   `{"extra":null,"message":"Unauthorized","messageId":"auth.unauthorized","statusCode":401,"traceID":""}`,
+		},
+		{
+			desc:      "viewer request should succeed",
+			url:       "http://viewer:viewer@%s/api/alertmanager/grafana/api/v2/status",
+			expStatus: http.StatusOK,
+			expBody:   cfgWithoutAutogen,
+		},
+		{
+			desc:      "editor request should succeed",
+			url:       "http://editor:editor@%s/api/alertmanager/grafana/api/v2/status",
+			expStatus: http.StatusOK,
+			expBody:   cfgWithoutAutogen,
+		},
+		{
+			desc:      "admin request should succeed",
+			url:       "http://admin:admin@%s/api/alertmanager/grafana/api/v2/status",
+			expStatus: http.StatusOK,
+			expBody:   cfgWithAutogen,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.desc, func(t *testing.T) {
+			resp, err := http.Get(fmt.Sprintf(tc.url, grafanaListedAddr))
+			t.Cleanup(func() {
+				require.NoError(t, resp.Body.Close())
+			})
+			require.NoError(t, err)
+			require.Equal(t, tc.expStatus, resp.StatusCode)
+			b, err := io.ReadAll(resp.Body)
+			if tc.expStatus == http.StatusOK {
+				re := regexp.MustCompile(`"uid":"([\w|-]+)"`)
+				b = re.ReplaceAll(b, []byte(`"uid":""`))
+			}
+			require.NoError(t, err)
+			require.JSONEq(t, tc.expBody, string(b))
+		})
 	}
 }
 
@@ -2098,7 +2331,6 @@ func TestIntegrationQuota(t *testing.T) {
 						  "version":2,
 						  "uid":"uid",
 						  "namespace_uid":"nsuid",
-						  "namespace_id":1,
 						  "rule_group":"arulegroup",
 						  "no_data_state":"NoData",
 						  "exec_err_state":"Alerting"
@@ -2160,6 +2392,7 @@ func TestIntegrationEval(t *testing.T) {
 							}
 						}
 					],
+				"condition": "A",
 				"now": "2021-04-11T14:38:14Z"
 			}
 			`,
@@ -2217,6 +2450,7 @@ func TestIntegrationEval(t *testing.T) {
 							}
 						}
 					],
+				"condition": "A",
 				"now": "2021-04-11T14:38:14Z"
 			}
 			`,
@@ -2272,23 +2506,81 @@ func TestIntegrationEval(t *testing.T) {
 							}
 						}
 					],
+				"condition": "A",
 				"now": "2021-04-11T14:38:14Z"
 			}
 			`,
 			expectedResponse: func() string { return "" },
 			expectedStatusCode: func() int {
 				if setting.IsEnterprise {
-					return http.StatusUnauthorized
+					return http.StatusForbidden
 				}
 				return http.StatusBadRequest
 			},
 			expectedMessage: func() string {
 				if setting.IsEnterprise {
-					return "user is not authorized to query one or many data sources used by the rule"
+					return "user is not authorized to access one or many data sources"
 				}
 				return "Failed to build evaluator for queries and expressions: failed to build query 'A': data source not found"
 			},
 		},
+		{
+			desc: "condition is empty",
+			payload: `
+			{
+				"data": [
+						{
+							"refId": "A",
+							"relativeTimeRange": {
+								"from": 18000,
+								"to": 10800
+							},
+							"datasourceUid": "__expr__",
+							"model": {
+								"type":"math",
+								"expression":"1 > 2"
+							}
+						}
+					],
+				"now": "2021-04-11T14:38:14Z"
+			}
+			`,
+			expectedStatusCode: func() int { return http.StatusOK },
+			expectedMessage:    func() string { return "" },
+			expectedResponse: func() string {
+				return `{
+				"results": {
+				  "A": {
+					"status": 200,
+					"frames": [
+					  {
+						"schema": {
+						  "refId": "A",
+						  "fields": [
+							{
+							  "name": "A",
+							  "type": "number",
+							  "typeInfo": {
+								"frame": "float64",
+								"nullable": true
+							  }
+							}
+						  ]
+						},
+						"data": {
+						  "values": [
+							[
+							  0
+							]
+						  ]
+						}
+					  }
+					]
+				  }
+				}
+			}`
+			},
+		},
 	}
 
 	for _, tc := range testCases {
diff --git a/pkg/tests/api/alerting/api_backtesting_test.go b/pkg/tests/api/alerting/api_backtesting_test.go
index 286245fa500ec..f9f6f2c7e8feb 100644
--- a/pkg/tests/api/alerting/api_backtesting_test.go
+++ b/pkg/tests/api/alerting/api_backtesting_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/models/roletype"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/resourcepermissions"
 	"github.com/grafana/grafana/pkg/services/datasources"
@@ -18,7 +19,6 @@ import (
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/user"
-	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tests/testinfra"
 )
 
@@ -92,14 +92,11 @@ func TestBacktesting(t *testing.T) {
 	})
 
 	t.Run("if user does not have permissions", func(t *testing.T) {
-		if !setting.IsEnterprise {
-			t.Skip("Enterprise-only test")
-		}
-
 		testUserId := createUser(t, env.SQLStore, user.CreateUserCommand{
-			DefaultOrgRole: "",
+			DefaultOrgRole: string(roletype.RoleNone),
 			Password:       "test",
 			Login:          "test",
+			OrgID:          1,
 		})
 
 		testUserApiCli := newAlertingApiClient(grafanaListedAddr, "test", "test")
@@ -128,8 +125,8 @@ func TestBacktesting(t *testing.T) {
 
 		t.Run("fail if can't query data sources", func(t *testing.T) {
 			status, body := testUserApiCli.SubmitRuleForBacktesting(t, queryRequest)
-			require.Contains(t, body, "user is not authorized to query one or many data sources used by the rule")
-			require.Equalf(t, http.StatusUnauthorized, status, "Response: %s", body)
+			require.Contains(t, body, "user is not authorized to access one or many data sources")
+			require.Equalf(t, http.StatusForbidden, status, "Response: %s", body)
 		})
 	})
 }
diff --git a/pkg/tests/api/alerting/api_notifications_time_interval_test.go b/pkg/tests/api/alerting/api_notifications_time_interval_test.go
new file mode 100644
index 0000000000000..76b890ecdc524
--- /dev/null
+++ b/pkg/tests/api/alerting/api_notifications_time_interval_test.go
@@ -0,0 +1,204 @@
+package alerting
+
+import (
+	"net/http"
+	"slices"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/prometheus/alertmanager/config"
+	"github.com/prometheus/alertmanager/timeinterval"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/util"
+)
+
+func TestTimeInterval(t *testing.T) {
+	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
+		DisableLegacyAlerting: true,
+		EnableUnifiedAlerting: true,
+		DisableAnonymous:      true,
+		AppModeProduction:     true,
+	})
+
+	grafanaListedAddr, store := testinfra.StartGrafana(t, dir, path)
+
+	createUser(t, store, user.CreateUserCommand{
+		DefaultOrgRole: string(org.RoleAdmin),
+		Password:       "admin",
+		Login:          "admin",
+	})
+
+	apiClient := newAlertingApiClient(grafanaListedAddr, "admin", "admin")
+
+	t.Run("default config should return empty list", func(t *testing.T) {
+		mt, status, body := apiClient.GetAllTimeIntervalsWithStatus(t)
+		requireStatusCode(t, http.StatusOK, status, body)
+		require.Empty(t, mt)
+	})
+
+	emptyTimeInterval := definitions.PostableTimeIntervals{
+		Name:          "Empty Mute Timing",
+		TimeIntervals: []definitions.TimeIntervalItem{},
+	}
+
+	func() {
+		// TODO replace with Time-Interval later
+		emptyMuteTiming := definitions.MuteTimeInterval{
+			MuteTimeInterval: config.MuteTimeInterval{
+				Name:          "Empty Mute Timing",
+				TimeIntervals: []timeinterval.TimeInterval{},
+			},
+		}
+
+		// TODO replace with create interval API
+		// t.Run("should create a new mute timing without any intervals", func(t *testing.T) {
+		mt, status, body := apiClient.CreateMuteTimingWithStatus(t, emptyMuteTiming)
+		requireStatusCode(t, http.StatusCreated, status, body)
+		require.Equal(t, emptyMuteTiming.MuteTimeInterval, mt.MuteTimeInterval)
+		require.EqualValues(t, models.ProvenanceAPI, mt.Provenance)
+		// })
+
+		anotherMuteTiming := definitions.MuteTimeInterval{
+			MuteTimeInterval: config.MuteTimeInterval{
+				Name: "Not Empty Mute Timing",
+				TimeIntervals: []timeinterval.TimeInterval{
+					{
+						Times: []timeinterval.TimeRange{
+							{
+								StartMinute: 10,
+								EndMinute:   45,
+							},
+						},
+						Weekdays: []timeinterval.WeekdayRange{
+							{
+								InclusiveRange: timeinterval.InclusiveRange{
+									Begin: 0,
+									End:   2,
+								},
+							},
+							{
+								InclusiveRange: timeinterval.InclusiveRange{
+									Begin: 4,
+									End:   5,
+								},
+							},
+						},
+						DaysOfMonth: []timeinterval.DayOfMonthRange{
+							{
+								InclusiveRange: timeinterval.InclusiveRange{
+									Begin: 1,
+									End:   7,
+								},
+							},
+							{
+								InclusiveRange: timeinterval.InclusiveRange{
+									Begin: 14,
+									End:   28,
+								},
+							},
+						},
+						Months: []timeinterval.MonthRange{
+							{
+								InclusiveRange: timeinterval.InclusiveRange{
+									Begin: 1,
+									End:   5,
+								},
+							},
+						},
+						Years: []timeinterval.YearRange{
+							{
+								InclusiveRange: timeinterval.InclusiveRange{
+									Begin: 2024,
+									End:   2025,
+								},
+							},
+						},
+						Location: &timeinterval.Location{
+							Location: time.UTC,
+						},
+					},
+				},
+			},
+		}
+
+		// t.Run("should create a new mute timing with some settings", func(t *testing.T) {
+		mt, status, body = apiClient.CreateMuteTimingWithStatus(t, anotherMuteTiming)
+		requireStatusCode(t, http.StatusCreated, status, body)
+		require.Equal(t, anotherMuteTiming.MuteTimeInterval, mt.MuteTimeInterval)
+		require.EqualValues(t, models.ProvenanceAPI, mt.Provenance)
+		// })
+	}()
+
+	anotherTimeInterval := definitions.PostableTimeIntervals{
+		Name: "Not Empty Mute Timing",
+		TimeIntervals: []definitions.TimeIntervalItem{
+			{
+				Times: []definitions.TimeIntervalTimeRange{
+					{
+						StartMinute: "00:10",
+						EndMinute:   "00:45",
+					},
+				},
+				Weekdays: util.Pointer([]string{
+					"sunday:tuesday",
+					"thursday:friday",
+				}),
+				DaysOfMonth: util.Pointer([]string{
+					"1:7",
+					"14:28",
+				}),
+				Months: util.Pointer([]string{
+					"1:5",
+				}),
+				Years: util.Pointer([]string{
+					"2024:2025",
+				}),
+				Location: util.Pointer("UTC"),
+			},
+		},
+	}
+
+	t.Run("should return time interval by name", func(t *testing.T) {
+		ti, status, body := apiClient.GetTimeIntervalByNameWithStatus(t, emptyTimeInterval.Name)
+		requireStatusCode(t, http.StatusOK, status, body)
+		require.Equal(t, emptyTimeInterval.TimeIntervals, ti.TimeIntervals)
+		require.Equal(t, emptyTimeInterval.Name, ti.Name)
+		require.EqualValues(t, models.ProvenanceAPI, ti.Provenance)
+
+		ti, status, body = apiClient.GetTimeIntervalByNameWithStatus(t, anotherTimeInterval.Name)
+		requireStatusCode(t, http.StatusOK, status, body)
+		require.Equal(t, anotherTimeInterval.TimeIntervals, ti.TimeIntervals)
+		require.Equal(t, anotherTimeInterval.Name, ti.Name)
+		require.EqualValues(t, models.ProvenanceAPI, ti.Provenance)
+	})
+
+	t.Run("should return NotFound if time interval does not exist", func(t *testing.T) {
+		_, status, body := apiClient.GetTimeIntervalByNameWithStatus(t, "some-missing-timing")
+		requireStatusCode(t, http.StatusNotFound, status, body)
+	})
+
+	t.Run("should return all mute timings", func(t *testing.T) {
+		mt, status, body := apiClient.GetAllTimeIntervalsWithStatus(t)
+		requireStatusCode(t, http.StatusOK, status, body)
+		require.Len(t, mt, 2)
+
+		slices.SortFunc(mt, func(a, b definitions.GettableTimeIntervals) int {
+			return strings.Compare(a.Name, b.Name)
+		})
+
+		require.Equal(t, emptyTimeInterval.TimeIntervals, mt[0].TimeIntervals)
+		require.Equal(t, emptyTimeInterval.Name, mt[0].Name)
+		require.EqualValues(t, models.ProvenanceAPI, mt[0].Provenance)
+
+		require.Equal(t, anotherTimeInterval.TimeIntervals, mt[1].TimeIntervals)
+		require.Equal(t, anotherTimeInterval.Name, mt[1].Name)
+		require.EqualValues(t, models.ProvenanceAPI, mt[1].Provenance)
+	})
+}
diff --git a/pkg/tests/api/alerting/api_provisioning_test.go b/pkg/tests/api/alerting/api_provisioning_test.go
index 9a8c424abe5c7..2b732461bfe16 100644
--- a/pkg/tests/api/alerting/api_provisioning_test.go
+++ b/pkg/tests/api/alerting/api_provisioning_test.go
@@ -6,15 +6,22 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"slices"
 	"sort"
+	"strings"
 	"testing"
 
+	"github.com/prometheus/alertmanager/config"
+	"github.com/prometheus/alertmanager/timeinterval"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/util/errutil"
 )
 
 func TestIntegrationProvisioning(t *testing.T) {
@@ -91,24 +98,24 @@ func TestIntegrationProvisioning(t *testing.T) {
 			require.Equal(t, 401, resp.StatusCode)
 		})
 
-		t.Run("viewer GET should 403", func(t *testing.T) {
+		t.Run("viewer GET should succeed", func(t *testing.T) {
 			req := createTestRequest("GET", url, "viewer", "")
 
 			resp, err := http.DefaultClient.Do(req)
 			require.NoError(t, err)
 			require.NoError(t, resp.Body.Close())
 
-			require.Equal(t, 403, resp.StatusCode)
+			require.Equal(t, 200, resp.StatusCode)
 		})
 
-		t.Run("editor GET should 403", func(t *testing.T) {
+		t.Run("editor GET should succeed", func(t *testing.T) {
 			req := createTestRequest("GET", url, "editor", "")
 
 			resp, err := http.DefaultClient.Do(req)
 			require.NoError(t, err)
 			require.NoError(t, resp.Body.Close())
 
-			require.Equal(t, 403, resp.StatusCode)
+			require.Equal(t, 200, resp.StatusCode)
 		})
 
 		t.Run("admin GET should succeed", func(t *testing.T) {
@@ -141,14 +148,13 @@ func TestIntegrationProvisioning(t *testing.T) {
 			require.Equal(t, 403, resp.StatusCode)
 		})
 
-		t.Run("editor PUT should 403", func(t *testing.T) {
+		t.Run("editor PUT should succeed", func(t *testing.T) {
 			req := createTestRequest("PUT", url, "editor", body)
 
 			resp, err := http.DefaultClient.Do(req)
 			require.NoError(t, err)
 			require.NoError(t, resp.Body.Close())
-
-			require.Equal(t, 403, resp.StatusCode)
+			require.Equal(t, 202, resp.StatusCode)
 		})
 
 		t.Run("admin PUT should succeed", func(t *testing.T) {
@@ -183,24 +189,24 @@ func TestIntegrationProvisioning(t *testing.T) {
 			require.Equal(t, 401, resp.StatusCode)
 		})
 
-		t.Run("viewer GET should 403", func(t *testing.T) {
+		t.Run("viewer GET should succeed", func(t *testing.T) {
 			req := createTestRequest("GET", url, "viewer", "")
 
 			resp, err := http.DefaultClient.Do(req)
 			require.NoError(t, err)
 			require.NoError(t, resp.Body.Close())
 
-			require.Equal(t, 403, resp.StatusCode)
+			require.Equal(t, 200, resp.StatusCode)
 		})
 
-		t.Run("editor GET should 403", func(t *testing.T) {
+		t.Run("editor GET should succeed", func(t *testing.T) {
 			req := createTestRequest("GET", url, "editor", "")
 
 			resp, err := http.DefaultClient.Do(req)
 			require.NoError(t, err)
 			require.NoError(t, resp.Body.Close())
 
-			require.Equal(t, 403, resp.StatusCode)
+			require.Equal(t, 200, resp.StatusCode)
 		})
 
 		t.Run("admin GET should succeed", func(t *testing.T) {
@@ -233,14 +239,14 @@ func TestIntegrationProvisioning(t *testing.T) {
 			require.Equal(t, 403, resp.StatusCode)
 		})
 
-		t.Run("editor POST should 403", func(t *testing.T) {
+		t.Run("editor POST should succeed", func(t *testing.T) {
 			req := createTestRequest("POST", url, "editor", body)
 
 			resp, err := http.DefaultClient.Do(req)
 			require.NoError(t, err)
 			require.NoError(t, resp.Body.Close())
 
-			require.Equal(t, 403, resp.StatusCode)
+			require.Equal(t, 202, resp.StatusCode)
 		})
 
 		t.Run("admin POST should succeed", func(t *testing.T) {
@@ -267,24 +273,24 @@ func TestIntegrationProvisioning(t *testing.T) {
 			require.Equal(t, 401, resp.StatusCode)
 		})
 
-		t.Run("viewer GET should 403", func(t *testing.T) {
+		t.Run("viewer GET should succeed", func(t *testing.T) {
 			req := createTestRequest("GET", url, "viewer", "")
 
 			resp, err := http.DefaultClient.Do(req)
 			require.NoError(t, err)
 			require.NoError(t, resp.Body.Close())
 
-			require.Equal(t, 403, resp.StatusCode)
+			require.Equal(t, 200, resp.StatusCode)
 		})
 
-		t.Run("editor GET should 403", func(t *testing.T) {
+		t.Run("editor GET should succeed", func(t *testing.T) {
 			req := createTestRequest("GET", url, "editor", "")
 
 			resp, err := http.DefaultClient.Do(req)
 			require.NoError(t, err)
 			require.NoError(t, resp.Body.Close())
 
-			require.Equal(t, 403, resp.StatusCode)
+			require.Equal(t, 200, resp.StatusCode)
 		})
 
 		t.Run("admin GET should succeed", func(t *testing.T) {
@@ -311,24 +317,24 @@ func TestIntegrationProvisioning(t *testing.T) {
 			require.Equal(t, 401, resp.StatusCode)
 		})
 
-		t.Run("viewer GET should 403", func(t *testing.T) {
+		t.Run("viewer GET should succeed", func(t *testing.T) {
 			req := createTestRequest("GET", url, "viewer", "")
 
 			resp, err := http.DefaultClient.Do(req)
 			require.NoError(t, err)
 			require.NoError(t, resp.Body.Close())
 
-			require.Equal(t, 403, resp.StatusCode)
+			require.Equal(t, 200, resp.StatusCode)
 		})
 
-		t.Run("editor GET should 403", func(t *testing.T) {
+		t.Run("editor GET should succeed", func(t *testing.T) {
 			req := createTestRequest("GET", url, "editor", "")
 
 			resp, err := http.DefaultClient.Do(req)
 			require.NoError(t, err)
 			require.NoError(t, resp.Body.Close())
 
-			require.Equal(t, 403, resp.StatusCode)
+			require.Equal(t, 200, resp.StatusCode)
 		})
 
 		t.Run("admin GET should succeed", func(t *testing.T) {
@@ -371,6 +377,243 @@ func TestIntegrationProvisioning(t *testing.T) {
 	})
 }
 
+func TestMuteTimings(t *testing.T) {
+	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
+		DisableLegacyAlerting: true,
+		EnableUnifiedAlerting: true,
+		DisableAnonymous:      true,
+		AppModeProduction:     true,
+	})
+
+	grafanaListedAddr, store := testinfra.StartGrafana(t, dir, path)
+
+	createUser(t, store, user.CreateUserCommand{
+		DefaultOrgRole: string(org.RoleAdmin),
+		Password:       "admin",
+		Login:          "admin",
+	})
+
+	apiClient := newAlertingApiClient(grafanaListedAddr, "admin", "admin")
+
+	t.Run("default config should return empty list", func(t *testing.T) {
+		mt, status, body := apiClient.GetAllMuteTimingsWithStatus(t)
+		requireStatusCode(t, http.StatusOK, status, body)
+		require.Empty(t, mt)
+	})
+
+	emptyMuteTiming := definitions.MuteTimeInterval{
+		MuteTimeInterval: config.MuteTimeInterval{
+			Name:          "Empty Mute Timing",
+			TimeIntervals: []timeinterval.TimeInterval{},
+		},
+	}
+
+	t.Run("should create a new mute timing without any intervals", func(t *testing.T) {
+		mt, status, body := apiClient.CreateMuteTimingWithStatus(t, emptyMuteTiming)
+		requireStatusCode(t, http.StatusCreated, status, body)
+		require.Equal(t, emptyMuteTiming.MuteTimeInterval, mt.MuteTimeInterval)
+		require.EqualValues(t, models.ProvenanceAPI, mt.Provenance)
+	})
+
+	anotherMuteTiming := definitions.MuteTimeInterval{
+		MuteTimeInterval: config.MuteTimeInterval{
+			Name: "Not Empty Mute Timing",
+			TimeIntervals: []timeinterval.TimeInterval{
+				{
+					Times: []timeinterval.TimeRange{
+						{
+							StartMinute: 10,
+							EndMinute:   45,
+						},
+					},
+					Weekdays: []timeinterval.WeekdayRange{
+						{
+							InclusiveRange: timeinterval.InclusiveRange{
+								Begin: 0,
+								End:   2,
+							},
+						},
+						{
+							InclusiveRange: timeinterval.InclusiveRange{
+								Begin: 4,
+								End:   5,
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	t.Run("should create a new mute timing with some settings", func(t *testing.T) {
+		mt, status, body := apiClient.CreateMuteTimingWithStatus(t, anotherMuteTiming)
+		requireStatusCode(t, http.StatusCreated, status, body)
+		require.Equal(t, anotherMuteTiming.MuteTimeInterval, mt.MuteTimeInterval)
+		require.EqualValues(t, models.ProvenanceAPI, mt.Provenance)
+	})
+
+	t.Run("should return mute timing by name", func(t *testing.T) {
+		mt, status, body := apiClient.GetMuteTimingByNameWithStatus(t, emptyMuteTiming.Name)
+		requireStatusCode(t, http.StatusOK, status, body)
+		require.Equal(t, emptyMuteTiming.MuteTimeInterval, mt.MuteTimeInterval)
+		require.EqualValues(t, models.ProvenanceAPI, mt.Provenance)
+
+		mt, status, body = apiClient.GetMuteTimingByNameWithStatus(t, anotherMuteTiming.Name)
+		requireStatusCode(t, http.StatusOK, status, body)
+		require.Equal(t, anotherMuteTiming.MuteTimeInterval, mt.MuteTimeInterval)
+		require.EqualValues(t, models.ProvenanceAPI, mt.Provenance)
+	})
+
+	t.Run("should return NotFound if mute timing does not exist", func(t *testing.T) {
+		_, status, body := apiClient.GetMuteTimingByNameWithStatus(t, "some-missing-timing")
+		requireStatusCode(t, http.StatusNotFound, status, body)
+	})
+
+	t.Run("should return all mute timings", func(t *testing.T) {
+		mt, status, body := apiClient.GetAllMuteTimingsWithStatus(t)
+		requireStatusCode(t, http.StatusOK, status, body)
+		require.Len(t, mt, 2)
+
+		slices.SortFunc(mt, func(a, b definitions.MuteTimeInterval) int {
+			return strings.Compare(a.Name, b.Name)
+		})
+
+		require.Equal(t, emptyMuteTiming.MuteTimeInterval, mt[0].MuteTimeInterval)
+		require.EqualValues(t, models.ProvenanceAPI, mt[0].Provenance)
+
+		require.Equal(t, anotherMuteTiming.MuteTimeInterval, mt[1].MuteTimeInterval)
+		require.EqualValues(t, models.ProvenanceAPI, mt[1].Provenance)
+	})
+
+	t.Run("should get BadRequest if creates a new mute timing with the same name", func(t *testing.T) {
+		m := anotherMuteTiming
+		m.TimeIntervals = nil
+		_, status, body := apiClient.CreateMuteTimingWithStatus(t, m)
+		t.Log(body)
+		requireStatusCode(t, http.StatusBadRequest, status, body)
+		var validationError errutil.PublicError
+		assert.NoError(t, json.Unmarshal([]byte(body), &validationError))
+		assert.NotEmpty(t, validationError, validationError.Message)
+		assert.Equal(t, "alerting.notifications.time-intervals.nameExists", validationError.MessageID)
+		if t.Failed() {
+			t.Fatalf("response: %s", body)
+		}
+	})
+
+	t.Run("should get BadRequest if creates an invalid mute timing", func(t *testing.T) {
+		m := definitions.MuteTimeInterval{
+			MuteTimeInterval: config.MuteTimeInterval{
+				Name: "Invalid",
+				TimeIntervals: []timeinterval.TimeInterval{
+					{
+						Times: []timeinterval.TimeRange{
+							{
+								StartMinute: 20000,
+								EndMinute:   90000,
+							},
+						},
+					},
+				},
+			},
+		}
+		_, status, body := apiClient.CreateMuteTimingWithStatus(t, m)
+		t.Log(body)
+		requireStatusCode(t, http.StatusBadRequest, status, body)
+		var validationError map[string]any
+		assert.NoError(t, json.Unmarshal([]byte(body), &validationError))
+		assert.Contains(t, validationError, "message")
+		if t.Failed() {
+			t.Fatalf("response: %s", body)
+		}
+	})
+
+	t.Run("should update existing mute timing", func(t *testing.T) {
+		anotherMuteTiming.TimeIntervals = []timeinterval.TimeInterval{
+			{
+				Times: []timeinterval.TimeRange{
+					{
+						StartMinute: 36,
+						EndMinute:   49,
+					},
+				},
+			},
+		}
+
+		mt, status, body := apiClient.UpdateMuteTimingWithStatus(t, anotherMuteTiming)
+		requireStatusCode(t, http.StatusAccepted, status, body)
+		require.Equal(t, anotherMuteTiming.MuteTimeInterval, mt.MuteTimeInterval)
+	})
+
+	t.Run("should fail to update existing mute timing with invalid one", func(t *testing.T) {
+		mt := anotherMuteTiming
+		mt.TimeIntervals = []timeinterval.TimeInterval{
+			{
+				Times: []timeinterval.TimeRange{
+					{
+						StartMinute: 360000,
+						EndMinute:   490000,
+					},
+				},
+			},
+		}
+
+		_, status, body := apiClient.UpdateMuteTimingWithStatus(t, mt)
+
+		requireStatusCode(t, http.StatusBadRequest, status, body)
+		var validationError map[string]any
+		assert.NoError(t, json.Unmarshal([]byte(body), &validationError))
+		assert.Contains(t, validationError, "message")
+		if t.Failed() {
+			t.Fatalf("response: %s", body)
+		}
+	})
+
+	t.Run("should get NotFound if updates mute timing that does not exist", func(t *testing.T) {
+		mt := definitions.MuteTimeInterval{
+			MuteTimeInterval: config.MuteTimeInterval{
+				Name: "Missing Mute Timing",
+			},
+		}
+		_, status, body := apiClient.UpdateMuteTimingWithStatus(t, mt)
+		requireStatusCode(t, http.StatusNotFound, status, body)
+	})
+
+	t.Run("should delete unused mute timing", func(t *testing.T) {
+		status, body := apiClient.DeleteMuteTimingWithStatus(t, emptyMuteTiming.Name)
+		requireStatusCode(t, http.StatusNoContent, status, body)
+
+		_, status, body = apiClient.GetMuteTimingByNameWithStatus(t, emptyMuteTiming.Name)
+		requireStatusCode(t, http.StatusNotFound, status, body)
+	})
+
+	t.Run("should get 409 Conflict if deletes used mute-timing", func(t *testing.T) {
+		route, status, response := apiClient.GetRouteWithStatus(t)
+		requireStatusCode(t, http.StatusOK, status, response)
+		route.Routes = append(route.Routes, &definitions.Route{
+			Receiver: route.Receiver,
+			ObjectMatchers: definitions.ObjectMatchers{
+				{
+					Name:  "a",
+					Value: "b",
+				},
+			},
+			MuteTimeIntervals: []string{anotherMuteTiming.Name},
+		})
+		status, response = apiClient.UpdateRouteWithStatus(t, route)
+		requireStatusCode(t, http.StatusAccepted, status, response)
+
+		status, response = apiClient.DeleteMuteTimingWithStatus(t, anotherMuteTiming.Name)
+		requireStatusCode(t, http.StatusConflict, status, response)
+		var validationError errutil.PublicError
+		assert.NoError(t, json.Unmarshal([]byte(response), &validationError))
+		assert.NotEmpty(t, validationError, validationError.Message)
+		assert.Equal(t, "alerting.notifications.time-intervals.used", validationError.MessageID)
+		if t.Failed() {
+			t.Fatalf("response: %s", response)
+		}
+	})
+}
+
 func createTestRequest(method string, url string, user string, body string) *http.Request {
 	var bodyBuf io.Reader
 	if body != "" {
diff --git a/pkg/tests/api/alerting/api_ruler_test.go b/pkg/tests/api/alerting/api_ruler_test.go
index 77ce404e97cb3..2a8db26dde05e 100644
--- a/pkg/tests/api/alerting/api_ruler_test.go
+++ b/pkg/tests/api/alerting/api_ruler_test.go
@@ -9,12 +9,15 @@ import (
 	"math/rand"
 	"net/http"
 	"path"
+	"slices"
 	"strings"
 	"testing"
 	"time"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/uuid"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/prometheus/alertmanager/pkg/labels"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -136,11 +139,9 @@ func TestIntegrationAlertRulePermissions(t *testing.T) {
 
 			for _, rule := range allRules["folder1"][0].Rules {
 				assert.Equal(t, "folder1", rule.GrafanaManagedAlert.NamespaceUID)
-				assert.Equal(t, int64(1), rule.GrafanaManagedAlert.NamespaceID)
 			}
 			for _, rule := range allRules["folder2"][0].Rules {
 				assert.Equal(t, "folder2", rule.GrafanaManagedAlert.NamespaceUID)
-				assert.Equal(t, int64(2), rule.GrafanaManagedAlert.NamespaceID)
 			}
 		})
 
@@ -285,7 +286,361 @@ func TestIntegrationAlertRulePermissions(t *testing.T) {
 				ExportQueryParams: apimodels.ExportQueryParams{Format: "json"},
 				FolderUID:         []string{"folder2"},
 			})
-			assert.Equal(t, http.StatusUnauthorized, status)
+			assert.Equal(t, http.StatusForbidden, status)
+		})
+
+		t.Run("Export from one group", func(t *testing.T) {
+			status, _ := apiClient.ExportRulesWithStatus(t, &apimodels.AlertRulesExportParameters{
+				ExportQueryParams: apimodels.ExportQueryParams{Format: "json"},
+				FolderUID:         []string{"folder2"},
+				GroupName:         "arulegroup",
+			})
+			assert.Equal(t, http.StatusForbidden, status)
+		})
+
+		t.Run("Export single rule", func(t *testing.T) {
+			uid := allRules["folder2"][0].Rules[0].GrafanaManagedAlert.UID
+			status, _ := apiClient.ExportRulesWithStatus(t, &apimodels.AlertRulesExportParameters{
+				ExportQueryParams: apimodels.ExportQueryParams{Format: "json"},
+				RuleUID:           uid,
+			})
+			require.Equal(t, http.StatusForbidden, status)
+		})
+
+		t.Run("when all permissions are revoked", func(t *testing.T) {
+			removeFolderPermission(t, permissionsStore, 1, userID, org.RoleEditor, "folder1")
+			apiClient.ReloadCachedPermissions(t)
+
+			rules, status, _ := apiClient.GetAllRulesWithStatus(t)
+			require.Equal(t, http.StatusOK, status)
+			require.Empty(t, rules)
+
+			status, _ = apiClient.ExportRulesWithStatus(t, &apimodels.AlertRulesExportParameters{
+				ExportQueryParams: apimodels.ExportQueryParams{Format: "json"},
+			})
+			require.Equal(t, http.StatusNotFound, status)
+		})
+	})
+}
+
+func TestIntegrationAlertRuleNestedPermissions(t *testing.T) {
+	testinfra.SQLiteIntegrationTest(t)
+
+	// Setup Grafana and its Database
+	dir, p := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
+		EnableFeatureToggles:  []string{featuremgmt.FlagNestedFolders},
+		DisableLegacyAlerting: true,
+		EnableUnifiedAlerting: true,
+		DisableAnonymous:      true,
+		AppModeProduction:     true,
+	})
+
+	grafanaListedAddr, store := testinfra.StartGrafana(t, dir, p)
+	permissionsStore := resourcepermissions.NewStore(store, featuremgmt.WithFeatures())
+
+	// Create a user to make authenticated requests
+	userID := createUser(t, store, user.CreateUserCommand{
+		DefaultOrgRole: string(org.RoleEditor),
+		Password:       "password",
+		Login:          "grafana",
+	})
+
+	apiClient := newAlertingApiClient(grafanaListedAddr, "grafana", "password")
+
+	// Create the namespace we'll save our alerts to.
+	apiClient.CreateFolder(t, "folder1", "folder1")
+	// Create the namespace we'll save our alerts to.
+	apiClient.CreateFolder(t, "folder2", "folder2")
+	// Create a subfolder
+	apiClient.CreateFolder(t, "subfolder", "subfolder", "folder1")
+
+	postGroupRaw, err := testData.ReadFile(path.Join("test-data", "rulegroup-1-post.json"))
+	require.NoError(t, err)
+	var group1 apimodels.PostableRuleGroupConfig
+	require.NoError(t, json.Unmarshal(postGroupRaw, &group1))
+
+	// Create rule under folder1
+	_, status, response := apiClient.PostRulesGroupWithStatus(t, "folder1", &group1)
+	require.Equalf(t, http.StatusAccepted, status, response)
+
+	postGroupRaw, err = testData.ReadFile(path.Join("test-data", "rulegroup-2-post.json"))
+	require.NoError(t, err)
+	var group2 apimodels.PostableRuleGroupConfig
+	require.NoError(t, json.Unmarshal(postGroupRaw, &group2))
+
+	// Create rule under folder2
+	_, status, response = apiClient.PostRulesGroupWithStatus(t, "folder2", &group2)
+	require.Equalf(t, http.StatusAccepted, status, response)
+
+	postGroupRaw, err = testData.ReadFile(path.Join("test-data", "rulegroup-3-post.json"))
+	require.NoError(t, err)
+	var group3 apimodels.PostableRuleGroupConfig
+	require.NoError(t, json.Unmarshal(postGroupRaw, &group3))
+
+	// Create rule under subfolder
+	_, status, response = apiClient.PostRulesGroupWithStatus(t, "subfolder", &group3)
+	require.Equalf(t, http.StatusAccepted, status, response)
+
+	// With the rules created, let's make sure that rule definitions are stored.
+	allRules, status, _ := apiClient.GetAllRulesWithStatus(t)
+	require.Equal(t, http.StatusOK, status)
+	status, allExportRaw := apiClient.ExportRulesWithStatus(t, &apimodels.AlertRulesExportParameters{
+		ExportQueryParams: apimodels.ExportQueryParams{Format: "json"},
+	})
+	require.Equal(t, http.StatusOK, status)
+	var allExport apimodels.AlertingFileExport
+	require.NoError(t, json.Unmarshal([]byte(allExportRaw), &allExport))
+
+	t.Run("when user has all permissions", func(t *testing.T) {
+		t.Run("Get all returns all rules", func(t *testing.T) {
+			var group1, group2, group3 apimodels.GettableRuleGroupConfig
+
+			getGroup1Raw, err := testData.ReadFile(path.Join("test-data", "rulegroup-1-get.json"))
+			require.NoError(t, err)
+			require.NoError(t, json.Unmarshal(getGroup1Raw, &group1))
+			getGroup2Raw, err := testData.ReadFile(path.Join("test-data", "rulegroup-2-get.json"))
+			require.NoError(t, err)
+			require.NoError(t, json.Unmarshal(getGroup2Raw, &group2))
+			getGroup3Raw, err := testData.ReadFile(path.Join("test-data", "rulegroup-3-get.json"))
+			require.NoError(t, err)
+			require.NoError(t, json.Unmarshal(getGroup3Raw, &group3))
+
+			expected := apimodels.NamespaceConfigResponse{
+				"folder1": []apimodels.GettableRuleGroupConfig{
+					group1,
+				},
+				"folder2": []apimodels.GettableRuleGroupConfig{
+					group2,
+				},
+				"folder1/subfolder": []apimodels.GettableRuleGroupConfig{
+					group3,
+				},
+			}
+
+			pathsToIgnore := []string{
+				"GrafanaManagedAlert.Updated",
+				"GrafanaManagedAlert.UID",
+				"GrafanaManagedAlert.ID",
+				"GrafanaManagedAlert.Data.Model",
+				"GrafanaManagedAlert.NamespaceUID",
+				"GrafanaManagedAlert.NamespaceID",
+			}
+
+			// compare expected and actual and ignore the dynamic fields
+			diff := cmp.Diff(expected, allRules, cmp.FilterPath(func(path cmp.Path) bool {
+				for _, s := range pathsToIgnore {
+					if strings.Contains(path.String(), s) {
+						return true
+					}
+				}
+				return false
+			}, cmp.Ignore()))
+
+			require.Empty(t, diff)
+
+			for _, rule := range allRules["folder1"][0].Rules {
+				assert.Equal(t, "folder1", rule.GrafanaManagedAlert.NamespaceUID)
+			}
+
+			for _, rule := range allRules["folder2"][0].Rules {
+				assert.Equal(t, "folder2", rule.GrafanaManagedAlert.NamespaceUID)
+			}
+
+			for _, rule := range allRules["folder1/subfolder"][0].Rules {
+				assert.Equal(t, "subfolder", rule.GrafanaManagedAlert.NamespaceUID)
+			}
+		})
+
+		t.Run("Get by folder returns groups in folder", func(t *testing.T) {
+			rules, status, _ := apiClient.GetAllRulesGroupInFolderWithStatus(t, "folder1")
+			require.Equal(t, http.StatusAccepted, status)
+			require.Contains(t, rules, "folder1")
+			require.Len(t, rules["folder1"], 1)
+			require.Equal(t, allRules["folder1"], rules["folder1"])
+		})
+
+		t.Run("Get group returns a single group", func(t *testing.T) {
+			rules := apiClient.GetRulesGroup(t, "folder2", allRules["folder2"][0].Name)
+			cmp.Diff(allRules["folder2"][0], rules.GettableRuleGroupConfig)
+		})
+
+		t.Run("Get by folder returns groups in folder with nested folder format", func(t *testing.T) {
+			rules, status, _ := apiClient.GetAllRulesGroupInFolderWithStatus(t, "subfolder")
+			require.Equal(t, http.StatusAccepted, status)
+
+			nestedKey := "folder1/subfolder"
+			require.Contains(t, rules, nestedKey)
+			require.Len(t, rules[nestedKey], 1)
+			require.Equal(t, allRules[nestedKey], rules[nestedKey])
+		})
+
+		t.Run("Export returns all rules", func(t *testing.T) {
+			var group1File, group2File, group3File apimodels.AlertingFileExport
+			getGroup1Raw, err := testData.ReadFile(path.Join("test-data", "rulegroup-1-export.json"))
+			require.NoError(t, err)
+			require.NoError(t, json.Unmarshal(getGroup1Raw, &group1File))
+			getGroup2Raw, err := testData.ReadFile(path.Join("test-data", "rulegroup-2-export.json"))
+			require.NoError(t, err)
+			require.NoError(t, json.Unmarshal(getGroup2Raw, &group2File))
+			getGroup3Raw, err := testData.ReadFile(path.Join("test-data", "rulegroup-3-export.json"))
+			require.NoError(t, err)
+			require.NoError(t, json.Unmarshal(getGroup3Raw, &group3File))
+
+			group1File.Groups = append(group1File.Groups, group2File.Groups...)
+			group1File.Groups = append(group1File.Groups, group3File.Groups...)
+			expected := group1File
+
+			pathsToIgnore := []string{
+				"Groups.Rules.UID",
+				"Groups.Folder",
+			}
+
+			// compare expected and actual and ignore the dynamic fields
+			diff := cmp.Diff(expected, allExport, cmp.FilterPath(func(path cmp.Path) bool {
+				for _, s := range pathsToIgnore {
+					if strings.Contains(path.String(), s) {
+						return true
+					}
+				}
+				return false
+			}, cmp.Ignore()))
+
+			require.Empty(t, diff)
+
+			require.Equal(t, "folder1", allExport.Groups[0].Folder)
+			require.Equal(t, "folder2", allExport.Groups[1].Folder)
+			require.Equal(t, "subfolder", allExport.Groups[2].Folder)
+		})
+
+		t.Run("Export from one folder", func(t *testing.T) {
+			expected := allExport.Groups[0]
+			status, exportRaw := apiClient.ExportRulesWithStatus(t, &apimodels.AlertRulesExportParameters{
+				ExportQueryParams: apimodels.ExportQueryParams{Format: "json"},
+				FolderUID:         []string{"folder1"},
+			})
+			require.Equal(t, http.StatusOK, status)
+			var export apimodels.AlertingFileExport
+			require.NoError(t, json.Unmarshal([]byte(exportRaw), &export))
+
+			require.Len(t, export.Groups, 1)
+			require.Equal(t, expected, export.Groups[0])
+		})
+
+		t.Run("Export from a subfolder", func(t *testing.T) {
+			expected := allExport.Groups[2]
+			status, exportRaw := apiClient.ExportRulesWithStatus(t, &apimodels.AlertRulesExportParameters{
+				ExportQueryParams: apimodels.ExportQueryParams{Format: "json"},
+				FolderUID:         []string{"subfolder"},
+			})
+			require.Equal(t, http.StatusOK, status)
+			var export apimodels.AlertingFileExport
+			require.NoError(t, json.Unmarshal([]byte(exportRaw), &export))
+
+			require.Len(t, export.Groups, 1)
+			require.Equal(t, expected, export.Groups[0])
+		})
+
+		t.Run("Export from one group", func(t *testing.T) {
+			expected := allExport.Groups[0]
+			status, exportRaw := apiClient.ExportRulesWithStatus(t, &apimodels.AlertRulesExportParameters{
+				ExportQueryParams: apimodels.ExportQueryParams{Format: "json"},
+				FolderUID:         []string{"folder1"},
+				GroupName:         expected.Name,
+			})
+			require.Equal(t, http.StatusOK, status)
+			var export apimodels.AlertingFileExport
+			require.NoError(t, json.Unmarshal([]byte(exportRaw), &export))
+
+			require.Len(t, export.Groups, 1)
+			require.Equal(t, expected, export.Groups[0])
+		})
+
+		t.Run("Export from one group under subfolder", func(t *testing.T) {
+			expected := allExport.Groups[2]
+			status, exportRaw := apiClient.ExportRulesWithStatus(t, &apimodels.AlertRulesExportParameters{
+				ExportQueryParams: apimodels.ExportQueryParams{Format: "json"},
+				FolderUID:         []string{"subfolder"},
+				GroupName:         expected.Name,
+			})
+			require.Equal(t, http.StatusOK, status)
+			var export apimodels.AlertingFileExport
+			require.NoError(t, json.Unmarshal([]byte(exportRaw), &export))
+
+			require.Len(t, export.Groups, 1)
+			require.Equal(t, expected, export.Groups[0])
+		})
+
+		t.Run("Export single rule", func(t *testing.T) {
+			expected := allExport.Groups[0]
+			expected.Rules = []apimodels.AlertRuleExport{
+				expected.Rules[0],
+			}
+			status, exportRaw := apiClient.ExportRulesWithStatus(t, &apimodels.AlertRulesExportParameters{
+				ExportQueryParams: apimodels.ExportQueryParams{Format: "json"},
+				RuleUID:           expected.Rules[0].UID,
+			})
+
+			require.Equal(t, http.StatusOK, status)
+			var export apimodels.AlertingFileExport
+			t.Log(exportRaw)
+			require.NoError(t, json.Unmarshal([]byte(exportRaw), &export))
+
+			require.Len(t, export.Groups, 1)
+			require.Equal(t, expected, export.Groups[0])
+		})
+	})
+
+	t.Run("when permissions for folder2 removed", func(t *testing.T) {
+		// remove permissions for folder2
+		removeFolderPermission(t, permissionsStore, 1, userID, org.RoleEditor, "folder2")
+		// remove permissions for subfolder (inherits from folder1)
+		removeFolderPermission(t, permissionsStore, 1, userID, org.RoleEditor, "subfolder")
+		apiClient.ReloadCachedPermissions(t)
+
+		t.Run("Get all returns all rules", func(t *testing.T) {
+			newAll, status, _ := apiClient.GetAllRulesWithStatus(t)
+			require.Equal(t, http.StatusOK, status)
+			require.Contains(t, newAll, "folder1")
+			require.NotContains(t, newAll, "folder2")
+			require.Contains(t, newAll, "folder1/subfolder")
+		})
+
+		t.Run("Get by folder returns groups in folder", func(t *testing.T) {
+			_, status, _ := apiClient.GetAllRulesGroupInFolderWithStatus(t, "folder2")
+			require.Equal(t, http.StatusForbidden, status)
+		})
+
+		t.Run("Get group returns a single group", func(t *testing.T) {
+			u := fmt.Sprintf("%s/api/ruler/grafana/api/v1/rules/folder2/arulegroup", apiClient.url)
+			// nolint:gosec
+			resp, err := http.Get(u)
+			require.NoError(t, err)
+			defer func() {
+				_ = resp.Body.Close()
+			}()
+			assert.Equal(t, http.StatusForbidden, resp.StatusCode)
+		})
+
+		t.Run("Export returns all rules", func(t *testing.T) {
+			status, exportRaw := apiClient.ExportRulesWithStatus(t, &apimodels.AlertRulesExportParameters{
+				ExportQueryParams: apimodels.ExportQueryParams{Format: "json"},
+			})
+			require.Equal(t, http.StatusOK, status)
+			var export apimodels.AlertingFileExport
+			require.NoError(t, json.Unmarshal([]byte(exportRaw), &export))
+
+			require.Equal(t, http.StatusOK, status)
+			require.Len(t, export.Groups, 2)
+			require.Equal(t, "folder1", export.Groups[0].Folder)
+			require.Equal(t, "subfolder", export.Groups[1].Folder)
+		})
+
+		t.Run("Export from one folder", func(t *testing.T) {
+			status, _ := apiClient.ExportRulesWithStatus(t, &apimodels.AlertRulesExportParameters{
+				ExportQueryParams: apimodels.ExportQueryParams{Format: "json"},
+				FolderUID:         []string{"folder2"},
+			})
+			assert.Equal(t, http.StatusForbidden, status)
 		})
 
 		t.Run("Export from one group", func(t *testing.T) {
@@ -488,11 +843,11 @@ func TestIntegrationAlertRuleConflictingTitle(t *testing.T) {
 		rulesWithUID.Rules = append(rulesWithUID.Rules, rules.Rules[0]) // Create new copy of first rule.
 
 		_, status, body := apiClient.PostRulesGroupWithStatus(t, "folder1", &rulesWithUID)
-		assert.Equal(t, http.StatusInternalServerError, status)
+		assert.Equal(t, http.StatusConflict, status)
 
 		var res map[string]any
 		require.NoError(t, json.Unmarshal([]byte(body), &res))
-		require.Equal(t, "failed to update rule group: failed to add rules: a conflicting alert rule is found: rule title under the same organisation and folder should be unique", res["message"])
+		require.Contains(t, res["message"], ngmodels.ErrAlertRuleUniqueConstraintViolation.Error())
 	})
 
 	t.Run("trying to update an alert to the title of an existing alert in the same folder should fail", func(t *testing.T) {
@@ -500,11 +855,11 @@ func TestIntegrationAlertRuleConflictingTitle(t *testing.T) {
 		rulesWithUID.Rules[1].GrafanaManagedAlert.Title = "AlwaysFiring"
 
 		_, status, body := apiClient.PostRulesGroupWithStatus(t, "folder1", &rulesWithUID)
-		assert.Equal(t, http.StatusInternalServerError, status)
+		assert.Equal(t, http.StatusConflict, status)
 
 		var res map[string]any
 		require.NoError(t, json.Unmarshal([]byte(body), &res))
-		require.Equal(t, "failed to update rule group: failed to update rules: a conflicting alert rule is found: rule title under the same organisation and folder should be unique", res["message"])
+		require.Contains(t, res["message"], ngmodels.ErrAlertRuleUniqueConstraintViolation.Error())
 	})
 
 	t.Run("trying to create alert with same title under another folder should succeed", func(t *testing.T) {
@@ -664,7 +1019,6 @@ func TestIntegrationRulerRulesFilterByDashboard(t *testing.T) {
 				"version": 1,
 				"uid": "uid",
 				"namespace_uid": "nsuid",
-				"namespace_id": 1,
 				"rule_group": "anotherrulegroup",
 				"no_data_state": "NoData",
 				"exec_err_state": "Alerting"
@@ -698,7 +1052,6 @@ func TestIntegrationRulerRulesFilterByDashboard(t *testing.T) {
 				"version": 1,
 				"uid": "uid",
 				"namespace_uid": "nsuid",
-				"namespace_id": 1,
 				"rule_group": "anotherrulegroup",
 				"no_data_state": "Alerting",
 				"exec_err_state": "Alerting"
@@ -744,7 +1097,6 @@ func TestIntegrationRulerRulesFilterByDashboard(t *testing.T) {
 				"version": 1,
 				"uid": "uid",
 				"namespace_uid": "nsuid",
-				"namespace_id": 1,
 				"rule_group": "anotherrulegroup",
 				"no_data_state": "NoData",
 				"exec_err_state": "Alerting"
@@ -899,19 +1251,21 @@ func TestIntegrationRuleGroupSequence(t *testing.T) {
 	})
 
 	client := newAlertingApiClient(grafanaListedAddr, "grafana", "password")
-	folder1Title := "folder1"
-	client.CreateFolder(t, util.GenerateShortUID(), folder1Title)
+	parentFolderUID := util.GenerateShortUID()
+	client.CreateFolder(t, parentFolderUID, "parent")
+	folderUID := util.GenerateShortUID()
+	client.CreateFolder(t, folderUID, "folder1", parentFolderUID)
 
 	group1 := generateAlertRuleGroup(5, alertRuleGen())
 	group2 := generateAlertRuleGroup(5, alertRuleGen())
 
-	_, status, _ := client.PostRulesGroupWithStatus(t, folder1Title, &group1)
+	_, status, _ := client.PostRulesGroupWithStatus(t, folderUID, &group1)
 	require.Equal(t, http.StatusAccepted, status)
-	_, status, _ = client.PostRulesGroupWithStatus(t, folder1Title, &group2)
+	_, status, _ = client.PostRulesGroupWithStatus(t, folderUID, &group2)
 	require.Equal(t, http.StatusAccepted, status)
 
 	t.Run("should persist order of the rules in a group", func(t *testing.T) {
-		group1Get := client.GetRulesGroup(t, folder1Title, group1.Name)
+		group1Get := client.GetRulesGroup(t, folderUID, group1.Name)
 		assert.Equal(t, group1.Name, group1Get.Name)
 		assert.Equal(t, group1.Interval, group1Get.Interval)
 		assert.Len(t, group1Get.Rules, len(group1.Rules))
@@ -930,10 +1284,10 @@ func TestIntegrationRuleGroupSequence(t *testing.T) {
 		for _, rule := range postableGroup1.Rules {
 			expectedUids = append(expectedUids, rule.GrafanaManagedAlert.UID)
 		}
-		_, status, _ := client.PostRulesGroupWithStatus(t, folder1Title, &postableGroup1)
+		_, status, _ := client.PostRulesGroupWithStatus(t, folderUID, &postableGroup1)
 		require.Equal(t, http.StatusAccepted, status)
 
-		group1Get = client.GetRulesGroup(t, folder1Title, group1.Name)
+		group1Get = client.GetRulesGroup(t, folderUID, group1.Name)
 
 		require.Len(t, group1Get.Rules, len(postableGroup1.Rules))
 
@@ -945,8 +1299,8 @@ func TestIntegrationRuleGroupSequence(t *testing.T) {
 	})
 
 	t.Run("should be able to move a rule from another group in a specific position", func(t *testing.T) {
-		group1Get := client.GetRulesGroup(t, folder1Title, group1.Name)
-		group2Get := client.GetRulesGroup(t, folder1Title, group2.Name)
+		group1Get := client.GetRulesGroup(t, folderUID, group1.Name)
+		group2Get := client.GetRulesGroup(t, folderUID, group2.Name)
 
 		movedRule := convertGettableRuleToPostable(group2Get.Rules[3])
 		// now shuffle the rules
@@ -956,10 +1310,10 @@ func TestIntegrationRuleGroupSequence(t *testing.T) {
 		for _, rule := range postableGroup1.Rules {
 			expectedUids = append(expectedUids, rule.GrafanaManagedAlert.UID)
 		}
-		_, status, _ := client.PostRulesGroupWithStatus(t, folder1Title, &postableGroup1)
+		_, status, _ := client.PostRulesGroupWithStatus(t, folderUID, &postableGroup1)
 		require.Equal(t, http.StatusAccepted, status)
 
-		group1Get = client.GetRulesGroup(t, folder1Title, group1.Name)
+		group1Get = client.GetRulesGroup(t, folderUID, group1.Name)
 
 		require.Len(t, group1Get.Rules, len(postableGroup1.Rules))
 
@@ -969,7 +1323,7 @@ func TestIntegrationRuleGroupSequence(t *testing.T) {
 		}
 		assert.Equal(t, expectedUids, actualUids)
 
-		group2Get = client.GetRulesGroup(t, folder1Title, group2.Name)
+		group2Get = client.GetRulesGroup(t, folderUID, group2.Name)
 		assert.Len(t, group2Get.Rules, len(group2.Rules)-1)
 		for _, rule := range group2Get.Rules {
 			require.NotEqual(t, movedRule.GrafanaManagedAlert.UID, rule.GrafanaManagedAlert.UID)
@@ -977,6 +1331,76 @@ func TestIntegrationRuleGroupSequence(t *testing.T) {
 	})
 }
 
+func TestIntegrationRuleCreate(t *testing.T) {
+	testinfra.SQLiteIntegrationTest(t)
+	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
+		DisableLegacyAlerting: true,
+		EnableUnifiedAlerting: true,
+		AppModeProduction:     true,
+	})
+	grafanaListedAddr, store := testinfra.StartGrafana(t, dir, path)
+	createUser(t, store, user.CreateUserCommand{
+		DefaultOrgRole: string(org.RoleAdmin),
+		Password:       "admin",
+		Login:          "admin",
+	})
+	client := newAlertingApiClient(grafanaListedAddr, "admin", "admin")
+
+	namespaceUID := "default"
+	client.CreateFolder(t, namespaceUID, namespaceUID)
+
+	cases := []struct {
+		name   string
+		config apimodels.PostableRuleGroupConfig
+	}{{
+		name: "can create a rule with UTF-8",
+		config: apimodels.PostableRuleGroupConfig{
+			Name:     "test1",
+			Interval: model.Duration(time.Minute),
+			Rules: []apimodels.PostableExtendedRuleNode{
+				{
+					ApiRuleNode: &apimodels.ApiRuleNode{
+						For: util.Pointer(model.Duration(2 * time.Minute)),
+						Labels: map[string]string{
+							"foo🙂":  "bar",
+							"_bar1": "baz🙂",
+						},
+						Annotations: map[string]string{
+							"Προμηθέας": "prom",      // Prometheus in Greek
+							"犬":         "Shiba Inu", // Dog in Japanese
+						},
+					},
+					GrafanaManagedAlert: &apimodels.PostableGrafanaRule{
+						Title:     "test1 rule1",
+						Condition: "A",
+						Data: []apimodels.AlertQuery{
+							{
+								RefID: "A",
+								RelativeTimeRange: apimodels.RelativeTimeRange{
+									From: apimodels.Duration(0),
+									To:   apimodels.Duration(15 * time.Minute),
+								},
+								DatasourceUID: expr.DatasourceUID,
+								Model:         json.RawMessage(`{"type": "math","expression": "1"}`),
+							},
+						},
+					},
+				},
+			},
+		},
+	}}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			resp, status, _ := client.PostRulesGroupWithStatus(t, namespaceUID, &tc.config)
+			require.Equal(t, http.StatusAccepted, status)
+			require.Len(t, resp.Created, 1)
+			require.Len(t, resp.Updated, 0)
+			require.Len(t, resp.Deleted, 0)
+		})
+	}
+}
+
 func TestIntegrationRuleUpdate(t *testing.T) {
 	testinfra.SQLiteIntegrationTest(t)
 
@@ -1023,26 +1447,26 @@ func TestIntegrationRuleUpdate(t *testing.T) {
 	adminClient := newAlertingApiClient(grafanaListedAddr, "admin", "admin")
 
 	client := newAlertingApiClient(grafanaListedAddr, "grafana", "password")
-	folder1Title := "folder1"
-	client.CreateFolder(t, util.GenerateShortUID(), folder1Title)
+	folderUID := util.GenerateShortUID()
+	client.CreateFolder(t, folderUID, "folder1")
 
 	t.Run("should be able to reset 'for' to 0", func(t *testing.T) {
 		group := generateAlertRuleGroup(1, alertRuleGen())
 		expected := model.Duration(10 * time.Second)
 		group.Rules[0].ApiRuleNode.For = &expected
 
-		_, status, body := client.PostRulesGroupWithStatus(t, folder1Title, &group)
+		_, status, body := client.PostRulesGroupWithStatus(t, folderUID, &group)
 		require.Equalf(t, http.StatusAccepted, status, "failed to post rule group. Response: %s", body)
-		getGroup := client.GetRulesGroup(t, folder1Title, group.Name)
+		getGroup := client.GetRulesGroup(t, folderUID, group.Name)
 		require.Equal(t, expected, *getGroup.Rules[0].ApiRuleNode.For)
 
 		group = convertGettableRuleGroupToPostable(getGroup.GettableRuleGroupConfig)
 		expected = 0
 		group.Rules[0].ApiRuleNode.For = &expected
-		_, status, body = client.PostRulesGroupWithStatus(t, folder1Title, &group)
+		_, status, body = client.PostRulesGroupWithStatus(t, folderUID, &group)
 		require.Equalf(t, http.StatusAccepted, status, "failed to post rule group. Response: %s", body)
 
-		getGroup = client.GetRulesGroup(t, folder1Title, group.Name)
+		getGroup = client.GetRulesGroup(t, folderUID, group.Name)
 		require.Equal(t, expected, *getGroup.Rules[0].ApiRuleNode.For)
 	})
 	t.Run("when data source missing", func(t *testing.T) {
@@ -1051,10 +1475,10 @@ func TestIntegrationRuleUpdate(t *testing.T) {
 			ds1 := adminClient.CreateTestDatasource(t)
 			group := generateAlertRuleGroup(3, alertRuleGen(withDatasourceQuery(ds1.Body.Datasource.UID)))
 
-			_, status, body := client.PostRulesGroupWithStatus(t, folder1Title, &group)
+			_, status, body := client.PostRulesGroupWithStatus(t, folderUID, &group)
 			require.Equalf(t, http.StatusAccepted, status, "failed to post rule group. Response: %s", body)
 
-			getGroup := client.GetRulesGroup(t, folder1Title, group.Name)
+			getGroup := client.GetRulesGroup(t, folderUID, group.Name)
 			group = convertGettableRuleGroupToPostable(getGroup.GettableRuleGroupConfig)
 
 			require.Len(t, group.Rules, 3)
@@ -1068,59 +1492,59 @@ func TestIntegrationRuleUpdate(t *testing.T) {
 		}
 
 		t.Run("noop should not fail", func(t *testing.T) {
-			getGroup := client.GetRulesGroup(t, folder1Title, groupName)
+			getGroup := client.GetRulesGroup(t, folderUID, groupName)
 			group := convertGettableRuleGroupToPostable(getGroup.GettableRuleGroupConfig)
 
-			_, status, body := client.PostRulesGroupWithStatus(t, folder1Title, &group)
+			_, status, body := client.PostRulesGroupWithStatus(t, folderUID, &group)
 			require.Equalf(t, http.StatusAccepted, status, "failed to post noop rule group. Response: %s", body)
 		})
 		t.Run("should not let update rule if it does not fix datasource", func(t *testing.T) {
-			getGroup := client.GetRulesGroup(t, folder1Title, groupName)
+			getGroup := client.GetRulesGroup(t, folderUID, groupName)
 			group := convertGettableRuleGroupToPostable(getGroup.GettableRuleGroupConfig)
 
 			group.Rules[0].GrafanaManagedAlert.Title = uuid.NewString()
-			resp, status, body := client.PostRulesGroupWithStatus(t, folder1Title, &group)
+			resp, status, body := client.PostRulesGroupWithStatus(t, folderUID, &group)
 
 			if status == http.StatusAccepted {
 				assert.Len(t, resp.Deleted, 1)
-				getGroup = client.GetRulesGroup(t, folder1Title, group.Name)
+				getGroup = client.GetRulesGroup(t, folderUID, group.Name)
 				assert.NotEqualf(t, group.Rules[0].GrafanaManagedAlert.Title, getGroup.Rules[0].GrafanaManagedAlert.Title, "group was updated")
 			}
 			require.Equalf(t, http.StatusBadRequest, status, "expected BadRequest. Response: %s", body)
 			assert.Contains(t, body, "data source not found")
 		})
 		t.Run("should let delete broken rule", func(t *testing.T) {
-			getGroup := client.GetRulesGroup(t, folder1Title, groupName)
+			getGroup := client.GetRulesGroup(t, folderUID, groupName)
 			group := convertGettableRuleGroupToPostable(getGroup.GettableRuleGroupConfig)
 
 			// remove the last rule.
 			group.Rules = group.Rules[0 : len(group.Rules)-1]
-			resp, status, body := client.PostRulesGroupWithStatus(t, folder1Title, &group)
+			resp, status, body := client.PostRulesGroupWithStatus(t, folderUID, &group)
 			require.Equalf(t, http.StatusAccepted, status, "failed to delete last rule from group. Response: %s", body)
 			assert.Len(t, resp.Deleted, 1)
 
-			getGroup = client.GetRulesGroup(t, folder1Title, group.Name)
+			getGroup = client.GetRulesGroup(t, folderUID, group.Name)
 			group = convertGettableRuleGroupToPostable(getGroup.GettableRuleGroupConfig)
 			require.Len(t, group.Rules, 2)
 		})
 		t.Run("should let fix single rule", func(t *testing.T) {
-			getGroup := client.GetRulesGroup(t, folder1Title, groupName)
+			getGroup := client.GetRulesGroup(t, folderUID, groupName)
 			group := convertGettableRuleGroupToPostable(getGroup.GettableRuleGroupConfig)
 
 			ds2 := adminClient.CreateTestDatasource(t)
 			withDatasourceQuery(ds2.Body.Datasource.UID)(&group.Rules[0])
-			resp, status, body := client.PostRulesGroupWithStatus(t, folder1Title, &group)
+			resp, status, body := client.PostRulesGroupWithStatus(t, folderUID, &group)
 			require.Equalf(t, http.StatusAccepted, status, "failed to post noop rule group. Response: %s", body)
 			assert.Len(t, resp.Deleted, 0)
 			assert.Len(t, resp.Updated, 2)
 			assert.Len(t, resp.Created, 0)
 
-			getGroup = client.GetRulesGroup(t, folder1Title, group.Name)
+			getGroup = client.GetRulesGroup(t, folderUID, group.Name)
 			group = convertGettableRuleGroupToPostable(getGroup.GettableRuleGroupConfig)
 			require.Equal(t, ds2.Body.Datasource.UID, group.Rules[0].GrafanaManagedAlert.Data[0].DatasourceUID)
 		})
 		t.Run("should let delete group", func(t *testing.T) {
-			status, body := client.DeleteRulesGroup(t, folder1Title, groupName)
+			status, body := client.DeleteRulesGroup(t, folderUID, groupName)
 			require.Equalf(t, http.StatusAccepted, status, "failed to post noop rule group. Response: %s", body)
 		})
 	})
@@ -1214,18 +1638,18 @@ func TestIntegrationRulePause(t *testing.T) {
 	})
 
 	client := newAlertingApiClient(grafanaListedAddr, "grafana", "password")
-	folder1Title := "folder1"
-	client.CreateFolder(t, util.GenerateShortUID(), folder1Title)
+	folderUID := util.GenerateShortUID()
+	client.CreateFolder(t, folderUID, "folder1")
 
 	t.Run("should create a paused rule if isPaused is true", func(t *testing.T) {
 		group := generateAlertRuleGroup(1, alertRuleGen())
 		expectedIsPaused := true
 		group.Rules[0].GrafanaManagedAlert.IsPaused = &expectedIsPaused
 
-		resp, status, body := client.PostRulesGroupWithStatus(t, folder1Title, &group)
+		resp, status, body := client.PostRulesGroupWithStatus(t, folderUID, &group)
 		require.Equalf(t, http.StatusAccepted, status, "failed to post rule group. Response: %s", body)
 		require.Len(t, resp.Created, 1)
-		getGroup := client.GetRulesGroup(t, folder1Title, group.Name)
+		getGroup := client.GetRulesGroup(t, folderUID, group.Name)
 		require.Equalf(t, http.StatusAccepted, status, "failed to get rule group. Response: %s", body)
 		require.Equal(t, expectedIsPaused, getGroup.Rules[0].GrafanaManagedAlert.IsPaused)
 	})
@@ -1235,10 +1659,10 @@ func TestIntegrationRulePause(t *testing.T) {
 		expectedIsPaused := false
 		group.Rules[0].GrafanaManagedAlert.IsPaused = &expectedIsPaused
 
-		resp, status, body := client.PostRulesGroupWithStatus(t, folder1Title, &group)
+		resp, status, body := client.PostRulesGroupWithStatus(t, folderUID, &group)
 		require.Equalf(t, http.StatusAccepted, status, "failed to post rule group. Response: %s", body)
 		require.Len(t, resp.Created, 1)
-		getGroup := client.GetRulesGroup(t, folder1Title, group.Name)
+		getGroup := client.GetRulesGroup(t, folderUID, group.Name)
 		require.Equalf(t, http.StatusAccepted, status, "failed to get rule group. Response: %s", body)
 		require.Equal(t, expectedIsPaused, getGroup.Rules[0].GrafanaManagedAlert.IsPaused)
 	})
@@ -1247,10 +1671,10 @@ func TestIntegrationRulePause(t *testing.T) {
 		group := generateAlertRuleGroup(1, alertRuleGen())
 		group.Rules[0].GrafanaManagedAlert.IsPaused = nil
 
-		resp, status, body := client.PostRulesGroupWithStatus(t, folder1Title, &group)
+		resp, status, body := client.PostRulesGroupWithStatus(t, folderUID, &group)
 		require.Equalf(t, http.StatusAccepted, status, "failed to post rule group. Response: %s", body)
 		require.Len(t, resp.Created, 1)
-		getGroup := client.GetRulesGroup(t, folder1Title, group.Name)
+		getGroup := client.GetRulesGroup(t, folderUID, group.Name)
 		require.Equalf(t, http.StatusAccepted, status, "failed to get rule group. Response: %s", body)
 		require.False(t, getGroup.Rules[0].GrafanaManagedAlert.IsPaused)
 	})
@@ -1305,18 +1729,374 @@ func TestIntegrationRulePause(t *testing.T) {
 			group := generateAlertRuleGroup(1, alertRuleGen())
 			group.Rules[0].GrafanaManagedAlert.IsPaused = &tc.isPausedInDb
 
-			_, status, body := client.PostRulesGroupWithStatus(t, folder1Title, &group)
+			_, status, body := client.PostRulesGroupWithStatus(t, folderUID, &group)
 			require.Equalf(t, http.StatusAccepted, status, "failed to post rule group. Response: %s", body)
-			getGroup := client.GetRulesGroup(t, folder1Title, group.Name)
+			getGroup := client.GetRulesGroup(t, folderUID, group.Name)
 			require.Equalf(t, http.StatusAccepted, status, "failed to get rule group. Response: %s", body)
 
 			group = convertGettableRuleGroupToPostable(getGroup.GettableRuleGroupConfig)
 			group.Rules[0].GrafanaManagedAlert.IsPaused = tc.isPausedInBody
-			_, status, body = client.PostRulesGroupWithStatus(t, folder1Title, &group)
+			_, status, body = client.PostRulesGroupWithStatus(t, folderUID, &group)
 			require.Equalf(t, http.StatusAccepted, status, "failed to post rule group. Response: %s", body)
 
-			getGroup = client.GetRulesGroup(t, folder1Title, group.Name)
+			getGroup = client.GetRulesGroup(t, folderUID, group.Name)
 			require.Equal(t, tc.expectedIsPausedInDb, getGroup.Rules[0].GrafanaManagedAlert.IsPaused)
 		})
 	}
 }
+
+func TestIntegrationHysteresisRule(t *testing.T) {
+	testinfra.SQLiteIntegrationTest(t)
+
+	// Setup Grafana and its Database. Scheduler is set to evaluate every 1 second
+	dir, p := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
+		DisableLegacyAlerting:        true,
+		EnableUnifiedAlerting:        true,
+		DisableAnonymous:             true,
+		AppModeProduction:            true,
+		NGAlertSchedulerBaseInterval: 1 * time.Second,
+		EnableFeatureToggles:         []string{featuremgmt.FlagConfigurableSchedulerTick, featuremgmt.FlagRecoveryThreshold},
+	})
+
+	grafanaListedAddr, store := testinfra.StartGrafana(t, dir, p)
+
+	// Create a user to make authenticated requests
+	createUser(t, store, user.CreateUserCommand{
+		DefaultOrgRole: string(org.RoleAdmin),
+		Password:       "password",
+		Login:          "grafana",
+	})
+
+	apiClient := newAlertingApiClient(grafanaListedAddr, "grafana", "password")
+
+	folder := "hysteresis"
+	testDs := apiClient.CreateTestDatasource(t)
+	apiClient.CreateFolder(t, folder, folder)
+
+	bodyRaw, err := testData.ReadFile("test-data/hysteresis_rule.json")
+	require.NoError(t, err)
+
+	var postData apimodels.PostableRuleGroupConfig
+	require.NoError(t, json.Unmarshal(bodyRaw, &postData))
+	for _, rule := range postData.Rules {
+		for i := range rule.GrafanaManagedAlert.Data {
+			rule.GrafanaManagedAlert.Data[i].DatasourceUID = strings.ReplaceAll(rule.GrafanaManagedAlert.Data[i].DatasourceUID, "REPLACE_ME", testDs.Body.Datasource.UID)
+		}
+	}
+	changes, status, body := apiClient.PostRulesGroupWithStatus(t, folder, &postData)
+	require.Equalf(t, http.StatusAccepted, status, body)
+	require.Len(t, changes.Created, 1)
+	ruleUid := changes.Created[0]
+
+	var frame data.Frame
+	require.Eventuallyf(t, func() bool {
+		frame, status, body = apiClient.GetRuleHistoryWithStatus(t, ruleUid)
+		require.Equalf(t, http.StatusOK, status, body)
+		return frame.Rows() > 1
+	}, 15*time.Second, 1*time.Second, "Alert state history expected to have more than one record but got %d. Body: %s", frame.Rows(), body)
+
+	f, _ := frame.FieldByName("next")
+
+	alertingIdx := 0
+	normalIdx := 1
+	if f.At(alertingIdx).(string) != "Alerting" {
+		alertingIdx = 1
+		normalIdx = 0
+	}
+
+	assert.Equalf(t, "Alerting", f.At(alertingIdx).(string), body)
+	assert.Equalf(t, "Normal", f.At(normalIdx).(string), body)
+
+	type HistoryData struct {
+		Values map[string]int64
+	}
+
+	f, _ = frame.FieldByName("data")
+	var d HistoryData
+	require.NoErrorf(t, json.Unmarshal([]byte(f.At(alertingIdx).(string)), &d), body)
+	assert.EqualValuesf(t, 5, d.Values["B"], body)
+	require.NoErrorf(t, json.Unmarshal([]byte(f.At(normalIdx).(string)), &d), body)
+	assert.EqualValuesf(t, 1, d.Values["B"], body)
+}
+
+func TestIntegrationRuleNotificationSettings(t *testing.T) {
+	testinfra.SQLiteIntegrationTest(t)
+
+	// Setup Grafana and its Database. Scheduler is set to evaluate every 1 second
+	dir, p := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
+		DisableLegacyAlerting:        true,
+		EnableUnifiedAlerting:        true,
+		DisableAnonymous:             true,
+		AppModeProduction:            true,
+		NGAlertSchedulerBaseInterval: 1 * time.Second,
+		EnableFeatureToggles:         []string{featuremgmt.FlagConfigurableSchedulerTick, featuremgmt.FlagAlertingSimplifiedRouting},
+	})
+
+	grafanaListedAddr, store := testinfra.StartGrafana(t, dir, p)
+
+	// Create a user to make authenticated requests
+	createUser(t, store, user.CreateUserCommand{
+		DefaultOrgRole: string(org.RoleAdmin),
+		Password:       "password",
+		Login:          "grafana",
+	})
+
+	apiClient := newAlertingApiClient(grafanaListedAddr, "grafana", "password")
+
+	folder := "Test-Alerting"
+	apiClient.CreateFolder(t, folder, folder)
+
+	testDataRaw, err := testData.ReadFile(path.Join("test-data", "rule-notification-settings-1-post.json"))
+	require.NoError(t, err)
+
+	type testData struct {
+		RuleGroup    apimodels.PostableRuleGroupConfig
+		Receiver     apimodels.EmbeddedContactPoint
+		TimeInterval apimodels.MuteTimeInterval
+	}
+	var d testData
+	err = json.Unmarshal(testDataRaw, &d)
+	require.NoError(t, err)
+
+	apiClient.EnsureReceiver(t, d.Receiver)
+	apiClient.EnsureMuteTiming(t, d.TimeInterval)
+
+	t.Run("create should fail if receiver does not exist", func(t *testing.T) {
+		var copyD testData
+		err = json.Unmarshal(testDataRaw, &copyD)
+		group := copyD.RuleGroup
+		ns := group.Rules[0].GrafanaManagedAlert.NotificationSettings
+		ns.Receiver = "random-receiver"
+
+		_, status, body := apiClient.PostRulesGroupWithStatus(t, folder, &group)
+		require.Equalf(t, http.StatusBadRequest, status, body)
+		t.Log(body)
+	})
+
+	t.Run("create should fail if mute timing does not exist", func(t *testing.T) {
+		var copyD testData
+		err = json.Unmarshal(testDataRaw, &copyD)
+		group := copyD.RuleGroup
+		ns := group.Rules[0].GrafanaManagedAlert.NotificationSettings
+		ns.MuteTimeIntervals = []string{"random-time-interval"}
+
+		_, status, body := apiClient.PostRulesGroupWithStatus(t, folder, &group)
+		require.Equalf(t, http.StatusBadRequest, status, body)
+		t.Log(body)
+	})
+
+	t.Run("create should not fail if group_by is missing required labels but they should still be used", func(t *testing.T) {
+		var copyD testData
+		err = json.Unmarshal(testDataRaw, &copyD)
+		group := copyD.RuleGroup
+		ns := group.Rules[0].GrafanaManagedAlert.NotificationSettings
+		ns.GroupBy = []string{"label1"}
+
+		_, status, body := apiClient.PostRulesGroupWithStatus(t, folder, &group)
+		require.Equalf(t, http.StatusAccepted, status, body)
+
+		cfg, status, body := apiClient.GetAlertmanagerConfigWithStatus(t)
+		if !assert.Equalf(t, http.StatusOK, status, body) {
+			return
+		}
+
+		// Ensure that the group by contains the default required labels.
+		autogenRoute := cfg.AlertmanagerConfig.Route.Routes[0]
+		receiverRoute := autogenRoute.Routes[0]
+		ruleRoute := receiverRoute.Routes[0]
+		assert.Equal(t, []model.LabelName{ngmodels.FolderTitleLabel, model.AlertNameLabel, "label1"}, ruleRoute.GroupBy)
+
+		t.Log(body)
+	})
+
+	t.Run("create with '...' groupBy followed by config post should succeed", func(t *testing.T) {
+		var copyD testData
+		err = json.Unmarshal(testDataRaw, &copyD)
+		group := copyD.RuleGroup
+		ns := group.Rules[0].GrafanaManagedAlert.NotificationSettings
+		ns.GroupBy = []string{ngmodels.FolderTitleLabel, model.AlertNameLabel, ngmodels.GroupByAll}
+
+		_, status, body := apiClient.PostRulesGroupWithStatus(t, folder, &group)
+		require.Equalf(t, http.StatusAccepted, status, body)
+
+		// Now update the config with no changes.
+		_, status, body = apiClient.GetAlertmanagerConfigWithStatus(t)
+		if !assert.Equalf(t, http.StatusOK, status, body) {
+			return
+		}
+
+		cfg := apimodels.PostableUserConfig{}
+
+		err = json.Unmarshal([]byte(body), &cfg)
+		require.NoError(t, err)
+
+		ok, err := apiClient.PostConfiguration(t, cfg)
+		require.NoError(t, err)
+		require.True(t, ok)
+	})
+
+	t.Run("should create rule and generate route", func(t *testing.T) {
+		_, status, body := apiClient.PostRulesGroupWithStatus(t, folder, &d.RuleGroup)
+		require.Equalf(t, http.StatusAccepted, status, body)
+		notificationSettings := d.RuleGroup.Rules[0].GrafanaManagedAlert.NotificationSettings
+
+		var routeBody string
+		if !assert.EventuallyWithT(t, func(c *assert.CollectT) {
+			amConfig, status, body := apiClient.GetAlertmanagerConfigWithStatus(t)
+			routeBody = body
+			if !assert.Equalf(t, http.StatusOK, status, body) {
+				return
+			}
+			route := amConfig.AlertmanagerConfig.Route
+
+			if !assert.Len(c, route.Routes, 1) {
+				return
+			}
+
+			// Check that we are in the auto-generated root
+			autogenRoute := route.Routes[0]
+			if !assert.Len(c, autogenRoute.ObjectMatchers, 1) {
+				return
+			}
+			canContinue := assert.Equal(c, ngmodels.AutogeneratedRouteLabel, autogenRoute.ObjectMatchers[0].Name)
+			assert.Equal(c, labels.MatchEqual, autogenRoute.ObjectMatchers[0].Type)
+			assert.Equal(c, "true", autogenRoute.ObjectMatchers[0].Value)
+
+			assert.Equalf(c, route.Receiver, autogenRoute.Receiver, "Autogenerated root receiver must be the default one")
+			assert.Nil(c, autogenRoute.GroupWait)
+			assert.Nil(c, autogenRoute.GroupInterval)
+			assert.Nil(c, autogenRoute.RepeatInterval)
+			assert.Empty(c, autogenRoute.MuteTimeIntervals)
+			assert.Empty(c, autogenRoute.GroupBy)
+			if !canContinue {
+				return
+			}
+			// Now check that the second level is route for receivers
+			if !assert.NotEmpty(c, autogenRoute.Routes) {
+				return
+			}
+			// There can be many routes, for all receivers
+			idx := slices.IndexFunc(autogenRoute.Routes, func(route *apimodels.Route) bool {
+				return route.Receiver == notificationSettings.Receiver
+			})
+			if !assert.GreaterOrEqual(t, idx, 0) {
+				return
+			}
+			receiverRoute := autogenRoute.Routes[idx]
+			if !assert.Len(c, receiverRoute.ObjectMatchers, 1) {
+				return
+			}
+			canContinue = assert.Equal(c, ngmodels.AutogeneratedRouteReceiverNameLabel, receiverRoute.ObjectMatchers[0].Name)
+			assert.Equal(c, labels.MatchEqual, receiverRoute.ObjectMatchers[0].Type)
+			assert.Equal(c, notificationSettings.Receiver, receiverRoute.ObjectMatchers[0].Value)
+
+			assert.Equal(c, notificationSettings.Receiver, receiverRoute.Receiver)
+			assert.Nil(c, receiverRoute.GroupWait)
+			assert.Nil(c, receiverRoute.GroupInterval)
+			assert.Nil(c, receiverRoute.RepeatInterval)
+			assert.Empty(c, receiverRoute.MuteTimeIntervals)
+			var groupBy []string
+			for _, name := range receiverRoute.GroupBy {
+				groupBy = append(groupBy, string(name))
+			}
+			slices.Sort(groupBy)
+			assert.EqualValues(c, []string{"alertname", "grafana_folder"}, groupBy)
+			if !canContinue {
+				return
+			}
+			// Now check that we created the 3rd level for specific combination of settings
+			if !assert.Lenf(c, receiverRoute.Routes, 1, "Receiver route should contain one options route") {
+				return
+			}
+			optionsRoute := receiverRoute.Routes[0]
+			if !assert.Len(c, optionsRoute.ObjectMatchers, 1) {
+				return
+			}
+			assert.Equal(c, ngmodels.AutogeneratedRouteSettingsHashLabel, optionsRoute.ObjectMatchers[0].Name)
+			assert.Equal(c, labels.MatchEqual, optionsRoute.ObjectMatchers[0].Type)
+			assert.EqualValues(c, notificationSettings.GroupWait, optionsRoute.GroupWait)
+			assert.EqualValues(c, notificationSettings.GroupInterval, optionsRoute.GroupInterval)
+			assert.EqualValues(c, notificationSettings.RepeatInterval, optionsRoute.RepeatInterval)
+			assert.EqualValues(c, notificationSettings.MuteTimeIntervals, optionsRoute.MuteTimeIntervals)
+			groupBy = nil
+			for _, name := range optionsRoute.GroupBy {
+				groupBy = append(groupBy, string(name))
+			}
+			assert.EqualValues(c, notificationSettings.GroupBy, groupBy)
+		}, 10*time.Second, 1*time.Second) {
+			t.Logf("config: %s", routeBody)
+		}
+	})
+
+	t.Run("should correctly create alerts", func(t *testing.T) {
+		var response string
+		if !assert.EventuallyWithT(t, func(c *assert.CollectT) {
+			groups, status, body := apiClient.GetActiveAlertsWithStatus(t)
+			require.Equalf(t, http.StatusOK, status, body)
+			response = body
+			if len(groups) == 0 {
+				return
+			}
+			g := groups[0]
+			alert := g.Alerts[0]
+			assert.Contains(c, alert.Labels, ngmodels.AutogeneratedRouteLabel)
+			assert.Equal(c, "true", alert.Labels[ngmodels.AutogeneratedRouteLabel])
+			assert.Contains(c, alert.Labels, ngmodels.AutogeneratedRouteReceiverNameLabel)
+			assert.Equal(c, d.Receiver.Name, alert.Labels[ngmodels.AutogeneratedRouteReceiverNameLabel])
+			assert.Contains(c, alert.Labels, ngmodels.AutogeneratedRouteSettingsHashLabel)
+			assert.NotEmpty(c, alert.Labels[ngmodels.AutogeneratedRouteSettingsHashLabel])
+		}, 10*time.Second, 1*time.Second) {
+			t.Logf("response: %s", response)
+		}
+	})
+
+	t.Run("should update rule with empty settings and delete route", func(t *testing.T) {
+		var copyD testData
+		err = json.Unmarshal(testDataRaw, &copyD)
+		group := copyD.RuleGroup
+		notificationSettings := group.Rules[0].GrafanaManagedAlert.NotificationSettings
+		group.Rules[0].GrafanaManagedAlert.NotificationSettings = nil
+
+		_, status, body := apiClient.PostRulesGroupWithStatus(t, folder, &group)
+		require.Equalf(t, http.StatusAccepted, status, body)
+
+		var routeBody string
+		if !assert.EventuallyWithT(t, func(c *assert.CollectT) {
+			amConfig, status, body := apiClient.GetAlertmanagerConfigWithStatus(t)
+			routeBody = body
+			if !assert.Equalf(t, http.StatusOK, status, body) {
+				return
+			}
+			route := amConfig.AlertmanagerConfig.Route
+
+			if !assert.Len(c, route.Routes, 1) {
+				return
+			}
+			// Check that we are in the auto-generated root
+			autogenRoute := route.Routes[0]
+			if !assert.Len(c, autogenRoute.ObjectMatchers, 1) {
+				return
+			}
+			if !assert.Equal(c, ngmodels.AutogeneratedRouteLabel, autogenRoute.ObjectMatchers[0].Name) {
+				return
+			}
+			// Now check that the second level is route for receivers
+			if !assert.NotEmpty(c, autogenRoute.Routes) {
+				return
+			}
+			// There can be many routes, for all receivers
+			idx := slices.IndexFunc(autogenRoute.Routes, func(route *apimodels.Route) bool {
+				return route.Receiver == notificationSettings.Receiver
+			})
+			if !assert.GreaterOrEqual(t, idx, 0) {
+				return
+			}
+			receiverRoute := autogenRoute.Routes[idx]
+			if !assert.Empty(c, receiverRoute.Routes) {
+				return
+			}
+		}, 10*time.Second, 1*time.Second) {
+			t.Logf("config: %s", routeBody)
+		}
+	})
+}
diff --git a/pkg/tests/api/alerting/api_testing_test.go b/pkg/tests/api/alerting/api_testing_test.go
index eee30ad69b8a7..6b01b4f163d46 100644
--- a/pkg/tests/api/alerting/api_testing_test.go
+++ b/pkg/tests/api/alerting/api_testing_test.go
@@ -24,6 +24,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 	"github.com/grafana/grafana/pkg/util"
 )
 
@@ -31,6 +32,10 @@ const (
 	TESTDATA_UID = "testdata"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestGrafanaRuleConfig(t *testing.T) {
 	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
 		DisableLegacyAlerting: true,
@@ -51,6 +56,8 @@ func TestGrafanaRuleConfig(t *testing.T) {
 
 	apiCli := newAlertingApiClient(grafanaListedAddr, "admin", "admin")
 
+	apiCli.CreateFolder(t, "NamespaceUID", "NamespaceTitle")
+
 	dsCmd := &datasources.AddDataSourceCommand{
 		Name:   "TestDatasource",
 		Type:   "testdata",
diff --git a/pkg/tests/api/alerting/test-data/hysteresis_rule.json b/pkg/tests/api/alerting/test-data/hysteresis_rule.json
new file mode 100644
index 0000000000000..53a01c9ac5e9e
--- /dev/null
+++ b/pkg/tests/api/alerting/test-data/hysteresis_rule.json
@@ -0,0 +1,71 @@
+{
+  "name": "Default",
+  "interval": "1s",
+  "rules": [
+    {
+      "grafana_alert": {
+        "title": "Hysteresis Test",
+        "condition": "C",
+        "no_data_state": "NoData",
+        "exec_err_state": "Error",
+        "data": [
+          {
+            "refId": "A",
+            "datasourceUid": "REPLACE_ME",
+            "queryType": "",
+            "relativeTimeRange": {
+              "from": 600,
+              "to": 0
+            },
+            "model": {
+              "refId": "A",
+              "scenarioId": "predictable_csv_wave",
+              "csvWave": [
+                {
+                  "timeStep": 1,
+                  "valuesCSV": "5,3,2,1"
+                }
+              ],
+              "seriesCount": 1
+            }
+          },
+          {
+            "refId": "B",
+            "datasourceUid": "__expr__",
+            "model": {
+              "refId": "B",
+              "type": "reduce",
+              "reducer": "last",
+              "expression": "A"
+            }
+          },
+          {
+            "refId": "C",
+            "datasourceUid": "__expr__",
+            "model": {
+              "refId": "C",
+              "type": "threshold",
+              "conditions": [
+                {
+                  "evaluator": {
+                    "params": [
+                      4
+                    ],
+                    "type": "gt"
+                  },
+                  "unloadEvaluator": {
+                    "params": [
+                      2
+                    ],
+                    "type": "lt"
+                  }
+                }
+              ],
+              "expression": "B"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tests/api/alerting/test-data/rule-notification-settings-1-post.json b/pkg/tests/api/alerting/test-data/rule-notification-settings-1-post.json
new file mode 100644
index 0000000000000..b281cc566a4e3
--- /dev/null
+++ b/pkg/tests/api/alerting/test-data/rule-notification-settings-1-post.json
@@ -0,0 +1,58 @@
+{
+  "ruleGroup" : {
+    "name": "Group1",
+    "interval": "1m",
+    "rules": [
+      {
+        "for": "0",
+        "labels": {
+          "label1": "test-label"
+        },
+        "annotations": {
+          "annotation": "test-annotation"
+        },
+        "grafana_alert": {
+          "title": "Rule1",
+          "condition": "A",
+          "data": [
+            {
+              "refId": "A",
+              "datasourceUid": "__expr__",
+              "model": {
+                "expression": "0 > 0",
+                "type": "math"
+              }
+            }
+          ],
+          "no_data_state": "NoData",
+          "exec_err_state": "Alerting",
+          "notification_settings": {
+            "receiver": "rule-receiver",
+            "group_by": [
+              "grafana_folder",
+              "alertname",
+              "label1"
+            ],
+            "group_wait": "100ms",
+            "group_interval": "5s",
+            "repeat_interval": "1d",
+            "mute_time_intervals": [
+              "rule-time-interval"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  "receiver": {
+    "name": "rule-receiver",
+    "type": "webhook",
+    "settings": {
+      "url": "http://localhost:3000/_callback"
+    }
+  },
+  "timeInterval": {
+    "name": "rule-time-interval",
+    "time_intervals":[{"times":[{"start_time":"10:00","end_time":"12:00"}]}]
+  }
+}
diff --git a/pkg/tests/api/alerting/test-data/rulegroup-1-get.json b/pkg/tests/api/alerting/test-data/rulegroup-1-get.json
index 9c3ad4dd97984..27474baf8e346 100644
--- a/pkg/tests/api/alerting/test-data/rulegroup-1-get.json
+++ b/pkg/tests/api/alerting/test-data/rulegroup-1-get.json
@@ -38,7 +38,6 @@
         "version": 1,
         "uid": "<dynamic>",
         "namespace_uid": "<dynamic>",
-        "namespace_id": 0,
         "rule_group": "Group1",
         "no_data_state": "NoData",
         "exec_err_state": "Alerting",
@@ -81,7 +80,6 @@
         "version": 1,
         "uid": "<dynamic>",
         "namespace_uid": "<dynamic>",
-        "namespace_id": 0,
         "rule_group": "Group1",
         "no_data_state": "NoData",
         "exec_err_state": "Alerting",
diff --git a/pkg/tests/api/alerting/test-data/rulegroup-2-get.json b/pkg/tests/api/alerting/test-data/rulegroup-2-get.json
index 6986c078e4e83..dc29a8b2bd23b 100644
--- a/pkg/tests/api/alerting/test-data/rulegroup-2-get.json
+++ b/pkg/tests/api/alerting/test-data/rulegroup-2-get.json
@@ -38,7 +38,6 @@
         "version": 1,
         "uid": "<dynamic>",
         "namespace_uid": "<dynamic>",
-        "namespace_id": 0,
         "rule_group": "Group2",
         "no_data_state": "NoData",
         "exec_err_state": "Error",
diff --git a/pkg/tests/api/alerting/test-data/rulegroup-3-export.json b/pkg/tests/api/alerting/test-data/rulegroup-3-export.json
new file mode 100644
index 0000000000000..5a1ba9e0eac1a
--- /dev/null
+++ b/pkg/tests/api/alerting/test-data/rulegroup-3-export.json
@@ -0,0 +1,75 @@
+{
+  "apiVersion": 1,
+  "groups": [
+    {
+      "orgId": 1,
+      "name": "Group3",
+      "folder": "<dynamic>",
+      "interval": "1m",
+      "rules": [
+        {
+          "uid": "<dynamic>",
+          "title": "Rule1",
+          "condition": "A",
+          "data": [
+            {
+              "refId": "A",
+              "relativeTimeRange": {
+                "from": 0,
+                "to": 0
+              },
+              "datasourceUid": "__expr__",
+              "model": {
+                "expression": "0 \u003e 0",
+                "intervalMs": 1000,
+                "maxDataPoints": 43200,
+                "type": "math"
+              }
+            }
+          ],
+          "noDataState": "NoData",
+          "execErrState": "Alerting",
+          "for": "5m",
+          "annotations": {
+            "annotation": "test-annotation"
+          },
+          "labels": {
+            "label1": "test-label"
+          },
+          "isPaused": false
+        },
+        {
+          "uid": "<dynamic>",
+          "title": "Rule2",
+          "condition": "A",
+          "data": [
+            {
+              "refId": "A",
+              "relativeTimeRange": {
+                "from": 0,
+                "to": 0
+              },
+              "datasourceUid": "__expr__",
+              "model": {
+                "expression": "0 == 0",
+                "intervalMs": 1000,
+                "maxDataPoints": 43200,
+                "type": "math"
+              }
+            }
+          ],
+          "noDataState": "NoData",
+          "execErrState": "Alerting",
+          "for": "5m",
+          "annotations": {
+            "annotation": "test-annotation"
+          },
+          "labels": {
+            "label1": "test-label"
+          },
+          "isPaused": false
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tests/api/alerting/test-data/rulegroup-3-get.json b/pkg/tests/api/alerting/test-data/rulegroup-3-get.json
new file mode 100644
index 0000000000000..252dc99f13be1
--- /dev/null
+++ b/pkg/tests/api/alerting/test-data/rulegroup-3-get.json
@@ -0,0 +1,90 @@
+{
+  "name": "Group3",
+  "interval": "1m",
+  "rules": [
+    {
+      "expr": "",
+      "for": "5m",
+      "labels": {
+        "label1": "test-label"
+      },
+      "annotations": {
+        "annotation": "test-annotation"
+      },
+      "grafana_alert": {
+        "id": 1,
+        "orgId": 1,
+        "title": "Rule1",
+        "condition": "A",
+        "data": [
+          {
+            "refId": "A",
+            "queryType": "",
+            "relativeTimeRange": {
+              "from": 0,
+              "to": 0
+            },
+            "datasourceUid": "__expr__",
+            "model": {
+              "expression": "0 > 0",
+              "intervalMs": 1000,
+              "maxDataPoints": 43200,
+              "type": "math"
+            }
+          }
+        ],
+        "updated": "2023-09-29T17:37:19Z",
+        "intervalSeconds": 60,
+        "version": 1,
+        "uid": "<dynamic>",
+        "namespace_uid": "<dynamic>",
+        "rule_group": "Group3",
+        "no_data_state": "NoData",
+        "exec_err_state": "Alerting",
+        "is_paused": false
+      }
+    },
+    {
+      "expr": "",
+      "for": "5m",
+      "labels": {
+        "label1": "test-label"
+      },
+      "annotations": {
+        "annotation": "test-annotation"
+      },
+      "grafana_alert": {
+        "id": 2,
+        "orgId": 1,
+        "title": "Rule2",
+        "condition": "A",
+        "data": [
+          {
+            "refId": "A",
+            "queryType": "",
+            "relativeTimeRange": {
+              "from": 0,
+              "to": 0
+            },
+            "datasourceUid": "__expr__",
+            "model": {
+              "expression": "0 == 0",
+              "intervalMs": 1000,
+              "maxDataPoints": 43200,
+              "type": "math"
+            }
+          }
+        ],
+        "updated": "2023-09-29T17:37:19Z",
+        "intervalSeconds": 60,
+        "version": 1,
+        "uid": "<dynamic>",
+        "namespace_uid": "<dynamic>",
+        "rule_group": "Group3",
+        "no_data_state": "NoData",
+        "exec_err_state": "Alerting",
+        "is_paused": false
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tests/api/alerting/test-data/rulegroup-3-post.json b/pkg/tests/api/alerting/test-data/rulegroup-3-post.json
new file mode 100644
index 0000000000000..2f528d19ad1cc
--- /dev/null
+++ b/pkg/tests/api/alerting/test-data/rulegroup-3-post.json
@@ -0,0 +1,56 @@
+{
+  "name": "Group3",
+  "interval": "1m",
+  "rules": [
+    {
+      "for": "5m",
+      "labels": {
+        "label1": "test-label"
+      },
+      "annotations": {
+        "annotation": "test-annotation"
+      },
+      "grafana_alert": {
+        "title": "Rule1",
+        "condition": "A",
+        "data": [
+          {
+            "refId": "A",
+            "datasourceUid": "__expr__",
+            "model": {
+              "expression": "0 > 0",
+              "type": "math"
+            }
+          }
+        ],
+        "no_data_state": "NoData",
+        "exec_err_state": "Alerting"
+      }
+    },
+    {
+      "for": "5m",
+      "labels": {
+        "label1": "test-label"
+      },
+      "annotations": {
+        "annotation": "test-annotation"
+      },
+      "grafana_alert": {
+        "title": "Rule2",
+        "condition": "A",
+        "data": [
+          {
+            "refId": "A",
+            "datasourceUid": "__expr__",
+            "model": {
+              "expression": "0 == 0",
+              "type": "math"
+            }
+          }
+        ],
+        "no_data_state": "NoData",
+        "exec_err_state": "Alerting"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tests/api/alerting/testing.go b/pkg/tests/api/alerting/testing.go
index ae4d1bcb649fb..208e7856a38a6 100644
--- a/pkg/tests/api/alerting/testing.go
+++ b/pkg/tests/api/alerting/testing.go
@@ -3,6 +3,7 @@ package alerting
 import (
 	"bytes"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -12,12 +13,14 @@ import (
 	"time"
 
 	"github.com/google/uuid"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/api"
 	"github.com/grafana/grafana/pkg/expr"
+	"github.com/grafana/grafana/pkg/services/folder"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/quota"
@@ -223,13 +226,14 @@ func convertGettableGrafanaRuleToPostable(gettable *apimodels.GettableGrafanaRul
 		return nil
 	}
 	return &apimodels.PostableGrafanaRule{
-		Title:        gettable.Title,
-		Condition:    gettable.Condition,
-		Data:         gettable.Data,
-		UID:          gettable.UID,
-		NoDataState:  gettable.NoDataState,
-		ExecErrState: gettable.ExecErrState,
-		IsPaused:     &gettable.IsPaused,
+		Title:                gettable.Title,
+		Condition:            gettable.Condition,
+		Data:                 gettable.Data,
+		UID:                  gettable.UID,
+		NoDataState:          gettable.NoDataState,
+		ExecErrState:         gettable.ExecErrState,
+		IsPaused:             &gettable.IsPaused,
+		NotificationSettings: gettable.NotificationSettings,
 	}
 }
 
@@ -259,9 +263,20 @@ func (a apiClient) ReloadCachedPermissions(t *testing.T) {
 }
 
 // CreateFolder creates a folder for storing our alerts, and then refreshes the permission cache to make sure that following requests will be accepted
-func (a apiClient) CreateFolder(t *testing.T, uID string, title string) {
+func (a apiClient) CreateFolder(t *testing.T, uID string, title string, parentUID ...string) {
 	t.Helper()
-	payload := fmt.Sprintf(`{"uid": "%s","title": "%s"}`, uID, title)
+	cmd := folder.CreateFolderCommand{
+		UID:   uID,
+		Title: title,
+	}
+	if len(parentUID) > 0 {
+		cmd.ParentUID = parentUID[0]
+	}
+
+	blob, err := json.Marshal(cmd)
+	require.NoError(t, err)
+
+	payload := string(blob)
 	u := fmt.Sprintf("%s/api/folders", a.url)
 	r := strings.NewReader(payload)
 	// nolint:gosec
@@ -328,6 +343,40 @@ func (a apiClient) UpdateAlertRuleOrgQuota(t *testing.T, orgID int64, limit int6
 	assert.Equal(t, http.StatusOK, resp.StatusCode)
 }
 
+func (a apiClient) PostConfiguration(t *testing.T, c apimodels.PostableUserConfig) (bool, error) {
+	t.Helper()
+
+	b, err := json.Marshal(c)
+	require.NoError(t, err)
+
+	u := fmt.Sprintf("%s/api/alertmanager/grafana/config/api/v1/alerts", a.url)
+	req, err := http.NewRequest(http.MethodPost, u, bytes.NewReader(b))
+	require.NoError(t, err)
+	req.Header.Set("Content-Type", "application/json")
+
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	require.NoError(t, err)
+	require.NotNil(t, resp)
+
+	defer func() {
+		_ = resp.Body.Close()
+	}()
+	b, err = io.ReadAll(resp.Body)
+	require.NoError(t, err)
+
+	data := struct {
+		Message string `json:"message"`
+	}{}
+	require.NoError(t, json.Unmarshal(b, &data))
+
+	if resp.StatusCode == http.StatusAccepted {
+		return true, nil
+	}
+
+	return false, errors.New(data.Message)
+}
+
 func (a apiClient) PostRulesGroupWithStatus(t *testing.T, folder string, group *apimodels.PostableRuleGroupConfig) (apimodels.UpdateRuleGroupResponse, int, string) {
 	t.Helper()
 	buf := bytes.Buffer{}
@@ -405,6 +454,41 @@ func (a apiClient) DeleteRulesGroup(t *testing.T, folder string, group string) (
 	return resp.StatusCode, string(b)
 }
 
+func (a apiClient) PostSilence(t *testing.T, s apimodels.PostableSilence) (string, error) {
+	t.Helper()
+
+	b, err := json.Marshal(s)
+	require.NoError(t, err)
+
+	u := fmt.Sprintf("%s/api/alertmanager/grafana/api/v2/silences", a.url)
+	req, err := http.NewRequest(http.MethodPost, u, bytes.NewReader(b))
+	require.NoError(t, err)
+	req.Header.Set("Content-Type", "application/json")
+
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	require.NoError(t, err)
+	require.NotNil(t, resp)
+
+	defer func() {
+		_ = resp.Body.Close()
+	}()
+	b, err = io.ReadAll(resp.Body)
+	require.NoError(t, err)
+
+	data := struct {
+		SilenceID string `json:"silenceID"`
+		Message   string `json:"message"`
+	}{}
+	require.NoError(t, json.Unmarshal(b, &data))
+
+	if resp.StatusCode == http.StatusAccepted {
+		return data.SilenceID, nil
+	}
+
+	return "", errors.New(data.Message)
+}
+
 func (a apiClient) GetRulesGroup(t *testing.T, folder string, group string) apimodels.RuleGroupConfigResponse {
 	result, status, _ := a.GetRulesGroupWithStatus(t, folder, group)
 	require.Equal(t, http.StatusAccepted, status)
@@ -594,3 +678,204 @@ func (a apiClient) DeleteDatasource(t *testing.T, uid string) {
 		require.Failf(t, "failed to create data source", "API request to create a datasource failed. Status code: %d, response: %s", resp.StatusCode, string(b))
 	}
 }
+
+func (a apiClient) GetAllMuteTimingsWithStatus(t *testing.T) (apimodels.MuteTimings, int, string) {
+	t.Helper()
+
+	req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/api/v1/provisioning/mute-timings", a.url), nil)
+	require.NoError(t, err)
+
+	return sendRequest[apimodels.MuteTimings](t, req, http.StatusOK)
+}
+
+func (a apiClient) GetMuteTimingByNameWithStatus(t *testing.T, name string) (apimodels.MuteTimeInterval, int, string) {
+	t.Helper()
+
+	req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/api/v1/provisioning/mute-timings/%s", a.url, name), nil)
+	require.NoError(t, err)
+
+	return sendRequest[apimodels.MuteTimeInterval](t, req, http.StatusOK)
+}
+
+func (a apiClient) CreateMuteTimingWithStatus(t *testing.T, interval apimodels.MuteTimeInterval) (apimodels.MuteTimeInterval, int, string) {
+	t.Helper()
+
+	buf := bytes.Buffer{}
+	enc := json.NewEncoder(&buf)
+	err := enc.Encode(interval)
+	require.NoError(t, err)
+
+	req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("%s/api/v1/provisioning/mute-timings", a.url), &buf)
+	req.Header.Add("Content-Type", "application/json")
+	require.NoError(t, err)
+
+	return sendRequest[apimodels.MuteTimeInterval](t, req, http.StatusCreated)
+}
+
+func (a apiClient) EnsureMuteTiming(t *testing.T, interval apimodels.MuteTimeInterval) {
+	t.Helper()
+
+	_, status, body := a.CreateMuteTimingWithStatus(t, interval)
+	require.Equalf(t, http.StatusCreated, status, body)
+}
+
+func (a apiClient) UpdateMuteTimingWithStatus(t *testing.T, interval apimodels.MuteTimeInterval) (apimodels.MuteTimeInterval, int, string) {
+	t.Helper()
+
+	buf := bytes.Buffer{}
+	enc := json.NewEncoder(&buf)
+	err := enc.Encode(interval)
+	require.NoError(t, err)
+
+	req, err := http.NewRequest(http.MethodPut, fmt.Sprintf("%s/api/v1/provisioning/mute-timings/%s", a.url, interval.Name), &buf)
+	req.Header.Add("Content-Type", "application/json")
+	require.NoError(t, err)
+
+	return sendRequest[apimodels.MuteTimeInterval](t, req, http.StatusAccepted)
+}
+
+func (a apiClient) DeleteMuteTimingWithStatus(t *testing.T, name string) (int, string) {
+	t.Helper()
+
+	req, err := http.NewRequest(http.MethodDelete, fmt.Sprintf("%s/api/v1/provisioning/mute-timings/%s", a.url, name), nil)
+	req.Header.Add("Content-Type", "application/json")
+	require.NoError(t, err)
+
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	require.NoError(t, err)
+	defer func() {
+		_ = resp.Body.Close()
+	}()
+	body, err := io.ReadAll(resp.Body)
+	require.NoError(t, err)
+
+	return resp.StatusCode, string(body)
+}
+
+func (a apiClient) GetRouteWithStatus(t *testing.T) (apimodels.Route, int, string) {
+	t.Helper()
+
+	req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/api/v1/provisioning/policies", a.url), nil)
+	require.NoError(t, err)
+
+	return sendRequest[apimodels.Route](t, req, http.StatusOK)
+}
+
+func (a apiClient) UpdateRouteWithStatus(t *testing.T, route apimodels.Route) (int, string) {
+	t.Helper()
+
+	buf := bytes.Buffer{}
+	enc := json.NewEncoder(&buf)
+	err := enc.Encode(route)
+	require.NoError(t, err)
+
+	req, err := http.NewRequest(http.MethodPut, fmt.Sprintf("%s/api/v1/provisioning/policies", a.url), &buf)
+	req.Header.Add("Content-Type", "application/json")
+	require.NoError(t, err)
+
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	require.NoError(t, err)
+	defer func() {
+		_ = resp.Body.Close()
+	}()
+	body, err := io.ReadAll(resp.Body)
+	require.NoError(t, err)
+
+	return resp.StatusCode, string(body)
+}
+
+func (a apiClient) GetRuleHistoryWithStatus(t *testing.T, ruleUID string) (data.Frame, int, string) {
+	t.Helper()
+	u, err := url.Parse(fmt.Sprintf("%s/api/v1/rules/history", a.url))
+	require.NoError(t, err)
+	q := url.Values{}
+	q.Set("ruleUID", ruleUID)
+	u.RawQuery = q.Encode()
+
+	req, err := http.NewRequest(http.MethodGet, u.String(), nil)
+	require.NoError(t, err)
+
+	return sendRequest[data.Frame](t, req, http.StatusOK)
+}
+
+func (a apiClient) GetAllTimeIntervalsWithStatus(t *testing.T) ([]apimodels.GettableTimeIntervals, int, string) {
+	t.Helper()
+
+	req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/api/v1/notifications/time-intervals", a.url), nil)
+	require.NoError(t, err)
+
+	return sendRequest[[]apimodels.GettableTimeIntervals](t, req, http.StatusOK)
+}
+
+func (a apiClient) GetTimeIntervalByNameWithStatus(t *testing.T, name string) (apimodels.GettableTimeIntervals, int, string) {
+	t.Helper()
+
+	req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/api/v1/notifications/time-intervals/%s", a.url, name), nil)
+	require.NoError(t, err)
+
+	return sendRequest[apimodels.GettableTimeIntervals](t, req, http.StatusOK)
+}
+
+func (a apiClient) CreateReceiverWithStatus(t *testing.T, receiver apimodels.EmbeddedContactPoint) (apimodels.EmbeddedContactPoint, int, string) {
+	t.Helper()
+
+	buf := bytes.Buffer{}
+	enc := json.NewEncoder(&buf)
+	err := enc.Encode(receiver)
+	require.NoError(t, err)
+
+	req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("%s/api/v1/provisioning/contact-points", a.url), &buf)
+	req.Header.Add("Content-Type", "application/json")
+	require.NoError(t, err)
+
+	return sendRequest[apimodels.EmbeddedContactPoint](t, req, http.StatusAccepted)
+}
+
+func (a apiClient) EnsureReceiver(t *testing.T, receiver apimodels.EmbeddedContactPoint) {
+	t.Helper()
+
+	_, status, body := a.CreateReceiverWithStatus(t, receiver)
+	require.Equalf(t, http.StatusAccepted, status, body)
+}
+
+func (a apiClient) GetAlertmanagerConfigWithStatus(t *testing.T) (apimodels.GettableUserConfig, int, string) {
+	t.Helper()
+	req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/api/alertmanager/grafana/config/api/v1/alerts", a.url), nil)
+	require.NoError(t, err)
+
+	return sendRequest[apimodels.GettableUserConfig](t, req, http.StatusOK)
+}
+
+func (a apiClient) GetActiveAlertsWithStatus(t *testing.T) (apimodels.AlertGroups, int, string) {
+	t.Helper()
+	req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/api/alertmanager/grafana/api/v2/alerts/groups", a.url), nil)
+	require.NoError(t, err)
+	return sendRequest[apimodels.AlertGroups](t, req, http.StatusOK)
+}
+
+func sendRequest[T any](t *testing.T, req *http.Request, successStatusCode int) (T, int, string) {
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	require.NoError(t, err)
+	defer func() {
+		_ = resp.Body.Close()
+	}()
+	body, err := io.ReadAll(resp.Body)
+	require.NoError(t, err)
+
+	var result T
+
+	if resp.StatusCode != successStatusCode {
+		return result, resp.StatusCode, string(body)
+	}
+
+	err = json.Unmarshal(body, &result)
+	require.NoError(t, err)
+	return result, resp.StatusCode, string(body)
+}
+
+func requireStatusCode(t *testing.T, expected, actual int, response string) {
+	require.Equalf(t, expected, actual, "Unexpected status. Response: %s", response)
+}
diff --git a/pkg/tests/api/azuremonitor/azuremonitor_test.go b/pkg/tests/api/azuremonitor/azuremonitor_test.go
index 099424f7c919b..a7cfc3f0fb944 100644
--- a/pkg/tests/api/azuremonitor/azuremonitor_test.go
+++ b/pkg/tests/api/azuremonitor/azuremonitor_test.go
@@ -18,8 +18,13 @@ import (
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationAzureMonitor(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
diff --git a/pkg/tests/api/correlations/common_test.go b/pkg/tests/api/correlations/common_test.go
index 01c166788f0e6..9dd112fff8be8 100644
--- a/pkg/tests/api/correlations/common_test.go
+++ b/pkg/tests/api/correlations/common_test.go
@@ -18,6 +18,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/user/userimpl"
 	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
 type errorResponseBody struct {
@@ -30,6 +31,10 @@ type TestContext struct {
 	t   *testing.T
 }
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func NewTestEnv(t *testing.T) TestContext {
 	t.Helper()
 	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
@@ -45,7 +50,7 @@ func NewTestEnv(t *testing.T) TestContext {
 
 type User struct {
 	User     user.User
-	password string
+	password user.Password
 }
 
 type GetParams struct {
diff --git a/pkg/tests/api/correlations/correlations_create_test.go b/pkg/tests/api/correlations/correlations_create_test.go
index 608f8ebfaf690..b41a0f3011a71 100644
--- a/pkg/tests/api/correlations/correlations_create_test.go
+++ b/pkg/tests/api/correlations/correlations_create_test.go
@@ -133,7 +133,6 @@ func TestIntegrationCreateCorrelation(t *testing.T) {
 		require.NoError(t, err)
 
 		require.Equal(t, "Data source not found", response.Message)
-		require.Equal(t, correlations.ErrSourceDataSourceDoesNotExists.Error(), response.Error)
 
 		require.NoError(t, res.Body.Close())
 	})
@@ -161,7 +160,6 @@ func TestIntegrationCreateCorrelation(t *testing.T) {
 		require.NoError(t, err)
 
 		require.Equal(t, "Data source not found", response.Message)
-		require.Equal(t, correlations.ErrTargetDataSourceDoesNotExists.Error(), response.Error)
 
 		require.NoError(t, res.Body.Close())
 	})
@@ -357,8 +355,6 @@ func TestIntegrationCreateCorrelation(t *testing.T) {
 		require.NoError(t, err)
 
 		require.Contains(t, response.Message, "bad request data")
-		require.Contains(t, response.Error, correlations.ErrInvalidConfigType.Error())
-		require.Contains(t, response.Error, configType)
 
 		require.NoError(t, res.Body.Close())
 	})
diff --git a/pkg/tests/api/correlations/correlations_delete_test.go b/pkg/tests/api/correlations/correlations_delete_test.go
index 357b9aba7c576..16eaf29b554cb 100644
--- a/pkg/tests/api/correlations/correlations_delete_test.go
+++ b/pkg/tests/api/correlations/correlations_delete_test.go
@@ -106,7 +106,6 @@ func TestIntegrationDeleteCorrelation(t *testing.T) {
 		require.NoError(t, err)
 
 		require.Equal(t, "Data source not found", response.Message)
-		require.Equal(t, correlations.ErrSourceDataSourceDoesNotExists.Error(), response.Error)
 
 		require.NoError(t, res.Body.Close())
 	})
@@ -126,7 +125,6 @@ func TestIntegrationDeleteCorrelation(t *testing.T) {
 		require.NoError(t, err)
 
 		require.Equal(t, "Correlation not found", response.Message)
-		require.Equal(t, correlations.ErrCorrelationNotFound.Error(), response.Error)
 
 		require.NoError(t, res.Body.Close())
 	})
@@ -153,7 +151,6 @@ func TestIntegrationDeleteCorrelation(t *testing.T) {
 		require.NoError(t, err)
 
 		require.Equal(t, "Correlation can only be edited via provisioning", response.Message)
-		require.Equal(t, correlations.ErrCorrelationReadOnly.Error(), response.Error)
 
 		require.NoError(t, res.Body.Close())
 	})
diff --git a/pkg/tests/api/correlations/correlations_update_test.go b/pkg/tests/api/correlations/correlations_update_test.go
index 5b470c09a2dc4..e2f3e9278e7fb 100644
--- a/pkg/tests/api/correlations/correlations_update_test.go
+++ b/pkg/tests/api/correlations/correlations_update_test.go
@@ -16,6 +16,8 @@ import (
 )
 
 func TestIntegrationUpdateCorrelation(t *testing.T) {
+	// TODO: #82520 Possibly a flaky test
+	t.Skip()
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
@@ -100,7 +102,6 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
 		require.NoError(t, err)
 
 		require.Equal(t, "Data source not found", response.Message)
-		require.Equal(t, correlations.ErrSourceDataSourceDoesNotExists.Error(), response.Error)
 
 		require.NoError(t, res.Body.Close())
 	})
@@ -123,7 +124,6 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
 		require.NoError(t, err)
 
 		require.Equal(t, "Correlation not found", response.Message)
-		require.Equal(t, correlations.ErrCorrelationNotFound.Error(), response.Error)
 
 		require.NoError(t, res.Body.Close())
 	})
@@ -153,7 +153,6 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
 		require.NoError(t, err)
 
 		require.Equal(t, "Correlation can only be edited via provisioning", response.Message)
-		require.Equal(t, correlations.ErrCorrelationReadOnly.Error(), response.Error)
 
 		require.NoError(t, res.Body.Close())
 	})
@@ -181,7 +180,6 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
 		require.NoError(t, err)
 
 		require.Equal(t, "At least one of label, description or config is required", response.Message)
-		require.Equal(t, correlations.ErrUpdateCorrelationEmptyParams.Error(), response.Error)
 		require.NoError(t, res.Body.Close())
 
 		// empty body
@@ -199,7 +197,6 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
 		require.NoError(t, err)
 
 		require.Equal(t, "At least one of label, description or config is required", response.Message)
-		require.Equal(t, correlations.ErrUpdateCorrelationEmptyParams.Error(), response.Error)
 		require.NoError(t, res.Body.Close())
 
 		// all set to null
@@ -221,7 +218,6 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
 		require.NoError(t, err)
 
 		require.Equal(t, "At least one of label, description or config is required", response.Message)
-		require.Equal(t, correlations.ErrUpdateCorrelationEmptyParams.Error(), response.Error)
 		require.NoError(t, res.Body.Close())
 	})
 
diff --git a/pkg/tests/api/dashboards/api_dashboards_test.go b/pkg/tests/api/dashboards/api_dashboards_test.go
index 78d89989fa1c9..60bd745e74006 100644
--- a/pkg/tests/api/dashboards/api_dashboards_test.go
+++ b/pkg/tests/api/dashboards/api_dashboards_test.go
@@ -15,9 +15,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/services/dashboardimport"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/org/orgimpl"
 	"github.com/grafana/grafana/pkg/services/plugindashboards"
@@ -28,8 +30,14 @@ import (
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/user/userimpl"
 	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
+	"github.com/grafana/grafana/pkg/util"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationDashboardQuota(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
@@ -272,3 +280,165 @@ providers:
 		})
 	})
 }
+
+func TestIntegrationCreate(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	// Setup Grafana and its Database
+	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
+		DisableAnonymous: true,
+	})
+
+	grafanaListedAddr, store := testinfra.StartGrafana(t, dir, path)
+	// Create user
+	createUser(t, store, user.CreateUserCommand{
+		DefaultOrgRole: string(org.RoleAdmin),
+		Password:       "admin",
+		Login:          "admin",
+	})
+
+	t.Run("create dashboard should succeed", func(t *testing.T) {
+		dashboardDataOne, err := simplejson.NewJson([]byte(`{"title":"just testing"}`))
+		require.NoError(t, err)
+		buf1 := &bytes.Buffer{}
+		err = json.NewEncoder(buf1).Encode(dashboards.SaveDashboardCommand{
+			Dashboard: dashboardDataOne,
+		})
+		require.NoError(t, err)
+		u := fmt.Sprintf("http://admin:admin@%s/api/dashboards/db", grafanaListedAddr)
+		// nolint:gosec
+		resp, err := http.Post(u, "application/json", buf1)
+		require.NoError(t, err)
+		assert.Equal(t, http.StatusOK, resp.StatusCode)
+		t.Cleanup(func() {
+			err := resp.Body.Close()
+			require.NoError(t, err)
+		})
+		b, err := io.ReadAll(resp.Body)
+		require.NoError(t, err)
+		var m util.DynMap
+		err = json.Unmarshal(b, &m)
+		require.NoError(t, err)
+		assert.NotEmpty(t, m["id"])
+		assert.NotEmpty(t, m["uid"])
+	})
+
+	t.Run("create dashboard under folder should succeed", func(t *testing.T) {
+		folder := createFolder(t, grafanaListedAddr, "test folder")
+
+		dashboardDataOne, err := simplejson.NewJson([]byte(`{"title":"just testing"}`))
+		require.NoError(t, err)
+		buf1 := &bytes.Buffer{}
+		err = json.NewEncoder(buf1).Encode(dashboards.SaveDashboardCommand{
+			Dashboard: dashboardDataOne,
+			OrgID:     0,
+			FolderUID: folder.UID,
+		})
+		require.NoError(t, err)
+		u := fmt.Sprintf("http://admin:admin@%s/api/dashboards/db", grafanaListedAddr)
+		// nolint:gosec
+		resp, err := http.Post(u, "application/json", buf1)
+		require.NoError(t, err)
+		require.Equal(t, http.StatusOK, resp.StatusCode)
+		t.Cleanup(func() {
+			err := resp.Body.Close()
+			require.NoError(t, err)
+		})
+		b, err := io.ReadAll(resp.Body)
+		require.NoError(t, err)
+		var m util.DynMap
+		err = json.Unmarshal(b, &m)
+		require.NoError(t, err)
+		assert.NotEmpty(t, m["id"])
+		assert.NotEmpty(t, m["uid"])
+		assert.Equal(t, folder.UID, m["folderUid"])
+	})
+
+	t.Run("create dashboard under folder (using deprecated folder sequential ID) should succeed", func(t *testing.T) {
+		folder := createFolder(t, grafanaListedAddr, "test folder 2")
+
+		dashboardDataOne, err := simplejson.NewJson([]byte(`{"title":"just testing"}`))
+		require.NoError(t, err)
+		buf1 := &bytes.Buffer{}
+		err = json.NewEncoder(buf1).Encode(dashboards.SaveDashboardCommand{
+			Dashboard: dashboardDataOne,
+			OrgID:     0,
+			FolderUID: folder.UID,
+		})
+		require.NoError(t, err)
+		u := fmt.Sprintf("http://admin:admin@%s/api/dashboards/db", grafanaListedAddr)
+		// nolint:gosec
+		resp, err := http.Post(u, "application/json", buf1)
+		require.NoError(t, err)
+		require.Equal(t, http.StatusOK, resp.StatusCode)
+		t.Cleanup(func() {
+			err := resp.Body.Close()
+			require.NoError(t, err)
+		})
+		b, err := io.ReadAll(resp.Body)
+		require.NoError(t, err)
+		var m util.DynMap
+		err = json.Unmarshal(b, &m)
+		require.NoError(t, err)
+		assert.NotEmpty(t, m["id"])
+		assert.NotEmpty(t, m["uid"])
+		assert.Equal(t, folder.UID, m["folderUid"])
+	})
+
+	t.Run("create dashboard under unknow folder should fail", func(t *testing.T) {
+		folderUID := "unknown"
+		// Import dashboard
+		dashboardDataOne, err := simplejson.NewJson([]byte(`{"title":"just testing"}`))
+		require.NoError(t, err)
+		buf1 := &bytes.Buffer{}
+		err = json.NewEncoder(buf1).Encode(dashboards.SaveDashboardCommand{
+			Dashboard: dashboardDataOne,
+			FolderUID: folderUID,
+		})
+		require.NoError(t, err)
+		u := fmt.Sprintf("http://admin:admin@%s/api/dashboards/db", grafanaListedAddr)
+		// nolint:gosec
+		resp, err := http.Post(u, "application/json", buf1)
+		require.NoError(t, err)
+		assert.Equal(t, http.StatusBadRequest, resp.StatusCode)
+		t.Cleanup(func() {
+			err := resp.Body.Close()
+			require.NoError(t, err)
+		})
+		b, err := io.ReadAll(resp.Body)
+		require.NoError(t, err)
+		var m util.DynMap
+		err = json.Unmarshal(b, &m)
+		require.NoError(t, err)
+		assert.Equal(t, dashboards.ErrFolderNotFound.Error(), m["message"])
+	})
+}
+
+func createFolder(t *testing.T, grafanaListedAddr string, title string) *dtos.Folder {
+	t.Helper()
+
+	buf1 := &bytes.Buffer{}
+	err := json.NewEncoder(buf1).Encode(folder.CreateFolderCommand{
+		Title: title,
+	})
+	require.NoError(t, err)
+	u := fmt.Sprintf("http://admin:admin@%s/api/folders", grafanaListedAddr)
+	// nolint:gosec
+	resp, err := http.Post(u, "application/json", buf1)
+	require.NoError(t, err)
+	assert.Equal(t, http.StatusOK, resp.StatusCode)
+	t.Cleanup(func() {
+		err := resp.Body.Close()
+		require.NoError(t, err)
+	})
+	b, err := io.ReadAll(resp.Body)
+	require.NoError(t, err)
+	require.Equal(t, http.StatusOK, resp.StatusCode)
+	var f *dtos.Folder
+	err = json.Unmarshal(b, &f)
+	require.NoError(t, err)
+
+	return f
+}
diff --git a/pkg/tests/api/elasticsearch/elasticsearch_test.go b/pkg/tests/api/elasticsearch/elasticsearch_test.go
index 21eb70c8c1620..d651be84d5ab1 100644
--- a/pkg/tests/api/elasticsearch/elasticsearch_test.go
+++ b/pkg/tests/api/elasticsearch/elasticsearch_test.go
@@ -18,8 +18,13 @@ import (
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationElasticsearch(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
@@ -95,7 +100,7 @@ func TestIntegrationElasticsearch(t *testing.T) {
 		resp, err := http.Post(u, "application/json", buf1)
 		require.NoError(t, err)
 
-		require.Equal(t, http.StatusInternalServerError, resp.StatusCode)
+		require.Equal(t, http.StatusBadRequest, resp.StatusCode)
 		t.Cleanup(func() {
 			err := resp.Body.Close()
 			require.NoError(t, err)
diff --git a/pkg/tests/api/folders/api_folder_test.go b/pkg/tests/api/folders/api_folder_test.go
new file mode 100644
index 0000000000000..5dbaf651c0b23
--- /dev/null
+++ b/pkg/tests/api/folders/api_folder_test.go
@@ -0,0 +1,220 @@
+package folders
+
+import (
+	"context"
+	"errors"
+	"net/http"
+	"testing"
+
+	"github.com/go-openapi/runtime"
+	"github.com/grafana/grafana-openapi-client-go/client/folders"
+	"github.com/grafana/grafana-openapi-client-go/models"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/services/org/orgimpl"
+	"github.com/grafana/grafana/pkg/services/quota/quotaimpl"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/services/user/userimpl"
+	"github.com/grafana/grafana/pkg/tests"
+	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+const orgID = 1
+
+func TestIntegrationUpdateFolder(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
+		DisableAnonymous: true,
+		EnableQuota:      true,
+	})
+
+	grafanaListedAddr, store := testinfra.StartGrafana(t, dir, path)
+	// Create user
+	createUser(t, store, user.CreateUserCommand{
+		DefaultOrgRole: string(org.RoleAdmin),
+		Password:       "admin",
+		Login:          "admin",
+	})
+
+	adminClient := tests.GetClient(grafanaListedAddr, "admin", "admin")
+	resp, err := adminClient.Folders.CreateFolder(&models.CreateFolderCommand{
+		Title: "folder",
+	})
+	require.NoError(t, err)
+	require.Equal(t, http.StatusOK, resp.Code())
+
+	t.Run("update folder should succeed", func(t *testing.T) {
+		resp, err := adminClient.Folders.UpdateFolder(resp.Payload.UID, &models.UpdateFolderCommand{
+			Title:   "new title",
+			Version: resp.Payload.Version,
+		})
+		require.NoError(t, err)
+		require.Equal(t, http.StatusOK, resp.Code())
+		require.Equal(t, "new title", resp.Payload.Title)
+	})
+}
+
+func TestIntegrationCreateFolder(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
+		DisableAnonymous: true,
+		EnableQuota:      true,
+	})
+
+	grafanaListedAddr, store := testinfra.StartGrafana(t, dir, path)
+	// Create user
+	createUser(t, store, user.CreateUserCommand{
+		DefaultOrgRole: string(org.RoleAdmin),
+		Password:       "admin",
+		Login:          "admin",
+	})
+
+	adminClient := tests.GetClient(grafanaListedAddr, "admin", "admin")
+
+	t.Run("create folder under root should succeed", func(t *testing.T) {
+		resp, err := adminClient.Folders.CreateFolder(&models.CreateFolderCommand{
+			Title: "folder",
+		})
+		require.NoError(t, err)
+		require.Equal(t, http.StatusOK, resp.Code())
+
+		t.Run("create folder with same name under root should fail", func(t *testing.T) {
+			_, err := adminClient.Folders.CreateFolder(&models.CreateFolderCommand{
+				Title: "folder",
+			})
+			require.Error(t, err)
+			var conflict *folders.CreateFolderConflict
+			assert.True(t, errors.As(err, &conflict))
+			assert.Equal(t, http.StatusConflict, conflict.Code())
+		})
+	})
+}
+
+func TestIntegrationNestedFoldersOn(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
+		DisableAnonymous:     true,
+		EnableQuota:          true,
+		EnableFeatureToggles: []string{featuremgmt.FlagNestedFolders},
+	})
+
+	grafanaListedAddr, store := testinfra.StartGrafana(t, dir, path)
+	// Create user
+	createUser(t, store, user.CreateUserCommand{
+		DefaultOrgRole: string(org.RoleAdmin),
+		Password:       "admin",
+		Login:          "admin",
+	})
+
+	adminClient := tests.GetClient(grafanaListedAddr, "admin", "admin")
+
+	t.Run("create folder under root should succeed", func(t *testing.T) {
+		resp, err := adminClient.Folders.CreateFolder(&models.CreateFolderCommand{
+			Title: "folder",
+		})
+		require.NoError(t, err)
+		require.Equal(t, http.StatusOK, resp.Code())
+
+		t.Run("create folder with same name under root should fail", func(t *testing.T) {
+			_, err := adminClient.Folders.CreateFolder(&models.CreateFolderCommand{
+				Title: "folder",
+			})
+			require.Error(t, err)
+			var conflict *folders.CreateFolderConflict
+			assert.True(t, errors.As(err, &conflict))
+			assert.Equal(t, http.StatusConflict, conflict.Code())
+		})
+	})
+
+	t.Run("create subfolder should succeed", func(t *testing.T) {
+		resp, err := adminClient.Folders.CreateFolder(&models.CreateFolderCommand{
+			Title: "parent",
+		})
+		require.NoError(t, err)
+		require.Equal(t, http.StatusOK, resp.Code())
+		parentUID := resp.Payload.UID
+
+		resp, err = adminClient.Folders.CreateFolder(&models.CreateFolderCommand{
+			Title:     "subfolder",
+			ParentUID: parentUID,
+		})
+		require.NoError(t, err)
+		require.Equal(t, http.StatusOK, resp.Code())
+
+		t.Run("create subfolder with same name should fail", func(t *testing.T) {
+			resp, err = adminClient.Folders.CreateFolder(&models.CreateFolderCommand{
+				Title:     "subfolder",
+				ParentUID: parentUID,
+			})
+			require.Error(t, err)
+			var conflict *folders.CreateFolderConflict
+			assert.True(t, errors.As(err, &conflict))
+			assert.Equal(t, http.StatusConflict, conflict.Code())
+		})
+
+		t.Run("create subfolder with same name under other folder should succeed", func(t *testing.T) {
+			resp, err := adminClient.Folders.CreateFolder(&models.CreateFolderCommand{
+				Title: "other",
+			})
+			require.NoError(t, err)
+			require.Equal(t, http.StatusOK, resp.Code())
+			other := resp.Payload.UID
+
+			resp, err = adminClient.Folders.CreateFolder(&models.CreateFolderCommand{
+				Title:     "subfolder",
+				ParentUID: other,
+			})
+			require.NoError(t, err)
+			assert.Equal(t, http.StatusOK, resp.Code())
+			assert.Equal(t, other, resp.Payload.ParentUID)
+			subfolderUnderOther := resp.Payload.UID
+
+			t.Run("move subfolder to other folder containing folder with that name should fail", func(t *testing.T) {
+				_, err := adminClient.Folders.MoveFolder(subfolderUnderOther, &models.MoveFolderCommand{
+					ParentUID: parentUID,
+				})
+				require.Error(t, err)
+				var apiError *runtime.APIError
+				assert.True(t, errors.As(err, &apiError))
+				assert.Equal(t, http.StatusConflict, apiError.Code)
+			})
+
+			t.Run("move subfolder to root should succeed", func(t *testing.T) {
+				resp, err := adminClient.Folders.MoveFolder(subfolderUnderOther, &models.MoveFolderCommand{})
+				require.NoError(t, err)
+				assert.Equal(t, http.StatusOK, resp.Code())
+				assert.Equal(t, "", resp.Payload.ParentUID)
+			})
+		})
+	})
+}
+
+func createUser(t *testing.T, store *sqlstore.SQLStore, cmd user.CreateUserCommand) int64 {
+	t.Helper()
+
+	store.Cfg.AutoAssignOrg = true
+	store.Cfg.AutoAssignOrgId = orgID
+
+	quotaService := quotaimpl.ProvideService(store, store.Cfg)
+	orgService, err := orgimpl.ProvideService(store, store.Cfg, quotaService)
+	require.NoError(t, err)
+	usrSvc, err := userimpl.ProvideService(store, orgService, store.Cfg, nil, nil, quotaService, supportbundlestest.NewFakeBundleService())
+	require.NoError(t, err)
+
+	u, err := usrSvc.Create(context.Background(), &cmd)
+	require.NoError(t, err)
+	return u.ID
+}
diff --git a/pkg/tests/api/folders/api_folders_test.go b/pkg/tests/api/folders/api_folders_test.go
new file mode 100644
index 0000000000000..d541757864eb6
--- /dev/null
+++ b/pkg/tests/api/folders/api_folders_test.go
@@ -0,0 +1,217 @@
+package folders
+
+import (
+	"fmt"
+	"net/http"
+	"testing"
+	"time"
+
+	"github.com/grafana/grafana-openapi-client-go/client/folders"
+	"github.com/grafana/grafana-openapi-client-go/models"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/resourcepermissions"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/folder"
+	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/tests"
+	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
+	"github.com/grafana/grafana/pkg/util/retryer"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
+func TestGetFolders(t *testing.T) {
+	// Setup Grafana and its Database
+	dir, p := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
+		DisableLegacyAlerting: true,
+		EnableUnifiedAlerting: true,
+		DisableAnonymous:      true,
+		AppModeProduction:     true,
+		EnableFeatureToggles:  []string{featuremgmt.FlagNestedFolders},
+	})
+
+	grafanaListedAddr, store := testinfra.StartGrafana(t, dir, p)
+
+	orgID := int64(1)
+
+	// Create a users to make authenticated requests
+	tests.CreateUser(t, store, user.CreateUserCommand{
+		DefaultOrgRole: string(org.RoleViewer),
+		OrgID:          orgID,
+		Password:       "viewer",
+		Login:          "viewer",
+	})
+	tests.CreateUser(t, store, user.CreateUserCommand{
+		OrgID:          orgID,
+		DefaultOrgRole: string(org.RoleEditor),
+		Password:       "editor",
+		Login:          "editor",
+	})
+	tests.CreateUser(t, store, user.CreateUserCommand{
+		OrgID:          orgID,
+		DefaultOrgRole: string(org.RoleAdmin),
+		Password:       "admin",
+		Login:          "admin",
+	})
+
+	adminClient := tests.GetClient(grafanaListedAddr, "admin", "admin")
+	editorClient := tests.GetClient(grafanaListedAddr, "editor", "editor")
+	viewerClient := tests.GetClient(grafanaListedAddr, "viewer", "viewer")
+
+	// access control permissions store
+	permissionsStore := resourcepermissions.NewStore(store, featuremgmt.WithFeatures())
+
+	numberOfFolders := 5
+	indexWithoutPermission := 3
+
+	for i := 0; i < numberOfFolders; i++ {
+		respCode := 0
+		folderUID := ""
+		retries := 0
+		maxRetries := 3
+		err := retryer.Retry(func() (retryer.RetrySignal, error) {
+			resp, err := adminClient.Folders.CreateFolder(&models.CreateFolderCommand{
+				Title: fmt.Sprintf("Folder %d", i),
+				UID:   fmt.Sprintf("folder-%d", i),
+			})
+			if err != nil {
+				if retries == maxRetries {
+					return retryer.FuncError, err
+				}
+				retries++
+				return retryer.FuncFailure, nil
+			}
+			respCode = resp.Code()
+			folderUID = resp.Payload.UID
+			return retryer.FuncComplete, nil
+		}, maxRetries, time.Millisecond*time.Duration(10), time.Second)
+		require.NoError(t, err)
+
+		require.Equal(t, http.StatusOK, respCode)
+		if i == indexWithoutPermission {
+			tests.RemoveFolderPermission(t, permissionsStore, orgID, org.RoleViewer, folderUID)
+			t.Log("Removed viewer permission from folder", folderUID)
+		}
+	}
+
+	t.Run("Admin can get all folders", func(t *testing.T) {
+		res, err := adminClient.Folders.GetFolders(folders.NewGetFoldersParams())
+		require.NoError(t, err)
+		actualFolders := make([]string, 0, len(res.Payload))
+		for i := range res.Payload {
+			actualFolders = append(actualFolders, res.Payload[i].UID)
+		}
+		assert.Equal(t, []string{"folder-0", "folder-1", "folder-2", "folder-3", "folder-4"}, actualFolders)
+	})
+
+	t.Run("Pagination works as expect for admin", func(t *testing.T) {
+		limit := int64(2)
+		page := int64(1)
+		res, err := adminClient.Folders.GetFolders(folders.NewGetFoldersParams().WithLimit(&limit).WithPage(&page))
+		require.NoError(t, err)
+		actualFolders := make([]string, 0, len(res.Payload))
+		for i := range res.Payload {
+			actualFolders = append(actualFolders, res.Payload[i].UID)
+		}
+		assert.Equal(t, []string{"folder-0", "folder-1"}, actualFolders)
+
+		page = int64(2)
+		res, err = adminClient.Folders.GetFolders(folders.NewGetFoldersParams().WithLimit(&limit).WithPage(&page))
+		require.NoError(t, err)
+		actualFolders = make([]string, 0, len(res.Payload))
+		for i := range res.Payload {
+			actualFolders = append(actualFolders, res.Payload[i].UID)
+		}
+		assert.Equal(t, []string{"folder-2", "folder-3"}, actualFolders)
+
+		page = int64(3)
+		res, err = adminClient.Folders.GetFolders(folders.NewGetFoldersParams().WithLimit(&limit).WithPage(&page))
+		require.NoError(t, err)
+		actualFolders = make([]string, 0, len(res.Payload))
+		for i := range res.Payload {
+			actualFolders = append(actualFolders, res.Payload[i].UID)
+		}
+		assert.Equal(t, []string{"folder-4"}, actualFolders)
+	})
+
+	t.Run("Editor can get all folders", func(t *testing.T) {
+		res, err := editorClient.Folders.GetFolders(folders.NewGetFoldersParams())
+		require.NoError(t, err)
+		actualFolders := make([]string, 0, len(res.Payload))
+		for i := range res.Payload {
+			actualFolders = append(actualFolders, res.Payload[i].UID)
+		}
+		assert.Equal(t, []string{folder.SharedWithMeFolderUID, "folder-0", "folder-1", "folder-2", "folder-3", "folder-4"}, actualFolders)
+	})
+
+	t.Run("Pagination works as expect for editor", func(t *testing.T) {
+		limit := int64(2)
+		page := int64(1)
+		res, err := editorClient.Folders.GetFolders(folders.NewGetFoldersParams().WithLimit(&limit).WithPage(&page))
+		require.NoError(t, err)
+		actualFolders := make([]string, 0, len(res.Payload))
+		for i := range res.Payload {
+			actualFolders = append(actualFolders, res.Payload[i].UID)
+		}
+		assert.Equal(t, []string{folder.SharedWithMeFolderUID, "folder-0", "folder-1"}, actualFolders)
+
+		page = int64(2)
+		res, err = editorClient.Folders.GetFolders(folders.NewGetFoldersParams().WithLimit(&limit).WithPage(&page))
+		require.NoError(t, err)
+		actualFolders = make([]string, 0, len(res.Payload))
+		for i := range res.Payload {
+			actualFolders = append(actualFolders, res.Payload[i].UID)
+		}
+		assert.Equal(t, []string{"folder-2", "folder-3"}, actualFolders)
+
+		page = int64(3)
+		res, err = editorClient.Folders.GetFolders(folders.NewGetFoldersParams().WithLimit(&limit).WithPage(&page))
+		require.NoError(t, err)
+		actualFolders = make([]string, 0, len(res.Payload))
+		for i := range res.Payload {
+			actualFolders = append(actualFolders, res.Payload[i].UID)
+		}
+		assert.Equal(t, []string{"folder-4"}, actualFolders)
+	})
+
+	t.Run("Viewer can get only the folders has access too", func(t *testing.T) {
+		res, err := viewerClient.Folders.GetFolders(folders.NewGetFoldersParams())
+		require.NoError(t, err)
+		actualFolders := make([]string, 0, len(res.Payload))
+		for i := range res.Payload {
+			actualFolders = append(actualFolders, res.Payload[i].UID)
+		}
+		assert.Equal(t, []string{folder.SharedWithMeFolderUID, "folder-0", "folder-1", "folder-2", "folder-4"}, actualFolders)
+	})
+
+	t.Run("Pagination works as expect for viewer", func(t *testing.T) {
+		limit := int64(2)
+		page := int64(1)
+		res, err := viewerClient.Folders.GetFolders(folders.NewGetFoldersParams().WithLimit(&limit).WithPage(&page))
+		require.NoError(t, err)
+		actualFolders := make([]string, 0, len(res.Payload))
+		for i := range res.Payload {
+			actualFolders = append(actualFolders, res.Payload[i].UID)
+		}
+		assert.Equal(t, []string{folder.SharedWithMeFolderUID, "folder-0", "folder-1"}, actualFolders)
+
+		page = int64(2)
+		res, err = viewerClient.Folders.GetFolders(folders.NewGetFoldersParams().WithLimit(&limit).WithPage(&page))
+		require.NoError(t, err)
+		actualFolders = make([]string, 0, len(res.Payload))
+		for i := range res.Payload {
+			actualFolders = append(actualFolders, res.Payload[i].UID)
+		}
+		assert.Equal(t, []string{"folder-2", "folder-4"}, actualFolders)
+
+		page = int64(3)
+		res, err = viewerClient.Folders.GetFolders(folders.NewGetFoldersParams().WithLimit(&limit).WithPage(&page))
+		require.NoError(t, err)
+		assert.Len(t, res.Payload, 0)
+	})
+}
diff --git a/pkg/tests/api/graphite/graphite_test.go b/pkg/tests/api/graphite/graphite_test.go
index 615209d625faa..e003574ac1d9c 100644
--- a/pkg/tests/api/graphite/graphite_test.go
+++ b/pkg/tests/api/graphite/graphite_test.go
@@ -18,8 +18,13 @@ import (
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationGraphite(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
diff --git a/pkg/tests/api/influxdb/influxdb_test.go b/pkg/tests/api/influxdb/influxdb_test.go
index bdaf6fefe46df..14a9b315fe990 100644
--- a/pkg/tests/api/influxdb/influxdb_test.go
+++ b/pkg/tests/api/influxdb/influxdb_test.go
@@ -18,8 +18,13 @@ import (
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationInflux(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
diff --git a/pkg/tests/api/loki/loki_test.go b/pkg/tests/api/loki/loki_test.go
index 8264c0936705f..f5cffd1c39bf9 100644
--- a/pkg/tests/api/loki/loki_test.go
+++ b/pkg/tests/api/loki/loki_test.go
@@ -18,8 +18,13 @@ import (
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationLoki(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
diff --git a/pkg/tests/api/opentdsb/opentdsb_test.go b/pkg/tests/api/opentdsb/opentdsb_test.go
index 2c04ac73ad11f..284e36d9297e9 100644
--- a/pkg/tests/api/opentdsb/opentdsb_test.go
+++ b/pkg/tests/api/opentdsb/opentdsb_test.go
@@ -18,8 +18,13 @@ import (
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationOpenTSDB(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
diff --git a/pkg/tests/api/plugins/api_plugins_test.go b/pkg/tests/api/plugins/api_plugins_test.go
index 4fc2295ed8bd3..94281f88989db 100644
--- a/pkg/tests/api/plugins/api_plugins_test.go
+++ b/pkg/tests/api/plugins/api_plugins_test.go
@@ -11,9 +11,13 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/api/dtos"
+	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/services/org/orgimpl"
 	"github.com/grafana/grafana/pkg/services/quota/quotaimpl"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
@@ -22,6 +26,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/user/userimpl"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
 const (
@@ -32,6 +37,10 @@ const (
 
 var updateSnapshotFlag = false
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationPlugins(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
@@ -108,11 +117,13 @@ func TestIntegrationPlugins(t *testing.T) {
 				require.Equal(t, tc.expStatus, resp.StatusCode)
 				b, err := io.ReadAll(resp.Body)
 				require.NoError(t, err)
+				var result dtos.PluginList
+				err = json.Unmarshal(b, &result)
+				require.NoError(t, err)
 
 				expResp := expectedResp(t, tc.expRespPath)
 
-				same := assert.JSONEq(t, expResp, string(b))
-				if !same {
+				if diff := cmp.Diff(expResp, result, cmpopts.IgnoreFields(plugins.Info{}, "Version")); diff != "" {
 					if updateSnapshotFlag {
 						t.Log("updating snapshot results")
 						var prettyJSON bytes.Buffer
@@ -121,6 +132,7 @@ func TestIntegrationPlugins(t *testing.T) {
 						}
 						updateRespSnapshot(t, tc.expRespPath, prettyJSON.String())
 					}
+					t.Errorf("unexpected response (-want +got):\n%s", diff)
 					t.FailNow()
 				}
 			})
@@ -218,14 +230,19 @@ func grafanaAPIURL(username string, grafanaListedAddr string, path string) strin
 	return fmt.Sprintf("http://%s:%s@%s/api/%s", username, defaultPassword, grafanaListedAddr, path)
 }
 
-func expectedResp(t *testing.T, filename string) string {
+func expectedResp(t *testing.T, filename string) dtos.PluginList {
 	//nolint:GOSEC
 	contents, err := os.ReadFile(filepath.Join("data", filename))
 	if err != nil {
 		t.Errorf("failed to load %s: %v", filename, err)
 	}
 
-	return string(contents)
+	var result dtos.PluginList
+	err = json.Unmarshal(contents, &result)
+	if err != nil {
+		t.Errorf("failed to unmarshal %s: %v", filename, err)
+	}
+	return result
 }
 
 func updateRespSnapshot(t *testing.T, filename string, body string) {
diff --git a/pkg/tests/api/plugins/backendplugin/backendplugin_test.go b/pkg/tests/api/plugins/backendplugin/backendplugin_test.go
index 31a53717ab0e5..9da079766e606 100644
--- a/pkg/tests/api/plugins/backendplugin/backendplugin_test.go
+++ b/pkg/tests/api/plugins/backendplugin/backendplugin_test.go
@@ -27,10 +27,15 @@ import (
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
 const loginCookieName = "grafana_session"
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationBackendPlugins(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
diff --git a/pkg/tests/api/plugins/data/expectedListResp.json b/pkg/tests/api/plugins/data/expectedListResp.json
index f740c989f0db2..2723c7388e888 100644
--- a/pkg/tests/api/plugins/data/expectedListResp.json
+++ b/pkg/tests/api/plugins/data/expectedListResp.json
@@ -13,13 +13,13 @@
       "description": "Shows list of alerts and their current status",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/alertlist/img/icn-singlestat-panel.svg",
-        "large": "/public/app/plugins/panel/alertlist/img/icn-singlestat-panel.svg"
+        "small": "public/app/plugins/panel/alertlist/img/icn-singlestat-panel.svg",
+        "large": "public/app/plugins/panel/alertlist/img/icn-singlestat-panel.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -47,7 +47,7 @@
         "name": "Prometheus alertmanager",
         "url": "https://grafana.com"
       },
-      "description": "",
+      "description": "Add external Alertmanagers (supports Prometheus and Mimir implementations) so you can use the Grafana Alerting UI to manage silences, contact points, and notification policies.",
       "links": [
         {
           "name": "Learn more",
@@ -55,13 +55,20 @@
         }
       ],
       "logos": {
-        "small": "/public/app/plugins/datasource/alertmanager/img/logo.svg",
-        "large": "/public/app/plugins/datasource/alertmanager/img/logo.svg"
+        "small": "public/app/plugins/datasource/alertmanager/img/logo.svg",
+        "large": "public/app/plugins/datasource/alertmanager/img/logo.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": [
+        "alerts",
+        "alerting",
+        "prometheus",
+        "alertmanager",
+        "mimir",
+        "cortex"
+      ]
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -92,13 +99,13 @@
       "description": "List annotations",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/annolist/img/icn-annolist-panel.svg",
-        "large": "/public/app/plugins/panel/annolist/img/icn-annolist-panel.svg"
+        "small": "public/app/plugins/panel/annolist/img/icn-annolist-panel.svg",
+        "large": "public/app/plugins/panel/annolist/img/icn-annolist-panel.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -138,30 +145,36 @@
         }
       ],
       "logos": {
-        "small": "/public/app/plugins/datasource/azuremonitor/img/logo.jpg",
-        "large": "/public/app/plugins/datasource/azuremonitor/img/logo.jpg"
+        "small": "public/app/plugins/datasource/azuremonitor/img/logo.jpg",
+        "large": "public/app/plugins/datasource/azuremonitor/img/logo.jpg"
       },
       "build": {},
       "screenshots": [
         {
           "name": "Azure Contoso Loans",
-          "path": "/public/app/plugins/datasource/azuremonitor/img/contoso_loans_grafana_dashboard.png"
+          "path": "public/app/plugins/datasource/azuremonitor/img/contoso_loans_grafana_dashboard.png"
         },
         {
           "name": "Azure Monitor Network",
-          "path": "/public/app/plugins/datasource/azuremonitor/img/azure_monitor_network.png"
+          "path": "public/app/plugins/datasource/azuremonitor/img/azure_monitor_network.png"
         },
         {
           "name": "Azure Monitor CPU",
-          "path": "/public/app/plugins/datasource/azuremonitor/img/azure_monitor_cpu.png"
+          "path": "public/app/plugins/datasource/azuremonitor/img/azure_monitor_cpu.png"
         }
       ],
-      "version": "1.0.0",
-      "updated": ""
+      "updated": "",
+      "keywords": [
+        "azure",
+        "monitor",
+        "Application Insights",
+        "Log Analytics",
+        "App Insights"
+      ]
     },
     "dependencies": {
-      "grafanaDependency": "",
-      "grafanaVersion": "5.2.x",
+      "grafanaDependency": "\u003e=10.3.0",
+      "grafanaVersion": "*",
       "plugins": []
     },
     "latestVersion": "",
@@ -188,13 +201,13 @@
       "description": "Categorical charts with group support",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/barchart/img/barchart.svg",
-        "large": "/public/app/plugins/panel/barchart/img/barchart.svg"
+        "small": "public/app/plugins/panel/barchart/img/barchart.svg",
+        "large": "public/app/plugins/panel/barchart/img/barchart.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -225,13 +238,13 @@
       "description": "Horizontal and vertical gauges",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/bargauge/img/icon_bar_gauge.svg",
-        "large": "/public/app/plugins/panel/bargauge/img/icon_bar_gauge.svg"
+        "small": "public/app/plugins/panel/bargauge/img/icon_bar_gauge.svg",
+        "large": "public/app/plugins/panel/bargauge/img/icon_bar_gauge.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -259,16 +272,21 @@
         "name": "Grafana Labs",
         "url": "https://grafana.com"
       },
-      "description": "",
+      "description": "Graphical representation of price movements of a security, derivative, or currency.",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/candlestick/img/candlestick.svg",
-        "large": "/public/app/plugins/panel/candlestick/img/candlestick.svg"
+        "small": "public/app/plugins/panel/candlestick/img/candlestick.svg",
+        "large": "public/app/plugins/panel/candlestick/img/candlestick.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": [
+        "financial",
+        "price",
+        "currency",
+        "k-line"
+      ]
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -299,13 +317,13 @@
       "description": "Explicit element placement",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/canvas/img/icn-canvas.svg",
-        "large": "/public/app/plugins/panel/canvas/img/icn-canvas.svg"
+        "small": "public/app/plugins/panel/canvas/img/icn-canvas.svg",
+        "large": "public/app/plugins/panel/canvas/img/icn-canvas.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -336,13 +354,13 @@
       "description": "Data source for Amazon AWS monitoring service",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png",
-        "large": "/public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png"
+        "small": "public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png",
+        "large": "public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -373,13 +391,13 @@
       "description": "List of dynamic links to other dashboards",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/dashlist/img/icn-dashlist-panel.svg",
-        "large": "/public/app/plugins/panel/dashlist/img/icn-dashlist-panel.svg"
+        "small": "public/app/plugins/panel/dashlist/img/icn-dashlist-panel.svg",
+        "large": "public/app/plugins/panel/dashlist/img/icn-dashlist-panel.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -410,13 +428,13 @@
       "description": "",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/datagrid/img/icn-table-panel.svg",
-        "large": "/public/app/plugins/panel/datagrid/img/icn-table-panel.svg"
+        "small": "public/app/plugins/panel/datagrid/img/icn-table-panel.svg",
+        "large": "public/app/plugins/panel/datagrid/img/icn-table-panel.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -452,13 +470,15 @@
         }
       ],
       "logos": {
-        "small": "/public/app/plugins/datasource/elasticsearch/img/elasticsearch.svg",
-        "large": "/public/app/plugins/datasource/elasticsearch/img/elasticsearch.svg"
+        "small": "public/app/plugins/datasource/elasticsearch/img/elasticsearch.svg",
+        "large": "public/app/plugins/datasource/elasticsearch/img/elasticsearch.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": [
+        "elasticsearch"
+      ]
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -489,13 +509,13 @@
       "description": "",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/flamegraph/img/icn-flamegraph.svg",
-        "large": "/public/app/plugins/panel/flamegraph/img/icn-flamegraph.svg"
+        "small": "public/app/plugins/panel/flamegraph/img/icn-flamegraph.svg",
+        "large": "public/app/plugins/panel/flamegraph/img/icn-flamegraph.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -526,13 +546,13 @@
       "description": "Standard gauge visualization",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/gauge/img/icon_gauge.svg",
-        "large": "/public/app/plugins/panel/gauge/img/icon_gauge.svg"
+        "small": "public/app/plugins/panel/gauge/img/icon_gauge.svg",
+        "large": "public/app/plugins/panel/gauge/img/icon_gauge.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -563,13 +583,13 @@
       "description": "Geomap panel",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/geomap/img/icn-geomap.svg",
-        "large": "/public/app/plugins/panel/geomap/img/icn-geomap.svg"
+        "small": "public/app/plugins/panel/geomap/img/icn-geomap.svg",
+        "large": "public/app/plugins/panel/geomap/img/icn-geomap.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -600,13 +620,13 @@
       "description": "",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/gettingstarted/img/icn-dashlist-panel.svg",
-        "large": "/public/app/plugins/panel/gettingstarted/img/icn-dashlist-panel.svg"
+        "small": "public/app/plugins/panel/gettingstarted/img/icn-dashlist-panel.svg",
+        "large": "public/app/plugins/panel/gettingstarted/img/icn-dashlist-panel.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -637,13 +657,13 @@
       "description": "Data source for Google's monitoring service (formerly named Stackdriver)",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/datasource/cloud-monitoring/img/cloud_monitoring_logo.svg",
-        "large": "/public/app/plugins/datasource/cloud-monitoring/img/cloud_monitoring_logo.svg"
+        "small": "public/app/plugins/datasource/cloud-monitoring/img/cloud_monitoring_logo.svg",
+        "large": "public/app/plugins/datasource/cloud-monitoring/img/cloud_monitoring_logo.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "1.0.0",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -679,16 +699,24 @@
         }
       ],
       "logos": {
-        "small": "/public/app/plugins/datasource/grafana-pyroscope-datasource/img/grafana_pyroscope_icon.svg",
-        "large": "/public/app/plugins/datasource/grafana-pyroscope-datasource/img/grafana_pyroscope_icon.svg"
+        "small": "public/app/plugins/datasource/grafana-pyroscope-datasource/img/grafana_pyroscope_icon.svg",
+        "large": "public/app/plugins/datasource/grafana-pyroscope-datasource/img/grafana_pyroscope_icon.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": [
+        "grafana",
+        "datasource",
+        "phlare",
+        "flamegraph",
+        "profiling",
+        "continuous profiling",
+        "pyroscope"
+      ]
     },
     "dependencies": {
-      "grafanaDependency": "",
+      "grafanaDependency": "\u003e=10.3.0-0",
       "grafanaVersion": "*",
       "plugins": []
     },
@@ -716,13 +744,13 @@
       "description": "The old default graph panel",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/graph/img/icn-graph-panel.svg",
-        "large": "/public/app/plugins/panel/graph/img/icn-graph-panel.svg"
+        "small": "public/app/plugins/panel/graph/img/icn-graph-panel.svg",
+        "large": "public/app/plugins/panel/graph/img/icn-graph-panel.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -762,13 +790,13 @@
         }
       ],
       "logos": {
-        "small": "/public/app/plugins/datasource/graphite/img/graphite_logo.png",
-        "large": "/public/app/plugins/datasource/graphite/img/graphite_logo.png"
+        "small": "public/app/plugins/datasource/graphite/img/graphite_logo.png",
+        "large": "public/app/plugins/datasource/graphite/img/graphite_logo.png"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -799,13 +827,13 @@
       "description": "Like a histogram over time",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/heatmap/img/icn-heatmap-panel.svg",
-        "large": "/public/app/plugins/panel/heatmap/img/icn-heatmap-panel.svg"
+        "small": "public/app/plugins/panel/heatmap/img/icn-heatmap-panel.svg",
+        "large": "public/app/plugins/panel/heatmap/img/icn-heatmap-panel.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -833,16 +861,21 @@
         "name": "Grafana Labs",
         "url": "https://grafana.com"
       },
-      "description": "",
+      "description": "Distribution of values presented as a bar chart.",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/histogram/img/histogram.svg",
-        "large": "/public/app/plugins/panel/histogram/img/histogram.svg"
+        "small": "public/app/plugins/panel/histogram/img/histogram.svg",
+        "large": "public/app/plugins/panel/histogram/img/histogram.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": [
+        "distribution",
+        "bar chart",
+        "frequency",
+        "proportional"
+      ]
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -873,13 +906,13 @@
       "description": "Open source time series database",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/datasource/influxdb/img/influxdb_logo.svg",
-        "large": "/public/app/plugins/datasource/influxdb/img/influxdb_logo.svg"
+        "small": "public/app/plugins/datasource/influxdb/img/influxdb_logo.svg",
+        "large": "public/app/plugins/datasource/influxdb/img/influxdb_logo.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -919,16 +952,16 @@
         }
       ],
       "logos": {
-        "small": "/public/app/plugins/datasource/jaeger/img/jaeger_logo.svg",
-        "large": "/public/app/plugins/datasource/jaeger/img/jaeger_logo.svg"
+        "small": "public/app/plugins/datasource/jaeger/img/jaeger_logo.svg",
+        "large": "public/app/plugins/datasource/jaeger/img/jaeger_logo.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
-      "grafanaDependency": "",
+      "grafanaDependency": "\u003e=10.3.0-0",
       "grafanaVersion": "*",
       "plugins": []
     },
@@ -956,13 +989,13 @@
       "description": "",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/logs/img/icn-logs-panel.svg",
-        "large": "/public/app/plugins/panel/logs/img/icn-logs-panel.svg"
+        "small": "public/app/plugins/panel/logs/img/icn-logs-panel.svg",
+        "large": "public/app/plugins/panel/logs/img/icn-logs-panel.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -1002,13 +1035,13 @@
         }
       ],
       "logos": {
-        "small": "/public/app/plugins/datasource/loki/img/loki_icon.svg",
-        "large": "/public/app/plugins/datasource/loki/img/loki_icon.svg"
+        "small": "public/app/plugins/datasource/loki/img/loki_icon.svg",
+        "large": "public/app/plugins/datasource/loki/img/loki_icon.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -1039,13 +1072,13 @@
       "description": "Data source for Microsoft SQL Server compatible databases",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/datasource/mssql/img/sql_server_logo.svg",
-        "large": "/public/app/plugins/datasource/mssql/img/sql_server_logo.svg"
+        "small": "public/app/plugins/datasource/mssql/img/sql_server_logo.svg",
+        "large": "public/app/plugins/datasource/mssql/img/sql_server_logo.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -1076,13 +1109,13 @@
       "description": "Data source for MySQL databases",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/datasource/mysql/img/mysql_logo.svg",
-        "large": "/public/app/plugins/datasource/mysql/img/mysql_logo.svg"
+        "small": "public/app/plugins/datasource/mysql/img/mysql_logo.svg",
+        "large": "public/app/plugins/datasource/mysql/img/mysql_logo.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -1113,13 +1146,13 @@
       "description": "RSS feed reader",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/news/img/news.svg",
-        "large": "/public/app/plugins/panel/news/img/news.svg"
+        "small": "public/app/plugins/panel/news/img/news.svg",
+        "large": "public/app/plugins/panel/news/img/news.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -1150,13 +1183,13 @@
       "description": "",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/nodeGraph/img/icn-node-graph.svg",
-        "large": "/public/app/plugins/panel/nodeGraph/img/icn-node-graph.svg"
+        "small": "public/app/plugins/panel/nodeGraph/img/icn-node-graph.svg",
+        "large": "public/app/plugins/panel/nodeGraph/img/icn-node-graph.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -1187,13 +1220,13 @@
       "description": "Open source time series database",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/datasource/opentsdb/img/opentsdb_logo.png",
-        "large": "/public/app/plugins/datasource/opentsdb/img/opentsdb_logo.png"
+        "small": "public/app/plugins/datasource/opentsdb/img/opentsdb_logo.png",
+        "large": "public/app/plugins/datasource/opentsdb/img/opentsdb_logo.png"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -1229,16 +1262,21 @@
         }
       ],
       "logos": {
-        "small": "/public/app/plugins/datasource/parca/img/logo-small.svg",
-        "large": "/public/app/plugins/datasource/parca/img/logo-small.svg"
+        "small": "public/app/plugins/datasource/parca/img/logo-small.svg",
+        "large": "public/app/plugins/datasource/parca/img/logo-small.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": [
+        "grafana",
+        "datasource",
+        "parca",
+        "profiling"
+      ]
     },
     "dependencies": {
-      "grafanaDependency": "",
+      "grafanaDependency": "\u003e=10.3.0-0",
       "grafanaVersion": "*",
       "plugins": []
     },
@@ -1266,13 +1304,13 @@
       "description": "The new core pie chart visualization",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/piechart/img/icon_piechart.svg",
-        "large": "/public/app/plugins/panel/piechart/img/icon_piechart.svg"
+        "small": "public/app/plugins/panel/piechart/img/icon_piechart.svg",
+        "large": "public/app/plugins/panel/piechart/img/icon_piechart.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -1292,7 +1330,7 @@
   {
     "name": "PostgreSQL",
     "type": "datasource",
-    "id": "postgres",
+    "id": "grafana-postgresql-datasource",
     "enabled": true,
     "pinned": false,
     "info": {
@@ -1303,13 +1341,13 @@
       "description": "Data source for PostgreSQL and compatible databases",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/datasource/postgres/img/postgresql_logo.svg",
-        "large": "/public/app/plugins/datasource/postgres/img/postgresql_logo.svg"
+        "small": "public/app/plugins/datasource/grafana-postgresql-datasource/img/postgresql_logo.svg",
+        "large": "public/app/plugins/datasource/grafana-postgresql-datasource/img/postgresql_logo.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -1318,7 +1356,7 @@
     },
     "latestVersion": "",
     "hasUpdate": false,
-    "defaultNavUrl": "/plugins/postgres/",
+    "defaultNavUrl": "/plugins/grafana-postgresql-datasource/",
     "category": "sql",
     "state": "",
     "signature": "internal",
@@ -1345,13 +1383,13 @@
         }
       ],
       "logos": {
-        "small": "/public/app/plugins/datasource/prometheus/img/prometheus_logo.svg",
-        "large": "/public/app/plugins/datasource/prometheus/img/prometheus_logo.svg"
+        "small": "public/app/plugins/datasource/prometheus/img/prometheus_logo.svg",
+        "large": "public/app/plugins/datasource/prometheus/img/prometheus_logo.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -1382,13 +1420,13 @@
       "description": "Big stat values \u0026 sparklines",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/stat/img/icn-singlestat-panel.svg",
-        "large": "/public/app/plugins/panel/stat/img/icn-singlestat-panel.svg"
+        "small": "public/app/plugins/panel/stat/img/icn-singlestat-panel.svg",
+        "large": "public/app/plugins/panel/stat/img/icn-singlestat-panel.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -1419,13 +1457,13 @@
       "description": "State changes and durations",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/state-timeline/img/timeline.svg",
-        "large": "/public/app/plugins/panel/state-timeline/img/timeline.svg"
+        "small": "public/app/plugins/panel/state-timeline/img/timeline.svg",
+        "large": "public/app/plugins/panel/state-timeline/img/timeline.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -1456,13 +1494,13 @@
       "description": "Periodic status history",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/status-history/img/status.svg",
-        "large": "/public/app/plugins/panel/status-history/img/status.svg"
+        "small": "public/app/plugins/panel/status-history/img/status.svg",
+        "large": "public/app/plugins/panel/status-history/img/status.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -1493,13 +1531,13 @@
       "description": "Supports many column styles",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/table/img/icn-table-panel.svg",
-        "large": "/public/app/plugins/panel/table/img/icn-table-panel.svg"
+        "small": "public/app/plugins/panel/table/img/icn-table-panel.svg",
+        "large": "public/app/plugins/panel/table/img/icn-table-panel.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -1530,13 +1568,13 @@
       "description": "Table Panel for Grafana",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/table-old/img/icn-table-panel.svg",
-        "large": "/public/app/plugins/panel/table-old/img/icn-table-panel.svg"
+        "small": "public/app/plugins/panel/table-old/img/icn-table-panel.svg",
+        "large": "public/app/plugins/panel/table-old/img/icn-table-panel.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -1572,16 +1610,16 @@
         }
       ],
       "logos": {
-        "small": "/public/app/plugins/datasource/tempo/img/tempo_logo.svg",
-        "large": "/public/app/plugins/datasource/tempo/img/tempo_logo.svg"
+        "small": "public/app/plugins/datasource/tempo/img/tempo_logo.svg",
+        "large": "public/app/plugins/datasource/tempo/img/tempo_logo.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
-      "grafanaDependency": "",
+      "grafanaDependency": "\u003e=10.3.0-0",
       "grafanaVersion": "*",
       "plugins": []
     },
@@ -1609,16 +1647,16 @@
       "description": "Generates test data in different forms",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/datasource/grafana-testdata-datasource/img/testdata.svg",
-        "large": "/public/app/plugins/datasource/grafana-testdata-datasource/img/testdata.svg"
+        "small": "public/app/plugins/datasource/grafana-testdata-datasource/img/testdata.svg",
+        "large": "public/app/plugins/datasource/grafana-testdata-datasource/img/testdata.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
-      "grafanaDependency": "",
+      "grafanaDependency": "\u003e=10.3.0-0",
       "grafanaVersion": "*",
       "plugins": []
     },
@@ -1646,13 +1684,13 @@
       "description": "Supports markdown and html content",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/text/img/icn-text-panel.svg",
-        "large": "/public/app/plugins/panel/text/img/icn-text-panel.svg"
+        "small": "public/app/plugins/panel/text/img/icn-text-panel.svg",
+        "large": "public/app/plugins/panel/text/img/icn-text-panel.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -1683,13 +1721,13 @@
       "description": "Time based line, area and bar charts",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/timeseries/img/icn-timeseries-panel.svg",
-        "large": "/public/app/plugins/panel/timeseries/img/icn-timeseries-panel.svg"
+        "small": "public/app/plugins/panel/timeseries/img/icn-timeseries-panel.svg",
+        "large": "public/app/plugins/panel/timeseries/img/icn-timeseries-panel.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -1720,13 +1758,13 @@
       "description": "",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/traces/img/traces-panel.svg",
-        "large": "/public/app/plugins/panel/traces/img/traces-panel.svg"
+        "small": "public/app/plugins/panel/traces/img/traces-panel.svg",
+        "large": "public/app/plugins/panel/traces/img/traces-panel.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -1757,13 +1795,13 @@
       "description": "Like timeseries, but when x != time",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/trend/img/trend.svg",
-        "large": "/public/app/plugins/panel/trend/img/trend.svg"
+        "small": "public/app/plugins/panel/trend/img/trend.svg",
+        "large": "public/app/plugins/panel/trend/img/trend.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -1794,13 +1832,13 @@
       "description": "",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/welcome/img/icn-dashlist-panel.svg",
-        "large": "/public/app/plugins/panel/welcome/img/icn-dashlist-panel.svg"
+        "small": "public/app/plugins/panel/welcome/img/icn-dashlist-panel.svg",
+        "large": "public/app/plugins/panel/welcome/img/icn-dashlist-panel.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -1828,16 +1866,19 @@
         "name": "Grafana Labs",
         "url": "https://grafana.com"
       },
-      "description": "",
+      "description": "Supports arbitrary X vs Y in a graph to visualize the relationship between two variables.",
       "links": null,
       "logos": {
-        "small": "/public/app/plugins/panel/xychart/img/icn-xychart.svg",
-        "large": "/public/app/plugins/panel/xychart/img/icn-xychart.svg"
+        "small": "public/app/plugins/panel/xychart/img/icn-xychart.svg",
+        "large": "public/app/plugins/panel/xychart/img/icn-xychart.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": [
+        "scatter",
+        "plot"
+      ]
     },
     "dependencies": {
       "grafanaDependency": "",
@@ -1873,16 +1914,16 @@
         }
       ],
       "logos": {
-        "small": "/public/app/plugins/datasource/zipkin/img/zipkin-logo.svg",
-        "large": "/public/app/plugins/datasource/zipkin/img/zipkin-logo.svg"
+        "small": "public/app/plugins/datasource/zipkin/img/zipkin-logo.svg",
+        "large": "public/app/plugins/datasource/zipkin/img/zipkin-logo.svg"
       },
       "build": {},
       "screenshots": null,
-      "version": "",
-      "updated": ""
+      "updated": "",
+      "keywords": null
     },
     "dependencies": {
-      "grafanaDependency": "",
+      "grafanaDependency": "\u003e=10.3.0-0",
       "grafanaVersion": "*",
       "plugins": []
     },
diff --git a/pkg/tests/api/prometheus/prometheus_test.go b/pkg/tests/api/prometheus/prometheus_test.go
index a2de470823240..df2182ff74381 100644
--- a/pkg/tests/api/prometheus/prometheus_test.go
+++ b/pkg/tests/api/prometheus/prometheus_test.go
@@ -17,8 +17,13 @@ import (
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationPrometheus(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
diff --git a/pkg/tests/api/stats/admin_test.go b/pkg/tests/api/stats/admin_test.go
index 5a9c910711574..0204f24d8fad4 100644
--- a/pkg/tests/api/stats/admin_test.go
+++ b/pkg/tests/api/stats/admin_test.go
@@ -16,8 +16,13 @@ import (
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/user/userimpl"
 	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestIntegrationAdminStats(t *testing.T) {
 	t.Run("with unified alerting enabled", func(t *testing.T) {
 		url := grafanaSetup(t, testinfra.GrafanaOpts{
diff --git a/pkg/tests/apis/dashboard/dashboards_test.go b/pkg/tests/apis/dashboard/dashboards_test.go
new file mode 100644
index 0000000000000..9771ef718e4a4
--- /dev/null
+++ b/pkg/tests/apis/dashboard/dashboards_test.go
@@ -0,0 +1,117 @@
+package dashboards
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/tests/apis"
+	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
+)
+
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
+func TestIntegrationRequiresDevMode(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+	helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
+		AppModeProduction: true, // should fail
+		DisableAnonymous:  true,
+		EnableFeatureToggles: []string{
+			featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs, // Required to start the example service
+		},
+	})
+
+	_, err := helper.NewDiscoveryClient().ServerResourcesForGroupVersion("dashboard.grafana.app/v0alpha1")
+	require.Error(t, err)
+}
+
+func TestIntegrationDashboardsApp(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+	helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
+		AppModeProduction: false, // required for experimental APIs
+		DisableAnonymous:  true,
+		EnableFeatureToggles: []string{
+			featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs, // Required to start the example service
+		},
+	})
+	_, err := helper.NewDiscoveryClient().ServerResourcesForGroupVersion("dashboard.grafana.app/v0alpha1")
+	require.NoError(t, err)
+
+	t.Run("Check discovery client", func(t *testing.T) {
+		disco := helper.GetGroupVersionInfoJSON("dashboard.grafana.app")
+		// fmt.Printf("%s", string(disco))
+
+		require.JSONEq(t, `[
+			{
+			  "freshness": "Current",
+			  "resources": [
+				{
+				  "resource": "dashboards",
+				  "responseKind": {
+					"group": "",
+					"kind": "Dashboard",
+					"version": ""
+				  },
+				  "scope": "Namespaced",
+				  "singularResource": "dashboard",
+				  "subresources": [
+					{
+					  "responseKind": {
+						"group": "",
+						"kind": "DashboardAccessInfo",
+						"version": ""
+					  },
+					  "subresource": "access",
+					  "verbs": [
+						"get"
+					  ]
+					},
+					{
+					  "responseKind": {
+						"group": "",
+						"kind": "DashboardVersionList",
+						"version": ""
+					  },
+					  "subresource": "versions",
+					  "verbs": [
+						"get"
+					  ]
+					}
+				  ],
+				  "verbs": [
+					"create",
+					"delete",
+					"get",
+					"list",
+					"patch",
+					"update"
+				  ]
+				},
+				{
+				  "resource": "summary",
+				  "responseKind": {
+					"group": "",
+					"kind": "DashboardSummary",
+					"version": ""
+				  },
+				  "scope": "Namespaced",
+				  "singularResource": "summary",
+				  "verbs": [
+					"get",
+					"list"
+				  ]
+				}
+			  ],
+			  "version": "v0alpha1"
+			}
+		  ]`, disco)
+	})
+}
diff --git a/pkg/tests/apis/dashboard/testdata/dashboard-generate.yaml b/pkg/tests/apis/dashboard/testdata/dashboard-generate.yaml
new file mode 100644
index 0000000000000..d5dfcb785645e
--- /dev/null
+++ b/pkg/tests/apis/dashboard/testdata/dashboard-generate.yaml
@@ -0,0 +1,6 @@
+apiVersion: dashboard.grafana.app/v0alpha1
+kind: Dashboard
+metadata:
+  generateName: x # anything is ok here... except yes or true -- they become boolean!
+spec:
+  title: Dashboard with auto generated UID ${NOW}
\ No newline at end of file
diff --git a/pkg/tests/apis/dashboard/testdata/dashboard-test-apply.yaml b/pkg/tests/apis/dashboard/testdata/dashboard-test-apply.yaml
new file mode 100644
index 0000000000000..912d995742388
--- /dev/null
+++ b/pkg/tests/apis/dashboard/testdata/dashboard-test-apply.yaml
@@ -0,0 +1,6 @@
+apiVersion: dashboard.grafana.app/v0alpha1
+kind: Dashboard
+metadata:
+  name: test
+spec:
+  title: Test dashboard (apply from k8s; PATCH) X
diff --git a/pkg/tests/apis/dashboard/testdata/dashboard-test-create.yaml b/pkg/tests/apis/dashboard/testdata/dashboard-test-create.yaml
new file mode 100644
index 0000000000000..d6a04640771ec
--- /dev/null
+++ b/pkg/tests/apis/dashboard/testdata/dashboard-test-create.yaml
@@ -0,0 +1,6 @@
+apiVersion: dashboard.grafana.app/v0alpha1
+kind: Dashboard
+metadata:
+  name: test
+spec:
+  title: Test dashboard (created from k8s; POST)
\ No newline at end of file
diff --git a/pkg/tests/apis/dashboard/testdata/dashboard-test-replace.yaml b/pkg/tests/apis/dashboard/testdata/dashboard-test-replace.yaml
new file mode 100644
index 0000000000000..7dc46c4e18725
--- /dev/null
+++ b/pkg/tests/apis/dashboard/testdata/dashboard-test-replace.yaml
@@ -0,0 +1,6 @@
+apiVersion: dashboard.grafana.app/v0alpha1
+kind: Dashboard
+metadata:
+  name: test
+spec:
+  title: Test dashboard (replaced from k8s; PUT)
\ No newline at end of file
diff --git a/pkg/tests/apis/dashboardsnapshot/snapshots_test.go b/pkg/tests/apis/dashboardsnapshot/snapshots_test.go
new file mode 100644
index 0000000000000..bf787a7916028
--- /dev/null
+++ b/pkg/tests/apis/dashboardsnapshot/snapshots_test.go
@@ -0,0 +1,85 @@
+package dashboardsnapshots
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/tests/apis"
+	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
+)
+
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
+func TestIntegrationDashboardSnapshots(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+	helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
+		AppModeProduction: false, // required for experimental apis
+		DisableAnonymous:  true,
+		EnableFeatureToggles: []string{
+			featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs, // required to register dashboardsnapshot.grafana.app
+		},
+	})
+
+	t.Run("Check discovery client", func(t *testing.T) {
+		disco := helper.GetGroupVersionInfoJSON("dashboardsnapshot.grafana.app")
+
+		// fmt.Printf("%s", disco)
+		require.JSONEq(t, `[
+			{
+			  "freshness": "Current",
+			  "resources": [
+				{
+				  "resource": "dashboardsnapshots",
+				  "responseKind": {
+					"group": "",
+					"kind": "DashboardSnapshot",
+					"version": ""
+				  },
+				  "scope": "Namespaced",
+				  "singularResource": "dashboardsnapshot",
+				  "subresources": [
+					{
+					  "responseKind": {
+						"group": "",
+						"kind": "FullDashboardSnapshot",
+						"version": ""
+					  },
+					  "subresource": "body",
+					  "verbs": [
+						"get"
+					  ]
+					}
+				  ],
+				  "verbs": [
+					"delete",
+					"get",
+					"list"
+				  ]
+				},
+				{
+				  "resource": "options",
+				  "responseKind": {
+					"group": "",
+					"kind": "SharingOptions",
+					"version": ""
+				  },
+				  "scope": "Namespaced",
+				  "singularResource": "options",
+				  "verbs": [
+					"get",
+					"list"
+				  ]
+				}
+			  ],
+			  "version": "v0alpha1"
+			}
+		  ]`, disco)
+	})
+}
diff --git a/pkg/tests/apis/datasource/testdata_test.go b/pkg/tests/apis/datasource/testdata_test.go
new file mode 100644
index 0000000000000..328cf81e35283
--- /dev/null
+++ b/pkg/tests/apis/datasource/testdata_test.go
@@ -0,0 +1,148 @@
+package dashboards
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/tests/apis"
+	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
+)
+
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
+func TestIntegrationTestDatasource(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+	helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
+		AppModeProduction: false, // dev mode required for datasource connections
+		DisableAnonymous:  true,
+		EnableFeatureToggles: []string{
+			featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs, // Required to start the example service
+		},
+	})
+
+	// Create a single datasource
+	ds := helper.CreateDS(&datasources.AddDataSourceCommand{
+		Name:  "test",
+		Type:  datasources.DS_TESTDATA,
+		UID:   "test",
+		OrgID: int64(1),
+	})
+	require.Equal(t, "test", ds.UID)
+
+	t.Run("Check discovery client", func(t *testing.T) {
+		disco := helper.GetGroupVersionInfoJSON("testdata.datasource.grafana.app")
+		// fmt.Printf("%s", string(disco))
+
+		require.JSONEq(t, `[
+			{
+			  "freshness": "Current",
+			  "resources": [
+				{
+				  "resource": "connections",
+				  "responseKind": {
+					"group": "",
+					"kind": "DataSourceConnection",
+					"version": ""
+				  },
+				  "scope": "Namespaced",
+				  "shortNames": [
+					"grafana-testdata-datasource-connection"
+				  ],
+				  "singularResource": "connection",
+				  "subresources": [
+					{
+					  "responseKind": {
+						"group": "",
+						"kind": "HealthCheckResult",
+						"version": ""
+					  },
+					  "subresource": "health",
+					  "verbs": [
+						"get"
+					  ]
+					},
+					{
+					  "responseKind": {
+						"group": "",
+						"kind": "QueryDataResponse",
+						"version": ""
+					  },
+					  "subresource": "query",
+					  "verbs": [
+						"create"
+					  ]
+					},
+					{
+					  "responseKind": {
+						"group": "",
+						"kind": "Status",
+						"version": ""
+					  },
+					  "subresource": "resource",
+					  "verbs": [
+						"create",
+						"delete",
+						"get",
+						"patch",
+						"update"
+					  ]
+					}
+				  ],
+				  "verbs": [
+					"get",
+					"list"
+				  ]
+				}
+			  ],
+			  "version": "v0alpha1"
+			}
+		  ]`, disco)
+	})
+
+	t.Run("Call subresources", func(t *testing.T) {
+		client := helper.Org1.Admin.ResourceClient(t, schema.GroupVersionResource{
+			Group:    "testdata.datasource.grafana.app",
+			Version:  "v0alpha1",
+			Resource: "connections",
+		}).Namespace("default")
+		ctx := context.Background()
+
+		list, err := client.List(ctx, metav1.ListOptions{})
+		require.NoError(t, err)
+		require.Len(t, list.Items, 1, "expected a single connection")
+		require.Equal(t, "test", list.Items[0].GetName(), "with the test uid")
+
+		rsp, err := client.Get(ctx, "test", metav1.GetOptions{}, "health")
+		require.NoError(t, err)
+		body, err := rsp.MarshalJSON()
+		require.NoError(t, err)
+		//fmt.Printf("GOT: %v\n", string(body))
+		require.JSONEq(t, `{
+			"apiVersion": "testdata.datasource.grafana.app/v0alpha1",
+			"code": 1,
+			"kind": "HealthCheckResult",
+			"message": "Data source is working",
+			"status": "OK"
+		  }
+		`, string(body))
+
+		// Test connecting to non-JSON marshaled data
+		raw := apis.DoRequest[any](helper, apis.RequestParams{
+			User:   helper.Org1.Admin,
+			Method: "GET",
+			Path:   "/apis/testdata.datasource.grafana.app/v0alpha1/namespaces/default/connections/test/resource",
+		}, nil)
+		require.Equal(t, `Hello world from test datasource!`, string(raw.Body))
+	})
+}
diff --git a/pkg/tests/apis/example/example_test.go b/pkg/tests/apis/example/example_test.go
new file mode 100644
index 0000000000000..c702402837fd5
--- /dev/null
+++ b/pkg/tests/apis/example/example_test.go
@@ -0,0 +1,176 @@
+package playlist
+
+import (
+	"context"
+	"encoding/json"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/tests/apis"
+	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
+)
+
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
+func TestIntegrationExampleApp(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+	helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
+		AppModeProduction: false, // required for experimental APIs
+		DisableAnonymous:  true,
+		EnableFeatureToggles: []string{
+			featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs, // Required to start the example service
+		},
+	})
+
+	t.Run("Check runtime info resource", func(t *testing.T) {
+		// Resource is not namespaced!
+		client := helper.Org1.Admin.ResourceClient(t, schema.GroupVersionResource{
+			Group:    "example.grafana.app",
+			Version:  "v0alpha1",
+			Resource: "runtime",
+		})
+		rsp, err := client.List(context.Background(), metav1.ListOptions{})
+		require.NoError(t, err)
+
+		v, ok := rsp.Object["startupTime"].(int64)
+		require.True(t, ok)
+		require.Greater(t, v, time.Now().Add(-1*time.Hour).UnixMilli()) // should be within the last hour
+	})
+
+	t.Run("Check discovery client", func(t *testing.T) {
+		disco := helper.NewDiscoveryClient()
+		resources, err := disco.ServerResourcesForGroupVersion("example.grafana.app/v0alpha1")
+		require.NoError(t, err)
+
+		v1Disco, err := json.MarshalIndent(resources, "", "  ")
+		require.NoError(t, err)
+		//fmt.Printf("%s", string(v1Disco))
+
+		require.JSONEq(t, `{
+			"kind": "APIResourceList",
+			"apiVersion": "v1",
+			"groupVersion": "example.grafana.app/v0alpha1",
+			"resources": [
+			  {
+				"name": "dummy",
+				"singularName": "dummy",
+				"namespaced": true,
+				"kind": "DummyResource",
+				"verbs": [
+				  "get",
+				  "list"
+				]
+			  },
+			  {
+				"name": "dummy/sub",
+				"singularName": "",
+				"namespaced": true,
+				"kind": "DummySubresource",
+				"verbs": [
+				  "get"
+				]
+			  },
+			  {
+				"name": "runtime",
+				"singularName": "runtime",
+				"namespaced": false,
+				"kind": "RuntimeInfo",
+				"verbs": [
+				  "list"
+				]
+			  }
+			]
+		  }`, string(v1Disco))
+
+		//fmt.Printf("%s", string(v1Disco))
+		require.JSONEq(t, `[
+			{
+			  "version": "v0alpha1",
+			  "freshness": "Current",
+			  "resources": [
+				{
+				  "resource": "dummy",
+				  "responseKind": {
+					"group": "",
+					"kind": "DummyResource",
+					"version": ""
+				  },
+				  "scope": "Namespaced",
+				  "singularResource": "dummy",
+				  "subresources": [
+					{
+					  "responseKind": {
+						"group": "",
+						"kind": "DummySubresource",
+						"version": ""
+					  },
+					  "subresource": "sub",
+					  "verbs": [
+						"get"
+					  ]
+					}
+				  ],
+				  "verbs": [
+					"get",
+					"list"
+				  ]
+				},
+				{
+				  "resource": "runtime",
+				  "responseKind": {
+					"group": "",
+					"kind": "RuntimeInfo",
+					"version": ""
+				  },
+				  "scope": "Cluster",
+				  "singularResource": "runtime",
+				  "verbs": [
+					"list"
+				  ]
+				}
+			  ]
+			}
+		  ]`, helper.GetGroupVersionInfoJSON("example.grafana.app"))
+	})
+
+	t.Run("Check dummy with subresource", func(t *testing.T) {
+		client := helper.Org1.Viewer.ResourceClient(t, schema.GroupVersionResource{
+			Group:    "example.grafana.app",
+			Version:  "v0alpha1",
+			Resource: "dummy",
+		}).Namespace("default")
+		rsp, err := client.Get(context.Background(), "test2", metav1.GetOptions{})
+		require.NoError(t, err)
+
+		v, ok, err := unstructured.NestedString(rsp.Object, "spec", "Dummy")
+		require.NoError(t, err)
+		require.True(t, ok)
+
+		require.Equal(t, "test2", v)
+		require.Equal(t, "DummyResource", rsp.GetObjectKind().GroupVersionKind().Kind)
+
+		// Now a sub-resource
+		rsp, err = client.Get(context.Background(), "test2", metav1.GetOptions{}, "sub")
+		require.NoError(t, err)
+
+		raw, err := json.MarshalIndent(rsp, "", "  ")
+		require.NoError(t, err)
+		//fmt.Printf("%s", string(raw))
+		require.JSONEq(t, `{
+			"apiVersion": "example.grafana.app/v0alpha1",
+			"kind": "DummySubresource",
+			"info": "default/viewer-1"
+		  }`, string(raw))
+	})
+}
diff --git a/pkg/tests/apis/folder/folders_test.go b/pkg/tests/apis/folder/folders_test.go
new file mode 100644
index 0000000000000..1dbbddf3ff671
--- /dev/null
+++ b/pkg/tests/apis/folder/folders_test.go
@@ -0,0 +1,88 @@
+package playlist
+
+import (
+	"encoding/json"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/tests/apis"
+	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
+)
+
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
+func TestIntegrationFoldersApp(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+	helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
+		AppModeProduction: false, // required for experimental APIs
+		EnableFeatureToggles: []string{
+			featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs, // Required to start the example service
+		},
+	})
+
+	t.Run("Check discovery client", func(t *testing.T) {
+		disco := helper.NewDiscoveryClient()
+		resources, err := disco.ServerResourcesForGroupVersion("folder.grafana.app/v0alpha1")
+		require.NoError(t, err)
+
+		v1Disco, err := json.MarshalIndent(resources, "", "  ")
+		require.NoError(t, err)
+		// fmt.Printf("%s", string(v1Disco))
+
+		require.JSONEq(t, `{
+			"kind": "APIResourceList",
+			"apiVersion": "v1",
+			"groupVersion": "folder.grafana.app/v0alpha1",
+			"resources": [
+			  {
+				"name": "folders",
+				"singularName": "folder",
+				"namespaced": true,
+				"kind": "Folder",
+				"verbs": [
+				  "create",
+				  "delete",
+				  "get",
+				  "list",
+				  "patch",
+				  "update"
+				]
+			  },
+			  {
+				"name": "folders/access",
+				"singularName": "",
+				"namespaced": true,
+				"kind": "FolderAccessInfo",
+				"verbs": [
+				  "get"
+				]
+			  },
+			  {
+				"name": "folders/count",
+				"singularName": "",
+				"namespaced": true,
+				"kind": "DescendantCounts",
+				"verbs": [
+				  "get"
+				]
+			  },
+			  {
+				"name": "folders/parents",
+				"singularName": "",
+				"namespaced": true,
+				"kind": "FolderInfoList",
+				"verbs": [
+				  "get"
+				]
+			  }
+			]
+		  }`, string(v1Disco))
+	})
+}
diff --git a/pkg/tests/apis/folder/testdata/folder-generate.yaml b/pkg/tests/apis/folder/testdata/folder-generate.yaml
new file mode 100644
index 0000000000000..a4c55dbaf5e0c
--- /dev/null
+++ b/pkg/tests/apis/folder/testdata/folder-generate.yaml
@@ -0,0 +1,7 @@
+apiVersion: folder.grafana.app/v0alpha1
+kind: Folder
+metadata:
+  generateName: x # anything is ok here... except yes or true -- they become boolean!
+spec:
+  title: Generated folder title (${RAND})
+  description: A description from here
diff --git a/pkg/tests/apis/helper.go b/pkg/tests/apis/helper.go
index 86d0b5666cf1a..fbb6bc3517663 100644
--- a/pkg/tests/apis/helper.go
+++ b/pkg/tests/apis/helper.go
@@ -7,19 +7,28 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"os"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
+	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/yaml"
+	"k8s.io/apimachinery/pkg/runtime/serializer/yaml"
+	yamlutil "k8s.io/apimachinery/pkg/util/yaml"
+
+	"k8s.io/client-go/discovery"
+	"k8s.io/client-go/dynamic"
+	"k8s.io/client-go/rest"
 
 	"github.com/grafana/grafana/pkg/infra/localcache"
 	"github.com/grafana/grafana/pkg/server"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/datasources"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/services/grafana-apiserver/endpoints/request"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/org/orgimpl"
 	"github.com/grafana/grafana/pkg/services/quota/quotaimpl"
@@ -35,47 +44,135 @@ type K8sTestHelper struct {
 	env        server.TestEnv
 	namespacer request.NamespaceMapper
 
-	Org1 OrgUsers
-	Org2 OrgUsers
+	Org1 OrgUsers // default
+	OrgB OrgUsers // some other id
 
 	// // Registered groups
 	groups []metav1.APIGroup
-
-	// Used to build the URL paths
-	selectedGVR schema.GroupVersionResource
 }
 
-func NewK8sTestHelper(t *testing.T) *K8sTestHelper {
+func NewK8sTestHelper(t *testing.T, opts testinfra.GrafanaOpts) *K8sTestHelper {
 	t.Helper()
-	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
-		AppModeProduction: true, // do not start extra port 6443
-		DisableAnonymous:  true,
-		EnableFeatureToggles: []string{
-			featuremgmt.FlagGrafanaAPIServer,
-			featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs,
-		},
-	})
-
+	dir, path := testinfra.CreateGrafDir(t, opts)
 	_, env := testinfra.StartGrafanaEnv(t, dir, path)
+
 	c := &K8sTestHelper{
 		env:        *env,
 		t:          t,
 		namespacer: request.GetNamespaceMapper(nil),
 	}
 
-	c.Org1 = c.createTestUsers(int64(1))
-	c.Org2 = c.createTestUsers(int64(2))
+	c.Org1 = c.createTestUsers("Org1")
+	c.OrgB = c.createTestUsers("OrgB")
+
+	c.loadAPIGroups()
 
-	// Read the API groups
-	rsp := doRequest(c, RequestParams{
-		User: c.Org1.Viewer,
-		Path: "/apis",
-		// Accept: "application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json",
-	}, &metav1.APIGroupList{})
-	c.groups = rsp.Result.Groups
 	return c
 }
 
+func (c *K8sTestHelper) loadAPIGroups() {
+	for {
+		rsp := DoRequest(c, RequestParams{
+			User: c.Org1.Viewer,
+			Path: "/apis",
+			// Accept: "application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json",
+		}, &metav1.APIGroupList{})
+
+		if rsp.Response.StatusCode == http.StatusOK {
+			c.groups = rsp.Result.Groups
+			return
+		}
+
+		time.Sleep(100 * time.Millisecond)
+	}
+}
+
+func (c *K8sTestHelper) Shutdown() {
+	err := c.env.Server.Shutdown(context.Background(), "done")
+	require.NoError(c.t, err)
+}
+
+type ResourceClientArgs struct {
+	User      User
+	Namespace string
+	GVR       schema.GroupVersionResource
+}
+
+type K8sResourceClient struct {
+	t        *testing.T
+	Args     ResourceClientArgs
+	Resource dynamic.ResourceInterface
+}
+
+// This will set the expected Group/Version/Resource and return the discovery info if found
+func (c *K8sTestHelper) GetResourceClient(args ResourceClientArgs) *K8sResourceClient {
+	c.t.Helper()
+
+	if args.Namespace == "" {
+		args.Namespace = c.namespacer(args.User.Identity.GetOrgID())
+	}
+
+	client, err := dynamic.NewForConfig(args.User.NewRestConfig())
+	require.NoError(c.t, err)
+
+	return &K8sResourceClient{
+		t:        c.t,
+		Args:     args,
+		Resource: client.Resource(args.GVR).Namespace(args.Namespace),
+	}
+}
+
+// Cast the error to status error
+func (c *K8sTestHelper) AsStatusError(err error) *errors.StatusError {
+	c.t.Helper()
+
+	if err == nil {
+		return nil
+	}
+
+	//nolint:errorlint
+	statusError, ok := err.(*errors.StatusError)
+	require.True(c.t, ok)
+	return statusError
+}
+
+// remove the meta keys that are expected to change each time
+func (c *K8sResourceClient) SanitizeJSON(v *unstructured.Unstructured) string {
+	c.t.Helper()
+
+	deep := v.DeepCopy()
+	anno := deep.GetAnnotations()
+	if anno["grafana.app/originKey"] != "" {
+		anno["grafana.app/originKey"] = "${originKey}"
+	}
+	if anno["grafana.app/updatedTimestamp"] != "" {
+		anno["grafana.app/updatedTimestamp"] = "${updatedTimestamp}"
+	}
+	// Remove annotations that are not added by legacy storage
+	delete(anno, "grafana.app/originTimestamp")
+	delete(anno, "grafana.app/createdBy")
+	delete(anno, "grafana.app/updatedBy")
+	delete(anno, "grafana.app/action")
+
+	deep.SetAnnotations(anno)
+	copy := deep.Object
+	meta, ok := copy["metadata"].(map[string]any)
+	require.True(c.t, ok)
+
+	replaceMeta := []string{"creationTimestamp", "resourceVersion", "uid"}
+	for _, key := range replaceMeta {
+		old, ok := meta[key]
+		require.True(c.t, ok)
+		require.NotEmpty(c.t, old)
+		meta[key] = fmt.Sprintf("${%s}", key)
+	}
+
+	out, err := json.MarshalIndent(copy, "", "  ")
+	//fmt.Printf("%s", out)
+	require.NoError(c.t, err)
+	return string(out)
+}
+
 type OrgUsers struct {
 	Admin  User
 	Editor User
@@ -85,6 +182,30 @@ type OrgUsers struct {
 type User struct {
 	Identity identity.Requester
 	password string
+	baseURL  string
+}
+
+func (c *User) NewRestConfig() *rest.Config {
+	return &rest.Config{
+		Host:     c.baseURL,
+		Username: c.Identity.GetLogin(),
+		Password: c.password,
+	}
+}
+
+func (c *User) ResourceClient(t *testing.T, gvr schema.GroupVersionResource) dynamic.NamespaceableResourceInterface {
+	client, err := dynamic.NewForConfig(c.NewRestConfig())
+	require.NoError(t, err)
+	return client.Resource(gvr)
+}
+
+func (c *User) RESTClient(t *testing.T, gv *schema.GroupVersion) *rest.RESTClient {
+	cfg := dynamic.ConfigFor(c.NewRestConfig()) // adds negotiated serializers!
+	cfg.GroupVersion = gv
+	cfg.APIPath = "apis" // the plural
+	client, err := rest.RESTClientFor(cfg)
+	require.NoError(t, err)
+	return client
 }
 
 type RequestParams struct {
@@ -106,13 +227,6 @@ type K8sResponse[T any] struct {
 type AnyResourceResponse = K8sResponse[AnyResource]
 type AnyResourceListResponse = K8sResponse[AnyResourceList]
 
-// This will set the expected Group/Version/Resource and return the discovery info if found
-func (c *K8sTestHelper) SetGroupVersionResource(gvr schema.GroupVersionResource) {
-	c.t.Helper()
-
-	c.selectedGVR = gvr
-}
-
 func (c *K8sTestHelper) PostResource(user User, resource string, payload AnyResource) AnyResourceResponse {
 	c.t.Helper()
 
@@ -130,7 +244,7 @@ func (c *K8sTestHelper) PostResource(user User, resource string, payload AnyReso
 	body, err := json.Marshal(payload)
 	require.NoError(c.t, err)
 
-	return doRequest(c, RequestParams{
+	return DoRequest(c, RequestParams{
 		Method: http.MethodPost,
 		Path:   path,
 		User:   user,
@@ -147,7 +261,7 @@ func (c *K8sTestHelper) PutResource(user User, resource string, payload AnyResou
 	body, err := json.Marshal(payload)
 	require.NoError(c.t, err)
 
-	return doRequest(c, RequestParams{
+	return DoRequest(c, RequestParams{
 		Method: http.MethodPut,
 		Path:   path,
 		User:   user,
@@ -155,20 +269,20 @@ func (c *K8sTestHelper) PutResource(user User, resource string, payload AnyResou
 	}, &AnyResource{})
 }
 
-func (c *K8sTestHelper) List(user User, namespace string) AnyResourceListResponse {
+func (c *K8sTestHelper) List(user User, namespace string, gvr schema.GroupVersionResource) AnyResourceListResponse {
 	c.t.Helper()
 
-	return doRequest(c, RequestParams{
+	return DoRequest(c, RequestParams{
 		User: user,
 		Path: fmt.Sprintf("/apis/%s/%s/namespaces/%s/%s",
-			c.selectedGVR.Group,
-			c.selectedGVR.Version,
+			gvr.Group,
+			gvr.Version,
 			namespace,
-			c.selectedGVR.Resource),
+			gvr.Resource),
 	}, &AnyResourceList{})
 }
 
-func doRequest[T any](c *K8sTestHelper, params RequestParams, result *T) K8sResponse[T] {
+func DoRequest[T any](c *K8sTestHelper, params RequestParams, result *T) K8sResponse[T] {
 	c.t.Helper()
 
 	if params.Method == "" {
@@ -224,39 +338,75 @@ func doRequest[T any](c *K8sTestHelper, params RequestParams, result *T) K8sResp
 			r.Status = s
 			r.Result = nil
 		}
-	} else {
-		_ = yaml.Unmarshal(r.Body, r.Result)
 	}
 	return r
 }
 
-func (c K8sTestHelper) createTestUsers(orgId int64) OrgUsers {
+// Read local JSON or YAML file into a resource
+func (c *K8sTestHelper) LoadYAMLOrJSONFile(fpath string) *unstructured.Unstructured {
+	c.t.Helper()
+
+	//nolint:gosec
+	raw, err := os.ReadFile(fpath)
+	require.NoError(c.t, err)
+	require.NotEmpty(c.t, raw)
+	return c.LoadYAMLOrJSON(string(raw))
+}
+
+// Read local JSON or YAML file into a resource
+func (c *K8sTestHelper) LoadYAMLOrJSON(body string) *unstructured.Unstructured {
+	c.t.Helper()
+
+	decoder := yamlutil.NewYAMLOrJSONDecoder(bytes.NewReader([]byte(body)), 100)
+	var rawObj runtime.RawExtension
+	err := decoder.Decode(&rawObj)
+	require.NoError(c.t, err)
+
+	obj, _, err := yaml.NewDecodingSerializer(unstructured.UnstructuredJSONScheme).Decode(rawObj.Raw, nil, nil)
+	require.NoError(c.t, err)
+	unstructuredMap, err := runtime.DefaultUnstructuredConverter.ToUnstructured(obj)
+	require.NoError(c.t, err)
+
+	return &unstructured.Unstructured{Object: unstructuredMap}
+}
+
+func (c K8sTestHelper) createTestUsers(orgName string) OrgUsers {
 	c.t.Helper()
 
 	store := c.env.SQLStore
-	store.Cfg.AutoAssignOrg = true
-	store.Cfg.AutoAssignOrgId = int(orgId)
+	defer func() {
+		store.Cfg.AutoAssignOrg = false
+		store.Cfg.AutoAssignOrgId = 1 // the default
+	}()
+
 	quotaService := quotaimpl.ProvideService(store, store.Cfg)
 
 	orgService, err := orgimpl.ProvideService(store, store.Cfg, quotaService)
 	require.NoError(c.t, err)
 
-	gotID, err := orgService.GetOrCreate(context.Background(), fmt.Sprintf("Org%d", orgId))
+	orgId := int64(1)
+	if orgName != "Org1" {
+		orgId, err = orgService.GetOrCreate(context.Background(), orgName)
+		require.NoError(c.t, err)
+	}
+	store.Cfg.AutoAssignOrg = true
+	store.Cfg.AutoAssignOrgId = int(orgId)
+
+	teamSvc, err := teamimpl.ProvideService(store, store.Cfg)
 	require.NoError(c.t, err)
-	require.Equal(c.t, orgId, gotID)
 
-	teamSvc := teamimpl.ProvideService(store, store.Cfg)
 	cache := localcache.ProvideService()
 	userSvc, err := userimpl.ProvideService(store,
 		orgService, store.Cfg, teamSvc, cache, quotaService,
 		supportbundlestest.NewFakeBundleService())
 	require.NoError(c.t, err)
 
+	baseUrl := fmt.Sprintf("http://%s", c.env.Server.HTTPServer.Listener.Addr())
 	createUser := func(key string, role org.RoleType) User {
 		u, err := userSvc.Create(context.Background(), &user.CreateUserCommand{
 			DefaultOrgRole: string(role),
-			Password:       key,
-			Login:          fmt.Sprintf("%s%d", key, orgId),
+			Password:       user.Password(key),
+			Login:          fmt.Sprintf("%s-%d", key, orgId),
 			OrgID:          orgId,
 		})
 		require.NoError(c.t, err)
@@ -272,9 +422,11 @@ func (c K8sTestHelper) createTestUsers(orgId int64) OrgUsers {
 		require.NoError(c.t, err)
 		require.Equal(c.t, orgId, s.OrgID)
 		require.Equal(c.t, role, s.OrgRole) // make sure the role was set properly
+
 		return User{
 			Identity: s,
 			password: key,
+			baseURL:  baseUrl,
 		}
 	}
 	return OrgUsers{
@@ -284,7 +436,60 @@ func (c K8sTestHelper) createTestUsers(orgId int64) OrgUsers {
 	}
 }
 
-func (c K8sTestHelper) CreateDS(cmd *datasources.AddDataSourceCommand) *datasources.DataSource {
+func (c *K8sTestHelper) NewDiscoveryClient() *discovery.DiscoveryClient {
+	c.t.Helper()
+
+	baseUrl := fmt.Sprintf("http://%s", c.env.Server.HTTPServer.Listener.Addr())
+	conf := &rest.Config{
+		Host:     baseUrl,
+		Username: c.Org1.Admin.Identity.GetLogin(),
+		Password: c.Org1.Admin.password,
+	}
+	client, err := discovery.NewDiscoveryClientForConfig(conf)
+	require.NoError(c.t, err)
+	return client
+}
+
+func (c *K8sTestHelper) GetGroupVersionInfoJSON(group string) string {
+	c.t.Helper()
+
+	disco := c.NewDiscoveryClient()
+	req := disco.RESTClient().Get().
+		Prefix("apis").
+		SetHeader("Accept", "application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json")
+
+	result := req.Do(context.Background())
+	require.NoError(c.t, result.Error())
+
+	type DiscoItem struct {
+		Metadata struct {
+			Name string `json:"name"`
+		} `json:"metadata"`
+		Versions []any `json:"versions,omitempty"`
+	}
+	type DiscoList struct {
+		Items []DiscoItem `json:"items"`
+	}
+
+	raw, err := result.Raw()
+	require.NoError(c.t, err)
+	all := &DiscoList{}
+	err = json.Unmarshal(raw, all)
+	require.NoError(c.t, err)
+
+	for _, item := range all.Items {
+		if item.Metadata.Name == group {
+			v, err := json.MarshalIndent(item.Versions, "", "  ")
+			require.NoError(c.t, err)
+			return string(v)
+		}
+	}
+
+	require.Fail(c.t, "could not find discovery info for: ", group)
+	return ""
+}
+
+func (c *K8sTestHelper) CreateDS(cmd *datasources.AddDataSourceCommand) *datasources.DataSource {
 	c.t.Helper()
 
 	dataSource, err := c.env.Server.HTTPServer.DataSourcesService.AddDataSource(context.Background(), cmd)
diff --git a/pkg/tests/apis/playlist/playlist_test.go b/pkg/tests/apis/playlist/playlist_test.go
index 053f01a634bd0..91ec2f1d23cc1 100644
--- a/pkg/tests/apis/playlist/playlist_test.go
+++ b/pkg/tests/apis/playlist/playlist_test.go
@@ -1,45 +1,479 @@
 package playlist
 
 import (
+	"cmp"
+	"context"
+	"encoding/json"
+	"net/http"
+	"slices"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/playlist"
 	"github.com/grafana/grafana/pkg/tests/apis"
+	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
-func TestPlaylist(t *testing.T) {
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
+var gvr = schema.GroupVersionResource{
+	Group:    "playlist.grafana.app",
+	Version:  "v0alpha1",
+	Resource: "playlists",
+}
+
+func TestIntegrationPlaylist(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
-	helper := apis.NewK8sTestHelper(t)
-	helper.SetGroupVersionResource(
-		schema.GroupVersionResource{
-			Group:    "playlist.grafana.app",
-			Version:  "v0alpha1",
-			Resource: "playlists",
+
+	t.Run("default setup", func(t *testing.T) {
+		h := doPlaylistTests(t, apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
+			AppModeProduction:    true, // do not start extra port 6443
+			DisableAnonymous:     true,
+			EnableFeatureToggles: []string{},
+		}))
+
+		// The accepted verbs will change when dual write is enabled
+		disco := h.GetGroupVersionInfoJSON("playlist.grafana.app")
+		// fmt.Printf("%s", string(disco))
+		require.JSONEq(t, `[
+			{
+			  "version": "v0alpha1",
+			  "freshness": "Current",
+			  "resources": [
+				{
+				  "resource": "playlists",
+				  "responseKind": {
+					"group": "",
+					"kind": "Playlist",
+					"version": ""
+				  },
+				  "scope": "Namespaced",
+				  "singularResource": "playlist",
+				  "verbs": [
+					"create",
+					"delete",
+					"get",
+					"list",
+					"patch",
+					"update"
+				  ]
+				}
+			  ]
+			}
+		  ]`, disco)
+	})
+
+	t.Run("with k8s api flag", func(t *testing.T) {
+		doPlaylistTests(t, apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
+			AppModeProduction: true, // do not start extra port 6443
+			DisableAnonymous:  true,
+			EnableFeatureToggles: []string{
+				featuremgmt.FlagKubernetesPlaylists, // <<< The change we are testing!
+			},
+		}))
+	})
+
+	t.Run("with dual write (file)", func(t *testing.T) {
+		doPlaylistTests(t, apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
+			AppModeProduction:    true,
+			DisableAnonymous:     true,
+			APIServerStorageType: "file", // write the files to disk
+			EnableFeatureToggles: []string{
+				featuremgmt.FlagKubernetesPlaylists, // Required so that legacy calls are also written
+			},
+		}))
+	})
+
+	t.Run("with dual write (unified storage)", func(t *testing.T) {
+		doPlaylistTests(t, apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
+			AppModeProduction:    false, // required for  unified storage
+			DisableAnonymous:     true,
+			APIServerStorageType: "unified", // use the entity api tables
+			EnableFeatureToggles: []string{
+				featuremgmt.FlagUnifiedStorage,
+				featuremgmt.FlagKubernetesPlaylists, // Required so that legacy calls are also written
+			},
+		}))
+	})
+
+	t.Run("with dual write (etcd)", func(t *testing.T) {
+		// NOTE: running local etcd, that will be wiped clean!
+		t.Skip("local etcd testing")
+
+		helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
+			AppModeProduction:    true,
+			DisableAnonymous:     true,
+			APIServerStorageType: "etcd", // requires etcd running on localhost:2379
+			EnableFeatureToggles: []string{
+				featuremgmt.FlagKubernetesPlaylists, // Required so that legacy calls are also written
+			},
+		})
+
+		// Clear the collection before starting (etcd)
+		client := helper.GetResourceClient(apis.ResourceClientArgs{
+			User: helper.Org1.Admin,
+			GVR:  gvr,
 		})
+		err := client.Resource.DeleteCollection(context.Background(), metav1.DeleteOptions{}, metav1.ListOptions{})
+		require.NoError(t, err)
 
-	t.Run("Check List from different org users", func(t *testing.T) {
+		doPlaylistTests(t, helper)
+	})
+}
+
+func doPlaylistTests(t *testing.T, helper *apis.K8sTestHelper) *apis.K8sTestHelper {
+	t.Run("Check direct List permissions from different org users", func(t *testing.T) {
 		// Check view permissions
-		rsp := helper.List(helper.Org1.Viewer, "default")
+		rsp := helper.List(helper.Org1.Viewer, "default", gvr)
 		require.Equal(t, 200, rsp.Response.StatusCode)
 		require.NotNil(t, rsp.Result)
 		require.Empty(t, rsp.Result.Items)
 		require.Nil(t, rsp.Status)
 
 		// Check view permissions
-		rsp = helper.List(helper.Org2.Viewer, "default")
-		require.Equal(t, 403, rsp.Response.StatusCode) // Org2 can not see default namespace
+		rsp = helper.List(helper.OrgB.Viewer, "default", gvr)
+		require.Equal(t, 403, rsp.Response.StatusCode) // OrgB can not see default namespace
 		require.Nil(t, rsp.Result)
 		require.Equal(t, metav1.StatusReasonForbidden, rsp.Status.Reason)
 
 		// Check view permissions
-		rsp = helper.List(helper.Org2.Viewer, "org-22")
+		rsp = helper.List(helper.OrgB.Viewer, "org-22", gvr)
 		require.Equal(t, 403, rsp.Response.StatusCode) // Unknown/not a member
 		require.Nil(t, rsp.Result)
 		require.Equal(t, metav1.StatusReasonForbidden, rsp.Status.Reason)
 	})
+
+	t.Run("Check k8s client-go List from different org users", func(t *testing.T) {
+		// Check Org1 Viewer
+		client := helper.GetResourceClient(apis.ResourceClientArgs{
+			User:      helper.Org1.Viewer,
+			Namespace: "", // << fills in the value org1 is allowed to see!
+			GVR:       gvr,
+		})
+		rsp, err := client.Resource.List(context.Background(), metav1.ListOptions{})
+		require.NoError(t, err)
+		require.Empty(t, rsp.Items)
+
+		// Check org2 viewer can not see org1 (default namespace)
+		client = helper.GetResourceClient(apis.ResourceClientArgs{
+			User:      helper.OrgB.Viewer,
+			Namespace: "default", // actually org1
+			GVR:       gvr,
+		})
+		rsp, err = client.Resource.List(context.Background(), metav1.ListOptions{})
+		statusError := helper.AsStatusError(err)
+		require.Nil(t, rsp)
+		require.Equal(t, metav1.StatusReasonForbidden, statusError.Status().Reason)
+
+		// Check invalid namespace
+		client = helper.GetResourceClient(apis.ResourceClientArgs{
+			User:      helper.OrgB.Viewer,
+			Namespace: "org-22", // org 22 does not exist
+			GVR:       gvr,
+		})
+		rsp, err = client.Resource.List(context.Background(), metav1.ListOptions{})
+		statusError = helper.AsStatusError(err)
+		require.Nil(t, rsp)
+		require.Equal(t, metav1.StatusReasonForbidden, statusError.Status().Reason)
+	})
+
+	t.Run("Check playlist CRUD in legacy API appears in k8s apis", func(t *testing.T) {
+		client := helper.GetResourceClient(apis.ResourceClientArgs{
+			User: helper.Org1.Editor,
+			GVR:  gvr,
+		})
+
+		// This includes the raw dashboard values that are currently sent (but should not be and are ignored)
+		legacyPayload := `{
+			"name": "Test",
+			"interval": "20s",
+			"items": [
+			  {
+				"type": "dashboard_by_uid",
+				"value": "xCmMwXdVz",
+				"dashboards": [
+				  {
+					"name": "The dashboard",
+					"kind": "dashboard",
+					"uid": "xCmMwXdVz",
+					"url": "/d/xCmMwXdVz/barchart-label-rotation-and-skipping",
+					"tags": ["barchart", "gdev", "graph-ng", "panel-tests"],
+					"location": "d1de6240-fd2e-4e13-99b6-f9d0c6b0550d"
+				  }
+				]
+			  },
+			  {
+				"type": "dashboard_by_tag",
+				"value": "graph-ng",
+				"dashboards": [ "..." ]
+			  }
+			],
+			"uid": ""
+		  }`
+		legacyCreate := apis.DoRequest(helper, apis.RequestParams{
+			User:   client.Args.User,
+			Method: http.MethodPost,
+			Path:   "/api/playlists",
+			Body:   []byte(legacyPayload),
+		}, &playlist.Playlist{})
+		require.NotNil(t, legacyCreate.Result)
+		uid := legacyCreate.Result.UID
+		require.NotEmpty(t, uid)
+
+		expectedResult := `{
+			"apiVersion": "playlist.grafana.app/v0alpha1",
+			"kind": "Playlist",
+			"metadata": {
+			  "annotations": {
+				"grafana.app/originKey": "${originKey}",
+				"grafana.app/originName": "SQL",
+				"grafana.app/updatedTimestamp": "${updatedTimestamp}"
+			  },
+			  "creationTimestamp": "${creationTimestamp}",
+			  "name": "` + uid + `",
+			  "namespace": "default",
+			  "resourceVersion": "${resourceVersion}",
+			  "uid": "${uid}"
+			},
+			"spec": {
+			  "interval": "20s",
+			  "items": [
+				{
+				  "type": "dashboard_by_uid",
+				  "value": "xCmMwXdVz"
+				},
+				{
+				  "type": "dashboard_by_tag",
+				  "value": "graph-ng"
+				}
+			  ],
+			  "title": "Test"
+			}
+		  }`
+
+		// List includes the expected result
+		k8sList, err := client.Resource.List(context.Background(), metav1.ListOptions{})
+		require.NoError(t, err)
+		require.Equal(t, 1, len(k8sList.Items))
+		require.JSONEq(t, expectedResult, client.SanitizeJSON(&k8sList.Items[0]))
+
+		// Get should return the same result
+		found, err := client.Resource.Get(context.Background(), uid, metav1.GetOptions{})
+		require.NoError(t, err)
+		require.JSONEq(t, expectedResult, client.SanitizeJSON(found))
+
+		// Now modify the interval
+		updatedInterval := `"interval": "10m"`
+		legacyPayload = strings.Replace(legacyPayload, `"interval": "20s"`, updatedInterval, 1)
+		expectedResult = strings.Replace(expectedResult, `"interval": "20s"`, updatedInterval, 1)
+		dtoResponse := apis.DoRequest(helper, apis.RequestParams{
+			User:   client.Args.User,
+			Method: http.MethodPut,
+			Path:   "/api/playlists/" + uid,
+			Body:   []byte(legacyPayload),
+		}, &playlist.PlaylistDTO{})
+		require.Equal(t, 200, dtoResponse.Response.StatusCode)
+		require.Equal(t, uid, dtoResponse.Result.Uid)
+		require.Equal(t, "10m", dtoResponse.Result.Interval)
+
+		// Make sure the changed interval is now returned from k8s
+		found, err = client.Resource.Get(context.Background(), uid, metav1.GetOptions{})
+		require.NoError(t, err)
+		require.JSONEq(t, expectedResult, client.SanitizeJSON(found))
+
+		// Delete does not return anything
+		deleteResponse := apis.DoRequest(helper, apis.RequestParams{
+			User:   client.Args.User,
+			Method: http.MethodDelete,
+			Path:   "/api/playlists/" + uid,
+			Body:   []byte(legacyPayload),
+		}, &playlist.PlaylistDTO{}) // response is empty
+		require.Equal(t, 200, deleteResponse.Response.StatusCode)
+
+		found, err = client.Resource.Get(context.Background(), uid, metav1.GetOptions{})
+		statusError := helper.AsStatusError(err)
+		require.Nil(t, found)
+		require.Equal(t, metav1.StatusReasonNotFound, statusError.Status().Reason)
+	})
+
+	t.Run("Do CRUD via k8s (and check that legacy api still works)", func(t *testing.T) {
+		client := helper.GetResourceClient(apis.ResourceClientArgs{
+			User: helper.Org1.Editor,
+			GVR:  gvr,
+		})
+
+		// Create the playlist "test"
+		first, err := client.Resource.Create(context.Background(),
+			helper.LoadYAMLOrJSONFile("testdata/playlist-test-create.yaml"),
+			metav1.CreateOptions{},
+		)
+		require.NoError(t, err)
+		require.Equal(t, "test", first.GetName())
+		uids := []string{first.GetName()}
+
+		// Create (with name generation) two playlists
+		for i := 0; i < 2; i++ {
+			out, err := client.Resource.Create(context.Background(),
+				helper.LoadYAMLOrJSONFile("testdata/playlist-generate.yaml"),
+				metav1.CreateOptions{},
+			)
+			require.NoError(t, err)
+			uids = append(uids, out.GetName())
+		}
+		slices.Sort(uids) // make list compare stable
+
+		// Check that everything is returned from the List command
+		list, err := client.Resource.List(context.Background(), metav1.ListOptions{})
+		require.NoError(t, err)
+		require.Equal(t, uids, SortSlice(Map(list.Items, func(item unstructured.Unstructured) string {
+			return item.GetName()
+		})))
+
+		// The legacy endpoint has the same results
+		searchResponse := apis.DoRequest(helper, apis.RequestParams{
+			User:   client.Args.User,
+			Method: http.MethodGet,
+			Path:   "/api/playlists",
+		}, &playlist.Playlists{})
+		require.NotNil(t, searchResponse.Result)
+		require.Equal(t, uids, SortSlice(Map(*searchResponse.Result, func(item *playlist.Playlist) string {
+			return item.UID
+		})))
+
+		// Check all playlists
+		for _, uid := range uids {
+			getFromBothAPIs(t, helper, client, uid, nil)
+		}
+
+		// PUT :: Update the title (full payload)
+		updated, err := client.Resource.Update(context.Background(),
+			helper.LoadYAMLOrJSONFile("testdata/playlist-test-replace.yaml"),
+			metav1.UpdateOptions{},
+		)
+		require.NoError(t, err)
+		require.Equal(t, first.GetName(), updated.GetName())
+		require.Equal(t, first.GetUID(), updated.GetUID())
+		require.Less(t, first.GetResourceVersion(), updated.GetResourceVersion())
+		out := getFromBothAPIs(t, helper, client, "test", &playlist.PlaylistDTO{
+			Name:     "Test playlist (replaced from k8s; 22m; 1 items; PUT)",
+			Interval: "22m",
+		})
+		require.Equal(t, updated.GetResourceVersion(), out.GetResourceVersion())
+
+		// PATCH :: apply only some fields
+		updated, err = client.Resource.Apply(context.Background(), "test",
+			helper.LoadYAMLOrJSONFile("testdata/playlist-test-apply.yaml"),
+			metav1.ApplyOptions{
+				Force:        true,
+				FieldManager: "testing",
+			},
+		)
+		require.NoError(t, err)
+		require.Equal(t, first.GetName(), updated.GetName())
+		require.Equal(t, first.GetUID(), updated.GetUID())
+		require.Less(t, first.GetResourceVersion(), updated.GetResourceVersion())
+		getFromBothAPIs(t, helper, client, "test", &playlist.PlaylistDTO{
+			Name:     "Test playlist (apply from k8s; ??m; ?? items; PATCH)",
+			Interval: "22m", // has not changed from previous update
+		})
+
+		// Now delete all playlist (three)
+		for _, uid := range uids {
+			err := client.Resource.Delete(context.Background(), uid, metav1.DeleteOptions{})
+			require.NoError(t, err)
+
+			// Second call is not found!
+			err = client.Resource.Delete(context.Background(), uid, metav1.DeleteOptions{})
+			statusError := helper.AsStatusError(err)
+			require.Equal(t, metav1.StatusReasonNotFound, statusError.Status().Reason)
+
+			// Not found from k8s getter
+			_, err = client.Resource.Get(context.Background(), uid, metav1.GetOptions{})
+			statusError = helper.AsStatusError(err)
+			require.Equal(t, metav1.StatusReasonNotFound, statusError.Status().Reason)
+		}
+
+		// Check that they are all gone
+		list, err = client.Resource.List(context.Background(), metav1.ListOptions{})
+		require.NoError(t, err)
+		require.Empty(t, list.Items)
+	})
+
+	return helper
+}
+
+// typescript style map function
+func Map[A any, B any](input []A, m func(A) B) []B {
+	output := make([]B, len(input))
+	for i, element := range input {
+		output[i] = m(element)
+	}
+	return output
+}
+
+func SortSlice[A cmp.Ordered](input []A) []A {
+	slices.Sort(input)
+	return input
+}
+
+// This does a get with both k8s and legacy API, and verifies the results are the same
+func getFromBothAPIs(t *testing.T,
+	helper *apis.K8sTestHelper,
+	client *apis.K8sResourceClient,
+	uid string,
+	// Optionally match some expect some values
+	expect *playlist.PlaylistDTO,
+) *unstructured.Unstructured {
+	t.Helper()
+
+	found, err := client.Resource.Get(context.Background(), uid, metav1.GetOptions{})
+	require.NoError(t, err)
+	require.Equal(t, uid, found.GetName())
+
+	dto := apis.DoRequest(helper, apis.RequestParams{
+		User:   client.Args.User,
+		Method: http.MethodGet,
+		Path:   "/api/playlists/" + uid,
+	}, &playlist.PlaylistDTO{}).Result
+	require.NotNil(t, dto)
+	require.Equal(t, uid, dto.Uid)
+
+	spec, ok := found.Object["spec"].(map[string]any)
+	require.True(t, ok)
+	require.Equal(t, dto.Uid, found.GetName())
+	require.Equal(t, dto.Name, spec["title"])
+	require.Equal(t, dto.Interval, spec["interval"])
+
+	a, errA := json.Marshal(spec["items"])
+	b, errB := json.Marshal(dto.Items)
+	require.NoError(t, errA)
+	require.NoError(t, errB)
+	require.JSONEq(t, string(a), string(b))
+
+	if expect != nil {
+		if expect.Name != "" {
+			require.Equal(t, expect.Name, dto.Name)
+			require.Equal(t, expect.Name, spec["title"])
+		}
+		if expect.Interval != "" {
+			require.Equal(t, expect.Interval, dto.Interval)
+			require.Equal(t, expect.Interval, spec["interval"])
+		}
+		if expect.Uid != "" {
+			require.Equal(t, expect.Uid, dto.Uid)
+			require.Equal(t, expect.Uid, found.GetName())
+		}
+	}
+	return found
 }
diff --git a/pkg/tests/apis/playlist/testdata/playlist-generate.yaml b/pkg/tests/apis/playlist/testdata/playlist-generate.yaml
new file mode 100644
index 0000000000000..07dbe1efe320e
--- /dev/null
+++ b/pkg/tests/apis/playlist/testdata/playlist-generate.yaml
@@ -0,0 +1,12 @@
+apiVersion: playlist.grafana.app/v0alpha1
+kind: Playlist
+metadata:
+  generateName: x # anything is ok here... except yes or true -- they become boolean!
+spec:
+  title: Playlist with auto generated UID
+  interval: 5m
+  items:
+  - type: dashboard_by_tag
+    value: panel-tests
+  - type: dashboard_by_uid
+    value: vmie2cmWz # dashboard from devenv
diff --git a/pkg/tests/apis/playlist/testdata/playlist-test-apply.yaml b/pkg/tests/apis/playlist/testdata/playlist-test-apply.yaml
new file mode 100644
index 0000000000000..098dc08e86ad2
--- /dev/null
+++ b/pkg/tests/apis/playlist/testdata/playlist-test-apply.yaml
@@ -0,0 +1,6 @@
+apiVersion: playlist.grafana.app/v0alpha1
+kind: Playlist
+metadata:
+  name: test
+spec:
+  title: Test playlist (apply from k8s; ??m; ?? items; PATCH)
diff --git a/pkg/tests/apis/playlist/testdata/playlist-test-create.yaml b/pkg/tests/apis/playlist/testdata/playlist-test-create.yaml
new file mode 100644
index 0000000000000..4839fa07669e7
--- /dev/null
+++ b/pkg/tests/apis/playlist/testdata/playlist-test-create.yaml
@@ -0,0 +1,12 @@
+apiVersion: playlist.grafana.app/v0alpha1
+kind: Playlist
+metadata:
+  name: test
+spec:
+  title: Test playlist (created from k8s; 2 items; POST)
+  interval: 5m
+  items:
+  - type: dashboard_by_tag
+    value: panel-tests
+  - type: dashboard_by_uid
+    value: vmie2cmWz # dashboard from devenv
diff --git a/pkg/tests/apis/playlist/testdata/playlist-test-replace.yaml b/pkg/tests/apis/playlist/testdata/playlist-test-replace.yaml
new file mode 100644
index 0000000000000..1984ef2c1dfde
--- /dev/null
+++ b/pkg/tests/apis/playlist/testdata/playlist-test-replace.yaml
@@ -0,0 +1,10 @@
+apiVersion: playlist.grafana.app/v0alpha1
+kind: Playlist
+metadata:
+  name: test
+spec:
+  title: Test playlist (replaced from k8s; 22m; 1 items; PUT)
+  interval: 22m
+  items:
+  - type: dashboard_by_tag
+    value: panel-tests
diff --git a/pkg/tests/apis/query/query_test.go b/pkg/tests/apis/query/query_test.go
new file mode 100644
index 0000000000000..b9786218a5b04
--- /dev/null
+++ b/pkg/tests/apis/query/query_test.go
@@ -0,0 +1,159 @@
+package dashboards
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"testing"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	data "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+	"github.com/stretchr/testify/require"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/tests/apis"
+	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
+)
+
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
+func TestIntegrationSimpleQuery(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+	helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
+		AppModeProduction: false, // dev mode required for datasource connections
+		EnableFeatureToggles: []string{
+			featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs, // Required to start the example service
+		},
+	})
+
+	// Create a single datasource
+	ds := helper.CreateDS(&datasources.AddDataSourceCommand{
+		Name:  "test",
+		Type:  datasources.DS_TESTDATA,
+		UID:   "test",
+		OrgID: int64(1),
+	})
+	require.Equal(t, "test", ds.UID)
+
+	t.Run("Call query with expression", func(t *testing.T) {
+		client := helper.Org1.Admin.RESTClient(t, &schema.GroupVersion{
+			Group:   "query.grafana.app",
+			Version: "v0alpha1",
+		})
+
+		body, err := json.Marshal(&data.QueryDataRequest{
+			Queries: []data.DataQuery{
+				data.NewDataQuery(map[string]any{
+					"refId": "X",
+					"datasource": data.DataSourceRef{
+						Type: "grafana-testdata-datasource",
+						UID:  ds.UID,
+					},
+					"scenarioId": "csv_content",
+					"csvContent": "a\n1",
+				}),
+				data.NewDataQuery(map[string]any{
+					"refId": "Y",
+					"datasource": data.DataSourceRef{
+						UID: "__expr__",
+					},
+					"type":       "math",
+					"expression": "$X + 2",
+				}),
+			},
+		})
+
+		//fmt.Printf("%s", string(body))
+
+		require.NoError(t, err)
+
+		result := client.Post().
+			Namespace("default").
+			Suffix("query").
+			SetHeader("Content-type", "application/json").
+			Body(body).
+			Do(context.Background())
+
+		require.NoError(t, result.Error())
+
+		contentType := "?"
+		result.ContentType(&contentType)
+		require.Equal(t, "application/json", contentType)
+
+		body, err = result.Raw()
+		require.NoError(t, err)
+		fmt.Printf("OUT: %s", string(body))
+
+		rsp := &backend.QueryDataResponse{}
+		err = json.Unmarshal(body, rsp)
+		require.NoError(t, err)
+		require.Equal(t, 2, len(rsp.Responses))
+
+		frameX := rsp.Responses["X"].Frames[0]
+		frameY := rsp.Responses["Y"].Frames[0]
+
+		vX, _ := frameX.Fields[0].ConcreteAt(0)
+		vY, _ := frameY.Fields[0].ConcreteAt(0)
+
+		require.Equal(t, int64(1), vX)
+		require.Equal(t, float64(3), vY) // 1 + 2, but always float64
+	})
+
+	t.Run("Gets an error with invalid queries", func(t *testing.T) {
+		client := helper.Org1.Admin.RESTClient(t, &schema.GroupVersion{
+			Group:   "query.grafana.app",
+			Version: "v0alpha1",
+		})
+
+		body, err := json.Marshal(&data.QueryDataRequest{
+			Queries: []data.DataQuery{
+				data.NewDataQuery(map[string]any{
+					"refId": "Y",
+					"datasource": data.DataSourceRef{
+						UID: "__expr__",
+					},
+					"type":       "math",
+					"expression": "$X + 2", // invalid X does not exit
+				}),
+			},
+		})
+		require.NoError(t, err)
+
+		result := client.Post().
+			Namespace("default").
+			Suffix("query").
+			SetHeader("Content-type", "application/json").
+			Body(body).
+			Do(context.Background())
+
+		body, err = result.Raw()
+		//fmt.Printf("OUT: %s", string(body))
+
+		require.Error(t, err, "expecting a 400")
+		require.JSONEq(t, `{
+			"status": "Failure",
+			"metadata": {},
+			"message": "did not execute expression [Y] due to a failure to of the dependent expression or query [X]",
+			"reason": "BadRequest",
+			"details": { "group": "query.grafana.app" },
+			"code": 400,
+			"messageId": "sse.dependencyError",
+			"extra": { "depRefId": "X", "refId": "Y" }
+		  }`, string(body))
+
+		statusCode := -1
+		contentType := "?"
+		result.ContentType(&contentType)
+		result.StatusCode(&statusCode)
+		require.Equal(t, "application/json", contentType)
+		require.Equal(t, http.StatusBadRequest, statusCode)
+	})
+}
diff --git a/pkg/tests/apis/scopes/scopes_test.go b/pkg/tests/apis/scopes/scopes_test.go
new file mode 100644
index 0000000000000..caaa02f89a3d8
--- /dev/null
+++ b/pkg/tests/apis/scopes/scopes_test.go
@@ -0,0 +1,155 @@
+package playlist
+
+import (
+	"context"
+	"encoding/json"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/tests/apis"
+	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
+)
+
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
+func TestIntegrationScopes(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	ctx := context.Background()
+	helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
+		AppModeProduction: false, // required for experimental APIs
+		EnableFeatureToggles: []string{
+			featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs, // Required to start the example service
+		},
+	})
+
+	t.Run("Check discovery client", func(t *testing.T) {
+		disco := helper.NewDiscoveryClient()
+		resources, err := disco.ServerResourcesForGroupVersion("scope.grafana.app/v0alpha1")
+		require.NoError(t, err)
+
+		v1Disco, err := json.MarshalIndent(resources, "", "  ")
+		require.NoError(t, err)
+
+		require.JSONEq(t, `{
+			"kind": "APIResourceList",
+			"apiVersion": "v1",
+			"groupVersion": "scope.grafana.app/v0alpha1",
+			"resources": [
+			  {
+				"name": "scopedashboardbindings",
+				"singularName": "scopedashboardbinding",
+				"namespaced": true,
+				"kind": "ScopeDashboardBinding",
+				"verbs": [
+				  "create",
+				  "delete",
+				  "deletecollection",
+				  "get",
+				  "list",
+				  "patch",
+				  "update",
+				  "watch"
+				]
+			  },
+			  {
+				"name": "scopes",
+				"singularName": "scope",
+				"namespaced": true,
+				"kind": "Scope",
+				"verbs": [
+				  "create",
+				  "delete",
+				  "deletecollection",
+				  "get",
+				  "list",
+				  "patch",
+				  "update",
+				  "watch"
+				]
+			  }
+			]
+		  }`, string(v1Disco))
+	})
+
+	t.Run("Check create and list", func(t *testing.T) {
+		// Scope create+get
+		scopeClient := helper.GetResourceClient(apis.ResourceClientArgs{
+			User:      helper.Org1.Admin,
+			Namespace: "default", // actually org1
+			GVR: schema.GroupVersionResource{
+				Group: "scope.grafana.app", Version: "v0alpha1", Resource: "scopes",
+			},
+		})
+		createOptions := metav1.CreateOptions{FieldValidation: "Strict"}
+
+		s0, err := scopeClient.Resource.Create(ctx,
+			helper.LoadYAMLOrJSONFile("testdata/example-scope.yaml"),
+			createOptions,
+		)
+
+		require.NoError(t, err)
+		require.Equal(t, "example", s0.GetName())
+		s1, err := scopeClient.Resource.Get(ctx, "example", metav1.GetOptions{})
+		require.NoError(t, err)
+		require.Equal(t,
+			mustNestedString(s0.Object, "spec", "title"),
+			mustNestedString(s1.Object, "spec", "title"),
+		)
+
+		_, err = scopeClient.Resource.Create(ctx,
+			helper.LoadYAMLOrJSONFile("testdata/example-scope2.yaml"),
+			createOptions,
+		)
+		require.NoError(t, err)
+
+		// Field Selector test
+		found, err := scopeClient.Resource.List(ctx, metav1.ListOptions{
+			FieldSelector: "spec.category=fun",
+		})
+		require.NoError(t, err)
+		require.Len(t, found.Items, 1)
+		require.Equal(t,
+			"example2",
+			mustNestedString(found.Items[0].Object, "metadata", "name"),
+		)
+
+		// Create bindings
+		scopeDashboardBindingClient := helper.GetResourceClient(apis.ResourceClientArgs{
+			User:      helper.Org1.Admin,
+			Namespace: "default", // actually org1
+			GVR: schema.GroupVersionResource{
+				Group: "scope.grafana.app", Version: "v0alpha1", Resource: "scopedashboardbindings",
+			},
+		})
+		_, err = scopeDashboardBindingClient.Resource.Create(ctx,
+			helper.LoadYAMLOrJSONFile("testdata/example-scope-dashboard-binding-abc.yaml"),
+			createOptions,
+		)
+		require.NoError(t, err)
+		_, err = scopeDashboardBindingClient.Resource.Create(ctx,
+			helper.LoadYAMLOrJSONFile("testdata/example-scope-dashboard-binding-xyz.yaml"),
+			createOptions,
+		)
+		require.NoError(t, err)
+
+		found, err = scopeDashboardBindingClient.Resource.List(ctx, metav1.ListOptions{})
+		require.NoError(t, err)
+		require.Len(t, found.Items, 2)
+	})
+}
+
+func mustNestedString(obj map[string]interface{}, fields ...string) string {
+	v, _, _ := unstructured.NestedString(obj, fields...)
+	return v
+}
diff --git a/pkg/tests/apis/scopes/testdata/example-scope-dashboard-binding-abc.yaml b/pkg/tests/apis/scopes/testdata/example-scope-dashboard-binding-abc.yaml
new file mode 100644
index 0000000000000..be175b5613b16
--- /dev/null
+++ b/pkg/tests/apis/scopes/testdata/example-scope-dashboard-binding-abc.yaml
@@ -0,0 +1,7 @@
+apiVersion: scope.grafana.app/v0alpha1
+kind: ScopeDashboardBinding
+metadata:
+  name: example_abc
+spec:
+    scope: example
+    dashboard: abc
\ No newline at end of file
diff --git a/pkg/tests/apis/scopes/testdata/example-scope-dashboard-binding-xyz.yaml b/pkg/tests/apis/scopes/testdata/example-scope-dashboard-binding-xyz.yaml
new file mode 100644
index 0000000000000..98cfa8ed93ff1
--- /dev/null
+++ b/pkg/tests/apis/scopes/testdata/example-scope-dashboard-binding-xyz.yaml
@@ -0,0 +1,7 @@
+apiVersion: scope.grafana.app/v0alpha1
+kind: ScopeDashboardBinding
+metadata:
+  name: example_xyz
+spec:
+    scope: example
+    dashboard: xyz
\ No newline at end of file
diff --git a/pkg/tests/apis/scopes/testdata/example-scope.yaml b/pkg/tests/apis/scopes/testdata/example-scope.yaml
new file mode 100644
index 0000000000000..4adaf8fde715b
--- /dev/null
+++ b/pkg/tests/apis/scopes/testdata/example-scope.yaml
@@ -0,0 +1,16 @@
+apiVersion: scope.grafana.app/v0alpha1
+kind: Scope
+metadata:
+  name: example
+spec:
+    title: Example scope
+    description: Longer description for a scope
+    category: should this be an enum or an external reference?
+    type: should this be an enum or an external reference?
+    filters: 
+      - key: aaa
+        operator: equals
+        value: bbb
+      - key: ccc
+        operator: not-equals
+        value: ddd
diff --git a/pkg/tests/apis/scopes/testdata/example-scope2.yaml b/pkg/tests/apis/scopes/testdata/example-scope2.yaml
new file mode 100644
index 0000000000000..951bf889c9327
--- /dev/null
+++ b/pkg/tests/apis/scopes/testdata/example-scope2.yaml
@@ -0,0 +1,16 @@
+apiVersion: scope.grafana.app/v0alpha1
+kind: Scope
+metadata:
+  name: example2
+spec:
+    title: Example scope 2
+    description: Longer description for a scope
+    category: fun
+    type: should this be an enum or an external reference?
+    filters: 
+      - key: aaa
+        operator: equals
+        value: zzz
+      - key: ccc
+        operator: not-equals
+        value: yyy
diff --git a/pkg/tests/apis/types.go b/pkg/tests/apis/types.go
index b405de90cd711..5c8a24563c21c 100644
--- a/pkg/tests/apis/types.go
+++ b/pkg/tests/apis/types.go
@@ -1,12 +1,7 @@
 package apis
 
 import (
-	"encoding/json"
-	"os"
-
-	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"sigs.k8s.io/yaml"
 )
 
 type AnyResource struct {
@@ -24,22 +19,3 @@ type AnyResourceList struct {
 
 	Items []map[string]any `json:"items,omitempty"`
 }
-
-// Read local JSON or YAML file into a resource
-func (c *K8sTestHelper) LoadAnyResource(fpath string) AnyResource {
-	c.t.Helper()
-
-	//nolint:gosec
-	raw, err := os.ReadFile(fpath)
-	require.NoError(c.t, err)
-	require.NotEmpty(c.t, raw)
-
-	res := &AnyResource{}
-	if json.Valid(raw) {
-		err = json.Unmarshal(raw, res)
-	} else {
-		err = yaml.Unmarshal(raw, res)
-	}
-	require.NoError(c.t, err)
-	return *res
-}
diff --git a/pkg/tests/testinfra/testinfra.go b/pkg/tests/testinfra/testinfra.go
index 33cdcb4325bd7..d2b920bfd11e7 100644
--- a/pkg/tests/testinfra/testinfra.go
+++ b/pkg/tests/testinfra/testinfra.go
@@ -50,9 +50,8 @@ func StartGrafanaEnv(t *testing.T, grafDir, cfgPath string) (string, *server.Tes
 	serverOpts := server.Options{Listener: listener, HomePath: grafDir}
 	apiServerOpts := api.ServerOptions{Listener: listener}
 
-	env, err := server.InitializeForTest(cfg, serverOpts, apiServerOpts)
+	env, err := server.InitializeForTest(t, cfg, serverOpts, apiServerOpts)
 	require.NoError(t, err)
-	require.NoError(t, env.SQLStore.Sync())
 
 	require.NotNil(t, env.SQLStore.Cfg)
 	dbSec, err := env.SQLStore.Cfg.Raw.GetSection("database")
@@ -99,21 +98,6 @@ func StartGrafanaEnv(t *testing.T, grafDir, cfgPath string) (string, *server.Tes
 	return addr, env
 }
 
-// SetUpDatabase sets up the Grafana database.
-func SetUpDatabase(t *testing.T, grafDir string) *sqlstore.SQLStore {
-	t.Helper()
-
-	sqlStore := db.InitTestDB(t, sqlstore.InitTestDBOpt{
-		EnsureDefaultOrgAndUser: true,
-	})
-
-	// Make sure changes are synced with other goroutines
-	err := sqlStore.Sync()
-	require.NoError(t, err)
-
-	return sqlStore
-}
-
 // CreateGrafDir creates the Grafana directory.
 // The log by default is muted in the regression test, to activate it, pass option EnableLog = true
 func CreateGrafDir(t *testing.T, opts ...GrafanaOpts) (string, string) {
@@ -154,17 +138,41 @@ func CreateGrafDir(t *testing.T, opts ...GrafanaOpts) (string, string) {
 	publicDir := filepath.Join(tmpDir, "public")
 	err = os.MkdirAll(publicDir, 0750)
 	require.NoError(t, err)
+
 	viewsDir := filepath.Join(publicDir, "views")
 	err = fs.CopyRecursive(filepath.Join(rootDir, "public", "views"), viewsDir)
 	require.NoError(t, err)
-	// Copy index template to index.html, since Grafana will try to use the latter
-	err = fs.CopyFile(filepath.Join(rootDir, "public", "views", "index-template.html"),
-		filepath.Join(viewsDir, "index.html"))
+
+	// add a stub manifest to the build directory
+	buildDir := filepath.Join(publicDir, "build")
+	err = os.MkdirAll(buildDir, 0750)
 	require.NoError(t, err)
-	// Copy error template to error.html, since Grafana will try to use the latter
-	err = fs.CopyFile(filepath.Join(rootDir, "public", "views", "error-template.html"),
-		filepath.Join(viewsDir, "error.html"))
+	err = os.WriteFile(filepath.Join(buildDir, "assets-manifest.json"), []byte(`{
+		"entrypoints": {
+		  "app": {
+			"assets": {
+			  "js": ["public/build/runtime.XYZ.js"]
+			}
+		  },
+		  "dark": {
+			"assets": {
+			  "css": ["public/build/dark.css"]
+			}
+		  },
+		  "light": {
+			"assets": {
+			  "css": ["public/build/light.css"]
+			}
+		  }
+		},
+		"runtime.50398398ecdeaf58968c.js": {
+		  "src": "public/build/runtime.XYZ.js",
+		  "integrity": "sha256-k1g7TksMHFQhhQGE"
+		}
+	  }
+	  `), 0750)
 	require.NoError(t, err)
+
 	emailsDir := filepath.Join(publicDir, "emails")
 	err = fs.CopyRecursive(filepath.Join(rootDir, "public", "emails"), emailsDir)
 	require.NoError(t, err)
@@ -311,12 +319,6 @@ func CreateGrafDir(t *testing.T, opts ...GrafanaOpts) (string, string) {
 			_, err = usersSection.NewKey("viewers_can_edit", "true")
 			require.NoError(t, err)
 		}
-		if o.DisableLegacyAlerting {
-			alertingSection, err := cfg.GetSection("alerting")
-			require.NoError(t, err)
-			_, err = alertingSection.NewKey("enabled", "false")
-			require.NoError(t, err)
-		}
 		if o.EnableUnifiedAlerting {
 			unifiedAlertingSection, err := getOrCreateSection("unified_alerting")
 			require.NoError(t, err)
@@ -342,6 +344,19 @@ func CreateGrafDir(t *testing.T, opts ...GrafanaOpts) (string, string) {
 			require.NoError(t, err)
 		}
 
+		if o.APIServerStorageType != "" {
+			section, err := getOrCreateSection("grafana-apiserver")
+			require.NoError(t, err)
+			_, err = section.NewKey("storage_type", o.APIServerStorageType)
+			require.NoError(t, err)
+
+			// Hardcoded local etcd until this is needed to run in CI
+			if o.APIServerStorageType == "etcd" {
+				_, err = section.NewKey("etcd_servers", "localhost:2379")
+				require.NoError(t, err)
+			}
+		}
+
 		if o.GRPCServerAddress != "" {
 			logSection, err := getOrCreateSection("grpc_server")
 			require.NoError(t, err)
@@ -357,6 +372,15 @@ func CreateGrafDir(t *testing.T, opts ...GrafanaOpts) (string, string) {
 		require.NoError(t, err)
 		_, err = logSection.NewKey("query_retries", fmt.Sprintf("%d", queryRetries))
 		require.NoError(t, err)
+
+		if o.NGAlertSchedulerBaseInterval > 0 {
+			unifiedAlertingSection, err := getOrCreateSection("unified_alerting")
+			require.NoError(t, err)
+			_, err = unifiedAlertingSection.NewKey("scheduler_tick_interval", o.NGAlertSchedulerBaseInterval.String())
+			require.NoError(t, err)
+			_, err = unifiedAlertingSection.NewKey("min_interval", o.NGAlertSchedulerBaseInterval.String())
+			require.NoError(t, err)
+		}
 	}
 
 	cfgPath := filepath.Join(cfgDir, "test.ini")
@@ -382,6 +406,7 @@ type GrafanaOpts struct {
 	EnableFeatureToggles                  []string
 	NGAlertAdminConfigPollInterval        time.Duration
 	NGAlertAlertmanagerConfigPollInterval time.Duration
+	NGAlertSchedulerBaseInterval          time.Duration
 	AnonymousUserRole                     org.RoleType
 	EnableQuota                           bool
 	DashboardOrgQuota                     *int64
@@ -397,6 +422,7 @@ type GrafanaOpts struct {
 	EnableLog                             bool
 	GRPCServerAddress                     string
 	QueryRetries                          int64
+	APIServerStorageType                  string
 }
 
 func CreateUser(t *testing.T, store *sqlstore.SQLStore, cmd user.CreateUserCommand) *user.User {
diff --git a/pkg/tests/testsuite/testsuite.go b/pkg/tests/testsuite/testsuite.go
new file mode 100644
index 0000000000000..87ce57eaa15d7
--- /dev/null
+++ b/pkg/tests/testsuite/testsuite.go
@@ -0,0 +1,15 @@
+package testsuite
+
+import (
+	"os"
+	"testing"
+
+	"github.com/grafana/grafana/pkg/infra/db"
+)
+
+func Run(m *testing.M) {
+	db.SetupTestDB()
+	code := m.Run()
+	db.CleanupTestDB()
+	os.Exit(code)
+}
diff --git a/pkg/tests/utils.go b/pkg/tests/utils.go
new file mode 100644
index 0000000000000..47f85298738ee
--- /dev/null
+++ b/pkg/tests/utils.go
@@ -0,0 +1,88 @@
+package tests
+
+import (
+	"context"
+	"crypto/tls"
+	"net/url"
+	"os"
+	"testing"
+
+	"github.com/go-openapi/strfmt"
+	goapi "github.com/grafana/grafana-openapi-client-go/client"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/resourcepermissions"
+	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/services/org/orgimpl"
+	"github.com/grafana/grafana/pkg/services/quota/quotaimpl"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/services/user/userimpl"
+	"github.com/stretchr/testify/require"
+)
+
+func CreateUser(t *testing.T, store *sqlstore.SQLStore, cmd user.CreateUserCommand) int64 {
+	t.Helper()
+
+	store.Cfg.AutoAssignOrg = true
+	store.Cfg.AutoAssignOrgId = 1
+
+	quotaService := quotaimpl.ProvideService(store, store.Cfg)
+	orgService, err := orgimpl.ProvideService(store, store.Cfg, quotaService)
+	require.NoError(t, err)
+	usrSvc, err := userimpl.ProvideService(store, orgService, store.Cfg, nil, nil, quotaService, supportbundlestest.NewFakeBundleService())
+	require.NoError(t, err)
+
+	u, err := usrSvc.Create(context.Background(), &cmd)
+	require.NoError(t, err)
+	return u.ID
+}
+
+func GetClient(host string, username string, password string) *goapi.GrafanaHTTPAPI {
+	cfg := &goapi.TransportConfig{
+		// Host is the doman name or IP address of the host that serves the API.
+		Host: host,
+		// BasePath is the URL prefix for all API paths, relative to the host root.
+		BasePath: "/api",
+		// Schemes are the transfer protocols used by the API (http or https).
+		Schemes: []string{"http"},
+		// APIKey is an optional API key or service account token.
+		APIKey: os.Getenv("API_ACCESS_TOKEN"),
+		// BasicAuth is optional basic auth credentials.
+		BasicAuth: url.UserPassword(username, password),
+		// OrgID provides an optional organization ID.
+		// OrgID is only supported with BasicAuth since API keys are already org-scoped.
+		OrgID: 1,
+		// TLSConfig provides an optional configuration for a TLS client
+		TLSConfig: &tls.Config{},
+		// NumRetries contains the optional number of attempted retries
+		NumRetries: 3,
+		// RetryTimeout sets an optional time to wait before retrying a request
+		RetryTimeout: 0,
+		// RetryStatusCodes contains the optional list of status codes to retry
+		// Use "x" as a wildcard for a single digit (default: [429, 5xx])
+		RetryStatusCodes: []string{"420", "5xx"},
+		// HTTPHeaders contains an optional map of HTTP headers to add to each request
+		HTTPHeaders: map[string]string{},
+	}
+	return goapi.NewHTTPClientWithConfig(strfmt.Default, cfg)
+}
+
+func RemoveFolderPermission(t *testing.T, store resourcepermissions.Store, orgID int64, role org.RoleType, uid string) {
+	t.Helper()
+
+	// remove org role permissions from folder
+	_, _ = store.SetBuiltInResourcePermission(context.Background(), orgID, string(role), resourcepermissions.SetResourcePermissionCommand{
+		Resource:          "folders",
+		ResourceID:        uid,
+		ResourceAttribute: "uid",
+	}, nil)
+
+	// remove org role children permissions from folder
+	for _, c := range role.Children() {
+		_, _ = store.SetBuiltInResourcePermission(context.Background(), orgID, string(c), resourcepermissions.SetResourcePermissionCommand{
+			Resource:          "folders",
+			ResourceID:        uid,
+			ResourceAttribute: "uid",
+		}, nil)
+	}
+}
diff --git a/pkg/tests/web/index_view_test.go b/pkg/tests/web/index_view_test.go
index 59240f765ce6e..330553c2638af 100644
--- a/pkg/tests/web/index_view_test.go
+++ b/pkg/tests/web/index_view_test.go
@@ -14,13 +14,18 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/services/login"
-	databaseAuthInfo "github.com/grafana/grafana/pkg/services/login/authinfoservice/database"
+	"github.com/grafana/grafana/pkg/services/login/authinfoimpl"
 	"github.com/grafana/grafana/pkg/services/secrets/database"
 	secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 // TestIntegrationIndexView tests the Grafana index view.
 func TestIntegrationIndexView(t *testing.T) {
 	if testing.Short() {
@@ -129,7 +134,7 @@ func TestIntegrationIndexViewAnalytics(t *testing.T) {
 			})
 
 			secretsService := secretsManager.SetupTestService(t, database.ProvideSecretsStore(store))
-			authInfoStore := databaseAuthInfo.ProvideAuthInfoStore(store, secretsService, nil)
+			authInfoStore := authinfoimpl.ProvideStore(store, secretsService)
 
 			// insert user_auth relationship
 			err := authInfoStore.SetAuthInfo(context.Background(), &login.SetAuthInfoCommand{
diff --git a/pkg/tsdb/Magefile.go b/pkg/tsdb/Magefile.go
index 89b3722826049..c875964a4cb89 100644
--- a/pkg/tsdb/Magefile.go
+++ b/pkg/tsdb/Magefile.go
@@ -26,8 +26,16 @@ func find(dir string, name string) ([]string, error) {
 	return files, err
 }
 
-func findPluginJSONDir(pluginDir string) (string, error) {
-	pluginJSONMatches, err := find(filepath.Join("../../public/app/plugins/datasource", pluginDir), "plugin.json")
+func fileHasString(path string, s string) bool {
+	f, err := os.ReadFile(path)
+	if err != nil {
+		return false
+	}
+	return strings.Contains(string(f), s)
+}
+
+func findPluginJSONDir(pluginID string) (string, error) {
+	pluginJSONMatches, err := filepath.Glob("../../public/app/plugins/datasource/*/plugin.json")
 	if err != nil {
 		return "", err
 	}
@@ -36,10 +44,11 @@ func findPluginJSONDir(pluginDir string) (string, error) {
 	}
 	pluginJSONPath := ""
 	for _, pluginJSONMatch := range pluginJSONMatches {
-		// Ignore dist folder
-		if filepath.Base(filepath.Dir(pluginJSONMatch)) != "dist" {
-			pluginJSONPath = pluginJSONMatch
+		if !fileHasString(pluginJSONMatch, fmt.Sprintf(`"id": "%s"`, pluginID)) {
+			continue
 		}
+		pluginJSONPath = pluginJSONMatch
+		break
 	}
 	pluginJSONPath, err = filepath.Abs(pluginJSONPath)
 	if err != nil {
@@ -48,19 +57,25 @@ func findPluginJSONDir(pluginDir string) (string, error) {
 	return filepath.Dir(pluginJSONPath), nil
 }
 
-func findRootDir(pluginDir string) (string, error) {
-	matches, err := find(pluginDir, "main.go")
+func findRootDir(pluginID string) (string, error) {
+	matches, err := find(".", "main.go")
 	if err != nil {
 		return "", err
 	}
 	if len(matches) == 0 {
 		return "", fmt.Errorf("Could not find main.go")
 	}
-	absolutePath, err := filepath.Abs(matches[0])
-	if err != nil {
-		return "", err
+	pluginDir := ""
+	for _, match := range matches {
+		if fileHasString(match, fmt.Sprintf(`datasource.Manage("%s"`, pluginID)) {
+			pluginDir = filepath.Dir(match)
+			break
+		}
 	}
-	return filepath.Dir(absolutePath), nil
+	if pluginDir == "" {
+		return "", nil
+	}
+	return filepath.Abs(pluginDir)
 }
 
 func buildPlugin(rootDir, pluginJSONDir string) {
@@ -76,44 +91,15 @@ func buildPlugin(rootDir, pluginJSONDir string) {
 	build.BuildAll()
 }
 
-func BuildPlugin(pluginDir string) error {
-	rootDir, err := findRootDir(pluginDir)
+func BuildPlugin(pluginID string) error {
+	rootDir, err := findRootDir(pluginID)
 	if err != nil {
 		return err
 	}
-	pluginJSONDir, err := findPluginJSONDir(pluginDir)
+	pluginJSONDir, err := findPluginJSONDir(pluginID)
 	if err != nil {
 		return err
 	}
 	buildPlugin(rootDir, pluginJSONDir)
 	return nil
 }
-
-func BuildAllPlugins() error {
-	// Plugins need to have a main.go file
-	matches, err := find(".", "main.go")
-	if err != nil {
-		return err
-	}
-	for _, match := range matches {
-		// Get the directory name of the plugin
-		parts := strings.Split(filepath.ToSlash(match), "/")
-		if len(parts) == 0 {
-			continue
-		}
-		pluginDir := parts[0]
-		rootDir, err := findRootDir(pluginDir)
-		if err != nil {
-			return err
-		}
-		pluginJSONDir, err := findPluginJSONDir(pluginDir)
-		if err != nil {
-			return err
-		}
-		buildPlugin(rootDir, pluginJSONDir)
-	}
-	return nil
-}
-
-// Default configures the default target.
-var Default = BuildAllPlugins
diff --git a/pkg/tsdb/azuremonitor/azmoncredentials/builder.go b/pkg/tsdb/azuremonitor/azmoncredentials/builder.go
new file mode 100644
index 0000000000000..30c98ec4915c8
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/azmoncredentials/builder.go
@@ -0,0 +1,140 @@
+package azmoncredentials
+
+import (
+	"fmt"
+
+	"github.com/grafana/grafana-azure-sdk-go/v2/azcredentials"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
+	"github.com/grafana/grafana-plugin-sdk-go/data/utils/maputil"
+)
+
+func FromDatasourceData(data map[string]interface{}, secureData map[string]string) (azcredentials.AzureCredentials, error) {
+	var credentials azcredentials.AzureCredentials
+	var err error
+
+	credentials, err = azcredentials.FromDatasourceData(data, secureData)
+	if err != nil {
+		return nil, err
+	}
+
+	// Fallback to legacy credentials format
+	if credentials == nil {
+		credentials, err = getFromLegacy(data, secureData)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return credentials, err
+}
+
+func getFromLegacy(data map[string]interface{}, secureData map[string]string) (azcredentials.AzureCredentials, error) {
+	authType, err := maputil.GetStringOptional(data, "azureAuthType")
+	if err != nil {
+		return nil, err
+	}
+	tenantId, err := maputil.GetStringOptional(data, "tenantId")
+	if err != nil {
+		return nil, err
+	}
+	clientId, err := maputil.GetStringOptional(data, "clientId")
+	if err != nil {
+		return nil, err
+	}
+
+	if authType == "" {
+		// Some very old legacy datasources may not have explicit auth type specified,
+		// but they imply App Registration authentication
+		if tenantId != "" && clientId != "" {
+			authType = azcredentials.AzureAuthClientSecret
+		} else {
+			// No configuration present
+			return nil, nil
+		}
+	}
+
+	switch authType {
+	case azcredentials.AzureAuthManagedIdentity:
+		credentials := &azcredentials.AzureManagedIdentityCredentials{}
+		return credentials, nil
+
+	case azcredentials.AzureAuthWorkloadIdentity:
+		credentials := &azcredentials.AzureWorkloadIdentityCredentials{}
+		return credentials, nil
+
+	case azcredentials.AzureAuthCurrentUserIdentity:
+		legacyCloud, err := maputil.GetStringOptional(data, "cloudName")
+		if err != nil {
+			return nil, err
+		}
+		cloud, err := resolveLegacyCloudName(legacyCloud)
+		if err != nil {
+			return nil, err
+		}
+		clientSecret := secureData["clientSecret"]
+
+		credentials := &azcredentials.AadCurrentUserCredentials{
+			ServiceCredentials: &azcredentials.AzureClientSecretCredentials{
+				AzureCloud:   cloud,
+				TenantId:     tenantId,
+				ClientId:     clientId,
+				ClientSecret: clientSecret,
+			},
+		}
+
+		return credentials, nil
+	case azcredentials.AzureAuthClientSecret:
+		legacyCloud, err := maputil.GetStringOptional(data, "cloudName")
+		if err != nil {
+			return nil, err
+		}
+		cloud, err := resolveLegacyCloudName(legacyCloud)
+		if err != nil {
+			return nil, err
+		}
+		clientSecret := secureData["clientSecret"]
+
+		if secureData["clientSecret"] == "" {
+			return nil, fmt.Errorf("unable to instantiate credentials, clientSecret must be set")
+		}
+
+		credentials := &azcredentials.AzureClientSecretCredentials{
+			AzureCloud:   cloud,
+			TenantId:     tenantId,
+			ClientId:     clientId,
+			ClientSecret: clientSecret,
+		}
+
+		return credentials, nil
+
+	default:
+		err := fmt.Errorf("the authentication type '%s' not supported", authType)
+		return nil, err
+	}
+}
+
+// Legacy Azure cloud names used by the Azure Monitor datasource
+const (
+	azureMonitorPublic       = "azuremonitor"
+	azureMonitorChina        = "chinaazuremonitor"
+	azureMonitorUSGovernment = "govazuremonitor"
+	azureMonitorCustomized   = "customizedazuremonitor"
+)
+
+func resolveLegacyCloudName(cloudName string) (string, error) {
+	switch cloudName {
+	case azureMonitorPublic:
+		return azsettings.AzurePublic, nil
+	case azureMonitorChina:
+		return azsettings.AzureChina, nil
+	case azureMonitorUSGovernment:
+		return azsettings.AzureUSGovernment, nil
+	case azureMonitorCustomized:
+		return azsettings.AzureCustomized, nil
+	case "":
+		return azsettings.AzurePublic, nil
+	default:
+		err := fmt.Errorf("the Azure cloud '%s' not supported by Azure Monitor datasource", cloudName)
+		return "", err
+	}
+}
diff --git a/pkg/tsdb/azuremonitor/azmoncredentials/builder_test.go b/pkg/tsdb/azuremonitor/azmoncredentials/builder_test.go
new file mode 100644
index 0000000000000..4b3af501255a1
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/azmoncredentials/builder_test.go
@@ -0,0 +1,215 @@
+package azmoncredentials
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana-azure-sdk-go/v2/azcredentials"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestFromDatasourceData(t *testing.T) {
+	t.Run("should return nil when no credentials configured", func(t *testing.T) {
+		var data = map[string]interface{}{}
+		var secureData = map[string]string{}
+
+		result, err := FromDatasourceData(data, secureData)
+		require.NoError(t, err)
+
+		assert.Nil(t, result)
+	})
+
+	t.Run("should return managed identity credentials when auth type is managed identity", func(t *testing.T) {
+		data := map[string]interface{}{
+			"azureAuthType": "msi",
+			"cloudName":     "chinaazuremonitor",
+			"tenantId":      "LEGACY-TENANT-ID",
+			"clientId":      "LEGACY-CLIENT-ID",
+		}
+		var secureData = map[string]string{
+			"clientSecret": "FAKE-LEGACY-SECRET",
+		}
+
+		credentials, err := FromDatasourceData(data, secureData)
+		require.NoError(t, err)
+		require.IsType(t, &azcredentials.AzureManagedIdentityCredentials{}, credentials)
+		msiCredentials := credentials.(*azcredentials.AzureManagedIdentityCredentials)
+
+		// Azure Monitor datasource doesn't support user-assigned managed identities (ClientId is always empty)
+		assert.Equal(t, "", msiCredentials.ClientId)
+	})
+
+	t.Run("should return workload identity credentials when auth type is workload identity", func(t *testing.T) {
+		data := map[string]interface{}{
+			"azureAuthType": azcredentials.AzureAuthWorkloadIdentity,
+		}
+		var secureData = map[string]string{}
+
+		credentials, err := FromDatasourceData(data, secureData)
+		require.NoError(t, err)
+		require.IsType(t, &azcredentials.AzureWorkloadIdentityCredentials{}, credentials)
+	})
+
+	t.Run("when legacy client secret configuration present", func(t *testing.T) {
+		t.Run("should return client secret credentials when auth type is client secret", func(t *testing.T) {
+			var data = map[string]interface{}{
+				"azureAuthType": "clientsecret",
+				"cloudName":     "chinaazuremonitor",
+				"tenantId":      "LEGACY-TENANT-ID",
+				"clientId":      "LEGACY-CLIENT-ID",
+			}
+			var secureData = map[string]string{
+				"clientSecret": "FAKE-LEGACY-SECRET",
+			}
+
+			result, err := FromDatasourceData(data, secureData)
+			require.NoError(t, err)
+
+			require.NotNil(t, result)
+			assert.IsType(t, &azcredentials.AzureClientSecretCredentials{}, result)
+			credential := (result).(*azcredentials.AzureClientSecretCredentials)
+
+			assert.Equal(t, azsettings.AzureChina, credential.AzureCloud)
+			assert.Equal(t, "LEGACY-TENANT-ID", credential.TenantId)
+			assert.Equal(t, "LEGACY-CLIENT-ID", credential.ClientId)
+			assert.Equal(t, "FAKE-LEGACY-SECRET", credential.ClientSecret)
+		})
+
+		t.Run("should return client secret credentials when auth type is not specified but configuration present", func(t *testing.T) {
+			var data = map[string]interface{}{
+				"cloudName": "chinaazuremonitor",
+				"tenantId":  "LEGACY-TENANT-ID",
+				"clientId":  "LEGACY-CLIENT-ID",
+			}
+			var secureData = map[string]string{
+				"clientSecret": "FAKE-LEGACY-SECRET",
+			}
+
+			result, err := FromDatasourceData(data, secureData)
+			require.NoError(t, err)
+
+			require.NotNil(t, result)
+			assert.IsType(t, &azcredentials.AzureClientSecretCredentials{}, result)
+			credential := (result).(*azcredentials.AzureClientSecretCredentials)
+
+			assert.Equal(t, azsettings.AzureChina, credential.AzureCloud)
+			assert.Equal(t, "LEGACY-TENANT-ID", credential.TenantId)
+			assert.Equal(t, "LEGACY-CLIENT-ID", credential.ClientId)
+			assert.Equal(t, "FAKE-LEGACY-SECRET", credential.ClientSecret)
+		})
+
+		t.Run("should error if no client secret is set", func(t *testing.T) {
+			var data = map[string]interface{}{
+				"azureAuthType": "clientsecret",
+				"cloudName":     "chinaazuremonitor",
+				"tenantId":      "LEGACY-TENANT-ID",
+				"clientId":      "LEGACY-CLIENT-ID",
+			}
+			var secureData = map[string]string{}
+
+			_, err := FromDatasourceData(data, secureData)
+			require.Error(t, err)
+
+			assert.ErrorContains(t, err, "clientSecret must be set")
+		})
+	})
+
+	t.Run("should return client secret credentials when client secret auth configured even if legacy configuration present", func(t *testing.T) {
+		var data = map[string]interface{}{
+			"azureCredentials": map[string]interface{}{
+				"authType":   "clientsecret",
+				"azureCloud": "AzureChinaCloud",
+				"tenantId":   "TENANT-ID",
+				"clientId":   "CLIENT-TD",
+			},
+			"azureAuthType": "clientsecret",
+			"cloudName":     "azuremonitor",
+			"tenantId":      "LEGACY-TENANT-ID",
+			"clientId":      "LEGACY-CLIENT-ID",
+		}
+		var secureData = map[string]string{
+			"azureClientSecret": "FAKE-SECRET",
+			"clientSecret":      "FAKE-LEGACY-SECRET",
+		}
+
+		result, err := FromDatasourceData(data, secureData)
+		require.NoError(t, err)
+
+		require.NotNil(t, result)
+		assert.IsType(t, &azcredentials.AzureClientSecretCredentials{}, result)
+		credential := (result).(*azcredentials.AzureClientSecretCredentials)
+
+		assert.Equal(t, credential.AzureCloud, azsettings.AzureChina)
+		assert.Equal(t, credential.TenantId, "TENANT-ID")
+		assert.Equal(t, credential.ClientId, "CLIENT-TD")
+		assert.Equal(t, credential.ClientSecret, "FAKE-SECRET")
+	})
+
+	t.Run("should return error when credentials not supported even if legacy configuration present", func(t *testing.T) {
+		var data = map[string]interface{}{
+			"azureCredentials": map[string]interface{}{
+				"authType":   "invalid",
+				"azureCloud": "AzureChinaCloud",
+				"tenantId":   "TENANT-ID",
+				"clientId":   "CLIENT-TD",
+			},
+			"cloudName":     "azuremonitor",
+			"tenantId":      "LEGACY-TENANT-ID",
+			"clientId":      "LEGACY-CLIENT-ID",
+			"onBehalfOf":    true,
+			"oauthPassThru": true,
+		}
+		var secureData = map[string]string{
+			"azureClientSecret": "FAKE-SECRET",
+			"clientSecret":      "FAKE-LEGACY-SECRET",
+		}
+
+		_, err := FromDatasourceData(data, secureData)
+		assert.Error(t, err)
+	})
+}
+
+func TestNormalizedCloudName(t *testing.T) {
+	t.Run("should return normalized cloud name", func(t *testing.T) {
+		tests := []struct {
+			description     string
+			legacyCloud     string
+			normalizedCloud string
+		}{
+			{
+				legacyCloud:     azureMonitorPublic,
+				normalizedCloud: azsettings.AzurePublic,
+			},
+			{
+				legacyCloud:     azureMonitorChina,
+				normalizedCloud: azsettings.AzureChina,
+			},
+			{
+				legacyCloud:     azureMonitorUSGovernment,
+				normalizedCloud: azsettings.AzureUSGovernment,
+			},
+			{
+				legacyCloud:     "",
+				normalizedCloud: azsettings.AzurePublic,
+			},
+		}
+
+		for _, tt := range tests {
+			t.Run(tt.description, func(t *testing.T) {
+				actualCloud, err := resolveLegacyCloudName(tt.legacyCloud)
+				require.NoError(t, err)
+
+				assert.Equal(t, tt.normalizedCloud, actualCloud)
+			})
+		}
+	})
+
+	t.Run("should fail when cloud is unknown", func(t *testing.T) {
+		legacyCloud := "unknown"
+
+		_, err := resolveLegacyCloudName(legacyCloud)
+		assert.Error(t, err)
+	})
+}
diff --git a/pkg/tsdb/azuremonitor/azmoncredentials/default.go b/pkg/tsdb/azuremonitor/azmoncredentials/default.go
new file mode 100644
index 0000000000000..9ce035b33a994
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/azmoncredentials/default.go
@@ -0,0 +1,16 @@
+package azmoncredentials
+
+import (
+	"github.com/grafana/grafana-azure-sdk-go/v2/azcredentials"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
+)
+
+func GetDefaultCredentials(settings *azsettings.AzureSettings) azcredentials.AzureCredentials {
+	if settings.ManagedIdentityEnabled {
+		return &azcredentials.AzureManagedIdentityCredentials{}
+	} else if settings.WorkloadIdentityEnabled {
+		return &azcredentials.AzureWorkloadIdentityCredentials{}
+	} else {
+		return &azcredentials.AzureClientSecretCredentials{AzureCloud: settings.GetDefaultCloud()}
+	}
+}
diff --git a/pkg/tsdb/azuremonitor/azuremonitor-resource-handler.go b/pkg/tsdb/azuremonitor/azuremonitor-resource-handler.go
index e01e6e505d296..13d4c411b8739 100644
--- a/pkg/tsdb/azuremonitor/azuremonitor-resource-handler.go
+++ b/pkg/tsdb/azuremonitor/azuremonitor-resource-handler.go
@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/resource/httpadapter"
 
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/types"
@@ -24,6 +25,7 @@ func getTarget(original string) (target string, err error) {
 }
 
 type httpServiceProxy struct {
+	logger log.Logger
 }
 
 func (s *httpServiceProxy) Do(rw http.ResponseWriter, req *http.Request, cli *http.Client) (http.ResponseWriter, error) {
@@ -38,7 +40,7 @@ func (s *httpServiceProxy) Do(rw http.ResponseWriter, req *http.Request, cli *ht
 	}
 	defer func() {
 		if err := res.Body.Close(); err != nil {
-			backend.Logger.Warn("Failed to close response body", "err", err)
+			s.logger.Warn("Failed to close response body", "err", err)
 		}
 	}()
 
@@ -91,7 +93,7 @@ func writeResponse(rw http.ResponseWriter, code int, msg string) {
 
 func (s *Service) handleResourceReq(subDataSource string) func(rw http.ResponseWriter, req *http.Request) {
 	return func(rw http.ResponseWriter, req *http.Request) {
-		backend.Logger.Debug("Received resource call", "url", req.URL.String(), "method", req.Method)
+		s.logger.Debug("Received resource call", "url", req.URL.String(), "method", req.Method)
 
 		newPath, err := getTarget(req.URL.Path)
 		if err != nil {
diff --git a/pkg/tsdb/azuremonitor/azuremonitor-resource-handler_test.go b/pkg/tsdb/azuremonitor/azuremonitor-resource-handler_test.go
index d5e251f2fef9d..487bbc9d358c4 100644
--- a/pkg/tsdb/azuremonitor/azuremonitor-resource-handler_test.go
+++ b/pkg/tsdb/azuremonitor/azuremonitor-resource-handler_test.go
@@ -6,7 +6,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/grafana/grafana-azure-sdk-go/azsettings"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/metrics"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/types"
@@ -104,8 +104,9 @@ func Test_handleResourceReq(t *testing.T) {
 		im: &fakeInstance{
 			services: map[string]types.DatasourceService{
 				azureMonitor: {
-					URL:        routes[azsettings.AzurePublic][azureMonitor].URL,
+					URL:        "https://management.azure.com",
 					HTTPClient: &http.Client{},
+					Logger:     log.DefaultLogger,
 				},
 			},
 		},
@@ -114,6 +115,7 @@ func Test_handleResourceReq(t *testing.T) {
 				Proxy: proxy,
 			},
 		},
+		logger: log.DefaultLogger,
 	}
 	rw := httptest.NewRecorder()
 	req, err := http.NewRequest(http.MethodGet, "http://foo/azuremonitor/subscriptions/44693801", nil)
diff --git a/pkg/tsdb/azuremonitor/azuremonitor.go b/pkg/tsdb/azuremonitor/azuremonitor.go
index 9cf434c2f73f8..085f05426d209 100644
--- a/pkg/tsdb/azuremonitor/azuremonitor.go
+++ b/pkg/tsdb/azuremonitor/azuremonitor.go
@@ -10,35 +10,40 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/grafana/grafana-azure-sdk-go/azsettings"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azusercontext"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/resource/httpadapter"
 
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/azmoncredentials"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/loganalytics"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/metrics"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/resourcegraph"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/types"
 )
 
-func ProvideService(cfg *setting.Cfg, httpClientProvider *httpclient.Provider, features featuremgmt.FeatureToggles) *Service {
-	proxy := &httpServiceProxy{}
+func ProvideService(httpClientProvider *httpclient.Provider) *Service {
+	logger := backend.NewLoggerWith("logger", "tsdb.azuremonitor")
+	proxy := &httpServiceProxy{
+		logger: logger,
+	}
 	executors := map[string]azDatasourceExecutor{
-		azureMonitor:       &metrics.AzureMonitorDatasource{Proxy: proxy, Features: features},
-		azureLogAnalytics:  &loganalytics.AzureLogAnalyticsDatasource{Proxy: proxy},
-		azureResourceGraph: &resourcegraph.AzureResourceGraphDatasource{Proxy: proxy},
-		azureTraces:        &loganalytics.AzureLogAnalyticsDatasource{Proxy: proxy},
+		azureMonitor:       &metrics.AzureMonitorDatasource{Proxy: proxy, Logger: logger},
+		azureLogAnalytics:  &loganalytics.AzureLogAnalyticsDatasource{Proxy: proxy, Logger: logger},
+		azureResourceGraph: &resourcegraph.AzureResourceGraphDatasource{Proxy: proxy, Logger: logger},
+		azureTraces:        &loganalytics.AzureLogAnalyticsDatasource{Proxy: proxy, Logger: logger},
 	}
 
-	im := datasource.NewInstanceManager(NewInstanceSettings(cfg, httpClientProvider, executors))
+	im := datasource.NewInstanceManager(NewInstanceSettings(httpClientProvider, executors, logger))
 
 	s := &Service{
 		im:        im,
 		executors: executors,
+		logger:    logger,
 	}
 
 	s.queryMux = s.newQueryMux()
@@ -48,11 +53,11 @@ func ProvideService(cfg *setting.Cfg, httpClientProvider *httpclient.Provider, f
 }
 
 func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
-	return s.queryMux.QueryData(ctx, req)
+	return s.queryMux.QueryData(azusercontext.WithUserFromQueryReq(ctx, req), req)
 }
 
 func (s *Service) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
-	return s.resourceHandler.CallResource(ctx, req, sender)
+	return s.resourceHandler.CallResource(azusercontext.WithUserFromResourceReq(ctx, req), req, sender)
 }
 
 type Service struct {
@@ -61,54 +66,58 @@ type Service struct {
 
 	queryMux        *datasource.QueryTypeMux
 	resourceHandler backend.CallResourceHandler
+	logger          log.Logger
 }
 
-func getDatasourceService(ctx context.Context, settings *backend.DataSourceInstanceSettings, cfg *setting.Cfg, clientProvider *httpclient.Provider, dsInfo types.DatasourceInfo, routeName string) (types.DatasourceService, error) {
+func getDatasourceService(ctx context.Context, settings *backend.DataSourceInstanceSettings, azureSettings *azsettings.AzureSettings, clientProvider *httpclient.Provider, dsInfo types.DatasourceInfo, routeName string, logger log.Logger) (types.DatasourceService, error) {
 	route := dsInfo.Routes[routeName]
-	client, err := newHTTPClient(ctx, route, dsInfo, settings, cfg, clientProvider)
+	client, err := newHTTPClient(ctx, route, dsInfo, settings, azureSettings, clientProvider)
 	if err != nil {
 		return types.DatasourceService{}, err
 	}
 	return types.DatasourceService{
 		URL:        dsInfo.Routes[routeName].URL,
 		HTTPClient: client,
+		Logger:     logger,
 	}, nil
 }
 
-func NewInstanceSettings(cfg *setting.Cfg, clientProvider *httpclient.Provider, executors map[string]azDatasourceExecutor) datasource.InstanceFactoryFunc {
+func NewInstanceSettings(clientProvider *httpclient.Provider, executors map[string]azDatasourceExecutor, logger log.Logger) datasource.InstanceFactoryFunc {
 	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		jsonDataObj := map[string]any{}
-		err := json.Unmarshal(settings.JSONData, &jsonDataObj)
+		jsonData := map[string]any{}
+		err := json.Unmarshal(settings.JSONData, &jsonData)
 		if err != nil {
 			return nil, fmt.Errorf("error reading settings: %w", err)
 		}
 
-		azSettings := types.AzureSettings{}
-		err = json.Unmarshal(settings.JSONData, &azSettings)
+		azMonitorSettings := types.AzureMonitorSettings{}
+		err = json.Unmarshal(settings.JSONData, &azMonitorSettings)
 		if err != nil {
 			return nil, fmt.Errorf("error reading settings: %w", err)
 		}
 
-		cloud, err := getAzureCloud(cfg, &azSettings.AzureClientSettings)
+		azureSettings, err := azsettings.ReadSettings(ctx)
 		if err != nil {
-			return nil, fmt.Errorf("error getting credentials: %w", err)
+			logger.Error("failed to read Azure settings from Grafana", "error", err.Error())
+			return nil, err
 		}
 
-		routesForModel, err := getAzureRoutes(cloud, settings.JSONData)
+		credentials, err := azmoncredentials.FromDatasourceData(jsonData, settings.DecryptedSecureJSONData)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("error getting credentials: %w", err)
+		} else if credentials == nil {
+			credentials = azmoncredentials.GetDefaultCredentials(azureSettings)
 		}
 
-		credentials, err := getAzureCredentials(cfg, &azSettings.AzureClientSettings, settings.DecryptedSecureJSONData)
+		routesForModel, err := getAzureMonitorRoutes(azureSettings, credentials, settings.JSONData)
 		if err != nil {
-			return nil, fmt.Errorf("error getting credentials: %w", err)
+			return nil, err
 		}
 
 		model := types.DatasourceInfo{
-			Cloud:                   cloud,
 			Credentials:             credentials,
-			Settings:                azSettings.AzureMonitorSettings,
-			JSONData:                jsonDataObj,
+			Settings:                azMonitorSettings,
+			JSONData:                jsonData,
 			DecryptedSecureJSONData: settings.DecryptedSecureJSONData,
 			DatasourceID:            settings.ID,
 			Routes:                  routesForModel,
@@ -116,7 +125,7 @@ func NewInstanceSettings(cfg *setting.Cfg, clientProvider *httpclient.Provider,
 		}
 
 		for routeName := range executors {
-			service, err := getDatasourceService(ctx, &settings, cfg, clientProvider, model, routeName)
+			service, err := getDatasourceService(ctx, &settings, azureSettings, clientProvider, model, routeName, logger)
 			if err != nil {
 				return nil, err
 			}
@@ -127,31 +136,6 @@ func NewInstanceSettings(cfg *setting.Cfg, clientProvider *httpclient.Provider,
 	}
 }
 
-func getCustomizedCloudSettings(cloud string, jsonData json.RawMessage) (types.AzureMonitorCustomizedCloudSettings, error) {
-	customizedCloudSettings := types.AzureMonitorCustomizedCloudSettings{}
-	err := json.Unmarshal(jsonData, &customizedCloudSettings)
-	if err != nil {
-		return types.AzureMonitorCustomizedCloudSettings{}, fmt.Errorf("error getting customized cloud settings: %w", err)
-	}
-	return customizedCloudSettings, nil
-}
-
-func getAzureRoutes(cloud string, jsonData json.RawMessage) (map[string]types.AzRoute, error) {
-	if cloud == azsettings.AzureCustomized {
-		customizedCloudSettings, err := getCustomizedCloudSettings(cloud, jsonData)
-		if err != nil {
-			return nil, err
-		}
-		if customizedCloudSettings.CustomizedRoutes == nil {
-			return nil, fmt.Errorf("unable to instantiate routes, customizedRoutes must be set")
-		}
-		azureRoutes := customizedCloudSettings.CustomizedRoutes
-		return azureRoutes, nil
-	} else {
-		return routes[cloud], nil
-	}
-}
-
 type azDatasourceExecutor interface {
 	ExecuteTimeSeriesQuery(ctx context.Context, originalQueries []backend.DataQuery, dsInfo types.DatasourceInfo, client *http.Client, url string) (*backend.QueryDataResponse, error)
 	ResourceRequest(rw http.ResponseWriter, req *http.Request, cli *http.Client) (http.ResponseWriter, error)
@@ -208,10 +192,10 @@ func (s *Service) getDSInfo(ctx context.Context, pluginCtx backend.PluginContext
 	return instance, nil
 }
 
-func queryMetricHealth(dsInfo types.DatasourceInfo) (*http.Response, error) {
+func queryMetricHealth(ctx context.Context, dsInfo types.DatasourceInfo) (*http.Response, error) {
 	subscriptionsApiVersion := "2020-01-01"
 	url := fmt.Sprintf("%v/subscriptions?api-version=%v", dsInfo.Routes["Azure Monitor"].URL, subscriptionsApiVersion)
-	request, err := http.NewRequest(http.MethodGet, url, nil)
+	request, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -224,9 +208,9 @@ func queryMetricHealth(dsInfo types.DatasourceInfo) (*http.Response, error) {
 	return res, nil
 }
 
-func checkAzureLogAnalyticsHealth(dsInfo types.DatasourceInfo, subscription string) (*http.Response, error) {
+func checkAzureLogAnalyticsHealth(ctx context.Context, dsInfo types.DatasourceInfo, subscription string) (*http.Response, error) {
 	workspacesUrl := fmt.Sprintf("%v/subscriptions/%v/providers/Microsoft.OperationalInsights/workspaces?api-version=2017-04-26-preview", dsInfo.Routes["Azure Monitor"].URL, subscription)
-	workspacesReq, err := http.NewRequest(http.MethodGet, workspacesUrl, nil)
+	workspacesReq, err := http.NewRequestWithContext(ctx, http.MethodGet, workspacesUrl, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -255,7 +239,7 @@ func checkAzureLogAnalyticsHealth(dsInfo types.DatasourceInfo, subscription stri
 	}
 
 	workspaceUrl := fmt.Sprintf("%v/v1/workspaces/%v/query", dsInfo.Routes["Azure Log Analytics"].URL, defaultWorkspaceId)
-	workspaceReq, err := http.NewRequest(http.MethodPost, workspaceUrl, bytes.NewBuffer(body))
+	workspaceReq, err := http.NewRequestWithContext(ctx, http.MethodPost, workspaceUrl, bytes.NewBuffer(body))
 	workspaceReq.Header.Set("Content-Type", "application/json")
 	if err != nil {
 		return nil, err
@@ -269,7 +253,7 @@ func checkAzureLogAnalyticsHealth(dsInfo types.DatasourceInfo, subscription stri
 	return res, nil
 }
 
-func checkAzureMonitorResourceGraphHealth(dsInfo types.DatasourceInfo, subscription string) (*http.Response, error) {
+func checkAzureMonitorResourceGraphHealth(ctx context.Context, dsInfo types.DatasourceInfo, subscription string) (*http.Response, error) {
 	body, err := json.Marshal(map[string]any{
 		"query":         "Resources | project id | limit 1",
 		"subscriptions": []string{subscription},
@@ -278,7 +262,7 @@ func checkAzureMonitorResourceGraphHealth(dsInfo types.DatasourceInfo, subscript
 		return nil, err
 	}
 	url := fmt.Sprintf("%v/providers/Microsoft.ResourceGraph/resources?api-version=%v", dsInfo.Routes["Azure Resource Graph"].URL, resourcegraph.ArgAPIVersion)
-	request, err := http.NewRequest(http.MethodPost, url, bytes.NewBuffer(body))
+	request, err := http.NewRequestWithContext(ctx, http.MethodPost, url, bytes.NewBuffer(body))
 	request.Header.Set("Content-Type", "application/json")
 	if err != nil {
 		return nil, err
@@ -292,9 +276,9 @@ func checkAzureMonitorResourceGraphHealth(dsInfo types.DatasourceInfo, subscript
 	return res, nil
 }
 
-func metricCheckHealth(dsInfo types.DatasourceInfo) (message string, defaultSubscription string, status backend.HealthStatus) {
+func metricCheckHealth(ctx context.Context, dsInfo types.DatasourceInfo, logger log.Logger) (message string, defaultSubscription string, status backend.HealthStatus) {
 	defaultSubscription = dsInfo.Settings.SubscriptionId
-	metricsRes, err := queryMetricHealth(dsInfo)
+	metricsRes, err := queryMetricHealth(ctx, dsInfo)
 	if err != nil {
 		if ok := errors.Is(err, types.ErrorAzureHealthCheck); ok {
 			return fmt.Sprintf("Error connecting to Azure Monitor endpoint: %s", err.Error()), defaultSubscription, backend.HealthStatusError
@@ -315,7 +299,7 @@ func metricCheckHealth(dsInfo types.DatasourceInfo) (message string, defaultSubs
 		}
 		return fmt.Sprintf("Error connecting to Azure Monitor endpoint: %s", string(body)), defaultSubscription, backend.HealthStatusError
 	}
-	subscriptions, err := parseSubscriptions(metricsRes)
+	subscriptions, err := parseSubscriptions(metricsRes, logger)
 	if err != nil {
 		return err.Error(), defaultSubscription, backend.HealthStatusError
 	}
@@ -326,8 +310,8 @@ func metricCheckHealth(dsInfo types.DatasourceInfo) (message string, defaultSubs
 	return "Successfully connected to Azure Monitor endpoint.", defaultSubscription, backend.HealthStatusOk
 }
 
-func logAnalyticsCheckHealth(dsInfo types.DatasourceInfo, defaultSubscription string) (message string, status backend.HealthStatus) {
-	logsRes, err := checkAzureLogAnalyticsHealth(dsInfo, defaultSubscription)
+func logAnalyticsCheckHealth(ctx context.Context, dsInfo types.DatasourceInfo, defaultSubscription string) (message string, status backend.HealthStatus) {
+	logsRes, err := checkAzureLogAnalyticsHealth(ctx, dsInfo, defaultSubscription)
 	if err != nil {
 		if err.Error() == "no default workspace found" {
 			return "No Log Analytics workspaces found.", backend.HealthStatusUnknown
@@ -354,8 +338,8 @@ func logAnalyticsCheckHealth(dsInfo types.DatasourceInfo, defaultSubscription st
 	return "Successfully connected to Azure Log Analytics endpoint.", backend.HealthStatusOk
 }
 
-func graphLogHealthCheck(dsInfo types.DatasourceInfo, defaultSubscription string) (message string, status backend.HealthStatus) {
-	resourceGraphRes, err := checkAzureMonitorResourceGraphHealth(dsInfo, defaultSubscription)
+func graphLogHealthCheck(ctx context.Context, dsInfo types.DatasourceInfo, defaultSubscription string) (message string, status backend.HealthStatus) {
+	resourceGraphRes, err := checkAzureMonitorResourceGraphHealth(ctx, dsInfo, defaultSubscription)
 	if err != nil {
 		if ok := errors.Is(err, types.ErrorAzureHealthCheck); ok {
 			return fmt.Sprintf("Error connecting to Azure Resource Graph endpoint: %s", err.Error()), backend.HealthStatusError
@@ -379,7 +363,7 @@ func graphLogHealthCheck(dsInfo types.DatasourceInfo, defaultSubscription string
 	return "Successfully connected to Azure Resource Graph endpoint.", backend.HealthStatusOk
 }
 
-func parseSubscriptions(res *http.Response) ([]string, error) {
+func parseSubscriptions(res *http.Response, logger log.Logger) ([]string, error) {
 	var target struct {
 		Value []struct {
 			SubscriptionId string `json:"subscriptionId"`
@@ -391,7 +375,7 @@ func parseSubscriptions(res *http.Response) ([]string, error) {
 	}
 	defer func() {
 		if err := res.Body.Close(); err != nil {
-			backend.Logger.Warn("Failed to close response body", "err", err)
+			logger.Warn("Failed to close response body", "err", err)
 		}
 	}()
 
@@ -404,6 +388,7 @@ func parseSubscriptions(res *http.Response) ([]string, error) {
 }
 
 func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
+	ctx = azusercontext.WithUserFromHealthCheckReq(ctx, req)
 	dsInfo, err := s.getDSInfo(ctx, req.PluginContext)
 	if err != nil {
 		return &backend.CheckHealthResult{
@@ -414,17 +399,17 @@ func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthReque
 
 	status := backend.HealthStatusOk
 
-	metricsLog, defaultSubscription, metricsStatus := metricCheckHealth(dsInfo)
+	metricsLog, defaultSubscription, metricsStatus := metricCheckHealth(ctx, dsInfo, s.logger)
 	if metricsStatus != backend.HealthStatusOk {
 		status = metricsStatus
 	}
 
-	logAnalyticsLog, logAnalyticsStatus := logAnalyticsCheckHealth(dsInfo, defaultSubscription)
+	logAnalyticsLog, logAnalyticsStatus := logAnalyticsCheckHealth(ctx, dsInfo, defaultSubscription)
 	if logAnalyticsStatus != backend.HealthStatusOk {
 		status = logAnalyticsStatus
 	}
 
-	graphLog, graphStatus := graphLogHealthCheck(dsInfo, defaultSubscription)
+	graphLog, graphStatus := graphLogHealthCheck(ctx, dsInfo, defaultSubscription)
 	if graphStatus != backend.HealthStatusOk {
 		status = graphStatus
 	}
diff --git a/pkg/tsdb/azuremonitor/azuremonitor_test.go b/pkg/tsdb/azuremonitor/azuremonitor_test.go
index 15aa4d787de86..28dff1e4683ce 100644
--- a/pkg/tsdb/azuremonitor/azuremonitor_test.go
+++ b/pkg/tsdb/azuremonitor/azuremonitor_test.go
@@ -11,19 +11,44 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/grafana/grafana-azure-sdk-go/azcredentials"
-	"github.com/grafana/grafana-azure-sdk-go/azsettings"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azcredentials"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 
-	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/types"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
+var testRoutes = map[string]types.AzRoute{
+	azureMonitor: {
+		URL:     "https://management.azure.com",
+		Scopes:  []string{"https://management.azure.com/.default"},
+		Headers: map[string]string{"x-ms-app": "Grafana"},
+	},
+	azureLogAnalytics: {
+		URL:     "https://api.loganalytics.io",
+		Scopes:  []string{"https://api.loganalytics.io/.default"},
+		Headers: map[string]string{"x-ms-app": "Grafana", "Cache-Control": "public, max-age=60"},
+	},
+	azureResourceGraph: {
+		URL:     "https://management.azure.com",
+		Scopes:  []string{"https://management.azure.com/.default"},
+		Headers: map[string]string{"x-ms-app": "Grafana"},
+	},
+	azureTraces: {
+		URL:     "https://api.loganalytics.io",
+		Scopes:  []string{"https://api.loganalytics.io/.default"},
+		Headers: map[string]string{"x-ms-app": "Grafana", "Cache-Control": "public, max-age=60"},
+	},
+	azurePortal: {
+		URL: "https://portal.azure.com",
+	},
+}
+
 func TestNewInstanceSettings(t *testing.T) {
 	tests := []struct {
 		name          string
@@ -39,10 +64,9 @@ func TestNewInstanceSettings(t *testing.T) {
 				ID:                      40,
 			},
 			expectedModel: types.DatasourceInfo{
-				Cloud:                   azsettings.AzurePublic,
 				Credentials:             &azcredentials.AzureManagedIdentityCredentials{},
 				Settings:                types.AzureMonitorSettings{},
-				Routes:                  routes[azsettings.AzurePublic],
+				Routes:                  testRoutes,
 				JSONData:                map[string]any{"azureAuthType": "msi"},
 				DatasourceID:            40,
 				DecryptedSecureJSONData: map[string]string{"key": "value"},
@@ -58,7 +82,6 @@ func TestNewInstanceSettings(t *testing.T) {
 				ID:                      50,
 			},
 			expectedModel: types.DatasourceInfo{
-				Cloud: "AzureCustomizedCloud",
 				Credentials: &azcredentials.AzureClientSecretCredentials{
 					AzureCloud:   "AzureCustomizedCloud",
 					ClientSecret: "secret",
@@ -86,15 +109,9 @@ func TestNewInstanceSettings(t *testing.T) {
 		},
 	}
 
-	cfg := &setting.Cfg{
-		Azure: &azsettings.AzureSettings{
-			Cloud: azsettings.AzurePublic,
-		},
-	}
-
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			factory := NewInstanceSettings(cfg, &httpclient.Provider{}, map[string]azDatasourceExecutor{})
+			factory := NewInstanceSettings(&httpclient.Provider{}, map[string]azDatasourceExecutor{}, log.DefaultLogger)
 			instance, err := factory(context.Background(), tt.settings)
 			tt.Err(t, err)
 			if !cmp.Equal(instance, tt.expectedModel) {
@@ -105,7 +122,6 @@ func TestNewInstanceSettings(t *testing.T) {
 }
 
 type fakeInstance struct {
-	cloud    string
 	routes   map[string]types.AzRoute
 	services map[string]types.DatasourceService
 	settings types.AzureMonitorSettings
@@ -113,7 +129,6 @@ type fakeInstance struct {
 
 func (f *fakeInstance) Get(_ context.Context, _ backend.PluginContext) (instancemgmt.Instance, error) {
 	return types.DatasourceInfo{
-		Cloud:    f.cloud,
 		Routes:   f.routes,
 		Services: f.services,
 		Settings: f.settings,
@@ -155,19 +170,19 @@ func Test_newMux(t *testing.T) {
 		{
 			name:        "creates an Azure Monitor executor",
 			queryType:   azureMonitor,
-			expectedURL: routes[azureMonitorPublic][azureMonitor].URL,
+			expectedURL: testRoutes[azureMonitor].URL,
 			Err:         require.NoError,
 		},
 		{
 			name:        "creates an Azure Log Analytics executor",
 			queryType:   azureLogAnalytics,
-			expectedURL: routes[azureMonitorPublic][azureLogAnalytics].URL,
+			expectedURL: testRoutes[azureLogAnalytics].URL,
 			Err:         require.NoError,
 		},
 		{
 			name:        "creates an Azure Traces executor",
 			queryType:   azureTraces,
-			expectedURL: routes[azureMonitorPublic][azureLogAnalytics].URL,
+			expectedURL: testRoutes[azureLogAnalytics].URL,
 			Err:         require.NoError,
 		},
 	}
@@ -176,10 +191,10 @@ func Test_newMux(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			s := &Service{
 				im: &fakeInstance{
-					routes: routes[azureMonitorPublic],
+					routes: testRoutes,
 					services: map[string]types.DatasourceService{
 						tt.queryType: {
-							URL:        routes[azureMonitorPublic][tt.queryType].URL,
+							URL:        testRoutes[tt.queryType].URL,
 							HTTPClient: &http.Client{},
 						},
 					},
@@ -308,7 +323,6 @@ func TestCheckHealth(t *testing.T) {
 		})
 	}
 
-	cloud := "AzureCloud"
 	tests := []struct {
 		name           string
 		errorExpected  bool
@@ -324,15 +338,15 @@ func TestCheckHealth(t *testing.T) {
 			},
 			customServices: map[string]types.DatasourceService{
 				azureMonitor: {
-					URL:        routes[cloud]["Azure Monitor"].URL,
+					URL:        testRoutes["Azure Monitor"].URL,
 					HTTPClient: azureMonitorClient(false, false),
 				},
 				azureLogAnalytics: {
-					URL:        routes[cloud]["Azure Log Analytics"].URL,
+					URL:        testRoutes["Azure Log Analytics"].URL,
 					HTTPClient: okClient,
 				},
 				azureResourceGraph: {
-					URL:        routes[cloud]["Azure Resource Graph"].URL,
+					URL:        testRoutes["Azure Resource Graph"].URL,
 					HTTPClient: okClient,
 				}},
 		},
@@ -347,15 +361,15 @@ func TestCheckHealth(t *testing.T) {
 			},
 			customServices: map[string]types.DatasourceService{
 				azureMonitor: {
-					URL:        routes[cloud]["Azure Monitor"].URL,
+					URL:        testRoutes["Azure Monitor"].URL,
 					HTTPClient: azureMonitorClient(false, true),
 				},
 				azureLogAnalytics: {
-					URL:        routes[cloud]["Azure Log Analytics"].URL,
+					URL:        testRoutes["Azure Log Analytics"].URL,
 					HTTPClient: okClient,
 				},
 				azureResourceGraph: {
-					URL:        routes[cloud]["Azure Resource Graph"].URL,
+					URL:        testRoutes["Azure Resource Graph"].URL,
 					HTTPClient: okClient,
 				}},
 		},
@@ -370,15 +384,15 @@ func TestCheckHealth(t *testing.T) {
 			},
 			customServices: map[string]types.DatasourceService{
 				azureMonitor: {
-					URL:        routes[cloud]["Azure Monitor"].URL,
+					URL:        testRoutes["Azure Monitor"].URL,
 					HTTPClient: azureMonitorClient(false, false),
 				},
 				azureLogAnalytics: {
-					URL:        routes[cloud]["Azure Log Analytics"].URL,
+					URL:        testRoutes["Azure Log Analytics"].URL,
 					HTTPClient: failClient(false),
 				},
 				azureResourceGraph: {
-					URL:        routes[cloud]["Azure Resource Graph"].URL,
+					URL:        testRoutes["Azure Resource Graph"].URL,
 					HTTPClient: okClient,
 				}},
 		},
@@ -393,15 +407,15 @@ func TestCheckHealth(t *testing.T) {
 			},
 			customServices: map[string]types.DatasourceService{
 				azureMonitor: {
-					URL:        routes[cloud]["Azure Monitor"].URL,
+					URL:        testRoutes["Azure Monitor"].URL,
 					HTTPClient: azureMonitorClient(false, false),
 				},
 				azureLogAnalytics: {
-					URL:        routes[cloud]["Azure Log Analytics"].URL,
+					URL:        testRoutes["Azure Log Analytics"].URL,
 					HTTPClient: okClient,
 				},
 				azureResourceGraph: {
-					URL:        routes[cloud]["Azure Resource Graph"].URL,
+					URL:        testRoutes["Azure Resource Graph"].URL,
 					HTTPClient: failClient(false),
 				}},
 		},
@@ -416,15 +430,15 @@ func TestCheckHealth(t *testing.T) {
 			},
 			customServices: map[string]types.DatasourceService{
 				azureMonitor: {
-					URL:        routes[cloud]["Azure Monitor"].URL,
+					URL:        testRoutes["Azure Monitor"].URL,
 					HTTPClient: azureMonitorClient(true, false),
 				},
 				azureLogAnalytics: {
-					URL:        routes[cloud]["Azure Log Analytics"].URL,
+					URL:        testRoutes["Azure Log Analytics"].URL,
 					HTTPClient: okClient,
 				},
 				azureResourceGraph: {
-					URL:        routes[cloud]["Azure Resource Graph"].URL,
+					URL:        testRoutes["Azure Resource Graph"].URL,
 					HTTPClient: okClient,
 				}},
 		},
@@ -439,23 +453,22 @@ func TestCheckHealth(t *testing.T) {
 			},
 			customServices: map[string]types.DatasourceService{
 				azureMonitor: {
-					URL:        routes[cloud]["Azure Monitor"].URL,
+					URL:        testRoutes["Azure Monitor"].URL,
 					HTTPClient: failClient(true),
 				},
 				azureLogAnalytics: {
-					URL:        routes[cloud]["Azure Log Analytics"].URL,
+					URL:        testRoutes["Azure Log Analytics"].URL,
 					HTTPClient: failClient(true),
 				},
 				azureResourceGraph: {
-					URL:        routes[cloud]["Azure Resource Graph"].URL,
+					URL:        testRoutes["Azure Resource Graph"].URL,
 					HTTPClient: failClient(true),
 				}},
 		},
 	}
 
 	instance := &fakeInstance{
-		cloud:    cloud,
-		routes:   routes[cloud],
+		routes:   testRoutes,
 		services: map[string]types.DatasourceService{},
 		settings: types.AzureMonitorSettings{
 			LogAnalyticsDefaultWorkspace: "workspace-id",
diff --git a/pkg/tsdb/azuremonitor/credentials.go b/pkg/tsdb/azuremonitor/credentials.go
deleted file mode 100644
index 6e19f743f593c..0000000000000
--- a/pkg/tsdb/azuremonitor/credentials.go
+++ /dev/null
@@ -1,136 +0,0 @@
-package azuremonitor
-
-import (
-	"fmt"
-
-	"github.com/grafana/grafana-azure-sdk-go/azcredentials"
-	"github.com/grafana/grafana-azure-sdk-go/azsettings"
-
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/types"
-)
-
-// Azure cloud names specific to Azure Monitor
-const (
-	azureMonitorPublic       = "azuremonitor"
-	azureMonitorChina        = "chinaazuremonitor"
-	azureMonitorUSGovernment = "govazuremonitor"
-	azureMonitorCustomized   = "customizedazuremonitor"
-)
-
-func getAuthType(cfg *setting.Cfg, jsonData *types.AzureClientSettings) string {
-	if azureAuthType := jsonData.AzureAuthType; azureAuthType != "" {
-		return azureAuthType
-	} else {
-		tenantId := jsonData.TenantId
-		clientId := jsonData.ClientId
-
-		// If authentication type isn't explicitly specified and datasource has client credentials,
-		// then this is existing datasource which is configured for app registration (client secret)
-		if tenantId != "" && clientId != "" {
-			return azcredentials.AzureAuthClientSecret
-		}
-
-		// For newly created datasource with no configuration the order is as follows:
-		// Managed identity is the default if enabled
-		// Workload identity is the next option if enabled
-		// Client secret is the final fallback
-		if cfg.Azure.ManagedIdentityEnabled {
-			return azcredentials.AzureAuthManagedIdentity
-		} else if cfg.Azure.WorkloadIdentityEnabled {
-			return azcredentials.AzureAuthWorkloadIdentity
-		} else {
-			return azcredentials.AzureAuthClientSecret
-		}
-	}
-}
-
-func getDefaultAzureCloud(cfg *setting.Cfg) (string, error) {
-	// Allow only known cloud names
-	cloudName := ""
-	if cfg != nil && cfg.Azure != nil {
-		cloudName = cfg.Azure.Cloud
-	}
-	switch cloudName {
-	case azsettings.AzurePublic:
-		return azsettings.AzurePublic, nil
-	case azsettings.AzureChina:
-		return azsettings.AzureChina, nil
-	case azsettings.AzureUSGovernment:
-		return azsettings.AzureUSGovernment, nil
-	case azsettings.AzureCustomized:
-		return azsettings.AzureCustomized, nil
-	case "":
-		// Not set cloud defaults to public
-		return azsettings.AzurePublic, nil
-	default:
-		err := fmt.Errorf("the cloud '%s' not supported", cloudName)
-		return "", err
-	}
-}
-
-func normalizeAzureCloud(cloudName string) (string, error) {
-	switch cloudName {
-	case azureMonitorPublic:
-		return azsettings.AzurePublic, nil
-	case azureMonitorChina:
-		return azsettings.AzureChina, nil
-	case azureMonitorUSGovernment:
-		return azsettings.AzureUSGovernment, nil
-	case azureMonitorCustomized:
-		return azsettings.AzureCustomized, nil
-	default:
-		err := fmt.Errorf("the cloud '%s' not supported", cloudName)
-		return "", err
-	}
-}
-
-func getAzureCloud(cfg *setting.Cfg, jsonData *types.AzureClientSettings) (string, error) {
-	authType := getAuthType(cfg, jsonData)
-	switch authType {
-	case azcredentials.AzureAuthManagedIdentity, azcredentials.AzureAuthWorkloadIdentity:
-		// In case of managed identity and workload identity, the cloud is always same as where Grafana is hosted
-		return getDefaultAzureCloud(cfg)
-	case azcredentials.AzureAuthClientSecret:
-		if cloud := jsonData.CloudName; cloud != "" {
-			return normalizeAzureCloud(cloud)
-		} else {
-			return getDefaultAzureCloud(cfg)
-		}
-	default:
-		err := fmt.Errorf("the authentication type '%s' not supported", authType)
-		return "", err
-	}
-}
-
-func getAzureCredentials(cfg *setting.Cfg, jsonData *types.AzureClientSettings, secureJsonData map[string]string) (azcredentials.AzureCredentials, error) {
-	authType := getAuthType(cfg, jsonData)
-
-	switch authType {
-	case azcredentials.AzureAuthManagedIdentity:
-		credentials := &azcredentials.AzureManagedIdentityCredentials{}
-		return credentials, nil
-	case azcredentials.AzureAuthWorkloadIdentity:
-		credentials := &azcredentials.AzureWorkloadIdentityCredentials{}
-		return credentials, nil
-	case azcredentials.AzureAuthClientSecret:
-		cloud, err := getAzureCloud(cfg, jsonData)
-		if err != nil {
-			return nil, err
-		}
-		if secureJsonData["clientSecret"] == "" {
-			return nil, fmt.Errorf("unable to instantiate credentials, clientSecret must be set")
-		}
-		credentials := &azcredentials.AzureClientSecretCredentials{
-			AzureCloud:   cloud,
-			TenantId:     jsonData.TenantId,
-			ClientId:     jsonData.ClientId,
-			ClientSecret: secureJsonData["clientSecret"],
-		}
-		return credentials, nil
-
-	default:
-		err := fmt.Errorf("the authentication type '%s' not supported", authType)
-		return nil, err
-	}
-}
diff --git a/pkg/tsdb/azuremonitor/credentials_test.go b/pkg/tsdb/azuremonitor/credentials_test.go
deleted file mode 100644
index 58ea12660cd3e..0000000000000
--- a/pkg/tsdb/azuremonitor/credentials_test.go
+++ /dev/null
@@ -1,266 +0,0 @@
-package azuremonitor
-
-import (
-	"testing"
-
-	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/types"
-
-	"github.com/grafana/grafana-azure-sdk-go/azcredentials"
-	"github.com/grafana/grafana-azure-sdk-go/azsettings"
-
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestCredentials_getAuthType(t *testing.T) {
-	cfg := &setting.Cfg{
-		Azure: &azsettings.AzureSettings{},
-	}
-
-	t.Run("when managed identities enabled", func(t *testing.T) {
-		cfg.Azure.ManagedIdentityEnabled = true
-
-		t.Run("should be client secret if auth type is set to client secret", func(t *testing.T) {
-			jsonData := &types.AzureClientSettings{
-				AzureAuthType: azcredentials.AzureAuthClientSecret,
-			}
-
-			authType := getAuthType(cfg, jsonData)
-
-			assert.Equal(t, azcredentials.AzureAuthClientSecret, authType)
-		})
-
-		t.Run("should be managed identity if datasource not configured", func(t *testing.T) {
-			jsonData := &types.AzureClientSettings{
-				AzureAuthType: "",
-			}
-
-			authType := getAuthType(cfg, jsonData)
-
-			assert.Equal(t, azcredentials.AzureAuthManagedIdentity, authType)
-		})
-
-		t.Run("should be client secret if auth type not specified but credentials configured", func(t *testing.T) {
-			jsonData := &types.AzureClientSettings{
-				AzureAuthType: "",
-				TenantId:      "9b9d90ee-a5cc-49c2-b97e-0d1b0f086b5c",
-				ClientId:      "849ccbb0-92eb-4226-b228-ef391abd8fe6",
-			}
-
-			authType := getAuthType(cfg, jsonData)
-
-			assert.Equal(t, azcredentials.AzureAuthClientSecret, authType)
-		})
-	})
-
-	t.Run("when managed identities disabled", func(t *testing.T) {
-		cfg.Azure.ManagedIdentityEnabled = false
-
-		t.Run("should be managed identity if auth type is set to managed identity", func(t *testing.T) {
-			jsonData := &types.AzureClientSettings{
-				AzureAuthType: azcredentials.AzureAuthManagedIdentity,
-			}
-
-			authType := getAuthType(cfg, jsonData)
-
-			assert.Equal(t, azcredentials.AzureAuthManagedIdentity, authType)
-		})
-
-		t.Run("should be client secret if datasource not configured", func(t *testing.T) {
-			jsonData := &types.AzureClientSettings{
-				AzureAuthType: "",
-			}
-
-			authType := getAuthType(cfg, jsonData)
-
-			assert.Equal(t, azcredentials.AzureAuthClientSecret, authType)
-		})
-	})
-
-	t.Run("when workload identities enabled", func(t *testing.T) {
-		cfg.Azure.WorkloadIdentityEnabled = true
-
-		t.Run("should be client secret if auth type is set to client secret", func(t *testing.T) {
-			jsonData := &types.AzureClientSettings{
-				AzureAuthType: azcredentials.AzureAuthClientSecret,
-			}
-
-			authType := getAuthType(cfg, jsonData)
-
-			assert.Equal(t, azcredentials.AzureAuthClientSecret, authType)
-		})
-
-		t.Run("should be workload identity if datasource not configured and managed identity is disabled", func(t *testing.T) {
-			jsonData := &types.AzureClientSettings{
-				AzureAuthType: "",
-			}
-
-			authType := getAuthType(cfg, jsonData)
-
-			assert.Equal(t, azcredentials.AzureAuthWorkloadIdentity, authType)
-		})
-
-		t.Run("should be client secret if auth type not specified but credentials configured", func(t *testing.T) {
-			jsonData := &types.AzureClientSettings{
-				AzureAuthType: "",
-				TenantId:      "9b9d90ee-a5cc-49c2-b97e-0d1b0f086b5c",
-				ClientId:      "849ccbb0-92eb-4226-b228-ef391abd8fe6",
-			}
-
-			authType := getAuthType(cfg, jsonData)
-
-			assert.Equal(t, azcredentials.AzureAuthClientSecret, authType)
-		})
-	})
-
-	t.Run("when workload identities disabled", func(t *testing.T) {
-		cfg.Azure.WorkloadIdentityEnabled = false
-
-		t.Run("should be workload identity if auth type is set to workload identity", func(t *testing.T) {
-			jsonData := &types.AzureClientSettings{
-				AzureAuthType: azcredentials.AzureAuthWorkloadIdentity,
-			}
-
-			authType := getAuthType(cfg, jsonData)
-
-			assert.Equal(t, azcredentials.AzureAuthWorkloadIdentity, authType)
-		})
-
-		t.Run("should be client secret if datasource not configured", func(t *testing.T) {
-			jsonData := &types.AzureClientSettings{
-				AzureAuthType: "",
-			}
-
-			authType := getAuthType(cfg, jsonData)
-
-			assert.Equal(t, azcredentials.AzureAuthClientSecret, authType)
-		})
-	})
-}
-
-func TestCredentials_getAzureCloud(t *testing.T) {
-	cfg := &setting.Cfg{
-		Azure: &azsettings.AzureSettings{
-			Cloud: azsettings.AzureChina,
-		},
-	}
-
-	t.Run("when auth type is managed identity", func(t *testing.T) {
-		jsonData := &types.AzureClientSettings{
-			AzureAuthType: azcredentials.AzureAuthManagedIdentity,
-			CloudName:     azureMonitorUSGovernment,
-		}
-
-		t.Run("should be from server configuration regardless of datasource value", func(t *testing.T) {
-			cloud, err := getAzureCloud(cfg, jsonData)
-			require.NoError(t, err)
-
-			assert.Equal(t, azsettings.AzureChina, cloud)
-		})
-
-		t.Run("should be public if not set in server configuration", func(t *testing.T) {
-			cfg := &setting.Cfg{
-				Azure: &azsettings.AzureSettings{
-					Cloud: "",
-				},
-			}
-
-			cloud, err := getAzureCloud(cfg, jsonData)
-			require.NoError(t, err)
-
-			assert.Equal(t, azsettings.AzurePublic, cloud)
-		})
-	})
-
-	t.Run("when auth type is client secret", func(t *testing.T) {
-		t.Run("should be from datasource value normalized to known cloud name", func(t *testing.T) {
-			jsonData := &types.AzureClientSettings{
-				AzureAuthType: azcredentials.AzureAuthClientSecret,
-				CloudName:     azureMonitorUSGovernment,
-			}
-
-			cloud, err := getAzureCloud(cfg, jsonData)
-			require.NoError(t, err)
-
-			assert.Equal(t, azsettings.AzureUSGovernment, cloud)
-		})
-
-		t.Run("should be from server configuration if not set in datasource", func(t *testing.T) {
-			jsonData := &types.AzureClientSettings{
-				AzureAuthType: azcredentials.AzureAuthClientSecret,
-				CloudName:     "",
-			}
-
-			cloud, err := getAzureCloud(cfg, jsonData)
-			require.NoError(t, err)
-
-			assert.Equal(t, azsettings.AzureChina, cloud)
-		})
-	})
-}
-
-func TestCredentials_getAzureCredentials(t *testing.T) {
-	cfg := &setting.Cfg{
-		Azure: &azsettings.AzureSettings{
-			Cloud: azsettings.AzureChina,
-		},
-	}
-
-	secureJsonData := map[string]string{
-		"clientSecret": "59e3498f-eb12-4943-b8f0-a5aa42640058",
-	}
-
-	t.Run("when auth type is managed identity", func(t *testing.T) {
-		jsonData := &types.AzureClientSettings{
-			AzureAuthType: azcredentials.AzureAuthManagedIdentity,
-			CloudName:     azureMonitorUSGovernment,
-			TenantId:      "9b9d90ee-a5cc-49c2-b97e-0d1b0f086b5c",
-			ClientId:      "849ccbb0-92eb-4226-b228-ef391abd8fe6",
-		}
-
-		t.Run("should return managed identity credentials", func(t *testing.T) {
-			credentials, err := getAzureCredentials(cfg, jsonData, secureJsonData)
-			require.NoError(t, err)
-			require.IsType(t, &azcredentials.AzureManagedIdentityCredentials{}, credentials)
-			msiCredentials := credentials.(*azcredentials.AzureManagedIdentityCredentials)
-
-			// Azure Monitor datasource doesn't support user-assigned managed identities (ClientId is always empty)
-			assert.Equal(t, "", msiCredentials.ClientId)
-		})
-	})
-
-	t.Run("when auth type is client secret", func(t *testing.T) {
-		jsonData := &types.AzureClientSettings{
-			AzureAuthType: azcredentials.AzureAuthClientSecret,
-			CloudName:     azureMonitorUSGovernment,
-			TenantId:      "9b9d90ee-a5cc-49c2-b97e-0d1b0f086b5c",
-			ClientId:      "849ccbb0-92eb-4226-b228-ef391abd8fe6",
-		}
-
-		t.Run("should return client secret credentials", func(t *testing.T) {
-			cfg := &setting.Cfg{}
-
-			credentials, err := getAzureCredentials(cfg, jsonData, secureJsonData)
-			require.NoError(t, err)
-			require.IsType(t, &azcredentials.AzureClientSecretCredentials{}, credentials)
-			clientSecretCredentials := credentials.(*azcredentials.AzureClientSecretCredentials)
-
-			assert.Equal(t, azsettings.AzureUSGovernment, clientSecretCredentials.AzureCloud)
-			assert.Equal(t, "9b9d90ee-a5cc-49c2-b97e-0d1b0f086b5c", clientSecretCredentials.TenantId)
-			assert.Equal(t, "849ccbb0-92eb-4226-b228-ef391abd8fe6", clientSecretCredentials.ClientId)
-			assert.Equal(t, "59e3498f-eb12-4943-b8f0-a5aa42640058", clientSecretCredentials.ClientSecret)
-
-			// Azure Monitor datasource doesn't support custom IdP authorities (Authority is always empty)
-			assert.Equal(t, "", clientSecretCredentials.Authority)
-		})
-
-		t.Run("should error if no client secret is set", func(t *testing.T) {
-			cfg := &setting.Cfg{}
-			_, err := getAzureCredentials(cfg, jsonData, map[string]string{
-				"clientSecret": "",
-			})
-			require.ErrorContains(t, err, "clientSecret must be set")
-		})
-	})
-}
diff --git a/pkg/tsdb/azuremonitor/httpclient.go b/pkg/tsdb/azuremonitor/httpclient.go
index 7aef1b53e0514..53fd0735d7a8b 100644
--- a/pkg/tsdb/azuremonitor/httpclient.go
+++ b/pkg/tsdb/azuremonitor/httpclient.go
@@ -6,12 +6,12 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/grafana/grafana-azure-sdk-go/azcredentials"
-	"github.com/grafana/grafana-azure-sdk-go/azhttpclient"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azcredentials"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azhttpclient"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 
-	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/types"
 )
 
@@ -21,14 +21,14 @@ type Provider interface {
 	GetTLSConfig(...httpclient.Options) (*tls.Config, error)
 }
 
-func newHTTPClient(ctx context.Context, route types.AzRoute, model types.DatasourceInfo, settings *backend.DataSourceInstanceSettings, cfg *setting.Cfg, clientProvider Provider) (*http.Client, error) {
+func newHTTPClient(ctx context.Context, route types.AzRoute, model types.DatasourceInfo, settings *backend.DataSourceInstanceSettings, azureSettings *azsettings.AzureSettings, clientProvider Provider) (*http.Client, error) {
 	clientOpts, err := settings.HTTPClientOptions(ctx)
 	if err != nil {
 		return nil, fmt.Errorf("error getting HTTP options: %w", err)
 	}
 
 	for header, value := range route.Headers {
-		clientOpts.Headers[header] = value
+		clientOpts.Header.Add(header, value)
 	}
 
 	// Use Azure credentials if the route has OAuth scopes configured
@@ -37,7 +37,8 @@ func newHTTPClient(ctx context.Context, route types.AzRoute, model types.Datasou
 			return nil, fmt.Errorf("unable to initialize HTTP Client: clientSecret not found")
 		}
 
-		authOpts := azhttpclient.NewAuthOptions(cfg.Azure)
+		authOpts := azhttpclient.NewAuthOptions(azureSettings)
+		authOpts.AllowUserIdentity()
 		authOpts.Scopes(route.Scopes)
 		azhttpclient.AddAzureAuthentication(&clientOpts, authOpts, model.Credentials)
 	}
diff --git a/pkg/tsdb/azuremonitor/httpclient_test.go b/pkg/tsdb/azuremonitor/httpclient_test.go
index 9cd4a41c0cc6c..ea237603444d9 100644
--- a/pkg/tsdb/azuremonitor/httpclient_test.go
+++ b/pkg/tsdb/azuremonitor/httpclient_test.go
@@ -7,11 +7,11 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/grafana/grafana-azure-sdk-go/azcredentials"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azcredentials"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 
-	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -32,7 +32,9 @@ func TestHttpClient_AzureCredentials(t *testing.T) {
 		},
 	}
 
-	cfg := &setting.Cfg{}
+	azureSettings := &azsettings.AzureSettings{
+		Cloud: azsettings.AzurePublic,
+	}
 	provider := &fakeHttpClientProvider{}
 
 	t.Run("should have Azure middleware when scopes provided", func(t *testing.T) {
@@ -40,7 +42,7 @@ func TestHttpClient_AzureCredentials(t *testing.T) {
 			Scopes: []string{"https://management.azure.com/.default"},
 		}
 
-		_, err := newHTTPClient(context.Background(), route, model, settings, cfg, provider)
+		_, err := newHTTPClient(context.Background(), route, model, settings, azureSettings, provider)
 		require.NoError(t, err)
 
 		require.NotNil(t, provider.opts)
@@ -53,7 +55,7 @@ func TestHttpClient_AzureCredentials(t *testing.T) {
 			Scopes: []string{},
 		}
 
-		_, err := newHTTPClient(context.Background(), route, model, settings, cfg, provider)
+		_, err := newHTTPClient(context.Background(), route, model, settings, azureSettings, provider)
 		require.NoError(t, err)
 
 		assert.NotNil(t, provider.opts)
@@ -70,18 +72,18 @@ func TestHttpClient_AzureCredentials(t *testing.T) {
 			},
 		}
 
-		res := map[string]string{
-			"GrafanaHeader": "GrafanaValue",
-			"AzureHeader":   "AzureValue",
+		res := http.Header{
+			"Grafanaheader": {"GrafanaValue"},
+			"Azureheader":   {"AzureValue"},
 		}
-		_, err := newHTTPClient(context.Background(), route, model, settings, cfg, provider)
+		_, err := newHTTPClient(context.Background(), route, model, settings, azureSettings, provider)
 		require.NoError(t, err)
 
 		assert.NotNil(t, provider.opts)
 
-		if provider.opts.Headers != nil {
-			assert.Len(t, provider.opts.Headers, 2)
-			assert.Equal(t, res, provider.opts.Headers)
+		if provider.opts.Header != nil {
+			assert.Len(t, provider.opts.Header, 2)
+			assert.Equal(t, res, provider.opts.Header)
 		}
 	})
 }
diff --git a/pkg/tsdb/azuremonitor/kinds/dataquery/types_dataquery_gen.go b/pkg/tsdb/azuremonitor/kinds/dataquery/types_dataquery_gen.go
index 95a779e019b17..0741de9a08559 100644
--- a/pkg/tsdb/azuremonitor/kinds/dataquery/types_dataquery_gen.go
+++ b/pkg/tsdb/azuremonitor/kinds/dataquery/types_dataquery_gen.go
@@ -98,10 +98,9 @@ const (
 
 // AppInsightsGroupByQuery defines model for AppInsightsGroupByQuery.
 type AppInsightsGroupByQuery struct {
-	BaseGrafanaTemplateVariableQuery
-	Kind       AppInsightsGroupByQueryKind `json:"kind"`
-	MetricName string                      `json:"metricName"`
-	RawQuery   *string                     `json:"rawQuery,omitempty"`
+	Kind       *AppInsightsGroupByQueryKind `json:"kind,omitempty"`
+	MetricName *string                      `json:"metricName,omitempty"`
+	RawQuery   *string                      `json:"rawQuery,omitempty"`
 }
 
 // AppInsightsGroupByQueryKind defines model for AppInsightsGroupByQuery.Kind.
@@ -109,9 +108,8 @@ type AppInsightsGroupByQueryKind string
 
 // AppInsightsMetricNameQuery defines model for AppInsightsMetricNameQuery.
 type AppInsightsMetricNameQuery struct {
-	BaseGrafanaTemplateVariableQuery
-	Kind     AppInsightsMetricNameQueryKind `json:"kind"`
-	RawQuery *string                        `json:"rawQuery,omitempty"`
+	Kind     *AppInsightsMetricNameQueryKind `json:"kind,omitempty"`
+	RawQuery *string                         `json:"rawQuery,omitempty"`
 }
 
 // AppInsightsMetricNameQueryKind defines model for AppInsightsMetricNameQuery.Kind.
@@ -221,20 +219,33 @@ type AzureMonitorDataQuery = map[string]any
 
 // AzureMonitorQuery defines model for AzureMonitorQuery.
 type AzureMonitorQuery struct {
-	// DataQuery These are the common properties available to all queries in all datasources.
-	// Specific implementations will *extend* this interface, adding the required
-	// properties for the given context.
-	DataQuery
-
 	// Azure Monitor Logs sub-query properties
 	AzureLogAnalytics  *AzureLogsQuery          `json:"azureLogAnalytics,omitempty"`
 	AzureMonitor       *AzureMetricQuery        `json:"azureMonitor,omitempty"`
 	AzureResourceGraph *AzureResourceGraphQuery `json:"azureResourceGraph,omitempty"`
 
 	// Application Insights Traces sub-query properties
-	AzureTraces               *AzureTracesQuery `json:"azureTraces,omitempty"`
-	GrafanaTemplateVariableFn *any              `json:"grafanaTemplateVariableFn,omitempty"`
-	Namespace                 *string           `json:"namespace,omitempty"`
+	AzureTraces *AzureTracesQuery `json:"azureTraces,omitempty"`
+
+	// For mixed data sources the selected datasource is on the query level.
+	// For non mixed scenarios this is undefined.
+	// TODO find a better way to do this ^ that's friendly to schema
+	// TODO this shouldn't be unknown but DataSourceRef | null
+	Datasource                *any `json:"datasource,omitempty"`
+	GrafanaTemplateVariableFn *any `json:"grafanaTemplateVariableFn,omitempty"`
+
+	// If hide is set to true, Grafana will filter out the response(s) associated with this query before returning it to the panel.
+	Hide      *bool   `json:"hide,omitempty"`
+	Namespace *string `json:"namespace,omitempty"`
+
+	// Specify the query flavor
+	// TODO make this required and give it a default
+	QueryType *string `json:"queryType,omitempty"`
+
+	// A unique identifier for the query within the list of targets.
+	// In server side expressions, the refId is used as a variable name to identify results.
+	// By default, the UI will assign A->Z; however setting meaningful names may be useful.
+	RefId *string `json:"refId,omitempty"`
 
 	// Azure Monitor query type.
 	// queryType: #AzureQueryType
@@ -318,9 +329,7 @@ type DataQuery struct {
 	// TODO this shouldn't be unknown but DataSourceRef | null
 	Datasource *any `json:"datasource,omitempty"`
 
-	// Hide true if query is disabled (ie should not be returned to the dashboard)
-	// Note this does not always imply that the query should not be executed since
-	// the results from a hidden query may be used as the input to other queries (SSE etc)
+	// If hide is set to true, Grafana will filter out the response(s) associated with this query before returning it to the panel.
 	Hide *bool `json:"hide,omitempty"`
 
 	// Specify the query flavor
@@ -336,15 +345,14 @@ type DataQuery struct {
 // GrafanaTemplateVariableQueryType defines model for GrafanaTemplateVariableQueryType.
 type GrafanaTemplateVariableQueryType string
 
-// MetricDefinitionsQuery defines model for MetricDefinitionsQuery.
+// @deprecated Use MetricNamespaceQuery instead
 type MetricDefinitionsQuery struct {
-	BaseGrafanaTemplateVariableQuery
-	Kind            MetricDefinitionsQueryKind `json:"kind"`
-	MetricNamespace *string                    `json:"metricNamespace,omitempty"`
-	RawQuery        *string                    `json:"rawQuery,omitempty"`
-	ResourceGroup   string                     `json:"resourceGroup"`
-	ResourceName    *string                    `json:"resourceName,omitempty"`
-	Subscription    string                     `json:"subscription"`
+	Kind            *MetricDefinitionsQueryKind `json:"kind,omitempty"`
+	MetricNamespace *string                     `json:"metricNamespace,omitempty"`
+	RawQuery        *string                     `json:"rawQuery,omitempty"`
+	ResourceGroup   *string                     `json:"resourceGroup,omitempty"`
+	ResourceName    *string                     `json:"resourceName,omitempty"`
+	Subscription    *string                     `json:"subscription,omitempty"`
 }
 
 // MetricDefinitionsQueryKind defines model for MetricDefinitionsQuery.Kind.
@@ -352,13 +360,12 @@ type MetricDefinitionsQueryKind string
 
 // MetricNamesQuery defines model for MetricNamesQuery.
 type MetricNamesQuery struct {
-	BaseGrafanaTemplateVariableQuery
-	Kind            MetricNamesQueryKind `json:"kind"`
-	MetricNamespace string               `json:"metricNamespace"`
-	RawQuery        *string              `json:"rawQuery,omitempty"`
-	ResourceGroup   string               `json:"resourceGroup"`
-	ResourceName    string               `json:"resourceName"`
-	Subscription    string               `json:"subscription"`
+	Kind            *MetricNamesQueryKind `json:"kind,omitempty"`
+	MetricNamespace *string               `json:"metricNamespace,omitempty"`
+	RawQuery        *string               `json:"rawQuery,omitempty"`
+	ResourceGroup   *string               `json:"resourceGroup,omitempty"`
+	ResourceName    *string               `json:"resourceName,omitempty"`
+	Subscription    *string               `json:"subscription,omitempty"`
 }
 
 // MetricNamesQueryKind defines model for MetricNamesQuery.Kind.
@@ -366,13 +373,12 @@ type MetricNamesQueryKind string
 
 // MetricNamespaceQuery defines model for MetricNamespaceQuery.
 type MetricNamespaceQuery struct {
-	BaseGrafanaTemplateVariableQuery
-	Kind            MetricNamespaceQueryKind `json:"kind"`
-	MetricNamespace *string                  `json:"metricNamespace,omitempty"`
-	RawQuery        *string                  `json:"rawQuery,omitempty"`
-	ResourceGroup   string                   `json:"resourceGroup"`
-	ResourceName    *string                  `json:"resourceName,omitempty"`
-	Subscription    string                   `json:"subscription"`
+	Kind            *MetricNamespaceQueryKind `json:"kind,omitempty"`
+	MetricNamespace *string                   `json:"metricNamespace,omitempty"`
+	RawQuery        *string                   `json:"rawQuery,omitempty"`
+	ResourceGroup   *string                   `json:"resourceGroup,omitempty"`
+	ResourceName    *string                   `json:"resourceName,omitempty"`
+	Subscription    *string                   `json:"subscription,omitempty"`
 }
 
 // MetricNamespaceQueryKind defines model for MetricNamespaceQuery.Kind.
@@ -380,10 +386,9 @@ type MetricNamespaceQueryKind string
 
 // ResourceGroupsQuery defines model for ResourceGroupsQuery.
 type ResourceGroupsQuery struct {
-	BaseGrafanaTemplateVariableQuery
-	Kind         ResourceGroupsQueryKind `json:"kind"`
-	RawQuery     *string                 `json:"rawQuery,omitempty"`
-	Subscription string                  `json:"subscription"`
+	Kind         *ResourceGroupsQueryKind `json:"kind,omitempty"`
+	RawQuery     *string                  `json:"rawQuery,omitempty"`
+	Subscription *string                  `json:"subscription,omitempty"`
 }
 
 // ResourceGroupsQueryKind defines model for ResourceGroupsQuery.Kind.
@@ -391,12 +396,11 @@ type ResourceGroupsQueryKind string
 
 // ResourceNamesQuery defines model for ResourceNamesQuery.
 type ResourceNamesQuery struct {
-	BaseGrafanaTemplateVariableQuery
-	Kind            ResourceNamesQueryKind `json:"kind"`
-	MetricNamespace string                 `json:"metricNamespace"`
-	RawQuery        *string                `json:"rawQuery,omitempty"`
-	ResourceGroup   string                 `json:"resourceGroup"`
-	Subscription    string                 `json:"subscription"`
+	Kind            *ResourceNamesQueryKind `json:"kind,omitempty"`
+	MetricNamespace *string                 `json:"metricNamespace,omitempty"`
+	RawQuery        *string                 `json:"rawQuery,omitempty"`
+	ResourceGroup   *string                 `json:"resourceGroup,omitempty"`
+	Subscription    *string                 `json:"subscription,omitempty"`
 }
 
 // ResourceNamesQueryKind defines model for ResourceNamesQuery.Kind.
@@ -407,9 +411,8 @@ type ResultFormat string
 
 // SubscriptionsQuery defines model for SubscriptionsQuery.
 type SubscriptionsQuery struct {
-	BaseGrafanaTemplateVariableQuery
-	Kind     SubscriptionsQueryKind `json:"kind"`
-	RawQuery *string                `json:"rawQuery,omitempty"`
+	Kind     *SubscriptionsQueryKind `json:"kind,omitempty"`
+	RawQuery *string                 `json:"rawQuery,omitempty"`
 }
 
 // SubscriptionsQueryKind defines model for SubscriptionsQuery.Kind.
@@ -417,9 +420,8 @@ type SubscriptionsQueryKind string
 
 // UnknownQuery defines model for UnknownQuery.
 type UnknownQuery struct {
-	BaseGrafanaTemplateVariableQuery
-	Kind     UnknownQueryKind `json:"kind"`
-	RawQuery *string          `json:"rawQuery,omitempty"`
+	Kind     *UnknownQueryKind `json:"kind,omitempty"`
+	RawQuery *string           `json:"rawQuery,omitempty"`
 }
 
 // UnknownQueryKind defines model for UnknownQuery.Kind.
@@ -427,10 +429,9 @@ type UnknownQueryKind string
 
 // WorkspacesQuery defines model for WorkspacesQuery.
 type WorkspacesQuery struct {
-	BaseGrafanaTemplateVariableQuery
-	Kind         WorkspacesQueryKind `json:"kind"`
-	RawQuery     *string             `json:"rawQuery,omitempty"`
-	Subscription string              `json:"subscription"`
+	Kind         *WorkspacesQueryKind `json:"kind,omitempty"`
+	RawQuery     *string              `json:"rawQuery,omitempty"`
+	Subscription *string              `json:"subscription,omitempty"`
 }
 
 // WorkspacesQueryKind defines model for WorkspacesQuery.Kind.
diff --git a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go
index edb636b3baf68..cdfdc6a147d4b 100644
--- a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go
+++ b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go
@@ -17,6 +17,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"go.opentelemetry.io/otel/attribute"
@@ -30,7 +31,8 @@ import (
 
 // AzureLogAnalyticsDatasource calls the Azure Log Analytics API's
 type AzureLogAnalyticsDatasource struct {
-	Proxy types.ServiceProxy
+	Proxy  types.ServiceProxy
+	Logger log.Logger
 }
 
 // AzureLogAnalyticsQuery is the query request that is built from the saved values for
@@ -300,7 +302,7 @@ func (e *AzureLogAnalyticsDatasource) executeQuery(ctx context.Context, query *A
 
 	defer func() {
 		if err := res.Body.Close(); err != nil {
-			backend.Logger.Warn("Failed to close response body", "err", err)
+			e.Logger.Warn("Failed to close response body", "err", err)
 		}
 	}()
 
@@ -324,12 +326,7 @@ func (e *AzureLogAnalyticsDatasource) executeQuery(ctx context.Context, query *A
 		return &dataResponse, nil
 	}
 
-	azurePortalBaseUrl, err := GetAzurePortalUrl(dsInfo.Cloud)
-	if err != nil {
-		return nil, err
-	}
-
-	queryUrl, err := getQueryUrl(query.Query, query.Resources, azurePortalBaseUrl, query.TimeRange)
+	queryUrl, err := getQueryUrl(query.Query, query.Resources, dsInfo.Routes["Azure Portal"].URL, query.TimeRange)
 	if err != nil {
 		return nil, err
 	}
@@ -363,7 +360,7 @@ func (e *AzureLogAnalyticsDatasource) executeQuery(ctx context.Context, query *A
 	}
 
 	// Use the parent span query for the parent span data link
-	err = addDataLinksToFields(query, azurePortalBaseUrl, frame, dsInfo, queryUrl)
+	err = addDataLinksToFields(query, dsInfo.Routes["Azure Portal"].URL, frame, dsInfo, queryUrl)
 	if err != nil {
 		return nil, err
 	}
@@ -413,9 +410,7 @@ func addTraceDataLinksToFields(query *AzureLogAnalyticsQuery, azurePortalBaseUrl
 
 	logsQueryType := string(dataquery.AzureQueryTypeAzureLogAnalytics)
 	logsJSONModel := dataquery.AzureMonitorQuery{
-		DataQuery: dataquery.DataQuery{
-			QueryType: &logsQueryType,
-		},
+		QueryType: &logsQueryType,
 		AzureLogAnalytics: &dataquery.AzureLogsQuery{
 			Query:     &query.TraceLogsExploreQuery,
 			Resources: []string{queryJSONModel.AzureTraces.Resources[0]},
@@ -488,11 +483,19 @@ func (e *AzureLogAnalyticsDatasource) createRequest(ctx context.Context, queryUR
 	}
 
 	if len(query.Resources) > 1 && query.QueryType == dataquery.AzureQueryTypeAzureLogAnalytics && !query.AppInsightsQuery {
-		body["workspaces"] = query.Resources
+		str := strings.ToLower(query.Resources[0])
+
+		if strings.Contains(str, "microsoft.operationalinsights/workspaces") {
+			body["workspaces"] = query.Resources
+		} else {
+			body["resources"] = query.Resources
+		}
 	}
+
 	if query.AppInsightsQuery {
 		body["applications"] = query.Resources
 	}
+
 	jsonValue, err := json.Marshal(body)
 	if err != nil {
 		return nil, fmt.Errorf("%v: %w", "failed to create request", err)
@@ -502,6 +505,7 @@ func (e *AzureLogAnalyticsDatasource) createRequest(ctx context.Context, queryUR
 	if err != nil {
 		return nil, fmt.Errorf("%v: %w", "failed to create request", err)
 	}
+
 	req.URL.Path = "/"
 	req.Header.Set("Content-Type", "application/json")
 	req.URL.Path = path.Join(req.URL.Path, query.URL)
@@ -610,7 +614,7 @@ func getCorrelationWorkspaces(ctx context.Context, baseResource string, resource
 
 		defer func() {
 			if err := res.Body.Close(); err != nil {
-				backend.Logger.Warn("Failed to close response body", "err", err)
+				azMonService.Logger.Warn("Failed to close response body", "err", err)
 			}
 		}()
 
@@ -714,7 +718,7 @@ func (e *AzureLogAnalyticsDatasource) unmarshalResponse(res *http.Response) (Azu
 	}
 	defer func() {
 		if err := res.Body.Close(); err != nil {
-			backend.Logger.Warn("Failed to close response body", "err", err)
+			e.Logger.Warn("Failed to close response body", "err", err)
 		}
 	}()
 
diff --git a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go
index 69a7edbf4bc7a..56e56a545bb54 100644
--- a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go
+++ b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go
@@ -1553,6 +1553,42 @@ func TestLogAnalyticsCreateRequest(t *testing.T) {
 			t.Errorf("Unexpected Body: %v", cmp.Diff(string(body), expectedBody))
 		}
 	})
+
+	t.Run("correctly classifies resources as workspaces when matching criteria", func(t *testing.T) {
+		ds := AzureLogAnalyticsDatasource{}
+		req, err := ds.createRequest(ctx, url, &AzureLogAnalyticsQuery{
+			Resources:        []string{"/subscriptions/test-sub/resourceGroups/test-rg/providers/microsoft.operationalInsights/workSpaces/ws1", "microsoft.operationalInsights/workspaces/ws2"}, // Note different casings and partial paths
+			Query:            "Perf",
+			QueryType:        dataquery.AzureQueryTypeAzureLogAnalytics,
+			AppInsightsQuery: false,
+			DashboardTime:    false,
+		})
+		require.NoError(t, err)
+		expectedBody := `{"query":"Perf","workspaces":["/subscriptions/test-sub/resourceGroups/test-rg/providers/microsoft.operationalInsights/workSpaces/ws1","microsoft.operationalInsights/workspaces/ws2"]}` // Expecting resources to be classified as workspaces
+		body, err := io.ReadAll(req.Body)
+		require.NoError(t, err)
+		if !cmp.Equal(string(body), expectedBody) {
+			t.Errorf("Unexpected Body: %v", cmp.Diff(string(body), expectedBody))
+		}
+	})
+
+	t.Run("correctly passes multiple resources not classified as workspaces", func(t *testing.T) {
+		ds := AzureLogAnalyticsDatasource{}
+		req, err := ds.createRequest(ctx, url, &AzureLogAnalyticsQuery{
+			Resources:        []string{"/subscriptions/test-sub/resourceGroups/test-rg/providers/SomeOtherService/serviceInstances/r1", "/subscriptions/test-sub/resourceGroups/test-rg/providers/SomeOtherService/serviceInstances/r2"},
+			Query:            "Perf",
+			QueryType:        dataquery.AzureQueryTypeAzureLogAnalytics,
+			AppInsightsQuery: false,
+			DashboardTime:    false,
+		})
+		require.NoError(t, err)
+		expectedBody := `{"query":"Perf","resources":["/subscriptions/test-sub/resourceGroups/test-rg/providers/SomeOtherService/serviceInstances/r1","/subscriptions/test-sub/resourceGroups/test-rg/providers/SomeOtherService/serviceInstances/r2"]}`
+		body, err := io.ReadAll(req.Body)
+		require.NoError(t, err)
+		if !cmp.Equal(string(body), expectedBody) {
+			t.Errorf("Unexpected Body: %v", cmp.Diff(string(body), expectedBody))
+		}
+	})
 }
 
 func Test_executeQueryErrorWithDifferentLogAnalyticsCreds(t *testing.T) {
diff --git a/pkg/tsdb/azuremonitor/loganalytics/utils.go b/pkg/tsdb/azuremonitor/loganalytics/utils.go
index 2a3f36e64c9d4..13c6b1afd33b3 100644
--- a/pkg/tsdb/azuremonitor/loganalytics/utils.go
+++ b/pkg/tsdb/azuremonitor/loganalytics/utils.go
@@ -1,9 +1,6 @@
 package loganalytics
 
 import (
-	"fmt"
-
-	"github.com/grafana/grafana-azure-sdk-go/azsettings"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 )
 
@@ -19,7 +16,7 @@ func AddCustomDataLink(frame data.Frame, dataLink data.DataLink) data.Frame {
 }
 
 func AddConfigLinks(frame data.Frame, dl string, title *string) data.Frame {
-	linkTitle := "View in Azure Portal"
+	linkTitle := "View query in Azure Portal"
 	if title != nil {
 		linkTitle = *title
 	}
@@ -34,16 +31,3 @@ func AddConfigLinks(frame data.Frame, dl string, title *string) data.Frame {
 
 	return frame
 }
-
-func GetAzurePortalUrl(azureCloud string) (string, error) {
-	switch azureCloud {
-	case azsettings.AzurePublic:
-		return "https://portal.azure.com", nil
-	case azsettings.AzureChina:
-		return "https://portal.azure.cn", nil
-	case azsettings.AzureUSGovernment:
-		return "https://portal.azure.us", nil
-	default:
-		return "", fmt.Errorf("the cloud is not supported")
-	}
-}
diff --git a/pkg/tsdb/azuremonitor/macros/macros.go b/pkg/tsdb/azuremonitor/macros/macros.go
index 75f158717574c..953f5f5c914ca 100644
--- a/pkg/tsdb/azuremonitor/macros/macros.go
+++ b/pkg/tsdb/azuremonitor/macros/macros.go
@@ -8,10 +8,10 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
 
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/kinds/dataquery"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/types"
-	"github.com/grafana/grafana/pkg/tsdb/intervalv2"
 )
 
 const rsIdentifier = `__(timeFilter|timeFrom|timeTo|interval|contains|escapeMulti)`
@@ -126,7 +126,7 @@ func (m *kqlMacroEngine) evaluateMacro(name string, defaultTimeField string, arg
 				if dsInterval, ok = dsInfo.JSONData["interval"].(string); !ok {
 					dsInterval = ""
 				}
-				it, err = intervalv2.GetIntervalFrom(dsInterval, queryInterval.Interval, queryInterval.IntervalMs, defaultInterval)
+				it, err = gtime.GetIntervalFrom(dsInterval, queryInterval.Interval, queryInterval.IntervalMs, defaultInterval)
 				if err != nil {
 					it = defaultInterval
 				}
diff --git a/pkg/tsdb/azuremonitor/metrics/azuremonitor-datasource.go b/pkg/tsdb/azuremonitor/metrics/azuremonitor-datasource.go
index cae6134a2b64c..ad55bbb4a7af0 100644
--- a/pkg/tsdb/azuremonitor/metrics/azuremonitor-datasource.go
+++ b/pkg/tsdb/azuremonitor/metrics/azuremonitor-datasource.go
@@ -14,12 +14,12 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
 
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/kinds/dataquery"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/loganalytics"
 	azTime "github.com/grafana/grafana/pkg/tsdb/azuremonitor/time"
@@ -28,8 +28,8 @@ import (
 
 // AzureMonitorDatasource calls the Azure Monitor API - one of the four API's supported
 type AzureMonitorDatasource struct {
-	Proxy    types.ServiceProxy
-	Features featuremgmt.FeatureToggles
+	Proxy  types.ServiceProxy
+	Logger log.Logger
 }
 
 var (
@@ -109,11 +109,17 @@ func (e *AzureMonitorDatasource) buildQueries(queries []backend.DataQuery, dsInf
 				MetricNamespace:     azJSONModel.MetricNamespace,
 				ResourceName:        resourceName,
 			}
-			azureURL = ub.BuildMetricsURL()
+
+			// Construct the resourceURI (for legacy query objects pre Grafana 9)
+			resourceUri, err := ub.buildResourceURI()
+			if err != nil {
+				return nil, err
+			}
+
 			// POST requests are only supported at the subscription level
 			filterInBody = false
-			resourceUri := ub.buildResourceURI()
 			if resourceUri != nil {
+				azureURL = fmt.Sprintf("%s/providers/microsoft.insights/metrics", *resourceUri)
 				resourceMap[*resourceUri] = dataquery.AzureMonitorResource{ResourceGroup: resourceGroup, ResourceName: resourceName}
 			}
 		} else {
@@ -125,7 +131,11 @@ func (e *AzureMonitorDatasource) buildQueries(queries []backend.DataQuery, dsInf
 					MetricNamespace:     azJSONModel.MetricNamespace,
 					ResourceName:        r.ResourceName,
 				}
-				resourceUri := ub.buildResourceURI()
+				resourceUri, err := ub.buildResourceURI()
+				if err != nil {
+					return nil, err
+				}
+
 				if resourceUri != nil {
 					resourceMap[*resourceUri] = r
 				}
@@ -268,7 +278,7 @@ func (e *AzureMonitorDatasource) retrieveSubscriptionDetails(cli *http.Client, c
 
 	defer func() {
 		if err := res.Body.Close(); err != nil {
-			backend.Logger.Warn("Failed to close response body", "err", err)
+			e.Logger.Warn("Failed to close response body", "err", err)
 		}
 	}()
 
@@ -320,7 +330,7 @@ func (e *AzureMonitorDatasource) executeQuery(ctx context.Context, query *types.
 
 	defer func() {
 		if err := res.Body.Close(); err != nil {
-			backend.Logger.Warn("Failed to close response body", "err", err)
+			e.Logger.Warn("Failed to close response body", "err", err)
 		}
 	}()
 
@@ -329,17 +339,12 @@ func (e *AzureMonitorDatasource) executeQuery(ctx context.Context, query *types.
 		return nil, err
 	}
 
-	azurePortalUrl, err := loganalytics.GetAzurePortalUrl(dsInfo.Cloud)
-	if err != nil {
-		return nil, err
-	}
-
 	subscription, err := e.retrieveSubscriptionDetails(cli, ctx, query.Subscription, dsInfo.Routes["Azure Monitor"].URL, dsInfo.DatasourceID, dsInfo.OrgID)
 	if err != nil {
 		return nil, err
 	}
 
-	frames, err := e.parseResponse(data, query, azurePortalUrl, subscription)
+	frames, err := e.parseResponse(data, query, dsInfo.Routes["Azure Portal"].URL, subscription)
 	if err != nil {
 		return nil, err
 	}
@@ -390,9 +395,7 @@ func (e *AzureMonitorDatasource) parseResponse(amr types.AzureMonitorResponse, q
 		}
 
 		frame := data.NewFrameOfFieldTypes("", len(series.Data), data.FieldTypeTime, data.FieldTypeNullableFloat64)
-		if e.Features.IsEnabled(featuremgmt.FlagAzureMonitorDataplane) {
-			frame.Meta = &data.FrameMeta{Type: data.FrameTypeTimeSeriesMulti, TypeVersion: data.FrameTypeVersion{0, 1}}
-		}
+		frame.Meta = &data.FrameMeta{Type: data.FrameTypeTimeSeriesMulti, TypeVersion: data.FrameTypeVersion{0, 1}}
 		frame.RefID = query.RefID
 		timeField := frame.Fields[0]
 		timeField.Name = data.TimeSeriesTimeFieldName
diff --git a/pkg/tsdb/azuremonitor/metrics/azuremonitor-datasource_test.go b/pkg/tsdb/azuremonitor/metrics/azuremonitor-datasource_test.go
index abc82c0b64d80..1e372632be914 100644
--- a/pkg/tsdb/azuremonitor/metrics/azuremonitor-datasource_test.go
+++ b/pkg/tsdb/azuremonitor/metrics/azuremonitor-datasource_test.go
@@ -23,9 +23,10 @@ import (
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/testdata"
 	azTime "github.com/grafana/grafana/pkg/tsdb/azuremonitor/time"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/types"
-	"github.com/grafana/grafana/pkg/util"
 )
 
+func Pointer[T any](v T) *T { return &v }
+
 func TestAzureMonitorBuildQueries(t *testing.T) {
 	datasource := &AzureMonitorDatasource{}
 	dsInfo := types.DatasourceInfo{
@@ -117,7 +118,7 @@ func TestAzureMonitorBuildQueries(t *testing.T) {
 			expectedInterval:        "PT1M",
 			azureMonitorQueryTarget: "aggregation=Average&api-version=2021-05-01&interval=PT1M&metricnames=Percentage+CPU&metricnamespace=Microsoft.Compute%2FvirtualMachines&timespan=2018-03-15T13%3A00%3A00Z%2F2018-03-15T13%3A34%3A00Z&top=30",
 			expectedParamFilter:     "blob eq '*'",
-			expectedPortalURL:       util.Pointer("http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%222018-03-15T13%3A00%3A00Z%22%2C%22endTime%22%3A%222018-03-15T13%3A34%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22grouping%22%3A%7B%22dimension%22%3A%22blob%22%2C%22sort%22%3A2%2C%22top%22%3A10%7D%2C%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22Percentage%20CPU%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22Microsoft.Compute%2FvirtualMachines%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22Percentage%20CPU%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"),
+			expectedPortalURL:       Pointer("http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%222018-03-15T13%3A00%3A00Z%22%2C%22endTime%22%3A%222018-03-15T13%3A34%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22grouping%22%3A%7B%22dimension%22%3A%22blob%22%2C%22sort%22%3A2%2C%22top%22%3A10%7D%2C%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22Percentage%20CPU%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22Microsoft.Compute%2FvirtualMachines%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22Percentage%20CPU%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"),
 		},
 		{
 			name: "legacy query without resourceURI and has dimensionFilter*s* property with two dimensions",
@@ -130,7 +131,7 @@ func TestAzureMonitorBuildQueries(t *testing.T) {
 			expectedInterval:        "PT1M",
 			azureMonitorQueryTarget: "aggregation=Average&api-version=2021-05-01&interval=PT1M&metricnames=Percentage+CPU&metricnamespace=Microsoft.Compute%2FvirtualMachines&timespan=2018-03-15T13%3A00%3A00Z%2F2018-03-15T13%3A34%3A00Z&top=30",
 			expectedParamFilter:     "blob eq '*' and tier eq '*'",
-			expectedPortalURL:       util.Pointer("http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%222018-03-15T13%3A00%3A00Z%22%2C%22endTime%22%3A%222018-03-15T13%3A34%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22grouping%22%3A%7B%22dimension%22%3A%22blob%22%2C%22sort%22%3A2%2C%22top%22%3A10%7D%2C%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22Percentage%20CPU%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22Microsoft.Compute%2FvirtualMachines%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22Percentage%20CPU%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"),
+			expectedPortalURL:       Pointer("http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%222018-03-15T13%3A00%3A00Z%22%2C%22endTime%22%3A%222018-03-15T13%3A34%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22grouping%22%3A%7B%22dimension%22%3A%22blob%22%2C%22sort%22%3A2%2C%22top%22%3A10%7D%2C%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22Percentage%20CPU%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22Microsoft.Compute%2FvirtualMachines%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22Percentage%20CPU%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"),
 		},
 		{
 			name: "legacy query without resourceURI and has a dimension filter without specifying a top",
@@ -155,7 +156,7 @@ func TestAzureMonitorBuildQueries(t *testing.T) {
 			expectedInterval:        "PT1M",
 			azureMonitorQueryTarget: "aggregation=Average&api-version=2021-05-01&interval=PT1M&metricnames=Percentage+CPU&metricnamespace=Microsoft.Compute%2FvirtualMachines&timespan=2018-03-15T13%3A00%3A00Z%2F2018-03-15T13%3A34%3A00Z&top=30",
 			expectedParamFilter:     "blob ne 'test'",
-			expectedPortalURL:       util.Pointer("http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%222018-03-15T13%3A00%3A00Z%22%2C%22endTime%22%3A%222018-03-15T13%3A34%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22filterCollection%22%3A%7B%22filters%22%3A%5B%7B%22key%22%3A%22blob%22%2C%22operator%22%3A1%2C%22values%22%3A%5B%22test%22%5D%7D%5D%7D%2C%22grouping%22%3A%7B%22dimension%22%3A%22blob%22%2C%22sort%22%3A2%2C%22top%22%3A10%7D%2C%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22Percentage%20CPU%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22Microsoft.Compute%2FvirtualMachines%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22Percentage%20CPU%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"),
+			expectedPortalURL:       Pointer("http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%222018-03-15T13%3A00%3A00Z%22%2C%22endTime%22%3A%222018-03-15T13%3A34%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22filterCollection%22%3A%7B%22filters%22%3A%5B%7B%22key%22%3A%22blob%22%2C%22operator%22%3A1%2C%22values%22%3A%5B%22test%22%5D%7D%5D%7D%2C%22grouping%22%3A%7B%22dimension%22%3A%22blob%22%2C%22sort%22%3A2%2C%22top%22%3A10%7D%2C%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22Percentage%20CPU%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22Microsoft.Compute%2FvirtualMachines%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22Percentage%20CPU%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"),
 		},
 		{
 			name: "has dimensionFilter*s* property with startsWith operator",
@@ -168,7 +169,7 @@ func TestAzureMonitorBuildQueries(t *testing.T) {
 			expectedInterval:        "PT1M",
 			azureMonitorQueryTarget: "aggregation=Average&api-version=2021-05-01&interval=PT1M&metricnames=Percentage+CPU&metricnamespace=Microsoft.Compute%2FvirtualMachines&timespan=2018-03-15T13%3A00%3A00Z%2F2018-03-15T13%3A34%3A00Z&top=30",
 			expectedParamFilter:     "blob sw 'test'",
-			expectedPortalURL:       util.Pointer("http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%222018-03-15T13%3A00%3A00Z%22%2C%22endTime%22%3A%222018-03-15T13%3A34%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22filterCollection%22%3A%7B%22filters%22%3A%5B%7B%22key%22%3A%22blob%22%2C%22operator%22%3A3%2C%22values%22%3A%5B%22test%22%5D%7D%5D%7D%2C%22grouping%22%3A%7B%22dimension%22%3A%22blob%22%2C%22sort%22%3A2%2C%22top%22%3A10%7D%2C%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22Percentage%20CPU%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22Microsoft.Compute%2FvirtualMachines%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22Percentage%20CPU%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"),
+			expectedPortalURL:       Pointer("http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%222018-03-15T13%3A00%3A00Z%22%2C%22endTime%22%3A%222018-03-15T13%3A34%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22filterCollection%22%3A%7B%22filters%22%3A%5B%7B%22key%22%3A%22blob%22%2C%22operator%22%3A3%2C%22values%22%3A%5B%22test%22%5D%7D%5D%7D%2C%22grouping%22%3A%7B%22dimension%22%3A%22blob%22%2C%22sort%22%3A2%2C%22top%22%3A10%7D%2C%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22Percentage%20CPU%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22Microsoft.Compute%2FvirtualMachines%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22Percentage%20CPU%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"),
 		},
 		{
 			name: "correctly sets dimension operator to eq (irrespective of operator) when filter value is '*'",
@@ -181,7 +182,7 @@ func TestAzureMonitorBuildQueries(t *testing.T) {
 			expectedInterval:        "PT1M",
 			azureMonitorQueryTarget: "aggregation=Average&api-version=2021-05-01&interval=PT1M&metricnames=Percentage+CPU&metricnamespace=Microsoft.Compute%2FvirtualMachines&timespan=2018-03-15T13%3A00%3A00Z%2F2018-03-15T13%3A34%3A00Z&top=30",
 			expectedParamFilter:     "blob eq '*' and tier eq '*'",
-			expectedPortalURL:       util.Pointer("http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%222018-03-15T13%3A00%3A00Z%22%2C%22endTime%22%3A%222018-03-15T13%3A34%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22grouping%22%3A%7B%22dimension%22%3A%22blob%22%2C%22sort%22%3A2%2C%22top%22%3A10%7D%2C%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22Percentage%20CPU%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22Microsoft.Compute%2FvirtualMachines%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22Percentage%20CPU%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"),
+			expectedPortalURL:       Pointer("http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%222018-03-15T13%3A00%3A00Z%22%2C%22endTime%22%3A%222018-03-15T13%3A34%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22grouping%22%3A%7B%22dimension%22%3A%22blob%22%2C%22sort%22%3A2%2C%22top%22%3A10%7D%2C%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22Percentage%20CPU%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22Microsoft.Compute%2FvirtualMachines%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22Percentage%20CPU%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"),
 		},
 		{
 			name: "correctly constructs target when multiple filter values are provided for the 'eq' operator",
@@ -194,7 +195,7 @@ func TestAzureMonitorBuildQueries(t *testing.T) {
 			expectedInterval:        "PT1M",
 			azureMonitorQueryTarget: "aggregation=Average&api-version=2021-05-01&interval=PT1M&metricnames=Percentage+CPU&metricnamespace=Microsoft.Compute%2FvirtualMachines&timespan=2018-03-15T13%3A00%3A00Z%2F2018-03-15T13%3A34%3A00Z&top=30",
 			expectedParamFilter:     "blob eq 'test' or blob eq 'test2'",
-			expectedPortalURL:       util.Pointer("http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%222018-03-15T13%3A00%3A00Z%22%2C%22endTime%22%3A%222018-03-15T13%3A34%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22filterCollection%22%3A%7B%22filters%22%3A%5B%7B%22key%22%3A%22blob%22%2C%22operator%22%3A0%2C%22values%22%3A%5B%22test%22%2C%22test2%22%5D%7D%5D%7D%2C%22grouping%22%3A%7B%22dimension%22%3A%22blob%22%2C%22sort%22%3A2%2C%22top%22%3A10%7D%2C%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22Percentage%20CPU%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22Microsoft.Compute%2FvirtualMachines%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22Percentage%20CPU%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"),
+			expectedPortalURL:       Pointer("http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%222018-03-15T13%3A00%3A00Z%22%2C%22endTime%22%3A%222018-03-15T13%3A34%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22filterCollection%22%3A%7B%22filters%22%3A%5B%7B%22key%22%3A%22blob%22%2C%22operator%22%3A0%2C%22values%22%3A%5B%22test%22%2C%22test2%22%5D%7D%5D%7D%2C%22grouping%22%3A%7B%22dimension%22%3A%22blob%22%2C%22sort%22%3A2%2C%22top%22%3A10%7D%2C%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22Percentage%20CPU%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22Microsoft.Compute%2FvirtualMachines%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22Percentage%20CPU%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"),
 		},
 		{
 			name: "correctly constructs target when multiple filter values are provided for ne 'eq' operator",
@@ -207,7 +208,7 @@ func TestAzureMonitorBuildQueries(t *testing.T) {
 			expectedInterval:        "PT1M",
 			azureMonitorQueryTarget: "aggregation=Average&api-version=2021-05-01&interval=PT1M&metricnames=Percentage+CPU&metricnamespace=Microsoft.Compute%2FvirtualMachines&timespan=2018-03-15T13%3A00%3A00Z%2F2018-03-15T13%3A34%3A00Z&top=30",
 			expectedParamFilter:     "blob ne 'test' and blob ne 'test2'",
-			expectedPortalURL:       util.Pointer("http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%222018-03-15T13%3A00%3A00Z%22%2C%22endTime%22%3A%222018-03-15T13%3A34%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22filterCollection%22%3A%7B%22filters%22%3A%5B%7B%22key%22%3A%22blob%22%2C%22operator%22%3A1%2C%22values%22%3A%5B%22test%22%2C%22test2%22%5D%7D%5D%7D%2C%22grouping%22%3A%7B%22dimension%22%3A%22blob%22%2C%22sort%22%3A2%2C%22top%22%3A10%7D%2C%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22Percentage%20CPU%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22Microsoft.Compute%2FvirtualMachines%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22Percentage%20CPU%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"),
+			expectedPortalURL:       Pointer("http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%222018-03-15T13%3A00%3A00Z%22%2C%22endTime%22%3A%222018-03-15T13%3A34%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22filterCollection%22%3A%7B%22filters%22%3A%5B%7B%22key%22%3A%22blob%22%2C%22operator%22%3A1%2C%22values%22%3A%5B%22test%22%2C%22test2%22%5D%7D%5D%7D%2C%22grouping%22%3A%7B%22dimension%22%3A%22blob%22%2C%22sort%22%3A2%2C%22top%22%3A10%7D%2C%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22Percentage%20CPU%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22Microsoft.Compute%2FvirtualMachines%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22Percentage%20CPU%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"),
 		},
 		{
 			name: "Includes a region",
@@ -257,7 +258,7 @@ func TestAzureMonitorBuildQueries(t *testing.T) {
 			expectedURL:             "/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/providers/microsoft.insights/metrics",
 			azureMonitorQueryTarget: "aggregation=Average&api-version=2021-05-01&interval=PT1M&metricnames=Percentage+CPU&metricnamespace=Microsoft.Compute%2FvirtualMachines&timespan=2018-03-15T13%3A00%3A00Z%2F2018-03-15T13%3A34%3A00Z&top=30",
 			expectedBodyFilter:      "(Microsoft.ResourceId eq '/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/resourceGroups/rg/providers/Microsoft.Compute/virtualMachines/vm' or Microsoft.ResourceId eq '/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/resourceGroups/rg2/providers/Microsoft.Compute/virtualMachines/vm2') and (blob ne 'test' and blob ne 'test2')",
-			expectedPortalURL:       util.Pointer("http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%222018-03-15T13%3A00%3A00Z%22%2C%22endTime%22%3A%222018-03-15T13%3A34%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22filterCollection%22%3A%7B%22filters%22%3A%5B%7B%22key%22%3A%22blob%22%2C%22operator%22%3A1%2C%22values%22%3A%5B%22test%22%2C%22test2%22%5D%7D%5D%7D%2C%22grouping%22%3A%7B%22dimension%22%3A%22blob%22%2C%22sort%22%3A2%2C%22top%22%3A10%7D%2C%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22Percentage%20CPU%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22Microsoft.Compute%2FvirtualMachines%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22Percentage%20CPU%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"),
+			expectedPortalURL:       Pointer("http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%222018-03-15T13%3A00%3A00Z%22%2C%22endTime%22%3A%222018-03-15T13%3A34%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22filterCollection%22%3A%7B%22filters%22%3A%5B%7B%22key%22%3A%22blob%22%2C%22operator%22%3A1%2C%22values%22%3A%5B%22test%22%2C%22test2%22%5D%7D%5D%7D%2C%22grouping%22%3A%7B%22dimension%22%3A%22blob%22%2C%22sort%22%3A2%2C%22top%22%3A10%7D%2C%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22Percentage%20CPU%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22Microsoft.Compute%2FvirtualMachines%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22Percentage%20CPU%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"),
 		},
 	}
 
@@ -365,20 +366,11 @@ func TestCustomNamespace(t *testing.T) {
 	})
 }
 
-type fakeFeatureToggles struct {
-	flags map[string]bool
-}
-
-func (f *fakeFeatureToggles) IsEnabled(feature string) bool {
-	return f.flags[feature]
-}
-
 func TestAzureMonitorParseResponse(t *testing.T) {
 	resources := map[string]dataquery.AzureMonitorResource{}
 	resources["/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/resourceGroups/grafanastaging/providers/Microsoft.Compute/virtualMachines/grafana"] =
 		dataquery.AzureMonitorResource{ResourceGroup: strPtr("grafanastaging"), ResourceName: strPtr("grafana")}
 	subscription := "12345678-aaaa-bbbb-cccc-123456789abc"
-	datasource := &AzureMonitorDatasource{Features: &fakeFeatureToggles{flags: map[string]bool{"azureMonitorDataplane": true}}}
 
 	tests := []struct {
 		name            string
@@ -386,7 +378,6 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 		mockQuery       *types.AzureMonitorQuery
 		expectedFrames  data.Frames
 		queryIntervalMS int64
-		datasource      *AzureMonitorDatasource
 	}{
 		{
 			name:         "average aggregate time series response",
@@ -399,7 +390,6 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 				Resources:    resources,
 				Subscription: subscription,
 			},
-			datasource: datasource,
 		},
 		{
 			name:         "total aggregate time series response",
@@ -412,7 +402,6 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 				Resources:    resources,
 				Subscription: subscription,
 			},
-			datasource: datasource,
 		},
 		{
 			name:         "maximum aggregate time series response",
@@ -425,7 +414,6 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 				Resources:    resources,
 				Subscription: subscription,
 			},
-			datasource: datasource,
 		},
 		{
 			name:         "minimum aggregate time series response",
@@ -438,7 +426,6 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 				Resources:    resources,
 				Subscription: subscription,
 			},
-			datasource: datasource,
 		},
 		{
 			name:         "count aggregate time series response",
@@ -451,7 +438,6 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 				Resources:    resources,
 				Subscription: subscription,
 			},
-			datasource: datasource,
 		},
 		{
 			name:         "single dimension time series response",
@@ -464,7 +450,6 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 				Resources:    resources,
 				Subscription: subscription,
 			},
-			datasource: datasource,
 		},
 		{
 			name:         "with alias patterns in the query",
@@ -478,7 +463,6 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 				Resources:    resources,
 				Subscription: subscription,
 			},
-			datasource: datasource,
 		},
 		{
 			name:         "single dimension with alias",
@@ -492,7 +476,6 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 				Resources:    resources,
 				Subscription: subscription,
 			},
-			datasource: datasource,
 		},
 		{
 			name:         "multiple dimension time series response with label alias",
@@ -506,7 +489,6 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 				Resources:    map[string]dataquery.AzureMonitorResource{"/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/resourceGroups/grafanatest/providers/Microsoft.Storage/storageAccounts/testblobaccount/blobServices/default/providers/Microsoft.Insights/metrics": {ResourceGroup: strPtr("grafanatest"), ResourceName: strPtr("testblobaccount")}},
 				Subscription: subscription,
 			},
-			datasource: datasource,
 		},
 		{
 			name:         "unspecified unit with alias should not panic",
@@ -520,7 +502,6 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 				Resources:    resources,
 				Subscription: subscription,
 			},
-			datasource: datasource,
 		},
 		{
 			name:         "with legacy azure monitor query properties and without a resource uri",
@@ -534,7 +515,6 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 				Resources:    resources,
 				Subscription: subscription,
 			},
-			datasource: datasource,
 		},
 		{
 			name:         "with legacy azure monitor query properties and with a resource uri it should use the resource uri",
@@ -548,7 +528,6 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 				Resources:    resources,
 				Subscription: subscription,
 			},
-			datasource: datasource,
 		},
 		{
 			name:         "multiple time series response",
@@ -561,7 +540,6 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 				Resources:    resources,
 				Subscription: subscription,
 			},
-			datasource: datasource,
 		},
 		{
 			name:         "multiple time series response with multiple dimensions",
@@ -574,27 +552,14 @@ func TestAzureMonitorParseResponse(t *testing.T) {
 				Resources:    resources,
 				Subscription: subscription,
 			},
-			datasource: datasource,
-		},
-		{
-			name:         "non-dataplane compliant response",
-			responseFile: "azuremonitor/11-azure-monitor-non-dataplane-response.json",
-			mockQuery: &types.AzureMonitorQuery{
-				URL: "/subscriptions/12345678-aaaa-bbbb-cccc-123456789abc/resourceGroups/grafanastaging/providers/Microsoft.Compute/virtualMachines/grafana/providers/microsoft.insights/metrics",
-				Params: url.Values{
-					"aggregation": {"Average"},
-				},
-				Resources:    resources,
-				Subscription: subscription,
-			},
-			datasource: &AzureMonitorDatasource{Features: &fakeFeatureToggles{flags: map[string]bool{"azureMonitorDataplane": false}}},
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			azData := loadTestFile(t, tt.responseFile)
-			dframes, err := tt.datasource.parseResponse(azData, tt.mockQuery, "http://ds", "")
+			datasource := &AzureMonitorDatasource{}
+			dframes, err := datasource.parseResponse(azData, tt.mockQuery, "http://ds", "")
 			require.NoError(t, err)
 			require.NotNil(t, dframes)
 
diff --git a/pkg/tsdb/azuremonitor/metrics/url-builder.go b/pkg/tsdb/azuremonitor/metrics/url-builder.go
index 2d38ce835a449..1d1b015ed7889 100644
--- a/pkg/tsdb/azuremonitor/metrics/url-builder.go
+++ b/pkg/tsdb/azuremonitor/metrics/url-builder.go
@@ -15,11 +15,12 @@ type urlBuilder struct {
 	ResourceGroup       *string
 	MetricNamespace     *string
 	ResourceName        *string
+	MetricDefinition    *string
 }
 
-func (params *urlBuilder) buildResourceURI() *string {
+func (params *urlBuilder) buildResourceURI() (*string, error) {
 	if params.ResourceURI != nil && *params.ResourceURI != "" {
-		return params.ResourceURI
+		return params.ResourceURI, nil
 	}
 
 	subscription := params.Subscription
@@ -28,11 +29,16 @@ func (params *urlBuilder) buildResourceURI() *string {
 		subscription = params.DefaultSubscription
 	}
 
-	if params.MetricNamespace == nil || *params.MetricNamespace == "" {
-		return nil
+	metricNamespace := params.MetricNamespace
+
+	if metricNamespace == nil || *metricNamespace == "" {
+		if params.MetricDefinition == nil || *params.MetricDefinition == "" {
+			return nil, fmt.Errorf("no metricNamespace or metricDefiniton value provided")
+		}
+		metricNamespace = params.MetricDefinition
 	}
 
-	metricNamespaceArray := strings.Split(*params.MetricNamespace, "/")
+	metricNamespaceArray := strings.Split(*metricNamespace, "/")
 	var resourceNameArray []string
 	if params.ResourceName != nil && *params.ResourceName != "" {
 		resourceNameArray = strings.Split(*params.ResourceName, "/")
@@ -40,7 +46,7 @@ func (params *urlBuilder) buildResourceURI() *string {
 	provider := metricNamespaceArray[0]
 	metricNamespaceArray = metricNamespaceArray[1:]
 
-	if strings.HasPrefix(strings.ToLower(*params.MetricNamespace), "microsoft.storage/storageaccounts/") &&
+	if strings.HasPrefix(strings.ToLower(*metricNamespace), "microsoft.storage/storageaccounts/") &&
 		params.ResourceName != nil &&
 		!strings.HasSuffix(*params.ResourceName, "default") {
 		resourceNameArray = append(resourceNameArray, "default")
@@ -64,20 +70,7 @@ func (params *urlBuilder) buildResourceURI() *string {
 	}
 
 	resourceURI := strings.Join(urlArray, "/")
-	return &resourceURI
-}
-
-// BuildMetricsURL checks the metric properties to see which form of the url
-// should be returned
-func (params *urlBuilder) BuildMetricsURL() string {
-	resourceURI := params.ResourceURI
-
-	// Prior to Grafana 9, we had a legacy query object rather than a resourceURI, so we manually create the resource URI
-	if resourceURI == nil || *resourceURI == "" {
-		resourceURI = params.buildResourceURI()
-	}
-
-	return fmt.Sprintf("%s/providers/microsoft.insights/metrics", *resourceURI)
+	return &resourceURI, nil
 }
 
 // BuildSubscriptionMetricsURL returns a URL for querying metrics for all resources in a subscription
diff --git a/pkg/tsdb/azuremonitor/metrics/url-builder_test.go b/pkg/tsdb/azuremonitor/metrics/url-builder_test.go
index e16385f6bfbe0..2c06308d9bdaa 100644
--- a/pkg/tsdb/azuremonitor/metrics/url-builder_test.go
+++ b/pkg/tsdb/azuremonitor/metrics/url-builder_test.go
@@ -6,15 +6,32 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestURLBuilder(t *testing.T) {
-	t.Run("AzureMonitor URL Builder", func(t *testing.T) {
-		t.Run("when only resource uri is provided it returns resource/uri/providers/microsoft.insights/metrics", func(t *testing.T) {
+func TestBuildResourceURI(t *testing.T) {
+	t.Run("AzureMonitor Resource URI Builder", func(t *testing.T) {
+		t.Run("when there is no resource uri", func(t *testing.T) {
+			ub := &urlBuilder{
+				DefaultSubscription: strPtr("default-sub"),
+				MetricDefinition:    strPtr("Microsoft.Web/serverFarms"),
+				ResourceGroup:       strPtr("rg"),
+				ResourceName:        strPtr("rn1"),
+			}
+
+			result, err := ub.buildResourceURI()
+			if err != nil {
+				return
+			}
+			url := *result
+			assert.Equal(t, "/subscriptions/default-sub/resourceGroups/rg/providers/Microsoft.Web/serverFarms/rn1", url)
+		})
+
+		t.Run("when only resource uri is provided it returns the resource URI", func(t *testing.T) {
 			ub := &urlBuilder{
 				ResourceURI: strPtr("/subscriptions/sub/resource/uri"),
 			}
 
-			url := ub.BuildMetricsURL()
-			assert.Equal(t, "/subscriptions/sub/resource/uri/providers/microsoft.insights/metrics", url)
+			url, err := ub.buildResourceURI()
+			assert.Nil(t, err)
+			assert.Equal(t, "/subscriptions/sub/resource/uri", *url)
 		})
 
 		t.Run("when resource uri and legacy fields are provided the legacy fields are ignored", func(t *testing.T) {
@@ -26,8 +43,9 @@ func TestURLBuilder(t *testing.T) {
 				ResourceName:        strPtr("rn1/rn2/rn3"),
 			}
 
-			url := ub.BuildMetricsURL()
-			assert.Equal(t, "/subscriptions/sub/resource/uri/providers/microsoft.insights/metrics", url)
+			url, err := ub.buildResourceURI()
+			assert.Nil(t, err)
+			assert.Equal(t, "/subscriptions/sub/resource/uri", *url)
 		})
 
 		t.Run("Legacy URL Builder params", func(t *testing.T) {
@@ -39,70 +57,93 @@ func TestURLBuilder(t *testing.T) {
 					ResourceName:        strPtr("rn"),
 				}
 
-				url := ub.BuildMetricsURL()
-				assert.Equal(t, "/subscriptions/default-sub/resourceGroups/rg/providers/Microsoft.Compute/virtualMachines/rn/providers/microsoft.insights/metrics", url)
+				url, err := ub.buildResourceURI()
+				assert.Nil(t, err)
+				assert.Equal(t, "/subscriptions/default-sub/resourceGroups/rg/providers/Microsoft.Compute/virtualMachines/rn", *url)
 			})
+		})
 
-			t.Run("when metric definition is in the short form and a subscription is defined", func(t *testing.T) {
-				ub := &urlBuilder{
-					DefaultSubscription: strPtr("default-sub"),
-					Subscription:        strPtr("specified-sub"),
-					ResourceGroup:       strPtr("rg"),
-					MetricNamespace:     strPtr("Microsoft.Compute/virtualMachines"),
-					ResourceName:        strPtr("rn"),
-				}
+		t.Run("when metric definition is in the short form and a subscription is defined", func(t *testing.T) {
+			ub := &urlBuilder{
+				DefaultSubscription: strPtr("default-sub"),
+				Subscription:        strPtr("specified-sub"),
+				ResourceGroup:       strPtr("rg"),
+				MetricNamespace:     strPtr("Microsoft.Compute/virtualMachines"),
+				ResourceName:        strPtr("rn"),
+			}
 
-				url := ub.BuildMetricsURL()
-				assert.Equal(t, "/subscriptions/specified-sub/resourceGroups/rg/providers/Microsoft.Compute/virtualMachines/rn/providers/microsoft.insights/metrics", url)
-			})
+			url, err := ub.buildResourceURI()
+			assert.Nil(t, err)
+			assert.Equal(t, "/subscriptions/specified-sub/resourceGroups/rg/providers/Microsoft.Compute/virtualMachines/rn", *url)
+		})
 
-			t.Run("when metric definition is Microsoft.Storage/storageAccounts/blobServices", func(t *testing.T) {
-				ub := &urlBuilder{
-					DefaultSubscription: strPtr("default-sub"),
-					ResourceGroup:       strPtr("rg"),
-					MetricNamespace:     strPtr("Microsoft.Storage/storageAccounts/blobServices"),
-					ResourceName:        strPtr("rn1/default"),
-				}
+		t.Run("when metric definition is Microsoft.Storage/storageAccounts/blobServices", func(t *testing.T) {
+			ub := &urlBuilder{
+				DefaultSubscription: strPtr("default-sub"),
+				ResourceGroup:       strPtr("rg"),
+				MetricNamespace:     strPtr("Microsoft.Storage/storageAccounts/blobServices"),
+				ResourceName:        strPtr("rn1"),
+			}
 
-				url := ub.BuildMetricsURL()
-				assert.Equal(t, "/subscriptions/default-sub/resourceGroups/rg/providers/Microsoft.Storage/storageAccounts/rn1/blobServices/default/providers/microsoft.insights/metrics", url)
-			})
+			result, err := ub.buildResourceURI()
+			if err != nil {
+				return
+			}
+			url := *result
+			assert.Equal(t, "/subscriptions/default-sub/resourceGroups/rg/providers/Microsoft.Storage/storageAccounts/rn1/blobServices/default", url)
+		})
 
-			t.Run("when metric definition is Microsoft.Storage/storageAccounts/fileServices", func(t *testing.T) {
-				ub := &urlBuilder{
-					DefaultSubscription: strPtr("default-sub"),
-					ResourceGroup:       strPtr("rg"),
-					MetricNamespace:     strPtr("Microsoft.Storage/storageAccounts/fileServices"),
-					ResourceName:        strPtr("rn1/default"),
-				}
+		t.Run("when metric definition is Microsoft.Storage/storageAccounts/tableServices", func(t *testing.T) {
+			ub := &urlBuilder{
+				DefaultSubscription: strPtr("default-sub"),
+				ResourceGroup:       strPtr("rg"),
+				MetricNamespace:     strPtr("Microsoft.Storage/storageAccounts/tableServices"),
+				ResourceName:        strPtr("rn1/default"),
+			}
 
-				url := ub.BuildMetricsURL()
-				assert.Equal(t, "/subscriptions/default-sub/resourceGroups/rg/providers/Microsoft.Storage/storageAccounts/rn1/fileServices/default/providers/microsoft.insights/metrics", url)
-			})
+			url, err := ub.buildResourceURI()
+			assert.Nil(t, err)
+			assert.Equal(t, "/subscriptions/default-sub/resourceGroups/rg/providers/Microsoft.Storage/storageAccounts/rn1/tableServices/default", *url)
+		})
 
-			t.Run("when metric definition is Microsoft.NetApp/netAppAccounts/capacityPools/volumes", func(t *testing.T) {
-				ub := &urlBuilder{
-					DefaultSubscription: strPtr("default-sub"),
-					ResourceGroup:       strPtr("rg"),
-					MetricNamespace:     strPtr("Microsoft.NetApp/netAppAccounts/capacityPools/volumes"),
-					ResourceName:        strPtr("rn1/rn2/rn3"),
-				}
+		t.Run("when metric definition is Microsoft.Storage/storageAccounts/fileServices", func(t *testing.T) {
+			ub := &urlBuilder{
+				DefaultSubscription: strPtr("default-sub"),
+				ResourceGroup:       strPtr("rg"),
+				MetricNamespace:     strPtr("Microsoft.Storage/storageAccounts/fileServices"),
+				ResourceName:        strPtr("rn1/default"),
+			}
 
-				url := ub.BuildMetricsURL()
-				assert.Equal(t, "/subscriptions/default-sub/resourceGroups/rg/providers/Microsoft.NetApp/netAppAccounts/rn1/capacityPools/rn2/volumes/rn3/providers/microsoft.insights/metrics", url)
-			})
+			url, err := ub.buildResourceURI()
+			assert.Nil(t, err)
+			assert.Equal(t, "/subscriptions/default-sub/resourceGroups/rg/providers/Microsoft.Storage/storageAccounts/rn1/fileServices/default", *url)
+		})
 
-			t.Run("when metric definition is Microsoft.Storage/storageAccounts/blobServices", func(t *testing.T) {
-				ub := &urlBuilder{
-					DefaultSubscription: strPtr("default-sub"),
-					ResourceGroup:       strPtr("rg"),
-					MetricNamespace:     strPtr("Microsoft.Storage/storageAccounts/blobServices"),
-					ResourceName:        strPtr("rn1"),
-				}
+		t.Run("when metric definition is Microsoft.NetApp/netAppAccounts/capacityPools/volumes", func(t *testing.T) {
+			ub := &urlBuilder{
+				DefaultSubscription: strPtr("default-sub"),
+				ResourceGroup:       strPtr("rg"),
+				MetricNamespace:     strPtr("Microsoft.NetApp/netAppAccounts/capacityPools/volumes"),
+				ResourceName:        strPtr("rn1/rn2/rn3"),
+			}
 
-				url := *ub.buildResourceURI()
-				assert.Equal(t, "/subscriptions/default-sub/resourceGroups/rg/providers/Microsoft.Storage/storageAccounts/rn1/blobServices/default", url)
-			})
+			url, err := ub.buildResourceURI()
+			assert.Nil(t, err)
+			assert.Equal(t, "/subscriptions/default-sub/resourceGroups/rg/providers/Microsoft.NetApp/netAppAccounts/rn1/capacityPools/rn2/volumes/rn3", *url)
+		})
+
+		t.Run("when metricDefinition or metricNamespace is not defined an error is thrown", func(t *testing.T) {
+			ub := &urlBuilder{}
+
+			_, err := ub.buildResourceURI()
+			if err == nil {
+				t.Errorf("Expected an error, but got nil")
+			} else {
+				expectedErrorMessage := "no metricNamespace or metricDefiniton value provided"
+				if err.Error() != expectedErrorMessage {
+					t.Errorf("Expected error message %s, but got %s", expectedErrorMessage, err.Error())
+				}
+			}
 		})
 	})
 }
diff --git a/pkg/tsdb/azuremonitor/resourcegraph/azure-resource-graph-datasource.go b/pkg/tsdb/azuremonitor/resourcegraph/azure-resource-graph-datasource.go
index c04aecc562ea4..b9616ae8cc163 100644
--- a/pkg/tsdb/azuremonitor/resourcegraph/azure-resource-graph-datasource.go
+++ b/pkg/tsdb/azuremonitor/resourcegraph/azure-resource-graph-datasource.go
@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"go.opentelemetry.io/otel/attribute"
@@ -30,7 +31,8 @@ type AzureResourceGraphResponse struct {
 
 // AzureResourceGraphDatasource calls the Azure Resource Graph API's
 type AzureResourceGraphDatasource struct {
-	Proxy types.ServiceProxy
+	Proxy  types.ServiceProxy
+	Logger log.Logger
 }
 
 // AzureResourceGraphQuery is the query request that is built from the saved values for
@@ -160,7 +162,7 @@ func (e *AzureResourceGraphDatasource) executeQuery(ctx context.Context, query *
 	)
 
 	defer span.End()
-	backend.Logger.Debug("azure resource graph query", "traceID", trace.SpanContextFromContext(ctx).TraceID())
+	e.Logger.Debug("azure resource graph query", "traceID", trace.SpanContextFromContext(ctx).TraceID())
 
 	res, err := client.Do(req)
 	if err != nil {
@@ -188,12 +190,7 @@ func (e *AzureResourceGraphDatasource) executeQuery(ctx context.Context, query *
 		return &dataResponse, nil
 	}
 
-	azurePortalUrl, err := loganalytics.GetAzurePortalUrl(dsInfo.Cloud)
-	if err != nil {
-		return nil, err
-	}
-
-	url := azurePortalUrl + "/#blade/HubsExtension/ArgQueryBlade/query/" + url.PathEscape(query.InterpolatedQuery)
+	url := dsInfo.Routes["Azure Portal"].URL + "/#blade/HubsExtension/ArgQueryBlade/query/" + url.PathEscape(query.InterpolatedQuery)
 	frameWithLink := loganalytics.AddConfigLinks(*frame, url, nil)
 	if frameWithLink.Meta == nil {
 		frameWithLink.Meta = &data.FrameMeta{}
@@ -224,7 +221,7 @@ func (e *AzureResourceGraphDatasource) unmarshalResponse(res *http.Response) (Az
 
 	defer func() {
 		if err := res.Body.Close(); err != nil {
-			backend.Logger.Warn("Failed to close response body", "err", err)
+			e.Logger.Warn("Failed to close response body", "err", err)
 		}
 	}()
 
diff --git a/pkg/tsdb/azuremonitor/resourcegraph/azure-resource-graph-datasource_test.go b/pkg/tsdb/azuremonitor/resourcegraph/azure-resource-graph-datasource_test.go
index 751e0757508a4..4668bcefbd7f0 100644
--- a/pkg/tsdb/azuremonitor/resourcegraph/azure-resource-graph-datasource_test.go
+++ b/pkg/tsdb/azuremonitor/resourcegraph/azure-resource-graph-datasource_test.go
@@ -10,7 +10,6 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/grafana/grafana-azure-sdk-go/azsettings"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 
@@ -117,7 +116,7 @@ func TestAzureResourceGraphCreateRequest(t *testing.T) {
 
 func TestAddConfigData(t *testing.T) {
 	field := data.Field{}
-	dataLink := data.DataLink{Title: "View in Azure Portal", TargetBlank: true, URL: "http://ds"}
+	dataLink := data.DataLink{Title: "View query in Azure Portal", TargetBlank: true, URL: "http://ds"}
 	frame := data.Frame{
 		Fields: []*data.Field{&field},
 	}
@@ -136,23 +135,6 @@ func TestAddConfigData(t *testing.T) {
 	}
 }
 
-func TestGetAzurePortalUrl(t *testing.T) {
-	clouds := []string{azsettings.AzurePublic, azsettings.AzureChina, azsettings.AzureUSGovernment}
-	expectedAzurePortalUrl := map[string]any{
-		azsettings.AzurePublic:       "https://portal.azure.com",
-		azsettings.AzureChina:        "https://portal.azure.cn",
-		azsettings.AzureUSGovernment: "https://portal.azure.us",
-	}
-
-	for _, cloud := range clouds {
-		azurePortalUrl, err := loganalytics.GetAzurePortalUrl(cloud)
-		if err != nil {
-			t.Errorf("The cloud not supported")
-		}
-		assert.Equal(t, expectedAzurePortalUrl[cloud], azurePortalUrl)
-	}
-}
-
 func TestUnmarshalResponse400(t *testing.T) {
 	datasource := &AzureResourceGraphDatasource{}
 	res, err := datasource.unmarshalResponse(&http.Response{
diff --git a/pkg/tsdb/azuremonitor/routes.go b/pkg/tsdb/azuremonitor/routes.go
index 430c1523addf5..1624debb03dcb 100644
--- a/pkg/tsdb/azuremonitor/routes.go
+++ b/pkg/tsdb/azuremonitor/routes.go
@@ -1,7 +1,13 @@
 package azuremonitor
 
 import (
-	"github.com/grafana/grafana-azure-sdk-go/azsettings"
+	"encoding/json"
+	"fmt"
+	"net/url"
+	"path"
+
+	"github.com/grafana/grafana-azure-sdk-go/v2/azcredentials"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
 
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/types"
 )
@@ -12,63 +18,99 @@ const (
 	azureLogAnalytics  = "Azure Log Analytics"
 	azureResourceGraph = "Azure Resource Graph"
 	azureTraces        = "Azure Traces"
+	azurePortal        = "Azure Portal"
 )
 
-var azManagement = types.AzRoute{
-	URL:     "https://management.azure.com",
-	Scopes:  []string{"https://management.azure.com/.default"},
-	Headers: map[string]string{"x-ms-app": "Grafana"},
-}
+func getAzureMonitorRoutes(settings *azsettings.AzureSettings, credentials azcredentials.AzureCredentials, jsonData json.RawMessage) (map[string]types.AzRoute, error) {
+	azureCloud, err := azcredentials.GetAzureCloud(settings, credentials)
+	if err != nil {
+		return nil, err
+	}
 
-var azUSGovManagement = types.AzRoute{
-	URL:     "https://management.usgovcloudapi.net",
-	Scopes:  []string{"https://management.usgovcloudapi.net/.default"},
-	Headers: map[string]string{"x-ms-app": "Grafana"},
-}
+	if azureCloud == azsettings.AzureCustomized {
+		routes, err := getCustomizedCloudRoutes(jsonData)
+		if err != nil {
+			return nil, err
+		}
+		return routes, nil
+	}
 
-var azChinaManagement = types.AzRoute{
-	URL:     "https://management.chinacloudapi.cn",
-	Scopes:  []string{"https://management.chinacloudapi.cn/.default"},
-	Headers: map[string]string{"x-ms-app": "Grafana"},
-}
+	cloudSettings, err := settings.GetCloud(azureCloud)
+	if err != nil {
+		return nil, err
+	}
 
-var azLogAnalytics = types.AzRoute{
-	URL:     "https://api.loganalytics.io",
-	Scopes:  []string{"https://api.loganalytics.io/.default"},
-	Headers: map[string]string{"x-ms-app": "Grafana", "Cache-Control": "public, max-age=60"},
-}
+	resourceManagerUrl, ok := cloudSettings.Properties["resourceManager"]
+	if !ok {
+		err := fmt.Errorf("the Azure cloud '%s' doesn't have configuration for Azure Resource Manager", azureCloud)
+		return nil, err
+	}
+	resourceManagerScopes, err := audienceToScopes(resourceManagerUrl)
+	if err != nil {
+		return nil, err
+	}
+	resourceManagerRoute := types.AzRoute{
+		URL:     resourceManagerUrl,
+		Scopes:  resourceManagerScopes,
+		Headers: map[string]string{"x-ms-app": "Grafana"},
+	}
+	logAnalyticsUrl, ok := cloudSettings.Properties["logAnalytics"]
+	if !ok {
+		err := fmt.Errorf("the Azure cloud '%s' doesn't have configuration for Azure Log Analytics", azureCloud)
+		return nil, err
+	}
+	logAnalyticsScopes, err := audienceToScopes(logAnalyticsUrl)
+	if err != nil {
+		return nil, err
+	}
+	logAnalyticsRoute := types.AzRoute{
+		URL:     logAnalyticsUrl,
+		Scopes:  logAnalyticsScopes,
+		Headers: map[string]string{"x-ms-app": "Grafana", "Cache-Control": "public, max-age=60"},
+	}
+	portalUrl, ok := cloudSettings.Properties["portal"]
+	if !ok {
+		err := fmt.Errorf("the Azure cloud '%s' doesn't have configuration for Azure Portal", azureCloud)
+		return nil, err
+	}
+	portalRoute := types.AzRoute{
+		URL: portalUrl,
+	}
 
-var azChinaLogAnalytics = types.AzRoute{
-	URL:     "https://api.loganalytics.azure.cn",
-	Scopes:  []string{"https://api.loganalytics.azure.cn/.default"},
-	Headers: map[string]string{"x-ms-app": "Grafana", "Cache-Control": "public, max-age=60"},
+	routes := map[string]types.AzRoute{
+		azureMonitor:       resourceManagerRoute,
+		azureLogAnalytics:  logAnalyticsRoute,
+		azureResourceGraph: resourceManagerRoute,
+		azureTraces:        logAnalyticsRoute,
+		azurePortal:        portalRoute,
+	}
+
+	return routes, nil
 }
 
-var azUSGovLogAnalytics = types.AzRoute{
-	URL:     "https://api.loganalytics.us",
-	Scopes:  []string{"https://api.loganalytics.us/.default"},
-	Headers: map[string]string{"x-ms-app": "Grafana", "Cache-Control": "public, max-age=60"},
+func getCustomizedCloudRoutes(jsonData json.RawMessage) (map[string]types.AzRoute, error) {
+	customizedCloudSettings := types.AzureMonitorCustomizedCloudSettings{}
+	err := json.Unmarshal(jsonData, &customizedCloudSettings)
+	if err != nil {
+		return nil, fmt.Errorf("error getting customized cloud settings: %w", err)
+	}
+
+	if customizedCloudSettings.CustomizedRoutes == nil {
+		return nil, fmt.Errorf("unable to instantiate routes, customizedRoutes must be set")
+	}
+
+	azureRoutes := customizedCloudSettings.CustomizedRoutes
+	return azureRoutes, nil
 }
 
-var (
-	// The different Azure routes are identified by its cloud (e.g. public or gov)
-	// and the service to query (e.g. Azure Monitor or Azure Log Analytics)
-	routes = map[string]map[string]types.AzRoute{
-		azsettings.AzurePublic: {
-			azureMonitor:       azManagement,
-			azureLogAnalytics:  azLogAnalytics,
-			azureResourceGraph: azManagement,
-			azureTraces:        azLogAnalytics,
-		},
-		azsettings.AzureUSGovernment: {
-			azureMonitor:       azUSGovManagement,
-			azureLogAnalytics:  azUSGovLogAnalytics,
-			azureResourceGraph: azUSGovManagement,
-		},
-		azsettings.AzureChina: {
-			azureMonitor:       azChinaManagement,
-			azureLogAnalytics:  azChinaLogAnalytics,
-			azureResourceGraph: azChinaManagement,
-		},
+func audienceToScopes(audience string) ([]string, error) {
+	resourceId, err := url.Parse(audience)
+	if err != nil || resourceId.Scheme == "" || resourceId.Host == "" {
+		err = fmt.Errorf("endpoint resource ID (audience) '%s' invalid", audience)
+		return nil, err
 	}
-)
+
+	resourceId.Path = path.Join(resourceId.Path, ".default")
+	scopes := []string{resourceId.String()}
+	return scopes, nil
+}
diff --git a/pkg/tsdb/azuremonitor/standalone/datasource.go b/pkg/tsdb/azuremonitor/standalone/datasource.go
new file mode 100644
index 0000000000000..08fb7727a899c
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/standalone/datasource.go
@@ -0,0 +1,48 @@
+package main
+
+import (
+	"context"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+	azuremonitor "github.com/grafana/grafana/pkg/tsdb/azuremonitor"
+)
+
+var (
+	_ backend.QueryDataHandler    = (*Datasource)(nil)
+	_ backend.CheckHealthHandler  = (*Datasource)(nil)
+	_ backend.CallResourceHandler = (*Datasource)(nil)
+)
+
+func NewDatasource(context.Context, backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+	return &Datasource{
+		Service: azuremonitor.ProvideService(httpclient.NewProvider()),
+	}, nil
+}
+
+type Datasource struct {
+	Service *azuremonitor.Service
+}
+
+func contextualMiddlewares(ctx context.Context) context.Context {
+	cfg := backend.GrafanaConfigFromContext(ctx)
+	responseLimitMiddleware := httpclient.ResponseLimitMiddleware(cfg.ResponseLimit())
+	ctx = httpclient.WithContextualMiddleware(ctx, responseLimitMiddleware)
+	return ctx
+}
+
+func (d *Datasource) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+	ctx = contextualMiddlewares(ctx)
+	return d.Service.QueryData(ctx, req)
+}
+
+func (d *Datasource) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	ctx = contextualMiddlewares(ctx)
+	return d.Service.CallResource(ctx, req, sender)
+}
+
+func (d *Datasource) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
+	ctx = contextualMiddlewares(ctx)
+	return d.Service.CheckHealth(ctx, req)
+}
diff --git a/pkg/tsdb/azuremonitor/standalone/main.go b/pkg/tsdb/azuremonitor/standalone/main.go
new file mode 100644
index 0000000000000..e1af6def7a745
--- /dev/null
+++ b/pkg/tsdb/azuremonitor/standalone/main.go
@@ -0,0 +1,23 @@
+package main
+
+import (
+	"os"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
+)
+
+func main() {
+	// Start listening to requests sent from Grafana. This call is blocking so
+	// it won't finish until Grafana shuts down the process or the plugin choose
+	// to exit by itself using os.Exit. Manage automatically manages life cycle
+	// of datasource instances. It accepts datasource instance factory as first
+	// argument. This factory will be automatically called on incoming request
+	// from Grafana to create different instances of SampleDatasource (per datasource
+	// ID). When datasource configuration changed Dispose method will be called and
+	// new datasource instance created using NewSampleDatasource factory.
+	if err := datasource.Manage("grafana-azure-monitor-datasource", NewDatasource, datasource.ManageOpts{}); err != nil {
+		log.DefaultLogger.Error(err.Error())
+		os.Exit(1)
+	}
+}
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/1-azure-monitor-response-avg.json.average-aggregate-time-series-response.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/1-azure-monitor-response-avg.json.average-aggregate-time-series-response.golden.jsonc
index 4106c54a69a8b..c456b44286d9f 100644
--- a/pkg/tsdb/azuremonitor/testdata/azuremonitor/1-azure-monitor-response-avg.json.average-aggregate-time-series-response.golden.jsonc
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/1-azure-monitor-response-avg.json.average-aggregate-time-series-response.golden.jsonc
@@ -45,7 +45,7 @@
             "config": {
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -64,7 +64,7 @@
               "unit": "percent",
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/10-azure-monitor-response-multi-with-dimensions.json.multiple-time-series-response-with-multiple-dimensions.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/10-azure-monitor-response-multi-with-dimensions.json.multiple-time-series-response-with-multiple-dimensions.golden.jsonc
index 93da9fb1f309f..809b44679f57a 100644
--- a/pkg/tsdb/azuremonitor/testdata/azuremonitor/10-azure-monitor-response-multi-with-dimensions.json.multiple-time-series-response-with-multiple-dimensions.golden.jsonc
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/10-azure-monitor-response-multi-with-dimensions.json.multiple-time-series-response-with-multiple-dimensions.golden.jsonc
@@ -114,7 +114,7 @@
             "config": {
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -136,7 +136,7 @@
               "unit": "percent",
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -183,7 +183,7 @@
             "config": {
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -205,7 +205,7 @@
               "unit": "percent",
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -252,7 +252,7 @@
             "config": {
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana-1%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana-1%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -274,7 +274,7 @@
               "unit": "percent",
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana-1%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana-1%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -321,7 +321,7 @@
             "config": {
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana-1%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana-1%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -343,7 +343,7 @@
               "unit": "percent",
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana-1%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana-1%22%7D%7D%5D%7D%5D%7D"
                 }
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/11-azure-monitor-non-dataplane-response.json b/pkg/tsdb/azuremonitor/testdata/azuremonitor/11-azure-monitor-non-dataplane-response.json
deleted file mode 100644
index 5fc84f6afa655..0000000000000
--- a/pkg/tsdb/azuremonitor/testdata/azuremonitor/11-azure-monitor-non-dataplane-response.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "cost": 0,
-  "timespan": "2019-02-08T10:13:50Z\/2019-02-08T16:13:50Z",
-  "interval": "PT1M",
-  "value": [
-    {
-      "id": "\/subscriptions\/xxx\/resourceGroups\/grafanastaging\/providers\/Microsoft.Compute\/virtualMachines\/grafana\/providers\/Microsoft.Insights\/metrics\/Percentage CPU",
-      "type": "Microsoft.Insights\/metrics",
-      "name": {
-        "value": "Percentage CPU",
-        "localizedValue": "Percentage CPU"
-      },
-      "unit": "Percent",
-      "timeseries": [
-        {
-          "metadatavalues": [
-
-          ],
-          "data": [
-            {
-              "timeStamp": "2019-02-08T10:13:00Z",
-              "average": 2.0875
-            },
-            {
-              "timeStamp": "2019-02-08T10:14:00Z",
-              "average": 2.1525
-            },
-            {
-              "timeStamp": "2019-02-08T10:15:00Z",
-              "average": 2.155
-            },
-            {
-              "timeStamp": "2019-02-08T10:16:00Z",
-              "average": 3.6925
-            },
-            {
-              "timeStamp": "2019-02-08T10:17:00Z",
-              "average": 2.44
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "namespace": "Microsoft.Compute\/virtualMachines",
-  "resourceregion": "westeurope"
-}
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/11-azure-monitor-non-dataplane-response.json.non-dataplane-compliant-response.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/11-azure-monitor-non-dataplane-response.json.non-dataplane-compliant-response.golden.jsonc
deleted file mode 100644
index b30ba57e5cfee..0000000000000
--- a/pkg/tsdb/azuremonitor/testdata/azuremonitor/11-azure-monitor-non-dataplane-response.json.non-dataplane-compliant-response.golden.jsonc
+++ /dev/null
@@ -1,83 +0,0 @@
-//  🌟 This was machine generated.  Do not edit. 🌟
-//  
-//  Frame[0] 
-//  Name: 
-//  Dimensions: 2 Fields by 5 Rows
-//  +-------------------------------+----------------------+
-//  | Name: Time                    | Name: Percentage CPU |
-//  | Labels:                       | Labels:              |
-//  | Type: []time.Time             | Type: []*float64     |
-//  +-------------------------------+----------------------+
-//  | 2019-02-08 10:13:00 +0000 UTC | 2.0875               |
-//  | 2019-02-08 10:14:00 +0000 UTC | 2.1525               |
-//  | 2019-02-08 10:15:00 +0000 UTC | 2.155                |
-//  | 2019-02-08 10:16:00 +0000 UTC | 3.6925               |
-//  | 2019-02-08 10:17:00 +0000 UTC | 2.44                 |
-//  +-------------------------------+----------------------+
-//  
-//  
-//  🌟 This was machine generated.  Do not edit. 🌟
-{
-  "status": 200,
-  "frames": [
-    {
-      "schema": {
-        "fields": [
-          {
-            "name": "Time",
-            "type": "time",
-            "typeInfo": {
-              "frame": "time.Time"
-            },
-            "config": {
-              "links": [
-                {
-                  "title": "View in Azure Portal",
-                  "targetBlank": true,
-                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
-                }
-              ]
-            }
-          },
-          {
-            "name": "Percentage CPU",
-            "type": "number",
-            "typeInfo": {
-              "frame": "float64",
-              "nullable": true
-            },
-            "labels": {},
-            "config": {
-              "unit": "percent",
-              "links": [
-                {
-                  "title": "View in Azure Portal",
-                  "targetBlank": true,
-                  "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
-                }
-              ]
-            }
-          }
-        ]
-      },
-      "data": {
-        "values": [
-          [
-            1549620780000,
-            1549620840000,
-            1549620900000,
-            1549620960000,
-            1549621020000
-          ],
-          [
-            2.0875,
-            2.1525,
-            2.155,
-            3.6925,
-            2.44
-          ]
-        ]
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.total-aggregate-time-series-response.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.total-aggregate-time-series-response.golden.jsonc
index 516d8dabdab5c..a2dad9ff76da3 100644
--- a/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.total-aggregate-time-series-response.golden.jsonc
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.total-aggregate-time-series-response.golden.jsonc
@@ -45,7 +45,7 @@
             "config": {
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A1%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -64,7 +64,7 @@
               "unit": "percent",
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A1%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-alias-patterns-in-the-query.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-alias-patterns-in-the-query.golden.jsonc
index e936dbfb6ae4c..9aa9a8f1e9859 100644
--- a/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-alias-patterns-in-the-query.golden.jsonc
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-alias-patterns-in-the-query.golden.jsonc
@@ -45,7 +45,7 @@
             "config": {
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A1%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -65,7 +65,7 @@
               "unit": "percent",
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A1%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-legacy-azure-monitor-query-properties-and-with-a-resource-uri-it-should-use-the-resource-uri.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-legacy-azure-monitor-query-properties-and-with-a-resource-uri-it-should-use-the-resource-uri.golden.jsonc
index e936dbfb6ae4c..9aa9a8f1e9859 100644
--- a/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-legacy-azure-monitor-query-properties-and-with-a-resource-uri-it-should-use-the-resource-uri.golden.jsonc
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-legacy-azure-monitor-query-properties-and-with-a-resource-uri-it-should-use-the-resource-uri.golden.jsonc
@@ -45,7 +45,7 @@
             "config": {
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A1%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -65,7 +65,7 @@
               "unit": "percent",
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A1%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-legacy-azure-monitor-query-properties-and-without-a-resource-uri.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-legacy-azure-monitor-query-properties-and-without-a-resource-uri.golden.jsonc
index e936dbfb6ae4c..9aa9a8f1e9859 100644
--- a/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-legacy-azure-monitor-query-properties-and-without-a-resource-uri.golden.jsonc
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/2-azure-monitor-response-total.json.with-legacy-azure-monitor-query-properties-and-without-a-resource-uri.golden.jsonc
@@ -45,7 +45,7 @@
             "config": {
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A1%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -65,7 +65,7 @@
               "unit": "percent",
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A1%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/3-azure-monitor-response-maximum.json.maximum-aggregate-time-series-response.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/3-azure-monitor-response-maximum.json.maximum-aggregate-time-series-response.golden.jsonc
index 206d655f0c77e..aea971bdc9fb4 100644
--- a/pkg/tsdb/azuremonitor/testdata/azuremonitor/3-azure-monitor-response-maximum.json.maximum-aggregate-time-series-response.golden.jsonc
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/3-azure-monitor-response-maximum.json.maximum-aggregate-time-series-response.golden.jsonc
@@ -45,7 +45,7 @@
             "config": {
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A3%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -64,7 +64,7 @@
               "unit": "percent",
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A3%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/4-azure-monitor-response-minimum.json.minimum-aggregate-time-series-response.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/4-azure-monitor-response-minimum.json.minimum-aggregate-time-series-response.golden.jsonc
index 710dd144f9bf5..d22ef4b29cf43 100644
--- a/pkg/tsdb/azuremonitor/testdata/azuremonitor/4-azure-monitor-response-minimum.json.minimum-aggregate-time-series-response.golden.jsonc
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/4-azure-monitor-response-minimum.json.minimum-aggregate-time-series-response.golden.jsonc
@@ -45,7 +45,7 @@
             "config": {
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A2%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -64,7 +64,7 @@
               "unit": "percent",
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A2%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/5-azure-monitor-response-count.json.count-aggregate-time-series-response.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/5-azure-monitor-response-count.json.count-aggregate-time-series-response.golden.jsonc
index efc28c3910bda..0a53b0297fa53 100644
--- a/pkg/tsdb/azuremonitor/testdata/azuremonitor/5-azure-monitor-response-count.json.count-aggregate-time-series-response.golden.jsonc
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/5-azure-monitor-response-count.json.count-aggregate-time-series-response.golden.jsonc
@@ -45,7 +45,7 @@
             "config": {
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A7%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -64,7 +64,7 @@
               "unit": "percent",
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A7%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/6-azure-monitor-response-single-dimension.json.single-dimension-time-series-response.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/6-azure-monitor-response-single-dimension.json.single-dimension-time-series-response.golden.jsonc
index b6af09011bca4..e49758133597b 100644
--- a/pkg/tsdb/azuremonitor/testdata/azuremonitor/6-azure-monitor-response-single-dimension.json.single-dimension-time-series-response.golden.jsonc
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/6-azure-monitor-response-single-dimension.json.single-dimension-time-series-response.golden.jsonc
@@ -94,7 +94,7 @@
             "config": {
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -115,7 +115,7 @@
               "unit": "short",
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -164,7 +164,7 @@
             "config": {
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -185,7 +185,7 @@
               "unit": "short",
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -234,7 +234,7 @@
             "config": {
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -255,7 +255,7 @@
               "unit": "short",
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/6-azure-monitor-response-single-dimension.json.single-dimension-with-alias.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/6-azure-monitor-response-single-dimension.json.single-dimension-with-alias.golden.jsonc
index 4a5602b986293..3edc27cddde51 100644
--- a/pkg/tsdb/azuremonitor/testdata/azuremonitor/6-azure-monitor-response-single-dimension.json.single-dimension-with-alias.golden.jsonc
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/6-azure-monitor-response-single-dimension.json.single-dimension-with-alias.golden.jsonc
@@ -94,7 +94,7 @@
             "config": {
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -116,7 +116,7 @@
               "unit": "short",
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -165,7 +165,7 @@
             "config": {
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -187,7 +187,7 @@
               "unit": "short",
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -236,7 +236,7 @@
             "config": {
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -258,7 +258,7 @@
               "unit": "short",
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/7-azure-monitor-response-multi-dimension.json.multiple-dimension-time-series-response-with-label-alias.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/7-azure-monitor-response-multi-dimension.json.multiple-dimension-time-series-response-with-label-alias.golden.jsonc
index 4daa96f7fef1b..21b577c92d43f 100644
--- a/pkg/tsdb/azuremonitor/testdata/azuremonitor/7-azure-monitor-response-multi-dimension.json.multiple-dimension-time-series-response-with-label-alias.golden.jsonc
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/7-azure-monitor-response-multi-dimension.json.multiple-dimension-time-series-response-with-label-alias.golden.jsonc
@@ -85,7 +85,7 @@
             "config": {
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanatest%2Fproviders%2FMicrosoft.Storage%2FstorageAccounts%2Ftestblobaccount%2FblobServices%2Fdefault%2Fproviders%2FMicrosoft.Insights%2Fmetrics%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22default%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -108,7 +108,7 @@
               "unit": "decbytes",
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanatest%2Fproviders%2FMicrosoft.Storage%2FstorageAccounts%2Ftestblobaccount%2FblobServices%2Fdefault%2Fproviders%2FMicrosoft.Insights%2Fmetrics%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22default%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -151,7 +151,7 @@
             "config": {
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanatest%2Fproviders%2FMicrosoft.Storage%2FstorageAccounts%2Ftestblobaccount%2FblobServices%2Fdefault%2Fproviders%2FMicrosoft.Insights%2Fmetrics%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22default%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -174,7 +174,7 @@
               "unit": "decbytes",
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanatest%2Fproviders%2FMicrosoft.Storage%2FstorageAccounts%2Ftestblobaccount%2FblobServices%2Fdefault%2Fproviders%2FMicrosoft.Insights%2Fmetrics%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22default%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -217,7 +217,7 @@
             "config": {
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanatest%2Fproviders%2FMicrosoft.Storage%2FstorageAccounts%2Ftestblobaccount%2FblobServices%2Fdefault%2Fproviders%2FMicrosoft.Insights%2Fmetrics%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22default%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -240,7 +240,7 @@
               "unit": "decbytes",
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanatest%2Fproviders%2FMicrosoft.Storage%2FstorageAccounts%2Ftestblobaccount%2FblobServices%2Fdefault%2Fproviders%2FMicrosoft.Insights%2Fmetrics%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22default%22%7D%7D%5D%7D%5D%7D"
                 }
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/8-azure-monitor-response-unspecified-unit.json.unspecified-unit-with-alias-should-not-panic.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/8-azure-monitor-response-unspecified-unit.json.unspecified-unit-with-alias-should-not-panic.golden.jsonc
index c70b808eb34db..4ab7576e666b5 100644
--- a/pkg/tsdb/azuremonitor/testdata/azuremonitor/8-azure-monitor-response-unspecified-unit.json.unspecified-unit-with-alias-should-not-panic.golden.jsonc
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/8-azure-monitor-response-unspecified-unit.json.unspecified-unit-with-alias-should-not-panic.golden.jsonc
@@ -41,7 +41,7 @@
             "config": {
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -60,7 +60,7 @@
               "displayName": "custom",
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
diff --git a/pkg/tsdb/azuremonitor/testdata/azuremonitor/9-azure-monitor-response-multi.json.multiple-time-series-response.golden.jsonc b/pkg/tsdb/azuremonitor/testdata/azuremonitor/9-azure-monitor-response-multi.json.multiple-time-series-response.golden.jsonc
index ab7b4533d0661..440df0e1d000f 100644
--- a/pkg/tsdb/azuremonitor/testdata/azuremonitor/9-azure-monitor-response-multi.json.multiple-time-series-response.golden.jsonc
+++ b/pkg/tsdb/azuremonitor/testdata/azuremonitor/9-azure-monitor-response-multi.json.multiple-time-series-response.golden.jsonc
@@ -45,7 +45,7 @@
             "config": {
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
@@ -66,7 +66,7 @@
               "unit": "percent",
               "links": [
                 {
-                  "title": "View in Azure Portal",
+                  "title": "View query in Azure Portal",
                   "targetBlank": true,
                   "url": "http://ds/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/Referer/MetricsExplorer/TimeContext/%7B%22absolute%22%3A%7B%22startTime%22%3A%220001-01-01T00%3A00%3A00Z%22%2C%22endTime%22%3A%220001-01-01T00%3A00%3A00Z%22%7D%7D/ChartDefinition/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F12345678-aaaa-bbbb-cccc-123456789abc%2FresourceGroups%2Fgrafanastaging%2Fproviders%2FMicrosoft.Compute%2FvirtualMachines%2Fgrafana%22%7D%2C%22name%22%3A%22%22%2C%22aggregationType%22%3A4%2C%22namespace%22%3A%22%22%2C%22metricVisualization%22%3A%7B%22displayName%22%3A%22%22%2C%22resourceDisplayName%22%3A%22grafana%22%7D%7D%5D%7D%5D%7D"
                 }
diff --git a/pkg/tsdb/azuremonitor/time/time-grain.go b/pkg/tsdb/azuremonitor/time/time-grain.go
index 6c69642482c73..dfc62d9c1ff0a 100644
--- a/pkg/tsdb/azuremonitor/time/time-grain.go
+++ b/pkg/tsdb/azuremonitor/time/time-grain.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/grafana/grafana/pkg/tsdb/intervalv2"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
 )
 
 // TimeGrain handles conversions between
@@ -17,7 +17,7 @@ var (
 )
 
 func CreateISO8601DurationFromIntervalMS(it int64) (string, error) {
-	formatted := intervalv2.FormatDuration(time.Duration(it) * time.Millisecond)
+	formatted := gtime.FormatInterval(time.Duration(it) * time.Millisecond)
 
 	if strings.Contains(formatted, "ms") {
 		return "PT1M", nil
diff --git a/pkg/tsdb/azuremonitor/types/types.go b/pkg/tsdb/azuremonitor/types/types.go
index b8a0d709c8ddc..341e5f60b41fa 100644
--- a/pkg/tsdb/azuremonitor/types/types.go
+++ b/pkg/tsdb/azuremonitor/types/types.go
@@ -9,8 +9,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/grafana/grafana-azure-sdk-go/azcredentials"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azcredentials"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/kinds/dataquery"
 )
 
@@ -30,24 +31,12 @@ type AzRoute struct {
 	Headers map[string]string
 }
 
-type AzureSettings struct {
-	AzureMonitorSettings
-	AzureClientSettings
-}
-
 type AzureMonitorSettings struct {
 	SubscriptionId               string `json:"subscriptionId"`
 	LogAnalyticsDefaultWorkspace string `json:"logAnalyticsDefaultWorkspace"`
 	AppInsightsAppId             string `json:"appInsightsAppId"`
 }
 
-type AzureClientSettings struct {
-	AzureAuthType string
-	CloudName     string
-	TenantId      string
-	ClientId      string
-}
-
 // AzureMonitorCustomizedCloudSettings is the extended Azure Monitor settings for customized cloud
 type AzureMonitorCustomizedCloudSettings struct {
 	CustomizedRoutes map[string]AzRoute `json:"customizedRoutes"`
@@ -56,10 +45,10 @@ type AzureMonitorCustomizedCloudSettings struct {
 type DatasourceService struct {
 	URL        string
 	HTTPClient *http.Client
+	Logger     log.Logger
 }
 
 type DatasourceInfo struct {
-	Cloud       string
 	Credentials azcredentials.AzureCredentials
 	Settings    AzureMonitorSettings
 	Routes      map[string]AzRoute
diff --git a/pkg/tsdb/cloud-monitoring/annotation_query.go b/pkg/tsdb/cloud-monitoring/annotation_query.go
index afa54f128e59d..a3c14572c9b5b 100644
--- a/pkg/tsdb/cloud-monitoring/annotation_query.go
+++ b/pkg/tsdb/cloud-monitoring/annotation_query.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 )
 
@@ -18,10 +19,10 @@ type annotationEvent struct {
 	Text  string
 }
 
-func (s *Service) executeAnnotationQuery(ctx context.Context, req *backend.QueryDataRequest, dsInfo datasourceInfo, queries []cloudMonitoringQueryExecutor) (
+func (s *Service) executeAnnotationQuery(ctx context.Context, req *backend.QueryDataRequest, dsInfo datasourceInfo, queries []cloudMonitoringQueryExecutor, logger log.Logger) (
 	*backend.QueryDataResponse, error) {
 	resp := backend.NewQueryDataResponse()
-	queryRes, dr, _, err := queries[0].run(ctx, req, s, dsInfo, s.tracer)
+	queryRes, dr, _, err := queries[0].run(ctx, req, s, dsInfo, logger)
 	if err != nil {
 		return resp, err
 	}
diff --git a/pkg/tsdb/cloud-monitoring/cloudmonitoring.go b/pkg/tsdb/cloud-monitoring/cloudmonitoring.go
index cb63abd0ad6af..c8218bb2959e7 100644
--- a/pkg/tsdb/cloud-monitoring/cloudmonitoring.go
+++ b/pkg/tsdb/cloud-monitoring/cloudmonitoring.go
@@ -17,20 +17,15 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/resource/httpadapter"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 
-	"github.com/grafana/grafana/pkg/infra/httpclient"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/tsdb/cloud-monitoring/kinds/dataquery"
 )
 
-var (
-	slog = log.New("tsdb.cloudMonitoring")
-)
-
 var (
 	legendKeyFormat             = regexp.MustCompile(`\{\{\s*(.+?)\s*\}\}`)
 	metricNameFormat            = regexp.MustCompile(`([\w\d_]+)\.(googleapis\.com|io)/(.+)`)
@@ -65,11 +60,11 @@ const (
 	perSeriesAlignerDefault   = "ALIGN_MEAN"
 )
 
-func ProvideService(httpClientProvider httpclient.Provider, tracer tracing.Tracer) *Service {
+func ProvideService(httpClientProvider *httpclient.Provider) *Service {
 	s := &Service{
-		tracer:             tracer,
-		httpClientProvider: httpClientProvider,
-		im:                 datasource.NewInstanceManager(newInstanceSettings(httpClientProvider)),
+		httpClientProvider: *httpClientProvider,
+		im:                 datasource.NewInstanceManager(newInstanceSettings(*httpClientProvider)),
+		logger:             backend.NewLoggerWith("logger", "tsdb.cloudmonitoring"),
 
 		gceDefaultProjectGetter: utils.GCEDefaultProject,
 	}
@@ -109,7 +104,7 @@ func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthReque
 	}
 	defer func() {
 		if err := res.Body.Close(); err != nil {
-			slog.Warn("Failed to close response body", "err", err)
+			s.logger.Warn("Failed to close response body", "err", err)
 		}
 	}()
 
@@ -128,7 +123,7 @@ func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthReque
 type Service struct {
 	httpClientProvider httpclient.Provider
 	im                 instancemgmt.InstanceManager
-	tracer             tracing.Tracer
+	logger             log.Logger
 
 	resourceHandler backend.CallResourceHandler
 
@@ -194,7 +189,7 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst
 		}
 
 		for name, info := range routes {
-			client, err := newHTTPClient(dsInfo, opts, httpClientProvider, name)
+			client, err := newHTTPClient(dsInfo, opts, &httpClientProvider, name)
 			if err != nil {
 				return nil, err
 			}
@@ -332,7 +327,7 @@ func migrateRequest(req *backend.QueryDataRequest) error {
 // QueryData takes in the frontend queries, parses them into the CloudMonitoring query format
 // executes the queries against the CloudMonitoring API and parses the response into data frames
 func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
-	logger := slog.FromContext(ctx)
+	logger := s.logger.FromContext(ctx)
 	if len(req.Queries) == 0 {
 		return nil, fmt.Errorf("query contains no queries")
 	}
@@ -354,21 +349,21 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest)
 
 	switch req.Queries[0].QueryType {
 	case string(dataquery.QueryTypeAnnotation):
-		return s.executeAnnotationQuery(ctx, req, *dsInfo, queries)
+		return s.executeAnnotationQuery(ctx, req, *dsInfo, queries, logger)
 	default:
-		return s.executeTimeSeriesQuery(ctx, req, *dsInfo, queries)
+		return s.executeTimeSeriesQuery(ctx, req, *dsInfo, queries, logger)
 	}
 }
 
-func (s *Service) executeTimeSeriesQuery(ctx context.Context, req *backend.QueryDataRequest, dsInfo datasourceInfo, queries []cloudMonitoringQueryExecutor) (
+func (s *Service) executeTimeSeriesQuery(ctx context.Context, req *backend.QueryDataRequest, dsInfo datasourceInfo, queries []cloudMonitoringQueryExecutor, logger log.Logger) (
 	*backend.QueryDataResponse, error) {
 	resp := backend.NewQueryDataResponse()
 	for _, queryExecutor := range queries {
-		queryRes, dr, executedQueryString, err := queryExecutor.run(ctx, req, s, dsInfo, s.tracer)
+		queryRes, dr, executedQueryString, err := queryExecutor.run(ctx, req, s, dsInfo, logger)
 		if err != nil {
 			return resp, err
 		}
-		err = queryExecutor.parseResponse(queryRes, dr, executedQueryString)
+		err = queryExecutor.parseResponse(queryRes, dr, executedQueryString, logger)
 		if err != nil {
 			queryRes.Error = err
 		}
@@ -405,7 +400,6 @@ func (s *Service) buildQueryExecutors(logger log.Logger, req *backend.QueryDataR
 		case string(dataquery.QueryTypeTimeSeriesList), string(dataquery.QueryTypeAnnotation):
 			cmtsf := &cloudMonitoringTimeSeriesList{
 				refID:   query.RefID,
-				logger:  logger,
 				aliasBy: q.AliasBy,
 			}
 			if q.TimeSeriesList.View == nil || *q.TimeSeriesList.View == "" {
@@ -427,7 +421,6 @@ func (s *Service) buildQueryExecutors(logger log.Logger, req *backend.QueryDataR
 		case string(dataquery.QueryTypeSlo):
 			cmslo := &cloudMonitoringSLO{
 				refID:      query.RefID,
-				logger:     logger,
 				aliasBy:    q.AliasBy,
 				parameters: q.SloQuery,
 			}
@@ -436,10 +429,10 @@ func (s *Service) buildQueryExecutors(logger log.Logger, req *backend.QueryDataR
 		case string(dataquery.QueryTypePromQL):
 			cmp := &cloudMonitoringProm{
 				refID:      query.RefID,
-				logger:     logger,
 				aliasBy:    q.AliasBy,
 				parameters: q.PromQLQuery,
 				timeRange:  req.Queries[0].TimeRange,
+				logger:     logger,
 			}
 			queryInterface = cmp
 		default:
@@ -595,7 +588,7 @@ func (s *Service) getDefaultProject(ctx context.Context, dsInfo datasourceInfo)
 	return dsInfo.defaultProject, nil
 }
 
-func unmarshalResponse(logger log.Logger, res *http.Response) (cloudMonitoringResponse, error) {
+func unmarshalResponse(res *http.Response, logger log.Logger) (cloudMonitoringResponse, error) {
 	body, err := io.ReadAll(res.Body)
 	if err != nil {
 		return cloudMonitoringResponse{}, err
@@ -646,7 +639,7 @@ func addConfigData(frames data.Frames, dl string, unit string, period *string) d
 		if period != nil && *period != "" {
 			err := addInterval(*period, frames[i].Fields[0])
 			if err != nil {
-				slog.Error("Failed to add interval", "error", err)
+				backend.Logger.Error("Failed to add interval", "error", err)
 			}
 		}
 	}
diff --git a/pkg/tsdb/cloud-monitoring/cloudmonitoring_test.go b/pkg/tsdb/cloud-monitoring/cloudmonitoring_test.go
index 8b46c7f4d32a4..31972c68f2a64 100644
--- a/pkg/tsdb/cloud-monitoring/cloudmonitoring_test.go
+++ b/pkg/tsdb/cloud-monitoring/cloudmonitoring_test.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
-	"github.com/grafana/grafana/pkg/infra/httpclient"
 	"github.com/grafana/grafana/pkg/tsdb/cloud-monitoring/kinds/dataquery"
 
 	"github.com/stretchr/testify/assert"
@@ -23,7 +23,7 @@ import (
 func TestNewInstanceSettings(t *testing.T) {
 	t.Run("should create a new instance with empty settings", func(t *testing.T) {
 		cli := httpclient.NewProvider()
-		f := newInstanceSettings(cli)
+		f := newInstanceSettings(*cli)
 		dsInfo, err := f(context.Background(), backend.DataSourceInstanceSettings{
 			JSONData: json.RawMessage(`{}`),
 		})
@@ -34,7 +34,7 @@ func TestNewInstanceSettings(t *testing.T) {
 
 	t.Run("should create a new instance parsing settings", func(t *testing.T) {
 		cli := httpclient.NewProvider()
-		f := newInstanceSettings(cli)
+		f := newInstanceSettings(*cli)
 		dsInfo, err := f(context.Background(), backend.DataSourceInstanceSettings{
 			JSONData: json.RawMessage(`{"authenticationType": "test", "defaultProject": "test", "clientEmail": "test", "tokenUri": "test"}`),
 		})
@@ -53,7 +53,7 @@ func TestCloudMonitoring(t *testing.T) {
 
 	t.Run("parses a time series list query", func(t *testing.T) {
 		req := baseTimeSeriesList()
-		qes, err := service.buildQueryExecutors(slog, req)
+		qes, err := service.buildQueryExecutors(service.logger, req)
 		require.NoError(t, err)
 		queries := getCloudMonitoringListFromInterface(t, qes)
 
@@ -71,7 +71,7 @@ func TestCloudMonitoring(t *testing.T) {
 
 	t.Run("parses a time series query", func(t *testing.T) {
 		req := baseTimeSeriesQuery()
-		qes, err := service.buildQueryExecutors(slog, req)
+		qes, err := service.buildQueryExecutors(service.logger, req)
 		require.NoError(t, err)
 		queries := getCloudMonitoringQueryFromInterface(t, qes)
 
@@ -95,7 +95,7 @@ func TestCloudMonitoring(t *testing.T) {
 			"aliasBy":    "testalias"
 		}`)
 
-		qes, err := service.buildQueryExecutors(slog, req)
+		qes, err := service.buildQueryExecutors(service.logger, req)
 		require.NoError(t, err)
 		queries := getCloudMonitoringListFromInterface(t, qes)
 
@@ -114,7 +114,7 @@ func TestCloudMonitoring(t *testing.T) {
 			req := deprecatedReq()
 			err := migrateRequest(req)
 			require.NoError(t, err)
-			qes, err := service.buildQueryExecutors(slog, req)
+			qes, err := service.buildQueryExecutors(service.logger, req)
 			require.NoError(t, err)
 			queries := getCloudMonitoringListFromInterface(t, qes)
 
@@ -157,7 +157,7 @@ func TestCloudMonitoring(t *testing.T) {
 			err := migrateRequest(query)
 			require.NoError(t, err)
 
-			qes, err := service.buildQueryExecutors(slog, query)
+			qes, err := service.buildQueryExecutors(service.logger, query)
 			require.NoError(t, err)
 			queries := getCloudMonitoringListFromInterface(t, qes)
 			assert.Equal(t, 1, len(queries))
@@ -191,7 +191,7 @@ func TestCloudMonitoring(t *testing.T) {
 				err := migrateRequest(req)
 				require.NoError(t, err)
 
-				qes, err := service.buildQueryExecutors(slog, req)
+				qes, err := service.buildQueryExecutors(service.logger, req)
 				require.NoError(t, err)
 				queries := getCloudMonitoringListFromInterface(t, qes)
 				assert.Equal(t, `+1000s`, queries[0].params["aggregation.alignmentPeriod"][0])
@@ -221,7 +221,7 @@ func TestCloudMonitoring(t *testing.T) {
 				err := migrateRequest(req)
 				require.NoError(t, err)
 
-				qes, err := service.buildQueryExecutors(slog, req)
+				qes, err := service.buildQueryExecutors(service.logger, req)
 				require.NoError(t, err)
 				queries := getCloudMonitoringListFromInterface(t, qes)
 				assert.Equal(t, `+60s`, queries[0].params["aggregation.alignmentPeriod"][0])
@@ -257,7 +257,7 @@ func TestCloudMonitoring(t *testing.T) {
 				err := migrateRequest(req)
 				require.NoError(t, err)
 
-				qes, err := service.buildQueryExecutors(slog, req)
+				qes, err := service.buildQueryExecutors(service.logger, req)
 				require.NoError(t, err)
 				queries := getCloudMonitoringListFromInterface(t, qes)
 				assert.Equal(t, `+60s`, queries[0].params["aggregation.alignmentPeriod"][0])
@@ -274,7 +274,7 @@ func TestCloudMonitoring(t *testing.T) {
 				err := migrateRequest(req)
 				require.NoError(t, err)
 
-				qes, err := service.buildQueryExecutors(slog, req)
+				qes, err := service.buildQueryExecutors(service.logger, req)
 				require.NoError(t, err)
 				queries := getCloudMonitoringListFromInterface(t, qes)
 				assert.Equal(t, `+60s`, queries[0].params["aggregation.alignmentPeriod"][0])
@@ -291,7 +291,7 @@ func TestCloudMonitoring(t *testing.T) {
 				err := migrateRequest(req)
 				require.NoError(t, err)
 
-				qes, err := service.buildQueryExecutors(slog, req)
+				qes, err := service.buildQueryExecutors(service.logger, req)
 				require.NoError(t, err)
 				queries := getCloudMonitoringListFromInterface(t, qes)
 				assert.Equal(t, `+300s`, queries[0].params["aggregation.alignmentPeriod"][0])
@@ -308,7 +308,7 @@ func TestCloudMonitoring(t *testing.T) {
 				err := migrateRequest(req)
 				require.NoError(t, err)
 
-				qes, err := service.buildQueryExecutors(slog, req)
+				qes, err := service.buildQueryExecutors(service.logger, req)
 				require.NoError(t, err)
 				queries := getCloudMonitoringListFromInterface(t, qes)
 				assert.Equal(t, `+3600s`, queries[0].params["aggregation.alignmentPeriod"][0])
@@ -329,7 +329,7 @@ func TestCloudMonitoring(t *testing.T) {
 				err := migrateRequest(req)
 				require.NoError(t, err)
 
-				qes, err := service.buildQueryExecutors(slog, req)
+				qes, err := service.buildQueryExecutors(service.logger, req)
 				require.NoError(t, err)
 				queries := getCloudMonitoringListFromInterface(t, qes)
 				assert.Equal(t, `+60s`, queries[0].params["aggregation.alignmentPeriod"][0])
@@ -361,7 +361,7 @@ func TestCloudMonitoring(t *testing.T) {
 				err := migrateRequest(req)
 				require.NoError(t, err)
 
-				qes, err := service.buildQueryExecutors(slog, req)
+				qes, err := service.buildQueryExecutors(service.logger, req)
 				require.NoError(t, err)
 				queries := getCloudMonitoringListFromInterface(t, qes)
 				assert.Equal(t, `+60s`, queries[0].params["aggregation.alignmentPeriod"][0])
@@ -393,7 +393,7 @@ func TestCloudMonitoring(t *testing.T) {
 				err := migrateRequest(req)
 				require.NoError(t, err)
 
-				qes, err := service.buildQueryExecutors(slog, req)
+				qes, err := service.buildQueryExecutors(service.logger, req)
 				require.NoError(t, err)
 				queries := getCloudMonitoringListFromInterface(t, qes)
 				assert.Equal(t, `+300s`, queries[0].params["aggregation.alignmentPeriod"][0])
@@ -425,7 +425,7 @@ func TestCloudMonitoring(t *testing.T) {
 				err := migrateRequest(req)
 				require.NoError(t, err)
 
-				qes, err := service.buildQueryExecutors(slog, req)
+				qes, err := service.buildQueryExecutors(service.logger, req)
 				require.NoError(t, err)
 				queries := getCloudMonitoringListFromInterface(t, qes)
 				assert.Equal(t, `+3600s`, queries[0].params["aggregation.alignmentPeriod"][0])
@@ -457,7 +457,7 @@ func TestCloudMonitoring(t *testing.T) {
 				err := migrateRequest(req)
 				require.NoError(t, err)
 
-				qes, err := service.buildQueryExecutors(slog, req)
+				qes, err := service.buildQueryExecutors(service.logger, req)
 				require.NoError(t, err)
 				queries := getCloudMonitoringListFromInterface(t, qes)
 				assert.Equal(t, `+600s`, queries[0].params["aggregation.alignmentPeriod"][0])
@@ -489,7 +489,7 @@ func TestCloudMonitoring(t *testing.T) {
 			err := migrateRequest(req)
 			require.NoError(t, err)
 
-			qes, err := service.buildQueryExecutors(slog, req)
+			qes, err := service.buildQueryExecutors(service.logger, req)
 			require.NoError(t, err)
 			queries := getCloudMonitoringListFromInterface(t, qes)
 
@@ -535,7 +535,7 @@ func TestCloudMonitoring(t *testing.T) {
 			err := migrateRequest(req)
 			require.NoError(t, err)
 
-			qes, err := service.buildQueryExecutors(slog, req)
+			qes, err := service.buildQueryExecutors(service.logger, req)
 			require.NoError(t, err)
 			queries := getCloudMonitoringListFromInterface(t, qes)
 
@@ -598,7 +598,7 @@ func TestCloudMonitoring(t *testing.T) {
 		require.NoError(t, err)
 
 		t.Run("and query type is metrics", func(t *testing.T) {
-			qes, err := service.buildQueryExecutors(slog, req)
+			qes, err := service.buildQueryExecutors(service.logger, req)
 			require.NoError(t, err)
 			queries := getCloudMonitoringListFromInterface(t, qes)
 
@@ -647,7 +647,7 @@ func TestCloudMonitoring(t *testing.T) {
 			err = migrateRequest(req)
 			require.NoError(t, err)
 
-			qes, err = service.buildQueryExecutors(slog, req)
+			qes, err = service.buildQueryExecutors(service.logger, req)
 			require.NoError(t, err)
 
 			tqueries := getCloudMonitoringQueryFromInterface(t, qes)
@@ -675,7 +675,7 @@ func TestCloudMonitoring(t *testing.T) {
 			err := migrateRequest(req)
 			require.NoError(t, err)
 
-			qes, err := service.buildQueryExecutors(slog, req)
+			qes, err := service.buildQueryExecutors(service.logger, req)
 			require.NoError(t, err)
 			queries := getCloudMonitoringSLOFromInterface(t, qes)
 
@@ -705,7 +705,7 @@ func TestCloudMonitoring(t *testing.T) {
 			err = migrateRequest(req)
 			require.NoError(t, err)
 
-			qes, err = service.buildQueryExecutors(slog, req)
+			qes, err = service.buildQueryExecutors(service.logger, req)
 			require.NoError(t, err)
 			qqueries := getCloudMonitoringSLOFromInterface(t, qes)
 			assert.Equal(t, "ALIGN_NEXT_OLDER", qqueries[0].params["aggregation.perSeriesAligner"][0])
@@ -730,7 +730,7 @@ func TestCloudMonitoring(t *testing.T) {
 			err = migrateRequest(req)
 			require.NoError(t, err)
 
-			qes, err = service.buildQueryExecutors(slog, req)
+			qes, err = service.buildQueryExecutors(service.logger, req)
 			require.NoError(t, err)
 			qqqueries := getCloudMonitoringSLOFromInterface(t, qes)
 			assert.Equal(t, `aggregation.alignmentPeriod=%2B60s&aggregation.perSeriesAligner=ALIGN_NEXT_OLDER&filter=select_slo_burn_rate%28%22projects%2Ftest-proj%2Fservices%2Ftest-service%2FserviceLevelObjectives%2Ftest-slo%22%2C+%221h%22%29&interval.endTime=2018-03-15T13%3A34%3A00Z&interval.startTime=2018-03-15T13%3A00%3A00Z`, qqqueries[0].params.Encode())
@@ -812,7 +812,7 @@ func TestCloudMonitoring(t *testing.T) {
 		err := migrateRequest(req)
 		require.NoError(t, err)
 
-		qes, err := service.buildQueryExecutors(slog, req)
+		qes, err := service.buildQueryExecutors(service.logger, req)
 		require.NoError(t, err)
 		queries := getCloudMonitoringListFromInterface(t, qes)
 
@@ -842,7 +842,7 @@ func TestCloudMonitoring(t *testing.T) {
 		err := migrateRequest(req)
 		require.NoError(t, err)
 
-		qes, err := service.buildQueryExecutors(slog, req)
+		qes, err := service.buildQueryExecutors(service.logger, req)
 		require.NoError(t, err)
 		queries := getCloudMonitoringListFromInterface(t, qes)
 
@@ -872,7 +872,7 @@ func TestCloudMonitoring(t *testing.T) {
 		err := migrateRequest(req)
 		require.NoError(t, err)
 
-		qes, err := service.buildQueryExecutors(slog, req)
+		qes, err := service.buildQueryExecutors(service.logger, req)
 		require.NoError(t, err)
 		queries := getCloudMonitoringListFromInterface(t, qes)
 
@@ -900,7 +900,7 @@ func TestCloudMonitoring(t *testing.T) {
 		err := migrateRequest(req)
 		require.NoError(t, err)
 
-		qes, err := service.buildQueryExecutors(slog, req)
+		qes, err := service.buildQueryExecutors(service.logger, req)
 		require.NoError(t, err)
 		queries := getCloudMonitoringListFromInterface(t, qes)
 
@@ -930,7 +930,7 @@ func TestCloudMonitoring(t *testing.T) {
 		err := migrateRequest(req)
 		require.NoError(t, err)
 
-		qes, err := service.buildQueryExecutors(slog, req)
+		qes, err := service.buildQueryExecutors(service.logger, req)
 		require.NoError(t, err)
 		queries := getCloudMonitoringListFromInterface(t, qes)
 
@@ -958,7 +958,7 @@ func TestCloudMonitoring(t *testing.T) {
 		err := migrateRequest(req)
 		require.NoError(t, err)
 
-		qes, err := service.buildQueryExecutors(slog, req)
+		qes, err := service.buildQueryExecutors(service.logger, req)
 		require.NoError(t, err)
 		queries := getCloudMonitoringListFromInterface(t, qes)
 
diff --git a/pkg/tsdb/cloud-monitoring/converter/converter.go b/pkg/tsdb/cloud-monitoring/converter/converter.go
new file mode 100644
index 0000000000000..7b5cd6b95f61f
--- /dev/null
+++ b/pkg/tsdb/cloud-monitoring/converter/converter.go
@@ -0,0 +1,1175 @@
+package converter
+
+import (
+	"encoding/json"
+	"fmt"
+	"strconv"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	sdkjsoniter "github.com/grafana/grafana-plugin-sdk-go/data/utils/jsoniter"
+	jsoniter "github.com/json-iterator/go"
+
+	"golang.org/x/exp/slices"
+)
+
+// helpful while debugging all the options that may appear
+func logf(format string, a ...any) {
+	// fmt.Printf(format, a...)
+}
+
+type Options struct {
+	Dataplane bool
+}
+
+func rspErr(e error) backend.DataResponse {
+	return backend.DataResponse{Error: e}
+}
+
+// ReadPrometheusStyleResult will read results from a prometheus or loki server and return data frames
+func ReadPrometheusStyleResult(jIter *jsoniter.Iterator, opt Options) backend.DataResponse {
+	iter := sdkjsoniter.NewIterator(jIter)
+	var rsp backend.DataResponse
+	status := "unknown"
+	errorType := ""
+	promErrString := ""
+	warnings := []data.Notice{}
+
+l1Fields:
+	for l1Field, err := iter.ReadObject(); ; l1Field, err = iter.ReadObject() {
+		if err != nil {
+			return rspErr(err)
+		}
+		switch l1Field {
+		case "status":
+			if status, err = iter.ReadString(); err != nil {
+				return rspErr(err)
+			}
+
+		case "data":
+			rsp = readPrometheusData(iter, opt)
+			if rsp.Error != nil {
+				return rsp
+			}
+
+		case "error":
+			if promErrString, err = iter.ReadString(); err != nil {
+				return rspErr(err)
+			}
+
+		case "errorType":
+			if errorType, err = iter.ReadString(); err != nil {
+				return rspErr(err)
+			}
+
+		case "warnings":
+			if warnings, err = readWarnings(iter); err != nil {
+				return rspErr(err)
+			}
+
+		case "":
+			if err != nil {
+				return rspErr(err)
+			}
+			break l1Fields
+
+		default:
+			v, err := iter.Read()
+			if err != nil {
+				rsp.Error = err
+				return rsp
+			}
+			logf("[ROOT] TODO, support key: %s / %v\n", l1Field, v)
+		}
+	}
+
+	if status == "error" {
+		return backend.DataResponse{
+			Error: fmt.Errorf("%s: %s", errorType, promErrString),
+		}
+	}
+
+	if len(warnings) > 0 {
+		for _, frame := range rsp.Frames {
+			if frame.Meta == nil {
+				frame.Meta = &data.FrameMeta{}
+			}
+			frame.Meta.Notices = warnings
+		}
+	}
+
+	return rsp
+}
+
+func readWarnings(iter *sdkjsoniter.Iterator) ([]data.Notice, error) {
+	warnings := []data.Notice{}
+	next, err := iter.WhatIsNext()
+	if err != nil {
+		return nil, err
+	}
+
+	if next != sdkjsoniter.ArrayValue {
+		return warnings, nil
+	}
+
+	for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+		if err != nil {
+			return nil, err
+		}
+		next, err := iter.WhatIsNext()
+		if err != nil {
+			return nil, err
+		}
+		if next == sdkjsoniter.StringValue {
+			s, err := iter.ReadString()
+			if err != nil {
+				return nil, err
+			}
+			notice := data.Notice{
+				Severity: data.NoticeSeverityWarning,
+				Text:     s,
+			}
+			warnings = append(warnings, notice)
+		}
+	}
+
+	return warnings, nil
+}
+
+func readPrometheusData(iter *sdkjsoniter.Iterator, opt Options) backend.DataResponse {
+	var rsp backend.DataResponse
+	t, err := iter.WhatIsNext()
+	if err != nil {
+		return rspErr(err)
+	}
+
+	if t == sdkjsoniter.ArrayValue {
+		return readArrayData(iter)
+	}
+
+	if t != sdkjsoniter.ObjectValue {
+		return backend.DataResponse{
+			Error: fmt.Errorf("expected object type"),
+		}
+	}
+
+	resultType := ""
+	resultTypeFound := false
+	var resultBytes []byte
+
+	encodingFlags := make([]string, 0)
+
+l1Fields:
+	for l1Field, err := iter.ReadObject(); ; l1Field, err = iter.ReadObject() {
+		if err != nil {
+			return rspErr(err)
+		}
+		switch l1Field {
+		case "encodingFlags":
+			for ok, err := iter.ReadArray(); ok; ok, err = iter.ReadArray() {
+				if err != nil {
+					return rspErr(err)
+				}
+				encodingFlag, err := iter.ReadString()
+				if err != nil {
+					return rspErr(err)
+				}
+				encodingFlags = append(encodingFlags, encodingFlag)
+			}
+			if err != nil {
+				return rspErr(err)
+			}
+		case "resultType":
+			resultType, err = iter.ReadString()
+			if err != nil {
+				return rspErr(err)
+			}
+			resultTypeFound = true
+
+			// if we have saved resultBytes we will parse them here
+			// we saved them because when we had them we don't know the resultType
+			if len(resultBytes) > 0 {
+				ji := sdkjsoniter.NewIterator(jsoniter.ParseBytes(sdkjsoniter.ConfigDefault, resultBytes))
+				rsp = readResult(resultType, rsp, ji, opt, encodingFlags)
+			}
+		case "result":
+			// for some rare cases resultType is coming after the result.
+			// when that happens we save the bytes and parse them after reading resultType
+			// see: https://github.com/grafana/grafana/issues/64693
+			if resultTypeFound {
+				rsp = readResult(resultType, rsp, iter, opt, encodingFlags)
+			} else {
+				resultBytes, _ = iter.SkipAndReturnBytes()
+			}
+
+		case "stats":
+			v, err := iter.Read()
+			if err != nil {
+				rspErr(err)
+			}
+			if len(rsp.Frames) > 0 {
+				meta := rsp.Frames[0].Meta
+				if meta == nil {
+					meta = &data.FrameMeta{}
+					rsp.Frames[0].Meta = meta
+				}
+				meta.Custom = map[string]any{
+					"stats": v,
+				}
+			}
+
+		case "":
+			if err != nil {
+				return rspErr(err)
+			}
+			if !resultTypeFound {
+				return rspErr(fmt.Errorf("no resultType found"))
+			}
+			break l1Fields
+
+		default:
+			v, err := iter.Read()
+			if err != nil {
+				return rspErr(err)
+			}
+			logf("[data] TODO, support key: %s / %v\n", l1Field, v)
+		}
+	}
+
+	return rsp
+}
+
+// will read the result object based on the resultType and return a DataResponse
+func readResult(resultType string, rsp backend.DataResponse, iter *sdkjsoniter.Iterator, opt Options, encodingFlags []string) backend.DataResponse {
+	switch resultType {
+	case "matrix", "vector":
+		rsp = readMatrixOrVectorMulti(iter, resultType, opt)
+		if rsp.Error != nil {
+			return rsp
+		}
+	case "streams":
+		if slices.Contains(encodingFlags, "categorize-labels") {
+			rsp = readCategorizedStream(iter)
+		} else {
+			rsp = readStream(iter)
+		}
+		if rsp.Error != nil {
+			return rsp
+		}
+	case "string":
+		rsp = readString(iter)
+		if rsp.Error != nil {
+			return rsp
+		}
+	case "scalar":
+		rsp = readScalar(iter, opt.Dataplane)
+		if rsp.Error != nil {
+			return rsp
+		}
+	default:
+		if err := iter.Skip(); err != nil {
+			return rspErr(err)
+		}
+		rsp = backend.DataResponse{
+			Error: fmt.Errorf("unknown result type: %s", resultType),
+		}
+	}
+	return rsp
+}
+
+// will return strings or exemplars
+func readArrayData(iter *sdkjsoniter.Iterator) backend.DataResponse {
+	lookup := make(map[string]*data.Field)
+
+	var labelFrame *data.Frame
+	rsp := backend.DataResponse{}
+
+	stringField := data.NewFieldFromFieldType(data.FieldTypeString, 0)
+	stringField.Name = "Value"
+	for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+		if err != nil {
+			rspErr(err)
+		}
+
+		next, err := iter.WhatIsNext()
+		if err != nil {
+			return rspErr(err)
+		}
+
+		switch next {
+		case sdkjsoniter.StringValue:
+			s, err := iter.ReadString()
+			if err != nil {
+				return rspErr(err)
+			}
+			stringField.Append(s)
+
+		// Either label or exemplars
+		case sdkjsoniter.ObjectValue:
+			exemplar, labelPairs, err := readLabelsOrExemplars(iter)
+			if err != nil {
+				rspErr(err)
+			}
+			if exemplar != nil {
+				rsp.Frames = append(rsp.Frames, exemplar)
+			} else if labelPairs != nil {
+				max := 0
+				for _, pair := range labelPairs {
+					k := pair[0]
+					v := pair[1]
+					f, ok := lookup[k]
+					if !ok {
+						f = data.NewFieldFromFieldType(data.FieldTypeString, 0)
+						f.Name = k
+						lookup[k] = f
+
+						if labelFrame == nil {
+							labelFrame = data.NewFrame("")
+							rsp.Frames = append(rsp.Frames, labelFrame)
+						}
+						labelFrame.Fields = append(labelFrame.Fields, f)
+					}
+					f.Append(fmt.Sprintf("%v", v))
+					if f.Len() > max {
+						max = f.Len()
+					}
+				}
+
+				// Make sure all fields have equal length
+				for _, f := range lookup {
+					diff := max - f.Len()
+					if diff > 0 {
+						f.Extend(diff)
+					}
+				}
+			}
+
+		default:
+			{
+				ext, err := iter.ReadAny()
+				if err != nil {
+					rspErr(err)
+				}
+				v := fmt.Sprintf("%v", ext)
+				stringField.Append(v)
+			}
+		}
+	}
+
+	if stringField.Len() > 0 {
+		rsp.Frames = append(rsp.Frames, data.NewFrame("", stringField))
+	}
+
+	return rsp
+}
+
+// For consistent ordering read values to an array not a map
+func readLabelsAsPairs(iter *sdkjsoniter.Iterator) ([][2]string, error) {
+	pairs := make([][2]string, 0, 10)
+	for k, err := iter.ReadObject(); k != ""; k, err = iter.ReadObject() {
+		if err != nil {
+			return nil, err
+		}
+		v, err := iter.ReadString()
+		if err != nil {
+			return nil, err
+		}
+		pairs = append(pairs, [2]string{k, v})
+	}
+	return pairs, nil
+}
+
+func readLabelsOrExemplars(iter *sdkjsoniter.Iterator) (*data.Frame, [][2]string, error) {
+	pairs := make([][2]string, 0, 10)
+	labels := data.Labels{}
+	var frame *data.Frame
+
+l1Fields:
+	for l1Field, err := iter.ReadObject(); ; l1Field, err = iter.ReadObject() {
+		if err != nil {
+			return nil, nil, err
+		}
+		switch l1Field {
+		case "seriesLabels":
+			err = iter.ReadVal(&labels)
+			if err != nil {
+				return nil, nil, err
+			}
+
+		case "exemplars":
+			lookup := make(map[string]*data.Field)
+			timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
+			timeField.Name = data.TimeSeriesTimeFieldName
+			valueField := data.NewFieldFromFieldType(data.FieldTypeFloat64, 0)
+			valueField.Name = data.TimeSeriesValueFieldName
+			valueField.Labels = labels
+			frame = data.NewFrame("", timeField, valueField)
+			frame.Meta = &data.FrameMeta{
+				Custom: resultTypeToCustomMeta("exemplar"),
+			}
+			exCount := 0
+			for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+				if err != nil {
+					return nil, nil, err
+				}
+				for l2Field, err := iter.ReadObject(); l2Field != ""; l2Field, err = iter.ReadObject() {
+					if err != nil {
+						return nil, nil, err
+					}
+					switch l2Field {
+					// nolint:goconst
+					case "value":
+						s, err := iter.ReadString()
+						if err != nil {
+							return nil, nil, err
+						}
+						v, err := strconv.ParseFloat(s, 64)
+						if err != nil {
+							return nil, nil, err
+						}
+						valueField.Append(v)
+
+					case "timestamp":
+						f, err := iter.ReadFloat64()
+						if err != nil {
+							return nil, nil, err
+						}
+						ts := timeFromFloat(f)
+						timeField.Append(ts)
+
+					case "labels":
+						pairs, err := readLabelsAsPairs(iter)
+						if err != nil {
+							return nil, nil, err
+						}
+						for _, pair := range pairs {
+							k := pair[0]
+							v := pair[1]
+							f, ok := lookup[k]
+							if !ok {
+								f = data.NewFieldFromFieldType(data.FieldTypeString, exCount)
+								f.Name = k
+								lookup[k] = f
+								frame.Fields = append(frame.Fields, f)
+							}
+							f.Append(v)
+						}
+
+						// Make sure all fields have equal length
+						for _, f := range lookup {
+							diff := exCount + 1 - f.Len()
+							if diff > 0 {
+								f.Extend(diff)
+							}
+						}
+
+					default:
+						if err = iter.Skip(); err != nil {
+							return nil, nil, err
+						}
+
+						frame.AppendNotices(data.Notice{
+							Severity: data.NoticeSeverityError,
+							Text:     fmt.Sprintf("unable to parse key: %s in response body", l2Field),
+						})
+					}
+				}
+				exCount++
+			}
+		case "":
+			if err != nil {
+				return nil, nil, err
+			}
+			break l1Fields
+
+		default:
+			iV, err := iter.Read()
+			if err != nil {
+				return nil, nil, err
+			}
+			v := fmt.Sprintf("%v", iV)
+			pairs = append(pairs, [2]string{l1Field, v})
+		}
+	}
+
+	return frame, pairs, nil
+}
+
+func readString(iter *sdkjsoniter.Iterator) backend.DataResponse {
+	timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
+	timeField.Name = data.TimeSeriesTimeFieldName
+	valueField := data.NewFieldFromFieldType(data.FieldTypeString, 0)
+	valueField.Name = data.TimeSeriesValueFieldName
+	valueField.Labels = data.Labels{}
+
+	_, err := iter.ReadArray()
+	if err != nil {
+		return rspErr(err)
+	}
+
+	var t float64
+	if t, err = iter.ReadFloat64(); err != nil {
+		return rspErr(err)
+	}
+
+	if _, err = iter.ReadArray(); err != nil {
+		return rspErr(err)
+	}
+
+	var v string
+	if v, err = iter.ReadString(); err != nil {
+		return rspErr(err)
+	}
+
+	if _, err = iter.ReadArray(); err != nil {
+		return rspErr(err)
+	}
+
+	tt := timeFromFloat(t)
+	timeField.Append(tt)
+	valueField.Append(v)
+
+	frame := data.NewFrame("", timeField, valueField)
+	frame.Meta = &data.FrameMeta{
+		Type:   data.FrameTypeTimeSeriesMulti,
+		Custom: resultTypeToCustomMeta("string"),
+	}
+
+	return backend.DataResponse{
+		Frames: []*data.Frame{frame},
+	}
+}
+
+func readScalar(iter *sdkjsoniter.Iterator, dataPlane bool) backend.DataResponse {
+	rsp := backend.DataResponse{}
+
+	timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
+	timeField.Name = data.TimeSeriesTimeFieldName
+	valueField := data.NewFieldFromFieldType(data.FieldTypeFloat64, 0)
+	valueField.Name = data.TimeSeriesValueFieldName
+	valueField.Labels = data.Labels{}
+
+	t, v, err := readTimeValuePair(iter)
+	if err != nil {
+		rsp.Error = err
+		return rsp
+	}
+	timeField.Append(t)
+	valueField.Append(v)
+
+	frame := data.NewFrame("", timeField, valueField)
+	frame.Meta = &data.FrameMeta{
+		Type:   data.FrameTypeNumericMulti,
+		Custom: resultTypeToCustomMeta("scalar"),
+	}
+
+	if dataPlane {
+		frame.Meta.TypeVersion = data.FrameTypeVersion{0, 1}
+	}
+
+	return backend.DataResponse{
+		Frames: []*data.Frame{frame},
+	}
+}
+
+func readMatrixOrVectorMulti(iter *sdkjsoniter.Iterator, resultType string, opt Options) backend.DataResponse {
+	rsp := backend.DataResponse{}
+
+	for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+		if err != nil {
+			return rspErr(err)
+		}
+		timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
+		timeField.Name = data.TimeSeriesTimeFieldName
+		valueField := data.NewFieldFromFieldType(data.FieldTypeFloat64, 0)
+		valueField.Name = data.TimeSeriesValueFieldName
+		valueField.Labels = data.Labels{}
+
+		var histogram *histogramInfo
+
+		for l1Field, err := iter.ReadObject(); l1Field != ""; l1Field, err = iter.ReadObject() {
+			if err != nil {
+				return rspErr(err)
+			}
+			switch l1Field {
+			case "metric":
+				if err = iter.ReadVal(&valueField.Labels); err != nil {
+					return rspErr(err)
+				}
+
+			case "value":
+				t, v, err := readTimeValuePair(iter)
+				if err != nil {
+					return rspErr(err)
+				}
+				timeField.Append(t)
+				valueField.Append(v)
+
+			// nolint:goconst
+			case "values":
+				for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+					if err != nil {
+						return rspErr(err)
+					}
+					t, v, err := readTimeValuePair(iter)
+					if err != nil {
+						return rspErr(err)
+					}
+					timeField.Append(t)
+					valueField.Append(v)
+				}
+
+			case "histogram":
+				if histogram == nil {
+					histogram = newHistogramInfo()
+				}
+				err = readHistogram(iter, histogram)
+				if err != nil {
+					return rspErr(err)
+				}
+
+			case "histograms":
+				if histogram == nil {
+					histogram = newHistogramInfo()
+				}
+				for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+					if err != nil {
+						return rspErr(err)
+					}
+					if err = readHistogram(iter, histogram); err != nil {
+						return rspErr(err)
+					}
+				}
+
+			default:
+				if err = iter.Skip(); err != nil {
+					return rspErr(err)
+				}
+				logf("readMatrixOrVector: %s\n", l1Field)
+			}
+		}
+
+		if histogram != nil {
+			histogram.yMin.Labels = valueField.Labels
+			frame := data.NewFrame(valueField.Name, histogram.time, histogram.yMin, histogram.yMax, histogram.count, histogram.yLayout)
+			frame.Meta = &data.FrameMeta{
+				Type: "heatmap-cells",
+			}
+			if frame.Name == data.TimeSeriesValueFieldName {
+				frame.Name = "" // only set the name if useful
+			}
+			rsp.Frames = append(rsp.Frames, frame)
+		} else {
+			frame := data.NewFrame("", timeField, valueField)
+			frame.Meta = &data.FrameMeta{
+				Type:   data.FrameTypeTimeSeriesMulti,
+				Custom: resultTypeToCustomMeta(resultType),
+			}
+			if opt.Dataplane && resultType == "vector" {
+				frame.Meta.Type = data.FrameTypeNumericMulti
+			}
+			if opt.Dataplane {
+				frame.Meta.TypeVersion = data.FrameTypeVersion{0, 1}
+			}
+			rsp.Frames = append(rsp.Frames, frame)
+		}
+	}
+
+	return rsp
+}
+
+func readTimeValuePair(iter *sdkjsoniter.Iterator) (time.Time, float64, error) {
+	if _, err := iter.ReadArray(); err != nil {
+		return time.Time{}, 0, err
+	}
+
+	t, err := iter.ReadFloat64()
+	if err != nil {
+		return time.Time{}, 0, err
+	}
+
+	if _, err = iter.ReadArray(); err != nil {
+		return time.Time{}, 0, err
+	}
+
+	var v string
+	if v, err = iter.ReadString(); err != nil {
+		return time.Time{}, 0, err
+	}
+
+	if _, err = iter.ReadArray(); err != nil {
+		return time.Time{}, 0, err
+	}
+
+	tt := timeFromFloat(t)
+	fv, err := strconv.ParseFloat(v, 64)
+	return tt, fv, err
+}
+
+type histogramInfo struct {
+	// XMax (time)	YMin	Ymax	Count	YLayout
+	time    *data.Field
+	yMin    *data.Field // will have labels?
+	yMax    *data.Field
+	count   *data.Field
+	yLayout *data.Field
+}
+
+func newHistogramInfo() *histogramInfo {
+	hist := &histogramInfo{
+		time:    data.NewFieldFromFieldType(data.FieldTypeTime, 0),
+		yMin:    data.NewFieldFromFieldType(data.FieldTypeFloat64, 0),
+		yMax:    data.NewFieldFromFieldType(data.FieldTypeFloat64, 0),
+		count:   data.NewFieldFromFieldType(data.FieldTypeFloat64, 0),
+		yLayout: data.NewFieldFromFieldType(data.FieldTypeInt8, 0),
+	}
+	hist.time.Name = "xMax"
+	hist.yMin.Name = "yMin"
+	hist.yMax.Name = "yMax"
+	hist.count.Name = "count"
+	hist.yLayout.Name = "yLayout"
+	return hist
+}
+
+// This will read a single sparse histogram
+// [ time, { count, sum, buckets: [...] }]
+func readHistogram(iter *sdkjsoniter.Iterator, hist *histogramInfo) error {
+	// first element
+	if _, err := iter.ReadArray(); err != nil {
+		return err
+	}
+
+	f, err := iter.ReadFloat64()
+	if err != nil {
+		return err
+	}
+	t := timeFromFloat(f)
+
+	// next object element
+	if _, err := iter.ReadArray(); err != nil {
+		return err
+	}
+
+	for l1Field, err := iter.ReadObject(); l1Field != ""; l1Field, err = iter.ReadObject() {
+		if err != nil {
+			return err
+		}
+		switch l1Field {
+		case "count":
+			if err = iter.Skip(); err != nil {
+				return err
+			}
+		case "sum":
+			if err = iter.Skip(); err != nil {
+				return err
+			}
+
+		case "buckets":
+			for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+				if err != nil {
+					return err
+				}
+				hist.time.Append(t)
+
+				if _, err := iter.ReadArray(); err != nil {
+					return err
+				}
+
+				v, err := iter.ReadInt8()
+				if err != nil {
+					return err
+				}
+				hist.yLayout.Append(v)
+
+				if _, err := iter.ReadArray(); err != nil {
+					return err
+				}
+
+				if err = appendValueFromString(iter, hist.yMin); err != nil {
+					return err
+				}
+
+				if _, err := iter.ReadArray(); err != nil {
+					return err
+				}
+
+				err = appendValueFromString(iter, hist.yMax)
+				if err != nil {
+					return err
+				}
+
+				if _, err := iter.ReadArray(); err != nil {
+					return err
+				}
+
+				err = appendValueFromString(iter, hist.count)
+				if err != nil {
+					return err
+				}
+
+				for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+					if err != nil {
+						return err
+					}
+					return fmt.Errorf("expected close array")
+				}
+			}
+
+		default:
+			if err = iter.Skip(); err != nil {
+				return err
+			}
+			logf("[SKIP]readHistogram: %s\n", l1Field)
+		}
+	}
+
+	if more, err := iter.ReadArray(); more || err != nil {
+		if err != nil {
+			return err
+		}
+		return fmt.Errorf("expected to be done")
+	}
+
+	return nil
+}
+
+func appendValueFromString(iter *sdkjsoniter.Iterator, field *data.Field) error {
+	var err error
+	var s string
+	if s, err = iter.ReadString(); err != nil {
+		return err
+	}
+
+	var v float64
+	if v, err = strconv.ParseFloat(s, 64); err != nil {
+		return err
+	}
+
+	field.Append(v)
+	return nil
+}
+
+func readStream(iter *sdkjsoniter.Iterator) backend.DataResponse {
+	rsp := backend.DataResponse{}
+
+	labelsField := data.NewFieldFromFieldType(data.FieldTypeJSON, 0)
+	labelsField.Name = "__labels" // avoid automatically spreading this by labels
+
+	timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
+	timeField.Name = "Time"
+
+	lineField := data.NewFieldFromFieldType(data.FieldTypeString, 0)
+	lineField.Name = "Line"
+
+	// Nanoseconds time field
+	tsField := data.NewFieldFromFieldType(data.FieldTypeString, 0)
+	tsField.Name = "TS"
+
+	labels := data.Labels{}
+	labelJson, err := labelsToRawJson(labels)
+	if err != nil {
+		return backend.DataResponse{Error: err}
+	}
+
+	for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+		if err != nil {
+			rspErr(err)
+		}
+
+	l1Fields:
+		for l1Field, err := iter.ReadObject(); ; l1Field, err = iter.ReadObject() {
+			if err != nil {
+				return rspErr(err)
+			}
+			switch l1Field {
+			case "stream":
+				// we need to clear `labels`, because `iter.ReadVal`
+				// only appends to it
+				labels := data.Labels{}
+				if err = iter.ReadVal(&labels); err != nil {
+					return rspErr(err)
+				}
+
+				if labelJson, err = labelsToRawJson(labels); err != nil {
+					return rspErr(err)
+				}
+
+			case "values":
+				for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+					if err != nil {
+						rsp.Error = err
+						return rsp
+					}
+
+					if _, err = iter.ReadArray(); err != nil {
+						return rspErr(err)
+					}
+
+					ts, err := iter.ReadString()
+					if err != nil {
+						return rspErr(err)
+					}
+
+					if _, err = iter.ReadArray(); err != nil {
+						return rspErr(err)
+					}
+
+					line, err := iter.ReadString()
+					if err != nil {
+						return rspErr(err)
+					}
+
+					if _, err = iter.ReadArray(); err != nil {
+						return rspErr(err)
+					}
+
+					t, err := timeFromLokiString(ts)
+					if err != nil {
+						return rspErr(err)
+					}
+
+					labelsField.Append(labelJson)
+					timeField.Append(t)
+					lineField.Append(line)
+					tsField.Append(ts)
+				}
+			case "":
+				if err != nil {
+					return rspErr(err)
+				}
+				break l1Fields
+			}
+		}
+	}
+
+	frame := data.NewFrame("", labelsField, timeField, lineField, tsField)
+	frame.Meta = &data.FrameMeta{}
+	rsp.Frames = append(rsp.Frames, frame)
+
+	return rsp
+}
+
+func readCategorizedStream(iter *sdkjsoniter.Iterator) backend.DataResponse {
+	rsp := backend.DataResponse{}
+
+	labelsField := data.NewFieldFromFieldType(data.FieldTypeJSON, 0)
+	labelsField.Name = "__labels" // avoid automatically spreading this by labels
+
+	labelTypesField := data.NewFieldFromFieldType(data.FieldTypeJSON, 0)
+	labelTypesField.Name = "__labelTypes" // avoid automatically spreading this by labels
+
+	timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
+	timeField.Name = "Time"
+
+	lineField := data.NewFieldFromFieldType(data.FieldTypeString, 0)
+	lineField.Name = "Line"
+
+	// Nanoseconds time field
+	tsField := data.NewFieldFromFieldType(data.FieldTypeString, 0)
+	tsField.Name = "TS"
+
+	indexedLabels := data.Labels{}
+
+	for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+		if err != nil {
+			rspErr(err)
+		}
+
+	l1Fields:
+		for l1Field, err := iter.ReadObject(); ; l1Field, err = iter.ReadObject() {
+			if err != nil {
+				return rspErr(err)
+			}
+			switch l1Field {
+			case "stream":
+				// we need to clear `labels`, because `iter.ReadVal`
+				// only appends to it
+				indexedLabels = data.Labels{}
+				if err = iter.ReadVal(&indexedLabels); err != nil {
+					return rspErr(err)
+				}
+
+			case "values":
+				for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+					if err != nil {
+						rsp.Error = err
+						return rsp
+					}
+
+					if _, err = iter.ReadArray(); err != nil {
+						return rspErr(err)
+					}
+
+					ts, err := iter.ReadString()
+					if err != nil {
+						return rspErr(err)
+					}
+
+					if _, err = iter.ReadArray(); err != nil {
+						return rspErr(err)
+					}
+
+					line, err := iter.ReadString()
+					if err != nil {
+						return rspErr(err)
+					}
+
+					if _, err = iter.ReadArray(); err != nil {
+						return rspErr(err)
+					}
+
+					parsedLabelsMap, structuredMetadataMap, err := readCategorizedStreamField(iter)
+					if err != nil {
+						return rspErr(err)
+					}
+
+					if _, err = iter.ReadArray(); err != nil {
+						return rspErr(err)
+					}
+
+					t, err := timeFromLokiString(ts)
+					if err != nil {
+						return rspErr(err)
+					}
+
+					typeMap := data.Labels{}
+					clonedLabels := data.Labels{}
+
+					for k := range indexedLabels {
+						typeMap[k] = "I"
+						clonedLabels[k] = indexedLabels[k]
+					}
+
+					// merge all labels (indexed, parsed, structuredMetadata) into one dataframe field
+					for k, v := range structuredMetadataMap {
+						clonedLabels[k] = fmt.Sprintf("%s", v)
+						typeMap[k] = "S"
+					}
+
+					for k, v := range parsedLabelsMap {
+						clonedLabels[k] = fmt.Sprintf("%s", v)
+						typeMap[k] = "P"
+					}
+
+					labelJson, err := labelsToRawJson(clonedLabels)
+					if err != nil {
+						return rspErr(err)
+					}
+
+					labelTypesJson, err := labelsToRawJson(typeMap)
+					if err != nil {
+						return rspErr(err)
+					}
+
+					labelsField.Append(labelJson)
+					labelTypesField.Append(labelTypesJson)
+					timeField.Append(t)
+					lineField.Append(line)
+					tsField.Append(ts)
+				}
+			case "":
+				if err != nil {
+					return rspErr(err)
+				}
+				break l1Fields
+			}
+		}
+	}
+
+	frame := data.NewFrame("", labelsField, timeField, lineField, tsField, labelTypesField)
+	frame.Meta = &data.FrameMeta{}
+	rsp.Frames = append(rsp.Frames, frame)
+
+	return rsp
+}
+
+func readCategorizedStreamField(iter *sdkjsoniter.Iterator) (map[string]interface{}, map[string]interface{}, error) {
+	parsedLabels := data.Labels{}
+	structuredMetadata := data.Labels{}
+	var parsedLabelsMap map[string]interface{}
+	var structuredMetadataMap map[string]interface{}
+streamField:
+	for streamField, err := iter.ReadObject(); ; streamField, err = iter.ReadObject() {
+		if err != nil {
+			return nil, nil, err
+		}
+		switch streamField {
+		case "parsed":
+			if err = iter.ReadVal(&parsedLabels); err != nil {
+				return nil, nil, err
+			}
+		case "structuredMetadata":
+			if err = iter.ReadVal(&structuredMetadata); err != nil {
+				return nil, nil, err
+			}
+		case "":
+			if err != nil {
+				return nil, nil, err
+			}
+			if parsedLabelsMap, err = labelsToMap(parsedLabels); err != nil {
+				return nil, nil, err
+			}
+			if structuredMetadataMap, err = labelsToMap(structuredMetadata); err != nil {
+				return nil, nil, err
+			}
+			break streamField
+		}
+	}
+	return parsedLabelsMap, structuredMetadataMap, nil
+}
+
+func resultTypeToCustomMeta(resultType string) map[string]string {
+	return map[string]string{"resultType": resultType}
+}
+
+func timeFromFloat(fv float64) time.Time {
+	return time.UnixMilli(int64(fv * 1000.0)).UTC()
+}
+
+func timeFromLokiString(str string) (time.Time, error) {
+	// normal time values look like: 1645030246277587968
+	// and are less than: math.MaxInt65=9223372036854775807
+	// This will do a fast path for any date before 2033
+	s := len(str)
+	if s < 19 || (s == 19 && str[0] == '1') {
+		ns, err := strconv.ParseInt(str, 10, 64)
+		if err == nil {
+			return time.Unix(0, ns).UTC(), nil
+		}
+	}
+
+	if s < 10 {
+		return time.Time{}, fmt.Errorf("unexpected time format '%v' in response. response may have been truncated", str)
+	}
+
+	ss, _ := strconv.ParseInt(str[0:10], 10, 64)
+	ns, _ := strconv.ParseInt(str[10:], 10, 64)
+	return time.Unix(ss, ns).UTC(), nil
+}
+
+func labelsToRawJson(labels data.Labels) (json.RawMessage, error) {
+	// data.Labels when converted to JSON keep the fields sorted
+	bytes, err := jsoniter.Marshal(labels)
+	if err != nil {
+		return nil, err
+	}
+
+	return json.RawMessage(bytes), nil
+}
+
+func labelsToMap(labels data.Labels) (map[string]interface{}, error) {
+	// data.Labels when converted to JSON keep the fields sorted
+	labelJson, err := labelsToRawJson(labels)
+	if err != nil {
+		return nil, err
+	}
+
+	var labelMap map[string]interface{}
+	err = jsoniter.Unmarshal(labelJson, &labelMap)
+	if err != nil {
+		return nil, err
+	}
+
+	return labelMap, nil
+}
diff --git a/pkg/tsdb/cloud-monitoring/httpclient.go b/pkg/tsdb/cloud-monitoring/httpclient.go
index c0f262a668d73..80f9aa1528fd6 100644
--- a/pkg/tsdb/cloud-monitoring/httpclient.go
+++ b/pkg/tsdb/cloud-monitoring/httpclient.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/grafana/grafana-google-sdk-go/pkg/tokenprovider"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
-	infrahttp "github.com/grafana/grafana/pkg/infra/httpclient"
 )
 
 const (
@@ -59,7 +58,7 @@ func getMiddleware(model *datasourceInfo, routePath string) (httpclient.Middlewa
 	return tokenprovider.AuthMiddleware(provider), nil
 }
 
-func newHTTPClient(model *datasourceInfo, opts httpclient.Options, clientProvider infrahttp.Provider, route string) (*http.Client, error) {
+func newHTTPClient(model *datasourceInfo, opts httpclient.Options, clientProvider *httpclient.Provider, route string) (*http.Client, error) {
 	m, err := getMiddleware(model, route)
 	if err != nil {
 		return nil, err
diff --git a/pkg/tsdb/cloud-monitoring/kinds/dataquery/types_dataquery_gen.go b/pkg/tsdb/cloud-monitoring/kinds/dataquery/types_dataquery_gen.go
index 08f2f3899d72d..f89711a9cf2f9 100644
--- a/pkg/tsdb/cloud-monitoring/kinds/dataquery/types_dataquery_gen.go
+++ b/pkg/tsdb/cloud-monitoring/kinds/dataquery/types_dataquery_gen.go
@@ -89,20 +89,33 @@ type AlignmentTypes string
 
 // CloudMonitoringQuery defines model for CloudMonitoringQuery.
 type CloudMonitoringQuery struct {
-	// DataQuery These are the common properties available to all queries in all datasources.
-	// Specific implementations will *extend* this interface, adding the required
-	// properties for the given context.
-	DataQuery
-
 	// Aliases can be set to modify the legend labels. e.g. {{metric.label.xxx}}. See docs for more detail.
 	AliasBy *string `json:"aliasBy,omitempty"`
 
+	// For mixed data sources the selected datasource is on the query level.
+	// For non mixed scenarios this is undefined.
+	// TODO find a better way to do this ^ that's friendly to schema
+	// TODO this shouldn't be unknown but DataSourceRef | null
+	Datasource *any `json:"datasource,omitempty"`
+
+	// If hide is set to true, Grafana will filter out the response(s) associated with this query before returning it to the panel.
+	Hide *bool `json:"hide,omitempty"`
+
 	// Time interval in milliseconds.
 	IntervalMs *float32 `json:"intervalMs,omitempty"`
 
 	// PromQL sub-query properties.
 	PromQLQuery *PromQLQuery `json:"promQLQuery,omitempty"`
 
+	// Specify the query flavor
+	// TODO make this required and give it a default
+	QueryType *string `json:"queryType,omitempty"`
+
+	// A unique identifier for the query within the list of targets.
+	// In server side expressions, the refId is used as a variable name to identify results.
+	// By default, the UI will assign A->Z; however setting meaningful names may be useful.
+	RefId *string `json:"refId,omitempty"`
+
 	// SLO sub-query properties.
 	SloQuery *SLOQuery `json:"sloQuery,omitempty"`
 
@@ -123,9 +136,7 @@ type DataQuery struct {
 	// TODO this shouldn't be unknown but DataSourceRef | null
 	Datasource *any `json:"datasource,omitempty"`
 
-	// Hide true if query is disabled (ie should not be returned to the dashboard)
-	// Note this does not always imply that the query should not be executed since
-	// the results from a hidden query may be used as the input to other queries (SSE etc)
+	// If hide is set to true, Grafana will filter out the response(s) associated with this query before returning it to the panel.
 	Hide *bool `json:"hide,omitempty"`
 
 	// Specify the query flavor
diff --git a/pkg/tsdb/cloud-monitoring/promql_query.go b/pkg/tsdb/cloud-monitoring/promql_query.go
index 3709623e4021b..16efb08e15420 100644
--- a/pkg/tsdb/cloud-monitoring/promql_query.go
+++ b/pkg/tsdb/cloud-monitoring/promql_query.go
@@ -11,28 +11,27 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/grafana/grafana/pkg/tsdb/cloud-monitoring/converter"
 	jsoniter "github.com/json-iterator/go"
-
-	"github.com/grafana/grafana/pkg/infra/tracing"
-	"github.com/grafana/grafana/pkg/util/converter"
 )
 
 func (promQLQ *cloudMonitoringProm) run(ctx context.Context, req *backend.QueryDataRequest,
-	s *Service, dsInfo datasourceInfo, tracer tracing.Tracer) (*backend.DataResponse, any, string, error) {
+	s *Service, dsInfo datasourceInfo, logger log.Logger) (*backend.DataResponse, any, string, error) {
 	dr := &backend.DataResponse{}
 	projectName, err := s.ensureProject(ctx, dsInfo, promQLQ.parameters.ProjectName)
 	if err != nil {
 		dr.Error = err
-		return dr, promResponse{}, "", nil
+		return dr, backend.DataResponse{}, "", nil
 	}
-	r, err := createRequest(ctx, promQLQ.logger, &dsInfo, path.Join("/v1/projects", projectName, "location/global/prometheus/api/v1/query_range"), nil)
+	r, err := createRequest(ctx, &dsInfo, path.Join("/v1/projects", projectName, "location/global/prometheus/api/v1/query_range"), nil)
 	if err != nil {
 		dr.Error = err
-		return dr, promResponse{}, "", nil
+		return dr, backend.DataResponse{}, "", nil
 	}
 
-	span := traceReq(ctx, tracer, req, dsInfo, r, "")
+	span := traceReq(ctx, req, dsInfo, r, "")
 	defer span.End()
 
 	requestBody := map[string]any{
@@ -43,15 +42,16 @@ func (promQLQ *cloudMonitoringProm) run(ctx context.Context, req *backend.QueryD
 	}
 
 	res, err := doRequestProm(r, dsInfo, requestBody)
+	if err != nil {
+		dr.Error = err
+		return dr, backend.DataResponse{}, "", nil
+	}
+
 	defer func() {
 		if err := res.Body.Close(); err != nil {
-			promQLQ.logger.Error("Failed to close response body", "err", err)
+			s.logger.Error("Failed to close response body", "err", err)
 		}
 	}()
-	if err != nil {
-		dr.Error = err
-		return dr, promResponse{}, "", nil
-	}
 
 	return dr, parseProm(res), r.URL.RawQuery, nil
 }
@@ -83,7 +83,7 @@ func parseProm(res *http.Response) backend.DataResponse {
 // We are not parsing the response in this function. ReadPrometheusStyleResult needs an open reader and we cannot
 // pass an open reader to this function because lint complains as it is unsafe
 func (promQLQ *cloudMonitoringProm) parseResponse(queryRes *backend.DataResponse,
-	response any, executedQueryString string) error {
+	response any, executedQueryString string, logger log.Logger) error {
 	r := response.(backend.DataResponse)
 	// Add frame to attach metadata
 	if len(r.Frames) == 0 {
diff --git a/pkg/tsdb/cloud-monitoring/promql_query_test.go b/pkg/tsdb/cloud-monitoring/promql_query_test.go
index d9994399b21c4..3b6af147f77af 100644
--- a/pkg/tsdb/cloud-monitoring/promql_query_test.go
+++ b/pkg/tsdb/cloud-monitoring/promql_query_test.go
@@ -1,6 +1,8 @@
 package cloudmonitoring
 
 import (
+	"context"
+	"fmt"
 	"io"
 	"net/http"
 	"os"
@@ -8,12 +10,16 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
 	"github.com/grafana/grafana-plugin-sdk-go/experimental"
+	"github.com/grafana/grafana/pkg/tsdb/cloud-monitoring/kinds/dataquery"
 	"github.com/stretchr/testify/require"
 )
 
 func TestPromqlQuery(t *testing.T) {
 	t.Run("parseResponse is returned", func(t *testing.T) {
+		service := &Service{}
 		fileData, err := os.ReadFile("./test-data/11-prom-response.json")
 		reader := strings.NewReader(string(fileData))
 		res := http.Response{Body: io.NopCloser(reader)}
@@ -24,9 +30,39 @@ func TestPromqlQuery(t *testing.T) {
 		dataRes := &backend.DataResponse{}
 		query := &cloudMonitoringProm{}
 		parsedProm := parseProm(&res)
-		err = query.parseResponse(dataRes, parsedProm, "")
+		err = query.parseResponse(dataRes, parsedProm, "", service.logger)
 		require.NoError(t, err)
 		frame := dataRes.Frames[0]
 		experimental.CheckGoldenJSONFrame(t, "test-data", "parse-response-is-returned", frame, false)
 	})
+
+	t.Run("parseResponse is returned with error", func(t *testing.T) {
+		dsInfo := datasourceInfo{
+			authenticationType: gceAuthentication,
+		}
+
+		im := datasource.NewInstanceManager(func(_ context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+			return &dsInfo, nil
+		})
+
+		service := &Service{
+			im: im,
+			gceDefaultProjectGetter: func(ctx context.Context, scope string) (string, error) {
+				return "", fmt.Errorf("not found!")
+			},
+		}
+
+		query := &cloudMonitoringProm{
+			parameters: &dataquery.PromQLQuery{
+				ProjectName: "",
+			},
+		}
+
+		dr, parsedProm, _, _ := query.run(context.Background(), &backend.QueryDataRequest{}, service, dsInfo, service.logger)
+		require.Error(t, dr.Error)
+		require.Equal(t, "not found!", dr.Error.Error())
+
+		err := query.parseResponse(dr, parsedProm, "", service.logger)
+		require.NoError(t, err)
+	})
 }
diff --git a/pkg/tsdb/cloud-monitoring/resource_handler.go b/pkg/tsdb/cloud-monitoring/resource_handler.go
index 7197748dd630f..5347b9a9499cb 100644
--- a/pkg/tsdb/cloud-monitoring/resource_handler.go
+++ b/pkg/tsdb/cloud-monitoring/resource_handler.go
@@ -15,6 +15,7 @@ import (
 	"time"
 
 	"github.com/andybalholm/brotli"
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/resource/httpadapter"
 )
 
@@ -199,14 +200,14 @@ func decode(encoding string, original io.ReadCloser) ([]byte, error) {
 		}
 		defer func() {
 			if err := reader.(io.ReadCloser).Close(); err != nil {
-				slog.Warn("Failed to close reader body", "err", err)
+				backend.Logger.Warn("Failed to close reader body", "err", err)
 			}
 		}()
 	case "deflate":
 		reader = flate.NewReader(original)
 		defer func() {
 			if err := reader.(io.ReadCloser).Close(); err != nil {
-				slog.Warn("Failed to close reader body", "err", err)
+				backend.Logger.Warn("Failed to close reader body", "err", err)
 			}
 		}()
 	case "br":
@@ -246,7 +247,7 @@ func encode(encoding string, body []byte) ([]byte, error) {
 	_, err = writer.Write(body)
 	if writeCloser, ok := writer.(io.WriteCloser); ok {
 		if err := writeCloser.Close(); err != nil {
-			slog.Warn("Failed to close writer body", "err", err)
+			backend.Logger.Warn("Failed to close writer body", "err", err)
 		}
 	}
 	if err != nil {
@@ -284,7 +285,7 @@ func doRequest(req *http.Request, cli *http.Client, responseFn processResponse)
 	}
 	defer func() {
 		if err := res.Body.Close(); err != nil {
-			slog.Warn("Failed to close response body", "err", err)
+			backend.Logger.Warn("Failed to close response body", "err", err)
 		}
 	}()
 	encoding := res.Header.Get("Content-Encoding")
@@ -346,7 +347,7 @@ func buildResponse(responses []json.RawMessage, encoding string) ([]byte, error)
 }
 
 func (s *Service) setRequestVariables(req *http.Request, subDataSource string) (*http.Client, int, error) {
-	slog.Debug("Received resource call", "url", req.URL.String(), "method", req.Method)
+	s.logger.Debug("Received resource call", "url", req.URL.String(), "method", req.Method)
 
 	newPath, err := getTarget(req.URL.Path)
 	if err != nil {
@@ -386,7 +387,7 @@ func writeResponseBytes(rw http.ResponseWriter, code int, msg []byte) {
 	rw.WriteHeader(code)
 	_, err := rw.Write(msg)
 	if err != nil {
-		slog.Error("Unable to write HTTP response", "error", err)
+		backend.Logger.Error("Unable to write HTTP response", "error", err)
 	}
 }
 
diff --git a/pkg/tsdb/cloud-monitoring/resource_handler_test.go b/pkg/tsdb/cloud-monitoring/resource_handler_test.go
index ec69ff18869b7..5f315ef9a5987 100644
--- a/pkg/tsdb/cloud-monitoring/resource_handler_test.go
+++ b/pkg/tsdb/cloud-monitoring/resource_handler_test.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -115,6 +116,7 @@ func Test_setRequestVariables(t *testing.T) {
 				},
 			},
 		},
+		logger: log.DefaultLogger,
 	}
 	req, err := http.NewRequest(http.MethodGet, "http://foo/cloudmonitoring/v3/projects/bar/metricDescriptors", nil)
 	if err != nil {
diff --git a/pkg/tsdb/cloud-monitoring/slo_query.go b/pkg/tsdb/cloud-monitoring/slo_query.go
index ee65cc64c95f9..7aa6544482d21 100644
--- a/pkg/tsdb/cloud-monitoring/slo_query.go
+++ b/pkg/tsdb/cloud-monitoring/slo_query.go
@@ -7,18 +7,17 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
-
-	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 )
 
 func (sloQ *cloudMonitoringSLO) run(ctx context.Context, req *backend.QueryDataRequest,
-	s *Service, dsInfo datasourceInfo, tracer tracing.Tracer) (*backend.DataResponse, any, string, error) {
-	return runTimeSeriesRequest(ctx, sloQ.logger, req, s, dsInfo, tracer, sloQ.parameters.ProjectName, sloQ.params, nil)
+	s *Service, dsInfo datasourceInfo, logger log.Logger) (*backend.DataResponse, any, string, error) {
+	return runTimeSeriesRequest(ctx, req, s, dsInfo, sloQ.parameters.ProjectName, sloQ.params, nil, logger)
 }
 
 func (sloQ *cloudMonitoringSLO) parseResponse(queryRes *backend.DataResponse,
-	response any, executedQueryString string) error {
-	return parseTimeSeriesResponse(queryRes, response.(cloudMonitoringResponse), executedQueryString, sloQ, sloQ.params, []string{})
+	response any, executedQueryString string, logger log.Logger) error {
+	return parseTimeSeriesResponse(queryRes, response.(cloudMonitoringResponse), executedQueryString, sloQ, sloQ.params, []string{}, logger)
 }
 
 func (sloQ *cloudMonitoringSLO) buildDeepLink() string {
diff --git a/pkg/tsdb/cloud-monitoring/slo_query_test.go b/pkg/tsdb/cloud-monitoring/slo_query_test.go
index 1d453dc882799..0533a2201f005 100644
--- a/pkg/tsdb/cloud-monitoring/slo_query_test.go
+++ b/pkg/tsdb/cloud-monitoring/slo_query_test.go
@@ -12,6 +12,7 @@ import (
 )
 
 func SLOQuery(t *testing.T) {
+	service := &Service{}
 	t.Run("when data from query returns slo and alias by is defined", func(t *testing.T) {
 		data, err := loadTestFile("./test-data/6-series-response-slo.json")
 		require.NoError(t, err)
@@ -29,7 +30,7 @@ func SLOQuery(t *testing.T) {
 				},
 				aliasBy: "{{project}} - {{service}} - {{slo}} - {{selector}}",
 			}
-			err = query.parseResponse(res, data, "")
+			err = query.parseResponse(res, data, "", service.logger)
 			require.NoError(t, err)
 			frames := res.Frames
 			require.NoError(t, err)
@@ -53,7 +54,7 @@ func SLOQuery(t *testing.T) {
 					SloId:        "test-slo",
 				},
 			}
-			err = query.parseResponse(res, data, "")
+			err = query.parseResponse(res, data, "", service.logger)
 			require.NoError(t, err)
 			frames := res.Frames
 			require.NoError(t, err)
@@ -68,7 +69,7 @@ func SLOQuery(t *testing.T) {
 
 		res := &backend.DataResponse{}
 		query := &cloudMonitoringSLO{params: url.Values{}, parameters: &dataquery.SLOQuery{SloId: "yes"}}
-		err = query.parseResponse(res, data, "")
+		err = query.parseResponse(res, data, "", service.logger)
 		require.NoError(t, err)
 		frames := res.Frames
 		assert.Equal(t, len(frames[0].Fields[1].Config.Links), 0)
diff --git a/pkg/tsdb/cloud-monitoring/standalone/datasource.go b/pkg/tsdb/cloud-monitoring/standalone/datasource.go
new file mode 100644
index 0000000000000..169f73cd3109b
--- /dev/null
+++ b/pkg/tsdb/cloud-monitoring/standalone/datasource.go
@@ -0,0 +1,38 @@
+package main
+
+import (
+	"context"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+	cloudmonitoring "github.com/grafana/grafana/pkg/tsdb/cloud-monitoring"
+)
+
+var (
+	_ backend.QueryDataHandler    = (*Datasource)(nil)
+	_ backend.CheckHealthHandler  = (*Datasource)(nil)
+	_ backend.CallResourceHandler = (*Datasource)(nil)
+)
+
+func NewDatasource(context.Context, backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+	return &Datasource{
+		Service: cloudmonitoring.ProvideService(httpclient.NewProvider()),
+	}, nil
+}
+
+type Datasource struct {
+	Service *cloudmonitoring.Service
+}
+
+func (d *Datasource) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+	return d.Service.QueryData(ctx, req)
+}
+
+func (d *Datasource) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	return d.Service.CallResource(ctx, req, sender)
+}
+
+func (d *Datasource) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
+	return d.Service.CheckHealth(ctx, req)
+}
diff --git a/pkg/tsdb/cloud-monitoring/standalone/main.go b/pkg/tsdb/cloud-monitoring/standalone/main.go
new file mode 100644
index 0000000000000..c1acbcad13e7a
--- /dev/null
+++ b/pkg/tsdb/cloud-monitoring/standalone/main.go
@@ -0,0 +1,23 @@
+package main
+
+import (
+	"os"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
+)
+
+func main() {
+	// Start listening to requests sent from Grafana. This call is blocking so
+	// it won't finish until Grafana shuts down the process or the plugin choose
+	// to exit by itself using os.Exit. Manage automatically manages life cycle
+	// of datasource instances. It accepts datasource instance factory as first
+	// argument. This factory will be automatically called on incoming request
+	// from Grafana to create different instances of SampleDatasource (per datasource
+	// ID). When datasource configuration changed Dispose method will be called and
+	// new datasource instance created using NewSampleDatasource factory.
+	if err := datasource.Manage("stackdriver", NewDatasource, datasource.ManageOpts{}); err != nil {
+		log.DefaultLogger.Error(err.Error())
+		os.Exit(1)
+	}
+}
diff --git a/pkg/tsdb/cloud-monitoring/time/interval.go b/pkg/tsdb/cloud-monitoring/time/interval.go
new file mode 100644
index 0000000000000..c3a1c452f0418
--- /dev/null
+++ b/pkg/tsdb/cloud-monitoring/time/interval.go
@@ -0,0 +1,76 @@
+// Copied from https://github.com/grafana/grafana/blob/main/pkg/tsdb/intervalv2/intervalv2.go
+// We're copying this to not block ourselves from decoupling until the conversation here is resolved
+// https://raintank-corp.slack.com/archives/C05QFJUHUQ6/p1700064431005089
+package time
+
+import (
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
+)
+
+var (
+	DefaultRes         int64 = 1500
+	defaultMinInterval       = time.Millisecond * 1
+)
+
+type Interval struct {
+	Text  string
+	Value time.Duration
+}
+
+type intervalCalculator struct {
+	minInterval time.Duration
+}
+
+type Calculator interface {
+	Calculate(timerange backend.TimeRange, minInterval time.Duration, maxDataPoints int64) Interval
+	CalculateSafeInterval(timerange backend.TimeRange, resolution int64) Interval
+}
+
+type CalculatorOptions struct {
+	MinInterval time.Duration
+}
+
+func NewCalculator(opts ...CalculatorOptions) *intervalCalculator {
+	calc := &intervalCalculator{}
+
+	for _, o := range opts {
+		if o.MinInterval == 0 {
+			calc.minInterval = defaultMinInterval
+		} else {
+			calc.minInterval = o.MinInterval
+		}
+	}
+
+	return calc
+}
+
+func (ic *intervalCalculator) Calculate(timerange backend.TimeRange, minInterval time.Duration, maxDataPoints int64) Interval {
+	to := timerange.To.UnixNano()
+	from := timerange.From.UnixNano()
+	resolution := maxDataPoints
+	if resolution == 0 {
+		resolution = DefaultRes
+	}
+
+	calculatedInterval := time.Duration((to - from) / resolution)
+
+	if calculatedInterval < minInterval {
+		return Interval{Text: gtime.FormatInterval(minInterval), Value: minInterval}
+	}
+
+	rounded := gtime.RoundInterval(calculatedInterval)
+
+	return Interval{Text: gtime.FormatInterval(rounded), Value: rounded}
+}
+
+func (ic *intervalCalculator) CalculateSafeInterval(timerange backend.TimeRange, safeRes int64) Interval {
+	to := timerange.To.UnixNano()
+	from := timerange.From.UnixNano()
+	safeInterval := time.Duration((to - from) / safeRes)
+
+	rounded := gtime.RoundInterval(safeInterval)
+	return Interval{Text: gtime.FormatInterval(rounded), Value: rounded}
+}
diff --git a/pkg/tsdb/cloud-monitoring/time_series_filter.go b/pkg/tsdb/cloud-monitoring/time_series_filter.go
index dab733e04ec0b..8725c7223df98 100644
--- a/pkg/tsdb/cloud-monitoring/time_series_filter.go
+++ b/pkg/tsdb/cloud-monitoring/time_series_filter.go
@@ -8,20 +8,20 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/huandu/xstrings"
 
-	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/tsdb/cloud-monitoring/kinds/dataquery"
 )
 
 func (timeSeriesFilter *cloudMonitoringTimeSeriesList) run(ctx context.Context, req *backend.QueryDataRequest,
-	s *Service, dsInfo datasourceInfo, tracer tracing.Tracer) (*backend.DataResponse, any, string, error) {
-	return runTimeSeriesRequest(ctx, timeSeriesFilter.logger, req, s, dsInfo, tracer, timeSeriesFilter.parameters.ProjectName, timeSeriesFilter.params, nil)
+	s *Service, dsInfo datasourceInfo, logger log.Logger) (*backend.DataResponse, any, string, error) {
+	return runTimeSeriesRequest(ctx, req, s, dsInfo, timeSeriesFilter.parameters.ProjectName, timeSeriesFilter.params, nil, logger)
 }
 
 func parseTimeSeriesResponse(queryRes *backend.DataResponse,
-	response cloudMonitoringResponse, executedQueryString string, query cloudMonitoringQueryExecutor, params url.Values, groupBys []string) error {
+	response cloudMonitoringResponse, executedQueryString string, query cloudMonitoringQueryExecutor, params url.Values, groupBys []string, logger log.Logger) error {
 	frames := data.Frames{}
 
 	for _, series := range response.TimeSeries {
@@ -56,8 +56,8 @@ func parseTimeSeriesResponse(queryRes *backend.DataResponse,
 }
 
 func (timeSeriesFilter *cloudMonitoringTimeSeriesList) parseResponse(queryRes *backend.DataResponse,
-	response any, executedQueryString string) error {
-	return parseTimeSeriesResponse(queryRes, response.(cloudMonitoringResponse), executedQueryString, timeSeriesFilter, timeSeriesFilter.params, timeSeriesFilter.parameters.GroupBys)
+	response any, executedQueryString string, logger log.Logger) error {
+	return parseTimeSeriesResponse(queryRes, response.(cloudMonitoringResponse), executedQueryString, timeSeriesFilter, timeSeriesFilter.params, timeSeriesFilter.parameters.GroupBys, logger)
 }
 
 func (timeSeriesFilter *cloudMonitoringTimeSeriesList) buildDeepLink() string {
@@ -89,7 +89,7 @@ func (timeSeriesFilter *cloudMonitoringTimeSeriesList) buildDeepLink() string {
 		timeSeriesFilter.params.Get("interval.endTime"),
 	)
 	if err != nil {
-		slog.Error(
+		backend.Logger.Error(
 			"Failed to generate deep link: unable to parse metrics explorer URL",
 			"ProjectName", timeSeriesFilter.parameters.ProjectName,
 			"error", err,
diff --git a/pkg/tsdb/cloud-monitoring/time_series_filter_test.go b/pkg/tsdb/cloud-monitoring/time_series_filter_test.go
index 27e3c9b0b727c..031d40a03471a 100644
--- a/pkg/tsdb/cloud-monitoring/time_series_filter_test.go
+++ b/pkg/tsdb/cloud-monitoring/time_series_filter_test.go
@@ -19,6 +19,7 @@ import (
 )
 
 func TestTimeSeriesFilter(t *testing.T) {
+	service := &Service{}
 	t.Run("parses params", func(t *testing.T) {
 		query := &cloudMonitoringTimeSeriesList{parameters: &dataquery.TimeSeriesList{}}
 		query.setParams(time.Time{}, time.Time{}, 0, 0)
@@ -63,7 +64,7 @@ func TestTimeSeriesFilter(t *testing.T) {
 
 		res := &backend.DataResponse{}
 		query := &cloudMonitoringTimeSeriesList{params: url.Values{}, parameters: &dataquery.TimeSeriesList{}}
-		err = query.parseResponse(res, data, "")
+		err = query.parseResponse(res, data, "", service.logger)
 		require.NoError(t, err)
 		frames := res.Frames
 		require.Len(t, frames, 1)
@@ -86,7 +87,7 @@ func TestTimeSeriesFilter(t *testing.T) {
 		assert.Equal(t, 3, len(data.TimeSeries))
 		res := &backend.DataResponse{}
 		query := &cloudMonitoringTimeSeriesList{params: url.Values{}, parameters: &dataquery.TimeSeriesList{}}
-		err = query.parseResponse(res, data, "")
+		err = query.parseResponse(res, data, "", service.logger)
 		require.NoError(t, err)
 
 		field := res.Frames[0].Fields[1]
@@ -128,7 +129,7 @@ func TestTimeSeriesFilter(t *testing.T) {
 		query := &cloudMonitoringTimeSeriesList{params: url.Values{}, parameters: &dataquery.TimeSeriesList{GroupBys: []string{
 			"metric.label.instance_name", "resource.label.zone",
 		}}}
-		err = query.parseResponse(res, data, "")
+		err = query.parseResponse(res, data, "", service.logger)
 		require.NoError(t, err)
 		frames := res.Frames
 		require.NoError(t, err)
@@ -153,7 +154,7 @@ func TestTimeSeriesFilter(t *testing.T) {
 				},
 				aliasBy: "{{metric.type}} - {{metric.label.instance_name}} - {{resource.label.zone}}",
 			}
-			err = query.parseResponse(res, data, "")
+			err = query.parseResponse(res, data, "", service.logger)
 			require.NoError(t, err)
 			frames := res.Frames
 			require.NoError(t, err)
@@ -170,7 +171,7 @@ func TestTimeSeriesFilter(t *testing.T) {
 				parameters: &dataquery.TimeSeriesList{GroupBys: []string{"metric.label.instance_name", "resource.label.zone"}},
 				aliasBy:    "metric {{metric.name}} service {{metric.service}}",
 			}
-			err = query.parseResponse(res, data, "")
+			err = query.parseResponse(res, data, "", service.logger)
 			require.NoError(t, err)
 			frames := res.Frames
 			require.NoError(t, err)
@@ -192,7 +193,7 @@ func TestTimeSeriesFilter(t *testing.T) {
 			parameters: &dataquery.TimeSeriesList{},
 			aliasBy:    "{{bucket}}",
 		}
-		err = query.parseResponse(res, data, "")
+		err = query.parseResponse(res, data, "", service.logger)
 		require.NoError(t, err)
 		frames := res.Frames
 		require.NoError(t, err)
@@ -237,7 +238,7 @@ func TestTimeSeriesFilter(t *testing.T) {
 			parameters: &dataquery.TimeSeriesList{},
 			aliasBy:    "{{bucket}}",
 		}
-		err = query.parseResponse(res, data, "")
+		err = query.parseResponse(res, data, "", service.logger)
 		require.NoError(t, err)
 		frames := res.Frames
 		require.NoError(t, err)
@@ -275,7 +276,7 @@ func TestTimeSeriesFilter(t *testing.T) {
 			parameters: &dataquery.TimeSeriesList{},
 			aliasBy:    "{{bucket}}",
 		}
-		err = query.parseResponse(res, data, "")
+		err = query.parseResponse(res, data, "", service.logger)
 		require.NoError(t, err)
 		require.NoError(t, err)
 		assert.Equal(t, 3, len(res.Frames))
@@ -315,7 +316,7 @@ func TestTimeSeriesFilter(t *testing.T) {
 				parameters: &dataquery.TimeSeriesList{},
 				aliasBy:    "{{metadata.system_labels.test}}",
 			}
-			err = query.parseResponse(res, data, "")
+			err = query.parseResponse(res, data, "", service.logger)
 			require.NoError(t, err)
 			frames := res.Frames
 			require.NoError(t, err)
@@ -333,7 +334,7 @@ func TestTimeSeriesFilter(t *testing.T) {
 				parameters: &dataquery.TimeSeriesList{},
 				aliasBy:    "{{metadata.system_labels.test2}}",
 			}
-			err = query.parseResponse(res, data, "")
+			err = query.parseResponse(res, data, "", service.logger)
 			require.NoError(t, err)
 			frames := res.Frames
 			require.NoError(t, err)
@@ -349,7 +350,7 @@ func TestTimeSeriesFilter(t *testing.T) {
 			assert.Equal(t, 1, len(data.TimeSeries))
 			res := &backend.DataResponse{}
 			query := &cloudMonitoringTimeSeriesList{params: url.Values{}, parameters: &dataquery.TimeSeriesList{}}
-			err = query.parseResponse(res, data, "")
+			err = query.parseResponse(res, data, "", service.logger)
 			require.NoError(t, err)
 			frames := res.Frames
 			require.NoError(t, err)
@@ -362,7 +363,7 @@ func TestTimeSeriesFilter(t *testing.T) {
 			assert.Equal(t, 3, len(data.TimeSeries))
 			res := &backend.DataResponse{}
 			query := &cloudMonitoringTimeSeriesList{params: url.Values{}, parameters: &dataquery.TimeSeriesList{}}
-			err = query.parseResponse(res, data, "")
+			err = query.parseResponse(res, data, "", service.logger)
 			require.NoError(t, err)
 			frames := res.Frames
 			require.NoError(t, err)
@@ -391,7 +392,7 @@ func TestTimeSeriesFilter(t *testing.T) {
 					To:   fromStart.Add(34 * time.Minute),
 				},
 			}
-			err = query.parseResponse(res, data, "")
+			err = query.parseResponse(res, data, "", service.logger)
 			require.NoError(t, err)
 			frames := res.Frames
 			assert.Equal(t, "test-proj - asia-northeast1-c - 6724404429462225363 - 200", frames[0].Fields[1].Name)
@@ -412,7 +413,7 @@ func TestTimeSeriesFilter(t *testing.T) {
 				GraphPeriod: strPtr("60s"),
 			},
 		}
-		err = query.parseResponse(res, data, "")
+		err = query.parseResponse(res, data, "", service.logger)
 		require.NoError(t, err)
 		assert.Equal(t, "value_utilization_sum", res.Frames[0].Fields[1].Name)
 	})
@@ -423,7 +424,7 @@ func TestTimeSeriesFilter(t *testing.T) {
 		assert.Equal(t, 3, len(data.TimeSeries))
 		res := &backend.DataResponse{}
 		query := &cloudMonitoringTimeSeriesList{params: url.Values{}, parameters: &dataquery.TimeSeriesList{}}
-		err = query.parseResponse(res, data, "")
+		err = query.parseResponse(res, data, "", service.logger)
 		require.NoError(t, err)
 		frames := res.Frames
 		custom, ok := frames[0].Meta.Custom.(map[string]any)
@@ -441,7 +442,7 @@ func TestTimeSeriesFilter(t *testing.T) {
 		query := &cloudMonitoringTimeSeriesList{params: url.Values{
 			"aggregation.alignmentPeriod": []string{"+60s"},
 		}, parameters: &dataquery.TimeSeriesList{}}
-		err = query.parseResponse(res, data, "")
+		err = query.parseResponse(res, data, "", service.logger)
 		require.NoError(t, err)
 		frames := res.Frames
 		timeField := frames[0].Fields[0]
@@ -455,7 +456,7 @@ func TestTimeSeriesFilter(t *testing.T) {
 			assert.Equal(t, 1, len(data.TimeSeries))
 
 			res := &backend.DataResponse{}
-			require.NoError(t, (&cloudMonitoringTimeSeriesList{parameters: &dataquery.TimeSeriesList{GroupBys: []string{"test_group_by"}}}).parseResponse(res, data, "test_query"))
+			require.NoError(t, (&cloudMonitoringTimeSeriesList{parameters: &dataquery.TimeSeriesList{GroupBys: []string{"test_group_by"}}}).parseResponse(res, data, "test_query", service.logger))
 
 			require.NotNil(t, res.Frames[0].Meta)
 			assert.Equal(t, sdkdata.FrameMeta{
@@ -478,7 +479,7 @@ func TestTimeSeriesFilter(t *testing.T) {
 			assert.Equal(t, 1, len(data.TimeSeries))
 
 			res := &backend.DataResponse{}
-			require.NoError(t, (&cloudMonitoringTimeSeriesList{parameters: &dataquery.TimeSeriesList{GroupBys: []string{"test_group_by"}}}).parseResponse(res, data, "test_query"))
+			require.NoError(t, (&cloudMonitoringTimeSeriesList{parameters: &dataquery.TimeSeriesList{GroupBys: []string{"test_group_by"}}}).parseResponse(res, data, "test_query", service.logger))
 
 			require.NotNil(t, res.Frames[0].Meta)
 			assert.Equal(t, sdkdata.FrameMeta{
@@ -501,7 +502,7 @@ func TestTimeSeriesFilter(t *testing.T) {
 			assert.Equal(t, 1, len(data.TimeSeries))
 
 			res := &backend.DataResponse{}
-			require.NoError(t, (&cloudMonitoringTimeSeriesList{parameters: &dataquery.TimeSeriesList{GroupBys: []string{"test_group_by"}}}).parseResponse(res, data, "test_query"))
+			require.NoError(t, (&cloudMonitoringTimeSeriesList{parameters: &dataquery.TimeSeriesList{GroupBys: []string{"test_group_by"}}}).parseResponse(res, data, "test_query", service.logger))
 
 			require.NotNil(t, res.Frames[0].Meta)
 			assert.Equal(t, sdkdata.FrameMeta{
diff --git a/pkg/tsdb/cloud-monitoring/time_series_query.go b/pkg/tsdb/cloud-monitoring/time_series_query.go
index 158615f6626df..4a7f29f72069c 100644
--- a/pkg/tsdb/cloud-monitoring/time_series_query.go
+++ b/pkg/tsdb/cloud-monitoring/time_series_query.go
@@ -7,10 +7,9 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
-
-	"github.com/grafana/grafana/pkg/infra/tracing"
-	"github.com/grafana/grafana/pkg/tsdb/intervalv2"
+	gcmTime "github.com/grafana/grafana/pkg/tsdb/cloud-monitoring/time"
 )
 
 func (timeSeriesQuery *cloudMonitoringTimeSeriesQuery) appendGraphPeriod(req *backend.QueryDataRequest) string {
@@ -18,7 +17,7 @@ func (timeSeriesQuery *cloudMonitoringTimeSeriesQuery) appendGraphPeriod(req *ba
 	// If not set, the default behavior is to set an automatic value
 	if timeSeriesQuery.parameters.GraphPeriod == nil || *timeSeriesQuery.parameters.GraphPeriod != "disabled" {
 		if timeSeriesQuery.parameters.GraphPeriod == nil || *timeSeriesQuery.parameters.GraphPeriod == "auto" || *timeSeriesQuery.parameters.GraphPeriod == "" {
-			intervalCalculator := intervalv2.NewCalculator(intervalv2.CalculatorOptions{})
+			intervalCalculator := gcmTime.NewCalculator(gcmTime.CalculatorOptions{})
 			interval := intervalCalculator.Calculate(req.Queries[0].TimeRange, time.Duration(timeSeriesQuery.IntervalMS/1000)*time.Second, req.Queries[0].MaxDataPoints)
 			timeSeriesQuery.parameters.GraphPeriod = &interval.Text
 		}
@@ -28,7 +27,7 @@ func (timeSeriesQuery *cloudMonitoringTimeSeriesQuery) appendGraphPeriod(req *ba
 }
 
 func (timeSeriesQuery *cloudMonitoringTimeSeriesQuery) run(ctx context.Context, req *backend.QueryDataRequest,
-	s *Service, dsInfo datasourceInfo, tracer tracing.Tracer) (*backend.DataResponse, any, string, error) {
+	s *Service, dsInfo datasourceInfo, logger log.Logger) (*backend.DataResponse, any, string, error) {
 	timeSeriesQuery.parameters.Query += timeSeriesQuery.appendGraphPeriod(req)
 	from := req.Queries[0].TimeRange.From
 	to := req.Queries[0].TimeRange.To
@@ -37,11 +36,11 @@ func (timeSeriesQuery *cloudMonitoringTimeSeriesQuery) run(ctx context.Context,
 	requestBody := map[string]any{
 		"query": timeSeriesQuery.parameters.Query,
 	}
-	return runTimeSeriesRequest(ctx, timeSeriesQuery.logger, req, s, dsInfo, tracer, timeSeriesQuery.parameters.ProjectName, nil, requestBody)
+	return runTimeSeriesRequest(ctx, req, s, dsInfo, timeSeriesQuery.parameters.ProjectName, nil, requestBody, logger)
 }
 
 func (timeSeriesQuery *cloudMonitoringTimeSeriesQuery) parseResponse(queryRes *backend.DataResponse,
-	res any, executedQueryString string) error {
+	res any, executedQueryString string, logger log.Logger) error {
 	response := res.(cloudMonitoringResponse)
 	frames := data.Frames{}
 
@@ -103,7 +102,7 @@ func (timeSeriesQuery *cloudMonitoringTimeSeriesQuery) buildDeepLink() string {
 		timeSeriesQuery.timeRange.To.Format(time.RFC3339Nano),
 	)
 	if err != nil {
-		slog.Error(
+		backend.Logger.Error(
 			"Failed to generate deep link: unable to parse metrics explorer URL",
 			"ProjectName", timeSeriesQuery.parameters.Query,
 			"error", err,
diff --git a/pkg/tsdb/cloud-monitoring/time_series_query_test.go b/pkg/tsdb/cloud-monitoring/time_series_query_test.go
index 73dcb8db8079f..8ddfc183366d3 100644
--- a/pkg/tsdb/cloud-monitoring/time_series_query_test.go
+++ b/pkg/tsdb/cloud-monitoring/time_series_query_test.go
@@ -13,6 +13,7 @@ import (
 )
 
 func TestTimeSeriesQuery(t *testing.T) {
+	service := &Service{}
 	t.Run("multiple point descriptor is returned", func(t *testing.T) {
 		data, err := loadTestFile("./test-data/8-series-response-mql-multiple-point-descriptors.json")
 		require.NoError(t, err)
@@ -33,7 +34,7 @@ func TestTimeSeriesQuery(t *testing.T) {
 					To:   fromStart.Add(34 * time.Minute),
 				},
 			}
-			err = query.parseResponse(res, data, "")
+			err = query.parseResponse(res, data, "", service.logger)
 			frames := res.Frames
 			assert.Equal(t, "grafana-prod asia-northeast1-c 6724404429462225363 200", frames[0].Fields[1].Name)
 			assert.Equal(t, 843302441.9, frames[0].Fields[1].At(0))
@@ -52,7 +53,7 @@ func TestTimeSeriesQuery(t *testing.T) {
 					To:   fromStart.Add(34 * time.Minute),
 				},
 			}
-			err = query.parseResponse(res, data, "")
+			err = query.parseResponse(res, data, "", service.logger)
 			frames := res.Frames
 			assert.Equal(t, "test-proj - asia-northeast1-c - 6724404429462225363 - 200", frames[0].Fields[1].Name)
 		})
@@ -79,7 +80,7 @@ func TestTimeSeriesQuery(t *testing.T) {
 					To:   fromStart.Add(34 * time.Minute),
 				},
 			}
-			err = query.parseResponse(res, data, "")
+			err = query.parseResponse(res, data, "", service.logger)
 			require.NoError(t, err)
 			frames := res.Frames
 			assert.Equal(t, 1, len(res.Frames))
@@ -103,7 +104,7 @@ func TestTimeSeriesQuery(t *testing.T) {
 				To:   fromStart.Add(34 * time.Minute),
 			},
 		}
-		err = query.parseResponse(res, data, "")
+		err = query.parseResponse(res, data, "", service.logger)
 		require.NoError(t, err)
 		frames := res.Frames
 		custom, ok := frames[0].Meta.Custom.(map[string]any)
@@ -131,7 +132,7 @@ func TestTimeSeriesQuery(t *testing.T) {
 				To:   fromStart.Add(34 * time.Minute),
 			},
 		}
-		err = query.parseResponse(res, data, "")
+		err = query.parseResponse(res, data, "", service.logger)
 		require.NoError(t, err)
 		frames := res.Frames
 		timeField := frames[0].Fields[0]
diff --git a/pkg/tsdb/cloud-monitoring/types.go b/pkg/tsdb/cloud-monitoring/types.go
index f00195ee86001..39610af750080 100644
--- a/pkg/tsdb/cloud-monitoring/types.go
+++ b/pkg/tsdb/cloud-monitoring/types.go
@@ -9,19 +9,18 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/huandu/xstrings"
 
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/tsdb/cloud-monitoring/kinds/dataquery"
 )
 
 type (
 	cloudMonitoringQueryExecutor interface {
-		run(ctx context.Context, req *backend.QueryDataRequest, s *Service, dsInfo datasourceInfo, tracer tracing.Tracer) (
+		run(ctx context.Context, req *backend.QueryDataRequest, s *Service, dsInfo datasourceInfo, logger log.Logger) (
 			*backend.DataResponse, any, string, error)
-		parseResponse(dr *backend.DataResponse, data any, executedQueryString string) error
+		parseResponse(dr *backend.DataResponse, data any, executedQueryString string, logger log.Logger) error
 		buildDeepLink() string
 		getRefID() string
 		getAliasBy() string
@@ -41,7 +40,6 @@ type (
 	cloudMonitoringTimeSeriesList struct {
 		refID      string
 		aliasBy    string
-		logger     log.Logger
 		parameters *dataquery.TimeSeriesList
 		// Processed properties
 		params url.Values
@@ -50,7 +48,6 @@ type (
 	cloudMonitoringSLO struct {
 		refID      string
 		aliasBy    string
-		logger     log.Logger
 		parameters *dataquery.SLOQuery
 		// Processed properties
 		params url.Values
@@ -59,8 +56,8 @@ type (
 	// cloudMonitoringProm is used to build a promQL queries
 	cloudMonitoringProm struct {
 		refID      string
-		aliasBy    string
 		logger     log.Logger
+		aliasBy    string
 		parameters *dataquery.PromQLQuery
 		timeRange  backend.TimeRange
 		IntervalMS int64
@@ -69,8 +66,8 @@ type (
 	// cloudMonitoringTimeSeriesQuery is used to build MQL queries
 	cloudMonitoringTimeSeriesQuery struct {
 		refID      string
-		aliasBy    string
 		logger     log.Logger
+		aliasBy    string
 		parameters *dataquery.TimeSeriesQuery
 		// Processed properties
 		timeRange  backend.TimeRange
@@ -100,14 +97,6 @@ type (
 		Unit                 string               `json:"unit"`
 		NextPageToken        string               `json:"nextPageToken"`
 	}
-
-	promResponse struct {
-		Status string `json:"status"`
-		Data   struct {
-			Result     any    `json:"result"`
-			ResultType string `json:"resultType"`
-		} `json:"data"`
-	}
 )
 
 type pointIterator interface {
diff --git a/pkg/tsdb/cloud-monitoring/utils.go b/pkg/tsdb/cloud-monitoring/utils.go
index 946a0f43b557f..3b719ff2c7e35 100644
--- a/pkg/tsdb/cloud-monitoring/utils.go
+++ b/pkg/tsdb/cloud-monitoring/utils.go
@@ -14,18 +14,17 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/infra/tracing"
-	"github.com/grafana/grafana/pkg/tsdb/intervalv2"
 )
 
 func addInterval(period string, field *data.Field) error {
 	period = strings.TrimPrefix(period, "+")
-	p, err := intervalv2.ParseIntervalStringToTimeDuration(period)
+	p, err := gtime.ParseIntervalStringToTimeDuration(period)
 	if err != nil {
 		return err
 	}
@@ -48,7 +47,7 @@ func toString(v any) string {
 	return v.(string)
 }
 
-func createRequest(ctx context.Context, logger log.Logger, dsInfo *datasourceInfo, proxyPass string, body io.Reader) (*http.Request, error) {
+func createRequest(ctx context.Context, dsInfo *datasourceInfo, proxyPass string, body io.Reader) (*http.Request, error) {
 	u, err := url.Parse(dsInfo.url)
 	if err != nil {
 		return nil, err
@@ -61,7 +60,7 @@ func createRequest(ctx context.Context, logger log.Logger, dsInfo *datasourceInf
 	}
 	req, err := http.NewRequestWithContext(ctx, method, dsInfo.services[cloudMonitor].url, body)
 	if err != nil {
-		logger.Error("Failed to create request", "error", err)
+		backend.Logger.Error("Failed to create request", "error", err)
 		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
 
@@ -71,7 +70,7 @@ func createRequest(ctx context.Context, logger log.Logger, dsInfo *datasourceInf
 	return req, nil
 }
 
-func doRequestPage(ctx context.Context, logger log.Logger, r *http.Request, dsInfo datasourceInfo, params url.Values, body map[string]any) (cloudMonitoringResponse, error) {
+func doRequestPage(ctx context.Context, r *http.Request, dsInfo datasourceInfo, params url.Values, body map[string]any, logger log.Logger) (cloudMonitoringResponse, error) {
 	if params != nil {
 		r.URL.RawQuery = params.Encode()
 	}
@@ -90,11 +89,11 @@ func doRequestPage(ctx context.Context, logger log.Logger, r *http.Request, dsIn
 
 	defer func() {
 		if err = res.Body.Close(); err != nil {
-			logger.Warn("Failed to close response body", "error", err)
+			backend.Logger.Warn("Failed to close response body", "error", err)
 		}
 	}()
 
-	dnext, err := unmarshalResponse(logger, res)
+	dnext, err := unmarshalResponse(res, logger)
 	if err != nil {
 		return cloudMonitoringResponse{}, err
 	}
@@ -102,8 +101,8 @@ func doRequestPage(ctx context.Context, logger log.Logger, r *http.Request, dsIn
 	return dnext, nil
 }
 
-func doRequestWithPagination(ctx context.Context, logger log.Logger, r *http.Request, dsInfo datasourceInfo, params url.Values, body map[string]any) (cloudMonitoringResponse, error) {
-	d, err := doRequestPage(ctx, logger, r, dsInfo, params, body)
+func doRequestWithPagination(ctx context.Context, r *http.Request, dsInfo datasourceInfo, params url.Values, body map[string]any, logger log.Logger) (cloudMonitoringResponse, error) {
+	d, err := doRequestPage(ctx, r, dsInfo, params, body, logger)
 	if err != nil {
 		return cloudMonitoringResponse{}, err
 	}
@@ -114,7 +113,7 @@ func doRequestWithPagination(ctx context.Context, logger log.Logger, r *http.Req
 		if body != nil {
 			body["pageToken"] = d.NextPageToken
 		}
-		nextPage, err := doRequestPage(ctx, logger, r, dsInfo, params, body)
+		nextPage, err := doRequestPage(ctx, r, dsInfo, params, body, logger)
 		if err != nil {
 			return cloudMonitoringResponse{}, err
 		}
@@ -125,20 +124,20 @@ func doRequestWithPagination(ctx context.Context, logger log.Logger, r *http.Req
 	return d, nil
 }
 
-func traceReq(ctx context.Context, tracer tracing.Tracer, req *backend.QueryDataRequest, dsInfo datasourceInfo, r *http.Request, target string) trace.Span {
-	ctx, span := tracer.Start(ctx, "cloudMonitoring query", trace.WithAttributes(
+func traceReq(ctx context.Context, req *backend.QueryDataRequest, dsInfo datasourceInfo, r *http.Request, target string) trace.Span {
+	_, span := tracing.DefaultTracer().Start(ctx, "cloudMonitoring query", trace.WithAttributes(
 		attribute.String("target", target),
 		attribute.String("from", req.Queries[0].TimeRange.From.String()),
 		attribute.String("until", req.Queries[0].TimeRange.To.String()),
 		attribute.Int64("datasource_id", dsInfo.id),
 		attribute.Int64("org_id", req.PluginContext.OrgID),
 	))
-	tracer.Inject(ctx, r.Header, span)
+	defer span.End()
 	return span
 }
 
-func runTimeSeriesRequest(ctx context.Context, logger log.Logger, req *backend.QueryDataRequest,
-	s *Service, dsInfo datasourceInfo, tracer tracing.Tracer, projectName string, params url.Values, body map[string]any) (*backend.DataResponse, cloudMonitoringResponse, string, error) {
+func runTimeSeriesRequest(ctx context.Context, req *backend.QueryDataRequest,
+	s *Service, dsInfo datasourceInfo, projectName string, params url.Values, body map[string]any, logger log.Logger) (*backend.DataResponse, cloudMonitoringResponse, string, error) {
 	dr := &backend.DataResponse{}
 	projectName, err := s.ensureProject(ctx, dsInfo, projectName)
 	if err != nil {
@@ -149,16 +148,16 @@ func runTimeSeriesRequest(ctx context.Context, logger log.Logger, req *backend.Q
 	if body != nil {
 		timeSeriesMethod += ":query"
 	}
-	r, err := createRequest(ctx, logger, &dsInfo, path.Join("/v3/projects", projectName, timeSeriesMethod), nil)
+	r, err := createRequest(ctx, &dsInfo, path.Join("/v3/projects", projectName, timeSeriesMethod), nil)
 	if err != nil {
 		dr.Error = err
 		return dr, cloudMonitoringResponse{}, "", nil
 	}
 
-	span := traceReq(ctx, tracer, req, dsInfo, r, params.Encode())
+	span := traceReq(ctx, req, dsInfo, r, params.Encode())
 	defer span.End()
 
-	d, err := doRequestWithPagination(ctx, logger, r, dsInfo, params, body)
+	d, err := doRequestWithPagination(ctx, r, dsInfo, params, body, logger)
 	if err != nil {
 		dr.Error = err
 		return dr, cloudMonitoringResponse{}, "", nil
diff --git a/pkg/tsdb/cloudwatch/annotation_query.go b/pkg/tsdb/cloudwatch/annotation_query.go
index ce390c71d5e60..c65bece8c2ed9 100644
--- a/pkg/tsdb/cloudwatch/annotation_query.go
+++ b/pkg/tsdb/cloudwatch/annotation_query.go
@@ -12,6 +12,7 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/kinds/dataquery"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/utils"
 )
 
 type annotationEvent struct {
@@ -50,7 +51,12 @@ func (e *cloudWatchExecutor) executeAnnotationQuery(ctx context.Context, pluginC
 	actionPrefix := model.ActionPrefix
 	alarmNamePrefix := model.AlarmNamePrefix
 
-	cli, err := e.getCWClient(ctx, pluginCtx, model.Region)
+	region := ""
+	if model.Region != nil {
+		region = *model.Region
+	}
+
+	cli, err := e.getCWClient(ctx, pluginCtx, region)
 	if err != nil {
 		return nil, err
 	}
@@ -76,9 +82,9 @@ func (e *cloudWatchExecutor) executeAnnotationQuery(ctx context.Context, pluginC
 		if err != nil {
 			return nil, fmt.Errorf("%v: %w", "failed to call cloudwatch:DescribeAlarms", err)
 		}
-		alarmNames = filterAlarms(resp, model.Namespace, metricName, dimensions, statistic, period)
+		alarmNames = filterAlarms(resp, utils.Depointerizer(model.Namespace), metricName, dimensions, statistic, period)
 	} else {
-		if model.Region == "" || model.Namespace == "" || metricName == "" || statistic == "" {
+		if model.Region == nil || model.Namespace == nil || metricName == "" || statistic == "" {
 			return result, errors.New("invalid annotations query")
 		}
 
@@ -96,7 +102,7 @@ func (e *cloudWatchExecutor) executeAnnotationQuery(ctx context.Context, pluginC
 			}
 		}
 		params := &cloudwatch.DescribeAlarmsForMetricInput{
-			Namespace:  aws.String(model.Namespace),
+			Namespace:  aws.String(utils.Depointerizer(model.Namespace)),
 			MetricName: aws.String(metricName),
 			Dimensions: qd,
 			Statistic:  aws.String(statistic),
diff --git a/pkg/tsdb/cloudwatch/annotation_query_test.go b/pkg/tsdb/cloudwatch/annotation_query_test.go
index 9d2ff5c0fc7f6..6779c82a89681 100644
--- a/pkg/tsdb/cloudwatch/annotation_query_test.go
+++ b/pkg/tsdb/cloudwatch/annotation_query_test.go
@@ -10,10 +10,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/cloudwatch"
 	"github.com/aws/aws-sdk-go/service/cloudwatch/cloudwatchiface"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -31,11 +28,9 @@ func TestQuery_AnnotationQuery(t *testing.T) {
 
 	t.Run("DescribeAlarmsForMetric is called with minimum parameters", func(t *testing.T) {
 		client = fakeCWAnnotationsClient{describeAlarmsForMetricOutput: &cloudwatch.DescribeAlarmsForMetricOutput{}}
-		im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: models.CloudWatchSettings{}}, nil
-		})
+		im := defaultTestInstanceManager()
 
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 		_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
 			PluginContext: backend.PluginContext{
 				DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{},
@@ -65,11 +60,9 @@ func TestQuery_AnnotationQuery(t *testing.T) {
 
 	t.Run("DescribeAlarms is called when prefixMatching is true", func(t *testing.T) {
 		client = fakeCWAnnotationsClient{describeAlarmsOutput: &cloudwatch.DescribeAlarmsOutput{}}
-		im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: models.CloudWatchSettings{}}, nil
-		})
+		im := defaultTestInstanceManager()
 
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 		_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
 			PluginContext: backend.PluginContext{
 				DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{},
diff --git a/pkg/tsdb/cloudwatch/clients/metrics.go b/pkg/tsdb/cloudwatch/clients/metrics.go
index 05456f3cf8a6c..b3648492a59f6 100644
--- a/pkg/tsdb/cloudwatch/clients/metrics.go
+++ b/pkg/tsdb/cloudwatch/clients/metrics.go
@@ -5,20 +5,19 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws/awsutil"
 	"github.com/aws/aws-sdk-go/service/cloudwatch"
-	"github.com/grafana/grafana/pkg/infra/metrics"
-	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/utils"
 )
 
 // this client wraps the CloudWatch API and handles pagination and the composition of the MetricResponse DTO
 type metricsClient struct {
 	models.CloudWatchMetricsAPIProvider
-	config *setting.Cfg
+	listMetricsPageLimit int
 }
 
-func NewMetricsClient(api models.CloudWatchMetricsAPIProvider, config *setting.Cfg) *metricsClient {
-	return &metricsClient{CloudWatchMetricsAPIProvider: api, config: config}
+func NewMetricsClient(api models.CloudWatchMetricsAPIProvider, pageLimit int) *metricsClient {
+	return &metricsClient{CloudWatchMetricsAPIProvider: api, listMetricsPageLimit: pageLimit}
 }
 
 func (l *metricsClient) ListMetricsWithPageLimit(ctx context.Context, params *cloudwatch.ListMetricsInput) ([]resources.MetricResponse, error) {
@@ -26,7 +25,7 @@ func (l *metricsClient) ListMetricsWithPageLimit(ctx context.Context, params *cl
 	pageNum := 0
 	err := l.ListMetricsPagesWithContext(ctx, params, func(page *cloudwatch.ListMetricsOutput, lastPage bool) bool {
 		pageNum++
-		metrics.MAwsCloudWatchListMetrics.Inc()
+		utils.QueriesTotalCounter.WithLabelValues(utils.ListMetricsLabel).Inc()
 		metrics, err := awsutil.ValuesAtPath(page, "Metrics")
 		if err == nil {
 			for idx, metric := range metrics {
@@ -37,7 +36,7 @@ func (l *metricsClient) ListMetricsWithPageLimit(ctx context.Context, params *cl
 				cloudWatchMetrics = append(cloudWatchMetrics, metric)
 			}
 		}
-		return !lastPage && pageNum < l.config.AWSListMetricsPageLimit
+		return !lastPage && pageNum < l.listMetricsPageLimit
 	})
 
 	return cloudWatchMetrics, err
diff --git a/pkg/tsdb/cloudwatch/clients/metrics_test.go b/pkg/tsdb/cloudwatch/clients/metrics_test.go
index 4dd455b65b7a4..644aecf85e4dd 100644
--- a/pkg/tsdb/cloudwatch/clients/metrics_test.go
+++ b/pkg/tsdb/cloudwatch/clients/metrics_test.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudwatch"
-	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/mocks"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
 	"github.com/stretchr/testify/assert"
@@ -31,7 +30,7 @@ func TestMetricsClient(t *testing.T) {
 	t.Run("List Metrics and page limit is reached", func(t *testing.T) {
 		pageLimit := 3
 		fakeApi := &mocks.FakeMetricsAPI{Metrics: metrics, MetricsPerPage: 2}
-		client := NewMetricsClient(fakeApi, &setting.Cfg{AWSListMetricsPageLimit: pageLimit})
+		client := NewMetricsClient(fakeApi, pageLimit)
 		response, err := client.ListMetricsWithPageLimit(ctx, &cloudwatch.ListMetricsInput{})
 		require.NoError(t, err)
 
@@ -42,7 +41,7 @@ func TestMetricsClient(t *testing.T) {
 	t.Run("List Metrics and page limit is not reached", func(t *testing.T) {
 		pageLimit := 2
 		fakeApi := &mocks.FakeMetricsAPI{Metrics: metrics}
-		client := NewMetricsClient(fakeApi, &setting.Cfg{AWSListMetricsPageLimit: pageLimit})
+		client := NewMetricsClient(fakeApi, pageLimit)
 
 		response, err := client.ListMetricsWithPageLimit(ctx, &cloudwatch.ListMetricsInput{})
 		require.NoError(t, err)
@@ -56,7 +55,7 @@ func TestMetricsClient(t *testing.T) {
 			{MetricName: aws.String("Test_MetricName2")},
 			{MetricName: aws.String("Test_MetricName3")},
 		}, OwningAccounts: []*string{aws.String("1234567890"), aws.String("1234567890"), aws.String("1234567895")}}
-		client := NewMetricsClient(fakeApi, &setting.Cfg{AWSListMetricsPageLimit: 100})
+		client := NewMetricsClient(fakeApi, 100)
 
 		response, err := client.ListMetricsWithPageLimit(ctx, &cloudwatch.ListMetricsInput{IncludeLinkedAccounts: aws.Bool(true)})
 		require.NoError(t, err)
@@ -70,7 +69,7 @@ func TestMetricsClient(t *testing.T) {
 
 	t.Run("Should not return account id in case IncludeLinkedAccounts is set to false", func(t *testing.T) {
 		fakeApi := &mocks.FakeMetricsAPI{Metrics: []*cloudwatch.Metric{{MetricName: aws.String("Test_MetricName1")}}, OwningAccounts: []*string{aws.String("1234567890")}}
-		client := NewMetricsClient(fakeApi, &setting.Cfg{AWSListMetricsPageLimit: 100})
+		client := NewMetricsClient(fakeApi, 100)
 
 		response, err := client.ListMetricsWithPageLimit(ctx, &cloudwatch.ListMetricsInput{IncludeLinkedAccounts: aws.Bool(false)})
 		require.NoError(t, err)
diff --git a/pkg/tsdb/cloudwatch/cloudwatch.go b/pkg/tsdb/cloudwatch/cloudwatch.go
index 2807d7372cd18..11a83b05572f0 100644
--- a/pkg/tsdb/cloudwatch/cloudwatch.go
+++ b/pkg/tsdb/cloudwatch/cloudwatch.go
@@ -3,9 +3,9 @@ package cloudwatch
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
-	"sync"
 	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -18,21 +18,26 @@ import (
 	"github.com/grafana/grafana-aws-sdk/pkg/awsds"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/proxy"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/resource/httpadapter"
-	"github.com/grafana/grafana/pkg/infra/httpclient"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	ngalertmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
-	"github.com/grafana/grafana/pkg/services/query"
-	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/clients"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/kinds/dataquery"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 	"github.com/patrickmn/go-cache"
 )
 
-const tagValueCacheExpiration = time.Hour * 24
+const (
+	tagValueCacheExpiration = time.Hour * 24
+
+	// headerFromExpression is used by datasources to identify expression queries
+	headerFromExpression = "X-Grafana-From-Expr"
+
+	// headerFromAlert is used by datasources to identify alert queries
+	headerFromAlert = "FromAlert"
+)
 
 type DataQueryJson struct {
 	dataquery.CloudWatchAnnotationQuery
@@ -42,7 +47,9 @@ type DataQueryJson struct {
 type DataSource struct {
 	Settings      models.CloudWatchSettings
 	HTTPClient    *http.Client
+	sessions      SessionCache
 	tagValueCache *cache.Cache
+	ProxyOpts     *proxy.Options
 }
 
 const (
@@ -54,21 +61,21 @@ const (
 	timeSeriesQuery = "timeSeriesQuery"
 )
 
-var logger = log.New("tsdb.cloudwatch")
-
-func ProvideService(cfg *setting.Cfg, httpClientProvider httpclient.Provider, features featuremgmt.FeatureToggles) *CloudWatchService {
+func ProvideService(httpClientProvider *httpclient.Provider) *CloudWatchService {
+	logger := backend.NewLoggerWith("logger", "tsdb.cloudwatch")
 	logger.Debug("Initializing")
 
-	executor := newExecutor(datasource.NewInstanceManager(NewInstanceSettings(httpClientProvider)), cfg, awsds.NewSessionCache(), features)
+	executor := newExecutor(
+		datasource.NewInstanceManager(NewInstanceSettings(httpClientProvider)),
+		logger,
+	)
 
 	return &CloudWatchService{
-		Cfg:      cfg,
 		Executor: executor,
 	}
 }
 
 type CloudWatchService struct {
-	Cfg      *setting.Cfg
 	Executor *cloudWatchExecutor
 }
 
@@ -76,21 +83,19 @@ type SessionCache interface {
 	GetSession(c awsds.SessionConfig) (*session.Session, error)
 }
 
-func newExecutor(im instancemgmt.InstanceManager, cfg *setting.Cfg, sessions SessionCache, features featuremgmt.FeatureToggles) *cloudWatchExecutor {
+func newExecutor(im instancemgmt.InstanceManager, logger log.Logger) *cloudWatchExecutor {
 	e := &cloudWatchExecutor{
-		im:       im,
-		cfg:      cfg,
-		sessions: sessions,
-		features: features,
+		im:     im,
+		logger: logger,
 	}
 
 	e.resourceHandler = httpadapter.New(e.newResourceMux())
 	return e
 }
 
-func NewInstanceSettings(httpClientProvider httpclient.Provider) datasource.InstanceFactoryFunc {
+func NewInstanceSettings(httpClientProvider *httpclient.Provider) datasource.InstanceFactoryFunc {
 	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		instanceSettings, err := models.LoadCloudWatchSettings(settings)
+		instanceSettings, err := models.LoadCloudWatchSettings(ctx, settings)
 		if err != nil {
 			return nil, fmt.Errorf("error reading settings: %w", err)
 		}
@@ -109,21 +114,36 @@ func NewInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst
 			Settings:      instanceSettings,
 			HTTPClient:    httpClient,
 			tagValueCache: cache.New(tagValueCacheExpiration, tagValueCacheExpiration*5),
+			sessions:      awsds.NewSessionCache(),
+			// this is used to build a custom dialer when secure socks proxy is enabled
+			ProxyOpts: opts.ProxyOptions,
 		}, nil
 	}
 }
 
-// cloudWatchExecutor executes CloudWatch requests.
+// cloudWatchExecutor executes CloudWatch requests
 type cloudWatchExecutor struct {
-	im          instancemgmt.InstanceManager
-	cfg         *setting.Cfg
-	sessions    SessionCache
-	features    featuremgmt.FeatureToggles
-	regionCache sync.Map
+	im     instancemgmt.InstanceManager
+	logger log.Logger
 
 	resourceHandler backend.CallResourceHandler
 }
 
+// instrumentContext adds plugin key-values to the context; later, logger.FromContext(ctx) will provide a logger
+// that adds these values to its output.
+// TODO: move this into the sdk (see https://github.com/grafana/grafana/issues/82033)
+func instrumentContext(ctx context.Context, endpoint string, pCtx backend.PluginContext) context.Context {
+	p := []any{"endpoint", endpoint, "pluginId", pCtx.PluginID}
+	if pCtx.DataSourceInstanceSettings != nil {
+		p = append(p, "dsName", pCtx.DataSourceInstanceSettings.Name)
+		p = append(p, "dsUID", pCtx.DataSourceInstanceSettings.UID)
+	}
+	if pCtx.User != nil {
+		p = append(p, "uname", pCtx.User.Login)
+	}
+	return log.WithContextualAttributes(ctx, p)
+}
+
 func (e *cloudWatchExecutor) getRequestContext(ctx context.Context, pluginCtx backend.PluginContext, region string) (models.RequestContext, error) {
 	r := region
 	instance, err := e.getInstance(ctx, pluginCtx)
@@ -139,28 +159,45 @@ func (e *cloudWatchExecutor) getRequestContext(ctx context.Context, pluginCtx ba
 		return models.RequestContext{}, err
 	}
 
-	sess, err := e.newSession(ctx, pluginCtx, r)
+	sess, err := instance.newSession(r)
 	if err != nil {
 		return models.RequestContext{}, err
 	}
 
 	return models.RequestContext{
 		OAMAPIProvider:        NewOAMAPI(sess),
-		MetricsClientProvider: clients.NewMetricsClient(NewMetricsAPI(sess), e.cfg),
+		MetricsClientProvider: clients.NewMetricsClient(NewMetricsAPI(sess), instance.Settings.GrafanaSettings.ListMetricsPageLimit),
 		LogsAPIProvider:       NewLogsAPI(sess),
 		EC2APIProvider:        ec2Client,
 		Settings:              instance.Settings,
-		Features:              e.features,
-		Logger:                logger,
+		Logger:                e.logger.FromContext(ctx),
+	}, nil
+}
+
+// getRequestContextOnlySettings is useful for resource endpoints that are called before auth has been configured such as external-id that need access to settings but nothing else
+func (e *cloudWatchExecutor) getRequestContextOnlySettings(ctx context.Context, pluginCtx backend.PluginContext, _ string) (models.RequestContext, error) {
+	instance, err := e.getInstance(ctx, pluginCtx)
+	if err != nil {
+		return models.RequestContext{}, err
+	}
+
+	return models.RequestContext{
+		OAMAPIProvider:        nil,
+		MetricsClientProvider: nil,
+		LogsAPIProvider:       nil,
+		EC2APIProvider:        nil,
+		Settings:              instance.Settings,
+		Logger:                e.logger.FromContext(ctx),
 	}, nil
 }
 
 func (e *cloudWatchExecutor) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	ctx = instrumentContext(ctx, "callResource", req.PluginContext)
 	return e.resourceHandler.CallResource(ctx, req, sender)
 }
 
 func (e *cloudWatchExecutor) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
-	logger := logger.FromContext(ctx)
+	ctx = instrumentContext(ctx, "queryData", req.PluginContext)
 	q := req.Queries[0]
 	var model DataQueryJson
 	err := json.Unmarshal(q.JSON, &model)
@@ -168,9 +205,17 @@ func (e *cloudWatchExecutor) QueryData(ctx context.Context, req *backend.QueryDa
 		return nil, err
 	}
 
-	_, fromAlert := req.Headers[ngalertmodels.FromAlertHeaderName]
-	fromExpression := req.GetHTTPHeader(query.HeaderFromExpression) != ""
-	isSyncLogQuery := (fromAlert || fromExpression) && model.QueryMode == logsQueryMode
+	_, fromAlert := req.Headers[headerFromAlert]
+	fromExpression := req.GetHTTPHeader(headerFromExpression) != ""
+	// Public dashboard queries execute like alert queries, i.e. they execute on the backend, therefore, we need to handle them synchronously.
+	// Since `model.Type` is set during execution on the frontend by the query runner and isn't saved with the query, we are checking here is
+	// missing the `model.Type` property and if it is a log query in order to determine if it is a public dashboard query.
+	queryMode := ""
+	if model.QueryMode != nil {
+		queryMode = string(*model.QueryMode)
+	}
+	fromPublicDashboard := model.Type == "" && queryMode == logsQueryMode
+	isSyncLogQuery := ((fromAlert || fromExpression) && queryMode == logsQueryMode) || fromPublicDashboard
 	if isSyncLogQuery {
 		return executeSyncLogQuery(ctx, e, req)
 	}
@@ -180,17 +225,18 @@ func (e *cloudWatchExecutor) QueryData(ctx context.Context, req *backend.QueryDa
 	case annotationQuery:
 		result, err = e.executeAnnotationQuery(ctx, req.PluginContext, model, q)
 	case logAction:
-		result, err = e.executeLogActions(ctx, logger, req)
+		result, err = e.executeLogActions(ctx, req)
 	case timeSeriesQuery:
 		fallthrough
 	default:
-		result, err = e.executeTimeSeriesQuery(ctx, logger, req)
+		result, err = e.executeTimeSeriesQuery(ctx, req)
 	}
 
 	return result, err
 }
 
 func (e *cloudWatchExecutor) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
+	ctx = instrumentContext(ctx, "checkHealth", req.PluginContext)
 	status := backend.HealthStatusOk
 	metricsTest := "Successfully queried the CloudWatch metrics API."
 	logsTest := "Successfully queried the CloudWatch logs API."
@@ -221,67 +267,90 @@ func (e *cloudWatchExecutor) checkHealthMetrics(ctx context.Context, pluginCtx b
 		MetricName: &metric,
 	}
 
-	session, err := e.newSession(ctx, pluginCtx, defaultRegion)
+	instance, err := e.getInstance(ctx, pluginCtx)
 	if err != nil {
 		return err
 	}
-	metricClient := clients.NewMetricsClient(NewMetricsAPI(session), e.cfg)
+
+	session, err := instance.newSession(defaultRegion)
+	if err != nil {
+		return err
+	}
+
+	metricClient := clients.NewMetricsClient(NewMetricsAPI(session), instance.Settings.GrafanaSettings.ListMetricsPageLimit)
 	_, err = metricClient.ListMetricsWithPageLimit(ctx, params)
 	return err
 }
 
 func (e *cloudWatchExecutor) checkHealthLogs(ctx context.Context, pluginCtx backend.PluginContext) error {
-	session, err := e.newSession(ctx, pluginCtx, defaultRegion)
+	session, err := e.newSessionFromContext(ctx, pluginCtx, defaultRegion)
 	if err != nil {
 		return err
 	}
 	logsClient := NewLogsAPI(session)
-	_, err = logsClient.DescribeLogGroups(&cloudwatchlogs.DescribeLogGroupsInput{Limit: aws.Int64(1)})
+	_, err = logsClient.DescribeLogGroupsWithContext(ctx, &cloudwatchlogs.DescribeLogGroupsInput{Limit: aws.Int64(1)})
 	return err
 }
 
-func (e *cloudWatchExecutor) newSession(ctx context.Context, pluginCtx backend.PluginContext, region string) (*session.Session, error) {
-	instance, err := e.getInstance(ctx, pluginCtx)
-	if err != nil {
-		return nil, err
-	}
-
+func (ds *DataSource) newSession(region string) (*session.Session, error) {
 	if region == defaultRegion {
-		if len(instance.Settings.Region) == 0 {
+		if len(ds.Settings.Region) == 0 {
 			return nil, models.ErrMissingRegion
 		}
-		region = instance.Settings.Region
+		region = ds.Settings.Region
 	}
-
-	sess, err := e.sessions.GetSession(awsds.SessionConfig{
+	sess, err := ds.sessions.GetSession(awsds.SessionConfig{
 		// https://github.com/grafana/grafana/issues/46365
 		// HTTPClient: instance.HTTPClient,
 		Settings: awsds.AWSDatasourceSettings{
-			Profile:       instance.Settings.Profile,
+			Profile:       ds.Settings.Profile,
 			Region:        region,
-			AuthType:      instance.Settings.AuthType,
-			AssumeRoleARN: instance.Settings.AssumeRoleARN,
-			ExternalID:    instance.Settings.ExternalID,
-			Endpoint:      instance.Settings.Endpoint,
-			DefaultRegion: instance.Settings.Region,
-			AccessKey:     instance.Settings.AccessKey,
-			SecretKey:     instance.Settings.SecretKey,
+			AuthType:      ds.Settings.AuthType,
+			AssumeRoleARN: ds.Settings.AssumeRoleARN,
+			ExternalID:    ds.Settings.ExternalID,
+			Endpoint:      ds.Settings.Endpoint,
+			DefaultRegion: ds.Settings.Region,
+			AccessKey:     ds.Settings.AccessKey,
+			SecretKey:     ds.Settings.SecretKey,
 		},
 		UserAgentName: aws.String("Cloudwatch"),
+		AuthSettings:  &ds.Settings.GrafanaSettings,
 	})
 	if err != nil {
 		return nil, err
 	}
 
 	// work around until https://github.com/grafana/grafana/issues/39089 is implemented
-	if e.cfg.SecureSocksDSProxy.Enabled && instance.Settings.SecureSocksProxyEnabled {
+	if ds.Settings.GrafanaSettings.SecureSocksDSProxyEnabled && ds.Settings.SecureSocksProxyEnabled {
 		// only update the transport to try to avoid the issue mentioned here https://github.com/grafana/grafana/issues/46365
-		sess.Config.HTTPClient.Transport = instance.HTTPClient.Transport
+		// also, 'sess' is cached and reused, so the first time it might have the transport not set, the following uses it will
+		if sess.Config.HTTPClient.Transport == nil {
+			// following go standard library logic (https://pkg.go.dev/net/http#Client), if no Transport is provided,
+			// then we use http.DefaultTransport
+			defTransport, ok := http.DefaultTransport.(*http.Transport)
+			if !ok {
+				// this should not happen but validating just in case
+				return nil, errors.New("default http client transport is not of type http.Transport")
+			}
+			sess.Config.HTTPClient.Transport = defTransport.Clone()
+		}
+		err = proxy.New(ds.ProxyOpts).ConfigureSecureSocksHTTPProxy(sess.Config.HTTPClient.Transport.(*http.Transport))
+		if err != nil {
+			return nil, fmt.Errorf("error configuring Secure Socks proxy for Transport: %w", err)
+		}
 	}
-
 	return sess, nil
 }
 
+func (e *cloudWatchExecutor) newSessionFromContext(ctx context.Context, pluginCtx backend.PluginContext, region string) (*session.Session, error) {
+	instance, err := e.getInstance(ctx, pluginCtx)
+	if err != nil {
+		return nil, err
+	}
+
+	return instance.newSession(region)
+}
+
 func (e *cloudWatchExecutor) getInstance(ctx context.Context, pluginCtx backend.PluginContext) (*DataSource, error) {
 	i, err := e.im.Get(ctx, pluginCtx)
 	if err != nil {
@@ -293,7 +362,7 @@ func (e *cloudWatchExecutor) getInstance(ctx context.Context, pluginCtx backend.
 }
 
 func (e *cloudWatchExecutor) getCWClient(ctx context.Context, pluginCtx backend.PluginContext, region string) (cloudwatchiface.CloudWatchAPI, error) {
-	sess, err := e.newSession(ctx, pluginCtx, region)
+	sess, err := e.newSessionFromContext(ctx, pluginCtx, region)
 	if err != nil {
 		return nil, err
 	}
@@ -301,7 +370,7 @@ func (e *cloudWatchExecutor) getCWClient(ctx context.Context, pluginCtx backend.
 }
 
 func (e *cloudWatchExecutor) getCWLogsClient(ctx context.Context, pluginCtx backend.PluginContext, region string) (cloudwatchlogsiface.CloudWatchLogsAPI, error) {
-	sess, err := e.newSession(ctx, pluginCtx, region)
+	sess, err := e.newSessionFromContext(ctx, pluginCtx, region)
 	if err != nil {
 		return nil, err
 	}
@@ -312,7 +381,7 @@ func (e *cloudWatchExecutor) getCWLogsClient(ctx context.Context, pluginCtx back
 }
 
 func (e *cloudWatchExecutor) getEC2Client(ctx context.Context, pluginCtx backend.PluginContext, region string) (models.EC2APIProvider, error) {
-	sess, err := e.newSession(ctx, pluginCtx, region)
+	sess, err := e.newSessionFromContext(ctx, pluginCtx, region)
 	if err != nil {
 		return nil, err
 	}
@@ -322,7 +391,7 @@ func (e *cloudWatchExecutor) getEC2Client(ctx context.Context, pluginCtx backend
 
 func (e *cloudWatchExecutor) getRGTAClient(ctx context.Context, pluginCtx backend.PluginContext, region string) (resourcegroupstaggingapiiface.ResourceGroupsTaggingAPIAPI,
 	error) {
-	sess, err := e.newSession(ctx, pluginCtx, region)
+	sess, err := e.newSessionFromContext(ctx, pluginCtx, region)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/tsdb/cloudwatch/cloudwatch_integration_test.go b/pkg/tsdb/cloudwatch/cloudwatch_integration_test.go
index 01789cfc95cf8..e9ce1632e2104 100644
--- a/pkg/tsdb/cloudwatch/cloudwatch_integration_test.go
+++ b/pkg/tsdb/cloudwatch/cloudwatch_integration_test.go
@@ -16,8 +16,7 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/mocks"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
@@ -55,16 +54,8 @@ func Test_CloudWatch_CallResource_Integration_Test(t *testing.T) {
 		return &api
 	}
 
-	im := datasource.NewInstanceManager((func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		return DataSource{Settings: models.CloudWatchSettings{
-			AWSDatasourceSettings: awsds.AWSDatasourceSettings{
-				Region: "us-east-1",
-			},
-		}}, nil
-	}))
-
 	t.Run("Should handle dimension value request and return values from the api", func(t *testing.T) {
-		pageLimit := 100
+		im := testInstanceManager(100)
 		api = mocks.FakeMetricsAPI{Metrics: []*cloudwatch.Metric{
 			{MetricName: aws.String("Test_MetricName1"), Dimensions: []*cloudwatch.Dimension{{Name: aws.String("Test_DimensionName1"), Value: aws.String("Value1")}, {Name: aws.String("Test_DimensionName2"), Value: aws.String("Value2")}}},
 			{MetricName: aws.String("Test_MetricName2"), Dimensions: []*cloudwatch.Dimension{{Name: aws.String("Test_DimensionName1"), Value: aws.String("Value3")}}},
@@ -77,7 +68,7 @@ func Test_CloudWatch_CallResource_Integration_Test(t *testing.T) {
 			{MetricName: aws.String("Test_MetricName8"), Dimensions: []*cloudwatch.Dimension{{Name: aws.String("Test_DimensionName4"), Value: aws.String("Value1")}}},
 			{MetricName: aws.String("Test_MetricName9"), Dimensions: []*cloudwatch.Dimension{{Name: aws.String("Test_DimensionName1"), Value: aws.String("Value2")}}},
 		}, MetricsPerPage: 100}
-		executor := newExecutor(im, &setting.Cfg{AWSListMetricsPageLimit: pageLimit}, &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 
 		req := &backend.CallResourceRequest{
 			Method: "GET",
@@ -100,7 +91,7 @@ func Test_CloudWatch_CallResource_Integration_Test(t *testing.T) {
 	})
 
 	t.Run("Should handle dimension key filter query and return keys from the api", func(t *testing.T) {
-		pageLimit := 3
+		im := testInstanceManager(3)
 		api = mocks.FakeMetricsAPI{Metrics: []*cloudwatch.Metric{
 			{MetricName: aws.String("Test_MetricName1"), Dimensions: []*cloudwatch.Dimension{{Name: aws.String("Test_DimensionName1")}, {Name: aws.String("Test_DimensionName2")}}},
 			{MetricName: aws.String("Test_MetricName2"), Dimensions: []*cloudwatch.Dimension{{Name: aws.String("Test_DimensionName1")}}},
@@ -113,7 +104,7 @@ func Test_CloudWatch_CallResource_Integration_Test(t *testing.T) {
 			{MetricName: aws.String("Test_MetricName8"), Dimensions: []*cloudwatch.Dimension{{Name: aws.String("Test_DimensionName4")}}},
 			{MetricName: aws.String("Test_MetricName9"), Dimensions: []*cloudwatch.Dimension{{Name: aws.String("Test_DimensionName1")}}},
 		}, MetricsPerPage: 2}
-		executor := newExecutor(im, &setting.Cfg{AWSListMetricsPageLimit: pageLimit}, &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 
 		req := &backend.CallResourceRequest{
 			Method: "GET",
@@ -136,8 +127,9 @@ func Test_CloudWatch_CallResource_Integration_Test(t *testing.T) {
 	})
 
 	t.Run("Should handle standard dimension key query and return hard coded keys", func(t *testing.T) {
+		im := defaultTestInstanceManager()
 		api = mocks.FakeMetricsAPI{}
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 
 		req := &backend.CallResourceRequest{
 			Method: "GET",
@@ -160,8 +152,9 @@ func Test_CloudWatch_CallResource_Integration_Test(t *testing.T) {
 	})
 
 	t.Run("Should handle custom namespace dimension key query and return hard coded keys", func(t *testing.T) {
+		im := defaultTestInstanceManager()
 		api = mocks.FakeMetricsAPI{}
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 
 		req := &backend.CallResourceRequest{
 			Method: "GET",
@@ -184,7 +177,7 @@ func Test_CloudWatch_CallResource_Integration_Test(t *testing.T) {
 	})
 
 	t.Run("Should handle custom namespace metrics query and return metrics from api", func(t *testing.T) {
-		pageLimit := 3
+		im := testInstanceManager(3)
 		api = mocks.FakeMetricsAPI{Metrics: []*cloudwatch.Metric{
 			{MetricName: aws.String("Test_MetricName1"), Namespace: aws.String("AWS/EC2"), Dimensions: []*cloudwatch.Dimension{{Name: aws.String("Test_DimensionName1")}, {Name: aws.String("Test_DimensionName2")}}},
 			{MetricName: aws.String("Test_MetricName2"), Namespace: aws.String("AWS/EC2"), Dimensions: []*cloudwatch.Dimension{{Name: aws.String("Test_DimensionName1")}}},
@@ -197,7 +190,7 @@ func Test_CloudWatch_CallResource_Integration_Test(t *testing.T) {
 			{MetricName: aws.String("Test_MetricName8"), Namespace: aws.String("AWS/EC2"), Dimensions: []*cloudwatch.Dimension{{Name: aws.String("Test_DimensionName4")}}},
 			{MetricName: aws.String("Test_MetricName9"), Namespace: aws.String("AWS/EC2"), Dimensions: []*cloudwatch.Dimension{{Name: aws.String("Test_DimensionName1")}}},
 		}, MetricsPerPage: 2}
-		executor := newExecutor(im, &setting.Cfg{AWSListMetricsPageLimit: pageLimit}, &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 
 		req := &backend.CallResourceRequest{
 			Method: "GET",
@@ -220,8 +213,9 @@ func Test_CloudWatch_CallResource_Integration_Test(t *testing.T) {
 	})
 
 	t.Run("Should handle log group fields request", func(t *testing.T) {
+		im := defaultTestInstanceManager()
 		logApi = mocks.LogsAPI{}
-		logApi.On("GetLogGroupFields", mock.Anything).Return(&cloudwatchlogs.GetLogGroupFieldsOutput{
+		logApi.On("GetLogGroupFieldsWithContext", mock.Anything).Return(&cloudwatchlogs.GetLogGroupFieldsOutput{
 			LogGroupFields: []*cloudwatchlogs.LogGroupField{
 				{
 					Name:    aws.String("field1"),
@@ -233,7 +227,7 @@ func Test_CloudWatch_CallResource_Integration_Test(t *testing.T) {
 				},
 			},
 		}, nil)
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 
 		req := &backend.CallResourceRequest{
 			Method: "GET",
@@ -254,7 +248,8 @@ func Test_CloudWatch_CallResource_Integration_Test(t *testing.T) {
 	})
 
 	t.Run("Should handle region requests and return regions from the api", func(t *testing.T) {
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures(featuremgmt.FlagCloudwatchNewRegionsHandler, true))
+		im := defaultTestInstanceManager()
+		executor := newExecutor(im, log.NewNullLogger())
 		req := &backend.CallResourceRequest{
 			Method: "GET",
 			Path:   `/regions`,
@@ -272,33 +267,15 @@ func Test_CloudWatch_CallResource_Integration_Test(t *testing.T) {
 		assert.Contains(t, string(sent.Body), `"name":"us-east-1"`)
 	})
 
-	t.Run("Should handle legacy region requests and feature toggle is turned off", func(t *testing.T) {
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures(featuremgmt.FlagCloudwatchNewRegionsHandler, false))
-		req := &backend.CallResourceRequest{
-			Method: "GET",
-			Path:   `/regions`,
-			PluginContext: backend.PluginContext{
-				DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{ID: 0},
-				PluginID:                   "cloudwatch",
-			},
-		}
-		err := executor.CallResource(context.Background(), req, sender)
-		require.NoError(t, err)
-		sent := sender.Response
-		require.NotNil(t, sent)
-		require.Equal(t, http.StatusOK, sent.Status)
-		require.Nil(t, err)
-		assert.Contains(t, string(sent.Body), `"text":"us-east-1"`)
-	})
-
 	t.Run("Should error for any request when a default region is not selected", func(t *testing.T) {
 		imWithoutDefaultRegion := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
 			return DataSource{Settings: models.CloudWatchSettings{
 				AWSDatasourceSettings: awsds.AWSDatasourceSettings{},
+				GrafanaSettings:       awsds.AuthSettings{ListMetricsPageLimit: 1000},
 			}}, nil
 		})
 
-		executor := newExecutor(imWithoutDefaultRegion, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures(featuremgmt.FlagCloudwatchNewRegionsHandler, false))
+		executor := newExecutor(imWithoutDefaultRegion, log.NewNullLogger())
 		req := &backend.CallResourceRequest{
 			Method: "GET",
 			Path:   `/regions`,
@@ -313,6 +290,6 @@ func Test_CloudWatch_CallResource_Integration_Test(t *testing.T) {
 		require.NotNil(t, sent)
 		require.Equal(t, http.StatusBadRequest, sent.Status)
 		require.Nil(t, err)
-		assert.Contains(t, string(sent.Body), "unexpected error missing default region")
+		assert.Contains(t, string(sent.Body), "missing default region")
 	})
 }
diff --git a/pkg/tsdb/cloudwatch/cloudwatch_test.go b/pkg/tsdb/cloudwatch/cloudwatch_test.go
index 7f05039d6dc11..c2287c279c50e 100644
--- a/pkg/tsdb/cloudwatch/cloudwatch_test.go
+++ b/pkg/tsdb/cloudwatch/cloudwatch_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"testing"
+	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
 	awsclient "github.com/aws/aws-sdk-go/aws/client"
@@ -14,9 +15,11 @@ import (
 	"github.com/grafana/grafana-aws-sdk/pkg/awsds"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
-	"github.com/grafana/grafana/pkg/infra/httpclient"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/proxy"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/features"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/mocks"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/utils"
@@ -26,9 +29,11 @@ import (
 )
 
 func TestNewInstanceSettings(t *testing.T) {
+	ctxDuration := 10 * time.Minute
 	tests := []struct {
 		name       string
 		settings   backend.DataSourceInstanceSettings
+		settingCtx context.Context
 		expectedDS DataSource
 		Err        require.ErrorAssertionFunc
 	}{
@@ -49,6 +54,14 @@ func TestNewInstanceSettings(t *testing.T) {
 					"secretKey": "secret",
 				},
 			},
+			settingCtx: backend.WithGrafanaConfig(context.Background(), backend.NewGrafanaCfg(map[string]string{
+				awsds.AllowedAuthProvidersEnvVarKeyName:  "foo , bar,baz",
+				awsds.AssumeRoleEnabledEnvVarKeyName:     "false",
+				awsds.SessionDurationEnvVarKeyName:       "10m",
+				awsds.GrafanaAssumeRoleExternalIdKeyName: "mock_id",
+				awsds.ListMetricsPageLimitKeyName:        "50",
+				proxy.PluginSecureSocksProxyEnabled:      "true",
+			})),
 			expectedDS: DataSource{
 				Settings: models.CloudWatchSettings{
 					AWSDatasourceSettings: awsds.AWSDatasourceSettings{
@@ -62,6 +75,14 @@ func TestNewInstanceSettings(t *testing.T) {
 						SecretKey:     "secret",
 					},
 					Namespace: "ns",
+					GrafanaSettings: awsds.AuthSettings{
+						AllowedAuthProviders:      []string{"foo", "bar", "baz"},
+						AssumeRoleEnabled:         false,
+						SessionDuration:           &ctxDuration,
+						ExternalID:                "mock_id",
+						ListMetricsPageLimit:      50,
+						SecureSocksDSProxyEnabled: true,
+					},
 				},
 			},
 			Err: require.NoError,
@@ -71,8 +92,9 @@ func TestNewInstanceSettings(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			f := NewInstanceSettings(httpclient.NewProvider())
-			model, err := f(context.Background(), tt.settings)
+			model, err := f(tt.settingCtx, tt.settings)
 			tt.Err(t, err)
+			assert.Equal(t, tt.expectedDS.Settings.GrafanaSettings, model.(DataSource).Settings.GrafanaSettings)
 			datasourceComparer := cmp.Comparer(func(d1 DataSource, d2 DataSource) bool {
 				return d1.Settings.Profile == d2.Settings.Profile &&
 					d1.Settings.Region == d2.Settings.Region &&
@@ -109,17 +131,11 @@ func Test_CheckHealth(t *testing.T) {
 	NewLogsAPI = func(sess *session.Session) models.CloudWatchLogsAPIProvider {
 		return client
 	}
-	im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		return DataSource{Settings: models.CloudWatchSettings{
-			AWSDatasourceSettings: awsds.AWSDatasourceSettings{
-				Region: "us-east-1",
-			},
-		}}, nil
-	})
+	im := defaultTestInstanceManager()
 
 	t.Run("successfully query metrics and logs", func(t *testing.T) {
 		client = fakeCheckHealthClient{}
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 
 		resp, err := executor.CheckHealth(context.Background(), &backend.CheckHealthRequest{
 			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
@@ -138,7 +154,7 @@ func Test_CheckHealth(t *testing.T) {
 				return nil, fmt.Errorf("some logs query error")
 			}}
 
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 
 		resp, err := executor.CheckHealth(context.Background(), &backend.CheckHealthRequest{
 			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
@@ -157,7 +173,7 @@ func Test_CheckHealth(t *testing.T) {
 				return fmt.Errorf("some list metrics error")
 			}}
 
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 
 		resp, err := executor.CheckHealth(context.Background(), &backend.CheckHealthRequest{
 			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
@@ -172,10 +188,16 @@ func Test_CheckHealth(t *testing.T) {
 
 	t.Run("fail to get clients", func(t *testing.T) {
 		client = fakeCheckHealthClient{}
+		im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+			return DataSource{
+				Settings: models.CloudWatchSettings{AWSDatasourceSettings: awsds.AWSDatasourceSettings{Region: "us-east-1"}},
+				sessions: &fakeSessionCache{getSession: func(c awsds.SessionConfig) (*session.Session, error) {
+					return nil, fmt.Errorf("some sessions error")
+				}},
+			}, nil
+		})
 
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{getSession: func(c awsds.SessionConfig) (*session.Session, error) {
-			return nil, fmt.Errorf("some sessions error")
-		}}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 
 		resp, err := executor.CheckHealth(context.Background(), &backend.CheckHealthRequest{
 			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
@@ -189,6 +211,40 @@ func Test_CheckHealth(t *testing.T) {
 	})
 }
 
+func TestNewSession_passes_authSettings(t *testing.T) {
+	ctxDuration := 15 * time.Minute
+	expectedSettings := awsds.AuthSettings{
+		AllowedAuthProviders:      []string{"foo", "bar", "baz"},
+		AssumeRoleEnabled:         false,
+		SessionDuration:           &ctxDuration,
+		ExternalID:                "mock_id",
+		ListMetricsPageLimit:      50,
+		SecureSocksDSProxyEnabled: true,
+	}
+	im := datasource.NewInstanceManager((func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+		return DataSource{
+			Settings: models.CloudWatchSettings{
+				AWSDatasourceSettings: awsds.AWSDatasourceSettings{
+					Region: "us-east-1",
+				},
+				GrafanaSettings: expectedSettings,
+			},
+			sessions: &fakeSessionCache{getSession: func(c awsds.SessionConfig) (*session.Session, error) {
+				assert.NotNil(t, c.AuthSettings)
+				assert.Equal(t, expectedSettings, *c.AuthSettings)
+				return &session.Session{
+					Config: &aws.Config{},
+				}, nil
+			}},
+		}, nil
+	}))
+	executor := newExecutor(im, log.NewNullLogger())
+
+	_, err := executor.newSessionFromContext(context.Background(),
+		backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}}, "us-east-1")
+	require.NoError(t, err)
+}
+
 func TestQuery_ResourceRequest_DescribeLogGroups_with_CrossAccountQuerying(t *testing.T) {
 	sender := &mockedCallResourceResponseSenderForOauth{}
 	origNewMetricsAPI := NewMetricsAPI
@@ -210,17 +266,11 @@ func TestQuery_ResourceRequest_DescribeLogGroups_with_CrossAccountQuerying(t *te
 		return &logsApi
 	}
 
-	im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		return DataSource{Settings: models.CloudWatchSettings{
-			AWSDatasourceSettings: awsds.AWSDatasourceSettings{
-				Region: "us-east-1",
-			},
-		}}, nil
-	})
+	im := defaultTestInstanceManager()
 
 	t.Run("maps log group api response to resource response of log-groups", func(t *testing.T) {
 		logsApi = mocks.LogsAPI{}
-		logsApi.On("DescribeLogGroups", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{
+		logsApi.On("DescribeLogGroupsWithContext", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{
 			LogGroups: []*cloudwatchlogs.LogGroup{
 				{Arn: aws.String("arn:aws:logs:us-east-1:111:log-group:group_a"), LogGroupName: aws.String("group_a")},
 			},
@@ -234,8 +284,8 @@ func TestQuery_ResourceRequest_DescribeLogGroups_with_CrossAccountQuerying(t *te
 			},
 		}
 
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures(featuremgmt.FlagCloudWatchCrossAccountQuerying))
-		err := executor.CallResource(context.Background(), req, sender)
+		executor := newExecutor(im, log.NewNullLogger())
+		err := executor.CallResource(contextWithFeaturesEnabled(features.FlagCloudWatchCrossAccountQuerying), req, sender)
 		assert.NoError(t, err)
 
 		assert.JSONEq(t, `[
@@ -248,7 +298,7 @@ func TestQuery_ResourceRequest_DescribeLogGroups_with_CrossAccountQuerying(t *te
 		   }
 		]`, string(sender.Response.Body))
 
-		logsApi.AssertCalled(t, "DescribeLogGroups",
+		logsApi.AssertCalled(t, "DescribeLogGroupsWithContext",
 			&cloudwatchlogs.DescribeLogGroupsInput{
 				AccountIdentifiers:    []*string{utils.Pointer("some-account-id")},
 				IncludeLinkedAccounts: utils.Pointer(true),
diff --git a/pkg/tsdb/cloudwatch/constants/metrics.go b/pkg/tsdb/cloudwatch/constants/metrics.go
index dd6379a510231..8f57d18e07cd4 100644
--- a/pkg/tsdb/cloudwatch/constants/metrics.go
+++ b/pkg/tsdb/cloudwatch/constants/metrics.go
@@ -7,10 +7,11 @@ var NamespaceMetricsMap = map[string][]string{
 	"AWS/AppFlow":                 {"FlowExecutionsStarted", "FlowExecutionsFailed", "FlowExecutionsSucceeded", "FlowExecutionTime", "FlowExecutionRecordsProcessed"},
 	"AWS/AppRunner":               {"2xxStatusResponses", "4xxStatusResponses", "5xxStatusResponses", "ActiveInstances", "CPUUtilization", "MemoryUtilization", "Requests", "RequestLatency"},
 	"AWS/AppStream":               {"ActualCapacity", "AvailableCapacity", "CapacityUtilization", "DesiredCapacity", "InUseCapacity", "InsufficientCapacityError", "PendingCapacity", "RunningCapacity"},
-	"AWS/AppSync":                 {"4XXError", "5XXError", "Latency", "ActiveConnections", "ActiveSubscriptions", "ConnectClientError", "ConnectionDuration", "ConnectServerError", "ConnectSuccess", "DisconnectClientError", "DisconnectServerError", "DisconnectSuccess", "PublishDataMessageClientError", "PublishDataMessageServerError", "PublishDataMessageSize", "PublishDataMessageSuccess", "SubscribeClientError", "SubscribeServerError", "SubscribeSuccess", "UnsubscribeClientError", "UnsubscribeServerError", "UnsubscribeSuccess"},
+	"AWS/AppSync":                 {"4XXError", "5XXError", "Latency", "Requests", "TokensConsumed", "ActiveConnections", "ActiveSubscriptions", "ConnectClientError", "ConnectionDuration", "ConnectServerError", "ConnectSuccess", "DisconnectClientError", "DisconnectServerError", "DisconnectSuccess", "PublishDataMessageClientError", "PublishDataMessageServerError", "PublishDataMessageSize", "PublishDataMessageSuccess", "SubscribeClientError", "SubscribeServerError", "SubscribeSuccess", "UnsubscribeClientError", "UnsubscribeServerError", "UnsubscribeSuccess"},
 	"AWS/ApplicationELB":          {"ActiveConnectionCount", "ClientTLSNegotiationErrorCount", "ConsumedLCUs", "DesyncMitigationMode_NonCompliant_Request_Count", "DroppedInvalidHeaderRequestCount", "ELBAuthError", "ELBAuthFailure", "ELBAuthLatency", "ELBAuthRefreshTokenSuccess", "ELBAuthSuccess", "ELBAuthUserClaimsSizeExceeded", "ForwardedInvalidHeaderRequestCount", "GrpcRequestCount", "HTTPCode_ELB_3XX_Count", "HTTPCode_ELB_4XX_Count", "HTTPCode_ELB_5XX_Count", "HTTPCode_ELB_500_Count", "HTTPCode_ELB_502_Count", "HTTPCode_ELB_503_Count", "HTTPCode_ELB_504_Count", "HTTPCode_Target_2XX_Count", "HTTPCode_Target_3XX_Count", "HTTPCode_Target_4XX_Count", "HTTPCode_Target_5XX_Count", "HTTP_Fixed_Response_Count", "HTTP_Redirect_Count", "HTTP_Redirect_Url_Limit_Exceeded_Count", "HealthyHostCount", "IPv6ProcessedBytes", "IPv6RequestCount", "LambdaInternalError", "LambdaTargetProcessedBytes", "LambdaUserError", "NewConnectionCount", "NonStickyRequestCount", "ProcessedBytes", "RejectedConnectionCount", "RequestCount", "RequestCountPerTarget", "RuleEvaluations", "StandardProcessedBytes", "TargetConnectionErrorCount", "TargetResponseTime", "TargetTLSNegotiationErrorCount", "UnHealthyHostCount"},
 	"AWS/Athena":                  {"EngineExecutionTime", "QueryPlanningTime", "QueryQueueTime", "ProcessedBytes", "ServiceProcessingTime", "TotalExecutionTime"},
-	"AWS/AutoScaling":             {"GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"},
+	"AWS/AutoScaling":             {"GroupAndWarmPoolDesiredCapacity", "GroupAndWarmPoolTotalCapacity", "GroupDesiredCapacity", "GroupInServiceCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingCapacity", "GroupPendingInstances", "GroupStandbyCapacity", "GroupStandbyInstances", "GroupTerminatingCapacity", "GroupTerminatingInstances", "GroupTotalCapacity", "GroupTotalInstances", "PredictiveScalingCapacityForecast", "PredictiveScalingLoadForecast", "PredictiveScalingMetricPairCorrelation", "WarmPoolDesiredCapacity", "WarmPoolMinSize", "WarmPoolPendingCapacity", "WarmPoolTerminatingCapacity", "WarmPoolTotalCapacity", "WarmPoolWarmedCapacity"},
+	"AWS/Bedrock":                 {"Invocations", "InvocationLatency", "InvocationClientErrors", "InvocationServerErrors", "InvocationThrottles", "InputTokenCount", "OutputImageCount", "OutputTokenCount"},
 	"AWS/Billing":                 {"EstimatedCharges"},
 	"AWS/Backup":                  {"NumberOfBackupJobsAborted", "NumberOfBackupJobsCompleted", "NumberOfBackupJobsCreated", "NumberOfBackupJobsExpired", "NumberOfBackupJobsFailed", "NumberOfBackupJobsPending", "NumberOfBackupJobsRunning", "NumberOfCopyJobsCompleted", "NumberOfCopyJobsCreated", "NumberOfCopyJobsFailed", "NumberOfCopyJobsRunning", "NumberOfRecoveryPointsCold", "NumberOfRecoveryPointsCompleted", "NumberOfRecoveryPointsDeleting", "NumberOfRecoveryPointsExpired", "NumberOfRecoveryPointsPartial", "NumberOfRestoreJobsCompleted", "NumberOfRestoreJobsFailed", "NumberOfRestoreJobsPending", "NumberOfRestoreJobsRunning"},
 	"AWS/CertificateManager":      {"DaysToExpiry"},
@@ -32,7 +33,7 @@ var NamespaceMetricsMap = map[string][]string{
 	"AWS/DAX":                     {"CPUUtilization", "NetworkPacketsIn", "NetworkPacketsOut", "GetItemRequestCount", "BatchGetItemRequestCount", "BatchWriteItemRequestCount", "DeleteItemRequestCount", "PutItemRequestCount", "UpdateItemRequestCount", "TransactWriteItemsCount", "TransactGetItemsCount", "ItemCacheHits", "ItemCacheMisses", "QueryCacheHits", "QueryCacheMisses", "ScanCacheHits", "ScanCacheMisses", "TotalRequestCount", "ErrorRequestCount", "FaultRequestCount", "FailedRequestCount", "QueryRequestCount", "ScanRequestCount", "ClientConnections", "EstimatedDbSize", "EvictedSize"},
 	"AWS/DynamoDB":                {"AccountMaxReads", "AccountMaxTableLevelReads", "AccountMaxTableLevelWrites", "AccountMaxWrites", "AccountProvisionedReadCapacityUtilization", "AccountProvisionedWriteCapacityUtilization", "AgeOfOldestUnreplicatedRecord", "ConditionalCheckFailedRequests", "ConsumedChangeDataCaptureUnits", "ConsumedReadCapacityUnits", "ConsumedWriteCapacityUnits", "FailedToReplicateRecordCount", "MaxProvisionedTableReadCapacityUtilization", "MaxProvisionedTableWriteCapacityUtilization", "OnlineIndexConsumedWriteCapacity", "OnlineIndexPercentageProgress", "OnlineIndexThrottleEvents", "PendingReplicationCount", "ProvisionedReadCapacityUnits", "ProvisionedWriteCapacityUnits", "ReadThrottleEvents", "ReplicationLatency", "ReturnedBytes", "ReturnedItemCount", "ReturnedRecordsCount", "SuccessfulRequestLatency", "SystemErrors", "TimeToLiveDeletedItemCount", "ThrottledPutRecordCount", "ThrottledRequests", "TransactionConflict", "UserErrors", "WriteThrottleEvents"},
 	"AWS/EBS":                     {"BurstBalance", "VolumeConsumedReadWriteOps", "VolumeIdleTime", "VolumeQueueLength", "VolumeReadBytes", "VolumeReadOps", "VolumeThroughputPercentage", "VolumeTotalReadTime", "VolumeTotalWriteTime", "VolumeWriteBytes", "VolumeWriteOps"},
-	"AWS/EC2":                     {"CPUCreditBalance", "CPUCreditUsage", "CPUSurplusCreditBalance", "CPUSurplusCreditsCharged", "CPUUtilization", "DiskReadBytes", "DiskReadOps", "DiskWriteBytes", "DiskWriteOps", "EBSByteBalance%", "EBSIOBalance%", "EBSReadBytes", "EBSReadOps", "EBSWriteBytes", "EBSWriteOps", "MetadataNoToken", "NetworkIn", "NetworkOut", "NetworkPacketsIn", "NetworkPacketsOut", "StatusCheckFailed", "StatusCheckFailed_Instance", "StatusCheckFailed_System"},
+	"AWS/EC2":                     {"CPUCreditBalance", "CPUCreditUsage", "CPUSurplusCreditBalance", "CPUSurplusCreditsCharged", "CPUUtilization", "DedicatedHostCPUUtilization", "DiskReadBytes", "DiskReadOps", "DiskWriteBytes", "DiskWriteOps", "EBSByteBalance%", "EBSIOBalance%", "EBSReadBytes", "EBSReadOps", "EBSWriteBytes", "EBSWriteOps", "MetadataNoToken", "NetworkIn", "NetworkOut", "NetworkPacketsIn", "NetworkPacketsOut", "StatusCheckFailed", "StatusCheckFailed_AttachedEBS", "StatusCheckFailed_Instance", "StatusCheckFailed_System"},
 	"AWS/ElasticGPUs":             {"GPUConnectivityCheckFailed", "GPUHealthCheckFailed", "GPUMemoryUtilization"},
 	"AWS/EC2/API":                 {"ClientErrors", "RequestLimitExceeded", "ServerErrors", "SuccessfulCalls"},
 	"AWS/EC2CapacityReservations": {"AvailableInstanceCount", "InstanceUtilization", "TotalInstanceCount", "UsedInstanceCount"},
@@ -41,7 +42,10 @@ var NamespaceMetricsMap = map[string][]string{
 	"AWS/EFS":                     {"BurstCreditBalance", "ClientConnections", "DataReadIOBytes", "DataWriteIOBytes", "MetadataIOBytes", "PercentIOLimit", "PermittedThroughput", "TotalIOBytes", "StorageBytes", "MeteredIOBytes"},
 	"AWS/ELB":                     {"BackendConnectionErrors", "EstimatedALBActiveConnectionCount", "EstimatedALBConsumedLCUs", "EstimatedALBNewConnectionCount", "EstimatedProcessedBytes", "HTTPCode_Backend_2XX", "HTTPCode_Backend_3XX", "HTTPCode_Backend_4XX", "HTTPCode_Backend_5XX", "HTTPCode_ELB_4XX", "HTTPCode_ELB_5XX", "HealthyHostCount", "Latency", "RequestCount", "SpilloverCount", "SurgeQueueLength", "UnHealthyHostCount"},
 	"AWS/ES": {
-		"2xx, 3xx, 4xx, 5xx",
+		"2xx",
+		"3xx",
+		"4xx",
+		"5xx",
 		"ADAnomalyDetectorsIndexStatus.red",
 		"ADAnomalyDetectorsIndexStatusIndexExists",
 		"ADAnomalyResultsIndexStatus.red",
@@ -70,13 +74,21 @@ var NamespaceMetricsMap = map[string][]string{
 		"AsynchronousSearchPersistRate",
 		"AsynchronousSearchRejected",
 		"AsynchronousSearchRunningCurrent",
+		"AsynchronousSearchStoredResponseCount",
 		"AsynchronousSearchStoreHealth",
 		"AsynchronousSearchStoreSize",
-		"AsynchronousSearchStoredResponseCount",
 		"AsynchronousSearchSubmissionRate",
+		"AutoFollowLeaderCallFailure",
+		"AutoFollowNumFailedStartReplication",
+		"AutoFollowNumSuccessStartReplication",
 		"AutomatedSnapshotFailure",
-		"CPUCreditBalance",
-		"CPUUtilization",
+		"AutoTuneChangesHistoryHeapSize",
+		"AutoTuneChangesHistoryJVMYoungGenArgs",
+		"AutoTuneFailed",
+		"AutoTuneSucceeded",
+		"AutoTuneValue",
+		"AvgPointInTimeAliveTime",
+		"BurstBalance",
 		"ClusterIndexWritesBlocked",
 		"ClusterStatus.green",
 		"ClusterStatus.red",
@@ -88,13 +100,30 @@ var NamespaceMetricsMap = map[string][]string{
 		"ColdToWarmMigrationQueueSize",
 		"ColdToWarmMigrationSuccessCount",
 		"CoordinatingWriteRejected",
+		"CPUCreditBalance",
+		"CPUUtilization",
+		"CrossClusterInboundReplicationRequests",
 		"CrossClusterInboundRequests",
 		"CrossClusterOutboundConnections",
+		"CrossClusterOutboundReplicationRequests",
 		"CrossClusterOutboundRequests",
+		"CurrentPointInTime",
+		"DataNodes",
+		"DataNodesShards.active",
+		"DataNodesShards.initializing",
+		"DataNodesShards.relocating",
+		"DataNodesShards.unassigned",
 		"DeletedDocuments",
 		"DiskQueueDepth",
+		"ElasticsearchRequests",
+		"ESReportingFailedRequestSysErrCount",
+		"ESReportingFailedRequestUserErrCount",
+		"ESReportingRequestCount",
+		"ESReportingSuccessCount",
 		"FollowerCheckPoint",
 		"FreeStorageSpace",
+		"HasActivePointInTime",
+		"HasUsedPointInTime",
 		"HotStorageSpaceUtilization",
 		"HotToWarmMigrationFailureCount",
 		"HotToWarmMigrationForceMergeLatency",
@@ -106,11 +135,24 @@ var NamespaceMetricsMap = map[string][]string{
 		"IndexingLatency",
 		"IndexingRate",
 		"InvalidHostHeaderRequests",
+		"IopsThrottle",
 		"JVMGCOldCollectionCount",
 		"JVMGCOldCollectionTime",
 		"JVMGCYoungCollectionCount",
 		"JVMGCYoungCollectionTime",
 		"JVMMemoryPressure",
+		"KibanaConcurrentConnections",
+		"KibanaHealthyNodes",
+		"KibanaHeapTotal",
+		"KibanaHeapUsed",
+		"KibanaHeapUtilization",
+		"KibanaOS1MinuteLoad",
+		"KibanaReportingFailedRequestSysErrCount",
+		"KibanaReportingFailedRequestUserErrCount",
+		"KibanaReportingRequestCount",
+		"KibanaReportingSuccessCount",
+		"KibanaRequestTotal",
+		"KibanaResponseTimesMaxInMillis",
 		"KMSKeyError",
 		"KMSKeyInaccessible",
 		"KNNCacheCapacityReached",
@@ -131,10 +173,7 @@ var NamespaceMetricsMap = map[string][]string{
 		"KNNScriptQueryErrors",
 		"KNNScriptQueryRequests",
 		"KNNTotalLoadTime",
-		"KibanaReportingFailedRequestSysErrCount",
-		"KibanaReportingFailedRequestUserErrCount",
-		"KibanaReportingRequestCount",
-		"KibanaReportingSuccessCount",
+		"LeaderCheckPoint",
 		"LTRFeatureMemoryUsageInBytes",
 		"LTRFeaturesetMemoryUsageInBytes",
 		"LTRMemoryUsage",
@@ -142,14 +181,16 @@ var NamespaceMetricsMap = map[string][]string{
 		"LTRRequestErrorCount",
 		"LTRRequestTotalCount",
 		"LTRStatus.red",
-		"LeaderCheckPoint",
 		"MasterCPUCreditBalance",
 		"MasterCPUUtilization",
 		"MasterFreeStorageSpace",
 		"MasterJVMMemoryPressure",
+		"MasterOldGenJVMMemoryPressure",
 		"MasterReachableFromNode",
 		"MasterSysMemoryUtilization",
+		"MaxProvisionedThroughput",
 		"Nodes",
+		"OldGenJVMMemoryPressure",
 		"OpenSearchDashboardsConcurrentConnections",
 		"OpenSearchDashboardsHealthyNode",
 		"OpenSearchDashboardsHealthyNodes",
@@ -157,6 +198,10 @@ var NamespaceMetricsMap = map[string][]string{
 		"OpenSearchDashboardsHeapUsed",
 		"OpenSearchDashboardsHeapUtilization",
 		"OpenSearchDashboardsOS1MinuteLoad",
+		"OpensearchDashboardsReportingFailedRequestSysErrCount",
+		"OpensearchDashboardsReportingFailedRequestUserErrCount",
+		"OpensearchDashboardsReportingRequestCount",
+		"OpensearchDashboardsReportingSuccessCount",
 		"OpenSearchDashboardsRequestTotal",
 		"OpenSearchDashboardsResponseTimesMaxInMillis",
 		"OpenSearchRequests",
@@ -165,18 +210,23 @@ var NamespaceMetricsMap = map[string][]string{
 		"PPLRequestCount",
 		"PrimaryWriteRejected",
 		"ReadIOPS",
+		"ReadIOPSMicroBursting",
 		"ReadLatency",
 		"ReadThroughput",
-		"ReplicaWriteRejected",
+		"ReadThroughputMicroBursting",
+		"RemoteStorageUsedSpace",
+		"RemoteStorageWriteRejected",
+		"ReplicationNumBootstrappingIndices",
+		"ReplicationNumFailedIndices",
+		"ReplicationNumPausedIndices",
+		"ReplicationNumSyncingIndices",
 		"ReplicationRate",
-		"SQLDefaultCursorRequestCount",
-		"SQLFailedRequestCountByCusErr",
-		"SQLFailedRequestCountBySysErr",
-		"SQLRequestCount",
-		"SQLUnhealthy",
+		"ReplicaWriteRejected",
+		"SearchableDocuments",
 		"SearchLatency",
 		"SearchRate",
-		"SearchableDocuments",
+		"SearchShardTaskCancelled",
+		"SearchTaskCancelled",
 		"SegmentCount",
 		"Shards.active",
 		"Shards.activePrimary",
@@ -184,6 +234,11 @@ var NamespaceMetricsMap = map[string][]string{
 		"Shards.initializing",
 		"Shards.relocating",
 		"Shards.unassigned",
+		"SQLDefaultCursorRequestCount",
+		"SQLFailedRequestCountByCusErr",
+		"SQLFailedRequestCountBySysErr",
+		"SQLRequestCount",
+		"SQLUnhealthy",
 		"SysMemoryUtilization",
 		"ThreadpoolBulkQueue",
 		"ThreadpoolBulkRejected",
@@ -197,21 +252,24 @@ var NamespaceMetricsMap = map[string][]string{
 		"ThreadpoolSearchQueue",
 		"ThreadpoolSearchRejected",
 		"ThreadpoolSearchThreads",
-		"ThreadpoolWriteQueue",
-		"ThreadpoolWriteRejected",
-		"ThreadpoolWriteThreads",
 		"Threadpoolsql-workerQueue",
 		"Threadpoolsql-workerRejected",
 		"Threadpoolsql-workerThreads",
+		"ThreadpoolWriteQueue",
+		"ThreadpoolWriteRejected",
+		"ThreadpoolWriteThreads",
+		"ThroughputThrottle",
+		"TotalPointInTime",
 		"WarmCPUUtilization",
 		"WarmFreeStorageSpace",
 		"WarmJVMGCOldCollectionCount",
 		"WarmJVMGCYoungCollectionCount",
 		"WarmJVMGCYoungCollectionTime",
 		"WarmJVMMemoryPressure",
+		"WarmOldGenJVMMemoryPressure",
+		"WarmSearchableDocuments",
 		"WarmSearchLatency",
 		"WarmSearchRate",
-		"WarmSearchableDocuments",
 		"WarmStorageSpaceUtilization",
 		"WarmSysMemoryUtilization",
 		"WarmThreadpoolSearchQueue",
@@ -223,8 +281,10 @@ var NamespaceMetricsMap = map[string][]string{
 		"WarmToColdMigrationSuccessCount",
 		"WarmToHotMigrationQueueSize",
 		"WriteIOPS",
+		"WriteIOPSMicroBursting",
 		"WriteLatency",
 		"WriteThroughput",
+		"WriteThroughputMicroBursting",
 	},
 	"AWS/ElastiCache": {
 		"ActiveDefragHits",
@@ -329,203 +389,227 @@ var NamespaceMetricsMap = map[string][]string{
 		"TouchMisses",
 		"UnusedMemory",
 	},
-	"AWS/ElasticBeanstalk":     {"ApplicationLatencyP10", "ApplicationLatencyP50", "ApplicationLatencyP75", "ApplicationLatencyP85", "ApplicationLatencyP90", "ApplicationLatencyP95", "ApplicationLatencyP99", "ApplicationLatencyP99.9", "ApplicationRequests2xx", "ApplicationRequests3xx", "ApplicationRequests4xx", "ApplicationRequests5xx", "ApplicationRequestsTotal", "CPUIdle", "CPUIowait", "CPUIrq", "CPUNice", "CPUSoftirq", "CPUSystem", "CPUUser", "EnvironmentHealth", "InstanceHealth", "InstancesDegraded", "InstancesInfo", "InstancesNoData", "InstancesOk", "InstancesPending", "InstancesSevere", "InstancesUnknown", "InstancesWarning", "LoadAverage1min", "LoadAverage5min", "RootFilesystemUtil"},
-	"AWS/ElasticInference":     {"AcceleratorHealthCheckFailed", "AcceleratorMemoryUsage", "ConnectivityCheckFailed"},
-	"AWS/ElasticMapReduce":     {"AppsCompleted", "AppsFailed", "AppsKilled", "AppsPending", "AppsRunning", "AppsSubmitted", "BackupFailed", "CapacityRemainingGB", "Cluster Status", "ContainerAllocated", "ContainerPending", "ContainerPendingRatio", "ContainerReserved", "CoreNodesPending", "CoreNodesRunning", "CorruptBlocks", "DfsPendingReplicationBlocks", "HBase", "HDFSBytesRead", "HDFSBytesWritten", "HDFSUtilization", "HbaseBackupFailed", "IO", "IsIdle", "JobsFailed", "JobsRunning", "LiveDataNodes", "LiveTaskTrackers", "MRActiveNodes", "MRDecommissionedNodes", "MRLostNodes", "MRRebootedNodes", "MRTotalNodes", "MRUnhealthyNodes", "Map/Reduce", "MapSlotsOpen", "MapTasksRemaining", "MapTasksRunning", "MemoryAllocatedMB", "MemoryAvailableMB", "MemoryReservedMB", "MemoryTotalMB", "MissingBlocks", "MostRecentBackupDuration", "Node Status", "PendingDeletionBlocks", "ReduceSlotsOpen", "ReduceTasksRemaining", "ReduceTasksRunning", "RemainingMapTasksPerSlot", "S3BytesRead", "S3BytesWritten", "TaskNodesPending", "TaskNodesRunning", "TimeSinceLastSuccessfulBackup", "TotalLoad", "UnderReplicatedBlocks", "YARNMemoryAvailablePercentage"},
-	"AWS/ElasticTranscoder":    {"Billed Audio Output", "Billed HD Output", "Billed SD Output", "Errors", "Jobs Completed", "Jobs Errored", "Outputs per Job", "Standby Time", "Throttles"},
-	"AWS/EventBridge/Pipes":    {"Concurrency", "Duration", "EnrichmentStageDuration", "EnrichmentStageFailed", "EventCount", "EventSize", "ExecutionFailed", "ExecutionPartiallyFailed", "ExecutionThrottled", "ExecutionTimeout", "Invocations", "TargetStageDuration", "TargetStageFailed", "TargetStagePartiallyFailed", "TargetStageSkipped"},
-	"AWS/Events":               {"DeadLetterInvocations", "Events", "FailedInvocations", "IngestionToInvocationStartLatency", "Invocations", "InvocationsFailedToBeSentToDlq", "InvocationsSentToDlq", "MatchedEvents", "ThrottledRules", "TriggeredRules"},
-	"AWS/Firehose":             {"ActivePartitionsLimit", "BackupToS3.Bytes", "BackupToS3.DataFreshness", "BackupToS3.Records", "BackupToS3.Success", "DataReadFromKinesisStream.Bytes", "DataReadFromKinesisStream.Records", "DeliveryToElasticsearch.Bytes", "DeliveryToElasticsearch.Records", "DeliveryToElasticsearch.Success", "DeliveryToRedshift.Bytes", "DeliveryToRedshift.Records", "DeliveryToRedshift.Success", "DeliveryToS3.Bytes", "DeliveryToS3.DataFreshness", "DeliveryToS3.ObjectCount", "DeliveryToS3.Records", "DeliveryToS3.Success", "DeliveryToSplunk.Bytes", "DeliveryToSplunk.DataFreshness", "DeliveryToSplunk.Records", "DeliveryToSplunk.Success", "DescribeDeliveryStream.Latency", "DescribeDeliveryStream.Requests", "ExecuteProcessing.Duration", "ExecuteProcessing.Success", "FailedConversion.Bytes", "FailedConversion.Records", "IncomingBytes", "IncomingRecords", "JQProcessing.Duration", "KinesisMillisBehindLatest", "ListDeliveryStreams.Latency", "ListDeliveryStreams.Requests", "PartitionCount", "PartitionCountExceeded", "PerPartitionThroughput", "PutRecord.Bytes", "PutRecord.Latency", "PutRecord.Requests", "PutRecordBatch.Bytes", "PutRecordBatch.Latency", "PutRecordBatch.Records", "PutRecordBatch.Requests", "SucceedConversion.Bytes", "SucceedConversion.Records", "SucceedProcessing.Bytes", "SucceedProcessing.Records", "ThrottledDescribeStream", "ThrottledGetRecords", "ThrottledGetShardIterator", "UpdateDeliveryStream.Latency", "UpdateDeliveryStream.Requests"},
-	"AWS/FSx":                  {"ClientConnections", "CPUUtilization", "DataReadBytes", "DataReadOperations", "DataWriteBytes", "DataWriteOperations", "DeduplicationSavedStorage", "DiskIopsUtilization", "DiskReadBytes", "DiskReadOperations", "DiskThroughputBalance", "DiskThroughputUtilization", "DiskWriteBytes", "DiskWriteOperations", "FileServerDiskIopsBalance", "FileServerDiskIopsUtilization", "FileServerDiskThroughputBalance", "FileServerDiskThroughputUtilization", "FreeDataStorageCapacity", "FreeStorageCapacity", "MemoryUtilization", "MetadataOperations", "NetworkThroughputUtilization", "StorageCapacityUtilization"},
-	"AWS/FraudDetector":        {"GetEventPrediction", "GetEventPrediction4xxError", "GetEventPrediction5xxError", "GetEventPredictionLatency", "ModelInvocation", "ModelInvocationError", "ModelInvocationLatency", "OutcomeReturned", "Prediction", "PredictionError", "PredictionLatency", "RuleEvaluateError", "RuleEvaluateFalse", "RuleEvaluateTrue", "RuleNotEvaluated", "VariableDefaultReturned", "VariableUsed"},
-	"AWS/GameLift":             {"ActivatingGameSessions", "ActiveGameSessions", "ActiveInstances", "ActiveServerProcesses", "AvailableGameSessions", "AverageWaitTime", "CurrentPlayerSessions", "CurrentTickets", "DesiredInstances", "FirstChoiceNotViable", "FirstChoiceOutOfCapacity", "GameSessionInterruptions", "HealthyServerProcesses", "IdleInstances", "InstanceInterruptions", "LowestLatencyPlacement", "LowestPricePlacement", "MatchAcceptancesTimedOut", "MatchesAccepted", "MatchesCreated", "MatchesPlaced", "MatchesRejected", "MaxInstances", "MinInstances", "PercentAvailableGameSessions", "PercentHealthyServerProcesses", "PercentIdleInstances", "Placement", "PlacementsCanceled", "PlacementsFailed", "PlacementsStarted", "PlacementsSucceeded", "PlacementsTimedOut", "PlayerSessionActivations", "PlayersStarted", "QueueDepth", "RuleEvaluationsFailed", "RuleEvaluationsPassed", "ServerProcessAbnormalTerminations", "ServerProcessActivations", "ServerProcessTerminations", "TicketsFailed", "TicketsStarted", "TicketsTimedOut", "TimeToMatch", "TimeToTicketSuccess"},
-	"AWS/GlobalAccelerator":    {"NewFlowCount", "ProcessedBytesIn", "ProcessedBytesOut", "HealthyEndpointCount", "UnhealthyEndpointCount"},
-	"AWS/Glue":                 {"glue.driver.BlockManager.disk.diskSpaceUsed_MB", "glue.driver.ExecutorAllocationManager.executors.numberAllExecutors", "glue.driver.ExecutorAllocationManager.executors.numberMaxNeededExecutors", "glue.driver.aggregate.bytesRead", "glue.driver.aggregate.elapsedTime", "glue.driver.aggregate.numCompletedStages", "glue.driver.aggregate.numCompletedTasks", "glue.driver.aggregate.numFailedTasks", "glue.driver.aggregate.numKilledTasks", "glue.driver.aggregate.recordsRead", "glue.driver.aggregate.shuffleBytesWritten", "glue.driver.aggregate.shuffleLocalBytesRead", "glue.driver.jvm.heap.usage  glue.executorId.jvm.heap.usage  glue.ALL.jvm.heap.usage", "glue.driver.jvm.heap.used  glue.executorId.jvm.heap.used  glue.ALL.jvm.heap.used", "glue.driver.s3.filesystem.read_bytes  glue.executorId.s3.filesystem.read_bytes  glue.ALL.s3.filesystem.read_bytes", "glue.driver.s3.filesystem.write_bytes  glue.executorId.s3.filesystem.write_bytes  glue.ALL.s3.filesystem.write_bytes", "glue.driver.system.cpuSystemLoad  glue.executorId.system.cpuSystemLoad  glue.ALL.system.cpuSystemLoad"},
-	"AWS/GroundStation":        {"BitErrorRate", "BlockErrorRate", "ReceivedPower", "Es/N0"},
-	"AWS/Inspector":            {"TotalAssessmentRunFindings", "TotalAssessmentRuns", "TotalHealthyAgents", "TotalMatchingAgents"},
-	"AWS/IVS":                  {"ConcurrentViews", "ConcurrentStreams", "IngestAudioBitrate", "IngestFramerate", "IngestVideoBitrate", "KeyframeInterval", "LiveDeliveredTime", "LiveInputTime", "RecordedTime"},
-	"AWS/IoT":                  {"CanceledJobExecutionCount", "CanceledJobExecutionTotalCount", "ClientError", "Connect.AuthError", "Connect.ClientError", "Connect.ServerError", "Connect.Success", "Connect.Throttle", "DeleteThingShadow.Accepted", "FailedJobExecutionCount", "FailedJobExecutionTotalCount", "Failure", "GetThingShadow.Accepted", "InProgressJobExecutionCount", "InProgressJobExecutionTotalCount", "NonCompliantResources", "NumLogBatchesFailedToPublishThrottled", "NumLogEventsFailedToPublishThrottled", "ParseError", "Ping.Success", "PublishIn.AuthError", "PublishIn.ClientError", "PublishIn.ServerError", "PublishIn.Success", "PublishIn.Throttle", "PublishOut.AuthError", "PublishOut.ClientError", "PublishOut.Success", "QueuedJobExecutionCount", "QueuedJobExecutionTotalCount", "RejectedJobExecutionCount", "RejectedJobExecutionTotalCount", "RemovedJobExecutionCount", "RemovedJobExecutionTotalCount", "ResourcesEvaluated", "RuleMessageThrottled", "RuleNotFound", "RulesExecuted", "ServerError", "Subscribe.AuthError", "Subscribe.ClientError", "Subscribe.ServerError", "Subscribe.Success", "Subscribe.Throttle", "SuccededJobExecutionCount", "SuccededJobExecutionTotalCount", "Success", "TopicMatch", "Unsubscribe.ClientError", "Unsubscribe.ServerError", "Unsubscribe.Success", "Unsubscribe.Throttle", "UpdateThingShadow.Accepted", "Violations", "ViolationsCleared", "ViolationsInvalidated"},
-	"AWS/IoTAnalytics":         {"ActionExecution", "ActivityExecutionError", "IncomingMessages"},
-	"AWS/IoTSiteWise":          {"Gateway.Heartbeat", "Gateway.PublishSuccessCount", "Gateway.PublishFailureCount", "Gateway.ProcessFailureCount", "OPCUACollector.Heartbeat", "OPCUACollector.ActiveDataStreamCount", "OPCUACollector.IncomingValuesCount"},
-	"AWS/KMS":                  {"SecondsUntilKeyMaterialExpiration"},
-	"AWS/Kafka":                {"ActiveControllerCount", "BytesInPerSec", "BytesOutPerSec", "CpuIdle", "CpuSystem", "CpuUser", "EstimatedMaxTimeLag", "EstimatedTimeLag", "FetchConsumerLocalTimeMsMean", "FetchConsumerRequestQueueTimeMsMean", "FetchConsumerResponseQueueTimeMsMean", "FetchConsumerResponseSendTimeMsMean", "FetchConsumerTotalTimeMsMean", "FetchFollowerLocalTimeMsMean", "FetchFollowerRequestQueueTimeMsMean", "FetchFollowerResponseQueueTimeMsMean", "FetchFollowerResponseSendTimeMsMean", "FetchFollowerTotalTimeMsMean", "FetchMessageConversionsPerSec", "FetchThrottleByteRate", "FetchThrottleQueueSize", "FetchThrottleTime", "GlobalPartitionCount", "GlobalTopicCount", "KafkaAppLogsDiskUsed", "KafkaDataLogsDiskUsed", "LeaderCount", "MaxOffsetLag", "MemoryBuffered", "MemoryCached", "MemoryFree", "MemoryUsed", "MessagesInPerSec", "NetworkProcessorAvgIdlePercent", "NetworkRxDropped", "NetworkRxErrors", "NetworkRxPackets", "NetworkTxDropped", "NetworkTxErrors", "NetworkTxPackets", "OfflinePartitionsCount", "PartitionCount", "ProduceLocalTimeMsMean", "ProduceMessageConversionsPerSec", "ProduceMessageConversionsTimeMsMean", "ProduceRequestQueueTimeMsMean", "ProduceResponseQueueTimeMsMean", "ProduceResponseSendTimeMsMean", "ProduceThrottleByteRate", "ProduceThrottleQueueSize", "ProduceThrottleTime", "ProduceTotalTimeMsMean", "ReplicationBytesInPerSec", "ReplicationBytesOutPerSec", "RequestBytesMean", "RequestExemptFromThrottleTime", "RequestHandlerAvgIdlePercent", "RequestThrottleQueueSize", "RequestThrottleTime", "RequestTime", "RootDiskUsed", "SumOffsetLag", "SwapFree", "SwapUsed", "OffsetLag", "UnderMinIsrPartitionCount", "UnderReplicatedPartitions", "ZooKeeperRequestLatencyMsMean", "ZooKeeperSessionState"},
-	"AWS/Kinesis":              {"GetRecords.Bytes", "GetRecords.IteratorAge", "GetRecords.IteratorAgeMilliseconds", "GetRecords.Latency", "GetRecords.Records", "GetRecords.Success", "IncomingBytes", "IncomingRecords", "IteratorAgeMilliseconds", "OutgoingBytes", "OutgoingRecords", "PutRecord.Bytes", "PutRecord.Latency", "PutRecord.Success", "PutRecords.Bytes", "PutRecords.Latency", "PutRecords.Records", "PutRecords.Success", "ReadProvisionedThroughputExceeded", "SubscribeToShard.RateExceeded", "SubscribeToShard.Success", "SubscribeToShardEvent.Bytes", "SubscribeToShardEvent.MillisBehindLatest", "SubscribeToShardEvent.Records", "SubscribeToShardEvent.Success", "WriteProvisionedThroughputExceeded"},
-	"AWS/KinesisAnalytics":     {"Bytes", "InputProcessing.DroppedRecords", "InputProcessing.Duration", "InputProcessing.OkBytes", "InputProcessing.OkRecords", "InputProcessing.ProcessingFailedRecords", "InputProcessing.Success", "KPUs", "LambdaDelivery.DeliveryFailedRecords", "LambdaDelivery.Duration", "LambdaDelivery.OkRecords", "MillisBehindLatest", "Records", "Success"},
-	"AWS/KinesisVideo":         {"GetHLSMasterPlaylist.Latency", "GetHLSMasterPlaylist.Requests", "GetHLSMasterPlaylist.Success", "GetHLSMediaPlaylist.Latency", "GetHLSMediaPlaylist.Requests", "GetHLSMediaPlaylist.Success", "GetHLSStreamingSessionURL.Latency", "GetHLSStreamingSessionURL.Requests", "GetHLSStreamingSessionURL.Success", "GetMP4InitFragment.Latency", "GetMP4InitFragment.Requests", "GetMP4InitFragment.Success", "GetMP4MediaFragment.Latency", "GetMP4MediaFragment.OutgoingBytes", "GetMP4MediaFragment.Requests", "GetMP4MediaFragment.Success", "GetMedia.ConnectionErrors", "GetMedia.MillisBehindNow", "GetMedia.OutgoingBytes", "GetMedia.OutgoingFragments", "GetMedia.OutgoingFrames", "GetMedia.Requests", "GetMedia.Success", "GetMediaForFragmentList.OutgoingBytes", "GetMediaForFragmentList.OutgoingFragments", "GetMediaForFragmentList.OutgoingFrames", "GetMediaForFragmentList.Requests", "GetMediaForFragmentList.Success", "GetTSFragment.Latency", "GetTSFragment.OutgoingBytes", "GetTSFragment.Requests", "GetTSFragment.Success", "ListFragments.Latency", "PutMedia.ActiveConnections", "PutMedia.BufferingAckLatency", "PutMedia.ConnectionErrors", "PutMedia.ErrorAckCount", "PutMedia.FragmentIngestionLatency", "PutMedia.FragmentPersistLatency", "PutMedia.IncomingBytes", "PutMedia.IncomingFragments", "PutMedia.IncomingFrames", "PutMedia.Latency", "PutMedia.PersistedAckLatency", "PutMedia.ReceivedAckLatency", "PutMedia.Requests", "PutMedia.Success"},
-	"AWS/Lambda":               {"ConcurrentExecutions", "DeadLetterErrors", "DestinationDeliveryFailures", "Duration", "Errors", "Invocations", "IteratorAge", "OffsetLag", "PostRuntimeExtensionsDuration", "ProvisionedConcurrencyInvocations", "ProvisionedConcurrencyUtilization", "ProvisionedConcurrentExecutions", "Throttles", "ProvisionedConcurrencySpilloverInvocations", "UnreservedConcurrentExecutions"},
-	"AWS/Lex":                  {"BotChannelAuthErrors", "BotChannelConfigurationErrors", "BotChannelInboundThrottledEvents", "BotChannelOutboundThrottledEvents", "BotChannelRequestCount", "BotChannelResponseCardErrors", "BotChannelSystemErrors", "MissedUtteranceCount", "RuntimeInvalidLambdaResponses", "RuntimeLambdaErrors", "RuntimePollyErrors", "RuntimeRequestCount", "RuntimeSucessfulRequestLatency", "RuntimeSystemErrors", "RuntimeThrottledEvents", "RuntimeUserErrors"},
-	"AWS/Logs":                 {"DeliveryErrors", "DeliveryThrottling", "ForwardedBytes", "ForwardedLogEvents", "IncomingBytes", "IncomingLogEvents"},
-	"AWS/LookoutMetrics":       {"ExecutionsStarted", "ExecutionsSucceeded", "ExecutionsFailed", "Delivered", "Undelivered"},
-	"AWS/ML":                   {"PredictCount", "PredictFailureCount"},
-	"AWS/MediaConnect":         {"ARQRecovered", "ARQRequests", "BitRate", "CATError", "CRCError", "Connected", "ConnectedOutputs", "ConnectionAttempts", "ConsecutiveDrops", "ConsecutiveNotRecovered", "ContinuityCounter", "Disconnections", "DroppedPackets", "EgressBridgeBitRate", "EgressBridgeCATError", "EgressBridgeCRCError", "EgressBridgeContinuityCounter", "EgressBridgeDroppedPackets", "EgressBridgeFailoverSwitches", "EgressBridgeMergeActive", "EgressBridgeNotRecoveredPackets", "EgressBridgePATError", "EgressBridgePCRAccuracyError", "EgressBridgePCRError", "EgressBridgePIDError", "EgressBridgePMTError", "EgressBridgePTSError", "EgressBridgePacketLossPercent", "EgressBridgeRecoveredPackets", "EgressBridgeSourceBitRate", "EgressBridgeSourceCATError", "EgressBridgeSourceCRCError", "EgressBridgeSourceContinuityCounter", "EgressBridgeSourceDroppedPackets", "EgressBridgeSourceMergeActive", "EgressBridgeSourceMergeLatency", "EgressBridgeSourceNotRecoveredPackets", "EgressBridgeSourcePATError", "EgressBridgeSourcePCRAccuracyError", "EgressBridgeSourcePCRError", "EgressBridgeSourcePIDError", "EgressBridgeSourcePMTError", "EgressBridgeSourcePTSError", "EgressBridgeSourcePacketLossPercent", "EgressBridgeSourceRecoveredPackets", "EgressBridgeSourceTSByteError", "EgressBridgeSourceTSSyncLoss", "EgressBridgeSourceTotalPackets", "EgressBridgeSourceTransportError", "EgressBridgeTSByteError", "EgressBridgeTSSyncLoss", "EgressBridgeTotalPackets", "EgressBridgeTransportError", "FailoverSwitches", "IngressBridgeBitRate", "IngressBridgeCATError", "IngressBridgeCRCError", "IngressBridgeContinuityCounter", "IngressBridgeDroppedPackets", "IngressBridgeFailoverSwitches", "IngressBridgeMergeActive", "IngressBridgeNotRecoveredPackets", "IngressBridgePATError", "IngressBridgePCRAccuracyError", "IngressBridgePCRError", "IngressBridgePIDError", "IngressBridgePMTError", "IngressBridgePTSError", "IngressBridgePacketLossPercent", "IngressBridgeRecoveredPackets", "IngressBridgeSourceARQRecovered", "IngressBridgeSourceARQRequests", "IngressBridgeSourceBitRate", "IngressBridgeSourceCATError", "IngressBridgeSourceCRCError", "IngressBridgeSourceContinuityCounter", "IngressBridgeSourceDroppedPackets", "IngressBridgeSourceFECPackets", "IngressBridgeSourceFECRecovered", "IngressBridgeSourceMergeActive", "IngressBridgeSourceMergeLatency", "IngressBridgeSourceNotRecoveredPackets", "IngressBridgeSourceOverflowPackets", "IngressBridgeSourcePATError", "IngressBridgeSourcePCRAccuracyError", "IngressBridgeSourcePCRError", "IngressBridgeSourcePIDError", "IngressBridgeSourcePMTError", "IngressBridgeSourcePTSError", "IngressBridgeSourcePacketLossPercent", "IngressBridgeSourceRecoveredPackets", "IngressBridgeSourceRoundTripTime", "IngressBridgeSourceTotalPackets", "IngressBridgeSourceTSByteError", "IngressBridgeSourceTSSyncLoss", "IngressBridgeSourceTransportError", "IngressBridgeTSByteError", "IngressBridgeTSSyncLoss", "IngressBridgeTotalPackets", "IngressBridgeTransportError", "Jitter", "Latency", "MaintenanceCanceled", "MaintenanceFailed", "MaintenanceRescheduled", "MaintenanceScheduled", "MaintenanceStarted", "MaintenanceSucceeded", "MergeActive", "MergeLatency", "NotRecoveredPackets", "OutputConnected", "OutputDisconnections", "OutputDroppedPayloads", "OutputLatePayloads", "OutputTotalBytes", "OutputTotalPayloads", "OverflowPackets", "PATError", "PCRAccuracyError", "PCRError", "PIDError", "PMTError", "PTSError", "PacketLossPercent", "RecoveredPackets", "RoundTripTime", "SourceARQRecovered", "SourceARQRequests", "SourceBitRate", "SourceCATError", "SourceCRCError", "SourceConnected", "SourceContinuityCounter", "SourceDisconnections", "SourceDroppedPackets", "SourceDroppedPayloads", "SourceFECPackets", "SourceFECRecovered", "SourceLatePayloads", "SourceMergeActive", "SourceMergeLatency", "SourceMergeStatusWarnMismatch", "SourceMergeStatusWarnSolo", "SourceMissingPackets", "SourceNotRecoveredPackets", "SourceOverflowPackets", "SourcePATError", "SourcePCRAccuracyError", "SourcePCRError", "SourcePIDError", "SourcePMTError", "SourcePTSError", "SourcePacketLossPercent", "SourceRecoveredPackets", "SourceRoundTripTime", "SourceSelected", "SourceTSByteError", "SourceTSSyncLoss", "SourceTotalBytes", "SourceTotalPackets", "SourceTotalPayloads", "SourceTransportError", "TSByteError", "TSSyncLoss", "TotalPackets", "TransportError", "Uptime"},
-	"AWS/MediaConvert":         {"AudioOutputSeconds", "Errors", "HDOutputSeconds", "JobsCompletedCount", "JobsErroredCount", "SDOutputSeconds", "StandbyTime", "TranscodingTime", "UHDOutputSeconds"},
-	"AWS/MediaPackage":         {"ActiveInput", "EgressBytes", "EgressRequestCount", "EgressResponseTime", "IngressBytes", "IngressResponseTime"},
-	"AWS/MediaStore":           {"RequestCount", "4xxErrorCount", "5xxErrorCount", "BytesUploaded", "BytesDownloaded", "TotalTime", "TurnaroundTime"},
-	"AWS/MediaTailor":          {"AdDecisionServer.Ads", "AdDecisionServer.Duration", "AdDecisionServer.Errors", "AdDecisionServer.FillRate", "AdDecisionServer.Timeouts", "AdNotReady", "Avails.Duration", "Avails.FillRate", "Avails.FilledDuration", "GetManifest.Errors", "Origin.Errors", "Origin.Timeouts"},
-	"AWS/MemoryDB":             {"ActiveDefragHits", "AuthenticationFailures", "BytesUsedForMemoryDB", "CommandAuthorizationFailures", "CPUUtilization", "CurrConnections", "CurrItems", "DatabaseMemoryUsagePercentage", "DB0AverageTTL", "EngineCPUUtilization", "EvalBasedCmds", "Evictions", "FreeableMemory", "GeoSpatialBasedCmds", "GetTypeCmds", "HashBasedCmds", "HyperLogLogBasedCmds", "IsPrimary", "KeyAuthorizationFailures", "KeyBasedCmds", "KeyspaceHits", "KeyspaceMisses", "KeysTracked", "ListBasedCmds", "MaxReplicationThroughput", "MemoryFragmentationRatio", "NetworkBandwidthInAllowanceExceeded", "NetworkBandwidthOutAllowanceExceeded", "NetworkBytesIn", "NetworkBytesOut", "NetworkConntrackAllowanceExceeded", "NetworkPacketsIn", "NetworkPacketsOut", "NetworkPacketsPerSecondAllowanceExceeded", "NewConnections", "PrimaryLinkHealthStatus", "PubSubBasedCmds", "Reclaimed", "ReplicationBytes", "ReplicationDelayedWriteCommands", "ReplicationLag", "SetBasedCmds", "SetTypeCmds", "SortedSetBasedCmds", "StringBasedCmds", "StreamBasedCmds", "SwapUsage"},
-	"AWS/NATGateway":           {"ActiveConnectionCount", "BytesInFromDestination", "BytesInFromSource", "BytesOutToDestination", "BytesOutToSource", "ConnectionAttemptCount", "ConnectionEstablishedCount", "ErrorPortAllocation", "IdleTimeoutCount", "PacketsDropCount", "PacketsInFromDestination", "PacketsInFromSource", "PacketsOutToDestination", "PacketsOutToSource"},
-	"AWS/Neptune":              {"CPUUtilization", "ClusterReplicaLag", "ClusterReplicaLagMaximum", "ClusterReplicaLagMinimum", "EngineUptime", "FreeLocalStorage", "FreeableMemory", "GremlinErrors", "GremlinHttp1xx", "GremlinHttp2xx", "GremlinHttp4xx", "GremlinHttp5xx", "GremlinRequests", "GremlinRequestsPerSec", "GremlinWebSocketAvailableConnections", "GremlinWebSocketClientErrors", "GremlinWebSocketServerErrors", "GremlinWebSocketSuccess", "Http100", "Http101", "Http1xx", "Http200", "Http2xx", "Http400", "Http403", "Http405", "Http413", "Http429", "Http4xx", "Http500", "Http501", "Http5xx", "LoaderErrors", "LoaderRequests", "NetworkReceiveThroughput", "NetworkThroughput", "NetworkTransmitThroughput", "SparqlErrors", "SparqlHttp1xx", "SparqlHttp2xx", "SparqlHttp4xx", "SparqlHttp5xx", "SparqlRequests", "SparqlRequestsPerSec", "StatusErrors", "StatusRequests", "VolumeBytesUsed", "VolumeReadIOPs", "VolumeWriteIOPs"},
-	"AWS/NetworkELB":           {"ActiveFlowCount", "ActiveFlowCount_TLS", "ClientTLSNegotiationErrorCount", "ConsumedLCUs", "HealthyHostCount", "NewFlowCount", "NewFlowCount_TLS", "ProcessedBytes", "ProcessedBytes_TLS", "TCP_Client_Reset_Count", "TCP_ELB_Reset_Count", "TCP_Target_Reset_Count", "TargetTLSNegotiationErrorCount", "UnHealthyHostCount"},
-	"AWS/GatewayELB":           {"ActiveFlowCount", "ConsumedLCUs", "HealthyHostCount", "NewFlowCount", "ProcessedBytes", "UnHealthyHostCount"},
-	"AWS/NetworkFirewall":      {"DroppedPackets", "Packets", "PassedPackets", "ReceivedPacketCount"},
-	"AWS/OpsWorks":             {"cpu_idle", "cpu_nice", "cpu_steal", "cpu_system", "cpu_user", "cpu_waitio", "load_1", "load_15", "load_5", "memory_buffers", "memory_cached", "memory_free", "memory_swap", "memory_total", "memory_used", "procs"},
-	"AWS/Polly":                {"2XXCount", "4XXCount", "5XXCount", "RequestCharacters", "ResponseLatency"},
-	"AWS/PrivateLinkEndpoints": {"ActiveConnections", "BytesProcessed", "NewConnections", "PacketsDropped", "RstPacketsReceived"},
-	"AWS/PrivateLinkServices":  {"ActiveConnections", "BytesProcessed", "EndpointsCount", "NewConnections", "RstPacketsReceived"},
-	"AWS/Prometheus":           {"AlertManagerAlertsReceived", "AlertManagerNotificationsFailed", "AlertManagerNotificationsThrottled", "DiscardedSamples", "RuleEvaluations", "RuleEvaluationFailures", "RuleGroupIterationsMissed"},
-	"AWS/RDS":                  {"ActiveTransactions", "AuroraBinlogReplicaLag", "AuroraGlobalDBDataTransferBytes", "AuroraGlobalDBReplicatedWriteIO", "AuroraGlobalDBReplicationLag", "AuroraReplicaLag", "AuroraReplicaLagMaximum", "AuroraReplicaLagMinimum", "AvailabilityPercentage", "BacktrackChangeRecordsCreationRate", "BacktrackChangeRecordsStored", "BacktrackWindowActual", "BacktrackWindowAlert", "BackupRetentionPeriodStorageUsed", "BinLogDiskUsage", "BlockedTransactions", "BufferCacheHitRatio", "BurstBalance", "CPUCreditBalance", "CPUCreditUsage", "CPUUtilization", "ClientConnections", "ClientConnectionsClosed", "ClientConnectionsNoTLS", "ClientConnectionsReceived", "ClientConnectionsSetupFailedAuth", "ClientConnectionsSetupSucceeded", "ClientConnectionsTLS", "CommitLatency", "CommitThroughput", "DDLLatency", "DDLThroughput", "DMLLatency", "DMLThroughput", "DatabaseConnectionRequests", "DatabaseConnectionRequestsWithTLS", "DatabaseConnections", "DatabaseConnectionsBorrowLatency", "DatabaseConnectionsCurrentlyBorrowed", "DatabaseConnectionsCurrentlyInTransaction", "DatabaseConnectionsCurrentlySessionPinned", "DatabaseConnectionsSetupFailed", "DatabaseConnectionsSetupSucceeded", "DatabaseConnectionsWithTLS", "Deadlocks", "DeleteLatency", "DeleteThroughput", "DiskQueueDepth", "EBSByteBalance%", "EBSIOBalance%", "EngineUptime", "FailedSQLServerAgentJobsCount", "FreeLocalStorage", "FreeStorageSpace", "FreeableMemory", "InsertLatency", "InsertThroughput", "LoginFailures", "MaxDatabaseConnectionsAllowed", "MaximumUsedTransactionIDs", "NetworkReceiveThroughput", "NetworkThroughput", "NetworkTransmitThroughput", "OldestReplicationSlotLag", "Queries", "QueryDatabaseResponseLatency", "QueryRequests", "QueryRequestsNoTLS", "QueryRequestsTLS", "QueryResponseLatency", "RDSToAuroraPostgreSQLReplicaLag", "ReadIOPS", "ReadLatency", "ReadThroughput", "ReplicaLag", "ReplicationSlotDiskUsage", "ResultSetCacheHitRatio", "SelectLatency", "SelectThroughput", "ServerlessDatabaseCapacity", "SnapshotStorageUsed", "SwapUsage", "TotalBackupStorageBilled", "TransactionLogsDiskUsage", "TransactionLogsGeneration", "UpdateLatency", "UpdateThroughput", "VolumeBytesUsed", "VolumeReadIOPs", "VolumeWriteIOPs", "WriteIOPS", "WriteLatency", "WriteThroughput"},
-	"AWS/Redshift":             {"CommitQueueLength", "ConcurrencyScalingActiveClusters", "ConcurrencyScalingSeconds", "CPUUtilization", "DatabaseConnections", "HealthStatus", "MaintenanceMode", "MaxConfiguredConcurrencyScalingClusters", "NetworkReceiveThroughput", "NetworkTransmitThroughput", "PercentageDiskSpaceUsed", "QueriesCompletedPerSecond", "QueryDuration", "QueryRuntimeBreakdown", "ReadIOPS", "ReadLatency", "ReadThroughput", "TotalTableCount", "WLMQueueLength", "WLMQueueWaitTime", "WLMQueriesCompletedPerSecond", "WLMQueryDuration", "WLMRunningQueries", "WriteIOPS", "WriteLatency", "WriteThroughput", "SchemaQuota", "NumExceededSchemaQuotas", "StorageUsed", "PercentageQuotaUsed"},
-	"AWS/Robomaker":            {"RealTimeFactor", "vCPU", "Memory", "SimulationUnit"},
-	"AWS/Route53":              {"ChildHealthCheckHealthyCount", "ConnectionTime", "DNSQueries", "HealthCheckPercentageHealthy", "HealthCheckStatus", "SSLHandshakeTime", "TimeToFirstByte"},
-	"AWS/Route53Resolver":      {"InboundQueryVolume", "OutboundQueryVolume", "OutboundQueryAggregatedVolume"},
-	"AWS/S3":                   {"4xxErrors", "5xxErrors", "AllRequests", "BucketSizeBytes", "BytesDownloaded", "BytesPendingReplication", "BytesUploaded", "DeleteRequests", "FirstByteLatency", "GetRequests", "HeadRequests", "ListRequests", "NumberOfObjects", "OperationsFailedReplication", "OperationsPendingReplication", "PostRequests", "PutRequests", "ReplicationLatency", "SelectRequests", "SelectReturnedBytes", "SelectScannedBytes", "TotalRequestLatency"},
-	"AWS/SDKMetrics":           {"CallCount", "ClientErrorCount", "EndToEndLatency", "ConnectionErrorCount", "ServerErrorCount", "ThrottleCount"},
-	"AWS/ServiceCatalog":       {"ProvisionedProductLaunch"},
-	"AWS/SES":                  {"Bounce", "Clicks", "Complaint", "Delivery", "Opens", "Reject", "Rendering Failures", "Reputation.BounceRate", "Reputation.ComplaintRate", "Send"},
-	"AWS/SNS":                  {"NumberOfMessagesPublished", "NumberOfNotificationsDelivered", "NumberOfNotificationsFailed", "NumberOfNotificationsFilteredOut", "NumberOfNotificationsFilteredOut-InvalidAttributes", "NumberOfNotificationsFilteredOut-NoMessageAttributes", "PublishSize", "SMSMonthToDateSpentUSD", "SMSSuccessRate"},
-	"AWS/SQS":                  {"ApproximateAgeOfOldestMessage", "ApproximateNumberOfMessagesDelayed", "ApproximateNumberOfMessagesNotVisible", "ApproximateNumberOfMessagesVisible", "NumberOfEmptyReceives", "NumberOfMessagesDeleted", "NumberOfMessagesReceived", "NumberOfMessagesSent", "SentMessageSize"},
-	"AWS/SWF":                  {"ActivityTaskScheduleToCloseTime", "ActivityTaskScheduleToStartTime", "ActivityTaskStartToCloseTime", "ActivityTasksCanceled", "ActivityTasksCompleted", "ActivityTasksFailed", "ConsumedCapacity", "DecisionTaskScheduleToStartTime", "DecisionTaskStartToCloseTime", "DecisionTasksCompleted", "PendingTasks", "ProvisionedBucketSize", "ProvisionedRefillRate", "ScheduledActivityTasksTimedOutOnClose", "ScheduledActivityTasksTimedOutOnStart", "StartedActivityTasksTimedOutOnClose", "StartedActivityTasksTimedOutOnHeartbeat", "StartedDecisionTasksTimedOutOnClose", "ThrottledEvents", "WorkflowStartToCloseTime", "WorkflowsCanceled", "WorkflowsCompleted", "WorkflowsContinuedAsNew", "WorkflowsFailed", "WorkflowsTerminated", "WorkflowsTimedOut"},
-	"AWS/SageMaker":            {"CPUUtilization", "DatasetObjectsAutoAnnotated", "DatasetObjectsHumanAnnotated", "DatasetObjectsLabelingFailed", "DiskUtilization", "GPUMemoryUtilization", "GPUUtilization", "Invocation4XXErrors", "Invocation5XXErrors", "Invocations", "InvocationsPerInstance", "JobsFailed", "JobsStopped", "JobsSucceeded", "MemoryUtilization", "ModelLatency", "OverheadLatency", "TotalDatasetObjectsLabeled"},
-	"AWS/States":               {"ActivitiesFailed", "ActivitiesHeartbeatTimedOut", "ActivitiesScheduled", "ActivitiesStarted", "ActivitiesSucceeded", "ActivitiesTimedOut", "ActivityRunTime", "ActivityScheduleTime", "ActivityTime", "ConsumedCapacity", "ConsumedCapacity", "ExecutionThrottled", "ExecutionTime", "ExecutionsAborted", "ExecutionsFailed", "ExecutionsStarted", "ExecutionsSucceeded", "ExecutionsTimedOut", "ExpressExecutionBilledDuration", "ExpressExecutionBilledMemory", "ExpressExecutionMemory", "LambdaFunctionRunTime", "LambdaFunctionScheduleTime", "LambdaFunctionTime", "LambdaFunctionsFailed", "LambdaFunctionsScheduled", "LambdaFunctionsStarted", "LambdaFunctionsSucceeded", "LambdaFunctionsTimedOut", "ProvisionedBucketSize", "ProvisionedRefillRate", "ServiceIntegrationRunTime", "ServiceIntegrationScheduleTime", "ServiceIntegrationTime", "ServiceIntegrationsFailed", "ServiceIntegrationsScheduled", "ServiceIntegrationsStarted", "ServiceIntegrationsSucceeded", "ServiceIntegrationsTimedOut", "ThrottledEvents"},
-	"AWS/StorageGateway":       {"CacheFree", "CacheHitPercent", "CachePercentDirty", "CachePercentUsed", "CacheUsed", "CloudBytesDownloaded", "CloudBytesUploaded", "CloudDownloadLatency", "QueuedWrites", "ReadBytes", "ReadTime", "TimeSinceLastRecoveryPoint", "TotalCacheSize", "UploadBufferFree", "UploadBufferPercentUsed", "UploadBufferUsed", "WorkingStorageFree", "WorkingStoragePercentUsed", "WorkingStorageUsed", "WriteBytes", "WriteTime"},
-	"AWS/Textract":             {"ResponseTime", "ServerErrorCount", "SuccessfulRequestCount", "ThrottledCount", "UserErrorCount"},
-	"AWS/Timestream":           {"SuccessfulRequestLatency", "SystemErrors", "UserErrors", "DataScannedBytes"},
-	"AWS/ThingsGraph":          {"EventStoreQueueSize", "FlowExecutionTime", "FlowExecutionsFailed", "FlowExecutionsStarted", "FlowExecutionsSucceeded", "FlowStepExecutionTime", "FlowStepExecutionsFailed", "FlowStepExecutionsStarted", "FlowStepExecutionsSucceeded"},
-	"AWS/TransitGateway":       {"BytesIn", "BytesOut", "PacketDropCountBlackhole", "PacketDropCountNoRoute", "PacketsIn", "PacketsOut"},
-	"AWS/Transfer":             {"BytesIn", "BytesOut", "FilesIn", "FilesOut", "InboundMessage", "InboundFailedMessage", "OnPartialUploadExecutionsStarted", "OnPartialUploadExecutionsSuccess", "OnPartialUploadExecutionsFailed", "OnUploadExecutionsStarted", "OnUploadExecutionsSuccess", "OnUploadExecutionsFailed"},
-	"AWS/Translate":            {"CharacterCount", "ResponseTime", "ServerErrorCount", "SuccessfulRequestCount", "ThrottledCount", "UserErrorCount"},
-	"AWS/TrustedAdvisor":       {"GreenChecks", "RedChecks", "RedResources", "ServiceLimitUsage", "YellowChecks", "YellowResources"},
-	"AWS/Usage":                {"CallCount", "ResourceCount"},
-	"AWS/VPN":                  {"TunnelDataIn", "TunnelDataOut", "TunnelState"},
-	"AWS/WAF":                  {"AllowedRequests", "BlockedRequests", "CountedRequests", "PassedRequests"},
-	"AWS/WAFV2":                {"AllowedRequests", "BlockedRequests", "CountedRequests", "PassedRequests"},
-	"AWS/WorkSpaces":           {"Available", "ConnectionAttempt", "ConnectionFailure", "ConnectionSuccess", "InSessionLatency", "Maintenance", "SessionDisconnect", "SessionLaunchTime", "Stopped", "Unhealthy", "UserConnected"},
-	"ECS/ContainerInsights":    {"ContainerInstanceCount", "CpuUtilized", "CpuReserved", "DeploymentCount", "DesiredTaskCount", "MemoryUtilized", "MemoryReserved", "NetworkRxBytes", "NetworkTxBytes", "PendingTaskCount", "RunningTaskCount", "ServiceCount", "StorageReadBytes", "StorageWriteBytes", "TaskCount", "TaskSetCount", "instance_cpu_limit", "instance_cpu_reserved_capacity", "instance_cpu_usage_total", "instance_cpu_utilization", "instance_filesystem_utilization", "instance_memory_limit", "instance_memory_reserved_capacity", "instance_memory_utliization", "instance_memory_working_set", "instance_network_total_bytes", "instance_number_of_running_tasks"},
-	"ContainerInsights":        {"cluster_failed_node_count", "cluster_node_count", "namespace_number_of_running_pods", "node_cpu_limit", "node_cpu_reserved_capacity", "node_cpu_usage_total", "node_cpu_utilization", "node_filesystem_utilization", "node_memory_limit", "node_memory_reserved_capacity", "node_memory_utilization", "node_memory_working_set", "node_network_total_bytes", "node_number_of_running_containers", "node_number_of_running_pods", "pod_cpu_reserved_capacity", "pod_cpu_utilization", "pod_cpu_utilization_over_pod_limit", "pod_memory_reserved_capacity", "pod_memory_utilization", "pod_memory_utilization_over_pod_limit", "pod_number_of_container_restarts", "pod_network_rx_bytes", "pod_network_tx_bytes", "service_number_of_running_pods"},
-	"AWS/Rekognition":          {"DetectedFaceCount", "DetectedLabelCount", "ResponseTime", "ServerErrorCount", "SuccessfulRequestCount", "ThrottledCount", "UserErrorCount"},
-	"AWS/Cassandra":            {"AccountMaxReads", "AccountMaxTableLevelReads", "AccountMaxTableLevelWrites", "AccountMaxWrites", "AccountProvisionedReadCapacityUtilization", "AccountProvisionedWriteCapacityUtilization", "ConditionalCheckFailedRequests", "ConsumedReadCapacityUnits", "ConsumedWriteCapacityUnits", "MaxProvisionedTableReadCapacityUtilization", "MaxProvisionedTableWriteCapacityUtilization", "ReturnedItemCount", "ReturnedItemCountBySelect", "SuccessfulRequestCount", "SuccessfulRequestLatency", "SystemErrors", "UserErrors"},
-	"AWS/AmplifyHosting":       {"Requests", "BytesDownloaded", "BytesUploaded", "4XXErrors", "5XXErrors", "Latency"},
-	"CloudWatchSynthetics":     {"SuccessPercent", "Duration", "2xx", "4xx", "5xx", "Failed", "Failed requests", "VisualMonitoringSuccessPercent", "VisualMonitoringTotalComparisons"},
+	"AWS/ElasticBeanstalk":               {"ApplicationLatencyP10", "ApplicationLatencyP50", "ApplicationLatencyP75", "ApplicationLatencyP85", "ApplicationLatencyP90", "ApplicationLatencyP95", "ApplicationLatencyP99", "ApplicationLatencyP99.9", "ApplicationRequests2xx", "ApplicationRequests3xx", "ApplicationRequests4xx", "ApplicationRequests5xx", "ApplicationRequestsTotal", "CPUIdle", "CPUIowait", "CPUIrq", "CPUNice", "CPUSoftirq", "CPUSystem", "CPUUser", "EnvironmentHealth", "InstanceHealth", "InstancesDegraded", "InstancesInfo", "InstancesNoData", "InstancesOk", "InstancesPending", "InstancesSevere", "InstancesUnknown", "InstancesWarning", "LoadAverage1min", "LoadAverage5min", "RootFilesystemUtil"},
+	"AWS/ElasticInference":               {"AcceleratorHealthCheckFailed", "AcceleratorMemoryUsage", "ConnectivityCheckFailed"},
+	"AWS/ElasticMapReduce":               {"AppsCompleted", "AppsFailed", "AppsKilled", "AppsPending", "AppsRunning", "AppsSubmitted", "BackupFailed", "CapacityRemainingGB", "Cluster Status", "ContainerAllocated", "ContainerPending", "ContainerPendingRatio", "ContainerReserved", "CoreNodesPending", "CoreNodesRunning", "CorruptBlocks", "DfsPendingReplicationBlocks", "HBase", "HDFSBytesRead", "HDFSBytesWritten", "HDFSUtilization", "HbaseBackupFailed", "IO", "IsIdle", "JobsFailed", "JobsRunning", "LiveDataNodes", "LiveTaskTrackers", "MRActiveNodes", "MRDecommissionedNodes", "MRLostNodes", "MRRebootedNodes", "MRTotalNodes", "MRUnhealthyNodes", "Map/Reduce", "MapSlotsOpen", "MapTasksRemaining", "MapTasksRunning", "MemoryAllocatedMB", "MemoryAvailableMB", "MemoryReservedMB", "MemoryTotalMB", "MissingBlocks", "MostRecentBackupDuration", "Node Status", "PendingDeletionBlocks", "ReduceSlotsOpen", "ReduceTasksRemaining", "ReduceTasksRunning", "RemainingMapTasksPerSlot", "S3BytesRead", "S3BytesWritten", "TaskNodesPending", "TaskNodesRunning", "TimeSinceLastSuccessfulBackup", "TotalLoad", "UnderReplicatedBlocks", "YARNMemoryAvailablePercentage"},
+	"AWS/EMRServerless":                  {"CancellingJobs", "CancelledJobs", "CPUAllocated", "FailedJobs", "IdleWorkerCount", "MaxCPUAllowed", "MaxMemoryAllowed", "MaxStorageAllowed", "MemoryAllocated", "PendingCreationWorkerCount", "PendingJobs", "RunningJobs", "RunningWorkerCount", "ScheduledJobs", "StorageAllocated", "SubmittedJobs", "SuccessJobs", "TotalWorkerCount"},
+	"AWS/ElasticTranscoder":              {"Billed Audio Output", "Billed HD Output", "Billed SD Output", "Errors", "Jobs Completed", "Jobs Errored", "Outputs per Job", "Standby Time", "Throttles"},
+	"AWS/EventBridge/Pipes":              {"Concurrency", "Duration", "EnrichmentStageDuration", "EnrichmentStageFailed", "EventCount", "EventSize", "ExecutionFailed", "ExecutionPartiallyFailed", "ExecutionThrottled", "ExecutionTimeout", "Invocations", "TargetStageDuration", "TargetStageFailed", "TargetStagePartiallyFailed", "TargetStageSkipped"},
+	"AWS/Events":                         {"DeadLetterInvocations", "Events", "FailedInvocations", "IngestionToInvocationStartLatency", "Invocations", "InvocationsFailedToBeSentToDlq", "InvocationsSentToDlq", "MatchedEvents", "ThrottledRules", "TriggeredRules"},
+	"AWS/Firehose":                       {"ActivePartitionsLimit", "BackupToS3.Bytes", "BackupToS3.DataFreshness", "BackupToS3.Records", "BackupToS3.Success", "DataReadFromKinesisStream.Bytes", "DataReadFromKinesisStream.Records", "DeliveryToElasticsearch.Bytes", "DeliveryToElasticsearch.Records", "DeliveryToElasticsearch.Success", "DeliveryToRedshift.Bytes", "DeliveryToRedshift.Records", "DeliveryToRedshift.Success", "DeliveryToS3.Bytes", "DeliveryToS3.DataFreshness", "DeliveryToS3.ObjectCount", "DeliveryToS3.Records", "DeliveryToS3.Success", "DeliveryToSplunk.Bytes", "DeliveryToSplunk.DataFreshness", "DeliveryToSplunk.Records", "DeliveryToSplunk.Success", "DescribeDeliveryStream.Latency", "DescribeDeliveryStream.Requests", "ExecuteProcessing.Duration", "ExecuteProcessing.Success", "FailedConversion.Bytes", "FailedConversion.Records", "IncomingBytes", "IncomingRecords", "JQProcessing.Duration", "KinesisMillisBehindLatest", "KMSKeyAccessDenied", "KMSKeyDisabled", "KMSKeyInvalidState", "KMSKeyNotFound", "ListDeliveryStreams.Latency", "ListDeliveryStreams.Requests", "PartitionCount", "PartitionCountExceeded", "PerPartitionThroughput", "PutRecord.Bytes", "PutRecord.Latency", "PutRecord.Requests", "PutRecordBatch.Bytes", "PutRecordBatch.Latency", "PutRecordBatch.Records", "PutRecordBatch.Requests", "SucceedConversion.Bytes", "SucceedConversion.Records", "SucceedProcessing.Bytes", "SucceedProcessing.Records", "ThrottledDescribeStream", "ThrottledGetRecords", "ThrottledGetShardIterator", "UpdateDeliveryStream.Latency", "UpdateDeliveryStream.Requests"},
+	"AWS/FSx":                            {"ClientConnections", "CPUUtilization", "DataReadBytes", "DataReadOperations", "DataWriteBytes", "DataWriteOperations", "DeduplicationSavedStorage", "DiskIopsUtilization", "DiskReadBytes", "DiskReadOperations", "DiskThroughputBalance", "DiskThroughputUtilization", "DiskWriteBytes", "DiskWriteOperations", "FileServerDiskIopsBalance", "FileServerDiskIopsUtilization", "FileServerDiskThroughputBalance", "FileServerDiskThroughputUtilization", "FreeDataStorageCapacity", "FreeStorageCapacity", "MemoryUtilization", "MetadataOperations", "NetworkThroughputUtilization", "StorageCapacityUtilization"},
+	"AWS/FraudDetector":                  {"GetEventPrediction", "GetEventPrediction4xxError", "GetEventPrediction5xxError", "GetEventPredictionLatency", "ModelInvocation", "ModelInvocationError", "ModelInvocationLatency", "OutcomeReturned", "Prediction", "PredictionError", "PredictionLatency", "RuleEvaluateError", "RuleEvaluateFalse", "RuleEvaluateTrue", "RuleNotEvaluated", "VariableDefaultReturned", "VariableUsed"},
+	"AWS/GameLift":                       {"ActivatingGameSessions", "ActiveGameSessions", "ActiveInstances", "ActiveServerProcesses", "AvailableGameServers", "AvailableGameSessions", "AverageWaitTime", "CurrentPlayerSessions", "CurrentTickets", "DesiredInstances", "DrainingAvailableGameServers", "DrainingUtilizedGameServers", "FirstChoiceNotViable", "FirstChoiceOutOfCapacity", "GameSessionInterruptions", "HealthyServerProcesses", "IdleInstances", "InstanceInterruptions", "LowestLatencyPlacement", "LowestPricePlacement", "MatchAcceptancesTimedOut", "MatchesAccepted", "MatchesCreated", "MatchesPlaced", "MatchesRejected", "MaxInstances", "MinInstances", "PercentAvailableGameSessions", "PercentHealthyServerProcesses", "PercentIdleInstances", "Placement", "PlacementsCanceled", "PlacementsFailed", "PlacementsStarted", "PlacementsSucceeded", "PlacementsTimedOut", "PlayerSessionActivations", "PlayersStarted", "QueueDepth", "RuleEvaluationsFailed", "RuleEvaluationsPassed", "ServerProcessAbnormalTerminations", "ServerProcessActivations", "ServerProcessTerminations", "TicketsFailed", "TicketsStarted", "TicketsTimedOut", "TimeToMatch", "TimeToTicketSuccess", "UtilizedGameServers"},
+	"AWS/GlobalAccelerator":              {"NewFlowCount", "ProcessedBytesIn", "ProcessedBytesOut", "HealthyEndpointCount", "UnhealthyEndpointCount"},
+	"AWS/Glue":                           {"glue.driver.BlockManager.disk.diskSpaceUsed_MB", "glue.driver.ExecutorAllocationManager.executors.numberAllExecutors", "glue.driver.ExecutorAllocationManager.executors.numberMaxNeededExecutors", "glue.driver.aggregate.bytesRead", "glue.driver.aggregate.elapsedTime", "glue.driver.aggregate.numCompletedStages", "glue.driver.aggregate.numCompletedTasks", "glue.driver.aggregate.numFailedTasks", "glue.driver.aggregate.numKilledTasks", "glue.driver.aggregate.recordsRead", "glue.driver.aggregate.shuffleBytesWritten", "glue.driver.aggregate.shuffleLocalBytesRead", "glue.driver.jvm.heap.usage  glue.executorId.jvm.heap.usage  glue.ALL.jvm.heap.usage", "glue.driver.jvm.heap.used  glue.executorId.jvm.heap.used  glue.ALL.jvm.heap.used", "glue.driver.s3.filesystem.read_bytes  glue.executorId.s3.filesystem.read_bytes  glue.ALL.s3.filesystem.read_bytes", "glue.driver.s3.filesystem.write_bytes  glue.executorId.s3.filesystem.write_bytes  glue.ALL.s3.filesystem.write_bytes", "glue.driver.system.cpuSystemLoad  glue.executorId.system.cpuSystemLoad  glue.ALL.system.cpuSystemLoad"},
+	"AWS/GroundStation":                  {"BitErrorRate", "BlockErrorRate", "ReceivedPower", "Es/N0"},
+	"AWS/Inspector":                      {"TotalAssessmentRunFindings", "TotalAssessmentRuns", "TotalHealthyAgents", "TotalMatchingAgents"},
+	"AWS/IVS":                            {"ConcurrentViews", "ConcurrentStreams", "IngestAudioBitrate", "IngestFramerate", "IngestVideoBitrate", "KeyframeInterval", "LiveDeliveredTime", "LiveInputTime", "RecordedTime"},
+	"AWS/IoT":                            {"CanceledJobExecutionCount", "CanceledJobExecutionTotalCount", "ClientError", "Connect.AuthError", "Connect.ClientError", "Connect.ServerError", "Connect.Success", "Connect.Throttle", "DeleteThingShadow.Accepted", "FailedJobExecutionCount", "FailedJobExecutionTotalCount", "Failure", "GetThingShadow.Accepted", "InProgressJobExecutionCount", "InProgressJobExecutionTotalCount", "NonCompliantResources", "NumLogBatchesFailedToPublishThrottled", "NumLogEventsFailedToPublishThrottled", "ParseError", "Ping.Success", "PublishIn.AuthError", "PublishIn.ClientError", "PublishIn.ServerError", "PublishIn.Success", "PublishIn.Throttle", "PublishOut.AuthError", "PublishOut.ClientError", "PublishOut.Success", "QueuedJobExecutionCount", "QueuedJobExecutionTotalCount", "RejectedJobExecutionCount", "RejectedJobExecutionTotalCount", "RemovedJobExecutionCount", "RemovedJobExecutionTotalCount", "ResourcesEvaluated", "RuleMessageThrottled", "RuleNotFound", "RulesExecuted", "ServerError", "Subscribe.AuthError", "Subscribe.ClientError", "Subscribe.ServerError", "Subscribe.Success", "Subscribe.Throttle", "SuccededJobExecutionCount", "SuccededJobExecutionTotalCount", "Success", "TopicMatch", "Unsubscribe.ClientError", "Unsubscribe.ServerError", "Unsubscribe.Success", "Unsubscribe.Throttle", "UpdateThingShadow.Accepted", "Violations", "ViolationsCleared", "ViolationsInvalidated"},
+	"AWS/IoTAnalytics":                   {"ActionExecution", "ActivityExecutionError", "IncomingMessages"},
+	"AWS/IoTSiteWise":                    {"Gateway.Heartbeat", "Gateway.PublishSuccessCount", "Gateway.PublishFailureCount", "Gateway.ProcessFailureCount", "OPCUACollector.Heartbeat", "OPCUACollector.ActiveDataStreamCount", "OPCUACollector.IncomingValuesCount"},
+	"AWS/KMS":                            {"SecondsUntilKeyMaterialExpiration"},
+	"AWS/Kafka":                          {"ActiveControllerCount", "BurstBalance", "BwInAllowanceExceeded", "BwOutAllowanceExceeded", "BytesInPerSec", "BytesOutPerSec", "ClientConnectionCount", "ConnectionCloseRate", "ConnectionCount", "ConnectionCreationRate", "ConnTrackAllowanceExceeded", "CPUCreditBalance", "CpuCreditUsage", "CpuIdle", "CpuIoWait", "CpuSystem", "CpuUser", "EstimatedMaxTimeLag", "EstimatedTimeLag", "FetchConsumerLocalTimeMsMean", "FetchConsumerRequestQueueTimeMsMean", "FetchConsumerResponseQueueTimeMsMean", "FetchConsumerResponseSendTimeMsMean", "FetchConsumerTotalTimeMsMean", "FetchFollowerLocalTimeMsMean", "FetchFollowerRequestQueueTimeMsMean", "FetchFollowerResponseQueueTimeMsMean", "FetchFollowerResponseSendTimeMsMean", "FetchFollowerTotalTimeMsMean", "FetchMessageConversionsPerSec", "FetchThrottleByteRate", "FetchThrottleQueueSize", "FetchThrottleTime", "GlobalPartitionCount", "GlobalTopicCount", "HeapMemoryAfterGC", "KafkaAppLogsDiskUsed", "KafkaDataLogsDiskUsed", "LeaderCount", "MaxOffsetLag", "MemoryBuffered", "MemoryCached", "MemoryFree", "MemoryUsed", "MessagesInPerSec", "NetworkProcessorAvgIdlePercent", "NetworkRxDropped", "NetworkRxErrors", "NetworkRxPackets", "NetworkTxDropped", "NetworkTxErrors", "NetworkTxPackets", "OfflinePartitionsCount", "OffsetLag", "PartitionCount", "PpsAllowanceExceeded", "ProduceLocalTimeMsMean", "ProduceMessageConversionsPerSec", "ProduceMessageConversionsTimeMsMean", "ProduceRequestQueueTimeMsMean", "ProduceResponseQueueTimeMsMean", "ProduceResponseSendTimeMsMean", "ProduceThrottleByteRate", "ProduceThrottleQueueSize", "ProduceThrottleTime", "ProduceTotalTimeMsMean", "RemoteCopyBytesPerSec", "RemoteCopyErrorsPerSec", "RemoteCopyLagBytes", "RemoteFetchBytesPerSec", "RemoteFetchErrorsPerSec", "RemoteFetchRequestsPerSec", "RemoteLogManagerTasksAvgIdlePercent", "RemoteLogReaderAvgIdlePercent", "RemoteLogReaderTaskQueueSize", "ReplicationBytesInPerSec", "ReplicationBytesOutPerSec", "RequestBytesMean", "RequestExemptFromThrottleTime", "RequestHandlerAvgIdlePercent", "RequestThrottleQueueSize", "RequestThrottleTime", "RequestTime", "RootDiskUsed", "SumOffsetLag", "SwapFree", "SwapUsed", "TcpConnections", "TrafficBytes", "TrafficShaping", "UnderMinIsrPartitionCount", "UnderReplicatedPartitions", "VolumeQueueLength", "VolumeReadBytes", "VolumeReadOps", "VolumeTotalReadTime", "VolumeTotalWriteTime", "VolumeWriteBytes", "VolumeWriteOps", "ZooKeeperRequestLatencyMsMean", "ZooKeeperSessionState"},
+	"AWS/KafkaConnect":                   {"BytesInPerSec", "BytesOutPerSec", "CpuUtilization", "ErroredTaskCount", "MemoryUtilization", "RebalanceCompletedTotal", "RebalanceTimeAvg", "RebalanceTimeMax", "RebalanceTimeSinceLast", "RunningTaskCount", "SinkRecordReadRate", "SinkRecordSendRate", "SourceRecordPollRate", "SourceRecordWriteRate", "TaskStartupAttemptsTotal", "TaskStartupSuccessPercentage", "WorkerCount"},
+	"AWS/Kinesis":                        {"GetRecords.Bytes", "GetRecords.IteratorAge", "GetRecords.IteratorAgeMilliseconds", "GetRecords.Latency", "GetRecords.Records", "GetRecords.Success", "IncomingBytes", "IncomingRecords", "IteratorAgeMilliseconds", "OutgoingBytes", "OutgoingRecords", "PutRecord.Bytes", "PutRecord.Latency", "PutRecord.Success", "PutRecords.Bytes", "PutRecords.Latency", "PutRecords.Records", "PutRecords.Success", "ReadProvisionedThroughputExceeded", "SubscribeToShard.RateExceeded", "SubscribeToShard.Success", "SubscribeToShardEvent.Bytes", "SubscribeToShardEvent.MillisBehindLatest", "SubscribeToShardEvent.Records", "SubscribeToShardEvent.Success", "WriteProvisionedThroughputExceeded"},
+	"AWS/KinesisAnalytics":               {"Bytes", "InputProcessing.DroppedRecords", "InputProcessing.Duration", "InputProcessing.OkBytes", "InputProcessing.OkRecords", "InputProcessing.ProcessingFailedRecords", "InputProcessing.Success", "KPUs", "LambdaDelivery.DeliveryFailedRecords", "LambdaDelivery.Duration", "LambdaDelivery.OkRecords", "MillisBehindLatest", "Records", "Success"},
+	"AWS/KinesisVideo":                   {"GetHLSMasterPlaylist.Latency", "GetHLSMasterPlaylist.Requests", "GetHLSMasterPlaylist.Success", "GetHLSMediaPlaylist.Latency", "GetHLSMediaPlaylist.Requests", "GetHLSMediaPlaylist.Success", "GetHLSStreamingSessionURL.Latency", "GetHLSStreamingSessionURL.Requests", "GetHLSStreamingSessionURL.Success", "GetMP4InitFragment.Latency", "GetMP4InitFragment.Requests", "GetMP4InitFragment.Success", "GetMP4MediaFragment.Latency", "GetMP4MediaFragment.OutgoingBytes", "GetMP4MediaFragment.Requests", "GetMP4MediaFragment.Success", "GetMedia.ConnectionErrors", "GetMedia.MillisBehindNow", "GetMedia.OutgoingBytes", "GetMedia.OutgoingFragments", "GetMedia.OutgoingFrames", "GetMedia.Requests", "GetMedia.Success", "GetMediaForFragmentList.OutgoingBytes", "GetMediaForFragmentList.OutgoingFragments", "GetMediaForFragmentList.OutgoingFrames", "GetMediaForFragmentList.Requests", "GetMediaForFragmentList.Success", "GetTSFragment.Latency", "GetTSFragment.OutgoingBytes", "GetTSFragment.Requests", "GetTSFragment.Success", "ListFragments.Latency", "PutMedia.ActiveConnections", "PutMedia.BufferingAckLatency", "PutMedia.ConnectionErrors", "PutMedia.ErrorAckCount", "PutMedia.FragmentIngestionLatency", "PutMedia.FragmentPersistLatency", "PutMedia.IncomingBytes", "PutMedia.IncomingFragments", "PutMedia.IncomingFrames", "PutMedia.Latency", "PutMedia.PersistedAckLatency", "PutMedia.ReceivedAckLatency", "PutMedia.Requests", "PutMedia.Success"},
+	"AWS/Lambda":                         {"AsyncEventAge", "AsyncEventsDropped", "AsyncEventsReceived", "ClaimedAccountConcurrency", "ConcurrentExecutions", "DeadLetterErrors", "DestinationDeliveryFailures", "Duration", "Errors", "Invocations", "IteratorAge", "OffsetLag", "OversizedRecordCount", "PostRuntimeExtensionsDuration", "ProvisionedConcurrencyInvocations", "ProvisionedConcurrencySpilloverInvocations", "ProvisionedConcurrencyUtilization", "ProvisionedConcurrentExecutions", "RecursiveInvocationsDropped", "Throttles", "UnreservedConcurrentExecutions"},
+	"AWS/Lex":                            {"BotChannelAuthErrors", "BotChannelConfigurationErrors", "BotChannelInboundThrottledEvents", "BotChannelOutboundThrottledEvents", "BotChannelRequestCount", "BotChannelResponseCardErrors", "BotChannelSystemErrors", "MissedUtteranceCount", "RuntimeInvalidLambdaResponses", "RuntimeLambdaErrors", "RuntimePollyErrors", "RuntimeRequestCount", "RuntimeSucessfulRequestLatency", "RuntimeSystemErrors", "RuntimeThrottledEvents", "RuntimeUserErrors"},
+	"AWS/Logs":                           {"DeliveryErrors", "DeliveryThrottling", "ForwardedBytes", "ForwardedLogEvents", "IncomingBytes", "IncomingLogEvents"},
+	"AWS/LookoutMetrics":                 {"ExecutionsStarted", "ExecutionsSucceeded", "ExecutionsFailed", "Delivered", "Undelivered"},
+	"AWS/ML":                             {"PredictCount", "PredictFailureCount"},
+	"AWS/MediaConnect":                   {"ARQRecovered", "ARQRequests", "BitRate", "CATError", "CRCError", "Connected", "ConnectedOutputs", "ConnectionAttempts", "ConsecutiveDrops", "ConsecutiveNotRecovered", "ContinuityCounter", "Disconnections", "DroppedPackets", "EgressBridgeBitRate", "EgressBridgeCATError", "EgressBridgeCRCError", "EgressBridgeContinuityCounter", "EgressBridgeDroppedPackets", "EgressBridgeFailoverSwitches", "EgressBridgeMergeActive", "EgressBridgeNotRecoveredPackets", "EgressBridgePATError", "EgressBridgePCRAccuracyError", "EgressBridgePCRError", "EgressBridgePIDError", "EgressBridgePMTError", "EgressBridgePTSError", "EgressBridgePacketLossPercent", "EgressBridgeRecoveredPackets", "EgressBridgeSourceBitRate", "EgressBridgeSourceCATError", "EgressBridgeSourceCRCError", "EgressBridgeSourceContinuityCounter", "EgressBridgeSourceDroppedPackets", "EgressBridgeSourceMergeActive", "EgressBridgeSourceMergeLatency", "EgressBridgeSourceNotRecoveredPackets", "EgressBridgeSourcePATError", "EgressBridgeSourcePCRAccuracyError", "EgressBridgeSourcePCRError", "EgressBridgeSourcePIDError", "EgressBridgeSourcePMTError", "EgressBridgeSourcePTSError", "EgressBridgeSourcePacketLossPercent", "EgressBridgeSourceRecoveredPackets", "EgressBridgeSourceTSByteError", "EgressBridgeSourceTSSyncLoss", "EgressBridgeSourceTotalPackets", "EgressBridgeSourceTransportError", "EgressBridgeTSByteError", "EgressBridgeTSSyncLoss", "EgressBridgeTotalPackets", "EgressBridgeTransportError", "FailoverSwitches", "IngressBridgeBitRate", "IngressBridgeCATError", "IngressBridgeCRCError", "IngressBridgeContinuityCounter", "IngressBridgeDroppedPackets", "IngressBridgeFailoverSwitches", "IngressBridgeMergeActive", "IngressBridgeNotRecoveredPackets", "IngressBridgePATError", "IngressBridgePCRAccuracyError", "IngressBridgePCRError", "IngressBridgePIDError", "IngressBridgePMTError", "IngressBridgePTSError", "IngressBridgePacketLossPercent", "IngressBridgeRecoveredPackets", "IngressBridgeSourceARQRecovered", "IngressBridgeSourceARQRequests", "IngressBridgeSourceBitRate", "IngressBridgeSourceCATError", "IngressBridgeSourceCRCError", "IngressBridgeSourceContinuityCounter", "IngressBridgeSourceDroppedPackets", "IngressBridgeSourceFECPackets", "IngressBridgeSourceFECRecovered", "IngressBridgeSourceMergeActive", "IngressBridgeSourceMergeLatency", "IngressBridgeSourceNotRecoveredPackets", "IngressBridgeSourceOverflowPackets", "IngressBridgeSourcePATError", "IngressBridgeSourcePCRAccuracyError", "IngressBridgeSourcePCRError", "IngressBridgeSourcePIDError", "IngressBridgeSourcePMTError", "IngressBridgeSourcePTSError", "IngressBridgeSourcePacketLossPercent", "IngressBridgeSourceRecoveredPackets", "IngressBridgeSourceRoundTripTime", "IngressBridgeSourceTotalPackets", "IngressBridgeSourceTSByteError", "IngressBridgeSourceTSSyncLoss", "IngressBridgeSourceTransportError", "IngressBridgeTSByteError", "IngressBridgeTSSyncLoss", "IngressBridgeTotalPackets", "IngressBridgeTransportError", "Jitter", "Latency", "MaintenanceCanceled", "MaintenanceFailed", "MaintenanceRescheduled", "MaintenanceScheduled", "MaintenanceStarted", "MaintenanceSucceeded", "MergeActive", "MergeLatency", "NotRecoveredPackets", "OutputConnected", "OutputDisconnections", "OutputDroppedPayloads", "OutputLatePayloads", "OutputTotalBytes", "OutputTotalPayloads", "OverflowPackets", "PATError", "PCRAccuracyError", "PCRError", "PIDError", "PMTError", "PTSError", "PacketLossPercent", "RecoveredPackets", "RoundTripTime", "SourceARQRecovered", "SourceARQRequests", "SourceBitRate", "SourceCATError", "SourceCRCError", "SourceConnected", "SourceContinuityCounter", "SourceDisconnections", "SourceDroppedPackets", "SourceDroppedPayloads", "SourceFECPackets", "SourceFECRecovered", "SourceLatePayloads", "SourceMergeActive", "SourceMergeLatency", "SourceMergeStatusWarnMismatch", "SourceMergeStatusWarnSolo", "SourceMissingPackets", "SourceNotRecoveredPackets", "SourceOverflowPackets", "SourcePATError", "SourcePCRAccuracyError", "SourcePCRError", "SourcePIDError", "SourcePMTError", "SourcePTSError", "SourcePacketLossPercent", "SourceRecoveredPackets", "SourceRoundTripTime", "SourceSelected", "SourceTSByteError", "SourceTSSyncLoss", "SourceTotalBytes", "SourceTotalPackets", "SourceTotalPayloads", "SourceTransportError", "TSByteError", "TSSyncLoss", "TotalPackets", "TransportError", "Uptime"},
+	"AWS/MediaConvert":                   {"AudioOutputSeconds", "Errors", "HDOutputSeconds", "JobsCompletedCount", "JobsErroredCount", "SDOutputSeconds", "StandbyTime", "TranscodingTime", "UHDOutputSeconds"},
+	"AWS/MediaPackage":                   {"ActiveInput", "EgressBytes", "EgressRequestCount", "EgressResponseTime", "IngressBytes", "IngressResponseTime"},
+	"AWS/MediaLive":                      {"ActiveAlerts", "ActiveOutputs", "ChannelInputErrorSeconds", "ConfiguredBitrate", "ConfiguredBitrateAvailable", "DroppedFrames", "EncoderBitrate", "EncoderRunning", "ErrorSeconds", "FillMsec", "InputLocked", "InputLossSeconds", "InputTimecodesPresent", "InputVideoFrameRate", "LinkedToStreamEndpoint", "NetworkIn", "NetworkOut", "NotRecoveredPackets", "Output4xxErrors", "Output5xxErrors", "OutputAudioLevelDbfs", "OutputAudioLevelLkfs", "PipelinesLocked", "PrimaryInputActive", "RecoveredPackets", "Streaming", "SvqTime", "Temperature", "TotalPackets", "UsingHDMI", "UsingSDI"},
+	"AWS/MediaStore":                     {"RequestCount", "4xxErrorCount", "5xxErrorCount", "BytesUploaded", "BytesDownloaded", "TotalTime", "TurnaroundTime"},
+	"AWS/MediaTailor":                    {"AdDecisionServer.Ads", "AdDecisionServer.Duration", "AdDecisionServer.Errors", "AdDecisionServer.FillRate", "AdDecisionServer.Timeouts", "AdNotReady", "Avails.Duration", "Avails.FillRate", "Avails.FilledDuration", "GetManifest.Errors", "Origin.Errors", "Origin.Timeouts"},
+	"AWS/MemoryDB":                       {"ActiveDefragHits", "AuthenticationFailures", "BytesUsedForMemoryDB", "CommandAuthorizationFailures", "CPUUtilization", "CurrConnections", "CurrItems", "DatabaseMemoryUsagePercentage", "DB0AverageTTL", "EngineCPUUtilization", "EvalBasedCmds", "Evictions", "FreeableMemory", "GeoSpatialBasedCmds", "GetTypeCmds", "HashBasedCmds", "HyperLogLogBasedCmds", "IsPrimary", "KeyAuthorizationFailures", "KeyBasedCmds", "KeyspaceHits", "KeyspaceMisses", "KeysTracked", "ListBasedCmds", "MaxReplicationThroughput", "MemoryFragmentationRatio", "NetworkBandwidthInAllowanceExceeded", "NetworkBandwidthOutAllowanceExceeded", "NetworkBytesIn", "NetworkBytesOut", "NetworkConntrackAllowanceExceeded", "NetworkPacketsIn", "NetworkPacketsOut", "NetworkPacketsPerSecondAllowanceExceeded", "NewConnections", "PrimaryLinkHealthStatus", "PubSubBasedCmds", "Reclaimed", "ReplicationBytes", "ReplicationDelayedWriteCommands", "ReplicationLag", "SetBasedCmds", "SetTypeCmds", "SortedSetBasedCmds", "StringBasedCmds", "StreamBasedCmds", "SwapUsage"},
+	"AWS/NATGateway":                     {"ActiveConnectionCount", "BytesInFromDestination", "BytesInFromSource", "BytesOutToDestination", "BytesOutToSource", "ConnectionAttemptCount", "ConnectionEstablishedCount", "ErrorPortAllocation", "IdleTimeoutCount", "PacketsDropCount", "PacketsInFromDestination", "PacketsInFromSource", "PacketsOutToDestination", "PacketsOutToSource"},
+	"AWS/Neptune":                        {"CPUUtilization", "ClusterReplicaLag", "ClusterReplicaLagMaximum", "ClusterReplicaLagMinimum", "EngineUptime", "FreeLocalStorage", "FreeableMemory", "GremlinErrors", "GremlinHttp1xx", "GremlinHttp2xx", "GremlinHttp4xx", "GremlinHttp5xx", "GremlinRequests", "GremlinRequestsPerSec", "GremlinWebSocketAvailableConnections", "GremlinWebSocketClientErrors", "GremlinWebSocketServerErrors", "GremlinWebSocketSuccess", "Http100", "Http101", "Http1xx", "Http200", "Http2xx", "Http400", "Http403", "Http405", "Http413", "Http429", "Http4xx", "Http500", "Http501", "Http5xx", "LoaderErrors", "LoaderRequests", "NetworkReceiveThroughput", "NetworkThroughput", "NetworkTransmitThroughput", "SparqlErrors", "SparqlHttp1xx", "SparqlHttp2xx", "SparqlHttp4xx", "SparqlHttp5xx", "SparqlRequests", "SparqlRequestsPerSec", "StatusErrors", "StatusRequests", "VolumeBytesUsed", "VolumeReadIOPs", "VolumeWriteIOPs"},
+	"AWS/NetworkELB":                     {"ActiveFlowCount", "ActiveFlowCount_TLS", "ClientTLSNegotiationErrorCount", "ConsumedLCUs", "HealthyHostCount", "NewFlowCount", "NewFlowCount_TLS", "ProcessedBytes", "ProcessedBytes_TLS", "TCP_Client_Reset_Count", "TCP_ELB_Reset_Count", "TCP_Target_Reset_Count", "TargetTLSNegotiationErrorCount", "UnHealthyHostCount"},
+	"AWS/GatewayELB":                     {"ActiveFlowCount", "ConsumedLCUs", "HealthyHostCount", "NewFlowCount", "ProcessedBytes", "UnHealthyHostCount"},
+	"AWS/NetworkFirewall":                {"DroppedPackets", "Packets", "PassedPackets", "ReceivedPacketCount"},
+	"AWS/OpsWorks":                       {"cpu_idle", "cpu_nice", "cpu_steal", "cpu_system", "cpu_user", "cpu_waitio", "load_1", "load_15", "load_5", "memory_buffers", "memory_cached", "memory_free", "memory_swap", "memory_total", "memory_used", "procs"},
+	"AWS/Polly":                          {"2XXCount", "4XXCount", "5XXCount", "RequestCharacters", "ResponseLatency"},
+	"AWS/PrivateLinkEndpoints":           {"ActiveConnections", "BytesProcessed", "NewConnections", "PacketsDropped", "RstPacketsReceived"},
+	"AWS/PrivateLinkServices":            {"ActiveConnections", "BytesProcessed", "EndpointsCount", "NewConnections", "RstPacketsReceived"},
+	"AWS/Prometheus":                     {"AlertManagerAlertsReceived", "AlertManagerNotificationsFailed", "AlertManagerNotificationsThrottled", "DiscardedSamples", "RuleEvaluations", "RuleEvaluationFailures", "RuleGroupIterationsMissed"},
+	"AWS/RDS":                            {"ActiveTransactions", "AuroraBinlogReplicaLag", "AuroraGlobalDBDataTransferBytes", "AuroraGlobalDBReplicatedWriteIO", "AuroraGlobalDBReplicationLag", "AuroraReplicaLag", "AuroraReplicaLagMaximum", "AuroraReplicaLagMinimum", "AvailabilityPercentage", "BacktrackChangeRecordsCreationRate", "BacktrackChangeRecordsStored", "BacktrackWindowActual", "BacktrackWindowAlert", "BackupRetentionPeriodStorageUsed", "BinLogDiskUsage", "BlockedTransactions", "BufferCacheHitRatio", "BurstBalance", "CPUCreditBalance", "CPUCreditUsage", "CPUUtilization", "ClientConnections", "ClientConnectionsClosed", "ClientConnectionsNoTLS", "ClientConnectionsReceived", "ClientConnectionsSetupFailedAuth", "ClientConnectionsSetupSucceeded", "ClientConnectionsTLS", "CommitLatency", "CommitThroughput", "DDLLatency", "DDLThroughput", "DMLLatency", "DMLThroughput", "DatabaseConnectionRequests", "DatabaseConnectionRequestsWithTLS", "DatabaseConnections", "DatabaseConnectionsBorrowLatency", "DatabaseConnectionsCurrentlyBorrowed", "DatabaseConnectionsCurrentlyInTransaction", "DatabaseConnectionsCurrentlySessionPinned", "DatabaseConnectionsSetupFailed", "DatabaseConnectionsSetupSucceeded", "DatabaseConnectionsWithTLS", "Deadlocks", "DeleteLatency", "DeleteThroughput", "DiskQueueDepth", "EBSByteBalance%", "EBSIOBalance%", "EngineUptime", "FailedSQLServerAgentJobsCount", "FreeLocalStorage", "FreeStorageSpace", "FreeableMemory", "InsertLatency", "InsertThroughput", "LoginFailures", "MaxDatabaseConnectionsAllowed", "MaximumUsedTransactionIDs", "NetworkReceiveThroughput", "NetworkThroughput", "NetworkTransmitThroughput", "OldestReplicationSlotLag", "Queries", "QueryDatabaseResponseLatency", "QueryRequests", "QueryRequestsNoTLS", "QueryRequestsTLS", "QueryResponseLatency", "RDSToAuroraPostgreSQLReplicaLag", "ReadIOPS", "ReadLatency", "ReadThroughput", "ReplicaLag", "ReplicationSlotDiskUsage", "ResultSetCacheHitRatio", "SelectLatency", "SelectThroughput", "ServerlessDatabaseCapacity", "SnapshotStorageUsed", "SwapUsage", "TotalBackupStorageBilled", "TransactionLogsDiskUsage", "TransactionLogsGeneration", "UpdateLatency", "UpdateThroughput", "VolumeBytesUsed", "VolumeReadIOPs", "VolumeWriteIOPs", "WriteIOPS", "WriteLatency", "WriteThroughput"},
+	"AWS/IVSRealTime":                    {"DroppedFrames", "PacketLoss", "PublishBitrate", "Publishers", "PublishResolution"},
+	"AWS/Redshift":                       {"CommitQueueLength", "ConcurrencyScalingActiveClusters", "ConcurrencyScalingSeconds", "CPUUtilization", "DatabaseConnections", "HealthStatus", "MaintenanceMode", "MaxConfiguredConcurrencyScalingClusters", "NetworkReceiveThroughput", "NetworkTransmitThroughput", "PercentageDiskSpaceUsed", "QueriesCompletedPerSecond", "QueryDuration", "QueryRuntimeBreakdown", "ReadIOPS", "ReadLatency", "ReadThroughput", "TotalTableCount", "WLMQueueLength", "WLMQueueWaitTime", "WLMQueriesCompletedPerSecond", "WLMQueryDuration", "WLMRunningQueries", "WriteIOPS", "WriteLatency", "WriteThroughput", "SchemaQuota", "NumExceededSchemaQuotas", "StorageUsed", "PercentageQuotaUsed"},
+	"AWS/Robomaker":                      {"RealTimeFactor", "vCPU", "Memory", "SimulationUnit"},
+	"AWS/Route53":                        {"ChildHealthCheckHealthyCount", "ConnectionTime", "DNSQueries", "HealthCheckPercentageHealthy", "HealthCheckStatus", "SSLHandshakeTime", "TimeToFirstByte"},
+	"AWS/Route53Resolver":                {"InboundQueryVolume", "OutboundQueryVolume", "OutboundQueryAggregatedVolume"},
+	"AWS/S3":                             {"4xxErrors", "5xxErrors", "AllRequests", "BucketSizeBytes", "BytesDownloaded", "BytesPendingReplication", "BytesUploaded", "DeleteRequests", "FirstByteLatency", "GetRequests", "HeadRequests", "ListRequests", "NumberOfObjects", "OperationsFailedReplication", "OperationsPendingReplication", "PostRequests", "PutRequests", "ReplicationLatency", "SelectRequests", "SelectReturnedBytes", "SelectScannedBytes", "TotalRequestLatency"},
+	"AWS/SDKMetrics":                     {"CallCount", "ClientErrorCount", "EndToEndLatency", "ConnectionErrorCount", "ServerErrorCount", "ThrottleCount"},
+	"AWS/ServiceCatalog":                 {"ProvisionedProductLaunch"},
+	"AWS/SES":                            {"Bounce", "Clicks", "Complaint", "Delivery", "Opens", "Reject", "Rendering Failures", "Reputation.BounceRate", "Reputation.ComplaintRate", "Send"},
+	"AWS/SNS":                            {"NumberOfMessagesPublished", "NumberOfNotificationsDelivered", "NumberOfNotificationsFailed", "NumberOfNotificationsFilteredOut", "NumberOfNotificationsFilteredOut-InvalidAttributes", "NumberOfNotificationsFilteredOut-NoMessageAttributes", "PublishSize", "SMSMonthToDateSpentUSD", "SMSSuccessRate"},
+	"AWS/SQS":                            {"ApproximateAgeOfOldestMessage", "ApproximateNumberOfMessagesDelayed", "ApproximateNumberOfMessagesNotVisible", "ApproximateNumberOfMessagesVisible", "NumberOfEmptyReceives", "NumberOfMessagesDeleted", "NumberOfMessagesReceived", "NumberOfMessagesSent", "SentMessageSize"},
+	"AWS/SWF":                            {"ActivityTaskScheduleToCloseTime", "ActivityTaskScheduleToStartTime", "ActivityTaskStartToCloseTime", "ActivityTasksCanceled", "ActivityTasksCompleted", "ActivityTasksFailed", "ConsumedCapacity", "DecisionTaskScheduleToStartTime", "DecisionTaskStartToCloseTime", "DecisionTasksCompleted", "PendingTasks", "ProvisionedBucketSize", "ProvisionedRefillRate", "ScheduledActivityTasksTimedOutOnClose", "ScheduledActivityTasksTimedOutOnStart", "StartedActivityTasksTimedOutOnClose", "StartedActivityTasksTimedOutOnHeartbeat", "StartedDecisionTasksTimedOutOnClose", "ThrottledEvents", "WorkflowStartToCloseTime", "WorkflowsCanceled", "WorkflowsCompleted", "WorkflowsContinuedAsNew", "WorkflowsFailed", "WorkflowsTerminated", "WorkflowsTimedOut"},
+	"AWS/SageMaker":                      {"Invocation4XXErrors", "Invocation5XXErrors", "InvocationModelErrors", "Invocations", "InvocationsPerCopy", "InvocationsPerInstance", "ModelCacheHit", "ModelDownloadingTime", "ModelLatency", "ModelLoadingTime", "ModelLoadingWaitTime", "ModelSetupTime", "ModelUnloadingTime", "OverheadLatency"},
+	"/aws/sagemaker/Endpoints":           {"CPUReservation", "CPUUtilization", "CPUUtilizationNormalized", "DiskUtilization", "GPUMemoryUtilization", "GPUMemoryUtilizationNormalized", "GPUReservation", "GPUUtilization", "GPUUtilizationNormalized", "LoadedModelCount", "MemoryReservation", "MemoryUtilization"},
+	"/aws/sagemaker/InferenceComponents": {"CPUUtilizationNormalized", "GPUMemoryUtilizationNormalized", "GPUUtilizationNormalized", "MemoryUtilizationNormalized"},
+	"/aws/sagemaker/InferenceRecommendationsJobs": {"ClientInvocations", "ClientInvocationErrors", "ClientLatency", "NumberOfUsers"},
+	"AWS/SageMaker/LabelingJobs":                  {"ActiveWorkers", "DatasetObjectsAutoAnnotated", "DatasetObjectsHumanAnnotated", "DatasetObjectsLabelingFailed", "JobsFailed", "JobsSucceeded", "JobsStopped", "TasksAccepted", "TasksDeclined", "TasksReturned", "TasksSubmitted", "TimeSpent", "TotalDatasetObjectsLabeled"},
+	"AWS/SageMaker/ModelBuildingPipeline":         {"ExecutionStarted", "ExecutionFailed", "ExecutionSucceeded", "ExecutionStopped", "ExecutionDuration", "StepStarted", "StepFailed", "StepSucceeded", "StepStopped", "StepDuration"},
+	"/aws/sagemaker/ProcessingJobs":               {"CPUReservation", "CPUUtilization", "CPUUtilizationNormalized", "DiskUtilization", "GPUMemoryUtilization", "GPUMemoryUtilizationNormalized", "GPUReservation", "GPUUtilization", "GPUUtilizationNormalized", "MemoryReservation", "MemoryUtilization"},
+	"/aws/sagemaker/TrainingJobs":                 {"CPUReservation", "CPUUtilization", "CPUUtilizationNormalized", "DiskUtilization", "GPUMemoryUtilization", "GPUMemoryUtilizationNormalized", "GPUReservation", "GPUUtilization", "GPUUtilizationNormalized", "MemoryReservation", "MemoryUtilization"},
+	"/aws/sagemaker/TransformJobs":                {"CPUReservation", "CPUUtilization", "CPUUtilizationNormalized", "DiskUtilization", "GPUMemoryUtilization", "GPUMemoryUtilizationNormalized", "GPUReservation", "GPUUtilization", "GPUUtilizationNormalized", "MemoryReservation", "MemoryUtilization"},
+	"AWS/States":                                  {"ActivitiesFailed", "ActivitiesHeartbeatTimedOut", "ActivitiesScheduled", "ActivitiesStarted", "ActivitiesSucceeded", "ActivitiesTimedOut", "ActivityRunTime", "ActivityScheduleTime", "ActivityTime", "ConsumedCapacity", "ConsumedCapacity", "ExecutionThrottled", "ExecutionTime", "ExecutionsAborted", "ExecutionsFailed", "ExecutionsStarted", "ExecutionsSucceeded", "ExecutionsTimedOut", "ExpressExecutionBilledDuration", "ExpressExecutionBilledMemory", "ExpressExecutionMemory", "LambdaFunctionRunTime", "LambdaFunctionScheduleTime", "LambdaFunctionTime", "LambdaFunctionsFailed", "LambdaFunctionsScheduled", "LambdaFunctionsStarted", "LambdaFunctionsSucceeded", "LambdaFunctionsTimedOut", "ProvisionedBucketSize", "ProvisionedRefillRate", "ServiceIntegrationRunTime", "ServiceIntegrationScheduleTime", "ServiceIntegrationTime", "ServiceIntegrationsFailed", "ServiceIntegrationsScheduled", "ServiceIntegrationsStarted", "ServiceIntegrationsSucceeded", "ServiceIntegrationsTimedOut", "ThrottledEvents"},
+	"AWS/StorageGateway":                          {"CacheFree", "CacheHitPercent", "CachePercentDirty", "CachePercentUsed", "CacheUsed", "CloudBytesDownloaded", "CloudBytesUploaded", "CloudDownloadLatency", "QueuedWrites", "ReadBytes", "ReadTime", "TimeSinceLastRecoveryPoint", "TotalCacheSize", "UploadBufferFree", "UploadBufferPercentUsed", "UploadBufferUsed", "WorkingStorageFree", "WorkingStoragePercentUsed", "WorkingStorageUsed", "WriteBytes", "WriteTime"},
+	"AWS/Textract":                                {"ResponseTime", "ServerErrorCount", "SuccessfulRequestCount", "ThrottledCount", "UserErrorCount"},
+	"AWS/Timestream":                              {"SuccessfulRequestLatency", "SystemErrors", "UserErrors", "DataScannedBytes"},
+	"AWS/ThingsGraph":                             {"EventStoreQueueSize", "FlowExecutionTime", "FlowExecutionsFailed", "FlowExecutionsStarted", "FlowExecutionsSucceeded", "FlowStepExecutionTime", "FlowStepExecutionsFailed", "FlowStepExecutionsStarted", "FlowStepExecutionsSucceeded"},
+	"AWS/TransitGateway":                          {"BytesIn", "BytesOut", "PacketDropCountBlackhole", "PacketDropCountNoRoute", "PacketsIn", "PacketsOut"},
+	"AWS/Transfer":                                {"BytesIn", "BytesOut", "FilesIn", "FilesOut", "InboundMessage", "InboundFailedMessage", "OnPartialUploadExecutionsStarted", "OnPartialUploadExecutionsSuccess", "OnPartialUploadExecutionsFailed", "OnUploadExecutionsStarted", "OnUploadExecutionsSuccess", "OnUploadExecutionsFailed"},
+	"AWS/Translate":                               {"CharacterCount", "ResponseTime", "ServerErrorCount", "SuccessfulRequestCount", "ThrottledCount", "UserErrorCount"},
+	"AWS/TrustedAdvisor":                          {"GreenChecks", "RedChecks", "RedResources", "ServiceLimitUsage", "YellowChecks", "YellowResources"},
+	"AWS/Usage":                                   {"CallCount", "ResourceCount"},
+	"AWS/VPN":                                     {"TunnelDataIn", "TunnelDataOut", "TunnelState"},
+	"AWS/WAF":                                     {"AllowedRequests", "BlockedRequests", "CountedRequests", "PassedRequests"},
+	"AWS/WAFV2":                                   {"AllowedRequests", "BlockedRequests", "CountedRequests", "PassedRequests"},
+	"AWS/WorkSpaces":                              {"Available", "ConnectionAttempt", "ConnectionFailure", "ConnectionSuccess", "InSessionLatency", "Maintenance", "SessionDisconnect", "SessionLaunchTime", "Stopped", "Unhealthy", "UserConnected"},
+	"ECS/ContainerInsights":                       {"ContainerInstanceCount", "CpuUtilized", "CpuReserved", "DeploymentCount", "DesiredTaskCount", "MemoryUtilized", "MemoryReserved", "NetworkRxBytes", "NetworkTxBytes", "PendingTaskCount", "RunningTaskCount", "ServiceCount", "StorageReadBytes", "StorageWriteBytes", "TaskCount", "TaskSetCount", "instance_cpu_limit", "instance_cpu_reserved_capacity", "instance_cpu_usage_total", "instance_cpu_utilization", "instance_filesystem_utilization", "instance_memory_limit", "instance_memory_reserved_capacity", "instance_memory_utliization", "instance_memory_working_set", "instance_network_total_bytes", "instance_number_of_running_tasks"},
+	"ContainerInsights":                           {"cluster_failed_node_count", "cluster_node_count", "namespace_number_of_running_pods", "node_cpu_limit", "node_cpu_reserved_capacity", "node_cpu_usage_total", "node_cpu_utilization", "node_filesystem_utilization", "node_memory_limit", "node_memory_reserved_capacity", "node_memory_utilization", "node_memory_working_set", "node_network_total_bytes", "node_number_of_running_containers", "node_number_of_running_pods", "pod_cpu_reserved_capacity", "pod_cpu_utilization", "pod_cpu_utilization_over_pod_limit", "pod_memory_reserved_capacity", "pod_memory_utilization", "pod_memory_utilization_over_pod_limit", "pod_number_of_container_restarts", "pod_network_rx_bytes", "pod_network_tx_bytes", "service_number_of_running_pods"},
+	"AWS/Rekognition":                             {"DetectedFaceCount", "DetectedLabelCount", "ResponseTime", "ServerErrorCount", "SuccessfulRequestCount", "ThrottledCount", "UserErrorCount"},
+	"AWS/Cassandra":                               {"AccountMaxReads", "AccountMaxTableLevelReads", "AccountMaxTableLevelWrites", "AccountMaxWrites", "AccountProvisionedReadCapacityUtilization", "AccountProvisionedWriteCapacityUtilization", "ConditionalCheckFailedRequests", "ConsumedReadCapacityUnits", "ConsumedWriteCapacityUnits", "MaxProvisionedTableReadCapacityUtilization", "MaxProvisionedTableWriteCapacityUtilization", "ReturnedItemCount", "ReturnedItemCountBySelect", "SuccessfulRequestCount", "SuccessfulRequestLatency", "SystemErrors", "UserErrors"},
+	"AWS/AmplifyHosting":                          {"Requests", "BytesDownloaded", "BytesUploaded", "4XXErrors", "5XXErrors", "Latency"},
+	"CloudWatchSynthetics":                        {"SuccessPercent", "Duration", "2xx", "4xx", "5xx", "Failed", "Failed requests", "VisualMonitoringSuccessPercent", "VisualMonitoringTotalComparisons"},
 }
 
 var NamespaceDimensionKeysMap = map[string][]string{
-	"AWS/ACMPrivateCA":            {},
-	"AWS/AmazonMQ":                {"Broker", "NetworkConnector", "Queue", "Topic", "Node", "Virtual host"},
-	"AWS/ApiGateway":              {"ApiId", "ApiName", "Method", "Resource", "Route", "Stage"},
-	"AWS/AppFlow":                 {"FlowName"},
-	"AWS/AppRunner":               {"Instance", "ServiceID", "ServiceName"},
-	"AWS/AppStream":               {"Fleet"},
-	"AWS/AppSync":                 {"GraphQLAPIId"},
-	"AWS/ApplicationELB":          {"AvailabilityZone", "LoadBalancer", "TargetGroup"},
-	"AWS/Athena":                  {"QueryState", "QueryType", "WorkGroup"},
-	"AWS/AutoScaling":             {"AutoScalingGroupName"},
-	"AWS/Backup":                  {"BackupVaultName", "ResourceType"},
-	"AWS/Billing":                 {"Currency", "LinkedAccount", "ServiceName"},
-	"AWS/CertificateManager":      {"CertificateArn"},
-	"AWS/Chatbot":                 {"ConfigurationName"},
-	"AWS/ClientVPN":               {"Endpoint"},
-	"AWS/CloudFront":              {"DistributionId", "Region"},
-	"AWS/CloudHSM":                {"ClusterId", "HsmId", "Region"},
-	"AWS/CloudSearch":             {"ClientId", "DomainName"},
-	"AWS/CodeBuild":               {"ProjectName"},
-	"AWS/CodeGuruProfiler":        {},
-	"AWS/Cognito":                 {"Operation", "RiskLevel", "UserPoolId", "UserPool", "UserPoolClient", "IdentityProvider"},
-	"AWS/Connect":                 {"InstanceId", "MetricGroup", "ContactFlowName", "SigningKeyId", "TypeOfConnection", "Participant", "QueueName", "StreamType"},
-	"AWS/DataLifecycleManager":    {"DLMPolicyId"},
-	"AWS/DataSync":                {"AgentId", "TaskId"},
-	"AWS/DDoSProtection":          {"ResourceArn", "AttackVector", "MitigationAction", "Protocol", "SourcePort", "DestinationPort", "SourceIp", "SourceAsn", "TcpFlags"},
-	"AWS/DMS":                     {"ReplicationInstanceIdentifier", "ReplicationTaskIdentifier"},
-	"AWS/DocDB":                   {"DBClusterIdentifier", "DBInstanceIdentifier", "Role"},
-	"AWS/DX":                      {"ConnectionId", "OpticalLaneNumber", "VirtualInterfaceId"},
-	"AWS/DAX":                     {"Account", "ClusterId", "NodeId"},
-	"AWS/DynamoDB":                {"DelegatedOperation", "GlobalSecondaryIndexName", "Operation", "OperationType", "ReceivingRegion", "StreamLabel", "TableName", "Verb"},
-	"AWS/EBS":                     {"VolumeId"},
-	"AWS/EC2":                     {"AutoScalingGroupName", "ImageId", "InstanceId", "InstanceType"},
-	"AWS/ElasticGPUs":             {"EGPUId", "InstanceId"},
-	"AWS/EC2/API":                 {},
-	"AWS/EC2CapacityReservations": {"CapacityReservationId"},
-	"AWS/EC2Spot":                 {"AvailabilityZone", "FleetRequestId", "InstanceType"},
-	"AWS/ECS":                     {"ClusterName", "ServiceName"},
-	"AWS/EFS":                     {"FileSystemId", "StorageClass"},
-	"AWS/ELB":                     {"AvailabilityZone", "LoadBalancerName"},
-	"AWS/ES":                      {"ClientId", "DomainName", "NodeId"},
-	"AWS/ElastiCache":             {"CacheClusterId", "CacheNodeId"},
-	"AWS/ElasticBeanstalk":        {"EnvironmentName", "InstanceId"},
-	"AWS/ElasticInference":        {"ElasticInferenceAcceleratorId", "InstanceId"},
-	"AWS/ElasticMapReduce":        {"ClusterId", "JobFlowId", "JobId"},
-	"AWS/ElasticTranscoder":       {"Operation", "PipelineId"},
-	"AWS/Events":                  {"EventBusName", "RuleName"},
-	"AWS/FSx":                     {"FileSystemId"},
-	"AWS/Firehose":                {"DeliveryStreamName"},
-	"AWS/FraudDetector":           {"DetectorID", "DetectorVersionID", "ModelEndpoint", "ModelID", "ModelType", "OutcomeName", "RuleID", "VariableName"},
-	"AWS/GameLift":                {"FleetId", "InstanceType", "MatchmakingConfigurationName", "MatchmakingConfigurationName-RuleName", "MetricGroups", "OperatingSystem", "QueueName"},
-	"AWS/GlobalAccelerator":       {"Accelerator", "Listener", "EndpointGroup", "SourceRegion", "DestinationEdge", "TransportProtocol", "AcceleratorIPAddress"},
-	"AWS/Glue":                    {"JobName", "JobRunId", "Type"},
-	"AWS/GroundStation":           {"Channel", "Polarization", "SatelliteId"},
-	"AWS/Inspector":               {},
-	"AWS/IVS":                     {"Channel", "ViewerCountryCode"},
-	"AWS/IoT":                     {"ActionType", "BehaviorName", "CheckName", "JobId", "Protocol", "RuleName", "ScheduledAuditName", "SecurityProfileName"},
-	"AWS/IoTAnalytics":            {"ActionType", "ChannelName", "DatasetName", "DatastoreName", "PipelineActivityName", "PipelineActivityType", "PipelineName"},
-	"AWS/IoTSiteWise":             {"GatewayId", "SourceName"},
-	"AWS/KMS":                     {"KeyId"},
-	"AWS/Kafka":                   {"Broker ID", "Cluster Name", "Consumer Group", "Topic"},
-	"AWS/Kinesis":                 {"ShardId", "StreamName"},
-	"AWS/KinesisAnalytics":        {"Application", "Flow", "Id"},
-	"AWS/KinesisVideo":            {"StreamName"},
-	"AWS/Lambda":                  {"ExecutedVersion", "FunctionName", "Resource"},
-	"AWS/Lex":                     {"BotAlias", "BotChannelName", "BotName", "BotVersion", "InputMode", "Operation", "Source"},
-	"AWS/Logs":                    {"DestinationType", "FilterName", "LogGroupName"},
-	"AWS/LookoutMetrics":          {"AlertArn", "AnomalyDetectorArn"},
-	"AWS/ML":                      {"MLModelId", "RequestMode"},
-	"AWS/MediaConnect":            {"AvailabilityZone", "FlowARN", "SourceARN", "OutputARN"},
-	"AWS/MediaConvert":            {"Job", "Operation", "Queue"},
-	"AWS/MediaPackage":            {"Channel", "No Dimension", "OriginEndpoint", "StatusCodeRange"},
-	"AWS/MediaStore":              {"ContainerName", "ObjectGroupName", "RequestType"},
-	"AWS/MediaTailor":             {"ConfigurationName"},
-	"AWS/MemoryDB":                {"ClusterName", "NodeName"},
-	"AWS/NATGateway":              {"NatGatewayId"},
-	"AWS/Neptune":                 {"DBClusterIdentifier", "DatabaseClass", "EngineName", "Role"},
-	"AWS/NetworkELB":              {"AvailabilityZone", "LoadBalancer", "TargetGroup"},
-	"AWS/GatewayELB":              {"AvailabilityZone", "LoadBalancer", "TargetGroup"},
-	"AWS/NetworkFirewall":         {"AvailabilityZone", "CustomAction", "Engine", "FirewallName"},
-	"AWS/OpsWorks":                {"InstanceId", "LayerId", "StackId"},
-	"AWS/Polly":                   {"Operation"},
-	"AWS/PrivateLinkEndpoints":    {"Endpoint Type", "Service Name", "Subnet Id", "VPC Endpoint Id", "VPC Id"},
-	"AWS/PrivateLinkServices":     {"Az", "Load Balancer Arn", "Service Id", "VPC Endpoint Id"},
-	"AWS/Prometheus":              {"Reason", "RuleGroup", "Workspace"},
-	"AWS/RDS":                     {"DBClusterIdentifier", "DBInstanceIdentifier", "DatabaseClass", "DbClusterIdentifier", "EndpointName", "EngineName", "ProxyName", "Role", "SourceRegion", "Target", "TargetGroup", "TargetRole"},
-	"AWS/Redshift":                {"ClusterIdentifier", "NodeID", "service class", "stage", "latency", "wlmid"},
-	"AWS/Robomaker":               {"SimulationJobId"},
-	"AWS/Route53":                 {"HealthCheckId", "Region", "HostedZoneId"},
-	"AWS/Route53Resolver":         {"EndpointId"},
-	"AWS/S3":                      {"BucketName", "DestinationBucket", "FilterId", "RuleId", "SourceBucket", "StorageType"},
-	"AWS/SDKMetrics":              {"DestinationRegion", "Service"},
-	"AWS/ServiceCatalog":          {"State", "ProductId", "ProvisioningArtifactId"},
-	"AWS/SES":                     {},
-	"AWS/SNS":                     {"Application", "Country", "Platform", "SMSType", "TopicName"},
-	"AWS/SQS":                     {"QueueName"},
-	"AWS/SWF":                     {"APIName", "ActivityTypeName", "ActivityTypeVersion", "DecisionName", "Domain", "TaskListName", "WorkflowTypeName", "WorkflowTypeVersion"},
-	"AWS/SageMaker":               {"EndpointName", "Host", "LabelingJobName", "VariantName"},
-	"AWS/States":                  {"APIName", "ActivityArn", "LambdaFunctionArn", "ServiceIntegrationResourceArn", "ServiceName", "StateMachineArn"},
-	"AWS/StorageGateway":          {"GatewayId", "GatewayName", "VolumeId"},
-	"AWS/Textract":                {},
-	"AWS/Timestream":              {"Operation", "DatabaseName", "TableName"},
-	"AWS/ThingsGraph":             {"FlowTemplateId", "StepName", "SystemTemplateId"},
-	"AWS/TransitGateway":          {"TransitGateway", "TransitGatewayAttachment"},
-	"AWS/Transfer":                {"ServerId"},
-	"AWS/Translate":               {"LanguagePair", "Operation"},
-	"AWS/TrustedAdvisor":          {},
-	"AWS/Usage":                   {"Class", "Resource", "Service", "Type"},
-	"AWS/VPN":                     {"TunnelIpAddress", "VpnId"},
-	"AWS/WAF":                     {"Region", "Rule", "RuleGroup", "WebACL"},
-	"AWS/WAFV2":                   {"Region", "Rule", "RuleGroup", "WebACL"},
-	"AWS/WorkSpaces":              {"DirectoryId", "WorkspaceId"},
-	"ECS/ContainerInsights":       {"ClusterName", "ServiceName", "TaskDefinitionFamily", "EC2InstanceId", "ContainerInstanceId"},
-	"ContainerInsights":           {"ClusterName", "NodeName", "Namespace", "InstanceId", "PodName", "Service"},
-	"AWS/Rekognition":             {},
-	"AWS/Cassandra":               {"Keyspace", "Operation", "TableName"},
-	"AWS/AmplifyHosting":          {"App"},
-	"CloudWatchSynthetics":        {"CanaryName", "StepName"},
+	"AWS/ACMPrivateCA":                   {},
+	"AWS/AmazonMQ":                       {"Broker", "NetworkConnector", "Queue", "Topic", "Node", "Virtual host"},
+	"AWS/ApiGateway":                     {"ApiId", "ApiName", "Method", "Resource", "Route", "Stage"},
+	"AWS/AppFlow":                        {"FlowName"},
+	"AWS/AppRunner":                      {"Instance", "ServiceID", "ServiceName"},
+	"AWS/AppStream":                      {"Fleet"},
+	"AWS/AppSync":                        {"GraphQLAPIId"},
+	"AWS/ApplicationELB":                 {"AvailabilityZone", "LoadBalancer", "TargetGroup"},
+	"AWS/Athena":                         {"QueryState", "QueryType", "WorkGroup"},
+	"AWS/AutoScaling":                    {"AutoScalingGroupName", "PairIndex", "PolicyName"},
+	"AWS/Backup":                         {"BackupVaultName", "ResourceType"},
+	"AWS/Bedrock":                        {"BucketedStepSize", "ImageSize", "ModelId"},
+	"AWS/Billing":                        {"Currency", "LinkedAccount", "ServiceName"},
+	"AWS/CertificateManager":             {"CertificateArn"},
+	"AWS/Chatbot":                        {"ConfigurationName"},
+	"AWS/ClientVPN":                      {"Endpoint"},
+	"AWS/CloudFront":                     {"DistributionId", "Region"},
+	"AWS/CloudHSM":                       {"ClusterId", "HsmId", "Region"},
+	"AWS/CloudSearch":                    {"ClientId", "DomainName"},
+	"AWS/CodeBuild":                      {"ProjectName"},
+	"AWS/CodeGuruProfiler":               {},
+	"AWS/Cognito":                        {"Operation", "RiskLevel", "UserPoolId", "UserPool", "UserPoolClient", "IdentityProvider"},
+	"AWS/Connect":                        {"InstanceId", "MetricGroup", "ContactFlowName", "SigningKeyId", "TypeOfConnection", "Participant", "QueueName", "StreamType"},
+	"AWS/DataLifecycleManager":           {"DLMPolicyId"},
+	"AWS/DataSync":                       {"AgentId", "TaskId"},
+	"AWS/DDoSProtection":                 {"ResourceArn", "AttackVector", "MitigationAction", "Protocol", "SourcePort", "DestinationPort", "SourceIp", "SourceAsn", "TcpFlags"},
+	"AWS/DMS":                            {"ReplicationInstanceIdentifier", "ReplicationTaskIdentifier"},
+	"AWS/DocDB":                          {"DBClusterIdentifier", "DBInstanceIdentifier", "Role"},
+	"AWS/DX":                             {"ConnectionId", "OpticalLaneNumber", "VirtualInterfaceId"},
+	"AWS/DAX":                            {"Account", "ClusterId", "NodeId"},
+	"AWS/DynamoDB":                       {"DelegatedOperation", "GlobalSecondaryIndexName", "Operation", "OperationType", "ReceivingRegion", "StreamLabel", "TableName", "Verb"},
+	"AWS/EBS":                            {"VolumeId"},
+	"AWS/EC2":                            {"AutoScalingGroupName", "ImageId", "InstanceId", "InstanceType"},
+	"AWS/ElasticGPUs":                    {"EGPUId", "InstanceId"},
+	"AWS/EC2/API":                        {},
+	"AWS/EC2CapacityReservations":        {"CapacityReservationId"},
+	"AWS/EC2Spot":                        {"AvailabilityZone", "FleetRequestId", "InstanceType"},
+	"AWS/ECS":                            {"ClusterName", "ServiceName"},
+	"AWS/EFS":                            {"FileSystemId", "StorageClass"},
+	"AWS/ELB":                            {"AvailabilityZone", "LoadBalancerName"},
+	"AWS/ES":                             {"ClientId", "DomainName", "NodeId"},
+	"AWS/ElastiCache":                    {"CacheClusterId", "CacheNodeId"},
+	"AWS/ElasticBeanstalk":               {"EnvironmentName", "InstanceId"},
+	"AWS/ElasticInference":               {"ElasticInferenceAcceleratorId", "InstanceId"},
+	"AWS/ElasticMapReduce":               {"ClusterId", "JobFlowId", "JobId"},
+	"AWS/EMRServerless":                  {"ApplicationId", "WorkerType", "CapacityAllocationType"},
+	"AWS/ElasticTranscoder":              {"Operation", "PipelineId"},
+	"AWS/Events":                         {"EventBusName", "RuleName"},
+	"AWS/FSx":                            {"FileSystemId"},
+	"AWS/Firehose":                       {"DeliveryStreamName"},
+	"AWS/FraudDetector":                  {"DetectorID", "DetectorVersionID", "ModelEndpoint", "ModelID", "ModelType", "OutcomeName", "RuleID", "VariableName"},
+	"AWS/GameLift":                       {"GameServerGroup", "FleetId", "InstanceType", "Location", "MatchmakingConfigurationName", "MatchmakingConfigurationName-RuleName", "MetricGroup", "OperatingSystem", "QueueName"},
+	"AWS/GlobalAccelerator":              {"Accelerator", "Listener", "EndpointGroup", "SourceRegion", "DestinationEdge", "TransportProtocol", "AcceleratorIPAddress"},
+	"AWS/Glue":                           {"JobName", "JobRunId", "Type"},
+	"AWS/GroundStation":                  {"Channel", "Polarization", "SatelliteId"},
+	"AWS/Inspector":                      {},
+	"AWS/IVS":                            {"Channel", "ViewerCountryCode"},
+	"AWS/IoT":                            {"ActionType", "BehaviorName", "CheckName", "JobId", "Protocol", "RuleName", "ScheduledAuditName", "SecurityProfileName"},
+	"AWS/IoTAnalytics":                   {"ActionType", "ChannelName", "DatasetName", "DatastoreName", "PipelineActivityName", "PipelineActivityType", "PipelineName"},
+	"AWS/IoTSiteWise":                    {"GatewayId", "SourceName"},
+	"AWS/KMS":                            {"KeyId"},
+	"AWS/Kafka":                          {"Broker ID", "Cluster Name", "Consumer Group", "Topic"},
+	"AWS/Kinesis":                        {"ShardId", "StreamName"},
+	"AWS/KinesisAnalytics":               {"Application", "Flow", "Id"},
+	"AWS/KinesisVideo":                   {"StreamName"},
+	"AWS/Lambda":                         {"ExecutedVersion", "FunctionName", "Resource"},
+	"AWS/Lex":                            {"BotAlias", "BotChannelName", "BotName", "BotVersion", "InputMode", "Operation", "Source"},
+	"AWS/Logs":                           {"DestinationType", "FilterName", "LogGroupName"},
+	"AWS/LookoutMetrics":                 {"AlertArn", "AnomalyDetectorArn"},
+	"AWS/ML":                             {"MLModelId", "RequestMode"},
+	"AWS/MediaConnect":                   {"AvailabilityZone", "FlowARN", "SourceARN", "OutputARN"},
+	"AWS/MediaConvert":                   {"Job", "Operation", "Queue"},
+	"AWS/MediaPackage":                   {"Channel", "No Dimension", "OriginEndpoint", "StatusCodeRange"},
+	"AWS/MediaLive":                      {"ActiveInputFailoverLabel", "AudioDescriptionName", "ChannelId", "DeviceType", "InputDeviceId", "OutputGroupName", "Pipeline"},
+	"AWS/MediaStore":                     {"ContainerName", "ObjectGroupName", "RequestType"},
+	"AWS/MediaTailor":                    {"ConfigurationName"},
+	"AWS/MemoryDB":                       {"ClusterName", "NodeName"},
+	"AWS/NATGateway":                     {"NatGatewayId"},
+	"AWS/Neptune":                        {"DBClusterIdentifier", "DatabaseClass", "EngineName", "Role"},
+	"AWS/NetworkELB":                     {"AvailabilityZone", "LoadBalancer", "TargetGroup"},
+	"AWS/GatewayELB":                     {"AvailabilityZone", "LoadBalancer", "TargetGroup"},
+	"AWS/NetworkFirewall":                {"AvailabilityZone", "CustomAction", "Engine", "FirewallName"},
+	"AWS/OpsWorks":                       {"InstanceId", "LayerId", "StackId"},
+	"AWS/Polly":                          {"Operation"},
+	"AWS/PrivateLinkEndpoints":           {"Endpoint Type", "Service Name", "Subnet Id", "VPC Endpoint Id", "VPC Id"},
+	"AWS/PrivateLinkServices":            {"Az", "Load Balancer Arn", "Service Id", "VPC Endpoint Id"},
+	"AWS/Prometheus":                     {"Reason", "RuleGroup", "Workspace"},
+	"AWS/IVSRealTime":                    {"Stage", "Participant", "SimulcastLayer", "MediaType"},
+	"AWS/RDS":                            {"DBClusterIdentifier", "DBInstanceIdentifier", "DatabaseClass", "DbClusterIdentifier", "EndpointName", "EngineName", "ProxyName", "Role", "SourceRegion", "Target", "TargetGroup", "TargetRole"},
+	"AWS/Redshift":                       {"ClusterIdentifier", "NodeID", "service class", "stage", "latency", "wlmid"},
+	"AWS/Robomaker":                      {"SimulationJobId"},
+	"AWS/Route53":                        {"HealthCheckId", "Region", "HostedZoneId"},
+	"AWS/Route53Resolver":                {"EndpointId"},
+	"AWS/S3":                             {"BucketName", "DestinationBucket", "FilterId", "RuleId", "SourceBucket", "StorageType"},
+	"AWS/SDKMetrics":                     {"DestinationRegion", "Service"},
+	"AWS/ServiceCatalog":                 {"State", "ProductId", "ProvisioningArtifactId"},
+	"AWS/SES":                            {},
+	"AWS/SNS":                            {"Application", "Country", "Platform", "SMSType", "TopicName"},
+	"AWS/SQS":                            {"QueueName"},
+	"AWS/SWF":                            {"APIName", "ActivityTypeName", "ActivityTypeVersion", "DecisionName", "Domain", "TaskListName", "WorkflowTypeName", "WorkflowTypeVersion"},
+	"AWS/SageMaker":                      {"EndpointName", "InferenceComponentName", "VariantName"},
+	"/aws/sagemaker/Endpoints":           {"EndpointName", "Host", "VariantName"},
+	"/aws/sagemaker/InferenceComponents": {"InferenceComponentName"},
+	"/aws/sagemaker/InferenceRecommendationsJobs": {"EndpointName", "JobName"},
+	"AWS/SageMaker/LabelingJobs":                  {"LabelingJobName"},
+	"AWS/Sagemaker/ModelBuildingPipeline":         {"PipelineName", "StepName"},
+	"/aws/sagemaker/ProcessingJobs":               {"Host"},
+	"/aws/sagemaker/TrainingJobs":                 {"Host"},
+	"/aws/sagemaker/TransformJobs":                {"Host"},
+	"AWS/States":                                  {"APIName", "ActivityArn", "LambdaFunctionArn", "ServiceIntegrationResourceArn", "ServiceName", "StateMachineArn"},
+	"AWS/StorageGateway":                          {"GatewayId", "GatewayName", "VolumeId"},
+	"AWS/Textract":                                {},
+	"AWS/Timestream":                              {"Operation", "DatabaseName", "TableName"},
+	"AWS/ThingsGraph":                             {"FlowTemplateId", "StepName", "SystemTemplateId"},
+	"AWS/TransitGateway":                          {"TransitGateway", "TransitGatewayAttachment"},
+	"AWS/Transfer":                                {"ServerId"},
+	"AWS/Translate":                               {"LanguagePair", "Operation"},
+	"AWS/TrustedAdvisor":                          {},
+	"AWS/Usage":                                   {"Class", "Resource", "Service", "Type"},
+	"AWS/VPN":                                     {"TunnelIpAddress", "VpnId"},
+	"AWS/WAF":                                     {"Region", "Rule", "RuleGroup", "WebACL"},
+	"AWS/WAFV2":                                   {"Region", "Rule", "RuleGroup", "WebACL"},
+	"AWS/WorkSpaces":                              {"DirectoryId", "WorkspaceId"},
+	"ECS/ContainerInsights":                       {"ClusterName", "ServiceName", "TaskDefinitionFamily", "EC2InstanceId", "ContainerInstanceId"},
+	"ContainerInsights":                           {"ClusterName", "NodeName", "Namespace", "InstanceId", "PodName", "Service"},
+	"AWS/Rekognition":                             {},
+	"AWS/Cassandra":                               {"Keyspace", "Operation", "TableName"},
+	"AWS/AmplifyHosting":                          {"App"},
+	"CloudWatchSynthetics":                        {"CanaryName", "StepName"},
 }
 
 type RegionsSet map[string]struct{}
diff --git a/pkg/tsdb/cloudwatch/features/features.go b/pkg/tsdb/cloudwatch/features/features.go
new file mode 100644
index 0000000000000..2c01a2673bfa0
--- /dev/null
+++ b/pkg/tsdb/cloudwatch/features/features.go
@@ -0,0 +1,16 @@
+package features
+
+import (
+	"context"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+)
+
+const (
+	FlagCloudWatchCrossAccountQuerying = "cloudWatchCrossAccountQuerying"
+	FlagCloudWatchBatchQueries         = "cloudWatchBatchQueries"
+)
+
+func IsEnabled(ctx context.Context, feature string) bool {
+	return backend.GrafanaConfigFromContext(ctx).FeatureToggles().IsEnabled(feature)
+}
diff --git a/pkg/tsdb/cloudwatch/get_dimension_values_for_wildcards.go b/pkg/tsdb/cloudwatch/get_dimension_values_for_wildcards.go
index ab1a6158106fd..3fc8f469942bf 100644
--- a/pkg/tsdb/cloudwatch/get_dimension_values_for_wildcards.go
+++ b/pkg/tsdb/cloudwatch/get_dimension_values_for_wildcards.go
@@ -4,8 +4,6 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/clients"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
@@ -14,9 +12,9 @@ import (
 )
 
 // getDimensionValues gets the actual dimension values for dimensions with a wildcard
-func (e *cloudWatchExecutor) getDimensionValuesForWildcards(ctx context.Context, pluginCtx backend.PluginContext, region string,
-	client models.CloudWatchMetricsAPIProvider, origQueries []*models.CloudWatchQuery, tagValueCache *cache.Cache, logger log.Logger) ([]*models.CloudWatchQuery, error) {
-	metricsClient := clients.NewMetricsClient(client, e.cfg)
+func (e *cloudWatchExecutor) getDimensionValuesForWildcards(ctx context.Context, region string,
+	client models.CloudWatchMetricsAPIProvider, origQueries []*models.CloudWatchQuery, tagValueCache *cache.Cache, listMetricsPageLimit int) ([]*models.CloudWatchQuery, error) {
+	metricsClient := clients.NewMetricsClient(client, listMetricsPageLimit)
 	service := services.NewListMetricsService(metricsClient)
 	// create copies of the original query. All the fields besides Dimensions are primitives
 	queries := copyQueries(origQueries)
@@ -35,12 +33,12 @@ func (e *cloudWatchExecutor) getDimensionValuesForWildcards(ctx context.Context,
 			cacheKey := fmt.Sprintf("%s-%s-%s-%s-%s", region, accountID, query.Namespace, query.MetricName, dimensionKey)
 			cachedDimensions, found := tagValueCache.Get(cacheKey)
 			if found {
-				logger.Debug("Fetching dimension values from cache")
+				e.logger.FromContext(ctx).Debug("Fetching dimension values from cache")
 				query.Dimensions[dimensionKey] = cachedDimensions.([]string)
 				continue
 			}
 
-			logger.Debug("Cache miss, fetching dimension values from AWS")
+			e.logger.FromContext(ctx).Debug("Cache miss, fetching dimension values from AWS")
 			request := resources.DimensionValuesRequest{
 				ResourceRequest: &resources.ResourceRequest{
 					Region:    region,
diff --git a/pkg/tsdb/cloudwatch/get_dimension_values_for_wildcards_test.go b/pkg/tsdb/cloudwatch/get_dimension_values_for_wildcards_test.go
index e0951515152f5..7a18ba59f8c8d 100644
--- a/pkg/tsdb/cloudwatch/get_dimension_values_for_wildcards_test.go
+++ b/pkg/tsdb/cloudwatch/get_dimension_values_for_wildcards_test.go
@@ -3,11 +3,9 @@ package cloudwatch
 import (
 	"context"
 	"testing"
-	"time"
 
 	"github.com/aws/aws-sdk-go/service/cloudwatch"
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana/pkg/infra/log/logtest"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/mocks"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/utils"
@@ -16,19 +14,15 @@ import (
 )
 
 func TestGetDimensionValuesForWildcards(t *testing.T) {
-	logger := &logtest.Fake{}
-	executor := &cloudWatchExecutor{}
+	executor := &cloudWatchExecutor{im: defaultTestInstanceManager(), logger: log.NewNullLogger()}
 	ctx := context.Background()
-	pluginCtx := backend.PluginContext{
-		DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{ID: 1, Updated: time.Now()},
-	}
 	tagValueCache := cache.New(0, 0)
 
 	t.Run("Should not change non-wildcard dimension value", func(t *testing.T) {
 		query := getBaseQuery()
 		query.MetricName = "Test_MetricName1"
 		query.Dimensions = map[string][]string{"Test_DimensionName1": {"Value1"}}
-		queries, err := executor.getDimensionValuesForWildcards(ctx, pluginCtx, "us-east-1", nil, []*models.CloudWatchQuery{query}, tagValueCache, logger)
+		queries, err := executor.getDimensionValuesForWildcards(ctx, "us-east-1", nil, []*models.CloudWatchQuery{query}, tagValueCache, 50)
 		assert.Nil(t, err)
 		assert.Len(t, queries, 1)
 		assert.NotNil(t, queries[0].Dimensions["Test_DimensionName1"], 1)
@@ -39,7 +33,7 @@ func TestGetDimensionValuesForWildcards(t *testing.T) {
 		query := getBaseQuery()
 		query.MetricName = "Test_MetricName1"
 		query.Dimensions = map[string][]string{"Test_DimensionName1": {"*"}}
-		queries, err := executor.getDimensionValuesForWildcards(ctx, pluginCtx, "us-east-1", nil, []*models.CloudWatchQuery{query}, tagValueCache, logger)
+		queries, err := executor.getDimensionValuesForWildcards(ctx, "us-east-1", nil, []*models.CloudWatchQuery{query}, tagValueCache, 50)
 		assert.Nil(t, err)
 		assert.Len(t, queries, 1)
 		assert.NotNil(t, queries[0].Dimensions["Test_DimensionName1"])
@@ -58,7 +52,7 @@ func TestGetDimensionValuesForWildcards(t *testing.T) {
 			{MetricName: utils.Pointer("Test_MetricName4"), Dimensions: []*cloudwatch.Dimension{{Name: utils.Pointer("Test_DimensionName1"), Value: utils.Pointer("Value2")}}},
 		}}
 		api.On("ListMetricsPagesWithContext").Return(nil)
-		queries, err := executor.getDimensionValuesForWildcards(ctx, pluginCtx, "us-east-1", api, []*models.CloudWatchQuery{query}, tagValueCache, logger)
+		queries, err := executor.getDimensionValuesForWildcards(ctx, "us-east-1", api, []*models.CloudWatchQuery{query}, tagValueCache, 50)
 		assert.Nil(t, err)
 		assert.Len(t, queries, 1)
 		assert.Equal(t, map[string][]string{"Test_DimensionName1": {"Value1", "Value2", "Value3", "Value4"}}, queries[0].Dimensions)
@@ -74,13 +68,13 @@ func TestGetDimensionValuesForWildcards(t *testing.T) {
 			{MetricName: utils.Pointer("Test_MetricName"), Dimensions: []*cloudwatch.Dimension{{Name: utils.Pointer("Test_DimensionName"), Value: utils.Pointer("Value")}}},
 		}}
 		api.On("ListMetricsPagesWithContext").Return(nil)
-		_, err := executor.getDimensionValuesForWildcards(ctx, pluginCtx, "us-east-1", api, []*models.CloudWatchQuery{query}, tagValueCache, logger)
+		_, err := executor.getDimensionValuesForWildcards(ctx, "us-east-1", api, []*models.CloudWatchQuery{query}, tagValueCache, 50)
 		assert.Nil(t, err)
 		// make sure the original query wasn't altered
 		assert.Equal(t, map[string][]string{"Test_DimensionName": {"*"}}, query.Dimensions)
 
 		//setting the api to nil confirms that it's using the cached value
-		queries, err := executor.getDimensionValuesForWildcards(ctx, pluginCtx, "us-east-1", nil, []*models.CloudWatchQuery{query}, tagValueCache, logger)
+		queries, err := executor.getDimensionValuesForWildcards(ctx, "us-east-1", nil, []*models.CloudWatchQuery{query}, tagValueCache, 50)
 		assert.Nil(t, err)
 		assert.Len(t, queries, 1)
 		assert.Equal(t, map[string][]string{"Test_DimensionName": {"Value"}}, queries[0].Dimensions)
@@ -94,7 +88,7 @@ func TestGetDimensionValuesForWildcards(t *testing.T) {
 		query.MatchExact = false
 		api := &mocks.MetricsAPI{Metrics: []*cloudwatch.Metric{}}
 		api.On("ListMetricsPagesWithContext").Return(nil)
-		queries, err := executor.getDimensionValuesForWildcards(ctx, pluginCtx, "us-east-1", api, []*models.CloudWatchQuery{query}, tagValueCache, logger)
+		queries, err := executor.getDimensionValuesForWildcards(ctx, "us-east-1", api, []*models.CloudWatchQuery{query}, tagValueCache, 50)
 		assert.Nil(t, err)
 		assert.Len(t, queries, 1)
 		// assert that the values was set to an empty array
@@ -105,7 +99,7 @@ func TestGetDimensionValuesForWildcards(t *testing.T) {
 			{MetricName: utils.Pointer("Test_MetricName"), Dimensions: []*cloudwatch.Dimension{{Name: utils.Pointer("Test_DimensionName2"), Value: utils.Pointer("Value")}}},
 		}
 		api.On("ListMetricsPagesWithContext").Return(nil)
-		queries, err = executor.getDimensionValuesForWildcards(ctx, pluginCtx, "us-east-1", api, []*models.CloudWatchQuery{query}, tagValueCache, logger)
+		queries, err = executor.getDimensionValuesForWildcards(ctx, "us-east-1", api, []*models.CloudWatchQuery{query}, tagValueCache, 50)
 		assert.Nil(t, err)
 		assert.Len(t, queries, 1)
 		assert.Equal(t, map[string][]string{"Test_DimensionName2": {"Value"}}, queries[0].Dimensions)
diff --git a/pkg/tsdb/cloudwatch/get_metric_data_executor.go b/pkg/tsdb/cloudwatch/get_metric_data_executor.go
index c81688b40dac0..de89b89af2d4b 100644
--- a/pkg/tsdb/cloudwatch/get_metric_data_executor.go
+++ b/pkg/tsdb/cloudwatch/get_metric_data_executor.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudwatch"
 	"github.com/aws/aws-sdk-go/service/cloudwatch/cloudwatchiface"
-	"github.com/grafana/grafana/pkg/infra/metrics"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/utils"
 )
 
 func (e *cloudWatchExecutor) executeRequest(ctx context.Context, client cloudwatchiface.CloudWatchAPI,
@@ -24,8 +24,7 @@ func (e *cloudWatchExecutor) executeRequest(ctx context.Context, client cloudwat
 		}
 
 		mdo = append(mdo, resp)
-		metrics.MAwsCloudWatchGetMetricData.Add(float64(len(metricDataInput.MetricDataQueries)))
-
+		utils.QueriesTotalCounter.WithLabelValues(utils.GetMetricDataLabel).Add(float64(len(metricDataInput.MetricDataQueries)))
 		if resp.NextToken == nil || *resp.NextToken == "" {
 			break
 		}
diff --git a/pkg/tsdb/cloudwatch/get_metric_query_batches.go b/pkg/tsdb/cloudwatch/get_metric_query_batches.go
index 924966bc1194b..71d87292d999a 100644
--- a/pkg/tsdb/cloudwatch/get_metric_query_batches.go
+++ b/pkg/tsdb/cloudwatch/get_metric_query_batches.go
@@ -3,7 +3,7 @@ package cloudwatch
 import (
 	"regexp"
 
-	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 )
 
@@ -13,72 +13,79 @@ var nonWordRegex = regexp.MustCompile(`\W+`)
 // getMetricQueryBatches separates queries into batches if necessary. Metric Insight queries cannot run together, and math expressions must be run
 // with all the queries they reference.
 func getMetricQueryBatches(queries []*models.CloudWatchQuery, logger log.Logger) [][]*models.CloudWatchQuery {
-	metricInsightIndices := []int{}
-	mathIndices := []int{}
-	for i, query := range queries {
-		switch query.GetGetMetricDataAPIMode() {
-		case models.GMDApiModeSQLExpression:
-			metricInsightIndices = append(metricInsightIndices, i)
-		case models.GMDApiModeMathExpression:
-			mathIndices = append(mathIndices, i)
-		default:
-		}
-	}
-	// We only need multiple batches if there are multiple metrics insight queries
-	if len(metricInsightIndices) <= 1 {
+	if !hasMultipleMetricInsights(queries) {
 		return [][]*models.CloudWatchQuery{queries}
 	}
 
 	logger.Debug("Separating queries into batches")
-	// Map ids to their queries
-	idToIndex := map[string]int{}
-	for i, query := range queries {
-		if query.Id != "" {
-			idToIndex[query.Id] = i
+
+	// set up list of math expression queries since below we loop over them to get what query IDs they reference
+	var mathQueries []*models.CloudWatchQuery
+	for _, query := range queries {
+		if query.GetGetMetricDataAPIMode() == models.GMDApiModeMathExpression {
+			mathQueries = append(mathQueries, query)
 		}
 	}
 
-	// Find and track which queries are referenced by math queries
-	queryReferences := make([][]int, len(queries))
-	isReferenced := make([]bool, len(queries))
-	for _, idx := range mathIndices {
-		tokens := nonWordRegex.Split(queries[idx].Expression, -1)
-		references := []int{}
-		for _, token := range tokens {
-			ref, found := idToIndex[token]
+	// put queries into a set in order to facilitate lookup below
+	idToQuery := make(map[string]*models.CloudWatchQuery, len(queries))
+	for _, q := range queries {
+		idToQuery[q.Id] = q
+	}
+
+	// gets query IDs which are referenced in math expressions
+	mathQueryIdToReferences := make(map[string][]*models.CloudWatchQuery)
+	// we will use this set of referenced queries to determine the root queries below
+	referencedQueries := make(map[string]bool)
+	for _, mathQuery := range mathQueries {
+		substrings := nonWordRegex.Split(mathQuery.Expression, -1)
+		for _, id := range substrings {
+			query, found := idToQuery[id]
 			if found {
-				references = append(references, ref)
-				isReferenced[ref] = true
+				mathQueryIdToReferences[mathQuery.Id] = append(mathQueryIdToReferences[mathQuery.Id], query)
+				referencedQueries[query.Id] = true
 			}
 		}
-		queryReferences[idx] = references
 	}
 
-	// Create a new batch for every query not used in another query
 	batches := [][]*models.CloudWatchQuery{}
-	for i, used := range isReferenced {
-		if !used {
-			batches = append(batches, getReferencedQueries(queries, queryReferences, i))
+	for _, query := range queries {
+		// if a query is not referenced, then it is a "root" query
+		if _, ok := referencedQueries[query.Id]; !ok {
+			batches = append(batches, getConnectedQueries(query, mathQueryIdToReferences))
 		}
 	}
 	return batches
 }
 
-// getReferencedQueries gets all the queries referenced by startQuery and its referenced queries
-func getReferencedQueries(queries []*models.CloudWatchQuery, queryReferences [][]int, startQuery int) []*models.CloudWatchQuery {
-	usedQueries := make([]bool, len(queries))
-	batch := []*models.CloudWatchQuery{}
+// getConnectedQueries does a breadth-first search to find all the query ids connected to the root id by references. The root id is also returned in the response.
+func getConnectedQueries(root *models.CloudWatchQuery, queryReferences map[string][]*models.CloudWatchQuery) []*models.CloudWatchQuery {
+	visited := map[string]bool{root.Id: true}
+	queriesToReturn := []*models.CloudWatchQuery{}
 
-	queriesToAdd := []int{startQuery}
-	usedQueries[startQuery] = true
-	for i := 0; i < len(queriesToAdd); i++ {
-		batch = append(batch, queries[queriesToAdd[i]])
-		for _, queryIdx := range queryReferences[queriesToAdd[i]] {
-			if !usedQueries[queryIdx] {
-				usedQueries[queryIdx] = true
-				queriesToAdd = append(queriesToAdd, queryIdx)
+	queriesToVisit := []*models.CloudWatchQuery{root}
+	for i := 0; i < len(queriesToVisit); i++ {
+		currentQuery := queriesToVisit[i]
+		queriesToReturn = append(queriesToReturn, currentQuery)
+		for _, queryRef := range queryReferences[currentQuery.Id] {
+			if !visited[queryRef.Id] {
+				visited[queryRef.Id] = true
+				queriesToVisit = append(queriesToVisit, queryRef)
 			}
 		}
 	}
-	return batch
+	return queriesToReturn
+}
+
+func hasMultipleMetricInsights(queries []*models.CloudWatchQuery) bool {
+	count := 0
+	for _, query := range queries {
+		if query.GetGetMetricDataAPIMode() == models.GMDApiModeSQLExpression {
+			count++
+		}
+		if count > 1 {
+			return true
+		}
+	}
+	return false
 }
diff --git a/pkg/tsdb/cloudwatch/get_metric_query_batches_test.go b/pkg/tsdb/cloudwatch/get_metric_query_batches_test.go
index 59023ba28435d..a5668ba6a453b 100644
--- a/pkg/tsdb/cloudwatch/get_metric_query_batches_test.go
+++ b/pkg/tsdb/cloudwatch/get_metric_query_batches_test.go
@@ -3,13 +3,13 @@ package cloudwatch
 import (
 	"testing"
 
-	"github.com/grafana/grafana/pkg/infra/log/logtest"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestGetMetricQueryBatches(t *testing.T) {
-	logger := &logtest.Fake{}
+	nullLogger := log.NewNullLogger()
 	insight1 := models.CloudWatchQuery{
 		MetricQueryType: models.MetricQueryTypeQuery,
 		Id:              "i1",
@@ -22,6 +22,7 @@ func TestGetMetricQueryBatches(t *testing.T) {
 		MetricQueryType: models.MetricQueryTypeQuery,
 		Id:              "i3",
 	}
+
 	metricStat := models.CloudWatchQuery{
 		MetricQueryType:  models.MetricQueryTypeSearch,
 		MetricEditorMode: models.MetricEditorModeBuilder,
@@ -33,6 +34,24 @@ func TestGetMetricQueryBatches(t *testing.T) {
 		Expression:       "PERIOD(i1)",
 		Id:               "m1",
 	}
+	m99_ref_m98 := models.CloudWatchQuery{
+		MetricQueryType:  models.MetricQueryTypeSearch,
+		MetricEditorMode: models.MetricEditorModeRaw,
+		Expression:       "PERIOD(m98)",
+		Id:               "m99",
+	}
+	m98_ref_m88 := models.CloudWatchQuery{
+		MetricQueryType:  models.MetricQueryTypeSearch,
+		MetricEditorMode: models.MetricEditorModeRaw,
+		Expression:       "PERIOD(m88)",
+		Id:               "m98",
+	}
+	m88_ref_m98 := models.CloudWatchQuery{
+		MetricQueryType:  models.MetricQueryTypeSearch,
+		MetricEditorMode: models.MetricEditorModeRaw,
+		Expression:       "PERIOD(m98)",
+		Id:               "m88",
+	}
 	m2_ref_i1 := models.CloudWatchQuery{
 		MetricQueryType:  models.MetricQueryTypeSearch,
 		MetricEditorMode: models.MetricEditorModeRaw,
@@ -58,6 +77,22 @@ func TestGetMetricQueryBatches(t *testing.T) {
 		Id:               "m5",
 	}
 
+	t.Run("m99 ref m98 which ref m88 which ref m98, with 2 insights", func(t *testing.T) {
+		batch := []*models.CloudWatchQuery{
+			&insight1,
+			&insight2,
+			&m99_ref_m98,
+			&m98_ref_m88,
+			&m88_ref_m98,
+		}
+
+		result := getMetricQueryBatches(batch, nullLogger)
+		assert.Len(t, result, 3)
+		assert.ElementsMatch(t, []*models.CloudWatchQuery{&insight1}, result[0])
+		assert.ElementsMatch(t, []*models.CloudWatchQuery{&insight2}, result[1])
+		assert.ElementsMatch(t, []*models.CloudWatchQuery{&m99_ref_m98, &m98_ref_m88, &m88_ref_m98}, result[2])
+	})
+
 	t.Run("zero insight queries should not separate into batches", func(t *testing.T) {
 		batch := []*models.CloudWatchQuery{
 			&metricStat,
@@ -67,7 +102,7 @@ func TestGetMetricQueryBatches(t *testing.T) {
 			&m4_ref_s1,
 		}
 
-		result := getMetricQueryBatches(batch, logger)
+		result := getMetricQueryBatches(batch, nullLogger)
 		assert.Len(t, result, 1)
 		assert.Equal(t, batch, result[0])
 	})
@@ -78,7 +113,7 @@ func TestGetMetricQueryBatches(t *testing.T) {
 			&metricStat,
 		}
 
-		result := getMetricQueryBatches(batch, logger)
+		result := getMetricQueryBatches(batch, nullLogger)
 		assert.Len(t, result, 1)
 		assert.ElementsMatch(t, batch, result[0])
 	})
@@ -90,7 +125,7 @@ func TestGetMetricQueryBatches(t *testing.T) {
 			&insight2,
 		}
 
-		result := getMetricQueryBatches(batch, logger)
+		result := getMetricQueryBatches(batch, nullLogger)
 		assert.Len(t, result, 3)
 		assert.ElementsMatch(t, []*models.CloudWatchQuery{&insight1}, result[0])
 		assert.ElementsMatch(t, []*models.CloudWatchQuery{&metricStat}, result[1])
@@ -107,7 +142,7 @@ func TestGetMetricQueryBatches(t *testing.T) {
 			&m4_ref_s1,
 		}
 
-		result := getMetricQueryBatches(batch, logger)
+		result := getMetricQueryBatches(batch, nullLogger)
 		assert.Len(t, result, 1)
 		assert.ElementsMatch(t, batch, result[0])
 	})
@@ -122,7 +157,7 @@ func TestGetMetricQueryBatches(t *testing.T) {
 			&m4_ref_s1,
 		}
 
-		result := getMetricQueryBatches(batch, logger)
+		result := getMetricQueryBatches(batch, nullLogger)
 		assert.Len(t, result, 3)
 		assert.ElementsMatch(t, []*models.CloudWatchQuery{&insight2}, result[0])
 		assert.ElementsMatch(t, []*models.CloudWatchQuery{&insight1, &m1_ref_i1, &m2_ref_i1, &m3_ref_m1_m2}, result[1])
@@ -137,7 +172,7 @@ func TestGetMetricQueryBatches(t *testing.T) {
 			&m4_ref_i1_i3,
 		}
 
-		result := getMetricQueryBatches(batch, logger)
+		result := getMetricQueryBatches(batch, nullLogger)
 		assert.Len(t, result, 3)
 		assert.ElementsMatch(t, []*models.CloudWatchQuery{&insight2}, result[0])
 		assert.ElementsMatch(t, []*models.CloudWatchQuery{&insight1, &m1_ref_i1}, result[1])
diff --git a/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go b/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go
index a7c64c0de2e35..a41f2d27536fd 100644
--- a/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go
+++ b/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go
@@ -105,14 +105,11 @@ const (
 	QueryEditorPropertyTypeString QueryEditorPropertyType = "string"
 )
 
-// CloudWatchAnnotationQuery defines model for CloudWatchAnnotationQuery.
+// Shape of a CloudWatch Annotation query
+//
+// TS type is CloudWatchDefaultQuery = Omit<CloudWatchLogsQuery, 'queryMode'> & CloudWatchMetricsQuery, declared in veneer
+// #CloudWatchDefaultQuery: #CloudWatchLogsQuery & #CloudWatchMetricsQuery @cuetsy(kind="type")
 type CloudWatchAnnotationQuery struct {
-	// DataQuery These are the common properties available to all queries in all datasources.
-	// Specific implementations will *extend* this interface, adding the required
-	// properties for the given context.
-	DataQuery
-	MetricStat
-
 	// The ID of the AWS account to query for the metric, specifying `all` will query all accounts that the monitoring account is permitted to query.
 	AccountId *string `json:"accountId,omitempty"`
 
@@ -137,9 +134,7 @@ type CloudWatchAnnotationQuery struct {
 	// A name/value pair that is part of the identity of a metric. For example, you can get statistics for a specific EC2 instance by specifying the InstanceId dimension when you search for metrics.
 	Dimensions *Dimensions `json:"dimensions,omitempty"`
 
-	// Hide true if query is disabled (ie should not be returned to the dashboard)
-	// Note this does not always imply that the query should not be executed since
-	// the results from a hidden query may be used as the input to other queries (SSE etc)
+	// If hide is set to true, Grafana will filter out the response(s) associated with this query before returning it to the panel.
 	Hide *bool `json:"hide,omitempty"`
 
 	// Only show metrics that exactly match all defined dimension names.
@@ -149,14 +144,14 @@ type CloudWatchAnnotationQuery struct {
 	MetricName *string `json:"metricName,omitempty"`
 
 	// A namespace is a container for CloudWatch metrics. Metrics in different namespaces are isolated from each other, so that metrics from different applications are not mistakenly aggregated into the same statistics. For example, Amazon EC2 uses the AWS/EC2 namespace.
-	Namespace string `json:"namespace"`
+	Namespace *string `json:"namespace,omitempty"`
 
 	// The length of time associated with a specific Amazon CloudWatch statistic. Can be specified by a number of seconds, 'auto', or as a duration string e.g. '15m' being 15 minutes
 	Period *string `json:"period,omitempty"`
 
 	// Enable matching on the prefix of the action name or alarm name, specify the prefixes with actionPrefix and/or alarmNamePrefix
-	PrefixMatching *bool               `json:"prefixMatching,omitempty"`
-	QueryMode      CloudWatchQueryMode `json:"queryMode"`
+	PrefixMatching *bool                `json:"prefixMatching,omitempty"`
+	QueryMode      *CloudWatchQueryMode `json:"queryMode,omitempty"`
 
 	// Specify the query flavor
 	// TODO make this required and give it a default
@@ -165,10 +160,10 @@ type CloudWatchAnnotationQuery struct {
 	// A unique identifier for the query within the list of targets.
 	// In server side expressions, the refId is used as a variable name to identify results.
 	// By default, the UI will assign A->Z; however setting meaningful names may be useful.
-	RefId string `json:"refId"`
+	RefId *string `json:"refId,omitempty"`
 
 	// AWS region to query for the metric
-	Region string `json:"region"`
+	Region *string `json:"region,omitempty"`
 
 	// Metric data aggregations over specified periods of time. For detailed definitions of the statistics supported by CloudWatch, see https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/Statistics-definitions.html.
 	Statistic *string `json:"statistic,omitempty"`
@@ -180,13 +175,8 @@ type CloudWatchAnnotationQuery struct {
 // CloudWatchDataQuery defines model for CloudWatchDataQuery.
 type CloudWatchDataQuery = map[string]any
 
-// CloudWatchLogsQuery defines model for CloudWatchLogsQuery.
+// Shape of a CloudWatch Logs query
 type CloudWatchLogsQuery struct {
-	// DataQuery These are the common properties available to all queries in all datasources.
-	// Specific implementations will *extend* this interface, adding the required
-	// properties for the given context.
-	DataQuery
-
 	// For mixed data sources the selected datasource is on the query level.
 	// For non mixed scenarios this is undefined.
 	// TODO find a better way to do this ^ that's friendly to schema
@@ -196,18 +186,16 @@ type CloudWatchLogsQuery struct {
 	// The CloudWatch Logs Insights query to execute
 	Expression *string `json:"expression,omitempty"`
 
-	// Hide true if query is disabled (ie should not be returned to the dashboard)
-	// Note this does not always imply that the query should not be executed since
-	// the results from a hidden query may be used as the input to other queries (SSE etc)
-	Hide *bool  `json:"hide,omitempty"`
-	Id   string `json:"id"`
+	// If hide is set to true, Grafana will filter out the response(s) associated with this query before returning it to the panel.
+	Hide *bool   `json:"hide,omitempty"`
+	Id   *string `json:"id,omitempty"`
 
 	// @deprecated use logGroups
 	LogGroupNames []string `json:"logGroupNames,omitempty"`
 
 	// Log groups to query
-	LogGroups []LogGroup          `json:"logGroups,omitempty"`
-	QueryMode CloudWatchQueryMode `json:"queryMode"`
+	LogGroups []LogGroup           `json:"logGroups,omitempty"`
+	QueryMode *CloudWatchQueryMode `json:"queryMode,omitempty"`
 
 	// Specify the query flavor
 	// TODO make this required and give it a default
@@ -216,23 +204,17 @@ type CloudWatchLogsQuery struct {
 	// A unique identifier for the query within the list of targets.
 	// In server side expressions, the refId is used as a variable name to identify results.
 	// By default, the UI will assign A->Z; however setting meaningful names may be useful.
-	RefId string `json:"refId"`
+	RefId *string `json:"refId,omitempty"`
 
 	// AWS region to query for the logs
-	Region string `json:"region"`
+	Region *string `json:"region,omitempty"`
 
 	// Fields to group the results by, this field is automatically populated whenever the query is updated
 	StatsGroups []string `json:"statsGroups,omitempty"`
 }
 
-// CloudWatchMetricsQuery defines model for CloudWatchMetricsQuery.
+// Shape of a CloudWatch Metrics query
 type CloudWatchMetricsQuery struct {
-	// DataQuery These are the common properties available to all queries in all datasources.
-	// Specific implementations will *extend* this interface, adding the required
-	// properties for the given context.
-	DataQuery
-	MetricStat
-
 	// The ID of the AWS account to query for the metric, specifying `all` will query all accounts that the monitoring account is permitted to query.
 	AccountId *string `json:"accountId,omitempty"`
 
@@ -252,13 +234,11 @@ type CloudWatchMetricsQuery struct {
 	// Math expression query
 	Expression *string `json:"expression,omitempty"`
 
-	// Hide true if query is disabled (ie should not be returned to the dashboard)
-	// Note this does not always imply that the query should not be executed since
-	// the results from a hidden query may be used as the input to other queries (SSE etc)
+	// If hide is set to true, Grafana will filter out the response(s) associated with this query before returning it to the panel.
 	Hide *bool `json:"hide,omitempty"`
 
 	// ID can be used to reference other queries in math expressions. The ID can include numbers, letters, and underscore, and must start with a lowercase letter.
-	Id string `json:"id"`
+	Id *string `json:"id,omitempty"`
 
 	// Change the time series legend names using dynamic labels. See https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/graph-dynamic-labels.html for more details.
 	Label *string `json:"label,omitempty"`
@@ -272,7 +252,7 @@ type CloudWatchMetricsQuery struct {
 	MetricQueryType *MetricQueryType `json:"metricQueryType,omitempty"`
 
 	// A namespace is a container for CloudWatch metrics. Metrics in different namespaces are isolated from each other, so that metrics from different applications are not mistakenly aggregated into the same statistics. For example, Amazon EC2 uses the AWS/EC2 namespace.
-	Namespace string `json:"namespace"`
+	Namespace *string `json:"namespace,omitempty"`
 
 	// The length of time associated with a specific Amazon CloudWatch statistic. Can be specified by a number of seconds, 'auto', or as a duration string e.g. '15m' being 15 minutes
 	Period    *string              `json:"period,omitempty"`
@@ -285,10 +265,10 @@ type CloudWatchMetricsQuery struct {
 	// A unique identifier for the query within the list of targets.
 	// In server side expressions, the refId is used as a variable name to identify results.
 	// By default, the UI will assign A->Z; however setting meaningful names may be useful.
-	RefId string `json:"refId"`
+	RefId *string `json:"refId,omitempty"`
 
 	// AWS region to query for the metric
-	Region string         `json:"region"`
+	Region *string        `json:"region,omitempty"`
 	Sql    *SQLExpression `json:"sql,omitempty"`
 
 	// When the metric query type is `metricQueryType` is set to `Query`, this field is used to specify the query string.
@@ -314,9 +294,7 @@ type DataQuery struct {
 	// TODO this shouldn't be unknown but DataSourceRef | null
 	Datasource *any `json:"datasource,omitempty"`
 
-	// Hide true if query is disabled (ie should not be returned to the dashboard)
-	// Note this does not always imply that the query should not be executed since
-	// the results from a hidden query may be used as the input to other queries (SSE etc)
+	// If hide is set to true, Grafana will filter out the response(s) associated with this query before returning it to the panel.
 	Hide *bool `json:"hide,omitempty"`
 
 	// Specify the query flavor
diff --git a/pkg/tsdb/cloudwatch/log_actions.go b/pkg/tsdb/cloudwatch/log_actions.go
index cb0e4f43de95d..ebf8e85058c8c 100644
--- a/pkg/tsdb/cloudwatch/log_actions.go
+++ b/pkg/tsdb/cloudwatch/log_actions.go
@@ -16,11 +16,10 @@ import (
 	"github.com/aws/aws-sdk-go/service/cloudwatchlogs/cloudwatchlogsiface"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
-	"golang.org/x/sync/errgroup"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/features"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
+
+	"golang.org/x/sync/errgroup"
 )
 
 const (
@@ -41,7 +40,7 @@ func (e *AWSError) Error() string {
 	return fmt.Sprintf("%s: %s", e.Code, e.Message)
 }
 
-func (e *cloudWatchExecutor) executeLogActions(ctx context.Context, logger log.Logger, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+func (e *cloudWatchExecutor) executeLogActions(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
 	resp := backend.NewQueryDataResponse()
 
 	resultChan := make(chan backend.Responses, len(req.Queries))
@@ -56,7 +55,7 @@ func (e *cloudWatchExecutor) executeLogActions(ctx context.Context, logger log.L
 
 		query := query
 		eg.Go(func() error {
-			dataframe, err := e.executeLogAction(ectx, logger, logsQuery, query, req.PluginContext)
+			dataframe, err := e.executeLogAction(ectx, logsQuery, query, req.PluginContext)
 			if err != nil {
 				var AWSError *AWSError
 				if errors.As(err, &AWSError) {
@@ -96,15 +95,15 @@ func (e *cloudWatchExecutor) executeLogActions(ctx context.Context, logger log.L
 	return resp, nil
 }
 
-func (e *cloudWatchExecutor) executeLogAction(ctx context.Context, logger log.Logger, logsQuery models.LogsQuery, query backend.DataQuery, pluginCtx backend.PluginContext) (*data.Frame, error) {
+func (e *cloudWatchExecutor) executeLogAction(ctx context.Context, logsQuery models.LogsQuery, query backend.DataQuery, pluginCtx backend.PluginContext) (*data.Frame, error) {
 	instance, err := e.getInstance(ctx, pluginCtx)
 	if err != nil {
 		return nil, err
 	}
 
 	region := instance.Settings.Region
-	if logsQuery.Region != "" {
-		region = logsQuery.Region
+	if logsQuery.Region != nil {
+		region = *logsQuery.Region
 	}
 
 	logsClient, err := e.getCWLogsClient(ctx, pluginCtx, region)
@@ -115,7 +114,7 @@ func (e *cloudWatchExecutor) executeLogAction(ctx context.Context, logger log.Lo
 	var data *data.Frame = nil
 	switch logsQuery.Subtype {
 	case "StartQuery":
-		data, err = e.handleStartQuery(ctx, logger, logsClient, logsQuery, query.TimeRange, query.RefID)
+		data, err = e.handleStartQuery(ctx, logsClient, logsQuery, query.TimeRange, query.RefID)
 	case "StopQuery":
 		data, err = e.handleStopQuery(ctx, logsClient, logsQuery)
 	case "GetQueryResults":
@@ -212,7 +211,7 @@ func (e *cloudWatchExecutor) executeStartQuery(ctx context.Context, logsClient c
 		QueryString: aws.String(modifiedQueryString),
 	}
 
-	if logsQuery.LogGroups != nil && len(logsQuery.LogGroups) > 0 && e.features.IsEnabled(featuremgmt.FlagCloudWatchCrossAccountQuerying) {
+	if logsQuery.LogGroups != nil && len(logsQuery.LogGroups) > 0 && features.IsEnabled(ctx, features.FlagCloudWatchCrossAccountQuerying) {
 		var logGroupIdentifiers []string
 		for _, lg := range logsQuery.LogGroups {
 			arn := lg.Arn
@@ -229,17 +228,17 @@ func (e *cloudWatchExecutor) executeStartQuery(ctx context.Context, logsClient c
 		startQueryInput.Limit = aws.Int64(*logsQuery.Limit)
 	}
 
-	logger.Debug("Calling startquery with context with input", "input", startQueryInput)
+	e.logger.FromContext(ctx).Debug("Calling startquery with context with input", "input", startQueryInput)
 	return logsClient.StartQueryWithContext(ctx, startQueryInput)
 }
 
-func (e *cloudWatchExecutor) handleStartQuery(ctx context.Context, logger log.Logger, logsClient cloudwatchlogsiface.CloudWatchLogsAPI,
+func (e *cloudWatchExecutor) handleStartQuery(ctx context.Context, logsClient cloudwatchlogsiface.CloudWatchLogsAPI,
 	logsQuery models.LogsQuery, timeRange backend.TimeRange, refID string) (*data.Frame, error) {
 	startQueryResponse, err := e.executeStartQuery(ctx, logsClient, logsQuery, timeRange)
 	if err != nil {
 		var awsErr awserr.Error
 		if errors.As(err, &awsErr) && awsErr.Code() == "LimitExceededException" {
-			logger.Debug("ExecuteStartQuery limit exceeded", "err", awsErr)
+			e.logger.FromContext(ctx).Debug("ExecuteStartQuery limit exceeded", "err", awsErr)
 			return nil, &AWSError{Code: limitExceededException, Message: err.Error()}
 		}
 		return nil, err
@@ -249,8 +248,8 @@ func (e *cloudWatchExecutor) handleStartQuery(ctx context.Context, logger log.Lo
 	dataFrame.RefID = refID
 
 	region := "default"
-	if logsQuery.Region != "" {
-		region = logsQuery.Region
+	if logsQuery.Region != nil {
+		region = *logsQuery.Region
 	}
 
 	dataFrame.Meta = &data.FrameMeta{
diff --git a/pkg/tsdb/cloudwatch/log_actions_test.go b/pkg/tsdb/cloudwatch/log_actions_test.go
index a2219c01e0965..f0d784c60f667 100644
--- a/pkg/tsdb/cloudwatch/log_actions_test.go
+++ b/pkg/tsdb/cloudwatch/log_actions_test.go
@@ -14,8 +14,9 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/features"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/mocks"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/utils"
@@ -87,10 +88,10 @@ func TestQuery_handleGetLogEvents_passes_nil_start_and_end_times_to_GetLogEvents
 			cli = fakeCWLogsClient{}
 
 			im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-				return DataSource{Settings: models.CloudWatchSettings{}}, nil
+				return DataSource{Settings: models.CloudWatchSettings{}, sessions: &fakeSessionCache{}}, nil
 			})
 
-			executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+			executor := newExecutor(im, log.NewNullLogger())
 			_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
 				PluginContext: backend.PluginContext{
 					DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{},
@@ -121,9 +122,9 @@ func TestQuery_GetLogEvents_returns_response_from_GetLogEvents_to_data_frame_fie
 		return cli
 	}
 	im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		return DataSource{Settings: models.CloudWatchSettings{}}, nil
+		return DataSource{Settings: models.CloudWatchSettings{}, sessions: &fakeSessionCache{}}, nil
 	})
-	executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+	executor := newExecutor(im, log.NewNullLogger())
 
 	cli = &mocks.MockLogEvents{}
 	cli.On("GetLogEventsWithContext", mock.Anything, mock.Anything, mock.Anything).Return(&cloudwatchlogs.GetLogEventsOutput{
@@ -205,10 +206,10 @@ func TestQuery_StartQuery(t *testing.T) {
 				AWSDatasourceSettings: awsds.AWSDatasourceSettings{
 					Region: "us-east-2",
 				},
-			}}, nil
+			}, sessions: &fakeSessionCache{}}, nil
 		})
 
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 		_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
 			PluginContext: backend.PluginContext{
 				DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{},
@@ -262,10 +263,10 @@ func TestQuery_StartQuery(t *testing.T) {
 				AWSDatasourceSettings: awsds.AWSDatasourceSettings{
 					Region: "us-east-2",
 				},
-			}}, nil
+			}, sessions: &fakeSessionCache{}}, nil
 		})
 
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 		resp, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
 			PluginContext: backend.PluginContext{
 				DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{},
@@ -320,9 +321,9 @@ func Test_executeStartQuery(t *testing.T) {
 	t.Run("successfully parses information from JSON to StartQueryWithContext", func(t *testing.T) {
 		cli = fakeCWLogsClient{}
 		im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}, sessions: &fakeSessionCache{}}, nil
 		})
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 
 		_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
 			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
@@ -356,9 +357,9 @@ func Test_executeStartQuery(t *testing.T) {
 	t.Run("does not populate StartQueryInput.limit when no limit provided", func(t *testing.T) {
 		cli = fakeCWLogsClient{}
 		im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}, sessions: &fakeSessionCache{}}, nil
 		})
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 
 		_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
 			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
@@ -382,11 +383,11 @@ func Test_executeStartQuery(t *testing.T) {
 	t.Run("attaches logGroupIdentifiers if the crossAccount feature is enabled", func(t *testing.T) {
 		cli = fakeCWLogsClient{}
 		im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}, sessions: &fakeSessionCache{}}, nil
 		})
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures(featuremgmt.FlagCloudWatchCrossAccountQuerying))
+		executor := newExecutor(im, log.NewNullLogger())
 
-		_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
+		_, err := executor.QueryData(contextWithFeaturesEnabled(features.FlagCloudWatchCrossAccountQuerying), &backend.QueryDataRequest{
 			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
 			Queries: []backend.DataQuery{
 				{
@@ -418,11 +419,11 @@ func Test_executeStartQuery(t *testing.T) {
 	t.Run("attaches logGroupIdentifiers if the crossAccount feature is enabled and strips out trailing *", func(t *testing.T) {
 		cli = fakeCWLogsClient{}
 		im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}, sessions: &fakeSessionCache{}}, nil
 		})
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures(featuremgmt.FlagCloudWatchCrossAccountQuerying))
+		executor := newExecutor(im, log.NewNullLogger())
 
-		_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
+		_, err := executor.QueryData(contextWithFeaturesEnabled(features.FlagCloudWatchCrossAccountQuerying), &backend.QueryDataRequest{
 			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
 			Queries: []backend.DataQuery{
 				{
@@ -454,9 +455,9 @@ func Test_executeStartQuery(t *testing.T) {
 	t.Run("uses LogGroupNames if the cross account feature flag is not enabled, and log group names is present", func(t *testing.T) {
 		cli = fakeCWLogsClient{}
 		im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}, sessions: &fakeSessionCache{}}, nil
 		})
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 		_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
 			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
 			Queries: []backend.DataQuery{
@@ -489,9 +490,9 @@ func Test_executeStartQuery(t *testing.T) {
 	t.Run("ignores logGroups if feature flag is disabled even if logGroupNames is not present", func(t *testing.T) {
 		cli = fakeCWLogsClient{}
 		im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}, sessions: &fakeSessionCache{}}, nil
 		})
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 		_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
 			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
 			Queries: []backend.DataQuery{
@@ -523,10 +524,10 @@ func Test_executeStartQuery(t *testing.T) {
 	t.Run("it always uses logGroups when feature flag is enabled and ignores log group names", func(t *testing.T) {
 		cli = fakeCWLogsClient{}
 		im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}, sessions: &fakeSessionCache{}}, nil
 		})
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures(featuremgmt.FlagCloudWatchCrossAccountQuerying))
-		_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
+		executor := newExecutor(im, log.NewNullLogger())
+		_, err := executor.QueryData(contextWithFeaturesEnabled(features.FlagCloudWatchCrossAccountQuerying), &backend.QueryDataRequest{
 			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
 			Queries: []backend.DataQuery{
 				{
@@ -588,7 +589,7 @@ func TestQuery_StopQuery(t *testing.T) {
 	}
 
 	im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		return DataSource{Settings: models.CloudWatchSettings{}}, nil
+		return DataSource{Settings: models.CloudWatchSettings{}, sessions: &fakeSessionCache{}}, nil
 	})
 
 	timeRange := backend.TimeRange{
@@ -596,7 +597,7 @@ func TestQuery_StopQuery(t *testing.T) {
 		To:   time.Unix(1584700643, 0),
 	}
 
-	executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+	executor := newExecutor(im, log.NewNullLogger())
 	resp, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
 		PluginContext: backend.PluginContext{
 			DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{},
@@ -683,10 +684,10 @@ func TestQuery_GetQueryResults(t *testing.T) {
 	}
 
 	im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		return DataSource{Settings: models.CloudWatchSettings{}}, nil
+		return DataSource{Settings: models.CloudWatchSettings{}, sessions: &fakeSessionCache{}}, nil
 	})
 
-	executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+	executor := newExecutor(im, log.NewNullLogger())
 	resp, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
 		PluginContext: backend.PluginContext{
 			DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{},
diff --git a/pkg/tsdb/cloudwatch/log_query.go b/pkg/tsdb/cloudwatch/log_query.go
index 1b9bc517b3b0b..575421f23c2c2 100644
--- a/pkg/tsdb/cloudwatch/log_query.go
+++ b/pkg/tsdb/cloudwatch/log_query.go
@@ -205,14 +205,16 @@ func groupResults(results *data.Frame, groupingFieldNames []string, fromSyncQuer
 			if fromSyncQuery {
 				// remove grouping indices
 				newFrame.Fields = removeFieldsByIndex(newFrame.Fields, removeFieldIndices)
+				groupLabels := generateLabels(groupingFields, i)
 
 				// set the group key as the display name for sync queries
-				for i := 1; i < len(newFrame.Fields); i++ {
-					valueField := newFrame.Fields[i]
+				for j := 1; j < len(newFrame.Fields); j++ {
+					valueField := newFrame.Fields[j]
 					if valueField.Config == nil {
 						valueField.Config = &data.FieldConfig{}
 					}
 					valueField.Config.DisplayNameFromDS = groupKey
+					valueField.Labels = groupLabels
 				}
 			}
 
@@ -275,10 +277,21 @@ func generateGroupKey(fields []*data.Field, row int) string {
 			}
 		}
 	}
-
 	return groupKey
 }
 
+func generateLabels(fields []*data.Field, row int) data.Labels {
+	labels := data.Labels{}
+	for _, field := range fields {
+		if strField, ok := field.At(row).(*string); ok {
+			if strField != nil {
+				labels[field.Name] = *strField
+			}
+		}
+	}
+	return labels
+}
+
 func numericFieldToStringField(field *data.Field) (*data.Field, error) {
 	if !field.Type().Numeric() {
 		return nil, fmt.Errorf("field is not numeric")
diff --git a/pkg/tsdb/cloudwatch/log_query_test.go b/pkg/tsdb/cloudwatch/log_query_test.go
index 125c6c3157771..1a72ded1e0942 100644
--- a/pkg/tsdb/cloudwatch/log_query_test.go
+++ b/pkg/tsdb/cloudwatch/log_query_test.go
@@ -583,7 +583,7 @@ func TestGroupingResultsWithFromSyncQueryTrue(t *testing.T) {
 			Name: "fakelog-a1",
 			Fields: []*data.Field{
 				data.NewField("@timestamp", data.Labels{}, []*time.Time{&timeA, &timeB}),
-				data.NewField("count", data.Labels{}, []*string{
+				data.NewField("count", data.Labels{"@log": "fakelog-a", "stream": "1"}, []*string{
 					aws.String("100"),
 					aws.String("57"),
 				}),
@@ -594,7 +594,7 @@ func TestGroupingResultsWithFromSyncQueryTrue(t *testing.T) {
 			Name: "fakelog-b1",
 			Fields: []*data.Field{
 				data.NewField("@timestamp", data.Labels{}, []*time.Time{&timeA, &timeB}),
-				data.NewField("count", data.Labels{}, []*string{
+				data.NewField("count", data.Labels{"@log": "fakelog-b", "stream": "1"}, []*string{
 					aws.String("150"),
 					aws.String("62"),
 				}),
diff --git a/pkg/tsdb/cloudwatch/log_sync_query.go b/pkg/tsdb/cloudwatch/log_sync_query.go
index b64a2db8d92bf..9243058184b89 100644
--- a/pkg/tsdb/cloudwatch/log_sync_query.go
+++ b/pkg/tsdb/cloudwatch/log_sync_query.go
@@ -12,6 +12,7 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/kinds/dataquery"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/utils"
 )
 
 const initialAlertPollPeriod = time.Second
@@ -36,9 +37,9 @@ var executeSyncLogQuery = func(ctx context.Context, e *cloudWatchExecutor, req *
 			logsQuery.QueryString = *logsQuery.Expression
 		}
 
-		region := logsQuery.Region
-		if logsQuery.Region == "" || region == defaultRegion {
-			logsQuery.Region = instance.Settings.Region
+		region := utils.Depointerizer(logsQuery.Region)
+		if region == "" || region == defaultRegion {
+			logsQuery.Region = utils.Pointer(instance.Settings.Region)
 		}
 
 		logsClient, err := e.getCWLogsClient(ctx, req.PluginContext, region)
diff --git a/pkg/tsdb/cloudwatch/log_sync_query_test.go b/pkg/tsdb/cloudwatch/log_sync_query_test.go
index 88e20ac4ff133..f1bed59ccfaf9 100644
--- a/pkg/tsdb/cloudwatch/log_sync_query_test.go
+++ b/pkg/tsdb/cloudwatch/log_sync_query_test.go
@@ -15,10 +15,8 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	ngalertmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
-	"github.com/grafana/grafana/pkg/services/query"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/utils"
 	"github.com/stretchr/testify/assert"
@@ -39,14 +37,14 @@ func Test_executeSyncLogQuery(t *testing.T) {
 
 	t.Run("getCWLogsClient is called with region from input JSON", func(t *testing.T) {
 		cli = fakeCWLogsClient{queryResults: cloudwatchlogs.GetQueryResultsOutput{Status: aws.String("Complete")}}
+		sess := fakeSessionCache{}
 		im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}, sessions: &sess}, nil
 		})
-		sess := fakeSessionCache{}
-		executor := newExecutor(im, newTestConfig(), &sess, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 
 		_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
-			Headers:       map[string]string{ngalertmodels.FromAlertHeaderName: "some value"},
+			Headers:       map[string]string{headerFromAlert: "some value"},
 			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
 			Queries: []backend.DataQuery{
 				{
@@ -65,14 +63,14 @@ func Test_executeSyncLogQuery(t *testing.T) {
 
 	t.Run("getCWLogsClient is called with region from instance manager when region is default", func(t *testing.T) {
 		cli = fakeCWLogsClient{queryResults: cloudwatchlogs.GetQueryResultsOutput{Status: aws.String("Complete")}}
+		sess := fakeSessionCache{}
 		im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: models.CloudWatchSettings{AWSDatasourceSettings: awsds.AWSDatasourceSettings{Region: "instance manager's region"}}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{AWSDatasourceSettings: awsds.AWSDatasourceSettings{Region: "instance manager's region"}}, sessions: &sess}, nil
 		})
-		sess := fakeSessionCache{}
 
-		executor := newExecutor(im, newTestConfig(), &sess, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 		_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
-			Headers:       map[string]string{ngalertmodels.FromAlertHeaderName: "some value"},
+			Headers:       map[string]string{headerFromAlert: "some value"},
 			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
 			Queries: []backend.DataQuery{
 				{
@@ -97,12 +95,12 @@ func Test_executeSyncLogQuery(t *testing.T) {
 		}{
 			{
 				"alert header",
-				map[string]string{ngalertmodels.FromAlertHeaderName: "some value"},
+				map[string]string{headerFromAlert: "some value"},
 				true,
 			},
 			{
 				"expression header",
-				map[string]string{fmt.Sprintf("http_%s", query.HeaderFromExpression): "some value"},
+				map[string]string{fmt.Sprintf("http_%s", headerFromExpression): "some value"},
 				true,
 			},
 			{
@@ -123,11 +121,10 @@ func Test_executeSyncLogQuery(t *testing.T) {
 				syncCalled = false
 				cli = fakeCWLogsClient{queryResults: cloudwatchlogs.GetQueryResultsOutput{Status: aws.String("Complete")}}
 				im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-					return DataSource{Settings: models.CloudWatchSettings{AWSDatasourceSettings: awsds.AWSDatasourceSettings{Region: "instance manager's region"}}}, nil
+					return DataSource{Settings: models.CloudWatchSettings{AWSDatasourceSettings: awsds.AWSDatasourceSettings{Region: "instance manager's region"}}, sessions: &fakeSessionCache{}}, nil
 				})
-				sess := fakeSessionCache{}
 
-				executor := newExecutor(im, newTestConfig(), &sess, featuremgmt.WithFeatures())
+				executor := newExecutor(im, log.NewNullLogger())
 				_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
 					Headers:       tc.headers,
 					PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
@@ -152,6 +149,41 @@ func Test_executeSyncLogQuery(t *testing.T) {
 
 		executeSyncLogQuery = origExecuteSyncLogQuery
 	})
+
+	t.Run("when query mode is 'Logs' and does not include type or subtype", func(t *testing.T) {
+		origExecuteSyncLogQuery := executeSyncLogQuery
+		syncCalled := false
+		executeSyncLogQuery = func(ctx context.Context, e *cloudWatchExecutor, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+			syncCalled = true
+			return nil, nil
+		}
+		t.Cleanup(func() {
+			executeSyncLogQuery = origExecuteSyncLogQuery
+		})
+
+		cli = fakeCWLogsClient{queryResults: cloudwatchlogs.GetQueryResultsOutput{Status: aws.String("Complete")}}
+		im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+			return DataSource{Settings: models.CloudWatchSettings{AWSDatasourceSettings: awsds.AWSDatasourceSettings{Region: "instance manager's region"}}, sessions: &fakeSessionCache{}}, nil
+		})
+
+		executor := newExecutor(im, log.NewNullLogger())
+		_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
+			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
+			Queries: []backend.DataQuery{
+				{
+					TimeRange: backend.TimeRange{From: time.Unix(0, 0), To: time.Unix(1, 0)},
+					JSON: json.RawMessage(`{
+								"queryMode":    "Logs",
+								"region":      "default",
+								"queryString": "fields @message"
+							}`),
+				},
+			},
+		})
+
+		assert.NoError(t, err)
+		assert.Equal(t, true, syncCalled)
+	})
 }
 func Test_executeSyncLogQuery_handles_RefId_from_input_queries(t *testing.T) {
 	origNewCWClient := NewCWClient
@@ -171,12 +203,12 @@ func Test_executeSyncLogQuery_handles_RefId_from_input_queries(t *testing.T) {
 		}, nil)
 		cli.On("GetQueryResultsWithContext", mock.Anything, mock.Anything, mock.Anything).Return(&cloudwatchlogs.GetQueryResultsOutput{Status: aws.String("Complete")}, nil)
 		im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}, sessions: &fakeSessionCache{}}, nil
 		})
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 
 		res, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
-			Headers:       map[string]string{ngalertmodels.FromAlertHeaderName: "some value"},
+			Headers:       map[string]string{headerFromAlert: "some value"},
 			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
 			Queries: []backend.DataQuery{
 				{
@@ -200,12 +232,12 @@ func Test_executeSyncLogQuery_handles_RefId_from_input_queries(t *testing.T) {
 		}, nil)
 		cli.On("GetQueryResultsWithContext", mock.Anything, mock.Anything, mock.Anything).Return(&cloudwatchlogs.GetQueryResultsOutput{Status: aws.String("Complete")}, nil)
 		im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}, sessions: &fakeSessionCache{}}, nil
 		})
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 
 		res, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
-			Headers:       map[string]string{ngalertmodels.FromAlertHeaderName: "some value"},
+			Headers:       map[string]string{headerFromAlert: "some value"},
 			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
 			Queries: []backend.DataQuery{
 				{
@@ -269,12 +301,12 @@ func Test_executeSyncLogQuery_handles_RefId_from_input_queries(t *testing.T) {
 			Status: aws.String("Complete")}, nil)
 
 		im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}, sessions: &fakeSessionCache{}}, nil
 		})
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 
 		res, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
-			Headers:       map[string]string{ngalertmodels.FromAlertHeaderName: "some value"},
+			Headers:       map[string]string{headerFromAlert: "some value"},
 			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
 			Queries: []backend.DataQuery{
 				{
@@ -314,13 +346,13 @@ func Test_executeSyncLogQuery_handles_RefId_from_input_queries(t *testing.T) {
 		}, nil)
 		cli.On("GetQueryResultsWithContext", mock.Anything, mock.Anything, mock.Anything).Return(&cloudwatchlogs.GetQueryResultsOutput{Status: aws.String("Running")}, nil)
 		im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: models.CloudWatchSettings{LogsTimeout: models.Duration{Duration: time.Millisecond}}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{LogsTimeout: models.Duration{Duration: time.Millisecond}}, sessions: &fakeSessionCache{}}, nil
 		})
 
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 
 		_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
-			Headers:       map[string]string{ngalertmodels.FromAlertHeaderName: "some value"},
+			Headers:       map[string]string{headerFromAlert: "some value"},
 			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
 			Queries: []backend.DataQuery{
 				{
@@ -347,12 +379,12 @@ func Test_executeSyncLogQuery_handles_RefId_from_input_queries(t *testing.T) {
 			&fakeAWSError{code: "foo", message: "bar"},
 		)
 		im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}, sessions: &fakeSessionCache{}}, nil
 		})
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 
 		res, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
-			Headers:       map[string]string{ngalertmodels.FromAlertHeaderName: "some value"},
+			Headers:       map[string]string{headerFromAlert: "some value"},
 			PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
 			Queries: []backend.DataQuery{
 				{
diff --git a/pkg/tsdb/cloudwatch/metric_data_input_builder.go b/pkg/tsdb/cloudwatch/metric_data_input_builder.go
index ebb667c2610fb..1cbb848258bd7 100644
--- a/pkg/tsdb/cloudwatch/metric_data_input_builder.go
+++ b/pkg/tsdb/cloudwatch/metric_data_input_builder.go
@@ -6,11 +6,10 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudwatch"
 
-	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 )
 
-func (e *cloudWatchExecutor) buildMetricDataInput(logger log.Logger, startTime time.Time, endTime time.Time,
+func (e *cloudWatchExecutor) buildMetricDataInput(startTime time.Time, endTime time.Time,
 	queries []*models.CloudWatchQuery) (*cloudwatch.GetMetricDataInput, error) {
 	metricDataInput := &cloudwatch.GetMetricDataInput{
 		StartTime: aws.Time(startTime),
@@ -27,7 +26,7 @@ func (e *cloudWatchExecutor) buildMetricDataInput(logger log.Logger, startTime t
 	}
 
 	for _, query := range queries {
-		metricDataQuery, err := e.buildMetricDataQuery(logger, query)
+		metricDataQuery, err := e.buildMetricDataQuery(query)
 		if err != nil {
 			return nil, &models.QueryError{Err: err, RefID: query.RefId}
 		}
diff --git a/pkg/tsdb/cloudwatch/metric_data_input_builder_test.go b/pkg/tsdb/cloudwatch/metric_data_input_builder_test.go
index 320cd8109fdf2..e891f996d2bfe 100644
--- a/pkg/tsdb/cloudwatch/metric_data_input_builder_test.go
+++ b/pkg/tsdb/cloudwatch/metric_data_input_builder_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 )
 
@@ -27,13 +27,13 @@ func TestMetricDataInputBuilder(t *testing.T) {
 
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
-			executor := newExecutor(nil, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+			executor := newExecutor(nil, log.NewNullLogger())
 			query := getBaseQuery()
 			query.TimezoneUTCOffset = tc.timezoneUTCOffset
 
 			from := now.Add(time.Hour * -2)
 			to := now.Add(time.Hour * -1)
-			mdi, err := executor.buildMetricDataInput(logger, from, to, []*models.CloudWatchQuery{query})
+			mdi, err := executor.buildMetricDataInput(from, to, []*models.CloudWatchQuery{query})
 
 			assert.NoError(t, err)
 			require.NotNil(t, mdi)
diff --git a/pkg/tsdb/cloudwatch/metric_data_query_builder.go b/pkg/tsdb/cloudwatch/metric_data_query_builder.go
index 0a6fa90316b66..aa30e28f5cb68 100644
--- a/pkg/tsdb/cloudwatch/metric_data_query_builder.go
+++ b/pkg/tsdb/cloudwatch/metric_data_query_builder.go
@@ -9,11 +9,10 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudwatch"
 
-	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 )
 
-func (e *cloudWatchExecutor) buildMetricDataQuery(logger log.Logger, query *models.CloudWatchQuery) (*cloudwatch.MetricDataQuery, error) {
+func (e *cloudWatchExecutor) buildMetricDataQuery(query *models.CloudWatchQuery) (*cloudwatch.MetricDataQuery, error) {
 	mdq := &cloudwatch.MetricDataQuery{
 		Id:         aws.String(query.Id),
 		ReturnData: aws.Bool(query.ReturnData),
diff --git a/pkg/tsdb/cloudwatch/metric_data_query_builder_test.go b/pkg/tsdb/cloudwatch/metric_data_query_builder_test.go
index d075fdfd7fde3..b956a88a45f4e 100644
--- a/pkg/tsdb/cloudwatch/metric_data_query_builder_test.go
+++ b/pkg/tsdb/cloudwatch/metric_data_query_builder_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -13,11 +13,11 @@ import (
 func TestMetricDataQueryBuilder(t *testing.T) {
 	t.Run("buildMetricDataQuery", func(t *testing.T) {
 		t.Run("should use metric stat", func(t *testing.T) {
-			executor := newExecutor(nil, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+			executor := newExecutor(nil, log.NewNullLogger())
 			query := getBaseQuery()
 			query.MetricEditorMode = models.MetricEditorModeBuilder
 			query.MetricQueryType = models.MetricQueryTypeSearch
-			mdq, err := executor.buildMetricDataQuery(logger, query)
+			mdq, err := executor.buildMetricDataQuery(query)
 			require.NoError(t, err)
 			require.Empty(t, mdq.Expression)
 			assert.Equal(t, query.MetricName, *mdq.MetricStat.Metric.MetricName)
@@ -25,70 +25,70 @@ func TestMetricDataQueryBuilder(t *testing.T) {
 		})
 
 		t.Run("should pass AccountId in metric stat query", func(t *testing.T) {
-			executor := newExecutor(nil, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+			executor := newExecutor(nil, log.NewNullLogger())
 			query := getBaseQuery()
 			query.MetricEditorMode = models.MetricEditorModeBuilder
 			query.MetricQueryType = models.MetricQueryTypeSearch
 			query.AccountId = aws.String("some account id")
-			mdq, err := executor.buildMetricDataQuery(logger, query)
+			mdq, err := executor.buildMetricDataQuery(query)
 			require.NoError(t, err)
 			assert.Equal(t, "some account id", *mdq.AccountId)
 		})
 
 		t.Run("should leave AccountId in metric stat query", func(t *testing.T) {
-			executor := newExecutor(nil, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+			executor := newExecutor(nil, log.NewNullLogger())
 			query := getBaseQuery()
 			query.MetricEditorMode = models.MetricEditorModeBuilder
 			query.MetricQueryType = models.MetricQueryTypeSearch
-			mdq, err := executor.buildMetricDataQuery(logger, query)
+			mdq, err := executor.buildMetricDataQuery(query)
 			require.NoError(t, err)
 			assert.Nil(t, mdq.AccountId)
 		})
 
 		t.Run("should use custom built expression", func(t *testing.T) {
-			executor := newExecutor(nil, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+			executor := newExecutor(nil, log.NewNullLogger())
 			query := getBaseQuery()
 			query.MetricEditorMode = models.MetricEditorModeBuilder
 			query.MetricQueryType = models.MetricQueryTypeSearch
 			query.MatchExact = false
-			mdq, err := executor.buildMetricDataQuery(logger, query)
+			mdq, err := executor.buildMetricDataQuery(query)
 			require.NoError(t, err)
 			require.Nil(t, mdq.MetricStat)
 			assert.Equal(t, `REMOVE_EMPTY(SEARCH('Namespace="AWS/EC2" MetricName="CPUUtilization" "LoadBalancer"="lb1"', '', 300))`, *mdq.Expression)
 		})
 
 		t.Run("should use sql expression", func(t *testing.T) {
-			executor := newExecutor(nil, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+			executor := newExecutor(nil, log.NewNullLogger())
 			query := getBaseQuery()
 			query.MetricEditorMode = models.MetricEditorModeRaw
 			query.MetricQueryType = models.MetricQueryTypeQuery
 			query.SqlExpression = `SELECT SUM(CPUUTilization) FROM "AWS/EC2"`
-			mdq, err := executor.buildMetricDataQuery(logger, query)
+			mdq, err := executor.buildMetricDataQuery(query)
 			require.NoError(t, err)
 			require.Nil(t, mdq.MetricStat)
 			assert.Equal(t, query.SqlExpression, *mdq.Expression)
 		})
 
 		t.Run("should use user defined math expression", func(t *testing.T) {
-			executor := newExecutor(nil, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+			executor := newExecutor(nil, log.NewNullLogger())
 			query := getBaseQuery()
 			query.MetricEditorMode = models.MetricEditorModeRaw
 			query.MetricQueryType = models.MetricQueryTypeSearch
 			query.Expression = `SUM(x+y)`
-			mdq, err := executor.buildMetricDataQuery(logger, query)
+			mdq, err := executor.buildMetricDataQuery(query)
 			require.NoError(t, err)
 			require.Nil(t, mdq.MetricStat)
 			assert.Equal(t, query.Expression, *mdq.Expression)
 		})
 
 		t.Run("should set period in user defined expression", func(t *testing.T) {
-			executor := newExecutor(nil, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+			executor := newExecutor(nil, log.NewNullLogger())
 			query := getBaseQuery()
 			query.MetricEditorMode = models.MetricEditorModeRaw
 			query.MetricQueryType = models.MetricQueryTypeSearch
 			query.MatchExact = false
 			query.Expression = `SUM([a,b])`
-			mdq, err := executor.buildMetricDataQuery(logger, query)
+			mdq, err := executor.buildMetricDataQuery(query)
 			require.NoError(t, err)
 			require.Nil(t, mdq.MetricStat)
 			assert.Equal(t, int64(300), *mdq.Period)
@@ -96,11 +96,11 @@ func TestMetricDataQueryBuilder(t *testing.T) {
 		})
 
 		t.Run("should set label", func(t *testing.T) {
-			executor := newExecutor(nil, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+			executor := newExecutor(nil, log.NewNullLogger())
 			query := getBaseQuery()
 			query.Label = "some label"
 
-			mdq, err := executor.buildMetricDataQuery(logger, query)
+			mdq, err := executor.buildMetricDataQuery(query)
 
 			assert.NoError(t, err)
 			require.NotNil(t, mdq.Label)
@@ -108,18 +108,18 @@ func TestMetricDataQueryBuilder(t *testing.T) {
 		})
 
 		t.Run("should not set label for empty string query label", func(t *testing.T) {
-			executor := newExecutor(nil, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+			executor := newExecutor(nil, log.NewNullLogger())
 			query := getBaseQuery()
 			query.Label = ""
 
-			mdq, err := executor.buildMetricDataQuery(logger, query)
+			mdq, err := executor.buildMetricDataQuery(query)
 
 			assert.NoError(t, err)
 			assert.Nil(t, mdq.Label)
 		})
 
 		t.Run(`should not specify accountId when it is "all"`, func(t *testing.T) {
-			executor := newExecutor(nil, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+			executor := newExecutor(nil, log.NewNullLogger())
 			query := &models.CloudWatchQuery{
 				Namespace:  "AWS/EC2",
 				MetricName: "CPUUtilization",
@@ -129,7 +129,7 @@ func TestMetricDataQueryBuilder(t *testing.T) {
 				AccountId:  aws.String("all"),
 			}
 
-			mdq, err := executor.buildMetricDataQuery(logger, query)
+			mdq, err := executor.buildMetricDataQuery(query)
 
 			assert.NoError(t, err)
 			require.Nil(t, mdq.MetricStat)
@@ -137,7 +137,7 @@ func TestMetricDataQueryBuilder(t *testing.T) {
 		})
 
 		t.Run("should set accountId when it is specified", func(t *testing.T) {
-			executor := newExecutor(nil, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+			executor := newExecutor(nil, log.NewNullLogger())
 			query := &models.CloudWatchQuery{
 				Namespace:  "AWS/EC2",
 				MetricName: "CPUUtilization",
@@ -147,7 +147,7 @@ func TestMetricDataQueryBuilder(t *testing.T) {
 				AccountId:  aws.String("12345"),
 			}
 
-			mdq, err := executor.buildMetricDataQuery(logger, query)
+			mdq, err := executor.buildMetricDataQuery(query)
 
 			assert.NoError(t, err)
 			require.Nil(t, mdq.MetricStat)
diff --git a/pkg/tsdb/cloudwatch/metric_find_query.go b/pkg/tsdb/cloudwatch/metric_find_query.go
index 5f91f118cad81..8acddfbcbd06f 100644
--- a/pkg/tsdb/cloudwatch/metric_find_query.go
+++ b/pkg/tsdb/cloudwatch/metric_find_query.go
@@ -17,7 +17,6 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/resourcegroupstaggingapi"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/constants"
 )
 
 type suggestData struct {
@@ -40,54 +39,6 @@ func parseMultiSelectValue(input string) []string {
 	return []string{trimmedInput}
 }
 
-// Whenever this list is updated, the frontend list should also be updated.
-// Please update the region list in public/app/plugins/datasource/cloudwatch/partials/config.html
-func (e *cloudWatchExecutor) handleGetRegions(ctx context.Context, pluginCtx backend.PluginContext, parameters url.Values) ([]suggestData, error) {
-	instance, err := e.getInstance(ctx, pluginCtx)
-	if err != nil {
-		return nil, err
-	}
-
-	profile := instance.Settings.Profile
-	if cache, ok := e.regionCache.Load(profile); ok {
-		if cache2, ok2 := cache.([]suggestData); ok2 {
-			return cache2, nil
-		}
-	}
-
-	client, err := e.getEC2Client(ctx, pluginCtx, defaultRegion)
-	if err != nil {
-		return nil, err
-	}
-	regions := constants.Regions()
-	ec2Regions, err := client.DescribeRegionsWithContext(ctx, &ec2.DescribeRegionsInput{})
-	if err != nil {
-		// ignore error for backward compatibility
-		logger.Error("Failed to get regions", "error", err)
-	} else {
-		mergeEC2RegionsAndConstantRegions(regions, ec2Regions.Regions)
-	}
-
-	result := make([]suggestData, 0)
-	for region := range regions {
-		result = append(result, suggestData{Text: region, Value: region, Label: region})
-	}
-	sort.Slice(result, func(i, j int) bool {
-		return result[i].Text < result[j].Text
-	})
-	e.regionCache.Store(profile, result)
-
-	return result, nil
-}
-
-func mergeEC2RegionsAndConstantRegions(regions map[string]struct{}, ec2Regions []*ec2.Region) {
-	for _, region := range ec2Regions {
-		if _, ok := regions[*region.RegionName]; !ok {
-			regions[*region.RegionName] = struct{}{}
-		}
-	}
-}
-
 func (e *cloudWatchExecutor) handleGetEbsVolumeIds(ctx context.Context, pluginCtx backend.PluginContext, parameters url.Values) ([]suggestData, error) {
 	region := parameters.Get("region")
 	instanceId := parameters.Get("instanceId")
@@ -307,7 +258,7 @@ func (e *cloudWatchExecutor) handleGetLogGroups(ctx context.Context, pluginCtx b
 		input.LogGroupNamePrefix = aws.String(logGroupNamePrefix)
 	}
 	var response *cloudwatchlogs.DescribeLogGroupsOutput
-	response, err = logsClient.DescribeLogGroups(input)
+	response, err = logsClient.DescribeLogGroupsWithContext(ctx, input)
 	if err != nil || response == nil {
 		return nil, err
 	}
diff --git a/pkg/tsdb/cloudwatch/metric_find_query_test.go b/pkg/tsdb/cloudwatch/metric_find_query_test.go
index 8a44b9ab3b7b4..400c304162074 100644
--- a/pkg/tsdb/cloudwatch/metric_find_query_test.go
+++ b/pkg/tsdb/cloudwatch/metric_find_query_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"net/url"
-	"sort"
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -12,118 +11,15 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/resourcegroupstaggingapi"
 	"github.com/aws/aws-sdk-go/service/resourcegroupstaggingapi/resourcegroupstaggingapiiface"
-	"github.com/grafana/grafana-aws-sdk/pkg/awsds"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
-	"github.com/grafana/grafana-plugin-sdk-go/data"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/constants"
-	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/mocks"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
-	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/utils"
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 )
 
-func TestQuery_Regions(t *testing.T) {
-	origNewEC2Client := NewEC2Client
-	t.Cleanup(func() {
-		NewEC2Client = origNewEC2Client
-	})
-
-	ec2Mock := &mocks.EC2Mock{}
-	NewEC2Client = func(provider client.ConfigProvider) models.EC2APIProvider {
-		return ec2Mock
-	}
-	t.Run("An extra region", func(t *testing.T) {
-		const regionName = "xtra-region"
-		ec2Mock.On("DescribeRegionsWithContext", mock.Anything, mock.Anything).Return(&ec2.DescribeRegionsOutput{
-			Regions: []*ec2.Region{
-				{
-					RegionName: utils.Pointer(regionName),
-				},
-			},
-		}, nil)
-
-		im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: models.CloudWatchSettings{AWSDatasourceSettings: awsds.AWSDatasourceSettings{Region: "us-east-2"}}}, nil
-		})
-
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
-		resp, err := executor.handleGetRegions(
-			context.Background(),
-			backend.PluginContext{
-				DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{},
-			}, url.Values{
-				"region":    []string{"us-east-1"},
-				"namespace": []string{"custom"},
-			},
-		)
-		require.NoError(t, err)
-
-		expRegions := buildSortedSliceOfDefaultAndExtraRegions(t, regionName)
-		expFrame := data.NewFrame(
-			"",
-			data.NewField("text", nil, expRegions),
-			data.NewField("value", nil, expRegions),
-		)
-		expFrame.Meta = &data.FrameMeta{
-			Custom: map[string]any{
-				"rowCount": len(constants.Regions()) + 1,
-			},
-		}
-
-		expResponse := []suggestData{}
-		for _, region := range expRegions {
-			expResponse = append(expResponse, suggestData{Text: region, Value: region, Label: region})
-		}
-		assert.Equal(t, expResponse, resp)
-	})
-}
-
-func buildSortedSliceOfDefaultAndExtraRegions(t *testing.T, regionName string) []string {
-	t.Helper()
-	regions := constants.Regions()
-	regions[regionName] = struct{}{}
-	var expRegions []string
-	for region := range regions {
-		expRegions = append(expRegions, region)
-	}
-	sort.Strings(expRegions)
-	return expRegions
-}
-
-func Test_handleGetRegions_regionCache(t *testing.T) {
-	origNewEC2Client := NewEC2Client
-	t.Cleanup(func() {
-		NewEC2Client = origNewEC2Client
-	})
-	cli := mockEC2Client{}
-	NewEC2Client = func(client.ConfigProvider) models.EC2APIProvider {
-		return &cli
-	}
-	im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		return DataSource{Settings: models.CloudWatchSettings{AWSDatasourceSettings: awsds.AWSDatasourceSettings{Region: "us-east-2"}}}, nil
-	})
-
-	t.Run("AWS only called once for multiple calls to handleGetRegions", func(t *testing.T) {
-		cli.On("DescribeRegionsWithContext", mock.Anything, mock.Anything).Return(&ec2.DescribeRegionsOutput{}, nil)
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
-		_, err := executor.handleGetRegions(
-			context.Background(),
-			backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}}, nil)
-		require.NoError(t, err)
-
-		_, err = executor.handleGetRegions(
-			context.Background(),
-			backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}}, nil)
-		require.NoError(t, err)
-
-		cli.AssertNumberOfCalls(t, "DescribeRegionsWithContext", 1)
-	})
-}
 func TestQuery_InstanceAttributes(t *testing.T) {
 	origNewEC2Client := NewEC2Client
 	t.Cleanup(func() {
@@ -157,7 +53,7 @@ func TestQuery_InstanceAttributes(t *testing.T) {
 		}
 
 		im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}, sessions: &fakeSessionCache{}}, nil
 		})
 
 		filterMap := map[string][]string{
@@ -166,7 +62,7 @@ func TestQuery_InstanceAttributes(t *testing.T) {
 		filterJson, err := json.Marshal(filterMap)
 		require.NoError(t, err)
 
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 		resp, err := executor.handleGetEc2InstanceAttribute(
 			context.Background(),
 			backend.PluginContext{
@@ -241,10 +137,10 @@ func TestQuery_EBSVolumeIDs(t *testing.T) {
 		}
 
 		im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}, sessions: &fakeSessionCache{}}, nil
 		})
 
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 		resp, err := executor.handleGetEbsVolumeIds(
 			context.Background(),
 			backend.PluginContext{
@@ -302,7 +198,7 @@ func TestQuery_ResourceARNs(t *testing.T) {
 		}
 
 		im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: models.CloudWatchSettings{}}, nil
+			return DataSource{Settings: models.CloudWatchSettings{}, sessions: &fakeSessionCache{}}, nil
 		})
 
 		tagMap := map[string][]string{
@@ -311,7 +207,7 @@ func TestQuery_ResourceARNs(t *testing.T) {
 		tagJson, err := json.Marshal(tagMap)
 		require.NoError(t, err)
 
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 		resp, err := executor.handleGetResourceArns(
 			context.Background(),
 			backend.PluginContext{
diff --git a/pkg/tsdb/cloudwatch/mocks/accounts_service.go b/pkg/tsdb/cloudwatch/mocks/accounts_service.go
index 52f3aff63b548..d7b742d684864 100644
--- a/pkg/tsdb/cloudwatch/mocks/accounts_service.go
+++ b/pkg/tsdb/cloudwatch/mocks/accounts_service.go
@@ -1,6 +1,8 @@
 package mocks
 
 import (
+	"context"
+
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
 	"github.com/stretchr/testify/mock"
 )
@@ -9,7 +11,7 @@ type AccountsServiceMock struct {
 	mock.Mock
 }
 
-func (a *AccountsServiceMock) GetAccountsForCurrentUserOrRole() ([]resources.ResourceResponse[resources.Account], error) {
+func (a *AccountsServiceMock) GetAccountsForCurrentUserOrRole(ctx context.Context) ([]resources.ResourceResponse[resources.Account], error) {
 	args := a.Called()
 
 	return args.Get(0).([]resources.ResourceResponse[resources.Account]), args.Error(1)
diff --git a/pkg/tsdb/cloudwatch/mocks/logs.go b/pkg/tsdb/cloudwatch/mocks/logs.go
index 54ac6737a1664..e0b16bf436d51 100644
--- a/pkg/tsdb/cloudwatch/mocks/logs.go
+++ b/pkg/tsdb/cloudwatch/mocks/logs.go
@@ -1,25 +1,28 @@
 package mocks
 
 import (
+	"context"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
 	"github.com/aws/aws-sdk-go/service/cloudwatchlogs/cloudwatchlogsiface"
-	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
 	"github.com/stretchr/testify/mock"
+
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
 )
 
 type LogsAPI struct {
 	mock.Mock
 }
 
-func (l *LogsAPI) DescribeLogGroups(input *cloudwatchlogs.DescribeLogGroupsInput) (*cloudwatchlogs.DescribeLogGroupsOutput, error) {
+func (l *LogsAPI) DescribeLogGroupsWithContext(ctx context.Context, input *cloudwatchlogs.DescribeLogGroupsInput, option ...request.Option) (*cloudwatchlogs.DescribeLogGroupsOutput, error) {
 	args := l.Called(input)
 
 	return args.Get(0).(*cloudwatchlogs.DescribeLogGroupsOutput), args.Error(1)
 }
 
-func (l *LogsAPI) GetLogGroupFields(input *cloudwatchlogs.GetLogGroupFieldsInput) (*cloudwatchlogs.GetLogGroupFieldsOutput, error) {
+func (l *LogsAPI) GetLogGroupFieldsWithContext(ctx context.Context, input *cloudwatchlogs.GetLogGroupFieldsInput, option ...request.Option) (*cloudwatchlogs.GetLogGroupFieldsOutput, error) {
 	args := l.Called(input)
 
 	return args.Get(0).(*cloudwatchlogs.GetLogGroupFieldsOutput), args.Error(1)
@@ -29,28 +32,18 @@ type LogsService struct {
 	mock.Mock
 }
 
-func (l *LogsService) GetLogGroups(request resources.LogGroupsRequest) ([]resources.ResourceResponse[resources.LogGroup], error) {
+func (l *LogsService) GetLogGroupsWithContext(ctx context.Context, request resources.LogGroupsRequest) ([]resources.ResourceResponse[resources.LogGroup], error) {
 	args := l.Called(request)
 
 	return args.Get(0).([]resources.ResourceResponse[resources.LogGroup]), args.Error(1)
 }
 
-func (l *LogsService) GetLogGroupFields(request resources.LogGroupFieldsRequest) ([]resources.ResourceResponse[resources.LogGroupField], error) {
+func (l *LogsService) GetLogGroupFieldsWithContext(ctx context.Context, request resources.LogGroupFieldsRequest, option ...request.Option) ([]resources.ResourceResponse[resources.LogGroupField], error) {
 	args := l.Called(request)
 
 	return args.Get(0).([]resources.ResourceResponse[resources.LogGroupField]), args.Error(1)
 }
 
-type MockFeatures struct {
-	mock.Mock
-}
-
-func (f *MockFeatures) IsEnabled(feature string) bool {
-	args := f.Called(feature)
-
-	return args.Bool(0)
-}
-
 type MockLogEvents struct {
 	cloudwatchlogsiface.CloudWatchLogsAPI
 
diff --git a/pkg/tsdb/cloudwatch/mocks/oam_client.go b/pkg/tsdb/cloudwatch/mocks/oam_client.go
index 2d617cc143a03..932ca1579b423 100644
--- a/pkg/tsdb/cloudwatch/mocks/oam_client.go
+++ b/pkg/tsdb/cloudwatch/mocks/oam_client.go
@@ -1,6 +1,9 @@
 package mocks
 
 import (
+	"context"
+
+	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/oam"
 	"github.com/stretchr/testify/mock"
 )
@@ -9,12 +12,12 @@ type FakeOAMClient struct {
 	mock.Mock
 }
 
-func (o *FakeOAMClient) ListSinks(input *oam.ListSinksInput) (*oam.ListSinksOutput, error) {
+func (o *FakeOAMClient) ListSinksWithContext(ctx context.Context, input *oam.ListSinksInput, opts ...request.Option) (*oam.ListSinksOutput, error) {
 	args := o.Called(input)
 	return args.Get(0).(*oam.ListSinksOutput), args.Error(1)
 }
 
-func (o *FakeOAMClient) ListAttachedLinks(input *oam.ListAttachedLinksInput) (*oam.ListAttachedLinksOutput, error) {
+func (o *FakeOAMClient) ListAttachedLinksWithContext(ctx context.Context, input *oam.ListAttachedLinksInput, opts ...request.Option) (*oam.ListAttachedLinksOutput, error) {
 	args := o.Called(input)
 	return args.Get(0).(*oam.ListAttachedLinksOutput), args.Error(1)
 }
diff --git a/pkg/tsdb/cloudwatch/models/api.go b/pkg/tsdb/cloudwatch/models/api.go
index 42d54c84e812a..c54c156b12397 100644
--- a/pkg/tsdb/cloudwatch/models/api.go
+++ b/pkg/tsdb/cloudwatch/models/api.go
@@ -10,8 +10,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/oam"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
 )
 
@@ -25,7 +24,6 @@ type RequestContext struct {
 	OAMAPIProvider        OAMAPIProvider
 	EC2APIProvider        EC2APIProvider
 	Settings              CloudWatchSettings
-	Features              featuremgmt.FeatureToggles
 	Logger                log.Logger
 }
 
@@ -37,12 +35,12 @@ type ListMetricsProvider interface {
 }
 
 type LogGroupsProvider interface {
-	GetLogGroups(request resources.LogGroupsRequest) ([]resources.ResourceResponse[resources.LogGroup], error)
-	GetLogGroupFields(request resources.LogGroupFieldsRequest) ([]resources.ResourceResponse[resources.LogGroupField], error)
+	GetLogGroupsWithContext(ctx context.Context, request resources.LogGroupsRequest) ([]resources.ResourceResponse[resources.LogGroup], error)
+	GetLogGroupFieldsWithContext(ctx context.Context, request resources.LogGroupFieldsRequest, option ...request.Option) ([]resources.ResourceResponse[resources.LogGroupField], error)
 }
 
 type AccountsProvider interface {
-	GetAccountsForCurrentUserOrRole() ([]resources.ResourceResponse[resources.Account], error)
+	GetAccountsForCurrentUserOrRole(ctx context.Context) ([]resources.ResourceResponse[resources.Account], error)
 }
 
 type RegionsAPIProvider interface {
@@ -60,13 +58,13 @@ type CloudWatchMetricsAPIProvider interface {
 }
 
 type CloudWatchLogsAPIProvider interface {
-	DescribeLogGroups(*cloudwatchlogs.DescribeLogGroupsInput) (*cloudwatchlogs.DescribeLogGroupsOutput, error)
-	GetLogGroupFields(*cloudwatchlogs.GetLogGroupFieldsInput) (*cloudwatchlogs.GetLogGroupFieldsOutput, error)
+	DescribeLogGroupsWithContext(ctx context.Context, in *cloudwatchlogs.DescribeLogGroupsInput, opts ...request.Option) (*cloudwatchlogs.DescribeLogGroupsOutput, error)
+	GetLogGroupFieldsWithContext(ctx context.Context, in *cloudwatchlogs.GetLogGroupFieldsInput, option ...request.Option) (*cloudwatchlogs.GetLogGroupFieldsOutput, error)
 }
 
 type OAMAPIProvider interface {
-	ListSinks(*oam.ListSinksInput) (*oam.ListSinksOutput, error)
-	ListAttachedLinks(*oam.ListAttachedLinksInput) (*oam.ListAttachedLinksOutput, error)
+	ListSinksWithContext(ctx context.Context, in *oam.ListSinksInput, opts ...request.Option) (*oam.ListSinksOutput, error)
+	ListAttachedLinksWithContext(ctx context.Context, in *oam.ListAttachedLinksInput, opts ...request.Option) (*oam.ListAttachedLinksOutput, error)
 }
 
 type EC2APIProvider interface {
diff --git a/pkg/tsdb/cloudwatch/models/cloudwatch_query.go b/pkg/tsdb/cloudwatch/models/cloudwatch_query.go
index ddf00f2b93933..4d6afa1e9e77e 100644
--- a/pkg/tsdb/cloudwatch/models/cloudwatch_query.go
+++ b/pkg/tsdb/cloudwatch/models/cloudwatch_query.go
@@ -7,17 +7,17 @@ import (
 	"math"
 	"net/url"
 	"regexp"
-	"sort"
 	"strconv"
 	"strings"
 	"time"
 
 	"github.com/aws/aws-sdk-go/aws/endpoints"
 	"github.com/google/uuid"
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
 
-	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/kinds/dataquery"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/utils"
 )
 
 type (
@@ -240,9 +240,9 @@ func ParseMetricDataQueries(dataQueries []backend.DataQuery, startTime time.Time
 		cwQuery := &CloudWatchQuery{
 			logger:            logger,
 			RefId:             refId,
-			Id:                mdq.Id,
-			Region:            mdq.Region,
-			Namespace:         mdq.Namespace,
+			Id:                utils.Depointerizer(mdq.Id),
+			Region:            utils.Depointerizer(mdq.Region),
+			Namespace:         utils.Depointerizer(mdq.Namespace),
 			TimezoneUTCOffset: mdq.TimezoneUTCOffset,
 		}
 
@@ -315,7 +315,7 @@ func (q *CloudWatchQuery) validateAndSetDefaults(refId string, metricsDataQuery
 		q.AccountId = metricsDataQuery.AccountId
 	}
 
-	if metricsDataQuery.Id == "" {
+	if utils.Depointerizer(metricsDataQuery.Id) == "" {
 		// Why not just use refId if id is not specified in the frontend? When specifying an id in the editor,
 		// and alphabetical must be used. The id must be unique, so if an id like for example a, b or c would be used,
 		// it would likely collide with some ref id. That's why the `query` prefix is used.
@@ -479,22 +479,7 @@ func parseDimensions(dimensions map[string]any) (map[string][]string, error) {
 		}
 	}
 
-	sortedDimensions := sortDimensions(parsedDimensions)
-	return sortedDimensions, nil
-}
-
-func sortDimensions(dimensions map[string][]string) map[string][]string {
-	sortedDimensions := make(map[string][]string, len(dimensions))
-	keys := make([]string, 0, len(dimensions))
-	for k := range dimensions {
-		keys = append(keys, k)
-	}
-	sort.Strings(keys)
-
-	for _, k := range keys {
-		sortedDimensions[k] = dimensions[k]
-	}
-	return sortedDimensions
+	return parsedDimensions, nil
 }
 
 func getEndpoint(region string) string {
diff --git a/pkg/tsdb/cloudwatch/models/cloudwatch_query_test.go b/pkg/tsdb/cloudwatch/models/cloudwatch_query_test.go
index 3a5a885d3ea37..f1d2ebc21c991 100644
--- a/pkg/tsdb/cloudwatch/models/cloudwatch_query_test.go
+++ b/pkg/tsdb/cloudwatch/models/cloudwatch_query_test.go
@@ -7,18 +7,16 @@ import (
 	"testing"
 	"time"
 
-	"github.com/grafana/kindsys"
-
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/kinds/dataquery"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/grafana/pkg/infra/log/logtest"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/utils"
 )
 
-var logger = &logtest.Fake{}
+var logger = log.NewNullLogger()
 
 func TestCloudWatchQuery(t *testing.T) {
 	t.Run("Deeplink", func(t *testing.T) {
@@ -898,15 +896,15 @@ func Test_migrateAliasToDynamicLabel_single_query_preserves_old_alias_and_create
 
 			queryToMigrate := metricsDataQuery{
 				CloudWatchMetricsQuery: dataquery.CloudWatchMetricsQuery{
-					Region:     "us-east-1",
-					Namespace:  "ec2",
-					MetricName: kindsys.Ptr("CPUUtilization"),
-					Alias:      kindsys.Ptr(tc.inputAlias),
+					Region:     utils.Pointer("us-east-1"),
+					Namespace:  utils.Pointer("ec2"),
+					MetricName: utils.Pointer("CPUUtilization"),
+					Alias:      utils.Pointer(tc.inputAlias),
 					Dimensions: &dataquery.Dimensions{
 						"InstanceId": []any{"test"},
 					},
 					Statistic: &average,
-					Period:    kindsys.Ptr("600"),
+					Period:    utils.Pointer("600"),
 					Hide:      &false,
 				},
 			}
diff --git a/pkg/tsdb/cloudwatch/models/settings.go b/pkg/tsdb/cloudwatch/models/settings.go
index a03fbcc9f29fe..9221fe42fb442 100644
--- a/pkg/tsdb/cloudwatch/models/settings.go
+++ b/pkg/tsdb/cloudwatch/models/settings.go
@@ -1,6 +1,7 @@
 package models
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"time"
@@ -17,22 +18,23 @@ type CloudWatchSettings struct {
 	Namespace               string   `json:"customMetricsNamespaces"`
 	SecureSocksProxyEnabled bool     `json:"enableSecureSocksProxy"` // this can be removed when https://github.com/grafana/grafana/issues/39089 is implemented
 	LogsTimeout             Duration `json:"logsTimeout"`
+
+	// GrafanaSettings are fetched from the GrafanaCfg in the context
+	GrafanaSettings awsds.AuthSettings `json:"-"`
 }
 
-func LoadCloudWatchSettings(config backend.DataSourceInstanceSettings) (CloudWatchSettings, error) {
+func LoadCloudWatchSettings(ctx context.Context, config backend.DataSourceInstanceSettings) (CloudWatchSettings, error) {
 	instance := CloudWatchSettings{}
+
 	if config.JSONData != nil && len(config.JSONData) > 1 {
 		if err := json.Unmarshal(config.JSONData, &instance); err != nil {
 			return CloudWatchSettings{}, fmt.Errorf("could not unmarshal DatasourceSettings json: %w", err)
 		}
 	}
 
-	if instance.Region == "default" || instance.Region == "" {
-		instance.Region = instance.DefaultRegion
-	}
-
-	if instance.Profile == "" {
-		instance.Profile = config.Database
+	// load the instance using the loader for the wrapped awsds.AWSDatasourceSettings
+	if err := instance.Load(config); err != nil {
+		return CloudWatchSettings{}, err
 	}
 
 	// logs timeout default is 30 minutes, the same as timeout in frontend logs query
@@ -41,8 +43,7 @@ func LoadCloudWatchSettings(config backend.DataSourceInstanceSettings) (CloudWat
 		instance.LogsTimeout = Duration{30 * time.Minute}
 	}
 
-	instance.AccessKey = config.DecryptedSecureJSONData["accessKey"]
-	instance.SecretKey = config.DecryptedSecureJSONData["secretKey"]
+	instance.GrafanaSettings = *awsds.ReadAuthSettings(ctx)
 
 	return instance, nil
 }
diff --git a/pkg/tsdb/cloudwatch/models/settings_test.go b/pkg/tsdb/cloudwatch/models/settings_test.go
index 5b011b0e4914a..8b6579ac1ea0b 100644
--- a/pkg/tsdb/cloudwatch/models/settings_test.go
+++ b/pkg/tsdb/cloudwatch/models/settings_test.go
@@ -1,16 +1,23 @@
 package models
 
 import (
+	"context"
 	"testing"
 	"time"
 
 	"github.com/grafana/grafana-aws-sdk/pkg/awsds"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/proxy"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func Test_Settings_LoadCloudWatchSettings(t *testing.T) {
+	settingCtx := backend.WithGrafanaConfig(context.Background(), backend.NewGrafanaCfg(map[string]string{
+		awsds.AllowedAuthProvidersEnvVarKeyName: "default,keys,credentials",
+		awsds.AssumeRoleEnabledEnvVarKeyName:    "false",
+		awsds.SessionDurationEnvVarKeyName:      "10m",
+	}))
 	t.Run("Should return error for invalid json", func(t *testing.T) {
 		settings := backend.DataSourceInstanceSettings{
 			ID: 33,
@@ -25,7 +32,7 @@ func Test_Settings_LoadCloudWatchSettings(t *testing.T) {
 			},
 		}
 
-		_, err := LoadCloudWatchSettings(settings)
+		_, err := LoadCloudWatchSettings(settingCtx, settings)
 
 		assert.Error(t, err)
 	})
@@ -47,7 +54,7 @@ func Test_Settings_LoadCloudWatchSettings(t *testing.T) {
 			},
 		}
 
-		s, err := LoadCloudWatchSettings(settings)
+		s, err := LoadCloudWatchSettings(settingCtx, settings)
 		require.NoError(t, err)
 		assert.Equal(t, awsds.AuthTypeKeys, s.AuthType)
 		assert.Equal(t, "arn:aws:iam::123456789012:role/grafana", s.AssumeRoleARN)
@@ -78,7 +85,7 @@ func Test_Settings_LoadCloudWatchSettings(t *testing.T) {
 			},
 		}
 
-		s, err := LoadCloudWatchSettings(settings)
+		s, err := LoadCloudWatchSettings(settingCtx, settings)
 		require.NoError(t, err)
 		assert.Equal(t, awsds.AuthTypeDefault, s.AuthType)
 		assert.Equal(t, "arn:aws:iam::123456789012:role/grafana", s.AssumeRoleARN)
@@ -103,7 +110,7 @@ func Test_Settings_LoadCloudWatchSettings(t *testing.T) {
 			},
 		}
 
-		s, err := LoadCloudWatchSettings(settings)
+		s, err := LoadCloudWatchSettings(settingCtx, settings)
 		require.NoError(t, err)
 		assert.Equal(t, time.Minute*30, s.LogsTimeout.Duration)
 	})
@@ -121,7 +128,7 @@ func Test_Settings_LoadCloudWatchSettings(t *testing.T) {
 			},
 		}
 
-		s, err := LoadCloudWatchSettings(settings)
+		s, err := LoadCloudWatchSettings(settingCtx, settings)
 		require.NoError(t, err)
 		assert.Equal(t, time.Minute*10, s.LogsTimeout.Duration)
 	})
@@ -139,7 +146,7 @@ func Test_Settings_LoadCloudWatchSettings(t *testing.T) {
 			},
 		}
 
-		s, err := LoadCloudWatchSettings(settings)
+		s, err := LoadCloudWatchSettings(settingCtx, settings)
 		require.NoError(t, err)
 		assert.Equal(t, time.Duration(1500000000), s.LogsTimeout.Duration)
 	})
@@ -157,7 +164,7 @@ func Test_Settings_LoadCloudWatchSettings(t *testing.T) {
 			},
 		}
 
-		s, err := LoadCloudWatchSettings(settings)
+		s, err := LoadCloudWatchSettings(settingCtx, settings)
 		require.NoError(t, err)
 		assert.Equal(t, 1500*time.Millisecond, s.LogsTimeout.Duration)
 	})
@@ -175,7 +182,7 @@ func Test_Settings_LoadCloudWatchSettings(t *testing.T) {
 			},
 		}
 
-		_, err := LoadCloudWatchSettings(settings)
+		_, err := LoadCloudWatchSettings(context.Background(), settings)
 		require.Error(t, err)
 	})
 	t.Run("Should throw error if logsTimeout is an invalid type", func(t *testing.T) {
@@ -192,7 +199,42 @@ func Test_Settings_LoadCloudWatchSettings(t *testing.T) {
 			},
 		}
 
-		_, err := LoadCloudWatchSettings(settings)
+		_, err := LoadCloudWatchSettings(settingCtx, settings)
 		require.Error(t, err)
 	})
+
+	t.Run("Should load settings from context", func(t *testing.T) {
+		settingCtx := backend.WithGrafanaConfig(context.Background(), backend.NewGrafanaCfg(map[string]string{
+			awsds.AllowedAuthProvidersEnvVarKeyName:  "foo , bar,baz",
+			awsds.AssumeRoleEnabledEnvVarKeyName:     "false",
+			awsds.SessionDurationEnvVarKeyName:       "10m",
+			awsds.GrafanaAssumeRoleExternalIdKeyName: "mock_id",
+			awsds.ListMetricsPageLimitKeyName:        "50",
+			proxy.PluginSecureSocksProxyEnabled:      "true",
+		}))
+		settings := backend.DataSourceInstanceSettings{
+			ID: 33,
+			JSONData: []byte(`{
+			"authType": "arn",
+			"assumeRoleArn": "arn:aws:iam::123456789012:role/grafana"
+		  }`),
+			DecryptedSecureJSONData: map[string]string{
+				"accessKey": "AKIAIOSFODNN7EXAMPLE",
+				"secretKey": "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY",
+			},
+		}
+		s, err := LoadCloudWatchSettings(settingCtx, settings)
+		require.NoError(t, err)
+
+		ctxDuration := 10 * time.Minute
+		expectedGrafanaSettings := awsds.AuthSettings{
+			AllowedAuthProviders:      []string{"foo", "bar", "baz"},
+			AssumeRoleEnabled:         false,
+			SessionDuration:           &ctxDuration,
+			ExternalID:                "mock_id",
+			ListMetricsPageLimit:      50,
+			SecureSocksDSProxyEnabled: true,
+		}
+		assert.Equal(t, expectedGrafanaSettings, s.GrafanaSettings)
+	})
 }
diff --git a/pkg/tsdb/cloudwatch/resource_handler.go b/pkg/tsdb/cloudwatch/resource_handler.go
index 5f154830891ab..9107a76cb5cdd 100644
--- a/pkg/tsdb/cloudwatch/resource_handler.go
+++ b/pkg/tsdb/cloudwatch/resource_handler.go
@@ -8,69 +8,62 @@ import (
 	"net/url"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/resource/httpadapter"
-
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/routes"
 )
 
 func (e *cloudWatchExecutor) newResourceMux() *http.ServeMux {
 	mux := http.NewServeMux()
-	mux.HandleFunc("/ebs-volume-ids", handleResourceReq(e.handleGetEbsVolumeIds))
-	mux.HandleFunc("/ec2-instance-attribute", handleResourceReq(e.handleGetEc2InstanceAttribute))
-	mux.HandleFunc("/resource-arns", handleResourceReq(e.handleGetResourceArns))
-	mux.HandleFunc("/log-groups", routes.ResourceRequestMiddleware(routes.LogGroupsHandler, logger, e.getRequestContext))
-	mux.HandleFunc("/metrics", routes.ResourceRequestMiddleware(routes.MetricsHandler, logger, e.getRequestContext))
-	mux.HandleFunc("/dimension-values", routes.ResourceRequestMiddleware(routes.DimensionValuesHandler, logger, e.getRequestContext))
-	mux.HandleFunc("/dimension-keys", routes.ResourceRequestMiddleware(routes.DimensionKeysHandler, logger, e.getRequestContext))
-	mux.HandleFunc("/accounts", routes.ResourceRequestMiddleware(routes.AccountsHandler, logger, e.getRequestContext))
-	mux.HandleFunc("/namespaces", routes.ResourceRequestMiddleware(routes.NamespacesHandler, logger, e.getRequestContext))
-	mux.HandleFunc("/log-group-fields", routes.ResourceRequestMiddleware(routes.LogGroupFieldsHandler, logger, e.getRequestContext))
-	mux.HandleFunc("/external-id", routes.ResourceRequestMiddleware(routes.ExternalIdHandler, logger, e.getRequestContext))
-
-	// feature is enabled by default, just putting behind a feature flag in case of unexpected bugs
-	if e.features.IsEnabled("cloudwatchNewRegionsHandler") {
-		mux.HandleFunc("/regions", routes.ResourceRequestMiddleware(routes.RegionsHandler, logger, e.getRequestContext))
-	} else {
-		mux.HandleFunc("/regions", handleResourceReq(e.handleGetRegions))
-	}
-
+	mux.HandleFunc("/ebs-volume-ids", handleResourceReq(e.handleGetEbsVolumeIds, e.logger))
+	mux.HandleFunc("/ec2-instance-attribute", handleResourceReq(e.handleGetEc2InstanceAttribute, e.logger))
+	mux.HandleFunc("/resource-arns", handleResourceReq(e.handleGetResourceArns, e.logger))
+	mux.HandleFunc("/log-groups", routes.ResourceRequestMiddleware(routes.LogGroupsHandler, e.logger, e.getRequestContext))
+	mux.HandleFunc("/metrics", routes.ResourceRequestMiddleware(routes.MetricsHandler, e.logger, e.getRequestContext))
+	mux.HandleFunc("/dimension-values", routes.ResourceRequestMiddleware(routes.DimensionValuesHandler, e.logger, e.getRequestContext))
+	mux.HandleFunc("/dimension-keys", routes.ResourceRequestMiddleware(routes.DimensionKeysHandler, e.logger, e.getRequestContext))
+	mux.HandleFunc("/accounts", routes.ResourceRequestMiddleware(routes.AccountsHandler, e.logger, e.getRequestContext))
+	mux.HandleFunc("/namespaces", routes.ResourceRequestMiddleware(routes.NamespacesHandler, e.logger, e.getRequestContext))
+	mux.HandleFunc("/log-group-fields", routes.ResourceRequestMiddleware(routes.LogGroupFieldsHandler, e.logger, e.getRequestContext))
+	mux.HandleFunc("/external-id", routes.ResourceRequestMiddleware(routes.ExternalIdHandler, e.logger, e.getRequestContextOnlySettings))
+	mux.HandleFunc("/regions", routes.ResourceRequestMiddleware(routes.RegionsHandler, e.logger, e.getRequestContext))
 	// remove this once AWS's Cross Account Observability is supported in GovCloud
-	mux.HandleFunc("/legacy-log-groups", handleResourceReq(e.handleGetLogGroups))
+	mux.HandleFunc("/legacy-log-groups", handleResourceReq(e.handleGetLogGroups, e.logger))
 
 	return mux
 }
 
 type handleFn func(ctx context.Context, pluginCtx backend.PluginContext, parameters url.Values) ([]suggestData, error)
 
-func handleResourceReq(handleFunc handleFn) func(rw http.ResponseWriter, req *http.Request) {
+func handleResourceReq(handleFunc handleFn, logger log.Logger) func(rw http.ResponseWriter, req *http.Request) {
 	return func(rw http.ResponseWriter, req *http.Request) {
 		ctx := req.Context()
 		pluginContext := httpadapter.PluginConfigFromContext(ctx)
 		err := req.ParseForm()
 		if err != nil {
-			writeResponse(rw, http.StatusBadRequest, fmt.Sprintf("unexpected error %v", err))
+			writeResponse(rw, http.StatusBadRequest, fmt.Sprintf("unexpected error %v", err), logger.FromContext(ctx))
 			return
 		}
 		data, err := handleFunc(ctx, pluginContext, req.URL.Query())
 		if err != nil {
-			writeResponse(rw, http.StatusBadRequest, fmt.Sprintf("unexpected error %v", err))
+			writeResponse(rw, http.StatusBadRequest, fmt.Sprintf("unexpected error %v", err), logger.FromContext(ctx))
 			return
 		}
 		body, err := json.Marshal(data)
 		if err != nil {
-			writeResponse(rw, http.StatusBadRequest, fmt.Sprintf("unexpected error %v", err))
+			writeResponse(rw, http.StatusBadRequest, fmt.Sprintf("unexpected error %v", err), logger.FromContext(ctx))
 			return
 		}
 		rw.WriteHeader(http.StatusOK)
 		_, err = rw.Write(body)
 		if err != nil {
-			logger.Error("Unable to write HTTP response", "error", err)
+			logger.FromContext(ctx).Error("Unable to write HTTP response", "error", err)
 			return
 		}
 	}
 }
 
-func writeResponse(rw http.ResponseWriter, code int, msg string) {
+func writeResponse(rw http.ResponseWriter, code int, msg string, logger log.Logger) {
 	rw.WriteHeader(code)
 	_, err := rw.Write([]byte(msg))
 	if err != nil {
diff --git a/pkg/tsdb/cloudwatch/response_parser.go b/pkg/tsdb/cloudwatch/response_parser.go
index 78b7154afa749..05bb8dcd9e691 100644
--- a/pkg/tsdb/cloudwatch/response_parser.go
+++ b/pkg/tsdb/cloudwatch/response_parser.go
@@ -2,6 +2,7 @@ package cloudwatch
 
 import (
 	"fmt"
+	"regexp"
 	"sort"
 	"strings"
 	"time"
@@ -12,6 +13,9 @@ import (
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 )
 
+// matches a dynamic label
+var dynamicLabel = regexp.MustCompile(`\$\{.+\}`)
+
 func (e *cloudWatchExecutor) parseResponse(startTime time.Time, endTime time.Time, metricDataOutputs []*cloudwatch.GetMetricDataOutput,
 	queries []*models.CloudWatchQuery) ([]*responseWrapper, error) {
 	aggregatedResponse := aggregateResponse(metricDataOutputs)
@@ -110,6 +114,8 @@ func getLabels(cloudwatchLabel string, query *models.CloudWatchQuery) data.Label
 func buildDataFrames(startTime time.Time, endTime time.Time, aggregatedResponse models.QueryRowResponse,
 	query *models.CloudWatchQuery) (data.Frames, error) {
 	frames := data.Frames{}
+	hasStaticLabel := query.Label != "" && !dynamicLabel.MatchString(query.Label)
+
 	for _, metric := range aggregatedResponse.Metrics {
 		label := *metric.Label
 
@@ -169,10 +175,15 @@ func buildDataFrames(startTime time.Time, endTime time.Time, aggregatedResponse
 		timeField := data.NewField(data.TimeSeriesTimeFieldName, nil, timestamps)
 		valueField := data.NewField(data.TimeSeriesValueFieldName, labels, points)
 
-		valueField.SetConfig(&data.FieldConfig{DisplayNameFromDS: label, Links: createDataLinks(deepLink)})
+		name := label
+		// CloudWatch appends the dimensions to the returned label if the query label is not dynamic, so static labels need to be set
+		if hasStaticLabel {
+			name = query.Label
+		}
 
+		valueField.SetConfig(&data.FieldConfig{DisplayNameFromDS: name, Links: createDataLinks(deepLink)})
 		frame := data.Frame{
-			Name: label,
+			Name: name,
 			Fields: []*data.Field{
 				timeField,
 				valueField,
diff --git a/pkg/tsdb/cloudwatch/response_parser_test.go b/pkg/tsdb/cloudwatch/response_parser_test.go
index 1701bcce63494..5cdedf4296775 100644
--- a/pkg/tsdb/cloudwatch/response_parser_test.go
+++ b/pkg/tsdb/cloudwatch/response_parser_test.go
@@ -376,6 +376,82 @@ func Test_buildDataFrames_uses_response_label_as_frame_name(t *testing.T) {
 		assert.Equal(t, "some label", frames[0].Name)
 	})
 
+	t.Run("when non-static label set on query", func(t *testing.T) {
+		timestamp := time.Unix(0, 0)
+		response := &models.QueryRowResponse{
+			Metrics: []*cloudwatch.MetricDataResult{
+				{
+					Id:    aws.String("lb3"),
+					Label: aws.String("some label"),
+					Timestamps: []*time.Time{
+						aws.Time(timestamp),
+					},
+					Values:     []*float64{aws.Float64(23)},
+					StatusCode: aws.String("Complete"),
+				},
+			},
+		}
+
+		query := &models.CloudWatchQuery{
+			RefId:      "refId1",
+			Region:     "us-east-1",
+			Namespace:  "AWS/ApplicationELB",
+			MetricName: "TargetResponseTime",
+			Dimensions: map[string][]string{
+				"LoadBalancer": {"lb1"},
+				"InstanceType": {"micro"},
+				"Resource":     {"res"},
+			},
+			Statistic:        "Average",
+			Period:           60,
+			MetricQueryType:  models.MetricQueryTypeQuery,
+			MetricEditorMode: models.MetricEditorModeBuilder,
+			Label:            "set ${AVG} label",
+		}
+		frames, err := buildDataFrames(startTime, endTime, *response, query)
+		require.NoError(t, err)
+
+		assert.Equal(t, "some label", frames[0].Name)
+	})
+
+	t.Run("unless static label set on query", func(t *testing.T) {
+		timestamp := time.Unix(0, 0)
+		response := &models.QueryRowResponse{
+			Metrics: []*cloudwatch.MetricDataResult{
+				{
+					Id:    aws.String("lb3"),
+					Label: aws.String("some label"),
+					Timestamps: []*time.Time{
+						aws.Time(timestamp),
+					},
+					Values:     []*float64{aws.Float64(23)},
+					StatusCode: aws.String("Complete"),
+				},
+			},
+		}
+
+		query := &models.CloudWatchQuery{
+			RefId:      "refId1",
+			Region:     "us-east-1",
+			Namespace:  "AWS/ApplicationELB",
+			MetricName: "TargetResponseTime",
+			Dimensions: map[string][]string{
+				"LoadBalancer": {"lb1"},
+				"InstanceType": {"micro"},
+				"Resource":     {"res"},
+			},
+			Statistic:        "Average",
+			Period:           60,
+			MetricQueryType:  models.MetricQueryTypeQuery,
+			MetricEditorMode: models.MetricEditorModeBuilder,
+			Label:            "actual",
+		}
+		frames, err := buildDataFrames(startTime, endTime, *response, query)
+		require.NoError(t, err)
+
+		assert.Equal(t, "actual", frames[0].Name)
+	})
+
 	t.Run("Parse cloudwatch response", func(t *testing.T) {
 		timestamp := time.Unix(0, 0)
 		response := &models.QueryRowResponse{
diff --git a/pkg/tsdb/cloudwatch/routes/accounts.go b/pkg/tsdb/cloudwatch/routes/accounts.go
index 3c18591b55fbb..565a8c67ac431 100644
--- a/pkg/tsdb/cloudwatch/routes/accounts.go
+++ b/pkg/tsdb/cloudwatch/routes/accounts.go
@@ -24,7 +24,7 @@ func AccountsHandler(ctx context.Context, pluginCtx backend.PluginContext, reqCt
 		return nil, models.NewHttpError("error in AccountsHandler", http.StatusInternalServerError, err)
 	}
 
-	accounts, err := service.GetAccountsForCurrentUserOrRole()
+	accounts, err := service.GetAccountsForCurrentUserOrRole(ctx)
 	if err != nil {
 		msg := "error getting accounts for current user or role"
 		switch {
diff --git a/pkg/tsdb/cloudwatch/routes/dimension_keys_test.go b/pkg/tsdb/cloudwatch/routes/dimension_keys_test.go
index 42dd3b360ab83..d48887142ce6b 100644
--- a/pkg/tsdb/cloudwatch/routes/dimension_keys_test.go
+++ b/pkg/tsdb/cloudwatch/routes/dimension_keys_test.go
@@ -9,18 +9,18 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/grafana/pkg/infra/log/logtest"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/mocks"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/services"
 )
 
-var logger = &logtest.Fake{}
+var logger = log.NewNullLogger()
 
 func Test_DimensionKeys_Route(t *testing.T) {
 	t.Run("calls FilterDimensionKeysRequest when a StandardDimensionKeysRequest is passed", func(t *testing.T) {
diff --git a/pkg/tsdb/cloudwatch/routes/external_id.go b/pkg/tsdb/cloudwatch/routes/external_id.go
index 8be23aeccf8fd..159f8cd81fbea 100644
--- a/pkg/tsdb/cloudwatch/routes/external_id.go
+++ b/pkg/tsdb/cloudwatch/routes/external_id.go
@@ -5,9 +5,7 @@ import (
 	"encoding/json"
 	"net/http"
 	"net/url"
-	"os"
 
-	"github.com/grafana/grafana-aws-sdk/pkg/awsds"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 )
@@ -16,9 +14,14 @@ type ExternalIdResponse struct {
 	ExternalId string `json:"externalId"`
 }
 
-func ExternalIdHandler(ctx context.Context, pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, parameters url.Values) ([]byte, *models.HttpError) {
+func ExternalIdHandler(ctx context.Context, pluginCtx backend.PluginContext, reqCtxBeforeAuth models.RequestContextFactoryFunc, parameters url.Values) ([]byte, *models.HttpError) {
+	reqCtx, err := reqCtxBeforeAuth(ctx, pluginCtx, "")
+	if err != nil {
+		return nil, models.NewHttpError("error in ExternalIdHandler", http.StatusInternalServerError, err)
+	}
+
 	response := ExternalIdResponse{
-		ExternalId: os.Getenv(awsds.GrafanaAssumeRoleExternalIdKeyName),
+		ExternalId: reqCtx.Settings.GrafanaSettings.ExternalID,
 	}
 	jsonResponse, err := json.Marshal(response)
 	if err != nil {
diff --git a/pkg/tsdb/cloudwatch/routes/external_id_test.go b/pkg/tsdb/cloudwatch/routes/external_id_test.go
index b69df5f7177d4..116378e09c6cb 100644
--- a/pkg/tsdb/cloudwatch/routes/external_id_test.go
+++ b/pkg/tsdb/cloudwatch/routes/external_id_test.go
@@ -1,19 +1,30 @@
 package routes
 
 import (
+	"context"
 	"net/http"
 	"net/http/httptest"
 	"testing"
 
+	"github.com/grafana/grafana-aws-sdk/pkg/awsds"
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 	"github.com/stretchr/testify/assert"
 )
 
 func Test_external_id_route(t *testing.T) {
-	t.Run("successfully returns an external id from the env", func(t *testing.T) {
+	t.Run("successfully returns an external id from the instance", func(t *testing.T) {
 		t.Setenv("AWS_AUTH_EXTERNAL_ID", "mock-external-id")
 		rr := httptest.NewRecorder()
 
-		handler := http.HandlerFunc(ResourceRequestMiddleware(ExternalIdHandler, logger, nil))
+		factoryFunc := func(_ context.Context, _ backend.PluginContext, region string) (reqCtx models.RequestContext, err error) {
+			return models.RequestContext{
+				Settings: models.CloudWatchSettings{
+					GrafanaSettings: awsds.AuthSettings{ExternalID: "mock-external-id"},
+				},
+			}, nil
+		}
+		handler := http.HandlerFunc(ResourceRequestMiddleware(ExternalIdHandler, logger, factoryFunc))
 		req := httptest.NewRequest("GET", "/external-id", nil)
 
 		handler.ServeHTTP(rr, req)
@@ -25,7 +36,12 @@ func Test_external_id_route(t *testing.T) {
 	t.Run("returns an empty string if there is no external id", func(t *testing.T) {
 		rr := httptest.NewRecorder()
 
-		handler := http.HandlerFunc(ResourceRequestMiddleware(ExternalIdHandler, logger, nil))
+		factoryFunc := func(_ context.Context, _ backend.PluginContext, region string) (reqCtx models.RequestContext, err error) {
+			return models.RequestContext{
+				Settings: models.CloudWatchSettings{},
+			}, nil
+		}
+		handler := http.HandlerFunc(ResourceRequestMiddleware(ExternalIdHandler, logger, factoryFunc))
 		req := httptest.NewRequest("GET", "/external-id", nil)
 
 		handler.ServeHTTP(rr, req)
diff --git a/pkg/tsdb/cloudwatch/routes/log_group_fields.go b/pkg/tsdb/cloudwatch/routes/log_group_fields.go
index 72352a2064672..455c286036861 100644
--- a/pkg/tsdb/cloudwatch/routes/log_group_fields.go
+++ b/pkg/tsdb/cloudwatch/routes/log_group_fields.go
@@ -22,7 +22,7 @@ func LogGroupFieldsHandler(ctx context.Context, pluginCtx backend.PluginContext,
 		return nil, models.NewHttpError("newLogGroupsService error", http.StatusInternalServerError, err)
 	}
 
-	logGroupFields, err := service.GetLogGroupFields(request)
+	logGroupFields, err := service.GetLogGroupFieldsWithContext(ctx, request)
 	if err != nil {
 		return nil, models.NewHttpError("GetLogGroupFields error", http.StatusInternalServerError, err)
 	}
diff --git a/pkg/tsdb/cloudwatch/routes/log_group_fields_test.go b/pkg/tsdb/cloudwatch/routes/log_group_fields_test.go
index 25f69937b06cd..e1c1de40eb458 100644
--- a/pkg/tsdb/cloudwatch/routes/log_group_fields_test.go
+++ b/pkg/tsdb/cloudwatch/routes/log_group_fields_test.go
@@ -8,17 +8,17 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/mocks"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
 )
 
 func TestLogGroupFieldsRoute(t *testing.T) {
-	mockFeatures := mocks.MockFeatures{}
 	reqCtxFunc := func(_ context.Context, pluginCtx backend.PluginContext, region string) (reqCtx models.RequestContext, err error) {
-		return models.RequestContext{Features: &mockFeatures}, err
+		return models.RequestContext{}, err
 	}
 	t.Run("returns 400 if an invalid LogGroupFieldsRequest is used", func(t *testing.T) {
 		rr := httptest.NewRecorder()
@@ -31,7 +31,7 @@ func TestLogGroupFieldsRoute(t *testing.T) {
 
 	t.Run("returns 500 if GetLogGroupFields method fails", func(t *testing.T) {
 		mockLogsService := mocks.LogsService{}
-		mockLogsService.On("GetLogGroupFields", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroupField]{}, fmt.Errorf("error from api"))
+		mockLogsService.On("GetLogGroupFieldsWithContext", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroupField]{}, fmt.Errorf("error from api"))
 		newLogGroupsService = func(_ context.Context, pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.LogGroupsProvider, error) {
 			return &mockLogsService, nil
 		}
@@ -47,7 +47,7 @@ func TestLogGroupFieldsRoute(t *testing.T) {
 
 	t.Run("returns valid json response if everything is ok", func(t *testing.T) {
 		mockLogsService := mocks.LogsService{}
-		mockLogsService.On("GetLogGroupFields", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroupField]{
+		mockLogsService.On("GetLogGroupFieldsWithContext", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroupField]{
 			{
 				AccountId: new(string),
 				Value: resources.LogGroupField{
diff --git a/pkg/tsdb/cloudwatch/routes/log_groups.go b/pkg/tsdb/cloudwatch/routes/log_groups.go
index 42b2c2d817dd1..34c9f35ab018d 100644
--- a/pkg/tsdb/cloudwatch/routes/log_groups.go
+++ b/pkg/tsdb/cloudwatch/routes/log_groups.go
@@ -7,7 +7,7 @@ import (
 	"net/url"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/features"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/services"
@@ -24,7 +24,7 @@ func LogGroupsHandler(ctx context.Context, pluginCtx backend.PluginContext, reqC
 		return nil, models.NewHttpError("newLogGroupsService error", http.StatusInternalServerError, err)
 	}
 
-	logGroups, err := service.GetLogGroups(request)
+	logGroups, err := service.GetLogGroupsWithContext(ctx, request)
 	if err != nil {
 		return nil, models.NewHttpError("GetLogGroups error", http.StatusInternalServerError, err)
 	}
@@ -46,5 +46,5 @@ var newLogGroupsService = func(ctx context.Context, pluginCtx backend.PluginCont
 		return nil, err
 	}
 
-	return services.NewLogGroupsService(reqCtx.LogsAPIProvider, reqCtx.Features.IsEnabled(featuremgmt.FlagCloudWatchCrossAccountQuerying)), nil
+	return services.NewLogGroupsService(reqCtx.LogsAPIProvider, features.IsEnabled(ctx, features.FlagCloudWatchCrossAccountQuerying)), nil
 }
diff --git a/pkg/tsdb/cloudwatch/routes/log_groups_test.go b/pkg/tsdb/cloudwatch/routes/log_groups_test.go
index 5f478f6cc432e..b1f9e53037e6e 100644
--- a/pkg/tsdb/cloudwatch/routes/log_groups_test.go
+++ b/pkg/tsdb/cloudwatch/routes/log_groups_test.go
@@ -8,13 +8,13 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/mocks"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/utils"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
 )
 
 func TestLogGroupsRoute(t *testing.T) {
@@ -23,15 +23,13 @@ func TestLogGroupsRoute(t *testing.T) {
 		newLogGroupsService = origLogGroupsService
 	})
 
-	mockFeatures := mocks.MockFeatures{}
-	mockFeatures.On("IsEnabled", featuremgmt.FlagCloudWatchCrossAccountQuerying).Return(false)
 	reqCtxFunc := func(_ context.Context, pluginCtx backend.PluginContext, region string) (reqCtx models.RequestContext, err error) {
-		return models.RequestContext{Features: &mockFeatures}, err
+		return models.RequestContext{}, err
 	}
 
 	t.Run("successfully returns 1 log group with account id", func(t *testing.T) {
 		mockLogsService := mocks.LogsService{}
-		mockLogsService.On("GetLogGroups", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroup]{{
+		mockLogsService.On("GetLogGroupsWithContext", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroup]{{
 			Value: resources.LogGroup{
 				Arn:  "some arn",
 				Name: "some name",
@@ -53,7 +51,7 @@ func TestLogGroupsRoute(t *testing.T) {
 
 	t.Run("successfully returns multiple log groups with account id", func(t *testing.T) {
 		mockLogsService := mocks.LogsService{}
-		mockLogsService.On("GetLogGroups", mock.Anything).Return(
+		mockLogsService.On("GetLogGroupsWithContext", mock.Anything).Return(
 			[]resources.ResourceResponse[resources.LogGroup]{
 				{
 					Value: resources.LogGroup{
@@ -99,7 +97,7 @@ func TestLogGroupsRoute(t *testing.T) {
 
 	t.Run("returns error when both logGroupPrefix and logGroup Pattern are provided", func(t *testing.T) {
 		mockLogsService := mocks.LogsService{}
-		mockLogsService.On("GetLogGroups", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroup]{}, nil)
+		mockLogsService.On("GetLogGroupsWithContext", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroup]{}, nil)
 		newLogGroupsService = func(_ context.Context, pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.LogGroupsProvider, error) {
 			return &mockLogsService, nil
 		}
@@ -115,7 +113,7 @@ func TestLogGroupsRoute(t *testing.T) {
 
 	t.Run("passes default log group limit and nil for logGroupNamePrefix, accountId, and logGroupPattern", func(t *testing.T) {
 		mockLogsService := mocks.LogsService{}
-		mockLogsService.On("GetLogGroups", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroup]{}, nil)
+		mockLogsService.On("GetLogGroupsWithContext", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroup]{}, nil)
 		newLogGroupsService = func(_ context.Context, pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.LogGroupsProvider, error) {
 			return &mockLogsService, nil
 		}
@@ -125,7 +123,7 @@ func TestLogGroupsRoute(t *testing.T) {
 		handler := http.HandlerFunc(ResourceRequestMiddleware(LogGroupsHandler, logger, reqCtxFunc))
 		handler.ServeHTTP(rr, req)
 
-		mockLogsService.AssertCalled(t, "GetLogGroups", resources.LogGroupsRequest{
+		mockLogsService.AssertCalled(t, "GetLogGroupsWithContext", resources.LogGroupsRequest{
 			Limit:               50,
 			ResourceRequest:     resources.ResourceRequest{},
 			LogGroupNamePrefix:  nil,
@@ -135,7 +133,7 @@ func TestLogGroupsRoute(t *testing.T) {
 
 	t.Run("passes default log group limit and nil for logGroupNamePrefix when both are absent", func(t *testing.T) {
 		mockLogsService := mocks.LogsService{}
-		mockLogsService.On("GetLogGroups", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroup]{}, nil)
+		mockLogsService.On("GetLogGroupsWithContext", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroup]{}, nil)
 		newLogGroupsService = func(_ context.Context, pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.LogGroupsProvider, error) {
 			return &mockLogsService, nil
 		}
@@ -145,7 +143,7 @@ func TestLogGroupsRoute(t *testing.T) {
 		handler := http.HandlerFunc(ResourceRequestMiddleware(LogGroupsHandler, logger, reqCtxFunc))
 		handler.ServeHTTP(rr, req)
 
-		mockLogsService.AssertCalled(t, "GetLogGroups", resources.LogGroupsRequest{
+		mockLogsService.AssertCalled(t, "GetLogGroupsWithContext", resources.LogGroupsRequest{
 			Limit:              50,
 			LogGroupNamePrefix: nil,
 		})
@@ -153,7 +151,7 @@ func TestLogGroupsRoute(t *testing.T) {
 
 	t.Run("passes log group limit from query parameter", func(t *testing.T) {
 		mockLogsService := mocks.LogsService{}
-		mockLogsService.On("GetLogGroups", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroup]{}, nil)
+		mockLogsService.On("GetLogGroupsWithContext", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroup]{}, nil)
 		newLogGroupsService = func(_ context.Context, pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.LogGroupsProvider, error) {
 			return &mockLogsService, nil
 		}
@@ -163,14 +161,14 @@ func TestLogGroupsRoute(t *testing.T) {
 		handler := http.HandlerFunc(ResourceRequestMiddleware(LogGroupsHandler, logger, reqCtxFunc))
 		handler.ServeHTTP(rr, req)
 
-		mockLogsService.AssertCalled(t, "GetLogGroups", resources.LogGroupsRequest{
+		mockLogsService.AssertCalled(t, "GetLogGroupsWithContext", resources.LogGroupsRequest{
 			Limit: 2,
 		})
 	})
 
 	t.Run("passes logGroupPrefix from query parameter", func(t *testing.T) {
 		mockLogsService := mocks.LogsService{}
-		mockLogsService.On("GetLogGroups", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroup]{}, nil)
+		mockLogsService.On("GetLogGroupsWithContext", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroup]{}, nil)
 		newLogGroupsService = func(_ context.Context, pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.LogGroupsProvider, error) {
 			return &mockLogsService, nil
 		}
@@ -180,7 +178,7 @@ func TestLogGroupsRoute(t *testing.T) {
 		handler := http.HandlerFunc(ResourceRequestMiddleware(LogGroupsHandler, logger, reqCtxFunc))
 		handler.ServeHTTP(rr, req)
 
-		mockLogsService.AssertCalled(t, "GetLogGroups", resources.LogGroupsRequest{
+		mockLogsService.AssertCalled(t, "GetLogGroupsWithContext", resources.LogGroupsRequest{
 			Limit:              50,
 			LogGroupNamePrefix: utils.Pointer("some-prefix"),
 		})
@@ -188,7 +186,7 @@ func TestLogGroupsRoute(t *testing.T) {
 
 	t.Run("passes logGroupPattern from query parameter", func(t *testing.T) {
 		mockLogsService := mocks.LogsService{}
-		mockLogsService.On("GetLogGroups", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroup]{}, nil)
+		mockLogsService.On("GetLogGroupsWithContext", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroup]{}, nil)
 		newLogGroupsService = func(_ context.Context, pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.LogGroupsProvider, error) {
 			return &mockLogsService, nil
 		}
@@ -198,7 +196,7 @@ func TestLogGroupsRoute(t *testing.T) {
 		handler := http.HandlerFunc(ResourceRequestMiddleware(LogGroupsHandler, logger, reqCtxFunc))
 		handler.ServeHTTP(rr, req)
 
-		mockLogsService.AssertCalled(t, "GetLogGroups", resources.LogGroupsRequest{
+		mockLogsService.AssertCalled(t, "GetLogGroupsWithContext", resources.LogGroupsRequest{
 			Limit:               50,
 			LogGroupNamePattern: utils.Pointer("some-pattern"),
 		})
@@ -206,7 +204,7 @@ func TestLogGroupsRoute(t *testing.T) {
 
 	t.Run("passes logGroupPattern from query parameter", func(t *testing.T) {
 		mockLogsService := mocks.LogsService{}
-		mockLogsService.On("GetLogGroups", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroup]{}, nil)
+		mockLogsService.On("GetLogGroupsWithContext", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroup]{}, nil)
 		newLogGroupsService = func(_ context.Context, pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.LogGroupsProvider, error) {
 			return &mockLogsService, nil
 		}
@@ -216,7 +214,7 @@ func TestLogGroupsRoute(t *testing.T) {
 		handler := http.HandlerFunc(ResourceRequestMiddleware(LogGroupsHandler, logger, reqCtxFunc))
 		handler.ServeHTTP(rr, req)
 
-		mockLogsService.AssertCalled(t, "GetLogGroups", resources.LogGroupsRequest{
+		mockLogsService.AssertCalled(t, "GetLogGroupsWithContext", resources.LogGroupsRequest{
 			Limit:           50,
 			ResourceRequest: resources.ResourceRequest{AccountId: utils.Pointer("some-account-id")},
 		})
@@ -224,7 +222,7 @@ func TestLogGroupsRoute(t *testing.T) {
 
 	t.Run("returns error if service returns error", func(t *testing.T) {
 		mockLogsService := mocks.LogsService{}
-		mockLogsService.On("GetLogGroups", mock.Anything).
+		mockLogsService.On("GetLogGroupsWithContext", mock.Anything).
 			Return([]resources.ResourceResponse[resources.LogGroup]{}, fmt.Errorf("some error"))
 		newLogGroupsService = func(_ context.Context, pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.LogGroupsProvider, error) {
 			return &mockLogsService, nil
diff --git a/pkg/tsdb/cloudwatch/routes/middleware.go b/pkg/tsdb/cloudwatch/routes/middleware.go
index 3ab5ca0816049..cf75a9cc3f35d 100644
--- a/pkg/tsdb/cloudwatch/routes/middleware.go
+++ b/pkg/tsdb/cloudwatch/routes/middleware.go
@@ -3,9 +3,9 @@ package routes
 import (
 	"net/http"
 
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/resource/httpadapter"
 
-	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 )
 
@@ -20,7 +20,7 @@ func ResourceRequestMiddleware(handleFunc models.RouteHandlerFunc, logger log.Lo
 		pluginContext := httpadapter.PluginConfigFromContext(ctx)
 		json, httpError := handleFunc(ctx, pluginContext, reqCtxFactory, req.URL.Query())
 		if httpError != nil {
-			logger.Error("Error handling resource request", "error", httpError.Message)
+			logger.FromContext(ctx).Error("Error handling resource request", "error", httpError.Message)
 			respondWithError(rw, httpError)
 			return
 		}
@@ -28,7 +28,7 @@ func ResourceRequestMiddleware(handleFunc models.RouteHandlerFunc, logger log.Lo
 		rw.Header().Set("Content-Type", "application/json")
 		_, err := rw.Write(json)
 		if err != nil {
-			logger.Error("Error handling resource request", "error", err)
+			logger.FromContext(ctx).Error("Error handling resource request", "error", err)
 			respondWithError(rw, models.NewHttpError("error writing response in resource request middleware", http.StatusInternalServerError, err))
 		}
 	}
diff --git a/pkg/tsdb/cloudwatch/services/accounts.go b/pkg/tsdb/cloudwatch/services/accounts.go
index 7f30f03805090..f05b18335a302 100644
--- a/pkg/tsdb/cloudwatch/services/accounts.go
+++ b/pkg/tsdb/cloudwatch/services/accounts.go
@@ -1,6 +1,7 @@
 package services
 
 import (
+	"context"
 	"errors"
 	"fmt"
 
@@ -20,11 +21,11 @@ func NewAccountsService(oamClient models.OAMAPIProvider) models.AccountsProvider
 	return &AccountsService{oamClient}
 }
 
-func (a *AccountsService) GetAccountsForCurrentUserOrRole() ([]resources.ResourceResponse[resources.Account], error) {
+func (a *AccountsService) GetAccountsForCurrentUserOrRole(ctx context.Context) ([]resources.ResourceResponse[resources.Account], error) {
 	var nextToken *string
 	sinks := []*oam.ListSinksItem{}
 	for {
-		response, err := a.ListSinks(&oam.ListSinksInput{NextToken: nextToken})
+		response, err := a.ListSinksWithContext(ctx, &oam.ListSinksInput{NextToken: nextToken})
 		if err != nil {
 			var aerr awserr.Error
 			if errors.As(err, &aerr) {
@@ -61,7 +62,7 @@ func (a *AccountsService) GetAccountsForCurrentUserOrRole() ([]resources.Resourc
 
 	nextToken = nil
 	for {
-		links, err := a.ListAttachedLinks(&oam.ListAttachedLinksInput{
+		links, err := a.ListAttachedLinksWithContext(ctx, &oam.ListAttachedLinksInput{
 			SinkIdentifier: sinkIdentifier,
 			NextToken:      nextToken,
 		})
diff --git a/pkg/tsdb/cloudwatch/services/accounts_test.go b/pkg/tsdb/cloudwatch/services/accounts_test.go
index 7e74e6fbec943..dbbadaf660c6b 100644
--- a/pkg/tsdb/cloudwatch/services/accounts_test.go
+++ b/pkg/tsdb/cloudwatch/services/accounts_test.go
@@ -1,6 +1,7 @@
 package services
 
 import (
+	"context"
 	"fmt"
 	"testing"
 
@@ -17,11 +18,11 @@ import (
 func TestHandleGetAccounts(t *testing.T) {
 	t.Run("Should return an error in case of insufficient permissions from ListSinks", func(t *testing.T) {
 		fakeOAMClient := &mocks.FakeOAMClient{}
-		fakeOAMClient.On("ListSinks", mock.Anything).Return(&oam.ListSinksOutput{}, awserr.New("AccessDeniedException",
+		fakeOAMClient.On("ListSinksWithContext", mock.Anything).Return(&oam.ListSinksOutput{}, awserr.New("AccessDeniedException",
 			"AWS message", nil))
 		accounts := NewAccountsService(fakeOAMClient)
 
-		resp, err := accounts.GetAccountsForCurrentUserOrRole()
+		resp, err := accounts.GetAccountsForCurrentUserOrRole(context.Background())
 
 		assert.Error(t, err)
 		assert.Nil(t, resp)
@@ -31,10 +32,10 @@ func TestHandleGetAccounts(t *testing.T) {
 
 	t.Run("Should return an error in case of any error from ListSinks", func(t *testing.T) {
 		fakeOAMClient := &mocks.FakeOAMClient{}
-		fakeOAMClient.On("ListSinks", mock.Anything).Return(&oam.ListSinksOutput{}, fmt.Errorf("some error"))
+		fakeOAMClient.On("ListSinksWithContext", mock.Anything).Return(&oam.ListSinksOutput{}, fmt.Errorf("some error"))
 		accounts := NewAccountsService(fakeOAMClient)
 
-		resp, err := accounts.GetAccountsForCurrentUserOrRole()
+		resp, err := accounts.GetAccountsForCurrentUserOrRole(context.Background())
 
 		assert.Error(t, err)
 		assert.Nil(t, resp)
@@ -43,10 +44,10 @@ func TestHandleGetAccounts(t *testing.T) {
 
 	t.Run("Should return empty array in case no monitoring account exists", func(t *testing.T) {
 		fakeOAMClient := &mocks.FakeOAMClient{}
-		fakeOAMClient.On("ListSinks", mock.Anything).Return(&oam.ListSinksOutput{}, nil)
+		fakeOAMClient.On("ListSinksWithContext", mock.Anything).Return(&oam.ListSinksOutput{}, nil)
 		accounts := NewAccountsService(fakeOAMClient)
 
-		resp, err := accounts.GetAccountsForCurrentUserOrRole()
+		resp, err := accounts.GetAccountsForCurrentUserOrRole(context.Background())
 
 		assert.NoError(t, err)
 		assert.Empty(t, resp)
@@ -54,26 +55,26 @@ func TestHandleGetAccounts(t *testing.T) {
 
 	t.Run("Should return one monitoring account (the first) even though ListSinks returns multiple sinks", func(t *testing.T) {
 		fakeOAMClient := &mocks.FakeOAMClient{}
-		fakeOAMClient.On("ListSinks", mock.Anything).Return(&oam.ListSinksOutput{
+		fakeOAMClient.On("ListSinksWithContext", mock.Anything).Return(&oam.ListSinksOutput{
 			Items: []*oam.ListSinksItem{
 				{Name: aws.String("Account 1"), Arn: aws.String("arn:aws:logs:us-east-1:123456789012:log-group:my-log-group1")},
 				{Name: aws.String("Account 2"), Arn: aws.String("arn:aws:logs:us-east-1:123456789012:log-group:my-log-group2")},
 			},
 			NextToken: new(string),
 		}, nil).Once()
-		fakeOAMClient.On("ListSinks", mock.Anything).Return(&oam.ListSinksOutput{
+		fakeOAMClient.On("ListSinksWithContext", mock.Anything).Return(&oam.ListSinksOutput{
 			Items: []*oam.ListSinksItem{
 				{Name: aws.String("Account 3"), Arn: aws.String("arn:aws:logs:us-east-1:123456789012:log-group:my-log-group3")},
 			},
 			NextToken: nil,
 		}, nil)
-		fakeOAMClient.On("ListAttachedLinks", mock.Anything).Return(&oam.ListAttachedLinksOutput{}, nil)
+		fakeOAMClient.On("ListAttachedLinksWithContext", mock.Anything).Return(&oam.ListAttachedLinksOutput{}, nil)
 		accounts := NewAccountsService(fakeOAMClient)
 
-		resp, err := accounts.GetAccountsForCurrentUserOrRole()
+		resp, err := accounts.GetAccountsForCurrentUserOrRole(context.Background())
 
 		assert.NoError(t, err)
-		fakeOAMClient.AssertNumberOfCalls(t, "ListSinks", 2)
+		fakeOAMClient.AssertNumberOfCalls(t, "ListSinksWithContext", 2)
 		require.Len(t, resp, 1)
 		assert.True(t, resp[0].Value.IsMonitoringAccount)
 		assert.Equal(t, "Account 1", resp[0].Value.Label)
@@ -82,27 +83,27 @@ func TestHandleGetAccounts(t *testing.T) {
 
 	t.Run("Should merge the first sink with attached links", func(t *testing.T) {
 		fakeOAMClient := &mocks.FakeOAMClient{}
-		fakeOAMClient.On("ListSinks", mock.Anything).Return(&oam.ListSinksOutput{
+		fakeOAMClient.On("ListSinksWithContext", mock.Anything).Return(&oam.ListSinksOutput{
 			Items: []*oam.ListSinksItem{
 				{Name: aws.String("Account 1"), Arn: aws.String("arn:aws:logs:us-east-1:123456789012:log-group:my-log-group1")},
 				{Name: aws.String("Account 2"), Arn: aws.String("arn:aws:logs:us-east-1:123456789012:log-group:my-log-group2")},
 			},
 			NextToken: new(string),
 		}, nil).Once()
-		fakeOAMClient.On("ListSinks", mock.Anything).Return(&oam.ListSinksOutput{
+		fakeOAMClient.On("ListSinksWithContext", mock.Anything).Return(&oam.ListSinksOutput{
 			Items: []*oam.ListSinksItem{
 				{Name: aws.String("Account 3"), Arn: aws.String("arn:aws:logs:us-east-1:123456789012:log-group:my-log-group3")},
 			},
 			NextToken: nil,
 		}, nil)
-		fakeOAMClient.On("ListAttachedLinks", mock.Anything).Return(&oam.ListAttachedLinksOutput{
+		fakeOAMClient.On("ListAttachedLinksWithContext", mock.Anything).Return(&oam.ListAttachedLinksOutput{
 			Items: []*oam.ListAttachedLinksItem{
 				{Label: aws.String("Account 10"), LinkArn: aws.String("arn:aws:logs:us-east-1:123456789013:log-group:my-log-group10")},
 				{Label: aws.String("Account 11"), LinkArn: aws.String("arn:aws:logs:us-east-1:123456789014:log-group:my-log-group11")},
 			},
 			NextToken: new(string),
 		}, nil).Once()
-		fakeOAMClient.On("ListAttachedLinks", mock.Anything).Return(&oam.ListAttachedLinksOutput{
+		fakeOAMClient.On("ListAttachedLinksWithContext", mock.Anything).Return(&oam.ListAttachedLinksOutput{
 			Items: []*oam.ListAttachedLinksItem{
 				{Label: aws.String("Account 12"), LinkArn: aws.String("arn:aws:logs:us-east-1:123456789012:log-group:my-log-group12")},
 			},
@@ -110,11 +111,11 @@ func TestHandleGetAccounts(t *testing.T) {
 		}, nil)
 		accounts := NewAccountsService(fakeOAMClient)
 
-		resp, err := accounts.GetAccountsForCurrentUserOrRole()
+		resp, err := accounts.GetAccountsForCurrentUserOrRole(context.Background())
 
 		assert.NoError(t, err)
-		fakeOAMClient.AssertNumberOfCalls(t, "ListSinks", 2)
-		fakeOAMClient.AssertNumberOfCalls(t, "ListAttachedLinks", 2)
+		fakeOAMClient.AssertNumberOfCalls(t, "ListSinksWithContext", 2)
+		fakeOAMClient.AssertNumberOfCalls(t, "ListAttachedLinksWithContext", 2)
 		expectedAccounts := []resources.ResourceResponse[resources.Account]{
 			{Value: resources.Account{Id: "123456789012", Label: "Account 1", Arn: "arn:aws:logs:us-east-1:123456789012:log-group:my-log-group1", IsMonitoringAccount: true}},
 			{Value: resources.Account{Id: "123456789013", Label: "Account 10", Arn: "arn:aws:logs:us-east-1:123456789013:log-group:my-log-group10", IsMonitoringAccount: false}},
@@ -126,37 +127,37 @@ func TestHandleGetAccounts(t *testing.T) {
 
 	t.Run("Should call ListAttachedLinks with arn of first sink", func(t *testing.T) {
 		fakeOAMClient := &mocks.FakeOAMClient{}
-		fakeOAMClient.On("ListSinks", mock.Anything).Return(&oam.ListSinksOutput{
+		fakeOAMClient.On("ListSinksWithContext", mock.Anything).Return(&oam.ListSinksOutput{
 			Items: []*oam.ListSinksItem{
 				{Name: aws.String("Account 1"), Arn: aws.String("arn:aws:logs:us-east-1:123456789012:log-group:my-log-group1")},
 			},
 			NextToken: new(string),
 		}, nil).Once()
-		fakeOAMClient.On("ListSinks", mock.Anything).Return(&oam.ListSinksOutput{
+		fakeOAMClient.On("ListSinksWithContext", mock.Anything).Return(&oam.ListSinksOutput{
 			Items: []*oam.ListSinksItem{
 				{Name: aws.String("Account 3"), Arn: aws.String("arn:aws:logs:us-east-1:123456789012:log-group:my-log-group3")},
 			},
 			NextToken: nil,
 		}, nil).Once()
-		fakeOAMClient.On("ListAttachedLinks", mock.Anything).Return(&oam.ListAttachedLinksOutput{}, nil)
+		fakeOAMClient.On("ListAttachedLinksWithContext", mock.Anything).Return(&oam.ListAttachedLinksOutput{}, nil)
 		accounts := NewAccountsService(fakeOAMClient)
 
-		_, _ = accounts.GetAccountsForCurrentUserOrRole()
+		_, _ = accounts.GetAccountsForCurrentUserOrRole(context.Background())
 
-		fakeOAMClient.AssertCalled(t, "ListAttachedLinks", &oam.ListAttachedLinksInput{
+		fakeOAMClient.AssertCalled(t, "ListAttachedLinksWithContext", &oam.ListAttachedLinksInput{
 			SinkIdentifier: aws.String("arn:aws:logs:us-east-1:123456789012:log-group:my-log-group1"),
 		})
 	})
 
 	t.Run("Should return an error in case of any error from ListAttachedLinks", func(t *testing.T) {
 		fakeOAMClient := &mocks.FakeOAMClient{}
-		fakeOAMClient.On("ListSinks", mock.Anything).Return(&oam.ListSinksOutput{
+		fakeOAMClient.On("ListSinksWithContext", mock.Anything).Return(&oam.ListSinksOutput{
 			Items: []*oam.ListSinksItem{{Name: aws.String("Account 1"), Arn: aws.String("arn:aws:logs:us-east-1:123456789012:log-group:my-log-group1")}},
 		}, nil)
-		fakeOAMClient.On("ListAttachedLinks", mock.Anything).Return(&oam.ListAttachedLinksOutput{}, fmt.Errorf("some error")).Once()
+		fakeOAMClient.On("ListAttachedLinksWithContext", mock.Anything).Return(&oam.ListAttachedLinksOutput{}, fmt.Errorf("some error")).Once()
 		accounts := NewAccountsService(fakeOAMClient)
 
-		resp, err := accounts.GetAccountsForCurrentUserOrRole()
+		resp, err := accounts.GetAccountsForCurrentUserOrRole(context.Background())
 
 		assert.Error(t, err)
 		assert.Nil(t, resp)
diff --git a/pkg/tsdb/cloudwatch/services/log_groups.go b/pkg/tsdb/cloudwatch/services/log_groups.go
index 54d2e5ada5d8a..1bbc99a67bd02 100644
--- a/pkg/tsdb/cloudwatch/services/log_groups.go
+++ b/pkg/tsdb/cloudwatch/services/log_groups.go
@@ -1,7 +1,10 @@
 package services
 
 import (
+	"context"
+
 	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
@@ -17,7 +20,7 @@ func NewLogGroupsService(logsClient models.CloudWatchLogsAPIProvider, isCrossAcc
 	return &LogGroupsService{logGroupsAPI: logsClient, isCrossAccountEnabled: isCrossAccountEnabled}
 }
 
-func (s *LogGroupsService) GetLogGroups(req resources.LogGroupsRequest) ([]resources.ResourceResponse[resources.LogGroup], error) {
+func (s *LogGroupsService) GetLogGroupsWithContext(ctx context.Context, req resources.LogGroupsRequest) ([]resources.ResourceResponse[resources.LogGroup], error) {
 	input := &cloudwatchlogs.DescribeLogGroupsInput{
 		Limit:              aws.Int64(req.Limit),
 		LogGroupNamePrefix: req.LogGroupNamePrefix,
@@ -36,7 +39,7 @@ func (s *LogGroupsService) GetLogGroups(req resources.LogGroupsRequest) ([]resou
 	result := []resources.ResourceResponse[resources.LogGroup]{}
 
 	for {
-		response, err := s.logGroupsAPI.DescribeLogGroups(input)
+		response, err := s.logGroupsAPI.DescribeLogGroupsWithContext(ctx, input)
 		if err != nil || response == nil {
 			return nil, err
 		}
@@ -60,7 +63,7 @@ func (s *LogGroupsService) GetLogGroups(req resources.LogGroupsRequest) ([]resou
 	return result, nil
 }
 
-func (s *LogGroupsService) GetLogGroupFields(request resources.LogGroupFieldsRequest) ([]resources.ResourceResponse[resources.LogGroupField], error) {
+func (s *LogGroupsService) GetLogGroupFieldsWithContext(ctx context.Context, request resources.LogGroupFieldsRequest, option ...request.Option) ([]resources.ResourceResponse[resources.LogGroupField], error) {
 	input := &cloudwatchlogs.GetLogGroupFieldsInput{
 		LogGroupName: aws.String(request.LogGroupName),
 	}
@@ -70,7 +73,7 @@ func (s *LogGroupsService) GetLogGroupFields(request resources.LogGroupFieldsReq
 	// 	input.LogGroupName = nil
 	// }
 
-	getLogGroupFieldsOutput, err := s.logGroupsAPI.GetLogGroupFields(input)
+	getLogGroupFieldsOutput, err := s.logGroupsAPI.GetLogGroupFieldsWithContext(ctx, input)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/tsdb/cloudwatch/services/log_groups_test.go b/pkg/tsdb/cloudwatch/services/log_groups_test.go
index 80dcaa32e6c2f..6b9a09170c3a1 100644
--- a/pkg/tsdb/cloudwatch/services/log_groups_test.go
+++ b/pkg/tsdb/cloudwatch/services/log_groups_test.go
@@ -1,6 +1,7 @@
 package services
 
 import (
+	"context"
 	"fmt"
 	"testing"
 
@@ -16,7 +17,7 @@ import (
 func TestGetLogGroups(t *testing.T) {
 	t.Run("Should map log groups response", func(t *testing.T) {
 		mockLogsAPI := &mocks.LogsAPI{}
-		mockLogsAPI.On("DescribeLogGroups", mock.Anything).Return(
+		mockLogsAPI.On("DescribeLogGroupsWithContext", mock.Anything).Return(
 			&cloudwatchlogs.DescribeLogGroupsOutput{
 				LogGroups: []*cloudwatchlogs.LogGroup{
 					{Arn: utils.Pointer("arn:aws:logs:us-east-1:111:log-group:group_a"), LogGroupName: utils.Pointer("group_a")},
@@ -26,7 +27,7 @@ func TestGetLogGroups(t *testing.T) {
 			}, nil)
 		service := NewLogGroupsService(mockLogsAPI, false)
 
-		resp, err := service.GetLogGroups(resources.LogGroupsRequest{})
+		resp, err := service.GetLogGroupsWithContext(context.Background(), resources.LogGroupsRequest{})
 
 		assert.NoError(t, err)
 		assert.Equal(t, []resources.ResourceResponse[resources.LogGroup]{
@@ -47,10 +48,10 @@ func TestGetLogGroups(t *testing.T) {
 
 	t.Run("Should return an empty error if api doesn't return any data", func(t *testing.T) {
 		mockLogsAPI := &mocks.LogsAPI{}
-		mockLogsAPI.On("DescribeLogGroups", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
+		mockLogsAPI.On("DescribeLogGroupsWithContext", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
 		service := NewLogGroupsService(mockLogsAPI, false)
 
-		resp, err := service.GetLogGroups(resources.LogGroupsRequest{})
+		resp, err := service.GetLogGroupsWithContext(context.Background(), resources.LogGroupsRequest{})
 
 		assert.NoError(t, err)
 		assert.Equal(t, []resources.ResourceResponse[resources.LogGroup]{}, resp)
@@ -59,16 +60,16 @@ func TestGetLogGroups(t *testing.T) {
 	t.Run("Should only use LogGroupNamePrefix even if LogGroupNamePattern passed in resource call", func(t *testing.T) {
 		// TODO: use LogGroupNamePattern when we have accounted for its behavior, still a little unexpected at the moment
 		mockLogsAPI := &mocks.LogsAPI{}
-		mockLogsAPI.On("DescribeLogGroups", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
+		mockLogsAPI.On("DescribeLogGroupsWithContext", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
 		service := NewLogGroupsService(mockLogsAPI, false)
 
-		_, err := service.GetLogGroups(resources.LogGroupsRequest{
+		_, err := service.GetLogGroupsWithContext(context.Background(), resources.LogGroupsRequest{
 			Limit:              0,
 			LogGroupNamePrefix: utils.Pointer("test"),
 		})
 
 		assert.NoError(t, err)
-		mockLogsAPI.AssertCalled(t, "DescribeLogGroups", &cloudwatchlogs.DescribeLogGroupsInput{
+		mockLogsAPI.AssertCalled(t, "DescribeLogGroupsWithContext", &cloudwatchlogs.DescribeLogGroupsInput{
 			Limit:              utils.Pointer(int64(0)),
 			LogGroupNamePrefix: utils.Pointer("test"),
 		})
@@ -76,24 +77,24 @@ func TestGetLogGroups(t *testing.T) {
 
 	t.Run("Should call api without LogGroupNamePrefix nor LogGroupNamePattern if not passed in resource call", func(t *testing.T) {
 		mockLogsAPI := &mocks.LogsAPI{}
-		mockLogsAPI.On("DescribeLogGroups", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
+		mockLogsAPI.On("DescribeLogGroupsWithContext", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
 		service := NewLogGroupsService(mockLogsAPI, false)
 
-		_, err := service.GetLogGroups(resources.LogGroupsRequest{})
+		_, err := service.GetLogGroupsWithContext(context.Background(), resources.LogGroupsRequest{})
 
 		assert.NoError(t, err)
-		mockLogsAPI.AssertCalled(t, "DescribeLogGroups", &cloudwatchlogs.DescribeLogGroupsInput{
+		mockLogsAPI.AssertCalled(t, "DescribeLogGroupsWithContext", &cloudwatchlogs.DescribeLogGroupsInput{
 			Limit: utils.Pointer(int64(0)),
 		})
 	})
 
 	t.Run("Should return an error when API returns error", func(t *testing.T) {
 		mockLogsAPI := &mocks.LogsAPI{}
-		mockLogsAPI.On("DescribeLogGroups", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{},
+		mockLogsAPI.On("DescribeLogGroupsWithContext", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{},
 			fmt.Errorf("some error"))
 		service := NewLogGroupsService(mockLogsAPI, false)
 
-		_, err := service.GetLogGroups(resources.LogGroupsRequest{})
+		_, err := service.GetLogGroupsWithContext(context.Background(), resources.LogGroupsRequest{})
 
 		assert.Error(t, err)
 		assert.Equal(t, "some error", err.Error())
@@ -107,7 +108,7 @@ func TestGetLogGroups(t *testing.T) {
 			ListAllLogGroups:   false,
 		}
 
-		mockLogsAPI.On("DescribeLogGroups", &cloudwatchlogs.DescribeLogGroupsInput{
+		mockLogsAPI.On("DescribeLogGroupsWithContext", &cloudwatchlogs.DescribeLogGroupsInput{
 			Limit:              aws.Int64(req.Limit),
 			LogGroupNamePrefix: req.LogGroupNamePrefix,
 		}).Return(&cloudwatchlogs.DescribeLogGroupsOutput{
@@ -118,10 +119,10 @@ func TestGetLogGroups(t *testing.T) {
 		}, nil)
 
 		service := NewLogGroupsService(mockLogsAPI, false)
-		resp, err := service.GetLogGroups(req)
+		resp, err := service.GetLogGroupsWithContext(context.Background(), req)
 
 		assert.NoError(t, err)
-		mockLogsAPI.AssertNumberOfCalls(t, "DescribeLogGroups", 1)
+		mockLogsAPI.AssertNumberOfCalls(t, "DescribeLogGroupsWithContext", 1)
 		assert.Equal(t, []resources.ResourceResponse[resources.LogGroup]{
 			{
 				AccountId: utils.Pointer("111"),
@@ -139,7 +140,7 @@ func TestGetLogGroups(t *testing.T) {
 		}
 
 		// first call
-		mockLogsAPI.On("DescribeLogGroups", &cloudwatchlogs.DescribeLogGroupsInput{
+		mockLogsAPI.On("DescribeLogGroupsWithContext", &cloudwatchlogs.DescribeLogGroupsInput{
 			Limit:              aws.Int64(req.Limit),
 			LogGroupNamePrefix: req.LogGroupNamePrefix,
 		}).Return(&cloudwatchlogs.DescribeLogGroupsOutput{
@@ -150,7 +151,7 @@ func TestGetLogGroups(t *testing.T) {
 		}, nil)
 
 		// second call
-		mockLogsAPI.On("DescribeLogGroups", &cloudwatchlogs.DescribeLogGroupsInput{
+		mockLogsAPI.On("DescribeLogGroupsWithContext", &cloudwatchlogs.DescribeLogGroupsInput{
 			Limit:              aws.Int64(req.Limit),
 			LogGroupNamePrefix: req.LogGroupNamePrefix,
 			NextToken:          utils.Pointer("token"),
@@ -160,9 +161,9 @@ func TestGetLogGroups(t *testing.T) {
 			},
 		}, nil)
 		service := NewLogGroupsService(mockLogsAPI, false)
-		resp, err := service.GetLogGroups(req)
+		resp, err := service.GetLogGroupsWithContext(context.Background(), req)
 		assert.NoError(t, err)
-		mockLogsAPI.AssertNumberOfCalls(t, "DescribeLogGroups", 2)
+		mockLogsAPI.AssertNumberOfCalls(t, "DescribeLogGroupsWithContext", 2)
 		assert.Equal(t, []resources.ResourceResponse[resources.LogGroup]{
 			{
 				AccountId: utils.Pointer("111"),
@@ -179,16 +180,16 @@ func TestGetLogGroups(t *testing.T) {
 func TestGetLogGroupsCrossAccountQuerying(t *testing.T) {
 	t.Run("Should not includeLinkedAccounts or accountId if isCrossAccountEnabled is set to false", func(t *testing.T) {
 		mockLogsAPI := &mocks.LogsAPI{}
-		mockLogsAPI.On("DescribeLogGroups", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
+		mockLogsAPI.On("DescribeLogGroupsWithContext", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
 		service := NewLogGroupsService(mockLogsAPI, false)
 
-		_, err := service.GetLogGroups(resources.LogGroupsRequest{
+		_, err := service.GetLogGroupsWithContext(context.Background(), resources.LogGroupsRequest{
 			ResourceRequest:    resources.ResourceRequest{AccountId: utils.Pointer("accountId")},
 			LogGroupNamePrefix: utils.Pointer("prefix"),
 		})
 
 		assert.NoError(t, err)
-		mockLogsAPI.AssertCalled(t, "DescribeLogGroups", &cloudwatchlogs.DescribeLogGroupsInput{
+		mockLogsAPI.AssertCalled(t, "DescribeLogGroupsWithContext", &cloudwatchlogs.DescribeLogGroupsInput{
 			Limit:              utils.Pointer(int64(0)),
 			LogGroupNamePrefix: utils.Pointer("prefix"),
 		})
@@ -196,17 +197,17 @@ func TestGetLogGroupsCrossAccountQuerying(t *testing.T) {
 
 	t.Run("Should replace LogGroupNamePrefix if LogGroupNamePattern passed in resource call", func(t *testing.T) {
 		mockLogsAPI := &mocks.LogsAPI{}
-		mockLogsAPI.On("DescribeLogGroups", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
+		mockLogsAPI.On("DescribeLogGroupsWithContext", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
 		service := NewLogGroupsService(mockLogsAPI, true)
 
-		_, err := service.GetLogGroups(resources.LogGroupsRequest{
+		_, err := service.GetLogGroupsWithContext(context.Background(), resources.LogGroupsRequest{
 			ResourceRequest:     resources.ResourceRequest{AccountId: utils.Pointer("accountId")},
 			LogGroupNamePrefix:  utils.Pointer("prefix"),
 			LogGroupNamePattern: utils.Pointer("pattern"),
 		})
 
 		assert.NoError(t, err)
-		mockLogsAPI.AssertCalled(t, "DescribeLogGroups", &cloudwatchlogs.DescribeLogGroupsInput{
+		mockLogsAPI.AssertCalled(t, "DescribeLogGroupsWithContext", &cloudwatchlogs.DescribeLogGroupsInput{
 			AccountIdentifiers:    []*string{utils.Pointer("accountId")},
 			Limit:                 utils.Pointer(int64(0)),
 			LogGroupNamePrefix:    utils.Pointer("pattern"),
@@ -216,15 +217,15 @@ func TestGetLogGroupsCrossAccountQuerying(t *testing.T) {
 
 	t.Run("Should includeLinkedAccounts,and accountId if isCrossAccountEnabled is set to true", func(t *testing.T) {
 		mockLogsAPI := &mocks.LogsAPI{}
-		mockLogsAPI.On("DescribeLogGroups", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
+		mockLogsAPI.On("DescribeLogGroupsWithContext", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
 		service := NewLogGroupsService(mockLogsAPI, true)
 
-		_, err := service.GetLogGroups(resources.LogGroupsRequest{
+		_, err := service.GetLogGroupsWithContext(context.Background(), resources.LogGroupsRequest{
 			ResourceRequest: resources.ResourceRequest{AccountId: utils.Pointer("accountId")},
 		})
 
 		assert.NoError(t, err)
-		mockLogsAPI.AssertCalled(t, "DescribeLogGroups", &cloudwatchlogs.DescribeLogGroupsInput{
+		mockLogsAPI.AssertCalled(t, "DescribeLogGroupsWithContext", &cloudwatchlogs.DescribeLogGroupsInput{
 			Limit:                 utils.Pointer(int64(0)),
 			IncludeLinkedAccounts: utils.Pointer(true),
 			AccountIdentifiers:    []*string{utils.Pointer("accountId")},
@@ -233,15 +234,15 @@ func TestGetLogGroupsCrossAccountQuerying(t *testing.T) {
 
 	t.Run("Should should not override prefix is there is no logGroupNamePattern", func(t *testing.T) {
 		mockLogsAPI := &mocks.LogsAPI{}
-		mockLogsAPI.On("DescribeLogGroups", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
+		mockLogsAPI.On("DescribeLogGroupsWithContext", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
 		service := NewLogGroupsService(mockLogsAPI, true)
 
-		_, err := service.GetLogGroups(resources.LogGroupsRequest{
+		_, err := service.GetLogGroupsWithContext(context.Background(), resources.LogGroupsRequest{
 			ResourceRequest:    resources.ResourceRequest{AccountId: utils.Pointer("accountId")},
 			LogGroupNamePrefix: utils.Pointer("prefix"),
 		})
 		assert.NoError(t, err)
-		mockLogsAPI.AssertCalled(t, "DescribeLogGroups", &cloudwatchlogs.DescribeLogGroupsInput{
+		mockLogsAPI.AssertCalled(t, "DescribeLogGroupsWithContext", &cloudwatchlogs.DescribeLogGroupsInput{
 			AccountIdentifiers:    []*string{utils.Pointer("accountId")},
 			Limit:                 utils.Pointer(int64(0)),
 			LogGroupNamePrefix:    utils.Pointer("prefix"),
@@ -251,15 +252,15 @@ func TestGetLogGroupsCrossAccountQuerying(t *testing.T) {
 
 	t.Run("Should not includeLinkedAccounts, or accountId if accountId is nil", func(t *testing.T) {
 		mockLogsAPI := &mocks.LogsAPI{}
-		mockLogsAPI.On("DescribeLogGroups", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
+		mockLogsAPI.On("DescribeLogGroupsWithContext", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
 		service := NewLogGroupsService(mockLogsAPI, true)
 
-		_, err := service.GetLogGroups(resources.LogGroupsRequest{
+		_, err := service.GetLogGroupsWithContext(context.Background(), resources.LogGroupsRequest{
 			LogGroupNamePrefix: utils.Pointer("prefix"),
 		})
 
 		assert.NoError(t, err)
-		mockLogsAPI.AssertCalled(t, "DescribeLogGroups", &cloudwatchlogs.DescribeLogGroupsInput{
+		mockLogsAPI.AssertCalled(t, "DescribeLogGroupsWithContext", &cloudwatchlogs.DescribeLogGroupsInput{
 			Limit:              utils.Pointer(int64(0)),
 			LogGroupNamePrefix: utils.Pointer("prefix"),
 		})
@@ -267,10 +268,10 @@ func TestGetLogGroupsCrossAccountQuerying(t *testing.T) {
 
 	t.Run("Should should not override prefix is there is no logGroupNamePattern", func(t *testing.T) {
 		mockLogsAPI := &mocks.LogsAPI{}
-		mockLogsAPI.On("DescribeLogGroups", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
+		mockLogsAPI.On("DescribeLogGroupsWithContext", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
 		service := NewLogGroupsService(mockLogsAPI, true)
 
-		_, err := service.GetLogGroups(resources.LogGroupsRequest{
+		_, err := service.GetLogGroupsWithContext(context.Background(), resources.LogGroupsRequest{
 			ResourceRequest: resources.ResourceRequest{
 				AccountId: utils.Pointer("accountId"),
 			},
@@ -278,7 +279,7 @@ func TestGetLogGroupsCrossAccountQuerying(t *testing.T) {
 		})
 
 		assert.NoError(t, err)
-		mockLogsAPI.AssertCalled(t, "DescribeLogGroups", &cloudwatchlogs.DescribeLogGroupsInput{
+		mockLogsAPI.AssertCalled(t, "DescribeLogGroupsWithContext", &cloudwatchlogs.DescribeLogGroupsInput{
 			AccountIdentifiers:    []*string{utils.Pointer("accountId")},
 			IncludeLinkedAccounts: utils.Pointer(true),
 			Limit:                 utils.Pointer(int64(0)),
@@ -290,7 +291,7 @@ func TestGetLogGroupsCrossAccountQuerying(t *testing.T) {
 func TestGetLogGroupFields(t *testing.T) {
 	t.Run("Should map log group fields response", func(t *testing.T) {
 		mockLogsAPI := &mocks.LogsAPI{}
-		mockLogsAPI.On("GetLogGroupFields", mock.Anything).Return(
+		mockLogsAPI.On("GetLogGroupFieldsWithContext", mock.Anything).Return(
 			&cloudwatchlogs.GetLogGroupFieldsOutput{
 				LogGroupFields: []*cloudwatchlogs.LogGroupField{
 					{
@@ -307,7 +308,7 @@ func TestGetLogGroupFields(t *testing.T) {
 			}, nil)
 
 		service := NewLogGroupsService(mockLogsAPI, false)
-		resp, err := service.GetLogGroupFields(resources.LogGroupFieldsRequest{})
+		resp, err := service.GetLogGroupFieldsWithContext(context.Background(), resources.LogGroupFieldsRequest{})
 
 		assert.NoError(t, err)
 		assert.Equal(t, []resources.ResourceResponse[resources.LogGroupField]{
@@ -355,16 +356,16 @@ func TestGetLogGroupFields(t *testing.T) {
 	// remove this test once the above test is uncommented
 	t.Run("Should only set LogGroupName as api input in case both LogGroupName and LogGroupARN are specified", func(t *testing.T) {
 		mockLogsAPI := &mocks.LogsAPI{}
-		mockLogsAPI.On("GetLogGroupFields", mock.Anything).Return(
+		mockLogsAPI.On("GetLogGroupFieldsWithContext", mock.Anything).Return(
 			&cloudwatchlogs.GetLogGroupFieldsOutput{}, nil)
 
 		service := NewLogGroupsService(mockLogsAPI, false)
-		resp, err := service.GetLogGroupFields(resources.LogGroupFieldsRequest{
+		resp, err := service.GetLogGroupFieldsWithContext(context.Background(), resources.LogGroupFieldsRequest{
 			LogGroupName: "logGroupName",
 			LogGroupARN:  "logGroupARN",
 		})
 
-		mockLogsAPI.AssertCalled(t, "GetLogGroupFields", &cloudwatchlogs.GetLogGroupFieldsInput{
+		mockLogsAPI.AssertCalled(t, "GetLogGroupFieldsWithContext", &cloudwatchlogs.GetLogGroupFieldsInput{
 			LogGroupIdentifier: nil,
 			LogGroupName:       utils.Pointer("logGroupName"),
 		})
@@ -374,16 +375,16 @@ func TestGetLogGroupFields(t *testing.T) {
 
 	t.Run("Should only set LogGroupName as api input in case only LogGroupName is specified", func(t *testing.T) {
 		mockLogsAPI := &mocks.LogsAPI{}
-		mockLogsAPI.On("GetLogGroupFields", mock.Anything).Return(
+		mockLogsAPI.On("GetLogGroupFieldsWithContext", mock.Anything).Return(
 			&cloudwatchlogs.GetLogGroupFieldsOutput{}, nil)
 
 		service := NewLogGroupsService(mockLogsAPI, false)
-		resp, err := service.GetLogGroupFields(resources.LogGroupFieldsRequest{
+		resp, err := service.GetLogGroupFieldsWithContext(context.Background(), resources.LogGroupFieldsRequest{
 			LogGroupName: "logGroupName",
 			LogGroupARN:  "",
 		})
 
-		mockLogsAPI.AssertCalled(t, "GetLogGroupFields", &cloudwatchlogs.GetLogGroupFieldsInput{
+		mockLogsAPI.AssertCalled(t, "GetLogGroupFieldsWithContext", &cloudwatchlogs.GetLogGroupFieldsInput{
 			LogGroupIdentifier: nil,
 			LogGroupName:       utils.Pointer("logGroupName"),
 		})
diff --git a/pkg/tsdb/cloudwatch/services/regions.go b/pkg/tsdb/cloudwatch/services/regions.go
index 9a2f6244e00fe..2f8fc345e0738 100644
--- a/pkg/tsdb/cloudwatch/services/regions.go
+++ b/pkg/tsdb/cloudwatch/services/regions.go
@@ -5,7 +5,7 @@ import (
 	"sort"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/constants"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
diff --git a/pkg/tsdb/cloudwatch/services/regions_test.go b/pkg/tsdb/cloudwatch/services/regions_test.go
index 7a3bb36a3d6ec..bb559ea590770 100644
--- a/pkg/tsdb/cloudwatch/services/regions_test.go
+++ b/pkg/tsdb/cloudwatch/services/regions_test.go
@@ -5,14 +5,14 @@ import (
 	"testing"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/mocks"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/utils"
 	"github.com/stretchr/testify/assert"
 )
 
-var testLogger = log.New("test logger")
+var testLogger = log.New().With("logger", "test.logger")
 
 func TestRegions(t *testing.T) {
 	t.Run("returns regions from the api and merges them with default regions", func(t *testing.T) {
diff --git a/pkg/tsdb/cloudwatch/test_utils.go b/pkg/tsdb/cloudwatch/test_utils.go
index 9dff03b03bf2d..9e7f531e1942f 100644
--- a/pkg/tsdb/cloudwatch/test_utils.go
+++ b/pkg/tsdb/cloudwatch/test_utils.go
@@ -2,6 +2,7 @@ package cloudwatch
 
 import (
 	"context"
+	"strings"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/request"
@@ -16,7 +17,11 @@ import (
 	"github.com/aws/aws-sdk-go/service/resourcegroupstaggingapi/resourcegroupstaggingapiiface"
 	"github.com/grafana/grafana-aws-sdk/pkg/awsds"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+	"github.com/grafana/grafana-plugin-sdk-go/experimental/featuretoggles"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
+	"github.com/patrickmn/go-cache"
 	"github.com/stretchr/testify/mock"
 )
 
@@ -71,14 +76,8 @@ func (m *mockLogsSyncClient) StartQueryWithContext(ctx context.Context, input *c
 	return args.Get(0).(*cloudwatchlogs.StartQueryOutput), args.Error(1)
 }
 
-func (m *fakeCWLogsClient) DescribeLogGroups(input *cloudwatchlogs.DescribeLogGroupsInput) (*cloudwatchlogs.DescribeLogGroupsOutput, error) {
-	m.calls.describeLogGroups = append(m.calls.describeLogGroups, input)
-	output := &m.logGroups[m.logGroupsIndex]
-	m.logGroupsIndex++
-	return output, nil
-}
-
 func (m *fakeCWLogsClient) DescribeLogGroupsWithContext(ctx context.Context, input *cloudwatchlogs.DescribeLogGroupsInput, option ...request.Option) (*cloudwatchlogs.DescribeLogGroupsOutput, error) {
+	m.calls.describeLogGroups = append(m.calls.describeLogGroups, input)
 	output := &m.logGroups[m.logGroupsIndex]
 	m.logGroupsIndex++
 	return output, nil
@@ -121,20 +120,6 @@ func (c *fakeCWAnnotationsClient) DescribeAlarms(params *cloudwatch.DescribeAlar
 	return c.describeAlarmsOutput, nil
 }
 
-type mockEC2Client struct {
-	mock.Mock
-}
-
-func (c *mockEC2Client) DescribeRegionsWithContext(ctx aws.Context, in *ec2.DescribeRegionsInput, option ...request.Option) (*ec2.DescribeRegionsOutput, error) {
-	args := c.Called(in)
-	return args.Get(0).(*ec2.DescribeRegionsOutput), args.Error(1)
-}
-
-func (c *mockEC2Client) DescribeInstancesPagesWithContext(ctx aws.Context, in *ec2.DescribeInstancesInput, fn func(*ec2.DescribeInstancesOutput, bool) bool, opts ...request.Option) error {
-	args := c.Called(in, fn)
-	return args.Error(0)
-}
-
 // Please use mockEC2Client above, we are slowly migrating towards using testify's mocks only
 type oldEC2Client struct {
 	ec2iface.EC2API
@@ -207,19 +192,32 @@ func (c fakeCheckHealthClient) ListMetricsPagesWithContext(ctx aws.Context, inpu
 	return nil
 }
 
-func (c fakeCheckHealthClient) DescribeLogGroups(input *cloudwatchlogs.DescribeLogGroupsInput) (*cloudwatchlogs.DescribeLogGroupsOutput, error) {
+func (c fakeCheckHealthClient) DescribeLogGroupsWithContext(ctx context.Context, input *cloudwatchlogs.DescribeLogGroupsInput, option ...request.Option) (*cloudwatchlogs.DescribeLogGroupsOutput, error) {
 	if c.describeLogGroups != nil {
 		return c.describeLogGroups(input)
 	}
 	return nil, nil
 }
 
-func (c fakeCheckHealthClient) GetLogGroupFields(input *cloudwatchlogs.GetLogGroupFieldsInput) (*cloudwatchlogs.GetLogGroupFieldsOutput, error) {
+func (c fakeCheckHealthClient) GetLogGroupFieldsWithContext(ctx context.Context, input *cloudwatchlogs.GetLogGroupFieldsInput, option ...request.Option) (*cloudwatchlogs.GetLogGroupFieldsOutput, error) {
 	return nil, nil
 }
 
-func newTestConfig() *setting.Cfg {
-	return &setting.Cfg{AWSAllowedAuthProviders: []string{"default"}, AWSAssumeRoleEnabled: true, AWSListMetricsPageLimit: 1000}
+func testInstanceManager(pageLimit int) instancemgmt.InstanceManager {
+	return datasource.NewInstanceManager((func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+		return DataSource{Settings: models.CloudWatchSettings{
+			AWSDatasourceSettings: awsds.AWSDatasourceSettings{
+				Region: "us-east-1",
+			},
+			GrafanaSettings: awsds.AuthSettings{ListMetricsPageLimit: pageLimit},
+		},
+			sessions:      &fakeSessionCache{},
+			tagValueCache: cache.New(0, 0)}, nil
+	}))
+}
+
+func defaultTestInstanceManager() instancemgmt.InstanceManager {
+	return testInstanceManager(1000)
 }
 
 type mockSessionCache struct {
@@ -276,3 +274,9 @@ func (e fakeAWSError) Code() string {
 func (e fakeAWSError) Message() string {
 	return e.message
 }
+
+func contextWithFeaturesEnabled(enabled ...string) context.Context {
+	featureString := strings.Join(enabled, ",")
+	cfg := backend.NewGrafanaCfg(map[string]string{featuretoggles.EnabledFeatures: featureString})
+	return backend.WithGrafanaConfig(context.Background(), cfg)
+}
diff --git a/pkg/tsdb/cloudwatch/time_series_query.go b/pkg/tsdb/cloudwatch/time_series_query.go
index 96f7bbd1880f9..cc6b9e772af63 100644
--- a/pkg/tsdb/cloudwatch/time_series_query.go
+++ b/pkg/tsdb/cloudwatch/time_series_query.go
@@ -3,13 +3,14 @@ package cloudwatch
 import (
 	"context"
 	"fmt"
+	"regexp"
 
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/features"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/utils"
 )
 
 type responseWrapper struct {
@@ -17,8 +18,8 @@ type responseWrapper struct {
 	RefId        string
 }
 
-func (e *cloudWatchExecutor) executeTimeSeriesQuery(ctx context.Context, logger log.Logger, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
-	logger.Debug("Executing time series query")
+func (e *cloudWatchExecutor) executeTimeSeriesQuery(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+	e.logger.FromContext(ctx).Debug("Executing time series query")
 	resp := backend.NewQueryDataResponse()
 
 	if len(req.Queries) == 0 {
@@ -36,8 +37,8 @@ func (e *cloudWatchExecutor) executeTimeSeriesQuery(ctx context.Context, logger
 		return nil, err
 	}
 
-	requestQueries, err := models.ParseMetricDataQueries(req.Queries, startTime, endTime, instance.Settings.Region, logger,
-		e.features.IsEnabled(featuremgmt.FlagCloudWatchCrossAccountQuerying))
+	requestQueries, err := models.ParseMetricDataQueries(req.Queries, startTime, endTime, instance.Settings.Region, e.logger.FromContext(ctx),
+		features.IsEnabled(ctx, features.FlagCloudWatchCrossAccountQuerying))
 	if err != nil {
 		return nil, err
 	}
@@ -60,8 +61,8 @@ func (e *cloudWatchExecutor) executeTimeSeriesQuery(ctx context.Context, logger
 		region := r
 
 		batches := [][]*models.CloudWatchQuery{regionQueries}
-		if e.features.IsEnabled(featuremgmt.FlagCloudWatchBatchQueries) {
-			batches = getMetricQueryBatches(regionQueries, logger)
+		if features.IsEnabled(ctx, features.FlagCloudWatchBatchQueries) {
+			batches = getMetricQueryBatches(regionQueries, e.logger.FromContext(ctx))
 		}
 
 		for _, batch := range batches {
@@ -69,7 +70,7 @@ func (e *cloudWatchExecutor) executeTimeSeriesQuery(ctx context.Context, logger
 			eg.Go(func() error {
 				defer func() {
 					if err := recover(); err != nil {
-						logger.Error("Execute Get Metric Data Query Panic", "error", err, "stack", log.Stack(1))
+						e.logger.FromContext(ctx).Error("Execute Get Metric Data Query Panic", "error", err, "stack", utils.Stack(1))
 						if theErr, ok := err.(error); ok {
 							resultChan <- &responseWrapper{
 								DataResponse: &backend.DataResponse{
@@ -85,7 +86,7 @@ func (e *cloudWatchExecutor) executeTimeSeriesQuery(ctx context.Context, logger
 					return err
 				}
 
-				metricDataInput, err := e.buildMetricDataInput(logger, startTime, endTime, requestQueries)
+				metricDataInput, err := e.buildMetricDataInput(startTime, endTime, requestQueries)
 				if err != nil {
 					return err
 				}
@@ -95,11 +96,9 @@ func (e *cloudWatchExecutor) executeTimeSeriesQuery(ctx context.Context, logger
 					return err
 				}
 
-				if e.features.IsEnabled(featuremgmt.FlagCloudWatchWildCardDimensionValues) {
-					requestQueries, err = e.getDimensionValuesForWildcards(ctx, req.PluginContext, region, client, requestQueries, instance.tagValueCache, logger)
-					if err != nil {
-						return err
-					}
+				requestQueries, err = e.getDimensionValuesForWildcards(ctx, region, client, requestQueries, instance.tagValueCache, instance.Settings.GrafanaSettings.ListMetricsPageLimit)
+				if err != nil {
+					return err
 				}
 
 				res, err := e.parseResponse(startTime, endTime, mdo, requestQueries)
@@ -121,6 +120,7 @@ func (e *cloudWatchExecutor) executeTimeSeriesQuery(ctx context.Context, logger
 			Error: fmt.Errorf("metric request error: %q", err),
 		}
 		resultChan <- &responseWrapper{
+			RefId:        getQueryRefIdFromErrorString(err.Error(), requestQueries),
 			DataResponse: &dataResponse,
 		}
 	}
@@ -132,3 +132,17 @@ func (e *cloudWatchExecutor) executeTimeSeriesQuery(ctx context.Context, logger
 
 	return resp, nil
 }
+
+func getQueryRefIdFromErrorString(err string, queries []*models.CloudWatchQuery) string {
+	// error can be in format "Error in expression 'test': Invalid syntax"
+	// so we can find the query id or ref id between the quotations
+	erroredRefId := ""
+
+	for _, query := range queries {
+		if regexp.MustCompile(`'`+query.RefId+`':`).MatchString(err) || regexp.MustCompile(`'`+query.Id+`':`).MatchString(err) {
+			erroredRefId = query.RefId
+		}
+	}
+	// if errorRefId is empty, it means the error concerns all queries (error metric limit exceeded, for example)
+	return erroredRefId
+}
diff --git a/pkg/tsdb/cloudwatch/time_series_query_test.go b/pkg/tsdb/cloudwatch/time_series_query_test.go
index 81032778e4f55..d1a1d13b47cbe 100644
--- a/pkg/tsdb/cloudwatch/time_series_query_test.go
+++ b/pkg/tsdb/cloudwatch/time_series_query_test.go
@@ -14,9 +14,10 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/stretchr/testify/mock"
 
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/features"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/kinds/dataquery"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/mocks"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
@@ -26,7 +27,7 @@ import (
 )
 
 func TestTimeSeriesQuery(t *testing.T) {
-	executor := newExecutor(nil, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+	executor := newExecutor(defaultTestInstanceManager(), log.NewNullLogger())
 	now := time.Now()
 
 	origNewCWClient := NewCWClient
@@ -50,11 +51,9 @@ func TestTimeSeriesQuery(t *testing.T) {
 					StatusCode: aws.String("Complete"), Id: aws.String("b"), Label: aws.String("NetworkIn"), Values: []*float64{aws.Float64(1.0)}, Timestamps: []*time.Time{&now},
 				}}}, nil)
 
-		im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-			return DataSource{Settings: models.CloudWatchSettings{}}, nil
-		})
+		im := defaultTestInstanceManager()
 
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 		resp, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
 			PluginContext: backend.PluginContext{
 				DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{},
@@ -119,7 +118,7 @@ func TestTimeSeriesQuery(t *testing.T) {
 	})
 
 	t.Run("End time before start time should result in error", func(t *testing.T) {
-		_, err := executor.executeTimeSeriesQuery(context.Background(), logger, &backend.QueryDataRequest{Queries: []backend.DataQuery{{TimeRange: backend.TimeRange{
+		_, err := executor.executeTimeSeriesQuery(context.Background(), &backend.QueryDataRequest{Queries: []backend.DataQuery{{TimeRange: backend.TimeRange{
 			From: now.Add(time.Hour * -1),
 			To:   now.Add(time.Hour * -2),
 		}}}})
@@ -127,7 +126,7 @@ func TestTimeSeriesQuery(t *testing.T) {
 	})
 
 	t.Run("End time equals start time should result in error", func(t *testing.T) {
-		_, err := executor.executeTimeSeriesQuery(context.Background(), logger, &backend.QueryDataRequest{Queries: []backend.DataQuery{{TimeRange: backend.TimeRange{
+		_, err := executor.executeTimeSeriesQuery(context.Background(), &backend.QueryDataRequest{Queries: []backend.DataQuery{{TimeRange: backend.TimeRange{
 			From: now.Add(time.Hour * -1),
 			To:   now.Add(time.Hour * -1),
 		}}}})
@@ -148,19 +147,18 @@ func Test_executeTimeSeriesQuery_getCWClient_is_called_once_per_region_and_GetMe
 		return &mockMetricClient
 	}
 
-	im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		return DataSource{Settings: models.CloudWatchSettings{}}, nil
-	})
-
 	t.Run("Queries with the same region should call GetSession with that region 1 time and call GetMetricDataWithContext 1 time", func(t *testing.T) {
 		mockSessionCache := &mockSessionCache{}
 		mockSessionCache.On("GetSession", mock.MatchedBy(
 			func(config awsds.SessionConfig) bool { return config.Settings.Region == "us-east-1" })). // region from queries is asserted here
 			Return(&session.Session{Config: &aws.Config{}}, nil).Once()
+		im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+			return DataSource{Settings: models.CloudWatchSettings{}, sessions: mockSessionCache}, nil
+		})
 		mockMetricClient = mocks.MetricsAPI{}
 		mockMetricClient.On("GetMetricDataWithContext", mock.Anything, mock.Anything, mock.Anything).Return(nil, nil)
 
-		executor := newExecutor(im, newTestConfig(), mockSessionCache, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 		_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
 			PluginContext: backend.PluginContext{
 				DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{},
@@ -208,10 +206,15 @@ func Test_executeTimeSeriesQuery_getCWClient_is_called_once_per_region_and_GetMe
 		sessionCache.On("GetSession", mock.MatchedBy(
 			func(config awsds.SessionConfig) bool { return config.Settings.Region == "us-east-2" })).
 			Return(&session.Session{Config: &aws.Config{}}, nil, nil).Once()
+
+		im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+			return DataSource{Settings: models.CloudWatchSettings{}, sessions: sessionCache}, nil
+		})
+
 		mockMetricClient = mocks.MetricsAPI{}
 		mockMetricClient.On("GetMetricDataWithContext", mock.Anything, mock.Anything, mock.Anything).Return(nil, nil)
 
-		executor := newExecutor(im, newTestConfig(), sessionCache, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 		_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
 			PluginContext: backend.PluginContext{
 				DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{},
@@ -338,13 +341,13 @@ func Test_QueryData_timeSeriesQuery_GetMetricDataWithContext(t *testing.T) {
 	}
 
 	im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		return DataSource{Settings: models.CloudWatchSettings{}}, nil
+		return DataSource{Settings: models.CloudWatchSettings{}, sessions: &fakeSessionCache{}}, nil
 	})
 
 	t.Run("passes query label as GetMetricData label", func(t *testing.T) {
 		api = mocks.MetricsAPI{}
 		api.On("GetMetricDataWithContext", mock.Anything, mock.Anything, mock.Anything).Return(&cloudwatch.GetMetricDataOutput{}, nil)
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 		query := newTestQuery(t, queryParameters{
 			Label: aws.String("${PROP('Period')} some words ${PROP('Dim.InstanceId')}"),
 		})
@@ -383,7 +386,7 @@ func Test_QueryData_timeSeriesQuery_GetMetricDataWithContext(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			api = mocks.MetricsAPI{}
 			api.On("GetMetricDataWithContext", mock.Anything, mock.Anything, mock.Anything).Return(&cloudwatch.GetMetricDataOutput{}, nil)
-			executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+			executor := newExecutor(im, log.NewNullLogger())
 
 			_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
 				PluginContext: backend.PluginContext{DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}},
@@ -433,10 +436,8 @@ func Test_QueryData_response_data_frame_name_is_always_response_label(t *testing
 					Values: []*float64{aws.Float64(1.0)}, Timestamps: []*time.Time{{}}},
 			}}, nil)
 
-	im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		return DataSource{Settings: models.CloudWatchSettings{}}, nil
-	})
-	executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+	im := defaultTestInstanceManager()
+	executor := newExecutor(im, log.NewNullLogger())
 
 	t.Run("where user defines search expression", func(t *testing.T) {
 		query := newTestQuery(t, queryParameters{
@@ -588,16 +589,14 @@ func TestTimeSeriesQuery_CrossAccountQuerying(t *testing.T) {
 	NewCWClient = func(sess *session.Session) cloudwatchiface.CloudWatchAPI {
 		return &api
 	}
-	im := datasource.NewInstanceManager(func(ctx context.Context, s backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		return DataSource{Settings: models.CloudWatchSettings{}}, nil
-	})
+	im := defaultTestInstanceManager()
 
 	t.Run("should call GetMetricDataInput with AccountId nil when no AccountId is provided", func(t *testing.T) {
 		api = mocks.MetricsAPI{}
 		api.On("GetMetricDataWithContext", mock.Anything, mock.Anything, mock.Anything).Return(&cloudwatch.GetMetricDataOutput{}, nil)
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures(featuremgmt.FlagCloudWatchCrossAccountQuerying))
+		executor := newExecutor(im, log.NewNullLogger())
 
-		_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
+		_, err := executor.QueryData(contextWithFeaturesEnabled(features.FlagCloudWatchCrossAccountQuerying), &backend.QueryDataRequest{
 			PluginContext: backend.PluginContext{
 				DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{},
 			},
@@ -636,7 +635,7 @@ func TestTimeSeriesQuery_CrossAccountQuerying(t *testing.T) {
 	t.Run("should call GetMetricDataInput with AccountId nil when feature flag is false", func(t *testing.T) {
 		api = mocks.MetricsAPI{}
 		api.On("GetMetricDataWithContext", mock.Anything, mock.Anything, mock.Anything).Return(&cloudwatch.GetMetricDataOutput{}, nil)
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures())
+		executor := newExecutor(im, log.NewNullLogger())
 		_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
 			PluginContext: backend.PluginContext{
 				DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{},
@@ -677,8 +676,8 @@ func TestTimeSeriesQuery_CrossAccountQuerying(t *testing.T) {
 	t.Run("should call GetMetricDataInput with AccountId in a MetricStat query", func(t *testing.T) {
 		api = mocks.MetricsAPI{}
 		api.On("GetMetricDataWithContext", mock.Anything, mock.Anything, mock.Anything).Return(&cloudwatch.GetMetricDataOutput{}, nil)
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures(featuremgmt.FlagCloudWatchCrossAccountQuerying))
-		_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
+		executor := newExecutor(im, log.NewNullLogger())
+		_, err := executor.QueryData(contextWithFeaturesEnabled(features.FlagCloudWatchCrossAccountQuerying), &backend.QueryDataRequest{
 			PluginContext: backend.PluginContext{
 				DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{},
 			},
@@ -718,8 +717,8 @@ func TestTimeSeriesQuery_CrossAccountQuerying(t *testing.T) {
 	t.Run("should GetMetricDataInput with AccountId in an inferred search expression query", func(t *testing.T) {
 		api = mocks.MetricsAPI{}
 		api.On("GetMetricDataWithContext", mock.Anything, mock.Anything, mock.Anything).Return(&cloudwatch.GetMetricDataOutput{}, nil)
-		executor := newExecutor(im, newTestConfig(), &fakeSessionCache{}, featuremgmt.WithFeatures(featuremgmt.FlagCloudWatchCrossAccountQuerying))
-		_, err := executor.QueryData(context.Background(), &backend.QueryDataRequest{
+		executor := newExecutor(im, log.NewNullLogger())
+		_, err := executor.QueryData(contextWithFeaturesEnabled(features.FlagCloudWatchCrossAccountQuerying), &backend.QueryDataRequest{
 			PluginContext: backend.PluginContext{
 				DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{},
 			},
diff --git a/pkg/tsdb/cloudwatch/utils/metrics.go b/pkg/tsdb/cloudwatch/utils/metrics.go
new file mode 100644
index 0000000000000..07d361ff2ef83
--- /dev/null
+++ b/pkg/tsdb/cloudwatch/utils/metrics.go
@@ -0,0 +1,22 @@
+package utils
+
+import (
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
+)
+
+const (
+	// Labels for the metric counter query types
+
+	ListMetricsLabel   = "list_metrics"
+	GetMetricDataLabel = "get_metric_data"
+)
+
+var QueriesTotalCounter = promauto.NewCounterVec(
+	prometheus.CounterOpts{
+		Namespace: "grafana_plugin",
+		Name:      "aws_cloudwatch_queries_total",
+		Help:      "Counter for AWS Queries",
+	},
+	[]string{"query_type"},
+)
diff --git a/pkg/tsdb/cloudwatch/utils/utils.go b/pkg/tsdb/cloudwatch/utils/utils.go
index 65a4cc8ba4dbf..bf5e8f9d0a70e 100644
--- a/pkg/tsdb/cloudwatch/utils/utils.go
+++ b/pkg/tsdb/cloudwatch/utils/utils.go
@@ -1,3 +1,22 @@
 package utils
 
+import "github.com/go-stack/stack"
+
 func Pointer[T any](arg T) *T { return &arg }
+
+func Depointerizer[T any](v *T) T {
+	var emptyValue T
+	if v != nil {
+		emptyValue = *v
+	}
+
+	return emptyValue
+}
+
+// Stack is copied from grafana/pkg/infra/log
+// TODO: maybe this should live in grafana-plugin-sdk-go?
+func Stack(skip int) string {
+	call := stack.Caller(skip)
+	s := stack.Trace().TrimBelow(call).TrimRuntime()
+	return s.String()
+}
diff --git a/pkg/tsdb/elasticsearch/client/client.go b/pkg/tsdb/elasticsearch/client/client.go
index 1004ab5efa446..b51b824e45b07 100644
--- a/pkg/tsdb/elasticsearch/client/client.go
+++ b/pkg/tsdb/elasticsearch/client/client.go
@@ -13,11 +13,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/trace"
 
+	exp "github.com/grafana/grafana-plugin-sdk-go/experimental/errorsource"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 )
@@ -36,10 +36,8 @@ type DatasourceInfo struct {
 	Database                   string
 	ConfiguredFields           ConfiguredFields
 	Interval                   string
-	TimeInterval               string
 	MaxConcurrentShardRequests int64
 	IncludeFrozen              bool
-	XPack                      bool
 }
 
 type ConfiguredFields struct {
@@ -56,7 +54,7 @@ type Client interface {
 }
 
 // NewClient creates a new elasticsearch client
-var NewClient = func(ctx context.Context, ds *DatasourceInfo, timeRange backend.TimeRange, logger log.Logger, tracer tracing.Tracer) (Client, error) {
+var NewClient = func(ctx context.Context, ds *DatasourceInfo, logger log.Logger, tracer tracing.Tracer) (Client, error) {
 	logger = logger.New("entity", "client")
 
 	ip, err := newIndexPattern(ds.Interval, ds.Database)
@@ -65,19 +63,14 @@ var NewClient = func(ctx context.Context, ds *DatasourceInfo, timeRange backend.
 		return nil, err
 	}
 
-	indices, err := ip.GetIndices(timeRange)
-	if err != nil {
-		return nil, err
-	}
-	logger.Debug("Creating new client", "configuredFields", fmt.Sprintf("%#v", ds.ConfiguredFields), "indices", strings.Join(indices, ", "), "interval", ds.Interval, "index", ds.Database)
+	logger.Debug("Creating new client", "configuredFields", fmt.Sprintf("%#v", ds.ConfiguredFields), "interval", ds.Interval, "index", ds.Database)
 
 	return &baseClientImpl{
 		logger:           logger,
 		ctx:              ctx,
 		ds:               ds,
 		configuredFields: ds.ConfiguredFields,
-		indices:          indices,
-		timeRange:        timeRange,
+		indexPattern:     ip,
 		tracer:           tracer,
 	}, nil
 }
@@ -86,8 +79,7 @@ type baseClientImpl struct {
 	ctx              context.Context
 	ds               *DatasourceInfo
 	configuredFields ConfiguredFields
-	indices          []string
-	timeRange        backend.TimeRange
+	indexPattern     IndexPattern
 	logger           log.Logger
 	tracer           tracing.Tracer
 }
@@ -192,6 +184,10 @@ func (c *baseClientImpl) ExecuteMultisearch(r *MultiSearchRequest) (*MultiSearch
 			status = "cancelled"
 		}
 		lp := []any{"error", err, "status", status, "duration", time.Since(start), "stage", StageDatabaseRequest}
+		sourceErr := exp.Error{}
+		if errors.As(err, &sourceErr) {
+			lp = append(lp, "statusSource", sourceErr.Source())
+		}
 		if clientRes != nil {
 			lp = append(lp, "statusCode", clientRes.StatusCode)
 		}
@@ -235,11 +231,16 @@ func (c *baseClientImpl) createMultiSearchRequests(searchRequests []*SearchReque
 	multiRequests := []*multiRequest{}
 
 	for _, searchReq := range searchRequests {
+		indices, err := c.indexPattern.GetIndices(searchReq.TimeRange)
+		if err != nil {
+			c.logger.Error("Failed to get indices from index pattern", "error", err)
+			continue
+		}
 		mr := multiRequest{
 			header: map[string]any{
 				"search_type":        "query_then_fetch",
 				"ignore_unavailable": true,
-				"index":              strings.Join(c.indices, ","),
+				"index":              strings.Join(indices, ","),
 			},
 			body:     searchReq,
 			interval: searchReq.Interval,
@@ -260,7 +261,7 @@ func (c *baseClientImpl) getMultiSearchQueryParameters() string {
 	}
 	qs = append(qs, fmt.Sprintf("max_concurrent_shard_requests=%d", maxConcurrentShardRequests))
 
-	if c.ds.IncludeFrozen && c.ds.XPack {
+	if c.ds.IncludeFrozen {
 		qs = append(qs, "ignore_throttled=false")
 	}
 
diff --git a/pkg/tsdb/elasticsearch/client/client_test.go b/pkg/tsdb/elasticsearch/client/client_test.go
index e394567555c6a..e857c385f5d2b 100644
--- a/pkg/tsdb/elasticsearch/client/client_test.go
+++ b/pkg/tsdb/elasticsearch/client/client_test.go
@@ -58,7 +58,6 @@ func TestClient_ExecuteMultisearch(t *testing.T) {
 			Interval:                   "Daily",
 			MaxConcurrentShardRequests: 6,
 			IncludeFrozen:              true,
-			XPack:                      true,
 		}
 
 		from := time.Date(2018, 5, 15, 17, 50, 0, 0, time.UTC)
@@ -68,7 +67,7 @@ func TestClient_ExecuteMultisearch(t *testing.T) {
 			To:   to,
 		}
 
-		c, err := NewClient(context.Background(), &ds, timeRange, log.New("test", "test"), tracing.InitializeTracerForTest())
+		c, err := NewClient(context.Background(), &ds, log.New("test", "test"), tracing.InitializeTracerForTest())
 		require.NoError(t, err)
 		require.NotNil(t, c)
 
@@ -76,7 +75,7 @@ func TestClient_ExecuteMultisearch(t *testing.T) {
 			ts.Close()
 		})
 
-		ms, err := createMultisearchForTest(t, c)
+		ms, err := createMultisearchForTest(t, c, timeRange)
 		require.NoError(t, err)
 		res, err := c.ExecuteMultisearch(ms)
 		require.NoError(t, err)
@@ -111,6 +110,78 @@ func TestClient_ExecuteMultisearch(t *testing.T) {
 		assert.Equal(t, 200, res.Status)
 		require.Len(t, res.Responses, 1)
 	})
+
+	t.Run("Given a fake http client, 2 queries and a client with response", func(t *testing.T) {
+		var requestBody *bytes.Buffer
+		ts := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
+			buf, err := io.ReadAll(r.Body)
+			require.NoError(t, err)
+
+			requestBody = bytes.NewBuffer(buf)
+
+			rw.Header().Set("Content-Type", "application/x-ndjson")
+			_, err = rw.Write([]byte(
+				`{
+				"responses": [
+					{
+						"hits": {	"hits": [], "max_score": 0,	"total": { "value": 4656, "relation": "eq"}	},
+						"status": 200
+					}
+				]
+			}`))
+			require.NoError(t, err)
+			rw.WriteHeader(200)
+		}))
+
+		configuredFields := ConfiguredFields{
+			TimeField:       "testtime",
+			LogMessageField: "line",
+			LogLevelField:   "lvl",
+		}
+
+		ds := DatasourceInfo{
+			URL:                        ts.URL,
+			HTTPClient:                 ts.Client(),
+			Database:                   "[metrics-]YYYY.MM.DD",
+			ConfiguredFields:           configuredFields,
+			Interval:                   "Daily",
+			MaxConcurrentShardRequests: 6,
+			IncludeFrozen:              true,
+		}
+
+		from := time.Date(2018, 5, 15, 17, 50, 0, 0, time.UTC)
+		to := time.Date(2018, 5, 15, 17, 55, 0, 0, time.UTC)
+		timeRange := backend.TimeRange{
+			From: from,
+			To:   to,
+		}
+
+		from2 := time.Date(2018, 5, 17, 17, 50, 0, 0, time.UTC)
+		to2 := time.Date(2018, 5, 17, 17, 55, 0, 0, time.UTC)
+		timeRange2 := backend.TimeRange{
+			From: from2,
+			To:   to2,
+		}
+
+		c, err := NewClient(context.Background(), &ds, log.New("test", "test"), tracing.InitializeTracerForTest())
+		require.NoError(t, err)
+		require.NotNil(t, c)
+
+		t.Cleanup(func() {
+			ts.Close()
+		})
+
+		ms, err := createMultisearchWithMultipleQueriesForTest(t, c, timeRange, timeRange2)
+		require.NoError(t, err)
+		_, err = c.ExecuteMultisearch(ms)
+		require.NoError(t, err)
+
+		require.NotNil(t, requestBody)
+
+		bodyString := requestBody.String()
+		require.Contains(t, bodyString, "metrics-2018.05.15")
+		require.Contains(t, bodyString, "metrics-2018.05.17")
+	})
 }
 
 func TestClient_Index(t *testing.T) {
@@ -180,7 +251,6 @@ func TestClient_Index(t *testing.T) {
 				Interval:                   test.patternInDatasource,
 				MaxConcurrentShardRequests: 6,
 				IncludeFrozen:              true,
-				XPack:                      true,
 			}
 
 			from := time.Date(2018, 5, 10, 17, 50, 0, 0, time.UTC)
@@ -190,7 +260,7 @@ func TestClient_Index(t *testing.T) {
 				To:   to,
 			}
 
-			c, err := NewClient(context.Background(), &ds, timeRange, log.New("test", "test"), tracing.InitializeTracerForTest())
+			c, err := NewClient(context.Background(), &ds, log.New("test", "test"), tracing.InitializeTracerForTest())
 			require.NoError(t, err)
 			require.NotNil(t, c)
 
@@ -198,7 +268,7 @@ func TestClient_Index(t *testing.T) {
 				ts.Close()
 			})
 
-			ms, err := createMultisearchForTest(t, c)
+			ms, err := createMultisearchForTest(t, c, timeRange)
 			require.NoError(t, err)
 			_, err = c.ExecuteMultisearch(ms)
 			require.NoError(t, err)
@@ -217,11 +287,11 @@ func TestClient_Index(t *testing.T) {
 	}
 }
 
-func createMultisearchForTest(t *testing.T, c Client) (*MultiSearchRequest, error) {
+func createMultisearchForTest(t *testing.T, c Client, timeRange backend.TimeRange) (*MultiSearchRequest, error) {
 	t.Helper()
 
 	msb := c.MultiSearch()
-	s := msb.Search(15 * time.Second)
+	s := msb.Search(15*time.Second, timeRange)
 	s.Agg().DateHistogram("2", "@timestamp", func(a *DateHistogramAgg, ab AggBuilder) {
 		a.FixedInterval = "$__interval"
 
@@ -231,3 +301,28 @@ func createMultisearchForTest(t *testing.T, c Client) (*MultiSearchRequest, erro
 	})
 	return msb.Build()
 }
+
+func createMultisearchWithMultipleQueriesForTest(t *testing.T, c Client, firstTimeRange backend.TimeRange, secondTimeRange backend.TimeRange) (*MultiSearchRequest, error) {
+	t.Helper()
+
+	msb := c.MultiSearch()
+	s1 := msb.Search(15*time.Second, firstTimeRange)
+	s1.Agg().DateHistogram("2", "@timestamp", func(a *DateHistogramAgg, ab AggBuilder) {
+		a.FixedInterval = "$__interval"
+
+		ab.Metric("1", "avg", "@hostname", func(a *MetricAggregation) {
+			a.Settings["script"] = "$__interval_ms*@hostname"
+		})
+	})
+
+	s2 := msb.Search(15*time.Second, secondTimeRange)
+	s2.Agg().DateHistogram("2", "@timestamp", func(a *DateHistogramAgg, ab AggBuilder) {
+		a.FixedInterval = "$__interval"
+
+		ab.Metric("1", "avg", "@hostname", func(a *MetricAggregation) {
+			a.Settings["script"] = "$__interval_ms*@hostname"
+		})
+	})
+
+	return msb.Build()
+}
diff --git a/pkg/tsdb/elasticsearch/client/index_pattern.go b/pkg/tsdb/elasticsearch/client/index_pattern.go
index 0f0b2b3cee2de..aae58ec04ee72 100644
--- a/pkg/tsdb/elasticsearch/client/index_pattern.go
+++ b/pkg/tsdb/elasticsearch/client/index_pattern.go
@@ -18,11 +18,11 @@ const (
 	intervalYearly  = "yearly"
 )
 
-type indexPattern interface {
+type IndexPattern interface {
 	GetIndices(timeRange backend.TimeRange) ([]string, error)
 }
 
-var newIndexPattern = func(interval string, pattern string) (indexPattern, error) {
+var newIndexPattern = func(interval string, pattern string) (IndexPattern, error) {
 	if interval == noInterval {
 		return &staticIndexPattern{indexName: pattern}, nil
 	}
diff --git a/pkg/tsdb/elasticsearch/client/models.go b/pkg/tsdb/elasticsearch/client/models.go
index 43701a2295c64..fd0d5b45d9e88 100644
--- a/pkg/tsdb/elasticsearch/client/models.go
+++ b/pkg/tsdb/elasticsearch/client/models.go
@@ -3,6 +3,8 @@ package es
 import (
 	"encoding/json"
 	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
 )
 
 // SearchRequest represents a search request
@@ -14,6 +16,7 @@ type SearchRequest struct {
 	Query       *Query
 	Aggs        AggArray
 	CustomProps map[string]interface{}
+	TimeRange   backend.TimeRange
 }
 
 // MarshalJSON returns the JSON encoding of the request.
diff --git a/pkg/tsdb/elasticsearch/client/search_request.go b/pkg/tsdb/elasticsearch/client/search_request.go
index 0b07184836ad0..354147122520f 100644
--- a/pkg/tsdb/elasticsearch/client/search_request.go
+++ b/pkg/tsdb/elasticsearch/client/search_request.go
@@ -3,6 +3,8 @@ package es
 import (
 	"strings"
 	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
 )
 
 const (
@@ -22,15 +24,17 @@ type SearchRequestBuilder struct {
 	queryBuilder *QueryBuilder
 	aggBuilders  []AggBuilder
 	customProps  map[string]any
+	timeRange    backend.TimeRange
 }
 
 // NewSearchRequestBuilder create a new search request builder
-func NewSearchRequestBuilder(interval time.Duration) *SearchRequestBuilder {
+func NewSearchRequestBuilder(interval time.Duration, timeRange backend.TimeRange) *SearchRequestBuilder {
 	builder := &SearchRequestBuilder{
 		interval:    interval,
 		sort:        make(map[string]any),
 		customProps: make(map[string]any),
 		aggBuilders: make([]AggBuilder, 0),
+		timeRange:   timeRange,
 	}
 	return builder
 }
@@ -39,6 +43,7 @@ func NewSearchRequestBuilder(interval time.Duration) *SearchRequestBuilder {
 func (b *SearchRequestBuilder) Build() (*SearchRequest, error) {
 	sr := SearchRequest{
 		Index:       b.index,
+		TimeRange:   b.timeRange,
 		Interval:    b.interval,
 		Size:        b.size,
 		Sort:        b.sort,
@@ -164,8 +169,8 @@ func NewMultiSearchRequestBuilder() *MultiSearchRequestBuilder {
 }
 
 // Search initiates and returns a new search request builder
-func (m *MultiSearchRequestBuilder) Search(interval time.Duration) *SearchRequestBuilder {
-	b := NewSearchRequestBuilder(interval)
+func (m *MultiSearchRequestBuilder) Search(interval time.Duration, timeRange backend.TimeRange) *SearchRequestBuilder {
+	b := NewSearchRequestBuilder(interval, timeRange)
 	m.requestBuilders = append(m.requestBuilders, b)
 	return b
 }
diff --git a/pkg/tsdb/elasticsearch/client/search_request_test.go b/pkg/tsdb/elasticsearch/client/search_request_test.go
index fe4046e2fab43..80113b4996ef1 100644
--- a/pkg/tsdb/elasticsearch/client/search_request_test.go
+++ b/pkg/tsdb/elasticsearch/client/search_request_test.go
@@ -7,14 +7,21 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana/pkg/components/simplejson"
 )
 
 func TestSearchRequest(t *testing.T) {
 	timeField := "@timestamp"
+	from := time.Date(2018, 5, 10, 17, 50, 0, 0, time.UTC)
+	to := time.Date(2018, 5, 12, 17, 55, 0, 0, time.UTC)
+	timeRange := backend.TimeRange{
+		From: from,
+		To:   to,
+	}
 
 	setup := func() *SearchRequestBuilder {
-		return NewSearchRequestBuilder(15 * time.Second)
+		return NewSearchRequestBuilder(15*time.Second, timeRange)
 	}
 
 	t.Run("When building search request", func(t *testing.T) {
@@ -398,9 +405,15 @@ func TestSearchRequest(t *testing.T) {
 }
 
 func TestMultiSearchRequest(t *testing.T) {
+	from := time.Date(2018, 5, 10, 17, 50, 0, 0, time.UTC)
+	to := time.Date(2018, 5, 12, 17, 55, 0, 0, time.UTC)
+	timeRange := backend.TimeRange{
+		From: from,
+		To:   to,
+	}
 	t.Run("When adding one search request", func(t *testing.T) {
 		b := NewMultiSearchRequestBuilder()
-		b.Search(15 * time.Second)
+		b.Search(15*time.Second, timeRange)
 
 		t.Run("When building search request should contain one search request", func(t *testing.T) {
 			mr, err := b.Build()
@@ -411,8 +424,8 @@ func TestMultiSearchRequest(t *testing.T) {
 
 	t.Run("When adding two search requests", func(t *testing.T) {
 		b := NewMultiSearchRequestBuilder()
-		b.Search(15 * time.Second)
-		b.Search(15 * time.Second)
+		b.Search(15*time.Second, timeRange)
+		b.Search(15*time.Second, timeRange)
 
 		t.Run("When building search request should contain two search requests", func(t *testing.T) {
 			mr, err := b.Build()
diff --git a/pkg/tsdb/elasticsearch/data_query.go b/pkg/tsdb/elasticsearch/data_query.go
index f2df4ba0afc48..8ea4cab315c9e 100644
--- a/pkg/tsdb/elasticsearch/data_query.go
+++ b/pkg/tsdb/elasticsearch/data_query.go
@@ -5,11 +5,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"regexp"
+	"slices"
 	"strconv"
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"golang.org/x/exp/slices"
+	"github.com/grafana/grafana-plugin-sdk-go/experimental/errorsource"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/log"
@@ -22,42 +23,50 @@ const (
 )
 
 type elasticsearchDataQuery struct {
-	client      es.Client
-	dataQueries []backend.DataQuery
-	logger      log.Logger
-	ctx         context.Context
-	tracer      tracing.Tracer
+	client               es.Client
+	dataQueries          []backend.DataQuery
+	logger               log.Logger
+	ctx                  context.Context
+	tracer               tracing.Tracer
+	keepLabelsInResponse bool
 }
 
-var newElasticsearchDataQuery = func(ctx context.Context, client es.Client, dataQuery []backend.DataQuery, logger log.Logger, tracer tracing.Tracer) *elasticsearchDataQuery {
+var newElasticsearchDataQuery = func(ctx context.Context, client es.Client, req *backend.QueryDataRequest, logger log.Logger, tracer tracing.Tracer) *elasticsearchDataQuery {
+	_, fromAlert := req.Headers[headerFromAlert]
+	fromExpression := req.GetHTTPHeader(headerFromExpression) != ""
+
 	return &elasticsearchDataQuery{
 		client:      client,
-		dataQueries: dataQuery,
+		dataQueries: req.Queries,
 		logger:      logger,
 		ctx:         ctx,
 		tracer:      tracer,
+		// To maintain backward compatibility, it is necessary to keep labels in responses for alerting and expressions queries.
+		// Historically, these labels have been used in alerting rules and transformations.
+		keepLabelsInResponse: fromAlert || fromExpression,
 	}
 }
 
 func (e *elasticsearchDataQuery) execute() (*backend.QueryDataResponse, error) {
 	start := time.Now()
+	response := backend.NewQueryDataResponse()
 	e.logger.Debug("Parsing queries", "queriesLength", len(e.dataQueries))
 	queries, err := parseQuery(e.dataQueries, e.logger)
 	if err != nil {
 		mq, _ := json.Marshal(e.dataQueries)
 		e.logger.Error("Failed to parse queries", "error", err, "queries", string(mq), "queriesLength", len(queries), "duration", time.Since(start), "stage", es.StagePrepareRequest)
-		return &backend.QueryDataResponse{}, err
+		return errorsource.AddPluginErrorToResponse(e.dataQueries[0].RefID, response, err), nil
 	}
 
 	ms := e.client.MultiSearch()
 
-	from := e.dataQueries[0].TimeRange.From.UnixNano() / int64(time.Millisecond)
-	to := e.dataQueries[0].TimeRange.To.UnixNano() / int64(time.Millisecond)
 	for _, q := range queries {
+		from := q.TimeRange.From.UnixNano() / int64(time.Millisecond)
+		to := q.TimeRange.To.UnixNano() / int64(time.Millisecond)
 		if err := e.processQuery(q, ms, from, to); err != nil {
 			mq, _ := json.Marshal(q)
 			e.logger.Error("Failed to process query to multisearch request builder", "error", err, "query", string(mq), "queriesLength", len(queries), "duration", time.Since(start), "stage", es.StagePrepareRequest)
-			return &backend.QueryDataResponse{}, err
+			return errorsource.AddPluginErrorToResponse(q.RefID, response, err), nil
 		}
 	}
 
@@ -65,16 +74,17 @@ func (e *elasticsearchDataQuery) execute() (*backend.QueryDataResponse, error) {
 	if err != nil {
 		mqs, _ := json.Marshal(e.dataQueries)
 		e.logger.Error("Failed to build multisearch request", "error", err, "queriesLength", len(queries), "queries", string(mqs), "duration", time.Since(start), "stage", es.StagePrepareRequest)
-		return &backend.QueryDataResponse{}, err
+		return errorsource.AddPluginErrorToResponse(e.dataQueries[0].RefID, response, err), nil
 	}
 
 	e.logger.Info("Prepared request", "queriesLength", len(queries), "duration", time.Since(start), "stage", es.StagePrepareRequest)
 	res, err := e.client.ExecuteMultisearch(req)
 	if err != nil {
-		return &backend.QueryDataResponse{}, err
+		// We are returning error containing the source that was added trough errorsource.Middleware
+		return errorsource.AddErrorToResponse(e.dataQueries[0].RefID, response, err), nil
 	}
 
-	return parseResponse(e.ctx, res.Responses, queries, e.client.GetConfiguredFields(), e.logger, e.tracer)
+	return parseResponse(e.ctx, res.Responses, queries, e.client.GetConfiguredFields(), e.keepLabelsInResponse, e.logger, e.tracer)
 }
 
 func (e *elasticsearchDataQuery) processQuery(q *Query, ms *es.MultiSearchRequestBuilder, from, to int64) error {
@@ -85,7 +95,7 @@ func (e *elasticsearchDataQuery) processQuery(q *Query, ms *es.MultiSearchReques
 	}
 
 	defaultTimeField := e.client.GetConfiguredFields().TimeField
-	b := ms.Search(q.Interval)
+	b := ms.Search(q.Interval, q.TimeRange)
 	b.Size(0)
 	filters := b.Query().Bool().Filter()
 	filters.AddDateRangeFilter(defaultTimeField, to, from, es.DateFormatEpochMS)
@@ -386,6 +396,11 @@ func processDocumentQuery(q *Query, b *es.SearchRequestBuilder, from, to int64,
 	b.Sort(es.SortOrderDesc, defaultTimeField, "boolean")
 	b.Sort(es.SortOrderDesc, "_doc", "")
 	b.AddDocValueField(defaultTimeField)
+	if isRawDataQuery(q) {
+		// For raw_data queries we need to add timeField as field with standardized time format to not receive
+		// invalid formats that elasticsearch can parse, but our frontend can't (e.g. yyyy_MM_dd_HH_mm_ss)
+		b.AddTimeFieldWithStandardizedFormat(defaultTimeField)
+	}
 	b.Size(stringToIntWithDefaultValue(metric.Settings.Get("size").MustString(), defaultSize))
 }
 
diff --git a/pkg/tsdb/elasticsearch/data_query_test.go b/pkg/tsdb/elasticsearch/data_query_test.go
index 337dbe42fd034..17381d29d9101 100644
--- a/pkg/tsdb/elasticsearch/data_query_test.go
+++ b/pkg/tsdb/elasticsearch/data_query_test.go
@@ -1428,10 +1428,12 @@ func TestExecuteElasticsearchDataQuery(t *testing.T) {
 
 		t.Run("With invalid query should return error", (func(t *testing.T) {
 			c := newFakeClient()
-			_, err := executeElasticsearchDataQuery(c, `{
+			res, err := executeElasticsearchDataQuery(c, `{
 				"query": "foo",
 			}`, from, to)
-			require.Error(t, err)
+			require.NoError(t, err)
+			require.Equal(t, res.Responses["A"].ErrorSource, backend.ErrorSourcePlugin)
+			require.Equal(t, res.Responses["A"].Error.Error(), "invalid character '}' looking for beginning of object key string")
 		}))
 	})
 }
@@ -1856,9 +1858,10 @@ func executeElasticsearchDataQuery(c es.Client, body string, from, to time.Time)
 			{
 				JSON:      json.RawMessage(body),
 				TimeRange: timeRange,
+				RefID:     "A",
 			},
 		},
 	}
-	query := newElasticsearchDataQuery(context.Background(), c, dataRequest.Queries, log.New("test.logger"), tracing.InitializeTracerForTest())
+	query := newElasticsearchDataQuery(context.Background(), c, &dataRequest, log.New("test.logger"), tracing.InitializeTracerForTest())
 	return query.execute()
 }
diff --git a/pkg/tsdb/elasticsearch/elasticsearch.go b/pkg/tsdb/elasticsearch/elasticsearch.go
index cd25200b52d64..28fe2bb824e3e 100644
--- a/pkg/tsdb/elasticsearch/elasticsearch.go
+++ b/pkg/tsdb/elasticsearch/elasticsearch.go
@@ -16,17 +16,26 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
+	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+	exp "github.com/grafana/grafana-plugin-sdk-go/experimental/errorsource"
+	exphttpclient "github.com/grafana/grafana-plugin-sdk-go/experimental/errorsource/httpclient"
 
 	"github.com/grafana/grafana/pkg/infra/httpclient"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
-	ngalertmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
 	es "github.com/grafana/grafana/pkg/tsdb/elasticsearch/client"
 )
 
 var eslog = log.New("tsdb.elasticsearch")
 
+const (
+	// headerFromExpression is used by data sources to identify expression queries
+	headerFromExpression = "X-Grafana-From-Expr"
+	// headerFromAlert is used by datasources to identify alert queries
+	headerFromAlert = "FromAlert"
+)
+
 type Service struct {
 	httpClientProvider httpclient.Provider
 	im                 instancemgmt.InstanceManager
@@ -45,7 +54,7 @@ func ProvideService(httpClientProvider httpclient.Provider, tracer tracing.Trace
 
 func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
 	dsInfo, err := s.getDSInfo(ctx, req.PluginContext)
-	_, fromAlert := req.Headers[ngalertmodels.FromAlertHeaderName]
+	_, fromAlert := req.Headers[headerFromAlert]
 	logger := s.logger.FromContext(ctx).New("fromAlert", fromAlert)
 
 	if err != nil {
@@ -53,20 +62,20 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest)
 		return &backend.QueryDataResponse{}, err
 	}
 
-	return queryData(ctx, req.Queries, dsInfo, logger, s.tracer)
+	return queryData(ctx, req, dsInfo, logger, s.tracer)
 }
 
 // separate function to allow testing the whole transformation and query flow
-func queryData(ctx context.Context, queries []backend.DataQuery, dsInfo *es.DatasourceInfo, logger log.Logger, tracer tracing.Tracer) (*backend.QueryDataResponse, error) {
-	if len(queries) == 0 {
+func queryData(ctx context.Context, req *backend.QueryDataRequest, dsInfo *es.DatasourceInfo, logger log.Logger, tracer tracing.Tracer) (*backend.QueryDataResponse, error) {
+	if len(req.Queries) == 0 {
 		return &backend.QueryDataResponse{}, fmt.Errorf("query contains no queries")
 	}
 
-	client, err := es.NewClient(ctx, dsInfo, queries[0].TimeRange, logger, tracer)
+	client, err := es.NewClient(ctx, dsInfo, logger, tracer)
 	if err != nil {
 		return &backend.QueryDataResponse{}, err
 	}
-	query := newElasticsearchDataQuery(ctx, client, queries, logger, tracer)
+	query := newElasticsearchDataQuery(ctx, client, req, logger, tracer)
 	return query.execute()
 }
 
@@ -87,7 +96,10 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst
 			httpCliOpts.SigV4.Service = "es"
 		}
 
-		httpCli, err := httpClientProvider.New(httpCliOpts)
+		// set the default middlewars from the httpClientProvider
+		httpCliOpts.Middlewares = httpClientProvider.(*sdkhttpclient.Provider).Opts.Middlewares
+		// enable experimental http client to support errors with source
+		httpCli, err := exphttpclient.New(httpCliOpts)
 		if err != nil {
 			return nil, err
 		}
@@ -118,11 +130,6 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst
 			interval = ""
 		}
 
-		timeInterval, ok := jsonData["timeInterval"].(string)
-		if !ok {
-			timeInterval = ""
-		}
-
 		index, ok := jsonData["index"].(string)
 		if !ok {
 			index = ""
@@ -150,11 +157,6 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst
 			includeFrozen = false
 		}
 
-		xpack, ok := jsonData["xpack"].(bool)
-		if !ok {
-			xpack = false
-		}
-
 		configuredFields := es.ConfiguredFields{
 			TimeField:       timeField,
 			LogLevelField:   logLevelField,
@@ -169,9 +171,7 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst
 			MaxConcurrentShardRequests: int64(maxConcurrentShardRequests),
 			ConfiguredFields:           configuredFields,
 			Interval:                   interval,
-			TimeInterval:               timeInterval,
 			IncludeFrozen:              includeFrozen,
-			XPack:                      xpack,
 		}
 		return model, nil
 	}
@@ -192,9 +192,10 @@ func (s *Service) CallResource(ctx context.Context, req *backend.CallResourceReq
 	logger := eslog.FromContext(ctx)
 	// allowed paths for resource calls:
 	// - empty string for fetching db version
-	// - ?/_mapping for fetching index mapping
+	// - /_mapping for fetching index mapping, e.g. requests going to `index/_mapping`
 	// - _msearch for executing getTerms queries
-	if req.Path != "" && !strings.HasSuffix(req.Path, "/_mapping") && req.Path != "_msearch" {
+	// - _mapping for fetching "root" index mappings
+	if req.Path != "" && !strings.HasSuffix(req.Path, "/_mapping") && req.Path != "_msearch" && req.Path != "_mapping" {
 		logger.Error("Invalid resource path", "path", req.Path)
 		return fmt.Errorf("invalid resource URL: %s", req.Path)
 	}
@@ -205,21 +206,11 @@ func (s *Service) CallResource(ctx context.Context, req *backend.CallResourceReq
 		return err
 	}
 
-	esUrl, err := url.Parse(ds.URL)
+	esUrl, err := createElasticsearchURL(req, ds)
 	if err != nil {
-		logger.Error("Failed to parse data source URL", "error", err, "url", ds.URL)
-		return err
+		logger.Error("Failed to create request url", "error", err, "url", ds.URL, "path", req.Path)
 	}
 
-	resourcePath, err := url.Parse(req.Path)
-	if err != nil {
-		logger.Error("Failed to parse data source path", "error", err, "url", req.Path)
-		return err
-	}
-
-	// We take the path and the query-string only
-	esUrl.RawQuery = resourcePath.RawQuery
-	esUrl.Path = path.Join(esUrl.Path, resourcePath.Path)
 	request, err := http.NewRequestWithContext(ctx, req.Method, esUrl.String(), bytes.NewBuffer(req.Body))
 	if err != nil {
 		logger.Error("Failed to create request", "error", err, "url", esUrl.String())
@@ -235,6 +226,10 @@ func (s *Service) CallResource(ctx context.Context, req *backend.CallResourceReq
 			status = "cancelled"
 		}
 		lp := []any{"error", err, "status", status, "duration", time.Since(start), "stage", es.StageDatabaseRequest, "resourcePath", req.Path}
+		sourceErr := exp.Error{}
+		if errors.As(err, &sourceErr) {
+			lp = append(lp, "statusSource", sourceErr.Source())
+		}
 		if response != nil {
 			lp = append(lp, "statusCode", response.StatusCode)
 		}
@@ -269,3 +264,13 @@ func (s *Service) CallResource(ctx context.Context, req *backend.CallResourceReq
 		Body:    body,
 	})
 }
+
+func createElasticsearchURL(req *backend.CallResourceRequest, ds *es.DatasourceInfo) (*url.URL, error) {
+	esUrl, err := url.Parse(ds.URL)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse data source URL: %s, error: %w", ds.URL, err)
+	}
+
+	esUrl.Path = path.Join(esUrl.Path, req.Path)
+	return esUrl, nil
+}
diff --git a/pkg/tsdb/elasticsearch/elasticsearch_test.go b/pkg/tsdb/elasticsearch/elasticsearch_test.go
index 3a336e410de0e..13a6aa79c71af 100644
--- a/pkg/tsdb/elasticsearch/elasticsearch_test.go
+++ b/pkg/tsdb/elasticsearch/elasticsearch_test.go
@@ -9,13 +9,13 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/infra/httpclient"
+	es "github.com/grafana/grafana/pkg/tsdb/elasticsearch/client"
 )
 
 type datasourceInfo struct {
 	TimeField                  any    `json:"timeField"`
 	MaxConcurrentShardRequests int64  `json:"maxConcurrentShardRequests"`
 	Interval                   string `json:"interval"`
-	TimeInterval               string `json:"timeInterval"`
 }
 
 func TestNewInstanceSettings(t *testing.T) {
@@ -40,7 +40,6 @@ func TestNewInstanceSettings(t *testing.T) {
 			dsInfo := datasourceInfo{
 				MaxConcurrentShardRequests: 5,
 				Interval:                   "Daily",
-				TimeInterval:               "TimeInterval",
 			}
 
 			settingsJSON, err := json.Marshal(dsInfo)
@@ -59,7 +58,6 @@ func TestNewInstanceSettings(t *testing.T) {
 				MaxConcurrentShardRequests: 5,
 				Interval:                   "Daily",
 				TimeField:                  "",
-				TimeInterval:               "TimeInterval",
 			}
 
 			settingsJSON, err := json.Marshal(dsInfo)
@@ -74,3 +72,32 @@ func TestNewInstanceSettings(t *testing.T) {
 		})
 	})
 }
+
+func TestCreateElasticsearchURL(t *testing.T) {
+	tt := []struct {
+		name     string
+		settings es.DatasourceInfo
+		req      backend.CallResourceRequest
+		expected string
+	}{
+		{name: "with /_msearch path and valid url", settings: es.DatasourceInfo{URL: "http://localhost:9200"}, req: backend.CallResourceRequest{Path: "_msearch"}, expected: "http://localhost:9200/_msearch"},
+		{name: "with _msearch path and valid url", settings: es.DatasourceInfo{URL: "http://localhost:9200"}, req: backend.CallResourceRequest{Path: "_msearch"}, expected: "http://localhost:9200/_msearch"},
+		{name: "with _msearch path and valid url with /", settings: es.DatasourceInfo{URL: "http://localhost:9200/"}, req: backend.CallResourceRequest{Path: "_msearch"}, expected: "http://localhost:9200/_msearch"},
+		{name: "with _mapping path and valid url", settings: es.DatasourceInfo{URL: "http://localhost:9200"}, req: backend.CallResourceRequest{Path: "/_mapping"}, expected: "http://localhost:9200/_mapping"},
+		{name: "with /_mapping path and valid url", settings: es.DatasourceInfo{URL: "http://localhost:9200"}, req: backend.CallResourceRequest{Path: "/_mapping"}, expected: "http://localhost:9200/_mapping"},
+		{name: "with /_mapping path and valid url with /", settings: es.DatasourceInfo{URL: "http://localhost:9200/"}, req: backend.CallResourceRequest{Path: "/_mapping"}, expected: "http://localhost:9200/_mapping"},
+		{name: "with abc/_mapping path and valid url", settings: es.DatasourceInfo{URL: "http://localhost:9200"}, req: backend.CallResourceRequest{Path: "abc/_mapping"}, expected: "http://localhost:9200/abc/_mapping"},
+		{name: "with /abc/_mapping path and valid url", settings: es.DatasourceInfo{URL: "http://localhost:9200"}, req: backend.CallResourceRequest{Path: "abc/_mapping"}, expected: "http://localhost:9200/abc/_mapping"},
+		{name: "with /abc/_mapping path and valid url", settings: es.DatasourceInfo{URL: "http://localhost:9200/"}, req: backend.CallResourceRequest{Path: "abc/_mapping"}, expected: "http://localhost:9200/abc/_mapping"},
+		// This is to support mappings to cross cluster search that includes ":"
+		{name: "with path including :", settings: es.DatasourceInfo{URL: "http://localhost:9200/"}, req: backend.CallResourceRequest{Path: "ab:c/_mapping"}, expected: "http://localhost:9200/ab:c/_mapping"},
+	}
+
+	for _, test := range tt {
+		t.Run(test.name, func(t *testing.T) {
+			url, err := createElasticsearchURL(&test.req, &test.settings)
+			require.NoError(t, err)
+			require.Equal(t, test.expected, url.String())
+		})
+	}
+}
diff --git a/pkg/tsdb/elasticsearch/error_handling_test.go b/pkg/tsdb/elasticsearch/error_handling_test.go
index 20dddacda4caa..353c1e2409d2a 100644
--- a/pkg/tsdb/elasticsearch/error_handling_test.go
+++ b/pkg/tsdb/elasticsearch/error_handling_test.go
@@ -139,11 +139,12 @@ func TestNonElasticError(t *testing.T) {
 	// to access the database for some reason.
 	response := []byte(`Access to the database is forbidden`)
 
-	_, err := queryDataTestWithResponseCode(query, 403, response)
+	res, err := queryDataTestWithResponseCode(query, 403, response)
 	// FIXME: we should return something better.
 	// currently it returns the error-message about being unable to decode JSON
 	// it is not 100% clear what we should return to the browser
 	// (and what to debug-log for example), we could return
 	// at least something like "unknown response, http status code 403"
-	require.ErrorContains(t, err, "invalid character")
+	require.NoError(t, err)
+	require.Contains(t, res.response.Responses["A"].Error.Error(), "invalid character")
 }
diff --git a/pkg/tsdb/elasticsearch/healthcheck.go b/pkg/tsdb/elasticsearch/healthcheck.go
new file mode 100644
index 0000000000000..9422b87fc8180
--- /dev/null
+++ b/pkg/tsdb/elasticsearch/healthcheck.go
@@ -0,0 +1,107 @@
+package elasticsearch
+
+import (
+	"context"
+	"encoding/json"
+	"io"
+	"net/http"
+	"net/url"
+	"path"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+)
+
+func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
+	logger := eslog.FromContext(ctx)
+
+	ds, err := s.getDSInfo(ctx, req.PluginContext)
+	if err != nil {
+		logger.Error("Failed to get data source info", "error", err)
+		return &backend.CheckHealthResult{
+			Status:  backend.HealthStatusUnknown,
+			Message: "Failed to get data source info",
+		}, err
+	}
+
+	esUrl, err := url.Parse(ds.URL)
+	if err != nil {
+		logger.Error("Failed to parse data source URL", "error", err, "url", ds.URL)
+		return &backend.CheckHealthResult{
+			Status:  backend.HealthStatusUnknown,
+			Message: "Failed to parse data source URL",
+		}, err
+	}
+
+	esUrl.Path = path.Join(esUrl.Path, "_cluster/health")
+	esUrl.RawQuery = "wait_for_status=yellow"
+
+	request, err := http.NewRequestWithContext(ctx, "GET", esUrl.String(), nil)
+	if err != nil {
+		logger.Error("Failed to create request", "error", err, "url", esUrl.String())
+		return &backend.CheckHealthResult{
+			Status:  backend.HealthStatusUnknown,
+			Message: "Failed to create request",
+		}, err
+	}
+
+	start := time.Now()
+	logger.Debug("Sending healthcheck request to Elasticsearch", "url", esUrl.String())
+	response, err := ds.HTTPClient.Do(request)
+
+	if err != nil {
+		logger.Error("Failed to do healthcheck request", "error", err, "url", esUrl.String())
+		return &backend.CheckHealthResult{
+			Status:  backend.HealthStatusUnknown,
+			Message: "Failed to do healthcheck request",
+		}, err
+	}
+
+	if response.StatusCode == http.StatusRequestTimeout {
+		return &backend.CheckHealthResult{
+			Status:  backend.HealthStatusError,
+			Message: "Elasticsearch data source is not healthy",
+		}, nil
+	}
+
+	logger.Info("Response received from Elasticsearch", "statusCode", response.StatusCode, "status", "ok", "duration", time.Since(start))
+
+	defer func() {
+		if err := response.Body.Close(); err != nil {
+			logger.Warn("Failed to close response body", "error", err)
+		}
+	}()
+
+	body, err := io.ReadAll(response.Body)
+	if err != nil {
+		logger.Error("Error reading response body bytes", "error", err)
+		return &backend.CheckHealthResult{
+			Status:  backend.HealthStatusUnknown,
+			Message: "Failed to read response",
+		}, err
+	}
+
+	jsonData := map[string]any{}
+
+	err = json.Unmarshal(body, &jsonData)
+	if err != nil {
+		logger.Error("Error during json unmarshal of the body", "error", err)
+		return &backend.CheckHealthResult{
+			Status:  backend.HealthStatusUnknown,
+			Message: "Failed to unmarshal response",
+		}, err
+	}
+
+	status := backend.HealthStatusOk
+	message := "Elasticsearch data source is healthy"
+
+	if jsonData["status"] == "red" {
+		status = backend.HealthStatusError
+		message = "Elasticsearch data source is not healthy"
+	}
+
+	return &backend.CheckHealthResult{
+		Status:  status,
+		Message: message,
+	}, nil
+}
diff --git a/pkg/tsdb/elasticsearch/healthcheck_test.go b/pkg/tsdb/elasticsearch/healthcheck_test.go
new file mode 100644
index 0000000000000..432c2d24413fa
--- /dev/null
+++ b/pkg/tsdb/elasticsearch/healthcheck_test.go
@@ -0,0 +1,80 @@
+package elasticsearch
+
+import (
+	"bytes"
+	"context"
+	"io"
+	"net/http"
+	"testing"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+	es "github.com/grafana/grafana/pkg/tsdb/elasticsearch/client"
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_Healthcheck_OK(t *testing.T) {
+	service := GetMockService(true)
+	res, _ := service.CheckHealth(context.Background(), &backend.CheckHealthRequest{
+		PluginContext: backend.PluginContext{},
+		Headers:       nil,
+	})
+	assert.Equal(t, backend.HealthStatusOk, res.Status)
+	assert.Equal(t, "Elasticsearch data source is healthy", res.Message)
+}
+
+func Test_Healthcheck_Timeout(t *testing.T) {
+	service := GetMockService(false)
+	res, _ := service.CheckHealth(context.Background(), &backend.CheckHealthRequest{
+		PluginContext: backend.PluginContext{},
+		Headers:       nil,
+	})
+	assert.Equal(t, backend.HealthStatusError, res.Status)
+	assert.Equal(t, "Elasticsearch data source is not healthy", res.Message)
+}
+
+type FakeRoundTripper struct {
+	isDsHealthy bool
+}
+
+func (fakeRoundTripper *FakeRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
+	var res *http.Response
+	if fakeRoundTripper.isDsHealthy {
+		res = &http.Response{
+			StatusCode: http.StatusOK,
+			Status:     "200 OK",
+			Body:       io.NopCloser(bytes.NewBufferString("{\"status\":\"green\"}")),
+		}
+	} else {
+		res = &http.Response{
+			StatusCode: http.StatusRequestTimeout,
+			Status:     "408 Request Timeout",
+			Body:       io.NopCloser(bytes.NewBufferString("{\"status\":\"red\"}")),
+		}
+	}
+	return res, nil
+}
+
+type FakeInstanceManager struct {
+	isDsHealthy bool
+}
+
+func (fakeInstanceManager *FakeInstanceManager) Get(tx context.Context, pluginContext backend.PluginContext) (instancemgmt.Instance, error) {
+	httpClient, _ := sdkhttpclient.New(sdkhttpclient.Options{})
+	httpClient.Transport = &FakeRoundTripper{isDsHealthy: fakeInstanceManager.isDsHealthy}
+
+	return es.DatasourceInfo{
+		HTTPClient: httpClient,
+	}, nil
+}
+
+func (*FakeInstanceManager) Do(_ context.Context, _ backend.PluginContext, _ instancemgmt.InstanceCallbackFunc) error {
+	return nil
+}
+
+func GetMockService(isDsHealthy bool) *Service {
+	return &Service{
+		im: &FakeInstanceManager{isDsHealthy: isDsHealthy},
+	}
+}
diff --git a/pkg/tsdb/elasticsearch/kinds/dataquery/types_dataquery_gen.go b/pkg/tsdb/elasticsearch/kinds/dataquery/types_dataquery_gen.go
index 5bf431b4d28b2..5b767aba2e9d6 100644
--- a/pkg/tsdb/elasticsearch/kinds/dataquery/types_dataquery_gen.go
+++ b/pkg/tsdb/elasticsearch/kinds/dataquery/types_dataquery_gen.go
@@ -172,9 +172,7 @@ type DataQuery struct {
 	// TODO this shouldn't be unknown but DataSourceRef | null
 	Datasource *any `json:"datasource,omitempty"`
 
-	// Hide true if query is disabled (ie should not be returned to the dashboard)
-	// Note this does not always imply that the query should not be executed since
-	// the results from a hidden query may be used as the input to other queries (SSE etc)
+	// If hide is set to true, Grafana will filter out the response(s) associated with this query before returning it to the panel.
 	Hide *bool `json:"hide,omitempty"`
 
 	// Specify the query flavor
diff --git a/pkg/tsdb/elasticsearch/models.go b/pkg/tsdb/elasticsearch/models.go
index 1fa6696c80208..d03861d394395 100644
--- a/pkg/tsdb/elasticsearch/models.go
+++ b/pkg/tsdb/elasticsearch/models.go
@@ -3,6 +3,7 @@ package elasticsearch
 import (
 	"time"
 
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana/pkg/components/simplejson"
 )
 
@@ -16,6 +17,7 @@ type Query struct {
 	IntervalMs    int64
 	RefID         string
 	MaxDataPoints int64
+	TimeRange     backend.TimeRange
 }
 
 // BucketAgg represents a bucket aggregation of the time series query model of the datasource
diff --git a/pkg/tsdb/elasticsearch/parse_query.go b/pkg/tsdb/elasticsearch/parse_query.go
index e3ebf5aa27cb3..6add9272d991e 100644
--- a/pkg/tsdb/elasticsearch/parse_query.go
+++ b/pkg/tsdb/elasticsearch/parse_query.go
@@ -42,6 +42,7 @@ func parseQuery(tsdbQuery []backend.DataQuery, logger log.Logger) ([]*Query, err
 			IntervalMs:    intervalMs,
 			RefID:         q.RefID,
 			MaxDataPoints: q.MaxDataPoints,
+			TimeRange:     q.TimeRange,
 		})
 	}
 
diff --git a/pkg/tsdb/elasticsearch/querydata_test.go b/pkg/tsdb/elasticsearch/querydata_test.go
index 3f9cefd697573..eeb3be175d7c5 100644
--- a/pkg/tsdb/elasticsearch/querydata_test.go
+++ b/pkg/tsdb/elasticsearch/querydata_test.go
@@ -53,12 +53,10 @@ func newFlowTestDsInfo(body []byte, statusCode int, requestCallback func(req *ht
 		Interval:                   "Daily",
 		Database:                   "[testdb-]YYYY.MM.DD",
 		ConfiguredFields:           configuredFields,
-		TimeInterval:               "1s",
 		URL:                        "http://localhost:9200",
 		HTTPClient:                 &client,
 		MaxConcurrentShardRequests: 42,
 		IncludeFrozen:              false,
-		XPack:                      true,
 	}
 }
 
@@ -115,6 +113,9 @@ type queryDataTestResult struct {
 
 func queryDataTestWithResponseCode(queriesBytes []byte, responseStatusCode int, responseBytes []byte) (queryDataTestResult, error) {
 	queries, err := newFlowTestQueries(queriesBytes)
+	req := backend.QueryDataRequest{
+		Queries: queries,
+	}
 	if err != nil {
 		return queryDataTestResult{}, err
 	}
@@ -139,7 +140,7 @@ func queryDataTestWithResponseCode(queriesBytes []byte, responseStatusCode int,
 		return nil
 	})
 
-	result, err := queryData(context.Background(), queries, dsInfo, log.New("test.logger"), tracing.InitializeTracerForTest())
+	result, err := queryData(context.Background(), &req, dsInfo, log.New("test.logger"), tracing.InitializeTracerForTest())
 	if err != nil {
 		return queryDataTestResult{}, err
 	}
diff --git a/pkg/tsdb/elasticsearch/response_parser.go b/pkg/tsdb/elasticsearch/response_parser.go
index b95eb98de1dc4..822a655fb3250 100644
--- a/pkg/tsdb/elasticsearch/response_parser.go
+++ b/pkg/tsdb/elasticsearch/response_parser.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/grafana/grafana-plugin-sdk-go/experimental/errorsource"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/trace"
@@ -46,7 +47,7 @@ const (
 
 var searchWordsRegex = regexp.MustCompile(regexp.QuoteMeta(es.HighlightPreTagsString) + `(.*?)` + regexp.QuoteMeta(es.HighlightPostTagsString))
 
-func parseResponse(ctx context.Context, responses []*es.SearchResponse, targets []*Query, configuredFields es.ConfiguredFields, logger log.Logger, tracer tracing.Tracer) (*backend.QueryDataResponse, error) {
+func parseResponse(ctx context.Context, responses []*es.SearchResponse, targets []*Query, configuredFields es.ConfiguredFields, keepLabelsInResponse bool, logger log.Logger, tracer tracing.Tracer) (*backend.QueryDataResponse, error) {
 	result := backend.QueryDataResponse{
 		Responses: backend.Responses{},
 	}
@@ -73,9 +74,7 @@ func parseResponse(ctx context.Context, responses []*es.SearchResponse, targets
 			resSpan.End()
 			logger.Error("Processing error response from Elasticsearch", "error", string(me), "query", string(mt))
 			errResult := getErrorFromElasticResponse(res)
-			result.Responses[target.RefID] = backend.DataResponse{
-				Error: errors.New(errResult),
-			}
+			result.Responses[target.RefID] = errorsource.Response(errorsource.PluginError(errors.New(errResult), false))
 			continue
 		}
 
@@ -118,7 +117,7 @@ func parseResponse(ctx context.Context, responses []*es.SearchResponse, targets
 				resSpan.End()
 				return &backend.QueryDataResponse{}, err
 			}
-			nameFields(queryRes, target)
+			nameFields(queryRes, target, keepLabelsInResponse)
 			trimDatapoints(queryRes, target)
 
 			result.Responses[target.RefID] = queryRes
@@ -137,8 +136,14 @@ func processLogsResponse(res *es.SearchResponse, target *Query, configuredFields
 
 	for hitIdx, hit := range res.Hits.Hits {
 		var flattened map[string]interface{}
+		var sourceString string
 		if hit["_source"] != nil {
 			flattened = flatten(hit["_source"].(map[string]interface{}), 10)
+			sourceMarshalled, err := json.Marshal(flattened)
+			if err != nil {
+				return err
+			}
+			sourceString = string(sourceMarshalled)
 		}
 
 		doc := map[string]interface{}{
@@ -147,7 +152,8 @@ func processLogsResponse(res *es.SearchResponse, target *Query, configuredFields
 			"_index":    hit["_index"],
 			"sort":      hit["sort"],
 			"highlight": hit["highlight"],
-			"_source":   flattened,
+			// In case of logs query we want to have the raw source as a string field so it can be visualized in logs panel
+			"_source": sourceString,
 		}
 
 		for k, v := range flattened {
@@ -232,6 +238,15 @@ func processRawDataResponse(res *es.SearchResponse, target *Query, configuredFie
 			doc[k] = v
 		}
 
+		if hit["fields"] != nil {
+			source, ok := hit["fields"].(map[string]interface{})
+			if ok {
+				for k, v := range source {
+					doc[k] = v
+				}
+			}
+		}
+
 		for key := range doc {
 			propNames[key] = true
 		}
@@ -873,7 +888,7 @@ func getSortedLabelValues(labels data.Labels) []string {
 	return values
 }
 
-func nameFields(queryResult backend.DataResponse, target *Query) {
+func nameFields(queryResult backend.DataResponse, target *Query, keepLabelsInResponse bool) {
 	set := make(map[string]struct{})
 	frames := queryResult.Frames
 	for _, v := range frames {
@@ -892,10 +907,18 @@ func nameFields(queryResult backend.DataResponse, target *Query) {
 			// another is "number"
 			valueField := frame.Fields[1]
 			fieldName := getFieldName(*valueField, target, metricTypeCount)
-			if valueField.Config == nil {
-				valueField.Config = &data.FieldConfig{}
+			// If we  need to keep the labels in the response, to prevent duplication in names and to keep
+			// backward compatibility with alerting and expressions we use DisplayNameFromDS
+			if keepLabelsInResponse {
+				if valueField.Config == nil {
+					valueField.Config = &data.FieldConfig{}
+				}
+				valueField.Config.DisplayNameFromDS = fieldName
+				// If we don't need to keep labels (how frontend mode worked), we use frame.Name and remove labels
+			} else {
+				valueField.Labels = nil
+				frame.Name = fieldName
 			}
-			valueField.Config.DisplayNameFromDS = fieldName
 		}
 	}
 }
diff --git a/pkg/tsdb/elasticsearch/response_parser_test.go b/pkg/tsdb/elasticsearch/response_parser_test.go
index 26d978d703edf..2fc85276f7a03 100644
--- a/pkg/tsdb/elasticsearch/response_parser_test.go
+++ b/pkg/tsdb/elasticsearch/response_parser_test.go
@@ -129,7 +129,7 @@ func TestProcessLogsResponse(t *testing.T) {
 			require.Equal(t, data.FieldTypeNullableFloat64, logsFieldMap["number"].Type())
 
 			require.Contains(t, logsFieldMap, "_source")
-			require.Equal(t, data.FieldTypeNullableJSON, logsFieldMap["_source"].Type())
+			require.Equal(t, data.FieldTypeNullableString, logsFieldMap["_source"].Type())
 
 			requireStringAt(t, "fdsfs", logsFieldMap["_id"], 0)
 			requireStringAt(t, "kdospaidopa", logsFieldMap["_id"], 1)
@@ -138,10 +138,8 @@ func TestProcessLogsResponse(t *testing.T) {
 			requireStringAt(t, "mock-index", logsFieldMap["_index"], 0)
 			requireStringAt(t, "mock-index", logsFieldMap["_index"], 1)
 
-			actualJson1, err := json.Marshal(logsFieldMap["_source"].At(0).(*json.RawMessage))
-			require.NoError(t, err)
-			actualJson2, err := json.Marshal(logsFieldMap["_source"].At(1).(*json.RawMessage))
-			require.NoError(t, err)
+			actualJson1 := logsFieldMap["_source"].At(0).(*string)
+			actualJson2 := logsFieldMap["_source"].At(1).(*string)
 
 			expectedJson1 := `
 					{
@@ -165,8 +163,8 @@ func TestProcessLogsResponse(t *testing.T) {
 						"fields.lvl": "info"
 					}`
 
-			require.JSONEq(t, expectedJson1, string(actualJson1))
-			require.JSONEq(t, expectedJson2, string(actualJson2))
+			require.JSONEq(t, expectedJson1, *actualJson1)
+			require.JSONEq(t, expectedJson2, *actualJson2)
 		})
 
 		t.Run("creates correct level field", func(t *testing.T) {
@@ -332,7 +330,7 @@ func TestProcessLogsResponse(t *testing.T) {
   			]
 			}`
 
-		result, err := parseTestResponse(targets, response)
+		result, err := parseTestResponse(targets, response, false)
 		require.NoError(t, err)
 		require.Len(t, result.Responses, 1)
 
@@ -419,7 +417,7 @@ func TestProcessLogsResponse(t *testing.T) {
   			]
 			}`
 
-		result, err := parseTestResponse(targets, response)
+		result, err := parseTestResponse(targets, response, false)
 		require.NoError(t, err)
 		require.Len(t, result.Responses, 1)
 
@@ -527,7 +525,7 @@ func TestProcessRawDataResponse(t *testing.T) {
   			]
 			}`
 
-		result, err := parseTestResponse(targets, response)
+		result, err := parseTestResponse(targets, response, false)
 		require.NoError(t, err)
 		require.Len(t, result.Responses, 1)
 
@@ -601,6 +599,92 @@ func TestProcessRawDataResponse(t *testing.T) {
 			require.Equal(t, filterableConfig, *field.Config)
 		}
 	})
+
+	t.Run("gets correct time field from fields", func(t *testing.T) {
+		query := []byte(`
+			[
+				{
+				  "refId": "A",
+				  "metrics": [{ "type": "raw_data", "id": "1" }]
+				}
+			]
+		`)
+
+		response := []byte(`
+			{
+				"responses": [
+				  {
+					"aggregations": {},
+					"hits": {
+					  "hits": [
+						{
+						  "_id": "fdsfs",
+						  "_type": "_doc",
+						  "_index": "mock-index",
+						  "_source": {
+							"testtime": "06/24/2019",
+							"host": "djisaodjsoad",
+							"number": 1,
+							"line": "hello, i am a message",
+							"level": "debug",
+							"fields": { "lvl": "debug" }
+						  },
+						  "highlight": {
+								"message": [
+							  	"@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"
+								]
+						  },
+							"fields": {
+								"testtime": [ "2019-06-24T09:51:19.765Z" ]
+							}
+						},
+						{
+						  "_id": "kdospaidopa",
+						  "_type": "_doc",
+						  "_index": "mock-index",
+						  "_source": {
+							"testtime": "06/24/2019",
+							"host": "dsalkdakdop",
+							"number": 2,
+							"line": "hello, i am also message",
+							"level": "error",
+							"fields": { "lvl": "info" }
+						  },
+						  "highlight": {
+								"message": [
+							  	"@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"
+								]
+						  },
+							"fields": {
+								"testtime": [ "2019-06-24T09:52:19.765Z" ]
+							}
+						}
+					  ]
+					}
+				  }
+				]
+			}
+			`)
+		result, err := queryDataTest(query, response)
+		require.NoError(t, err)
+
+		require.Len(t, result.response.Responses, 1)
+		frames := result.response.Responses["A"].Frames
+		require.Len(t, frames, 1)
+
+		logsFrame := frames[0]
+
+		logsFieldMap := make(map[string]*data.Field)
+		for _, field := range logsFrame.Fields {
+			logsFieldMap[field.Name] = field
+		}
+		t0 := time.Date(2019, time.June, 24, 9, 51, 19, 765000000, time.UTC)
+		t1 := time.Date(2019, time.June, 24, 9, 52, 19, 765000000, time.UTC)
+		require.Contains(t, logsFieldMap, "testtime")
+		require.Equal(t, data.FieldTypeNullableTime, logsFieldMap["testtime"].Type())
+		require.Equal(t, &t0, logsFieldMap["testtime"].At(0))
+		require.Equal(t, &t1, logsFieldMap["testtime"].At(1))
+	})
 }
 
 func TestProcessRawDocumentResponse(t *testing.T) {
@@ -730,7 +814,7 @@ func TestProcessRawDocumentResponse(t *testing.T) {
   			]
 			}`
 
-		result, err := parseTestResponse(targets, response)
+		result, err := parseTestResponse(targets, response, false)
 		require.NoError(t, err)
 		require.Len(t, result.Responses, 1)
 
@@ -911,7 +995,7 @@ func TestProcessBuckets(t *testing.T) {
           }
         ]
 			}`
-			result, err := parseTestResponse(targets, response)
+			result, err := parseTestResponse(targets, response, false)
 			require.NoError(t, err)
 			require.Len(t, result.Responses, 1)
 
@@ -927,7 +1011,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "p75")
+			assert.Equal(t, frame.Name, "p75")
 
 			frame = dataframes[1]
 			require.Len(t, frame.Fields, 2)
@@ -935,7 +1019,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "p90")
+			assert.Equal(t, frame.Name, "p90")
 		})
 	})
 
@@ -1013,7 +1097,7 @@ func TestProcessBuckets(t *testing.T) {
          }
         ]
 			}`
-			result, err := parseTestResponse(targets, response)
+			result, err := parseTestResponse(targets, response, false)
 			require.NoError(t, err)
 			require.Len(t, result.Responses, 1)
 
@@ -1076,7 +1160,7 @@ func TestProcessBuckets(t *testing.T) {
 					}
 				]
 			}`
-			result, err := parseTestResponse(targets, response)
+			result, err := parseTestResponse(targets, response, false)
 			require.NoError(t, err)
 			require.Len(t, result.Responses, 1)
 
@@ -1149,7 +1233,7 @@ func TestProcessBuckets(t *testing.T) {
 			}]
 		}`
 
-			result, err := parseTestResponse(targets, response)
+			result, err := parseTestResponse(targets, response, false)
 			assert.Nil(t, err)
 			assert.Len(t, result.Responses, 1)
 			frames := result.Responses["A"].Frames
@@ -1380,7 +1464,7 @@ func TestProcessBuckets(t *testing.T) {
 				}
 			}]
 		}`
-			result, err := parseTestResponse(targets, response)
+			result, err := parseTestResponse(targets, response, false)
 			assert.Nil(t, err)
 			assert.Len(t, result.Responses, 1)
 
@@ -1394,7 +1478,7 @@ func TestProcessBuckets(t *testing.T) {
 			assert.Len(t, frame.Fields, 2)
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Top Metrics @value")
+			assert.Equal(t, frame.Name, "Top Metrics @value")
 			v, _ := frame.FloatAt(0, 0)
 			assert.Equal(t, 1609459200000., v)
 			v, _ = frame.FloatAt(1, 0)
@@ -1411,7 +1495,7 @@ func TestProcessBuckets(t *testing.T) {
 			assert.Len(t, frame.Fields, 2)
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Top Metrics @anotherValue")
+			assert.Equal(t, frame.Name, "Top Metrics @anotherValue")
 			v, _ = frame.FloatAt(0, 0)
 			assert.Equal(t, 1609459200000., v)
 			v, _ = frame.FloatAt(1, 0)
@@ -1467,7 +1551,7 @@ func TestProcessBuckets(t *testing.T) {
 			}]
 		}`
 
-			result, err := parseTestResponse(targets, response)
+			result, err := parseTestResponse(targets, response, false)
 			assert.Nil(t, err)
 			assert.Len(t, result.Responses, 1)
 			frames := result.Responses["A"].Frames
@@ -1665,7 +1749,69 @@ func TestProcessBuckets(t *testing.T) {
           }
         ]
 			}`
-			result, err := parseTestResponse(targets, response)
+			result, err := parseTestResponse(targets, response, false)
+			require.NoError(t, err)
+
+			queryRes := result.Responses["A"]
+			require.NotNil(t, queryRes)
+			dataframes := queryRes.Frames
+			require.NoError(t, err)
+			require.Len(t, dataframes, 2)
+
+			frame := dataframes[0]
+			require.Len(t, frame.Fields, 2)
+			require.Equal(t, frame.Fields[0].Name, data.TimeSeriesTimeFieldName)
+			require.Equal(t, frame.Fields[0].Len(), 2)
+			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
+			require.Equal(t, frame.Fields[1].Len(), 2)
+			assert.Equal(t, frame.Name, "server1")
+
+			frame = dataframes[1]
+			require.Len(t, frame.Fields, 2)
+			require.Equal(t, frame.Fields[0].Name, data.TimeSeriesTimeFieldName)
+			require.Equal(t, frame.Fields[0].Len(), 2)
+			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
+			require.Equal(t, frame.Fields[1].Len(), 2)
+			assert.Equal(t, frame.Name, "server2")
+		})
+
+		t.Run("Single group by query one metric with true keepLabelsInResponse", func(t *testing.T) {
+			targets := map[string]string{
+				"A": `{
+					"metrics": [{ "type": "count", "id": "1" }],
+          "bucketAggs": [
+						{ "type": "terms", "field": "host", "id": "2" },
+						{ "type": "date_histogram", "field": "@timestamp", "id": "3" }
+					]
+				}`,
+			}
+			response := `{
+        "responses": [
+          {
+            "aggregations": {
+              "2": {
+                "buckets": [
+                  {
+                    "3": {
+                      "buckets": [{ "doc_count": 1, "key": 1000 }, { "doc_count": 3, "key": 2000 }]
+                    },
+                    "doc_count": 4,
+                    "key": "server1"
+                  },
+                  {
+                    "3": {
+                      "buckets": [{ "doc_count": 2, "key": 1000 }, { "doc_count": 8, "key": 2000 }]
+                    },
+                    "doc_count": 10,
+                    "key": "server2"
+                  }
+                ]
+              }
+            }
+          }
+        ]
+			}`
+			result, err := parseTestResponse(targets, response, true)
 			require.NoError(t, err)
 
 			queryRes := result.Responses["A"]
@@ -1680,6 +1826,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
+			require.Equal(t, frame.Fields[1].Labels, data.Labels{"host": "server1"})
 			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server1")
 
 			frame = dataframes[1]
@@ -1688,6 +1835,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
+			require.Equal(t, frame.Fields[1].Labels, data.Labels{"host": "server2"})
 			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server2")
 		})
 
@@ -1733,7 +1881,7 @@ func TestProcessBuckets(t *testing.T) {
           }
         ]
 			}`
-			result, err := parseTestResponse(targets, response)
+			result, err := parseTestResponse(targets, response, false)
 			require.NoError(t, err)
 			require.Len(t, result.Responses, 1)
 
@@ -1749,7 +1897,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server1 Count")
+			assert.Equal(t, frame.Name, "server1 Count")
 
 			frame = dataframes[1]
 			require.Len(t, frame.Fields, 2)
@@ -1757,7 +1905,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server1 Average @value")
+			assert.Equal(t, frame.Name, "server1 Average @value")
 
 			frame = dataframes[2]
 			require.Len(t, frame.Fields, 2)
@@ -1765,7 +1913,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server2 Count")
+			assert.Equal(t, frame.Name, "server2 Count")
 
 			frame = dataframes[3]
 			require.Len(t, frame.Fields, 2)
@@ -1773,7 +1921,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server2 Average @value")
+			assert.Equal(t, frame.Name, "server2 Average @value")
 		})
 
 		t.Run("Simple group by 2 metrics 4 frames", func(t *testing.T) {
@@ -1885,7 +2033,7 @@ func TestProcessBuckets(t *testing.T) {
           }
         ]
 			}`
-			result, err := parseTestResponse(targets, response)
+			result, err := parseTestResponse(targets, response, false)
 			require.NoError(t, err)
 			require.Len(t, result.Responses, 1)
 
@@ -1901,7 +2049,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server1 Count and {{not_exist}} server1")
+			assert.Equal(t, frame.Name, "server1 Count and {{not_exist}} server1")
 
 			frame = dataframes[1]
 			require.Len(t, frame.Fields, 2)
@@ -1909,7 +2057,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server2 Count and {{not_exist}} server2")
+			assert.Equal(t, frame.Name, "server2 Count and {{not_exist}} server2")
 
 			frame = dataframes[2]
 			require.Len(t, frame.Fields, 2)
@@ -1917,7 +2065,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "0 Count and {{not_exist}} 0")
+			assert.Equal(t, frame.Name, "0 Count and {{not_exist}} 0")
 		})
 	})
 
@@ -2058,7 +2206,7 @@ func TestProcessBuckets(t *testing.T) {
           }
         ]
 			}`
-			result, err := parseTestResponse(targets, response)
+			result, err := parseTestResponse(targets, response, false)
 			require.NoError(t, err)
 			require.Len(t, result.Responses, 1)
 
@@ -2074,7 +2222,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 1)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 1)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server1 Max")
+			assert.Equal(t, frame.Name, "server1 Max")
 
 			frame = dataframes[1]
 			require.Len(t, frame.Fields, 2)
@@ -2082,7 +2230,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 1)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 1)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server1 Std Dev Lower")
+			assert.Equal(t, frame.Name, "server1 Std Dev Lower")
 
 			frame = dataframes[2]
 			require.Len(t, frame.Fields, 2)
@@ -2090,7 +2238,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 1)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 1)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server1 Std Dev Upper")
+			assert.Equal(t, frame.Name, "server1 Std Dev Upper")
 
 			frame = dataframes[3]
 			require.Len(t, frame.Fields, 2)
@@ -2098,7 +2246,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 1)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 1)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server2 Max")
+			assert.Equal(t, frame.Name, "server2 Max")
 
 			frame = dataframes[4]
 			require.Len(t, frame.Fields, 2)
@@ -2106,7 +2254,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 1)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 1)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server2 Std Dev Lower")
+			assert.Equal(t, frame.Name, "server2 Std Dev Lower")
 
 			frame = dataframes[5]
 			require.Len(t, frame.Fields, 2)
@@ -2114,7 +2262,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 1)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 1)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "server2 Std Dev Upper")
+			assert.Equal(t, frame.Name, "server2 Std Dev Upper")
 		})
 	})
 
@@ -2190,7 +2338,7 @@ func TestProcessBuckets(t *testing.T) {
           }
         ]
 			}`
-			result, err := parseTestResponse(targets, response)
+			result, err := parseTestResponse(targets, response, false)
 			require.NoError(t, err)
 			require.Len(t, result.Responses, 1)
 
@@ -2206,7 +2354,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Count")
+			assert.Equal(t, frame.Name, "Count")
 		})
 
 		t.Run("Simple query count & avg aggregation", func(t *testing.T) {
@@ -2238,7 +2386,7 @@ func TestProcessBuckets(t *testing.T) {
           }
         ]
 			}`
-			result, err := parseTestResponse(targets, response)
+			result, err := parseTestResponse(targets, response, false)
 			require.NoError(t, err)
 			require.Len(t, result.Responses, 1)
 
@@ -2255,7 +2403,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Count")
+			assert.Equal(t, frame.Name, "Count")
 
 			frame = dataframes[1]
 			require.Len(t, frame.Fields, 2)
@@ -2264,7 +2412,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Average value")
+			assert.Equal(t, frame.Name, "Average value")
 		})
 	})
 
@@ -2300,7 +2448,7 @@ func TestProcessBuckets(t *testing.T) {
           }
         ]
 			}`
-			result, err := parseTestResponse(targets, response)
+			result, err := parseTestResponse(targets, response, false)
 			require.NoError(t, err)
 			require.Len(t, result.Responses, 1)
 
@@ -2422,7 +2570,7 @@ func TestProcessBuckets(t *testing.T) {
           }
         ]
 			}`
-			result, err := parseTestResponse(targets, response)
+			result, err := parseTestResponse(targets, response, false)
 			require.NoError(t, err)
 			require.Len(t, result.Responses, 1)
 
@@ -2438,7 +2586,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "@metric:cpu")
+			assert.Equal(t, frame.Name, "@metric:cpu")
 
 			frame = dataframes[1]
 			require.Len(t, frame.Fields, 2)
@@ -2446,7 +2594,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "@metric:logins.count")
+			assert.Equal(t, frame.Name, "@metric:logins.count")
 		})
 	})
 
@@ -2525,7 +2673,7 @@ func TestProcessBuckets(t *testing.T) {
           }
         ]
 			}`
-			result, err := parseTestResponse(targets, response)
+			result, err := parseTestResponse(targets, response, false)
 			require.NoError(t, err)
 			require.Len(t, result.Responses, 1)
 
@@ -2575,7 +2723,7 @@ func TestProcessBuckets(t *testing.T) {
          }
         ]
 			}`
-			result, err := parseTestResponse(targets, response)
+			result, err := parseTestResponse(targets, response, false)
 			require.NoError(t, err)
 			require.Len(t, result.Responses, 1)
 
@@ -2637,7 +2785,7 @@ func TestProcessBuckets(t *testing.T) {
           }
         ]
 			}`
-			result, err := parseTestResponse(targets, response)
+			result, err := parseTestResponse(targets, response, false)
 			require.NoError(t, err)
 			require.Len(t, result.Responses, 1)
 
@@ -2653,7 +2801,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 1)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 1)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Average")
+			assert.Equal(t, frame.Name, "Average")
 
 			frame = dataframes[1]
 			require.Len(t, frame.Fields, 2)
@@ -2661,7 +2809,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 1)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 1)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Count")
+			assert.Equal(t, frame.Name, "Count")
 		})
 
 		t.Run("With drop first and last aggregation (string)", func(t *testing.T) {
@@ -2705,7 +2853,7 @@ func TestProcessBuckets(t *testing.T) {
           }
         ]
 			}`
-			result, err := parseTestResponse(targets, response)
+			result, err := parseTestResponse(targets, response, false)
 			require.NoError(t, err)
 			require.Len(t, result.Responses, 1)
 
@@ -2721,7 +2869,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 1)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 1)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Average")
+			assert.Equal(t, frame.Name, "Average")
 
 			frame = dataframes[1]
 			require.Len(t, frame.Fields, 2)
@@ -2729,7 +2877,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 1)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 1)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Count")
+			assert.Equal(t, frame.Name, "Count")
 		})
 	})
 
@@ -2769,7 +2917,7 @@ func TestProcessBuckets(t *testing.T) {
           }
         ]
 			}`
-			result, err := parseTestResponse(targets, response)
+			result, err := parseTestResponse(targets, response, false)
 
 			require.NoError(t, err)
 			require.Len(t, result.Responses, 1)
@@ -2823,7 +2971,7 @@ func TestProcessBuckets(t *testing.T) {
           }
         ]
 			}`
-			result, err := parseTestResponse(targets, response)
+			result, err := parseTestResponse(targets, response, false)
 			require.NoError(t, err)
 			require.Len(t, result.Responses, 1)
 
@@ -2839,7 +2987,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Sum @value")
+			assert.Equal(t, frame.Name, "Sum @value")
 
 			frame = dataframes[1]
 			require.Len(t, frame.Fields, 2)
@@ -2847,7 +2995,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Max @value")
+			assert.Equal(t, frame.Name, "Max @value")
 
 			frame = dataframes[2]
 			require.Len(t, frame.Fields, 2)
@@ -2855,7 +3003,7 @@ func TestProcessBuckets(t *testing.T) {
 			require.Equal(t, frame.Fields[0].Len(), 2)
 			require.Equal(t, frame.Fields[1].Name, data.TimeSeriesValueFieldName)
 			require.Equal(t, frame.Fields[1].Len(), 2)
-			assert.Equal(t, frame.Fields[1].Config.DisplayNameFromDS, "Sum @value * Max @value")
+			assert.Equal(t, frame.Name, "Sum @value * Max @value")
 		})
 
 		t.Run("Two bucket_script", func(t *testing.T) {
@@ -3499,7 +3647,7 @@ func TestTrimEdges(t *testing.T) {
 	requireFrameLength(t, frames[0], 1)
 }
 
-func parseTestResponse(tsdbQueries map[string]string, responseBody string) (*backend.QueryDataResponse, error) {
+func parseTestResponse(tsdbQueries map[string]string, responseBody string, keepLabelsInResponse bool) (*backend.QueryDataResponse, error) {
 	from := time.Date(2018, 5, 15, 17, 50, 0, 0, time.UTC)
 	to := time.Date(2018, 5, 15, 17, 55, 0, 0, time.UTC)
 	configuredFields := es.ConfiguredFields{
@@ -3534,7 +3682,7 @@ func parseTestResponse(tsdbQueries map[string]string, responseBody string) (*bac
 		return nil, err
 	}
 
-	return parseResponse(context.Background(), response.Responses, queries, configuredFields, log.New("test.logger"), tracing.InitializeTracerForTest())
+	return parseResponse(context.Background(), response.Responses, queries, configuredFields, keepLabelsInResponse, log.New("test.logger"), tracing.InitializeTracerForTest())
 }
 
 func requireTimeValue(t *testing.T, expected int64, frame *data.Frame, index int) {
@@ -3588,16 +3736,5 @@ func requireFloatAt(t *testing.T, expected float64, field *data.Field, index int
 }
 
 func requireTimeSeriesName(t *testing.T, expected string, frame *data.Frame) {
-	getField := func() *data.Field {
-		for _, field := range frame.Fields {
-			if field.Type() != data.FieldTypeTime {
-				return field
-			}
-		}
-		return nil
-	}
-
-	field := getField()
-	require.NotNil(t, expected, field.Config)
-	require.Equal(t, expected, field.Config.DisplayNameFromDS)
+	require.Equal(t, expected, frame.Name)
 }
diff --git a/pkg/tsdb/elasticsearch/testdata/trimedges_string.golden.jsonc b/pkg/tsdb/elasticsearch/testdata/trimedges_string.golden.jsonc
index b16bfc9bd9aae..17c3bb3eef8d3 100644
--- a/pkg/tsdb/elasticsearch/testdata/trimedges_string.golden.jsonc
+++ b/pkg/tsdb/elasticsearch/testdata/trimedges_string.golden.jsonc
@@ -7,7 +7,7 @@
 //          0
 //      ]
 //  }
-//  Name: 
+//  Name: Count
 //  Dimensions: 2 Fields by 3 Rows
 //  +-------------------------------+------------------+
 //  | Name: Time                    | Name: Value      |
@@ -26,6 +26,7 @@
   "frames": [
     {
       "schema": {
+        "name": "Count",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -47,10 +48,6 @@
             "typeInfo": {
               "frame": "float64",
               "nullable": true
-            },
-            "labels": {},
-            "config": {
-              "displayNameFromDS": "Count"
             }
           }
         ]
diff --git a/pkg/tsdb/elasticsearch/testdata_request/raw_data.request.line1.json b/pkg/tsdb/elasticsearch/testdata_request/raw_data.request.line1.json
index 63ac3f3b5b731..c11c28bd80554 100644
--- a/pkg/tsdb/elasticsearch/testdata_request/raw_data.request.line1.json
+++ b/pkg/tsdb/elasticsearch/testdata_request/raw_data.request.line1.json
@@ -26,5 +26,12 @@
       "_doc": {
         "order": "desc"
       }
-    }
+    },
+  "fields": 
+    [ 
+      {
+        "field": "testtime",
+        "format": "strict_date_optional_time_nanos"
+      }
+    ]
 }
\ No newline at end of file
diff --git a/pkg/tsdb/elasticsearch/testdata_response/logs.a.golden.jsonc b/pkg/tsdb/elasticsearch/testdata_response/logs.a.golden.jsonc
index 9fe7a4c133745..105279a888ebf 100644
--- a/pkg/tsdb/elasticsearch/testdata_response/logs.a.golden.jsonc
+++ b/pkg/tsdb/elasticsearch/testdata_response/logs.a.golden.jsonc
@@ -19,7 +19,7 @@
 //  +-----------------------------------+---------------------------+----------------------+-----------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------+-----------------+------------------+--------------------+--------------------------------------------------------------------------------------------------------------------------------+--------------------------------------+---------------+-----------------+-----------------+-----------------------------------------+------------------------------------+---------------------------------------------------------------------------------+--------------------------+
 //  | Name: testtime                    | Name: line                | Name: _id            | Name: _index    | Name: _source                                                                                                                                                                                                                                                                                                                                 | Name: _type              | Name: abc       | Name: counter    | Name: float        | Name: highlight                                                                                                                | Name: id                             | Name: is_true | Name: label     | Name: level     | Name: location                          | Name: nested_field.internal.nested | Name: shapes                                                                    | Name: sort               |
 //  | Labels:                           | Labels:                   | Labels:              | Labels:         | Labels:                                                                                                                                                                                                                                                                                                                                       | Labels:                  | Labels:         | Labels:          | Labels:            | Labels:                                                                                                                        | Labels:                              | Labels:       | Labels:         | Labels:         | Labels:                                 | Labels:                            | Labels:                                                                         | Labels:                  |
-//  | Type: []*time.Time                | Type: []*string           | Type: []*string      | Type: []*string | Type: []*json.RawMessage                                                                                                                                                                                                                                                                                                                      | Type: []*json.RawMessage | Type: []*string | Type: []*float64 | Type: []*float64   | Type: []*json.RawMessage                                                                                                       | Type: []*string                      | Type: []*bool | Type: []*string | Type: []*string | Type: []*string                         | Type: []*string                    | Type: []*json.RawMessage                                                        | Type: []*json.RawMessage |
+//  | Type: []*time.Time                | Type: []*string           | Type: []*string      | Type: []*string | Type: []*string                                                                                                                                                                                                                                                                                                                               | Type: []*json.RawMessage | Type: []*string | Type: []*float64 | Type: []*float64   | Type: []*json.RawMessage                                                                                                       | Type: []*string                      | Type: []*bool | Type: []*string | Type: []*string | Type: []*string                         | Type: []*string                    | Type: []*json.RawMessage                                                        | Type: []*json.RawMessage |
 //  +-----------------------------------+---------------------------+----------------------+-----------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------+-----------------+------------------+--------------------+--------------------------------------------------------------------------------------------------------------------------------+--------------------------------------+---------------+-----------------+-----------------+-----------------------------------------+------------------------------------+---------------------------------------------------------------------------------+--------------------------+
 //  | 2023-02-09 14:40:01.475 +0000 UTC | log text  [106619125]     | g2aeNoYB7vaC3bq-ezfK | logs-2023.02.09 | {"abc":null,"counter":81,"float":10.911972180833306,"is_true":true,"label":"val3","line":"log text  [106619125]","location":"-42.73465234425797, -14.097854057104112","lvl":"info","nested_field.internal.nested":"value1","shapes":[{"type":"triangle"},{"type":"triangle"},{"type":"triangle"},{"type":"square"}],"testtime":"09/02/2023"}  | null                     | null            | 81               | 10.911972180833306 | {"duplicated":["@HIGHLIGHT@hello@/HIGHLIGHT@"],"line":["@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"]} | logs-2023.02.09#g2aeNoYB7vaC3bq-ezfK | true          | val3            | info            | -42.73465234425797, -14.097854057104112 | value1                             | [{"type":"triangle"},{"type":"triangle"},{"type":"triangle"},{"type":"square"}] | [1675953601475,4]        |
 //  | 2023-02-09 14:40:00.513 +0000 UTC | log text with [781660944] | gmaeNoYB7vaC3bq-eDcN | logs-2023.02.09 | {"abc":null,"counter":80,"float":62.94120607636795,"is_true":false,"label":"val3","line":"log text with [781660944]","location":"42.07571917624318, 15.95725088484611","lvl":"error","nested_field.internal.nested":"value2","shapes":[{"type":"triangle"},{"type":"square"}],"testtime":"09/02/2023"}                                        | null                     | null            | 80               | 62.94120607636795  | {"duplicated":["@HIGHLIGHT@hello@/HIGHLIGHT@"],"line":["@HIGHLIGHT@hello@/HIGHLIGHT@, i am a @HIGHLIGHT@message@/HIGHLIGHT@"]} | logs-2023.02.09#gmaeNoYB7vaC3bq-eDcN | false         | val3            | error           | 42.07571917624318, 15.95725088484611    | value2                             | [{"type":"triangle"},{"type":"square"}]                                         | [1675953600513,7]        |
@@ -96,9 +96,9 @@
           },
           {
             "name": "_source",
-            "type": "other",
+            "type": "string",
             "typeInfo": {
-              "frame": "json.RawMessage",
+              "frame": "string",
               "nullable": true
             },
             "config": {
@@ -281,124 +281,11 @@
             "logs-2023.02.09"
           ],
           [
-            {
-              "abc": null,
-              "counter": 81,
-              "float": 10.911972180833306,
-              "is_true": true,
-              "label": "val3",
-              "line": "log text  [106619125]",
-              "location": "-42.73465234425797, -14.097854057104112",
-              "lvl": "info",
-              "nested_field.internal.nested": "value1",
-              "shapes": [
-                {
-                  "type": "triangle"
-                },
-                {
-                  "type": "triangle"
-                },
-                {
-                  "type": "triangle"
-                },
-                {
-                  "type": "square"
-                }
-              ],
-              "testtime": "09/02/2023"
-            },
-            {
-              "abc": null,
-              "counter": 80,
-              "float": 62.94120607636795,
-              "is_true": false,
-              "label": "val3",
-              "line": "log text with [781660944]",
-              "location": "42.07571917624318, 15.95725088484611",
-              "lvl": "error",
-              "nested_field.internal.nested": "value2",
-              "shapes": [
-                {
-                  "type": "triangle"
-                },
-                {
-                  "type": "square"
-                }
-              ],
-              "testtime": "09/02/2023"
-            },
-            {
-              "abc": "def",
-              "counter": 79,
-              "float": 53.323706427230455,
-              "is_true": true,
-              "label": "val1",
-              "line": "log text  [894867430]",
-              "location": "-38.27341566189766, -23.66739642570781",
-              "lvl": "info",
-              "nested_field.internal.nested": "value3",
-              "shapes": [
-                {
-                  "type": "triangle"
-                },
-                {
-                  "type": "square"
-                }
-              ],
-              "testtime": "09/02/2023"
-            },
-            {
-              "abc": "def",
-              "counter": 78,
-              "float": 82.72012623471589,
-              "is_true": false,
-              "label": "val1",
-              "line": "log text  [478598889]",
-              "location": "12.373240290451287, 43.265493464362024",
-              "lvl": "info",
-              "nested_field.internal.nested": "value4",
-              "shapes": [
-                {
-                  "type": "triangle"
-                },
-                {
-                  "type": "triangle"
-                },
-                {
-                  "type": "triangle"
-                },
-                {
-                  "type": "square"
-                }
-              ],
-              "testtime": "09/02/2023"
-            },
-            {
-              "abc": "def",
-              "counter": 77,
-              "float": 35.05784443331803,
-              "is_true": false,
-              "label": "val3",
-              "line": "log text  [526995818]",
-              "location": "-31.524344042228194, -32.11254790120572",
-              "lvl": "info",
-              "nested_field.internal.nested": "value5",
-              "shapes": [
-                {
-                  "type": "triangle"
-                },
-                {
-                  "type": "triangle"
-                },
-                {
-                  "type": "triangle"
-                },
-                {
-                  "type": "square"
-                }
-              ],
-              "testtime": "09/02/2023"
-            }
+            "{\"abc\":null,\"counter\":81,\"float\":10.911972180833306,\"is_true\":true,\"label\":\"val3\",\"line\":\"log text  [106619125]\",\"location\":\"-42.73465234425797, -14.097854057104112\",\"lvl\":\"info\",\"nested_field.internal.nested\":\"value1\",\"shapes\":[{\"type\":\"triangle\"},{\"type\":\"triangle\"},{\"type\":\"triangle\"},{\"type\":\"square\"}],\"testtime\":\"09/02/2023\"}",
+            "{\"abc\":null,\"counter\":80,\"float\":62.94120607636795,\"is_true\":false,\"label\":\"val3\",\"line\":\"log text with [781660944]\",\"location\":\"42.07571917624318, 15.95725088484611\",\"lvl\":\"error\",\"nested_field.internal.nested\":\"value2\",\"shapes\":[{\"type\":\"triangle\"},{\"type\":\"square\"}],\"testtime\":\"09/02/2023\"}",
+            "{\"abc\":\"def\",\"counter\":79,\"float\":53.323706427230455,\"is_true\":true,\"label\":\"val1\",\"line\":\"log text  [894867430]\",\"location\":\"-38.27341566189766, -23.66739642570781\",\"lvl\":\"info\",\"nested_field.internal.nested\":\"value3\",\"shapes\":[{\"type\":\"triangle\"},{\"type\":\"square\"}],\"testtime\":\"09/02/2023\"}",
+            "{\"abc\":\"def\",\"counter\":78,\"float\":82.72012623471589,\"is_true\":false,\"label\":\"val1\",\"line\":\"log text  [478598889]\",\"location\":\"12.373240290451287, 43.265493464362024\",\"lvl\":\"info\",\"nested_field.internal.nested\":\"value4\",\"shapes\":[{\"type\":\"triangle\"},{\"type\":\"triangle\"},{\"type\":\"triangle\"},{\"type\":\"square\"}],\"testtime\":\"09/02/2023\"}",
+            "{\"abc\":\"def\",\"counter\":77,\"float\":35.05784443331803,\"is_true\":false,\"label\":\"val3\",\"line\":\"log text  [526995818]\",\"location\":\"-31.524344042228194, -32.11254790120572\",\"lvl\":\"info\",\"nested_field.internal.nested\":\"value5\",\"shapes\":[{\"type\":\"triangle\"},{\"type\":\"triangle\"},{\"type\":\"triangle\"},{\"type\":\"square\"}],\"testtime\":\"09/02/2023\"}"
           ],
           [
             null,
diff --git a/pkg/tsdb/elasticsearch/testdata_response/metric_avg.a.golden.jsonc b/pkg/tsdb/elasticsearch/testdata_response/metric_avg.a.golden.jsonc
index 22005bf997fe4..cb6395c9e372f 100644
--- a/pkg/tsdb/elasticsearch/testdata_response/metric_avg.a.golden.jsonc
+++ b/pkg/tsdb/elasticsearch/testdata_response/metric_avg.a.golden.jsonc
@@ -7,7 +7,7 @@
 //          0
 //      ]
 //  }
-//  Name: 
+//  Name: Average counter
 //  Dimensions: 2 Fields by 3 Rows
 //  +-----------------------------------+------------------+
 //  | Name: Time                        | Name: Value      |
@@ -26,6 +26,7 @@
   "frames": [
     {
       "schema": {
+        "name": "Average counter",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -47,10 +48,6 @@
             "typeInfo": {
               "frame": "float64",
               "nullable": true
-            },
-            "labels": {},
-            "config": {
-              "displayNameFromDS": "Average counter"
             }
           }
         ]
diff --git a/pkg/tsdb/elasticsearch/testdata_response/metric_complex.a.golden.jsonc b/pkg/tsdb/elasticsearch/testdata_response/metric_complex.a.golden.jsonc
index cbbf26e2fd868..2013b3542efa1 100644
--- a/pkg/tsdb/elasticsearch/testdata_response/metric_complex.a.golden.jsonc
+++ b/pkg/tsdb/elasticsearch/testdata_response/metric_complex.a.golden.jsonc
@@ -7,17 +7,17 @@
 //          0
 //      ]
 //  }
-//  Name: 
+//  Name: val3 Max float
 //  Dimensions: 2 Fields by 3 Rows
-//  +-------------------------------+--------------------+
-//  | Name: Time                    | Name: Value        |
-//  | Labels:                       | Labels: label=val3 |
-//  | Type: []time.Time             | Type: []*float64   |
-//  +-------------------------------+--------------------+
-//  | 2022-11-22 12:45:00 +0000 UTC | 97.85990905761719  |
-//  | 2022-11-22 12:46:00 +0000 UTC | 98.39459228515625  |
-//  | 2022-11-22 12:47:00 +0000 UTC | 99.76652526855469  |
-//  +-------------------------------+--------------------+
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels:           |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2022-11-22 12:45:00 +0000 UTC | 97.85990905761719 |
+//  | 2022-11-22 12:46:00 +0000 UTC | 98.39459228515625 |
+//  | 2022-11-22 12:47:00 +0000 UTC | 99.76652526855469 |
+//  +-------------------------------+-------------------+
 //  
 //  
 //  
@@ -28,11 +28,11 @@
 //          0
 //      ]
 //  }
-//  Name: 
+//  Name: val3 Min float
 //  Dimensions: 2 Fields by 3 Rows
 //  +-------------------------------+--------------------+
 //  | Name: Time                    | Name: Value        |
-//  | Labels:                       | Labels: label=val3 |
+//  | Labels:                       | Labels:            |
 //  | Type: []time.Time             | Type: []*float64   |
 //  +-------------------------------+--------------------+
 //  | 2022-11-22 12:45:00 +0000 UTC | 8.375883102416992  |
@@ -49,17 +49,17 @@
 //          0
 //      ]
 //  }
-//  Name: 
+//  Name: val2 Max float
 //  Dimensions: 2 Fields by 3 Rows
-//  +-------------------------------+--------------------+
-//  | Name: Time                    | Name: Value        |
-//  | Labels:                       | Labels: label=val2 |
-//  | Type: []time.Time             | Type: []*float64   |
-//  +-------------------------------+--------------------+
-//  | 2022-11-22 12:45:00 +0000 UTC | 87.77692413330078  |
-//  | 2022-11-22 12:46:00 +0000 UTC | 98.47160339355469  |
-//  | 2022-11-22 12:47:00 +0000 UTC | 92.53878784179688  |
-//  +-------------------------------+--------------------+
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels:           |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2022-11-22 12:45:00 +0000 UTC | 87.77692413330078 |
+//  | 2022-11-22 12:46:00 +0000 UTC | 98.47160339355469 |
+//  | 2022-11-22 12:47:00 +0000 UTC | 92.53878784179688 |
+//  +-------------------------------+-------------------+
 //  
 //  
 //  
@@ -70,11 +70,11 @@
 //          0
 //      ]
 //  }
-//  Name: 
+//  Name: val2 Min float
 //  Dimensions: 2 Fields by 3 Rows
 //  +-------------------------------+--------------------+
 //  | Name: Time                    | Name: Value        |
-//  | Labels:                       | Labels: label=val2 |
+//  | Labels:                       | Labels:            |
 //  | Type: []time.Time             | Type: []*float64   |
 //  +-------------------------------+--------------------+
 //  | 2022-11-22 12:45:00 +0000 UTC | 4.540984630584717  |
@@ -91,17 +91,17 @@
 //          0
 //      ]
 //  }
-//  Name: 
+//  Name: val1 Max float
 //  Dimensions: 2 Fields by 3 Rows
-//  +-------------------------------+--------------------+
-//  | Name: Time                    | Name: Value        |
-//  | Labels:                       | Labels: label=val1 |
-//  | Type: []time.Time             | Type: []*float64   |
-//  +-------------------------------+--------------------+
-//  | 2022-11-22 12:45:00 +0000 UTC | 98.57181549072266  |
-//  | 2022-11-22 12:46:00 +0000 UTC | 97.99356079101562  |
-//  | 2022-11-22 12:47:00 +0000 UTC | 94.45416259765625  |
-//  +-------------------------------+--------------------+
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels:           |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2022-11-22 12:45:00 +0000 UTC | 98.57181549072266 |
+//  | 2022-11-22 12:46:00 +0000 UTC | 97.99356079101562 |
+//  | 2022-11-22 12:47:00 +0000 UTC | 94.45416259765625 |
+//  +-------------------------------+-------------------+
 //  
 //  
 //  
@@ -112,11 +112,11 @@
 //          0
 //      ]
 //  }
-//  Name: 
+//  Name: val1 Min float
 //  Dimensions: 2 Fields by 3 Rows
 //  +-------------------------------+--------------------+
 //  | Name: Time                    | Name: Value        |
-//  | Labels:                       | Labels: label=val1 |
+//  | Labels:                       | Labels:            |
 //  | Type: []time.Time             | Type: []*float64   |
 //  +-------------------------------+--------------------+
 //  | 2022-11-22 12:45:00 +0000 UTC | 2.859630584716797  |
@@ -131,6 +131,7 @@
   "frames": [
     {
       "schema": {
+        "name": "val3 Max float",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -152,12 +153,6 @@
             "typeInfo": {
               "frame": "float64",
               "nullable": true
-            },
-            "labels": {
-              "label": "val3"
-            },
-            "config": {
-              "displayNameFromDS": "val3 Max float"
             }
           }
         ]
@@ -179,6 +174,7 @@
     },
     {
       "schema": {
+        "name": "val3 Min float",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -200,12 +196,6 @@
             "typeInfo": {
               "frame": "float64",
               "nullable": true
-            },
-            "labels": {
-              "label": "val3"
-            },
-            "config": {
-              "displayNameFromDS": "val3 Min float"
             }
           }
         ]
@@ -227,6 +217,7 @@
     },
     {
       "schema": {
+        "name": "val2 Max float",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -248,12 +239,6 @@
             "typeInfo": {
               "frame": "float64",
               "nullable": true
-            },
-            "labels": {
-              "label": "val2"
-            },
-            "config": {
-              "displayNameFromDS": "val2 Max float"
             }
           }
         ]
@@ -275,6 +260,7 @@
     },
     {
       "schema": {
+        "name": "val2 Min float",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -296,12 +282,6 @@
             "typeInfo": {
               "frame": "float64",
               "nullable": true
-            },
-            "labels": {
-              "label": "val2"
-            },
-            "config": {
-              "displayNameFromDS": "val2 Min float"
             }
           }
         ]
@@ -323,6 +303,7 @@
     },
     {
       "schema": {
+        "name": "val1 Max float",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -344,12 +325,6 @@
             "typeInfo": {
               "frame": "float64",
               "nullable": true
-            },
-            "labels": {
-              "label": "val1"
-            },
-            "config": {
-              "displayNameFromDS": "val1 Max float"
             }
           }
         ]
@@ -371,6 +346,7 @@
     },
     {
       "schema": {
+        "name": "val1 Min float",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -392,12 +368,6 @@
             "typeInfo": {
               "frame": "float64",
               "nullable": true
-            },
-            "labels": {
-              "label": "val1"
-            },
-            "config": {
-              "displayNameFromDS": "val1 Min float"
             }
           }
         ]
diff --git a/pkg/tsdb/elasticsearch/testdata_response/metric_extended_stats.a.golden.jsonc b/pkg/tsdb/elasticsearch/testdata_response/metric_extended_stats.a.golden.jsonc
index 6b51aa3398847..dcaacd9ed857b 100644
--- a/pkg/tsdb/elasticsearch/testdata_response/metric_extended_stats.a.golden.jsonc
+++ b/pkg/tsdb/elasticsearch/testdata_response/metric_extended_stats.a.golden.jsonc
@@ -7,7 +7,7 @@
 //          0
 //      ]
 //  }
-//  Name: 
+//  Name: Std Dev Lower counter
 //  Dimensions: 2 Fields by 3 Rows
 //  +-----------------------------------+--------------------+
 //  | Name: Time                        | Name: Value        |
@@ -28,7 +28,7 @@
 //          0
 //      ]
 //  }
-//  Name: 
+//  Name: Std Dev Upper counter
 //  Dimensions: 2 Fields by 3 Rows
 //  +-----------------------------------+--------------------+
 //  | Name: Time                        | Name: Value        |
@@ -47,6 +47,7 @@
   "frames": [
     {
       "schema": {
+        "name": "Std Dev Lower counter",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -68,10 +69,6 @@
             "typeInfo": {
               "frame": "float64",
               "nullable": true
-            },
-            "labels": {},
-            "config": {
-              "displayNameFromDS": "Std Dev Lower counter"
             }
           }
         ]
@@ -93,6 +90,7 @@
     },
     {
       "schema": {
+        "name": "Std Dev Upper counter",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -114,10 +112,6 @@
             "typeInfo": {
               "frame": "float64",
               "nullable": true
-            },
-            "labels": {},
-            "config": {
-              "displayNameFromDS": "Std Dev Upper counter"
             }
           }
         ]
diff --git a/pkg/tsdb/elasticsearch/testdata_response/metric_multi.a.golden.jsonc b/pkg/tsdb/elasticsearch/testdata_response/metric_multi.a.golden.jsonc
index 7ca6e62de3a1d..094f675aa33c9 100644
--- a/pkg/tsdb/elasticsearch/testdata_response/metric_multi.a.golden.jsonc
+++ b/pkg/tsdb/elasticsearch/testdata_response/metric_multi.a.golden.jsonc
@@ -7,7 +7,7 @@
 //          0
 //      ]
 //  }
-//  Name: 
+//  Name: Max float
 //  Dimensions: 2 Fields by 3 Rows
 //  +-------------------------------+-------------------+
 //  | Name: Time                    | Name: Value       |
@@ -26,6 +26,7 @@
   "frames": [
     {
       "schema": {
+        "name": "Max float",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -47,10 +48,6 @@
             "typeInfo": {
               "frame": "float64",
               "nullable": true
-            },
-            "labels": {},
-            "config": {
-              "displayNameFromDS": "Max float"
             }
           }
         ]
diff --git a/pkg/tsdb/elasticsearch/testdata_response/metric_multi.b.golden.jsonc b/pkg/tsdb/elasticsearch/testdata_response/metric_multi.b.golden.jsonc
index 61dd567194ffe..32e0d1b13c1d5 100644
--- a/pkg/tsdb/elasticsearch/testdata_response/metric_multi.b.golden.jsonc
+++ b/pkg/tsdb/elasticsearch/testdata_response/metric_multi.b.golden.jsonc
@@ -7,7 +7,7 @@
 //          0
 //      ]
 //  }
-//  Name: 
+//  Name: Min float
 //  Dimensions: 2 Fields by 3 Rows
 //  +-------------------------------+---------------------+
 //  | Name: Time                    | Name: Value         |
@@ -26,6 +26,7 @@
   "frames": [
     {
       "schema": {
+        "name": "Min float",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -47,10 +48,6 @@
             "typeInfo": {
               "frame": "float64",
               "nullable": true
-            },
-            "labels": {},
-            "config": {
-              "displayNameFromDS": "Min float"
             }
           }
         ]
diff --git a/pkg/tsdb/elasticsearch/testdata_response/metric_percentiles.a.golden.jsonc b/pkg/tsdb/elasticsearch/testdata_response/metric_percentiles.a.golden.jsonc
index a33daf632dc2a..2e6ebcd3c5ade 100644
--- a/pkg/tsdb/elasticsearch/testdata_response/metric_percentiles.a.golden.jsonc
+++ b/pkg/tsdb/elasticsearch/testdata_response/metric_percentiles.a.golden.jsonc
@@ -7,7 +7,7 @@
 //          0
 //      ]
 //  }
-//  Name: 
+//  Name: p25.0 counter
 //  Dimensions: 2 Fields by 3 Rows
 //  +-----------------------------------+------------------+
 //  | Name: Time                        | Name: Value      |
@@ -28,7 +28,7 @@
 //          0
 //      ]
 //  }
-//  Name: 
+//  Name: p75.0 counter
 //  Dimensions: 2 Fields by 3 Rows
 //  +-----------------------------------+------------------+
 //  | Name: Time                        | Name: Value      |
@@ -47,6 +47,7 @@
   "frames": [
     {
       "schema": {
+        "name": "p25.0 counter",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -68,10 +69,6 @@
             "typeInfo": {
               "frame": "float64",
               "nullable": true
-            },
-            "labels": {},
-            "config": {
-              "displayNameFromDS": "p25.0 counter"
             }
           }
         ]
@@ -93,6 +90,7 @@
     },
     {
       "schema": {
+        "name": "p75.0 counter",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -114,10 +112,6 @@
             "typeInfo": {
               "frame": "float64",
               "nullable": true
-            },
-            "labels": {},
-            "config": {
-              "displayNameFromDS": "p75.0 counter"
             }
           }
         ]
diff --git a/pkg/tsdb/elasticsearch/testdata_response/metric_simple.a.golden.jsonc b/pkg/tsdb/elasticsearch/testdata_response/metric_simple.a.golden.jsonc
index e67e507a97679..e1f7ae7f7026e 100644
--- a/pkg/tsdb/elasticsearch/testdata_response/metric_simple.a.golden.jsonc
+++ b/pkg/tsdb/elasticsearch/testdata_response/metric_simple.a.golden.jsonc
@@ -7,18 +7,18 @@
 //          0
 //      ]
 //  }
-//  Name: 
+//  Name: val3
 //  Dimensions: 2 Fields by 4 Rows
-//  +-----------------------------------+--------------------+
-//  | Name: Time                        | Name: Value        |
-//  | Labels:                           | Labels: label=val3 |
-//  | Type: []time.Time                 | Type: []*float64   |
-//  +-----------------------------------+--------------------+
-//  | 2022-11-14 10:40:00.123 +0000 UTC | 0                  |
-//  | 2022-11-14 10:41:00.123 +0000 UTC | 27                 |
-//  | 2022-11-14 10:42:00.123 +0000 UTC | 21                 |
-//  | 2022-11-14 10:43:00.123 +0000 UTC | 31                 |
-//  +-----------------------------------+--------------------+
+//  +-----------------------------------+------------------+
+//  | Name: Time                        | Name: Value      |
+//  | Labels:                           | Labels:          |
+//  | Type: []time.Time                 | Type: []*float64 |
+//  +-----------------------------------+------------------+
+//  | 2022-11-14 10:40:00.123 +0000 UTC | 0                |
+//  | 2022-11-14 10:41:00.123 +0000 UTC | 27               |
+//  | 2022-11-14 10:42:00.123 +0000 UTC | 21               |
+//  | 2022-11-14 10:43:00.123 +0000 UTC | 31               |
+//  +-----------------------------------+------------------+
 //  
 //  
 //  
@@ -29,18 +29,18 @@
 //          0
 //      ]
 //  }
-//  Name: 
+//  Name: val2
 //  Dimensions: 2 Fields by 4 Rows
-//  +-----------------------------------+--------------------+
-//  | Name: Time                        | Name: Value        |
-//  | Labels:                           | Labels: label=val2 |
-//  | Type: []time.Time                 | Type: []*float64   |
-//  +-----------------------------------+--------------------+
-//  | 2022-11-14 10:40:00.123 +0000 UTC | 0                  |
-//  | 2022-11-14 10:41:00.123 +0000 UTC | 28                 |
-//  | 2022-11-14 10:42:00.123 +0000 UTC | 22                 |
-//  | 2022-11-14 10:43:00.123 +0000 UTC | 39                 |
-//  +-----------------------------------+--------------------+
+//  +-----------------------------------+------------------+
+//  | Name: Time                        | Name: Value      |
+//  | Labels:                           | Labels:          |
+//  | Type: []time.Time                 | Type: []*float64 |
+//  +-----------------------------------+------------------+
+//  | 2022-11-14 10:40:00.123 +0000 UTC | 0                |
+//  | 2022-11-14 10:41:00.123 +0000 UTC | 28               |
+//  | 2022-11-14 10:42:00.123 +0000 UTC | 22               |
+//  | 2022-11-14 10:43:00.123 +0000 UTC | 39               |
+//  +-----------------------------------+------------------+
 //  
 //  
 //  
@@ -51,18 +51,18 @@
 //          0
 //      ]
 //  }
-//  Name: 
+//  Name: val1
 //  Dimensions: 2 Fields by 4 Rows
-//  +-----------------------------------+--------------------+
-//  | Name: Time                        | Name: Value        |
-//  | Labels:                           | Labels: label=val1 |
-//  | Type: []time.Time                 | Type: []*float64   |
-//  +-----------------------------------+--------------------+
-//  | 2022-11-14 10:40:00.123 +0000 UTC | 0                  |
-//  | 2022-11-14 10:41:00.123 +0000 UTC | 26                 |
-//  | 2022-11-14 10:42:00.123 +0000 UTC | 20                 |
-//  | 2022-11-14 10:43:00.123 +0000 UTC | 41                 |
-//  +-----------------------------------+--------------------+
+//  +-----------------------------------+------------------+
+//  | Name: Time                        | Name: Value      |
+//  | Labels:                           | Labels:          |
+//  | Type: []time.Time                 | Type: []*float64 |
+//  +-----------------------------------+------------------+
+//  | 2022-11-14 10:40:00.123 +0000 UTC | 0                |
+//  | 2022-11-14 10:41:00.123 +0000 UTC | 26               |
+//  | 2022-11-14 10:42:00.123 +0000 UTC | 20               |
+//  | 2022-11-14 10:43:00.123 +0000 UTC | 41               |
+//  +-----------------------------------+------------------+
 //  
 //  
 //  🌟 This was machine generated.  Do not edit. 🌟
@@ -71,6 +71,7 @@
   "frames": [
     {
       "schema": {
+        "name": "val3",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -92,12 +93,6 @@
             "typeInfo": {
               "frame": "float64",
               "nullable": true
-            },
-            "labels": {
-              "label": "val3"
-            },
-            "config": {
-              "displayNameFromDS": "val3"
             }
           }
         ]
@@ -121,6 +116,7 @@
     },
     {
       "schema": {
+        "name": "val2",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -142,12 +138,6 @@
             "typeInfo": {
               "frame": "float64",
               "nullable": true
-            },
-            "labels": {
-              "label": "val2"
-            },
-            "config": {
-              "displayNameFromDS": "val2"
             }
           }
         ]
@@ -171,6 +161,7 @@
     },
     {
       "schema": {
+        "name": "val1",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -192,12 +183,6 @@
             "typeInfo": {
               "frame": "float64",
               "nullable": true
-            },
-            "labels": {
-              "label": "val1"
-            },
-            "config": {
-              "displayNameFromDS": "val1"
             }
           }
         ]
diff --git a/pkg/tsdb/elasticsearch/testdata_response/metric_top_metrics.a.golden.jsonc b/pkg/tsdb/elasticsearch/testdata_response/metric_top_metrics.a.golden.jsonc
index e02d8f90d05b5..e91888a595aad 100644
--- a/pkg/tsdb/elasticsearch/testdata_response/metric_top_metrics.a.golden.jsonc
+++ b/pkg/tsdb/elasticsearch/testdata_response/metric_top_metrics.a.golden.jsonc
@@ -7,7 +7,7 @@
 //          0
 //      ]
 //  }
-//  Name: 
+//  Name: Top Metrics float
 //  Dimensions: 2 Fields by 3 Rows
 //  +-----------------------------------+-------------------+
 //  | Name: Time                        | Name: Value       |
@@ -26,6 +26,7 @@
   "frames": [
     {
       "schema": {
+        "name": "Top Metrics float",
         "meta": {
           "type": "timeseries-multi",
           "typeVersion": [
@@ -47,10 +48,6 @@
             "typeInfo": {
               "frame": "float64",
               "nullable": true
-            },
-            "labels": {},
-            "config": {
-              "displayNameFromDS": "Top Metrics float"
             }
           }
         ]
diff --git a/pkg/tsdb/postgres/locker.go b/pkg/tsdb/grafana-postgresql-datasource/locker.go
similarity index 100%
rename from pkg/tsdb/postgres/locker.go
rename to pkg/tsdb/grafana-postgresql-datasource/locker.go
diff --git a/pkg/tsdb/postgres/locker_test.go b/pkg/tsdb/grafana-postgresql-datasource/locker_test.go
similarity index 100%
rename from pkg/tsdb/postgres/locker_test.go
rename to pkg/tsdb/grafana-postgresql-datasource/locker_test.go
diff --git a/pkg/tsdb/postgres/macros.go b/pkg/tsdb/grafana-postgresql-datasource/macros.go
similarity index 100%
rename from pkg/tsdb/postgres/macros.go
rename to pkg/tsdb/grafana-postgresql-datasource/macros.go
diff --git a/pkg/tsdb/postgres/macros_test.go b/pkg/tsdb/grafana-postgresql-datasource/macros_test.go
similarity index 100%
rename from pkg/tsdb/postgres/macros_test.go
rename to pkg/tsdb/grafana-postgresql-datasource/macros_test.go
diff --git a/pkg/tsdb/grafana-postgresql-datasource/postgres.go b/pkg/tsdb/grafana-postgresql-datasource/postgres.go
new file mode 100644
index 0000000000000..95b5ec96e1c93
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/postgres.go
@@ -0,0 +1,356 @@
+package postgres
+
+import (
+	"context"
+	"database/sql"
+	"encoding/json"
+	"fmt"
+	"reflect"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/grafana/grafana-plugin-sdk-go/data/sqlutil"
+	"github.com/lib/pq"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tsdb/sqleng"
+)
+
+func ProvideService(cfg *setting.Cfg) *Service {
+	logger := backend.NewLoggerWith("logger", "tsdb.postgres")
+	s := &Service{
+		tlsManager: newTLSManager(logger, cfg.DataPath),
+		logger:     logger,
+	}
+	s.im = datasource.NewInstanceManager(s.newInstanceSettings())
+	return s
+}
+
+type Service struct {
+	tlsManager tlsSettingsProvider
+	im         instancemgmt.InstanceManager
+	logger     log.Logger
+}
+
+func (s *Service) getDSInfo(ctx context.Context, pluginCtx backend.PluginContext) (*sqleng.DataSourceHandler, error) {
+	i, err := s.im.Get(ctx, pluginCtx)
+	if err != nil {
+		return nil, err
+	}
+	instance := i.(*sqleng.DataSourceHandler)
+	return instance, nil
+}
+
+func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+	dsInfo, err := s.getDSInfo(ctx, req.PluginContext)
+	if err != nil {
+		return nil, err
+	}
+	return dsInfo.QueryData(ctx, req)
+}
+
+func newPostgres(ctx context.Context, userFacingDefaultError string, rowLimit int64, dsInfo sqleng.DataSourceInfo, cnnstr string, logger log.Logger, settings backend.DataSourceInstanceSettings) (*sql.DB, *sqleng.DataSourceHandler, error) {
+	connector, err := pq.NewConnector(cnnstr)
+	if err != nil {
+		logger.Error("postgres connector creation failed", "error", err)
+		return nil, nil, fmt.Errorf("postgres connector creation failed")
+	}
+
+	proxyClient, err := settings.ProxyClient(ctx)
+	if err != nil {
+		logger.Error("postgres proxy creation failed", "error", err)
+		return nil, nil, fmt.Errorf("postgres proxy creation failed")
+	}
+
+	if proxyClient.SecureSocksProxyEnabled() {
+		dialer, err := proxyClient.NewSecureSocksProxyContextDialer()
+		if err != nil {
+			logger.Error("postgres proxy creation failed", "error", err)
+			return nil, nil, fmt.Errorf("postgres proxy creation failed")
+		}
+		postgresDialer := newPostgresProxyDialer(dialer)
+		// update the postgres dialer with the proxy dialer
+		connector.Dialer(postgresDialer)
+	}
+
+	config := sqleng.DataPluginConfiguration{
+		DSInfo:            dsInfo,
+		MetricColumnTypes: []string{"UNKNOWN", "TEXT", "VARCHAR", "CHAR"},
+		RowLimit:          rowLimit,
+	}
+
+	queryResultTransformer := postgresQueryResultTransformer{}
+
+	db := sql.OpenDB(connector)
+
+	db.SetMaxOpenConns(config.DSInfo.JsonData.MaxOpenConns)
+	db.SetMaxIdleConns(config.DSInfo.JsonData.MaxIdleConns)
+	db.SetConnMaxLifetime(time.Duration(config.DSInfo.JsonData.ConnMaxLifetime) * time.Second)
+
+	handler, err := sqleng.NewQueryDataHandler(userFacingDefaultError, db, config, &queryResultTransformer, newPostgresMacroEngine(dsInfo.JsonData.Timescaledb),
+		logger)
+	if err != nil {
+		logger.Error("Failed connecting to Postgres", "err", err)
+		return nil, nil, err
+	}
+
+	logger.Debug("Successfully connected to Postgres")
+	return db, handler, nil
+}
+
+func (s *Service) newInstanceSettings() datasource.InstanceFactoryFunc {
+	logger := s.logger
+	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+		cfg := backend.GrafanaConfigFromContext(ctx)
+		sqlCfg, err := cfg.SQL()
+		if err != nil {
+			return nil, err
+		}
+
+		jsonData := sqleng.JsonData{
+			MaxOpenConns:        sqlCfg.DefaultMaxOpenConns,
+			MaxIdleConns:        sqlCfg.DefaultMaxIdleConns,
+			ConnMaxLifetime:     sqlCfg.DefaultMaxConnLifetimeSeconds,
+			Timescaledb:         false,
+			ConfigurationMethod: "file-path",
+			SecureDSProxy:       false,
+		}
+
+		err = json.Unmarshal(settings.JSONData, &jsonData)
+		if err != nil {
+			return nil, fmt.Errorf("error reading settings: %w", err)
+		}
+
+		database := jsonData.Database
+		if database == "" {
+			database = settings.Database
+		}
+
+		dsInfo := sqleng.DataSourceInfo{
+			JsonData:                jsonData,
+			URL:                     settings.URL,
+			User:                    settings.User,
+			Database:                database,
+			ID:                      settings.ID,
+			Updated:                 settings.Updated,
+			UID:                     settings.UID,
+			DecryptedSecureJSONData: settings.DecryptedSecureJSONData,
+		}
+
+		cnnstr, err := s.generateConnectionString(dsInfo)
+		if err != nil {
+			return nil, err
+		}
+
+		userFacingDefaultError, err := cfg.UserFacingDefaultError()
+		if err != nil {
+			return nil, err
+		}
+
+		_, handler, err := newPostgres(ctx, userFacingDefaultError, sqlCfg.RowLimit, dsInfo, cnnstr, logger, settings)
+
+		if err != nil {
+			logger.Error("Failed connecting to Postgres", "err", err)
+			return nil, err
+		}
+
+		logger.Debug("Successfully connected to Postgres")
+		return handler, nil
+	}
+}
+
+// escape single quotes and backslashes in Postgres connection string parameters.
+func escape(input string) string {
+	return strings.ReplaceAll(strings.ReplaceAll(input, `\`, `\\`), "'", `\'`)
+}
+
+func (s *Service) generateConnectionString(dsInfo sqleng.DataSourceInfo) (string, error) {
+	logger := s.logger
+	var host string
+	var port int
+	if strings.HasPrefix(dsInfo.URL, "/") {
+		host = dsInfo.URL
+		logger.Debug("Generating connection string with Unix socket specifier", "socket", host)
+	} else {
+		index := strings.LastIndex(dsInfo.URL, ":")
+		v6Index := strings.Index(dsInfo.URL, "]")
+		sp := strings.SplitN(dsInfo.URL, ":", 2)
+		host = sp[0]
+		if v6Index == -1 {
+			if len(sp) > 1 {
+				var err error
+				port, err = strconv.Atoi(sp[1])
+				if err != nil {
+					return "", fmt.Errorf("invalid port in host specifier %q: %w", sp[1], err)
+				}
+
+				logger.Debug("Generating connection string with network host/port pair", "host", host, "port", port)
+			} else {
+				logger.Debug("Generating connection string with network host", "host", host)
+			}
+		} else {
+			if index == v6Index+1 {
+				host = dsInfo.URL[1 : index-1]
+				var err error
+				port, err = strconv.Atoi(dsInfo.URL[index+1:])
+				if err != nil {
+					return "", fmt.Errorf("invalid port in host specifier %q: %w", dsInfo.URL[index+1:], err)
+				}
+
+				logger.Debug("Generating ipv6 connection string with network host/port pair", "host", host, "port", port)
+			} else {
+				host = dsInfo.URL[1 : len(dsInfo.URL)-1]
+				logger.Debug("Generating ipv6 connection string with network host", "host", host)
+			}
+		}
+	}
+
+	connStr := fmt.Sprintf("user='%s' password='%s' host='%s' dbname='%s'",
+		escape(dsInfo.User), escape(dsInfo.DecryptedSecureJSONData["password"]), escape(host), escape(dsInfo.Database))
+	if port > 0 {
+		connStr += fmt.Sprintf(" port=%d", port)
+	}
+
+	tlsSettings, err := s.tlsManager.getTLSSettings(dsInfo)
+	if err != nil {
+		return "", err
+	}
+
+	connStr += fmt.Sprintf(" sslmode='%s'", escape(tlsSettings.Mode))
+
+	// there is an issue with the lib/pq module, the `verify-ca` tls mode
+	// does not work correctly. ( see https://github.com/lib/pq/issues/1106 )
+	// to workaround the problem, if the `verify-ca` mode is chosen,
+	// we disable sslsni.
+	if tlsSettings.Mode == "verify-ca" {
+		connStr += " sslsni=0"
+	}
+
+	// Attach root certificate if provided
+	if tlsSettings.RootCertFile != "" {
+		logger.Debug("Setting server root certificate", "tlsRootCert", tlsSettings.RootCertFile)
+		connStr += fmt.Sprintf(" sslrootcert='%s'", escape(tlsSettings.RootCertFile))
+	}
+
+	// Attach client certificate and key if both are provided
+	if tlsSettings.CertFile != "" && tlsSettings.CertKeyFile != "" {
+		logger.Debug("Setting TLS/SSL client auth", "tlsCert", tlsSettings.CertFile, "tlsKey", tlsSettings.CertKeyFile)
+		connStr += fmt.Sprintf(" sslcert='%s' sslkey='%s'", escape(tlsSettings.CertFile), escape(tlsSettings.CertKeyFile))
+	} else if tlsSettings.CertFile != "" || tlsSettings.CertKeyFile != "" {
+		return "", fmt.Errorf("TLS/SSL client certificate and key must both be specified")
+	}
+
+	logger.Debug("Generated Postgres connection string successfully")
+	return connStr, nil
+}
+
+type postgresQueryResultTransformer struct{}
+
+func (t *postgresQueryResultTransformer) TransformQueryError(_ log.Logger, err error) error {
+	return err
+}
+
+// CheckHealth pings the connected SQL database
+func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
+	dsHandler, err := s.getDSInfo(ctx, req.PluginContext)
+	if err != nil {
+		return nil, err
+	}
+
+	err = dsHandler.Ping()
+
+	if err != nil {
+		s.logger.Error("Check health failed", "error", err)
+		return &backend.CheckHealthResult{Status: backend.HealthStatusError, Message: dsHandler.TransformQueryError(s.logger, err).Error()}, nil
+	}
+
+	return &backend.CheckHealthResult{Status: backend.HealthStatusOk, Message: "Database Connection OK"}, nil
+}
+
+func (t *postgresQueryResultTransformer) GetConverterList() []sqlutil.StringConverter {
+	return []sqlutil.StringConverter{
+		{
+			Name:           "handle FLOAT4",
+			InputScanKind:  reflect.Interface,
+			InputTypeName:  "FLOAT4",
+			ConversionFunc: func(in *string) (*string, error) { return in, nil },
+			Replacer: &sqlutil.StringFieldReplacer{
+				OutputFieldType: data.FieldTypeNullableFloat64,
+				ReplaceFunc: func(in *string) (any, error) {
+					if in == nil {
+						return nil, nil
+					}
+					v, err := strconv.ParseFloat(*in, 64)
+					if err != nil {
+						return nil, err
+					}
+					return &v, nil
+				},
+			},
+		},
+		{
+			Name:           "handle FLOAT8",
+			InputScanKind:  reflect.Interface,
+			InputTypeName:  "FLOAT8",
+			ConversionFunc: func(in *string) (*string, error) { return in, nil },
+			Replacer: &sqlutil.StringFieldReplacer{
+				OutputFieldType: data.FieldTypeNullableFloat64,
+				ReplaceFunc: func(in *string) (any, error) {
+					if in == nil {
+						return nil, nil
+					}
+					v, err := strconv.ParseFloat(*in, 64)
+					if err != nil {
+						return nil, err
+					}
+					return &v, nil
+				},
+			},
+		},
+		{
+			Name:           "handle NUMERIC",
+			InputScanKind:  reflect.Interface,
+			InputTypeName:  "NUMERIC",
+			ConversionFunc: func(in *string) (*string, error) { return in, nil },
+			Replacer: &sqlutil.StringFieldReplacer{
+				OutputFieldType: data.FieldTypeNullableFloat64,
+				ReplaceFunc: func(in *string) (any, error) {
+					if in == nil {
+						return nil, nil
+					}
+					v, err := strconv.ParseFloat(*in, 64)
+					if err != nil {
+						return nil, err
+					}
+					return &v, nil
+				},
+			},
+		},
+		{
+			Name:           "handle INT2",
+			InputScanKind:  reflect.Interface,
+			InputTypeName:  "INT2",
+			ConversionFunc: func(in *string) (*string, error) { return in, nil },
+			Replacer: &sqlutil.StringFieldReplacer{
+				OutputFieldType: data.FieldTypeNullableInt16,
+				ReplaceFunc: func(in *string) (any, error) {
+					if in == nil {
+						return nil, nil
+					}
+					i64, err := strconv.ParseInt(*in, 10, 16)
+					if err != nil {
+						return nil, err
+					}
+					v := int16(i64)
+					return &v, nil
+				},
+			},
+		},
+	}
+}
diff --git a/pkg/tsdb/grafana-postgresql-datasource/postgres_snapshot_test.go b/pkg/tsdb/grafana-postgresql-datasource/postgres_snapshot_test.go
new file mode 100644
index 0000000000000..fef80c0111eab
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/postgres_snapshot_test.go
@@ -0,0 +1,195 @@
+package postgres
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
+	"github.com/grafana/grafana-plugin-sdk-go/experimental"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/tsdb/sqleng"
+)
+
+var updateGoldenFiles = false
+
+// These tests require a real postgres database:
+// - make devenv sources=potgres_tests
+// - either set the env variable GRAFANA_TEST_DB = postgres
+//   - or set `forceRun := true` below
+//
+// The tests require a PostgreSQL db named grafanadstest and a user/password grafanatest/grafanatest!
+// Use the docker/blocks/postgres_tests/docker-compose.yaml to spin up a
+// preconfigured Postgres server suitable for running these tests.
+func TestIntegrationPostgresSnapshots(t *testing.T) {
+	// the logic in this function is copied from postgres_tests.go
+	shouldRunTest := func() bool {
+		if testing.Short() {
+			return false
+		}
+
+		testDbName, present := os.LookupEnv("GRAFANA_TEST_DB")
+
+		if present && testDbName == "postgres" {
+			return true
+		}
+
+		return false
+	}
+
+	if !shouldRunTest() {
+		t.Skip()
+	}
+
+	getCnnStr := func() string {
+		host := os.Getenv("POSTGRES_HOST")
+		if host == "" {
+			host = "localhost"
+		}
+		port := os.Getenv("POSTGRES_PORT")
+		if port == "" {
+			port = "5432"
+		}
+
+		return fmt.Sprintf("user=grafanatest password=grafanatest host=%s port=%s dbname=grafanadstest sslmode=disable",
+			host, port)
+	}
+
+	sqlQueryCommentRe := regexp.MustCompile(`^-- (.+)\n`)
+
+	readSqlFile := func(path string) (string, string) {
+		// the file-path is not coming from the outside,
+		// it is hardcoded in this file.
+		//nolint:gosec
+		sqlBytes, err := os.ReadFile(path)
+		require.NoError(t, err)
+
+		sql := string(sqlBytes)
+
+		// first line of the file contains the sql query to run, commented out
+		match := sqlQueryCommentRe.FindStringSubmatch(sql)
+		require.Len(t, match, 2)
+
+		rawSQL := strings.TrimSpace(match[1])
+
+		return rawSQL, sql
+	}
+
+	makeQuery := func(rawSQL string, format string) backend.QueryDataRequest {
+		queryData := map[string]string{
+			"rawSql": rawSQL,
+			"format": format,
+		}
+
+		queryBytes, err := json.Marshal(queryData)
+		require.NoError(t, err)
+
+		return backend.QueryDataRequest{
+			Queries: []backend.DataQuery{
+				{
+					JSON:  queryBytes,
+					RefID: "A",
+					TimeRange: backend.TimeRange{
+						From: time.Date(2023, 12, 24, 14, 15, 22, 123456, time.UTC),
+						To:   time.Date(2023, 12, 24, 14, 45, 13, 876543, time.UTC),
+					},
+				},
+			},
+		}
+	}
+
+	tt := []struct {
+		name   string
+		format string
+	}{
+		{format: "time_series", name: "simple"},
+		{format: "time_series", name: "no_rows_long"},
+		{format: "time_series", name: "no_rows_wide"},
+		{format: "time_series", name: "7x_compat_metric_label"},
+		{format: "time_series", name: "convert_to_float64"},
+		{format: "time_series", name: "convert_to_float64_not"},
+		{format: "time_series", name: "fill_null"},
+		{format: "time_series", name: "fill_previous"},
+		{format: "time_series", name: "fill_value"},
+		{format: "time_series", name: "fill_value_wide"},
+		{format: "table", name: "simple"},
+		{format: "table", name: "no_rows"},
+		{format: "table", name: "types_numeric"},
+		{format: "table", name: "types_char"},
+		{format: "table", name: "types_datetime"},
+		{format: "table", name: "types_other"},
+		{format: "table", name: "timestamp_convert_bigint"},
+		{format: "table", name: "timestamp_convert_integer"},
+		{format: "table", name: "timestamp_convert_real"},
+		{format: "table", name: "timestamp_convert_double"},
+		{format: "table", name: "time_group_compat_case1"},
+		{format: "table", name: "time_group_compat_case2"},
+	}
+
+	for _, test := range tt {
+		require.True(t, test.format == "table" || test.format == "time_series")
+		t.Run(test.name, func(t *testing.T) {
+			origInterpolate := sqleng.Interpolate
+			t.Cleanup(func() {
+				sqleng.Interpolate = origInterpolate
+			})
+
+			sqleng.Interpolate = func(query backend.DataQuery, timeRange backend.TimeRange, timeInterval string, sql string) string {
+				return sql
+			}
+
+			jsonData := sqleng.JsonData{
+				MaxOpenConns:        0,
+				MaxIdleConns:        2,
+				ConnMaxLifetime:     14400,
+				Timescaledb:         false,
+				ConfigurationMethod: "file-path",
+			}
+
+			dsInfo := sqleng.DataSourceInfo{
+				JsonData:                jsonData,
+				DecryptedSecureJSONData: map[string]string{},
+			}
+
+			logger := log.New()
+
+			cnnstr := getCnnStr()
+
+			db, handler, err := newPostgres(context.Background(), "error", 10000, dsInfo, cnnstr, logger, backend.DataSourceInstanceSettings{})
+
+			t.Cleanup((func() {
+				_, err := db.Exec("DROP TABLE tbl")
+				require.NoError(t, err)
+				err = db.Close()
+				require.NoError(t, err)
+			}))
+
+			require.NoError(t, err)
+
+			sqlFilePath := filepath.Join("testdata", test.format, test.name+".sql")
+			goldenFileName := filepath.Join(test.format, test.name+".golden")
+
+			rawSQL, sql := readSqlFile(sqlFilePath)
+
+			_, err = db.Exec(sql)
+			require.NoError(t, err)
+
+			query := makeQuery(rawSQL, test.format)
+
+			result, err := handler.QueryData(context.Background(), &query)
+			require.Len(t, result.Responses, 1)
+			response, found := result.Responses["A"]
+			require.True(t, found)
+			require.NoError(t, err)
+			experimental.CheckGoldenJSONResponse(t, "testdata", goldenFileName, &response, updateGoldenFiles)
+		})
+	}
+}
diff --git a/pkg/tsdb/postgres/postgres_test.go b/pkg/tsdb/grafana-postgresql-datasource/postgres_test.go
similarity index 91%
rename from pkg/tsdb/postgres/postgres_test.go
rename to pkg/tsdb/grafana-postgresql-datasource/postgres_test.go
index 133d5d7b3e6ea..f5ccc6787f4ce 100644
--- a/pkg/tsdb/postgres/postgres_test.go
+++ b/pkg/tsdb/grafana-postgresql-datasource/postgres_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"math/rand"
+	"os"
 	"strings"
 	"testing"
 	"time"
@@ -12,10 +13,7 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"xorm.io/xorm"
 
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/sqlstore/sqlutil"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/sqleng"
 
@@ -59,6 +57,15 @@ func TestIntegrationGenerateConnectionString(t *testing.T) {
 			tlsSettings: tlsSettings{Mode: "verify-full"},
 			expConnStr:  "user='user' password='password' host='host' dbname='database' sslmode='verify-full'",
 		},
+		{
+			desc:        "verify-ca automatically adds disable-sni",
+			host:        "host:1234",
+			user:        "user",
+			password:    "password",
+			database:    "database",
+			tlsSettings: tlsSettings{Mode: "verify-ca"},
+			expConnStr:  "user='user' password='password' host='host' dbname='database' port=1234 sslmode='verify-ca' sslsni=0",
+		},
 		{
 			desc:        "TCP/port host",
 			host:        "host:1234",
@@ -141,6 +148,7 @@ func TestIntegrationGenerateConnectionString(t *testing.T) {
 		t.Run(tt.desc, func(t *testing.T) {
 			svc := Service{
 				tlsManager: &tlsTestManager{settings: tt.tlsSettings},
+				logger:     backend.NewLoggerWith("logger", "tsdb.postgres"),
 			}
 
 			ds := sqleng.DataSourceInfo{
@@ -166,7 +174,7 @@ func TestIntegrationGenerateConnectionString(t *testing.T) {
 }
 
 // To run this test, set runPostgresTests=true
-// Or from the commandline: GRAFANA_TEST_DB=postgres go test -tags=integration -v ./pkg/tsdb/postgres
+// Or from the commandline: GRAFANA_TEST_DB=postgres go test -tags=integration -v ./pkg/tsdb/grafana-postgresql-datasource
 // The tests require a PostgreSQL db named grafanadstest and a user/password grafanatest/grafanatest!
 // Use the docker/blocks/postgres_tests/docker-compose.yaml to spin up a
 // preconfigured Postgres server suitable for running these tests.
@@ -180,27 +188,17 @@ func TestIntegrationPostgres(t *testing.T) {
 	// change to true to run the PostgreSQL tests
 	const runPostgresTests = false
 
-	if !(db.IsTestDbPostgres() || runPostgresTests) {
+	if !(isTestDbPostgres() || runPostgresTests) {
 		t.Skip()
 	}
 
-	x := InitPostgresTestDB(t)
-
-	origXormEngine := sqleng.NewXormEngine
 	origInterpolate := sqleng.Interpolate
 	t.Cleanup(func() {
-		sqleng.NewXormEngine = origXormEngine
 		sqleng.Interpolate = origInterpolate
 	})
-	sqleng.NewXormEngine = func(d, c string) (*xorm.Engine, error) {
-		return x, nil
+	sqleng.Interpolate = func(query backend.DataQuery, timeRange backend.TimeRange, timeInterval string, sql string) string {
+		return sql
 	}
-	sqleng.Interpolate = func(query backend.DataQuery, timeRange backend.TimeRange, timeInterval string, sql string) (string, error) {
-		return sql, nil
-	}
-
-	cfg := setting.NewCfg()
-	cfg.DataPath = t.TempDir()
 
 	jsonData := sqleng.JsonData{
 		MaxOpenConns:        0,
@@ -215,23 +213,14 @@ func TestIntegrationPostgres(t *testing.T) {
 		DecryptedSecureJSONData: map[string]string{},
 	}
 
-	config := sqleng.DataPluginConfiguration{
-		DriverName:        "postgres",
-		ConnectionString:  "",
-		DSInfo:            dsInfo,
-		MetricColumnTypes: []string{"UNKNOWN", "TEXT", "VARCHAR", "CHAR"},
-		RowLimit:          1000000,
-	}
+	logger := backend.NewLoggerWith("logger", "postgres.test")
 
-	queryResultTransformer := postgresQueryResultTransformer{}
+	cnnstr := postgresTestDBConnString()
 
-	exe, err := sqleng.NewQueryDataHandler(cfg, config, &queryResultTransformer, newPostgresMacroEngine(dsInfo.JsonData.Timescaledb),
-		logger)
+	db, exe, err := newPostgres(context.Background(), "error", 10000, dsInfo, cnnstr, logger, backend.DataSourceInstanceSettings{})
 
 	require.NoError(t, err)
 
-	sess := x.NewSession()
-	t.Cleanup(sess.Close)
 	fromStart := time.Date(2018, 3, 15, 13, 0, 0, 0, time.UTC).In(time.Local)
 
 	t.Run("Given a table with different native data types", func(t *testing.T) {
@@ -261,7 +250,7 @@ func TestIntegrationPostgres(t *testing.T) {
 				c16_smallint smallint
 			);
 		`
-		_, err := sess.Exec(sql)
+		_, err := db.Exec(sql)
 		require.NoError(t, err)
 
 		sql = `
@@ -274,7 +263,7 @@ func TestIntegrationPostgres(t *testing.T) {
 				null
 			);
 		`
-		_, err = sess.Exec(sql)
+		_, err = db.Exec(sql)
 		require.NoError(t, err)
 
 		t.Run("When doing a table query should map Postgres column types to Go types", func(t *testing.T) {
@@ -337,7 +326,7 @@ func TestIntegrationPostgres(t *testing.T) {
 				)
 			`
 
-		_, err := sess.Exec(sql)
+		_, err := db.Exec(sql)
 		require.NoError(t, err)
 
 		type metric struct {
@@ -363,8 +352,10 @@ func TestIntegrationPostgres(t *testing.T) {
 			})
 		}
 
-		_, err = sess.InsertMulti(series)
-		require.NoError(t, err)
+		for _, m := range series {
+			_, err := db.Exec(`INSERT INTO metric ("time", value) VALUES ($1, $2)`, m.Time.UTC(), m.Value)
+			require.NoError(t, err)
+		}
 
 		t.Run("When doing a metric query using timeGroup", func(t *testing.T) {
 			query := &backend.QueryDataRequest{
@@ -425,7 +416,8 @@ func TestIntegrationPostgres(t *testing.T) {
 							"rawSql": "SELECT $__timeGroup(time, $__interval) AS time, avg(value) as value FROM metric GROUP BY 1 ORDER BY 1",
 							"format": "time_series"
 						}`),
-						RefID: "A",
+						RefID:    "A",
+						Interval: time.Second * 60,
 						TimeRange: backend.TimeRange{
 							From: fromStart,
 							To:   fromStart.Add(30 * time.Minute),
@@ -541,8 +533,10 @@ func TestIntegrationPostgres(t *testing.T) {
 			},
 		}
 
-		_, err = sess.InsertMulti(series)
-		require.NoError(t, err)
+		for _, m := range series {
+			_, err := db.Exec(`INSERT INTO metric ("time", value) VALUES ($1, $2)`, m.Time.UTC(), m.Value)
+			require.NoError(t, err)
+		}
 
 		t.Run("querying with time group with default value", func(t *testing.T) {
 			query := &backend.QueryDataRequest{
@@ -611,25 +605,31 @@ func TestIntegrationPostgres(t *testing.T) {
 	t.Run("Given a table with metrics having multiple values and measurements", func(t *testing.T) {
 		type metric_values struct {
 			Time                time.Time
-			TimeInt64           int64    `xorm:"bigint 'timeInt64' not null"`
-			TimeInt64Nullable   *int64   `xorm:"bigint 'timeInt64Nullable' null"`
-			TimeFloat64         float64  `xorm:"double 'timeFloat64' not null"`
-			TimeFloat64Nullable *float64 `xorm:"double 'timeFloat64Nullable' null"`
-			TimeInt32           int32    `xorm:"int(11) 'timeInt32' not null"`
-			TimeInt32Nullable   *int32   `xorm:"int(11) 'timeInt32Nullable' null"`
-			TimeFloat32         float32  `xorm:"double 'timeFloat32' not null"`
-			TimeFloat32Nullable *float32 `xorm:"double 'timeFloat32Nullable' null"`
+			TimeInt64           int64
+			TimeInt64Nullable   *int64
+			TimeFloat64         float64
+			TimeFloat64Nullable *float64
+			TimeInt32           int32
+			TimeInt32Nullable   *int32
+			TimeFloat32         float32
+			TimeFloat32Nullable *float32
 			Measurement         string
-			ValueOne            int64 `xorm:"integer 'valueOne'"`
-			ValueTwo            int64 `xorm:"integer 'valueTwo'"`
+			ValueOne            int64
+			ValueTwo            int64
 		}
 
-		if exists, err := sess.IsTableExist(metric_values{}); err != nil || exists {
-			require.NoError(t, err)
-			err := sess.DropTable(metric_values{})
-			require.NoError(t, err)
-		}
-		err := sess.CreateTable(metric_values{})
+		_, err := db.Exec("DROP TABLE IF EXISTS metric_values")
+		require.NoError(t, err)
+
+		_, err = db.Exec(`CREATE TABLE metric_values (
+			"time" TIMESTAMP NULL,
+			"timeInt64" BIGINT NOT NULL, "timeInt64Nullable" BIGINT NULL,
+			"timeFloat64" DOUBLE PRECISION NOT NULL, "timeFloat64Nullable" DOUBLE PRECISION NULL,
+			"timeInt32" INTEGER NOT NULL, "timeInt32Nullable" INTEGER NULL,
+			"timeFloat32" DOUBLE PRECISION NOT NULL, "timeFloat32Nullable" DOUBLE PRECISION NULL,
+			measurement VARCHAR(255) NULL,
+			"valueOne" INTEGER NULL, "valueTwo" INTEGER NULL
+		)`)
 		require.NoError(t, err)
 
 		rng := rand.New(rand.NewSource(time.Now().Unix()))
@@ -672,8 +672,25 @@ func TestIntegrationPostgres(t *testing.T) {
 			series = append(series, &second)
 		}
 
-		_, err = sess.InsertMulti(series)
-		require.NoError(t, err)
+		// _, err = session.InsertMulti(series)
+		for _, m := range series {
+			_, err := db.Exec(`INSERT INTO "metric_values" (
+				time,
+				"timeInt64", "timeInt64Nullable",
+				"timeFloat64", "timeFloat64Nullable",
+				"timeInt32", "timeInt32Nullable",
+				"timeFloat32", "timeFloat32Nullable",
+				measurement, "valueOne", "valueTwo"
+			) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)`,
+				m.Time,
+				m.TimeInt64, m.TimeInt64Nullable,
+				m.TimeFloat64, m.TimeFloat64Nullable,
+				m.TimeInt32, m.TimeInt32Nullable,
+				m.TimeFloat32, m.TimeFloat32Nullable,
+				m.Measurement, m.ValueOne, m.ValueTwo,
+			)
+			require.NoError(t, err)
+		}
 
 		t.Run(
 			"When doing a metric query using epoch (int64) as time column and value column (int64) should return metric with time in time.Time",
@@ -994,12 +1011,9 @@ func TestIntegrationPostgres(t *testing.T) {
 			Tags        string
 		}
 
-		if exists, err := sess.IsTableExist(event{}); err != nil || exists {
-			require.NoError(t, err)
-			err := sess.DropTable(event{})
-			require.NoError(t, err)
-		}
-		err := sess.CreateTable(event{})
+		_, err := db.Exec("DROP TABLE IF EXISTS event")
+		require.NoError(t, err)
+		_, err = db.Exec(`CREATE TABLE event (time_sec BIGINT NULL, description VARCHAR(255) NULL, tags VARCHAR(255) NULL)`)
 		require.NoError(t, err)
 
 		events := []*event{}
@@ -1017,7 +1031,7 @@ func TestIntegrationPostgres(t *testing.T) {
 		}
 
 		for _, e := range events {
-			_, err := sess.Insert(e)
+			_, err := db.Exec("INSERT INTO event (time_sec, description, tags) VALUES ($1, $2, $3)", e.TimeSec, e.Description, e.Tags)
 			require.NoError(t, err)
 		}
 
@@ -1257,17 +1271,8 @@ func TestIntegrationPostgres(t *testing.T) {
 
 		t.Run("When row limit set to 1", func(t *testing.T) {
 			dsInfo := sqleng.DataSourceInfo{}
-			config := sqleng.DataPluginConfiguration{
-				DriverName:        "postgres",
-				ConnectionString:  "",
-				DSInfo:            dsInfo,
-				MetricColumnTypes: []string{"UNKNOWN", "TEXT", "VARCHAR", "CHAR"},
-				RowLimit:          1,
-			}
+			_, handler, err := newPostgres(context.Background(), "error", 1, dsInfo, cnnstr, logger, backend.DataSourceInstanceSettings{})
 
-			queryResultTransformer := postgresQueryResultTransformer{}
-
-			handler, err := sqleng.NewQueryDataHandler(setting.NewCfg(), config, &queryResultTransformer, newPostgresMacroEngine(false), logger)
 			require.NoError(t, err)
 
 			t.Run("When doing a table query that returns 2 rows should limit the result to 1 row", func(t *testing.T) {
@@ -1333,18 +1338,9 @@ func TestIntegrationPostgres(t *testing.T) {
 	})
 
 	t.Run("Given an empty table", func(t *testing.T) {
-		type emptyObj struct {
-			EmptyKey string
-			EmptyVal int64
-		}
-
-		exists, err := sess.IsTableExist(emptyObj{})
+		_, err := db.Exec("DROP TABLE IF EXISTS empty_obj")
 		require.NoError(t, err)
-		if exists {
-			err := sess.DropTable(emptyObj{})
-			require.NoError(t, err)
-		}
-		err = sess.CreateTable(emptyObj{})
+		_, err = db.Exec("CREATE TABLE empty_obj (empty_key VARCHAR(255) NULL, empty_val BIGINT NULL)")
 		require.NoError(t, err)
 
 		t.Run("When no rows are returned, should return an empty frame", func(t *testing.T) {
@@ -1377,20 +1373,6 @@ func TestIntegrationPostgres(t *testing.T) {
 	})
 }
 
-func InitPostgresTestDB(t *testing.T) *xorm.Engine {
-	testDB := sqlutil.PostgresTestDB()
-	x, err := xorm.NewEngine(testDB.DriverName, strings.Replace(testDB.ConnStr, "dbname=grafanatest",
-		"dbname=grafanadstest", 1))
-	require.NoError(t, err, "Failed to init postgres DB")
-
-	x.DatabaseTZ = time.UTC
-	x.TZLocation = time.UTC
-
-	// x.ShowSQL()
-
-	return x
-}
-
 func genTimeRangeByInterval(from time.Time, duration time.Duration, interval time.Duration) []time.Time {
 	durationSec := int64(duration.Seconds())
 	intervalSec := int64(interval.Seconds())
@@ -1411,3 +1393,24 @@ type tlsTestManager struct {
 func (m *tlsTestManager) getTLSSettings(dsInfo sqleng.DataSourceInfo) (tlsSettings, error) {
 	return m.settings, nil
 }
+
+func isTestDbPostgres() bool {
+	if db, present := os.LookupEnv("GRAFANA_TEST_DB"); present {
+		return db == "postgres"
+	}
+
+	return false
+}
+
+func postgresTestDBConnString() string {
+	host := os.Getenv("POSTGRES_HOST")
+	if host == "" {
+		host = "localhost"
+	}
+	port := os.Getenv("POSTGRES_PORT")
+	if port == "" {
+		port = "5432"
+	}
+	return fmt.Sprintf("user=grafanatest password=grafanatest host=%s port=%s dbname=grafanadstest sslmode=disable",
+		host, port)
+}
diff --git a/pkg/tsdb/grafana-postgresql-datasource/proxy.go b/pkg/tsdb/grafana-postgresql-datasource/proxy.go
new file mode 100644
index 0000000000000..d06d8b681527b
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/proxy.go
@@ -0,0 +1,35 @@
+package postgres
+
+import (
+	"context"
+	"net"
+	"time"
+
+	"github.com/lib/pq"
+	"golang.org/x/net/proxy"
+)
+
+// we wrap the proxy.Dialer to become dialer that the postgres module accepts
+func newPostgresProxyDialer(dialer proxy.Dialer) pq.Dialer {
+	return &postgresProxyDialer{d: dialer}
+}
+
+var _ pq.Dialer = (&postgresProxyDialer{})
+
+// postgresProxyDialer implements the postgres dialer using a proxy dialer, as their functions differ slightly
+type postgresProxyDialer struct {
+	d proxy.Dialer
+}
+
+// Dial uses the normal proxy dial function with the updated dialer
+func (p *postgresProxyDialer) Dial(network, addr string) (c net.Conn, err error) {
+	return p.d.Dial(network, addr)
+}
+
+// DialTimeout uses the normal postgres dial timeout function with the updated dialer
+func (p *postgresProxyDialer) DialTimeout(network, address string, timeout time.Duration) (net.Conn, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
+	defer cancel()
+
+	return p.d.(proxy.ContextDialer).DialContext(ctx, network, address)
+}
diff --git a/pkg/tsdb/grafana-postgresql-datasource/proxy_test.go b/pkg/tsdb/grafana-postgresql-datasource/proxy_test.go
new file mode 100644
index 0000000000000..ec36e1a1eae3e
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/proxy_test.go
@@ -0,0 +1,39 @@
+package postgres
+
+import (
+	"database/sql"
+	"fmt"
+	"net"
+	"testing"
+
+	"github.com/lib/pq"
+	"github.com/stretchr/testify/require"
+	"golang.org/x/net/proxy"
+)
+
+type testDialer struct {
+}
+
+func (d *testDialer) Dial(network, addr string) (c net.Conn, err error) {
+	return nil, fmt.Errorf("test-dialer is not functional")
+}
+
+var _ proxy.Dialer = (&testDialer{})
+
+func TestPostgresProxyDriver(t *testing.T) {
+	dbURL := "localhost:5432"
+	cnnstr := fmt.Sprintf("postgres://auser:password@%s/db?sslmode=disable", dbURL)
+
+	t.Run("Connector should use dialer context that routes through the socks proxy to db", func(t *testing.T) {
+		connector, err := pq.NewConnector(cnnstr)
+		require.NoError(t, err)
+		dialer := newPostgresProxyDialer(&testDialer{})
+
+		connector.Dialer(dialer)
+
+		db := sql.OpenDB(connector)
+		err = db.Ping()
+
+		require.Contains(t, err.Error(), "test-dialer is not functional")
+	})
+}
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/table/no_rows.golden.jsonc b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/no_rows.golden.jsonc
new file mode 100644
index 0000000000000..2cc0ccc47b8b5
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/no_rows.golden.jsonc
@@ -0,0 +1,36 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl WHERE false"
+//  }
+//  Name: 
+//  Dimensions: 0 Fields by 0 Rows
+//  +
+//  +
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl WHERE false"
+        },
+        "fields": []
+      },
+      "data": {
+        "values": []
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/table/no_rows.sql b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/no_rows.sql
new file mode 100644
index 0000000000000..bae1feff9f14a
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/no_rows.sql
@@ -0,0 +1,12 @@
+-- SELECT * FROM tbl WHERE false
+CREATE TEMPORARY TABLE tbl (
+    "time" timestamp with time zone,
+    v double precision,
+    c text
+);
+
+INSERT INTO tbl ("time", v, c) VALUES
+('2023-12-24 14:30:03 UTC', 10, 'a'),
+('2023-12-24 14:30:03 UTC', 110, 'b'),
+('2023-12-24 14:31:03 UTC', 20, 'a'),
+('2023-12-24 14:31:03 UTC', 120, 'b');
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/table/simple.golden.jsonc b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/simple.golden.jsonc
new file mode 100644
index 0000000000000..68803e3e77ee6
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/simple.golden.jsonc
@@ -0,0 +1,112 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl"
+//  }
+//  Name: 
+//  Dimensions: 3 Fields by 10 Rows
+//  +-------------------------------+------------------+-----------------+
+//  | Name: time                    | Name: v          | Name: c         |
+//  | Labels:                       | Labels:          | Labels:         |
+//  | Type: []*time.Time            | Type: []*float64 | Type: []*string |
+//  +-------------------------------+------------------+-----------------+
+//  | 2023-12-24 14:30:03 +0000 UTC | 10               | a               |
+//  | 2023-12-24 14:30:03 +0000 UTC | 110              | b               |
+//  | 2023-12-24 14:31:03 +0000 UTC | 20               | a               |
+//  | 2023-12-24 14:31:03 +0000 UTC | 120              | b               |
+//  | 2023-12-24 14:32:03 +0000 UTC | 30               | a               |
+//  | 2023-12-24 14:32:03 +0000 UTC | 130              | b               |
+//  | 2023-12-24 14:33:03 +0000 UTC | 40               | a               |
+//  | 2023-12-24 14:33:03 +0000 UTC | 140              | b               |
+//  | 2023-12-24 14:34:03 +0000 UTC | 50               | a               |
+//  | 2023-12-24 14:34:03 +0000 UTC | 150              | b               |
+//  +-------------------------------+------------------+-----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl"
+        },
+        "fields": [
+          {
+            "name": "time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "v",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "c",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703428203000,
+            1703428203000,
+            1703428263000,
+            1703428263000,
+            1703428323000,
+            1703428323000,
+            1703428383000,
+            1703428383000,
+            1703428443000,
+            1703428443000
+          ],
+          [
+            10,
+            110,
+            20,
+            120,
+            30,
+            130,
+            40,
+            140,
+            50,
+            150
+          ],
+          [
+            "a",
+            "b",
+            "a",
+            "b",
+            "a",
+            "b",
+            "a",
+            "b",
+            "a",
+            "b"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/table/simple.sql b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/simple.sql
new file mode 100644
index 0000000000000..b89651e591d16
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/simple.sql
@@ -0,0 +1,18 @@
+-- SELECT * FROM tbl
+CREATE TEMPORARY TABLE tbl (
+    "time" timestamp with time zone,
+    v double precision,
+    c text
+);
+
+INSERT INTO tbl ("time", v, c) VALUES
+('2023-12-24 14:30:03 UTC', 10, 'a'),
+('2023-12-24 14:30:03 UTC', 110, 'b'),
+('2023-12-24 14:31:03 UTC', 20, 'a'),
+('2023-12-24 14:31:03 UTC', 120, 'b'),
+('2023-12-24 14:32:03 UTC', 30, 'a'),
+('2023-12-24 14:32:03 UTC', 130, 'b'),
+('2023-12-24 14:33:03 UTC', 40, 'a'),
+('2023-12-24 14:33:03 UTC', 140, 'b'),
+('2023-12-24 14:34:03 UTC', 50, 'a'),
+('2023-12-24 14:34:03 UTC', 150, 'b');
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/table/time_group_compat_case1.golden.jsonc b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/time_group_compat_case1.golden.jsonc
new file mode 100644
index 0000000000000..7cff97c96d09c
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/time_group_compat_case1.golden.jsonc
@@ -0,0 +1,65 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT floor(extract(epoch from \"t\")/300)*300 AS \"time\",avg(v) FROM tbl GROUP BY 1"
+//  }
+//  Name: 
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+------------------+
+//  | Name: time                    | Name: avg        |
+//  | Labels:                       | Labels:          |
+//  | Type: []*time.Time            | Type: []*float64 |
+//  +-------------------------------+------------------+
+//  | 2023-12-24 14:30:00 +0000 UTC | 42               |
+//  +-------------------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT floor(extract(epoch from \"t\")/300)*300 AS \"time\",avg(v) FROM tbl GROUP BY 1"
+        },
+        "fields": [
+          {
+            "name": "time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "avg",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703428200000
+          ],
+          [
+            42
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/table/time_group_compat_case1.sql b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/time_group_compat_case1.sql
new file mode 100644
index 0000000000000..918610e6d3e45
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/time_group_compat_case1.sql
@@ -0,0 +1,10 @@
+-- SELECT $__timeGroup("t",5m,NULL),avg(v) FROM tbl GROUP BY 1
+-- we change behavior based on what follows the timegroup, see:
+-- https://github.com/grafana/grafana/blob/0b4c81158ea32a671e7788b888b086082343407c/pkg/tsdb/grafana-postgresql-datasource/macros.go#L36
+CREATE TEMPORARY TABLE tbl (
+    t timestamp with time zone,
+    v double precision
+);
+
+INSERT INTO tbl (t, v) VALUES
+('2023-12-24 14:30:03 UTC', 42);
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/table/time_group_compat_case2.golden.jsonc b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/time_group_compat_case2.golden.jsonc
new file mode 100644
index 0000000000000..76b059f924f77
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/time_group_compat_case2.golden.jsonc
@@ -0,0 +1,65 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT floor(extract(epoch from \"t\")/300)*300 ,avg(v) FROM tbl GROUP BY 1"
+//  }
+//  Name: 
+//  Dimensions: 2 Fields by 1 Rows
+//  +------------------+------------------+
+//  | Name: ?column?   | Name: avg        |
+//  | Labels:          | Labels:          |
+//  | Type: []*float64 | Type: []*float64 |
+//  +------------------+------------------+
+//  | 1.7034282e+09    | 42               |
+//  +------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT floor(extract(epoch from \"t\")/300)*300 ,avg(v) FROM tbl GROUP BY 1"
+        },
+        "fields": [
+          {
+            "name": "?column?",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "avg",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703428200
+          ],
+          [
+            42
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/table/time_group_compat_case2.sql b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/time_group_compat_case2.sql
new file mode 100644
index 0000000000000..2f6c4b9b0ea95
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/time_group_compat_case2.sql
@@ -0,0 +1,10 @@
+-- SELECT $__timeGroup("t",5m,NULL) ,avg(v) FROM tbl GROUP BY 1
+-- we change behavior based on what follows the timegroup, see:
+-- https://github.com/grafana/grafana/blob/0b4c81158ea32a671e7788b888b086082343407c/pkg/tsdb/grafana-postgresql-datasource/macros.go#L36
+CREATE TEMPORARY TABLE tbl (
+    t timestamp with time zone,
+    v double precision
+);
+
+INSERT INTO tbl (t, v) VALUES
+('2023-12-24 14:30:03 UTC', 42);
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/table/timestamp_convert_bigint.golden.jsonc b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/timestamp_convert_bigint.golden.jsonc
new file mode 100644
index 0000000000000..81fe927d20109
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/timestamp_convert_bigint.golden.jsonc
@@ -0,0 +1,113 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl"
+//  }
+//  Name: 
+//  Dimensions: 4 Fields by 4 Rows
+//  +--------------------------------------+-----------------------------------+---------------------+-----------------------------------+
+//  | Name: reallyt                        | Name: time                        | Name: n             | Name: timeend                     |
+//  | Labels:                              | Labels:                           | Labels:             | Labels:                           |
+//  | Type: []*time.Time                   | Type: []*time.Time                | Type: []*int64      | Type: []*time.Time                |
+//  +--------------------------------------+-----------------------------------+---------------------+-----------------------------------+
+//  | 2023-12-21 12:21:27 +0000 UTC        | 2023-12-21 12:21:27 +0000 UTC     | 1703161287          | 2023-12-21 12:21:52 +0000 UTC     |
+//  | 2023-12-21 12:21:27.724 +0000 UTC    | 2023-12-21 12:21:27.724 +0000 UTC | 1703161287724       | 2023-12-21 12:21:52.522 +0000 UTC |
+//  | 2023-12-21 12:21:27.724919 +0000 UTC | 2023-12-21 12:21:27.724 +0000 UTC | 1703161287724919000 | 2023-12-21 12:21:52.522 +0000 UTC |
+//  | null                                 | null                              | null                | null                              |
+//  +--------------------------------------+-----------------------------------+---------------------+-----------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl"
+        },
+        "fields": [
+          {
+            "name": "reallyt",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "n",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "timeend",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703161287000,
+            1703161287724,
+            1703161287724,
+            null
+          ],
+          [
+            1703161287000,
+            1703161287724,
+            1703161287724,
+            null
+          ],
+          [
+            1703161287,
+            1703161287724,
+            1703161287724919000,
+            null
+          ],
+          [
+            1703161312000,
+            1703161312522,
+            1703161312522,
+            null
+          ]
+        ],
+        "nanos": [
+          [
+            0,
+            0,
+            919000,
+            0
+          ],
+          null,
+          null,
+          null
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/table/timestamp_convert_bigint.sql b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/timestamp_convert_bigint.sql
new file mode 100644
index 0000000000000..fee2235c46bf4
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/timestamp_convert_bigint.sql
@@ -0,0 +1,14 @@
+-- SELECT * FROM tbl
+-- the time-field and time-end field gets converted to time.Time
+CREATE TEMPORARY TABLE tbl (
+    reallyt timestamp with time zone, -- reference real timestamp
+    "time" bigint,
+    n bigint, -- normal number, it should not get converted to a timestamp
+    timeend bigint
+);
+
+INSERT INTO tbl (reallyt, "time", n, timeend) VALUES
+('2023-12-21T12:21:27 UTC', 1703161287, 1703161287, 1703161312),
+('2023-12-21T12:21:27.724 UTC', 1703161287724, 1703161287724, 1703161312522),
+('2023-12-21T12:21:27.724919 UTC', 1703161287724919000, 1703161287724919000, 1703161312522186000),
+(NULL, NULL, NULL, NULL);
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/table/timestamp_convert_double.golden.jsonc b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/timestamp_convert_double.golden.jsonc
new file mode 100644
index 0000000000000..310adf7157d63
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/timestamp_convert_double.golden.jsonc
@@ -0,0 +1,113 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl"
+//  }
+//  Name: 
+//  Dimensions: 4 Fields by 4 Rows
+//  +--------------------------------------+-----------------------------------+-----------------------+-----------------------------------+
+//  | Name: reallyt                        | Name: time                        | Name: n               | Name: timeend                     |
+//  | Labels:                              | Labels:                           | Labels:               | Labels:                           |
+//  | Type: []*time.Time                   | Type: []*time.Time                | Type: []*float64      | Type: []*time.Time                |
+//  +--------------------------------------+-----------------------------------+-----------------------+-----------------------------------+
+//  | 2023-12-21 12:21:27 +0000 UTC        | 2023-12-21 12:21:27 +0000 UTC     | 1.703161287e+09       | 2023-12-21 12:21:52 +0000 UTC     |
+//  | 2023-12-21 12:21:27.724 +0000 UTC    | 2023-12-21 12:21:27.724 +0000 UTC | 1.703161287724e+12    | 2023-12-21 12:21:52.522 +0000 UTC |
+//  | 2023-12-21 12:21:27.724919 +0000 UTC | 2023-12-21 12:21:27.724 +0000 UTC | 1.703161287724919e+18 | 2023-12-21 12:21:52.522 +0000 UTC |
+//  | null                                 | null                              | null                  | null                              |
+//  +--------------------------------------+-----------------------------------+-----------------------+-----------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl"
+        },
+        "fields": [
+          {
+            "name": "reallyt",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "n",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "timeend",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703161287000,
+            1703161287724,
+            1703161287724,
+            null
+          ],
+          [
+            1703161287000,
+            1703161287724,
+            1703161287724,
+            null
+          ],
+          [
+            1703161287,
+            1703161287724,
+            1703161287724919000,
+            null
+          ],
+          [
+            1703161312000,
+            1703161312522,
+            1703161312522,
+            null
+          ]
+        ],
+        "nanos": [
+          [
+            0,
+            0,
+            919000,
+            0
+          ],
+          null,
+          null,
+          null
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/table/timestamp_convert_double.sql b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/timestamp_convert_double.sql
new file mode 100644
index 0000000000000..0ae41f6db66fc
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/timestamp_convert_double.sql
@@ -0,0 +1,14 @@
+-- SELECT * FROM tbl
+-- the time-field and time-end field gets converted to time.Time
+CREATE TEMPORARY TABLE tbl (
+    reallyt timestamp with time zone, -- reference real timestamp
+    "time" double precision,
+    n double precision, -- normal number, it should not get converted to a timestamp
+    timeend bigint
+);
+
+INSERT INTO tbl (reallyt, "time", n, timeend) VALUES
+('2023-12-21T12:21:27 UTC', 1703161287, 1703161287, 1703161312),
+('2023-12-21T12:21:27.724 UTC', 1703161287724, 1703161287724, 1703161312522),
+('2023-12-21T12:21:27.724919 UTC', 1703161287724919000, 1703161287724919000, 1703161312522186000),
+(NULL, NULL, NULL, NULL);
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/table/timestamp_convert_integer.golden.jsonc b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/timestamp_convert_integer.golden.jsonc
new file mode 100644
index 0000000000000..fefca8385abb7
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/timestamp_convert_integer.golden.jsonc
@@ -0,0 +1,92 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl"
+//  }
+//  Name: 
+//  Dimensions: 4 Fields by 2 Rows
+//  +-------------------------------+-------------------------------+----------------+-------------------------------+
+//  | Name: reallyt                 | Name: time                    | Name: n        | Name: timeend                 |
+//  | Labels:                       | Labels:                       | Labels:        | Labels:                       |
+//  | Type: []*time.Time            | Type: []*time.Time            | Type: []*int32 | Type: []*time.Time            |
+//  +-------------------------------+-------------------------------+----------------+-------------------------------+
+//  | 2023-12-21 12:21:27 +0000 UTC | 2023-12-21 12:21:27 +0000 UTC | 1703161287     | 2023-12-21 12:21:52 +0000 UTC |
+//  | null                          | null                          | null           | null                          |
+//  +-------------------------------+-------------------------------+----------------+-------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl"
+        },
+        "fields": [
+          {
+            "name": "reallyt",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "n",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int32",
+              "nullable": true
+            }
+          },
+          {
+            "name": "timeend",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703161287000,
+            null
+          ],
+          [
+            1703161287000,
+            null
+          ],
+          [
+            1703161287,
+            null
+          ],
+          [
+            1703161312000,
+            null
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/table/timestamp_convert_integer.sql b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/timestamp_convert_integer.sql
new file mode 100644
index 0000000000000..87bec5e98bea8
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/timestamp_convert_integer.sql
@@ -0,0 +1,12 @@
+-- SELECT * FROM tbl
+-- the time-field and time-end field gets converted to time.Time
+CREATE TEMPORARY TABLE tbl (
+    reallyt timestamp with time zone, -- reference real timestamp
+    "time" integer, -- 32bits, seconds-as-number is highest we can go, milliseconds-as-number does not fit
+    n integer, -- normal number, it should not get converted to a timestamp
+    timeend integer
+);
+
+INSERT INTO tbl (reallyt, "time", n, timeend) VALUES
+('2023-12-21T12:21:27 UTC', 1703161287, 1703161287, 1703161312),
+(NULL, NULL, NULL, NULL);
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/table/timestamp_convert_real.golden.jsonc b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/timestamp_convert_real.golden.jsonc
new file mode 100644
index 0000000000000..af23cf8b5bdbf
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/timestamp_convert_real.golden.jsonc
@@ -0,0 +1,113 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl"
+//  }
+//  Name: 
+//  Dimensions: 4 Fields by 4 Rows
+//  +--------------------------------------+-------------------------------+------------------+-----------------------------------+
+//  | Name: reallyt                        | Name: time                    | Name: n          | Name: timeend                     |
+//  | Labels:                              | Labels:                       | Labels:          | Labels:                           |
+//  | Type: []*time.Time                   | Type: []*time.Time            | Type: []*float64 | Type: []*time.Time                |
+//  +--------------------------------------+-------------------------------+------------------+-----------------------------------+
+//  | 2023-12-21 12:22:24 +0000 UTC        | 2023-12-21 12:21:40 +0000 UTC | 1.7031613e+09    | 2023-12-21 12:22:52 +0000 UTC     |
+//  | 2023-12-21 12:20:33.408 +0000 UTC    | 2023-12-21 12:20:00 +0000 UTC | 1.7031612e+12    | 2023-12-21 12:21:52.522 +0000 UTC |
+//  | 2023-12-21 12:20:41.050022 +0000 UTC | 2023-12-21 12:20:00 +0000 UTC | 1.7031612e+18    | 2023-12-21 12:21:52.522 +0000 UTC |
+//  | null                                 | null                          | null             | null                              |
+//  +--------------------------------------+-------------------------------+------------------+-----------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl"
+        },
+        "fields": [
+          {
+            "name": "reallyt",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "n",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "timeend",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703161344000,
+            1703161233408,
+            1703161241050,
+            null
+          ],
+          [
+            1703161300000,
+            1703161200000,
+            1703161200000,
+            null
+          ],
+          [
+            1703161300,
+            1703161200000,
+            1703161200000000000,
+            null
+          ],
+          [
+            1703161372000,
+            1703161312522,
+            1703161312522,
+            null
+          ]
+        ],
+        "nanos": [
+          [
+            0,
+            0,
+            22000,
+            0
+          ],
+          null,
+          null,
+          null
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/table/timestamp_convert_real.sql b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/timestamp_convert_real.sql
new file mode 100644
index 0000000000000..b0d00ce9773b4
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/timestamp_convert_real.sql
@@ -0,0 +1,14 @@
+-- SELECT * FROM tbl
+-- the time-field and time-end field gets converted to time.Time
+CREATE TEMPORARY TABLE tbl (
+    reallyt timestamp with time zone, -- reference real timestamp
+    "time" real,
+    n real, -- normal number, it should not get converted to a timestamp
+    timeend bigint
+);
+
+INSERT INTO tbl (reallyt, "time", n, timeend) VALUES
+('2023-12-21T12:22:24', 1703161344, 1703161344, 1703161372),
+('2023-12-21T12:20:33.408', 1703161233408, 1703161233408, 1703161312522),
+('2023-12-21T12:20:41.050022', 1703161241050021888, 1703161241050021888, 1703161312522186000),
+(NULL, NULL, NULL, NULL);
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_char.golden.jsonc b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_char.golden.jsonc
new file mode 100644
index 0000000000000..fb9afae767539
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_char.golden.jsonc
@@ -0,0 +1,140 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl"
+//  }
+//  Name: 
+//  Dimensions: 8 Fields by 2 Rows
+//  +-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+
+//  | Name: cv        | Name: cvnn      | Name: c         | Name: cnn       | Name: bpc       | Name: bpcnn     | Name: t         | Name: tnn       |
+//  | Labels:         | Labels:         | Labels:         | Labels:         | Labels:         | Labels:         | Labels:         | Labels:         |
+//  | Type: []*string | Type: []*string | Type: []*string | Type: []*string | Type: []*string | Type: []*string | Type: []*string | Type: []*string |
+//  +-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+
+//  | one             | two             | three           | four            | five            | six             | seven           | eight           |
+//  | null            | xtwo            | null            | xfour           | null            | xsix            | null            | xeight          |
+//  +-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl"
+        },
+        "fields": [
+          {
+            "name": "cv",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "cvnn",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "c",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "cnn",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "bpc",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "bpcnn",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "t",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "tnn",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "one",
+            null
+          ],
+          [
+            "two",
+            "xtwo"
+          ],
+          [
+            "three     ",
+            null
+          ],
+          [
+            "four      ",
+            "xfour     "
+          ],
+          [
+            "five",
+            null
+          ],
+          [
+            "six",
+            "xsix"
+          ],
+          [
+            "seven",
+            null
+          ],
+          [
+            "eight",
+            "xeight"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_char.sql b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_char.sql
new file mode 100644
index 0000000000000..34551aa9442b3
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_char.sql
@@ -0,0 +1,16 @@
+-- SELECT * FROM tbl
+-- test all character-based postgres data types
+CREATE TEMPORARY TABLE tbl (
+    cv character varying(10),
+    cvnn character varying(10) NOT NULL,
+    c character(10),
+    cnn character(10) NOT NULL,
+    bpc bpchar,
+    bpcnn bpchar NOT NULL,
+    t text,
+    tnn text NOT NULL
+);
+
+INSERT INTO tbl (cv, cvnn, c, cnn, bpc, bpcnn,  t, tnn) VALUES
+('one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight'),
+(NULL, 'xtwo', NULL, 'xfour', NULL, 'xsix', NULL, 'xeight');
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_datetime.golden.jsonc b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_datetime.golden.jsonc
new file mode 100644
index 0000000000000..48e55e7b077fa
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_datetime.golden.jsonc
@@ -0,0 +1,226 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl"
+//  }
+//  Name: 
+//  Dimensions: 12 Fields by 2 Rows
+//  +----------------------------------------+----------------------------------------+--------------------------------------+--------------------------------------+---------------------------------+---------------------------------+--------------------------------------+--------------------------------------+----------------------------------------+----------------------------------------+-----------------+-----------------+
+//  | Name: ts                               | Name: tsnn                             | Name: tsz                            | Name: tsznn                          | Name: d                         | Name: dnn                       | Name: t                              | Name: tnn                            | Name: tz                               | Name: tznn                             | Name: i         | Name: inn       |
+//  | Labels:                                | Labels:                                | Labels:                              | Labels:                              | Labels:                         | Labels:                         | Labels:                              | Labels:                              | Labels:                                | Labels:                                | Labels:         | Labels:         |
+//  | Type: []*time.Time                     | Type: []*time.Time                     | Type: []*time.Time                   | Type: []*time.Time                   | Type: []*time.Time              | Type: []*time.Time              | Type: []*time.Time                   | Type: []*time.Time                   | Type: []*time.Time                     | Type: []*time.Time                     | Type: []*string | Type: []*string |
+//  +----------------------------------------+----------------------------------------+--------------------------------------+--------------------------------------+---------------------------------+---------------------------------+--------------------------------------+--------------------------------------+----------------------------------------+----------------------------------------+-----------------+-----------------+
+//  | 2023-11-15 05:06:07.123456 +0000 +0000 | 2023-11-15 05:06:08.123456 +0000 +0000 | 2021-07-22 11:22:33.654321 +0000 UTC | 2021-07-22 11:22:34.654321 +0000 UTC | 2023-12-20 00:00:00 +0000 +0000 | 2023-12-21 00:00:00 +0000 +0000 | 0000-01-01 12:34:56.234567 +0000 UTC | 0000-01-01 12:34:57.234567 +0000 UTC | 0000-01-01 23:12:36.765432 +0100 +0100 | 0000-01-01 23:12:37.765432 +0100 +0100 | 00:00:00.987654 | 00:00:00.887654 |
+//  | null                                   | 2023-11-15 05:06:09.123456 +0000 +0000 | null                                 | 2021-07-22 11:22:35.654321 +0000 UTC | null                            | 2023-12-22 00:00:00 +0000 +0000 | null                                 | 0000-01-01 12:34:58.234567 +0000 UTC | null                                   | 0000-01-01 23:12:38.765432 +0100 +0100 | null            | 00:00:00.787654 |
+//  +----------------------------------------+----------------------------------------+--------------------------------------+--------------------------------------+---------------------------------+---------------------------------+--------------------------------------+--------------------------------------+----------------------------------------+----------------------------------------+-----------------+-----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl"
+        },
+        "fields": [
+          {
+            "name": "ts",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "tsnn",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "tsz",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "tsznn",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "d",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "dnn",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "t",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "tnn",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "tz",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "tznn",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "i",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "inn",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700024767123,
+            null
+          ],
+          [
+            1700024768123,
+            1700024769123
+          ],
+          [
+            1626952953654,
+            null
+          ],
+          [
+            1626952954654,
+            1626952955654
+          ],
+          [
+            1703030400000,
+            null
+          ],
+          [
+            1703116800000,
+            1703203200000
+          ],
+          [
+            -62167173903766,
+            null
+          ],
+          [
+            -62167173902766,
+            -62167173901766
+          ],
+          [
+            -62167139243235,
+            null
+          ],
+          [
+            -62167139242235,
+            -62167139241235
+          ],
+          [
+            "00:00:00.987654",
+            null
+          ],
+          [
+            "00:00:00.887654",
+            "00:00:00.787654"
+          ]
+        ],
+        "nanos": [
+          [
+            456000,
+            0
+          ],
+          [
+            456000,
+            456000
+          ],
+          [
+            321000,
+            0
+          ],
+          [
+            321000,
+            321000
+          ],
+          null,
+          null,
+          [
+            567000,
+            0
+          ],
+          [
+            567000,
+            567000
+          ],
+          [
+            432000,
+            0
+          ],
+          [
+            432000,
+            432000
+          ],
+          null,
+          null
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_datetime.sql b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_datetime.sql
new file mode 100644
index 0000000000000..d81b3ca235bd1
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_datetime.sql
@@ -0,0 +1,44 @@
+-- SELECT * FROM tbl
+-- test all date/time-based postgres data types
+CREATE TEMPORARY TABLE tbl (
+    ts timestamp,
+    tsnn timestamp NOT NULL,
+    tsz timestamp with time zone,
+    tsznn timestamp with time zone NOT NULL,
+    d date,
+    dnn date NOT NULL,
+    t time,
+    tnn time NOT NULL,
+    tz time with time zone,
+    tznn time with time zone NOT NULL,
+    i interval,
+    inn interval NOT NULL
+);
+
+INSERT INTO tbl (ts, tsnn, tsz, tsznn, d, dnn, t, tnn, tz, tznn, i, inn) VALUES (
+'2023-11-15 05:06:07.123456',
+'2023-11-15 05:06:08.123456',
+'2021-07-22 13:22:33.654321 Europe/Berlin',
+'2021-07-22 13:22:34.654321 Europe/Berlin',
+'2023-12-20',
+'2023-12-21',
+'12:34:56.234567',
+'12:34:57.234567',
+'23:12:36.765432+1',
+'23:12:37.765432+1',
+'987654 microsecond',
+'887654 microsecond'
+), (
+NULL,
+'2023-11-15 05:06:09.123456',
+NULL,
+'2021-07-22 13:22:35.654321 Europe/Berlin',
+NULL,
+'2023-12-22',
+NULL,
+'12:34:58.234567',
+NULL,
+'23:12:38.765432+1',
+NULL,
+'787654 microsecond'
+);
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_numeric.golden.jsonc b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_numeric.golden.jsonc
new file mode 100644
index 0000000000000..d8ac6c700a6a1
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_numeric.golden.jsonc
@@ -0,0 +1,188 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl"
+//  }
+//  Name: 
+//  Dimensions: 12 Fields by 2 Rows
+//  +----------------+----------------+----------------+----------------+----------------+----------------+------------------+------------------+------------------+------------------+------------------+------------------+
+//  | Name: i16      | Name: i16nn    | Name: i32      | Name: i32nn    | Name: i64      | Name: i64nn    | Name: n          | Name: nnn        | Name: f32        | Name: f32nn      | Name: f64        | Name: f64nn      |
+//  | Labels:        | Labels:        | Labels:        | Labels:        | Labels:        | Labels:        | Labels:          | Labels:          | Labels:          | Labels:          | Labels:          | Labels:          |
+//  | Type: []*int16 | Type: []*int16 | Type: []*int32 | Type: []*int32 | Type: []*int64 | Type: []*int64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 |
+//  +----------------+----------------+----------------+----------------+----------------+----------------+------------------+------------------+------------------+------------------+------------------+------------------+
+//  | 1              | 2              | 3              | 4              | 5              | 6              | 81.75            | 7065.25          | 30.75            | 14.625           | 21.5625          | 14.25            |
+//  | null           | 22             | null           | 44             | null           | 66             | null             | 169.75           | null             | 77.125           | null             | 215.8125         |
+//  +----------------+----------------+----------------+----------------+----------------+----------------+------------------+------------------+------------------+------------------+------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl"
+        },
+        "fields": [
+          {
+            "name": "i16",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int16",
+              "nullable": true
+            }
+          },
+          {
+            "name": "i16nn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int16",
+              "nullable": true
+            }
+          },
+          {
+            "name": "i32",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int32",
+              "nullable": true
+            }
+          },
+          {
+            "name": "i32nn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int32",
+              "nullable": true
+            }
+          },
+          {
+            "name": "i64",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "i64nn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "n",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "nnn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "f32",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "f32nn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "f64",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "f64nn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1,
+            null
+          ],
+          [
+            2,
+            22
+          ],
+          [
+            3,
+            null
+          ],
+          [
+            4,
+            44
+          ],
+          [
+            5,
+            null
+          ],
+          [
+            6,
+            66
+          ],
+          [
+            81.75,
+            null
+          ],
+          [
+            7065.25,
+            169.75
+          ],
+          [
+            30.75,
+            null
+          ],
+          [
+            14.625,
+            77.125
+          ],
+          [
+            21.5625,
+            null
+          ],
+          [
+            14.25,
+            215.8125
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_numeric.sql b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_numeric.sql
new file mode 100644
index 0000000000000..cd8a5c15f5199
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_numeric.sql
@@ -0,0 +1,20 @@
+-- SELECT * FROM tbl
+-- test all numeric postgres data types
+CREATE TEMPORARY TABLE tbl (
+    i16 smallint,
+    i16nn smallint NOT NULL,
+    i32 integer,
+    i32nn integer NOT NULL,
+    i64 bigint,
+    i64nn bigint NOT NULL,
+    n numeric(7, 2),
+    nnn numeric(7,2) NOT NULL,
+    f32 real,
+    f32nn real NOT NULL,
+    f64 double precision,
+    f64nn double precision NOT NULL
+);
+
+INSERT INTO tbl (i16, i16nn, i32, i32nn, i64, i64nn, n, nnn, f32, f32nn, f64, f64nn) VALUES
+(1, 2, 3, 4, 5, 6, 81.75, 7065.25, 30.75, 14.625, 21.5625, 14.25),
+(NULL, 22, NULL, 44, NULL, 66, NULL, 169.75, NULL, 77.125, NULL, 215.8125);
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_other.golden.jsonc b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_other.golden.jsonc
new file mode 100644
index 0000000000000..f0eb0ba94048f
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_other.golden.jsonc
@@ -0,0 +1,123 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl"
+//  }
+//  Name: 
+//  Dimensions: 6 Fields by 3 Rows
+//  +-----------------+-----------------+-----------------+-----------------+---------------+---------------+
+//  | Name: m         | Name: mnn       | Name: bt        | Name: btnn      | Name: bl      | Name: blnn    |
+//  | Labels:         | Labels:         | Labels:         | Labels:         | Labels:       | Labels:       |
+//  | Type: []*string | Type: []*string | Type: []*string | Type: []*string | Type: []*bool | Type: []*bool |
+//  +-----------------+-----------------+-----------------+-----------------+---------------+---------------+
+//  | $12.34          | $23.45          | ABCD            | EFGH            | true          | true          |
+//  | $12.34          | $23.45          | QRST            | UVWX            | false         | false         |
+//  | null            | $34.56          | null            | abcd            | null          | true          |
+//  +-----------------+-----------------+-----------------+-----------------+---------------+---------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl"
+        },
+        "fields": [
+          {
+            "name": "m",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "mnn",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "bt",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "btnn",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "bl",
+            "type": "boolean",
+            "typeInfo": {
+              "frame": "bool",
+              "nullable": true
+            }
+          },
+          {
+            "name": "blnn",
+            "type": "boolean",
+            "typeInfo": {
+              "frame": "bool",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "$12.34",
+            "$12.34",
+            null
+          ],
+          [
+            "$23.45",
+            "$23.45",
+            "$34.56"
+          ],
+          [
+            "ABCD",
+            "QRST",
+            null
+          ],
+          [
+            "EFGH",
+            "UVWX",
+            "abcd"
+          ],
+          [
+            true,
+            false,
+            null
+          ],
+          [
+            true,
+            false,
+            true
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_other.sql b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_other.sql
new file mode 100644
index 0000000000000..0d8c2e87920c8
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/table/types_other.sql
@@ -0,0 +1,15 @@
+-- SELECT * FROM tbl
+-- test the less used postgres data types
+CREATE TEMPORARY TABLE tbl (
+    m money,
+    mnn money NOT NULL,
+    bt bytea,
+    btnn bytea NOT NULL,
+    bl boolean,
+    blnn boolean NOT NULL
+);
+
+INSERT INTO tbl (m, mnn, bt, btnn, bl, blnn) VALUES
+(12.34, 23.45, '\x41424344'::bytea, '\x45464748'::bytea, TRUE, TRUE),
+(12.34, 23.45, '\x51525354'::bytea, '\x55565758'::bytea, FALSE, FALSE),
+(NULL, 34.56, NULL, '\x61626364'::bytea, NULL, TRUE);
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/7x_compat_metric_label.golden.jsonc b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/7x_compat_metric_label.golden.jsonc
new file mode 100644
index 0000000000000..4bbf17b84250e
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/7x_compat_metric_label.golden.jsonc
@@ -0,0 +1,93 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "timeseries-wide",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl"
+//  }
+//  Name: 
+//  Dimensions: 3 Fields by 5 Rows
+//  +-------------------------------+------------------+------------------+
+//  | Name: Time                    | Name: a          | Name: b          |
+//  | Labels:                       | Labels:          | Labels:          |
+//  | Type: []time.Time             | Type: []*float64 | Type: []*float64 |
+//  +-------------------------------+------------------+------------------+
+//  | 2023-12-24 14:30:03 +0000 UTC | 10               | 110              |
+//  | 2023-12-24 14:31:03 +0000 UTC | 20               | 120              |
+//  | 2023-12-24 14:32:03 +0000 UTC | 30               | 130              |
+//  | 2023-12-24 14:33:03 +0000 UTC | 40               | 140              |
+//  | 2023-12-24 14:34:03 +0000 UTC | 50               | 150              |
+//  +-------------------------------+------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-wide",
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "a",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "b",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703428203000,
+            1703428263000,
+            1703428323000,
+            1703428383000,
+            1703428443000
+          ],
+          [
+            10,
+            20,
+            30,
+            40,
+            50
+          ],
+          [
+            110,
+            120,
+            130,
+            140,
+            150
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/7x_compat_metric_label.sql b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/7x_compat_metric_label.sql
new file mode 100644
index 0000000000000..8e3256f47893a
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/7x_compat_metric_label.sql
@@ -0,0 +1,19 @@
+-- SELECT * FROM tbl
+-- there's special backward-compat code which handles a field named 'metric'
+CREATE TEMPORARY TABLE tbl (
+    "time" timestamp with time zone,
+    v double precision,
+    metric text
+);
+
+INSERT INTO tbl ("time", v, metric) VALUES
+('2023-12-24 14:30:03 UTC', 10, 'a'),
+('2023-12-24 14:30:03 UTC', 110, 'b'),
+('2023-12-24 14:31:03 UTC', 20, 'a'),
+('2023-12-24 14:31:03 UTC', 120, 'b'),
+('2023-12-24 14:32:03 UTC', 30, 'a'),
+('2023-12-24 14:32:03 UTC', 130, 'b'),
+('2023-12-24 14:33:03 UTC', 40, 'a'),
+('2023-12-24 14:33:03 UTC', 140, 'b'),
+('2023-12-24 14:34:03 UTC', 50, 'a'),
+('2023-12-24 14:34:03 UTC', 150, 'b');
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/convert_to_float64.golden.jsonc b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/convert_to_float64.golden.jsonc
new file mode 100644
index 0000000000000..7411c92183709
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/convert_to_float64.golden.jsonc
@@ -0,0 +1,207 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "timeseries-wide",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl"
+//  }
+//  Name: 
+//  Dimensions: 11 Fields by 2 Rows
+//  +-------------------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+
+//  | Name: Time                    | Name: v1         | Name: v1nn       | Name: v2         | Name: v2nn       | Name: x1         | Name: x1nn       | Name: x2         | Name: x2nn       | Name: x3         | Name: x3nn       |
+//  | Labels:                       | Labels: t=one    | Labels: t=one    | Labels: t=one    | Labels: t=one    | Labels: t=one    | Labels: t=one    | Labels: t=one    | Labels: t=one    | Labels: t=one    | Labels: t=one    |
+//  | Type: []time.Time             | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 |
+//  +-------------------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+
+//  | 2023-12-21 11:30:03 +0000 UTC | 3.78125          | 451.5625         | 52.25            | 511.3125         | 101              | 102              | 103              | 104              | 105              | 106              |
+//  | 2023-12-21 11:31:03 +0000 UTC | null             | 464.375          | null             | 346.125          | null             | 202              | null             | 204              | null             | 206              |
+//  +-------------------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-wide",
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "v1",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "t": "one"
+            }
+          },
+          {
+            "name": "v1nn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "t": "one"
+            }
+          },
+          {
+            "name": "v2",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "t": "one"
+            }
+          },
+          {
+            "name": "v2nn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "t": "one"
+            }
+          },
+          {
+            "name": "x1",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "t": "one"
+            }
+          },
+          {
+            "name": "x1nn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "t": "one"
+            }
+          },
+          {
+            "name": "x2",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "t": "one"
+            }
+          },
+          {
+            "name": "x2nn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "t": "one"
+            }
+          },
+          {
+            "name": "x3",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "t": "one"
+            }
+          },
+          {
+            "name": "x3nn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "t": "one"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703158203000,
+            1703158263000
+          ],
+          [
+            3.78125,
+            null
+          ],
+          [
+            451.5625,
+            464.375
+          ],
+          [
+            52.25,
+            null
+          ],
+          [
+            511.3125,
+            346.125
+          ],
+          [
+            101,
+            null
+          ],
+          [
+            102,
+            202
+          ],
+          [
+            103,
+            null
+          ],
+          [
+            104,
+            204
+          ],
+          [
+            105,
+            null
+          ],
+          [
+            106,
+            206
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/convert_to_float64.sql b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/convert_to_float64.sql
new file mode 100644
index 0000000000000..9cce0c3b107e3
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/convert_to_float64.sql
@@ -0,0 +1,29 @@
+-- SELECT * FROM tbl
+-- in timeseries mode, most fields gets converted to float64
+CREATE TEMPORARY TABLE tbl (
+    "time" timestamp with time zone,
+    v1 double precision,
+    v1nn double precision NOT NULL,
+    v2 real,
+    v2nn real NOT NULL,
+    t text,
+    x1 smallint,
+    x1nn smallint NOT NULL,
+    x2 integer,
+    x2nn integer NOT NULL,
+    x3 bigint,
+    x3nn bigint NOT NULL
+);
+
+INSERT INTO tbl ("time",
+v1, v1nn, v2, v2nn,
+t,
+x1, x1nn, x2, x2nn, x3, x3nn) VALUES
+('2023-12-21 11:30:03 UTC',
+3.78125, 451.5625, 52.25, 511.3125,
+'one',
+101, 102, 103, 104, 105, 106),
+('2023-12-21 11:31:03 UTC',
+NULL, 464.375, NULL, 346.125,
+'one',
+NULL, 202, NULL, 204, NULL, 206);
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/convert_to_float64_not.golden.jsonc b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/convert_to_float64_not.golden.jsonc
new file mode 100644
index 0000000000000..df0fcf391436a
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/convert_to_float64_not.golden.jsonc
@@ -0,0 +1,97 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "timeseries-wide",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl"
+//  }
+//  Name: 
+//  Dimensions: 3 Fields by 2 Rows
+//  +-------------------------------+--------------------------------------------------------------------+-------------------------------------------------------------------------------+
+//  | Name: Time                    | Name: v                                                            | Name: v                                                                       |
+//  | Labels:                       | Labels: c1=, c1nn=twelve, c2=, c2nn=fourteen, c3=, c3nn=sixteen    | Labels: c1=one, c1nn=two, c2=three, c2nn=four, c3=five      , c3nn=six        |
+//  | Type: []time.Time             | Type: []*float64                                                   | Type: []*float64                                                              |
+//  +-------------------------------+--------------------------------------------------------------------+-------------------------------------------------------------------------------+
+//  | 2023-12-21 11:30:03 +0000 UTC | null                                                               | 10.1                                                                          |
+//  | 2023-12-21 11:31:03 +0000 UTC | 20.1                                                               | null                                                                          |
+//  +-------------------------------+--------------------------------------------------------------------+-------------------------------------------------------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-wide",
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "v",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "c1": "",
+              "c1nn": "twelve",
+              "c2": "",
+              "c2nn": "fourteen",
+              "c3": "",
+              "c3nn": "sixteen   "
+            }
+          },
+          {
+            "name": "v",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "c1": "one",
+              "c1nn": "two",
+              "c2": "three",
+              "c2nn": "four",
+              "c3": "five      ",
+              "c3nn": "six       "
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703158203000,
+            1703158263000
+          ],
+          [
+            null,
+            20.1
+          ],
+          [
+            10.1,
+            null
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/convert_to_float64_not.sql b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/convert_to_float64_not.sql
new file mode 100644
index 0000000000000..e360e7fe164de
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/convert_to_float64_not.sql
@@ -0,0 +1,22 @@
+-- SELECT * FROM tbl
+-- in timeseries mode, most fields gets converted to float64, but text-fields should stay text
+CREATE TEMPORARY TABLE tbl (
+    "time" timestamp with time zone,
+    v double precision NOT NULL,
+    c1 text,
+    c1nn text NOT NULL,
+    c2 varchar(10),
+    c2nn varchar(10) NOT NULL,
+    c3 char(10),
+    c3nn char(10) NOT NULL
+);
+
+INSERT INTO tbl ("time",
+v,
+c1, c1nn, c2, c2nn, c3, c3nn) VALUES
+('2023-12-21 11:30:03 UTC',
+10.1,
+'one', 'two', 'three', 'four', 'five', 'six'),
+('2023-12-21 11:31:03 UTC',
+20.1,
+NULL, 'twelve', NULL, 'fourteen', NULL, 'sixteen');
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/fill_null.golden.jsonc b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/fill_null.golden.jsonc
new file mode 100644
index 0000000000000..ce457d9d7335d
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/fill_null.golden.jsonc
@@ -0,0 +1,107 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "timeseries-wide",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT floor(extract(epoch from \"time\")/300)*300 AS \"time\",c,avg(v) AS \"v\" FROM tbl GROUP BY 1,2 ORDER BY 1,2"
+//  }
+//  Name: 
+//  Dimensions: 3 Fields by 7 Rows
+//  +-------------------------------+------------------+------------------+
+//  | Name: Time                    | Name: v          | Name: v          |
+//  | Labels:                       | Labels: c=a      | Labels: c=b      |
+//  | Type: []time.Time             | Type: []*float64 | Type: []*float64 |
+//  +-------------------------------+------------------+------------------+
+//  | 2023-12-24 14:15:00 +0000 UTC | null             | null             |
+//  | 2023-12-24 14:20:00 +0000 UTC | 15               | 115              |
+//  | 2023-12-24 14:25:00 +0000 UTC | null             | null             |
+//  | 2023-12-24 14:30:00 +0000 UTC | null             | null             |
+//  | 2023-12-24 14:35:00 +0000 UTC | 50               | 150              |
+//  | 2023-12-24 14:40:00 +0000 UTC | null             | null             |
+//  | 2023-12-24 14:45:00 +0000 UTC | null             | null             |
+//  +-------------------------------+------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-wide",
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT floor(extract(epoch from \"time\")/300)*300 AS \"time\",c,avg(v) AS \"v\" FROM tbl GROUP BY 1,2 ORDER BY 1,2"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "v",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "c": "a"
+            }
+          },
+          {
+            "name": "v",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "c": "b"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703427300000,
+            1703427600000,
+            1703427900000,
+            1703428200000,
+            1703428500000,
+            1703428800000,
+            1703429100000
+          ],
+          [
+            null,
+            15,
+            null,
+            null,
+            50,
+            null,
+            null
+          ],
+          [
+            null,
+            115,
+            null,
+            null,
+            150,
+            null,
+            null
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/fill_null.sql b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/fill_null.sql
new file mode 100644
index 0000000000000..d3ae81dad8fd5
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/fill_null.sql
@@ -0,0 +1,15 @@
+-- SELECT $__timeGroup("time",5m,NULL),c,avg(v) AS "v" FROM tbl GROUP BY 1,2 ORDER BY 1,2
+-- tests fill-mode=null
+CREATE TEMPORARY TABLE tbl (
+    "time" timestamp with time zone,
+    v double precision,
+    c text
+);
+
+INSERT INTO tbl ("time", v, c) VALUES
+('2023-12-24 14:21:03 UTC', 10, 'a'),
+('2023-12-24 14:21:03 UTC', 110, 'b'),
+('2023-12-24 14:23:03 UTC', 20, 'a'),
+('2023-12-24 14:23:03 UTC', 120, 'b'),
+('2023-12-24 14:39:03 UTC', 50, 'a'),
+('2023-12-24 14:39:03 UTC', 150, 'b');
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/fill_previous.golden.jsonc b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/fill_previous.golden.jsonc
new file mode 100644
index 0000000000000..a6ba3b9f68ab0
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/fill_previous.golden.jsonc
@@ -0,0 +1,107 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "timeseries-wide",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT floor(extract(epoch from \"time\")/300)*300 AS \"time\",c,avg(v) AS \"v\" FROM tbl GROUP BY 1,2 ORDER BY 1,2"
+//  }
+//  Name: 
+//  Dimensions: 3 Fields by 7 Rows
+//  +-------------------------------+------------------+------------------+
+//  | Name: Time                    | Name: v          | Name: v          |
+//  | Labels:                       | Labels: c=a      | Labels: c=b      |
+//  | Type: []time.Time             | Type: []*float64 | Type: []*float64 |
+//  +-------------------------------+------------------+------------------+
+//  | 2023-12-24 14:15:00 +0000 UTC | null             | null             |
+//  | 2023-12-24 14:20:00 +0000 UTC | 15               | 115              |
+//  | 2023-12-24 14:25:00 +0000 UTC | 15               | 115              |
+//  | 2023-12-24 14:30:00 +0000 UTC | 15               | 115              |
+//  | 2023-12-24 14:35:00 +0000 UTC | 50               | 150              |
+//  | 2023-12-24 14:40:00 +0000 UTC | 50               | 150              |
+//  | 2023-12-24 14:45:00 +0000 UTC | 50               | 150              |
+//  +-------------------------------+------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-wide",
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT floor(extract(epoch from \"time\")/300)*300 AS \"time\",c,avg(v) AS \"v\" FROM tbl GROUP BY 1,2 ORDER BY 1,2"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "v",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "c": "a"
+            }
+          },
+          {
+            "name": "v",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "c": "b"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703427300000,
+            1703427600000,
+            1703427900000,
+            1703428200000,
+            1703428500000,
+            1703428800000,
+            1703429100000
+          ],
+          [
+            null,
+            15,
+            15,
+            15,
+            50,
+            50,
+            50
+          ],
+          [
+            null,
+            115,
+            115,
+            115,
+            150,
+            150,
+            150
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/fill_previous.sql b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/fill_previous.sql
new file mode 100644
index 0000000000000..625155a9e78e2
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/fill_previous.sql
@@ -0,0 +1,15 @@
+-- SELECT $__timeGroup("time",5m,previous),c,avg(v) AS "v" FROM tbl GROUP BY 1,2 ORDER BY 1,2
+-- tests fill-mode=previous
+CREATE TEMPORARY TABLE tbl (
+    "time" timestamp with time zone,
+    v double precision,
+    c text
+);
+
+INSERT INTO tbl ("time", v, c) VALUES
+('2023-12-24 14:21:03 UTC', 10, 'a'),
+('2023-12-24 14:21:03 UTC', 110, 'b'),
+('2023-12-24 14:23:03 UTC', 20, 'a'),
+('2023-12-24 14:23:03 UTC', 120, 'b'),
+('2023-12-24 14:39:03 UTC', 50, 'a'),
+('2023-12-24 14:39:03 UTC', 150, 'b');
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/fill_value.golden.jsonc b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/fill_value.golden.jsonc
new file mode 100644
index 0000000000000..a0d1acc4ec618
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/fill_value.golden.jsonc
@@ -0,0 +1,107 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "timeseries-wide",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT floor(extract(epoch from \"time\")/300)*300 AS \"time\",c,avg(v) AS \"v\" FROM tbl GROUP BY 1,2 ORDER BY 1,2"
+//  }
+//  Name: 
+//  Dimensions: 3 Fields by 7 Rows
+//  +-------------------------------+------------------+------------------+
+//  | Name: Time                    | Name: v          | Name: v          |
+//  | Labels:                       | Labels: c=a      | Labels: c=b      |
+//  | Type: []time.Time             | Type: []*float64 | Type: []*float64 |
+//  +-------------------------------+------------------+------------------+
+//  | 2023-12-24 14:15:00 +0000 UTC | 27               | 27               |
+//  | 2023-12-24 14:20:00 +0000 UTC | 15               | 115              |
+//  | 2023-12-24 14:25:00 +0000 UTC | 27               | 27               |
+//  | 2023-12-24 14:30:00 +0000 UTC | 27               | 27               |
+//  | 2023-12-24 14:35:00 +0000 UTC | 50               | 150              |
+//  | 2023-12-24 14:40:00 +0000 UTC | 27               | 27               |
+//  | 2023-12-24 14:45:00 +0000 UTC | 27               | 27               |
+//  +-------------------------------+------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-wide",
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT floor(extract(epoch from \"time\")/300)*300 AS \"time\",c,avg(v) AS \"v\" FROM tbl GROUP BY 1,2 ORDER BY 1,2"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "v",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "c": "a"
+            }
+          },
+          {
+            "name": "v",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "c": "b"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703427300000,
+            1703427600000,
+            1703427900000,
+            1703428200000,
+            1703428500000,
+            1703428800000,
+            1703429100000
+          ],
+          [
+            27,
+            15,
+            27,
+            27,
+            50,
+            27,
+            27
+          ],
+          [
+            27,
+            115,
+            27,
+            27,
+            150,
+            27,
+            27
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/fill_value.sql b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/fill_value.sql
new file mode 100644
index 0000000000000..a986288e241c1
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/fill_value.sql
@@ -0,0 +1,15 @@
+-- SELECT $__timeGroup("time",5m,27),c,avg(v) AS "v" FROM tbl GROUP BY 1,2 ORDER BY 1,2
+-- tests fill-mode=value
+CREATE TEMPORARY TABLE tbl (
+    "time" timestamp with time zone,
+    v double precision,
+    c text
+);
+
+INSERT INTO tbl ("time", v, c) VALUES
+('2023-12-24 14:21:03 UTC', 10, 'a'),
+('2023-12-24 14:21:03 UTC', 110, 'b'),
+('2023-12-24 14:23:03 UTC', 20, 'a'),
+('2023-12-24 14:23:03 UTC', 120, 'b'),
+('2023-12-24 14:39:03 UTC', 50, 'a'),
+('2023-12-24 14:39:03 UTC', 150, 'b');
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/fill_value_wide.golden.jsonc b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/fill_value_wide.golden.jsonc
new file mode 100644
index 0000000000000..16287fc206fab
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/fill_value_wide.golden.jsonc
@@ -0,0 +1,100 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT floor(extract(epoch from \"time\")/300)*300 AS \"time\",avg(v1) AS \"v1\", avg(v2) AS \"v2\" FROM tbl GROUP BY 1 ORDER BY 1"
+//  }
+//  Name: 
+//  Dimensions: 3 Fields by 7 Rows
+//  +-------------------------------+------------------+------------------+
+//  | Name: Time                    | Name: v1         | Name: v2         |
+//  | Labels:                       | Labels:          | Labels:          |
+//  | Type: []*time.Time            | Type: []*float64 | Type: []*float64 |
+//  +-------------------------------+------------------+------------------+
+//  | 2023-12-24 14:15:00 +0000 UTC | 27               | 27               |
+//  | 2023-12-24 14:20:00 +0000 UTC | 15               | 115              |
+//  | 2023-12-24 14:25:00 +0000 UTC | 27               | 27               |
+//  | 2023-12-24 14:30:00 +0000 UTC | 27               | 27               |
+//  | 2023-12-24 14:35:00 +0000 UTC | 50               | 150              |
+//  | 2023-12-24 14:40:00 +0000 UTC | 27               | 27               |
+//  | 2023-12-24 14:45:00 +0000 UTC | 27               | 27               |
+//  +-------------------------------+------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT floor(extract(epoch from \"time\")/300)*300 AS \"time\",avg(v1) AS \"v1\", avg(v2) AS \"v2\" FROM tbl GROUP BY 1 ORDER BY 1"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "v1",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "v2",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703427300000,
+            1703427600000,
+            1703427900000,
+            1703428200000,
+            1703428500000,
+            1703428800000,
+            1703429100000
+          ],
+          [
+            27,
+            15,
+            27,
+            27,
+            50,
+            27,
+            27
+          ],
+          [
+            27,
+            115,
+            27,
+            27,
+            150,
+            27,
+            27
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/fill_value_wide.sql b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/fill_value_wide.sql
new file mode 100644
index 0000000000000..f0171e5d7fcc2
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/fill_value_wide.sql
@@ -0,0 +1,12 @@
+-- SELECT $__timeGroup("time",5m,27),avg(v1) AS "v1", avg(v2) AS "v2" FROM tbl GROUP BY 1 ORDER BY 1
+-- tests fill-mode=value
+CREATE TEMPORARY TABLE tbl (
+    "time" timestamp with time zone,
+    v1 double precision,
+    v2 double precision
+);
+
+INSERT INTO tbl ("time", v1, v2) VALUES
+('2023-12-24 14:21:03 UTC', 10, 110),
+('2023-12-24 14:23:03 UTC', 20, 120),
+('2023-12-24 14:39:03 UTC', 50, 150);
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/no_rows_long.golden.jsonc b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/no_rows_long.golden.jsonc
new file mode 100644
index 0000000000000..2cc0ccc47b8b5
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/no_rows_long.golden.jsonc
@@ -0,0 +1,36 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl WHERE false"
+//  }
+//  Name: 
+//  Dimensions: 0 Fields by 0 Rows
+//  +
+//  +
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl WHERE false"
+        },
+        "fields": []
+      },
+      "data": {
+        "values": []
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/no_rows_long.sql b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/no_rows_long.sql
new file mode 100644
index 0000000000000..bae1feff9f14a
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/no_rows_long.sql
@@ -0,0 +1,12 @@
+-- SELECT * FROM tbl WHERE false
+CREATE TEMPORARY TABLE tbl (
+    "time" timestamp with time zone,
+    v double precision,
+    c text
+);
+
+INSERT INTO tbl ("time", v, c) VALUES
+('2023-12-24 14:30:03 UTC', 10, 'a'),
+('2023-12-24 14:30:03 UTC', 110, 'b'),
+('2023-12-24 14:31:03 UTC', 20, 'a'),
+('2023-12-24 14:31:03 UTC', 120, 'b');
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/no_rows_wide.golden.jsonc b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/no_rows_wide.golden.jsonc
new file mode 100644
index 0000000000000..2cc0ccc47b8b5
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/no_rows_wide.golden.jsonc
@@ -0,0 +1,36 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl WHERE false"
+//  }
+//  Name: 
+//  Dimensions: 0 Fields by 0 Rows
+//  +
+//  +
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl WHERE false"
+        },
+        "fields": []
+      },
+      "data": {
+        "values": []
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/no_rows_wide.sql b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/no_rows_wide.sql
new file mode 100644
index 0000000000000..b34df7a065036
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/no_rows_wide.sql
@@ -0,0 +1,10 @@
+-- SELECT * FROM tbl WHERE false
+CREATE TEMPORARY TABLE tbl (
+    "time" timestamp with time zone,
+    v1 double precision,
+    v2 double precision
+);
+
+INSERT INTO tbl ("time", v1, v2) VALUES
+('2023-12-24 14:30:03 UTC', 10, 110),
+('2023-12-24 14:31:03 UTC', 20, 120);
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/simple.golden.jsonc b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/simple.golden.jsonc
new file mode 100644
index 0000000000000..c8075f2b65b40
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/simple.golden.jsonc
@@ -0,0 +1,99 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "timeseries-wide",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl"
+//  }
+//  Name: 
+//  Dimensions: 3 Fields by 5 Rows
+//  +-------------------------------+------------------+------------------+
+//  | Name: Time                    | Name: v          | Name: v          |
+//  | Labels:                       | Labels: c=a      | Labels: c=b      |
+//  | Type: []time.Time             | Type: []*float64 | Type: []*float64 |
+//  +-------------------------------+------------------+------------------+
+//  | 2023-12-24 14:30:03 +0000 UTC | 10               | 110              |
+//  | 2023-12-24 14:31:03 +0000 UTC | 20               | 120              |
+//  | 2023-12-24 14:32:03 +0000 UTC | 30               | 130              |
+//  | 2023-12-24 14:33:03 +0000 UTC | 40               | 140              |
+//  | 2023-12-24 14:34:03 +0000 UTC | 50               | 150              |
+//  +-------------------------------+------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-wide",
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "v",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "c": "a"
+            }
+          },
+          {
+            "name": "v",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "c": "b"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703428203000,
+            1703428263000,
+            1703428323000,
+            1703428383000,
+            1703428443000
+          ],
+          [
+            10,
+            20,
+            30,
+            40,
+            50
+          ],
+          [
+            110,
+            120,
+            130,
+            140,
+            150
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/simple.sql b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/simple.sql
new file mode 100644
index 0000000000000..b89651e591d16
--- /dev/null
+++ b/pkg/tsdb/grafana-postgresql-datasource/testdata/time_series/simple.sql
@@ -0,0 +1,18 @@
+-- SELECT * FROM tbl
+CREATE TEMPORARY TABLE tbl (
+    "time" timestamp with time zone,
+    v double precision,
+    c text
+);
+
+INSERT INTO tbl ("time", v, c) VALUES
+('2023-12-24 14:30:03 UTC', 10, 'a'),
+('2023-12-24 14:30:03 UTC', 110, 'b'),
+('2023-12-24 14:31:03 UTC', 20, 'a'),
+('2023-12-24 14:31:03 UTC', 120, 'b'),
+('2023-12-24 14:32:03 UTC', 30, 'a'),
+('2023-12-24 14:32:03 UTC', 130, 'b'),
+('2023-12-24 14:33:03 UTC', 40, 'a'),
+('2023-12-24 14:33:03 UTC', 140, 'b'),
+('2023-12-24 14:34:03 UTC', 50, 'a'),
+('2023-12-24 14:34:03 UTC', 150, 'b');
\ No newline at end of file
diff --git a/pkg/tsdb/postgres/tlsmanager.go b/pkg/tsdb/grafana-postgresql-datasource/tlsmanager.go
similarity index 89%
rename from pkg/tsdb/postgres/tlsmanager.go
rename to pkg/tsdb/grafana-postgresql-datasource/tlsmanager.go
index 5011beb9cfa11..116872d061394 100644
--- a/pkg/tsdb/postgres/tlsmanager.go
+++ b/pkg/tsdb/grafana-postgresql-datasource/tlsmanager.go
@@ -9,8 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/grafana/grafana/pkg/infra/fs"
-	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana/pkg/tsdb/sqleng"
 )
 
@@ -132,7 +131,7 @@ func writeCertFile(logger log.Logger, fileContent string, generatedFilePath stri
 	}
 
 	logger.Debug("Deleting cert file since no content is provided", "path", generatedFilePath)
-	exists, err := fs.Exists(generatedFilePath)
+	exists, err := fileExists(generatedFilePath)
 	if err != nil {
 		return err
 	}
@@ -181,7 +180,7 @@ func (m *tlsManager) writeCertFiles(dsInfo sqleng.DataSourceInfo, tlsconfig *tls
 	}
 
 	// Write certification directory and files
-	exists, err := fs.Exists(workDir)
+	exists, err := fileExists(workDir)
 	if err != nil {
 		return err
 	}
@@ -201,6 +200,19 @@ func (m *tlsManager) writeCertFiles(dsInfo sqleng.DataSourceInfo, tlsconfig *tls
 		return err
 	}
 
+	// we do not want to point to cert-files that do not exist
+	if tlsRootCert == "" {
+		tlsconfig.RootCertFile = ""
+	}
+
+	if tlsClientCert == "" {
+		tlsconfig.CertFile = ""
+	}
+
+	if tlsClientKey == "" {
+		tlsconfig.CertKeyFile = ""
+	}
+
 	// Update datasource cache
 	m.dsCacheInstance.cache.Store(cacheKey, dsInfo.Updated)
 	return nil
@@ -212,7 +224,7 @@ func validateCertFilePaths(rootCert, clientCert, clientKey string) error {
 		if fpath == "" {
 			continue
 		}
-		exists, err := fs.Exists(fpath)
+		exists, err := fileExists(fpath)
 		if err != nil {
 			return err
 		}
@@ -222,3 +234,16 @@ func validateCertFilePaths(rootCert, clientCert, clientKey string) error {
 	}
 	return nil
 }
+
+// Exists determines whether a file/directory exists or not.
+func fileExists(fpath string) (bool, error) {
+	_, err := os.Stat(fpath)
+	if err != nil {
+		if !os.IsNotExist(err) {
+			return false, err
+		}
+		return false, nil
+	}
+
+	return true, nil
+}
diff --git a/pkg/tsdb/postgres/tlsmanager_test.go b/pkg/tsdb/grafana-postgresql-datasource/tlsmanager_test.go
similarity index 83%
rename from pkg/tsdb/postgres/tlsmanager_test.go
rename to pkg/tsdb/grafana-postgresql-datasource/tlsmanager_test.go
index dd3fd3f6ed436..8e60e841cab32 100644
--- a/pkg/tsdb/postgres/tlsmanager_test.go
+++ b/pkg/tsdb/grafana-postgresql-datasource/tlsmanager_test.go
@@ -9,7 +9,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/sqleng"
 	"github.com/stretchr/testify/assert"
@@ -25,7 +26,7 @@ func TestDataSourceCacheManager(t *testing.T) {
 	cfg := setting.NewCfg()
 	cfg.DataPath = t.TempDir()
 	mng := tlsManager{
-		logger:          log.New("tsdb.postgres"),
+		logger:          backend.NewLoggerWith("logger", "tsdb.postgres"),
 		dsCacheInstance: datasourceCacheManager{locker: newLocker()},
 		dataPath:        cfg.DataPath,
 	}
@@ -236,13 +237,52 @@ func TestGetTLSSettings(t *testing.T) {
 				CertKeyFile:         filepath.Join(cfg.DataPath, "tls", "xxxgeneratedTLSCerts", "client.key"),
 			},
 		},
+		{
+			desc:    "Custom TLS mode verify-ca with no client certificates with certificate files content",
+			updated: updatedTime.Add(3 * time.Minute),
+			uid:     "xxx",
+			jsonData: sqleng.JsonData{
+				Mode:                "verify-ca",
+				ConfigurationMethod: "file-content",
+			},
+			secureJSONData: map[string]string{
+				"tlsCACert": "I am CA certification",
+			},
+			tlsSettings: tlsSettings{
+				Mode:                "verify-ca",
+				ConfigurationMethod: "file-content",
+				RootCertFile:        filepath.Join(cfg.DataPath, "tls", "xxxgeneratedTLSCerts", "root.crt"),
+				CertFile:            "",
+				CertKeyFile:         "",
+			},
+		},
+		{
+			desc:    "Custom TLS mode require with client certificates and no root certificate with certificate files content",
+			updated: updatedTime.Add(4 * time.Minute),
+			uid:     "xxx",
+			jsonData: sqleng.JsonData{
+				Mode:                "require",
+				ConfigurationMethod: "file-content",
+			},
+			secureJSONData: map[string]string{
+				"tlsClientCert": "I am client certification",
+				"tlsClientKey":  "I am client key",
+			},
+			tlsSettings: tlsSettings{
+				Mode:                "require",
+				ConfigurationMethod: "file-content",
+				RootCertFile:        "",
+				CertFile:            filepath.Join(cfg.DataPath, "tls", "xxxgeneratedTLSCerts", "client.crt"),
+				CertKeyFile:         filepath.Join(cfg.DataPath, "tls", "xxxgeneratedTLSCerts", "client.key"),
+			},
+		},
 	}
 	for _, tt := range testCases {
 		t.Run(tt.desc, func(t *testing.T) {
 			var settings tlsSettings
 			var err error
 			mng := tlsManager{
-				logger:          log.New("tsdb.postgres"),
+				logger:          backend.NewLoggerWith("logger", "tsdb.postgres"),
 				dsCacheInstance: datasourceCacheManager{locker: newLocker()},
 				dataPath:        cfg.DataPath,
 			}
diff --git a/pkg/tsdb/grafana-pyroscope-datasource/instance.go b/pkg/tsdb/grafana-pyroscope-datasource/instance.go
index 58b97e19d08b2..4c5119876c2d2 100644
--- a/pkg/tsdb/grafana-pyroscope-datasource/instance.go
+++ b/pkg/tsdb/grafana-pyroscope-datasource/instance.go
@@ -6,14 +6,17 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
+	"slices"
+	"strconv"
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
-	"github.com/grafana/grafana/pkg/infra/httpclient"
-	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/prometheus/prometheus/model/labels"
+	"github.com/prometheus/prometheus/promql/parser"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
 )
@@ -26,11 +29,12 @@ var (
 )
 
 type ProfilingClient interface {
-	ProfileTypes(context.Context) ([]*ProfileType, error)
-	LabelNames(ctx context.Context) ([]string, error)
-	LabelValues(ctx context.Context, label string) ([]string, error)
+	ProfileTypes(ctx context.Context, start int64, end int64) ([]*ProfileType, error)
+	LabelNames(ctx context.Context, labelSelector string, start int64, end int64) ([]string, error)
+	LabelValues(ctx context.Context, label string, labelSelector string, start int64, end int64) ([]string, error)
 	GetSeries(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, groupBy []string, step float64) (*SeriesResponse, error)
 	GetProfile(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, maxNodes *int64) (*ProfileResponse, error)
+	GetSpanProfile(ctx context.Context, profileTypeID string, labelSelector string, spanSelector []string, start int64, end int64, maxNodes *int64) (*ProfileResponse, error)
 }
 
 // PyroscopeDatasource is a datasource for querying application performance profiles.
@@ -38,17 +42,19 @@ type PyroscopeDatasource struct {
 	httpClient *http.Client
 	client     ProfilingClient
 	settings   backend.DataSourceInstanceSettings
-	ac         accesscontrol.AccessControl
 }
 
 // NewPyroscopeDatasource creates a new datasource instance.
-func NewPyroscopeDatasource(ctx context.Context, httpClientProvider httpclient.Provider, settings backend.DataSourceInstanceSettings, ac accesscontrol.AccessControl) (instancemgmt.Instance, error) {
+func NewPyroscopeDatasource(ctx context.Context, httpClientProvider httpclient.Provider, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+	ctxLogger := logger.FromContext(ctx)
 	opt, err := settings.HTTPClientOptions(ctx)
 	if err != nil {
+		ctxLogger.Error("Failed to get HTTP client options", "error", err, "function", logEntrypoint())
 		return nil, err
 	}
 	httpClient, err := httpClientProvider.New(opt)
 	if err != nil {
+		ctxLogger.Error("Failed to create HTTP client", "error", err, "function", logEntrypoint())
 		return nil, err
 	}
 
@@ -56,14 +62,14 @@ func NewPyroscopeDatasource(ctx context.Context, httpClientProvider httpclient.P
 		httpClient: httpClient,
 		client:     NewPyroscopeClient(httpClient, settings.URL),
 		settings:   settings,
-		ac:         ac,
 	}, nil
 }
 
 func (d *PyroscopeDatasource) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	ctxLogger := logger.FromContext(ctx)
 	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.pyroscope.CallResource", trace.WithAttributes(attribute.String("path", req.Path), attribute.String("method", req.Method)))
 	defer span.End()
-	logger.Debug("CallResource", "Path", req.Path, "Method", req.Method, "Body", req.Body)
+	ctxLogger.Debug("CallResource", "Path", req.Path, "Method", req.Method, "Body", req.Body, "function", logEntrypoint())
 	if req.Path == "profileTypes" {
 		return d.profileTypes(ctx, req, sender)
 	}
@@ -79,32 +85,91 @@ func (d *PyroscopeDatasource) CallResource(ctx context.Context, req *backend.Cal
 }
 
 func (d *PyroscopeDatasource) profileTypes(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
-	types, err := d.client.ProfileTypes(ctx)
+	ctxLogger := logger.FromContext(ctx)
+
+	u, err := url.Parse(req.URL)
+	if err != nil {
+		ctxLogger.Error("Failed to parse URL", "error", err, "function", logEntrypoint())
+		return err
+	}
+	query := u.Query()
+
+	var start, end int64
+	if query.Has("start") && query.Has("end") {
+		start, err = strconv.ParseInt(query.Get("start"), 10, 64)
+		if err != nil {
+			ctxLogger.Error("Failed to parse start as int", "error", err, "function", logEntrypoint())
+			return err
+		}
+
+		end, err = strconv.ParseInt(query.Get("end"), 10, 64)
+		if err != nil {
+			ctxLogger.Error("Failed to parse end as int", "error", err, "function", logEntrypoint())
+			return err
+		}
+	}
+
+	types, err := d.client.ProfileTypes(ctx, start, end)
 	if err != nil {
+		ctxLogger.Error("Received error from client", "error", err, "function", logEntrypoint())
 		return err
 	}
 	bodyData, err := json.Marshal(types)
 	if err != nil {
+		ctxLogger.Error("Failed to marshal response", "error", err, "function", logEntrypoint())
 		return err
 	}
 	err = sender.Send(&backend.CallResourceResponse{Body: bodyData, Headers: req.Headers, Status: 200})
 	if err != nil {
+		ctxLogger.Error("Failed to send response", "error", err, "function", logEntrypoint())
 		return err
 	}
 	return nil
 }
 
 func (d *PyroscopeDatasource) labelNames(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
-	res, err := d.client.LabelNames(ctx)
+	ctxLogger := logger.FromContext(ctx)
+
+	u, err := url.Parse(req.URL)
+	if err != nil {
+		ctxLogger.Error("Failed to parse URL", "error", err, "function", logEntrypoint())
+		return err
+	}
+	query := u.Query()
+
+	start, _ := strconv.ParseInt(query.Get("start"), 10, 64)
+	end, _ := strconv.ParseInt(query.Get("end"), 10, 64)
+	labelSelector := query.Get("query")
+	matchers, err := parser.ParseMetricSelector(labelSelector)
+	if err != nil {
+		ctxLogger.Error("Could not parse label selector", "error", err, "function", logEntrypoint())
+		return fmt.Errorf("failed parsing label selector: %v", err)
+	}
+
+	labelNames, err := d.client.LabelNames(ctx, labelSelector, start, end)
 	if err != nil {
+		ctxLogger.Error("Received error from client", "error", err, "function", logEntrypoint())
 		return fmt.Errorf("error calling LabelNames: %v", err)
 	}
-	data, err := json.Marshal(res)
+
+	finalLabels := make([]string, 0)
+	for _, label := range labelNames {
+		if slices.ContainsFunc(matchers, func(m *labels.Matcher) bool {
+			return m.Name == label
+		}) {
+			continue
+		}
+		finalLabels = append(finalLabels, label)
+	}
+
+	jsonResponse, err := json.Marshal(finalLabels)
 	if err != nil {
+		ctxLogger.Error("Failed to marshal response", "error", err, "function", logEntrypoint())
 		return err
 	}
-	err = sender.Send(&backend.CallResourceResponse{Body: data, Headers: req.Headers, Status: 200})
+	err = sender.Send(&backend.CallResourceResponse{Body: jsonResponse, Headers: req.Headers, Status: 200})
 	if err != nil {
+		ctxLogger.Error("Failed to send response", "error", err, "function", logEntrypoint())
 		return err
 	}
 	return nil
@@ -118,24 +183,36 @@ type LabelValuesPayload struct {
 }
 
 func (d *PyroscopeDatasource) labelValues(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	ctxLogger := logger.FromContext(ctx)
 	u, err := url.Parse(req.URL)
 	if err != nil {
+		ctxLogger.Error("Failed to parse URL", "error", err, "function", logEntrypoint())
 		return err
 	}
 	query := u.Query()
 
-	res, err := d.client.LabelValues(ctx, query["label"][0])
+	start, _ := strconv.ParseInt(query.Get("start"), 10, 64)
+	end, _ := strconv.ParseInt(query.Get("end"), 10, 64)
+	label := query.Get("label")
+
+	res, err := d.client.LabelValues(ctx, label, query.Get("query"), start, end)
 	if err != nil {
+		ctxLogger.Error("Received error from client", "error", err, "function", logEntrypoint())
 		return fmt.Errorf("error calling LabelValues: %v", err)
 	}
+
 	data, err := json.Marshal(res)
 	if err != nil {
+		ctxLogger.Error("Failed to marshal response", "error", err, "function", logEntrypoint())
 		return err
 	}
+
 	err = sender.Send(&backend.CallResourceResponse{Body: data, Headers: req.Headers, Status: 200})
 	if err != nil {
+		ctxLogger.Error("Failed to send response", "error", err, "function", logEntrypoint())
 		return err
 	}
+
 	return nil
 }
 
@@ -144,13 +221,15 @@ func (d *PyroscopeDatasource) labelValues(ctx context.Context, req *backend.Call
 // The QueryDataResponse contains a map of RefID to the response for each query, and each response
 // contains Frames ([]*Frame).
 func (d *PyroscopeDatasource) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
-	logger.Debug("QueryData called", "Queries", req.Queries)
+	ctxLogger := logger.FromContext(ctx)
+	ctxLogger.Debug("Processing queries", "queryLength", len(req.Queries), "function", logEntrypoint())
 
 	// create response struct
 	response := backend.NewQueryDataResponse()
 
 	// loop over queries and execute them individually.
-	for _, q := range req.Queries {
+	for i, q := range req.Queries {
+		ctxLogger.Debug("Processing query", "counter", i, "function", logEntrypoint())
 		res := d.query(ctx, req.PluginContext, q)
 
 		// save the response in a hashmap
@@ -158,6 +237,7 @@ func (d *PyroscopeDatasource) QueryData(ctx context.Context, req *backend.QueryD
 		response.Responses[q.RefID] = res
 	}
 
+	ctxLogger.Debug("All queries processed", "function", logEntrypoint())
 	return response, nil
 }
 
@@ -166,12 +246,16 @@ func (d *PyroscopeDatasource) QueryData(ctx context.Context, req *backend.QueryD
 // datasource configuration page which allows users to verify that
 // a datasource is working as expected.
 func (d *PyroscopeDatasource) CheckHealth(ctx context.Context, _ *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
-	logger.Debug("CheckHealth called")
+	logger.FromContext(ctx).Debug("CheckHealth called", "function", logEntrypoint())
 
 	status := backend.HealthStatusOk
 	message := "Data source is working"
 
-	if _, err := d.client.ProfileTypes(ctx); err != nil {
+	// Since this is a health check mechanism and we only care about whether the
+	// request succeeded or failed, we set the window to be small.
+	start := time.Now().Add(-5 * time.Minute).UnixMilli()
+	end := time.Now().UnixMilli()
+	if _, err := d.client.ProfileTypes(ctx, start, end); err != nil {
 		status = backend.HealthStatusError
 		message = err.Error()
 	}
@@ -185,7 +269,7 @@ func (d *PyroscopeDatasource) CheckHealth(ctx context.Context, _ *backend.CheckH
 // SubscribeStream is called when a client wants to connect to a stream. This callback
 // allows sending the first message.
 func (d *PyroscopeDatasource) SubscribeStream(_ context.Context, req *backend.SubscribeStreamRequest) (*backend.SubscribeStreamResponse, error) {
-	logger.Debug("SubscribeStream called")
+	logger.Debug("Subscribing stream called", "function", logEntrypoint())
 
 	status := backend.SubscribeStreamStatusPermissionDenied
 	if req.Path == "stream" {
@@ -200,7 +284,8 @@ func (d *PyroscopeDatasource) SubscribeStream(_ context.Context, req *backend.Su
 // RunStream is called once for any open channel.  Results are shared with everyone
 // subscribed to the same channel.
 func (d *PyroscopeDatasource) RunStream(ctx context.Context, req *backend.RunStreamRequest, sender *backend.StreamSender) error {
-	logger.Debug("RunStream called")
+	ctxLogger := logger.FromContext(ctx)
+	ctxLogger.Debug("Running stream", "path", req.Path, "function", logEntrypoint())
 
 	// Create the same data frame as for query data.
 	frame := data.NewFrame("response")
@@ -217,7 +302,7 @@ func (d *PyroscopeDatasource) RunStream(ctx context.Context, req *backend.RunStr
 	for {
 		select {
 		case <-ctx.Done():
-			logger.Info("Context done, finish streaming", "path", req.Path)
+			ctxLogger.Info("Context done, finish streaming", "path", req.Path, "function", logEntrypoint())
 			return nil
 		case <-time.After(time.Second):
 			// Send new data periodically.
@@ -228,7 +313,7 @@ func (d *PyroscopeDatasource) RunStream(ctx context.Context, req *backend.RunStr
 
 			err := sender.SendFrame(frame, data.IncludeAll)
 			if err != nil {
-				logger.Error("Error sending frame", "error", err)
+				ctxLogger.Error("Error sending frame", "error", err, "function", logEntrypoint())
 				continue
 			}
 		}
@@ -236,8 +321,8 @@ func (d *PyroscopeDatasource) RunStream(ctx context.Context, req *backend.RunStr
 }
 
 // PublishStream is called when a client sends a message to the stream.
-func (d *PyroscopeDatasource) PublishStream(_ context.Context, _ *backend.PublishStreamRequest) (*backend.PublishStreamResponse, error) {
-	logger.Debug("PublishStream called")
+func (d *PyroscopeDatasource) PublishStream(ctx context.Context, _ *backend.PublishStreamRequest) (*backend.PublishStreamResponse, error) {
+	logger.FromContext(ctx).Debug("Publishing stream", "function", logEntrypoint())
 
 	// Do not allow publishing at all.
 	return &backend.PublishStreamResponse{
diff --git a/pkg/tsdb/grafana-pyroscope-datasource/kinds/dataquery/types_dataquery_gen.go b/pkg/tsdb/grafana-pyroscope-datasource/kinds/dataquery/types_dataquery_gen.go
index 0f2bf677b77bd..9d06729e65c77 100644
--- a/pkg/tsdb/grafana-pyroscope-datasource/kinds/dataquery/types_dataquery_gen.go
+++ b/pkg/tsdb/grafana-pyroscope-datasource/kinds/dataquery/types_dataquery_gen.go
@@ -26,9 +26,7 @@ type DataQuery struct {
 	// TODO this shouldn't be unknown but DataSourceRef | null
 	Datasource *any `json:"datasource,omitempty"`
 
-	// Hide true if query is disabled (ie should not be returned to the dashboard)
-	// Note this does not always imply that the query should not be executed since
-	// the results from a hidden query may be used as the input to other queries (SSE etc)
+	// If hide is set to true, Grafana will filter out the response(s) associated with this query before returning it to the panel.
 	Hide *bool `json:"hide,omitempty"`
 
 	// Specify the query flavor
@@ -43,11 +41,6 @@ type DataQuery struct {
 
 // GrafanaPyroscopeDataQuery defines model for GrafanaPyroscopeDataQuery.
 type GrafanaPyroscopeDataQuery struct {
-	// DataQuery These are the common properties available to all queries in all datasources.
-	// Specific implementations will *extend* this interface, adding the required
-	// properties for the given context.
-	DataQuery
-
 	// For mixed data sources the selected datasource is on the query level.
 	// For non mixed scenarios this is undefined.
 	// TODO find a better way to do this ^ that's friendly to schema
@@ -55,21 +48,19 @@ type GrafanaPyroscopeDataQuery struct {
 	Datasource *any `json:"datasource,omitempty"`
 
 	// Allows to group the results.
-	GroupBy []string `json:"groupBy"`
+	GroupBy []string `json:"groupBy,omitempty"`
 
-	// Hide true if query is disabled (ie should not be returned to the dashboard)
-	// Note this does not always imply that the query should not be executed since
-	// the results from a hidden query may be used as the input to other queries (SSE etc)
+	// If hide is set to true, Grafana will filter out the response(s) associated with this query before returning it to the panel.
 	Hide *bool `json:"hide,omitempty"`
 
 	// Specifies the query label selectors.
-	LabelSelector string `json:"labelSelector"`
+	LabelSelector *string `json:"labelSelector,omitempty"`
 
 	// Sets the maximum number of nodes in the flamegraph.
 	MaxNodes *int64 `json:"maxNodes,omitempty"`
 
 	// Specifies the type of profile to query.
-	ProfileTypeId string `json:"profileTypeId"`
+	ProfileTypeId *string `json:"profileTypeId,omitempty"`
 
 	// Specify the query flavor
 	// TODO make this required and give it a default
@@ -78,7 +69,10 @@ type GrafanaPyroscopeDataQuery struct {
 	// A unique identifier for the query within the list of targets.
 	// In server side expressions, the refId is used as a variable name to identify results.
 	// By default, the UI will assign A->Z; however setting meaningful names may be useful.
-	RefId string `json:"refId"`
+	RefId *string `json:"refId,omitempty"`
+
+	// Specifies the query span selectors.
+	SpanSelector []string `json:"spanSelector,omitempty"`
 }
 
 // PyroscopeQueryType defines model for PyroscopeQueryType.
diff --git a/pkg/tsdb/grafana-pyroscope-datasource/pyroscopeClient.go b/pkg/tsdb/grafana-pyroscope-datasource/pyroscopeClient.go
index 007ee6d06050e..8a6845055fe45 100644
--- a/pkg/tsdb/grafana-pyroscope-datasource/pyroscopeClient.go
+++ b/pkg/tsdb/grafana-pyroscope-datasource/pyroscopeClient.go
@@ -70,11 +70,15 @@ func NewPyroscopeClient(httpClient *http.Client, url string) *PyroscopeClient {
 	}
 }
 
-func (c *PyroscopeClient) ProfileTypes(ctx context.Context) ([]*ProfileType, error) {
+func (c *PyroscopeClient) ProfileTypes(ctx context.Context, start int64, end int64) ([]*ProfileType, error) {
 	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.pyroscope.ProfileTypes")
 	defer span.End()
-	res, err := c.connectClient.ProfileTypes(ctx, connect.NewRequest(&querierv1.ProfileTypesRequest{}))
+	res, err := c.connectClient.ProfileTypes(ctx, connect.NewRequest(&querierv1.ProfileTypesRequest{
+		Start: start,
+		End:   end,
+	}))
 	if err != nil {
+		logger.Error("Received error from client", "error", err, "function", logEntrypoint())
 		span.RecordError(err)
 		span.SetStatus(codes.Error, err.Error())
 		return nil, err
@@ -108,6 +112,7 @@ func (c *PyroscopeClient) GetSeries(ctx context.Context, profileTypeID string, l
 
 	resp, err := c.connectClient.SelectSeries(ctx, req)
 	if err != nil {
+		logger.Error("Received error from client", "error", err, "function", logEntrypoint())
 		span.RecordError(err)
 		span.SetStatus(codes.Error, err.Error())
 		return nil, err
@@ -162,6 +167,7 @@ func (c *PyroscopeClient) GetProfile(ctx context.Context, profileTypeID, labelSe
 
 	resp, err := c.connectClient.SelectMergeStacktraces(ctx, req)
 	if err != nil {
+		logger.Error("Received error from client", "error", err, "function", logEntrypoint())
 		span.RecordError(err)
 		span.SetStatus(codes.Error, err.Error())
 		return nil, err
@@ -172,8 +178,41 @@ func (c *PyroscopeClient) GetProfile(ctx context.Context, profileTypeID, labelSe
 		return nil, nil
 	}
 
-	levels := make([]*Level, len(resp.Msg.Flamegraph.Levels))
-	for i, level := range resp.Msg.Flamegraph.Levels {
+	return profileQuery(ctx, err, span, resp.Msg.Flamegraph, profileTypeID)
+}
+
+func (c *PyroscopeClient) GetSpanProfile(ctx context.Context, profileTypeID, labelSelector string, spanSelector []string, start, end int64, maxNodes *int64) (*ProfileResponse, error) {
+	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.pyroscope.GetSpanProfile", trace.WithAttributes(attribute.String("profileTypeID", profileTypeID), attribute.String("labelSelector", labelSelector), attribute.String("spanSelector", strings.Join(spanSelector, ","))))
+	defer span.End()
+	req := &connect.Request[querierv1.SelectMergeSpanProfileRequest]{
+		Msg: &querierv1.SelectMergeSpanProfileRequest{
+			ProfileTypeID: profileTypeID,
+			LabelSelector: labelSelector,
+			SpanSelector:  spanSelector,
+			Start:         start,
+			End:           end,
+			MaxNodes:      maxNodes,
+		},
+	}
+
+	resp, err := c.connectClient.SelectMergeSpanProfile(ctx, req)
+	if err != nil {
+		span.RecordError(err)
+		span.SetStatus(codes.Error, err.Error())
+		return nil, err
+	}
+
+	if resp.Msg.Flamegraph == nil {
+		// Not an error, can happen when querying data oout of range.
+		return nil, nil
+	}
+
+	return profileQuery(ctx, err, span, resp.Msg.Flamegraph, profileTypeID)
+}
+
+func profileQuery(ctx context.Context, err error, span trace.Span, flamegraph *querierv1.FlameGraph, profileTypeID string) (*ProfileResponse, error) {
+	levels := make([]*Level, len(flamegraph.Levels))
+	for i, level := range flamegraph.Levels {
 		levels[i] = &Level{
 			Values: level.Values,
 		}
@@ -181,10 +220,10 @@ func (c *PyroscopeClient) GetProfile(ctx context.Context, profileTypeID, labelSe
 
 	return &ProfileResponse{
 		Flamebearer: &Flamebearer{
-			Names:   resp.Msg.Flamegraph.Names,
+			Names:   flamegraph.Names,
 			Levels:  levels,
-			Total:   resp.Msg.Flamegraph.Total,
-			MaxSelf: resp.Msg.Flamegraph.MaxSelf,
+			Total:   flamegraph.Total,
+			MaxSelf: flamegraph.MaxSelf,
 		},
 		Units: getUnits(profileTypeID),
 	}, nil
@@ -202,14 +241,23 @@ func getUnits(profileTypeID string) string {
 	return unit
 }
 
-func (c *PyroscopeClient) LabelNames(ctx context.Context) ([]string, error) {
+func (c *PyroscopeClient) LabelNames(ctx context.Context, labelSelector string, start int64, end int64) ([]string, error) {
 	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.pyroscope.LabelNames")
 	defer span.End()
-	resp, err := c.connectClient.LabelNames(ctx, connect.NewRequest(&typesv1.LabelNamesRequest{}))
+	resp, err := c.connectClient.LabelNames(ctx, connect.NewRequest(&typesv1.LabelNamesRequest{
+		Matchers: []string{labelSelector},
+		Start:    start,
+		End:      end,
+	}))
 	if err != nil {
+		logger.Error("Received error from client", "error", err, "function", logEntrypoint())
 		span.RecordError(err)
 		span.SetStatus(codes.Error, err.Error())
-		return nil, fmt.Errorf("error seding LabelNames request %v", err)
+		return nil, fmt.Errorf("error sending LabelNames request %v", err)
+	}
+
+	if resp.Msg.Names == nil {
+		return []string{}, nil
 	}
 
 	var filtered []string
@@ -222,15 +270,24 @@ func (c *PyroscopeClient) LabelNames(ctx context.Context) ([]string, error) {
 	return filtered, nil
 }
 
-func (c *PyroscopeClient) LabelValues(ctx context.Context, label string) ([]string, error) {
+func (c *PyroscopeClient) LabelValues(ctx context.Context, label string, labelSelector string, start int64, end int64) ([]string, error) {
 	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.pyroscope.LabelValues")
 	defer span.End()
-	resp, err := c.connectClient.LabelValues(ctx, connect.NewRequest(&typesv1.LabelValuesRequest{Name: label}))
+	resp, err := c.connectClient.LabelValues(ctx, connect.NewRequest(&typesv1.LabelValuesRequest{
+		Name:     label,
+		Matchers: []string{labelSelector},
+		Start:    start,
+		End:      end,
+	}))
 	if err != nil {
+		logger.Error("Received error from client", "error", err, "function", logEntrypoint())
 		span.RecordError(err)
 		span.SetStatus(codes.Error, err.Error())
 		return nil, err
 	}
+	if resp.Msg.Names == nil {
+		return []string{}, nil
+	}
 	return resp.Msg.Names, nil
 }
 
diff --git a/pkg/tsdb/grafana-pyroscope-datasource/pyroscopeClient_test.go b/pkg/tsdb/grafana-pyroscope-datasource/pyroscopeClient_test.go
index 28c39e2108c89..cc93e7b304954 100644
--- a/pkg/tsdb/grafana-pyroscope-datasource/pyroscopeClient_test.go
+++ b/pkg/tsdb/grafana-pyroscope-datasource/pyroscopeClient_test.go
@@ -129,3 +129,7 @@ func (f *FakePyroscopeConnectClient) SelectSeries(ctx context.Context, req *conn
 func (f *FakePyroscopeConnectClient) SelectMergeProfile(ctx context.Context, c *connect.Request[querierv1.SelectMergeProfileRequest]) (*connect.Response[googlev1.Profile], error) {
 	panic("implement me")
 }
+
+func (f *FakePyroscopeConnectClient) SelectMergeSpanProfile(ctx context.Context, c *connect.Request[querierv1.SelectMergeSpanProfileRequest]) (*connect.Response[querierv1.SelectMergeSpanProfileResponse], error) {
+	panic("implement me")
+}
diff --git a/pkg/tsdb/grafana-pyroscope-datasource/query.go b/pkg/tsdb/grafana-pyroscope-datasource/query.go
index 3f21c0cf8c8bd..5d6d0ce17ae57 100644
--- a/pkg/tsdb/grafana-pyroscope-datasource/query.go
+++ b/pkg/tsdb/grafana-pyroscope-datasource/query.go
@@ -52,6 +52,9 @@ func (d *PyroscopeDatasource) query(ctx context.Context, pCtx backend.PluginCont
 		return response
 	}
 
+	profileTypeId := depointerizer(qm.ProfileTypeId)
+	labelSelector := depointerizer(qm.LabelSelector)
+
 	responseMutex := sync.Mutex{}
 	g, gCtx := errgroup.WithContext(ctx)
 	if query.QueryType == queryTypeMetrics || query.QueryType == queryTypeBoth {
@@ -69,14 +72,14 @@ func (d *PyroscopeDatasource) query(ctx context.Context, pCtx backend.PluginCont
 				parsedInterval, err = gtime.ParseDuration(dsJson.MinStep)
 				if err != nil {
 					parsedInterval = time.Second * 15
-					logger.Debug("Failed to parse the MinStep using default", "MinStep", dsJson.MinStep)
+					logger.Error("Failed to parse the MinStep using default", "MinStep", dsJson.MinStep, "function", logEntrypoint())
 				}
 			}
-			logger.Debug("Sending SelectSeriesRequest", "queryModel", qm)
+			logger.Debug("Sending SelectSeriesRequest", "queryModel", qm, "function", logEntrypoint())
 			seriesResp, err := d.client.GetSeries(
 				gCtx,
-				qm.ProfileTypeId,
-				qm.LabelSelector,
+				profileTypeId,
+				labelSelector,
 				query.TimeRange.From.UnixMilli(),
 				query.TimeRange.To.UnixMilli(),
 				qm.GroupBy,
@@ -85,7 +88,7 @@ func (d *PyroscopeDatasource) query(ctx context.Context, pCtx backend.PluginCont
 			if err != nil {
 				span.RecordError(err)
 				span.SetStatus(codes.Error, err.Error())
-				logger.Error("Querying SelectSeries()", "err", err)
+				logger.Error("Querying SelectSeries()", "err", err, "function", logEntrypoint())
 				return err
 			}
 			// add the frames to the response.
@@ -98,18 +101,32 @@ func (d *PyroscopeDatasource) query(ctx context.Context, pCtx backend.PluginCont
 
 	if query.QueryType == queryTypeProfile || query.QueryType == queryTypeBoth {
 		g.Go(func() error {
-			logger.Debug("Calling GetProfile", "queryModel", qm)
-			prof, err := d.client.GetProfile(gCtx, qm.ProfileTypeId, qm.LabelSelector, query.TimeRange.From.UnixMilli(), query.TimeRange.To.UnixMilli(), qm.MaxNodes)
-			if err != nil {
-				span.RecordError(err)
-				span.SetStatus(codes.Error, err.Error())
-				logger.Error("Error GetProfile()", "err", err)
-				return err
+			var profileResp *ProfileResponse
+			if len(qm.SpanSelector) > 0 {
+				logger.Debug("Calling GetSpanProfile", "queryModel", qm, "function", logEntrypoint())
+				prof, err := d.client.GetSpanProfile(gCtx, profileTypeId, labelSelector, qm.SpanSelector, query.TimeRange.From.UnixMilli(), query.TimeRange.To.UnixMilli(), qm.MaxNodes)
+				if err != nil {
+					span.RecordError(err)
+					span.SetStatus(codes.Error, err.Error())
+					logger.Error("Error GetSpanProfile()", "err", err, "function", logEntrypoint())
+					return err
+				}
+				profileResp = prof
+			} else {
+				logger.Debug("Calling GetProfile", "queryModel", qm, "function", logEntrypoint())
+				prof, err := d.client.GetProfile(gCtx, profileTypeId, labelSelector, query.TimeRange.From.UnixMilli(), query.TimeRange.To.UnixMilli(), qm.MaxNodes)
+				if err != nil {
+					span.RecordError(err)
+					span.SetStatus(codes.Error, err.Error())
+					logger.Error("Error GetProfile()", "err", err, "function", logEntrypoint())
+					return err
+				}
+				profileResp = prof
 			}
 
 			var frame *data.Frame
-			if prof != nil {
-				frame = responseToDataFrames(prof)
+			if profileResp != nil {
+				frame = responseToDataFrames(profileResp)
 
 				// If query called with streaming on then return a channel
 				// to subscribe on a client-side and consume updates from a plugin.
@@ -201,7 +218,7 @@ func levelsToTree(levels []*Level, names []string) *ProfileTree {
 
 		// If we still have levels to go, this should not happen. Something is probably wrong with the flamebearer data.
 		if len(parentsStack) == 0 {
-			logger.Error("ParentsStack is empty but we are not at the the last level", "currentLevel", currentLevel)
+			logger.Error("ParentsStack is empty but we are not at the last level", "currentLevel", currentLevel, "function", logEntrypoint())
 			break
 		}
 
@@ -245,7 +262,7 @@ func levelsToTree(levels []*Level, names []string) *ProfileTree {
 				// We went out of parents bounds so lets move to next parent. We will evaluate the same item again, but
 				// we will check if it is a child of the next parent item in line.
 				if len(parentsStack) == 0 {
-					logger.Error("ParentsStack is empty but there are still items in current level", "currentLevel", currentLevel, "itemIndex", itemIndex)
+					logger.Error("ParentsStack is empty but there are still items in current level", "currentLevel", currentLevel, "itemIndex", itemIndex, "function", logEntrypoint())
 					break
 				}
 				currentParent = parentsStack[:1][0]
@@ -436,3 +453,12 @@ func seriesToDataFrames(resp *SeriesResponse) []*data.Frame {
 	}
 	return frames
 }
+
+func depointerizer[T any](v *T) T {
+	var emptyValue T
+	if v != nil {
+		emptyValue = *v
+	}
+
+	return emptyValue
+}
diff --git a/pkg/tsdb/grafana-pyroscope-datasource/query_test.go b/pkg/tsdb/grafana-pyroscope-datasource/query_test.go
index 1ed8aa723a2c7..8926fd8d679b7 100644
--- a/pkg/tsdb/grafana-pyroscope-datasource/query_test.go
+++ b/pkg/tsdb/grafana-pyroscope-datasource/query_test.go
@@ -275,7 +275,7 @@ type FakeClient struct {
 	Args []any
 }
 
-func (f *FakeClient) ProfileTypes(ctx context.Context) ([]*ProfileType, error) {
+func (f *FakeClient) ProfileTypes(ctx context.Context, start int64, end int64) ([]*ProfileType, error) {
 	return []*ProfileType{
 		{
 			ID:    "type:1",
@@ -288,11 +288,11 @@ func (f *FakeClient) ProfileTypes(ctx context.Context) ([]*ProfileType, error) {
 	}, nil
 }
 
-func (f *FakeClient) LabelValues(ctx context.Context, label string) ([]string, error) {
+func (f *FakeClient) LabelValues(ctx context.Context, label string, labelSelector string, start int64, end int64) ([]string, error) {
 	panic("implement me")
 }
 
-func (f *FakeClient) LabelNames(ctx context.Context) ([]string, error) {
+func (f *FakeClient) LabelNames(ctx context.Context, labelSelector string, start int64, end int64) ([]string, error) {
 	panic("implement me")
 }
 
@@ -312,6 +312,22 @@ func (f *FakeClient) GetProfile(ctx context.Context, profileTypeID, labelSelecto
 	}, nil
 }
 
+func (f *FakeClient) GetSpanProfile(ctx context.Context, profileTypeID, labelSelector string, spanSelector []string, start, end int64, maxNodes *int64) (*ProfileResponse, error) {
+	return &ProfileResponse{
+		Flamebearer: &Flamebearer{
+			Names: []string{"foo", "bar", "baz"},
+			Levels: []*Level{
+				{Values: []int64{0, 10, 0, 0}},
+				{Values: []int64{0, 9, 0, 1}},
+				{Values: []int64{0, 8, 8, 2}},
+			},
+			Total:   100,
+			MaxSelf: 56,
+		},
+		Units: "count",
+	}, nil
+}
+
 func (f *FakeClient) GetSeries(ctx context.Context, profileTypeID, labelSelector string, start, end int64, groupBy []string, step float64) (*SeriesResponse, error) {
 	f.Args = []any{profileTypeID, labelSelector, start, end, groupBy, step}
 	return &SeriesResponse{
diff --git a/pkg/tsdb/grafana-pyroscope-datasource/service.go b/pkg/tsdb/grafana-pyroscope-datasource/service.go
index 23f3ace482aad..bad52d489840f 100644
--- a/pkg/tsdb/grafana-pyroscope-datasource/service.go
+++ b/pkg/tsdb/grafana-pyroscope-datasource/service.go
@@ -2,13 +2,15 @@ package pyroscope
 
 import (
 	"context"
+	"fmt"
+	"runtime"
+	"strings"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
-	"github.com/grafana/grafana/pkg/infra/httpclient"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 )
 
 // Make sure PyroscopeDatasource implements required interfaces. This is important to do
@@ -27,78 +29,158 @@ var (
 	_ backend.StreamHandler       = (*Service)(nil)
 )
 
-var logger = log.New("tsdb.pyroscope")
-
 type Service struct {
-	im instancemgmt.InstanceManager
+	im     instancemgmt.InstanceManager
+	logger log.Logger
+}
+
+var logger = backend.NewLoggerWith("logger", "tsdb.pyroscope")
+
+// Return the file, line, and (full-path) function name of the caller
+func getRunContext() (string, int, string) {
+	pc := make([]uintptr, 10)
+	runtime.Callers(2, pc)
+	f := runtime.FuncForPC(pc[0])
+	file, line := f.FileLine(pc[0])
+	return file, line, f.Name()
+}
+
+// Return a formatted string representing the execution context for the logger
+func logEntrypoint() string {
+	file, line, pathToFunction := getRunContext()
+	parts := strings.Split(pathToFunction, "/")
+	functionName := parts[len(parts)-1]
+	return fmt.Sprintf("%s:%d[%s]", file, line, functionName)
 }
 
 func (s *Service) getInstance(ctx context.Context, pluginCtx backend.PluginContext) (*PyroscopeDatasource, error) {
 	i, err := s.im.Get(ctx, pluginCtx)
 	if err != nil {
+		s.logger.FromContext(ctx).Error("Failed to get instance", "error", err, "pluginID", pluginCtx.PluginID, "function", logEntrypoint())
 		return nil, err
 	}
 	in := i.(*PyroscopeDatasource)
 	return in, nil
 }
 
-func ProvideService(httpClientProvider httpclient.Provider, ac accesscontrol.AccessControl) *Service {
+func ProvideService(httpClientProvider *httpclient.Provider) *Service {
 	return &Service{
-		im: datasource.NewInstanceManager(newInstanceSettings(httpClientProvider, ac)),
+		im:     datasource.NewInstanceManager(newInstanceSettings(httpClientProvider)),
+		logger: logger,
 	}
 }
 
-func newInstanceSettings(httpClientProvider httpclient.Provider, ac accesscontrol.AccessControl) datasource.InstanceFactoryFunc {
+func newInstanceSettings(httpClientProvider *httpclient.Provider) datasource.InstanceFactoryFunc {
 	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		return NewPyroscopeDatasource(ctx, httpClientProvider, settings, ac)
+		return NewPyroscopeDatasource(ctx, *httpClientProvider, settings)
 	}
 }
 
 func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+	ctxLogger := s.logger.FromContext(ctx)
+	ctxLogger.Debug("Processing queries", "queriesLength", len(req.Queries), "function", logEntrypoint())
+
 	i, err := s.getInstance(ctx, req.PluginContext)
 	if err != nil {
 		return nil, err
 	}
-	return i.QueryData(ctx, req)
+
+	response, err := i.QueryData(ctx, req)
+	if err != nil {
+		ctxLogger.Error("Received error from Pyroscope", "error", err, "function", logEntrypoint())
+	} else {
+		ctxLogger.Debug("All queries processed", "function", logEntrypoint())
+	}
+	return response, err
 }
 
 func (s *Service) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	loggerWithContext := s.logger.FromContext(ctx)
+	loggerWithContext.Debug("Calling resource", "function", logEntrypoint())
+
 	i, err := s.getInstance(ctx, req.PluginContext)
 	if err != nil {
 		return err
 	}
-	return i.CallResource(ctx, req, sender)
+
+	err = i.CallResource(ctx, req, sender)
+	if err != nil {
+		loggerWithContext.Error("Received error from Pyroscope", "error", err, "function", logEntrypoint())
+	} else {
+		loggerWithContext.Debug("Health check succeeded", "function", logEntrypoint())
+	}
+	return err
 }
 
 func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
+	loggerWithContext := s.logger.FromContext(ctx)
+	loggerWithContext.Debug("Checking health", "function", logEntrypoint())
+
 	i, err := s.getInstance(ctx, req.PluginContext)
 	if err != nil {
 		return nil, err
 	}
-	return i.CheckHealth(ctx, req)
+
+	response, err := i.CheckHealth(ctx, req)
+	if err != nil {
+		loggerWithContext.Error("Received error from Pyroscope", "error", err, "function", logEntrypoint())
+	} else {
+		loggerWithContext.Debug("Health check succeeded", "function", logEntrypoint())
+	}
+	return response, err
 }
 
 func (s *Service) SubscribeStream(ctx context.Context, req *backend.SubscribeStreamRequest) (*backend.SubscribeStreamResponse, error) {
+	loggerWithContext := s.logger.FromContext(ctx)
+	loggerWithContext.Debug("Subscribing stream", "function", logEntrypoint())
+
 	i, err := s.getInstance(ctx, req.PluginContext)
 	if err != nil {
 		return nil, err
 	}
-	return i.SubscribeStream(ctx, req)
+
+	response, err := i.SubscribeStream(ctx, req)
+	if err != nil {
+		loggerWithContext.Error("Received error from Pyroscope", "error", err, "function", logEntrypoint())
+	} else {
+		loggerWithContext.Debug("Stream subscribed", "function", logEntrypoint())
+	}
+	return response, err
 }
 
 func (s *Service) RunStream(ctx context.Context, req *backend.RunStreamRequest, sender *backend.StreamSender) error {
+	loggerWithContext := s.logger.FromContext(ctx)
+	loggerWithContext.Debug("Running stream", "function", logEntrypoint())
+
 	i, err := s.getInstance(ctx, req.PluginContext)
 	if err != nil {
 		return err
 	}
-	return i.RunStream(ctx, req, sender)
+
+	err = i.RunStream(ctx, req, sender)
+	if err != nil {
+		loggerWithContext.Error("Received error from Pyroscope", "error", err, "function", logEntrypoint())
+	} else {
+		loggerWithContext.Debug("Stream run", "function", logEntrypoint())
+	}
+	return err
 }
 
 // PublishStream is called when a client sends a message to the stream.
 func (s *Service) PublishStream(ctx context.Context, req *backend.PublishStreamRequest) (*backend.PublishStreamResponse, error) {
+	loggerWithContext := s.logger.FromContext(ctx)
+	loggerWithContext.Debug("Publishing stream", "function", logEntrypoint())
+
 	i, err := s.getInstance(ctx, req.PluginContext)
 	if err != nil {
 		return nil, err
 	}
-	return i.PublishStream(ctx, req)
+
+	response, err := i.PublishStream(ctx, req)
+	if err != nil {
+		loggerWithContext.Error("Received error from Pyroscope", "error", err, "function", logEntrypoint())
+	} else {
+		loggerWithContext.Debug("Stream published", "function", logEntrypoint())
+	}
+	return response, err
 }
diff --git a/pkg/tsdb/grafana-pyroscope-datasource/standalone/datasource.go b/pkg/tsdb/grafana-pyroscope-datasource/standalone/datasource.go
new file mode 100644
index 0000000000000..fc00c805d311f
--- /dev/null
+++ b/pkg/tsdb/grafana-pyroscope-datasource/standalone/datasource.go
@@ -0,0 +1,51 @@
+package main
+
+import (
+	"context"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+	pyroscope "github.com/grafana/grafana/pkg/tsdb/grafana-pyroscope-datasource"
+)
+
+var (
+	_ backend.QueryDataHandler    = (*Datasource)(nil)
+	_ backend.CheckHealthHandler  = (*Datasource)(nil)
+	_ backend.CallResourceHandler = (*Datasource)(nil)
+	_ backend.StreamHandler       = (*Datasource)(nil)
+)
+
+func NewDatasource(context.Context, backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+	return &Datasource{
+		Service: pyroscope.ProvideService(httpclient.NewProvider()),
+	}, nil
+}
+
+type Datasource struct {
+	Service *pyroscope.Service
+}
+
+func (d *Datasource) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+	return d.Service.QueryData(ctx, req)
+}
+
+func (d *Datasource) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	return d.Service.CallResource(ctx, req, sender)
+}
+
+func (d *Datasource) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
+	return d.Service.CheckHealth(ctx, req)
+}
+
+func (d *Datasource) SubscribeStream(ctx context.Context, req *backend.SubscribeStreamRequest) (*backend.SubscribeStreamResponse, error) {
+	return d.Service.SubscribeStream(ctx, req)
+}
+
+func (d *Datasource) PublishStream(ctx context.Context, req *backend.PublishStreamRequest) (*backend.PublishStreamResponse, error) {
+	return d.Service.PublishStream(ctx, req)
+}
+
+func (d *Datasource) RunStream(ctx context.Context, req *backend.RunStreamRequest, sender *backend.StreamSender) error {
+	return d.Service.RunStream(ctx, req, sender)
+}
diff --git a/pkg/tsdb/grafana-pyroscope-datasource/standalone/main.go b/pkg/tsdb/grafana-pyroscope-datasource/standalone/main.go
new file mode 100644
index 0000000000000..345f249371551
--- /dev/null
+++ b/pkg/tsdb/grafana-pyroscope-datasource/standalone/main.go
@@ -0,0 +1,23 @@
+package main
+
+import (
+	"os"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
+)
+
+func main() {
+	// Start listening to requests sent from Grafana. This call is blocking so
+	// it won't finish until Grafana shuts down the process or the plugin choose
+	// to exit by itself using os.Exit. Manage automatically manages life cycle
+	// of datasource instances. It accepts datasource instance factory as first
+	// argument. This factory will be automatically called on incoming request
+	// from Grafana to create different instances of SampleDatasource (per datasource
+	// ID). When datasource configuration changed Dispose method will be called and
+	// new datasource instance created using NewSampleDatasource factory.
+	if err := datasource.Manage("grafana-pyroscope-datasource", NewDatasource, datasource.ManageOpts{}); err != nil {
+		log.DefaultLogger.Error(err.Error())
+		os.Exit(1)
+	}
+}
diff --git a/pkg/tsdb/grafana-testdata-datasource/csv_data.go b/pkg/tsdb/grafana-testdata-datasource/csv_data.go
index 5ba1c962e84a3..68a53c265d20b 100644
--- a/pkg/tsdb/grafana-testdata-datasource/csv_data.go
+++ b/pkg/tsdb/grafana-testdata-datasource/csv_data.go
@@ -26,7 +26,7 @@ func (s *Service) handleCsvContentScenario(ctx context.Context, req *backend.Que
 			return nil, fmt.Errorf("failed to parse query json: %v", err)
 		}
 
-		csvContent := model.CSVContent
+		csvContent := model.CsvContent
 		if len(csvContent) == 0 {
 			return backend.NewQueryDataResponse(), nil
 		}
@@ -63,7 +63,7 @@ func (s *Service) handleCsvFileScenario(ctx context.Context, req *backend.QueryD
 			return nil, fmt.Errorf("failed to parse query json %v", err)
 		}
 
-		fileName := model.CSVFileName
+		fileName := model.CsvFileName
 
 		if len(fileName) == 0 {
 			continue
diff --git a/pkg/tsdb/grafana-testdata-datasource/data/automobiles.csv b/pkg/tsdb/grafana-testdata-datasource/data/automobiles.csv
new file mode 100644
index 0000000000000..2a1623ecc9c04
--- /dev/null
+++ b/pkg/tsdb/grafana-testdata-datasource/data/automobiles.csv
@@ -0,0 +1,407 @@
+Year,Origin,Make,Model,Miles_per_Gallon,Cylinders,Displacement,Horsepower,Weight_in_lbs,Acceleration
+1970-01-01T00:00:00,USA,chevrolet,chevelle malibu,18,8,307,130,3504,12
+1970-01-01T00:00:00,USA,buick,skylark 320,15,8,350,165,3693,11.5
+1970-01-01T00:00:00,USA,plymouth,satellite,18,8,318,150,3436,11
+1970-01-01T00:00:00,USA,amc,rebel sst,16,8,304,150,3433,12
+1970-01-01T00:00:00,USA,ford,torino,17,8,302,140,3449,10.5
+1970-01-01T00:00:00,USA,ford,galaxie 500,15,8,429,198,4341,10
+1970-01-01T00:00:00,USA,chevrolet,impala,14,8,454,220,4354,9
+1970-01-01T00:00:00,USA,plymouth,fury iii,14,8,440,215,4312,8.5
+1970-01-01T00:00:00,USA,pontiac,catalina,14,8,455,225,4425,10
+1970-01-01T00:00:00,USA,amc,ambassador dpl,15,8,390,190,3850,8.5
+1970-01-01T00:00:00,Europe,citroen,ds-21 pallas,,4,133,115,3090,17.5
+1970-01-01T00:00:00,USA,chevrolet,chevelle concours (sw),,8,350,165,4142,11.5
+1970-01-01T00:00:00,USA,ford,torino (sw),,8,351,153,4034,11
+1970-01-01T00:00:00,USA,plymouth,satellite (sw),,8,383,175,4166,10.5
+1970-01-01T00:00:00,USA,amc,rebel sst (sw),,8,360,175,3850,11
+1970-01-01T00:00:00,USA,dodge,challenger se,15,8,383,170,3563,10
+1970-01-01T00:00:00,USA,plymouth,'cuda 340,14,8,340,160,3609,8
+1970-01-01T00:00:00,USA,ford,mustang boss 302,,8,302,140,3353,8
+1970-01-01T00:00:00,USA,chevrolet,monte carlo,15,8,400,150,3761,9.5
+1970-01-01T00:00:00,USA,buick,estate wagon (sw),14,8,455,225,3086,10
+1970-01-01T00:00:00,Japan,toyota,corona mark ii,24,4,113,95,2372,15
+1970-01-01T00:00:00,USA,plymouth,duster,22,6,198,95,2833,15.5
+1970-01-01T00:00:00,USA,amc,hornet,18,6,199,97,2774,15.5
+1970-01-01T00:00:00,USA,ford,maverick,21,6,200,85,2587,16
+1970-01-01T00:00:00,Japan,datsun,pl510,27,4,97,88,2130,14.5
+1970-01-01T00:00:00,Europe,volkswagen,1131 deluxe sedan,26,4,97,46,1835,20.5
+1970-01-01T00:00:00,Europe,peugeot,504,25,4,110,87,2672,17.5
+1970-01-01T00:00:00,Europe,audi,100 ls,24,4,107,90,2430,14.5
+1970-01-01T00:00:00,Europe,saab,99e,25,4,104,95,2375,17.5
+1970-01-01T00:00:00,Europe,bmw,2002,26,4,121,113,2234,12.5
+1970-01-01T00:00:00,USA,amc,gremlin,21,6,199,90,2648,15
+1970-01-01T00:00:00,USA,ford,f250,10,8,360,215,4615,14
+1970-01-01T00:00:00,USA,chevrolet,c20,10,8,307,200,4376,15
+1970-01-01T00:00:00,USA,dodge,d200,11,8,318,210,4382,13.5
+1970-01-01T00:00:00,USA,hi,1200d,9,8,304,193,4732,18.5
+1971-01-01T00:00:00,Japan,datsun,pl510,27,4,97,88,2130,14.5
+1971-01-01T00:00:00,USA,chevrolet,vega 2300,28,4,140,90,2264,15.5
+1971-01-01T00:00:00,Japan,toyota,corona,25,4,113,95,2228,14
+1971-01-01T00:00:00,USA,ford,pinto,25,4,98,,2046,19
+1971-01-01T00:00:00,Europe,volkswagen,super beetle 117,,4,97,48,1978,20
+1971-01-01T00:00:00,USA,amc,gremlin,19,6,232,100,2634,13
+1971-01-01T00:00:00,USA,plymouth,satellite custom,16,6,225,105,3439,15.5
+1971-01-01T00:00:00,USA,chevrolet,chevelle malibu,17,6,250,100,3329,15.5
+1971-01-01T00:00:00,USA,ford,torino 500,19,6,250,88,3302,15.5
+1971-01-01T00:00:00,USA,amc,matador,18,6,232,100,3288,15.5
+1971-01-01T00:00:00,USA,chevrolet,impala,14,8,350,165,4209,12
+1971-01-01T00:00:00,USA,pontiac,catalina brougham,14,8,400,175,4464,11.5
+1971-01-01T00:00:00,USA,ford,galaxie 500,14,8,351,153,4154,13.5
+1971-01-01T00:00:00,USA,plymouth,fury iii,14,8,318,150,4096,13
+1971-01-01T00:00:00,USA,dodge,monaco (sw),12,8,383,180,4955,11.5
+1971-01-01T00:00:00,USA,ford,country squire (sw),13,8,400,170,4746,12
+1971-01-01T00:00:00,USA,pontiac,safari (sw),13,8,400,175,5140,12
+1971-01-01T00:00:00,USA,amc,hornet sportabout (sw),18,6,258,110,2962,13.5
+1971-01-01T00:00:00,USA,chevrolet,vega (sw),22,4,140,72,2408,19
+1971-01-01T00:00:00,USA,pontiac,firebird,19,6,250,100,3282,15
+1971-01-01T00:00:00,USA,ford,mustang,18,6,250,88,3139,14.5
+1971-01-01T00:00:00,USA,mercury,capri 2000,23,4,122,86,2220,14
+1971-01-01T00:00:00,Europe,opel,1900,28,4,116,90,2123,14
+1971-01-01T00:00:00,Europe,peugeot,304,30,4,79,70,2074,19.5
+1971-01-01T00:00:00,Europe,fiat,124b,30,4,88,76,2065,14.5
+1971-01-01T00:00:00,Japan,toyota,corolla 1200,31,4,71,65,1773,19
+1971-01-01T00:00:00,Japan,datsun,1200,35,4,72,69,1613,18
+1971-01-01T00:00:00,Europe,volkswagen,model 111,27,4,97,60,1834,19
+1971-01-01T00:00:00,USA,plymouth,cricket,26,4,91,70,1955,20.5
+1972-01-01T00:00:00,Japan,toyota,corona hardtop,24,4,113,95,2278,15.5
+1972-01-01T00:00:00,USA,dodge,colt hardtop,25,4,97.5,80,2126,17
+1972-01-01T00:00:00,Europe,volkswagen,type 3,23,4,97,54,2254,23.5
+1972-01-01T00:00:00,USA,chevrolet,vega,20,4,140,90,2408,19.5
+1972-01-01T00:00:00,USA,ford,pinto runabout,21,4,122,86,2226,16.5
+1972-01-01T00:00:00,USA,chevrolet,impala,13,8,350,165,4274,12
+1972-01-01T00:00:00,USA,pontiac,catalina,14,8,400,175,4385,12
+1972-01-01T00:00:00,USA,plymouth,fury iii,15,8,318,150,4135,13.5
+1972-01-01T00:00:00,USA,ford,galaxie 500,14,8,351,153,4129,13
+1972-01-01T00:00:00,USA,amc,ambassador sst,17,8,304,150,3672,11.5
+1972-01-01T00:00:00,USA,mercury,marquis,11,8,429,208,4633,11
+1972-01-01T00:00:00,USA,buick,lesabre custom,13,8,350,155,4502,13.5
+1972-01-01T00:00:00,USA,oldsmobile,delta 88 royale,12,8,350,160,4456,13.5
+1972-01-01T00:00:00,USA,chrysler,newport royal,13,8,400,190,4422,12.5
+1972-01-01T00:00:00,Japan,mazda,rx2 coupe,19,3,70,97,2330,13.5
+1972-01-01T00:00:00,USA,amc,matador (sw),15,8,304,150,3892,12.5
+1972-01-01T00:00:00,USA,chevrolet,chevelle concours (sw),13,8,307,130,4098,14
+1972-01-01T00:00:00,USA,ford,gran torino (sw),13,8,302,140,4294,16
+1972-01-01T00:00:00,USA,plymouth,satellite custom (sw),14,8,318,150,4077,14
+1972-01-01T00:00:00,Europe,volvo,145e (sw),18,4,121,112,2933,14.5
+1972-01-01T00:00:00,Europe,volkswagen,411 (sw),22,4,121,76,2511,18
+1972-01-01T00:00:00,Europe,peugeot,504 (sw),21,4,120,87,2979,19.5
+1972-01-01T00:00:00,Europe,renault,12 (sw),26,4,96,69,2189,18
+1972-01-01T00:00:00,USA,ford,pinto (sw),22,4,122,86,2395,16
+1972-01-01T00:00:00,Japan,datsun,510 (sw),28,4,97,92,2288,17
+1972-01-01T00:00:00,Japan,toyota,corona mark ii (sw),23,4,120,97,2506,14.5
+1972-01-01T00:00:00,USA,dodge,colt (sw),28,4,98,80,2164,15
+1972-01-01T00:00:00,Japan,toyota,corolla 1600 (sw),27,4,97,88,2100,16.5
+1973-01-01T00:00:00,USA,buick,century 350,13,8,350,175,4100,13
+1973-01-01T00:00:00,USA,amc,matador,14,8,304,150,3672,11.5
+1973-01-01T00:00:00,USA,chevrolet,malibu,13,8,350,145,3988,13
+1973-01-01T00:00:00,USA,ford,gran torino,14,8,302,137,4042,14.5
+1973-01-01T00:00:00,USA,dodge,coronet custom,15,8,318,150,3777,12.5
+1973-01-01T00:00:00,USA,mercury,marquis brougham,12,8,429,198,4952,11.5
+1973-01-01T00:00:00,USA,chevrolet,caprice classic,13,8,400,150,4464,12
+1973-01-01T00:00:00,USA,ford,ltd,13,8,351,158,4363,13
+1973-01-01T00:00:00,USA,plymouth,fury gran sedan,14,8,318,150,4237,14.5
+1973-01-01T00:00:00,USA,chrysler,new yorker brougham,13,8,440,215,4735,11
+1973-01-01T00:00:00,USA,buick,electra 225 custom,12,8,455,225,4951,11
+1973-01-01T00:00:00,USA,amc,ambassador brougham,13,8,360,175,3821,11
+1973-01-01T00:00:00,USA,plymouth,valiant,18,6,225,105,3121,16.5
+1973-01-01T00:00:00,USA,chevrolet,nova custom,16,6,250,100,3278,18
+1973-01-01T00:00:00,USA,amc,hornet,18,6,232,100,2945,16
+1973-01-01T00:00:00,USA,ford,maverick,18,6,250,88,3021,16.5
+1973-01-01T00:00:00,USA,plymouth,duster,23,6,198,95,2904,16
+1973-01-01T00:00:00,Europe,volkswagen,super beetle,26,4,97,46,1950,21
+1973-01-01T00:00:00,USA,chevrolet,impala,11,8,400,150,4997,14
+1973-01-01T00:00:00,USA,ford,country,12,8,400,167,4906,12.5
+1973-01-01T00:00:00,USA,plymouth,custom suburb,13,8,360,170,4654,13
+1973-01-01T00:00:00,USA,oldsmobile,vista cruiser,12,8,350,180,4499,12.5
+1973-01-01T00:00:00,USA,amc,gremlin,18,6,232,100,2789,15
+1973-01-01T00:00:00,Japan,toyota,carina,20,4,97,88,2279,19
+1973-01-01T00:00:00,USA,chevrolet,vega,21,4,140,72,2401,19.5
+1973-01-01T00:00:00,Japan,datsun,610,22,4,108,94,2379,16.5
+1973-01-01T00:00:00,Japan,mazda,rx3,18,3,70,90,2124,13.5
+1973-01-01T00:00:00,USA,ford,pinto,19,4,122,85,2310,18.5
+1973-01-01T00:00:00,USA,mercury,capri v6,21,6,155,107,2472,14
+1973-01-01T00:00:00,Europe,fiat,124 sport coupe,26,4,98,90,2265,15.5
+1973-01-01T00:00:00,USA,chevrolet,monte carlo s,15,8,350,145,4082,13
+1973-01-01T00:00:00,USA,pontiac,grand prix,16,8,400,230,4278,9.5
+1973-01-01T00:00:00,Europe,fiat,128,29,4,68,49,1867,19.5
+1973-01-01T00:00:00,Europe,opel,manta,24,4,116,75,2158,15.5
+1973-01-01T00:00:00,Europe,audi,100ls,20,4,114,91,2582,14
+1973-01-01T00:00:00,Europe,volvo,144ea,19,4,121,112,2868,15.5
+1973-01-01T00:00:00,USA,dodge,dart custom,15,8,318,150,3399,11
+1973-01-01T00:00:00,Europe,saab,99le,24,4,121,110,2660,14
+1973-01-01T00:00:00,Japan,toyota,mark ii,20,6,156,122,2807,13.5
+1973-01-01T00:00:00,USA,oldsmobile,omega,11,8,350,180,3664,11
+1974-01-01T00:00:00,USA,plymouth,duster,20,6,198,95,3102,16.5
+1974-01-01T00:00:00,USA,ford,maverick,21,6,200,,2875,17
+1974-01-01T00:00:00,USA,amc,hornet,19,6,232,100,2901,16
+1974-01-01T00:00:00,USA,chevrolet,nova,15,6,250,100,3336,17
+1974-01-01T00:00:00,Japan,datsun,b210,31,4,79,67,1950,19
+1974-01-01T00:00:00,USA,ford,pinto,26,4,122,80,2451,16.5
+1974-01-01T00:00:00,Japan,toyota,corolla 1200,32,4,71,65,1836,21
+1974-01-01T00:00:00,USA,chevrolet,vega,25,4,140,75,2542,17
+1974-01-01T00:00:00,USA,chevrolet,chevelle malibu classic,16,6,250,100,3781,17
+1974-01-01T00:00:00,USA,amc,matador,16,6,258,110,3632,18
+1974-01-01T00:00:00,USA,plymouth,satellite sebring,18,6,225,105,3613,16.5
+1974-01-01T00:00:00,USA,ford,gran torino,16,8,302,140,4141,14
+1974-01-01T00:00:00,USA,buick,century luxus (sw),13,8,350,150,4699,14.5
+1974-01-01T00:00:00,USA,dodge,coronet custom (sw),14,8,318,150,4457,13.5
+1974-01-01T00:00:00,USA,ford,gran torino (sw),14,8,302,140,4638,16
+1974-01-01T00:00:00,USA,amc,matador (sw),14,8,304,150,4257,15.5
+1974-01-01T00:00:00,Europe,audi,fox,29,4,98,83,2219,16.5
+1974-01-01T00:00:00,Europe,volkswagen,dasher,26,4,79,67,1963,15.5
+1974-01-01T00:00:00,Europe,opel,manta,26,4,97,78,2300,14.5
+1974-01-01T00:00:00,Japan,toyota,corona,31,4,76,52,1649,16.5
+1974-01-01T00:00:00,Japan,datsun,710,32,4,83,61,2003,19
+1974-01-01T00:00:00,USA,dodge,colt,28,4,90,75,2125,14.5
+1974-01-01T00:00:00,Europe,fiat,128,24,4,90,75,2108,15.5
+1974-01-01T00:00:00,Europe,fiat,124 tc,26,4,116,75,2246,14
+1974-01-01T00:00:00,Japan,honda,civic,24,4,120,97,2489,15
+1974-01-01T00:00:00,Japan,,subaru,26,4,108,93,2391,15.5
+1974-01-01T00:00:00,Europe,fiat,x1.9,31,4,79,67,2000,16
+1975-01-01T00:00:00,USA,plymouth,valiant custom,19,6,225,95,3264,16
+1975-01-01T00:00:00,USA,chevrolet,nova,18,6,250,105,3459,16
+1975-01-01T00:00:00,USA,mercury,monarch,15,6,250,72,3432,21
+1975-01-01T00:00:00,USA,ford,maverick,15,6,250,72,3158,19.5
+1975-01-01T00:00:00,USA,pontiac,catalina,16,8,400,170,4668,11.5
+1975-01-01T00:00:00,USA,chevrolet,bel air,15,8,350,145,4440,14
+1975-01-01T00:00:00,USA,plymouth,grand fury,16,8,318,150,4498,14.5
+1975-01-01T00:00:00,USA,ford,ltd,14,8,351,148,4657,13.5
+1975-01-01T00:00:00,USA,buick,century,17,6,231,110,3907,21
+1975-01-01T00:00:00,USA,chevroelt,chevelle malibu,16,6,250,105,3897,18.5
+1975-01-01T00:00:00,USA,amc,matador,15,6,258,110,3730,19
+1975-01-01T00:00:00,USA,plymouth,fury,18,6,225,95,3785,19
+1975-01-01T00:00:00,USA,buick,skyhawk,21,6,231,110,3039,15
+1975-01-01T00:00:00,USA,chevrolet,monza 2+2,20,8,262,110,3221,13.5
+1975-01-01T00:00:00,USA,ford,mustang ii,13,8,302,129,3169,12
+1975-01-01T00:00:00,Japan,toyota,corolla,29,4,97,75,2171,16
+1975-01-01T00:00:00,USA,ford,pinto,23,4,140,83,2639,17
+1975-01-01T00:00:00,USA,amc,gremlin,20,6,232,100,2914,16
+1975-01-01T00:00:00,USA,pontiac,astro,23,4,140,78,2592,18.5
+1975-01-01T00:00:00,Japan,toyota,corona,24,4,134,96,2702,13.5
+1975-01-01T00:00:00,Europe,volkswagen,dasher,25,4,90,71,2223,16.5
+1975-01-01T00:00:00,Japan,datsun,710,24,4,119,97,2545,17
+1975-01-01T00:00:00,USA,ford,pinto,18,6,171,97,2984,14.5
+1975-01-01T00:00:00,Europe,volkswagen,rabbit,29,4,90,70,1937,14
+1975-01-01T00:00:00,USA,amc,pacer,19,6,232,90,3211,17
+1975-01-01T00:00:00,Europe,audi,100ls,23,4,115,95,2694,15
+1975-01-01T00:00:00,Europe,peugeot,504,23,4,120,88,2957,17
+1975-01-01T00:00:00,Europe,volvo,244dl,22,4,121,98,2945,14.5
+1975-01-01T00:00:00,Europe,saab,99le,25,4,121,115,2671,13.5
+1975-01-01T00:00:00,Japan,honda,civic cvcc,33,4,91,53,1795,17.5
+1976-01-01T00:00:00,Europe,fiat,131,28,4,107,86,2464,15.5
+1976-01-01T00:00:00,Europe,opel,1900,25,4,116,81,2220,16.9
+1976-01-01T00:00:00,USA,capri,ii,25,4,140,92,2572,14.9
+1976-01-01T00:00:00,USA,dodge,colt,26,4,98,79,2255,17.7
+1976-01-01T00:00:00,Europe,renault,12tl,27,4,101,83,2202,15.3
+1976-01-01T00:00:00,USA,chevrolet,chevelle malibu classic,17.5,8,305,140,4215,13
+1976-01-01T00:00:00,USA,dodge,coronet brougham,16,8,318,150,4190,13
+1976-01-01T00:00:00,USA,amc,matador,15.5,8,304,120,3962,13.9
+1976-01-01T00:00:00,USA,ford,gran torino,14.5,8,351,152,4215,12.8
+1976-01-01T00:00:00,USA,plymouth,valiant,22,6,225,100,3233,15.4
+1976-01-01T00:00:00,USA,chevrolet,nova,22,6,250,105,3353,14.5
+1976-01-01T00:00:00,USA,ford,maverick,24,6,200,81,3012,17.6
+1976-01-01T00:00:00,USA,amc,hornet,22.5,6,232,90,3085,17.6
+1976-01-01T00:00:00,USA,chevrolet,chevette,29,4,85,52,2035,22.2
+1976-01-01T00:00:00,USA,chevrolet,woody,24.5,4,98,60,2164,22.1
+1976-01-01T00:00:00,Europe,volkswagen,rabbit,29,4,90,70,1937,14.2
+1976-01-01T00:00:00,Japan,honda,civic,33,4,91,53,1795,17.4
+1976-01-01T00:00:00,USA,dodge,aspen se,20,6,225,100,3651,17.7
+1976-01-01T00:00:00,USA,ford,granada ghia,18,6,250,78,3574,21
+1976-01-01T00:00:00,USA,pontiac,ventura sj,18.5,6,250,110,3645,16.2
+1976-01-01T00:00:00,USA,amc,pacer d/l,17.5,6,258,95,3193,17.8
+1976-01-01T00:00:00,Europe,volkswagen,rabbit,29.5,4,97,71,1825,12.2
+1976-01-01T00:00:00,Japan,datsun,b-210,32,4,85,70,1990,17
+1976-01-01T00:00:00,Japan,toyota,corolla,28,4,97,75,2155,16.4
+1976-01-01T00:00:00,USA,ford,pinto,26.5,4,140,72,2565,13.6
+1976-01-01T00:00:00,Europe,volvo,245,20,4,130,102,3150,15.7
+1976-01-01T00:00:00,USA,plymouth,volare premier v8,13,8,318,150,3940,13.2
+1976-01-01T00:00:00,Europe,peugeot,504,19,4,120,88,3270,21.9
+1976-01-01T00:00:00,Japan,toyota,mark ii,19,6,156,108,2930,15.5
+1976-01-01T00:00:00,Europe,mercedes-benz,280s,16.5,6,168,120,3820,16.7
+1976-01-01T00:00:00,USA,cadillac,seville,16.5,8,350,180,4380,12.1
+1976-01-01T00:00:00,USA,chevrolet,c10,13,8,350,145,4055,12
+1976-01-01T00:00:00,USA,ford,f108,13,8,302,130,3870,15
+1976-01-01T00:00:00,USA,dodge,d100,13,8,318,150,3755,14
+1977-01-01T00:00:00,Japan,honda,Accelerationord cvcc,31.5,4,98,68,2045,18.5
+1977-01-01T00:00:00,USA,buick,opel isuzu deluxe,30,4,111,80,2155,14.8
+1977-01-01T00:00:00,Europe,renault,5 gtl,36,4,79,58,1825,18.6
+1977-01-01T00:00:00,USA,plymouth,arrow gs,25.5,4,122,96,2300,15.5
+1977-01-01T00:00:00,Japan,datsun,f-10 hatchback,33.5,4,85,70,1945,16.8
+1977-01-01T00:00:00,USA,chevrolet,caprice classic,17.5,8,305,145,3880,12.5
+1977-01-01T00:00:00,USA,oldsmobile,cutlass supreme,17,8,260,110,4060,19
+1977-01-01T00:00:00,USA,dodge,monaco brougham,15.5,8,318,145,4140,13.7
+1977-01-01T00:00:00,USA,mercury,cougar brougham,15,8,302,130,4295,14.9
+1977-01-01T00:00:00,USA,chevrolet,concours,17.5,6,250,110,3520,16.4
+1977-01-01T00:00:00,USA,buick,skylark,20.5,6,231,105,3425,16.9
+1977-01-01T00:00:00,USA,plymouth,volare custom,19,6,225,100,3630,17.7
+1977-01-01T00:00:00,USA,ford,granada,18.5,6,250,98,3525,19
+1977-01-01T00:00:00,USA,pontiac,grand prix lj,16,8,400,180,4220,11.1
+1977-01-01T00:00:00,USA,chevrolet,monte carlo landau,15.5,8,350,170,4165,11.4
+1977-01-01T00:00:00,USA,chrysler,cordoba,15.5,8,400,190,4325,12.2
+1977-01-01T00:00:00,USA,ford,thunderbird,16,8,351,149,4335,14.5
+1977-01-01T00:00:00,Europe,volkswagen,rabbit custom,29,4,97,78,1940,14.5
+1977-01-01T00:00:00,USA,pontiac,sunbird coupe,24.5,4,151,88,2740,16
+1977-01-01T00:00:00,Japan,toyota,corolla liftback,26,4,97,75,2265,18.2
+1977-01-01T00:00:00,USA,ford,mustang ii 2+2,25.5,4,140,89,2755,15.8
+1977-01-01T00:00:00,USA,chevrolet,chevette,30.5,4,98,63,2051,17
+1977-01-01T00:00:00,USA,dodge,colt m/m,33.5,4,98,83,2075,15.9
+1977-01-01T00:00:00,Japan,subaru,dl,30,4,97,67,1985,16.4
+1977-01-01T00:00:00,Europe,volkswagen,dasher,30.5,4,97,78,2190,14.1
+1977-01-01T00:00:00,Japan,datsun,810,22,6,146,97,2815,14.5
+1977-01-01T00:00:00,Europe,bmw,320i,21.5,4,121,110,2600,12.8
+1977-01-01T00:00:00,Japan,mazda,rx-4,21.5,3,80,110,2720,13.5
+1978-01-01T00:00:00,Europe,volkswagen,rabbit custom diesel,43.1,4,90,48,1985,21.5
+1978-01-01T00:00:00,USA,ford,fiesta,36.1,4,98,66,1800,14.4
+1978-01-01T00:00:00,Japan,mazda,glc deluxe,32.8,4,78,52,1985,19.4
+1978-01-01T00:00:00,Japan,datsun,b210 gx,39.4,4,85,70,2070,18.6
+1978-01-01T00:00:00,Japan,honda,civic cvcc,36.1,4,91,60,1800,16.4
+1978-01-01T00:00:00,USA,oldsmobile,cutlass salon brougham,19.9,8,260,110,3365,15.5
+1978-01-01T00:00:00,USA,dodge,diplomat,19.4,8,318,140,3735,13.2
+1978-01-01T00:00:00,USA,mercury,monarch ghia,20.2,8,302,139,3570,12.8
+1978-01-01T00:00:00,USA,pontiac,phoenix lj,19.2,6,231,105,3535,19.2
+1978-01-01T00:00:00,USA,chevrolet,malibu,20.5,6,200,95,3155,18.2
+1978-01-01T00:00:00,USA,ford,fairmont (auto),20.2,6,200,85,2965,15.8
+1978-01-01T00:00:00,USA,ford,fairmont (man),25.1,4,140,88,2720,15.4
+1978-01-01T00:00:00,USA,plymouth,volare,20.5,6,225,100,3430,17.2
+1978-01-01T00:00:00,USA,amc,concord,19.4,6,232,90,3210,17.2
+1978-01-01T00:00:00,USA,buick,century special,20.6,6,231,105,3380,15.8
+1978-01-01T00:00:00,USA,mercury,zephyr,20.8,6,200,85,3070,16.7
+1978-01-01T00:00:00,USA,dodge,aspen,18.6,6,225,110,3620,18.7
+1978-01-01T00:00:00,USA,amc,concord d/l,18.1,6,258,120,3410,15.1
+1978-01-01T00:00:00,USA,chevrolet,monte carlo landau,19.2,8,305,145,3425,13.2
+1978-01-01T00:00:00,USA,buick,regal sport coupe (turbo),17.7,6,231,165,3445,13.4
+1978-01-01T00:00:00,USA,ford,futura,18.1,8,302,139,3205,11.2
+1978-01-01T00:00:00,USA,dodge,magnum xe,17.5,8,318,140,4080,13.7
+1978-01-01T00:00:00,USA,chevrolet,chevette,30,4,98,68,2155,16.5
+1978-01-01T00:00:00,Japan,toyota,corona,27.5,4,134,95,2560,14.2
+1978-01-01T00:00:00,Japan,datsun,510,27.2,4,119,97,2300,14.7
+1978-01-01T00:00:00,USA,dodge,omni,30.9,4,105,75,2230,14.5
+1978-01-01T00:00:00,Japan,toyota,celica gt liftback,21.1,4,134,95,2515,14.8
+1978-01-01T00:00:00,USA,plymouth,sapporo,23.2,4,156,105,2745,16.7
+1978-01-01T00:00:00,USA,oldsmobile,starfire sx,23.8,4,151,85,2855,17.6
+1978-01-01T00:00:00,Japan,datsun,200-sx,23.9,4,119,97,2405,14.9
+1978-01-01T00:00:00,Europe,audi,5000,20.3,5,131,103,2830,15.9
+1978-01-01T00:00:00,Europe,volvo,264gl,17,6,163,125,3140,13.6
+1978-01-01T00:00:00,Europe,saab,99gle,21.6,4,121,115,2795,15.7
+1978-01-01T00:00:00,Europe,peugeot,604sl,16.2,6,163,133,3410,15.8
+1978-01-01T00:00:00,Europe,volkswagen,scirocco,31.5,4,89,71,1990,14.9
+1978-01-01T00:00:00,Japan,honda,Accelerationord lx,29.5,4,98,68,2135,16.6
+1979-01-01T00:00:00,USA,pontiac,lemans v6,21.5,6,231,115,3245,15.4
+1979-01-01T00:00:00,USA,mercury,zephyr 6,19.8,6,200,85,2990,18.2
+1979-01-01T00:00:00,USA,ford,fairmont 4,22.3,4,140,88,2890,17.3
+1979-01-01T00:00:00,USA,amc,concord dl 6,20.2,6,232,90,3265,18.2
+1979-01-01T00:00:00,USA,dodge,aspen 6,20.6,6,225,110,3360,16.6
+1979-01-01T00:00:00,USA,chevrolet,caprice classic,17,8,305,130,3840,15.4
+1979-01-01T00:00:00,USA,ford,ltd landau,17.6,8,302,129,3725,13.4
+1979-01-01T00:00:00,USA,mercury,grand marquis,16.5,8,351,138,3955,13.2
+1979-01-01T00:00:00,USA,dodge,st. regis,18.2,8,318,135,3830,15.2
+1979-01-01T00:00:00,USA,buick,estate wagon (sw),16.9,8,350,155,4360,14.9
+1979-01-01T00:00:00,USA,ford,country squire (sw),15.5,8,351,142,4054,14.3
+1979-01-01T00:00:00,USA,chevrolet,malibu classic (sw),19.2,8,267,125,3605,15
+1979-01-01T00:00:00,USA,chrysler,lebaron town @ country (sw),18.5,8,360,150,3940,13
+1979-01-01T00:00:00,Europe,volkswagen,rabbit custom,31.9,4,89,71,1925,14
+1979-01-01T00:00:00,Japan,mazda,glc deluxe,34.1,4,86,65,1975,15.2
+1979-01-01T00:00:00,USA,dodge,colt hatchback custom,35.7,4,98,80,1915,14.4
+1979-01-01T00:00:00,USA,amc,spirit dl,27.4,4,121,80,2670,15
+1979-01-01T00:00:00,Europe,mercedes,benz 300d,25.4,5,183,77,3530,20.1
+1979-01-01T00:00:00,USA,cadillac,eldorado,23,8,350,125,3900,17.4
+1979-01-01T00:00:00,Europe,peugeot,504,27.2,4,141,71,3190,24.8
+1979-01-01T00:00:00,USA,oldsmobile,cutlass salon brougham,23.9,8,260,90,3420,22.2
+1979-01-01T00:00:00,USA,plymouth,horizon,34.2,4,105,70,2200,13.2
+1979-01-01T00:00:00,USA,plymouth,horizon tc3,34.5,4,105,70,2150,14.9
+1979-01-01T00:00:00,Japan,datsun,210,31.8,4,85,65,2020,19.2
+1979-01-01T00:00:00,Europe,fiat,strada custom,37.3,4,91,69,2130,14.7
+1979-01-01T00:00:00,USA,buick,skylark limited,28.4,4,151,90,2670,16
+1979-01-01T00:00:00,USA,chevrolet,citation,28.8,6,173,115,2595,11.3
+1979-01-01T00:00:00,USA,oldsmobile,omega brougham,26.8,6,173,115,2700,12.9
+1979-01-01T00:00:00,USA,pontiac,phoenix,33.5,4,151,90,2556,13.2
+1980-01-01T00:00:00,Europe,volkswagen,rabbit,41.5,4,98,76,2144,14.7
+1980-01-01T00:00:00,Japan,toyota,corolla tercel,38.1,4,89,60,1968,18.8
+1980-01-01T00:00:00,USA,chevrolet,chevette,32.1,4,98,70,2120,15.5
+1980-01-01T00:00:00,Japan,datsun,310,37.2,4,86,65,2019,16.4
+1980-01-01T00:00:00,USA,chevrolet,citation,28,4,151,90,2678,16.5
+1980-01-01T00:00:00,USA,ford,fairmont,26.4,4,140,88,2870,18.1
+1980-01-01T00:00:00,USA,amc,concord,24.3,4,151,90,3003,20.1
+1980-01-01T00:00:00,USA,dodge,aspen,19.1,6,225,90,3381,18.7
+1980-01-01T00:00:00,Europe,audi,4000,34.3,4,97,78,2188,15.8
+1980-01-01T00:00:00,Japan,toyota,corona liftback,29.8,4,134,90,2711,15.5
+1980-01-01T00:00:00,Japan,mazda,626,31.3,4,120,75,2542,17.5
+1980-01-01T00:00:00,Japan,datsun,510 hatchback,37,4,119,92,2434,15
+1980-01-01T00:00:00,Japan,toyota,corolla,32.2,4,108,75,2265,15.2
+1980-01-01T00:00:00,Japan,mazda,glc,46.6,4,86,65,2110,17.9
+1980-01-01T00:00:00,USA,dodge,colt,27.9,4,156,105,2800,14.4
+1980-01-01T00:00:00,Japan,datsun,210,40.8,4,85,65,2110,19.2
+1980-01-01T00:00:00,Europe,volkswagen,rabbit c (diesel),44.3,4,90,48,2085,21.7
+1980-01-01T00:00:00,Europe,volkswagen,dasher (diesel),43.4,4,90,48,2335,23.7
+1980-01-01T00:00:00,Europe,audi,5000s (diesel),36.4,5,121,67,2950,19.9
+1980-01-01T00:00:00,Europe,mercedes-benz,240d,30,4,146,67,3250,21.8
+1980-01-01T00:00:00,Japan,honda,civic 1500 gl,44.6,4,91,67,1850,13.8
+1980-01-01T00:00:00,Europe,renault,lecar deluxe,40.9,4,85,,1835,17.3
+1980-01-01T00:00:00,Japan,subaru,dl,33.8,4,97,67,2145,18
+1980-01-01T00:00:00,Europe,vokswagen,rabbit,29.8,4,89,62,1845,15.3
+1980-01-01T00:00:00,Japan,datsun,280-zx,32.7,6,168,132,2910,11.4
+1980-01-01T00:00:00,Japan,mazda,rx-7 gs,23.7,3,70,100,2420,12.5
+1980-01-01T00:00:00,Europe,triumph,tr7 coupe,35,4,122,88,2500,15.1
+1980-01-01T00:00:00,USA,ford,mustang cobra,23.6,4,140,,2905,14.3
+1980-01-01T00:00:00,Japan,honda,Accelerationord,32.4,4,107,72,2290,17
+1982-01-01T00:00:00,USA,plymouth,reliant,27.2,4,135,84,2490,15.7
+1982-01-01T00:00:00,USA,buick,skylark,26.6,4,151,84,2635,16.4
+1982-01-01T00:00:00,USA,dodge,aries wagon (sw),25.8,4,156,92,2620,14.4
+1982-01-01T00:00:00,USA,chevrolet,citation,23.5,6,173,110,2725,12.6
+1982-01-01T00:00:00,USA,plymouth,reliant,30,4,135,84,2385,12.9
+1982-01-01T00:00:00,Japan,toyota,starlet,39.1,4,79,58,1755,16.9
+1982-01-01T00:00:00,USA,plymouth,champ,39,4,86,64,1875,16.4
+1982-01-01T00:00:00,Japan,honda,civic 1300,35.1,4,81,60,1760,16.1
+1982-01-01T00:00:00,Japan,,subaru,32.3,4,97,67,2065,17.8
+1982-01-01T00:00:00,Japan,datsun,210,37,4,85,65,1975,19.4
+1982-01-01T00:00:00,Japan,toyota,tercel,37.7,4,89,62,2050,17.3
+1982-01-01T00:00:00,Japan,mazda,glc 4,34.1,4,91,68,1985,16
+1982-01-01T00:00:00,USA,plymouth,horizon 4,34.7,4,105,63,2215,14.9
+1982-01-01T00:00:00,USA,ford,escort 4w,34.4,4,98,65,2045,16.2
+1982-01-01T00:00:00,USA,ford,escort 2h,29.9,4,98,65,2380,20.7
+1982-01-01T00:00:00,Europe,volkswagen,jetta,33,4,105,74,2190,14.2
+1982-01-01T00:00:00,Europe,renault,18i,34.5,4,100,,2320,15.8
+1982-01-01T00:00:00,Japan,honda,prelude,33.7,4,107,75,2210,14.4
+1982-01-01T00:00:00,Japan,toyota,corolla,32.4,4,108,75,2350,16.8
+1982-01-01T00:00:00,Japan,datsun,200sx,32.9,4,119,100,2615,14.8
+1982-01-01T00:00:00,Japan,mazda,626,31.6,4,120,74,2635,18.3
+1982-01-01T00:00:00,Europe,peugeot,505s turbo diesel,28.1,4,141,80,3230,20.4
+1982-01-01T00:00:00,Europe,saab,900s,,4,121,110,2800,15.4
+1982-01-01T00:00:00,Europe,volvo,diesel,30.7,6,145,76,3160,19.6
+1982-01-01T00:00:00,Japan,toyota,cressida,25.4,6,168,116,2900,12.6
+1982-01-01T00:00:00,Japan,datsun,810 maxima,24.2,6,146,120,2930,13.8
+1982-01-01T00:00:00,USA,buick,century,22.4,6,231,110,3415,15.8
+1982-01-01T00:00:00,USA,oldsmobile,cutlass ls,26.6,8,350,105,3725,19
+1982-01-01T00:00:00,USA,ford,granada gl,20.2,6,200,88,3060,17.1
+1982-01-01T00:00:00,USA,chrysler,lebaron salon,17.6,6,225,85,3465,16.6
+1982-01-01T00:00:00,USA,chevrolet,cavalier,28,4,112,88,2605,19.6
+1982-01-01T00:00:00,USA,chevrolet,cavalier wagon,27,4,112,88,2640,18.6
+1982-01-01T00:00:00,USA,chevrolet,cavalier 2-door,34,4,112,88,2395,18
+1982-01-01T00:00:00,USA,pontiac,j2000 se hatchback,31,4,112,85,2575,16.2
+1982-01-01T00:00:00,USA,dodge,aries se,29,4,135,84,2525,16
+1982-01-01T00:00:00,USA,pontiac,phoenix,27,4,151,90,2735,18
+1982-01-01T00:00:00,USA,ford,fairmont futura,24,4,140,92,2865,16.4
+1982-01-01T00:00:00,USA,amc,concord dl,23,4,151,,3035,20.5
+1982-01-01T00:00:00,Europe,volkswagen,rabbit l,36,4,105,74,1980,15.3
+1982-01-01T00:00:00,Japan,mazda,glc custom l,37,4,91,68,2025,18.2
+1982-01-01T00:00:00,Japan,mazda,glc custom,31,4,91,68,1970,17.6
+1982-01-01T00:00:00,USA,plymouth,horizon miser,38,4,105,63,2125,14.7
+1982-01-01T00:00:00,USA,mercury,lynx l,36,4,98,70,2125,17.3
+1982-01-01T00:00:00,Japan,nissan,stanza xe,36,4,120,88,2160,14.5
+1982-01-01T00:00:00,Japan,honda,Accelerationord,36,4,107,75,2205,14.5
+1982-01-01T00:00:00,Japan,toyota,corolla,34,4,108,70,2245,16.9
+1982-01-01T00:00:00,Japan,honda,civic,38,4,91,67,1965,15
+1982-01-01T00:00:00,Japan,honda,civic (auto),32,4,91,67,1965,15.7
+1982-01-01T00:00:00,Japan,datsun,310 gx,38,4,91,67,1995,16.2
+1982-01-01T00:00:00,USA,buick,century limited,25,6,181,110,2945,16.4
+1982-01-01T00:00:00,USA,oldsmobile,cutlass ciera (diesel),38,6,262,85,3015,17
+1982-01-01T00:00:00,USA,chrysler,lebaron medallion,26,4,156,92,2585,14.5
+1982-01-01T00:00:00,USA,ford,granada l,22,6,232,112,2835,14.7
+1982-01-01T00:00:00,Japan,toyota,celica gt,32,4,144,96,2665,13.9
+1982-01-01T00:00:00,USA,dodge,charger 2.2,36,4,135,84,2370,13
+1982-01-01T00:00:00,USA,chevrolet,camaro,27,4,151,90,2950,17.3
+1982-01-01T00:00:00,USA,ford,mustang gl,27,4,140,86,2790,15.6
+1982-01-01T00:00:00,Europe,volkswagen,pickup,44,4,97,52,2130,24.6
+1982-01-01T00:00:00,USA,dodge,rampage,32,4,135,84,2295,11.6
+1982-01-01T00:00:00,USA,ford,ranger,28,4,120,79,2625,18.6
+1982-01-01T00:00:00,USA,chevrolet,s-10,31,4,119,82,2720,19.4
diff --git a/pkg/tsdb/grafana-testdata-datasource/kinds/dataquery/types_dataquery_gen.go b/pkg/tsdb/grafana-testdata-datasource/kinds/dataquery/types_dataquery_gen.go
deleted file mode 100644
index 0a22cb5c8e53e..0000000000000
--- a/pkg/tsdb/grafana-testdata-datasource/kinds/dataquery/types_dataquery_gen.go
+++ /dev/null
@@ -1,195 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     public/app/plugins/gen.go
-// Using jennies:
-//     PluginGoTypesJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package dataquery
-
-// Defines values for NodesQueryType.
-const (
-	NodesQueryTypeRandom      NodesQueryType = "random"
-	NodesQueryTypeRandomEdges NodesQueryType = "random edges"
-	NodesQueryTypeResponse    NodesQueryType = "response"
-)
-
-// Defines values for StreamingQueryType.
-const (
-	StreamingQueryTypeFetch  StreamingQueryType = "fetch"
-	StreamingQueryTypeLogs   StreamingQueryType = "logs"
-	StreamingQueryTypeSignal StreamingQueryType = "signal"
-)
-
-// Defines values for ErrorType.
-const (
-	ErrorTypeFrontendException  ErrorType = "frontend_exception"
-	ErrorTypeFrontendObservable ErrorType = "frontend_observable"
-	ErrorTypeServerPanic        ErrorType = "server_panic"
-)
-
-// Defines values for TestDataQueryType.
-const (
-	TestDataQueryTypeAnnotations                  TestDataQueryType = "annotations"
-	TestDataQueryTypeArrow                        TestDataQueryType = "arrow"
-	TestDataQueryTypeCsvContent                   TestDataQueryType = "csv_content"
-	TestDataQueryTypeCsvFile                      TestDataQueryType = "csv_file"
-	TestDataQueryTypeCsvMetricValues              TestDataQueryType = "csv_metric_values"
-	TestDataQueryTypeDatapointsOutsideRange       TestDataQueryType = "datapoints_outside_range"
-	TestDataQueryTypeExponentialHeatmapBucketData TestDataQueryType = "exponential_heatmap_bucket_data"
-	TestDataQueryTypeFlameGraph                   TestDataQueryType = "flame_graph"
-	TestDataQueryTypeGrafanaApi                   TestDataQueryType = "grafana_api"
-	TestDataQueryTypeLinearHeatmapBucketData      TestDataQueryType = "linear_heatmap_bucket_data"
-	TestDataQueryTypeLive                         TestDataQueryType = "live"
-	TestDataQueryTypeLogs                         TestDataQueryType = "logs"
-	TestDataQueryTypeManualEntry                  TestDataQueryType = "manual_entry"
-	TestDataQueryTypeNoDataPoints                 TestDataQueryType = "no_data_points"
-	TestDataQueryTypeNodeGraph                    TestDataQueryType = "node_graph"
-	TestDataQueryTypePredictableCsvWave           TestDataQueryType = "predictable_csv_wave"
-	TestDataQueryTypePredictablePulse             TestDataQueryType = "predictable_pulse"
-	TestDataQueryTypeRandomWalk                   TestDataQueryType = "random_walk"
-	TestDataQueryTypeRandomWalkTable              TestDataQueryType = "random_walk_table"
-	TestDataQueryTypeRandomWalkWithError          TestDataQueryType = "random_walk_with_error"
-	TestDataQueryTypeRawFrame                     TestDataQueryType = "raw_frame"
-	TestDataQueryTypeServerError500               TestDataQueryType = "server_error_500"
-	TestDataQueryTypeSimulation                   TestDataQueryType = "simulation"
-	TestDataQueryTypeSlowQuery                    TestDataQueryType = "slow_query"
-	TestDataQueryTypeStreamingClient              TestDataQueryType = "streaming_client"
-	TestDataQueryTypeTableStatic                  TestDataQueryType = "table_static"
-	TestDataQueryTypeTrace                        TestDataQueryType = "trace"
-	TestDataQueryTypeUsa                          TestDataQueryType = "usa"
-	TestDataQueryTypeVariablesQuery               TestDataQueryType = "variables-query"
-)
-
-// CSVWave defines model for CSVWave.
-type CSVWave struct {
-	Labels    *string `json:"labels,omitempty"`
-	Name      *string `json:"name,omitempty"`
-	TimeStep  *int64  `json:"timeStep,omitempty"`
-	ValuesCSV *string `json:"valuesCSV,omitempty"`
-}
-
-// These are the common properties available to all queries in all datasources.
-// Specific implementations will *extend* this interface, adding the required
-// properties for the given context.
-type DataQuery struct {
-	// For mixed data sources the selected datasource is on the query level.
-	// For non mixed scenarios this is undefined.
-	// TODO find a better way to do this ^ that's friendly to schema
-	// TODO this shouldn't be unknown but DataSourceRef | null
-	Datasource *any `json:"datasource,omitempty"`
-
-	// Hide true if query is disabled (ie should not be returned to the dashboard)
-	// Note this does not always imply that the query should not be executed since
-	// the results from a hidden query may be used as the input to other queries (SSE etc)
-	Hide *bool `json:"hide,omitempty"`
-
-	// Specify the query flavor
-	// TODO make this required and give it a default
-	QueryType *string `json:"queryType,omitempty"`
-
-	// A unique identifier for the query within the list of targets.
-	// In server side expressions, the refId is used as a variable name to identify results.
-	// By default, the UI will assign A->Z; however setting meaningful names may be useful.
-	RefId string `json:"refId"`
-}
-
-// NodesQuery defines model for NodesQuery.
-type NodesQuery struct {
-	Count *int64          `json:"count,omitempty"`
-	Type  *NodesQueryType `json:"type,omitempty"`
-}
-
-// NodesQueryType defines model for NodesQuery.Type.
-type NodesQueryType string
-
-// PulseWaveQuery defines model for PulseWaveQuery.
-type PulseWaveQuery struct {
-	OffCount *int64   `json:"offCount,omitempty"`
-	OffValue *float64 `json:"offValue,omitempty"`
-	OnCount  *int64   `json:"onCount,omitempty"`
-	OnValue  *float64 `json:"onValue,omitempty"`
-	TimeStep *int64   `json:"timeStep,omitempty"`
-}
-
-// TODO: Should this live here given it's not used in the dataquery?
-type Scenario struct {
-	Description    *string `json:"description,omitempty"`
-	HideAliasField *bool   `json:"hideAliasField,omitempty"`
-	Id             string  `json:"id"`
-	Name           string  `json:"name"`
-	StringInput    string  `json:"stringInput"`
-}
-
-// SimulationQuery defines model for SimulationQuery.
-type SimulationQuery struct {
-	Config map[string]any `json:"config,omitempty"`
-	Key    struct {
-		Tick float64 `json:"tick"`
-		Type string  `json:"type"`
-		Uid  *string `json:"uid,omitempty"`
-	} `json:"key"`
-	Last   *bool `json:"last,omitempty"`
-	Stream *bool `json:"stream,omitempty"`
-}
-
-// StreamingQuery defines model for StreamingQuery.
-type StreamingQuery struct {
-	Bands  *int32             `json:"bands,omitempty"`
-	Noise  int32              `json:"noise"`
-	Speed  int32              `json:"speed"`
-	Spread int32              `json:"spread"`
-	Type   StreamingQueryType `json:"type"`
-	Url    *string            `json:"url,omitempty"`
-}
-
-// StreamingQueryType defines model for StreamingQuery.Type.
-type StreamingQueryType string
-
-// TestDataDataQuery defines model for TestDataDataQuery.
-type TestDataDataQuery struct {
-	// DataQuery These are the common properties available to all queries in all datasources.
-	// Specific implementations will *extend* this interface, adding the required
-	// properties for the given context.
-	DataQuery
-	Alias       *string   `json:"alias,omitempty"`
-	Channel     *string   `json:"channel,omitempty"`
-	CsvContent  *string   `json:"csvContent,omitempty"`
-	CsvFileName *string   `json:"csvFileName,omitempty"`
-	CsvWave     []CSVWave `json:"csvWave,omitempty"`
-
-	// Drop percentage (the chance we will lose a point 0-100)
-	DropPercent     *float64           `json:"dropPercent,omitempty"`
-	ErrorType       *ErrorType         `json:"errorType,omitempty"`
-	FlamegraphDiff  *bool              `json:"flamegraphDiff,omitempty"`
-	Labels          *string            `json:"labels,omitempty"`
-	LevelColumn     *bool              `json:"levelColumn,omitempty"`
-	Lines           *int64             `json:"lines,omitempty"`
-	Nodes           *NodesQuery        `json:"nodes,omitempty"`
-	Points          [][]any            `json:"points,omitempty"`
-	PulseWave       *PulseWaveQuery    `json:"pulseWave,omitempty"`
-	RawFrameContent *string            `json:"rawFrameContent,omitempty"`
-	ScenarioId      *TestDataQueryType `json:"scenarioId,omitempty"`
-	SeriesCount     *int32             `json:"seriesCount,omitempty"`
-	Sim             *SimulationQuery   `json:"sim,omitempty"`
-	SpanCount       *int32             `json:"spanCount,omitempty"`
-	Stream          *StreamingQuery    `json:"stream,omitempty"`
-	StringInput     *string            `json:"stringInput,omitempty"`
-	Usa             *USAQuery          `json:"usa,omitempty"`
-}
-
-// ErrorType defines model for TestDataDataQuery.ErrorType.
-type ErrorType string
-
-// TestDataQueryType defines model for TestDataQueryType.
-type TestDataQueryType string
-
-// USAQuery defines model for USAQuery.
-type USAQuery struct {
-	Fields []string `json:"fields,omitempty"`
-	Mode   *string  `json:"mode,omitempty"`
-	Period *string  `json:"period,omitempty"`
-	States []string `json:"states,omitempty"`
-}
diff --git a/pkg/tsdb/grafana-testdata-datasource/kinds/query.go b/pkg/tsdb/grafana-testdata-datasource/kinds/query.go
new file mode 100644
index 0000000000000..f160c486b6dd1
--- /dev/null
+++ b/pkg/tsdb/grafana-testdata-datasource/kinds/query.go
@@ -0,0 +1,178 @@
+package kinds
+
+import (
+	"embed"
+	"encoding/json"
+)
+
+// NodesQueryType defines model for NodesQuery.Type.
+// +enum
+type NodesQueryType string
+
+const (
+	NodesQueryTypeRandom          NodesQueryType = "random"
+	NodesQueryTypeRandomEdges     NodesQueryType = "random edges"
+	NodesQueryTypeResponseMedium  NodesQueryType = "response_medium"
+	NodesQueryTypeResponseSmall   NodesQueryType = "response_small"
+	NodesQueryTypeFeatureShowcase NodesQueryType = "feature_showcase"
+)
+
+// StreamingQueryType defines model for StreamingQuery.Type.
+// +enum
+type StreamingQueryType string
+
+const (
+	StreamingQueryTypeFetch  StreamingQueryType = "fetch"
+	StreamingQueryTypeLogs   StreamingQueryType = "logs"
+	StreamingQueryTypeSignal StreamingQueryType = "signal"
+	StreamingQueryTypeTraces StreamingQueryType = "traces"
+)
+
+// ErrorType defines model for TestDataQuery.ErrorType.
+// +enum
+type ErrorType string
+
+const (
+	ErrorTypeFrontendException  ErrorType = "frontend_exception"
+	ErrorTypeFrontendObservable ErrorType = "frontend_observable"
+	ErrorTypeServerPanic        ErrorType = "server_panic"
+)
+
+// TestDataQueryType defines model for TestDataQueryType.
+// +enum
+type TestDataQueryType string
+
+// Defines values for TestDataQueryType.
+const (
+	TestDataQueryTypeAnnotations                  TestDataQueryType = "annotations"
+	TestDataQueryTypeArrow                        TestDataQueryType = "arrow"
+	TestDataQueryTypeCsvContent                   TestDataQueryType = "csv_content"
+	TestDataQueryTypeCsvFile                      TestDataQueryType = "csv_file"
+	TestDataQueryTypeCsvMetricValues              TestDataQueryType = "csv_metric_values"
+	TestDataQueryTypeDatapointsOutsideRange       TestDataQueryType = "datapoints_outside_range"
+	TestDataQueryTypeExponentialHeatmapBucketData TestDataQueryType = "exponential_heatmap_bucket_data"
+	TestDataQueryTypeFlameGraph                   TestDataQueryType = "flame_graph"
+	TestDataQueryTypeGrafanaApi                   TestDataQueryType = "grafana_api"
+	TestDataQueryTypeLinearHeatmapBucketData      TestDataQueryType = "linear_heatmap_bucket_data"
+	TestDataQueryTypeLive                         TestDataQueryType = "live"
+	TestDataQueryTypeLogs                         TestDataQueryType = "logs"
+	TestDataQueryTypeManualEntry                  TestDataQueryType = "manual_entry"
+	TestDataQueryTypeNoDataPoints                 TestDataQueryType = "no_data_points"
+	TestDataQueryTypeNodeGraph                    TestDataQueryType = "node_graph"
+	TestDataQueryTypePredictableCsvWave           TestDataQueryType = "predictable_csv_wave"
+	TestDataQueryTypePredictablePulse             TestDataQueryType = "predictable_pulse"
+	TestDataQueryTypeRandomWalk                   TestDataQueryType = "random_walk"
+	TestDataQueryTypeRandomWalkTable              TestDataQueryType = "random_walk_table"
+	TestDataQueryTypeRandomWalkWithError          TestDataQueryType = "random_walk_with_error"
+	TestDataQueryTypeRawFrame                     TestDataQueryType = "raw_frame"
+	TestDataQueryTypeServerError500               TestDataQueryType = "server_error_500"
+	TestDataQueryTypeSimulation                   TestDataQueryType = "simulation"
+	TestDataQueryTypeSlowQuery                    TestDataQueryType = "slow_query"
+	TestDataQueryTypeStreamingClient              TestDataQueryType = "streaming_client"
+	TestDataQueryTypeTableStatic                  TestDataQueryType = "table_static"
+	TestDataQueryTypeTrace                        TestDataQueryType = "trace"
+	TestDataQueryTypeUsa                          TestDataQueryType = "usa"
+	TestDataQueryTypeVariablesQuery               TestDataQueryType = "variables-query"
+)
+
+// TestDataQuery defines model for TestDataQuery.
+type TestDataQuery struct {
+	ScenarioId TestDataQueryType `json:"scenarioId,omitempty"`
+	Alias      string            `json:"alias,omitempty"`
+	Labels     string            `json:"labels,omitempty"`
+
+	// common parameter used by many query types
+	StringInput string `json:"stringInput,omitempty"`
+
+	CsvContent  string    `json:"csvContent,omitempty"`
+	CsvFileName string    `json:"csvFileName,omitempty"`
+	CsvWave     []CSVWave `json:"csvWave,omitempty"`
+
+	// Used for live query
+	Channel string `json:"channel,omitempty"`
+
+	// Drop percentage (the chance we will lose a point 0-100)
+	DropPercent     float64   `json:"dropPercent,omitempty"`
+	ErrorType       ErrorType `json:"errorType,omitempty"`
+	FlamegraphDiff  bool      `json:"flamegraphDiff,omitempty"`
+	LevelColumn     bool      `json:"levelColumn,omitempty"`
+	StartValue      float64   `json:"startValue,omitempty"`
+	Spread          float64   `json:"spread,omitempty"`
+	Noise           float64   `json:"noise,omitempty"`
+	Min             *float64  `json:"min,omitempty"`
+	Max             *float64  `json:"max,omitempty"`
+	WithNil         bool      `json:"withNil,omitempty"`
+	Lines           int64     `json:"lines,omitempty"`
+	Points          [][]any   `json:"points,omitempty"`
+	RawFrameContent string    `json:"rawFrameContent,omitempty"`
+	SeriesCount     int       `json:"seriesCount,omitempty"`
+	SpanCount       int       `json:"spanCount,omitempty"`
+
+	Nodes     *NodesQuery      `json:"nodes,omitempty"`
+	PulseWave *PulseWaveQuery  `json:"pulseWave,omitempty"`
+	Sim       *SimulationQuery `json:"sim,omitempty"`
+	Stream    *StreamingQuery  `json:"stream,omitempty"`
+	Usa       *USAQuery        `json:"usa,omitempty"`
+}
+
+// CSVWave defines model for CSVWave.
+type CSVWave struct {
+	TimeStep  int64  `json:"timeStep,omitempty"`
+	ValuesCSV string `json:"valuesCSV,omitempty"`
+	Labels    string `json:"labels,omitempty"`
+	Name      string `json:"name,omitempty"`
+}
+
+// NodesQuery defines model for NodesQuery.
+type NodesQuery struct {
+	Count int64          `json:"count,omitempty"`
+	Seed  int64          `json:"seed,omitempty"`
+	Type  NodesQueryType `json:"type,omitempty"`
+}
+
+// PulseWaveQuery defines model for PulseWaveQuery.
+type PulseWaveQuery struct {
+	OffCount int64   `json:"offCount,omitempty"`
+	OffValue float64 `json:"offValue,omitempty"`
+	OnCount  int64   `json:"onCount,omitempty"`
+	OnValue  float64 `json:"onValue,omitempty"`
+	TimeStep int64   `json:"timeStep,omitempty"`
+}
+
+// SimulationQuery defines model for SimulationQuery.
+type SimulationQuery struct {
+	Config map[string]any `json:"config,omitempty"`
+	Key    struct {
+		Tick float64 `json:"tick"`
+		Type string  `json:"type"`
+		Uid  *string `json:"uid,omitempty"`
+	} `json:"key"`
+	Last   bool `json:"last,omitempty"`
+	Stream bool `json:"stream,omitempty"`
+}
+
+// StreamingQuery defines model for StreamingQuery.
+type StreamingQuery struct {
+	Bands  int32              `json:"bands,omitempty"`
+	Noise  float64            `json:"noise"`
+	Speed  float64            `json:"speed"`
+	Spread float64            `json:"spread"`
+	Type   StreamingQueryType `json:"type"`
+	Url    string             `json:"url,omitempty"`
+}
+
+// USAQuery defines model for USAQuery.
+type USAQuery struct {
+	Fields []string `json:"fields,omitempty"`
+	Mode   string   `json:"mode,omitempty"`
+	Period string   `json:"period,omitempty"`
+	States []string `json:"states,omitempty"`
+}
+
+//go:embed query.types.json
+var f embed.FS
+
+// QueryTypeDefinitionsJSON returns the query type definitions
+func QueryTypeDefinitionsJSON() (json.RawMessage, error) {
+	return f.ReadFile("query.types.json")
+}
diff --git a/pkg/tsdb/grafana-testdata-datasource/kinds/query.panel.example.json b/pkg/tsdb/grafana-testdata-datasource/kinds/query.panel.example.json
new file mode 100644
index 0000000000000..c3ac056d02eba
--- /dev/null
+++ b/pkg/tsdb/grafana-testdata-datasource/kinds/query.panel.example.json
@@ -0,0 +1,28 @@
+{
+  "type": "table",
+  "targets": [
+    {
+      "refId": "A",
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "TheUID"
+      },
+      "scenarioId": "random_walk"
+    },
+    {
+      "refId": "B",
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "TheUID"
+      },
+      "pulseWave": {
+        "offCount": 20,
+        "offValue": 1.23,
+        "onCount": 10,
+        "onValue": 4.56,
+        "timeStep": 1000
+      },
+      "scenarioId": "predictable_pulse"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-testdata-datasource/kinds/query.panel.schema.json b/pkg/tsdb/grafana-testdata-datasource/kinds/query.panel.schema.json
new file mode 100644
index 0000000000000..96f7b230af2c2
--- /dev/null
+++ b/pkg/tsdb/grafana-testdata-datasource/kinds/query.panel.schema.json
@@ -0,0 +1,411 @@
+{
+  "type": "object",
+  "required": [
+    "targets",
+    "type"
+  ],
+  "properties": {
+    "targets": {
+      "type": "array",
+      "items": {
+        "description": "TestDataQuery defines model for TestDataQuery.",
+        "type": "object",
+        "properties": {
+          "alias": {
+            "type": "string"
+          },
+          "channel": {
+            "description": "Used for live query",
+            "type": "string"
+          },
+          "csvContent": {
+            "type": "string"
+          },
+          "csvFileName": {
+            "type": "string"
+          },
+          "csvWave": {
+            "type": "array",
+            "items": {
+              "description": "CSVWave defines model for CSVWave.",
+              "type": "object",
+              "properties": {
+                "labels": {
+                  "type": "string"
+                },
+                "name": {
+                  "type": "string"
+                },
+                "timeStep": {
+                  "type": "integer"
+                },
+                "valuesCSV": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            }
+          },
+          "datasource": {
+            "description": "The datasource",
+            "type": "object",
+            "required": [
+              "type"
+            ],
+            "properties": {
+              "type": {
+                "description": "The datasource plugin type",
+                "type": "string",
+                "pattern": "^grafana-testdata-datasource$|^testdata$"
+              },
+              "uid": {
+                "description": "Datasource UID",
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          },
+          "dropPercent": {
+            "description": "Drop percentage (the chance we will lose a point 0-100)",
+            "type": "number"
+          },
+          "errorType": {
+            "description": "Possible enum values:\n - `\"frontend_exception\"` \n - `\"frontend_observable\"` \n - `\"server_panic\"` ",
+            "type": "string",
+            "enum": [
+              "frontend_exception",
+              "frontend_observable",
+              "server_panic"
+            ],
+            "x-enum-description": {}
+          },
+          "flamegraphDiff": {
+            "type": "boolean"
+          },
+          "hide": {
+            "description": "true if query is disabled (ie should not be returned to the dashboard)\nNOTE: this does not always imply that the query should not be executed since\nthe results from a hidden query may be used as the input to other queries (SSE etc)",
+            "type": "boolean"
+          },
+          "intervalMs": {
+            "description": "Interval is the suggested duration between time points in a time series query.\nNOTE: the values for intervalMs is not saved in the query model.  It is typically calculated\nfrom the interval required to fill a pixels in the visualization",
+            "type": "number"
+          },
+          "labels": {
+            "type": "string"
+          },
+          "levelColumn": {
+            "type": "boolean"
+          },
+          "lines": {
+            "type": "integer"
+          },
+          "max": {
+            "type": "number"
+          },
+          "maxDataPoints": {
+            "description": "MaxDataPoints is the maximum number of data points that should be returned from a time series query.\nNOTE: the values for maxDataPoints is not saved in the query model.  It is typically calculated\nfrom the number of pixels visible in a visualization",
+            "type": "integer"
+          },
+          "min": {
+            "type": "number"
+          },
+          "nodes": {
+            "type": "object",
+            "properties": {
+              "count": {
+                "type": "integer"
+              },
+              "seed": {
+                "type": "integer"
+              },
+              "type": {
+                "description": "Possible enum values:\n - `\"random\"` \n - `\"random edges\"` \n - `\"response_medium\"` \n - `\"response_small\"` \n - `\"feature_showcase\"` ",
+                "type": "string",
+                "enum": [
+                  "random",
+                  "random edges",
+                  "response_medium",
+                  "response_small",
+                  "feature_showcase"
+                ],
+                "x-enum-description": {}
+              }
+            },
+            "additionalProperties": false
+          },
+          "noise": {
+            "type": "number"
+          },
+          "points": {
+            "type": "array",
+            "items": {
+              "type": "array"
+            }
+          },
+          "pulseWave": {
+            "type": "object",
+            "properties": {
+              "offCount": {
+                "type": "integer"
+              },
+              "offValue": {
+                "type": "number"
+              },
+              "onCount": {
+                "type": "integer"
+              },
+              "onValue": {
+                "type": "number"
+              },
+              "timeStep": {
+                "type": "integer"
+              }
+            },
+            "additionalProperties": false
+          },
+          "queryType": {
+            "description": "QueryType is an optional identifier for the type of query.\nIt can be used to distinguish different types of queries.",
+            "type": "string"
+          },
+          "rawFrameContent": {
+            "type": "string"
+          },
+          "refId": {
+            "description": "RefID is the unique identifier of the query, set by the frontend call.",
+            "type": "string"
+          },
+          "resultAssertions": {
+            "description": "Optionally define expected query result behavior",
+            "type": "object",
+            "required": [
+              "typeVersion"
+            ],
+            "properties": {
+              "maxFrames": {
+                "description": "Maximum frame count",
+                "type": "integer"
+              },
+              "type": {
+                "description": "Type asserts that the frame matches a known type structure.\n\n\nPossible enum values:\n - `\"\"` \n - `\"timeseries-wide\"` \n - `\"timeseries-long\"` \n - `\"timeseries-many\"` \n - `\"timeseries-multi\"` \n - `\"directory-listing\"` \n - `\"table\"` \n - `\"numeric-wide\"` \n - `\"numeric-multi\"` \n - `\"numeric-long\"` \n - `\"log-lines\"` ",
+                "type": "string",
+                "enum": [
+                  "",
+                  "timeseries-wide",
+                  "timeseries-long",
+                  "timeseries-many",
+                  "timeseries-multi",
+                  "directory-listing",
+                  "table",
+                  "numeric-wide",
+                  "numeric-multi",
+                  "numeric-long",
+                  "log-lines"
+                ],
+                "x-enum-description": {}
+              },
+              "typeVersion": {
+                "description": "TypeVersion is the version of the Type property. Versions greater than 0.0 correspond to the dataplane\ncontract documentation https://grafana.github.io/dataplane/contract/.",
+                "type": "array",
+                "maxItems": 2,
+                "minItems": 2,
+                "items": {
+                  "type": "integer"
+                }
+              }
+            },
+            "additionalProperties": false
+          },
+          "scenarioId": {
+            "description": "Possible enum values:\n - `\"annotations\"` \n - `\"arrow\"` \n - `\"csv_content\"` \n - `\"csv_file\"` \n - `\"csv_metric_values\"` \n - `\"datapoints_outside_range\"` \n - `\"exponential_heatmap_bucket_data\"` \n - `\"flame_graph\"` \n - `\"grafana_api\"` \n - `\"linear_heatmap_bucket_data\"` \n - `\"live\"` \n - `\"logs\"` \n - `\"manual_entry\"` \n - `\"no_data_points\"` \n - `\"node_graph\"` \n - `\"predictable_csv_wave\"` \n - `\"predictable_pulse\"` \n - `\"random_walk\"` \n - `\"random_walk_table\"` \n - `\"random_walk_with_error\"` \n - `\"raw_frame\"` \n - `\"server_error_500\"` \n - `\"simulation\"` \n - `\"slow_query\"` \n - `\"streaming_client\"` \n - `\"table_static\"` \n - `\"trace\"` \n - `\"usa\"` \n - `\"variables-query\"` ",
+            "type": "string",
+            "enum": [
+              "annotations",
+              "arrow",
+              "csv_content",
+              "csv_file",
+              "csv_metric_values",
+              "datapoints_outside_range",
+              "exponential_heatmap_bucket_data",
+              "flame_graph",
+              "grafana_api",
+              "linear_heatmap_bucket_data",
+              "live",
+              "logs",
+              "manual_entry",
+              "no_data_points",
+              "node_graph",
+              "predictable_csv_wave",
+              "predictable_pulse",
+              "random_walk",
+              "random_walk_table",
+              "random_walk_with_error",
+              "raw_frame",
+              "server_error_500",
+              "simulation",
+              "slow_query",
+              "streaming_client",
+              "table_static",
+              "trace",
+              "usa",
+              "variables-query"
+            ],
+            "x-enum-description": {}
+          },
+          "seriesCount": {
+            "type": "integer"
+          },
+          "sim": {
+            "type": "object",
+            "required": [
+              "key"
+            ],
+            "properties": {
+              "config": {
+                "type": "object"
+              },
+              "key": {
+                "type": "object",
+                "required": [
+                  "tick",
+                  "type"
+                ],
+                "properties": {
+                  "tick": {
+                    "type": "number"
+                  },
+                  "type": {
+                    "type": "string"
+                  },
+                  "uid": {
+                    "type": "string"
+                  }
+                },
+                "additionalProperties": false
+              },
+              "last": {
+                "type": "boolean"
+              },
+              "stream": {
+                "type": "boolean"
+              }
+            },
+            "additionalProperties": false
+          },
+          "spanCount": {
+            "type": "integer"
+          },
+          "spread": {
+            "type": "number"
+          },
+          "startValue": {
+            "type": "number"
+          },
+          "stream": {
+            "type": "object",
+            "required": [
+              "noise",
+              "speed",
+              "spread",
+              "type"
+            ],
+            "properties": {
+              "bands": {
+                "type": "integer"
+              },
+              "noise": {
+                "type": "number"
+              },
+              "speed": {
+                "type": "number"
+              },
+              "spread": {
+                "type": "number"
+              },
+              "type": {
+                "description": "Possible enum values:\n - `\"fetch\"` \n - `\"logs\"` \n - `\"signal\"` \n - `\"traces\"` ",
+                "type": "string",
+                "enum": [
+                  "fetch",
+                  "logs",
+                  "signal",
+                  "traces"
+                ],
+                "x-enum-description": {}
+              },
+              "url": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          },
+          "stringInput": {
+            "description": "common parameter used by many query types",
+            "type": "string"
+          },
+          "timeRange": {
+            "description": "TimeRange represents the query range\nNOTE: unlike generic /ds/query, we can now send explicit time values in each query\nNOTE: the values for timeRange are not saved in a dashboard, they are constructed on the fly",
+            "type": "object",
+            "required": [
+              "from",
+              "to"
+            ],
+            "properties": {
+              "from": {
+                "description": "From is the start time of the query.",
+                "type": "string",
+                "default": "now-6h",
+                "examples": [
+                  "now-1h"
+                ]
+              },
+              "to": {
+                "description": "To is the end time of the query.",
+                "type": "string",
+                "default": "now",
+                "examples": [
+                  "now"
+                ]
+              }
+            },
+            "additionalProperties": false
+          },
+          "usa": {
+            "type": "object",
+            "properties": {
+              "fields": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              "mode": {
+                "type": "string"
+              },
+              "period": {
+                "type": "string"
+              },
+              "states": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            },
+            "additionalProperties": false
+          },
+          "withNil": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false,
+        "$schema": "https://json-schema.org/draft-04/schema#"
+      }
+    },
+    "type": {
+      "description": "the panel type",
+      "type": "string"
+    }
+  },
+  "additionalProperties": true,
+  "$schema": "https://json-schema.org/draft-04/schema#"
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-testdata-datasource/kinds/query.request.example.json b/pkg/tsdb/grafana-testdata-datasource/kinds/query.request.example.json
new file mode 100644
index 0000000000000..534f9d3473b24
--- /dev/null
+++ b/pkg/tsdb/grafana-testdata-datasource/kinds/query.request.example.json
@@ -0,0 +1,25 @@
+{
+  "from": "now-1h",
+  "to": "now",
+  "queries": [
+    {
+      "refId": "A",
+      "maxDataPoints": 1000,
+      "intervalMs": 5,
+      "scenarioId": "random_walk"
+    },
+    {
+      "refId": "B",
+      "maxDataPoints": 1000,
+      "intervalMs": 5,
+      "pulseWave": {
+        "offCount": 20,
+        "offValue": 1.23,
+        "onCount": 10,
+        "onValue": 4.56,
+        "timeStep": 1000
+      },
+      "scenarioId": "predictable_pulse"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-testdata-datasource/kinds/query.request.schema.json b/pkg/tsdb/grafana-testdata-datasource/kinds/query.request.schema.json
new file mode 100644
index 0000000000000..17a228e32c8a4
--- /dev/null
+++ b/pkg/tsdb/grafana-testdata-datasource/kinds/query.request.schema.json
@@ -0,0 +1,421 @@
+{
+  "type": "object",
+  "required": [
+    "queries"
+  ],
+  "properties": {
+    "$schema": {
+      "description": "helper",
+      "type": "string"
+    },
+    "debug": {
+      "type": "boolean"
+    },
+    "from": {
+      "description": "From Start time in epoch timestamps in milliseconds or relative using Grafana time units.",
+      "type": "string"
+    },
+    "queries": {
+      "type": "array",
+      "items": {
+        "description": "TestDataQuery defines model for TestDataQuery.",
+        "type": "object",
+        "properties": {
+          "alias": {
+            "type": "string"
+          },
+          "channel": {
+            "description": "Used for live query",
+            "type": "string"
+          },
+          "csvContent": {
+            "type": "string"
+          },
+          "csvFileName": {
+            "type": "string"
+          },
+          "csvWave": {
+            "type": "array",
+            "items": {
+              "description": "CSVWave defines model for CSVWave.",
+              "type": "object",
+              "properties": {
+                "labels": {
+                  "type": "string"
+                },
+                "name": {
+                  "type": "string"
+                },
+                "timeStep": {
+                  "type": "integer"
+                },
+                "valuesCSV": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            }
+          },
+          "datasource": {
+            "description": "The datasource",
+            "type": "object",
+            "required": [
+              "type"
+            ],
+            "properties": {
+              "type": {
+                "description": "The datasource plugin type",
+                "type": "string",
+                "pattern": "^grafana-testdata-datasource$|^testdata$"
+              },
+              "uid": {
+                "description": "Datasource UID",
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          },
+          "dropPercent": {
+            "description": "Drop percentage (the chance we will lose a point 0-100)",
+            "type": "number"
+          },
+          "errorType": {
+            "description": "Possible enum values:\n - `\"frontend_exception\"` \n - `\"frontend_observable\"` \n - `\"server_panic\"` ",
+            "type": "string",
+            "enum": [
+              "frontend_exception",
+              "frontend_observable",
+              "server_panic"
+            ],
+            "x-enum-description": {}
+          },
+          "flamegraphDiff": {
+            "type": "boolean"
+          },
+          "hide": {
+            "description": "true if query is disabled (ie should not be returned to the dashboard)\nNOTE: this does not always imply that the query should not be executed since\nthe results from a hidden query may be used as the input to other queries (SSE etc)",
+            "type": "boolean"
+          },
+          "intervalMs": {
+            "description": "Interval is the suggested duration between time points in a time series query.\nNOTE: the values for intervalMs is not saved in the query model.  It is typically calculated\nfrom the interval required to fill a pixels in the visualization",
+            "type": "number"
+          },
+          "labels": {
+            "type": "string"
+          },
+          "levelColumn": {
+            "type": "boolean"
+          },
+          "lines": {
+            "type": "integer"
+          },
+          "max": {
+            "type": "number"
+          },
+          "maxDataPoints": {
+            "description": "MaxDataPoints is the maximum number of data points that should be returned from a time series query.\nNOTE: the values for maxDataPoints is not saved in the query model.  It is typically calculated\nfrom the number of pixels visible in a visualization",
+            "type": "integer"
+          },
+          "min": {
+            "type": "number"
+          },
+          "nodes": {
+            "type": "object",
+            "properties": {
+              "count": {
+                "type": "integer"
+              },
+              "seed": {
+                "type": "integer"
+              },
+              "type": {
+                "description": "Possible enum values:\n - `\"random\"` \n - `\"random edges\"` \n - `\"response_medium\"` \n - `\"response_small\"` \n - `\"feature_showcase\"` ",
+                "type": "string",
+                "enum": [
+                  "random",
+                  "random edges",
+                  "response_medium",
+                  "response_small",
+                  "feature_showcase"
+                ],
+                "x-enum-description": {}
+              }
+            },
+            "additionalProperties": false
+          },
+          "noise": {
+            "type": "number"
+          },
+          "points": {
+            "type": "array",
+            "items": {
+              "type": "array"
+            }
+          },
+          "pulseWave": {
+            "type": "object",
+            "properties": {
+              "offCount": {
+                "type": "integer"
+              },
+              "offValue": {
+                "type": "number"
+              },
+              "onCount": {
+                "type": "integer"
+              },
+              "onValue": {
+                "type": "number"
+              },
+              "timeStep": {
+                "type": "integer"
+              }
+            },
+            "additionalProperties": false
+          },
+          "queryType": {
+            "description": "QueryType is an optional identifier for the type of query.\nIt can be used to distinguish different types of queries.",
+            "type": "string"
+          },
+          "rawFrameContent": {
+            "type": "string"
+          },
+          "refId": {
+            "description": "RefID is the unique identifier of the query, set by the frontend call.",
+            "type": "string"
+          },
+          "resultAssertions": {
+            "description": "Optionally define expected query result behavior",
+            "type": "object",
+            "required": [
+              "typeVersion"
+            ],
+            "properties": {
+              "maxFrames": {
+                "description": "Maximum frame count",
+                "type": "integer"
+              },
+              "type": {
+                "description": "Type asserts that the frame matches a known type structure.\n\n\nPossible enum values:\n - `\"\"` \n - `\"timeseries-wide\"` \n - `\"timeseries-long\"` \n - `\"timeseries-many\"` \n - `\"timeseries-multi\"` \n - `\"directory-listing\"` \n - `\"table\"` \n - `\"numeric-wide\"` \n - `\"numeric-multi\"` \n - `\"numeric-long\"` \n - `\"log-lines\"` ",
+                "type": "string",
+                "enum": [
+                  "",
+                  "timeseries-wide",
+                  "timeseries-long",
+                  "timeseries-many",
+                  "timeseries-multi",
+                  "directory-listing",
+                  "table",
+                  "numeric-wide",
+                  "numeric-multi",
+                  "numeric-long",
+                  "log-lines"
+                ],
+                "x-enum-description": {}
+              },
+              "typeVersion": {
+                "description": "TypeVersion is the version of the Type property. Versions greater than 0.0 correspond to the dataplane\ncontract documentation https://grafana.github.io/dataplane/contract/.",
+                "type": "array",
+                "maxItems": 2,
+                "minItems": 2,
+                "items": {
+                  "type": "integer"
+                }
+              }
+            },
+            "additionalProperties": false
+          },
+          "scenarioId": {
+            "description": "Possible enum values:\n - `\"annotations\"` \n - `\"arrow\"` \n - `\"csv_content\"` \n - `\"csv_file\"` \n - `\"csv_metric_values\"` \n - `\"datapoints_outside_range\"` \n - `\"exponential_heatmap_bucket_data\"` \n - `\"flame_graph\"` \n - `\"grafana_api\"` \n - `\"linear_heatmap_bucket_data\"` \n - `\"live\"` \n - `\"logs\"` \n - `\"manual_entry\"` \n - `\"no_data_points\"` \n - `\"node_graph\"` \n - `\"predictable_csv_wave\"` \n - `\"predictable_pulse\"` \n - `\"random_walk\"` \n - `\"random_walk_table\"` \n - `\"random_walk_with_error\"` \n - `\"raw_frame\"` \n - `\"server_error_500\"` \n - `\"simulation\"` \n - `\"slow_query\"` \n - `\"streaming_client\"` \n - `\"table_static\"` \n - `\"trace\"` \n - `\"usa\"` \n - `\"variables-query\"` ",
+            "type": "string",
+            "enum": [
+              "annotations",
+              "arrow",
+              "csv_content",
+              "csv_file",
+              "csv_metric_values",
+              "datapoints_outside_range",
+              "exponential_heatmap_bucket_data",
+              "flame_graph",
+              "grafana_api",
+              "linear_heatmap_bucket_data",
+              "live",
+              "logs",
+              "manual_entry",
+              "no_data_points",
+              "node_graph",
+              "predictable_csv_wave",
+              "predictable_pulse",
+              "random_walk",
+              "random_walk_table",
+              "random_walk_with_error",
+              "raw_frame",
+              "server_error_500",
+              "simulation",
+              "slow_query",
+              "streaming_client",
+              "table_static",
+              "trace",
+              "usa",
+              "variables-query"
+            ],
+            "x-enum-description": {}
+          },
+          "seriesCount": {
+            "type": "integer"
+          },
+          "sim": {
+            "type": "object",
+            "required": [
+              "key"
+            ],
+            "properties": {
+              "config": {
+                "type": "object"
+              },
+              "key": {
+                "type": "object",
+                "required": [
+                  "tick",
+                  "type"
+                ],
+                "properties": {
+                  "tick": {
+                    "type": "number"
+                  },
+                  "type": {
+                    "type": "string"
+                  },
+                  "uid": {
+                    "type": "string"
+                  }
+                },
+                "additionalProperties": false
+              },
+              "last": {
+                "type": "boolean"
+              },
+              "stream": {
+                "type": "boolean"
+              }
+            },
+            "additionalProperties": false
+          },
+          "spanCount": {
+            "type": "integer"
+          },
+          "spread": {
+            "type": "number"
+          },
+          "startValue": {
+            "type": "number"
+          },
+          "stream": {
+            "type": "object",
+            "required": [
+              "noise",
+              "speed",
+              "spread",
+              "type"
+            ],
+            "properties": {
+              "bands": {
+                "type": "integer"
+              },
+              "noise": {
+                "type": "number"
+              },
+              "speed": {
+                "type": "number"
+              },
+              "spread": {
+                "type": "number"
+              },
+              "type": {
+                "description": "Possible enum values:\n - `\"fetch\"` \n - `\"logs\"` \n - `\"signal\"` \n - `\"traces\"` ",
+                "type": "string",
+                "enum": [
+                  "fetch",
+                  "logs",
+                  "signal",
+                  "traces"
+                ],
+                "x-enum-description": {}
+              },
+              "url": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          },
+          "stringInput": {
+            "description": "common parameter used by many query types",
+            "type": "string"
+          },
+          "timeRange": {
+            "description": "TimeRange represents the query range\nNOTE: unlike generic /ds/query, we can now send explicit time values in each query\nNOTE: the values for timeRange are not saved in a dashboard, they are constructed on the fly",
+            "type": "object",
+            "required": [
+              "from",
+              "to"
+            ],
+            "properties": {
+              "from": {
+                "description": "From is the start time of the query.",
+                "type": "string",
+                "default": "now-6h",
+                "examples": [
+                  "now-1h"
+                ]
+              },
+              "to": {
+                "description": "To is the end time of the query.",
+                "type": "string",
+                "default": "now",
+                "examples": [
+                  "now"
+                ]
+              }
+            },
+            "additionalProperties": false
+          },
+          "usa": {
+            "type": "object",
+            "properties": {
+              "fields": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              "mode": {
+                "type": "string"
+              },
+              "period": {
+                "type": "string"
+              },
+              "states": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            },
+            "additionalProperties": false
+          },
+          "withNil": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false,
+        "$schema": "https://json-schema.org/draft-04/schema#"
+      }
+    },
+    "to": {
+      "description": "To end time in epoch timestamps in milliseconds or relative using Grafana time units.",
+      "type": "string"
+    }
+  },
+  "additionalProperties": false,
+  "$schema": "https://json-schema.org/draft-04/schema#"
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-testdata-datasource/kinds/query.types.json b/pkg/tsdb/grafana-testdata-datasource/kinds/query.types.json
new file mode 100644
index 0000000000000..50b7dca76d1aa
--- /dev/null
+++ b/pkg/tsdb/grafana-testdata-datasource/kinds/query.types.json
@@ -0,0 +1,325 @@
+{
+  "kind": "QueryTypeDefinitionList",
+  "apiVersion": "query.grafana.app/v0alpha1",
+  "metadata": {
+    "resourceVersion": "1709261615323"
+  },
+  "items": [
+    {
+      "metadata": {
+        "name": "default",
+        "resourceVersion": "1711119846950",
+        "creationTimestamp": "2024-03-01T02:53:35Z"
+      },
+      "spec": {
+        "schema": {
+          "$schema": "https://json-schema.org/draft-04/schema",
+          "additionalProperties": false,
+          "description": "TestDataQuery defines model for TestDataQuery.",
+          "properties": {
+            "alias": {
+              "type": "string"
+            },
+            "channel": {
+              "description": "Used for live query",
+              "type": "string"
+            },
+            "csvContent": {
+              "type": "string"
+            },
+            "csvFileName": {
+              "type": "string"
+            },
+            "csvWave": {
+              "items": {
+                "additionalProperties": false,
+                "description": "CSVWave defines model for CSVWave.",
+                "properties": {
+                  "labels": {
+                    "type": "string"
+                  },
+                  "name": {
+                    "type": "string"
+                  },
+                  "timeStep": {
+                    "type": "integer"
+                  },
+                  "valuesCSV": {
+                    "type": "string"
+                  }
+                },
+                "type": "object"
+              },
+              "type": "array"
+            },
+            "dropPercent": {
+              "description": "Drop percentage (the chance we will lose a point 0-100)",
+              "type": "number"
+            },
+            "errorType": {
+              "description": "Possible enum values:\n - `\"frontend_exception\"` \n - `\"frontend_observable\"` \n - `\"server_panic\"` ",
+              "enum": [
+                "frontend_exception",
+                "frontend_observable",
+                "server_panic"
+              ],
+              "type": "string",
+              "x-enum-description": {}
+            },
+            "flamegraphDiff": {
+              "type": "boolean"
+            },
+            "labels": {
+              "type": "string"
+            },
+            "levelColumn": {
+              "type": "boolean"
+            },
+            "lines": {
+              "type": "integer"
+            },
+            "max": {
+              "type": "number"
+            },
+            "min": {
+              "type": "number"
+            },
+            "nodes": {
+              "additionalProperties": false,
+              "properties": {
+                "count": {
+                  "type": "integer"
+                },
+                "seed": {
+                  "type": "integer"
+                },
+                "type": {
+                  "description": "Possible enum values:\n - `\"random\"` \n - `\"random edges\"` \n - `\"response_medium\"` \n - `\"response_small\"` \n - `\"feature_showcase\"` ",
+                  "enum": [
+                    "random",
+                    "random edges",
+                    "response_medium",
+                    "response_small",
+                    "feature_showcase"
+                  ],
+                  "type": "string",
+                  "x-enum-description": {}
+                }
+              },
+              "type": "object"
+            },
+            "noise": {
+              "type": "number"
+            },
+            "points": {
+              "items": {
+                "type": "array"
+              },
+              "type": "array"
+            },
+            "pulseWave": {
+              "additionalProperties": false,
+              "properties": {
+                "offCount": {
+                  "type": "integer"
+                },
+                "offValue": {
+                  "type": "number"
+                },
+                "onCount": {
+                  "type": "integer"
+                },
+                "onValue": {
+                  "type": "number"
+                },
+                "timeStep": {
+                  "type": "integer"
+                }
+              },
+              "type": "object"
+            },
+            "rawFrameContent": {
+              "type": "string"
+            },
+            "scenarioId": {
+              "description": "Possible enum values:\n - `\"annotations\"` \n - `\"arrow\"` \n - `\"csv_content\"` \n - `\"csv_file\"` \n - `\"csv_metric_values\"` \n - `\"datapoints_outside_range\"` \n - `\"exponential_heatmap_bucket_data\"` \n - `\"flame_graph\"` \n - `\"grafana_api\"` \n - `\"linear_heatmap_bucket_data\"` \n - `\"live\"` \n - `\"logs\"` \n - `\"manual_entry\"` \n - `\"no_data_points\"` \n - `\"node_graph\"` \n - `\"predictable_csv_wave\"` \n - `\"predictable_pulse\"` \n - `\"random_walk\"` \n - `\"random_walk_table\"` \n - `\"random_walk_with_error\"` \n - `\"raw_frame\"` \n - `\"server_error_500\"` \n - `\"simulation\"` \n - `\"slow_query\"` \n - `\"streaming_client\"` \n - `\"table_static\"` \n - `\"trace\"` \n - `\"usa\"` \n - `\"variables-query\"` ",
+              "enum": [
+                "annotations",
+                "arrow",
+                "csv_content",
+                "csv_file",
+                "csv_metric_values",
+                "datapoints_outside_range",
+                "exponential_heatmap_bucket_data",
+                "flame_graph",
+                "grafana_api",
+                "linear_heatmap_bucket_data",
+                "live",
+                "logs",
+                "manual_entry",
+                "no_data_points",
+                "node_graph",
+                "predictable_csv_wave",
+                "predictable_pulse",
+                "random_walk",
+                "random_walk_table",
+                "random_walk_with_error",
+                "raw_frame",
+                "server_error_500",
+                "simulation",
+                "slow_query",
+                "streaming_client",
+                "table_static",
+                "trace",
+                "usa",
+                "variables-query"
+              ],
+              "type": "string",
+              "x-enum-description": {}
+            },
+            "seriesCount": {
+              "type": "integer"
+            },
+            "sim": {
+              "additionalProperties": false,
+              "properties": {
+                "config": {
+                  "type": "object"
+                },
+                "key": {
+                  "additionalProperties": false,
+                  "properties": {
+                    "tick": {
+                      "type": "number"
+                    },
+                    "type": {
+                      "type": "string"
+                    },
+                    "uid": {
+                      "type": "string"
+                    }
+                  },
+                  "required": [
+                    "tick",
+                    "type"
+                  ],
+                  "type": "object"
+                },
+                "last": {
+                  "type": "boolean"
+                },
+                "stream": {
+                  "type": "boolean"
+                }
+              },
+              "required": [
+                "key"
+              ],
+              "type": "object"
+            },
+            "spanCount": {
+              "type": "integer"
+            },
+            "spread": {
+              "type": "number"
+            },
+            "startValue": {
+              "type": "number"
+            },
+            "stream": {
+              "additionalProperties": false,
+              "properties": {
+                "bands": {
+                  "type": "integer"
+                },
+                "noise": {
+                  "type": "number"
+                },
+                "speed": {
+                  "type": "number"
+                },
+                "spread": {
+                  "type": "number"
+                },
+                "type": {
+                  "description": "Possible enum values:\n - `\"fetch\"` \n - `\"logs\"` \n - `\"signal\"` \n - `\"traces\"` ",
+                  "enum": [
+                    "fetch",
+                    "logs",
+                    "signal",
+                    "traces"
+                  ],
+                  "type": "string",
+                  "x-enum-description": {}
+                },
+                "url": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "noise",
+                "speed",
+                "spread",
+                "type"
+              ],
+              "type": "object"
+            },
+            "stringInput": {
+              "description": "common parameter used by many query types",
+              "type": "string"
+            },
+            "usa": {
+              "additionalProperties": false,
+              "properties": {
+                "fields": {
+                  "items": {
+                    "type": "string"
+                  },
+                  "type": "array"
+                },
+                "mode": {
+                  "type": "string"
+                },
+                "period": {
+                  "type": "string"
+                },
+                "states": {
+                  "items": {
+                    "type": "string"
+                  },
+                  "type": "array"
+                }
+              },
+              "type": "object"
+            },
+            "withNil": {
+              "type": "boolean"
+            }
+          },
+          "type": "object"
+        },
+        "examples": [
+          {
+            "name": "simple random walk",
+            "saveModel": {
+              "scenarioId": "random_walk"
+            }
+          },
+          {
+            "name": "pulse wave example",
+            "saveModel": {
+              "pulseWave": {
+                "offCount": 20,
+                "offValue": 1.23,
+                "onCount": 10,
+                "onValue": 4.56,
+                "timeStep": 1000
+              },
+              "scenarioId": "predictable_pulse"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/grafana-testdata-datasource/kinds/query_test.go b/pkg/tsdb/grafana-testdata-datasource/kinds/query_test.go
new file mode 100644
index 0000000000000..584d4876748f0
--- /dev/null
+++ b/pkg/tsdb/grafana-testdata-datasource/kinds/query_test.go
@@ -0,0 +1,62 @@
+package kinds
+
+import (
+	"reflect"
+	"testing"
+
+	data "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+	"github.com/grafana/grafana-plugin-sdk-go/experimental/schemabuilder"
+	"github.com/stretchr/testify/require"
+)
+
+func TestQueryTypeDefinitions(t *testing.T) {
+	builder, err := schemabuilder.NewSchemaBuilder(
+		schemabuilder.BuilderOptions{
+			PluginID: []string{"grafana-testdata-datasource", "testdata"},
+			ScanCode: []schemabuilder.CodePaths{{
+				BasePackage: "github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource/kinds",
+				CodePath:    "./",
+			}},
+			Enums: []reflect.Type{
+				reflect.TypeOf(NodesQueryTypeRandom),         // pick an example value (not the root)
+				reflect.TypeOf(StreamingQueryTypeFetch),      // pick an example value (not the root)
+				reflect.TypeOf(ErrorTypeServerPanic),         // pick an example value (not the root)
+				reflect.TypeOf(TestDataQueryTypeAnnotations), // pick an example value (not the root)
+			},
+		})
+	require.NoError(t, err)
+	err = builder.AddQueries(
+		schemabuilder.QueryTypeInfo{
+			Name:   "default",
+			GoType: reflect.TypeOf(&TestDataQuery{}),
+			Examples: []data.QueryExample{
+				{
+					Name: "simple random walk",
+					SaveModel: data.AsUnstructured(
+						TestDataQuery{
+							ScenarioId: TestDataQueryTypeRandomWalk,
+						},
+					),
+				},
+				{
+					Name: "pulse wave example",
+					SaveModel: data.AsUnstructured(
+						TestDataQuery{
+							ScenarioId: TestDataQueryTypePredictablePulse,
+							PulseWave: &PulseWaveQuery{
+								TimeStep: int64(1000),
+								OnCount:  10,
+								OffCount: 20,
+								OffValue: 1.23, // should be any (rather json any)
+								OnValue:  4.56, // should be any
+							},
+						},
+					),
+				},
+			},
+		},
+	)
+
+	require.NoError(t, err)
+	builder.UpdateQueryDefinition(t, "./")
+}
diff --git a/pkg/tsdb/grafana-testdata-datasource/resource_handler.go b/pkg/tsdb/grafana-testdata-datasource/resource_handler.go
index 616baf785077a..3c02b18379205 100644
--- a/pkg/tsdb/grafana-testdata-datasource/resource_handler.go
+++ b/pkg/tsdb/grafana-testdata-datasource/resource_handler.go
@@ -10,6 +10,8 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
+
+	"github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource/kinds"
 )
 
 func (s *Service) registerRoutes() *http.ServeMux {
@@ -46,12 +48,12 @@ func (s *Service) getScenariosHandler(rw http.ResponseWriter, req *http.Request)
 
 	scenarioIds := make([]string, 0)
 	for id := range s.scenarios {
-		scenarioIds = append(scenarioIds, id)
+		scenarioIds = append(scenarioIds, string(id))
 	}
 	sort.Strings(scenarioIds)
 
 	for _, scenarioID := range scenarioIds {
-		scenario := s.scenarios[scenarioID]
+		scenario := s.scenarios[kinds.TestDataQueryType(scenarioID)]
 		result = append(result, map[string]any{
 			"id":          scenario.ID,
 			"name":        scenario.Name,
diff --git a/pkg/tsdb/grafana-testdata-datasource/scenarios.go b/pkg/tsdb/grafana-testdata-datasource/scenarios.go
index a187aac0f6eb5..9114c3dc76513 100644
--- a/pkg/tsdb/grafana-testdata-datasource/scenarios.go
+++ b/pkg/tsdb/grafana-testdata-datasource/scenarios.go
@@ -17,42 +17,13 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
-)
 
-const (
-	randomWalkQuery                   queryType = "random_walk"
-	randomWalkSlowQuery               queryType = "slow_query"
-	randomWalkWithErrorQuery          queryType = "random_walk_with_error"
-	randomWalkTableQuery              queryType = "random_walk_table"
-	exponentialHeatmapBucketDataQuery queryType = "exponential_heatmap_bucket_data"
-	linearHeatmapBucketDataQuery      queryType = "linear_heatmap_bucket_data"
-	noDataPointsQuery                 queryType = "no_data_points"
-	datapointsOutsideRangeQuery       queryType = "datapoints_outside_range"
-	csvMetricValuesQuery              queryType = "csv_metric_values"
-	predictablePulseQuery             queryType = "predictable_pulse"
-	predictableCSVWaveQuery           queryType = "predictable_csv_wave"
-	streamingClientQuery              queryType = "streaming_client"
-	simulation                        queryType = "simulation"
-	usaQueryKey                       queryType = "usa"
-	liveQuery                         queryType = "live"
-	grafanaAPIQuery                   queryType = "grafana_api"
-	arrowQuery                        queryType = "arrow"
-	annotationsQuery                  queryType = "annotations"
-	tableStaticQuery                  queryType = "table_static"
-	serverError500Query               queryType = "server_error_500"
-	logsQuery                         queryType = "logs"
-	nodeGraphQuery                    queryType = "node_graph"
-	flameGraphQuery                   queryType = "flame_graph"
-	rawFrameQuery                     queryType = "raw_frame"
-	csvFileQueryType                  queryType = "csv_file"
-	csvContentQueryType               queryType = "csv_content"
-	traceType                         queryType = "trace"
+	"github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource/kinds"
 )
 
-type queryType string
-
 type Scenario struct {
-	ID          string `json:"id"`
+	ID kinds.TestDataQueryType `json:"id"`
+
 	Name        string `json:"name"`
 	StringInput string `json:"stringInput"`
 	Description string `json:"description"`
@@ -61,25 +32,25 @@ type Scenario struct {
 
 func (s *Service) registerScenarios() {
 	s.registerScenario(&Scenario{
-		ID:      string(exponentialHeatmapBucketDataQuery),
+		ID:      kinds.TestDataQueryTypeExponentialHeatmapBucketData,
 		Name:    "Exponential heatmap bucket data",
 		handler: s.handleExponentialHeatmapBucketDataScenario,
 	})
 
 	s.registerScenario(&Scenario{
-		ID:      string(linearHeatmapBucketDataQuery),
+		ID:      kinds.TestDataQueryTypeLinearHeatmapBucketData,
 		Name:    "Linear heatmap bucket data",
 		handler: s.handleLinearHeatmapBucketDataScenario,
 	})
 
 	s.registerScenario(&Scenario{
-		ID:      string(randomWalkQuery),
+		ID:      kinds.TestDataQueryTypeRandomWalk,
 		Name:    "Random Walk",
 		handler: s.handleRandomWalkScenario,
 	})
 
 	s.registerScenario(&Scenario{
-		ID:      string(predictablePulseQuery),
+		ID:      kinds.TestDataQueryTypePredictablePulse,
 		Name:    "Predictable Pulse",
 		handler: s.handlePredictablePulseScenario,
 		Description: `Predictable Pulse returns a pulse wave where there is a datapoint every timeStepSeconds.
@@ -89,100 +60,100 @@ Timestamps will line up evenly on timeStepSeconds (For example, 60 seconds means
 	})
 
 	s.registerScenario(&Scenario{
-		ID:      string(predictableCSVWaveQuery),
+		ID:      kinds.TestDataQueryTypePredictableCsvWave,
 		Name:    "Predictable CSV Wave",
 		handler: s.handlePredictableCSVWaveScenario,
 	})
 
 	s.registerScenario(&Scenario{
-		ID:      string(randomWalkTableQuery),
+		ID:      kinds.TestDataQueryTypeRandomWalkTable,
 		Name:    "Random Walk Table",
 		handler: s.handleRandomWalkTableScenario,
 	})
 
 	s.registerScenario(&Scenario{
-		ID:          string(randomWalkSlowQuery),
+		ID:          kinds.TestDataQueryTypeSlowQuery,
 		Name:        "Slow Query",
 		StringInput: "5s",
 		handler:     s.handleRandomWalkSlowScenario,
 	})
 
 	s.registerScenario(&Scenario{
-		ID:      string(noDataPointsQuery),
+		ID:      kinds.TestDataQueryTypeNoDataPoints,
 		Name:    "No Data Points",
 		handler: s.handleClientSideScenario,
 	})
 
 	s.registerScenario(&Scenario{
-		ID:      string(datapointsOutsideRangeQuery),
+		ID:      kinds.TestDataQueryTypeDatapointsOutsideRange,
 		Name:    "Datapoints Outside Range",
 		handler: s.handleDatapointsOutsideRangeScenario,
 	})
 
 	s.registerScenario(&Scenario{
-		ID:          string(csvMetricValuesQuery),
+		ID:          kinds.TestDataQueryTypeCsvMetricValues,
 		Name:        "CSV Metric Values",
 		StringInput: "1,20,90,30,5,0",
 		handler:     s.handleCSVMetricValuesScenario,
 	})
 
 	s.registerScenario(&Scenario{
-		ID:      string(streamingClientQuery),
+		ID:      kinds.TestDataQueryTypeStreamingClient,
 		Name:    "Streaming Client",
 		handler: s.handleClientSideScenario,
 	})
 
 	s.registerScenario(&Scenario{
-		ID:      string(liveQuery),
+		ID:      kinds.TestDataQueryTypeLive,
 		Name:    "Grafana Live",
 		handler: s.handleClientSideScenario,
 	})
 
 	s.registerScenario(&Scenario{
-		ID:      string(simulation),
+		ID:      kinds.TestDataQueryTypeSimulation,
 		Name:    "Simulation",
 		handler: s.sims.QueryData,
 	})
 
 	s.registerScenario(&Scenario{
-		ID:      string(usaQueryKey),
+		ID:      kinds.TestDataQueryTypeUsa,
 		Name:    "USA generated data",
 		handler: s.handleUSAScenario,
 	})
 
 	s.registerScenario(&Scenario{
-		ID:      string(grafanaAPIQuery),
+		ID:      kinds.TestDataQueryTypeGrafanaApi,
 		Name:    "Grafana API",
 		handler: s.handleClientSideScenario,
 	})
 
 	s.registerScenario(&Scenario{
-		ID:      string(arrowQuery),
+		ID:      kinds.TestDataQueryTypeArrow,
 		Name:    "Load Apache Arrow Data",
 		handler: s.handleArrowScenario,
 	})
 
 	s.registerScenario(&Scenario{
-		ID:      string(annotationsQuery),
+		ID:      kinds.TestDataQueryTypeAnnotations,
 		Name:    "Annotations",
 		handler: s.handleClientSideScenario,
 	})
 
 	s.registerScenario(&Scenario{
-		ID:      string(tableStaticQuery),
+		ID:      kinds.TestDataQueryTypeTableStatic,
 		Name:    "Table Static",
 		handler: s.handleTableStaticScenario,
 	})
 
 	s.registerScenario(&Scenario{
-		ID:      string(randomWalkWithErrorQuery),
+		ID:      kinds.TestDataQueryTypeRandomWalkWithError,
 		Name:    "Random Walk (with error)",
 		handler: s.handleRandomWalkWithErrorScenario,
 	})
 
 	s.registerScenario(&Scenario{
 		// Is no longer strictly a _server_ error scenario, but ID is kept for legacy :)
-		ID:          string(serverError500Query),
+		ID:          kinds.TestDataQueryTypeServerError500,
 		Name:        "Conditional Error",
 		handler:     s.handleServerError500Scenario,
 		StringInput: "1,20,90,30,5,0",
@@ -190,40 +161,40 @@ Timestamps will line up evenly on timeStepSeconds (For example, 60 seconds means
 	})
 
 	s.registerScenario(&Scenario{
-		ID:      string(logsQuery),
+		ID:      kinds.TestDataQueryTypeLogs,
 		Name:    "Logs",
 		handler: s.handleLogsScenario,
 	})
 
 	s.registerScenario(&Scenario{
-		ID:   string(nodeGraphQuery),
+		ID:   kinds.TestDataQueryTypeNodeGraph,
 		Name: "Node Graph",
 	})
 
 	s.registerScenario(&Scenario{
-		ID:   string(flameGraphQuery),
+		ID:   kinds.TestDataQueryTypeFlameGraph,
 		Name: "Flame Graph",
 	})
 
 	s.registerScenario(&Scenario{
-		ID:   string(rawFrameQuery),
+		ID:   kinds.TestDataQueryTypeRawFrame,
 		Name: "Raw Frames",
 	})
 
 	s.registerScenario(&Scenario{
-		ID:      string(csvFileQueryType),
+		ID:      kinds.TestDataQueryTypeCsvFile,
 		Name:    "CSV File",
 		handler: s.handleCsvFileScenario,
 	})
 
 	s.registerScenario(&Scenario{
-		ID:      string(csvContentQueryType),
+		ID:      kinds.TestDataQueryTypeCsvContent,
 		Name:    "CSV Content",
 		handler: s.handleCsvContentScenario,
 	})
 
 	s.registerScenario(&Scenario{
-		ID:   string(traceType),
+		ID:   kinds.TestDataQueryTypeTrace,
 		Name: "Trace",
 	})
 
@@ -232,14 +203,14 @@ Timestamps will line up evenly on timeStepSeconds (For example, 60 seconds means
 
 func (s *Service) registerScenario(scenario *Scenario) {
 	s.scenarios[scenario.ID] = scenario
-	s.queryMux.HandleFunc(scenario.ID, instrumentScenarioHandler(s.logger, scenario.ID, scenario.handler))
+	s.queryMux.HandleFunc(string(scenario.ID), instrumentScenarioHandler(s.logger, scenario.ID, scenario.handler))
 }
 
-func instrumentScenarioHandler(logger log.Logger, scenario string, fn backend.QueryDataHandlerFunc) backend.QueryDataHandlerFunc {
+func instrumentScenarioHandler(logger log.Logger, scenario kinds.TestDataQueryType, fn backend.QueryDataHandlerFunc) backend.QueryDataHandlerFunc {
 	return backend.QueryDataHandlerFunc(func(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
 		ctx, span := tracing.DefaultTracer().Start(ctx, "testdatasource.queryData",
 			trace.WithAttributes(
-				attribute.String("scenario", scenario),
+				attribute.String("scenario", string(scenario)),
 			))
 		defer span.End()
 
@@ -250,52 +221,18 @@ func instrumentScenarioHandler(logger log.Logger, scenario string, fn backend.Qu
 	})
 }
 
-type JSONModel struct {
-	ScenarioID         string    `json:"scenarioId"`
-	SeriesCount        int       `json:"seriesCount"`
-	StringInput        string    `json:"stringInput"`
-	Lines              int64     `json:"lines"`
-	IncludeLevelColumn bool      `json:"includeLevelColumn"`
-	StartValue         float64   `json:"startValue"`
-	Spread             float64   `json:"spread"`
-	Noise              float64   `json:"noise"`
-	Drop               float64   `json:"drop"`
-	Min                *float64  `json:"min,omitempty"`
-	Max                *float64  `json:"max,omitempty"`
-	Labels             string    `json:"labels"`
-	WithNil            bool      `json:"withNil"`
-	PulseWave          pulseWave `json:"pulseWave"`
-	Alias              string    `json:"alias"`
-	// Cannot specify a type for csvWave since legacy queries
-	// does not follow the same format as the new ones (and there is no migration).
-	CSVWave     any     `json:"csvWave"`
-	CSVContent  string  `json:"csvContent"`
-	CSVFileName string  `json:"csvFileName"`
-	DropPercent float64 `json:"dropPercent"`
-}
-
-type pulseWave struct {
-	TimeStep int64 `json:"timeStep"`
-	OnCount  int64 `json:"onCount"`
-	OffCount int64 `json:"offCount"`
-	OnValue  any   `json:"onValue"`
-	OffValue any   `json:"offValue"`
-}
-
-func GetJSONModel(j json.RawMessage) (JSONModel, error) {
-	model := JSONModel{
+func GetJSONModel(j json.RawMessage) (kinds.TestDataQuery, error) {
+	model := kinds.TestDataQuery{
 		// Default values
-		ScenarioID:  string(randomWalkQuery),
+		ScenarioId:  kinds.TestDataQueryTypeRandomWalk,
 		SeriesCount: 1,
 		Lines:       10,
 		StartValue:  rand.Float64() * 100,
 		Spread:      1,
 	}
 	if len(j) > 0 {
-		err := json.Unmarshal(j, &model)
-		if err != nil {
-			return JSONModel{}, err
-		}
+		// csvWave has saved values that are single values, not arrays
+		_ = json.Unmarshal(j, &model)
 	}
 	return model, nil
 }
@@ -303,7 +240,7 @@ func GetJSONModel(j json.RawMessage) (JSONModel, error) {
 // handleFallbackScenario handles the scenario where queryType is not set and fallbacks to scenarioId.
 func (s *Service) handleFallbackScenario(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
 	ctxLogger := s.logger.FromContext(ctx)
-	scenarioQueries := map[string][]backend.DataQuery{}
+	scenarioQueries := map[kinds.TestDataQueryType][]backend.DataQuery{}
 
 	for _, q := range req.Queries {
 		model, err := GetJSONModel(q.JSON)
@@ -312,7 +249,7 @@ func (s *Service) handleFallbackScenario(ctx context.Context, req *backend.Query
 			continue
 		}
 
-		scenarioID := model.ScenarioID
+		scenarioID := model.ScenarioId
 		if _, exist := s.scenarios[scenarioID]; exist {
 			if _, ok := scenarioQueries[scenarioID]; !ok {
 				scenarioQueries[scenarioID] = []backend.DataQuery{}
@@ -654,7 +591,7 @@ func (s *Service) handleLogsScenario(ctx context.Context, req *backend.QueryData
 		}
 
 		lines := model.Lines
-		includeLevelColumn := model.IncludeLevelColumn
+		includeLevelColumn := model.LevelColumn
 
 		logLevelGenerator := newRandomStringProvider([]string{
 			"emerg",
@@ -726,14 +663,14 @@ func (s *Service) handleLogsScenario(ctx context.Context, req *backend.QueryData
 	return resp, nil
 }
 
-func RandomWalk(query backend.DataQuery, model JSONModel, index int) *data.Frame {
+func RandomWalk(query backend.DataQuery, model kinds.TestDataQuery, index int) *data.Frame {
 	rand := rand.New(rand.NewSource(time.Now().UnixNano() + int64(index)))
 	timeWalkerMs := query.TimeRange.From.UnixNano() / int64(time.Millisecond)
 	to := query.TimeRange.To.UnixNano() / int64(time.Millisecond)
 	startValue := model.StartValue
 	spread := model.Spread
 	noise := model.Noise
-	drop := model.Drop / 100.0 // value is 0-100
+	drop := model.DropPercent / 100.0 // value is 0-100
 
 	min := float64(0)
 	hasMin := false
@@ -795,7 +732,7 @@ func RandomWalk(query backend.DataQuery, model JSONModel, index int) *data.Frame
 	return frame
 }
 
-func randomWalkTable(query backend.DataQuery, model JSONModel) *data.Frame {
+func randomWalkTable(query backend.DataQuery, model kinds.TestDataQuery) *data.Frame {
 	rand := rand.New(rand.NewSource(time.Now().UnixNano()))
 	timeWalkerMs := query.TimeRange.From.UnixNano() / int64(time.Millisecond)
 	to := query.TimeRange.To.UnixNano() / int64(time.Millisecond)
@@ -868,23 +805,8 @@ func randomWalkTable(query backend.DataQuery, model JSONModel) *data.Frame {
 	return frame
 }
 
-type pCSVOptions struct {
-	TimeStep  int64  `json:"timeStep"`
-	ValuesCSV string `json:"valuesCSV"`
-	Labels    string `json:"labels"`
-	Name      string `json:"name"`
-}
-
-func predictableCSVWave(query backend.DataQuery, model JSONModel) ([]*data.Frame, error) {
-	queries := []pCSVOptions{}
-	input, err := json.Marshal(model.CSVWave)
-	if err != nil {
-		return nil, err
-	}
-	err = json.Unmarshal(input, &queries)
-	if err != nil {
-		return nil, err
-	}
+func predictableCSVWave(query backend.DataQuery, model kinds.TestDataQuery) ([]*data.Frame, error) {
+	queries := model.CsvWave
 
 	frames := make([]*data.Frame, 0, len(queries))
 
@@ -972,7 +894,7 @@ func predictableSeries(timeRange backend.TimeRange, timeStep, length int64, getV
 	}, nil
 }
 
-func predictablePulse(query backend.DataQuery, model JSONModel) (*data.Frame, error) {
+func predictablePulse(query backend.DataQuery, model kinds.TestDataQuery) (*data.Frame, error) {
 	// Process Input
 	var timeStep int64
 	var onCount int64
@@ -1042,7 +964,7 @@ func randomHeatmapData(query backend.DataQuery, fnBucketGen func(index int) floa
 	return frame
 }
 
-func doArrowQuery(query backend.DataQuery, model JSONModel) (*data.Frame, error) {
+func doArrowQuery(query backend.DataQuery, model kinds.TestDataQuery) (*data.Frame, error) {
 	encoded := model.StringInput
 	if encoded == "" {
 		return nil, nil
@@ -1054,7 +976,7 @@ func doArrowQuery(query backend.DataQuery, model JSONModel) (*data.Frame, error)
 	return data.UnmarshalArrowFrame(arrow)
 }
 
-func newSeriesForQuery(query backend.DataQuery, model JSONModel, index int) *data.Frame {
+func newSeriesForQuery(query backend.DataQuery, model kinds.TestDataQuery, index int) *data.Frame {
 	alias := model.Alias
 	suffix := ""
 
@@ -1082,7 +1004,7 @@ func newSeriesForQuery(query backend.DataQuery, model JSONModel, index int) *dat
  *
  * '{job="foo", instance="bar"} => {job: "foo", instance: "bar"}`
  */
-func parseLabels(model JSONModel, seriesIndex int) data.Labels {
+func parseLabels(model kinds.TestDataQuery, seriesIndex int) data.Labels {
 	return parseLabelsString(model.Labels, seriesIndex)
 }
 
@@ -1110,7 +1032,7 @@ func parseLabelsString(labelText string, seriesIndex int) data.Labels {
 	return tags
 }
 
-func frameNameForQuery(query backend.DataQuery, model JSONModel, index int) string {
+func frameNameForQuery(query backend.DataQuery, model kinds.TestDataQuery, index int) string {
 	name := model.Alias
 	suffix := ""
 
diff --git a/pkg/tsdb/grafana-testdata-datasource/scenarios_test.go b/pkg/tsdb/grafana-testdata-datasource/scenarios_test.go
index cf66d1f061ddf..42ca0645cd500 100644
--- a/pkg/tsdb/grafana-testdata-datasource/scenarios_test.go
+++ b/pkg/tsdb/grafana-testdata-datasource/scenarios_test.go
@@ -11,6 +11,8 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource/kinds"
 )
 
 func TestTestdataScenarios(t *testing.T) {
@@ -184,32 +186,32 @@ func TestParseLabels(t *testing.T) {
 
 	tests := []struct {
 		name     string
-		model    JSONModel
+		model    kinds.TestDataQuery
 		expected data.Labels
 	}{
 		{
 			name:     "wrapped in {} and quoted value ",
-			model:    JSONModel{Labels: `{job="foo", instance="bar"}`},
+			model:    kinds.TestDataQuery{Labels: `{job="foo", instance="bar"}`},
 			expected: expectedTags,
 		},
 		{
 			name:     "comma-separated non-quoted",
-			model:    JSONModel{Labels: `job=foo, instance=bar`},
+			model:    kinds.TestDataQuery{Labels: `job=foo, instance=bar`},
 			expected: expectedTags,
 		},
 		{
 			name:     "comma-separated quoted",
-			model:    JSONModel{Labels: `job="foo"", instance="bar"`},
+			model:    kinds.TestDataQuery{Labels: `job="foo"", instance="bar"`},
 			expected: expectedTags,
 		},
 		{
 			name:     "comma-separated with spaces, non quoted",
-			model:    JSONModel{Labels: `job = foo,instance = bar`},
+			model:    kinds.TestDataQuery{Labels: `job = foo,instance = bar`},
 			expected: expectedTags,
 		},
 		{
 			name:  "expands $seriesIndex",
-			model: JSONModel{Labels: `job=series-$seriesIndex,instance=bar`},
+			model: kinds.TestDataQuery{Labels: `job=series-$seriesIndex,instance=bar`},
 			expected: data.Labels{
 				"job":      fmt.Sprintf("series-%d", seriesIndex),
 				"instance": "bar",
diff --git a/pkg/tsdb/grafana-testdata-datasource/testdata.go b/pkg/tsdb/grafana-testdata-datasource/testdata.go
index 8c994491358bb..d4d4a409799db 100644
--- a/pkg/tsdb/grafana-testdata-datasource/testdata.go
+++ b/pkg/tsdb/grafana-testdata-datasource/testdata.go
@@ -9,13 +9,18 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/resource/httpadapter"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
+
+	"github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource/kinds"
 	"github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource/sims"
 )
 
+// ensures that testdata implements all client functions
+// var _ plugins.Client = &Service{}
+
 func ProvideService() *Service {
 	s := &Service{
 		queryMux:  datasource.NewQueryTypeMux(),
-		scenarios: map[string]*Scenario{},
+		scenarios: map[kinds.TestDataQueryType]*Scenario{},
 		frame: data.NewFrame("testdata",
 			data.NewField("Time", nil, make([]time.Time, 1)),
 			data.NewField("Value", nil, make([]float64, 1)),
@@ -44,7 +49,7 @@ func ProvideService() *Service {
 
 type Service struct {
 	logger          log.Logger
-	scenarios       map[string]*Scenario
+	scenarios       map[kinds.TestDataQueryType]*Scenario
 	frame           *data.Frame
 	labelFrame      *data.Frame
 	queryMux        *datasource.QueryTypeMux
@@ -66,3 +71,8 @@ func (s *Service) CheckHealth(_ context.Context, _ *backend.CheckHealthRequest)
 		Message: "Data source is working",
 	}, nil
 }
+
+// CollectMetricsHandler handles metric collection.
+func (s *Service) CollectMetrics(ctx context.Context, req *backend.CollectMetricsRequest) (*backend.CollectMetricsResult, error) {
+	return nil, nil
+}
diff --git a/pkg/tsdb/grafanads/grafana.go b/pkg/tsdb/grafanads/grafana.go
index f35a7cfb96a78..e3eb5c7f8bd17 100644
--- a/pkg/tsdb/grafanads/grafana.go
+++ b/pkg/tsdb/grafanads/grafana.go
@@ -124,7 +124,8 @@ func (s *Service) doListQuery(ctx context.Context, query backend.DataQuery) back
 	}
 
 	path := store.RootPublicStatic + "/" + q.Path
-	listFrame, err := s.store.List(ctx, nil, path)
+	maxFiles := int(query.MaxDataPoints)
+	listFrame, err := s.store.List(ctx, nil, path, maxFiles)
 	response.Error = err
 	if listFrame != nil {
 		response.Frames = data.Frames{listFrame.Frame}
diff --git a/pkg/tsdb/influxdb/flux/executor_test.go b/pkg/tsdb/influxdb/flux/executor_test.go
index 42dfd17275cf6..4e72c5dde7cdc 100644
--- a/pkg/tsdb/influxdb/flux/executor_test.go
+++ b/pkg/tsdb/influxdb/flux/executor_test.go
@@ -24,9 +24,9 @@ import (
 	"github.com/grafana/grafana/pkg/util"
 )
 
-//--------------------------------------------------------------
+// --------------------------------------------------------------
 // TestData -- reads result from saved files
-//--------------------------------------------------------------
+// --------------------------------------------------------------
 
 // MockRunner reads local file path for testdata.
 type MockRunner struct {
@@ -220,7 +220,8 @@ func TestRealQuery(t *testing.T) {
 		json.Set("organization", "test-org")
 
 		dsInfo := &models.DatasourceInfo{
-			URL: "http://localhost:9999", // NOTE! no api/v2
+			URL:     "http://localhost:9999", // NOTE! no api/v2
+			Timeout: 30 * time.Second,
 		}
 
 		runner, err := runnerFromDataSource(dsInfo)
diff --git a/pkg/tsdb/influxdb/flux/flux.go b/pkg/tsdb/influxdb/flux/flux.go
index 4f9fc25f78642..18d2a6f725a30 100644
--- a/pkg/tsdb/influxdb/flux/flux.go
+++ b/pkg/tsdb/influxdb/flux/flux.go
@@ -17,8 +17,7 @@ var (
 )
 
 // Query builds flux queries, executes them, and returns the results.
-func Query(ctx context.Context, dsInfo *models.DatasourceInfo, tsdbQuery backend.QueryDataRequest) (
-	*backend.QueryDataResponse, error) {
+func Query(ctx context.Context, dsInfo *models.DatasourceInfo, tsdbQuery backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
 	logger := glog.FromContext(ctx)
 	tRes := backend.NewQueryDataResponse()
 	logger.Debug("Received a query", "query", tsdbQuery)
@@ -76,6 +75,7 @@ func runnerFromDataSource(dsInfo *models.DatasourceInfo) (*runner, error) {
 	}
 	opts := influxdb2.DefaultOptions()
 	opts.HTTPOptions().SetHTTPClient(dsInfo.HTTPClient)
+	opts.SetHTTPRequestTimeout(uint(dsInfo.Timeout.Seconds()))
 	return &runner{
 		client: influxdb2.NewClientWithOptions(url, dsInfo.Token, opts),
 		org:    org,
diff --git a/pkg/tsdb/influxdb/flux/macros.go b/pkg/tsdb/influxdb/flux/macros.go
index ed3a34d2d20cc..4dce9d76822d0 100644
--- a/pkg/tsdb/influxdb/flux/macros.go
+++ b/pkg/tsdb/influxdb/flux/macros.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/grafana/grafana/pkg/tsdb/intervalv2"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
 )
 
 // $__interval_ms is the exact value in milliseconds
@@ -15,7 +15,7 @@ import (
 
 func interpolateInterval(flux string, interval time.Duration) string {
 	intervalMs := int64(interval / time.Millisecond)
-	intervalText := intervalv2.FormatDuration(interval)
+	intervalText := gtime.FormatInterval(interval)
 
 	flux = strings.ReplaceAll(flux, "$__interval_ms", strconv.FormatInt(intervalMs, 10))
 	flux = strings.ReplaceAll(flux, "$__interval", intervalText)
diff --git a/pkg/tsdb/influxdb/fsql/arrow.go b/pkg/tsdb/influxdb/fsql/arrow.go
index 576f08b798571..965e17f83572a 100644
--- a/pkg/tsdb/influxdb/fsql/arrow.go
+++ b/pkg/tsdb/influxdb/fsql/arrow.go
@@ -8,9 +8,9 @@ import (
 	"runtime/debug"
 	"time"
 
-	"github.com/apache/arrow/go/v13/arrow"
-	"github.com/apache/arrow/go/v13/arrow/array"
-	"github.com/apache/arrow/go/v13/arrow/scalar"
+	"github.com/apache/arrow/go/v15/arrow"
+	"github.com/apache/arrow/go/v15/arrow/array"
+	"github.com/apache/arrow/go/v15/arrow/scalar"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana-plugin-sdk-go/data/sqlutil"
diff --git a/pkg/tsdb/influxdb/fsql/arrow_test.go b/pkg/tsdb/influxdb/fsql/arrow_test.go
index d6b0121523e5b..fa8844acf1d9c 100644
--- a/pkg/tsdb/influxdb/fsql/arrow_test.go
+++ b/pkg/tsdb/influxdb/fsql/arrow_test.go
@@ -7,9 +7,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/apache/arrow/go/v13/arrow"
-	"github.com/apache/arrow/go/v13/arrow/array"
-	"github.com/apache/arrow/go/v13/arrow/memory"
+	"github.com/apache/arrow/go/v15/arrow"
+	"github.com/apache/arrow/go/v15/arrow/array"
+	"github.com/apache/arrow/go/v15/arrow/memory"
 	"github.com/google/go-cmp/cmp"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana-plugin-sdk-go/data/sqlutil"
diff --git a/pkg/tsdb/influxdb/fsql/client.go b/pkg/tsdb/influxdb/fsql/client.go
index ce094769b6602..56f31f5da6e1b 100644
--- a/pkg/tsdb/influxdb/fsql/client.go
+++ b/pkg/tsdb/influxdb/fsql/client.go
@@ -6,10 +6,10 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/apache/arrow/go/v13/arrow/flight"
-	"github.com/apache/arrow/go/v13/arrow/flight/flightsql"
-	"github.com/apache/arrow/go/v13/arrow/ipc"
-	"github.com/apache/arrow/go/v13/arrow/memory"
+	"github.com/apache/arrow/go/v15/arrow/flight"
+	"github.com/apache/arrow/go/v15/arrow/flight/flightsql"
+	"github.com/apache/arrow/go/v15/arrow/ipc"
+	"github.com/apache/arrow/go/v15/arrow/memory"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/credentials/insecure"
diff --git a/pkg/tsdb/influxdb/fsql/flightsql_test.go b/pkg/tsdb/influxdb/fsql/flightsql_test.go
deleted file mode 100644
index ebf51068fe007..0000000000000
--- a/pkg/tsdb/influxdb/fsql/flightsql_test.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package fsql
-
-import (
-	"context"
-	"database/sql"
-	"encoding/json"
-	"testing"
-
-	"github.com/apache/arrow/go/v13/arrow/flight"
-	"github.com/apache/arrow/go/v13/arrow/flight/flightsql"
-	"github.com/apache/arrow/go/v13/arrow/flight/flightsql/example"
-	"github.com/apache/arrow/go/v13/arrow/memory"
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/tsdb/influxdb/models"
-)
-
-func TestIntegration_QueryData(t *testing.T) {
-	db, err := example.CreateDB()
-	require.NoError(t, err)
-	defer func(db *sql.DB) {
-		err := db.Close()
-		assert.NoError(t, err)
-	}(db)
-
-	sqliteServer, err := example.NewSQLiteFlightSQLServer(db)
-	require.NoError(t, err)
-	sqliteServer.Alloc = memory.NewCheckedAllocator(memory.DefaultAllocator)
-	server := flight.NewServerWithMiddleware(nil)
-	server.RegisterFlightService(flightsql.NewFlightServer(sqliteServer))
-	err = server.Init("localhost:12345")
-	require.NoError(t, err)
-	go func() {
-		err := server.Serve()
-		assert.NoError(t, err)
-	}()
-	defer server.Shutdown()
-
-	resp, err := Query(
-		context.Background(),
-		&models.DatasourceInfo{
-			HTTPClient: nil,
-			Token:      "secret",
-			URL:        "http://localhost:12345",
-			DbName:     "influxdb",
-			Version:    "test",
-			HTTPMode:   "proxy",
-			Metadata: []map[string]string{
-				{
-					"bucket": "bucket",
-				},
-			},
-			SecureGrpc: false,
-		},
-		backend.QueryDataRequest{
-			Queries: []backend.DataQuery{
-				{
-					RefID: "A",
-					JSON:  mustQueryJSON(t, "A", "select * from intTable"),
-				},
-				{
-					RefID: "B",
-					JSON:  mustQueryJSON(t, "B", "select 1"),
-				},
-			},
-		},
-	)
-	require.NoError(t, err)
-	require.Len(t, resp.Responses, 2)
-
-	respA := resp.Responses["A"]
-	require.NoError(t, respA.Error)
-	frame := respA.Frames[0]
-
-	require.Equal(t, "id", frame.Fields[0].Name)
-	require.Equal(t, "keyName", frame.Fields[1].Name)
-	require.Equal(t, "value", frame.Fields[2].Name)
-	require.Equal(t, "foreignId", frame.Fields[3].Name)
-	for _, f := range frame.Fields {
-		assert.Equal(t, 4, f.Len())
-	}
-}
-
-func mustQueryJSON(t *testing.T, refID, sql string) []byte {
-	t.Helper()
-
-	b, err := json.Marshal(queryRequest{
-		RefID:    refID,
-		RawQuery: sql,
-		Format:   "table",
-	})
-	if err != nil {
-		panic(err)
-	}
-	return b
-}
diff --git a/pkg/tsdb/influxdb/fsql/fsql.go b/pkg/tsdb/influxdb/fsql/fsql.go
index b0c6dfd73176a..52ed6614d04e6 100644
--- a/pkg/tsdb/influxdb/fsql/fsql.go
+++ b/pkg/tsdb/influxdb/fsql/fsql.go
@@ -3,9 +3,7 @@ package fsql
 import (
 	"context"
 	"fmt"
-	"net"
 	"net/url"
-	"strings"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"google.golang.org/grpc/metadata"
@@ -94,29 +92,20 @@ func runnerFromDataSource(dsInfo *models.DatasourceInfo) (*runner, error) {
 		return nil, fmt.Errorf("bad URL : %s", err)
 	}
 
-	host, port, err := net.SplitHostPort(u.Host)
-	if err != nil {
-		return nil, fmt.Errorf("bad URL : %s", err)
+	addr := u.Host
+	if u.Port() == "" {
+		addr += ":443"
 	}
-	addr := strings.Join([]string{host, port}, ":")
 
 	md := metadata.MD{}
-	for _, m := range dsInfo.Metadata {
-		for k, v := range m {
-			if _, ok := md[k]; ok {
-				return nil, fmt.Errorf("metadata: duplicate key: %s", k)
-			}
-			if k != "" {
-				md.Set(k, v)
-			}
-		}
+	if dsInfo.DbName != "" {
+		md.Set("database", dsInfo.DbName)
 	}
-
 	if dsInfo.Token != "" {
 		md.Set("Authorization", fmt.Sprintf("Bearer %s", dsInfo.Token))
 	}
 
-	fsqlClient, err := newFlightSQLClient(addr, md, dsInfo.SecureGrpc)
+	fsqlClient, err := newFlightSQLClient(addr, md, !dsInfo.InsecureGrpc)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/tsdb/influxdb/fsql/fsql_test.go b/pkg/tsdb/influxdb/fsql/fsql_test.go
new file mode 100644
index 0000000000000..b2eb94f5b0d0d
--- /dev/null
+++ b/pkg/tsdb/influxdb/fsql/fsql_test.go
@@ -0,0 +1,111 @@
+package fsql
+
+import (
+	"context"
+	"database/sql"
+	"encoding/json"
+	"testing"
+
+	"github.com/apache/arrow/go/v15/arrow/flight"
+	"github.com/apache/arrow/go/v15/arrow/flight/flightsql"
+	"github.com/apache/arrow/go/v15/arrow/flight/flightsql/example"
+	"github.com/apache/arrow/go/v15/arrow/memory"
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/stretchr/testify/require"
+	"github.com/stretchr/testify/suite"
+
+	"github.com/grafana/grafana/pkg/tsdb/influxdb/models"
+)
+
+type FSQLTestSuite struct {
+	suite.Suite
+	db     *sql.DB
+	server flight.Server
+}
+
+func (suite *FSQLTestSuite) SetupTest() {
+	db, err := example.CreateDB()
+	require.NoError(suite.T(), err)
+
+	sqliteServer, err := example.NewSQLiteFlightSQLServer(db)
+	require.NoError(suite.T(), err)
+	sqliteServer.Alloc = memory.NewCheckedAllocator(memory.DefaultAllocator)
+	server := flight.NewServerWithMiddleware(nil)
+	server.RegisterFlightService(flightsql.NewFlightServer(sqliteServer))
+	err = server.Init("localhost:12345")
+	require.NoError(suite.T(), err)
+	go func() {
+		err := server.Serve()
+		require.NoError(suite.T(), err)
+	}()
+	suite.db = db
+	suite.server = server
+}
+
+func (suite *FSQLTestSuite) AfterTest(suiteName, testName string) {
+	err := suite.db.Close()
+	require.NoError(suite.T(), err)
+	suite.server.Shutdown()
+}
+
+func TestFSQLTestSuite(t *testing.T) {
+	suite.Run(t, new(FSQLTestSuite))
+}
+
+func (suite *FSQLTestSuite) TestIntegration_QueryData() {
+	suite.Run("should run simple query data", func() {
+		resp, err := Query(
+			context.Background(),
+			&models.DatasourceInfo{
+				HTTPClient:   nil,
+				Token:        "secret",
+				URL:          "http://localhost:12345",
+				DbName:       "influxdb",
+				Version:      "test",
+				HTTPMode:     "proxy",
+				InsecureGrpc: true,
+			},
+			backend.QueryDataRequest{
+				Queries: []backend.DataQuery{
+					{
+						RefID: "A",
+						JSON:  mustQueryJSON(suite.T(), "A", "select * from intTable"),
+					},
+					{
+						RefID: "B",
+						JSON:  mustQueryJSON(suite.T(), "B", "select 1"),
+					},
+				},
+			},
+		)
+
+		require.NoError(suite.T(), err)
+		require.Len(suite.T(), resp.Responses, 2)
+
+		respA := resp.Responses["A"]
+		require.NoError(suite.T(), respA.Error)
+		frame := respA.Frames[0]
+
+		require.Equal(suite.T(), "id", frame.Fields[0].Name)
+		require.Equal(suite.T(), "keyName", frame.Fields[1].Name)
+		require.Equal(suite.T(), "value", frame.Fields[2].Name)
+		require.Equal(suite.T(), "foreignId", frame.Fields[3].Name)
+		for _, f := range frame.Fields {
+			require.Equal(suite.T(), 4, f.Len())
+		}
+	})
+}
+
+func mustQueryJSON(t *testing.T, refID, sql string) []byte {
+	t.Helper()
+
+	b, err := json.Marshal(queryRequest{
+		RefID:    refID,
+		RawQuery: sql,
+		Format:   "table",
+	})
+	if err != nil {
+		panic(err)
+	}
+	return b
+}
diff --git a/pkg/tsdb/influxdb/healthcheck.go b/pkg/tsdb/influxdb/healthcheck.go
index 6cbe7f3694ebb..b1080bf6f784d 100644
--- a/pkg/tsdb/influxdb/healthcheck.go
+++ b/pkg/tsdb/influxdb/healthcheck.go
@@ -7,8 +7,10 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
 
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/tsdb/influxdb/flux"
 	"github.com/grafana/grafana/pkg/tsdb/influxdb/fsql"
 	"github.com/grafana/grafana/pkg/tsdb/influxdb/influxql"
@@ -35,7 +37,7 @@ func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthReque
 	case influxVersionFlux:
 		return CheckFluxHealth(ctx, dsInfo, req)
 	case influxVersionInfluxQL:
-		return CheckInfluxQLHealth(ctx, dsInfo)
+		return CheckInfluxQLHealth(ctx, dsInfo, req, s.features)
 	case influxVersionSQL:
 		return CheckSQLHealth(ctx, dsInfo, req)
 	default:
@@ -78,10 +80,12 @@ func CheckFluxHealth(ctx context.Context, dsInfo *models.DatasourceInfo,
 	return getHealthCheckMessage(logger, "", errors.New("error getting flux query buckets"))
 }
 
-func CheckInfluxQLHealth(ctx context.Context, dsInfo *models.DatasourceInfo) (*backend.CheckHealthResult, error) {
+func CheckInfluxQLHealth(ctx context.Context, dsInfo *models.DatasourceInfo, req *backend.CheckHealthRequest, features featuremgmt.FeatureToggles) (*backend.CheckHealthResult, error) {
 	logger := logger.FromContext(ctx)
-
-	resp, err := influxql.Query(ctx, dsInfo, &backend.QueryDataRequest{
+	tracer := tracing.DefaultTracer()
+	resp, err := influxql.Query(ctx, tracer, dsInfo, &backend.QueryDataRequest{
+		PluginContext: req.PluginContext,
+		Headers:       req.Headers,
 		Queries: []backend.DataQuery{
 			{
 				RefID:     refID,
@@ -89,7 +93,7 @@ func CheckInfluxQLHealth(ctx context.Context, dsInfo *models.DatasourceInfo) (*b
 				JSON:      []byte(`{"query": "SHOW measurements", "rawQuery": true}`),
 			},
 		},
-	})
+	}, features)
 	if err != nil {
 		return getHealthCheckMessage(logger, "error performing influxQL query", err)
 	}
diff --git a/pkg/tsdb/influxdb/influxdb.go b/pkg/tsdb/influxdb/influxdb.go
index 9a03d5ddc8a84..48a376e5db7e2 100644
--- a/pkg/tsdb/influxdb/influxdb.go
+++ b/pkg/tsdb/influxdb/influxdb.go
@@ -8,7 +8,9 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
 
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/tsdb/influxdb/flux"
 	"github.com/grafana/grafana/pkg/tsdb/influxdb/fsql"
 
@@ -21,12 +23,14 @@ import (
 var logger log.Logger = log.New("tsdb.influxdb")
 
 type Service struct {
-	im instancemgmt.InstanceManager
+	im       instancemgmt.InstanceManager
+	features featuremgmt.FeatureToggles
 }
 
-func ProvideService(httpClient httpclient.Provider) *Service {
+func ProvideService(httpClient httpclient.Provider, features featuremgmt.FeatureToggles) *Service {
 	return &Service{
-		im: datasource.NewInstanceManager(newInstanceSettings(httpClient)),
+		im:       datasource.NewInstanceManager(newInstanceSettings(httpClient)),
+		features: features,
 	}
 }
 
@@ -77,10 +81,10 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst
 			TimeInterval:  jsonData.TimeInterval,
 			DefaultBucket: jsonData.DefaultBucket,
 			Organization:  jsonData.Organization,
-			Metadata:      jsonData.Metadata,
 			MaxSeries:     maxSeries,
-			SecureGrpc:    true,
+			InsecureGrpc:  jsonData.InsecureGrpc,
 			Token:         settings.DecryptedSecureJSONData["token"],
+			Timeout:       opts.Timeouts.Timeout,
 		}
 		return model, nil
 	}
@@ -90,6 +94,8 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest)
 	logger := logger.FromContext(ctx)
 	logger.Debug("Received a query request", "numQueries", len(req.Queries))
 
+	tracer := tracing.DefaultTracer()
+
 	dsInfo, err := s.getDSInfo(ctx, req.PluginContext)
 	if err != nil {
 		return nil, err
@@ -101,7 +107,7 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest)
 	case influxVersionFlux:
 		return flux.Query(ctx, dsInfo, *req)
 	case influxVersionInfluxQL:
-		return influxql.Query(ctx, dsInfo, req)
+		return influxql.Query(ctx, tracer, dsInfo, req, s.features)
 	case influxVersionSQL:
 		return fsql.Query(ctx, dsInfo, *req)
 	default:
diff --git a/pkg/tsdb/influxdb/influxql/buffered/response_parser.go b/pkg/tsdb/influxdb/influxql/buffered/response_parser.go
new file mode 100644
index 0000000000000..0d45632987917
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/buffered/response_parser.go
@@ -0,0 +1,356 @@
+package buffered
+
+import (
+	"encoding/json"
+	"fmt"
+	"io"
+	"strings"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+
+	"github.com/grafana/grafana/pkg/tsdb/influxdb/influxql/util"
+	"github.com/grafana/grafana/pkg/tsdb/influxdb/models"
+)
+
+func ResponseParse(buf io.ReadCloser, statusCode int, query *models.Query) *backend.DataResponse {
+	return parse(buf, statusCode, query)
+}
+
+// parse is the same as Parse, but without the io.ReadCloser (we don't need to
+// close the buffer)
+func parse(buf io.Reader, statusCode int, query *models.Query) *backend.DataResponse {
+	response, jsonErr := parseJSON(buf)
+
+	if statusCode/100 != 2 {
+		return &backend.DataResponse{Error: fmt.Errorf("InfluxDB returned error: %s", response.Error)}
+	}
+
+	if jsonErr != nil {
+		return &backend.DataResponse{Error: jsonErr}
+	}
+
+	if response.Error != "" {
+		return &backend.DataResponse{Error: fmt.Errorf(response.Error)}
+	}
+
+	result := response.Results[0]
+	if result.Error != "" {
+		return &backend.DataResponse{Error: fmt.Errorf(result.Error)}
+	}
+
+	if query.ResultFormat == "table" {
+		return &backend.DataResponse{Frames: transformRowsForTable(result.Series, *query)}
+	}
+
+	return &backend.DataResponse{Frames: transformRowsForTimeSeries(result.Series, *query)}
+}
+
+func parseJSON(buf io.Reader) (models.Response, error) {
+	var response models.Response
+
+	dec := json.NewDecoder(buf)
+	dec.UseNumber()
+
+	err := dec.Decode(&response)
+
+	return response, err
+}
+
+func transformRowsForTable(rows []models.Row, query models.Query) data.Frames {
+	if len(rows) == 0 {
+		return make([]*data.Frame, 0)
+	}
+
+	frames := make([]*data.Frame, 0, 1)
+
+	newFrame := data.NewFrame(rows[0].Name)
+	newFrame.Meta = &data.FrameMeta{
+		ExecutedQueryString:    query.RawQuery,
+		PreferredVisualization: util.GetVisType(query.ResultFormat),
+	}
+
+	conLen := len(rows[0].Columns)
+	if rows[0].Columns[0] == "time" {
+		newFrame.Fields = append(newFrame.Fields, newTimeField(rows))
+	} else {
+		newFrame.Fields = append(newFrame.Fields, newValueFields(rows, nil, 0, 1)...)
+	}
+
+	newFrame.Fields = append(newFrame.Fields, newTagField(rows, nil)...)
+	newFrame.Fields = append(newFrame.Fields, newValueFields(rows, nil, 1, conLen)...)
+
+	frames = append(frames, newFrame)
+	return frames
+}
+
+func newTimeField(rows []models.Row) *data.Field {
+	var timeArray []time.Time
+	for _, row := range rows {
+		for _, valuePair := range row.Values {
+			timestamp, timestampErr := util.ParseTimestamp(valuePair[0])
+			// we only add this row if the timestamp is valid
+			if timestampErr != nil {
+				continue
+			}
+
+			timeArray = append(timeArray, timestamp)
+		}
+	}
+
+	timeField := data.NewField("Time", nil, timeArray)
+	return timeField
+}
+
+func newTagField(rows []models.Row, labels data.Labels) []*data.Field {
+	fields := make([]*data.Field, 0, len(rows[0].Tags))
+
+	for key := range rows[0].Tags {
+		tagField := data.NewField(key, labels, []*string{})
+		for _, row := range rows {
+			for range row.Values {
+				value := row.Tags[key]
+				tagField.Append(&value)
+			}
+		}
+		tagField.SetConfig(&data.FieldConfig{DisplayNameFromDS: key})
+		fields = append(fields, tagField)
+	}
+
+	return fields
+}
+
+func newValueFields(rows []models.Row, labels data.Labels, colIdxStart, colIdxEnd int) []*data.Field {
+	fields := make([]*data.Field, 0)
+
+	for colIdx := colIdxStart; colIdx < colIdxEnd; colIdx++ {
+		var valueField *data.Field
+		var floatArray []*float64
+		var stringArray []*string
+		var boolArray []*bool
+
+		for _, row := range rows {
+			valType := util.Typeof(row.Values, colIdx)
+
+			for _, valuePair := range row.Values {
+				switch valType {
+				case "string":
+					value, ok := valuePair[colIdx].(string)
+					if ok {
+						// we handle null values by adding nil to floatArray
+						// if then we see the valueField should be a sting field
+						// we append those nil elements into the stringArray
+						// then we clear the floatArray
+						// these steps are necessary for the responses like in string_column_with_null_value.json
+						for range floatArray {
+							stringArray = append(stringArray, nil)
+						}
+						floatArray = nil
+						stringArray = append(stringArray, &value)
+					} else {
+						stringArray = append(stringArray, nil)
+					}
+				case "json.Number":
+					value := util.ParseNumber(valuePair[colIdx])
+					floatArray = append(floatArray, value)
+				case "bool":
+					value, ok := valuePair[colIdx].(bool)
+					if ok {
+						// we handle null values by adding nil to floatArray
+						// if then we see the valueField should be a bool field
+						// we append those nil elements into the boolArray
+						// then we clear the floatArray
+						for range floatArray {
+							boolArray = append(boolArray, nil)
+						}
+						floatArray = nil
+						boolArray = append(boolArray, &value)
+					} else {
+						boolArray = append(boolArray, nil)
+					}
+				case "null":
+					// If there is already a valueField, instead of adding nil to floatArray
+					// we add nil to the valueField and to the array of valueField constructed from
+					if valueField != nil {
+						valueFieldType := valueField.Type()
+						switch valueFieldType {
+						case data.FieldTypeNullableString:
+							stringArray = append(stringArray, nil)
+						case data.FieldTypeNullableBool:
+							boolArray = append(boolArray, nil)
+						default:
+							floatArray = append(floatArray, nil)
+						}
+						valueField.Append(nil)
+					} else {
+						// If there is no valueField created before we add the nil value to floatArray
+						// when we have the real value of the field these will be appended to the field
+						floatArray = append(floatArray, nil)
+					}
+				}
+			}
+
+			switch valType {
+			case "string":
+				valueField = data.NewField(row.Columns[colIdx], labels, stringArray)
+			case "json.Number":
+				valueField = data.NewField(row.Columns[colIdx], labels, floatArray)
+			case "bool":
+				valueField = data.NewField(row.Columns[colIdx], labels, boolArray)
+			case "null":
+				if valueField == nil {
+					valueField = data.NewField(row.Columns[colIdx], labels, floatArray)
+				}
+			}
+
+			valueField.SetConfig(&data.FieldConfig{DisplayNameFromDS: row.Columns[colIdx]})
+		}
+		fields = append(fields, valueField)
+	}
+
+	return fields
+}
+
+func transformRowsForTimeSeries(rows []models.Row, query models.Query) data.Frames {
+	// pre-allocate frames - this can save many allocations
+	cols := 0
+	for _, row := range rows {
+		cols += len(row.Columns)
+	}
+
+	if len(rows) == 0 {
+		return make([]*data.Frame, 0)
+	}
+
+	// Preallocate for the worst-case scenario
+	frames := make([]*data.Frame, 0, len(rows)*len(rows[0].Columns))
+
+	// frameName is pre-allocated. So we can reuse it, saving memory.
+	// It's sized for a reasonably-large name, but will grow if needed.
+	frameName := make([]byte, 0, 128)
+
+	for _, row := range rows {
+		var hasTimeCol = false
+
+		for _, column := range row.Columns {
+			if strings.ToLower(column) == "time" {
+				hasTimeCol = true
+			}
+		}
+
+		if !hasTimeCol {
+			newFrame := newFrameWithoutTimeField(row, query)
+			if len(frames) == 0 {
+				newFrame.Meta = &data.FrameMeta{
+					ExecutedQueryString:    query.RawQuery,
+					PreferredVisualization: util.GetVisType(query.ResultFormat),
+				}
+			}
+			frames = append(frames, newFrame)
+		} else {
+			for colIndex, column := range row.Columns {
+				if column == "time" {
+					continue
+				}
+				newFrame := newFrameWithTimeField(row, column, colIndex, query, frameName)
+				if len(frames) == 0 {
+					newFrame.Meta = &data.FrameMeta{
+						ExecutedQueryString:    query.RawQuery,
+						PreferredVisualization: util.GetVisType(query.ResultFormat),
+					}
+				}
+				frames = append(frames, newFrame)
+			}
+		}
+	}
+
+	return frames
+}
+
+func newFrameWithTimeField(row models.Row, column string, colIndex int, query models.Query, frameName []byte) *data.Frame {
+	var timeArray []time.Time
+	var floatArray []*float64
+	var stringArray []*string
+	var boolArray []*bool
+	valType := util.Typeof(row.Values, colIndex)
+
+	for _, valuePair := range row.Values {
+		timestamp, timestampErr := util.ParseTimestamp(valuePair[0])
+		// we only add this row if the timestamp is valid
+		if timestampErr != nil {
+			continue
+		}
+
+		timeArray = append(timeArray, timestamp)
+		switch valType {
+		case "string":
+			value, ok := valuePair[colIndex].(string)
+			if ok {
+				stringArray = append(stringArray, &value)
+			} else {
+				stringArray = append(stringArray, nil)
+			}
+		case "json.Number":
+			value := util.ParseNumber(valuePair[colIndex])
+			floatArray = append(floatArray, value)
+		case "bool":
+			value, ok := valuePair[colIndex].(bool)
+			if ok {
+				boolArray = append(boolArray, &value)
+			} else {
+				boolArray = append(boolArray, nil)
+			}
+		case "null":
+			floatArray = append(floatArray, nil)
+		}
+	}
+
+	timeField := data.NewField("Time", nil, timeArray)
+
+	var valueField *data.Field
+
+	switch valType {
+	case "string":
+		valueField = data.NewField("Value", row.Tags, stringArray)
+	case "json.Number":
+		valueField = data.NewField("Value", row.Tags, floatArray)
+	case "bool":
+		valueField = data.NewField("Value", row.Tags, boolArray)
+	case "null":
+		valueField = data.NewField("Value", row.Tags, floatArray)
+	}
+
+	name := string(util.FormatFrameName(row.Name, column, row.Tags, query, frameName[:]))
+	valueField.SetConfig(&data.FieldConfig{DisplayNameFromDS: name})
+	return data.NewFrame(name, timeField, valueField)
+}
+
+func newFrameWithoutTimeField(row models.Row, query models.Query) *data.Frame {
+	var values []*string
+
+	for _, valuePair := range row.Values {
+		if strings.Contains(strings.ToLower(query.RawQuery), strings.ToLower("CARDINALITY")) {
+			values = append(values, util.ParseString(valuePair[0]))
+		} else {
+			if strings.Contains(strings.ToLower(query.RawQuery), strings.ToLower("SHOW TAG VALUES")) {
+				if len(valuePair) >= 2 {
+					values = append(values, util.ParseString(valuePair[1]))
+				}
+			} else if strings.Contains(strings.ToLower(query.RawQuery), strings.ToLower("SHOW DIAGNOSTICS")) {
+				// https://docs.influxdata.com/platform/monitoring/influxdata-platform/tools/show-diagnostics/
+				for _, vp := range valuePair {
+					values = append(values, util.ParseString(vp))
+				}
+			} else {
+				if len(valuePair) >= 1 {
+					values = append(values, util.ParseString(valuePair[0]))
+				}
+			}
+		}
+	}
+
+	field := data.NewField("Value", nil, values)
+	frame := data.NewFrame(row.Name, field)
+	return frame
+}
diff --git a/pkg/tsdb/influxdb/influxql/buffered/response_parser_test.go b/pkg/tsdb/influxdb/influxql/buffered/response_parser_test.go
new file mode 100644
index 0000000000000..890d25a41252c
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/buffered/response_parser_test.go
@@ -0,0 +1,395 @@
+package buffered
+
+import (
+	"encoding/json"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/grafana/grafana-plugin-sdk-go/experimental"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/tsdb/influxdb/influxql/util"
+	"github.com/grafana/grafana/pkg/tsdb/influxdb/models"
+)
+
+const (
+	shouldUpdate = false
+	testPath     = "../testdata"
+)
+
+func readJsonFile(filePath string) io.ReadCloser {
+	bytes, err := os.ReadFile(filepath.Join(testPath, filepath.Clean(filePath)+".json"))
+	if err != nil {
+		panic(fmt.Sprintf("cannot read the file: %s", filePath))
+	}
+
+	return io.NopCloser(strings.NewReader(string(bytes)))
+}
+
+func generateQuery(query, resFormat, alias string) *models.Query {
+	return &models.Query{
+		RawQuery:     query,
+		UseRawQuery:  true,
+		Alias:        alias,
+		ResultFormat: resFormat,
+	}
+}
+
+// show_diagnostics file won't be added to test files because of its inconsistent
+// json data with other responses. But I do add it here just to have it.
+// It can be parsed with time_series response but not table.
+// It only works with InfluxDB v1.x. The usage of it is quite limited.
+var testFiles = []string{
+	"all_values_are_null",
+	"influx_select_all_from_cpu",
+	"one_measurement_with_two_columns",
+	"response_with_weird_tag",
+	"some_values_are_null",
+	"simple_response",
+	"multiple_series_with_tags_and_multiple_columns",
+	"multiple_series_with_tags",
+	"empty_response",
+	"metric_find_queries",
+	"show_tag_values_response",
+	"retention_policy",
+	"simple_response_with_diverse_data_types",
+	"multiple_measurements",
+	"string_column_with_null_value",
+	"string_column_with_null_value2",
+	"many_columns",
+	"response_with_nil_bools_and_nil_strings",
+	"invalid_value_format",
+}
+
+func TestReadInfluxAsTimeSeries(t *testing.T) {
+	for _, f := range testFiles {
+		t.Run(f, runScenario(f, "time_series"))
+	}
+}
+
+func TestReadInfluxAsTable(t *testing.T) {
+	for _, f := range testFiles {
+		t.Run(f, runScenario(f, "table"))
+	}
+}
+
+func runScenario(tf string, resultFormat string) func(t *testing.T) {
+	return func(t *testing.T) {
+		f := readJsonFile(tf)
+
+		query := generateQuery("Test raw query", resultFormat, "")
+
+		runQuery(t, f, tf, resultFormat, query)
+	}
+}
+
+func runQuery(t *testing.T, f io.ReadCloser, tf string, rf string, query *models.Query) {
+	rsp := ResponseParse(f, 200, query)
+
+	if strings.Contains(tf, "error") {
+		require.Error(t, rsp.Error)
+		return
+	}
+	require.NoError(t, rsp.Error)
+
+	fname := tf + "." + rf + ".golden"
+	experimental.CheckGoldenJSONResponse(t, testPath, fname, rsp, shouldUpdate)
+}
+
+func TestParsingAsTimeSeriesWithoutTimeColumn(t *testing.T) {
+	t.Run("cardinality", func(t *testing.T) {
+		f := readJsonFile("cardinality")
+
+		query := generateQuery(`SHOW TAG VALUES CARDINALITY with key = "host"`, "time_series", "")
+
+		runQuery(t, f, "cardinality", "time_series", query)
+	})
+}
+
+func TestInfluxdbResponseParser(t *testing.T) {
+	t.Run("Influxdb response parser should handle invalid JSON", func(t *testing.T) {
+		result := ResponseParse(
+			io.NopCloser(strings.NewReader(`{ invalid }`)),
+			200,
+			generateQuery("Test raw query", "time_series", ""),
+		)
+
+		require.Nil(t, result.Frames)
+		require.Error(t, result.Error)
+	})
+
+	t.Run("Influxdb response parser with alias", func(t *testing.T) {
+		labels, err := data.LabelsFromString("/cluster/name/=Cluster/, @cluster@name@=Cluster@, cluster-name=Cluster, datacenter=America, dc.region.name=Northeast")
+		require.Nil(t, err)
+		newField := data.NewField("Value", labels, []*float64{
+			util.ToPtr(222.0),
+		})
+		newField.Config = &data.FieldConfig{DisplayNameFromDS: "series alias"}
+		testFrame := data.NewFrame("series alias",
+			data.NewField("Time", nil,
+				[]time.Time{
+					time.Date(1970, 1, 1, 0, 0, 0, 111000000, time.UTC),
+				}),
+			newField,
+		)
+		testFrame.Meta = &data.FrameMeta{PreferredVisualization: util.GraphVisType, ExecutedQueryString: "Test raw query"}
+		testFrameWithoutMeta := data.NewFrame("series alias",
+			data.NewField("Time", nil,
+				[]time.Time{
+					time.Date(1970, 1, 1, 0, 0, 0, 111000000, time.UTC),
+				}),
+			newField,
+		)
+
+		t.Run("should parse aliases", func(t *testing.T) {
+			result := ResponseParse(readJsonFile("response"), 200, generateQuery("Test raw query", "time_sereies", "alias $m $measurement"))
+
+			name := "alias cpu.upc cpu.upc"
+			testFrame.Name = name
+			testFrame.Fields[1].Config.DisplayNameFromDS = name
+			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
+				t.Errorf("Result mismatch (-want +got):\n%s", diff)
+			}
+
+			query := generateQuery("Test raw query", "time_series", "alias $col")
+			query.Measurement = "10m"
+			result = ResponseParse(readJsonFile("response"), 200, query)
+			name = "alias mean"
+			testFrame.Name = name
+			testFrame.Fields[1].Config.DisplayNameFromDS = name
+			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
+				t.Errorf("Result mismatch (-want +got):\n%s", diff)
+			}
+			name = "alias sum"
+			testFrameWithoutMeta.Name = name
+			newField = data.NewField("Value", labels, []*float64{
+				util.ToPtr(333.0),
+			})
+			testFrameWithoutMeta.Fields[1] = newField
+			testFrameWithoutMeta.Fields[1].Config = &data.FieldConfig{DisplayNameFromDS: name}
+			testFrameWithoutMeta.Meta = nil
+			if diff := cmp.Diff(testFrameWithoutMeta, result.Frames[1], data.FrameTestCompareOptions()...); diff != "" {
+				t.Errorf("Result mismatch (-want +got):\n%s", diff)
+			}
+
+			result = ResponseParse(readJsonFile("response"), 200, generateQuery("Test raw query", "time_series", "alias $tag_datacenter"))
+			name = "alias America"
+			testFrame.Name = name
+			newField = data.NewField("Value", labels, []*float64{
+				util.ToPtr(222.0),
+			})
+			testFrame.Fields[1] = newField
+			testFrame.Fields[1].Config = &data.FieldConfig{DisplayNameFromDS: name}
+			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
+				t.Errorf("Result mismatch (-want +got):\n%s", diff)
+			}
+
+			result = ResponseParse(readJsonFile("response"), 200, generateQuery("Test raw query", "time_series", "alias $tag_datacenter/$tag_datacenter"))
+			name = "alias America/America"
+			testFrame.Name = name
+			newField = data.NewField("Value", labels, []*float64{
+				util.ToPtr(222.0),
+			})
+			testFrame.Fields[1] = newField
+			testFrame.Fields[1].Config = &data.FieldConfig{DisplayNameFromDS: name}
+			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
+				t.Errorf("Result mismatch (-want +got):\n%s", diff)
+			}
+
+			query = generateQuery("Test raw query", "time_series", "alias [[col]]")
+			query.Measurement = "10m"
+			result = ResponseParse(readJsonFile("response"), 200, query)
+			name = "alias mean"
+			testFrame.Name = name
+			testFrame.Fields[1].Config.DisplayNameFromDS = name
+			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
+				t.Errorf("Result mismatch (-want +got):\n%s", diff)
+			}
+
+			result = ResponseParse(readJsonFile("response"), 200, generateQuery("Test raw query", "time_series", "alias $0 $1 $2 $3 $4"))
+			name = "alias cpu upc $2 $3 $4"
+			testFrame.Name = name
+			testFrame.Fields[1].Config.DisplayNameFromDS = name
+			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
+				t.Errorf("Result mismatch (-want +got):\n%s", diff)
+			}
+
+			result = ResponseParse(readJsonFile("response"), 200, generateQuery("Test raw query", "time_series", "alias $0, $1 - $2 - $3, $4: something"))
+			name = "alias cpu, upc - $2 - $3, $4: something"
+			testFrame.Name = name
+			testFrame.Fields[1].Config.DisplayNameFromDS = name
+			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
+				t.Errorf("Result mismatch (-want +got):\n%s", diff)
+			}
+
+			result = ResponseParse(readJsonFile("response"), 200, generateQuery("Test raw query", "time_series", "alias $1"))
+			name = "alias upc"
+			testFrame.Name = name
+			testFrame.Fields[1].Config.DisplayNameFromDS = name
+			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
+				t.Errorf("Result mismatch (-want +got):\n%s", diff)
+			}
+
+			result = ResponseParse(readJsonFile("response"), 200, generateQuery("Test raw query", "time_series", "alias $5"))
+			name = "alias $5"
+			testFrame.Name = name
+			testFrame.Fields[1].Config.DisplayNameFromDS = name
+			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
+				t.Errorf("Result mismatch (-want +got):\n%s", diff)
+			}
+
+			result = ResponseParse(readJsonFile("response"), 200, generateQuery("Test raw query", "time_series", "series alias"))
+			name = "series alias"
+			testFrame.Name = name
+			testFrame.Fields[1].Config.DisplayNameFromDS = name
+			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
+				t.Errorf("Result mismatch (-want +got):\n%s", diff)
+			}
+
+			query = generateQuery("Test raw query", "time_series", "alias [[m]] [[measurement]]")
+			query.Measurement = "10m"
+			result = ResponseParse(readJsonFile("response"), 200, query)
+			name = "alias cpu.upc cpu.upc"
+			testFrame.Name = name
+			testFrame.Fields[1].Config.DisplayNameFromDS = name
+			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
+				t.Errorf("Result mismatch (-want +got):\n%s", diff)
+			}
+
+			result = ResponseParse(readJsonFile("response"), 200, generateQuery("Test raw query", "time_series", "alias [[tag_datacenter]]"))
+			name = "alias America"
+			testFrame.Name = name
+			testFrame.Fields[1].Config.DisplayNameFromDS = name
+			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
+				t.Errorf("Result mismatch (-want +got):\n%s", diff)
+			}
+
+			result = ResponseParse(readJsonFile("response"), 200, generateQuery("Test raw query", "time_series", "alias [[tag_dc.region.name]]"))
+			name = "alias Northeast"
+			testFrame.Name = name
+			testFrame.Fields[1].Config.DisplayNameFromDS = name
+			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
+				t.Errorf("Result mismatch (-want +got):\n%s", diff)
+			}
+
+			result = ResponseParse(readJsonFile("response"), 200, generateQuery("Test raw query", "time_series", "alias [[tag_cluster-name]]"))
+			name = "alias Cluster"
+			testFrame.Name = name
+			testFrame.Fields[1].Config.DisplayNameFromDS = name
+			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
+				t.Errorf("Result mismatch (-want +got):\n%s", diff)
+			}
+
+			result = ResponseParse(readJsonFile("response"), 200, generateQuery("Test raw query", "time_series", "alias [[tag_/cluster/name/]]"))
+			name = "alias Cluster/"
+			testFrame.Name = name
+			testFrame.Fields[1].Config.DisplayNameFromDS = name
+			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
+				t.Errorf("Result mismatch (-want +got):\n%s", diff)
+			}
+
+			result = ResponseParse(readJsonFile("response"), 200, generateQuery("Test raw query", "time_series", "alias [[tag_@cluster@name@]]"))
+			name = "alias Cluster@"
+			testFrame.Name = name
+			testFrame.Fields[1].Config.DisplayNameFromDS = name
+			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
+				t.Errorf("Result mismatch (-want +got):\n%s", diff)
+			}
+		})
+
+		t.Run("shouldn't parse aliases", func(t *testing.T) {
+			result := ResponseParse(readJsonFile("response"), 200, generateQuery("Test raw query", "time_series", "alias words with no brackets"))
+			name := "alias words with no brackets"
+			testFrame.Name = name
+			testFrame.Fields[1].Config.DisplayNameFromDS = name
+			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
+				t.Errorf("Result mismatch (-want +got):\n%s", diff)
+			}
+
+			result = ResponseParse(readJsonFile("response"), 200, generateQuery("Test raw query", "time_series", "alias Test 1.5"))
+			name = "alias Test 1.5"
+			testFrame.Name = name
+			testFrame.Fields[1].Config.DisplayNameFromDS = name
+			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
+				t.Errorf("Result mismatch (-want +got):\n%s", diff)
+			}
+
+			result = ResponseParse(readJsonFile("response"), 200, generateQuery("Test raw query", "time_series", "alias Test -1"))
+			name = "alias Test -1"
+			testFrame.Name = name
+			testFrame.Fields[1].Config.DisplayNameFromDS = name
+			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
+				t.Errorf("Result mismatch (-want +got):\n%s", diff)
+			}
+		})
+	})
+
+	t.Run("Influxdb response parser with errors", func(t *testing.T) {
+		result := ResponseParse(readJsonFile("error_response"), 200, generateQuery("Test raw query", "time_series", ""))
+
+		require.EqualError(t, result.Error, "query-timeout limit exceeded")
+	})
+
+	t.Run("Influxdb response parser with top-level error", func(t *testing.T) {
+		result := ResponseParse(readJsonFile("error_on_top_level_response"), 200, generateQuery("Test raw query", "time_series", ""))
+		require.Nil(t, result.Frames)
+		require.EqualError(t, result.Error, "error parsing query: found THING")
+	})
+
+	t.Run("Influxdb response parser parseNumber nil", func(t *testing.T) {
+		value := util.ParseNumber(nil)
+		require.Nil(t, value)
+	})
+
+	t.Run("Influxdb response parser parseNumber valid JSON.number", func(t *testing.T) {
+		value := util.ParseNumber(json.Number("95.4"))
+		require.Equal(t, *value, 95.4)
+	})
+
+	t.Run("Influxdb response parser parseNumber invalid type", func(t *testing.T) {
+		value := util.ParseNumber("95.4")
+		require.Nil(t, value)
+	})
+
+	t.Run("Influxdb response parser with invalid timestamp-format", func(t *testing.T) {
+		newField := data.NewField("Value", nil, []*float64{
+			util.ToPtr(50.0), util.ToPtr(52.0),
+		})
+		newField.Config = &data.FieldConfig{DisplayNameFromDS: "cpu.mean"}
+		testFrame := data.NewFrame("cpu.mean",
+			data.NewField("Time", nil,
+				[]time.Time{
+					time.Date(1970, 1, 1, 0, 0, 0, 100000000, time.UTC),
+					time.Date(1970, 1, 1, 0, 0, 0, 102000000, time.UTC),
+				}),
+			newField,
+		)
+		testFrame.Meta = &data.FrameMeta{PreferredVisualization: util.GraphVisType, ExecutedQueryString: "Test raw query"}
+
+		result := ResponseParse(readJsonFile("invalid_timestamp_format"), 200, generateQuery("Test raw query", "time_series", ""))
+
+		if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
+			t.Errorf("Result mismatch (-want +got):\n%s", diff)
+		}
+	})
+
+	t.Run("Influxdb response parser parseTimestamp valid JSON.number", func(t *testing.T) {
+		// currently we use milliseconds-precision with influxdb, so the test works with that.
+		// if we change this to for example nanoseconds-precision, the tests will have to change.
+		timestamp, err := util.ParseTimestamp(json.Number("1609556645000"))
+		require.NoError(t, err)
+		require.Equal(t, timestamp.Format(time.RFC3339), "2021-01-02T03:04:05Z")
+	})
+
+	t.Run("Influxdb response parser parseNumber invalid type", func(t *testing.T) {
+		_, err := util.ParseTimestamp("hello")
+		require.Error(t, err)
+	})
+}
diff --git a/pkg/tsdb/influxdb/influxql/converter/converter.go b/pkg/tsdb/influxdb/influxql/converter/converter.go
new file mode 100644
index 0000000000000..0cdbc010b73d4
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/converter/converter.go
@@ -0,0 +1,461 @@
+package converter
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	sdkjsoniter "github.com/grafana/grafana-plugin-sdk-go/data/utils/jsoniter"
+	jsoniter "github.com/json-iterator/go"
+
+	"github.com/grafana/grafana/pkg/tsdb/influxdb/influxql/util"
+	"github.com/grafana/grafana/pkg/tsdb/influxdb/models"
+)
+
+func rspErr(e error) *backend.DataResponse {
+	return &backend.DataResponse{Error: e}
+}
+
+func ReadInfluxQLStyleResult(jIter *jsoniter.Iterator, query *models.Query) *backend.DataResponse {
+	iter := sdkjsoniter.NewIterator(jIter)
+	var rsp *backend.DataResponse
+
+l1Fields:
+	for l1Field, err := iter.ReadObject(); ; l1Field, err = iter.ReadObject() {
+		if err != nil {
+			return rspErr(err)
+		}
+		switch l1Field {
+		case "results":
+			rsp = readResults(iter, query)
+			if rsp.Error != nil {
+				return rsp
+			}
+		case "":
+			if err != nil {
+				return rspErr(err)
+			}
+			break l1Fields
+		default:
+			v, err := iter.Read()
+			if err != nil {
+				rsp.Error = err
+				return rsp
+			}
+			fmt.Printf("[ROOT] unsupported key: %s / %v\n\n", l1Field, v)
+		}
+	}
+
+	return rsp
+}
+
+func readResults(iter *sdkjsoniter.Iterator, query *models.Query) *backend.DataResponse {
+	rsp := &backend.DataResponse{Frames: make(data.Frames, 0)}
+l1Fields:
+	for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+		if err != nil {
+			return rspErr(err)
+		}
+		for l1Field, err := iter.ReadObject(); l1Field != ""; l1Field, err = iter.ReadObject() {
+			if err != nil {
+				return rspErr(err)
+			}
+			switch l1Field {
+			case "series":
+				rsp = readSeries(iter, query)
+			case "":
+				break l1Fields
+			default:
+				_, err := iter.Read()
+				if err != nil {
+					return rspErr(err)
+				}
+			}
+		}
+	}
+
+	return rsp
+}
+
+func readSeries(iter *sdkjsoniter.Iterator, query *models.Query) *backend.DataResponse {
+	var (
+		measurement   string
+		tags          map[string]string
+		columns       []string
+		valueFields   data.Fields
+		hasTimeColumn bool
+	)
+
+	// frameName is pre-allocated. So we can reuse it, saving memory.
+	// It's sized for a reasonably-large name, but will grow if needed.
+	frameName := make([]byte, 0, 128)
+
+	rsp := &backend.DataResponse{Frames: make(data.Frames, 0)}
+	for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+		if err != nil {
+			return rspErr(err)
+		}
+
+		for l1Field, err := iter.ReadObject(); l1Field != ""; l1Field, err = iter.ReadObject() {
+			if err != nil {
+				return rspErr(err)
+			}
+			switch l1Field {
+			case "name":
+				if measurement, err = iter.ReadString(); err != nil {
+					return rspErr(err)
+				}
+			case "tags":
+				if tags, err = readTags(iter); err != nil {
+					return rspErr(err)
+				}
+			case "columns":
+				columns, err = readColumns(iter)
+				if err != nil {
+					return rspErr(err)
+				}
+				if columns[0] == "time" {
+					hasTimeColumn = true
+				}
+			case "values":
+				valueFields, err = readValues(iter, hasTimeColumn)
+				if err != nil {
+					return rspErr(err)
+				}
+				if util.GetVisType(query.ResultFormat) != util.TableVisType {
+					for i, v := range valueFields {
+						if v.Type() == data.FieldTypeNullableJSON {
+							maybeFixValueFieldType(valueFields, data.FieldTypeNullableFloat64, i)
+						}
+					}
+				}
+			default:
+				v, err := iter.Read()
+				if err != nil {
+					return rspErr(err)
+				}
+				fmt.Printf("[Series] unsupported key: %s / %v\n", l1Field, v)
+			}
+		}
+
+		if util.GetVisType(query.ResultFormat) == util.TableVisType {
+			handleTableFormatFirstFrame(rsp, measurement, query)
+			handleTableFormatFirstField(rsp, valueFields, columns)
+			handleTableFormatTagFields(rsp, valueFields, tags)
+			handleTableFormatValueFields(rsp, valueFields, tags, columns)
+		} else {
+			// time_series response format
+			if hasTimeColumn {
+				// Frame with time column
+				newFrames := handleTimeSeriesFormatWithTimeColumn(valueFields, tags, columns, measurement, frameName, query)
+				rsp.Frames = append(rsp.Frames, newFrames...)
+			} else {
+				// Frame without time column
+				newFrame := handleTimeSeriesFormatWithoutTimeColumn(valueFields, columns, measurement, query)
+				rsp.Frames = append(rsp.Frames, newFrame)
+			}
+		}
+	}
+
+	// if all values are null in a field, we convert the field type to NullableFloat64
+	// it is because of the consistency between buffer and stream parser
+	// also frontend probably will not interpret the nullableJson value
+	for i, f := range rsp.Frames {
+		for j, v := range f.Fields {
+			if v.Type() == data.FieldTypeNullableJSON {
+				newField := data.NewFieldFromFieldType(data.FieldTypeNullableFloat64, 0)
+				newField.Name = v.Name
+				newField.Config = v.Config
+				for k := 0; k < v.Len(); k++ {
+					newField.Append(nil)
+				}
+				rsp.Frames[i].Fields[j] = newField
+			}
+		}
+	}
+
+	return rsp
+}
+
+func readTags(iter *sdkjsoniter.Iterator) (map[string]string, error) {
+	tags := make(map[string]string)
+	for l1Field, err := iter.ReadObject(); l1Field != ""; l1Field, err = iter.ReadObject() {
+		if err != nil {
+			return nil, err
+		}
+		value, err := iter.ReadString()
+		if err != nil {
+			return nil, err
+		}
+		tags[l1Field] = value
+	}
+	return tags, nil
+}
+
+func readColumns(iter *sdkjsoniter.Iterator) (columns []string, err error) {
+	for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+		if err != nil {
+			return nil, err
+		}
+
+		l1Field, err := iter.ReadString()
+		if err != nil {
+			return nil, err
+		}
+		columns = append(columns, l1Field)
+	}
+	return columns, nil
+}
+
+func readValues(iter *sdkjsoniter.Iterator, hasTimeColumn bool) (valueFields data.Fields, err error) {
+	if hasTimeColumn {
+		valueFields = append(valueFields, data.NewField("Time", nil, make([]time.Time, 0)))
+	}
+
+	for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
+		if err != nil {
+			return nil, err
+		}
+
+		colIdx := 0
+
+		for more2, err := iter.ReadArray(); more2; more2, err = iter.ReadArray() {
+			if err != nil {
+				return nil, err
+			}
+
+			if hasTimeColumn && colIdx == 0 {
+				// Read time
+				var t float64
+				if t, err = iter.ReadFloat64(); err != nil {
+					return nil, err
+				}
+				valueFields[0].Append(time.UnixMilli(int64(t)).UTC())
+
+				colIdx++
+				continue
+			}
+
+			// Read column values
+			next, err := iter.WhatIsNext()
+			if err != nil {
+				return nil, err
+			}
+
+			switch next {
+			case jsoniter.StringValue:
+				s, err := iter.ReadString()
+				if err != nil {
+					return nil, err
+				}
+				valueFields = maybeCreateValueField(valueFields, data.FieldTypeNullableString, colIdx)
+				maybeFixValueFieldType(valueFields, data.FieldTypeNullableString, colIdx)
+				tryToAppendValue(valueFields, &s, colIdx)
+			case jsoniter.NumberValue:
+				n, err := iter.ReadFloat64()
+				if err != nil {
+					return nil, err
+				}
+				valueFields = maybeCreateValueField(valueFields, data.FieldTypeNullableFloat64, colIdx)
+				maybeFixValueFieldType(valueFields, data.FieldTypeNullableFloat64, colIdx)
+				tryToAppendValue(valueFields, &n, colIdx)
+			case jsoniter.BoolValue:
+				b, err := iter.ReadAny()
+				if err != nil {
+					return nil, err
+				}
+				valueFields = maybeCreateValueField(valueFields, data.FieldTypeNullableBool, colIdx)
+				maybeFixValueFieldType(valueFields, data.FieldTypeNullableBool, colIdx)
+				tryToAppendValue(valueFields, util.ToPtr(b.ToBool()), colIdx)
+			case jsoniter.NilValue:
+				_, _ = iter.Read()
+				if len(valueFields) <= colIdx {
+					// no value field created before
+					// we don't know the type of the values for this field, yet
+					// so we create a FieldTypeNullableJSON to hold nil values
+					// if that is something else it will be replaced later
+					unknownField := data.NewFieldFromFieldType(data.FieldTypeNullableJSON, 0)
+					unknownField.Name = "Value"
+					valueFields = append(valueFields, unknownField)
+				}
+				valueFields[colIdx].Append(nil)
+			default:
+				return nil, fmt.Errorf("unknown value type")
+			}
+
+			colIdx++
+		}
+	}
+
+	return valueFields, nil
+}
+
+// maybeCreateValueField checks whether a value field has created already.
+// if it hasn't, creates a new one
+func maybeCreateValueField(valueFields data.Fields, expectedType data.FieldType, colIdx int) data.Fields {
+	if len(valueFields) == colIdx {
+		newField := data.NewFieldFromFieldType(expectedType, 0)
+		newField.Name = "Value"
+		valueFields = append(valueFields, newField)
+	}
+
+	return valueFields
+}
+
+// maybeFixValueFieldType checks if the value field type is matching
+// For nil values we might have added FieldTypeNullableJSON value field
+// if the type of the field in valueFields is not matching the expected type
+// or the type of the field in valueFields is nullableJSON
+// we change the type of the field as expectedType
+func maybeFixValueFieldType(valueFields data.Fields, expectedType data.FieldType, colIdx int) {
+	if valueFields[colIdx].Type() == expectedType || valueFields[colIdx].Type() != data.FieldTypeNullableJSON {
+		return
+	}
+	stringField := data.NewFieldFromFieldType(expectedType, 0)
+	stringField.Name = "Value"
+	for i := 0; i < valueFields[colIdx].Len(); i++ {
+		stringField.Append(nil)
+	}
+	valueFields[colIdx] = stringField
+}
+
+func tryToAppendValue[T *string | *float64 | *bool](valueFields data.Fields, value T, colIdx int) {
+	if valueFields[colIdx].Type() == typeOf(value) {
+		valueFields[colIdx].Append(value)
+	} else {
+		valueFields[colIdx].Append(nil)
+	}
+}
+
+func typeOf(value interface{}) data.FieldType {
+	switch v := value.(type) {
+	case *string:
+		return data.FieldTypeNullableString
+	case *float64:
+		return data.FieldTypeNullableFloat64
+	case *bool:
+		return data.FieldTypeNullableBool
+	default:
+		fmt.Printf("unknown value type: %v", v)
+		return data.FieldTypeNullableJSON
+	}
+}
+
+func handleTimeSeriesFormatWithTimeColumn(valueFields data.Fields, tags map[string]string, columns []string, measurement string, frameName []byte, query *models.Query) []*data.Frame {
+	frames := make([]*data.Frame, 0, len(columns)-1)
+	// don't iterate over first column as it is a time column already
+	for i := 1; i < len(columns); i++ {
+		formattedFrameName := string(util.FormatFrameName(measurement, columns[i], tags, *query, frameName[:]))
+		valueFields[i].Labels = tags
+		valueFields[i].Config = &data.FieldConfig{DisplayNameFromDS: formattedFrameName}
+
+		frame := data.NewFrame(formattedFrameName, valueFields[0], valueFields[i])
+		frames = append(frames, frame)
+	}
+	return frames
+}
+
+func handleTimeSeriesFormatWithoutTimeColumn(valueFields data.Fields, columns []string, measurement string, query *models.Query) *data.Frame {
+	// Frame without time column
+	if strings.Contains(strings.ToLower(query.RawQuery), strings.ToLower("CARDINALITY")) {
+		var stringArray []*string
+		for _, v := range valueFields {
+			if f, ok := v.At(0).(*float64); ok {
+				str := strconv.FormatFloat(*f, 'f', -1, 64)
+				stringArray = append(stringArray, util.ParseString(str))
+			} else {
+				stringArray = append(stringArray, util.ParseString(v.At(0)))
+			}
+		}
+		return data.NewFrame(measurement, data.NewField("Value", nil, stringArray))
+	}
+	if len(columns) >= 2 && strings.Contains(strings.ToLower(query.RawQuery), strings.ToLower("SHOW TAG VALUES")) {
+		return data.NewFrame(measurement, valueFields[1])
+	}
+	if len(columns) >= 1 {
+		return data.NewFrame(measurement, valueFields[0])
+	}
+	return nil
+}
+
+func handleTableFormatFirstFrame(rsp *backend.DataResponse, measurement string, query *models.Query) {
+	// Add the first and only frame for table format
+	if len(rsp.Frames) == 0 {
+		newFrame := data.NewFrame(measurement)
+		newFrame.Meta = &data.FrameMeta{
+			ExecutedQueryString:    query.RawQuery,
+			PreferredVisualization: util.GetVisType(query.ResultFormat),
+		}
+		rsp.Frames = append(rsp.Frames, newFrame)
+	}
+}
+
+func handleTableFormatFirstField(rsp *backend.DataResponse, valueFields data.Fields, columns []string) {
+	if len(rsp.Frames[0].Fields) == 0 {
+		rsp.Frames[0].Fields = append(rsp.Frames[0].Fields, valueFields[0])
+		if columns[0] != "time" {
+			rsp.Frames[0].Fields[0].Name = columns[0]
+			rsp.Frames[0].Fields[0].Config = &data.FieldConfig{DisplayNameFromDS: columns[0]}
+		}
+	} else {
+		var i int
+		for i < valueFields[0].Len() {
+			rsp.Frames[0].Fields[0].Append(valueFields[0].At(i))
+			i++
+		}
+	}
+}
+
+func handleTableFormatTagFields(rsp *backend.DataResponse, valueFields data.Fields, tags map[string]string) {
+	ti := 1
+	// We have the first field, so we should add tagField if there is any tag
+	for k, v := range tags {
+		if len(rsp.Frames[0].Fields) == ti {
+			tagField := data.NewField(k, nil, []*string{})
+			tagField.Config = &data.FieldConfig{DisplayNameFromDS: k}
+			rsp.Frames[0].Fields = append(rsp.Frames[0].Fields, tagField)
+		}
+		var i int
+		for i < valueFields[0].Len() {
+			val := v[0:]
+			rsp.Frames[0].Fields[ti].Append(&val)
+			i++
+		}
+		ti++
+	}
+}
+
+func handleTableFormatValueFields(rsp *backend.DataResponse, valueFields data.Fields, tags map[string]string, columns []string) {
+	// number of fields we currently have in the first frame
+	// we handled first value field and then tags.
+	si := len(tags) + 1
+	l := len(valueFields)
+	// first value field is always handled first, before tags.
+	// no need to create another one again here
+	for i := 1; i < l; i++ {
+		if len(rsp.Frames[0].Fields) == si {
+			rsp.Frames[0].Fields = append(rsp.Frames[0].Fields, valueFields[i])
+		} else {
+			ll := valueFields[i].Len()
+			for vi := 0; vi < ll; vi++ {
+				if valueFields[i].Type() == data.FieldTypeNullableJSON {
+					// add nil explicitly.
+					// we don't know if it is a float pointer nil or string pointer nil or etc
+					rsp.Frames[0].Fields[si].Append(nil)
+				} else {
+					if valueFields[i].Type() != rsp.Frames[0].Fields[si].Type() {
+						maybeFixValueFieldType(rsp.Frames[0].Fields, valueFields[i].Type(), si)
+					}
+					rsp.Frames[0].Fields[si].Append(valueFields[i].At(vi))
+				}
+			}
+		}
+
+		rsp.Frames[0].Fields[si].Name = columns[i]
+		rsp.Frames[0].Fields[si].Config = &data.FieldConfig{DisplayNameFromDS: columns[i]}
+		si++
+	}
+}
diff --git a/pkg/tsdb/influxdb/influxql/converter/converter_test.go b/pkg/tsdb/influxdb/influxql/converter/converter_test.go
new file mode 100644
index 0000000000000..2c5e1deecd565
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/converter/converter_test.go
@@ -0,0 +1,82 @@
+package converter
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestMaybeFixValueFieldType(t *testing.T) {
+	tests := []struct {
+		name         string
+		valueFields  data.Fields
+		inputType    data.FieldType
+		colIdx       int
+		expectedType data.FieldType
+	}{
+		{
+			name:         "should do nothing if both are the same type (bool)",
+			valueFields:  data.Fields{data.NewFieldFromFieldType(data.FieldTypeNullableBool, 0)},
+			inputType:    data.FieldTypeNullableBool,
+			colIdx:       0,
+			expectedType: data.FieldTypeNullableBool,
+		},
+		{
+			name:         "should do nothing if both are the same type (string)",
+			valueFields:  data.Fields{data.NewFieldFromFieldType(data.FieldTypeNullableString, 0)},
+			inputType:    data.FieldTypeNullableString,
+			colIdx:       0,
+			expectedType: data.FieldTypeNullableString,
+		},
+		{
+			name:         "should do nothing if both are the same type (float64)",
+			valueFields:  data.Fields{data.NewFieldFromFieldType(data.FieldTypeNullableFloat64, 0)},
+			inputType:    data.FieldTypeNullableFloat64,
+			colIdx:       0,
+			expectedType: data.FieldTypeNullableFloat64,
+		},
+		{
+			name:         "should return nullableJson if both are nullableJson",
+			valueFields:  data.Fields{data.NewFieldFromFieldType(data.FieldTypeNullableJSON, 0)},
+			inputType:    data.FieldTypeNullableJSON,
+			colIdx:       0,
+			expectedType: data.FieldTypeNullableJSON,
+		},
+		{
+			name:         "should return nullableString if valueField is nullableJson and input is nullableString",
+			valueFields:  data.Fields{data.NewFieldFromFieldType(data.FieldTypeNullableJSON, 0)},
+			inputType:    data.FieldTypeNullableString,
+			colIdx:       0,
+			expectedType: data.FieldTypeNullableString,
+		},
+		{
+			name:         "should return nullableBool if valueField is nullableJson and input is nullableBool",
+			valueFields:  data.Fields{data.NewFieldFromFieldType(data.FieldTypeNullableJSON, 0)},
+			inputType:    data.FieldTypeNullableBool,
+			colIdx:       0,
+			expectedType: data.FieldTypeNullableBool,
+		},
+		{
+			name:         "should return nullableFloat64 if valueField is nullableJson and input is nullableFloat64",
+			valueFields:  data.Fields{data.NewFieldFromFieldType(data.FieldTypeNullableJSON, 0)},
+			inputType:    data.FieldTypeNullableFloat64,
+			colIdx:       0,
+			expectedType: data.FieldTypeNullableFloat64,
+		},
+		{
+			name:         "should do nothing if valueField is different than nullableJson and input is anything but nullableJson",
+			valueFields:  data.Fields{data.NewFieldFromFieldType(data.FieldTypeNullableFloat64, 0)},
+			inputType:    data.FieldTypeNullableString,
+			colIdx:       0,
+			expectedType: data.FieldTypeNullableFloat64,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			maybeFixValueFieldType(tt.valueFields, tt.inputType, tt.colIdx)
+			assert.Equal(t, tt.valueFields[tt.colIdx].Type(), tt.expectedType)
+		})
+	}
+}
diff --git a/pkg/tsdb/influxdb/influxql/influxql.go b/pkg/tsdb/influxdb/influxql/influxql.go
index d84144aa415f8..ada4a2eade38a 100644
--- a/pkg/tsdb/influxdb/influxql/influxql.go
+++ b/pkg/tsdb/influxdb/influxql/influxql.go
@@ -3,15 +3,23 @@ package influxql
 import (
 	"context"
 	"errors"
+	"fmt"
 	"net/http"
 	"net/url"
 	"path"
 	"strings"
+	"sync"
 
+	"github.com/grafana/dskit/concurrency"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/trace"
 
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tsdb/influxdb/influxql/buffered"
+	"github.com/grafana/grafana/pkg/tsdb/influxdb/influxql/querydata"
 	"github.com/grafana/grafana/pkg/tsdb/influxdb/models"
 )
 
@@ -22,43 +30,94 @@ var (
 	glog               = log.New("tsdb.influx_influxql")
 )
 
-func Query(ctx context.Context, dsInfo *models.DatasourceInfo, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+func Query(ctx context.Context, tracer trace.Tracer, dsInfo *models.DatasourceInfo, req *backend.QueryDataRequest, features featuremgmt.FeatureToggles) (*backend.QueryDataResponse, error) {
 	logger := glog.FromContext(ctx)
 	response := backend.NewQueryDataResponse()
+	var err error
 
-	for _, reqQuery := range req.Queries {
-		query, err := models.QueryParse(reqQuery)
+	// We are testing running of queries in parallel behind feature flag
+	if features.IsEnabled(ctx, featuremgmt.FlagInfluxdbRunQueriesInParallel) {
+		concurrentQueryCount, err := req.PluginContext.GrafanaConfig.ConcurrentQueryCount()
 		if err != nil {
-			return &backend.QueryDataResponse{}, err
+			logger.Debug(fmt.Sprintf("Concurrent Query Count read/parse error: %v", err), featuremgmt.FlagInfluxdbRunQueriesInParallel)
+			concurrentQueryCount = 10
 		}
 
-		rawQuery, err := query.Build(req)
-		if err != nil {
-			return &backend.QueryDataResponse{}, err
-		}
-
-		query.RefID = reqQuery.RefID
-		query.RawQuery = rawQuery
-
-		if setting.Env == setting.Dev {
-			logger.Debug("Influxdb query", "raw query", rawQuery)
-		}
+		responseLock := sync.Mutex{}
+		err = concurrency.ForEachJob(ctx, len(req.Queries), concurrentQueryCount, func(ctx context.Context, idx int) error {
+			reqQuery := req.Queries[idx]
+			query, err := models.QueryParse(reqQuery)
+			if err != nil {
+				return err
+			}
+
+			rawQuery, err := query.Build(req)
+			if err != nil {
+				return err
+			}
+
+			query.RefID = reqQuery.RefID
+			query.RawQuery = rawQuery
+
+			if setting.Env == setting.Dev {
+				logger.Debug("Influxdb query", "raw query", rawQuery)
+			}
+
+			request, err := createRequest(ctx, logger, dsInfo, rawQuery, query.Policy)
+			if err != nil {
+				return err
+			}
+
+			resp, err := execute(ctx, tracer, dsInfo, logger, query, request, features.IsEnabled(ctx, featuremgmt.FlagInfluxqlStreamingParser))
+
+			responseLock.Lock()
+			defer responseLock.Unlock()
+			if err != nil {
+				response.Responses[query.RefID] = backend.DataResponse{Error: err}
+			} else {
+				response.Responses[query.RefID] = resp
+			}
+			return nil // errors are saved per-query,always return nil
+		})
 
-		request, err := createRequest(ctx, logger, dsInfo, rawQuery, query.Policy)
 		if err != nil {
-			return &backend.QueryDataResponse{}, err
+			logger.Debug("Influxdb concurrent query error", "concurrent query", err)
 		}
-
-		resp, err := execute(dsInfo, logger, query, request)
-
-		if err != nil {
-			response.Responses[query.RefID] = backend.DataResponse{Error: err}
-		} else {
-			response.Responses[query.RefID] = resp
+	} else {
+		for _, reqQuery := range req.Queries {
+			query, err := models.QueryParse(reqQuery)
+			if err != nil {
+				return &backend.QueryDataResponse{}, err
+			}
+
+			rawQuery, err := query.Build(req)
+			if err != nil {
+				return &backend.QueryDataResponse{}, err
+			}
+
+			query.RefID = reqQuery.RefID
+			query.RawQuery = rawQuery
+
+			if setting.Env == setting.Dev {
+				logger.Debug("Influxdb query", "raw query", rawQuery)
+			}
+
+			request, err := createRequest(ctx, logger, dsInfo, rawQuery, query.Policy)
+			if err != nil {
+				return &backend.QueryDataResponse{}, err
+			}
+
+			resp, err := execute(ctx, tracer, dsInfo, logger, query, request, features.IsEnabled(ctx, featuremgmt.FlagInfluxqlStreamingParser))
+
+			if err != nil {
+				response.Responses[query.RefID] = backend.DataResponse{Error: err}
+			} else {
+				response.Responses[query.RefID] = resp
+			}
 		}
 	}
 
-	return response, nil
+	return response, err
 }
 
 func createRequest(ctx context.Context, logger log.Logger, dsInfo *models.DatasourceInfo, queryStr string, retentionPolicy string) (*http.Request, error) {
@@ -110,7 +169,7 @@ func createRequest(ctx context.Context, logger log.Logger, dsInfo *models.Dataso
 	return req, nil
 }
 
-func execute(dsInfo *models.DatasourceInfo, logger log.Logger, query *models.Query, request *http.Request) (backend.DataResponse, error) {
+func execute(ctx context.Context, tracer trace.Tracer, dsInfo *models.DatasourceInfo, logger log.Logger, query *models.Query, request *http.Request, isStreamingParserEnabled bool) (backend.DataResponse, error) {
 	res, err := dsInfo.HTTPClient.Do(request)
 	if err != nil {
 		return backend.DataResponse{}, err
@@ -120,6 +179,27 @@ func execute(dsInfo *models.DatasourceInfo, logger log.Logger, query *models.Que
 			logger.Warn("Failed to close response body", "err", err)
 		}
 	}()
-	resp := ResponseParse(res.Body, res.StatusCode, query)
+
+	_, endSpan := startTrace(ctx, tracer, "datasource.influxdb.influxql.parseResponse")
+	defer endSpan()
+
+	var resp *backend.DataResponse
+	if isStreamingParserEnabled {
+		logger.Info("InfluxDB InfluxQL streaming parser enabled: ", "info")
+		resp = querydata.ResponseParse(res.Body, res.StatusCode, query)
+	} else {
+		resp = buffered.ResponseParse(res.Body, res.StatusCode, query)
+	}
 	return *resp, nil
 }
+
+// startTrace setups a trace but does not panic if tracer is nil which helps with testing
+func startTrace(ctx context.Context, tracer trace.Tracer, name string, attributes ...attribute.KeyValue) (context.Context, func()) {
+	if tracer == nil {
+		return ctx, func() {}
+	}
+	ctx, span := tracer.Start(ctx, name, trace.WithAttributes(attributes...))
+	return ctx, func() {
+		span.End()
+	}
+}
diff --git a/pkg/tsdb/influxdb/influxql/parser_bench_test.go b/pkg/tsdb/influxdb/influxql/parser_bench_test.go
new file mode 100644
index 0000000000000..9fbd1f70f3105
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/parser_bench_test.go
@@ -0,0 +1,58 @@
+package influxql
+
+import (
+	_ "embed"
+	"fmt"
+	"io"
+	"os"
+	"strings"
+	"testing"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/tsdb/influxdb/influxql/buffered"
+	"github.com/grafana/grafana/pkg/tsdb/influxdb/influxql/querydata"
+	"github.com/grafana/grafana/pkg/tsdb/influxdb/models"
+)
+
+// TEST_MODE=buffered RES_FORMAT=time_series go test -benchmem -run=^$ -memprofile buffered_mem.out -count=10 -bench ^BenchmarkParseJson github.com/grafana/grafana/pkg/tsdb/influxdb/influxql | tee buffered.txt
+// TEST_MODE=stream RES_FORMAT=time_series go test -benchmem -run=^$ -memprofile stream_mem.out -count=10 -bench ^BenchmarkParseJson github.com/grafana/grafana/pkg/tsdb/influxdb/influxql | tee stream.txt
+// TEST_MODE=buffered RES_FORMAT=table go test -benchmem -run=^$ -memprofile buffered_table_mem.out -cpuprofile buffered_table_cpu.out -count=10 -bench ^BenchmarkParseJson github.com/grafana/grafana/pkg/tsdb/influxdb/influxql | tee buffered_table.txt
+// TEST_MODE=stream RES_FORMAT=table go test -benchmem -run=^$ -memprofile stream_table_mem.out -cpuprofile stream_table_cpu.out -count=10 -bench ^BenchmarkParseJson github.com/grafana/grafana/pkg/tsdb/influxdb/influxql | tee stream_table.txt
+// go tool pprof -http=localhost:9999 memprofile.out
+// benchstat buffered.txt stream.txt
+// benchstat buffered_table.txt stream_table.txt
+func BenchmarkParseJson(b *testing.B) {
+	filePath := "testdata/many_columns.json"
+	bytes, err := os.ReadFile(filePath)
+	if err != nil {
+		panic(fmt.Sprintf("cannot read the file: %s", filePath))
+	}
+
+	testMode := os.Getenv("TEST_MODE")
+	resFormat := os.Getenv("RES_FORMAT")
+	if testMode == "" {
+		testMode = "stream"
+	}
+
+	query := &models.Query{
+		RawQuery:     "Test raw query",
+		UseRawQuery:  true,
+		ResultFormat: resFormat,
+	}
+	b.ResetTimer()
+
+	for n := 0; n < b.N; n++ {
+		buf := io.NopCloser(strings.NewReader(string(bytes)))
+		var result *backend.DataResponse
+		switch testMode {
+		case "buffered":
+			result = buffered.ResponseParse(buf, 200, query)
+		case "stream":
+			result = querydata.ResponseParse(buf, 200, query)
+		}
+		require.NotNil(b, result.Frames)
+		require.NoError(b, result.Error)
+	}
+}
diff --git a/pkg/tsdb/influxdb/influxql/querydata/stream_parser.go b/pkg/tsdb/influxdb/influxql/querydata/stream_parser.go
new file mode 100644
index 0000000000000..dde413c8fa454
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/querydata/stream_parser.go
@@ -0,0 +1,38 @@
+package querydata
+
+import (
+	"fmt"
+	"io"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	jsoniter "github.com/json-iterator/go"
+
+	"github.com/grafana/grafana/pkg/tsdb/influxdb/influxql/converter"
+	"github.com/grafana/grafana/pkg/tsdb/influxdb/influxql/util"
+	"github.com/grafana/grafana/pkg/tsdb/influxdb/models"
+)
+
+func ResponseParse(buf io.ReadCloser, statusCode int, query *models.Query) *backend.DataResponse {
+	defer func() {
+		if err := buf.Close(); err != nil {
+			fmt.Println("Failed to close response body", "err", err)
+		}
+	}()
+
+	iter := jsoniter.Parse(jsoniter.ConfigDefault, buf, 1024)
+	r := converter.ReadInfluxQLStyleResult(iter, query)
+
+	if statusCode/100 != 2 {
+		return &backend.DataResponse{Error: fmt.Errorf("InfluxDB returned error: %s", r.Error)}
+	}
+
+	// The ExecutedQueryString can be viewed in QueryInspector in UI
+	for i, frame := range r.Frames {
+		if i == 0 {
+			frame.Meta = &data.FrameMeta{ExecutedQueryString: query.RawQuery, PreferredVisualization: util.GetVisType(query.ResultFormat)}
+		}
+	}
+
+	return r
+}
diff --git a/pkg/tsdb/influxdb/influxql/querydata/stream_parser_test.go b/pkg/tsdb/influxdb/influxql/querydata/stream_parser_test.go
new file mode 100644
index 0000000000000..7e2f8951bbeb4
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/querydata/stream_parser_test.go
@@ -0,0 +1,107 @@
+package querydata
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"path"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/grafana/grafana-plugin-sdk-go/experimental"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/tsdb/influxdb/models"
+)
+
+const (
+	shouldUpdate = false
+	testPath     = "../testdata"
+)
+
+func readJsonFile(filePath string) io.ReadCloser {
+	bytes, err := os.ReadFile(filepath.Join(testPath, filepath.Clean(filePath)+".json"))
+	if err != nil {
+		panic(fmt.Sprintf("cannot read the file: %s", filePath))
+	}
+
+	return io.NopCloser(strings.NewReader(string(bytes)))
+}
+
+func generateQuery(query, resFormat, alias string) *models.Query {
+	return &models.Query{
+		RawQuery:     query,
+		UseRawQuery:  true,
+		Alias:        alias,
+		ResultFormat: resFormat,
+	}
+}
+
+var testFiles = []string{
+	"all_values_are_null",
+	"influx_select_all_from_cpu",
+	"one_measurement_with_two_columns",
+	"response_with_weird_tag",
+	"some_values_are_null",
+	"simple_response",
+	"multiple_series_with_tags_and_multiple_columns",
+	"multiple_series_with_tags",
+	"empty_response",
+	"metric_find_queries",
+	"show_tag_values_response",
+	"retention_policy",
+	"simple_response_with_diverse_data_types",
+	"multiple_measurements",
+	"string_column_with_null_value",
+	"string_column_with_null_value2",
+	"many_columns",
+	"response_with_nil_bools_and_nil_strings",
+	"invalid_value_format",
+}
+
+func TestReadInfluxAsTimeSeries(t *testing.T) {
+	for _, f := range testFiles {
+		t.Run(f, runScenario(f, "time_series"))
+	}
+}
+
+func TestReadInfluxAsTable(t *testing.T) {
+	for _, f := range testFiles {
+		t.Run(f, runScenario(f, "table"))
+	}
+}
+
+func runScenario(tf string, resultFormat string) func(t *testing.T) {
+	return func(t *testing.T) {
+		f := readJsonFile(tf)
+
+		query := generateQuery("Test raw query", resultFormat, "")
+
+		runQuery(t, f, tf, resultFormat, query)
+	}
+}
+
+func runQuery(t *testing.T, f io.ReadCloser, tf string, rf string, query *models.Query) {
+	rsp := ResponseParse(f, 200, query)
+
+	if strings.Contains(tf, "error") {
+		require.Error(t, rsp.Error)
+		return
+	}
+	require.NoError(t, rsp.Error)
+
+	fname := tf + "." + rf + ".golden"
+	experimental.CheckGoldenJSONResponse(t, testPath, fname, rsp, shouldUpdate)
+}
+
+func TestParsingAsTimeSeriesWithoutTimeColumn(t *testing.T) {
+	t.Run("cardinality", func(t *testing.T) {
+		f, err := os.Open(path.Join(testPath, filepath.Clean("cardinality.json")))
+		require.NoError(t, err)
+
+		query := generateQuery(`SHOW TAG VALUES CARDINALITY with key = "host"`, "time_series", "")
+
+		runQuery(t, f, "cardinality", "time_series", query)
+	})
+}
diff --git a/pkg/tsdb/influxdb/influxql/response_parser.go b/pkg/tsdb/influxdb/influxql/response_parser.go
deleted file mode 100644
index 22972d209cae6..0000000000000
--- a/pkg/tsdb/influxdb/influxql/response_parser.go
+++ /dev/null
@@ -1,352 +0,0 @@
-package influxql
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"regexp"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana-plugin-sdk-go/data"
-
-	"github.com/grafana/grafana/pkg/tsdb/influxdb/models"
-)
-
-var (
-	legendFormat = regexp.MustCompile(`\[\[([\@\/\w-]+)(\.[\@\/\w-]+)*\]\]*|\$([\@\w-]+?)*`)
-)
-
-const (
-	graphVisType data.VisType = "graph"
-	tableVisType data.VisType = "table"
-	logsVisType  data.VisType = "logs"
-)
-
-func ResponseParse(buf io.ReadCloser, statusCode int, query *models.Query) *backend.DataResponse {
-	return parse(buf, statusCode, query)
-}
-
-// parse is the same as Parse, but without the io.ReadCloser (we don't need to
-// close the buffer)
-func parse(buf io.Reader, statusCode int, query *models.Query) *backend.DataResponse {
-	response, jsonErr := parseJSON(buf)
-
-	if statusCode/100 != 2 {
-		return &backend.DataResponse{Error: fmt.Errorf("InfluxDB returned error: %s", response.Error)}
-	}
-
-	if jsonErr != nil {
-		return &backend.DataResponse{Error: jsonErr}
-	}
-
-	if response.Error != "" {
-		return &backend.DataResponse{Error: fmt.Errorf(response.Error)}
-	}
-
-	result := response.Results[0]
-	if result.Error != "" {
-		return &backend.DataResponse{Error: fmt.Errorf(result.Error)}
-	} else {
-		return &backend.DataResponse{Frames: transformRows(result.Series, *query)}
-	}
-}
-
-func parseJSON(buf io.Reader) (models.Response, error) {
-	var response models.Response
-
-	dec := json.NewDecoder(buf)
-	dec.UseNumber()
-
-	err := dec.Decode(&response)
-
-	return response, err
-}
-
-func transformRows(rows []models.Row, query models.Query) data.Frames {
-	// pre-allocate frames - this can save many allocations
-	cols := 0
-	for _, row := range rows {
-		cols += len(row.Columns)
-	}
-	frames := make([]*data.Frame, 0, len(rows)+cols)
-
-	// frameName is pre-allocated. So we can reuse it, saving memory.
-	// It's sized for a reasonably-large name, but will grow if needed.
-	frameName := make([]byte, 0, 128)
-
-	retentionPolicyQuery := isRetentionPolicyQuery(query)
-	tagValuesQuery := isTagValuesQuery(query)
-
-	for _, row := range rows {
-		var hasTimeCol = false
-
-		for _, column := range row.Columns {
-			if strings.ToLower(column) == "time" {
-				hasTimeCol = true
-			}
-		}
-
-		if !hasTimeCol {
-			newFrame := newFrameWithoutTimeField(row, retentionPolicyQuery, tagValuesQuery)
-			frames = append(frames, newFrame)
-		} else {
-			for colIndex, column := range row.Columns {
-				if column == "time" {
-					continue
-				}
-				newFrame := newFrameWithTimeField(row, column, colIndex, query, frameName)
-				frames = append(frames, newFrame)
-			}
-		}
-	}
-
-	return frames
-}
-
-func newFrameWithTimeField(row models.Row, column string, colIndex int, query models.Query, frameName []byte) *data.Frame {
-	var timeArray []time.Time
-	var floatArray []*float64
-	var stringArray []*string
-	var boolArray []*bool
-	valType := typeof(row.Values, colIndex)
-
-	for _, valuePair := range row.Values {
-		timestamp, timestampErr := parseTimestamp(valuePair[0])
-		// we only add this row if the timestamp is valid
-		if timestampErr != nil {
-			continue
-		}
-
-		timeArray = append(timeArray, timestamp)
-		switch valType {
-		case "string":
-			value, ok := valuePair[colIndex].(string)
-			if ok {
-				stringArray = append(stringArray, &value)
-			} else {
-				stringArray = append(stringArray, nil)
-			}
-		case "json.Number":
-			value := parseNumber(valuePair[colIndex])
-			floatArray = append(floatArray, value)
-		case "bool":
-			value, ok := valuePair[colIndex].(bool)
-			if ok {
-				boolArray = append(boolArray, &value)
-			} else {
-				boolArray = append(boolArray, nil)
-			}
-		case "null":
-			floatArray = append(floatArray, nil)
-		}
-	}
-
-	timeField := data.NewField("Time", nil, timeArray)
-
-	var valueField *data.Field
-
-	switch valType {
-	case "string":
-		valueField = data.NewField("Value", row.Tags, stringArray)
-	case "json.Number":
-		valueField = data.NewField("Value", row.Tags, floatArray)
-	case "bool":
-		valueField = data.NewField("Value", row.Tags, boolArray)
-	case "null":
-		valueField = data.NewField("Value", row.Tags, floatArray)
-	}
-
-	name := string(formatFrameName(row, column, query, frameName[:]))
-	valueField.SetConfig(&data.FieldConfig{DisplayNameFromDS: name})
-	return newDataFrame(name, query.RawQuery, timeField, valueField, getVisType(query.ResultFormat))
-}
-
-func newFrameWithoutTimeField(row models.Row, retentionPolicyQuery bool, tagValuesQuery bool) *data.Frame {
-	var values []string
-
-	if retentionPolicyQuery {
-		values = make([]string, 1, len(row.Values))
-	} else {
-		values = make([]string, 0, len(row.Values))
-	}
-
-	for _, valuePair := range row.Values {
-		if tagValuesQuery {
-			if len(valuePair) >= 2 {
-				values = append(values, valuePair[1].(string))
-			}
-		} else if retentionPolicyQuery {
-			// We want to know whether the given retention policy is the default one or not.
-			// If it is default policy then we should add it to the beginning.
-			// The index 4 gives us if that policy is default or not.
-			// https://docs.influxdata.com/influxdb/v1.8/query_language/explore-schema/#show-retention-policies
-			// Only difference is v0.9. In that version we don't receive shardGroupDuration value.
-			// https://archive.docs.influxdata.com/influxdb/v0.9/query_language/schema_exploration/#show-retention-policies
-			// Since it is always the last value we will check that last value always.
-			if len(valuePair) >= 1 {
-				if valuePair[len(row.Columns)-1].(bool) {
-					values[0] = valuePair[0].(string)
-				} else {
-					values = append(values, valuePair[0].(string))
-				}
-			}
-		} else {
-			if len(valuePair) >= 1 {
-				values = append(values, valuePair[0].(string))
-			}
-		}
-	}
-
-	field := data.NewField("Value", nil, values)
-	return data.NewFrame(row.Name, field)
-}
-
-func newDataFrame(name string, queryString string, timeField *data.Field, valueField *data.Field, visType data.VisType) *data.Frame {
-	frame := data.NewFrame(name, timeField, valueField)
-	frame.Meta = &data.FrameMeta{
-		ExecutedQueryString:    queryString,
-		PreferredVisualization: visType,
-	}
-
-	return frame
-}
-
-func formatFrameName(row models.Row, column string, query models.Query, frameName []byte) []byte {
-	if query.Alias == "" {
-		return buildFrameNameFromQuery(row, column, frameName, query.ResultFormat)
-	}
-	nameSegment := strings.Split(row.Name, ".")
-
-	result := legendFormat.ReplaceAllFunc([]byte(query.Alias), func(in []byte) []byte {
-		aliasFormat := string(in)
-		aliasFormat = strings.Replace(aliasFormat, "[[", "", 1)
-		aliasFormat = strings.Replace(aliasFormat, "]]", "", 1)
-		aliasFormat = strings.Replace(aliasFormat, "$", "", 1)
-
-		if aliasFormat == "m" || aliasFormat == "measurement" {
-			return []byte(row.Name)
-		}
-		if aliasFormat == "col" {
-			return []byte(column)
-		}
-
-		pos, err := strconv.Atoi(aliasFormat)
-		if err == nil && len(nameSegment) > pos {
-			return []byte(nameSegment[pos])
-		}
-
-		if !strings.HasPrefix(aliasFormat, "tag_") {
-			return in
-		}
-
-		tagKey := strings.Replace(aliasFormat, "tag_", "", 1)
-		tagValue, exist := row.Tags[tagKey]
-		if exist {
-			return []byte(tagValue)
-		}
-
-		return in
-	})
-
-	return result
-}
-
-func buildFrameNameFromQuery(row models.Row, column string, frameName []byte, resultFormat string) []byte {
-	if resultFormat != "table" {
-		frameName = append(frameName, row.Name...)
-		frameName = append(frameName, '.')
-	}
-	frameName = append(frameName, column...)
-
-	if len(row.Tags) > 0 {
-		frameName = append(frameName, ' ', '{', ' ')
-		first := true
-		for k, v := range row.Tags {
-			if !first {
-				frameName = append(frameName, ' ')
-			} else {
-				first = false
-			}
-			frameName = append(frameName, k...)
-			frameName = append(frameName, ':', ' ')
-			frameName = append(frameName, v...)
-		}
-
-		frameName = append(frameName, ' ', '}')
-	}
-
-	return frameName
-}
-
-func parseTimestamp(value any) (time.Time, error) {
-	timestampNumber, ok := value.(json.Number)
-	if !ok {
-		return time.Time{}, fmt.Errorf("timestamp-value has invalid type: %#v", value)
-	}
-	timestampInMilliseconds, err := timestampNumber.Int64()
-	if err != nil {
-		return time.Time{}, err
-	}
-
-	// currently in the code the influxdb-timestamps are requested with
-	// milliseconds-precision, meaning these values are milliseconds
-	t := time.UnixMilli(timestampInMilliseconds).UTC()
-
-	return t, nil
-}
-
-func typeof(values [][]any, colIndex int) string {
-	for _, value := range values {
-		if value != nil && value[colIndex] != nil {
-			return fmt.Sprintf("%T", value[colIndex])
-		}
-	}
-	return "null"
-}
-
-func parseNumber(value any) *float64 {
-	// NOTE: we use pointers-to-float64 because we need
-	// to represent null-json-values. they come for example
-	// when we do a group-by with fill(null)
-
-	if value == nil {
-		// this is what json-nulls become
-		return nil
-	}
-
-	number, ok := value.(json.Number)
-	if !ok {
-		// in the current implementation, errors become nils
-		return nil
-	}
-
-	fvalue, err := number.Float64()
-	if err != nil {
-		// in the current implementation, errors become nils
-		return nil
-	}
-
-	return &fvalue
-}
-
-func getVisType(resFormat string) data.VisType {
-	switch resFormat {
-	case "table":
-		return tableVisType
-	case "logs":
-		return logsVisType
-	default:
-		return graphVisType
-	}
-}
-
-func isTagValuesQuery(query models.Query) bool {
-	return strings.Contains(strings.ToLower(query.RawQuery), strings.ToLower("SHOW TAG VALUES"))
-}
-
-func isRetentionPolicyQuery(query models.Query) bool {
-	return strings.Contains(strings.ToLower(query.RawQuery), strings.ToLower("SHOW RETENTION POLICIES"))
-}
diff --git a/pkg/tsdb/influxdb/influxql/response_parser_bench_test.go b/pkg/tsdb/influxdb/influxql/response_parser_bench_test.go
deleted file mode 100644
index 9652ae4933c9e..0000000000000
--- a/pkg/tsdb/influxdb/influxql/response_parser_bench_test.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package influxql
-
-import (
-	_ "embed"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/tsdb/influxdb/models"
-)
-
-//go:embed testdata/response.json
-var testResponse string
-
-// go test -benchmem -run=^$ -memprofile memprofile.out -count=10 -bench ^BenchmarkParseJson$ github.com/grafana/grafana/pkg/tsdb/influxdb/influxql
-// go tool pprof -http=localhost:9999 memprofile.out
-func BenchmarkParseJson(b *testing.B) {
-	query := generateQuery(models.Query{})
-
-	b.ResetTimer()
-
-	for n := 0; n < b.N; n++ {
-		buf := strings.NewReader(testResponse)
-		result := parse(buf, 200, query)
-		require.NotNil(b, result.Frames)
-		require.NoError(b, result.Error)
-	}
-}
diff --git a/pkg/tsdb/influxdb/influxql/response_parser_test.go b/pkg/tsdb/influxdb/influxql/response_parser_test.go
deleted file mode 100644
index b089542f8eb78..0000000000000
--- a/pkg/tsdb/influxdb/influxql/response_parser_test.go
+++ /dev/null
@@ -1,873 +0,0 @@
-package influxql
-
-import (
-	"encoding/json"
-	"io"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana-plugin-sdk-go/data"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/tsdb/influxdb/models"
-	"github.com/grafana/grafana/pkg/util"
-)
-
-func prepare(text string) io.ReadCloser {
-	return io.NopCloser(strings.NewReader(text))
-}
-
-func generateQuery(query models.Query) *models.Query {
-	if query.RefID == "" {
-		query.RefID = "A"
-	}
-	if query.RawQuery == "" {
-		query.RawQuery = "Test raw query"
-	}
-
-	if query.ResultFormat == "" {
-		query.ResultFormat = "time_series"
-	}
-	return &query
-}
-
-func TestInfluxdbResponseParser(t *testing.T) {
-	t.Run("Influxdb response parser should handle invalid JSON", func(t *testing.T) {
-		response := `{ invalid }`
-
-		query := models.Query{}
-
-		result := ResponseParse(prepare(response), 200, generateQuery(query))
-
-		require.Nil(t, result.Frames)
-		require.Error(t, result.Error)
-	})
-
-	t.Run("Influxdb response parser should parse everything normally including nil bools and nil strings", func(t *testing.T) {
-		response := `
-		{
-			"results": [
-				{
-					"series": [
-						{
-							"name": "cpu",
-							"columns": ["time","mean","path","isActive"],
-							"tags": {"datacenter": "America"},
-							"values": [
-								[111,222,null,null],
-								[111,222,"/usr/path",false],
-								[111,null,"/usr/path",true]
-							]
-						}
-					]
-				}
-			]
-		}
-		`
-
-		query := models.Query{}
-		labels, err := data.LabelsFromString("datacenter=America")
-		require.Nil(t, err)
-
-		floatField := data.NewField("Value", labels, []*float64{
-			util.Pointer(222.0), util.Pointer(222.0), nil,
-		})
-		floatField.Config = &data.FieldConfig{DisplayNameFromDS: "cpu.mean { datacenter: America }"}
-		floatFrame := data.NewFrame("cpu.mean { datacenter: America }",
-			data.NewField("Time", nil,
-				[]time.Time{
-					time.Date(1970, 1, 1, 0, 0, 0, 111000000, time.UTC),
-					time.Date(1970, 1, 1, 0, 0, 0, 111000000, time.UTC),
-					time.Date(1970, 1, 1, 0, 0, 0, 111000000, time.UTC),
-				}),
-			floatField,
-		)
-		floatFrame.Meta = &data.FrameMeta{PreferredVisualization: graphVisType, ExecutedQueryString: "Test raw query"}
-
-		string_test := "/usr/path"
-		stringField := data.NewField("Value", labels, []*string{
-			nil, &string_test, &string_test,
-		})
-		stringField.Config = &data.FieldConfig{DisplayNameFromDS: "cpu.path { datacenter: America }"}
-		stringFrame := data.NewFrame("cpu.path { datacenter: America }",
-			data.NewField("Time", nil,
-				[]time.Time{
-					time.Date(1970, 1, 1, 0, 0, 0, 111000000, time.UTC),
-					time.Date(1970, 1, 1, 0, 0, 0, 111000000, time.UTC),
-					time.Date(1970, 1, 1, 0, 0, 0, 111000000, time.UTC),
-				}),
-			stringField,
-		)
-		stringFrame.Meta = &data.FrameMeta{PreferredVisualization: graphVisType, ExecutedQueryString: "Test raw query"}
-
-		bool_true := true
-		bool_false := false
-		boolField := data.NewField("Value", labels, []*bool{
-			nil, &bool_false, &bool_true,
-		})
-		boolField.Config = &data.FieldConfig{DisplayNameFromDS: "cpu.isActive { datacenter: America }"}
-		boolFrame := data.NewFrame("cpu.isActive { datacenter: America }",
-			data.NewField("Time", nil,
-				[]time.Time{
-					time.Date(1970, 1, 1, 0, 0, 0, 111000000, time.UTC),
-					time.Date(1970, 1, 1, 0, 0, 0, 111000000, time.UTC),
-					time.Date(1970, 1, 1, 0, 0, 0, 111000000, time.UTC),
-				}),
-			boolField,
-		)
-		boolFrame.Meta = &data.FrameMeta{PreferredVisualization: graphVisType, ExecutedQueryString: "Test raw query"}
-
-		result := ResponseParse(prepare(response), 200, generateQuery(query))
-
-		if diff := cmp.Diff(floatFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-			t.Errorf("Result mismatch (-want +got):\n%s", diff)
-		}
-		if diff := cmp.Diff(stringFrame, result.Frames[1], data.FrameTestCompareOptions()...); diff != "" {
-			t.Errorf("Result mismatch (-want +got):\n%s", diff)
-		}
-		if diff := cmp.Diff(boolFrame, result.Frames[2], data.FrameTestCompareOptions()...); diff != "" {
-			t.Errorf("Result mismatch (-want +got):\n%s", diff)
-		}
-	})
-
-	t.Run("Influxdb response parser should parse metricFindQueries normally", func(t *testing.T) {
-		response := `
-		{
-			"results": [
-				{
-					"series": [
-						{
-							"refId": "metricFindQuery",
-							"name": "cpu",
-							"values": [
-								["cpu"],
-								["disk"],
-								["logs"]
-							]
-						}
-					]
-				}
-			]
-		}
-		`
-
-		query := models.Query{RefID: "metricFindQuery"}
-		newField := data.NewField("Value", nil, []string{
-			"cpu", "disk", "logs",
-		})
-		testFrame := data.NewFrame("cpu",
-			newField,
-		)
-
-		result := ResponseParse(prepare(response), 200, generateQuery(query))
-
-		if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-			t.Errorf("Result mismatch (-want +got):\n%s", diff)
-		}
-	})
-
-	t.Run("Influxdb response parser should parse metricFindQueries->SHOW TAG VALUES normally", func(t *testing.T) {
-		response := `
-		{
-			"results": [
-				{
-					"series": [
-						{
-							"name": "cpu",
-							"values": [
-								["values", "cpu-total"],
-								["values", "cpu0"],
-								["values", "cpu1"]
-							]
-						}
-					]
-				}
-			]
-		}
-		`
-
-		query := models.Query{RawQuery: "SHOW TAG VALUES", RefID: "metricFindQuery"}
-		newField := data.NewField("Value", nil, []string{
-			"cpu-total", "cpu0", "cpu1",
-		})
-		testFrame := data.NewFrame("cpu",
-			newField,
-		)
-
-		result := ResponseParse(prepare(response), 200, generateQuery(query))
-
-		if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-			t.Errorf("Result mismatch (-want +got):\n%s", diff)
-		}
-	})
-
-	t.Run("Influxdb response parser populates the RawQuery in the response meta ExecutedQueryString", func(t *testing.T) {
-		response := `
-		{
-			"results": [
-				{
-					"series": [
-						{
-							"name": "cpu",
-							"columns": ["time","cpu"],
-							"values": [
-								["values", "cpu-total"],
-								["values", "cpu0"],
-								["values", "cpu1"]
-							]
-						}
-					]
-				}
-			]
-		}
-		`
-
-		query := models.Query{}
-		query.RawQuery = "Test raw query"
-		result := ResponseParse(prepare(response), 200, generateQuery(query))
-
-		assert.Equal(t, result.Frames[0].Meta.ExecutedQueryString, "Test raw query")
-	})
-
-	t.Run("Influxdb response parser with invalid value-format", func(t *testing.T) {
-		response := `
-		{
-			"results": [
-				{
-					"series": [
-						{
-							"name": "cpu",
-							"columns": ["time","mean"],
-							"values": [
-								[100,50],
-								[101,"hello"],
-								[102,52]
-							]
-						}
-					]
-				}
-			]
-		}
-		`
-
-		query := models.Query{}
-
-		newField := data.NewField("Value", nil, []*float64{
-			util.Pointer(50.0), nil, util.Pointer(52.0),
-		})
-		newField.Config = &data.FieldConfig{DisplayNameFromDS: "cpu.mean"}
-		testFrame := data.NewFrame("cpu.mean",
-			data.NewField("Time", nil,
-				[]time.Time{
-					time.Date(1970, 1, 1, 0, 0, 0, 100000000, time.UTC),
-					time.Date(1970, 1, 1, 0, 0, 0, 101000000, time.UTC),
-					time.Date(1970, 1, 1, 0, 0, 0, 102000000, time.UTC),
-				}),
-			newField,
-		)
-		testFrame.Meta = &data.FrameMeta{PreferredVisualization: graphVisType, ExecutedQueryString: "Test raw query"}
-
-		result := ResponseParse(prepare(response), 200, generateQuery(query))
-
-		if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-			t.Errorf("Result mismatch (-want +got):\n%s", diff)
-		}
-	})
-
-	t.Run("Influxdb response parser with invalid timestamp-format", func(t *testing.T) {
-		response := `
-		{
-			"results": [
-				{
-					"series": [
-						{
-							"name": "cpu",
-							"columns": ["time","mean"],
-							"values": [
-								[100,50],
-								["hello",51],
-								["hello","hello"],
-								[102,52]
-							]
-						}
-					]
-				}
-			]
-		}
-		`
-
-		query := models.Query{}
-
-		newField := data.NewField("Value", nil, []*float64{
-			util.Pointer(50.0), util.Pointer(52.0),
-		})
-		newField.Config = &data.FieldConfig{DisplayNameFromDS: "cpu.mean"}
-		testFrame := data.NewFrame("cpu.mean",
-			data.NewField("Time", nil,
-				[]time.Time{
-					time.Date(1970, 1, 1, 0, 0, 0, 100000000, time.UTC),
-					time.Date(1970, 1, 1, 0, 0, 0, 102000000, time.UTC),
-				}),
-			newField,
-		)
-		testFrame.Meta = &data.FrameMeta{PreferredVisualization: graphVisType, ExecutedQueryString: "Test raw query"}
-
-		result := ResponseParse(prepare(response), 200, generateQuery(query))
-
-		if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-			t.Errorf("Result mismatch (-want +got):\n%s", diff)
-		}
-	})
-
-	t.Run("Influxdb response parser with $measurement alias when multiple measurement in response", func(t *testing.T) {
-		response := `
-		{
-			"results": [
-				{
-					"series": [
-						{
-							"name": "cpu.upc",
-							"columns": ["time","mean"],
-							"tags": {
-								"datacenter": "America",
-								"dc.region.name": "Northeast",
-								"cluster-name":   "Cluster"
-							},
-							"values": [
-								[111,222]
-							]
-						},
-						{
-							"name": "logins.count",
-							"columns": ["time","mean"],
-							"tags": {
-								"datacenter": "America",
-								"dc.region.name": "Northeast",
-								"cluster-name":   "Cluster"
-							},
-							"values": [
-								[111,222]
-							]
-						}
-					]
-				}
-			]
-		}
-		`
-
-		query := models.Query{Alias: "alias $measurement"}
-		result := ResponseParse(prepare(response), 200, generateQuery(query))
-		assert.Equal(t, "alias cpu.upc", result.Frames[0].Name)
-		assert.Equal(t, "alias logins.count", result.Frames[1].Name)
-	})
-
-	t.Run("Influxdb response parser with alias", func(t *testing.T) {
-		response := `
-		{
-			"results": [
-				{
-					"series": [
-						{
-							"name": "cpu.upc",
-							"columns": ["time","mean","sum"],
-							"tags": {
-								"datacenter": "America",
-								"dc.region.name": "Northeast",
-								"cluster-name":   "Cluster",
-								"/cluster/name/": "Cluster/",
-								"@cluster@name@": "Cluster@"
-							},
-							"values": [
-								[111,222,333]
-							]
-						}
-					]
-				}
-			]
-		}
-		`
-
-		query := models.Query{Alias: "series alias"}
-		labels, err := data.LabelsFromString("/cluster/name/=Cluster/, @cluster@name@=Cluster@, cluster-name=Cluster, datacenter=America, dc.region.name=Northeast")
-		require.Nil(t, err)
-		newField := data.NewField("Value", labels, []*float64{
-			util.Pointer(222.0),
-		})
-		newField.Config = &data.FieldConfig{DisplayNameFromDS: "series alias"}
-		testFrame := data.NewFrame("series alias",
-			data.NewField("Time", nil,
-				[]time.Time{
-					time.Date(1970, 1, 1, 0, 0, 0, 111000000, time.UTC),
-				}),
-			newField,
-		)
-		testFrame.Meta = &data.FrameMeta{PreferredVisualization: graphVisType, ExecutedQueryString: "Test raw query"}
-		result := ResponseParse(prepare(response), 200, generateQuery(query))
-		t.Run("should parse aliases", func(t *testing.T) {
-			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-				t.Errorf("Result mismatch (-want +got):\n%s", diff)
-			}
-
-			query = models.Query{Alias: "alias $m $measurement", Measurement: "10m"}
-			result = ResponseParse(prepare(response), 200, generateQuery(query))
-
-			name := "alias cpu.upc cpu.upc"
-			testFrame.Name = name
-			testFrame.Fields[1].Config.DisplayNameFromDS = name
-			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-				t.Errorf("Result mismatch (-want +got):\n%s", diff)
-			}
-
-			query = models.Query{Alias: "alias $col", Measurement: "10m"}
-			result = ResponseParse(prepare(response), 200, generateQuery(query))
-			name = "alias mean"
-			testFrame.Name = name
-			testFrame.Fields[1].Config.DisplayNameFromDS = name
-			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-				t.Errorf("Result mismatch (-want +got):\n%s", diff)
-			}
-			name = "alias sum"
-			testFrame.Name = name
-			newField = data.NewField("Value", labels, []*float64{
-				util.Pointer(333.0),
-			})
-			testFrame.Fields[1] = newField
-			testFrame.Fields[1].Config = &data.FieldConfig{DisplayNameFromDS: name}
-			if diff := cmp.Diff(testFrame, result.Frames[1], data.FrameTestCompareOptions()...); diff != "" {
-				t.Errorf("Result mismatch (-want +got):\n%s", diff)
-			}
-
-			query = models.Query{Alias: "alias $tag_datacenter"}
-			result = ResponseParse(prepare(response), 200, generateQuery(query))
-			name = "alias America"
-			testFrame.Name = name
-			newField = data.NewField("Value", labels, []*float64{
-				util.Pointer(222.0),
-			})
-			testFrame.Fields[1] = newField
-			testFrame.Fields[1].Config = &data.FieldConfig{DisplayNameFromDS: name}
-			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-				t.Errorf("Result mismatch (-want +got):\n%s", diff)
-			}
-
-			query = models.Query{Alias: "alias $tag_datacenter/$tag_datacenter"}
-			result = ResponseParse(prepare(response), 200, generateQuery(query))
-			name = "alias America/America"
-			testFrame.Name = name
-			newField = data.NewField("Value", labels, []*float64{
-				util.Pointer(222.0),
-			})
-			testFrame.Fields[1] = newField
-			testFrame.Fields[1].Config = &data.FieldConfig{DisplayNameFromDS: name}
-			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-				t.Errorf("Result mismatch (-want +got):\n%s", diff)
-			}
-
-			query = models.Query{Alias: "alias [[col]]", Measurement: "10m"}
-			result = ResponseParse(prepare(response), 200, generateQuery(query))
-			name = "alias mean"
-			testFrame.Name = name
-			testFrame.Fields[1].Config.DisplayNameFromDS = name
-			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-				t.Errorf("Result mismatch (-want +got):\n%s", diff)
-			}
-
-			query = models.Query{Alias: "alias $0 $1 $2 $3 $4"}
-			result = ResponseParse(prepare(response), 200, generateQuery(query))
-			name = "alias cpu upc $2 $3 $4"
-			testFrame.Name = name
-			testFrame.Fields[1].Config.DisplayNameFromDS = name
-			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-				t.Errorf("Result mismatch (-want +got):\n%s", diff)
-			}
-
-			query = models.Query{Alias: "alias $0, $1 - $2 - $3, $4: something"}
-			result = ResponseParse(prepare(response), 200, generateQuery(query))
-			name = "alias cpu, upc - $2 - $3, $4: something"
-			testFrame.Name = name
-			testFrame.Fields[1].Config.DisplayNameFromDS = name
-			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-				t.Errorf("Result mismatch (-want +got):\n%s", diff)
-			}
-
-			query = models.Query{Alias: "alias $1"}
-			result = ResponseParse(prepare(response), 200, generateQuery(query))
-			name = "alias upc"
-			testFrame.Name = name
-			testFrame.Fields[1].Config.DisplayNameFromDS = name
-			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-				t.Errorf("Result mismatch (-want +got):\n%s", diff)
-			}
-
-			query = models.Query{Alias: "alias $5"}
-			result = ResponseParse(prepare(response), 200, generateQuery(query))
-			name = "alias $5"
-			testFrame.Name = name
-			testFrame.Fields[1].Config.DisplayNameFromDS = name
-			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-				t.Errorf("Result mismatch (-want +got):\n%s", diff)
-			}
-
-			query = models.Query{Alias: "series alias"}
-			result = ResponseParse(prepare(response), 200, generateQuery(query))
-			name = "series alias"
-			testFrame.Name = name
-			testFrame.Fields[1].Config.DisplayNameFromDS = name
-			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-				t.Errorf("Result mismatch (-want +got):\n%s", diff)
-			}
-
-			query = models.Query{Alias: "alias [[m]] [[measurement]]", Measurement: "10m"}
-			result = ResponseParse(prepare(response), 200, generateQuery(query))
-			name = "alias cpu.upc cpu.upc"
-			testFrame.Name = name
-			testFrame.Fields[1].Config.DisplayNameFromDS = name
-			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-				t.Errorf("Result mismatch (-want +got):\n%s", diff)
-			}
-
-			query = models.Query{Alias: "alias [[tag_datacenter]]"}
-			result = ResponseParse(prepare(response), 200, generateQuery(query))
-			name = "alias America"
-			testFrame.Name = name
-			testFrame.Fields[1].Config.DisplayNameFromDS = name
-			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-				t.Errorf("Result mismatch (-want +got):\n%s", diff)
-			}
-
-			query = models.Query{Alias: "alias [[tag_dc.region.name]]"}
-			result = ResponseParse(prepare(response), 200, generateQuery(query))
-			name = "alias Northeast"
-			testFrame.Name = name
-			testFrame.Fields[1].Config.DisplayNameFromDS = name
-			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-				t.Errorf("Result mismatch (-want +got):\n%s", diff)
-			}
-
-			query = models.Query{Alias: "alias [[tag_cluster-name]]"}
-			result = ResponseParse(prepare(response), 200, generateQuery(query))
-			name = "alias Cluster"
-			testFrame.Name = name
-			testFrame.Fields[1].Config.DisplayNameFromDS = name
-			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-				t.Errorf("Result mismatch (-want +got):\n%s", diff)
-			}
-
-			query = models.Query{Alias: "alias [[tag_/cluster/name/]]"}
-			result = ResponseParse(prepare(response), 200, generateQuery(query))
-			name = "alias Cluster/"
-			testFrame.Name = name
-			testFrame.Fields[1].Config.DisplayNameFromDS = name
-			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-				t.Errorf("Result mismatch (-want +got):\n%s", diff)
-			}
-
-			query = models.Query{Alias: "alias [[tag_@cluster@name@]]"}
-			result = ResponseParse(prepare(response), 200, generateQuery(query))
-			name = "alias Cluster@"
-			testFrame.Name = name
-			testFrame.Fields[1].Config.DisplayNameFromDS = name
-			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-				t.Errorf("Result mismatch (-want +got):\n%s", diff)
-			}
-		})
-		t.Run("shouldn't parse aliases", func(t *testing.T) {
-			query = models.Query{Alias: "alias words with no brackets"}
-			result = ResponseParse(prepare(response), 200, generateQuery(query))
-			name := "alias words with no brackets"
-			testFrame.Name = name
-			testFrame.Fields[1].Config.DisplayNameFromDS = name
-			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-				t.Errorf("Result mismatch (-want +got):\n%s", diff)
-			}
-
-			query = models.Query{Alias: "alias Test 1.5"}
-			result = ResponseParse(prepare(response), 200, generateQuery(query))
-			name = "alias Test 1.5"
-			testFrame.Name = name
-			testFrame.Fields[1].Config.DisplayNameFromDS = name
-			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-				t.Errorf("Result mismatch (-want +got):\n%s", diff)
-			}
-
-			query = models.Query{Alias: "alias Test -1"}
-			result = ResponseParse(prepare(response), 200, generateQuery(query))
-			name = "alias Test -1"
-			testFrame.Name = name
-			testFrame.Fields[1].Config.DisplayNameFromDS = name
-			if diff := cmp.Diff(testFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-				t.Errorf("Result mismatch (-want +got):\n%s", diff)
-			}
-		})
-	})
-
-	t.Run("Influxdb response parser with errors", func(t *testing.T) {
-		response := `
-		{
-			"results": [
-				{
-					"error": "query-timeout limit exceeded"
-				}
-			]
-		}
-		`
-
-		query := models.Query{}
-		labels, err := data.LabelsFromString("datacenter=America")
-		require.Nil(t, err)
-		newField := data.NewField("Value", labels, []*float64{
-			util.Pointer(222.0), util.Pointer(222.0), nil,
-		})
-		newField.Config = &data.FieldConfig{DisplayNameFromDS: "cpu.mean { datacenter: America }"}
-		testFrame := data.NewFrame("cpu.mean { datacenter: America }",
-			data.NewField("Time", nil,
-				[]time.Time{
-					time.Date(1970, 1, 1, 0, 0, 0, 111000000, time.UTC),
-					time.Date(1970, 1, 1, 0, 0, 0, 111000000, time.UTC),
-					time.Date(1970, 1, 1, 0, 0, 0, 111000000, time.UTC),
-				}),
-			newField,
-		)
-		testFrame.Meta = &data.FrameMeta{PreferredVisualization: graphVisType, ExecutedQueryString: "Test raw query"}
-		result := ResponseParse(prepare(response), 200, generateQuery(query))
-
-		require.EqualError(t, result.Error, "query-timeout limit exceeded")
-	})
-
-	t.Run("Influxdb response parser with top-level error", func(t *testing.T) {
-		response := `
-		{
-			"error": "error parsing query: found THING"
-		}
-		`
-
-		query := models.Query{}
-
-		result := ResponseParse(prepare(response), 200, generateQuery(query))
-
-		require.Nil(t, result.Frames)
-
-		require.EqualError(t, result.Error, "error parsing query: found THING")
-	})
-
-	t.Run("Influxdb response parser parseNumber nil", func(t *testing.T) {
-		value := parseNumber(nil)
-		require.Nil(t, value)
-	})
-
-	t.Run("Influxdb response parser parseNumber valid JSON.number", func(t *testing.T) {
-		value := parseNumber(json.Number("95.4"))
-		require.Equal(t, *value, 95.4)
-	})
-
-	t.Run("Influxdb response parser parseNumber invalid type", func(t *testing.T) {
-		value := parseNumber("95.4")
-		require.Nil(t, value)
-	})
-
-	t.Run("Influxdb response parser parseTimestamp valid JSON.number", func(t *testing.T) {
-		// currently we use milliseconds-precision with influxdb, so the test works with that.
-		// if we change this to for example nanoseconds-precision, the tests will have to change.
-		timestamp, err := parseTimestamp(json.Number("1609556645000"))
-		require.NoError(t, err)
-		require.Equal(t, timestamp.Format(time.RFC3339), "2021-01-02T03:04:05Z")
-	})
-
-	t.Run("Influxdb response parser parseNumber invalid type", func(t *testing.T) {
-		_, err := parseTimestamp("hello")
-		require.Error(t, err)
-	})
-}
-
-func TestResponseParser_Parse_RetentionPolicy(t *testing.T) {
-	t.Run("Influxdb response parser should parse metricFindQueries->SHOW RETENTION POLICIES normally", func(t *testing.T) {
-		response := `
-		{
-		  "results": [
-		    {
-		      "statement_id": 0,
-		      "series": [
-		        {
-		          "columns": [
-		            "name",
-		            "duration",
-		            "shardGroupDuration",
-		            "replicaN",
-		            "default"
-		          ],
-		          "values": [
-		            [
-		              "autogen",
-		              "0s",
-		              "168h0m0s",
-		              1,
-		              false
-		            ],
-		            [
-		              "bar",
-		              "24h0m0s",
-		              "1h0m0s",
-		              1,
-		              true
-		            ],
-		            [
-		              "5m_avg",
-		              "2400h0m0s",
-		              "24h0m0s",
-		              1,
-		              false
-		            ],
-		            [
-		              "1m_avg",
-		              "240h0m0s",
-		              "24h0m0s",
-		              1,
-		              false
-		            ]
-		          ]
-		        }
-		      ]
-		    }
-		  ]
-		}
-		`
-
-		query := models.Query{RefID: "metricFindQuery", RawQuery: "SHOW RETENTION POLICIES"}
-		policyFrame := data.NewFrame("",
-			data.NewField("Value", nil, []string{
-				"bar", "autogen", "5m_avg", "1m_avg",
-			}),
-		)
-
-		result := ResponseParse(prepare(response), 200, generateQuery(query))
-
-		if diff := cmp.Diff(policyFrame, result.Frames[0], data.FrameTestCompareOptions()...); diff != "" {
-			t.Errorf("Result mismatch (-want +got):\n%s", diff)
-		}
-	})
-}
-
-func TestResponseParser_Parse(t *testing.T) {
-	tests := []struct {
-		name      string
-		resFormat string
-		input     string
-		f         func(t *testing.T, got backend.DataResponse)
-	}{
-		{
-			name:      "Influxdb response parser with valid value when null values returned",
-			resFormat: "time_series",
-			input: `{ "results": [ { "series": [ {
-				"name": "cpu",
-				"columns": ["time","mean"],
-				"values": [
-					[100,null],
-					[101,null],
-					[102,52]
-				]
-			}]}]}`,
-			f: func(t *testing.T, got backend.DataResponse) {
-				newField := data.NewField("Value", nil, []*float64{nil, nil, util.Pointer(52.0)})
-				newField.Config = &data.FieldConfig{DisplayNameFromDS: "cpu.mean"}
-				testFrame := data.NewFrame("cpu.mean",
-					data.NewField("Time", nil,
-						[]time.Time{
-							time.Date(1970, 1, 1, 0, 0, 0, 100000000, time.UTC),
-							time.Date(1970, 1, 1, 0, 0, 0, 101000000, time.UTC),
-							time.Date(1970, 1, 1, 0, 0, 0, 102000000, time.UTC),
-						}),
-					newField,
-				)
-				testFrame.Meta = &data.FrameMeta{PreferredVisualization: graphVisType, ExecutedQueryString: "Test raw query"}
-				assert.Equal(t, testFrame, got.Frames[0])
-			},
-		},
-		{
-			name:      "Influxdb response parser with valid value when all values are null",
-			resFormat: "time_series",
-			input: `{ "results": [ { "series": [ {
-				"name": "cpu",
-				"columns": ["time","mean"],
-				"values": [
-					[100,null],
-					[101,null],
-					[102,null]
-				]
-			}]}]}`,
-			f: func(t *testing.T, got backend.DataResponse) {
-				newField := data.NewField("Value", nil, []*float64{nil, nil, nil})
-				newField.Config = &data.FieldConfig{DisplayNameFromDS: "cpu.mean"}
-				testFrame := data.NewFrame("cpu.mean",
-					data.NewField("Time", nil,
-						[]time.Time{
-							time.Date(1970, 1, 1, 0, 0, 0, 100000000, time.UTC),
-							time.Date(1970, 1, 1, 0, 0, 0, 101000000, time.UTC),
-							time.Date(1970, 1, 1, 0, 0, 0, 102000000, time.UTC),
-						}),
-					newField,
-				)
-				testFrame.Meta = &data.FrameMeta{PreferredVisualization: graphVisType, ExecutedQueryString: "Test raw query"}
-				assert.Equal(t, testFrame, got.Frames[0])
-			},
-		},
-		{
-			name:      "Influxdb response parser with table result",
-			resFormat: "table",
-			input: `{
-					  "results": [
-					    {
-					      "statement_id": 0,
-					      "series": [
-					        {
-					          "name": "Annotation",
-					          "columns": [
-					            "time",
-					            "domain",
-					            "type",
-					            "ASD",
-					            "details"
-					          ],
-					          "values": [
-					            [
-					              1697789142916,
-					              "AASD157",
-					              "fghg",
-					              null,
-					              "Something happened AtTime=2023-10-20T08:05:42.902036"
-					            ],
-					            [
-					              1697789142918,
-					              "HUY23",
-					              "val23",
-					              null,
-					              "Something else happened AtTime=2023-10-20T08:05:42.902036"
-					            ]
-					          ]
-					        }
-					      ]
-					    }
-					  ]
-					}`,
-			f: func(t *testing.T, got backend.DataResponse) {
-				assert.Equal(t, "domain", got.Frames[0].Name)
-				assert.Equal(t, "domain", got.Frames[0].Fields[1].Config.DisplayNameFromDS)
-				assert.Equal(t, "ASD", got.Frames[2].Name)
-				assert.Equal(t, "ASD", got.Frames[2].Fields[1].Config.DisplayNameFromDS)
-				assert.Equal(t, tableVisType, got.Frames[0].Meta.PreferredVisualization)
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := ResponseParse(prepare(tt.input), 200, generateQuery(models.Query{ResultFormat: tt.resFormat}))
-			require.NotNil(t, got)
-			if tt.f != nil {
-				tt.f(t, *got)
-			}
-		})
-	}
-}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/all_values_are_null.json b/pkg/tsdb/influxdb/influxql/testdata/all_values_are_null.json
new file mode 100644
index 0000000000000..a13c8dfcf2dfe
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/all_values_are_null.json
@@ -0,0 +1 @@
+{"results":[{"series":[{"name":"cpu","columns":["time","mean"],"values":[[100,null],[101,null],[102,null]]}]}]}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/all_values_are_null.table.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/all_values_are_null.table.golden.jsonc
new file mode 100644
index 0000000000000..b6016d94f20f7
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/all_values_are_null.table.golden.jsonc
@@ -0,0 +1,76 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "table",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu
+//  Dimensions: 2 Fields by 3 Rows
+//  +-----------------------------------+------------------+
+//  | Name: Time                        | Name: mean       |
+//  | Labels:                           | Labels:          |
+//  | Type: []time.Time                 | Type: []*float64 |
+//  +-----------------------------------+------------------+
+//  | 1970-01-01 00:00:00.1 +0000 UTC   | null             |
+//  | 1970-01-01 00:00:00.101 +0000 UTC | null             |
+//  | 1970-01-01 00:00:00.102 +0000 UTC | null             |
+//  +-----------------------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "table",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "mean",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "mean"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            100,
+            101,
+            102
+          ],
+          [
+            null,
+            null,
+            null
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/all_values_are_null.time_series.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/all_values_are_null.time_series.golden.jsonc
new file mode 100644
index 0000000000000..4de6fc6aae7f6
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/all_values_are_null.time_series.golden.jsonc
@@ -0,0 +1,76 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "graph",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu.mean
+//  Dimensions: 2 Fields by 3 Rows
+//  +-----------------------------------+------------------+
+//  | Name: Time                        | Name: Value      |
+//  | Labels:                           | Labels:          |
+//  | Type: []time.Time                 | Type: []*float64 |
+//  +-----------------------------------+------------------+
+//  | 1970-01-01 00:00:00.1 +0000 UTC   | null             |
+//  | 1970-01-01 00:00:00.101 +0000 UTC | null             |
+//  | 1970-01-01 00:00:00.102 +0000 UTC | null             |
+//  +-----------------------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu.mean",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "graph",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "cpu.mean"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            100,
+            101,
+            102
+          ],
+          [
+            null,
+            null,
+            null
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/cardinality.json b/pkg/tsdb/influxdb/influxql/testdata/cardinality.json
new file mode 100644
index 0000000000000..142f3cdec85bc
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/cardinality.json
@@ -0,0 +1 @@
+{"results":[{"statement_id":0,"series":[{"name":"cpu","columns":["count"],"values":[[1]]},{"name":"disk","columns":["count"],"values":[[1]]},{"name":"diskio","columns":["count"],"values":[[1]]},{"name":"kernel","columns":["count"],"values":[[1]]},{"name":"logs","columns":["count"],"values":[[1]]},{"name":"mem","columns":["count"],"values":[[1]]},{"name":"processes","columns":["count"],"values":[[1]]},{"name":"swap","columns":["count"],"values":[[1]]},{"name":"system","columns":["count"],"values":[[1]]}]}]}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/cardinality.table.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/cardinality.table.golden.jsonc
new file mode 100644
index 0000000000000..fa5e42a0a94f7
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/cardinality.table.golden.jsonc
@@ -0,0 +1,76 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "table",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu
+//  Dimensions: 1 Fields by 9 Rows
+//  +------------------+
+//  | Name: count      |
+//  | Labels:          |
+//  | Type: []*float64 |
+//  +------------------+
+//  | 1                |
+//  | 1                |
+//  | 1                |
+//  | 1                |
+//  | 1                |
+//  | 1                |
+//  | 1                |
+//  | 1                |
+//  | 1                |
+//  +------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "table",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "count",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "count"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1,
+            1,
+            1,
+            1,
+            1,
+            1,
+            1,
+            1,
+            1
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/cardinality.time_series.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/cardinality.time_series.golden.jsonc
new file mode 100644
index 0000000000000..5719d64a6fc13
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/cardinality.time_series.golden.jsonc
@@ -0,0 +1,337 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "graph",
+//      "executedQueryString": "SHOW TAG VALUES CARDINALITY with key = \"host\""
+//  }
+//  Name: cpu
+//  Dimensions: 1 Fields by 1 Rows
+//  +-----------------+
+//  | Name: Value     |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  | 1               |
+//  +-----------------+
+//  
+//  
+//  
+//  Frame[1] 
+//  Name: disk
+//  Dimensions: 1 Fields by 1 Rows
+//  +-----------------+
+//  | Name: Value     |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  | 1               |
+//  +-----------------+
+//  
+//  
+//  
+//  Frame[2] 
+//  Name: diskio
+//  Dimensions: 1 Fields by 1 Rows
+//  +-----------------+
+//  | Name: Value     |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  | 1               |
+//  +-----------------+
+//  
+//  
+//  
+//  Frame[3] 
+//  Name: kernel
+//  Dimensions: 1 Fields by 1 Rows
+//  +-----------------+
+//  | Name: Value     |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  | 1               |
+//  +-----------------+
+//  
+//  
+//  
+//  Frame[4] 
+//  Name: logs
+//  Dimensions: 1 Fields by 1 Rows
+//  +-----------------+
+//  | Name: Value     |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  | 1               |
+//  +-----------------+
+//  
+//  
+//  
+//  Frame[5] 
+//  Name: mem
+//  Dimensions: 1 Fields by 1 Rows
+//  +-----------------+
+//  | Name: Value     |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  | 1               |
+//  +-----------------+
+//  
+//  
+//  
+//  Frame[6] 
+//  Name: processes
+//  Dimensions: 1 Fields by 1 Rows
+//  +-----------------+
+//  | Name: Value     |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  | 1               |
+//  +-----------------+
+//  
+//  
+//  
+//  Frame[7] 
+//  Name: swap
+//  Dimensions: 1 Fields by 1 Rows
+//  +-----------------+
+//  | Name: Value     |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  | 1               |
+//  +-----------------+
+//  
+//  
+//  
+//  Frame[8] 
+//  Name: system
+//  Dimensions: 1 Fields by 1 Rows
+//  +-----------------+
+//  | Name: Value     |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  | 1               |
+//  +-----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "graph",
+          "executedQueryString": "SHOW TAG VALUES CARDINALITY with key = \"host\""
+        },
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "1"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "disk",
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "1"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "diskio",
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "1"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "kernel",
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "1"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "logs",
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "1"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "mem",
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "1"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "processes",
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "1"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "swap",
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "1"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "system",
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "1"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/empty_response.json b/pkg/tsdb/influxdb/influxql/testdata/empty_response.json
new file mode 100644
index 0000000000000..040088ac8d77d
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/empty_response.json
@@ -0,0 +1 @@
+{"results": [{"statement_id": 0}]}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/empty_response.table.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/empty_response.table.golden.jsonc
new file mode 100644
index 0000000000000..38ec455084c5a
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/empty_response.table.golden.jsonc
@@ -0,0 +1,6 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": []
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/empty_response.time_series.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/empty_response.time_series.golden.jsonc
new file mode 100644
index 0000000000000..38ec455084c5a
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/empty_response.time_series.golden.jsonc
@@ -0,0 +1,6 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": []
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/error_on_top_level_response.json b/pkg/tsdb/influxdb/influxql/testdata/error_on_top_level_response.json
new file mode 100644
index 0000000000000..e384265a89a71
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/error_on_top_level_response.json
@@ -0,0 +1 @@
+{"error": "error parsing query: found THING"}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/error_response.json b/pkg/tsdb/influxdb/influxql/testdata/error_response.json
new file mode 100644
index 0000000000000..f19b2633c414f
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/error_response.json
@@ -0,0 +1 @@
+{"results":[{"error":"query-timeout limit exceeded"}]}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/influx_select_all_from_cpu.json b/pkg/tsdb/influxdb/influxql/testdata/influx_select_all_from_cpu.json
new file mode 100644
index 0000000000000..93ae26f83cbc0
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/influx_select_all_from_cpu.json
@@ -0,0 +1 @@
+{"results":[{"statement_id":0,"series":[{"name":"cpu","columns":["time","mean_usage_guest","mean_usage_nice","mean_usage_idle"],"values":[[1697984400000,1111,1112,1113],[1697984700000,2221,2222,2223],[1697985000000,3331,3332,3333],[1697985300000,4441,4442,4443]]}]}]}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/influx_select_all_from_cpu.table.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/influx_select_all_from_cpu.table.golden.jsonc
new file mode 100644
index 0000000000000..34c4ee82f62c8
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/influx_select_all_from_cpu.table.golden.jsonc
@@ -0,0 +1,113 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "table",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu
+//  Dimensions: 4 Fields by 4 Rows
+//  +-------------------------------+------------------------+-----------------------+-----------------------+
+//  | Name: Time                    | Name: mean_usage_guest | Name: mean_usage_nice | Name: mean_usage_idle |
+//  | Labels:                       | Labels:                | Labels:               | Labels:               |
+//  | Type: []time.Time             | Type: []*float64       | Type: []*float64      | Type: []*float64      |
+//  +-------------------------------+------------------------+-----------------------+-----------------------+
+//  | 2023-10-22 14:20:00 +0000 UTC | 1111                   | 1112                  | 1113                  |
+//  | 2023-10-22 14:25:00 +0000 UTC | 2221                   | 2222                  | 2223                  |
+//  | 2023-10-22 14:30:00 +0000 UTC | 3331                   | 3332                  | 3333                  |
+//  | 2023-10-22 14:35:00 +0000 UTC | 4441                   | 4442                  | 4443                  |
+//  +-------------------------------+------------------------+-----------------------+-----------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "table",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "mean_usage_guest",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "mean_usage_guest"
+            }
+          },
+          {
+            "name": "mean_usage_nice",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "mean_usage_nice"
+            }
+          },
+          {
+            "name": "mean_usage_idle",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "mean_usage_idle"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1697984400000,
+            1697984700000,
+            1697985000000,
+            1697985300000
+          ],
+          [
+            1111,
+            2221,
+            3331,
+            4441
+          ],
+          [
+            1112,
+            2222,
+            3332,
+            4442
+          ],
+          [
+            1113,
+            2223,
+            3333,
+            4443
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/influx_select_all_from_cpu.time_series.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/influx_select_all_from_cpu.time_series.golden.jsonc
new file mode 100644
index 0000000000000..87705aac1ec57
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/influx_select_all_from_cpu.time_series.golden.jsonc
@@ -0,0 +1,193 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "graph",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu.mean_usage_guest
+//  Dimensions: 2 Fields by 4 Rows
+//  +-------------------------------+------------------+
+//  | Name: Time                    | Name: Value      |
+//  | Labels:                       | Labels:          |
+//  | Type: []time.Time             | Type: []*float64 |
+//  +-------------------------------+------------------+
+//  | 2023-10-22 14:20:00 +0000 UTC | 1111             |
+//  | 2023-10-22 14:25:00 +0000 UTC | 2221             |
+//  | 2023-10-22 14:30:00 +0000 UTC | 3331             |
+//  | 2023-10-22 14:35:00 +0000 UTC | 4441             |
+//  +-------------------------------+------------------+
+//  
+//  
+//  
+//  Frame[1] 
+//  Name: cpu.mean_usage_nice
+//  Dimensions: 2 Fields by 4 Rows
+//  +-------------------------------+------------------+
+//  | Name: Time                    | Name: Value      |
+//  | Labels:                       | Labels:          |
+//  | Type: []time.Time             | Type: []*float64 |
+//  +-------------------------------+------------------+
+//  | 2023-10-22 14:20:00 +0000 UTC | 1112             |
+//  | 2023-10-22 14:25:00 +0000 UTC | 2222             |
+//  | 2023-10-22 14:30:00 +0000 UTC | 3332             |
+//  | 2023-10-22 14:35:00 +0000 UTC | 4442             |
+//  +-------------------------------+------------------+
+//  
+//  
+//  
+//  Frame[2] 
+//  Name: cpu.mean_usage_idle
+//  Dimensions: 2 Fields by 4 Rows
+//  +-------------------------------+------------------+
+//  | Name: Time                    | Name: Value      |
+//  | Labels:                       | Labels:          |
+//  | Type: []time.Time             | Type: []*float64 |
+//  +-------------------------------+------------------+
+//  | 2023-10-22 14:20:00 +0000 UTC | 1113             |
+//  | 2023-10-22 14:25:00 +0000 UTC | 2223             |
+//  | 2023-10-22 14:30:00 +0000 UTC | 3333             |
+//  | 2023-10-22 14:35:00 +0000 UTC | 4443             |
+//  +-------------------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu.mean_usage_guest",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "graph",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "cpu.mean_usage_guest"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1697984400000,
+            1697984700000,
+            1697985000000,
+            1697985300000
+          ],
+          [
+            1111,
+            2221,
+            3331,
+            4441
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.mean_usage_nice",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "cpu.mean_usage_nice"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1697984400000,
+            1697984700000,
+            1697985000000,
+            1697985300000
+          ],
+          [
+            1112,
+            2222,
+            3332,
+            4442
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.mean_usage_idle",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "cpu.mean_usage_idle"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1697984400000,
+            1697984700000,
+            1697985000000,
+            1697985300000
+          ],
+          [
+            1113,
+            2223,
+            3333,
+            4443
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/invalid_timestamp_format.json b/pkg/tsdb/influxdb/influxql/testdata/invalid_timestamp_format.json
new file mode 100644
index 0000000000000..38d1b7fb85520
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/invalid_timestamp_format.json
@@ -0,0 +1 @@
+{"results":[{"series":[{"name":"cpu","columns":["time","mean"],"values":[[100,50],["hello",51],["hello","hello"],[102,52]]}]}]}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/invalid_value_format.json b/pkg/tsdb/influxdb/influxql/testdata/invalid_value_format.json
new file mode 100644
index 0000000000000..55079cc04cc64
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/invalid_value_format.json
@@ -0,0 +1 @@
+{"results":[{"series":[{"name":"cpu","columns":["time","mean"],"values":[[100,50],[101,"hello"],[102,52]]}]}]}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/invalid_value_format.table.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/invalid_value_format.table.golden.jsonc
new file mode 100644
index 0000000000000..0250b0d067e10
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/invalid_value_format.table.golden.jsonc
@@ -0,0 +1,76 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "table",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu
+//  Dimensions: 2 Fields by 3 Rows
+//  +-----------------------------------+------------------+
+//  | Name: Time                        | Name: mean       |
+//  | Labels:                           | Labels:          |
+//  | Type: []time.Time                 | Type: []*float64 |
+//  +-----------------------------------+------------------+
+//  | 1970-01-01 00:00:00.1 +0000 UTC   | 50               |
+//  | 1970-01-01 00:00:00.101 +0000 UTC | null             |
+//  | 1970-01-01 00:00:00.102 +0000 UTC | 52               |
+//  +-----------------------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "table",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "mean",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "mean"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            100,
+            101,
+            102
+          ],
+          [
+            50,
+            null,
+            52
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/invalid_value_format.time_series.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/invalid_value_format.time_series.golden.jsonc
new file mode 100644
index 0000000000000..8e9e2bb1b3992
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/invalid_value_format.time_series.golden.jsonc
@@ -0,0 +1,76 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "graph",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu.mean
+//  Dimensions: 2 Fields by 3 Rows
+//  +-----------------------------------+------------------+
+//  | Name: Time                        | Name: Value      |
+//  | Labels:                           | Labels:          |
+//  | Type: []time.Time                 | Type: []*float64 |
+//  +-----------------------------------+------------------+
+//  | 1970-01-01 00:00:00.1 +0000 UTC   | 50               |
+//  | 1970-01-01 00:00:00.101 +0000 UTC | null             |
+//  | 1970-01-01 00:00:00.102 +0000 UTC | 52               |
+//  +-----------------------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu.mean",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "graph",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "cpu.mean"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            100,
+            101,
+            102
+          ],
+          [
+            50,
+            null,
+            52
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/many_columns.json b/pkg/tsdb/influxdb/influxql/testdata/many_columns.json
new file mode 100644
index 0000000000000..70140980ca59a
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/many_columns.json
@@ -0,0 +1 @@
+{"results":[{"statement_id":0,"series":[{"name":"series_name","tags":{"series_tag_2":"3167640"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,"589051IR",1678734134503,"",16.726718841369227,null,null,53,null,48.72,null,null,null,null,"BYOD",null,null]]},{"name":"series_name","tags":{"series_tag_2":"0"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,"tertggdfs",1678734188679,"",23.432988173518233,null,null,64,null,70.92,null,null,null,null,null,null,null]]},{"name":"series_name","tags":{"series_tag_2":"0"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,null,null,"Unknown",null,null,null,null,null,null,null,null,null,null,null,null,null]]},{"name":"series_name","tags":{"series_tag_2":"2249908"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,"ASDWQ234",1678734167565,"",10.772527844239201,null,null,25,null,58.33,null,null,null,null,null,null,null]]},{"name":"series_name","tags":{"series_tag_2":"3415374"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,"123SDQWE",1678734222642,"ADSADS",40.61198862661182,null,null,33,null,51.41,null,null,null,null,"SCCM",null,null]]},{"name":"series_name","tags":{"series_tag_2":"0"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,null,null,"Unknown",null,null,null,null,null,null,null,null,null,null,null,null,null]]},{"name":"series_name","tags":{"series_tag_2":"2191438"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,"SDF32R",1678734212872,"",15.267734587695077,null,null,43,null,58.43,null,null,null,null,null,null,null]]},{"name":"series_name","tags":{"series_tag_2":"0"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,null,null,"Unknown",null,null,null,null,null,null,null,null,null,null,null,null,null]]},{"name":"series_name","tags":{"series_tag_2":"0"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,null,null,"Unknown",null,null,null,null,null,null,null,null,null,null,null,null,null]]}]}]}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/many_columns.table.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/many_columns.table.golden.jsonc
new file mode 100644
index 0000000000000..93d86938b4098
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/many_columns.table.golden.jsonc
@@ -0,0 +1,446 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "table",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: series_name
+//  Dimensions: 18 Fields by 9 Rows
+//  +-----------------------------------+--------------------+------------------+--------------------+-----------------+--------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+-----------------+------------------+------------------+
+//  | Name: Time                        | Name: series_tag_2 | Name: col_1_name | Name: timestamp    | Name: c_name    | Name: mem_used     | Name: dbytes     | Name: ubytes     | Name: dused      | Name: jitter     | Name: free       | Name: late       | Name: core       | Name: ploss      | Name: idletime   | Name: sol       | Name: isp        | Name: vpn        |
+//  | Labels:                           | Labels:            | Labels:          | Labels:            | Labels:         | Labels:            | Labels:          | Labels:          | Labels:          | Labels:          | Labels:          | Labels:          | Labels:          | Labels:          | Labels:          | Labels:         | Labels:          | Labels:          |
+//  | Type: []time.Time                 | Type: []*string    | Type: []*string  | Type: []*float64   | Type: []*string | Type: []*float64   | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*string | Type: []*float64 | Type: []*float64 |
+//  +-----------------------------------+--------------------+------------------+--------------------+-----------------+--------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+-----------------+------------------+------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 3167640            | 589051IR         | 1.678734134503e+12 |                 | 16.726718841369227 | null             | null             | 53               | null             | 48.72            | null             | null             | null             | null             | BYOD            | null             | null             |
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 0                  | tertggdfs        | 1.678734188679e+12 |                 | 23.432988173518233 | null             | null             | 64               | null             | 70.92            | null             | null             | null             | null             | null            | null             | null             |
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 0                  | null             | null               | Unknown         | null               | null             | null             | null             | null             | null             | null             | null             | null             | null             | null            | null             | null             |
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 2249908            | ASDWQ234         | 1.678734167565e+12 |                 | 10.772527844239201 | null             | null             | 25               | null             | 58.33            | null             | null             | null             | null             | null            | null             | null             |
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 3415374            | 123SDQWE         | 1.678734222642e+12 | ADSADS          | 40.61198862661182  | null             | null             | 33               | null             | 51.41            | null             | null             | null             | null             | SCCM            | null             | null             |
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 0                  | null             | null               | Unknown         | null               | null             | null             | null             | null             | null             | null             | null             | null             | null             | null            | null             | null             |
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 2191438            | SDF32R           | 1.678734212872e+12 |                 | 15.267734587695077 | null             | null             | 43               | null             | 58.43            | null             | null             | null             | null             | null            | null             | null             |
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 0                  | null             | null               | Unknown         | null               | null             | null             | null             | null             | null             | null             | null             | null             | null             | null            | null             | null             |
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 0                  | null             | null               | Unknown         | null               | null             | null             | null             | null             | null             | null             | null             | null             | null             | null            | null             | null             |
+//  +-----------------------------------+--------------------+------------------+--------------------+-----------------+--------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+-----------------+------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "series_name",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "table",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "series_tag_2",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "series_tag_2"
+            }
+          },
+          {
+            "name": "col_1_name",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "col_1_name"
+            }
+          },
+          {
+            "name": "timestamp",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "timestamp"
+            }
+          },
+          {
+            "name": "c_name",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "c_name"
+            }
+          },
+          {
+            "name": "mem_used",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "mem_used"
+            }
+          },
+          {
+            "name": "dbytes",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "dbytes"
+            }
+          },
+          {
+            "name": "ubytes",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "ubytes"
+            }
+          },
+          {
+            "name": "dused",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "dused"
+            }
+          },
+          {
+            "name": "jitter",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "jitter"
+            }
+          },
+          {
+            "name": "free",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "free"
+            }
+          },
+          {
+            "name": "late",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "late"
+            }
+          },
+          {
+            "name": "core",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "core"
+            }
+          },
+          {
+            "name": "ploss",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "ploss"
+            }
+          },
+          {
+            "name": "idletime",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "idletime"
+            }
+          },
+          {
+            "name": "sol",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "sol"
+            }
+          },
+          {
+            "name": "isp",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "isp"
+            }
+          },
+          {
+            "name": "vpn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "vpn"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474,
+            1678723623474,
+            1678723623474,
+            1678723623474,
+            1678723623474,
+            1678723623474,
+            1678723623474,
+            1678723623474,
+            1678723623474
+          ],
+          [
+            "3167640",
+            "0",
+            "0",
+            "2249908",
+            "3415374",
+            "0",
+            "2191438",
+            "0",
+            "0"
+          ],
+          [
+            "589051IR",
+            "tertggdfs",
+            null,
+            "ASDWQ234",
+            "123SDQWE",
+            null,
+            "SDF32R",
+            null,
+            null
+          ],
+          [
+            1678734134503,
+            1678734188679,
+            null,
+            1678734167565,
+            1678734222642,
+            null,
+            1678734212872,
+            null,
+            null
+          ],
+          [
+            "",
+            "",
+            "Unknown",
+            "",
+            "ADSADS",
+            "Unknown",
+            "",
+            "Unknown",
+            "Unknown"
+          ],
+          [
+            16.726718841369227,
+            23.432988173518233,
+            null,
+            10.772527844239201,
+            40.61198862661182,
+            null,
+            15.267734587695077,
+            null,
+            null
+          ],
+          [
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null
+          ],
+          [
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null
+          ],
+          [
+            53,
+            64,
+            null,
+            25,
+            33,
+            null,
+            43,
+            null,
+            null
+          ],
+          [
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null
+          ],
+          [
+            48.72,
+            70.92,
+            null,
+            58.33,
+            51.41,
+            null,
+            58.43,
+            null,
+            null
+          ],
+          [
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null
+          ],
+          [
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null
+          ],
+          [
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null
+          ],
+          [
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null
+          ],
+          [
+            "BYOD",
+            null,
+            null,
+            null,
+            "SCCM",
+            null,
+            null,
+            null,
+            null
+          ],
+          [
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null
+          ],
+          [
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/many_columns.time_series.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/many_columns.time_series.golden.jsonc
new file mode 100644
index 0000000000000..ac6861e093a01
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/many_columns.time_series.golden.jsonc
@@ -0,0 +1,7366 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "graph",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: series_name.col_1_name { series_tag_2: 3167640 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3167640 |
+//  | Type: []time.Time                 | Type: []*string              |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 589051IR                     |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[1] 
+//  Name: series_name.timestamp { series_tag_2: 3167640 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3167640 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 1.678734134503e+12           |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[2] 
+//  Name: series_name.c_name { series_tag_2: 3167640 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3167640 |
+//  | Type: []time.Time                 | Type: []*string              |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC |                              |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[3] 
+//  Name: series_name.mem_used { series_tag_2: 3167640 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3167640 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 16.726718841369227           |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[4] 
+//  Name: series_name.dbytes { series_tag_2: 3167640 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3167640 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[5] 
+//  Name: series_name.ubytes { series_tag_2: 3167640 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3167640 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[6] 
+//  Name: series_name.dused { series_tag_2: 3167640 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3167640 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 53                           |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[7] 
+//  Name: series_name.jitter { series_tag_2: 3167640 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3167640 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[8] 
+//  Name: series_name.free { series_tag_2: 3167640 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3167640 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 48.72                        |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[9] 
+//  Name: series_name.late { series_tag_2: 3167640 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3167640 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[10] 
+//  Name: series_name.core { series_tag_2: 3167640 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3167640 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[11] 
+//  Name: series_name.ploss { series_tag_2: 3167640 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3167640 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[12] 
+//  Name: series_name.idletime { series_tag_2: 3167640 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3167640 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[13] 
+//  Name: series_name.sol { series_tag_2: 3167640 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3167640 |
+//  | Type: []time.Time                 | Type: []*string              |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | BYOD                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[14] 
+//  Name: series_name.isp { series_tag_2: 3167640 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3167640 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[15] 
+//  Name: series_name.vpn { series_tag_2: 3167640 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3167640 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[16] 
+//  Name: series_name.col_1_name { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*string        |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | tertggdfs              |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[17] 
+//  Name: series_name.timestamp { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 1.678734188679e+12     |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[18] 
+//  Name: series_name.c_name { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*string        |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC |                        |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[19] 
+//  Name: series_name.mem_used { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 23.432988173518233     |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[20] 
+//  Name: series_name.dbytes { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[21] 
+//  Name: series_name.ubytes { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[22] 
+//  Name: series_name.dused { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 64                     |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[23] 
+//  Name: series_name.jitter { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[24] 
+//  Name: series_name.free { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 70.92                  |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[25] 
+//  Name: series_name.late { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[26] 
+//  Name: series_name.core { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[27] 
+//  Name: series_name.ploss { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[28] 
+//  Name: series_name.idletime { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[29] 
+//  Name: series_name.sol { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[30] 
+//  Name: series_name.isp { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[31] 
+//  Name: series_name.vpn { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[32] 
+//  Name: series_name.col_1_name { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[33] 
+//  Name: series_name.timestamp { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[34] 
+//  Name: series_name.c_name { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*string        |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | Unknown                |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[35] 
+//  Name: series_name.mem_used { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[36] 
+//  Name: series_name.dbytes { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[37] 
+//  Name: series_name.ubytes { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[38] 
+//  Name: series_name.dused { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[39] 
+//  Name: series_name.jitter { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[40] 
+//  Name: series_name.free { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[41] 
+//  Name: series_name.late { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[42] 
+//  Name: series_name.core { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[43] 
+//  Name: series_name.ploss { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[44] 
+//  Name: series_name.idletime { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[45] 
+//  Name: series_name.sol { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[46] 
+//  Name: series_name.isp { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[47] 
+//  Name: series_name.vpn { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[48] 
+//  Name: series_name.col_1_name { series_tag_2: 2249908 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2249908 |
+//  | Type: []time.Time                 | Type: []*string              |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | ASDWQ234                     |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[49] 
+//  Name: series_name.timestamp { series_tag_2: 2249908 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2249908 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 1.678734167565e+12           |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[50] 
+//  Name: series_name.c_name { series_tag_2: 2249908 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2249908 |
+//  | Type: []time.Time                 | Type: []*string              |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC |                              |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[51] 
+//  Name: series_name.mem_used { series_tag_2: 2249908 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2249908 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 10.772527844239201           |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[52] 
+//  Name: series_name.dbytes { series_tag_2: 2249908 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2249908 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[53] 
+//  Name: series_name.ubytes { series_tag_2: 2249908 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2249908 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[54] 
+//  Name: series_name.dused { series_tag_2: 2249908 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2249908 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 25                           |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[55] 
+//  Name: series_name.jitter { series_tag_2: 2249908 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2249908 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[56] 
+//  Name: series_name.free { series_tag_2: 2249908 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2249908 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 58.33                        |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[57] 
+//  Name: series_name.late { series_tag_2: 2249908 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2249908 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[58] 
+//  Name: series_name.core { series_tag_2: 2249908 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2249908 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[59] 
+//  Name: series_name.ploss { series_tag_2: 2249908 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2249908 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[60] 
+//  Name: series_name.idletime { series_tag_2: 2249908 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2249908 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[61] 
+//  Name: series_name.sol { series_tag_2: 2249908 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2249908 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[62] 
+//  Name: series_name.isp { series_tag_2: 2249908 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2249908 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[63] 
+//  Name: series_name.vpn { series_tag_2: 2249908 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2249908 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[64] 
+//  Name: series_name.col_1_name { series_tag_2: 3415374 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3415374 |
+//  | Type: []time.Time                 | Type: []*string              |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 123SDQWE                     |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[65] 
+//  Name: series_name.timestamp { series_tag_2: 3415374 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3415374 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 1.678734222642e+12           |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[66] 
+//  Name: series_name.c_name { series_tag_2: 3415374 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3415374 |
+//  | Type: []time.Time                 | Type: []*string              |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | ADSADS                       |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[67] 
+//  Name: series_name.mem_used { series_tag_2: 3415374 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3415374 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 40.61198862661182            |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[68] 
+//  Name: series_name.dbytes { series_tag_2: 3415374 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3415374 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[69] 
+//  Name: series_name.ubytes { series_tag_2: 3415374 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3415374 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[70] 
+//  Name: series_name.dused { series_tag_2: 3415374 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3415374 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 33                           |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[71] 
+//  Name: series_name.jitter { series_tag_2: 3415374 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3415374 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[72] 
+//  Name: series_name.free { series_tag_2: 3415374 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3415374 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 51.41                        |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[73] 
+//  Name: series_name.late { series_tag_2: 3415374 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3415374 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[74] 
+//  Name: series_name.core { series_tag_2: 3415374 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3415374 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[75] 
+//  Name: series_name.ploss { series_tag_2: 3415374 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3415374 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[76] 
+//  Name: series_name.idletime { series_tag_2: 3415374 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3415374 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[77] 
+//  Name: series_name.sol { series_tag_2: 3415374 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3415374 |
+//  | Type: []time.Time                 | Type: []*string              |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | SCCM                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[78] 
+//  Name: series_name.isp { series_tag_2: 3415374 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3415374 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[79] 
+//  Name: series_name.vpn { series_tag_2: 3415374 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=3415374 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[80] 
+//  Name: series_name.col_1_name { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[81] 
+//  Name: series_name.timestamp { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[82] 
+//  Name: series_name.c_name { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*string        |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | Unknown                |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[83] 
+//  Name: series_name.mem_used { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[84] 
+//  Name: series_name.dbytes { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[85] 
+//  Name: series_name.ubytes { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[86] 
+//  Name: series_name.dused { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[87] 
+//  Name: series_name.jitter { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[88] 
+//  Name: series_name.free { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[89] 
+//  Name: series_name.late { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[90] 
+//  Name: series_name.core { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[91] 
+//  Name: series_name.ploss { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[92] 
+//  Name: series_name.idletime { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[93] 
+//  Name: series_name.sol { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[94] 
+//  Name: series_name.isp { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[95] 
+//  Name: series_name.vpn { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[96] 
+//  Name: series_name.col_1_name { series_tag_2: 2191438 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2191438 |
+//  | Type: []time.Time                 | Type: []*string              |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | SDF32R                       |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[97] 
+//  Name: series_name.timestamp { series_tag_2: 2191438 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2191438 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 1.678734212872e+12           |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[98] 
+//  Name: series_name.c_name { series_tag_2: 2191438 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2191438 |
+//  | Type: []time.Time                 | Type: []*string              |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC |                              |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[99] 
+//  Name: series_name.mem_used { series_tag_2: 2191438 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2191438 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 15.267734587695077           |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[100] 
+//  Name: series_name.dbytes { series_tag_2: 2191438 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2191438 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[101] 
+//  Name: series_name.ubytes { series_tag_2: 2191438 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2191438 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[102] 
+//  Name: series_name.dused { series_tag_2: 2191438 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2191438 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 43                           |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[103] 
+//  Name: series_name.jitter { series_tag_2: 2191438 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2191438 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[104] 
+//  Name: series_name.free { series_tag_2: 2191438 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2191438 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 58.43                        |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[105] 
+//  Name: series_name.late { series_tag_2: 2191438 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2191438 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[106] 
+//  Name: series_name.core { series_tag_2: 2191438 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2191438 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[107] 
+//  Name: series_name.ploss { series_tag_2: 2191438 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2191438 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[108] 
+//  Name: series_name.idletime { series_tag_2: 2191438 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2191438 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[109] 
+//  Name: series_name.sol { series_tag_2: 2191438 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2191438 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[110] 
+//  Name: series_name.isp { series_tag_2: 2191438 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2191438 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[111] 
+//  Name: series_name.vpn { series_tag_2: 2191438 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------------+
+//  | Name: Time                        | Name: Value                  |
+//  | Labels:                           | Labels: series_tag_2=2191438 |
+//  | Type: []time.Time                 | Type: []*float64             |
+//  +-----------------------------------+------------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                         |
+//  +-----------------------------------+------------------------------+
+//  
+//  
+//  
+//  Frame[112] 
+//  Name: series_name.col_1_name { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[113] 
+//  Name: series_name.timestamp { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[114] 
+//  Name: series_name.c_name { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*string        |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | Unknown                |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[115] 
+//  Name: series_name.mem_used { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[116] 
+//  Name: series_name.dbytes { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[117] 
+//  Name: series_name.ubytes { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[118] 
+//  Name: series_name.dused { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[119] 
+//  Name: series_name.jitter { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[120] 
+//  Name: series_name.free { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[121] 
+//  Name: series_name.late { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[122] 
+//  Name: series_name.core { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[123] 
+//  Name: series_name.ploss { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[124] 
+//  Name: series_name.idletime { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[125] 
+//  Name: series_name.sol { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[126] 
+//  Name: series_name.isp { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[127] 
+//  Name: series_name.vpn { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[128] 
+//  Name: series_name.col_1_name { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[129] 
+//  Name: series_name.timestamp { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[130] 
+//  Name: series_name.c_name { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*string        |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | Unknown                |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[131] 
+//  Name: series_name.mem_used { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[132] 
+//  Name: series_name.dbytes { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[133] 
+//  Name: series_name.ubytes { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[134] 
+//  Name: series_name.dused { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[135] 
+//  Name: series_name.jitter { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[136] 
+//  Name: series_name.free { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[137] 
+//  Name: series_name.late { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[138] 
+//  Name: series_name.core { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[139] 
+//  Name: series_name.ploss { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[140] 
+//  Name: series_name.idletime { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[141] 
+//  Name: series_name.sol { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[142] 
+//  Name: series_name.isp { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  
+//  Frame[143] 
+//  Name: series_name.vpn { series_tag_2: 0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------------+
+//  | Name: Time                        | Name: Value            |
+//  | Labels:                           | Labels: series_tag_2=0 |
+//  | Type: []time.Time                 | Type: []*float64       |
+//  +-----------------------------------+------------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null                   |
+//  +-----------------------------------+------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "series_name.col_1_name { series_tag_2: 3167640 }",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "graph",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3167640"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.col_1_name { series_tag_2: 3167640 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            "589051IR"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.timestamp { series_tag_2: 3167640 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3167640"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.timestamp { series_tag_2: 3167640 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            1678734134503
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.c_name { series_tag_2: 3167640 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3167640"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.c_name { series_tag_2: 3167640 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            ""
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.mem_used { series_tag_2: 3167640 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3167640"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.mem_used { series_tag_2: 3167640 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            16.726718841369227
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.dbytes { series_tag_2: 3167640 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3167640"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.dbytes { series_tag_2: 3167640 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.ubytes { series_tag_2: 3167640 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3167640"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.ubytes { series_tag_2: 3167640 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.dused { series_tag_2: 3167640 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3167640"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.dused { series_tag_2: 3167640 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            53
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.jitter { series_tag_2: 3167640 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3167640"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.jitter { series_tag_2: 3167640 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.free { series_tag_2: 3167640 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3167640"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.free { series_tag_2: 3167640 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            48.72
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.late { series_tag_2: 3167640 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3167640"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.late { series_tag_2: 3167640 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.core { series_tag_2: 3167640 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3167640"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.core { series_tag_2: 3167640 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.ploss { series_tag_2: 3167640 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3167640"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.ploss { series_tag_2: 3167640 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.idletime { series_tag_2: 3167640 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3167640"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.idletime { series_tag_2: 3167640 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.sol { series_tag_2: 3167640 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3167640"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.sol { series_tag_2: 3167640 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            "BYOD"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.isp { series_tag_2: 3167640 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3167640"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.isp { series_tag_2: 3167640 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.vpn { series_tag_2: 3167640 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3167640"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.vpn { series_tag_2: 3167640 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.col_1_name { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.col_1_name { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            "tertggdfs"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.timestamp { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.timestamp { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            1678734188679
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.c_name { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.c_name { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            ""
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.mem_used { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.mem_used { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            23.432988173518233
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.dbytes { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.dbytes { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.ubytes { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.ubytes { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.dused { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.dused { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            64
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.jitter { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.jitter { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.free { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.free { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            70.92
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.late { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.late { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.core { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.core { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.ploss { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.ploss { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.idletime { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.idletime { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.sol { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.sol { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.isp { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.isp { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.vpn { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.vpn { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.col_1_name { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.col_1_name { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.timestamp { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.timestamp { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.c_name { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.c_name { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            "Unknown"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.mem_used { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.mem_used { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.dbytes { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.dbytes { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.ubytes { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.ubytes { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.dused { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.dused { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.jitter { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.jitter { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.free { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.free { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.late { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.late { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.core { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.core { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.ploss { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.ploss { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.idletime { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.idletime { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.sol { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.sol { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.isp { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.isp { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.vpn { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.vpn { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.col_1_name { series_tag_2: 2249908 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2249908"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.col_1_name { series_tag_2: 2249908 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            "ASDWQ234"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.timestamp { series_tag_2: 2249908 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2249908"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.timestamp { series_tag_2: 2249908 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            1678734167565
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.c_name { series_tag_2: 2249908 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2249908"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.c_name { series_tag_2: 2249908 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            ""
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.mem_used { series_tag_2: 2249908 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2249908"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.mem_used { series_tag_2: 2249908 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            10.772527844239201
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.dbytes { series_tag_2: 2249908 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2249908"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.dbytes { series_tag_2: 2249908 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.ubytes { series_tag_2: 2249908 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2249908"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.ubytes { series_tag_2: 2249908 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.dused { series_tag_2: 2249908 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2249908"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.dused { series_tag_2: 2249908 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            25
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.jitter { series_tag_2: 2249908 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2249908"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.jitter { series_tag_2: 2249908 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.free { series_tag_2: 2249908 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2249908"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.free { series_tag_2: 2249908 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            58.33
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.late { series_tag_2: 2249908 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2249908"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.late { series_tag_2: 2249908 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.core { series_tag_2: 2249908 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2249908"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.core { series_tag_2: 2249908 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.ploss { series_tag_2: 2249908 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2249908"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.ploss { series_tag_2: 2249908 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.idletime { series_tag_2: 2249908 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2249908"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.idletime { series_tag_2: 2249908 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.sol { series_tag_2: 2249908 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2249908"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.sol { series_tag_2: 2249908 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.isp { series_tag_2: 2249908 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2249908"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.isp { series_tag_2: 2249908 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.vpn { series_tag_2: 2249908 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2249908"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.vpn { series_tag_2: 2249908 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.col_1_name { series_tag_2: 3415374 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3415374"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.col_1_name { series_tag_2: 3415374 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            "123SDQWE"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.timestamp { series_tag_2: 3415374 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3415374"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.timestamp { series_tag_2: 3415374 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            1678734222642
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.c_name { series_tag_2: 3415374 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3415374"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.c_name { series_tag_2: 3415374 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            "ADSADS"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.mem_used { series_tag_2: 3415374 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3415374"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.mem_used { series_tag_2: 3415374 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            40.61198862661182
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.dbytes { series_tag_2: 3415374 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3415374"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.dbytes { series_tag_2: 3415374 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.ubytes { series_tag_2: 3415374 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3415374"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.ubytes { series_tag_2: 3415374 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.dused { series_tag_2: 3415374 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3415374"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.dused { series_tag_2: 3415374 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            33
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.jitter { series_tag_2: 3415374 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3415374"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.jitter { series_tag_2: 3415374 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.free { series_tag_2: 3415374 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3415374"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.free { series_tag_2: 3415374 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            51.41
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.late { series_tag_2: 3415374 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3415374"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.late { series_tag_2: 3415374 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.core { series_tag_2: 3415374 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3415374"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.core { series_tag_2: 3415374 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.ploss { series_tag_2: 3415374 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3415374"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.ploss { series_tag_2: 3415374 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.idletime { series_tag_2: 3415374 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3415374"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.idletime { series_tag_2: 3415374 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.sol { series_tag_2: 3415374 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3415374"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.sol { series_tag_2: 3415374 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            "SCCM"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.isp { series_tag_2: 3415374 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3415374"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.isp { series_tag_2: 3415374 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.vpn { series_tag_2: 3415374 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "3415374"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.vpn { series_tag_2: 3415374 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.col_1_name { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.col_1_name { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.timestamp { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.timestamp { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.c_name { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.c_name { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            "Unknown"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.mem_used { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.mem_used { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.dbytes { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.dbytes { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.ubytes { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.ubytes { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.dused { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.dused { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.jitter { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.jitter { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.free { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.free { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.late { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.late { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.core { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.core { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.ploss { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.ploss { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.idletime { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.idletime { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.sol { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.sol { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.isp { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.isp { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.vpn { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.vpn { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.col_1_name { series_tag_2: 2191438 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2191438"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.col_1_name { series_tag_2: 2191438 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            "SDF32R"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.timestamp { series_tag_2: 2191438 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2191438"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.timestamp { series_tag_2: 2191438 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            1678734212872
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.c_name { series_tag_2: 2191438 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2191438"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.c_name { series_tag_2: 2191438 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            ""
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.mem_used { series_tag_2: 2191438 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2191438"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.mem_used { series_tag_2: 2191438 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            15.267734587695077
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.dbytes { series_tag_2: 2191438 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2191438"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.dbytes { series_tag_2: 2191438 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.ubytes { series_tag_2: 2191438 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2191438"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.ubytes { series_tag_2: 2191438 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.dused { series_tag_2: 2191438 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2191438"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.dused { series_tag_2: 2191438 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            43
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.jitter { series_tag_2: 2191438 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2191438"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.jitter { series_tag_2: 2191438 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.free { series_tag_2: 2191438 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2191438"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.free { series_tag_2: 2191438 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            58.43
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.late { series_tag_2: 2191438 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2191438"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.late { series_tag_2: 2191438 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.core { series_tag_2: 2191438 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2191438"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.core { series_tag_2: 2191438 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.ploss { series_tag_2: 2191438 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2191438"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.ploss { series_tag_2: 2191438 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.idletime { series_tag_2: 2191438 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2191438"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.idletime { series_tag_2: 2191438 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.sol { series_tag_2: 2191438 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2191438"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.sol { series_tag_2: 2191438 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.isp { series_tag_2: 2191438 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2191438"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.isp { series_tag_2: 2191438 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.vpn { series_tag_2: 2191438 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "2191438"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.vpn { series_tag_2: 2191438 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.col_1_name { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.col_1_name { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.timestamp { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.timestamp { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.c_name { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.c_name { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            "Unknown"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.mem_used { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.mem_used { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.dbytes { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.dbytes { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.ubytes { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.ubytes { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.dused { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.dused { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.jitter { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.jitter { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.free { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.free { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.late { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.late { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.core { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.core { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.ploss { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.ploss { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.idletime { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.idletime { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.sol { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.sol { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.isp { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.isp { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.vpn { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.vpn { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.col_1_name { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.col_1_name { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.timestamp { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.timestamp { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.c_name { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.c_name { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            "Unknown"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.mem_used { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.mem_used { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.dbytes { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.dbytes { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.ubytes { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.ubytes { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.dused { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.dused { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.jitter { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.jitter { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.free { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.free { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.late { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.late { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.core { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.core { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.ploss { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.ploss { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.idletime { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.idletime { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.sol { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.sol { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.isp { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.isp { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.vpn { series_tag_2: 0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "series_tag_2": "0"
+            },
+            "config": {
+              "displayNameFromDS": "series_name.vpn { series_tag_2: 0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/metric_find_queries.json b/pkg/tsdb/influxdb/influxql/testdata/metric_find_queries.json
new file mode 100644
index 0000000000000..0c4a9dbf7ff9f
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/metric_find_queries.json
@@ -0,0 +1 @@
+{"results":[{"statement_id":0,"series":[{"name":"measurements","columns":["name"],"values":[["cpu"],["disk"],["diskio"],["kernel"],["logs"],["mem"],["myMeasurement"],["processes"],["swap"],["system"]]}]}]}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/metric_find_queries.table.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/metric_find_queries.table.golden.jsonc
new file mode 100644
index 0000000000000..2881d7a039c8b
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/metric_find_queries.table.golden.jsonc
@@ -0,0 +1,78 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "table",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: measurements
+//  Dimensions: 1 Fields by 10 Rows
+//  +-----------------+
+//  | Name: name      |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  | cpu             |
+//  | disk            |
+//  | diskio          |
+//  | kernel          |
+//  | logs            |
+//  | mem             |
+//  | myMeasurement   |
+//  | processes       |
+//  | swap            |
+//  | system          |
+//  +-----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "measurements",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "table",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "name",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "name"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "cpu",
+            "disk",
+            "diskio",
+            "kernel",
+            "logs",
+            "mem",
+            "myMeasurement",
+            "processes",
+            "swap",
+            "system"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/metric_find_queries.time_series.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/metric_find_queries.time_series.golden.jsonc
new file mode 100644
index 0000000000000..100f21e55f3fe
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/metric_find_queries.time_series.golden.jsonc
@@ -0,0 +1,75 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "graph",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: measurements
+//  Dimensions: 1 Fields by 10 Rows
+//  +-----------------+
+//  | Name: Value     |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  | cpu             |
+//  | disk            |
+//  | diskio          |
+//  | kernel          |
+//  | logs            |
+//  | mem             |
+//  | myMeasurement   |
+//  | processes       |
+//  | swap            |
+//  | system          |
+//  +-----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "measurements",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "graph",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "cpu",
+            "disk",
+            "diskio",
+            "kernel",
+            "logs",
+            "mem",
+            "myMeasurement",
+            "processes",
+            "swap",
+            "system"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/multiple_measurements.json b/pkg/tsdb/influxdb/influxql/testdata/multiple_measurements.json
new file mode 100644
index 0000000000000..aaeff6cbad18d
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/multiple_measurements.json
@@ -0,0 +1 @@
+{"results":[{"series":[{"name":"cpu.upc","columns":["time","mean"],"tags":{"datacenter":"America"},"values":[[111,222]]},{"name":"logins.count","columns":["time","mean"],"tags":{"datacenter":"America"},"values":[[111,222]]}]}]}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/multiple_measurements.table.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/multiple_measurements.table.golden.jsonc
new file mode 100644
index 0000000000000..1b5d737d0a492
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/multiple_measurements.table.golden.jsonc
@@ -0,0 +1,88 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "table",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu.upc
+//  Dimensions: 3 Fields by 2 Rows
+//  +-----------------------------------+------------------+------------------+
+//  | Name: Time                        | Name: datacenter | Name: mean       |
+//  | Labels:                           | Labels:          | Labels:          |
+//  | Type: []time.Time                 | Type: []*string  | Type: []*float64 |
+//  +-----------------------------------+------------------+------------------+
+//  | 1970-01-01 00:00:00.111 +0000 UTC | America          | 222              |
+//  | 1970-01-01 00:00:00.111 +0000 UTC | America          | 222              |
+//  +-----------------------------------+------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu.upc",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "table",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "datacenter",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "datacenter"
+            }
+          },
+          {
+            "name": "mean",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "mean"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            111,
+            111
+          ],
+          [
+            "America",
+            "America"
+          ],
+          [
+            222,
+            222
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/multiple_measurements.time_series.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/multiple_measurements.time_series.golden.jsonc
new file mode 100644
index 0000000000000..60bffcdb56799
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/multiple_measurements.time_series.golden.jsonc
@@ -0,0 +1,124 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "graph",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu.upc.mean { datacenter: America }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+----------------------------+
+//  | Name: Time                        | Name: Value                |
+//  | Labels:                           | Labels: datacenter=America |
+//  | Type: []time.Time                 | Type: []*float64           |
+//  +-----------------------------------+----------------------------+
+//  | 1970-01-01 00:00:00.111 +0000 UTC | 222                        |
+//  +-----------------------------------+----------------------------+
+//  
+//  
+//  
+//  Frame[1] 
+//  Name: logins.count.mean { datacenter: America }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+----------------------------+
+//  | Name: Time                        | Name: Value                |
+//  | Labels:                           | Labels: datacenter=America |
+//  | Type: []time.Time                 | Type: []*float64           |
+//  +-----------------------------------+----------------------------+
+//  | 1970-01-01 00:00:00.111 +0000 UTC | 222                        |
+//  +-----------------------------------+----------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu.upc.mean { datacenter: America }",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "graph",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "datacenter": "America"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.upc.mean { datacenter: America }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            111
+          ],
+          [
+            222
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "logins.count.mean { datacenter: America }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "datacenter": "America"
+            },
+            "config": {
+              "displayNameFromDS": "logins.count.mean { datacenter: America }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            111
+          ],
+          [
+            222
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/multiple_series_with_tags.json b/pkg/tsdb/influxdb/influxql/testdata/multiple_series_with_tags.json
new file mode 100644
index 0000000000000..5fc89cc29298d
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/multiple_series_with_tags.json
@@ -0,0 +1 @@
+{"results":[{"statement_id":0,"series":[{"name":"cpu","tags":{"cpu":"cpu-total"},"columns":["time","mean"],"values":[[1700046000000,99.06919189833442],[1700047200000,99.13105510262923],[1700048400000,98.99236330721192],[1700049600000,98.80510091380069]]},{"name":"cpu","tags":{"cpu":"cpu0"},"columns":["time","mean"],"values":[[1700046000000,99.01372119142576],[1700047200000,99.00430308480553],[1700048400000,98.9737996641964],[1700049600000,98.79638916754935]]},{"name":"cpu","tags":{"cpu":"cpu1"},"columns":["time","mean"],"values":[[1700046000000,99.04949983158023],[1700047200000,99.06989461231551],[1700048400000,98.97954813782476],[1700049600000,98.49246231161365]]},{"name":"cpu","tags":{"cpu":"cpu2"},"columns":["time","mean"],"values":[[1700046000000,99.11296419686643],[1700047200000,99.01817278917116],[1700048400000,98.96847021232013],[1700049600000,98.192771084406]]},{"name":"cpu","tags":{"cpu":"cpu3"},"columns":["time","mean"],"values":[[1700046000000,99.0742704326151],[1700047200000,99.17835628293322],[1700048400000,98.98968994907334],[1700049600000,98.69215291745849]]}]}]}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/multiple_series_with_tags.table.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/multiple_series_with_tags.table.golden.jsonc
new file mode 100644
index 0000000000000..afddbe2476f34
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/multiple_series_with_tags.table.golden.jsonc
@@ -0,0 +1,150 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "table",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu
+//  Dimensions: 3 Fields by 20 Rows
+//  +-------------------------------+-----------------+-------------------+
+//  | Name: Time                    | Name: cpu       | Name: mean        |
+//  | Labels:                       | Labels:         | Labels:           |
+//  | Type: []time.Time             | Type: []*string | Type: []*float64  |
+//  +-------------------------------+-----------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | cpu-total       | 99.06919189833442 |
+//  | 2023-11-15 11:20:00 +0000 UTC | cpu-total       | 99.13105510262923 |
+//  | 2023-11-15 11:40:00 +0000 UTC | cpu-total       | 98.99236330721192 |
+//  | 2023-11-15 12:00:00 +0000 UTC | cpu-total       | 98.80510091380069 |
+//  | 2023-11-15 11:00:00 +0000 UTC | cpu0            | 99.01372119142576 |
+//  | 2023-11-15 11:20:00 +0000 UTC | cpu0            | 99.00430308480553 |
+//  | 2023-11-15 11:40:00 +0000 UTC | cpu0            | 98.9737996641964  |
+//  | 2023-11-15 12:00:00 +0000 UTC | cpu0            | 98.79638916754935 |
+//  | 2023-11-15 11:00:00 +0000 UTC | cpu1            | 99.04949983158023 |
+//  | ...                           | ...             | ...               |
+//  +-------------------------------+-----------------+-------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "table",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "cpu",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "cpu"
+            }
+          },
+          {
+            "name": "mean",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "mean"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000,
+            1700047200000,
+            1700048400000,
+            1700049600000,
+            1700046000000,
+            1700047200000,
+            1700048400000,
+            1700049600000,
+            1700046000000,
+            1700047200000,
+            1700048400000,
+            1700049600000,
+            1700046000000,
+            1700047200000,
+            1700048400000,
+            1700049600000,
+            1700046000000,
+            1700047200000,
+            1700048400000,
+            1700049600000
+          ],
+          [
+            "cpu-total",
+            "cpu-total",
+            "cpu-total",
+            "cpu-total",
+            "cpu0",
+            "cpu0",
+            "cpu0",
+            "cpu0",
+            "cpu1",
+            "cpu1",
+            "cpu1",
+            "cpu1",
+            "cpu2",
+            "cpu2",
+            "cpu2",
+            "cpu2",
+            "cpu3",
+            "cpu3",
+            "cpu3",
+            "cpu3"
+          ],
+          [
+            99.06919189833442,
+            99.13105510262923,
+            98.99236330721192,
+            98.80510091380069,
+            99.01372119142576,
+            99.00430308480553,
+            98.9737996641964,
+            98.79638916754935,
+            99.04949983158023,
+            99.06989461231551,
+            98.97954813782476,
+            98.49246231161365,
+            99.11296419686643,
+            99.01817278917116,
+            98.96847021232013,
+            98.192771084406,
+            99.0742704326151,
+            99.17835628293322,
+            98.98968994907334,
+            98.69215291745849
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/multiple_series_with_tags.time_series.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/multiple_series_with_tags.time_series.golden.jsonc
new file mode 100644
index 0000000000000..7bb77ddcc2490
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/multiple_series_with_tags.time_series.golden.jsonc
@@ -0,0 +1,322 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "graph",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu.mean { cpu: cpu-total }
+//  Dimensions: 2 Fields by 4 Rows
+//  +-------------------------------+-----------------------+
+//  | Name: Time                    | Name: Value           |
+//  | Labels:                       | Labels: cpu=cpu-total |
+//  | Type: []time.Time             | Type: []*float64      |
+//  +-------------------------------+-----------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.06919189833442     |
+//  | 2023-11-15 11:20:00 +0000 UTC | 99.13105510262923     |
+//  | 2023-11-15 11:40:00 +0000 UTC | 98.99236330721192     |
+//  | 2023-11-15 12:00:00 +0000 UTC | 98.80510091380069     |
+//  +-------------------------------+-----------------------+
+//  
+//  
+//  
+//  Frame[1] 
+//  Name: cpu.mean { cpu: cpu0 }
+//  Dimensions: 2 Fields by 4 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu0  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.01372119142576 |
+//  | 2023-11-15 11:20:00 +0000 UTC | 99.00430308480553 |
+//  | 2023-11-15 11:40:00 +0000 UTC | 98.9737996641964  |
+//  | 2023-11-15 12:00:00 +0000 UTC | 98.79638916754935 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[2] 
+//  Name: cpu.mean { cpu: cpu1 }
+//  Dimensions: 2 Fields by 4 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu1  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.04949983158023 |
+//  | 2023-11-15 11:20:00 +0000 UTC | 99.06989461231551 |
+//  | 2023-11-15 11:40:00 +0000 UTC | 98.97954813782476 |
+//  | 2023-11-15 12:00:00 +0000 UTC | 98.49246231161365 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[3] 
+//  Name: cpu.mean { cpu: cpu2 }
+//  Dimensions: 2 Fields by 4 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu2  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.11296419686643 |
+//  | 2023-11-15 11:20:00 +0000 UTC | 99.01817278917116 |
+//  | 2023-11-15 11:40:00 +0000 UTC | 98.96847021232013 |
+//  | 2023-11-15 12:00:00 +0000 UTC | 98.192771084406   |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[4] 
+//  Name: cpu.mean { cpu: cpu3 }
+//  Dimensions: 2 Fields by 4 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu3  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.0742704326151  |
+//  | 2023-11-15 11:20:00 +0000 UTC | 99.17835628293322 |
+//  | 2023-11-15 11:40:00 +0000 UTC | 98.98968994907334 |
+//  | 2023-11-15 12:00:00 +0000 UTC | 98.69215291745849 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu.mean { cpu: cpu-total }",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "graph",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu-total"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.mean { cpu: cpu-total }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000,
+            1700047200000,
+            1700048400000,
+            1700049600000
+          ],
+          [
+            99.06919189833442,
+            99.13105510262923,
+            98.99236330721192,
+            98.80510091380069
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.mean { cpu: cpu0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu0"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.mean { cpu: cpu0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000,
+            1700047200000,
+            1700048400000,
+            1700049600000
+          ],
+          [
+            99.01372119142576,
+            99.00430308480553,
+            98.9737996641964,
+            98.79638916754935
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.mean { cpu: cpu1 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu1"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.mean { cpu: cpu1 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000,
+            1700047200000,
+            1700048400000,
+            1700049600000
+          ],
+          [
+            99.04949983158023,
+            99.06989461231551,
+            98.97954813782476,
+            98.49246231161365
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.mean { cpu: cpu2 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu2"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.mean { cpu: cpu2 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000,
+            1700047200000,
+            1700048400000,
+            1700049600000
+          ],
+          [
+            99.11296419686643,
+            99.01817278917116,
+            98.96847021232013,
+            98.192771084406
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.mean { cpu: cpu3 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu3"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.mean { cpu: cpu3 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000,
+            1700047200000,
+            1700048400000,
+            1700049600000
+          ],
+          [
+            99.0742704326151,
+            99.17835628293322,
+            98.98968994907334,
+            98.69215291745849
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/multiple_series_with_tags_and_multiple_columns.json b/pkg/tsdb/influxdb/influxql/testdata/multiple_series_with_tags_and_multiple_columns.json
new file mode 100644
index 0000000000000..804ecae5ea932
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/multiple_series_with_tags_and_multiple_columns.json
@@ -0,0 +1 @@
+{"results":[{"statement_id":0,"series":[{"name":"cpu","tags":{"cpu":"cpu-total"},"columns":["time","mean","min","p90","p95","max"],"values":[[1700046000000,99.06348570053983,97.3214285712978,99.2066680055868,99.24812030075188,99.31809065366402]]},{"name":"cpu","tags":{"cpu":"cpu0"},"columns":["time","mean","min","p90","p95","max"],"values":[[1700046000000,98.99671817733766,96.65991902847126,99.29364278499536,99.29718875523953,99.59839357421622]]},{"name":"cpu","tags":{"cpu":"cpu1"},"columns":["time","mean","min","p90","p95","max"],"values":[[1700046000000,99.03148357927465,96.67673715996412,99.39698492464545,99.39759036146867,99.59798994966731]]},{"name":"cpu","tags":{"cpu":"cpu2"},"columns":["time","mean","min","p90","p95","max"],"values":[[1700046000000,99.03087433486812,96.03658536600605,99.29859719431953,99.39759036146867,99.59879638908582]]},{"name":"cpu","tags":{"cpu":"cpu3"},"columns":["time","mean","min","p90","p95","max"],"values":[[1700046000000,99.0796957137731,97.37903225797402,99.39698492464723,99.39879759521435,99.4984954865762]]},{"name":"cpu","tags":{"cpu":"cpu4"},"columns":["time","mean","min","p90","p95","max"],"values":[[1700046000000,99.09573460946685,97.57330637016123,99.39759036146867,99.49698189117252,99.59839357450608]]},{"name":"cpu","tags":{"cpu":"cpu5"},"columns":["time","mean","min","p90","p95","max"],"values":[[1700046000000,99.0690883079725,96.65991902847126,99.39698492464545,99.39819458377468,99.59798994995865]]},{"name":"cpu","tags":{"cpu":"cpu6"},"columns":["time","mean","min","p90","p95","max"],"values":[[1700046000000,99.06475215715605,97.37108190081956,99.39698492464545,99.39879759521259,99.69879518073434]]},{"name":"cpu","tags":{"cpu":"cpu7"},"columns":["time","mean","min","p90","p95","max"],"values":[[1700046000000,99.06204005079694,97.7596741344093,99.39637826964127,99.39759036147042,99.59879638908698]]},{"name":"cpu","tags":{"cpu":"cpu8"},"columns":["time","mean","min","p90","p95","max"],"values":[[1700046000000,99.0999818796052,96.56565656568982,99.39698492464723,99.39819458377468,99.59758551299777]]},{"name":"cpu","tags":{"cpu":"cpu9"},"columns":["time","mean","min","p90","p95","max"],"values":[[1700046000000,99.10477313534511,96.8463886063268,99.39759036146867,99.39819458377468,99.59839357421622]]}]}]}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/multiple_series_with_tags_and_multiple_columns.table.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/multiple_series_with_tags_and_multiple_columns.table.golden.jsonc
new file mode 100644
index 0000000000000..d3c2a642f597a
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/multiple_series_with_tags_and_multiple_columns.table.golden.jsonc
@@ -0,0 +1,219 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "table",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu
+//  Dimensions: 7 Fields by 11 Rows
+//  +-------------------------------+-----------------+-------------------+-------------------+-------------------+-------------------+-------------------+
+//  | Name: Time                    | Name: cpu       | Name: mean        | Name: min         | Name: p90         | Name: p95         | Name: max         |
+//  | Labels:                       | Labels:         | Labels:           | Labels:           | Labels:           | Labels:           | Labels:           |
+//  | Type: []time.Time             | Type: []*string | Type: []*float64  | Type: []*float64  | Type: []*float64  | Type: []*float64  | Type: []*float64  |
+//  +-------------------------------+-----------------+-------------------+-------------------+-------------------+-------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | cpu-total       | 99.06348570053983 | 97.3214285712978  | 99.2066680055868  | 99.24812030075188 | 99.31809065366402 |
+//  | 2023-11-15 11:00:00 +0000 UTC | cpu0            | 98.99671817733766 | 96.65991902847126 | 99.29364278499536 | 99.29718875523953 | 99.59839357421622 |
+//  | 2023-11-15 11:00:00 +0000 UTC | cpu1            | 99.03148357927465 | 96.67673715996412 | 99.39698492464545 | 99.39759036146867 | 99.59798994966731 |
+//  | 2023-11-15 11:00:00 +0000 UTC | cpu2            | 99.03087433486812 | 96.03658536600605 | 99.29859719431953 | 99.39759036146867 | 99.59879638908582 |
+//  | 2023-11-15 11:00:00 +0000 UTC | cpu3            | 99.0796957137731  | 97.37903225797402 | 99.39698492464723 | 99.39879759521435 | 99.4984954865762  |
+//  | 2023-11-15 11:00:00 +0000 UTC | cpu4            | 99.09573460946685 | 97.57330637016123 | 99.39759036146867 | 99.49698189117252 | 99.59839357450608 |
+//  | 2023-11-15 11:00:00 +0000 UTC | cpu5            | 99.0690883079725  | 96.65991902847126 | 99.39698492464545 | 99.39819458377468 | 99.59798994995865 |
+//  | 2023-11-15 11:00:00 +0000 UTC | cpu6            | 99.06475215715605 | 97.37108190081956 | 99.39698492464545 | 99.39879759521259 | 99.69879518073434 |
+//  | 2023-11-15 11:00:00 +0000 UTC | cpu7            | 99.06204005079694 | 97.7596741344093  | 99.39637826964127 | 99.39759036147042 | 99.59879638908698 |
+//  | ...                           | ...             | ...               | ...               | ...               | ...               | ...               |
+//  +-------------------------------+-----------------+-------------------+-------------------+-------------------+-------------------+-------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "table",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "cpu",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "cpu"
+            }
+          },
+          {
+            "name": "mean",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "mean"
+            }
+          },
+          {
+            "name": "min",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "min"
+            }
+          },
+          {
+            "name": "p90",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "p90"
+            }
+          },
+          {
+            "name": "p95",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "p95"
+            }
+          },
+          {
+            "name": "max",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "max"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000,
+            1700046000000,
+            1700046000000,
+            1700046000000,
+            1700046000000,
+            1700046000000,
+            1700046000000,
+            1700046000000,
+            1700046000000,
+            1700046000000,
+            1700046000000
+          ],
+          [
+            "cpu-total",
+            "cpu0",
+            "cpu1",
+            "cpu2",
+            "cpu3",
+            "cpu4",
+            "cpu5",
+            "cpu6",
+            "cpu7",
+            "cpu8",
+            "cpu9"
+          ],
+          [
+            99.06348570053983,
+            98.99671817733766,
+            99.03148357927465,
+            99.03087433486812,
+            99.0796957137731,
+            99.09573460946685,
+            99.0690883079725,
+            99.06475215715605,
+            99.06204005079694,
+            99.0999818796052,
+            99.10477313534511
+          ],
+          [
+            97.3214285712978,
+            96.65991902847126,
+            96.67673715996412,
+            96.03658536600605,
+            97.37903225797402,
+            97.57330637016123,
+            96.65991902847126,
+            97.37108190081956,
+            97.7596741344093,
+            96.56565656568982,
+            96.8463886063268
+          ],
+          [
+            99.2066680055868,
+            99.29364278499536,
+            99.39698492464545,
+            99.29859719431953,
+            99.39698492464723,
+            99.39759036146867,
+            99.39698492464545,
+            99.39698492464545,
+            99.39637826964127,
+            99.39698492464723,
+            99.39759036146867
+          ],
+          [
+            99.24812030075188,
+            99.29718875523953,
+            99.39759036146867,
+            99.39759036146867,
+            99.39879759521435,
+            99.49698189117252,
+            99.39819458377468,
+            99.39879759521259,
+            99.39759036147042,
+            99.39819458377468,
+            99.39819458377468
+          ],
+          [
+            99.31809065366402,
+            99.59839357421622,
+            99.59798994966731,
+            99.59879638908582,
+            99.4984954865762,
+            99.59839357450608,
+            99.59798994995865,
+            99.69879518073434,
+            99.59879638908698,
+            99.59758551299777,
+            99.59839357421622
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/multiple_series_with_tags_and_multiple_columns.time_series.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/multiple_series_with_tags_and_multiple_columns.time_series.golden.jsonc
new file mode 100644
index 0000000000000..f234505fafa5f
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/multiple_series_with_tags_and_multiple_columns.time_series.golden.jsonc
@@ -0,0 +1,2827 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "graph",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu.mean { cpu: cpu-total }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-----------------------+
+//  | Name: Time                    | Name: Value           |
+//  | Labels:                       | Labels: cpu=cpu-total |
+//  | Type: []time.Time             | Type: []*float64      |
+//  +-------------------------------+-----------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.06348570053983     |
+//  +-------------------------------+-----------------------+
+//  
+//  
+//  
+//  Frame[1] 
+//  Name: cpu.min { cpu: cpu-total }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-----------------------+
+//  | Name: Time                    | Name: Value           |
+//  | Labels:                       | Labels: cpu=cpu-total |
+//  | Type: []time.Time             | Type: []*float64      |
+//  +-------------------------------+-----------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 97.3214285712978      |
+//  +-------------------------------+-----------------------+
+//  
+//  
+//  
+//  Frame[2] 
+//  Name: cpu.p90 { cpu: cpu-total }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-----------------------+
+//  | Name: Time                    | Name: Value           |
+//  | Labels:                       | Labels: cpu=cpu-total |
+//  | Type: []time.Time             | Type: []*float64      |
+//  +-------------------------------+-----------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.2066680055868      |
+//  +-------------------------------+-----------------------+
+//  
+//  
+//  
+//  Frame[3] 
+//  Name: cpu.p95 { cpu: cpu-total }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-----------------------+
+//  | Name: Time                    | Name: Value           |
+//  | Labels:                       | Labels: cpu=cpu-total |
+//  | Type: []time.Time             | Type: []*float64      |
+//  +-------------------------------+-----------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.24812030075188     |
+//  +-------------------------------+-----------------------+
+//  
+//  
+//  
+//  Frame[4] 
+//  Name: cpu.max { cpu: cpu-total }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-----------------------+
+//  | Name: Time                    | Name: Value           |
+//  | Labels:                       | Labels: cpu=cpu-total |
+//  | Type: []time.Time             | Type: []*float64      |
+//  +-------------------------------+-----------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.31809065366402     |
+//  +-------------------------------+-----------------------+
+//  
+//  
+//  
+//  Frame[5] 
+//  Name: cpu.mean { cpu: cpu0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu0  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 98.99671817733766 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[6] 
+//  Name: cpu.min { cpu: cpu0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu0  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 96.65991902847126 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[7] 
+//  Name: cpu.p90 { cpu: cpu0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu0  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.29364278499536 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[8] 
+//  Name: cpu.p95 { cpu: cpu0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu0  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.29718875523953 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[9] 
+//  Name: cpu.max { cpu: cpu0 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu0  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.59839357421622 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[10] 
+//  Name: cpu.mean { cpu: cpu1 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu1  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.03148357927465 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[11] 
+//  Name: cpu.min { cpu: cpu1 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu1  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 96.67673715996412 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[12] 
+//  Name: cpu.p90 { cpu: cpu1 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu1  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.39698492464545 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[13] 
+//  Name: cpu.p95 { cpu: cpu1 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu1  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.39759036146867 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[14] 
+//  Name: cpu.max { cpu: cpu1 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu1  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.59798994966731 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[15] 
+//  Name: cpu.mean { cpu: cpu2 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu2  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.03087433486812 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[16] 
+//  Name: cpu.min { cpu: cpu2 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu2  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 96.03658536600605 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[17] 
+//  Name: cpu.p90 { cpu: cpu2 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu2  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.29859719431953 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[18] 
+//  Name: cpu.p95 { cpu: cpu2 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu2  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.39759036146867 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[19] 
+//  Name: cpu.max { cpu: cpu2 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu2  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.59879638908582 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[20] 
+//  Name: cpu.mean { cpu: cpu3 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+------------------+
+//  | Name: Time                    | Name: Value      |
+//  | Labels:                       | Labels: cpu=cpu3 |
+//  | Type: []time.Time             | Type: []*float64 |
+//  +-------------------------------+------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.0796957137731 |
+//  +-------------------------------+------------------+
+//  
+//  
+//  
+//  Frame[21] 
+//  Name: cpu.min { cpu: cpu3 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu3  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 97.37903225797402 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[22] 
+//  Name: cpu.p90 { cpu: cpu3 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu3  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.39698492464723 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[23] 
+//  Name: cpu.p95 { cpu: cpu3 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu3  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.39879759521435 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[24] 
+//  Name: cpu.max { cpu: cpu3 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+------------------+
+//  | Name: Time                    | Name: Value      |
+//  | Labels:                       | Labels: cpu=cpu3 |
+//  | Type: []time.Time             | Type: []*float64 |
+//  +-------------------------------+------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.4984954865762 |
+//  +-------------------------------+------------------+
+//  
+//  
+//  
+//  Frame[25] 
+//  Name: cpu.mean { cpu: cpu4 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu4  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.09573460946685 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[26] 
+//  Name: cpu.min { cpu: cpu4 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu4  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 97.57330637016123 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[27] 
+//  Name: cpu.p90 { cpu: cpu4 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu4  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.39759036146867 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[28] 
+//  Name: cpu.p95 { cpu: cpu4 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu4  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.49698189117252 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[29] 
+//  Name: cpu.max { cpu: cpu4 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu4  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.59839357450608 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[30] 
+//  Name: cpu.mean { cpu: cpu5 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+------------------+
+//  | Name: Time                    | Name: Value      |
+//  | Labels:                       | Labels: cpu=cpu5 |
+//  | Type: []time.Time             | Type: []*float64 |
+//  +-------------------------------+------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.0690883079725 |
+//  +-------------------------------+------------------+
+//  
+//  
+//  
+//  Frame[31] 
+//  Name: cpu.min { cpu: cpu5 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu5  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 96.65991902847126 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[32] 
+//  Name: cpu.p90 { cpu: cpu5 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu5  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.39698492464545 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[33] 
+//  Name: cpu.p95 { cpu: cpu5 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu5  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.39819458377468 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[34] 
+//  Name: cpu.max { cpu: cpu5 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu5  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.59798994995865 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[35] 
+//  Name: cpu.mean { cpu: cpu6 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu6  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.06475215715605 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[36] 
+//  Name: cpu.min { cpu: cpu6 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu6  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 97.37108190081956 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[37] 
+//  Name: cpu.p90 { cpu: cpu6 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu6  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.39698492464545 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[38] 
+//  Name: cpu.p95 { cpu: cpu6 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu6  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.39879759521259 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[39] 
+//  Name: cpu.max { cpu: cpu6 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu6  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.69879518073434 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[40] 
+//  Name: cpu.mean { cpu: cpu7 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu7  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.06204005079694 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[41] 
+//  Name: cpu.min { cpu: cpu7 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+------------------+
+//  | Name: Time                    | Name: Value      |
+//  | Labels:                       | Labels: cpu=cpu7 |
+//  | Type: []time.Time             | Type: []*float64 |
+//  +-------------------------------+------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 97.7596741344093 |
+//  +-------------------------------+------------------+
+//  
+//  
+//  
+//  Frame[42] 
+//  Name: cpu.p90 { cpu: cpu7 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu7  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.39637826964127 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[43] 
+//  Name: cpu.p95 { cpu: cpu7 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu7  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.39759036147042 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[44] 
+//  Name: cpu.max { cpu: cpu7 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu7  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.59879638908698 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[45] 
+//  Name: cpu.mean { cpu: cpu8 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+------------------+
+//  | Name: Time                    | Name: Value      |
+//  | Labels:                       | Labels: cpu=cpu8 |
+//  | Type: []time.Time             | Type: []*float64 |
+//  +-------------------------------+------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.0999818796052 |
+//  +-------------------------------+------------------+
+//  
+//  
+//  
+//  Frame[46] 
+//  Name: cpu.min { cpu: cpu8 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu8  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 96.56565656568982 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[47] 
+//  Name: cpu.p90 { cpu: cpu8 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu8  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.39698492464723 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[48] 
+//  Name: cpu.p95 { cpu: cpu8 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu8  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.39819458377468 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[49] 
+//  Name: cpu.max { cpu: cpu8 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu8  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.59758551299777 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[50] 
+//  Name: cpu.mean { cpu: cpu9 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu9  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.10477313534511 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[51] 
+//  Name: cpu.min { cpu: cpu9 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+------------------+
+//  | Name: Time                    | Name: Value      |
+//  | Labels:                       | Labels: cpu=cpu9 |
+//  | Type: []time.Time             | Type: []*float64 |
+//  +-------------------------------+------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 96.8463886063268 |
+//  +-------------------------------+------------------+
+//  
+//  
+//  
+//  Frame[52] 
+//  Name: cpu.p90 { cpu: cpu9 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu9  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.39759036146867 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[53] 
+//  Name: cpu.p95 { cpu: cpu9 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu9  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.39819458377468 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[54] 
+//  Name: cpu.max { cpu: cpu9 }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels: cpu=cpu9  |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.59839357421622 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu.mean { cpu: cpu-total }",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "graph",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu-total"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.mean { cpu: cpu-total }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.06348570053983
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.min { cpu: cpu-total }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu-total"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.min { cpu: cpu-total }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            97.3214285712978
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.p90 { cpu: cpu-total }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu-total"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.p90 { cpu: cpu-total }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.2066680055868
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.p95 { cpu: cpu-total }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu-total"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.p95 { cpu: cpu-total }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.24812030075188
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.max { cpu: cpu-total }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu-total"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.max { cpu: cpu-total }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.31809065366402
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.mean { cpu: cpu0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu0"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.mean { cpu: cpu0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            98.99671817733766
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.min { cpu: cpu0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu0"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.min { cpu: cpu0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            96.65991902847126
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.p90 { cpu: cpu0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu0"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.p90 { cpu: cpu0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.29364278499536
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.p95 { cpu: cpu0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu0"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.p95 { cpu: cpu0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.29718875523953
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.max { cpu: cpu0 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu0"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.max { cpu: cpu0 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.59839357421622
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.mean { cpu: cpu1 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu1"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.mean { cpu: cpu1 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.03148357927465
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.min { cpu: cpu1 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu1"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.min { cpu: cpu1 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            96.67673715996412
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.p90 { cpu: cpu1 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu1"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.p90 { cpu: cpu1 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.39698492464545
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.p95 { cpu: cpu1 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu1"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.p95 { cpu: cpu1 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.39759036146867
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.max { cpu: cpu1 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu1"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.max { cpu: cpu1 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.59798994966731
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.mean { cpu: cpu2 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu2"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.mean { cpu: cpu2 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.03087433486812
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.min { cpu: cpu2 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu2"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.min { cpu: cpu2 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            96.03658536600605
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.p90 { cpu: cpu2 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu2"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.p90 { cpu: cpu2 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.29859719431953
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.p95 { cpu: cpu2 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu2"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.p95 { cpu: cpu2 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.39759036146867
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.max { cpu: cpu2 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu2"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.max { cpu: cpu2 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.59879638908582
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.mean { cpu: cpu3 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu3"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.mean { cpu: cpu3 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.0796957137731
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.min { cpu: cpu3 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu3"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.min { cpu: cpu3 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            97.37903225797402
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.p90 { cpu: cpu3 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu3"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.p90 { cpu: cpu3 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.39698492464723
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.p95 { cpu: cpu3 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu3"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.p95 { cpu: cpu3 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.39879759521435
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.max { cpu: cpu3 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu3"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.max { cpu: cpu3 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.4984954865762
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.mean { cpu: cpu4 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu4"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.mean { cpu: cpu4 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.09573460946685
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.min { cpu: cpu4 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu4"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.min { cpu: cpu4 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            97.57330637016123
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.p90 { cpu: cpu4 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu4"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.p90 { cpu: cpu4 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.39759036146867
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.p95 { cpu: cpu4 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu4"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.p95 { cpu: cpu4 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.49698189117252
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.max { cpu: cpu4 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu4"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.max { cpu: cpu4 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.59839357450608
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.mean { cpu: cpu5 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu5"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.mean { cpu: cpu5 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.0690883079725
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.min { cpu: cpu5 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu5"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.min { cpu: cpu5 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            96.65991902847126
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.p90 { cpu: cpu5 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu5"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.p90 { cpu: cpu5 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.39698492464545
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.p95 { cpu: cpu5 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu5"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.p95 { cpu: cpu5 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.39819458377468
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.max { cpu: cpu5 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu5"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.max { cpu: cpu5 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.59798994995865
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.mean { cpu: cpu6 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu6"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.mean { cpu: cpu6 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.06475215715605
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.min { cpu: cpu6 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu6"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.min { cpu: cpu6 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            97.37108190081956
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.p90 { cpu: cpu6 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu6"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.p90 { cpu: cpu6 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.39698492464545
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.p95 { cpu: cpu6 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu6"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.p95 { cpu: cpu6 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.39879759521259
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.max { cpu: cpu6 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu6"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.max { cpu: cpu6 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.69879518073434
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.mean { cpu: cpu7 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu7"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.mean { cpu: cpu7 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.06204005079694
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.min { cpu: cpu7 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu7"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.min { cpu: cpu7 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            97.7596741344093
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.p90 { cpu: cpu7 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu7"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.p90 { cpu: cpu7 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.39637826964127
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.p95 { cpu: cpu7 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu7"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.p95 { cpu: cpu7 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.39759036147042
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.max { cpu: cpu7 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu7"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.max { cpu: cpu7 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.59879638908698
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.mean { cpu: cpu8 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu8"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.mean { cpu: cpu8 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.0999818796052
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.min { cpu: cpu8 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu8"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.min { cpu: cpu8 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            96.56565656568982
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.p90 { cpu: cpu8 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu8"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.p90 { cpu: cpu8 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.39698492464723
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.p95 { cpu: cpu8 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu8"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.p95 { cpu: cpu8 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.39819458377468
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.max { cpu: cpu8 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu8"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.max { cpu: cpu8 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.59758551299777
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.mean { cpu: cpu9 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu9"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.mean { cpu: cpu9 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.10477313534511
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.min { cpu: cpu9 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu9"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.min { cpu: cpu9 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            96.8463886063268
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.p90 { cpu: cpu9 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu9"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.p90 { cpu: cpu9 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.39759036146867
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.p95 { cpu: cpu9 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu9"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.p95 { cpu: cpu9 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.39819458377468
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.max { cpu: cpu9 }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "cpu": "cpu9"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.max { cpu: cpu9 }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000
+          ],
+          [
+            99.59839357421622
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/one_measurement_with_two_columns.json b/pkg/tsdb/influxdb/influxql/testdata/one_measurement_with_two_columns.json
new file mode 100644
index 0000000000000..d179eb5d24494
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/one_measurement_with_two_columns.json
@@ -0,0 +1 @@
+{"results":[{"statement_id":0,"series":[{"name":"cpu","columns":["time","mean"],"values":[[1700046000000,99.0693929754458],[1700047200000,99.13073313839024],[1700048400000,98.99278645182834],[1700049600000,98.77818123433566]]}]}]}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/one_measurement_with_two_columns.table.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/one_measurement_with_two_columns.table.golden.jsonc
new file mode 100644
index 0000000000000..6c06d6baed816
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/one_measurement_with_two_columns.table.golden.jsonc
@@ -0,0 +1,79 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "table",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu
+//  Dimensions: 2 Fields by 4 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: mean        |
+//  | Labels:                       | Labels:           |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.0693929754458  |
+//  | 2023-11-15 11:20:00 +0000 UTC | 99.13073313839024 |
+//  | 2023-11-15 11:40:00 +0000 UTC | 98.99278645182834 |
+//  | 2023-11-15 12:00:00 +0000 UTC | 98.77818123433566 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "table",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "mean",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "mean"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000,
+            1700047200000,
+            1700048400000,
+            1700049600000
+          ],
+          [
+            99.0693929754458,
+            99.13073313839024,
+            98.99278645182834,
+            98.77818123433566
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/one_measurement_with_two_columns.time_series.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/one_measurement_with_two_columns.time_series.golden.jsonc
new file mode 100644
index 0000000000000..59c5a50f0d981
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/one_measurement_with_two_columns.time_series.golden.jsonc
@@ -0,0 +1,79 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "graph",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu.mean
+//  Dimensions: 2 Fields by 4 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels:           |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 11:00:00 +0000 UTC | 99.0693929754458  |
+//  | 2023-11-15 11:20:00 +0000 UTC | 99.13073313839024 |
+//  | 2023-11-15 11:40:00 +0000 UTC | 98.99278645182834 |
+//  | 2023-11-15 12:00:00 +0000 UTC | 98.77818123433566 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu.mean",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "graph",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "cpu.mean"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700046000000,
+            1700047200000,
+            1700048400000,
+            1700049600000
+          ],
+          [
+            99.0693929754458,
+            99.13073313839024,
+            98.99278645182834,
+            98.77818123433566
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/response.json b/pkg/tsdb/influxdb/influxql/testdata/response.json
index dad9896caaaf3..a06def4b4aad9 100644
--- a/pkg/tsdb/influxdb/influxql/testdata/response.json
+++ b/pkg/tsdb/influxdb/influxql/testdata/response.json
@@ -1 +1 @@
-{"results":[{"statement_id":0,"series":[{"name":"series_name","tags":{"series_tag_1":"-248","series_tag_2":"3167640"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,"589051IR",1678734134503,"",16.726718841369227,null,null,53,null,48.72,null,null,null,null,"BYOD",null,null]]},{"name":"series_name","tags":{"series_tag_1":"-258","series_tag_2":"0"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,"tertggdfs",1678734188679,"",23.432988173518233,null,null,64,null,70.92,null,null,null,null,null,null,null]]},{"name":"series_name","tags":{"series_tag_1":"-28","series_tag_2":"0"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,null,null,"Unknown",null,null,null,null,null,null,null,null,null,null,null,null,null]]},{"name":"series_name","tags":{"series_tag_1":"-28","series_tag_2":"2249908"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,"ASDWQ234",1678734167565,"",10.772527844239201,null,null,25,null,58.33,null,null,null,null,null,null,null]]},{"name":"series_name","tags":{"series_tag_1":"-327","series_tag_2":"3415374"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,"123SDQWE",1678734222642,"ADSADS",40.61198862661182,null,null,33,null,51.41,null,null,null,null,"SCCM",null,null]]},{"name":"series_name","tags":{"series_tag_1":"-331","series_tag_2":"0"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,null,null,"Unknown",null,null,null,null,null,null,null,null,null,null,null,null,null]]},{"name":"series_name","tags":{"series_tag_1":"-331","series_tag_2":"2191438"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,"SDF32R",1678734212872,"",15.267734587695077,null,null,43,null,58.43,null,null,null,null,null,null,null]]},{"name":"series_name","tags":{"series_tag_1":"0","series_tag_2":"0"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,null,null,"Unknown",null,null,null,null,null,null,null,null,null,null,null,null,null]]},{"name":"series_name","tags":{"series_tag_1":"00-00-00-08-1E-0C","series_tag_2":"0"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,null,null,"Unknown",null,null,null,null,null,null,null,null,null,null,null,null,null]]}]}]}
+{"results":[{"series":[{"name":"cpu.upc","columns":["time","mean","sum"],"tags":{"datacenter":"America","dc.region.name":"Northeast","cluster-name":"Cluster","/cluster/name/":"Cluster/","@cluster@name@":"Cluster@"},"values":[[111,222,333]]}]}]}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/response.table.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/response.table.golden.jsonc
new file mode 100644
index 0000000000000..38afbd18a511e
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/response.table.golden.jsonc
@@ -0,0 +1,154 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "table",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu.upc
+//  Dimensions: 8 Fields by 1 Rows
+//  +-----------------------------------+------------------+----------------------+--------------------+----------------------+----------------------+------------------+------------------+
+//  | Name: Time                        | Name: datacenter | Name: dc.region.name | Name: cluster-name | Name: /cluster/name/ | Name: @cluster@name@ | Name: mean       | Name: sum        |
+//  | Labels:                           | Labels:          | Labels:              | Labels:            | Labels:              | Labels:              | Labels:          | Labels:          |
+//  | Type: []time.Time                 | Type: []*string  | Type: []*string      | Type: []*string    | Type: []*string      | Type: []*string      | Type: []*float64 | Type: []*float64 |
+//  +-----------------------------------+------------------+----------------------+--------------------+----------------------+----------------------+------------------+------------------+
+//  | 1970-01-01 00:00:00.111 +0000 UTC | America          | Northeast            | Cluster            | Cluster/             | Cluster@             | 222              | 333              |
+//  +-----------------------------------+------------------+----------------------+--------------------+----------------------+----------------------+------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu.upc",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "table",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "datacenter",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "datacenter"
+            }
+          },
+          {
+            "name": "dc.region.name",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "dc.region.name"
+            }
+          },
+          {
+            "name": "cluster-name",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "cluster-name"
+            }
+          },
+          {
+            "name": "/cluster/name/",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "/cluster/name/"
+            }
+          },
+          {
+            "name": "@cluster@name@",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "@cluster@name@"
+            }
+          },
+          {
+            "name": "mean",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "mean"
+            }
+          },
+          {
+            "name": "sum",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "sum"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            111
+          ],
+          [
+            "America"
+          ],
+          [
+            "Northeast"
+          ],
+          [
+            "Cluster"
+          ],
+          [
+            "Cluster/"
+          ],
+          [
+            "Cluster@"
+          ],
+          [
+            222
+          ],
+          [
+            333
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/response.time_series.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/response.time_series.golden.jsonc
new file mode 100644
index 0000000000000..444265d3ec61b
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/response.time_series.golden.jsonc
@@ -0,0 +1,124 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "graph",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu.upc.mean { @cluster@name@: Cluster@ }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+---------------------------------+
+//  | Name: Time                        | Name: Value                     |
+//  | Labels:                           | Labels: @cluster@name@=Cluster@ |
+//  | Type: []time.Time                 | Type: []*float64                |
+//  +-----------------------------------+---------------------------------+
+//  | 1970-01-01 00:00:00.111 +0000 UTC | 222                             |
+//  +-----------------------------------+---------------------------------+
+//  
+//  
+//  
+//  Frame[1] 
+//  Name: cpu.upc.sum { @cluster@name@: Cluster@ }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+---------------------------------+
+//  | Name: Time                        | Name: Value                     |
+//  | Labels:                           | Labels: @cluster@name@=Cluster@ |
+//  | Type: []time.Time                 | Type: []*float64                |
+//  +-----------------------------------+---------------------------------+
+//  | 1970-01-01 00:00:00.111 +0000 UTC | 333                             |
+//  +-----------------------------------+---------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu.upc.mean { @cluster@name@: Cluster@ }",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "graph",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "@cluster@name@": "Cluster@"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.upc.mean { @cluster@name@: Cluster@ }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            111
+          ],
+          [
+            222
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.upc.sum { @cluster@name@: Cluster@ }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "@cluster@name@": "Cluster@"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.upc.sum { @cluster@name@: Cluster@ }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            111
+          ],
+          [
+            333
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/response_with_nil_bools_and_nil_strings.json b/pkg/tsdb/influxdb/influxql/testdata/response_with_nil_bools_and_nil_strings.json
new file mode 100644
index 0000000000000..21a534f555355
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/response_with_nil_bools_and_nil_strings.json
@@ -0,0 +1 @@
+{"results":[{"series":[{"name":"cpu","columns":["time","mean","path","isActive"],"tags":{"datacenter":"America"},"values":[[111,222,null,null],[111,222,"/usr/path",false],[111,null,"/usr/path",true]]}]}]}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/response_with_nil_bools_and_nil_strings.table.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/response_with_nil_bools_and_nil_strings.table.golden.jsonc
new file mode 100644
index 0000000000000..d52d8658762ec
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/response_with_nil_bools_and_nil_strings.table.golden.jsonc
@@ -0,0 +1,124 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "table",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu
+//  Dimensions: 5 Fields by 3 Rows
+//  +-----------------------------------+------------------+------------------+-----------------+----------------+
+//  | Name: Time                        | Name: datacenter | Name: mean       | Name: path      | Name: isActive |
+//  | Labels:                           | Labels:          | Labels:          | Labels:         | Labels:        |
+//  | Type: []time.Time                 | Type: []*string  | Type: []*float64 | Type: []*string | Type: []*bool  |
+//  +-----------------------------------+------------------+------------------+-----------------+----------------+
+//  | 1970-01-01 00:00:00.111 +0000 UTC | America          | 222              | null            | null           |
+//  | 1970-01-01 00:00:00.111 +0000 UTC | America          | 222              | /usr/path       | false          |
+//  | 1970-01-01 00:00:00.111 +0000 UTC | America          | null             | /usr/path       | true           |
+//  +-----------------------------------+------------------+------------------+-----------------+----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "table",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "datacenter",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "datacenter"
+            }
+          },
+          {
+            "name": "mean",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "mean"
+            }
+          },
+          {
+            "name": "path",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "path"
+            }
+          },
+          {
+            "name": "isActive",
+            "type": "boolean",
+            "typeInfo": {
+              "frame": "bool",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "isActive"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            111,
+            111,
+            111
+          ],
+          [
+            "America",
+            "America",
+            "America"
+          ],
+          [
+            222,
+            222,
+            null
+          ],
+          [
+            null,
+            "/usr/path",
+            "/usr/path"
+          ],
+          [
+            null,
+            false,
+            true
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/response_with_nil_bools_and_nil_strings.time_series.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/response_with_nil_bools_and_nil_strings.time_series.golden.jsonc
new file mode 100644
index 0000000000000..1999378ee3612
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/response_with_nil_bools_and_nil_strings.time_series.golden.jsonc
@@ -0,0 +1,193 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "graph",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu.mean { datacenter: America }
+//  Dimensions: 2 Fields by 3 Rows
+//  +-----------------------------------+----------------------------+
+//  | Name: Time                        | Name: Value                |
+//  | Labels:                           | Labels: datacenter=America |
+//  | Type: []time.Time                 | Type: []*float64           |
+//  +-----------------------------------+----------------------------+
+//  | 1970-01-01 00:00:00.111 +0000 UTC | 222                        |
+//  | 1970-01-01 00:00:00.111 +0000 UTC | 222                        |
+//  | 1970-01-01 00:00:00.111 +0000 UTC | null                       |
+//  +-----------------------------------+----------------------------+
+//  
+//  
+//  
+//  Frame[1] 
+//  Name: cpu.path { datacenter: America }
+//  Dimensions: 2 Fields by 3 Rows
+//  +-----------------------------------+----------------------------+
+//  | Name: Time                        | Name: Value                |
+//  | Labels:                           | Labels: datacenter=America |
+//  | Type: []time.Time                 | Type: []*string            |
+//  +-----------------------------------+----------------------------+
+//  | 1970-01-01 00:00:00.111 +0000 UTC | null                       |
+//  | 1970-01-01 00:00:00.111 +0000 UTC | /usr/path                  |
+//  | 1970-01-01 00:00:00.111 +0000 UTC | /usr/path                  |
+//  +-----------------------------------+----------------------------+
+//  
+//  
+//  
+//  Frame[2] 
+//  Name: cpu.isActive { datacenter: America }
+//  Dimensions: 2 Fields by 3 Rows
+//  +-----------------------------------+----------------------------+
+//  | Name: Time                        | Name: Value                |
+//  | Labels:                           | Labels: datacenter=America |
+//  | Type: []time.Time                 | Type: []*bool              |
+//  +-----------------------------------+----------------------------+
+//  | 1970-01-01 00:00:00.111 +0000 UTC | null                       |
+//  | 1970-01-01 00:00:00.111 +0000 UTC | false                      |
+//  | 1970-01-01 00:00:00.111 +0000 UTC | true                       |
+//  +-----------------------------------+----------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu.mean { datacenter: America }",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "graph",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "datacenter": "America"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.mean { datacenter: America }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            111,
+            111,
+            111
+          ],
+          [
+            222,
+            222,
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.path { datacenter: America }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "labels": {
+              "datacenter": "America"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.path { datacenter: America }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            111,
+            111,
+            111
+          ],
+          [
+            null,
+            "/usr/path",
+            "/usr/path"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.isActive { datacenter: America }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "boolean",
+            "typeInfo": {
+              "frame": "bool",
+              "nullable": true
+            },
+            "labels": {
+              "datacenter": "America"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.isActive { datacenter: America }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            111,
+            111,
+            111
+          ],
+          [
+            null,
+            false,
+            true
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/response_with_weird_tag.json b/pkg/tsdb/influxdb/influxql/testdata/response_with_weird_tag.json
new file mode 100644
index 0000000000000..7eaad4b7ad3f5
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/response_with_weird_tag.json
@@ -0,0 +1 @@
+{"results":[{"series":[{"name":"cpu.upc","columns":["time","mean","sum"],"tags":{"@cluster@name@":"Cluster@"},"values":[[111,222,333]]}]}]}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/response_with_weird_tag.table.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/response_with_weird_tag.table.golden.jsonc
new file mode 100644
index 0000000000000..ac31c690529be
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/response_with_weird_tag.table.golden.jsonc
@@ -0,0 +1,98 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "table",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu.upc
+//  Dimensions: 4 Fields by 1 Rows
+//  +-----------------------------------+----------------------+------------------+------------------+
+//  | Name: Time                        | Name: @cluster@name@ | Name: mean       | Name: sum        |
+//  | Labels:                           | Labels:              | Labels:          | Labels:          |
+//  | Type: []time.Time                 | Type: []*string      | Type: []*float64 | Type: []*float64 |
+//  +-----------------------------------+----------------------+------------------+------------------+
+//  | 1970-01-01 00:00:00.111 +0000 UTC | Cluster@             | 222              | 333              |
+//  +-----------------------------------+----------------------+------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu.upc",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "table",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "@cluster@name@",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "@cluster@name@"
+            }
+          },
+          {
+            "name": "mean",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "mean"
+            }
+          },
+          {
+            "name": "sum",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "sum"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            111
+          ],
+          [
+            "Cluster@"
+          ],
+          [
+            222
+          ],
+          [
+            333
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/response_with_weird_tag.time_series.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/response_with_weird_tag.time_series.golden.jsonc
new file mode 100644
index 0000000000000..444265d3ec61b
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/response_with_weird_tag.time_series.golden.jsonc
@@ -0,0 +1,124 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "graph",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu.upc.mean { @cluster@name@: Cluster@ }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+---------------------------------+
+//  | Name: Time                        | Name: Value                     |
+//  | Labels:                           | Labels: @cluster@name@=Cluster@ |
+//  | Type: []time.Time                 | Type: []*float64                |
+//  +-----------------------------------+---------------------------------+
+//  | 1970-01-01 00:00:00.111 +0000 UTC | 222                             |
+//  +-----------------------------------+---------------------------------+
+//  
+//  
+//  
+//  Frame[1] 
+//  Name: cpu.upc.sum { @cluster@name@: Cluster@ }
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+---------------------------------+
+//  | Name: Time                        | Name: Value                     |
+//  | Labels:                           | Labels: @cluster@name@=Cluster@ |
+//  | Type: []time.Time                 | Type: []*float64                |
+//  +-----------------------------------+---------------------------------+
+//  | 1970-01-01 00:00:00.111 +0000 UTC | 333                             |
+//  +-----------------------------------+---------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu.upc.mean { @cluster@name@: Cluster@ }",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "graph",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "@cluster@name@": "Cluster@"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.upc.mean { @cluster@name@: Cluster@ }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            111
+          ],
+          [
+            222
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.upc.sum { @cluster@name@: Cluster@ }",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "@cluster@name@": "Cluster@"
+            },
+            "config": {
+              "displayNameFromDS": "cpu.upc.sum { @cluster@name@: Cluster@ }"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            111
+          ],
+          [
+            333
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/retention_policy.json b/pkg/tsdb/influxdb/influxql/testdata/retention_policy.json
new file mode 100644
index 0000000000000..7d72b7a941133
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/retention_policy.json
@@ -0,0 +1 @@
+{"results":[{"statement_id":0,"series":[{"columns":["name","duration","shardGroupDuration","replicaN","default"],"values":[["default","0s","168h0m0s",1,true],["autogen","0s","168h0m0s",1,false],["bar","0s","168h0m0s",1,false],["5m_avg","0s","168h0m0s",1,false],["1m_avg","0s","168h0m0s",1,false]]}]}]}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/retention_policy.table.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/retention_policy.table.golden.jsonc
new file mode 100644
index 0000000000000..1943eb794b7a7
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/retention_policy.table.golden.jsonc
@@ -0,0 +1,139 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "table",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: 
+//  Dimensions: 5 Fields by 5 Rows
+//  +-----------------+-----------------+--------------------------+------------------+---------------+
+//  | Name: name      | Name: duration  | Name: shardGroupDuration | Name: replicaN   | Name: default |
+//  | Labels:         | Labels:         | Labels:                  | Labels:          | Labels:       |
+//  | Type: []*string | Type: []*string | Type: []*string          | Type: []*float64 | Type: []*bool |
+//  +-----------------+-----------------+--------------------------+------------------+---------------+
+//  | default         | 0s              | 168h0m0s                 | 1                | true          |
+//  | autogen         | 0s              | 168h0m0s                 | 1                | false         |
+//  | bar             | 0s              | 168h0m0s                 | 1                | false         |
+//  | 5m_avg          | 0s              | 168h0m0s                 | 1                | false         |
+//  | 1m_avg          | 0s              | 168h0m0s                 | 1                | false         |
+//  +-----------------+-----------------+--------------------------+------------------+---------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "table",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "name",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "name"
+            }
+          },
+          {
+            "name": "duration",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "duration"
+            }
+          },
+          {
+            "name": "shardGroupDuration",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "shardGroupDuration"
+            }
+          },
+          {
+            "name": "replicaN",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "replicaN"
+            }
+          },
+          {
+            "name": "default",
+            "type": "boolean",
+            "typeInfo": {
+              "frame": "bool",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "default"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "default",
+            "autogen",
+            "bar",
+            "5m_avg",
+            "1m_avg"
+          ],
+          [
+            "0s",
+            "0s",
+            "0s",
+            "0s",
+            "0s"
+          ],
+          [
+            "168h0m0s",
+            "168h0m0s",
+            "168h0m0s",
+            "168h0m0s",
+            "168h0m0s"
+          ],
+          [
+            1,
+            1,
+            1,
+            1,
+            1
+          ],
+          [
+            true,
+            false,
+            false,
+            false,
+            false
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/retention_policy.time_series.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/retention_policy.time_series.golden.jsonc
new file mode 100644
index 0000000000000..f41fcbc2ba083
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/retention_policy.time_series.golden.jsonc
@@ -0,0 +1,64 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "graph",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: 
+//  Dimensions: 1 Fields by 5 Rows
+//  +-----------------+
+//  | Name: Value     |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  | default         |
+//  | autogen         |
+//  | bar             |
+//  | 5m_avg          |
+//  | 1m_avg          |
+//  +-----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "graph",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "default",
+            "autogen",
+            "bar",
+            "5m_avg",
+            "1m_avg"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/show_diagnostics.json b/pkg/tsdb/influxdb/influxql/testdata/show_diagnostics.json
new file mode 100644
index 0000000000000..25843bd3ac145
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/show_diagnostics.json
@@ -0,0 +1 @@
+{"results":[{"statement_id":0,"series":[{"name":"build","columns":["Branch","Build Time","Commit","Version"],"values":[["1.8","","688e697c51fd","1.8.10"]]},{"name":"config","columns":["bind-address","reporting-disabled"],"values":[["127.0.0.1:8088",false]]},{"name":"config-coordinator","columns":["log-queries-after","max-concurrent-queries","max-select-buckets","max-select-point","max-select-series","query-timeout","write-timeout"],"values":[["0s",0,0,0,0,"0s","10s"]]},{"name":"config-cqs","columns":["enabled","query-stats-enabled","run-interval"],"values":[[true,false,"1s"]]},{"name":"config-data","columns":["cache-max-memory-size","cache-snapshot-memory-size","cache-snapshot-write-cold-duration","compact-full-write-cold-duration","dir","max-concurrent-compactions","max-index-log-file-size","max-series-per-database","max-values-per-tag","series-file-max-concurrent-compactions","series-id-set-cache-size","strict-error-handling","wal-dir","wal-fsync-delay"],"values":[[1073741824,26214400,"10m0s","4h0m0s","/var/lib/influxdb/data",0,1048576,1000000,100000,0,100,false,"/var/lib/influxdb/wal","0s"]]},{"name":"config-httpd","columns":["access-log-path","bind-address","enabled","https-enabled","max-connection-limit","max-row-limit"],"values":[["",":8086",true,false,0,10000]]},{"name":"config-meta","columns":["dir"],"values":[["/var/lib/influxdb/meta"]]},{"name":"config-monitor","columns":["store-database","store-enabled","store-interval"],"values":[["_internal",true,"10s"]]},{"name":"config-precreator","columns":["advance-period","check-interval","enabled"],"values":[["30m0s","10m0s",true]]},{"name":"config-retention","columns":["check-interval","enabled"],"values":[["30m0s",true]]},{"name":"config-subscriber","columns":["enabled","http-timeout","write-buffer-size","write-concurrency"],"values":[[true,"30s",1000,40]]},{"name":"network","columns":["hostname"],"values":[["635ab5063baa"]]},{"name":"runtime","columns":["GOARCH","GOMAXPROCS","GOOS","version"],"values":[["arm64",10,"linux","go1.13.8"]]},{"name":"system","columns":["PID","currentTime","started","uptime"],"values":[[1,"2024-02-02T11:33:46.519061719Z","2024-01-29T11:11:07.051577923Z","96h22m39.467483796s"]]}]}]}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/show_diagnostics.time_series.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/show_diagnostics.time_series.golden.jsonc
new file mode 100644
index 0000000000000..7e4837248dcfb
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/show_diagnostics.time_series.golden.jsonc
@@ -0,0 +1,512 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "graph",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: build
+//  Dimensions: 1 Fields by 1 Rows
+//  +-----------------+
+//  | Name: Value     |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  | 1.8             |
+//  +-----------------+
+//  
+//  
+//  
+//  Frame[1] 
+//  Name: config
+//  Dimensions: 1 Fields by 1 Rows
+//  +-----------------+
+//  | Name: Value     |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  | 127.0.0.1:8088  |
+//  +-----------------+
+//  
+//  
+//  
+//  Frame[2] 
+//  Name: config-coordinator
+//  Dimensions: 1 Fields by 1 Rows
+//  +-----------------+
+//  | Name: Value     |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  | 0s              |
+//  +-----------------+
+//  
+//  
+//  
+//  Frame[3] 
+//  Name: config-cqs
+//  Dimensions: 1 Fields by 1 Rows
+//  +-----------------+
+//  | Name: Value     |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  | true            |
+//  +-----------------+
+//  
+//  
+//  
+//  Frame[4] 
+//  Name: config-data
+//  Dimensions: 1 Fields by 1 Rows
+//  +-----------------+
+//  | Name: Value     |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  | 1073741824      |
+//  +-----------------+
+//  
+//  
+//  
+//  Frame[5] 
+//  Name: config-httpd
+//  Dimensions: 1 Fields by 1 Rows
+//  +-----------------+
+//  | Name: Value     |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  |                 |
+//  +-----------------+
+//  
+//  
+//  
+//  Frame[6] 
+//  Name: config-meta
+//  Dimensions: 1 Fields by 1 Rows
+//  +------------------------+
+//  | Name: Value            |
+//  | Labels:                |
+//  | Type: []*string        |
+//  +------------------------+
+//  | /var/lib/influxdb/meta |
+//  +------------------------+
+//  
+//  
+//  
+//  Frame[7] 
+//  Name: config-monitor
+//  Dimensions: 1 Fields by 1 Rows
+//  +-----------------+
+//  | Name: Value     |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  | _internal       |
+//  +-----------------+
+//  
+//  
+//  
+//  Frame[8] 
+//  Name: config-precreator
+//  Dimensions: 1 Fields by 1 Rows
+//  +-----------------+
+//  | Name: Value     |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  | 30m0s           |
+//  +-----------------+
+//  
+//  
+//  
+//  Frame[9] 
+//  Name: config-retention
+//  Dimensions: 1 Fields by 1 Rows
+//  +-----------------+
+//  | Name: Value     |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  | 30m0s           |
+//  +-----------------+
+//  
+//  
+//  
+//  Frame[10] 
+//  Name: config-subscriber
+//  Dimensions: 1 Fields by 1 Rows
+//  +-----------------+
+//  | Name: Value     |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  | true            |
+//  +-----------------+
+//  
+//  
+//  
+//  Frame[11] 
+//  Name: network
+//  Dimensions: 1 Fields by 1 Rows
+//  +-----------------+
+//  | Name: Value     |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  | 635ab5063baa    |
+//  +-----------------+
+//  
+//  
+//  
+//  Frame[12] 
+//  Name: runtime
+//  Dimensions: 1 Fields by 1 Rows
+//  +-----------------+
+//  | Name: Value     |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  | arm64           |
+//  +-----------------+
+//  
+//  
+//  
+//  Frame[13] 
+//  Name: system
+//  Dimensions: 1 Fields by 1 Rows
+//  +-----------------+
+//  | Name: Value     |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  | 1               |
+//  +-----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "build",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "graph",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "1.8"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "config",
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "127.0.0.1:8088"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "config-coordinator",
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "0s"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "config-cqs",
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "true"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "config-data",
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "1073741824"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "config-httpd",
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            ""
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "config-meta",
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "/var/lib/influxdb/meta"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "config-monitor",
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "_internal"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "config-precreator",
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "30m0s"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "config-retention",
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "30m0s"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "config-subscriber",
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "true"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "network",
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "635ab5063baa"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "runtime",
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "arm64"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "system",
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "1"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/show_tag_values_response.json b/pkg/tsdb/influxdb/influxql/testdata/show_tag_values_response.json
new file mode 100644
index 0000000000000..06537e3ad6391
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/show_tag_values_response.json
@@ -0,0 +1 @@
+{"results":[{"statement_id":0,"series":[{"name":"cpu","columns":["key","value"],"values":[["cpu","cpu-total"],["cpu","cpu0"],["cpu","cpu1"],["cpu","cpu2"],["cpu","cpu3"],["cpu","cpu4"],["cpu","cpu5"],["cpu","cpu6"],["cpu","cpu7"],["cpu","cpu8"],["cpu","cpu9"]]}]}]}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/show_tag_values_response.table.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/show_tag_values_response.table.golden.jsonc
new file mode 100644
index 0000000000000..724d3b7cfd49d
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/show_tag_values_response.table.golden.jsonc
@@ -0,0 +1,103 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "table",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu
+//  Dimensions: 2 Fields by 11 Rows
+//  +-----------------+-----------------+
+//  | Name: key       | Name: value     |
+//  | Labels:         | Labels:         |
+//  | Type: []*string | Type: []*string |
+//  +-----------------+-----------------+
+//  | cpu             | cpu-total       |
+//  | cpu             | cpu0            |
+//  | cpu             | cpu1            |
+//  | cpu             | cpu2            |
+//  | cpu             | cpu3            |
+//  | cpu             | cpu4            |
+//  | cpu             | cpu5            |
+//  | cpu             | cpu6            |
+//  | cpu             | cpu7            |
+//  | ...             | ...             |
+//  +-----------------+-----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "table",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "key",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "key"
+            }
+          },
+          {
+            "name": "value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "value"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "cpu",
+            "cpu",
+            "cpu",
+            "cpu",
+            "cpu",
+            "cpu",
+            "cpu",
+            "cpu",
+            "cpu",
+            "cpu",
+            "cpu"
+          ],
+          [
+            "cpu-total",
+            "cpu0",
+            "cpu1",
+            "cpu2",
+            "cpu3",
+            "cpu4",
+            "cpu5",
+            "cpu6",
+            "cpu7",
+            "cpu8",
+            "cpu9"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/show_tag_values_response.time_series.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/show_tag_values_response.time_series.golden.jsonc
new file mode 100644
index 0000000000000..8703367b352e5
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/show_tag_values_response.time_series.golden.jsonc
@@ -0,0 +1,76 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "graph",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu
+//  Dimensions: 1 Fields by 11 Rows
+//  +-----------------+
+//  | Name: Value     |
+//  | Labels:         |
+//  | Type: []*string |
+//  +-----------------+
+//  | cpu             |
+//  | cpu             |
+//  | cpu             |
+//  | cpu             |
+//  | cpu             |
+//  | cpu             |
+//  | cpu             |
+//  | cpu             |
+//  | cpu             |
+//  | ...             |
+//  +-----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "graph",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "cpu",
+            "cpu",
+            "cpu",
+            "cpu",
+            "cpu",
+            "cpu",
+            "cpu",
+            "cpu",
+            "cpu",
+            "cpu",
+            "cpu"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/simple_response.json b/pkg/tsdb/influxdb/influxql/testdata/simple_response.json
new file mode 100644
index 0000000000000..994a84a6cc57c
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/simple_response.json
@@ -0,0 +1 @@
+{"results":[{"statement_id":0,"series":[{"name":"cpu","columns":["time","usage_idle","usage_iowait"],"values":[[1700090120000,99.0255173802101,0.020092425155804713],[1700090120000,99.29718875523953,0],[1700090120000,99.09456740445926,0],[1700090120000,99.39455095864957,0],[1700090120000,99.09729187566201,0]]}]}]}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/simple_response.table.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/simple_response.table.golden.jsonc
new file mode 100644
index 0000000000000..d9380e9e48211
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/simple_response.table.golden.jsonc
@@ -0,0 +1,100 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "table",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu
+//  Dimensions: 3 Fields by 5 Rows
+//  +-------------------------------+-------------------+----------------------+
+//  | Name: Time                    | Name: usage_idle  | Name: usage_iowait   |
+//  | Labels:                       | Labels:           | Labels:              |
+//  | Type: []time.Time             | Type: []*float64  | Type: []*float64     |
+//  +-------------------------------+-------------------+----------------------+
+//  | 2023-11-15 23:15:20 +0000 UTC | 99.0255173802101  | 0.020092425155804713 |
+//  | 2023-11-15 23:15:20 +0000 UTC | 99.29718875523953 | 0                    |
+//  | 2023-11-15 23:15:20 +0000 UTC | 99.09456740445926 | 0                    |
+//  | 2023-11-15 23:15:20 +0000 UTC | 99.39455095864957 | 0                    |
+//  | 2023-11-15 23:15:20 +0000 UTC | 99.09729187566201 | 0                    |
+//  +-------------------------------+-------------------+----------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "table",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "usage_idle",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "usage_idle"
+            }
+          },
+          {
+            "name": "usage_iowait",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "usage_iowait"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700090120000,
+            1700090120000,
+            1700090120000,
+            1700090120000,
+            1700090120000
+          ],
+          [
+            99.0255173802101,
+            99.29718875523953,
+            99.09456740445926,
+            99.39455095864957,
+            99.09729187566201
+          ],
+          [
+            0.020092425155804713,
+            0,
+            0,
+            0,
+            0
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/simple_response.time_series.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/simple_response.time_series.golden.jsonc
new file mode 100644
index 0000000000000..6d6406355dd43
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/simple_response.time_series.golden.jsonc
@@ -0,0 +1,142 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "graph",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu.usage_idle
+//  Dimensions: 2 Fields by 5 Rows
+//  +-------------------------------+-------------------+
+//  | Name: Time                    | Name: Value       |
+//  | Labels:                       | Labels:           |
+//  | Type: []time.Time             | Type: []*float64  |
+//  +-------------------------------+-------------------+
+//  | 2023-11-15 23:15:20 +0000 UTC | 99.0255173802101  |
+//  | 2023-11-15 23:15:20 +0000 UTC | 99.29718875523953 |
+//  | 2023-11-15 23:15:20 +0000 UTC | 99.09456740445926 |
+//  | 2023-11-15 23:15:20 +0000 UTC | 99.39455095864957 |
+//  | 2023-11-15 23:15:20 +0000 UTC | 99.09729187566201 |
+//  +-------------------------------+-------------------+
+//  
+//  
+//  
+//  Frame[1] 
+//  Name: cpu.usage_iowait
+//  Dimensions: 2 Fields by 5 Rows
+//  +-------------------------------+----------------------+
+//  | Name: Time                    | Name: Value          |
+//  | Labels:                       | Labels:              |
+//  | Type: []time.Time             | Type: []*float64     |
+//  +-------------------------------+----------------------+
+//  | 2023-11-15 23:15:20 +0000 UTC | 0.020092425155804713 |
+//  | 2023-11-15 23:15:20 +0000 UTC | 0                    |
+//  | 2023-11-15 23:15:20 +0000 UTC | 0                    |
+//  | 2023-11-15 23:15:20 +0000 UTC | 0                    |
+//  | 2023-11-15 23:15:20 +0000 UTC | 0                    |
+//  +-------------------------------+----------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu.usage_idle",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "graph",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "cpu.usage_idle"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700090120000,
+            1700090120000,
+            1700090120000,
+            1700090120000,
+            1700090120000
+          ],
+          [
+            99.0255173802101,
+            99.29718875523953,
+            99.09456740445926,
+            99.39455095864957,
+            99.09729187566201
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "cpu.usage_iowait",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "cpu.usage_iowait"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700090120000,
+            1700090120000,
+            1700090120000,
+            1700090120000,
+            1700090120000
+          ],
+          [
+            0.020092425155804713,
+            0,
+            0,
+            0,
+            0
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/simple_response_with_diverse_data_types.json b/pkg/tsdb/influxdb/influxql/testdata/simple_response_with_diverse_data_types.json
new file mode 100644
index 0000000000000..6f03bbd06c247
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/simple_response_with_diverse_data_types.json
@@ -0,0 +1 @@
+{"results":[{"statement_id":0,"series":[{"name":"Annotation","columns":["time","domain","type","ASD","details"],"values":[[1697789142916,"AASD157","fghg",null,"Something happened AtTime=2023-10-20T08:05:42.902036"],[1697789142918,"HUY23","val23",null,"Something else happened AtTime=2023-10-20T08:05:42.902036"]]}]}]}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/simple_response_with_diverse_data_types.table.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/simple_response_with_diverse_data_types.table.golden.jsonc
new file mode 100644
index 0000000000000..6aeaa82e05d1f
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/simple_response_with_diverse_data_types.table.golden.jsonc
@@ -0,0 +1,118 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "table",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: Annotation
+//  Dimensions: 5 Fields by 2 Rows
+//  +-----------------------------------+-----------------+-----------------+------------------+-----------------------------------------------------------+
+//  | Name: Time                        | Name: domain    | Name: type      | Name: ASD        | Name: details                                             |
+//  | Labels:                           | Labels:         | Labels:         | Labels:          | Labels:                                                   |
+//  | Type: []time.Time                 | Type: []*string | Type: []*string | Type: []*float64 | Type: []*string                                           |
+//  +-----------------------------------+-----------------+-----------------+------------------+-----------------------------------------------------------+
+//  | 2023-10-20 08:05:42.916 +0000 UTC | AASD157         | fghg            | null             | Something happened AtTime=2023-10-20T08:05:42.902036      |
+//  | 2023-10-20 08:05:42.918 +0000 UTC | HUY23           | val23           | null             | Something else happened AtTime=2023-10-20T08:05:42.902036 |
+//  +-----------------------------------+-----------------+-----------------+------------------+-----------------------------------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "Annotation",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "table",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "domain",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "domain"
+            }
+          },
+          {
+            "name": "type",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "type"
+            }
+          },
+          {
+            "name": "ASD",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "ASD"
+            }
+          },
+          {
+            "name": "details",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "details"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1697789142916,
+            1697789142918
+          ],
+          [
+            "AASD157",
+            "HUY23"
+          ],
+          [
+            "fghg",
+            "val23"
+          ],
+          [
+            null,
+            null
+          ],
+          [
+            "Something happened AtTime=2023-10-20T08:05:42.902036",
+            "Something else happened AtTime=2023-10-20T08:05:42.902036"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/simple_response_with_diverse_data_types.time_series.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/simple_response_with_diverse_data_types.time_series.golden.jsonc
new file mode 100644
index 0000000000000..c1b164da72a4d
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/simple_response_with_diverse_data_types.time_series.golden.jsonc
@@ -0,0 +1,226 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "graph",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: Annotation.domain
+//  Dimensions: 2 Fields by 2 Rows
+//  +-----------------------------------+-----------------+
+//  | Name: Time                        | Name: Value     |
+//  | Labels:                           | Labels:         |
+//  | Type: []time.Time                 | Type: []*string |
+//  +-----------------------------------+-----------------+
+//  | 2023-10-20 08:05:42.916 +0000 UTC | AASD157         |
+//  | 2023-10-20 08:05:42.918 +0000 UTC | HUY23           |
+//  +-----------------------------------+-----------------+
+//  
+//  
+//  
+//  Frame[1] 
+//  Name: Annotation.type
+//  Dimensions: 2 Fields by 2 Rows
+//  +-----------------------------------+-----------------+
+//  | Name: Time                        | Name: Value     |
+//  | Labels:                           | Labels:         |
+//  | Type: []time.Time                 | Type: []*string |
+//  +-----------------------------------+-----------------+
+//  | 2023-10-20 08:05:42.916 +0000 UTC | fghg            |
+//  | 2023-10-20 08:05:42.918 +0000 UTC | val23           |
+//  +-----------------------------------+-----------------+
+//  
+//  
+//  
+//  Frame[2] 
+//  Name: Annotation.ASD
+//  Dimensions: 2 Fields by 2 Rows
+//  +-----------------------------------+------------------+
+//  | Name: Time                        | Name: Value      |
+//  | Labels:                           | Labels:          |
+//  | Type: []time.Time                 | Type: []*float64 |
+//  +-----------------------------------+------------------+
+//  | 2023-10-20 08:05:42.916 +0000 UTC | null             |
+//  | 2023-10-20 08:05:42.918 +0000 UTC | null             |
+//  +-----------------------------------+------------------+
+//  
+//  
+//  
+//  Frame[3] 
+//  Name: Annotation.details
+//  Dimensions: 2 Fields by 2 Rows
+//  +-----------------------------------+-----------------------------------------------------------+
+//  | Name: Time                        | Name: Value                                               |
+//  | Labels:                           | Labels:                                                   |
+//  | Type: []time.Time                 | Type: []*string                                           |
+//  +-----------------------------------+-----------------------------------------------------------+
+//  | 2023-10-20 08:05:42.916 +0000 UTC | Something happened AtTime=2023-10-20T08:05:42.902036      |
+//  | 2023-10-20 08:05:42.918 +0000 UTC | Something else happened AtTime=2023-10-20T08:05:42.902036 |
+//  +-----------------------------------+-----------------------------------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "Annotation.domain",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "graph",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "Annotation.domain"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1697789142916,
+            1697789142918
+          ],
+          [
+            "AASD157",
+            "HUY23"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "Annotation.type",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "Annotation.type"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1697789142916,
+            1697789142918
+          ],
+          [
+            "fghg",
+            "val23"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "Annotation.ASD",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "Annotation.ASD"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1697789142916,
+            1697789142918
+          ],
+          [
+            null,
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "Annotation.details",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "Annotation.details"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1697789142916,
+            1697789142918
+          ],
+          [
+            "Something happened AtTime=2023-10-20T08:05:42.902036",
+            "Something else happened AtTime=2023-10-20T08:05:42.902036"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/some_values_are_null.json b/pkg/tsdb/influxdb/influxql/testdata/some_values_are_null.json
new file mode 100644
index 0000000000000..43a4249284669
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/some_values_are_null.json
@@ -0,0 +1 @@
+{"results":[{"series":[{"name":"cpu","columns":["time","mean"],"values":[[100,null],[101,null],[102,52]]}]}]}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/some_values_are_null.table.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/some_values_are_null.table.golden.jsonc
new file mode 100644
index 0000000000000..1ba4e54302014
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/some_values_are_null.table.golden.jsonc
@@ -0,0 +1,76 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "table",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu
+//  Dimensions: 2 Fields by 3 Rows
+//  +-----------------------------------+------------------+
+//  | Name: Time                        | Name: mean       |
+//  | Labels:                           | Labels:          |
+//  | Type: []time.Time                 | Type: []*float64 |
+//  +-----------------------------------+------------------+
+//  | 1970-01-01 00:00:00.1 +0000 UTC   | null             |
+//  | 1970-01-01 00:00:00.101 +0000 UTC | null             |
+//  | 1970-01-01 00:00:00.102 +0000 UTC | 52               |
+//  +-----------------------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "table",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "mean",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "mean"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            100,
+            101,
+            102
+          ],
+          [
+            null,
+            null,
+            52
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/some_values_are_null.time_series.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/some_values_are_null.time_series.golden.jsonc
new file mode 100644
index 0000000000000..3c57bbdd0884c
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/some_values_are_null.time_series.golden.jsonc
@@ -0,0 +1,76 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "graph",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: cpu.mean
+//  Dimensions: 2 Fields by 3 Rows
+//  +-----------------------------------+------------------+
+//  | Name: Time                        | Name: Value      |
+//  | Labels:                           | Labels:          |
+//  | Type: []time.Time                 | Type: []*float64 |
+//  +-----------------------------------+------------------+
+//  | 1970-01-01 00:00:00.1 +0000 UTC   | null             |
+//  | 1970-01-01 00:00:00.101 +0000 UTC | null             |
+//  | 1970-01-01 00:00:00.102 +0000 UTC | 52               |
+//  +-----------------------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "cpu.mean",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "graph",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "cpu.mean"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            100,
+            101,
+            102
+          ],
+          [
+            null,
+            null,
+            52
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/string_column_with_null_value.json b/pkg/tsdb/influxdb/influxql/testdata/string_column_with_null_value.json
new file mode 100644
index 0000000000000..e23cfab65ba8e
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/string_column_with_null_value.json
@@ -0,0 +1 @@
+{"results":[{"statement_id":0,"series":[{"name":"series_name","tags":{},"columns":["time","col_1_name"],"values":[[1678723623474,"589051IR"]]},{"name":"series_name","tags":{},"columns":["time","col_1_name"],"values":[[1678723623474,null]]},{"name":"series_name","tags":{},"columns":["time","col_1_name"],"values":[[1678723623474,null]]}]}]}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/string_column_with_null_value.table.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/string_column_with_null_value.table.golden.jsonc
new file mode 100644
index 0000000000000..92e5da5d280cb
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/string_column_with_null_value.table.golden.jsonc
@@ -0,0 +1,76 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "table",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: series_name
+//  Dimensions: 2 Fields by 3 Rows
+//  +-----------------------------------+------------------+
+//  | Name: Time                        | Name: col_1_name |
+//  | Labels:                           | Labels:          |
+//  | Type: []time.Time                 | Type: []*string  |
+//  +-----------------------------------+------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 589051IR         |
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null             |
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null             |
+//  +-----------------------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "series_name",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "table",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "col_1_name",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "col_1_name"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474,
+            1678723623474,
+            1678723623474
+          ],
+          [
+            "589051IR",
+            null,
+            null
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/string_column_with_null_value.time_series.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/string_column_with_null_value.time_series.golden.jsonc
new file mode 100644
index 0000000000000..fb5f9afd56104
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/string_column_with_null_value.time_series.golden.jsonc
@@ -0,0 +1,169 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "graph",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: series_name.col_1_name
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+-----------------+
+//  | Name: Time                        | Name: Value     |
+//  | Labels:                           | Labels:         |
+//  | Type: []time.Time                 | Type: []*string |
+//  +-----------------------------------+-----------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | 589051IR        |
+//  +-----------------------------------+-----------------+
+//  
+//  
+//  
+//  Frame[1] 
+//  Name: series_name.col_1_name
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------+
+//  | Name: Time                        | Name: Value      |
+//  | Labels:                           | Labels:          |
+//  | Type: []time.Time                 | Type: []*float64 |
+//  +-----------------------------------+------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null             |
+//  +-----------------------------------+------------------+
+//  
+//  
+//  
+//  Frame[2] 
+//  Name: series_name.col_1_name
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------+
+//  | Name: Time                        | Name: Value      |
+//  | Labels:                           | Labels:          |
+//  | Type: []time.Time                 | Type: []*float64 |
+//  +-----------------------------------+------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null             |
+//  +-----------------------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "series_name.col_1_name",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "graph",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "labels": {},
+            "config": {
+              "displayNameFromDS": "series_name.col_1_name"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            "589051IR"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.col_1_name",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {},
+            "config": {
+              "displayNameFromDS": "series_name.col_1_name"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.col_1_name",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {},
+            "config": {
+              "displayNameFromDS": "series_name.col_1_name"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/string_column_with_null_value2.json b/pkg/tsdb/influxdb/influxql/testdata/string_column_with_null_value2.json
new file mode 100644
index 0000000000000..9ccea8bacef55
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/string_column_with_null_value2.json
@@ -0,0 +1 @@
+{"results":[{"statement_id":0,"series":[{"name":"series_name","tags":{},"columns":["time","col_1_name"],"values":[[1678723623474,null]]},{"name":"series_name","tags":{},"columns":["time","col_1_name"],"values":[[1678723623474,"someval"]]},{"name":"series_name","tags":{},"columns":["time","col_1_name"],"values":[[1678723623474,"anotherval"]]}]}]}
diff --git a/pkg/tsdb/influxdb/influxql/testdata/string_column_with_null_value2.table.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/string_column_with_null_value2.table.golden.jsonc
new file mode 100644
index 0000000000000..eea4a1f41daab
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/string_column_with_null_value2.table.golden.jsonc
@@ -0,0 +1,76 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "table",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: series_name
+//  Dimensions: 2 Fields by 3 Rows
+//  +-----------------------------------+------------------+
+//  | Name: Time                        | Name: col_1_name |
+//  | Labels:                           | Labels:          |
+//  | Type: []time.Time                 | Type: []*string  |
+//  +-----------------------------------+------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null             |
+//  | 2023-03-13 16:07:03.474 +0000 UTC | someval          |
+//  | 2023-03-13 16:07:03.474 +0000 UTC | anotherval       |
+//  +-----------------------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "series_name",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "table",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "col_1_name",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "config": {
+              "displayNameFromDS": "col_1_name"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474,
+            1678723623474,
+            1678723623474
+          ],
+          [
+            null,
+            "someval",
+            "anotherval"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/testdata/string_column_with_null_value2.time_series.golden.jsonc b/pkg/tsdb/influxdb/influxql/testdata/string_column_with_null_value2.time_series.golden.jsonc
new file mode 100644
index 0000000000000..df3a26e19500c
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/testdata/string_column_with_null_value2.time_series.golden.jsonc
@@ -0,0 +1,169 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "preferredVisualisationType": "graph",
+//      "executedQueryString": "Test raw query"
+//  }
+//  Name: series_name.col_1_name
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+------------------+
+//  | Name: Time                        | Name: Value      |
+//  | Labels:                           | Labels:          |
+//  | Type: []time.Time                 | Type: []*float64 |
+//  +-----------------------------------+------------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | null             |
+//  +-----------------------------------+------------------+
+//  
+//  
+//  
+//  Frame[1] 
+//  Name: series_name.col_1_name
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+-----------------+
+//  | Name: Time                        | Name: Value     |
+//  | Labels:                           | Labels:         |
+//  | Type: []time.Time                 | Type: []*string |
+//  +-----------------------------------+-----------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | someval         |
+//  +-----------------------------------+-----------------+
+//  
+//  
+//  
+//  Frame[2] 
+//  Name: series_name.col_1_name
+//  Dimensions: 2 Fields by 1 Rows
+//  +-----------------------------------+-----------------+
+//  | Name: Time                        | Name: Value     |
+//  | Labels:                           | Labels:         |
+//  | Type: []time.Time                 | Type: []*string |
+//  +-----------------------------------+-----------------+
+//  | 2023-03-13 16:07:03.474 +0000 UTC | anotherval      |
+//  +-----------------------------------+-----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "name": "series_name.col_1_name",
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "preferredVisualisationType": "graph",
+          "executedQueryString": "Test raw query"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {},
+            "config": {
+              "displayNameFromDS": "series_name.col_1_name"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            null
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.col_1_name",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "labels": {},
+            "config": {
+              "displayNameFromDS": "series_name.col_1_name"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            "someval"
+          ]
+        ]
+      }
+    },
+    {
+      "schema": {
+        "name": "series_name.col_1_name",
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Value",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            },
+            "labels": {},
+            "config": {
+              "displayNameFromDS": "series_name.col_1_name"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1678723623474
+          ],
+          [
+            "anotherval"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/influxdb/influxql/util/util.go b/pkg/tsdb/influxdb/influxql/util/util.go
new file mode 100644
index 0000000000000..b0179f3b2b515
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/util/util.go
@@ -0,0 +1,173 @@
+package util
+
+import (
+	"encoding/json"
+	"fmt"
+	"regexp"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+
+	"github.com/grafana/grafana/pkg/tsdb/influxdb/models"
+)
+
+var (
+	legendFormat = regexp.MustCompile(`\[\[([\@\/\w-]+)(\.[\@\/\w-]+)*\]\]*|\$([\@\w]+?)*`)
+)
+
+const (
+	GraphVisType data.VisType = "graph"
+	TableVisType data.VisType = "table"
+	LogsVisType  data.VisType = "logs"
+)
+
+func FormatFrameName(rowName, column string, tags map[string]string, query models.Query, frameName []byte) []byte {
+	if query.Alias == "" {
+		return BuildFrameNameFromQuery(rowName, column, tags, frameName, query.ResultFormat)
+	}
+	nameSegment := strings.Split(rowName, ".")
+	intervalText := gtime.FormatInterval(query.Interval)
+	intervalMs := int64(query.Interval / time.Millisecond)
+
+	result := legendFormat.ReplaceAllFunc([]byte(query.Alias), func(in []byte) []byte {
+		aliasFormat := string(in)
+		aliasFormat = strings.Replace(aliasFormat, "[[", "", 1)
+		aliasFormat = strings.Replace(aliasFormat, "]]", "", 1)
+		aliasFormat = strings.Replace(aliasFormat, "$", "", 1)
+
+		if aliasFormat == "m" || aliasFormat == "measurement" {
+			return []byte(rowName)
+		}
+		if aliasFormat == "col" {
+			return []byte(column)
+		}
+		if aliasFormat == "__interval" {
+			return []byte(intervalText)
+		}
+		if aliasFormat == "__interval_ms" {
+			return []byte(strconv.FormatInt(intervalMs, 10))
+		}
+
+		pos, err := strconv.Atoi(aliasFormat)
+		if err == nil && len(nameSegment) > pos {
+			return []byte(nameSegment[pos])
+		}
+
+		if !strings.HasPrefix(aliasFormat, "tag_") {
+			return in
+		}
+
+		tagKey := strings.Replace(aliasFormat, "tag_", "", 1)
+		tagValue, exist := tags[tagKey]
+		if exist {
+			return []byte(tagValue)
+		}
+
+		return in
+	})
+
+	return result
+}
+
+func BuildFrameNameFromQuery(rowName, column string, tags map[string]string, frameName []byte, resultFormat string) []byte {
+	if resultFormat != "table" {
+		frameName = append(frameName, rowName...)
+		frameName = append(frameName, '.')
+	}
+	frameName = append(frameName, column...)
+
+	if len(tags) == 0 {
+		return frameName
+	}
+	frameName = append(frameName, ' ', '{', ' ')
+	first := true
+	for k, v := range tags {
+		if !first {
+			frameName = append(frameName, ',', ' ')
+		} else {
+			first = false
+		}
+		frameName = append(frameName, k...)
+		frameName = append(frameName, ':', ' ')
+		frameName = append(frameName, v...)
+	}
+	return append(frameName, ' ', '}')
+}
+
+func ParseTimestamp(value any) (time.Time, error) {
+	timestampNumber, ok := value.(json.Number)
+	if !ok {
+		return time.Time{}, fmt.Errorf("timestamp-value has invalid type: %#v", value)
+	}
+	timestampInMilliseconds, err := timestampNumber.Int64()
+	if err != nil {
+		return time.Time{}, err
+	}
+
+	// currently in the code the influxdb-timestamps are requested with
+	// milliseconds-precision, meaning these values are milliseconds
+	t := time.UnixMilli(timestampInMilliseconds).UTC()
+
+	return t, nil
+}
+
+func Typeof(values [][]any, colIndex int) string {
+	for _, value := range values {
+		if value != nil && value[colIndex] != nil {
+			return fmt.Sprintf("%T", value[colIndex])
+		}
+	}
+	return "null"
+}
+
+func ParseNumber(value any) *float64 {
+	// NOTE: we use pointers-to-float64 because we need
+	// to represent null-json-values. they come for example
+	// when we do a group-by with fill(null)
+
+	if value == nil {
+		// this is what json-nulls become
+		return nil
+	}
+
+	number, ok := value.(json.Number)
+	if !ok {
+		// in the current implementation, errors become nils
+		return nil
+	}
+
+	fvalue, err := number.Float64()
+	if err != nil {
+		// in the current implementation, errors become nils
+		return nil
+	}
+
+	return &fvalue
+}
+
+func ParseString(value any) *string {
+	switch val := value.(type) {
+	case string:
+		return ToPtr(val)
+	default:
+		return ToPtr(fmt.Sprintf("%v", value))
+	}
+}
+
+func GetVisType(resFormat string) data.VisType {
+	switch resFormat {
+	case "table":
+		return TableVisType
+	case "logs":
+		return LogsVisType
+	default:
+		return GraphVisType
+	}
+}
+
+func ToPtr[T any](v T) *T {
+	return &v
+}
diff --git a/pkg/tsdb/influxdb/influxql/util/util_test.go b/pkg/tsdb/influxdb/influxql/util/util_test.go
new file mode 100644
index 0000000000000..12809575a82ed
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxql/util/util_test.go
@@ -0,0 +1,67 @@
+package util
+
+import (
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/tsdb/influxdb/models"
+)
+
+func TestParseString(t *testing.T) {
+	t.Run("parse bool value to string", func(t *testing.T) {
+		val := true
+		expected := ToPtr("true")
+		result := ParseString(val)
+		require.Equal(t, expected, result)
+	})
+
+	t.Run("parse number value to string", func(t *testing.T) {
+		val := 123
+		expected := ToPtr("123")
+		result := ParseString(val)
+		require.Equal(t, expected, result)
+	})
+}
+
+func TestFormatFrameName(t *testing.T) {
+	testcases := []struct {
+		name     string
+		rowName  string
+		column   string
+		tags     map[string]string
+		query    models.Query
+		expected string
+	}{
+		{name: "no alias", rowName: "rowName", column: "colName", tags: map[string]string{"key": "value"}, query: models.Query{Alias: "", ResultFormat: "time_series"}, expected: "rowName.colName { key: value }"},
+		{name: "simple alias", rowName: "rowName", column: "colName", tags: map[string]string{"key": "value"}, query: models.Query{Alias: "alias", ResultFormat: "time_series"}, expected: "alias"},
+		{name: "segmented name", rowName: "rowName.other.one", column: "colName", tags: map[string]string{"key": "value"}, query: models.Query{Alias: "zero: $0 - one: $1 - second: $2", ResultFormat: "time_series"}, expected: "zero: rowName - one: other - second: one"},
+		{name: "[[m]] measurement alias", rowName: "rowName", column: "colName", tags: map[string]string{"key": "value"}, query: models.Query{Alias: "[[m]]", ResultFormat: "time_series"}, expected: "rowName"},
+		{name: "$m measurement alias", rowName: "rowName", column: "colName", tags: map[string]string{"key": "value"}, query: models.Query{Alias: "$m", ResultFormat: "time_series"}, expected: "rowName"},
+		{name: "[[measurement]] measurement alias", rowName: "rowName", column: "colName", tags: map[string]string{"key": "value"}, query: models.Query{Alias: "[[measurement]]", ResultFormat: "time_series"}, expected: "rowName"},
+		{name: "[[col]] column alias", rowName: "rowName", column: "colName", tags: map[string]string{"key": "value"}, query: models.Query{Alias: "[[col]]", ResultFormat: "time_series"}, expected: "colName"},
+		{name: "$col column alias", rowName: "rowName", column: "colName", tags: map[string]string{"key": "value"}, query: models.Query{Alias: "$col", ResultFormat: "time_series"}, expected: "colName"},
+		{name: "[[tag_key]] tag alias", rowName: "rowName", column: "colName", tags: map[string]string{"key": "value"}, query: models.Query{Alias: "[[tag_key]]", ResultFormat: "time_series"}, expected: "value"},
+		{name: "$tag_key tag alias", rowName: "rowName", column: "colName", tags: map[string]string{"key": "value"}, query: models.Query{Alias: "$tag_key", ResultFormat: "time_series"}, expected: "value"},
+		{name: "[[m]] with additional text", rowName: "rowName", column: "colName", tags: map[string]string{"key": "value"}, query: models.Query{Alias: "[[m]] - something", ResultFormat: "time_series"}, expected: "rowName - something"},
+		{name: "$m with additional text", rowName: "rowName", column: "colName", tags: map[string]string{"key": "value"}, query: models.Query{Alias: "$m - something", ResultFormat: "time_series"}, expected: "rowName - something"},
+		{name: "[[measurement]] with additional text", rowName: "rowName", column: "colName", tags: map[string]string{"key": "value"}, query: models.Query{Alias: "[[measurement]] - something", ResultFormat: "time_series"}, expected: "rowName - something"},
+		{name: "[[col]] with additional text", rowName: "rowName", column: "colName", tags: map[string]string{"key": "value"}, query: models.Query{Alias: "[[col]] - something", ResultFormat: "time_series"}, expected: "colName - something"},
+		{name: "$col with additional text", rowName: "rowName", column: "colName", tags: map[string]string{"key": "value"}, query: models.Query{Alias: "$col - something", ResultFormat: "time_series"}, expected: "colName - something"},
+		{name: "[[tag_key]] with additional text", rowName: "rowName", column: "colName", tags: map[string]string{"key": "value"}, query: models.Query{Alias: "[[tag_key]] - something", ResultFormat: "time_series"}, expected: "value - something"},
+		{name: "$tag_key with additional text", rowName: "rowName", column: "colName", tags: map[string]string{"key": "value"}, query: models.Query{Alias: "$tag_key - something", ResultFormat: "time_series"}, expected: "value - something"},
+		{name: "$tag_key complex", rowName: "rowName", column: "colName", tags: map[string]string{"key": "value", "key2": "value2"}, query: models.Query{Alias: "L:$tag_key-$tag_key2", ResultFormat: "time_series"}, expected: "L:value-value2"},
+		{name: "$__interval", rowName: "rowName", column: "colName", tags: map[string]string{"key": "value", "key2": "value2"}, query: models.Query{Alias: "Interval: $__interval", Interval: time.Millisecond * 10}, expected: "Interval: 10ms"},
+		{name: "$__interval_ms", rowName: "rowName", column: "colName", tags: map[string]string{"key": "value", "key2": "value2"}, query: models.Query{Alias: "Interval: $__interval_ms", Interval: time.Millisecond * 10}, expected: "Interval: 10"},
+		{name: "Complex alias with $__interval and $tag_key", rowName: "rowName", column: "colName", tags: map[string]string{"key": "value", "key2": "value2"}, query: models.Query{Alias: "Interval: $__interval_ms for tag: $tag_key", Interval: time.Millisecond * 10}, expected: "Interval: 10 for tag: value"},
+	}
+
+	frameName := make([]byte, 0, 128)
+	for _, tc := range testcases {
+		t.Run(tc.name, func(t *testing.T) {
+			result := string(FormatFrameName(tc.rowName, tc.column, tc.tags, tc.query, frameName[:]))
+			require.Equal(t, tc.expected, result)
+		})
+	}
+}
diff --git a/pkg/tsdb/influxdb/mocks_test.go b/pkg/tsdb/influxdb/mocks_test.go
index 4dc690c4ccb04..c08090bb747a3 100644
--- a/pkg/tsdb/influxdb/mocks_test.go
+++ b/pkg/tsdb/influxdb/mocks_test.go
@@ -14,6 +14,7 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
 
 	"github.com/grafana/grafana/pkg/infra/httpclient"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/tsdb/influxdb/models"
 )
 
@@ -117,5 +118,8 @@ func GetMockService(version string, rt RoundTripper) *Service {
 			version:          version,
 			fakeRoundTripper: rt,
 		},
+
+		// featuremgmt.FlagInfluxqlStreamingParser: false
+		features: featuremgmt.WithFeatures(),
 	}
 }
diff --git a/pkg/tsdb/influxdb/models/datasource_info.go b/pkg/tsdb/influxdb/models/datasource_info.go
index 3a86f853228a2..2e953ed4a7949 100644
--- a/pkg/tsdb/influxdb/models/datasource_info.go
+++ b/pkg/tsdb/influxdb/models/datasource_info.go
@@ -2,6 +2,7 @@ package models
 
 import (
 	"net/http"
+	"time"
 )
 
 type DatasourceInfo struct {
@@ -17,9 +18,8 @@ type DatasourceInfo struct {
 	DefaultBucket string `json:"defaultBucket"`
 	Organization  string `json:"organization"`
 	MaxSeries     int    `json:"maxSeries"`
+	Timeout       time.Duration
 
-	// Flight SQL metadata
-	Metadata []map[string]string `json:"metadata"`
 	// FlightSQL grpc connection
-	SecureGrpc bool `json:"secureGrpc"`
+	InsecureGrpc bool `json:"insecureGrpc"`
 }
diff --git a/pkg/tsdb/influxdb/models/query.go b/pkg/tsdb/influxdb/models/query.go
index 0c6155521b49a..0620e5d3b027d 100644
--- a/pkg/tsdb/influxdb/models/query.go
+++ b/pkg/tsdb/influxdb/models/query.go
@@ -8,13 +8,13 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
-
-	"github.com/grafana/grafana/pkg/tsdb/intervalv2"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
 )
 
 var (
-	regexpOperatorPattern    = regexp.MustCompile(`^\/.*\/$`)
-	regexpMeasurementPattern = regexp.MustCompile(`^\/.*\/$`)
+	regexpOperatorPattern           = regexp.MustCompile(`^\/.*\/$`)
+	regexpMeasurementPattern        = regexp.MustCompile(`^\/.*\/$`)
+	regexMatcherWithStartEndPattern = regexp.MustCompile(`^/\^(.*)\$/$`)
 )
 
 func (query *Query) Build(queryContext *backend.QueryDataRequest) (string, error) {
@@ -33,7 +33,7 @@ func (query *Query) Build(queryContext *backend.QueryDataRequest) (string, error
 		res += query.renderTz()
 	}
 
-	intervalText := intervalv2.FormatDuration(query.Interval)
+	intervalText := gtime.FormatInterval(query.Interval)
 	intervalMs := int64(query.Interval / time.Millisecond)
 
 	res = strings.ReplaceAll(res, "$timeFilter", query.renderTimeFilter(queryContext))
@@ -67,15 +67,56 @@ func (query *Query) renderTags() []string {
 			}
 		}
 
+		isOperatorTypeHandler := func(tag *Tag) (string, string) {
+			// Attempt to identify the type of the supplied value
+			var lowerValue = strings.ToLower(tag.Value)
+			var r = regexp.MustCompile(`^(-?)[0-9\.]+$`)
+			var textValue string
+			var operator string
+
+			// Perform operator replacements
+			switch tag.Operator {
+			case "Is":
+				operator = "="
+			case "Is Not":
+				operator = "!="
+			default:
+				// This should never happen
+				operator = "="
+			}
+
+			// Always quote tag values
+			if strings.HasSuffix(tag.Key, "::tag") {
+				textValue = fmt.Sprintf("'%s'", strings.ReplaceAll(tag.Value, `\`, `\\`))
+				return textValue, operator
+			}
+
+			// Try and discern the type of fields
+			if lowerValue == "true" || lowerValue == "false" {
+				// boolean, don't quote, but make lowercase
+				textValue = lowerValue
+			} else if r.MatchString(tag.Value) {
+				// Integer or float, don't quote
+				textValue = tag.Value
+			} else {
+				// String (or unknown) - quote
+				textValue = fmt.Sprintf("'%s'", strings.ReplaceAll(tag.Value, `\`, `\\`))
+			}
+
+			return removeRegexWrappers(textValue, `'`), operator
+		}
+
 		// quote value unless regex or number
 		var textValue string
 		switch tag.Operator {
-		case "=~", "!~":
-			textValue = tag.Value
-		case "<", ">":
+		case "=~", "!~", "":
 			textValue = tag.Value
+		case "<", ">", ">=", "<=":
+			textValue = removeRegexWrappers(tag.Value, `'`)
+		case "Is", "Is Not":
+			textValue, tag.Operator = isOperatorTypeHandler(tag)
 		default:
-			textValue = fmt.Sprintf("'%s'", strings.ReplaceAll(tag.Value, `\`, `\\`))
+			textValue = fmt.Sprintf("'%s'", strings.ReplaceAll(removeRegexWrappers(tag.Value, ""), `\`, `\\`))
 		}
 
 		escapedKey := fmt.Sprintf(`"%s"`, tag.Key)
@@ -203,3 +244,15 @@ func epochMStoInfluxTime(tr *backend.TimeRange) (string, string) {
 
 	return fmt.Sprintf("%dms", from), fmt.Sprintf("%dms", to)
 }
+
+func removeRegexWrappers(wrappedValue string, wrapper string) string {
+	value := wrappedValue
+	// get the value only in between /^...$/
+	matches := regexMatcherWithStartEndPattern.FindStringSubmatch(wrappedValue)
+	if len(matches) > 1 {
+		// full match. the value is like /^value$/
+		value = wrapper + matches[1] + wrapper
+	}
+
+	return value
+}
diff --git a/pkg/tsdb/influxdb/models/query_test.go b/pkg/tsdb/influxdb/models/query_test.go
index 8bda035939480..235de42360efa 100644
--- a/pkg/tsdb/influxdb/models/query_test.go
+++ b/pkg/tsdb/influxdb/models/query_test.go
@@ -228,6 +228,58 @@ func TestInfluxdbQueryBuilder(t *testing.T) {
 			require.Equal(t, strings.Join(query.renderTags(), ""), `"key" > 10001`)
 		})
 
+		t.Run("can render number greater than or equal to condition tags", func(t *testing.T) {
+			query := &Query{Tags: []*Tag{{Operator: ">=", Value: "10001", Key: "key"}}}
+
+			require.Equal(t, strings.Join(query.renderTags(), ""), `"key" >= 10001`)
+		})
+		t.Run("can render number less than or equal to condition tags", func(t *testing.T) {
+			query := &Query{Tags: []*Tag{{Operator: "<=", Value: "10001", Key: "key"}}}
+
+			require.Equal(t, strings.Join(query.renderTags(), ""), `"key" <= 10001`)
+		})
+
+		t.Run("can render boolean equality tags", func(t *testing.T) {
+			query := &Query{Tags: []*Tag{{Operator: "Is", Value: "false", Key: "key"}}}
+
+			require.Equal(t, strings.Join(query.renderTags(), ""), `"key" = false`)
+		})
+
+		t.Run("can render boolean inequality tags", func(t *testing.T) {
+			query := &Query{Tags: []*Tag{{Operator: "Is Not", Value: "true", Key: "key"}}}
+			require.Equal(t, strings.Join(query.renderTags(), ""), `"key" != true`)
+		})
+
+		t.Run("can correct case of boolean tags", func(t *testing.T) {
+			query := &Query{Tags: []*Tag{{Operator: "Is", Value: "False", Key: "key"}}}
+			require.Equal(t, strings.Join(query.renderTags(), ""), `"key" = false`)
+		})
+
+		t.Run("can use strings with Is", func(t *testing.T) {
+			query := &Query{Tags: []*Tag{{Operator: "Is", Value: "A string", Key: "key"}}}
+			require.Equal(t, strings.Join(query.renderTags(), ""), `"key" = 'A string'`)
+		})
+
+		t.Run("can use integers with Is", func(t *testing.T) {
+			query := &Query{Tags: []*Tag{{Operator: "Is", Value: "123", Key: "key"}}}
+			require.Equal(t, strings.Join(query.renderTags(), ""), `"key" = 123`)
+		})
+
+		t.Run("can use negative integers with Is", func(t *testing.T) {
+			query := &Query{Tags: []*Tag{{Operator: "Is", Value: "-123", Key: "key"}}}
+			require.Equal(t, strings.Join(query.renderTags(), ""), `"key" = -123`)
+		})
+
+		t.Run("can use floats with Is", func(t *testing.T) {
+			query := &Query{Tags: []*Tag{{Operator: "Is", Value: "1.23", Key: "key"}}}
+			require.Equal(t, strings.Join(query.renderTags(), ""), `"key" = 1.23`)
+		})
+
+		t.Run("can use negative floats with Is", func(t *testing.T) {
+			query := &Query{Tags: []*Tag{{Operator: "Is", Value: "-1.23", Key: "key"}}}
+			require.Equal(t, strings.Join(query.renderTags(), ""), `"key" = -1.23`)
+		})
+
 		t.Run("can render string tags", func(t *testing.T) {
 			query := &Query{Tags: []*Tag{{Operator: "=", Value: "value", Key: "key"}}}
 
@@ -251,5 +303,29 @@ func TestInfluxdbQueryBuilder(t *testing.T) {
 
 			require.Equal(t, query.renderMeasurement(), ` FROM "policy"./apa/`)
 		})
+
+		t.Run("can render single quoted tag value when regexed value has been sent", func(t *testing.T) {
+			query := &Query{Tags: []*Tag{{Operator: ">", Value: `/^12.2$/`, Key: "key"}}}
+
+			require.Equal(t, `"key" > '12.2'`, strings.Join(query.renderTags(), ""))
+		})
+	})
+}
+
+func TestRemoveRegexWrappers(t *testing.T) {
+	t.Run("remove regex wrappers", func(t *testing.T) {
+		wrappedText := `/^someValue$/`
+		expected := `'someValue'`
+		result := removeRegexWrappers(wrappedText, `'`)
+
+		require.Equal(t, expected, result)
+	})
+
+	t.Run("return same value if the value is not wrapped by regex wrappers", func(t *testing.T) {
+		wrappedText := `someValue`
+		expected := `someValue`
+		result := removeRegexWrappers(wrappedText, "")
+
+		require.Equal(t, expected, result)
 	})
 }
diff --git a/pkg/tsdb/intervalv2/intervalv2.go b/pkg/tsdb/intervalv2/intervalv2.go
deleted file mode 100644
index c107f7ab08713..0000000000000
--- a/pkg/tsdb/intervalv2/intervalv2.go
+++ /dev/null
@@ -1,255 +0,0 @@
-package intervalv2
-
-import (
-	"fmt"
-	"regexp"
-	"strings"
-	"time"
-
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
-)
-
-var (
-	DefaultRes         int64 = 1500
-	defaultMinInterval       = time.Millisecond * 1
-	year                     = time.Hour * 24 * 365
-	day                      = time.Hour * 24
-)
-
-type Interval struct {
-	Text  string
-	Value time.Duration
-}
-
-type intervalCalculator struct {
-	minInterval time.Duration
-}
-
-type Calculator interface {
-	Calculate(timerange backend.TimeRange, minInterval time.Duration, maxDataPoints int64) Interval
-	CalculateSafeInterval(timerange backend.TimeRange, resolution int64) Interval
-}
-
-type CalculatorOptions struct {
-	MinInterval time.Duration
-}
-
-func NewCalculator(opts ...CalculatorOptions) *intervalCalculator {
-	calc := &intervalCalculator{}
-
-	for _, o := range opts {
-		if o.MinInterval == 0 {
-			calc.minInterval = defaultMinInterval
-		} else {
-			calc.minInterval = o.MinInterval
-		}
-	}
-
-	return calc
-}
-
-func (i *Interval) Milliseconds() int64 {
-	return i.Value.Nanoseconds() / int64(time.Millisecond)
-}
-
-func (ic *intervalCalculator) Calculate(timerange backend.TimeRange, minInterval time.Duration, maxDataPoints int64) Interval {
-	to := timerange.To.UnixNano()
-	from := timerange.From.UnixNano()
-	resolution := maxDataPoints
-	if resolution == 0 {
-		resolution = DefaultRes
-	}
-
-	calculatedInterval := time.Duration((to - from) / resolution)
-
-	if calculatedInterval < minInterval {
-		return Interval{Text: FormatDuration(minInterval), Value: minInterval}
-	}
-
-	rounded := roundInterval(calculatedInterval)
-
-	return Interval{Text: FormatDuration(rounded), Value: rounded}
-}
-
-func (ic *intervalCalculator) CalculateSafeInterval(timerange backend.TimeRange, safeRes int64) Interval {
-	to := timerange.To.UnixNano()
-	from := timerange.From.UnixNano()
-	safeInterval := time.Duration((to - from) / safeRes)
-
-	rounded := roundInterval(safeInterval)
-	return Interval{Text: FormatDuration(rounded), Value: rounded}
-}
-
-// GetIntervalFrom returns the minimum interval.
-// dsInterval is the string representation of data source min interval, if configured.
-// queryInterval is the string representation of query interval (min interval), e.g. "10ms" or "10s".
-// queryIntervalMS is a pre-calculated numeric representation of the query interval in milliseconds.
-func GetIntervalFrom(dsInterval, queryInterval string, queryIntervalMS int64, defaultInterval time.Duration) (time.Duration, error) {
-	// Apparently we are setting default value of queryInterval to 0s now
-	interval := queryInterval
-	if interval == "0s" {
-		interval = ""
-	}
-	if interval == "" {
-		if queryIntervalMS != 0 {
-			return time.Duration(queryIntervalMS) * time.Millisecond, nil
-		}
-	}
-	if interval == "" && dsInterval != "" {
-		interval = dsInterval
-	}
-	if interval == "" {
-		return defaultInterval, nil
-	}
-
-	parsedInterval, err := ParseIntervalStringToTimeDuration(interval)
-	if err != nil {
-		return time.Duration(0), err
-	}
-
-	return parsedInterval, nil
-}
-
-func ParseIntervalStringToTimeDuration(interval string) (time.Duration, error) {
-	formattedInterval := strings.Replace(strings.Replace(interval, "<", "", 1), ">", "", 1)
-	isPureNum, err := regexp.MatchString(`^\d+$`, formattedInterval)
-	if err != nil {
-		return time.Duration(0), err
-	}
-	if isPureNum {
-		formattedInterval += "s"
-	}
-	parsedInterval, err := gtime.ParseDuration(formattedInterval)
-	if err != nil {
-		return time.Duration(0), err
-	}
-	return parsedInterval, nil
-}
-
-// FormatDuration converts a duration into the kbn format e.g. 1m 2h or 3d
-func FormatDuration(inter time.Duration) string {
-	if inter >= year {
-		return fmt.Sprintf("%dy", inter/year)
-	}
-
-	if inter >= day {
-		return fmt.Sprintf("%dd", inter/day)
-	}
-
-	if inter >= time.Hour {
-		return fmt.Sprintf("%dh", inter/time.Hour)
-	}
-
-	if inter >= time.Minute {
-		return fmt.Sprintf("%dm", inter/time.Minute)
-	}
-
-	if inter >= time.Second {
-		return fmt.Sprintf("%ds", inter/time.Second)
-	}
-
-	if inter >= time.Millisecond {
-		return fmt.Sprintf("%dms", inter/time.Millisecond)
-	}
-
-	return "1ms"
-}
-
-//nolint:gocyclo
-func roundInterval(interval time.Duration) time.Duration {
-	switch {
-	// 0.01s
-	case interval <= 10*time.Millisecond:
-		return time.Millisecond * 1 // 0.001s
-	// 0.015s
-	case interval <= 15*time.Millisecond:
-		return time.Millisecond * 10 // 0.01s
-	// 0.035s
-	case interval <= 35*time.Millisecond:
-		return time.Millisecond * 20 // 0.02s
-	// 0.075s
-	case interval <= 75*time.Millisecond:
-		return time.Millisecond * 50 // 0.05s
-	// 0.15s
-	case interval <= 150*time.Millisecond:
-		return time.Millisecond * 100 // 0.1s
-	// 0.35s
-	case interval <= 350*time.Millisecond:
-		return time.Millisecond * 200 // 0.2s
-	// 0.75s
-	case interval <= 750*time.Millisecond:
-		return time.Millisecond * 500 // 0.5s
-	// 1.5s
-	case interval <= 1500*time.Millisecond:
-		return time.Millisecond * 1000 // 1s
-	// 3.5s
-	case interval <= 3500*time.Millisecond:
-		return time.Millisecond * 2000 // 2s
-	// 7.5s
-	case interval <= 7500*time.Millisecond:
-		return time.Millisecond * 5000 // 5s
-	// 12.5s
-	case interval <= 12500*time.Millisecond:
-		return time.Millisecond * 10000 // 10s
-	// 17.5s
-	case interval <= 17500*time.Millisecond:
-		return time.Millisecond * 15000 // 15s
-	// 25s
-	case interval <= 25000*time.Millisecond:
-		return time.Millisecond * 20000 // 20s
-	// 45s
-	case interval <= 45000*time.Millisecond:
-		return time.Millisecond * 30000 // 30s
-	// 1.5m
-	case interval <= 90000*time.Millisecond:
-		return time.Millisecond * 60000 // 1m
-	// 3.5m
-	case interval <= 210000*time.Millisecond:
-		return time.Millisecond * 120000 // 2m
-	// 7.5m
-	case interval <= 450000*time.Millisecond:
-		return time.Millisecond * 300000 // 5m
-	// 12.5m
-	case interval <= 750000*time.Millisecond:
-		return time.Millisecond * 600000 // 10m
-	// 17.5m
-	case interval <= 1050000*time.Millisecond:
-		return time.Millisecond * 900000 // 15m
-	// 25m
-	case interval <= 1500000*time.Millisecond:
-		return time.Millisecond * 1200000 // 20m
-	// 45m
-	case interval <= 2700000*time.Millisecond:
-		return time.Millisecond * 1800000 // 30m
-	// 1.5h
-	case interval <= 5400000*time.Millisecond:
-		return time.Millisecond * 3600000 // 1h
-	// 2.5h
-	case interval <= 9000000*time.Millisecond:
-		return time.Millisecond * 7200000 // 2h
-	// 4.5h
-	case interval <= 16200000*time.Millisecond:
-		return time.Millisecond * 10800000 // 3h
-	// 9h
-	case interval <= 32400000*time.Millisecond:
-		return time.Millisecond * 21600000 // 6h
-	// 24h
-	case interval <= 86400000*time.Millisecond:
-		return time.Millisecond * 43200000 // 12h
-	// 48h
-	case interval <= 172800000*time.Millisecond:
-		return time.Millisecond * 86400000 // 24h
-	// 1w
-	case interval <= 604800000*time.Millisecond:
-		return time.Millisecond * 86400000 // 24h
-	// 3w
-	case interval <= 1814400000*time.Millisecond:
-		return time.Millisecond * 604800000 // 1w
-	// 2y
-	case interval < 3628800000*time.Millisecond:
-		return time.Millisecond * 2592000000 // 30d
-	default:
-		return time.Millisecond * 31536000000 // 1y
-	}
-}
diff --git a/pkg/tsdb/intervalv2/intervalv2_test.go b/pkg/tsdb/intervalv2/intervalv2_test.go
deleted file mode 100644
index 21b5a48abeffe..0000000000000
--- a/pkg/tsdb/intervalv2/intervalv2_test.go
+++ /dev/null
@@ -1,132 +0,0 @@
-package intervalv2
-
-import (
-	"testing"
-	"time"
-
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/grafana/grafana/pkg/services/datasources"
-)
-
-func TestIntervalCalculator_Calculate(t *testing.T) {
-	calculator := NewCalculator(CalculatorOptions{})
-
-	timeNow := time.Now()
-
-	testCases := []struct {
-		name       string
-		timeRange  backend.TimeRange
-		resolution int64
-		expected   string
-	}{
-		{"from 5m to now and default resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(5 * time.Minute)}, 0, "200ms"},
-		{"from 5m to now and 500 resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(5 * time.Minute)}, 500, "500ms"},
-		{"from 15m to now and default resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(15 * time.Minute)}, 0, "500ms"},
-		{"from 15m to now and 100 resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(15 * time.Minute)}, 100, "10s"},
-		{"from 30m to now and default resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(30 * time.Minute)}, 0, "1s"},
-		{"from 30m to now and 3000 resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(30 * time.Minute)}, 3000, "500ms"},
-		{"from 1h to now and default resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(time.Hour)}, 0, "2s"},
-		{"from 1h to now and 1000 resoluion", backend.TimeRange{From: timeNow, To: timeNow.Add(time.Hour)}, 1000, "5s"},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			interval := calculator.Calculate(tc.timeRange, time.Millisecond*1, tc.resolution)
-			assert.Equal(t, tc.expected, interval.Text)
-		})
-	}
-}
-
-func TestIntervalCalculator_CalculateSafeInterval(t *testing.T) {
-	calculator := NewCalculator(CalculatorOptions{})
-
-	timeNow := time.Now()
-
-	testCases := []struct {
-		name           string
-		timeRange      backend.TimeRange
-		safeResolution int64
-		expected       string
-	}{
-		{"from 5m to now", backend.TimeRange{From: timeNow, To: timeNow.Add(5 * time.Minute)}, 11000, "20ms"},
-		{"from 15m to now", backend.TimeRange{From: timeNow, To: timeNow.Add(15 * time.Minute)}, 11000, "100ms"},
-		{"from 30m to now", backend.TimeRange{From: timeNow, To: timeNow.Add(30 * time.Minute)}, 11000, "200ms"},
-		{"from 24h to now", backend.TimeRange{From: timeNow, To: timeNow.Add(1440 * time.Minute)}, 11000, "10s"},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			interval := calculator.CalculateSafeInterval(tc.timeRange, tc.safeResolution)
-			assert.Equal(t, tc.expected, interval.Text)
-		})
-	}
-}
-
-func TestRoundInterval(t *testing.T) {
-	testCases := []struct {
-		name     string
-		interval time.Duration
-		expected time.Duration
-	}{
-		{"10ms", time.Millisecond * 10, time.Millisecond * 1},
-		{"15ms", time.Millisecond * 15, time.Millisecond * 10},
-		{"30ms", time.Millisecond * 30, time.Millisecond * 20},
-		{"45ms", time.Millisecond * 45, time.Millisecond * 50},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			assert.Equal(t, tc.expected, roundInterval(tc.interval))
-		})
-	}
-}
-
-func TestFormatDuration(t *testing.T) {
-	testCases := []struct {
-		name     string
-		duration time.Duration
-		expected string
-	}{
-		{"61s", time.Second * 61, "1m"},
-		{"30ms", time.Millisecond * 30, "30ms"},
-		{"23h", time.Hour * 23, "23h"},
-		{"24h", time.Hour * 24, "1d"},
-		{"367d", time.Hour * 24 * 367, "1y"},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			assert.Equal(t, tc.expected, FormatDuration(tc.duration))
-		})
-	}
-}
-
-func TestGetIntervalFrom(t *testing.T) {
-	testCases := []struct {
-		name            string
-		dsInfo          *datasources.DataSource
-		queryInterval   string
-		queryIntervalMs int64
-		defaultInterval time.Duration
-		expected        time.Duration
-	}{
-		{"45s", nil, "45s", 0, time.Second * 15, time.Second * 45},
-		{"45", nil, "45", 0, time.Second * 15, time.Second * 45},
-		{"2m", nil, "2m", 0, time.Second * 15, time.Minute * 2},
-		{"1d", nil, "1d", 0, time.Second * 15, time.Hour * 24},
-		{"intervalMs", nil, "", 45000, time.Second * 15, time.Second * 45},
-		{"intervalMs sub-seconds", nil, "", 45200, time.Second * 15, time.Millisecond * 45200},
-		{"defaultInterval when interval empty", nil, "", 0, time.Second * 15, time.Second * 15},
-		{"defaultInterval when intervalMs 0", nil, "", 0, time.Second * 15, time.Second * 15},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			actual, err := GetIntervalFrom(tc.queryInterval, "", tc.queryIntervalMs, tc.defaultInterval)
-			assert.Nil(t, err)
-			assert.Equal(t, tc.expected, actual)
-		})
-	}
-}
diff --git a/pkg/tsdb/legacydata/conversions.go b/pkg/tsdb/legacydata/conversions.go
new file mode 100644
index 0000000000000..4ca7322f9e8e7
--- /dev/null
+++ b/pkg/tsdb/legacydata/conversions.go
@@ -0,0 +1,84 @@
+package legacydata
+
+import (
+	"encoding/json"
+	"fmt"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	data "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+)
+
+// ToDataSourceQueries returns queries that should be sent to a single datasource
+// This will throw an error if the queries reference multiple instances
+func ToDataSourceQueries(req data.QueryDataRequest) ([]backend.DataQuery, *data.DataSourceRef, error) {
+	var dsRef *data.DataSourceRef
+	var tr *backend.TimeRange
+	if req.From != "" {
+		val := NewDataTimeRange(req.From, req.To)
+		tr = &backend.TimeRange{
+			From: val.GetFromAsTimeUTC(),
+			To:   val.GetToAsTimeUTC(),
+		}
+	}
+
+	queries := []backend.DataQuery{}
+	if len(req.Queries) > 0 {
+		dsRef := req.Queries[0].Datasource
+		for _, generic := range req.Queries {
+			if generic.Datasource != nil && dsRef != nil {
+				if dsRef.Type != generic.Datasource.Type {
+					return queries, dsRef, fmt.Errorf("expect same datasource types")
+				}
+				if dsRef.UID != generic.Datasource.UID {
+					return queries, dsRef, fmt.Errorf("expect same datasource UID")
+				}
+			}
+			q, err := toBackendDataQuery(generic, tr)
+			if err != nil {
+				return queries, dsRef, err
+			}
+			queries = append(queries, q)
+		}
+		return queries, dsRef, nil
+	}
+	return queries, dsRef, nil
+}
+
+// Converts a generic query to a backend one
+func toBackendDataQuery(q data.DataQuery, defaultTimeRange *backend.TimeRange) (backend.DataQuery, error) {
+	var err error
+	bq := backend.DataQuery{
+		RefID:         q.RefID,
+		QueryType:     q.QueryType,
+		MaxDataPoints: q.MaxDataPoints,
+	}
+
+	// Set an explicit time range for the query
+	if q.TimeRange != nil {
+		tr := NewDataTimeRange(q.TimeRange.From, q.TimeRange.To)
+		bq.TimeRange = backend.TimeRange{
+			From: tr.GetFromAsTimeUTC(),
+			To:   tr.GetToAsTimeUTC(),
+		}
+	} else if defaultTimeRange != nil {
+		bq.TimeRange = *defaultTimeRange
+	}
+
+	bq.JSON, err = json.Marshal(q)
+	if err != nil {
+		return bq, err
+	}
+	if bq.RefID == "" {
+		bq.RefID = "A"
+	}
+	if bq.MaxDataPoints == 0 {
+		bq.MaxDataPoints = 100
+	}
+	if q.IntervalMS > 0 {
+		bq.Interval = time.Millisecond * time.Duration(q.IntervalMS)
+	} else {
+		bq.Interval = time.Second
+	}
+	return bq, nil
+}
diff --git a/pkg/tsdb/legacydata/interval/interval.go b/pkg/tsdb/legacydata/interval/interval.go
index 2ab255a3c5f78..7f9769f471730 100644
--- a/pkg/tsdb/legacydata/interval/interval.go
+++ b/pkg/tsdb/legacydata/interval/interval.go
@@ -1,7 +1,6 @@
 package interval
 
 import (
-	"fmt"
 	"regexp"
 	"strings"
 	"time"
@@ -16,8 +15,6 @@ import (
 var (
 	DefaultRes         int64 = 1500
 	defaultMinInterval       = time.Millisecond * 1
-	year                     = time.Hour * 24 * 365
-	day                      = time.Hour * 24
 )
 
 type Interval struct {
@@ -62,11 +59,11 @@ func (ic *intervalCalculator) Calculate(timerange legacydata.DataTimeRange, minI
 	calculatedInterval := time.Duration((to - from) / DefaultRes)
 
 	if calculatedInterval < minInterval {
-		return Interval{Text: FormatDuration(minInterval), Value: minInterval}
+		return Interval{Text: gtime.FormatInterval(minInterval), Value: minInterval}
 	}
 
 	rounded := roundInterval(calculatedInterval)
-	return Interval{Text: FormatDuration(rounded), Value: rounded}
+	return Interval{Text: gtime.FormatInterval(rounded), Value: rounded}
 }
 
 func (ic *intervalCalculator) CalculateSafeInterval(timerange legacydata.DataTimeRange, safeRes int64) Interval {
@@ -75,7 +72,7 @@ func (ic *intervalCalculator) CalculateSafeInterval(timerange legacydata.DataTim
 	safeInterval := time.Duration((to - from) / safeRes)
 
 	rounded := roundInterval(safeInterval)
-	return Interval{Text: FormatDuration(rounded), Value: rounded}
+	return Interval{Text: gtime.FormatInterval(rounded), Value: rounded}
 }
 
 func GetIntervalFrom(dsInfo *datasources.DataSource, queryModel *simplejson.Json, defaultInterval time.Duration) (time.Duration, error) {
@@ -117,126 +114,11 @@ func GetIntervalFrom(dsInfo *datasources.DataSource, queryModel *simplejson.Json
 	return parsedInterval, nil
 }
 
-// FormatDuration converts a duration into the kbn format e.g. 1m 2h or 3d
-func FormatDuration(inter time.Duration) string {
-	if inter >= year {
-		return fmt.Sprintf("%dy", inter/year)
-	}
-
-	if inter >= day {
-		return fmt.Sprintf("%dd", inter/day)
-	}
-
-	if inter >= time.Hour {
-		return fmt.Sprintf("%dh", inter/time.Hour)
-	}
-
-	if inter >= time.Minute {
-		return fmt.Sprintf("%dm", inter/time.Minute)
-	}
-
-	if inter >= time.Second {
-		return fmt.Sprintf("%ds", inter/time.Second)
-	}
-
-	if inter >= time.Millisecond {
-		return fmt.Sprintf("%dms", inter/time.Millisecond)
-	}
-
-	return "1ms"
-}
-
 //nolint:gocyclo
 func roundInterval(interval time.Duration) time.Duration {
-	switch {
 	// 0.015s
-	case interval <= 15*time.Millisecond:
+	if interval <= 15*time.Millisecond {
 		return time.Millisecond * 10 // 0.01s
-	// 0.035s
-	case interval <= 35*time.Millisecond:
-		return time.Millisecond * 20 // 0.02s
-	// 0.075s
-	case interval <= 75*time.Millisecond:
-		return time.Millisecond * 50 // 0.05s
-	// 0.15s
-	case interval <= 150*time.Millisecond:
-		return time.Millisecond * 100 // 0.1s
-	// 0.35s
-	case interval <= 350*time.Millisecond:
-		return time.Millisecond * 200 // 0.2s
-	// 0.75s
-	case interval <= 750*time.Millisecond:
-		return time.Millisecond * 500 // 0.5s
-	// 1.5s
-	case interval <= 1500*time.Millisecond:
-		return time.Millisecond * 1000 // 1s
-	// 3.5s
-	case interval <= 3500*time.Millisecond:
-		return time.Millisecond * 2000 // 2s
-	// 7.5s
-	case interval <= 7500*time.Millisecond:
-		return time.Millisecond * 5000 // 5s
-	// 12.5s
-	case interval <= 12500*time.Millisecond:
-		return time.Millisecond * 10000 // 10s
-	// 17.5s
-	case interval <= 17500*time.Millisecond:
-		return time.Millisecond * 15000 // 15s
-	// 25s
-	case interval <= 25000*time.Millisecond:
-		return time.Millisecond * 20000 // 20s
-	// 45s
-	case interval <= 45000*time.Millisecond:
-		return time.Millisecond * 30000 // 30s
-	// 1.5m
-	case interval <= 90000*time.Millisecond:
-		return time.Millisecond * 60000 // 1m
-	// 3.5m
-	case interval <= 210000*time.Millisecond:
-		return time.Millisecond * 120000 // 2m
-	// 7.5m
-	case interval <= 450000*time.Millisecond:
-		return time.Millisecond * 300000 // 5m
-	// 12.5m
-	case interval <= 750000*time.Millisecond:
-		return time.Millisecond * 600000 // 10m
-	// 12.5m
-	case interval <= 1050000*time.Millisecond:
-		return time.Millisecond * 900000 // 15m
-	// 25m
-	case interval <= 1500000*time.Millisecond:
-		return time.Millisecond * 1200000 // 20m
-	// 45m
-	case interval <= 2700000*time.Millisecond:
-		return time.Millisecond * 1800000 // 30m
-	// 1.5h
-	case interval <= 5400000*time.Millisecond:
-		return time.Millisecond * 3600000 // 1h
-	// 2.5h
-	case interval <= 9000000*time.Millisecond:
-		return time.Millisecond * 7200000 // 2h
-	// 4.5h
-	case interval <= 16200000*time.Millisecond:
-		return time.Millisecond * 10800000 // 3h
-	// 9h
-	case interval <= 32400000*time.Millisecond:
-		return time.Millisecond * 21600000 // 6h
-	// 24h
-	case interval <= 86400000*time.Millisecond:
-		return time.Millisecond * 43200000 // 12h
-	// 48h
-	case interval <= 172800000*time.Millisecond:
-		return time.Millisecond * 86400000 // 24h
-	// 1w
-	case interval <= 604800000*time.Millisecond:
-		return time.Millisecond * 86400000 // 24h
-	// 3w
-	case interval <= 1814400000*time.Millisecond:
-		return time.Millisecond * 604800000 // 1w
-	// 2y
-	case interval < 3628800000*time.Millisecond:
-		return time.Millisecond * 2592000000 // 30d
-	default:
-		return time.Millisecond * 31536000000 // 1y
 	}
+	return gtime.RoundInterval(interval)
 }
diff --git a/pkg/tsdb/legacydata/interval/interval_test.go b/pkg/tsdb/legacydata/interval/interval_test.go
index fdd5deb2519eb..b76c36a6774f6 100644
--- a/pkg/tsdb/legacydata/interval/interval_test.go
+++ b/pkg/tsdb/legacydata/interval/interval_test.go
@@ -74,26 +74,6 @@ func TestRoundInterval(t *testing.T) {
 	}
 }
 
-func TestFormatDuration(t *testing.T) {
-	testCases := []struct {
-		name     string
-		duration time.Duration
-		expected string
-	}{
-		{"61s", time.Second * 61, "1m"},
-		{"30ms", time.Millisecond * 30, "30ms"},
-		{"23h", time.Hour * 23, "23h"},
-		{"24h", time.Hour * 24, "1d"},
-		{"367d", time.Hour * 24 * 367, "1y"},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			assert.Equal(t, tc.expected, FormatDuration(tc.duration))
-		})
-	}
-}
-
 func TestGetIntervalFrom(t *testing.T) {
 	dsJSON, err := simplejson.NewJson([]byte(`{"timeInterval": "60s"}`))
 	require.NoError(t, err)
diff --git a/pkg/tsdb/legacydata/service/service_test.go b/pkg/tsdb/legacydata/service/service_test.go
index ebf5f98d488fb..a38e7b43bb1ce 100644
--- a/pkg/tsdb/legacydata/service/service_test.go
+++ b/pkg/tsdb/legacydata/service/service_test.go
@@ -12,12 +12,12 @@ import (
 	"github.com/grafana/grafana/pkg/infra/localcache"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/plugins"
-	"github.com/grafana/grafana/pkg/plugins/config"
-	pluginFakes "github.com/grafana/grafana/pkg/plugins/manager/fakes"
 	acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
 	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/datasources/guardian"
 	datasourceservice "github.com/grafana/grafana/pkg/services/datasources/service"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginconfig"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
 	pluginSettings "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings/service"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
@@ -26,9 +26,14 @@ import (
 	secretskvs "github.com/grafana/grafana/pkg/services/secrets/kvstore"
 	secretsmng "github.com/grafana/grafana/pkg/services/secrets/manager"
 	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 	"github.com/grafana/grafana/pkg/tsdb/legacydata"
 )
 
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
 func TestHandleRequest(t *testing.T) {
 	t.Run("Should invoke plugin manager QueryData when handling request for query", func(t *testing.T) {
 		client := &fakePluginsClient{}
@@ -42,12 +47,13 @@ func TestHandleRequest(t *testing.T) {
 		secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
 		datasourcePermissions := acmock.NewMockedPermissionsService()
 		quotaService := quotatest.New(false, nil)
+		dsCache := datasourceservice.ProvideCacheService(localcache.ProvideService(), sqlStore, guardian.ProvideGuardian())
 		dsService, err := datasourceservice.ProvideService(nil, secretsService, secretsStore, sqlStore.Cfg, featuremgmt.WithFeatures(), acmock.New(), datasourcePermissions, quotaService, &pluginstore.FakePluginStore{})
 		require.NoError(t, err)
 
 		pCtxProvider := plugincontext.ProvideService(sqlStore.Cfg, localcache.ProvideService(), &pluginstore.FakePluginStore{
 			PluginList: []pluginstore.Plugin{{JSONData: plugins.JSONData{ID: "test"}}},
-		}, dsService, pluginSettings.ProvideService(sqlStore, secretsService), pluginFakes.NewFakeLicensingService(), &config.Cfg{})
+		}, dsCache, dsService, pluginSettings.ProvideService(sqlStore, secretsService), pluginconfig.NewFakePluginRequestConfigProvider())
 		s := ProvideService(client, nil, dsService, pCtxProvider)
 
 		ds := &datasources.DataSource{ID: 12, Type: "test", JsonData: simplejson.New()}
diff --git a/pkg/tsdb/loki/api.go b/pkg/tsdb/loki/api.go
index b1a9dfd404c0d..6ffa5226a65b0 100644
--- a/pkg/tsdb/loki/api.go
+++ b/pkg/tsdb/loki/api.go
@@ -11,25 +11,28 @@ import (
 	"net/url"
 	"path"
 	"strconv"
+	"syscall"
 	"time"
 
-	"github.com/grafana/grafana-plugin-sdk-go/data"
 	jsoniter "github.com/json-iterator/go"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/trace"
 
-	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/promlib/converter"
 	"github.com/grafana/grafana/pkg/tsdb/loki/instrumentation"
-	"github.com/grafana/grafana/pkg/util/converter"
 )
 
 type LokiAPI struct {
-	client *http.Client
-	url    string
-	log    log.Logger
-	tracer tracing.Tracer
+	client                    *http.Client
+	url                       string
+	log                       log.Logger
+	tracer                    tracing.Tracer
+	requestStructuredMetadata bool
 }
 
 type RawLokiResponse struct {
@@ -38,11 +41,11 @@ type RawLokiResponse struct {
 	Encoding string
 }
 
-func newLokiAPI(client *http.Client, url string, log log.Logger, tracer tracing.Tracer) *LokiAPI {
-	return &LokiAPI{client: client, url: url, log: log, tracer: tracer}
+func newLokiAPI(client *http.Client, url string, log log.Logger, tracer tracing.Tracer, requestStructuredMetadata bool) *LokiAPI {
+	return &LokiAPI{client: client, url: url, log: log, tracer: tracer, requestStructuredMetadata: requestStructuredMetadata}
 }
 
-func makeDataRequest(ctx context.Context, lokiDsUrl string, query lokiQuery) (*http.Request, error) {
+func makeDataRequest(ctx context.Context, lokiDsUrl string, query lokiQuery, categorizeLabels bool) (*http.Request, error) {
 	qs := url.Values{}
 	qs.Set("query", query.Expr)
 
@@ -96,12 +99,16 @@ func makeDataRequest(ctx context.Context, lokiDsUrl string, query lokiQuery) (*h
 	}
 
 	if query.SupportingQueryType != SupportingQueryNone {
-		value := getSupportingQueryHeaderValue(req, query.SupportingQueryType)
+		value := getSupportingQueryHeaderValue(query.SupportingQueryType)
 		if value != "" {
 			req.Header.Set("X-Query-Tags", "Source="+value)
 		}
 	}
 
+	if categorizeLabels {
+		req.Header.Set("X-Loki-Response-Encoding-Flags", "categorize-labels")
+	}
+
 	return req, nil
 }
 
@@ -155,8 +162,8 @@ func readLokiError(body io.ReadCloser) error {
 	return makeLokiError(bytes)
 }
 
-func (api *LokiAPI) DataQuery(ctx context.Context, query lokiQuery, responseOpts ResponseOpts) (data.Frames, error) {
-	req, err := makeDataRequest(ctx, api.url, query)
+func (api *LokiAPI) DataQuery(ctx context.Context, query lokiQuery, responseOpts ResponseOpts) (*backend.DataResponse, error) {
+	req, err := makeDataRequest(ctx, api.url, query, api.requestStructuredMetadata)
 	if err != nil {
 		return nil, err
 	}
@@ -176,7 +183,13 @@ func (api *LokiAPI) DataQuery(ctx context.Context, query lokiQuery, responseOpts
 			lp = append(lp, "statusCode", resp.StatusCode)
 		}
 		api.log.Error("Error received from Loki", lp...)
-		return nil, err
+		res := backend.DataResponse{
+			Error: err,
+		}
+		if errors.Is(err, syscall.ECONNREFUSED) {
+			res.ErrorSource = backend.ErrorSourceDownstream
+		}
+		return &res, nil
 	}
 
 	defer func() {
@@ -189,9 +202,13 @@ func (api *LokiAPI) DataQuery(ctx context.Context, query lokiQuery, responseOpts
 	lp = append(lp, queryAttrs...)
 	if resp.StatusCode/100 != 2 {
 		err := readLokiError(resp.Body)
-		lp = append(lp, "status", "error", "error", err)
+		res := backend.DataResponse{
+			Error:       err,
+			ErrorSource: backend.ErrorSourceFromHTTPStatus(resp.StatusCode),
+		}
+		lp = append(lp, "status", "error", "error", err, "statusSource", res.ErrorSource)
 		api.log.Error("Error received from Loki", lp...)
-		return nil, err
+		return &res, nil
 	} else {
 		lp = append(lp, "status", "ok")
 		api.log.Info("Response received from loki", lp...)
@@ -208,7 +225,7 @@ func (api *LokiAPI) DataQuery(ctx context.Context, query lokiQuery, responseOpts
 
 	if res.Error != nil {
 		span.RecordError(res.Error)
-		span.SetStatus(codes.Error, err.Error())
+		span.SetStatus(codes.Error, res.Error.Error())
 		instrumentation.UpdatePluginParsingResponseDurationSeconds(ctx, time.Since(start), "error")
 		api.log.Error("Error parsing response from loki", "error", res.Error, "metricDataplane", responseOpts.metricDataplane, "duration", time.Since(start), "stage", stageParseResponse)
 		return nil, res.Error
@@ -216,7 +233,7 @@ func (api *LokiAPI) DataQuery(ctx context.Context, query lokiQuery, responseOpts
 	instrumentation.UpdatePluginParsingResponseDurationSeconds(ctx, time.Since(start), "ok")
 	api.log.Info("Response parsed from loki", "duration", time.Since(start), "metricDataplane", responseOpts.metricDataplane, "framesLength", len(res.Frames), "stage", stageParseResponse)
 
-	return res.Frames, nil
+	return &res, nil
 }
 
 func makeRawRequest(ctx context.Context, lokiDsUrl string, resourcePath string) (*http.Request, error) {
@@ -307,8 +324,13 @@ func (api *LokiAPI) RawQuery(ctx context.Context, resourcePath string) (RawLokiR
 	return rawLokiResponse, nil
 }
 
-func getSupportingQueryHeaderValue(req *http.Request, supportingQueryType SupportingQueryType) string {
+func getSupportingQueryHeaderValue(supportingQueryType SupportingQueryType) string {
 	value := ""
+
+	// we need to map the SupportingQueryType to the actual header value. For
+	// legacy reasons we defined each value, such as "logsVolume" maps to the
+	// "logvolhist" header value to Loki. With #85123, even the value set in the
+	// frontend query can be passed as is to Loki.
 	switch supportingQueryType {
 	case SupportingQueryLogsVolume:
 		value = "logvolhist"
@@ -316,7 +338,10 @@ func getSupportingQueryHeaderValue(req *http.Request, supportingQueryType Suppor
 		value = "logsample"
 	case SupportingQueryDataSample:
 		value = "datasample"
-	default: //ignore
+	case SupportingQueryInfiniteScroll:
+		value = "infinitescroll"
+	default:
+		value = string(supportingQueryType)
 	}
 
 	return value
diff --git a/pkg/tsdb/loki/api_mock.go b/pkg/tsdb/loki/api_mock.go
index bd32f443f249d..1f9ebfcefef26 100644
--- a/pkg/tsdb/loki/api_mock.go
+++ b/pkg/tsdb/loki/api_mock.go
@@ -5,7 +5,8 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+
 	"github.com/grafana/grafana/pkg/infra/tracing"
 )
 
@@ -56,16 +57,16 @@ func (mockedRT *mockedCompressedRoundTripper) RoundTrip(req *http.Request) (*htt
 	}, nil
 }
 
-func makeMockedAPI(statusCode int, contentType string, responseBytes []byte, requestCallback mockRequestCallback) *LokiAPI {
-	return makeMockedAPIWithUrl("http://localhost:9999", statusCode, contentType, responseBytes, requestCallback)
+func makeMockedAPI(statusCode int, contentType string, responseBytes []byte, requestCallback mockRequestCallback, structuredMetadata bool) *LokiAPI {
+	return makeMockedAPIWithUrl("http://localhost:9999", statusCode, contentType, responseBytes, requestCallback, structuredMetadata)
 }
 
-func makeMockedAPIWithUrl(url string, statusCode int, contentType string, responseBytes []byte, requestCallback mockRequestCallback) *LokiAPI {
+func makeMockedAPIWithUrl(url string, statusCode int, contentType string, responseBytes []byte, requestCallback mockRequestCallback, structuredMetadata bool) *LokiAPI {
 	client := http.Client{
 		Transport: &mockedRoundTripper{statusCode: statusCode, contentType: contentType, responseBytes: responseBytes, requestCallback: requestCallback},
 	}
 
-	return newLokiAPI(&client, url, log.New("test"), tracing.InitializeTracerForTest())
+	return newLokiAPI(&client, url, backend.NewLoggerWith("logger", "test"), tracing.InitializeTracerForTest(), structuredMetadata)
 }
 
 func makeCompressedMockedAPIWithUrl(url string, statusCode int, contentType string, responseBytes []byte, requestCallback mockRequestCallback) *LokiAPI {
@@ -73,5 +74,5 @@ func makeCompressedMockedAPIWithUrl(url string, statusCode int, contentType stri
 		Transport: &mockedCompressedRoundTripper{statusCode: statusCode, contentType: contentType, responseBytes: responseBytes, requestCallback: requestCallback},
 	}
 
-	return newLokiAPI(&client, url, log.New("test"), tracing.InitializeTracerForTest())
+	return newLokiAPI(&client, url, backend.NewLoggerWith("logger", "test"), tracing.InitializeTracerForTest(), false)
 }
diff --git a/pkg/tsdb/loki/api_test.go b/pkg/tsdb/loki/api_test.go
index 6adc839f8ad75..d7acd1c791d7a 100644
--- a/pkg/tsdb/loki/api_test.go
+++ b/pkg/tsdb/loki/api_test.go
@@ -7,6 +7,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/grafana/grafana/pkg/tsdb/loki/kinds/dataquery"
 	"github.com/stretchr/testify/require"
 )
 
@@ -26,7 +27,7 @@ func TestApiLogVolume(t *testing.T) {
 		api := makeMockedAPI(200, "application/json", response, func(req *http.Request) {
 			called = true
 			require.Equal(t, "Source=logvolhist", req.Header.Get("X-Query-Tags"))
-		})
+		}, false)
 
 		_, err := api.DataQuery(context.Background(), lokiQuery{Expr: "", SupportingQueryType: SupportingQueryLogsVolume, QueryType: QueryTypeRange}, ResponseOpts{})
 		require.NoError(t, err)
@@ -38,7 +39,7 @@ func TestApiLogVolume(t *testing.T) {
 		api := makeMockedAPI(200, "application/json", response, func(req *http.Request) {
 			called = true
 			require.Equal(t, "Source=logsample", req.Header.Get("X-Query-Tags"))
-		})
+		}, false)
 
 		_, err := api.DataQuery(context.Background(), lokiQuery{Expr: "", SupportingQueryType: SupportingQueryLogsSample, QueryType: QueryTypeRange}, ResponseOpts{})
 		require.NoError(t, err)
@@ -50,24 +51,72 @@ func TestApiLogVolume(t *testing.T) {
 		api := makeMockedAPI(200, "application/json", response, func(req *http.Request) {
 			called = true
 			require.Equal(t, "Source=datasample", req.Header.Get("X-Query-Tags"))
-		})
+		}, false)
 
 		_, err := api.DataQuery(context.Background(), lokiQuery{Expr: "", SupportingQueryType: SupportingQueryDataSample, QueryType: QueryTypeRange}, ResponseOpts{})
 		require.NoError(t, err)
 		require.True(t, called)
 	})
 
-	t.Run("non-log-volume queries should not set log-volume http header", func(t *testing.T) {
+	t.Run("none queries should not set X-Query-Tags http header", func(t *testing.T) {
 		called := false
 		api := makeMockedAPI(200, "application/json", response, func(req *http.Request) {
 			called = true
 			require.Equal(t, "", req.Header.Get("X-Query-Tags"))
-		})
+		}, false)
 
 		_, err := api.DataQuery(context.Background(), lokiQuery{Expr: "", SupportingQueryType: SupportingQueryNone, QueryType: QueryTypeRange}, ResponseOpts{})
 		require.NoError(t, err)
 		require.True(t, called)
 	})
+
+	t.Run("any defined supporting query should not set X-Query-Tags http header", func(t *testing.T) {
+		called := false
+		api := makeMockedAPI(200, "application/json", response, func(req *http.Request) {
+			called = true
+			require.Equal(t, "Source=foo", req.Header.Get("X-Query-Tags"))
+		}, false)
+
+		_, err := api.DataQuery(context.Background(), lokiQuery{Expr: "", SupportingQueryType: SupportingQueryType("foo"), QueryType: QueryTypeRange}, ResponseOpts{})
+		require.NoError(t, err)
+		require.True(t, called)
+	})
+
+	t.Run("with `structuredMetadata` should set correct http header", func(t *testing.T) {
+		called := false
+		api := makeMockedAPI(200, "application/json", response, func(req *http.Request) {
+			called = true
+			require.Equal(t, "categorize-labels", req.Header.Get("X-Loki-Response-Encoding-Flags"))
+		}, true)
+
+		_, err := api.DataQuery(context.Background(), lokiQuery{Expr: "", SupportingQueryType: SupportingQueryLogsVolume, QueryType: QueryTypeRange}, ResponseOpts{})
+		require.NoError(t, err)
+		require.True(t, called)
+	})
+}
+
+func TestInfiniteScroll(t *testing.T) {
+	response := []byte(`
+	{
+		"status": "success",
+		"data": {
+			"resultType" : "matrix",
+			"result": []
+		}
+	}
+	`)
+
+	t.Run("infinite scrolling queries should set infinite scroll http header", func(t *testing.T) {
+		called := false
+		api := makeMockedAPI(200, "application/json", response, func(req *http.Request) {
+			called = true
+			require.Equal(t, "Source=infinitescroll", req.Header.Get("X-Query-Tags"))
+		}, false)
+
+		_, err := api.DataQuery(context.Background(), lokiQuery{Expr: "", SupportingQueryType: dataquery.SupportingQueryTypeInfiniteScroll, QueryType: QueryTypeRange}, ResponseOpts{})
+		require.NoError(t, err)
+		require.True(t, called)
+	})
 }
 
 func TestApiUrlHandling(t *testing.T) {
@@ -127,7 +176,7 @@ func TestApiUrlHandling(t *testing.T) {
 				wantedPrefix := test.rangeQueryPrefix
 				failMessage := fmt.Sprintf(`wanted prefix: [%s], got string [%s]`, wantedPrefix, urlString)
 				require.True(t, strings.HasPrefix(urlString, wantedPrefix), failMessage)
-			})
+			}, false)
 
 			query := lokiQuery{
 				QueryType: QueryTypeRange,
@@ -148,7 +197,7 @@ func TestApiUrlHandling(t *testing.T) {
 				wantedPrefix := test.instantQueryPrefix
 				failMessage := fmt.Sprintf(`wanted prefix: [%s], got string [%s]`, wantedPrefix, urlString)
 				require.True(t, strings.HasPrefix(urlString, wantedPrefix), failMessage)
-			})
+			}, false)
 
 			query := lokiQuery{
 				QueryType: QueryTypeInstant,
@@ -166,7 +215,7 @@ func TestApiUrlHandling(t *testing.T) {
 			api := makeMockedAPIWithUrl(test.dsUrl, 200, "application/json", response, func(req *http.Request) {
 				called = true
 				require.Equal(t, test.metaUrl, req.URL.String())
-			})
+			}, false)
 
 			_, err := api.RawQuery(context.Background(), "/loki/api/v1/labels?start=1&end=2")
 			require.NoError(t, err)
diff --git a/pkg/tsdb/loki/frame.go b/pkg/tsdb/loki/frame.go
index aa40633291a8e..8655b746acacd 100644
--- a/pkg/tsdb/loki/frame.go
+++ b/pkg/tsdb/loki/frame.go
@@ -93,14 +93,26 @@ func adjustLogsFrame(frame *data.Frame, query *lokiQuery, dataplane bool) error
 func adjustLegacyLogsFrame(frame *data.Frame, query *lokiQuery) error {
 	// we check if the fields are of correct type and length
 	fields := frame.Fields
-	if len(fields) != 4 {
-		return fmt.Errorf("invalid field length in logs frame. expected 4, got %d", len(fields))
+	if len(fields) != 4 && len(fields) != 5 {
+		return fmt.Errorf("invalid field length in logs frame. expected 4 or 5, got %d", len(fields))
 	}
 
 	labelsField := fields[0]
 	timeField := fields[1]
 	lineField := fields[2]
 	stringTimeField := fields[3]
+	if len(fields) == 5 {
+		labelTypesField := fields[4]
+		if labelTypesField.Type() != data.FieldTypeJSON {
+			return fmt.Errorf("invalid field types in logs frame. expected json, got %s", labelTypesField.Type())
+		}
+		labelTypesField.Name = "labelTypes"
+		labelTypesField.Config = &data.FieldConfig{
+			Custom: map[string]interface{}{
+				"hidden": true,
+			},
+		}
+	}
 
 	if (timeField.Type() != data.FieldTypeTime) || (lineField.Type() != data.FieldTypeString) || (labelsField.Type() != data.FieldTypeJSON) || (stringTimeField.Type() != data.FieldTypeString) {
 		return fmt.Errorf("invalid field types in logs frame. expected time, string, json and string, got %s, %s, %s and %s", timeField.Type(), lineField.Type(), labelsField.Type(), stringTimeField.Type())
@@ -149,14 +161,27 @@ func adjustLegacyLogsFrame(frame *data.Frame, query *lokiQuery) error {
 func adjustDataplaneLogsFrame(frame *data.Frame, query *lokiQuery) error {
 	// we check if the fields are of correct type and length
 	fields := frame.Fields
-	if len(fields) != 4 {
-		return fmt.Errorf("invalid field length in logs frame. expected 4, got %d", len(fields))
+	if len(fields) != 4 && len(fields) != 5 {
+		return fmt.Errorf("invalid field length in logs frame. expected 4 or 5, got %d", len(fields))
 	}
 
 	labelsField := fields[0]
 	timeField := fields[1]
 	lineField := fields[2]
 	stringTimeField := fields[3]
+	var labelTypesField *data.Field
+	if len(fields) == 5 {
+		labelTypesField = fields[4]
+		if labelTypesField.Type() != data.FieldTypeJSON {
+			return fmt.Errorf("invalid field types in logs frame. expected json, got %s", labelTypesField.Type())
+		}
+		labelTypesField.Name = "labelTypes"
+		labelTypesField.Config = &data.FieldConfig{
+			Custom: map[string]interface{}{
+				"hidden": true,
+			},
+		}
+	}
 
 	if (timeField.Type() != data.FieldTypeTime) || (lineField.Type() != data.FieldTypeString) || (labelsField.Type() != data.FieldTypeJSON) || (stringTimeField.Type() != data.FieldTypeString) {
 		return fmt.Errorf("invalid field types in logs frame. expected time, string, json and string, got %s, %s, %s and %s", timeField.Type(), lineField.Type(), labelsField.Type(), stringTimeField.Type())
@@ -173,7 +198,7 @@ func adjustDataplaneLogsFrame(frame *data.Frame, query *lokiQuery) error {
 	}
 
 	timeField.Name = "timestamp"
-	labelsField.Name = "attributes"
+	labelsField.Name = "labels"
 	lineField.Name = "body"
 
 	if frame.Meta == nil {
@@ -190,7 +215,12 @@ func adjustDataplaneLogsFrame(frame *data.Frame, query *lokiQuery) error {
 	if err != nil {
 		return err
 	}
-	frame.Fields = data.Fields{labelsField, timeField, lineField, idField}
+
+	if labelTypesField != nil {
+		frame.Fields = data.Fields{labelsField, timeField, lineField, idField, labelTypesField}
+	} else {
+		frame.Fields = data.Fields{labelsField, timeField, lineField, idField}
+	}
 	return nil
 }
 
diff --git a/pkg/tsdb/loki/framing_test.go b/pkg/tsdb/loki/framing_test.go
index 056b0e8ac9237..34e2773eb8049 100644
--- a/pkg/tsdb/loki/framing_test.go
+++ b/pkg/tsdb/loki/framing_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/experimental"
-	"github.com/grafana/grafana/pkg/infra/log"
+
 	"github.com/stretchr/testify/require"
 )
 
@@ -51,6 +51,9 @@ func TestSuccessResponse(t *testing.T) {
 		{name: "parse a streams response with parse errors", filepath: "streams_parse_errors", query: streamsQuery},
 
 		{name: "parse an empty response", filepath: "empty", query: matrixQuery},
+
+		{name: "parse structured metadata", filepath: "streams_structured_metadata", query: streamsQuery},
+		{name: "parse structured metadata different labels each log line", filepath: "streams_structured_metadata_2", query: streamsQuery},
 	}
 
 	runTest := func(folder string, path string, query lokiQuery, responseOpts ResponseOpts) {
@@ -61,14 +64,10 @@ func TestSuccessResponse(t *testing.T) {
 		bytes, err := os.ReadFile(responseFileName)
 		require.NoError(t, err)
 
-		frames, err := runQuery(context.Background(), makeMockedAPI(http.StatusOK, "application/json", bytes, nil), &query, responseOpts, log.New("test"))
+		dr, err := runQuery(context.Background(), makeMockedAPI(http.StatusOK, "application/json", bytes, nil, false), &query, responseOpts, backend.NewLoggerWith("logger", "test"))
 		require.NoError(t, err)
 
-		dr := &backend.DataResponse{
-			Frames: frames,
-			Error:  err,
-		}
-		experimental.CheckGoldenJSONResponse(t, folder, goldenFileName, dr, true)
+		experimental.CheckGoldenJSONResponse(t, folder, goldenFileName, dr, false)
 	}
 
 	for _, test := range tt {
@@ -126,11 +125,57 @@ func TestErrorResponse(t *testing.T) {
 
 	for _, test := range tt {
 		t.Run(test.name, func(t *testing.T) {
-			frames, err := runQuery(context.Background(), makeMockedAPI(400, test.contentType, test.body, nil), &lokiQuery{QueryType: QueryTypeRange, Direction: DirectionBackward}, ResponseOpts{}, log.New("test"))
+			dr, err := runQuery(context.Background(), makeMockedAPI(400, test.contentType, test.body, nil, false), &lokiQuery{QueryType: QueryTypeRange, Direction: DirectionBackward}, ResponseOpts{}, backend.NewLoggerWith("logger", "test"))
+			require.NoError(t, err)
+			require.Len(t, dr.Frames, 0)
+			require.Equal(t, dr.Error.Error(), test.errorMessage)
+			require.Equal(t, dr.ErrorSource, backend.ErrorSourceDownstream)
+		})
+	}
+}
+
+func TestErrorsFromResponseCodes(t *testing.T) {
+	tt := []struct {
+		name        string
+		statusCode  int
+		errorSource backend.ErrorSource
+	}{
+		{
+			name:        "parse response with status code 400 into correct error",
+			statusCode:  400,
+			errorSource: backend.ErrorSourceDownstream,
+		},
+		{
+			name:        "parse response with status code 406 into correct error",
+			statusCode:  406,
+			errorSource: backend.ErrorSourcePlugin,
+		},
+		{
+			name:        "parse response with status code 413 into correct error",
+			statusCode:  413,
+			errorSource: backend.ErrorSourcePlugin,
+		},
+		{
+			name:        "parse response with status code 500 into correct error",
+			statusCode:  500,
+			errorSource: backend.ErrorSourceDownstream,
+		},
+		{
+			name:        "parse response with status code 501 into correct error",
+			statusCode:  501,
+			errorSource: backend.ErrorSourcePlugin,
+		},
+	}
+
+	errorString := "parse error at line 1, col 8: something is wrong"
+	contentType := "application/json; charset=UTF-8"
 
-			require.Len(t, frames, 0)
-			require.Error(t, err)
-			require.EqualError(t, err, test.errorMessage)
+	for _, test := range tt {
+		t.Run(test.name, func(t *testing.T) {
+			dr, _ := runQuery(context.Background(), makeMockedAPI(test.statusCode, contentType, []byte(errorString), nil, false), &lokiQuery{QueryType: QueryTypeRange, Direction: DirectionBackward}, ResponseOpts{}, backend.NewLoggerWith("logger", "test"))
+			require.Len(t, dr.Frames, 0)
+			require.Equal(t, dr.Error.Error(), errorString)
+			require.Equal(t, dr.ErrorSource, test.errorSource)
 		})
 	}
 }
diff --git a/pkg/tsdb/loki/healthcheck.go b/pkg/tsdb/loki/healthcheck.go
index b3c798c971b30..1bcd17e6be2a5 100644
--- a/pkg/tsdb/loki/healthcheck.go
+++ b/pkg/tsdb/loki/healthcheck.go
@@ -8,8 +8,10 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
+
 	"github.com/grafana/grafana/pkg/tsdb/loki/kinds/dataquery"
+	"github.com/grafana/grafana/pkg/util"
 )
 
 const (
@@ -18,7 +20,7 @@ const (
 
 func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult,
 	error) {
-	logger := s.logger.New("endpoint", "CheckHealth")
+	logger := s.logger.With("endpoint", "CheckHealth")
 	ds, err := s.im.Get(ctx, req.PluginContext)
 	// check that the datasource exists
 	if err != nil {
@@ -34,11 +36,11 @@ func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthReque
 	return hc, nil
 }
 
-func healthcheck(ctx context.Context, req *backend.CheckHealthRequest, s *Service, logger *log.ConcreteLogger) *backend.CheckHealthResult {
+func healthcheck(ctx context.Context, req *backend.CheckHealthRequest, s *Service, logger log.Logger) *backend.CheckHealthResult {
 	step := "1s"
 	qt := "instant"
 	qm := dataquery.LokiDataQuery{
-		Expr:      "vector(1)+vector(1)",
+		Expr:      util.Pointer("vector(1)+vector(1)"),
 		Step:      &step,
 		QueryType: &qt,
 	}
@@ -88,7 +90,7 @@ func healthcheck(ctx context.Context, req *backend.CheckHealthRequest, s *Servic
 	return getHealthCheckMessage(nil, logger)
 }
 
-func getHealthCheckMessage(err error, logger *log.ConcreteLogger) *backend.CheckHealthResult {
+func getHealthCheckMessage(err error, logger log.Logger) *backend.CheckHealthResult {
 	if err == nil {
 		return &backend.CheckHealthResult{
 			Status:  backend.HealthStatusOk,
diff --git a/pkg/tsdb/loki/healthcheck_test.go b/pkg/tsdb/loki/healthcheck_test.go
index a889fefae082f..2d99e04269940 100644
--- a/pkg/tsdb/loki/healthcheck_test.go
+++ b/pkg/tsdb/loki/healthcheck_test.go
@@ -10,9 +10,8 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
-	sdkHttpClient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
-	"github.com/grafana/grafana/pkg/infra/httpclient"
-	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/stretchr/testify/assert"
@@ -64,21 +63,30 @@ func (rt *healthCheckFailRoundTripper) RoundTrip(req *http.Request) (*http.Respo
 	}, nil
 }
 
-func (provider *healthCheckProvider[T]) New(opts ...sdkHttpClient.Options) (*http.Client, error) {
+func (provider *healthCheckProvider[T]) New(opts ...httpclient.Options) (*http.Client, error) {
 	client := &http.Client{}
 	provider.RoundTripper = new(T)
 	client.Transport = *provider.RoundTripper
 	return client, nil
 }
 
-func (provider *healthCheckProvider[T]) GetTransport(opts ...sdkHttpClient.Options) (http.RoundTripper, error) {
+func (provider *healthCheckProvider[T]) GetTransport(opts ...httpclient.Options) (http.RoundTripper, error) {
 	return *new(T), nil
 }
 
-func getMockProvider[T http.RoundTripper]() *healthCheckProvider[T] {
-	return &healthCheckProvider[T]{
+// Return a mocked HTTP client provider.
+//
+// Example taken from `pkg/promlib/healthcheck_test.go`
+func getMockProvider[T http.RoundTripper]() *httpclient.Provider {
+	p := &healthCheckProvider[T]{
 		RoundTripper: new(T),
 	}
+	anotherFN := func(o httpclient.Options, next http.RoundTripper) http.RoundTripper {
+		return *p.RoundTripper
+	}
+	fn := httpclient.MiddlewareFunc(anotherFN)
+	mid := httpclient.NamedMiddlewareFunc("mock", fn)
+	return httpclient.NewProvider(httpclient.ProviderOptions{Middlewares: []httpclient.Middleware{mid}})
 }
 
 func Test_healthcheck(t *testing.T) {
@@ -88,7 +96,7 @@ func Test_healthcheck(t *testing.T) {
 			im:       datasource.NewInstanceManager(newInstanceSettings(httpProvider)),
 			features: featuremgmt.WithFeatures(featuremgmt.FlagLokiLogsDataplane, featuremgmt.FlagLokiMetricDataplane),
 			tracer:   tracing.InitializeTracerForTest(),
-			logger:   log.New("loki test"),
+			logger:   backend.NewLoggerWith("logger", "loki test"),
 		}
 
 		req := &backend.CheckHealthRequest{
@@ -107,7 +115,7 @@ func Test_healthcheck(t *testing.T) {
 			im:       datasource.NewInstanceManager(newInstanceSettings(httpProvider)),
 			features: featuremgmt.WithFeatures(featuremgmt.FlagLokiLogsDataplane, featuremgmt.FlagLokiMetricDataplane),
 			tracer:   tracing.InitializeTracerForTest(),
-			logger:   log.New("loki test"),
+			logger:   backend.NewLoggerWith("logger", "loki test"),
 		}
 
 		req := &backend.CheckHealthRequest{
diff --git a/pkg/tsdb/loki/kinds/dataquery/types_dataquery_gen.go b/pkg/tsdb/loki/kinds/dataquery/types_dataquery_gen.go
index c79be5cae6fd5..f9dcd723805a8 100644
--- a/pkg/tsdb/loki/kinds/dataquery/types_dataquery_gen.go
+++ b/pkg/tsdb/loki/kinds/dataquery/types_dataquery_gen.go
@@ -30,9 +30,10 @@ const (
 
 // Defines values for SupportingQueryType.
 const (
-	SupportingQueryTypeDataSample SupportingQueryType = "dataSample"
-	SupportingQueryTypeLogsSample SupportingQueryType = "logsSample"
-	SupportingQueryTypeLogsVolume SupportingQueryType = "logsVolume"
+	SupportingQueryTypeDataSample     SupportingQueryType = "dataSample"
+	SupportingQueryTypeInfiniteScroll SupportingQueryType = "infiniteScroll"
+	SupportingQueryTypeLogsSample     SupportingQueryType = "logsSample"
+	SupportingQueryTypeLogsVolume     SupportingQueryType = "logsVolume"
 )
 
 // These are the common properties available to all queries in all datasources.
@@ -45,9 +46,7 @@ type DataQuery struct {
 	// TODO this shouldn't be unknown but DataSourceRef | null
 	Datasource *any `json:"datasource,omitempty"`
 
-	// Hide true if query is disabled (ie should not be returned to the dashboard)
-	// Note this does not always imply that the query should not be executed since
-	// the results from a hidden query may be used as the input to other queries (SSE etc)
+	// If hide is set to true, Grafana will filter out the response(s) associated with this query before returning it to the panel.
 	Hide *bool `json:"hide,omitempty"`
 
 	// Specify the query flavor
@@ -62,11 +61,6 @@ type DataQuery struct {
 
 // LokiDataQuery defines model for LokiDataQuery.
 type LokiDataQuery struct {
-	// DataQuery These are the common properties available to all queries in all datasources.
-	// Specific implementations will *extend* this interface, adding the required
-	// properties for the given context.
-	DataQuery
-
 	// For mixed data sources the selected datasource is on the query level.
 	// For non mixed scenarios this is undefined.
 	// TODO find a better way to do this ^ that's friendly to schema
@@ -75,11 +69,9 @@ type LokiDataQuery struct {
 	EditorMode *QueryEditorMode `json:"editorMode,omitempty"`
 
 	// The LogQL query.
-	Expr string `json:"expr"`
+	Expr *string `json:"expr,omitempty"`
 
-	// Hide true if query is disabled (ie should not be returned to the dashboard)
-	// Note this does not always imply that the query should not be executed since
-	// the results from a hidden query may be used as the input to other queries (SSE etc)
+	// If hide is set to true, Grafana will filter out the response(s) associated with this query before returning it to the panel.
 	Hide *bool `json:"hide,omitempty"`
 
 	// @deprecated, now use queryType.
@@ -101,7 +93,7 @@ type LokiDataQuery struct {
 	// A unique identifier for the query within the list of targets.
 	// In server side expressions, the refId is used as a variable name to identify results.
 	// By default, the UI will assign A->Z; however setting meaningful names may be useful.
-	RefId string `json:"refId"`
+	RefId *string `json:"refId,omitempty"`
 
 	// @deprecated, now use step.
 	Resolution *int64 `json:"resolution,omitempty"`
diff --git a/pkg/tsdb/loki/loki.go b/pkg/tsdb/loki/loki.go
index ceb5b1d08c7d6..1d31f500c2dc8 100644
--- a/pkg/tsdb/loki/loki.go
+++ b/pkg/tsdb/loki/loki.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"net/http"
 	"regexp"
-	"strings"
 	"sync"
 	"time"
 
@@ -14,26 +13,25 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/trace"
 
-	"github.com/grafana/grafana/pkg/infra/httpclient"
-	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	ngalertmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/tsdb/loki/kinds/dataquery"
 )
 
-var logger = log.New("tsdb.loki")
-
 type Service struct {
 	im       instancemgmt.InstanceManager
 	features featuremgmt.FeatureToggles
 	tracer   tracing.Tracer
-	logger   *log.ConcreteLogger
+	logger   log.Logger
 }
 
 var (
@@ -42,12 +40,12 @@ var (
 	_ backend.CallResourceHandler = (*Service)(nil)
 )
 
-func ProvideService(httpClientProvider httpclient.Provider, features featuremgmt.FeatureToggles, tracer tracing.Tracer) *Service {
+func ProvideService(httpClientProvider *httpclient.Provider, features featuremgmt.FeatureToggles, tracer tracing.Tracer) *Service {
 	return &Service{
 		im:       datasource.NewInstanceManager(newInstanceSettings(httpClientProvider)),
 		features: features,
 		tracer:   tracer,
-		logger:   logger,
+		logger:   backend.NewLoggerWith("logger", "tsdb.loki"),
 	}
 }
 
@@ -88,7 +86,7 @@ func parseQueryModel(raw json.RawMessage) (*QueryJSONModel, error) {
 	return model, err
 }
 
-func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.InstanceFactoryFunc {
+func newInstanceSettings(httpClientProvider *httpclient.Provider) datasource.InstanceFactoryFunc {
 	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
 		opts, err := settings.HTTPClientOptions(ctx)
 		if err != nil {
@@ -121,18 +119,7 @@ func (s *Service) CallResource(ctx context.Context, req *backend.CallResourceReq
 
 func callResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender, dsInfo *datasourceInfo, plog log.Logger, tracer tracing.Tracer) error {
 	url := req.URL
-	// a very basic is-this-url-valid check
-	if req.Method != "GET" {
-		plog.Error("Invalid HTTP method", "method", req.Method)
-		return fmt.Errorf("invalid HTTP method: %s", req.Method)
-	}
-	if (!strings.HasPrefix(url, "labels?")) &&
-		(!strings.HasPrefix(url, "label/")) && // the `/label/$label_name/values` form
-		(!strings.HasPrefix(url, "series?")) &&
-		(!strings.HasPrefix(url, "index/stats?")) {
-		plog.Error("Invalid URL", "url", url)
-		return fmt.Errorf("invalid URL: %s", url)
-	}
+
 	lokiURL := fmt.Sprintf("/loki/api/v1/%s", url)
 
 	ctx, span := tracer.Start(ctx, "datasource.loki.CallResource", trace.WithAttributes(
@@ -140,7 +127,7 @@ func callResource(ctx context.Context, req *backend.CallResourceRequest, sender
 	))
 	defer span.End()
 
-	api := newLokiAPI(dsInfo.HTTPClient, dsInfo.URL, plog, tracer)
+	api := newLokiAPI(dsInfo.HTTPClient, dsInfo.URL, plog, tracer, false)
 
 	rawLokiResponse, err := api.RawQuery(ctx, lokiURL)
 	if err != nil {
@@ -165,7 +152,7 @@ func callResource(ctx context.Context, req *backend.CallResourceRequest, sender
 func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
 	dsInfo, err := s.getDSInfo(ctx, req.PluginContext)
 	_, fromAlert := req.Headers[ngalertmodels.FromAlertHeaderName]
-	logger := logger.FromContext(ctx).New("fromAlert", fromAlert)
+	logger := s.logger.FromContext(ctx).With("fromAlert", fromAlert)
 	if err != nil {
 		logger.Error("Failed to get data source info", "err", err)
 		result := backend.NewQueryDataResponse()
@@ -173,17 +160,17 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest)
 	}
 
 	responseOpts := ResponseOpts{
-		metricDataplane: s.features.IsEnabled(featuremgmt.FlagLokiMetricDataplane),
-		logsDataplane:   s.features.IsEnabled(featuremgmt.FlagLokiLogsDataplane),
+		metricDataplane: s.features.IsEnabled(ctx, featuremgmt.FlagLokiMetricDataplane),
+		logsDataplane:   s.features.IsEnabled(ctx, featuremgmt.FlagLokiLogsDataplane),
 	}
 
-	return queryData(ctx, req, dsInfo, responseOpts, s.tracer, logger, s.features.IsEnabled(featuremgmt.FlagLokiRunQueriesInParallel))
+	return queryData(ctx, req, dsInfo, responseOpts, s.tracer, logger, s.features.IsEnabled(ctx, featuremgmt.FlagLokiRunQueriesInParallel), s.features.IsEnabled(ctx, featuremgmt.FlagLokiStructuredMetadata))
 }
 
-func queryData(ctx context.Context, req *backend.QueryDataRequest, dsInfo *datasourceInfo, responseOpts ResponseOpts, tracer tracing.Tracer, plog log.Logger, runInParallel bool) (*backend.QueryDataResponse, error) {
+func queryData(ctx context.Context, req *backend.QueryDataRequest, dsInfo *datasourceInfo, responseOpts ResponseOpts, tracer tracing.Tracer, plog log.Logger, runInParallel bool, requestStructuredMetadata bool) (*backend.QueryDataResponse, error) {
 	result := backend.NewQueryDataResponse()
 
-	api := newLokiAPI(dsInfo.HTTPClient, dsInfo.URL, plog, tracer)
+	api := newLokiAPI(dsInfo.HTTPClient, dsInfo.URL, plog, tracer, requestStructuredMetadata)
 
 	start := time.Now()
 	queries, err := parseQuery(req)
@@ -239,37 +226,39 @@ func executeQuery(ctx context.Context, query *lokiQuery, req *backend.QueryDataR
 
 	defer span.End()
 
-	frames, err := runQuery(ctx, api, query, responseOpts, plog)
-	queryRes := backend.DataResponse{}
+	queryRes, err := runQuery(ctx, api, query, responseOpts, plog)
+	if queryRes == nil {
+		// we always want to return a backend.DataResponse object, even if we received just an error
+		queryRes = &backend.DataResponse{}
+	}
+
 	if err != nil {
 		span.RecordError(err)
 		span.SetStatus(codes.Error, err.Error())
 		queryRes.Error = err
-	} else {
-		queryRes.Frames = frames
 	}
 
-	return queryRes
+	return *queryRes
 }
 
 // we extracted this part of the functionality to make it easy to unit-test it
-func runQuery(ctx context.Context, api *LokiAPI, query *lokiQuery, responseOpts ResponseOpts, plog log.Logger) (data.Frames, error) {
-	frames, err := api.DataQuery(ctx, *query, responseOpts)
+func runQuery(ctx context.Context, api *LokiAPI, query *lokiQuery, responseOpts ResponseOpts, plog log.Logger) (*backend.DataResponse, error) {
+	res, err := api.DataQuery(ctx, *query, responseOpts)
 	if err != nil {
 		plog.Error("Error querying loki", "error", err)
-		return data.Frames{}, err
+		return res, err
 	}
 
-	for _, frame := range frames {
+	for _, frame := range res.Frames {
 		err = adjustFrame(frame, query, !responseOpts.metricDataplane, responseOpts.logsDataplane)
 
 		if err != nil {
 			plog.Error("Error adjusting frame", "error", err)
-			return data.Frames{}, err
+			return res, err
 		}
 	}
 
-	return frames, nil
+	return res, nil
 }
 
 func (s *Service) getDSInfo(ctx context.Context, pluginCtx backend.PluginContext) (*datasourceInfo, error) {
diff --git a/pkg/tsdb/loki/loki_bench_test.go b/pkg/tsdb/loki/loki_bench_test.go
index a12579623c0db..f9c5e15f29360 100644
--- a/pkg/tsdb/loki/loki_bench_test.go
+++ b/pkg/tsdb/loki/loki_bench_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
 )
 
 // when memory-profiling these benchmarks these commands are recommended
@@ -19,7 +19,7 @@ func BenchmarkMatrixJson(b *testing.B) {
 
 	b.ResetTimer()
 	for n := 0; n < b.N; n++ {
-		_, _ = runQuery(context.Background(), makeMockedAPI(http.StatusOK, "application/json", bytes, nil), &lokiQuery{}, ResponseOpts{}, log.New("test"))
+		_, _ = runQuery(context.Background(), makeMockedAPI(http.StatusOK, "application/json", bytes, nil, false), &lokiQuery{}, ResponseOpts{}, backend.NewLoggerWith("logger", "test"))
 	}
 }
 
diff --git a/pkg/tsdb/loki/parse_query.go b/pkg/tsdb/loki/parse_query.go
index 6cfdfaee0c99d..a4f39679d6c8b 100644
--- a/pkg/tsdb/loki/parse_query.go
+++ b/pkg/tsdb/loki/parse_query.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
 
-	"github.com/grafana/grafana/pkg/tsdb/intervalv2"
 	"github.com/grafana/grafana/pkg/tsdb/loki/kinds/dataquery"
 )
 
@@ -32,8 +32,8 @@ const (
 )
 
 func interpolateVariables(expr string, interval time.Duration, timeRange time.Duration, queryType dataquery.LokiQueryType, step time.Duration) string {
-	intervalText := intervalv2.FormatDuration(interval)
-	stepText := intervalv2.FormatDuration(step)
+	intervalText := gtime.FormatInterval(interval)
+	stepText := gtime.FormatInterval(step)
 	intervalMsText := strconv.FormatInt(int64(interval/time.Millisecond), 10)
 
 	rangeMs := timeRange.Milliseconds()
@@ -100,21 +100,26 @@ func parseDirection(jsonPointerValue *string) (Direction, error) {
 	}
 }
 
-func parseSupportingQueryType(jsonPointerValue *string) (SupportingQueryType, error) {
+func parseSupportingQueryType(jsonPointerValue *string) SupportingQueryType {
 	if jsonPointerValue == nil {
-		return SupportingQueryNone, nil
-	} else {
-		jsonValue := *jsonPointerValue
-		switch jsonValue {
-		case "logsVolume":
-			return SupportingQueryLogsVolume, nil
-		case "logsSample":
-			return SupportingQueryLogsSample, nil
-		case "dataSample":
-			return SupportingQueryDataSample, nil
-		default:
-			return SupportingQueryNone, fmt.Errorf("invalid supportingQueryType: %s", jsonValue)
-		}
+		return SupportingQueryNone
+	}
+
+	jsonValue := *jsonPointerValue
+	switch jsonValue {
+	case "logsVolume":
+		return SupportingQueryLogsVolume
+	case "logsSample":
+		return SupportingQueryLogsSample
+	case "dataSample":
+		return SupportingQueryDataSample
+	case "infiniteScroll":
+		return SupportingQueryInfiniteScroll
+	case "":
+		return SupportingQueryNone
+	default:
+		// `SupportingQueryType` is just a `string` in the schema, so we can just parse this as a string
+		return SupportingQueryType(jsonValue)
 	}
 }
 
@@ -147,7 +152,7 @@ func parseQuery(queryContext *backend.QueryDataRequest) ([]*lokiQuery, error) {
 			return nil, err
 		}
 
-		expr := interpolateVariables(model.Expr, interval, timeRange, queryType, step)
+		expr := interpolateVariables(depointerizer(model.Expr), interval, timeRange, queryType, step)
 
 		direction, err := parseDirection(model.Direction)
 		if err != nil {
@@ -164,10 +169,7 @@ func parseQuery(queryContext *backend.QueryDataRequest) ([]*lokiQuery, error) {
 			legendFormat = *model.LegendFormat
 		}
 
-		supportingQueryType, err := parseSupportingQueryType(model.SupportingQueryType)
-		if err != nil {
-			return nil, err
-		}
+		supportingQueryType := parseSupportingQueryType(model.SupportingQueryType)
 
 		qs = append(qs, &lokiQuery{
 			Expr:                expr,
@@ -185,3 +187,12 @@ func parseQuery(queryContext *backend.QueryDataRequest) ([]*lokiQuery, error) {
 
 	return qs, nil
 }
+
+func depointerizer[T any](v *T) T {
+	var emptyValue T
+	if v != nil {
+		emptyValue = *v
+	}
+
+	return emptyValue
+}
diff --git a/pkg/tsdb/loki/parse_query_test.go b/pkg/tsdb/loki/parse_query_test.go
index 40dc6b9d5ca16..50a111c489a8d 100644
--- a/pkg/tsdb/loki/parse_query_test.go
+++ b/pkg/tsdb/loki/parse_query_test.go
@@ -35,6 +35,85 @@ func TestParseQuery(t *testing.T) {
 		require.Equal(t, time.Second*15, models[0].Step)
 		require.Equal(t, "go_goroutines 15s 15000 3000s 3000 3000000", models[0].Expr)
 	})
+
+	t.Run("parsing query model with logsVolume supporting query type", func(t *testing.T) {
+		queryContext := &backend.QueryDataRequest{
+			Queries: []backend.DataQuery{
+				{
+					JSON: []byte(`
+					{
+						"expr": "go_goroutines $__interval $__interval_ms $__range $__range_s $__range_ms",
+						"format": "time_series",
+						"refId": "A",
+						"supportingQueryType": "logsVolume"
+					}`,
+					),
+					TimeRange: backend.TimeRange{
+						From: time.Now().Add(-3000 * time.Second),
+						To:   time.Now(),
+					},
+					Interval:      time.Second * 15,
+					MaxDataPoints: 200,
+				},
+			},
+		}
+		models, err := parseQuery(queryContext)
+		require.NoError(t, err)
+		require.Equal(t, SupportingQueryLogsVolume, models[0].SupportingQueryType)
+	})
+
+	t.Run("parsing query model with any supporting query type", func(t *testing.T) {
+		queryContext := &backend.QueryDataRequest{
+			Queries: []backend.DataQuery{
+				{
+					JSON: []byte(`
+					{
+						"expr": "go_goroutines $__interval $__interval_ms $__range $__range_s $__range_ms",
+						"format": "time_series",
+						"refId": "A",
+						"supportingQueryType": "foo"
+					}`,
+					),
+					TimeRange: backend.TimeRange{
+						From: time.Now().Add(-3000 * time.Second),
+						To:   time.Now(),
+					},
+					Interval:      time.Second * 15,
+					MaxDataPoints: 200,
+				},
+			},
+		}
+		models, err := parseQuery(queryContext)
+		require.NoError(t, err)
+		require.Equal(t, SupportingQueryType("foo"), models[0].SupportingQueryType)
+	})
+
+	t.Run("parsing query model with any empty query type", func(t *testing.T) {
+		queryContext := &backend.QueryDataRequest{
+			Queries: []backend.DataQuery{
+				{
+					JSON: []byte(`
+					{
+						"expr": "go_goroutines $__interval $__interval_ms $__range $__range_s $__range_ms",
+						"format": "time_series",
+						"refId": "A",
+						"supportingQueryType": ""
+					}`,
+					),
+					TimeRange: backend.TimeRange{
+						From: time.Now().Add(-3000 * time.Second),
+						To:   time.Now(),
+					},
+					Interval:      time.Second * 15,
+					MaxDataPoints: 200,
+				},
+			},
+		}
+		models, err := parseQuery(queryContext)
+		require.NoError(t, err)
+		require.Equal(t, SupportingQueryNone, models[0].SupportingQueryType)
+	})
+
 	t.Run("interpolate variables, range between 1s and 0.5s", func(t *testing.T) {
 		expr := "go_goroutines $__interval $__interval_ms $__range $__range_s $__range_ms"
 		queryType := dataquery.LokiQueryTypeRange
diff --git a/pkg/tsdb/loki/step.go b/pkg/tsdb/loki/step.go
index df66ebef466c9..4023abfe1dbb0 100644
--- a/pkg/tsdb/loki/step.go
+++ b/pkg/tsdb/loki/step.go
@@ -4,7 +4,7 @@ import (
 	"math"
 	"time"
 
-	"github.com/grafana/grafana/pkg/tsdb/intervalv2"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
 )
 
 // round the duration to the nearest millisecond larger-or-equal-to the duration
@@ -31,7 +31,7 @@ func calculateStep(interval time.Duration, timeRange time.Duration, resolution i
 		return ceilMs(chosenStep), nil
 	}
 
-	step, err := intervalv2.ParseIntervalStringToTimeDuration(*queryStep)
+	step, err := gtime.ParseIntervalStringToTimeDuration(*queryStep)
 	if err != nil {
 		return step, err
 	}
diff --git a/pkg/tsdb/loki/streaming.go b/pkg/tsdb/loki/streaming.go
index a8d5ad0af31b6..29eb7be93a547 100644
--- a/pkg/tsdb/loki/streaming.go
+++ b/pkg/tsdb/loki/streaming.go
@@ -34,7 +34,7 @@ func (s *Service) SubscribeStream(ctx context.Context, req *backend.SubscribeStr
 	if err != nil {
 		return nil, err
 	}
-	if query.Expr == "" {
+	if query.Expr != nil {
 		return &backend.SubscribeStreamResponse{
 			Status: backend.SubscribeStreamStatusNotFound,
 		}, fmt.Errorf("missing expr in channel (subscribe)")
@@ -69,18 +69,18 @@ func (s *Service) RunStream(ctx context.Context, req *backend.RunStreamRequest,
 	if err != nil {
 		return err
 	}
-	if query.Expr == "" {
+	if query.Expr != nil {
 		return fmt.Errorf("missing expr in cuannel")
 	}
 
-	logger := logger.FromContext(ctx)
+	logger := s.logger.FromContext(ctx)
 	count := int64(0)
 
 	interrupt := make(chan os.Signal, 1)
 	signal.Notify(interrupt, os.Interrupt)
 
 	params := url.Values{}
-	params.Add("query", query.Expr)
+	params.Add("query", *query.Expr)
 
 	wsurl, _ := url.Parse(dsInfo.URL)
 
@@ -149,7 +149,7 @@ func (s *Service) RunStream(ctx context.Context, req *backend.RunStreamRequest,
 		}
 	}()
 
-	ticker := time.NewTicker(time.Second * 60) //.Step)
+	ticker := time.NewTicker(time.Second * 60) // .Step)
 	defer ticker.Stop()
 
 	for {
diff --git a/pkg/tsdb/loki/testdata/streams_structured_metadata.golden.jsonc b/pkg/tsdb/loki/testdata/streams_structured_metadata.golden.jsonc
new file mode 100644
index 0000000000000..c0c39f9cf2675
--- /dev/null
+++ b/pkg/tsdb/loki/testdata/streams_structured_metadata.golden.jsonc
@@ -0,0 +1,416 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "custom": {
+//          "frameType": "LabeledTimeValues"
+//      },
+//      "stats": [
+//          {
+//              "displayName": "Summary: bytes processed per second",
+//              "unit": "Bps",
+//              "value": 3507022
+//          },
+//          {
+//              "displayName": "Summary: lines processed per second",
+//              "value": 24818
+//          },
+//          {
+//              "displayName": "Summary: total bytes processed",
+//              "unit": "decbytes",
+//              "value": 7772
+//          },
+//          {
+//              "displayName": "Summary: total lines processed",
+//              "value": 55
+//          },
+//          {
+//              "displayName": "Summary: exec time",
+//              "unit": "s",
+//              "value": 0.002216125
+//          },
+//          {
+//              "displayName": "Store: total chunks ref",
+//              "value": 2
+//          },
+//          {
+//              "displayName": "Store: total chunks downloaded",
+//              "value": 3
+//          },
+//          {
+//              "displayName": "Store: chunks download time",
+//              "unit": "s",
+//              "value": 0.000390958
+//          },
+//          {
+//              "displayName": "Store: head chunk bytes",
+//              "unit": "decbytes",
+//              "value": 4
+//          },
+//          {
+//              "displayName": "Store: head chunk lines",
+//              "value": 5
+//          },
+//          {
+//              "displayName": "Store: decompressed bytes",
+//              "unit": "decbytes",
+//              "value": 7772
+//          },
+//          {
+//              "displayName": "Store: decompressed lines",
+//              "value": 55
+//          },
+//          {
+//              "displayName": "Store: compressed bytes",
+//              "unit": "decbytes",
+//              "value": 31432
+//          },
+//          {
+//              "displayName": "Store: total duplicates",
+//              "value": 6
+//          },
+//          {
+//              "displayName": "Ingester: total reached",
+//              "value": 7
+//          },
+//          {
+//              "displayName": "Ingester: total chunks matched",
+//              "value": 8
+//          },
+//          {
+//              "displayName": "Ingester: total batches",
+//              "value": 9
+//          },
+//          {
+//              "displayName": "Ingester: total lines sent",
+//              "value": 10
+//          },
+//          {
+//              "displayName": "Ingester: head chunk bytes",
+//              "unit": "decbytes",
+//              "value": 11
+//          },
+//          {
+//              "displayName": "Ingester: head chunk lines",
+//              "value": 12
+//          },
+//          {
+//              "displayName": "Ingester: decompressed bytes",
+//              "unit": "decbytes",
+//              "value": 13
+//          },
+//          {
+//              "displayName": "Ingester: decompressed lines",
+//              "value": 14
+//          },
+//          {
+//              "displayName": "Ingester: compressed bytes",
+//              "unit": "decbytes",
+//              "value": 15
+//          },
+//          {
+//              "displayName": "Ingester: total duplicates",
+//              "value": 16
+//          }
+//      ],
+//      "executedQueryString": "Expr: query1"
+//  }
+//  Name: 
+//  Dimensions: 6 Fields by 6 Rows
+//  +---------------------------------------+-----------------------------------------+------------------+---------------------+-----------------------------+--------------------------------+
+//  | Name: labels                          | Name: Time                              | Name: Line       | Name: tsNs          | Name: labelTypes            | Name: id                       |
+//  | Labels:                               | Labels:                                 | Labels:          | Labels:             | Labels:                     | Labels:                        |
+//  | Type: []json.RawMessage               | Type: []time.Time                       | Type: []string   | Type: []string      | Type: []json.RawMessage     | Type: []string                 |
+//  +---------------------------------------+-----------------------------------------+------------------+---------------------+-----------------------------+--------------------------------+
+//  | {"code":"one\",","location":"moon🌙"} | 2022-02-16 16:50:44.81075712 +0000 UTC  | log line error 1 | 1645030244810757120 | {"code":"I","location":"I"} | 1645030244810757120_1d8c2178   |
+//  | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:47.02773504 +0000 UTC  | log line info 1  | 1645030247027735040 | {"code":"I","location":"I"} | 1645030247027735040_87a7aed2   |
+//  | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:46.277587968 +0000 UTC | log line info 2  | 1645030246277587968 | {"code":"I","location":"I"} | 1645030246277587968_318d05c9   |
+//  | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:46.277587968 +0000 UTC | log line info 2  | 1645030246277587968 | {"code":"I","location":"I"} | 1645030246277587968_318d05c9_1 |
+//  | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:45.539423744 +0000 UTC | log line info 3  | 1645030245539423744 | {"code":"I","location":"I"} | 1645030245539423744_fd17f65c   |
+//  | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:44.091700992 +0000 UTC | log line info 4  | 1645030244091700992 | {"code":"I","location":"I"} | 1645030244091700992_62ae07f3   |
+//  +---------------------------------------+-----------------------------------------+------------------+---------------------+-----------------------------+--------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "custom": {
+            "frameType": "LabeledTimeValues"
+          },
+          "stats": [
+            {
+              "displayName": "Summary: bytes processed per second",
+              "unit": "Bps",
+              "value": 3507022
+            },
+            {
+              "displayName": "Summary: lines processed per second",
+              "value": 24818
+            },
+            {
+              "displayName": "Summary: total bytes processed",
+              "unit": "decbytes",
+              "value": 7772
+            },
+            {
+              "displayName": "Summary: total lines processed",
+              "value": 55
+            },
+            {
+              "displayName": "Summary: exec time",
+              "unit": "s",
+              "value": 0.002216125
+            },
+            {
+              "displayName": "Store: total chunks ref",
+              "value": 2
+            },
+            {
+              "displayName": "Store: total chunks downloaded",
+              "value": 3
+            },
+            {
+              "displayName": "Store: chunks download time",
+              "unit": "s",
+              "value": 0.000390958
+            },
+            {
+              "displayName": "Store: head chunk bytes",
+              "unit": "decbytes",
+              "value": 4
+            },
+            {
+              "displayName": "Store: head chunk lines",
+              "value": 5
+            },
+            {
+              "displayName": "Store: decompressed bytes",
+              "unit": "decbytes",
+              "value": 7772
+            },
+            {
+              "displayName": "Store: decompressed lines",
+              "value": 55
+            },
+            {
+              "displayName": "Store: compressed bytes",
+              "unit": "decbytes",
+              "value": 31432
+            },
+            {
+              "displayName": "Store: total duplicates",
+              "value": 6
+            },
+            {
+              "displayName": "Ingester: total reached",
+              "value": 7
+            },
+            {
+              "displayName": "Ingester: total chunks matched",
+              "value": 8
+            },
+            {
+              "displayName": "Ingester: total batches",
+              "value": 9
+            },
+            {
+              "displayName": "Ingester: total lines sent",
+              "value": 10
+            },
+            {
+              "displayName": "Ingester: head chunk bytes",
+              "unit": "decbytes",
+              "value": 11
+            },
+            {
+              "displayName": "Ingester: head chunk lines",
+              "value": 12
+            },
+            {
+              "displayName": "Ingester: decompressed bytes",
+              "unit": "decbytes",
+              "value": 13
+            },
+            {
+              "displayName": "Ingester: decompressed lines",
+              "value": 14
+            },
+            {
+              "displayName": "Ingester: compressed bytes",
+              "unit": "decbytes",
+              "value": 15
+            },
+            {
+              "displayName": "Ingester: total duplicates",
+              "value": 16
+            }
+          ],
+          "executedQueryString": "Expr: query1"
+        },
+        "fields": [
+          {
+            "name": "labels",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage"
+            }
+          },
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Line",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "tsNs",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "labelTypes",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage"
+            },
+            "config": {
+              "custom": {
+                "hidden": true
+              }
+            }
+          },
+          {
+            "name": "id",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            {
+              "code": "one\",",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "location": "moon🌙"
+            }
+          ],
+          [
+            1645030244810,
+            1645030247027,
+            1645030246277,
+            1645030246277,
+            1645030245539,
+            1645030244091
+          ],
+          [
+            "log line error 1",
+            "log line info 1",
+            "log line info 2",
+            "log line info 2",
+            "log line info 3",
+            "log line info 4"
+          ],
+          [
+            "1645030244810757120",
+            "1645030247027735040",
+            "1645030246277587968",
+            "1645030246277587968",
+            "1645030245539423744",
+            "1645030244091700992"
+          ],
+          [
+            {
+              "code": "I",
+              "location": "I"
+            },
+            {
+              "code": "I",
+              "location": "I"
+            },
+            {
+              "code": "I",
+              "location": "I"
+            },
+            {
+              "code": "I",
+              "location": "I"
+            },
+            {
+              "code": "I",
+              "location": "I"
+            },
+            {
+              "code": "I",
+              "location": "I"
+            }
+          ],
+          [
+            "1645030244810757120_1d8c2178",
+            "1645030247027735040_87a7aed2",
+            "1645030246277587968_318d05c9",
+            "1645030246277587968_318d05c9_1",
+            "1645030245539423744_fd17f65c",
+            "1645030244091700992_62ae07f3"
+          ]
+        ],
+        "nanos": [
+          null,
+          [
+            757120,
+            735040,
+            587968,
+            587968,
+            423744,
+            700992
+          ],
+          null,
+          null,
+          null,
+          null
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/loki/testdata/streams_structured_metadata.json b/pkg/tsdb/loki/testdata/streams_structured_metadata.json
new file mode 100644
index 0000000000000..760e15ca712be
--- /dev/null
+++ b/pkg/tsdb/loki/testdata/streams_structured_metadata.json
@@ -0,0 +1,89 @@
+{
+  "status": "success",
+  "data": {
+    "encodingFlags": [
+      "categorize-labels"
+    ],
+    "resultType": "streams",
+    "result": [
+      {
+        "stream": {
+          "code": "one\",",
+          "location": "moon🌙"
+        },
+        "values": [
+          [
+            "1645030244810757120",
+						"log line error 1",
+            {}
+          ]
+        ]
+      },
+      {
+        "stream": {
+          "code": "\",two",
+          "location": "moon🌙"
+        },
+        "values": [
+          [
+            "1645030247027735040",
+						"log line info 1",
+            {}
+          ],
+          [
+            "1645030246277587968",
+						"log line info 2",
+            {}
+          ],
+          [
+            "1645030246277587968",
+						"log line info 2",
+            {}
+          ],
+          [
+            "1645030245539423744",
+						"log line info 3",
+            {}
+          ],
+          [
+            "1645030244091700992",
+						"log line info 4",
+            {}
+          ]
+        ]
+      }
+    ],
+    "stats": {
+      "summary": {
+        "bytesProcessedPerSecond": 3507022,
+        "linesProcessedPerSecond": 24818,
+        "totalBytesProcessed": 7772,
+        "totalLinesProcessed": 55,
+        "execTime": 0.002216125
+      },
+      "store": {
+        "totalChunksRef": 2,
+        "totalChunksDownloaded": 3,
+        "chunksDownloadTime": 0.000390958,
+        "headChunkBytes": 4,
+        "headChunkLines": 5,
+        "decompressedBytes": 7772,
+        "decompressedLines": 55,
+        "compressedBytes": 31432,
+        "totalDuplicates": 6
+      },
+      "ingester": {
+        "totalReached": 7,
+        "totalChunksMatched": 8,
+        "totalBatches": 9,
+        "totalLinesSent": 10,
+        "headChunkBytes": 11,
+        "headChunkLines": 12,
+        "decompressedBytes": 13,
+        "decompressedLines": 14,
+        "compressedBytes": 15,
+        "totalDuplicates": 16
+      }
+    }
+  }
+}
diff --git a/pkg/tsdb/loki/testdata/streams_structured_metadata_2.golden.jsonc b/pkg/tsdb/loki/testdata/streams_structured_metadata_2.golden.jsonc
new file mode 100644
index 0000000000000..2f65417a5afd4
--- /dev/null
+++ b/pkg/tsdb/loki/testdata/streams_structured_metadata_2.golden.jsonc
@@ -0,0 +1,380 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "custom": {
+//          "frameType": "LabeledTimeValues"
+//      },
+//      "stats": [
+//          {
+//              "displayName": "Summary: bytes processed per second",
+//              "unit": "Bps",
+//              "value": 3507022
+//          },
+//          {
+//              "displayName": "Summary: lines processed per second",
+//              "value": 24818
+//          },
+//          {
+//              "displayName": "Summary: total bytes processed",
+//              "unit": "decbytes",
+//              "value": 7772
+//          },
+//          {
+//              "displayName": "Summary: total lines processed",
+//              "value": 55
+//          },
+//          {
+//              "displayName": "Summary: exec time",
+//              "unit": "s",
+//              "value": 0.002216125
+//          },
+//          {
+//              "displayName": "Store: total chunks ref",
+//              "value": 2
+//          },
+//          {
+//              "displayName": "Store: total chunks downloaded",
+//              "value": 3
+//          },
+//          {
+//              "displayName": "Store: chunks download time",
+//              "unit": "s",
+//              "value": 0.000390958
+//          },
+//          {
+//              "displayName": "Store: head chunk bytes",
+//              "unit": "decbytes",
+//              "value": 4
+//          },
+//          {
+//              "displayName": "Store: head chunk lines",
+//              "value": 5
+//          },
+//          {
+//              "displayName": "Store: decompressed bytes",
+//              "unit": "decbytes",
+//              "value": 7772
+//          },
+//          {
+//              "displayName": "Store: decompressed lines",
+//              "value": 55
+//          },
+//          {
+//              "displayName": "Store: compressed bytes",
+//              "unit": "decbytes",
+//              "value": 31432
+//          },
+//          {
+//              "displayName": "Store: total duplicates",
+//              "value": 6
+//          },
+//          {
+//              "displayName": "Ingester: total reached",
+//              "value": 7
+//          },
+//          {
+//              "displayName": "Ingester: total chunks matched",
+//              "value": 8
+//          },
+//          {
+//              "displayName": "Ingester: total batches",
+//              "value": 9
+//          },
+//          {
+//              "displayName": "Ingester: total lines sent",
+//              "value": 10
+//          },
+//          {
+//              "displayName": "Ingester: head chunk bytes",
+//              "unit": "decbytes",
+//              "value": 11
+//          },
+//          {
+//              "displayName": "Ingester: head chunk lines",
+//              "value": 12
+//          },
+//          {
+//              "displayName": "Ingester: decompressed bytes",
+//              "unit": "decbytes",
+//              "value": 13
+//          },
+//          {
+//              "displayName": "Ingester: decompressed lines",
+//              "value": 14
+//          },
+//          {
+//              "displayName": "Ingester: compressed bytes",
+//              "unit": "decbytes",
+//              "value": 15
+//          },
+//          {
+//              "displayName": "Ingester: total duplicates",
+//              "value": 16
+//          }
+//      ],
+//      "executedQueryString": "Expr: query1"
+//  }
+//  Name: 
+//  Dimensions: 6 Fields by 3 Rows
+//  +------------------------------------------------------+--------------------------------------+------------------+---------------------+------------------------------------------+------------------------------+
+//  | Name: labels                                         | Name: Time                           | Name: Line       | Name: tsNs          | Name: labelTypes                         | Name: id                     |
+//  | Labels:                                              | Labels:                              | Labels:          | Labels:             | Labels:                                  | Labels:                      |
+//  | Type: []json.RawMessage                              | Type: []time.Time                    | Type: []string   | Type: []string      | Type: []json.RawMessage                  | Type: []string               |
+//  +------------------------------------------------------+--------------------------------------+------------------+---------------------+------------------------------------------+------------------------------+
+//  | {"code":"\",two","field2":"two","location":"moon🌙"} | 2024-01-10 14:01:36.244577 +0000 UTC | {"field2":"two"} | 1704895296244577000 | {"code":"I","field2":"P","location":"I"} | 1704895296244577000_194597ad |
+//  | {"code":"\",two","field1":"one","location":"moon🌙"} | 2024-01-10 14:01:07.503906 +0000 UTC | {"field1":"one"} | 1704895267503906000 | {"code":"I","field1":"P","location":"I"} | 1704895267503906000_90781cdf |
+//  | {"code":"\",two","field1":"one","location":"moon🌙"} | 2024-01-10 14:00:45.190222 +0000 UTC | {"field1":"one"} | 1704895245190222000 | {"code":"I","field1":"P","location":"I"} | 1704895245190222000_90781cdf |
+//  +------------------------------------------------------+--------------------------------------+------------------+---------------------+------------------------------------------+------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "custom": {
+            "frameType": "LabeledTimeValues"
+          },
+          "stats": [
+            {
+              "displayName": "Summary: bytes processed per second",
+              "unit": "Bps",
+              "value": 3507022
+            },
+            {
+              "displayName": "Summary: lines processed per second",
+              "value": 24818
+            },
+            {
+              "displayName": "Summary: total bytes processed",
+              "unit": "decbytes",
+              "value": 7772
+            },
+            {
+              "displayName": "Summary: total lines processed",
+              "value": 55
+            },
+            {
+              "displayName": "Summary: exec time",
+              "unit": "s",
+              "value": 0.002216125
+            },
+            {
+              "displayName": "Store: total chunks ref",
+              "value": 2
+            },
+            {
+              "displayName": "Store: total chunks downloaded",
+              "value": 3
+            },
+            {
+              "displayName": "Store: chunks download time",
+              "unit": "s",
+              "value": 0.000390958
+            },
+            {
+              "displayName": "Store: head chunk bytes",
+              "unit": "decbytes",
+              "value": 4
+            },
+            {
+              "displayName": "Store: head chunk lines",
+              "value": 5
+            },
+            {
+              "displayName": "Store: decompressed bytes",
+              "unit": "decbytes",
+              "value": 7772
+            },
+            {
+              "displayName": "Store: decompressed lines",
+              "value": 55
+            },
+            {
+              "displayName": "Store: compressed bytes",
+              "unit": "decbytes",
+              "value": 31432
+            },
+            {
+              "displayName": "Store: total duplicates",
+              "value": 6
+            },
+            {
+              "displayName": "Ingester: total reached",
+              "value": 7
+            },
+            {
+              "displayName": "Ingester: total chunks matched",
+              "value": 8
+            },
+            {
+              "displayName": "Ingester: total batches",
+              "value": 9
+            },
+            {
+              "displayName": "Ingester: total lines sent",
+              "value": 10
+            },
+            {
+              "displayName": "Ingester: head chunk bytes",
+              "unit": "decbytes",
+              "value": 11
+            },
+            {
+              "displayName": "Ingester: head chunk lines",
+              "value": 12
+            },
+            {
+              "displayName": "Ingester: decompressed bytes",
+              "unit": "decbytes",
+              "value": 13
+            },
+            {
+              "displayName": "Ingester: decompressed lines",
+              "value": 14
+            },
+            {
+              "displayName": "Ingester: compressed bytes",
+              "unit": "decbytes",
+              "value": 15
+            },
+            {
+              "displayName": "Ingester: total duplicates",
+              "value": 16
+            }
+          ],
+          "executedQueryString": "Expr: query1"
+        },
+        "fields": [
+          {
+            "name": "labels",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage"
+            }
+          },
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Line",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "tsNs",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "labelTypes",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage"
+            },
+            "config": {
+              "custom": {
+                "hidden": true
+              }
+            }
+          },
+          {
+            "name": "id",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            {
+              "code": "\",two",
+              "field2": "two",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "field1": "one",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "field1": "one",
+              "location": "moon🌙"
+            }
+          ],
+          [
+            1704895296244,
+            1704895267503,
+            1704895245190
+          ],
+          [
+            "{\"field2\":\"two\"}",
+            "{\"field1\":\"one\"}",
+            "{\"field1\":\"one\"}"
+          ],
+          [
+            "1704895296244577000",
+            "1704895267503906000",
+            "1704895245190222000"
+          ],
+          [
+            {
+              "code": "I",
+              "field2": "P",
+              "location": "I"
+            },
+            {
+              "code": "I",
+              "field1": "P",
+              "location": "I"
+            },
+            {
+              "code": "I",
+              "field1": "P",
+              "location": "I"
+            }
+          ],
+          [
+            "1704895296244577000_194597ad",
+            "1704895267503906000_90781cdf",
+            "1704895245190222000_90781cdf"
+          ]
+        ],
+        "nanos": [
+          null,
+          [
+            577000,
+            906000,
+            222000
+          ],
+          null,
+          null,
+          null,
+          null
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/loki/testdata/streams_structured_metadata_2.json b/pkg/tsdb/loki/testdata/streams_structured_metadata_2.json
new file mode 100644
index 0000000000000..45dc560f354dd
--- /dev/null
+++ b/pkg/tsdb/loki/testdata/streams_structured_metadata_2.json
@@ -0,0 +1,78 @@
+{
+  "status": "success",
+  "data": {
+    "encodingFlags": [
+      "categorize-labels"
+    ],
+    "resultType": "streams",
+    "result": [
+      {
+        "stream": {
+          "code": "\",two",
+          "location": "moon🌙"
+        },
+        "values": [
+          [
+            "1704895296244577000",
+            "{\"field2\":\"two\"}",
+            {
+              "parsed": {
+                "field2": "two"
+              }
+            }
+          ],
+          [
+            "1704895267503906000",
+            "{\"field1\":\"one\"}",
+            {
+              "parsed": {
+                "field1": "one"
+              }
+            }
+          ],
+          [
+            "1704895245190222000",
+            "{\"field1\":\"one\"}",
+            {
+              "parsed": {
+                "field1": "one"
+              }
+            }
+          ]
+        ]
+      }
+    ],
+    "stats": {
+      "summary": {
+        "bytesProcessedPerSecond": 3507022,
+        "linesProcessedPerSecond": 24818,
+        "totalBytesProcessed": 7772,
+        "totalLinesProcessed": 55,
+        "execTime": 0.002216125
+      },
+      "store": {
+        "totalChunksRef": 2,
+        "totalChunksDownloaded": 3,
+        "chunksDownloadTime": 0.000390958,
+        "headChunkBytes": 4,
+        "headChunkLines": 5,
+        "decompressedBytes": 7772,
+        "decompressedLines": 55,
+        "compressedBytes": 31432,
+        "totalDuplicates": 6
+      },
+      "ingester": {
+        "totalReached": 7,
+        "totalChunksMatched": 8,
+        "totalBatches": 9,
+        "totalLinesSent": 10,
+        "headChunkBytes": 11,
+        "headChunkLines": 12,
+        "decompressedBytes": 13,
+        "decompressedLines": 14,
+        "compressedBytes": 15,
+        "totalDuplicates": 16
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/pkg/tsdb/loki/testdata_dataplane/streams_parse_errors.golden.jsonc b/pkg/tsdb/loki/testdata_dataplane/streams_parse_errors.golden.jsonc
index f7d072f5bab00..8631194fa4bc3 100644
--- a/pkg/tsdb/loki/testdata_dataplane/streams_parse_errors.golden.jsonc
+++ b/pkg/tsdb/loki/testdata_dataplane/streams_parse_errors.golden.jsonc
@@ -11,7 +11,7 @@
 //  Name: 
 //  Dimensions: 4 Fields by 4 Rows
 //  +------------------------------------------------+-------------------------------+----------------+------------------------------+
-//  | Name: attributes                               | Name: timestamp               | Name: body     | Name: id                     |
+//  | Name: labels                                   | Name: timestamp               | Name: body     | Name: id                     |
 //  | Labels:                                        | Labels:                       | Labels:        | Labels:                      |
 //  | Type: []json.RawMessage                        | Type: []time.Time             | Type: []string | Type: []string               |
 //  +------------------------------------------------+-------------------------------+----------------+------------------------------+
@@ -38,7 +38,7 @@
         },
         "fields": [
           {
-            "name": "attributes",
+            "name": "labels",
             "type": "other",
             "typeInfo": {
               "frame": "json.RawMessage"
diff --git a/pkg/tsdb/loki/testdata_dataplane/streams_simple.golden.jsonc b/pkg/tsdb/loki/testdata_dataplane/streams_simple.golden.jsonc
index 44d9d82d38305..7168eaf851448 100644
--- a/pkg/tsdb/loki/testdata_dataplane/streams_simple.golden.jsonc
+++ b/pkg/tsdb/loki/testdata_dataplane/streams_simple.golden.jsonc
@@ -119,7 +119,7 @@
 //  Name: 
 //  Dimensions: 4 Fields by 6 Rows
 //  +---------------------------------------+-----------------------------------------+------------------+--------------------------------+
-//  | Name: attributes                      | Name: timestamp                         | Name: body       | Name: id                       |
+//  | Name: labels                          | Name: timestamp                         | Name: body       | Name: id                       |
 //  | Labels:                               | Labels:                                 | Labels:          | Labels:                        |
 //  | Type: []json.RawMessage               | Type: []time.Time                       | Type: []string   | Type: []string                 |
 //  +---------------------------------------+-----------------------------------------+------------------+--------------------------------+
@@ -256,7 +256,7 @@
         },
         "fields": [
           {
-            "name": "attributes",
+            "name": "labels",
             "type": "other",
             "typeInfo": {
               "frame": "json.RawMessage"
diff --git a/pkg/tsdb/loki/testdata_dataplane/streams_structured_metadata.golden.jsonc b/pkg/tsdb/loki/testdata_dataplane/streams_structured_metadata.golden.jsonc
new file mode 100644
index 0000000000000..edbdb4e40d8f4
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_dataplane/streams_structured_metadata.golden.jsonc
@@ -0,0 +1,396 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "log-lines",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "stats": [
+//          {
+//              "displayName": "Summary: bytes processed per second",
+//              "unit": "Bps",
+//              "value": 3507022
+//          },
+//          {
+//              "displayName": "Summary: lines processed per second",
+//              "value": 24818
+//          },
+//          {
+//              "displayName": "Summary: total bytes processed",
+//              "unit": "decbytes",
+//              "value": 7772
+//          },
+//          {
+//              "displayName": "Summary: total lines processed",
+//              "value": 55
+//          },
+//          {
+//              "displayName": "Summary: exec time",
+//              "unit": "s",
+//              "value": 0.002216125
+//          },
+//          {
+//              "displayName": "Store: total chunks ref",
+//              "value": 2
+//          },
+//          {
+//              "displayName": "Store: total chunks downloaded",
+//              "value": 3
+//          },
+//          {
+//              "displayName": "Store: chunks download time",
+//              "unit": "s",
+//              "value": 0.000390958
+//          },
+//          {
+//              "displayName": "Store: head chunk bytes",
+//              "unit": "decbytes",
+//              "value": 4
+//          },
+//          {
+//              "displayName": "Store: head chunk lines",
+//              "value": 5
+//          },
+//          {
+//              "displayName": "Store: decompressed bytes",
+//              "unit": "decbytes",
+//              "value": 7772
+//          },
+//          {
+//              "displayName": "Store: decompressed lines",
+//              "value": 55
+//          },
+//          {
+//              "displayName": "Store: compressed bytes",
+//              "unit": "decbytes",
+//              "value": 31432
+//          },
+//          {
+//              "displayName": "Store: total duplicates",
+//              "value": 6
+//          },
+//          {
+//              "displayName": "Ingester: total reached",
+//              "value": 7
+//          },
+//          {
+//              "displayName": "Ingester: total chunks matched",
+//              "value": 8
+//          },
+//          {
+//              "displayName": "Ingester: total batches",
+//              "value": 9
+//          },
+//          {
+//              "displayName": "Ingester: total lines sent",
+//              "value": 10
+//          },
+//          {
+//              "displayName": "Ingester: head chunk bytes",
+//              "unit": "decbytes",
+//              "value": 11
+//          },
+//          {
+//              "displayName": "Ingester: head chunk lines",
+//              "value": 12
+//          },
+//          {
+//              "displayName": "Ingester: decompressed bytes",
+//              "unit": "decbytes",
+//              "value": 13
+//          },
+//          {
+//              "displayName": "Ingester: decompressed lines",
+//              "value": 14
+//          },
+//          {
+//              "displayName": "Ingester: compressed bytes",
+//              "unit": "decbytes",
+//              "value": 15
+//          },
+//          {
+//              "displayName": "Ingester: total duplicates",
+//              "value": 16
+//          }
+//      ],
+//      "executedQueryString": "Expr: query1"
+//  }
+//  Name: 
+//  Dimensions: 5 Fields by 6 Rows
+//  +---------------------------------------+-----------------------------------------+------------------+--------------------------------+-----------------------------+
+//  | Name: labels                          | Name: timestamp                         | Name: body       | Name: id                       | Name: labelTypes            |
+//  | Labels:                               | Labels:                                 | Labels:          | Labels:                        | Labels:                     |
+//  | Type: []json.RawMessage               | Type: []time.Time                       | Type: []string   | Type: []string                 | Type: []json.RawMessage     |
+//  +---------------------------------------+-----------------------------------------+------------------+--------------------------------+-----------------------------+
+//  | {"code":"one\",","location":"moon🌙"} | 2022-02-16 16:50:44.81075712 +0000 UTC  | log line error 1 | 1645030244810757120_1d8c2178   | {"code":"I","location":"I"} |
+//  | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:47.02773504 +0000 UTC  | log line info 1  | 1645030247027735040_87a7aed2   | {"code":"I","location":"I"} |
+//  | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:46.277587968 +0000 UTC | log line info 2  | 1645030246277587968_318d05c9   | {"code":"I","location":"I"} |
+//  | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:46.277587968 +0000 UTC | log line info 2  | 1645030246277587968_318d05c9_1 | {"code":"I","location":"I"} |
+//  | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:45.539423744 +0000 UTC | log line info 3  | 1645030245539423744_fd17f65c   | {"code":"I","location":"I"} |
+//  | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:44.091700992 +0000 UTC | log line info 4  | 1645030244091700992_62ae07f3   | {"code":"I","location":"I"} |
+//  +---------------------------------------+-----------------------------------------+------------------+--------------------------------+-----------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "log-lines",
+          "typeVersion": [
+            0,
+            0
+          ],
+          "stats": [
+            {
+              "displayName": "Summary: bytes processed per second",
+              "unit": "Bps",
+              "value": 3507022
+            },
+            {
+              "displayName": "Summary: lines processed per second",
+              "value": 24818
+            },
+            {
+              "displayName": "Summary: total bytes processed",
+              "unit": "decbytes",
+              "value": 7772
+            },
+            {
+              "displayName": "Summary: total lines processed",
+              "value": 55
+            },
+            {
+              "displayName": "Summary: exec time",
+              "unit": "s",
+              "value": 0.002216125
+            },
+            {
+              "displayName": "Store: total chunks ref",
+              "value": 2
+            },
+            {
+              "displayName": "Store: total chunks downloaded",
+              "value": 3
+            },
+            {
+              "displayName": "Store: chunks download time",
+              "unit": "s",
+              "value": 0.000390958
+            },
+            {
+              "displayName": "Store: head chunk bytes",
+              "unit": "decbytes",
+              "value": 4
+            },
+            {
+              "displayName": "Store: head chunk lines",
+              "value": 5
+            },
+            {
+              "displayName": "Store: decompressed bytes",
+              "unit": "decbytes",
+              "value": 7772
+            },
+            {
+              "displayName": "Store: decompressed lines",
+              "value": 55
+            },
+            {
+              "displayName": "Store: compressed bytes",
+              "unit": "decbytes",
+              "value": 31432
+            },
+            {
+              "displayName": "Store: total duplicates",
+              "value": 6
+            },
+            {
+              "displayName": "Ingester: total reached",
+              "value": 7
+            },
+            {
+              "displayName": "Ingester: total chunks matched",
+              "value": 8
+            },
+            {
+              "displayName": "Ingester: total batches",
+              "value": 9
+            },
+            {
+              "displayName": "Ingester: total lines sent",
+              "value": 10
+            },
+            {
+              "displayName": "Ingester: head chunk bytes",
+              "unit": "decbytes",
+              "value": 11
+            },
+            {
+              "displayName": "Ingester: head chunk lines",
+              "value": 12
+            },
+            {
+              "displayName": "Ingester: decompressed bytes",
+              "unit": "decbytes",
+              "value": 13
+            },
+            {
+              "displayName": "Ingester: decompressed lines",
+              "value": 14
+            },
+            {
+              "displayName": "Ingester: compressed bytes",
+              "unit": "decbytes",
+              "value": 15
+            },
+            {
+              "displayName": "Ingester: total duplicates",
+              "value": 16
+            }
+          ],
+          "executedQueryString": "Expr: query1"
+        },
+        "fields": [
+          {
+            "name": "labels",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage"
+            }
+          },
+          {
+            "name": "timestamp",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "body",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "id",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "labelTypes",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage"
+            },
+            "config": {
+              "custom": {
+                "hidden": true
+              }
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            {
+              "code": "one\",",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "location": "moon🌙"
+            }
+          ],
+          [
+            1645030244810,
+            1645030247027,
+            1645030246277,
+            1645030246277,
+            1645030245539,
+            1645030244091
+          ],
+          [
+            "log line error 1",
+            "log line info 1",
+            "log line info 2",
+            "log line info 2",
+            "log line info 3",
+            "log line info 4"
+          ],
+          [
+            "1645030244810757120_1d8c2178",
+            "1645030247027735040_87a7aed2",
+            "1645030246277587968_318d05c9",
+            "1645030246277587968_318d05c9_1",
+            "1645030245539423744_fd17f65c",
+            "1645030244091700992_62ae07f3"
+          ],
+          [
+            {
+              "code": "I",
+              "location": "I"
+            },
+            {
+              "code": "I",
+              "location": "I"
+            },
+            {
+              "code": "I",
+              "location": "I"
+            },
+            {
+              "code": "I",
+              "location": "I"
+            },
+            {
+              "code": "I",
+              "location": "I"
+            },
+            {
+              "code": "I",
+              "location": "I"
+            }
+          ]
+        ],
+        "nanos": [
+          null,
+          [
+            757120,
+            735040,
+            587968,
+            587968,
+            423744,
+            700992
+          ],
+          null,
+          null,
+          null
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/loki/testdata_dataplane/streams_structured_metadata.json b/pkg/tsdb/loki/testdata_dataplane/streams_structured_metadata.json
new file mode 100644
index 0000000000000..760e15ca712be
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_dataplane/streams_structured_metadata.json
@@ -0,0 +1,89 @@
+{
+  "status": "success",
+  "data": {
+    "encodingFlags": [
+      "categorize-labels"
+    ],
+    "resultType": "streams",
+    "result": [
+      {
+        "stream": {
+          "code": "one\",",
+          "location": "moon🌙"
+        },
+        "values": [
+          [
+            "1645030244810757120",
+						"log line error 1",
+            {}
+          ]
+        ]
+      },
+      {
+        "stream": {
+          "code": "\",two",
+          "location": "moon🌙"
+        },
+        "values": [
+          [
+            "1645030247027735040",
+						"log line info 1",
+            {}
+          ],
+          [
+            "1645030246277587968",
+						"log line info 2",
+            {}
+          ],
+          [
+            "1645030246277587968",
+						"log line info 2",
+            {}
+          ],
+          [
+            "1645030245539423744",
+						"log line info 3",
+            {}
+          ],
+          [
+            "1645030244091700992",
+						"log line info 4",
+            {}
+          ]
+        ]
+      }
+    ],
+    "stats": {
+      "summary": {
+        "bytesProcessedPerSecond": 3507022,
+        "linesProcessedPerSecond": 24818,
+        "totalBytesProcessed": 7772,
+        "totalLinesProcessed": 55,
+        "execTime": 0.002216125
+      },
+      "store": {
+        "totalChunksRef": 2,
+        "totalChunksDownloaded": 3,
+        "chunksDownloadTime": 0.000390958,
+        "headChunkBytes": 4,
+        "headChunkLines": 5,
+        "decompressedBytes": 7772,
+        "decompressedLines": 55,
+        "compressedBytes": 31432,
+        "totalDuplicates": 6
+      },
+      "ingester": {
+        "totalReached": 7,
+        "totalChunksMatched": 8,
+        "totalBatches": 9,
+        "totalLinesSent": 10,
+        "headChunkBytes": 11,
+        "headChunkLines": 12,
+        "decompressedBytes": 13,
+        "decompressedLines": 14,
+        "compressedBytes": 15,
+        "totalDuplicates": 16
+      }
+    }
+  }
+}
diff --git a/pkg/tsdb/loki/testdata_dataplane/streams_structured_metadata_2.golden.jsonc b/pkg/tsdb/loki/testdata_dataplane/streams_structured_metadata_2.golden.jsonc
new file mode 100644
index 0000000000000..b2ea873dc1f98
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_dataplane/streams_structured_metadata_2.golden.jsonc
@@ -0,0 +1,363 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "log-lines",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "stats": [
+//          {
+//              "displayName": "Summary: bytes processed per second",
+//              "unit": "Bps",
+//              "value": 3507022
+//          },
+//          {
+//              "displayName": "Summary: lines processed per second",
+//              "value": 24818
+//          },
+//          {
+//              "displayName": "Summary: total bytes processed",
+//              "unit": "decbytes",
+//              "value": 7772
+//          },
+//          {
+//              "displayName": "Summary: total lines processed",
+//              "value": 55
+//          },
+//          {
+//              "displayName": "Summary: exec time",
+//              "unit": "s",
+//              "value": 0.002216125
+//          },
+//          {
+//              "displayName": "Store: total chunks ref",
+//              "value": 2
+//          },
+//          {
+//              "displayName": "Store: total chunks downloaded",
+//              "value": 3
+//          },
+//          {
+//              "displayName": "Store: chunks download time",
+//              "unit": "s",
+//              "value": 0.000390958
+//          },
+//          {
+//              "displayName": "Store: head chunk bytes",
+//              "unit": "decbytes",
+//              "value": 4
+//          },
+//          {
+//              "displayName": "Store: head chunk lines",
+//              "value": 5
+//          },
+//          {
+//              "displayName": "Store: decompressed bytes",
+//              "unit": "decbytes",
+//              "value": 7772
+//          },
+//          {
+//              "displayName": "Store: decompressed lines",
+//              "value": 55
+//          },
+//          {
+//              "displayName": "Store: compressed bytes",
+//              "unit": "decbytes",
+//              "value": 31432
+//          },
+//          {
+//              "displayName": "Store: total duplicates",
+//              "value": 6
+//          },
+//          {
+//              "displayName": "Ingester: total reached",
+//              "value": 7
+//          },
+//          {
+//              "displayName": "Ingester: total chunks matched",
+//              "value": 8
+//          },
+//          {
+//              "displayName": "Ingester: total batches",
+//              "value": 9
+//          },
+//          {
+//              "displayName": "Ingester: total lines sent",
+//              "value": 10
+//          },
+//          {
+//              "displayName": "Ingester: head chunk bytes",
+//              "unit": "decbytes",
+//              "value": 11
+//          },
+//          {
+//              "displayName": "Ingester: head chunk lines",
+//              "value": 12
+//          },
+//          {
+//              "displayName": "Ingester: decompressed bytes",
+//              "unit": "decbytes",
+//              "value": 13
+//          },
+//          {
+//              "displayName": "Ingester: decompressed lines",
+//              "value": 14
+//          },
+//          {
+//              "displayName": "Ingester: compressed bytes",
+//              "unit": "decbytes",
+//              "value": 15
+//          },
+//          {
+//              "displayName": "Ingester: total duplicates",
+//              "value": 16
+//          }
+//      ],
+//      "executedQueryString": "Expr: query1"
+//  }
+//  Name: 
+//  Dimensions: 5 Fields by 3 Rows
+//  +------------------------------------------------------+--------------------------------------+------------------+------------------------------+------------------------------------------+
+//  | Name: labels                                         | Name: timestamp                      | Name: body       | Name: id                     | Name: labelTypes                         |
+//  | Labels:                                              | Labels:                              | Labels:          | Labels:                      | Labels:                                  |
+//  | Type: []json.RawMessage                              | Type: []time.Time                    | Type: []string   | Type: []string               | Type: []json.RawMessage                  |
+//  +------------------------------------------------------+--------------------------------------+------------------+------------------------------+------------------------------------------+
+//  | {"code":"\",two","field2":"two","location":"moon🌙"} | 2024-01-10 14:01:36.244577 +0000 UTC | {"field2":"two"} | 1704895296244577000_194597ad | {"code":"I","field2":"P","location":"I"} |
+//  | {"code":"\",two","field1":"one","location":"moon🌙"} | 2024-01-10 14:01:07.503906 +0000 UTC | {"field1":"one"} | 1704895267503906000_90781cdf | {"code":"I","field1":"P","location":"I"} |
+//  | {"code":"\",two","field1":"one","location":"moon🌙"} | 2024-01-10 14:00:45.190222 +0000 UTC | {"field1":"one"} | 1704895245190222000_90781cdf | {"code":"I","field1":"P","location":"I"} |
+//  +------------------------------------------------------+--------------------------------------+------------------+------------------------------+------------------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "log-lines",
+          "typeVersion": [
+            0,
+            0
+          ],
+          "stats": [
+            {
+              "displayName": "Summary: bytes processed per second",
+              "unit": "Bps",
+              "value": 3507022
+            },
+            {
+              "displayName": "Summary: lines processed per second",
+              "value": 24818
+            },
+            {
+              "displayName": "Summary: total bytes processed",
+              "unit": "decbytes",
+              "value": 7772
+            },
+            {
+              "displayName": "Summary: total lines processed",
+              "value": 55
+            },
+            {
+              "displayName": "Summary: exec time",
+              "unit": "s",
+              "value": 0.002216125
+            },
+            {
+              "displayName": "Store: total chunks ref",
+              "value": 2
+            },
+            {
+              "displayName": "Store: total chunks downloaded",
+              "value": 3
+            },
+            {
+              "displayName": "Store: chunks download time",
+              "unit": "s",
+              "value": 0.000390958
+            },
+            {
+              "displayName": "Store: head chunk bytes",
+              "unit": "decbytes",
+              "value": 4
+            },
+            {
+              "displayName": "Store: head chunk lines",
+              "value": 5
+            },
+            {
+              "displayName": "Store: decompressed bytes",
+              "unit": "decbytes",
+              "value": 7772
+            },
+            {
+              "displayName": "Store: decompressed lines",
+              "value": 55
+            },
+            {
+              "displayName": "Store: compressed bytes",
+              "unit": "decbytes",
+              "value": 31432
+            },
+            {
+              "displayName": "Store: total duplicates",
+              "value": 6
+            },
+            {
+              "displayName": "Ingester: total reached",
+              "value": 7
+            },
+            {
+              "displayName": "Ingester: total chunks matched",
+              "value": 8
+            },
+            {
+              "displayName": "Ingester: total batches",
+              "value": 9
+            },
+            {
+              "displayName": "Ingester: total lines sent",
+              "value": 10
+            },
+            {
+              "displayName": "Ingester: head chunk bytes",
+              "unit": "decbytes",
+              "value": 11
+            },
+            {
+              "displayName": "Ingester: head chunk lines",
+              "value": 12
+            },
+            {
+              "displayName": "Ingester: decompressed bytes",
+              "unit": "decbytes",
+              "value": 13
+            },
+            {
+              "displayName": "Ingester: decompressed lines",
+              "value": 14
+            },
+            {
+              "displayName": "Ingester: compressed bytes",
+              "unit": "decbytes",
+              "value": 15
+            },
+            {
+              "displayName": "Ingester: total duplicates",
+              "value": 16
+            }
+          ],
+          "executedQueryString": "Expr: query1"
+        },
+        "fields": [
+          {
+            "name": "labels",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage"
+            }
+          },
+          {
+            "name": "timestamp",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "body",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "id",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "labelTypes",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage"
+            },
+            "config": {
+              "custom": {
+                "hidden": true
+              }
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            {
+              "code": "\",two",
+              "field2": "two",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "field1": "one",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "field1": "one",
+              "location": "moon🌙"
+            }
+          ],
+          [
+            1704895296244,
+            1704895267503,
+            1704895245190
+          ],
+          [
+            "{\"field2\":\"two\"}",
+            "{\"field1\":\"one\"}",
+            "{\"field1\":\"one\"}"
+          ],
+          [
+            "1704895296244577000_194597ad",
+            "1704895267503906000_90781cdf",
+            "1704895245190222000_90781cdf"
+          ],
+          [
+            {
+              "code": "I",
+              "field2": "P",
+              "location": "I"
+            },
+            {
+              "code": "I",
+              "field1": "P",
+              "location": "I"
+            },
+            {
+              "code": "I",
+              "field1": "P",
+              "location": "I"
+            }
+          ]
+        ],
+        "nanos": [
+          null,
+          [
+            577000,
+            906000,
+            222000
+          ],
+          null,
+          null,
+          null
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/loki/testdata_dataplane/streams_structured_metadata_2.json b/pkg/tsdb/loki/testdata_dataplane/streams_structured_metadata_2.json
new file mode 100644
index 0000000000000..45dc560f354dd
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_dataplane/streams_structured_metadata_2.json
@@ -0,0 +1,78 @@
+{
+  "status": "success",
+  "data": {
+    "encodingFlags": [
+      "categorize-labels"
+    ],
+    "resultType": "streams",
+    "result": [
+      {
+        "stream": {
+          "code": "\",two",
+          "location": "moon🌙"
+        },
+        "values": [
+          [
+            "1704895296244577000",
+            "{\"field2\":\"two\"}",
+            {
+              "parsed": {
+                "field2": "two"
+              }
+            }
+          ],
+          [
+            "1704895267503906000",
+            "{\"field1\":\"one\"}",
+            {
+              "parsed": {
+                "field1": "one"
+              }
+            }
+          ],
+          [
+            "1704895245190222000",
+            "{\"field1\":\"one\"}",
+            {
+              "parsed": {
+                "field1": "one"
+              }
+            }
+          ]
+        ]
+      }
+    ],
+    "stats": {
+      "summary": {
+        "bytesProcessedPerSecond": 3507022,
+        "linesProcessedPerSecond": 24818,
+        "totalBytesProcessed": 7772,
+        "totalLinesProcessed": 55,
+        "execTime": 0.002216125
+      },
+      "store": {
+        "totalChunksRef": 2,
+        "totalChunksDownloaded": 3,
+        "chunksDownloadTime": 0.000390958,
+        "headChunkBytes": 4,
+        "headChunkLines": 5,
+        "decompressedBytes": 7772,
+        "decompressedLines": 55,
+        "compressedBytes": 31432,
+        "totalDuplicates": 6
+      },
+      "ingester": {
+        "totalReached": 7,
+        "totalChunksMatched": 8,
+        "totalBatches": 9,
+        "totalLinesSent": 10,
+        "headChunkBytes": 11,
+        "headChunkLines": 12,
+        "decompressedBytes": 13,
+        "decompressedLines": 14,
+        "compressedBytes": 15,
+        "totalDuplicates": 16
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/pkg/tsdb/loki/testdata_logs_dataplane/streams_parse_errors.golden.jsonc b/pkg/tsdb/loki/testdata_logs_dataplane/streams_parse_errors.golden.jsonc
index f7d072f5bab00..8631194fa4bc3 100644
--- a/pkg/tsdb/loki/testdata_logs_dataplane/streams_parse_errors.golden.jsonc
+++ b/pkg/tsdb/loki/testdata_logs_dataplane/streams_parse_errors.golden.jsonc
@@ -11,7 +11,7 @@
 //  Name: 
 //  Dimensions: 4 Fields by 4 Rows
 //  +------------------------------------------------+-------------------------------+----------------+------------------------------+
-//  | Name: attributes                               | Name: timestamp               | Name: body     | Name: id                     |
+//  | Name: labels                                   | Name: timestamp               | Name: body     | Name: id                     |
 //  | Labels:                                        | Labels:                       | Labels:        | Labels:                      |
 //  | Type: []json.RawMessage                        | Type: []time.Time             | Type: []string | Type: []string               |
 //  +------------------------------------------------+-------------------------------+----------------+------------------------------+
@@ -38,7 +38,7 @@
         },
         "fields": [
           {
-            "name": "attributes",
+            "name": "labels",
             "type": "other",
             "typeInfo": {
               "frame": "json.RawMessage"
diff --git a/pkg/tsdb/loki/testdata_logs_dataplane/streams_simple.golden.jsonc b/pkg/tsdb/loki/testdata_logs_dataplane/streams_simple.golden.jsonc
index 44d9d82d38305..7168eaf851448 100644
--- a/pkg/tsdb/loki/testdata_logs_dataplane/streams_simple.golden.jsonc
+++ b/pkg/tsdb/loki/testdata_logs_dataplane/streams_simple.golden.jsonc
@@ -119,7 +119,7 @@
 //  Name: 
 //  Dimensions: 4 Fields by 6 Rows
 //  +---------------------------------------+-----------------------------------------+------------------+--------------------------------+
-//  | Name: attributes                      | Name: timestamp                         | Name: body       | Name: id                       |
+//  | Name: labels                          | Name: timestamp                         | Name: body       | Name: id                       |
 //  | Labels:                               | Labels:                                 | Labels:          | Labels:                        |
 //  | Type: []json.RawMessage               | Type: []time.Time                       | Type: []string   | Type: []string                 |
 //  +---------------------------------------+-----------------------------------------+------------------+--------------------------------+
@@ -256,7 +256,7 @@
         },
         "fields": [
           {
-            "name": "attributes",
+            "name": "labels",
             "type": "other",
             "typeInfo": {
               "frame": "json.RawMessage"
diff --git a/pkg/tsdb/loki/testdata_logs_dataplane/streams_structured_metadata.golden.jsonc b/pkg/tsdb/loki/testdata_logs_dataplane/streams_structured_metadata.golden.jsonc
new file mode 100644
index 0000000000000..edbdb4e40d8f4
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_logs_dataplane/streams_structured_metadata.golden.jsonc
@@ -0,0 +1,396 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "log-lines",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "stats": [
+//          {
+//              "displayName": "Summary: bytes processed per second",
+//              "unit": "Bps",
+//              "value": 3507022
+//          },
+//          {
+//              "displayName": "Summary: lines processed per second",
+//              "value": 24818
+//          },
+//          {
+//              "displayName": "Summary: total bytes processed",
+//              "unit": "decbytes",
+//              "value": 7772
+//          },
+//          {
+//              "displayName": "Summary: total lines processed",
+//              "value": 55
+//          },
+//          {
+//              "displayName": "Summary: exec time",
+//              "unit": "s",
+//              "value": 0.002216125
+//          },
+//          {
+//              "displayName": "Store: total chunks ref",
+//              "value": 2
+//          },
+//          {
+//              "displayName": "Store: total chunks downloaded",
+//              "value": 3
+//          },
+//          {
+//              "displayName": "Store: chunks download time",
+//              "unit": "s",
+//              "value": 0.000390958
+//          },
+//          {
+//              "displayName": "Store: head chunk bytes",
+//              "unit": "decbytes",
+//              "value": 4
+//          },
+//          {
+//              "displayName": "Store: head chunk lines",
+//              "value": 5
+//          },
+//          {
+//              "displayName": "Store: decompressed bytes",
+//              "unit": "decbytes",
+//              "value": 7772
+//          },
+//          {
+//              "displayName": "Store: decompressed lines",
+//              "value": 55
+//          },
+//          {
+//              "displayName": "Store: compressed bytes",
+//              "unit": "decbytes",
+//              "value": 31432
+//          },
+//          {
+//              "displayName": "Store: total duplicates",
+//              "value": 6
+//          },
+//          {
+//              "displayName": "Ingester: total reached",
+//              "value": 7
+//          },
+//          {
+//              "displayName": "Ingester: total chunks matched",
+//              "value": 8
+//          },
+//          {
+//              "displayName": "Ingester: total batches",
+//              "value": 9
+//          },
+//          {
+//              "displayName": "Ingester: total lines sent",
+//              "value": 10
+//          },
+//          {
+//              "displayName": "Ingester: head chunk bytes",
+//              "unit": "decbytes",
+//              "value": 11
+//          },
+//          {
+//              "displayName": "Ingester: head chunk lines",
+//              "value": 12
+//          },
+//          {
+//              "displayName": "Ingester: decompressed bytes",
+//              "unit": "decbytes",
+//              "value": 13
+//          },
+//          {
+//              "displayName": "Ingester: decompressed lines",
+//              "value": 14
+//          },
+//          {
+//              "displayName": "Ingester: compressed bytes",
+//              "unit": "decbytes",
+//              "value": 15
+//          },
+//          {
+//              "displayName": "Ingester: total duplicates",
+//              "value": 16
+//          }
+//      ],
+//      "executedQueryString": "Expr: query1"
+//  }
+//  Name: 
+//  Dimensions: 5 Fields by 6 Rows
+//  +---------------------------------------+-----------------------------------------+------------------+--------------------------------+-----------------------------+
+//  | Name: labels                          | Name: timestamp                         | Name: body       | Name: id                       | Name: labelTypes            |
+//  | Labels:                               | Labels:                                 | Labels:          | Labels:                        | Labels:                     |
+//  | Type: []json.RawMessage               | Type: []time.Time                       | Type: []string   | Type: []string                 | Type: []json.RawMessage     |
+//  +---------------------------------------+-----------------------------------------+------------------+--------------------------------+-----------------------------+
+//  | {"code":"one\",","location":"moon🌙"} | 2022-02-16 16:50:44.81075712 +0000 UTC  | log line error 1 | 1645030244810757120_1d8c2178   | {"code":"I","location":"I"} |
+//  | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:47.02773504 +0000 UTC  | log line info 1  | 1645030247027735040_87a7aed2   | {"code":"I","location":"I"} |
+//  | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:46.277587968 +0000 UTC | log line info 2  | 1645030246277587968_318d05c9   | {"code":"I","location":"I"} |
+//  | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:46.277587968 +0000 UTC | log line info 2  | 1645030246277587968_318d05c9_1 | {"code":"I","location":"I"} |
+//  | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:45.539423744 +0000 UTC | log line info 3  | 1645030245539423744_fd17f65c   | {"code":"I","location":"I"} |
+//  | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:44.091700992 +0000 UTC | log line info 4  | 1645030244091700992_62ae07f3   | {"code":"I","location":"I"} |
+//  +---------------------------------------+-----------------------------------------+------------------+--------------------------------+-----------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "log-lines",
+          "typeVersion": [
+            0,
+            0
+          ],
+          "stats": [
+            {
+              "displayName": "Summary: bytes processed per second",
+              "unit": "Bps",
+              "value": 3507022
+            },
+            {
+              "displayName": "Summary: lines processed per second",
+              "value": 24818
+            },
+            {
+              "displayName": "Summary: total bytes processed",
+              "unit": "decbytes",
+              "value": 7772
+            },
+            {
+              "displayName": "Summary: total lines processed",
+              "value": 55
+            },
+            {
+              "displayName": "Summary: exec time",
+              "unit": "s",
+              "value": 0.002216125
+            },
+            {
+              "displayName": "Store: total chunks ref",
+              "value": 2
+            },
+            {
+              "displayName": "Store: total chunks downloaded",
+              "value": 3
+            },
+            {
+              "displayName": "Store: chunks download time",
+              "unit": "s",
+              "value": 0.000390958
+            },
+            {
+              "displayName": "Store: head chunk bytes",
+              "unit": "decbytes",
+              "value": 4
+            },
+            {
+              "displayName": "Store: head chunk lines",
+              "value": 5
+            },
+            {
+              "displayName": "Store: decompressed bytes",
+              "unit": "decbytes",
+              "value": 7772
+            },
+            {
+              "displayName": "Store: decompressed lines",
+              "value": 55
+            },
+            {
+              "displayName": "Store: compressed bytes",
+              "unit": "decbytes",
+              "value": 31432
+            },
+            {
+              "displayName": "Store: total duplicates",
+              "value": 6
+            },
+            {
+              "displayName": "Ingester: total reached",
+              "value": 7
+            },
+            {
+              "displayName": "Ingester: total chunks matched",
+              "value": 8
+            },
+            {
+              "displayName": "Ingester: total batches",
+              "value": 9
+            },
+            {
+              "displayName": "Ingester: total lines sent",
+              "value": 10
+            },
+            {
+              "displayName": "Ingester: head chunk bytes",
+              "unit": "decbytes",
+              "value": 11
+            },
+            {
+              "displayName": "Ingester: head chunk lines",
+              "value": 12
+            },
+            {
+              "displayName": "Ingester: decompressed bytes",
+              "unit": "decbytes",
+              "value": 13
+            },
+            {
+              "displayName": "Ingester: decompressed lines",
+              "value": 14
+            },
+            {
+              "displayName": "Ingester: compressed bytes",
+              "unit": "decbytes",
+              "value": 15
+            },
+            {
+              "displayName": "Ingester: total duplicates",
+              "value": 16
+            }
+          ],
+          "executedQueryString": "Expr: query1"
+        },
+        "fields": [
+          {
+            "name": "labels",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage"
+            }
+          },
+          {
+            "name": "timestamp",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "body",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "id",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "labelTypes",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage"
+            },
+            "config": {
+              "custom": {
+                "hidden": true
+              }
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            {
+              "code": "one\",",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "location": "moon🌙"
+            }
+          ],
+          [
+            1645030244810,
+            1645030247027,
+            1645030246277,
+            1645030246277,
+            1645030245539,
+            1645030244091
+          ],
+          [
+            "log line error 1",
+            "log line info 1",
+            "log line info 2",
+            "log line info 2",
+            "log line info 3",
+            "log line info 4"
+          ],
+          [
+            "1645030244810757120_1d8c2178",
+            "1645030247027735040_87a7aed2",
+            "1645030246277587968_318d05c9",
+            "1645030246277587968_318d05c9_1",
+            "1645030245539423744_fd17f65c",
+            "1645030244091700992_62ae07f3"
+          ],
+          [
+            {
+              "code": "I",
+              "location": "I"
+            },
+            {
+              "code": "I",
+              "location": "I"
+            },
+            {
+              "code": "I",
+              "location": "I"
+            },
+            {
+              "code": "I",
+              "location": "I"
+            },
+            {
+              "code": "I",
+              "location": "I"
+            },
+            {
+              "code": "I",
+              "location": "I"
+            }
+          ]
+        ],
+        "nanos": [
+          null,
+          [
+            757120,
+            735040,
+            587968,
+            587968,
+            423744,
+            700992
+          ],
+          null,
+          null,
+          null
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/loki/testdata_logs_dataplane/streams_structured_metadata.json b/pkg/tsdb/loki/testdata_logs_dataplane/streams_structured_metadata.json
new file mode 100644
index 0000000000000..760e15ca712be
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_logs_dataplane/streams_structured_metadata.json
@@ -0,0 +1,89 @@
+{
+  "status": "success",
+  "data": {
+    "encodingFlags": [
+      "categorize-labels"
+    ],
+    "resultType": "streams",
+    "result": [
+      {
+        "stream": {
+          "code": "one\",",
+          "location": "moon🌙"
+        },
+        "values": [
+          [
+            "1645030244810757120",
+						"log line error 1",
+            {}
+          ]
+        ]
+      },
+      {
+        "stream": {
+          "code": "\",two",
+          "location": "moon🌙"
+        },
+        "values": [
+          [
+            "1645030247027735040",
+						"log line info 1",
+            {}
+          ],
+          [
+            "1645030246277587968",
+						"log line info 2",
+            {}
+          ],
+          [
+            "1645030246277587968",
+						"log line info 2",
+            {}
+          ],
+          [
+            "1645030245539423744",
+						"log line info 3",
+            {}
+          ],
+          [
+            "1645030244091700992",
+						"log line info 4",
+            {}
+          ]
+        ]
+      }
+    ],
+    "stats": {
+      "summary": {
+        "bytesProcessedPerSecond": 3507022,
+        "linesProcessedPerSecond": 24818,
+        "totalBytesProcessed": 7772,
+        "totalLinesProcessed": 55,
+        "execTime": 0.002216125
+      },
+      "store": {
+        "totalChunksRef": 2,
+        "totalChunksDownloaded": 3,
+        "chunksDownloadTime": 0.000390958,
+        "headChunkBytes": 4,
+        "headChunkLines": 5,
+        "decompressedBytes": 7772,
+        "decompressedLines": 55,
+        "compressedBytes": 31432,
+        "totalDuplicates": 6
+      },
+      "ingester": {
+        "totalReached": 7,
+        "totalChunksMatched": 8,
+        "totalBatches": 9,
+        "totalLinesSent": 10,
+        "headChunkBytes": 11,
+        "headChunkLines": 12,
+        "decompressedBytes": 13,
+        "decompressedLines": 14,
+        "compressedBytes": 15,
+        "totalDuplicates": 16
+      }
+    }
+  }
+}
diff --git a/pkg/tsdb/loki/testdata_logs_dataplane/streams_structured_metadata_2.golden.jsonc b/pkg/tsdb/loki/testdata_logs_dataplane/streams_structured_metadata_2.golden.jsonc
new file mode 100644
index 0000000000000..b2ea873dc1f98
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_logs_dataplane/streams_structured_metadata_2.golden.jsonc
@@ -0,0 +1,363 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "log-lines",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "stats": [
+//          {
+//              "displayName": "Summary: bytes processed per second",
+//              "unit": "Bps",
+//              "value": 3507022
+//          },
+//          {
+//              "displayName": "Summary: lines processed per second",
+//              "value": 24818
+//          },
+//          {
+//              "displayName": "Summary: total bytes processed",
+//              "unit": "decbytes",
+//              "value": 7772
+//          },
+//          {
+//              "displayName": "Summary: total lines processed",
+//              "value": 55
+//          },
+//          {
+//              "displayName": "Summary: exec time",
+//              "unit": "s",
+//              "value": 0.002216125
+//          },
+//          {
+//              "displayName": "Store: total chunks ref",
+//              "value": 2
+//          },
+//          {
+//              "displayName": "Store: total chunks downloaded",
+//              "value": 3
+//          },
+//          {
+//              "displayName": "Store: chunks download time",
+//              "unit": "s",
+//              "value": 0.000390958
+//          },
+//          {
+//              "displayName": "Store: head chunk bytes",
+//              "unit": "decbytes",
+//              "value": 4
+//          },
+//          {
+//              "displayName": "Store: head chunk lines",
+//              "value": 5
+//          },
+//          {
+//              "displayName": "Store: decompressed bytes",
+//              "unit": "decbytes",
+//              "value": 7772
+//          },
+//          {
+//              "displayName": "Store: decompressed lines",
+//              "value": 55
+//          },
+//          {
+//              "displayName": "Store: compressed bytes",
+//              "unit": "decbytes",
+//              "value": 31432
+//          },
+//          {
+//              "displayName": "Store: total duplicates",
+//              "value": 6
+//          },
+//          {
+//              "displayName": "Ingester: total reached",
+//              "value": 7
+//          },
+//          {
+//              "displayName": "Ingester: total chunks matched",
+//              "value": 8
+//          },
+//          {
+//              "displayName": "Ingester: total batches",
+//              "value": 9
+//          },
+//          {
+//              "displayName": "Ingester: total lines sent",
+//              "value": 10
+//          },
+//          {
+//              "displayName": "Ingester: head chunk bytes",
+//              "unit": "decbytes",
+//              "value": 11
+//          },
+//          {
+//              "displayName": "Ingester: head chunk lines",
+//              "value": 12
+//          },
+//          {
+//              "displayName": "Ingester: decompressed bytes",
+//              "unit": "decbytes",
+//              "value": 13
+//          },
+//          {
+//              "displayName": "Ingester: decompressed lines",
+//              "value": 14
+//          },
+//          {
+//              "displayName": "Ingester: compressed bytes",
+//              "unit": "decbytes",
+//              "value": 15
+//          },
+//          {
+//              "displayName": "Ingester: total duplicates",
+//              "value": 16
+//          }
+//      ],
+//      "executedQueryString": "Expr: query1"
+//  }
+//  Name: 
+//  Dimensions: 5 Fields by 3 Rows
+//  +------------------------------------------------------+--------------------------------------+------------------+------------------------------+------------------------------------------+
+//  | Name: labels                                         | Name: timestamp                      | Name: body       | Name: id                     | Name: labelTypes                         |
+//  | Labels:                                              | Labels:                              | Labels:          | Labels:                      | Labels:                                  |
+//  | Type: []json.RawMessage                              | Type: []time.Time                    | Type: []string   | Type: []string               | Type: []json.RawMessage                  |
+//  +------------------------------------------------------+--------------------------------------+------------------+------------------------------+------------------------------------------+
+//  | {"code":"\",two","field2":"two","location":"moon🌙"} | 2024-01-10 14:01:36.244577 +0000 UTC | {"field2":"two"} | 1704895296244577000_194597ad | {"code":"I","field2":"P","location":"I"} |
+//  | {"code":"\",two","field1":"one","location":"moon🌙"} | 2024-01-10 14:01:07.503906 +0000 UTC | {"field1":"one"} | 1704895267503906000_90781cdf | {"code":"I","field1":"P","location":"I"} |
+//  | {"code":"\",two","field1":"one","location":"moon🌙"} | 2024-01-10 14:00:45.190222 +0000 UTC | {"field1":"one"} | 1704895245190222000_90781cdf | {"code":"I","field1":"P","location":"I"} |
+//  +------------------------------------------------------+--------------------------------------+------------------+------------------------------+------------------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "log-lines",
+          "typeVersion": [
+            0,
+            0
+          ],
+          "stats": [
+            {
+              "displayName": "Summary: bytes processed per second",
+              "unit": "Bps",
+              "value": 3507022
+            },
+            {
+              "displayName": "Summary: lines processed per second",
+              "value": 24818
+            },
+            {
+              "displayName": "Summary: total bytes processed",
+              "unit": "decbytes",
+              "value": 7772
+            },
+            {
+              "displayName": "Summary: total lines processed",
+              "value": 55
+            },
+            {
+              "displayName": "Summary: exec time",
+              "unit": "s",
+              "value": 0.002216125
+            },
+            {
+              "displayName": "Store: total chunks ref",
+              "value": 2
+            },
+            {
+              "displayName": "Store: total chunks downloaded",
+              "value": 3
+            },
+            {
+              "displayName": "Store: chunks download time",
+              "unit": "s",
+              "value": 0.000390958
+            },
+            {
+              "displayName": "Store: head chunk bytes",
+              "unit": "decbytes",
+              "value": 4
+            },
+            {
+              "displayName": "Store: head chunk lines",
+              "value": 5
+            },
+            {
+              "displayName": "Store: decompressed bytes",
+              "unit": "decbytes",
+              "value": 7772
+            },
+            {
+              "displayName": "Store: decompressed lines",
+              "value": 55
+            },
+            {
+              "displayName": "Store: compressed bytes",
+              "unit": "decbytes",
+              "value": 31432
+            },
+            {
+              "displayName": "Store: total duplicates",
+              "value": 6
+            },
+            {
+              "displayName": "Ingester: total reached",
+              "value": 7
+            },
+            {
+              "displayName": "Ingester: total chunks matched",
+              "value": 8
+            },
+            {
+              "displayName": "Ingester: total batches",
+              "value": 9
+            },
+            {
+              "displayName": "Ingester: total lines sent",
+              "value": 10
+            },
+            {
+              "displayName": "Ingester: head chunk bytes",
+              "unit": "decbytes",
+              "value": 11
+            },
+            {
+              "displayName": "Ingester: head chunk lines",
+              "value": 12
+            },
+            {
+              "displayName": "Ingester: decompressed bytes",
+              "unit": "decbytes",
+              "value": 13
+            },
+            {
+              "displayName": "Ingester: decompressed lines",
+              "value": 14
+            },
+            {
+              "displayName": "Ingester: compressed bytes",
+              "unit": "decbytes",
+              "value": 15
+            },
+            {
+              "displayName": "Ingester: total duplicates",
+              "value": 16
+            }
+          ],
+          "executedQueryString": "Expr: query1"
+        },
+        "fields": [
+          {
+            "name": "labels",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage"
+            }
+          },
+          {
+            "name": "timestamp",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "body",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "id",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "labelTypes",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage"
+            },
+            "config": {
+              "custom": {
+                "hidden": true
+              }
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            {
+              "code": "\",two",
+              "field2": "two",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "field1": "one",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "field1": "one",
+              "location": "moon🌙"
+            }
+          ],
+          [
+            1704895296244,
+            1704895267503,
+            1704895245190
+          ],
+          [
+            "{\"field2\":\"two\"}",
+            "{\"field1\":\"one\"}",
+            "{\"field1\":\"one\"}"
+          ],
+          [
+            "1704895296244577000_194597ad",
+            "1704895267503906000_90781cdf",
+            "1704895245190222000_90781cdf"
+          ],
+          [
+            {
+              "code": "I",
+              "field2": "P",
+              "location": "I"
+            },
+            {
+              "code": "I",
+              "field1": "P",
+              "location": "I"
+            },
+            {
+              "code": "I",
+              "field1": "P",
+              "location": "I"
+            }
+          ]
+        ],
+        "nanos": [
+          null,
+          [
+            577000,
+            906000,
+            222000
+          ],
+          null,
+          null,
+          null
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/loki/testdata_logs_dataplane/streams_structured_metadata_2.json b/pkg/tsdb/loki/testdata_logs_dataplane/streams_structured_metadata_2.json
new file mode 100644
index 0000000000000..45dc560f354dd
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_logs_dataplane/streams_structured_metadata_2.json
@@ -0,0 +1,78 @@
+{
+  "status": "success",
+  "data": {
+    "encodingFlags": [
+      "categorize-labels"
+    ],
+    "resultType": "streams",
+    "result": [
+      {
+        "stream": {
+          "code": "\",two",
+          "location": "moon🌙"
+        },
+        "values": [
+          [
+            "1704895296244577000",
+            "{\"field2\":\"two\"}",
+            {
+              "parsed": {
+                "field2": "two"
+              }
+            }
+          ],
+          [
+            "1704895267503906000",
+            "{\"field1\":\"one\"}",
+            {
+              "parsed": {
+                "field1": "one"
+              }
+            }
+          ],
+          [
+            "1704895245190222000",
+            "{\"field1\":\"one\"}",
+            {
+              "parsed": {
+                "field1": "one"
+              }
+            }
+          ]
+        ]
+      }
+    ],
+    "stats": {
+      "summary": {
+        "bytesProcessedPerSecond": 3507022,
+        "linesProcessedPerSecond": 24818,
+        "totalBytesProcessed": 7772,
+        "totalLinesProcessed": 55,
+        "execTime": 0.002216125
+      },
+      "store": {
+        "totalChunksRef": 2,
+        "totalChunksDownloaded": 3,
+        "chunksDownloadTime": 0.000390958,
+        "headChunkBytes": 4,
+        "headChunkLines": 5,
+        "decompressedBytes": 7772,
+        "decompressedLines": 55,
+        "compressedBytes": 31432,
+        "totalDuplicates": 6
+      },
+      "ingester": {
+        "totalReached": 7,
+        "totalChunksMatched": 8,
+        "totalBatches": 9,
+        "totalLinesSent": 10,
+        "headChunkBytes": 11,
+        "headChunkLines": 12,
+        "decompressedBytes": 13,
+        "decompressedLines": 14,
+        "compressedBytes": 15,
+        "totalDuplicates": 16
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/streams_structured_metadata.golden.jsonc b/pkg/tsdb/loki/testdata_metric_dataplane/streams_structured_metadata.golden.jsonc
new file mode 100644
index 0000000000000..b6957ad760a95
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/streams_structured_metadata.golden.jsonc
@@ -0,0 +1,360 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "custom": {
+//          "frameType": "LabeledTimeValues"
+//      },
+//      "stats": [
+//          {
+//              "displayName": "Summary: bytes processed per second",
+//              "unit": "Bps",
+//              "value": 3507022
+//          },
+//          {
+//              "displayName": "Summary: lines processed per second",
+//              "value": 24818
+//          },
+//          {
+//              "displayName": "Summary: total bytes processed",
+//              "unit": "decbytes",
+//              "value": 7772
+//          },
+//          {
+//              "displayName": "Summary: total lines processed",
+//              "value": 55
+//          },
+//          {
+//              "displayName": "Summary: exec time",
+//              "unit": "s",
+//              "value": 0.002216125
+//          },
+//          {
+//              "displayName": "Store: total chunks ref",
+//              "value": 2
+//          },
+//          {
+//              "displayName": "Store: total chunks downloaded",
+//              "value": 3
+//          },
+//          {
+//              "displayName": "Store: chunks download time",
+//              "unit": "s",
+//              "value": 0.000390958
+//          },
+//          {
+//              "displayName": "Store: head chunk bytes",
+//              "unit": "decbytes",
+//              "value": 4
+//          },
+//          {
+//              "displayName": "Store: head chunk lines",
+//              "value": 5
+//          },
+//          {
+//              "displayName": "Store: decompressed bytes",
+//              "unit": "decbytes",
+//              "value": 7772
+//          },
+//          {
+//              "displayName": "Store: decompressed lines",
+//              "value": 55
+//          },
+//          {
+//              "displayName": "Store: compressed bytes",
+//              "unit": "decbytes",
+//              "value": 31432
+//          },
+//          {
+//              "displayName": "Store: total duplicates",
+//              "value": 6
+//          },
+//          {
+//              "displayName": "Ingester: total reached",
+//              "value": 7
+//          },
+//          {
+//              "displayName": "Ingester: total chunks matched",
+//              "value": 8
+//          },
+//          {
+//              "displayName": "Ingester: total batches",
+//              "value": 9
+//          },
+//          {
+//              "displayName": "Ingester: total lines sent",
+//              "value": 10
+//          },
+//          {
+//              "displayName": "Ingester: head chunk bytes",
+//              "unit": "decbytes",
+//              "value": 11
+//          },
+//          {
+//              "displayName": "Ingester: head chunk lines",
+//              "value": 12
+//          },
+//          {
+//              "displayName": "Ingester: decompressed bytes",
+//              "unit": "decbytes",
+//              "value": 13
+//          },
+//          {
+//              "displayName": "Ingester: decompressed lines",
+//              "value": 14
+//          },
+//          {
+//              "displayName": "Ingester: compressed bytes",
+//              "unit": "decbytes",
+//              "value": 15
+//          },
+//          {
+//              "displayName": "Ingester: total duplicates",
+//              "value": 16
+//          }
+//      ],
+//      "executedQueryString": "Expr: query1"
+//  }
+//  Name: 
+//  Dimensions: 6 Fields by 2 Rows
+//  +---------------------------------------+----------------------------------------+------------------+---------------------+-----------------------------+------------------------------+
+//  | Name: labels                          | Name: Time                             | Name: Line       | Name: tsNs          | Name: labelTypes            | Name: id                     |
+//  | Labels:                               | Labels:                                | Labels:          | Labels:             | Labels:                     | Labels:                      |
+//  | Type: []json.RawMessage               | Type: []time.Time                      | Type: []string   | Type: []string      | Type: []json.RawMessage     | Type: []string               |
+//  +---------------------------------------+----------------------------------------+------------------+---------------------+-----------------------------+------------------------------+
+//  | {"code":"one\",","location":"moon🌙"} | 2022-02-16 16:50:44.81075712 +0000 UTC | log line error 1 | 1645030244810757120 | {"code":"I","location":"I"} | 1645030244810757120_1d8c2178 |
+//  | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:47.02773504 +0000 UTC | log line info 1  | 1645030247027735040 | {"code":"I","location":"I"} | 1645030247027735040_87a7aed2 |
+//  +---------------------------------------+----------------------------------------+------------------+---------------------+-----------------------------+------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "custom": {
+            "frameType": "LabeledTimeValues"
+          },
+          "stats": [
+            {
+              "displayName": "Summary: bytes processed per second",
+              "unit": "Bps",
+              "value": 3507022
+            },
+            {
+              "displayName": "Summary: lines processed per second",
+              "value": 24818
+            },
+            {
+              "displayName": "Summary: total bytes processed",
+              "unit": "decbytes",
+              "value": 7772
+            },
+            {
+              "displayName": "Summary: total lines processed",
+              "value": 55
+            },
+            {
+              "displayName": "Summary: exec time",
+              "unit": "s",
+              "value": 0.002216125
+            },
+            {
+              "displayName": "Store: total chunks ref",
+              "value": 2
+            },
+            {
+              "displayName": "Store: total chunks downloaded",
+              "value": 3
+            },
+            {
+              "displayName": "Store: chunks download time",
+              "unit": "s",
+              "value": 0.000390958
+            },
+            {
+              "displayName": "Store: head chunk bytes",
+              "unit": "decbytes",
+              "value": 4
+            },
+            {
+              "displayName": "Store: head chunk lines",
+              "value": 5
+            },
+            {
+              "displayName": "Store: decompressed bytes",
+              "unit": "decbytes",
+              "value": 7772
+            },
+            {
+              "displayName": "Store: decompressed lines",
+              "value": 55
+            },
+            {
+              "displayName": "Store: compressed bytes",
+              "unit": "decbytes",
+              "value": 31432
+            },
+            {
+              "displayName": "Store: total duplicates",
+              "value": 6
+            },
+            {
+              "displayName": "Ingester: total reached",
+              "value": 7
+            },
+            {
+              "displayName": "Ingester: total chunks matched",
+              "value": 8
+            },
+            {
+              "displayName": "Ingester: total batches",
+              "value": 9
+            },
+            {
+              "displayName": "Ingester: total lines sent",
+              "value": 10
+            },
+            {
+              "displayName": "Ingester: head chunk bytes",
+              "unit": "decbytes",
+              "value": 11
+            },
+            {
+              "displayName": "Ingester: head chunk lines",
+              "value": 12
+            },
+            {
+              "displayName": "Ingester: decompressed bytes",
+              "unit": "decbytes",
+              "value": 13
+            },
+            {
+              "displayName": "Ingester: decompressed lines",
+              "value": 14
+            },
+            {
+              "displayName": "Ingester: compressed bytes",
+              "unit": "decbytes",
+              "value": 15
+            },
+            {
+              "displayName": "Ingester: total duplicates",
+              "value": 16
+            }
+          ],
+          "executedQueryString": "Expr: query1"
+        },
+        "fields": [
+          {
+            "name": "labels",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage"
+            }
+          },
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Line",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "tsNs",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "labelTypes",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage"
+            },
+            "config": {
+              "custom": {
+                "hidden": true
+              }
+            }
+          },
+          {
+            "name": "id",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            {
+              "code": "one\",",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "location": "moon🌙"
+            }
+          ],
+          [
+            1645030244810,
+            1645030247027
+          ],
+          [
+            "log line error 1",
+            "log line info 1"
+          ],
+          [
+            "1645030244810757120",
+            "1645030247027735040"
+          ],
+          [
+            {
+              "code": "I",
+              "location": "I"
+            },
+            {
+              "code": "I",
+              "location": "I"
+            }
+          ],
+          [
+            "1645030244810757120_1d8c2178",
+            "1645030247027735040_87a7aed2"
+          ]
+        ],
+        "nanos": [
+          null,
+          [
+            757120,
+            735040
+          ],
+          null,
+          null,
+          null,
+          null
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/streams_structured_metadata.json b/pkg/tsdb/loki/testdata_metric_dataplane/streams_structured_metadata.json
new file mode 100644
index 0000000000000..f8dcaca0b1988
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/streams_structured_metadata.json
@@ -0,0 +1,69 @@
+{
+  "status": "success",
+  "data": {
+    "encodingFlags": [
+      "categorize-labels"
+    ],
+    "resultType": "streams",
+    "result": [
+      {
+        "stream": {
+          "code": "one\",",
+          "location": "moon🌙"
+        },
+        "values": [
+          [
+            "1645030244810757120",
+						"log line error 1",
+            {}
+          ]
+        ]
+      },
+      {
+        "stream": {
+          "code": "\",two",
+          "location": "moon🌙"
+        },
+        "values": [
+          [
+            "1645030247027735040",
+						"log line info 1",
+            {}
+          ]
+        ]
+      }
+    ],
+    "stats": {
+      "summary": {
+        "bytesProcessedPerSecond": 3507022,
+        "linesProcessedPerSecond": 24818,
+        "totalBytesProcessed": 7772,
+        "totalLinesProcessed": 55,
+        "execTime": 0.002216125
+      },
+      "store": {
+        "totalChunksRef": 2,
+        "totalChunksDownloaded": 3,
+        "chunksDownloadTime": 0.000390958,
+        "headChunkBytes": 4,
+        "headChunkLines": 5,
+        "decompressedBytes": 7772,
+        "decompressedLines": 55,
+        "compressedBytes": 31432,
+        "totalDuplicates": 6
+      },
+      "ingester": {
+        "totalReached": 7,
+        "totalChunksMatched": 8,
+        "totalBatches": 9,
+        "totalLinesSent": 10,
+        "headChunkBytes": 11,
+        "headChunkLines": 12,
+        "decompressedBytes": 13,
+        "decompressedLines": 14,
+        "compressedBytes": 15,
+        "totalDuplicates": 16
+      }
+    }
+  }
+}
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/streams_structured_metadata_2.golden.jsonc b/pkg/tsdb/loki/testdata_metric_dataplane/streams_structured_metadata_2.golden.jsonc
new file mode 100644
index 0000000000000..2f65417a5afd4
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/streams_structured_metadata_2.golden.jsonc
@@ -0,0 +1,380 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "custom": {
+//          "frameType": "LabeledTimeValues"
+//      },
+//      "stats": [
+//          {
+//              "displayName": "Summary: bytes processed per second",
+//              "unit": "Bps",
+//              "value": 3507022
+//          },
+//          {
+//              "displayName": "Summary: lines processed per second",
+//              "value": 24818
+//          },
+//          {
+//              "displayName": "Summary: total bytes processed",
+//              "unit": "decbytes",
+//              "value": 7772
+//          },
+//          {
+//              "displayName": "Summary: total lines processed",
+//              "value": 55
+//          },
+//          {
+//              "displayName": "Summary: exec time",
+//              "unit": "s",
+//              "value": 0.002216125
+//          },
+//          {
+//              "displayName": "Store: total chunks ref",
+//              "value": 2
+//          },
+//          {
+//              "displayName": "Store: total chunks downloaded",
+//              "value": 3
+//          },
+//          {
+//              "displayName": "Store: chunks download time",
+//              "unit": "s",
+//              "value": 0.000390958
+//          },
+//          {
+//              "displayName": "Store: head chunk bytes",
+//              "unit": "decbytes",
+//              "value": 4
+//          },
+//          {
+//              "displayName": "Store: head chunk lines",
+//              "value": 5
+//          },
+//          {
+//              "displayName": "Store: decompressed bytes",
+//              "unit": "decbytes",
+//              "value": 7772
+//          },
+//          {
+//              "displayName": "Store: decompressed lines",
+//              "value": 55
+//          },
+//          {
+//              "displayName": "Store: compressed bytes",
+//              "unit": "decbytes",
+//              "value": 31432
+//          },
+//          {
+//              "displayName": "Store: total duplicates",
+//              "value": 6
+//          },
+//          {
+//              "displayName": "Ingester: total reached",
+//              "value": 7
+//          },
+//          {
+//              "displayName": "Ingester: total chunks matched",
+//              "value": 8
+//          },
+//          {
+//              "displayName": "Ingester: total batches",
+//              "value": 9
+//          },
+//          {
+//              "displayName": "Ingester: total lines sent",
+//              "value": 10
+//          },
+//          {
+//              "displayName": "Ingester: head chunk bytes",
+//              "unit": "decbytes",
+//              "value": 11
+//          },
+//          {
+//              "displayName": "Ingester: head chunk lines",
+//              "value": 12
+//          },
+//          {
+//              "displayName": "Ingester: decompressed bytes",
+//              "unit": "decbytes",
+//              "value": 13
+//          },
+//          {
+//              "displayName": "Ingester: decompressed lines",
+//              "value": 14
+//          },
+//          {
+//              "displayName": "Ingester: compressed bytes",
+//              "unit": "decbytes",
+//              "value": 15
+//          },
+//          {
+//              "displayName": "Ingester: total duplicates",
+//              "value": 16
+//          }
+//      ],
+//      "executedQueryString": "Expr: query1"
+//  }
+//  Name: 
+//  Dimensions: 6 Fields by 3 Rows
+//  +------------------------------------------------------+--------------------------------------+------------------+---------------------+------------------------------------------+------------------------------+
+//  | Name: labels                                         | Name: Time                           | Name: Line       | Name: tsNs          | Name: labelTypes                         | Name: id                     |
+//  | Labels:                                              | Labels:                              | Labels:          | Labels:             | Labels:                                  | Labels:                      |
+//  | Type: []json.RawMessage                              | Type: []time.Time                    | Type: []string   | Type: []string      | Type: []json.RawMessage                  | Type: []string               |
+//  +------------------------------------------------------+--------------------------------------+------------------+---------------------+------------------------------------------+------------------------------+
+//  | {"code":"\",two","field2":"two","location":"moon🌙"} | 2024-01-10 14:01:36.244577 +0000 UTC | {"field2":"two"} | 1704895296244577000 | {"code":"I","field2":"P","location":"I"} | 1704895296244577000_194597ad |
+//  | {"code":"\",two","field1":"one","location":"moon🌙"} | 2024-01-10 14:01:07.503906 +0000 UTC | {"field1":"one"} | 1704895267503906000 | {"code":"I","field1":"P","location":"I"} | 1704895267503906000_90781cdf |
+//  | {"code":"\",two","field1":"one","location":"moon🌙"} | 2024-01-10 14:00:45.190222 +0000 UTC | {"field1":"one"} | 1704895245190222000 | {"code":"I","field1":"P","location":"I"} | 1704895245190222000_90781cdf |
+//  +------------------------------------------------------+--------------------------------------+------------------+---------------------+------------------------------------------+------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "custom": {
+            "frameType": "LabeledTimeValues"
+          },
+          "stats": [
+            {
+              "displayName": "Summary: bytes processed per second",
+              "unit": "Bps",
+              "value": 3507022
+            },
+            {
+              "displayName": "Summary: lines processed per second",
+              "value": 24818
+            },
+            {
+              "displayName": "Summary: total bytes processed",
+              "unit": "decbytes",
+              "value": 7772
+            },
+            {
+              "displayName": "Summary: total lines processed",
+              "value": 55
+            },
+            {
+              "displayName": "Summary: exec time",
+              "unit": "s",
+              "value": 0.002216125
+            },
+            {
+              "displayName": "Store: total chunks ref",
+              "value": 2
+            },
+            {
+              "displayName": "Store: total chunks downloaded",
+              "value": 3
+            },
+            {
+              "displayName": "Store: chunks download time",
+              "unit": "s",
+              "value": 0.000390958
+            },
+            {
+              "displayName": "Store: head chunk bytes",
+              "unit": "decbytes",
+              "value": 4
+            },
+            {
+              "displayName": "Store: head chunk lines",
+              "value": 5
+            },
+            {
+              "displayName": "Store: decompressed bytes",
+              "unit": "decbytes",
+              "value": 7772
+            },
+            {
+              "displayName": "Store: decompressed lines",
+              "value": 55
+            },
+            {
+              "displayName": "Store: compressed bytes",
+              "unit": "decbytes",
+              "value": 31432
+            },
+            {
+              "displayName": "Store: total duplicates",
+              "value": 6
+            },
+            {
+              "displayName": "Ingester: total reached",
+              "value": 7
+            },
+            {
+              "displayName": "Ingester: total chunks matched",
+              "value": 8
+            },
+            {
+              "displayName": "Ingester: total batches",
+              "value": 9
+            },
+            {
+              "displayName": "Ingester: total lines sent",
+              "value": 10
+            },
+            {
+              "displayName": "Ingester: head chunk bytes",
+              "unit": "decbytes",
+              "value": 11
+            },
+            {
+              "displayName": "Ingester: head chunk lines",
+              "value": 12
+            },
+            {
+              "displayName": "Ingester: decompressed bytes",
+              "unit": "decbytes",
+              "value": 13
+            },
+            {
+              "displayName": "Ingester: decompressed lines",
+              "value": 14
+            },
+            {
+              "displayName": "Ingester: compressed bytes",
+              "unit": "decbytes",
+              "value": 15
+            },
+            {
+              "displayName": "Ingester: total duplicates",
+              "value": 16
+            }
+          ],
+          "executedQueryString": "Expr: query1"
+        },
+        "fields": [
+          {
+            "name": "labels",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage"
+            }
+          },
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "Line",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "tsNs",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "labelTypes",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage"
+            },
+            "config": {
+              "custom": {
+                "hidden": true
+              }
+            }
+          },
+          {
+            "name": "id",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            {
+              "code": "\",two",
+              "field2": "two",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "field1": "one",
+              "location": "moon🌙"
+            },
+            {
+              "code": "\",two",
+              "field1": "one",
+              "location": "moon🌙"
+            }
+          ],
+          [
+            1704895296244,
+            1704895267503,
+            1704895245190
+          ],
+          [
+            "{\"field2\":\"two\"}",
+            "{\"field1\":\"one\"}",
+            "{\"field1\":\"one\"}"
+          ],
+          [
+            "1704895296244577000",
+            "1704895267503906000",
+            "1704895245190222000"
+          ],
+          [
+            {
+              "code": "I",
+              "field2": "P",
+              "location": "I"
+            },
+            {
+              "code": "I",
+              "field1": "P",
+              "location": "I"
+            },
+            {
+              "code": "I",
+              "field1": "P",
+              "location": "I"
+            }
+          ],
+          [
+            "1704895296244577000_194597ad",
+            "1704895267503906000_90781cdf",
+            "1704895245190222000_90781cdf"
+          ]
+        ],
+        "nanos": [
+          null,
+          [
+            577000,
+            906000,
+            222000
+          ],
+          null,
+          null,
+          null,
+          null
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/loki/testdata_metric_dataplane/streams_structured_metadata_2.json b/pkg/tsdb/loki/testdata_metric_dataplane/streams_structured_metadata_2.json
new file mode 100644
index 0000000000000..45dc560f354dd
--- /dev/null
+++ b/pkg/tsdb/loki/testdata_metric_dataplane/streams_structured_metadata_2.json
@@ -0,0 +1,78 @@
+{
+  "status": "success",
+  "data": {
+    "encodingFlags": [
+      "categorize-labels"
+    ],
+    "resultType": "streams",
+    "result": [
+      {
+        "stream": {
+          "code": "\",two",
+          "location": "moon🌙"
+        },
+        "values": [
+          [
+            "1704895296244577000",
+            "{\"field2\":\"two\"}",
+            {
+              "parsed": {
+                "field2": "two"
+              }
+            }
+          ],
+          [
+            "1704895267503906000",
+            "{\"field1\":\"one\"}",
+            {
+              "parsed": {
+                "field1": "one"
+              }
+            }
+          ],
+          [
+            "1704895245190222000",
+            "{\"field1\":\"one\"}",
+            {
+              "parsed": {
+                "field1": "one"
+              }
+            }
+          ]
+        ]
+      }
+    ],
+    "stats": {
+      "summary": {
+        "bytesProcessedPerSecond": 3507022,
+        "linesProcessedPerSecond": 24818,
+        "totalBytesProcessed": 7772,
+        "totalLinesProcessed": 55,
+        "execTime": 0.002216125
+      },
+      "store": {
+        "totalChunksRef": 2,
+        "totalChunksDownloaded": 3,
+        "chunksDownloadTime": 0.000390958,
+        "headChunkBytes": 4,
+        "headChunkLines": 5,
+        "decompressedBytes": 7772,
+        "decompressedLines": 55,
+        "compressedBytes": 31432,
+        "totalDuplicates": 6
+      },
+      "ingester": {
+        "totalReached": 7,
+        "totalChunksMatched": 8,
+        "totalBatches": 9,
+        "totalLinesSent": 10,
+        "headChunkBytes": 11,
+        "headChunkLines": 12,
+        "decompressedBytes": 13,
+        "decompressedLines": 14,
+        "compressedBytes": 15,
+        "totalDuplicates": 16
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/pkg/tsdb/loki/types.go b/pkg/tsdb/loki/types.go
index 06f8b1836b577..5ac5ee514c348 100644
--- a/pkg/tsdb/loki/types.go
+++ b/pkg/tsdb/loki/types.go
@@ -16,10 +16,11 @@ const (
 )
 
 const (
-	SupportingQueryLogsVolume                     = dataquery.SupportingQueryTypeLogsVolume
-	SupportingQueryLogsSample                     = dataquery.SupportingQueryTypeLogsSample
-	SupportingQueryDataSample                     = dataquery.SupportingQueryTypeDataSample
-	SupportingQueryNone       SupportingQueryType = "none"
+	SupportingQueryLogsVolume                         = dataquery.SupportingQueryTypeLogsVolume
+	SupportingQueryLogsSample                         = dataquery.SupportingQueryTypeLogsSample
+	SupportingQueryDataSample                         = dataquery.SupportingQueryTypeDataSample
+	SupportingQueryInfiniteScroll                     = dataquery.SupportingQueryTypeInfiniteScroll
+	SupportingQueryNone           SupportingQueryType = "none"
 )
 
 const (
diff --git a/pkg/tsdb/mssql/kerberos/kerberos.go b/pkg/tsdb/mssql/kerberos/kerberos.go
new file mode 100644
index 0000000000000..207f324672a81
--- /dev/null
+++ b/pkg/tsdb/mssql/kerberos/kerberos.go
@@ -0,0 +1,106 @@
+package kerberos
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
+)
+
+type KerberosLookup struct {
+	User                    string `json:"user"`
+	DBName                  string `json:"database"`
+	Address                 string `json:"address"`
+	CredentialCacheFilename string `json:"credentialCache"`
+}
+
+type KerberosAuth struct {
+	KeytabFilePath            string
+	CredentialCache           string
+	CredentialCacheLookupFile string
+	ConfigFilePath            string
+	UDPConnectionLimit        string
+	EnableDNSLookupKDC        string
+}
+
+func GetKerberosSettings(settings backend.DataSourceInstanceSettings) (kerberosAuth KerberosAuth, err error) {
+	err = json.Unmarshal(settings.JSONData, &kerberosAuth)
+	return kerberosAuth, err
+}
+
+func Krb5ParseAuthCredentials(host string, port string, db string, user string, pass string, kerberosAuth KerberosAuth) string {
+	//params for driver conn str
+	//More details: https://github.com/microsoft/go-mssqldb#kerberos-active-directory-authentication-outside-windows
+
+	krb5CCLookupFile := kerberosAuth.CredentialCacheLookupFile
+	krb5CacheCredsFile := kerberosAuth.CredentialCache
+
+	// if there is a lookup file specified, use it to find the correct credential cache file and overwrite var
+	// getCredentialCacheFromLookup implementation taken from mysql kerberos solution - https://github.com/grafana/mysql/commit/b5e73c8d536150c054d310123643683d3b18f0da
+	if krb5CCLookupFile != "" {
+		krb5CacheCredsFile = getCredentialCacheFromLookup(krb5CCLookupFile, host, port, db, user)
+		if krb5CacheCredsFile == "" {
+			logger.Error("No valid credential cache file found in lookup.")
+			return ""
+		}
+	}
+
+	krb5DriverParams := fmt.Sprintf("authenticator=krb5;krb5-configfile=%s;", kerberosAuth.ConfigFilePath)
+
+	// There are 3 main connection types:
+	// - credentials cache
+	// - user, realm, keytab
+	// - realm, user, pass
+	if krb5CacheCredsFile != "" {
+		krb5DriverParams += fmt.Sprintf("server=%s;database=%s;krb5-credcachefile=%s;", host, db, krb5CacheCredsFile)
+	} else if kerberosAuth.KeytabFilePath != "" {
+		krb5DriverParams += fmt.Sprintf("server=%s;database=%s;user id=%s;krb5-keytabfile=%s;", host, db, user, kerberosAuth.KeytabFilePath)
+	} else if kerberosAuth.KeytabFilePath == "" {
+		krb5DriverParams += fmt.Sprintf("server=%s;database=%s;user id=%s;password=%s;", host, db, user, pass)
+	} else {
+		logger.Error("invalid kerberos configuration")
+		return ""
+	}
+
+	if kerberosAuth.UDPConnectionLimit != "" {
+		krb5DriverParams += "krb5-udppreferencelimit=" + kerberosAuth.UDPConnectionLimit + ";"
+	}
+
+	if kerberosAuth.EnableDNSLookupKDC != "" {
+		krb5DriverParams += "krb5-dnslookupkdc=" + kerberosAuth.EnableDNSLookupKDC + ";"
+	}
+
+	logger.Info(fmt.Sprintf("final krb connstr: %s", krb5DriverParams))
+
+	return krb5DriverParams
+}
+
+func getCredentialCacheFromLookup(lookupFile string, host string, port string, dbName string, user string) string {
+	logger.Info(fmt.Sprintf("reading credential cache lookup: %s", lookupFile))
+	content, err := os.ReadFile(filepath.Clean(lookupFile))
+	if err != nil {
+		logger.Error(fmt.Sprintf("error reading: %s, %v", lookupFile, err))
+		return ""
+	}
+	var lookups []KerberosLookup
+	err = json.Unmarshal(content, &lookups)
+	if err != nil {
+		logger.Error(fmt.Sprintf("error parsing: %s, %v", lookupFile, err))
+		return ""
+	}
+	// find cache file
+	for _, item := range lookups {
+		if port == "0" {
+			item.Address = host + ":0"
+		}
+		if item.Address == host+":"+port && item.DBName == dbName && item.User == user {
+			logger.Info(fmt.Sprintf("matched: %+v", item))
+			return item.CredentialCacheFilename
+		}
+	}
+	logger.Error(fmt.Sprintf("no match found for %s", host+":"+port))
+	return ""
+}
diff --git a/pkg/tsdb/mssql/mssql.go b/pkg/tsdb/mssql/mssql.go
index df224eddc5ae9..3f6a4fae44daa 100644
--- a/pkg/tsdb/mssql/mssql.go
+++ b/pkg/tsdb/mssql/mssql.go
@@ -2,6 +2,7 @@ package mssql
 
 import (
 	"context"
+	"database/sql"
 	"encoding/json"
 	"fmt"
 	"net/url"
@@ -9,40 +10,46 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"time"
 
-	"github.com/grafana/grafana-azure-sdk-go/azcredentials"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azcredentials"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
-	sdkproxy "github.com/grafana/grafana-plugin-sdk-go/backend/proxy"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana-plugin-sdk-go/data/sqlutil"
 	mssql "github.com/microsoft/go-mssqldb"
 	_ "github.com/microsoft/go-mssqldb/azuread"
+	_ "github.com/microsoft/go-mssqldb/integratedauth/krb5"
 
-	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tsdb/mssql/kerberos"
 	"github.com/grafana/grafana/pkg/tsdb/mssql/utils"
 	"github.com/grafana/grafana/pkg/tsdb/sqleng"
-	"github.com/grafana/grafana/pkg/tsdb/sqleng/proxyutil"
 	"github.com/grafana/grafana/pkg/util"
 )
 
-var logger = log.New("tsdb.mssql")
-
 type Service struct {
-	im instancemgmt.InstanceManager
+	im     instancemgmt.InstanceManager
+	logger log.Logger
 }
 
 const (
-	azureAuthentication     = "Azure AD Authentication"
-	windowsAuthentication   = "Windows Authentication"
-	sqlServerAuthentication = "SQL Server Authentication"
+	azureAuthentication         = "Azure AD Authentication"
+	windowsAuthentication       = "Windows Authentication"
+	sqlServerAuthentication     = "SQL Server Authentication"
+	kerberosRaw                 = "Windows AD: Username + password"
+	kerberosKeytab              = "Windows AD: Keytab"
+	kerberosCredentialCache     = "Windows AD: Credential cache"      // #nosec G101
+	kerberosCredentialCacheFile = "Windows AD: Credential cache file" // #nosec G101
 )
 
 func ProvideService(cfg *setting.Cfg) *Service {
+	logger := backend.NewLoggerWith("logger", "tsdb.mssql")
 	return &Service{
-		im: datasource.NewInstanceManager(newInstanceSettings(cfg)),
+		im:     datasource.NewInstanceManager(newInstanceSettings(cfg, logger)),
+		logger: logger,
 	}
 }
 
@@ -63,8 +70,8 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest)
 	return dsHandler.QueryData(ctx, req)
 }
 
-func newInstanceSettings(cfg *setting.Cfg) datasource.InstanceFactoryFunc {
-	return func(_ context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+func newInstanceSettings(cfg *setting.Cfg, logger log.Logger) datasource.InstanceFactoryFunc {
+	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
 		jsonData := sqleng.JsonData{
 			MaxOpenConns:      cfg.SqlDatasourceMaxOpenConnsDefault,
 			MaxIdleConns:      cfg.SqlDatasourceMaxIdleConnsDefault,
@@ -77,6 +84,12 @@ func newInstanceSettings(cfg *setting.Cfg) datasource.InstanceFactoryFunc {
 		if err != nil {
 			return nil, fmt.Errorf("error reading azure credentials")
 		}
+
+		kerberosAuth, err := kerberos.GetKerberosSettings(settings)
+		if err != nil {
+			return nil, fmt.Errorf("error getting kerberos settings: %w", err)
+		}
+
 		err = json.Unmarshal(settings.JSONData, &jsonData)
 		if err != nil {
 			return nil, fmt.Errorf("error reading settings: %w", err)
@@ -97,7 +110,7 @@ func newInstanceSettings(cfg *setting.Cfg) datasource.InstanceFactoryFunc {
 			UID:                     settings.UID,
 			DecryptedSecureJSONData: settings.DecryptedSecureJSONData,
 		}
-		cnnstr, err := generateConnectionString(dsInfo, cfg, azureCredentials)
+		cnnstr, err := generateConnectionString(dsInfo, cfg, azureCredentials, kerberosAuth, logger)
 		if err != nil {
 			return nil, err
 		}
@@ -110,22 +123,28 @@ func newInstanceSettings(cfg *setting.Cfg) datasource.InstanceFactoryFunc {
 			driverName = "azuresql"
 		}
 
+		proxyClient, err := settings.ProxyClient(ctx)
+		if err != nil {
+			return nil, err
+		}
+
 		// register a new proxy driver if the secure socks proxy is enabled
-		proxyOpts := proxyutil.GetSQLProxyOptions(cfg.SecureSocksDSProxy, dsInfo)
-		if sdkproxy.New(proxyOpts).SecureSocksProxyEnabled() {
-			URL, err := ParseURL(dsInfo.URL)
+		if proxyClient.SecureSocksProxyEnabled() {
+			dialer, err := proxyClient.NewSecureSocksProxyContextDialer()
+			if err != nil {
+				return nil, err
+			}
+			URL, err := ParseURL(dsInfo.URL, logger)
 			if err != nil {
 				return nil, err
 			}
-			driverName, err = createMSSQLProxyDriver(cnnstr, URL.Hostname(), proxyOpts)
+			driverName, err = createMSSQLProxyDriver(cnnstr, URL.Hostname(), dialer)
 			if err != nil {
 				return nil, err
 			}
 		}
 
 		config := sqleng.DataPluginConfiguration{
-			DriverName:        driverName,
-			ConnectionString:  cnnstr,
 			DSInfo:            dsInfo,
 			MetricColumnTypes: []string{"VARCHAR", "CHAR", "NVARCHAR", "NCHAR"},
 			RowLimit:          cfg.DataProxyRowLimit,
@@ -135,12 +154,29 @@ func newInstanceSettings(cfg *setting.Cfg) datasource.InstanceFactoryFunc {
 			userError: cfg.UserFacingDefaultError,
 		}
 
-		return sqleng.NewQueryDataHandler(cfg, config, &queryResultTransformer, newMssqlMacroEngine(), logger)
+		db, err := sql.Open(driverName, cnnstr)
+		if err != nil {
+			return nil, err
+		}
+
+		db.SetMaxOpenConns(config.DSInfo.JsonData.MaxOpenConns)
+		db.SetMaxIdleConns(config.DSInfo.JsonData.MaxIdleConns)
+		db.SetConnMaxLifetime(time.Duration(config.DSInfo.JsonData.ConnMaxLifetime) * time.Second)
+
+		return sqleng.NewQueryDataHandler(cfg.UserFacingDefaultError, db, config, &queryResultTransformer, newMssqlMacroEngine(), logger)
 	}
 }
 
+// ParseURL is called also from pkg/api/datasource/validation.go,
+// which uses a different logging interface,
+// so we have a special minimal interface that is fulfilled by
+// both places.
+type DebugOnlyLogger interface {
+	Debug(msg string, args ...interface{})
+}
+
 // ParseURL tries to parse an MSSQL URL string into a URL object.
-func ParseURL(u string) (*url.URL, error) {
+func ParseURL(u string, logger DebugOnlyLogger) (*url.URL, error) {
 	logger.Debug("Parsing MSSQL URL", "url", u)
 
 	// Recognize ODBC connection strings like host\instance:1234
@@ -160,11 +196,11 @@ func ParseURL(u string) (*url.URL, error) {
 	}, nil
 }
 
-func generateConnectionString(dsInfo sqleng.DataSourceInfo, cfg *setting.Cfg, azureCredentials azcredentials.AzureCredentials) (string, error) {
+func generateConnectionString(dsInfo sqleng.DataSourceInfo, cfg *setting.Cfg, azureCredentials azcredentials.AzureCredentials, kerberosAuth kerberos.KerberosAuth, logger log.Logger) (string, error) {
 	const dfltPort = "0"
 	var addr util.NetworkAddress
 	if dsInfo.URL != "" {
-		u, err := ParseURL(dsInfo.URL)
+		u, err := ParseURL(dsInfo.URL, logger)
 		if err != nil {
 			return "", err
 		}
@@ -205,6 +241,8 @@ func generateConnectionString(dsInfo sqleng.DataSourceInfo, cfg *setting.Cfg, az
 		connStr += azureCredentialDSNFragment
 	case windowsAuthentication:
 		// No user id or password. We're using windows single sign on.
+	case kerberosRaw, kerberosKeytab, kerberosCredentialCacheFile, kerberosCredentialCache:
+		connStr = kerberos.Krb5ParseAuthCredentials(addr.Host, addr.Port, dsInfo.Database, dsInfo.User, dsInfo.DecryptedSecureJSONData["password"], kerberosAuth)
 	default:
 		connStr += fmt.Sprintf("user id=%s;password=%s;", dsInfo.User, dsInfo.DecryptedSecureJSONData["password"])
 	}
@@ -264,7 +302,7 @@ func (t *mssqlQueryResultTransformer) TransformQueryError(logger log.Logger, err
 	// ref https://github.com/denisenkom/go-mssqldb/blob/045585d74f9069afe2e115b6235eb043c8047043/tds.go#L904
 	if strings.HasPrefix(strings.ToLower(err.Error()), "unable to open tcp connection with host") {
 		logger.Error("Query error", "error", err)
-		return sqleng.ErrConnectionFailed.Errorf("failed to connect to server - %s", t.userError)
+		return fmt.Errorf("failed to connect to server - %s", t.userError)
 	}
 
 	return err
@@ -280,7 +318,7 @@ func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthReque
 	err = dsHandler.Ping()
 
 	if err != nil {
-		return &backend.CheckHealthResult{Status: backend.HealthStatusError, Message: dsHandler.TransformQueryError(logger, err).Error()}, nil
+		return &backend.CheckHealthResult{Status: backend.HealthStatusError, Message: dsHandler.TransformQueryError(s.logger, err).Error()}, nil
 	}
 
 	return &backend.CheckHealthResult{Status: backend.HealthStatusOk, Message: "Database Connection OK"}, nil
@@ -365,5 +403,20 @@ func (t *mssqlQueryResultTransformer) GetConverterList() []sqlutil.StringConvert
 				},
 			},
 		},
+		{
+			Name:           "handle SQL_VARIANT",
+			InputScanKind:  reflect.Pointer,
+			InputTypeName:  "SQL_VARIANT",
+			ConversionFunc: func(in *string) (*string, error) { return in, nil },
+			Replacer: &sqlutil.StringFieldReplacer{
+				OutputFieldType: data.FieldTypeNullableString,
+				ReplaceFunc: func(in *string) (any, error) {
+					if in == nil {
+						return nil, nil
+					}
+					return in, nil
+				},
+			},
+		},
 	}
 }
diff --git a/pkg/tsdb/mssql/mssql_test.go b/pkg/tsdb/mssql/mssql_test.go
index 7c1cd6ca61275..f424fb0016ff6 100644
--- a/pkg/tsdb/mssql/mssql_test.go
+++ b/pkg/tsdb/mssql/mssql_test.go
@@ -2,9 +2,11 @@ package mssql
 
 import (
 	"context"
+	"database/sql"
+	"encoding/json"
 	"fmt"
 	"math/rand"
-	"strings"
+	"os"
 	"testing"
 	"time"
 
@@ -12,11 +14,9 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"xorm.io/xorm"
 
 	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/sqlstore/sqlutil"
-	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tsdb/mssql/kerberos"
 	"github.com/grafana/grafana/pkg/tsdb/sqleng"
 )
 
@@ -39,30 +39,20 @@ func TestMSSQL(t *testing.T) {
 		t.Skip()
 	}
 
-	x := initMSSQLTestDB(t)
-	origXormEngine := sqleng.NewXormEngine
-	t.Cleanup(func() {
-		sqleng.NewXormEngine = origXormEngine
-	})
-
-	sqleng.NewXormEngine = func(d, c string) (*xorm.Engine, error) {
-		return x, nil
-	}
-
 	queryResultTransformer := mssqlQueryResultTransformer{}
 	dsInfo := sqleng.DataSourceInfo{}
 	config := sqleng.DataPluginConfiguration{
-		DriverName:        "mssql",
-		ConnectionString:  "",
 		DSInfo:            dsInfo,
 		MetricColumnTypes: []string{"VARCHAR", "CHAR", "NVARCHAR", "NCHAR"},
 		RowLimit:          1000000,
 	}
-	endpoint, err := sqleng.NewQueryDataHandler(setting.NewCfg(), config, &queryResultTransformer, newMssqlMacroEngine(), logger)
-	require.NoError(t, err)
 
-	sess := x.NewSession()
-	t.Cleanup(sess.Close)
+	logger := backend.NewLoggerWith("logger", "mssql.test")
+
+	db := initMSSQLTestDB(t, config.DSInfo.JsonData)
+
+	endpoint, err := sqleng.NewQueryDataHandler("", db, config, &queryResultTransformer, newMssqlMacroEngine(), logger)
+	require.NoError(t, err)
 
 	fromStart := time.Date(2018, 3, 15, 13, 0, 0, 0, time.UTC).In(time.Local)
 
@@ -102,10 +92,11 @@ func TestMSSQL(t *testing.T) {
 						c_datetimeoffset datetimeoffset,
 
 						c_uuid uniqueidentifier
+						c_sql_variant sql_variant
 					)
 				`
 
-		_, err := sess.Exec(sql)
+		_, err := db.Exec(sql)
 		require.NoError(t, err)
 
 		dt := time.Date(2018, 3, 14, 21, 20, 6, 527e6, time.UTC)
@@ -124,10 +115,10 @@ func TestMSSQL(t *testing.T) {
 					'char10', 'varchar10', 'text',
 					N'☺nchar12☺', N'☺nvarchar12☺', N'☺text☺',
 					CAST('%s' AS DATETIME), CAST('%s' AS DATETIME2), CAST('%s' AS SMALLDATETIME), CAST('%s' AS DATE), CAST('%s' AS TIME), SWITCHOFFSET(CAST('%s' AS DATETIMEOFFSET), '-07:00'),
-					CONVERT(uniqueidentifier, '%s')
+					CONVERT(uniqueidentifier, '%s'), 'test-sql-variant'
 		`, d, d2, d, d, d, d2, uuid)
 
-		_, err = sess.Exec(sql)
+		_, err = db.Exec(sql)
 		require.NoError(t, err)
 
 		t.Run("When doing a table query should map MSSQL column types to Go types", func(t *testing.T) {
@@ -180,6 +171,7 @@ func TestMSSQL(t *testing.T) {
 			require.Equal(t, dt2.In(time.FixedZone("UTC-7", int(-7*60*60))).Unix(), (*frames[0].Fields[22].At(0).(*time.Time)).Unix())
 
 			require.Equal(t, uuid, *frames[0].Fields[23].At(0).(*string))
+			require.Equal(t, "test-sql-variant", *frames[0].Fields[24].At(0).(*string))
 		})
 	})
 
@@ -194,7 +186,7 @@ func TestMSSQL(t *testing.T) {
 							)
 						`
 
-		_, err := sess.Exec(sql)
+		_, err := db.Exec(sql)
 		require.NoError(t, err)
 
 		type metric struct {
@@ -220,8 +212,10 @@ func TestMSSQL(t *testing.T) {
 			})
 		}
 
-		_, err = sess.InsertMulti(series)
-		require.NoError(t, err)
+		for _, m := range series {
+			_, err := db.Exec(`INSERT INTO metric ("time", value) VALUES (?, ?)`, m.Time.UTC(), m.Value)
+			require.NoError(t, err)
+		}
 
 		t.Run("When doing a metric query using timeGroup", func(t *testing.T) {
 			query := &backend.QueryDataRequest{
@@ -327,7 +321,8 @@ func TestMSSQL(t *testing.T) {
 							JSON: []byte(`{
 								"rawSql": "SELECT $__timeGroup(time, $__interval) AS time, avg(value) as value FROM metric GROUP BY $__timeGroup(time, $__interval) ORDER BY 1",
 								"format": "time_series"}`),
-							RefID: "A",
+							RefID:    "A",
+							Interval: time.Second * 60,
 							TimeRange: backend.TimeRange{
 								From: fromStart,
 								To:   fromStart.Add(30 * time.Minute),
@@ -378,26 +373,30 @@ func TestMSSQL(t *testing.T) {
 	t.Run("Given a table with metrics having multiple values and measurements", func(t *testing.T) {
 		type metric_values struct {
 			Time                time.Time
-			TimeInt64           int64    `xorm:"bigint 'timeInt64' not null"`
-			TimeInt64Nullable   *int64   `xorm:"bigint 'timeInt64Nullable' null"`
-			TimeFloat64         float64  `xorm:"float 'timeFloat64' not null"`
-			TimeFloat64Nullable *float64 `xorm:"float 'timeFloat64Nullable' null"`
-			TimeInt32           int32    `xorm:"int(11) 'timeInt32' not null"`
-			TimeInt32Nullable   *int32   `xorm:"int(11) 'timeInt32Nullable' null"`
-			TimeFloat32         float32  `xorm:"float(11) 'timeFloat32' not null"`
-			TimeFloat32Nullable *float32 `xorm:"float(11) 'timeFloat32Nullable' null"`
+			TimeInt64           int64
+			TimeInt64Nullable   *int64
+			TimeFloat64         float64
+			TimeFloat64Nullable *float64
+			TimeInt32           int32
+			TimeInt32Nullable   *int32
+			TimeFloat32         float32
+			TimeFloat32Nullable *float32
 			Measurement         string
-			ValueOne            int64 `xorm:"integer 'valueOne'"`
-			ValueTwo            int64 `xorm:"integer 'valueTwo'"`
+			ValueOne            int64
+			ValueTwo            int64
 		}
 
-		exists, err := sess.IsTableExist(metric_values{})
+		_, err := db.Exec("DROP TABLE IF EXISTS metric_values")
 		require.NoError(t, err)
-		if exists {
-			err := sess.DropTable(metric_values{})
-			require.NoError(t, err)
-		}
-		err = sess.CreateTable(metric_values{})
+		_, err = db.Exec(`CREATE TABLE metric_values (
+			"time" DATETIME NULL,
+			timeInt64 BIGINT NOT NULL, timeInt64Nullable BIGINT NULL,
+			timeFloat64 FLOAT NOT NULL, timeFloat64Nullable FLOAT NULL,
+			timeInt32 INT NOT NULL, timeInt32Nullable INT NULL,
+			timeFloat32 FLOAT(11) NOT NULL, timeFloat32Nullable FLOAT(11) NULL,
+			measurement VARCHAR(255) NULL, valueOne INTEGER NULL, valueTwo INTEGER NULL
+		);
+		`)
 		require.NoError(t, err)
 
 		rng := rand.New(rand.NewSource(time.Now().Unix()))
@@ -440,8 +439,23 @@ func TestMSSQL(t *testing.T) {
 			series = append(series, &second)
 		}
 
-		_, err = sess.InsertMulti(series)
-		require.NoError(t, err)
+		for _, m := range series {
+			_, err := db.Exec(`INSERT INTO metric_values (
+					"time",
+					timeInt64, timeInt64Nullable,
+					timeFloat64, timeFloat64Nullable,
+					timeInt32, timeInt32Nullable,
+					timeFloat32, timeFloat32Nullable,
+					measurement, valueOne, valueTwo
+				) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+			`, m.Time,
+				m.TimeInt64, m.TimeInt64Nullable,
+				m.TimeFloat64, m.TimeFloat64Nullable,
+				m.TimeInt32, m.TimeInt32Nullable,
+				m.TimeFloat32, m.TimeFloat32Nullable,
+				m.Measurement, m.ValueOne, m.ValueTwo)
+			require.NoError(t, err)
+		}
 
 		t.Run("When doing a metric query using epoch (int64) as time column and value column (int64) should return metric with time in time.Time", func(t *testing.T) {
 			query := &backend.QueryDataRequest{
@@ -747,7 +761,7 @@ func TestMSSQL(t *testing.T) {
 									DROP PROCEDURE sp_test_epoch
 							`
 
-			_, err := sess.Exec(sql)
+			_, err := db.Exec(sql)
 			require.NoError(t, err)
 
 			sql = `
@@ -781,20 +795,18 @@ func TestMSSQL(t *testing.T) {
 				END
 			`
 
-			_, err = sess.Exec(sql)
+			_, err = db.Exec(sql)
 			require.NoError(t, err)
 
 			t.Run("When doing a metric query using stored procedure should return correct result", func(t *testing.T) {
 				queryResultTransformer := mssqlQueryResultTransformer{}
 				dsInfo := sqleng.DataSourceInfo{}
 				config := sqleng.DataPluginConfiguration{
-					DriverName:        "mssql",
-					ConnectionString:  "",
 					DSInfo:            dsInfo,
 					MetricColumnTypes: []string{"VARCHAR", "CHAR", "NVARCHAR", "NCHAR"},
 					RowLimit:          1000000,
 				}
-				endpoint, err := sqleng.NewQueryDataHandler(setting.NewCfg(), config, &queryResultTransformer, newMssqlMacroEngine(), logger)
+				endpoint, err := sqleng.NewQueryDataHandler("", db, config, &queryResultTransformer, newMssqlMacroEngine(), logger)
 				require.NoError(t, err)
 				query := &backend.QueryDataRequest{
 					Queries: []backend.DataQuery{
@@ -837,7 +849,7 @@ func TestMSSQL(t *testing.T) {
 									DROP PROCEDURE sp_test_datetime
 							`
 
-			_, err := sess.Exec(sql)
+			_, err := db.Exec(sql)
 			require.NoError(t, err)
 
 			sql = `
@@ -871,7 +883,7 @@ func TestMSSQL(t *testing.T) {
 				END
 			`
 
-			_, err = sess.Exec(sql)
+			_, err = db.Exec(sql)
 			require.NoError(t, err)
 
 			t.Run("When doing a metric query using stored procedure should return correct result", func(t *testing.T) {
@@ -924,7 +936,7 @@ func TestMSSQL(t *testing.T) {
 			)
 		`
 
-		_, err := sess.Exec(sql)
+		_, err := db.Exec(sql)
 		require.NoError(t, err)
 
 		type event struct {
@@ -953,7 +965,7 @@ func TestMSSQL(t *testing.T) {
 							VALUES(%d, '%s', '%s')
 						`, e.TimeSec, e.Description, e.Tags)
 
-			_, err = sess.Exec(sql)
+			_, err = db.Exec(sql)
 			require.NoError(t, err)
 		}
 
@@ -1193,14 +1205,12 @@ func TestMSSQL(t *testing.T) {
 			queryResultTransformer := mssqlQueryResultTransformer{}
 			dsInfo := sqleng.DataSourceInfo{}
 			config := sqleng.DataPluginConfiguration{
-				DriverName:        "mssql",
-				ConnectionString:  "",
 				DSInfo:            dsInfo,
 				MetricColumnTypes: []string{"VARCHAR", "CHAR", "NVARCHAR", "NCHAR"},
 				RowLimit:          1,
 			}
 
-			handler, err := sqleng.NewQueryDataHandler(setting.NewCfg(), config, &queryResultTransformer, newMssqlMacroEngine(), logger)
+			handler, err := sqleng.NewQueryDataHandler("", db, config, &queryResultTransformer, newMssqlMacroEngine(), logger)
 			require.NoError(t, err)
 
 			t.Run("When doing a table query that returns 2 rows should limit the result to 1 row", func(t *testing.T) {
@@ -1266,18 +1276,10 @@ func TestMSSQL(t *testing.T) {
 	})
 
 	t.Run("Given an empty table", func(t *testing.T) {
-		type emptyObj struct {
-			EmptyKey string
-			EmptyVal int64
-		}
-
-		exists, err := sess.IsTableExist(emptyObj{})
+		_, err := db.Exec("DROP TABLE IF EXISTS empty_obj")
 		require.NoError(t, err)
-		if exists {
-			err := sess.DropTable(emptyObj{})
-			require.NoError(t, err)
-		}
-		err = sess.CreateTable(emptyObj{})
+
+		_, err = db.Exec("CREATE TABLE empty_obj (empty_key VARCHAR(255) NULL, empty_val BIGINT NULL)")
 		require.NoError(t, err)
 
 		t.Run("When no rows are returned, should return an empty frame", func(t *testing.T) {
@@ -1313,29 +1315,114 @@ func TestMSSQL(t *testing.T) {
 func TestTransformQueryError(t *testing.T) {
 	transformer := &mssqlQueryResultTransformer{}
 
-	randomErr := fmt.Errorf("random error")
+	logger := backend.NewLoggerWith("logger", "mssql.test")
 
-	tests := []struct {
-		err         error
-		expectedErr error
-	}{
-		{err: fmt.Errorf("Unable to open tcp connection with host 'localhost:5000': dial tcp: connection refused"), expectedErr: sqleng.ErrConnectionFailed},
-		{err: fmt.Errorf("unable to open tcp connection with host 'localhost:5000': dial tcp: connection refused"), expectedErr: sqleng.ErrConnectionFailed},
-		{err: randomErr, expectedErr: randomErr},
-	}
+	t.Run("Should not return a connection error", func(t *testing.T) {
+		err := fmt.Errorf("Unable to open tcp connection with host 'localhost:5000': dial tcp: connection refused")
+		resultErr := transformer.TransformQueryError(logger, err)
+		errorText := resultErr.Error()
+		assert.NotEqual(t, err, resultErr)
+		assert.NotContains(t, errorText, "Unable to open tcp connection with host")
+		assert.Contains(t, errorText, "failed to connect to server")
+	})
 
-	for _, tc := range tests {
-		resultErr := transformer.TransformQueryError(logger, tc.err)
-		assert.ErrorIs(t, resultErr, tc.expectedErr)
-	}
+	t.Run("Should return a non-connection error unmodified", func(t *testing.T) {
+		err := fmt.Errorf("normal error")
+		resultErr := transformer.TransformQueryError(logger, err)
+		assert.Equal(t, err, resultErr)
+		assert.ErrorIs(t, err, resultErr)
+	})
 }
 
 func TestGenerateConnectionString(t *testing.T) {
+	kerberosLookup := []kerberos.KerberosLookup{
+		{
+			Address:                 "example.host",
+			DBName:                  "testDB",
+			User:                    "testUser",
+			CredentialCacheFilename: "/tmp/cache",
+		},
+	}
+	tmpFile := genTempCacheFile(t, kerberosLookup)
+	defer func() {
+		err := os.Remove(tmpFile)
+		if err != nil {
+			t.Log(err)
+		}
+	}()
+
 	testCases := []struct {
-		desc       string
-		dataSource sqleng.DataSourceInfo
-		expConnStr string
+		desc        string
+		kerberosCfg kerberos.KerberosAuth
+		dataSource  sqleng.DataSourceInfo
+		expConnStr  string
 	}{
+		{
+			desc: "Use Kerberos Credential Cache",
+			kerberosCfg: kerberos.KerberosAuth{
+				CredentialCache: "/tmp/krb5cc_1000",
+				ConfigFilePath:  "/etc/krb5.conf",
+			},
+			dataSource: sqleng.DataSourceInfo{
+				URL:      "localhost",
+				Database: "database",
+				JsonData: sqleng.JsonData{
+					AuthenticationType: "Windows AD: Credential cache",
+				},
+			},
+			expConnStr: "authenticator=krb5;krb5-configfile=/etc/krb5.conf;server=localhost;database=database;krb5-credcachefile=/tmp/krb5cc_1000;",
+		},
+		{
+			desc: "Use Kerberos Credential Cache File path",
+			kerberosCfg: kerberos.KerberosAuth{
+				CredentialCacheLookupFile: tmpFile,
+				ConfigFilePath:            "/etc/krb5.conf",
+			},
+			dataSource: sqleng.DataSourceInfo{
+				URL:      "example.host",
+				Database: "testDB",
+				User:     "testUser",
+				JsonData: sqleng.JsonData{
+					AuthenticationType: "Windows AD: Credential cache file",
+				},
+			},
+			expConnStr: "authenticator=krb5;krb5-configfile=/etc/krb5.conf;server=example.host;database=testDB;krb5-credcachefile=/tmp/cache;",
+		},
+		{
+			desc: "Use Kerberos Keytab",
+			kerberosCfg: kerberos.KerberosAuth{
+				KeytabFilePath: "/foo/bar.keytab",
+				ConfigFilePath: "/etc/krb5.conf",
+			},
+			dataSource: sqleng.DataSourceInfo{
+				URL:      "localhost",
+				Database: "database",
+				User:     "foo@test.lab",
+				JsonData: sqleng.JsonData{
+					AuthenticationType: "Windows AD: Keytab",
+				},
+			},
+			expConnStr: "authenticator=krb5;krb5-configfile=/etc/krb5.conf;server=localhost;database=database;user id=foo@test.lab;krb5-keytabfile=/foo/bar.keytab;",
+		},
+		{
+			desc: "Use Kerberos Username and Password",
+			kerberosCfg: kerberos.KerberosAuth{
+				ConfigFilePath: "/etc/krb5.conf",
+			},
+			dataSource: sqleng.DataSourceInfo{
+				URL:      "localhost",
+				Database: "database",
+				User:     "foo@test.lab",
+				DecryptedSecureJSONData: map[string]string{
+					"password": "foo",
+				},
+				JsonData: sqleng.JsonData{
+					AuthenticationType: "Windows AD: Username + password",
+				},
+			},
+			expConnStr: "authenticator=krb5;krb5-configfile=/etc/krb5.conf;server=localhost;database=database;user id=foo@test.lab;password=foo;",
+		},
+
 		{
 			desc: "From URL w/ port",
 			dataSource: sqleng.DataSourceInfo{
@@ -1458,29 +1545,38 @@ func TestGenerateConnectionString(t *testing.T) {
 			expConnStr: "server=localhost;database=database;user id=user;password=;",
 		},
 	}
+
+	logger := backend.NewLoggerWith("logger", "mssql.test")
+
 	for _, tc := range testCases {
 		t.Run(tc.desc, func(t *testing.T) {
-			connStr, err := generateConnectionString(tc.dataSource, nil, nil)
+			connStr, err := generateConnectionString(tc.dataSource, nil, nil, tc.kerberosCfg, logger)
 			require.NoError(t, err)
 			assert.Equal(t, tc.expConnStr, connStr)
 		})
 	}
 }
 
-func initMSSQLTestDB(t *testing.T) *xorm.Engine {
+func initMSSQLTestDB(t *testing.T, jsonData sqleng.JsonData) *sql.DB {
 	t.Helper()
 
-	testDB := sqlutil.MSSQLTestDB()
-	x, err := xorm.NewEngine(testDB.DriverName, strings.Replace(testDB.ConnStr, "localhost",
-		serverIP, 1))
-	require.NoError(t, err)
+	host := os.Getenv("MSSQL_HOST")
+	if host == "" {
+		host = serverIP
+	}
+	port := os.Getenv("MSSQL_PORT")
+	if port == "" {
+		port = "1433"
+	}
 
-	x.DatabaseTZ = time.UTC
-	x.TZLocation = time.UTC
+	db, err := sql.Open("mssql", fmt.Sprintf("server=%s;port=%s;database=grafanatest;user id=grafana;password=Password!", host, port))
+	require.NoError(t, err)
 
-	// x.ShowSQL()
+	db.SetMaxOpenConns(jsonData.MaxOpenConns)
+	db.SetMaxIdleConns(jsonData.MaxIdleConns)
+	db.SetConnMaxLifetime(time.Duration(jsonData.ConnMaxLifetime) * time.Second)
 
-	return x
+	return db
 }
 
 func genTimeRangeByInterval(from time.Time, duration time.Duration, interval time.Duration) []time.Time {
@@ -1495,3 +1591,21 @@ func genTimeRangeByInterval(from time.Time, duration time.Duration, interval tim
 
 	return timeRange
 }
+
+func genTempCacheFile(t *testing.T, lookups []kerberos.KerberosLookup) string {
+	content, err := json.Marshal(lookups)
+	if err != nil {
+		t.Fatalf("Unable to marshall json for temp lookup: %v", err)
+	}
+
+	tmpFile, err := os.CreateTemp("", "lookup*.json")
+	if err != nil {
+		t.Fatalf("Unable to create temporary file for temp lookup: %v", err)
+	}
+
+	if _, err := tmpFile.Write(content); err != nil {
+		t.Fatalf("Unable to write to temporary file for temp lookup: %v", err)
+	}
+
+	return tmpFile.Name()
+}
diff --git a/pkg/tsdb/mssql/proxy.go b/pkg/tsdb/mssql/proxy.go
index e76886abe7404..2518af15d442f 100644
--- a/pkg/tsdb/mssql/proxy.go
+++ b/pkg/tsdb/mssql/proxy.go
@@ -2,45 +2,37 @@ package mssql
 
 import (
 	"context"
+	"crypto/md5"
 	"database/sql"
 	"database/sql/driver"
 	"errors"
+	"fmt"
 	"net"
+	"slices"
 
-	sdkproxy "github.com/grafana/grafana-plugin-sdk-go/backend/proxy"
-	"github.com/grafana/grafana/pkg/tsdb/sqleng"
-	"github.com/grafana/grafana/pkg/util"
 	mssql "github.com/microsoft/go-mssqldb"
 	"golang.org/x/net/proxy"
-	"xorm.io/core"
 )
 
 // createMSSQLProxyDriver creates and registers a new sql driver that uses a mssql connector and updates the dialer to
 // route connections through the secure socks proxy
-func createMSSQLProxyDriver(cnnstr string, hostName string, opts *sdkproxy.Options) (string, error) {
-	sqleng.XormDriverMu.Lock()
-	defer sqleng.XormDriverMu.Unlock()
-
+func createMSSQLProxyDriver(cnnstr string, hostName string, dialer proxy.Dialer) (string, error) {
 	// create a unique driver per connection string
-	hash, err := util.Md5SumString(cnnstr)
-	if err != nil {
-		return "", err
-	}
+	hash := fmt.Sprintf("%x", md5.Sum([]byte(cnnstr)))
 	driverName := "mssql-proxy-" + hash
 
 	// only register the driver once
-	if core.QueryDriver(driverName) == nil {
+	if !slices.Contains(sql.Drivers(), driverName) {
 		connector, err := mssql.NewConnector(cnnstr)
 		if err != nil {
 			return "", err
 		}
 
-		driver, err := newMSSQLProxyDriver(connector, hostName, opts)
+		driver, err := newMSSQLProxyDriver(connector, hostName, dialer)
 		if err != nil {
 			return "", err
 		}
 		sql.Register(driverName, driver)
-		core.RegisterDriver(driverName, driver)
 	}
 
 	return driverName, nil
@@ -66,16 +58,10 @@ type mssqlProxyDriver struct {
 }
 
 var _ driver.DriverContext = (*mssqlProxyDriver)(nil)
-var _ core.Driver = (*mssqlProxyDriver)(nil)
 
 // newMSSQLProxyDriver updates the dialer for a mssql connector with a dialer that proxys connections through the secure socks proxy
 // and returns a new mssql driver to register
-func newMSSQLProxyDriver(connector *mssql.Connector, hostName string, opts *sdkproxy.Options) (*mssqlProxyDriver, error) {
-	dialer, err := sdkproxy.New(opts).NewSecureSocksProxyContextDialer()
-	if err != nil {
-		return nil, err
-	}
-
+func newMSSQLProxyDriver(connector *mssql.Connector, hostName string, dialer proxy.Dialer) (*mssqlProxyDriver, error) {
 	contextDialer, ok := dialer.(proxy.ContextDialer)
 	if !ok {
 		return nil, errors.New("unable to cast socks proxy dialer to context proxy dialer")
@@ -85,14 +71,6 @@ func newMSSQLProxyDriver(connector *mssql.Connector, hostName string, opts *sdkp
 	return &mssqlProxyDriver{c: connector}, nil
 }
 
-// Parse uses the xorm mssql dialect for the driver (this has to be implemented to register the driver with xorm)
-func (d *mssqlProxyDriver) Parse(a string, b string) (*core.Uri, error) {
-	sqleng.XormDriverMu.RLock()
-	defer sqleng.XormDriverMu.RUnlock()
-
-	return core.QueryDriver("mssql").Parse(a, b)
-}
-
 // OpenConnector returns the normal mssql connector that has the updated dialer context
 func (d *mssqlProxyDriver) OpenConnector(name string) (driver.Connector, error) {
 	return d.c, nil
diff --git a/pkg/tsdb/mssql/proxy_test.go b/pkg/tsdb/mssql/proxy_test.go
index 3a81e1855f0c0..7a735c00ec0bf 100644
--- a/pkg/tsdb/mssql/proxy_test.go
+++ b/pkg/tsdb/mssql/proxy_test.go
@@ -3,75 +3,70 @@ package mssql
 import (
 	"context"
 	"fmt"
+	"net"
 	"testing"
 
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/tsdb/sqleng"
-	"github.com/grafana/grafana/pkg/tsdb/sqleng/proxyutil"
 	mssql "github.com/microsoft/go-mssqldb"
 	"github.com/stretchr/testify/require"
-	"xorm.io/core"
+	"golang.org/x/net/proxy"
 )
 
+type testDialer struct {
+}
+
+func (d *testDialer) Dial(network, addr string) (c net.Conn, err error) {
+	return nil, fmt.Errorf("test-dialer: Dial is not functional")
+}
+
+func (d *testDialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
+	return nil, fmt.Errorf("test-dialer: DialContext is not functional")
+}
+
+var _ proxy.Dialer = (&testDialer{})
+var _ proxy.ContextDialer = (&testDialer{})
+
+func newTestDialer() proxy.Dialer {
+	d := testDialer{}
+	return &d
+}
+
 func TestMSSQLProxyDriver(t *testing.T) {
-	settings := proxyutil.SetupTestSecureSocksProxySettings(t)
-	proxySettings := setting.SecureSocksDSProxySettings{
-		Enabled:      true,
-		ClientCert:   settings.ClientCert,
-		ClientKey:    settings.ClientKey,
-		RootCA:       settings.RootCA,
-		ProxyAddress: settings.ProxyAddress,
-		ServerName:   settings.ServerName,
-	}
-	dialect := "mssql"
-	opts := proxyutil.GetSQLProxyOptions(proxySettings, sqleng.DataSourceInfo{UID: "1", JsonData: sqleng.JsonData{SecureDSProxy: true}})
 	cnnstr := "server=127.0.0.1;port=1433;user id=sa;password=yourStrong(!)Password;database=db"
-	driverName, err := createMSSQLProxyDriver(cnnstr, "127.0.0.1", opts)
+	driverName, err := createMSSQLProxyDriver(cnnstr, "127.0.0.1", newTestDialer())
 	require.NoError(t, err)
 
 	t.Run("Driver should not be registered more than once", func(t *testing.T) {
-		testDriver, err := createMSSQLProxyDriver(cnnstr, "127.0.0.1", opts)
+		testDriver, err := createMSSQLProxyDriver(cnnstr, "127.0.0.1", newTestDialer())
 		require.NoError(t, err)
 		require.Equal(t, driverName, testDriver)
 	})
 
 	t.Run("A new driver should be created for a new connection string", func(t *testing.T) {
-		testDriver, err := createMSSQLProxyDriver("server=localhost;user id=sa;password=yourStrong(!)Password;database=db2", "localhost", opts)
+		testDriver, err := createMSSQLProxyDriver("server=localhost;user id=sa;password=yourStrong(!)Password;database=db2", "localhost", newTestDialer())
 		require.NoError(t, err)
 		require.NotEqual(t, driverName, testDriver)
 	})
 
-	t.Run("Parse should have the same result as xorm mssql parse", func(t *testing.T) {
-		xormDriver := core.QueryDriver(dialect)
-		xormResult, err := xormDriver.Parse(dialect, cnnstr)
-		require.NoError(t, err)
-
-		xormNewDriver := core.QueryDriver(driverName)
-		xormNewResult, err := xormNewDriver.Parse(dialect, cnnstr)
-		require.NoError(t, err)
-		require.Equal(t, xormResult, xormNewResult)
-	})
-
 	t.Run("Connector should use dialer context that routes through the socks proxy to db", func(t *testing.T) {
 		connector, err := mssql.NewConnector(cnnstr)
 		require.NoError(t, err)
-		driver, err := newMSSQLProxyDriver(connector, "127.0.0.1", opts)
+		driver, err := newMSSQLProxyDriver(connector, "127.0.0.1", newTestDialer())
 		require.NoError(t, err)
 
 		conn, err := driver.OpenConnector(cnnstr)
 		require.NoError(t, err)
 
 		_, err = conn.Connect(context.Background())
-		require.Contains(t, err.Error(), fmt.Sprintf("socks connect tcp %s->127.0.0.1:1433", settings.ProxyAddress))
+		require.Contains(t, err.Error(), "test-dialer: DialContext is not functional")
 	})
 
 	t.Run("Open should use the connector that routes through the socks proxy to db", func(t *testing.T) {
 		connector, err := mssql.NewConnector(cnnstr)
 		require.NoError(t, err)
-		driver, err := newMSSQLProxyDriver(connector, "127.0.0.1", opts)
+		driver, err := newMSSQLProxyDriver(connector, "127.0.0.1", newTestDialer())
 		require.NoError(t, err)
 
 		_, err = driver.Open(cnnstr)
-		require.Contains(t, err.Error(), fmt.Sprintf("socks connect tcp %s->127.0.0.1:1433", settings.ProxyAddress))
+		require.Contains(t, err.Error(), "test-dialer: DialContext is not functional")
 	})
 }
diff --git a/pkg/tsdb/mssql/utils/utils.go b/pkg/tsdb/mssql/utils/utils.go
index 9e927f28fba73..1e8a2fcb28f69 100644
--- a/pkg/tsdb/mssql/utils/utils.go
+++ b/pkg/tsdb/mssql/utils/utils.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/grafana/grafana-azure-sdk-go/azcredentials"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azcredentials"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 )
 
diff --git a/pkg/tsdb/mysql/macros.go b/pkg/tsdb/mysql/macros.go
index ace4072960e64..05e93c0aee59f 100644
--- a/pkg/tsdb/mysql/macros.go
+++ b/pkg/tsdb/mysql/macros.go
@@ -7,8 +7,7 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana/pkg/tsdb/sqleng"
 )
 
@@ -23,11 +22,11 @@ type mySQLMacroEngine struct {
 	userError string
 }
 
-func newMysqlMacroEngine(logger log.Logger, cfg *setting.Cfg) sqleng.SQLMacroEngine {
+func newMysqlMacroEngine(logger log.Logger, userFacingDefaultError string) sqleng.SQLMacroEngine {
 	return &mySQLMacroEngine{
 		SQLMacroEngineBase: sqleng.NewSQLMacroEngineBase(),
 		logger:             logger,
-		userError:          cfg.UserFacingDefaultError,
+		userError:          userFacingDefaultError,
 	}
 }
 
diff --git a/pkg/tsdb/mysql/macros_test.go b/pkg/tsdb/mysql/macros_test.go
index 564d35097b303..595e06c7dc4fe 100644
--- a/pkg/tsdb/mysql/macros_test.go
+++ b/pkg/tsdb/mysql/macros_test.go
@@ -7,15 +7,13 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/setting"
 
 	"github.com/stretchr/testify/require"
 )
 
 func TestMacroEngine(t *testing.T) {
 	engine := &mySQLMacroEngine{
-		logger:    log.New("test"),
+		logger:    backend.NewLoggerWith("logger", "test"),
 		userError: "inspect Grafana server log for details",
 	}
 	query := &backend.DataQuery{}
@@ -195,7 +193,7 @@ func TestMacroEngine(t *testing.T) {
 }
 
 func TestMacroEngineConcurrency(t *testing.T) {
-	engine := newMysqlMacroEngine(log.New("test"), setting.NewCfg())
+	engine := newMysqlMacroEngine(backend.NewLoggerWith("logger", "test"), "error")
 	query1 := backend.DataQuery{
 		JSON: []byte{},
 	}
diff --git a/pkg/tsdb/mysql/mysql.go b/pkg/tsdb/mysql/mysql.go
index e65e02ec225a3..2e908afc93d93 100644
--- a/pkg/tsdb/mysql/mysql.go
+++ b/pkg/tsdb/mysql/mysql.go
@@ -2,6 +2,7 @@ package mysql
 
 import (
 	"context"
+	"database/sql"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -15,16 +16,13 @@ import (
 	"github.com/go-sql-driver/mysql"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
+	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
-	sdkproxy "github.com/grafana/grafana-plugin-sdk-go/backend/proxy"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana-plugin-sdk-go/data/sqlutil"
 
-	"github.com/grafana/grafana/pkg/infra/httpclient"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana/pkg/tsdb/sqleng"
-	"github.com/grafana/grafana/pkg/tsdb/sqleng/proxyutil"
 )
 
 const (
@@ -33,34 +31,39 @@ const (
 	dateTimeFormat2 = "2006-01-02T15:04:05Z"
 )
 
-var logger = log.New("tsdb.mysql")
-
 type Service struct {
-	Cfg *setting.Cfg
-	im  instancemgmt.InstanceManager
+	im     instancemgmt.InstanceManager
+	logger log.Logger
 }
 
 func characterEscape(s string, escapeChar string) string {
 	return strings.ReplaceAll(s, escapeChar, url.QueryEscape(escapeChar))
 }
 
-func ProvideService(cfg *setting.Cfg, httpClientProvider httpclient.Provider) *Service {
+func ProvideService() *Service {
+	logger := backend.NewLoggerWith("logger", "tsdb.mysql")
 	return &Service{
-		im: datasource.NewInstanceManager(newInstanceSettings(cfg, httpClientProvider)),
+		im:     datasource.NewInstanceManager(newInstanceSettings(logger)),
+		logger: logger,
 	}
 }
 
-func newInstanceSettings(cfg *setting.Cfg, httpClientProvider httpclient.Provider) datasource.InstanceFactoryFunc {
+func newInstanceSettings(logger log.Logger) datasource.InstanceFactoryFunc {
 	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+		cfg := backend.GrafanaConfigFromContext(ctx)
+		sqlCfg, err := cfg.SQL()
+		if err != nil {
+			return nil, err
+		}
 		jsonData := sqleng.JsonData{
-			MaxOpenConns:            cfg.SqlDatasourceMaxOpenConnsDefault,
-			MaxIdleConns:            cfg.SqlDatasourceMaxIdleConnsDefault,
-			ConnMaxLifetime:         cfg.SqlDatasourceMaxConnLifetimeDefault,
+			MaxOpenConns:            sqlCfg.DefaultMaxOpenConns,
+			MaxIdleConns:            sqlCfg.DefaultMaxIdleConns,
+			ConnMaxLifetime:         sqlCfg.DefaultMaxConnLifetimeSeconds,
 			SecureDSProxy:           false,
 			AllowCleartextPasswords: false,
 		}
 
-		err := json.Unmarshal(settings.JSONData, &jsonData)
+		err = json.Unmarshal(settings.JSONData, &jsonData)
 		if err != nil {
 			return nil, fmt.Errorf("error reading settings: %w", err)
 		}
@@ -86,12 +89,20 @@ func newInstanceSettings(cfg *setting.Cfg, httpClientProvider httpclient.Provide
 			protocol = "unix"
 		}
 
+		proxyClient, err := settings.ProxyClient(ctx)
+		if err != nil {
+			return nil, err
+		}
+
 		// register the secure socks proxy dialer context, if enabled
-		proxyOpts := proxyutil.GetSQLProxyOptions(cfg.SecureSocksDSProxy, dsInfo)
-		if sdkproxy.New(proxyOpts).SecureSocksProxyEnabled() {
+		if proxyClient.SecureSocksProxyEnabled() {
+			dialer, err := proxyClient.NewSecureSocksProxyContextDialer()
+			if err != nil {
+				return nil, err
+			}
 			// UID is only unique per org, the only way to ensure uniqueness is to do it by connection information
 			uniqueIdentifier := dsInfo.User + dsInfo.DecryptedSecureJSONData["password"] + dsInfo.URL + dsInfo.Database
-			protocol, err = registerProxyDialerContext(protocol, uniqueIdentifier, proxyOpts)
+			protocol, err = registerProxyDialerContext(protocol, uniqueIdentifier, dialer)
 			if err != nil {
 				return nil, err
 			}
@@ -114,7 +125,7 @@ func newInstanceSettings(cfg *setting.Cfg, httpClientProvider httpclient.Provide
 			return nil, err
 		}
 
-		tlsConfig, err := httpClientProvider.GetTLSConfig(opts)
+		tlsConfig, err := sdkhttpclient.GetTLSConfig(opts)
 		if err != nil {
 			return nil, err
 		}
@@ -131,24 +142,32 @@ func newInstanceSettings(cfg *setting.Cfg, httpClientProvider httpclient.Provide
 			cnnstr += fmt.Sprintf("&time_zone='%s'", url.QueryEscape(dsInfo.JsonData.Timezone))
 		}
 
-		if cfg.Env == setting.Dev {
-			logger.Debug("GetEngine", "connection", cnnstr)
-		}
-
 		config := sqleng.DataPluginConfiguration{
-			DriverName:        "mysql",
-			ConnectionString:  cnnstr,
 			DSInfo:            dsInfo,
 			TimeColumnNames:   []string{"time", "time_sec"},
 			MetricColumnTypes: []string{"CHAR", "VARCHAR", "TINYTEXT", "TEXT", "MEDIUMTEXT", "LONGTEXT"},
-			RowLimit:          cfg.DataProxyRowLimit,
+			RowLimit:          sqlCfg.RowLimit,
+		}
+
+		userFacingDefaultError, err := cfg.UserFacingDefaultError()
+		if err != nil {
+			return nil, err
 		}
 
 		rowTransformer := mysqlQueryResultTransformer{
-			userError: cfg.UserFacingDefaultError,
+			userError: userFacingDefaultError,
 		}
 
-		return sqleng.NewQueryDataHandler(cfg, config, &rowTransformer, newMysqlMacroEngine(logger, cfg), logger)
+		db, err := sql.Open("mysql", cnnstr)
+		if err != nil {
+			return nil, err
+		}
+
+		db.SetMaxOpenConns(config.DSInfo.JsonData.MaxOpenConns)
+		db.SetMaxIdleConns(config.DSInfo.JsonData.MaxIdleConns)
+		db.SetConnMaxLifetime(time.Duration(config.DSInfo.JsonData.ConnMaxLifetime) * time.Second)
+
+		return sqleng.NewQueryDataHandler(userFacingDefaultError, db, config, &rowTransformer, newMysqlMacroEngine(logger, userFacingDefaultError), logger)
 	}
 }
 
@@ -173,9 +192,9 @@ func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthReque
 	if err != nil {
 		var driverErr *mysql.MySQLError
 		if errors.As(err, &driverErr) {
-			return &backend.CheckHealthResult{Status: backend.HealthStatusError, Message: dsHandler.TransformQueryError(logger, driverErr).Error()}, nil
+			return &backend.CheckHealthResult{Status: backend.HealthStatusError, Message: dsHandler.TransformQueryError(s.logger, driverErr).Error()}, nil
 		}
-		return &backend.CheckHealthResult{Status: backend.HealthStatusError, Message: dsHandler.TransformQueryError(logger, err).Error()}, nil
+		return &backend.CheckHealthResult{Status: backend.HealthStatusError, Message: dsHandler.TransformQueryError(s.logger, err).Error()}, nil
 	}
 	return &backend.CheckHealthResult{Status: backend.HealthStatusOk, Message: "Database Connection OK"}, nil
 }
diff --git a/pkg/tsdb/mysql/mysql_snapshot_test.go b/pkg/tsdb/mysql/mysql_snapshot_test.go
new file mode 100644
index 0000000000000..d2ff94f889c67
--- /dev/null
+++ b/pkg/tsdb/mysql/mysql_snapshot_test.go
@@ -0,0 +1,214 @@
+package mysql
+
+import (
+	"context"
+	"database/sql"
+	"encoding/json"
+	"fmt"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/experimental"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/tsdb/sqleng"
+
+	_ "github.com/go-sql-driver/mysql"
+)
+
+var updateGoldenFiles = false
+
+// These tests require a real mysql database:
+// - make devenv sources=potgres_tests
+// - either set the env variable GRAFANA_TEST_DB = mysql
+//   - or set `forceRun := true` below
+//
+// The tests require a MySQL db named grafanadstest and a user/password grafanatest/grafanatest!
+// Use the docker/blocks/mysql_tests/docker-compose.yaml to spin up a
+// preconfigured MySQL server suitable for running these tests.
+func TestIntegrationMySQLSnapshots(t *testing.T) {
+	// the logic in this function is copied from mysql_tests.go
+	shouldRunTest := func() bool {
+		if testing.Short() {
+			return false
+		}
+
+		testDbName, present := os.LookupEnv("GRAFANA_TEST_DB")
+
+		if present && testDbName == "mysql" {
+			return true
+		}
+
+		return false
+	}
+
+	if !shouldRunTest() {
+		t.Skip()
+	}
+
+	sqlQueryCommentRe := regexp.MustCompile(`^-- (.+)\n`)
+
+	readSqlFile := func(path string) (string, []string) {
+		// the file-path is not coming from the outside,
+		// it is hardcoded in this file.
+		//nolint:gosec
+		sqlBytes, err := os.ReadFile(path)
+		require.NoError(t, err)
+
+		sql := string(sqlBytes)
+
+		// first line of the file contains the sql query to run, commented out
+		match := sqlQueryCommentRe.FindStringSubmatch(sql)
+		require.Len(t, match, 2)
+
+		rawSQL := strings.TrimSpace(match[1])
+
+		// mysql is unable to send multiple queries in a single `Query()`,
+		// so we split the queries. we split by an "empty new line"
+		sqls := strings.Split(sql, "\n\n")
+
+		return rawSQL, sqls
+	}
+
+	makeQuery := func(rawSQL string, format string) backend.QueryDataRequest {
+		queryData := map[string]string{
+			"rawSql": rawSQL,
+			"format": format,
+		}
+
+		queryBytes, err := json.Marshal(queryData)
+		require.NoError(t, err)
+
+		return backend.QueryDataRequest{
+			Queries: []backend.DataQuery{
+				{
+					JSON:  queryBytes,
+					RefID: "A",
+					TimeRange: backend.TimeRange{
+						From: time.Date(2023, 12, 24, 14, 15, 22, 123456, time.UTC),
+						To:   time.Date(2023, 12, 24, 14, 45, 13, 876543, time.UTC),
+					},
+				},
+			},
+		}
+	}
+
+	tt := []struct {
+		name   string
+		format string
+	}{
+		{format: "time_series", name: "simple"},
+		{format: "time_series", name: "no_rows_long"},
+		{format: "time_series", name: "no_rows_wide"},
+		{format: "time_series", name: "7x_compat_metric_label"},
+		{format: "time_series", name: "convert_to_float64"},
+		{format: "time_series", name: "convert_to_float64_not"},
+		{format: "time_series", name: "fill_null"},
+		{format: "time_series", name: "fill_previous"},
+		{format: "time_series", name: "fill_value"},
+		{format: "time_series", name: "fill_value_wide"},
+		{format: "table", name: "simple"},
+		{format: "table", name: "no_rows"},
+		{format: "table", name: "types_numeric"},
+		{format: "table", name: "types_char"},
+		{format: "table", name: "types_datetime"},
+		{format: "table", name: "types_other"},
+		{format: "table", name: "timestamp_convert_bigint"},
+		{format: "table", name: "timestamp_convert_integer"},
+		{format: "table", name: "timestamp_convert_float"},
+		{format: "table", name: "timestamp_convert_double"},
+	}
+
+	for _, test := range tt {
+		require.True(t, test.format == "table" || test.format == "time_series")
+		t.Run(test.name, func(t *testing.T) {
+			origInterpolate := sqleng.Interpolate
+			t.Cleanup(func() {
+				sqleng.Interpolate = origInterpolate
+			})
+
+			sqleng.Interpolate = func(query backend.DataQuery, timeRange backend.TimeRange, timeInterval string, sql string) string {
+				return sql
+			}
+
+			host := os.Getenv("MYSQL_HOST")
+			if host == "" {
+				host = "localhost"
+			}
+			port := os.Getenv("MYSQL_PORT")
+			if port == "" {
+				port = "3306"
+			}
+			cnnStr := fmt.Sprintf("grafana:password@tcp(%s:%s)/grafana_ds_tests?collation=utf8mb4_unicode_ci&sql_mode='ANSI_QUOTES'&parseTime=true&loc=UTC", host, port)
+
+			dsInfo := sqleng.DataSourceInfo{
+				JsonData: sqleng.JsonData{
+					MaxOpenConns:    0,
+					MaxIdleConns:    2,
+					ConnMaxLifetime: 14400,
+				},
+			}
+
+			db, err := sql.Open("mysql", cnnStr)
+
+			if err != nil {
+				t.Fatalf("Failed to init mysql db %v", err)
+			}
+
+			db.SetMaxOpenConns(dsInfo.JsonData.MaxOpenConns)
+			db.SetMaxIdleConns(dsInfo.JsonData.MaxIdleConns)
+			db.SetConnMaxLifetime(time.Duration(dsInfo.JsonData.ConnMaxLifetime))
+
+			rowTransformer := mysqlQueryResultTransformer{}
+
+			logger := backend.NewLoggerWith("logger", "mysql.test")
+
+			config := sqleng.DataPluginConfiguration{
+				DSInfo:            dsInfo,
+				TimeColumnNames:   []string{"time", "time_sec"},
+				MetricColumnTypes: []string{"CHAR", "VARCHAR", "TINYTEXT", "TEXT", "MEDIUMTEXT", "LONGTEXT"},
+				RowLimit:          1000000,
+			}
+
+			handler, err := sqleng.NewQueryDataHandler("", db, config, &rowTransformer, newMysqlMacroEngine(logger, ""), logger)
+
+			require.NoError(t, err)
+
+			t.Cleanup((func() {
+				_, err := db.Exec("DROP TABLE IF EXISTS tbl")
+				require.NoError(t, err)
+				err = db.Close()
+				require.NoError(t, err)
+			}))
+
+			require.NoError(t, err)
+
+			sqlFilePath := filepath.Join("testdata", test.format, test.name+".sql")
+			goldenFileName := filepath.Join(test.format, test.name+".golden")
+
+			rawSQL, sqls := readSqlFile(sqlFilePath)
+
+			_, err = db.Exec("DROP TABLE IF EXISTS tbl")
+			require.NoError(t, err)
+
+			for _, sql := range sqls {
+				_, err = db.Exec(sql)
+				require.NoError(t, err)
+			}
+
+			query := makeQuery(rawSQL, test.format)
+
+			result, err := handler.QueryData(context.Background(), &query)
+			require.Len(t, result.Responses, 1)
+			response, found := result.Responses["A"]
+			require.True(t, found)
+			require.NoError(t, err)
+			experimental.CheckGoldenJSONResponse(t, "testdata", goldenFileName, &response, updateGoldenFiles)
+		})
+	}
+}
diff --git a/pkg/tsdb/mysql/mysql_test.go b/pkg/tsdb/mysql/mysql_test.go
index 6e0aa4d3132cb..c01ec8bae6cf0 100644
--- a/pkg/tsdb/mysql/mysql_test.go
+++ b/pkg/tsdb/mysql/mysql_test.go
@@ -2,20 +2,17 @@ package mysql
 
 import (
 	"context"
+	"database/sql"
 	"fmt"
 	"math/rand"
-	"strings"
+	"os"
 	"testing"
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/stretchr/testify/require"
-	"xorm.io/xorm"
 
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/sqlstore/sqlutil"
-	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/sqleng"
 )
 
@@ -35,25 +32,17 @@ func TestIntegrationMySQL(t *testing.T) {
 	runMySQLTests := false
 	// runMySqlTests := true
 
-	if !(db.IsTestDbMySQL() || runMySQLTests) {
+	if !(isTestDbMySQL() || runMySQLTests) {
 		t.Skip()
 	}
 
-	x := InitMySQLTestDB(t)
-
-	origXormEngine := sqleng.NewXormEngine
 	origInterpolate := sqleng.Interpolate
 	t.Cleanup(func() {
-		sqleng.NewXormEngine = origXormEngine
 		sqleng.Interpolate = origInterpolate
 	})
 
-	sqleng.NewXormEngine = func(d, c string) (*xorm.Engine, error) {
-		return x, nil
-	}
-
-	sqleng.Interpolate = func(query backend.DataQuery, timeRange backend.TimeRange, timeInterval string, sql string) (string, error) {
-		return sql, nil
+	sqleng.Interpolate = func(query backend.DataQuery, timeRange backend.TimeRange, timeInterval string, sql string) string {
+		return sql
 	}
 
 	dsInfo := sqleng.DataSourceInfo{
@@ -65,8 +54,6 @@ func TestIntegrationMySQL(t *testing.T) {
 	}
 
 	config := sqleng.DataPluginConfiguration{
-		DriverName:        "mysql",
-		ConnectionString:  "",
 		DSInfo:            dsInfo,
 		TimeColumnNames:   []string{"time", "time_sec"},
 		MetricColumnTypes: []string{"CHAR", "VARCHAR", "TINYTEXT", "TEXT", "MEDIUMTEXT", "LONGTEXT"},
@@ -75,21 +62,19 @@ func TestIntegrationMySQL(t *testing.T) {
 
 	rowTransformer := mysqlQueryResultTransformer{}
 
-	exe, err := sqleng.NewQueryDataHandler(setting.NewCfg(), config, &rowTransformer, newMysqlMacroEngine(logger, setting.NewCfg()), logger)
+	logger := backend.NewLoggerWith("logger", "mysql.test")
+
+	db := InitMySQLTestDB(t, config.DSInfo.JsonData)
+
+	exe, err := sqleng.NewQueryDataHandler("", db, config, &rowTransformer, newMysqlMacroEngine(logger, ""), logger)
 
 	require.NoError(t, err)
 
-	sess := x.NewSession()
-	t.Cleanup(sess.Close)
 	fromStart := time.Date(2018, 3, 15, 13, 0, 0, 0, time.UTC)
 
 	t.Run("Given a table with different native data types", func(t *testing.T) {
-		exists, err := sess.IsTableExist("mysql_types")
+		_, err = db.Exec("DROP TABLE IF EXISTS mysql_types")
 		require.NoError(t, err)
-		if exists {
-			err := sess.DropTable("mysql_types")
-			require.NoError(t, err)
-		}
 
 		sql := "CREATE TABLE `mysql_types` ("
 		sql += "`atinyint` tinyint(1) NOT NULL,"
@@ -105,7 +90,7 @@ func TestIntegrationMySQL(t *testing.T) {
 		sql += "`atimestamp` timestamp NOT NULL,"
 		sql += "`adatetime` datetime NOT NULL,"
 		sql += "`atime` time NOT NULL,"
-		sql += "`ayear` year," // Crashes xorm when running cleandb
+		sql += "`ayear` year,"
 		sql += "`abit` bit(1),"
 		sql += "`atinytext` tinytext,"
 		sql += "`atinyblob` tinyblob,"
@@ -124,7 +109,7 @@ func TestIntegrationMySQL(t *testing.T) {
 		sql += "`avarcharnull` varchar(3),"
 		sql += "`adecimalnull` decimal(10,2)"
 		sql += ") ENGINE=InnoDB DEFAULT CHARSET=latin1;"
-		_, err = sess.Exec(sql)
+		_, err = db.Exec(sql)
 		require.NoError(t, err)
 
 		sql = "INSERT INTO `mysql_types` "
@@ -136,7 +121,7 @@ func TestIntegrationMySQL(t *testing.T) {
 		sql += "2.22, 3.33, current_timestamp(), now(), '11:11:11', '2018', 1, 'tinytext', "
 		sql += "'tinyblob', 'text', 'blob', 'mediumtext', 'mediumblob', 'longtext', 'longblob', "
 		sql += "'val2', 'a,b', curdate(), '2018-01-01 00:01:01.123456');"
-		_, err = sess.Exec(sql)
+		_, err = db.Exec(sql)
 		require.NoError(t, err)
 
 		t.Run("Query with Table format should map MySQL column types to Go types", func(t *testing.T) {
@@ -202,13 +187,10 @@ func TestIntegrationMySQL(t *testing.T) {
 			Value int64
 		}
 
-		exists, err := sess.IsTableExist(metric{})
+		_, err := db.Exec("DROP TABLE IF EXISTS metric")
 		require.NoError(t, err)
-		if exists {
-			err := sess.DropTable(metric{})
-			require.NoError(t, err)
-		}
-		err = sess.CreateTable(metric{})
+
+		_, err = db.Exec("CREATE TABLE IF NOT EXISTS metric (time DATETIME NULL, value BIGINT(20) NULL)")
 		require.NoError(t, err)
 
 		series := []*metric{}
@@ -229,8 +211,10 @@ func TestIntegrationMySQL(t *testing.T) {
 			})
 		}
 
-		_, err = sess.InsertMulti(series)
-		require.NoError(t, err)
+		for _, m := range series {
+			_, err = db.Exec("INSERT INTO metric (`time`, `value`) VALUES (?, ?)", m.Time, m.Value)
+			require.NoError(t, err)
+		}
 
 		t.Run("When doing a metric query using timeGroup", func(t *testing.T) {
 			query := &backend.QueryDataRequest{
@@ -345,7 +329,8 @@ func TestIntegrationMySQL(t *testing.T) {
 								"rawSql": "SELECT $__timeGroup(time, $__interval) AS time, avg(value) as value FROM metric GROUP BY 1 ORDER BY 1",
 								"format": "time_series"
 							}`),
-							RefID: "A",
+							RefID:    "A",
+							Interval: time.Second * 60,
 							TimeRange: backend.TimeRange{
 								From: fromStart,
 								To:   fromStart.Add(30 * time.Minute),
@@ -425,30 +410,46 @@ func TestIntegrationMySQL(t *testing.T) {
 
 	t.Run("Given a table with metrics having multiple values and measurements", func(t *testing.T) {
 		type metric_values struct {
-			Time                time.Time  `xorm:"datetime 'time' not null"`
-			TimeNullable        *time.Time `xorm:"datetime(6) 'timeNullable' null"`
-			TimeInt64           int64      `xorm:"bigint(20) 'timeInt64' not null"`
-			TimeInt64Nullable   *int64     `xorm:"bigint(20) 'timeInt64Nullable' null"`
-			TimeFloat64         float64    `xorm:"double 'timeFloat64' not null"`
-			TimeFloat64Nullable *float64   `xorm:"double 'timeFloat64Nullable' null"`
-			TimeInt32           int32      `xorm:"int(11) 'timeInt32' not null"`
-			TimeInt32Nullable   *int32     `xorm:"int(11) 'timeInt32Nullable' null"`
-			TimeFloat32         float32    `xorm:"double 'timeFloat32' not null"`
-			TimeFloat32Nullable *float32   `xorm:"double 'timeFloat32Nullable' null"`
+			Time                time.Time
+			TimeNullable        *time.Time
+			TimeInt64           int64
+			TimeInt64Nullable   *int64
+			TimeFloat64         float64
+			TimeFloat64Nullable *float64
+			TimeInt32           int32
+			TimeInt32Nullable   *int32
+			TimeFloat32         float32
+			TimeFloat32Nullable *float32
 			Measurement         string
-			ValueOne            int64 `xorm:"integer 'valueOne'"`
-			ValueTwo            int64 `xorm:"integer 'valueTwo'"`
-			ValueThree          int64 `xorm:"tinyint(1) null 'valueThree'"`
-			ValueFour           int64 `xorm:"smallint(1) null 'valueFour'"`
+			ValueOne            int64
+			ValueTwo            int64
+			ValueThree          int64
+			ValueFour           int64
 		}
 
-		exists, err := sess.IsTableExist(metric_values{})
+		_, err := db.Exec("DROP TABLE IF EXISTS metric_values")
 		require.NoError(t, err)
-		if exists {
-			err := sess.DropTable(metric_values{})
-			require.NoError(t, err)
-		}
-		err = sess.CreateTable(metric_values{})
+
+		// the strings contain backticks, so i cannot use a raw go string
+		sqlCreateTable := "CREATE TABLE metric_values ("
+		sqlCreateTable += " `time` DATETIME NOT NULL,"
+		sqlCreateTable += "	`timeNullable` DATETIME(6) NULL,"
+		sqlCreateTable += "	`timeInt64` BIGINT(20) NOT NULL,"
+		sqlCreateTable += "	`timeInt64Nullable` BIGINT(20) NULL,"
+		sqlCreateTable += "	`timeFloat64` DOUBLE NOT NULL,"
+		sqlCreateTable += "	`timeFloat64Nullable` DOUBLE NULL,"
+		sqlCreateTable += "	`timeInt32` INT(11) NOT NULL,"
+		sqlCreateTable += "	`timeInt32Nullable` INT(11) NULL,"
+		sqlCreateTable += "	`timeFloat32` DOUBLE NOT NULL,"
+		sqlCreateTable += "	`timeFloat32Nullable` DOUBLE NULL,"
+		sqlCreateTable += "	`measurement` VARCHAR(255) NULL,"
+		sqlCreateTable += "	`valueOne` INTEGER NULL,"
+		sqlCreateTable += "	`valueTwo` INTEGER NULL,"
+		sqlCreateTable += "	`valueThree` TINYINT(1) NULL,"
+		sqlCreateTable += "	`valueFour` SMALLINT(1) NULL"
+		sqlCreateTable += ")"
+
+		_, err = db.Exec(sqlCreateTable)
 		require.NoError(t, err)
 
 		rng := rand.New(rand.NewSource(time.Now().Unix()))
@@ -497,8 +498,24 @@ func TestIntegrationMySQL(t *testing.T) {
 			series = append(series, &second)
 		}
 
-		_, err = sess.InsertMulti(series)
-		require.NoError(t, err)
+		sqlInsertSeries := "INSERT INTO `metric_values` ("
+		sqlInsertSeries += " 	 	`time`, `timeNullable`,"
+		sqlInsertSeries += "		`timeInt64`, `timeInt64Nullable`,"
+		sqlInsertSeries += "		`timeFloat64`, `timeFloat64Nullable`,"
+		sqlInsertSeries += "		`timeInt32`, `timeInt32Nullable`,"
+		sqlInsertSeries += "		`timeFloat32`, `timeFloat32Nullable`,"
+		sqlInsertSeries += "		`measurement`, `valueOne`, `valueTwo`, `valueThree`, `valueFour`)"
+		sqlInsertSeries += "	VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"
+		for _, m := range series {
+			_, err = db.Exec(sqlInsertSeries,
+				m.Time, m.TimeNullable,
+				m.TimeInt64, m.TimeInt64Nullable,
+				m.TimeFloat64, m.TimeFloat64Nullable,
+				m.TimeInt32, m.TimeInt32Nullable,
+				m.TimeFloat32, m.TimeFloat32Nullable,
+				m.Measurement, m.ValueOne, m.ValueTwo, m.ValueThree, m.ValueFour)
+			require.NoError(t, err)
+		}
 
 		t.Run("When doing a metric query using time as time column should return metric with time in time.Time", func(t *testing.T) {
 			query := &backend.QueryDataRequest{
@@ -896,13 +913,10 @@ func TestIntegrationMySQL(t *testing.T) {
 			Tags        string
 		}
 
-		exists, err := sess.IsTableExist(event{})
+		_, err := db.Exec("DROP TABLE IF EXISTS event")
 		require.NoError(t, err)
-		if exists {
-			err := sess.DropTable(event{})
-			require.NoError(t, err)
-		}
-		err = sess.CreateTable(event{})
+
+		_, err = db.Exec("CREATE TABLE IF NOT EXISTS event (time_sec BIGINT(20) NULL, description VARCHAR(255) NULL, tags VARCHAR(255) NULL)")
 		require.NoError(t, err)
 
 		events := []*event{}
@@ -920,7 +934,7 @@ func TestIntegrationMySQL(t *testing.T) {
 		}
 
 		for _, e := range events {
-			_, err := sess.Insert(e)
+			_, err := db.Exec("INSERT INTO event (time_sec, description, tags) VALUES (?, ?, ?)", e.TimeSec, e.Description, e.Tags)
 			require.NoError(t, err)
 		}
 
@@ -1156,8 +1170,6 @@ func TestIntegrationMySQL(t *testing.T) {
 		t.Run("When row limit set to 1", func(t *testing.T) {
 			dsInfo := sqleng.DataSourceInfo{}
 			config := sqleng.DataPluginConfiguration{
-				DriverName:        "mysql",
-				ConnectionString:  "",
 				DSInfo:            dsInfo,
 				TimeColumnNames:   []string{"time", "time_sec"},
 				MetricColumnTypes: []string{"CHAR", "VARCHAR", "TINYTEXT", "TEXT", "MEDIUMTEXT", "LONGTEXT"},
@@ -1166,7 +1178,7 @@ func TestIntegrationMySQL(t *testing.T) {
 
 			queryResultTransformer := mysqlQueryResultTransformer{}
 
-			handler, err := sqleng.NewQueryDataHandler(setting.NewCfg(), config, &queryResultTransformer, newMysqlMacroEngine(logger, setting.NewCfg()), logger)
+			handler, err := sqleng.NewQueryDataHandler("", db, config, &queryResultTransformer, newMysqlMacroEngine(logger, ""), logger)
 			require.NoError(t, err)
 
 			t.Run("When doing a table query that returns 2 rows should limit the result to 1 row", func(t *testing.T) {
@@ -1232,18 +1244,10 @@ func TestIntegrationMySQL(t *testing.T) {
 	})
 
 	t.Run("Given an empty table", func(t *testing.T) {
-		type emptyObj struct {
-			EmptyKey string
-			EmptyVal int64
-		}
-
-		exists, err := sess.IsTableExist(emptyObj{})
+		_, err := db.Exec("DROP TABLE IF EXISTS empty_obj")
 		require.NoError(t, err)
-		if exists {
-			err := sess.DropTable(emptyObj{})
-			require.NoError(t, err)
-		}
-		err = sess.CreateTable(emptyObj{})
+
+		_, err = db.Exec("CREATE TABLE empty_obj (empty_key VARCHAR(255) NULL, empty_val BIGINT(20) NULL)")
 		require.NoError(t, err)
 
 		t.Run("When no rows are returned, should return an empty frame", func(t *testing.T) {
@@ -1276,20 +1280,18 @@ func TestIntegrationMySQL(t *testing.T) {
 	})
 }
 
-func InitMySQLTestDB(t *testing.T) *xorm.Engine {
-	testDB := sqlutil.MySQLTestDB()
-	x, err := xorm.NewEngine(testDB.DriverName, strings.Replace(testDB.ConnStr, "/grafana_tests",
-		"/grafana_ds_tests", 1)+"&parseTime=true&loc=UTC")
+func InitMySQLTestDB(t *testing.T, jsonData sqleng.JsonData) *sql.DB {
+	connStr := mySQLTestDBConnStr()
+	db, err := sql.Open("mysql", connStr)
 	if err != nil {
 		t.Fatalf("Failed to init mysql db %v", err)
 	}
 
-	x.DatabaseTZ = time.UTC
-	x.TZLocation = time.UTC
+	db.SetMaxOpenConns(jsonData.MaxOpenConns)
+	db.SetMaxIdleConns(jsonData.MaxIdleConns)
+	db.SetConnMaxLifetime(time.Duration(jsonData.ConnMaxLifetime) * time.Second)
 
-	// x.ShowSQL()
-
-	return x
+	return db
 }
 
 func genTimeRangeByInterval(from time.Time, duration time.Duration, interval time.Duration) []time.Time {
@@ -1304,3 +1306,23 @@ func genTimeRangeByInterval(from time.Time, duration time.Duration, interval tim
 
 	return timeRange
 }
+
+func isTestDbMySQL() bool {
+	if db, present := os.LookupEnv("GRAFANA_TEST_DB"); present {
+		return db == "mysql"
+	}
+
+	return false
+}
+
+func mySQLTestDBConnStr() string {
+	host := os.Getenv("MYSQL_HOST")
+	if host == "" {
+		host = "localhost"
+	}
+	port := os.Getenv("MYSQL_PORT")
+	if port == "" {
+		port = "3306"
+	}
+	return fmt.Sprintf("grafana:password@tcp(%s:%s)/grafana_ds_tests?collation=utf8mb4_unicode_ci&sql_mode='ANSI_QUOTES'&parseTime=true&loc=UTC", host, port)
+}
diff --git a/pkg/tsdb/mysql/proxy.go b/pkg/tsdb/mysql/proxy.go
index 07dc58ad125b1..c2b288ba507b1 100644
--- a/pkg/tsdb/mysql/proxy.go
+++ b/pkg/tsdb/mysql/proxy.go
@@ -2,31 +2,28 @@ package mysql
 
 import (
 	"context"
+	"crypto/md5"
+	"fmt"
 	"net"
 
 	"github.com/go-sql-driver/mysql"
-	sdkproxy "github.com/grafana/grafana-plugin-sdk-go/backend/proxy"
-	"github.com/grafana/grafana/pkg/util"
 	"golang.org/x/net/proxy"
 )
 
 // registerProxyDialerContext registers a new dialer context to be used by mysql when the proxy network is
 // specified in the connection string
-func registerProxyDialerContext(protocol, cnnstr string, opts *sdkproxy.Options) (string, error) {
-	// the dialer contains the true network used behind the scenes
-	dialer, err := getProxyDialerContext(protocol, opts)
+func registerProxyDialerContext(protocol, cnnstr string, dialer proxy.Dialer) (string, error) {
+	// the mysqlDialer contains the true network used behind the scenes
+	mysqlDialer, err := getProxyDialerContext(protocol, dialer)
 	if err != nil {
 		return "", err
 	}
 
 	// the dialer context can be updated everytime the datasource is updated
 	// have a unique network per connection string
-	hash, err := util.Md5SumString(cnnstr)
-	if err != nil {
-		return "", err
-	}
+	hash := fmt.Sprintf("%x", md5.Sum([]byte(cnnstr)))
 	network := "proxy-" + hash
-	mysql.RegisterDialContext(network, dialer.DialContext)
+	mysql.RegisterDialContext(network, mysqlDialer.DialContext)
 
 	return network, nil
 }
@@ -38,14 +35,10 @@ type mySQLContextDialer struct {
 }
 
 // getProxyDialerContext returns a context dialer that will send the request through to the secure socks proxy
-func getProxyDialerContext(actualNetwork string, opts *sdkproxy.Options) (*mySQLContextDialer, error) {
-	dialer, err := sdkproxy.New(opts).NewSecureSocksProxyContextDialer()
-	if err != nil {
-		return nil, err
-	}
+func getProxyDialerContext(actualNetwork string, dialer proxy.Dialer) (*mySQLContextDialer, error) {
 	contextDialer, ok := dialer.(proxy.ContextDialer)
 	if !ok {
-		return nil, err
+		return nil, fmt.Errorf("mysql proxy creation failed")
 	}
 	return &mySQLContextDialer{dialer: contextDialer, network: actualNetwork}, nil
 }
diff --git a/pkg/tsdb/mysql/proxy_test.go b/pkg/tsdb/mysql/proxy_test.go
index 3abffe93ebbe8..bc8b28799b75d 100644
--- a/pkg/tsdb/mysql/proxy_test.go
+++ b/pkg/tsdb/mysql/proxy_test.go
@@ -3,29 +3,32 @@ package mysql
 import (
 	"context"
 	"fmt"
+	"net"
 	"testing"
 
 	"github.com/go-sql-driver/mysql"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/tsdb/sqleng"
-	"github.com/grafana/grafana/pkg/tsdb/sqleng/proxyutil"
 	"github.com/stretchr/testify/require"
+	"golang.org/x/net/proxy"
 )
 
+type testDialer struct {
+}
+
+func (d *testDialer) Dial(network, addr string) (c net.Conn, err error) {
+	return nil, fmt.Errorf("test-dialer: Dial is not functional")
+}
+
+func (d *testDialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
+	return nil, fmt.Errorf("test-dialer: DialContext is not functional")
+}
+
+var _ proxy.Dialer = (&testDialer{})
+var _ proxy.ContextDialer = (&testDialer{})
+
 func TestMySQLProxyDialer(t *testing.T) {
-	settings := proxyutil.SetupTestSecureSocksProxySettings(t)
-	proxySettings := setting.SecureSocksDSProxySettings{
-		Enabled:      true,
-		ClientCert:   settings.ClientCert,
-		ClientKey:    settings.ClientKey,
-		RootCA:       settings.RootCA,
-		ProxyAddress: settings.ProxyAddress,
-		ServerName:   settings.ServerName,
-	}
 	protocol := "tcp"
-	opts := proxyutil.GetSQLProxyOptions(proxySettings, sqleng.DataSourceInfo{UID: "1", JsonData: sqleng.JsonData{SecureDSProxy: true}})
 	dbURL := "localhost:5432"
-	network, err := registerProxyDialerContext(protocol, dbURL, opts)
+	network, err := registerProxyDialerContext(protocol, dbURL, &testDialer{})
 	require.NoError(t, err)
 	driver := mysql.MySQLDriver{}
 	cnnstr := fmt.Sprintf("test:test@%s(%s)/db",
@@ -38,7 +41,7 @@ func TestMySQLProxyDialer(t *testing.T) {
 	})
 
 	t.Run("Multiple networks can be created", func(t *testing.T) {
-		network, err := registerProxyDialerContext(protocol, dbURL, opts)
+		network, err := registerProxyDialerContext(protocol, dbURL, &testDialer{})
 		require.NoError(t, err)
 		cnnstr2 := fmt.Sprintf("test:test@%s(%s)/db",
 			network,
@@ -56,6 +59,6 @@ func TestMySQLProxyDialer(t *testing.T) {
 		require.NoError(t, err)
 		_, err = conn.Connect(context.Background())
 		require.Error(t, err)
-		require.Contains(t, err.Error(), fmt.Sprintf("socks connect %s %s->%s", protocol, settings.ProxyAddress, dbURL))
+		require.Contains(t, err.Error(), "test-dialer: DialContext is not functional")
 	})
 }
diff --git a/pkg/tsdb/mysql/testdata/table/no_rows.golden.jsonc b/pkg/tsdb/mysql/testdata/table/no_rows.golden.jsonc
new file mode 100644
index 0000000000000..2cc0ccc47b8b5
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/table/no_rows.golden.jsonc
@@ -0,0 +1,36 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl WHERE false"
+//  }
+//  Name: 
+//  Dimensions: 0 Fields by 0 Rows
+//  +
+//  +
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl WHERE false"
+        },
+        "fields": []
+      },
+      "data": {
+        "values": []
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/table/no_rows.sql b/pkg/tsdb/mysql/testdata/table/no_rows.sql
new file mode 100644
index 0000000000000..0a81eb4fa0792
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/table/no_rows.sql
@@ -0,0 +1,12 @@
+-- SELECT * FROM tbl WHERE false
+CREATE TABLE tbl (
+    `time` timestamp NOT NULL,
+    v double precision,
+    c text
+);
+
+INSERT INTO tbl (`time`, v, c) VALUES
+('2023-12-24 14:30:03+00:00', 10, 'a'),
+('2023-12-24 14:30:03+00:00', 110, 'b'),
+('2023-12-24 14:31:03+00:00', 20, 'a'),
+('2023-12-24 14:31:03+00:00', 120, 'b');
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/table/simple.golden.jsonc b/pkg/tsdb/mysql/testdata/table/simple.golden.jsonc
new file mode 100644
index 0000000000000..68803e3e77ee6
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/table/simple.golden.jsonc
@@ -0,0 +1,112 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl"
+//  }
+//  Name: 
+//  Dimensions: 3 Fields by 10 Rows
+//  +-------------------------------+------------------+-----------------+
+//  | Name: time                    | Name: v          | Name: c         |
+//  | Labels:                       | Labels:          | Labels:         |
+//  | Type: []*time.Time            | Type: []*float64 | Type: []*string |
+//  +-------------------------------+------------------+-----------------+
+//  | 2023-12-24 14:30:03 +0000 UTC | 10               | a               |
+//  | 2023-12-24 14:30:03 +0000 UTC | 110              | b               |
+//  | 2023-12-24 14:31:03 +0000 UTC | 20               | a               |
+//  | 2023-12-24 14:31:03 +0000 UTC | 120              | b               |
+//  | 2023-12-24 14:32:03 +0000 UTC | 30               | a               |
+//  | 2023-12-24 14:32:03 +0000 UTC | 130              | b               |
+//  | 2023-12-24 14:33:03 +0000 UTC | 40               | a               |
+//  | 2023-12-24 14:33:03 +0000 UTC | 140              | b               |
+//  | 2023-12-24 14:34:03 +0000 UTC | 50               | a               |
+//  | 2023-12-24 14:34:03 +0000 UTC | 150              | b               |
+//  +-------------------------------+------------------+-----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl"
+        },
+        "fields": [
+          {
+            "name": "time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "v",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "c",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703428203000,
+            1703428203000,
+            1703428263000,
+            1703428263000,
+            1703428323000,
+            1703428323000,
+            1703428383000,
+            1703428383000,
+            1703428443000,
+            1703428443000
+          ],
+          [
+            10,
+            110,
+            20,
+            120,
+            30,
+            130,
+            40,
+            140,
+            50,
+            150
+          ],
+          [
+            "a",
+            "b",
+            "a",
+            "b",
+            "a",
+            "b",
+            "a",
+            "b",
+            "a",
+            "b"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/table/simple.sql b/pkg/tsdb/mysql/testdata/table/simple.sql
new file mode 100644
index 0000000000000..38b5c33650d04
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/table/simple.sql
@@ -0,0 +1,18 @@
+-- SELECT * FROM tbl
+CREATE TABLE tbl (
+    `time` timestamp NOT NULL,
+    v double precision,
+    c text
+);
+
+INSERT INTO tbl (`time`, v, c) VALUES
+('2023-12-24 14:30:03+00:00', 10, 'a'),
+('2023-12-24 14:30:03+00:00', 110, 'b'),
+('2023-12-24 14:31:03+00:00', 20, 'a'),
+('2023-12-24 14:31:03+00:00', 120, 'b'),
+('2023-12-24 14:32:03+00:00', 30, 'a'),
+('2023-12-24 14:32:03+00:00', 130, 'b'),
+('2023-12-24 14:33:03+00:00', 40, 'a'),
+('2023-12-24 14:33:03+00:00', 140, 'b'),
+('2023-12-24 14:34:03+00:00', 50, 'a'),
+('2023-12-24 14:34:03+00:00', 150, 'b');
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/table/timestamp_convert_bigint.golden.jsonc b/pkg/tsdb/mysql/testdata/table/timestamp_convert_bigint.golden.jsonc
new file mode 100644
index 0000000000000..81fe927d20109
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/table/timestamp_convert_bigint.golden.jsonc
@@ -0,0 +1,113 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl"
+//  }
+//  Name: 
+//  Dimensions: 4 Fields by 4 Rows
+//  +--------------------------------------+-----------------------------------+---------------------+-----------------------------------+
+//  | Name: reallyt                        | Name: time                        | Name: n             | Name: timeend                     |
+//  | Labels:                              | Labels:                           | Labels:             | Labels:                           |
+//  | Type: []*time.Time                   | Type: []*time.Time                | Type: []*int64      | Type: []*time.Time                |
+//  +--------------------------------------+-----------------------------------+---------------------+-----------------------------------+
+//  | 2023-12-21 12:21:27 +0000 UTC        | 2023-12-21 12:21:27 +0000 UTC     | 1703161287          | 2023-12-21 12:21:52 +0000 UTC     |
+//  | 2023-12-21 12:21:27.724 +0000 UTC    | 2023-12-21 12:21:27.724 +0000 UTC | 1703161287724       | 2023-12-21 12:21:52.522 +0000 UTC |
+//  | 2023-12-21 12:21:27.724919 +0000 UTC | 2023-12-21 12:21:27.724 +0000 UTC | 1703161287724919000 | 2023-12-21 12:21:52.522 +0000 UTC |
+//  | null                                 | null                              | null                | null                              |
+//  +--------------------------------------+-----------------------------------+---------------------+-----------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl"
+        },
+        "fields": [
+          {
+            "name": "reallyt",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "n",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "timeend",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703161287000,
+            1703161287724,
+            1703161287724,
+            null
+          ],
+          [
+            1703161287000,
+            1703161287724,
+            1703161287724,
+            null
+          ],
+          [
+            1703161287,
+            1703161287724,
+            1703161287724919000,
+            null
+          ],
+          [
+            1703161312000,
+            1703161312522,
+            1703161312522,
+            null
+          ]
+        ],
+        "nanos": [
+          [
+            0,
+            0,
+            919000,
+            0
+          ],
+          null,
+          null,
+          null
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/table/timestamp_convert_bigint.sql b/pkg/tsdb/mysql/testdata/table/timestamp_convert_bigint.sql
new file mode 100644
index 0000000000000..d432c6cdef8a6
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/table/timestamp_convert_bigint.sql
@@ -0,0 +1,15 @@
+-- SELECT * FROM tbl
+-- the time-field and time-end field gets converted to time.Time
+CREATE TABLE tbl (
+    -- note, in the timestmap below we must say `NULL` otherwise mysql-below-8 inserts current timestamp
+    reallyt timestamp(6) NULL, -- reference real timestamp
+    "time" bigint,
+    n bigint, -- normal number, it should not get converted to a timestamp
+    timeend bigint
+);
+
+INSERT INTO tbl (reallyt, "time", n, timeend) VALUES
+('2023-12-21T12:21:27 UTC', 1703161287, 1703161287, 1703161312),
+('2023-12-21T12:21:27.724 UTC', 1703161287724, 1703161287724, 1703161312522),
+('2023-12-21T12:21:27.724919 UTC', 1703161287724919000, 1703161287724919000, 1703161312522186000),
+(NULL, NULL, NULL, NULL);
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/table/timestamp_convert_double.golden.jsonc b/pkg/tsdb/mysql/testdata/table/timestamp_convert_double.golden.jsonc
new file mode 100644
index 0000000000000..310adf7157d63
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/table/timestamp_convert_double.golden.jsonc
@@ -0,0 +1,113 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl"
+//  }
+//  Name: 
+//  Dimensions: 4 Fields by 4 Rows
+//  +--------------------------------------+-----------------------------------+-----------------------+-----------------------------------+
+//  | Name: reallyt                        | Name: time                        | Name: n               | Name: timeend                     |
+//  | Labels:                              | Labels:                           | Labels:               | Labels:                           |
+//  | Type: []*time.Time                   | Type: []*time.Time                | Type: []*float64      | Type: []*time.Time                |
+//  +--------------------------------------+-----------------------------------+-----------------------+-----------------------------------+
+//  | 2023-12-21 12:21:27 +0000 UTC        | 2023-12-21 12:21:27 +0000 UTC     | 1.703161287e+09       | 2023-12-21 12:21:52 +0000 UTC     |
+//  | 2023-12-21 12:21:27.724 +0000 UTC    | 2023-12-21 12:21:27.724 +0000 UTC | 1.703161287724e+12    | 2023-12-21 12:21:52.522 +0000 UTC |
+//  | 2023-12-21 12:21:27.724919 +0000 UTC | 2023-12-21 12:21:27.724 +0000 UTC | 1.703161287724919e+18 | 2023-12-21 12:21:52.522 +0000 UTC |
+//  | null                                 | null                              | null                  | null                              |
+//  +--------------------------------------+-----------------------------------+-----------------------+-----------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl"
+        },
+        "fields": [
+          {
+            "name": "reallyt",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "n",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "timeend",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703161287000,
+            1703161287724,
+            1703161287724,
+            null
+          ],
+          [
+            1703161287000,
+            1703161287724,
+            1703161287724,
+            null
+          ],
+          [
+            1703161287,
+            1703161287724,
+            1703161287724919000,
+            null
+          ],
+          [
+            1703161312000,
+            1703161312522,
+            1703161312522,
+            null
+          ]
+        ],
+        "nanos": [
+          [
+            0,
+            0,
+            919000,
+            0
+          ],
+          null,
+          null,
+          null
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/table/timestamp_convert_double.sql b/pkg/tsdb/mysql/testdata/table/timestamp_convert_double.sql
new file mode 100644
index 0000000000000..9b1c735a0770f
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/table/timestamp_convert_double.sql
@@ -0,0 +1,15 @@
+-- SELECT * FROM tbl
+-- the time-field and time-end field gets converted to time.Time
+CREATE TABLE tbl (
+    -- note, in the timestmap below we must say `NULL` otherwise mysql-below-8 inserts current timestamp
+    reallyt timestamp(6) NULL, -- reference real timestamp
+    "time" double precision,
+    n double precision, -- normal number, it should not get converted to a timestamp
+    timeend bigint
+);
+
+INSERT INTO tbl (reallyt, "time", n, timeend) VALUES
+('2023-12-21T12:21:27 UTC', 1703161287, 1703161287, 1703161312),
+('2023-12-21T12:21:27.724 UTC', 1703161287724, 1703161287724, 1703161312522),
+('2023-12-21T12:21:27.724919 UTC', 1703161287724919000, 1703161287724919000, 1703161312522186000),
+(NULL, NULL, NULL, NULL);
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/table/timestamp_convert_float.golden.jsonc b/pkg/tsdb/mysql/testdata/table/timestamp_convert_float.golden.jsonc
new file mode 100644
index 0000000000000..e6d1dfd238295
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/table/timestamp_convert_float.golden.jsonc
@@ -0,0 +1,113 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl"
+//  }
+//  Name: 
+//  Dimensions: 4 Fields by 4 Rows
+//  +--------------------------------------+-----------------------------------+-----------------------+-----------------------------------+
+//  | Name: reallyt                        | Name: time                        | Name: n               | Name: timeend                     |
+//  | Labels:                              | Labels:                           | Labels:               | Labels:                           |
+//  | Type: []*time.Time                   | Type: []*time.Time                | Type: []*float64      | Type: []*time.Time                |
+//  +--------------------------------------+-----------------------------------+-----------------------+-----------------------------------+
+//  | 2023-12-21 12:22:24 +0000 UTC        | 2023-12-21 12:22:24 +0000 UTC     | 1.703161344e+09       | 2023-12-21 12:22:52 +0000 UTC     |
+//  | 2023-12-21 12:20:33.408 +0000 UTC    | 2023-12-21 12:20:33.408 +0000 UTC | 1.703161233408e+12    | 2023-12-21 12:21:52.522 +0000 UTC |
+//  | 2023-12-21 12:20:41.050022 +0000 UTC | 2023-12-21 12:20:41.05 +0000 UTC  | 1.703161241050022e+18 | 2023-12-21 12:21:52.522 +0000 UTC |
+//  | null                                 | null                              | null                  | null                              |
+//  +--------------------------------------+-----------------------------------+-----------------------+-----------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl"
+        },
+        "fields": [
+          {
+            "name": "reallyt",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "n",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "timeend",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703161344000,
+            1703161233408,
+            1703161241050,
+            null
+          ],
+          [
+            1703161344000,
+            1703161233408,
+            1703161241050,
+            null
+          ],
+          [
+            1703161344,
+            1703161233408,
+            1703161241050022000,
+            null
+          ],
+          [
+            1703161372000,
+            1703161312522,
+            1703161312522,
+            null
+          ]
+        ],
+        "nanos": [
+          [
+            0,
+            0,
+            22000,
+            0
+          ],
+          null,
+          null,
+          null
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/table/timestamp_convert_float.sql b/pkg/tsdb/mysql/testdata/table/timestamp_convert_float.sql
new file mode 100644
index 0000000000000..140b3e909e361
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/table/timestamp_convert_float.sql
@@ -0,0 +1,15 @@
+-- SELECT * FROM tbl
+-- the time-field and time-end field gets converted to time.Time
+CREATE TABLE tbl (
+    -- note, in the timestmap below we must say `NULL` otherwise mysql-below-8 inserts current timestamp
+    reallyt timestamp(6) NULL, -- reference real timestamp
+    "time" real,
+    n real, -- normal number, it should not get converted to a timestamp
+    timeend bigint
+);
+
+INSERT INTO tbl (reallyt, "time", n, timeend) VALUES
+('2023-12-21T12:22:24', 1703161344, 1703161344, 1703161372),
+('2023-12-21T12:20:33.408', 1703161233408, 1703161233408, 1703161312522),
+('2023-12-21T12:20:41.050022', 1703161241050021888, 1703161241050021888, 1703161312522186000),
+(NULL, NULL, NULL, NULL);
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/table/timestamp_convert_integer.golden.jsonc b/pkg/tsdb/mysql/testdata/table/timestamp_convert_integer.golden.jsonc
new file mode 100644
index 0000000000000..9f0145041b042
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/table/timestamp_convert_integer.golden.jsonc
@@ -0,0 +1,92 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl"
+//  }
+//  Name: 
+//  Dimensions: 4 Fields by 2 Rows
+//  +-------------------------------+-------------------------------+----------------+-------------------------------+
+//  | Name: reallyt                 | Name: time                    | Name: n        | Name: timeend                 |
+//  | Labels:                       | Labels:                       | Labels:        | Labels:                       |
+//  | Type: []*time.Time            | Type: []*time.Time            | Type: []*int64 | Type: []*time.Time            |
+//  +-------------------------------+-------------------------------+----------------+-------------------------------+
+//  | 2023-12-21 12:21:27 +0000 UTC | 2023-12-21 12:21:27 +0000 UTC | 1703161287     | 2023-12-21 12:21:52 +0000 UTC |
+//  | null                          | null                          | null           | null                          |
+//  +-------------------------------+-------------------------------+----------------+-------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl"
+        },
+        "fields": [
+          {
+            "name": "reallyt",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "n",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "timeend",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703161287000,
+            null
+          ],
+          [
+            1703161287000,
+            null
+          ],
+          [
+            1703161287,
+            null
+          ],
+          [
+            1703161312000,
+            null
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/table/timestamp_convert_integer.sql b/pkg/tsdb/mysql/testdata/table/timestamp_convert_integer.sql
new file mode 100644
index 0000000000000..8d9a0d05d94ac
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/table/timestamp_convert_integer.sql
@@ -0,0 +1,13 @@
+-- SELECT * FROM tbl
+-- the time-field and time-end field gets converted to time.Time
+CREATE TABLE tbl (
+    -- note, in the timestmap below we must say `NULL` otherwise mysql-below-8 inserts current timestamp
+    reallyt timestamp(6) NULL, -- reference real timestamp
+    "time" integer, -- 32bits, seconds-as-number is highest we can go, milliseconds-as-number does not fit
+    n integer, -- normal number, it should not get converted to a timestamp
+    timeend integer
+);
+
+INSERT INTO tbl (reallyt, "time", n, timeend) VALUES
+('2023-12-21T12:21:27 UTC', 1703161287, 1703161287, 1703161312),
+(NULL, NULL, NULL, NULL);
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/table/types_char.golden.jsonc b/pkg/tsdb/mysql/testdata/table/types_char.golden.jsonc
new file mode 100644
index 0000000000000..1f4c8147a05fc
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/table/types_char.golden.jsonc
@@ -0,0 +1,236 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl"
+//  }
+//  Name: 
+//  Dimensions: 16 Fields by 2 Rows
+//  +-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+
+//  | Name: vc        | Name: vcnn      | Name: c         | Name: cnn       | Name: tt        | Name: ttnn      | Name: t         | Name: tnn       | Name: mt        | Name: mtnn      | Name: lt        | Name: ltnn      | Name: e         | Name: enn       | Name: s         | Name: snn       |
+//  | Labels:         | Labels:         | Labels:         | Labels:         | Labels:         | Labels:         | Labels:         | Labels:         | Labels:         | Labels:         | Labels:         | Labels:         | Labels:         | Labels:         | Labels:         | Labels:         |
+//  | Type: []*string | Type: []*string | Type: []*string | Type: []*string | Type: []*string | Type: []*string | Type: []*string | Type: []*string | Type: []*string | Type: []*string | Type: []*string | Type: []*string | Type: []*string | Type: []*string | Type: []*string | Type: []*string |
+//  +-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+
+//  | one             | two             | three           | four            | five            | six             | seven           | eight           | nine            | ten             | eleven          | twelve          | v1              | v2              | a,b             |                 |
+//  | null            | xtwo            | null            | xfour           | null            | xsix            | null            | xeight          | null            | xten            | null            | xtwelve         | null            | v1              | null            | a,c             |
+//  +-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl"
+        },
+        "fields": [
+          {
+            "name": "vc",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "vcnn",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "c",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "cnn",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "tt",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "ttnn",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "t",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "tnn",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "mt",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "mtnn",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "lt",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "ltnn",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "e",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "enn",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "s",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "snn",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "one",
+            null
+          ],
+          [
+            "two",
+            "xtwo"
+          ],
+          [
+            "three",
+            null
+          ],
+          [
+            "four",
+            "xfour"
+          ],
+          [
+            "five",
+            null
+          ],
+          [
+            "six",
+            "xsix"
+          ],
+          [
+            "seven",
+            null
+          ],
+          [
+            "eight",
+            "xeight"
+          ],
+          [
+            "nine",
+            null
+          ],
+          [
+            "ten",
+            "xten"
+          ],
+          [
+            "eleven",
+            null
+          ],
+          [
+            "twelve",
+            "xtwelve"
+          ],
+          [
+            "v1",
+            null
+          ],
+          [
+            "v2",
+            "v1"
+          ],
+          [
+            "a,b",
+            null
+          ],
+          [
+            "",
+            "a,c"
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/table/types_char.sql b/pkg/tsdb/mysql/testdata/table/types_char.sql
new file mode 100644
index 0000000000000..cc492a8d83b9c
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/table/types_char.sql
@@ -0,0 +1,24 @@
+-- SELECT * FROM tbl
+-- test all character-based mysql data types
+CREATE TABLE tbl (
+    vc varchar(10),
+    vcnn varchar(10) NOT NULL,
+    c char(10),
+    cnn char(10) NOT NULL,
+    tt tinytext,
+    ttnn tinytext NOT NULL,
+    t text,
+    tnn text NOT NULL,
+    mt mediumtext,
+    mtnn mediumtext NOT NULL,
+    lt longtext,
+    ltnn longtext NOT NULL,
+    e enum('v1', 'v2'),
+    enn enum('v1', 'v2') NOT NULL,
+    s set('a', 'b', 'c'),
+    snn set('a', 'b', 'c') NOT NULL
+);
+
+INSERT INTO tbl (vc, vcnn, c, cnn, tt, ttnn, t, tnn, mt, mtnn, lt, ltnn, e, enn, s, snn) VALUES
+('one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten', 'eleven', 'twelve', 'v1', 'v2', 'a,b', ''),
+(NULL, 'xtwo', NULL, 'xfour', NULL, 'xsix', NULL, 'xeight' , NULL, 'xten', NULL, 'xtwelve', NULL, 'v1', NULL, 'a,c');
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/table/types_datetime.golden.jsonc b/pkg/tsdb/mysql/testdata/table/types_datetime.golden.jsonc
new file mode 100644
index 0000000000000..288010166bb80
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/table/types_datetime.golden.jsonc
@@ -0,0 +1,266 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl"
+//  }
+//  Name: 
+//  Dimensions: 16 Fields by 2 Rows
+//  +-------------------------------+-------------------------------+--------------------------------------+--------------------------------------+-------------------------------+-------------------------------+--------------------------------------+--------------------------------------+-------------------------------+-------------------------------+-----------------+-----------------+-----------------+-----------------+----------------+----------------+
+//  | Name: ts                      | Name: tsnn                    | Name: ts6                            | Name: ts6nn                          | Name: dt                      | Name: dtnn                    | Name: dt6                            | Name: dt6nn                          | Name: d                       | Name: dnn                     | Name: t         | Name: tnn       | Name: t6        | Name: t6nn      | Name: y        | Name: ynn      |
+//  | Labels:                       | Labels:                       | Labels:                              | Labels:                              | Labels:                       | Labels:                       | Labels:                              | Labels:                              | Labels:                       | Labels:                       | Labels:         | Labels:         | Labels:         | Labels:         | Labels:        | Labels:        |
+//  | Type: []*time.Time            | Type: []*time.Time            | Type: []*time.Time                   | Type: []*time.Time                   | Type: []*time.Time            | Type: []*time.Time            | Type: []*time.Time                   | Type: []*time.Time                   | Type: []*time.Time            | Type: []*time.Time            | Type: []*string | Type: []*string | Type: []*string | Type: []*string | Type: []*int64 | Type: []*int64 |
+//  +-------------------------------+-------------------------------+--------------------------------------+--------------------------------------+-------------------------------+-------------------------------+--------------------------------------+--------------------------------------+-------------------------------+-------------------------------+-----------------+-----------------+-----------------+-----------------+----------------+----------------+
+//  | 2023-11-15 05:06:07 +0000 UTC | 2023-11-15 05:06:08 +0000 UTC | 2021-07-22 13:22:33.654321 +0000 UTC | 2021-07-22 13:22:34.654321 +0000 UTC | 2023-11-15 06:06:07 +0000 UTC | 2023-11-15 06:06:08 +0000 UTC | 2021-07-22 14:22:33.654321 +0000 UTC | 2021-07-22 14:22:34.654321 +0000 UTC | 2023-12-20 00:00:00 +0000 UTC | 2023-12-21 00:00:00 +0000 UTC | 12:34:56        | 12:34:57        | 12:44:56.234567 | 12:44:57.234567 | 2022           | 2023           |
+//  | null                          | 2023-11-15 05:06:09 +0000 UTC | null                                 | 2021-07-22 13:22:35.654321 +0000 UTC | null                          | 2023-11-16 05:06:09 +0000 UTC | null                                 | 2021-07-23 13:22:35.654321 +0000 UTC | null                          | 2023-12-22 00:00:00 +0000 UTC | null            | 12:34:58        | null            | 12:44:58.234567 | null           | 2024           |
+//  +-------------------------------+-------------------------------+--------------------------------------+--------------------------------------+-------------------------------+-------------------------------+--------------------------------------+--------------------------------------+-------------------------------+-------------------------------+-----------------+-----------------+-----------------+-----------------+----------------+----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl"
+        },
+        "fields": [
+          {
+            "name": "ts",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "tsnn",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "ts6",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "ts6nn",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "dt",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "dtnn",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "dt6",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "dt6nn",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "d",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "dnn",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "t",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "tnn",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "t6",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "t6nn",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string",
+              "nullable": true
+            }
+          },
+          {
+            "name": "y",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "ynn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int64",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1700024767000,
+            null
+          ],
+          [
+            1700024768000,
+            1700024769000
+          ],
+          [
+            1626960153654,
+            null
+          ],
+          [
+            1626960154654,
+            1626960155654
+          ],
+          [
+            1700028367000,
+            null
+          ],
+          [
+            1700028368000,
+            1700111169000
+          ],
+          [
+            1626963753654,
+            null
+          ],
+          [
+            1626963754654,
+            1627046555654
+          ],
+          [
+            1703030400000,
+            null
+          ],
+          [
+            1703116800000,
+            1703203200000
+          ],
+          [
+            "12:34:56",
+            null
+          ],
+          [
+            "12:34:57",
+            "12:34:58"
+          ],
+          [
+            "12:44:56.234567",
+            null
+          ],
+          [
+            "12:44:57.234567",
+            "12:44:58.234567"
+          ],
+          [
+            2022,
+            null
+          ],
+          [
+            2023,
+            2024
+          ]
+        ],
+        "nanos": [
+          null,
+          null,
+          [
+            321000,
+            0
+          ],
+          [
+            321000,
+            321000
+          ],
+          null,
+          null,
+          [
+            321000,
+            0
+          ],
+          [
+            321000,
+            321000
+          ],
+          null,
+          null,
+          null,
+          null,
+          null,
+          null,
+          null,
+          null
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/table/types_datetime.sql b/pkg/tsdb/mysql/testdata/table/types_datetime.sql
new file mode 100644
index 0000000000000..89c9219538330
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/table/types_datetime.sql
@@ -0,0 +1,56 @@
+-- SELECT * FROM tbl
+-- test all date/time-based postgres data types
+CREATE TABLE tbl (
+    ts timestamp NULL, -- must say `NULL` for below mysql8, see (explicit_defaults_for_timestamp)
+    tsnn timestamp NOT NULL,
+    ts6 timestamp(6) NULL, -- must say `NULL` for below mysql8, see (explicit_defaults_for_timestamp)
+    ts6nn timestamp(6) NOT NULL,
+    dt datetime,
+    dtnn datetime NOT NULL,
+    dt6 datetime(6),
+    dt6nn datetime(6) NOT NULL,
+    d date,
+    dnn date NOT NULL,
+    t time,
+    tnn time NOT NULL,
+    t6 time(6),
+    t6nn time(6) NOT NULL,
+    y year,
+    ynn year NOT NULL
+);
+
+INSERT INTO tbl (ts, tsnn, ts6, ts6nn, dt, dtnn, dt6, dt6nn, d, dnn, t, tnn, t6, t6nn, y, ynn) VALUES (
+'2023-11-15 05:06:07+00:00',
+'2023-11-15 05:06:08+00:00',
+'2021-07-22 13:22:33.654321+00:00',
+'2021-07-22 13:22:34.654321+00:00',
+'2023-11-15 06:06:07+00:00',
+'2023-11-15 06:06:08+00:00',
+'2021-07-22 14:22:33.654321+00:00',
+'2021-07-22 14:22:34.654321+00:00',
+'2023-12-20',
+'2023-12-21',
+'12:34:56',
+'12:34:57',
+'12:44:56.234567',
+'12:44:57.234567',
+'2022',
+'2023'
+), (
+NULL,
+'2023-11-15 05:06:09+00:00',
+NULL,
+'2021-07-22 13:22:35.654321+00:00',
+NULL,
+'2023-11-16 05:06:09+00:00',
+NULL,
+'2021-07-23 13:22:35.654321+00:00',
+NULL,
+'2023-12-22',
+NULL,
+'12:34:58',
+NULL,
+'12:44:58.234567',
+NULL,
+'2024'
+);
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/table/types_numeric.golden.jsonc b/pkg/tsdb/mysql/testdata/table/types_numeric.golden.jsonc
new file mode 100644
index 0000000000000..0b4db9c7bf757
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/table/types_numeric.golden.jsonc
@@ -0,0 +1,235 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl"
+//  }
+//  Name: 
+//  Dimensions: 16 Fields by 2 Rows
+//  +----------------+----------------+----------------+----------------+----------------+---------------+----------------+----------------+----------------+----------------+------------------+------------------+------------------+------------------+------------------+------------------+
+//  | Name: i8       | Name: i8nn     | Name: i16      | Name: i16nn    | Name: i24      | Name: i24nn   | Name: i32      | Name: i32nn    | Name: i64      | Name: i64nn    | Name: d          | Name: dnn        | Name: f32        | Name: f32nn      | Name: f64        | Name: f64nn      |
+//  | Labels:        | Labels:        | Labels:        | Labels:        | Labels:        | Labels:       | Labels:        | Labels:        | Labels:        | Labels:        | Labels:          | Labels:          | Labels:          | Labels:          | Labels:          | Labels:          |
+//  | Type: []*int64 | Type: []*int64 | Type: []*int64 | Type: []*int64 | Type: []*int64 | Type: []int32 | Type: []*int64 | Type: []*int64 | Type: []*int64 | Type: []*int64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 |
+//  +----------------+----------------+----------------+----------------+----------------+---------------+----------------+----------------+----------------+----------------+------------------+------------------+------------------+------------------+------------------+------------------+
+//  | -5             | -4             | 1              | 2              | 3              | 4             | 5              | 6              | 7              | 8              | 81.75            | 7065.25          | 30.75            | 14.625           | 21.5625          | 14.25            |
+//  | null           | -44            | null           | 22             | null           | 44            | null           | 66             | null           | 88             | null             | 169.75           | null             | 77.125           | null             | 215.8125         |
+//  +----------------+----------------+----------------+----------------+----------------+---------------+----------------+----------------+----------------+----------------+------------------+------------------+------------------+------------------+------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl"
+        },
+        "fields": [
+          {
+            "name": "i8",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "i8nn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "i16",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "i16nn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "i24",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "i24nn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int32"
+            }
+          },
+          {
+            "name": "i32",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "i32nn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "i64",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "i64nn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "int64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "d",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "dnn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "f32",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "f32nn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "f64",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "f64nn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            -5,
+            null
+          ],
+          [
+            -4,
+            -44
+          ],
+          [
+            1,
+            null
+          ],
+          [
+            2,
+            22
+          ],
+          [
+            3,
+            null
+          ],
+          [
+            4,
+            44
+          ],
+          [
+            5,
+            null
+          ],
+          [
+            6,
+            66
+          ],
+          [
+            7,
+            null
+          ],
+          [
+            8,
+            88
+          ],
+          [
+            81.75,
+            null
+          ],
+          [
+            7065.25,
+            169.75
+          ],
+          [
+            30.75,
+            null
+          ],
+          [
+            14.625,
+            77.125
+          ],
+          [
+            21.5625,
+            null
+          ],
+          [
+            14.25,
+            215.8125
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/table/types_numeric.sql b/pkg/tsdb/mysql/testdata/table/types_numeric.sql
new file mode 100644
index 0000000000000..1574ef3d92671
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/table/types_numeric.sql
@@ -0,0 +1,24 @@
+-- SELECT * FROM tbl
+-- test all numeric mysql data types
+CREATE TABLE tbl (
+    i8 tinyint,
+    i8nn tinyint NOT NULL,
+    i16 smallint,
+    i16nn smallint NOT NULL,
+    i24 mediumint,
+    i24nn mediumint NOT NULL,
+    i32 integer,
+    i32nn integer NOT NULL,
+    i64 bigint,
+    i64nn bigint NOT NULL,
+    d decimal(7, 2),
+    dnn decimal(7,2) NOT NULL,
+    f32 float,
+    f32nn float NOT NULL,
+    f64 double precision,
+    f64nn double precision NOT NULL
+);
+
+INSERT INTO tbl (i8, i8nn, i16, i16nn, i24, i24nn, i32, i32nn, i64, i64nn, d, dnn, f32, f32nn, f64, f64nn) VALUES
+(-5, -4, 1, 2, 3, 4, 5, 6, 7, 8,  81.75, 7065.25, 30.75, 14.625, 21.5625, 14.25),
+(NULL, -44, NULL, 22, NULL, 44, NULL, 66, NULL, 88, NULL, 169.75, NULL, 77.125, NULL, 215.8125);
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/table/types_other.golden.jsonc b/pkg/tsdb/mysql/testdata/table/types_other.golden.jsonc
new file mode 100644
index 0000000000000..413bf85bca8f0
Binary files /dev/null and b/pkg/tsdb/mysql/testdata/table/types_other.golden.jsonc differ
diff --git a/pkg/tsdb/mysql/testdata/table/types_other.sql b/pkg/tsdb/mysql/testdata/table/types_other.sql
new file mode 100644
index 0000000000000..5f626828e6e9e
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/table/types_other.sql
@@ -0,0 +1,40 @@
+-- SELECT * FROM tbl
+-- test the less used mysql data types
+CREATE TABLE tbl (
+    tb tinyblob,
+    tbnn tinyblob NOT NULL,
+    b blob,
+    bnn blob NOT NULL,
+    mb mediumblob,
+    mbnn mediumblob NOT NULL,
+    lb longblob,
+    lbnn longblob NOT NULL,
+    bt bit(1),
+    btnn bit(1) NOT NULL
+);
+
+INSERT INTO tbl (tb, tbnn, b, bnn, mb, mbnn, lb, lbnn, bt, btnn) VALUES
+(
+    UNHEX('4141'),
+    UNHEX('4142'),
+    UNHEX('4143'),
+    UNHEX('4144'),
+    UNHEX('4145'),
+    UNHEX('4146'),
+    UNHEX('4147'),
+    UNHEX('4148'),
+    b'0',
+    b'1'
+),
+(
+    NULL,
+    UNHEX('4242'),
+    NULL,
+    UNHEX('4244'),
+    NULL,
+    UNHEX('4246'),
+    NULL,
+    UNHEX('4248'),
+    NULL,
+    b'0'
+);
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/time_series/7x_compat_metric_label.golden.jsonc b/pkg/tsdb/mysql/testdata/time_series/7x_compat_metric_label.golden.jsonc
new file mode 100644
index 0000000000000..4bbf17b84250e
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/time_series/7x_compat_metric_label.golden.jsonc
@@ -0,0 +1,93 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "timeseries-wide",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl"
+//  }
+//  Name: 
+//  Dimensions: 3 Fields by 5 Rows
+//  +-------------------------------+------------------+------------------+
+//  | Name: Time                    | Name: a          | Name: b          |
+//  | Labels:                       | Labels:          | Labels:          |
+//  | Type: []time.Time             | Type: []*float64 | Type: []*float64 |
+//  +-------------------------------+------------------+------------------+
+//  | 2023-12-24 14:30:03 +0000 UTC | 10               | 110              |
+//  | 2023-12-24 14:31:03 +0000 UTC | 20               | 120              |
+//  | 2023-12-24 14:32:03 +0000 UTC | 30               | 130              |
+//  | 2023-12-24 14:33:03 +0000 UTC | 40               | 140              |
+//  | 2023-12-24 14:34:03 +0000 UTC | 50               | 150              |
+//  +-------------------------------+------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-wide",
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "a",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "b",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703428203000,
+            1703428263000,
+            1703428323000,
+            1703428383000,
+            1703428443000
+          ],
+          [
+            10,
+            20,
+            30,
+            40,
+            50
+          ],
+          [
+            110,
+            120,
+            130,
+            140,
+            150
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/time_series/7x_compat_metric_label.sql b/pkg/tsdb/mysql/testdata/time_series/7x_compat_metric_label.sql
new file mode 100644
index 0000000000000..f61cabe96d792
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/time_series/7x_compat_metric_label.sql
@@ -0,0 +1,19 @@
+-- SELECT * FROM tbl
+-- there's special backward-compat code which handles a field named 'metric'
+CREATE TABLE tbl (
+    `time` timestamp NOT NULL,
+    v double precision,
+    metric text
+);
+
+INSERT INTO tbl (`time`, v, metric) VALUES
+('2023-12-24 14:30:03+00:00', 10, 'a'),
+('2023-12-24 14:30:03+00:00', 110, 'b'),
+('2023-12-24 14:31:03+00:00', 20, 'a'),
+('2023-12-24 14:31:03+00:00', 120, 'b'),
+('2023-12-24 14:32:03+00:00', 30, 'a'),
+('2023-12-24 14:32:03+00:00', 130, 'b'),
+('2023-12-24 14:33:03+00:00', 40, 'a'),
+('2023-12-24 14:33:03+00:00', 140, 'b'),
+('2023-12-24 14:34:03+00:00', 50, 'a'),
+('2023-12-24 14:34:03+00:00', 150, 'b');
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/time_series/convert_to_float64.golden.jsonc b/pkg/tsdb/mysql/testdata/time_series/convert_to_float64.golden.jsonc
new file mode 100644
index 0000000000000..6229de42795ce
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/time_series/convert_to_float64.golden.jsonc
@@ -0,0 +1,267 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "timeseries-wide",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl"
+//  }
+//  Name: 
+//  Dimensions: 15 Fields by 2 Rows
+//  +-------------------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+
+//  | Name: Time                    | Name: v1         | Name: v1nn       | Name: v2         | Name: v2nn       | Name: x1         | Name: x1nn       | Name: x2         | Name: x2nn       | Name: x3         | Name: x3nn       | Name: x4         | Name: x4nn       | Name: x5         | Name: x5nn       |
+//  | Labels:                       | Labels: t=one    | Labels: t=one    | Labels: t=one    | Labels: t=one    | Labels: t=one    | Labels: t=one    | Labels: t=one    | Labels: t=one    | Labels: t=one    | Labels: t=one    | Labels: t=one    | Labels: t=one    | Labels: t=one    | Labels: t=one    |
+//  | Type: []time.Time             | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 |
+//  +-------------------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+
+//  | 2023-12-21 11:30:03 +0000 UTC | 3.78125          | 451.5625         | 52.25            | 511.312          | 101              | 102              | 103              | 104              | 105              | 106              | 107              | 108              | 109              | 110              |
+//  | 2023-12-21 11:31:03 +0000 UTC | null             | 464.375          | null             | 346.125          | null             | 127              | null             | 204              | null             | 206              | null             | 208              | null             | 210              |
+//  +-------------------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-wide",
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "v1",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "t": "one"
+            }
+          },
+          {
+            "name": "v1nn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "t": "one"
+            }
+          },
+          {
+            "name": "v2",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "t": "one"
+            }
+          },
+          {
+            "name": "v2nn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "t": "one"
+            }
+          },
+          {
+            "name": "x1",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "t": "one"
+            }
+          },
+          {
+            "name": "x1nn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "t": "one"
+            }
+          },
+          {
+            "name": "x2",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "t": "one"
+            }
+          },
+          {
+            "name": "x2nn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "t": "one"
+            }
+          },
+          {
+            "name": "x3",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "t": "one"
+            }
+          },
+          {
+            "name": "x3nn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "t": "one"
+            }
+          },
+          {
+            "name": "x4",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "t": "one"
+            }
+          },
+          {
+            "name": "x4nn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "t": "one"
+            }
+          },
+          {
+            "name": "x5",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "t": "one"
+            }
+          },
+          {
+            "name": "x5nn",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "t": "one"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703158203000,
+            1703158263000
+          ],
+          [
+            3.78125,
+            null
+          ],
+          [
+            451.5625,
+            464.375
+          ],
+          [
+            52.25,
+            null
+          ],
+          [
+            511.312,
+            346.125
+          ],
+          [
+            101,
+            null
+          ],
+          [
+            102,
+            127
+          ],
+          [
+            103,
+            null
+          ],
+          [
+            104,
+            204
+          ],
+          [
+            105,
+            null
+          ],
+          [
+            106,
+            206
+          ],
+          [
+            107,
+            null
+          ],
+          [
+            108,
+            208
+          ],
+          [
+            109,
+            null
+          ],
+          [
+            110,
+            210
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/time_series/convert_to_float64.sql b/pkg/tsdb/mysql/testdata/time_series/convert_to_float64.sql
new file mode 100644
index 0000000000000..c73e9e85fd61a
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/time_series/convert_to_float64.sql
@@ -0,0 +1,33 @@
+-- SELECT * FROM tbl
+-- in timeseries mode, most fields gets converted to float64
+CREATE TABLE tbl (
+    "time" timestamp NOT NULL,
+    v1 double precision,
+    v1nn double precision NOT NULL,
+    v2 float,
+    v2nn float NOT NULL,
+    t text,
+    x1 tinyint,
+    x1nn tinyint NOT NULL,
+    x2 smallint,
+    x2nn smallint NOT NULL,
+    x3 mediumint,
+    x3nn mediumint NOT NULL,
+    x4 integer,
+    x4nn integer NOT NULL,
+    x5 bigint,
+    x5nn bigint NOT NULL
+);
+
+INSERT INTO tbl ("time",
+v1, v1nn, v2, v2nn,
+t,
+x1, x1nn, x2, x2nn, x3, x3nn, x4, x4nn, x5, x5nn) VALUES
+('2023-12-21 11:30:03 UTC',
+3.78125, 451.5625, 52.25, 511.3125,
+'one',
+101, 102, 103, 104, 105, 106, 107, 108, 109, 110),
+('2023-12-21 11:31:03 UTC',
+NULL, 464.375, NULL, 346.125,
+'one',
+NULL, 202, NULL, 204, NULL, 206, NULL, 208, NULL, 210);
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/time_series/convert_to_float64_not.golden.jsonc b/pkg/tsdb/mysql/testdata/time_series/convert_to_float64_not.golden.jsonc
new file mode 100644
index 0000000000000..3cea08784fbc6
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/time_series/convert_to_float64_not.golden.jsonc
@@ -0,0 +1,113 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "timeseries-wide",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl"
+//  }
+//  Name: 
+//  Dimensions: 3 Fields by 2 Rows
+//  +-------------------------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------+
+//  | Name: Time                    | Name: v                                                                                                  | Name: v                                                                                                    |
+//  | Labels:                       | Labels: c1=, c1nn=bb, c2=, c2nn=dd, c3=, c3nn=ff, c4=, c4nn=hh, c5=, c5nn=jj, c6=, c6nn=ll, c7=, c7nn=v1 | Labels: c1=a, c1nn=b, c2=c, c2nn=d, c3=e, c3nn=f, c4=g, c4nn=h, c5=i, c5nn=j, c6=k, c6nn=l, c7=v1, c7nn=v2 |
+//  | Type: []time.Time             | Type: []*float64                                                                                         | Type: []*float64                                                                                           |
+//  +-------------------------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------+
+//  | 2023-12-21 11:30:03 +0000 UTC | null                                                                                                     | 10.1                                                                                                       |
+//  | 2023-12-21 11:31:03 +0000 UTC | 20.1                                                                                                     | null                                                                                                       |
+//  +-------------------------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-wide",
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "v",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "c1": "",
+              "c1nn": "bb",
+              "c2": "",
+              "c2nn": "dd",
+              "c3": "",
+              "c3nn": "ff",
+              "c4": "",
+              "c4nn": "hh",
+              "c5": "",
+              "c5nn": "jj",
+              "c6": "",
+              "c6nn": "ll",
+              "c7": "",
+              "c7nn": "v1"
+            }
+          },
+          {
+            "name": "v",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "c1": "a",
+              "c1nn": "b",
+              "c2": "c",
+              "c2nn": "d",
+              "c3": "e",
+              "c3nn": "f",
+              "c4": "g",
+              "c4nn": "h",
+              "c5": "i",
+              "c5nn": "j",
+              "c6": "k",
+              "c6nn": "l",
+              "c7": "v1",
+              "c7nn": "v2"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703158203000,
+            1703158263000
+          ],
+          [
+            null,
+            20.1
+          ],
+          [
+            10.1,
+            null
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/time_series/convert_to_float64_not.sql b/pkg/tsdb/mysql/testdata/time_series/convert_to_float64_not.sql
new file mode 100644
index 0000000000000..32265521e7a43
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/time_series/convert_to_float64_not.sql
@@ -0,0 +1,30 @@
+-- SELECT * FROM tbl
+-- in timeseries mode, most fields gets converted to float64, but text-fields should stay text
+CREATE TABLE tbl (
+    "time" timestamp NOT NULL,
+    v double precision NOT NULL,
+    c1 varchar(10),
+    c1nn varchar(10) NOT NULL,
+    c2 char(10),
+    c2nn char(10) NOT NULL,
+    c3 tinytext,
+    c3nn tinytext NOT NULL,
+    c4 text,
+    c4nn text NOT NULL,
+    c5 mediumtext,
+    c5nn mediumtext NOT NULL,
+    c6 longtext,
+    c6nn longtext NOT NULL,
+    c7 enum('v1', 'v2'),
+    c7nn enum('v1', 'v2') NOT NULL
+);
+
+INSERT INTO tbl ("time",
+v,
+c1, c1nn, c2, c2nn, c3, c3nn, c4, c4nn, c5, c5nn, c6, c6nn, c7, c7nn) VALUES
+('2023-12-21 11:30:03 UTC',
+10.1,
+'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'v1', 'v2'),
+('2023-12-21 11:31:03 UTC',
+20.1,
+NULL, 'bb', NULL, 'dd', NULL, 'ff', NULL, 'hh', NULL, 'jj', NULL, 'll', NULL, 'v1');
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/time_series/fill_null.golden.jsonc b/pkg/tsdb/mysql/testdata/time_series/fill_null.golden.jsonc
new file mode 100644
index 0000000000000..e9e19ce2b01a1
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/time_series/fill_null.golden.jsonc
@@ -0,0 +1,107 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "timeseries-wide",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT UNIX_TIMESTAMP(\"time\") DIV 300 * 300 AS \"time\",c,avg(v) AS \"v\" FROM tbl GROUP BY 1,2 ORDER BY 1,2"
+//  }
+//  Name: 
+//  Dimensions: 3 Fields by 7 Rows
+//  +-------------------------------+------------------+------------------+
+//  | Name: Time                    | Name: v          | Name: v          |
+//  | Labels:                       | Labels: c=a      | Labels: c=b      |
+//  | Type: []time.Time             | Type: []*float64 | Type: []*float64 |
+//  +-------------------------------+------------------+------------------+
+//  | 2023-12-24 14:15:00 +0000 UTC | null             | null             |
+//  | 2023-12-24 14:20:00 +0000 UTC | 15               | 115              |
+//  | 2023-12-24 14:25:00 +0000 UTC | null             | null             |
+//  | 2023-12-24 14:30:00 +0000 UTC | null             | null             |
+//  | 2023-12-24 14:35:00 +0000 UTC | 50               | 150              |
+//  | 2023-12-24 14:40:00 +0000 UTC | null             | null             |
+//  | 2023-12-24 14:45:00 +0000 UTC | null             | null             |
+//  +-------------------------------+------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-wide",
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT UNIX_TIMESTAMP(\"time\") DIV 300 * 300 AS \"time\",c,avg(v) AS \"v\" FROM tbl GROUP BY 1,2 ORDER BY 1,2"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "v",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "c": "a"
+            }
+          },
+          {
+            "name": "v",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "c": "b"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703427300000,
+            1703427600000,
+            1703427900000,
+            1703428200000,
+            1703428500000,
+            1703428800000,
+            1703429100000
+          ],
+          [
+            null,
+            15,
+            null,
+            null,
+            50,
+            null,
+            null
+          ],
+          [
+            null,
+            115,
+            null,
+            null,
+            150,
+            null,
+            null
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/time_series/fill_null.sql b/pkg/tsdb/mysql/testdata/time_series/fill_null.sql
new file mode 100644
index 0000000000000..2a9bd0b54c4af
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/time_series/fill_null.sql
@@ -0,0 +1,15 @@
+-- SELECT $__timeGroupAlias("time",5m,NULL),c,avg(v) AS "v" FROM tbl GROUP BY 1,2 ORDER BY 1,2
+-- tests fill-mode=null
+CREATE TABLE tbl (
+    `time` timestamp NOT NULL,
+    v double precision,
+    c text
+);
+
+INSERT INTO tbl (`time`, v, c) VALUES
+('2023-12-24 14:21:03+00:00', 10, 'a'),
+('2023-12-24 14:21:03+00:00', 110, 'b'),
+('2023-12-24 14:23:03+00:00', 20, 'a'),
+('2023-12-24 14:23:03+00:00', 120, 'b'),
+('2023-12-24 14:39:03+00:00', 50, 'a'),
+('2023-12-24 14:39:03+00:00', 150, 'b');
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/time_series/fill_previous.golden.jsonc b/pkg/tsdb/mysql/testdata/time_series/fill_previous.golden.jsonc
new file mode 100644
index 0000000000000..743e9e0706e76
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/time_series/fill_previous.golden.jsonc
@@ -0,0 +1,107 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "timeseries-wide",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT UNIX_TIMESTAMP(\"time\") DIV 300 * 300 AS \"time\",c,avg(v) AS \"v\" FROM tbl GROUP BY 1,2 ORDER BY 1,2"
+//  }
+//  Name: 
+//  Dimensions: 3 Fields by 7 Rows
+//  +-------------------------------+------------------+------------------+
+//  | Name: Time                    | Name: v          | Name: v          |
+//  | Labels:                       | Labels: c=a      | Labels: c=b      |
+//  | Type: []time.Time             | Type: []*float64 | Type: []*float64 |
+//  +-------------------------------+------------------+------------------+
+//  | 2023-12-24 14:15:00 +0000 UTC | null             | null             |
+//  | 2023-12-24 14:20:00 +0000 UTC | 15               | 115              |
+//  | 2023-12-24 14:25:00 +0000 UTC | 15               | 115              |
+//  | 2023-12-24 14:30:00 +0000 UTC | 15               | 115              |
+//  | 2023-12-24 14:35:00 +0000 UTC | 50               | 150              |
+//  | 2023-12-24 14:40:00 +0000 UTC | 50               | 150              |
+//  | 2023-12-24 14:45:00 +0000 UTC | 50               | 150              |
+//  +-------------------------------+------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-wide",
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT UNIX_TIMESTAMP(\"time\") DIV 300 * 300 AS \"time\",c,avg(v) AS \"v\" FROM tbl GROUP BY 1,2 ORDER BY 1,2"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "v",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "c": "a"
+            }
+          },
+          {
+            "name": "v",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "c": "b"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703427300000,
+            1703427600000,
+            1703427900000,
+            1703428200000,
+            1703428500000,
+            1703428800000,
+            1703429100000
+          ],
+          [
+            null,
+            15,
+            15,
+            15,
+            50,
+            50,
+            50
+          ],
+          [
+            null,
+            115,
+            115,
+            115,
+            150,
+            150,
+            150
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/time_series/fill_previous.sql b/pkg/tsdb/mysql/testdata/time_series/fill_previous.sql
new file mode 100644
index 0000000000000..7f2d7b9870b6c
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/time_series/fill_previous.sql
@@ -0,0 +1,15 @@
+-- SELECT $__timeGroupAlias("time",5m,previous),c,avg(v) AS "v" FROM tbl GROUP BY 1,2 ORDER BY 1,2
+-- tests fill-mode=previous
+CREATE TABLE tbl (
+    `time` timestamp NOT NULL,
+    v double precision,
+    c text
+);
+
+INSERT INTO tbl (`time`, v, c) VALUES
+('2023-12-24 14:21:03+00:00', 10, 'a'),
+('2023-12-24 14:21:03+00:00', 110, 'b'),
+('2023-12-24 14:23:03+00:00', 20, 'a'),
+('2023-12-24 14:23:03+00:00', 120, 'b'),
+('2023-12-24 14:39:03+00:00', 50, 'a'),
+('2023-12-24 14:39:03+00:00', 150, 'b');
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/time_series/fill_value.golden.jsonc b/pkg/tsdb/mysql/testdata/time_series/fill_value.golden.jsonc
new file mode 100644
index 0000000000000..1c0b9889d6922
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/time_series/fill_value.golden.jsonc
@@ -0,0 +1,107 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "timeseries-wide",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT UNIX_TIMESTAMP(\"time\") DIV 300 * 300 AS \"time\",c,avg(v) AS \"v\" FROM tbl GROUP BY 1,2 ORDER BY 1,2"
+//  }
+//  Name: 
+//  Dimensions: 3 Fields by 7 Rows
+//  +-------------------------------+------------------+------------------+
+//  | Name: Time                    | Name: v          | Name: v          |
+//  | Labels:                       | Labels: c=a      | Labels: c=b      |
+//  | Type: []time.Time             | Type: []*float64 | Type: []*float64 |
+//  +-------------------------------+------------------+------------------+
+//  | 2023-12-24 14:15:00 +0000 UTC | 27               | 27               |
+//  | 2023-12-24 14:20:00 +0000 UTC | 15               | 115              |
+//  | 2023-12-24 14:25:00 +0000 UTC | 27               | 27               |
+//  | 2023-12-24 14:30:00 +0000 UTC | 27               | 27               |
+//  | 2023-12-24 14:35:00 +0000 UTC | 50               | 150              |
+//  | 2023-12-24 14:40:00 +0000 UTC | 27               | 27               |
+//  | 2023-12-24 14:45:00 +0000 UTC | 27               | 27               |
+//  +-------------------------------+------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-wide",
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT UNIX_TIMESTAMP(\"time\") DIV 300 * 300 AS \"time\",c,avg(v) AS \"v\" FROM tbl GROUP BY 1,2 ORDER BY 1,2"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "v",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "c": "a"
+            }
+          },
+          {
+            "name": "v",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "c": "b"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703427300000,
+            1703427600000,
+            1703427900000,
+            1703428200000,
+            1703428500000,
+            1703428800000,
+            1703429100000
+          ],
+          [
+            27,
+            15,
+            27,
+            27,
+            50,
+            27,
+            27
+          ],
+          [
+            27,
+            115,
+            27,
+            27,
+            150,
+            27,
+            27
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/time_series/fill_value.sql b/pkg/tsdb/mysql/testdata/time_series/fill_value.sql
new file mode 100644
index 0000000000000..1b373c5e9945c
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/time_series/fill_value.sql
@@ -0,0 +1,15 @@
+-- SELECT $__timeGroupAlias("time",5m,27),c,avg(v) AS "v" FROM tbl GROUP BY 1,2 ORDER BY 1,2
+-- tests fill-mode=value
+CREATE TABLE tbl (
+    `time` timestamp NOT NULL,
+    v double precision,
+    c text
+);
+
+INSERT INTO tbl (`time`, v, c) VALUES
+('2023-12-24 14:21:03+00:00', 10, 'a'),
+('2023-12-24 14:21:03+00:00', 110, 'b'),
+('2023-12-24 14:23:03+00:00', 20, 'a'),
+('2023-12-24 14:23:03+00:00', 120, 'b'),
+('2023-12-24 14:39:03+00:00', 50, 'a'),
+('2023-12-24 14:39:03+00:00', 150, 'b');
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/time_series/fill_value_wide.golden.jsonc b/pkg/tsdb/mysql/testdata/time_series/fill_value_wide.golden.jsonc
new file mode 100644
index 0000000000000..a676314a6db81
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/time_series/fill_value_wide.golden.jsonc
@@ -0,0 +1,100 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT UNIX_TIMESTAMP(\"time\") DIV 300 * 300 AS \"time\",avg(v1) AS \"v1\", avg(v2) AS \"v2\" FROM tbl GROUP BY 1 ORDER BY 1"
+//  }
+//  Name: 
+//  Dimensions: 3 Fields by 7 Rows
+//  +-------------------------------+------------------+------------------+
+//  | Name: Time                    | Name: v1         | Name: v2         |
+//  | Labels:                       | Labels:          | Labels:          |
+//  | Type: []*time.Time            | Type: []*float64 | Type: []*float64 |
+//  +-------------------------------+------------------+------------------+
+//  | 2023-12-24 14:15:00 +0000 UTC | 27               | 27               |
+//  | 2023-12-24 14:20:00 +0000 UTC | 15               | 115              |
+//  | 2023-12-24 14:25:00 +0000 UTC | 27               | 27               |
+//  | 2023-12-24 14:30:00 +0000 UTC | 27               | 27               |
+//  | 2023-12-24 14:35:00 +0000 UTC | 50               | 150              |
+//  | 2023-12-24 14:40:00 +0000 UTC | 27               | 27               |
+//  | 2023-12-24 14:45:00 +0000 UTC | 27               | 27               |
+//  +-------------------------------+------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT UNIX_TIMESTAMP(\"time\") DIV 300 * 300 AS \"time\",avg(v1) AS \"v1\", avg(v2) AS \"v2\" FROM tbl GROUP BY 1 ORDER BY 1"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time",
+              "nullable": true
+            }
+          },
+          {
+            "name": "v1",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          },
+          {
+            "name": "v2",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703427300000,
+            1703427600000,
+            1703427900000,
+            1703428200000,
+            1703428500000,
+            1703428800000,
+            1703429100000
+          ],
+          [
+            27,
+            15,
+            27,
+            27,
+            50,
+            27,
+            27
+          ],
+          [
+            27,
+            115,
+            27,
+            27,
+            150,
+            27,
+            27
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/time_series/fill_value_wide.sql b/pkg/tsdb/mysql/testdata/time_series/fill_value_wide.sql
new file mode 100644
index 0000000000000..22d6746b49b84
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/time_series/fill_value_wide.sql
@@ -0,0 +1,12 @@
+-- SELECT $__timeGroupAlias("time",5m,27),avg(v1) AS "v1", avg(v2) AS "v2" FROM tbl GROUP BY 1 ORDER BY 1
+-- tests fill-mode=value
+CREATE TABLE tbl (
+    "time" timestamp(6) NOT NULL,
+    v1 double precision,
+    v2 double precision
+);
+
+INSERT INTO tbl ("time", v1, v2) VALUES
+('2023-12-24 14:21:03 UTC', 10, 110),
+('2023-12-24 14:23:03 UTC', 20, 120),
+('2023-12-24 14:39:03 UTC', 50, 150);
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/time_series/no_rows_long.golden.jsonc b/pkg/tsdb/mysql/testdata/time_series/no_rows_long.golden.jsonc
new file mode 100644
index 0000000000000..2cc0ccc47b8b5
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/time_series/no_rows_long.golden.jsonc
@@ -0,0 +1,36 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl WHERE false"
+//  }
+//  Name: 
+//  Dimensions: 0 Fields by 0 Rows
+//  +
+//  +
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl WHERE false"
+        },
+        "fields": []
+      },
+      "data": {
+        "values": []
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/time_series/no_rows_long.sql b/pkg/tsdb/mysql/testdata/time_series/no_rows_long.sql
new file mode 100644
index 0000000000000..0a81eb4fa0792
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/time_series/no_rows_long.sql
@@ -0,0 +1,12 @@
+-- SELECT * FROM tbl WHERE false
+CREATE TABLE tbl (
+    `time` timestamp NOT NULL,
+    v double precision,
+    c text
+);
+
+INSERT INTO tbl (`time`, v, c) VALUES
+('2023-12-24 14:30:03+00:00', 10, 'a'),
+('2023-12-24 14:30:03+00:00', 110, 'b'),
+('2023-12-24 14:31:03+00:00', 20, 'a'),
+('2023-12-24 14:31:03+00:00', 120, 'b');
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/time_series/no_rows_wide.golden.jsonc b/pkg/tsdb/mysql/testdata/time_series/no_rows_wide.golden.jsonc
new file mode 100644
index 0000000000000..2cc0ccc47b8b5
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/time_series/no_rows_wide.golden.jsonc
@@ -0,0 +1,36 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl WHERE false"
+//  }
+//  Name: 
+//  Dimensions: 0 Fields by 0 Rows
+//  +
+//  +
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl WHERE false"
+        },
+        "fields": []
+      },
+      "data": {
+        "values": []
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/time_series/no_rows_wide.sql b/pkg/tsdb/mysql/testdata/time_series/no_rows_wide.sql
new file mode 100644
index 0000000000000..25c16edda9cc5
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/time_series/no_rows_wide.sql
@@ -0,0 +1,10 @@
+-- SELECT * FROM tbl WHERE false
+CREATE TABLE tbl (
+    `time` timestamp NOT NULL,
+    v1 double precision,
+    v2 double precision
+);
+
+INSERT INTO tbl (`time`, v1, v2) VALUES
+('2023-12-24 14:30:03+00:00', 10, 110),
+('2023-12-24 14:31:03+00:00', 20, 120);
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/time_series/simple.golden.jsonc b/pkg/tsdb/mysql/testdata/time_series/simple.golden.jsonc
new file mode 100644
index 0000000000000..c8075f2b65b40
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/time_series/simple.golden.jsonc
@@ -0,0 +1,99 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "timeseries-wide",
+//      "typeVersion": [
+//          0,
+//          0
+//      ],
+//      "executedQueryString": "SELECT * FROM tbl"
+//  }
+//  Name: 
+//  Dimensions: 3 Fields by 5 Rows
+//  +-------------------------------+------------------+------------------+
+//  | Name: Time                    | Name: v          | Name: v          |
+//  | Labels:                       | Labels: c=a      | Labels: c=b      |
+//  | Type: []time.Time             | Type: []*float64 | Type: []*float64 |
+//  +-------------------------------+------------------+------------------+
+//  | 2023-12-24 14:30:03 +0000 UTC | 10               | 110              |
+//  | 2023-12-24 14:31:03 +0000 UTC | 20               | 120              |
+//  | 2023-12-24 14:32:03 +0000 UTC | 30               | 130              |
+//  | 2023-12-24 14:33:03 +0000 UTC | 40               | 140              |
+//  | 2023-12-24 14:34:03 +0000 UTC | 50               | 150              |
+//  +-------------------------------+------------------+------------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "status": 200,
+  "frames": [
+    {
+      "schema": {
+        "meta": {
+          "type": "timeseries-wide",
+          "typeVersion": [
+            0,
+            0
+          ],
+          "executedQueryString": "SELECT * FROM tbl"
+        },
+        "fields": [
+          {
+            "name": "Time",
+            "type": "time",
+            "typeInfo": {
+              "frame": "time.Time"
+            }
+          },
+          {
+            "name": "v",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "c": "a"
+            }
+          },
+          {
+            "name": "v",
+            "type": "number",
+            "typeInfo": {
+              "frame": "float64",
+              "nullable": true
+            },
+            "labels": {
+              "c": "b"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            1703428203000,
+            1703428263000,
+            1703428323000,
+            1703428383000,
+            1703428443000
+          ],
+          [
+            10,
+            20,
+            30,
+            40,
+            50
+          ],
+          [
+            110,
+            120,
+            130,
+            140,
+            150
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/tsdb/mysql/testdata/time_series/simple.sql b/pkg/tsdb/mysql/testdata/time_series/simple.sql
new file mode 100644
index 0000000000000..38b5c33650d04
--- /dev/null
+++ b/pkg/tsdb/mysql/testdata/time_series/simple.sql
@@ -0,0 +1,18 @@
+-- SELECT * FROM tbl
+CREATE TABLE tbl (
+    `time` timestamp NOT NULL,
+    v double precision,
+    c text
+);
+
+INSERT INTO tbl (`time`, v, c) VALUES
+('2023-12-24 14:30:03+00:00', 10, 'a'),
+('2023-12-24 14:30:03+00:00', 110, 'b'),
+('2023-12-24 14:31:03+00:00', 20, 'a'),
+('2023-12-24 14:31:03+00:00', 120, 'b'),
+('2023-12-24 14:32:03+00:00', 30, 'a'),
+('2023-12-24 14:32:03+00:00', 130, 'b'),
+('2023-12-24 14:33:03+00:00', 40, 'a'),
+('2023-12-24 14:33:03+00:00', 140, 'b'),
+('2023-12-24 14:34:03+00:00', 50, 'a'),
+('2023-12-24 14:34:03+00:00', 150, 'b');
\ No newline at end of file
diff --git a/pkg/tsdb/opentsdb/opentsdb.go b/pkg/tsdb/opentsdb/opentsdb.go
index 8dbf3c8a71224..5d1902c7ac947 100644
--- a/pkg/tsdb/opentsdb/opentsdb.go
+++ b/pkg/tsdb/opentsdb/opentsdb.go
@@ -70,6 +70,8 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest)
 
 	q := req.Queries[0]
 
+	myRefID := q.RefID
+
 	tsdbQuery.Start = q.TimeRange.From.UnixNano() / int64(time.Millisecond)
 	tsdbQuery.End = q.TimeRange.To.UnixNano() / int64(time.Millisecond)
 
@@ -105,7 +107,7 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest)
 		}
 	}()
 
-	result, err := s.parseResponse(logger, res)
+	result, err := s.parseResponse(logger, res, myRefID)
 	if err != nil {
 		return &backend.QueryDataResponse{}, err
 	}
@@ -136,7 +138,7 @@ func (s *Service) createRequest(ctx context.Context, logger log.Logger, dsInfo *
 	return req, nil
 }
 
-func (s *Service) parseResponse(logger log.Logger, res *http.Response) (*backend.QueryDataResponse, error) {
+func (s *Service) parseResponse(logger log.Logger, res *http.Response, myRefID string) (*backend.QueryDataResponse, error) {
 	resp := backend.NewQueryDataResponse()
 
 	body, err := io.ReadAll(res.Body)
@@ -181,9 +183,9 @@ func (s *Service) parseResponse(logger log.Logger, res *http.Response) (*backend
 			data.NewField("time", nil, timeVector),
 			data.NewField("value", tags, values)))
 	}
-	result := resp.Responses["A"]
+	result := resp.Responses[myRefID]
 	result.Frames = frames
-	resp.Responses["A"] = result
+	resp.Responses[myRefID] = result
 	return resp, nil
 }
 
diff --git a/pkg/tsdb/opentsdb/opentsdb_test.go b/pkg/tsdb/opentsdb/opentsdb_test.go
index 22faa22e289b0..a48c14188f4ab 100644
--- a/pkg/tsdb/opentsdb/opentsdb_test.go
+++ b/pkg/tsdb/opentsdb/opentsdb_test.go
@@ -33,7 +33,7 @@ func TestOpenTsdbExecutor(t *testing.T) {
 	t.Run("Parse response should handle invalid JSON", func(t *testing.T) {
 		response := `{ invalid }`
 
-		result, err := service.parseResponse(logger, &http.Response{Body: io.NopCloser(strings.NewReader(response))})
+		result, err := service.parseResponse(logger, &http.Response{Body: io.NopCloser(strings.NewReader(response))}, "A")
 		require.Nil(t, result)
 		require.Error(t, err)
 	})
@@ -63,7 +63,7 @@ func TestOpenTsdbExecutor(t *testing.T) {
 
 		resp := http.Response{Body: io.NopCloser(strings.NewReader(response))}
 		resp.StatusCode = 200
-		result, err := service.parseResponse(logger, &resp)
+		result, err := service.parseResponse(logger, &resp, "A")
 		require.NoError(t, err)
 
 		frame := result.Responses["A"]
@@ -73,6 +73,41 @@ func TestOpenTsdbExecutor(t *testing.T) {
 		}
 	})
 
+	t.Run("ref id is not hard coded", func(t *testing.T) {
+		myRefid := "reference id"
+
+		response := `
+		[
+			{
+				"metric": "test",
+				"dps": {
+					"1405544146": 50.0
+				},
+				"tags" : {
+					"env": "prod",
+					"app": "grafana"
+				}
+			}
+		]`
+
+		testFrame := data.NewFrame("test",
+			data.NewField("time", nil, []time.Time{
+				time.Date(2014, 7, 16, 20, 55, 46, 0, time.UTC),
+			}),
+			data.NewField("value", map[string]string{"env": "prod", "app": "grafana"}, []float64{
+				50}),
+		)
+
+		resp := http.Response{Body: io.NopCloser(strings.NewReader(response))}
+		resp.StatusCode = 200
+		result, err := service.parseResponse(logger, &resp, myRefid)
+		require.NoError(t, err)
+
+		if diff := cmp.Diff(testFrame, result.Responses[myRefid].Frames[0], data.FrameTestCompareOptions()...); diff != "" {
+			t.Errorf("Result mismatch (-want +got):\n%s", diff)
+		}
+	})
+
 	t.Run("Build metric with downsampling enabled", func(t *testing.T) {
 		query := backend.DataQuery{
 			JSON: []byte(`
diff --git a/pkg/tsdb/parca/kinds/dataquery/types_dataquery_gen.go b/pkg/tsdb/parca/kinds/dataquery/types_dataquery_gen.go
index 346237c487a73..2acdac9bc9c49 100644
--- a/pkg/tsdb/parca/kinds/dataquery/types_dataquery_gen.go
+++ b/pkg/tsdb/parca/kinds/dataquery/types_dataquery_gen.go
@@ -26,9 +26,7 @@ type DataQuery struct {
 	// TODO this shouldn't be unknown but DataSourceRef | null
 	Datasource *any `json:"datasource,omitempty"`
 
-	// Hide true if query is disabled (ie should not be returned to the dashboard)
-	// Note this does not always imply that the query should not be executed since
-	// the results from a hidden query may be used as the input to other queries (SSE etc)
+	// If hide is set to true, Grafana will filter out the response(s) associated with this query before returning it to the panel.
 	Hide *bool `json:"hide,omitempty"`
 
 	// Specify the query flavor
@@ -43,27 +41,20 @@ type DataQuery struct {
 
 // ParcaDataQuery defines model for ParcaDataQuery.
 type ParcaDataQuery struct {
-	// DataQuery These are the common properties available to all queries in all datasources.
-	// Specific implementations will *extend* this interface, adding the required
-	// properties for the given context.
-	DataQuery
-
 	// For mixed data sources the selected datasource is on the query level.
 	// For non mixed scenarios this is undefined.
 	// TODO find a better way to do this ^ that's friendly to schema
 	// TODO this shouldn't be unknown but DataSourceRef | null
 	Datasource *any `json:"datasource,omitempty"`
 
-	// Hide true if query is disabled (ie should not be returned to the dashboard)
-	// Note this does not always imply that the query should not be executed since
-	// the results from a hidden query may be used as the input to other queries (SSE etc)
+	// If hide is set to true, Grafana will filter out the response(s) associated with this query before returning it to the panel.
 	Hide *bool `json:"hide,omitempty"`
 
 	// Specifies the query label selectors.
-	LabelSelector string `json:"labelSelector"`
+	LabelSelector *string `json:"labelSelector,omitempty"`
 
 	// Specifies the type of profile to query.
-	ProfileTypeId string `json:"profileTypeId"`
+	ProfileTypeId *string `json:"profileTypeId,omitempty"`
 
 	// Specify the query flavor
 	// TODO make this required and give it a default
@@ -72,7 +63,7 @@ type ParcaDataQuery struct {
 	// A unique identifier for the query within the list of targets.
 	// In server side expressions, the refId is used as a variable name to identify results.
 	// By default, the UI will assign A->Z; however setting meaningful names may be useful.
-	RefId string `json:"refId"`
+	RefId *string `json:"refId,omitempty"`
 }
 
 // ParcaQueryType defines model for ParcaQueryType.
diff --git a/pkg/tsdb/parca/plugin.go b/pkg/tsdb/parca/plugin.go
index 50bf3a233a9ba..1459d506f0b47 100644
--- a/pkg/tsdb/parca/plugin.go
+++ b/pkg/tsdb/parca/plugin.go
@@ -7,9 +7,9 @@ import (
 	v1alpha1 "buf.build/gen/go/parca-dev/parca/protocolbuffers/go/parca/query/v1alpha1"
 	"github.com/bufbuild/connect-go"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
-	"github.com/grafana/grafana/pkg/infra/httpclient"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
 )
@@ -35,13 +35,16 @@ type ParcaDatasource struct {
 }
 
 // NewParcaDatasource creates a new datasource instance.
-func NewParcaDatasource(ctx context.Context, httpClientProvider httpclient.Provider, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+func NewParcaDatasource(ctx context.Context, httpClientProvider *httpclient.Provider, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+	ctxLogger := logger.FromContext(ctx)
 	opt, err := settings.HTTPClientOptions(ctx)
 	if err != nil {
+		ctxLogger.Error("Failed to get HTTP options", "error", err, "function", logEntrypoint())
 		return nil, err
 	}
 	httpClient, err := httpClientProvider.New(opt)
 	if err != nil {
+		ctxLogger.Error("Failed to create HTTP client", "error", err, "function", logEntrypoint())
 		return nil, err
 	}
 
@@ -58,7 +61,8 @@ func (d *ParcaDatasource) Dispose() {
 }
 
 func (d *ParcaDatasource) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
-	logger.Debug("CallResource", "Path", req.Path, "Method", req.Method, "Body", req.Body)
+	ctxLogger := logger.FromContext(ctx)
+	ctxLogger.Debug("CallResource", "Path", req.Path, "Method", req.Method, "Body", req.Body, "function", logEntrypoint())
 	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.parca.CallResource", trace.WithAttributes(attribute.String("path", req.Path), attribute.String("method", req.Method)))
 	defer span.End()
 
@@ -69,6 +73,7 @@ func (d *ParcaDatasource) CallResource(ctx context.Context, req *backend.CallRes
 		return d.callLabelNames(ctx, req, sender)
 	}
 	if req.Path == "labelValues" {
+		ctxLogger.Debug("CallResource completed", "function", logEntrypoint())
 		return d.callLabelValues(ctx, req, sender)
 	}
 	return sender.Send(&backend.CallResourceResponse{
@@ -81,8 +86,6 @@ func (d *ParcaDatasource) CallResource(ctx context.Context, req *backend.CallRes
 // The QueryDataResponse contains a map of RefID to the response for each query, and each response
 // contains Frames ([]*Frame).
 func (d *ParcaDatasource) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
-	logger.Debug("QueryData called", "queries", req.Queries)
-
 	// create response struct
 	response := backend.NewQueryDataResponse()
 
@@ -103,8 +106,7 @@ func (d *ParcaDatasource) QueryData(ctx context.Context, req *backend.QueryDataR
 // datasource configuration page which allows users to verify that
 // a datasource is working as expected.
 func (d *ParcaDatasource) CheckHealth(ctx context.Context, _ *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
-	logger.Debug("CheckHealth called")
-
+	ctxLogger := logger.FromContext(ctx)
 	status := backend.HealthStatusOk
 	message := "Data source is working"
 
@@ -113,6 +115,7 @@ func (d *ParcaDatasource) CheckHealth(ctx context.Context, _ *backend.CheckHealt
 		message = err.Error()
 	}
 
+	ctxLogger.Debug("CheckHealth completed", "function", logEntrypoint())
 	return &backend.CheckHealthResult{
 		Status:  status,
 		Message: message,
diff --git a/pkg/tsdb/parca/query.go b/pkg/tsdb/parca/query.go
index 83ee24b67697b..97e6a3e1ec5dd 100644
--- a/pkg/tsdb/parca/query.go
+++ b/pkg/tsdb/parca/query.go
@@ -12,6 +12,7 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/utils"
 	"github.com/grafana/grafana/pkg/tsdb/parca/kinds/dataquery"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
@@ -31,6 +32,7 @@ const (
 
 // query processes single Parca query transforming the response to data.Frame packaged in DataResponse
 func (d *ParcaDatasource) query(ctx context.Context, pCtx backend.PluginContext, query backend.DataQuery) backend.DataResponse {
+	ctxLogger := logger.FromContext(ctx)
 	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.parca.query", trace.WithAttributes(attribute.String("query_type", query.QueryType)))
 	defer span.End()
 
@@ -40,6 +42,7 @@ func (d *ParcaDatasource) query(ctx context.Context, pCtx backend.PluginContext,
 	err := json.Unmarshal(query.JSON, &qm)
 	if err != nil {
 		response.Error = err
+		ctxLogger.Error("Failed to unmarshall query", "error", err, "function", logEntrypoint())
 		span.RecordError(response.Error)
 		span.SetStatus(codes.Error, response.Error.Error())
 		return response
@@ -49,18 +52,21 @@ func (d *ParcaDatasource) query(ctx context.Context, pCtx backend.PluginContext,
 		seriesResp, err := d.client.QueryRange(ctx, makeMetricRequest(qm, query))
 		if err != nil {
 			response.Error = err
+			ctxLogger.Error("Failed to process query", "error", err, "queryType", query.QueryType, "function", logEntrypoint())
 			span.RecordError(response.Error)
 			span.SetStatus(codes.Error, response.Error.Error())
 			return response
 		}
-		response.Frames = append(response.Frames, seriesToDataFrame(seriesResp, qm.ProfileTypeId)...)
+
+		response.Frames = append(response.Frames, seriesToDataFrame(seriesResp, utils.Depointerizer(qm.ProfileTypeId))...)
 	}
 
 	if query.QueryType == queryTypeProfile || query.QueryType == queryTypeBoth {
-		logger.Debug("Querying SelectMergeStacktraces()", "queryModel", qm)
+		ctxLogger.Debug("Querying SelectMergeStacktraces()", "queryModel", qm, "function", logEntrypoint())
 		resp, err := d.client.Query(ctx, makeProfileRequest(qm, query))
 		if err != nil {
 			response.Error = err
+			ctxLogger.Error("Failed to process query", "error", err, "queryType", query.QueryType, "function", logEntrypoint())
 			span.RecordError(response.Error)
 			span.SetStatus(codes.Error, response.Error.Error())
 			return response
@@ -78,7 +84,7 @@ func makeProfileRequest(qm queryModel, query backend.DataQuery) *connect.Request
 			Mode: v1alpha1.QueryRequest_MODE_MERGE,
 			Options: &v1alpha1.QueryRequest_Merge{
 				Merge: &v1alpha1.MergeProfile{
-					Query: fmt.Sprintf("%s%s", qm.ProfileTypeId, qm.LabelSelector),
+					Query: fmt.Sprintf("%s%s", utils.Depointerizer(qm.ProfileTypeId), utils.Depointerizer(qm.LabelSelector)),
 					Start: &timestamppb.Timestamp{
 						Seconds: query.TimeRange.From.Unix(),
 					},
@@ -97,7 +103,7 @@ func makeProfileRequest(qm queryModel, query backend.DataQuery) *connect.Request
 func makeMetricRequest(qm queryModel, query backend.DataQuery) *connect.Request[v1alpha1.QueryRangeRequest] {
 	return &connect.Request[v1alpha1.QueryRangeRequest]{
 		Msg: &v1alpha1.QueryRangeRequest{
-			Query: fmt.Sprintf("%s%s", qm.ProfileTypeId, qm.LabelSelector),
+			Query: fmt.Sprintf("%s%s", utils.Depointerizer(qm.ProfileTypeId), utils.Depointerizer(qm.LabelSelector)),
 			Start: &timestamppb.Timestamp{
 				Seconds: query.TimeRange.From.Unix(),
 			},
diff --git a/pkg/tsdb/parca/resources.go b/pkg/tsdb/parca/resources.go
index db27a9bfad43c..f625137d505e6 100644
--- a/pkg/tsdb/parca/resources.go
+++ b/pkg/tsdb/parca/resources.go
@@ -25,10 +25,14 @@ type ProfileType struct {
 }
 
 func (d *ParcaDatasource) callProfileTypes(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	ctxLogger := logger.FromContext(ctx)
+	ctxLogger.Debug("Getting profile types", "function", logEntrypoint())
+
 	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.parca.callProfileTypes")
 	defer span.End()
 	res, err := d.client.ProfileTypes(ctx, connect.NewRequest(&v1alpha1.ProfileTypesRequest{}))
 	if err != nil {
+		ctxLogger.Error("Failed to get profile types", "error", err, "function", logEntrypoint())
 		span.RecordError(err)
 		span.SetStatus(codes.Error, err.Error())
 		return err
@@ -56,24 +60,32 @@ func (d *ParcaDatasource) callProfileTypes(ctx context.Context, req *backend.Cal
 
 	data, err := json.Marshal(types)
 	if err != nil {
+		ctxLogger.Error("Failed to marshal profile types", "error", err, "function", logEntrypoint())
 		span.RecordError(err)
 		span.SetStatus(codes.Error, err.Error())
 		return err
 	}
 	err = sender.Send(&backend.CallResourceResponse{Body: data, Headers: req.Headers, Status: 200})
 	if err != nil {
+		ctxLogger.Error("Failed to send data to Parca", "error", err, "function", logEntrypoint())
 		span.RecordError(err)
 		span.SetStatus(codes.Error, err.Error())
 		return err
 	}
+
+	ctxLogger.Debug("Successfully got profile types", "function", logEntrypoint())
 	return nil
 }
 
 func (d *ParcaDatasource) callLabelNames(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	ctxLogger := logger.FromContext(ctx)
+	ctxLogger.Debug("Getting label names", "function", logEntrypoint())
+
 	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.parca.callLabelNames")
 	defer span.End()
 	res, err := d.client.Labels(ctx, connect.NewRequest(&v1alpha1.LabelsRequest{}))
 	if err != nil {
+		ctxLogger.Error("Failed to get label names", "error", err, "function", logEntrypoint())
 		span.RecordError(err)
 		span.SetStatus(codes.Error, err.Error())
 		return err
@@ -81,49 +93,63 @@ func (d *ParcaDatasource) callLabelNames(ctx context.Context, req *backend.CallR
 
 	data, err := json.Marshal(res.Msg.LabelNames)
 	if err != nil {
+		ctxLogger.Error("Failed to marshal label names", "error", err, "function", logEntrypoint())
 		span.RecordError(err)
 		span.SetStatus(codes.Error, err.Error())
 		return err
 	}
 	err = sender.Send(&backend.CallResourceResponse{Body: data, Headers: req.Headers, Status: 200})
 	if err != nil {
+		ctxLogger.Error("Failed to send data to Parca", "error", err, "function", logEntrypoint())
 		span.RecordError(err)
 		span.SetStatus(codes.Error, err.Error())
 		return err
 	}
+
+	ctxLogger.Debug("Successfully got label names", "function", logEntrypoint())
 	return nil
 }
 
 func (d *ParcaDatasource) callLabelValues(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	ctxLogger := logger.FromContext(ctx)
+	ctxLogger.Debug("Getting label values", "function", logEntrypoint())
+
 	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.parca.callLabelValues")
 	defer span.End()
 	parsedUrl, err := url.Parse(req.URL)
 	if err != nil {
+		ctxLogger.Error("Failed to parse URL", "error", err, "function", logEntrypoint())
 		span.RecordError(err)
 		span.SetStatus(codes.Error, err.Error())
 		return err
 	}
 	label, ok := parsedUrl.Query()["label"]
 	if !ok {
+		ctxLogger.Error("Failed to get label from query", "error", err, "function", logEntrypoint())
 		label = []string{""}
 	}
 	res, err := d.client.Values(ctx, connect.NewRequest(&v1alpha1.ValuesRequest{LabelName: label[0]}))
 	if err != nil {
+		ctxLogger.Error("Failed to get values for given label", "error", err, "function", logEntrypoint())
 		span.RecordError(err)
 		span.SetStatus(codes.Error, err.Error())
 		return err
 	}
 	data, err := json.Marshal(res.Msg.LabelValues)
 	if err != nil {
+		ctxLogger.Error("Failed to marshal label values", "error", err, "function", logEntrypoint())
 		span.RecordError(err)
 		span.SetStatus(codes.Error, err.Error())
 		return err
 	}
 	err = sender.Send(&backend.CallResourceResponse{Body: data, Headers: req.Headers, Status: 200})
 	if err != nil {
+		ctxLogger.Error("Failed to send data to Parca", "error", err, "function", logEntrypoint())
 		span.RecordError(err)
 		span.SetStatus(codes.Error, err.Error())
 		return err
 	}
+
+	ctxLogger.Debug("Successfully got label values", "function", logEntrypoint())
 	return nil
 }
diff --git a/pkg/tsdb/parca/service.go b/pkg/tsdb/parca/service.go
index b47b2ad7abf14..6f6179ed049d8 100644
--- a/pkg/tsdb/parca/service.go
+++ b/pkg/tsdb/parca/service.go
@@ -2,12 +2,15 @@ package parca
 
 import (
 	"context"
+	"fmt"
+	"runtime"
+	"strings"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
-	"github.com/grafana/grafana/pkg/infra/httpclient"
-	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 )
 
 // Make sure ParcaDatasource implements required interfaces. This is important to do
@@ -25,53 +28,104 @@ var (
 	_ backend.CheckHealthHandler  = (*Service)(nil)
 )
 
-var logger = log.New("tsdb.parca")
-
 type Service struct {
-	im instancemgmt.InstanceManager
+	im     instancemgmt.InstanceManager
+	logger log.Logger
+}
+
+var logger = backend.NewLoggerWith("logger", "tsdb.parca")
+
+// Return the file, line, and (full-path) function name of the caller
+func getRunContext() (string, int, string) {
+	pc := make([]uintptr, 10)
+	runtime.Callers(2, pc)
+	f := runtime.FuncForPC(pc[0])
+	file, line := f.FileLine(pc[0])
+	return file, line, f.Name()
+}
+
+// Return a formatted string representing the execution context for the logger
+func logEntrypoint() string {
+	file, line, pathToFunction := getRunContext()
+	parts := strings.Split(pathToFunction, "/")
+	functionName := parts[len(parts)-1]
+	return fmt.Sprintf("%s:%d[%s]", file, line, functionName)
 }
 
 func (s *Service) getInstance(ctx context.Context, pluginCtx backend.PluginContext) (*ParcaDatasource, error) {
+	ctxLogger := s.logger.FromContext(ctx)
 	i, err := s.im.Get(ctx, pluginCtx)
 	if err != nil {
+		ctxLogger.Error("Failed to get instance", "error", err, "pluginID", pluginCtx.PluginID, "function", logEntrypoint())
 		return nil, err
 	}
 	in := i.(*ParcaDatasource)
 	return in, nil
 }
 
-func ProvideService(httpClientProvider httpclient.Provider) *Service {
+func ProvideService(httpClientProvider *httpclient.Provider) *Service {
 	return &Service{
-		im: datasource.NewInstanceManager(newInstanceSettings(httpClientProvider)),
+		im:     datasource.NewInstanceManager(newInstanceSettings(httpClientProvider)),
+		logger: logger,
 	}
 }
 
-func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.InstanceFactoryFunc {
+func newInstanceSettings(httpClientProvider *httpclient.Provider) datasource.InstanceFactoryFunc {
 	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
 		return NewParcaDatasource(ctx, httpClientProvider, settings)
 	}
 }
 
 func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+	ctxLogger := s.logger.FromContext(ctx)
+	ctxLogger.Debug("Processing queries", "queryLength", len(req.Queries), "function", logEntrypoint())
+
 	i, err := s.getInstance(ctx, req.PluginContext)
 	if err != nil {
 		return nil, err
 	}
-	return i.QueryData(ctx, req)
+
+	data, err := i.QueryData(ctx, req)
+	if err != nil {
+		ctxLogger.Error("Received error from Parca", "error", err, "function", logEntrypoint())
+	} else {
+		ctxLogger.Debug("All queries processed", "function", logEntrypoint())
+	}
+	return data, err
 }
 
 func (s *Service) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	ctxLogger := s.logger.FromContext(ctx)
+	ctxLogger.Debug("Calling resource", "path", req.Path, "function", logEntrypoint())
+
 	i, err := s.getInstance(ctx, req.PluginContext)
 	if err != nil {
 		return err
 	}
-	return i.CallResource(ctx, req, sender)
+
+	err = i.CallResource(ctx, req, sender)
+	if err != nil {
+		ctxLogger.Error("Failed to call resource", "error", err, "function", logEntrypoint())
+	} else {
+		ctxLogger.Debug("Resource called", "function", logEntrypoint())
+	}
+	return err
 }
 
 func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
+	ctxLogger := s.logger.FromContext(ctx)
+	ctxLogger.Debug("Checking health", "function", logEntrypoint())
+
 	i, err := s.getInstance(ctx, req.PluginContext)
 	if err != nil {
 		return nil, err
 	}
-	return i.CheckHealth(ctx, req)
+
+	check, err := i.CheckHealth(ctx, req)
+	if err != nil {
+		ctxLogger.Error("Health check failed", "error", err, "function", logEntrypoint())
+	} else {
+		ctxLogger.Debug("Health check succeeded", "function", logEntrypoint())
+	}
+	return check, err
 }
diff --git a/pkg/tsdb/parca/standalone/datasource.go b/pkg/tsdb/parca/standalone/datasource.go
new file mode 100644
index 0000000000000..d5d26a9679ef5
--- /dev/null
+++ b/pkg/tsdb/parca/standalone/datasource.go
@@ -0,0 +1,38 @@
+package main
+
+import (
+	"context"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+	"github.com/grafana/grafana/pkg/tsdb/parca"
+)
+
+var (
+	_ backend.QueryDataHandler    = (*Datasource)(nil)
+	_ backend.CheckHealthHandler  = (*Datasource)(nil)
+	_ backend.CallResourceHandler = (*Datasource)(nil)
+)
+
+func NewDatasource(context.Context, backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+	return &Datasource{
+		Service: parca.ProvideService(httpclient.NewProvider()),
+	}, nil
+}
+
+type Datasource struct {
+	Service *parca.Service
+}
+
+func (d *Datasource) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+	return d.Service.QueryData(ctx, req)
+}
+
+func (d *Datasource) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	return d.Service.CallResource(ctx, req, sender)
+}
+
+func (d *Datasource) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
+	return d.Service.CheckHealth(ctx, req)
+}
diff --git a/pkg/tsdb/parca/standalone/main.go b/pkg/tsdb/parca/standalone/main.go
new file mode 100644
index 0000000000000..e0f12f4ab9e95
--- /dev/null
+++ b/pkg/tsdb/parca/standalone/main.go
@@ -0,0 +1,23 @@
+package main
+
+import (
+	"os"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
+)
+
+func main() {
+	// Start listening to requests sent from Grafana. This call is blocking so
+	// it won't finish until Grafana shuts down the process or the plugin choose
+	// to exit by itself using os.Exit. Manage automatically manages life cycle
+	// of datasource instances. It accepts datasource instance factory as first
+	// argument. This factory will be automatically called on incoming request
+	// from Grafana to create different instances of SampleDatasource (per datasource
+	// ID). When datasource configuration changed Dispose method will be called and
+	// new datasource instance created using NewSampleDatasource factory.
+	if err := datasource.Manage("parca", NewDatasource, datasource.ManageOpts{}); err != nil {
+		log.DefaultLogger.Error(err.Error())
+		os.Exit(1)
+	}
+}
diff --git a/pkg/tsdb/postgres/postgres.go b/pkg/tsdb/postgres/postgres.go
deleted file mode 100644
index b11daefa253d8..0000000000000
--- a/pkg/tsdb/postgres/postgres.go
+++ /dev/null
@@ -1,309 +0,0 @@
-package postgres
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"reflect"
-	"strconv"
-	"strings"
-
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
-	sdkproxy "github.com/grafana/grafana-plugin-sdk-go/backend/proxy"
-	"github.com/grafana/grafana-plugin-sdk-go/data"
-	"github.com/grafana/grafana-plugin-sdk-go/data/sqlutil"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/tsdb/sqleng"
-	"github.com/grafana/grafana/pkg/tsdb/sqleng/proxyutil"
-)
-
-var logger = log.New("tsdb.postgres")
-
-func ProvideService(cfg *setting.Cfg) *Service {
-	s := &Service{
-		tlsManager: newTLSManager(logger, cfg.DataPath),
-	}
-	s.im = datasource.NewInstanceManager(s.newInstanceSettings(cfg))
-	return s
-}
-
-type Service struct {
-	tlsManager tlsSettingsProvider
-	im         instancemgmt.InstanceManager
-}
-
-func (s *Service) getDSInfo(ctx context.Context, pluginCtx backend.PluginContext) (*sqleng.DataSourceHandler, error) {
-	i, err := s.im.Get(ctx, pluginCtx)
-	if err != nil {
-		return nil, err
-	}
-	instance := i.(*sqleng.DataSourceHandler)
-	return instance, nil
-}
-
-func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
-	dsInfo, err := s.getDSInfo(ctx, req.PluginContext)
-	if err != nil {
-		return nil, err
-	}
-	return dsInfo.QueryData(ctx, req)
-}
-
-func (s *Service) newInstanceSettings(cfg *setting.Cfg) datasource.InstanceFactoryFunc {
-	return func(_ context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		logger.Debug("Creating Postgres query endpoint")
-		jsonData := sqleng.JsonData{
-			MaxOpenConns:        cfg.SqlDatasourceMaxOpenConnsDefault,
-			MaxIdleConns:        cfg.SqlDatasourceMaxIdleConnsDefault,
-			ConnMaxLifetime:     cfg.SqlDatasourceMaxConnLifetimeDefault,
-			Timescaledb:         false,
-			ConfigurationMethod: "file-path",
-			SecureDSProxy:       false,
-		}
-
-		err := json.Unmarshal(settings.JSONData, &jsonData)
-		if err != nil {
-			return nil, fmt.Errorf("error reading settings: %w", err)
-		}
-
-		database := jsonData.Database
-		if database == "" {
-			database = settings.Database
-		}
-
-		dsInfo := sqleng.DataSourceInfo{
-			JsonData:                jsonData,
-			URL:                     settings.URL,
-			User:                    settings.User,
-			Database:                database,
-			ID:                      settings.ID,
-			Updated:                 settings.Updated,
-			UID:                     settings.UID,
-			DecryptedSecureJSONData: settings.DecryptedSecureJSONData,
-		}
-
-		cnnstr, err := s.generateConnectionString(dsInfo)
-		if err != nil {
-			return nil, err
-		}
-
-		if cfg.Env == setting.Dev {
-			logger.Debug("GetEngine", "connection", cnnstr)
-		}
-
-		driverName := "postgres"
-		// register a proxy driver if the secure socks proxy is enabled
-		proxyOpts := proxyutil.GetSQLProxyOptions(cfg.SecureSocksDSProxy, dsInfo)
-		if sdkproxy.New(proxyOpts).SecureSocksProxyEnabled() {
-			driverName, err = createPostgresProxyDriver(cnnstr, proxyOpts)
-			if err != nil {
-				return "", nil
-			}
-		}
-
-		config := sqleng.DataPluginConfiguration{
-			DriverName:        driverName,
-			ConnectionString:  cnnstr,
-			DSInfo:            dsInfo,
-			MetricColumnTypes: []string{"UNKNOWN", "TEXT", "VARCHAR", "CHAR"},
-			RowLimit:          cfg.DataProxyRowLimit,
-		}
-
-		queryResultTransformer := postgresQueryResultTransformer{}
-
-		handler, err := sqleng.NewQueryDataHandler(cfg, config, &queryResultTransformer, newPostgresMacroEngine(dsInfo.JsonData.Timescaledb),
-			logger)
-		if err != nil {
-			logger.Error("Failed connecting to Postgres", "err", err)
-			return nil, err
-		}
-
-		logger.Debug("Successfully connected to Postgres")
-		return handler, nil
-	}
-}
-
-// escape single quotes and backslashes in Postgres connection string parameters.
-func escape(input string) string {
-	return strings.ReplaceAll(strings.ReplaceAll(input, `\`, `\\`), "'", `\'`)
-}
-
-func (s *Service) generateConnectionString(dsInfo sqleng.DataSourceInfo) (string, error) {
-	var host string
-	var port int
-	if strings.HasPrefix(dsInfo.URL, "/") {
-		host = dsInfo.URL
-		logger.Debug("Generating connection string with Unix socket specifier", "socket", host)
-	} else {
-		index := strings.LastIndex(dsInfo.URL, ":")
-		v6Index := strings.Index(dsInfo.URL, "]")
-		sp := strings.SplitN(dsInfo.URL, ":", 2)
-		host = sp[0]
-		if v6Index == -1 {
-			if len(sp) > 1 {
-				var err error
-				port, err = strconv.Atoi(sp[1])
-				if err != nil {
-					return "", fmt.Errorf("invalid port in host specifier %q: %w", sp[1], err)
-				}
-
-				logger.Debug("Generating connection string with network host/port pair", "host", host, "port", port)
-			} else {
-				logger.Debug("Generating connection string with network host", "host", host)
-			}
-		} else {
-			if index == v6Index+1 {
-				host = dsInfo.URL[1 : index-1]
-				var err error
-				port, err = strconv.Atoi(dsInfo.URL[index+1:])
-				if err != nil {
-					return "", fmt.Errorf("invalid port in host specifier %q: %w", dsInfo.URL[index+1:], err)
-				}
-
-				logger.Debug("Generating ipv6 connection string with network host/port pair", "host", host, "port", port)
-			} else {
-				host = dsInfo.URL[1 : len(dsInfo.URL)-1]
-				logger.Debug("Generating ipv6 connection string with network host", "host", host)
-			}
-		}
-	}
-
-	connStr := fmt.Sprintf("user='%s' password='%s' host='%s' dbname='%s'",
-		escape(dsInfo.User), escape(dsInfo.DecryptedSecureJSONData["password"]), escape(host), escape(dsInfo.Database))
-	if port > 0 {
-		connStr += fmt.Sprintf(" port=%d", port)
-	}
-
-	tlsSettings, err := s.tlsManager.getTLSSettings(dsInfo)
-	if err != nil {
-		return "", err
-	}
-
-	connStr += fmt.Sprintf(" sslmode='%s'", escape(tlsSettings.Mode))
-
-	// Attach root certificate if provided
-	if tlsSettings.RootCertFile != "" {
-		logger.Debug("Setting server root certificate", "tlsRootCert", tlsSettings.RootCertFile)
-		connStr += fmt.Sprintf(" sslrootcert='%s'", escape(tlsSettings.RootCertFile))
-	}
-
-	// Attach client certificate and key if both are provided
-	if tlsSettings.CertFile != "" && tlsSettings.CertKeyFile != "" {
-		logger.Debug("Setting TLS/SSL client auth", "tlsCert", tlsSettings.CertFile, "tlsKey", tlsSettings.CertKeyFile)
-		connStr += fmt.Sprintf(" sslcert='%s' sslkey='%s'", escape(tlsSettings.CertFile), escape(tlsSettings.CertKeyFile))
-	} else if tlsSettings.CertFile != "" || tlsSettings.CertKeyFile != "" {
-		return "", fmt.Errorf("TLS/SSL client certificate and key must both be specified")
-	}
-
-	logger.Debug("Generated Postgres connection string successfully")
-	return connStr, nil
-}
-
-type postgresQueryResultTransformer struct{}
-
-func (t *postgresQueryResultTransformer) TransformQueryError(_ log.Logger, err error) error {
-	return err
-}
-
-// CheckHealth pings the connected SQL database
-func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
-	dsHandler, err := s.getDSInfo(ctx, req.PluginContext)
-	if err != nil {
-		return nil, err
-	}
-
-	err = dsHandler.Ping()
-
-	if err != nil {
-		logger.Error("Check health failed", "error", err)
-		return &backend.CheckHealthResult{Status: backend.HealthStatusError, Message: dsHandler.TransformQueryError(logger, err).Error()}, nil
-	}
-
-	return &backend.CheckHealthResult{Status: backend.HealthStatusOk, Message: "Database Connection OK"}, nil
-}
-
-func (t *postgresQueryResultTransformer) GetConverterList() []sqlutil.StringConverter {
-	return []sqlutil.StringConverter{
-		{
-			Name:           "handle FLOAT4",
-			InputScanKind:  reflect.Interface,
-			InputTypeName:  "FLOAT4",
-			ConversionFunc: func(in *string) (*string, error) { return in, nil },
-			Replacer: &sqlutil.StringFieldReplacer{
-				OutputFieldType: data.FieldTypeNullableFloat64,
-				ReplaceFunc: func(in *string) (any, error) {
-					if in == nil {
-						return nil, nil
-					}
-					v, err := strconv.ParseFloat(*in, 64)
-					if err != nil {
-						return nil, err
-					}
-					return &v, nil
-				},
-			},
-		},
-		{
-			Name:           "handle FLOAT8",
-			InputScanKind:  reflect.Interface,
-			InputTypeName:  "FLOAT8",
-			ConversionFunc: func(in *string) (*string, error) { return in, nil },
-			Replacer: &sqlutil.StringFieldReplacer{
-				OutputFieldType: data.FieldTypeNullableFloat64,
-				ReplaceFunc: func(in *string) (any, error) {
-					if in == nil {
-						return nil, nil
-					}
-					v, err := strconv.ParseFloat(*in, 64)
-					if err != nil {
-						return nil, err
-					}
-					return &v, nil
-				},
-			},
-		},
-		{
-			Name:           "handle NUMERIC",
-			InputScanKind:  reflect.Interface,
-			InputTypeName:  "NUMERIC",
-			ConversionFunc: func(in *string) (*string, error) { return in, nil },
-			Replacer: &sqlutil.StringFieldReplacer{
-				OutputFieldType: data.FieldTypeNullableFloat64,
-				ReplaceFunc: func(in *string) (any, error) {
-					if in == nil {
-						return nil, nil
-					}
-					v, err := strconv.ParseFloat(*in, 64)
-					if err != nil {
-						return nil, err
-					}
-					return &v, nil
-				},
-			},
-		},
-		{
-			Name:           "handle INT2",
-			InputScanKind:  reflect.Interface,
-			InputTypeName:  "INT2",
-			ConversionFunc: func(in *string) (*string, error) { return in, nil },
-			Replacer: &sqlutil.StringFieldReplacer{
-				OutputFieldType: data.FieldTypeNullableInt16,
-				ReplaceFunc: func(in *string) (any, error) {
-					if in == nil {
-						return nil, nil
-					}
-					i64, err := strconv.ParseInt(*in, 10, 16)
-					if err != nil {
-						return nil, err
-					}
-					v := int16(i64)
-					return &v, nil
-				},
-			},
-		},
-	}
-}
diff --git a/pkg/tsdb/postgres/proxy.go b/pkg/tsdb/postgres/proxy.go
deleted file mode 100644
index f7ceaeb023709..0000000000000
--- a/pkg/tsdb/postgres/proxy.go
+++ /dev/null
@@ -1,106 +0,0 @@
-package postgres
-
-import (
-	"context"
-	"database/sql"
-	"database/sql/driver"
-	"net"
-	"time"
-
-	sdkproxy "github.com/grafana/grafana-plugin-sdk-go/backend/proxy"
-	"github.com/grafana/grafana/pkg/tsdb/sqleng"
-	"github.com/grafana/grafana/pkg/util"
-	"github.com/lib/pq"
-	"golang.org/x/net/proxy"
-	"xorm.io/core"
-)
-
-// createPostgresProxyDriver creates and registers a new sql driver that uses a postgres connector and updates the dialer to
-// route connections through the secure socks proxy
-func createPostgresProxyDriver(cnnstr string, opts *sdkproxy.Options) (string, error) {
-	sqleng.XormDriverMu.Lock()
-	defer sqleng.XormDriverMu.Unlock()
-
-	// create a unique driver per connection string
-	hash, err := util.Md5SumString(cnnstr)
-	if err != nil {
-		return "", err
-	}
-	driverName := "postgres-proxy-" + hash
-
-	// only register the driver once
-	if core.QueryDriver(driverName) == nil {
-		connector, err := pq.NewConnector(cnnstr)
-		if err != nil {
-			return "", err
-		}
-
-		driver, err := newPostgresProxyDriver(connector, opts)
-		if err != nil {
-			return "", err
-		}
-
-		sql.Register(driverName, driver)
-		core.RegisterDriver(driverName, driver)
-	}
-	return driverName, nil
-}
-
-// postgresProxyDriver is a regular postgres driver with an updated dialer.
-// This is done because there is no way to save a dialer to the postgres driver in xorm
-type postgresProxyDriver struct {
-	c *pq.Connector
-}
-
-var _ driver.DriverContext = (*postgresProxyDriver)(nil)
-var _ core.Driver = (*postgresProxyDriver)(nil)
-
-// newPostgresProxyDriver updates the dialer for a postgres connector with a dialer that proxies connections through the secure socks proxy
-// and returns a new postgres driver to register
-func newPostgresProxyDriver(connector *pq.Connector, opts *sdkproxy.Options) (*postgresProxyDriver, error) {
-	dialer, err := sdkproxy.New(opts).NewSecureSocksProxyContextDialer()
-	if err != nil {
-		return nil, err
-	}
-
-	// update the postgres dialer with the proxy dialer
-	connector.Dialer(&postgresProxyDialer{d: dialer})
-
-	return &postgresProxyDriver{connector}, nil
-}
-
-// postgresProxyDialer implements the postgres dialer using a proxy dialer, as their functions differ slightly
-type postgresProxyDialer struct {
-	d proxy.Dialer
-}
-
-// Dial uses the normal proxy dial function with the updated dialer
-func (p *postgresProxyDialer) Dial(network, addr string) (c net.Conn, err error) {
-	return p.d.Dial(network, addr)
-}
-
-// DialTimeout uses the normal postgres dial timeout function with the updated dialer
-func (p *postgresProxyDialer) DialTimeout(network, address string, timeout time.Duration) (net.Conn, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), timeout)
-	defer cancel()
-
-	return p.d.(proxy.ContextDialer).DialContext(ctx, network, address)
-}
-
-// Parse uses the xorm postgres dialect for the driver (this has to be implemented to register the driver with xorm)
-func (d *postgresProxyDriver) Parse(a string, b string) (*core.Uri, error) {
-	sqleng.XormDriverMu.RLock()
-	defer sqleng.XormDriverMu.RUnlock()
-
-	return core.QueryDriver("postgres").Parse(a, b)
-}
-
-// OpenConnector returns the normal postgres connector that has the updated dialer context
-func (d *postgresProxyDriver) OpenConnector(name string) (driver.Connector, error) {
-	return d.c, nil
-}
-
-// Open uses the connector with the updated dialer to open a new connection
-func (d *postgresProxyDriver) Open(dsn string) (driver.Conn, error) {
-	return d.c.Connect(context.Background())
-}
diff --git a/pkg/tsdb/postgres/proxy_test.go b/pkg/tsdb/postgres/proxy_test.go
deleted file mode 100644
index 7b4f12be518d8..0000000000000
--- a/pkg/tsdb/postgres/proxy_test.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package postgres
-
-import (
-	"context"
-	"fmt"
-	"testing"
-
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/tsdb/sqleng"
-	"github.com/grafana/grafana/pkg/tsdb/sqleng/proxyutil"
-	"github.com/lib/pq"
-	"github.com/stretchr/testify/require"
-	"xorm.io/core"
-)
-
-func TestPostgresProxyDriver(t *testing.T) {
-	dialect := "postgres"
-	settings := proxyutil.SetupTestSecureSocksProxySettings(t)
-	proxySettings := setting.SecureSocksDSProxySettings{
-		Enabled:      true,
-		ClientCert:   settings.ClientCert,
-		ClientKey:    settings.ClientKey,
-		RootCA:       settings.RootCA,
-		ProxyAddress: settings.ProxyAddress,
-		ServerName:   settings.ServerName,
-	}
-	opts := proxyutil.GetSQLProxyOptions(proxySettings, sqleng.DataSourceInfo{UID: "1", JsonData: sqleng.JsonData{SecureDSProxy: true}})
-	dbURL := "localhost:5432"
-	cnnstr := fmt.Sprintf("postgres://auser:password@%s/db?sslmode=disable", dbURL)
-	driverName, err := createPostgresProxyDriver(cnnstr, opts)
-	require.NoError(t, err)
-
-	t.Run("Driver should not be registered more than once", func(t *testing.T) {
-		testDriver, err := createPostgresProxyDriver(cnnstr, opts)
-		require.NoError(t, err)
-		require.Equal(t, driverName, testDriver)
-	})
-
-	t.Run("A new driver should be created for a new connection string", func(t *testing.T) {
-		testDriver, err := createPostgresProxyDriver("server=localhost;user id=sa;password=yourStrong(!)Password;database=db2", opts)
-		require.NoError(t, err)
-		require.NotEqual(t, driverName, testDriver)
-	})
-
-	t.Run("Parse should have the same result as xorm mssql parse", func(t *testing.T) {
-		xormDriver := core.QueryDriver(dialect)
-		xormResult, err := xormDriver.Parse(dialect, cnnstr)
-		require.NoError(t, err)
-
-		xormNewDriver := core.QueryDriver(driverName)
-		xormNewResult, err := xormNewDriver.Parse(dialect, cnnstr)
-		require.NoError(t, err)
-		require.Equal(t, xormResult, xormNewResult)
-	})
-
-	t.Run("Connector should use dialer context that routes through the socks proxy to db", func(t *testing.T) {
-		connector, err := pq.NewConnector(cnnstr)
-		require.NoError(t, err)
-		driver, err := newPostgresProxyDriver(connector, opts)
-		require.NoError(t, err)
-
-		conn, err := driver.OpenConnector(cnnstr)
-		require.NoError(t, err)
-
-		_, err = conn.Connect(context.Background())
-		require.Contains(t, err.Error(), fmt.Sprintf("socks connect %s %s->%s", "tcp", settings.ProxyAddress, dbURL))
-	})
-
-	t.Run("Connector should use dialer context that routes through the socks proxy to db", func(t *testing.T) {
-		connector, err := pq.NewConnector(cnnstr)
-		require.NoError(t, err)
-		driver, err := newPostgresProxyDriver(connector, opts)
-		require.NoError(t, err)
-
-		conn, err := driver.OpenConnector(cnnstr)
-		require.NoError(t, err)
-
-		_, err = conn.Connect(context.Background())
-		require.Contains(t, err.Error(), fmt.Sprintf("socks connect %s %s->%s", "tcp", settings.ProxyAddress, dbURL))
-	})
-}
diff --git a/pkg/tsdb/prometheus/azureauth/azure.go b/pkg/tsdb/prometheus/azureauth/azure.go
index 5b0f9a98a641b..7bdedf5e448c7 100644
--- a/pkg/tsdb/prometheus/azureauth/azure.go
+++ b/pkg/tsdb/prometheus/azureauth/azure.go
@@ -5,22 +5,14 @@ import (
 	"net/url"
 	"path"
 
-	"github.com/grafana/grafana-azure-sdk-go/azcredentials"
-	"github.com/grafana/grafana-azure-sdk-go/azhttpclient"
-	"github.com/grafana/grafana-azure-sdk-go/azsettings"
-	"github.com/grafana/grafana-azure-sdk-go/util/maputil"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azcredentials"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azhttpclient"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+	"github.com/grafana/grafana-plugin-sdk-go/data/utils/maputil"
 
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/utils"
-)
-
-var (
-	azurePrometheusScopes = map[string][]string{
-		azsettings.AzurePublic:       {"https://prometheus.monitor.azure.com/.default"},
-		azsettings.AzureChina:        {"https://prometheus.monitor.azure.cn/.default"},
-		azsettings.AzureUSGovernment: {"https://prometheus.monitor.azure.us/.default"},
-	}
+	"github.com/grafana/grafana/pkg/promlib/utils"
 )
 
 func ConfigureAzureAuthentication(settings backend.DataSourceInstanceSettings, azureSettings *azsettings.AzureSettings, clientOpts *sdkhttpclient.Options) error {
@@ -82,11 +74,28 @@ func getPrometheusScopes(settings *azsettings.AzureSettings, credentials azcrede
 		return nil, err
 	}
 
+	cloudSettings, err := settings.GetCloud(azureCloud)
+	if err != nil {
+		return nil, err
+	}
+
 	// Get scopes for the given cloud
-	if scopes, ok := azurePrometheusScopes[azureCloud]; !ok {
-		err := fmt.Errorf("the Azure cloud '%s' not supported by Prometheus datasource", azureCloud)
+	resourceIdS, ok := cloudSettings.Properties["prometheusResourceId"]
+	if !ok {
+		err := fmt.Errorf("the Azure cloud '%s' doesn't have configuration for Prometheus", azureCloud)
+		return nil, err
+	}
+	return audienceToScopes(resourceIdS)
+}
+
+func audienceToScopes(audience string) ([]string, error) {
+	resourceId, err := url.Parse(audience)
+	if err != nil || resourceId.Scheme == "" || resourceId.Host == "" {
+		err = fmt.Errorf("endpoint resource ID (audience) '%s' invalid", audience)
 		return nil, err
-	} else {
-		return scopes, nil
 	}
+
+	resourceId.Path = path.Join(resourceId.Path, ".default")
+	scopes := []string{resourceId.String()}
+	return scopes, nil
 }
diff --git a/pkg/tsdb/prometheus/azureauth/azure_test.go b/pkg/tsdb/prometheus/azureauth/azure_test.go
index 7a35300d183e5..7de7de193cb29 100644
--- a/pkg/tsdb/prometheus/azureauth/azure_test.go
+++ b/pkg/tsdb/prometheus/azureauth/azure_test.go
@@ -3,19 +3,16 @@ package azureauth
 import (
 	"testing"
 
-	"github.com/grafana/grafana-azure-sdk-go/azsettings"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azcredentials"
+	"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/setting"
 )
 
 func TestConfigureAzureAuthentication(t *testing.T) {
-	cfg := &setting.Cfg{
-		Azure: &azsettings.AzureSettings{},
-	}
+	azureSettings := &azsettings.AzureSettings{}
 
 	t.Run("should set Azure middleware when JsonData contains valid credentials", func(t *testing.T) {
 		settings := backend.DataSourceInstanceSettings{
@@ -29,7 +26,7 @@ func TestConfigureAzureAuthentication(t *testing.T) {
 
 		var opts = &sdkhttpclient.Options{CustomOptions: map[string]any{}}
 
-		err := ConfigureAzureAuthentication(settings, cfg.Azure, opts)
+		err := ConfigureAzureAuthentication(settings, azureSettings, opts)
 		require.NoError(t, err)
 
 		require.NotNil(t, opts.Middlewares)
@@ -43,7 +40,7 @@ func TestConfigureAzureAuthentication(t *testing.T) {
 
 		var opts = &sdkhttpclient.Options{CustomOptions: map[string]any{}}
 
-		err := ConfigureAzureAuthentication(settings, cfg.Azure, opts)
+		err := ConfigureAzureAuthentication(settings, azureSettings, opts)
 		require.NoError(t, err)
 
 		assert.NotContains(t, opts.CustomOptions, "_azureCredentials")
@@ -58,7 +55,7 @@ func TestConfigureAzureAuthentication(t *testing.T) {
 		}
 
 		var opts = &sdkhttpclient.Options{CustomOptions: map[string]any{}}
-		err := ConfigureAzureAuthentication(settings, cfg.Azure, opts)
+		err := ConfigureAzureAuthentication(settings, azureSettings, opts)
 		assert.Error(t, err)
 	})
 
@@ -74,7 +71,7 @@ func TestConfigureAzureAuthentication(t *testing.T) {
 		}
 		var opts = &sdkhttpclient.Options{CustomOptions: map[string]any{}}
 
-		err := ConfigureAzureAuthentication(settings, cfg.Azure, opts)
+		err := ConfigureAzureAuthentication(settings, azureSettings, opts)
 		require.NoError(t, err)
 
 		require.NotNil(t, opts.Middlewares)
@@ -90,7 +87,7 @@ func TestConfigureAzureAuthentication(t *testing.T) {
 		}
 		var opts = &sdkhttpclient.Options{CustomOptions: map[string]any{}}
 
-		err := ConfigureAzureAuthentication(settings, cfg.Azure, opts)
+		err := ConfigureAzureAuthentication(settings, azureSettings, opts)
 		require.NoError(t, err)
 
 		if opts.Middlewares != nil {
@@ -111,7 +108,33 @@ func TestConfigureAzureAuthentication(t *testing.T) {
 
 		var opts = &sdkhttpclient.Options{CustomOptions: map[string]any{}}
 
-		err := ConfigureAzureAuthentication(settings, cfg.Azure, opts)
+		err := ConfigureAzureAuthentication(settings, azureSettings, opts)
 		assert.Error(t, err)
 	})
 }
+
+func TestGetPrometheusScopes(t *testing.T) {
+	azureSettings := &azsettings.AzureSettings{
+		Cloud: azsettings.AzureUSGovernment,
+	}
+
+	t.Run("should return scopes for cloud from settings with MSI credentials", func(t *testing.T) {
+		credentials := &azcredentials.AzureManagedIdentityCredentials{}
+		scopes, err := getPrometheusScopes(azureSettings, credentials)
+		require.NoError(t, err)
+
+		assert.NotNil(t, scopes)
+		assert.Len(t, scopes, 1)
+		assert.Equal(t, "https://prometheus.monitor.azure.us/.default", scopes[0])
+	})
+
+	t.Run("should return scopes for cloud from client secret credentials", func(t *testing.T) {
+		credentials := &azcredentials.AzureClientSecretCredentials{AzureCloud: azsettings.AzureChina}
+		scopes, err := getPrometheusScopes(azureSettings, credentials)
+		require.NoError(t, err)
+
+		assert.NotNil(t, scopes)
+		assert.Len(t, scopes, 1)
+		assert.Equal(t, "https://prometheus.monitor.azure.cn/.default", scopes[0])
+	})
+}
diff --git a/pkg/tsdb/prometheus/client/client.go b/pkg/tsdb/prometheus/client/client.go
deleted file mode 100644
index 47a5969d37391..0000000000000
--- a/pkg/tsdb/prometheus/client/client.go
+++ /dev/null
@@ -1,172 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"context"
-	"io"
-	"net/http"
-	"net/url"
-	"path"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/models"
-)
-
-type doer interface {
-	Do(req *http.Request) (*http.Response, error)
-}
-
-// Client is a custom Prometheus client. Reason for this is that Prom Go client serializes response into its own
-// objects, we have to go through them and then serialize again into DataFrame which isn't very efficient. Using custom
-// client we can parse response directly into DataFrame.
-type Client struct {
-	doer    doer
-	method  string
-	baseUrl string
-}
-
-func NewClient(d doer, method, baseUrl string) *Client {
-	return &Client{doer: d, method: method, baseUrl: baseUrl}
-}
-
-func (c *Client) QueryRange(ctx context.Context, q *models.Query) (*http.Response, error) {
-	tr := q.TimeRange()
-	qv := map[string]string{
-		"query": q.Expr,
-		"start": formatTime(tr.Start),
-		"end":   formatTime(tr.End),
-		"step":  strconv.FormatFloat(tr.Step.Seconds(), 'f', -1, 64),
-	}
-
-	req, err := c.createQueryRequest(ctx, "api/v1/query_range", qv)
-	if err != nil {
-		return nil, err
-	}
-
-	return c.doer.Do(req)
-}
-
-func (c *Client) QueryInstant(ctx context.Context, q *models.Query) (*http.Response, error) {
-	// We do not need a time range here.
-	// Instant query evaluates at a single point in time.
-	// Using q.TimeRange is aligning the query range to step.
-	// Which causes a misleading time point.
-	// Instead of aligning we use time point directly.
-	// https://prometheus.io/docs/prometheus/latest/querying/api/#instant-queries
-	qv := map[string]string{"query": q.Expr, "time": formatTime(q.End)}
-	req, err := c.createQueryRequest(ctx, "api/v1/query", qv)
-	if err != nil {
-		return nil, err
-	}
-
-	return c.doer.Do(req)
-}
-
-func (c *Client) QueryExemplars(ctx context.Context, q *models.Query) (*http.Response, error) {
-	tr := q.TimeRange()
-	qv := map[string]string{
-		"query": q.Expr,
-		"start": formatTime(tr.Start),
-		"end":   formatTime(tr.End),
-	}
-
-	req, err := c.createQueryRequest(ctx, "api/v1/query_exemplars", qv)
-	if err != nil {
-		return nil, err
-	}
-
-	return c.doer.Do(req)
-}
-
-func (c *Client) QueryResource(ctx context.Context, req *backend.CallResourceRequest) (*http.Response, error) {
-	// The way URL is represented in CallResourceRequest and what we need for the fetch function is different
-	// so here we have to do a bit of parsing, so we can then compose it with the base url in correct way.
-	reqUrlParsed, err := url.Parse(req.URL)
-	if err != nil {
-		return nil, err
-	}
-	u, err := c.createUrl(req.Path, nil)
-	if err != nil {
-		return nil, err
-	}
-	u.RawQuery = reqUrlParsed.RawQuery
-
-	// We use method from the request, as for resources front end may do a fallback to GET if POST does not work
-	// nad we want to respect that.
-	httpRequest, err := createRequest(ctx, req.Method, u, bytes.NewReader(req.Body))
-	if err != nil {
-		return nil, err
-	}
-
-	return c.doer.Do(httpRequest)
-}
-
-func (c *Client) createQueryRequest(ctx context.Context, endpoint string, qv map[string]string) (*http.Request, error) {
-	if strings.ToUpper(c.method) == http.MethodPost {
-		u, err := c.createUrl(endpoint, nil)
-		if err != nil {
-			return nil, err
-		}
-
-		v := make(url.Values)
-		for key, val := range qv {
-			v.Set(key, val)
-		}
-
-		return createRequest(ctx, c.method, u, strings.NewReader(v.Encode()))
-	}
-
-	u, err := c.createUrl(endpoint, qv)
-	if err != nil {
-		return nil, err
-	}
-
-	return createRequest(ctx, c.method, u, http.NoBody)
-}
-
-func (c *Client) createUrl(endpoint string, qs map[string]string) (*url.URL, error) {
-	finalUrl, err := url.ParseRequestURI(c.baseUrl)
-	if err != nil {
-		return nil, err
-	}
-
-	finalUrl.Path = path.Join(finalUrl.Path, endpoint)
-
-	// don't re-encode the Query if not needed
-	if len(qs) != 0 {
-		urlQuery := finalUrl.Query()
-
-		for key, val := range qs {
-			urlQuery.Set(key, val)
-		}
-
-		finalUrl.RawQuery = urlQuery.Encode()
-	}
-
-	return finalUrl, nil
-}
-
-func createRequest(ctx context.Context, method string, u *url.URL, bodyReader io.Reader) (*http.Request, error) {
-	request, err := http.NewRequestWithContext(ctx, method, u.String(), bodyReader)
-	if err != nil {
-		return nil, err
-	}
-
-	if strings.ToUpper(method) == http.MethodPost {
-		// This may not be true but right now we don't have more information here and seems like we send just this type
-		// of encoding right now if it is a POST
-		request.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-		// This allows transport to retry request. See https://github.com/prometheus/client_golang/pull/1022
-		// It's set to nil so it is not actually sent over the wire, just used in Go http lib to retry requests.
-		request.Header["Idempotency-Key"] = nil
-	}
-	return request, nil
-}
-
-func formatTime(t time.Time) string {
-	return strconv.FormatFloat(float64(t.Unix())+float64(t.Nanosecond())/1e9, 'f', -1, 64)
-}
diff --git a/pkg/tsdb/prometheus/client/client_test.go b/pkg/tsdb/prometheus/client/client_test.go
deleted file mode 100644
index 920baf81dfb8a..0000000000000
--- a/pkg/tsdb/prometheus/client/client_test.go
+++ /dev/null
@@ -1,141 +0,0 @@
-package client
-
-import (
-	"context"
-	"io"
-	"net/http"
-	"testing"
-	"time"
-
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/models"
-)
-
-type MockDoer struct {
-	Req *http.Request
-}
-
-func (doer *MockDoer) Do(req *http.Request) (*http.Response, error) {
-	doer.Req = req
-	return &http.Response{
-		StatusCode: http.StatusOK,
-		Status:     "200 OK",
-	}, nil
-}
-
-func TestClient(t *testing.T) {
-	t.Run("QueryResource", func(t *testing.T) {
-		doer := &MockDoer{}
-		// The method here does not really matter for resource calls
-		client := NewClient(doer, http.MethodGet, "http://localhost:9090")
-
-		t.Run("sends correct POST request", func(t *testing.T) {
-			req := &backend.CallResourceRequest{
-				PluginContext: backend.PluginContext{},
-				Path:          "/api/v1/series",
-				Method:        http.MethodPost,
-				URL:           "/api/v1/series",
-				Body:          []byte("match%5B%5D: ALERTS\nstart: 1655271408\nend: 1655293008"),
-			}
-			res, err := client.QueryResource(context.Background(), req)
-			defer func() {
-				if res != nil && res.Body != nil {
-					if err := res.Body.Close(); err != nil {
-						logger.Warn("Error", "err", err)
-					}
-				}
-			}()
-			require.NoError(t, err)
-			require.NotNil(t, doer.Req)
-			require.Equal(t, http.MethodPost, doer.Req.Method)
-			body, err := io.ReadAll(doer.Req.Body)
-			require.NoError(t, err)
-			require.Equal(t, []byte("match%5B%5D: ALERTS\nstart: 1655271408\nend: 1655293008"), body)
-			require.Equal(t, "http://localhost:9090/api/v1/series", doer.Req.URL.String())
-		})
-
-		t.Run("sends correct GET request", func(t *testing.T) {
-			req := &backend.CallResourceRequest{
-				PluginContext: backend.PluginContext{},
-				Path:          "/api/v1/series",
-				Method:        http.MethodGet,
-				URL:           "api/v1/series?match%5B%5D=ALERTS&start=1655272558&end=1655294158",
-			}
-			res, err := client.QueryResource(context.Background(), req)
-			defer func() {
-				if res != nil && res.Body != nil {
-					if err := res.Body.Close(); err != nil {
-						logger.Warn("Error", "err", err)
-					}
-				}
-			}()
-			require.NoError(t, err)
-			require.NotNil(t, doer.Req)
-			require.Equal(t, http.MethodGet, doer.Req.Method)
-			body, err := io.ReadAll(doer.Req.Body)
-			require.NoError(t, err)
-			require.Equal(t, []byte{}, body)
-			require.Equal(t, "http://localhost:9090/api/v1/series?match%5B%5D=ALERTS&start=1655272558&end=1655294158", doer.Req.URL.String())
-		})
-	})
-
-	t.Run("QueryRange", func(t *testing.T) {
-		doer := &MockDoer{}
-
-		t.Run("sends correct POST query", func(t *testing.T) {
-			client := NewClient(doer, http.MethodPost, "http://localhost:9090")
-			req := &models.Query{
-				Expr:       "rate(ALERTS{job=\"test\" [$__rate_interval]})",
-				Start:      time.Unix(0, 0),
-				End:        time.Unix(1234, 0),
-				RangeQuery: true,
-				Step:       1 * time.Second,
-			}
-			res, err := client.QueryRange(context.Background(), req)
-			defer func() {
-				if res != nil && res.Body != nil {
-					if err := res.Body.Close(); err != nil {
-						logger.Warn("Error", "err", err)
-					}
-				}
-			}()
-			require.NoError(t, err)
-			require.NotNil(t, doer.Req)
-			require.Equal(t, http.MethodPost, doer.Req.Method)
-			require.Equal(t, "application/x-www-form-urlencoded", doer.Req.Header.Get("Content-Type"))
-			body, err := io.ReadAll(doer.Req.Body)
-			require.NoError(t, err)
-			require.Equal(t, []byte("end=1234&query=rate%28ALERTS%7Bjob%3D%22test%22+%5B%24__rate_interval%5D%7D%29&start=0&step=1"), body)
-			require.Equal(t, "http://localhost:9090/api/v1/query_range", doer.Req.URL.String())
-		})
-
-		t.Run("sends correct GET query", func(t *testing.T) {
-			client := NewClient(doer, http.MethodGet, "http://localhost:9090")
-			req := &models.Query{
-				Expr:       "rate(ALERTS{job=\"test\" [$__rate_interval]})",
-				Start:      time.Unix(0, 0),
-				End:        time.Unix(1234, 0),
-				RangeQuery: true,
-				Step:       1 * time.Second,
-			}
-			res, err := client.QueryRange(context.Background(), req)
-			defer func() {
-				if res != nil && res.Body != nil {
-					if err := res.Body.Close(); err != nil {
-						logger.Warn("Error", "err", err)
-					}
-				}
-			}()
-			require.NoError(t, err)
-			require.NotNil(t, doer.Req)
-			require.Equal(t, http.MethodGet, doer.Req.Method)
-			body, err := io.ReadAll(doer.Req.Body)
-			require.NoError(t, err)
-			require.Equal(t, []byte{}, body)
-			require.Equal(t, "http://localhost:9090/api/v1/query_range?end=1234&query=rate%28ALERTS%7Bjob%3D%22test%22+%5B%24__rate_interval%5D%7D%29&start=0&step=1", doer.Req.URL.String())
-		})
-	})
-}
diff --git a/pkg/tsdb/prometheus/client/transport.go b/pkg/tsdb/prometheus/client/transport.go
deleted file mode 100644
index 1776e5ef370fd..0000000000000
--- a/pkg/tsdb/prometheus/client/transport.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package client
-
-import (
-	"context"
-	"fmt"
-	"strings"
-
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
-
-	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/azureauth"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/middleware"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/utils"
-	"github.com/grafana/grafana/pkg/util/maputil"
-)
-
-// CreateTransportOptions creates options for the http client. Probably should be shared and should not live in the
-// buffered package.
-func CreateTransportOptions(ctx context.Context, settings backend.DataSourceInstanceSettings, cfg *setting.Cfg, logger log.Logger) (*sdkhttpclient.Options, error) {
-	opts, err := settings.HTTPClientOptions(ctx)
-	if err != nil {
-		return nil, fmt.Errorf("error getting HTTP options: %w", err)
-	}
-
-	jsonData, err := utils.GetJsonData(settings)
-	if err != nil {
-		return nil, fmt.Errorf("error reading settings: %w", err)
-	}
-	httpMethod, _ := maputil.GetStringOptional(jsonData, "httpMethod")
-
-	opts.Middlewares = middlewares(logger, httpMethod)
-
-	// Set SigV4 service namespace
-	if opts.SigV4 != nil {
-		opts.SigV4.Service = "aps"
-	}
-
-	// Set Azure authentication
-	if cfg.AzureAuthEnabled {
-		err = azureauth.ConfigureAzureAuthentication(settings, cfg.Azure, &opts)
-		if err != nil {
-			return nil, fmt.Errorf("error configuring Azure auth: %v", err)
-		}
-	}
-
-	return &opts, nil
-}
-
-func middlewares(logger log.Logger, httpMethod string) []sdkhttpclient.Middleware {
-	middlewares := []sdkhttpclient.Middleware{
-		// TODO: probably isn't needed anymore and should by done by http infra code
-		middleware.CustomQueryParameters(logger),
-		sdkhttpclient.CustomHeadersMiddleware(),
-	}
-
-	// Needed to control GET vs POST method of the requests
-	if strings.ToLower(httpMethod) == "get" {
-		middlewares = append(middlewares, middleware.ForceHttpGet(logger))
-	}
-
-	return middlewares
-}
diff --git a/pkg/tsdb/prometheus/client/transport_test.go b/pkg/tsdb/prometheus/client/transport_test.go
deleted file mode 100644
index f609ec0af7da5..0000000000000
--- a/pkg/tsdb/prometheus/client/transport_test.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package client
-
-import (
-	"context"
-	"testing"
-
-	"github.com/grafana/grafana-azure-sdk-go/azsettings"
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func TestCreateTransportOptions(t *testing.T) {
-	t.Run("creates correct options object", func(t *testing.T) {
-		settings := backend.DataSourceInstanceSettings{
-			BasicAuthEnabled: false,
-			BasicAuthUser:    "",
-			JSONData:         []byte(`{"httpHeaderName1": "foo"}`),
-			DecryptedSecureJSONData: map[string]string{
-				"httpHeaderValue1": "bar",
-			},
-		}
-		opts, err := CreateTransportOptions(context.Background(), settings, &setting.Cfg{}, backend.NewLoggerWith("logger", "test"))
-		require.NoError(t, err)
-		require.Equal(t, map[string]string{"foo": "bar"}, opts.Headers)
-		require.Equal(t, 2, len(opts.Middlewares))
-	})
-
-	t.Run("add azure credentials if configured", func(t *testing.T) {
-		settings := backend.DataSourceInstanceSettings{
-			BasicAuthEnabled: false,
-			BasicAuthUser:    "",
-			JSONData: []byte(`{
-				"azureCredentials": {
-					"authType": "msi"
-				}
-			}`),
-			DecryptedSecureJSONData: map[string]string{},
-		}
-		opts, err := CreateTransportOptions(context.Background(), settings, &setting.Cfg{AzureAuthEnabled: true, Azure: &azsettings.AzureSettings{}}, backend.NewLoggerWith("logger", "test"))
-		require.NoError(t, err)
-		require.Equal(t, 3, len(opts.Middlewares))
-	})
-}
diff --git a/pkg/tsdb/prometheus/healthcheck.go b/pkg/tsdb/prometheus/healthcheck.go
deleted file mode 100644
index 873b8ac06fd43..0000000000000
--- a/pkg/tsdb/prometheus/healthcheck.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package prometheus
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"time"
-
-	"github.com/grafana/kindsys"
-
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/kinds/dataquery"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/models"
-)
-
-const (
-	refID = "__healthcheck__"
-)
-
-var logger log.Logger = backend.NewLoggerWith("logger", "tsdb.prometheus")
-
-func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult,
-	error) {
-	logger := logger.FromContext(ctx)
-	ds, err := s.getInstance(ctx, req.PluginContext)
-
-	// check that the datasource exists
-	if err != nil {
-		return getHealthCheckMessage("error getting datasource info", err)
-	}
-
-	if ds == nil {
-		return getHealthCheckMessage("", errors.New("invalid datasource info received"))
-	}
-
-	hc, err := healthcheck(ctx, req, ds)
-	if err != nil {
-		logger.Warn("Error performing prometheus healthcheck", "err", err.Error())
-		return nil, err
-	}
-
-	heuristics, err := getHeuristics(ctx, ds)
-	if err != nil {
-		logger.Warn("Failed to get prometheus heuristics", "err", err.Error())
-	} else {
-		jsonDetails, err := json.Marshal(heuristics)
-		if err != nil {
-			logger.Warn("Failed to marshal heuristics", "err", err)
-		} else {
-			hc.JSONDetails = jsonDetails
-		}
-	}
-
-	return hc, nil
-}
-
-func healthcheck(ctx context.Context, req *backend.CheckHealthRequest, i *instance) (*backend.CheckHealthResult, error) {
-	qm := models.QueryModel{
-		LegendFormat: "",
-		UtcOffsetSec: 0,
-		PrometheusDataQuery: dataquery.PrometheusDataQuery{
-			Expr:    "1+1",
-			Instant: kindsys.Ptr(true),
-			RefId:   refID,
-		},
-	}
-	b, _ := json.Marshal(&qm)
-
-	query := backend.DataQuery{
-		RefID: refID,
-		TimeRange: backend.TimeRange{
-			From: time.Unix(1, 0).UTC(),
-			To:   time.Unix(4, 0).UTC(),
-		},
-		JSON: b,
-	}
-	resp, err := i.queryData.Execute(ctx, &backend.QueryDataRequest{
-		PluginContext: req.PluginContext,
-		Queries:       []backend.DataQuery{query},
-	})
-
-	if err != nil {
-		return getHealthCheckMessage("There was an error returned querying the Prometheus API.", err)
-	}
-
-	if resp.Responses[refID].Error != nil {
-		return getHealthCheckMessage("There was an error returned querying the Prometheus API.",
-			errors.New(resp.Responses[refID].Error.Error()))
-	}
-
-	return getHealthCheckMessage("Successfully queried the Prometheus API.", nil)
-}
-
-func getHealthCheckMessage(message string, err error) (*backend.CheckHealthResult, error) {
-	if err == nil {
-		return &backend.CheckHealthResult{
-			Status:  backend.HealthStatusOk,
-			Message: message,
-		}, nil
-	}
-
-	errorMessage := fmt.Sprintf("%s - %s", err.Error(), message)
-
-	return &backend.CheckHealthResult{
-		Status:  backend.HealthStatusError,
-		Message: errorMessage,
-	}, nil
-}
diff --git a/pkg/tsdb/prometheus/healthcheck_test.go b/pkg/tsdb/prometheus/healthcheck_test.go
deleted file mode 100644
index eaf38c317e79d..0000000000000
--- a/pkg/tsdb/prometheus/healthcheck_test.go
+++ /dev/null
@@ -1,141 +0,0 @@
-package prometheus
-
-import (
-	"context"
-	"io"
-	"net/http"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/stretchr/testify/assert"
-)
-
-type healthCheckProvider[T http.RoundTripper] struct {
-	httpclient.Provider
-	RoundTripper *T
-}
-
-type healthCheckSuccessRoundTripper struct {
-}
-type healthCheckFailRoundTripper struct {
-}
-
-func (rt *healthCheckSuccessRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
-	return &http.Response{
-		Status:     "200",
-		StatusCode: 200,
-		Header:     nil,
-		Body: io.NopCloser(strings.NewReader(`{
-			"status": "success",
-			"data": {
-				"resultType": "scalar",
-				"result": [
-					1692969348.331,
-					"2"
-				]
-			}
-		}`)),
-		ContentLength: 0,
-		Request:       req,
-	}, nil
-}
-
-func (rt *healthCheckFailRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
-	return &http.Response{
-		Status:        "400",
-		StatusCode:    400,
-		Header:        nil,
-		Body:          nil,
-		ContentLength: 0,
-		Request:       req,
-	}, nil
-}
-
-func (provider *healthCheckProvider[T]) New(opts ...httpclient.Options) (*http.Client, error) {
-	client := &http.Client{}
-	provider.RoundTripper = new(T)
-	client.Transport = *provider.RoundTripper
-	return client, nil
-}
-
-func (provider *healthCheckProvider[T]) GetTransport(opts ...httpclient.Options) (http.RoundTripper, error) {
-	return *new(T), nil
-}
-
-func getMockProvider[T http.RoundTripper]() *httpclient.Provider {
-	p := &healthCheckProvider[T]{
-		RoundTripper: new(T),
-	}
-	anotherFN := func(o httpclient.Options, next http.RoundTripper) http.RoundTripper {
-		return *p.RoundTripper
-	}
-	fn := httpclient.MiddlewareFunc(anotherFN)
-	mid := httpclient.NamedMiddlewareFunc("mock", fn)
-	return httpclient.NewProvider(httpclient.ProviderOptions{Middlewares: []httpclient.Middleware{mid}})
-}
-
-func Test_healthcheck(t *testing.T) {
-	t.Run("should do a successful health check", func(t *testing.T) {
-		httpProvider := getMockProvider[*healthCheckSuccessRoundTripper]()
-		s := &Service{
-			im: datasource.NewInstanceManager(newInstanceSettings(httpProvider, &setting.Cfg{}, &featuremgmt.FeatureManager{}, backend.NewLoggerWith("logger", "test"))),
-		}
-
-		req := &backend.CheckHealthRequest{
-			PluginContext: getPluginContext(),
-			Headers:       nil,
-		}
-
-		res, err := s.CheckHealth(context.Background(), req)
-		assert.NoError(t, err)
-		assert.Equal(t, backend.HealthStatusOk, res.Status)
-	})
-
-	t.Run("should return an error for an unsuccessful health check", func(t *testing.T) {
-		httpProvider := getMockProvider[*healthCheckFailRoundTripper]()
-		s := &Service{
-			im: datasource.NewInstanceManager(newInstanceSettings(httpProvider, &setting.Cfg{}, &featuremgmt.FeatureManager{}, backend.NewLoggerWith("logger", "test"))),
-		}
-
-		req := &backend.CheckHealthRequest{
-			PluginContext: getPluginContext(),
-			Headers:       nil,
-		}
-
-		res, err := s.CheckHealth(context.Background(), req)
-		assert.NoError(t, err)
-		assert.Equal(t, backend.HealthStatusError, res.Status)
-	})
-}
-
-func getPluginContext() backend.PluginContext {
-	return backend.PluginContext{
-		OrgID:                      0,
-		PluginID:                   "prometheus",
-		User:                       nil,
-		AppInstanceSettings:        nil,
-		DataSourceInstanceSettings: getPromInstanceSettings(),
-	}
-}
-func getPromInstanceSettings() *backend.DataSourceInstanceSettings {
-	return &backend.DataSourceInstanceSettings{
-		ID:                      0,
-		UID:                     "",
-		Type:                    "prometheus",
-		Name:                    "test-prometheus",
-		URL:                     "http://promurl:9090",
-		User:                    "",
-		Database:                "",
-		BasicAuthEnabled:        true,
-		BasicAuthUser:           "admin",
-		JSONData:                []byte("{}"),
-		DecryptedSecureJSONData: map[string]string{},
-		Updated:                 time.Time{},
-	}
-}
diff --git a/pkg/tsdb/prometheus/heuristics_test.go b/pkg/tsdb/prometheus/heuristics_test.go
deleted file mode 100644
index 70de2738dfca4..0000000000000
--- a/pkg/tsdb/prometheus/heuristics_test.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package prometheus
-
-import (
-	"context"
-	"io"
-	"net/http"
-	"strconv"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-type heuristicsSuccessRoundTripper struct {
-	res    io.ReadCloser
-	status int
-}
-
-func (rt *heuristicsSuccessRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
-	return &http.Response{
-		Status:        strconv.Itoa(rt.status),
-		StatusCode:    rt.status,
-		Header:        nil,
-		Body:          rt.res,
-		ContentLength: 0,
-		Request:       req,
-	}, nil
-}
-
-func newHeuristicsSDKProvider(hrt heuristicsSuccessRoundTripper) *httpclient.Provider {
-	anotherFN := func(o httpclient.Options, next http.RoundTripper) http.RoundTripper {
-		return &hrt
-	}
-	fn := httpclient.MiddlewareFunc(anotherFN)
-	mid := httpclient.NamedMiddlewareFunc("mock", fn)
-	return httpclient.NewProvider(httpclient.ProviderOptions{Middlewares: []httpclient.Middleware{mid}})
-}
-
-func Test_GetHeuristics(t *testing.T) {
-	t.Run("should return Prometheus", func(t *testing.T) {
-		rt := heuristicsSuccessRoundTripper{
-			res:    io.NopCloser(strings.NewReader("{\"status\":\"success\",\"data\":{\"version\":\"1.0\"}}")),
-			status: http.StatusOK,
-		}
-		//httpProvider := getHeuristicsMockProvider(&rt)
-		httpProvider := newHeuristicsSDKProvider(rt)
-		s := &Service{
-			im: datasource.NewInstanceManager(newInstanceSettings(httpProvider, &setting.Cfg{}, &featuremgmt.FeatureManager{}, backend.NewLoggerWith("logger", "test"))),
-		}
-
-		req := HeuristicsRequest{
-			PluginContext: getPluginContext(),
-		}
-		res, err := s.GetHeuristics(context.Background(), req)
-		assert.NoError(t, err)
-		require.NotNil(t, res)
-		assert.Equal(t, KindPrometheus, res.Application)
-		assert.Equal(t, Features{RulerApiEnabled: false}, res.Features)
-	})
-
-	t.Run("should return Mimir", func(t *testing.T) {
-		rt := heuristicsSuccessRoundTripper{
-			res:    io.NopCloser(strings.NewReader("{\"status\":\"success\",\"data\":{\"features\":{\"foo\":\"bar\"},\"version\":\"1.0\"}}")),
-			status: http.StatusOK,
-		}
-		httpProvider := newHeuristicsSDKProvider(rt)
-		s := &Service{
-			im: datasource.NewInstanceManager(newInstanceSettings(httpProvider, &setting.Cfg{}, &featuremgmt.FeatureManager{}, backend.NewLoggerWith("logger", "test"))),
-		}
-
-		req := HeuristicsRequest{
-			PluginContext: getPluginContext(),
-		}
-		res, err := s.GetHeuristics(context.Background(), req)
-		assert.NoError(t, err)
-		require.NotNil(t, res)
-		assert.Equal(t, KindMimir, res.Application)
-		assert.Equal(t, Features{RulerApiEnabled: true}, res.Features)
-	})
-}
diff --git a/pkg/tsdb/prometheus/kinds/dataquery/types_dataquery_gen.go b/pkg/tsdb/prometheus/kinds/dataquery/types_dataquery_gen.go
deleted file mode 100644
index 2112a08c93cfb..0000000000000
--- a/pkg/tsdb/prometheus/kinds/dataquery/types_dataquery_gen.go
+++ /dev/null
@@ -1,103 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     public/app/plugins/gen.go
-// Using jennies:
-//     PluginGoTypesJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package dataquery
-
-// Defines values for PromQueryFormat.
-const (
-	PromQueryFormatHeatmap    PromQueryFormat = "heatmap"
-	PromQueryFormatTable      PromQueryFormat = "table"
-	PromQueryFormatTimeSeries PromQueryFormat = "time_series"
-)
-
-// Defines values for QueryEditorMode.
-const (
-	QueryEditorModeBuilder QueryEditorMode = "builder"
-	QueryEditorModeCode    QueryEditorMode = "code"
-)
-
-// These are the common properties available to all queries in all datasources.
-// Specific implementations will *extend* this interface, adding the required
-// properties for the given context.
-type DataQuery struct {
-	// For mixed data sources the selected datasource is on the query level.
-	// For non mixed scenarios this is undefined.
-	// TODO find a better way to do this ^ that's friendly to schema
-	// TODO this shouldn't be unknown but DataSourceRef | null
-	Datasource *any `json:"datasource,omitempty"`
-
-	// Hide true if query is disabled (ie should not be returned to the dashboard)
-	// Note this does not always imply that the query should not be executed since
-	// the results from a hidden query may be used as the input to other queries (SSE etc)
-	Hide *bool `json:"hide,omitempty"`
-
-	// Specify the query flavor
-	// TODO make this required and give it a default
-	QueryType *string `json:"queryType,omitempty"`
-
-	// A unique identifier for the query within the list of targets.
-	// In server side expressions, the refId is used as a variable name to identify results.
-	// By default, the UI will assign A->Z; however setting meaningful names may be useful.
-	RefId string `json:"refId"`
-}
-
-// PromQueryFormat defines model for PromQueryFormat.
-type PromQueryFormat string
-
-// PrometheusDataQuery defines model for PrometheusDataQuery.
-type PrometheusDataQuery struct {
-	// DataQuery These are the common properties available to all queries in all datasources.
-	// Specific implementations will *extend* this interface, adding the required
-	// properties for the given context.
-	DataQuery
-
-	// For mixed data sources the selected datasource is on the query level.
-	// For non mixed scenarios this is undefined.
-	// TODO find a better way to do this ^ that's friendly to schema
-	// TODO this shouldn't be unknown but DataSourceRef | null
-	Datasource *any             `json:"datasource,omitempty"`
-	EditorMode *QueryEditorMode `json:"editorMode,omitempty"`
-
-	// Execute an additional query to identify interesting raw samples relevant for the given expr
-	Exemplar *bool `json:"exemplar,omitempty"`
-
-	// The actual expression/query that will be evaluated by Prometheus
-	Expr   string           `json:"expr"`
-	Format *PromQueryFormat `json:"format,omitempty"`
-
-	// Hide true if query is disabled (ie should not be returned to the dashboard)
-	// Note this does not always imply that the query should not be executed since
-	// the results from a hidden query may be used as the input to other queries (SSE etc)
-	Hide *bool `json:"hide,omitempty"`
-
-	// Returns only the latest value that Prometheus has scraped for the requested time series
-	Instant *bool `json:"instant,omitempty"`
-
-	// @deprecated Used to specify how many times to divide max data points by. We use max data points under query options
-	// See https://github.com/grafana/grafana/issues/48081
-	IntervalFactor *float32 `json:"intervalFactor,omitempty"`
-
-	// Series name override or template. Ex. {{hostname}} will be replaced with label value for hostname
-	LegendFormat *string `json:"legendFormat,omitempty"`
-
-	// Specify the query flavor
-	// TODO make this required and give it a default
-	QueryType *string `json:"queryType,omitempty"`
-
-	// Returns a Range vector, comprised of a set of time series containing a range of data points over time for each time series
-	Range *bool `json:"range,omitempty"`
-
-	// A unique identifier for the query within the list of targets.
-	// In server side expressions, the refId is used as a variable name to identify results.
-	// By default, the UI will assign A->Z; however setting meaningful names may be useful.
-	RefId string `json:"refId"`
-}
-
-// QueryEditorMode defines model for QueryEditorMode.
-type QueryEditorMode string
diff --git a/pkg/tsdb/prometheus/models/query.go b/pkg/tsdb/prometheus/models/query.go
deleted file mode 100644
index 91c7caf60bced..0000000000000
--- a/pkg/tsdb/prometheus/models/query.go
+++ /dev/null
@@ -1,261 +0,0 @@
-package models
-
-import (
-	"encoding/json"
-	"math"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana/pkg/tsdb/intervalv2"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/kinds/dataquery"
-)
-
-// Internal interval and range variables
-const (
-	varInterval       = "$__interval"
-	varIntervalMs     = "$__interval_ms"
-	varRange          = "$__range"
-	varRangeS         = "$__range_s"
-	varRangeMs        = "$__range_ms"
-	varRateInterval   = "$__rate_interval"
-	varRateIntervalMs = "$__rate_interval_ms"
-)
-
-// Internal interval and range variables with {} syntax
-// Repetitive code, we should have functionality to unify these
-const (
-	varIntervalAlt       = "${__interval}"
-	varIntervalMsAlt     = "${__interval_ms}"
-	varRangeAlt          = "${__range}"
-	varRangeSAlt         = "${__range_s}"
-	varRangeMsAlt        = "${__range_ms}"
-	varRateIntervalAlt   = "${__rate_interval}"
-	varRateIntervalMsAlt = "${__rate_interval_ms}"
-)
-
-type TimeSeriesQueryType string
-
-const (
-	RangeQueryType    TimeSeriesQueryType = "range"
-	InstantQueryType  TimeSeriesQueryType = "instant"
-	ExemplarQueryType TimeSeriesQueryType = "exemplar"
-	UnknownQueryType  TimeSeriesQueryType = "unknown"
-)
-
-var safeResolution = 11000
-
-type QueryModel struct {
-	dataquery.PrometheusDataQuery
-	// The following properties may be part of the request payload, however they are not saved in panel JSON
-	// Timezone offset to align start & end time on backend
-	UtcOffsetSec   int64  `json:"utcOffsetSec,omitempty"`
-	LegendFormat   string `json:"legendFormat,omitempty"`
-	Interval       string `json:"interval,omitempty"`
-	IntervalMs     int64  `json:"intervalMs,omitempty"`
-	IntervalFactor int64  `json:"intervalFactor,omitempty"`
-}
-
-type TimeRange struct {
-	Start time.Time
-	End   time.Time
-	Step  time.Duration
-}
-
-type Query struct {
-	Expr          string
-	Step          time.Duration
-	LegendFormat  string
-	Start         time.Time
-	End           time.Time
-	RefId         string
-	InstantQuery  bool
-	RangeQuery    bool
-	ExemplarQuery bool
-	UtcOffsetSec  int64
-}
-
-func Parse(query backend.DataQuery, timeInterval string, intervalCalculator intervalv2.Calculator, fromAlert bool) (*Query, error) {
-	model := &QueryModel{}
-	if err := json.Unmarshal(query.JSON, model); err != nil {
-		return nil, err
-	}
-
-	// Final interval value
-	interval, err := calculatePrometheusInterval(model.Interval, timeInterval, model.IntervalMs, model.IntervalFactor, query, intervalCalculator)
-	if err != nil {
-		return nil, err
-	}
-
-	// Interpolate variables in expr
-	timeRange := query.TimeRange.To.Sub(query.TimeRange.From)
-	expr := interpolateVariables(model.Expr, model.Interval, interval, timeRange, intervalCalculator, timeInterval)
-	var rangeQuery, instantQuery bool
-	if model.Instant == nil {
-		instantQuery = false
-	} else {
-		instantQuery = *model.Instant
-	}
-	if model.Range == nil {
-		rangeQuery = false
-	} else {
-		rangeQuery = *model.Range
-	}
-	if !instantQuery && !rangeQuery {
-		// In older dashboards, we were not setting range query param and !range && !instant was run as range query
-		rangeQuery = true
-	}
-
-	// We never want to run exemplar query for alerting
-	exemplarQuery := false
-	if model.Exemplar != nil {
-		exemplarQuery = *model.Exemplar
-	}
-	if fromAlert {
-		exemplarQuery = false
-	}
-
-	return &Query{
-		Expr:          expr,
-		Step:          interval,
-		LegendFormat:  model.LegendFormat,
-		Start:         query.TimeRange.From,
-		End:           query.TimeRange.To,
-		RefId:         query.RefID,
-		InstantQuery:  instantQuery,
-		RangeQuery:    rangeQuery,
-		ExemplarQuery: exemplarQuery,
-		UtcOffsetSec:  model.UtcOffsetSec,
-	}, nil
-}
-
-func (query *Query) Type() TimeSeriesQueryType {
-	if query.InstantQuery {
-		return InstantQueryType
-	}
-	if query.RangeQuery {
-		return RangeQueryType
-	}
-	if query.ExemplarQuery {
-		return ExemplarQueryType
-	}
-	return UnknownQueryType
-}
-
-func (query *Query) TimeRange() TimeRange {
-	return TimeRange{
-		Step: query.Step,
-		// Align query range to step. It rounds start and end down to a multiple of step.
-		Start: AlignTimeRange(query.Start, query.Step, query.UtcOffsetSec),
-		End:   AlignTimeRange(query.End, query.Step, query.UtcOffsetSec),
-	}
-}
-
-func calculatePrometheusInterval(
-	queryInterval, timeInterval string,
-	intervalMs, intervalFactor int64,
-	query backend.DataQuery,
-	intervalCalculator intervalv2.Calculator,
-) (time.Duration, error) {
-	// we need to compare the original query model after it is overwritten below to variables so that we can
-	// calculate the rateInterval if it is equal to $__rate_interval or ${__rate_interval}
-	originalQueryInterval := queryInterval
-
-	// If we are using variable for interval/step, we will replace it with calculated interval
-	if isVariableInterval(queryInterval) {
-		queryInterval = ""
-	}
-
-	minInterval, err := intervalv2.GetIntervalFrom(timeInterval, queryInterval, intervalMs, 15*time.Second)
-	if err != nil {
-		return time.Duration(0), err
-	}
-	calculatedInterval := intervalCalculator.Calculate(query.TimeRange, minInterval, query.MaxDataPoints)
-	safeInterval := intervalCalculator.CalculateSafeInterval(query.TimeRange, int64(safeResolution))
-
-	adjustedInterval := safeInterval.Value
-	if calculatedInterval.Value > safeInterval.Value {
-		adjustedInterval = calculatedInterval.Value
-	}
-
-	// here is where we compare for $__rate_interval or ${__rate_interval}
-	if originalQueryInterval == varRateInterval || originalQueryInterval == varRateIntervalAlt {
-		// Rate interval is final and is not affected by resolution
-		return calculateRateInterval(adjustedInterval, timeInterval, intervalCalculator), nil
-	} else {
-		queryIntervalFactor := intervalFactor
-		if queryIntervalFactor == 0 {
-			queryIntervalFactor = 1
-		}
-		return time.Duration(int64(adjustedInterval) * queryIntervalFactor), nil
-	}
-}
-
-func calculateRateInterval(
-	interval time.Duration,
-	scrapeInterval string,
-	intervalCalculator intervalv2.Calculator,
-) time.Duration {
-	scrape := scrapeInterval
-	if scrape == "" {
-		scrape = "15s"
-	}
-
-	scrapeIntervalDuration, err := intervalv2.ParseIntervalStringToTimeDuration(scrape)
-	if err != nil {
-		return time.Duration(0)
-	}
-
-	rateInterval := time.Duration(int64(math.Max(float64(interval+scrapeIntervalDuration), float64(4)*float64(scrapeIntervalDuration))))
-	return rateInterval
-}
-
-func interpolateVariables(expr, queryInterval string, interval time.Duration,
-	timeRange time.Duration,
-	intervalCalculator intervalv2.Calculator, timeInterval string) string {
-	rangeMs := timeRange.Milliseconds()
-	rangeSRounded := int64(math.Round(float64(rangeMs) / 1000.0))
-
-	var rateInterval time.Duration
-	if queryInterval == varRateInterval || queryInterval == varRateIntervalAlt {
-		rateInterval = interval
-	} else {
-		rateInterval = calculateRateInterval(interval, timeInterval, intervalCalculator)
-	}
-
-	expr = strings.ReplaceAll(expr, varIntervalMs, strconv.FormatInt(int64(interval/time.Millisecond), 10))
-	expr = strings.ReplaceAll(expr, varInterval, intervalv2.FormatDuration(interval))
-	expr = strings.ReplaceAll(expr, varRangeMs, strconv.FormatInt(rangeMs, 10))
-	expr = strings.ReplaceAll(expr, varRangeS, strconv.FormatInt(rangeSRounded, 10))
-	expr = strings.ReplaceAll(expr, varRange, strconv.FormatInt(rangeSRounded, 10)+"s")
-	expr = strings.ReplaceAll(expr, varRateIntervalMs, strconv.FormatInt(int64(rateInterval/time.Millisecond), 10))
-	expr = strings.ReplaceAll(expr, varRateInterval, rateInterval.String())
-
-	// Repetitive code, we should have functionality to unify these
-	expr = strings.ReplaceAll(expr, varIntervalMsAlt, strconv.FormatInt(int64(interval/time.Millisecond), 10))
-	expr = strings.ReplaceAll(expr, varIntervalAlt, intervalv2.FormatDuration(interval))
-	expr = strings.ReplaceAll(expr, varRangeMsAlt, strconv.FormatInt(rangeMs, 10))
-	expr = strings.ReplaceAll(expr, varRangeSAlt, strconv.FormatInt(rangeSRounded, 10))
-	expr = strings.ReplaceAll(expr, varRangeAlt, strconv.FormatInt(rangeSRounded, 10)+"s")
-	expr = strings.ReplaceAll(expr, varRateIntervalMsAlt, strconv.FormatInt(int64(rateInterval/time.Millisecond), 10))
-	expr = strings.ReplaceAll(expr, varRateIntervalAlt, rateInterval.String())
-	return expr
-}
-
-func isVariableInterval(interval string) bool {
-	if interval == varInterval || interval == varIntervalMs || interval == varRateInterval || interval == varRateIntervalMs {
-		return true
-	}
-	// Repetitive code, we should have functionality to unify these
-	if interval == varIntervalAlt || interval == varIntervalMsAlt || interval == varRateIntervalAlt || interval == varRateIntervalMsAlt {
-		return true
-	}
-	return false
-}
-
-func AlignTimeRange(t time.Time, step time.Duration, offset int64) time.Time {
-	offsetNano := float64(offset * 1e9)
-	stepNano := float64(step.Nanoseconds())
-	return time.Unix(0, int64(math.Floor((float64(t.UnixNano())+offsetNano)/stepNano)*stepNano-offsetNano)).UTC()
-}
diff --git a/pkg/tsdb/prometheus/models/query_test.go b/pkg/tsdb/prometheus/models/query_test.go
deleted file mode 100644
index 4322ed802a1db..0000000000000
--- a/pkg/tsdb/prometheus/models/query_test.go
+++ /dev/null
@@ -1,531 +0,0 @@
-package models_test
-
-import (
-	"reflect"
-	"testing"
-	"time"
-
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/tsdb/intervalv2"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/models"
-)
-
-var (
-	now                = time.Now()
-	intervalCalculator = intervalv2.NewCalculator()
-)
-
-func TestParse(t *testing.T) {
-	t.Run("parsing query from unified alerting", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(12 * time.Hour),
-		}
-
-		queryJson := `{
-			"expr": "go_goroutines",
-			"refId": "A",
-			"exemplar": true
-		}`
-
-		q := backend.DataQuery{
-			JSON:      []byte(queryJson),
-			TimeRange: timeRange,
-			RefID:     "A",
-		}
-
-		res, err := models.Parse(q, "15s", intervalCalculator, true)
-		require.NoError(t, err)
-		require.Equal(t, false, res.ExemplarQuery)
-	})
-
-	t.Run("parsing query model with step", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(12 * time.Hour),
-		}
-
-		q := queryContext(`{
-			"expr": "go_goroutines",
-			"format": "time_series",
-			"refId": "A"
-		}`, timeRange)
-
-		res, err := models.Parse(q, "15s", intervalCalculator, false)
-		require.NoError(t, err)
-		require.Equal(t, time.Second*30, res.Step)
-	})
-
-	t.Run("parsing query model without step parameter", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(1 * time.Hour),
-		}
-
-		q := queryContext(`{
-			"expr": "go_goroutines",
-			"format": "time_series",
-			"intervalFactor": 1,
-			"refId": "A"
-		}`, timeRange)
-
-		res, err := models.Parse(q, "15s", intervalCalculator, false)
-		require.NoError(t, err)
-		require.Equal(t, time.Second*15, res.Step)
-	})
-
-	t.Run("parsing query model with high intervalFactor", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(48 * time.Hour),
-		}
-
-		q := queryContext(`{
-			"expr": "go_goroutines",
-			"format": "time_series",
-			"intervalFactor": 10,
-			"refId": "A"
-		}`, timeRange)
-
-		res, err := models.Parse(q, "15s", intervalCalculator, false)
-		require.NoError(t, err)
-		require.Equal(t, time.Minute*20, res.Step)
-	})
-
-	t.Run("parsing query model with low intervalFactor", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(48 * time.Hour),
-		}
-
-		q := queryContext(`{
-			"expr": "go_goroutines",
-			"format": "time_series",
-			"intervalFactor": 1,
-			"refId": "A"
-		}`, timeRange)
-
-		res, err := models.Parse(q, "15s", intervalCalculator, false)
-		require.NoError(t, err)
-		require.Equal(t, time.Minute*2, res.Step)
-	})
-
-	t.Run("parsing query model specified scrape-interval in the data source", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(48 * time.Hour),
-		}
-
-		q := queryContext(`{
-			"expr": "go_goroutines",
-			"format": "time_series",
-			"intervalFactor": 1,
-			"refId": "A"
-		}`, timeRange)
-
-		res, err := models.Parse(q, "240s", intervalCalculator, false)
-		require.NoError(t, err)
-		require.Equal(t, time.Minute*4, res.Step)
-	})
-
-	t.Run("parsing query model with $__interval variable", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(48 * time.Hour),
-		}
-
-		q := queryContext(`{
-			"expr": "rate(ALERTS{job=\"test\" [$__interval]})",
-			"format": "time_series",
-			"intervalFactor": 1,
-			"refId": "A"
-		}`, timeRange)
-
-		res, err := models.Parse(q, "15s", intervalCalculator, false)
-		require.NoError(t, err)
-		require.Equal(t, "rate(ALERTS{job=\"test\" [2m]})", res.Expr)
-	})
-
-	t.Run("parsing query model with ${__interval} variable", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(48 * time.Hour),
-		}
-
-		q := queryContext(`{
-			"expr": "rate(ALERTS{job=\"test\" [${__interval}]})",
-			"format": "time_series",
-			"intervalFactor": 1,
-			"refId": "A"
-		}`, timeRange)
-
-		res, err := models.Parse(q, "15s", intervalCalculator, false)
-		require.NoError(t, err)
-		require.Equal(t, "rate(ALERTS{job=\"test\" [2m]})", res.Expr)
-	})
-
-	t.Run("parsing query model with $__interval_ms variable", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(48 * time.Hour),
-		}
-
-		q := queryContext(`{
-			"expr": "rate(ALERTS{job=\"test\" [$__interval_ms]})",
-			"format": "time_series",
-			"intervalFactor": 1,
-			"refId": "A"
-		}`, timeRange)
-
-		res, err := models.Parse(q, "15s", intervalCalculator, false)
-		require.NoError(t, err)
-		require.Equal(t, "rate(ALERTS{job=\"test\" [120000]})", res.Expr)
-	})
-
-	t.Run("parsing query model with $__interval_ms and $__interval variable", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(48 * time.Hour),
-		}
-
-		q := queryContext(`{
-			"expr": "rate(ALERTS{job=\"test\" [$__interval_ms]}) + rate(ALERTS{job=\"test\" [$__interval]})",
-			"format": "time_series",
-			"intervalFactor": 1,
-			"refId": "A"
-		}`, timeRange)
-
-		res, err := models.Parse(q, "15s", intervalCalculator, false)
-		require.NoError(t, err)
-		require.Equal(t, "rate(ALERTS{job=\"test\" [120000]}) + rate(ALERTS{job=\"test\" [2m]})", res.Expr)
-	})
-
-	t.Run("parsing query model with ${__interval_ms} and ${__interval} variable", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(48 * time.Hour),
-		}
-
-		q := queryContext(`{
-			"expr": "rate(ALERTS{job=\"test\" [${__interval_ms}]}) + rate(ALERTS{job=\"test\" [${__interval}]})",
-			"format": "time_series",
-			"intervalFactor": 1,
-			"refId": "A"
-		}`, timeRange)
-
-		res, err := models.Parse(q, "15s", intervalCalculator, false)
-		require.NoError(t, err)
-		require.Equal(t, "rate(ALERTS{job=\"test\" [120000]}) + rate(ALERTS{job=\"test\" [2m]})", res.Expr)
-	})
-
-	t.Run("parsing query model with $__range variable", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(48 * time.Hour),
-		}
-
-		q := queryContext(`{
-			"expr": "rate(ALERTS{job=\"test\" [$__range]})",
-			"format": "time_series",
-			"intervalFactor": 1,
-			"refId": "A"
-		}`, timeRange)
-
-		res, err := models.Parse(q, "15s", intervalCalculator, false)
-		require.NoError(t, err)
-		require.Equal(t, "rate(ALERTS{job=\"test\" [172800s]})", res.Expr)
-	})
-
-	t.Run("parsing query model with $__range_s variable", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(48 * time.Hour),
-		}
-
-		q := queryContext(`{
-			"expr": "rate(ALERTS{job=\"test\" [$__range_s]})",
-			"format": "time_series",
-			"intervalFactor": 1,
-			"refId": "A"
-		}`, timeRange)
-
-		res, err := models.Parse(q, "15s", intervalCalculator, false)
-		require.NoError(t, err)
-		require.Equal(t, "rate(ALERTS{job=\"test\" [172800]})", res.Expr)
-	})
-
-	t.Run("parsing query model with ${__range_s} variable", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(48 * time.Hour),
-		}
-
-		q := queryContext(`{
-			"expr": "rate(ALERTS{job=\"test\" [${__range_s}s]})",
-			"format": "time_series",
-			"intervalFactor": 1,
-			"refId": "A"
-		}`, timeRange)
-
-		res, err := models.Parse(q, "15s", intervalCalculator, false)
-		require.NoError(t, err)
-		require.Equal(t, "rate(ALERTS{job=\"test\" [172800s]})", res.Expr)
-	})
-
-	t.Run("parsing query model with $__range_s variable below 0.5s", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(40 * time.Millisecond),
-		}
-
-		q := queryContext(`{
-			"expr": "rate(ALERTS{job=\"test\" [$__range_s]})",
-			"format": "time_series",
-			"intervalFactor": 1,
-			"refId": "A"
-		}`, timeRange)
-
-		res, err := models.Parse(q, "15s", intervalCalculator, false)
-		require.NoError(t, err)
-		require.Equal(t, "rate(ALERTS{job=\"test\" [0]})", res.Expr)
-	})
-
-	t.Run("parsing query model with $__range_s variable between 1-0.5s", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(800 * time.Millisecond),
-		}
-
-		q := queryContext(`{
-			"expr": "rate(ALERTS{job=\"test\" [$__range_s]})",
-			"format": "time_series",
-			"intervalFactor": 1,
-			"refId": "A"
-		}`, timeRange)
-
-		res, err := models.Parse(q, "15s", intervalCalculator, false)
-		require.NoError(t, err)
-		require.Equal(t, "rate(ALERTS{job=\"test\" [1]})", res.Expr)
-	})
-
-	t.Run("parsing query model with $__range_ms variable", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(48 * time.Hour),
-		}
-
-		q := queryContext(`{
-			"expr": "rate(ALERTS{job=\"test\" [$__range_ms]})",
-			"format": "time_series",
-			"intervalFactor": 1,
-			"refId": "A"
-		}`, timeRange)
-
-		res, err := models.Parse(q, "15s", intervalCalculator, false)
-		require.NoError(t, err)
-		require.Equal(t, "rate(ALERTS{job=\"test\" [172800000]})", res.Expr)
-	})
-
-	t.Run("parsing query model with $__range_ms variable below 1s", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(20 * time.Millisecond),
-		}
-
-		q := queryContext(`{
-			"expr": "rate(ALERTS{job=\"test\" [$__range_ms]})",
-			"format": "time_series",
-			"intervalFactor": 1,
-			"refId": "A"
-		}`, timeRange)
-
-		res, err := models.Parse(q, "15s", intervalCalculator, false)
-		require.NoError(t, err)
-		require.Equal(t, "rate(ALERTS{job=\"test\" [20]})", res.Expr)
-	})
-
-	t.Run("parsing query model with $__rate_interval variable", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(5 * time.Minute),
-		}
-
-		q := queryContext(`{
-			"expr": "rate(ALERTS{job=\"test\" [$__rate_interval]})",
-			"format": "time_series",
-			"intervalFactor": 1,
-			"interval": "5m",
-			"refId": "A"
-		}`, timeRange)
-
-		res, err := models.Parse(q, "15s", intervalCalculator, false)
-		require.NoError(t, err)
-		require.Equal(t, "rate(ALERTS{job=\"test\" [5m15s]})", res.Expr)
-	})
-
-	t.Run("parsing query model with $__rate_interval variable in expr and interval", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(5 * time.Minute),
-		}
-
-		q := queryContext(`{
-			"expr": "rate(ALERTS{job=\"test\" [$__rate_interval]})",
-			"format": "time_series",
-			"intervalFactor": 1,
-			"interval": "$__rate_interval",
-			"refId": "A"
-		}`, timeRange)
-
-		res, err := models.Parse(q, "15s", intervalCalculator, false)
-		require.NoError(t, err)
-		require.Equal(t, "rate(ALERTS{job=\"test\" [1m0s]})", res.Expr)
-		require.Equal(t, 1*time.Minute, res.Step)
-	})
-
-	t.Run("parsing query model with $__rate_interval_ms variable", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(48 * time.Hour),
-		}
-
-		q := queryContext(`{
-			"expr": "rate(ALERTS{job=\"test\" [$__rate_interval_ms]})",
-			"format": "time_series",
-			"intervalFactor": 1,
-			"refId": "A"
-		}`, timeRange)
-
-		res, err := models.Parse(q, "15s", intervalCalculator, false)
-		require.NoError(t, err)
-		require.Equal(t, "rate(ALERTS{job=\"test\" [135000]})", res.Expr)
-	})
-
-	t.Run("parsing query model with $__rate_interval_ms and $__rate_interval variable", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(48 * time.Hour),
-		}
-
-		q := queryContext(`{
-			"expr": "rate(ALERTS{job=\"test\" [$__rate_interval_ms]}) + rate(ALERTS{job=\"test\" [$__rate_interval]})",
-			"format": "time_series",
-			"intervalFactor": 1,
-			"refId": "A"
-		}`, timeRange)
-
-		res, err := models.Parse(q, "15s", intervalCalculator, false)
-		require.NoError(t, err)
-		require.Equal(t, "rate(ALERTS{job=\"test\" [135000]}) + rate(ALERTS{job=\"test\" [2m15s]})", res.Expr)
-	})
-
-	t.Run("parsing query model with ${__rate_interval_ms} and ${__rate_interval} variable", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(48 * time.Hour),
-		}
-
-		q := queryContext(`{
-			"expr": "rate(ALERTS{job=\"test\" [${__rate_interval_ms}]}) + rate(ALERTS{job=\"test\" [${__rate_interval}]})",
-			"format": "time_series",
-			"intervalFactor": 1,
-			"refId": "A"
-		}`, timeRange)
-
-		res, err := models.Parse(q, "15s", intervalCalculator, false)
-		require.NoError(t, err)
-		require.Equal(t, "rate(ALERTS{job=\"test\" [135000]}) + rate(ALERTS{job=\"test\" [2m15s]})", res.Expr)
-	})
-
-	t.Run("parsing query model of range query", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(48 * time.Hour),
-		}
-
-		q := queryContext(`{
-			"expr": "go_goroutines",
-			"format": "time_series",
-			"intervalFactor": 1,
-			"refId": "A",
-			"range": true
-		}`, timeRange)
-
-		res, err := models.Parse(q, "15s", intervalCalculator, false)
-		require.NoError(t, err)
-		require.Equal(t, true, res.RangeQuery)
-	})
-
-	t.Run("parsing query model of range and instant query", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(48 * time.Hour),
-		}
-
-		q := queryContext(`{
-			"expr": "go_goroutines",
-			"format": "time_series",
-			"intervalFactor": 1,
-			"refId": "A",
-			"range": true,
-			"instant": true
-		}`, timeRange)
-
-		res, err := models.Parse(q, "15s", intervalCalculator, false)
-		require.NoError(t, err)
-		require.Equal(t, true, res.RangeQuery)
-		require.Equal(t, true, res.InstantQuery)
-	})
-
-	t.Run("parsing query model of with no query type", func(t *testing.T) {
-		timeRange := backend.TimeRange{
-			From: now,
-			To:   now.Add(48 * time.Hour),
-		}
-
-		q := queryContext(`{
-			"expr": "go_goroutines",
-			"format": "time_series",
-			"intervalFactor": 1,
-			"refId": "A"
-		}`, timeRange)
-
-		res, err := models.Parse(q, "15s", intervalCalculator, false)
-		require.NoError(t, err)
-		require.Equal(t, true, res.RangeQuery)
-	})
-}
-
-func queryContext(json string, timeRange backend.TimeRange) backend.DataQuery {
-	return backend.DataQuery{
-		JSON:      []byte(json),
-		TimeRange: timeRange,
-		RefID:     "A",
-	}
-}
-
-func TestAlignTimeRange(t *testing.T) {
-	type args struct {
-		t      time.Time
-		step   time.Duration
-		offset int64
-	}
-	tests := []struct {
-		name string
-		args args
-		want time.Time
-	}{
-		{name: "second step", args: args{t: time.Unix(1664816826, 0), step: 10 * time.Second, offset: 0}, want: time.Unix(1664816820, 0).UTC()},
-		{name: "millisecond step", args: args{t: time.Unix(1664816825, 5*int64(time.Millisecond)), step: 10 * time.Millisecond, offset: 0}, want: time.Unix(1664816825, 0).UTC()},
-		{name: "second step with offset", args: args{t: time.Unix(1664816825, 5*int64(time.Millisecond)), step: 2 * time.Second, offset: -3}, want: time.Unix(1664816825, 0).UTC()},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := models.AlignTimeRange(tt.args.t, tt.args.step, tt.args.offset); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("AlignTimeRange() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
diff --git a/pkg/tsdb/prometheus/prometheus.go b/pkg/tsdb/prometheus/prometheus.go
index 9c1a0db794ab6..ef4e1df310557 100644
--- a/pkg/tsdb/prometheus/prometheus.go
+++ b/pkg/tsdb/prometheus/prometheus.go
@@ -2,148 +2,67 @@ package prometheus
 
 import (
 	"context"
-	"errors"
 	"fmt"
-	"strings"
-	"time"
 
+	"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
-	"github.com/patrickmn/go-cache"
-	apiv1 "github.com/prometheus/client_golang/api/prometheus/v1"
+	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 
-	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/client"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/instrumentation"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/querydata"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/resource"
+	"github.com/grafana/grafana/pkg/promlib"
+	"github.com/grafana/grafana/pkg/tsdb/prometheus/azureauth"
 )
 
 type Service struct {
-	im       instancemgmt.InstanceManager
-	features featuremgmt.FeatureToggles
-	logger   log.Logger
+	lib *promlib.Service
 }
 
-type instance struct {
-	queryData    *querydata.QueryData
-	resource     *resource.Resource
-	versionCache *cache.Cache
-}
-
-func ProvideService(httpClientProvider *httpclient.Provider, cfg *setting.Cfg, features featuremgmt.FeatureToggles) *Service {
+func ProvideService(httpClientProvider *sdkhttpclient.Provider) *Service {
 	plog := backend.NewLoggerWith("logger", "tsdb.prometheus")
 	plog.Debug("Initializing")
 	return &Service{
-		im:       datasource.NewInstanceManager(newInstanceSettings(httpClientProvider, cfg, features, plog)),
-		features: features,
-		logger:   plog,
+		lib: promlib.NewService(httpClientProvider, plog, extendClientOpts),
 	}
 }
 
-func newInstanceSettings(httpClientProvider *httpclient.Provider, cfg *setting.Cfg, features featuremgmt.FeatureToggles, log log.Logger) datasource.InstanceFactoryFunc {
-	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		// Creates a http roundTripper.
-		opts, err := client.CreateTransportOptions(ctx, settings, cfg, log)
-		if err != nil {
-			return nil, fmt.Errorf("error creating transport options: %v", err)
-		}
-		httpClient, err := httpClientProvider.New(*opts)
-		if err != nil {
-			return nil, fmt.Errorf("error creating http client: %v", err)
-		}
+func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+	return s.lib.QueryData(ctx, req)
+}
 
-		// New version using custom client and better response parsing
-		qd, err := querydata.New(httpClient, features, settings, log)
-		if err != nil {
-			return nil, err
-		}
+func (s *Service) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	return s.lib.CallResource(ctx, req, sender)
+}
 
-		// Resource call management using new custom client same as querydata
-		r, err := resource.New(httpClient, settings, log)
-		if err != nil {
-			return nil, err
-		}
+func (s *Service) GetBuildInfo(ctx context.Context, req promlib.BuildInfoRequest) (*promlib.BuildInfoResponse, error) {
+	return s.lib.GetBuildInfo(ctx, req)
+}
 
-		return instance{
-			queryData:    qd,
-			resource:     r,
-			versionCache: cache.New(time.Minute*1, time.Minute*5),
-		}, nil
-	}
+func (s *Service) GetHeuristics(ctx context.Context, req promlib.HeuristicsRequest) (*promlib.Heuristics, error) {
+	return s.lib.GetHeuristics(ctx, req)
 }
 
-func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
-	if len(req.Queries) == 0 {
-		err := fmt.Errorf("query contains no queries")
-		instrumentation.UpdateQueryDataMetrics(err, nil)
-		return &backend.QueryDataResponse{}, err
-	}
+func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult,
+	error) {
+	return s.lib.CheckHealth(ctx, req)
+}
 
-	i, err := s.getInstance(ctx, req.PluginContext)
-	if err != nil {
-		instrumentation.UpdateQueryDataMetrics(err, nil)
-		return nil, err
+func extendClientOpts(ctx context.Context, settings backend.DataSourceInstanceSettings, clientOpts *sdkhttpclient.Options) error {
+	// Set SigV4 service namespace
+	if clientOpts.SigV4 != nil {
+		clientOpts.SigV4.Service = "aps"
 	}
 
-	qd, err := i.queryData.Execute(ctx, req)
-	instrumentation.UpdateQueryDataMetrics(err, qd)
-
-	return qd, err
-}
-
-func (s *Service) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
-	i, err := s.getInstance(ctx, req.PluginContext)
+	azureSettings, err := azsettings.ReadSettings(ctx)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to read Azure settings from Grafana: %v", err)
 	}
 
-	if strings.EqualFold(req.Path, "version-detect") {
-		versionObj, found := i.versionCache.Get("version")
-		if found {
-			return sender.Send(versionObj.(*backend.CallResourceResponse))
-		}
-
-		vResp, err := i.resource.DetectVersion(ctx, req)
+	// Set Azure authentication
+	if azureSettings.AzureAuthEnabled {
+		err = azureauth.ConfigureAzureAuthentication(settings, azureSettings, clientOpts)
 		if err != nil {
-			return err
+			return fmt.Errorf("error configuring Azure auth: %v", err)
 		}
-		i.versionCache.Set("version", vResp, cache.DefaultExpiration)
-		return sender.Send(vResp)
-	}
-
-	resp, err := i.resource.Execute(ctx, req)
-	if err != nil {
-		return err
 	}
 
-	return sender.Send(resp)
-}
-
-func (s *Service) getInstance(ctx context.Context, pluginCtx backend.PluginContext) (*instance, error) {
-	i, err := s.im.Get(ctx, pluginCtx)
-	if err != nil {
-		return nil, err
-	}
-	in := i.(instance)
-	return &in, nil
-}
-
-// IsAPIError returns whether err is or wraps a Prometheus error.
-func IsAPIError(err error) bool {
-	// Check if the right error type is in err's chain.
-	var e *apiv1.Error
-	return errors.As(err, &e)
-}
-
-func ConvertAPIError(err error) error {
-	var e *apiv1.Error
-	if errors.As(err, &e) {
-		return fmt.Errorf("%s: %s", e.Msg, e.Detail)
-	}
-	return err
+	return nil
 }
diff --git a/pkg/tsdb/prometheus/prometheus_test.go b/pkg/tsdb/prometheus/prometheus_test.go
index 735ed25e38c32..f778956115ef6 100644
--- a/pkg/tsdb/prometheus/prometheus_test.go
+++ b/pkg/tsdb/prometheus/prometheus_test.go
@@ -2,118 +2,53 @@ package prometheus
 
 import (
 	"context"
-	"io"
-	"net/http"
 	"testing"
-	"time"
 
+	"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/setting"
+	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/stretchr/testify/require"
 )
 
-type fakeSender struct{}
-
-func (sender *fakeSender) Send(resp *backend.CallResourceResponse) error {
-	return nil
-}
-
-type fakeRoundtripper struct {
-	Req *http.Request
-}
-
-func (rt *fakeRoundtripper) RoundTrip(req *http.Request) (*http.Response, error) {
-	rt.Req = req
-	return &http.Response{
-		Status:        "200",
-		StatusCode:    200,
-		Header:        nil,
-		Body:          nil,
-		ContentLength: 0,
-	}, nil
-}
-
-type fakeHTTPClientProvider struct {
-	httpclient.Provider
-	Roundtripper *fakeRoundtripper
-}
-
-func (provider *fakeHTTPClientProvider) New(opts ...httpclient.Options) (*http.Client, error) {
-	client := &http.Client{}
-	provider.Roundtripper = &fakeRoundtripper{}
-	client.Transport = provider.Roundtripper
-	return client, nil
-}
-
-func (provider *fakeHTTPClientProvider) GetTransport(opts ...httpclient.Options) (http.RoundTripper, error) {
-	return &fakeRoundtripper{}, nil
-}
-
-func getMockPromTestSDKProvider(f *fakeHTTPClientProvider) *httpclient.Provider {
-	anotherFN := func(o httpclient.Options, next http.RoundTripper) http.RoundTripper {
-		_, _ = f.New()
-		return f.Roundtripper
-	}
-	fn := httpclient.MiddlewareFunc(anotherFN)
-	mid := httpclient.NamedMiddlewareFunc("mock", fn)
-	return httpclient.NewProvider(httpclient.ProviderOptions{Middlewares: []httpclient.Middleware{mid}})
-}
-
-func TestService(t *testing.T) {
-	t.Run("Service", func(t *testing.T) {
-		t.Run("CallResource", func(t *testing.T) {
-			t.Run("creates correct request", func(t *testing.T) {
-				f := &fakeHTTPClientProvider{}
-				httpProvider := getMockPromTestSDKProvider(f)
-				service := &Service{
-					im: datasource.NewInstanceManager(newInstanceSettings(httpProvider, &setting.Cfg{}, &featuremgmt.FeatureManager{}, backend.NewLoggerWith("logger", "test"))),
-				}
-
-				req := &backend.CallResourceRequest{
-					PluginContext: backend.PluginContext{
-						OrgID:               0,
-						PluginID:            "prometheus",
-						User:                nil,
-						AppInstanceSettings: nil,
-						DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{
-							ID:               0,
-							UID:              "",
-							Type:             "prometheus",
-							Name:             "test-prom",
-							URL:              "http://localhost:9090",
-							User:             "",
-							Database:         "",
-							BasicAuthEnabled: true,
-							BasicAuthUser:    "admin",
-							Updated:          time.Time{},
-							JSONData:         []byte("{}"),
-						},
-					},
-					Path:   "/api/v1/series",
-					Method: http.MethodPost,
-					URL:    "/api/v1/series",
-					Body:   []byte("match%5B%5D: ALERTS\nstart: 1655271408\nend: 1655293008"),
+func TestExtendClientOpts(t *testing.T) {
+	t.Run("add azure credentials if configured", func(t *testing.T) {
+		cfg := backend.NewGrafanaCfg(map[string]string{
+			azsettings.AzureCloud:       azsettings.AzurePublic,
+			azsettings.AzureAuthEnabled: "true",
+		})
+		settings := backend.DataSourceInstanceSettings{
+			BasicAuthEnabled: false,
+			BasicAuthUser:    "",
+			JSONData: []byte(`{
+				"azureCredentials": {
+					"authType": "msi"
 				}
+			}`),
+			DecryptedSecureJSONData: map[string]string{},
+		}
+		ctx := backend.WithGrafanaConfig(context.Background(), cfg)
+		opts := &sdkhttpclient.Options{}
+		err := extendClientOpts(ctx, settings, opts)
+		require.NoError(t, err)
+		require.Equal(t, 1, len(opts.Middlewares))
+	})
 
-				sender := &fakeSender{}
-				err := service.CallResource(context.Background(), req, sender)
-				require.NoError(t, err)
-				require.Equal(
-					t,
-					http.Header{
-						"Content-Type":    {"application/x-www-form-urlencoded"},
-						"Idempotency-Key": []string(nil),
-					},
-					f.Roundtripper.Req.Header)
-				require.Equal(t, http.MethodPost, f.Roundtripper.Req.Method)
-				body, err := io.ReadAll(f.Roundtripper.Req.Body)
-				require.NoError(t, err)
-				require.Equal(t, []byte("match%5B%5D: ALERTS\nstart: 1655271408\nend: 1655293008"), body)
-				require.Equal(t, "http://localhost:9090/api/v1/series", f.Roundtripper.Req.URL.String())
-			})
-		})
+	t.Run("add sigV4 auth if opts has SigV4 configured", func(t *testing.T) {
+		settings := backend.DataSourceInstanceSettings{
+			BasicAuthEnabled:        false,
+			BasicAuthUser:           "",
+			JSONData:                []byte(""),
+			DecryptedSecureJSONData: map[string]string{},
+		}
+		opts := &sdkhttpclient.Options{
+			SigV4: &sdkhttpclient.SigV4Config{
+				AuthType:  "test",
+				AccessKey: "accesskey",
+				SecretKey: "secretkey",
+			},
+		}
+		err := extendClientOpts(context.Background(), settings, opts)
+		require.NoError(t, err)
+		require.Equal(t, "aps", opts.SigV4.Service)
 	})
 }
diff --git a/pkg/tsdb/prometheus/querydata/request.go b/pkg/tsdb/prometheus/querydata/request.go
deleted file mode 100644
index 5992e5ded631e..0000000000000
--- a/pkg/tsdb/prometheus/querydata/request.go
+++ /dev/null
@@ -1,220 +0,0 @@
-package querydata
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-	"regexp"
-	"time"
-
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana-plugin-sdk-go/data"
-	"go.opentelemetry.io/otel/attribute"
-	"go.opentelemetry.io/otel/trace"
-
-	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/tsdb/intervalv2"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/client"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/models"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/querydata/exemplar"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/utils"
-	"github.com/grafana/grafana/pkg/util/maputil"
-)
-
-const legendFormatAuto = "__auto"
-
-var legendFormatRegexp = regexp.MustCompile(`\{\{\s*(.+?)\s*\}\}`)
-
-type ExemplarEvent struct {
-	Time   time.Time
-	Value  float64
-	Labels map[string]string
-}
-
-// QueryData handles querying but different from buffered package uses a custom client instead of default Go Prom
-// client.
-type QueryData struct {
-	intervalCalculator intervalv2.Calculator
-	tracer             trace.Tracer
-	client             *client.Client
-	log                log.Logger
-	ID                 int64
-	URL                string
-	TimeInterval       string
-	enableDataplane    bool
-	exemplarSampler    func() exemplar.Sampler
-}
-
-func New(
-	httpClient *http.Client,
-	features featuremgmt.FeatureToggles,
-	settings backend.DataSourceInstanceSettings,
-	plog log.Logger,
-) (*QueryData, error) {
-	jsonData, err := utils.GetJsonData(settings)
-	if err != nil {
-		return nil, err
-	}
-	httpMethod, _ := maputil.GetStringOptional(jsonData, "httpMethod")
-
-	timeInterval, err := maputil.GetStringOptional(jsonData, "timeInterval")
-	if err != nil {
-		return nil, err
-	}
-
-	promClient := client.NewClient(httpClient, httpMethod, settings.URL)
-
-	// standard deviation sampler is the default for backwards compatibility
-	exemplarSampler := exemplar.NewStandardDeviationSampler
-
-	if features.IsEnabled(featuremgmt.FlagDisablePrometheusExemplarSampling) {
-		exemplarSampler = exemplar.NewNoOpSampler
-	}
-
-	return &QueryData{
-		intervalCalculator: intervalv2.NewCalculator(),
-		tracer:             tracing.DefaultTracer(),
-		log:                plog,
-		client:             promClient,
-		TimeInterval:       timeInterval,
-		ID:                 settings.ID,
-		URL:                settings.URL,
-		enableDataplane:    features.IsEnabled(featuremgmt.FlagPrometheusDataplane),
-		exemplarSampler:    exemplarSampler,
-	}, nil
-}
-
-func (s *QueryData) Execute(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
-	fromAlert := req.Headers["FromAlert"] == "true"
-	result := backend.QueryDataResponse{
-		Responses: backend.Responses{},
-	}
-
-	for _, q := range req.Queries {
-		query, err := models.Parse(q, s.TimeInterval, s.intervalCalculator, fromAlert)
-		if err != nil {
-			return &result, err
-		}
-		r := s.fetch(ctx, s.client, query, req.Headers)
-		if r == nil {
-			s.log.FromContext(ctx).Debug("Received nil response from runQuery", "query", query.Expr)
-			continue
-		}
-		result.Responses[q.RefID] = *r
-	}
-
-	return &result, nil
-}
-
-func (s *QueryData) fetch(ctx context.Context, client *client.Client, q *models.Query, headers map[string]string) *backend.DataResponse {
-	traceCtx, end := s.trace(ctx, q)
-	defer end()
-
-	logger := s.log.FromContext(traceCtx)
-	logger.Debug("Sending query", "start", q.Start, "end", q.End, "step", q.Step, "query", q.Expr)
-
-	dr := &backend.DataResponse{
-		Frames: data.Frames{},
-		Error:  nil,
-	}
-
-	if q.InstantQuery {
-		res := s.instantQuery(traceCtx, client, q, headers)
-		dr.Error = res.Error
-		dr.Frames = res.Frames
-	}
-
-	if q.RangeQuery {
-		res := s.rangeQuery(traceCtx, client, q, headers)
-		if res.Error != nil {
-			if dr.Error == nil {
-				dr.Error = res.Error
-			} else {
-				dr.Error = fmt.Errorf("%v %w", dr.Error, res.Error)
-			}
-		}
-		dr.Frames = append(dr.Frames, res.Frames...)
-	}
-
-	if q.ExemplarQuery {
-		res := s.exemplarQuery(traceCtx, client, q, headers)
-		if res.Error != nil {
-			// If exemplar query returns error, we want to only log it and
-			// continue with other results processing
-			logger.Error("Exemplar query failed", "query", q.Expr, "err", res.Error)
-		}
-		dr.Frames = append(dr.Frames, res.Frames...)
-	}
-
-	return dr
-}
-
-func (s *QueryData) rangeQuery(ctx context.Context, c *client.Client, q *models.Query, headers map[string]string) backend.DataResponse {
-	res, err := c.QueryRange(ctx, q)
-	if err != nil {
-		return backend.DataResponse{
-			Error: err,
-		}
-	}
-
-	defer func() {
-		err := res.Body.Close()
-		if err != nil {
-			s.log.Warn("Failed to close query range response body", "error", err)
-		}
-	}()
-
-	return s.parseResponse(ctx, q, res)
-}
-
-func (s *QueryData) instantQuery(ctx context.Context, c *client.Client, q *models.Query, headers map[string]string) backend.DataResponse {
-	res, err := c.QueryInstant(ctx, q)
-	if err != nil {
-		return backend.DataResponse{
-			Error: err,
-		}
-	}
-
-	// This is only for health check fall back scenario
-	if res.StatusCode != 200 && q.RefId == "__healthcheck__" {
-		return backend.DataResponse{
-			Error: fmt.Errorf(res.Status),
-		}
-	}
-
-	defer func() {
-		err := res.Body.Close()
-		if err != nil {
-			s.log.Warn("Failed to close response body", "error", err)
-		}
-	}()
-
-	return s.parseResponse(ctx, q, res)
-}
-
-func (s *QueryData) exemplarQuery(ctx context.Context, c *client.Client, q *models.Query, headers map[string]string) backend.DataResponse {
-	res, err := c.QueryExemplars(ctx, q)
-	if err != nil {
-		return backend.DataResponse{
-			Error: err,
-		}
-	}
-
-	defer func() {
-		err := res.Body.Close()
-		if err != nil {
-			s.log.Warn("Failed to close response body", "error", err)
-		}
-	}()
-	return s.parseResponse(ctx, q, res)
-}
-
-func (s *QueryData) trace(ctx context.Context, q *models.Query) (context.Context, func()) {
-	return utils.StartTrace(ctx, s.tracer, "datasource.prometheus",
-		attribute.String("expr", q.Expr),
-		attribute.Int64("start_unixnano", q.Start.UnixNano()),
-		attribute.Int64("stop_unixnano", q.End.UnixNano()),
-	)
-}
diff --git a/pkg/tsdb/prometheus/querydata/request_test.go b/pkg/tsdb/prometheus/querydata/request_test.go
deleted file mode 100644
index 82a701db46a76..0000000000000
--- a/pkg/tsdb/prometheus/querydata/request_test.go
+++ /dev/null
@@ -1,500 +0,0 @@
-package querydata_test
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"math"
-	"net/http"
-	"testing"
-	"time"
-
-	apiv1 "github.com/prometheus/client_golang/api/prometheus/v1"
-	p "github.com/prometheus/common/model"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/kinds/dataquery"
-
-	"github.com/grafana/kindsys"
-
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
-	"github.com/grafana/grafana-plugin-sdk-go/data"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/client"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/models"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/querydata"
-)
-
-func TestPrometheus_parseTimeSeriesResponse(t *testing.T) {
-	t.Run("exemplars response should be sampled and parsed normally", func(t *testing.T) {
-		t.Skip()
-		exemplars := []apiv1.ExemplarQueryResult{
-			{
-				SeriesLabels: p.LabelSet{
-					"__name__": "tns_request_duration_seconds_bucket",
-					"instance": "app:80",
-					"job":      "tns/app",
-				},
-				Exemplars: []apiv1.Exemplar{
-					{
-						Labels:    p.LabelSet{"traceID": "test1"},
-						Value:     0.003535405,
-						Timestamp: p.TimeFromUnixNano(time.Now().Add(-2 * time.Minute).UnixNano()),
-					},
-					{
-						Labels:    p.LabelSet{"traceID": "test2"},
-						Value:     0.005555605,
-						Timestamp: p.TimeFromUnixNano(time.Now().Add(-4 * time.Minute).UnixNano()),
-					},
-					{
-						Labels:    p.LabelSet{"traceID": "test3"},
-						Value:     0.007545445,
-						Timestamp: p.TimeFromUnixNano(time.Now().Add(-6 * time.Minute).UnixNano()),
-					},
-					{
-						Labels:    p.LabelSet{"traceID": "test4"},
-						Value:     0.009545445,
-						Timestamp: p.TimeFromUnixNano(time.Now().Add(-7 * time.Minute).UnixNano()),
-					},
-				},
-			},
-		}
-
-		tctx, err := setup()
-		require.NoError(t, err)
-
-		qm := models.QueryModel{
-			LegendFormat: "legend {{app}}",
-			UtcOffsetSec: 0,
-			PrometheusDataQuery: dataquery.PrometheusDataQuery{
-				Exemplar: kindsys.Ptr(true),
-			},
-		}
-		b, err := json.Marshal(&qm)
-		require.NoError(t, err)
-		query := backend.DataQuery{
-			RefID: "A",
-			JSON:  b,
-		}
-		res, err := execute(tctx, query, exemplars)
-		require.NoError(t, err)
-
-		// Test fields
-		require.Len(t, res, 1)
-		//		require.Equal(t, res[0].Name, "exemplar")
-		require.Equal(t, res[0].Fields[0].Name, "Time")
-		require.Equal(t, res[0].Fields[1].Name, "Value")
-		require.Len(t, res[0].Fields, 6)
-
-		// Test correct values (sampled to 2)
-		require.Equal(t, res[0].Fields[1].Len(), 2)
-		require.Equal(t, res[0].Fields[1].At(0), 0.009545445)
-		require.Equal(t, res[0].Fields[1].At(1), 0.003535405)
-	})
-
-	t.Run("matrix response should be parsed normally", func(t *testing.T) {
-		values := []p.SamplePair{
-			{Value: 1, Timestamp: 1000},
-			{Value: 2, Timestamp: 2000},
-			{Value: 3, Timestamp: 3000},
-			{Value: 4, Timestamp: 4000},
-			{Value: 5, Timestamp: 5000},
-		}
-		result := queryResult{
-			Type: p.ValMatrix,
-			Result: p.Matrix{
-				&p.SampleStream{
-					Metric: p.Metric{"app": "Application", "tag2": "tag2"},
-					Values: values,
-				},
-			},
-		}
-
-		qm := models.QueryModel{
-			LegendFormat: "legend {{app}}",
-			UtcOffsetSec: 0,
-			PrometheusDataQuery: dataquery.PrometheusDataQuery{
-				Range: kindsys.Ptr(true),
-			},
-		}
-		b, err := json.Marshal(&qm)
-		require.NoError(t, err)
-		query := backend.DataQuery{
-			TimeRange: backend.TimeRange{
-				From: time.Unix(1, 0).UTC(),
-				To:   time.Unix(5, 0).UTC(),
-			},
-			JSON: b,
-		}
-		tctx, err := setup()
-		require.NoError(t, err)
-		res, err := execute(tctx, query, result)
-		require.NoError(t, err)
-
-		require.Len(t, res, 1)
-		require.Len(t, res[0].Fields, 2)
-		require.Len(t, res[0].Fields[0].Labels, 0)
-		require.Equal(t, "Time", res[0].Fields[0].Name)
-		require.Len(t, res[0].Fields[1].Labels, 2)
-		require.Equal(t, "app=Application, tag2=tag2", res[0].Fields[1].Labels.String())
-		require.Equal(t, "legend Application", res[0].Name)
-
-		// Ensure the timestamps are UTC zoned
-		testValue := res[0].Fields[0].At(0)
-		require.Equal(t, "UTC", testValue.(time.Time).Location().String())
-	})
-
-	t.Run("matrix response with missed data points should be parsed correctly", func(t *testing.T) {
-		values := []p.SamplePair{
-			{Value: 1, Timestamp: 1000},
-			{Value: 4, Timestamp: 4000},
-		}
-		result := queryResult{
-			Type: p.ValMatrix,
-			Result: p.Matrix{
-				&p.SampleStream{
-					Metric: p.Metric{"app": "Application", "tag2": "tag2"},
-					Values: values,
-				},
-			},
-		}
-
-		qm := models.QueryModel{
-			LegendFormat: "",
-			UtcOffsetSec: 0,
-			PrometheusDataQuery: dataquery.PrometheusDataQuery{
-				Range: kindsys.Ptr(true),
-			},
-		}
-		b, err := json.Marshal(&qm)
-		require.NoError(t, err)
-		query := backend.DataQuery{
-			TimeRange: backend.TimeRange{
-				From: time.Unix(1, 0).UTC(),
-				To:   time.Unix(4, 0).UTC(),
-			},
-			JSON: b,
-		}
-		tctx, err := setup()
-		require.NoError(t, err)
-		res, err := execute(tctx, query, result)
-
-		require.NoError(t, err)
-		require.Len(t, res, 1)
-		require.Equal(t, res[0].Fields[0].Len(), 2)
-		require.Equal(t, time.Unix(1, 0).UTC(), res[0].Fields[0].At(0))
-		require.Equal(t, time.Unix(4, 0).UTC(), res[0].Fields[0].At(1))
-		require.Equal(t, res[0].Fields[1].Len(), 2)
-		require.Equal(t, float64(1), res[0].Fields[1].At(0).(float64))
-		require.Equal(t, float64(4), res[0].Fields[1].At(1).(float64))
-	})
-
-	t.Run("matrix response with from alerting missed data points should be parsed correctly", func(t *testing.T) {
-		values := []p.SamplePair{
-			{Value: 1, Timestamp: 1000},
-			{Value: 4, Timestamp: 4000},
-		}
-		result := queryResult{
-			Type: p.ValMatrix,
-			Result: p.Matrix{
-				&p.SampleStream{
-					Metric: p.Metric{"app": "Application", "tag2": "tag2"},
-					Values: values,
-				},
-			},
-		}
-
-		qm := models.QueryModel{
-			LegendFormat: "",
-			UtcOffsetSec: 0,
-			PrometheusDataQuery: dataquery.PrometheusDataQuery{
-				Range: kindsys.Ptr(true),
-			},
-		}
-		b, err := json.Marshal(&qm)
-		require.NoError(t, err)
-		query := backend.DataQuery{
-			TimeRange: backend.TimeRange{
-				From: time.Unix(1, 0).UTC(),
-				To:   time.Unix(4, 0).UTC(),
-			},
-			JSON: b,
-		}
-		tctx, err := setup()
-		require.NoError(t, err)
-		res, err := execute(tctx, query, result)
-
-		require.NoError(t, err)
-		require.Len(t, res, 1)
-		require.Len(t, res[0].Fields, 2)
-		require.Len(t, res[0].Fields[0].Labels, 0)
-		require.Equal(t, res[0].Fields[0].Name, "Time")
-		require.Len(t, res[0].Fields[1].Labels, 2)
-		require.Equal(t, res[0].Fields[1].Labels.String(), "app=Application, tag2=tag2")
-		require.Equal(t, "{app=\"Application\", tag2=\"tag2\"}", res[0].Name)
-	})
-
-	t.Run("matrix response with NaN value should be changed to null", func(t *testing.T) {
-		result := queryResult{
-			Type: p.ValMatrix,
-			Result: p.Matrix{
-				&p.SampleStream{
-					Metric: p.Metric{"app": "Application"},
-					Values: []p.SamplePair{
-						{Value: p.SampleValue(math.NaN()), Timestamp: 1000},
-					},
-				},
-			},
-		}
-
-		qm := models.QueryModel{
-			LegendFormat: "",
-			UtcOffsetSec: 0,
-			PrometheusDataQuery: dataquery.PrometheusDataQuery{
-				Range: kindsys.Ptr(true),
-			},
-		}
-		b, err := json.Marshal(&qm)
-		require.NoError(t, err)
-		query := backend.DataQuery{
-			TimeRange: backend.TimeRange{
-				From: time.Unix(1, 0).UTC(),
-				To:   time.Unix(4, 0).UTC(),
-			},
-			JSON: b,
-		}
-
-		tctx, err := setup()
-		require.NoError(t, err)
-		res, err := execute(tctx, query, result)
-		require.NoError(t, err)
-
-		require.Equal(t, "{app=\"Application\"}", res[0].Name)
-		require.True(t, math.IsNaN(res[0].Fields[1].At(0).(float64)))
-	})
-
-	t.Run("vector response should be parsed normally", func(t *testing.T) {
-		qr := queryResult{
-			Type: p.ValVector,
-			Result: p.Vector{
-				&p.Sample{
-					Metric:    p.Metric{"app": "Application", "tag2": "tag2"},
-					Value:     1,
-					Timestamp: 123,
-				},
-			},
-		}
-		qm := models.QueryModel{
-			LegendFormat: "legend {{app}}",
-			UtcOffsetSec: 0,
-			PrometheusDataQuery: dataquery.PrometheusDataQuery{
-				Instant: kindsys.Ptr(true),
-			},
-		}
-		b, err := json.Marshal(&qm)
-		require.NoError(t, err)
-		query := backend.DataQuery{
-			JSON: b,
-		}
-		tctx, err := setup()
-		require.NoError(t, err)
-		res, err := execute(tctx, query, qr)
-		require.NoError(t, err)
-
-		require.Len(t, res, 1)
-		require.Len(t, res[0].Fields, 2)
-		require.Len(t, res[0].Fields[0].Labels, 0)
-		require.Equal(t, res[0].Fields[0].Name, "Time")
-		require.Equal(t, res[0].Fields[0].Name, "Time")
-		require.Len(t, res[0].Fields[1].Labels, 2)
-		require.Equal(t, res[0].Fields[1].Labels.String(), "app=Application, tag2=tag2")
-		require.Equal(t, "legend Application", res[0].Name)
-
-		// Ensure the timestamps are UTC zoned
-		testValue := res[0].Fields[0].At(0)
-		require.Equal(t, "UTC", testValue.(time.Time).Location().String())
-		require.Equal(t, int64(123), testValue.(time.Time).UnixMilli())
-	})
-
-	t.Run("scalar response should be parsed normally", func(t *testing.T) {
-		t.Skip("TODO: implement scalar responses")
-		qr := queryResult{
-			Type: p.ValScalar,
-			Result: &p.Scalar{
-				Value:     1,
-				Timestamp: 123,
-			},
-		}
-		qm := models.QueryModel{
-			LegendFormat: "",
-			UtcOffsetSec: 0,
-			PrometheusDataQuery: dataquery.PrometheusDataQuery{
-				Instant: kindsys.Ptr(true),
-			},
-		}
-		b, err := json.Marshal(&qm)
-		require.NoError(t, err)
-		query := backend.DataQuery{
-			JSON: b,
-		}
-		tctx, err := setup()
-		require.NoError(t, err)
-		res, err := execute(tctx, query, qr)
-		require.NoError(t, err)
-
-		require.Len(t, res, 1)
-		require.Len(t, res[0].Fields, 2)
-		require.Len(t, res[0].Fields[0].Labels, 0)
-		require.Equal(t, res[0].Fields[0].Name, "Time")
-		require.Equal(t, "1", res[0].Fields[1].Name)
-
-		// Ensure the timestamps are UTC zoned
-		testValue := res[0].Fields[0].At(0)
-		require.Equal(t, "UTC", testValue.(time.Time).Location().String())
-		require.Equal(t, int64(123), testValue.(time.Time).UnixMilli())
-	})
-}
-
-type queryResult struct {
-	Type   p.ValueType `json:"resultType"`
-	Result any         `json:"result"`
-}
-
-func executeWithHeaders(tctx *testContext, query backend.DataQuery, qr any, headers map[string]string) (data.Frames, error) {
-	req := backend.QueryDataRequest{
-		Queries: []backend.DataQuery{query},
-		Headers: headers,
-	}
-
-	promRes, err := toAPIResponse(qr)
-	defer func() {
-		if err := promRes.Body.Close(); err != nil {
-			fmt.Println(fmt.Errorf("response body close error: %v", err))
-		}
-	}()
-	if err != nil {
-		return nil, err
-	}
-	tctx.httpProvider.setResponse(promRes)
-
-	res, err := tctx.queryData.Execute(context.Background(), &req)
-	if err != nil {
-		return nil, err
-	}
-
-	return res.Responses[req.Queries[0].RefID].Frames, nil
-}
-
-func execute(tctx *testContext, query backend.DataQuery, qr any) (data.Frames, error) {
-	return executeWithHeaders(tctx, query, qr, map[string]string{})
-}
-
-type apiResponse struct {
-	Status string          `json:"status"`
-	Data   json.RawMessage `json:"data"`
-}
-
-func toAPIResponse(d any) (*http.Response, error) {
-	b, err := json.Marshal(d)
-	if err != nil {
-		return nil, err
-	}
-
-	res := apiResponse{
-		Status: "success",
-		Data:   json.RawMessage(b),
-	}
-
-	raw, err := json.Marshal(&res)
-	if err != nil {
-		return nil, err
-	}
-
-	return &http.Response{
-		StatusCode: 200,
-		Body:       io.NopCloser(bytes.NewReader(raw)),
-	}, nil
-}
-
-type testContext struct {
-	httpProvider *fakeHttpClientProvider
-	queryData    *querydata.QueryData
-}
-
-func setup() (*testContext, error) {
-	httpProvider := &fakeHttpClientProvider{
-		opts: httpclient.Options{
-			Timeouts: &httpclient.DefaultTimeoutOptions,
-		},
-		res: &http.Response{
-			StatusCode: 200,
-			Body:       io.NopCloser(bytes.NewReader([]byte(`{}`))),
-		},
-	}
-	settings := backend.DataSourceInstanceSettings{
-		URL:      "http://localhost:9090",
-		JSONData: json.RawMessage(`{"timeInterval": "15s"}`),
-	}
-
-	features := &fakeFeatureToggles{flags: map[string]bool{"prometheusBufferedClient": false}}
-
-	opts, err := client.CreateTransportOptions(context.Background(), settings, &setting.Cfg{}, log.New())
-	if err != nil {
-		return nil, err
-	}
-
-	httpClient, err := httpProvider.New(*opts)
-	if err != nil {
-		return nil, err
-	}
-
-	queryData, _ := querydata.New(httpClient, features, settings, log.New())
-
-	return &testContext{
-		httpProvider: httpProvider,
-		queryData:    queryData,
-	}, nil
-}
-
-type fakeFeatureToggles struct {
-	flags map[string]bool
-}
-
-func (f *fakeFeatureToggles) IsEnabled(feature string) bool {
-	return f.flags[feature]
-}
-
-type fakeHttpClientProvider struct {
-	httpclient.Provider
-	opts httpclient.Options
-	req  *http.Request
-	res  *http.Response
-}
-
-func (p *fakeHttpClientProvider) New(opts ...httpclient.Options) (*http.Client, error) {
-	p.opts = opts[0]
-	c, err := httpclient.New(opts[0])
-	if err != nil {
-		return nil, err
-	}
-	c.Transport = p
-	return c, nil
-}
-
-func (p *fakeHttpClientProvider) GetTransport(opts ...httpclient.Options) (http.RoundTripper, error) {
-	p.opts = opts[0]
-	return http.DefaultTransport, nil
-}
-
-func (p *fakeHttpClientProvider) setResponse(res *http.Response) {
-	p.res = res
-}
-
-func (p *fakeHttpClientProvider) RoundTrip(req *http.Request) (*http.Response, error) {
-	p.req = req
-	return p.res, nil
-}
diff --git a/pkg/tsdb/prometheus/resource/resource.go b/pkg/tsdb/prometheus/resource/resource.go
deleted file mode 100644
index 1c5223c361731..0000000000000
--- a/pkg/tsdb/prometheus/resource/resource.go
+++ /dev/null
@@ -1,85 +0,0 @@
-package resource
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"net/http"
-
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/client"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/utils"
-	"github.com/grafana/grafana/pkg/util/maputil"
-)
-
-type Resource struct {
-	promClient *client.Client
-	log        log.Logger
-}
-
-func New(
-	httpClient *http.Client,
-	settings backend.DataSourceInstanceSettings,
-	plog log.Logger,
-) (*Resource, error) {
-	jsonData, err := utils.GetJsonData(settings)
-	if err != nil {
-		return nil, err
-	}
-	httpMethod, _ := maputil.GetStringOptional(jsonData, "httpMethod")
-
-	if httpMethod == "" {
-		httpMethod = http.MethodPost
-	}
-
-	return &Resource{
-		log:        plog,
-		promClient: client.NewClient(httpClient, httpMethod, settings.URL),
-	}, nil
-}
-
-func (r *Resource) Execute(ctx context.Context, req *backend.CallResourceRequest) (*backend.CallResourceResponse, error) {
-	r.log.FromContext(ctx).Debug("Sending resource query", "URL", req.URL)
-	resp, err := r.promClient.QueryResource(ctx, req)
-	if err != nil {
-		return nil, fmt.Errorf("error querying resource: %v", err)
-	}
-
-	// frontend sets the X-Grafana-Cache with the desired response cache control value
-	if len(req.GetHTTPHeaders().Get("X-Grafana-Cache")) > 0 {
-		resp.Header.Set("X-Grafana-Cache", "y")
-		resp.Header.Set("Cache-Control", req.GetHTTPHeaders().Get("X-Grafana-Cache"))
-	}
-
-	defer func() {
-		tmpErr := resp.Body.Close()
-		if tmpErr != nil && err == nil {
-			err = tmpErr
-		}
-	}()
-
-	var buf bytes.Buffer
-	// Should be more efficient than ReadAll. See https://github.com/prometheus/client_golang/pull/976
-	_, err = buf.ReadFrom(resp.Body)
-	body := buf.Bytes()
-	if err != nil {
-		return nil, err
-	}
-	callResponse := &backend.CallResourceResponse{
-		Status:  resp.StatusCode,
-		Headers: resp.Header,
-		Body:    body,
-	}
-
-	return callResponse, err
-}
-
-func (r *Resource) DetectVersion(ctx context.Context, req *backend.CallResourceRequest) (*backend.CallResourceResponse, error) {
-	newReq := &backend.CallResourceRequest{
-		PluginContext: req.PluginContext,
-		Path:          "/api/v1/status/buildinfo",
-	}
-
-	return r.Execute(ctx, newReq)
-}
diff --git a/pkg/tsdb/sqleng/proxyutil/proxy_test_util.go b/pkg/tsdb/sqleng/proxyutil/proxy_test_util.go
deleted file mode 100644
index 8b9783e1b37f1..0000000000000
--- a/pkg/tsdb/sqleng/proxyutil/proxy_test_util.go
+++ /dev/null
@@ -1,111 +0,0 @@
-package proxyutil
-
-import (
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"encoding/pem"
-	"math/big"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	sdkproxy "github.com/grafana/grafana-plugin-sdk-go/backend/proxy"
-	"github.com/stretchr/testify/require"
-)
-
-func SetupTestSecureSocksProxySettings(t *testing.T) *sdkproxy.ClientCfg {
-	t.Helper()
-	proxyAddress := "localhost:3000"
-	serverName := "localhost"
-	tempDir := t.TempDir()
-
-	// generate test rootCA
-	ca := &x509.Certificate{
-		SerialNumber: big.NewInt(2019),
-		Subject: pkix.Name{
-			Organization: []string{"Grafana Labs"},
-			CommonName:   "Grafana",
-		},
-		NotBefore:             time.Now(),
-		NotAfter:              time.Now().AddDate(10, 0, 0),
-		IsCA:                  true,
-		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth},
-		KeyUsage:              x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
-		BasicConstraintsValid: true,
-	}
-	caPrivKey, err := rsa.GenerateKey(rand.Reader, 4096)
-	require.NoError(t, err)
-	caBytes, err := x509.CreateCertificate(rand.Reader, ca, ca, &caPrivKey.PublicKey, caPrivKey)
-	require.NoError(t, err)
-	rootCACert := filepath.Join(tempDir, "ca.cert")
-	// nolint:gosec
-	// The gosec G304 warning can be ignored because all values come from the test
-	caCertFile, err := os.Create(rootCACert)
-	require.NoError(t, err)
-	err = pem.Encode(caCertFile, &pem.Block{
-		Type:  "CERTIFICATE",
-		Bytes: caBytes,
-	})
-	require.NoError(t, err)
-
-	err = caCertFile.Close()
-	require.NoError(t, err)
-
-	// generate test client cert & key
-	cert := &x509.Certificate{
-		SerialNumber: big.NewInt(2019),
-		Subject: pkix.Name{
-			Organization: []string{"Grafana Labs"},
-			CommonName:   "Grafana",
-		},
-		NotBefore:    time.Now(),
-		NotAfter:     time.Now().AddDate(10, 0, 0),
-		SubjectKeyId: []byte{1, 2, 3, 4, 6},
-		ExtKeyUsage:  []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth},
-		KeyUsage:     x509.KeyUsageDigitalSignature,
-	}
-	certPrivKey, err := rsa.GenerateKey(rand.Reader, 4096)
-	require.NoError(t, err)
-	certBytes, err := x509.CreateCertificate(rand.Reader, cert, ca, &certPrivKey.PublicKey, caPrivKey)
-	require.NoError(t, err)
-	clientCert := filepath.Join(tempDir, "client.cert")
-	// nolint:gosec
-	// The gosec G304 warning can be ignored because all values come from the test
-	certFile, err := os.Create(clientCert)
-	require.NoError(t, err)
-	err = pem.Encode(certFile, &pem.Block{
-		Type:  "CERTIFICATE",
-		Bytes: certBytes,
-	})
-	require.NoError(t, err)
-
-	err = certFile.Close()
-	require.NoError(t, err)
-
-	clientKey := filepath.Join(tempDir, "client.key")
-	// nolint:gosec
-	// The gosec G304 warning can be ignored because all values come from the test
-	keyFile, err := os.Create(clientKey)
-	require.NoError(t, err)
-	err = pem.Encode(keyFile, &pem.Block{
-		Type:  "RSA PRIVATE KEY",
-		Bytes: x509.MarshalPKCS1PrivateKey(certPrivKey),
-	})
-	require.NoError(t, err)
-
-	err = keyFile.Close()
-	require.NoError(t, err)
-
-	settings := &sdkproxy.ClientCfg{
-		ClientCert:   clientCert,
-		ClientKey:    clientKey,
-		RootCA:       rootCACert,
-		ServerName:   serverName,
-		ProxyAddress: proxyAddress,
-	}
-
-	return settings
-}
diff --git a/pkg/tsdb/sqleng/proxyutil/proxy_util.go b/pkg/tsdb/sqleng/proxyutil/proxy_util.go
deleted file mode 100644
index ce82abb955280..0000000000000
--- a/pkg/tsdb/sqleng/proxyutil/proxy_util.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package proxyutil
-
-import (
-	sdkproxy "github.com/grafana/grafana-plugin-sdk-go/backend/proxy"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/tsdb/sqleng"
-)
-
-func GetSQLProxyOptions(cfg setting.SecureSocksDSProxySettings, dsInfo sqleng.DataSourceInfo) *sdkproxy.Options {
-	opts := &sdkproxy.Options{
-		Enabled: dsInfo.JsonData.SecureDSProxy && cfg.Enabled,
-		Auth: &sdkproxy.AuthOptions{
-			Username: dsInfo.UID,
-		},
-		ClientCfg: &sdkproxy.ClientCfg{
-			ClientCert:   cfg.ClientCert,
-			ClientKey:    cfg.ClientKey,
-			ServerName:   cfg.ServerName,
-			RootCA:       cfg.RootCA,
-			ProxyAddress: cfg.ProxyAddress,
-		},
-	}
-	if dsInfo.JsonData.SecureDSProxyUsername != "" {
-		opts.Auth.Username = dsInfo.JsonData.SecureDSProxyUsername
-	}
-	return opts
-}
diff --git a/pkg/tsdb/sqleng/resample_test.go b/pkg/tsdb/sqleng/resample_test.go
index 17e052d75a204..95976c351cc8c 100644
--- a/pkg/tsdb/sqleng/resample_test.go
+++ b/pkg/tsdb/sqleng/resample_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
-	"github.com/grafana/grafana/pkg/util"
+	"github.com/grafana/grafana/pkg/tsdb/sqleng/util"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/pkg/tsdb/sqleng/sql_engine.go b/pkg/tsdb/sqleng/sql_engine.go
index 2700b29136ea5..3dceed95cba05 100644
--- a/pkg/tsdb/sqleng/sql_engine.go
+++ b/pkg/tsdb/sqleng/sql_engine.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"net"
 	"regexp"
+	"runtime/debug"
 	"strconv"
 	"strings"
 	"sync"
@@ -16,23 +17,14 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana-plugin-sdk-go/data/sqlutil"
-	"xorm.io/core"
-	"xorm.io/xorm"
 
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/tsdb/intervalv2"
-	"github.com/grafana/grafana/pkg/util/errutil"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 )
 
-// XormDriverMu is used to allow safe concurrent registering and querying of drivers in xorm
-var XormDriverMu sync.RWMutex
-
 // MetaKeyExecutedQueryString is the key where the executed query should get stored
 const MetaKeyExecutedQueryString = "executedQueryString"
 
-var ErrConnectionFailed = errutil.Internal("sqleng.connectionError")
-
 // SQLMacroEngine interpolates macros into sql. It takes in the Query to have access to query context and
 // timeRange to be able to generate queries that use from and to.
 type SQLMacroEngine interface {
@@ -46,15 +38,6 @@ type SqlQueryResultTransformer interface {
 	GetConverterList() []sqlutil.StringConverter
 }
 
-var sqlIntervalCalculator = intervalv2.NewCalculator()
-
-// NewXormEngine is an xorm.Engine factory, that can be stubbed by tests.
-//
-//nolint:gocritic
-var NewXormEngine = func(driverName string, connectionString string) (*xorm.Engine, error) {
-	return xorm.NewEngine(driverName, connectionString)
-}
-
 type JsonData struct {
 	MaxOpenConns            int    `json:"maxOpenConns"`
 	MaxIdleConns            int    `json:"maxIdleConns"`
@@ -89,17 +72,8 @@ type DataSourceInfo struct {
 	DecryptedSecureJSONData map[string]string
 }
 
-// Defaults for the xorm connection pool
-type DefaultConnectionInfo struct {
-	MaxOpenConns    int
-	MaxIdleConns    int
-	ConnMaxLifetime int
-}
-
 type DataPluginConfiguration struct {
-	DriverName        string
 	DSInfo            DataSourceInfo
-	ConnectionString  string
 	TimeColumnNames   []string
 	MetricColumnTypes []string
 	RowLimit          int64
@@ -108,7 +82,7 @@ type DataPluginConfiguration struct {
 type DataSourceHandler struct {
 	macroEngine            SQLMacroEngine
 	queryResultTransformer SqlQueryResultTransformer
-	engine                 *xorm.Engine
+	db                     *sql.DB
 	timeColumnNames        []string
 	metricColumnTypes      []string
 	log                    log.Logger
@@ -134,19 +108,14 @@ func (e *DataSourceHandler) TransformQueryError(logger log.Logger, err error) er
 	var opErr *net.OpError
 	if errors.As(err, &opErr) {
 		logger.Error("Query error", "err", err)
-		return ErrConnectionFailed.Errorf("failed to connect to server - %s", e.userError)
+		return fmt.Errorf("failed to connect to server - %s", e.userError)
 	}
 
 	return e.queryResultTransformer.TransformQueryError(logger, err)
 }
 
-func NewQueryDataHandler(cfg *setting.Cfg, config DataPluginConfiguration, queryResultTransformer SqlQueryResultTransformer,
+func NewQueryDataHandler(userFacingDefaultError string, db *sql.DB, config DataPluginConfiguration, queryResultTransformer SqlQueryResultTransformer,
 	macroEngine SQLMacroEngine, log log.Logger) (*DataSourceHandler, error) {
-	log.Debug("Creating engine...")
-	defer func() {
-		log.Debug("Engine created")
-	}()
-
 	queryDataHandler := DataSourceHandler{
 		queryResultTransformer: queryResultTransformer,
 		macroEngine:            macroEngine,
@@ -154,7 +123,7 @@ func NewQueryDataHandler(cfg *setting.Cfg, config DataPluginConfiguration, query
 		log:                    log,
 		dsInfo:                 config.DSInfo,
 		rowLimit:               config.RowLimit,
-		userError:              cfg.UserFacingDefaultError,
+		userError:              userFacingDefaultError,
 	}
 
 	if len(config.TimeColumnNames) > 0 {
@@ -165,16 +134,7 @@ func NewQueryDataHandler(cfg *setting.Cfg, config DataPluginConfiguration, query
 		queryDataHandler.metricColumnTypes = config.MetricColumnTypes
 	}
 
-	engine, err := NewXormEngine(config.DriverName, config.ConnectionString)
-	if err != nil {
-		return nil, err
-	}
-
-	engine.SetMaxOpenConns(config.DSInfo.JsonData.MaxOpenConns)
-	engine.SetMaxIdleConns(config.DSInfo.JsonData.MaxIdleConns)
-	engine.SetConnMaxLifetime(time.Duration(config.DSInfo.JsonData.ConnMaxLifetime) * time.Second)
-
-	queryDataHandler.engine = engine
+	queryDataHandler.db = db
 	return &queryDataHandler, nil
 }
 
@@ -184,17 +144,17 @@ type DBDataResponse struct {
 }
 
 func (e *DataSourceHandler) Dispose() {
-	e.log.Debug("Disposing engine...")
-	if e.engine != nil {
-		if err := e.engine.Close(); err != nil {
-			e.log.Error("Failed to dispose engine", "error", err)
+	e.log.Debug("Disposing DB...")
+	if e.db != nil {
+		if err := e.db.Close(); err != nil {
+			e.log.Error("Failed to dispose db", "error", err)
 		}
 	}
-	e.log.Debug("Engine disposed")
+	e.log.Debug("DB disposed")
 }
 
 func (e *DataSourceHandler) Ping() error {
-	return e.engine.Ping()
+	return e.db.Ping()
 }
 
 func (e *DataSourceHandler) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
@@ -211,6 +171,13 @@ func (e *DataSourceHandler) QueryData(ctx context.Context, req *backend.QueryDat
 		if err != nil {
 			return nil, fmt.Errorf("error unmarshal query json: %w", err)
 		}
+
+		// the fill-params are only stored inside this function, during query-interpolation. we do not support
+		// sending them in "from the outside"
+		if queryjson.Fill || queryjson.FillInterval != 0.0 || queryjson.FillMode != "" || queryjson.FillValue != 0.0 {
+			return nil, fmt.Errorf("query fill-parameters not supported")
+		}
+
 		if queryjson.RawSql == "" {
 			continue
 		}
@@ -243,7 +210,7 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG
 
 	defer func() {
 		if r := recover(); r != nil {
-			logger.Error("ExecuteQuery panic", "error", r, "stack", log.Stack(1))
+			logger.Error("ExecuteQuery panic", "error", r, "stack", string(debug.Stack()))
 			if theErr, ok := r.(error); ok {
 				queryResult.dataResponse.Error = theErr
 			} else if theErrString, ok := r.(string); ok {
@@ -272,24 +239,16 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG
 	}
 
 	// global substitutions
-	interpolatedQuery, err := Interpolate(query, timeRange, e.dsInfo.JsonData.TimeInterval, queryJson.RawSql)
-	if err != nil {
-		errAppendDebug("interpolation failed", e.TransformQueryError(logger, err), interpolatedQuery)
-		return
-	}
+	interpolatedQuery := Interpolate(query, timeRange, e.dsInfo.JsonData.TimeInterval, queryJson.RawSql)
 
 	// data source specific substitutions
-	interpolatedQuery, err = e.macroEngine.Interpolate(&query, timeRange, interpolatedQuery)
+	interpolatedQuery, err := e.macroEngine.Interpolate(&query, timeRange, interpolatedQuery)
 	if err != nil {
 		errAppendDebug("interpolation failed", e.TransformQueryError(logger, err), interpolatedQuery)
 		return
 	}
 
-	session := e.engine.NewSession()
-	defer session.Close()
-	db := session.DB()
-
-	rows, err := db.QueryContext(queryContext, interpolatedQuery)
+	rows, err := e.db.QueryContext(queryContext, interpolatedQuery)
 	if err != nil {
 		errAppendDebug("db query error", e.TransformQueryError(logger, err), interpolatedQuery)
 		return
@@ -308,7 +267,7 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG
 
 	// Convert row.Rows to dataframe
 	stringConverters := e.queryResultTransformer.GetConverterList()
-	frame, err := sqlutil.FrameFromRows(rows.Rows, e.rowLimit, sqlutil.ToConverters(stringConverters...)...)
+	frame, err := sqlutil.FrameFromRows(rows, e.rowLimit, sqlutil.ToConverters(stringConverters...)...)
 	if err != nil {
 		errAppendDebug("convert frame from rows error", err, interpolatedQuery)
 		return
@@ -402,23 +361,19 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG
 }
 
 // Interpolate provides global macros/substitutions for all sql datasources.
-var Interpolate = func(query backend.DataQuery, timeRange backend.TimeRange, timeInterval string, sql string) (string, error) {
-	minInterval, err := intervalv2.GetIntervalFrom(timeInterval, query.Interval.String(), query.Interval.Milliseconds(), time.Second*60)
-	if err != nil {
-		return "", err
-	}
-	interval := sqlIntervalCalculator.Calculate(timeRange, minInterval, query.MaxDataPoints)
+var Interpolate = func(query backend.DataQuery, timeRange backend.TimeRange, timeInterval string, sql string) string {
+	interval := query.Interval
 
 	sql = strings.ReplaceAll(sql, "$__interval_ms", strconv.FormatInt(interval.Milliseconds(), 10))
-	sql = strings.ReplaceAll(sql, "$__interval", interval.Text)
+	sql = strings.ReplaceAll(sql, "$__interval", gtime.FormatInterval(interval))
 	sql = strings.ReplaceAll(sql, "$__unixEpochFrom()", fmt.Sprintf("%d", timeRange.From.UTC().Unix()))
 	sql = strings.ReplaceAll(sql, "$__unixEpochTo()", fmt.Sprintf("%d", timeRange.To.UTC().Unix()))
 
-	return sql, nil
+	return sql
 }
 
 func (e *DataSourceHandler) newProcessCfg(query backend.DataQuery, queryContext context.Context,
-	rows *core.Rows, interpolatedQuery string) (*dataQueryModel, error) {
+	rows *sql.Rows, interpolatedQuery string) (*dataQueryModel, error) {
 	columnNames, err := rows.Columns()
 	if err != nil {
 		return nil, err
@@ -431,7 +386,6 @@ func (e *DataSourceHandler) newProcessCfg(query backend.DataQuery, queryContext
 	qm := &dataQueryModel{
 		columnTypes:  columnTypes,
 		columnNames:  columnNames,
-		rows:         rows,
 		timeIndex:    -1,
 		timeEndIndex: -1,
 		metricIndex:  -1,
@@ -525,334 +479,10 @@ type dataQueryModel struct {
 	timeIndex         int
 	timeEndIndex      int
 	metricIndex       int
-	rows              *core.Rows
 	metricPrefix      bool
 	queryContext      context.Context
 }
 
-func convertInt64ToFloat64(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		value := float64(origin.At(i).(int64))
-		newField.Append(&value)
-	}
-}
-
-func convertNullableInt64ToFloat64(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		iv := origin.At(i).(*int64)
-		if iv == nil {
-			newField.Append(nil)
-		} else {
-			value := float64(*iv)
-			newField.Append(&value)
-		}
-	}
-}
-
-func convertUInt64ToFloat64(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		value := float64(origin.At(i).(uint64))
-		newField.Append(&value)
-	}
-}
-
-func convertNullableUInt64ToFloat64(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		iv := origin.At(i).(*uint64)
-		if iv == nil {
-			newField.Append(nil)
-		} else {
-			value := float64(*iv)
-			newField.Append(&value)
-		}
-	}
-}
-
-func convertInt32ToFloat64(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		value := float64(origin.At(i).(int32))
-		newField.Append(&value)
-	}
-}
-
-func convertNullableInt32ToFloat64(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		iv := origin.At(i).(*int32)
-		if iv == nil {
-			newField.Append(nil)
-		} else {
-			value := float64(*iv)
-			newField.Append(&value)
-		}
-	}
-}
-
-func convertUInt32ToFloat64(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		value := float64(origin.At(i).(uint32))
-		newField.Append(&value)
-	}
-}
-
-func convertNullableUInt32ToFloat64(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		iv := origin.At(i).(*uint32)
-		if iv == nil {
-			newField.Append(nil)
-		} else {
-			value := float64(*iv)
-			newField.Append(&value)
-		}
-	}
-}
-
-func convertInt16ToFloat64(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		value := float64(origin.At(i).(int16))
-		newField.Append(&value)
-	}
-}
-
-func convertNullableInt16ToFloat64(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		iv := origin.At(i).(*int16)
-		if iv == nil {
-			newField.Append(nil)
-		} else {
-			value := float64(*iv)
-			newField.Append(&value)
-		}
-	}
-}
-
-func convertUInt16ToFloat64(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		value := float64(origin.At(i).(uint16))
-		newField.Append(&value)
-	}
-}
-
-func convertNullableUInt16ToFloat64(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		iv := origin.At(i).(*uint16)
-		if iv == nil {
-			newField.Append(nil)
-		} else {
-			value := float64(*iv)
-			newField.Append(&value)
-		}
-	}
-}
-
-func convertInt8ToFloat64(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		value := float64(origin.At(i).(int8))
-		newField.Append(&value)
-	}
-}
-
-func convertNullableInt8ToFloat64(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		iv := origin.At(i).(*int8)
-		if iv == nil {
-			newField.Append(nil)
-		} else {
-			value := float64(*iv)
-			newField.Append(&value)
-		}
-	}
-}
-
-func convertUInt8ToFloat64(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		value := float64(origin.At(i).(uint8))
-		newField.Append(&value)
-	}
-}
-
-func convertNullableUInt8ToFloat64(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		iv := origin.At(i).(*uint8)
-		if iv == nil {
-			newField.Append(nil)
-		} else {
-			value := float64(*iv)
-			newField.Append(&value)
-		}
-	}
-}
-
-func convertUnknownToZero(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		value := float64(0)
-		newField.Append(&value)
-	}
-}
-
-func convertNullableFloat32ToFloat64(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		iv := origin.At(i).(*float32)
-		if iv == nil {
-			newField.Append(nil)
-		} else {
-			value := float64(*iv)
-			newField.Append(&value)
-		}
-	}
-}
-
-func convertFloat32ToFloat64(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		value := float64(origin.At(i).(float32))
-		newField.Append(&value)
-	}
-}
-
-func convertInt64ToEpochMS(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		value := time.Unix(0, int64(epochPrecisionToMS(float64(origin.At(i).(int64))))*int64(time.Millisecond))
-		newField.Append(&value)
-	}
-}
-
-func convertNullableInt64ToEpochMS(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		iv := origin.At(i).(*int64)
-		if iv == nil {
-			newField.Append(nil)
-		} else {
-			value := time.Unix(0, int64(epochPrecisionToMS(float64(*iv)))*int64(time.Millisecond))
-			newField.Append(&value)
-		}
-	}
-}
-
-func convertUInt64ToEpochMS(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		value := time.Unix(0, int64(epochPrecisionToMS(float64(origin.At(i).(uint64))))*int64(time.Millisecond))
-		newField.Append(&value)
-	}
-}
-
-func convertNullableUInt64ToEpochMS(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		iv := origin.At(i).(*uint64)
-		if iv == nil {
-			newField.Append(nil)
-		} else {
-			value := time.Unix(0, int64(epochPrecisionToMS(float64(*iv)))*int64(time.Millisecond))
-			newField.Append(&value)
-		}
-	}
-}
-
-func convertInt32ToEpochMS(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		value := time.Unix(0, int64(epochPrecisionToMS(float64(origin.At(i).(int32))))*int64(time.Millisecond))
-		newField.Append(&value)
-	}
-}
-
-func convertNullableInt32ToEpochMS(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		iv := origin.At(i).(*int32)
-		if iv == nil {
-			newField.Append(nil)
-		} else {
-			value := time.Unix(0, int64(epochPrecisionToMS(float64(*iv)))*int64(time.Millisecond))
-			newField.Append(&value)
-		}
-	}
-}
-
-func convertUInt32ToEpochMS(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		value := time.Unix(0, int64(epochPrecisionToMS(float64(origin.At(i).(uint32))))*int64(time.Millisecond))
-		newField.Append(&value)
-	}
-}
-
-func convertNullableUInt32ToEpochMS(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		iv := origin.At(i).(*uint32)
-		if iv == nil {
-			newField.Append(nil)
-		} else {
-			value := time.Unix(0, int64(epochPrecisionToMS(float64(*iv)))*int64(time.Millisecond))
-			newField.Append(&value)
-		}
-	}
-}
-
-func convertFloat64ToEpochMS(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		value := time.Unix(0, int64(epochPrecisionToMS(origin.At(i).(float64)))*int64(time.Millisecond))
-		newField.Append(&value)
-	}
-}
-
-func convertNullableFloat64ToEpochMS(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		iv := origin.At(i).(*float64)
-		if iv == nil {
-			newField.Append(nil)
-		} else {
-			value := time.Unix(0, int64(epochPrecisionToMS(*iv))*int64(time.Millisecond))
-			newField.Append(&value)
-		}
-	}
-}
-
-func convertFloat32ToEpochMS(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		value := time.Unix(0, int64(epochPrecisionToMS(float64(origin.At(i).(float32))))*int64(time.Millisecond))
-		newField.Append(&value)
-	}
-}
-
-func convertNullableFloat32ToEpochMS(origin *data.Field, newField *data.Field) {
-	valueLength := origin.Len()
-	for i := 0; i < valueLength; i++ {
-		iv := origin.At(i).(*float32)
-		if iv == nil {
-			newField.Append(nil)
-		} else {
-			value := time.Unix(0, int64(epochPrecisionToMS(float64(*iv)))*int64(time.Millisecond))
-			newField.Append(&value)
-		}
-	}
-}
-
 func convertSQLTimeColumnsToEpochMS(frame *data.Frame, qm *dataQueryModel) error {
 	if qm.timeIndex != -1 {
 		if err := convertSQLTimeColumnToEpochMS(frame, qm.timeIndex); err != nil {
@@ -886,33 +516,18 @@ func convertSQLTimeColumnToEpochMS(frame *data.Frame, timeIndex int) error {
 	newField.Name = origin.Name
 	newField.Labels = origin.Labels
 
-	switch valueType {
-	case data.FieldTypeInt64:
-		convertInt64ToEpochMS(frame.Fields[timeIndex], newField)
-	case data.FieldTypeNullableInt64:
-		convertNullableInt64ToEpochMS(frame.Fields[timeIndex], newField)
-	case data.FieldTypeUint64:
-		convertUInt64ToEpochMS(frame.Fields[timeIndex], newField)
-	case data.FieldTypeNullableUint64:
-		convertNullableUInt64ToEpochMS(frame.Fields[timeIndex], newField)
-	case data.FieldTypeInt32:
-		convertInt32ToEpochMS(frame.Fields[timeIndex], newField)
-	case data.FieldTypeNullableInt32:
-		convertNullableInt32ToEpochMS(frame.Fields[timeIndex], newField)
-	case data.FieldTypeUint32:
-		convertUInt32ToEpochMS(frame.Fields[timeIndex], newField)
-	case data.FieldTypeNullableUint32:
-		convertNullableUInt32ToEpochMS(frame.Fields[timeIndex], newField)
-	case data.FieldTypeFloat64:
-		convertFloat64ToEpochMS(frame.Fields[timeIndex], newField)
-	case data.FieldTypeNullableFloat64:
-		convertNullableFloat64ToEpochMS(frame.Fields[timeIndex], newField)
-	case data.FieldTypeFloat32:
-		convertFloat32ToEpochMS(frame.Fields[timeIndex], newField)
-	case data.FieldTypeNullableFloat32:
-		convertNullableFloat32ToEpochMS(frame.Fields[timeIndex], newField)
-	default:
-		return fmt.Errorf("column type %q is not convertible to time.Time", valueType)
+	valueLength := origin.Len()
+	for i := 0; i < valueLength; i++ {
+		v, err := origin.NullableFloatAt(i)
+		if err != nil {
+			return fmt.Errorf("unable to convert data to a time field")
+		}
+		if v == nil {
+			newField.Append(nil)
+		} else {
+			timestamp := time.Unix(0, int64(epochPrecisionToMS(*v))*int64(time.Millisecond))
+			newField.Append(&timestamp)
+		}
 	}
 	frame.Fields[timeIndex] = newField
 
@@ -920,8 +535,6 @@ func convertSQLTimeColumnToEpochMS(frame *data.Frame, timeIndex int) error {
 }
 
 // convertSQLValueColumnToFloat converts timeseries value column to float.
-//
-//nolint:gocyclo
 func convertSQLValueColumnToFloat(frame *data.Frame, Index int) (*data.Frame, error) {
 	if Index < 0 || Index >= len(frame.Fields) {
 		return frame, fmt.Errorf("metricIndex %d is out of range", Index)
@@ -933,52 +546,18 @@ func convertSQLValueColumnToFloat(frame *data.Frame, Index int) (*data.Frame, er
 		return frame, nil
 	}
 
-	newField := data.NewFieldFromFieldType(data.FieldTypeNullableFloat64, 0)
+	newField := data.NewFieldFromFieldType(data.FieldTypeNullableFloat64, origin.Len())
 	newField.Name = origin.Name
 	newField.Labels = origin.Labels
 
-	switch valueType {
-	case data.FieldTypeInt64:
-		convertInt64ToFloat64(frame.Fields[Index], newField)
-	case data.FieldTypeNullableInt64:
-		convertNullableInt64ToFloat64(frame.Fields[Index], newField)
-	case data.FieldTypeUint64:
-		convertUInt64ToFloat64(frame.Fields[Index], newField)
-	case data.FieldTypeNullableUint64:
-		convertNullableUInt64ToFloat64(frame.Fields[Index], newField)
-	case data.FieldTypeInt32:
-		convertInt32ToFloat64(frame.Fields[Index], newField)
-	case data.FieldTypeNullableInt32:
-		convertNullableInt32ToFloat64(frame.Fields[Index], newField)
-	case data.FieldTypeUint32:
-		convertUInt32ToFloat64(frame.Fields[Index], newField)
-	case data.FieldTypeNullableUint32:
-		convertNullableUInt32ToFloat64(frame.Fields[Index], newField)
-	case data.FieldTypeInt16:
-		convertInt16ToFloat64(frame.Fields[Index], newField)
-	case data.FieldTypeNullableInt16:
-		convertNullableInt16ToFloat64(frame.Fields[Index], newField)
-	case data.FieldTypeUint16:
-		convertUInt16ToFloat64(frame.Fields[Index], newField)
-	case data.FieldTypeNullableUint16:
-		convertNullableUInt16ToFloat64(frame.Fields[Index], newField)
-	case data.FieldTypeInt8:
-		convertInt8ToFloat64(frame.Fields[Index], newField)
-	case data.FieldTypeNullableInt8:
-		convertNullableInt8ToFloat64(frame.Fields[Index], newField)
-	case data.FieldTypeUint8:
-		convertUInt8ToFloat64(frame.Fields[Index], newField)
-	case data.FieldTypeNullableUint8:
-		convertNullableUInt8ToFloat64(frame.Fields[Index], newField)
-	case data.FieldTypeFloat32:
-		convertFloat32ToFloat64(frame.Fields[Index], newField)
-	case data.FieldTypeNullableFloat32:
-		convertNullableFloat32ToFloat64(frame.Fields[Index], newField)
-	default:
-		convertUnknownToZero(frame.Fields[Index], newField)
-		frame.Fields[Index] = newField
-		return frame, fmt.Errorf("metricIndex %d type %s can't be converted to float", Index, valueType)
+	for i := 0; i < origin.Len(); i++ {
+		v, err := origin.NullableFloatAt(i)
+		if err != nil {
+			return frame, err
+		}
+		newField.Set(i, v)
 	}
+
 	frame.Fields[Index] = newField
 
 	return frame, nil
diff --git a/pkg/tsdb/sqleng/sql_engine_test.go b/pkg/tsdb/sqleng/sql_engine_test.go
index 307284684e356..367f6cb143a2c 100644
--- a/pkg/tsdb/sqleng/sql_engine_test.go
+++ b/pkg/tsdb/sqleng/sql_engine_test.go
@@ -12,46 +12,52 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/util"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
+	"github.com/grafana/grafana/pkg/tsdb/sqleng/util"
 )
 
 func TestSQLEngine(t *testing.T) {
 	dt := time.Date(2018, 3, 14, 21, 20, 6, int(527345*time.Microsecond), time.UTC)
 
-	t.Run("Given a time range between 2018-04-12 00:00 and 2018-04-12 00:05", func(t *testing.T) {
+	t.Run("Handle interpolating $__interval and $__interval_ms", func(t *testing.T) {
 		from := time.Date(2018, 4, 12, 18, 0, 0, 0, time.UTC)
 		to := from.Add(5 * time.Minute)
 		timeRange := backend.TimeRange{From: from, To: to}
-		query := backend.DataQuery{JSON: []byte("{}")}
 
-		t.Run("interpolate $__interval", func(t *testing.T) {
-			sql, err := Interpolate(query, timeRange, "", "select $__interval ")
-			require.NoError(t, err)
-			require.Equal(t, "select 1m ", sql)
+		text := "$__interval $__timeGroupAlias(time,$__interval) $__interval_ms"
+
+		t.Run("interpolate 10 minutes $__interval", func(t *testing.T) {
+			query := backend.DataQuery{JSON: []byte("{}"), MaxDataPoints: 1500, Interval: time.Minute * 10}
+			sql := Interpolate(query, timeRange, "", text)
+			require.Equal(t, "10m $__timeGroupAlias(time,10m) 600000", sql)
 		})
 
-		t.Run("interpolate $__interval in $__timeGroup", func(t *testing.T) {
-			sql, err := Interpolate(query, timeRange, "", "select $__timeGroupAlias(time,$__interval)")
-			require.NoError(t, err)
-			require.Equal(t, "select $__timeGroupAlias(time,1m)", sql)
+		t.Run("interpolate 4seconds $__interval", func(t *testing.T) {
+			query := backend.DataQuery{JSON: []byte("{}"), MaxDataPoints: 1500, Interval: time.Second * 4}
+			sql := Interpolate(query, timeRange, "", text)
+			require.Equal(t, "4s $__timeGroupAlias(time,4s) 4000", sql)
 		})
 
-		t.Run("interpolate $__interval_ms", func(t *testing.T) {
-			sql, err := Interpolate(query, timeRange, "", "select $__interval_ms ")
-			require.NoError(t, err)
-			require.Equal(t, "select 60000 ", sql)
+		t.Run("interpolate 200 milliseconds $__interval", func(t *testing.T) {
+			query := backend.DataQuery{JSON: []byte("{}"), MaxDataPoints: 1500, Interval: time.Millisecond * 200}
+			sql := Interpolate(query, timeRange, "", text)
+			require.Equal(t, "200ms $__timeGroupAlias(time,200ms) 200", sql)
 		})
+	})
+
+	t.Run("Given a time range between 2018-04-12 00:00 and 2018-04-12 00:05", func(t *testing.T) {
+		from := time.Date(2018, 4, 12, 18, 0, 0, 0, time.UTC)
+		to := from.Add(5 * time.Minute)
+		timeRange := backend.TimeRange{From: from, To: to}
+		query := backend.DataQuery{JSON: []byte("{}"), MaxDataPoints: 1500, Interval: time.Second * 60}
 
 		t.Run("interpolate __unixEpochFrom function", func(t *testing.T) {
-			sql, err := Interpolate(query, timeRange, "", "select $__unixEpochFrom()")
-			require.NoError(t, err)
+			sql := Interpolate(query, timeRange, "", "select $__unixEpochFrom()")
 			require.Equal(t, fmt.Sprintf("select %d", from.Unix()), sql)
 		})
 
 		t.Run("interpolate __unixEpochTo function", func(t *testing.T) {
-			sql, err := Interpolate(query, timeRange, "", "select $__unixEpochTo()")
-			require.NoError(t, err)
+			sql := Interpolate(query, timeRange, "", "select $__unixEpochTo()")
 			require.Equal(t, fmt.Sprintf("select %d", to.Unix()), sql)
 		})
 	})
@@ -389,28 +395,32 @@ func TestSQLEngine(t *testing.T) {
 		}
 	})
 
-	t.Run("Should handle connection errors", func(t *testing.T) {
-		randomErr := fmt.Errorf("random error")
-
-		tests := []struct {
-			err                                   error
-			expectedErr                           error
-			expectQueryResultTransformerWasCalled bool
-		}{
-			{err: &net.OpError{Op: "Dial"}, expectedErr: ErrConnectionFailed, expectQueryResultTransformerWasCalled: false},
-			{err: randomErr, expectedErr: randomErr, expectQueryResultTransformerWasCalled: true},
+	t.Run("Should not return raw connection errors", func(t *testing.T) {
+		err := net.OpError{Op: "Dial", Err: fmt.Errorf("inner-error")}
+		transformer := &testQueryResultTransformer{}
+		dp := DataSourceHandler{
+			log:                    backend.NewLoggerWith("logger", "test"),
+			queryResultTransformer: transformer,
 		}
+		resultErr := dp.TransformQueryError(dp.log, &err)
+		assert.False(t, transformer.transformQueryErrorWasCalled)
+		errorText := resultErr.Error()
+		assert.NotEqual(t, err, resultErr)
+		assert.NotContains(t, errorText, "inner-error")
+		assert.Contains(t, errorText, "failed to connect to server")
+	})
 
-		for _, tc := range tests {
-			transformer := &testQueryResultTransformer{}
-			dp := DataSourceHandler{
-				log:                    log.New("test"),
-				queryResultTransformer: transformer,
-			}
-			resultErr := dp.TransformQueryError(dp.log, tc.err)
-			assert.ErrorIs(t, resultErr, tc.expectedErr)
-			assert.Equal(t, tc.expectQueryResultTransformerWasCalled, transformer.transformQueryErrorWasCalled)
+	t.Run("Should return non-connection errors unmodified", func(t *testing.T) {
+		err := fmt.Errorf("normal error")
+		transformer := &testQueryResultTransformer{}
+		dp := DataSourceHandler{
+			log:                    backend.NewLoggerWith("logger", "test"),
+			queryResultTransformer: transformer,
 		}
+		resultErr := dp.TransformQueryError(dp.log, err)
+		assert.True(t, transformer.transformQueryErrorWasCalled)
+		assert.Equal(t, err, resultErr)
+		assert.ErrorIs(t, err, resultErr)
 	})
 }
 
diff --git a/pkg/tsdb/sqleng/util/util.go b/pkg/tsdb/sqleng/util/util.go
new file mode 100644
index 0000000000000..f6b5d330c1742
--- /dev/null
+++ b/pkg/tsdb/sqleng/util/util.go
@@ -0,0 +1,3 @@
+package util
+
+func Pointer[T any](v T) *T { return &v }
diff --git a/pkg/tsdb/tempo/grpc.go b/pkg/tsdb/tempo/grpc.go
index 39a90631f62a1..12ff015547119 100644
--- a/pkg/tsdb/tempo/grpc.go
+++ b/pkg/tsdb/tempo/grpc.go
@@ -8,6 +8,8 @@ import (
 	"net/url"
 	"strings"
 
+	"google.golang.org/grpc/metadata"
+
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/tempo/pkg/tempopb"
@@ -16,17 +18,22 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 )
 
-// This function creates a new gRPC client to connect to a streaming query service.
-// It starts by parsing the URL from the data source settings and extracting the host, since that's what the gRPC connection expects.
-// If the URL does not contain a port number, it adds a default port based on the scheme (80 for HTTP and 443 for HTTPS).
-// If basic authentication is enabled, it uses TLS transport credentials and sets the basic authentication header for each RPC call.
-// Otherwise, it uses insecure credentials.
+var logger = backend.NewLoggerWith("logger", "tsdb.tempo")
+
+// newGrpcClient creates a new gRPC client to connect to a streaming query service.
+// This uses the default google.golang.org/grpc library. One caveat to that is that it does not allow passing the
+// default httpClient to the gRPC client. This means that we cannot use the same middleware that we use for
+// standard HTTP requests.
+// Using other library like connect-go isn't possible right now because Tempo uses non-standard proto compiler which
+// makes generating different client difficult. See https://github.com/grafana/grafana/pull/81683
 func newGrpcClient(settings backend.DataSourceInstanceSettings, opts httpclient.Options) (tempopb.StreamingQuerierClient, error) {
 	parsedUrl, err := url.Parse(settings.URL)
 	if err != nil {
+		logger.Error("Error parsing URL for gRPC client", "error", err, "URL", settings.URL, "function", logEntrypoint())
 		return nil, err
 	}
 
+	// Make sure we have some default port if none is set. This is required for gRPC to work.
 	onlyHost := parsedUrl.Host
 	if !strings.Contains(onlyHost, ":") {
 		if parsedUrl.Scheme == "http" {
@@ -36,21 +43,54 @@ func newGrpcClient(settings backend.DataSourceInstanceSettings, opts httpclient.
 		}
 	}
 
+	clientConn, err := grpc.Dial(onlyHost, getDialOpts(settings, opts)...)
+	if err != nil {
+		logger.Error("Error dialing gRPC client", "error", err, "URL", settings.URL, "function", logEntrypoint())
+		return nil, err
+	}
+
+	return tempopb.NewStreamingQuerierClient(clientConn), nil
+}
+
+// getDialOpts creates options and interceptors (middleware) this should roughly match what we do in
+// http_client_provider.go for standard http requests.
+func getDialOpts(settings backend.DataSourceInstanceSettings, opts httpclient.Options) []grpc.DialOption {
+	// TODO: Missing middleware TracingMiddleware, DataSourceMetricsMiddleware, ContextualMiddleware,
+	//  ResponseLimitMiddleware RedirectLimitMiddleware.
+	// Also User agent but that is set before each rpc call as for decoupled DS we have to get it from request context
+	// and cannot add it to client here.
+
 	var dialOps []grpc.DialOption
+
+	dialOps = append(dialOps, grpc.WithChainStreamInterceptor(CustomHeadersStreamInterceptor(opts)))
 	if settings.BasicAuthEnabled {
+		// If basic authentication is enabled, it uses TLS transport credentials and sets the basic authentication header for each RPC call.
 		dialOps = append(dialOps, grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{})))
 		dialOps = append(dialOps, grpc.WithPerRPCCredentials(&basicAuth{
 			Header: basicHeaderForAuth(opts.BasicAuth.User, opts.BasicAuth.Password),
 		}))
 	} else {
+		// Otherwise, it uses insecure credentials.
 		dialOps = append(dialOps, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	}
 
-	clientConn, err := grpc.Dial(onlyHost, dialOps...)
-	if err != nil {
-		return nil, err
+	return dialOps
+}
+
+// CustomHeadersStreamInterceptor adds custom headers to the outgoing context for each RPC call. Should work similar
+// to the CustomHeadersMiddleware in the HTTP client provider.
+func CustomHeadersStreamInterceptor(httpOpts httpclient.Options) grpc.StreamClientInterceptor {
+	return func(ctx context.Context, desc *grpc.StreamDesc, cc *grpc.ClientConn, method string, streamer grpc.Streamer, opts ...grpc.CallOption) (grpc.ClientStream, error) {
+		if len(httpOpts.Header) != 0 {
+			for key, value := range httpOpts.Header {
+				for _, v := range value {
+					ctx = metadata.AppendToOutgoingContext(ctx, key, v)
+				}
+			}
+		}
+
+		return streamer(ctx, desc, cc, method, opts...)
 	}
-	return tempopb.NewStreamingQuerierClient(clientConn), nil
 }
 
 type basicAuth struct {
diff --git a/pkg/tsdb/tempo/kinds/dataquery/types_dataquery_gen.go b/pkg/tsdb/tempo/kinds/dataquery/types_dataquery_gen.go
index e635751839de6..13a6c6117b90c 100644
--- a/pkg/tsdb/tempo/kinds/dataquery/types_dataquery_gen.go
+++ b/pkg/tsdb/tempo/kinds/dataquery/types_dataquery_gen.go
@@ -27,7 +27,6 @@ const (
 const (
 	TempoQueryTypeClear         TempoQueryType = "clear"
 	TempoQueryTypeNativeSearch  TempoQueryType = "nativeSearch"
-	TempoQueryTypeSearch        TempoQueryType = "search"
 	TempoQueryTypeServiceMap    TempoQueryType = "serviceMap"
 	TempoQueryTypeTraceId       TempoQueryType = "traceId"
 	TempoQueryTypeTraceql       TempoQueryType = "traceql"
@@ -53,9 +52,7 @@ type DataQuery struct {
 	// TODO this shouldn't be unknown but DataSourceRef | null
 	Datasource *any `json:"datasource,omitempty"`
 
-	// Hide true if query is disabled (ie should not be returned to the dashboard)
-	// Note this does not always imply that the query should not be executed since
-	// the results from a hidden query may be used as the input to other queries (SSE etc)
+	// If hide is set to true, Grafana will filter out the response(s) associated with this query before returning it to the panel.
 	Hide *bool `json:"hide,omitempty"`
 
 	// Specify the query flavor
@@ -79,24 +76,17 @@ type TempoDataQuery = map[string]any
 
 // TempoQuery defines model for TempoQuery.
 type TempoQuery struct {
-	// DataQuery These are the common properties available to all queries in all datasources.
-	// Specific implementations will *extend* this interface, adding the required
-	// properties for the given context.
-	DataQuery
-
 	// For mixed data sources the selected datasource is on the query level.
 	// For non mixed scenarios this is undefined.
 	// TODO find a better way to do this ^ that's friendly to schema
 	// TODO this shouldn't be unknown but DataSourceRef | null
 	Datasource *any            `json:"datasource,omitempty"`
-	Filters    []TraceqlFilter `json:"filters"`
+	Filters    []TraceqlFilter `json:"filters,omitempty"`
 
 	// Filters that are used to query the metrics summary
 	GroupBy []TraceqlFilter `json:"groupBy,omitempty"`
 
-	// Hide true if query is disabled (ie should not be returned to the dashboard)
-	// Note this does not always imply that the query should not be executed since
-	// the results from a hidden query may be used as the input to other queries (SSE etc)
+	// If hide is set to true, Grafana will filter out the response(s) associated with this query before returning it to the panel.
 	Hide *bool `json:"hide,omitempty"`
 
 	// Defines the maximum number of traces that are returned from Tempo
@@ -118,7 +108,7 @@ type TempoQuery struct {
 	// A unique identifier for the query within the list of targets.
 	// In server side expressions, the refId is used as a variable name to identify results.
 	// By default, the UI will assign A->Z; however setting meaningful names may be useful.
-	RefId string `json:"refId"`
+	RefId *string `json:"refId,omitempty"`
 
 	// @deprecated Logfmt query to filter traces by their tags. Example: http.status_code=200 error=true
 	Search *string `json:"search,omitempty"`
@@ -126,8 +116,8 @@ type TempoQuery struct {
 	// Use service.namespace in addition to service.name to uniquely identify a service.
 	ServiceMapIncludeNamespace *bool `json:"serviceMapIncludeNamespace,omitempty"`
 
-	// Filters to be included in a PromQL query to select data for the service graph. Example: {client="app",service="app"}
-	ServiceMapQuery *string `json:"serviceMapQuery,omitempty"`
+	// Filters to be included in a PromQL query to select data for the service graph. Example: {client="app",service="app"}. Providing multiple values will produce union of results for each filter, using PromQL OR operator internally.
+	ServiceMapQuery *any `json:"serviceMapQuery,omitempty"`
 
 	// @deprecated Query traces by service name
 	ServiceName *string `json:"serviceName,omitempty"`
@@ -142,7 +132,7 @@ type TempoQuery struct {
 	TableType *SearchTableType `json:"tableType,omitempty"`
 }
 
-// TempoQueryType search = Loki search, nativeSearch = Tempo search for backwards compatibility
+// TempoQueryType defines model for TempoQueryType.
 type TempoQueryType string
 
 // TraceqlFilter defines model for TraceqlFilter.
diff --git a/pkg/tsdb/tempo/search_stream.go b/pkg/tsdb/tempo/search_stream.go
index d2ef5a1d8ae2a..d96fec7a21666 100644
--- a/pkg/tsdb/tempo/search_stream.go
+++ b/pkg/tsdb/tempo/search_stream.go
@@ -7,6 +7,8 @@ import (
 	"fmt"
 	"io"
 
+	"google.golang.org/grpc/metadata"
+
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
@@ -60,6 +62,11 @@ func (s *Service) runSearchStream(ctx context.Context, req *backend.RunStreamReq
 	sr.Start = uint32(backendQuery.TimeRange.From.Unix())
 	sr.End = uint32(backendQuery.TimeRange.To.Unix())
 
+	// Setting the user agent for the gRPC call. When DS is decoupled we don't recreate instance when grafana config
+	// changes or updates, so we have to get it from context.
+	// Ideally this would be pushed higher, so it's set once for all rpc calls, but we have only one now.
+	ctx = metadata.AppendToOutgoingContext(ctx, "User-Agent", backend.UserAgentFromContext(ctx).String())
+
 	stream, err := datasource.StreamingClient.Search(ctx, sr)
 	if err != nil {
 		span.RecordError(err)
diff --git a/pkg/tsdb/tempo/search_stream_test.go b/pkg/tsdb/tempo/search_stream_test.go
index dddda21d20128..31a1e702425c5 100644
--- a/pkg/tsdb/tempo/search_stream_test.go
+++ b/pkg/tsdb/tempo/search_stream_test.go
@@ -11,14 +11,16 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
-	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/tsdb/tempo/kinds/dataquery"
 	"github.com/grafana/tempo/pkg/tempopb"
 	"google.golang.org/grpc/metadata"
 )
 
 func TestProcessStream_ValidInput_ReturnsNoError(t *testing.T) {
-	service := &Service{}
+	logger := backend.NewLoggerWith("logger", "tsdb.tempo.test")
+	service := &Service{
+		logger: logger,
+	}
 	searchClient := &mockStreamer{}
 	streamSender := &mockSender{}
 	err := service.processStream(context.Background(), searchClient, streamSender)
@@ -27,7 +29,7 @@ func TestProcessStream_ValidInput_ReturnsNoError(t *testing.T) {
 	}
 }
 func TestProcessStream_InvalidInput_ReturnsError(t *testing.T) {
-	logger := log.New("tsdb.tempo.test")
+	logger := backend.NewLoggerWith("logger", "tsdb.tempo.test")
 	service := &Service{
 		logger: logger,
 	}
@@ -41,7 +43,7 @@ func TestProcessStream_InvalidInput_ReturnsError(t *testing.T) {
 	}
 }
 func TestProcessStream_ValidInput_ReturnsExpectedOutput(t *testing.T) {
-	logger := log.New("tsdb.tempo.test")
+	logger := backend.NewLoggerWith("logger", "tsdb.tempo.test")
 	service := &Service{
 		logger: logger,
 	}
diff --git a/pkg/tsdb/tempo/standalone/datasource.go b/pkg/tsdb/tempo/standalone/datasource.go
new file mode 100644
index 0000000000000..087cb4dff7156
--- /dev/null
+++ b/pkg/tsdb/tempo/standalone/datasource.go
@@ -0,0 +1,41 @@
+package main
+
+import (
+	"context"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+	tempo "github.com/grafana/grafana/pkg/tsdb/tempo"
+)
+
+type Datasource struct {
+	Service *tempo.Service
+}
+
+var (
+	_ backend.QueryDataHandler = (*Datasource)(nil)
+	_ backend.StreamHandler    = (*Datasource)(nil)
+)
+
+func NewDatasource(c context.Context, b backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+	return &Datasource{
+		Service: tempo.ProvideService(httpclient.NewProvider()),
+	}, nil
+}
+
+func (d *Datasource) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+	return d.Service.QueryData(ctx, req)
+}
+
+func (d *Datasource) SubscribeStream(ctx context.Context, req *backend.SubscribeStreamRequest) (*backend.SubscribeStreamResponse, error) {
+	return d.Service.SubscribeStream(ctx, req)
+}
+
+func (d *Datasource) PublishStream(ctx context.Context, req *backend.PublishStreamRequest) (*backend.PublishStreamResponse, error) {
+	return d.Service.PublishStream(ctx, req)
+}
+
+func (d *Datasource) RunStream(ctx context.Context, req *backend.RunStreamRequest, sender *backend.StreamSender) error {
+	return d.Service.RunStream(ctx, req, sender)
+}
diff --git a/pkg/tsdb/tempo/standalone/main.go b/pkg/tsdb/tempo/standalone/main.go
new file mode 100644
index 0000000000000..6961ead4c2024
--- /dev/null
+++ b/pkg/tsdb/tempo/standalone/main.go
@@ -0,0 +1,16 @@
+package main
+
+import (
+	"os"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
+)
+
+func main() {
+	// Created as described at https://grafana.com/developers/plugin-tools/introduction/backend-plugins
+	if err := datasource.Manage("tempo", NewDatasource, datasource.ManageOpts{}); err != nil {
+		log.DefaultLogger.Error(err.Error())
+		os.Exit(1)
+	}
+}
diff --git a/pkg/tsdb/tempo/tempo.go b/pkg/tsdb/tempo/tempo.go
index b4c924de28544..e5c3fdb599e96 100644
--- a/pkg/tsdb/tempo/tempo.go
+++ b/pkg/tsdb/tempo/tempo.go
@@ -4,12 +4,14 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"runtime"
+	"strings"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
-	"github.com/grafana/grafana/pkg/infra/httpclient"
-	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana/pkg/tsdb/tempo/kinds/dataquery"
 	"github.com/grafana/tempo/pkg/tempopb"
 )
@@ -19,9 +21,26 @@ type Service struct {
 	logger log.Logger
 }
 
-func ProvideService(httpClientProvider httpclient.Provider) *Service {
+// Return the file, line, and (full-path) function name of the caller
+func getRunContext() (string, int, string) {
+	pc := make([]uintptr, 10)
+	runtime.Callers(2, pc)
+	f := runtime.FuncForPC(pc[0])
+	file, line := f.FileLine(pc[0])
+	return file, line, f.Name()
+}
+
+// Return a formatted string representing the execution context for the logger
+func logEntrypoint() string {
+	file, line, pathToFunction := getRunContext()
+	parts := strings.Split(pathToFunction, "/")
+	functionName := parts[len(parts)-1]
+	return fmt.Sprintf("%s:%d[%s]", file, line, functionName)
+}
+
+func ProvideService(httpClientProvider *httpclient.Provider) *Service {
 	return &Service{
-		logger: log.New("tsdb.tempo"),
+		logger: backend.NewLoggerWith("logger", "tsdb.tempo"),
 		im:     datasource.NewInstanceManager(newInstanceSettings(httpClientProvider)),
 	}
 }
@@ -32,20 +51,24 @@ type Datasource struct {
 	URL             string
 }
 
-func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.InstanceFactoryFunc {
+func newInstanceSettings(httpClientProvider *httpclient.Provider) datasource.InstanceFactoryFunc {
 	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+		ctxLogger := backend.NewLoggerWith("logger", "tsdb.tempo").FromContext(ctx)
 		opts, err := settings.HTTPClientOptions(ctx)
 		if err != nil {
+			ctxLogger.Error("Failed to get HTTP client options", "error", err, "function", logEntrypoint())
 			return nil, err
 		}
 
 		client, err := httpClientProvider.New(opts)
 		if err != nil {
+			ctxLogger.Error("Failed to get HTTP client provider", "error", err, "function", logEntrypoint())
 			return nil, err
 		}
 
 		streamingClient, err := newGrpcClient(settings, opts)
 		if err != nil {
+			ctxLogger.Error("Failed to get gRPC client", "error", err, "function", logEntrypoint())
 			return nil, err
 		}
 
@@ -59,20 +82,29 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst
 }
 
 func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+	ctxLogger := s.logger.FromContext(ctx)
+	ctxLogger.Debug("Processing queries", "queryLength", len(req.Queries), "function", logEntrypoint())
+
 	// create response struct
 	response := backend.NewQueryDataResponse()
 
 	// loop over queries and execute them individually.
-	for _, q := range req.Queries {
+	for i, q := range req.Queries {
+		ctxLogger.Debug("Processing query", "counter", i, "function", logEntrypoint())
 		if res, err := s.query(ctx, req.PluginContext, q); err != nil {
+			ctxLogger.Error("Error processing query", "error", err)
 			return response, err
 		} else {
 			if res != nil {
+				ctxLogger.Debug("Query processed", "counter", i, "function", logEntrypoint())
 				response.Responses[q.RefID] = *res
+			} else {
+				ctxLogger.Debug("Query resulted in empty response", "counter", i, "function", logEntrypoint())
 			}
 		}
 	}
 
+	ctxLogger.Debug("All queries processed", "function", logEntrypoint())
 	return response, nil
 }
 
@@ -80,7 +112,6 @@ func (s *Service) query(ctx context.Context, pCtx backend.PluginContext, query b
 	if query.QueryType == string(dataquery.TempoQueryTypeTraceId) {
 		return s.getTrace(ctx, pCtx, query)
 	}
-
 	return nil, fmt.Errorf("unsupported query type: '%s' for query with refID '%s'", query.QueryType, query.RefID)
 }
 
diff --git a/pkg/tsdb/tempo/trace.go b/pkg/tsdb/tempo/trace.go
index 8b3ac71aef784..ed3c43061f33a 100644
--- a/pkg/tsdb/tempo/trace.go
+++ b/pkg/tsdb/tempo/trace.go
@@ -18,6 +18,9 @@ import (
 )
 
 func (s *Service) getTrace(ctx context.Context, pCtx backend.PluginContext, query backend.DataQuery) (*backend.DataResponse, error) {
+	ctxLogger := s.logger.FromContext(ctx)
+	ctxLogger.Debug("Getting trace", "function", logEntrypoint())
+
 	result := &backend.DataResponse{}
 	refID := query.RefID
 
@@ -29,20 +32,25 @@ func (s *Service) getTrace(ctx context.Context, pCtx backend.PluginContext, quer
 	model := &dataquery.TempoQuery{}
 	err := json.Unmarshal(query.JSON, model)
 	if err != nil {
+		ctxLogger.Error("Failed to unmarshall Tempo query model", "error", err, "function", logEntrypoint())
 		return result, err
 	}
 
 	dsInfo, err := s.getDSInfo(ctx, pCtx)
 	if err != nil {
+		ctxLogger.Error("Failed to get datasource information", "error", err, "function", logEntrypoint())
 		return nil, err
 	}
 
 	if model.Query == nil || *model.Query == "" {
-		return result, fmt.Errorf("trace id is required")
+		err := fmt.Errorf("trace id is required")
+		ctxLogger.Error("Failed to validate model query", "error", err, "function", logEntrypoint())
+		return result, err
 	}
 
 	request, err := s.createRequest(ctx, dsInfo, *model.Query, query.TimeRange.From.Unix(), query.TimeRange.To.Unix())
 	if err != nil {
+		ctxLogger.Error("Failed to create request", "error", err, "function", logEntrypoint())
 		span.RecordError(err)
 		span.SetStatus(codes.Error, err.Error())
 		return result, err
@@ -50,6 +58,7 @@ func (s *Service) getTrace(ctx context.Context, pCtx backend.PluginContext, quer
 
 	resp, err := dsInfo.HTTPClient.Do(request)
 	if err != nil {
+		ctxLogger.Error("Failed to send request to Tempo", "error", err, "function", logEntrypoint())
 		span.RecordError(err)
 		span.SetStatus(codes.Error, err.Error())
 		return result, fmt.Errorf("failed get to tempo: %w", err)
@@ -57,17 +66,19 @@ func (s *Service) getTrace(ctx context.Context, pCtx backend.PluginContext, quer
 
 	defer func() {
 		if err := resp.Body.Close(); err != nil {
-			s.logger.FromContext(ctx).Warn("Failed to close response body", "err", err)
+			ctxLogger.Error("Failed to close response body", "error", err, "function", logEntrypoint())
 		}
 	}()
 
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
+		ctxLogger.Error("Failed to read response body", "error", err, "function", logEntrypoint())
 		return &backend.DataResponse{}, err
 	}
 
 	if resp.StatusCode != http.StatusOK {
-		result.Error = fmt.Errorf("failed to get trace with id: %v Status: %s Body: %s", model.Query, resp.Status, string(body))
+		ctxLogger.Error("Failed to get trace", "error", err, "function", logEntrypoint())
+		result.Error = fmt.Errorf("failed to get trace with id: %s Status: %s Body: %s", *model.Query, resp.Status, string(body))
 		span.RecordError(result.Error)
 		span.SetStatus(codes.Error, result.Error.Error())
 		return result, nil
@@ -77,6 +88,7 @@ func (s *Service) getTrace(ctx context.Context, pCtx backend.PluginContext, quer
 	otTrace, err := pbUnmarshaler.UnmarshalTraces(body)
 
 	if err != nil {
+		ctxLogger.Error("Failed to convert tempo response to Otlp", "error", err, "function", logEntrypoint())
 		span.RecordError(err)
 		span.SetStatus(codes.Error, err.Error())
 		return &backend.DataResponse{}, fmt.Errorf("failed to convert tempo response to Otlp: %w", err)
@@ -84,18 +96,23 @@ func (s *Service) getTrace(ctx context.Context, pCtx backend.PluginContext, quer
 
 	frame, err := TraceToFrame(otTrace)
 	if err != nil {
+		ctxLogger.Error("Failed to transform trace to data frame", "error", err, "function", logEntrypoint())
 		span.RecordError(err)
 		span.SetStatus(codes.Error, err.Error())
 		return &backend.DataResponse{}, fmt.Errorf("failed to transform trace %v to data frame: %w", model.Query, err)
 	}
+
 	frame.RefID = refID
 	frames := []*data.Frame{frame}
 	result.Frames = frames
+	ctxLogger.Debug("Successfully got trace", "function", logEntrypoint())
 	return result, nil
 }
 
 func (s *Service) createRequest(ctx context.Context, dsInfo *Datasource, traceID string, start int64, end int64) (*http.Request, error) {
+	ctxLogger := s.logger.FromContext(ctx)
 	var tempoQuery string
+
 	if start == 0 || end == 0 {
 		tempoQuery = fmt.Sprintf("%s/api/traces/%s", dsInfo.URL, traceID)
 	} else {
@@ -104,11 +121,10 @@ func (s *Service) createRequest(ctx context.Context, dsInfo *Datasource, traceID
 
 	req, err := http.NewRequestWithContext(ctx, "GET", tempoQuery, nil)
 	if err != nil {
+		ctxLogger.Error("Failed to create request", "error", err, "function", logEntrypoint())
 		return nil, err
 	}
 
 	req.Header.Set("Accept", "application/protobuf")
-
-	s.logger.FromContext(ctx).Debug("Tempo request", "url", req.URL.String(), "headers", req.Header)
 	return req, nil
 }
diff --git a/pkg/tsdb/tempo/trace_test.go b/pkg/tsdb/tempo/trace_test.go
index 5b202d90df7f6..e58da96f5f15b 100644
--- a/pkg/tsdb/tempo/trace_test.go
+++ b/pkg/tsdb/tempo/trace_test.go
@@ -4,21 +4,21 @@ import (
 	"context"
 	"testing"
 
-	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func TestTempo(t *testing.T) {
 	t.Run("createRequest without time range - success", func(t *testing.T) {
-		service := &Service{logger: log.New("tempo-test")}
+		service := &Service{logger: backend.NewLoggerWith("logger", "tempo-test")}
 		req, err := service.createRequest(context.Background(), &Datasource{}, "traceID", 0, 0)
 		require.NoError(t, err)
 		assert.Equal(t, 1, len(req.Header))
 	})
 
 	t.Run("createRequest with time range - success", func(t *testing.T) {
-		service := &Service{logger: log.New("tempo-test")}
+		service := &Service{logger: backend.NewLoggerWith("logger", "tempo-test")}
 		req, err := service.createRequest(context.Background(), &Datasource{}, "traceID", 1, 2)
 		require.NoError(t, err)
 		assert.Equal(t, 1, len(req.Header))
diff --git a/pkg/util/converter/jsonitere/jsonitere.go b/pkg/util/converter/jsonitere/jsonitere.go
deleted file mode 100644
index 4bc0c2ed55fb4..0000000000000
--- a/pkg/util/converter/jsonitere/jsonitere.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Package jsonitere wraps json-iterator/go's Iterator methods with error returns
-// so linting can catch unchecked errors.
-// The underlying iterator's Error property is returned and not reset.
-// See json-iterator/go for method documentation and additional methods that
-// can be added to this library.
-package jsonitere
-
-import (
-	j "github.com/json-iterator/go"
-)
-
-type Iterator struct {
-	// named property instead of embedded so there is no
-	// confusion about which method or property is called
-	i *j.Iterator
-}
-
-func NewIterator(i *j.Iterator) *Iterator {
-	return &Iterator{i}
-}
-
-func (iter *Iterator) Read() (any, error) {
-	return iter.i.Read(), iter.i.Error
-}
-
-func (iter *Iterator) ReadAny() (j.Any, error) {
-	return iter.i.ReadAny(), iter.i.Error
-}
-
-func (iter *Iterator) ReadArray() (bool, error) {
-	return iter.i.ReadArray(), iter.i.Error
-}
-
-func (iter *Iterator) ReadObject() (string, error) {
-	return iter.i.ReadObject(), iter.i.Error
-}
-
-func (iter *Iterator) ReadString() (string, error) {
-	return iter.i.ReadString(), iter.i.Error
-}
-
-func (iter *Iterator) WhatIsNext() (j.ValueType, error) {
-	return iter.i.WhatIsNext(), iter.i.Error
-}
-
-func (iter *Iterator) Skip() error {
-	iter.i.Skip()
-	return iter.i.Error
-}
-
-func (iter *Iterator) SkipAndReturnBytes() []byte {
-	return iter.i.SkipAndReturnBytes()
-}
-
-func (iter *Iterator) ReadVal(obj any) error {
-	iter.i.ReadVal(obj)
-	return iter.i.Error
-}
-
-func (iter *Iterator) ReadFloat64() (float64, error) {
-	return iter.i.ReadFloat64(), iter.i.Error
-}
-
-func (iter *Iterator) ReadInt8() (int8, error) {
-	return iter.i.ReadInt8(), iter.i.Error
-}
diff --git a/pkg/util/converter/prom.go b/pkg/util/converter/prom.go
deleted file mode 100644
index 1f6bdb67b8bf4..0000000000000
--- a/pkg/util/converter/prom.go
+++ /dev/null
@@ -1,965 +0,0 @@
-package converter
-
-import (
-	"encoding/json"
-	"fmt"
-	"strconv"
-	"time"
-
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana-plugin-sdk-go/data"
-	jsoniter "github.com/json-iterator/go"
-
-	"github.com/grafana/grafana/pkg/util/converter/jsonitere"
-)
-
-// helpful while debugging all the options that may appear
-func logf(format string, a ...any) {
-	//fmt.Printf(format, a...)
-}
-
-type Options struct {
-	Dataplane bool
-}
-
-func rspErr(e error) backend.DataResponse {
-	return backend.DataResponse{Error: e}
-}
-
-// ReadPrometheusStyleResult will read results from a prometheus or loki server and return data frames
-func ReadPrometheusStyleResult(jIter *jsoniter.Iterator, opt Options) backend.DataResponse {
-	iter := jsonitere.NewIterator(jIter)
-	var rsp backend.DataResponse
-	status := "unknown"
-	errorType := ""
-	promErrString := ""
-	warnings := []data.Notice{}
-
-l1Fields:
-	for l1Field, err := iter.ReadObject(); ; l1Field, err = iter.ReadObject() {
-		if err != nil {
-			return rspErr(err)
-		}
-		switch l1Field {
-		case "status":
-			if status, err = iter.ReadString(); err != nil {
-				return rspErr(err)
-			}
-
-		case "data":
-			rsp = readPrometheusData(iter, opt)
-			if rsp.Error != nil {
-				return rsp
-			}
-
-		case "error":
-			if promErrString, err = iter.ReadString(); err != nil {
-				return rspErr(err)
-			}
-
-		case "errorType":
-			if errorType, err = iter.ReadString(); err != nil {
-				return rspErr(err)
-			}
-
-		case "warnings":
-			if warnings, err = readWarnings(iter); err != nil {
-				return rspErr(err)
-			}
-
-		case "":
-			if err != nil {
-				return rspErr(err)
-			}
-			break l1Fields
-
-		default:
-			v, err := iter.Read()
-			if err != nil {
-				rsp.Error = err
-				return rsp
-			}
-			logf("[ROOT] TODO, support key: %s / %v\n", l1Field, v)
-		}
-	}
-
-	if status == "error" {
-		return backend.DataResponse{
-			Error: fmt.Errorf("%s: %s", errorType, promErrString),
-		}
-	}
-
-	if len(warnings) > 0 {
-		for _, frame := range rsp.Frames {
-			if frame.Meta == nil {
-				frame.Meta = &data.FrameMeta{}
-			}
-			frame.Meta.Notices = warnings
-		}
-	}
-
-	return rsp
-}
-
-func readWarnings(iter *jsonitere.Iterator) ([]data.Notice, error) {
-	warnings := []data.Notice{}
-	next, err := iter.WhatIsNext()
-	if err != nil {
-		return nil, err
-	}
-
-	if next != jsoniter.ArrayValue {
-		return warnings, nil
-	}
-
-	for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
-		if err != nil {
-			return nil, err
-		}
-		next, err := iter.WhatIsNext()
-		if err != nil {
-			return nil, err
-		}
-		if next == jsoniter.StringValue {
-			s, err := iter.ReadString()
-			if err != nil {
-				return nil, err
-			}
-			notice := data.Notice{
-				Severity: data.NoticeSeverityWarning,
-				Text:     s,
-			}
-			warnings = append(warnings, notice)
-		}
-	}
-
-	return warnings, nil
-}
-
-func readPrometheusData(iter *jsonitere.Iterator, opt Options) backend.DataResponse {
-	var rsp backend.DataResponse
-	t, err := iter.WhatIsNext()
-	if err != nil {
-		return rspErr(err)
-	}
-
-	if t == jsoniter.ArrayValue {
-		return readArrayData(iter)
-	}
-
-	if t != jsoniter.ObjectValue {
-		return backend.DataResponse{
-			Error: fmt.Errorf("expected object type"),
-		}
-	}
-
-	resultType := ""
-	resultTypeFound := false
-	var resultBytes []byte
-
-l1Fields:
-	for l1Field, err := iter.ReadObject(); ; l1Field, err = iter.ReadObject() {
-		if err != nil {
-			return rspErr(err)
-		}
-		switch l1Field {
-		case "resultType":
-			resultType, err = iter.ReadString()
-			if err != nil {
-				return rspErr(err)
-			}
-			resultTypeFound = true
-
-			// if we have saved resultBytes we will parse them here
-			// we saved them because when we had them we don't know the resultType
-			if len(resultBytes) > 0 {
-				ji := jsonitere.NewIterator(jsoniter.ParseBytes(jsoniter.ConfigDefault, resultBytes))
-				rsp = readResult(resultType, rsp, ji, opt)
-			}
-		case "result":
-			// for some rare cases resultType is coming after the result.
-			// when that happens we save the bytes and parse them after reading resultType
-			// see: https://github.com/grafana/grafana/issues/64693
-			if resultTypeFound {
-				rsp = readResult(resultType, rsp, iter, opt)
-			} else {
-				resultBytes = iter.SkipAndReturnBytes()
-			}
-
-		case "stats":
-			v, err := iter.Read()
-			if err != nil {
-				rspErr(err)
-			}
-			if len(rsp.Frames) > 0 {
-				meta := rsp.Frames[0].Meta
-				if meta == nil {
-					meta = &data.FrameMeta{}
-					rsp.Frames[0].Meta = meta
-				}
-				meta.Custom = map[string]any{
-					"stats": v,
-				}
-			}
-
-		case "":
-			if err != nil {
-				return rspErr(err)
-			}
-			if !resultTypeFound {
-				return rspErr(fmt.Errorf("no resultType found"))
-			}
-			break l1Fields
-
-		default:
-			v, err := iter.Read()
-			if err != nil {
-				return rspErr(err)
-			}
-			logf("[data] TODO, support key: %s / %v\n", l1Field, v)
-		}
-	}
-
-	return rsp
-}
-
-// will read the result object based on the resultType and return a DataResponse
-func readResult(resultType string, rsp backend.DataResponse, iter *jsonitere.Iterator, opt Options) backend.DataResponse {
-	switch resultType {
-	case "matrix", "vector":
-		rsp = readMatrixOrVectorMulti(iter, resultType, opt)
-		if rsp.Error != nil {
-			return rsp
-		}
-	case "streams":
-		rsp = readStream(iter)
-		if rsp.Error != nil {
-			return rsp
-		}
-	case "string":
-		rsp = readString(iter)
-		if rsp.Error != nil {
-			return rsp
-		}
-	case "scalar":
-		rsp = readScalar(iter)
-		if rsp.Error != nil {
-			return rsp
-		}
-	default:
-		if err := iter.Skip(); err != nil {
-			return rspErr(err)
-		}
-		rsp = backend.DataResponse{
-			Error: fmt.Errorf("unknown result type: %s", resultType),
-		}
-	}
-	return rsp
-}
-
-// will return strings or exemplars
-func readArrayData(iter *jsonitere.Iterator) backend.DataResponse {
-	lookup := make(map[string]*data.Field)
-
-	var labelFrame *data.Frame
-	rsp := backend.DataResponse{}
-
-	stringField := data.NewFieldFromFieldType(data.FieldTypeString, 0)
-	stringField.Name = "Value"
-	for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
-		if err != nil {
-			rspErr(err)
-		}
-
-		next, err := iter.WhatIsNext()
-		if err != nil {
-			return rspErr(err)
-		}
-
-		switch next {
-		case jsoniter.StringValue:
-			s, err := iter.ReadString()
-			if err != nil {
-				return rspErr(err)
-			}
-			stringField.Append(s)
-
-		// Either label or exemplars
-		case jsoniter.ObjectValue:
-			exemplar, labelPairs, err := readLabelsOrExemplars(iter)
-			if err != nil {
-				rspErr(err)
-			}
-			if exemplar != nil {
-				rsp.Frames = append(rsp.Frames, exemplar)
-			} else if labelPairs != nil {
-				max := 0
-				for _, pair := range labelPairs {
-					k := pair[0]
-					v := pair[1]
-					f, ok := lookup[k]
-					if !ok {
-						f = data.NewFieldFromFieldType(data.FieldTypeString, 0)
-						f.Name = k
-						lookup[k] = f
-
-						if labelFrame == nil {
-							labelFrame = data.NewFrame("")
-							rsp.Frames = append(rsp.Frames, labelFrame)
-						}
-						labelFrame.Fields = append(labelFrame.Fields, f)
-					}
-					f.Append(fmt.Sprintf("%v", v))
-					if f.Len() > max {
-						max = f.Len()
-					}
-				}
-
-				// Make sure all fields have equal length
-				for _, f := range lookup {
-					diff := max - f.Len()
-					if diff > 0 {
-						f.Extend(diff)
-					}
-				}
-			}
-
-		default:
-			{
-				ext, err := iter.ReadAny()
-				if err != nil {
-					rspErr(err)
-				}
-				v := fmt.Sprintf("%v", ext)
-				stringField.Append(v)
-			}
-		}
-	}
-
-	if stringField.Len() > 0 {
-		rsp.Frames = append(rsp.Frames, data.NewFrame("", stringField))
-	}
-
-	return rsp
-}
-
-// For consistent ordering read values to an array not a map
-func readLabelsAsPairs(iter *jsonitere.Iterator) ([][2]string, error) {
-	pairs := make([][2]string, 0, 10)
-	for k, err := iter.ReadObject(); k != ""; k, err = iter.ReadObject() {
-		if err != nil {
-			return nil, err
-		}
-		v, err := iter.ReadString()
-		if err != nil {
-			return nil, err
-		}
-		pairs = append(pairs, [2]string{k, v})
-	}
-	return pairs, nil
-}
-
-func readLabelsOrExemplars(iter *jsonitere.Iterator) (*data.Frame, [][2]string, error) {
-	pairs := make([][2]string, 0, 10)
-	labels := data.Labels{}
-	var frame *data.Frame
-
-l1Fields:
-	for l1Field, err := iter.ReadObject(); ; l1Field, err = iter.ReadObject() {
-		if err != nil {
-			return nil, nil, err
-		}
-		switch l1Field {
-		case "seriesLabels":
-			err = iter.ReadVal(&labels)
-			if err != nil {
-				return nil, nil, err
-			}
-
-		case "exemplars":
-			lookup := make(map[string]*data.Field)
-			timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
-			timeField.Name = data.TimeSeriesTimeFieldName
-			valueField := data.NewFieldFromFieldType(data.FieldTypeFloat64, 0)
-			valueField.Name = data.TimeSeriesValueFieldName
-			valueField.Labels = labels
-			frame = data.NewFrame("", timeField, valueField)
-			frame.Meta = &data.FrameMeta{
-				Custom: resultTypeToCustomMeta("exemplar"),
-			}
-			exCount := 0
-			for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
-				if err != nil {
-					return nil, nil, err
-				}
-				for l2Field, err := iter.ReadObject(); l2Field != ""; l2Field, err = iter.ReadObject() {
-					if err != nil {
-						return nil, nil, err
-					}
-					switch l2Field {
-					// nolint:goconst
-					case "value":
-						s, err := iter.ReadString()
-						if err != nil {
-							return nil, nil, err
-						}
-						v, err := strconv.ParseFloat(s, 64)
-						if err != nil {
-							return nil, nil, err
-						}
-						valueField.Append(v)
-
-					case "timestamp":
-						f, err := iter.ReadFloat64()
-						if err != nil {
-							return nil, nil, err
-						}
-						ts := timeFromFloat(f)
-						timeField.Append(ts)
-
-					case "labels":
-						pairs, err := readLabelsAsPairs(iter)
-						if err != nil {
-							return nil, nil, err
-						}
-						for _, pair := range pairs {
-							k := pair[0]
-							v := pair[1]
-							f, ok := lookup[k]
-							if !ok {
-								f = data.NewFieldFromFieldType(data.FieldTypeString, exCount)
-								f.Name = k
-								lookup[k] = f
-								frame.Fields = append(frame.Fields, f)
-							}
-							f.Append(v)
-						}
-
-						// Make sure all fields have equal length
-						for _, f := range lookup {
-							diff := exCount + 1 - f.Len()
-							if diff > 0 {
-								f.Extend(diff)
-							}
-						}
-
-					default:
-						if err = iter.Skip(); err != nil {
-							return nil, nil, err
-						}
-
-						frame.AppendNotices(data.Notice{
-							Severity: data.NoticeSeverityError,
-							Text:     fmt.Sprintf("unable to parse key: %s in response body", l2Field),
-						})
-					}
-				}
-				exCount++
-			}
-		case "":
-			if err != nil {
-				return nil, nil, err
-			}
-			break l1Fields
-
-		default:
-			iV, err := iter.Read()
-			if err != nil {
-				return nil, nil, err
-			}
-			v := fmt.Sprintf("%v", iV)
-			pairs = append(pairs, [2]string{l1Field, v})
-		}
-	}
-
-	return frame, pairs, nil
-}
-
-func readString(iter *jsonitere.Iterator) backend.DataResponse {
-	timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
-	timeField.Name = data.TimeSeriesTimeFieldName
-	valueField := data.NewFieldFromFieldType(data.FieldTypeString, 0)
-	valueField.Name = data.TimeSeriesValueFieldName
-	valueField.Labels = data.Labels{}
-
-	_, err := iter.ReadArray()
-	if err != nil {
-		return rspErr(err)
-	}
-
-	var t float64
-	if t, err = iter.ReadFloat64(); err != nil {
-		return rspErr(err)
-	}
-
-	if _, err = iter.ReadArray(); err != nil {
-		return rspErr(err)
-	}
-
-	var v string
-	if v, err = iter.ReadString(); err != nil {
-		return rspErr(err)
-	}
-
-	if _, err = iter.ReadArray(); err != nil {
-		return rspErr(err)
-	}
-
-	tt := timeFromFloat(t)
-	timeField.Append(tt)
-	valueField.Append(v)
-
-	frame := data.NewFrame("", timeField, valueField)
-	frame.Meta = &data.FrameMeta{
-		Type:   data.FrameTypeTimeSeriesMulti,
-		Custom: resultTypeToCustomMeta("string"),
-	}
-
-	return backend.DataResponse{
-		Frames: []*data.Frame{frame},
-	}
-}
-
-func readScalar(iter *jsonitere.Iterator) backend.DataResponse {
-	rsp := backend.DataResponse{}
-
-	timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
-	timeField.Name = data.TimeSeriesTimeFieldName
-	valueField := data.NewFieldFromFieldType(data.FieldTypeFloat64, 0)
-	valueField.Name = data.TimeSeriesValueFieldName
-	valueField.Labels = data.Labels{}
-
-	t, v, err := readTimeValuePair(iter)
-	if err != nil {
-		rsp.Error = err
-		return rsp
-	}
-	timeField.Append(t)
-	valueField.Append(v)
-
-	frame := data.NewFrame("", timeField, valueField)
-	frame.Meta = &data.FrameMeta{
-		Type:   data.FrameTypeNumericMulti,
-		Custom: resultTypeToCustomMeta("scalar"),
-	}
-
-	return backend.DataResponse{
-		Frames: []*data.Frame{frame},
-	}
-}
-
-func readMatrixOrVectorMulti(iter *jsonitere.Iterator, resultType string, opt Options) backend.DataResponse {
-	rsp := backend.DataResponse{}
-
-	for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
-		if err != nil {
-			return rspErr(err)
-		}
-		timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
-		timeField.Name = data.TimeSeriesTimeFieldName
-		valueField := data.NewFieldFromFieldType(data.FieldTypeFloat64, 0)
-		valueField.Name = data.TimeSeriesValueFieldName
-		valueField.Labels = data.Labels{}
-
-		var histogram *histogramInfo
-
-		for l1Field, err := iter.ReadObject(); l1Field != ""; l1Field, err = iter.ReadObject() {
-			if err != nil {
-				return rspErr(err)
-			}
-			switch l1Field {
-			case "metric":
-				if err = iter.ReadVal(&valueField.Labels); err != nil {
-					return rspErr(err)
-				}
-
-			case "value":
-				t, v, err := readTimeValuePair(iter)
-				if err != nil {
-					return rspErr(err)
-				}
-				timeField.Append(t)
-				valueField.Append(v)
-
-			// nolint:goconst
-			case "values":
-				for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
-					if err != nil {
-						return rspErr(err)
-					}
-					t, v, err := readTimeValuePair(iter)
-					if err != nil {
-						return rspErr(err)
-					}
-					timeField.Append(t)
-					valueField.Append(v)
-				}
-
-			case "histogram":
-				if histogram == nil {
-					histogram = newHistogramInfo()
-				}
-				err = readHistogram(iter, histogram)
-				if err != nil {
-					return rspErr(err)
-				}
-
-			case "histograms":
-				if histogram == nil {
-					histogram = newHistogramInfo()
-				}
-				for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
-					if err != nil {
-						return rspErr(err)
-					}
-					if err = readHistogram(iter, histogram); err != nil {
-						return rspErr(err)
-					}
-				}
-
-			default:
-				if err = iter.Skip(); err != nil {
-					return rspErr(err)
-				}
-				logf("readMatrixOrVector: %s\n", l1Field)
-			}
-		}
-
-		if histogram != nil {
-			histogram.yMin.Labels = valueField.Labels
-			frame := data.NewFrame(valueField.Name, histogram.time, histogram.yMin, histogram.yMax, histogram.count, histogram.yLayout)
-			frame.Meta = &data.FrameMeta{
-				Type: "heatmap-cells",
-			}
-			if frame.Name == data.TimeSeriesValueFieldName {
-				frame.Name = "" // only set the name if useful
-			}
-			rsp.Frames = append(rsp.Frames, frame)
-		} else {
-			frame := data.NewFrame("", timeField, valueField)
-			frame.Meta = &data.FrameMeta{
-				Type:   data.FrameTypeTimeSeriesMulti,
-				Custom: resultTypeToCustomMeta(resultType),
-			}
-			if opt.Dataplane && resultType == "vector" {
-				frame.Meta.Type = data.FrameTypeNumericMulti
-			}
-			if opt.Dataplane {
-				frame.Meta.TypeVersion = data.FrameTypeVersion{0, 1}
-			}
-			rsp.Frames = append(rsp.Frames, frame)
-		}
-	}
-
-	return rsp
-}
-
-func readTimeValuePair(iter *jsonitere.Iterator) (time.Time, float64, error) {
-	if _, err := iter.ReadArray(); err != nil {
-		return time.Time{}, 0, err
-	}
-
-	t, err := iter.ReadFloat64()
-	if err != nil {
-		return time.Time{}, 0, err
-	}
-
-	if _, err = iter.ReadArray(); err != nil {
-		return time.Time{}, 0, err
-	}
-
-	var v string
-	if v, err = iter.ReadString(); err != nil {
-		return time.Time{}, 0, err
-	}
-
-	if _, err = iter.ReadArray(); err != nil {
-		return time.Time{}, 0, err
-	}
-
-	tt := timeFromFloat(t)
-	fv, err := strconv.ParseFloat(v, 64)
-	return tt, fv, err
-}
-
-type histogramInfo struct {
-	//XMax (time)	YMin	Ymax	Count	YLayout
-	time    *data.Field
-	yMin    *data.Field // will have labels?
-	yMax    *data.Field
-	count   *data.Field
-	yLayout *data.Field
-}
-
-func newHistogramInfo() *histogramInfo {
-	hist := &histogramInfo{
-		time:    data.NewFieldFromFieldType(data.FieldTypeTime, 0),
-		yMin:    data.NewFieldFromFieldType(data.FieldTypeFloat64, 0),
-		yMax:    data.NewFieldFromFieldType(data.FieldTypeFloat64, 0),
-		count:   data.NewFieldFromFieldType(data.FieldTypeFloat64, 0),
-		yLayout: data.NewFieldFromFieldType(data.FieldTypeInt8, 0),
-	}
-	hist.time.Name = "xMax"
-	hist.yMin.Name = "yMin"
-	hist.yMax.Name = "yMax"
-	hist.count.Name = "count"
-	hist.yLayout.Name = "yLayout"
-	return hist
-}
-
-// This will read a single sparse histogram
-// [ time, { count, sum, buckets: [...] }]
-func readHistogram(iter *jsonitere.Iterator, hist *histogramInfo) error {
-	// first element
-	if _, err := iter.ReadArray(); err != nil {
-		return err
-	}
-
-	f, err := iter.ReadFloat64()
-	if err != nil {
-		return err
-	}
-	t := timeFromFloat(f)
-
-	// next object element
-	if _, err := iter.ReadArray(); err != nil {
-		return err
-	}
-
-	for l1Field, err := iter.ReadObject(); l1Field != ""; l1Field, err = iter.ReadObject() {
-		if err != nil {
-			return err
-		}
-		switch l1Field {
-		case "count":
-			if err = iter.Skip(); err != nil {
-				return err
-			}
-		case "sum":
-			if err = iter.Skip(); err != nil {
-				return err
-			}
-
-		case "buckets":
-			for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
-				if err != nil {
-					return err
-				}
-				hist.time.Append(t)
-
-				if _, err := iter.ReadArray(); err != nil {
-					return err
-				}
-
-				v, err := iter.ReadInt8()
-				if err != nil {
-					return err
-				}
-				hist.yLayout.Append(v)
-
-				if _, err := iter.ReadArray(); err != nil {
-					return err
-				}
-
-				if err = appendValueFromString(iter, hist.yMin); err != nil {
-					return err
-				}
-
-				if _, err := iter.ReadArray(); err != nil {
-					return err
-				}
-
-				err = appendValueFromString(iter, hist.yMax)
-				if err != nil {
-					return err
-				}
-
-				if _, err := iter.ReadArray(); err != nil {
-					return err
-				}
-
-				err = appendValueFromString(iter, hist.count)
-				if err != nil {
-					return err
-				}
-
-				for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
-					if err != nil {
-						return err
-					}
-					return fmt.Errorf("expected close array")
-				}
-			}
-
-		default:
-			if err = iter.Skip(); err != nil {
-				return err
-			}
-			logf("[SKIP]readHistogram: %s\n", l1Field)
-		}
-	}
-
-	if more, err := iter.ReadArray(); more || err != nil {
-		if err != nil {
-			return err
-		}
-		return fmt.Errorf("expected to be done")
-	}
-
-	return nil
-}
-
-func appendValueFromString(iter *jsonitere.Iterator, field *data.Field) error {
-	var err error
-	var s string
-	if s, err = iter.ReadString(); err != nil {
-		return err
-	}
-
-	var v float64
-	if v, err = strconv.ParseFloat(s, 64); err != nil {
-		return err
-	}
-
-	field.Append(v)
-	return nil
-}
-
-func readStream(iter *jsonitere.Iterator) backend.DataResponse {
-	rsp := backend.DataResponse{}
-
-	labelsField := data.NewFieldFromFieldType(data.FieldTypeJSON, 0)
-	labelsField.Name = "__labels" // avoid automatically spreading this by labels
-
-	timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
-	timeField.Name = "Time"
-
-	lineField := data.NewFieldFromFieldType(data.FieldTypeString, 0)
-	lineField.Name = "Line"
-
-	// Nanoseconds time field
-	tsField := data.NewFieldFromFieldType(data.FieldTypeString, 0)
-	tsField.Name = "TS"
-
-	labels := data.Labels{}
-	labelJson, err := labelsToRawJson(labels)
-	if err != nil {
-		return backend.DataResponse{Error: err}
-	}
-
-	for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
-		if err != nil {
-			rspErr(err)
-		}
-
-	l1Fields:
-		for l1Field, err := iter.ReadObject(); ; l1Field, err = iter.ReadObject() {
-			if err != nil {
-				return rspErr(err)
-			}
-			switch l1Field {
-			case "stream":
-				// we need to clear `labels`, because `iter.ReadVal`
-				// only appends to it
-				labels := data.Labels{}
-				if err = iter.ReadVal(&labels); err != nil {
-					return rspErr(err)
-				}
-
-				if labelJson, err = labelsToRawJson(labels); err != nil {
-					return rspErr(err)
-				}
-
-			case "values":
-				for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
-					if err != nil {
-						rsp.Error = err
-						return rsp
-					}
-
-					if _, err = iter.ReadArray(); err != nil {
-						return rspErr(err)
-					}
-
-					ts, err := iter.ReadString()
-					if err != nil {
-						return rspErr(err)
-					}
-
-					if _, err = iter.ReadArray(); err != nil {
-						return rspErr(err)
-					}
-
-					line, err := iter.ReadString()
-					if err != nil {
-						return rspErr(err)
-					}
-
-					if _, err = iter.ReadArray(); err != nil {
-						return rspErr(err)
-					}
-
-					t, err := timeFromLokiString(ts)
-					if err != nil {
-						return rspErr(err)
-					}
-
-					labelsField.Append(labelJson)
-					timeField.Append(t)
-					lineField.Append(line)
-					tsField.Append(ts)
-				}
-			case "":
-				if err != nil {
-					return rspErr(err)
-				}
-				break l1Fields
-			}
-		}
-	}
-
-	frame := data.NewFrame("", labelsField, timeField, lineField, tsField)
-	frame.Meta = &data.FrameMeta{}
-	rsp.Frames = append(rsp.Frames, frame)
-
-	return rsp
-}
-
-func resultTypeToCustomMeta(resultType string) map[string]string {
-	return map[string]string{"resultType": resultType}
-}
-
-func timeFromFloat(fv float64) time.Time {
-	return time.UnixMilli(int64(fv * 1000.0)).UTC()
-}
-
-func timeFromLokiString(str string) (time.Time, error) {
-	// normal time values look like: 1645030246277587968
-	// and are less than: math.MaxInt65=9223372036854775807
-	// This will do a fast path for any date before 2033
-	s := len(str)
-	if s < 19 || (s == 19 && str[0] == '1') {
-		ns, err := strconv.ParseInt(str, 10, 64)
-		if err == nil {
-			return time.Unix(0, ns).UTC(), nil
-		}
-	}
-
-	if s < 10 {
-		return time.Time{}, fmt.Errorf("unexpected time format '%v' in response. response may have been truncated", str)
-	}
-
-	ss, _ := strconv.ParseInt(str[0:10], 10, 64)
-	ns, _ := strconv.ParseInt(str[10:], 10, 64)
-	return time.Unix(ss, ns).UTC(), nil
-}
-
-func labelsToRawJson(labels data.Labels) (json.RawMessage, error) {
-	// data.Labels when converted to JSON keep the fields sorted
-	bytes, err := jsoniter.Marshal(labels)
-	if err != nil {
-		return nil, err
-	}
-
-	return json.RawMessage(bytes), nil
-}
diff --git a/pkg/util/converter/prom_test.go b/pkg/util/converter/prom_test.go
deleted file mode 100644
index 5ea6639acec5e..0000000000000
--- a/pkg/util/converter/prom_test.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package converter
-
-import (
-	"fmt"
-	"os"
-	"path"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/grafana/grafana-plugin-sdk-go/experimental"
-	"github.com/grafana/grafana/pkg/infra/httpclient"
-	jsoniter "github.com/json-iterator/go"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-const update = false
-
-var files = []string{
-	"prom-labels",
-	"prom-matrix",
-	"prom-matrix-with-nans",
-	"prom-matrix-histogram-no-labels",
-	"prom-matrix-histogram-partitioned",
-	"prom-vector-histogram-no-labels",
-	"prom-vector",
-	"prom-string",
-	"prom-scalar",
-	"prom-series",
-	"prom-warnings",
-	"prom-error",
-	"prom-exemplars-a",
-	"prom-exemplars-b",
-	"prom-exemplars-diff-labels",
-	"loki-streams-a",
-	"loki-streams-b",
-	"loki-streams-c",
-}
-
-func TestReadPromFrames(t *testing.T) {
-	for _, name := range files {
-		t.Run(name, runScenario(name, Options{}))
-	}
-}
-
-func TestReadLimited(t *testing.T) {
-	for _, name := range files {
-		p := path.Join("testdata", name+".json")
-		stat, err := os.Stat(p)
-		require.NoError(t, err)
-		size := stat.Size()
-
-		for i := int64(10); i < size-1; i += size / 10 {
-			t.Run(fmt.Sprintf("%v_%v", name, i), func(t *testing.T) {
-				//nolint:gosec
-				f, err := os.Open(p)
-				require.NoError(t, err)
-				mbr := httpclient.MaxBytesReader(f, i)
-
-				iter := jsoniter.Parse(jsoniter.ConfigDefault, mbr, 1024)
-				rsp := ReadPrometheusStyleResult(iter, Options{})
-
-				require.ErrorContains(t, rsp.Error, "response body too large")
-			})
-		}
-	}
-}
-
-// FIXME:
-//
-//lint:ignore U1000 Ignore used function for now
-func runScenario(name string, opts Options) func(t *testing.T) {
-	return func(t *testing.T) {
-		// Safe to disable, this is a test.
-		// nolint:gosec
-		f, err := os.Open(path.Join("testdata", name+".json"))
-		require.NoError(t, err)
-
-		iter := jsoniter.Parse(jsoniter.ConfigDefault, f, 1024)
-		rsp := ReadPrometheusStyleResult(iter, opts)
-
-		if strings.Contains(name, "error") {
-			require.Error(t, rsp.Error)
-			return
-		}
-		require.NoError(t, rsp.Error)
-
-		fname := name + "-frame"
-		experimental.CheckGoldenJSONResponse(t, "testdata", fname, &rsp, update)
-	}
-}
-
-func TestTimeConversions(t *testing.T) {
-	// include millisecond precision
-	assert.Equal(t,
-		time.Date(2020, time.September, 14, 15, 22, 25, 479000000, time.UTC),
-		timeFromFloat(1600096945.479))
-
-	ti, err := timeFromLokiString("1645030246277587968")
-	require.NoError(t, err)
-	// Loki date parsing
-	assert.Equal(t,
-		time.Date(2022, time.February, 16, 16, 50, 46, 277587968, time.UTC),
-		ti)
-
-	ti, err = timeFromLokiString("2000000000000000000")
-	require.NoError(t, err)
-
-	assert.Equal(t,
-		time.Date(2033, time.May, 18, 3, 33, 20, 0, time.UTC),
-		ti)
-}
diff --git a/pkg/util/errutil/errhttp/writer.go b/pkg/util/errutil/errhttp/writer.go
index 08de5720c6877..9f0b24b918f88 100644
--- a/pkg/util/errutil/errhttp/writer.go
+++ b/pkg/util/errutil/errhttp/writer.go
@@ -7,6 +7,9 @@ import (
 	"net/http"
 	"reflect"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apiserver/pkg/endpoints/request"
+
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/util/errutil"
 )
@@ -20,6 +23,14 @@ type ErrorOptions struct {
 	logger   log.Logger
 }
 
+type k8sError struct {
+	metav1.Status `json:",inline"`
+
+	// Internal values that do not have a clean home in the standard Status object
+	MessageID string         `json:"messageId"`
+	Extra     map[string]any `json:"extra,omitempty"`
+}
+
 // Write writes an error to the provided [http.ResponseWriter] with the
 // appropriate HTTP status and JSON payload from [errutil.Error].
 // Write also logs the provided error to either the "request-errors"
@@ -43,10 +54,49 @@ func Write(ctx context.Context, err error, w http.ResponseWriter, opts ...func(E
 
 	logError(ctx, gErr, opt)
 
+	var rsp any
 	pub := gErr.Public()
 	w.Header().Add("Content-Type", "application/json")
 	w.WriteHeader(pub.StatusCode)
-	err = json.NewEncoder(w).Encode(pub)
+	rsp = pub
+
+	// When running in k8s, this will return a v1 status
+	// Typically, k8s handlers should directly support error negotiation, however
+	// when implementing handlers directly this will maintain compatibility with client-go
+	info, ok := request.RequestInfoFrom(ctx)
+	if ok {
+		status := &k8sError{
+			Status: metav1.Status{
+				Status:  metav1.StatusFailure,
+				Code:    int32(pub.StatusCode),
+				Message: pub.Message,
+				Details: &metav1.StatusDetails{
+					Name:  info.Name,
+					Group: info.APIGroup,
+				},
+			},
+			// Add the internal values into
+			MessageID: pub.MessageID,
+			Extra:     pub.Extra,
+		}
+		switch pub.StatusCode {
+		case 400:
+			status.Reason = metav1.StatusReasonBadRequest
+		case 401:
+			status.Reason = metav1.StatusReasonUnauthorized
+		case 403:
+			status.Reason = metav1.StatusReasonForbidden
+		case 404:
+			status.Reason = metav1.StatusReasonNotFound
+		case 500: // many reasons things could map here
+			status.Reason = metav1.StatusReasonInternalError
+		case 504:
+			status.Reason = metav1.StatusReasonTimeout
+		}
+		rsp = status
+	}
+
+	err = json.NewEncoder(w).Encode(rsp)
 	if err != nil {
 		defaultLogger.FromContext(ctx).Error("error while writing error", "error", err)
 	}
diff --git a/pkg/util/errutil/errhttp/writer_test.go b/pkg/util/errutil/errhttp/writer_test.go
index 00737ebf711d7..d6c6427c88c3c 100644
--- a/pkg/util/errutil/errhttp/writer_test.go
+++ b/pkg/util/errutil/errhttp/writer_test.go
@@ -7,15 +7,39 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"k8s.io/apiserver/pkg/endpoints/request"
 
 	"github.com/grafana/grafana/pkg/util/errutil"
 )
 
 func TestWrite(t *testing.T) {
-	ctx := context.Background()
+	// Error without k8s context
+	recorder := doError(t, context.Background())
+	assert.Equal(t, http.StatusGatewayTimeout, recorder.Code)
+	assert.JSONEq(t, `{"message": "Timeout", "messageId": "test.thisIsExpected", "statusCode": 504}`, recorder.Body.String())
+
+	// Another request, but within the k8s framework
+	recorder = doError(t, request.WithRequestInfo(context.Background(), &request.RequestInfo{
+		APIGroup: "TestGroup",
+	}))
+	assert.Equal(t, http.StatusGatewayTimeout, recorder.Code)
+	assert.JSONEq(t, `{
+		"status": "Failure",
+		"reason": "Timeout",
+		"metadata": {},
+		"messageId": "test.thisIsExpected",
+		"message": "Timeout",
+		"details": { "group": "TestGroup" },
+		"code": 504
+	  }`, recorder.Body.String())
+}
+
+func doError(t *testing.T, ctx context.Context) *httptest.ResponseRecorder {
+	t.Helper()
+
 	const msgID = "test.thisIsExpected"
 	base := errutil.Timeout(msgID)
-	handler := func(writer http.ResponseWriter, request *http.Request) {
+	handler := func(writer http.ResponseWriter, _ *http.Request) {
 		Write(ctx, base.Errorf("got expected error"), writer)
 	}
 
@@ -23,7 +47,5 @@ func TestWrite(t *testing.T) {
 	recorder := httptest.NewRecorder()
 
 	handler(recorder, req)
-
-	assert.Equal(t, http.StatusGatewayTimeout, recorder.Code)
-	assert.JSONEq(t, `{"message": "Timeout", "messageId": "test.thisIsExpected", "statusCode": 504}`, recorder.Body.String())
+	return recorder
 }
diff --git a/pkg/util/errutil/errors.go b/pkg/util/errutil/errors.go
index 01ba37e0dadf2..d8e26760b7b91 100644
--- a/pkg/util/errutil/errors.go
+++ b/pkg/util/errutil/errors.go
@@ -55,6 +55,28 @@ func NotFound(msgID string, opts ...BaseOpt) Base {
 	return NewBase(StatusNotFound, msgID, opts...)
 }
 
+// UnprocessableContent initializes a new [Base] error with reason StatusUnprocessableEntity
+// that is used to construct [Error]. The msgID is passed to the caller
+// to serve as the base for user facing error messages.
+//
+// msgID should be structured as component.errorBrief, for example
+//
+//	plugin.checksumMismatch
+func UnprocessableEntity(msgID string, opts ...BaseOpt) Base {
+	return NewBase(StatusUnprocessableEntity, msgID, opts...)
+}
+
+// Conflict initializes a new [Base] error with reason StatusConflict
+// that is used to construct [Error]. The msgID is passed to the caller
+// to serve as the base for user facing error messages.
+//
+// msgID should be structured as component.errorBrief, for example
+//
+//	folder.alreadyExists
+func Conflict(msgID string, opts ...BaseOpt) Base {
+	return NewBase(StatusConflict, msgID, opts...)
+}
+
 // BadRequest initializes a new [Base] error with reason StatusBadRequest
 // that is used to construct [Error]. The msgID is passed to the caller
 // to serve as the base for user facing error messages.
diff --git a/pkg/util/errutil/status.go b/pkg/util/errutil/status.go
index 22b1b40ab2c3b..69c9166ccae29 100644
--- a/pkg/util/errutil/status.go
+++ b/pkg/util/errutil/status.go
@@ -20,6 +20,15 @@ const (
 	// corresponding document to return to the request.
 	// HTTP status code 404.
 	StatusNotFound CoreStatus = "Not found"
+	// StatusUnprocessableEntity means that the server understands the request,
+	// the content type and the syntax but it was unable to process the
+	// contained instructions.
+	// HTTP status code 422.
+	StatusUnprocessableEntity CoreStatus = "Unprocessable Entity"
+	// StatusConflict means that the server cannot fulfill the request
+	// there is a conflict in the current state of a resource
+	// HTTP status code 409.
+	StatusConflict CoreStatus = "Conflict"
 	// StatusTooManyRequests means that the client is rate limited
 	// by the server and should back-off before trying again.
 	// HTTP status code 429.
@@ -92,6 +101,10 @@ func (s CoreStatus) HTTPStatus() int {
 		return http.StatusNotFound
 	case StatusTimeout, StatusGatewayTimeout:
 		return http.StatusGatewayTimeout
+	case StatusUnprocessableEntity:
+		return http.StatusUnprocessableEntity
+	case StatusConflict:
+		return http.StatusConflict
 	case StatusTooManyRequests:
 		return http.StatusTooManyRequests
 	case StatusBadRequest, StatusValidationFailed:
@@ -120,6 +133,10 @@ func (s CoreStatus) LogLevel() LogLevel {
 		return LevelInfo
 	case StatusTimeout:
 		return LevelInfo
+	case StatusUnprocessableEntity:
+		return LevelInfo
+	case StatusConflict:
+		return LevelInfo
 	case StatusTooManyRequests:
 		return LevelInfo
 	case StatusBadRequest:
diff --git a/pkg/util/filepath.go b/pkg/util/filepath.go
index 1034245ac595e..fc76005840748 100644
--- a/pkg/util/filepath.go
+++ b/pkg/util/filepath.go
@@ -14,11 +14,20 @@ var ErrWalkSkipDir = errors.New("skip this directory")
 // If resolvedPath != "", then we are following symbolic links.
 type WalkFunc func(resolvedPath string, info os.FileInfo, err error) error
 
+type walker struct {
+	rootDir string
+}
+
+// newWalker creates a new walker
+func newWalker(rootDir string) *walker {
+	return &walker{rootDir: rootDir}
+}
+
 // Walk walks a path, optionally following symbolic links, and for each path,
 // it calls the walkFn passed.
 //
 // It is similar to filepath.Walk, except that it supports symbolic links and
-// can detect infinite loops while following sym links.
+// can detect infinite loops while following symlinks.
 // It solves the issue where your WalkFunc needs a path relative to the symbolic link
 // (resolving links within walkfunc loses the path to the symbolic link for each traversal).
 func Walk(path string, followSymlinks bool, detectSymlinkInfiniteLoop bool, walkFn WalkFunc) error {
@@ -34,7 +43,8 @@ func Walk(path string, followSymlinks bool, detectSymlinkInfiniteLoop bool, walk
 			symlinkPathsFollowed = make(map[string]bool, 8)
 		}
 	}
-	return walk(path, info, resolvedPath, symlinkPathsFollowed, walkFn)
+
+	return newWalker(path).walk(path, info, resolvedPath, symlinkPathsFollowed, walkFn)
 }
 
 // walk walks the path. It is a helper/sibling function to Walk.
@@ -43,7 +53,7 @@ func Walk(path string, followSymlinks bool, detectSymlinkInfiniteLoop bool, walk
 //
 // If resolvedPath is "", then we are not following symbolic links.
 // If symlinkPathsFollowed is not nil, then we need to detect infinite loop.
-func walk(path string, info os.FileInfo, resolvedPath string, symlinkPathsFollowed map[string]bool, walkFn WalkFunc) error {
+func (w *walker) walk(path string, info os.FileInfo, resolvedPath string, symlinkPathsFollowed map[string]bool, walkFn WalkFunc) error {
 	if info == nil {
 		return errors.New("walk: Nil FileInfo passed")
 	}
@@ -81,7 +91,7 @@ func walk(path string, info os.FileInfo, resolvedPath string, symlinkPathsFollow
 		if err != nil {
 			return err
 		}
-		return walk(path, info2, path2, symlinkPathsFollowed, walkFn)
+		return w.walk(path, info2, path2, symlinkPathsFollowed, walkFn)
 	} else if info.IsDir() {
 		list, err := os.ReadDir(path)
 		if err != nil {
@@ -102,49 +112,46 @@ func walk(path string, info os.FileInfo, resolvedPath string, symlinkPathsFollow
 			subFiles = append(subFiles, subFile{path: path2, resolvedPath: resolvedPath2, fileInfo: fileInfo})
 		}
 
-		if containsDistFolder(subFiles) {
-			err := walk(
+		if w.containsDistFolder(subFiles) {
+			err := w.walk(
 				filepath.Join(path, "dist"),
 				info,
 				filepath.Join(resolvedPath, "dist"),
 				symlinkPathsFollowed,
 				walkFn)
-
 			if err != nil {
 				return err
 			}
 		} else {
 			for _, p := range subFiles {
-				err = walk(p.path, p.fileInfo, p.resolvedPath, symlinkPathsFollowed, walkFn)
-
+				err = w.walk(p.path, p.fileInfo, p.resolvedPath, symlinkPathsFollowed, walkFn)
 				if err != nil {
 					return err
 				}
 			}
 		}
-
 		return nil
 	}
 	return nil
 }
 
-type subFile struct {
-	path, resolvedPath string
-	fileInfo           os.FileInfo
-}
-
-func containsDistFolder(subFiles []subFile) bool {
+// containsDistFolder returns true if the provided subFiles is a folder named "dist".
+func (w *walker) containsDistFolder(subFiles []subFile) bool {
 	for _, p := range subFiles {
 		if p.fileInfo.IsDir() && p.fileInfo.Name() == "dist" {
 			return true
 		}
 	}
-
 	return false
 }
 
+type subFile struct {
+	path, resolvedPath string
+	fileInfo           os.FileInfo
+}
+
 // CleanRelativePath returns the shortest path name equivalent to path
-// by purely lexical processing. It make sure the provided path is rooted
+// by purely lexical processing. It makes sure the provided path is rooted
 // and then uses filepath.Clean and filepath.Rel to make sure the path
 // doesn't include any separators or elements that shouldn't be there
 // like ., .., //.
diff --git a/pkg/util/filepath_test.go b/pkg/util/filepath_test.go
index 38116c5dda9af..dcaf10a53f939 100644
--- a/pkg/util/filepath_test.go
+++ b/pkg/util/filepath_test.go
@@ -1,6 +1,7 @@
 package util
 
 import (
+	"path/filepath"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -16,16 +17,17 @@ func TestCleanRelativePath(t *testing.T) {
 			expectedPath: ".",
 		},
 		{
-			input:        "/test/test.txt",
-			expectedPath: "test/test.txt",
+			input:        filepath.Join(string(filepath.Separator), "test", "test.txt"),
+			expectedPath: filepath.Join("test", "test.txt"),
 		},
 		{
-			input:        "../../test/test.txt",
-			expectedPath: "test/test.txt",
+			input:        filepath.Join("..", "..", "test", "test.txt"),
+			expectedPath: filepath.Join("test", "test.txt"),
 		},
 		{
-			input:        "./../test/test.txt",
-			expectedPath: "test/test.txt",
+			// since filepath.Join will remove the leading dot, we need to build the path manually
+			input:        "." + string(filepath.Separator) + filepath.Join("..", "test", "test.txt"),
+			expectedPath: filepath.Join("test", "test.txt"),
 		},
 	}
 
diff --git a/pkg/util/json.go b/pkg/util/json.go
index 7268ff93798ca..b1e7503bf5186 100644
--- a/pkg/util/json.go
+++ b/pkg/util/json.go
@@ -1,4 +1,112 @@
 package util
 
+import (
+	"encoding/json"
+
+	"github.com/jmespath/go-jmespath"
+
+	"github.com/grafana/grafana/pkg/util/errutil"
+)
+
 // DynMap defines a dynamic map interface.
 type DynMap map[string]any
+
+var (
+	// ErrEmptyJSON is an error for empty attribute in JSON.
+	ErrEmptyJSON = errutil.NewBase(errutil.StatusBadRequest,
+		"json-missing-body", errutil.WithPublicMessage("Empty JSON provided"))
+
+	// ErrNoAttributePathSpecified is an error for no attribute path specified.
+	ErrNoAttributePathSpecified = errutil.NewBase(errutil.StatusBadRequest,
+		"json-no-attribute-path-specified", errutil.WithPublicMessage("No attribute path specified"))
+
+	// ErrFailedToUnmarshalJSON is an error for failure in unmarshalling JSON.
+	ErrFailedToUnmarshalJSON = errutil.NewBase(errutil.StatusBadRequest,
+		"json-failed-to-unmarshal", errutil.WithPublicMessage("Failed to unmarshal JSON"))
+
+	// ErrFailedToSearchJSON is an error for failure in searching JSON.
+	ErrFailedToSearchJSON = errutil.NewBase(errutil.StatusBadRequest,
+		"json-failed-to-search", errutil.WithPublicMessage("Failed to search JSON with provided path"))
+)
+
+// SearchJSONForStringSliceAttr searches for a slice attribute in a JSON object and returns a string slice.
+// The attributePath parameter is a string that specifies the path to the attribute.
+// The data parameter is the JSON object that we're searching. It can be a byte slice or a go type.
+func SearchJSONForStringSliceAttr(attributePath string, data any) ([]string, error) {
+	val, err := searchJSONForAttr(attributePath, data)
+	if err != nil {
+		return []string{}, err
+	}
+
+	ifArr, ok := val.([]any)
+	if !ok {
+		return []string{}, nil
+	}
+
+	result := []string{}
+	for _, v := range ifArr {
+		if strVal, ok := v.(string); ok {
+			result = append(result, strVal)
+		}
+	}
+
+	return result, nil
+}
+
+// SearchJSONForStringAttr searches for a specific attribute in a JSON object and returns a string.
+// The attributePath parameter is a string that specifies the path to the attribute.
+// The data parameter is the JSON object that we're searching. It can be a byte slice or a go type.
+func SearchJSONForStringAttr(attributePath string, data any) (string, error) {
+	val, err := searchJSONForAttr(attributePath, data)
+	if err != nil {
+		return "", err
+	}
+
+	strVal, ok := val.(string)
+	if ok {
+		return strVal, nil
+	}
+
+	return "", nil
+}
+
+// searchJSONForAttr searches for a specific attribute in a JSON object.
+// The attributePath parameter is a string that specifies the path to the attribute.
+// The data parameter is the JSON object that we're searching.
+// The function returns the value of the attribute and an error if one occurred.
+func searchJSONForAttr(attributePath string, data any) (any, error) {
+	// If no attribute path is specified, return an error
+	if attributePath == "" {
+		return "", ErrNoAttributePathSpecified.Errorf("attribute path: %q", attributePath)
+	}
+
+	// If the data is nil, return an error
+	if data == nil {
+		return "", ErrEmptyJSON.Errorf("empty json, attribute path: %q", attributePath)
+	}
+
+	// Copy the data to a new variable
+	var jsonData = data
+
+	// If the data is a byte slice, try to unmarshal it into a JSON object
+	if dataBytes, ok := data.([]byte); ok {
+		// If the byte slice is empty, return an error
+		if len(dataBytes) == 0 {
+			return "", ErrEmptyJSON.Errorf("empty json, attribute path: %q", attributePath)
+		}
+
+		// Try to unmarshal the byte slice
+		if err := json.Unmarshal(dataBytes, &jsonData); err != nil {
+			return "", ErrFailedToUnmarshalJSON.Errorf("%v: %w", "failed to unmarshal user info JSON response", err)
+		}
+	}
+
+	// Search for the attribute in the JSON object
+	value, err := jmespath.Search(attributePath, jsonData)
+	if err != nil {
+		return "", ErrFailedToSearchJSON.Errorf("failed to search user info JSON response with provided path: %q: %w", attributePath, err)
+	}
+
+	// Return the value and nil error
+	return value, nil
+}
diff --git a/pkg/util/json_test.go b/pkg/util/json_test.go
new file mode 100644
index 0000000000000..232043a05f5c5
--- /dev/null
+++ b/pkg/util/json_test.go
@@ -0,0 +1,155 @@
+package util_test
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/util"
+)
+
+func TestSearchJSONForGroups(t *testing.T) {
+	t.Parallel()
+	tests := []struct {
+		Name                string
+		searchObject        any
+		GroupsAttributePath string
+		ExpectedResult      []string
+		ExpectedError       error
+	}{
+		{
+			Name:                "Given an invalid user info JSON response",
+			searchObject:        []byte("{"),
+			GroupsAttributePath: "attributes.groups",
+			ExpectedResult:      []string{},
+			ExpectedError:       util.ErrFailedToUnmarshalJSON,
+		},
+		{
+			Name:                "Given an empty user info JSON response and empty JMES path",
+			searchObject:        []byte{},
+			GroupsAttributePath: "",
+			ExpectedResult:      []string{},
+			ExpectedError:       util.ErrNoAttributePathSpecified,
+		},
+		{
+			Name:                "Given an empty user info JSON response and valid JMES path",
+			searchObject:        []byte{},
+			GroupsAttributePath: "attributes.groups",
+			ExpectedResult:      []string{},
+			ExpectedError:       util.ErrEmptyJSON,
+		},
+		{
+			Name:                "Given a nil JSON and valid JMES path",
+			searchObject:        []byte{},
+			GroupsAttributePath: "attributes.groups",
+			ExpectedResult:      []string{},
+			ExpectedError:       util.ErrEmptyJSON,
+		},
+		{
+			Name: "Given a simple user info JSON response and valid JMES path",
+			searchObject: []byte(`{
+		"attributes": {
+			"groups": ["foo", "bar"]
+		}
+}`),
+			GroupsAttributePath: "attributes.groups[]",
+			ExpectedResult:      []string{"foo", "bar"},
+		},
+		{
+			Name: "Given a simple object and valid JMES path",
+			searchObject: map[string]any{
+				"attributes": map[string]any{
+					"groups": []string{"foo", "bar"},
+				},
+			},
+			GroupsAttributePath: "attributes.groups[]",
+			ExpectedResult:      []string{"foo", "bar"},
+		},
+	}
+
+	for _, test := range tests {
+		test := test
+		t.Run(test.Name, func(t *testing.T) {
+			t.Parallel()
+			actualResult, err := util.SearchJSONForStringSliceAttr(
+				test.GroupsAttributePath, test.searchObject)
+			if test.ExpectedError == nil {
+				require.NoError(t, err)
+			} else {
+				require.ErrorIs(t, err, test.ExpectedError)
+			}
+			require.Equal(t, test.ExpectedResult, actualResult)
+		})
+	}
+}
+
+func TestSearchJSONForEmail(t *testing.T) {
+	t.Parallel()
+	tests := []struct {
+		Name                 string
+		UserInfoJSONResponse any
+		EmailAttributePath   string
+		ExpectedResult       string
+		ExpectedError        error
+	}{
+		{
+			Name: "Given a simple user info JSON response and valid JMES path",
+			UserInfoJSONResponse: []byte(`{
+	"attributes": {
+		"email": "grafana@localhost"
+	}
+}`),
+			EmailAttributePath: "attributes.email",
+			ExpectedResult:     "grafana@localhost",
+		},
+		{
+			Name: "Given a simple object and valid JMES path",
+			UserInfoJSONResponse: map[string]any{
+				"attributes": map[string]any{
+					"email": "grafana@localhost",
+				},
+			},
+			EmailAttributePath: "attributes.email",
+			ExpectedResult:     "grafana@localhost",
+		},
+		{
+			Name: "Given a user info JSON response with e-mails array and valid JMES path",
+			UserInfoJSONResponse: []byte(`{
+	"attributes": {
+		"emails": ["grafana@localhost", "admin@localhost"]
+	}
+}`),
+			EmailAttributePath: "attributes.emails[0]",
+			ExpectedResult:     "grafana@localhost",
+		},
+		{
+			Name: "Given a nested user info JSON response and valid JMES path",
+			UserInfoJSONResponse: []byte(`{
+	"identities": [
+		{
+			"userId": "grafana@localhost"
+		},
+		{
+			"userId": "admin@localhost"
+		}
+	]
+}`),
+			EmailAttributePath: "identities[0].userId",
+			ExpectedResult:     "grafana@localhost",
+		},
+	}
+
+	for _, test := range tests {
+		test := test
+		t.Run(test.Name, func(t *testing.T) {
+			t.Parallel()
+			actualResult, err := util.SearchJSONForStringAttr(test.EmailAttributePath, test.UserInfoJSONResponse)
+			if test.ExpectedError != nil {
+				require.NoError(t, err)
+			} else {
+				require.ErrorIs(t, err, test.ExpectedError)
+			}
+			require.Equal(t, test.ExpectedResult, actualResult)
+		})
+	}
+}
diff --git a/pkg/util/maputil/maputil.go b/pkg/util/maputil/maputil.go
deleted file mode 100644
index f3ff61baecdd9..0000000000000
--- a/pkg/util/maputil/maputil.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package maputil
-
-import "fmt"
-
-func GetMap(obj map[string]any, key string) (map[string]any, error) {
-	if untypedValue, ok := obj[key]; ok {
-		if value, ok := untypedValue.(map[string]any); ok {
-			return value, nil
-		} else {
-			err := fmt.Errorf("the field '%s' should be an object", key)
-			return nil, err
-		}
-	} else {
-		err := fmt.Errorf("the field '%s' should be set", key)
-		return nil, err
-	}
-}
-
-func GetBool(obj map[string]any, key string) (bool, error) {
-	if untypedValue, ok := obj[key]; ok {
-		if value, ok := untypedValue.(bool); ok {
-			return value, nil
-		} else {
-			err := fmt.Errorf("the field '%s' should be a bool", key)
-			return false, err
-		}
-	} else {
-		err := fmt.Errorf("the field '%s' should be set", key)
-		return false, err
-	}
-}
-
-func GetBoolOptional(obj map[string]any, key string) (bool, error) {
-	if untypedValue, ok := obj[key]; ok {
-		if value, ok := untypedValue.(bool); ok {
-			return value, nil
-		} else {
-			err := fmt.Errorf("the field '%s' should be a bool", key)
-			return false, err
-		}
-	} else {
-		// Value optional, not error
-		return false, nil
-	}
-}
-
-func GetString(obj map[string]any, key string) (string, error) {
-	if untypedValue, ok := obj[key]; ok {
-		if value, ok := untypedValue.(string); ok {
-			return value, nil
-		} else {
-			err := fmt.Errorf("the field '%s' should be a string", key)
-			return "", err
-		}
-	} else {
-		err := fmt.Errorf("the field '%s' should be set", key)
-		return "", err
-	}
-}
-
-func GetStringOptional(obj map[string]any, key string) (string, error) {
-	if untypedValue, ok := obj[key]; ok {
-		if value, ok := untypedValue.(string); ok {
-			return value, nil
-		} else {
-			err := fmt.Errorf("the field '%s' should be a string", key)
-			return "", err
-		}
-	} else {
-		// Value optional, not error
-		return "", nil
-	}
-}
diff --git a/pkg/util/math.go b/pkg/util/math.go
deleted file mode 100644
index e656393b14eed..0000000000000
--- a/pkg/util/math.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package util
-
-// MinInt returns the smaller of x or y.
-func MinInt(x, y int) int {
-	if x > y {
-		return y
-	}
-	return x
-}
diff --git a/pkg/util/osutil/osutil.go b/pkg/util/osutil/osutil.go
new file mode 100644
index 0000000000000..605a8812a0fe8
--- /dev/null
+++ b/pkg/util/osutil/osutil.go
@@ -0,0 +1,42 @@
+package osutil
+
+import (
+	"os"
+)
+
+// Env collects global functions from standard package "os" that are related to
+// environment variables. This allows abstracting code and provides a way to
+// concurrently test code that needs access to these shared resources.
+type Env interface {
+	Setenv(key, value string) error
+	Getenv(key string) string
+}
+
+// RealEnv implements Env interface by calling the actual global functions in
+// package "os". This should be used by default anywhere that an Env is
+// expected, and use MapEnv instead in your unit tests.
+type RealEnv struct{}
+
+func (RealEnv) Setenv(key, value string) error {
+	return os.Setenv(key, value)
+}
+
+func (RealEnv) Getenv(key string) string {
+	return os.Getenv(key)
+}
+
+// MapEnv is a fake implementing Env interface. It is purposefully not
+// concurrency-safe, so if your tests using it panic due to concurrent map
+// access, then you need to fix a data race in your code. This is
+// because environment variables are globals to a process, so you should be
+// properly synchronizing access to them (e.g. with a mutex).
+type MapEnv map[string]string
+
+func (m MapEnv) Setenv(key, value string) error {
+	m[key] = value
+	return nil
+}
+
+func (m MapEnv) Getenv(key string) string {
+	return m[key]
+}
diff --git a/pkg/util/osutil/osutil_test.go b/pkg/util/osutil/osutil_test.go
new file mode 100644
index 0000000000000..5a9dcc41b5fc5
--- /dev/null
+++ b/pkg/util/osutil/osutil_test.go
@@ -0,0 +1,35 @@
+package osutil
+
+import (
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestRealEnv(t *testing.T) {
+	// testing here is obviously not parallel since we do need to access real
+	// environment variables from the os
+
+	const key = "MEREKETENGUE"
+	const value = "IS ALIVE"
+
+	assert.Equal(t, os.Getenv(key), RealEnv{}.Getenv(key))
+	assert.NoError(t, RealEnv{}.Setenv(key, value))
+	assert.Equal(t, value, RealEnv{}.Getenv(key))
+	assert.Equal(t, value, os.Getenv(key))
+}
+
+func TestMapEnv(t *testing.T) {
+	t.Parallel()
+
+	const key = "THE_THING"
+	const value = "IS ALIVE"
+
+	e := MapEnv{}
+	assert.Empty(t, e.Getenv(key))
+	assert.Len(t, e, 0)
+	assert.NoError(t, e.Setenv(key, value))
+	assert.Equal(t, value, e.Getenv(key))
+	assert.Len(t, e, 1)
+}
diff --git a/pkg/util/shortid_generator.go b/pkg/util/shortid_generator.go
index eb841b7bba0fa..db216e622a6e6 100644
--- a/pkg/util/shortid_generator.go
+++ b/pkg/util/shortid_generator.go
@@ -8,6 +8,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/bwmarrin/snowflake"
 	"github.com/google/uuid"
 )
 
@@ -42,24 +43,39 @@ func IsShortUIDTooLong(uid string) bool {
 	return len(uid) > MaxUIDLength
 }
 
+var node *snowflake.Node
+
 // GenerateShortUID will generate a UUID that can also be a k8s name
 // it is guaranteed to have a character as the first letter
 // This UID will be a valid k8s name
 func GenerateShortUID() string {
 	mtx.Lock()
 	defer mtx.Unlock()
-	uid, err := uuid.NewRandom()
-	if err != nil {
-		// This should never happen... but this seems better than a panic
-		for i := range uid {
-			uid[i] = byte(uidrand.Intn(255))
-		}
+
+	if node == nil {
+		// ignoring the error happens when input outside 0-1023
+		node, _ = snowflake.NewNode(rand.Int63n(1024))
 	}
-	uuid := uid.String()
-	if rune(uuid[0]) < rune('a') {
-		return string(hexLetters[uidrand.Intn(len(hexLetters))]) + uuid[1:]
+
+	// Use UUIDs if snowflake failed (should be never)
+	if node == nil {
+		uid, err := uuid.NewRandom()
+		if err != nil {
+			// This should never happen... but this seems better than a panic
+			for i := range uid {
+				uid[i] = byte(uidrand.Intn(255))
+			}
+		}
+		uuid := uid.String()
+		if rune(uuid[0]) < rune('a') {
+			uuid = string(hexLetters[uidrand.Intn(len(hexLetters))]) + uuid[1:]
+		}
+		return uuid
 	}
-	return uuid
+
+	return string(hexLetters[uidrand.Intn(len(hexLetters))]) + // start with a letter
+		node.Generate().Base36() +
+		string(hexLetters[uidrand.Intn(len(hexLetters))]) // a bit more entropy
 }
 
 // ValidateUID checks the format and length of the string and returns error if it does not pass the condition
diff --git a/pkg/util/shortid_generator_test.go b/pkg/util/shortid_generator_test.go
index 010219244aee4..6bc4bb05b5c3b 100644
--- a/pkg/util/shortid_generator_test.go
+++ b/pkg/util/shortid_generator_test.go
@@ -1,12 +1,13 @@
 package util
 
 import (
+	"fmt"
 	"sync"
 	"testing"
 
 	"cuelang.org/go/pkg/strings"
-	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
+	"github.com/teris-io/shortid"
 	"k8s.io/apimachinery/pkg/util/validation"
 )
 
@@ -48,14 +49,27 @@ func TestRandomUIDs(t *testing.T) {
 			t.Fatalf("created invalid name: %v", validation)
 		}
 
-		_, err := uuid.Parse(v)
-		require.NoError(t, err)
-
-		//fmt.Println(v)
+		//	fmt.Println(v)
 	}
 	// t.FailNow()
 }
 
+func TestCaseInsensitiveCollisionsUIDs(t *testing.T) {
+	history := make(map[string]bool, 0)
+	for i := 0; i < 100000; i++ {
+		v := GenerateShortUID()
+		if false {
+			v, _ = shortid.Generate() // collides in less then 500 iterations
+		}
+
+		lower := strings.ToLower(v)
+		_, exists := history[lower]
+		require.False(t, exists, fmt.Sprintf("already found: %s (index:%d)", v, i))
+
+		history[lower] = true
+	}
+}
+
 func TestIsShortUIDTooLong(t *testing.T) {
 	var tests = []struct {
 		name     string
diff --git a/pkg/services/store/kind/svg/svg.go b/pkg/util/svg.go
similarity index 99%
rename from pkg/services/store/kind/svg/svg.go
rename to pkg/util/svg.go
index 4460981444256..356c3f080cddf 100644
--- a/pkg/services/store/kind/svg/svg.go
+++ b/pkg/util/svg.go
@@ -23,7 +23,7 @@
 //FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 //OTHER DEALINGS IN THE SOFTWARE.
 
-package svg
+package util
 
 import (
 	"regexp"
diff --git a/pkg/util/xorm/engine.go b/pkg/util/xorm/engine.go
index 3556dc9325c4c..ba2136414b190 100644
--- a/pkg/util/xorm/engine.go
+++ b/pkg/util/xorm/engine.go
@@ -259,6 +259,15 @@ func (engine *Engine) SQL(query any, args ...any) *Session {
 	return session.SQL(query, args...)
 }
 
+// NoAutoTime Default if your struct has "created" or "updated" filed tag, the fields
+// will automatically be filled with current time when Insert or Update
+// invoked. Call NoAutoTime if you dont' want to fill automatically.
+func (engine *Engine) NoAutoTime() *Session {
+	session := engine.NewSession()
+	session.isAutoClose = true
+	return session.NoAutoTime()
+}
+
 func (engine *Engine) loadTableInfo(table *core.Table) error {
 	colSeq, cols, err := engine.dialect.GetColumns(table.Name)
 	if err != nil {
diff --git a/pkg/util/xorm/go.mod b/pkg/util/xorm/go.mod
index 95cdb5d2b6b74..d499a5d5137f7 100644
--- a/pkg/util/xorm/go.mod
+++ b/pkg/util/xorm/go.mod
@@ -1,16 +1,20 @@
-module xorm.io/xorm
+module github.com/grafana/grafana/pkg/util/xorm
 
-go 1.11
+go 1.21
 
 require (
-	github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4
-	github.com/go-sql-driver/mysql v1.4.1
-	github.com/kr/pretty v0.1.0 // indirect
-	github.com/lib/pq v1.0.0
-	github.com/mattn/go-sqlite3 v1.10.0
-	github.com/stretchr/testify v1.4.0
-	github.com/ziutek/mymysql v1.5.4
-	gopkg.in/yaml.v2 v2.2.8 // indirect
+	github.com/mattn/go-sqlite3 v1.14.19
+	github.com/stretchr/testify v1.9.0
 	xorm.io/builder v0.3.6
-	xorm.io/core v0.7.2
+	xorm.io/core v0.7.3
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/go-sql-driver/mysql v1.7.1 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/rogpeppe/go-internal v1.11.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/pkg/util/xorm/go.sum b/pkg/util/xorm/go.sum
index 1bbc639a7a347..5e9f1440f7ed9 100644
--- a/pkg/util/xorm/go.sum
+++ b/pkg/util/xorm/go.sum
@@ -1,151 +1,28 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.37.4 h1:glPeL3BQJsbF6aIIYfZizMwc5LTYz250bDMjttbBGAU=
-cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
-github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4 h1:YcpmyvADGYw5LqMnHqSkyIELsHCGF6PkrmM31V8rF7o=
-github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM=
-github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
-github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
-github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
 github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk8V3XHWUcJmYTh+ZnlHVyc+A4oZYS3Y=
 github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
-github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
-github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
-github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
-github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
-go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c h1:Vj5n4GlwjmQteupaxJ9+0FNOmBrHfq7vN4btdGoDZgI=
-golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.0 h1:Tfd7cKwKbFRsI8RMAD3oqqw7JPFRrvFlOsfbgVkjOOw=
 google.golang.org/appengine v1.6.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 xorm.io/builder v0.3.6 h1:ha28mQ2M+TFx96Hxo+iq6tQgnkC9IZkM6D8w9sKHHF8=
 xorm.io/builder v0.3.6/go.mod h1:LEFAPISnRzG+zxaxj2vPicRwz67BdhFreKg8yv8/TgU=
-xorm.io/core v0.7.2 h1:mEO22A2Z7a3fPaZMk6gKL/jMD80iiyNwRrX5HOv3XLw=
-xorm.io/core v0.7.2/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM=
+xorm.io/core v0.7.3 h1:W8ws1PlrnkS1CZU1YWaYLMQcQilwAmQXU0BJDJon+H0=
diff --git a/pkg/util/xorm/session_cols.go b/pkg/util/xorm/session_cols.go
index 184cfb982c239..268c865799177 100644
--- a/pkg/util/xorm/session_cols.go
+++ b/pkg/util/xorm/session_cols.go
@@ -94,6 +94,12 @@ func (session *Session) AllCols() *Session {
 	return session
 }
 
+// AllCols ask all columns
+func (session *Session) Omit(columns ...string) *Session {
+	session.statement.Omit(columns...)
+	return session
+}
+
 // MustCols specify some columns must use even if they are empty
 func (session *Session) MustCols(columns ...string) *Session {
 	session.statement.MustCols(columns...)
@@ -123,3 +129,10 @@ func (session *Session) Nullable(columns ...string) *Session {
 	session.statement.Nullable(columns...)
 	return session
 }
+
+// NoAutoTime means do not automatically give created field and updated field
+// the current time on the current session temporarily
+func (session *Session) NoAutoTime() *Session {
+	session.statement.UseAutoTime = false
+	return session
+}
diff --git a/pkg/util/xorm/xorm_test.go b/pkg/util/xorm/xorm_test.go
new file mode 100644
index 0000000000000..988528edb6bb7
--- /dev/null
+++ b/pkg/util/xorm/xorm_test.go
@@ -0,0 +1,17 @@
+package xorm
+
+import (
+	"testing"
+
+	_ "github.com/mattn/go-sqlite3"
+	"github.com/stretchr/testify/require"
+)
+
+func TestNewEngine(t *testing.T) {
+	t.Run("successfully create a new engine", func(t *testing.T) {
+		eng, err := NewEngine("sqlite3", "./test.db")
+		require.NoError(t, err)
+		require.NotNil(t, eng)
+		require.Equal(t, "sqlite3", eng.DriverName())
+	})
+}
diff --git a/pkg/web/context.go b/pkg/web/context.go
index 138945f3dcd14..706da507ece5c 100644
--- a/pkg/web/context.go
+++ b/pkg/web/context.go
@@ -205,3 +205,9 @@ func (ctx *Context) GetCookie(name string) string {
 	val, _ := url.QueryUnescape(cookie.Value)
 	return val
 }
+
+// QueryFloat64 returns query result in float64 type.
+func (ctx *Context) QueryFloat64(name string) float64 {
+	n, _ := strconv.ParseFloat(ctx.Query(name), 64)
+	return n
+}
diff --git a/pkg/web/macaron.go b/pkg/web/macaron.go
index 835389675f3c8..ceecf6dc08b89 100644
--- a/pkg/web/macaron.go
+++ b/pkg/web/macaron.go
@@ -1,6 +1,3 @@
-//go:build go1.3
-// +build go1.3
-
 // Copyright 2014 The Macaron Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License"): you may
diff --git a/playwright.config.ts b/playwright.config.ts
new file mode 100644
index 0000000000000..a4abcbd026302
--- /dev/null
+++ b/playwright.config.ts
@@ -0,0 +1,74 @@
+import { defineConfig, devices } from '@playwright/test';
+import path, { dirname } from 'path';
+
+import { PluginOptions } from '@grafana/plugin-e2e';
+
+const testDirRoot = 'e2e/plugin-e2e/';
+
+export default defineConfig<PluginOptions>({
+  fullyParallel: true,
+  /* Retry on CI only */
+  retries: process.env.CI ? 2 : 0,
+  /* Opt out of parallel tests on CI. */
+  workers: process.env.CI ? 1 : undefined,
+  reporter: 'html',
+  use: {
+    baseURL: `http://${process.env.HOST || 'localhost'}:${process.env.PORT || 3000}`,
+    trace: 'retain-on-failure',
+    httpCredentials: {
+      username: 'admin',
+      password: 'admin',
+    },
+    provisioningRootDir: path.join(process.cwd(), process.env.PROV_DIR ?? 'conf/provisioning'),
+  },
+  projects: [
+    // Login to Grafana with admin user and store the cookie on disk for use in other tests
+    {
+      name: 'authenticate',
+      testDir: `${dirname(require.resolve('@grafana/plugin-e2e'))}/auth`,
+      testMatch: [/.*\.js/],
+    },
+    // Login to Grafana with new user with viewer role and store the cookie on disk for use in other tests
+    {
+      name: 'createUserAndAuthenticate',
+      testDir: `${dirname(require.resolve('@grafana/plugin-e2e'))}/auth`,
+      testMatch: [/.*\.js/],
+      use: {
+        user: {
+          user: 'viewer',
+          password: 'password',
+          role: 'Viewer',
+        },
+      },
+    },
+    // Run all tests in parallel using user with admin role
+    {
+      name: 'admin',
+      testDir: path.join(testDirRoot, '/plugin-e2e-api-tests/as-admin-user'),
+      use: {
+        ...devices['Desktop Chrome'],
+        storageState: 'playwright/.auth/admin.json',
+      },
+      dependencies: ['authenticate'],
+    },
+    // Run all tests in parallel using user with viewer role
+    {
+      name: 'viewer',
+      testDir: path.join(testDirRoot, '/plugin-e2e-api-tests/as-viewer-user'),
+      use: {
+        ...devices['Desktop Chrome'],
+        storageState: 'playwright/.auth/viewer.json',
+      },
+      dependencies: ['createUserAndAuthenticate'],
+    },
+    {
+      name: 'mysql',
+      testDir: path.join(testDirRoot, '/mysql'),
+      use: {
+        ...devices['Desktop Chrome'],
+        storageState: 'playwright/.auth/admin.json',
+      },
+      dependencies: ['authenticate'],
+    },
+  ],
+});
diff --git a/plugins-bundled/internal/input-datasource/.gitignore b/plugins-bundled/internal/input-datasource/.gitignore
deleted file mode 100644
index 61c3bc75a05ef..0000000000000
--- a/plugins-bundled/internal/input-datasource/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.yarn
diff --git a/plugins-bundled/internal/input-datasource/README.md b/plugins-bundled/internal/input-datasource/README.md
deleted file mode 100644
index 00761696d6a0d..0000000000000
--- a/plugins-bundled/internal/input-datasource/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Direct Input Data Source - Bundled Plugin
-
-This data source lets you define results directly in CSV. The values are stored either in a shared data source, or directly in panels.
diff --git a/plugins-bundled/internal/input-datasource/__mocks__/d3-interpolate.ts b/plugins-bundled/internal/input-datasource/__mocks__/d3-interpolate.ts
deleted file mode 100644
index f053ebf7976e3..0000000000000
--- a/plugins-bundled/internal/input-datasource/__mocks__/d3-interpolate.ts
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = {};
diff --git a/plugins-bundled/internal/input-datasource/jest.config.js b/plugins-bundled/internal/input-datasource/jest.config.js
deleted file mode 100644
index 88c2dfafc09d5..0000000000000
--- a/plugins-bundled/internal/input-datasource/jest.config.js
+++ /dev/null
@@ -1,18 +0,0 @@
-module.exports = {
-  testEnvironment: 'jest-environment-jsdom',
-  preset: 'ts-jest',
-  extensionsToTreatAsEsm: ['.ts'],
-  transform: {
-    '^.+\\.(t|j)sx?$': [
-      'ts-jest',
-      {
-        useESM: true,
-        isolatedModules: true,
-        allowJs: true,
-      },
-    ],
-  },
-  moduleNameMapper: {
-    '^d3-interpolate$': '<rootDir>/__mocks__/d3-interpolate.ts',
-  },
-};
diff --git a/plugins-bundled/internal/input-datasource/package.json b/plugins-bundled/internal/input-datasource/package.json
deleted file mode 100644
index 8229547e4dd83..0000000000000
--- a/plugins-bundled/internal/input-datasource/package.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "name": "@grafana-plugins/input-datasource",
-  "version": "10.3.0-pre",
-  "description": "Input Datasource",
-  "private": true,
-  "repository": {
-    "type": "git",
-    "url": "http://github.com/grafana/grafana.git"
-  },
-  "scripts": {
-    "build": "yarn test && webpack -c webpack.config.ts --env production",
-    "dev": "webpack -w -c webpack.config.ts --env development",
-    "test": "jest -c jest.config.js"
-  },
-  "author": "Grafana Labs",
-  "devDependencies": {
-    "@grafana/tsconfig": "^1.2.0-rc1",
-    "@types/jest": "26.0.15",
-    "@types/react": "18.0.28",
-    "copy-webpack-plugin": "11.0.0",
-    "eslint-webpack-plugin": "4.0.0",
-    "fork-ts-checker-webpack-plugin": "8.0.0",
-    "jest": "29.3.1",
-    "jest-environment-jsdom": "29.3.1",
-    "swc-loader": "0.2.3",
-    "ts-jest": "29.0.5",
-    "ts-node": "10.9.1",
-    "webpack": "5.76.0"
-  },
-  "dependencies": {
-    "@grafana/data": "10.3.0-pre",
-    "@grafana/ui": "10.3.0-pre",
-    "react": "18.2.0",
-    "tslib": "2.5.0"
-  }
-}
diff --git a/plugins-bundled/internal/input-datasource/src/InputConfigEditor.tsx b/plugins-bundled/internal/input-datasource/src/InputConfigEditor.tsx
deleted file mode 100644
index e79558da14c4e..0000000000000
--- a/plugins-bundled/internal/input-datasource/src/InputConfigEditor.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-// Libraries
-import React, { PureComponent } from 'react';
-
-// Types
-import { DataSourcePluginOptionsEditorProps, DataFrame, MutableDataFrame } from '@grafana/data';
-import { TableInputCSV } from '@grafana/ui';
-
-import { InputOptions } from './types';
-import { dataFrameToCSV } from './utils';
-
-interface Props extends DataSourcePluginOptionsEditorProps<InputOptions> {}
-
-interface State {
-  text: string;
-}
-
-export class InputConfigEditor extends PureComponent<Props, State> {
-  state = {
-    text: '',
-  };
-
-  componentDidMount() {
-    const { options } = this.props;
-    if (options.jsonData.data) {
-      const text = dataFrameToCSV(options.jsonData.data);
-      this.setState({ text });
-    }
-  }
-
-  onSeriesParsed = (data: DataFrame[], text: string) => {
-    const { options, onOptionsChange } = this.props;
-    if (!data) {
-      data = [new MutableDataFrame()];
-    }
-    // data is a property on 'jsonData'
-    const jsonData = {
-      ...options.jsonData,
-      data,
-    };
-
-    onOptionsChange({
-      ...options,
-      jsonData,
-    });
-    this.setState({ text });
-  };
-
-  render() {
-    const { text } = this.state;
-    return (
-      <div>
-        <div className="gf-form-group">
-          <h4>Shared Data:</h4>
-          <span>Enter CSV</span>
-          <TableInputCSV text={text} onSeriesParsed={this.onSeriesParsed} width={'100%'} height={200} />
-        </div>
-
-        <div className="grafana-info-box">
-          This data is stored in the datasource json and is returned to every user in the initial request for any
-          datasource. This is an appropriate place to enter a few values. Large datasets will perform better in other
-          datasources.
-          <br />
-          <br />
-          <b>NOTE:</b> Changes to this data will only be reflected after a browser refresh.
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/plugins-bundled/internal/input-datasource/src/InputDatasource.test.ts b/plugins-bundled/internal/input-datasource/src/InputDatasource.test.ts
deleted file mode 100644
index e28de87908db4..0000000000000
--- a/plugins-bundled/internal/input-datasource/src/InputDatasource.test.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import {
-  DataFrame,
-  DataFrameDTO,
-  DataSourceInstanceSettings,
-  MutableDataFrame,
-  PluginMeta,
-  readCSV,
-} from '@grafana/data';
-
-import InputDatasource, { describeDataFrame } from './InputDatasource';
-import { getQueryOptions } from './testHelpers';
-import { InputOptions, InputQuery } from './types';
-
-describe('InputDatasource', () => {
-  const data = readCSV('a,b,c\n1,2,3\n4,5,6');
-  const instanceSettings: DataSourceInstanceSettings<InputOptions> = {
-    id: 1,
-    uid: 'xxx',
-    type: 'x',
-    name: 'xxx',
-    meta: {} as PluginMeta,
-    access: 'proxy',
-    readOnly: false,
-    jsonData: {
-      data,
-    },
-  };
-
-  describe('when querying', () => {
-    test('should return the saved data with a query', () => {
-      const ds = new InputDatasource(instanceSettings);
-      const options = getQueryOptions<InputQuery>({
-        targets: [{ refId: 'Z' }],
-      });
-
-      return ds.query(options).then((rsp) => {
-        expect(rsp.data.length).toBe(1);
-
-        const series: DataFrame = rsp.data[0];
-        expect(series.refId).toBe('Z');
-        expect(series.fields[0].values).toEqual(data[0].fields[0].values);
-      });
-    });
-  });
-
-  test('DataFrame descriptions', () => {
-    expect(describeDataFrame([])).toEqual('');
-    expect(describeDataFrame(null as unknown as Array<DataFrameDTO | DataFrame>)).toEqual('');
-    expect(
-      describeDataFrame([
-        new MutableDataFrame({
-          name: 'x',
-          fields: [{ name: 'a' }],
-        }),
-      ])
-    ).toEqual('1 Fields, 0 Rows');
-  });
-});
diff --git a/plugins-bundled/internal/input-datasource/src/InputDatasource.ts b/plugins-bundled/internal/input-datasource/src/InputDatasource.ts
deleted file mode 100644
index 455452693eeb8..0000000000000
--- a/plugins-bundled/internal/input-datasource/src/InputDatasource.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-// Types
-import {
-  DataQueryRequest,
-  DataQueryResponse,
-  TestDataSourceResponse,
-  DataSourceApi,
-  DataSourceInstanceSettings,
-  MetricFindValue,
-  DataFrame,
-  DataFrameDTO,
-  toDataFrame,
-} from '@grafana/data';
-
-import { InputQuery, InputOptions } from './types';
-
-export class InputDatasource extends DataSourceApi<InputQuery, InputOptions> {
-  data: DataFrame[] = [];
-
-  constructor(instanceSettings: DataSourceInstanceSettings<InputOptions>) {
-    super(instanceSettings);
-
-    if (instanceSettings.jsonData.data) {
-      this.data = instanceSettings.jsonData.data.map((v) => toDataFrame(v));
-    }
-  }
-
-  /**
-   * Convert a query to a simple text string
-   */
-  getQueryDisplayText(query: InputQuery): string {
-    if (query.data) {
-      return 'Panel Data: ' + describeDataFrame(query.data);
-    }
-    return `Shared Data From: ${this.name} (${describeDataFrame(this.data)})`;
-  }
-
-  metricFindQuery(query: string, options?: any): Promise<MetricFindValue[]> {
-    return new Promise((resolve, reject) => {
-      const names = [];
-      for (const series of this.data) {
-        for (const field of series.fields) {
-          // TODO, match query/options?
-          names.push({
-            text: field.name,
-          });
-        }
-      }
-      resolve(names);
-    });
-  }
-
-  query(options: DataQueryRequest<InputQuery>): Promise<DataQueryResponse> {
-    const results: DataFrame[] = [];
-    for (const query of options.targets) {
-      if (query.hide) {
-        continue;
-      }
-      let data = this.data;
-      if (query.data) {
-        data = query.data.map((v) => toDataFrame(v));
-      }
-      for (let i = 0; i < data.length; i++) {
-        results.push({
-          ...data[i],
-          refId: query.refId,
-        });
-      }
-    }
-    return Promise.resolve({ data: results });
-  }
-
-  testDatasource(): Promise<TestDataSourceResponse> {
-    return new Promise((resolve, reject) => {
-      let rowCount = 0;
-      let info = `${this.data.length} Series:`;
-      for (const series of this.data) {
-        const length = series.length;
-        info += ` [${series.fields.length} Fields, ${length} Rows]`;
-        rowCount += length;
-      }
-
-      if (rowCount > 0) {
-        resolve({
-          status: 'success',
-          message: info,
-        });
-      }
-      reject({
-        status: 'error',
-        message: 'No Data Entered',
-      });
-    });
-  }
-}
-
-function getLength(data?: DataFrameDTO | DataFrame) {
-  if (!data || !data.fields || !data.fields.length) {
-    return 0;
-  }
-  if ('length' in data) {
-    return data.length;
-  }
-  return data.fields[0].values!.length;
-}
-
-export function describeDataFrame(data: Array<DataFrameDTO | DataFrame>): string {
-  if (!data || !data.length) {
-    return '';
-  }
-  if (data.length > 1) {
-    const count = data.reduce((acc, series) => {
-      return acc + getLength(series);
-    }, 0);
-    return `${data.length} Series, ${count} Rows`;
-  }
-  const series = data[0];
-  if (!series.fields) {
-    return 'Missing Fields';
-  }
-  const length = getLength(series);
-  return `${series.fields.length} Fields, ${length} Rows`;
-}
-
-export default InputDatasource;
diff --git a/plugins-bundled/internal/input-datasource/src/InputQueryEditor.tsx b/plugins-bundled/internal/input-datasource/src/InputQueryEditor.tsx
deleted file mode 100644
index b20520629f6a4..0000000000000
--- a/plugins-bundled/internal/input-datasource/src/InputQueryEditor.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-// Libraries
-import React, { PureComponent } from 'react';
-
-// Types
-import { DataFrame, toCSV, SelectableValue, MutableDataFrame, QueryEditorProps } from '@grafana/data';
-import { Select, TableInputCSV, LinkButton, Icon, InlineField } from '@grafana/ui';
-
-import { InputDatasource, describeDataFrame } from './InputDatasource';
-import { InputQuery, InputOptions } from './types';
-import { dataFrameToCSV } from './utils';
-
-type Props = QueryEditorProps<InputDatasource, InputQuery, InputOptions>;
-
-const options = [
-  { value: 'panel', label: 'Panel', description: 'Save data in the panel configuration.' },
-  { value: 'shared', label: 'Shared', description: 'Save data in the shared datasource object.' },
-];
-
-interface State {
-  text: string;
-}
-
-export class InputQueryEditor extends PureComponent<Props, State> {
-  state = {
-    text: '',
-  };
-
-  onComponentDidMount() {
-    const { query } = this.props;
-    const text = dataFrameToCSV(query.data);
-    this.setState({ text });
-  }
-
-  onSourceChange = (item: SelectableValue<string>) => {
-    const { datasource, query, onChange, onRunQuery } = this.props;
-    let data: DataFrame[] | undefined = undefined;
-    if (item.value === 'panel') {
-      if (query.data) {
-        return;
-      }
-      data = [...datasource.data];
-      if (!data) {
-        data = [new MutableDataFrame()];
-      }
-      this.setState({ text: toCSV(data) });
-    }
-    onChange({ ...query, data });
-    onRunQuery();
-  };
-
-  onSeriesParsed = (data: DataFrame[], text: string) => {
-    const { query, onChange, onRunQuery } = this.props;
-    this.setState({ text });
-    if (!data) {
-      data = [new MutableDataFrame()];
-    }
-    onChange({ ...query, data });
-    onRunQuery();
-  };
-
-  render() {
-    const { datasource, query } = this.props;
-    const { uid, name } = datasource;
-    const { text } = this.state;
-
-    const selected = query.data ? options[0] : options[1];
-    return (
-      <div>
-        <InlineField label="Data" labelWidth={8}>
-          <>
-            <Select width={20} options={options} value={selected} onChange={this.onSourceChange} />
-            {query.data ? (
-              <div style={{ alignSelf: 'center' }}>{describeDataFrame(query.data)}</div>
-            ) : (
-              <LinkButton fill="text" href={`datasources/edit/${uid}/`}>
-                {name}: {describeDataFrame(datasource.data)} &nbsp;&nbsp;
-                <Icon name="pen" />
-              </LinkButton>
-            )}
-          </>
-        </InlineField>
-        {query.data && <TableInputCSV text={text} onSeriesParsed={this.onSeriesParsed} width={'100%'} height={200} />}
-      </div>
-    );
-  }
-}
diff --git a/plugins-bundled/internal/input-datasource/src/img/input.svg b/plugins-bundled/internal/input-datasource/src/img/input.svg
deleted file mode 100644
index 5d2d8ce6c5bf4..0000000000000
--- a/plugins-bundled/internal/input-datasource/src/img/input.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Svg Vector Icons : http://www.onlinewebfonts.com/icon -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
-<defs>
-<style>.cls-1{fill:url(#linear-gradient);}</style>
-<linearGradient id="linear-gradient" x1="50" y1="101.02" x2="50" y2="4.05" gradientTransform="matrix(1, 0, 0, -1, 0, 102)" gradientUnits="userSpaceOnUse">
-<stop offset="0" stop-color="#70b0df"/>
-<stop offset="0.5" stop-color="#1b81c5"/>
-<stop offset="1" stop-color="#4a98ce"/>
-</linearGradient>
-</defs>
-<g><path class="cls-1" d="M889.5,814.1h-201v50.2H701c20.8,0,37.7,16.9,37.7,37.7c0,20.8-16.9,37.7-37.7,37.7H600.5c-20.8,0-37.7-16.9-37.7-37.7c0-20.8,16.9-37.7,37.7-37.7h12.6v-50.2H110.5C55,814.1,10,769.1,10,713.6V286.5c0-55.5,45-100.5,100.5-100.5h502.6v-50.3h-12.6c-20.8,0-37.7-16.9-37.7-37.7c0-20.8,16.9-37.7,37.7-37.7H701c20.8,0,37.7,16.9,37.7,37.7c0,20.8-16.9,37.7-37.7,37.7h-12.6v50.3h201c55.5,0,100.5,45,100.5,100.5v427.2C990,769.1,945,814.1,889.5,814.1z M562.8,738.8h50.3V261.3h-50.3 M688.5,261.3v477.5h50.3V261.3H688.5z"/></g>
-</svg>
\ No newline at end of file
diff --git a/plugins-bundled/internal/input-datasource/src/module.ts b/plugins-bundled/internal/input-datasource/src/module.ts
deleted file mode 100644
index 66765d458c5bc..0000000000000
--- a/plugins-bundled/internal/input-datasource/src/module.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { DataSourcePlugin } from '@grafana/data';
-
-import { InputConfigEditor } from './InputConfigEditor';
-import { InputDatasource } from './InputDatasource';
-import { InputQueryEditor } from './InputQueryEditor';
-import { InputOptions, InputQuery } from './types';
-
-export const plugin = new DataSourcePlugin<InputDatasource, InputQuery, InputOptions>(InputDatasource)
-  .setConfigEditor(InputConfigEditor)
-  .setQueryEditor(InputQueryEditor);
diff --git a/plugins-bundled/internal/input-datasource/src/plugin.json b/plugins-bundled/internal/input-datasource/src/plugin.json
deleted file mode 100644
index 5cd72d9f1c778..0000000000000
--- a/plugins-bundled/internal/input-datasource/src/plugin.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "type": "datasource",
-  "name": "Direct Input",
-  "id": "input",
-  "state": "alpha",
-
-  "metrics": true,
-
-  "info": {
-    "version": "1.0.0",
-    "description": "Data source that supports manual table & CSV input",
-    "author": {
-      "name": "Grafana Labs",
-      "url": "https://grafana.com"
-    },
-    "logos": {
-      "small": "img/input.svg",
-      "large": "img/input.svg"
-    }
-  }
-}
diff --git a/plugins-bundled/internal/input-datasource/src/testHelpers.ts b/plugins-bundled/internal/input-datasource/src/testHelpers.ts
deleted file mode 100644
index d4f0902542c30..0000000000000
--- a/plugins-bundled/internal/input-datasource/src/testHelpers.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { DataQueryRequest, DataQuery, CoreApp, dateTime } from '@grafana/data';
-
-export function getQueryOptions<TQuery extends DataQuery>(
-  options: Partial<DataQueryRequest<TQuery>>
-): DataQueryRequest<TQuery> {
-  const raw = { from: 'now', to: 'now-1h' };
-  const range = { from: dateTime(), to: dateTime(), raw: raw };
-
-  const defaults: DataQueryRequest<TQuery> = {
-    requestId: 'TEST',
-    app: CoreApp.Dashboard,
-    range: range,
-    targets: [],
-    scopedVars: {},
-    timezone: 'browser',
-    panelId: 1,
-    dashboardUID: 'test-uid-1',
-    interval: '60s',
-    intervalMs: 60000,
-    maxDataPoints: 500,
-    startTime: 0,
-  };
-
-  Object.assign(defaults, options);
-
-  return defaults;
-}
diff --git a/plugins-bundled/internal/input-datasource/src/types.ts b/plugins-bundled/internal/input-datasource/src/types.ts
deleted file mode 100644
index 9dc0164a32a2b..0000000000000
--- a/plugins-bundled/internal/input-datasource/src/types.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { DataQuery, DataSourceJsonData, DataFrameDTO } from '@grafana/data';
-
-export interface InputQuery extends DataQuery {
-  // Data saved in the panel
-  data?: DataFrameDTO[];
-}
-
-export interface InputOptions extends DataSourceJsonData {
-  // Saved in the datasource and download with bootData
-  data?: DataFrameDTO[];
-}
diff --git a/plugins-bundled/internal/input-datasource/src/utils.ts b/plugins-bundled/internal/input-datasource/src/utils.ts
deleted file mode 100644
index 7ca7393a8a1b8..0000000000000
--- a/plugins-bundled/internal/input-datasource/src/utils.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { toDataFrame, DataFrameDTO, toCSV } from '@grafana/data';
-
-export function dataFrameToCSV(dto?: DataFrameDTO[]) {
-  if (!dto || !dto.length) {
-    return '';
-  }
-  return toCSV(dto.map((v) => toDataFrame(v)));
-}
diff --git a/plugins-bundled/internal/input-datasource/tsconfig.json b/plugins-bundled/internal/input-datasource/tsconfig.json
deleted file mode 100644
index 78788d15d8486..0000000000000
--- a/plugins-bundled/internal/input-datasource/tsconfig.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "extends": "@grafana/tsconfig",
-  "include": ["src", "types"],
-  "compilerOptions": {
-    "declaration": false,
-    "rootDir": "./src",
-    "baseUrl": "./src"
-  },
-  "ts-node": {
-    "compilerOptions": {
-      "module": "commonjs",
-      "target": "es5",
-      "esModuleInterop": true
-    },
-    "transpileOnly": true
-  }
-}
diff --git a/plugins-bundled/internal/input-datasource/webpack.config.ts b/plugins-bundled/internal/input-datasource/webpack.config.ts
deleted file mode 100644
index f90c0a0c5391d..0000000000000
--- a/plugins-bundled/internal/input-datasource/webpack.config.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-import CopyWebpackPlugin from 'copy-webpack-plugin';
-import ESLintPlugin from 'eslint-webpack-plugin';
-import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
-import path from 'path';
-import { Configuration } from 'webpack';
-
-const SOURCE_DIR = path.resolve(__dirname, 'src');
-const DIST_DIR = path.resolve(__dirname, 'dist');
-const PLUGIN_ID = require(path.join(SOURCE_DIR, 'plugin.json')).id;
-
-const config = async (env: Record<string, string>): Promise<Configuration> => ({
-  cache: {
-    type: 'filesystem',
-    buildDependencies: {
-      config: [__filename],
-    },
-  },
-
-  context: path.join(process.cwd(), SOURCE_DIR),
-
-  devtool: env.production ? 'source-map' : 'eval-source-map',
-
-  entry: {
-    module: path.join(SOURCE_DIR, 'module.ts'),
-  },
-
-  externals: [
-    'lodash',
-    'jquery',
-    'moment',
-    'slate',
-    'emotion',
-    '@emotion/react',
-    '@emotion/css',
-    'prismjs',
-    'slate-plain-serializer',
-    '@grafana/slate-react',
-    'react',
-    'react-dom',
-    'react-redux',
-    'redux',
-    'rxjs',
-    'react-router',
-    'react-router-dom',
-    'd3',
-    'angular',
-    '@grafana/ui',
-    '@grafana/runtime',
-    '@grafana/data',
-
-    // Mark legacy SDK imports as external if their name starts with the "grafana/" prefix
-    ({ request }, callback) => {
-      const prefix = 'grafana/';
-      const hasPrefix = (request: string) => request.indexOf(prefix) === 0;
-      const stripPrefix = (request: string) => request.substring(prefix.length);
-
-      if (request && hasPrefix(request)) {
-        return callback(undefined, stripPrefix(request));
-      }
-
-      callback();
-    },
-  ],
-
-  mode: env.production ? 'production' : 'development',
-
-  module: {
-    rules: [
-      {
-        exclude: /(node_modules)/,
-        test: /\.[tj]sx?$/,
-        use: {
-          loader: 'swc-loader',
-          options: {
-            jsc: {
-              baseUrl: '.',
-              target: 'es2015',
-              loose: false,
-              parser: {
-                syntax: 'typescript',
-                tsx: true,
-                decorators: false,
-                dynamicImport: true,
-              },
-            },
-          },
-        },
-      },
-      {
-        test: /\.(png|jpe?g|gif|svg)$/,
-        type: 'asset/resource',
-        generator: {
-          // Keep publicPath relative for host.com/grafana/ deployments
-          publicPath: `public/plugins/${PLUGIN_ID}/img/`,
-          outputPath: 'img/',
-          filename: Boolean(env.production) ? '[hash][ext]' : '[name][ext]',
-        },
-      },
-      {
-        test: /\.(woff|woff2|eot|ttf|otf)(\?v=\d+\.\d+\.\d+)?$/,
-        type: 'asset/resource',
-        generator: {
-          // Keep publicPath relative for host.com/grafana/ deployments
-          publicPath: `public/plugins/${PLUGIN_ID}/fonts`,
-          outputPath: 'fonts/',
-          filename: Boolean(env.production) ? '[hash][ext]' : '[name][ext]',
-        },
-      },
-    ],
-  },
-
-  output: {
-    clean: {
-      keep: new RegExp(`.*?_(amd64|arm(64)?)(.exe)?`),
-    },
-    filename: '[name].js',
-    library: {
-      type: 'amd',
-    },
-    path: DIST_DIR,
-    publicPath: '/',
-  },
-
-  plugins: [
-    new CopyWebpackPlugin({
-      patterns: [
-        { from: '../README.md', to: '.', force: true, context: SOURCE_DIR },
-        { from: 'plugin.json', to: '.', context: SOURCE_DIR },
-        { from: '**/*.json', to: '.', context: SOURCE_DIR },
-        { from: '**/*.svg', to: '.', noErrorOnMissing: true, context: SOURCE_DIR }, // Optional
-        { from: '**/*.png', to: '.', noErrorOnMissing: true, context: SOURCE_DIR }, // Optional
-        { from: '**/*.html', to: '.', noErrorOnMissing: true, context: SOURCE_DIR }, // Optional
-        { from: 'img/**/*', to: '.', noErrorOnMissing: true, context: SOURCE_DIR }, // Optional
-        { from: 'libs/**/*', to: '.', noErrorOnMissing: true, context: SOURCE_DIR }, // Optional
-        { from: 'static/**/*', to: '.', noErrorOnMissing: true, context: SOURCE_DIR }, // Optional
-      ],
-    }),
-    new ForkTsCheckerWebpackPlugin({
-      async: Boolean(env.development),
-      issue: {
-        include: [{ file: '**/*.{ts,tsx}' }],
-      },
-      typescript: { configFile: path.join(process.cwd(), 'tsconfig.json') },
-    }),
-    new ESLintPlugin({
-      extensions: ['.ts', '.tsx'],
-      lintDirtyModulesOnly: Boolean(env.development), // don't lint on start, only lint changed files
-    }),
-  ],
-
-  resolve: {
-    extensions: ['.js', '.jsx', '.ts', '.tsx'],
-    // handle resolving "rootDir" paths
-    modules: [path.resolve(process.cwd(), 'src'), 'node_modules'],
-    unsafeCache: true,
-  },
-});
-
-export default config;
diff --git a/project.json b/project.json
new file mode 100644
index 0000000000000..fe31d5b90ddd5
--- /dev/null
+++ b/project.json
@@ -0,0 +1,35 @@
+{
+  "name": "grafana",
+  "$schema": "node_modules/nx/schemas/project-schema.json",
+  "projectType": "application",
+  "targets": {
+    "start": {
+      "dependsOn": [
+        "themes-generate",
+        {
+          "projects": ["@grafana-plugins/**"],
+          "target": "build"
+        }
+      ]
+    },
+    "build": {
+      "dependsOn": [
+        "themes-generate",
+        {
+          "projects": ["@grafana-plugins/**"],
+          "target": "build"
+        }
+      ],
+      "outputs": ["{workspaceRoot}/public/build"],
+      "cache": true
+    },
+    "themes-generate": {
+      "outputs": [
+        "{workspaceRoot}/public/sass/_variables.generated.scss",
+        "{workspaceRoot}/public/sass/_variables.dark.generated.scss",
+        "{workspaceRoot}/public/sass/_variables.light.generated.scss"
+      ],
+      "cache": true
+    }
+  }
+}
diff --git a/public/api-enterprise-spec.json b/public/api-enterprise-spec.json
index f9e390481dfca..427770b9e9eda 100644
--- a/public/api-enterprise-spec.json
+++ b/public/api-enterprise-spec.json
@@ -318,6 +318,41 @@
         }
       }
     },
+    "/access-control/teams/roles/search": {
+      "post": {
+        "description": "Lists the roles that have been directly assigned to the given teams.\n\nYou need to have a permission with action `teams.roles:read` and scope `teams:id:*`.",
+        "tags": [
+          "access_control",
+          "enterprise"
+        ],
+        "summary": "List roles assigned to multiple teams.",
+        "operationId": "listTeamsRoles",
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/RolesSearchQuery"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/listTeamsRolesResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
+          }
+        }
+      }
+    },
     "/access-control/teams/{teamId}/roles": {
       "get": {
         "description": "You need to have a permission with action `teams.roles:read` and scope `teams:id:\u003cteam ID\u003e`.",
@@ -473,6 +508,41 @@
         }
       }
     },
+    "/access-control/users/roles/search": {
+      "post": {
+        "description": "Lists the roles that have been directly assigned to the given users. The list does not include built-in roles (Viewer, Editor, Admin or Grafana Admin), and it does not include roles that have been inherited from a team.\n\nYou need to have a permission with action `users.roles:read` and scope `users:id:*`.",
+        "tags": [
+          "access_control",
+          "enterprise"
+        ],
+        "summary": "List roles assigned to multiple users.",
+        "operationId": "listUsersRoles",
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/RolesSearchQuery"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/listUsersRolesResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
+          }
+        }
+      }
+    },
     "/access-control/users/{userId}/roles": {
       "get": {
         "description": "Lists the roles that have been directly assigned to a given user. The list does not include built-in roles (Viewer, Editor, Admin or Grafana Admin), and it does not include roles that have been inherited from a team.\n\nYou need to have a permission with action `users.roles:read` and scope `users:id:\u003cuser ID\u003e`.",
@@ -685,216 +755,6 @@
         }
       }
     },
-    "/datasources/{datasourceId}/disable-permissions": {
-      "post": {
-        "description": "Disables permissions for the data source with the given id. All existing permissions will be removed and anyone will be able to query the data source.\n\nYou need to have a permission with action `datasources.permissions:toggle` and scopes `datasources:*`, `datasources:id:*`, `datasources:id:1` (single data source).\n\nDeprecated: true.",
-        "tags": [
-          "datasource_permissions",
-          "enterprise"
-        ],
-        "summary": "Disable permissions for a data source.",
-        "operationId": "disablePermissions",
-        "parameters": [
-          {
-            "type": "string",
-            "name": "datasourceId",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/createOrUpdateDatasourceResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
-          }
-        }
-      }
-    },
-    "/datasources/{datasourceId}/enable-permissions": {
-      "post": {
-        "description": "Enables permissions for the data source with the given id.\nNo one except Org Admins will be able to query the data source until permissions have been added\nwhich permit certain users or teams to query the data source.\n\nYou need to have a permission with action `datasources.permissions:toggle` and scopes `datasources:*`, `datasources:id:*`, `datasources:id:1` (single data source).\n\nDeprecated: true.",
-        "tags": [
-          "datasource_permissions",
-          "enterprise"
-        ],
-        "summary": "Enable permissions for a data source.",
-        "operationId": "enablePermissions",
-        "parameters": [
-          {
-            "type": "string",
-            "name": "datasourceId",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/createOrUpdateDatasourceResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
-          }
-        }
-      }
-    },
-    "/datasources/{datasourceId}/permissions": {
-      "get": {
-        "description": "Gets all existing permissions for the data source with the given id.\n\nYou need to have a permission with action `datasources.permissions:read` and scopes `datasources:*`, `datasources:id:*`, `datasources:id:1` (single data source).\n\nDeprecated: true.\nDeprecated. Please use GET /api/access-control/datasources/:uid",
-        "tags": [
-          "datasource_permissions",
-          "enterprise"
-        ],
-        "summary": "Get permissions for a data source.",
-        "operationId": "getAllPermissions",
-        "parameters": [
-          {
-            "type": "string",
-            "name": "datasourceId",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/getAllPermissionseResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
-          }
-        }
-      },
-      "post": {
-        "description": "You need to have a permission with action `datasources.permissions:read` and scopes `datasources:*`, `datasources:id:*`, `datasources:id:1` (single data source).\n\nDeprecated: true.\nDeprecated. Please use POST /api/access-control/datasources/:uid/users/:id, /api/access-control/datasources/:uid/teams/:id or /api/access-control/datasources/:uid/buildInRoles/:id",
-        "tags": [
-          "datasource_permissions",
-          "enterprise"
-        ],
-        "summary": "Add permissions for a data source.",
-        "operationId": "addPermission",
-        "parameters": [
-          {
-            "type": "integer",
-            "format": "int64",
-            "name": "userId",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "name": "teamId",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "name": "builtinRole",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "name": "permission",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "name": "datasourceId",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/addPermissionResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
-          }
-        }
-      }
-    },
-    "/datasources/{datasourceId}/permissions/{permissionId}": {
-      "delete": {
-        "description": "Removes the permission with the given permissionId for the data source with the given id.\n\nYou need to have a permission with action `datasources.permissions:delete` and scopes `datasources:*`, `datasources:id:*`, `datasources:id:1` (single data source).\n\nDeprecated: true.\nDeprecated. Please use POST /api/access-control/datasources/:uid/users/:id, /api/access-control/datasources/:uid/teams/:id or /api/access-control/datasources/:uid/buildInRoles/:id",
-        "tags": [
-          "datasource_permissions",
-          "enterprise"
-        ],
-        "summary": "Remove permission for a data source.",
-        "operationId": "deletePermissions",
-        "parameters": [
-          {
-            "type": "string",
-            "name": "datasourceId",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "name": "permissionId",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/okResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          }
-        }
-      }
-    },
     "/licensing/check": {
       "get": {
         "tags": [
@@ -919,10 +779,8 @@
         ],
         "summary": "Get custom permissions report.",
         "operationId": "getCustomPermissionsReport",
+        "deprecated": true,
         "responses": {
-          "200": {
-            "$ref": "#/responses/getCustomPermissionsReportResponse"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
@@ -941,10 +799,8 @@
         ],
         "summary": "Get custom permissions report in CSV format.",
         "operationId": "getCustomPermissionsCSV",
+        "deprecated": true,
         "responses": {
-          "200": {
-            "$ref": "#/responses/getCustomPermissionsReportResponse"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
@@ -1407,7 +1263,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/CreateOrUpdateConfigCmd"
+              "$ref": "#/definitions/CreateOrUpdateReportConfig"
             }
           }
         ],
@@ -1448,7 +1304,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/ReportEmailDTO"
+              "$ref": "#/definitions/ReportEmail"
             }
           }
         ],
@@ -1474,9 +1330,9 @@
         }
       }
     },
-    "/reports/render/pdf/{dashboardID}": {
+    "/reports/render/pdfs": {
       "get": {
-        "description": "Please refer to [reports enterprise](#/reports/renderReportPDFs) instead. This will be removed in Grafana 10.",
+        "description": "Available to all users and with a valid license.",
         "produces": [
           "application/pdf"
         ],
@@ -1484,43 +1340,13 @@
           "reports",
           "enterprise"
         ],
-        "summary": "Render report for dashboard.",
-        "operationId": "renderReportPDF",
-        "deprecated": true,
+        "summary": "Render report for multiple dashboards.",
+        "operationId": "renderReportPDFs",
         "parameters": [
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "DashboardID",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "integer",
-            "format": "int64",
+            "type": "string",
             "name": "dashboardID",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "name": "title",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "name": "variables",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "name": "from",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "name": "to",
-            "in": "query"
+            "in": "query"
           },
           {
             "type": "string",
@@ -1531,50 +1357,20 @@
             "type": "string",
             "name": "layout",
             "in": "query"
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/contentResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
           },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
-          }
-        }
-      }
-    },
-    "/reports/render/pdfs": {
-      "get": {
-        "description": "Available to all users and with a valid license.",
-        "produces": [
-          "application/pdf"
-        ],
-        "tags": [
-          "reports",
-          "enterprise"
-        ],
-        "summary": "Render report for multiple dashboards.",
-        "operationId": "renderReportPDFs",
-        "parameters": [
           {
             "type": "string",
-            "name": "dashboardID",
+            "name": "title",
             "in": "query"
           },
           {
             "type": "string",
-            "name": "orientation",
+            "name": "scaleFactor",
             "in": "query"
           },
           {
             "type": "string",
-            "name": "layout",
+            "name": "includeTables",
             "in": "query"
           }
         ],
@@ -1632,7 +1428,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/SettingsDTO"
+              "$ref": "#/definitions/ReportSettings"
             }
           }
         ],
@@ -1670,7 +1466,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/CreateOrUpdateConfigCmd"
+              "$ref": "#/definitions/CreateOrUpdateReportConfig"
             }
           }
         ],
@@ -1749,7 +1545,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/CreateOrUpdateConfigCmd"
+              "$ref": "#/definitions/CreateOrUpdateReportConfig"
             }
           },
           {
@@ -2080,6 +1876,10 @@
           "type": "integer",
           "format": "int64"
         },
+        "active_anonymous_devices": {
+          "type": "integer",
+          "format": "int64"
+        },
         "active_users": {
           "type": "integer",
           "format": "int64"
@@ -2090,7 +1890,7 @@
         }
       }
     },
-    "AddCommand": {
+    "AddAPIKeyCommand": {
       "type": "object",
       "properties": {
         "name": {
@@ -2199,25 +1999,6 @@
         }
       }
     },
-    "AddPermissionDTO": {
-      "type": "object",
-      "properties": {
-        "builtinRole": {
-          "type": "string"
-        },
-        "permission": {
-          "$ref": "#/definitions/DsPermissionType"
-        },
-        "teamId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "userId": {
-          "type": "integer",
-          "format": "int64"
-        }
-      }
-    },
     "AddServiceAccountTokenCommand": {
       "type": "object",
       "properties": {
@@ -2298,7 +2079,7 @@
           "format": "int64"
         },
         "password": {
-          "type": "string"
+          "$ref": "#/definitions/Password"
         }
       }
     },
@@ -2321,6 +2102,10 @@
           "type": "integer",
           "format": "int64"
         },
+        "activeDevices": {
+          "type": "integer",
+          "format": "int64"
+        },
         "activeEditors": {
           "type": "integer",
           "format": "int64"
@@ -2415,7 +2200,7 @@
       "type": "object",
       "properties": {
         "password": {
-          "type": "string"
+          "$ref": "#/definitions/Password"
         }
       }
     },
@@ -2427,123 +2212,100 @@
         }
       }
     },
-    "AlertListItemDTO": {
+    "Annotation": {
       "type": "object",
       "properties": {
-        "dashboardId": {
+        "alertId": {
           "type": "integer",
           "format": "int64"
         },
-        "dashboardSlug": {
-          "type": "string"
-        },
-        "dashboardUid": {
+        "alertName": {
           "type": "string"
         },
-        "evalData": {
-          "$ref": "#/definitions/Json"
-        },
-        "evalDate": {
-          "type": "string",
-          "format": "date-time"
-        },
-        "executionError": {
+        "avatarUrl": {
           "type": "string"
         },
-        "id": {
+        "created": {
           "type": "integer",
           "format": "int64"
         },
-        "name": {
-          "type": "string"
-        },
-        "newStateDate": {
-          "type": "string",
-          "format": "date-time"
-        },
-        "panelId": {
+        "dashboardId": {
           "type": "integer",
           "format": "int64"
         },
-        "state": {
-          "$ref": "#/definitions/AlertStateType"
-        },
-        "url": {
+        "dashboardUID": {
           "type": "string"
-        }
-      }
-    },
-    "AlertNotification": {
-      "type": "object",
-      "properties": {
-        "created": {
-          "type": "string",
-          "format": "date-time"
         },
-        "disableResolveMessage": {
-          "type": "boolean"
+        "data": {
+          "$ref": "#/definitions/Json"
         },
-        "frequency": {
+        "email": {
           "type": "string"
         },
         "id": {
           "type": "integer",
           "format": "int64"
         },
-        "isDefault": {
-          "type": "boolean"
+        "login": {
+          "type": "string"
         },
-        "name": {
+        "newState": {
           "type": "string"
         },
-        "secureFields": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "boolean"
-          }
+        "panelId": {
+          "type": "integer",
+          "format": "int64"
         },
-        "sendReminder": {
-          "type": "boolean"
+        "prevState": {
+          "type": "string"
         },
-        "settings": {
-          "$ref": "#/definitions/Json"
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
         },
-        "type": {
+        "text": {
           "type": "string"
         },
-        "uid": {
-          "type": "string"
+        "time": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "timeEnd": {
+          "type": "integer",
+          "format": "int64"
         },
         "updated": {
-          "type": "string",
-          "format": "date-time"
+          "type": "integer",
+          "format": "int64"
+        },
+        "userId": {
+          "type": "integer",
+          "format": "int64"
         }
       }
     },
-    "AlertNotificationLookup": {
+    "AnnotationActions": {
       "type": "object",
       "properties": {
-        "id": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "isDefault": {
+        "canAdd": {
           "type": "boolean"
         },
-        "name": {
-          "type": "string"
-        },
-        "type": {
-          "type": "string"
+        "canDelete": {
+          "type": "boolean"
         },
-        "uid": {
-          "type": "string"
+        "canEdit": {
+          "type": "boolean"
         }
       }
     },
-    "AlertStateInfoDTO": {
+    "AnnotationEvent": {
       "type": "object",
       "properties": {
+        "color": {
+          "type": "string"
+        },
         "dashboardId": {
           "type": "integer",
           "format": "int64"
@@ -2552,86 +2314,50 @@
           "type": "integer",
           "format": "int64"
         },
-        "newStateDate": {
-          "type": "string",
-          "format": "date-time"
-        },
-        "panelId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "state": {
-          "$ref": "#/definitions/AlertStateType"
-        }
-      }
-    },
-    "AlertStateType": {
-      "type": "string"
-    },
-    "AlertTestCommand": {
-      "type": "object",
-      "properties": {
-        "dashboard": {
-          "$ref": "#/definitions/Json"
+        "isRegion": {
+          "type": "boolean"
         },
         "panelId": {
           "type": "integer",
           "format": "int64"
-        }
-      }
-    },
-    "AlertTestResult": {
-      "type": "object",
-      "properties": {
-        "conditionEvals": {
-          "type": "string"
-        },
-        "error": {
-          "type": "string"
         },
-        "firing": {
-          "type": "boolean"
+        "source": {
+          "$ref": "#/definitions/AnnotationQuery"
         },
-        "logs": {
+        "tags": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/AlertTestResultLog"
+            "type": "string"
           }
         },
-        "matches": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/EvalMatch"
-          }
+        "text": {
+          "type": "string"
         },
-        "state": {
-          "$ref": "#/definitions/AlertStateType"
+        "time": {
+          "type": "integer",
+          "format": "int64"
         },
-        "timeMs": {
-          "type": "string"
-        }
-      }
-    },
-    "AlertTestResultLog": {
-      "type": "object",
-      "properties": {
-        "data": {},
-        "message": {
-          "type": "string"
+        "timeEnd": {
+          "type": "integer",
+          "format": "int64"
         }
       }
     },
-    "AnnotationActions": {
+    "AnnotationPanelFilter": {
       "type": "object",
+      "title": "AnnotationPanelFilter defines model for AnnotationPanelFilter.",
       "properties": {
-        "canAdd": {
-          "type": "boolean"
-        },
-        "canDelete": {
+        "exclude": {
+          "description": "Should the specified panels be included or excluded",
           "type": "boolean"
         },
-        "canEdit": {
-          "type": "boolean"
+        "ids": {
+          "description": "Panel IDs that should be included or excluded",
+          "type": "array",
+          "items": {
+            "type": "integer",
+            "format": "int64"
+          }
         }
       }
     },
@@ -2646,28 +2372,94 @@
         }
       }
     },
-    "ApiKeyDTO": {
+    "AnnotationQuery": {
+      "description": "TODO docs\nFROM: AnnotationQuery in grafana-data/src/types/annotations.ts",
       "type": "object",
       "properties": {
-        "accessControl": {
-          "$ref": "#/definitions/Metadata"
+        "builtIn": {
+          "description": "Set to 1 for the standard annotation query all dashboards have by default.",
+          "type": "number",
+          "format": "float"
         },
-        "expiration": {
-          "type": "string",
-          "format": "date-time"
+        "datasource": {
+          "$ref": "#/definitions/DataSourceRef"
         },
-        "id": {
-          "type": "integer",
-          "format": "int64"
+        "enable": {
+          "description": "When enabled the annotation query is issued with every dashboard refresh",
+          "type": "boolean"
         },
-        "lastUsedAt": {
-          "type": "string",
-          "format": "date-time"
+        "filter": {
+          "$ref": "#/definitions/AnnotationPanelFilter"
+        },
+        "hide": {
+          "description": "Annotation queries can be toggled on or off at the top of the dashboard.\nWhen hide is true, the toggle is not shown in the dashboard.",
+          "type": "boolean"
+        },
+        "iconColor": {
+          "description": "Color to use for the annotation event markers",
+          "type": "string"
         },
         "name": {
+          "description": "Name of annotation.",
           "type": "string"
         },
-        "role": {
+        "target": {
+          "$ref": "#/definitions/AnnotationTarget"
+        },
+        "type": {
+          "description": "TODO -- this should not exist here, it is based on the --grafana-- datasource",
+          "type": "string"
+        }
+      }
+    },
+    "AnnotationTarget": {
+      "description": "TODO: this should be a regular DataQuery that depends on the selected dashboard\nthese match the properties of the \"grafana\" datasouce that is default in most dashboards",
+      "type": "object",
+      "properties": {
+        "limit": {
+          "description": "Only required/valid for the grafana datasource...\nbut code+tests is already depending on it so hard to change",
+          "type": "integer",
+          "format": "int64"
+        },
+        "matchAny": {
+          "description": "Only required/valid for the grafana datasource...\nbut code+tests is already depending on it so hard to change",
+          "type": "boolean"
+        },
+        "tags": {
+          "description": "Only required/valid for the grafana datasource...\nbut code+tests is already depending on it so hard to change",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "type": {
+          "description": "Only required/valid for the grafana datasource...\nbut code+tests is already depending on it so hard to change",
+          "type": "string"
+        }
+      }
+    },
+    "ApiKeyDTO": {
+      "type": "object",
+      "properties": {
+        "accessControl": {
+          "$ref": "#/definitions/Metadata"
+        },
+        "expiration": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "lastUsedAt": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "name": {
+          "type": "string"
+        },
+        "role": {
           "type": "string",
           "enum": [
             "None",
@@ -2678,34 +2470,31 @@
         }
       }
     },
-    "AttributeTypeAndValue": {
-      "description": "AttributeTypeAndValue mirrors the ASN.1 structure of the same name in\nRFC 5280, Section 4.1.2.4.",
+    "Assignments": {
       "type": "object",
       "properties": {
-        "Type": {
-          "$ref": "#/definitions/ObjectIdentifier"
+        "builtInRoles": {
+          "type": "boolean"
         },
-        "Value": {}
+        "serviceAccounts": {
+          "type": "boolean"
+        },
+        "teams": {
+          "type": "boolean"
+        },
+        "users": {
+          "type": "boolean"
+        }
       }
     },
-    "BrandingOptionsDTO": {
+    "AttributeTypeAndValue": {
+      "description": "AttributeTypeAndValue mirrors the ASN.1 structure of the same name in\nRFC 5280, Section 4.1.2.4.",
       "type": "object",
       "properties": {
-        "emailFooterLink": {
-          "type": "string"
-        },
-        "emailFooterMode": {
-          "type": "string"
-        },
-        "emailFooterText": {
-          "type": "string"
-        },
-        "emailLogoUrl": {
-          "type": "string"
+        "Type": {
+          "$ref": "#/definitions/ObjectIdentifier"
         },
-        "reportLogoUrl": {
-          "type": "string"
-        }
+        "Value": {}
       }
     },
     "CalculateDiffTarget": {
@@ -2969,10 +2758,10 @@
       "type": "object",
       "properties": {
         "newPassword": {
-          "type": "string"
+          "$ref": "#/definitions/Password"
         },
         "oldPassword": {
-          "type": "string"
+          "$ref": "#/definitions/Password"
         }
       }
     },
@@ -2981,88 +2770,6 @@
       "type": "number",
       "format": "double"
     },
-    "ConfigDTO": {
-      "description": "ConfigDTO is model representation in transfer",
-      "type": "object",
-      "properties": {
-        "created": {
-          "type": "string",
-          "format": "date-time"
-        },
-        "dashboardId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "dashboardName": {
-          "type": "string"
-        },
-        "dashboardUid": {
-          "type": "string"
-        },
-        "dashboards": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/DashboardDTO"
-          }
-        },
-        "enableCsv": {
-          "type": "boolean"
-        },
-        "enableDashboardUrl": {
-          "type": "boolean"
-        },
-        "formats": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/Type"
-          }
-        },
-        "id": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "message": {
-          "type": "string"
-        },
-        "name": {
-          "type": "string"
-        },
-        "options": {
-          "$ref": "#/definitions/ReportOptionsDTO"
-        },
-        "orgId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "recipients": {
-          "type": "string"
-        },
-        "replyTo": {
-          "type": "string"
-        },
-        "scaleFactor": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "schedule": {
-          "$ref": "#/definitions/ScheduleDTO"
-        },
-        "state": {
-          "$ref": "#/definitions/State"
-        },
-        "templateVars": {
-          "type": "object"
-        },
-        "updated": {
-          "type": "string",
-          "format": "date-time"
-        },
-        "userId": {
-          "type": "integer",
-          "format": "int64"
-        }
-      }
-    },
     "CookiePreferences": {
       "type": "object",
       "title": "CookiePreferences defines model for CookiePreferences.",
@@ -3200,41 +2907,6 @@
         }
       }
     },
-    "CreateAlertNotificationCommand": {
-      "type": "object",
-      "properties": {
-        "disableResolveMessage": {
-          "type": "boolean"
-        },
-        "frequency": {
-          "type": "string"
-        },
-        "isDefault": {
-          "type": "boolean"
-        },
-        "name": {
-          "type": "string"
-        },
-        "secureSettings": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
-        "sendReminder": {
-          "type": "boolean"
-        },
-        "settings": {
-          "$ref": "#/definitions/Json"
-        },
-        "type": {
-          "type": "string"
-        },
-        "uid": {
-          "type": "string"
-        }
-      }
-    },
     "CreateCorrelationCommand": {
       "description": "CreateCorrelationCommand is the command for creating a correlation",
       "type": "object",
@@ -3282,8 +2954,12 @@
         "dashboard"
       ],
       "properties": {
+        "apiVersion": {
+          "description": "APIVersion defines the versioned schema of this representation of an object.\nServers should convert recognized schemas to the latest internal value, and\nmay reject unrecognized values.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources\n+optional",
+          "type": "string"
+        },
         "dashboard": {
-          "$ref": "#/definitions/Json"
+          "$ref": "#/definitions/Unstructured"
         },
         "deleteKey": {
           "description": "Unique key used to delete the snapshot. It is different from the `key` so that only the creator can delete the snapshot. Required if `external` is `true`.",
@@ -3304,6 +2980,10 @@
           "description": "Define the unique key. Required if `external` is `true`.",
           "type": "string"
         },
+        "kind": {
+          "description": "Kind is a string value representing the REST resource this object represents.\nServers may infer this from the endpoint the client submits requests to.\nCannot be updated.\nIn CamelCase.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds\n+optional",
+          "type": "string"
+        },
         "name": {
           "description": "Snapshot name",
           "type": "string"
@@ -3333,7 +3013,7 @@
       "type": "object",
       "properties": {
         "folderId": {
-          "description": "ID of the folder where the library element is stored.",
+          "description": "ID of the folder where the library element is stored.\n\nDeprecated: use FolderUID instead",
           "type": "integer",
           "format": "int64"
         },
@@ -3363,20 +3043,13 @@
         }
       }
     },
-    "CreateOrUpdateConfigCmd": {
+    "CreateOrUpdateReportConfig": {
       "type": "object",
       "properties": {
-        "dashboardId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "dashboardUid": {
-          "type": "string"
-        },
         "dashboards": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/DashboardDTO"
+            "$ref": "#/definitions/ReportDashboard"
           }
         },
         "enableCsv": {
@@ -3398,7 +3071,7 @@
           "type": "string"
         },
         "options": {
-          "$ref": "#/definitions/ReportOptionsDTO"
+          "$ref": "#/definitions/ReportOptions"
         },
         "recipients": {
           "type": "string"
@@ -3411,13 +3084,10 @@
           "format": "int64"
         },
         "schedule": {
-          "$ref": "#/definitions/ScheduleDTO"
+          "$ref": "#/definitions/ReportSchedule"
         },
         "state": {
           "$ref": "#/definitions/State"
-        },
-        "templateVars": {
-          "type": "object"
         }
       }
     },
@@ -3533,53 +3203,6 @@
         }
       }
     },
-    "CustomPermissionsRecordDTO": {
-      "type": "object",
-      "properties": {
-        "customPermissions": {
-          "type": "string"
-        },
-        "granteeName": {
-          "type": "string"
-        },
-        "granteeType": {
-          "type": "string"
-        },
-        "granteeUrl": {
-          "type": "string"
-        },
-        "id": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "isFolder": {
-          "type": "boolean"
-        },
-        "orgId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "orgRole": {
-          "type": "string"
-        },
-        "slug": {
-          "type": "string"
-        },
-        "title": {
-          "type": "string"
-        },
-        "uid": {
-          "type": "string"
-        },
-        "url": {
-          "type": "string"
-        },
-        "usersCount": {
-          "type": "integer",
-          "format": "int64"
-        }
-      }
-    },
     "DashboardACLInfoDTO": {
       "type": "object",
       "properties": {
@@ -3592,6 +3215,7 @@
           "format": "int64"
         },
         "folderId": {
+          "description": "Deprecated: use FolderUID instead",
           "type": "integer",
           "format": "int64"
         },
@@ -3688,18 +3312,39 @@
         }
       }
     },
-    "DashboardDTO": {
+    "DashboardCreateCommand": {
+      "description": "These are the values expected to be sent from an end user\n+k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object",
       "type": "object",
+      "required": [
+        "dashboard"
+      ],
       "properties": {
-        "dashboard": {
-          "$ref": "#/definitions/DashboardReportDTO"
+        "apiVersion": {
+          "description": "APIVersion defines the versioned schema of this representation of an object.\nServers should convert recognized schemas to the latest internal value, and\nmay reject unrecognized values.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources\n+optional",
+          "type": "string"
         },
-        "reportVariables": {
-          "type": "object"
+        "dashboard": {
+          "$ref": "#/definitions/Unstructured"
         },
-        "timeRange": {
-          "$ref": "#/definitions/TimeRangeDTO"
-        }
+        "expires": {
+          "description": "When the snapshot should expire in seconds in seconds. Default is never to expire.",
+          "type": "integer",
+          "format": "int64",
+          "default": 0
+        },
+        "external": {
+          "description": "these are passed when storing an external snapshot ref\nSave the snapshot on an external server rather than locally.",
+          "type": "boolean",
+          "default": false
+        },
+        "kind": {
+          "description": "Kind is a string value representing the REST resource this object represents.\nServers may infer this from the endpoint the client submits requests to.\nCannot be updated.\nIn CamelCase.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds\n+optional",
+          "type": "string"
+        },
+        "name": {
+          "description": "Snapshot name",
+          "type": "string"
+        }
       }
     },
     "DashboardFullWithMeta": {
@@ -3746,6 +3391,7 @@
           "format": "date-time"
         },
         "folderId": {
+          "description": "Deprecated: use FolderUID instead",
           "type": "integer",
           "format": "int64"
         },
@@ -3812,21 +3458,6 @@
         }
       }
     },
-    "DashboardReportDTO": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "name": {
-          "type": "string"
-        },
-        "uid": {
-          "type": "string"
-        }
-      }
-    },
     "DashboardSnapshotDTO": {
       "description": "DashboardSnapshotDTO without dashboard map",
       "type": "object",
@@ -3845,27 +3476,15 @@
         "externalUrl": {
           "type": "string"
         },
-        "id": {
-          "type": "integer",
-          "format": "int64"
-        },
         "key": {
           "type": "string"
         },
         "name": {
           "type": "string"
         },
-        "orgId": {
-          "type": "integer",
-          "format": "int64"
-        },
         "updated": {
           "type": "string",
           "format": "date-time"
-        },
-        "userId": {
-          "type": "integer",
-          "format": "int64"
         }
       }
     },
@@ -4087,83 +3706,20 @@
         }
       }
     },
-    "DataSourcePermissionRuleDTO": {
+    "DataSourceRef": {
+      "description": "Ref to a DataSource instance",
       "type": "object",
       "properties": {
-        "builtInRole": {
-          "type": "string"
-        },
-        "created": {
-          "type": "string",
-          "format": "date-time"
-        },
-        "datasourceId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "id": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "isManaged": {
-          "type": "boolean"
-        },
-        "permission": {
-          "$ref": "#/definitions/DsPermissionType"
-        },
-        "permissionName": {
-          "type": "string"
-        },
-        "team": {
-          "type": "string"
-        },
-        "teamAvatarUrl": {
-          "type": "string"
-        },
-        "teamEmail": {
-          "type": "string"
-        },
-        "teamId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "updated": {
-          "type": "string",
-          "format": "date-time"
-        },
-        "userAvatarUrl": {
-          "type": "string"
-        },
-        "userEmail": {
+        "type": {
+          "description": "The plugin type-id",
           "type": "string"
         },
-        "userId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "userLogin": {
+        "uid": {
+          "description": "Specific datasource instance",
           "type": "string"
         }
       }
     },
-    "DataSourcePermissionsDTO": {
-      "type": "object",
-      "properties": {
-        "datasourceId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "enabled": {
-          "type": "boolean"
-        },
-        "permissions": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/DataSourcePermissionRuleDTO"
-          }
-        }
-      }
-    },
     "DataTopic": {
       "description": "nolint:revive",
       "type": "string",
@@ -4193,6 +3749,46 @@
         "format": "int64"
       }
     },
+    "Description": {
+      "type": "object",
+      "properties": {
+        "assignments": {
+          "$ref": "#/definitions/Assignments"
+        },
+        "permissions": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "DeviceSearchHitDTO": {
+      "type": "object",
+      "properties": {
+        "clientIp": {
+          "type": "string"
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "deviceId": {
+          "type": "string"
+        },
+        "lastSeenAt": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "updatedAt": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "userAgent": {
+          "type": "string"
+        }
+      }
+    },
     "DsAccess": {
       "type": "string"
     },
@@ -4206,6 +3802,17 @@
       "type": "integer",
       "format": "int64"
     },
+    "EmailDTO": {
+      "type": "object",
+      "properties": {
+        "recipient": {
+          "type": "string"
+        },
+        "uid": {
+          "type": "string"
+        }
+      }
+    },
     "EnumFieldConfig": {
       "description": "Enum field config\nVector values are used as lookup keys into the enum fields",
       "type": "object",
@@ -4264,23 +3871,6 @@
       "description": "ErrorSource type defines the source of the error",
       "type": "string"
     },
-    "EvalMatch": {
-      "type": "object",
-      "properties": {
-        "metric": {
-          "type": "string"
-        },
-        "tags": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
-        "value": {
-          "type": "string"
-        }
-      }
-    },
     "ExplorePanelsState": {
       "description": "This is an object constructed with the keys as the values of the enum VisType and the value being a bag of properties"
     },
@@ -4467,6 +4057,11 @@
           "type": "boolean"
         },
         "id": {
+          "description": "Deprecated: use UID instead",
+          "type": "integer",
+          "format": "int64"
+        },
+        "orgId": {
           "type": "integer",
           "format": "int64"
         },
@@ -4606,11 +4201,20 @@
         },
         "typeVersion": {
           "$ref": "#/definitions/FrameTypeVersion"
+        },
+        "uniqueRowIdFields": {
+          "description": "Array of field indices which values create a unique id for each row. Ideally this should be globally unique ID\nbut that isn't guarantied. Should help with keeping track and deduplicating rows in visualizations, especially\nwith streaming data with frequent updates.",
+          "type": "array",
+          "items": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "example": "TraceID in Tempo, table name + primary key in SQL"
         }
       }
     },
     "FrameType": {
-      "description": "A FrameType string, when present in a frame's metadata, asserts that the\nframe's structure conforms to the FrameType's specification.\nThis property is currently optional, so FrameType may be FrameTypeUnknown even if the properties of\nthe Frame correspond to a defined FrameType.",
+      "description": "A FrameType string, when present in a frame's metadata, asserts that the\nframe's structure conforms to the FrameType's specification.\nThis property is currently optional, so FrameType may be FrameTypeUnknown even if the properties of\nthe Frame correspond to a defined FrameType.\n+enum",
       "type": "string"
     },
     "FrameTypeVersion": {
@@ -4666,6 +4270,7 @@
       "type": "object",
       "properties": {
         "folderId": {
+          "description": "Deprecated: use FolderUID instead",
           "type": "integer",
           "format": "int64"
         },
@@ -4774,6 +4379,7 @@
           "$ref": "#/definitions/Json"
         },
         "folderId": {
+          "description": "Deprecated: use FolderUID instead",
           "type": "integer",
           "format": "int64"
         },
@@ -4809,6 +4415,7 @@
           "type": "string"
         },
         "folderId": {
+          "description": "Deprecated: use FolderUID instead",
           "type": "integer",
           "format": "int64"
         },
@@ -4882,83 +4489,9 @@
         }
       }
     },
-    "ItemDTO": {
-      "type": "object",
-      "properties": {
-        "alertId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "alertName": {
-          "type": "string"
-        },
-        "avatarUrl": {
-          "type": "string"
-        },
-        "created": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "dashboardId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "dashboardUID": {
-          "type": "string"
-        },
-        "data": {
-          "$ref": "#/definitions/Json"
-        },
-        "email": {
-          "type": "string"
-        },
-        "id": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "login": {
-          "type": "string"
-        },
-        "newState": {
-          "type": "string"
-        },
-        "panelId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "prevState": {
-          "type": "string"
-        },
-        "tags": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "text": {
-          "type": "string"
-        },
-        "time": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "timeEnd": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "updated": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "userId": {
-          "type": "integer",
-          "format": "int64"
-        }
-      }
-    },
     "JSONWebKey": {
+      "description": "JSONWebKey represents a public or private key in JWK format. It can be\nmarshaled into JSON and unmarshaled from JSON.",
       "type": "object",
-      "title": "JSONWebKey represents a public or private key in JWK format.",
       "properties": {
         "Algorithm": {
           "description": "Key algorithm, parsed from `alg` header.",
@@ -4991,7 +4524,7 @@
           "$ref": "#/definitions/URL"
         },
         "Key": {
-          "description": "Cryptographic key, can be a symmetric or asymmetric key."
+          "description": "Key is the Go in-memory representation of this key. It must have one\nof these types:\ned25519.PublicKey\ned25519.PrivateKey\necdsa.PublicKey\necdsa.PrivateKey\nrsa.PublicKey\nrsa.PrivateKey\n[]byte (a symmetric key)\n\nWhen marshaling this JSONWebKey into JSON, the \"kty\" header parameter\nwill be automatically set based on the type of this field."
         },
         "KeyID": {
           "description": "Key identifier, parsed from `kid` header.",
@@ -5011,79 +4544,15 @@
       "type": "integer",
       "format": "int64"
     },
-    "LegacyAlert": {
+    "LibraryElementArrayResponse": {
       "type": "object",
+      "title": "LibraryElementArrayResponse is a response struct for an array of LibraryElementDTO.",
       "properties": {
-        "Created": {
-          "type": "string",
-          "format": "date-time"
-        },
-        "DashboardID": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "EvalData": {
-          "$ref": "#/definitions/Json"
-        },
-        "ExecutionError": {
-          "type": "string"
-        },
-        "For": {
-          "$ref": "#/definitions/Duration"
-        },
-        "Frequency": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "Handler": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "ID": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "Message": {
-          "type": "string"
-        },
-        "Name": {
-          "type": "string"
-        },
-        "NewStateDate": {
-          "type": "string",
-          "format": "date-time"
-        },
-        "OrgID": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "PanelID": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "Settings": {
-          "$ref": "#/definitions/Json"
-        },
-        "Severity": {
-          "type": "string"
-        },
-        "Silenced": {
-          "type": "boolean"
-        },
-        "State": {
-          "$ref": "#/definitions/AlertStateType"
-        },
-        "StateChanges": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "Updated": {
-          "type": "string",
-          "format": "date-time"
-        },
-        "Version": {
-          "type": "integer",
-          "format": "int64"
+        "result": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/LibraryElementDTO"
+          }
         }
       }
     },
@@ -5139,6 +4608,7 @@
           "type": "string"
         },
         "folderId": {
+          "description": "Deprecated: use FolderUID instead",
           "type": "integer",
           "format": "int64"
         },
@@ -5449,39 +4919,6 @@
       "format": "int64",
       "title": "NoticeSeverity is a type for the Severity property of a Notice."
     },
-    "NotificationTestCommand": {
-      "type": "object",
-      "properties": {
-        "disableResolveMessage": {
-          "type": "boolean"
-        },
-        "frequency": {
-          "type": "string"
-        },
-        "id": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "name": {
-          "type": "string"
-        },
-        "secureSettings": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
-        "sendReminder": {
-          "type": "boolean"
-        },
-        "settings": {
-          "$ref": "#/definitions/Json"
-        },
-        "type": {
-          "type": "string"
-        }
-      }
-    },
     "ObjectIdentifier": {
       "type": "array",
       "title": "An ObjectIdentifier represents an ASN.1 OBJECT IDENTIFIER.",
@@ -5490,6 +4927,20 @@
         "format": "int64"
       }
     },
+    "ObjectMatcher": {
+      "type": "array",
+      "title": "ObjectMatcher is a matcher that can be used to filter alerts.",
+      "items": {
+        "type": "string"
+      }
+    },
+    "ObjectMatchers": {
+      "type": "array",
+      "title": "ObjectMatchers is a list of matchers that can be used to filter alerts.",
+      "items": {
+        "$ref": "#/definitions/ObjectMatcher"
+      }
+    },
     "OrgDTO": {
       "type": "object",
       "properties": {
@@ -5570,6 +5021,9 @@
         }
       }
     },
+    "Password": {
+      "type": "string"
+    },
     "PatchAnnotationsCmd": {
       "type": "object",
       "properties": {
@@ -5604,7 +5058,7 @@
       "type": "object",
       "properties": {
         "folderId": {
-          "description": "ID of the folder where the library element is stored.",
+          "description": "ID of the folder where the library element is stored.\n\nDeprecated: use FolderUID instead",
           "type": "integer",
           "format": "int64"
         },
@@ -5692,26 +5146,6 @@
         }
       }
     },
-    "PauseAlertCommand": {
-      "type": "object",
-      "properties": {
-        "alertId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "paused": {
-          "type": "boolean"
-        }
-      }
-    },
-    "PauseAllAlertsCommand": {
-      "type": "object",
-      "properties": {
-        "paused": {
-          "type": "boolean"
-        }
-      }
-    },
     "Permission": {
       "type": "object",
       "title": "Permission is the model for access control permissions.",
@@ -5914,6 +5348,38 @@
         }
       }
     },
+    "Preferences": {
+      "description": "Spec defines user, team or org Grafana preferences",
+      "type": "object",
+      "properties": {
+        "cookiePreferences": {
+          "$ref": "#/definitions/CookiePreferences"
+        },
+        "homeDashboardUID": {
+          "description": "UID for the home dashboard",
+          "type": "string"
+        },
+        "language": {
+          "description": "Selected language (beta)",
+          "type": "string"
+        },
+        "queryHistory": {
+          "$ref": "#/definitions/QueryHistoryPreference"
+        },
+        "theme": {
+          "description": "Theme light, dark, empty is default",
+          "type": "string"
+        },
+        "timezone": {
+          "description": "The timezone selection\nTODO: this should use the timezone defined in common",
+          "type": "string"
+        },
+        "weekStart": {
+          "description": "WeekStart day of the week (sunday, monday, etc)",
+          "type": "string"
+        }
+      }
+    },
     "PrometheusRemoteWriteTargetJSON": {
       "type": "object",
       "properties": {
@@ -5928,6 +5394,123 @@
         }
       }
     },
+    "PublicDashboard": {
+      "type": "object",
+      "properties": {
+        "accessToken": {
+          "type": "string"
+        },
+        "annotationsEnabled": {
+          "type": "boolean"
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "createdBy": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "dashboardUid": {
+          "type": "string"
+        },
+        "isEnabled": {
+          "type": "boolean"
+        },
+        "recipients": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/EmailDTO"
+          }
+        },
+        "share": {
+          "$ref": "#/definitions/ShareType"
+        },
+        "timeSelectionEnabled": {
+          "type": "boolean"
+        },
+        "uid": {
+          "type": "string"
+        },
+        "updatedAt": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "updatedBy": {
+          "type": "integer",
+          "format": "int64"
+        }
+      }
+    },
+    "PublicDashboardDTO": {
+      "type": "object",
+      "properties": {
+        "accessToken": {
+          "type": "string"
+        },
+        "annotationsEnabled": {
+          "type": "boolean"
+        },
+        "isEnabled": {
+          "type": "boolean"
+        },
+        "share": {
+          "$ref": "#/definitions/ShareType"
+        },
+        "timeSelectionEnabled": {
+          "type": "boolean"
+        },
+        "uid": {
+          "type": "string"
+        }
+      }
+    },
+    "PublicDashboardListResponse": {
+      "type": "object",
+      "properties": {
+        "accessToken": {
+          "type": "string"
+        },
+        "dashboardUid": {
+          "type": "string"
+        },
+        "isEnabled": {
+          "type": "boolean"
+        },
+        "slug": {
+          "type": "string"
+        },
+        "title": {
+          "type": "string"
+        },
+        "uid": {
+          "type": "string"
+        }
+      }
+    },
+    "PublicDashboardListResponseWithPagination": {
+      "type": "object",
+      "properties": {
+        "page": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "perPage": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "publicDashboards": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/PublicDashboardListResponse"
+          }
+        },
+        "totalCount": {
+          "type": "integer",
+          "format": "int64"
+        }
+      }
+    },
     "PublicKeyAlgorithm": {
       "type": "integer",
       "format": "int64"
@@ -5937,7 +5520,7 @@
       "type": "object",
       "title": "QueryDataResponse contains the results from a QueryDataRequest.",
       "properties": {
-        "Responses": {
+        "results": {
           "$ref": "#/definitions/Responses"
         }
       }
@@ -5985,8 +5568,10 @@
     },
     "QueryHistoryPreference": {
       "type": "object",
+      "title": "QueryHistoryPreference defines model for QueryHistoryPreference.",
       "properties": {
         "homeTab": {
+          "description": "HomeTab one of: '' | 'query' | 'starred';",
           "type": "string"
         }
       }
@@ -6184,12 +5769,130 @@
         }
       }
     },
-    "ReportEmailDTO": {
+    "Report": {
+      "description": "ConfigDTO is model representation in transfer",
       "type": "object",
       "properties": {
-        "email": {
+        "created": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "dashboards": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ReportDashboard"
+          }
+        },
+        "enableCsv": {
+          "type": "boolean"
+        },
+        "enableDashboardUrl": {
+          "type": "boolean"
+        },
+        "formats": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Type"
+          }
+        },
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "message": {
+          "type": "string"
+        },
+        "name": {
+          "type": "string"
+        },
+        "options": {
+          "$ref": "#/definitions/ReportOptions"
+        },
+        "orgId": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "recipients": {
+          "type": "string"
+        },
+        "replyTo": {
+          "type": "string"
+        },
+        "scaleFactor": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "schedule": {
+          "$ref": "#/definitions/ReportSchedule"
+        },
+        "state": {
+          "$ref": "#/definitions/State"
+        },
+        "uid": {
+          "type": "string"
+        },
+        "updated": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "userId": {
+          "type": "integer",
+          "format": "int64"
+        }
+      }
+    },
+    "ReportBrandingOptions": {
+      "type": "object",
+      "properties": {
+        "emailFooterLink": {
+          "type": "string"
+        },
+        "emailFooterMode": {
+          "type": "string"
+        },
+        "emailFooterText": {
+          "type": "string"
+        },
+        "emailLogoUrl": {
+          "type": "string"
+        },
+        "reportLogoUrl": {
+          "type": "string"
+        }
+      }
+    },
+    "ReportDashboard": {
+      "type": "object",
+      "properties": {
+        "dashboard": {
+          "$ref": "#/definitions/ReportDashboardID"
+        },
+        "reportVariables": {
+          "type": "object"
+        },
+        "timeRange": {
+          "$ref": "#/definitions/ReportTimeRange"
+        }
+      }
+    },
+    "ReportDashboardID": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "name": {
           "type": "string"
         },
+        "uid": {
+          "type": "string"
+        }
+      }
+    },
+    "ReportEmail": {
+      "type": "object",
+      "properties": {
         "emails": {
           "description": "Comma-separated list of emails to which to send the report to.",
           "type": "string"
@@ -6205,7 +5908,7 @@
         }
       }
     },
-    "ReportOptionsDTO": {
+    "ReportOptions": {
       "type": "object",
       "properties": {
         "layout": {
@@ -6215,7 +5918,70 @@
           "type": "string"
         },
         "timeRange": {
-          "$ref": "#/definitions/TimeRangeDTO"
+          "$ref": "#/definitions/ReportTimeRange"
+        }
+      }
+    },
+    "ReportSchedule": {
+      "type": "object",
+      "properties": {
+        "dayOfMonth": {
+          "type": "string"
+        },
+        "endDate": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "frequency": {
+          "type": "string"
+        },
+        "intervalAmount": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "intervalFrequency": {
+          "type": "string"
+        },
+        "startDate": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "timeZone": {
+          "type": "string"
+        },
+        "workdaysOnly": {
+          "type": "boolean"
+        }
+      }
+    },
+    "ReportSettings": {
+      "type": "object",
+      "properties": {
+        "branding": {
+          "$ref": "#/definitions/ReportBrandingOptions"
+        },
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "orgId": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "userId": {
+          "type": "integer",
+          "format": "int64"
+        }
+      }
+    },
+    "ReportTimeRange": {
+      "type": "object",
+      "properties": {
+        "from": {
+          "type": "string"
+        },
+        "to": {
+          "type": "string"
         }
       }
     },
@@ -6290,6 +6056,9 @@
         "displayName": {
           "type": "string"
         },
+        "global": {
+          "type": "boolean"
+        },
         "group": {
           "type": "string"
         },
@@ -6318,6 +6087,32 @@
         }
       }
     },
+    "RolesSearchQuery": {
+      "type": "object",
+      "properties": {
+        "includeHidden": {
+          "type": "boolean"
+        },
+        "orgId": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "teamIds": {
+          "type": "array",
+          "items": {
+            "type": "integer",
+            "format": "int64"
+          }
+        },
+        "userIds": {
+          "type": "array",
+          "items": {
+            "type": "integer",
+            "format": "int64"
+          }
+        }
+      }
+    },
     "SaveDashboardCommand": {
       "type": "object",
       "properties": {
@@ -6351,46 +6146,26 @@
         }
       }
     },
-    "ScheduleDTO": {
+    "SearchDeviceQueryResult": {
       "type": "object",
       "properties": {
-        "day": {
-          "type": "string"
-        },
-        "dayOfMonth": {
-          "type": "string"
-        },
-        "endDate": {
-          "type": "string",
-          "format": "date-time"
-        },
-        "frequency": {
-          "type": "string"
+        "devices": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/DeviceSearchHitDTO"
+          }
         },
-        "hour": {
+        "page": {
           "type": "integer",
           "format": "int64"
         },
-        "intervalAmount": {
+        "perPage": {
           "type": "integer",
           "format": "int64"
         },
-        "intervalFrequency": {
-          "type": "string"
-        },
-        "minute": {
+        "totalCount": {
           "type": "integer",
           "format": "int64"
-        },
-        "startDate": {
-          "type": "string",
-          "format": "date-time"
-        },
-        "timeZone": {
-          "type": "string"
-        },
-        "workdaysOnly": {
-          "type": "boolean"
         }
       }
     },
@@ -6631,6 +6406,10 @@
           "format": "int64",
           "example": 1
         },
+        "requiredBy": {
+          "type": "string",
+          "example": "grafana-app"
+        },
         "role": {
           "type": "string",
           "example": "Editor"
@@ -6653,6 +6432,25 @@
         }
       }
     },
+    "SetResourcePermissionCommand": {
+      "type": "object",
+      "properties": {
+        "builtInRole": {
+          "type": "string"
+        },
+        "permission": {
+          "type": "string"
+        },
+        "teamId": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "userId": {
+          "type": "integer",
+          "format": "int64"
+        }
+      }
+    },
     "SetRoleAssignmentsCommand": {
       "type": "object",
       "properties": {
@@ -6696,71 +6494,22 @@
         }
       }
     },
-    "SettingsBag": {
-      "type": "object",
-      "additionalProperties": {
-        "type": "object",
-        "additionalProperties": {
-          "type": "string"
-        }
-      }
-    },
-    "SettingsDTO": {
-      "type": "object",
-      "properties": {
-        "branding": {
-          "$ref": "#/definitions/BrandingOptionsDTO"
-        },
-        "id": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "orgId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "userId": {
-          "type": "integer",
-          "format": "int64"
-        }
-      }
-    },
-    "SignatureAlgorithm": {
-      "type": "integer",
-      "format": "int64"
-    },
-    "Spec": {
+    "SettingsBag": {
       "type": "object",
-      "title": "Spec defines model for Spec.",
-      "properties": {
-        "cookiePreferences": {
-          "$ref": "#/definitions/CookiePreferences"
-        },
-        "homeDashboardUID": {
-          "description": "UID for the home dashboard",
-          "type": "string"
-        },
-        "language": {
-          "description": "Selected language (beta)",
-          "type": "string"
-        },
-        "queryHistory": {
-          "$ref": "#/definitions/QueryHistoryPreference"
-        },
-        "theme": {
-          "description": "Theme light, dark, empty is default",
-          "type": "string"
-        },
-        "timezone": {
-          "description": "The timezone selection\nTODO: this should use the timezone defined in common",
-          "type": "string"
-        },
-        "weekStart": {
-          "description": "WeekStart day of the week (sunday, monday, etc)",
+      "additionalProperties": {
+        "type": "object",
+        "additionalProperties": {
           "type": "string"
         }
       }
     },
+    "ShareType": {
+      "type": "string"
+    },
+    "SignatureAlgorithm": {
+      "type": "integer",
+      "format": "int64"
+    },
     "State": {
       "type": "string"
     },
@@ -7040,23 +6789,16 @@
         }
       }
     },
-    "TimeRangeDTO": {
-      "type": "object",
-      "properties": {
-        "from": {
-          "type": "string"
-        },
-        "to": {
-          "type": "string"
-        }
-      }
-    },
     "Token": {
       "type": "object",
       "properties": {
         "account": {
           "type": "string"
         },
+        "anonymousRatio": {
+          "type": "integer",
+          "format": "int64"
+        },
         "company": {
           "type": "string"
         },
@@ -7211,31 +6953,24 @@
         "$ref": "#/definitions/Transformation"
       }
     },
-    "TrimDashboardCommand": {
-      "type": "object",
-      "properties": {
-        "dashboard": {
-          "$ref": "#/definitions/Json"
-        },
-        "meta": {
-          "$ref": "#/definitions/Json"
-        }
-      }
+    "Type": {
+      "type": "string"
     },
-    "TrimDashboardFullWithMeta": {
+    "TypeMeta": {
+      "description": "+k8s:deepcopy-gen=false",
       "type": "object",
+      "title": "TypeMeta describes an individual object in an API response or request\nwith strings representing the type of the object and its API schema version.\nStructures that are versioned or persisted should inline TypeMeta.",
       "properties": {
-        "dashboard": {
-          "$ref": "#/definitions/Json"
+        "apiVersion": {
+          "description": "APIVersion defines the versioned schema of this representation of an object.\nServers should convert recognized schemas to the latest internal value, and\nmay reject unrecognized values.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources\n+optional",
+          "type": "string"
         },
-        "meta": {
-          "$ref": "#/definitions/Json"
+        "kind": {
+          "description": "Kind is a string value representing the REST resource this object represents.\nServers may infer this from the endpoint the client submits requests to.\nCannot be updated.\nIn CamelCase.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds\n+optional",
+          "type": "string"
         }
       }
     },
-    "Type": {
-      "type": "string"
-    },
     "URL": {
       "description": "The general form represented is:\n\n[scheme:][//[userinfo@]host][/]path[?query][#fragment]\n\nURLs that do not start with a slash after the scheme are interpreted as:\n\nscheme:opaque[?query][#fragment]\n\nNote that the Path field is stored in decoded form: /%47%6f%2f becomes /Go/.\nA consequence is that it is impossible to tell which slashes in the Path were\nslashes in the raw URL and which were %2f. This distinction is rarely important,\nbut when it is, the code should use the EscapedPath method, which preserves\nthe original encoding of Path.\n\nThe RawPath field is an optional field which is only set when the default\nencoding of Path is different from the escaped path. See the EscapedPath method\nfor more details.\n\nURL's String method uses the EscapedPath method to obtain the path.",
       "type": "object",
@@ -7276,77 +7011,14 @@
         }
       }
     },
-    "UpdateAlertNotificationCommand": {
-      "type": "object",
-      "properties": {
-        "disableResolveMessage": {
-          "type": "boolean"
-        },
-        "frequency": {
-          "type": "string"
-        },
-        "id": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "isDefault": {
-          "type": "boolean"
-        },
-        "name": {
-          "type": "string"
-        },
-        "secureSettings": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
-        "sendReminder": {
-          "type": "boolean"
-        },
-        "settings": {
-          "$ref": "#/definitions/Json"
-        },
-        "type": {
-          "type": "string"
-        },
-        "uid": {
-          "type": "string"
-        }
-      }
-    },
-    "UpdateAlertNotificationWithUidCommand": {
+    "Unstructured": {
+      "description": "Unstructured allows objects that do not have Golang structs registered to be manipulated\ngenerically.",
       "type": "object",
       "properties": {
-        "disableResolveMessage": {
-          "type": "boolean"
-        },
-        "frequency": {
-          "type": "string"
-        },
-        "isDefault": {
-          "type": "boolean"
-        },
-        "name": {
-          "type": "string"
-        },
-        "secureSettings": {
+        "Object": {
+          "description": "Object is a JSON compatible map with string, float, int, bool, []interface{},\nor map[string]interface{} children.",
           "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
-        "sendReminder": {
-          "type": "boolean"
-        },
-        "settings": {
-          "$ref": "#/definitions/Json"
-        },
-        "type": {
-          "type": "string"
-        },
-        "uid": {
-          "type": "string"
+          "additionalProperties": {}
         }
       }
     },
@@ -7807,6 +7479,9 @@
         "theme": {
           "type": "string"
         },
+        "uid": {
+          "type": "string"
+        },
         "updatedAt": {
           "type": "string",
           "format": "date-time"
@@ -7850,6 +7525,9 @@
         },
         "name": {
           "type": "string"
+        },
+        "uid": {
+          "type": "string"
         }
       }
     },
@@ -7922,32 +7600,145 @@
     "VisType": {
       "type": "string",
       "title": "VisType is used to indicate how the data should be visualized in explore."
-    }
-  },
-  "responses": {
-    "SMTPNotEnabledError": {
-      "description": ""
     },
-    "acceptedResponse": {
-      "description": "AcceptedResponse",
-      "schema": {
-        "$ref": "#/definitions/ErrorResponseBody"
+    "deviceDTO": {
+      "type": "object",
+      "properties": {
+        "avatarUrl": {
+          "type": "string"
+        },
+        "clientIp": {
+          "type": "string"
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "deviceId": {
+          "type": "string"
+        },
+        "lastSeenAt": {
+          "type": "string"
+        },
+        "updatedAt": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "userAgent": {
+          "type": "string"
+        }
       }
     },
-    "addPermissionResponse": {
-      "description": "",
-      "schema": {
-        "type": "object",
-        "properties": {
-          "message": {
+    "publicError": {
+      "description": "PublicError is derived from Error and only contains information\navailable to the end user.",
+      "type": "object",
+      "required": [
+        "statusCode",
+        "messageId"
+      ],
+      "properties": {
+        "extra": {
+          "description": "Extra Additional information about the error",
+          "type": "object",
+          "additionalProperties": {}
+        },
+        "message": {
+          "description": "Message A human readable message",
+          "type": "string"
+        },
+        "messageId": {
+          "description": "MessageID A unique identifier for the error",
+          "type": "string"
+        },
+        "statusCode": {
+          "description": "StatusCode The HTTP status code returned",
+          "type": "integer",
+          "format": "int64"
+        }
+      }
+    },
+    "resourcePermissionDTO": {
+      "type": "object",
+      "properties": {
+        "actions": {
+          "type": "array",
+          "items": {
             "type": "string"
-          },
-          "permissionId": {
-            "type": "integer",
-            "format": "int64"
+          }
+        },
+        "builtInRole": {
+          "type": "string"
+        },
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "isInherited": {
+          "type": "boolean"
+        },
+        "isManaged": {
+          "type": "boolean"
+        },
+        "isServiceAccount": {
+          "type": "boolean"
+        },
+        "permission": {
+          "type": "string"
+        },
+        "roleName": {
+          "type": "string"
+        },
+        "team": {
+          "type": "string"
+        },
+        "teamAvatarUrl": {
+          "type": "string"
+        },
+        "teamId": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "userAvatarUrl": {
+          "type": "string"
+        },
+        "userId": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "userLogin": {
+          "type": "string"
+        }
+      }
+    },
+    "setPermissionCommand": {
+      "type": "object",
+      "properties": {
+        "permission": {
+          "type": "string"
+        }
+      }
+    },
+    "setPermissionsCommand": {
+      "type": "object",
+      "properties": {
+        "permissions": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SetResourcePermissionCommand"
           }
         }
       }
+    }
+  },
+  "responses": {
+    "SMTPNotEnabledError": {
+      "description": ""
+    },
+    "acceptedResponse": {
+      "description": "AcceptedResponse",
+      "schema": {
+        "$ref": "#/definitions/ErrorResponseBody"
+      }
     },
     "adminCreateUserResponse": {
       "description": "",
@@ -7982,6 +7773,12 @@
         "$ref": "#/definitions/ErrorResponseBody"
       }
     },
+    "badRequestPublicError": {
+      "description": "BadRequestPublicError is returned when the request is invalid and it cannot be processed.",
+      "schema": {
+        "$ref": "#/definitions/publicError"
+      }
+    },
     "calculateDashboardDiffResponse": {
       "description": "",
       "schema": {
@@ -8103,6 +7900,12 @@
         "$ref": "#/definitions/Playlist"
       }
     },
+    "createPublicDashboardResponse": {
+      "description": "",
+      "schema": {
+        "$ref": "#/definitions/PublicDashboard"
+      }
+    },
     "createReportResponse": {
       "description": "",
       "schema": {
@@ -8172,28 +7975,6 @@
         }
       }
     },
-    "deleteAlertNotificationChannelResponse": {
-      "description": "",
-      "schema": {
-        "type": "object",
-        "required": [
-          "id",
-          "message"
-        ],
-        "properties": {
-          "id": {
-            "description": "ID Identifier of the deleted notification channel.",
-            "type": "integer",
-            "format": "int64",
-            "example": 65
-          },
-          "message": {
-            "description": "Message Message of the deleted notificatiton channel.",
-            "type": "string"
-          }
-        }
-      }
-    },
     "deleteCorrelationResponse": {
       "description": "",
       "schema": {
@@ -8281,82 +8062,58 @@
         }
       }
     },
-    "folderResponse": {
-      "description": "",
-      "schema": {
-        "$ref": "#/definitions/Folder"
-      }
-    },
-    "forbiddenError": {
-      "description": "ForbiddenError is returned if the user/token has insufficient permissions to access the requested resource.",
-      "schema": {
-        "$ref": "#/definitions/ErrorResponseBody"
-      }
-    },
-    "genericError": {
-      "description": "A GenericError is the default error message that is generated.\nFor certain status codes there are more appropriate error structures.",
-      "schema": {
-        "$ref": "#/definitions/ErrorResponseBody"
-      }
-    },
-    "getAPIkeyResponse": {
+    "devicesResponse": {
       "description": "",
       "schema": {
         "type": "array",
         "items": {
-          "$ref": "#/definitions/ApiKeyDTO"
+          "$ref": "#/definitions/deviceDTO"
         }
       }
     },
-    "getAccessControlStatusResponse": {
+    "devicesSearchResponse": {
       "description": "",
       "schema": {
-        "$ref": "#/definitions/Status"
+        "$ref": "#/definitions/SearchDeviceQueryResult"
       }
     },
-    "getAlertNotificationChannelResponse": {
+    "folderResponse": {
       "description": "",
       "schema": {
-        "$ref": "#/definitions/AlertNotification"
+        "$ref": "#/definitions/Folder"
       }
     },
-    "getAlertNotificationChannelsResponse": {
-      "description": "",
+    "forbiddenError": {
+      "description": "ForbiddenError is returned if the user/token has insufficient permissions to access the requested resource.",
       "schema": {
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/AlertNotification"
-        }
+        "$ref": "#/definitions/ErrorResponseBody"
       }
     },
-    "getAlertNotificationLookupResponse": {
-      "description": "",
+    "forbiddenPublicError": {
+      "description": "ForbiddenPublicError is returned if the user/token has insufficient permissions to access the requested resource.",
       "schema": {
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/AlertNotificationLookup"
-        }
+        "$ref": "#/definitions/publicError"
       }
     },
-    "getAlertResponse": {
-      "description": "",
+    "genericError": {
+      "description": "A GenericError is the default error message that is generated.\nFor certain status codes there are more appropriate error structures.",
       "schema": {
-        "$ref": "#/definitions/LegacyAlert"
+        "$ref": "#/definitions/ErrorResponseBody"
       }
     },
-    "getAlertsResponse": {
+    "getAPIkeyResponse": {
       "description": "",
       "schema": {
         "type": "array",
         "items": {
-          "$ref": "#/definitions/AlertListItemDTO"
+          "$ref": "#/definitions/ApiKeyDTO"
         }
       }
     },
-    "getAllPermissionseResponse": {
+    "getAccessControlStatusResponse": {
       "description": "",
       "schema": {
-        "$ref": "#/definitions/DataSourcePermissionsDTO"
+        "$ref": "#/definitions/Status"
       }
     },
     "getAllRolesResponse": {
@@ -8371,7 +8128,7 @@
     "getAnnotationByIDResponse": {
       "description": "",
       "schema": {
-        "$ref": "#/definitions/ItemDTO"
+        "$ref": "#/definitions/Annotation"
       }
     },
     "getAnnotationTagsResponse": {
@@ -8385,7 +8142,7 @@
       "schema": {
         "type": "array",
         "items": {
-          "$ref": "#/definitions/ItemDTO"
+          "$ref": "#/definitions/Annotation"
         }
       }
     },
@@ -8419,15 +8176,6 @@
         "$ref": "#/definitions/OrgDetailsDTO"
       }
     },
-    "getCustomPermissionsReportResponse": {
-      "description": "",
-      "schema": {
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/CustomPermissionsRecordDTO"
-        }
-      }
-    },
     "getDashboardPermissionsListResponse": {
       "description": "",
       "schema": {
@@ -8440,15 +8188,6 @@
     "getDashboardSnapshotResponse": {
       "description": ""
     },
-    "getDashboardStatesResponse": {
-      "description": "",
-      "schema": {
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/AlertStateInfoDTO"
-        }
-      }
-    },
     "getDashboardsTagsResponse": {
       "description": "",
       "schema": {
@@ -8517,6 +8256,12 @@
         "$ref": "#/definitions/GetHomeDashboardResponse"
       }
     },
+    "getLibraryElementArrayResponse": {
+      "description": "",
+      "schema": {
+        "$ref": "#/definitions/LibraryElementArrayResponse"
+      }
+    },
     "getLibraryElementConnectionsResponse": {
       "description": "",
       "schema": {
@@ -8613,7 +8358,22 @@
     "getPreferencesResponse": {
       "description": "",
       "schema": {
-        "$ref": "#/definitions/Spec"
+        "$ref": "#/definitions/Preferences"
+      }
+    },
+    "getPublicAnnotationsResponse": {
+      "description": "",
+      "schema": {
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/AnnotationEvent"
+        }
+      }
+    },
+    "getPublicDashboardResponse": {
+      "description": "",
+      "schema": {
+        "$ref": "#/definitions/PublicDashboard"
       }
     },
     "getQueryHistoryDeleteQueryResponse": {
@@ -8646,13 +8406,13 @@
     "getReportResponse": {
       "description": "",
       "schema": {
-        "$ref": "#/definitions/ConfigDTO"
+        "$ref": "#/definitions/Report"
       }
     },
     "getReportSettingsResponse": {
       "description": "",
       "schema": {
-        "$ref": "#/definitions/SettingsDTO"
+        "$ref": "#/definitions/ReportSettings"
       }
     },
     "getReportsResponse": {
@@ -8660,7 +8420,16 @@
       "schema": {
         "type": "array",
         "items": {
-          "$ref": "#/definitions/ConfigDTO"
+          "$ref": "#/definitions/Report"
+        }
+      }
+    },
+    "getResourcePermissionsResponse": {
+      "description": "",
+      "schema": {
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/resourcePermissionDTO"
         }
       }
     },
@@ -8676,6 +8445,27 @@
         "$ref": "#/definitions/RoleDTO"
       }
     },
+    "getSSOSettingsResponse": {
+      "description": "",
+      "schema": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "provider": {
+            "type": "string"
+          },
+          "settings": {
+            "type": "object",
+            "additionalProperties": {}
+          },
+          "source": {
+            "type": "string"
+          }
+        }
+      }
+    },
     "getSharingOptionsResponse": {
       "description": "",
       "schema": {
@@ -8798,6 +8588,12 @@
         "$ref": "#/definitions/ErrorResponseBody"
       }
     },
+    "internalServerPublicError": {
+      "description": "InternalServerPublicError is a general error indicating something went wrong internally.",
+      "schema": {
+        "$ref": "#/definitions/publicError"
+      }
+    },
     "jwksResponse": {
       "description": "",
       "schema": {
@@ -8824,6 +8620,12 @@
         }
       }
     },
+    "listPublicDashboardsResponse": {
+      "description": "",
+      "schema": {
+        "$ref": "#/definitions/PublicDashboardListResponseWithPagination"
+      }
+    },
     "listRecordingRulesResponse": {
       "description": "",
       "schema": {
@@ -8842,6 +8644,30 @@
         }
       }
     },
+    "listSSOSettingsResponse": {
+      "description": "",
+      "schema": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "id": {
+              "type": "string"
+            },
+            "provider": {
+              "type": "string"
+            },
+            "settings": {
+              "type": "object",
+              "additionalProperties": {}
+            },
+            "source": {
+              "type": "string"
+            }
+          }
+        }
+      }
+    },
     "listSortOptionsResponse": {
       "description": "",
       "schema": {
@@ -8862,69 +8688,55 @@
         }
       }
     },
-    "listTokensResponse": {
+    "listTeamsRolesResponse": {
       "description": "",
       "schema": {
-        "$ref": "#/definitions/TokenDTO"
-      }
-    },
-    "notFoundError": {
-      "description": "NotFoundError is returned when the requested resource was not found.",
-      "schema": {
-        "$ref": "#/definitions/ErrorResponseBody"
+        "type": "object",
+        "additionalProperties": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/RoleDTO"
+          }
+        }
       }
     },
-    "okResponse": {
-      "description": "An OKResponse is returned if the request was successful.",
+    "listTokensResponse": {
+      "description": "",
       "schema": {
-        "$ref": "#/definitions/SuccessResponseBody"
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/TokenDTO"
+        }
       }
     },
-    "pauseAlertResponse": {
+    "listUsersRolesResponse": {
       "description": "",
       "schema": {
         "type": "object",
-        "required": [
-          "alertId",
-          "message"
-        ],
-        "properties": {
-          "alertId": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "message": {
-            "type": "string"
-          },
-          "state": {
-            "description": "Alert result state\nrequired true",
-            "type": "string"
+        "additionalProperties": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/RoleDTO"
           }
         }
       }
     },
-    "pauseAlertsResponse": {
-      "description": "",
+    "notFoundError": {
+      "description": "NotFoundError is returned when the requested resource was not found.",
       "schema": {
-        "type": "object",
-        "required": [
-          "alertsAffected",
-          "message"
-        ],
-        "properties": {
-          "alertsAffected": {
-            "description": "AlertsAffected is the number of the affected alerts.",
-            "type": "integer",
-            "format": "int64"
-          },
-          "message": {
-            "type": "string"
-          },
-          "state": {
-            "description": "Alert result state\nrequired true",
-            "type": "string"
-          }
-        }
+        "$ref": "#/definitions/ErrorResponseBody"
+      }
+    },
+    "notFoundPublicError": {
+      "description": "NotFoundPublicError is returned when the requested resource was not found.",
+      "schema": {
+        "$ref": "#/definitions/publicError"
+      }
+    },
+    "okResponse": {
+      "description": "An OKResponse is returned if the request was successful.",
+      "schema": {
+        "$ref": "#/definitions/SuccessResponseBody"
       }
     },
     "postAPIkeyResponse": {
@@ -8968,6 +8780,10 @@
           "url"
         ],
         "properties": {
+          "folderUid": {
+            "description": "FolderUID The unique identifier (uid) of the folder the dashboard belongs to.",
+            "type": "string"
+          },
           "id": {
             "description": "ID The unique identifier (id) of the created/updated dashboard.",
             "type": "integer",
@@ -9012,12 +8828,24 @@
         "$ref": "#/definitions/ErrorResponseBody"
       }
     },
+    "publicErrorResponse": {
+      "description": "",
+      "schema": {
+        "$ref": "#/definitions/publicError"
+      }
+    },
     "queryMetricsWithExpressionsRespons": {
       "description": "",
       "schema": {
         "$ref": "#/definitions/QueryDataResponse"
       }
     },
+    "queryPublicDashboardResponse": {
+      "description": "",
+      "schema": {
+        "$ref": "#/definitions/QueryDataResponse"
+      }
+    },
     "recordingRuleResponse": {
       "description": "",
       "schema": {
@@ -9036,6 +8864,12 @@
         "$ref": "#/definitions/ActiveUserStats"
       }
     },
+    "resourcePermissionsDescription": {
+      "description": "",
+      "schema": {
+        "$ref": "#/definitions/Description"
+      }
+    },
     "retrieveServiceAccountResponse": {
       "description": "",
       "schema": {
@@ -9117,24 +8951,18 @@
         "$ref": "#/definitions/RoleAssignmentsDTO"
       }
     },
-    "testAlertResponse": {
-      "description": "",
-      "schema": {
-        "$ref": "#/definitions/AlertTestResult"
-      }
-    },
-    "trimDashboardResponse": {
-      "description": "",
-      "schema": {
-        "$ref": "#/definitions/TrimDashboardFullWithMeta"
-      }
-    },
     "unauthorisedError": {
       "description": "UnauthorizedError is returned when the request is not authenticated.",
       "schema": {
         "$ref": "#/definitions/ErrorResponseBody"
       }
     },
+    "unauthorisedPublicError": {
+      "description": "UnauthorisedPublicError is returned when the request is not authenticated.",
+      "schema": {
+        "$ref": "#/definitions/publicError"
+      }
+    },
     "unprocessableEntityError": {
       "description": "UnprocessableEntityError",
       "schema": {
@@ -9153,6 +8981,12 @@
         "$ref": "#/definitions/PlaylistDTO"
       }
     },
+    "updatePublicDashboardResponse": {
+      "description": "",
+      "schema": {
+        "$ref": "#/definitions/PublicDashboard"
+      }
+    },
     "updateServiceAccountResponse": {
       "description": "",
       "schema": {
@@ -9180,15 +9014,10 @@
         "$ref": "#/definitions/UserProfileDTO"
       }
     },
-    "validateDashboardResponse": {
+    "viewPublicDashboardResponse": {
       "description": "",
-      "headers": {
-        "isValid": {
-          "type": "boolean"
-        },
-        "message": {
-          "type": "string"
-        }
+      "schema": {
+        "$ref": "#/definitions/DashboardFullWithMeta"
       }
     }
   },
diff --git a/public/api-merged.json b/public/api-merged.json
index 8194ddb54cc35..038827f26b16d 100644
--- a/public/api-merged.json
+++ b/public/api-merged.json
@@ -318,6 +318,41 @@
         }
       }
     },
+    "/access-control/teams/roles/search": {
+      "post": {
+        "description": "Lists the roles that have been directly assigned to the given teams.\n\nYou need to have a permission with action `teams.roles:read` and scope `teams:id:*`.",
+        "tags": [
+          "access_control",
+          "enterprise"
+        ],
+        "summary": "List roles assigned to multiple teams.",
+        "operationId": "listTeamsRoles",
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/RolesSearchQuery"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/listTeamsRolesResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
+          }
+        }
+      }
+    },
     "/access-control/teams/{teamId}/roles": {
       "get": {
         "description": "You need to have a permission with action `teams.roles:read` and scope `teams:id:\u003cteam ID\u003e`.",
@@ -473,6 +508,41 @@
         }
       }
     },
+    "/access-control/users/roles/search": {
+      "post": {
+        "description": "Lists the roles that have been directly assigned to the given users. The list does not include built-in roles (Viewer, Editor, Admin or Grafana Admin), and it does not include roles that have been inherited from a team.\n\nYou need to have a permission with action `users.roles:read` and scope `users:id:*`.",
+        "tags": [
+          "access_control",
+          "enterprise"
+        ],
+        "summary": "List roles assigned to multiple users.",
+        "operationId": "listUsersRoles",
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/RolesSearchQuery"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/listUsersRolesResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
+          }
+        }
+      }
+    },
     "/access-control/users/{userId}/roles": {
       "get": {
         "description": "Lists the roles that have been directly assigned to a given user. The list does not include built-in roles (Viewer, Editor, Admin or Grafana Admin), and it does not include roles that have been inherited from a team.\n\nYou need to have a permission with action `users.roles:read` and scope `users:id:\u003cuser ID\u003e`.",
@@ -639,21 +709,24 @@
         }
       }
     },
-    "/admin/ldap-sync-status": {
+    "/access-control/{resource}/description": {
       "get": {
-        "description": "You need to have a permission with action `ldap.status:read`.",
         "tags": [
-          "ldap_debug",
-          "enterprise"
+          "access_control"
+        ],
+        "summary": "Get a description of a resource's access control properties.",
+        "operationId": "getResourceDescription",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "resource",
+            "in": "path",
+            "required": true
+          }
         ],
-        "summary": "Returns the current state of the LDAP background sync integration.",
-        "operationId": "getSyncStatus",
         "responses": {
           "200": {
-            "$ref": "#/responses/getSyncStatusResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
+            "$ref": "#/responses/resourcePermissionsDescription"
           },
           "403": {
             "$ref": "#/responses/forbiddenError"
@@ -664,211 +737,295 @@
         }
       }
     },
-    "/admin/ldap/reload": {
-      "post": {
-        "security": [
+    "/access-control/{resource}/{resourceID}": {
+      "get": {
+        "tags": [
+          "access_control"
+        ],
+        "summary": "Get permissions for a resource.",
+        "operationId": "getResourcePermissions",
+        "parameters": [
           {
-            "basic": []
+            "type": "string",
+            "name": "resource",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "name": "resourceID",
+            "in": "path",
+            "required": true
           }
         ],
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `ldap.config:reload`.",
-        "tags": [
-          "admin_ldap"
-        ],
-        "summary": "Reloads the LDAP configuration.",
-        "operationId": "reloadLDAPCfg",
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
+            "$ref": "#/responses/getResourcePermissionsResponse"
           },
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/admin/ldap/status": {
-      "get": {
-        "security": [
+      },
+      "post": {
+        "description": "Assigns permissions for a resource by a given type (`:resource`) and `:resourceID` to one or many\nassignment types. Allowed resources are `datasources`, `teams`, `dashboards`, `folders`, and `serviceaccounts`.\nRefer to the `/access-control/{resource}/description` endpoint for allowed Permissions.",
+        "tags": [
+          "access_control"
+        ],
+        "summary": "Set resource permissions.",
+        "operationId": "setResourcePermissions",
+        "parameters": [
           {
-            "basic": []
+            "type": "string",
+            "name": "resource",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "name": "resourceID",
+            "in": "path",
+            "required": true
+          },
+          {
+            "name": "Body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/setPermissionsCommand"
+            }
           }
         ],
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `ldap.status:read`.",
-        "tags": [
-          "admin_ldap"
-        ],
-        "summary": "Attempts to connect to all the configured LDAP servers and returns information on whenever they're available or not.",
-        "operationId": "getLDAPStatus",
         "responses": {
           "200": {
             "$ref": "#/responses/okResponse"
           },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/admin/ldap/sync/{user_id}": {
+    "/access-control/{resource}/{resourceID}/builtInRoles/{builtInRole}": {
       "post": {
-        "security": [
-          {
-            "basic": []
-          }
-        ],
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `ldap.user:sync`.",
+        "description": "Assigns permissions for a resource by a given type (`:resource`) and `:resourceID` to a built-in role.\nAllowed resources are `datasources`, `teams`, `dashboards`, `folders`, and `serviceaccounts`.\nRefer to the `/access-control/{resource}/description` endpoint for allowed Permissions.",
         "tags": [
-          "admin_ldap"
+          "access_control"
         ],
-        "summary": "Enables a single Grafana user to be synchronized against LDAP.",
-        "operationId": "postSyncUserWithLDAP",
+        "summary": "Set resource permissions for a built-in role.",
+        "operationId": "setResourcePermissionsForBuiltInRole",
         "parameters": [
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "user_id",
+            "type": "string",
+            "name": "resource",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "name": "resourceID",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "name": "builtInRole",
             "in": "path",
             "required": true
+          },
+          {
+            "name": "Body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/setPermissionCommand"
+            }
           }
         ],
         "responses": {
           "200": {
             "$ref": "#/responses/okResponse"
           },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/admin/ldap/{user_name}": {
-      "get": {
-        "security": [
-          {
-            "basic": []
-          }
-        ],
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `ldap.user:read`.",
+    "/access-control/{resource}/{resourceID}/teams/{teamID}": {
+      "post": {
+        "description": "Assigns permissions for a resource by a given type (`:resource`) and `:resourceID` to a team.\nAllowed resources are `datasources`, `teams`, `dashboards`, `folders`, and `serviceaccounts`.\nRefer to the `/access-control/{resource}/description` endpoint for allowed Permissions.",
         "tags": [
-          "admin_ldap"
+          "access_control"
         ],
-        "summary": "Finds an user based on a username in LDAP. This helps illustrate how would the particular user be mapped in Grafana when synced.",
-        "operationId": "getUserFromLDAP",
+        "summary": "Set resource permissions for a team.",
+        "operationId": "setResourcePermissionsForTeam",
         "parameters": [
           {
             "type": "string",
-            "name": "user_name",
+            "name": "resource",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "name": "resourceID",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "teamID",
             "in": "path",
             "required": true
+          },
+          {
+            "name": "Body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/setPermissionCommand"
+            }
           }
         ],
         "responses": {
           "200": {
             "$ref": "#/responses/okResponse"
           },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/admin/pause-all-alerts": {
+    "/access-control/{resource}/{resourceID}/users/{userID}": {
       "post": {
-        "security": [
-          {
-            "basic": []
-          }
-        ],
+        "description": "Assigns permissions for a resource by a given type (`:resource`) and `:resourceID` to a user or a service account.\nAllowed resources are `datasources`, `teams`, `dashboards`, `folders`, and `serviceaccounts`.\nRefer to the `/access-control/{resource}/description` endpoint for allowed Permissions.",
         "tags": [
-          "admin"
+          "access_control"
         ],
-        "summary": "Pause/unpause all (legacy) alerts.",
-        "operationId": "pauseAllAlerts",
+        "summary": "Set resource permissions for a user.",
+        "operationId": "setResourcePermissionsForUser",
         "parameters": [
           {
-            "name": "body",
+            "type": "string",
+            "name": "resource",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "name": "resourceID",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "userID",
+            "in": "path",
+            "required": true
+          },
+          {
+            "name": "Body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/PauseAllAlertsCommand"
+              "$ref": "#/definitions/setPermissionCommand"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/pauseAlertsResponse"
+            "$ref": "#/responses/okResponse"
           },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/admin/provisioning/access-control/reload": {
-      "post": {
+    "/admin/ldap-sync-status": {
+      "get": {
+        "description": "You need to have a permission with action `ldap.status:read`.",
         "tags": [
-          "access_control_provisioning",
+          "ldap_debug",
           "enterprise"
         ],
-        "summary": "You need to have a permission with action `provisioning:reload` with scope `provisioners:accesscontrol`.",
-        "operationId": "adminProvisioningReloadAccessControl",
+        "summary": "Returns the current state of the LDAP background sync integration.",
+        "operationId": "getSyncStatus",
         "responses": {
-          "202": {
-            "$ref": "#/responses/acceptedResponse"
+          "200": {
+            "$ref": "#/responses/getSyncStatusResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
           "403": {
             "$ref": "#/responses/forbiddenError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/admin/provisioning/dashboards/reload": {
+    "/admin/ldap/reload": {
       "post": {
         "security": [
           {
             "basic": []
           }
         ],
-        "description": "Reloads the provisioning config files for dashboards again. It won’t return until the new provisioned entities are already stored in the database. In case of dashboards, it will stop polling for changes in dashboard files and then restart it with new configurations after returning.\nIf you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `provisioning:reload` and scope `provisioners:dashboards`.",
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `ldap.config:reload`.",
         "tags": [
-          "admin_provisioning"
+          "admin_ldap"
         ],
-        "summary": "Reload dashboard provisioning configurations.",
-        "operationId": "adminProvisioningReloadDashboards",
+        "summary": "Reloads the LDAP configuration.",
+        "operationId": "reloadLDAPCfg",
         "responses": {
           "200": {
             "$ref": "#/responses/okResponse"
@@ -885,19 +1042,144 @@
         }
       }
     },
-    "/admin/provisioning/datasources/reload": {
+    "/admin/ldap/status": {
+      "get": {
+        "security": [
+          {
+            "basic": []
+          }
+        ],
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `ldap.status:read`.",
+        "tags": [
+          "admin_ldap"
+        ],
+        "summary": "Attempts to connect to all the configured LDAP servers and returns information on whenever they're available or not.",
+        "operationId": "getLDAPStatus",
+        "responses": {
+          "200": {
+            "$ref": "#/responses/okResponse"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
+          }
+        }
+      }
+    },
+    "/admin/ldap/sync/{user_id}": {
       "post": {
         "security": [
           {
             "basic": []
           }
         ],
-        "description": "Reloads the provisioning config files for datasources again. It won’t return until the new provisioned entities are already stored in the database. In case of dashboards, it will stop polling for changes in dashboard files and then restart it with new configurations after returning.\nIf you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `provisioning:reload` and scope `provisioners:datasources`.",
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `ldap.user:sync`.",
+        "tags": [
+          "admin_ldap"
+        ],
+        "summary": "Enables a single Grafana user to be synchronized against LDAP.",
+        "operationId": "postSyncUserWithLDAP",
+        "parameters": [
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "user_id",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/okResponse"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
+          }
+        }
+      }
+    },
+    "/admin/ldap/{user_name}": {
+      "get": {
+        "security": [
+          {
+            "basic": []
+          }
+        ],
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `ldap.user:read`.",
+        "tags": [
+          "admin_ldap"
+        ],
+        "summary": "Finds an user based on a username in LDAP. This helps illustrate how would the particular user be mapped in Grafana when synced.",
+        "operationId": "getUserFromLDAP",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "user_name",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/okResponse"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
+          }
+        }
+      }
+    },
+    "/admin/provisioning/access-control/reload": {
+      "post": {
+        "tags": [
+          "access_control_provisioning",
+          "enterprise"
+        ],
+        "summary": "You need to have a permission with action `provisioning:reload` with scope `provisioners:accesscontrol`.",
+        "operationId": "adminProvisioningReloadAccessControl",
+        "responses": {
+          "202": {
+            "$ref": "#/responses/acceptedResponse"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          }
+        }
+      }
+    },
+    "/admin/provisioning/dashboards/reload": {
+      "post": {
+        "security": [
+          {
+            "basic": []
+          }
+        ],
+        "description": "Reloads the provisioning config files for dashboards again. It won’t return until the new provisioned entities are already stored in the database. In case of dashboards, it will stop polling for changes in dashboard files and then restart it with new configurations after returning.\nIf you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `provisioning:reload` and scope `provisioners:dashboards`.",
         "tags": [
           "admin_provisioning"
         ],
-        "summary": "Reload datasource provisioning configurations.",
-        "operationId": "adminProvisioningReloadDatasources",
+        "summary": "Reload dashboard provisioning configurations.",
+        "operationId": "adminProvisioningReloadDashboards",
         "responses": {
           "200": {
             "$ref": "#/responses/okResponse"
@@ -914,19 +1196,19 @@
         }
       }
     },
-    "/admin/provisioning/notifications/reload": {
+    "/admin/provisioning/datasources/reload": {
       "post": {
         "security": [
           {
             "basic": []
           }
         ],
-        "description": "Reloads the provisioning config files for legacy alert notifiers again. It won’t return until the new provisioned entities are already stored in the database. In case of dashboards, it will stop polling for changes in dashboard files and then restart it with new configurations after returning.\nIf you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `provisioning:reload` and scope `provisioners:notifications`.",
+        "description": "Reloads the provisioning config files for datasources again. It won’t return until the new provisioned entities are already stored in the database. In case of dashboards, it will stop polling for changes in dashboard files and then restart it with new configurations after returning.\nIf you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `provisioning:reload` and scope `provisioners:datasources`.",
         "tags": [
           "admin_provisioning"
         ],
-        "summary": "Reload legacy alert notifier provisioning configurations.",
-        "operationId": "adminProvisioningReloadNotifications",
+        "summary": "Reload datasource provisioning configurations.",
+        "operationId": "adminProvisioningReloadDatasources",
         "responses": {
           "200": {
             "$ref": "#/responses/okResponse"
@@ -1513,49 +1795,132 @@
         }
       }
     },
-    "/alert-notifications": {
+    "/annotations": {
       "get": {
-        "description": "Returns all notification channels that the authenticated user has permission to view.",
+        "description": "Starting in Grafana v6.4 regions annotations are now returned in one entity that now includes the timeEnd property.",
         "tags": [
-          "legacy_alerts_notification_channels"
+          "annotations"
+        ],
+        "summary": "Find Annotations.",
+        "operationId": "getAnnotations",
+        "parameters": [
+          {
+            "type": "integer",
+            "format": "int64",
+            "description": "Find annotations created after specific epoch datetime in milliseconds.",
+            "name": "from",
+            "in": "query"
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "description": "Find annotations created before specific epoch datetime in milliseconds.",
+            "name": "to",
+            "in": "query"
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "description": "Limit response to annotations created by specific user.",
+            "name": "userId",
+            "in": "query"
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "description": "Find annotations for a specified alert.",
+            "name": "alertId",
+            "in": "query"
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "description": "Find annotations that are scoped to a specific dashboard",
+            "name": "dashboardId",
+            "in": "query"
+          },
+          {
+            "type": "string",
+            "description": "Find annotations that are scoped to a specific dashboard",
+            "name": "dashboardUID",
+            "in": "query"
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "description": "Find annotations that are scoped to a specific panel",
+            "name": "panelId",
+            "in": "query"
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "description": "Max limit for results returned.",
+            "name": "limit",
+            "in": "query"
+          },
+          {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "collectionFormat": "multi",
+            "description": "Use this to filter organization annotations. Organization annotations are annotations from an annotation data source that are not connected specifically to a dashboard or panel. You can filter by multiple tags.",
+            "name": "tags",
+            "in": "query"
+          },
+          {
+            "enum": [
+              "alert",
+              "annotation"
+            ],
+            "type": "string",
+            "description": "Return alerts or user created annotations",
+            "name": "type",
+            "in": "query"
+          },
+          {
+            "type": "boolean",
+            "description": "Match any or all tags",
+            "name": "matchAny",
+            "in": "query"
+          }
         ],
-        "summary": "Get all notification channels.",
-        "operationId": "getAlertNotificationChannels",
         "responses": {
           "200": {
-            "$ref": "#/responses/getAlertNotificationChannelsResponse"
+            "$ref": "#/responses/getAnnotationsResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       },
       "post": {
-        "description": "You can find the full list of [supported notifiers](https://grafana.com/docs/grafana/latest/alerting/old-alerting/notifications/#list-of-supported-notifiers) on the alert notifiers page.",
+        "description": "Creates an annotation in the Grafana database. The dashboardId and panelId fields are optional. If they are not specified then an organization annotation is created and can be queried in any dashboard that adds the Grafana annotations data source. When creating a region annotation include the timeEnd property.\nThe format for `time` and `timeEnd` should be epoch numbers in millisecond resolution.\nThe response for this HTTP request is slightly different in versions prior to v6.4. In prior versions you would also get an endId if you where creating a region. But in 6.4 regions are represented using a single event with time and timeEnd properties.",
         "tags": [
-          "legacy_alerts_notification_channels"
+          "annotations"
         ],
-        "summary": "Create notification channel.",
-        "operationId": "createAlertNotificationChannel",
+        "summary": "Create Annotation.",
+        "operationId": "postAnnotation",
         "parameters": [
           {
             "name": "body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/CreateAlertNotificationCommand"
+              "$ref": "#/definitions/PostAnnotationsCmd"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getAlertNotificationChannelResponse"
+            "$ref": "#/responses/postAnnotationResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -1563,26 +1928,36 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "409": {
-            "$ref": "#/responses/conflictError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/alert-notifications/lookup": {
-      "get": {
-        "description": "Returns all notification channels, but with less detailed information. Accessible by any authenticated user and is mainly used by providing alert notification channels in Grafana UI when configuring alert rule.",
+    "/annotations/graphite": {
+      "post": {
+        "description": "Creates an annotation by using Graphite-compatible event format. The `when` and `data` fields are optional. If `when` is not specified then the current time will be used as annotation’s timestamp. The `tags` field can also be in prior to Graphite `0.10.0` format (string with multiple tags being separated by a space).",
         "tags": [
-          "legacy_alerts_notification_channels"
+          "annotations"
+        ],
+        "summary": "Create Annotation in Graphite format.",
+        "operationId": "postGraphiteAnnotation",
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/PostGraphiteAnnotationsCmd"
+            }
+          }
         ],
-        "summary": "Get all notification channels (lookup).",
-        "operationId": "getAlertNotificationLookup",
         "responses": {
           "200": {
-            "$ref": "#/responses/getAlertNotificationLookupResponse"
+            "$ref": "#/responses/postAnnotationResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -1596,21 +1971,20 @@
         }
       }
     },
-    "/alert-notifications/test": {
+    "/annotations/mass-delete": {
       "post": {
-        "description": "Sends a test notification to the channel.",
         "tags": [
-          "legacy_alerts_notification_channels"
+          "annotations"
         ],
-        "summary": "Test notification channel.",
-        "operationId": "notificationChannelTest",
+        "summary": "Delete multiple annotations.",
+        "operationId": "massDeleteAnnotations",
         "parameters": [
           {
             "name": "body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/NotificationTestCommand"
+              "$ref": "#/definitions/MassDeleteAnnotationsCmd"
             }
           }
         ],
@@ -1618,17 +1992,44 @@
           "200": {
             "$ref": "#/responses/okResponse"
           },
-          "400": {
-            "$ref": "#/responses/badRequestError"
-          },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
+          "500": {
+            "$ref": "#/responses/internalServerError"
+          }
+        }
+      }
+    },
+    "/annotations/tags": {
+      "get": {
+        "description": "Find all the event tags created in the annotations.",
+        "tags": [
+          "annotations"
+        ],
+        "summary": "Find Annotations Tags.",
+        "operationId": "getAnnotationTags",
+        "parameters": [
+          {
+            "type": "string",
+            "description": "Tag is a string that you can use to filter tags.",
+            "name": "tag",
+            "in": "query"
           },
-          "412": {
-            "$ref": "#/responses/SMTPNotEnabledError"
+          {
+            "type": "string",
+            "default": "100",
+            "description": "Max limit for results returned.",
+            "name": "limit",
+            "in": "query"
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/getAnnotationTagsResponse"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
           },
           "500": {
             "$ref": "#/responses/internalServerError"
@@ -1636,66 +2037,92 @@
         }
       }
     },
-    "/alert-notifications/uid/{notification_channel_uid}": {
+    "/annotations/{annotation_id}": {
       "get": {
-        "description": "Returns the notification channel given the notification channel UID.",
         "tags": [
-          "legacy_alerts_notification_channels"
+          "annotations"
         ],
-        "summary": "Get notification channel by UID.",
-        "operationId": "getAlertNotificationChannelByUID",
+        "summary": "Get Annotation by ID.",
+        "operationId": "getAnnotationByID",
         "parameters": [
           {
             "type": "string",
-            "name": "notification_channel_uid",
+            "name": "annotation_id",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getAlertNotificationChannelResponse"
+            "$ref": "#/responses/getAnnotationByIDResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       },
       "put": {
-        "description": "Updates an existing notification channel identified by uid.",
+        "description": "Updates all properties of an annotation that matches the specified id. To only update certain property, consider using the Patch Annotation operation.",
         "tags": [
-          "legacy_alerts_notification_channels"
+          "annotations"
         ],
-        "summary": "Update notification channel by UID.",
-        "operationId": "updateAlertNotificationChannelByUID",
+        "summary": "Update Annotation.",
+        "operationId": "updateAnnotation",
         "parameters": [
+          {
+            "type": "string",
+            "name": "annotation_id",
+            "in": "path",
+            "required": true
+          },
           {
             "name": "body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/UpdateAlertNotificationWithUidCommand"
+              "$ref": "#/definitions/UpdateAnnotationsCmd"
             }
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
           },
+          "500": {
+            "$ref": "#/responses/internalServerError"
+          }
+        }
+      },
+      "delete": {
+        "description": "Deletes the annotation that matches the specified ID.",
+        "tags": [
+          "annotations"
+        ],
+        "summary": "Delete Annotation By ID.",
+        "operationId": "deleteAnnotationByID",
+        "parameters": [
           {
             "type": "string",
-            "name": "notification_channel_uid",
+            "name": "annotation_id",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getAlertNotificationChannelResponse"
+            "$ref": "#/responses/okResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -1703,32 +2130,37 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       },
-      "delete": {
-        "description": "Deletes an existing notification channel identified by UID.",
+      "patch": {
+        "description": "Updates one or more properties of an annotation that matches the specified ID.\nThis operation currently supports updating of the `text`, `tags`, `time` and `timeEnd` properties.\nThis is available in Grafana 6.0.0-beta2 and above.",
         "tags": [
-          "legacy_alerts_notification_channels"
+          "annotations"
         ],
-        "summary": "Delete alert notification by UID.",
-        "operationId": "deleteAlertNotificationChannelByUID",
+        "summary": "Patch Annotation.",
+        "operationId": "patchAnnotation",
         "parameters": [
           {
             "type": "string",
-            "name": "notification_channel_uid",
+            "name": "annotation_id",
             "in": "path",
             "required": true
+          },
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/PatchAnnotationsCmd"
+            }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/deleteAlertNotificationChannelResponse"
+            "$ref": "#/responses/okResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -1745,26 +2177,26 @@
         }
       }
     },
-    "/alert-notifications/{notification_channel_id}": {
+    "/auth/keys": {
       "get": {
-        "description": "Returns the notification channel given the notification channel ID.",
+        "description": "Will return auth keys.\n\nDeprecated: true.\n\nDeprecated. Please use GET /api/serviceaccounts and GET /api/serviceaccounts/{id}/tokens instead\nsee https://grafana.com/docs/grafana/next/administration/api-keys/#migrate-api-keys-to-grafana-service-accounts-using-the-api.",
         "tags": [
-          "legacy_alerts_notification_channels"
+          "api_keys"
         ],
-        "summary": "Get notification channel by ID.",
-        "operationId": "getAlertNotificationChannelByID",
+        "summary": "Get auth keys.",
+        "operationId": "getAPIkeys",
         "parameters": [
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "notification_channel_id",
-            "in": "path",
-            "required": true
+            "type": "boolean",
+            "default": false,
+            "description": "Show expired keys",
+            "name": "includeExpired",
+            "in": "query"
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getAlertNotificationChannelResponse"
+            "$ref": "#/responses/getAPIkeyResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -1780,33 +2212,30 @@
           }
         }
       },
-      "put": {
-        "description": "Updates an existing notification channel identified by ID.",
+      "post": {
+        "description": "Will return details of the created API key.",
         "tags": [
-          "legacy_alerts_notification_channels"
+          "api_keys"
         ],
-        "summary": "Update notification channel by ID.",
-        "operationId": "updateAlertNotificationChannel",
+        "summary": "Creates an API key.",
+        "operationId": "addAPIkey",
+        "deprecated": true,
         "parameters": [
           {
-            "name": "body",
+            "name": "Body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/UpdateAlertNotificationCommand"
+              "$ref": "#/definitions/AddAPIKeyCommand"
             }
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "name": "notification_channel_id",
-            "in": "path",
-            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getAlertNotificationChannelResponse"
+            "$ref": "#/responses/postAPIkeyResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -1814,26 +2243,29 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
+          "409": {
+            "$ref": "#/responses/conflictError"
           },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      },
+      }
+    },
+    "/auth/keys/{id}": {
       "delete": {
-        "description": "Deletes an existing notification channel identified by ID.",
+        "description": "Deletes an API key.\nDeprecated. See: https://grafana.com/docs/grafana/next/administration/api-keys/#migrate-api-keys-to-grafana-service-accounts-using-the-api.",
         "tags": [
-          "legacy_alerts_notification_channels"
+          "api_keys"
         ],
-        "summary": "Delete alert notification by ID.",
-        "operationId": "deleteAlertNotificationChannel",
+        "summary": "Delete API key.",
+        "operationId": "deleteAPIkey",
+        "deprecated": true,
         "parameters": [
           {
             "type": "integer",
             "format": "int64",
-            "name": "notification_channel_id",
+            "name": "id",
             "in": "path",
             "required": true
           }
@@ -1857,91 +2289,32 @@
         }
       }
     },
-    "/alerts": {
+    "/dashboard/snapshots": {
       "get": {
         "tags": [
-          "legacy_alerts"
+          "snapshots"
         ],
-        "summary": "Get legacy alerts.",
-        "operationId": "getAlerts",
+        "summary": "List snapshots.",
+        "operationId": "searchDashboardSnapshots",
         "parameters": [
-          {
-            "type": "array",
-            "items": {
-              "type": "string"
-            },
-            "description": "Limit response to alerts in specified dashboard(s). You can specify multiple dashboards.",
-            "name": "dashboardId",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "description": "Limit response to alert for a specified panel on a dashboard.",
-            "name": "panelId",
-            "in": "query"
-          },
           {
             "type": "string",
-            "description": "Limit response to alerts having a name like this value.",
+            "description": "Search Query",
             "name": "query",
             "in": "query"
           },
-          {
-            "enum": [
-              "all",
-              "no_data",
-              "paused",
-              "alerting",
-              "ok",
-              "pending",
-              "unknown"
-            ],
-            "type": "string",
-            "description": "Return alerts with one or more of the following alert states",
-            "name": "state",
-            "in": "query"
-          },
           {
             "type": "integer",
             "format": "int64",
-            "description": "Limit response to X number of alerts.",
+            "default": 1000,
+            "description": "Limit the number of returned results",
             "name": "limit",
             "in": "query"
-          },
-          {
-            "type": "array",
-            "items": {
-              "type": "string"
-            },
-            "collectionFormat": "multi",
-            "description": "Limit response to alerts of dashboards in specified folder(s). You can specify multiple folders",
-            "name": "folderId",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "description": "Limit response to alerts having a dashboard name like this value./ Limit response to alerts having a dashboard name like this value.",
-            "name": "dashboardQuery",
-            "in": "query"
-          },
-          {
-            "type": "array",
-            "items": {
-              "type": "string"
-            },
-            "collectionFormat": "multi",
-            "description": "Limit response to alerts of dashboards with specified tags. To do an “AND” filtering with multiple tags, specify the tags parameter multiple times",
-            "name": "dashboardTag",
-            "in": "query"
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getAlertsResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
+            "$ref": "#/responses/searchDashboardSnapshotsResponse"
           },
           "500": {
             "$ref": "#/responses/internalServerError"
@@ -1949,28 +2322,52 @@
         }
       }
     },
-    "/alerts/states-for-dashboard": {
-      "get": {
+    "/dashboards/calculate-diff": {
+      "post": {
+        "produces": [
+          "application/json",
+          "text/html"
+        ],
         "tags": [
-          "legacy_alerts"
+          "dashboards"
         ],
-        "summary": "Get alert states for a dashboard.",
-        "operationId": "getDashboardStates",
+        "summary": "Perform diff on two dashboards.",
+        "operationId": "calculateDashboardDiff",
         "parameters": [
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "dashboardId",
-            "in": "query",
-            "required": true
+            "name": "Body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "object",
+              "properties": {
+                "base": {
+                  "$ref": "#/definitions/CalculateDiffTarget"
+                },
+                "diffType": {
+                  "description": "The type of diff to return\nDescription:\n`basic`\n`json`",
+                  "type": "string",
+                  "enum": [
+                    "basic",
+                    "json"
+                  ]
+                },
+                "new": {
+                  "$ref": "#/definitions/CalculateDiffTarget"
+                }
+              }
+            }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getDashboardStatesResponse"
+            "$ref": "#/responses/calculateDashboardDiffResponse"
           },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
           },
           "500": {
             "$ref": "#/responses/internalServerError"
@@ -1978,32 +2375,43 @@
         }
       }
     },
-    "/alerts/test": {
+    "/dashboards/db": {
       "post": {
+        "description": "Creates a new dashboard or updates an existing dashboard.\nNote: This endpoint is not intended for creating folders, use `POST /api/folders` for that.",
         "tags": [
-          "legacy_alerts"
+          "dashboards"
         ],
-        "summary": "Test alert.",
-        "operationId": "testAlert",
+        "summary": "Create / Update dashboard",
+        "operationId": "postDashboard",
         "parameters": [
           {
-            "name": "body",
+            "name": "Body",
             "in": "body",
+            "required": true,
             "schema": {
-              "$ref": "#/definitions/AlertTestCommand"
+              "$ref": "#/definitions/SaveDashboardCommand"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/testAlertResponse"
+            "$ref": "#/responses/postDashboardResponse"
           },
           "400": {
             "$ref": "#/responses/badRequestError"
           },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
+          "412": {
+            "$ref": "#/responses/preconditionFailedError"
+          },
           "422": {
             "$ref": "#/responses/unprocessableEntityError"
           },
@@ -2013,25 +2421,16 @@
         }
       }
     },
-    "/alerts/{alert_id}": {
+    "/dashboards/home": {
       "get": {
-        "description": "“evalMatches” data in the response is cached in the db when and only when the state of the alert changes (e.g. transitioning from “ok” to “alerting” state).\nIf data from one server triggers the alert first and, before that server is seen leaving alerting state, a second server also enters a state that would trigger the alert, the second server will not be visible in “evalMatches” data.",
         "tags": [
-          "legacy_alerts"
-        ],
-        "summary": "Get alert by ID.",
-        "operationId": "getAlertByID",
-        "parameters": [
-          {
-            "type": "string",
-            "name": "alert_id",
-            "in": "path",
-            "required": true
-          }
+          "dashboards"
         ],
+        "summary": "Get home dashboard.",
+        "operationId": "getHomeDashboard",
         "responses": {
           "200": {
-            "$ref": "#/responses/getAlertResponse"
+            "$ref": "#/responses/getHomeDashboardResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -2042,32 +2441,27 @@
         }
       }
     },
-    "/alerts/{alert_id}/pause": {
-      "post": {
+    "/dashboards/id/{DashboardID}/permissions": {
+      "get": {
+        "description": "Please refer to [updated API](#/dashboard_permissions/getDashboardPermissionsListByUID) instead",
         "tags": [
-          "legacy_alerts"
+          "dashboard_permissions"
         ],
-        "summary": "Pause/unpause alert by id.",
-        "operationId": "pauseAlert",
+        "summary": "Gets all existing permissions for the given dashboard.",
+        "operationId": "getDashboardPermissionsListByID",
+        "deprecated": true,
         "parameters": [
           {
-            "type": "string",
-            "name": "alert_id",
+            "type": "integer",
+            "format": "int64",
+            "name": "DashboardID",
             "in": "path",
             "required": true
-          },
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/PauseAlertCommand"
-            }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/pauseAlertResponse"
+            "$ref": "#/responses/getDashboardPermissionsListResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -2082,134 +2476,83 @@
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/annotations": {
-      "get": {
-        "description": "Starting in Grafana v6.4 regions annotations are now returned in one entity that now includes the timeEnd property.",
+      },
+      "post": {
+        "description": "Please refer to [updated API](#/dashboard_permissions/updateDashboardPermissionsByUID) instead\n\nThis operation will remove existing permissions if they’re not included in the request.",
         "tags": [
-          "annotations"
+          "dashboard_permissions"
         ],
-        "summary": "Find Annotations.",
-        "operationId": "getAnnotations",
+        "summary": "Updates permissions for a dashboard.",
+        "operationId": "updateDashboardPermissionsByID",
+        "deprecated": true,
         "parameters": [
           {
-            "type": "integer",
-            "format": "int64",
-            "description": "Find annotations created after specific epoch datetime in milliseconds.",
-            "name": "from",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "description": "Find annotations created before specific epoch datetime in milliseconds.",
-            "name": "to",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "description": "Limit response to annotations created by specific user.",
-            "name": "userId",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "description": "Find annotations for a specified alert.",
-            "name": "alertId",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "description": "Find annotations that are scoped to a specific dashboard",
-            "name": "dashboardId",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "description": "Find annotations that are scoped to a specific dashboard",
-            "name": "dashboardUID",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "description": "Find annotations that are scoped to a specific panel",
-            "name": "panelId",
-            "in": "query"
+            "name": "Body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/UpdateDashboardACLCommand"
+            }
           },
           {
             "type": "integer",
             "format": "int64",
-            "description": "Max limit for results returned.",
-            "name": "limit",
-            "in": "query"
-          },
-          {
-            "type": "array",
-            "items": {
-              "type": "string"
-            },
-            "collectionFormat": "multi",
-            "description": "Use this to filter organization annotations. Organization annotations are annotations from an annotation data source that are not connected specifically to a dashboard or panel. You can filter by multiple tags.",
-            "name": "tags",
-            "in": "query"
-          },
-          {
-            "enum": [
-              "alert",
-              "annotation"
-            ],
-            "type": "string",
-            "description": "Return alerts or user created annotations",
-            "name": "type",
-            "in": "query"
-          },
-          {
-            "type": "boolean",
-            "description": "Match any or all tags",
-            "name": "matchAny",
-            "in": "query"
+            "name": "DashboardID",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getAnnotationsResponse"
+            "$ref": "#/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      },
+      }
+    },
+    "/dashboards/id/{DashboardID}/restore": {
       "post": {
-        "description": "Creates an annotation in the Grafana database. The dashboardId and panelId fields are optional. If they are not specified then an organization annotation is created and can be queried in any dashboard that adds the Grafana annotations data source. When creating a region annotation include the timeEnd property.\nThe format for `time` and `timeEnd` should be epoch numbers in millisecond resolution.\nThe response for this HTTP request is slightly different in versions prior to v6.4. In prior versions you would also get an endId if you where creating a region. But in 6.4 regions are represented using a single event with time and timeEnd properties.",
+        "description": "Please refer to [updated API](#/dashboard_versions/restoreDashboardVersionByUID) instead",
         "tags": [
-          "annotations"
+          "dashboard_versions"
         ],
-        "summary": "Create Annotation.",
-        "operationId": "postAnnotation",
+        "summary": "Restore a dashboard to a given dashboard version.",
+        "operationId": "restoreDashboardVersionByID",
+        "deprecated": true,
         "parameters": [
           {
-            "name": "body",
+            "name": "Body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/PostAnnotationsCmd"
+              "$ref": "#/definitions/RestoreDashboardVersionCommand"
             }
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "DashboardID",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/postAnnotationResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+            "$ref": "#/responses/postDashboardResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -2217,36 +2560,36 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/annotations/graphite": {
-      "post": {
-        "description": "Creates an annotation by using Graphite-compatible event format. The `when` and `data` fields are optional. If `when` is not specified then the current time will be used as annotation’s timestamp. The `tags` field can also be in prior to Graphite `0.10.0` format (string with multiple tags being separated by a space).",
+    "/dashboards/id/{DashboardID}/versions": {
+      "get": {
+        "description": "Please refer to [updated API](#/dashboard_versions/getDashboardVersionsByUID) instead",
         "tags": [
-          "annotations"
+          "dashboard_versions"
         ],
-        "summary": "Create Annotation in Graphite format.",
-        "operationId": "postGraphiteAnnotation",
+        "summary": "Gets all existing versions for the dashboard.",
+        "operationId": "getDashboardVersionsByID",
+        "deprecated": true,
         "parameters": [
           {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/PostGraphiteAnnotationsCmd"
-            }
+            "type": "integer",
+            "format": "int64",
+            "name": "DashboardID",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/postAnnotationResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+            "$ref": "#/responses/dashboardVersionsResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -2254,68 +2597,131 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "500": {
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
+          "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/annotations/mass-delete": {
+    "/dashboards/id/{DashboardID}/versions/{DashboardVersionID}": {
+      "get": {
+        "description": "Please refer to [updated API](#/dashboard_versions/getDashboardVersionByUID) instead",
+        "tags": [
+          "dashboard_versions"
+        ],
+        "summary": "Get a specific dashboard version.",
+        "operationId": "getDashboardVersionByID",
+        "deprecated": true,
+        "parameters": [
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "DashboardID",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "DashboardVersionID",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/dashboardVersionResponse"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
+          }
+        }
+      }
+    },
+    "/dashboards/import": {
       "post": {
         "tags": [
-          "annotations"
+          "dashboards"
         ],
-        "summary": "Delete multiple annotations.",
-        "operationId": "massDeleteAnnotations",
+        "summary": "Import dashboard.",
+        "operationId": "importDashboard",
         "parameters": [
           {
-            "name": "body",
+            "name": "Body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/MassDeleteAnnotationsCmd"
+              "$ref": "#/definitions/ImportDashboardRequest"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
+            "$ref": "#/responses/importDashboardResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
+          "412": {
+            "$ref": "#/responses/preconditionFailedError"
+          },
+          "422": {
+            "$ref": "#/responses/unprocessableEntityError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/annotations/tags": {
+    "/dashboards/public-dashboards": {
       "get": {
-        "description": "Find all the event tags created in the annotations.",
+        "description": "Get list of public dashboards",
         "tags": [
-          "annotations"
+          "dashboard_public"
         ],
-        "summary": "Find Annotations Tags.",
-        "operationId": "getAnnotationTags",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "Tag is a string that you can use to filter tags.",
-            "name": "tag",
-            "in": "query"
+        "operationId": "listPublicDashboards",
+        "responses": {
+          "200": {
+            "$ref": "#/responses/listPublicDashboardsResponse"
           },
-          {
-            "type": "string",
-            "default": "100",
-            "description": "Max limit for results returned.",
-            "name": "limit",
-            "in": "query"
+          "401": {
+            "$ref": "#/responses/unauthorisedPublicError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenPublicError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerPublicError"
           }
+        }
+      }
+    },
+    "/dashboards/tags": {
+      "get": {
+        "tags": [
+          "dashboards"
         ],
+        "summary": "Get all dashboards tags of an organisation.",
+        "operationId": "getDashboardTags",
         "responses": {
           "200": {
-            "$ref": "#/responses/getAnnotationTagsResponse"
+            "$ref": "#/responses/getDashboardsTagsResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -2326,85 +2732,103 @@
         }
       }
     },
-    "/annotations/{annotation_id}": {
+    "/dashboards/uid/{dashboardUid}/public-dashboards": {
       "get": {
+        "description": "Get public dashboard by dashboardUid",
         "tags": [
-          "annotations"
+          "dashboard_public"
         ],
-        "summary": "Get Annotation by ID.",
-        "operationId": "getAnnotationByID",
+        "operationId": "getPublicDashboard",
         "parameters": [
           {
             "type": "string",
-            "name": "annotation_id",
+            "name": "dashboardUid",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getAnnotationByIDResponse"
+            "$ref": "#/responses/getPublicDashboardResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestPublicError"
           },
           "401": {
-            "$ref": "#/responses/unauthorisedError"
+            "$ref": "#/responses/unauthorisedPublicError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenPublicError"
+          },
+          "404": {
+            "$ref": "#/responses/notFoundPublicError"
           },
           "500": {
-            "$ref": "#/responses/internalServerError"
+            "$ref": "#/responses/internalServerPublicError"
           }
         }
       },
-      "put": {
-        "description": "Updates all properties of an annotation that matches the specified id. To only update certain property, consider using the Patch Annotation operation.",
+      "post": {
+        "description": "Create public dashboard for a dashboard",
+        "produces": [
+          "application/json"
+        ],
         "tags": [
-          "annotations"
+          "dashboard_public"
         ],
-        "summary": "Update Annotation.",
-        "operationId": "updateAnnotation",
+        "operationId": "createPublicDashboard",
         "parameters": [
           {
             "type": "string",
-            "name": "annotation_id",
+            "name": "dashboardUid",
             "in": "path",
             "required": true
           },
           {
-            "name": "body",
+            "name": "Body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/UpdateAnnotationsCmd"
+              "$ref": "#/definitions/PublicDashboardDTO"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
+            "$ref": "#/responses/createPublicDashboardResponse"
           },
           "400": {
-            "$ref": "#/responses/badRequestError"
+            "$ref": "#/responses/badRequestPublicError"
           },
           "401": {
-            "$ref": "#/responses/unauthorisedError"
+            "$ref": "#/responses/unauthorisedPublicError"
           },
           "403": {
-            "$ref": "#/responses/forbiddenError"
+            "$ref": "#/responses/forbiddenPublicError"
           },
           "500": {
-            "$ref": "#/responses/internalServerError"
+            "$ref": "#/responses/internalServerPublicError"
           }
         }
-      },
+      }
+    },
+    "/dashboards/uid/{dashboardUid}/public-dashboards/{uid}": {
       "delete": {
-        "description": "Deletes the annotation that matches the specified ID.",
+        "description": "Delete public dashboard for a dashboard",
         "tags": [
-          "annotations"
+          "dashboard_public"
         ],
-        "summary": "Delete Annotation By ID.",
-        "operationId": "deleteAnnotationByID",
+        "operationId": "deletePublicDashboard",
         "parameters": [
           {
             "type": "string",
-            "name": "annotation_id",
+            "name": "dashboardUid",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "name": "uid",
             "in": "path",
             "required": true
           }
@@ -2413,984 +2837,1018 @@
           "200": {
             "$ref": "#/responses/okResponse"
           },
+          "400": {
+            "$ref": "#/responses/badRequestPublicError"
+          },
           "401": {
-            "$ref": "#/responses/unauthorisedError"
+            "$ref": "#/responses/unauthorisedPublicError"
           },
           "403": {
-            "$ref": "#/responses/forbiddenError"
+            "$ref": "#/responses/forbiddenPublicError"
           },
           "500": {
-            "$ref": "#/responses/internalServerError"
+            "$ref": "#/responses/internalServerPublicError"
           }
         }
       },
       "patch": {
-        "description": "Updates one or more properties of an annotation that matches the specified ID.\nThis operation currently supports updating of the `text`, `tags`, `time` and `timeEnd` properties.\nThis is available in Grafana 6.0.0-beta2 and above.",
+        "description": "Update public dashboard for a dashboard",
+        "produces": [
+          "application/json"
+        ],
         "tags": [
-          "annotations"
+          "dashboard_public"
         ],
-        "summary": "Patch Annotation.",
-        "operationId": "patchAnnotation",
+        "operationId": "updatePublicDashboard",
         "parameters": [
           {
             "type": "string",
-            "name": "annotation_id",
+            "name": "dashboardUid",
             "in": "path",
             "required": true
           },
           {
-            "name": "body",
+            "type": "string",
+            "name": "uid",
+            "in": "path",
+            "required": true
+          },
+          {
+            "name": "Body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/PatchAnnotationsCmd"
+              "$ref": "#/definitions/PublicDashboardDTO"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
+            "$ref": "#/responses/updatePublicDashboardResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestPublicError"
           },
           "401": {
-            "$ref": "#/responses/unauthorisedError"
+            "$ref": "#/responses/unauthorisedPublicError"
           },
           "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/responses/notFoundError"
+            "$ref": "#/responses/forbiddenPublicError"
           },
           "500": {
-            "$ref": "#/responses/internalServerError"
+            "$ref": "#/responses/internalServerPublicError"
           }
         }
       }
     },
-    "/api/v1/provisioning/alert-rules": {
+    "/dashboards/uid/{uid}": {
       "get": {
+        "description": "Will return the dashboard given the dashboard unique identifier (uid).",
         "tags": [
-          "provisioning"
+          "dashboards"
+        ],
+        "summary": "Get dashboard by uid.",
+        "operationId": "getDashboardByUID",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "uid",
+            "in": "path",
+            "required": true
+          }
         ],
-        "summary": "Get all the alert rules.",
-        "operationId": "RouteGetAlertRules",
         "responses": {
           "200": {
-            "description": "ProvisionedAlertRules",
-            "schema": {
-              "$ref": "#/definitions/ProvisionedAlertRules"
-            }
+            "$ref": "#/responses/dashboardResponse"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
           }
         }
       },
-      "post": {
-        "consumes": [
-          "application/json"
-        ],
+      "delete": {
+        "description": "Will delete the dashboard given the specified unique identifier (uid).",
         "tags": [
-          "provisioning"
+          "dashboards"
         ],
-        "summary": "Create a new alert rule.",
-        "operationId": "RoutePostAlertRule",
+        "summary": "Delete dashboard by uid.",
+        "operationId": "deleteDashboardByUID",
         "parameters": [
-          {
-            "name": "Body",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/ProvisionedAlertRule"
-            }
-          },
           {
             "type": "string",
-            "name": "X-Disable-Provenance",
-            "in": "header"
+            "name": "uid",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
-          "201": {
-            "description": "ProvisionedAlertRule",
-            "schema": {
-              "$ref": "#/definitions/ProvisionedAlertRule"
-            }
+          "200": {
+            "$ref": "#/responses/deleteDashboardResponse"
           },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      }
-    },
-    "/api/v1/provisioning/alert-rules/export": {
-      "get": {
-        "tags": [
-          "provisioning"
-        ],
-        "summary": "Export all alert rules in provisioning file format.",
-        "operationId": "RouteGetAlertRulesExport",
-        "parameters": [
-          {
-            "type": "boolean",
-            "default": false,
-            "description": "Whether to initiate a download of the file or not.",
-            "name": "download",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "default": "yaml",
-            "description": "Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.",
-            "name": "format",
-            "in": "query"
-          },
-          {
-            "type": "array",
-            "items": {
-              "type": "string"
-            },
-            "description": "UIDs of folders from which to export rules",
-            "name": "folderUid",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "description": "Name of group of rules to export. Must be specified only together with a single folder UID",
-            "name": "group",
-            "in": "query"
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
           },
-          {
-            "type": "string",
-            "description": "UID of alert rule to export. If specified, parameters folderUid and group must be empty.",
-            "name": "ruleUid",
-            "in": "query"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "AlertingFileExport",
-            "schema": {
-              "$ref": "#/definitions/AlertingFileExport"
-            }
+          "403": {
+            "$ref": "#/responses/forbiddenError"
           },
           "404": {
-            "description": " Not found."
+            "$ref": "#/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/api/v1/provisioning/alert-rules/{UID}": {
+    "/dashboards/uid/{uid}/permissions": {
       "get": {
         "tags": [
-          "provisioning"
+          "dashboard_permissions"
         ],
-        "summary": "Get a specific alert rule by UID.",
-        "operationId": "RouteGetAlertRule",
+        "summary": "Gets all existing permissions for the given dashboard.",
+        "operationId": "getDashboardPermissionsListByUID",
         "parameters": [
           {
             "type": "string",
-            "description": "Alert rule UID",
-            "name": "UID",
+            "name": "uid",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "description": "ProvisionedAlertRule",
-            "schema": {
-              "$ref": "#/definitions/ProvisionedAlertRule"
-            }
+            "$ref": "#/responses/getDashboardPermissionsListResponse"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
           },
           "404": {
-            "description": " Not found."
+            "$ref": "#/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
           }
         }
       },
-      "put": {
-        "consumes": [
-          "application/json"
-        ],
+      "post": {
+        "description": "This operation will remove existing permissions if they’re not included in the request.",
         "tags": [
-          "provisioning"
+          "dashboard_permissions"
         ],
-        "summary": "Update an existing alert rule.",
-        "operationId": "RoutePutAlertRule",
+        "summary": "Updates permissions for a dashboard.",
+        "operationId": "updateDashboardPermissionsByUID",
         "parameters": [
-          {
-            "type": "string",
-            "description": "Alert rule UID",
-            "name": "UID",
-            "in": "path",
-            "required": true
-          },
           {
             "name": "Body",
             "in": "body",
+            "required": true,
             "schema": {
-              "$ref": "#/definitions/ProvisionedAlertRule"
+              "$ref": "#/definitions/UpdateDashboardACLCommand"
             }
           },
           {
             "type": "string",
-            "name": "X-Disable-Provenance",
-            "in": "header"
+            "name": "uid",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
-            "description": "ProvisionedAlertRule",
-            "schema": {
-              "$ref": "#/definitions/ProvisionedAlertRule"
-            }
+            "$ref": "#/responses/okResponse"
           },
           "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
+            "$ref": "#/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
           }
         }
-      },
-      "delete": {
+      }
+    },
+    "/dashboards/uid/{uid}/restore": {
+      "post": {
         "tags": [
-          "provisioning"
+          "dashboard_versions"
         ],
-        "summary": "Delete a specific alert rule by UID.",
-        "operationId": "RouteDeleteAlertRule",
+        "summary": "Restore a dashboard to a given dashboard version using UID.",
+        "operationId": "restoreDashboardVersionByUID",
         "parameters": [
+          {
+            "name": "Body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/RestoreDashboardVersionCommand"
+            }
+          },
           {
             "type": "string",
-            "description": "Alert rule UID",
-            "name": "UID",
+            "name": "uid",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
-          "204": {
-            "description": " The alert rule was deleted successfully."
+          "200": {
+            "$ref": "#/responses/postDashboardResponse"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/api/v1/provisioning/alert-rules/{UID}/export": {
+    "/dashboards/uid/{uid}/versions": {
       "get": {
-        "produces": [
-          "application/json",
-          "application/yaml",
-          "text/yaml"
-        ],
         "tags": [
-          "provisioning"
+          "dashboard_versions"
         ],
-        "summary": "Export an alert rule in provisioning file format.",
-        "operationId": "RouteGetAlertRuleExport",
+        "summary": "Gets all existing versions for the dashboard using UID.",
+        "operationId": "getDashboardVersionsByUID",
         "parameters": [
           {
-            "type": "boolean",
-            "default": false,
-            "description": "Whether to initiate a download of the file or not.",
-            "name": "download",
-            "in": "query"
+            "type": "string",
+            "name": "uid",
+            "in": "path",
+            "required": true
           },
           {
-            "type": "string",
-            "default": "yaml",
-            "description": "Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.",
-            "name": "format",
+            "type": "integer",
+            "format": "int64",
+            "default": 0,
+            "description": "Maximum number of results to return",
+            "name": "limit",
             "in": "query"
           },
           {
-            "type": "string",
-            "description": "Alert rule UID",
-            "name": "UID",
-            "in": "path",
-            "required": true
+            "type": "integer",
+            "format": "int64",
+            "default": 0,
+            "description": "Version to start from when returning queries",
+            "name": "start",
+            "in": "query"
           }
         ],
         "responses": {
           "200": {
-            "description": "AlertingFileExport",
-            "schema": {
-              "$ref": "#/definitions/AlertingFileExport"
-            }
+            "$ref": "#/responses/dashboardVersionsResponse"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
           },
           "404": {
-            "description": " Not found."
+            "$ref": "#/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/api/v1/provisioning/contact-points": {
+    "/dashboards/uid/{uid}/versions/{DashboardVersionID}": {
       "get": {
         "tags": [
-          "provisioning"
+          "dashboard_versions"
         ],
-        "summary": "Get all the contact points.",
-        "operationId": "RouteGetContactpoints",
+        "summary": "Get a specific dashboard version using UID.",
+        "operationId": "getDashboardVersionByUID",
         "parameters": [
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "DashboardVersionID",
+            "in": "path",
+            "required": true
+          },
           {
             "type": "string",
-            "description": "Filter by name",
-            "name": "name",
-            "in": "query"
+            "name": "uid",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
-            "description": "ContactPoints",
-            "schema": {
-              "$ref": "#/definitions/ContactPoints"
-            }
-          }
-        }
-      },
-      "post": {
-        "consumes": [
-          "application/json"
-        ],
+            "$ref": "#/responses/dashboardVersionResponse"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
+          }
+        }
+      }
+    },
+    "/datasources": {
+      "get": {
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:read` and scope: `datasources:*`.",
         "tags": [
-          "provisioning"
+          "datasources"
         ],
-        "summary": "Create a contact point.",
-        "operationId": "RoutePostContactpoints",
+        "summary": "Get all data sources.",
+        "operationId": "getDataSources",
+        "responses": {
+          "200": {
+            "$ref": "#/responses/getDataSourcesResponse"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
+          }
+        }
+      },
+      "post": {
+        "description": "By defining `password` and `basicAuthPassword` under secureJsonData property\nGrafana encrypts them securely as an encrypted blob in the database.\nThe response then lists the encrypted fields under secureJsonFields.\n\nIf you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:create`",
+        "tags": [
+          "datasources"
+        ],
+        "summary": "Create a data source.",
+        "operationId": "addDataSource",
         "parameters": [
           {
             "name": "Body",
             "in": "body",
+            "required": true,
             "schema": {
-              "$ref": "#/definitions/EmbeddedContactPoint"
+              "$ref": "#/definitions/AddDataSourceCommand"
             }
           }
         ],
         "responses": {
-          "202": {
-            "description": "EmbeddedContactPoint",
-            "schema": {
-              "$ref": "#/definitions/EmbeddedContactPoint"
-            }
+          "200": {
+            "$ref": "#/responses/createOrUpdateDatasourceResponse"
           },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "409": {
+            "$ref": "#/responses/conflictError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/api/v1/provisioning/contact-points/export": {
+    "/datasources/correlations": {
       "get": {
         "tags": [
-          "provisioning"
+          "correlations"
         ],
-        "summary": "Export all contact points in provisioning file format.",
-        "operationId": "RouteGetContactpointsExport",
+        "summary": "Gets all correlations.",
+        "operationId": "getCorrelations",
         "parameters": [
           {
-            "type": "boolean",
-            "default": false,
-            "description": "Whether to initiate a download of the file or not.",
-            "name": "download",
+            "maximum": 1000,
+            "type": "integer",
+            "format": "int64",
+            "default": 100,
+            "description": "Limit the maximum number of correlations to return per page",
+            "name": "limit",
             "in": "query"
           },
           {
-            "type": "string",
-            "default": "yaml",
-            "description": "Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.",
-            "name": "format",
+            "type": "integer",
+            "format": "int64",
+            "default": 1,
+            "description": "Page index for starting fetching correlations",
+            "name": "page",
             "in": "query"
           },
           {
-            "type": "boolean",
-            "default": false,
-            "description": "Whether any contained secure settings should be decrypted or left redacted. Redacted settings will contain RedactedValue instead. Currently, only org admin can view decrypted secure settings.",
-            "name": "decrypt",
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "collectionFormat": "multi",
+            "description": "Source datasource UID filter to be applied to correlations",
+            "name": "sourceUID",
             "in": "query"
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/getCorrelationsResponse"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "404": {
+            "$ref": "#/responses/notFoundError"
           },
+          "500": {
+            "$ref": "#/responses/internalServerError"
+          }
+        }
+      }
+    },
+    "/datasources/id/{name}": {
+      "get": {
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:read` and scopes: `datasources:*`, `datasources:name:*` and `datasources:name:test_datasource` (single data source).",
+        "tags": [
+          "datasources"
+        ],
+        "summary": "Get data source Id by Name.",
+        "operationId": "getDataSourceIdByName",
+        "parameters": [
           {
             "type": "string",
-            "description": "Filter by name",
             "name": "name",
-            "in": "query"
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
-            "description": "AlertingFileExport",
-            "schema": {
-              "$ref": "#/definitions/AlertingFileExport"
-            }
+            "$ref": "#/responses/getDataSourceIDResponse"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
           },
           "403": {
-            "description": "PermissionDenied",
-            "schema": {
-              "$ref": "#/definitions/PermissionDenied"
-            }
+            "$ref": "#/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/api/v1/provisioning/contact-points/{UID}": {
-      "put": {
-        "consumes": [
-          "application/json"
-        ],
+    "/datasources/name/{name}": {
+      "get": {
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:read` and scopes: `datasources:*`, `datasources:name:*` and `datasources:name:test_datasource` (single data source).",
         "tags": [
-          "provisioning"
+          "datasources"
         ],
-        "summary": "Update an existing contact point.",
-        "operationId": "RoutePutContactpoint",
+        "summary": "Get a single data source by Name.",
+        "operationId": "getDataSourceByName",
         "parameters": [
           {
             "type": "string",
-            "description": "UID is the contact point unique identifier",
-            "name": "UID",
+            "name": "name",
             "in": "path",
             "required": true
-          },
-          {
-            "name": "Body",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/EmbeddedContactPoint"
-            }
           }
         ],
         "responses": {
-          "202": {
-            "description": "Ack",
-            "schema": {
-              "$ref": "#/definitions/Ack"
-            }
+          "200": {
+            "$ref": "#/responses/getDataSourceResponse"
           },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
           }
         }
       },
       "delete": {
-        "consumes": [
-          "application/json"
-        ],
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:delete` and scopes: `datasources:*`, `datasources:name:*` and `datasources:name:test_datasource` (single data source).",
         "tags": [
-          "provisioning"
+          "datasources"
         ],
-        "summary": "Delete a contact point.",
-        "operationId": "RouteDeleteContactpoints",
+        "summary": "Delete an existing data source by name.",
+        "operationId": "deleteDataSourceByName",
         "parameters": [
           {
             "type": "string",
-            "description": "UID is the contact point unique identifier",
-            "name": "UID",
+            "name": "name",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
-          "204": {
-            "description": " The contact point was deleted successfully."
+          "200": {
+            "$ref": "#/responses/deleteDataSourceByNameResponse"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}": {
+    "/datasources/proxy/uid/{uid}/{datasource_proxy_route}": {
       "get": {
+        "description": "Proxies all calls to the actual data source.",
         "tags": [
-          "provisioning"
+          "datasources"
         ],
-        "summary": "Get a rule group.",
-        "operationId": "RouteGetAlertRuleGroup",
+        "summary": "Data source proxy GET calls.",
+        "operationId": "datasourceProxyGETByUIDcalls",
         "parameters": [
           {
             "type": "string",
-            "name": "FolderUID",
+            "name": "datasource_proxy_route",
             "in": "path",
             "required": true
           },
           {
             "type": "string",
-            "name": "Group",
+            "name": "uid",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "description": "AlertRuleGroup",
-            "schema": {
-              "$ref": "#/definitions/AlertRuleGroup"
-            }
+            "description": "(empty)"
           },
-          "404": {
-            "description": " Not found."
-          }
-        }
-      },
-      "put": {
-        "consumes": [
-          "application/json"
-        ],
+          "400": {
+            "$ref": "#/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
+          }
+        }
+      },
+      "post": {
+        "description": "Proxies all calls to the actual data source. The data source should support POST methods for the specific path and role as defined",
         "tags": [
-          "provisioning"
+          "datasources"
         ],
-        "summary": "Update the interval of a rule group.",
-        "operationId": "RoutePutAlertRuleGroup",
+        "summary": "Data source proxy POST calls.",
+        "operationId": "datasourceProxyPOSTByUIDcalls",
         "parameters": [
+          {
+            "name": "DatasourceProxyParam",
+            "in": "body",
+            "required": true,
+            "schema": {}
+          },
           {
             "type": "string",
-            "name": "FolderUID",
+            "name": "datasource_proxy_route",
             "in": "path",
             "required": true
           },
           {
             "type": "string",
-            "name": "Group",
+            "name": "uid",
             "in": "path",
             "required": true
-          },
-          {
-            "name": "Body",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/AlertRuleGroup"
-            }
           }
         ],
         "responses": {
-          "200": {
-            "description": "AlertRuleGroup",
-            "schema": {
-              "$ref": "#/definitions/AlertRuleGroup"
-            }
+          "201": {
+            "description": "(empty)"
+          },
+          "202": {
+            "description": "(empty)"
           },
           "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
+            "$ref": "#/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}/export": {
-      "get": {
-        "produces": [
-          "application/json",
-          "application/yaml",
-          "text/yaml"
-        ],
+      },
+      "delete": {
+        "description": "Proxies all calls to the actual data source.",
         "tags": [
-          "provisioning"
+          "datasources"
         ],
-        "summary": "Export an alert rule group in provisioning file format.",
-        "operationId": "RouteGetAlertRuleGroupExport",
+        "summary": "Data source proxy DELETE calls.",
+        "operationId": "datasourceProxyDELETEByUIDcalls",
         "parameters": [
-          {
-            "type": "boolean",
-            "default": false,
-            "description": "Whether to initiate a download of the file or not.",
-            "name": "download",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "default": "yaml",
-            "description": "Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.",
-            "name": "format",
-            "in": "query"
-          },
           {
             "type": "string",
-            "name": "FolderUID",
+            "name": "uid",
             "in": "path",
             "required": true
           },
           {
             "type": "string",
-            "name": "Group",
+            "name": "datasource_proxy_route",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
-          "200": {
-            "description": "AlertingFileExport",
-            "schema": {
-              "$ref": "#/definitions/AlertingFileExport"
-            }
+          "202": {
+            "description": "(empty)"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
           },
           "404": {
-            "description": " Not found."
+            "$ref": "#/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/api/v1/provisioning/mute-timings": {
+    "/datasources/proxy/{id}/{datasource_proxy_route}": {
       "get": {
+        "description": "Proxies all calls to the actual data source.\n\nPlease refer to [updated API](#/datasources/datasourceProxyGETByUIDcalls) instead",
         "tags": [
-          "provisioning"
-        ],
-        "summary": "Get all the mute timings.",
-        "operationId": "RouteGetMuteTimings",
-        "responses": {
-          "200": {
-            "description": "MuteTimings",
-            "schema": {
-              "$ref": "#/definitions/MuteTimings"
-            }
-          }
-        }
-      },
-      "post": {
-        "consumes": [
-          "application/json"
-        ],
-        "tags": [
-          "provisioning"
+          "datasources"
         ],
-        "summary": "Create a new mute timing.",
-        "operationId": "RoutePostMuteTiming",
+        "summary": "Data source proxy GET calls.",
+        "operationId": "datasourceProxyGETcalls",
+        "deprecated": true,
         "parameters": [
           {
-            "name": "Body",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/MuteTimeInterval"
-            }
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "MuteTimeInterval",
-            "schema": {
-              "$ref": "#/definitions/MuteTimeInterval"
-            }
+            "type": "string",
+            "name": "datasource_proxy_route",
+            "in": "path",
+            "required": true
           },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      }
-    },
-    "/api/v1/provisioning/mute-timings/{name}": {
-      "get": {
-        "tags": [
-          "provisioning"
-        ],
-        "summary": "Get a mute timing.",
-        "operationId": "RouteGetMuteTiming",
-        "parameters": [
           {
             "type": "string",
-            "description": "Mute timing name",
-            "name": "name",
+            "name": "id",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "description": "MuteTimeInterval",
-            "schema": {
-              "$ref": "#/definitions/MuteTimeInterval"
-            }
+            "description": "(empty)"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
           },
           "404": {
-            "description": " Not found."
+            "$ref": "#/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
           }
         }
       },
-      "put": {
-        "consumes": [
-          "application/json"
-        ],
+      "post": {
+        "description": "Proxies all calls to the actual data source. The data source should support POST methods for the specific path and role as defined\n\nPlease refer to [updated API](#/datasources/datasourceProxyPOSTByUIDcalls) instead",
         "tags": [
-          "provisioning"
+          "datasources"
         ],
-        "summary": "Replace an existing mute timing.",
-        "operationId": "RoutePutMuteTiming",
+        "summary": "Data source proxy POST calls.",
+        "operationId": "datasourceProxyPOSTcalls",
+        "deprecated": true,
         "parameters": [
+          {
+            "name": "DatasourceProxyParam",
+            "in": "body",
+            "required": true,
+            "schema": {}
+          },
           {
             "type": "string",
-            "description": "Mute timing name",
-            "name": "name",
+            "name": "datasource_proxy_route",
             "in": "path",
             "required": true
           },
           {
-            "name": "Body",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/MuteTimeInterval"
-            }
+            "type": "string",
+            "name": "id",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
-          "200": {
-            "description": "MuteTimeInterval",
-            "schema": {
-              "$ref": "#/definitions/MuteTimeInterval"
-            }
+          "201": {
+            "description": "(empty)"
+          },
+          "202": {
+            "description": "(empty)"
           },
           "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      },
-      "delete": {
-        "tags": [
-          "provisioning"
+            "$ref": "#/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
+          }
+        }
+      },
+      "delete": {
+        "description": "Proxies all calls to the actual data source.\n\nPlease refer to [updated API](#/datasources/datasourceProxyDELETEByUIDcalls) instead",
+        "tags": [
+          "datasources"
         ],
-        "summary": "Delete a mute timing.",
-        "operationId": "RouteDeleteMuteTiming",
+        "summary": "Data source proxy DELETE calls.",
+        "operationId": "datasourceProxyDELETEcalls",
+        "deprecated": true,
         "parameters": [
           {
             "type": "string",
-            "description": "Mute timing name",
-            "name": "name",
+            "name": "id",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "name": "datasource_proxy_route",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
-          "204": {
-            "description": " The mute timing was deleted successfully."
+          "202": {
+            "description": "(empty)"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/api/v1/provisioning/policies": {
+    "/datasources/uid/{sourceUID}/correlations": {
       "get": {
         "tags": [
-          "provisioning"
-        ],
-        "summary": "Get the notification policy tree.",
-        "operationId": "RouteGetPolicyTree",
-        "responses": {
-          "200": {
-            "description": "Route",
-            "schema": {
-              "$ref": "#/definitions/Route"
-            }
-          }
-        }
-      },
-      "put": {
-        "consumes": [
-          "application/json"
-        ],
-        "tags": [
-          "provisioning"
+          "correlations"
         ],
-        "summary": "Sets the notification policy tree.",
-        "operationId": "RoutePutPolicyTree",
+        "summary": "Gets all correlations originating from the given data source.",
+        "operationId": "getCorrelationsBySourceUID",
         "parameters": [
           {
-            "description": "The new notification routing tree to use",
-            "name": "Body",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/Route"
-            }
+            "type": "string",
+            "name": "sourceUID",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
-          "202": {
-            "description": "Ack",
-            "schema": {
-              "$ref": "#/definitions/Ack"
-            }
+          "200": {
+            "$ref": "#/responses/getCorrelationsBySourceUIDResponse"
           },
-          "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
           }
         }
       },
-      "delete": {
-        "consumes": [
-          "application/json"
-        ],
-        "tags": [
-          "provisioning"
-        ],
-        "summary": "Clears the notification policy tree.",
-        "operationId": "RouteResetPolicyTree",
-        "responses": {
-          "202": {
-            "description": "Ack",
-            "schema": {
-              "$ref": "#/definitions/Ack"
-            }
-          }
-        }
-      }
-    },
-    "/api/v1/provisioning/policies/export": {
-      "get": {
+      "post": {
         "tags": [
-          "provisioning"
+          "correlations"
         ],
-        "summary": "Export the notification policy tree in provisioning file format.",
-        "operationId": "RouteGetPolicyTreeExport",
-        "responses": {
-          "200": {
-            "description": "AlertingFileExport",
+        "summary": "Add correlation.",
+        "operationId": "createCorrelation",
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
             "schema": {
-              "$ref": "#/definitions/AlertingFileExport"
+              "$ref": "#/definitions/CreateCorrelationCommand"
             }
           },
-          "404": {
-            "description": "NotFound",
-            "schema": {
-              "$ref": "#/definitions/NotFound"
-            }
+          {
+            "type": "string",
+            "name": "sourceUID",
+            "in": "path",
+            "required": true
           }
-        }
-      }
-    },
-    "/api/v1/provisioning/templates": {
-      "get": {
-        "tags": [
-          "provisioning"
         ],
-        "summary": "Get all notification templates.",
-        "operationId": "RouteGetTemplates",
         "responses": {
           "200": {
-            "description": "NotificationTemplates",
-            "schema": {
-              "$ref": "#/definitions/NotificationTemplates"
-            }
+            "$ref": "#/responses/createCorrelationResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
           },
           "404": {
-            "description": " Not found."
+            "$ref": "#/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/api/v1/provisioning/templates/{name}": {
+    "/datasources/uid/{sourceUID}/correlations/{correlationUID}": {
       "get": {
         "tags": [
-          "provisioning"
+          "correlations"
         ],
-        "summary": "Get a notification template.",
-        "operationId": "RouteGetTemplate",
+        "summary": "Gets a correlation.",
+        "operationId": "getCorrelation",
         "parameters": [
           {
             "type": "string",
-            "description": "Template Name",
-            "name": "name",
+            "name": "sourceUID",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "name": "correlationUID",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "description": "NotificationTemplate",
-            "schema": {
-              "$ref": "#/definitions/NotificationTemplate"
-            }
+            "$ref": "#/responses/getCorrelationResponse"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
           },
           "404": {
-            "description": " Not found."
+            "$ref": "#/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
           }
         }
       },
-      "put": {
-        "consumes": [
-          "application/json"
-        ],
+      "patch": {
         "tags": [
-          "provisioning"
+          "correlations"
         ],
-        "summary": "Updates an existing notification template.",
-        "operationId": "RoutePutTemplate",
+        "summary": "Updates a correlation.",
+        "operationId": "updateCorrelation",
         "parameters": [
           {
             "type": "string",
-            "description": "Template Name",
-            "name": "name",
+            "name": "sourceUID",
             "in": "path",
             "required": true
           },
           {
-            "name": "Body",
+            "type": "string",
+            "name": "correlationUID",
+            "in": "path",
+            "required": true
+          },
+          {
+            "name": "body",
             "in": "body",
             "schema": {
-              "$ref": "#/definitions/NotificationTemplateContent"
+              "$ref": "#/definitions/UpdateCorrelationCommand"
             }
           }
         ],
         "responses": {
-          "202": {
-            "description": "NotificationTemplate",
-            "schema": {
-              "$ref": "#/definitions/NotificationTemplate"
-            }
+          "200": {
+            "$ref": "#/responses/updateCorrelationResponse"
           },
           "400": {
-            "description": "ValidationError",
-            "schema": {
-              "$ref": "#/definitions/ValidationError"
-            }
-          }
-        }
-      },
-      "delete": {
-        "tags": [
-          "provisioning"
-        ],
-        "summary": "Delete a template.",
-        "operationId": "RouteDeleteTemplate",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "Template Name",
-            "name": "name",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": " The template was deleted successfully."
+            "$ref": "#/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/auth/keys": {
+    "/datasources/uid/{uid}": {
       "get": {
-        "description": "Will return auth keys.\n\nDeprecated: true.\n\nDeprecated. Please use GET /api/serviceaccounts and GET /api/serviceaccounts/{id}/tokens instead\nsee https://grafana.com/docs/grafana/next/administration/api-keys/#migrate-api-keys-to-grafana-service-accounts-using-the-api.",
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:read` and scopes: `datasources:*`, `datasources:uid:*` and `datasources:uid:kLtEtcRGk` (single data source).",
         "tags": [
-          "api_keys"
+          "datasources"
         ],
-        "summary": "Get auth keys.",
-        "operationId": "getAPIkeys",
+        "summary": "Get a single data source by UID.",
+        "operationId": "getDataSourceByUID",
         "parameters": [
           {
-            "type": "boolean",
-            "default": false,
-            "description": "Show expired keys",
-            "name": "includeExpired",
-            "in": "query"
+            "type": "string",
+            "name": "uid",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getAPIkeyResponse"
+            "$ref": "#/responses/getDataSourceResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -3406,30 +3864,32 @@
           }
         }
       },
-      "post": {
-        "description": "Will return details of the created API key.",
+      "put": {
+        "description": "Similar to creating a data source, `password` and `basicAuthPassword` should be defined under\nsecureJsonData in order to be stored securely as an encrypted blob in the database. Then, the\nencrypted fields are listed under secureJsonFields section in the response.\n\nIf you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:write` and scopes: `datasources:*`, `datasources:uid:*` and `datasources:uid:1` (single data source).",
         "tags": [
-          "api_keys"
+          "datasources"
         ],
-        "summary": "Creates an API key.",
-        "operationId": "addAPIkey",
-        "deprecated": true,
+        "summary": "Update an existing data source.",
+        "operationId": "updateDataSourceByUID",
         "parameters": [
           {
             "name": "Body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/AddCommand"
+              "$ref": "#/definitions/UpdateDataSourceCommand"
             }
+          },
+          {
+            "type": "string",
+            "name": "uid",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/postAPIkeyResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+            "$ref": "#/responses/createOrUpdateDatasourceResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -3437,29 +3897,22 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "409": {
-            "$ref": "#/responses/conflictError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/auth/keys/{id}": {
+      },
       "delete": {
-        "description": "Deletes an API key.\nDeprecated. See: https://grafana.com/docs/grafana/next/administration/api-keys/#migrate-api-keys-to-grafana-service-accounts-using-the-api.",
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:delete` and scopes: `datasources:*`, `datasources:uid:*` and `datasources:uid:kLtEtcRGk` (single data source).",
         "tags": [
-          "api_keys"
+          "datasources"
         ],
-        "summary": "Delete API key.",
-        "operationId": "deleteAPIkey",
-        "deprecated": true,
+        "summary": "Delete an existing data source by UID.",
+        "operationId": "deleteDataSourceByUID",
         "parameters": [
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "id",
+            "type": "string",
+            "name": "uid",
             "in": "path",
             "required": true
           }
@@ -3483,32 +3936,39 @@
         }
       }
     },
-    "/dashboard/snapshots": {
-      "get": {
+    "/datasources/uid/{uid}/correlations/{correlationUID}": {
+      "delete": {
         "tags": [
-          "snapshots"
+          "correlations"
         ],
-        "summary": "List snapshots.",
-        "operationId": "searchDashboardSnapshots",
+        "summary": "Delete a correlation.",
+        "operationId": "deleteCorrelation",
         "parameters": [
           {
             "type": "string",
-            "description": "Search Query",
-            "name": "query",
-            "in": "query"
+            "name": "uid",
+            "in": "path",
+            "required": true
           },
           {
-            "type": "integer",
-            "format": "int64",
-            "default": 1000,
-            "description": "Limit the number of returned results",
-            "name": "limit",
-            "in": "query"
+            "type": "string",
+            "name": "correlationUID",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/searchDashboardSnapshotsResponse"
+            "$ref": "#/responses/deleteCorrelationResponse"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/responses/notFoundError"
           },
           "500": {
             "$ref": "#/responses/internalServerError"
@@ -3516,46 +3976,27 @@
         }
       }
     },
-    "/dashboards/calculate-diff": {
-      "post": {
-        "produces": [
-          "application/json",
-          "text/html"
-        ],
+    "/datasources/uid/{uid}/health": {
+      "get": {
         "tags": [
-          "dashboards"
+          "datasources"
         ],
-        "summary": "Perform diff on two dashboards.",
-        "operationId": "calculateDashboardDiff",
+        "summary": "Sends a health check request to the plugin datasource identified by the UID.",
+        "operationId": "checkDatasourceHealthWithUID",
         "parameters": [
           {
-            "name": "Body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "properties": {
-                "base": {
-                  "$ref": "#/definitions/CalculateDiffTarget"
-                },
-                "diffType": {
-                  "description": "The type of diff to return\nDescription:\n`basic`\n`json`",
-                  "type": "string",
-                  "enum": [
-                    "basic",
-                    "json"
-                  ]
-                },
-                "new": {
-                  "$ref": "#/definitions/CalculateDiffTarget"
-                }
-              }
-            }
+            "type": "string",
+            "name": "uid",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/calculateDashboardDiffResponse"
+            "$ref": "#/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -3569,27 +4010,30 @@
         }
       }
     },
-    "/dashboards/db": {
-      "post": {
-        "description": "Creates a new dashboard or updates an existing dashboard.",
+    "/datasources/uid/{uid}/resources/{datasource_proxy_route}": {
+      "get": {
         "tags": [
-          "dashboards"
+          "datasources"
         ],
-        "summary": "Create / Update dashboard",
-        "operationId": "postDashboard",
+        "summary": "Fetch data source resources.",
+        "operationId": "callDatasourceResourceWithUID",
         "parameters": [
           {
-            "name": "Body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/SaveDashboardCommand"
-            }
+            "type": "string",
+            "name": "datasource_proxy_route",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "name": "uid",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/postDashboardResponse"
+            "$ref": "#/responses/okResponse"
           },
           "400": {
             "$ref": "#/responses/badRequestError"
@@ -3603,59 +4047,35 @@
           "404": {
             "$ref": "#/responses/notFoundError"
           },
-          "412": {
-            "$ref": "#/responses/preconditionFailedError"
-          },
-          "422": {
-            "$ref": "#/responses/unprocessableEntityError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
-          }
-        }
-      }
-    },
-    "/dashboards/home": {
-      "get": {
-        "tags": [
-          "dashboards"
-        ],
-        "summary": "Get home dashboard.",
-        "operationId": "getHomeDashboard",
-        "responses": {
-          "200": {
-            "$ref": "#/responses/getHomeDashboardResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/dashboards/id/{DashboardID}/permissions": {
+    "/datasources/{id}": {
       "get": {
-        "description": "Please refer to [updated API](#/dashboard_permissions/getDashboardPermissionsListByUID) instead",
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:read` and scopes: `datasources:*`, `datasources:id:*` and `datasources:id:1` (single data source).\n\nPlease refer to [updated API](#/datasources/getDataSourceByUID) instead",
         "tags": [
-          "dashboard_permissions"
+          "datasources"
         ],
-        "summary": "Gets all existing permissions for the given dashboard.",
-        "operationId": "getDashboardPermissionsListByID",
+        "summary": "Get a single data source by Id.",
+        "operationId": "getDataSourceByID",
         "deprecated": true,
         "parameters": [
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "DashboardID",
+            "type": "string",
+            "name": "id",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getDashboardPermissionsListResponse"
+            "$ref": "#/responses/getDataSourceResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -3671,13 +4091,13 @@
           }
         }
       },
-      "post": {
-        "description": "Please refer to [updated API](#/dashboard_permissions/updateDashboardPermissionsByUID) instead\n\nThis operation will remove existing permissions if they’re not included in the request.",
+      "put": {
+        "description": "Similar to creating a data source, `password` and `basicAuthPassword` should be defined under\nsecureJsonData in order to be stored securely as an encrypted blob in the database. Then, the\nencrypted fields are listed under secureJsonFields section in the response.\n\nIf you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:write` and scopes: `datasources:*`, `datasources:id:*` and `datasources:id:1` (single data source).\n\nPlease refer to [updated API](#/datasources/updateDataSourceByUID) instead",
         "tags": [
-          "dashboard_permissions"
+          "datasources"
         ],
-        "summary": "Updates permissions for a dashboard.",
-        "operationId": "updateDashboardPermissionsByID",
+        "summary": "Update an existing data source by its sequential ID.",
+        "operationId": "updateDataSourceByID",
         "deprecated": true,
         "parameters": [
           {
@@ -3685,23 +4105,19 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/UpdateDashboardACLCommand"
+              "$ref": "#/definitions/UpdateDataSourceCommand"
             }
           },
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "DashboardID",
+            "type": "string",
+            "name": "id",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+            "$ref": "#/responses/createOrUpdateDatasourceResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -3709,44 +4125,30 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/dashboards/id/{DashboardID}/restore": {
-      "post": {
-        "description": "Please refer to [updated API](#/dashboard_versions/restoreDashboardVersionByUID) instead",
+      },
+      "delete": {
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:delete` and scopes: `datasources:*`, `datasources:id:*` and `datasources:id:1` (single data source).\n\nPlease refer to [updated API](#/datasources/deleteDataSourceByUID) instead",
         "tags": [
-          "dashboard_versions"
+          "datasources"
         ],
-        "summary": "Restore a dashboard to a given dashboard version.",
-        "operationId": "restoreDashboardVersionByID",
+        "summary": "Delete an existing data source by id.",
+        "operationId": "deleteDataSourceByID",
         "deprecated": true,
         "parameters": [
           {
-            "name": "Body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/RestoreDashboardVersionCommand"
-            }
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "name": "DashboardID",
+            "type": "string",
+            "name": "id",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/postDashboardResponse"
+            "$ref": "#/responses/okResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -3763,27 +4165,29 @@
         }
       }
     },
-    "/dashboards/id/{DashboardID}/versions": {
+    "/datasources/{id}/health": {
       "get": {
-        "description": "Please refer to [updated API](#/dashboard_versions/getDashboardVersionsByUID) instead",
+        "description": "Please refer to [updated API](#/datasources/checkDatasourceHealthWithUID) instead",
         "tags": [
-          "dashboard_versions"
+          "datasources"
         ],
-        "summary": "Gets all existing versions for the dashboard.",
-        "operationId": "getDashboardVersionsByID",
+        "summary": "Sends a health check request to the plugin datasource identified by the ID.",
+        "operationId": "checkDatasourceHealthByID",
         "deprecated": true,
         "parameters": [
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "DashboardID",
+            "type": "string",
+            "name": "id",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/dashboardVersionsResponse"
+            "$ref": "#/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -3791,43 +4195,41 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/dashboards/id/{DashboardID}/versions/{DashboardVersionID}": {
+    "/datasources/{id}/resources/{datasource_proxy_route}": {
       "get": {
-        "description": "Please refer to [updated API](#/dashboard_versions/getDashboardVersionByUID) instead",
+        "description": "Please refer to [updated API](#/datasources/callDatasourceResourceWithUID) instead",
         "tags": [
-          "dashboard_versions"
+          "datasources"
         ],
-        "summary": "Get a specific dashboard version.",
-        "operationId": "getDashboardVersionByID",
+        "summary": "Fetch data source resources by Id.",
+        "operationId": "callDatasourceResourceByID",
         "deprecated": true,
         "parameters": [
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "DashboardID",
+            "type": "string",
+            "name": "datasource_proxy_route",
             "in": "path",
             "required": true
           },
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "DashboardVersionID",
+            "type": "string",
+            "name": "id",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/dashboardVersionResponse"
+            "$ref": "#/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -3844,26 +4246,30 @@
         }
       }
     },
-    "/dashboards/import": {
+    "/ds/query": {
       "post": {
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:query`.",
         "tags": [
-          "dashboards"
+          "ds"
         ],
-        "summary": "Import dashboard.",
-        "operationId": "importDashboard",
+        "summary": "DataSource query metrics with expressions.",
+        "operationId": "queryMetricsWithExpressions",
         "parameters": [
           {
-            "name": "Body",
+            "name": "body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/ImportDashboardRequest"
+              "$ref": "#/definitions/MetricRequest"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/importDashboardResponse"
+            "$ref": "#/responses/queryMetricsWithExpressionsRespons"
+          },
+          "207": {
+            "$ref": "#/responses/queryMetricsWithExpressionsRespons"
           },
           "400": {
             "$ref": "#/responses/badRequestError"
@@ -3871,11 +4277,8 @@
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
-          "412": {
-            "$ref": "#/responses/preconditionFailedError"
-          },
-          "422": {
-            "$ref": "#/responses/unprocessableEntityError"
+          "403": {
+            "$ref": "#/responses/forbiddenError"
           },
           "500": {
             "$ref": "#/responses/internalServerError"
@@ -3883,75 +4286,124 @@
         }
       }
     },
-    "/dashboards/tags": {
+    "/folders": {
       "get": {
+        "description": "It returns all folders that the authenticated user has permission to view.\nIf nested folders are enabled, it expects an additional query parameter with the parent folder UID\nand returns the immediate subfolders that the authenticated user has permission to view.\nIf the parameter is not supplied then it returns immediate subfolders under the root\nthat the authenticated user has permission to view.",
         "tags": [
-          "dashboards"
+          "folders"
+        ],
+        "summary": "Get all folders.",
+        "operationId": "getFolders",
+        "parameters": [
+          {
+            "type": "integer",
+            "format": "int64",
+            "default": 1000,
+            "description": "Limit the maximum number of folders to return",
+            "name": "limit",
+            "in": "query"
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "default": 1,
+            "description": "Page index for starting fetching folders",
+            "name": "page",
+            "in": "query"
+          },
+          {
+            "type": "string",
+            "description": "The parent folder UID",
+            "name": "parentUid",
+            "in": "query"
+          },
+          {
+            "enum": [
+              "Edit",
+              "View"
+            ],
+            "type": "string",
+            "default": "View",
+            "description": "Set to `Edit` to return folders that the user can edit",
+            "name": "permission",
+            "in": "query"
+          }
         ],
-        "summary": "Get all dashboards tags of an organisation.",
-        "operationId": "getDashboardTags",
         "responses": {
           "200": {
-            "$ref": "#/responses/getDashboardsTagsResponse"
+            "$ref": "#/responses/getFoldersResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/dashboards/trim": {
+      },
       "post": {
+        "description": "If nested folders are enabled then it additionally expects the parent folder UID.",
         "tags": [
-          "dashboards"
+          "folders"
         ],
-        "summary": "Trim defaults from dashboard.",
-        "operationId": "trimDashboard",
+        "summary": "Create folder.",
+        "operationId": "createFolder",
         "parameters": [
           {
-            "name": "Body",
+            "name": "body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/TrimDashboardCommand"
+              "$ref": "#/definitions/CreateFolderCommand"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/trimDashboardResponse"
+            "$ref": "#/responses/folderResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "409": {
+            "$ref": "#/responses/conflictError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/dashboards/uid/{uid}": {
+    "/folders/id/{folder_id}": {
       "get": {
-        "description": "Will return the dashboard given the dashboard unique identifier (uid).",
+        "description": "Returns the folder identified by id. This is deprecated.\nPlease refer to [updated API](#/folders/getFolderByUID) instead",
         "tags": [
-          "dashboards"
+          "folders"
         ],
-        "summary": "Get dashboard by uid.",
-        "operationId": "getDashboardByUID",
+        "summary": "Get folder by id.",
+        "operationId": "getFolderByID",
+        "deprecated": true,
         "parameters": [
           {
-            "type": "string",
-            "name": "uid",
+            "type": "integer",
+            "format": "int64",
+            "name": "folder_id",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/dashboardResponse"
+            "$ref": "#/responses/folderResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -3966,25 +4418,26 @@
             "$ref": "#/responses/internalServerError"
           }
         }
-      },
-      "delete": {
-        "description": "Will delete the dashboard given the specified unique identifier (uid).",
+      }
+    },
+    "/folders/{folder_uid}": {
+      "get": {
         "tags": [
-          "dashboards"
+          "folders"
         ],
-        "summary": "Delete dashboard by uid.",
-        "operationId": "deleteDashboardByUID",
+        "summary": "Get folder by uid.",
+        "operationId": "getFolderByUID",
         "parameters": [
           {
             "type": "string",
-            "name": "uid",
+            "name": "folder_uid",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/deleteDashboardResponse"
+            "$ref": "#/responses/folderResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -3999,26 +4452,36 @@
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/dashboards/uid/{uid}/permissions": {
-      "get": {
+      },
+      "put": {
         "tags": [
-          "dashboard_permissions"
+          "folders"
         ],
-        "summary": "Gets all existing permissions for the given dashboard.",
-        "operationId": "getDashboardPermissionsListByUID",
+        "summary": "Update folder.",
+        "operationId": "updateFolder",
         "parameters": [
           {
             "type": "string",
-            "name": "uid",
+            "name": "folder_uid",
             "in": "path",
             "required": true
+          },
+          {
+            "description": "To change the unique identifier (uid), provide another one.\nTo overwrite an existing folder with newer version, set `overwrite` to `true`.\nProvide the current version to safelly update the folder: if the provided version differs from the stored one the request will fail, unless `overwrite` is `true`.",
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/UpdateFolderCommand"
+            }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getDashboardPermissionsListResponse"
+            "$ref": "#/responses/folderResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -4029,37 +4492,39 @@
           "404": {
             "$ref": "#/responses/notFoundError"
           },
+          "409": {
+            "$ref": "#/responses/conflictError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       },
-      "post": {
-        "description": "This operation will remove existing permissions if they’re not included in the request.",
-        "tags": [
-          "dashboard_permissions"
+      "delete": {
+        "description": "Deletes an existing folder identified by UID along with all dashboards (and their alerts) stored in the folder. This operation cannot be reverted.\nIf nested folders are enabled then it also deletes all the subfolders.",
+        "tags": [
+          "folders"
         ],
-        "summary": "Updates permissions for a dashboard.",
-        "operationId": "updateDashboardPermissionsByUID",
+        "summary": "Delete folder.",
+        "operationId": "deleteFolder",
         "parameters": [
-          {
-            "name": "Body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/UpdateDashboardACLCommand"
-            }
-          },
           {
             "type": "string",
-            "name": "uid",
+            "name": "folder_uid",
             "in": "path",
             "required": true
+          },
+          {
+            "type": "boolean",
+            "default": false,
+            "description": "If `true` any Grafana 8 Alerts under this folder will be deleted.\nSet to `false` so that the request will fail if the folder contains any Grafana 8 Alerts.",
+            "name": "forceDeleteRules",
+            "in": "query"
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
+            "$ref": "#/responses/deleteFolderResponse"
           },
           "400": {
             "$ref": "#/responses/badRequestError"
@@ -4079,32 +4544,24 @@
         }
       }
     },
-    "/dashboards/uid/{uid}/restore": {
-      "post": {
+    "/folders/{folder_uid}/counts": {
+      "get": {
         "tags": [
-          "dashboard_versions"
+          "folders"
         ],
-        "summary": "Restore a dashboard to a given dashboard version using UID.",
-        "operationId": "restoreDashboardVersionByUID",
+        "summary": "Gets the count of each descendant of a folder by kind. The folder is identified by UID.",
+        "operationId": "getFolderDescendantCounts",
         "parameters": [
-          {
-            "name": "Body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/RestoreDashboardVersionCommand"
-            }
-          },
           {
             "type": "string",
-            "name": "uid",
+            "name": "folder_uid",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/postDashboardResponse"
+            "$ref": "#/responses/getFolderDescendantCountsResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -4121,40 +4578,32 @@
         }
       }
     },
-    "/dashboards/uid/{uid}/versions": {
-      "get": {
+    "/folders/{folder_uid}/move": {
+      "post": {
         "tags": [
-          "dashboard_versions"
+          "folders"
         ],
-        "summary": "Gets all existing versions for the dashboard using UID.",
-        "operationId": "getDashboardVersionsByUID",
+        "summary": "Move folder.",
+        "operationId": "moveFolder",
         "parameters": [
           {
             "type": "string",
-            "name": "uid",
+            "name": "folder_uid",
             "in": "path",
             "required": true
           },
           {
-            "type": "integer",
-            "format": "int64",
-            "default": 0,
-            "description": "Maximum number of results to return",
-            "name": "limit",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "default": 0,
-            "description": "Version to start from when returning queries",
-            "name": "start",
-            "in": "query"
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/MoveFolderCommand"
+            }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/dashboardVersionsResponse"
+            "$ref": "#/responses/folderResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -4171,31 +4620,24 @@
         }
       }
     },
-    "/dashboards/uid/{uid}/versions/{DashboardVersionID}": {
+    "/folders/{folder_uid}/permissions": {
       "get": {
         "tags": [
-          "dashboard_versions"
+          "folder_permissions"
         ],
-        "summary": "Get a specific dashboard version using UID.",
-        "operationId": "getDashboardVersionByUID",
+        "summary": "Gets all existing permissions for the folder with the given `uid`.",
+        "operationId": "getFolderPermissionList",
         "parameters": [
-          {
-            "type": "integer",
-            "format": "int64",
-            "name": "DashboardVersionID",
-            "in": "path",
-            "required": true
-          },
           {
             "type": "string",
-            "name": "uid",
+            "name": "folder_uid",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/dashboardVersionResponse"
+            "$ref": "#/responses/getFolderPermissionListResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -4210,51 +4652,32 @@
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/datasources": {
-      "get": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:read` and scope: `datasources:*`.",
-        "tags": [
-          "datasources"
-        ],
-        "summary": "Get all data sources.",
-        "operationId": "getDataSources",
-        "responses": {
-          "200": {
-            "$ref": "#/responses/getDataSourcesResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
-          }
-        }
       },
       "post": {
-        "description": "By defining `password` and `basicAuthPassword` under secureJsonData property\nGrafana encrypts them securely as an encrypted blob in the database.\nThe response then lists the encrypted fields under secureJsonFields.\n\nIf you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:create`",
         "tags": [
-          "datasources"
+          "folder_permissions"
         ],
-        "summary": "Create a data source.",
-        "operationId": "addDataSource",
+        "summary": "Updates permissions for a folder. This operation will remove existing permissions if they’re not included in the request.",
+        "operationId": "updateFolderPermissions",
         "parameters": [
+          {
+            "type": "string",
+            "name": "folder_uid",
+            "in": "path",
+            "required": true
+          },
           {
             "name": "Body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/AddDataSourceCommand"
+              "$ref": "#/definitions/UpdateDashboardACLCommand"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/createOrUpdateDatasourceResponse"
+            "$ref": "#/responses/okResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -4262,8 +4685,8 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "409": {
-            "$ref": "#/responses/conflictError"
+          "404": {
+            "$ref": "#/responses/notFoundError"
           },
           "500": {
             "$ref": "#/responses/internalServerError"
@@ -4271,77 +4694,112 @@
         }
       }
     },
-    "/datasources/correlations": {
+    "/library-elements": {
       "get": {
+        "description": "Returns a list of all library elements the authenticated user has permission to view.\nUse the `perPage` query parameter to control the maximum number of library elements returned; the default limit is `100`.\nYou can also use the `page` query parameter to fetch library elements from any page other than the first one.",
         "tags": [
-          "correlations"
+          "library_elements"
         ],
-        "summary": "Gets all correlations.",
-        "operationId": "getCorrelations",
+        "summary": "Get all library elements.",
+        "operationId": "getLibraryElements",
         "parameters": [
           {
-            "maximum": 1000,
+            "type": "string",
+            "description": "Part of the name or description searched for.",
+            "name": "searchString",
+            "in": "query"
+          },
+          {
+            "enum": [
+              1,
+              2
+            ],
             "type": "integer",
             "format": "int64",
-            "default": 100,
-            "description": "Limit the maximum number of correlations to return per page",
-            "name": "limit",
+            "description": "Kind of element to search for.",
+            "name": "kind",
+            "in": "query"
+          },
+          {
+            "enum": [
+              "alpha-asc",
+              "alpha-desc"
+            ],
+            "type": "string",
+            "description": "Sort order of elements.",
+            "name": "sortDirection",
+            "in": "query"
+          },
+          {
+            "type": "string",
+            "description": "A comma separated list of types to filter the elements by",
+            "name": "typeFilter",
+            "in": "query"
+          },
+          {
+            "type": "string",
+            "description": "Element UID to exclude from search results.",
+            "name": "excludeUid",
+            "in": "query"
+          },
+          {
+            "type": "string",
+            "description": "A comma separated list of folder ID(s) to filter the elements by.",
+            "name": "folderFilter",
             "in": "query"
           },
           {
             "type": "integer",
             "format": "int64",
-            "default": 1,
-            "description": "Page index for starting fetching correlations",
-            "name": "page",
+            "default": 100,
+            "description": "The number of results per page.",
+            "name": "perPage",
             "in": "query"
           },
           {
-            "type": "array",
-            "items": {
-              "type": "string"
-            },
-            "collectionFormat": "multi",
-            "description": "Source datasource UID filter to be applied to correlations",
-            "name": "sourceUID",
+            "type": "integer",
+            "format": "int64",
+            "default": 1,
+            "description": "The page for a set of records, given that only perPage records are returned at a time. Numbering starts at 1.",
+            "name": "page",
             "in": "query"
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getCorrelationsResponse"
+            "$ref": "#/responses/getLibraryElementsResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/datasources/id/{name}": {
-      "get": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:read` and scopes: `datasources:*`, `datasources:name:*` and `datasources:name:test_datasource` (single data source).",
+      },
+      "post": {
+        "description": "Creates a new library element.",
         "tags": [
-          "datasources"
+          "library_elements"
         ],
-        "summary": "Get data source Id by Name.",
-        "operationId": "getDataSourceIdByName",
+        "summary": "Create library element.",
+        "operationId": "createLibraryElement",
         "parameters": [
           {
-            "type": "string",
-            "name": "name",
-            "in": "path",
-            "required": true
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/CreateLibraryElementCommand"
+            }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getDataSourceIDResponse"
+            "$ref": "#/responses/getLibraryElementResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -4358,55 +4816,57 @@
         }
       }
     },
-    "/datasources/name/{name}": {
+    "/library-elements/name/{library_element_name}": {
       "get": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:read` and scopes: `datasources:*`, `datasources:name:*` and `datasources:name:test_datasource` (single data source).",
+        "description": "Returns a library element with the given name.",
         "tags": [
-          "datasources"
+          "library_elements"
         ],
-        "summary": "Get a single data source by Name.",
-        "operationId": "getDataSourceByName",
+        "summary": "Get library element by name.",
+        "operationId": "getLibraryElementByName",
         "parameters": [
           {
             "type": "string",
-            "name": "name",
+            "name": "library_element_name",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getDataSourceResponse"
+            "$ref": "#/responses/getLibraryElementArrayResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
+          "404": {
+            "$ref": "#/responses/notFoundError"
           },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      },
-      "delete": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:delete` and scopes: `datasources:*`, `datasources:name:*` and `datasources:name:test_datasource` (single data source).",
+      }
+    },
+    "/library-elements/{library_element_uid}": {
+      "get": {
+        "description": "Returns a library element with the given UID.",
         "tags": [
-          "datasources"
+          "library_elements"
         ],
-        "summary": "Delete an existing data source by name.",
-        "operationId": "deleteDataSourceByName",
+        "summary": "Get library element by UID.",
+        "operationId": "getLibraryElementByUID",
         "parameters": [
           {
             "type": "string",
-            "name": "name",
+            "name": "library_element_uid",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/deleteDataSourceByNameResponse"
+            "$ref": "#/responses/getLibraryElementResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -4421,33 +4881,25 @@
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/datasources/proxy/uid/{uid}/{datasource_proxy_route}": {
-      "get": {
-        "description": "Proxies all calls to the actual data source.",
+      },
+      "delete": {
+        "description": "Deletes an existing library element as specified by the UID. This operation cannot be reverted.\nYou cannot delete a library element that is connected. This operation cannot be reverted.",
         "tags": [
-          "datasources"
+          "library_elements"
         ],
-        "summary": "Data source proxy GET calls.",
-        "operationId": "datasourceProxyGETByUIDcalls",
+        "summary": "Delete library element.",
+        "operationId": "deleteLibraryElementByUID",
         "parameters": [
           {
             "type": "string",
-            "name": "datasource_proxy_route",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "name": "uid",
+            "name": "library_element_uid",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "description": "(empty)"
+            "$ref": "#/responses/okResponse"
           },
           "400": {
             "$ref": "#/responses/badRequestError"
@@ -4466,39 +4918,32 @@
           }
         }
       },
-      "post": {
-        "description": "Proxies all calls to the actual data source. The data source should support POST methods for the specific path and role as defined",
+      "patch": {
+        "description": "Updates an existing library element identified by uid.",
         "tags": [
-          "datasources"
+          "library_elements"
         ],
-        "summary": "Data source proxy POST calls.",
-        "operationId": "datasourceProxyPOSTByUIDcalls",
+        "summary": "Update library element.",
+        "operationId": "updateLibraryElement",
         "parameters": [
           {
-            "name": "DatasourceProxyParam",
+            "name": "body",
             "in": "body",
             "required": true,
-            "schema": {}
-          },
-          {
-            "type": "string",
-            "name": "datasource_proxy_route",
-            "in": "path",
-            "required": true
+            "schema": {
+              "$ref": "#/definitions/PatchLibraryElementCommand"
+            }
           },
           {
             "type": "string",
-            "name": "uid",
+            "name": "library_element_uid",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
-          "201": {
-            "description": "(empty)"
-          },
-          "202": {
-            "description": "(empty)"
+          "200": {
+            "$ref": "#/responses/getLibraryElementResponse"
           },
           "400": {
             "$ref": "#/responses/badRequestError"
@@ -4512,38 +4957,34 @@
           "404": {
             "$ref": "#/responses/notFoundError"
           },
+          "412": {
+            "$ref": "#/responses/preconditionFailedError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      },
-      "delete": {
-        "description": "Proxies all calls to the actual data source.",
+      }
+    },
+    "/library-elements/{library_element_uid}/connections/": {
+      "get": {
+        "description": "Returns a list of connections for a library element based on the UID specified.",
         "tags": [
-          "datasources"
+          "library_elements"
         ],
-        "summary": "Data source proxy DELETE calls.",
-        "operationId": "datasourceProxyDELETEByUIDcalls",
+        "summary": "Get library element connections.",
+        "operationId": "getLibraryElementConnections",
         "parameters": [
           {
             "type": "string",
-            "name": "uid",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "name": "datasource_proxy_route",
+            "name": "library_element_uid",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
-          "202": {
-            "description": "(empty)"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+          "200": {
+            "$ref": "#/responses/getLibraryElementConnectionsResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -4560,127 +5001,140 @@
         }
       }
     },
-    "/datasources/proxy/{id}/{datasource_proxy_route}": {
+    "/licensing/check": {
       "get": {
-        "description": "Proxies all calls to the actual data source.\n\nPlease refer to [updated API](#/datasources/datasourceProxyGETByUIDcalls) instead",
         "tags": [
-          "datasources"
+          "licensing",
+          "enterprise"
         ],
-        "summary": "Data source proxy GET calls.",
-        "operationId": "datasourceProxyGETcalls",
+        "summary": "Check license availability.",
+        "operationId": "getStatus",
+        "responses": {
+          "200": {
+            "$ref": "#/responses/getStatusResponse"
+          }
+        }
+      }
+    },
+    "/licensing/custom-permissions": {
+      "get": {
+        "description": "You need to have a permission with action `licensing.reports:read`.",
+        "tags": [
+          "licensing",
+          "enterprise"
+        ],
+        "summary": "Get custom permissions report.",
+        "operationId": "getCustomPermissionsReport",
         "deprecated": true,
-        "parameters": [
-          {
-            "type": "string",
-            "name": "datasource_proxy_route",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "name": "id",
-            "in": "path",
-            "required": true
+        "responses": {
+          "500": {
+            "$ref": "#/responses/internalServerError"
           }
+        }
+      }
+    },
+    "/licensing/custom-permissions-csv": {
+      "get": {
+        "description": "You need to have a permission with action `licensing.reports:read`.",
+        "produces": [
+          "text/csv"
+        ],
+        "tags": [
+          "licensing",
+          "enterprise"
+        ],
+        "summary": "Get custom permissions report in CSV format.",
+        "operationId": "getCustomPermissionsCSV",
+        "deprecated": true,
+        "responses": {
+          "500": {
+            "$ref": "#/responses/internalServerError"
+          }
+        }
+      }
+    },
+    "/licensing/refresh-stats": {
+      "get": {
+        "description": "You need to have a permission with action `licensing:read`.",
+        "tags": [
+          "licensing",
+          "enterprise"
         ],
+        "summary": "Refresh license stats.",
+        "operationId": "refreshLicenseStats",
         "responses": {
           "200": {
-            "description": "(empty)"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/responses/notFoundError"
+            "$ref": "#/responses/refreshLicenseStatsResponse"
           },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
+      }
+    },
+    "/licensing/token": {
+      "get": {
+        "description": "You need to have a permission with action `licensing:read`.",
+        "tags": [
+          "licensing",
+          "enterprise"
+        ],
+        "summary": "Get license token.",
+        "operationId": "getLicenseToken",
+        "responses": {
+          "200": {
+            "$ref": "#/responses/getLicenseTokenResponse"
+          }
+        }
       },
       "post": {
-        "description": "Proxies all calls to the actual data source. The data source should support POST methods for the specific path and role as defined\n\nPlease refer to [updated API](#/datasources/datasourceProxyPOSTByUIDcalls) instead",
+        "description": "You need to have a permission with action `licensing:update`.",
         "tags": [
-          "datasources"
+          "licensing",
+          "enterprise"
         ],
-        "summary": "Data source proxy POST calls.",
-        "operationId": "datasourceProxyPOSTcalls",
-        "deprecated": true,
+        "summary": "Create license token.",
+        "operationId": "postLicenseToken",
         "parameters": [
           {
-            "name": "DatasourceProxyParam",
+            "name": "body",
             "in": "body",
             "required": true,
-            "schema": {}
-          },
-          {
-            "type": "string",
-            "name": "datasource_proxy_route",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "name": "id",
-            "in": "path",
-            "required": true
+            "schema": {
+              "$ref": "#/definitions/DeleteTokenCommand"
+            }
           }
         ],
         "responses": {
-          "201": {
-            "description": "(empty)"
-          },
-          "202": {
-            "description": "(empty)"
+          "200": {
+            "$ref": "#/responses/getLicenseTokenResponse"
           },
           "400": {
             "$ref": "#/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
           }
         }
       },
       "delete": {
-        "description": "Proxies all calls to the actual data source.\n\nPlease refer to [updated API](#/datasources/datasourceProxyDELETEByUIDcalls) instead",
+        "description": "Removes the license stored in the Grafana database. Available in Grafana Enterprise v7.4+.\n\nYou need to have a permission with action `licensing:delete`.",
         "tags": [
-          "datasources"
+          "licensing",
+          "enterprise"
         ],
-        "summary": "Data source proxy DELETE calls.",
-        "operationId": "datasourceProxyDELETEcalls",
-        "deprecated": true,
+        "summary": "Remove license from database.",
+        "operationId": "deleteLicenseToken",
         "parameters": [
           {
-            "type": "string",
-            "name": "id",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "name": "datasource_proxy_route",
-            "in": "path",
-            "required": true
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/DeleteTokenCommand"
+            }
           }
         ],
         "responses": {
           "202": {
-            "description": "(empty)"
+            "$ref": "#/responses/acceptedResponse"
           },
           "400": {
             "$ref": "#/responses/badRequestError"
@@ -4691,8 +5145,8 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
+          "422": {
+            "$ref": "#/responses/unprocessableEntityError"
           },
           "500": {
             "$ref": "#/responses/internalServerError"
@@ -4700,70 +5154,49 @@
         }
       }
     },
-    "/datasources/uid/{sourceUID}/correlations": {
-      "get": {
+    "/licensing/token/renew": {
+      "post": {
+        "description": "Manually ask license issuer for a new token. Available in Grafana Enterprise v7.4+.\n\nYou need to have a permission with action `licensing:update`.",
         "tags": [
-          "correlations"
+          "licensing",
+          "enterprise"
         ],
-        "summary": "Gets all correlations originating from the given data source.",
-        "operationId": "getCorrelationsBySourceUID",
+        "summary": "Manually force license refresh.",
+        "operationId": "postRenewLicenseToken",
         "parameters": [
           {
-            "type": "string",
-            "name": "sourceUID",
-            "in": "path",
-            "required": true
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "object"
+            }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getCorrelationsBySourceUIDResponse"
+            "$ref": "#/responses/postRenewLicenseTokenResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
           "404": {
             "$ref": "#/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
           }
         }
-      },
-      "post": {
+      }
+    },
+    "/logout/saml": {
+      "get": {
         "tags": [
-          "correlations"
-        ],
-        "summary": "Add correlation.",
-        "operationId": "createCorrelation",
-        "parameters": [
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/CreateCorrelationCommand"
-            }
-          },
-          {
-            "type": "string",
-            "name": "sourceUID",
-            "in": "path",
-            "required": true
-          }
+          "saml",
+          "enterprise"
         ],
+        "summary": "GetLogout initiates single logout process.",
+        "operationId": "getSAMLLogout",
         "responses": {
-          "200": {
-            "$ref": "#/responses/createCorrelationResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
+          "302": {
+            "description": "(empty)"
           },
           "404": {
             "$ref": "#/responses/notFoundError"
@@ -4774,72 +5207,47 @@
         }
       }
     },
-    "/datasources/uid/{sourceUID}/correlations/{correlationUID}": {
+    "/org": {
       "get": {
         "tags": [
-          "correlations"
-        ],
-        "summary": "Gets a correlation.",
-        "operationId": "getCorrelation",
-        "parameters": [
-          {
-            "type": "string",
-            "name": "sourceUID",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "name": "correlationUID",
-            "in": "path",
-            "required": true
-          }
+          "org"
         ],
+        "summary": "Get current Organization.",
+        "operationId": "getCurrentOrg",
         "responses": {
           "200": {
-            "$ref": "#/responses/getCorrelationResponse"
+            "$ref": "#/responses/getCurrentOrgResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
+          "403": {
+            "$ref": "#/responses/forbiddenError"
           },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       },
-      "patch": {
+      "put": {
         "tags": [
-          "correlations"
+          "org"
         ],
-        "summary": "Updates a correlation.",
-        "operationId": "updateCorrelation",
+        "summary": "Update current Organization.",
+        "operationId": "updateCurrentOrg",
         "parameters": [
-          {
-            "type": "string",
-            "name": "sourceUID",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "name": "correlationUID",
-            "in": "path",
-            "required": true
-          },
           {
             "name": "body",
             "in": "body",
+            "required": true,
             "schema": {
-              "$ref": "#/definitions/UpdateCorrelationCommand"
+              "$ref": "#/definitions/UpdateOrgForm"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/updateCorrelationResponse"
+            "$ref": "#/responses/okResponse"
           },
           "400": {
             "$ref": "#/responses/badRequestError"
@@ -4850,34 +5258,32 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/datasources/uid/{uid}": {
-      "get": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:read` and scopes: `datasources:*`, `datasources:uid:*` and `datasources:uid:kLtEtcRGk` (single data source).",
+    "/org/address": {
+      "put": {
         "tags": [
-          "datasources"
+          "org"
         ],
-        "summary": "Get a single data source by UID.",
-        "operationId": "getDataSourceByUID",
+        "summary": "Update current Organization's address.",
+        "operationId": "updateCurrentOrgAddress",
         "parameters": [
           {
-            "type": "string",
-            "name": "uid",
-            "in": "path",
-            "required": true
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/UpdateOrgAddressForm"
+            }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getDataSourceResponse"
+            "$ref": "#/responses/okResponse"
           },
           "400": {
             "$ref": "#/responses/badRequestError"
@@ -4888,40 +5294,56 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
+          "500": {
+            "$ref": "#/responses/internalServerError"
+          }
+        }
+      }
+    },
+    "/org/invites": {
+      "get": {
+        "tags": [
+          "org_invites"
+        ],
+        "summary": "Get pending invites.",
+        "operationId": "getPendingOrgInvites",
+        "responses": {
+          "200": {
+            "$ref": "#/responses/getPendingOrgInvitesResponse"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
           },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       },
-      "put": {
-        "description": "Similar to creating a data source, `password` and `basicAuthPassword` should be defined under\nsecureJsonData in order to be stored securely as an encrypted blob in the database. Then, the\nencrypted fields are listed under secureJsonFields section in the response.\n\nIf you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:write` and scopes: `datasources:*`, `datasources:uid:*` and `datasources:uid:1` (single data source).",
+      "post": {
         "tags": [
-          "datasources"
+          "org_invites"
         ],
-        "summary": "Update an existing data source.",
-        "operationId": "updateDataSourceByUID",
+        "summary": "Add invite.",
+        "operationId": "addOrgInvite",
         "parameters": [
           {
-            "name": "Body",
+            "name": "body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/UpdateDataSourceCommand"
+              "$ref": "#/definitions/AddInviteForm"
             }
-          },
-          {
-            "type": "string",
-            "name": "uid",
-            "in": "path",
-            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/createOrUpdateDatasourceResponse"
+            "$ref": "#/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -4929,22 +5351,26 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "412": {
+            "$ref": "#/responses/SMTPNotEnabledError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      },
+      }
+    },
+    "/org/invites/{invitation_code}/revoke": {
       "delete": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:delete` and scopes: `datasources:*`, `datasources:uid:*` and `datasources:uid:kLtEtcRGk` (single data source).",
         "tags": [
-          "datasources"
+          "org_invites"
         ],
-        "summary": "Delete an existing data source by UID.",
-        "operationId": "deleteDataSourceByUID",
+        "summary": "Revoke invite.",
+        "operationId": "revokeInvite",
         "parameters": [
           {
             "type": "string",
-            "name": "uid",
+            "name": "invitation_code",
             "in": "path",
             "required": true
           }
@@ -4968,30 +5394,16 @@
         }
       }
     },
-    "/datasources/uid/{uid}/correlations/{correlationUID}": {
-      "delete": {
+    "/org/preferences": {
+      "get": {
         "tags": [
-          "correlations"
-        ],
-        "summary": "Delete a correlation.",
-        "operationId": "deleteCorrelation",
-        "parameters": [
-          {
-            "type": "string",
-            "name": "uid",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "name": "correlationUID",
-            "in": "path",
-            "required": true
-          }
+          "org_preferences"
         ],
+        "summary": "Get Current Org Prefs.",
+        "operationId": "getOrgPreferences",
         "responses": {
           "200": {
-            "$ref": "#/responses/deleteCorrelationResponse"
+            "$ref": "#/responses/getPreferencesResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -4999,28 +5411,25 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/datasources/uid/{uid}/health": {
-      "get": {
+      },
+      "put": {
         "tags": [
-          "datasources"
+          "org_preferences"
         ],
-        "summary": "Sends a health check request to the plugin datasource identified by the UID.",
-        "operationId": "checkDatasourceHealthWithUID",
+        "summary": "Update Current Org Prefs.",
+        "operationId": "updateOrgPreferences",
         "parameters": [
           {
-            "type": "string",
-            "name": "uid",
-            "in": "path",
-            "required": true
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/UpdatePrefsCmd"
+            }
           }
         ],
         "responses": {
@@ -5040,27 +5449,21 @@
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/datasources/uid/{uid}/resources/{datasource_proxy_route}": {
-      "get": {
+      },
+      "patch": {
         "tags": [
-          "datasources"
+          "org_preferences"
         ],
-        "summary": "Fetch data source resources.",
-        "operationId": "callDatasourceResourceWithUID",
+        "summary": "Patch Current Org Prefs.",
+        "operationId": "patchOrgPreferences",
         "parameters": [
           {
-            "type": "string",
-            "name": "datasource_proxy_route",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "name": "uid",
-            "in": "path",
-            "required": true
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/PatchPrefsCmd"
+            }
           }
         ],
         "responses": {
@@ -5076,38 +5479,23 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/datasources/{datasourceId}/disable-permissions": {
-      "post": {
-        "description": "Disables permissions for the data source with the given id. All existing permissions will be removed and anyone will be able to query the data source.\n\nYou need to have a permission with action `datasources.permissions:toggle` and scopes `datasources:*`, `datasources:id:*`, `datasources:id:1` (single data source).\n\nDeprecated: true.",
+    "/org/quotas": {
+      "get": {
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `orgs.quotas:read` and scope `org:id:1` (orgIDScope).",
         "tags": [
-          "datasource_permissions",
-          "enterprise"
-        ],
-        "summary": "Disable permissions for a data source.",
-        "operationId": "disablePermissions",
-        "parameters": [
-          {
-            "type": "string",
-            "name": "datasourceId",
-            "in": "path",
-            "required": true
-          }
+          "getCurrentOrg"
         ],
+        "summary": "Fetch Organization quota.",
+        "operationId": "getCurrentOrgQuota",
         "responses": {
           "200": {
-            "$ref": "#/responses/createOrUpdateDatasourceResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+            "$ref": "#/responses/getQuotaResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -5124,29 +5512,17 @@
         }
       }
     },
-    "/datasources/{datasourceId}/enable-permissions": {
-      "post": {
-        "description": "Enables permissions for the data source with the given id.\nNo one except Org Admins will be able to query the data source until permissions have been added\nwhich permit certain users or teams to query the data source.\n\nYou need to have a permission with action `datasources.permissions:toggle` and scopes `datasources:*`, `datasources:id:*`, `datasources:id:1` (single data source).\n\nDeprecated: true.",
+    "/org/users": {
+      "get": {
+        "description": "Returns all org users within the current organization. Accessible to users with org admin role.\nIf you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:read` with scope `users:*`.",
         "tags": [
-          "datasource_permissions",
-          "enterprise"
-        ],
-        "summary": "Enable permissions for a data source.",
-        "operationId": "enablePermissions",
-        "parameters": [
-          {
-            "type": "string",
-            "name": "datasourceId",
-            "in": "path",
-            "required": true
-          }
+          "org"
         ],
+        "summary": "Get all users within the current organization.",
+        "operationId": "getOrgUsersForCurrentOrg",
         "responses": {
           "200": {
-            "$ref": "#/responses/createOrUpdateDatasourceResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+            "$ref": "#/responses/getOrgUsersForCurrentOrgResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -5154,35 +5530,31 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/datasources/{datasourceId}/permissions": {
-      "get": {
-        "description": "Gets all existing permissions for the data source with the given id.\n\nYou need to have a permission with action `datasources.permissions:read` and scopes `datasources:*`, `datasources:id:*`, `datasources:id:1` (single data source).\n\nDeprecated: true.\nDeprecated. Please use GET /api/access-control/datasources/:uid",
+      },
+      "post": {
+        "description": "Adds a global user to the current organization.\n\nIf you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:add` with scope `users:*`.",
         "tags": [
-          "datasource_permissions",
-          "enterprise"
+          "org"
         ],
-        "summary": "Get permissions for a data source.",
-        "operationId": "getAllPermissions",
+        "summary": "Add a new user to the current organization.",
+        "operationId": "addOrgUserToCurrentOrg",
         "parameters": [
           {
-            "type": "string",
-            "name": "datasourceId",
-            "in": "path",
-            "required": true
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/AddOrgUserCommand"
+            }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getAllPermissionseResponse"
+            "$ref": "#/responses/okResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -5190,56 +5562,36 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      },
-      "post": {
-        "description": "You need to have a permission with action `datasources.permissions:read` and scopes `datasources:*`, `datasources:id:*`, `datasources:id:1` (single data source).\n\nDeprecated: true.\nDeprecated. Please use POST /api/access-control/datasources/:uid/users/:id, /api/access-control/datasources/:uid/teams/:id or /api/access-control/datasources/:uid/buildInRoles/:id",
+      }
+    },
+    "/org/users/lookup": {
+      "get": {
+        "description": "Returns all org users within the current organization, but with less detailed information.\nAccessible to users with org admin role, admin in any folder or admin of any team.\nMainly used by Grafana UI for providing list of users when adding team members and when editing folder/dashboard permissions.",
         "tags": [
-          "datasource_permissions",
-          "enterprise"
+          "org"
         ],
-        "summary": "Add permissions for a data source.",
-        "operationId": "addPermission",
+        "summary": "Get all users within the current organization (lookup)",
+        "operationId": "getOrgUsersForCurrentOrgLookup",
         "parameters": [
-          {
-            "type": "integer",
-            "format": "int64",
-            "name": "userId",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "name": "teamId",
-            "in": "query"
-          },
           {
             "type": "string",
-            "name": "builtinRole",
+            "name": "query",
             "in": "query"
           },
           {
             "type": "integer",
             "format": "int64",
-            "name": "permission",
+            "name": "limit",
             "in": "query"
-          },
-          {
-            "type": "string",
-            "name": "datasourceId",
-            "in": "path",
-            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/addPermissionResponse"
+            "$ref": "#/responses/getOrgUsersForCurrentOrgLookupResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -5247,34 +5599,25 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/datasources/{datasourceId}/permissions/{permissionId}": {
+    "/org/users/{user_id}": {
       "delete": {
-        "description": "Removes the permission with the given permissionId for the data source with the given id.\n\nYou need to have a permission with action `datasources.permissions:delete` and scopes `datasources:*`, `datasources:id:*`, `datasources:id:1` (single data source).\n\nDeprecated: true.\nDeprecated. Please use POST /api/access-control/datasources/:uid/users/:id, /api/access-control/datasources/:uid/teams/:id or /api/access-control/datasources/:uid/buildInRoles/:id",
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:remove` with scope `users:*`.",
         "tags": [
-          "datasource_permissions",
-          "enterprise"
+          "org"
         ],
-        "summary": "Remove permission for a data source.",
-        "operationId": "deletePermissions",
+        "summary": "Delete user in current organization.",
+        "operationId": "removeOrgUserForCurrentOrg",
         "parameters": [
           {
-            "type": "string",
-            "name": "datasourceId",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "name": "permissionId",
+            "type": "integer",
+            "format": "int64",
+            "name": "user_id",
             "in": "path",
             "required": true
           }
@@ -5283,38 +5626,47 @@
           "200": {
             "$ref": "#/responses/okResponse"
           },
+          "400": {
+            "$ref": "#/responses/badRequestError"
+          },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
+          "500": {
+            "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/datasources/{id}": {
-      "get": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:read` and scopes: `datasources:*`, `datasources:id:*` and `datasources:id:1` (single data source).\n\nPlease refer to [updated API](#/datasources/getDataSourceByUID) instead",
+      },
+      "patch": {
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users.role:update` with scope `users:*`.",
         "tags": [
-          "datasources"
+          "org"
         ],
-        "summary": "Get a single data source by Id.",
-        "operationId": "getDataSourceByID",
-        "deprecated": true,
+        "summary": "Updates the given user.",
+        "operationId": "updateOrgUserForCurrentOrg",
         "parameters": [
           {
-            "type": "string",
-            "name": "id",
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/UpdateOrgUserCommand"
+            }
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "user_id",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getDataSourceResponse"
+            "$ref": "#/responses/okResponse"
           },
           "400": {
             "$ref": "#/responses/badRequestError"
@@ -5325,41 +5677,55 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      },
-      "put": {
-        "description": "Similar to creating a data source, `password` and `basicAuthPassword` should be defined under\nsecureJsonData in order to be stored securely as an encrypted blob in the database. Then, the\nencrypted fields are listed under secureJsonFields section in the response.\n\nIf you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:write` and scopes: `datasources:*`, `datasources:id:*` and `datasources:id:1` (single data source).\n\nPlease refer to [updated API](#/datasources/updateDataSourceByUID) instead",
+      }
+    },
+    "/orgs": {
+      "get": {
+        "security": [
+          {
+            "basic": []
+          }
+        ],
         "tags": [
-          "datasources"
+          "orgs"
         ],
-        "summary": "Update an existing data source by its sequential ID.",
-        "operationId": "updateDataSourceByID",
-        "deprecated": true,
-        "parameters": [
+        "summary": "Search all Organizations.",
+        "operationId": "searchOrgs",
+        "parameters": [
           {
-            "name": "Body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/UpdateDataSourceCommand"
-            }
+            "type": "integer",
+            "format": "int64",
+            "default": 1,
+            "name": "page",
+            "in": "query"
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "default": 1000,
+            "description": "Number of items per page\nThe totalCount field in the response can be used for pagination list E.g. if totalCount is equal to 100 teams and the perpage parameter is set to 10 then there are 10 pages of teams.",
+            "name": "perpage",
+            "in": "query"
           },
           {
             "type": "string",
-            "name": "id",
-            "in": "path",
-            "required": true
+            "name": "name",
+            "in": "query"
+          },
+          {
+            "type": "string",
+            "description": "If set it will return results where the query value is contained in the name field. Query values with spaces need to be URL encoded.",
+            "name": "query",
+            "in": "query"
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/createOrUpdateDatasourceResponse"
+            "$ref": "#/responses/searchOrgsResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -5367,30 +5733,34 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "409": {
+            "$ref": "#/responses/conflictError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       },
-      "delete": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:delete` and scopes: `datasources:*`, `datasources:id:*` and `datasources:id:1` (single data source).\n\nPlease refer to [updated API](#/datasources/deleteDataSourceByUID) instead",
+      "post": {
+        "description": "Only works if [users.allow_org_create](https://grafana.com/docs/grafana/latest/administration/configuration/#allow_org_create) is set.",
         "tags": [
-          "datasources"
+          "orgs"
         ],
-        "summary": "Delete an existing data source by id.",
-        "operationId": "deleteDataSourceByID",
-        "deprecated": true,
+        "summary": "Create Organization.",
+        "operationId": "createOrg",
         "parameters": [
           {
-            "type": "string",
-            "name": "id",
-            "in": "path",
-            "required": true
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/CreateOrgCommand"
+            }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
+            "$ref": "#/responses/createOrgResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -5398,8 +5768,8 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
+          "409": {
+            "$ref": "#/responses/conflictError"
           },
           "500": {
             "$ref": "#/responses/internalServerError"
@@ -5407,29 +5777,29 @@
         }
       }
     },
-    "/datasources/{id}/health": {
+    "/orgs/name/{org_name}": {
       "get": {
-        "description": "Please refer to [updated API](#/datasources/checkDatasourceHealthWithUID) instead",
+        "security": [
+          {
+            "basic": []
+          }
+        ],
         "tags": [
-          "datasources"
+          "orgs"
         ],
-        "summary": "Sends a health check request to the plugin datasource identified by the ID.",
-        "operationId": "checkDatasourceHealthByID",
-        "deprecated": true,
+        "summary": "Get Organization by ID.",
+        "operationId": "getOrgByName",
         "parameters": [
           {
             "type": "string",
-            "name": "id",
+            "name": "org_name",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+            "$ref": "#/responses/getOrgByNameResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -5443,35 +5813,30 @@
         }
       }
     },
-    "/datasources/{id}/resources/{datasource_proxy_route}": {
+    "/orgs/{org_id}": {
       "get": {
-        "description": "Please refer to [updated API](#/datasources/callDatasourceResourceWithUID) instead",
+        "security": [
+          {
+            "basic": []
+          }
+        ],
         "tags": [
-          "datasources"
+          "orgs"
         ],
-        "summary": "Fetch data source resources by Id.",
-        "operationId": "callDatasourceResourceByID",
-        "deprecated": true,
+        "summary": "Get Organization by ID.",
+        "operationId": "getOrgByID",
         "parameters": [
           {
-            "type": "string",
-            "name": "datasource_proxy_route",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "name": "id",
+            "type": "integer",
+            "format": "int64",
+            "name": "org_id",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+            "$ref": "#/responses/getOrgByIDResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -5479,39 +5844,42 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/ds/query": {
-      "post": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:query`.",
+      },
+      "put": {
+        "security": [
+          {
+            "basic": []
+          }
+        ],
         "tags": [
-          "ds"
+          "orgs"
         ],
-        "summary": "DataSource query metrics with expressions.",
-        "operationId": "queryMetricsWithExpressions",
+        "summary": "Update Organization.",
+        "operationId": "updateOrg",
         "parameters": [
           {
             "name": "body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/MetricRequest"
+              "$ref": "#/definitions/UpdateOrgForm"
             }
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "org_id",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/queryMetricsWithExpressionsRespons"
-          },
-          "207": {
-            "$ref": "#/responses/queryMetricsWithExpressionsRespons"
+            "$ref": "#/responses/okResponse"
           },
           "400": {
             "$ref": "#/responses/badRequestError"
@@ -5526,43 +5894,33 @@
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/folders": {
-      "get": {
-        "description": "Returns all folders that the authenticated user has permission to view.\nIf nested folders are enabled, it expects an additional query parameter with the parent folder UID\nand returns the immediate subfolders that the authenticated user has permission to view.\nIf the parameter is not supplied then it returns immediate subfolders under the root\nthat the authenticated user has permission to view.",
+      },
+      "delete": {
+        "security": [
+          {
+            "basic": []
+          }
+        ],
         "tags": [
-          "folders"
+          "orgs"
         ],
-        "summary": "Get all folders.",
-        "operationId": "getFolders",
+        "summary": "Delete Organization.",
+        "operationId": "deleteOrgByID",
         "parameters": [
           {
             "type": "integer",
             "format": "int64",
-            "default": 1000,
-            "description": "Limit the maximum number of folders to return",
-            "name": "limit",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "default": 1,
-            "description": "Page index for starting fetching folders",
-            "name": "page",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "description": "The parent folder UID",
-            "name": "parentUid",
-            "in": "query"
+            "name": "org_id",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getFoldersResponse"
+            "$ref": "#/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -5570,31 +5928,42 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      },
-      "post": {
-        "description": "If nested folders are enabled then it additionally expects the parent folder UID.",
+      }
+    },
+    "/orgs/{org_id}/address": {
+      "put": {
         "tags": [
-          "folders"
+          "orgs"
         ],
-        "summary": "Create folder.",
-        "operationId": "createFolder",
+        "summary": "Update Organization's address.",
+        "operationId": "updateOrgAddress",
         "parameters": [
           {
             "name": "body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/CreateFolderCommand"
+              "$ref": "#/definitions/UpdateOrgAddressForm"
             }
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "org_id",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/folderResponse"
+            "$ref": "#/responses/okResponse"
           },
           "400": {
             "$ref": "#/responses/badRequestError"
@@ -5605,36 +5974,32 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "409": {
-            "$ref": "#/responses/conflictError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/folders/id/{folder_id}": {
+    "/orgs/{org_id}/quotas": {
       "get": {
-        "description": "Returns the folder identified by id. This is deprecated.\nPlease refer to [updated API](#/folders/getFolderByUID) instead",
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `orgs.quotas:read` and scope `org:id:1` (orgIDScope).",
         "tags": [
-          "folders"
+          "orgs"
         ],
-        "summary": "Get folder by id.",
-        "operationId": "getFolderByID",
-        "deprecated": true,
+        "summary": "Fetch Organization quota.",
+        "operationId": "getOrgQuota",
         "parameters": [
           {
             "type": "integer",
             "format": "int64",
-            "name": "folder_id",
+            "name": "org_id",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/folderResponse"
+            "$ref": "#/responses/getQuotaResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -5651,24 +6016,45 @@
         }
       }
     },
-    "/folders/{folder_uid}": {
-      "get": {
+    "/orgs/{org_id}/quotas/{quota_target}": {
+      "put": {
+        "security": [
+          {
+            "basic": []
+          }
+        ],
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `orgs.quotas:write` and scope `org:id:1` (orgIDScope).",
         "tags": [
-          "folders"
+          "orgs"
         ],
-        "summary": "Get folder by uid.",
-        "operationId": "getFolderByUID",
-        "parameters": [
+        "summary": "Update user quota.",
+        "operationId": "updateOrgQuota",
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/UpdateQuotaCmd"
+            }
+          },
           {
             "type": "string",
-            "name": "folder_uid",
+            "name": "quota_target",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "org_id",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/folderResponse"
+            "$ref": "#/responses/okResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -5683,36 +6069,33 @@
             "$ref": "#/responses/internalServerError"
           }
         }
-      },
-      "put": {
+      }
+    },
+    "/orgs/{org_id}/users": {
+      "get": {
+        "security": [
+          {
+            "basic": []
+          }
+        ],
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:read` with scope `users:*`.",
         "tags": [
-          "folders"
+          "orgs"
         ],
-        "summary": "Update folder.",
-        "operationId": "updateFolder",
+        "summary": "Get Users in Organization.",
+        "operationId": "getOrgUsers",
         "parameters": [
           {
-            "type": "string",
-            "name": "folder_uid",
+            "type": "integer",
+            "format": "int64",
+            "name": "org_id",
             "in": "path",
             "required": true
-          },
-          {
-            "description": "To change the unique identifier (uid), provide another one.\nTo overwrite an existing folder with newer version, set `overwrite` to `true`.\nProvide the current version to safelly update the folder: if the provided version differs from the stored one the request will fail, unless `overwrite` is `true`.",
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/UpdateFolderCommand"
-            }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/folderResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+            "$ref": "#/responses/getOrgUsersResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -5720,45 +6103,38 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
-          "409": {
-            "$ref": "#/responses/conflictError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       },
-      "delete": {
-        "description": "Deletes an existing folder identified by UID along with all dashboards (and their alerts) stored in the folder. This operation cannot be reverted.\nIf nested folders are enabled then it also deletes all the subfolders.",
+      "post": {
+        "description": "Adds a global user to the current organization.\n\nIf you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:add` with scope `users:*`.",
         "tags": [
-          "folders"
+          "orgs"
         ],
-        "summary": "Delete folder.",
-        "operationId": "deleteFolder",
+        "summary": "Add a new user to the current organization.",
+        "operationId": "addOrgUser",
         "parameters": [
           {
-            "type": "string",
-            "name": "folder_uid",
-            "in": "path",
-            "required": true
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/AddOrgUserCommand"
+            }
           },
           {
-            "type": "boolean",
-            "default": false,
-            "description": "If `true` any Grafana 8 Alerts under this folder will be deleted.\nSet to `false` so that the request will fail if the folder contains any Grafana 8 Alerts.",
-            "name": "forceDeleteRules",
-            "in": "query"
+            "type": "integer",
+            "format": "int64",
+            "name": "org_id",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/deleteFolderResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+            "$ref": "#/responses/okResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -5766,33 +6142,37 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/folders/{folder_uid}/counts": {
+    "/orgs/{org_id}/users/search": {
       "get": {
+        "security": [
+          {
+            "basic": []
+          }
+        ],
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:read` with scope `users:*`.",
         "tags": [
-          "folders"
+          "orgs"
         ],
-        "summary": "Gets the count of each descendant of a folder by kind. The folder is identified by UID.",
-        "operationId": "getFolderDescendantCounts",
+        "summary": "Search Users in Organization.",
+        "operationId": "searchOrgUsers",
         "parameters": [
           {
-            "type": "string",
-            "name": "folder_uid",
+            "type": "integer",
+            "format": "int64",
+            "name": "org_id",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getFolderDescendantCountsResponse"
+            "$ref": "#/responses/searchOrgUsersResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -5800,41 +6180,42 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/folders/{folder_uid}/move": {
-      "post": {
+    "/orgs/{org_id}/users/{user_id}": {
+      "delete": {
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:remove` with scope `users:*`.",
         "tags": [
-          "folders"
+          "orgs"
         ],
-        "summary": "Move folder.",
-        "operationId": "moveFolder",
+        "summary": "Delete user in current organization.",
+        "operationId": "removeOrgUser",
         "parameters": [
           {
-            "type": "string",
-            "name": "folder_uid",
+            "type": "integer",
+            "format": "int64",
+            "name": "org_id",
             "in": "path",
             "required": true
           },
           {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/MoveFolderCommand"
-            }
+            "type": "integer",
+            "format": "int64",
+            "name": "user_id",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/folderResponse"
+            "$ref": "#/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -5842,33 +6223,48 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/folders/{folder_uid}/permissions": {
-      "get": {
+      },
+      "patch": {
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users.role:update` with scope `users:*`.",
         "tags": [
-          "folder_permissions"
+          "orgs"
         ],
-        "summary": "Gets all existing permissions for the folder with the given `uid`.",
-        "operationId": "getFolderPermissionList",
+        "summary": "Update Users in Organization.",
+        "operationId": "updateOrgUser",
         "parameters": [
           {
-            "type": "string",
-            "name": "folder_uid",
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/UpdateOrgUserCommand"
+            }
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "org_id",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "user_id",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getFolderPermissionListResponse"
+            "$ref": "#/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -5876,39 +6272,61 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      },
-      "post": {
+      }
+    },
+    "/playlists": {
+      "get": {
         "tags": [
-          "folder_permissions"
+          "playlists"
         ],
-        "summary": "Updates permissions for a folder. This operation will remove existing permissions if they’re not included in the request.",
-        "operationId": "updateFolderPermissions",
+        "summary": "Get playlists.",
+        "operationId": "searchPlaylists",
         "parameters": [
           {
             "type": "string",
-            "name": "folder_uid",
-            "in": "path",
-            "required": true
+            "name": "query",
+            "in": "query"
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "description": "in:limit",
+            "name": "limit",
+            "in": "query"
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/searchPlaylistsResponse"
           },
+          "500": {
+            "$ref": "#/responses/internalServerError"
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "playlists"
+        ],
+        "summary": "Create playlist.",
+        "operationId": "createPlaylist",
+        "parameters": [
           {
             "name": "Body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/UpdateDashboardACLCommand"
+              "$ref": "#/definitions/CreatePlaylistCommand"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
+            "$ref": "#/responses/createPlaylistResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -5925,112 +6343,64 @@
         }
       }
     },
-    "/library-elements": {
+    "/playlists/{uid}": {
       "get": {
-        "description": "Returns a list of all library elements the authenticated user has permission to view.\nUse the `perPage` query parameter to control the maximum number of library elements returned; the default limit is `100`.\nYou can also use the `page` query parameter to fetch library elements from any page other than the first one.",
         "tags": [
-          "library_elements"
+          "playlists"
         ],
-        "summary": "Get all library elements.",
-        "operationId": "getLibraryElements",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "Part of the name or description searched for.",
-            "name": "searchString",
-            "in": "query"
-          },
-          {
-            "enum": [
-              1,
-              2
-            ],
-            "type": "integer",
-            "format": "int64",
-            "description": "Kind of element to search for.",
-            "name": "kind",
-            "in": "query"
-          },
-          {
-            "enum": [
-              "alpha-asc",
-              "alpha-desc"
-            ],
-            "type": "string",
-            "description": "Sort order of elements.",
-            "name": "sortDirection",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "description": "A comma separated list of types to filter the elements by",
-            "name": "typeFilter",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "description": "Element UID to exclude from search results.",
-            "name": "excludeUid",
-            "in": "query"
-          },
+        "summary": "Get playlist.",
+        "operationId": "getPlaylist",
+        "parameters": [
           {
             "type": "string",
-            "description": "A comma separated list of folder ID(s) to filter the elements by.",
-            "name": "folderFilter",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "default": 100,
-            "description": "The number of results per page.",
-            "name": "perPage",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "default": 1,
-            "description": "The page for a set of records, given that only perPage records are returned at a time. Numbering starts at 1.",
-            "name": "page",
-            "in": "query"
+            "name": "uid",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getLibraryElementsResponse"
+            "$ref": "#/responses/getPlaylistResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       },
-      "post": {
-        "description": "Creates a new library element.",
+      "put": {
         "tags": [
-          "library_elements"
+          "playlists"
         ],
-        "summary": "Create library element.",
-        "operationId": "createLibraryElement",
+        "summary": "Update playlist.",
+        "operationId": "updatePlaylist",
         "parameters": [
           {
-            "name": "body",
+            "name": "Body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/CreateLibraryElementCommand"
+              "$ref": "#/definitions/UpdatePlaylistCommand"
             }
+          },
+          {
+            "type": "string",
+            "name": "uid",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getLibraryElementResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+            "$ref": "#/responses/updatePlaylistResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -6045,31 +6415,31 @@
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/library-elements/name/{library_element_name}": {
-      "get": {
-        "description": "Returns a library element with the given name.",
+      },
+      "delete": {
         "tags": [
-          "library_elements"
+          "playlists"
         ],
-        "summary": "Get library element by name.",
-        "operationId": "getLibraryElementByName",
+        "summary": "Delete playlist.",
+        "operationId": "deletePlaylist",
         "parameters": [
           {
             "type": "string",
-            "name": "library_element_name",
+            "name": "uid",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getLibraryElementResponse"
+            "$ref": "#/responses/okResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
           "404": {
             "$ref": "#/responses/notFoundError"
           },
@@ -6079,25 +6449,24 @@
         }
       }
     },
-    "/library-elements/{library_element_uid}": {
+    "/playlists/{uid}/items": {
       "get": {
-        "description": "Returns a library element with the given UID.",
         "tags": [
-          "library_elements"
+          "playlists"
         ],
-        "summary": "Get library element by UID.",
-        "operationId": "getLibraryElementByUID",
+        "summary": "Get playlist items.",
+        "operationId": "getPlaylistItems",
         "parameters": [
           {
             "type": "string",
-            "name": "library_element_uid",
+            "name": "uid",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getLibraryElementResponse"
+            "$ref": "#/responses/getPlaylistItemsResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -6112,264 +6481,229 @@
             "$ref": "#/responses/internalServerError"
           }
         }
-      },
-      "delete": {
-        "description": "Deletes an existing library element as specified by the UID. This operation cannot be reverted.\nYou cannot delete a library element that is connected. This operation cannot be reverted.",
+      }
+    },
+    "/public/dashboards/{accessToken}": {
+      "get": {
+        "description": "Get public dashboard for view",
         "tags": [
-          "library_elements"
+          "dashboard_public"
         ],
-        "summary": "Delete library element.",
-        "operationId": "deleteLibraryElementByUID",
+        "operationId": "viewPublicDashboard",
         "parameters": [
           {
             "type": "string",
-            "name": "library_element_uid",
+            "name": "accessToken",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
+            "$ref": "#/responses/viewPublicDashboardResponse"
           },
           "400": {
-            "$ref": "#/responses/badRequestError"
+            "$ref": "#/responses/badRequestPublicError"
           },
           "401": {
-            "$ref": "#/responses/unauthorisedError"
+            "$ref": "#/responses/unauthorisedPublicError"
           },
           "403": {
-            "$ref": "#/responses/forbiddenError"
+            "$ref": "#/responses/forbiddenPublicError"
           },
           "404": {
-            "$ref": "#/responses/notFoundError"
+            "$ref": "#/responses/notFoundPublicError"
           },
           "500": {
-            "$ref": "#/responses/internalServerError"
+            "$ref": "#/responses/internalServerPublicError"
           }
         }
-      },
-      "patch": {
-        "description": "Updates an existing library element identified by uid.",
+      }
+    },
+    "/public/dashboards/{accessToken}/annotations": {
+      "get": {
+        "description": "Get annotations for a public dashboard",
         "tags": [
-          "library_elements"
+          "dashboard_public"
         ],
-        "summary": "Update library element.",
-        "operationId": "updateLibraryElement",
+        "operationId": "getPublicAnnotations",
         "parameters": [
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/PatchLibraryElementCommand"
-            }
-          },
           {
             "type": "string",
-            "name": "library_element_uid",
+            "name": "accessToken",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getLibraryElementResponse"
+            "$ref": "#/responses/getPublicAnnotationsResponse"
           },
           "400": {
-            "$ref": "#/responses/badRequestError"
+            "$ref": "#/responses/badRequestPublicError"
           },
           "401": {
-            "$ref": "#/responses/unauthorisedError"
+            "$ref": "#/responses/unauthorisedPublicError"
           },
           "403": {
-            "$ref": "#/responses/forbiddenError"
+            "$ref": "#/responses/forbiddenPublicError"
           },
           "404": {
-            "$ref": "#/responses/notFoundError"
-          },
-          "412": {
-            "$ref": "#/responses/preconditionFailedError"
+            "$ref": "#/responses/notFoundPublicError"
           },
           "500": {
-            "$ref": "#/responses/internalServerError"
+            "$ref": "#/responses/internalServerPublicError"
           }
         }
       }
     },
-    "/library-elements/{library_element_uid}/connections/": {
-      "get": {
-        "description": "Returns a list of connections for a library element based on the UID specified.",
+    "/public/dashboards/{accessToken}/panels/{panelId}/query": {
+      "post": {
+        "description": "Get results for a given panel on a public dashboard",
         "tags": [
-          "library_elements"
+          "dashboard_public"
         ],
-        "summary": "Get library element connections.",
-        "operationId": "getLibraryElementConnections",
+        "operationId": "queryPublicDashboard",
         "parameters": [
           {
             "type": "string",
-            "name": "library_element_uid",
+            "name": "accessToken",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "panelId",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getLibraryElementConnectionsResponse"
+            "$ref": "#/responses/queryPublicDashboardResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestPublicError"
           },
           "401": {
-            "$ref": "#/responses/unauthorisedError"
+            "$ref": "#/responses/unauthorisedPublicError"
           },
           "403": {
-            "$ref": "#/responses/forbiddenError"
+            "$ref": "#/responses/forbiddenPublicError"
           },
           "404": {
-            "$ref": "#/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
-          }
-        }
-      }
-    },
-    "/licensing/check": {
-      "get": {
-        "tags": [
-          "licensing",
-          "enterprise"
-        ],
-        "summary": "Check license availability.",
-        "operationId": "getStatus",
-        "responses": {
-          "200": {
-            "$ref": "#/responses/getStatusResponse"
-          }
-        }
-      }
-    },
-    "/licensing/custom-permissions": {
-      "get": {
-        "description": "You need to have a permission with action `licensing.reports:read`.",
-        "tags": [
-          "licensing",
-          "enterprise"
-        ],
-        "summary": "Get custom permissions report.",
-        "operationId": "getCustomPermissionsReport",
-        "responses": {
-          "200": {
-            "$ref": "#/responses/getCustomPermissionsReportResponse"
+            "$ref": "#/responses/notFoundPublicError"
           },
           "500": {
-            "$ref": "#/responses/internalServerError"
+            "$ref": "#/responses/internalServerPublicError"
           }
         }
       }
     },
-    "/licensing/custom-permissions-csv": {
+    "/query-history": {
       "get": {
-        "description": "You need to have a permission with action `licensing.reports:read`.",
-        "produces": [
-          "text/csv"
-        ],
+        "description": "Returns a list of queries in the query history that matches the search criteria.\nQuery history search supports pagination. Use the `limit` parameter to control the maximum number of queries returned; the default limit is 100.\nYou can also use the `page` query parameter to fetch queries from any page other than the first one.",
         "tags": [
-          "licensing",
-          "enterprise"
+          "query_history"
         ],
-        "summary": "Get custom permissions report in CSV format.",
-        "operationId": "getCustomPermissionsCSV",
-        "responses": {
-          "200": {
-            "$ref": "#/responses/getCustomPermissionsReportResponse"
+        "summary": "Query history search.",
+        "operationId": "searchQueries",
+        "parameters": [
+          {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "collectionFormat": "multi",
+            "description": "List of data source UIDs to search for",
+            "name": "datasourceUid",
+            "in": "query"
           },
-          "500": {
-            "$ref": "#/responses/internalServerError"
-          }
-        }
-      }
-    },
-    "/licensing/refresh-stats": {
-      "get": {
-        "description": "You need to have a permission with action `licensing:read`.",
-        "tags": [
-          "licensing",
-          "enterprise"
+          {
+            "type": "string",
+            "description": "Text inside query or comments that is searched for",
+            "name": "searchString",
+            "in": "query"
+          },
+          {
+            "type": "boolean",
+            "description": "Flag indicating if only starred queries should be returned",
+            "name": "onlyStarred",
+            "in": "query"
+          },
+          {
+            "enum": [
+              "time-desc",
+              "time-asc"
+            ],
+            "type": "string",
+            "default": "time-desc",
+            "description": "Sort method",
+            "name": "sort",
+            "in": "query"
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "description": "Use this parameter to access hits beyond limit. Numbering starts at 1. limit param acts as page size.",
+            "name": "page",
+            "in": "query"
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "description": "Limit the number of returned results",
+            "name": "limit",
+            "in": "query"
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "description": "From range for the query history search",
+            "name": "from",
+            "in": "query"
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "description": "To range for the query history search",
+            "name": "to",
+            "in": "query"
+          }
         ],
-        "summary": "Refresh license stats.",
-        "operationId": "refreshLicenseStats",
         "responses": {
           "200": {
-            "$ref": "#/responses/refreshLicenseStatsResponse"
+            "$ref": "#/responses/getQueryHistorySearchResponse"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
           },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/licensing/token": {
-      "get": {
-        "description": "You need to have a permission with action `licensing:read`.",
-        "tags": [
-          "licensing",
-          "enterprise"
-        ],
-        "summary": "Get license token.",
-        "operationId": "getLicenseToken",
-        "responses": {
-          "200": {
-            "$ref": "#/responses/getLicenseTokenResponse"
-          }
-        }
       },
       "post": {
-        "description": "You need to have a permission with action `licensing:update`.",
+        "description": "Adds new query to query history.",
         "tags": [
-          "licensing",
-          "enterprise"
+          "query_history"
         ],
-        "summary": "Create license token.",
-        "operationId": "postLicenseToken",
+        "summary": "Add query to query history.",
+        "operationId": "createQuery",
         "parameters": [
           {
             "name": "body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/DeleteTokenCommand"
+              "$ref": "#/definitions/CreateQueryInQueryHistoryCommand"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getLicenseTokenResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
-          }
-        }
-      },
-      "delete": {
-        "description": "Removes the license stored in the Grafana database. Available in Grafana Enterprise v7.4+.\n\nYou need to have a permission with action `licensing:delete`.",
-        "tags": [
-          "licensing",
-          "enterprise"
-        ],
-        "summary": "Remove license from database.",
-        "operationId": "deleteLicenseToken",
-        "parameters": [
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/DeleteTokenCommand"
-            }
-          }
-        ],
-        "responses": {
-          "202": {
-            "$ref": "#/responses/acceptedResponse"
+            "$ref": "#/responses/getQueryHistoryResponse"
           },
           "400": {
             "$ref": "#/responses/badRequestError"
@@ -6377,148 +6711,122 @@
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "422": {
-            "$ref": "#/responses/unprocessableEntityError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/licensing/token/renew": {
+    "/query-history/star/{query_history_uid}": {
       "post": {
-        "description": "Manually ask license issuer for a new token. Available in Grafana Enterprise v7.4+.\n\nYou need to have a permission with action `licensing:update`.",
+        "description": "Adds star to query in query history as specified by the UID.",
         "tags": [
-          "licensing",
-          "enterprise"
+          "query_history"
         ],
-        "summary": "Manually force license refresh.",
-        "operationId": "postRenewLicenseToken",
+        "summary": "Add star to query in query history.",
+        "operationId": "starQuery",
         "parameters": [
           {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object"
-            }
+            "type": "string",
+            "name": "query_history_uid",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/postRenewLicenseTokenResponse"
+            "$ref": "#/responses/getQueryHistoryResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          }
-        }
-      }
-    },
-    "/logout/saml": {
-      "get": {
-        "tags": [
-          "saml",
-          "enterprise"
-        ],
-        "summary": "GetLogout initiates single logout process.",
-        "operationId": "getSAMLLogout",
-        "responses": {
-          "302": {
-            "description": "(empty)"
-          },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/org": {
-      "get": {
+      },
+      "delete": {
+        "description": "Removes star from query in query history as specified by the UID.",
         "tags": [
-          "org"
+          "query_history"
+        ],
+        "summary": "Remove star to query in query history.",
+        "operationId": "unstarQuery",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "query_history_uid",
+            "in": "path",
+            "required": true
+          }
         ],
-        "summary": "Get current Organization.",
-        "operationId": "getCurrentOrg",
         "responses": {
           "200": {
-            "$ref": "#/responses/getCurrentOrgResponse"
+            "$ref": "#/responses/getQueryHistoryResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      },
-      "put": {
+      }
+    },
+    "/query-history/{query_history_uid}": {
+      "delete": {
+        "description": "Deletes an existing query in query history as specified by the UID. This operation cannot be reverted.",
         "tags": [
-          "org"
+          "query_history"
         ],
-        "summary": "Update current Organization.",
-        "operationId": "updateCurrentOrg",
+        "summary": "Delete query in query history.",
+        "operationId": "deleteQuery",
         "parameters": [
           {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/UpdateOrgForm"
-            }
+            "type": "string",
+            "name": "query_history_uid",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+            "$ref": "#/responses/getQueryHistoryDeleteQueryResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/org/address": {
-      "put": {
+      },
+      "patch": {
+        "description": "Updates comment for query in query history as specified by the UID.",
         "tags": [
-          "org"
+          "query_history"
         ],
-        "summary": "Update current Organization's address.",
-        "operationId": "updateCurrentOrgAddress",
+        "summary": "Update comment for query in query history.",
+        "operationId": "patchQueryComment",
         "parameters": [
+          {
+            "type": "string",
+            "name": "query_history_uid",
+            "in": "path",
+            "required": true
+          },
           {
             "name": "body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/UpdateOrgAddressForm"
+              "$ref": "#/definitions/PatchQueryCommentInQueryHistoryCommand"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
+            "$ref": "#/responses/getQueryHistoryResponse"
           },
           "400": {
             "$ref": "#/responses/badRequestError"
@@ -6526,25 +6834,23 @@
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/org/invites": {
+    "/recording-rules": {
       "get": {
         "tags": [
-          "org_invites"
+          "recording_rules",
+          "enterprise"
         ],
-        "summary": "Get pending invites.",
-        "operationId": "getPendingOrgInvites",
+        "summary": "Lists all rules in the database: active or deleted.",
+        "operationId": "listRecordingRules",
         "responses": {
           "200": {
-            "$ref": "#/responses/getPendingOrgInvitesResponse"
+            "$ref": "#/responses/listRecordingRulesResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -6552,33 +6858,69 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       },
-      "post": {
+      "put": {
         "tags": [
-          "org_invites"
+          "recording_rules",
+          "enterprise"
         ],
-        "summary": "Add invite.",
-        "operationId": "addOrgInvite",
+        "summary": "Update the active status of a rule.",
+        "operationId": "updateRecordingRule",
         "parameters": [
           {
             "name": "body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/AddInviteForm"
+              "$ref": "#/definitions/RecordingRuleJSON"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
+            "$ref": "#/responses/recordingRuleResponse"
           },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "recording_rules",
+          "enterprise"
+        ],
+        "summary": "Create a recording rule that is then registered and started.",
+        "operationId": "createRecordingRule",
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/RecordingRuleJSON"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/recordingRuleResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -6586,8 +6928,8 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "412": {
-            "$ref": "#/responses/SMTPNotEnabledError"
+          "404": {
+            "$ref": "#/responses/notFoundError"
           },
           "500": {
             "$ref": "#/responses/internalServerError"
@@ -6595,19 +6937,22 @@
         }
       }
     },
-    "/org/invites/{invitation_code}/revoke": {
-      "delete": {
+    "/recording-rules/test": {
+      "post": {
         "tags": [
-          "org_invites"
+          "recording_rules",
+          "enterprise"
         ],
-        "summary": "Revoke invite.",
-        "operationId": "revokeInvite",
+        "summary": "Test a recording rule.",
+        "operationId": "testCreateRecordingRule",
         "parameters": [
           {
-            "type": "string",
-            "name": "invitation_code",
-            "in": "path",
-            "required": true
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/RecordingRuleJSON"
+            }
           }
         ],
         "responses": {
@@ -6623,22 +6968,26 @@
           "404": {
             "$ref": "#/responses/notFoundError"
           },
+          "422": {
+            "$ref": "#/responses/unprocessableEntityError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/org/preferences": {
+    "/recording-rules/writer": {
       "get": {
         "tags": [
-          "org_preferences"
+          "recording_rules",
+          "enterprise"
         ],
-        "summary": "Get Current Org Prefs.",
-        "operationId": "getOrgPreferences",
+        "summary": "Return the prometheus remote write target.",
+        "operationId": "getRecordingRuleWriteTarget",
         "responses": {
           "200": {
-            "$ref": "#/responses/getPreferencesResponse"
+            "$ref": "#/responses/recordingRuleWriteTargetResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -6646,33 +6995,35 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       },
-      "put": {
+      "post": {
+        "description": "It returns a 422 if there is not an existing prometheus data source configured.",
         "tags": [
-          "org_preferences"
+          "recording_rules",
+          "enterprise"
         ],
-        "summary": "Update Current Org Prefs.",
-        "operationId": "updateOrgPreferences",
+        "summary": "Create a remote write target.",
+        "operationId": "createRecordingRuleWriteTarget",
         "parameters": [
           {
             "name": "body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/UpdatePrefsCmd"
+              "$ref": "#/definitions/PrometheusRemoteWriteTargetJSON"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+            "$ref": "#/responses/recordingRuleWriteTargetResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -6680,57 +7031,63 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
+          "422": {
+            "$ref": "#/responses/unprocessableEntityError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       },
-      "patch": {
+      "delete": {
         "tags": [
-          "org_preferences"
-        ],
-        "summary": "Patch Current Org Prefs.",
-        "operationId": "patchOrgPreferences",
-        "parameters": [
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/PatchPrefsCmd"
-            }
-          }
+          "recording_rules",
+          "enterprise"
         ],
+        "summary": "Delete the remote write target.",
+        "operationId": "deleteRecordingRuleWriteTarget",
         "responses": {
           "200": {
             "$ref": "#/responses/okResponse"
           },
-          "400": {
-            "$ref": "#/responses/badRequestError"
-          },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/org/quotas": {
-      "get": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `orgs.quotas:read` and scope `org:id:1` (orgIDScope).",
+    "/recording-rules/{recordingRuleID}": {
+      "delete": {
         "tags": [
-          "getCurrentOrg"
+          "recording_rules",
+          "enterprise"
+        ],
+        "summary": "Delete removes the rule from the registry and stops it.",
+        "operationId": "deleteRecordingRule",
+        "parameters": [
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "recordingRuleID",
+            "in": "path",
+            "required": true
+          }
         ],
-        "summary": "Fetch Organization quota.",
-        "operationId": "getCurrentOrgQuota",
         "responses": {
           "200": {
-            "$ref": "#/responses/getQuotaResponse"
+            "$ref": "#/responses/okResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -6747,17 +7104,18 @@
         }
       }
     },
-    "/org/users": {
+    "/reports": {
       "get": {
-        "description": "Returns all org users within the current organization. Accessible to users with org admin role.\nIf you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:read` with scope `users:*`.",
+        "description": "Available to org admins only and with a valid or expired license.\n\nYou need to have a permission with action `reports:read` with scope `reports:*`.",
         "tags": [
-          "org"
+          "reports",
+          "enterprise"
         ],
-        "summary": "Get all users within the current organization.",
-        "operationId": "getOrgUsersForCurrentOrg",
+        "summary": "List reports.",
+        "operationId": "getReports",
         "responses": {
           "200": {
-            "$ref": "#/responses/getOrgUsersForCurrentOrgResponse"
+            "$ref": "#/responses/getReportsResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -6771,25 +7129,29 @@
         }
       },
       "post": {
-        "description": "Adds a global user to the current organization.\n\nIf you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:add` with scope `users:*`.",
+        "description": "Available to org admins only and with a valid license.\n\nYou need to have a permission with action `reports.admin:create`.",
         "tags": [
-          "org"
+          "reports",
+          "enterprise"
         ],
-        "summary": "Add a new user to the current organization.",
-        "operationId": "addOrgUserToCurrentOrg",
+        "summary": "Create a report.",
+        "operationId": "createReport",
         "parameters": [
           {
             "name": "body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/AddOrgUserCommand"
+              "$ref": "#/definitions/CreateOrUpdateReportConfig"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
+            "$ref": "#/responses/createReportResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -6797,36 +7159,40 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/org/users/lookup": {
-      "get": {
-        "description": "Returns all org users within the current organization, but with less detailed information.\nAccessible to users with org admin role, admin in any folder or admin of any team.\nMainly used by Grafana UI for providing list of users when adding team members and when editing folder/dashboard permissions.",
+    "/reports/email": {
+      "post": {
+        "description": "Generate and send a report. This API waits for the report to be generated before returning. We recommend that you set the client’s timeout to at least 60 seconds. Available to org admins only and with a valid license.\n\nOnly available in Grafana Enterprise v7.0+.\nThis API endpoint is experimental and may be deprecated in a future release. On deprecation, a migration strategy will be provided and the endpoint will remain functional until the next major release of Grafana.\n\nYou need to have a permission with action `reports:send`.",
         "tags": [
-          "org"
+          "reports",
+          "enterprise"
         ],
-        "summary": "Get all users within the current organization (lookup)",
-        "operationId": "getOrgUsersForCurrentOrgLookup",
+        "summary": "Send a report.",
+        "operationId": "sendReport",
         "parameters": [
           {
-            "type": "string",
-            "name": "query",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "name": "limit",
-            "in": "query"
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/ReportEmail"
+            }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getOrgUsersForCurrentOrgLookupResponse"
+            "$ref": "#/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -6834,74 +7200,62 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/org/users/{user_id}": {
-      "delete": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:remove` with scope `users:*`.",
+    "/reports/render/pdfs": {
+      "get": {
+        "description": "Available to all users and with a valid license.",
+        "produces": [
+          "application/pdf"
+        ],
         "tags": [
-          "org"
+          "reports",
+          "enterprise"
         ],
-        "summary": "Delete user in current organization.",
-        "operationId": "removeOrgUserForCurrentOrg",
+        "summary": "Render report for multiple dashboards.",
+        "operationId": "renderReportPDFs",
         "parameters": [
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "user_id",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/okResponse"
+            "type": "string",
+            "name": "dashboardID",
+            "in": "query"
           },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+          {
+            "type": "string",
+            "name": "orientation",
+            "in": "query"
           },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
+          {
+            "type": "string",
+            "name": "layout",
+            "in": "query"
           },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
+          {
+            "type": "string",
+            "name": "title",
+            "in": "query"
           },
-          "500": {
-            "$ref": "#/responses/internalServerError"
-          }
-        }
-      },
-      "patch": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users.role:update` with scope `users:*`.",
-        "tags": [
-          "org"
-        ],
-        "summary": "Updates the given user.",
-        "operationId": "updateOrgUserForCurrentOrg",
-        "parameters": [
           {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/UpdateOrgUserCommand"
-            }
+            "type": "string",
+            "name": "scaleFactor",
+            "in": "query"
           },
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "user_id",
-            "in": "path",
-            "required": true
+            "type": "string",
+            "name": "includeTables",
+            "in": "query"
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
+            "$ref": "#/responses/contentResponse"
           },
           "400": {
             "$ref": "#/responses/badRequestError"
@@ -6909,58 +7263,24 @@
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/orgs": {
+    "/reports/settings": {
       "get": {
-        "security": [
-          {
-            "basic": []
-          }
-        ],
+        "description": "Available to org admins only and with a valid or expired license.\n\nYou need to have a permission with action `reports.settings:read`x.",
         "tags": [
-          "orgs"
-        ],
-        "summary": "Search all Organizations.",
-        "operationId": "searchOrgs",
-        "parameters": [
-          {
-            "type": "integer",
-            "format": "int64",
-            "default": 1,
-            "name": "page",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "default": 1000,
-            "description": "Number of items per page\nThe totalCount field in the response can be used for pagination list E.g. if totalCount is equal to 100 teams and the perpage parameter is set to 10 then there are 10 pages of teams.",
-            "name": "perpage",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "name": "name",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "description": "If set it will return results where the query value is contained in the name field. Query values with spaces need to be URL encoded.",
-            "name": "query",
-            "in": "query"
-          }
+          "reports",
+          "enterprise"
         ],
+        "summary": "Get settings.",
+        "operationId": "getReportSettings",
         "responses": {
           "200": {
-            "$ref": "#/responses/searchOrgsResponse"
+            "$ref": "#/responses/getReportSettingsResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -6968,34 +7288,35 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "409": {
-            "$ref": "#/responses/conflictError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       },
       "post": {
-        "description": "Only works if [users.allow_org_create](https://grafana.com/docs/grafana/latest/administration/configuration/#allow_org_create) is set.",
+        "description": "Available to org admins only and with a valid or expired license.\n\nYou need to have a permission with action `reports.settings:write`xx.",
         "tags": [
-          "orgs"
+          "reports",
+          "enterprise"
         ],
-        "summary": "Create Organization.",
-        "operationId": "createOrg",
+        "summary": "Save settings.",
+        "operationId": "saveReportSettings",
         "parameters": [
           {
             "name": "body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/CreateOrgCommand"
+              "$ref": "#/definitions/ReportSettings"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/createOrgResponse"
+            "$ref": "#/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -7003,38 +7324,37 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "409": {
-            "$ref": "#/responses/conflictError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/orgs/name/{org_name}": {
-      "get": {
-        "security": [
-          {
-            "basic": []
-          }
-        ],
+    "/reports/test-email": {
+      "post": {
+        "description": "Available to org admins only and with a valid license.\n\nYou need to have a permission with action `reports:send`.",
         "tags": [
-          "orgs"
+          "reports",
+          "enterprise"
         ],
-        "summary": "Get Organization by ID.",
-        "operationId": "getOrgByName",
+        "summary": "Send test report via email.",
+        "operationId": "sendTestEmail",
         "parameters": [
           {
-            "type": "string",
-            "name": "org_name",
-            "in": "path",
-            "required": true
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/CreateOrUpdateReportConfig"
+            }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getOrgByNameResponse"
+            "$ref": "#/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -7042,36 +7362,39 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/orgs/{org_id}": {
+    "/reports/{id}": {
       "get": {
-        "security": [
-          {
-            "basic": []
-          }
-        ],
+        "description": "Available to org admins only and with a valid or expired license.\n\nYou need to have a permission with action `reports:read` with scope `reports:id:\u003creport ID\u003e`.",
         "tags": [
-          "orgs"
+          "reports",
+          "enterprise"
         ],
-        "summary": "Get Organization by ID.",
-        "operationId": "getOrgByID",
+        "summary": "Get a report.",
+        "operationId": "getReport",
         "parameters": [
           {
             "type": "integer",
             "format": "int64",
-            "name": "org_id",
+            "name": "id",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getOrgByIDResponse"
+            "$ref": "#/responses/getReportResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -7079,35 +7402,35 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       },
       "put": {
-        "security": [
-          {
-            "basic": []
-          }
-        ],
+        "description": "Available to org admins only and with a valid or expired license.\n\nYou need to have a permission with action `reports.admin:write` with scope `reports:id:\u003creport ID\u003e`.",
         "tags": [
-          "orgs"
+          "reports",
+          "enterprise"
         ],
-        "summary": "Update Organization.",
-        "operationId": "updateOrg",
+        "summary": "Update a report.",
+        "operationId": "updateReport",
         "parameters": [
           {
             "name": "body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/UpdateOrgForm"
+              "$ref": "#/definitions/CreateOrUpdateReportConfig"
             }
           },
           {
             "type": "integer",
             "format": "int64",
-            "name": "org_id",
+            "name": "id",
             "in": "path",
             "required": true
           }
@@ -7125,27 +7448,27 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       },
       "delete": {
-        "security": [
-          {
-            "basic": []
-          }
-        ],
+        "description": "Available to org admins only and with a valid or expired license.\n\nYou need to have a permission with action `reports.delete` with scope `reports:id:\u003creport ID\u003e`.",
         "tags": [
-          "orgs"
+          "reports",
+          "enterprise"
         ],
-        "summary": "Delete Organization.",
-        "operationId": "deleteOrgByID",
+        "summary": "Delete a report.",
+        "operationId": "deleteReport",
         "parameters": [
           {
             "type": "integer",
             "format": "int64",
-            "name": "org_id",
+            "name": "id",
             "in": "path",
             "required": true
           }
@@ -7172,39 +7495,24 @@
         }
       }
     },
-    "/orgs/{org_id}/address": {
-      "put": {
+    "/saml/acs": {
+      "post": {
         "tags": [
-          "orgs"
+          "saml",
+          "enterprise"
         ],
-        "summary": "Update Organization's address.",
-        "operationId": "updateOrgAddress",
+        "summary": "It performs Assertion Consumer Service (ACS).",
+        "operationId": "postACS",
         "parameters": [
           {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/UpdateOrgAddressForm"
-            }
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "name": "org_id",
-            "in": "path",
-            "required": true
+            "type": "string",
+            "name": "RelayState",
+            "in": "query"
           }
         ],
         "responses": {
-          "200": {
-            "$ref": "#/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
+          "302": {
+            "description": "(empty)"
           },
           "403": {
             "$ref": "#/responses/forbiddenError"
@@ -7215,128 +7523,207 @@
         }
       }
     },
-    "/orgs/{org_id}/quotas": {
+    "/saml/metadata": {
       "get": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `orgs.quotas:read` and scope `org:id:1` (orgIDScope).",
+        "produces": [
+          "application/xml;application/samlmetadata+xml"
+        ],
         "tags": [
-          "orgs"
+          "saml",
+          "enterprise"
         ],
-        "summary": "Fetch Organization quota.",
-        "operationId": "getOrgQuota",
-        "parameters": [
-          {
-            "type": "integer",
-            "format": "int64",
-            "name": "org_id",
-            "in": "path",
-            "required": true
+        "summary": "It exposes the SP (Grafana's) metadata for the IdP's consumption.",
+        "operationId": "getMetadata",
+        "responses": {
+          "200": {
+            "$ref": "#/responses/contentResponse"
           }
+        }
+      }
+    },
+    "/saml/slo": {
+      "get": {
+        "description": "There might be two possible requests:\n1. Logout response (callback) when Grafana initiates single logout and IdP returns response to logout request.\n2. Logout request when another SP initiates single logout and IdP sends logout request to the Grafana,\nor in case of IdP-initiated logout.",
+        "tags": [
+          "saml",
+          "enterprise"
         ],
+        "summary": "It performs Single Logout (SLO) callback.",
+        "operationId": "getSLO",
         "responses": {
-          "200": {
-            "$ref": "#/responses/getQuotaResponse"
+          "302": {
+            "description": "(empty)"
           },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/orgs/{org_id}/quotas/{quota_target}": {
-      "put": {
-        "security": [
-          {
-            "basic": []
-          }
-        ],
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `orgs.quotas:write` and scope `org:id:1` (orgIDScope).",
+      },
+      "post": {
+        "description": "There might be two possible requests:\n1. Logout response (callback) when Grafana initiates single logout and IdP returns response to logout request.\n2. Logout request when another SP initiates single logout and IdP sends logout request to the Grafana,\nor in case of IdP-initiated logout.",
         "tags": [
-          "orgs"
+          "saml",
+          "enterprise"
         ],
-        "summary": "Update user quota.",
-        "operationId": "updateOrgQuota",
+        "summary": "It performs Single Logout (SLO) callback.",
+        "operationId": "postSLO",
         "parameters": [
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/UpdateQuotaCmd"
-            }
-          },
           {
             "type": "string",
-            "name": "quota_target",
-            "in": "path",
-            "required": true
+            "name": "SAMLRequest",
+            "in": "query"
           },
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "org_id",
-            "in": "path",
-            "required": true
+            "type": "string",
+            "name": "SAMLResponse",
+            "in": "query"
           }
         ],
         "responses": {
-          "200": {
-            "$ref": "#/responses/okResponse"
+          "302": {
+            "description": "(empty)"
           },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/orgs/{org_id}/users": {
+    "/search": {
       "get": {
-        "security": [
-          {
-            "basic": []
-          }
-        ],
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:read` with scope `users:*`.",
         "tags": [
-          "orgs"
+          "search"
         ],
-        "summary": "Get Users in Organization.",
-        "operationId": "getOrgUsers",
+        "operationId": "search",
         "parameters": [
+          {
+            "type": "string",
+            "description": "Search Query",
+            "name": "query",
+            "in": "query"
+          },
+          {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "collectionFormat": "multi",
+            "description": "List of tags to search for",
+            "name": "tag",
+            "in": "query"
+          },
+          {
+            "enum": [
+              "dash-folder",
+              "dash-db"
+            ],
+            "type": "string",
+            "description": "Type to search for, dash-folder or dash-db",
+            "name": "type",
+            "in": "query"
+          },
+          {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int64"
+            },
+            "description": "List of dashboard id’s to search for\nThis is deprecated: users should use the `dashboardUIDs` query parameter instead",
+            "name": "dashboardIds",
+            "in": "query"
+          },
+          {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "List of dashboard uid’s to search for",
+            "name": "dashboardUIDs",
+            "in": "query"
+          },
+          {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int64"
+            },
+            "description": "List of folder id’s to search in for dashboards\nIf it's `0` then it will query for the top level folders\nThis is deprecated: users should use the `folderUIDs` query parameter instead",
+            "name": "folderIds",
+            "in": "query"
+          },
+          {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "List of folder UID’s to search in for dashboards\nIf it's an empty string then it will query for the top level folders",
+            "name": "folderUIDs",
+            "in": "query"
+          },
+          {
+            "type": "boolean",
+            "description": "Flag indicating if only starred Dashboards should be returned",
+            "name": "starred",
+            "in": "query"
+          },
           {
             "type": "integer",
             "format": "int64",
-            "name": "org_id",
-            "in": "path",
-            "required": true
+            "description": "Limit the number of returned results (max 5000)",
+            "name": "limit",
+            "in": "query"
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "description": "Use this parameter to access hits beyond limit. Numbering starts at 1. limit param acts as page size. Only available in Grafana v6.2+.",
+            "name": "page",
+            "in": "query"
+          },
+          {
+            "enum": [
+              "Edit",
+              "View"
+            ],
+            "type": "string",
+            "default": "View",
+            "description": "Set to `Edit` to return dashboards/folders that the user can edit",
+            "name": "permission",
+            "in": "query"
+          },
+          {
+            "enum": [
+              "alpha-asc",
+              "alpha-desc"
+            ],
+            "type": "string",
+            "default": "alpha-asc",
+            "description": "Sort method; for listing all the possible sort methods use the search sorting endpoint.",
+            "name": "sort",
+            "in": "query"
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getOrgUsersResponse"
+            "$ref": "#/responses/searchResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
+          "422": {
+            "$ref": "#/responses/unprocessableEntityError"
           },
           "500": {
             "$ref": "#/responses/internalServerError"
@@ -7344,32 +7731,17 @@
         }
       },
       "post": {
-        "description": "Adds a global user to the current organization.\n\nIf you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:add` with scope `users:*`.",
-        "tags": [
-          "orgs"
+        "produces": [
+          "application/json"
         ],
-        "summary": "Add a new user to the current organization.",
-        "operationId": "addOrgUser",
-        "parameters": [
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/AddOrgUserCommand"
-            }
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "name": "org_id",
-            "in": "path",
-            "required": true
-          }
+        "tags": [
+          "devices"
         ],
+        "summary": "Lists all devices within the last 30 days",
+        "operationId": "SearchDevices",
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
+            "$ref": "#/responses/devicesSearchResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -7377,37 +7749,55 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/orgs/{org_id}/users/search": {
+    "/search/sorting": {
       "get": {
-        "security": [
-          {
-            "basic": []
-          }
+        "tags": [
+          "search"
         ],
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:read` with scope `users:*`.",
+        "summary": "List search sorting options.",
+        "operationId": "listSortOptions",
+        "responses": {
+          "200": {
+            "$ref": "#/responses/listSortOptionsResponse"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          }
+        }
+      }
+    },
+    "/serviceaccounts": {
+      "post": {
+        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:write` scope: `serviceaccounts:*`\n\nRequires basic authentication and that the authenticated user is a Grafana Admin.",
         "tags": [
-          "orgs"
+          "service_accounts"
         ],
-        "summary": "Search Users in Organization.",
-        "operationId": "searchOrgUsers",
+        "summary": "Create service account",
+        "operationId": "createServiceAccount",
         "parameters": [
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "org_id",
-            "in": "path",
-            "required": true
+            "name": "Body",
+            "in": "body",
+            "schema": {
+              "$ref": "#/definitions/CreateServiceAccountForm"
+            }
           }
         ],
         "responses": {
-          "200": {
-            "$ref": "#/responses/searchOrgUsersResponse"
+          "201": {
+            "$ref": "#/responses/createServiceAccountResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -7421,36 +7811,49 @@
         }
       }
     },
-    "/orgs/{org_id}/users/{user_id}": {
-      "delete": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:remove` with scope `users:*`.",
+    "/serviceaccounts/search": {
+      "get": {
+        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:read` scope: `serviceaccounts:*`",
         "tags": [
-          "orgs"
+          "service_accounts"
         ],
-        "summary": "Delete user in current organization.",
-        "operationId": "removeOrgUser",
+        "summary": "Search service accounts with paging",
+        "operationId": "searchOrgServiceAccountsWithPaging",
         "parameters": [
+          {
+            "type": "boolean",
+            "name": "Disabled",
+            "in": "query"
+          },
+          {
+            "type": "boolean",
+            "name": "expiredTokens",
+            "in": "query"
+          },
+          {
+            "type": "string",
+            "description": "It will return results where the query value is contained in one of the name.\nQuery values with spaces need to be URL encoded.",
+            "name": "query",
+            "in": "query"
+          },
           {
             "type": "integer",
             "format": "int64",
-            "name": "org_id",
-            "in": "path",
-            "required": true
+            "description": "The default value is 1000.",
+            "name": "perpage",
+            "in": "query"
           },
           {
             "type": "integer",
             "format": "int64",
-            "name": "user_id",
-            "in": "path",
-            "required": true
+            "description": "The default value is 1.",
+            "name": "page",
+            "in": "query"
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+            "$ref": "#/responses/searchOrgServiceAccountsWithPagingResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -7462,41 +7865,28 @@
             "$ref": "#/responses/internalServerError"
           }
         }
-      },
-      "patch": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users.role:update` with scope `users:*`.",
+      }
+    },
+    "/serviceaccounts/{serviceAccountId}": {
+      "get": {
+        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:read` scope: `serviceaccounts:id:1` (single service account)",
         "tags": [
-          "orgs"
+          "service_accounts"
         ],
-        "summary": "Update Users in Organization.",
-        "operationId": "updateOrgUser",
+        "summary": "Get single serviceaccount by Id",
+        "operationId": "retrieveServiceAccount",
         "parameters": [
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/UpdateOrgUserCommand"
-            }
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "name": "org_id",
-            "in": "path",
-            "required": true
-          },
           {
             "type": "integer",
             "format": "int64",
-            "name": "user_id",
+            "name": "serviceAccountId",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
+            "$ref": "#/responses/retrieveServiceAccountResponse"
           },
           "400": {
             "$ref": "#/responses/badRequestError"
@@ -7507,61 +7897,77 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/playlists": {
-      "get": {
+      },
+      "delete": {
+        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:delete` scope: `serviceaccounts:id:1` (single service account)",
         "tags": [
-          "playlists"
+          "service_accounts"
         ],
-        "summary": "Get playlists.",
-        "operationId": "searchPlaylists",
+        "summary": "Delete service account",
+        "operationId": "deleteServiceAccount",
         "parameters": [
-          {
-            "type": "string",
-            "name": "query",
-            "in": "query"
-          },
           {
             "type": "integer",
             "format": "int64",
-            "description": "in:limit",
-            "name": "limit",
-            "in": "query"
+            "name": "serviceAccountId",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/searchPlaylistsResponse"
+            "$ref": "#/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
           },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       },
-      "post": {
+      "patch": {
+        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:write` scope: `serviceaccounts:id:1` (single service account)",
         "tags": [
-          "playlists"
+          "service_accounts"
         ],
-        "summary": "Create playlist.",
-        "operationId": "createPlaylist",
+        "summary": "Update service account",
+        "operationId": "updateServiceAccount",
         "parameters": [
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "serviceAccountId",
+            "in": "path",
+            "required": true
+          },
           {
             "name": "Body",
             "in": "body",
-            "required": true,
             "schema": {
-              "$ref": "#/definitions/CreatePlaylistCommand"
+              "$ref": "#/definitions/UpdateServiceAccountForm"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/createPlaylistResponse"
+            "$ref": "#/responses/updateServiceAccountResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -7578,24 +7984,29 @@
         }
       }
     },
-    "/playlists/{uid}": {
+    "/serviceaccounts/{serviceAccountId}/tokens": {
       "get": {
+        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:read` scope: `global:serviceaccounts:id:1` (single service account)\n\nRequires basic authentication and that the authenticated user is a Grafana Admin.",
         "tags": [
-          "playlists"
+          "service_accounts"
         ],
-        "summary": "Get playlist.",
-        "operationId": "getPlaylist",
+        "summary": "Get service account tokens",
+        "operationId": "listTokens",
         "parameters": [
           {
-            "type": "string",
-            "name": "uid",
+            "type": "integer",
+            "format": "int64",
+            "name": "serviceAccountId",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getPlaylistResponse"
+            "$ref": "#/responses/listTokensResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -7603,39 +8014,40 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       },
-      "put": {
+      "post": {
+        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:write` scope: `serviceaccounts:id:1` (single service account)",
         "tags": [
-          "playlists"
+          "service_accounts"
         ],
-        "summary": "Update playlist.",
-        "operationId": "updatePlaylist",
+        "summary": "CreateNewToken adds a token to a service account",
+        "operationId": "createToken",
         "parameters": [
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "serviceAccountId",
+            "in": "path",
+            "required": true
+          },
           {
             "name": "Body",
             "in": "body",
-            "required": true,
             "schema": {
-              "$ref": "#/definitions/UpdatePlaylistCommand"
+              "$ref": "#/definitions/AddServiceAccountTokenCommand"
             }
-          },
-          {
-            "type": "string",
-            "name": "uid",
-            "in": "path",
-            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/updatePlaylistResponse"
+            "$ref": "#/responses/createTokenResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -7646,29 +8058,46 @@
           "404": {
             "$ref": "#/responses/notFoundError"
           },
+          "409": {
+            "$ref": "#/responses/conflictError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      },
+      }
+    },
+    "/serviceaccounts/{serviceAccountId}/tokens/{tokenId}": {
       "delete": {
+        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:write` scope: `serviceaccounts:id:1` (single service account)\n\nRequires basic authentication and that the authenticated user is a Grafana Admin.",
         "tags": [
-          "playlists"
+          "service_accounts"
         ],
-        "summary": "Delete playlist.",
-        "operationId": "deletePlaylist",
+        "summary": "DeleteToken deletes service account tokens",
+        "operationId": "deleteToken",
         "parameters": [
           {
-            "type": "string",
-            "name": "uid",
-            "in": "path",
-            "required": true
+            "type": "integer",
+            "format": "int64",
+            "name": "tokenId",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "serviceAccountId",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
             "$ref": "#/responses/okResponse"
           },
+          "400": {
+            "$ref": "#/responses/badRequestError"
+          },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
@@ -7684,33 +8113,17 @@
         }
       }
     },
-    "/playlists/{uid}/items": {
+    "/signing-keys/keys": {
       "get": {
+        "description": "Required permissions\nNone",
         "tags": [
-          "playlists"
-        ],
-        "summary": "Get playlist items.",
-        "operationId": "getPlaylistItems",
-        "parameters": [
-          {
-            "type": "string",
-            "name": "uid",
-            "in": "path",
-            "required": true
-          }
+          "signing_keys"
         ],
+        "summary": "Get JSON Web Key Set (JWKS) with all the keys that can be used to verify tokens (public keys)",
+        "operationId": "retrieveJWKS",
         "responses": {
           "200": {
-            "$ref": "#/responses/getPlaylistItemsResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/responses/notFoundError"
+            "$ref": "#/responses/jwksResponse"
           },
           "500": {
             "$ref": "#/responses/internalServerError"
@@ -7718,171 +8131,85 @@
         }
       }
     },
-    "/query-history": {
+    "/snapshot/shared-options": {
       "get": {
-        "description": "Returns a list of queries in the query history that matches the search criteria.\nQuery history search supports pagination. Use the `limit` parameter to control the maximum number of queries returned; the default limit is 100.\nYou can also use the `page` query parameter to fetch queries from any page other than the first one.",
         "tags": [
-          "query_history"
-        ],
-        "summary": "Query history search.",
-        "operationId": "searchQueries",
-        "parameters": [
-          {
-            "type": "array",
-            "items": {
-              "type": "string"
-            },
-            "collectionFormat": "multi",
-            "description": "List of data source UIDs to search for",
-            "name": "datasourceUid",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "description": "Text inside query or comments that is searched for",
-            "name": "searchString",
-            "in": "query"
-          },
-          {
-            "type": "boolean",
-            "description": "Flag indicating if only starred queries should be returned",
-            "name": "onlyStarred",
-            "in": "query"
-          },
-          {
-            "enum": [
-              "time-desc",
-              "time-asc"
-            ],
-            "type": "string",
-            "default": "time-desc",
-            "description": "Sort method",
-            "name": "sort",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "description": "Use this parameter to access hits beyond limit. Numbering starts at 1. limit param acts as page size.",
-            "name": "page",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "description": "Limit the number of returned results",
-            "name": "limit",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "description": "From range for the query history search",
-            "name": "from",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "description": "To range for the query history search",
-            "name": "to",
-            "in": "query"
-          }
+          "snapshots"
         ],
+        "summary": "Get snapshot sharing settings.",
+        "operationId": "getSharingOptions",
         "responses": {
           "200": {
-            "$ref": "#/responses/getQueryHistorySearchResponse"
+            "$ref": "#/responses/getSharingOptionsResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
           }
         }
-      },
+      }
+    },
+    "/snapshots": {
       "post": {
-        "description": "Adds new query to query history.",
+        "description": "Snapshot public mode should be enabled or authentication is required.",
         "tags": [
-          "query_history"
+          "snapshots"
         ],
-        "summary": "Add query to query history.",
-        "operationId": "createQuery",
+        "summary": "When creating a snapshot using the API, you have to provide the full dashboard payload including the snapshot data. This endpoint is designed for the Grafana UI.",
+        "operationId": "createDashboardSnapshot",
         "parameters": [
           {
             "name": "body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/CreateQueryInQueryHistoryCommand"
+              "$ref": "#/definitions/CreateDashboardSnapshotCommand"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getQueryHistoryResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+            "$ref": "#/responses/createDashboardSnapshotResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/query-history/star/{query_history_uid}": {
-      "post": {
-        "description": "Adds star to query in query history as specified by the UID.",
+    "/snapshots-delete/{deleteKey}": {
+      "get": {
+        "description": "Snapshot public mode should be enabled or authentication is required.",
         "tags": [
-          "query_history"
+          "snapshots"
         ],
-        "summary": "Add star to query in query history.",
-        "operationId": "starQuery",
+        "summary": "Delete Snapshot by deleteKey.",
+        "operationId": "deleteDashboardSnapshotByDeleteKey",
         "parameters": [
           {
             "type": "string",
-            "name": "query_history_uid",
+            "name": "deleteKey",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getQueryHistoryResponse"
+            "$ref": "#/responses/okResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
-          "500": {
-            "$ref": "#/responses/internalServerError"
-          }
-        }
-      },
-      "delete": {
-        "description": "Removes star from query in query history as specified by the UID.",
-        "tags": [
-          "query_history"
-        ],
-        "summary": "Remove star to query in query history.",
-        "operationId": "unstarQuery",
-        "parameters": [
-          {
-            "type": "string",
-            "name": "query_history_uid",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/getQueryHistoryResponse"
+          "403": {
+            "$ref": "#/responses/forbiddenError"
           },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
+          "404": {
+            "$ref": "#/responses/notFoundError"
           },
           "500": {
             "$ref": "#/responses/internalServerError"
@@ -7890,66 +8217,59 @@
         }
       }
     },
-    "/query-history/{query_history_uid}": {
-      "delete": {
-        "description": "Deletes an existing query in query history as specified by the UID. This operation cannot be reverted.",
+    "/snapshots/{key}": {
+      "get": {
         "tags": [
-          "query_history"
+          "snapshots"
         ],
-        "summary": "Delete query in query history.",
-        "operationId": "deleteQuery",
+        "summary": "Get Snapshot by Key.",
+        "operationId": "getDashboardSnapshot",
         "parameters": [
           {
             "type": "string",
-            "name": "query_history_uid",
+            "name": "key",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getQueryHistoryDeleteQueryResponse"
+            "$ref": "#/responses/getDashboardSnapshotResponse"
           },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
+          "400": {
+            "$ref": "#/responses/badRequestError"
+          },
+          "404": {
+            "$ref": "#/responses/notFoundError"
           },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       },
-      "patch": {
-        "description": "Updates comment for query in query history as specified by the UID.",
+      "delete": {
         "tags": [
-          "query_history"
+          "snapshots"
         ],
-        "summary": "Update comment for query in query history.",
-        "operationId": "patchQueryComment",
+        "summary": "Delete Snapshot by Key.",
+        "operationId": "deleteDashboardSnapshot",
         "parameters": [
           {
             "type": "string",
-            "name": "query_history_uid",
+            "name": "key",
             "in": "path",
             "required": true
-          },
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/PatchQueryCommentInQueryHistoryCommand"
-            }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getQueryHistoryResponse"
+            "$ref": "#/responses/okResponse"
           },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+          "403": {
+            "$ref": "#/responses/forbiddenError"
           },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
+          "404": {
+            "$ref": "#/responses/notFoundError"
           },
           "500": {
             "$ref": "#/responses/internalServerError"
@@ -7957,17 +8277,19 @@
         }
       }
     },
-    "/recording-rules": {
+    "/stats": {
       "get": {
+        "produces": [
+          "application/json"
+        ],
         "tags": [
-          "recording_rules",
-          "enterprise"
+          "devices"
         ],
-        "summary": "Lists all rules in the database: active or deleted.",
-        "operationId": "listRecordingRules",
+        "summary": "Lists all devices within the last 30 days",
+        "operationId": "listDevices",
         "responses": {
           "200": {
-            "$ref": "#/responses/listRecordingRulesResponse"
+            "$ref": "#/responses/devicesResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -7982,27 +8304,28 @@
             "$ref": "#/responses/internalServerError"
           }
         }
-      },
-      "put": {
+      }
+    },
+    "/teams": {
+      "post": {
         "tags": [
-          "recording_rules",
-          "enterprise"
+          "teams"
         ],
-        "summary": "Update the active status of a rule.",
-        "operationId": "updateRecordingRule",
+        "summary": "Add Team.",
+        "operationId": "createTeam",
         "parameters": [
           {
             "name": "body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/RecordingRuleJSON"
+              "$ref": "#/definitions/CreateTeamCommand"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/recordingRuleResponse"
+            "$ref": "#/responses/createTeamResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -8010,71 +8333,53 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
+          "409": {
+            "$ref": "#/responses/conflictError"
           },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      },
-      "post": {
+      }
+    },
+    "/teams/search": {
+      "get": {
         "tags": [
-          "recording_rules",
-          "enterprise"
+          "teams"
         ],
-        "summary": "Create a recording rule that is then registered and started.",
-        "operationId": "createRecordingRule",
+        "summary": "Team Search With Paging.",
+        "operationId": "searchTeams",
         "parameters": [
           {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/RecordingRuleJSON"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/recordingRuleResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
+            "type": "integer",
+            "format": "int64",
+            "default": 1,
+            "name": "page",
+            "in": "query"
           },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
+          {
+            "type": "integer",
+            "format": "int64",
+            "default": 1000,
+            "description": "Number of items per page\nThe totalCount field in the response can be used for pagination list E.g. if totalCount is equal to 100 teams and the perpage parameter is set to 10 then there are 10 pages of teams.",
+            "name": "perpage",
+            "in": "query"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
+          {
+            "type": "string",
+            "name": "name",
+            "in": "query"
           },
-          "500": {
-            "$ref": "#/responses/internalServerError"
-          }
-        }
-      }
-    },
-    "/recording-rules/test": {
-      "post": {
-        "tags": [
-          "recording_rules",
-          "enterprise"
-        ],
-        "summary": "Test a recording rule.",
-        "operationId": "testCreateRecordingRule",
-        "parameters": [
           {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/RecordingRuleJSON"
-            }
+            "type": "string",
+            "description": "If set it will return results where the query value is contained in the name field. Query values with spaces need to be URL encoded.",
+            "name": "query",
+            "in": "query"
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
+            "$ref": "#/responses/searchTeamsResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -8082,29 +8387,35 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
-          "422": {
-            "$ref": "#/responses/unprocessableEntityError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/recording-rules/writer": {
+    "/teams/{teamId}/groups": {
       "get": {
         "tags": [
-          "recording_rules",
+          "sync_team_groups",
           "enterprise"
         ],
-        "summary": "Return the prometheus remote write target.",
-        "operationId": "getRecordingRuleWriteTarget",
+        "summary": "Get External Groups.",
+        "operationId": "getTeamGroupsApi",
+        "parameters": [
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "teamId",
+            "in": "path",
+            "required": true
+          }
+        ],
         "responses": {
           "200": {
-            "$ref": "#/responses/recordingRuleWriteTargetResponse"
+            "$ref": "#/responses/getTeamGroupsApiResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -8121,55 +8432,36 @@
         }
       },
       "post": {
-        "description": "It returns a 422 if there is not an existing prometheus data source configured.",
         "tags": [
-          "recording_rules",
+          "sync_team_groups",
           "enterprise"
         ],
-        "summary": "Create a remote write target.",
-        "operationId": "createRecordingRuleWriteTarget",
+        "summary": "Add External Group.",
+        "operationId": "addTeamGroupApi",
         "parameters": [
           {
             "name": "body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/PrometheusRemoteWriteTargetJSON"
+              "$ref": "#/definitions/TeamGroupMapping"
             }
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/recordingRuleWriteTargetResponse"
           },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
-          "422": {
-            "$ref": "#/responses/unprocessableEntityError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "teamId",
+            "in": "path",
+            "required": true
           }
-        }
-      },
-      "delete": {
-        "tags": [
-          "recording_rules",
-          "enterprise"
         ],
-        "summary": "Delete the remote write target.",
-        "operationId": "deleteRecordingRuleWriteTarget",
         "responses": {
           "200": {
             "$ref": "#/responses/okResponse"
           },
+          "400": {
+            "$ref": "#/responses/badRequestError"
+          },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
@@ -8183,21 +8475,24 @@
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/recording-rules/{recordingRuleID}": {
+      },
       "delete": {
         "tags": [
-          "recording_rules",
+          "sync_team_groups",
           "enterprise"
         ],
-        "summary": "Delete removes the rule from the registry and stops it.",
-        "operationId": "deleteRecordingRule",
+        "summary": "Remove External Group.",
+        "operationId": "removeTeamGroupApiQuery",
         "parameters": [
+          {
+            "type": "string",
+            "name": "groupId",
+            "in": "query"
+          },
           {
             "type": "integer",
             "format": "int64",
-            "name": "recordingRuleID",
+            "name": "teamId",
             "in": "path",
             "required": true
           }
@@ -8206,6 +8501,9 @@
           "200": {
             "$ref": "#/responses/okResponse"
           },
+          "400": {
+            "$ref": "#/responses/badRequestError"
+          },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
@@ -8221,18 +8519,24 @@
         }
       }
     },
-    "/reports": {
+    "/teams/{team_id}": {
       "get": {
-        "description": "Available to org admins only and with a valid or expired license.\n\nYou need to have a permission with action `reports:read` with scope `reports:*`.",
         "tags": [
-          "reports",
-          "enterprise"
+          "teams"
+        ],
+        "summary": "Get Team By ID.",
+        "operationId": "getTeamByID",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "team_id",
+            "in": "path",
+            "required": true
+          }
         ],
-        "summary": "List reports.",
-        "operationId": "getReports",
         "responses": {
           "200": {
-            "$ref": "#/responses/getReportsResponse"
+            "$ref": "#/responses/getTeamByIDResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -8240,35 +8544,39 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       },
-      "post": {
-        "description": "Available to org admins only and with a valid license.\n\nYou need to have a permission with action `reports.admin:create`.",
+      "put": {
         "tags": [
-          "reports",
-          "enterprise"
+          "teams"
         ],
-        "summary": "Create a report.",
-        "operationId": "createReport",
+        "summary": "Update Team.",
+        "operationId": "updateTeam",
         "parameters": [
           {
             "name": "body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/CreateOrUpdateConfigCmd"
+              "$ref": "#/definitions/UpdateTeamCommand"
             }
+          },
+          {
+            "type": "string",
+            "name": "team_id",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/createReportResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+            "$ref": "#/responses/okResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -8279,38 +8587,32 @@
           "404": {
             "$ref": "#/responses/notFoundError"
           },
+          "409": {
+            "$ref": "#/responses/conflictError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/reports/email": {
-      "post": {
-        "description": "Generate and send a report. This API waits for the report to be generated before returning. We recommend that you set the client’s timeout to at least 60 seconds. Available to org admins only and with a valid license.\n\nOnly available in Grafana Enterprise v7.0+.\nThis API endpoint is experimental and may be deprecated in a future release. On deprecation, a migration strategy will be provided and the endpoint will remain functional until the next major release of Grafana.\n\nYou need to have a permission with action `reports:send`.",
+      },
+      "delete": {
         "tags": [
-          "reports",
-          "enterprise"
+          "teams"
         ],
-        "summary": "Send a report.",
-        "operationId": "sendReport",
+        "summary": "Delete Team By ID.",
+        "operationId": "deleteTeamByID",
         "parameters": [
           {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/ReportEmailDTO"
-            }
+            "type": "string",
+            "name": "team_id",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
             "$ref": "#/responses/okResponse"
           },
-          "400": {
-            "$ref": "#/responses/badRequestError"
-          },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
@@ -8326,138 +8628,64 @@
         }
       }
     },
-    "/reports/render/pdf/{dashboardID}": {
+    "/teams/{team_id}/members": {
       "get": {
-        "description": "Please refer to [reports enterprise](#/reports/renderReportPDFs) instead. This will be removed in Grafana 10.",
-        "produces": [
-          "application/pdf"
-        ],
         "tags": [
-          "reports",
-          "enterprise"
+          "teams"
         ],
-        "summary": "Render report for dashboard.",
-        "operationId": "renderReportPDF",
-        "deprecated": true,
+        "summary": "Get Team Members.",
+        "operationId": "getTeamMembers",
         "parameters": [
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "DashboardID",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "name": "dashboardID",
+            "type": "string",
+            "name": "team_id",
             "in": "path",
             "required": true
-          },
-          {
-            "type": "string",
-            "name": "title",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "name": "variables",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "name": "from",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "name": "to",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "name": "orientation",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "name": "layout",
-            "in": "query"
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/contentResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+            "$ref": "#/responses/getTeamMembersResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/reports/render/pdfs": {
-      "get": {
-        "description": "Available to all users and with a valid license.",
-        "produces": [
-          "application/pdf"
-        ],
+      },
+      "post": {
         "tags": [
-          "reports",
-          "enterprise"
+          "teams"
         ],
-        "summary": "Render report for multiple dashboards.",
-        "operationId": "renderReportPDFs",
+        "summary": "Add Team Member.",
+        "operationId": "addTeamMember",
         "parameters": [
           {
-            "type": "string",
-            "name": "dashboardID",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "name": "orientation",
-            "in": "query"
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/AddTeamMemberCommand"
+            }
           },
           {
             "type": "string",
-            "name": "layout",
-            "in": "query"
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/contentResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+            "name": "team_id",
+            "in": "path",
+            "required": true
           }
-        }
-      }
-    },
-    "/reports/settings": {
-      "get": {
-        "description": "Available to org admins only and with a valid or expired license.\n\nYou need to have a permission with action `reports.settings:read`x.",
-        "tags": [
-          "reports",
-          "enterprise"
         ],
-        "summary": "Get settings.",
-        "operationId": "getReportSettings",
         "responses": {
           "200": {
-            "$ref": "#/responses/getReportSettingsResponse"
+            "$ref": "#/responses/okResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -8465,74 +8693,88 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      },
-      "post": {
-        "description": "Available to org admins only and with a valid or expired license.\n\nYou need to have a permission with action `reports.settings:write`xx.",
+      }
+    },
+    "/teams/{team_id}/members/{user_id}": {
+      "put": {
         "tags": [
-          "reports",
-          "enterprise"
+          "teams"
         ],
-        "summary": "Save settings.",
-        "operationId": "saveReportSettings",
+        "summary": "Update Team Member.",
+        "operationId": "updateTeamMember",
         "parameters": [
           {
             "name": "body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/SettingsDTO"
+              "$ref": "#/definitions/UpdateTeamMemberCommand"
             }
+          },
+          {
+            "type": "string",
+            "name": "team_id",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "user_id",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
             "$ref": "#/responses/okResponse"
           },
-          "400": {
-            "$ref": "#/responses/badRequestError"
-          },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/reports/test-email": {
-      "post": {
-        "description": "Available to org admins only and with a valid license.\n\nYou need to have a permission with action `reports:send`.",
+      },
+      "delete": {
         "tags": [
-          "reports",
-          "enterprise"
+          "teams"
         ],
-        "summary": "Send test report via email.",
-        "operationId": "sendTestEmail",
+        "summary": "Remove Member From Team.",
+        "operationId": "removeTeamMember",
         "parameters": [
           {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/CreateOrUpdateConfigCmd"
-            }
+            "type": "string",
+            "name": "team_id",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "user_id",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
             "$ref": "#/responses/okResponse"
           },
-          "400": {
-            "$ref": "#/responses/badRequestError"
-          },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
@@ -8548,68 +8790,53 @@
         }
       }
     },
-    "/reports/{id}": {
+    "/teams/{team_id}/preferences": {
       "get": {
-        "description": "Available to org admins only and with a valid or expired license.\n\nYou need to have a permission with action `reports:read` with scope `reports:id:\u003creport ID\u003e`.",
         "tags": [
-          "reports",
-          "enterprise"
+          "teams"
         ],
-        "summary": "Get a report.",
-        "operationId": "getReport",
+        "summary": "Get Team Preferences.",
+        "operationId": "getTeamPreferences",
         "parameters": [
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "id",
+            "type": "string",
+            "name": "team_id",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getReportResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+            "$ref": "#/responses/getPreferencesResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       },
       "put": {
-        "description": "Available to org admins only and with a valid or expired license.\n\nYou need to have a permission with action `reports.admin:write` with scope `reports:id:\u003creport ID\u003e`.",
         "tags": [
-          "reports",
-          "enterprise"
+          "teams"
         ],
-        "summary": "Update a report.",
-        "operationId": "updateReport",
+        "summary": "Update Team Preferences.",
+        "operationId": "updateTeamPreferences",
         "parameters": [
+          {
+            "type": "string",
+            "name": "team_id",
+            "in": "path",
+            "required": true
+          },
           {
             "name": "body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/CreateOrUpdateConfigCmd"
+              "$ref": "#/definitions/UpdatePrefsCmd"
             }
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "name": "id",
-            "in": "path",
-            "required": true
           }
         ],
         "responses": {
@@ -8622,40 +8849,22 @@
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      },
-      "delete": {
-        "description": "Available to org admins only and with a valid or expired license.\n\nYou need to have a permission with action `reports.delete` with scope `reports:id:\u003creport ID\u003e`.",
+      }
+    },
+    "/user": {
+      "get": {
+        "description": "Get (current authenticated user)",
         "tags": [
-          "reports",
-          "enterprise"
-        ],
-        "summary": "Delete a report.",
-        "operationId": "deleteReport",
-        "parameters": [
-          {
-            "type": "integer",
-            "format": "int64",
-            "name": "id",
-            "in": "path",
-            "required": true
-          }
+          "signed_in_user"
         ],
+        "operationId": "getSignedInUser",
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+            "$ref": "#/responses/userResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -8670,69 +8879,95 @@
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/saml/acs": {
-      "post": {
+      },
+      "put": {
         "tags": [
-          "saml",
-          "enterprise"
+          "signed_in_user"
         ],
-        "summary": "It performs Assertion Consumer Service (ACS).",
-        "operationId": "postACS",
+        "summary": "Update signed in User.",
+        "operationId": "updateSignedInUser",
         "parameters": [
           {
-            "type": "string",
-            "name": "RelayState",
-            "in": "query"
+            "description": "To change the email, name, login, theme, provide another one.",
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/UpdateUserCommand"
+            }
           }
         ],
         "responses": {
-          "302": {
-            "description": "(empty)"
+          "200": {
+            "$ref": "#/responses/okResponse"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
           },
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "409": {
+            "$ref": "#/responses/conflictError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/saml/metadata": {
+    "/user/auth-tokens": {
       "get": {
-        "produces": [
-          "application/xml;application/samlmetadata+xml"
-        ],
+        "description": "Return a list of all auth tokens (devices) that the actual user currently have logged in from.",
         "tags": [
-          "saml",
-          "enterprise"
+          "signed_in_user"
         ],
-        "summary": "It exposes the SP (Grafana's) metadata for the IdP's consumption.",
-        "operationId": "getMetadata",
+        "summary": "Auth tokens of the actual User.",
+        "operationId": "getUserAuthTokens",
         "responses": {
           "200": {
-            "$ref": "#/responses/contentResponse"
+            "$ref": "#/responses/getUserAuthTokensResponse"
+          },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/saml/slo": {
+    "/user/email/update": {
       "get": {
-        "description": "There might be two possible requests:\n1. Logout response (callback) when Grafana initiates single logout and IdP returns response to logout request.\n2. Logout request when another SP initiates single logout and IdP sends logout request to the Grafana,\nor in case of IdP-initiated logout.",
+        "description": "Update the email of user given a verification code.",
         "tags": [
-          "saml",
-          "enterprise"
+          "user"
         ],
-        "summary": "It performs Single Logout (SLO) callback.",
-        "operationId": "getSLO",
+        "summary": "Update user email.",
+        "operationId": "updateUserEmail",
         "responses": {
           "302": {
-            "description": "(empty)"
+            "$ref": "#/responses/okResponse"
+          }
+        }
+      }
+    },
+    "/user/helpflags/clear": {
+      "get": {
+        "tags": [
+          "signed_in_user"
+        ],
+        "summary": "Clear user help flag.",
+        "operationId": "clearHelpFlags",
+        "responses": {
+          "200": {
+            "$ref": "#/responses/helpFlagResponse"
           },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
           },
           "403": {
             "$ref": "#/responses/forbiddenError"
@@ -8741,33 +8976,29 @@
             "$ref": "#/responses/internalServerError"
           }
         }
-      },
-      "post": {
-        "description": "There might be two possible requests:\n1. Logout response (callback) when Grafana initiates single logout and IdP returns response to logout request.\n2. Logout request when another SP initiates single logout and IdP sends logout request to the Grafana,\nor in case of IdP-initiated logout.",
+      }
+    },
+    "/user/helpflags/{flag_id}": {
+      "put": {
         "tags": [
-          "saml",
-          "enterprise"
+          "signed_in_user"
         ],
-        "summary": "It performs Single Logout (SLO) callback.",
-        "operationId": "postSLO",
+        "summary": "Set user help flag.",
+        "operationId": "setHelpFlag",
         "parameters": [
           {
             "type": "string",
-            "name": "SAMLRequest",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "name": "SAMLResponse",
-            "in": "query"
+            "name": "flag_id",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
-          "302": {
-            "description": "(empty)"
+          "200": {
+            "$ref": "#/responses/helpFlagResponse"
           },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
           },
           "403": {
             "$ref": "#/responses/forbiddenError"
@@ -8778,173 +9009,148 @@
         }
       }
     },
-    "/search": {
+    "/user/orgs": {
       "get": {
+        "security": [
+          {
+            "basic": []
+          }
+        ],
+        "description": "Return a list of all organizations of the current user.",
         "tags": [
-          "search"
+          "signed_in_user"
         ],
-        "operationId": "search",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "Search Query",
-            "name": "query",
-            "in": "query"
+        "summary": "Organizations of the actual User.",
+        "operationId": "getSignedInUserOrgList",
+        "responses": {
+          "200": {
+            "$ref": "#/responses/getSignedInUserOrgListResponse"
           },
-          {
-            "type": "array",
-            "items": {
-              "type": "string"
-            },
-            "collectionFormat": "multi",
-            "description": "List of tags to search for",
-            "name": "tag",
-            "in": "query"
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
           },
-          {
-            "enum": [
-              "dash-folder",
-              "dash-db"
-            ],
-            "type": "string",
-            "description": "Type to search for, dash-folder or dash-db",
-            "name": "type",
-            "in": "query"
+          "403": {
+            "$ref": "#/responses/forbiddenError"
           },
+          "500": {
+            "$ref": "#/responses/internalServerError"
+          }
+        }
+      }
+    },
+    "/user/password": {
+      "put": {
+        "security": [
           {
-            "type": "array",
-            "items": {
-              "type": "integer",
-              "format": "int64"
-            },
-            "description": "List of dashboard id’s to search for\nThis is deprecated: users should use the `dashboardUIDs` query parameter instead",
-            "name": "dashboardIds",
-            "in": "query"
-          },
+            "basic": []
+          }
+        ],
+        "description": "Changes the password for the user.",
+        "tags": [
+          "signed_in_user"
+        ],
+        "summary": "Change Password.",
+        "operationId": "changeUserPassword",
+        "parameters": [
           {
-            "type": "array",
-            "items": {
-              "type": "string"
-            },
-            "description": "List of dashboard uid’s to search for",
-            "name": "dashboardUIDs",
-            "in": "query"
+            "description": "To change the email, name, login, theme, provide another one.",
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/ChangeUserPasswordCommand"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/okResponse"
           },
-          {
-            "type": "array",
-            "items": {
-              "type": "integer",
-              "format": "int64"
-            },
-            "description": "List of folder id’s to search in for dashboards\nIf it's `0` then it will query for the top level folders\nThis is deprecated: users should use the `folderUIDs` query parameter instead",
-            "name": "folderIds",
-            "in": "query"
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
-          {
-            "type": "array",
-            "items": {
-              "type": "string"
-            },
-            "description": "List of folder UID’s to search in for dashboards\nIf it's an empty string then it will query for the top level folders",
-            "name": "folderUIDs",
-            "in": "query"
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
           },
-          {
-            "type": "boolean",
-            "description": "Flag indicating if only starred Dashboards should be returned",
-            "name": "starred",
-            "in": "query"
+          "403": {
+            "$ref": "#/responses/forbiddenError"
           },
-          {
-            "type": "integer",
-            "format": "int64",
-            "description": "Limit the number of returned results (max 5000)",
-            "name": "limit",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "description": "Use this parameter to access hits beyond limit. Numbering starts at 1. limit param acts as page size. Only available in Grafana v6.2+.",
-            "name": "page",
-            "in": "query"
-          },
-          {
-            "enum": [
-              "Edit",
-              "View"
-            ],
-            "type": "string",
-            "default": "View",
-            "description": "Set to `Edit` to return dashboards/folders that the user can edit",
-            "name": "permission",
-            "in": "query"
-          },
-          {
-            "enum": [
-              "alpha-asc",
-              "alpha-desc"
-            ],
-            "type": "string",
-            "default": "alpha-asc",
-            "description": "Sort method; for listing all the possible sort methods use the search sorting endpoint.",
-            "name": "sort",
-            "in": "query"
+          "500": {
+            "$ref": "#/responses/internalServerError"
           }
+        }
+      }
+    },
+    "/user/preferences": {
+      "get": {
+        "tags": [
+          "user_preferences"
         ],
+        "summary": "Get user preferences.",
+        "operationId": "getUserPreferences",
         "responses": {
           "200": {
-            "$ref": "#/responses/searchResponse"
+            "$ref": "#/responses/getPreferencesResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
-          "422": {
-            "$ref": "#/responses/unprocessableEntityError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/search/sorting": {
-      "get": {
+      },
+      "put": {
+        "description": "Omitting a key (`theme`, `homeDashboardId`, `timezone`) will cause the current value to be replaced with the system default value.",
         "tags": [
-          "search"
+          "user_preferences"
+        ],
+        "summary": "Update user preferences.",
+        "operationId": "updateUserPreferences",
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/UpdatePrefsCmd"
+            }
+          }
         ],
-        "summary": "List search sorting options.",
-        "operationId": "listSortOptions",
         "responses": {
           "200": {
-            "$ref": "#/responses/listSortOptionsResponse"
+            "$ref": "#/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/serviceaccounts": {
-      "post": {
-        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:write` scope: `serviceaccounts:*`\n\nRequires basic authentication and that the authenticated user is a Grafana Admin.",
+      },
+      "patch": {
         "tags": [
-          "service_accounts"
+          "user_preferences"
         ],
-        "summary": "Create service account",
-        "operationId": "createServiceAccount",
+        "summary": "Patch user preferences.",
+        "operationId": "patchUserPreferences",
         "parameters": [
           {
-            "name": "Body",
+            "name": "body",
             "in": "body",
+            "required": true,
             "schema": {
-              "$ref": "#/definitions/CreateServiceAccountForm"
+              "$ref": "#/definitions/PatchPrefsCmd"
             }
           }
         ],
         "responses": {
-          "201": {
-            "$ref": "#/responses/createServiceAccountResponse"
+          "200": {
+            "$ref": "#/responses/okResponse"
           },
           "400": {
             "$ref": "#/responses/badRequestError"
@@ -8952,58 +9158,22 @@
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/serviceaccounts/search": {
+    "/user/quotas": {
       "get": {
-        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:read` scope: `serviceaccounts:*`",
         "tags": [
-          "service_accounts"
-        ],
-        "summary": "Search service accounts with paging",
-        "operationId": "searchOrgServiceAccountsWithPaging",
-        "parameters": [
-          {
-            "type": "boolean",
-            "name": "Disabled",
-            "in": "query"
-          },
-          {
-            "type": "boolean",
-            "name": "expiredTokens",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "description": "It will return results where the query value is contained in one of the name.\nQuery values with spaces need to be URL encoded.",
-            "name": "query",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "description": "The default value is 1000.",
-            "name": "perpage",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "description": "The default value is 1.",
-            "name": "page",
-            "in": "query"
-          }
+          "signed_in_user"
         ],
+        "summary": "Fetch user quota.",
+        "operationId": "getUserQuotas",
         "responses": {
           "200": {
-            "$ref": "#/responses/searchOrgServiceAccountsWithPagingResponse"
+            "$ref": "#/responses/getQuotaResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -9011,32 +9181,36 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/serviceaccounts/{serviceAccountId}": {
-      "get": {
-        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:read` scope: `serviceaccounts:id:1` (single service account)",
+    "/user/revoke-auth-token": {
+      "post": {
+        "description": "Revokes the given auth token (device) for the actual user. User of issued auth token (device) will no longer be logged in and will be required to authenticate again upon next activity.",
         "tags": [
-          "service_accounts"
+          "signed_in_user"
         ],
-        "summary": "Get single serviceaccount by Id",
-        "operationId": "retrieveServiceAccount",
+        "summary": "Revoke an auth token of the actual User.",
+        "operationId": "revokeUserAuthToken",
         "parameters": [
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "serviceAccountId",
-            "in": "path",
-            "required": true
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/RevokeAuthTokenCmd"
+            }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/retrieveServiceAccountResponse"
+            "$ref": "#/responses/okResponse"
           },
           "400": {
             "$ref": "#/responses/badRequestError"
@@ -9047,26 +9221,24 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      },
-      "delete": {
-        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:delete` scope: `serviceaccounts:id:1` (single service account)",
+      }
+    },
+    "/user/stars/dashboard/uid/{dashboard_uid}": {
+      "post": {
+        "description": "Stars the given Dashboard for the actual user.",
         "tags": [
-          "service_accounts"
+          "signed_in_user"
         ],
-        "summary": "Delete service account",
-        "operationId": "deleteServiceAccount",
+        "summary": "Star a dashboard.",
+        "operationId": "starDashboardByUID",
         "parameters": [
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "serviceAccountId",
+            "type": "string",
+            "name": "dashboard_uid",
             "in": "path",
             "required": true
           }
@@ -9089,32 +9261,24 @@
           }
         }
       },
-      "patch": {
-        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:write` scope: `serviceaccounts:id:1` (single service account)",
+      "delete": {
+        "description": "Deletes the starring of the given Dashboard for the actual user.",
         "tags": [
-          "service_accounts"
+          "signed_in_user"
         ],
-        "summary": "Update service account",
-        "operationId": "updateServiceAccount",
+        "summary": "Unstar a dashboard.",
+        "operationId": "unstarDashboardByUID",
         "parameters": [
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "serviceAccountId",
+            "type": "string",
+            "name": "dashboard_uid",
             "in": "path",
             "required": true
-          },
-          {
-            "name": "Body",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/UpdateServiceAccountForm"
-            }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/updateServiceAccountResponse"
+            "$ref": "#/responses/okResponse"
           },
           "400": {
             "$ref": "#/responses/badRequestError"
@@ -9125,35 +9289,32 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/serviceaccounts/{serviceAccountId}/tokens": {
-      "get": {
-        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:read` scope: `global:serviceaccounts:id:1` (single service account)\n\nRequires basic authentication and that the authenticated user is a Grafana Admin.",
+    "/user/stars/dashboard/{dashboard_id}": {
+      "post": {
+        "description": "Stars the given Dashboard for the actual user.",
         "tags": [
-          "service_accounts"
+          "signed_in_user"
         ],
-        "summary": "Get service account tokens",
-        "operationId": "listTokens",
+        "summary": "Star a dashboard.",
+        "operationId": "starDashboard",
+        "deprecated": true,
         "parameters": [
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "serviceAccountId",
+            "type": "string",
+            "name": "dashboard_id",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/listTokensResponse"
+            "$ref": "#/responses/okResponse"
           },
           "400": {
             "$ref": "#/responses/badRequestError"
@@ -9169,32 +9330,25 @@
           }
         }
       },
-      "post": {
-        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:write` scope: `serviceaccounts:id:1` (single service account)",
+      "delete": {
+        "description": "Deletes the starring of the given Dashboard for the actual user.",
         "tags": [
-          "service_accounts"
+          "signed_in_user"
         ],
-        "summary": "CreateNewToken adds a token to a service account",
-        "operationId": "createToken",
+        "summary": "Unstar a dashboard.",
+        "operationId": "unstarDashboard",
+        "deprecated": true,
         "parameters": [
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "serviceAccountId",
+            "type": "string",
+            "name": "dashboard_id",
             "in": "path",
             "required": true
-          },
-          {
-            "name": "Body",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/AddServiceAccountTokenCommand"
-            }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/createTokenResponse"
+            "$ref": "#/responses/okResponse"
           },
           "400": {
             "$ref": "#/responses/badRequestError"
@@ -9205,11 +9359,29 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
+          "500": {
+            "$ref": "#/responses/internalServerError"
+          }
+        }
+      }
+    },
+    "/user/teams": {
+      "get": {
+        "description": "Return a list of all teams that the current user is member of.",
+        "tags": [
+          "signed_in_user"
+        ],
+        "summary": "Teams that the actual User is member of.",
+        "operationId": "getSignedInUserTeamList",
+        "responses": {
+          "200": {
+            "$ref": "#/responses/getSignedInUserTeamListResponse"
           },
-          "409": {
-            "$ref": "#/responses/conflictError"
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
           },
           "500": {
             "$ref": "#/responses/internalServerError"
@@ -9217,26 +9389,19 @@
         }
       }
     },
-    "/serviceaccounts/{serviceAccountId}/tokens/{tokenId}": {
-      "delete": {
-        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:write` scope: `serviceaccounts:id:1` (single service account)\n\nRequires basic authentication and that the authenticated user is a Grafana Admin.",
+    "/user/using/{org_id}": {
+      "post": {
+        "description": "Switch user context to the given organization.",
         "tags": [
-          "service_accounts"
+          "signed_in_user"
         ],
-        "summary": "DeleteToken deletes service account tokens",
-        "operationId": "deleteToken",
+        "summary": "Switch user context for signed in user.",
+        "operationId": "userSetUsingOrg",
         "parameters": [
           {
             "type": "integer",
             "format": "int64",
-            "name": "tokenId",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "name": "serviceAccountId",
+            "name": "org_id",
             "in": "path",
             "required": true
           }
@@ -9254,71 +9419,73 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/signing-keys/keys": {
+    "/users": {
       "get": {
-        "description": "Required permissions\nNone",
+        "description": "Returns all users that the authenticated user has permission to view, admin permission required.",
         "tags": [
-          "signing_keys"
+          "users"
         ],
-        "summary": "Get JSON Web Key Set (JWKS) with all the keys that can be used to verify tokens (public keys)",
-        "operationId": "retrieveJWKS",
-        "responses": {
-          "200": {
-            "$ref": "#/responses/jwksResponse"
+        "summary": "Get users.",
+        "operationId": "searchUsers",
+        "parameters": [
+          {
+            "type": "integer",
+            "format": "int64",
+            "default": 1000,
+            "description": "Limit the maximum number of users to return per page",
+            "name": "perpage",
+            "in": "query"
           },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+          {
+            "type": "integer",
+            "format": "int64",
+            "default": 1,
+            "description": "Page index for starting fetching users",
+            "name": "page",
+            "in": "query"
           }
-        }
-      }
-    },
-    "/snapshot/shared-options": {
-      "get": {
-        "tags": [
-          "snapshots"
         ],
-        "summary": "Get snapshot sharing settings.",
-        "operationId": "getSharingOptions",
         "responses": {
           "200": {
-            "$ref": "#/responses/getSharingOptionsResponse"
+            "$ref": "#/responses/searchUsersResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
+          },
+          "500": {
+            "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/snapshots": {
-      "post": {
-        "description": "Snapshot public mode should be enabled or authentication is required.",
+    "/users/lookup": {
+      "get": {
         "tags": [
-          "snapshots"
+          "users"
         ],
-        "summary": "When creating a snapshot using the API, you have to provide the full dashboard payload including the snapshot data. This endpoint is designed for the Grafana UI.",
-        "operationId": "createDashboardSnapshot",
+        "summary": "Get user by login or email.",
+        "operationId": "getUserByLoginOrEmail",
         "parameters": [
           {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/CreateDashboardSnapshotCommand"
-            }
+            "type": "string",
+            "description": "loginOrEmail of the user",
+            "name": "loginOrEmail",
+            "in": "query",
+            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/createDashboardSnapshotResponse"
+            "$ref": "#/responses/userResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -9326,31 +9493,25 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/snapshots-delete/{deleteKey}": {
+    "/users/search": {
       "get": {
-        "description": "Snapshot public mode should be enabled or authentication is required.",
         "tags": [
-          "snapshots"
-        ],
-        "summary": "Delete Snapshot by deleteKey.",
-        "operationId": "deleteDashboardSnapshotByDeleteKey",
-        "parameters": [
-          {
-            "type": "string",
-            "name": "deleteKey",
-            "in": "path",
-            "required": true
-          }
+          "users"
         ],
+        "summary": "Get users with paging.",
+        "operationId": "searchUsersWithPaging",
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
+            "$ref": "#/responses/searchUsersWithPagingResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -9367,27 +9528,31 @@
         }
       }
     },
-    "/snapshots/{key}": {
+    "/users/{user_id}": {
       "get": {
         "tags": [
-          "snapshots"
+          "users"
         ],
-        "summary": "Get Snapshot by Key.",
-        "operationId": "getDashboardSnapshot",
+        "summary": "Get user by id.",
+        "operationId": "getUserByID",
         "parameters": [
           {
-            "type": "string",
-            "name": "key",
+            "type": "integer",
+            "format": "int64",
+            "name": "user_id",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getDashboardSnapshotResponse"
+            "$ref": "#/responses/userResponse"
           },
-          "400": {
-            "$ref": "#/responses/badRequestError"
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/responses/forbiddenError"
           },
           "404": {
             "$ref": "#/responses/notFoundError"
@@ -9397,16 +9562,27 @@
           }
         }
       },
-      "delete": {
+      "put": {
+        "description": "Update the user identified by id.",
         "tags": [
-          "snapshots"
+          "users"
         ],
-        "summary": "Delete Snapshot by Key.",
-        "operationId": "deleteDashboardSnapshot",
+        "summary": "Update user.",
+        "operationId": "updateUser",
         "parameters": [
           {
-            "type": "string",
-            "name": "key",
+            "description": "To change the email, name, login, theme, provide another one.",
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/UpdateUserCommand"
+            }
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "name": "user_id",
             "in": "path",
             "required": true
           }
@@ -9415,38 +9591,44 @@
           "200": {
             "$ref": "#/responses/okResponse"
           },
+          "401": {
+            "$ref": "#/responses/unauthorisedError"
+          },
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
           "404": {
             "$ref": "#/responses/notFoundError"
           },
+          "409": {
+            "$ref": "#/responses/conflictError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/teams": {
-      "post": {
+    "/users/{user_id}/orgs": {
+      "get": {
+        "description": "Get organizations for user identified by id.",
         "tags": [
-          "teams"
+          "users"
         ],
-        "summary": "Add Team.",
-        "operationId": "createTeam",
+        "summary": "Get organizations for user.",
+        "operationId": "getUserOrgList",
         "parameters": [
           {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/CreateTeamCommand"
-            }
+            "type": "integer",
+            "format": "int64",
+            "name": "user_id",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/createTeamResponse"
+            "$ref": "#/responses/getUserOrgListResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -9454,8 +9636,8 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "409": {
-            "$ref": "#/responses/conflictError"
+          "404": {
+            "$ref": "#/responses/notFoundError"
           },
           "500": {
             "$ref": "#/responses/internalServerError"
@@ -9463,44 +9645,26 @@
         }
       }
     },
-    "/teams/search": {
+    "/users/{user_id}/teams": {
       "get": {
+        "description": "Get teams for user identified by id.",
         "tags": [
-          "teams"
+          "users"
         ],
-        "summary": "Team Search With Paging.",
-        "operationId": "searchTeams",
+        "summary": "Get teams for user.",
+        "operationId": "getUserTeams",
         "parameters": [
           {
             "type": "integer",
             "format": "int64",
-            "default": 1,
-            "name": "page",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "default": 1000,
-            "description": "Number of items per page\nThe totalCount field in the response can be used for pagination list E.g. if totalCount is equal to 100 teams and the perpage parameter is set to 10 then there are 10 pages of teams.",
-            "name": "perpage",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "name": "name",
-            "in": "query"
-          },
-          {
-            "type": "string",
-            "description": "If set it will return results where the query value is contained in the name field. Query values with spaces need to be URL encoded.",
-            "name": "query",
-            "in": "query"
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/searchTeamsResponse"
+            "name": "user_id",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/getUserTeamsResponse"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -9508,1148 +9672,1204 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/teams/{teamId}/groups": {
+    "/v1/provisioning/alert-rules": {
       "get": {
         "tags": [
-          "sync_team_groups",
-          "enterprise"
-        ],
-        "summary": "Get External Groups.",
-        "operationId": "getTeamGroupsApi",
-        "parameters": [
-          {
-            "type": "integer",
-            "format": "int64",
-            "name": "teamId",
-            "in": "path",
-            "required": true
-          }
+          "provisioning"
         ],
+        "summary": "Get all the alert rules.",
+        "operationId": "RouteGetAlertRules",
         "responses": {
           "200": {
-            "$ref": "#/responses/getTeamGroupsApiResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+            "description": "ProvisionedAlertRules",
+            "schema": {
+              "$ref": "#/definitions/ProvisionedAlertRules"
+            }
           }
         }
       },
       "post": {
+        "consumes": [
+          "application/json"
+        ],
         "tags": [
-          "sync_team_groups",
-          "enterprise"
+          "provisioning"
         ],
-        "summary": "Add External Group.",
-        "operationId": "addTeamGroupApi",
+        "summary": "Create a new alert rule.",
+        "operationId": "RoutePostAlertRule",
         "parameters": [
           {
-            "name": "body",
+            "name": "Body",
             "in": "body",
-            "required": true,
             "schema": {
-              "$ref": "#/definitions/TeamGroupMapping"
+              "$ref": "#/definitions/ProvisionedAlertRule"
             }
           },
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "teamId",
-            "in": "path",
-            "required": true
+            "type": "string",
+            "name": "X-Disable-Provenance",
+            "in": "header"
           }
         ],
         "responses": {
-          "200": {
-            "$ref": "#/responses/okResponse"
+          "201": {
+            "description": "ProvisionedAlertRule",
+            "schema": {
+              "$ref": "#/definitions/ProvisionedAlertRule"
+            }
           },
           "400": {
-            "$ref": "#/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+            "description": "ValidationError",
+            "schema": {
+              "$ref": "#/definitions/ValidationError"
+            }
           }
         }
-      },
-      "delete": {
+      }
+    },
+    "/v1/provisioning/alert-rules/export": {
+      "get": {
+        "produces": [
+          "application/json",
+          "application/yaml",
+          "application/terraform+hcl",
+          "text/yaml",
+          "text/hcl"
+        ],
         "tags": [
-          "sync_team_groups",
-          "enterprise"
+          "provisioning"
         ],
-        "summary": "Remove External Group.",
-        "operationId": "removeTeamGroupApiQuery",
+        "summary": "Export all alert rules in provisioning file format.",
+        "operationId": "RouteGetAlertRulesExport",
         "parameters": [
           {
+            "type": "boolean",
+            "default": false,
+            "description": "Whether to initiate a download of the file or not.",
+            "name": "download",
+            "in": "query"
+          },
+          {
+            "enum": [
+              "yaml",
+              "json",
+              "hcl"
+            ],
             "type": "string",
-            "name": "groupId",
+            "default": "yaml",
+            "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+            "name": "format",
             "in": "query"
           },
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "teamId",
-            "in": "path",
-            "required": true
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "UIDs of folders from which to export rules",
+            "name": "folderUid",
+            "in": "query"
+          },
+          {
+            "type": "string",
+            "description": "Name of group of rules to export. Must be specified only together with a single folder UID",
+            "name": "group",
+            "in": "query"
+          },
+          {
+            "type": "string",
+            "description": "UID of alert rule to export. If specified, parameters folderUid and group must be empty.",
+            "name": "ruleUid",
+            "in": "query"
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
+            "description": "AlertingFileExport",
+            "schema": {
+              "$ref": "#/definitions/AlertingFileExport"
+            }
           },
           "404": {
-            "$ref": "#/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+            "description": " Not found."
           }
         }
       }
     },
-    "/teams/{team_id}": {
+    "/v1/provisioning/alert-rules/{UID}": {
       "get": {
         "tags": [
-          "teams"
+          "provisioning"
         ],
-        "summary": "Get Team By ID.",
-        "operationId": "getTeamByID",
+        "summary": "Get a specific alert rule by UID.",
+        "operationId": "RouteGetAlertRule",
         "parameters": [
           {
             "type": "string",
-            "name": "team_id",
+            "description": "Alert rule UID",
+            "name": "UID",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getTeamByIDResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
+            "description": "ProvisionedAlertRule",
+            "schema": {
+              "$ref": "#/definitions/ProvisionedAlertRule"
+            }
           },
           "404": {
-            "$ref": "#/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+            "description": " Not found."
           }
         }
       },
       "put": {
+        "consumes": [
+          "application/json"
+        ],
         "tags": [
-          "teams"
+          "provisioning"
         ],
-        "summary": "Update Team.",
-        "operationId": "updateTeam",
+        "summary": "Update an existing alert rule.",
+        "operationId": "RoutePutAlertRule",
         "parameters": [
           {
-            "name": "body",
+            "type": "string",
+            "description": "Alert rule UID",
+            "name": "UID",
+            "in": "path",
+            "required": true
+          },
+          {
+            "name": "Body",
             "in": "body",
-            "required": true,
             "schema": {
-              "$ref": "#/definitions/UpdateTeamCommand"
+              "$ref": "#/definitions/ProvisionedAlertRule"
             }
           },
           {
             "type": "string",
-            "name": "team_id",
-            "in": "path",
-            "required": true
+            "name": "X-Disable-Provenance",
+            "in": "header"
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
-          "409": {
-            "$ref": "#/responses/conflictError"
+            "description": "ProvisionedAlertRule",
+            "schema": {
+              "$ref": "#/definitions/ProvisionedAlertRule"
+            }
           },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+          "400": {
+            "description": "ValidationError",
+            "schema": {
+              "$ref": "#/definitions/ValidationError"
+            }
           }
         }
       },
       "delete": {
         "tags": [
-          "teams"
+          "provisioning"
         ],
-        "summary": "Delete Team By ID.",
-        "operationId": "deleteTeamByID",
+        "summary": "Delete a specific alert rule by UID.",
+        "operationId": "RouteDeleteAlertRule",
         "parameters": [
           {
             "type": "string",
-            "name": "team_id",
+            "description": "Alert rule UID",
+            "name": "UID",
             "in": "path",
             "required": true
+          },
+          {
+            "type": "string",
+            "name": "X-Disable-Provenance",
+            "in": "header"
           }
         ],
         "responses": {
-          "200": {
-            "$ref": "#/responses/okResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+          "204": {
+            "description": " The alert rule was deleted successfully."
           }
         }
       }
     },
-    "/teams/{team_id}/members": {
+    "/v1/provisioning/alert-rules/{UID}/export": {
       "get": {
+        "produces": [
+          "application/json",
+          "application/yaml",
+          "application/terraform+hcl",
+          "text/yaml",
+          "text/hcl"
+        ],
         "tags": [
-          "teams"
+          "provisioning"
         ],
-        "summary": "Get Team Members.",
-        "operationId": "getTeamMembers",
+        "summary": "Export an alert rule in provisioning file format.",
+        "operationId": "RouteGetAlertRuleExport",
         "parameters": [
           {
+            "type": "boolean",
+            "default": false,
+            "description": "Whether to initiate a download of the file or not.",
+            "name": "download",
+            "in": "query"
+          },
+          {
+            "enum": [
+              "yaml",
+              "json",
+              "hcl"
+            ],
             "type": "string",
-            "name": "team_id",
+            "default": "yaml",
+            "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+            "name": "format",
+            "in": "query"
+          },
+          {
+            "type": "string",
+            "description": "Alert rule UID",
+            "name": "UID",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/getTeamMembersResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
+            "description": "AlertingFileExport",
+            "schema": {
+              "$ref": "#/definitions/AlertingFileExport"
+            }
           },
           "404": {
-            "$ref": "#/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+            "description": " Not found."
           }
         }
-      },
-      "post": {
+      }
+    },
+    "/v1/provisioning/contact-points": {
+      "get": {
         "tags": [
-          "teams"
+          "provisioning"
         ],
-        "summary": "Add Team Member.",
-        "operationId": "addTeamMember",
+        "summary": "Get all the contact points.",
+        "operationId": "RouteGetContactpoints",
         "parameters": [
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/AddTeamMemberCommand"
-            }
-          },
           {
             "type": "string",
-            "name": "team_id",
-            "in": "path",
-            "required": true
+            "description": "Filter by name",
+            "name": "name",
+            "in": "query"
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+            "description": "ContactPoints",
+            "schema": {
+              "$ref": "#/definitions/ContactPoints"
+            }
           }
         }
-      }
-    },
-    "/teams/{team_id}/members/{user_id}": {
-      "put": {
+      },
+      "post": {
+        "consumes": [
+          "application/json"
+        ],
         "tags": [
-          "teams"
+          "provisioning"
         ],
-        "summary": "Update Team Member.",
-        "operationId": "updateTeamMember",
+        "summary": "Create a contact point.",
+        "operationId": "RoutePostContactpoints",
         "parameters": [
           {
-            "name": "body",
+            "name": "Body",
             "in": "body",
-            "required": true,
             "schema": {
-              "$ref": "#/definitions/UpdateTeamMemberCommand"
+              "$ref": "#/definitions/EmbeddedContactPoint"
             }
           },
           {
             "type": "string",
-            "name": "team_id",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "name": "user_id",
-            "in": "path",
-            "required": true
+            "name": "X-Disable-Provenance",
+            "in": "header"
           }
         ],
         "responses": {
-          "200": {
-            "$ref": "#/responses/okResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/responses/notFoundError"
+          "202": {
+            "description": "EmbeddedContactPoint",
+            "schema": {
+              "$ref": "#/definitions/EmbeddedContactPoint"
+            }
           },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+          "400": {
+            "description": "ValidationError",
+            "schema": {
+              "$ref": "#/definitions/ValidationError"
+            }
           }
         }
-      },
-      "delete": {
+      }
+    },
+    "/v1/provisioning/contact-points/export": {
+      "get": {
+        "produces": [
+          "application/json",
+          "application/yaml",
+          "application/terraform+hcl",
+          "text/yaml",
+          "text/hcl"
+        ],
         "tags": [
-          "teams"
+          "provisioning"
         ],
-        "summary": "Remove Member From Team.",
-        "operationId": "removeTeamMember",
+        "summary": "Export all contact points in provisioning file format.",
+        "operationId": "RouteGetContactpointsExport",
         "parameters": [
           {
+            "type": "boolean",
+            "default": false,
+            "description": "Whether to initiate a download of the file or not.",
+            "name": "download",
+            "in": "query"
+          },
+          {
+            "enum": [
+              "yaml",
+              "json",
+              "hcl"
+            ],
             "type": "string",
-            "name": "team_id",
-            "in": "path",
-            "required": true
+            "default": "yaml",
+            "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+            "name": "format",
+            "in": "query"
           },
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "user_id",
-            "in": "path",
-            "required": true
+            "type": "boolean",
+            "default": false,
+            "description": "Whether any contained secure settings should be decrypted or left redacted. Redacted settings will contain RedactedValue instead. Currently, only org admin can view decrypted secure settings.",
+            "name": "decrypt",
+            "in": "query"
+          },
+          {
+            "type": "string",
+            "description": "Filter by name",
+            "name": "name",
+            "in": "query"
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
+            "description": "AlertingFileExport",
+            "schema": {
+              "$ref": "#/definitions/AlertingFileExport"
+            }
           },
           "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+            "description": "PermissionDenied",
+            "schema": {
+              "$ref": "#/definitions/PermissionDenied"
+            }
           }
         }
       }
     },
-    "/teams/{team_id}/preferences": {
-      "get": {
+    "/v1/provisioning/contact-points/{UID}": {
+      "put": {
+        "consumes": [
+          "application/json"
+        ],
         "tags": [
-          "teams"
+          "provisioning"
         ],
-        "summary": "Get Team Preferences.",
-        "operationId": "getTeamPreferences",
+        "summary": "Update an existing contact point.",
+        "operationId": "RoutePutContactpoint",
         "parameters": [
           {
             "type": "string",
-            "name": "team_id",
+            "description": "UID is the contact point unique identifier",
+            "name": "UID",
             "in": "path",
             "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/getPreferencesResponse"
           },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
+          {
+            "name": "Body",
+            "in": "body",
+            "schema": {
+              "$ref": "#/definitions/EmbeddedContactPoint"
+            }
           },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+          {
+            "type": "string",
+            "name": "X-Disable-Provenance",
+            "in": "header"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Ack",
+            "schema": {
+              "$ref": "#/definitions/Ack"
+            }
+          },
+          "400": {
+            "description": "ValidationError",
+            "schema": {
+              "$ref": "#/definitions/ValidationError"
+            }
           }
         }
       },
-      "put": {
+      "delete": {
+        "consumes": [
+          "application/json"
+        ],
         "tags": [
-          "teams"
+          "provisioning"
         ],
-        "summary": "Update Team Preferences.",
-        "operationId": "updateTeamPreferences",
+        "summary": "Delete a contact point.",
+        "operationId": "RouteDeleteContactpoints",
         "parameters": [
           {
             "type": "string",
-            "name": "team_id",
+            "description": "UID is the contact point unique identifier",
+            "name": "UID",
             "in": "path",
             "required": true
-          },
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/UpdatePrefsCmd"
-            }
           }
         ],
         "responses": {
-          "200": {
-            "$ref": "#/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+          "202": {
+            "description": " The contact point was deleted successfully."
           }
         }
       }
     },
-    "/user": {
+    "/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}": {
       "get": {
-        "description": "Get (current authenticated user)",
         "tags": [
-          "signed_in_user"
+          "provisioning"
+        ],
+        "summary": "Get a rule group.",
+        "operationId": "RouteGetAlertRuleGroup",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "FolderUID",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "name": "Group",
+            "in": "path",
+            "required": true
+          }
         ],
-        "operationId": "getSignedInUser",
         "responses": {
           "200": {
-            "$ref": "#/responses/userResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
+            "description": "AlertRuleGroup",
+            "schema": {
+              "$ref": "#/definitions/AlertRuleGroup"
+            }
           },
           "404": {
-            "$ref": "#/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+            "description": " Not found."
           }
         }
       },
       "put": {
+        "consumes": [
+          "application/json"
+        ],
         "tags": [
-          "signed_in_user"
+          "provisioning"
         ],
-        "summary": "Update signed in User.",
-        "operationId": "updateSignedInUser",
+        "summary": "Create or update alert rule group.",
+        "operationId": "RoutePutAlertRuleGroup",
         "parameters": [
           {
-            "description": "To change the email, name, login, theme, provide another one.",
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/UpdateUserCommand"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/okResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
-          }
-        }
-      }
-    },
-    "/user/auth-tokens": {
-      "get": {
-        "description": "Return a list of all auth tokens (devices) that the actual user currently have logged in from.",
-        "tags": [
-          "signed_in_user"
-        ],
-        "summary": "Auth tokens of the actual User.",
-        "operationId": "getUserAuthTokens",
-        "responses": {
-          "200": {
-            "$ref": "#/responses/getUserAuthTokensResponse"
+            "type": "string",
+            "name": "X-Disable-Provenance",
+            "in": "header"
           },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
+          {
+            "type": "string",
+            "name": "FolderUID",
+            "in": "path",
+            "required": true
           },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
+          {
+            "type": "string",
+            "name": "Group",
+            "in": "path",
+            "required": true
           },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+          {
+            "name": "Body",
+            "in": "body",
+            "schema": {
+              "$ref": "#/definitions/AlertRuleGroup"
+            }
           }
-        }
-      }
-    },
-    "/user/helpflags/clear": {
-      "get": {
-        "tags": [
-          "signed_in_user"
         ],
-        "summary": "Clear user help flag.",
-        "operationId": "clearHelpFlags",
         "responses": {
           "200": {
-            "$ref": "#/responses/helpFlagResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
+            "description": "AlertRuleGroup",
+            "schema": {
+              "$ref": "#/definitions/AlertRuleGroup"
+            }
           },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+          "400": {
+            "description": "ValidationError",
+            "schema": {
+              "$ref": "#/definitions/ValidationError"
+            }
           }
         }
-      }
-    },
-    "/user/helpflags/{flag_id}": {
-      "put": {
+      },
+      "delete": {
+        "description": "Delete rule group",
         "tags": [
-          "signed_in_user"
+          "provisioning"
         ],
-        "summary": "Set user help flag.",
-        "operationId": "setHelpFlag",
+        "operationId": "RouteDeleteAlertRuleGroup",
         "parameters": [
           {
             "type": "string",
-            "name": "flag_id",
+            "name": "FolderUID",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "name": "Group",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
-          "200": {
-            "$ref": "#/responses/helpFlagResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
+          "204": {
+            "description": " The alert rule group was deleted successfully."
           },
           "403": {
-            "$ref": "#/responses/forbiddenError"
+            "description": "ForbiddenError",
+            "schema": {
+              "$ref": "#/definitions/ForbiddenError"
+            }
           },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+          "404": {
+            "description": "NotFound",
+            "schema": {
+              "$ref": "#/definitions/NotFound"
+            }
           }
         }
       }
     },
-    "/user/orgs": {
+    "/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}/export": {
       "get": {
-        "security": [
-          {
-            "basic": []
-          }
+        "produces": [
+          "application/json",
+          "application/yaml",
+          "application/terraform+hcl",
+          "text/yaml",
+          "text/hcl"
         ],
-        "description": "Return a list of all organizations of the current user.",
         "tags": [
-          "signed_in_user"
+          "provisioning"
         ],
-        "summary": "Organizations of the actual User.",
-        "operationId": "getSignedInUserOrgList",
-        "responses": {
-          "200": {
-            "$ref": "#/responses/getSignedInUserOrgListResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
+        "summary": "Export an alert rule group in provisioning file format.",
+        "operationId": "RouteGetAlertRuleGroupExport",
+        "parameters": [
+          {
+            "type": "boolean",
+            "default": false,
+            "description": "Whether to initiate a download of the file or not.",
+            "name": "download",
+            "in": "query"
           },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
+          {
+            "enum": [
+              "yaml",
+              "json",
+              "hcl"
+            ],
+            "type": "string",
+            "default": "yaml",
+            "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+            "name": "format",
+            "in": "query"
           },
-          "500": {
-            "$ref": "#/responses/internalServerError"
-          }
-        }
-      }
-    },
-    "/user/password": {
-      "put": {
-        "security": [
           {
-            "basic": []
-          }
-        ],
-        "description": "Changes the password for the user.",
-        "tags": [
-          "signed_in_user"
-        ],
-        "summary": "Change Password.",
-        "operationId": "changeUserPassword",
-        "parameters": [
+            "type": "string",
+            "name": "FolderUID",
+            "in": "path",
+            "required": true
+          },
           {
-            "description": "To change the email, name, login, theme, provide another one.",
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/ChangeUserPasswordCommand"
-            }
+            "type": "string",
+            "name": "Group",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
+            "description": "AlertingFileExport",
+            "schema": {
+              "$ref": "#/definitions/AlertingFileExport"
+            }
           },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+          "404": {
+            "description": " Not found."
           }
         }
       }
     },
-    "/user/preferences": {
+    "/v1/provisioning/mute-timings": {
       "get": {
         "tags": [
-          "user_preferences"
+          "provisioning"
         ],
-        "summary": "Get user preferences.",
-        "operationId": "getUserPreferences",
+        "summary": "Get all the mute timings.",
+        "operationId": "RouteGetMuteTimings",
         "responses": {
           "200": {
-            "$ref": "#/responses/getPreferencesResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+            "description": "MuteTimings",
+            "schema": {
+              "$ref": "#/definitions/MuteTimings"
+            }
           }
         }
       },
-      "put": {
-        "description": "Omitting a key (`theme`, `homeDashboardId`, `timezone`) will cause the current value to be replaced with the system default value.",
+      "post": {
+        "consumes": [
+          "application/json"
+        ],
         "tags": [
-          "user_preferences"
+          "provisioning"
         ],
-        "summary": "Update user preferences.",
-        "operationId": "updateUserPreferences",
+        "summary": "Create a new mute timing.",
+        "operationId": "RoutePostMuteTiming",
         "parameters": [
           {
-            "name": "body",
+            "name": "Body",
             "in": "body",
-            "required": true,
             "schema": {
-              "$ref": "#/definitions/UpdatePrefsCmd"
+              "$ref": "#/definitions/MuteTimeInterval"
             }
+          },
+          {
+            "type": "string",
+            "name": "X-Disable-Provenance",
+            "in": "header"
           }
         ],
         "responses": {
-          "200": {
-            "$ref": "#/responses/okResponse"
+          "201": {
+            "description": "MuteTimeInterval",
+            "schema": {
+              "$ref": "#/definitions/MuteTimeInterval"
+            }
           },
           "400": {
-            "$ref": "#/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+            "description": "ValidationError",
+            "schema": {
+              "$ref": "#/definitions/ValidationError"
+            }
           }
         }
-      },
-      "patch": {
+      }
+    },
+    "/v1/provisioning/mute-timings/export": {
+      "get": {
+        "produces": [
+          "application/json",
+          "application/yaml",
+          "application/terraform+hcl",
+          "text/yaml",
+          "text/hcl"
+        ],
         "tags": [
-          "user_preferences"
+          "provisioning"
         ],
-        "summary": "Patch user preferences.",
-        "operationId": "patchUserPreferences",
+        "summary": "Export all mute timings in provisioning format.",
+        "operationId": "RouteExportMuteTimings",
         "parameters": [
           {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/PatchPrefsCmd"
-            }
+            "type": "boolean",
+            "default": false,
+            "description": "Whether to initiate a download of the file or not.",
+            "name": "download",
+            "in": "query"
+          },
+          {
+            "enum": [
+              "yaml",
+              "json",
+              "hcl"
+            ],
+            "type": "string",
+            "default": "yaml",
+            "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+            "name": "format",
+            "in": "query"
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
+            "description": "AlertingFileExport",
+            "schema": {
+              "$ref": "#/definitions/AlertingFileExport"
+            }
           },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+          "403": {
+            "description": "PermissionDenied",
+            "schema": {
+              "$ref": "#/definitions/PermissionDenied"
+            }
           }
         }
       }
     },
-    "/user/quotas": {
+    "/v1/provisioning/mute-timings/{name}": {
       "get": {
         "tags": [
-          "signed_in_user"
+          "provisioning"
+        ],
+        "summary": "Get a mute timing.",
+        "operationId": "RouteGetMuteTiming",
+        "parameters": [
+          {
+            "type": "string",
+            "description": "Mute timing name",
+            "name": "name",
+            "in": "path",
+            "required": true
+          }
         ],
-        "summary": "Fetch user quota.",
-        "operationId": "getUserQuotas",
         "responses": {
           "200": {
-            "$ref": "#/responses/getQuotaResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
+            "description": "MuteTimeInterval",
+            "schema": {
+              "$ref": "#/definitions/MuteTimeInterval"
+            }
           },
           "404": {
-            "$ref": "#/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+            "description": " Not found."
           }
         }
-      }
-    },
-    "/user/revoke-auth-token": {
-      "post": {
-        "description": "Revokes the given auth token (device) for the actual user. User of issued auth token (device) will no longer be logged in and will be required to authenticate again upon next activity.",
+      },
+      "put": {
+        "consumes": [
+          "application/json"
+        ],
         "tags": [
-          "signed_in_user"
+          "provisioning"
         ],
-        "summary": "Revoke an auth token of the actual User.",
-        "operationId": "revokeUserAuthToken",
+        "summary": "Replace an existing mute timing.",
+        "operationId": "RoutePutMuteTiming",
         "parameters": [
           {
-            "name": "body",
+            "type": "string",
+            "description": "Mute timing name",
+            "name": "name",
+            "in": "path",
+            "required": true
+          },
+          {
+            "name": "Body",
             "in": "body",
-            "required": true,
             "schema": {
-              "$ref": "#/definitions/RevokeAuthTokenCmd"
+              "$ref": "#/definitions/MuteTimeInterval"
             }
+          },
+          {
+            "type": "string",
+            "name": "X-Disable-Provenance",
+            "in": "header"
           }
         ],
         "responses": {
-          "200": {
-            "$ref": "#/responses/okResponse"
+          "202": {
+            "description": "MuteTimeInterval",
+            "schema": {
+              "$ref": "#/definitions/MuteTimeInterval"
+            }
           },
           "400": {
-            "$ref": "#/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+            "description": "ValidationError",
+            "schema": {
+              "$ref": "#/definitions/ValidationError"
+            }
           }
         }
-      }
-    },
-    "/user/stars/dashboard/uid/{dashboard_uid}": {
-      "post": {
-        "description": "Stars the given Dashboard for the actual user.",
+      },
+      "delete": {
         "tags": [
-          "signed_in_user"
+          "provisioning"
         ],
-        "summary": "Star a dashboard.",
-        "operationId": "starDashboardByUID",
+        "summary": "Delete a mute timing.",
+        "operationId": "RouteDeleteMuteTiming",
         "parameters": [
           {
             "type": "string",
-            "name": "dashboard_uid",
+            "description": "Mute timing name",
+            "name": "name",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
-          "200": {
-            "$ref": "#/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
+          "204": {
+            "description": " The mute timing was deleted successfully."
           },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+          "409": {
+            "description": "GenericPublicError",
+            "schema": {
+              "$ref": "#/definitions/GenericPublicError"
+            }
           }
         }
-      },
-      "delete": {
-        "description": "Deletes the starring of the given Dashboard for the actual user.",
+      }
+    },
+    "/v1/provisioning/mute-timings/{name}/export": {
+      "get": {
+        "produces": [
+          "application/json",
+          "application/yaml",
+          "application/terraform+hcl",
+          "text/yaml",
+          "text/hcl"
+        ],
         "tags": [
-          "signed_in_user"
+          "provisioning"
         ],
-        "summary": "Unstar a dashboard.",
-        "operationId": "unstarDashboardByUID",
+        "summary": "Export a mute timing in provisioning format.",
+        "operationId": "RouteExportMuteTiming",
         "parameters": [
           {
+            "type": "boolean",
+            "default": false,
+            "description": "Whether to initiate a download of the file or not.",
+            "name": "download",
+            "in": "query"
+          },
+          {
+            "enum": [
+              "yaml",
+              "json",
+              "hcl"
+            ],
             "type": "string",
-            "name": "dashboard_uid",
+            "default": "yaml",
+            "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+            "name": "format",
+            "in": "query"
+          },
+          {
+            "type": "string",
+            "description": "Mute timing name",
+            "name": "name",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
+            "description": "AlertingFileExport",
+            "schema": {
+              "$ref": "#/definitions/AlertingFileExport"
+            }
           },
           "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+            "description": "PermissionDenied",
+            "schema": {
+              "$ref": "#/definitions/PermissionDenied"
+            }
           }
         }
       }
     },
-    "/user/stars/dashboard/{dashboard_id}": {
-      "post": {
-        "description": "Stars the given Dashboard for the actual user.",
+    "/v1/provisioning/policies": {
+      "get": {
+        "tags": [
+          "provisioning"
+        ],
+        "summary": "Get the notification policy tree.",
+        "operationId": "RouteGetPolicyTree",
+        "responses": {
+          "200": {
+            "description": "Route",
+            "schema": {
+              "$ref": "#/definitions/Route"
+            }
+          }
+        }
+      },
+      "put": {
+        "consumes": [
+          "application/json"
+        ],
         "tags": [
-          "signed_in_user"
+          "provisioning"
         ],
-        "summary": "Star a dashboard.",
-        "operationId": "starDashboard",
-        "deprecated": true,
+        "summary": "Sets the notification policy tree.",
+        "operationId": "RoutePutPolicyTree",
         "parameters": [
+          {
+            "description": "The new notification routing tree to use",
+            "name": "Body",
+            "in": "body",
+            "schema": {
+              "$ref": "#/definitions/Route"
+            }
+          },
           {
             "type": "string",
-            "name": "dashboard_id",
-            "in": "path",
-            "required": true
+            "name": "X-Disable-Provenance",
+            "in": "header"
           }
         ],
         "responses": {
-          "200": {
-            "$ref": "#/responses/okResponse"
+          "202": {
+            "description": "Ack",
+            "schema": {
+              "$ref": "#/definitions/Ack"
+            }
           },
           "400": {
-            "$ref": "#/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+            "description": "ValidationError",
+            "schema": {
+              "$ref": "#/definitions/ValidationError"
+            }
           }
         }
       },
       "delete": {
-        "description": "Deletes the starring of the given Dashboard for the actual user.",
+        "consumes": [
+          "application/json"
+        ],
         "tags": [
-          "signed_in_user"
+          "provisioning"
         ],
-        "summary": "Unstar a dashboard.",
-        "operationId": "unstarDashboard",
-        "deprecated": true,
-        "parameters": [
-          {
-            "type": "string",
-            "name": "dashboard_id",
-            "in": "path",
-            "required": true
+        "summary": "Clears the notification policy tree.",
+        "operationId": "RouteResetPolicyTree",
+        "responses": {
+          "202": {
+            "description": "Ack",
+            "schema": {
+              "$ref": "#/definitions/Ack"
+            }
           }
+        }
+      }
+    },
+    "/v1/provisioning/policies/export": {
+      "get": {
+        "produces": [
+          "application/json",
+          "application/yaml",
+          "application/terraform+hcl",
+          "text/yaml",
+          "text/hcl"
+        ],
+        "tags": [
+          "provisioning"
         ],
+        "summary": "Export the notification policy tree in provisioning file format.",
+        "operationId": "RouteGetPolicyTreeExport",
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
+            "description": "AlertingFileExport",
+            "schema": {
+              "$ref": "#/definitions/AlertingFileExport"
+            }
           },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+          "404": {
+            "description": "NotFound",
+            "schema": {
+              "$ref": "#/definitions/NotFound"
+            }
           }
         }
       }
     },
-    "/user/teams": {
+    "/v1/provisioning/templates": {
       "get": {
-        "description": "Return a list of all teams that the current user is member of.",
         "tags": [
-          "signed_in_user"
+          "provisioning"
         ],
-        "summary": "Teams that the actual User is member of.",
-        "operationId": "getSignedInUserTeamList",
+        "summary": "Get all notification templates.",
+        "operationId": "RouteGetTemplates",
         "responses": {
           "200": {
-            "$ref": "#/responses/getSignedInUserTeamListResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
+            "description": "NotificationTemplates",
+            "schema": {
+              "$ref": "#/definitions/NotificationTemplates"
+            }
           },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+          "404": {
+            "description": " Not found."
           }
         }
       }
     },
-    "/user/using/{org_id}": {
-      "post": {
-        "description": "Switch user context to the given organization.",
+    "/v1/provisioning/templates/{name}": {
+      "get": {
         "tags": [
-          "signed_in_user"
+          "provisioning"
         ],
-        "summary": "Switch user context for signed in user.",
-        "operationId": "userSetUsingOrg",
+        "summary": "Get a notification template.",
+        "operationId": "RouteGetTemplate",
         "parameters": [
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "org_id",
+            "type": "string",
+            "description": "Template Name",
+            "name": "name",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
+            "description": "NotificationTemplate",
+            "schema": {
+              "$ref": "#/definitions/NotificationTemplate"
+            }
           },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+          "404": {
+            "description": " Not found."
           }
         }
-      }
-    },
-    "/users": {
-      "get": {
-        "description": "Returns all users that the authenticated user has permission to view, admin permission required.",
+      },
+      "put": {
+        "consumes": [
+          "application/json"
+        ],
         "tags": [
-          "users"
+          "provisioning"
         ],
-        "summary": "Get users.",
-        "operationId": "searchUsers",
+        "summary": "Updates an existing notification template.",
+        "operationId": "RoutePutTemplate",
         "parameters": [
           {
-            "type": "integer",
-            "format": "int64",
-            "default": 1000,
-            "description": "Limit the maximum number of users to return per page",
-            "name": "perpage",
-            "in": "query"
+            "type": "string",
+            "description": "Template Name",
+            "name": "name",
+            "in": "path",
+            "required": true
           },
           {
-            "type": "integer",
-            "format": "int64",
-            "default": 1,
-            "description": "Page index for starting fetching users",
-            "name": "page",
-            "in": "query"
+            "name": "Body",
+            "in": "body",
+            "schema": {
+              "$ref": "#/definitions/NotificationTemplateContent"
+            }
+          },
+          {
+            "type": "string",
+            "name": "X-Disable-Provenance",
+            "in": "header"
           }
         ],
         "responses": {
-          "200": {
-            "$ref": "#/responses/searchUsersResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
+          "202": {
+            "description": "NotificationTemplate",
+            "schema": {
+              "$ref": "#/definitions/NotificationTemplate"
+            }
           },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+          "400": {
+            "description": "ValidationError",
+            "schema": {
+              "$ref": "#/definitions/ValidationError"
+            }
           }
         }
-      }
-    },
-    "/users/lookup": {
-      "get": {
+      },
+      "delete": {
         "tags": [
-          "users"
+          "provisioning"
         ],
-        "summary": "Get user by login or email.",
-        "operationId": "getUserByLoginOrEmail",
+        "summary": "Delete a template.",
+        "operationId": "RouteDeleteTemplate",
         "parameters": [
           {
             "type": "string",
-            "description": "loginOrEmail of the user",
-            "name": "loginOrEmail",
-            "in": "query",
+            "description": "Template Name",
+            "name": "name",
+            "in": "path",
             "required": true
           }
         ],
         "responses": {
-          "200": {
-            "$ref": "#/responses/userResponse"
-          },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
+          "204": {
+            "description": " The template was deleted successfully."
           }
         }
       }
     },
-    "/users/search": {
+    "/v1/sso-settings": {
       "get": {
+        "description": "You need to have a permission with action `settings:read` with scope `settings:auth.\u003cprovider\u003e:*`.",
         "tags": [
-          "users"
+          "sso_settings"
         ],
-        "summary": "Get users with paging.",
-        "operationId": "searchUsersWithPaging",
+        "summary": "List all SSO Settings entries",
+        "operationId": "listAllProvidersSettings",
         "responses": {
           "200": {
-            "$ref": "#/responses/searchUsersWithPagingResponse"
+            "$ref": "#/responses/listSSOSettingsResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
           },
           "403": {
             "$ref": "#/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
           }
         }
       }
     },
-    "/users/{user_id}": {
+    "/v1/sso-settings/{key}": {
       "get": {
+        "description": "You need to have a permission with action `settings:read` with scope `settings:auth.\u003cprovider\u003e:*`.",
         "tags": [
-          "users"
+          "sso_settings"
         ],
-        "summary": "Get user by id.",
-        "operationId": "getUserByID",
+        "summary": "Get an SSO Settings entry by Key",
+        "operationId": "getProviderSettings",
         "parameters": [
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "user_id",
+            "type": "string",
+            "name": "key",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/userResponse"
+            "$ref": "#/responses/getSSOSettingsResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -10659,76 +10879,50 @@
           },
           "404": {
             "$ref": "#/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
           }
         }
       },
       "put": {
-        "description": "Update the user identified by id.",
+        "description": "Inserts or updates the SSO Settings for a provider.\n\nYou need to have a permission with action `settings:write` and scope `settings:auth.\u003cprovider\u003e:*`.",
         "tags": [
-          "users"
+          "sso_settings"
         ],
-        "summary": "Update user.",
-        "operationId": "updateUser",
+        "summary": "Update SSO Settings",
+        "operationId": "updateProviderSettings",
         "parameters": [
           {
-            "description": "To change the email, name, login, theme, provide another one.",
+            "type": "string",
+            "name": "key",
+            "in": "path",
+            "required": true
+          },
+          {
             "name": "body",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/UpdateUserCommand"
+              "type": "object",
+              "properties": {
+                "id": {
+                  "type": "string"
+                },
+                "provider": {
+                  "type": "string"
+                },
+                "settings": {
+                  "type": "object",
+                  "additionalProperties": false
+                }
+              }
             }
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "name": "user_id",
-            "in": "path",
-            "required": true
           }
         ],
         "responses": {
-          "200": {
+          "204": {
             "$ref": "#/responses/okResponse"
           },
-          "401": {
-            "$ref": "#/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/responses/internalServerError"
-          }
-        }
-      }
-    },
-    "/users/{user_id}/orgs": {
-      "get": {
-        "description": "Get organizations for user identified by id.",
-        "tags": [
-          "users"
-        ],
-        "summary": "Get organizations for user.",
-        "operationId": "getUserOrgList",
-        "parameters": [
-          {
-            "type": "integer",
-            "format": "int64",
-            "name": "user_id",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/getUserOrgListResponse"
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -10736,35 +10930,32 @@
           "403": {
             "$ref": "#/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/responses/internalServerError"
           }
         }
-      }
-    },
-    "/users/{user_id}/teams": {
-      "get": {
-        "description": "Get teams for user identified by id.",
+      },
+      "delete": {
+        "description": "Removes the SSO Settings for a provider.\n\nYou need to have a permission with action `settings:write` and scope `settings:auth.\u003cprovider\u003e:*`.",
         "tags": [
-          "users"
+          "sso_settings"
         ],
-        "summary": "Get teams for user.",
-        "operationId": "getUserTeams",
+        "summary": "Remove SSO Settings",
+        "operationId": "removeProviderSettings",
         "parameters": [
           {
-            "type": "integer",
-            "format": "int64",
-            "name": "user_id",
+            "type": "string",
+            "name": "key",
             "in": "path",
             "required": true
           }
         ],
         "responses": {
-          "200": {
-            "$ref": "#/responses/getUserTeamsResponse"
+          "204": {
+            "$ref": "#/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/responses/badRequestError"
           },
           "401": {
             "$ref": "#/responses/unauthorisedError"
@@ -10812,6 +11003,10 @@
           "type": "integer",
           "format": "int64"
         },
+        "active_anonymous_devices": {
+          "type": "integer",
+          "format": "int64"
+        },
         "active_users": {
           "type": "integer",
           "format": "int64"
@@ -10822,7 +11017,7 @@
         }
       }
     },
-    "AddCommand": {
+    "AddAPIKeyCommand": {
       "type": "object",
       "properties": {
         "name": {
@@ -10931,25 +11126,6 @@
         }
       }
     },
-    "AddPermissionDTO": {
-      "type": "object",
-      "properties": {
-        "builtinRole": {
-          "type": "string"
-        },
-        "permission": {
-          "$ref": "#/definitions/DsPermissionType"
-        },
-        "teamId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "userId": {
-          "type": "integer",
-          "format": "int64"
-        }
-      }
-    },
     "AddServiceAccountTokenCommand": {
       "type": "object",
       "properties": {
@@ -11030,7 +11206,7 @@
           "format": "int64"
         },
         "password": {
-          "type": "string"
+          "$ref": "#/definitions/Password"
         }
       }
     },
@@ -11053,6 +11229,10 @@
           "type": "integer",
           "format": "int64"
         },
+        "activeDevices": {
+          "type": "integer",
+          "format": "int64"
+        },
         "activeEditors": {
           "type": "integer",
           "format": "int64"
@@ -11147,7 +11327,7 @@
       "type": "object",
       "properties": {
         "password": {
-          "type": "string"
+          "$ref": "#/definitions/Password"
         }
       }
     },
@@ -11218,52 +11398,6 @@
         }
       }
     },
-    "AlertListItemDTO": {
-      "type": "object",
-      "properties": {
-        "dashboardId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "dashboardSlug": {
-          "type": "string"
-        },
-        "dashboardUid": {
-          "type": "string"
-        },
-        "evalData": {
-          "$ref": "#/definitions/Json"
-        },
-        "evalDate": {
-          "type": "string",
-          "format": "date-time"
-        },
-        "executionError": {
-          "type": "string"
-        },
-        "id": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "name": {
-          "type": "string"
-        },
-        "newStateDate": {
-          "type": "string",
-          "format": "date-time"
-        },
-        "panelId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "state": {
-          "$ref": "#/definitions/AlertStateType"
-        },
-        "url": {
-          "type": "string"
-        }
-      }
-    },
     "AlertManager": {
       "type": "object",
       "title": "AlertManager models a configured Alert Manager.",
@@ -11280,85 +11414,17 @@
       "type": "object",
       "title": "AlertManagersResult contains the result from querying the alertmanagers endpoint.",
       "properties": {
-        "activeAlertManagers": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/AlertManager"
-          }
-        },
-        "droppedAlertManagers": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/AlertManager"
-          }
-        }
-      }
-    },
-    "AlertNotification": {
-      "type": "object",
-      "properties": {
-        "created": {
-          "type": "string",
-          "format": "date-time"
-        },
-        "disableResolveMessage": {
-          "type": "boolean"
-        },
-        "frequency": {
-          "type": "string"
-        },
-        "id": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "isDefault": {
-          "type": "boolean"
-        },
-        "name": {
-          "type": "string"
-        },
-        "secureFields": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "boolean"
-          }
-        },
-        "sendReminder": {
-          "type": "boolean"
-        },
-        "settings": {
-          "$ref": "#/definitions/Json"
-        },
-        "type": {
-          "type": "string"
-        },
-        "uid": {
-          "type": "string"
-        },
-        "updated": {
-          "type": "string",
-          "format": "date-time"
-        }
-      }
-    },
-    "AlertNotificationLookup": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "isDefault": {
-          "type": "boolean"
-        },
-        "name": {
-          "type": "string"
-        },
-        "type": {
-          "type": "string"
+        "activeAlertManagers": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/AlertManager"
+          }
         },
-        "uid": {
-          "type": "string"
+        "droppedAlertManagers": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/AlertManager"
+          }
         }
       }
     },
@@ -11479,6 +11545,9 @@
             "OK"
           ]
         },
+        "notification_settings": {
+          "$ref": "#/definitions/AlertRuleNotificationSettingsExport"
+        },
         "panelId": {
           "type": "integer",
           "format": "int64"
@@ -11546,82 +11615,86 @@
         }
       }
     },
-    "AlertStateInfoDTO": {
+    "AlertRuleNotificationSettings": {
       "type": "object",
+      "required": [
+        "receiver"
+      ],
       "properties": {
-        "dashboardId": {
-          "type": "integer",
-          "format": "int64"
+        "group_by": {
+          "description": "Override the labels by which incoming alerts are grouped together. For example, multiple alerts coming in for\ncluster=A and alertname=LatencyHigh would be batched into a single group. To aggregate by all possible labels\nuse the special value '...' as the sole label name.\nThis effectively disables aggregation entirely, passing through all alerts as-is. This is unlikely to be what\nyou want, unless you have a very low alert volume or your upstream notification system performs its own grouping.\nMust include 'alertname' and 'grafana_folder' if not using '...'.",
+          "type": "array",
+          "default": [
+            "alertname",
+            "grafana_folder"
+          ],
+          "items": {
+            "type": "string"
+          },
+          "example": [
+            "alertname",
+            "grafana_folder",
+            "cluster"
+          ]
         },
-        "id": {
-          "type": "integer",
-          "format": "int64"
+        "group_interval": {
+          "description": "Override how long to wait before sending a notification about new alerts that are added to a group of alerts for\nwhich an initial notification has already been sent. (Usually ~5m or more.)",
+          "type": "string",
+          "example": "5m"
         },
-        "newStateDate": {
+        "group_wait": {
+          "description": "Override how long to initially wait to send a notification for a group of alerts. Allows to wait for an\ninhibiting alert to arrive or collect more initial alerts for the same group. (Usually ~0s to few minutes.)",
           "type": "string",
-          "format": "date-time"
+          "example": "30s"
         },
-        "panelId": {
-          "type": "integer",
-          "format": "int64"
+        "mute_time_intervals": {
+          "description": "Override the times when notifications should be muted. These must match the name of a mute time interval defined\nin the alertmanager configuration mute_time_intervals section. When muted it will not send any notifications, but\notherwise acts normally.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "example": [
+            "maintenance"
+          ]
         },
-        "state": {
-          "$ref": "#/definitions/AlertStateType"
-        }
-      }
-    },
-    "AlertStateType": {
-      "type": "string"
-    },
-    "AlertTestCommand": {
-      "type": "object",
-      "properties": {
-        "dashboard": {
-          "$ref": "#/definitions/Json"
+        "receiver": {
+          "description": "Name of the receiver to send notifications to.",
+          "type": "string",
+          "example": "grafana-default-email"
         },
-        "panelId": {
-          "type": "integer",
-          "format": "int64"
+        "repeat_interval": {
+          "description": "Override how long to wait before sending a notification again if it has already been sent successfully for an\nalert. (Usually ~3h or more).\nNote that this parameter is implicitly bound by Alertmanager's `--data.retention` configuration flag.\nNotifications will be resent after either repeat_interval or the data retention period have passed, whichever\noccurs first. `repeat_interval` should not be less than `group_interval`.",
+          "type": "string",
+          "example": "4h"
         }
       }
     },
-    "AlertTestResult": {
+    "AlertRuleNotificationSettingsExport": {
       "type": "object",
+      "title": "AlertRuleNotificationSettingsExport is the provisioned export of models.NotificationSettings.",
       "properties": {
-        "conditionEvals": {
-          "type": "string"
-        },
-        "error": {
-          "type": "string"
-        },
-        "firing": {
-          "type": "boolean"
-        },
-        "logs": {
+        "group_by": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/AlertTestResultLog"
+            "type": "string"
           }
         },
-        "matches": {
+        "group_interval": {
+          "type": "string"
+        },
+        "group_wait": {
+          "type": "string"
+        },
+        "mute_time_intervals": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/EvalMatch"
+            "type": "string"
           }
         },
-        "state": {
-          "$ref": "#/definitions/AlertStateType"
-        },
-        "timeMs": {
+        "receiver": {
           "type": "string"
-        }
-      }
-    },
-    "AlertTestResultLog": {
-      "type": "object",
-      "properties": {
-        "data": {},
-        "message": {
+        },
+        "repeat_interval": {
           "type": "string"
         }
       }
@@ -11646,6 +11719,12 @@
             "$ref": "#/definitions/AlertRuleGroupExport"
           }
         },
+        "muteTimes": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/MuteTimeIntervalExport"
+          }
+        },
         "policies": {
           "type": "array",
           "items": {
@@ -11747,6 +11826,80 @@
         }
       }
     },
+    "Annotation": {
+      "type": "object",
+      "properties": {
+        "alertId": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "alertName": {
+          "type": "string"
+        },
+        "avatarUrl": {
+          "type": "string"
+        },
+        "created": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "dashboardId": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "dashboardUID": {
+          "type": "string"
+        },
+        "data": {
+          "$ref": "#/definitions/Json"
+        },
+        "email": {
+          "type": "string"
+        },
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "login": {
+          "type": "string"
+        },
+        "newState": {
+          "type": "string"
+        },
+        "panelId": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "prevState": {
+          "type": "string"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "text": {
+          "type": "string"
+        },
+        "time": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "timeEnd": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "updated": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "userId": {
+          "type": "integer",
+          "format": "int64"
+        }
+      }
+    },
     "AnnotationActions": {
       "type": "object",
       "properties": {
@@ -11761,14 +11914,141 @@
         }
       }
     },
+    "AnnotationEvent": {
+      "type": "object",
+      "properties": {
+        "color": {
+          "type": "string"
+        },
+        "dashboardId": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "isRegion": {
+          "type": "boolean"
+        },
+        "panelId": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "source": {
+          "$ref": "#/definitions/AnnotationQuery"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "text": {
+          "type": "string"
+        },
+        "time": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "timeEnd": {
+          "type": "integer",
+          "format": "int64"
+        }
+      }
+    },
+    "AnnotationPanelFilter": {
+      "type": "object",
+      "title": "AnnotationPanelFilter defines model for AnnotationPanelFilter.",
+      "properties": {
+        "exclude": {
+          "description": "Should the specified panels be included or excluded",
+          "type": "boolean"
+        },
+        "ids": {
+          "description": "Panel IDs that should be included or excluded",
+          "type": "array",
+          "items": {
+            "type": "integer",
+            "format": "int64"
+          }
+        }
+      }
+    },
     "AnnotationPermission": {
       "type": "object",
       "properties": {
         "dashboard": {
           "$ref": "#/definitions/AnnotationActions"
         },
-        "organization": {
-          "$ref": "#/definitions/AnnotationActions"
+        "organization": {
+          "$ref": "#/definitions/AnnotationActions"
+        }
+      }
+    },
+    "AnnotationQuery": {
+      "description": "TODO docs\nFROM: AnnotationQuery in grafana-data/src/types/annotations.ts",
+      "type": "object",
+      "properties": {
+        "builtIn": {
+          "description": "Set to 1 for the standard annotation query all dashboards have by default.",
+          "type": "number",
+          "format": "float"
+        },
+        "datasource": {
+          "$ref": "#/definitions/DataSourceRef"
+        },
+        "enable": {
+          "description": "When enabled the annotation query is issued with every dashboard refresh",
+          "type": "boolean"
+        },
+        "filter": {
+          "$ref": "#/definitions/AnnotationPanelFilter"
+        },
+        "hide": {
+          "description": "Annotation queries can be toggled on or off at the top of the dashboard.\nWhen hide is true, the toggle is not shown in the dashboard.",
+          "type": "boolean"
+        },
+        "iconColor": {
+          "description": "Color to use for the annotation event markers",
+          "type": "string"
+        },
+        "name": {
+          "description": "Name of annotation.",
+          "type": "string"
+        },
+        "target": {
+          "$ref": "#/definitions/AnnotationTarget"
+        },
+        "type": {
+          "description": "TODO -- this should not exist here, it is based on the --grafana-- datasource",
+          "type": "string"
+        }
+      }
+    },
+    "AnnotationTarget": {
+      "description": "TODO: this should be a regular DataQuery that depends on the selected dashboard\nthese match the properties of the \"grafana\" datasouce that is default in most dashboards",
+      "type": "object",
+      "properties": {
+        "limit": {
+          "description": "Only required/valid for the grafana datasource...\nbut code+tests is already depending on it so hard to change",
+          "type": "integer",
+          "format": "int64"
+        },
+        "matchAny": {
+          "description": "Only required/valid for the grafana datasource...\nbut code+tests is already depending on it so hard to change",
+          "type": "boolean"
+        },
+        "tags": {
+          "description": "Only required/valid for the grafana datasource...\nbut code+tests is already depending on it so hard to change",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "type": {
+          "description": "Only required/valid for the grafana datasource...\nbut code+tests is already depending on it so hard to change",
+          "type": "string"
         }
       }
     },
@@ -11836,6 +12116,23 @@
         }
       }
     },
+    "Assignments": {
+      "type": "object",
+      "properties": {
+        "builtInRoles": {
+          "type": "boolean"
+        },
+        "serviceAccounts": {
+          "type": "boolean"
+        },
+        "teams": {
+          "type": "boolean"
+        },
+        "users": {
+          "type": "boolean"
+        }
+      }
+    },
     "AttributeTypeAndValue": {
       "description": "AttributeTypeAndValue mirrors the ASN.1 structure of the same name in\nRFC 5280, Section 4.1.2.4.",
       "type": "object",
@@ -11927,25 +12224,8 @@
         },
         "username": {
           "type": "string"
-        }
-      }
-    },
-    "BrandingOptionsDTO": {
-      "type": "object",
-      "properties": {
-        "emailFooterLink": {
-          "type": "string"
-        },
-        "emailFooterMode": {
-          "type": "string"
         },
-        "emailFooterText": {
-          "type": "string"
-        },
-        "emailLogoUrl": {
-          "type": "string"
-        },
-        "reportLogoUrl": {
+        "username_file": {
           "type": "string"
         }
       }
@@ -12211,10 +12491,10 @@
       "type": "object",
       "properties": {
         "newPassword": {
-          "type": "string"
+          "$ref": "#/definitions/Password"
         },
         "oldPassword": {
-          "type": "string"
+          "$ref": "#/definitions/Password"
         }
       }
     },
@@ -12237,6 +12517,7 @@
           }
         },
         "mute_time_intervals": {
+          "description": "MuteTimeIntervals is deprecated and will be removed before Alertmanager 1.0.",
           "type": "array",
           "items": {
             "$ref": "#/definitions/MuteTimeInterval"
@@ -12250,88 +12531,12 @@
           "items": {
             "type": "string"
           }
-        }
-      }
-    },
-    "ConfigDTO": {
-      "description": "ConfigDTO is model representation in transfer",
-      "type": "object",
-      "properties": {
-        "created": {
-          "type": "string",
-          "format": "date-time"
-        },
-        "dashboardId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "dashboardName": {
-          "type": "string"
-        },
-        "dashboardUid": {
-          "type": "string"
-        },
-        "dashboards": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/DashboardDTO"
-          }
         },
-        "enableCsv": {
-          "type": "boolean"
-        },
-        "enableDashboardUrl": {
-          "type": "boolean"
-        },
-        "formats": {
+        "time_intervals": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/Type"
+            "$ref": "#/definitions/TimeInterval"
           }
-        },
-        "id": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "message": {
-          "type": "string"
-        },
-        "name": {
-          "type": "string"
-        },
-        "options": {
-          "$ref": "#/definitions/ReportOptionsDTO"
-        },
-        "orgId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "recipients": {
-          "type": "string"
-        },
-        "replyTo": {
-          "type": "string"
-        },
-        "scaleFactor": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "schedule": {
-          "$ref": "#/definitions/ScheduleDTO"
-        },
-        "state": {
-          "$ref": "#/definitions/State"
-        },
-        "templateVars": {
-          "type": "object"
-        },
-        "updated": {
-          "type": "string",
-          "format": "date-time"
-        },
-        "userId": {
-          "type": "integer",
-          "format": "int64"
         }
       }
     },
@@ -12503,41 +12708,6 @@
       "format": "uint8",
       "title": "CounterResetHint contains the known information about a counter reset,"
     },
-    "CreateAlertNotificationCommand": {
-      "type": "object",
-      "properties": {
-        "disableResolveMessage": {
-          "type": "boolean"
-        },
-        "frequency": {
-          "type": "string"
-        },
-        "isDefault": {
-          "type": "boolean"
-        },
-        "name": {
-          "type": "string"
-        },
-        "secureSettings": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
-        "sendReminder": {
-          "type": "boolean"
-        },
-        "settings": {
-          "$ref": "#/definitions/Json"
-        },
-        "type": {
-          "type": "string"
-        },
-        "uid": {
-          "type": "string"
-        }
-      }
-    },
     "CreateCorrelationCommand": {
       "description": "CreateCorrelationCommand is the command for creating a correlation",
       "type": "object",
@@ -12585,8 +12755,12 @@
         "dashboard"
       ],
       "properties": {
+        "apiVersion": {
+          "description": "APIVersion defines the versioned schema of this representation of an object.\nServers should convert recognized schemas to the latest internal value, and\nmay reject unrecognized values.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources\n+optional",
+          "type": "string"
+        },
         "dashboard": {
-          "$ref": "#/definitions/Json"
+          "$ref": "#/definitions/Unstructured"
         },
         "deleteKey": {
           "description": "Unique key used to delete the snapshot. It is different from the `key` so that only the creator can delete the snapshot. Required if `external` is `true`.",
@@ -12607,6 +12781,10 @@
           "description": "Define the unique key. Required if `external` is `true`.",
           "type": "string"
         },
+        "kind": {
+          "description": "Kind is a string value representing the REST resource this object represents.\nServers may infer this from the endpoint the client submits requests to.\nCannot be updated.\nIn CamelCase.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds\n+optional",
+          "type": "string"
+        },
         "name": {
           "description": "Snapshot name",
           "type": "string"
@@ -12636,7 +12814,7 @@
       "type": "object",
       "properties": {
         "folderId": {
-          "description": "ID of the folder where the library element is stored.",
+          "description": "ID of the folder where the library element is stored.\n\nDeprecated: use FolderUID instead",
           "type": "integer",
           "format": "int64"
         },
@@ -12666,20 +12844,13 @@
         }
       }
     },
-    "CreateOrUpdateConfigCmd": {
+    "CreateOrUpdateReportConfig": {
       "type": "object",
       "properties": {
-        "dashboardId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "dashboardUid": {
-          "type": "string"
-        },
         "dashboards": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/DashboardDTO"
+            "$ref": "#/definitions/ReportDashboard"
           }
         },
         "enableCsv": {
@@ -12701,7 +12872,7 @@
           "type": "string"
         },
         "options": {
-          "$ref": "#/definitions/ReportOptionsDTO"
+          "$ref": "#/definitions/ReportOptions"
         },
         "recipients": {
           "type": "string"
@@ -12714,13 +12885,10 @@
           "format": "int64"
         },
         "schedule": {
-          "$ref": "#/definitions/ScheduleDTO"
+          "$ref": "#/definitions/ReportSchedule"
         },
         "state": {
           "$ref": "#/definitions/State"
-        },
-        "templateVars": {
-          "type": "object"
         }
       }
     },
@@ -12836,53 +13004,6 @@
         }
       }
     },
-    "CustomPermissionsRecordDTO": {
-      "type": "object",
-      "properties": {
-        "customPermissions": {
-          "type": "string"
-        },
-        "granteeName": {
-          "type": "string"
-        },
-        "granteeType": {
-          "type": "string"
-        },
-        "granteeUrl": {
-          "type": "string"
-        },
-        "id": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "isFolder": {
-          "type": "boolean"
-        },
-        "orgId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "orgRole": {
-          "type": "string"
-        },
-        "slug": {
-          "type": "string"
-        },
-        "title": {
-          "type": "string"
-        },
-        "uid": {
-          "type": "string"
-        },
-        "url": {
-          "type": "string"
-        },
-        "usersCount": {
-          "type": "integer",
-          "format": "int64"
-        }
-      }
-    },
     "DashboardACLInfoDTO": {
       "type": "object",
       "properties": {
@@ -12895,6 +13016,7 @@
           "format": "int64"
         },
         "folderId": {
+          "description": "Deprecated: use FolderUID instead",
           "type": "integer",
           "format": "int64"
         },
@@ -12991,17 +13113,38 @@
         }
       }
     },
-    "DashboardDTO": {
+    "DashboardCreateCommand": {
+      "description": "These are the values expected to be sent from an end user\n+k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object",
       "type": "object",
+      "required": [
+        "dashboard"
+      ],
       "properties": {
+        "apiVersion": {
+          "description": "APIVersion defines the versioned schema of this representation of an object.\nServers should convert recognized schemas to the latest internal value, and\nmay reject unrecognized values.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources\n+optional",
+          "type": "string"
+        },
         "dashboard": {
-          "$ref": "#/definitions/DashboardReportDTO"
+          "$ref": "#/definitions/Unstructured"
         },
-        "reportVariables": {
-          "type": "object"
+        "expires": {
+          "description": "When the snapshot should expire in seconds in seconds. Default is never to expire.",
+          "type": "integer",
+          "format": "int64",
+          "default": 0
         },
-        "timeRange": {
-          "$ref": "#/definitions/TimeRangeDTO"
+        "external": {
+          "description": "these are passed when storing an external snapshot ref\nSave the snapshot on an external server rather than locally.",
+          "type": "boolean",
+          "default": false
+        },
+        "kind": {
+          "description": "Kind is a string value representing the REST resource this object represents.\nServers may infer this from the endpoint the client submits requests to.\nCannot be updated.\nIn CamelCase.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds\n+optional",
+          "type": "string"
+        },
+        "name": {
+          "description": "Snapshot name",
+          "type": "string"
         }
       }
     },
@@ -13049,6 +13192,7 @@
           "format": "date-time"
         },
         "folderId": {
+          "description": "Deprecated: use FolderUID instead",
           "type": "integer",
           "format": "int64"
         },
@@ -13115,21 +13259,6 @@
         }
       }
     },
-    "DashboardReportDTO": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "name": {
-          "type": "string"
-        },
-        "uid": {
-          "type": "string"
-        }
-      }
-    },
     "DashboardSnapshotDTO": {
       "description": "DashboardSnapshotDTO without dashboard map",
       "type": "object",
@@ -13148,27 +13277,15 @@
         "externalUrl": {
           "type": "string"
         },
-        "id": {
-          "type": "integer",
-          "format": "int64"
-        },
         "key": {
           "type": "string"
         },
-        "name": {
-          "type": "string"
-        },
-        "orgId": {
-          "type": "integer",
-          "format": "int64"
-        },
+        "name": {
+          "type": "string"
+        },
         "updated": {
           "type": "string",
           "format": "date-time"
-        },
-        "userId": {
-          "type": "integer",
-          "format": "int64"
         }
       }
     },
@@ -13390,83 +13507,20 @@
         }
       }
     },
-    "DataSourcePermissionRuleDTO": {
+    "DataSourceRef": {
+      "description": "Ref to a DataSource instance",
       "type": "object",
       "properties": {
-        "builtInRole": {
-          "type": "string"
-        },
-        "created": {
-          "type": "string",
-          "format": "date-time"
-        },
-        "datasourceId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "id": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "isManaged": {
-          "type": "boolean"
-        },
-        "permission": {
-          "$ref": "#/definitions/DsPermissionType"
-        },
-        "permissionName": {
-          "type": "string"
-        },
-        "team": {
-          "type": "string"
-        },
-        "teamAvatarUrl": {
-          "type": "string"
-        },
-        "teamEmail": {
-          "type": "string"
-        },
-        "teamId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "updated": {
-          "type": "string",
-          "format": "date-time"
-        },
-        "userAvatarUrl": {
-          "type": "string"
-        },
-        "userEmail": {
+        "type": {
+          "description": "The plugin type-id",
           "type": "string"
         },
-        "userId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "userLogin": {
+        "uid": {
+          "description": "Specific datasource instance",
           "type": "string"
         }
       }
     },
-    "DataSourcePermissionsDTO": {
-      "type": "object",
-      "properties": {
-        "datasourceId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "enabled": {
-          "type": "boolean"
-        },
-        "permissions": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/DataSourcePermissionRuleDTO"
-          }
-        }
-      }
-    },
     "DataTopic": {
       "description": "nolint:revive",
       "type": "string",
@@ -13496,6 +13550,46 @@
         "format": "int64"
       }
     },
+    "Description": {
+      "type": "object",
+      "properties": {
+        "assignments": {
+          "$ref": "#/definitions/Assignments"
+        },
+        "permissions": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "DeviceSearchHitDTO": {
+      "type": "object",
+      "properties": {
+        "clientIp": {
+          "type": "string"
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "deviceId": {
+          "type": "string"
+        },
+        "lastSeenAt": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "updatedAt": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "userAgent": {
+          "type": "string"
+        }
+      }
+    },
     "DiscordConfig": {
       "type": "object",
       "title": "DiscordConfig configures notifications via Discord.",
@@ -13514,6 +13608,9 @@
         },
         "webhook_url": {
           "$ref": "#/definitions/SecretURL"
+        },
+        "webhook_url_file": {
+          "type": "string"
         }
       }
     },
@@ -13602,6 +13699,17 @@
         }
       }
     },
+    "EmailDTO": {
+      "type": "object",
+      "properties": {
+        "recipient": {
+          "type": "string"
+        },
+        "uid": {
+          "type": "string"
+        }
+      }
+    },
     "EmbeddedContactPoint": {
       "description": "EmbeddedContactPoint is the contact point type that is used\nby grafanas embedded alertmanager implementation.",
       "type": "object",
@@ -13741,26 +13849,12 @@
         }
       }
     },
-    "EvalMatch": {
+    "EvalQueriesPayload": {
       "type": "object",
       "properties": {
-        "metric": {
+        "condition": {
           "type": "string"
         },
-        "tags": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
-        "value": {
-          "type": "string"
-        }
-      }
-    },
-    "EvalQueriesPayload": {
-      "type": "object",
-      "properties": {
         "data": {
           "type": "array",
           "items": {
@@ -14045,6 +14139,11 @@
           "type": "boolean"
         },
         "id": {
+          "description": "Deprecated: use UID instead",
+          "type": "integer",
+          "format": "int64"
+        },
+        "orgId": {
           "type": "integer",
           "format": "int64"
         },
@@ -14099,6 +14198,14 @@
         }
       }
     },
+    "ForbiddenError": {
+      "type": "object",
+      "properties": {
+        "body": {
+          "$ref": "#/definitions/PublicError"
+        }
+      }
+    },
     "Frame": {
       "description": "Each Field is well typed by its FieldType and supports optional Labels.\n\nA Frame is a general data container for Grafana. A Frame can be table data\nor time series data depending on its content and field types.",
       "type": "object",
@@ -14184,11 +14291,20 @@
         },
         "typeVersion": {
           "$ref": "#/definitions/FrameTypeVersion"
+        },
+        "uniqueRowIdFields": {
+          "description": "Array of field indices which values create a unique id for each row. Ideally this should be globally unique ID\nbut that isn't guarantied. Should help with keeping track and deduplicating rows in visualizations, especially\nwith streaming data with frequent updates.",
+          "type": "array",
+          "items": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "example": "TraceID in Tempo, table name + primary key in SQL"
         }
       }
     },
     "FrameType": {
-      "description": "A FrameType string, when present in a frame's metadata, asserts that the\nframe's structure conforms to the FrameType's specification.\nThis property is currently optional, so FrameType may be FrameTypeUnknown even if the properties of\nthe Frame correspond to a defined FrameType.",
+      "description": "A FrameType string, when present in a frame's metadata, asserts that the\nframe's structure conforms to the FrameType's specification.\nThis property is currently optional, so FrameType may be FrameTypeUnknown even if the properties of\nthe Frame correspond to a defined FrameType.\n+enum",
       "type": "string"
     },
     "FrameTypeVersion": {
@@ -14207,6 +14323,14 @@
         "$ref": "#/definitions/Frame"
       }
     },
+    "GenericPublicError": {
+      "type": "object",
+      "properties": {
+        "body": {
+          "$ref": "#/definitions/PublicError"
+        }
+      }
+    },
     "GetAnnotationTagsResponse": {
       "type": "object",
       "title": "GetAnnotationTagsResponse is a response struct for FindTagsResult.",
@@ -14270,6 +14394,7 @@
           }
         },
         "mute_time_intervals": {
+          "description": "MuteTimeIntervals is deprecated and will be removed before Alertmanager 1.0.",
           "type": "array",
           "items": {
             "$ref": "#/definitions/MuteTimeInterval"
@@ -14290,6 +14415,12 @@
           "items": {
             "type": "string"
           }
+        },
+        "time_intervals": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TimeInterval"
+          }
         }
       }
     },
@@ -14492,10 +14623,6 @@
         "is_paused": {
           "type": "boolean"
         },
-        "namespace_id": {
-          "type": "integer",
-          "format": "int64"
-        },
         "namespace_uid": {
           "type": "string"
         },
@@ -14507,6 +14634,9 @@
             "OK"
           ]
         },
+        "notification_settings": {
+          "$ref": "#/definitions/AlertRuleNotificationSettings"
+        },
         "orgId": {
           "type": "integer",
           "format": "int64"
@@ -14622,6 +14752,23 @@
         }
       }
     },
+    "GettableTimeIntervals": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "provenance": {
+          "$ref": "#/definitions/Provenance"
+        },
+        "time_intervals": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TimeIntervalItem"
+          }
+        }
+      }
+    },
     "GettableUserConfig": {
       "type": "object",
       "properties": {
@@ -14783,6 +14930,7 @@
       "type": "object",
       "properties": {
         "folderId": {
+          "description": "Deprecated: use FolderUID instead",
           "type": "integer",
           "format": "int64"
         },
@@ -14903,6 +15051,7 @@
           "$ref": "#/definitions/Json"
         },
         "folderId": {
+          "description": "Deprecated: use FolderUID instead",
           "type": "integer",
           "format": "int64"
         },
@@ -14938,6 +15087,7 @@
           "type": "string"
         },
         "folderId": {
+          "description": "Deprecated: use FolderUID instead",
           "type": "integer",
           "format": "int64"
         },
@@ -15032,97 +15182,23 @@
           "type": "string"
         },
         "panelsState": {
-          "$ref": "#/definitions/ExplorePanelsState"
-        },
-        "query": {},
-        "timeRange": {
-          "$ref": "#/definitions/TimeRange"
-        },
-        "transformations": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/LinkTransformationConfig"
-          }
-        }
-      }
-    },
-    "ItemDTO": {
-      "type": "object",
-      "properties": {
-        "alertId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "alertName": {
-          "type": "string"
-        },
-        "avatarUrl": {
-          "type": "string"
-        },
-        "created": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "dashboardId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "dashboardUID": {
-          "type": "string"
-        },
-        "data": {
-          "$ref": "#/definitions/Json"
-        },
-        "email": {
-          "type": "string"
-        },
-        "id": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "login": {
-          "type": "string"
-        },
-        "newState": {
-          "type": "string"
-        },
-        "panelId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "prevState": {
-          "type": "string"
-        },
-        "tags": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "text": {
-          "type": "string"
-        },
-        "time": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "timeEnd": {
-          "type": "integer",
-          "format": "int64"
+          "$ref": "#/definitions/ExplorePanelsState"
         },
-        "updated": {
-          "type": "integer",
-          "format": "int64"
+        "query": {},
+        "timeRange": {
+          "$ref": "#/definitions/TimeRange"
         },
-        "userId": {
-          "type": "integer",
-          "format": "int64"
+        "transformations": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/LinkTransformationConfig"
+          }
         }
       }
     },
     "JSONWebKey": {
+      "description": "JSONWebKey represents a public or private key in JWK format. It can be\nmarshaled into JSON and unmarshaled from JSON.",
       "type": "object",
-      "title": "JSONWebKey represents a public or private key in JWK format.",
       "properties": {
         "Algorithm": {
           "description": "Key algorithm, parsed from `alg` header.",
@@ -15155,7 +15231,7 @@
           "$ref": "#/definitions/URL"
         },
         "Key": {
-          "description": "Cryptographic key, can be a symmetric or asymmetric key."
+          "description": "Key is the Go in-memory representation of this key. It must have one\nof these types:\ned25519.PublicKey\ned25519.PrivateKey\necdsa.PublicKey\necdsa.PrivateKey\nrsa.PublicKey\nrsa.PrivateKey\n[]byte (a symmetric key)\n\nWhen marshaling this JSONWebKey into JSON, the \"kty\" header parameter\nwill be automatically set based on the type of this field."
         },
         "KeyID": {
           "description": "Key identifier, parsed from `kid` header.",
@@ -15213,79 +15289,15 @@
         "$ref": "#/definitions/Label"
       }
     },
-    "LegacyAlert": {
+    "LibraryElementArrayResponse": {
       "type": "object",
+      "title": "LibraryElementArrayResponse is a response struct for an array of LibraryElementDTO.",
       "properties": {
-        "Created": {
-          "type": "string",
-          "format": "date-time"
-        },
-        "DashboardID": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "EvalData": {
-          "$ref": "#/definitions/Json"
-        },
-        "ExecutionError": {
-          "type": "string"
-        },
-        "For": {
-          "$ref": "#/definitions/Duration"
-        },
-        "Frequency": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "Handler": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "ID": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "Message": {
-          "type": "string"
-        },
-        "Name": {
-          "type": "string"
-        },
-        "NewStateDate": {
-          "type": "string",
-          "format": "date-time"
-        },
-        "OrgID": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "PanelID": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "Settings": {
-          "$ref": "#/definitions/Json"
-        },
-        "Severity": {
-          "type": "string"
-        },
-        "Silenced": {
-          "type": "boolean"
-        },
-        "State": {
-          "$ref": "#/definitions/AlertStateType"
-        },
-        "StateChanges": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "Updated": {
-          "type": "string",
-          "format": "date-time"
-        },
-        "Version": {
-          "type": "integer",
-          "format": "int64"
+        "result": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/LibraryElementDTO"
+          }
         }
       }
     },
@@ -15341,6 +15353,7 @@
           "type": "string"
         },
         "folderId": {
+          "description": "Deprecated: use FolderUID instead",
           "type": "integer",
           "format": "int64"
         },
@@ -15498,6 +15511,9 @@
         "send_resolved": {
           "type": "boolean"
         },
+        "summary": {
+          "type": "string"
+        },
         "text": {
           "type": "string"
         },
@@ -15506,6 +15522,9 @@
         },
         "webhook_url": {
           "$ref": "#/definitions/SecretURL"
+        },
+        "webhook_url_file": {
+          "type": "string"
         }
       }
     },
@@ -15533,7 +15552,7 @@
       "type": "object",
       "title": "MatchRegexps represents a map of Regexp.",
       "additionalProperties": {
-        "$ref": "#/definitions/Regexp"
+        "type": "string"
       }
     },
     "MatchType": {
@@ -15639,6 +15658,24 @@
         }
       }
     },
+    "MuteTimeIntervalExport": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "orgId": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "time_intervals": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TimeInterval"
+          }
+        }
+      }
+    },
     "MuteTimings": {
       "type": "array",
       "items": {
@@ -15745,12 +15782,58 @@
       "type": "object",
       "title": "NotificationPolicyExport is the provisioned file export of alerting.NotificiationPolicyV1.",
       "properties": {
-        "Policy": {
-          "$ref": "#/definitions/RouteExport"
+        "continue": {
+          "type": "boolean"
+        },
+        "group_by": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "group_interval": {
+          "type": "string"
+        },
+        "group_wait": {
+          "type": "string"
+        },
+        "match": {
+          "description": "Deprecated. Remove before v1.0 release.",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
+        "match_re": {
+          "$ref": "#/definitions/MatchRegexps"
+        },
+        "matchers": {
+          "$ref": "#/definitions/Matchers"
+        },
+        "mute_time_intervals": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "object_matchers": {
+          "$ref": "#/definitions/ObjectMatchers"
         },
         "orgId": {
           "type": "integer",
           "format": "int64"
+        },
+        "receiver": {
+          "type": "string"
+        },
+        "repeat_interval": {
+          "type": "string"
+        },
+        "routes": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/RouteExport"
+          }
         }
       }
     },
@@ -15782,39 +15865,6 @@
         "$ref": "#/definitions/NotificationTemplate"
       }
     },
-    "NotificationTestCommand": {
-      "type": "object",
-      "properties": {
-        "disableResolveMessage": {
-          "type": "boolean"
-        },
-        "frequency": {
-          "type": "string"
-        },
-        "id": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "name": {
-          "type": "string"
-        },
-        "secureSettings": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
-        "sendReminder": {
-          "type": "boolean"
-        },
-        "settings": {
-          "$ref": "#/definitions/Json"
-        },
-        "type": {
-          "type": "string"
-        }
-      }
-    },
     "NotifierConfig": {
       "type": "object",
       "title": "NotifierConfig contains base options common across all notifier configurations.",
@@ -15879,9 +15929,19 @@
         "format": "int64"
       }
     },
+    "ObjectMatcher": {
+      "type": "array",
+      "title": "ObjectMatcher is a matcher that can be used to filter alerts.",
+      "items": {
+        "type": "string"
+      }
+    },
     "ObjectMatchers": {
-      "description": "ObjectMatchers is Matchers with a different Unmarshal and Marshal methods that accept matchers as objects\nthat have already been parsed.",
-      "$ref": "#/definitions/Matchers"
+      "type": "array",
+      "title": "ObjectMatchers is a list of matchers that can be used to filter alerts.",
+      "items": {
+        "$ref": "#/definitions/ObjectMatcher"
+      }
     },
     "OpsGenieConfig": {
       "type": "object",
@@ -16138,6 +16198,9 @@
         }
       }
     },
+    "Password": {
+      "type": "string"
+    },
     "PatchAnnotationsCmd": {
       "type": "object",
       "properties": {
@@ -16172,7 +16235,7 @@
       "type": "object",
       "properties": {
         "folderId": {
-          "description": "ID of the folder where the library element is stored.",
+          "description": "ID of the folder where the library element is stored.\n\nDeprecated: use FolderUID instead",
           "type": "integer",
           "format": "int64"
         },
@@ -16260,26 +16323,6 @@
         }
       }
     },
-    "PauseAlertCommand": {
-      "type": "object",
-      "properties": {
-        "alertId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "paused": {
-          "type": "boolean"
-        }
-      }
-    },
-    "PauseAllAlertsCommand": {
-      "type": "object",
-      "properties": {
-        "paused": {
-          "type": "boolean"
-        }
-      }
-    },
     "Permission": {
       "type": "object",
       "title": "Permission is the model for access control permissions.",
@@ -16430,24 +16473,6 @@
         "$ref": "#/definitions/Playlist"
       }
     },
-    "Point": {
-      "description": "If H is not nil, then this is a histogram point and only (T, H) is valid.\nIf H is nil, then only (T, V) is valid.",
-      "type": "object",
-      "title": "Point represents a single data point for a given timestamp.",
-      "properties": {
-        "H": {
-          "$ref": "#/definitions/FloatHistogram"
-        },
-        "T": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "V": {
-          "type": "number",
-          "format": "double"
-        }
-      }
-    },
     "PostAnnotationsCmd": {
       "type": "object",
       "required": [
@@ -16504,6 +16529,7 @@
       }
     },
     "PostableApiAlertingConfig": {
+      "description": "nolint:revive",
       "type": "object",
       "properties": {
         "global": {
@@ -16516,6 +16542,7 @@
           }
         },
         "mute_time_intervals": {
+          "description": "MuteTimeIntervals is deprecated and will be removed before Alertmanager 1.0.",
           "type": "array",
           "items": {
             "$ref": "#/definitions/MuteTimeInterval"
@@ -16536,10 +16563,17 @@
           "items": {
             "type": "string"
           }
+        },
+        "time_intervals": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TimeInterval"
+          }
         }
       }
     },
     "PostableApiReceiver": {
+      "description": "nolint:revive",
       "type": "object",
       "properties": {
         "discord_configs": {
@@ -16758,6 +16792,9 @@
             "OK"
           ]
         },
+        "notification_settings": {
+          "$ref": "#/definitions/AlertRuleNotificationSettings"
+        },
         "title": {
           "type": "string"
         },
@@ -16796,17 +16833,63 @@
         }
       }
     },
+    "PostableTimeIntervals": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "time_intervals": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TimeIntervalItem"
+          }
+        }
+      }
+    },
     "PostableUserConfig": {
       "type": "object",
       "properties": {
         "alertmanager_config": {
           "$ref": "#/definitions/PostableApiAlertingConfig"
         },
-        "template_files": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
+        "template_files": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "Preferences": {
+      "description": "Spec defines user, team or org Grafana preferences",
+      "type": "object",
+      "properties": {
+        "cookiePreferences": {
+          "$ref": "#/definitions/CookiePreferences"
+        },
+        "homeDashboardUID": {
+          "description": "UID for the home dashboard",
+          "type": "string"
+        },
+        "language": {
+          "description": "Selected language (beta)",
+          "type": "string"
+        },
+        "queryHistory": {
+          "$ref": "#/definitions/QueryHistoryPreference"
+        },
+        "theme": {
+          "description": "Theme light, dark, empty is default",
+          "type": "string"
+        },
+        "timezone": {
+          "description": "The timezone selection\nTODO: this should use the timezone defined in common",
+          "type": "string"
+        },
+        "weekStart": {
+          "description": "WeekStart day of the week (sunday, monday, etc)",
+          "type": "string"
         }
       }
     },
@@ -16945,6 +17028,9 @@
             "OK"
           ]
         },
+        "notification_settings": {
+          "$ref": "#/definitions/AlertRuleNotificationSettings"
+        },
         "orgID": {
           "type": "integer",
           "format": "int64"
@@ -17002,6 +17088,143 @@
         }
       }
     },
+    "PublicDashboard": {
+      "type": "object",
+      "properties": {
+        "accessToken": {
+          "type": "string"
+        },
+        "annotationsEnabled": {
+          "type": "boolean"
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "createdBy": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "dashboardUid": {
+          "type": "string"
+        },
+        "isEnabled": {
+          "type": "boolean"
+        },
+        "recipients": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/EmailDTO"
+          }
+        },
+        "share": {
+          "$ref": "#/definitions/ShareType"
+        },
+        "timeSelectionEnabled": {
+          "type": "boolean"
+        },
+        "uid": {
+          "type": "string"
+        },
+        "updatedAt": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "updatedBy": {
+          "type": "integer",
+          "format": "int64"
+        }
+      }
+    },
+    "PublicDashboardDTO": {
+      "type": "object",
+      "properties": {
+        "accessToken": {
+          "type": "string"
+        },
+        "annotationsEnabled": {
+          "type": "boolean"
+        },
+        "isEnabled": {
+          "type": "boolean"
+        },
+        "share": {
+          "$ref": "#/definitions/ShareType"
+        },
+        "timeSelectionEnabled": {
+          "type": "boolean"
+        },
+        "uid": {
+          "type": "string"
+        }
+      }
+    },
+    "PublicDashboardListResponse": {
+      "type": "object",
+      "properties": {
+        "accessToken": {
+          "type": "string"
+        },
+        "dashboardUid": {
+          "type": "string"
+        },
+        "isEnabled": {
+          "type": "boolean"
+        },
+        "slug": {
+          "type": "string"
+        },
+        "title": {
+          "type": "string"
+        },
+        "uid": {
+          "type": "string"
+        }
+      }
+    },
+    "PublicDashboardListResponseWithPagination": {
+      "type": "object",
+      "properties": {
+        "page": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "perPage": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "publicDashboards": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/PublicDashboardListResponse"
+          }
+        },
+        "totalCount": {
+          "type": "integer",
+          "format": "int64"
+        }
+      }
+    },
+    "PublicError": {
+      "description": "PublicError is derived from Error and only contains information\navailable to the end user.",
+      "type": "object",
+      "properties": {
+        "extra": {
+          "type": "object",
+          "additionalProperties": false
+        },
+        "message": {
+          "type": "string"
+        },
+        "messageId": {
+          "type": "string"
+        },
+        "statusCode": {
+          "type": "integer",
+          "format": "int64"
+        }
+      }
+    },
     "PublicKeyAlgorithm": {
       "type": "integer",
       "format": "int64"
@@ -17067,7 +17290,7 @@
       "type": "object",
       "title": "QueryDataResponse contains the results from a QueryDataRequest.",
       "properties": {
-        "Responses": {
+        "results": {
           "$ref": "#/definitions/Responses"
         }
       }
@@ -17115,8 +17338,10 @@
     },
     "QueryHistoryPreference": {
       "type": "object",
+      "title": "QueryHistoryPreference defines model for QueryHistoryPreference.",
       "properties": {
         "homeTab": {
+          "description": "HomeTab one of: '' | 'query' | 'starred';",
           "type": "string"
         }
       }
@@ -17397,68 +17622,181 @@
         "id": {
           "type": "string"
         },
-        "interval": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "name": {
+        "interval": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "name": {
+          "type": "string"
+        },
+        "prom_name": {
+          "type": "string"
+        },
+        "queries": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "range": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "target_ref_id": {
+          "type": "string"
+        }
+      }
+    },
+    "RelativeTimeRange": {
+      "description": "RelativeTimeRange is the per query start and end time\nfor requests.",
+      "type": "object",
+      "properties": {
+        "from": {
+          "$ref": "#/definitions/Duration"
+        },
+        "to": {
+          "$ref": "#/definitions/Duration"
+        }
+      }
+    },
+    "RelativeTimeRangeExport": {
+      "type": "object",
+      "properties": {
+        "from": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "to": {
+          "type": "integer",
+          "format": "int64"
+        }
+      }
+    },
+    "Report": {
+      "description": "ConfigDTO is model representation in transfer",
+      "type": "object",
+      "properties": {
+        "created": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "dashboards": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ReportDashboard"
+          }
+        },
+        "enableCsv": {
+          "type": "boolean"
+        },
+        "enableDashboardUrl": {
+          "type": "boolean"
+        },
+        "formats": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Type"
+          }
+        },
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "message": {
+          "type": "string"
+        },
+        "name": {
+          "type": "string"
+        },
+        "options": {
+          "$ref": "#/definitions/ReportOptions"
+        },
+        "orgId": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "recipients": {
+          "type": "string"
+        },
+        "replyTo": {
+          "type": "string"
+        },
+        "scaleFactor": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "schedule": {
+          "$ref": "#/definitions/ReportSchedule"
+        },
+        "state": {
+          "$ref": "#/definitions/State"
+        },
+        "uid": {
+          "type": "string"
+        },
+        "updated": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "userId": {
+          "type": "integer",
+          "format": "int64"
+        }
+      }
+    },
+    "ReportBrandingOptions": {
+      "type": "object",
+      "properties": {
+        "emailFooterLink": {
+          "type": "string"
+        },
+        "emailFooterMode": {
           "type": "string"
         },
-        "prom_name": {
+        "emailFooterText": {
           "type": "string"
         },
-        "queries": {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "additionalProperties": false
-          }
-        },
-        "range": {
-          "type": "integer",
-          "format": "int64"
+        "emailLogoUrl": {
+          "type": "string"
         },
-        "target_ref_id": {
+        "reportLogoUrl": {
           "type": "string"
         }
       }
     },
-    "Regexp": {
-      "description": "A Regexp is safe for concurrent use by multiple goroutines,\nexcept for configuration methods, such as Longest.",
-      "type": "object",
-      "title": "Regexp is the representation of a compiled regular expression."
-    },
-    "RelativeTimeRange": {
-      "description": "RelativeTimeRange is the per query start and end time\nfor requests.",
+    "ReportDashboard": {
       "type": "object",
       "properties": {
-        "from": {
-          "$ref": "#/definitions/Duration"
+        "dashboard": {
+          "$ref": "#/definitions/ReportDashboardID"
         },
-        "to": {
-          "$ref": "#/definitions/Duration"
+        "reportVariables": {
+          "type": "object"
+        },
+        "timeRange": {
+          "$ref": "#/definitions/ReportTimeRange"
         }
       }
     },
-    "RelativeTimeRangeExport": {
+    "ReportDashboardID": {
       "type": "object",
       "properties": {
-        "from": {
+        "id": {
           "type": "integer",
           "format": "int64"
         },
-        "to": {
-          "type": "integer",
-          "format": "int64"
+        "name": {
+          "type": "string"
+        },
+        "uid": {
+          "type": "string"
         }
       }
     },
-    "ReportEmailDTO": {
+    "ReportEmail": {
       "type": "object",
       "properties": {
-        "email": {
-          "type": "string"
-        },
         "emails": {
           "description": "Comma-separated list of emails to which to send the report to.",
           "type": "string"
@@ -17474,7 +17812,7 @@
         }
       }
     },
-    "ReportOptionsDTO": {
+    "ReportOptions": {
       "type": "object",
       "properties": {
         "layout": {
@@ -17484,7 +17822,70 @@
           "type": "string"
         },
         "timeRange": {
-          "$ref": "#/definitions/TimeRangeDTO"
+          "$ref": "#/definitions/ReportTimeRange"
+        }
+      }
+    },
+    "ReportSchedule": {
+      "type": "object",
+      "properties": {
+        "dayOfMonth": {
+          "type": "string"
+        },
+        "endDate": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "frequency": {
+          "type": "string"
+        },
+        "intervalAmount": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "intervalFrequency": {
+          "type": "string"
+        },
+        "startDate": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "timeZone": {
+          "type": "string"
+        },
+        "workdaysOnly": {
+          "type": "boolean"
+        }
+      }
+    },
+    "ReportSettings": {
+      "type": "object",
+      "properties": {
+        "branding": {
+          "$ref": "#/definitions/ReportBrandingOptions"
+        },
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "orgId": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "userId": {
+          "type": "integer",
+          "format": "int64"
+        }
+      }
+    },
+    "ReportTimeRange": {
+      "type": "object",
+      "properties": {
+        "from": {
+          "type": "string"
+        },
+        "to": {
+          "type": "string"
         }
       }
     },
@@ -17567,6 +17968,9 @@
         "displayName": {
           "type": "string"
         },
+        "global": {
+          "type": "boolean"
+        },
         "group": {
           "type": "string"
         },
@@ -17595,6 +17999,32 @@
         }
       }
     },
+    "RolesSearchQuery": {
+      "type": "object",
+      "properties": {
+        "includeHidden": {
+          "type": "boolean"
+        },
+        "orgId": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "teamIds": {
+          "type": "array",
+          "items": {
+            "type": "integer",
+            "format": "int64"
+          }
+        },
+        "userIds": {
+          "type": "array",
+          "items": {
+            "type": "integer",
+            "format": "int64"
+          }
+        }
+      }
+    },
     "Route": {
       "description": "A Route is a node that contains definitions of how to handle alerts. This is modified\nfrom the upstream alertmanager in that it adds the ObjectMatchers property.",
       "type": "object",
@@ -17896,9 +18326,13 @@
       }
     },
     "Sample": {
+      "description": "Sample is a single sample belonging to a metric. It represents either a float\nsample or a histogram sample. If H is nil, it is a float sample. Otherwise,\nit is a histogram sample.",
       "type": "object",
-      "title": "Sample is a single sample belonging to a metric.",
       "properties": {
+        "F": {
+          "type": "number",
+          "format": "double"
+        },
         "H": {
           "$ref": "#/definitions/FloatHistogram"
         },
@@ -17908,10 +18342,6 @@
         "T": {
           "type": "integer",
           "format": "int64"
-        },
-        "V": {
-          "type": "number",
-          "format": "double"
         }
       }
     },
@@ -17948,46 +18378,26 @@
         }
       }
     },
-    "ScheduleDTO": {
+    "SearchDeviceQueryResult": {
       "type": "object",
       "properties": {
-        "day": {
-          "type": "string"
-        },
-        "dayOfMonth": {
-          "type": "string"
-        },
-        "endDate": {
-          "type": "string",
-          "format": "date-time"
-        },
-        "frequency": {
-          "type": "string"
+        "devices": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/DeviceSearchHitDTO"
+          }
         },
-        "hour": {
+        "page": {
           "type": "integer",
           "format": "int64"
         },
-        "intervalAmount": {
+        "perPage": {
           "type": "integer",
           "format": "int64"
         },
-        "intervalFrequency": {
-          "type": "string"
-        },
-        "minute": {
+        "totalCount": {
           "type": "integer",
           "format": "int64"
-        },
-        "startDate": {
-          "type": "string",
-          "format": "date-time"
-        },
-        "timeZone": {
-          "type": "string"
-        },
-        "workdaysOnly": {
-          "type": "boolean"
         }
       }
     },
@@ -18236,6 +18646,10 @@
           "format": "int64",
           "example": 1
         },
+        "requiredBy": {
+          "type": "string",
+          "example": "grafana-app"
+        },
         "role": {
           "type": "string",
           "example": "Editor"
@@ -18258,6 +18672,25 @@
         }
       }
     },
+    "SetResourcePermissionCommand": {
+      "type": "object",
+      "properties": {
+        "builtInRole": {
+          "type": "string"
+        },
+        "permission": {
+          "type": "string"
+        },
+        "teamId": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "userId": {
+          "type": "integer",
+          "format": "int64"
+        }
+      }
+    },
     "SetRoleAssignmentsCommand": {
       "type": "object",
       "properties": {
@@ -18310,25 +18743,8 @@
         }
       }
     },
-    "SettingsDTO": {
-      "type": "object",
-      "properties": {
-        "branding": {
-          "$ref": "#/definitions/BrandingOptionsDTO"
-        },
-        "id": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "orgId": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "userId": {
-          "type": "integer",
-          "format": "int64"
-        }
-      }
+    "ShareType": {
+      "type": "string"
     },
     "SigV4Config": {
       "description": "SigV4Config is the configuration for signing remote write requests with\nAWS's SigV4 verification process. Empty values will be retrieved using the\nAWS default credentials chain.",
@@ -18521,38 +18937,6 @@
         }
       }
     },
-    "Spec": {
-      "type": "object",
-      "title": "Spec defines model for Spec.",
-      "properties": {
-        "cookiePreferences": {
-          "$ref": "#/definitions/CookiePreferences"
-        },
-        "homeDashboardUID": {
-          "description": "UID for the home dashboard",
-          "type": "string"
-        },
-        "language": {
-          "description": "Selected language (beta)",
-          "type": "string"
-        },
-        "queryHistory": {
-          "$ref": "#/definitions/QueryHistoryPreference"
-        },
-        "theme": {
-          "description": "Theme light, dark, empty is default",
-          "type": "string"
-        },
-        "timezone": {
-          "description": "The timezone selection\nTODO: this should use the timezone defined in common",
-          "type": "string"
-        },
-        "weekStart": {
-          "description": "WeekStart day of the week (sunday, monday, etc)",
-          "type": "string"
-        }
-      }
-    },
     "State": {
       "type": "string"
     },
@@ -19071,7 +19455,21 @@
       "type": "string"
     },
     "TimeInterval": {
-      "description": "TimeInterval describes intervals of time. ContainsTime will tell you if a golang time is contained\nwithin the interval.",
+      "type": "object",
+      "title": "TimeInterval represents a named set of time intervals for which a route should be muted.",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "time_intervals": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TimeInterval"
+          }
+        }
+      }
+    },
+    "TimeIntervalItem": {
       "type": "object",
       "properties": {
         "days_of_month": {
@@ -19092,7 +19490,7 @@
         "times": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/TimeRange"
+            "$ref": "#/definitions/TimeIntervalTimeRange"
           }
         },
         "weekdays": {
@@ -19109,6 +19507,17 @@
         }
       }
     },
+    "TimeIntervalTimeRange": {
+      "type": "object",
+      "properties": {
+        "end_time": {
+          "type": "string"
+        },
+        "start_time": {
+          "type": "string"
+        }
+      }
+    },
     "TimeRange": {
       "description": "Redefining this to avoid an import cycle",
       "type": "object",
@@ -19123,23 +19532,16 @@
         }
       }
     },
-    "TimeRangeDTO": {
-      "type": "object",
-      "properties": {
-        "from": {
-          "type": "string"
-        },
-        "to": {
-          "type": "string"
-        }
-      }
-    },
     "Token": {
       "type": "object",
       "properties": {
         "account": {
           "type": "string"
         },
+        "anonymousRatio": {
+          "type": "integer",
+          "format": "int64"
+        },
         "company": {
           "type": "string"
         },
@@ -19294,31 +19696,24 @@
         "$ref": "#/definitions/Transformation"
       }
     },
-    "TrimDashboardCommand": {
-      "type": "object",
-      "properties": {
-        "dashboard": {
-          "$ref": "#/definitions/Json"
-        },
-        "meta": {
-          "$ref": "#/definitions/Json"
-        }
-      }
+    "Type": {
+      "type": "string"
     },
-    "TrimDashboardFullWithMeta": {
+    "TypeMeta": {
+      "description": "+k8s:deepcopy-gen=false",
       "type": "object",
+      "title": "TypeMeta describes an individual object in an API response or request\nwith strings representing the type of the object and its API schema version.\nStructures that are versioned or persisted should inline TypeMeta.",
       "properties": {
-        "dashboard": {
-          "$ref": "#/definitions/Json"
+        "apiVersion": {
+          "description": "APIVersion defines the versioned schema of this representation of an object.\nServers should convert recognized schemas to the latest internal value, and\nmay reject unrecognized values.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources\n+optional",
+          "type": "string"
         },
-        "meta": {
-          "$ref": "#/definitions/Json"
+        "kind": {
+          "description": "Kind is a string value representing the REST resource this object represents.\nServers may infer this from the endpoint the client submits requests to.\nCannot be updated.\nIn CamelCase.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds\n+optional",
+          "type": "string"
         }
       }
     },
-    "Type": {
-      "type": "string"
-    },
     "URL": {
       "description": "The general form represented is:\n\n[scheme:][//[userinfo@]host][/]path[?query][#fragment]\n\nURLs that do not start with a slash after the scheme are interpreted as:\n\nscheme:opaque[?query][#fragment]\n\nNote that the Path field is stored in decoded form: /%47%6f%2f becomes /Go/.\nA consequence is that it is impossible to tell which slashes in the Path were\nslashes in the raw URL and which were %2f. This distinction is rarely important,\nbut when it is, the code should use the EscapedPath method, which preserves\nthe original encoding of Path.\n\nThe RawPath field is an optional field which is only set when the default\nencoding of Path is different from the escaped path. See the EscapedPath method\nfor more details.\n\nURL's String method uses the EscapedPath method to obtain the path.",
       "type": "object",
@@ -19359,77 +19754,14 @@
         }
       }
     },
-    "UpdateAlertNotificationCommand": {
-      "type": "object",
-      "properties": {
-        "disableResolveMessage": {
-          "type": "boolean"
-        },
-        "frequency": {
-          "type": "string"
-        },
-        "id": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "isDefault": {
-          "type": "boolean"
-        },
-        "name": {
-          "type": "string"
-        },
-        "secureSettings": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
-        "sendReminder": {
-          "type": "boolean"
-        },
-        "settings": {
-          "$ref": "#/definitions/Json"
-        },
-        "type": {
-          "type": "string"
-        },
-        "uid": {
-          "type": "string"
-        }
-      }
-    },
-    "UpdateAlertNotificationWithUidCommand": {
+    "Unstructured": {
+      "description": "Unstructured allows objects that do not have Golang structs registered to be manipulated\ngenerically.",
       "type": "object",
       "properties": {
-        "disableResolveMessage": {
-          "type": "boolean"
-        },
-        "frequency": {
-          "type": "string"
-        },
-        "isDefault": {
-          "type": "boolean"
-        },
-        "name": {
-          "type": "string"
-        },
-        "secureSettings": {
+        "Object": {
+          "description": "Object is a JSON compatible map with string, float, int, bool, []interface{},\nor map[string]interface{} children.",
           "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
-        "sendReminder": {
-          "type": "boolean"
-        },
-        "settings": {
-          "$ref": "#/definitions/Json"
-        },
-        "type": {
-          "type": "string"
-        },
-        "uid": {
-          "type": "string"
+          "additionalProperties": false
         }
       }
     },
@@ -19916,6 +20248,9 @@
         "theme": {
           "type": "string"
         },
+        "uid": {
+          "type": "string"
+        },
         "updatedAt": {
           "type": "string",
           "format": "date-time"
@@ -19959,6 +20294,9 @@
         },
         "name": {
           "type": "string"
+        },
+        "uid": {
+          "type": "string"
         }
       }
     },
@@ -20038,7 +20376,7 @@
       }
     },
     "Vector": {
-      "description": "Vector is basically only an alias for model.Samples, but the\ncontract is that in a Vector, all Samples have the same timestamp.",
+      "description": "Vector is basically only an alias for []Sample, but the contract is that\nin a Vector, all Samples have the same timestamp.",
       "type": "array",
       "items": {
         "$ref": "#/definitions/Sample"
@@ -20191,6 +20529,7 @@
       }
     },
     "alertGroup": {
+      "description": "AlertGroup alert group",
       "type": "object",
       "required": [
         "alerts",
@@ -20318,6 +20657,34 @@
         }
       }
     },
+    "deviceDTO": {
+      "type": "object",
+      "properties": {
+        "avatarUrl": {
+          "type": "string"
+        },
+        "clientIp": {
+          "type": "string"
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "deviceId": {
+          "type": "string"
+        },
+        "lastSeenAt": {
+          "type": "string"
+        },
+        "updatedAt": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "userAgent": {
+          "type": "string"
+        }
+      }
+    },
     "gettableAlert": {
       "description": "GettableAlert gettable alert",
       "type": "object",
@@ -20429,12 +20796,14 @@
       }
     },
     "gettableSilences": {
+      "description": "GettableSilences gettable silences",
       "type": "array",
       "items": {
         "$ref": "#/definitions/gettableSilence"
       }
     },
     "integration": {
+      "description": "Integration integration",
       "type": "object",
       "required": [
         "name",
@@ -20615,8 +20984,35 @@
         }
       }
     },
+    "publicError": {
+      "description": "PublicError is derived from Error and only contains information\navailable to the end user.",
+      "type": "object",
+      "required": [
+        "statusCode",
+        "messageId"
+      ],
+      "properties": {
+        "extra": {
+          "description": "Extra Additional information about the error",
+          "type": "object",
+          "additionalProperties": false
+        },
+        "message": {
+          "description": "Message A human readable message",
+          "type": "string"
+        },
+        "messageId": {
+          "description": "MessageID A unique identifier for the error",
+          "type": "string"
+        },
+        "statusCode": {
+          "description": "StatusCode The HTTP status code returned",
+          "type": "integer",
+          "format": "int64"
+        }
+      }
+    },
     "receiver": {
-      "description": "Receiver receiver",
       "type": "object",
       "required": [
         "active",
@@ -20641,6 +21037,78 @@
         }
       }
     },
+    "resourcePermissionDTO": {
+      "type": "object",
+      "properties": {
+        "actions": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "builtInRole": {
+          "type": "string"
+        },
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "isInherited": {
+          "type": "boolean"
+        },
+        "isManaged": {
+          "type": "boolean"
+        },
+        "isServiceAccount": {
+          "type": "boolean"
+        },
+        "permission": {
+          "type": "string"
+        },
+        "roleName": {
+          "type": "string"
+        },
+        "team": {
+          "type": "string"
+        },
+        "teamAvatarUrl": {
+          "type": "string"
+        },
+        "teamId": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "userAvatarUrl": {
+          "type": "string"
+        },
+        "userId": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "userLogin": {
+          "type": "string"
+        }
+      }
+    },
+    "setPermissionCommand": {
+      "type": "object",
+      "properties": {
+        "permission": {
+          "type": "string"
+        }
+      }
+    },
+    "setPermissionsCommand": {
+      "type": "object",
+      "properties": {
+        "permissions": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SetResourcePermissionCommand"
+          }
+        }
+      }
+    },
     "silence": {
       "description": "Silence silence",
       "type": "object",
@@ -20731,54 +21199,69 @@
     }
   },
   "responses": {
-    "GettableHistoricUserConfigs": {
+    "GetAllIntervalsResponse": {
       "description": "(empty)",
       "schema": {
         "type": "array",
         "items": {
-          "$ref": "#/definitions/GettableHistoricUserConfig"
+          "$ref": "#/definitions/GettableTimeIntervals"
         }
       }
     },
-    "SMTPNotEnabledError": {
-      "description": "(empty)"
+    "GetIntervalsByNameResponse": {
+      "description": "(empty)",
+      "schema": {
+        "$ref": "#/definitions/GettableTimeIntervals"
+      }
     },
-    "StateHistory": {
+    "GetReceiverResponse": {
       "description": "(empty)",
       "schema": {
-        "$ref": "#/definitions/Frame"
+        "$ref": "#/definitions/GettableApiReceiver"
       }
     },
-    "TestGrafanaRuleResponse": {
+    "GetReceiversResponse": {
       "description": "(empty)",
       "schema": {
         "type": "array",
         "items": {
-          "$ref": "#/definitions/postableAlert"
+          "$ref": "#/definitions/GettableApiReceiver"
         }
       }
     },
-    "acceptedResponse": {
-      "description": "AcceptedResponse",
+    "GettableHistoricUserConfigs": {
+      "description": "(empty)",
       "schema": {
-        "$ref": "#/definitions/ErrorResponseBody"
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/GettableHistoricUserConfig"
+        }
+      }
+    },
+    "SMTPNotEnabledError": {
+      "description": "(empty)"
+    },
+    "StateHistory": {
+      "description": "(empty)",
+      "schema": {
+        "$ref": "#/definitions/Frame"
       }
     },
-    "addPermissionResponse": {
+    "TestGrafanaRuleResponse": {
       "description": "(empty)",
       "schema": {
-        "type": "object",
-        "properties": {
-          "message": {
-            "type": "string"
-          },
-          "permissionId": {
-            "type": "integer",
-            "format": "int64"
-          }
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/postableAlert"
         }
       }
     },
+    "acceptedResponse": {
+      "description": "AcceptedResponse",
+      "schema": {
+        "$ref": "#/definitions/ErrorResponseBody"
+      }
+    },
     "adminCreateUserResponse": {
       "description": "(empty)",
       "schema": {
@@ -20812,6 +21295,12 @@
         "$ref": "#/definitions/ErrorResponseBody"
       }
     },
+    "badRequestPublicError": {
+      "description": "BadRequestPublicError is returned when the request is invalid and it cannot be processed.",
+      "schema": {
+        "$ref": "#/definitions/publicError"
+      }
+    },
     "calculateDashboardDiffResponse": {
       "description": "(empty)",
       "schema": {
@@ -20933,6 +21422,12 @@
         "$ref": "#/definitions/Playlist"
       }
     },
+    "createPublicDashboardResponse": {
+      "description": "(empty)",
+      "schema": {
+        "$ref": "#/definitions/PublicDashboard"
+      }
+    },
     "createReportResponse": {
       "description": "(empty)",
       "schema": {
@@ -21002,28 +21497,6 @@
         }
       }
     },
-    "deleteAlertNotificationChannelResponse": {
-      "description": "(empty)",
-      "schema": {
-        "type": "object",
-        "required": [
-          "id",
-          "message"
-        ],
-        "properties": {
-          "id": {
-            "description": "ID Identifier of the deleted notification channel.",
-            "type": "integer",
-            "format": "int64",
-            "example": 65
-          },
-          "message": {
-            "description": "Message Message of the deleted notificatiton channel.",
-            "type": "string"
-          }
-        }
-      }
-    },
     "deleteCorrelationResponse": {
       "description": "(empty)",
       "schema": {
@@ -21111,82 +21584,58 @@
         }
       }
     },
-    "folderResponse": {
-      "description": "(empty)",
-      "schema": {
-        "$ref": "#/definitions/Folder"
-      }
-    },
-    "forbiddenError": {
-      "description": "ForbiddenError is returned if the user/token has insufficient permissions to access the requested resource.",
-      "schema": {
-        "$ref": "#/definitions/ErrorResponseBody"
-      }
-    },
-    "genericError": {
-      "description": "A GenericError is the default error message that is generated.\nFor certain status codes there are more appropriate error structures.",
-      "schema": {
-        "$ref": "#/definitions/ErrorResponseBody"
-      }
-    },
-    "getAPIkeyResponse": {
+    "devicesResponse": {
       "description": "(empty)",
       "schema": {
         "type": "array",
         "items": {
-          "$ref": "#/definitions/ApiKeyDTO"
+          "$ref": "#/definitions/deviceDTO"
         }
       }
     },
-    "getAccessControlStatusResponse": {
+    "devicesSearchResponse": {
       "description": "(empty)",
       "schema": {
-        "$ref": "#/definitions/Status"
+        "$ref": "#/definitions/SearchDeviceQueryResult"
       }
     },
-    "getAlertNotificationChannelResponse": {
+    "folderResponse": {
       "description": "(empty)",
       "schema": {
-        "$ref": "#/definitions/AlertNotification"
+        "$ref": "#/definitions/Folder"
       }
     },
-    "getAlertNotificationChannelsResponse": {
-      "description": "(empty)",
+    "forbiddenError": {
+      "description": "ForbiddenError is returned if the user/token has insufficient permissions to access the requested resource.",
       "schema": {
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/AlertNotification"
-        }
+        "$ref": "#/definitions/ErrorResponseBody"
       }
     },
-    "getAlertNotificationLookupResponse": {
-      "description": "(empty)",
+    "forbiddenPublicError": {
+      "description": "ForbiddenPublicError is returned if the user/token has insufficient permissions to access the requested resource.",
       "schema": {
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/AlertNotificationLookup"
-        }
+        "$ref": "#/definitions/publicError"
       }
     },
-    "getAlertResponse": {
-      "description": "(empty)",
+    "genericError": {
+      "description": "A GenericError is the default error message that is generated.\nFor certain status codes there are more appropriate error structures.",
       "schema": {
-        "$ref": "#/definitions/LegacyAlert"
+        "$ref": "#/definitions/ErrorResponseBody"
       }
     },
-    "getAlertsResponse": {
+    "getAPIkeyResponse": {
       "description": "(empty)",
       "schema": {
         "type": "array",
         "items": {
-          "$ref": "#/definitions/AlertListItemDTO"
+          "$ref": "#/definitions/ApiKeyDTO"
         }
       }
     },
-    "getAllPermissionseResponse": {
+    "getAccessControlStatusResponse": {
       "description": "(empty)",
       "schema": {
-        "$ref": "#/definitions/DataSourcePermissionsDTO"
+        "$ref": "#/definitions/Status"
       }
     },
     "getAllRolesResponse": {
@@ -21201,7 +21650,7 @@
     "getAnnotationByIDResponse": {
       "description": "(empty)",
       "schema": {
-        "$ref": "#/definitions/ItemDTO"
+        "$ref": "#/definitions/Annotation"
       }
     },
     "getAnnotationTagsResponse": {
@@ -21215,7 +21664,7 @@
       "schema": {
         "type": "array",
         "items": {
-          "$ref": "#/definitions/ItemDTO"
+          "$ref": "#/definitions/Annotation"
         }
       }
     },
@@ -21249,15 +21698,6 @@
         "$ref": "#/definitions/OrgDetailsDTO"
       }
     },
-    "getCustomPermissionsReportResponse": {
-      "description": "(empty)",
-      "schema": {
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/CustomPermissionsRecordDTO"
-        }
-      }
-    },
     "getDashboardPermissionsListResponse": {
       "description": "(empty)",
       "schema": {
@@ -21270,15 +21710,6 @@
     "getDashboardSnapshotResponse": {
       "description": "(empty)"
     },
-    "getDashboardStatesResponse": {
-      "description": "(empty)",
-      "schema": {
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/AlertStateInfoDTO"
-        }
-      }
-    },
     "getDashboardsTagsResponse": {
       "description": "(empty)",
       "schema": {
@@ -21347,6 +21778,12 @@
         "$ref": "#/definitions/GetHomeDashboardResponse"
       }
     },
+    "getLibraryElementArrayResponse": {
+      "description": "(empty)",
+      "schema": {
+        "$ref": "#/definitions/LibraryElementArrayResponse"
+      }
+    },
     "getLibraryElementConnectionsResponse": {
       "description": "(empty)",
       "schema": {
@@ -21443,7 +21880,22 @@
     "getPreferencesResponse": {
       "description": "(empty)",
       "schema": {
-        "$ref": "#/definitions/Spec"
+        "$ref": "#/definitions/Preferences"
+      }
+    },
+    "getPublicAnnotationsResponse": {
+      "description": "(empty)",
+      "schema": {
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/AnnotationEvent"
+        }
+      }
+    },
+    "getPublicDashboardResponse": {
+      "description": "(empty)",
+      "schema": {
+        "$ref": "#/definitions/PublicDashboard"
       }
     },
     "getQueryHistoryDeleteQueryResponse": {
@@ -21476,13 +21928,13 @@
     "getReportResponse": {
       "description": "(empty)",
       "schema": {
-        "$ref": "#/definitions/ConfigDTO"
+        "$ref": "#/definitions/Report"
       }
     },
     "getReportSettingsResponse": {
       "description": "(empty)",
       "schema": {
-        "$ref": "#/definitions/SettingsDTO"
+        "$ref": "#/definitions/ReportSettings"
       }
     },
     "getReportsResponse": {
@@ -21490,7 +21942,16 @@
       "schema": {
         "type": "array",
         "items": {
-          "$ref": "#/definitions/ConfigDTO"
+          "$ref": "#/definitions/Report"
+        }
+      }
+    },
+    "getResourcePermissionsResponse": {
+      "description": "(empty)",
+      "schema": {
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/resourcePermissionDTO"
         }
       }
     },
@@ -21506,6 +21967,27 @@
         "$ref": "#/definitions/RoleDTO"
       }
     },
+    "getSSOSettingsResponse": {
+      "description": "(empty)",
+      "schema": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "provider": {
+            "type": "string"
+          },
+          "settings": {
+            "type": "object",
+            "additionalProperties": false
+          },
+          "source": {
+            "type": "string"
+          }
+        }
+      }
+    },
     "getSharingOptionsResponse": {
       "description": "(empty)",
       "schema": {
@@ -21628,6 +22110,12 @@
         "$ref": "#/definitions/ErrorResponseBody"
       }
     },
+    "internalServerPublicError": {
+      "description": "InternalServerPublicError is a general error indicating something went wrong internally.",
+      "schema": {
+        "$ref": "#/definitions/publicError"
+      }
+    },
     "jwksResponse": {
       "description": "(empty)",
       "schema": {
@@ -21654,6 +22142,12 @@
         }
       }
     },
+    "listPublicDashboardsResponse": {
+      "description": "(empty)",
+      "schema": {
+        "$ref": "#/definitions/PublicDashboardListResponseWithPagination"
+      }
+    },
     "listRecordingRulesResponse": {
       "description": "(empty)",
       "schema": {
@@ -21672,6 +22166,30 @@
         }
       }
     },
+    "listSSOSettingsResponse": {
+      "description": "(empty)",
+      "schema": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "id": {
+              "type": "string"
+            },
+            "provider": {
+              "type": "string"
+            },
+            "settings": {
+              "type": "object",
+              "additionalProperties": false
+            },
+            "source": {
+              "type": "string"
+            }
+          }
+        }
+      }
+    },
     "listSortOptionsResponse": {
       "description": "(empty)",
       "schema": {
@@ -21692,69 +22210,55 @@
         }
       }
     },
-    "listTokensResponse": {
+    "listTeamsRolesResponse": {
       "description": "(empty)",
       "schema": {
-        "$ref": "#/definitions/TokenDTO"
-      }
-    },
-    "notFoundError": {
-      "description": "NotFoundError is returned when the requested resource was not found.",
-      "schema": {
-        "$ref": "#/definitions/ErrorResponseBody"
+        "type": "object",
+        "additionalProperties": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/RoleDTO"
+          }
+        }
       }
     },
-    "okResponse": {
-      "description": "An OKResponse is returned if the request was successful.",
+    "listTokensResponse": {
+      "description": "(empty)",
       "schema": {
-        "$ref": "#/definitions/SuccessResponseBody"
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/TokenDTO"
+        }
       }
     },
-    "pauseAlertResponse": {
+    "listUsersRolesResponse": {
       "description": "(empty)",
       "schema": {
         "type": "object",
-        "required": [
-          "alertId",
-          "message"
-        ],
-        "properties": {
-          "alertId": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "message": {
-            "type": "string"
-          },
-          "state": {
-            "description": "Alert result state\nrequired true",
-            "type": "string"
+        "additionalProperties": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/RoleDTO"
           }
         }
       }
     },
-    "pauseAlertsResponse": {
-      "description": "(empty)",
+    "notFoundError": {
+      "description": "NotFoundError is returned when the requested resource was not found.",
       "schema": {
-        "type": "object",
-        "required": [
-          "alertsAffected",
-          "message"
-        ],
-        "properties": {
-          "alertsAffected": {
-            "description": "AlertsAffected is the number of the affected alerts.",
-            "type": "integer",
-            "format": "int64"
-          },
-          "message": {
-            "type": "string"
-          },
-          "state": {
-            "description": "Alert result state\nrequired true",
-            "type": "string"
-          }
-        }
+        "$ref": "#/definitions/ErrorResponseBody"
+      }
+    },
+    "notFoundPublicError": {
+      "description": "NotFoundPublicError is returned when the requested resource was not found.",
+      "schema": {
+        "$ref": "#/definitions/publicError"
+      }
+    },
+    "okResponse": {
+      "description": "An OKResponse is returned if the request was successful.",
+      "schema": {
+        "$ref": "#/definitions/SuccessResponseBody"
       }
     },
     "postAPIkeyResponse": {
@@ -21798,6 +22302,10 @@
           "url"
         ],
         "properties": {
+          "folderUid": {
+            "description": "FolderUID The unique identifier (uid) of the folder the dashboard belongs to.",
+            "type": "string"
+          },
           "id": {
             "description": "ID The unique identifier (id) of the created/updated dashboard.",
             "type": "integer",
@@ -21842,12 +22350,24 @@
         "$ref": "#/definitions/ErrorResponseBody"
       }
     },
+    "publicErrorResponse": {
+      "description": "(empty)",
+      "schema": {
+        "$ref": "#/definitions/publicError"
+      }
+    },
     "queryMetricsWithExpressionsRespons": {
       "description": "(empty)",
       "schema": {
         "$ref": "#/definitions/QueryDataResponse"
       }
     },
+    "queryPublicDashboardResponse": {
+      "description": "(empty)",
+      "schema": {
+        "$ref": "#/definitions/QueryDataResponse"
+      }
+    },
     "receiversResponse": {
       "description": "(empty)",
       "schema": {
@@ -21875,6 +22395,12 @@
         "$ref": "#/definitions/ActiveUserStats"
       }
     },
+    "resourcePermissionsDescription": {
+      "description": "(empty)",
+      "schema": {
+        "$ref": "#/definitions/Description"
+      }
+    },
     "retrieveServiceAccountResponse": {
       "description": "(empty)",
       "schema": {
@@ -21956,24 +22482,18 @@
         "$ref": "#/definitions/RoleAssignmentsDTO"
       }
     },
-    "testAlertResponse": {
-      "description": "(empty)",
-      "schema": {
-        "$ref": "#/definitions/AlertTestResult"
-      }
-    },
-    "trimDashboardResponse": {
-      "description": "(empty)",
-      "schema": {
-        "$ref": "#/definitions/TrimDashboardFullWithMeta"
-      }
-    },
     "unauthorisedError": {
       "description": "UnauthorizedError is returned when the request is not authenticated.",
       "schema": {
         "$ref": "#/definitions/ErrorResponseBody"
       }
     },
+    "unauthorisedPublicError": {
+      "description": "UnauthorisedPublicError is returned when the request is not authenticated.",
+      "schema": {
+        "$ref": "#/definitions/publicError"
+      }
+    },
     "unprocessableEntityError": {
       "description": "UnprocessableEntityError",
       "schema": {
@@ -21992,6 +22512,12 @@
         "$ref": "#/definitions/PlaylistDTO"
       }
     },
+    "updatePublicDashboardResponse": {
+      "description": "(empty)",
+      "schema": {
+        "$ref": "#/definitions/PublicDashboard"
+      }
+    },
     "updateServiceAccountResponse": {
       "description": "(empty)",
       "schema": {
@@ -22019,15 +22545,10 @@
         "$ref": "#/definitions/UserProfileDTO"
       }
     },
-    "validateDashboardResponse": {
+    "viewPublicDashboardResponse": {
       "description": "(empty)",
-      "headers": {
-        "isValid": {
-          "type": "boolean"
-        },
-        "message": {
-          "type": "string"
-        }
+      "schema": {
+        "$ref": "#/definitions/DashboardFullWithMeta"
       }
     }
   },
diff --git a/public/app/AppWrapper.tsx b/public/app/AppWrapper.tsx
index 9cf0b4d0aaf05..6a527baa7698b 100644
--- a/public/app/AppWrapper.tsx
+++ b/public/app/AppWrapper.tsx
@@ -5,7 +5,7 @@ import { Router, Redirect, Switch, RouteComponentProps } from 'react-router-dom'
 import { CompatRouter, CompatRoute } from 'react-router-dom-v5-compat';
 
 import { config, locationService, navigationLogger, reportInteraction } from '@grafana/runtime';
-import { ErrorBoundaryAlert, GlobalStyles, ModalRoot, ModalsProvider, PortalContainer } from '@grafana/ui';
+import { ErrorBoundaryAlert, GlobalStyles, ModalRoot, PortalContainer } from '@grafana/ui';
 import { getAppRoutes } from 'app/routes/routes';
 import { store } from 'app/store/store';
 
@@ -15,6 +15,7 @@ import { GrafanaApp } from './app';
 import { AppChrome } from './core/components/AppChrome/AppChrome';
 import { AppNotificationList } from './core/components/AppNotifications/AppNotificationList';
 import { GrafanaContext } from './core/context/GrafanaContext';
+import { ModalsContextProvider } from './core/context/ModalsContextProvider';
 import { GrafanaRoute } from './core/navigation/GrafanaRoute';
 import { RouteDescriptor } from './core/navigation/types';
 import { contextSrv } from './core/services/context_srv';
@@ -102,11 +103,11 @@ export class AppWrapper extends React.Component<AppWrapperProps, AppWrapperState
                 actions={[]}
                 options={{ enableHistory: true, callbacks: { onSelectAction: commandPaletteActionSelected } }}
               >
-                <ModalsProvider>
-                  <GlobalStyles />
-                  <div className="grafana-app">
-                    <Router history={locationService.getHistory()}>
-                      <CompatRouter>
+                <Router history={locationService.getHistory()}>
+                  <CompatRouter>
+                    <ModalsContextProvider>
+                      <GlobalStyles />
+                      <div className="grafana-app">
                         <AppChrome>
                           {pageBanners.map((Banner, index) => (
                             <Banner key={index.toString()} />
@@ -118,13 +119,13 @@ export class AppWrapper extends React.Component<AppWrapperProps, AppWrapperState
                             <Hook key={index.toString()} />
                           ))}
                         </AppChrome>
-                      </CompatRouter>
-                    </Router>
-                  </div>
-                  <LiveConnectionWarning />
-                  <ModalRoot />
-                  <PortalContainer />
-                </ModalsProvider>
+                      </div>
+                      <LiveConnectionWarning />
+                      <ModalRoot />
+                      <PortalContainer />
+                    </ModalsContextProvider>
+                  </CompatRouter>
+                </Router>
               </KBarProvider>
             </ThemeProvider>
           </GrafanaContext.Provider>
diff --git a/public/app/angular/AngularApp.ts b/public/app/angular/AngularApp.ts
index 045f1d279850d..d0f2bcff4d82f 100644
--- a/public/app/angular/AngularApp.ts
+++ b/public/app/angular/AngularApp.ts
@@ -2,12 +2,11 @@ import 'angular';
 import 'angular-route';
 import 'angular-sanitize';
 import 'angular-bindonce';
-import 'vendor/bootstrap/bootstrap';
 
 import angular from 'angular'; // eslint-disable-line no-duplicate-imports
 import { extend } from 'lodash';
 
-import { getTemplateSrv, SystemJS } from '@grafana/runtime';
+import { getTemplateSrv } from '@grafana/runtime';
 import { coreModule, angularModules } from 'app/angular/core_module';
 import appEvents from 'app/core/app_events';
 import { config } from 'app/core/config';
@@ -15,6 +14,7 @@ import { contextSrv } from 'app/core/services/context_srv';
 import { DashboardLoaderSrv } from 'app/features/dashboard/services/DashboardLoaderSrv';
 import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { setAngularPanelReactWrapper } from 'app/features/plugins/importPanelPlugin';
+import { SystemJS } from 'app/features/plugins/loader/systemjs';
 import { buildImportMap } from 'app/features/plugins/loader/utils';
 import * as sdk from 'app/plugins/sdk';
 
diff --git a/public/app/app.ts b/public/app/app.ts
index fedbda115589a..5796b18c21e3b 100644
--- a/public/app/app.ts
+++ b/public/app/app.ts
@@ -1,10 +1,10 @@
 import 'symbol-observable';
-import 'core-js';
 import 'regenerator-runtime/runtime';
 
 import 'whatwg-fetch'; // fetch polyfill needed for PhantomJs rendering
 import 'file-saver';
 import 'jquery';
+import 'vendor/bootstrap/bootstrap';
 
 import 'app/features/all';
 
@@ -15,7 +15,6 @@ import { createRoot } from 'react-dom/client';
 import {
   locationUtil,
   monacoLanguageRegistry,
-  OrgRole,
   setLocale,
   setTimeZoneResolver,
   setWeekStart,
@@ -34,14 +33,16 @@ import {
   setRunRequest,
   setPluginImportUtils,
   setPluginExtensionGetter,
+  setEmbeddedDashboard,
   setAppEvents,
+  setReturnToPreviousHook,
   type GetPluginExtensions,
 } from '@grafana/runtime';
 import { setPanelDataErrorView } from '@grafana/runtime/src/components/PanelDataErrorView';
 import { setPanelRenderer } from '@grafana/runtime/src/components/PanelRenderer';
 import { setPluginPage } from '@grafana/runtime/src/components/PluginPage';
 import { getScrollbarWidth } from '@grafana/ui';
-import config from 'app/core/config';
+import config, { updateConfig } from 'app/core/config';
 import { arrayMove } from 'app/core/utils/arrayMove';
 import { getStandardTransformers } from 'app/features/transformers/standardTransformers';
 
@@ -52,11 +53,12 @@ import appEvents from './core/app_events';
 import { AppChromeService } from './core/components/AppChrome/AppChromeService';
 import { getAllOptionEditors, getAllStandardFieldConfigs } from './core/components/OptionsUI/registry';
 import { PluginPage } from './core/components/Page/PluginPage';
-import { GrafanaContextType } from './core/context/GrafanaContext';
+import { GrafanaContextType, useReturnToPreviousInternal } from './core/context/GrafanaContext';
 import { initIconCache } from './core/icons/iconBundle';
 import { initializeI18n } from './core/internationalization';
+import { setMonacoEnv } from './core/monacoEnv';
 import { interceptLinkClicks } from './core/navigation/patch/interceptLinkClicks';
-import { ModalManager } from './core/services/ModalManager';
+import { NewFrontendAssetsChecker } from './core/services/NewFrontendAssetsChecker';
 import { backendSrv } from './core/services/backend_srv';
 import { contextSrv } from './core/services/context_srv';
 import { Echo } from './core/services/echo/Echo';
@@ -70,8 +72,10 @@ import { GrafanaJavascriptAgentBackend } from './core/services/echo/backends/gra
 import { KeybindingSrv } from './core/services/keybindingSrv';
 import { startMeasure, stopMeasure } from './core/utils/metrics';
 import { initDevFeatures } from './dev';
+import { initAlerting } from './features/alerting/unified/initAlerting';
 import { initAuthConfig } from './features/auth-config';
 import { getTimeSrv } from './features/dashboard/services/TimeSrv';
+import { EmbeddedDashboardLazy } from './features/dashboard-scene/embedding/EmbeddedDashboardLazy';
 import { initGrafanaLive } from './features/live';
 import { PanelDataErrorView } from './features/panel/components/PanelDataErrorView';
 import { PanelRenderer } from './features/panel/components/PanelRenderer';
@@ -80,7 +84,7 @@ import { createPluginExtensionRegistry } from './features/plugins/extensions/cre
 import { getCoreExtensionConfigurations } from './features/plugins/extensions/getCoreExtensionConfigurations';
 import { getPluginExtensions } from './features/plugins/extensions/getPluginExtensions';
 import { importPanelPlugin, syncGetPanelPlugin } from './features/plugins/importPanelPlugin';
-import { preloadPlugins } from './features/plugins/pluginPreloader';
+import { PluginPreloadResult, preloadPlugins } from './features/plugins/pluginPreloader';
 import { QueryRunner } from './features/query/state/QueryRunner';
 import { runRequest } from './features/query/state/runRequest';
 import { initWindowRuntime } from './features/runtime/init';
@@ -121,19 +125,25 @@ export class GrafanaApp {
       parent.postMessage('GrafanaAppInit', '*');
 
       const initI18nPromise = initializeI18n(config.bootData.user.language);
+      initI18nPromise.then(({ language }) => updateConfig({ language }));
 
       setBackendSrv(backendSrv);
       initEchoSrv();
       initIconCache();
       // This needs to be done after the `initEchoSrv` since it is being used under the hood.
       startMeasure('frontend_app_init');
-      addClassIfNoOverlayScrollbar();
+
+      if (!config.featureToggles.betterPageScrolling) {
+        addClassIfNoOverlayScrollbar();
+      }
+
       setLocale(config.bootData.user.locale);
       setWeekStart(config.bootData.user.weekStart);
       setPanelRenderer(PanelRenderer);
       setPluginPage(PluginPage);
       setPanelDataErrorView(PanelDataErrorView);
       setLocationSrv(locationService);
+      setEmbeddedDashboard(EmbeddedDashboardLazy);
       setTimeZoneResolver(() => config.bootData.user.timezone);
       initGrafanaLive();
 
@@ -150,6 +160,8 @@ export class GrafanaApp {
       configureStore();
       initExtensions();
 
+      initAlerting();
+
       standardEditorsRegistry.setInit(getAllOptionEditors);
       standardFieldConfigEditorRegistry.setInit(getAllStandardFieldConfigs);
       standardTransformersRegistry.setInit(getStandardTransformers);
@@ -163,7 +175,9 @@ export class GrafanaApp {
         createAdHocVariableAdapter(),
         createSystemVariableAdapter(),
       ]);
+
       monacoLanguageRegistry.setInit(getDefaultMonacoLanguages);
+      setMonacoEnv();
 
       setQueryRunnerFactory(() => new QueryRunner());
       setVariableQueryRunner(new VariableQueryRunner());
@@ -192,12 +206,12 @@ export class GrafanaApp {
       setDataSourceSrv(dataSourceSrv);
       initWindowRuntime();
 
-      // init modal manager
-      const modalManager = new ModalManager();
-      modalManager.init();
+      let preloadResults: PluginPreloadResult[] = [];
 
-      // Preload selected app plugins
-      const preloadResults = await preloadPlugins(config.apps);
+      if (contextSrv.user.orgRole !== '') {
+        // Preload selected app plugins
+        preloadResults = await preloadPlugins(config.apps);
+      }
 
       // Create extension registry out of preloaded plugins and core extensions
       const extensionRegistry = createPluginExtensionRegistry([
@@ -215,6 +229,8 @@ export class GrafanaApp {
       const queryParams = locationService.getSearchObject();
       const chromeService = new AppChromeService();
       const keybindingsService = new KeybindingSrv(locationService, chromeService);
+      const newAssetsChecker = new NewFrontendAssetsChecker();
+      newAssetsChecker.start();
 
       // Read initial kiosk mode from url at app startup
       chromeService.setKioskModeFromUrl(queryParams.kiosk);
@@ -231,9 +247,12 @@ export class GrafanaApp {
         location: locationService,
         chrome: chromeService,
         keybindings: keybindingsService,
+        newAssetsChecker,
         config,
       };
 
+      setReturnToPreviousHook(useReturnToPreviousInternal);
+
       const root = createRoot(document.getElementById('reactRoot')!);
       root.render(
         React.createElement(AppWrapper, {
@@ -266,7 +285,7 @@ function initEchoSrv() {
 
   window.addEventListener('load', (e) => {
     const loadMetricName = 'frontend_boot_load_time_seconds';
-    // Metrics below are marked in public/views/index-template.html
+    // Metrics below are marked in public/views/index.html
     const jsLoadMetricName = 'frontend_boot_js_done_time_seconds';
     const cssLoadMetricName = 'frontend_boot_css_time_seconds';
 
@@ -280,7 +299,7 @@ function initEchoSrv() {
     }
   });
 
-  if (contextSrv.user.orgRole !== OrgRole.None) {
+  if (contextSrv.user.orgRole !== '') {
     registerEchoBackend(new PerformanceBackend({}));
   }
 
diff --git a/public/app/core/actions/index.ts b/public/app/core/actions/index.ts
index 88c6c68ab2eaa..d73c489b33e24 100644
--- a/public/app/core/actions/index.ts
+++ b/public/app/core/actions/index.ts
@@ -1,3 +1,4 @@
 import { hideAppNotification, notifyApp } from '../reducers/appNotification';
 import { updateNavIndex, updateConfigurationSubtitle } from '../reducers/navModel';
+
 export { updateNavIndex, updateConfigurationSubtitle, notifyApp, hideAppNotification };
diff --git a/public/app/core/components/AccessControl/AddPermission.tsx b/public/app/core/components/AccessControl/AddPermission.tsx
index 740e0acc041ee..3099e84ad54b3 100644
--- a/public/app/core/components/AccessControl/AddPermission.tsx
+++ b/public/app/core/components/AccessControl/AddPermission.tsx
@@ -1,7 +1,6 @@
 import React, { useEffect, useMemo, useState } from 'react';
 
-import { Stack } from '@grafana/experimental';
-import { Button, Form, Select } from '@grafana/ui';
+import { Button, Select, Stack } from '@grafana/ui';
 import { CloseButton } from 'app/core/components/CloseButton/CloseButton';
 import { ServiceAccountPicker } from 'app/core/components/Select/ServiceAccountPicker';
 import { TeamPicker } from 'app/core/components/Select/TeamPicker';
@@ -72,54 +71,54 @@ export const AddPermission = ({
       <CloseButton onClick={onCancel} />
       <h5>{title}</h5>
 
-      <Form
+      <form
         name="addPermission"
-        maxWidth="none"
-        onSubmit={() => onAdd({ userId, teamId, builtInRole, permission, target })}
+        onSubmit={(event) => {
+          event.preventDefault();
+          onAdd({ userId, teamId, builtInRole, permission, target });
+        }}
       >
-        {() => (
-          <Stack gap={1} direction="row">
-            <Select
-              aria-label="Role to add new permission to"
-              value={target}
-              options={targetOptions}
-              onChange={(v) => setPermissionTarget(v.value!)}
-              disabled={targetOptions.length === 0}
-              width="auto"
-            />
+        <Stack gap={1} direction="row">
+          <Select
+            aria-label="Role to add new permission to"
+            value={target}
+            options={targetOptions}
+            onChange={(v) => setPermissionTarget(v.value!)}
+            disabled={targetOptions.length === 0}
+            width="auto"
+          />
 
-            {target === PermissionTarget.User && <UserPicker onSelected={(u) => setUserId(u?.value || 0)} />}
+          {target === PermissionTarget.User && <UserPicker onSelected={(u) => setUserId(u?.value || 0)} />}
 
-            {target === PermissionTarget.ServiceAccount && (
-              <ServiceAccountPicker onSelected={(u) => setUserId(u?.value || 0)} />
-            )}
+          {target === PermissionTarget.ServiceAccount && (
+            <ServiceAccountPicker onSelected={(u) => setUserId(u?.value || 0)} />
+          )}
 
-            {target === PermissionTarget.Team && <TeamPicker onSelected={(t) => setTeamId(t.value?.id || 0)} />}
-
-            {target === PermissionTarget.BuiltInRole && (
-              <Select
-                aria-label={'Built-in role picker'}
-                options={Object.values(OrgRole)
-                  .filter((r) => r !== OrgRole.None)
-                  .map((r) => ({ value: r, label: r }))}
-                onChange={(r) => setBuiltinRole(r.value || '')}
-                width="auto"
-              />
-            )}
+          {target === PermissionTarget.Team && <TeamPicker onSelected={(t) => setTeamId(t.value?.id || 0)} />}
 
+          {target === PermissionTarget.BuiltInRole && (
             <Select
-              aria-label="Permission Level"
+              aria-label={'Built-in role picker'}
+              options={Object.values(OrgRole)
+                .filter((r) => r !== OrgRole.None)
+                .map((r) => ({ value: r, label: r }))}
+              onChange={(r) => setBuiltinRole(r.value || '')}
               width="auto"
-              value={permissions.find((p) => p === permission)}
-              options={permissions.map((p) => ({ label: p, value: p }))}
-              onChange={(v) => setPermission(v.value || '')}
             />
-            <Button type="submit" disabled={!isValid()}>
-              <Trans i18nKey="access-control.add-permissions.save">Save</Trans>
-            </Button>
-          </Stack>
-        )}
-      </Form>
+          )}
+
+          <Select
+            aria-label="Permission Level"
+            width="auto"
+            value={permissions.find((p) => p === permission)}
+            options={permissions.map((p) => ({ label: p, value: p }))}
+            onChange={(v) => setPermission(v.value || '')}
+          />
+          <Button type="submit" disabled={!isValid()}>
+            <Trans i18nKey="access-control.add-permissions.save">Save</Trans>
+          </Button>
+        </Stack>
+      </form>
     </div>
   );
 };
diff --git a/public/app/core/components/AccessControl/PermissionList.tsx b/public/app/core/components/AccessControl/PermissionList.tsx
index baadf95b0c729..a56c98c4d32a6 100644
--- a/public/app/core/components/AccessControl/PermissionList.tsx
+++ b/public/app/core/components/AccessControl/PermissionList.tsx
@@ -27,6 +27,12 @@ export const PermissionList = ({ title, items, compareKey, permissionLevels, can
 
       if (item.actions.length > keep[key].actions.length) {
         keep[key] = item;
+        continue;
+      }
+
+      // If the same permission has been inherited and applied directly, keep the one that is applied directly
+      if (item.actions.length === keep[key].actions.length && !item.isInherited) {
+        keep[key] = item;
       }
     }
     return Object.keys(keep).map((k) => keep[k]);
diff --git a/public/app/core/components/AccessControl/PermissionListItem.tsx b/public/app/core/components/AccessControl/PermissionListItem.tsx
index 77b7e177a2b72..0d6eaf15cf786 100644
--- a/public/app/core/components/AccessControl/PermissionListItem.tsx
+++ b/public/app/core/components/AccessControl/PermissionListItem.tsx
@@ -1,6 +1,8 @@
+import { css } from '@emotion/css';
 import React from 'react';
 
-import { Button, Icon, Select, Tooltip } from '@grafana/ui';
+import { GrafanaTheme2 } from '@grafana/data';
+import { Box, Button, Icon, Select, Tooltip, useStyles2 } from '@grafana/ui';
 
 import { ResourcePermission } from './types';
 
@@ -12,42 +14,59 @@ interface Props {
   onChange: (item: ResourcePermission, permission: string) => void;
 }
 
-export const PermissionListItem = ({ item, permissionLevels, canSet, onRemove, onChange }: Props) => (
-  <tr>
-    <td>{getAvatar(item)}</td>
-    <td>{getDescription(item)}</td>
-    <td>{item.isInherited && <em className="muted no-wrap">Inherited from folder</em>}</td>
-    <td>
-      <Select
-        disabled={!canSet || !item.isManaged}
-        onChange={(p) => onChange(item, p.value!)}
-        value={permissionLevels.find((p) => p === item.permission)}
-        options={permissionLevels.map((p) => ({ value: p, label: p }))}
-      />
-    </td>
-    <td>
-      <Tooltip content={getPermissionInfo(item)}>
-        <Icon name="info-circle" />
-      </Tooltip>
-    </td>
-    <td>
-      {item.isManaged ? (
-        <Button
-          size="sm"
-          icon="times"
-          variant="destructive"
-          disabled={!canSet}
-          onClick={() => onRemove(item)}
-          aria-label={`Remove permission for ${getName(item)}`}
+export const PermissionListItem = ({ item, permissionLevels, canSet, onRemove, onChange }: Props) => {
+  const styles = useStyles2(getStyles);
+
+  return (
+    <tr>
+      <td>{getAvatar(item)}</td>
+      <td>{getDescription(item)}</td>
+      <td>{item.isInherited && <em className="muted no-wrap">Inherited from folder</em>}</td>
+      <td>
+        <Select
+          disabled={!canSet || !item.isManaged}
+          onChange={(p) => onChange(item, p.value!)}
+          value={permissionLevels.find((p) => p === item.permission)}
+          options={permissionLevels.map((p) => ({ value: p, label: p }))}
         />
-      ) : (
-        <Tooltip content={item.isInherited ? 'Inherited Permission' : 'Provisioned Permission'}>
-          <Button size="sm" icon="lock" />
-        </Tooltip>
-      )}
-    </td>
-  </tr>
-);
+      </td>
+      <td>
+        {item.warning ? (
+          <Tooltip
+            content={
+              <>
+                <Box marginBottom={1}>{item.warning}</Box>
+                {getPermissionInfo(item)}
+              </>
+            }
+          >
+            <Icon name="exclamation-triangle" className={styles.warning} />
+          </Tooltip>
+        ) : (
+          <Tooltip content={getPermissionInfo(item)}>
+            <Icon name="info-circle" />
+          </Tooltip>
+        )}
+      </td>
+      <td>
+        {item.isManaged ? (
+          <Button
+            size="sm"
+            icon="times"
+            variant="destructive"
+            disabled={!canSet}
+            onClick={() => onRemove(item)}
+            aria-label={`Remove permission for ${getName(item)}`}
+          />
+        ) : (
+          <Tooltip content={item.isInherited ? 'Inherited Permission' : 'Provisioned Permission'}>
+            <Button size="sm" icon="lock" />
+          </Tooltip>
+        )}
+      </td>
+    </tr>
+  );
+};
 
 const getAvatar = (item: ResourcePermission) => {
   if (item.teamId) {
@@ -80,3 +99,9 @@ const getDescription = (item: ResourcePermission) => {
 };
 
 const getPermissionInfo = (p: ResourcePermission) => `Actions: ${[...new Set(p.actions)].sort().join(' ')}`;
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  warning: css({
+    color: theme.colors.warning.main,
+  }),
+});
diff --git a/public/app/core/components/AccessControl/Permissions.tsx b/public/app/core/components/AccessControl/Permissions.tsx
index 92dfb78e7bd96..d84e03031e788 100644
--- a/public/app/core/components/AccessControl/Permissions.tsx
+++ b/public/app/core/components/AccessControl/Permissions.tsx
@@ -3,13 +3,11 @@ import { sortBy } from 'lodash';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Space } from '@grafana/experimental';
-import { Button, useStyles2 } from '@grafana/ui';
+import { Text, Box, Button, useStyles2, Space } from '@grafana/ui';
 import { SlideDown } from 'app/core/components/Animations/SlideDown';
 import { Trans, t } from 'app/core/internationalization';
 import { getBackendSrv } from 'app/core/services/backend_srv';
 import { DescendantCount } from 'app/features/browse-dashboards/components/BrowseActions/DescendantCount';
-import { newBrowseDashboardsEnabled } from 'app/features/browse-dashboards/featureFlag';
 
 import { AddPermission } from './AddPermission';
 import { PermissionList } from './PermissionList';
@@ -38,6 +36,8 @@ export type Props = {
   resource: string;
   resourceId: ResourceId;
   canSetPermissions: boolean;
+  getWarnings?: (items: ResourcePermission[]) => ResourcePermission[];
+  epilogue?: (items: ResourcePermission[]) => React.ReactNode;
 };
 
 export const Permissions = ({
@@ -48,15 +48,21 @@ export const Permissions = ({
   resourceId,
   canSetPermissions,
   addPermissionTitle,
+  getWarnings,
+  epilogue,
 }: Props) => {
   const styles = useStyles2(getStyles);
   const [isAdding, setIsAdding] = useState(false);
   const [items, setItems] = useState<ResourcePermission[]>([]);
   const [desc, setDesc] = useState(INITIAL_DESCRIPTION);
 
-  const fetchItems = useCallback(() => {
-    return getPermissions(resource, resourceId).then((r) => setItems(r));
-  }, [resource, resourceId]);
+  const fetchItems = useCallback(async () => {
+    let items = await getPermissions(resource, resourceId);
+    if (getWarnings) {
+      items = getWarnings(items);
+    }
+    setItems(items);
+  }, [resource, resourceId, getWarnings]);
 
   useEffect(() => {
     getDescription(resource).then((r) => {
@@ -153,91 +159,90 @@ export const Permissions = ({
   const titleTeam = t('access-control.permissions.team', 'Team');
 
   return (
-    <div>
-      {canSetPermissions && (
-        <>
-          {newBrowseDashboardsEnabled() && resource === 'folders' && (
-            <>
-              <Trans i18nKey="access-control.permissions.permissions-change-warning">
-                This will change permissions for this folder and all its descendants. In total, this will affect:
-              </Trans>
-              <DescendantCount
-                selectedItems={{
-                  folder: { [resourceId]: true },
-                  dashboard: {},
-                  panel: {},
-                  $all: false,
-                }}
-              />
-              <Space v={2} />
-            </>
-          )}
-          <Button
-            className={styles.addPermissionButton}
-            variant={'primary'}
-            key="add-permission"
-            onClick={() => setIsAdding(true)}
-          >
-            {buttonLabel}
-          </Button>
-          <SlideDown in={isAdding}>
-            <AddPermission
-              title={addPermissionTitle}
-              onAdd={onAdd}
-              permissions={desc.permissions}
-              assignments={desc.assignments}
-              onCancel={() => setIsAdding(false)}
+    <>
+      <div>
+        {canSetPermissions && resource === 'folders' && (
+          <>
+            <Trans i18nKey="access-control.permissions.permissions-change-warning">
+              This will change permissions for this folder and all its descendants. In total, this will affect:
+            </Trans>
+            <DescendantCount
+              selectedItems={{
+                folder: { [resourceId]: true },
+                dashboard: {},
+                panel: {},
+                $all: false,
+              }}
             />
-          </SlideDown>
-        </>
-      )}
-      {items.length === 0 && (
-        <table className="filter-table gf-form-group">
-          <tbody>
-            <tr>
-              <th>{emptyLabel}</th>
-            </tr>
-          </tbody>
-        </table>
-      )}
-      <PermissionList
-        title={titleRole}
-        items={builtInRoles}
-        compareKey={'builtInRole'}
-        permissionLevels={desc.permissions}
-        onChange={onChange}
-        onRemove={onRemove}
-        canSet={canSetPermissions}
-      />
-      <PermissionList
-        title={titleUser}
-        items={users}
-        compareKey={'userLogin'}
-        permissionLevels={desc.permissions}
-        onChange={onChange}
-        onRemove={onRemove}
-        canSet={canSetPermissions}
-      />
-      <PermissionList
-        title={titleServiceAccount}
-        items={serviceAccounts}
-        compareKey={'userLogin'}
-        permissionLevels={desc.permissions}
-        onChange={onChange}
-        onRemove={onRemove}
-        canSet={canSetPermissions}
-      />
-
-      <PermissionList
-        title={titleTeam}
-        items={teams}
-        compareKey={'team'}
-        permissionLevels={desc.permissions}
-        onChange={onChange}
-        onRemove={onRemove}
-        canSet={canSetPermissions}
-      />
-    </div>
+            <Space v={2} />
+          </>
+        )}
+        {items.length === 0 && (
+          <Box>
+            <Text>{emptyLabel}</Text>
+          </Box>
+        )}
+        <PermissionList
+          title={titleRole}
+          items={builtInRoles}
+          compareKey={'builtInRole'}
+          permissionLevels={desc.permissions}
+          onChange={onChange}
+          onRemove={onRemove}
+          canSet={canSetPermissions}
+        />
+        <PermissionList
+          title={titleUser}
+          items={users}
+          compareKey={'userLogin'}
+          permissionLevels={desc.permissions}
+          onChange={onChange}
+          onRemove={onRemove}
+          canSet={canSetPermissions}
+        />
+        <PermissionList
+          title={titleServiceAccount}
+          items={serviceAccounts}
+          compareKey={'userLogin'}
+          permissionLevels={desc.permissions}
+          onChange={onChange}
+          onRemove={onRemove}
+          canSet={canSetPermissions}
+        />
+        <PermissionList
+          title={titleTeam}
+          items={teams}
+          compareKey={'team'}
+          permissionLevels={desc.permissions}
+          onChange={onChange}
+          onRemove={onRemove}
+          canSet={canSetPermissions}
+        />
+        {canSetPermissions && (
+          <>
+            <Button
+              className={styles.addPermissionButton}
+              variant={'primary'}
+              key="add-permission"
+              onClick={() => setIsAdding(true)}
+              icon="plus"
+            >
+              {buttonLabel}
+            </Button>
+            <SlideDown in={isAdding}>
+              <AddPermission
+                title={addPermissionTitle}
+                onAdd={onAdd}
+                permissions={desc.permissions}
+                assignments={desc.assignments}
+                onCancel={() => setIsAdding(false)}
+              />
+            </SlideDown>
+          </>
+        )}
+      </div>
+      {epilogue && epilogue(items)}
+    </>
   );
 };
 
diff --git a/public/app/core/components/AccessControl/types.ts b/public/app/core/components/AccessControl/types.ts
index e2de980100d70..80ceca019bc89 100644
--- a/public/app/core/components/AccessControl/types.ts
+++ b/public/app/core/components/AccessControl/types.ts
@@ -13,6 +13,7 @@ export type ResourcePermission = {
   builtInRole?: string;
   actions: string[];
   permission: string;
+  warning?: string;
 };
 
 export type SetPermission = {
diff --git a/public/app/core/components/AppChrome/AppChrome.test.tsx b/public/app/core/components/AppChrome/AppChrome.test.tsx
index a4c4a40e43b48..870030ab187d3 100644
--- a/public/app/core/components/AppChrome/AppChrome.test.tsx
+++ b/public/app/core/components/AppChrome/AppChrome.test.tsx
@@ -1,11 +1,11 @@
-import { render, screen, waitFor } from '@testing-library/react';
+import { render, screen, waitFor, act } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { KBarProvider } from 'kbar';
 import React, { ReactNode } from 'react';
 import { TestProvider } from 'test/helpers/TestProvider';
 import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
 
-import { DataFrame, DataFrameView, FieldType, NavModelItem } from '@grafana/data';
+import { DataFrame, DataFrameView, FieldType } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { HOME_NAV_ID } from 'app/core/reducers/navModel';
 import { DashboardQueryResult, getGrafanaSearcher, QueryResponse } from 'app/features/search/service';
@@ -14,13 +14,10 @@ import { Page } from '../Page/Page';
 
 import { AppChrome } from './AppChrome';
 
-const pageNav: NavModelItem = {
-  text: 'pageNav title',
-  children: [
-    { text: 'pageNav child1', url: '1', active: true },
-    { text: 'pageNav child2', url: '2' },
-  ],
-};
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getPluginLinkExtensions: jest.fn().mockReturnValue({ extensions: [] }),
+}));
 
 const searchData: DataFrame = {
   fields: [
@@ -87,30 +84,6 @@ describe('AppChrome', () => {
     jest.clearAllMocks();
   });
 
-  it('should render section nav model based on navId', async () => {
-    setup(<Page navId="child1">Children</Page>);
-    expect(await screen.findByTestId('page-children')).toBeInTheDocument();
-
-    expect(screen.getByRole('tab', { name: 'Tab Section name' })).toBeInTheDocument();
-    expect(screen.getByRole('tab', { name: 'Tab Child1' })).toBeInTheDocument();
-    expect(screen.getByRole('tab', { name: 'Tab Child1' })).toBeInTheDocument();
-    expect(screen.getAllByRole('tab').length).toBe(3);
-  });
-
-  it('should render section nav model based on navId and item page nav', async () => {
-    setup(
-      <Page navId="child1" pageNav={pageNav}>
-        Children
-      </Page>
-    );
-    expect(await screen.findByTestId('page-children')).toBeInTheDocument();
-
-    expect(screen.getByRole('tab', { name: 'Tab Section name' })).toBeInTheDocument();
-    expect(screen.getByRole('heading', { name: 'pageNav title' })).toBeInTheDocument();
-    expect(screen.getByRole('tab', { name: 'Tab Child1' })).toBeInTheDocument();
-    expect(screen.getByRole('tab', { name: 'Tab pageNav child1' })).toBeInTheDocument();
-  });
-
   it('should create a skip link to skip to main content', async () => {
     setup(<Page navId="child1">Children</Page>);
     expect(await screen.findByRole('link', { name: 'Skip to main content' })).toBeInTheDocument();
@@ -127,8 +100,10 @@ describe('AppChrome', () => {
 
   it('should not render a skip link if the page is chromeless', async () => {
     const { context } = setup(<Page navId="child1">Children</Page>);
-    context.chrome.update({
-      chromeless: true,
+    act(() => {
+      context.chrome.update({
+        chromeless: true,
+      });
     });
     waitFor(() => {
       expect(screen.queryByRole('link', { name: 'Skip to main content' })).not.toBeInTheDocument();
diff --git a/public/app/core/components/AppChrome/AppChrome.tsx b/public/app/core/components/AppChrome/AppChrome.tsx
index b73009538a613..dc7492db63061 100644
--- a/public/app/core/components/AppChrome/AppChrome.tsx
+++ b/public/app/core/components/AppChrome/AppChrome.tsx
@@ -1,19 +1,22 @@
 import { css, cx } from '@emotion/css';
 import classNames from 'classnames';
-import React, { PropsWithChildren } from 'react';
+import React, { PropsWithChildren, useEffect } from 'react';
 
-import { GrafanaTheme2, PageLayoutType } from '@grafana/data';
+import { GrafanaTheme2 } from '@grafana/data';
+import { locationSearchToObject, locationService } from '@grafana/runtime';
 import { useStyles2, LinkButton, useTheme2 } from '@grafana/ui';
 import config from 'app/core/config';
 import { useGrafana } from 'app/core/context/GrafanaContext';
+import { useMediaQueryChange } from 'app/core/hooks/useMediaQueryChange';
+import store from 'app/core/store';
 import { CommandPalette } from 'app/features/commandPalette/CommandPalette';
 import { KioskMode } from 'app/types';
 
 import { AppChromeMenu } from './AppChromeMenu';
-import { MegaMenu as DockedMegaMenu } from './DockedMegaMenu/MegaMenu';
+import { DOCKED_LOCAL_STORAGE_KEY, DOCKED_MENU_OPEN_LOCAL_STORAGE_KEY } from './AppChromeService';
 import { MegaMenu } from './MegaMenu/MegaMenu';
 import { NavToolbar } from './NavToolbar/NavToolbar';
-import { SectionNav } from './SectionNav/SectionNav';
+import { ReturnToPrevious } from './ReturnToPrevious/ReturnToPrevious';
 import { TopSearchBar } from './TopBar/TopSearchBar';
 import { TOP_BAR_LEVEL_HEIGHT } from './types';
 
@@ -26,6 +29,20 @@ export function AppChrome({ children }: Props) {
   const theme = useTheme2();
   const styles = useStyles2(getStyles);
 
+  const dockedMenuBreakpoint = theme.breakpoints.values.xl;
+  const dockedMenuLocalStorageState = store.getBool(DOCKED_LOCAL_STORAGE_KEY, true);
+  useMediaQueryChange({
+    breakpoint: dockedMenuBreakpoint,
+    onChange: (e) => {
+      if (dockedMenuLocalStorageState) {
+        chrome.setMegaMenuDocked(e.matches, false);
+        chrome.setMegaMenuOpen(
+          e.matches ? store.getBool(DOCKED_MENU_OPEN_LOCAL_STORAGE_KEY, state.megaMenuOpen) : false
+        );
+      }
+    },
+  });
+
   const contentClass = cx({
     [styles.content]: true,
     [styles.contentNoSearchBar]: searchBarHidden,
@@ -33,22 +50,29 @@ export function AppChrome({ children }: Props) {
   });
 
   const handleMegaMenu = () => {
-    switch (state.megaMenu) {
-      case 'closed':
-        chrome.setMegaMenu('open');
-        break;
-      case 'open':
-        chrome.setMegaMenu('closed');
-        break;
-      case 'docked':
-        // on large screens, clicking the button when the menu is docked should close the menu
-        // on smaller screens, the docked menu is hidden, so clicking the button should open the menu
-        const isLargeScreen = window.innerWidth >= theme.breakpoints.values.xl;
-        isLargeScreen ? chrome.setMegaMenu('closed') : chrome.setMegaMenu('open');
-        break;
-    }
+    chrome.setMegaMenuOpen(!state.megaMenuOpen);
   };
 
+  const { pathname, search } = locationService.getLocation();
+  const url = pathname + search;
+  const shouldShowReturnToPrevious =
+    config.featureToggles.returnToPrevious && state.returnToPrevious && url !== state.returnToPrevious.href;
+
+  // Clear returnToPrevious when the page is manually navigated to
+  useEffect(() => {
+    if (state.returnToPrevious && url === state.returnToPrevious.href) {
+      chrome.clearReturnToPrevious('auto_dismissed');
+    }
+    // We only want to pay attention when the location changes
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [chrome, url]);
+
+  // Sync updates from kiosk mode query string back into app chrome
+  useEffect(() => {
+    const queryParams = locationSearchToObject(search);
+    chrome.setKioskModeFromUrl(queryParams.kiosk);
+  }, [chrome, search]);
+
   // Chromeless routes are without topNav, mega menu, search & command palette
   // We check chromeless twice here instead of having a separate path so {children}
   // doesn't get re-mounted when chromeless goes from true to false.
@@ -64,7 +88,7 @@ export function AppChrome({ children }: Props) {
           <LinkButton className={styles.skipLink} href="#pageContent">
             Skip to main content
           </LinkButton>
-          <div className={cx(styles.topNav)}>
+          <header className={cx(styles.topNav)}>
             {!searchBarHidden && <TopSearchBar />}
             <NavToolbar
               searchBarHidden={searchBarHidden}
@@ -75,41 +99,29 @@ export function AppChrome({ children }: Props) {
               onToggleMegaMenu={handleMegaMenu}
               onToggleKioskMode={chrome.onToggleKioskMode}
             />
-          </div>
+          </header>
         </>
       )}
-      <main className={contentClass}>
+      <div className={contentClass}>
         <div className={styles.panes}>
-          {state.layout === PageLayoutType.Standard && state.sectionNav && !config.featureToggles.dockedMegaMenu && (
-            <SectionNav model={state.sectionNav} />
-          )}
-          {config.featureToggles.dockedMegaMenu && !state.chromeless && state.megaMenu === 'docked' && (
-            <DockedMegaMenu className={styles.dockedMegaMenu} onClose={() => chrome.setMegaMenu('closed')} />
+          {!state.chromeless && state.megaMenuDocked && state.megaMenuOpen && (
+            <MegaMenu className={styles.dockedMegaMenu} onClose={() => chrome.setMegaMenuOpen(false)} />
           )}
-          <div className={styles.pageContainer} id="pageContent">
+          <main className={styles.pageContainer} id="pageContent">
             {children}
-          </div>
+          </main>
         </div>
-      </main>
-      {!state.chromeless && (
-        <>
-          {config.featureToggles.dockedMegaMenu ? (
-            <AppChromeMenu />
-          ) : (
-            <MegaMenu searchBarHidden={searchBarHidden} onClose={() => chrome.setMegaMenu('closed')} />
-          )}
-          <CommandPalette />
-        </>
+      </div>
+      {!state.chromeless && !state.megaMenuDocked && <AppChromeMenu />}
+      {!state.chromeless && <CommandPalette />}
+      {shouldShowReturnToPrevious && state.returnToPrevious && (
+        <ReturnToPrevious href={state.returnToPrevious.href} title={state.returnToPrevious.title} />
       )}
     </div>
   );
 }
 
 const getStyles = (theme: GrafanaTheme2) => {
-  const shadow = theme.isDark
-    ? `0 0.6px 1.5px rgb(0 0 0), 0 2px 4px rgb(0 0 0 / 40%), 0 5px 10px rgb(0 0 0 / 23%)`
-    : '0 4px 8px rgb(0 0 0 / 4%)';
-
   return {
     content: css({
       display: 'flex',
@@ -127,7 +139,6 @@ const getStyles = (theme: GrafanaTheme2) => {
     dockedMegaMenu: css({
       background: theme.colors.background.primary,
       borderRight: `1px solid ${theme.colors.border.weak}`,
-      borderTop: `1px solid ${theme.colors.border.weak}`,
       display: 'none',
       zIndex: theme.zIndex.navbarFixed,
 
@@ -141,10 +152,8 @@ const getStyles = (theme: GrafanaTheme2) => {
       zIndex: theme.zIndex.navbarFixed,
       left: 0,
       right: 0,
-      boxShadow: shadow,
       background: theme.colors.background.primary,
       flexDirection: 'column',
-      borderBottom: `1px solid ${theme.colors.border.weak}`,
     }),
     panes: css({
       label: 'page-panes',
@@ -163,6 +172,15 @@ const getStyles = (theme: GrafanaTheme2) => {
       flexGrow: 1,
       minHeight: 0,
       minWidth: 0,
+      overflow: 'auto',
+      '@media print': {
+        overflow: 'visible',
+      },
+      '@page': {
+        margin: 0,
+        size: 'auto',
+        padding: 0,
+      },
     }),
     skipLink: css({
       position: 'absolute',
diff --git a/public/app/core/components/AppChrome/AppChromeMenu.tsx b/public/app/core/components/AppChrome/AppChromeMenu.tsx
index a204e7fc9b3bb..7471a2416d292 100644
--- a/public/app/core/components/AppChrome/AppChromeMenu.tsx
+++ b/public/app/core/components/AppChrome/AppChromeMenu.tsx
@@ -10,7 +10,7 @@ import { useStyles2, useTheme2 } from '@grafana/ui';
 import { useGrafana } from 'app/core/context/GrafanaContext';
 import { KioskMode } from 'app/types';
 
-import { MegaMenu, MENU_WIDTH } from './DockedMegaMenu/MegaMenu';
+import { MegaMenu, MENU_WIDTH } from './MegaMenu/MegaMenu';
 import { TOGGLE_BUTTON_ID } from './NavToolbar/NavToolbar';
 import { TOP_BAR_LEVEL_HEIGHT } from './types';
 
@@ -27,8 +27,8 @@ export function AppChromeMenu({}: Props) {
   const animationSpeed = theme.transitions.duration.shortest;
   const animationStyles = useStyles2(getAnimStyles, animationSpeed);
 
-  const isOpen = state.megaMenu === 'open';
-  const onClose = () => chrome.setMegaMenu('closed');
+  const isOpen = state.megaMenuOpen && !state.megaMenuDocked;
+  const onClose = () => chrome.setMegaMenuOpen(false);
 
   const { overlayProps, underlayProps } = useOverlay(
     {
@@ -57,7 +57,7 @@ export function AppChromeMenu({}: Props) {
           classNames={animationStyles.overlay}
           timeout={{ enter: animationSpeed, exit: 0 }}
         >
-          <FocusScope contain autoFocus>
+          <FocusScope contain autoFocus restoreFocus>
             <MegaMenu className={styles.menu} onClose={onClose} ref={ref} {...overlayProps} {...dialogProps} />
           </FocusScope>
         </CSSTransition>
@@ -76,7 +76,7 @@ export function AppChromeMenu({}: Props) {
 }
 
 const getStyles = (theme: GrafanaTheme2, searchBarHidden?: boolean) => {
-  const topPosition = (searchBarHidden ? TOP_BAR_LEVEL_HEIGHT : TOP_BAR_LEVEL_HEIGHT * 2) + 1;
+  const topPosition = searchBarHidden ? TOP_BAR_LEVEL_HEIGHT : TOP_BAR_LEVEL_HEIGHT * 2;
 
   return {
     backdrop: css({
diff --git a/public/app/core/components/AppChrome/AppChromeService.tsx b/public/app/core/components/AppChrome/AppChromeService.tsx
index 83032e0dd631a..647e21bb638ad 100644
--- a/public/app/core/components/AppChrome/AppChromeService.tsx
+++ b/public/app/core/components/AppChrome/AppChromeService.tsx
@@ -11,35 +11,49 @@ import { KioskMode } from 'app/types';
 
 import { RouteDescriptor } from '../../navigation/types';
 
+import { ReturnToPreviousProps } from './ReturnToPrevious/ReturnToPrevious';
+
 export interface AppChromeState {
   chromeless?: boolean;
   sectionNav: NavModel;
   pageNav?: NavModelItem;
   actions?: React.ReactNode;
   searchBarHidden?: boolean;
-  megaMenu: 'open' | 'closed' | 'docked';
+  megaMenuOpen: boolean;
+  megaMenuDocked: boolean;
   kioskMode: KioskMode | null;
   layout: PageLayoutType;
+  returnToPrevious?: {
+    title: ReturnToPreviousProps['title'];
+    href: ReturnToPreviousProps['href'];
+  };
 }
 
-const DOCKED_LOCAL_STORAGE_KEY = 'grafana.navigation.docked';
+export const DOCKED_LOCAL_STORAGE_KEY = 'grafana.navigation.docked';
+export const DOCKED_MENU_OPEN_LOCAL_STORAGE_KEY = 'grafana.navigation.open';
 
 export class AppChromeService {
   searchBarStorageKey = 'SearchBar_Hidden';
   private currentRoute?: RouteDescriptor;
   private routeChangeHandled = true;
 
+  private megaMenuDocked = Boolean(
+    window.innerWidth >= config.theme2.breakpoints.values.xl &&
+      store.getBool(DOCKED_LOCAL_STORAGE_KEY, Boolean(window.innerWidth >= config.theme2.breakpoints.values.xxl))
+  );
+
+  private sessionStorageData = window.sessionStorage.getItem('returnToPrevious');
+  private returnToPreviousData = this.sessionStorageData ? JSON.parse(this.sessionStorageData) : undefined;
+
   readonly state = new BehaviorSubject<AppChromeState>({
     chromeless: true, // start out hidden to not flash it on pages without chrome
     sectionNav: { node: { text: t('nav.home.title', 'Home') }, main: { text: '' } },
     searchBarHidden: store.getBool(this.searchBarStorageKey, false),
-    megaMenu:
-      config.featureToggles.dockedMegaMenu &&
-      store.getBool(DOCKED_LOCAL_STORAGE_KEY, window.innerWidth >= config.theme2.breakpoints.values.xxl)
-        ? 'docked'
-        : 'closed',
+    megaMenuOpen: this.megaMenuDocked && store.getBool(DOCKED_MENU_OPEN_LOCAL_STORAGE_KEY, true),
+    megaMenuDocked: this.megaMenuDocked,
     kioskMode: null,
     layout: PageLayoutType.Canvas,
+    returnToPrevious: this.returnToPreviousData,
   });
 
   public setMatchedRoute(route: RouteDescriptor) {
@@ -75,6 +89,38 @@ export class AppChromeService {
     }
   }
 
+  public setReturnToPrevious = (returnToPrevious: ReturnToPreviousProps) => {
+    const isReturnToPreviousEnabled = config.featureToggles.returnToPrevious;
+    if (!isReturnToPreviousEnabled) {
+      return;
+    }
+    const previousPage = this.state.getValue().returnToPrevious;
+    reportInteraction('grafana_return_to_previous_button_created', {
+      page: returnToPrevious.href,
+      previousPage: previousPage?.href,
+    });
+
+    this.update({ returnToPrevious });
+    window.sessionStorage.setItem('returnToPrevious', JSON.stringify(returnToPrevious));
+  };
+
+  public clearReturnToPrevious = (interactionAction: 'clicked' | 'dismissed' | 'auto_dismissed') => {
+    const isReturnToPreviousEnabled = config.featureToggles.returnToPrevious;
+    if (!isReturnToPreviousEnabled) {
+      return;
+    }
+    const existingRtp = this.state.getValue().returnToPrevious;
+    if (existingRtp) {
+      reportInteraction('grafana_return_to_previous_button_dismissed', {
+        action: interactionAction,
+        page: existingRtp.href,
+      });
+    }
+
+    this.update({ returnToPrevious: undefined });
+    window.sessionStorage.removeItem('returnToPrevious');
+  };
+
   private ignoreStateUpdate(newState: AppChromeState, current: AppChromeState) {
     if (isShallowEqual(newState, current)) {
       return true;
@@ -100,14 +146,25 @@ export class AppChromeService {
     return useObservable(this.state, this.state.getValue());
   }
 
-  public setMegaMenu = (newMegaMenuState: AppChromeState['megaMenu']) => {
-    if (config.featureToggles.dockedMegaMenu) {
-      store.set(DOCKED_LOCAL_STORAGE_KEY, newMegaMenuState === 'docked');
-      reportInteraction('grafana_mega_menu_state', { state: newMegaMenuState });
-    } else {
-      reportInteraction('grafana_toggle_menu_clicked', { action: newMegaMenuState === 'open' ? 'open' : 'close' });
+  public setMegaMenuOpen = (newOpenState: boolean) => {
+    const { megaMenuDocked } = this.state.getValue();
+    if (megaMenuDocked) {
+      store.set(DOCKED_MENU_OPEN_LOCAL_STORAGE_KEY, newOpenState);
     }
-    this.update({ megaMenu: newMegaMenuState });
+    reportInteraction('grafana_mega_menu_open', { state: newOpenState });
+    this.update({
+      megaMenuOpen: newOpenState,
+    });
+  };
+
+  public setMegaMenuDocked = (newDockedState: boolean, updatePersistedState = true) => {
+    if (updatePersistedState) {
+      store.set(DOCKED_LOCAL_STORAGE_KEY, newDockedState);
+    }
+    reportInteraction('grafana_mega_menu_docked', { state: newDockedState });
+    this.update({
+      megaMenuDocked: newDockedState,
+    });
   };
 
   public onToggleSearchBar = () => {
@@ -134,13 +191,19 @@ export class AppChromeService {
   }
 
   public setKioskModeFromUrl(kiosk: UrlQueryValue) {
+    let newKioskMode: KioskMode | undefined;
+
     switch (kiosk) {
       case 'tv':
-        this.update({ kioskMode: KioskMode.TV });
+        newKioskMode = KioskMode.TV;
         break;
       case '1':
       case true:
-        this.update({ kioskMode: KioskMode.Full });
+        newKioskMode = KioskMode.Full;
+    }
+
+    if (newKioskMode && newKioskMode !== this.state.getValue().kioskMode) {
+      this.update({ kioskMode: newKioskMode });
     }
   }
 
diff --git a/public/app/core/components/AppChrome/DockedMegaMenu/MegaMenu.test.tsx b/public/app/core/components/AppChrome/DockedMegaMenu/MegaMenu.test.tsx
deleted file mode 100644
index 5b603aeb12dfa..0000000000000
--- a/public/app/core/components/AppChrome/DockedMegaMenu/MegaMenu.test.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import React from 'react';
-import { Router } from 'react-router-dom';
-import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
-
-import { NavModelItem } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
-import { locationService } from '@grafana/runtime';
-
-import { TestProvider } from '../../../../../test/helpers/TestProvider';
-
-import { MegaMenu } from './MegaMenu';
-
-const setup = () => {
-  const navBarTree: NavModelItem[] = [
-    {
-      text: 'Section name',
-      id: 'section',
-      url: 'section',
-      children: [
-        {
-          text: 'Child1',
-          id: 'child1',
-          url: 'section/child1',
-          children: [{ text: 'Grandchild1', id: 'grandchild1', url: 'section/child1/grandchild1' }],
-        },
-        { text: 'Child2', id: 'child2', url: 'section/child2' },
-      ],
-    },
-    {
-      text: 'Profile',
-      id: 'profile',
-      url: 'profile',
-    },
-  ];
-
-  const grafanaContext = getGrafanaContextMock();
-  grafanaContext.chrome.setMegaMenu('open');
-
-  return render(
-    <TestProvider storeState={{ navBarTree }} grafanaContext={grafanaContext}>
-      <Router history={locationService.getHistory()}>
-        <MegaMenu onClose={() => {}} />
-      </Router>
-    </TestProvider>
-  );
-};
-
-describe('MegaMenu', () => {
-  afterEach(() => {
-    window.localStorage.clear();
-  });
-  it('should render component', async () => {
-    setup();
-
-    expect(await screen.findByTestId(selectors.components.NavMenu.Menu)).toBeInTheDocument();
-    expect(await screen.findByRole('link', { name: 'Section name' })).toBeInTheDocument();
-  });
-
-  it('should render children', async () => {
-    setup();
-    await userEvent.click(await screen.findByRole('button', { name: 'Expand section Section name' }));
-    expect(await screen.findByRole('link', { name: 'Child1' })).toBeInTheDocument();
-    expect(await screen.findByRole('link', { name: 'Child2' })).toBeInTheDocument();
-  });
-
-  it('should render grandchildren', async () => {
-    setup();
-    await userEvent.click(await screen.findByRole('button', { name: 'Expand section Section name' }));
-    expect(await screen.findByRole('link', { name: 'Child1' })).toBeInTheDocument();
-    await userEvent.click(await screen.findByRole('button', { name: 'Expand section Child1' }));
-    expect(await screen.findByRole('link', { name: 'Grandchild1' })).toBeInTheDocument();
-    expect(await screen.findByRole('link', { name: 'Child2' })).toBeInTheDocument();
-  });
-
-  it('should filter out profile', async () => {
-    setup();
-
-    expect(screen.queryByLabelText('Profile')).not.toBeInTheDocument();
-  });
-});
diff --git a/public/app/core/components/AppChrome/DockedMegaMenu/MegaMenu.tsx b/public/app/core/components/AppChrome/DockedMegaMenu/MegaMenu.tsx
deleted file mode 100644
index 3f615d45a8bfd..0000000000000
--- a/public/app/core/components/AppChrome/DockedMegaMenu/MegaMenu.tsx
+++ /dev/null
@@ -1,124 +0,0 @@
-import { css } from '@emotion/css';
-import { DOMAttributes } from '@react-types/shared';
-import React, { forwardRef } from 'react';
-import { useLocation } from 'react-router-dom';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
-import { CustomScrollbar, Icon, IconButton, useStyles2 } from '@grafana/ui';
-import { Flex } from '@grafana/ui/src/unstable';
-import { useGrafana } from 'app/core/context/GrafanaContext';
-import { t } from 'app/core/internationalization';
-import { useSelector } from 'app/types';
-
-import { MegaMenuItem } from './MegaMenuItem';
-import { enrichWithInteractionTracking, getActiveItem } from './utils';
-
-export const MENU_WIDTH = '300px';
-
-export interface Props extends DOMAttributes {
-  onClose: () => void;
-}
-
-export const MegaMenu = React.memo(
-  forwardRef<HTMLDivElement, Props>(({ onClose, ...restProps }, ref) => {
-    const navTree = useSelector((state) => state.navBarTree);
-    const styles = useStyles2(getStyles);
-    const location = useLocation();
-    const { chrome } = useGrafana();
-    const state = chrome.useState();
-
-    // Remove profile + help from tree
-    const navItems = navTree
-      .filter((item) => item.id !== 'profile' && item.id !== 'help')
-      .map((item) => enrichWithInteractionTracking(item, true));
-
-    const activeItem = getActiveItem(navItems, location.pathname);
-
-    const handleDockedMenu = () => {
-      chrome.setMegaMenu(state.megaMenu === 'docked' ? 'closed' : 'docked');
-    };
-
-    return (
-      <div data-testid={selectors.components.NavMenu.Menu} ref={ref} {...restProps}>
-        <div className={styles.mobileHeader}>
-          <Icon name="bars" size="xl" />
-          <IconButton
-            tooltip={t('navigation.megamenu.close', 'Close menu')}
-            name="times"
-            onClick={onClose}
-            size="xl"
-            variant="secondary"
-          />
-        </div>
-        <nav className={styles.content}>
-          <CustomScrollbar showScrollIndicators hideHorizontalTrack>
-            <ul className={styles.itemList}>
-              {navItems.map((link, index) => (
-                <Flex key={link.text} direction="row" alignItems="center">
-                  <MegaMenuItem
-                    link={link}
-                    onClick={state.megaMenu === 'open' ? onClose : undefined}
-                    activeItem={activeItem}
-                  />
-                  {index === 0 && (
-                    <IconButton
-                      className={styles.dockMenuButton}
-                      tooltip={
-                        state.megaMenu === 'docked'
-                          ? t('navigation.megamenu.undock', 'Undock menu')
-                          : t('navigation.megamenu.dock', 'Dock menu')
-                      }
-                      name="web-section-alt"
-                      onClick={handleDockedMenu}
-                      variant="secondary"
-                    />
-                  )}
-                </Flex>
-              ))}
-            </ul>
-          </CustomScrollbar>
-        </nav>
-      </div>
-    );
-  })
-);
-
-MegaMenu.displayName = 'MegaMenu';
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  content: css({
-    display: 'flex',
-    flexDirection: 'column',
-    height: '100%',
-    minHeight: 0,
-    position: 'relative',
-  }),
-  mobileHeader: css({
-    display: 'flex',
-    justifyContent: 'space-between',
-    padding: theme.spacing(1, 1, 1, 2),
-    borderBottom: `1px solid ${theme.colors.border.weak}`,
-
-    [theme.breakpoints.up('md')]: {
-      display: 'none',
-    },
-  }),
-  itemList: css({
-    boxSizing: 'border-box',
-    display: 'flex',
-    flexDirection: 'column',
-    listStyleType: 'none',
-    padding: theme.spacing(1),
-    [theme.breakpoints.up('md')]: {
-      width: MENU_WIDTH,
-    },
-  }),
-  dockMenuButton: css({
-    display: 'none',
-
-    [theme.breakpoints.up('xl')]: {
-      display: 'inline-flex',
-    },
-  }),
-});
diff --git a/public/app/core/components/AppChrome/DockedMegaMenu/utils.test.ts b/public/app/core/components/AppChrome/DockedMegaMenu/utils.test.ts
deleted file mode 100644
index eacea3cfdf914..0000000000000
--- a/public/app/core/components/AppChrome/DockedMegaMenu/utils.test.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-import { GrafanaConfig, locationUtil, NavModelItem } from '@grafana/data';
-import { ContextSrv, setContextSrv } from 'app/core/services/context_srv';
-
-import { enrichHelpItem, getActiveItem, isMatchOrChildMatch } from './utils';
-
-jest.mock('../../../app_events', () => ({
-  publish: jest.fn(),
-}));
-
-describe('enrichConfigItems', () => {
-  let mockHelpNode: NavModelItem;
-
-  beforeEach(() => {
-    mockHelpNode = {
-      id: 'help',
-      text: 'Help',
-    };
-  });
-
-  it('enhances the help node with extra child links', () => {
-    const contextSrv = new ContextSrv();
-    setContextSrv(contextSrv);
-    const helpNode = enrichHelpItem(mockHelpNode);
-    expect(helpNode!.children).toContainEqual(
-      expect.objectContaining({
-        text: 'Documentation',
-      })
-    );
-    expect(helpNode!.children).toContainEqual(
-      expect.objectContaining({
-        text: 'Support',
-      })
-    );
-    expect(helpNode!.children).toContainEqual(
-      expect.objectContaining({
-        text: 'Community',
-      })
-    );
-    expect(helpNode!.children).toContainEqual(
-      expect.objectContaining({
-        text: 'Keyboard shortcuts',
-      })
-    );
-  });
-});
-
-describe('isMatchOrChildMatch', () => {
-  const mockChild: NavModelItem = {
-    text: 'Child',
-    url: '/dashboards/child',
-  };
-  const mockItemToCheck: NavModelItem = {
-    text: 'Dashboards',
-    url: '/dashboards',
-    children: [mockChild],
-  };
-
-  it('returns true if the itemToCheck is an exact match with the searchItem', () => {
-    const searchItem = mockItemToCheck;
-    expect(isMatchOrChildMatch(mockItemToCheck, searchItem)).toBe(true);
-  });
-
-  it('returns true if the itemToCheck has a child that matches the searchItem', () => {
-    const searchItem = mockChild;
-    expect(isMatchOrChildMatch(mockItemToCheck, searchItem)).toBe(true);
-  });
-
-  it('returns false otherwise', () => {
-    const searchItem: NavModelItem = {
-      text: 'No match',
-      url: '/noMatch',
-    };
-    expect(isMatchOrChildMatch(mockItemToCheck, searchItem)).toBe(false);
-  });
-});
-
-describe('getActiveItem', () => {
-  const mockNavTree: NavModelItem[] = [
-    {
-      text: 'Item',
-      url: '/item',
-    },
-    {
-      text: 'Item with query param',
-      url: '/itemWithQueryParam?foo=bar',
-    },
-    {
-      text: 'Item after subpath',
-      url: '/subUrl/itemAfterSubpath',
-    },
-    {
-      text: 'Item with children',
-      url: '/itemWithChildren',
-      children: [
-        {
-          text: 'Child',
-          url: '/child',
-        },
-      ],
-    },
-    {
-      text: 'Alerting item',
-      url: '/alerting/list',
-    },
-    {
-      text: 'Base',
-      url: '/',
-    },
-    {
-      text: 'Starred',
-      url: '/dashboards?starred',
-      id: 'starred',
-    },
-    {
-      text: 'Dashboards',
-      url: '/dashboards',
-    },
-    {
-      text: 'More specific dashboard',
-      url: '/d/moreSpecificDashboard',
-    },
-  ];
-  beforeEach(() => {
-    locationUtil.initialize({
-      config: { appSubUrl: '/subUrl' } as GrafanaConfig,
-      getVariablesUrlParams: () => ({}),
-      getTimeRangeForUrl: () => ({ from: 'now-7d', to: 'now' }),
-    });
-  });
-
-  it('returns an exact match at the top level', () => {
-    const mockPathName = '/item';
-    expect(getActiveItem(mockNavTree, mockPathName)).toEqual({
-      text: 'Item',
-      url: '/item',
-    });
-  });
-
-  it('returns an exact match ignoring root subpath', () => {
-    const mockPathName = '/itemAfterSubpath';
-    expect(getActiveItem(mockNavTree, mockPathName)).toEqual({
-      text: 'Item after subpath',
-      url: '/subUrl/itemAfterSubpath',
-    });
-  });
-
-  it('returns an exact match ignoring query params', () => {
-    const mockPathName = '/itemWithQueryParam?bar=baz';
-    expect(getActiveItem(mockNavTree, mockPathName)).toEqual({
-      text: 'Item with query param',
-      url: '/itemWithQueryParam?foo=bar',
-    });
-  });
-
-  it('returns an exact child match', () => {
-    const mockPathName = '/child';
-    expect(getActiveItem(mockNavTree, mockPathName)).toEqual({
-      text: 'Child',
-      url: '/child',
-    });
-  });
-
-  it('returns the alerting link if the pathname is an alert notification', () => {
-    const mockPathName = '/alerting/notification/foo';
-    expect(getActiveItem(mockNavTree, mockPathName)).toEqual({
-      text: 'Alerting item',
-      url: '/alerting/list',
-    });
-  });
-
-  it('returns the dashboards route link if the pathname starts with /d/', () => {
-    const mockPathName = '/d/foo';
-    expect(getActiveItem(mockNavTree, mockPathName)).toEqual({
-      text: 'Dashboards',
-      url: '/dashboards',
-    });
-  });
-
-  it('returns a more specific link if one exists', () => {
-    const mockPathName = '/d/moreSpecificDashboard';
-    expect(getActiveItem(mockNavTree, mockPathName)).toEqual({
-      text: 'More specific dashboard',
-      url: '/d/moreSpecificDashboard',
-    });
-  });
-});
diff --git a/public/app/core/components/AppChrome/DockedMegaMenu/utils.ts b/public/app/core/components/AppChrome/DockedMegaMenu/utils.ts
deleted file mode 100644
index 89384f0eb6c9c..0000000000000
--- a/public/app/core/components/AppChrome/DockedMegaMenu/utils.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-import { locationUtil, NavModelItem } from '@grafana/data';
-import { config, reportInteraction } from '@grafana/runtime';
-import { t } from 'app/core/internationalization';
-
-import { ShowModalReactEvent } from '../../../../types/events';
-import appEvents from '../../../app_events';
-import { getFooterLinks } from '../../Footer/Footer';
-import { HelpModal } from '../../help/HelpModal';
-
-export const enrichHelpItem = (helpItem: NavModelItem) => {
-  let menuItems = helpItem.children || [];
-
-  if (helpItem.id === 'help') {
-    const onOpenShortcuts = () => {
-      appEvents.publish(new ShowModalReactEvent({ component: HelpModal }));
-    };
-    helpItem.children = [
-      ...menuItems,
-      ...getFooterLinks(),
-      ...getEditionAndUpdateLinks(),
-      {
-        id: 'keyboard-shortcuts',
-        text: t('nav.help/keyboard-shortcuts', 'Keyboard shortcuts'),
-        icon: 'keyboard',
-        onClick: onOpenShortcuts,
-      },
-    ];
-  }
-  return helpItem;
-};
-
-export const enrichWithInteractionTracking = (item: NavModelItem, expandedState: boolean) => {
-  // creating a new object here to not mutate the original item object
-  const newItem = { ...item };
-  const onClick = newItem.onClick;
-  newItem.onClick = () => {
-    reportInteraction('grafana_navigation_item_clicked', {
-      path: newItem.url ?? newItem.id,
-      state: expandedState ? 'expanded' : 'collapsed',
-    });
-    onClick?.();
-  };
-  if (newItem.children) {
-    newItem.children = newItem.children.map((item) => enrichWithInteractionTracking(item, expandedState));
-  }
-  return newItem;
-};
-
-export const isMatchOrChildMatch = (itemToCheck: NavModelItem, searchItem?: NavModelItem) => {
-  return Boolean(itemToCheck === searchItem || hasChildMatch(itemToCheck, searchItem));
-};
-
-export const hasChildMatch = (itemToCheck: NavModelItem, searchItem?: NavModelItem): boolean => {
-  return Boolean(
-    itemToCheck.children?.some((child) => {
-      if (child === searchItem) {
-        return true;
-      } else {
-        return hasChildMatch(child, searchItem);
-      }
-    })
-  );
-};
-
-const stripQueryParams = (url?: string) => {
-  return url?.split('?')[0] ?? '';
-};
-
-const isBetterMatch = (newMatch: NavModelItem, currentMatch?: NavModelItem) => {
-  const currentMatchUrl = stripQueryParams(currentMatch?.url);
-  const newMatchUrl = stripQueryParams(newMatch.url);
-  return newMatchUrl && newMatchUrl.length > currentMatchUrl?.length;
-};
-
-export const getActiveItem = (
-  navTree: NavModelItem[],
-  pathname: string,
-  currentBestMatch?: NavModelItem
-): NavModelItem | undefined => {
-  const dashboardLinkMatch = '/dashboards';
-
-  for (const link of navTree) {
-    const linkWithoutParams = stripQueryParams(link.url);
-    const linkPathname = locationUtil.stripBaseFromUrl(linkWithoutParams);
-    if (linkPathname && link.id !== 'starred') {
-      if (linkPathname === pathname) {
-        // exact match
-        currentBestMatch = link;
-        break;
-      } else if (linkPathname !== '/' && pathname.startsWith(linkPathname)) {
-        // partial match
-        if (isBetterMatch(link, currentBestMatch)) {
-          currentBestMatch = link;
-        }
-      } else if (linkPathname === '/alerting/list' && pathname.startsWith('/alerting/notification/')) {
-        // alert channel match
-        // TODO refactor routes such that we don't need this custom logic
-        currentBestMatch = link;
-        break;
-      } else if (linkPathname === dashboardLinkMatch && pathname.startsWith('/d/')) {
-        // dashboard match
-        // TODO refactor routes such that we don't need this custom logic
-        if (isBetterMatch(link, currentBestMatch)) {
-          currentBestMatch = link;
-        }
-      }
-    }
-    if (link.children) {
-      currentBestMatch = getActiveItem(link.children, pathname, currentBestMatch);
-    }
-    if (stripQueryParams(currentBestMatch?.url) === pathname) {
-      return currentBestMatch;
-    }
-  }
-  return currentBestMatch;
-};
-
-export function getEditionAndUpdateLinks(): NavModelItem[] {
-  const { buildInfo, licenseInfo } = config;
-  const stateInfo = licenseInfo.stateInfo ? ` (${licenseInfo.stateInfo})` : '';
-  const links: NavModelItem[] = [];
-
-  links.push({
-    target: '_blank',
-    id: 'version',
-    text: `${buildInfo.edition}${stateInfo}`,
-    url: licenseInfo.licenseUrl,
-    icon: 'external-link-alt',
-  });
-
-  if (buildInfo.hasUpdate) {
-    links.push({
-      target: '_blank',
-      id: 'updateVersion',
-      text: `New version available!`,
-      icon: 'download-alt',
-      url: 'https://grafana.com/grafana/download?utm_source=grafana_footer',
-    });
-  }
-
-  return links;
-}
diff --git a/public/app/core/components/AppChrome/DockedMegaMenu/FeatureHighlight.tsx b/public/app/core/components/AppChrome/MegaMenu/FeatureHighlight.tsx
similarity index 100%
rename from public/app/core/components/AppChrome/DockedMegaMenu/FeatureHighlight.tsx
rename to public/app/core/components/AppChrome/MegaMenu/FeatureHighlight.tsx
diff --git a/public/app/core/components/AppChrome/MegaMenu/MegaMenu.test.tsx b/public/app/core/components/AppChrome/MegaMenu/MegaMenu.test.tsx
index 9c56cdd3eeef5..43f9bc20180b0 100644
--- a/public/app/core/components/AppChrome/MegaMenu/MegaMenu.test.tsx
+++ b/public/app/core/components/AppChrome/MegaMenu/MegaMenu.test.tsx
@@ -1,4 +1,5 @@
 import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { Router } from 'react-router-dom';
 import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
@@ -18,7 +19,12 @@ const setup = () => {
       id: 'section',
       url: 'section',
       children: [
-        { text: 'Child1', id: 'child1', url: 'section/child1' },
+        {
+          text: 'Child1',
+          id: 'child1',
+          url: 'section/child1',
+          children: [{ text: 'Grandchild1', id: 'grandchild1', url: 'section/child1/grandchild1' }],
+        },
         { text: 'Child2', id: 'child2', url: 'section/child2' },
       ],
     },
@@ -30,7 +36,7 @@ const setup = () => {
   ];
 
   const grafanaContext = getGrafanaContextMock();
-  grafanaContext.chrome.setMegaMenu('open');
+  grafanaContext.chrome.setMegaMenuOpen(true);
 
   return render(
     <TestProvider storeState={{ navBarTree }} grafanaContext={grafanaContext}>
@@ -42,6 +48,9 @@ const setup = () => {
 };
 
 describe('MegaMenu', () => {
+  afterEach(() => {
+    window.localStorage.clear();
+  });
   it('should render component', async () => {
     setup();
 
@@ -49,6 +58,22 @@ describe('MegaMenu', () => {
     expect(await screen.findByRole('link', { name: 'Section name' })).toBeInTheDocument();
   });
 
+  it('should render children', async () => {
+    setup();
+    await userEvent.click(await screen.findByRole('button', { name: 'Expand section Section name' }));
+    expect(await screen.findByRole('link', { name: 'Child1' })).toBeInTheDocument();
+    expect(await screen.findByRole('link', { name: 'Child2' })).toBeInTheDocument();
+  });
+
+  it('should render grandchildren', async () => {
+    setup();
+    await userEvent.click(await screen.findByRole('button', { name: 'Expand section Section name' }));
+    expect(await screen.findByRole('link', { name: 'Child1' })).toBeInTheDocument();
+    await userEvent.click(await screen.findByRole('button', { name: 'Expand section Child1' }));
+    expect(await screen.findByRole('link', { name: 'Grandchild1' })).toBeInTheDocument();
+    expect(await screen.findByRole('link', { name: 'Child2' })).toBeInTheDocument();
+  });
+
   it('should filter out profile', async () => {
     setup();
 
diff --git a/public/app/core/components/AppChrome/MegaMenu/MegaMenu.tsx b/public/app/core/components/AppChrome/MegaMenu/MegaMenu.tsx
index 72b90257473f0..4f55f8409904d 100644
--- a/public/app/core/components/AppChrome/MegaMenu/MegaMenu.tsx
+++ b/public/app/core/components/AppChrome/MegaMenu/MegaMenu.tsx
@@ -1,50 +1,132 @@
 import { css } from '@emotion/css';
-import { cloneDeep } from 'lodash';
-import React from 'react';
+import { DOMAttributes } from '@react-types/shared';
+import React, { forwardRef } from 'react';
 import { useLocation } from 'react-router-dom';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { useTheme2 } from '@grafana/ui';
+import { selectors } from '@grafana/e2e-selectors';
+import { CustomScrollbar, Icon, IconButton, useStyles2, Stack } from '@grafana/ui';
+import { useGrafana } from 'app/core/context/GrafanaContext';
+import { t } from 'app/core/internationalization';
 import { useSelector } from 'app/types';
 
-import { NavBarMenu } from './NavBarMenu';
+import { MegaMenuItem } from './MegaMenuItem';
 import { enrichWithInteractionTracking, getActiveItem } from './utils';
 
-export interface Props {
+export const MENU_WIDTH = '300px';
+
+export interface Props extends DOMAttributes {
   onClose: () => void;
-  searchBarHidden?: boolean;
 }
 
-export const MegaMenu = React.memo<Props>(({ onClose, searchBarHidden }) => {
-  const navBarTree = useSelector((state) => state.navBarTree);
-  const theme = useTheme2();
-  const styles = getStyles(theme);
-  const location = useLocation();
+export const MegaMenu = React.memo(
+  forwardRef<HTMLDivElement, Props>(({ onClose, ...restProps }, ref) => {
+    const navTree = useSelector((state) => state.navBarTree);
+    const styles = useStyles2(getStyles);
+    const location = useLocation();
+    const { chrome } = useGrafana();
+    const state = chrome.useState();
 
-  const navTree = cloneDeep(navBarTree);
+    // Remove profile + help from tree
+    const navItems = navTree
+      .filter((item) => item.id !== 'profile' && item.id !== 'help')
+      .map((item) => enrichWithInteractionTracking(item, state.megaMenuDocked));
 
-  // Remove profile + help from tree
-  const navItems = navTree
-    .filter((item) => item.id !== 'profile' && item.id !== 'help')
-    .map((item) => enrichWithInteractionTracking(item, true));
+    const activeItem = getActiveItem(navItems, location.pathname);
 
-  const activeItem = getActiveItem(navItems, location.pathname);
+    const handleDockedMenu = () => {
+      chrome.setMegaMenuDocked(!state.megaMenuDocked);
+      if (state.megaMenuDocked) {
+        chrome.setMegaMenuOpen(false);
+      }
 
-  return (
-    <div className={styles.menuWrapper}>
-      <NavBarMenu activeItem={activeItem} navItems={navItems} onClose={onClose} searchBarHidden={searchBarHidden} />
-    </div>
-  );
-});
+      // refocus on undock/menu open button when changing state
+      setTimeout(() => {
+        document.getElementById(state.megaMenuDocked ? 'mega-menu-toggle' : 'dock-menu-button')?.focus();
+      });
+    };
+
+    return (
+      <div data-testid={selectors.components.NavMenu.Menu} ref={ref} {...restProps}>
+        <div className={styles.mobileHeader}>
+          <Icon name="bars" size="xl" />
+          <IconButton
+            tooltip={t('navigation.megamenu.close', 'Close menu')}
+            name="times"
+            onClick={onClose}
+            size="xl"
+            variant="secondary"
+          />
+        </div>
+        <nav className={styles.content}>
+          <CustomScrollbar showScrollIndicators hideHorizontalTrack>
+            <ul className={styles.itemList} aria-label={t('navigation.megamenu.list-label', 'Navigation')}>
+              {navItems.map((link, index) => (
+                <Stack key={link.text} direction={index === 0 ? 'row-reverse' : 'row'} alignItems="center">
+                  {index === 0 && (
+                    <IconButton
+                      id="dock-menu-button"
+                      className={styles.dockMenuButton}
+                      tooltip={
+                        state.megaMenuDocked
+                          ? t('navigation.megamenu.undock', 'Undock menu')
+                          : t('navigation.megamenu.dock', 'Dock menu')
+                      }
+                      name="web-section-alt"
+                      onClick={handleDockedMenu}
+                      variant="secondary"
+                    />
+                  )}
+                  <MegaMenuItem
+                    link={link}
+                    onClick={state.megaMenuDocked ? undefined : onClose}
+                    activeItem={activeItem}
+                  />
+                </Stack>
+              ))}
+            </ul>
+          </CustomScrollbar>
+        </nav>
+      </div>
+    );
+  })
+);
 
 MegaMenu.displayName = 'MegaMenu';
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  menuWrapper: css({
-    position: 'fixed',
-    display: 'grid',
-    gridAutoFlow: 'column',
+  content: css({
+    display: 'flex',
+    flexDirection: 'column',
     height: '100%',
-    zIndex: theme.zIndex.sidemenu,
+    minHeight: 0,
+    position: 'relative',
+  }),
+  mobileHeader: css({
+    display: 'flex',
+    justifyContent: 'space-between',
+    padding: theme.spacing(1, 1, 1, 2),
+    borderBottom: `1px solid ${theme.colors.border.weak}`,
+
+    [theme.breakpoints.up('md')]: {
+      display: 'none',
+    },
+  }),
+  itemList: css({
+    boxSizing: 'border-box',
+    display: 'flex',
+    flexDirection: 'column',
+    listStyleType: 'none',
+    padding: theme.spacing(1, 1, 2, 1),
+    [theme.breakpoints.up('md')]: {
+      width: MENU_WIDTH,
+    },
+  }),
+  dockMenuButton: css({
+    display: 'none',
+
+    [theme.breakpoints.up('xl')]: {
+      display: 'inline-flex',
+    },
   }),
 });
diff --git a/public/app/core/components/AppChrome/DockedMegaMenu/MegaMenuItem.tsx b/public/app/core/components/AppChrome/MegaMenu/MegaMenuItem.tsx
similarity index 88%
rename from public/app/core/components/AppChrome/DockedMegaMenu/MegaMenuItem.tsx
rename to public/app/core/components/AppChrome/MegaMenu/MegaMenuItem.tsx
index 11fbe24bbc734..528c0c9a04f88 100644
--- a/public/app/core/components/AppChrome/DockedMegaMenu/MegaMenuItem.tsx
+++ b/public/app/core/components/AppChrome/MegaMenu/MegaMenuItem.tsx
@@ -1,9 +1,11 @@
 import { css, cx } from '@emotion/css';
 import React, { useEffect, useRef } from 'react';
+import { useLocation } from 'react-router-dom';
 import { useLocalStorage } from 'react-use';
 
 import { GrafanaTheme2, NavModelItem, toIconName } from '@grafana/data';
 import { useStyles2, Text, IconButton, Icon } from '@grafana/ui';
+import { useGrafana } from 'app/core/context/GrafanaContext';
 
 import { Indent } from '../../Indent/Indent';
 
@@ -21,6 +23,10 @@ interface Props {
 const MAX_DEPTH = 2;
 
 export function MegaMenuItem({ link, activeItem, level = 0, onClick }: Props) {
+  const { chrome } = useGrafana();
+  const state = chrome.useState();
+  const menuIsDocked = state.megaMenuDocked;
+  const location = useLocation();
   const FeatureHighlightWrapper = link.highlightText ? FeatureHighlight : React.Fragment;
   const hasActiveChild = hasChildMatch(link, activeItem);
   const isActive = link === activeItem || (level === MAX_DEPTH && hasActiveChild);
@@ -38,7 +44,7 @@ export function MegaMenuItem({ link, activeItem, level = 0, onClick }: Props) {
     if (hasActiveChild) {
       setSectionExpanded(true);
     }
-  }, [hasActiveChild, setSectionExpanded]);
+  }, [hasActiveChild, location, menuIsDocked, setSectionExpanded]);
 
   // scroll active element into center if it's offscreen
   useEffect(() => {
@@ -57,7 +63,7 @@ export function MegaMenuItem({ link, activeItem, level = 0, onClick }: Props) {
     <li ref={item} className={styles.listItem}>
       <div
         className={cx(styles.menuItem, {
-          [styles.hasIcon]: Boolean(level === 0 && link.icon),
+          [styles.menuItemWithIcon]: Boolean(level === 0 && link.icon),
         })}
       >
         {level !== 0 && <Indent level={level === MAX_DEPTH ? level - 1 : level} spacing={3} />}
@@ -87,6 +93,7 @@ export function MegaMenuItem({ link, activeItem, level = 0, onClick }: Props) {
             <div
               className={cx(styles.labelWrapper, {
                 [styles.hasActiveChild]: hasActiveChild,
+                [styles.labelWrapperWithIcon]: Boolean(level === 0 && link.icon),
               })}
             >
               {level === 0 && link.icon && (
@@ -114,7 +121,9 @@ export function MegaMenuItem({ link, activeItem, level = 0, onClick }: Props) {
                 />
               ))
           ) : (
-            <div className={styles.emptyMessage}>{link.emptyMessage}</div>
+            <div className={styles.emptyMessage} aria-live="polite">
+              {link.emptyMessage}
+            </div>
           )}
         </ul>
       )}
@@ -135,9 +144,12 @@ const getStyles = (theme: GrafanaTheme2) => ({
     alignItems: 'center',
     gap: theme.spacing(1),
     height: theme.spacing(4),
-    paddingLeft: theme.spacing(1),
+    paddingLeft: theme.spacing(0.5),
     position: 'relative',
   }),
+  menuItemWithIcon: css({
+    paddingLeft: theme.spacing(0),
+  }),
   collapseButtonWrapper: css({
     display: 'flex',
     justifyContent: 'center',
@@ -172,9 +184,10 @@ const getStyles = (theme: GrafanaTheme2) => ({
     alignItems: 'center',
     gap: theme.spacing(2),
     minWidth: 0,
+    paddingLeft: theme.spacing(1),
   }),
-  hasIcon: css({
-    paddingLeft: theme.spacing(0),
+  labelWrapperWithIcon: css({
+    paddingLeft: theme.spacing(0.5),
   }),
   hasActiveChild: css({
     color: theme.colors.text.primary,
diff --git a/public/app/core/components/AppChrome/DockedMegaMenu/MegaMenuItemText.tsx b/public/app/core/components/AppChrome/MegaMenu/MegaMenuItemText.tsx
similarity index 98%
rename from public/app/core/components/AppChrome/DockedMegaMenu/MegaMenuItemText.tsx
rename to public/app/core/components/AppChrome/MegaMenu/MegaMenuItemText.tsx
index 910a571e2afb8..6510fda9a2799 100644
--- a/public/app/core/components/AppChrome/DockedMegaMenu/MegaMenuItemText.tsx
+++ b/public/app/core/components/AppChrome/MegaMenu/MegaMenuItemText.tsx
@@ -88,7 +88,6 @@ const getStyles = (theme: GrafanaTheme2, isActive: Props['isActive']) => ({
     display: 'flex',
     gap: '0.5rem',
     height: '100%',
-    paddingLeft: theme.spacing(1),
     width: '100%',
   }),
 });
diff --git a/public/app/core/components/AppChrome/MegaMenu/NavBarItemIcon.tsx b/public/app/core/components/AppChrome/MegaMenu/NavBarItemIcon.tsx
deleted file mode 100644
index b259eb97660b1..0000000000000
--- a/public/app/core/components/AppChrome/MegaMenu/NavBarItemIcon.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import { css, cx } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2, NavModelItem } from '@grafana/data';
-import { Icon, toIconName, useTheme2 } from '@grafana/ui';
-
-import { Branding } from '../../Branding/Branding';
-
-interface NavBarItemIconProps {
-  link: NavModelItem;
-}
-
-export function NavBarItemIcon({ link }: NavBarItemIconProps) {
-  const theme = useTheme2();
-  const styles = getStyles(theme);
-
-  if (link.icon === 'grafana') {
-    return <Branding.MenuLogo className={styles.img} />;
-  } else if (link.icon) {
-    const iconName = toIconName(link.icon);
-    return <Icon name={iconName ?? 'link'} size="xl" />;
-  } else {
-    // consumer of NavBarItemIcon gives enclosing element an appropriate label
-    return <img className={cx(styles.img, link.roundIcon && styles.round)} src={link.img} alt="" />;
-  }
-}
-
-function getStyles(theme: GrafanaTheme2) {
-  return {
-    img: css({
-      height: theme.spacing(3),
-      width: theme.spacing(3),
-    }),
-    round: css({
-      borderRadius: theme.shape.radius.circle,
-    }),
-  };
-}
diff --git a/public/app/core/components/AppChrome/MegaMenu/NavBarMenu.tsx b/public/app/core/components/AppChrome/MegaMenu/NavBarMenu.tsx
deleted file mode 100644
index 6cdb9d308b355..0000000000000
--- a/public/app/core/components/AppChrome/MegaMenu/NavBarMenu.tsx
+++ /dev/null
@@ -1,231 +0,0 @@
-import { css } from '@emotion/css';
-import { useDialog } from '@react-aria/dialog';
-import { FocusScope } from '@react-aria/focus';
-import { OverlayContainer, useOverlay } from '@react-aria/overlays';
-import React, { useEffect, useRef, useState } from 'react';
-import CSSTransition from 'react-transition-group/CSSTransition';
-
-import { GrafanaTheme2, NavModelItem } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
-import { CustomScrollbar, Icon, IconButton, useTheme2 } from '@grafana/ui';
-import { useGrafana } from 'app/core/context/GrafanaContext';
-
-import { TOP_BAR_LEVEL_HEIGHT } from '../types';
-
-import { NavBarMenuItemWrapper } from './NavBarMenuItemWrapper';
-
-const MENU_WIDTH = '350px';
-
-export interface Props {
-  activeItem?: NavModelItem;
-  navItems: NavModelItem[];
-  searchBarHidden?: boolean;
-  onClose: () => void;
-}
-
-export function NavBarMenu({ activeItem, navItems, searchBarHidden, onClose }: Props) {
-  const theme = useTheme2();
-  const styles = getStyles(theme, searchBarHidden);
-  const animationSpeed = theme.transitions.duration.shortest;
-  const animStyles = getAnimStyles(theme, animationSpeed);
-  const { chrome } = useGrafana();
-  const state = chrome.useState();
-  const ref = useRef(null);
-  const backdropRef = useRef(null);
-  const { dialogProps } = useDialog({}, ref);
-  const [isOpen, setIsOpen] = useState(false);
-
-  const onMenuClose = () => setIsOpen(false);
-
-  const { overlayProps, underlayProps } = useOverlay(
-    {
-      isDismissable: true,
-      isOpen: true,
-      onClose: onMenuClose,
-    },
-    ref
-  );
-
-  useEffect(() => {
-    if (state.megaMenu === 'open') {
-      setIsOpen(true);
-    }
-  }, [state.megaMenu]);
-
-  return (
-    <OverlayContainer>
-      <CSSTransition
-        nodeRef={ref}
-        in={isOpen}
-        unmountOnExit={true}
-        classNames={animStyles.overlay}
-        timeout={{ enter: animationSpeed, exit: 0 }}
-        onExited={onClose}
-      >
-        <FocusScope contain autoFocus>
-          <div
-            data-testid={selectors.components.NavMenu.Menu}
-            ref={ref}
-            {...overlayProps}
-            {...dialogProps}
-            className={styles.container}
-          >
-            <div className={styles.mobileHeader}>
-              <Icon name="bars" size="xl" />
-              <IconButton
-                aria-label="Close navigation menu"
-                tooltip="Close menu"
-                name="times"
-                onClick={onMenuClose}
-                size="xl"
-                variant="secondary"
-              />
-            </div>
-            <nav className={styles.content}>
-              <CustomScrollbar showScrollIndicators hideHorizontalTrack>
-                <ul className={styles.itemList}>
-                  {navItems.map((link) => (
-                    <NavBarMenuItemWrapper link={link} onClose={onMenuClose} activeItem={activeItem} key={link.text} />
-                  ))}
-                </ul>
-              </CustomScrollbar>
-            </nav>
-          </div>
-        </FocusScope>
-      </CSSTransition>
-      <CSSTransition
-        nodeRef={backdropRef}
-        in={isOpen}
-        unmountOnExit={true}
-        classNames={animStyles.backdrop}
-        timeout={{ enter: animationSpeed, exit: 0 }}
-      >
-        <div ref={backdropRef} className={styles.backdrop} {...underlayProps} />
-      </CSSTransition>
-    </OverlayContainer>
-  );
-}
-
-NavBarMenu.displayName = 'NavBarMenu';
-
-const getStyles = (theme: GrafanaTheme2, searchBarHidden?: boolean) => {
-  const topPosition = (searchBarHidden ? TOP_BAR_LEVEL_HEIGHT : TOP_BAR_LEVEL_HEIGHT * 2) + 1;
-
-  return {
-    backdrop: css({
-      backdropFilter: 'blur(1px)',
-      backgroundColor: theme.components.overlay.background,
-      bottom: 0,
-      left: 0,
-      position: 'fixed',
-      right: 0,
-      top: searchBarHidden ? 0 : TOP_BAR_LEVEL_HEIGHT,
-      zIndex: theme.zIndex.modalBackdrop,
-
-      [theme.breakpoints.up('md')]: {
-        top: topPosition,
-      },
-    }),
-    container: css({
-      display: 'flex',
-      bottom: 0,
-      flexDirection: 'column',
-      left: 0,
-      marginRight: theme.spacing(1.5),
-      right: 0,
-      // Needs to below navbar should we change the navbarFixed? add add a new level?
-      zIndex: theme.zIndex.modal,
-      position: 'fixed',
-      top: searchBarHidden ? 0 : TOP_BAR_LEVEL_HEIGHT,
-      backgroundColor: theme.colors.background.primary,
-      boxSizing: 'content-box',
-      flex: '1 1 0',
-
-      [theme.breakpoints.up('md')]: {
-        borderRight: `1px solid ${theme.colors.border.weak}`,
-        right: 'unset',
-        top: topPosition,
-      },
-    }),
-    content: css({
-      display: 'flex',
-      flexDirection: 'column',
-      flexGrow: 1,
-      minHeight: 0,
-    }),
-    mobileHeader: css({
-      display: 'flex',
-      justifyContent: 'space-between',
-      padding: theme.spacing(1, 1, 1, 2),
-      borderBottom: `1px solid ${theme.colors.border.weak}`,
-
-      [theme.breakpoints.up('md')]: {
-        display: 'none',
-      },
-    }),
-    itemList: css({
-      display: 'grid',
-      gridAutoRows: `minmax(${theme.spacing(6)}, auto)`,
-      gridTemplateColumns: `minmax(${MENU_WIDTH}, auto)`,
-      minWidth: MENU_WIDTH,
-    }),
-  };
-};
-
-const getAnimStyles = (theme: GrafanaTheme2, animationDuration: number) => {
-  const commonTransition = {
-    transitionDuration: `${animationDuration}ms`,
-    transitionTimingFunction: theme.transitions.easing.easeInOut,
-    [theme.breakpoints.down('md')]: {
-      overflow: 'hidden',
-    },
-  };
-
-  const overlayTransition = {
-    ...commonTransition,
-    transitionProperty: 'box-shadow, width',
-    // this is needed to prevent a horizontal scrollbar during the animation on firefox
-    '.scrollbar-view': {
-      overflow: 'hidden !important',
-    },
-  };
-
-  const backdropTransition = {
-    ...commonTransition,
-    transitionProperty: 'opacity',
-  };
-
-  const overlayOpen = {
-    width: '100%',
-    [theme.breakpoints.up('md')]: {
-      boxShadow: theme.shadows.z3,
-      width: MENU_WIDTH,
-    },
-  };
-
-  const overlayClosed = {
-    boxShadow: 'none',
-    width: 0,
-  };
-
-  const backdropOpen = {
-    opacity: 1,
-  };
-
-  const backdropClosed = {
-    opacity: 0,
-  };
-
-  return {
-    backdrop: {
-      enter: css(backdropClosed),
-      enterActive: css(backdropTransition, backdropOpen),
-      enterDone: css(backdropOpen),
-    },
-    overlay: {
-      enter: css(overlayClosed),
-      enterActive: css(overlayTransition, overlayOpen),
-      enterDone: css(overlayOpen),
-    },
-  };
-};
diff --git a/public/app/core/components/AppChrome/MegaMenu/NavBarMenuItem.tsx b/public/app/core/components/AppChrome/MegaMenu/NavBarMenuItem.tsx
deleted file mode 100644
index 4829d36701a6b..0000000000000
--- a/public/app/core/components/AppChrome/MegaMenu/NavBarMenuItem.tsx
+++ /dev/null
@@ -1,139 +0,0 @@
-import { css, cx } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
-import { Icon, IconName, Link, useTheme2 } from '@grafana/ui';
-
-export interface Props {
-  children: React.ReactNode;
-  icon?: IconName;
-  isActive?: boolean;
-  isChild?: boolean;
-  onClick?: () => void;
-  target?: HTMLAnchorElement['target'];
-  url?: string;
-}
-
-export function NavBarMenuItem({ children, icon, isActive, isChild, onClick, target, url }: Props) {
-  const theme = useTheme2();
-  const styles = getStyles(theme, isActive, isChild);
-
-  const linkContent = (
-    <div className={styles.linkContent}>
-      {icon && <Icon data-testid="dropdown-child-icon" name={icon} />}
-
-      <div className={styles.linkText}>{children}</div>
-
-      {target === '_blank' && (
-        <Icon data-testid="external-link-icon" name="external-link-alt" className={styles.externalLinkIcon} />
-      )}
-    </div>
-  );
-
-  let element = (
-    <button
-      data-testid={selectors.components.NavMenu.item}
-      className={cx(styles.button, styles.element)}
-      onClick={onClick}
-    >
-      {linkContent}
-    </button>
-  );
-
-  if (url) {
-    element =
-      !target && url.startsWith('/') ? (
-        <Link
-          data-testid={selectors.components.NavMenu.item}
-          className={styles.element}
-          href={url}
-          target={target}
-          onClick={onClick}
-        >
-          {linkContent}
-        </Link>
-      ) : (
-        <a
-          data-testid={selectors.components.NavMenu.item}
-          href={url}
-          target={target}
-          className={styles.element}
-          onClick={onClick}
-        >
-          {linkContent}
-        </a>
-      );
-  }
-
-  return <li className={styles.listItem}>{element}</li>;
-}
-
-NavBarMenuItem.displayName = 'NavBarMenuItem';
-
-const getStyles = (theme: GrafanaTheme2, isActive: Props['isActive'], isChild: Props['isActive']) => ({
-  button: css({
-    backgroundColor: 'unset',
-    borderStyle: 'unset',
-  }),
-  linkContent: css({
-    alignItems: 'center',
-    display: 'flex',
-    gap: '0.5rem',
-    height: '100%',
-    width: '100%',
-  }),
-  linkText: css({
-    textOverflow: 'ellipsis',
-    overflow: 'hidden',
-    whiteSpace: 'nowrap',
-  }),
-  externalLinkIcon: css({
-    color: theme.colors.text.secondary,
-  }),
-  element: css({
-    alignItems: 'center',
-    boxSizing: 'border-box',
-    position: 'relative',
-    color: isActive ? theme.colors.text.primary : theme.colors.text.secondary,
-    padding: theme.spacing(1, 1, 1, isChild ? 5 : 0),
-    ...(isChild && {
-      borderRadius: theme.shape.radius.default,
-    }),
-    width: '100%',
-    '&:hover, &:focus-visible': {
-      ...(isChild && {
-        background: theme.colors.emphasize(theme.colors.background.primary, 0.03),
-      }),
-      textDecoration: 'underline',
-      color: theme.colors.text.primary,
-    },
-    '&:focus-visible': {
-      boxShadow: 'none',
-      outline: `2px solid ${theme.colors.primary.main}`,
-      outlineOffset: '-2px',
-      transition: 'none',
-    },
-    '&::before': {
-      display: isActive ? 'block' : 'none',
-      content: '" "',
-      height: theme.spacing(3),
-      position: 'absolute',
-      left: theme.spacing(1),
-      top: '50%',
-      transform: 'translateY(-50%)',
-      width: theme.spacing(0.5),
-      borderRadius: theme.shape.radius.default,
-      backgroundImage: theme.colors.gradients.brandVertical,
-    },
-  }),
-  listItem: css({
-    boxSizing: 'border-box',
-    position: 'relative',
-    display: 'flex',
-    width: '100%',
-    ...(isChild && {
-      padding: theme.spacing(0, 2),
-    }),
-  }),
-});
diff --git a/public/app/core/components/AppChrome/MegaMenu/NavBarMenuItemWrapper.tsx b/public/app/core/components/AppChrome/MegaMenu/NavBarMenuItemWrapper.tsx
deleted file mode 100644
index d64073c6f6c4d..0000000000000
--- a/public/app/core/components/AppChrome/MegaMenu/NavBarMenuItemWrapper.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import { css } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2, NavModelItem } from '@grafana/data';
-import { useStyles2 } from '@grafana/ui';
-
-import { NavBarMenuItem } from './NavBarMenuItem';
-import { NavBarMenuSection } from './NavBarMenuSection';
-import { isMatchOrChildMatch } from './utils';
-
-export function NavBarMenuItemWrapper({
-  link,
-  activeItem,
-  onClose,
-}: {
-  link: NavModelItem;
-  activeItem?: NavModelItem;
-  onClose: () => void;
-}) {
-  const styles = useStyles2(getStyles);
-
-  if (link.emptyMessage && !linkHasChildren(link)) {
-    return (
-      <NavBarMenuSection onClose={onClose} link={link} activeItem={activeItem}>
-        <ul className={styles.children}>
-          <div className={styles.emptyMessage}>{link.emptyMessage}</div>
-        </ul>
-      </NavBarMenuSection>
-    );
-  }
-
-  return (
-    <NavBarMenuSection onClose={onClose} link={link} activeItem={activeItem}>
-      {linkHasChildren(link) && (
-        <ul className={styles.children}>
-          {link.children.map((childLink) => {
-            return (
-              !childLink.isCreateAction && (
-                <NavBarMenuItem
-                  key={`${link.text}-${childLink.text}`}
-                  isActive={isMatchOrChildMatch(childLink, activeItem)}
-                  isChild
-                  onClick={() => {
-                    childLink.onClick?.();
-                    onClose();
-                  }}
-                  target={childLink.target}
-                  url={childLink.url}
-                >
-                  {childLink.text}
-                </NavBarMenuItem>
-              )
-            );
-          })}
-        </ul>
-      )}
-    </NavBarMenuSection>
-  );
-}
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  children: css({
-    display: 'flex',
-    flexDirection: 'column',
-  }),
-  flex: css({
-    display: 'flex',
-  }),
-  itemWithoutMenu: css({
-    position: 'relative',
-    placeItems: 'inherit',
-    justifyContent: 'start',
-    display: 'flex',
-    flexGrow: 1,
-    alignItems: 'center',
-  }),
-  fullWidth: css({
-    height: '100%',
-    width: '100%',
-  }),
-  iconContainer: css({
-    display: 'flex',
-    placeContent: 'center',
-  }),
-  itemWithoutMenuContent: css({
-    display: 'grid',
-    gridAutoFlow: 'column',
-    gridTemplateColumns: `${theme.spacing(7)} auto`,
-    alignItems: 'center',
-    height: '100%',
-  }),
-  linkText: css({
-    fontSize: theme.typography.pxToRem(14),
-    justifySelf: 'start',
-  }),
-  emptyMessage: css({
-    color: theme.colors.text.secondary,
-    fontStyle: 'italic',
-    padding: theme.spacing(1, 1.5, 1, 7),
-  }),
-});
-
-function linkHasChildren(link: NavModelItem): link is NavModelItem & { children: NavModelItem[] } {
-  return Boolean(link.children && link.children.length > 0);
-}
diff --git a/public/app/core/components/AppChrome/MegaMenu/NavBarMenuSection.tsx b/public/app/core/components/AppChrome/MegaMenu/NavBarMenuSection.tsx
deleted file mode 100644
index 978181f6b0809..0000000000000
--- a/public/app/core/components/AppChrome/MegaMenu/NavBarMenuSection.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-import { css, cx } from '@emotion/css';
-import React from 'react';
-import { useLocalStorage } from 'react-use';
-
-import { GrafanaTheme2, NavModelItem } from '@grafana/data';
-import { Button, Icon, useStyles2 } from '@grafana/ui';
-
-import { NavBarItemIcon } from './NavBarItemIcon';
-import { NavBarMenuItem } from './NavBarMenuItem';
-import { NavFeatureHighlight } from './NavFeatureHighlight';
-import { hasChildMatch } from './utils';
-
-export function NavBarMenuSection({
-  link,
-  activeItem,
-  children,
-  className,
-  onClose,
-}: {
-  link: NavModelItem;
-  activeItem?: NavModelItem;
-  children: React.ReactNode;
-  className?: string;
-  onClose?: () => void;
-}) {
-  const styles = useStyles2(getStyles);
-  const FeatureHighlightWrapper = link.highlightText ? NavFeatureHighlight : React.Fragment;
-  const isActive = link === activeItem;
-  const hasActiveChild = hasChildMatch(link, activeItem);
-  const [sectionExpanded, setSectionExpanded] =
-    useLocalStorage(`grafana.navigation.expanded[${link.text}]`, false) ?? Boolean(hasActiveChild);
-
-  return (
-    <>
-      <div className={cx(styles.collapsibleSectionWrapper, className)}>
-        <NavBarMenuItem
-          isActive={link === activeItem}
-          onClick={() => {
-            link.onClick?.();
-            onClose?.();
-          }}
-          target={link.target}
-          url={link.url}
-        >
-          <div
-            className={cx(styles.labelWrapper, {
-              [styles.isActive]: isActive,
-              [styles.hasActiveChild]: hasActiveChild,
-            })}
-          >
-            <FeatureHighlightWrapper>
-              <NavBarItemIcon link={link} />
-            </FeatureHighlightWrapper>
-            {link.text}
-          </div>
-        </NavBarMenuItem>
-        {children && (
-          <Button
-            aria-label={`${sectionExpanded ? 'Collapse' : 'Expand'} section ${link.text}`}
-            variant="secondary"
-            fill="text"
-            className={styles.collapseButton}
-            onClick={() => setSectionExpanded(!sectionExpanded)}
-          >
-            <Icon name={sectionExpanded ? 'angle-up' : 'angle-down'} size="xl" />
-          </Button>
-        )}
-      </div>
-      {sectionExpanded && children}
-    </>
-  );
-}
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  collapsibleSectionWrapper: css({
-    alignItems: 'center',
-    display: 'flex',
-  }),
-  collapseButton: css({
-    color: theme.colors.text.disabled,
-    padding: theme.spacing(0, 0.5),
-    marginRight: theme.spacing(1),
-  }),
-  collapseWrapperActive: css({
-    backgroundColor: theme.colors.action.disabledBackground,
-  }),
-  collapseContent: css({
-    padding: 0,
-  }),
-  labelWrapper: css({
-    display: 'grid',
-    fontSize: theme.typography.pxToRem(14),
-    gridAutoFlow: 'column',
-    gridTemplateColumns: `${theme.spacing(7)} auto`,
-    placeItems: 'center',
-    fontWeight: theme.typography.fontWeightMedium,
-  }),
-  isActive: css({
-    color: theme.colors.text.primary,
-
-    '&::before': {
-      display: 'block',
-      content: '" "',
-      height: theme.spacing(3),
-      position: 'absolute',
-      left: theme.spacing(1),
-      top: '50%',
-      transform: 'translateY(-50%)',
-      width: theme.spacing(0.5),
-      borderRadius: theme.shape.radius.default,
-      backgroundImage: theme.colors.gradients.brandVertical,
-    },
-  }),
-  hasActiveChild: css({
-    color: theme.colors.text.primary,
-  }),
-});
diff --git a/public/app/core/components/AppChrome/MegaMenu/NavFeatureHighlight.tsx b/public/app/core/components/AppChrome/MegaMenu/NavFeatureHighlight.tsx
deleted file mode 100644
index 9992d9fe2c8a5..0000000000000
--- a/public/app/core/components/AppChrome/MegaMenu/NavFeatureHighlight.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { css } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { useStyles2 } from '@grafana/ui';
-
-export interface Props {
-  children: JSX.Element;
-}
-
-export const NavFeatureHighlight = ({ children }: Props): JSX.Element => {
-  const styles = useStyles2(getStyles);
-  return (
-    <div>
-      {children}
-      <span className={styles.highlight} />
-    </div>
-  );
-};
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    highlight: css`
-      background-color: ${theme.colors.success.main};
-      border-radius: ${theme.shape.radius.circle};
-      width: 6px;
-      height: 6px;
-      display: inline-block;
-      position: absolute;
-      top: 50%;
-      transform: translateY(-50%);
-    `,
-  };
-};
diff --git a/public/app/core/components/AppChrome/MegaMenu/utils.ts b/public/app/core/components/AppChrome/MegaMenu/utils.ts
index 2f180c5e674d7..9486c3ee5cecb 100644
--- a/public/app/core/components/AppChrome/MegaMenu/utils.ts
+++ b/public/app/core/components/AppChrome/MegaMenu/utils.ts
@@ -29,19 +29,21 @@ export const enrichHelpItem = (helpItem: NavModelItem) => {
   return helpItem;
 };
 
-export const enrichWithInteractionTracking = (item: NavModelItem, expandedState: boolean) => {
-  const onClick = item.onClick;
-  item.onClick = () => {
+export const enrichWithInteractionTracking = (item: NavModelItem, megaMenuDockedState: boolean) => {
+  // creating a new object here to not mutate the original item object
+  const newItem = { ...item };
+  const onClick = newItem.onClick;
+  newItem.onClick = () => {
     reportInteraction('grafana_navigation_item_clicked', {
-      path: item.url ?? item.id,
-      state: expandedState ? 'expanded' : 'collapsed',
+      path: newItem.url ?? newItem.id,
+      menuIsDocked: megaMenuDockedState,
     });
     onClick?.();
   };
-  if (item.children) {
-    item.children = item.children.map((item) => enrichWithInteractionTracking(item, expandedState));
+  if (newItem.children) {
+    newItem.children = newItem.children.map((item) => enrichWithInteractionTracking(item, megaMenuDockedState));
   }
-  return item;
+  return newItem;
 };
 
 export const isMatchOrChildMatch = (itemToCheck: NavModelItem, searchItem?: NavModelItem) => {
diff --git a/public/app/core/components/AppChrome/NavToolbar/NavToolbar.tsx b/public/app/core/components/AppChrome/NavToolbar/NavToolbar.tsx
index ec8738a9af48f..4d74ae0e759ff 100644
--- a/public/app/core/components/AppChrome/NavToolbar/NavToolbar.tsx
+++ b/public/app/core/components/AppChrome/NavToolbar/NavToolbar.tsx
@@ -4,9 +4,13 @@ import React from 'react';
 import { GrafanaTheme2, NavModelItem } from '@grafana/data';
 import { Components } from '@grafana/e2e-selectors';
 import { Icon, IconButton, ToolbarButton, useStyles2 } from '@grafana/ui';
+import { useGrafana } from 'app/core/context/GrafanaContext';
+// Psiphon change - import contextSrv needed for permissions information
+import { contextSrv } from 'app/core/core';
 import { t } from 'app/core/internationalization';
 import { HOME_NAV_ID } from 'app/core/reducers/navModel';
-import { useSelector } from 'app/types';
+// Psiphon change - import AccessControlAction needed for permissions information
+import { AccessControlAction, useSelector } from 'app/types';
 
 import { Breadcrumbs } from '../../Breadcrumbs/Breadcrumbs';
 import { buildBreadcrumbs } from '../../Breadcrumbs/utils';
@@ -35,26 +39,38 @@ export function NavToolbar({
   onToggleSearchBar,
   onToggleKioskMode,
 }: Props) {
+  const { chrome } = useGrafana();
+  const state = chrome.useState();
   const homeNav = useSelector((state) => state.navIndex)[HOME_NAV_ID];
   const styles = useStyles2(getStyles);
   const breadcrumbs = buildBreadcrumbs(sectionNav, pageNav, homeNav);
+  // Psiphon change - check if user can create Dashboards. If yes, the user is an Admin or
+  // Editor. Menu toggle button should only be available to Admin or Editor users.
+  const hasMenu = contextSrv.hasPermission(AccessControlAction.DashboardsCreate);
 
+  // Psiphon change - add a check to see if the user is admin or editor to show the menu
   return (
     <div data-testid={Components.NavToolbar.container} className={styles.pageToolbar}>
-      <div className={styles.menuButton}>
-        <IconButton
-          id={TOGGLE_BUTTON_ID}
-          name="bars"
-          tooltip={t('navigation.toolbar.toggle-menu', 'Toggle menu')}
-          tooltipPlacement="bottom"
-          size="xl"
-          onClick={onToggleMegaMenu}
-        />
-      </div>
+      {hasMenu && (
+        <div className={styles.menuButton}>
+          <IconButton
+            id={TOGGLE_BUTTON_ID}
+            name="bars"
+            tooltip={
+              state.megaMenuOpen
+                ? t('navigation.toolbar.close-menu', 'Close menu')
+                : t('navigation.toolbar.open-menu', 'Open menu')
+            }
+            tooltipPlacement="bottom"
+            size="xl"
+            onClick={onToggleMegaMenu}
+            data-testid={Components.NavBar.Toggle.button}
+          />
+        </div>
+      )}
       <Breadcrumbs breadcrumbs={breadcrumbs} className={styles.breadcrumbsWrapper} />
       <div className={styles.actions}>
         {actions}
-        {actions && <NavToolbarSeparator />}
         {searchBarHidden && (
           <ToolbarButton
             onClick={onToggleKioskMode}
@@ -63,6 +79,7 @@ export function NavToolbar({
             icon="monitor"
           />
         )}
+        {actions && <NavToolbarSeparator />}
         <ToolbarButton
           onClick={onToggleSearchBar}
           narrow
@@ -89,6 +106,7 @@ const getStyles = (theme: GrafanaTheme2) => {
       display: 'flex',
       padding: theme.spacing(0, 1, 0, 2),
       alignItems: 'center',
+      borderBottom: `1px solid ${theme.colors.border.weak}`,
     }),
     menuButton: css({
       display: 'flex',
@@ -103,7 +121,7 @@ const getStyles = (theme: GrafanaTheme2) => {
       justifyContent: 'flex-end',
       paddingLeft: theme.spacing(1),
       flexGrow: 1,
-      gap: theme.spacing(0.5),
+      gap: theme.spacing(1),
       minWidth: 0,
 
       '.body-drawer-open &': {
diff --git a/public/app/core/components/AppChrome/News/NewsContainer.tsx b/public/app/core/components/AppChrome/News/NewsContainer.tsx
index 2c0815b6b4f1e..ff0934277694a 100644
--- a/public/app/core/components/AppChrome/News/NewsContainer.tsx
+++ b/public/app/core/components/AppChrome/News/NewsContainer.tsx
@@ -4,7 +4,7 @@ import { useToggle } from 'react-use';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { Button, Drawer, ToolbarButton, useStyles2, Text } from '@grafana/ui';
+import { IconButton, Drawer, ToolbarButton, useStyles2, Text } from '@grafana/ui';
 import { t } from 'app/core/internationalization';
 import { DEFAULT_FEED_URL } from 'app/plugins/panel/news/constants';
 
@@ -36,12 +36,12 @@ export function NewsContainer({ className }: NewsContainerProps) {
                 <img src="public/img/grot-news.svg" alt="Grot reading news" />
               </a>
               <div className={styles.actions}>
-                <Button
-                  icon="times"
+                <IconButton
+                  name="times"
                   variant="secondary"
-                  fill="text"
                   onClick={onToggleShowNewsDrawer}
-                  aria-label={selectors.components.Drawer.General.close}
+                  data-testid={selectors.components.Drawer.General.close}
+                  tooltip={t(`news.drawer.close`, 'Close Drawer')}
                 />
               </div>
             </div>
diff --git a/public/app/core/components/AppChrome/News/NewsWrapper.tsx b/public/app/core/components/AppChrome/News/NewsWrapper.tsx
index 022a18e4f1c6b..f7a36884c8eb2 100644
--- a/public/app/core/components/AppChrome/News/NewsWrapper.tsx
+++ b/public/app/core/components/AppChrome/News/NewsWrapper.tsx
@@ -3,7 +3,7 @@ import React, { useEffect } from 'react';
 import { useMeasure } from 'react-use';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { LoadingPlaceholder, useStyles2 } from '@grafana/ui';
+import { useStyles2 } from '@grafana/ui';
 import { News } from 'app/plugins/panel/news/component/News';
 import { useNewsFeed } from 'app/plugins/panel/news/useNewsFeed';
 
@@ -19,25 +19,28 @@ export function NewsWrapper({ feedUrl }: NewsWrapperProps) {
     getNews();
   }, [getNews]);
 
-  if (state.loading || state.error) {
-    return (
-      <div className={styles.innerWrapper}>
-        {state.loading && <LoadingPlaceholder text="Loading..." />}
-        {state.error && state.error.message}
-      </div>
-    );
-  }
-
-  if (!state.value) {
-    return null;
+  if (state.error) {
+    return <div className={styles.innerWrapper}>{state.error && state.error.message}</div>;
   }
 
   return (
     <div ref={widthRef}>
-      {widthMeasure.width > 0 &&
-        state.value.map((_, index) => (
-          <News key={index} index={index} showImage width={widthMeasure.width} data={state.value} />
-        ))}
+      {state.loading ? (
+        <>
+          <News.Skeleton showImage width={widthMeasure.width} />
+          <News.Skeleton showImage width={widthMeasure.width} />
+          <News.Skeleton showImage width={widthMeasure.width} />
+          <News.Skeleton showImage width={widthMeasure.width} />
+          <News.Skeleton showImage width={widthMeasure.width} />
+        </>
+      ) : (
+        <>
+          {widthMeasure.width > 0 &&
+            state.value?.map((_, index) => (
+              <News key={index} index={index} showImage width={widthMeasure.width} data={state.value} />
+            ))}
+        </>
+      )}
       <div className={styles.grot}>
         <a href="https://grafana.com/blog/" target="_blank" rel="noreferrer" title="Go to Grafana labs blog">
           <img src="public/img/grot-news.svg" alt="Grot reading news" />
diff --git a/public/app/core/components/AppChrome/OrganizationSwitcher/OrganizationSwitcher.test.tsx b/public/app/core/components/AppChrome/OrganizationSwitcher/OrganizationSwitcher.test.tsx
index 60a9e08d54524..74b3af5569846 100644
--- a/public/app/core/components/AppChrome/OrganizationSwitcher/OrganizationSwitcher.test.tsx
+++ b/public/app/core/components/AppChrome/OrganizationSwitcher/OrganizationSwitcher.test.tsx
@@ -97,7 +97,7 @@ describe('OrganisationSwitcher', () => {
       },
     });
 
-    expect(screen.getByRole('button', { name: /change organization/i })).toBeInTheDocument();
+    expect(screen.getByTestId('data-testid Value picker button Change organization')).toBeInTheDocument();
   });
 
   it('should not render and not try to get user organizations if not signed in', () => {
diff --git a/public/app/core/components/AppChrome/ReturnToPrevious/DismissableButton.tsx b/public/app/core/components/AppChrome/ReturnToPrevious/DismissableButton.tsx
new file mode 100644
index 0000000000000..a9fe92cdb249a
--- /dev/null
+++ b/public/app/core/components/AppChrome/ReturnToPrevious/DismissableButton.tsx
@@ -0,0 +1,61 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { Button, ButtonGroup, useStyles2 } from '@grafana/ui';
+import { t } from 'app/core/internationalization';
+
+export interface DismissableButtonProps {
+  label: string;
+  onClick: () => void;
+  onDismiss: () => void;
+}
+
+export const DismissableButton = ({ label, onClick, onDismiss }: DismissableButtonProps) => {
+  const styles = useStyles2(getStyles);
+
+  return (
+    <ButtonGroup className={styles.buttonGroup}>
+      <Button
+        icon="angle-left"
+        size="sm"
+        variant="primary"
+        fill="outline"
+        onClick={onClick}
+        title={label}
+        className={styles.mainDismissableButton}
+        data-testid={selectors.components.ReturnToPrevious.backButton}
+      >
+        {label}
+      </Button>
+      <Button
+        icon="times"
+        aria-label={t('return-to-previous.dismissable-button', 'Close')}
+        variant="primary"
+        fill="outline"
+        size="sm"
+        onClick={onDismiss}
+        data-testid={selectors.components.ReturnToPrevious.dismissButton}
+      />
+    </ButtonGroup>
+  );
+};
+const getStyles = (theme: GrafanaTheme2) => ({
+  mainDismissableButton: css({
+    width: '100%',
+    ['> span']: {
+      overflow: 'hidden',
+      textOverflow: 'ellipsis',
+      whiteSpace: 'nowrap',
+      maxWidth: '270px',
+      display: 'inline-block',
+    },
+  }),
+  buttonGroup: css({
+    width: 'fit-content',
+    backgroundColor: theme.colors.background.secondary,
+  }),
+});
+
+DismissableButton.displayName = 'DismissableButton';
diff --git a/public/app/core/components/AppChrome/ReturnToPrevious/ReturnToPrevious.test.tsx b/public/app/core/components/AppChrome/ReturnToPrevious/ReturnToPrevious.test.tsx
new file mode 100644
index 0000000000000..0f9b5d62c9477
--- /dev/null
+++ b/public/app/core/components/AppChrome/ReturnToPrevious/ReturnToPrevious.test.tsx
@@ -0,0 +1,76 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { TestProvider } from 'test/helpers/TestProvider';
+import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
+
+import { config, reportInteraction } from '@grafana/runtime';
+
+import { ReturnToPrevious, ReturnToPreviousProps } from './ReturnToPrevious';
+
+const mockReturnToPreviousProps: ReturnToPreviousProps = {
+  title: 'Dashboards Page',
+  href: '/dashboards',
+};
+const reportInteractionMock = jest.mocked(reportInteraction);
+jest.mock('@grafana/runtime', () => {
+  return {
+    ...jest.requireActual('@grafana/runtime'),
+    reportInteraction: reportInteractionMock,
+  };
+});
+jest.mock('@grafana/runtime', () => {
+  return {
+    ...jest.requireActual('@grafana/runtime'),
+    reportInteraction: jest.fn(),
+  };
+});
+const setup = () => {
+  const grafanaContext = getGrafanaContextMock();
+  grafanaContext.chrome.setReturnToPrevious(mockReturnToPreviousProps);
+  return render(
+    <TestProvider grafanaContext={grafanaContext}>
+      <ReturnToPrevious {...mockReturnToPreviousProps} />
+    </TestProvider>
+  );
+};
+
+describe('ReturnToPrevious', () => {
+  beforeEach(() => {
+    /* We enabled the feature toggle */
+    config.featureToggles.returnToPrevious = true;
+  });
+  afterEach(() => {
+    window.sessionStorage.clear();
+    jest.resetAllMocks();
+    config.featureToggles.returnToPrevious = false;
+  });
+  it('should render component', async () => {
+    setup();
+    expect(await screen.findByTitle('Back to Dashboards Page')).toBeInTheDocument();
+  });
+
+  it('should trigger event once when clicking on the RTP button', async () => {
+    setup();
+    const returnButton = await screen.findByTitle('Back to Dashboards Page');
+    expect(returnButton).toBeInTheDocument();
+    await userEvent.click(returnButton);
+    const mockCalls = reportInteractionMock.mock.calls;
+    /* The report is called 'grafana_return_to_previous_button_dismissed' but the action is 'clicked' */
+    const mockReturn = mockCalls.filter((call) => call[0] === 'grafana_return_to_previous_button_dismissed');
+    expect(mockReturn).toHaveLength(1);
+    expect(mockReturn[0][1]).toEqual({ action: 'clicked', page: '/dashboards' });
+  });
+
+  it('should trigger event once when clicking on the Close button', async () => {
+    setup();
+    const closeBtn = await screen.findByRole('button', { name: 'Close' });
+    expect(closeBtn).toBeInTheDocument();
+    await userEvent.click(closeBtn);
+    const mockCalls = reportInteractionMock.mock.calls;
+    /* The report is called 'grafana_return_to_previous_button_dismissed' but the action is 'dismissed' */
+    const mockDismissed = mockCalls.filter((call) => call[0] === 'grafana_return_to_previous_button_dismissed');
+    expect(mockDismissed).toHaveLength(1);
+    expect(mockDismissed[0][1]).toEqual({ action: 'dismissed', page: '/dashboards' });
+  });
+});
diff --git a/public/app/core/components/AppChrome/ReturnToPrevious/ReturnToPrevious.tsx b/public/app/core/components/AppChrome/ReturnToPrevious/ReturnToPrevious.tsx
new file mode 100644
index 0000000000000..8d9ca18eabc48
--- /dev/null
+++ b/public/app/core/components/AppChrome/ReturnToPrevious/ReturnToPrevious.tsx
@@ -0,0 +1,55 @@
+import { css } from '@emotion/css';
+import React, { useCallback } from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { locationService } from '@grafana/runtime';
+import { useStyles2 } from '@grafana/ui';
+import { useGrafana } from 'app/core/context/GrafanaContext';
+import { t } from 'app/core/internationalization';
+
+import { DismissableButton } from './DismissableButton';
+
+export interface ReturnToPreviousProps {
+  title: string;
+  href: string;
+}
+
+export const ReturnToPrevious = ({ href, title }: ReturnToPreviousProps) => {
+  const styles = useStyles2(getStyles);
+  const { chrome } = useGrafana();
+
+  const handleOnClick = useCallback(() => {
+    locationService.push(href);
+    chrome.clearReturnToPrevious('clicked');
+  }, [href, chrome]);
+
+  const handleOnDismiss = useCallback(() => {
+    chrome.clearReturnToPrevious('dismissed');
+  }, [chrome]);
+
+  return (
+    <div className={styles.returnToPrevious} data-testid={selectors.components.ReturnToPrevious.buttonGroup}>
+      <DismissableButton
+        label={t('return-to-previous.button.label', 'Back to {{title}}', { title })}
+        onClick={handleOnClick}
+        onDismiss={handleOnDismiss}
+      />
+    </div>
+  );
+};
+const getStyles = (theme: GrafanaTheme2) => ({
+  returnToPrevious: css({
+    label: 'return-to-previous',
+    display: 'flex',
+    justifyContent: 'center',
+    left: '50%',
+    transform: 'translateX(-50%)',
+    zIndex: theme.zIndex.tooltip,
+    position: 'fixed',
+    bottom: theme.spacing.x4,
+    boxShadow: theme.shadows.z3,
+  }),
+});
+
+ReturnToPrevious.displayName = 'ReturnToPrevious';
diff --git a/public/app/core/components/AppChrome/SectionNav/SectionNav.tsx b/public/app/core/components/AppChrome/SectionNav/SectionNav.tsx
deleted file mode 100644
index 1b46e1a86c41b..0000000000000
--- a/public/app/core/components/AppChrome/SectionNav/SectionNav.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import { css, cx } from '@emotion/css';
-import React, { useEffect, useState } from 'react';
-import { useLocalStorage } from 'react-use';
-
-import { NavModel, GrafanaTheme2 } from '@grafana/data';
-import { useStyles2, CustomScrollbar, useTheme2 } from '@grafana/ui';
-
-import { SectionNavItem } from './SectionNavItem';
-import { SectionNavToggle } from './SectionNavToggle';
-
-export interface Props {
-  model: NavModel;
-}
-
-export function SectionNav({ model }: Props) {
-  const styles = useStyles2(getStyles);
-  const { isExpanded, onToggleSectionNav } = useSectionNavState();
-
-  if (!Boolean(model.main?.children?.length)) {
-    return null;
-  }
-
-  return (
-    <div className={styles.navContainer}>
-      <nav
-        className={cx(styles.nav, {
-          [styles.navExpanded]: isExpanded,
-        })}
-      >
-        <CustomScrollbar showScrollIndicators>
-          <div className={styles.items} role="tablist">
-            <SectionNavItem item={model.main} isSectionRoot />
-          </div>
-        </CustomScrollbar>
-      </nav>
-      <SectionNavToggle isExpanded={isExpanded} onClick={onToggleSectionNav} />
-    </div>
-  );
-}
-
-function useSectionNavState() {
-  const theme = useTheme2();
-
-  const isSmallScreen = window.matchMedia(`(max-width: ${theme.breakpoints.values.lg}px)`).matches;
-  const [navExpandedPreference, setNavExpandedPreference] = useLocalStorage<boolean>(
-    'grafana.sectionNav.expanded',
-    !isSmallScreen
-  );
-  const [isExpanded, setIsExpanded] = useState(!isSmallScreen && navExpandedPreference);
-
-  useEffect(() => {
-    const mediaQuery = window.matchMedia(`(max-width: ${theme.breakpoints.values.lg}px)`);
-    const onMediaQueryChange = (e: MediaQueryListEvent) => setIsExpanded(e.matches ? false : navExpandedPreference);
-    mediaQuery.addEventListener('change', onMediaQueryChange);
-    return () => mediaQuery.removeEventListener('change', onMediaQueryChange);
-  }, [navExpandedPreference, theme.breakpoints.values.lg]);
-
-  const onToggleSectionNav = () => {
-    setNavExpandedPreference(!isExpanded);
-    setIsExpanded(!isExpanded);
-  };
-
-  return { isExpanded, onToggleSectionNav };
-}
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    navContainer: css({
-      display: 'flex',
-      flexDirection: 'column',
-      position: 'relative',
-
-      [theme.breakpoints.up('md')]: {
-        flexDirection: 'row',
-      },
-    }),
-    nav: css({
-      display: 'flex',
-      flexDirection: 'column',
-      background: theme.colors.background.canvas,
-      flexShrink: 0,
-      transition: theme.transitions.create(['width', 'max-height']),
-      maxHeight: 0,
-      visibility: 'hidden',
-      [theme.breakpoints.up('md')]: {
-        width: 0,
-        maxHeight: 'unset',
-      },
-    }),
-    navExpanded: css({
-      maxHeight: '50vh',
-      visibility: 'visible',
-      [theme.breakpoints.up('md')]: {
-        width: '250px',
-        maxHeight: 'unset',
-      },
-    }),
-    items: css({
-      display: 'flex',
-      flexDirection: 'column',
-      padding: theme.spacing(2, 1, 2, 2),
-      minWidth: '250px',
-
-      [theme.breakpoints.up('md')]: {
-        padding: theme.spacing(4.5, 1, 2, 2),
-      },
-    }),
-  };
-};
diff --git a/public/app/core/components/AppChrome/SectionNav/SectionNavItem.test.tsx b/public/app/core/components/AppChrome/SectionNav/SectionNavItem.test.tsx
deleted file mode 100644
index 90d92e7546217..0000000000000
--- a/public/app/core/components/AppChrome/SectionNav/SectionNavItem.test.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import React from 'react';
-
-import { NavModelItem } from '@grafana/data';
-
-import { SectionNavItem } from './SectionNavItem';
-
-describe('SectionNavItem', () => {
-  it('should only show the img for a section root if both img and icon are present', () => {
-    const item: NavModelItem = {
-      text: 'Test',
-      icon: 'k6',
-      img: 'img',
-      children: [
-        {
-          text: 'Child',
-        },
-      ],
-    };
-
-    render(<SectionNavItem item={item} isSectionRoot />);
-    expect(screen.getByTestId('section-image')).toBeInTheDocument();
-    expect(screen.queryByTestId('section-icon')).not.toBeInTheDocument();
-  });
-});
diff --git a/public/app/core/components/AppChrome/SectionNav/SectionNavItem.tsx b/public/app/core/components/AppChrome/SectionNav/SectionNavItem.tsx
deleted file mode 100644
index b21f8976aa985..0000000000000
--- a/public/app/core/components/AppChrome/SectionNav/SectionNavItem.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-import { css, cx } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2, NavModelItem } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
-import { reportInteraction } from '@grafana/runtime';
-import { useStyles2, Icon } from '@grafana/ui';
-
-import { getActiveItem, hasChildMatch } from '../MegaMenu/utils';
-
-export interface Props {
-  item: NavModelItem;
-  isSectionRoot?: boolean;
-  level?: number;
-}
-
-// max level depth to render
-const MAX_DEPTH = 2;
-
-export function SectionNavItem({ item, isSectionRoot = false, level = 0 }: Props) {
-  const styles = useStyles2(getStyles);
-
-  const children = item.children?.filter((x) => !x.hideFromTabs);
-  const activeItem = item.children && getActiveItem(item.children, location.pathname);
-
-  // If first root child is a section skip the bottom margin (as sections have top margin already)
-  const noRootMargin = isSectionRoot && Boolean(item.children![0].children?.length);
-
-  const linkClass = cx({
-    [styles.link]: true,
-    [styles.activeStyle]: item.active || (level === MAX_DEPTH && hasChildMatch(item, activeItem)),
-    [styles.isSection]: level < MAX_DEPTH && (Boolean(children?.length) || item.isSection),
-    [styles.isSectionRoot]: isSectionRoot,
-    [styles.noRootMargin]: noRootMargin,
-  });
-
-  let icon: React.ReactNode | null = null;
-
-  if (item.img) {
-    icon = <img data-testid="section-image" className={styles.sectionImg} src={item.img} alt="" />;
-  } else if (item.icon) {
-    icon = <Icon data-testid="section-icon" className={styles.sectionImg} name={item.icon} />;
-  }
-
-  const onItemClicked = () => {
-    reportInteraction('grafana_navigation_item_clicked', {
-      path: item.url ?? item.id,
-      sectionNav: true,
-    });
-  };
-
-  return (
-    <>
-      <a
-        onClick={onItemClicked}
-        href={item.url}
-        className={linkClass}
-        aria-label={selectors.components.Tab.title(item.text)}
-        role="tab"
-        aria-selected={item.active}
-      >
-        {isSectionRoot && icon}
-        {item.text}
-        {item.tabSuffix && <item.tabSuffix className={styles.suffix} />}
-      </a>
-      {level < MAX_DEPTH &&
-        children?.map((child, index) => <SectionNavItem item={child} key={index} level={level + 1} />)}
-    </>
-  );
-}
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    link: css`
-      padding: ${theme.spacing(1, 0, 1, 1.5)};
-      display: flex;
-      align-items: flex-start;
-      border-radius: ${theme.shape.radius.default};
-      gap: ${theme.spacing(1)};
-      height: 100%;
-      position: relative;
-      color: ${theme.colors.text.secondary};
-
-      &:hover,
-      &:focus {
-        text-decoration: underline;
-        z-index: 1;
-      }
-    `,
-    activeStyle: css`
-      label: activeTabStyle;
-      color: ${theme.colors.text.primary};
-      font-weight: ${theme.typography.fontWeightMedium};
-      background: ${theme.colors.emphasize(theme.colors.background.canvas, 0.03)};
-
-      &::before {
-        display: block;
-        content: ' ';
-        position: absolute;
-        left: 0;
-        width: 4px;
-        bottom: 2px;
-        top: 2px;
-        border-radius: ${theme.shape.radius.default};
-        background-image: ${theme.colors.gradients.brandVertical};
-      }
-    `,
-    suffix: css`
-      margin-left: ${theme.spacing(1)};
-    `,
-    sectionImg: css({
-      margin: '6px 0',
-      width: theme.spacing(2),
-    }),
-    isSectionRoot: css({
-      fontSize: theme.typography.h4.fontSize,
-      marginTop: 0,
-      marginBottom: theme.spacing(2),
-      fontWeight: theme.typography.fontWeightMedium,
-    }),
-    isSection: css({
-      color: theme.colors.text.primary,
-      fontSize: theme.typography.h5.fontSize,
-      marginTop: theme.spacing(2),
-      fontWeight: theme.typography.fontWeightMedium,
-    }),
-    noRootMargin: css({
-      marginBottom: 0,
-    }),
-  };
-};
diff --git a/public/app/core/components/AppChrome/SectionNav/SectionNavToggle.tsx b/public/app/core/components/AppChrome/SectionNav/SectionNavToggle.tsx
deleted file mode 100644
index d500d5620fe5f..0000000000000
--- a/public/app/core/components/AppChrome/SectionNav/SectionNavToggle.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import { css } from '@emotion/css';
-import classnames from 'classnames';
-import React from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { Button, useTheme2 } from '@grafana/ui';
-
-export interface Props {
-  isExpanded?: boolean;
-  onClick: () => void;
-}
-
-export const SectionNavToggle = ({ isExpanded, onClick }: Props) => {
-  const theme = useTheme2();
-  const styles = getStyles(theme);
-
-  return (
-    <Button
-      title={'Toggle section navigation'}
-      aria-label={isExpanded ? 'Close section navigation' : 'Open section navigation'}
-      icon="arrow-to-right"
-      className={classnames(styles.icon, {
-        [styles.iconExpanded]: isExpanded,
-      })}
-      variant="secondary"
-      fill="text"
-      size="md"
-      onClick={onClick}
-    />
-  );
-};
-
-SectionNavToggle.displayName = 'SectionNavToggle';
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  icon: css({
-    alignSelf: 'center',
-    margin: theme.spacing(1, 0),
-    transform: 'rotate(90deg)',
-    transition: theme.transitions.create('opacity'),
-    color: theme.colors.text.secondary,
-    zIndex: 1,
-
-    [theme.breakpoints.up('md')]: {
-      alignSelf: 'flex-start',
-      position: 'relative',
-      left: 0,
-      margin: theme.spacing(0, 0, 0, 1),
-      top: theme.spacing(2),
-      transform: 'none',
-    },
-
-    'div:hover > &, &:focus': {
-      opacity: 1,
-    },
-  }),
-  iconExpanded: css({
-    rotate: '180deg',
-
-    [theme.breakpoints.up('md')]: {
-      opacity: 0,
-      margin: 0,
-      position: 'absolute',
-      right: 0,
-      left: 'initial',
-    },
-  }),
-});
diff --git a/public/app/core/components/AppChrome/TopBar/SignInLink.tsx b/public/app/core/components/AppChrome/TopBar/SignInLink.tsx
index 8b7650fd73819..19791612093e1 100644
--- a/public/app/core/components/AppChrome/TopBar/SignInLink.tsx
+++ b/public/app/core/components/AppChrome/TopBar/SignInLink.tsx
@@ -8,7 +8,12 @@ import { useStyles2 } from '@grafana/ui';
 export function SignInLink() {
   const location = useLocation();
   const styles = useStyles2(getStyles);
-  const loginUrl = textUtil.sanitizeUrl(locationUtil.getUrlForPartial(location, { forceLogin: 'true' }));
+  let loginUrl = textUtil.sanitizeUrl(locationUtil.getUrlForPartial(location, { forceLogin: 'true' }));
+
+  // Fix for loginUrl starting with "//" which is a scheme relative URL
+  if (loginUrl.startsWith('//')) {
+    loginUrl = loginUrl.replace(/\/+/g, '/');
+  }
 
   return (
     <a className={styles.link} href={loginUrl} target="_self">
diff --git a/public/app/core/components/AppChrome/TopBar/TopSearchBar.tsx b/public/app/core/components/AppChrome/TopBar/TopSearchBar.tsx
index 727f0cec7efa3..7b4fdfb1d1675 100644
--- a/public/app/core/components/AppChrome/TopBar/TopSearchBar.tsx
+++ b/public/app/core/components/AppChrome/TopBar/TopSearchBar.tsx
@@ -7,7 +7,8 @@ import { GrafanaTheme2, locationUtil, textUtil } from '@grafana/data';
 import { Dropdown, ToolbarButton, useStyles2 } from '@grafana/ui';
 import { config } from 'app/core/config';
 import { contextSrv } from 'app/core/core';
-import { useSelector } from 'app/types';
+// Psiphon change - import AccessControlAction needed for permissions information
+import { AccessControlAction, useSelector } from 'app/types';
 
 import { Branding } from '../../Branding/Branding';
 import { enrichHelpItem } from '../MegaMenu/utils';
@@ -25,6 +26,9 @@ export const TopSearchBar = React.memo(function TopSearchBar() {
   const styles = useStyles2(getStyles);
   const navIndex = useSelector((state) => state.navIndex);
   const location = useLocation();
+  // Psiphon change - check if user can create Dashboards. If yes, the user is an Admin or
+  // Editor. Search bar should only be available to Admin or Editor users.
+  const hasSearch = contextSrv.hasPermission(AccessControlAction.DashboardsCreate);
 
   const helpNode = cloneDeep(navIndex['help']);
   const enrichedHelpNode = helpNode ? enrichHelpItem(helpNode) : undefined;
@@ -35,17 +39,21 @@ export const TopSearchBar = React.memo(function TopSearchBar() {
     homeUrl = textUtil.sanitizeUrl(locationUtil.getUrlForPartial(location, { forceLogin: 'true' }));
   }
 
+  // Psiphon change - apply custom logo sizing class to menu logo
   return (
     <div className={styles.layout}>
       <TopSearchBarSection>
         <a className={styles.logo} href={homeUrl} title="Go to home">
-          <Branding.MenuLogo className={styles.img} />
+          <Branding.MenuLogo className={styles.imgLogo} />
         </a>
         <OrganizationSwitcher />
       </TopSearchBarSection>
 
       <TopSearchBarSection>
-        <TopSearchBarCommandPaletteTrigger />
+        {hasSearch && (
+          // Psiphon change - hide search bar for non admin/editor users
+          <TopSearchBarCommandPaletteTrigger />
+        )}
       </TopSearchBarSection>
 
       <TopSearchBarSection align="right">
@@ -93,6 +101,11 @@ const getStyles = (theme: GrafanaTheme2) => ({
     height: theme.spacing(3),
     width: theme.spacing(3),
   }),
+  // Psiphon change - add logo sizing class to fit aspect ratio of PDE logo
+  imgLogo: css({
+    height: theme.spacing(2),
+    width: theme.spacing(32.27),
+  }),
   logo: css({
     display: 'flex',
   }),
diff --git a/public/app/core/components/AppChrome/TopBar/TopSearchBarCommandPaletteTrigger.tsx b/public/app/core/components/AppChrome/TopBar/TopSearchBarCommandPaletteTrigger.tsx
index 92ffcfc22d973..40d4e61e33da2 100644
--- a/public/app/core/components/AppChrome/TopBar/TopSearchBarCommandPaletteTrigger.tsx
+++ b/public/app/core/components/AppChrome/TopBar/TopSearchBarCommandPaletteTrigger.tsx
@@ -3,7 +3,7 @@ import { useKBar, VisualState } from 'kbar';
 import React, { useMemo, useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { getInputStyles, Icon, ToolbarButton, useStyles2, useTheme2 } from '@grafana/ui';
+import { getInputStyles, Icon, Text, ToolbarButton, useStyles2, useTheme2 } from '@grafana/ui';
 import { focusCss } from '@grafana/ui/src/themes/mixins';
 import { useMediaQueryChange } from 'app/core/hooks/useMediaQueryChange';
 import { t } from 'app/core/internationalization';
@@ -70,7 +70,7 @@ function PretendTextInput({ onClick }: PretendTextInputProps) {
 
         <div className={styles.suffix}>
           <Icon name="keyboard" />
-          <span className={styles.shortcut}>{modKey}+k</span>
+          <Text variant="bodySmall">{modKey}+k</Text>
         </div>
       </div>
     </div>
@@ -91,9 +91,6 @@ const getStyles = (theme: GrafanaTheme2) => {
         gap: theme.spacing(0.5),
       },
     ]),
-    shortcut: css({
-      fontSize: theme.typography.bodySmall.fontSize,
-    }),
     fakeInput: css([
       baseStyles.input,
       {
diff --git a/public/app/core/components/BouncingLoader/BouncingLoader.tsx b/public/app/core/components/BouncingLoader/BouncingLoader.tsx
new file mode 100644
index 0000000000000..21e7601053220
--- /dev/null
+++ b/public/app/core/components/BouncingLoader/BouncingLoader.tsx
@@ -0,0 +1,95 @@
+import { css, keyframes } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { useStyles2 } from '@grafana/ui';
+
+import { t } from '../../internationalization';
+
+export function BouncingLoader() {
+  const styles = useStyles2(getStyles);
+
+  return (
+    <div
+      className={styles.container}
+      aria-live="polite"
+      role="status"
+      aria-label={t('bouncing-loader.label', 'Loading')}
+    >
+      <div className={styles.bounce}>
+        <img alt="" src="public/img/grafana_icon.svg" className={styles.logo} />
+      </div>
+    </div>
+  );
+}
+
+const fadeIn = keyframes({
+  '0%': {
+    opacity: 0,
+    animationTimingFunction: 'cubic-bezier(0, 0, 0.5, 1)',
+  },
+  '100%': {
+    opacity: 1,
+  },
+});
+
+const bounce = keyframes({
+  'from, to': {
+    transform: 'translateY(0px)',
+    animationTimingFunction: 'cubic-bezier(0.3, 0, 0.1, 1)',
+  },
+  '50%': {
+    transform: 'translateY(-50px)',
+    animationTimingFunction: 'cubic-bezier(0.9, 0, 0.7, 1)',
+  },
+});
+
+const squash = keyframes({
+  '0%': {
+    transform: 'scaleX(1.3) scaleY(0.8)',
+    animationTimingFunction: 'cubic-bezier(0.3, 0, 0.1, 1)',
+  },
+  '15%': {
+    transform: 'scaleX(0.75) scaleY(1.25)',
+    animationTimingFunction: 'cubic-bezier(0, 0, 0.7, 0.75)',
+  },
+  '55%': {
+    transform: 'scaleX(1.05) scaleY(0.95)',
+    animationTimingFunction: 'cubic-bezier(0.9, 0, 1, 1)',
+  },
+  '95%': {
+    transform: 'scaleX(0.75) scaleY(1.25)',
+    animationTimingFunction: 'cubic-bezier(0, 0, 0, 1)',
+  },
+  '100%': {
+    transform: 'scaleX(1.3) scaleY(0.8)',
+    animationTimingFunction: 'cubic-bezier(0, 0, 0.7, 1)',
+  },
+});
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  container: css({
+    opacity: 0,
+    animationName: fadeIn,
+    animationIterationCount: 1,
+    animationDuration: '0.9s',
+    animationDelay: '0.5s',
+    animationFillMode: 'forwards',
+  }),
+
+  bounce: css({
+    textAlign: 'center',
+    animationName: bounce,
+    animationDuration: '0.9s',
+    animationIterationCount: 'infinite',
+  }),
+
+  logo: css({
+    display: 'inline-block',
+    animationName: squash,
+    animationDuration: '0.9s',
+    animationIterationCount: 'infinite',
+    width: '60px',
+    height: '60px',
+  }),
+});
diff --git a/public/app/core/components/Branding/Branding.tsx b/public/app/core/components/Branding/Branding.tsx
index 0082d219c0f80..768c93f246761 100644
--- a/public/app/core/components/Branding/Branding.tsx
+++ b/public/app/core/components/Branding/Branding.tsx
@@ -2,65 +2,68 @@ import { css, cx } from '@emotion/css';
 import React, { FC } from 'react';
 
 import { colorManipulator } from '@grafana/data';
-import { useTheme2, styleMixins } from '@grafana/ui';
+import { useTheme2 } from '@grafana/ui';
 
 export interface BrandComponentProps {
   className?: string;
   children?: JSX.Element | JSX.Element[];
 }
 
+// Psiphon change - use Psiphon logo on login page instead of Grafana logo
 export const LoginLogo: FC<BrandComponentProps & { logo?: string }> = ({ className, logo }) => {
-  return <img className={className} src={`${logo ? logo : 'public/img/grafana_icon.svg'}`} alt="Grafana" />;
+  return <img className={className} src="public/img/psiphon-logo-512x512.png" alt="Psiphon logo" />;
 };
 
 const LoginBackground: FC<BrandComponentProps> = ({ className, children }) => {
   const theme = useTheme2();
 
-  const background = css`
-    &:before {
-      content: '';
-      position: fixed;
-      left: 0;
-      right: 0;
-      bottom: 0;
-      top: 0;
-      background: url(public/img/g8_login_${theme.isDark ? 'dark' : 'light'}.svg);
-      background-position: top center;
-      background-size: auto;
-      background-repeat: no-repeat;
+  // Psiphon change - use custom background image on login page
+  const background = css({
+    '&:before': {
+      content: '""',
+      position: 'fixed',
+      left: 0,
+      right: 0,
+      bottom: 0,
+      top: 0,
+      background: `url('public/img/grafana-psiphon-login.png')`,
+      backgroundPosition: 'top center',
+      backgroundSize: 'auto',
+      backgroundRepeat: 'no-repeat',
 
-      opacity: 0;
-      transition: opacity 3s ease-in-out;
+      opacity: 0,
+      transition: 'opacity 3s ease-in-out',
 
-      @media ${styleMixins.mediaUp(theme.v1.breakpoints.md)} {
-        background-position: center;
-        background-size: cover;
-      }
-    }
-  `;
+      [theme.breakpoints.up('md')]: {
+        backgroundPosition: 'center',
+        backgroundSize: 'cover',
+      },
+    },
+  });
 
   return <div className={cx(background, className)}>{children}</div>;
 };
 
+// Psiphon change - use psiphon logo on menu bar instead of Grafana logo
 const MenuLogo: FC<BrandComponentProps> = ({ className }) => {
-  return <img className={className} src="public/img/grafana_icon.svg" alt="Grafana" />;
+  return <img className={className} src="public/img/psiphon_pde_icon.png" alt="Psiphon Data Engine" />;
 };
 
 const LoginBoxBackground = () => {
   const theme = useTheme2();
-  return css`
-    background: ${colorManipulator.alpha(theme.colors.background.primary, 0.7)};
-    background-size: cover;
-  `;
+  return css({
+    background: colorManipulator.alpha(theme.colors.background.primary, 0.7),
+    backgroundSize: 'cover',
+  });
 };
 
+// Psiphon change - remove Grafana welcome message on login page and change app title
 export class Branding {
   static LoginLogo = LoginLogo;
   static LoginBackground = LoginBackground;
   static MenuLogo = MenuLogo;
   static LoginBoxBackground = LoginBoxBackground;
-  static AppTitle = 'Grafana';
-  static LoginTitle = 'Welcome to Grafana';
+  static AppTitle = 'Psiphon Data Engine';
   static HideEdition = false;
   static GetLoginSubTitle = (): null | string => {
     return null;
diff --git a/public/app/core/components/Breadcrumbs/utils.ts b/public/app/core/components/Breadcrumbs/utils.ts
index 4537585ca894e..c7b094e83ec33 100644
--- a/public/app/core/components/Breadcrumbs/utils.ts
+++ b/public/app/core/components/Breadcrumbs/utils.ts
@@ -1,5 +1,4 @@
 import { NavModelItem } from '@grafana/data';
-import { config } from '@grafana/runtime';
 
 import { Breadcrumb } from './types';
 
@@ -8,7 +7,7 @@ export function buildBreadcrumbs(sectionNav: NavModelItem, pageNav?: NavModelIte
   let foundHome = false;
   let lastPath: string | undefined = undefined;
 
-  function addCrumbs(node: NavModelItem) {
+  function addCrumbs(node: NavModelItem, shouldDedupe = false) {
     if (foundHome) {
       return;
     }
@@ -16,12 +15,9 @@ export function buildBreadcrumbs(sectionNav: NavModelItem, pageNav?: NavModelIte
     // construct the URL to match
     const urlParts = node.url?.split('?') ?? ['', ''];
     let urlToMatch = urlParts[0];
-
-    if (config.featureToggles.dockedMegaMenu) {
-      const urlSearchParams = new URLSearchParams(urlParts[1]);
-      if (urlSearchParams.has('editview')) {
-        urlToMatch += `?editview=${urlSearchParams.get('editview')}`;
-      }
+    const urlSearchParams = new URLSearchParams(urlParts[1]);
+    if (urlSearchParams.has('editview')) {
+      urlToMatch += `?editview=${urlSearchParams.get('editview')}`;
     }
 
     // Check if we found home/root if if so return early
@@ -31,12 +27,14 @@ export function buildBreadcrumbs(sectionNav: NavModelItem, pageNav?: NavModelIte
       return;
     }
 
-    // This enabled app plugins to control breadcrumbs of their root pages
     const isSamePathAsLastBreadcrumb = urlToMatch.length > 0 && lastPath === urlToMatch;
+
     // Remember this path for the next breadcrumb
     lastPath = urlToMatch;
 
-    if (!node.hideFromBreadcrumbs && !isSamePathAsLastBreadcrumb) {
+    const shouldAddCrumb = !node.hideFromBreadcrumbs && !(shouldDedupe && isSamePathAsLastBreadcrumb);
+
+    if (shouldAddCrumb) {
       crumbs.unshift({ text: node.text, href: node.url ?? '' });
     }
 
@@ -49,7 +47,8 @@ export function buildBreadcrumbs(sectionNav: NavModelItem, pageNav?: NavModelIte
     addCrumbs(pageNav);
   }
 
-  addCrumbs(sectionNav);
+  // shouldDedupe = true enables app plugins to control breadcrumbs of their root pages
+  addCrumbs(sectionNav, true);
 
   return crumbs;
 }
diff --git a/public/app/core/components/CardButton.tsx b/public/app/core/components/CardButton.tsx
index eb8c8fbc22237..2ed4eed360db0 100644
--- a/public/app/core/components/CardButton.tsx
+++ b/public/app/core/components/CardButton.tsx
@@ -27,27 +27,26 @@ CardButton.displayName = 'CardButton';
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
-    action: css`
-      display: flex;
-      flex-direction: column;
-      height: 100%;
-
-      justify-self: center;
-      cursor: pointer;
-      background: ${theme.colors.background.secondary};
-      border-radius: ${theme.shape.radius.default};
-      color: ${theme.colors.text.primary};
-      border: unset;
-      width: 100%;
-      display: flex;
-
-      justify-content: center;
-      align-items: center;
-      text-align: center;
-
-      &:hover {
-        background: ${theme.colors.emphasize(theme.colors.background.secondary)};
-      }
-    `,
+    action: css({
+      display: 'flex',
+      flexDirection: 'column',
+      height: '100%',
+
+      justifySelf: 'center',
+      cursor: 'pointer',
+      background: theme.colors.background.secondary,
+      borderRadius: theme.shape.radius.default,
+      color: theme.colors.text.primary,
+      border: 'unset',
+      width: '100%',
+
+      justifyContent: 'center',
+      alignItems: 'center',
+      textAlign: 'center',
+
+      '&:hover': {
+        background: theme.colors.emphasize(theme.colors.background.secondary),
+      },
+    }),
   };
 };
diff --git a/public/app/core/components/CloseButton/CloseButton.tsx b/public/app/core/components/CloseButton/CloseButton.tsx
index 77b406699367c..a80a28f17f20e 100644
--- a/public/app/core/components/CloseButton/CloseButton.tsx
+++ b/public/app/core/components/CloseButton/CloseButton.tsx
@@ -24,8 +24,9 @@ export const CloseButton = ({ onClick, 'aria-label': ariaLabel, style }: Props)
   );
 };
 
-const getStyles = (theme: GrafanaTheme2) => css`
-  position: absolute;
-  right: ${theme.spacing(0.5)};
-  top: ${theme.spacing(1)};
-`;
+const getStyles = (theme: GrafanaTheme2) =>
+  css({
+    position: 'absolute',
+    right: theme.spacing(0.5),
+    top: theme.spacing(1),
+  });
diff --git a/public/app/core/components/ColorScale/ColorScale.tsx b/public/app/core/components/ColorScale/ColorScale.tsx
index 0a689c8addd97..5fd2039e1a8e5 100644
--- a/public/app/core/components/ColorScale/ColorScale.tsx
+++ b/public/app/core/components/ColorScale/ColorScale.tsx
@@ -64,8 +64,8 @@ export const ColorScale = ({ colorPalette, min, max, display, hoverValue, useSto
       {display && (
         <div className={styles.followerContainer}>
           <div className={styles.legendValues}>
-            <span>{display(min)}</span>
-            <span>{display(max)}</span>
+            <span className={styles.disabled}>{display(min)}</span>
+            <span className={styles.disabled}>{display(max)}</span>
           </div>
           {percent != null && (scaleHover.isShown || hoverValue !== undefined) && (
             <span className={styles.hoverValue} style={{ left: `${percent}%` }}>
@@ -128,40 +128,43 @@ function clampPercent100(v: number) {
 }
 
 const getStyles = (theme: GrafanaTheme2, colors: string[]) => ({
-  scaleWrapper: css`
-    width: 100%;
-    font-size: 11px;
-    opacity: 1;
-  `,
-  scaleGradient: css`
-    background: linear-gradient(90deg, ${colors.join()});
-    height: 10px;
-    pointer-events: none;
-  `,
-  legendValues: css`
-    display: flex;
-    justify-content: space-between;
-    pointer-events: none;
-  `,
-  hoverValue: css`
-    position: absolute;
-    margin-top: -14px;
-    padding: 3px 15px;
-    background: ${theme.colors.background.primary};
-    transform: translateX(-50%);
-  `,
-  followerContainer: css`
-    position: relative;
-    pointer-events: none;
-    white-space: nowrap;
-  `,
-  follower: css`
-    position: absolute;
-    height: 14px;
-    width: 14px;
-    border-radius: 50%;
-    transform: translateX(-50%) translateY(-50%);
-    border: 2px solid ${theme.colors.text.primary};
-    margin-top: 5px;
-  `,
+  scaleWrapper: css({
+    width: '100%',
+    fontSize: '11px',
+    opacity: 1,
+  }),
+  scaleGradient: css({
+    background: `linear-gradient(90deg, ${colors.join()})`,
+    height: '9px',
+    pointerEvents: 'none',
+    borderRadius: theme.shape.radius.default,
+  }),
+  legendValues: css({
+    display: 'flex',
+    justifyContent: 'space-between',
+    pointerEvents: 'none',
+  }),
+  hoverValue: css({
+    position: 'absolute',
+    marginTop: '-14px',
+    padding: '3px 15px',
+    transform: 'translateX(-50%)',
+  }),
+  followerContainer: css({
+    position: 'relative',
+    pointerEvents: 'none',
+    whiteSpace: 'nowrap',
+  }),
+  follower: css({
+    position: 'absolute',
+    height: '13px',
+    width: '13px',
+    borderRadius: theme.shape.radius.default,
+    transform: 'translateX(-50%) translateY(-50%)',
+    border: `2px solid ${theme.colors.text.primary}`,
+    top: '5px',
+  }),
+  disabled: css({
+    color: theme.colors.text.disabled,
+  }),
 });
diff --git a/public/app/core/components/ConfigDescriptionLink.tsx b/public/app/core/components/ConfigDescriptionLink.tsx
deleted file mode 100644
index c2cecc84cd912..0000000000000
--- a/public/app/core/components/ConfigDescriptionLink.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import { css } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { useStyles2 } from '@grafana/ui';
-
-type Props = {
-  description: string;
-  suffix: string;
-  feature: string;
-};
-
-export function ConfigDescriptionLink(props: Props) {
-  const { description, suffix, feature } = props;
-  const text = `Learn more about ${feature}`;
-  const styles = useStyles2(getStyles);
-
-  return (
-    <span className={styles.container}>
-      {description}
-      <a
-        aria-label={text}
-        href={`https://grafana.com/docs/grafana/next/datasources/${suffix}`}
-        rel="noreferrer"
-        target="_blank"
-      >
-        {text}
-      </a>
-    </span>
-  );
-}
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    container: css({
-      color: theme.colors.text.secondary,
-      a: css({
-        color: theme.colors.text.link,
-        textDecoration: 'underline',
-        marginLeft: '5px',
-        '&:hover': {
-          textDecoration: 'none',
-        },
-      }),
-    }),
-  };
-};
diff --git a/public/app/core/components/Divider.tsx b/public/app/core/components/Divider.tsx
deleted file mode 100644
index 7e062fd6165ec..0000000000000
--- a/public/app/core/components/Divider.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { css } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { useStyles2 } from '@grafana/ui';
-
-export const Divider = ({ hideLine = false }) => {
-  const styles = useStyles2(getStyles);
-
-  if (hideLine) {
-    return <hr className={styles.dividerHideLine} />;
-  }
-
-  return <hr className={styles.divider} />;
-};
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  divider: css`
-    margin: ${theme.spacing(4, 0)};
-  `,
-  dividerHideLine: css`
-    border: none;
-    margin: ${theme.spacing(3, 0)};
-  `,
-});
diff --git a/public/app/core/components/EmptyListCTA/EmptyListCTA.tsx b/public/app/core/components/EmptyListCTA/EmptyListCTA.tsx
index 18b2f5c39acc4..ee31efcb2f997 100644
--- a/public/app/core/components/EmptyListCTA/EmptyListCTA.tsx
+++ b/public/app/core/components/EmptyListCTA/EmptyListCTA.tsx
@@ -19,14 +19,14 @@ export interface Props {
   infoBoxTitle?: string;
 }
 
-const ctaStyle = css`
-  text-align: center;
-`;
+const ctaStyle = css({
+  textAlign: 'center',
+});
 
-const infoBoxStyles = css`
-  max-width: 700px;
-  margin: 0 auto;
-`;
+const infoBoxStyles = css({
+  maxWidth: '700px',
+  margin: '0 auto',
+});
 
 const EmptyListCTA = ({
   title,
@@ -71,9 +71,9 @@ const EmptyListCTA = ({
   };
 
   const ctaElementClassName = !footer()
-    ? css`
-        margin-bottom: 20px;
-      `
+    ? css({
+        marginBottom: '20px',
+      })
     : '';
 
   const ButtonEl = buttonLink ? LinkButton : Button;
diff --git a/public/app/core/components/FlaggedScroller.tsx b/public/app/core/components/FlaggedScroller.tsx
new file mode 100644
index 0000000000000..f7dbdd85dca2d
--- /dev/null
+++ b/public/app/core/components/FlaggedScroller.tsx
@@ -0,0 +1,54 @@
+import { css, cx } from '@emotion/css';
+import React, { useEffect, useRef } from 'react';
+
+import { config } from '@grafana/runtime';
+import { CustomScrollbar, useStyles2 } from '@grafana/ui';
+
+type FlaggedScrollerProps = Parameters<typeof CustomScrollbar>[0];
+
+export default function FlaggedScrollbar(props: FlaggedScrollerProps) {
+  if (config.featureToggles.betterPageScrolling) {
+    return <NativeScrollbar {...props}>{props.children}</NativeScrollbar>;
+  }
+
+  return <CustomScrollbar {...props} />;
+}
+
+// Shim to provide API-compatibility for Page's scroll-related props
+function NativeScrollbar({ children, scrollRefCallback, scrollTop }: FlaggedScrollerProps) {
+  const styles = useStyles2(getStyles);
+  const ref = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    if (ref.current && scrollRefCallback) {
+      scrollRefCallback(ref.current);
+    }
+  }, [ref, scrollRefCallback]);
+
+  useEffect(() => {
+    if (ref.current && scrollTop != null) {
+      ref.current?.scrollTo(0, scrollTop);
+    }
+  }, [scrollTop]);
+
+  return (
+    // Set the .scrollbar-view class to help e2e tests find this, like in CustomScrollbar
+    <div ref={ref} className={cx(styles.nativeScrollbars, 'scrollbar-view')}>
+      {children}
+    </div>
+  );
+}
+
+function getStyles() {
+  return {
+    nativeScrollbars: css({
+      label: 'native-scroll-container',
+      minHeight: `calc(100% + 0px)`, // I don't know, just copied from custom scrollbars
+      maxHeight: `calc(100% + 0px)`, // I don't know, just copied from custom scrollbars
+      display: 'flex',
+      flexDirection: 'column',
+      flexGrow: 1,
+      overflow: 'auto',
+    }),
+  };
+}
diff --git a/public/app/core/components/FolderFilter/FolderFilter.tsx b/public/app/core/components/FolderFilter/FolderFilter.tsx
index d1fb837e2da1f..b23e6765af2a4 100644
--- a/public/app/core/components/FolderFilter/FolderFilter.tsx
+++ b/public/app/core/components/FolderFilter/FolderFilter.tsx
@@ -85,18 +85,18 @@ async function getFoldersAsOptions(
 
 function getStyles(theme: GrafanaTheme2) {
   return {
-    container: css`
-      label: container;
-      position: relative;
-      min-width: 180px;
-      flex-grow: 1;
-    `,
-    clear: css`
-      label: clear;
-      font-size: ${theme.spacing(1.5)};
-      position: absolute;
-      top: -${theme.spacing(4.5)};
-      right: 0;
-    `,
+    container: css({
+      label: 'container',
+      position: 'relative',
+      minWidth: '180px',
+      flexGrow: 1,
+    }),
+    clear: css({
+      label: 'clear',
+      fontSize: theme.spacing(1.5),
+      position: 'absolute',
+      top: -theme.spacing(4.5),
+      right: 0,
+    }),
   };
 }
diff --git a/public/app/core/components/Footer/Footer.tsx b/public/app/core/components/Footer/Footer.tsx
index 62739518c0ce2..16ffb45dc8437 100644
--- a/public/app/core/components/Footer/Footer.tsx
+++ b/public/app/core/components/Footer/Footer.tsx
@@ -71,7 +71,7 @@ export function getVersionLinks(hideEdition?: boolean): FooterLink[] {
   links.push({
     target: '_blank',
     id: 'version',
-    text: `v${buildInfo.version} (${buildInfo.commit})`,
+    text: buildInfo.versionString,
     url: hasReleaseNotes ? `https://github.com/grafana/grafana/blob/main/CHANGELOG.md` : undefined,
   });
 
@@ -105,8 +105,8 @@ export const Footer = React.memo(({ customLinks, hideEdition }: Props) => {
     <footer className="footer">
       <div className="text-center">
         <ul>
-          {links.map((link) => (
-            <li key={link.text}>
+          {links.map((link, index) => (
+            <li key={index}>
               <FooterItem item={link} />
             </li>
           ))}
diff --git a/public/app/core/components/ForgottenPassword/ChangePassword.tsx b/public/app/core/components/ForgottenPassword/ChangePassword.tsx
index d24442a91e1aa..4f5dbec643d69 100644
--- a/public/app/core/components/ForgottenPassword/ChangePassword.tsx
+++ b/public/app/core/components/ForgottenPassword/ChangePassword.tsx
@@ -1,10 +1,18 @@
-import React, { SyntheticEvent } from 'react';
+import React, { SyntheticEvent, useState } from 'react';
+import { useForm } from 'react-hook-form';
 
 import { selectors } from '@grafana/e2e-selectors';
-import { Tooltip, Form, Field, VerticalGroup, Button, Alert } from '@grafana/ui';
+import { config } from '@grafana/runtime';
+import { Tooltip, Field, VerticalGroup, Button, Alert, useStyles2 } from '@grafana/ui';
 
-import { submitButton } from '../Login/LoginForm';
+import { getStyles } from '../Login/LoginForm';
 import { PasswordField } from '../PasswordField/PasswordField';
+import {
+  ValidationLabels,
+  strongPasswordValidations,
+  strongPasswordValidationRegister,
+} from '../ValidationLabels/ValidationLabels';
+
 interface Props {
   onSubmit: (pw: string) => void;
   onSkip?: (event?: SyntheticEvent) => void;
@@ -17,52 +25,78 @@ interface PasswordDTO {
 }
 
 export const ChangePassword = ({ onSubmit, onSkip, showDefaultPasswordWarning }: Props) => {
+  const styles = useStyles2(getStyles);
+  const [displayValidationLabels, setDisplayValidationLabels] = useState(false);
+  const [pristine, setPristine] = useState(true);
+
+  const {
+    handleSubmit,
+    register,
+    getValues,
+    formState: { errors },
+    watch,
+  } = useForm<PasswordDTO>({
+    defaultValues: {
+      newPassword: '',
+      confirmNew: '',
+    },
+  });
+
+  const newPassword = watch('newPassword');
   const submit = (passwords: PasswordDTO) => {
     onSubmit(passwords.newPassword);
   };
   return (
-    <Form onSubmit={submit}>
-      {({ errors, register, getValues }) => (
-        <>
-          {showDefaultPasswordWarning && (
-            <Alert severity="info" title="Continuing to use the default password exposes you to security risks." />
-          )}
-          <Field label="New password" invalid={!!errors.newPassword} error={errors?.newPassword?.message}>
-            <PasswordField
-              id="new-password"
-              autoFocus
-              autoComplete="new-password"
-              {...register('newPassword', { required: 'New Password is required' })}
-            />
-          </Field>
-          <Field label="Confirm new password" invalid={!!errors.confirmNew} error={errors?.confirmNew?.message}>
-            <PasswordField
-              id="confirm-new-password"
-              autoComplete="new-password"
-              {...register('confirmNew', {
-                required: 'Confirmed Password is required',
-                validate: (v: string) => v === getValues().newPassword || 'Passwords must match!',
-              })}
-            />
-          </Field>
-          <VerticalGroup>
-            <Button type="submit" className={submitButton}>
-              Submit
-            </Button>
-
-            {onSkip && (
-              <Tooltip
-                content="If you skip you will be prompted to change password next time you log in."
-                placement="bottom"
-              >
-                <Button fill="text" onClick={onSkip} type="button" aria-label={selectors.pages.Login.skip}>
-                  Skip
-                </Button>
-              </Tooltip>
-            )}
-          </VerticalGroup>
-        </>
+    <form onSubmit={handleSubmit(submit)}>
+      {showDefaultPasswordWarning && (
+        <Alert severity="info" title="Continuing to use the default password exposes you to security risks." />
+      )}
+      <Field label="New password" invalid={!!errors.newPassword} error={errors?.newPassword?.message}>
+        <PasswordField
+          onFocus={() => setDisplayValidationLabels(true)}
+          {...register('newPassword', {
+            required: 'New Password is required',
+            onBlur: () => setPristine(false),
+            validate: { strongPasswordValidationRegister },
+          })}
+          id="new-password"
+          autoFocus
+          autoComplete="new-password"
+        />
+      </Field>
+      {displayValidationLabels && (
+        <ValidationLabels
+          pristine={pristine}
+          password={newPassword}
+          strongPasswordValidations={strongPasswordValidations}
+        />
       )}
-    </Form>
+      <Field label="Confirm new password" invalid={!!errors.confirmNew} error={errors?.confirmNew?.message}>
+        <PasswordField
+          {...register('confirmNew', {
+            required: 'Confirmed Password is required',
+            validate: (v: string) => v === getValues().newPassword || 'Passwords must match!',
+          })}
+          id="confirm-new-password"
+          autoComplete="new-password"
+        />
+      </Field>
+      <VerticalGroup>
+        <Button type="submit" className={styles.submitButton}>
+          Submit
+        </Button>
+
+        {!config.auth.basicAuthStrongPasswordPolicy && onSkip && (
+          <Tooltip
+            content="If you skip you will be prompted to change password next time you log in."
+            placement="bottom"
+          >
+            <Button fill="text" onClick={onSkip} type="button" data-testid={selectors.pages.Login.skip}>
+              Skip
+            </Button>
+          </Tooltip>
+        )}
+      </VerticalGroup>
+    </form>
   );
 };
diff --git a/public/app/core/components/ForgottenPassword/ChangePasswordPage.test.tsx b/public/app/core/components/ForgottenPassword/ChangePasswordPage.test.tsx
index 6df0b66cefb80..cc2a0cb6d3590 100644
--- a/public/app/core/components/ForgottenPassword/ChangePasswordPage.test.tsx
+++ b/public/app/core/components/ForgottenPassword/ChangePasswordPage.test.tsx
@@ -24,6 +24,9 @@ jest.mock('@grafana/runtime', () => ({
       licenseUrl: '',
     },
     appSubUrl: '',
+    auth: {
+      basicAuthStrongPasswordPolicy: false,
+    },
   },
 }));
 
diff --git a/public/app/core/components/ForgottenPassword/ForgottenPassword.tsx b/public/app/core/components/ForgottenPassword/ForgottenPassword.tsx
index 90e02383fcb0a..c4ab8a1b18378 100644
--- a/public/app/core/components/ForgottenPassword/ForgottenPassword.tsx
+++ b/public/app/core/components/ForgottenPassword/ForgottenPassword.tsx
@@ -1,27 +1,34 @@
 import { css } from '@emotion/css';
 import React, { useState } from 'react';
+import { useForm } from 'react-hook-form';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { getBackendSrv } from '@grafana/runtime';
-import { Form, Field, Input, Button, Legend, Container, useStyles2, HorizontalGroup, LinkButton } from '@grafana/ui';
+import { Field, Input, Button, Legend, Container, useStyles2, HorizontalGroup, LinkButton } from '@grafana/ui';
 import config from 'app/core/config';
 
 interface EmailDTO {
   userOrEmail: string;
 }
 
-const paragraphStyles = (theme: GrafanaTheme2) => css`
-  color: ${theme.colors.text.secondary};
-  font-size: ${theme.typography.bodySmall.fontSize};
-  font-weight: ${theme.typography.fontWeightRegular};
-  margin-top: ${theme.spacing(1)};
-  display: block;
-`;
+const paragraphStyles = (theme: GrafanaTheme2) =>
+  css({
+    color: theme.colors.text.secondary,
+    fontSize: theme.typography.bodySmall.fontSize,
+    fontWeight: theme.typography.fontWeightRegular,
+    marginTop: theme.spacing(1),
+    display: 'block',
+  });
 
 export const ForgottenPassword = () => {
   const [emailSent, setEmailSent] = useState(false);
   const styles = useStyles2(paragraphStyles);
   const loginHref = `${config.appSubUrl}/login`;
+  const {
+    handleSubmit,
+    register,
+    formState: { errors },
+  } = useForm<EmailDTO>();
 
   const sendEmail = async (formModel: EmailDTO) => {
     const res = await getBackendSrv().post('/api/user/password/send-reset-email', formModel);
@@ -42,32 +49,28 @@ export const ForgottenPassword = () => {
     );
   }
   return (
-    <Form onSubmit={sendEmail}>
-      {({ register, errors }) => (
-        <>
-          <Legend>Reset password</Legend>
-          <Field
-            label="User"
-            description="Enter your information to get a reset link sent to you"
-            invalid={!!errors.userOrEmail}
-            error={errors?.userOrEmail?.message}
-          >
-            <Input
-              id="user-input"
-              placeholder="Email or username"
-              {...register('userOrEmail', { required: 'Email or username is required' })}
-            />
-          </Field>
-          <HorizontalGroup>
-            <Button type="submit">Send reset email</Button>
-            <LinkButton fill="text" href={loginHref}>
-              Back to login
-            </LinkButton>
-          </HorizontalGroup>
+    <form onSubmit={handleSubmit(sendEmail)}>
+      <Legend>Reset password</Legend>
+      <Field
+        label="User"
+        description="Enter your information to get a reset link sent to you"
+        invalid={!!errors.userOrEmail}
+        error={errors?.userOrEmail?.message}
+      >
+        <Input
+          id="user-input"
+          placeholder="Email or username"
+          {...register('userOrEmail', { required: 'Email or username is required' })}
+        />
+      </Field>
+      <HorizontalGroup>
+        <Button type="submit">Send reset email</Button>
+        <LinkButton fill="text" href={loginHref}>
+          Back to login
+        </LinkButton>
+      </HorizontalGroup>
 
-          <p className={styles}>Did you forget your username or email? Contact your Grafana administrator.</p>
-        </>
-      )}
-    </Form>
+      <p className={styles}>Did you forget your username or email? Contact your Grafana administrator.</p>
+    </form>
   );
 };
diff --git a/public/app/core/components/Form/Form.tsx b/public/app/core/components/Form/Form.tsx
new file mode 100644
index 0000000000000..91ea061c97500
--- /dev/null
+++ b/public/app/core/components/Form/Form.tsx
@@ -0,0 +1,62 @@
+import { css } from '@emotion/css';
+import React, { HTMLProps, useEffect } from 'react';
+import {
+  useForm,
+  Mode,
+  DefaultValues,
+  SubmitHandler,
+  FieldValues,
+  UseFormReturn,
+  FieldErrors,
+  FieldPath,
+} from 'react-hook-form';
+
+export type FormAPI<T extends FieldValues> = Omit<UseFormReturn<T>, 'handleSubmit'> & {
+  errors: FieldErrors<T>;
+};
+
+interface FormProps<T extends FieldValues> extends Omit<HTMLProps<HTMLFormElement>, 'onSubmit' | 'children'> {
+  validateOn?: Mode;
+  validateOnMount?: boolean;
+  validateFieldsOnMount?: FieldPath<T> | Array<FieldPath<T>>;
+  defaultValues?: DefaultValues<T>;
+  onSubmit: SubmitHandler<T>;
+  children: (api: FormAPI<T>) => React.ReactNode;
+  /** Sets max-width for container. Use it instead of setting individual widths on inputs.*/
+  maxWidth?: number | 'none';
+}
+
+export function Form<T extends FieldValues>({
+  defaultValues,
+  onSubmit,
+  validateOnMount = false,
+  validateFieldsOnMount,
+  children,
+  validateOn = 'onSubmit',
+  maxWidth = 600,
+  ...htmlProps
+}: FormProps<T>) {
+  const { handleSubmit, trigger, formState, ...rest } = useForm<T>({
+    mode: validateOn,
+    defaultValues,
+  });
+
+  useEffect(() => {
+    if (validateOnMount) {
+      trigger(validateFieldsOnMount);
+    }
+  }, [trigger, validateFieldsOnMount, validateOnMount]);
+
+  return (
+    <form
+      className={css({
+        maxWidth: maxWidth !== 'none' ? maxWidth + 'px' : maxWidth,
+        width: '100%',
+      })}
+      onSubmit={handleSubmit(onSubmit)}
+      {...htmlProps}
+    >
+      {children({ errors: formState.errors, formState, trigger, ...rest })}
+    </form>
+  );
+}
diff --git a/public/app/core/components/FormPrompt/FormPrompt.tsx b/public/app/core/components/FormPrompt/FormPrompt.tsx
new file mode 100644
index 0000000000000..4339b7b89b04c
--- /dev/null
+++ b/public/app/core/components/FormPrompt/FormPrompt.tsx
@@ -0,0 +1,115 @@
+import { css } from '@emotion/css';
+import history from 'history';
+import React, { useEffect, useState } from 'react';
+import { Prompt, Redirect } from 'react-router-dom';
+
+import { Button, Modal } from '@grafana/ui';
+
+export interface Props {
+  confirmRedirect?: boolean;
+  onDiscard: () => void;
+  /** Extra check to invoke when location changes.
+   * Could be useful in multistep forms where each step has a separate URL
+   */
+  onLocationChange?: (location: history.Location) => void;
+}
+
+/**
+ * Component handling redirects when a form has unsaved changes.
+ * Page reloads are handled in useEffect via beforeunload event.
+ * URL navigation is handled by react-router's components since it does not trigger beforeunload event.
+ */
+export const FormPrompt = ({ confirmRedirect, onDiscard, onLocationChange }: Props) => {
+  const [modalIsOpen, setModalIsOpen] = useState(false);
+  const [blockedLocation, setBlockedLocation] = useState<history.Location | null>(null);
+  const [changesDiscarded, setChangesDiscarded] = useState(false);
+
+  useEffect(() => {
+    const onBeforeUnload = (e: BeforeUnloadEvent) => {
+      if (confirmRedirect) {
+        e.preventDefault();
+        e.returnValue = '';
+      }
+    };
+    window.addEventListener('beforeunload', onBeforeUnload);
+    return () => {
+      window.removeEventListener('beforeunload', onBeforeUnload);
+    };
+  }, [confirmRedirect]);
+
+  // Returning 'false' from this function will prevent navigation to the next URL
+  const handleRedirect = (location: history.Location) => {
+    // Do not show the unsaved changes modal if only the URL params have changed
+    const currentPath = window.location.pathname;
+    const nextPath = location.pathname;
+    if (currentPath === nextPath) {
+      return true;
+    }
+
+    const locationChangeCheck = onLocationChange?.(location);
+
+    let blockRedirect = confirmRedirect && !changesDiscarded;
+    if (locationChangeCheck !== undefined) {
+      blockRedirect = blockRedirect && locationChangeCheck;
+    }
+
+    if (blockRedirect) {
+      setModalIsOpen(true);
+      setBlockedLocation(location);
+      return false;
+    }
+
+    if (locationChangeCheck) {
+      onDiscard();
+    }
+
+    return true;
+  };
+
+  const onBackToForm = () => {
+    setModalIsOpen(false);
+    setBlockedLocation(null);
+  };
+
+  const onDiscardChanges = () => {
+    setModalIsOpen(false);
+    setChangesDiscarded(true);
+    onDiscard();
+  };
+
+  return (
+    <>
+      <Prompt when={true} message={handleRedirect} />
+      {blockedLocation && changesDiscarded && <Redirect to={blockedLocation} />}
+      <UnsavedChangesModal isOpen={modalIsOpen} onDiscard={onDiscardChanges} onBackToForm={onBackToForm} />
+    </>
+  );
+};
+
+interface UnsavedChangesModalProps {
+  onDiscard: () => void;
+  onBackToForm: () => void;
+  isOpen: boolean;
+}
+
+const UnsavedChangesModal = ({ onDiscard, onBackToForm, isOpen }: UnsavedChangesModalProps) => {
+  return (
+    <Modal
+      isOpen={isOpen}
+      title="Leave page?"
+      onDismiss={onBackToForm}
+      icon="exclamation-triangle"
+      className={css({ width: '500px' })}
+    >
+      <h5>Changes that you made may not be saved.</h5>
+      <Modal.ButtonRow>
+        <Button variant="secondary" onClick={onBackToForm} fill="outline">
+          Continue editing
+        </Button>
+        <Button variant="destructive" onClick={onDiscard}>
+          Discard unsaved changes
+        </Button>
+      </Modal.ButtonRow>
+    </Modal>
+  );
+};
diff --git a/public/app/core/components/GraphNG/GraphNG.tsx b/public/app/core/components/GraphNG/GraphNG.tsx
new file mode 100644
index 0000000000000..fbed8b62cfde3
--- /dev/null
+++ b/public/app/core/components/GraphNG/GraphNG.tsx
@@ -0,0 +1,232 @@
+import React, { Component } from 'react';
+import uPlot, { AlignedData } from 'uplot';
+
+import {
+  DataFrame,
+  DataLinkPostProcessor,
+  Field,
+  FieldMatcherID,
+  fieldMatchers,
+  FieldType,
+  getLinksSupplier,
+  InterpolateFunction,
+  TimeRange,
+  TimeZone,
+} from '@grafana/data';
+import { VizLegendOptions } from '@grafana/schema';
+import { Themeable2, PanelContextRoot, VizLayout } from '@grafana/ui';
+import { UPlotChart } from '@grafana/ui/src/components/uPlot/Plot';
+import { AxisProps } from '@grafana/ui/src/components/uPlot/config/UPlotAxisBuilder';
+import { Renderers, UPlotConfigBuilder } from '@grafana/ui/src/components/uPlot/config/UPlotConfigBuilder';
+import { ScaleProps } from '@grafana/ui/src/components/uPlot/config/UPlotScaleBuilder';
+import { pluginLog } from '@grafana/ui/src/components/uPlot/utils';
+
+import { GraphNGLegendEvent, XYFieldMatchers } from './types';
+import { preparePlotFrame as defaultPreparePlotFrame } from './utils';
+
+/**
+ * @internal -- not a public API
+ */
+export type PropDiffFn<T extends any = any> = (prev: T, next: T) => boolean;
+
+export interface GraphNGProps extends Themeable2 {
+  frames: DataFrame[];
+  structureRev?: number; // a number that will change when the frames[] structure changes
+  width: number;
+  height: number;
+  timeRange: TimeRange;
+  timeZone: TimeZone[] | TimeZone;
+  legend: VizLegendOptions;
+  fields?: XYFieldMatchers; // default will assume timeseries data
+  renderers?: Renderers;
+  tweakScale?: (opts: ScaleProps, forField: Field) => ScaleProps;
+  tweakAxis?: (opts: AxisProps, forField: Field) => AxisProps;
+  onLegendClick?: (event: GraphNGLegendEvent) => void;
+  children?: (builder: UPlotConfigBuilder, alignedFrame: DataFrame) => React.ReactNode;
+  prepConfig: (alignedFrame: DataFrame, allFrames: DataFrame[], getTimeRange: () => TimeRange) => UPlotConfigBuilder;
+  propsToDiff?: Array<string | PropDiffFn>;
+  preparePlotFrame?: (frames: DataFrame[], dimFields: XYFieldMatchers) => DataFrame | null;
+  renderLegend: (config: UPlotConfigBuilder) => React.ReactElement | null;
+  replaceVariables: InterpolateFunction;
+  dataLinkPostProcessor?: DataLinkPostProcessor;
+
+  /**
+   * needed for propsToDiff to re-init the plot & config
+   * this is a generic approach to plot re-init, without having to specify which panel-level options
+   * should cause invalidation. we can drop this in favor of something like panelOptionsRev that gets passed in
+   * similar to structureRev. then we can drop propsToDiff entirely.
+   */
+  options?: Record<string, any>;
+}
+
+function sameProps(prevProps: any, nextProps: any, propsToDiff: Array<string | PropDiffFn> = []) {
+  for (const propName of propsToDiff) {
+    if (typeof propName === 'function') {
+      if (!propName(prevProps, nextProps)) {
+        return false;
+      }
+    } else if (nextProps[propName] !== prevProps[propName]) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+/**
+ * @internal -- not a public API
+ */
+export interface GraphNGState {
+  alignedFrame: DataFrame;
+  alignedData?: AlignedData;
+  config?: UPlotConfigBuilder;
+}
+
+const defaultMatchers = {
+  x: fieldMatchers.get(FieldMatcherID.firstTimeField).get({}),
+  y: fieldMatchers.get(FieldMatcherID.byTypes).get(new Set([FieldType.number, FieldType.enum])),
+};
+
+/**
+ * "Time as X" core component, expects ascending x
+ */
+export class GraphNG extends Component<GraphNGProps, GraphNGState> {
+  static contextType = PanelContextRoot;
+  private plotInstance: React.RefObject<uPlot>;
+
+  constructor(props: GraphNGProps) {
+    super(props);
+    let state = this.prepState(props);
+    state.alignedData = state.config!.prepData!([state.alignedFrame]) as AlignedData;
+    this.state = state;
+    this.plotInstance = React.createRef();
+  }
+
+  getTimeRange = () => this.props.timeRange;
+
+  prepState(props: GraphNGProps, withConfig = true) {
+    let state: GraphNGState = null as any;
+
+    const { frames, fields = defaultMatchers, preparePlotFrame, replaceVariables, dataLinkPostProcessor } = props;
+
+    const preparePlotFrameFn = preparePlotFrame ?? defaultPreparePlotFrame;
+
+    const withLinks = frames.some((frame) => frame.fields.some((field) => (field.config.links?.length ?? 0) > 0));
+
+    const alignedFrame = preparePlotFrameFn(
+      frames,
+      {
+        ...fields,
+        // if there are data links, keep all fields during join so they're index-matched
+        y: withLinks ? () => true : fields.y,
+      },
+      props.timeRange
+    );
+
+    pluginLog('GraphNG', false, 'data aligned', alignedFrame);
+
+    if (alignedFrame) {
+      let alignedFrameFinal = alignedFrame;
+
+      if (withLinks) {
+        const timeZone = Array.isArray(this.props.timeZone) ? this.props.timeZone[0] : this.props.timeZone;
+
+        alignedFrame.fields.forEach((field) => {
+          field.getLinks = getLinksSupplier(
+            alignedFrame,
+            field,
+            {
+              ...field.state?.scopedVars,
+              __dataContext: {
+                value: {
+                  data: [alignedFrame],
+                  field: field,
+                  frame: alignedFrame,
+                  frameIndex: 0,
+                },
+              },
+            },
+            replaceVariables,
+            timeZone,
+            dataLinkPostProcessor
+          );
+        });
+
+        // filter join field and fields.y
+        alignedFrameFinal = {
+          ...alignedFrame,
+          fields: alignedFrame.fields.filter((field, i) => i === 0 || fields.y(field, alignedFrame, [alignedFrame])),
+        };
+      }
+
+      let config = this.state?.config;
+
+      if (withConfig) {
+        config = props.prepConfig(alignedFrameFinal, this.props.frames, this.getTimeRange);
+        pluginLog('GraphNG', false, 'config prepared', config);
+      }
+
+      state = {
+        alignedFrame: alignedFrameFinal,
+        config,
+      };
+
+      pluginLog('GraphNG', false, 'data prepared', state.alignedData);
+    }
+
+    return state;
+  }
+
+  componentDidUpdate(prevProps: GraphNGProps) {
+    const { frames, structureRev, timeZone, propsToDiff } = this.props;
+
+    const propsChanged = !sameProps(prevProps, this.props, propsToDiff);
+
+    if (frames !== prevProps.frames || propsChanged || timeZone !== prevProps.timeZone) {
+      let newState = this.prepState(this.props, false);
+
+      if (newState) {
+        const shouldReconfig =
+          this.state.config === undefined ||
+          timeZone !== prevProps.timeZone ||
+          structureRev !== prevProps.structureRev ||
+          !structureRev ||
+          propsChanged;
+
+        if (shouldReconfig) {
+          newState.config = this.props.prepConfig(newState.alignedFrame, this.props.frames, this.getTimeRange);
+          pluginLog('GraphNG', false, 'config recreated', newState.config);
+        }
+
+        newState.alignedData = newState.config!.prepData!([newState.alignedFrame]) as AlignedData;
+
+        this.setState(newState);
+      }
+    }
+  }
+
+  render() {
+    const { width, height, children, renderLegend } = this.props;
+    const { config, alignedFrame, alignedData } = this.state;
+
+    if (!config) {
+      return null;
+    }
+
+    return (
+      <VizLayout width={width} height={height} legend={renderLegend(config)}>
+        {(vizWidth: number, vizHeight: number) => (
+          <UPlotChart
+            config={config}
+            data={alignedData!}
+            width={vizWidth}
+            height={vizHeight}
+            plotRef={(u) => ((this.plotInstance as React.MutableRefObject<uPlot>).current = u)}
+          >
+            {children ? children(config, alignedFrame) : null}
+          </UPlotChart>
+        )}
+      </VizLayout>
+    );
+  }
+}
diff --git a/public/app/core/components/GraphNG/__snapshots__/utils.test.ts.snap b/public/app/core/components/GraphNG/__snapshots__/utils.test.ts.snap
new file mode 100644
index 0000000000000..8443971551dc5
--- /dev/null
+++ b/public/app/core/components/GraphNG/__snapshots__/utils.test.ts.snap
@@ -0,0 +1,247 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`GraphNG utils preparePlotConfigBuilder 1`] = `
+{
+  "axes": [
+    {
+      "filter": undefined,
+      "font": "12px "Inter", "Helvetica", "Arial", sans-serif",
+      "gap": 5,
+      "grid": {
+        "show": true,
+        "stroke": "rgba(240, 250, 255, 0.09)",
+        "width": 1,
+      },
+      "incrs": undefined,
+      "labelGap": 0,
+      "rotate": undefined,
+      "scale": "x",
+      "show": true,
+      "side": 2,
+      "size": [Function],
+      "space": [Function],
+      "splits": undefined,
+      "stroke": "rgb(204, 204, 220)",
+      "ticks": {
+        "show": true,
+        "size": 4,
+        "stroke": "rgba(240, 250, 255, 0.09)",
+        "width": 1,
+      },
+      "timeZone": "utc",
+      "values": [Function],
+    },
+    {
+      "filter": undefined,
+      "font": "12px "Inter", "Helvetica", "Arial", sans-serif",
+      "gap": 5,
+      "grid": {
+        "show": true,
+        "stroke": "rgba(240, 250, 255, 0.09)",
+        "width": 1,
+      },
+      "incrs": undefined,
+      "labelGap": 0,
+      "rotate": undefined,
+      "scale": "__fixed/na-na/na-na/auto/linear/na/number",
+      "show": true,
+      "side": 3,
+      "size": [Function],
+      "space": [Function],
+      "splits": undefined,
+      "stroke": "rgb(204, 204, 220)",
+      "ticks": {
+        "show": false,
+        "size": 4,
+        "stroke": "rgb(204, 204, 220)",
+        "width": 1,
+      },
+      "timeZone": undefined,
+      "values": [Function],
+    },
+  ],
+  "cursor": {
+    "drag": {
+      "setScale": false,
+    },
+    "focus": {
+      "prox": 30,
+    },
+    "hover": {
+      "prox": [Function],
+      "skip": [
+        null,
+      ],
+    },
+    "points": {
+      "fill": [Function],
+      "size": [Function],
+      "stroke": [Function],
+      "width": [Function],
+    },
+    "sync": {
+      "key": "__global_",
+      "scales": [
+        "x",
+        null,
+      ],
+    },
+  },
+  "focus": {
+    "alpha": 1,
+  },
+  "hooks": {},
+  "legend": {
+    "show": false,
+  },
+  "mode": 1,
+  "ms": 1,
+  "padding": [
+    [Function],
+    [Function],
+    [Function],
+    [Function],
+  ],
+  "scales": {
+    "__fixed/na-na/na-na/auto/linear/na/number": {
+      "asinh": undefined,
+      "auto": true,
+      "dir": 1,
+      "distr": 1,
+      "log": undefined,
+      "ori": 1,
+      "range": [Function],
+      "time": undefined,
+    },
+    "x": {
+      "auto": false,
+      "dir": 1,
+      "ori": 0,
+      "range": [Function],
+      "time": true,
+    },
+  },
+  "select": undefined,
+  "series": [
+    {
+      "value": [Function],
+    },
+    {
+      "dash": [
+        1,
+        2,
+      ],
+      "facets": undefined,
+      "fill": [Function],
+      "paths": [Function],
+      "points": {
+        "fill": "#ff0000",
+        "filter": [Function],
+        "show": true,
+        "size": undefined,
+        "stroke": "#ff0000",
+      },
+      "pxAlign": undefined,
+      "scale": "__fixed/na-na/na-na/auto/linear/na/number",
+      "show": true,
+      "spanGaps": false,
+      "stroke": "#ff0000",
+      "value": [Function],
+      "width": 2,
+    },
+    {
+      "dash": [
+        1,
+        2,
+      ],
+      "facets": undefined,
+      "fill": [Function],
+      "paths": [Function],
+      "points": {
+        "fill": [Function],
+        "filter": [Function],
+        "show": true,
+        "size": undefined,
+        "stroke": [Function],
+      },
+      "pxAlign": undefined,
+      "scale": "__fixed/na-na/na-na/auto/linear/na/number",
+      "show": true,
+      "spanGaps": false,
+      "stroke": [Function],
+      "value": [Function],
+      "width": 2,
+    },
+    {
+      "dash": [
+        1,
+        2,
+      ],
+      "facets": undefined,
+      "fill": [Function],
+      "paths": [Function],
+      "points": {
+        "fill": "#ff0000",
+        "filter": [Function],
+        "show": true,
+        "size": undefined,
+        "stroke": "#ff0000",
+      },
+      "pxAlign": undefined,
+      "scale": "__fixed/na-na/na-na/auto/linear/na/number",
+      "show": true,
+      "spanGaps": false,
+      "stroke": "#ff0000",
+      "value": [Function],
+      "width": 2,
+    },
+    {
+      "dash": [
+        1,
+        2,
+      ],
+      "facets": undefined,
+      "fill": [Function],
+      "paths": [Function],
+      "points": {
+        "fill": [Function],
+        "filter": [Function],
+        "show": true,
+        "size": undefined,
+        "stroke": [Function],
+      },
+      "pxAlign": undefined,
+      "scale": "__fixed/na-na/na-na/auto/linear/na/number",
+      "show": true,
+      "spanGaps": false,
+      "stroke": [Function],
+      "value": [Function],
+      "width": 2,
+    },
+    {
+      "dash": [
+        1,
+        2,
+      ],
+      "facets": undefined,
+      "fill": [Function],
+      "paths": [Function],
+      "points": {
+        "fill": [Function],
+        "filter": [Function],
+        "show": true,
+        "size": undefined,
+        "stroke": [Function],
+      },
+      "pxAlign": undefined,
+      "scale": "__fixed/na-na/na-na/auto/linear/na/number",
+      "show": true,
+      "spanGaps": false,
+      "stroke": [Function],
+      "value": [Function],
+      "width": 2,
+    },
+  ],
+  "tzDate": [Function],
+}
+`;
diff --git a/packages/grafana-ui/src/components/GraphNG/hooks.ts b/public/app/core/components/GraphNG/hooks.ts
similarity index 100%
rename from packages/grafana-ui/src/components/GraphNG/hooks.ts
rename to public/app/core/components/GraphNG/hooks.ts
diff --git a/public/app/core/components/GraphNG/types.ts b/public/app/core/components/GraphNG/types.ts
new file mode 100644
index 0000000000000..e642fbd8aac52
--- /dev/null
+++ b/public/app/core/components/GraphNG/types.ts
@@ -0,0 +1,17 @@
+import { DataFrameFieldIndex, FieldMatcher } from '@grafana/data';
+import { SeriesVisibilityChangeMode } from '@grafana/ui';
+
+/**
+ * Event being triggered when the user interact with the Graph legend.
+ * @alpha
+ */
+export interface GraphNGLegendEvent {
+  fieldIndex: DataFrameFieldIndex;
+  mode: SeriesVisibilityChangeMode;
+}
+
+/** @alpha */
+export interface XYFieldMatchers {
+  x: FieldMatcher; // first match
+  y: FieldMatcher;
+}
diff --git a/public/app/core/components/GraphNG/utils.test.ts b/public/app/core/components/GraphNG/utils.test.ts
new file mode 100644
index 0000000000000..234a587d0e768
--- /dev/null
+++ b/public/app/core/components/GraphNG/utils.test.ts
@@ -0,0 +1,518 @@
+import {
+  createTheme,
+  DashboardCursorSync,
+  DataFrame,
+  DefaultTimeZone,
+  FieldColorModeId,
+  FieldConfig,
+  FieldMatcherID,
+  fieldMatchers,
+  FieldType,
+  getDefaultTimeRange,
+  MutableDataFrame,
+} from '@grafana/data';
+import {
+  BarAlignment,
+  GraphDrawStyle,
+  GraphFieldConfig,
+  GraphGradientMode,
+  LineInterpolation,
+  VisibilityMode,
+  StackingMode,
+} from '@grafana/schema';
+
+import { preparePlotConfigBuilder } from '../TimeSeries/utils';
+
+import { preparePlotFrame } from './utils';
+
+function mockDataFrame() {
+  const df1 = new MutableDataFrame({
+    refId: 'A',
+    fields: [{ name: 'ts', type: FieldType.time, values: [1, 2, 3] }],
+  });
+  const df2 = new MutableDataFrame({
+    refId: 'B',
+    fields: [{ name: 'ts', type: FieldType.time, values: [1, 2, 4] }],
+  });
+
+  const f1Config: FieldConfig<GraphFieldConfig> = {
+    displayName: 'Metric 1',
+    color: {
+      mode: FieldColorModeId.Fixed,
+    },
+    decimals: 2,
+    custom: {
+      drawStyle: GraphDrawStyle.Line,
+      gradientMode: GraphGradientMode.Opacity,
+      lineColor: '#ff0000',
+      lineWidth: 2,
+      lineInterpolation: LineInterpolation.Linear,
+      lineStyle: {
+        fill: 'dash',
+        dash: [1, 2],
+      },
+      spanNulls: false,
+      fillColor: '#ff0000',
+      fillOpacity: 0.1,
+      showPoints: VisibilityMode.Always,
+      stacking: {
+        group: 'A',
+        mode: StackingMode.Normal,
+      },
+    },
+  };
+
+  const f2Config: FieldConfig<GraphFieldConfig> = {
+    displayName: 'Metric 2',
+    color: {
+      mode: FieldColorModeId.Fixed,
+    },
+    decimals: 2,
+    custom: {
+      drawStyle: GraphDrawStyle.Bars,
+      gradientMode: GraphGradientMode.Hue,
+      lineColor: '#ff0000',
+      lineWidth: 2,
+      lineInterpolation: LineInterpolation.Linear,
+      lineStyle: {
+        fill: 'dash',
+        dash: [1, 2],
+      },
+      barAlignment: BarAlignment.Before,
+      fillColor: '#ff0000',
+      fillOpacity: 0.1,
+      showPoints: VisibilityMode.Always,
+      stacking: {
+        group: 'A',
+        mode: StackingMode.Normal,
+      },
+    },
+  };
+
+  const f3Config: FieldConfig<GraphFieldConfig> = {
+    displayName: 'Metric 3',
+    decimals: 2,
+    color: {
+      mode: FieldColorModeId.Fixed,
+    },
+    custom: {
+      drawStyle: GraphDrawStyle.Line,
+      gradientMode: GraphGradientMode.Opacity,
+      lineColor: '#ff0000',
+      lineWidth: 2,
+      lineInterpolation: LineInterpolation.Linear,
+      lineStyle: {
+        fill: 'dash',
+        dash: [1, 2],
+      },
+      spanNulls: false,
+      fillColor: '#ff0000',
+      fillOpacity: 0.1,
+      showPoints: VisibilityMode.Always,
+      stacking: {
+        group: 'B',
+        mode: StackingMode.Normal,
+      },
+    },
+  };
+  const f4Config: FieldConfig<GraphFieldConfig> = {
+    displayName: 'Metric 4',
+    decimals: 2,
+    color: {
+      mode: FieldColorModeId.Fixed,
+    },
+    custom: {
+      drawStyle: GraphDrawStyle.Bars,
+      gradientMode: GraphGradientMode.Hue,
+      lineColor: '#ff0000',
+      lineWidth: 2,
+      lineInterpolation: LineInterpolation.Linear,
+      lineStyle: {
+        fill: 'dash',
+        dash: [1, 2],
+      },
+      barAlignment: BarAlignment.Before,
+      fillColor: '#ff0000',
+      fillOpacity: 0.1,
+      showPoints: VisibilityMode.Always,
+      stacking: {
+        group: 'B',
+        mode: StackingMode.Normal,
+      },
+    },
+  };
+  const f5Config: FieldConfig<GraphFieldConfig> = {
+    displayName: 'Metric 4',
+    decimals: 2,
+    color: {
+      mode: FieldColorModeId.Fixed,
+    },
+    custom: {
+      drawStyle: GraphDrawStyle.Bars,
+      gradientMode: GraphGradientMode.Hue,
+      lineColor: '#ff0000',
+      lineWidth: 2,
+      lineInterpolation: LineInterpolation.Linear,
+      lineStyle: {
+        fill: 'dash',
+        dash: [1, 2],
+      },
+      barAlignment: BarAlignment.Before,
+      fillColor: '#ff0000',
+      fillOpacity: 0.1,
+      showPoints: VisibilityMode.Always,
+      stacking: {
+        group: 'B',
+        mode: StackingMode.None,
+      },
+    },
+  };
+
+  df1.addField({
+    name: 'metric1',
+    type: FieldType.number,
+    config: f1Config,
+  });
+
+  df2.addField({
+    name: 'metric2',
+    type: FieldType.number,
+    config: f2Config,
+  });
+  df2.addField({
+    name: 'metric3',
+    type: FieldType.number,
+    config: f3Config,
+  });
+  df2.addField({
+    name: 'metric4',
+    type: FieldType.number,
+    config: f4Config,
+  });
+  df2.addField({
+    name: 'metric5',
+    type: FieldType.number,
+    config: f5Config,
+  });
+
+  return preparePlotFrame([df1, df2], {
+    x: fieldMatchers.get(FieldMatcherID.firstTimeField).get({}),
+    y: fieldMatchers.get(FieldMatcherID.numeric).get({}),
+  });
+}
+
+jest.mock('@grafana/data', () => ({
+  ...jest.requireActual('@grafana/data'),
+  DefaultTimeZone: 'utc',
+}));
+
+describe('GraphNG utils', () => {
+  test('preparePlotConfigBuilder', () => {
+    const frame = mockDataFrame();
+    const result = preparePlotConfigBuilder({
+      frame: frame!,
+      theme: createTheme(),
+      timeZones: [DefaultTimeZone],
+      getTimeRange: getDefaultTimeRange,
+      sync: () => DashboardCursorSync.Tooltip,
+      allFrames: [frame!],
+    }).getConfig();
+    expect(result).toMatchSnapshot();
+  });
+
+  test('preparePlotFrame appends min bar spaced nulls when > 1 bar series', () => {
+    const df1: DataFrame = {
+      name: 'A',
+      length: 5,
+      fields: [
+        {
+          name: 'time',
+          type: FieldType.time,
+          config: {},
+          values: [1, 2, 4, 6, 100], // should find smallest delta === 1 from here
+        },
+        {
+          name: 'value',
+          type: FieldType.number,
+          config: {
+            custom: {
+              drawStyle: GraphDrawStyle.Bars,
+            },
+          },
+          values: [1, 1, 1, 1, 1],
+        },
+      ],
+    };
+
+    const df2: DataFrame = {
+      name: 'B',
+      length: 5,
+      fields: [
+        {
+          name: 'time',
+          type: FieldType.time,
+          config: {},
+          values: [30, 40, 50, 90, 100], // should be appended with two smallest-delta increments
+        },
+        {
+          name: 'value',
+          type: FieldType.number,
+          config: {
+            custom: {
+              drawStyle: GraphDrawStyle.Bars,
+            },
+          },
+          values: [2, 2, 2, 2, 2], // bar series should be appended with nulls
+        },
+        {
+          name: 'value',
+          type: FieldType.number,
+          config: {
+            custom: {
+              drawStyle: GraphDrawStyle.Line,
+            },
+          },
+          values: [3, 3, 3, 3, 3], // line series should be appended with undefineds
+        },
+      ],
+    };
+
+    const df3: DataFrame = {
+      name: 'C',
+      length: 2,
+      fields: [
+        {
+          name: 'time',
+          type: FieldType.time,
+          config: {},
+          values: [1, 1.1], // should not trip up on smaller deltas of non-bars
+        },
+        {
+          name: 'value',
+          type: FieldType.number,
+          config: {
+            custom: {
+              drawStyle: GraphDrawStyle.Line,
+            },
+          },
+          values: [4, 4],
+        },
+        {
+          name: 'value',
+          type: FieldType.number,
+          config: {
+            custom: {
+              drawStyle: GraphDrawStyle.Bars,
+              hideFrom: {
+                viz: true, // should ignore hidden bar series
+              },
+            },
+          },
+          values: [4, 4],
+        },
+      ],
+    };
+
+    let aligndFrame = preparePlotFrame([df1, df2, df3], {
+      x: fieldMatchers.get(FieldMatcherID.firstTimeField).get({}),
+      y: fieldMatchers.get(FieldMatcherID.numeric).get({}),
+    });
+
+    expect(aligndFrame).toMatchInlineSnapshot(`
+      {
+        "fields": [
+          {
+            "config": {},
+            "name": "time",
+            "state": {
+              "nullThresholdApplied": true,
+              "origin": {
+                "fieldIndex": 0,
+                "frameIndex": 0,
+              },
+            },
+            "type": "time",
+            "values": [
+              1,
+              1.1,
+              2,
+              4,
+              6,
+              30,
+              40,
+              50,
+              90,
+              100,
+              101,
+              102,
+            ],
+          },
+          {
+            "config": {
+              "custom": {
+                "drawStyle": "bars",
+              },
+            },
+            "labels": {
+              "name": "A",
+            },
+            "name": "value",
+            "state": {
+              "origin": {
+                "fieldIndex": 1,
+                "frameIndex": 0,
+              },
+            },
+            "type": "number",
+            "values": [
+              1,
+              undefined,
+              1,
+              1,
+              1,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              1,
+              null,
+              null,
+            ],
+          },
+          {
+            "config": {
+              "custom": {
+                "drawStyle": "bars",
+              },
+            },
+            "labels": {
+              "name": "B",
+            },
+            "name": "value",
+            "state": {
+              "origin": {
+                "fieldIndex": 1,
+                "frameIndex": 1,
+              },
+            },
+            "type": "number",
+            "values": [
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              2,
+              2,
+              2,
+              2,
+              2,
+              null,
+              null,
+            ],
+          },
+          {
+            "config": {
+              "custom": {
+                "drawStyle": "line",
+              },
+            },
+            "labels": {
+              "name": "B",
+            },
+            "name": "value",
+            "state": {
+              "origin": {
+                "fieldIndex": 2,
+                "frameIndex": 1,
+              },
+            },
+            "type": "number",
+            "values": [
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              3,
+              3,
+              3,
+              3,
+              3,
+              undefined,
+              undefined,
+            ],
+          },
+          {
+            "config": {
+              "custom": {
+                "drawStyle": "line",
+              },
+            },
+            "labels": {
+              "name": "C",
+            },
+            "name": "value",
+            "state": {
+              "origin": {
+                "fieldIndex": 1,
+                "frameIndex": 2,
+              },
+            },
+            "type": "number",
+            "values": [
+              4,
+              4,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+            ],
+          },
+          {
+            "config": {
+              "custom": {
+                "drawStyle": "bars",
+                "hideFrom": {
+                  "viz": true,
+                },
+              },
+            },
+            "labels": {
+              "name": "C",
+            },
+            "name": "value",
+            "state": {
+              "origin": {
+                "fieldIndex": 2,
+                "frameIndex": 2,
+              },
+            },
+            "type": "number",
+            "values": [
+              4,
+              4,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+            ],
+          },
+        ],
+        "length": 12,
+      }
+    `);
+  });
+});
diff --git a/public/app/core/components/GraphNG/utils.ts b/public/app/core/components/GraphNG/utils.ts
new file mode 100644
index 0000000000000..b0c4368f3bbfb
--- /dev/null
+++ b/public/app/core/components/GraphNG/utils.ts
@@ -0,0 +1,145 @@
+import { DataFrame, Field, FieldType, outerJoinDataFrames, TimeRange } from '@grafana/data';
+import { NULL_EXPAND, NULL_REMOVE, NULL_RETAIN } from '@grafana/data/src/transformations/transformers/joinDataFrames';
+import { applyNullInsertThreshold } from '@grafana/data/src/transformations/transformers/nulls/nullInsertThreshold';
+import { nullToUndefThreshold } from '@grafana/data/src/transformations/transformers/nulls/nullToUndefThreshold';
+import { GraphDrawStyle } from '@grafana/schema';
+
+import { XYFieldMatchers } from './types';
+
+function isVisibleBarField(f: Field) {
+  return (
+    f.type === FieldType.number && f.config.custom?.drawStyle === GraphDrawStyle.Bars && !f.config.custom?.hideFrom?.viz
+  );
+}
+
+export function getRefField(frame: DataFrame, refFieldName?: string | null) {
+  return frame.fields.find((field) => {
+    // note: getFieldDisplayName() would require full DF[]
+    return refFieldName != null ? field.name === refFieldName : field.type === FieldType.time;
+  });
+}
+
+// will mutate the DataFrame's fields' values
+function applySpanNullsThresholds(frame: DataFrame, refFieldName?: string | null) {
+  const refField = getRefField(frame, refFieldName);
+
+  let refValues = refField?.values;
+
+  for (let i = 0; i < frame.fields.length; i++) {
+    let field = frame.fields[i];
+
+    if (field === refField || isVisibleBarField(field)) {
+      continue;
+    }
+
+    let spanNulls = field.config.custom?.spanNulls;
+
+    if (typeof spanNulls === 'number') {
+      if (spanNulls !== -1 && refValues) {
+        field.values = nullToUndefThreshold(refValues, field.values, spanNulls);
+      }
+    }
+  }
+
+  return frame;
+}
+
+export function preparePlotFrame(frames: DataFrame[], dimFields: XYFieldMatchers, timeRange?: TimeRange | null) {
+  let xField: Field;
+  loop: for (let frame of frames) {
+    for (let field of frame.fields) {
+      if (dimFields.x(field, frame, frames)) {
+        xField = field;
+        break loop;
+      }
+    }
+  }
+
+  // apply null insertions at interval
+  frames = frames.map((frame) => {
+    if (!xField?.state?.nullThresholdApplied) {
+      return applyNullInsertThreshold({
+        frame,
+        refFieldName: xField.name,
+        refFieldPseudoMin: timeRange?.from.valueOf(),
+        refFieldPseudoMax: timeRange?.to.valueOf(),
+      });
+    } else {
+      return frame;
+    }
+  });
+
+  let numBarSeries = frames.reduce(
+    (acc, frame) => acc + frame.fields.reduce((acc, field) => acc + (isVisibleBarField(field) ? 1 : 0), 0),
+    0
+  );
+
+  // to make bar widths of all series uniform (equal to narrowest bar series), find smallest distance between x points
+  let minXDelta = Infinity;
+
+  if (numBarSeries > 1) {
+    frames.forEach((frame) => {
+      if (!frame.fields.some(isVisibleBarField)) {
+        return;
+      }
+
+      const xVals = xField.values;
+
+      for (let i = 0; i < xVals.length; i++) {
+        if (i > 0) {
+          minXDelta = Math.min(minXDelta, xVals[i] - xVals[i - 1]);
+        }
+      }
+    });
+  }
+
+  let alignedFrame = outerJoinDataFrames({
+    frames,
+    joinBy: dimFields.x,
+    keep: dimFields.y,
+    keepOriginIndices: true,
+
+    // the join transformer force-deletes our state.displayName cache unless keepDisplayNames: true
+    // https://github.com/grafana/grafana/pull/31121
+    // https://github.com/grafana/grafana/pull/71806
+    keepDisplayNames: true,
+
+    // prevent minesweeper-expansion of nulls (gaps) when joining bars
+    // since bar width is determined from the minimum distance between non-undefined values
+    // (this strategy will still retain any original pre-join nulls, though)
+    nullMode: (field) => {
+      if (isVisibleBarField(field)) {
+        return NULL_RETAIN;
+      }
+
+      let spanNulls = field.config.custom?.spanNulls;
+      return spanNulls === true ? NULL_REMOVE : spanNulls === -1 ? NULL_RETAIN : NULL_EXPAND;
+    },
+  });
+
+  if (alignedFrame) {
+    alignedFrame = applySpanNullsThresholds(alignedFrame, xField!.name);
+
+    // append 2 null vals at minXDelta to bar series
+    if (minXDelta !== Infinity) {
+      alignedFrame.fields.forEach((f, fi) => {
+        let vals = f.values;
+
+        if (fi === 0) {
+          let lastVal = vals[vals.length - 1];
+          vals.push(lastVal + minXDelta, lastVal + 2 * minXDelta);
+        } else if (isVisibleBarField(f)) {
+          vals.push(null, null);
+        } else {
+          vals.push(undefined, undefined);
+        }
+      });
+
+      alignedFrame.length += 2;
+    }
+
+    return alignedFrame;
+  }
+
+  return null;
+}
diff --git a/public/app/core/components/Layers/AddLayerButton.test.tsx b/public/app/core/components/Layers/AddLayerButton.test.tsx
index 082f1e0dc1c40..0bdbf16f7fda9 100644
--- a/public/app/core/components/Layers/AddLayerButton.test.tsx
+++ b/public/app/core/components/Layers/AddLayerButton.test.tsx
@@ -10,7 +10,7 @@ describe('AddLayerButton', () => {
   it('renders AddLayerButton', () => {
     renderScenario({});
 
-    const button = screen.getByLabelText(selectors.components.ValuePicker.button(testLabel));
+    const button = screen.getByTestId(selectors.components.ValuePicker.button(testLabel));
 
     expect(button).toBeInTheDocument();
   });
diff --git a/public/app/core/components/Layers/LayerDragDropList.tsx b/public/app/core/components/Layers/LayerDragDropList.tsx
index 9bbfd683507ab..1dc2ff5dc6681 100644
--- a/public/app/core/components/Layers/LayerDragDropList.tsx
+++ b/public/app/core/components/Layers/LayerDragDropList.tsx
@@ -127,49 +127,49 @@ LayerDragDropList.defaultProps = {
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  wrapper: css`
-    margin-bottom: ${theme.spacing(2)};
-  `,
-  row: css`
-    padding: ${theme.spacing(0.5, 1)};
-    border-radius: ${theme.shape.radius.default};
-    background: ${theme.colors.background.secondary};
-    min-height: ${theme.spacing(4)};
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-bottom: 3px;
-    cursor: pointer;
+  wrapper: css({
+    marginBottom: theme.spacing(2),
+  }),
+  row: css({
+    padding: theme.spacing(0.5, 1),
+    borderRadius: theme.shape.radius.default,
+    background: theme.colors.background.secondary,
+    minHeight: theme.spacing(4),
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    marginBottom: '3px',
+    cursor: 'pointer',
 
-    border: 1px solid ${theme.components.input.borderColor};
-    &:hover {
-      border: 1px solid ${theme.components.input.borderHover};
-    }
-  `,
-  sel: css`
-    border: 1px solid ${theme.colors.primary.border};
-    &:hover {
-      border: 1px solid ${theme.colors.primary.border};
-    }
-  `,
-  dragIcon: css`
-    cursor: drag;
-  `,
-  actionIcon: css`
-    color: ${theme.colors.text.secondary};
-    &:hover {
-      color: ${theme.colors.text};
-    }
-  `,
-  typeWrapper: css`
-    color: ${theme.colors.primary.text};
-    margin-right: 5px;
-  `,
-  textWrapper: css`
-    display: flex;
-    align-items: center;
-    flex-grow: 1;
-    overflow: hidden;
-    margin-right: ${theme.spacing(1)};
-  `,
+    border: `1px solid ${theme.components.input.borderColor}`,
+    '&:hover': {
+      border: `1px solid ${theme.components.input.borderHover}`,
+    },
+  }),
+  sel: css({
+    border: `1px solid ${theme.colors.primary.border}`,
+    '&:hover': {
+      border: `1px solid ${theme.colors.primary.border}`,
+    },
+  }),
+  dragIcon: css({
+    cursor: 'drag',
+  }),
+  actionIcon: css({
+    color: theme.colors.text.secondary,
+    '&:hover': {
+      color: theme.colors.text.primary,
+    },
+  }),
+  typeWrapper: css({
+    color: theme.colors.primary.text,
+    marginRight: '5px',
+  }),
+  textWrapper: css({
+    display: 'flex',
+    alignItems: 'center',
+    flexGrow: 1,
+    overflow: 'hidden',
+    marginRight: theme.spacing(1),
+  }),
 });
diff --git a/public/app/core/components/Layers/LayerName.tsx b/public/app/core/components/Layers/LayerName.tsx
index 1ed35e1a3a130..2ef0a2981cd77 100644
--- a/public/app/core/components/Layers/LayerName.tsx
+++ b/public/app/core/components/Layers/LayerName.tsx
@@ -105,55 +105,54 @@ export const LayerName = ({ name, onChange, verifyLayerNameUniqueness, overrideS
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
-    wrapper: css`
-      label: Wrapper;
-      display: flex;
-      align-items: center;
-      margin-left: ${theme.spacing(0.5)};
-    `,
-    layerNameWrapper: css`
-      display: flex;
-      cursor: pointer;
-      border: 1px solid transparent;
-      border-radius: ${theme.shape.borderRadius(2)};
-      align-items: center;
-      padding: 0 0 0 ${theme.spacing(0.5)};
-      margin: 0;
-      background: transparent;
-
-      &:hover {
-        background: ${theme.colors.action.hover};
-        border: 1px dashed ${theme.colors.border.strong};
-      }
-
-      &:focus {
-        border: 2px solid ${theme.colors.primary.border};
-      }
-
-      &:hover,
-      &:focus {
-        .query-name-edit-icon {
-          visibility: visible;
-        }
-      }
-    `,
-    layerName: css`
-      font-weight: ${theme.typography.fontWeightMedium};
-      color: ${theme.colors.primary.text};
-      cursor: pointer;
-      overflow: hidden;
-      margin-left: ${theme.spacing(0.5)};
-    `,
+    wrapper: css({
+      label: 'Wrapper',
+      display: 'flex',
+      alignItems: 'center',
+      marginLeft: theme.spacing(0.5),
+    }),
+    layerNameWrapper: css({
+      display: 'flex',
+      cursor: 'pointer',
+      border: '1px solid transparent',
+      borderRadius: theme.shape.radius.default,
+      alignItems: 'center',
+      padding: `0 0 0 ${theme.spacing(0.5)}`,
+      margin: 0,
+      background: 'transparent',
+
+      '&:hover': {
+        background: theme.colors.action.hover,
+        border: `1px dashed ${theme.colors.border.strong}`,
+      },
+
+      '&:focus': {
+        border: `2px solid ${theme.colors.primary.border}`,
+      },
+
+      '&:hover, &:focus': {
+        '.query-name-edit-icon': {
+          visibility: 'visible',
+        },
+      },
+    }),
+    layerName: css({
+      fontWeight: theme.typography.fontWeightMedium,
+      color: theme.colors.primary.text,
+      cursor: 'pointer',
+      overflow: 'hidden',
+      marginLeft: theme.spacing(0.5),
+    }),
     layerEditIcon: cx(
-      css`
-        margin-left: ${theme.spacing(2)};
-        visibility: hidden;
-      `,
+      css({
+        marginLeft: theme.spacing(2),
+        visibility: 'hidden',
+      }),
       'query-name-edit-icon'
     ),
-    layerNameInput: css`
-      max-width: 300px;
-      margin: -4px 0;
-    `,
+    layerNameInput: css({
+      maxWidth: '300px',
+      margin: '-4px 0',
+    }),
   };
 };
diff --git a/public/app/core/components/Login/LoginForm.tsx b/public/app/core/components/Login/LoginForm.tsx
index 45cdf8fa0877b..cfc706ad62cdd 100644
--- a/public/app/core/components/Login/LoginForm.tsx
+++ b/public/app/core/components/Login/LoginForm.tsx
@@ -1,8 +1,11 @@
 import { css } from '@emotion/css';
-import React, { ReactElement } from 'react';
+import React, { ReactElement, useId } from 'react';
+import { useForm } from 'react-hook-form';
 
+import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { Button, Form, Input, Field } from '@grafana/ui';
+import { Button, Input, Field, useStyles2 } from '@grafana/ui';
+import { t } from 'app/core/internationalization';
 
 import { PasswordField } from '../PasswordField/PasswordField';
 
@@ -16,51 +19,69 @@ interface Props {
   loginHint: string;
 }
 
-const wrapperStyles = css`
-  width: 100%;
-  padding-bottom: 16px;
-`;
-
-export const submitButton = css`
-  justify-content: center;
-  width: 100%;
-`;
-
 export const LoginForm = ({ children, onSubmit, isLoggingIn, passwordHint, loginHint }: Props) => {
+  const styles = useStyles2(getStyles);
+  const usernameId = useId();
+  const passwordId = useId();
+  const {
+    handleSubmit,
+    register,
+    formState: { errors },
+  } = useForm<FormModel>({ mode: 'onChange' });
+
   return (
-    <div className={wrapperStyles}>
-      <Form onSubmit={onSubmit} validateOn="onChange">
-        {({ register, errors }) => (
-          <>
-            <Field label="Email or username" invalid={!!errors.user} error={errors.user?.message}>
-              <Input
-                {...register('user', { required: 'Email or username is required' })}
-                autoFocus
-                autoCapitalize="none"
-                placeholder={loginHint}
-                aria-label={selectors.pages.Login.username}
-              />
-            </Field>
-            <Field label="Password" invalid={!!errors.password} error={errors.password?.message}>
-              <PasswordField
-                id="current-password"
-                autoComplete="current-password"
-                passwordHint={passwordHint}
-                {...register('password', { required: 'Password is required' })}
-              />
-            </Field>
-            <Button
-              type="submit"
-              aria-label={selectors.pages.Login.submit}
-              className={submitButton}
-              disabled={isLoggingIn}
-            >
-              {isLoggingIn ? 'Logging in...' : 'Log in'}
-            </Button>
-            {children}
-          </>
-        )}
-      </Form>
+    <div className={styles.wrapper}>
+      <form onSubmit={handleSubmit(onSubmit)}>
+        <Field
+          label={t('login.form.username-label', 'Email or username')}
+          invalid={!!errors.user}
+          error={errors.user?.message}
+        >
+          <Input
+            {...register('user', { required: t('login.form.username-required', 'Email or username is required') })}
+            id={usernameId}
+            autoFocus
+            autoCapitalize="none"
+            placeholder={loginHint}
+            data-testid={selectors.pages.Login.username}
+          />
+        </Field>
+        <Field
+          label={t('login.form.password-label', 'Password')}
+          invalid={!!errors.password}
+          error={errors.password?.message}
+        >
+          <PasswordField
+            {...register('password', { required: t('login.form.password-required', 'Password is required') })}
+            id={passwordId}
+            autoComplete="current-password"
+            placeholder={passwordHint}
+          />
+        </Field>
+        <Button
+          type="submit"
+          data-testid={selectors.pages.Login.submit}
+          className={styles.submitButton}
+          disabled={isLoggingIn}
+        >
+          {isLoggingIn ? t('login.form.submit-loading-label', 'Logging in...') : t('login.form.submit-label', 'Log in')}
+        </Button>
+        {children}
+      </form>
     </div>
   );
 };
+
+export const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    wrapper: css({
+      width: '100%',
+      paddingBottom: theme.spacing(2),
+    }),
+
+    submitButton: css({
+      justifyContent: 'center',
+      width: '100%',
+    }),
+  };
+};
diff --git a/public/app/core/components/Login/LoginLayout.tsx b/public/app/core/components/Login/LoginLayout.tsx
index 1488cb47d8f32..6c60db0542f19 100644
--- a/public/app/core/components/Login/LoginLayout.tsx
+++ b/public/app/core/components/Login/LoginLayout.tsx
@@ -2,11 +2,11 @@ import { cx, css, keyframes } from '@emotion/css';
 import React, { useEffect, useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { useStyles2, styleMixins } from '@grafana/ui';
+import { useStyles2 } from '@grafana/ui';
 
 import { Branding } from '../Branding/Branding';
 import { BrandingSettings } from '../Branding/types';
-import { Footer } from '../Footer/Footer';
+// Psiphon change - Remove unused import after Psiphon changes
 
 interface InnerBoxProps {
   enterAnimation?: boolean;
@@ -22,40 +22,37 @@ export interface LoginLayoutProps {
   isChangingPassword?: boolean;
 }
 
+// Psiphon change - remove unused consts
 export const LoginLayout = ({ children, branding, isChangingPassword }: React.PropsWithChildren<LoginLayoutProps>) => {
   const loginStyles = useStyles2(getLoginStyles);
   const [startAnim, setStartAnim] = useState(false);
   const subTitle = branding?.loginSubtitle ?? Branding.GetLoginSubTitle();
-  const loginTitle = branding?.loginTitle ?? Branding.LoginTitle;
-  const loginBoxBackground = branding?.loginBoxBackground || Branding.LoginBoxBackground();
   const loginLogo = branding?.loginLogo;
-  const hideEdition = branding?.hideEdition ?? Branding.HideEdition;
+  // Psiphon change - remove unused const
 
   useEffect(() => setStartAnim(true), []);
 
+  // Psiphon changes - remove loginboxbackground styling because it looks bad with custom
+  // image, remove 'Welcome to Grafana' message. Remove footer.
   return (
     <Branding.LoginBackground
       className={cx(loginStyles.container, startAnim && loginStyles.loginAnim, branding?.loginBackground)}
     >
       <div className={loginStyles.loginMain}>
-        <div className={cx(loginStyles.loginContent, loginBoxBackground, 'login-content-box')}>
+        <div className={cx(loginStyles.loginContent, 'login-content-box')}>
           <div className={loginStyles.loginLogoWrapper}>
             <Branding.LoginLogo className={loginStyles.loginLogo} logo={loginLogo} />
             <div className={loginStyles.titleWrapper}>
               {isChangingPassword ? (
                 <h1 className={loginStyles.mainTitle}>Update your password</h1>
               ) : (
-                <>
-                  <h1 className={loginStyles.mainTitle}>{loginTitle}</h1>
-                  {subTitle && <h3 className={loginStyles.subTitle}>{subTitle}</h3>}
-                </>
+                <>{subTitle && <h3 className={loginStyles.subTitle}>{subTitle}</h3>}</>
               )}
             </div>
           </div>
           <div className={loginStyles.loginOuterBox}>{children}</div>
         </div>
       </div>
-      {branding?.hideFooter ? <></> : <Footer hideEdition={hideEdition} customLinks={branding?.footerLinks} />}
     </Branding.LoginBackground>
   );
 };
@@ -92,90 +89,91 @@ export const getLoginStyles = (theme: GrafanaTheme2) => {
       alignItems: 'center',
       justifyContent: 'center',
     }),
-    loginAnim: css`
-      &:before {
-        opacity: 1;
-      }
+    loginAnim: css({
+      ['&:before']: {
+        opacity: 1,
+      },
 
-      .login-content-box {
-        opacity: 1;
-      }
-    `,
-    submitButton: css`
-      justify-content: center;
-      width: 100%;
-    `,
-    loginLogo: css`
-      width: 100%;
-      max-width: 60px;
-      margin-bottom: 15px;
-
-      @media ${styleMixins.mediaUp(theme.v1.breakpoints.sm)} {
-        max-width: 100px;
-      }
-    `,
-    loginLogoWrapper: css`
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      flex-direction: column;
-      padding: ${theme.spacing(3)};
-    `,
-    titleWrapper: css`
-      text-align: center;
-    `,
-    mainTitle: css`
-      font-size: 22px;
+      // Psiphon change - shift login box up a bit to look better with custom background image
+      ['.login-content-box']: {
+        opacity: 1,
+        marginTop: -10,
+      },
+    }),
+    submitButton: css({
+      justifyContent: 'center',
+      width: '100%',
+    }),
+    loginLogo: css({
+      width: '100%',
+      maxWidth: 60,
+      marginBottom: theme.spacing(2),
 
-      @media ${styleMixins.mediaUp(theme.v1.breakpoints.sm)} {
-        font-size: 32px;
-      }
-    `,
-    subTitle: css`
-      font-size: ${theme.typography.size.md};
-      color: ${theme.colors.text.secondary};
-    `,
-    loginContent: css`
-      max-width: 478px;
-      width: calc(100% - 2rem);
-      display: flex;
-      align-items: stretch;
-      flex-direction: column;
-      position: relative;
-      justify-content: flex-start;
-      z-index: 1;
-      min-height: 320px;
-      border-radius: ${theme.shape.borderRadius(4)};
-      padding: ${theme.spacing(2, 0)};
-      opacity: 0;
-      transition: opacity 0.5s ease-in-out;
+      [theme.breakpoints.up('sm')]: {
+        maxWidth: 100,
+      },
+    }),
+    loginLogoWrapper: css({
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'center',
+      flexDirection: 'column',
+      padding: theme.spacing(3),
+    }),
+    titleWrapper: css({
+      textAlign: 'center',
+    }),
+    mainTitle: css({
+      fontSize: 22,
 
-      @media ${styleMixins.mediaUp(theme.v1.breakpoints.sm)} {
-        min-height: 320px;
-        justify-content: center;
-      }
-    `,
-    loginOuterBox: css`
-      display: flex;
-      overflow-y: hidden;
-      align-items: center;
-      justify-content: center;
-    `,
-    loginInnerBox: css`
-      padding: ${theme.spacing(0, 2, 2, 2)};
+      [theme.breakpoints.up('sm')]: {
+        fontSize: 32,
+      },
+    }),
+    subTitle: css({
+      fontSize: theme.typography.size.md,
+      color: theme.colors.text.secondary,
+    }),
+    loginContent: css({
+      maxWidth: 478,
+      width: `calc(100% - 2rem)`,
+      display: 'flex',
+      alignItems: 'stretch',
+      flexDirection: 'column',
+      position: 'relative',
+      justifyContent: 'flex-start',
+      zIndex: 1,
+      minHeight: 320,
+      borderRadius: theme.shape.radius.default,
+      padding: theme.spacing(2, 0),
+      opacity: 0,
+      transition: 'opacity 0.5s ease-in-out',
 
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: center;
-      flex-grow: 1;
-      max-width: 415px;
-      width: 100%;
-      transform: translate(0px, 0px);
-      transition: 0.25s ease;
-    `,
-    enterAnimation: css`
-      animation: ${flyInAnimation} ease-out 0.2s;
-    `,
+      [theme.breakpoints.up('sm')]: {
+        minHeight: theme.spacing(40),
+        justifyContent: 'center',
+      },
+    }),
+    loginOuterBox: css({
+      display: 'flex',
+      overflowY: 'hidden',
+      alignItems: 'center',
+      justifyContent: 'center',
+    }),
+    loginInnerBox: css({
+      padding: theme.spacing(0, 2, 2, 2),
+      display: 'flex',
+      flexDirection: 'column',
+      alignItems: 'center',
+      justifyContent: 'center',
+      flexGrow: 1,
+      maxWidth: 415,
+      width: '100%',
+      transform: 'translate(0px, 0px)',
+      transition: '0.25s ease',
+    }),
+    enterAnimation: css({
+      animation: `${flyInAnimation} ease-out 0.2s`,
+    }),
   };
 };
diff --git a/public/app/core/components/Login/LoginPage.test.tsx b/public/app/core/components/Login/LoginPage.test.tsx
index fba3892af2b16..17d6a0fd86f7d 100644
--- a/public/app/core/components/Login/LoginPage.test.tsx
+++ b/public/app/core/components/Login/LoginPage.test.tsx
@@ -14,6 +14,9 @@ jest.mock('@grafana/runtime', () => ({
     post: postMock,
   }),
   config: {
+    auth: {
+      disableLogin: false,
+    },
     loginError: false,
     buildInfo: {
       version: 'v1.0',
@@ -39,9 +42,9 @@ describe('Login Page', () => {
     render(<LoginPage />);
 
     expect(screen.getByRole('heading', { name: 'Welcome to Grafana' })).toBeInTheDocument();
-    expect(screen.getByRole('textbox', { name: 'Username input field' })).toBeInTheDocument();
-    expect(screen.getByLabelText('Password input field')).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: 'Login button' })).toBeInTheDocument();
+    expect(screen.getByRole('textbox', { name: 'Email or username' })).toBeInTheDocument();
+    expect(screen.getByLabelText('Password')).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'Log in' })).toBeInTheDocument();
 
     expect(screen.getByRole('link', { name: 'Forgot your password?' })).toBeInTheDocument();
     expect(screen.getByRole('link', { name: 'Forgot your password?' })).toHaveAttribute(
@@ -56,20 +59,20 @@ describe('Login Page', () => {
   it('should pass validation checks for username field', async () => {
     render(<LoginPage />);
 
-    fireEvent.click(screen.getByRole('button', { name: 'Login button' }));
+    fireEvent.click(screen.getByRole('button', { name: 'Log in' }));
     expect(await screen.findByText('Email or username is required')).toBeInTheDocument();
 
-    await userEvent.type(screen.getByRole('textbox', { name: 'Username input field' }), 'admin');
+    await userEvent.type(screen.getByRole('textbox', { name: 'Email or username' }), 'admin');
     await waitFor(() => expect(screen.queryByText('Email or username is required')).not.toBeInTheDocument());
   });
 
   it('should pass validation checks for password field', async () => {
     render(<LoginPage />);
 
-    fireEvent.click(screen.getByRole('button', { name: 'Login button' }));
+    fireEvent.click(screen.getByRole('button', { name: 'Log in' }));
     expect(await screen.findByText('Password is required')).toBeInTheDocument();
 
-    await userEvent.type(screen.getByLabelText('Password input field'), 'admin');
+    await userEvent.type(screen.getByLabelText('Password'), 'admin');
     await waitFor(() => expect(screen.queryByText('Password is required')).not.toBeInTheDocument());
   });
 
@@ -82,9 +85,9 @@ describe('Login Page', () => {
     postMock.mockResolvedValueOnce({ message: 'Logged in' });
     render(<LoginPage />);
 
-    await userEvent.type(screen.getByLabelText('Username input field'), 'admin');
-    await userEvent.type(screen.getByLabelText('Password input field'), 'test');
-    fireEvent.click(screen.getByLabelText('Login button'));
+    await userEvent.type(screen.getByLabelText('Email or username'), 'admin');
+    await userEvent.type(screen.getByLabelText('Password'), 'test');
+    fireEvent.click(screen.getByRole('button', { name: 'Log in' }));
 
     await waitFor(() =>
       expect(postMock).toHaveBeenCalledWith('/login', { password: 'test', user: 'admin' }, { showErrorAlert: false })
@@ -128,9 +131,9 @@ describe('Login Page', () => {
 
     render(<LoginPage />);
 
-    await userEvent.type(screen.getByLabelText('Username input field'), 'admin');
-    await userEvent.type(screen.getByLabelText('Password input field'), 'test');
-    await userEvent.click(screen.getByRole('button', { name: 'Login button' }));
+    await userEvent.type(screen.getByLabelText('Email or username'), 'admin');
+    await userEvent.type(screen.getByLabelText('Password'), 'test');
+    await userEvent.click(screen.getByRole('button', { name: 'Log in' }));
 
     const alert = await screen.findByRole('alert', { name: 'Login failed' });
     expect(alert).toBeInTheDocument();
@@ -150,9 +153,9 @@ describe('Login Page', () => {
 
     render(<LoginPage />);
 
-    await userEvent.type(screen.getByLabelText('Username input field'), 'admin');
-    await userEvent.type(screen.getByLabelText('Password input field'), 'test');
-    await userEvent.click(screen.getByRole('button', { name: 'Login button' }));
+    await userEvent.type(screen.getByLabelText('Email or username'), 'admin');
+    await userEvent.type(screen.getByLabelText('Password'), 'test');
+    await userEvent.click(screen.getByRole('button', { name: 'Log in' }));
 
     const alert = await screen.findByRole('alert', { name: 'Login failed' });
     expect(alert).toBeInTheDocument();
diff --git a/public/app/core/components/Login/LoginPage.tsx b/public/app/core/components/Login/LoginPage.tsx
index e86dd4a3b28d8..bdefbfd569670 100644
--- a/public/app/core/components/Login/LoginPage.tsx
+++ b/public/app/core/components/Login/LoginPage.tsx
@@ -3,10 +3,11 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 // Components
-import { Alert, HorizontalGroup, LinkButton } from '@grafana/ui';
+import { GrafanaTheme2 } from '@grafana/data';
+import { config } from '@grafana/runtime';
+import { Alert, HorizontalGroup, LinkButton, useStyles2 } from '@grafana/ui';
 import { Branding } from 'app/core/components/Branding/Branding';
-import config from 'app/core/config';
-import { t } from 'app/core/internationalization';
+import { t, Trans } from 'app/core/internationalization';
 
 import { ChangePassword } from '../ForgottenPassword/ChangePassword';
 
@@ -16,17 +17,10 @@ import { LoginLayout, InnerBox } from './LoginLayout';
 import { LoginServiceButtons } from './LoginServiceButtons';
 import { UserSignup } from './UserSignup';
 
-const forgottenPasswordStyles = css`
-  padding: 0;
-  margin-top: 4px;
-`;
-
-const alertStyles = css({
-  width: '100%',
-});
-
 export const LoginPage = () => {
+  const styles = useStyles2(getStyles);
   document.title = Branding.AppTitle;
+
   return (
     <LoginCtrl>
       {({
@@ -46,7 +40,7 @@ export const LoginPage = () => {
           {!isChangingPassword && (
             <InnerBox>
               {loginErrorMessage && (
-                <Alert className={alertStyles} severity="error" title={t('login.error.title', 'Login failed')}>
+                <Alert className={styles.alert} severity="error" title={t('login.error.title', 'Login failed')}>
                   {loginErrorMessage}
                 </Alert>
               )}
@@ -54,13 +48,15 @@ export const LoginPage = () => {
               {!disableLoginForm && (
                 <LoginForm onSubmit={login} loginHint={loginHint} passwordHint={passwordHint} isLoggingIn={isLoggingIn}>
                   <HorizontalGroup justify="flex-end">
-                    <LinkButton
-                      className={forgottenPasswordStyles}
-                      fill="text"
-                      href={`${config.appSubUrl}/user/password/send-reset-email`}
-                    >
-                      Forgot your password?
-                    </LinkButton>
+                    {!config.auth.disableLogin && (
+                      <LinkButton
+                        className={styles.forgottenPassword}
+                        fill="text"
+                        href={`${config.appSubUrl}/user/password/send-reset-email`}
+                      >
+                        <Trans i18nKey="login.forgot-password">Forgot your password?</Trans>
+                      </LinkButton>
+                    )}
                   </HorizontalGroup>
                 </LoginForm>
               )}
@@ -83,3 +79,16 @@ export const LoginPage = () => {
     </LoginCtrl>
   );
 };
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    forgottenPassword: css({
+      padding: 0,
+      marginTop: theme.spacing(0.5),
+    }),
+
+    alert: css({
+      width: '100%',
+    }),
+  };
+};
diff --git a/public/app/core/components/Login/LoginServiceButtons.tsx b/public/app/core/components/Login/LoginServiceButtons.tsx
index aee1e887ba0c6..084852c348066 100644
--- a/public/app/core/components/Login/LoginServiceButtons.tsx
+++ b/public/app/core/components/Login/LoginServiceButtons.tsx
@@ -5,6 +5,7 @@ import React from 'react';
 import { GrafanaTheme2, DEFAULT_SAML_NAME } from '@grafana/data';
 import { Icon, IconName, LinkButton, useStyles2, useTheme2, VerticalGroup } from '@grafana/ui';
 import config from 'app/core/config';
+import { Trans } from 'app/core/internationalization';
 
 export interface LoginService {
   bgColor: string;
@@ -77,30 +78,30 @@ const loginServices: () => LoginServices = () => {
 
 const getServiceStyles = (theme: GrafanaTheme2) => {
   return {
-    button: css`
-      color: #d8d9da;
-      position: relative;
-    `,
-    buttonIcon: css`
-      position: absolute;
-      left: ${theme.spacing(1)};
-      top: 50%;
-      transform: translateY(-50%);
-    `,
+    button: css({
+      color: '#d8d9da',
+      position: 'relative',
+    }),
+    buttonIcon: css({
+      position: 'absolute',
+      left: theme.spacing(1),
+      top: '50%',
+      transform: 'translateY(-50%)',
+    }),
     divider: {
-      base: css`
-        color: ${theme.colors.text};
-        display: flex;
-        margin-bottom: ${theme.spacing(1)};
-        justify-content: space-between;
-        text-align: center;
-        width: 100%;
-      `,
-      line: css`
-        width: 100px;
-        height: 10px;
-        border-bottom: 1px solid ${theme.colors.text};
-      `,
+      base: css({
+        color: theme.colors.text.primary,
+        display: 'flex',
+        marginBottom: theme.spacing(1),
+        justifyContent: 'space-between',
+        textAlign: 'center',
+        width: '100%',
+      }),
+      line: css({
+        width: 100,
+        height: 10,
+        borderBottom: `1px solid ${theme.colors.text}`,
+      }),
     },
   };
 };
@@ -128,15 +129,15 @@ const LoginDivider = () => {
 function getButtonStyleFor(service: LoginService, styles: ReturnType<typeof getServiceStyles>, theme: GrafanaTheme2) {
   return cx(
     styles.button,
-    css`
-      background-color: ${service.bgColor};
-      color: ${theme.colors.getContrastText(service.bgColor)};
+    css({
+      backgroundColor: service.bgColor,
+      color: theme.colors.getContrastText(service.bgColor),
 
-      &:hover {
-        background-color: ${theme.colors.emphasize(service.bgColor, 0.15)};
-        box-shadow: ${theme.shadows.z1};
-      }
-    `
+      ['&:hover']: {
+        backgroundColor: theme.colors.emphasize(service.bgColor, 0.15),
+        boxShadow: theme.shadows.z1,
+      },
+    })
   );
 }
 
@@ -150,18 +151,21 @@ export const LoginServiceButtons = () => {
     return (
       <VerticalGroup>
         <LoginDivider />
-        {Object.entries(enabledServices).map(([key, service]) => (
-          <LinkButton
-            key={key}
-            className={getButtonStyleFor(service, styles, theme)}
-            href={`login/${service.hrefName ? service.hrefName : key}`}
-            target="_self"
-            fullWidth
-          >
-            <Icon className={styles.buttonIcon} name={service.icon} />
-            Sign in with {service.name}
-          </LinkButton>
-        ))}
+        {Object.entries(enabledServices).map(([key, service]) => {
+          const serviceName = service.name;
+          return (
+            <LinkButton
+              key={key}
+              className={getButtonStyleFor(service, styles, theme)}
+              href={`login/${service.hrefName ? service.hrefName : key}`}
+              target="_self"
+              fullWidth
+            >
+              <Icon className={styles.buttonIcon} name={service.icon} />
+              <Trans i18nKey="login.services.sing-in-with-prefix">Sign in with {{ serviceName }}</Trans>
+            </LinkButton>
+          );
+        })}
       </VerticalGroup>
     );
   }
diff --git a/public/app/core/components/Login/UserSignup.tsx b/public/app/core/components/Login/UserSignup.tsx
index 04866de95d90b..7b039d59113d9 100644
--- a/public/app/core/components/Login/UserSignup.tsx
+++ b/public/app/core/components/Login/UserSignup.tsx
@@ -3,6 +3,7 @@ import React from 'react';
 
 import { LinkButton, VerticalGroup } from '@grafana/ui';
 import { getConfig } from 'app/core/config';
+import { Trans } from 'app/core/internationalization';
 
 export const UserSignup = () => {
   const href = getConfig().verifyEmailEnabled ? `${getConfig().appSubUrl}/verify` : `${getConfig().appSubUrl}/signup`;
@@ -10,17 +11,19 @@ export const UserSignup = () => {
 
   return (
     <VerticalGroup>
-      <div className={paddingTop}>New to Grafana?</div>
+      <div className={paddingTop}>
+        <Trans i18nKey="login.signup.new-to-question">New to Grafana?</Trans>
+      </div>
       <LinkButton
-        className={css`
-          width: 100%;
-          justify-content: center;
-        `}
+        className={css({
+          width: '100%',
+          justifyContent: 'center',
+        })}
         href={href}
         variant="secondary"
         fill="outline"
       >
-        Sign up
+        <Trans i18nKey="login.signup.button-label">Sign up</Trans>
       </LinkButton>
     </VerticalGroup>
   );
diff --git a/public/app/core/components/NestedFolderPicker/NestedFolderList.tsx b/public/app/core/components/NestedFolderPicker/NestedFolderList.tsx
index f0874362c93ed..7de1643f74dbe 100644
--- a/public/app/core/components/NestedFolderPicker/NestedFolderList.tsx
+++ b/public/app/core/components/NestedFolderPicker/NestedFolderList.tsx
@@ -6,7 +6,6 @@ import InfiniteLoader from 'react-window-infinite-loader';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { IconButton, useStyles2 } from '@grafana/ui';
-import { getSvgSize } from '@grafana/ui/src/components/Icon/utils';
 import { Text } from '@grafana/ui/src/components/Text/Text';
 import { Indent } from 'app/core/components/Indent/Indent';
 import { Trans } from 'app/core/internationalization';
@@ -191,6 +190,7 @@ function Row({ index, style: virtualStyles, data }: RowProps) {
     >
       <div className={styles.rowBody}>
         <Indent level={level} spacing={2} />
+
         {foldersAreOpenable ? (
           <IconButton
             size={CHEVRON_SIZE}
@@ -237,9 +237,8 @@ const getStyles = (theme: GrafanaTheme2) => {
       width: '100%',
     }),
 
-    // Should be the same size as the <IconButton /> for proper alignment
     folderButtonSpacer: css({
-      paddingLeft: `calc(${getSvgSize(CHEVRON_SIZE)}px + ${theme.spacing(0.5)})`,
+      paddingLeft: theme.spacing(0.5),
     }),
 
     row: css({
diff --git a/public/app/core/components/NestedFolderPicker/NestedFolderPicker.test.tsx b/public/app/core/components/NestedFolderPicker/NestedFolderPicker.test.tsx
index fc71b260d5ccc..c19e7221517c2 100644
--- a/public/app/core/components/NestedFolderPicker/NestedFolderPicker.test.tsx
+++ b/public/app/core/components/NestedFolderPicker/NestedFolderPicker.test.tsx
@@ -1,39 +1,30 @@
 import 'whatwg-fetch'; // fetch polyfill
 import { fireEvent, render as rtlRender, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { rest } from 'msw';
+import { HttpResponse, http } from 'msw';
 import { SetupServer, setupServer } from 'msw/node';
 import React from 'react';
 import { TestProvider } from 'test/helpers/TestProvider';
 
+import { config } from '@grafana/runtime';
 import { backendSrv } from 'app/core/services/backend_srv';
+import { PermissionLevelString } from 'app/types';
 
-import { wellFormedTree } from '../../../features/browse-dashboards/fixtures/dashboardsTreeItem.fixture';
+import {
+  treeViewersCanEdit,
+  wellFormedTree,
+} from '../../../features/browse-dashboards/fixtures/dashboardsTreeItem.fixture';
 
 import { NestedFolderPicker } from './NestedFolderPicker';
 
 const [mockTree, { folderA, folderB, folderC, folderA_folderA, folderA_folderB }] = wellFormedTree();
+const [mockTreeThatViewersCanEdit /* shares folders with wellFormedTree */] = treeViewersCanEdit();
 
 jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
   getBackendSrv: () => backendSrv,
 }));
 
-jest.mock('app/features/browse-dashboards/api/services', () => {
-  const orig = jest.requireActual('app/features/browse-dashboards/api/services');
-
-  return {
-    ...orig,
-    listFolders(parentUID?: string) {
-      const childrenForUID = mockTree
-        .filter((v) => v.item.kind === 'folder' && v.item.parentUID === parentUID)
-        .map((v) => v.item);
-
-      return Promise.resolve(childrenForUID);
-    },
-  };
-});
-
 function render(...[ui, options]: Parameters<typeof rtlRender>) {
   rtlRender(<TestProvider>{ui}</TestProvider>, options);
 }
@@ -45,17 +36,40 @@ describe('NestedFolderPicker', () => {
 
   beforeAll(() => {
     window.HTMLElement.prototype.scrollIntoView = function () {};
+
     server = setupServer(
-      rest.get('/api/folders/:uid', (_, res, ctx) => {
-        return res(
-          ctx.status(200),
-          ctx.json({
-            title: folderA.item.title,
-            uid: folderA.item.uid,
+      http.get('/api/folders/:uid', () => {
+        return HttpResponse.json({
+          title: folderA.item.title,
+          uid: folderA.item.uid,
+        });
+      }),
+
+      http.get('/api/folders', ({ request }) => {
+        const url = new URL(request.url);
+        const parentUid = url.searchParams.get('parentUid') ?? undefined;
+        const permission = url.searchParams.get('permission');
+
+        const limit = parseInt(url.searchParams.get('limit') ?? '1000', 10);
+        const page = parseInt(url.searchParams.get('page') ?? '1', 10);
+
+        const tree = permission === 'Edit' ? mockTreeThatViewersCanEdit : mockTree;
+
+        // reconstruct a folder API response from the flat tree fixture
+        const folders = tree
+          .filter((v) => v.item.kind === 'folder' && v.item.parentUID === parentUid)
+          .map((folder) => {
+            return {
+              uid: folder.item.uid,
+              title: folder.item.kind === 'folder' ? folder.item.title : "invalid - this shouldn't happen",
+            };
           })
-        );
+          .slice(limit * (page - 1), limit * page);
+
+        return HttpResponse.json(folders);
       })
     );
+
     server.listen();
   });
 
@@ -96,7 +110,7 @@ describe('NestedFolderPicker', () => {
     expect(screen.getByPlaceholderText('Search folders')).toBeInTheDocument();
     expect(screen.getByLabelText('Dashboards')).toBeInTheDocument();
     expect(screen.getByLabelText(folderA.item.title)).toBeInTheDocument();
-    expect(screen.getByLabelText(folderB.item.title)).toBeInTheDocument();
+    // expect(screen.getByLabelText(folderB.item.title)).toBeInTheDocument();
     expect(screen.getByLabelText(folderC.item.title)).toBeInTheDocument();
   });
 
@@ -112,6 +126,13 @@ describe('NestedFolderPicker', () => {
     expect(mockOnChange).toHaveBeenCalledWith(folderA.item.uid, folderA.item.title);
   });
 
+  it('can clear a selection if clearable is specified', async () => {
+    render(<NestedFolderPicker clearable value={folderA.item.uid} onChange={mockOnChange} />);
+
+    await userEvent.click(await screen.findByRole('button', { name: 'Clear selection' }));
+    expect(mockOnChange).toHaveBeenCalledWith(undefined, undefined);
+  });
+
   it('can select a folder from the picker with the keyboard', async () => {
     render(<NestedFolderPicker onChange={mockOnChange} />);
     const button = await screen.findByRole('button', { name: 'Select folder' });
@@ -122,7 +143,7 @@ describe('NestedFolderPicker', () => {
     expect(mockOnChange).toHaveBeenCalledWith(folderA.item.uid, folderA.item.title);
   });
 
-  it('can expand and collapse a folder to show its children', async () => {
+  it('shows the root folder by default', async () => {
     render(<NestedFolderPicker onChange={mockOnChange} />);
 
     // Open the picker and wait for children to load
@@ -130,52 +151,159 @@ describe('NestedFolderPicker', () => {
     await userEvent.click(button);
     await screen.findByLabelText(folderA.item.title);
 
-    // Expand Folder A
-    // Note: we need to use mouseDown here because userEvent's click event doesn't get prevented correctly
-    fireEvent.mouseDown(screen.getByRole('button', { name: `Expand folder ${folderA.item.title}` }));
+    await userEvent.click(screen.getByLabelText('Dashboards'));
+    expect(mockOnChange).toHaveBeenCalledWith('', 'Dashboards');
+  });
 
-    // Folder A's children are visible
-    expect(await screen.findByLabelText(folderA_folderA.item.title)).toBeInTheDocument();
-    expect(await screen.findByLabelText(folderA_folderB.item.title)).toBeInTheDocument();
+  it('hides the root folder if the prop says so', async () => {
+    render(<NestedFolderPicker showRootFolder={false} onChange={mockOnChange} />);
 
-    // Collapse Folder A
-    // Note: we need to use mouseDown here because userEvent's click event doesn't get prevented correctly
-    fireEvent.mouseDown(screen.getByRole('button', { name: `Collapse folder ${folderA.item.title}` }));
-    expect(screen.queryByLabelText(folderA_folderA.item.title)).not.toBeInTheDocument();
-    expect(screen.queryByLabelText(folderA_folderB.item.title)).not.toBeInTheDocument();
+    // Open the picker and wait for children to load
+    const button = await screen.findByRole('button', { name: 'Select folder' });
+    await userEvent.click(button);
+    await screen.findByLabelText(folderA.item.title);
+
+    expect(screen.queryByLabelText('Dashboards')).not.toBeInTheDocument();
+  });
+
+  it('hides folders specififed by UID', async () => {
+    render(<NestedFolderPicker excludeUIDs={[folderC.item.uid]} onChange={mockOnChange} />);
 
-    // Expand Folder A again
-    // Note: we need to use mouseDown here because userEvent's click event doesn't get prevented correctly
-    fireEvent.mouseDown(screen.getByRole('button', { name: `Expand folder ${folderA.item.title}` }));
+    // Open the picker and wait for children to load
+    const button = await screen.findByRole('button', { name: 'Select folder' });
+    await userEvent.click(button);
+    await screen.findByLabelText(folderA.item.title);
 
-    // Select the first child
-    await userEvent.click(screen.getByLabelText(folderA_folderA.item.title));
-    expect(mockOnChange).toHaveBeenCalledWith(folderA_folderA.item.uid, folderA_folderA.item.title);
+    expect(screen.queryByLabelText(folderC.item.title)).not.toBeInTheDocument();
   });
 
-  it('can expand and collapse a folder to show its children with the keyboard', async () => {
+  it('by default only shows items the user can edit', async () => {
     render(<NestedFolderPicker onChange={mockOnChange} />);
+
     const button = await screen.findByRole('button', { name: 'Select folder' });
+    await userEvent.click(button);
+    await screen.findByLabelText(folderA.item.title);
+
+    expect(screen.queryByLabelText(folderB.item.title)).not.toBeInTheDocument(); // folderB is not editable
+    expect(screen.getByLabelText(folderC.item.title)).toBeInTheDocument(); // but folderC is
+  });
+
+  it('shows items the user can view, with the prop', async () => {
+    render(<NestedFolderPicker permission={PermissionLevelString.View} onChange={mockOnChange} />);
 
+    const button = await screen.findByRole('button', { name: 'Select folder' });
     await userEvent.click(button);
+    await screen.findByLabelText(folderA.item.title);
+
+    expect(screen.getByLabelText(folderB.item.title)).toBeInTheDocument();
+    expect(screen.getByLabelText(folderC.item.title)).toBeInTheDocument();
+  });
+
+  describe('when nestedFolders is enabled', () => {
+    let originalToggles = { ...config.featureToggles };
+
+    beforeAll(() => {
+      config.featureToggles.nestedFolders = true;
+    });
+
+    afterAll(() => {
+      config.featureToggles = originalToggles;
+    });
+
+    it('can expand and collapse a folder to show its children', async () => {
+      render(<NestedFolderPicker permission={PermissionLevelString.View} onChange={mockOnChange} />);
+
+      // Open the picker and wait for children to load
+      const button = await screen.findByRole('button', { name: 'Select folder' });
+      await userEvent.click(button);
+      await screen.findByLabelText(folderA.item.title);
+
+      // Expand Folder A
+      // Note: we need to use mouseDown here because userEvent's click event doesn't get prevented correctly
+      fireEvent.mouseDown(screen.getByRole('button', { name: `Expand folder ${folderA.item.title}` }));
+
+      // Folder A's children are visible
+      expect(await screen.findByLabelText(folderA_folderA.item.title)).toBeInTheDocument();
+      expect(await screen.findByLabelText(folderA_folderB.item.title)).toBeInTheDocument();
+
+      // Collapse Folder A
+      // Note: we need to use mouseDown here because userEvent's click event doesn't get prevented correctly
+      fireEvent.mouseDown(screen.getByRole('button', { name: `Collapse folder ${folderA.item.title}` }));
+      expect(screen.queryByLabelText(folderA_folderA.item.title)).not.toBeInTheDocument();
+      expect(screen.queryByLabelText(folderA_folderB.item.title)).not.toBeInTheDocument();
+
+      // Expand Folder A again
+      // Note: we need to use mouseDown here because userEvent's click event doesn't get prevented correctly
+      fireEvent.mouseDown(screen.getByRole('button', { name: `Expand folder ${folderA.item.title}` }));
+
+      // Select the first child
+      await userEvent.click(screen.getByLabelText(folderA_folderA.item.title));
+      expect(mockOnChange).toHaveBeenCalledWith(folderA_folderA.item.uid, folderA_folderA.item.title);
+    });
+
+    it('can expand and collapse a folder to show its children with the keyboard', async () => {
+      render(<NestedFolderPicker permission={PermissionLevelString.View} onChange={mockOnChange} />);
+      const button = await screen.findByRole('button', { name: 'Select folder' });
+
+      await userEvent.click(button);
+
+      // Expand Folder A
+      await userEvent.keyboard('{ArrowDown}{ArrowDown}{ArrowRight}');
+
+      // Folder A's children are visible
+      expect(screen.getByLabelText(folderA_folderA.item.title)).toBeInTheDocument();
+      expect(screen.getByLabelText(folderA_folderB.item.title)).toBeInTheDocument();
+
+      // Collapse Folder A
+      await userEvent.keyboard('{ArrowLeft}');
+      expect(screen.queryByLabelText(folderA_folderA.item.title)).not.toBeInTheDocument();
+      expect(screen.queryByLabelText(folderA_folderB.item.title)).not.toBeInTheDocument();
+
+      // Expand Folder A again
+      await userEvent.keyboard('{ArrowRight}');
+
+      // Select the first child
+      await userEvent.keyboard('{ArrowDown}{Enter}');
+      expect(mockOnChange).toHaveBeenCalledWith(folderA_folderA.item.uid, folderA_folderA.item.title);
+    });
+  });
+
+  describe('when nestedFolders is disabled', () => {
+    let originalToggles = { ...config.featureToggles };
+
+    beforeAll(() => {
+      config.featureToggles.nestedFolders = false;
+    });
+
+    afterAll(() => {
+      config.featureToggles = originalToggles;
+    });
+
+    it('does not show an expand button', async () => {
+      render(<NestedFolderPicker onChange={mockOnChange} />);
+
+      // Open the picker and wait for children to load
+      const button = await screen.findByRole('button', { name: 'Select folder' });
+      await userEvent.click(button);
+      await screen.findByLabelText(folderA.item.title);
 
-    // Expand Folder A
-    await userEvent.keyboard('{ArrowDown}{ArrowDown}{ArrowRight}');
+      // There should be no expand button
+      // Note: we need to use mouseDown here because userEvent's click event doesn't get prevented correctly
+      expect(screen.queryByRole('button', { name: `Expand folder ${folderA.item.title}` })).not.toBeInTheDocument();
+    });
 
-    // Folder A's children are visible
-    expect(screen.getByLabelText(folderA_folderA.item.title)).toBeInTheDocument();
-    expect(screen.getByLabelText(folderA_folderB.item.title)).toBeInTheDocument();
+    it('does not expand a folder with the keyboard', async () => {
+      render(<NestedFolderPicker onChange={mockOnChange} />);
+      const button = await screen.findByRole('button', { name: 'Select folder' });
 
-    // Collapse Folder A
-    await userEvent.keyboard('{ArrowLeft}');
-    expect(screen.queryByLabelText(folderA_folderA.item.title)).not.toBeInTheDocument();
-    expect(screen.queryByLabelText(folderA_folderB.item.title)).not.toBeInTheDocument();
+      await userEvent.click(button);
 
-    // Expand Folder A again
-    await userEvent.keyboard('{ArrowRight}');
+      // try to expand Folder A
+      await userEvent.keyboard('{ArrowDown}{ArrowDown}{ArrowRight}');
 
-    // Select the first child
-    await userEvent.keyboard('{ArrowDown}{Enter}');
-    expect(mockOnChange).toHaveBeenCalledWith(folderA_folderA.item.uid, folderA_folderA.item.title);
+      // Folder A's children are not visible
+      expect(screen.queryByLabelText(folderA_folderA.item.title)).not.toBeInTheDocument();
+      expect(screen.queryByLabelText(folderA_folderB.item.title)).not.toBeInTheDocument();
+    });
   });
 });
diff --git a/public/app/core/components/NestedFolderPicker/NestedFolderPicker.tsx b/public/app/core/components/NestedFolderPicker/NestedFolderPicker.tsx
index baff647e306ab..e9ee8eb95743f 100644
--- a/public/app/core/components/NestedFolderPicker/NestedFolderPicker.tsx
+++ b/public/app/core/components/NestedFolderPicker/NestedFolderPicker.tsx
@@ -1,31 +1,23 @@
 import { css } from '@emotion/css';
-import React, { useCallback, useId, useMemo, useState } from 'react';
-import { usePopperTooltip } from 'react-popper-tooltip';
-import { useAsync } from 'react-use';
+import { autoUpdate, flip, useClick, useDismiss, useFloating, useInteractions } from '@floating-ui/react';
+import debounce from 'debounce-promise';
+import React, { useCallback, useEffect, useId, useMemo, useRef, useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
+import { config } from '@grafana/runtime';
 import { Alert, Icon, Input, LoadingBar, useStyles2 } from '@grafana/ui';
 import { t } from 'app/core/internationalization';
 import { skipToken, useGetFolderQuery } from 'app/features/browse-dashboards/api/browseDashboardsAPI';
-import { PAGE_SIZE } from 'app/features/browse-dashboards/api/services';
-import {
-  childrenByParentUIDSelector,
-  createFlatTree,
-  fetchNextChildrenPage,
-  rootItemsSelector,
-  useBrowseLoadingStatus,
-  useLoadNextChildrenPage,
-} from 'app/features/browse-dashboards/state';
-import { getPaginationPlaceholders } from 'app/features/browse-dashboards/state/utils';
-import { DashboardViewItemCollection } from 'app/features/browse-dashboards/types';
-import { getGrafanaSearcher } from 'app/features/search/service';
+import { DashboardViewItemWithUIItems, DashboardsTreeItem } from 'app/features/browse-dashboards/types';
+import { QueryResponse, getGrafanaSearcher } from 'app/features/search/service';
 import { queryResultToViewItem } from 'app/features/search/service/utils';
 import { DashboardViewItem } from 'app/features/search/types';
-import { useDispatch, useSelector } from 'app/types/store';
+import { PermissionLevelString } from 'app/types';
 
 import { getDOMId, NestedFolderList } from './NestedFolderList';
 import Trigger from './Trigger';
-import { useTreeInteractions } from './hooks';
+import { ROOT_FOLDER_ITEM, useFoldersQuery } from './useFoldersQuery';
+import { useTreeInteractions } from './useTreeInteractions';
 
 export interface NestedFolderPickerProps {
   /* Folder UID to show as selected */
@@ -40,58 +32,97 @@ export interface NestedFolderPickerProps {
   /* Folder UIDs to exclude from the picker, to prevent invalid operations */
   excludeUIDs?: string[];
 
+  /* Show folders matching this permission, mainly used to also show folders user can view. Defaults to showing only folders user has Edit  */
+  permission?: PermissionLevelString.View | PermissionLevelString.Edit;
+
   /* Callback for when the user selects a folder */
-  onChange?: (folderUID: string, folderName: string) => void;
+  onChange?: (folderUID: string | undefined, folderName: string | undefined) => void;
+
+  /* Whether the picker should be clearable */
+  clearable?: boolean;
 }
 
-const EXCLUDED_KINDS = ['empty-folder' as const, 'dashboard' as const];
+const debouncedSearch = debounce(getSearchResults, 300);
+
+async function getSearchResults(searchQuery: string, permission?: PermissionLevelString) {
+  const queryResponse = await getGrafanaSearcher().search({
+    query: searchQuery,
+    kind: ['folder'],
+    limit: 100,
+    permission: permission,
+  });
+
+  const items = queryResponse.view.map((v) => queryResultToViewItem(v, queryResponse.view));
+  return { ...queryResponse, items };
+}
 
 export function NestedFolderPicker({
   value,
   invalid,
   showRootFolder = true,
+  clearable = false,
   excludeUIDs,
+  permission = PermissionLevelString.Edit,
   onChange,
 }: NestedFolderPickerProps) {
   const styles = useStyles2(getStyles);
-  const dispatch = useDispatch();
   const selectedFolder = useGetFolderQuery(value || skipToken);
 
-  const rootStatus = useBrowseLoadingStatus(undefined);
+  const nestedFoldersEnabled = Boolean(config.featureToggles.nestedFolders);
 
   const [search, setSearch] = useState('');
+  const [searchResults, setSearchResults] = useState<(QueryResponse & { items: DashboardViewItem[] }) | null>(null);
+  const [isFetchingSearchResults, setIsFetchingSearchResults] = useState(false);
   const [autoFocusButton, setAutoFocusButton] = useState(false);
   const [overlayOpen, setOverlayOpen] = useState(false);
-  const [folderOpenState, setFolderOpenState] = useState<Record<string, boolean>>({});
+  const [foldersOpenState, setFoldersOpenState] = useState<Record<string, boolean>>({});
   const overlayId = useId();
   const [error] = useState<Error | undefined>(undefined); // TODO: error not populated anymore
+  const lastSearchTimestamp = useRef<number>(0);
+
+  const isBrowsing = Boolean(overlayOpen && !(search && searchResults));
+  const {
+    items: browseFlatTree,
+    isLoading: isBrowseLoading,
+    requestNextPage: fetchFolderPage,
+  } = useFoldersQuery(isBrowsing, foldersOpenState, permission);
 
-  const searchState = useAsync(async () => {
+  useEffect(() => {
     if (!search) {
-      return undefined;
+      setSearchResults(null);
+      return;
     }
-    const searcher = getGrafanaSearcher();
-    const queryResponse = await searcher.search({
-      query: search,
-      kind: ['folder'],
-      limit: 100,
-    });
-
-    const items = queryResponse.view.map((v) => queryResultToViewItem(v, queryResponse.view));
 
-    return { ...queryResponse, items };
-  }, [search]);
-
-  const rootCollection = useSelector(rootItemsSelector);
-  const childrenCollections = useSelector(childrenByParentUIDSelector);
+    const timestamp = Date.now();
+    setIsFetchingSearchResults(true);
+
+    debouncedSearch(search, permission).then((queryResponse) => {
+      // Only keep the results if it's was issued after the most recently resolved search.
+      // This prevents results showing out of order if first request is slower than later ones.
+      // We don't need to worry about clearing the isFetching state either - if there's a later
+      // request in progress, this will clear it for us
+      if (timestamp > lastSearchTimestamp.current) {
+        const items = queryResponse.view.map((v) => queryResultToViewItem(v, queryResponse.view));
+        setSearchResults({ ...queryResponse, items });
+        setIsFetchingSearchResults(false);
+        lastSearchTimestamp.current = timestamp;
+      }
+    });
+  }, [search, permission]);
+
+  // the order of middleware is important!
+  const middleware = [
+    flip({
+      // see https://floating-ui.com/docs/flip#combining-with-shift
+      crossAxis: false,
+      boundary: document.body,
+    }),
+  ];
 
-  const { getTooltipProps, setTooltipRef, setTriggerRef, visible, triggerRef } = usePopperTooltip({
-    visible: overlayOpen,
+  const { context, refs, floatingStyles, elements } = useFloating({
+    open: overlayOpen,
     placement: 'bottom',
-    interactive: true,
-    offset: [0, 0],
-    trigger: 'click',
-    onVisibleChange: (value: boolean) => {
+    onOpenChange: (value) => {
       // ensure state is clean on opening the overlay
       if (value) {
         setSearch('');
@@ -99,17 +130,24 @@ export function NestedFolderPicker({
       }
       setOverlayOpen(value);
     },
+    middleware,
+    whileElementsMounted: autoUpdate,
   });
 
+  const click = useClick(context);
+  const dismiss = useDismiss(context);
+
+  const { getReferenceProps, getFloatingProps } = useInteractions([dismiss, click]);
+
   const handleFolderExpand = useCallback(
     async (uid: string, newOpenState: boolean) => {
-      setFolderOpenState((old) => ({ ...old, [uid]: newOpenState }));
+      setFoldersOpenState((old) => ({ ...old, [uid]: newOpenState }));
 
-      if (newOpenState && !folderOpenState[uid]) {
-        dispatch(fetchNextChildrenPage({ parentUID: uid, pageSize: PAGE_SIZE, excludeKinds: EXCLUDED_KINDS }));
+      if (newOpenState && !foldersOpenState[uid]) {
+        fetchFolderPage(uid);
       }
     },
-    [dispatch, folderOpenState]
+    [fetchFolderPage, foldersOpenState]
   );
 
   const handleFolderSelect = useCallback(
@@ -122,69 +160,66 @@ export function NestedFolderPicker({
     [onChange]
   );
 
+  const handleClearSelection = useCallback(
+    (event: React.MouseEvent<SVGElement> | React.KeyboardEvent<SVGElement>) => {
+      event.preventDefault();
+      event.stopPropagation();
+      if (onChange) {
+        onChange(undefined, undefined);
+      }
+    },
+    [onChange]
+  );
+
   const handleCloseOverlay = useCallback(() => setOverlayOpen(false), [setOverlayOpen]);
 
-  const baseHandleLoadMore = useLoadNextChildrenPage(EXCLUDED_KINDS);
   const handleLoadMore = useCallback(
     (folderUID: string | undefined) => {
       if (search) {
         return;
       }
 
-      baseHandleLoadMore(folderUID);
+      fetchFolderPage(folderUID);
     },
-    [search, baseHandleLoadMore]
+    [search, fetchFolderPage]
   );
 
   const flatTree = useMemo(() => {
-    const searchResults = search && searchState.value;
-
-    if (searchResults) {
-      const searchCollection: DashboardViewItemCollection = {
-        isFullyLoaded: true, //searchResults.items.length === searchResults.totalRows,
-        lastKindHasMoreItems: false, // TODO: paginate search
-        lastFetchedKind: 'folder', // TODO: paginate search
-        lastFetchedPage: 1, // TODO: paginate search
-        items: searchResults.items ?? [],
-      };
-
-      return createFlatTree(undefined, searchCollection, childrenCollections, {}, 0, EXCLUDED_KINDS, excludeUIDs);
+    let flatTree: Array<DashboardsTreeItem<DashboardViewItemWithUIItems>> = [];
+
+    if (isBrowsing) {
+      flatTree = browseFlatTree;
+    } else {
+      flatTree =
+        searchResults?.items.map((item) => ({
+          isOpen: false,
+          level: 0,
+          item: {
+            kind: 'folder' as const,
+            title: item.title,
+            uid: item.uid,
+          },
+        })) ?? [];
     }
 
-    let flatTree = createFlatTree(
-      undefined,
-      rootCollection,
-      childrenCollections,
-      folderOpenState,
-      0,
-      EXCLUDED_KINDS,
-      excludeUIDs
-    );
+    // It's not super optimal to filter these in an additional iteration, but
+    // these options are used infrequently that its not a big deal
+    if (!showRootFolder || excludeUIDs?.length) {
+      flatTree = flatTree.filter((item) => {
+        if (!showRootFolder && item === ROOT_FOLDER_ITEM) {
+          return false;
+        }
 
-    if (showRootFolder) {
-      // Increase the level of each item to 'make way' for the fake root Dashboards item
-      for (const item of flatTree) {
-        item.level += 1;
-      }
+        if (excludeUIDs?.includes(item.item.uid)) {
+          return false;
+        }
 
-      flatTree.unshift({
-        isOpen: true,
-        level: 0,
-        item: {
-          kind: 'folder',
-          title: 'Dashboards',
-          uid: '',
-        },
+        return true;
       });
     }
 
-    // If the root collection hasn't loaded yet, create loading placeholders
-    if (!rootCollection) {
-      flatTree = flatTree.concat(getPaginationPlaceholders(PAGE_SIZE, undefined, 0));
-    }
-
     return flatTree;
-  }, [search, searchState.value, rootCollection, childrenCollections, folderOpenState, excludeUIDs, showRootFolder]);
+  }, [browseFlatTree, excludeUIDs, isBrowsing, searchResults?.items, showRootFolder]);
 
   const isItemLoaded = useCallback(
     (itemIndex: number) => {
@@ -192,6 +227,7 @@ export function NestedFolderPicker({
       if (!treeItem) {
         return false;
       }
+
       const item = treeItem.item;
       const result = !(item.kind === 'ui' && item.uiKind === 'pagination-placeholder');
 
@@ -200,7 +236,7 @@ export function NestedFolderPicker({
     [flatTree]
   );
 
-  const isLoading = rootStatus === 'pending' || searchState.loading;
+  const isLoading = isBrowseLoading || isFetchingSearchResults;
 
   const { focusedItemIndex, handleKeyDown } = useTreeInteractions({
     tree: flatTree,
@@ -209,7 +245,7 @@ export function NestedFolderPicker({
     handleFolderExpand,
     idPrefix: overlayId,
     search,
-    visible,
+    visible: overlayOpen,
   });
 
   let label = selectedFolder.data?.title;
@@ -217,14 +253,15 @@ export function NestedFolderPicker({
     label = 'Dashboards';
   }
 
-  if (!visible) {
+  if (!overlayOpen) {
     return (
       <Trigger
         label={label}
+        handleClearSelection={clearable && value !== undefined ? handleClearSelection : undefined}
         invalid={invalid}
         isLoading={selectedFolder.isLoading}
         autoFocus={autoFocusButton}
-        ref={setTriggerRef}
+        ref={refs.setReference}
         aria-label={
           label
             ? t('browse-dashboards.folder-picker.accessible-label', 'Select folder: {{ label }} currently selected', {
@@ -232,6 +269,7 @@ export function NestedFolderPicker({
               })
             : undefined
         }
+        {...getReferenceProps()}
       />
     );
   }
@@ -239,14 +277,13 @@ export function NestedFolderPicker({
   return (
     <>
       <Input
-        ref={setTriggerRef}
+        ref={refs.setReference}
         autoFocus
         prefix={label ? <Icon name="folder" /> : null}
         placeholder={label ?? t('browse-dashboards.folder-picker.search-placeholder', 'Search folders')}
         value={search}
         invalid={invalid}
         className={styles.search}
-        onKeyDown={handleKeyDown}
         onChange={(e) => setSearch(e.currentTarget.value)}
         aria-autocomplete="list"
         aria-expanded
@@ -256,16 +293,18 @@ export function NestedFolderPicker({
         aria-activedescendant={getDOMId(overlayId, flatTree[focusedItemIndex]?.item.uid)}
         role="combobox"
         suffix={<Icon name="search" />}
+        {...getReferenceProps()}
+        onKeyDown={handleKeyDown}
       />
       <fieldset
-        ref={setTooltipRef}
+        ref={refs.setFloating}
         id={overlayId}
-        {...getTooltipProps({
-          className: styles.tableWrapper,
-          style: {
-            width: triggerRef?.clientWidth,
-          },
-        })}
+        className={styles.tableWrapper}
+        style={{
+          ...floatingStyles,
+          width: elements.domReference?.clientWidth,
+        }}
+        {...getFloatingProps()}
       >
         {error ? (
           <Alert
@@ -290,7 +329,7 @@ export function NestedFolderPicker({
               onFolderExpand={handleFolderExpand}
               onFolderSelect={handleFolderSelect}
               idPrefix={overlayId}
-              foldersAreOpenable={!(search && searchState.value)}
+              foldersAreOpenable={nestedFoldersEnabled && !(search && searchResults)}
               isItemLoaded={isItemLoaded}
               requestLoadMore={handleLoadMore}
             />
diff --git a/public/app/core/components/NestedFolderPicker/Trigger.tsx b/public/app/core/components/NestedFolderPicker/Trigger.tsx
index f1ed9974d9cd4..8b25bd9b32fee 100644
--- a/public/app/core/components/NestedFolderPicker/Trigger.tsx
+++ b/public/app/core/components/NestedFolderPicker/Trigger.tsx
@@ -4,19 +4,29 @@ import Skeleton from 'react-loading-skeleton';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { Icon, getInputStyles, useTheme2, Text } from '@grafana/ui';
-import { focusCss } from '@grafana/ui/src/themes/mixins';
-import { Trans } from 'app/core/internationalization';
+import { focusCss, getFocusStyles, getMouseFocusStyles } from '@grafana/ui/src/themes/mixins';
+import { Trans, t } from 'app/core/internationalization';
 
 interface TriggerProps extends ButtonHTMLAttributes<HTMLButtonElement> {
   isLoading: boolean;
+  handleClearSelection?: (event: React.MouseEvent<SVGElement> | React.KeyboardEvent<SVGElement>) => void;
   invalid?: boolean;
   label?: ReactNode;
 }
 
-function Trigger({ isLoading, invalid, label, ...rest }: TriggerProps, ref: React.ForwardedRef<HTMLButtonElement>) {
+function Trigger(
+  { handleClearSelection, isLoading, invalid, label, ...rest }: TriggerProps,
+  ref: React.ForwardedRef<HTMLButtonElement>
+) {
   const theme = useTheme2();
   const styles = getStyles(theme, invalid);
 
+  const handleKeyDown = (event: React.KeyboardEvent<SVGElement>) => {
+    if (event.key === 'Enter' || event.key === ' ') {
+      handleClearSelection?.(event);
+    }
+  };
+
   return (
     <div className={styles.wrapper}>
       <div className={styles.inputWrapper}>
@@ -41,6 +51,18 @@ function Trigger({ isLoading, invalid, label, ...rest }: TriggerProps, ref: Reac
               <Trans i18nKey="browse-dashboards.folder-picker.button-label">Select folder</Trans>
             </Text>
           )}
+
+          {!isLoading && handleClearSelection && (
+            <Icon
+              role="button"
+              tabIndex={0}
+              aria-label={t('browse-dashboards.folder-picker.clear-selection', 'Clear selection')}
+              className={styles.clearIcon}
+              name="times"
+              onClick={handleClearSelection}
+              onKeyDown={handleKeyDown}
+            />
+          )}
         </button>
 
         <div className={styles.suffix}>
@@ -92,11 +114,26 @@ const getStyles = (theme: GrafanaTheme2, invalid = false) => {
         '&:focus-visible': css`
           ${focusCss(theme)}
         `,
+        alignItems: 'center',
+        display: 'flex',
+        flexWrap: 'nowrap',
+        justifyContent: 'space-between',
+        paddingRight: 28,
       },
     ]),
 
     hasPrefix: css({
       paddingLeft: 28,
     }),
+
+    clearIcon: css({
+      color: theme.colors.text.secondary,
+      cursor: 'pointer',
+      '&:hover': {
+        color: theme.colors.text.primary,
+      },
+      '&:focus:not(:focus-visible)': getMouseFocusStyles(theme),
+      '&:focus-visible': getFocusStyles(theme),
+    }),
   };
 };
diff --git a/public/app/core/components/NestedFolderPicker/hooks.ts b/public/app/core/components/NestedFolderPicker/hooks.ts
deleted file mode 100644
index 29a76e8c28f36..0000000000000
--- a/public/app/core/components/NestedFolderPicker/hooks.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import React, { useCallback, useEffect, useState } from 'react';
-
-import { DashboardsTreeItem } from 'app/features/browse-dashboards/types';
-import { DashboardViewItem } from 'app/features/search/types';
-
-import { getDOMId } from './NestedFolderList';
-
-interface TreeInteractionProps {
-  tree: DashboardsTreeItem[];
-  handleCloseOverlay: () => void;
-  handleFolderSelect: (item: DashboardViewItem) => void;
-  handleFolderExpand: (uid: string, newOpenState: boolean) => Promise<void>;
-  idPrefix: string;
-  search: string;
-  visible: boolean;
-}
-
-export function useTreeInteractions({
-  tree,
-  handleCloseOverlay,
-  handleFolderSelect,
-  handleFolderExpand,
-  idPrefix,
-  search,
-  visible,
-}: TreeInteractionProps) {
-  const [focusedItemIndex, setFocusedItemIndex] = useState(-1);
-
-  useEffect(() => {
-    if (visible) {
-      setFocusedItemIndex(-1);
-    }
-  }, [visible]);
-
-  useEffect(() => {
-    setFocusedItemIndex(0);
-  }, [search]);
-
-  useEffect(() => {
-    document
-      .getElementById(getDOMId(idPrefix, tree[focusedItemIndex]?.item.uid))
-      ?.scrollIntoView({ block: 'nearest', inline: 'nearest' });
-  }, [focusedItemIndex, idPrefix, tree]);
-
-  const handleKeyDown = useCallback(
-    (ev: React.KeyboardEvent<HTMLInputElement>) => {
-      const foldersAreOpenable = !search;
-      switch (ev.key) {
-        // Expand/collapse folder on right/left arrow keys
-        case 'ArrowRight':
-        case 'ArrowLeft':
-          if (foldersAreOpenable) {
-            ev.preventDefault();
-            handleFolderExpand(tree[focusedItemIndex].item.uid, ev.key === 'ArrowRight');
-          }
-          break;
-        case 'ArrowUp':
-          if (focusedItemIndex > 0) {
-            ev.preventDefault();
-            setFocusedItemIndex(focusedItemIndex - 1);
-          }
-          break;
-        case 'ArrowDown':
-          if (focusedItemIndex < tree.length - 1) {
-            ev.preventDefault();
-            setFocusedItemIndex(focusedItemIndex + 1);
-          }
-          break;
-        case 'Enter':
-          ev.preventDefault();
-          const item = tree[focusedItemIndex].item;
-          if (item.kind === 'folder') {
-            handleFolderSelect(item);
-          }
-          break;
-        case 'Tab':
-          ev.stopPropagation();
-          handleCloseOverlay();
-          break;
-        case 'Escape':
-          ev.stopPropagation();
-          ev.preventDefault();
-          handleCloseOverlay();
-          break;
-      }
-    },
-    [focusedItemIndex, handleCloseOverlay, handleFolderExpand, handleFolderSelect, search, tree]
-  );
-
-  return {
-    focusedItemIndex,
-    handleKeyDown,
-  };
-}
diff --git a/public/app/core/components/NestedFolderPicker/useFoldersQuery.ts b/public/app/core/components/NestedFolderPicker/useFoldersQuery.ts
new file mode 100644
index 0000000000000..6a89b5e1be9b0
--- /dev/null
+++ b/public/app/core/components/NestedFolderPicker/useFoldersQuery.ts
@@ -0,0 +1,206 @@
+import { createSelector } from '@reduxjs/toolkit';
+import { QueryDefinition, BaseQueryFn } from '@reduxjs/toolkit/dist/query';
+import { QueryActionCreatorResult } from '@reduxjs/toolkit/dist/query/core/buildInitiate';
+import { RequestOptions } from 'http';
+import { useCallback, useEffect, useMemo, useRef } from 'react';
+
+import { ListFolderQueryArgs, browseDashboardsAPI } from 'app/features/browse-dashboards/api/browseDashboardsAPI';
+import { PAGE_SIZE } from 'app/features/browse-dashboards/api/services';
+import { getPaginationPlaceholders } from 'app/features/browse-dashboards/state/utils';
+import { DashboardViewItemWithUIItems, DashboardsTreeItem } from 'app/features/browse-dashboards/types';
+import { RootState } from 'app/store/configureStore';
+import { FolderListItemDTO, PermissionLevelString } from 'app/types';
+import { useDispatch, useSelector } from 'app/types/store';
+
+type ListFoldersQuery = ReturnType<ReturnType<typeof browseDashboardsAPI.endpoints.listFolders.select>>;
+type ListFoldersRequest = QueryActionCreatorResult<
+  QueryDefinition<
+    ListFolderQueryArgs,
+    BaseQueryFn<RequestOptions>,
+    'getFolder',
+    FolderListItemDTO[],
+    'browseDashboardsAPI'
+  >
+>;
+
+const listFoldersSelector = createSelector(
+  (state: RootState) => state,
+  (
+    state: RootState,
+    parentUid: ListFolderQueryArgs['parentUid'],
+    page: ListFolderQueryArgs['page'],
+    limit: ListFolderQueryArgs['limit'],
+    permission: ListFolderQueryArgs['permission']
+  ) => browseDashboardsAPI.endpoints.listFolders.select({ parentUid, page, limit, permission }),
+  (state, selectFolderList) => selectFolderList(state)
+);
+
+const listAllFoldersSelector = createSelector(
+  [(state: RootState) => state, (state: RootState, requests: ListFoldersRequest[]) => requests],
+  (state: RootState, requests: ListFoldersRequest[]) => {
+    const seenRequests = new Set<string>();
+
+    const rootPages: ListFoldersQuery[] = [];
+    const pagesByParent: Record<string, ListFoldersQuery[]> = {};
+    let isLoading = false;
+
+    for (const req of requests) {
+      if (seenRequests.has(req.requestId)) {
+        continue;
+      }
+
+      const page = listFoldersSelector(state, req.arg.parentUid, req.arg.page, req.arg.limit, req.arg.permission);
+      if (page.status === 'pending') {
+        isLoading = true;
+      }
+
+      const parentUid = page.originalArgs?.parentUid;
+      if (parentUid) {
+        if (!pagesByParent[parentUid]) {
+          pagesByParent[parentUid] = [];
+        }
+
+        pagesByParent[parentUid].push(page);
+      } else {
+        rootPages.push(page);
+      }
+    }
+
+    return {
+      isLoading,
+      rootPages,
+      pagesByParent,
+    };
+  }
+);
+
+/**
+ * Returns the whether the set of pages are 'fully loaded', and the last page number
+ */
+function getPagesLoadStatus(pages: ListFoldersQuery[]): [boolean, number | undefined] {
+  const lastPage = pages.at(-1);
+  const lastPageNumber = lastPage?.originalArgs?.page;
+
+  if (!lastPage?.data) {
+    // If there's no pages yet, or the last page is still loading
+    return [false, lastPageNumber];
+  } else {
+    return [lastPage.data.length < lastPage.originalArgs.limit, lastPageNumber];
+  }
+}
+
+/**
+ * Returns a loaded folder hierarchy as a flat list and a function to load more pages.
+ */
+export function useFoldersQuery(
+  isBrowsing: boolean,
+  openFolders: Record<string, boolean>,
+  permission?: PermissionLevelString
+) {
+  const dispatch = useDispatch();
+
+  // Keep a list of all requests so we can
+  //   a) unsubscribe from them when the component is unmounted
+  //   b) use them to select the responses out of the state
+  const requestsRef = useRef<ListFoldersRequest[]>([]);
+
+  const state = useSelector((rootState: RootState) => {
+    return listAllFoldersSelector(rootState, requestsRef.current);
+  });
+
+  // Loads the next page of folders for the given parent UID by inspecting the
+  // state to determine what the next page is
+  const requestNextPage = useCallback(
+    (parentUid: string | undefined) => {
+      const pages = parentUid ? state.pagesByParent[parentUid] : state.rootPages;
+      const [fullyLoaded, pageNumber] = getPagesLoadStatus(pages ?? []);
+      if (fullyLoaded) {
+        return;
+      }
+
+      const args = { parentUid, page: (pageNumber ?? 0) + 1, limit: PAGE_SIZE, permission };
+      const promise = dispatch(browseDashboardsAPI.endpoints.listFolders.initiate(args));
+
+      // It's important that we create a new array so we can correctly memoize with it
+      requestsRef.current = requestsRef.current.concat([promise]);
+    },
+    [state, dispatch, permission]
+  );
+
+  // Unsubscribe from all requests when the component is unmounted
+  useEffect(() => {
+    return () => {
+      for (const req of requestsRef.current) {
+        req.unsubscribe();
+      }
+    };
+  }, []);
+
+  // Convert the individual responses into a flat list of folders, with level indicating
+  // the depth in the hierarchy.
+  const treeList = useMemo(() => {
+    if (!isBrowsing) {
+      return [];
+    }
+
+    function createFlatList(
+      parentUid: string | undefined,
+      pages: ListFoldersQuery[],
+      level: number
+    ): Array<DashboardsTreeItem<DashboardViewItemWithUIItems>> {
+      const flatList = pages.flatMap((page) => {
+        const pageItems = page.data ?? [];
+
+        return pageItems.flatMap((item) => {
+          const folderIsOpen = openFolders[item.uid];
+
+          const flatItem: DashboardsTreeItem<DashboardViewItemWithUIItems> = {
+            isOpen: Boolean(folderIsOpen),
+            level: level,
+            item: {
+              kind: 'folder' as const,
+              title: item.title,
+              uid: item.uid,
+            },
+          };
+
+          const childPages = folderIsOpen && state.pagesByParent[item.uid];
+          if (childPages) {
+            const childFlatItems = createFlatList(item.uid, childPages, level + 1);
+            return [flatItem, ...childFlatItems];
+          }
+
+          return flatItem;
+        });
+      });
+
+      const [fullyLoaded] = getPagesLoadStatus(pages);
+      if (!fullyLoaded) {
+        flatList.push(...getPaginationPlaceholders(PAGE_SIZE, parentUid, level));
+      }
+
+      return flatList;
+    }
+
+    const rootFlatTree = createFlatList(undefined, state.rootPages, 1);
+    rootFlatTree.unshift(ROOT_FOLDER_ITEM);
+
+    return rootFlatTree;
+  }, [state, isBrowsing, openFolders]);
+
+  return {
+    items: treeList,
+    isLoading: state.isLoading,
+    requestNextPage,
+  };
+}
+
+export const ROOT_FOLDER_ITEM = {
+  isOpen: true,
+  level: 0,
+  item: {
+    kind: 'folder' as const,
+    title: 'Dashboards',
+    uid: '',
+  },
+};
diff --git a/public/app/core/components/NestedFolderPicker/useTreeInteractions.ts b/public/app/core/components/NestedFolderPicker/useTreeInteractions.ts
new file mode 100644
index 0000000000000..393d35320e5f7
--- /dev/null
+++ b/public/app/core/components/NestedFolderPicker/useTreeInteractions.ts
@@ -0,0 +1,96 @@
+import React, { useCallback, useEffect, useState } from 'react';
+
+import { config } from '@grafana/runtime';
+import { DashboardsTreeItem } from 'app/features/browse-dashboards/types';
+import { DashboardViewItem } from 'app/features/search/types';
+
+import { getDOMId } from './NestedFolderList';
+
+interface TreeInteractionProps {
+  tree: DashboardsTreeItem[];
+  handleCloseOverlay: () => void;
+  handleFolderSelect: (item: DashboardViewItem) => void;
+  handleFolderExpand: (uid: string, newOpenState: boolean) => Promise<void>;
+  idPrefix: string;
+  search: string;
+  visible: boolean;
+}
+
+export function useTreeInteractions({
+  tree,
+  handleCloseOverlay,
+  handleFolderSelect,
+  handleFolderExpand,
+  idPrefix,
+  search,
+  visible,
+}: TreeInteractionProps) {
+  const [focusedItemIndex, setFocusedItemIndex] = useState(-1);
+  const nestedFoldersEnabled = Boolean(config.featureToggles.nestedFolders);
+
+  useEffect(() => {
+    if (visible) {
+      setFocusedItemIndex(-1);
+    }
+  }, [visible]);
+
+  useEffect(() => {
+    setFocusedItemIndex(0);
+  }, [search]);
+
+  useEffect(() => {
+    document
+      .getElementById(getDOMId(idPrefix, tree[focusedItemIndex]?.item.uid))
+      ?.scrollIntoView({ block: 'nearest', inline: 'nearest' });
+  }, [focusedItemIndex, idPrefix, tree]);
+
+  const handleKeyDown = useCallback(
+    (ev: React.KeyboardEvent<HTMLInputElement>) => {
+      const foldersAreOpenable = nestedFoldersEnabled && !search;
+      switch (ev.key) {
+        // Expand/collapse folder on right/left arrow keys
+        case 'ArrowRight':
+        case 'ArrowLeft':
+          if (foldersAreOpenable) {
+            ev.preventDefault();
+            handleFolderExpand(tree[focusedItemIndex].item.uid, ev.key === 'ArrowRight');
+          }
+          break;
+        case 'ArrowUp':
+          if (focusedItemIndex > 0) {
+            ev.preventDefault();
+            setFocusedItemIndex(focusedItemIndex - 1);
+          }
+          break;
+        case 'ArrowDown':
+          if (focusedItemIndex < tree.length - 1) {
+            ev.preventDefault();
+            setFocusedItemIndex(focusedItemIndex + 1);
+          }
+          break;
+        case 'Enter':
+          ev.preventDefault();
+          const item = tree[focusedItemIndex].item;
+          if (item.kind === 'folder') {
+            handleFolderSelect(item);
+          }
+          break;
+        case 'Tab':
+          ev.stopPropagation();
+          handleCloseOverlay();
+          break;
+        case 'Escape':
+          ev.stopPropagation();
+          ev.preventDefault();
+          handleCloseOverlay();
+          break;
+      }
+    },
+    [focusedItemIndex, handleCloseOverlay, handleFolderExpand, handleFolderSelect, nestedFoldersEnabled, search, tree]
+  );
+
+  return {
+    focusedItemIndex,
+    handleKeyDown,
+  };
+}
diff --git a/public/app/core/components/OptionsUI/color.tsx b/public/app/core/components/OptionsUI/color.tsx
index c4c94b06a99ed..3916c9b6ed62e 100644
--- a/public/app/core/components/OptionsUI/color.tsx
+++ b/public/app/core/components/OptionsUI/color.tsx
@@ -71,30 +71,30 @@ export const ColorValueEditor = ({ value, settings, onChange, details }: Props)
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
-    spot: css`
-      cursor: pointer;
-      color: ${theme.colors.text};
-      background: ${theme.components.input.background};
-      padding: 3px;
-      height: ${theme.v1.spacing.formInputHeight}px;
-      border: 1px solid ${theme.components.input.borderColor};
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      align-content: flex-end;
-      &:hover {
-        border: 1px solid ${theme.components.input.borderHover};
-      }
-    `,
-    colorPicker: css`
-      padding: 0 ${theme.spacing(1)};
-    `,
-    colorText: css`
-      flex-grow: 2;
-    `,
-    placeholderText: css`
-      flex-grow: 2;
-      color: ${theme.colors.text.secondary};
-    `,
+    spot: css({
+      cursor: 'pointer',
+      color: theme.colors.text.primary,
+      background: theme.components.input.background,
+      padding: '3px',
+      height: theme.v1.spacing.formInputHeight,
+      border: `1px solid ${theme.components.input.borderColor}`,
+      display: 'flex',
+      flexDirection: 'row',
+      alignItems: 'center',
+      alignContent: 'flex-end',
+      '&:hover': {
+        border: `1px solid ${theme.components.input.borderHover}`,
+      },
+    }),
+    colorPicker: css({
+      padding: `0 ${theme.spacing(1)}`,
+    }),
+    colorText: css({
+      flexGrow: 2,
+    }),
+    placeholderText: css({
+      flexGrow: 2,
+      color: theme.colors.text.secondary,
+    }),
   };
 };
diff --git a/public/app/core/components/OptionsUI/fieldColor.test.tsx b/public/app/core/components/OptionsUI/fieldColor.test.tsx
new file mode 100644
index 0000000000000..316679ab359cf
--- /dev/null
+++ b/public/app/core/components/OptionsUI/fieldColor.test.tsx
@@ -0,0 +1,54 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { FieldColorEditor } from './fieldColor';
+
+const testRegistryItems = [
+  {
+    id: 'foo',
+    name: 'Foo',
+    description: 'This option will appear in the picker',
+    getCalculator: () => 'red',
+  },
+  {
+    id: 'bar',
+    name: 'Bar',
+    description: 'This option will also appear in the picker',
+    getCalculator: () => 'green',
+  },
+  {
+    id: 'baz',
+    name: 'Baz',
+    description: 'This option will not appear in the picker',
+    getCalculator: () => 'blue',
+    excludeFromPicker: true,
+  },
+];
+
+jest.mock('@grafana/data', () => {
+  const actualData = jest.requireActual('@grafana/data');
+  return {
+    ...actualData,
+    fieldColorModeRegistry: new actualData.Registry(() => testRegistryItems),
+  };
+});
+
+describe('fieldColor', () => {
+  it('filters out registry options with excludeFromPicker=true', async () => {
+    render(
+      <FieldColorEditor
+        value={undefined}
+        onChange={() => {}}
+        id="test"
+        data-testid="test"
+        context={{ data: [] }}
+        item={testRegistryItems[0]}
+      />
+    );
+    await userEvent.type(screen.getByRole('combobox'), '{arrowdown}');
+    expect(screen.getByText(/^Foo/i)).toBeInTheDocument();
+    expect(screen.getByText(/^Bar/i)).toBeInTheDocument();
+    expect(screen.queryByText(/^Baz/i)).not.toBeInTheDocument();
+  });
+});
diff --git a/public/app/core/components/OptionsUI/fieldColor.tsx b/public/app/core/components/OptionsUI/fieldColor.tsx
index 3576efc7d0eb7..77e67d73d115b 100644
--- a/public/app/core/components/OptionsUI/fieldColor.tsx
+++ b/public/app/core/components/OptionsUI/fieldColor.tsx
@@ -2,7 +2,7 @@ import { css } from '@emotion/css';
 import React, { CSSProperties, FC } from 'react';
 
 import {
-  FieldConfigEditorProps,
+  StandardEditorProps,
   FieldColorModeId,
   SelectableValue,
   FieldColor,
@@ -17,7 +17,7 @@ import { useStyles2, useTheme2, Field, RadioButtonGroup, Select } from '@grafana
 
 import { ColorValueEditor } from './color';
 
-type Props = FieldConfigEditorProps<FieldColor | undefined, FieldColorConfigSettings>;
+type Props = StandardEditorProps<FieldColor | undefined, FieldColorConfigSettings>;
 
 export const FieldColorEditor = ({ value, onChange, item, id }: Props) => {
   const theme = useTheme2();
@@ -28,20 +28,22 @@ export const FieldColorEditor = ({ value, onChange, item, id }: Props) => {
     ? fieldColorModeRegistry.list()
     : fieldColorModeRegistry.list().filter((m) => !m.isByValue);
 
-  const options = availableOptions.map((mode) => {
-    let suffix = mode.isByValue ? ' (by value)' : '';
-
-    return {
-      value: mode.id,
-      label: `${mode.name}${suffix}`,
-      description: mode.description,
-      isContinuous: mode.isContinuous,
-      isByValue: mode.isByValue,
-      component() {
-        return <FieldColorModeViz mode={mode} theme={theme} />;
-      },
-    };
-  });
+  const options = availableOptions
+    .filter((mode) => !mode.excludeFromPicker)
+    .map((mode) => {
+      let suffix = mode.isByValue ? ' (by value)' : '';
+
+      return {
+        value: mode.id,
+        label: `${mode.name}${suffix}`,
+        description: mode.description,
+        isContinuous: mode.isContinuous,
+        isByValue: mode.isByValue,
+        component() {
+          return <FieldColorModeViz mode={mode} theme={theme} />;
+        },
+      };
+    });
 
   const onModeChange = (newMode: SelectableValue<string>) => {
     onChange({
@@ -150,12 +152,12 @@ const FieldColorModeViz: FC<ModeProps> = ({ mode, theme }) => {
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
-    group: css`
-      display: flex;
-    `,
-    select: css`
-      margin-right: 8px;
-      flex-grow: 1;
-    `,
+    group: css({
+      display: 'flex',
+    }),
+    select: css({
+      marginRight: theme.spacing(1),
+      flexGrow: 1,
+    }),
   };
 };
diff --git a/public/app/core/components/OptionsUI/links.tsx b/public/app/core/components/OptionsUI/links.tsx
index fe5baf07a0b5f..31aa70e266a53 100644
--- a/public/app/core/components/OptionsUI/links.tsx
+++ b/public/app/core/components/OptionsUI/links.tsx
@@ -1,14 +1,9 @@
 import React from 'react';
 
-import {
-  DataLink,
-  DataLinksFieldConfigSettings,
-  FieldConfigEditorProps,
-  VariableSuggestionsScope,
-} from '@grafana/data';
+import { DataLink, DataLinksFieldConfigSettings, StandardEditorProps, VariableSuggestionsScope } from '@grafana/data';
 import { DataLinksInlineEditor } from '@grafana/ui';
 
-type Props = FieldConfigEditorProps<DataLink[], DataLinksFieldConfigSettings>;
+type Props = StandardEditorProps<DataLink[], DataLinksFieldConfigSettings>;
 
 export const DataLinksValueEditor = ({ value, onChange, context }: Props) => {
   return (
diff --git a/public/app/core/components/OptionsUI/multiSelect.tsx b/public/app/core/components/OptionsUI/multiSelect.tsx
index 80f30019e65a2..9550e352f4f3e 100644
--- a/public/app/core/components/OptionsUI/multiSelect.tsx
+++ b/public/app/core/components/OptionsUI/multiSelect.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { FieldConfigEditorProps, SelectFieldConfigSettings, SelectableValue } from '@grafana/data';
+import { StandardEditorProps, SelectFieldConfigSettings, SelectableValue } from '@grafana/data';
 import { MultiSelect } from '@grafana/ui';
 
 interface State<T> {
@@ -8,7 +8,7 @@ interface State<T> {
   options: Array<SelectableValue<T>>;
 }
 
-type Props<T> = FieldConfigEditorProps<T[], SelectFieldConfigSettings<T>>;
+type Props<T> = StandardEditorProps<T[], SelectFieldConfigSettings<T>>;
 
 /**
  * MultiSelect for options UI
diff --git a/public/app/core/components/OptionsUI/number.tsx b/public/app/core/components/OptionsUI/number.tsx
index 7f5e6366dc56d..ff57e1e0c1e11 100644
--- a/public/app/core/components/OptionsUI/number.tsx
+++ b/public/app/core/components/OptionsUI/number.tsx
@@ -1,10 +1,10 @@
 import React, { useCallback } from 'react';
 
-import { FieldConfigEditorProps, NumberFieldConfigSettings } from '@grafana/data';
+import { StandardEditorProps, NumberFieldConfigSettings } from '@grafana/data';
 
 import { NumberInput } from './NumberInput';
 
-type Props = FieldConfigEditorProps<number, NumberFieldConfigSettings>;
+type Props = StandardEditorProps<number, NumberFieldConfigSettings>;
 
 export const NumberValueEditor = ({ value, onChange, item }: Props) => {
   const { settings } = item;
diff --git a/public/app/core/components/OptionsUI/registry.tsx b/public/app/core/components/OptionsUI/registry.tsx
index 2a3f6c65f4d82..dfe87a7943684 100644
--- a/public/app/core/components/OptionsUI/registry.tsx
+++ b/public/app/core/components/OptionsUI/registry.tsx
@@ -55,14 +55,14 @@ export const getAllOptionEditors = () => {
     id: 'number',
     name: 'Number',
     description: 'Allows numeric values input',
-    editor: NumberValueEditor as any,
+    editor: NumberValueEditor,
   };
 
   const slider: StandardEditorsRegistryItem<number> = {
     id: 'slider',
     name: 'Slider',
     description: 'Allows numeric values input',
-    editor: SliderValueEditor as any,
+    editor: SliderValueEditor,
   };
 
   const text: StandardEditorsRegistryItem<string> = {
@@ -76,7 +76,7 @@ export const getAllOptionEditors = () => {
     id: 'strings',
     name: 'String array',
     description: 'An array of strings',
-    editor: StringArrayEditor as any,
+    editor: StringArrayEditor,
   };
 
   const boolean: StandardEditorsRegistryItem<boolean> = {
@@ -93,14 +93,14 @@ export const getAllOptionEditors = () => {
     id: 'select',
     name: 'Select',
     description: 'Allows option selection',
-    editor: SelectValueEditor as any,
+    editor: SelectValueEditor,
   };
 
   const multiSelect: StandardEditorsRegistryItem = {
     id: 'multi-select',
     name: 'Multi select',
     description: 'Allows for multiple option selection',
-    editor: MultiSelectValueEditor as any,
+    editor: MultiSelectValueEditor,
   };
 
   const radio: StandardEditorsRegistryItem = {
@@ -116,7 +116,7 @@ export const getAllOptionEditors = () => {
     id: 'unit',
     name: 'Unit',
     description: 'Allows unit input',
-    editor: UnitValueEditor as any,
+    editor: UnitValueEditor,
   };
 
   const color: StandardEditorsRegistryItem<string, ColorValueEditorSettings> = {
@@ -130,24 +130,24 @@ export const getAllOptionEditors = () => {
     },
   };
 
-  const fieldColor: StandardEditorsRegistryItem<FieldColor> = {
+  const fieldColor: StandardEditorsRegistryItem<FieldColor | undefined> = {
     id: 'fieldColor',
     name: 'Field Color',
     description: 'Field color selection',
-    editor: FieldColorEditor as any,
+    editor: FieldColorEditor,
   };
 
   const links: StandardEditorsRegistryItem<DataLink[]> = {
     id: 'links',
     name: 'Links',
     description: 'Allows defining data links',
-    editor: DataLinksValueEditor as any,
+    editor: DataLinksValueEditor,
   };
 
   const statsPicker: StandardEditorsRegistryItem<string[], StatsPickerConfigSettings> = {
     id: 'stats-picker',
     name: 'Stats Picker',
-    editor: StatsPickerEditor as any,
+    editor: StatsPickerEditor,
     description: '',
   };
 
@@ -183,7 +183,7 @@ export const getAllOptionEditors = () => {
     id: 'thresholds',
     name: 'Thresholds',
     description: 'Allows defining thresholds',
-    editor: ThresholdsValueEditor as any,
+    editor: ThresholdsValueEditor,
   };
 
   return [
@@ -218,8 +218,8 @@ export const getAllStandardFieldConfigs = () => {
     path: 'displayName',
     name: 'Display name',
     description: 'Change the field or series name',
-    editor: standardEditorsRegistry.get('text').editor as any,
-    override: standardEditorsRegistry.get('text').editor as any,
+    editor: standardEditorsRegistry.get('text').editor,
+    override: standardEditorsRegistry.get('text').editor,
     process: displayNameOverrideProcessor,
     settings: {
       placeholder: 'none',
@@ -235,8 +235,8 @@ export const getAllStandardFieldConfigs = () => {
     name: 'Unit',
     description: '',
 
-    editor: standardEditorsRegistry.get('unit').editor as any,
-    override: standardEditorsRegistry.get('unit').editor as any,
+    editor: standardEditorsRegistry.get('unit').editor,
+    override: standardEditorsRegistry.get('unit').editor,
     process: stringOverrideProcessor,
 
     settings: {
@@ -253,8 +253,8 @@ export const getAllStandardFieldConfigs = () => {
     name: 'Field min/max',
     description: 'Calculate min max per field',
 
-    editor: standardEditorsRegistry.get('boolean').editor as any,
-    override: standardEditorsRegistry.get('boolean').editor as any,
+    editor: standardEditorsRegistry.get('boolean').editor,
+    override: standardEditorsRegistry.get('boolean').editor,
     process: booleanOverrideProcessor,
 
     shouldApply: (field) => field.type === FieldType.number,
@@ -270,8 +270,8 @@ export const getAllStandardFieldConfigs = () => {
     name: 'Min',
     description: 'Leave empty to calculate based on all values',
 
-    editor: standardEditorsRegistry.get('number').editor as any,
-    override: standardEditorsRegistry.get('number').editor as any,
+    editor: standardEditorsRegistry.get('number').editor,
+    override: standardEditorsRegistry.get('number').editor,
     process: numberOverrideProcessor,
 
     settings: {
@@ -287,8 +287,8 @@ export const getAllStandardFieldConfigs = () => {
     name: 'Max',
     description: 'Leave empty to calculate based on all values',
 
-    editor: standardEditorsRegistry.get('number').editor as any,
-    override: standardEditorsRegistry.get('number').editor as any,
+    editor: standardEditorsRegistry.get('number').editor,
+    override: standardEditorsRegistry.get('number').editor,
     process: numberOverrideProcessor,
 
     settings: {
@@ -304,8 +304,8 @@ export const getAllStandardFieldConfigs = () => {
     path: 'decimals',
     name: 'Decimals',
 
-    editor: standardEditorsRegistry.get('number').editor as any,
-    override: standardEditorsRegistry.get('number').editor as any,
+    editor: standardEditorsRegistry.get('number').editor,
+    override: standardEditorsRegistry.get('number').editor,
     process: numberOverrideProcessor,
 
     settings: {
@@ -325,8 +325,8 @@ export const getAllStandardFieldConfigs = () => {
     name: 'No value',
     description: 'What to show when there is no value',
 
-    editor: standardEditorsRegistry.get('text').editor as any,
-    override: standardEditorsRegistry.get('text').editor as any,
+    editor: standardEditorsRegistry.get('text').editor,
+    override: standardEditorsRegistry.get('text').editor,
     process: stringOverrideProcessor,
 
     settings: {
@@ -341,8 +341,8 @@ export const getAllStandardFieldConfigs = () => {
     id: 'links',
     path: 'links',
     name: 'Data links',
-    editor: standardEditorsRegistry.get('links').editor as any,
-    override: standardEditorsRegistry.get('links').editor as any,
+    editor: standardEditorsRegistry.get('links').editor,
+    override: standardEditorsRegistry.get('links').editor,
     process: dataLinksOverrideProcessor,
     settings: {
       placeholder: '-',
@@ -356,8 +356,8 @@ export const getAllStandardFieldConfigs = () => {
     id: 'color',
     path: 'color',
     name: 'Color scheme',
-    editor: standardEditorsRegistry.get('fieldColor').editor as any,
-    override: standardEditorsRegistry.get('fieldColor').editor as any,
+    editor: standardEditorsRegistry.get('fieldColor').editor,
+    override: standardEditorsRegistry.get('fieldColor').editor,
     process: identityOverrideProcessor,
     shouldApply: () => true,
     settings: {
@@ -373,8 +373,8 @@ export const getAllStandardFieldConfigs = () => {
     name: 'Value mappings',
     description: 'Modify the display text based on input value',
 
-    editor: standardEditorsRegistry.get('mappings').editor as any,
-    override: standardEditorsRegistry.get('mappings').editor as any,
+    editor: standardEditorsRegistry.get('mappings').editor,
+    override: standardEditorsRegistry.get('mappings').editor,
     process: valueMappingsOverrideProcessor,
     settings: {},
     defaultValue: [],
@@ -387,8 +387,8 @@ export const getAllStandardFieldConfigs = () => {
     id: 'thresholds',
     path: 'thresholds',
     name: 'Thresholds',
-    editor: standardEditorsRegistry.get('thresholds').editor as any,
-    override: standardEditorsRegistry.get('thresholds').editor as any,
+    editor: standardEditorsRegistry.get('thresholds').editor,
+    override: standardEditorsRegistry.get('thresholds').editor,
     process: thresholdsOverrideProcessor,
     settings: {},
     defaultValue: {
@@ -408,8 +408,8 @@ export const getAllStandardFieldConfigs = () => {
     path: 'filterable',
     name: 'Ad-hoc filterable',
     hideFromDefaults: true,
-    editor: standardEditorsRegistry.get('boolean').editor as any,
-    override: standardEditorsRegistry.get('boolean').editor as any,
+    editor: standardEditorsRegistry.get('boolean').editor,
+    override: standardEditorsRegistry.get('boolean').editor,
     process: booleanOverrideProcessor,
     shouldApply: () => true,
     settings: {},
diff --git a/public/app/core/components/OptionsUI/select.tsx b/public/app/core/components/OptionsUI/select.tsx
index 7a9bd5ce9233a..006d83cc77b79 100644
--- a/public/app/core/components/OptionsUI/select.tsx
+++ b/public/app/core/components/OptionsUI/select.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { FieldConfigEditorProps, SelectFieldConfigSettings, SelectableValue } from '@grafana/data';
+import { StandardEditorProps, SelectFieldConfigSettings, SelectableValue } from '@grafana/data';
 import { Select } from '@grafana/ui';
 
 interface State<T> {
@@ -8,7 +8,7 @@ interface State<T> {
   options: Array<SelectableValue<T>>;
 }
 
-type Props<T> = FieldConfigEditorProps<T, SelectFieldConfigSettings<T>>;
+type Props<T> = StandardEditorProps<T, SelectFieldConfigSettings<T>>;
 
 export class SelectValueEditor<T> extends React.PureComponent<Props<T>, State<T>> {
   state: State<T> = {
diff --git a/public/app/core/components/OptionsUI/slider.tsx b/public/app/core/components/OptionsUI/slider.tsx
index c681adfc40e57..a734cc99facf5 100644
--- a/public/app/core/components/OptionsUI/slider.tsx
+++ b/public/app/core/components/OptionsUI/slider.tsx
@@ -3,13 +3,13 @@ import { Global } from '@emotion/react';
 import Slider from 'rc-slider';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 
-import { FieldConfigEditorProps, GrafanaTheme2, SliderFieldConfigSettings } from '@grafana/data';
+import { StandardEditorProps, GrafanaTheme2, SliderFieldConfigSettings } from '@grafana/data';
 import { useTheme2 } from '@grafana/ui';
 import { getStyles } from '@grafana/ui/src/components/Slider/styles';
 
 import { NumberInput } from './NumberInput';
 
-type Props = FieldConfigEditorProps<number, SliderFieldConfigSettings>;
+type Props = StandardEditorProps<number, SliderFieldConfigSettings>;
 
 export const SliderValueEditor = ({ value, onChange, item }: Props) => {
   // Input reference
@@ -94,7 +94,7 @@ export const SliderValueEditor = ({ value, onChange, item }: Props) => {
     <div className={cx(styles.container, styles.slider)}>
       {/** Slider tooltip's parent component is body and therefore we need Global component to do css overrides for it. */}
       <Global styles={styles.slider} />
-      <label className={cx(styles.sliderInput, ...sliderInputClassNames)}>
+      <div className={cx(styles.sliderInput, ...sliderInputClassNames)}>
         <Slider
           min={min}
           max={max}
@@ -111,7 +111,7 @@ export const SliderValueEditor = ({ value, onChange, item }: Props) => {
         <span className={stylesSlider.numberInputWrapper} ref={inputRef}>
           <NumberInput value={sliderValue} onChange={onSliderInputChange} max={max} min={min} step={step} />
         </span>
-      </label>
+      </div>
     </div>
   );
 };
@@ -130,13 +130,13 @@ function getTextWidth(text: string, font: string): number | null {
 
 const getStylesSlider = (theme: GrafanaTheme2, width: number) => {
   return {
-    numberInputWrapper: css`
-      margin-left: ${theme.spacing(3)};
-      max-height: 32px;
-      max-width: ${width}px;
-      min-width: ${width}px;
-      overflow: visible;
-      width: 100%;
-    `,
+    numberInputWrapper: css({
+      marginLeft: theme.spacing(3),
+      maxHeight: '32px',
+      maxWidth: width,
+      minWidth: width,
+      overflow: 'visible',
+      width: '100%',
+    }),
   };
 };
diff --git a/public/app/core/components/OptionsUI/stats.tsx b/public/app/core/components/OptionsUI/stats.tsx
index d428b08813b4a..558d774e9a338 100644
--- a/public/app/core/components/OptionsUI/stats.tsx
+++ b/public/app/core/components/OptionsUI/stats.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { FieldConfigEditorProps, StatsPickerConfigSettings } from '@grafana/data';
+import { StandardEditorProps, StatsPickerConfigSettings } from '@grafana/data';
 import { StatsPicker } from '@grafana/ui';
 
 export const StatsPickerEditor = ({
@@ -8,7 +8,7 @@ export const StatsPickerEditor = ({
   onChange,
   item,
   id,
-}: FieldConfigEditorProps<string[], StatsPickerConfigSettings>) => {
+}: StandardEditorProps<string[], StatsPickerConfigSettings>) => {
   return (
     <StatsPicker
       stats={value}
diff --git a/public/app/core/components/OptionsUI/strings.tsx b/public/app/core/components/OptionsUI/strings.tsx
index 603cf776459f6..244abc7ec475b 100644
--- a/public/app/core/components/OptionsUI/strings.tsx
+++ b/public/app/core/components/OptionsUI/strings.tsx
@@ -1,11 +1,11 @@
 import { css } from '@emotion/css';
 import React from 'react';
 
-import { FieldConfigEditorProps, StringFieldConfigSettings, GrafanaTheme2 } from '@grafana/data';
+import { StandardEditorProps, StringFieldConfigSettings, GrafanaTheme2 } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { stylesFactory, Button, Icon, Input } from '@grafana/ui';
 
-type Props = FieldConfigEditorProps<string[], StringFieldConfigSettings>;
+type Props = StandardEditorProps<string[], StringFieldConfigSettings>;
 interface State {
   showAdd: boolean;
 }
@@ -92,19 +92,19 @@ export class StringArrayEditor extends React.PureComponent<Props, State> {
 
 const getStyles = stylesFactory((theme: GrafanaTheme2) => {
   return {
-    textInput: css`
-      margin-bottom: 5px;
-      &:hover {
-        border: 1px solid ${theme.components.input.borderHover};
-      }
-    `,
-    trashIcon: css`
-      color: ${theme.colors.text.secondary};
-      cursor: pointer;
+    textInput: css({
+      marginBottom: '5px',
+      '&:hover': {
+        border: `1px solid ${theme.components.input.borderHover}`,
+      },
+    }),
+    trashIcon: css({
+      color: theme.colors.text.secondary,
+      cursor: 'pointer',
 
-      &:hover {
-        color: ${theme.colors.text};
-      }
-    `,
+      '&:hover': {
+        color: theme.colors.text.primary,
+      },
+    }),
   };
 });
diff --git a/public/app/core/components/OptionsUI/units.tsx b/public/app/core/components/OptionsUI/units.tsx
index fb04e8d1957c5..4bf6d1e653c2f 100644
--- a/public/app/core/components/OptionsUI/units.tsx
+++ b/public/app/core/components/OptionsUI/units.tsx
@@ -1,10 +1,10 @@
 import { css } from '@emotion/css';
 import React from 'react';
 
-import { FieldConfigEditorProps, GrafanaTheme2, UnitFieldConfigSettings } from '@grafana/data';
+import { StandardEditorProps, GrafanaTheme2, UnitFieldConfigSettings } from '@grafana/data';
 import { IconButton, UnitPicker, useStyles2 } from '@grafana/ui';
 
-type Props = FieldConfigEditorProps<string, UnitFieldConfigSettings>;
+type Props = StandardEditorProps<string, UnitFieldConfigSettings>;
 
 export function UnitValueEditor({ value, onChange, item }: Props) {
   const styles = useStyles2(getStyles);
@@ -22,14 +22,14 @@ export function UnitValueEditor({ value, onChange, item }: Props) {
 }
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  wrapper: css`
-    width: 100%;
-    display: flex;
-    flex-direction: rows;
-    align-items: center;
-  `,
-  first: css`
-    margin-right: 8px;
-    flex-grow: 2;
-  `,
+  wrapper: css({
+    width: '100%',
+    display: 'flex',
+    flexDirection: 'row',
+    alignItems: 'center',
+  }),
+  first: css({
+    marginRight: theme.spacing(1),
+    flexGrow: 2,
+  }),
 });
diff --git a/public/app/core/components/Page/Page.tsx b/public/app/core/components/Page/Page.tsx
index f2490a2d91f97..7f017fba48732 100644
--- a/public/app/core/components/Page/Page.tsx
+++ b/public/app/core/components/Page/Page.tsx
@@ -1,12 +1,12 @@
-// Libraries
 import { css, cx } from '@emotion/css';
 import React, { useLayoutEffect } from 'react';
 
 import { GrafanaTheme2, PageLayoutType } from '@grafana/data';
-import { config } from '@grafana/runtime';
-import { CustomScrollbar, useStyles2 } from '@grafana/ui';
+import { useStyles2 } from '@grafana/ui';
 import { useGrafana } from 'app/core/context/GrafanaContext';
 
+import FlaggedScrollbar from '../FlaggedScroller';
+
 import { PageContents } from './PageContents';
 import { PageHeader } from './PageHeader';
 import { PageTabs } from './PageTabs';
@@ -53,7 +53,7 @@ export const Page: PageType = ({
   return (
     <div className={cx(styles.wrapper, className)} {...otherProps}>
       {layout === PageLayoutType.Standard && (
-        <CustomScrollbar autoHeightMin={'100%'} scrollTop={scrollTop} scrollRefCallback={scrollRef}>
+        <FlaggedScrollbar autoHeightMin={'100%'} scrollTop={scrollTop} scrollRefCallback={scrollRef}>
           <div className={styles.pageInner}>
             {pageHeaderNav && (
               <PageHeader
@@ -68,13 +68,15 @@ export const Page: PageType = ({
             {pageNav && pageNav.children && <PageTabs navItem={pageNav} />}
             <div className={styles.pageContent}>{children}</div>
           </div>
-        </CustomScrollbar>
+        </FlaggedScrollbar>
       )}
+
       {layout === PageLayoutType.Canvas && (
-        <CustomScrollbar autoHeightMin={'100%'} scrollTop={scrollTop} scrollRefCallback={scrollRef}>
+        <FlaggedScrollbar autoHeightMin={'100%'} scrollTop={scrollTop} scrollRefCallback={scrollRef}>
           <div className={styles.canvasContent}>{children}</div>
-        </CustomScrollbar>
+        </FlaggedScrollbar>
       )}
+
       {layout === PageLayoutType.Custom && children}
     </div>
   );
@@ -96,11 +98,12 @@ const getStyles = (theme: GrafanaTheme2) => {
       label: 'page-content',
       flexGrow: 1,
     }),
+    primaryBg: css({
+      background: theme.colors.background.primary,
+    }),
     pageInner: css({
       label: 'page-inner',
       padding: theme.spacing(2),
-      borderRadius: theme.shape.radius.default,
-      border: `1px solid ${theme.colors.border.weak}`,
       borderBottom: 'none',
       background: theme.colors.background.primary,
       display: 'flex',
@@ -109,8 +112,7 @@ const getStyles = (theme: GrafanaTheme2) => {
       margin: theme.spacing(0, 0, 0, 0),
 
       [theme.breakpoints.up('md')]: {
-        margin: theme.spacing(2, 2, 0, config.featureToggles.dockedMegaMenu ? 2 : 1),
-        padding: theme.spacing(3),
+        padding: theme.spacing(4),
       },
     }),
     canvasContent: css({
diff --git a/public/app/core/components/Page/PageHeader.tsx b/public/app/core/components/Page/PageHeader.tsx
index d6f8aba8505b6..23a7796c2c121 100644
--- a/public/app/core/components/Page/PageHeader.tsx
+++ b/public/app/core/components/Page/PageHeader.tsx
@@ -57,6 +57,7 @@ const getStyles = (theme: GrafanaTheme2) => {
     title: css({
       display: 'flex',
       flexDirection: 'row',
+      maxWidth: '100%',
       h1: {
         display: 'flex',
         marginBottom: 0,
diff --git a/public/app/core/components/Page/PageTabs.test.tsx b/public/app/core/components/Page/PageTabs.test.tsx
new file mode 100644
index 0000000000000..8ef76d655b2d1
--- /dev/null
+++ b/public/app/core/components/Page/PageTabs.test.tsx
@@ -0,0 +1,23 @@
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+
+import { NavModelItem } from '@grafana/data';
+
+import { PageTabs } from './PageTabs';
+
+describe('PageTabs', () => {
+  it('should render a tab with a counter', () => {
+    const navItem: NavModelItem = {
+      text: 'My page',
+      children: [
+        {
+          text: 'My tab',
+          tabCounter: 10,
+        },
+      ],
+    };
+
+    render(<PageTabs navItem={navItem} />);
+    expect(screen.getByText('10')).toBeInTheDocument();
+  });
+});
diff --git a/public/app/core/components/Page/PageTabs.tsx b/public/app/core/components/Page/PageTabs.tsx
index ba55375e8dfc5..b25223d14e225 100644
--- a/public/app/core/components/Page/PageTabs.tsx
+++ b/public/app/core/components/Page/PageTabs.tsx
@@ -23,8 +23,10 @@ export function PageTabs({ navItem }: Props) {
                 active={child.active}
                 key={`${child.url}-${index}`}
                 icon={icon}
+                counter={child.tabCounter}
                 href={child.url}
                 suffix={child.tabSuffix}
+                onChangeTab={child.onClick}
               />
             )
           );
diff --git a/public/app/core/components/Page/types.ts b/public/app/core/components/Page/types.ts
index aa76f10af7377..4705291cbc762 100644
--- a/public/app/core/components/Page/types.ts
+++ b/public/app/core/components/Page/types.ts
@@ -20,9 +20,15 @@ export interface PageProps extends HTMLAttributes<HTMLDivElement> {
   subTitle?: React.ReactNode;
   /** Control the page layout. */
   layout?: PageLayoutType;
-  /** Can be used to get the scroll container element to access scroll position */
+  /**
+   * Can be used to get the scroll container element to access scroll position
+   * */
+  // Probably will deprecate this in the future in favor of just scrolling document.body directly
   scrollRef?: RefCallback<HTMLDivElement>;
-  /** Can be used to update the current scroll position */
+  /**
+   * Can be used to update the current scroll position
+   * */
+  // Probably will deprecate this in the future in favor of just scrolling document.body directly
   scrollTop?: number;
 }
 
diff --git a/public/app/core/components/PageHeader/PanelHeaderMenuItem.tsx b/public/app/core/components/PageHeader/PanelHeaderMenuItem.tsx
index e9d8291a48e68..28d02904d9d66 100644
--- a/public/app/core/components/PageHeader/PanelHeaderMenuItem.tsx
+++ b/public/app/core/components/PageHeader/PanelHeaderMenuItem.tsx
@@ -33,7 +33,10 @@ export const PanelHeaderMenuItem = (props: Props & PanelMenuItem) => {
         >
           <a onClick={props.onClick} href={props.href} role="menuitem">
             {icon && <Icon name={icon} className={styles.menuIconClassName} />}
-            <span className="dropdown-item-text" aria-label={selectors.components.Panels.Panel.headerItems(props.text)}>
+            <span
+              className="dropdown-item-text"
+              data-testid={selectors.components.Panels.Panel.headerItems(props.text)}
+            >
               {props.text}
               {isSubMenu && <Icon name="angle-right" className={styles.shortcutIconClassName} />}
             </span>
diff --git a/public/app/core/components/PageNotFound/EntityNotFound.tsx b/public/app/core/components/PageNotFound/EntityNotFound.tsx
index 4ed5d97f59aaa..24edfa76f5c18 100644
--- a/public/app/core/components/PageNotFound/EntityNotFound.tsx
+++ b/public/app/core/components/PageNotFound/EntityNotFound.tsx
@@ -2,7 +2,7 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { useStyles2, useTheme2 } from '@grafana/ui';
+import { EmptyState, TextLink, useStyles2 } from '@grafana/ui';
 
 export interface Props {
   /**
@@ -13,24 +13,16 @@ export interface Props {
 
 export function EntityNotFound({ entity = 'Page' }: Props) {
   const styles = useStyles2(getStyles);
-  const theme = useTheme2();
 
   return (
     <div className={styles.container}>
-      <h1>{entity} not found</h1>
-      <div className={styles.subtitle}>
+      <EmptyState message={`${entity} not found`} variant="not-found">
         We&apos;re looking but can&apos;t seem to find this {entity.toLowerCase()}. Try returning{' '}
-        <a href="/" className="external-link">
-          home
-        </a>{' '}
-        or seeking help on the{' '}
-        <a href="https://community.grafana.com" target="_blank" rel="noreferrer" className="external-link">
+        <TextLink href="/">home</TextLink> or seeking help on the{' '}
+        <TextLink href="https://community.grafana.com" external>
           community site.
-        </a>
-      </div>
-      <div className={styles.grot}>
-        <img src={`public/img/grot-404-${theme.isDark ? 'dark' : 'light'}.svg`} width="100%" alt="grot" />
-      </div>
+        </TextLink>
+      </EmptyState>
     </div>
   );
 }
@@ -38,23 +30,7 @@ export function EntityNotFound({ entity = 'Page' }: Props) {
 export function getStyles(theme: GrafanaTheme2) {
   return {
     container: css({
-      display: 'flex',
-      flexDirection: 'column',
       padding: theme.spacing(8, 2, 2, 2),
-      h1: {
-        textAlign: 'center',
-      },
-    }),
-    subtitle: css({
-      color: theme.colors.text.secondary,
-      fontSize: theme.typography.h5.fontSize,
-      padding: theme.spacing(2, 0),
-      textAlign: 'center',
-    }),
-    grot: css({
-      maxWidth: '450px',
-      paddingTop: theme.spacing(8),
-      margin: '0 auto',
     }),
   };
 }
diff --git a/public/app/core/components/PasswordField/PasswordField.test.tsx b/public/app/core/components/PasswordField/PasswordField.test.tsx
index 3b98573076835..1e5ef302e7518 100644
--- a/public/app/core/components/PasswordField/PasswordField.test.tsx
+++ b/public/app/core/components/PasswordField/PasswordField.test.tsx
@@ -1,23 +1,31 @@
 import { fireEvent, render, screen } from '@testing-library/react';
 import React from 'react';
 
+import { Field } from '@grafana/ui';
+
 import { PasswordField } from './PasswordField';
 
 describe('PasswordField', () => {
-  const props = {
-    id: 'password',
-    placeholder: 'enter password',
-    'data-testid': 'password-field',
-  };
   it('should render correctly', () => {
-    render(<PasswordField {...props} />);
-    expect(screen.getByTestId('password-field')).toBeInTheDocument();
+    render(
+      <Field label="Password">
+        <PasswordField id="password" />
+      </Field>
+    );
+
+    expect(screen.getByLabelText('Password')).toBeInTheDocument();
     expect(screen.getByRole('switch', { name: 'Show password' })).toBeInTheDocument();
   });
+
   it('should able to show password value if clicked on password-reveal icon', () => {
-    render(<PasswordField {...props} />);
-    expect(screen.getByTestId('password-field')).toHaveProperty('type', 'password');
+    render(
+      <Field label="Password">
+        <PasswordField id="password" />
+      </Field>
+    );
+
+    expect(screen.getByLabelText('Password')).toHaveProperty('type', 'password');
     fireEvent.click(screen.getByRole('switch', { name: 'Show password' }));
-    expect(screen.getByTestId('password-field')).toHaveProperty('type', 'text');
+    expect(screen.getByLabelText('Password')).toHaveProperty('type', 'text');
   });
 });
diff --git a/public/app/core/components/PasswordField/PasswordField.tsx b/public/app/core/components/PasswordField/PasswordField.tsx
index 06a54869722da..0a91c8a9b501b 100644
--- a/public/app/core/components/PasswordField/PasswordField.tsx
+++ b/public/app/core/components/PasswordField/PasswordField.tsx
@@ -2,43 +2,33 @@ import React, { useState } from 'react';
 
 import { selectors } from '@grafana/e2e-selectors';
 import { Input, IconButton } from '@grafana/ui';
+import { Props as InputProps } from '@grafana/ui/src/components/Input/Input';
 
-export interface Props {
-  autoFocus?: boolean;
-  autoComplete?: string;
-  id?: string;
-  passwordHint?: string;
-}
+interface Props extends Omit<InputProps, 'type'> {}
 
-export const PasswordField = React.forwardRef<HTMLInputElement, Props>(
-  ({ autoComplete, autoFocus, id, passwordHint, ...props }, ref) => {
-    const [showPassword, setShowPassword] = useState(false);
+export const PasswordField = React.forwardRef<HTMLInputElement, Props>((props, ref) => {
+  const [showPassword, setShowPassword] = useState(false);
 
-    return (
-      <Input
-        id={id}
-        autoFocus={autoFocus}
-        autoComplete={autoComplete}
-        {...props}
-        type={showPassword ? 'text' : 'password'}
-        placeholder={passwordHint}
-        aria-label={selectors.pages.Login.password}
-        ref={ref}
-        suffix={
-          <IconButton
-            name={showPassword ? 'eye-slash' : 'eye'}
-            aria-controls={id}
-            role="switch"
-            aria-checked={showPassword}
-            onClick={() => {
-              setShowPassword(!showPassword);
-            }}
-            tooltip={showPassword ? 'Hide password' : 'Show password'}
-          />
-        }
-      />
-    );
-  }
-);
+  return (
+    <Input
+      {...props}
+      type={showPassword ? 'text' : 'password'}
+      data-testid={selectors.pages.Login.password}
+      ref={ref}
+      suffix={
+        <IconButton
+          name={showPassword ? 'eye-slash' : 'eye'}
+          aria-controls={props.id}
+          role="switch"
+          aria-checked={showPassword}
+          onClick={() => {
+            setShowPassword(!showPassword);
+          }}
+          tooltip={showPassword ? 'Hide password' : 'Show password'}
+        />
+      }
+    />
+  );
+});
 
 PasswordField.displayName = 'PasswordField';
diff --git a/public/app/core/components/PermissionList/AddPermission.tsx b/public/app/core/components/PermissionList/AddPermission.tsx
deleted file mode 100644
index 3620fe6144305..0000000000000
--- a/public/app/core/components/PermissionList/AddPermission.tsx
+++ /dev/null
@@ -1,148 +0,0 @@
-import { css } from '@emotion/css';
-import React, { Component } from 'react';
-
-import { GrafanaTheme2, SelectableValue } from '@grafana/data';
-import { Button, Form, HorizontalGroup, Select, stylesFactory } from '@grafana/ui';
-import { TeamPicker } from 'app/core/components/Select/TeamPicker';
-import { UserPicker } from 'app/core/components/Select/UserPicker';
-import config from 'app/core/config';
-import { OrgUser, Team } from 'app/types';
-import {
-  dashboardPermissionLevels,
-  dashboardAclTargets,
-  AclTarget,
-  PermissionLevel,
-  NewDashboardAclItem,
-  OrgRole,
-} from 'app/types/acl';
-
-import { CloseButton } from '../CloseButton/CloseButton';
-
-export interface Props {
-  onAddPermission: (item: NewDashboardAclItem) => void;
-  onCancel: () => void;
-}
-
-class AddPermissions extends Component<Props, NewDashboardAclItem> {
-  static defaultProps = {
-    showPermissionLevels: true,
-  };
-
-  constructor(props: Props) {
-    super(props);
-    this.state = this.getCleanState();
-  }
-
-  getCleanState() {
-    return {
-      userId: 0,
-      teamId: 0,
-      role: undefined,
-      type: AclTarget.Team,
-      permission: PermissionLevel.View,
-    };
-  }
-
-  onTypeChanged = (item: SelectableValue<AclTarget>) => {
-    const type = item.value;
-
-    switch (type) {
-      case AclTarget.User:
-      case AclTarget.Team:
-        this.setState({ type: type, userId: 0, teamId: 0, role: undefined });
-        break;
-      case AclTarget.Editor:
-        this.setState({ type: type, userId: 0, teamId: 0, role: OrgRole.Editor });
-        break;
-      case AclTarget.Viewer:
-        this.setState({ type: type, userId: 0, teamId: 0, role: OrgRole.Viewer });
-        break;
-    }
-  };
-
-  onUserSelected = (user: SelectableValue<OrgUser['userId']>) => {
-    this.setState({ userId: user && !Array.isArray(user) ? user.id : 0 });
-  };
-
-  onTeamSelected = (team: SelectableValue<Team>) => {
-    this.setState({ teamId: team.value?.id && !Array.isArray(team.value) ? team.value.id : 0 });
-  };
-
-  onPermissionChanged = (permission: SelectableValue<PermissionLevel>) => {
-    this.setState({ permission: permission.value! });
-  };
-
-  onSubmit = async () => {
-    await this.props.onAddPermission(this.state);
-    this.setState(this.getCleanState());
-  };
-
-  isValid() {
-    switch (this.state.type) {
-      case AclTarget.Team:
-        return this.state.teamId > 0;
-      case AclTarget.User:
-        return this.state.userId > 0;
-    }
-    return true;
-  }
-
-  render() {
-    const { onCancel } = this.props;
-    const newItem = this.state;
-    const pickerClassName = 'min-width-20';
-    const isValid = this.isValid();
-    const styles = getStyles(config.theme2);
-
-    return (
-      <div className="cta-form">
-        <CloseButton onClick={onCancel} />
-        <h5>Add Permission For</h5>
-        <Form maxWidth="none" onSubmit={this.onSubmit}>
-          {() => (
-            <HorizontalGroup>
-              <Select
-                aria-label="Role to add new permission to"
-                isSearchable={false}
-                value={this.state.type}
-                options={dashboardAclTargets}
-                onChange={this.onTypeChanged}
-              />
-
-              {newItem.type === AclTarget.User ? (
-                <UserPicker onSelected={this.onUserSelected} className={pickerClassName} />
-              ) : null}
-
-              {newItem.type === AclTarget.Team ? (
-                <TeamPicker onSelected={this.onTeamSelected} className={pickerClassName} />
-              ) : null}
-
-              <span className={styles.label}>Can</span>
-
-              <Select
-                aria-label="Permission level"
-                isSearchable={false}
-                value={this.state.permission}
-                options={dashboardPermissionLevels}
-                onChange={this.onPermissionChanged}
-                width={25}
-              />
-              <Button data-save-permission type="submit" disabled={!isValid}>
-                Save
-              </Button>
-            </HorizontalGroup>
-          )}
-        </Form>
-      </div>
-    );
-  }
-}
-
-const getStyles = stylesFactory((theme: GrafanaTheme2) => ({
-  label: css`
-    color: ${theme.colors.primary.text};
-    font-weight: bold;
-  `,
-}));
-
-export default AddPermissions;
diff --git a/public/app/core/components/PermissionList/DisabledPermissionListItem.tsx b/public/app/core/components/PermissionList/DisabledPermissionListItem.tsx
deleted file mode 100644
index ae0fd53fe3570..0000000000000
--- a/public/app/core/components/PermissionList/DisabledPermissionListItem.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import React, { Component } from 'react';
-
-import { Select, Icon, Button } from '@grafana/ui';
-import { DashboardAcl, dashboardPermissionLevels } from 'app/types/acl';
-
-export interface Props {
-  item: DashboardAcl;
-}
-
-export default class DisabledPermissionListItem extends Component<Props> {
-  render() {
-    const { item } = this.props;
-    const currentPermissionLevel = dashboardPermissionLevels.find((dp) => dp.value === item.permission);
-
-    return (
-      <tr className="gf-form-disabled">
-        <td style={{ width: '1%' }}>
-          <Icon size="lg" name="shield" />
-        </td>
-        <td style={{ width: '90%' }}>
-          {item.name}
-          <span className="filter-table__weak-italic"> (Role)</span>
-        </td>
-        <td />
-        <td className="query-keyword">Can</td>
-        <td>
-          <div className="gf-form">
-            <Select
-              aria-label={`Permission level for "${item.name}"`}
-              options={dashboardPermissionLevels}
-              onChange={() => {}}
-              disabled={true}
-              value={currentPermissionLevel}
-            />
-          </div>
-        </td>
-        <td>
-          <Button aria-label={`Remove permission for "${item.name}"`} size="sm" icon="lock" disabled />
-        </td>
-      </tr>
-    );
-  }
-}
diff --git a/public/app/core/components/PermissionList/PermissionList.tsx b/public/app/core/components/PermissionList/PermissionList.tsx
deleted file mode 100644
index 2631905e7993d..0000000000000
--- a/public/app/core/components/PermissionList/PermissionList.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import React, { PureComponent } from 'react';
-
-import { FolderInfo } from 'app/types';
-import { DashboardAcl, PermissionLevel } from 'app/types/acl';
-
-import DisabledPermissionsListItem from './DisabledPermissionListItem';
-import PermissionsListItem from './PermissionListItem';
-
-export interface Props {
-  items: DashboardAcl[];
-  onRemoveItem: (item: DashboardAcl) => void;
-  onPermissionChanged: (item: DashboardAcl, level: PermissionLevel) => void;
-  isFetching: boolean;
-  folderInfo?: FolderInfo;
-}
-
-class PermissionList extends PureComponent<Props> {
-  render() {
-    const { items, onRemoveItem, onPermissionChanged, isFetching, folderInfo } = this.props;
-
-    return (
-      <table className="filter-table gf-form-group">
-        <tbody>
-          <DisabledPermissionsListItem
-            key={0}
-            item={{
-              name: 'Admin',
-              permission: 4,
-            }}
-          />
-          {items.map((item, idx) => {
-            return (
-              <PermissionsListItem
-                key={idx + 1}
-                item={item}
-                onRemoveItem={onRemoveItem}
-                onPermissionChanged={onPermissionChanged}
-                folderInfo={folderInfo}
-              />
-            );
-          })}
-          {isFetching === true && items.length < 1 ? (
-            <tr>
-              <td colSpan={4}>
-                <em>Loading permissions...</em>
-              </td>
-            </tr>
-          ) : null}
-
-          {isFetching === false && items.length < 1 ? (
-            <tr>
-              <td colSpan={4}>
-                <em>No permissions are set. Will only be accessible by admins.</em>
-              </td>
-            </tr>
-          ) : null}
-        </tbody>
-      </table>
-    );
-  }
-}
-
-export default PermissionList;
diff --git a/public/app/core/components/PermissionList/PermissionListItem.tsx b/public/app/core/components/PermissionList/PermissionListItem.tsx
deleted file mode 100644
index f93b2791107ee..0000000000000
--- a/public/app/core/components/PermissionList/PermissionListItem.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-import React, { PureComponent } from 'react';
-
-import { SelectableValue } from '@grafana/data';
-import { Select, Icon, Button } from '@grafana/ui';
-import { FolderInfo } from 'app/types';
-import { dashboardPermissionLevels, DashboardAcl, PermissionLevel } from 'app/types/acl';
-
-const setClassNameHelper = (inherited: boolean) => {
-  return inherited ? 'gf-form-disabled' : '';
-};
-
-function ItemAvatar({ item }: { item: DashboardAcl }) {
-  if (item.userAvatarUrl) {
-    return <img className="filter-table__avatar" src={item.userAvatarUrl} alt="User avatar" />;
-  }
-  if (item.teamAvatarUrl) {
-    return <img className="filter-table__avatar" src={item.teamAvatarUrl} alt="Team avatar" />;
-  }
-  if (item.role === 'Editor') {
-    return <Icon size="lg" name="edit" />;
-  }
-
-  return <Icon size="lg" name="eye" />;
-}
-
-function ItemDescription({ item }: { item: DashboardAcl }) {
-  if (item.userId) {
-    return <span className="filter-table__weak-italic">(User)</span>;
-  }
-  if (item.teamId) {
-    return <span className="filter-table__weak-italic">(Team)</span>;
-  }
-  return <span className="filter-table__weak-italic">(Role)</span>;
-}
-
-interface Props {
-  item: DashboardAcl;
-  onRemoveItem: (item: DashboardAcl) => void;
-  onPermissionChanged: (item: DashboardAcl, level: PermissionLevel) => void;
-  folderInfo?: FolderInfo;
-}
-
-export default class PermissionsListItem extends PureComponent<Props> {
-  onPermissionChanged = (option: SelectableValue<PermissionLevel>) => {
-    this.props.onPermissionChanged(this.props.item, option.value!);
-  };
-
-  onRemoveItem = () => {
-    this.props.onRemoveItem(this.props.item);
-  };
-
-  render() {
-    const { item, folderInfo } = this.props;
-    const inheritedFromRoot = item.dashboardId === -1 && !item.inherited;
-    const currentPermissionLevel = dashboardPermissionLevels.find((dp) => dp.value === item.permission);
-
-    return (
-      <tr className={setClassNameHelper(Boolean(item?.inherited))}>
-        <td style={{ width: '1%' }}>
-          <ItemAvatar item={item} />
-        </td>
-        <td style={{ width: '90%' }}>
-          {item.name} <ItemDescription item={item} />
-        </td>
-        <td>
-          {item.inherited && folderInfo && (
-            <em className="muted no-wrap">
-              Inherited from folder{' '}
-              {folderInfo.canViewFolderPermissions ? (
-                <a className="text-link" href={`${folderInfo.url}/permissions`}>
-                  {folderInfo.title}
-                </a>
-              ) : (
-                folderInfo.title
-              )}
-            </em>
-          )}
-          {inheritedFromRoot && <em className="muted no-wrap">Default Permission</em>}
-        </td>
-        <td className="query-keyword">Can</td>
-        <td>
-          <Select
-            aria-label={`Permission level for "${item.name}"`}
-            isSearchable={false}
-            options={dashboardPermissionLevels}
-            onChange={this.onPermissionChanged}
-            disabled={item.inherited}
-            value={currentPermissionLevel}
-            width={25}
-          />
-        </td>
-        <td>
-          {!item.inherited ? (
-            <Button
-              aria-label={`Remove permission for "${item.name}"`}
-              size="sm"
-              variant="destructive"
-              icon="times"
-              onClick={this.onRemoveItem}
-            />
-          ) : (
-            <Button aria-label={`Remove permission for "${item.name}" (Disabled)`} size="sm" disabled icon="times" />
-          )}
-        </td>
-      </tr>
-    );
-  }
-}
diff --git a/public/app/core/components/PermissionList/PermissionsInfo.tsx b/public/app/core/components/PermissionList/PermissionsInfo.tsx
deleted file mode 100644
index 7920b9552910d..0000000000000
--- a/public/app/core/components/PermissionList/PermissionsInfo.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from 'react';
-
-const PermissionsInfo = () => (
-  <div>
-    <h5>What are Permissions?</h5>
-    <p>
-      An Access Control List (ACL) model is used to limit access to Dashboard Folders. A user or a Team can be assigned
-      permissions for a folder or for a single dashboard.
-    </p>
-  </div>
-);
-
-export default PermissionsInfo;
diff --git a/public/app/core/components/QueryOperationRow/OperationRowHelp.tsx b/public/app/core/components/QueryOperationRow/OperationRowHelp.tsx
index 600b2f5eb1558..ea17c9ff423eb 100644
--- a/public/app/core/components/QueryOperationRow/OperationRowHelp.tsx
+++ b/public/app/core/components/QueryOperationRow/OperationRowHelp.tsx
@@ -8,19 +8,22 @@ export interface Props extends React.HTMLAttributes<HTMLDivElement> {
   children?: React.ReactNode;
   markdown?: string;
   onRemove?: () => void;
+  styleOverrides?: { [key: string]: string };
 }
 
 export const OperationRowHelp = React.memo(
-  React.forwardRef<HTMLDivElement, Props>(({ className, children, markdown, onRemove, ...otherProps }, ref) => {
-    const styles = useStyles2(getStyles);
-
-    return (
-      <div className={cx(styles.wrapper, className)} {...otherProps} ref={ref}>
-        {markdown && markdownHelper(markdown)}
-        {children}
-      </div>
-    );
-  })
+  React.forwardRef<HTMLDivElement, Props>(
+    ({ className, children, markdown, styleOverrides, onRemove, ...otherProps }, ref) => {
+      const styles = useStyles2((theme) => getStyles(theme, styleOverrides?.borderTop));
+
+      return (
+        <div className={cx(styles.wrapper, className)} {...otherProps} ref={ref}>
+          {markdown && markdownHelper(markdown)}
+          {children}
+        </div>
+      );
+    }
+  )
 );
 
 function markdownHelper(markdown: string) {
@@ -30,14 +33,16 @@ function markdownHelper(markdown: string) {
 
 OperationRowHelp.displayName = 'OperationRowHelp';
 
-const getStyles = (theme: GrafanaTheme2) => {
+const getStyles = (theme: GrafanaTheme2, borderTop?: string) => {
   const borderRadius = theme.shape.radius.default;
 
+  const themeBackgroundColor = theme.colors.background.secondary;
+
   return {
     wrapper: css`
       padding: ${theme.spacing(2)};
-      border: 2px solid ${theme.colors.background.secondary};
-      border-top: none;
+      border: 2px solid ${themeBackgroundColor};
+      border-top: ${borderTop ? borderTop + themeBackgroundColor : 'none'};
       border-radius: 0 0 ${borderRadius} ${borderRadius};
       position: relative;
       top: -4px;
diff --git a/public/app/core/components/QueryOperationRow/QueryOperationAction.test.tsx b/public/app/core/components/QueryOperationRow/QueryOperationAction.test.tsx
index b7d583a01a210..5895d97c2013b 100644
--- a/public/app/core/components/QueryOperationRow/QueryOperationAction.test.tsx
+++ b/public/app/core/components/QueryOperationRow/QueryOperationAction.test.tsx
@@ -2,8 +2,6 @@ import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React, { ComponentPropsWithoutRef } from 'react';
 
-import { selectors } from '@grafana/e2e-selectors';
-
 import { QueryOperationAction, QueryOperationToggleAction } from './QueryOperationAction';
 
 describe('QueryOperationAction tests', () => {
@@ -22,9 +20,7 @@ describe('QueryOperationAction tests', () => {
   it('should render component', () => {
     setup();
 
-    expect(
-      screen.getByRole('button', { name: selectors.components.QueryEditorRow.actionButton('test') })
-    ).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'test' })).toBeInTheDocument();
   });
 
   it('should call on click handler', async () => {
@@ -32,7 +28,7 @@ describe('QueryOperationAction tests', () => {
     setup({ disabled: false, onClick: clickSpy });
 
     expect(clickSpy).not.toHaveBeenCalled();
-    const queryButton = screen.getByRole('button', { name: selectors.components.QueryEditorRow.actionButton('test') });
+    const queryButton = screen.getByRole('button', { name: 'test' });
 
     await userEvent.click(queryButton);
 
@@ -44,7 +40,7 @@ describe('QueryOperationAction tests', () => {
     setup({ disabled: true, onClick: clickSpy });
 
     expect(clickSpy).not.toHaveBeenCalled();
-    const queryButton = screen.getByRole('button', { name: selectors.components.QueryEditorRow.actionButton('test') });
+    const queryButton = screen.getByRole('button', { name: 'test' });
 
     await userEvent.click(queryButton);
 
@@ -69,7 +65,7 @@ describe('QueryOperationToggleAction', () => {
 
     expect(
       screen.getByRole('button', {
-        name: selectors.components.QueryEditorRow.actionButton('test'),
+        name: 'test',
         pressed: false,
       })
     ).toBeInTheDocument();
@@ -78,7 +74,7 @@ describe('QueryOperationToggleAction', () => {
 
     expect(
       screen.getByRole('button', {
-        name: selectors.components.QueryEditorRow.actionButton('test'),
+        name: 'test',
         pressed: true,
       })
     ).toBeInTheDocument();
diff --git a/public/app/core/components/QueryOperationRow/QueryOperationAction.tsx b/public/app/core/components/QueryOperationRow/QueryOperationAction.tsx
index fe69509ac4aa3..b9c9ec1f5e9a1 100644
--- a/public/app/core/components/QueryOperationRow/QueryOperationAction.tsx
+++ b/public/app/core/components/QueryOperationRow/QueryOperationAction.tsx
@@ -10,6 +10,7 @@ interface BaseQueryOperationActionProps {
   title: string;
   onClick: (e: React.MouseEvent) => void;
   disabled?: boolean;
+  dataTestId?: string;
 }
 
 function BaseQueryOperationAction(props: QueryOperationActionProps | QueryOperationToggleActionProps) {
@@ -24,7 +25,7 @@ function BaseQueryOperationAction(props: QueryOperationActionProps | QueryOperat
         disabled={!!props.disabled}
         onClick={props.onClick}
         type="button"
-        aria-label={selectors.components.QueryEditorRow.actionButton(props.title)}
+        data-testid={props.dataTestId ?? selectors.components.QueryEditorRow.actionButton(props.title)}
         {...('active' in props && { 'aria-pressed': props.active })}
       />
     </div>
@@ -45,23 +46,24 @@ export const QueryOperationToggleAction = (props: QueryOperationToggleActionProp
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
-    icon: css`
-      display: flex;
-      position: relative;
-      color: ${theme.colors.text.secondary};
-    `,
-    active: css`
-      &::before {
-        display: block;
-        content: ' ';
-        position: absolute;
-        left: -1px;
-        right: 2px;
-        height: 3px;
-        border-radius: ${theme.shape.radius.default};
-        bottom: -8px;
-        background-image: ${theme.colors.gradients.brandHorizontal} !important;
-      }
-    `,
+    icon: css({
+      display: 'flex',
+      position: 'relative',
+      color: theme.colors.text.secondary,
+    }),
+    active: css({
+      '&:before': {
+        display: 'block',
+        content: '" "',
+        position: 'absolute',
+        left: -1,
+        right: 2,
+        height: 3,
+        borderRadius: theme.shape.radius.default,
+        bottom: -8,
+        // Psiphon change - change active highlight color to Psiphon orange
+        backgroundImage: theme.colors.psiphon.psiphonOrangeLight,
+      },
+    }),
   };
 };
diff --git a/public/app/core/components/QueryOperationRow/QueryOperationRowHeader.tsx b/public/app/core/components/QueryOperationRow/QueryOperationRowHeader.tsx
index bcdfb7cf42bd1..0525cc9ca7f9f 100644
--- a/public/app/core/components/QueryOperationRow/QueryOperationRowHeader.tsx
+++ b/public/app/core/components/QueryOperationRow/QueryOperationRowHeader.tsx
@@ -3,8 +3,8 @@ import React, { MouseEventHandler } from 'react';
 import { DraggableProvided } from 'react-beautiful-dnd';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { IconButton, useStyles2 } from '@grafana/ui';
+import { Icon, IconButton, useStyles2, Stack } from '@grafana/ui';
+import { t } from 'app/core/internationalization';
 
 export interface QueryOperationRowHeaderProps {
   actionsElement?: React.ReactNode;
@@ -15,7 +15,7 @@ export interface QueryOperationRowHeaderProps {
   headerElement?: React.ReactNode;
   isContentVisible: boolean;
   onRowToggle: () => void;
-  reportDragMousePosition: MouseEventHandler<HTMLButtonElement>;
+  reportDragMousePosition: MouseEventHandler<HTMLDivElement>;
   title?: string;
   id: string;
   expanderMessages?: ExpanderMessages;
@@ -42,13 +42,17 @@ export const QueryOperationRowHeader = ({
 }: QueryOperationRowHeaderProps) => {
   const styles = useStyles2(getStyles);
 
-  let tooltipMessage = isContentVisible ? 'Collapse query row' : 'Expand query row';
+  let tooltipMessage = isContentVisible
+    ? t('query-operation.header.collapse-row', 'Collapse query row')
+    : t('query-operation.header.expand-row', 'Expand query row');
   if (expanderMessages !== undefined && isContentVisible) {
     tooltipMessage = expanderMessages.close;
   } else if (expanderMessages !== undefined) {
     tooltipMessage = expanderMessages?.open;
   }
 
+  const dragAndDropLabel = t('query-operation.header.drag-and-drop', 'Drag and drop to reorder');
+
   return (
     <div className={styles.header}>
       <div className={styles.column}>
@@ -73,19 +77,12 @@ export const QueryOperationRowHeader = ({
         {headerElement}
       </div>
 
-      <Stack gap={1} alignItems="center" wrap={false}>
+      <Stack gap={1} alignItems="center">
         {actionsElement}
         {draggable && (
-          <IconButton
-            title="Drag and drop to reorder"
-            name="draggabledots"
-            tooltip="Drag and drop to reorder"
-            tooltipPlacement="bottom"
-            size="lg"
-            className={styles.dragIcon}
-            onMouseMove={reportDragMousePosition}
-            {...dragHandleProps}
-          />
+          <div onMouseMove={reportDragMousePosition} {...dragHandleProps}>
+            <Icon title={dragAndDropLabel} name="draggabledots" size="lg" className={styles.dragIcon} />
+          </div>
         )}
       </Stack>
     </div>
diff --git a/public/app/core/components/RolePicker/RoleMenuGroupsSection.tsx b/public/app/core/components/RolePicker/RoleMenuGroupsSection.tsx
index 64c6cdc9e5d77..340b392cb2d1e 100644
--- a/public/app/core/components/RolePicker/RoleMenuGroupsSection.tsx
+++ b/public/app/core/components/RolePicker/RoleMenuGroupsSection.tsx
@@ -26,7 +26,7 @@ interface RoleMenuGroupsSectionProps {
   selectedOptions: Role[];
   onRoleChange: (option: Role) => void;
   onClearSubMenu: (group: string) => void;
-  showOnLeftSubMenu: boolean;
+  showOnLeftSubMenu?: boolean;
 }
 
 export const RoleMenuGroupsSection = React.forwardRef<HTMLDivElement, RoleMenuGroupsSectionProps>(
diff --git a/public/app/core/components/RolePicker/RolePicker.tsx b/public/app/core/components/RolePicker/RolePicker.tsx
index 41592ae22a0dc..fe958e408c65c 100644
--- a/public/app/core/components/RolePicker/RolePicker.tsx
+++ b/public/app/core/components/RolePicker/RolePicker.tsx
@@ -1,12 +1,11 @@
 import React, { FormEvent, useCallback, useEffect, useState, useRef } from 'react';
 
-import { ClickOutsideWrapper, Spinner, useStyles2, useTheme2 } from '@grafana/ui';
+import { ClickOutsideWrapper, Portal, useTheme2 } from '@grafana/ui';
 import { Role, OrgRole } from 'app/types';
 
 import { RolePickerInput } from './RolePickerInput';
 import { RolePickerMenu } from './RolePickerMenu';
-import { MENU_MAX_HEIGHT, ROLE_PICKER_SUBMENU_MIN_WIDTH, ROLE_PICKER_WIDTH } from './constants';
-import { getStyles } from './styles';
+import { MENU_MAX_HEIGHT, ROLE_PICKER_MAX_MENU_WIDTH, ROLE_PICKER_WIDTH } from './constants';
 
 export interface Props {
   basicRole?: OrgRole;
@@ -49,8 +48,8 @@ export const RolePicker = ({
   const [selectedBuiltInRole, setSelectedBuiltInRole] = useState<OrgRole | undefined>(basicRole);
   const [query, setQuery] = useState('');
   const [offset, setOffset] = useState({ vertical: 0, horizontal: 0 });
+  const [menuLeft, setMenuLeft] = useState(false);
   const ref = useRef<HTMLDivElement>(null);
-  const styles = useStyles2(getStyles);
   const theme = useTheme2();
   const widthPx = typeof width === 'number' ? theme.spacing(width) : width;
 
@@ -59,22 +58,46 @@ export const RolePicker = ({
     setSelectedRoles(appliedRoles);
   }, [appliedRoles, basicRole, onBasicRoleChange]);
 
+  const setMenuPosition = useCallback(() => {
+    const { horizontal, vertical, menuToLeft } = calculateMenuPosition();
+    if (horizontal && vertical) {
+      setOffset({ horizontal, vertical });
+      setMenuLeft(menuToLeft);
+    }
+  }, []);
+
   useEffect(() => {
-    const dimensions = ref?.current?.getBoundingClientRect();
-    if (!dimensions || !isOpen) {
+    if (!isOpen) {
       return;
     }
-    const { bottom, top, left, right, width: currentRolePickerWidth } = dimensions;
-    const distance = window.innerHeight - bottom;
-    const offsetVertical = bottom - top + 10; // Add extra 10px to offset to account for border and outline
-    const offsetHorizontal = right - left;
-    let horizontal = -offsetHorizontal;
-    let vertical = -offsetVertical;
+    setMenuPosition();
+  }, [isOpen, selectedRoles, setMenuPosition]);
+
+  const calculateMenuPosition = () => {
+    const dimensions = ref?.current?.getBoundingClientRect();
+    if (!dimensions) {
+      return {};
+    }
+    const { bottom, top, left, right } = dimensions;
+    let horizontal = left;
+    let menuToLeft = false;
 
+    const distance = window.innerHeight - bottom;
+    let vertical = bottom + 5;
+    let ToTheSide = false;
     if (distance < MENU_MAX_HEIGHT + 20) {
-      // Off set to display the role picker menu at the bottom of the screen
-      // without resorting to scroll the page
-      vertical = 50 + (MENU_MAX_HEIGHT - distance) - offsetVertical;
+      // move the menu above the input if there is not enough space below
+      vertical = top - MENU_MAX_HEIGHT - 50;
+    }
+
+    // check if there is enough space above the input field
+    if (top < MENU_MAX_HEIGHT + 50) {
+      // if not, reset the vertical position
+      vertical = top;
+      // move the menu to the right edge of the input field
+      horizontal = right + 5;
+      // flag to align the menu to the right or left edge of the input field
+      ToTheSide = true;
     }
 
     /*
@@ -84,25 +107,24 @@ export const RolePicker = ({
      * both (the role picker menu and its sub menu) aligned to the left edge of the input.
      * Otherwise, it aligns the role picker menu to the right.
      */
-    if (
-      window.innerWidth - right < currentRolePickerWidth &&
-      currentRolePickerWidth < 2 * ROLE_PICKER_SUBMENU_MIN_WIDTH
-    ) {
-      horizontal = offsetHorizontal;
+    if (horizontal + ROLE_PICKER_MAX_MENU_WIDTH > window.innerWidth) {
+      horizontal = window.innerWidth - (ToTheSide ? left : right);
+      menuToLeft = true;
     }
 
-    setOffset({ horizontal, vertical });
-  }, [isOpen, selectedRoles]);
+    return { horizontal, vertical, menuToLeft };
+  };
 
   const onOpen = useCallback(
     (event: FormEvent<HTMLElement>) => {
       if (!disabled) {
         event.preventDefault();
         event.stopPropagation();
+        setMenuPosition();
         setOpen(true);
       }
     },
-    [setOpen, disabled]
+    [disabled, setMenuPosition]
   );
 
   const onClose = useCallback(() => {
@@ -152,15 +174,6 @@ export const RolePicker = ({
     return options;
   };
 
-  if (isLoading) {
-    return (
-      <div style={{ maxWidth: widthPx || maxWidth, width: widthPx }}>
-        <span>Loading...</span>
-        <Spinner inline className={styles.loadingSpinner} />
-      </div>
-    );
-  }
-
   return (
     <div
       data-testid="role-picker"
@@ -171,7 +184,7 @@ export const RolePicker = ({
       }}
       ref={ref}
     >
-      <ClickOutsideWrapper onClick={onClickOutside} useCapture={true}>
+      <ClickOutsideWrapper onClick={onClickOutside} useCapture={false}>
         <RolePickerInput
           basicRole={selectedBuiltInRole}
           appliedRoles={selectedRoles}
@@ -183,23 +196,32 @@ export const RolePicker = ({
           disabled={disabled}
           showBasicRole={showBasicRole}
           width={widthPx}
+          isLoading={isLoading}
         />
         {isOpen && (
-          <RolePickerMenu
-            options={getOptions()}
-            basicRole={selectedBuiltInRole}
-            appliedRoles={appliedRoles}
-            onBasicRoleSelect={onBasicRoleSelect}
-            onSelect={onSelect}
-            onUpdate={onUpdate}
-            showGroups={query.length === 0 || query.trim() === ''}
-            basicRoleDisabled={basicRoleDisabled}
-            disabledMessage={basicRoleDisabledMessage}
-            showBasicRole={showBasicRole}
-            updateDisabled={basicRoleDisabled && !canUpdateRoles}
-            apply={apply}
-            offset={offset}
-          />
+          <Portal>
+            {/* Since menu rendered in portal and whole component wrapped in ClickOutsideWrapper, */}
+            {/* we need to stop event propagation to prevent closing menu */}
+            {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions */}
+            <div onClick={(e) => e.stopPropagation()}>
+              <RolePickerMenu
+                options={getOptions()}
+                basicRole={selectedBuiltInRole}
+                appliedRoles={appliedRoles}
+                onBasicRoleSelect={onBasicRoleSelect}
+                onSelect={onSelect}
+                onUpdate={onUpdate}
+                showGroups={query.length === 0 || query.trim() === ''}
+                basicRoleDisabled={basicRoleDisabled}
+                disabledMessage={basicRoleDisabledMessage}
+                showBasicRole={showBasicRole}
+                updateDisabled={basicRoleDisabled && !canUpdateRoles}
+                apply={apply}
+                offset={offset}
+                menuLeft={menuLeft}
+              />
+            </div>
+          </Portal>
         )}
       </ClickOutsideWrapper>
     </div>
diff --git a/public/app/core/components/RolePicker/RolePickerInput.tsx b/public/app/core/components/RolePicker/RolePickerInput.tsx
index 084a0aab6cc52..e5caab4b88707 100644
--- a/public/app/core/components/RolePicker/RolePickerInput.tsx
+++ b/public/app/core/components/RolePicker/RolePickerInput.tsx
@@ -2,7 +2,7 @@ import { css, cx } from '@emotion/css';
 import React, { FormEvent, HTMLProps, useEffect, useRef } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { useStyles2, getInputStyles, sharedInputStyle, styleMixins, Tooltip, Icon } from '@grafana/ui';
+import { useStyles2, getInputStyles, sharedInputStyle, styleMixins, Tooltip, Icon, Spinner } from '@grafana/ui';
 
 import { Role } from '../../../types';
 
@@ -19,6 +19,7 @@ interface InputProps extends HTMLProps<HTMLInputElement> {
   isFocused?: boolean;
   disabled?: boolean;
   width?: string;
+  isLoading?: boolean;
   onQueryChange: (query?: string) => void;
   onOpen: (event: FormEvent<HTMLElement>) => void;
   onClose: () => void;
@@ -32,6 +33,7 @@ export const RolePickerInput = ({
   query,
   showBasicRole,
   width,
+  isLoading,
   onOpen,
   onClose,
   onQueryChange,
@@ -63,12 +65,17 @@ export const RolePickerInput = ({
         numberOfRoles={appliedRoles.length}
         showBuiltInRole={showBasicRoleOnLabel}
       />
+      {isLoading && (
+        <div className={styles.spinner}>
+          <Spinner size={16} inline />
+        </div>
+      )}
     </div>
   ) : (
     <div className={styles.wrapper}>
       {showBasicRoleOnLabel && <ValueContainer>{basicRole}</ValueContainer>}
       {appliedRoles.map((role) => (
-        <ValueContainer key={role.uid}>{role.displayName || role.name}</ValueContainer>
+        <ValueContainer key={role.uid}>{role.group + ':' + (role.displayName || role.name)}</ValueContainer>
       ))}
 
       {!disabled && (
@@ -107,7 +114,7 @@ export const RolesLabel = ({ showBuiltInRole, numberOfRoles, appliedRoles }: Rol
         <Tooltip
           content={
             <div className={styles.tooltip}>
-              {appliedRoles?.map((role) => <p key={role.uid}>{role.displayName}</p>)}
+              {appliedRoles?.map((role) => <p key={role.uid}>{role.group + ':' + (role.displayName || role.name)}</p>)}
             </div>
           }
         >
@@ -141,22 +148,22 @@ const getRolePickerInputStyles = (
           ${styleMixins.focusCss(theme.v1)}
         `,
       disabled && styles.inputDisabled,
-      css`
-        min-width: ${width || ROLE_PICKER_WIDTH + 'px'};
-        width: ${width};
-        min-height: 32px;
-        height: auto;
-        flex-direction: row;
-        padding-right: 24px;
-        max-width: 100%;
-        align-items: center;
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: flex-start;
-        position: relative;
-        box-sizing: border-box;
-        cursor: default;
-      `,
+      css({
+        minWidth: width || ROLE_PICKER_WIDTH + 'px',
+        width: width,
+        minHeight: '32px',
+        height: 'auto',
+        flexDirection: 'row',
+        paddingRight: theme.spacing(1),
+        maxWidth: '100%',
+        alignItems: 'center',
+        display: 'flex',
+        flexWrap: 'wrap',
+        justifyContent: 'flex-start',
+        position: 'relative',
+        boxSizing: 'border-box',
+        cursor: 'default',
+      }),
       withPrefix &&
         css`
           padding-left: 0;
@@ -184,6 +191,11 @@ const getRolePickerInputStyles = (
         margin-bottom: ${theme.spacing(0.5)};
       }
     `,
+    spinner: css({
+      display: 'flex',
+      flexGrow: 1,
+      justifyContent: 'flex-end',
+    }),
   };
 };
 
diff --git a/public/app/core/components/RolePicker/RolePickerMenu.tsx b/public/app/core/components/RolePicker/RolePickerMenu.tsx
index 1da2a057b52ee..1bfe1d63ce7cc 100644
--- a/public/app/core/components/RolePicker/RolePickerMenu.tsx
+++ b/public/app/core/components/RolePicker/RolePickerMenu.tsx
@@ -63,6 +63,7 @@ interface RolePickerMenuProps {
   updateDisabled?: boolean;
   apply?: boolean;
   offset: { vertical: number; horizontal: number };
+  menuLeft?: boolean;
 }
 
 export const RolePickerMenu = ({
@@ -78,6 +79,7 @@ export const RolePickerMenu = ({
   onUpdate,
   updateDisabled,
   offset,
+  menuLeft,
   apply,
 }: RolePickerMenuProps): JSX.Element => {
   const [selectedOptions, setSelectedOptions] = useState<Role[]>(appliedRoles);
@@ -206,11 +208,12 @@ export const RolePickerMenu = ({
       className={cx(
         styles.menu,
         customStyles.menuWrapper,
-        { [customStyles.menuLeft]: offset.horizontal > 0 },
-        css`
-          bottom: ${offset.vertical > 0 ? `${offset.vertical}px` : 'unset'};
-          top: ${offset.vertical < 0 ? `${Math.abs(offset.vertical)}px` : 'unset'};
-        `
+        { [customStyles.menuLeft]: menuLeft },
+        css({
+          top: `${offset.vertical}px`,
+          left: !menuLeft ? `${offset.horizontal}px` : 'unset',
+          right: menuLeft ? `${offset.horizontal}px` : 'unset',
+        })
       )}
     >
       <div className={customStyles.menu} aria-label="Role picker menu">
@@ -248,7 +251,7 @@ export const RolePickerMenu = ({
               selectedOptions={selectedOptions}
               onRoleChange={onChange}
               onClearSubMenu={onClearSubMenu}
-              showOnLeftSubMenu={offset.horizontal > 0}
+              showOnLeftSubMenu={menuLeft}
             />
           ))}
         </CustomScrollbar>
diff --git a/public/app/core/components/RolePicker/TeamRolePicker.tsx b/public/app/core/components/RolePicker/TeamRolePicker.tsx
index 98d292da3cf52..f4f33871a537b 100644
--- a/public/app/core/components/RolePicker/TeamRolePicker.tsx
+++ b/public/app/core/components/RolePicker/TeamRolePicker.tsx
@@ -12,6 +12,7 @@ export interface Props {
   orgId?: number;
   roleOptions: Role[];
   disabled?: boolean;
+  roles?: Role[];
   onApplyRoles?: (newRoles: Role[]) => void;
   pendingRoles?: Role[];
   /**
@@ -28,36 +29,42 @@ export interface Props {
   apply?: boolean;
   maxWidth?: string | number;
   width?: string | number;
+  isLoading?: boolean;
 }
 
 export const TeamRolePicker = ({
   teamId,
   roleOptions,
   disabled,
+  roles,
   onApplyRoles,
   pendingRoles,
   apply = false,
   maxWidth,
   width,
+  isLoading,
 }: Props) => {
-  const [{ loading, value: appliedRoles = [] }, getTeamRoles] = useAsyncFn(async () => {
+  const [{ loading, value: appliedRoles = roles || [] }, getTeamRoles] = useAsyncFn(async () => {
     try {
+      if (roles) {
+        return roles;
+      }
       if (apply && Boolean(pendingRoles?.length)) {
         return pendingRoles;
       }
 
-      if (contextSrv.hasPermission(AccessControlAction.ActionTeamsRolesList)) {
+      if (contextSrv.hasPermission(AccessControlAction.ActionTeamsRolesList) && teamId > 0) {
         return await fetchTeamRoles(teamId);
       }
     } catch (e) {
       console.error('Error loading options', e);
     }
     return [];
-  }, [teamId, pendingRoles]);
+  }, [teamId, pendingRoles, roles]);
 
   useEffect(() => {
     getTeamRoles();
-  }, [teamId, getTeamRoles, pendingRoles]);
+  }, [getTeamRoles]);
 
   const onRolesChange = async (roles: Role[]) => {
     if (!apply) {
@@ -78,7 +85,7 @@ export const TeamRolePicker = ({
       onRolesChange={onRolesChange}
       roleOptions={roleOptions}
       appliedRoles={appliedRoles}
-      isLoading={loading}
+      isLoading={loading || isLoading}
       disabled={disabled}
       basicRoleDisabled={true}
       canUpdateRoles={canUpdateRoles}
diff --git a/public/app/core/components/RolePicker/UserRolePicker.tsx b/public/app/core/components/RolePicker/UserRolePicker.tsx
index ca7cecdc07b1d..1b3bab63b7172 100644
--- a/public/app/core/components/RolePicker/UserRolePicker.tsx
+++ b/public/app/core/components/RolePicker/UserRolePicker.tsx
@@ -9,6 +9,7 @@ import { fetchUserRoles, updateUserRoles } from './api';
 
 export interface Props {
   basicRole: OrgRole;
+  roles?: Role[];
   userId: number;
   orgId?: number;
   onBasicRoleChange: (newRole: OrgRole) => void;
@@ -32,10 +33,12 @@ export interface Props {
   pendingRoles?: Role[];
   maxWidth?: string | number;
   width?: string | number;
+  isLoading?: boolean;
 }
 
 export const UserRolePicker = ({
   basicRole,
+  roles,
   userId,
   orgId,
   onBasicRoleChange,
@@ -48,14 +51,18 @@ export const UserRolePicker = ({
   pendingRoles,
   maxWidth,
   width,
+  isLoading,
 }: Props) => {
-  const [{ loading, value: appliedRoles = [] }, getUserRoles] = useAsyncFn(async () => {
+  const [{ loading, value: appliedRoles = roles || [] }, getUserRoles] = useAsyncFn(async () => {
     try {
+      if (roles) {
+        return roles;
+      }
       if (apply && Boolean(pendingRoles?.length)) {
         return pendingRoles;
       }
 
-      if (contextSrv.hasPermission(AccessControlAction.ActionUserRolesList)) {
+      if (contextSrv.hasPermission(AccessControlAction.ActionUserRolesList) && userId > 0) {
         return await fetchUserRoles(userId, orgId);
       }
     } catch (e) {
@@ -63,14 +70,14 @@ export const UserRolePicker = ({
       console.error('Error loading options');
     }
     return [];
-  }, [orgId, userId, pendingRoles]);
+  }, [orgId, userId, pendingRoles, roles]);
 
   useEffect(() => {
     // only load roles when there is an Org selected
     if (orgId) {
       getUserRoles();
     }
-  }, [orgId, getUserRoles, pendingRoles]);
+  }, [getUserRoles, orgId]);
 
   const onRolesChange = async (roles: Role[]) => {
     if (!apply) {
@@ -92,7 +99,7 @@ export const UserRolePicker = ({
       onRolesChange={onRolesChange}
       onBasicRoleChange={onBasicRoleChange}
       roleOptions={roleOptions}
-      isLoading={loading}
+      isLoading={loading || isLoading}
       disabled={disabled}
       basicRoleDisabled={basicRoleDisabled}
       basicRoleDisabledMessage={basicRoleDisabledMessage}
diff --git a/public/app/core/components/RolePicker/api.ts b/public/app/core/components/RolePicker/api.ts
index da0273fc881d4..978fe333c4d7a 100644
--- a/public/app/core/components/RolePicker/api.ts
+++ b/public/app/core/components/RolePicker/api.ts
@@ -3,7 +3,7 @@ import { Role } from 'app/types';
 
 import { addDisplayNameForFixedRole } from './utils';
 
-export const fetchRoleOptions = async (orgId?: number, query?: string): Promise<Role[]> => {
+export const fetchRoleOptions = async (orgId?: number): Promise<Role[]> => {
   let rolesUrl = '/api/access-control/roles?delegatable=true';
   if (orgId) {
     rolesUrl += `&targetOrgId=${orgId}`;
diff --git a/public/app/core/components/RolePicker/constants.ts b/public/app/core/components/RolePicker/constants.ts
index 3b6c35447dadb..f2c0f8818fafb 100644
--- a/public/app/core/components/RolePicker/constants.ts
+++ b/public/app/core/components/RolePicker/constants.ts
@@ -1,3 +1,11 @@
-export const MENU_MAX_HEIGHT = 300; // max height for the picker's dropdown menu
 export const ROLE_PICKER_WIDTH = 360;
-export const ROLE_PICKER_SUBMENU_MIN_WIDTH = 260;
+
+export const MENU_MAX_HEIGHT = 300; // max height for the picker's dropdown menu
+
+export const ROLE_PICKER_MENU_MIN_WIDTH = 320;
+export const ROLE_PICKER_MENU_MAX_WIDTH = 360;
+
+export const ROLE_PICKER_SUBMENU_MIN_WIDTH = 320;
+export const ROLE_PICKER_SUBMENU_MAX_WIDTH = 360;
+
+export const ROLE_PICKER_MAX_MENU_WIDTH = ROLE_PICKER_MENU_MAX_WIDTH + ROLE_PICKER_SUBMENU_MAX_WIDTH;
diff --git a/public/app/core/components/RolePicker/styles.ts b/public/app/core/components/RolePicker/styles.ts
index 74ce953af80c3..bbafed71a8713 100644
--- a/public/app/core/components/RolePicker/styles.ts
+++ b/public/app/core/components/RolePicker/styles.ts
@@ -2,7 +2,12 @@ import { css } from '@emotion/css';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
-import { ROLE_PICKER_SUBMENU_MIN_WIDTH } from './constants';
+import {
+  ROLE_PICKER_MENU_MAX_WIDTH,
+  ROLE_PICKER_MENU_MIN_WIDTH,
+  ROLE_PICKER_SUBMENU_MAX_WIDTH,
+  ROLE_PICKER_SUBMENU_MIN_WIDTH,
+} from './constants';
 
 export const getStyles = (theme: GrafanaTheme2) => ({
   hideScrollBar: css({
@@ -24,18 +29,19 @@ export const getStyles = (theme: GrafanaTheme2) => ({
     minWidth: 'auto',
   }),
   menu: css({
-    minWidth: `${ROLE_PICKER_SUBMENU_MIN_WIDTH}px`,
+    minWidth: `${ROLE_PICKER_MENU_MIN_WIDTH}px`,
+    maxWidth: `${ROLE_PICKER_MENU_MAX_WIDTH}px`,
     '& > div': {
       paddingTop: theme.spacing(1),
     },
   }),
   menuLeft: css({
-    right: 0,
     flexDirection: 'row-reverse',
   }),
   subMenu: css({
     height: '100%',
     minWidth: `${ROLE_PICKER_SUBMENU_MIN_WIDTH}px`,
+    maxWidth: `${ROLE_PICKER_SUBMENU_MAX_WIDTH}px`,
     display: 'flex',
     flexDirection: 'column',
     borderLeft: `1px solid ${theme.components.input.borderColor}`,
@@ -83,7 +89,7 @@ export const getStyles = (theme: GrafanaTheme2) => ({
   }),
   menuOptionExpand: css({
     position: 'absolute',
-    right: theme.spacing(1.25),
+    right: theme.spacing(2.5),
     color: theme.colors.text.disabled,
 
     '&:after': {
diff --git a/public/app/core/components/Select/FolderPicker.tsx b/public/app/core/components/Select/FolderPicker.tsx
index 71cfb8262ff78..1611b96136602 100644
--- a/public/app/core/components/Select/FolderPicker.tsx
+++ b/public/app/core/components/Select/FolderPicker.tsx
@@ -28,7 +28,9 @@ interface FolderPickerProps extends NestedFolderPickerProps {
 // Temporary wrapper component to switch between the NestedFolderPicker and the old flat
 // FolderPicker depending on feature flags
 export function FolderPicker(props: FolderPickerProps) {
-  const nestedEnabled = config.featureToggles.nestedFolders && config.featureToggles.nestedFolderPicker;
+  const nestedEnabled =
+    config.featureToggles.newFolderPicker ||
+    (config.featureToggles.nestedFolders && config.featureToggles.nestedFolderPicker);
   const { initialTitle, dashboardId, enableCreateNew, ...newFolderPickerProps } = props;
 
   return nestedEnabled ? <NestedFolderPicker {...newFolderPickerProps} /> : <OldFolderPickerWrapper {...props} />;
diff --git a/public/app/core/components/Select/MetricSelect.tsx b/public/app/core/components/Select/MetricSelect.tsx
index cdbbc7be4a249..c1fca99041851 100644
--- a/public/app/core/components/Select/MetricSelect.tsx
+++ b/public/app/core/components/Select/MetricSelect.tsx
@@ -1,10 +1,9 @@
 import { flatten } from 'lodash';
-import React, { useMemo, useCallback } from 'react';
+import React, { useCallback, useMemo } from 'react';
 
 import { SelectableValue } from '@grafana/data';
-import { LegacyForms } from '@grafana/ui';
+import { Select } from '@grafana/ui';
 import { Variable } from 'app/types/templates';
-const { Select } = LegacyForms;
 
 export interface Props {
   onChange: (value: string | undefined) => void;
@@ -33,7 +32,7 @@ export const MetricSelect = (props: Props) => {
       isSearchable={isSearchable}
       maxMenuHeight={500}
       placeholder={placeholder}
-      noOptionsMessage={() => 'No options found'}
+      noOptionsMessage="No options found"
       value={selected}
     />
   );
diff --git a/public/app/core/components/Select/OldFolderPicker.test.tsx b/public/app/core/components/Select/OldFolderPicker.test.tsx
index 2b27a1fbfd735..9b86d840f6558 100644
--- a/public/app/core/components/Select/OldFolderPicker.test.tsx
+++ b/public/app/core/components/Select/OldFolderPicker.test.tsx
@@ -35,7 +35,7 @@ describe('OldFolderPicker', () => {
 
     render(<OldFolderPicker onChange={jest.fn()} filter={(hits) => hits.filter((h) => h.uid !== 'wfTJJL5Wz')} />);
 
-    const pickerContainer = screen.getByLabelText(selectors.components.FolderPicker.input);
+    const pickerContainer = screen.getByTestId(selectors.components.FolderPicker.input);
     selectEvent.openMenu(pickerContainer);
 
     const pickerOptions = await screen.findAllByLabelText('Select option');
@@ -62,7 +62,7 @@ describe('OldFolderPicker', () => {
     render(<OldFolderPicker onChange={onChangeFn} enableCreateNew={true} allowEmpty={true} />);
     expect(await screen.findByTestId(selectors.components.FolderPicker.containerV2)).toBeInTheDocument();
 
-    await userEvent.type(screen.getByLabelText('Select a folder'), newFolder.title);
+    await userEvent.type(screen.getByTestId(selectors.components.FolderPicker.input), newFolder.title);
     const enter = await screen.findByText('Hit enter to add');
 
     await userEvent.click(enter);
@@ -76,7 +76,7 @@ describe('OldFolderPicker', () => {
     });
   });
 
-  it('should show the General folder by default for editors', async () => {
+  it('should show the Dashboards root by default for editors', async () => {
     jest
       .spyOn(api, 'searchFolders')
       .mockResolvedValue([
@@ -89,15 +89,15 @@ describe('OldFolderPicker', () => {
     const onChangeFn = jest.fn();
     render(<OldFolderPicker onChange={onChangeFn} />);
     expect(await screen.findByTestId(selectors.components.FolderPicker.containerV2)).toBeInTheDocument();
-    const pickerContainer = screen.getByLabelText(selectors.components.FolderPicker.input);
+    const pickerContainer = screen.getByTestId(selectors.components.FolderPicker.input);
     selectEvent.openMenu(pickerContainer);
 
     const pickerOptions = await screen.findAllByLabelText('Select option');
 
-    expect(pickerOptions[0]).toHaveTextContent('General');
+    expect(pickerOptions[0]).toHaveTextContent('Dashboards');
   });
 
-  it('should not show the General folder by default if showRoot is false', async () => {
+  it('should not show the Dashboards root by default if showRoot is false', async () => {
     jest
       .spyOn(api, 'searchFolders')
       .mockResolvedValue([
@@ -110,15 +110,15 @@ describe('OldFolderPicker', () => {
     const onChangeFn = jest.fn();
     render(<OldFolderPicker onChange={onChangeFn} showRoot={false} />);
     expect(await screen.findByTestId(selectors.components.FolderPicker.containerV2)).toBeInTheDocument();
-    const pickerContainer = screen.getByLabelText(selectors.components.FolderPicker.input);
+    const pickerContainer = screen.getByTestId(selectors.components.FolderPicker.input);
     selectEvent.openMenu(pickerContainer);
 
     const pickerOptions = await screen.findAllByLabelText('Select option');
 
-    expect(pickerOptions[0]).not.toHaveTextContent('General');
+    expect(pickerOptions[0]).not.toHaveTextContent('Dashboards');
   });
 
-  it('should not show the General folder by default for not editors', async () => {
+  it('should not show the Dashboards root by default for not editors', async () => {
     jest
       .spyOn(api, 'searchFolders')
       .mockResolvedValue([
@@ -131,12 +131,12 @@ describe('OldFolderPicker', () => {
     const onChangeFn = jest.fn();
     render(<OldFolderPicker onChange={onChangeFn} />);
     expect(await screen.findByTestId(selectors.components.FolderPicker.containerV2)).toBeInTheDocument();
-    const pickerContainer = screen.getByLabelText(selectors.components.FolderPicker.input);
+    const pickerContainer = screen.getByTestId(selectors.components.FolderPicker.input);
     selectEvent.openMenu(pickerContainer);
 
     const pickerOptions = await screen.findAllByLabelText('Select option');
 
-    expect(pickerOptions[0]).not.toHaveTextContent('General');
+    expect(pickerOptions[0]).not.toHaveTextContent('Dashboards');
   });
 
   it('should return the correct search results when typing in the select', async () => {
@@ -152,7 +152,7 @@ describe('OldFolderPicker', () => {
     const onChangeFn = jest.fn();
     render(<OldFolderPicker onChange={onChangeFn} />);
 
-    const pickerContainer = screen.getByLabelText(selectors.components.FolderPicker.input);
+    const pickerContainer = screen.getByTestId(selectors.components.FolderPicker.input);
     await userEvent.type(pickerContainer, 'Test');
 
     expect(await screen.findByText('Dash Test')).toBeInTheDocument();
diff --git a/public/app/core/components/Select/OldFolderPicker.tsx b/public/app/core/components/Select/OldFolderPicker.tsx
index 77fbf504c087c..c144b30fba1b5 100644
--- a/public/app/core/components/Select/OldFolderPicker.tsx
+++ b/public/app/core/components/Select/OldFolderPicker.tsx
@@ -1,16 +1,15 @@
 import { css } from '@emotion/css';
 import debounce from 'debounce-promise';
-import React, { useState, useEffect, useMemo, useCallback, FormEvent } from 'react';
+import React, { FormEvent, useCallback, useEffect, useMemo, useState } from 'react';
 import { useAsync } from 'react-use';
 
-import { AppEvents, SelectableValue, GrafanaTheme2 } from '@grafana/data';
+import { AppEvents, GrafanaTheme2, SelectableValue } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { reportInteraction } from '@grafana/runtime';
-import { useStyles2, ActionMeta, Input, InputActionMeta, AsyncVirtualizedSelect } from '@grafana/ui';
+import { ActionMeta, AsyncVirtualizedSelect, Input, InputActionMeta, useStyles2 } from '@grafana/ui';
 import appEvents from 'app/core/app_events';
 import { t } from 'app/core/internationalization';
 import { contextSrv } from 'app/core/services/context_srv';
-import { newBrowseDashboardsEnabled } from 'app/features/browse-dashboards/featureFlag';
 import { createFolder, getFolderByUid, searchFolders } from 'app/features/manage-dashboards/state/actions';
 import { DashboardSearchHit } from 'app/features/search/types';
 import { AccessControlAction, PermissionLevelString, SearchQueryType } from 'app/types';
@@ -55,6 +54,7 @@ export interface Props {
   skipInitialLoad?: boolean;
   /** The id of the search input. Use this to set a matching label with htmlFor */
   inputId?: string;
+  invalid?: boolean;
 }
 
 export type SelectedFolder = SelectableValue<string>;
@@ -79,9 +79,10 @@ export function OldFolderPicker(props: Props) {
     searchQueryType,
     customAdd,
     folderWarning,
+    invalid,
   } = props;
 
-  const rootName = rootNameProp ?? newBrowseDashboardsEnabled() ? 'Dashboards' : 'General';
+  const rootName = rootNameProp ?? 'Dashboards';
 
   const [folder, setFolder] = useState<SelectedFolder | null>(null);
   const [isCreatingNew, setIsCreatingNew] = useState(false);
@@ -339,7 +340,7 @@ export function OldFolderPicker(props: Props) {
         <FolderWarningWhenSearching />
         <AsyncVirtualizedSelect
           inputId={inputId}
-          aria-label={selectors.components.FolderPicker.input}
+          data-testid={selectors.components.FolderPicker.input}
           loadingMessage={t('folder-picker.loading', 'Loading folders...')}
           defaultOptions
           defaultValue={folder}
@@ -350,6 +351,7 @@ export function OldFolderPicker(props: Props) {
           loadOptions={debouncedSearch}
           onChange={onFolderChange}
           onCreateOption={createNewFolder}
+          invalid={invalid}
           isClearable={isClearable}
         />
       </div>
@@ -381,9 +383,9 @@ export async function getInitialValues({ folderName, folderUid, getFolder }: Arg
 }
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  newFolder: css`
-    color: ${theme.colors.warning.main};
-    font-size: ${theme.typography.bodySmall.fontSize};
-    padding-bottom: ${theme.spacing(1)};
-  `,
+  newFolder: css({
+    color: theme.colors.warning.main,
+    fontSize: theme.typography.bodySmall.fontSize,
+    paddingBottom: theme.spacing(1),
+  }),
 });
diff --git a/public/app/core/components/Select/OrgPicker.tsx b/public/app/core/components/Select/OrgPicker.tsx
index e465decd5296e..27214d9f18e23 100644
--- a/public/app/core/components/Select/OrgPicker.tsx
+++ b/public/app/core/components/Select/OrgPicker.tsx
@@ -45,8 +45,11 @@ export function OrgPicker({ onSelected, className, inputId, autoFocus, excludeOr
       className={className}
       isLoading={orgOptionsState.loading}
       defaultOptions={true}
-      isSearchable={false}
       loadOptions={getOrgOptions}
+      filterOption={(option, rawInput) => {
+        const input = rawInput.toLowerCase();
+        return !!option.value?.name.toLowerCase().includes(input);
+      }}
       onChange={onSelected}
       placeholder="Select organization"
       noOptionsMessage="No organizations found"
diff --git a/public/app/core/components/SharedPreferences/SharedPreferences.tsx b/public/app/core/components/SharedPreferences/SharedPreferences.tsx
index 819608c4fb11c..67147e5af1177 100644
--- a/public/app/core/components/SharedPreferences/SharedPreferences.tsx
+++ b/public/app/core/components/SharedPreferences/SharedPreferences.tsx
@@ -5,11 +5,11 @@ import { FeatureState, SelectableValue, getBuiltInThemes, ThemeRegistryItem } fr
 import { selectors } from '@grafana/e2e-selectors';
 import { config, reportInteraction } from '@grafana/runtime';
 import { Preferences as UserPreferencesDTO } from '@grafana/schema/src/raw/preferences/x/preferences_types.gen';
+// Psiphon change - remove unused import
 import {
   Button,
   Field,
   FieldSet,
-  Form,
   Label,
   Select,
   stylesFactory,
@@ -19,7 +19,7 @@ import {
 } from '@grafana/ui';
 import { DashboardPicker } from 'app/core/components/Select/DashboardPicker';
 import { t, Trans } from 'app/core/internationalization';
-import { LANGUAGES } from 'app/core/internationalization/constants';
+import { LANGUAGES, PSEUDO_LOCALE } from 'app/core/internationalization/constants';
 import { PreferencesService } from 'app/core/services/PreferencesService';
 import { changeTheme } from 'app/core/services/theme';
 
@@ -36,7 +36,17 @@ function getLanguageOptions(): Array<SelectableValue<string>> {
   const languageOptions = LANGUAGES.map((v) => ({
     value: v.code,
     label: v.name,
-  }));
+  })).sort((a, b) => {
+    if (a.value === PSEUDO_LOCALE) {
+      return 1;
+    }
+
+    if (b.value === PSEUDO_LOCALE) {
+      return -1;
+    }
+
+    return a.label.localeCompare(b.label);
+  });
 
   const options = [
     {
@@ -87,7 +97,8 @@ export class SharedPreferences extends PureComponent<Props, State> {
     });
   }
 
-  onSubmitForm = async () => {
+  onSubmitForm = async (event: React.FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
     const confirmationResult = this.props.onConfirm ? await this.props.onConfirm() : true;
 
     if (confirmationResult) {
@@ -130,101 +141,85 @@ export class SharedPreferences extends PureComponent<Props, State> {
   };
 
   render() {
-    const { theme, timezone, weekStart, homeDashboardUID, language } = this.state;
+    // Psiphon change - remove unused theme variable
+    const { timezone, weekStart, homeDashboardUID, language } = this.state;
     const { disabled } = this.props;
     const styles = getStyles();
     const languages = getLanguageOptions();
-    const currentThemeOption = this.themeOptions.find((x) => x.value === theme) ?? this.themeOptions[0];
+    // Psiphon change - remove unused check for theme options
 
+    // Psiphon change - remove theme change radio buttons in user preferences form.
+    // We are only supporting light theme for now
     return (
-      <Form onSubmit={this.onSubmitForm}>
-        {() => {
-          return (
-            <>
-              <FieldSet label={<Trans i18nKey="shared-preferences.title">Preferences</Trans>} disabled={disabled}>
-                <Field label={t('shared-preferences.fields.theme-label', 'Interface theme')}>
-                  <Select
-                    options={this.themeOptions}
-                    value={currentThemeOption}
-                    onChange={this.onThemeChanged}
-                    inputId="shared-preferences-theme-select"
-                  />
-                </Field>
-
-                <Field
-                  label={
-                    <Label htmlFor="home-dashboard-select">
-                      <span className={styles.labelText}>
-                        <Trans i18nKey="shared-preferences.fields.home-dashboard-label">Home Dashboard</Trans>
-                      </span>
-                    </Label>
-                  }
-                  data-testid="User preferences home dashboard drop down"
-                >
-                  <DashboardPicker
-                    value={homeDashboardUID}
-                    onChange={(v) => this.onHomeDashboardChanged(v?.uid ?? '')}
-                    defaultOptions={true}
-                    isClearable={true}
-                    placeholder={t('shared-preferences.fields.home-dashboard-placeholder', 'Default dashboard')}
-                    inputId="home-dashboard-select"
-                  />
-                </Field>
-
-                <Field
-                  label={t('shared-dashboard.fields.timezone-label', 'Timezone')}
-                  data-testid={selectors.components.TimeZonePicker.containerV2}
-                >
-                  <TimeZonePicker
-                    includeInternal={true}
-                    value={timezone}
-                    onChange={this.onTimeZoneChanged}
-                    inputId="shared-preferences-timezone-picker"
-                  />
-                </Field>
-
-                <Field
-                  label={t('shared-preferences.fields.week-start-label', 'Week start')}
-                  data-testid={selectors.components.WeekStartPicker.containerV2}
-                >
-                  <WeekStartPicker
-                    value={weekStart || ''}
-                    onChange={this.onWeekStartChanged}
-                    inputId={'shared-preferences-week-start-picker'}
-                  />
-                </Field>
-
-                <Field
-                  label={
-                    <Label htmlFor="locale-select">
-                      <span className={styles.labelText}>
-                        <Trans i18nKey="shared-preferences.fields.locale-label">Language</Trans>
-                      </span>
-                      <FeatureBadge featureState={FeatureState.beta} />
-                    </Label>
-                  }
-                  data-testid="User preferences language drop down"
-                >
-                  <Select
-                    value={languages.find((lang) => lang.value === language)}
-                    onChange={(lang: SelectableValue<string>) => this.onLanguageChanged(lang.value ?? '')}
-                    options={languages}
-                    placeholder={t('shared-preferences.fields.locale-placeholder', 'Choose language')}
-                    inputId="locale-select"
-                  />
-                </Field>
-              </FieldSet>
-              <Button
-                type="submit"
-                variant="primary"
-                data-testid={selectors.components.UserProfile.preferencesSaveButton}
-              >
-                <Trans i18nKey="common.save">Save</Trans>
-              </Button>
-            </>
-          );
-        }}
-      </Form>
+      <form onSubmit={this.onSubmitForm} className={styles.form}>
+        <FieldSet label={<Trans i18nKey="shared-preferences.title">Preferences</Trans>} disabled={disabled}>
+          <Field
+            label={
+              <Label htmlFor="home-dashboard-select">
+                <span className={styles.labelText}>
+                  <Trans i18nKey="shared-preferences.fields.home-dashboard-label">Home Dashboard</Trans>
+                </span>
+              </Label>
+            }
+            data-testid="User preferences home dashboard drop down"
+          >
+            <DashboardPicker
+              value={homeDashboardUID}
+              onChange={(v) => this.onHomeDashboardChanged(v?.uid ?? '')}
+              defaultOptions={true}
+              isClearable={true}
+              placeholder={t('shared-preferences.fields.home-dashboard-placeholder', 'Default dashboard')}
+              inputId="home-dashboard-select"
+            />
+          </Field>
+
+          <Field
+            label={t('shared-dashboard.fields.timezone-label', 'Timezone')}
+            data-testid={selectors.components.TimeZonePicker.containerV2}
+          >
+            <TimeZonePicker
+              includeInternal={true}
+              value={timezone}
+              onChange={this.onTimeZoneChanged}
+              inputId="shared-preferences-timezone-picker"
+            />
+          </Field>
+
+          <Field
+            label={t('shared-preferences.fields.week-start-label', 'Week start')}
+            data-testid={selectors.components.WeekStartPicker.containerV2}
+          >
+            <WeekStartPicker
+              value={weekStart || ''}
+              onChange={this.onWeekStartChanged}
+              inputId={'shared-preferences-week-start-picker'}
+            />
+          </Field>
+
+          <Field
+            label={
+              <Label htmlFor="locale-select">
+                <span className={styles.labelText}>
+                  <Trans i18nKey="shared-preferences.fields.locale-label">Language</Trans>
+                </span>
+                <FeatureBadge featureState={FeatureState.beta} />
+              </Label>
+            }
+            data-testid="User preferences language drop down"
+          >
+            <Select
+              value={languages.find((lang) => lang.value === language)}
+              onChange={(lang: SelectableValue<string>) => this.onLanguageChanged(lang.value ?? '')}
+              options={languages}
+              placeholder={t('shared-preferences.fields.locale-placeholder', 'Choose language')}
+              inputId="locale-select"
+            />
+          </Field>
+        </FieldSet>
+        <Button type="submit" variant="primary" data-testid={selectors.components.UserProfile.preferencesSaveButton}>
+          <Trans i18nKey="common.save">Save</Trans>
+        </Button>
+      </form>
     );
   }
 }
@@ -233,9 +228,13 @@ export default SharedPreferences;
 
 const getStyles = stylesFactory(() => {
   return {
-    labelText: css`
-      margin-right: 6px;
-    `,
+    labelText: css({
+      marginRight: '6px',
+    }),
+    form: css({
+      width: '100%',
+      maxWidth: '600px',
+    }),
   };
 });
 
diff --git a/public/app/core/components/Signup/SignupPage.test.tsx b/public/app/core/components/Signup/SignupPage.test.tsx
index 9d3c867563288..5c2a0ffb4680b 100644
--- a/public/app/core/components/Signup/SignupPage.test.tsx
+++ b/public/app/core/components/Signup/SignupPage.test.tsx
@@ -14,6 +14,7 @@ jest.mock('@grafana/runtime', () => ({
     post: postMock,
   }),
   config: {
+    ...jest.requireActual('@grafana/runtime').config,
     loginError: false,
     buildInfo: {
       version: 'v1.0',
diff --git a/public/app/core/components/Signup/SignupPage.tsx b/public/app/core/components/Signup/SignupPage.tsx
index d0d1bd2c434c1..c91cb3646982a 100644
--- a/public/app/core/components/Signup/SignupPage.tsx
+++ b/public/app/core/components/Signup/SignupPage.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
+import { useForm } from 'react-hook-form';
 
 import { getBackendSrv } from '@grafana/runtime';
-import { Form, Field, Input, Button, HorizontalGroup, LinkButton, FormAPI } from '@grafana/ui';
+import { Field, Input, Button, LinkButton, Stack } from '@grafana/ui';
 import { getConfig } from 'app/core/config';
 import { useAppNotification } from 'app/core/copy/appNotification';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
@@ -27,8 +28,15 @@ interface QueryParams {
 
 interface Props extends GrafanaRouteComponentProps<{}, QueryParams> {}
 
-export const SignupPage = (props: Props) => {
+export const SignupPage = ({ queryParams }: Props) => {
   const notifyApp = useAppNotification();
+  const {
+    handleSubmit,
+    formState: { errors },
+    register,
+    getValues,
+  } = useForm<SignupDTO>({ defaultValues: { email: queryParams.email, code: queryParams.code } });
+
   const onSubmit = async (formData: SignupDTO) => {
     if (formData.name === '') {
       delete formData.name;
@@ -55,72 +63,63 @@ export const SignupPage = (props: Props) => {
     window.location.assign(getConfig().appSubUrl + '/');
   };
 
-  const defaultValues = {
-    email: props.queryParams.email,
-    code: props.queryParams.code,
-  };
-
   return (
     <LoginLayout>
       <InnerBox>
-        <Form defaultValues={defaultValues} onSubmit={onSubmit}>
-          {({ errors, register, getValues }: FormAPI<SignupDTO>) => (
-            <>
-              <Field label="Your name">
-                <Input id="user-name" {...register('name')} placeholder="(optional)" />
-              </Field>
-              <Field label="Email" invalid={!!errors.email} error={errors.email?.message}>
-                <Input
-                  id="email"
-                  {...register('email', {
-                    required: 'Email is required',
-                    pattern: {
-                      value: w3cStandardEmailValidator,
-                      message: 'Email is invalid',
-                    },
-                  })}
-                  type="email"
-                  placeholder="Email"
-                />
-              </Field>
-              {!getConfig().autoAssignOrg && (
-                <Field label="Org. name">
-                  <Input id="org-name" {...register('orgName')} placeholder="Org. name" />
-                </Field>
-              )}
-              {getConfig().verifyEmailEnabled && (
-                <Field label="Email verification code (sent to your email)">
-                  <Input id="verification-code" {...register('code')} placeholder="Code" />
-                </Field>
-              )}
-              <Field label="Password" invalid={!!errors.password} error={errors?.password?.message}>
-                <PasswordField
-                  id="new-password"
-                  autoFocus
-                  autoComplete="new-password"
-                  {...register('password', { required: 'Password is required' })}
-                />
-              </Field>
-              <Field label="Confirm password" invalid={!!errors.confirm} error={errors?.confirm?.message}>
-                <PasswordField
-                  id="confirm-new-password"
-                  autoComplete="new-password"
-                  {...register('confirm', {
-                    required: 'Confirmed password is required',
-                    validate: (v) => v === getValues().password || 'Passwords must match!',
-                  })}
-                />
-              </Field>
-
-              <HorizontalGroup>
-                <Button type="submit">Submit</Button>
-                <LinkButton fill="text" href={getConfig().appSubUrl + '/login'}>
-                  Back to login
-                </LinkButton>
-              </HorizontalGroup>
-            </>
+        <form onSubmit={handleSubmit(onSubmit)} style={{ width: '100%' }}>
+          <Field label="Your name">
+            <Input id="user-name" {...register('name')} placeholder="(optional)" />
+          </Field>
+          <Field label="Email" invalid={!!errors.email} error={errors.email?.message}>
+            <Input
+              id="email"
+              {...register('email', {
+                required: 'Email is required',
+                pattern: {
+                  value: w3cStandardEmailValidator,
+                  message: 'Email is invalid',
+                },
+              })}
+              type="email"
+              placeholder="Email"
+            />
+          </Field>
+          {!getConfig().autoAssignOrg && (
+            <Field label="Org. name">
+              <Input id="org-name" {...register('orgName')} placeholder="Org. name" />
+            </Field>
+          )}
+          {getConfig().verifyEmailEnabled && (
+            <Field label="Email verification code (sent to your email)">
+              <Input id="verification-code" {...register('code')} placeholder="Code" />
+            </Field>
           )}
-        </Form>
+          <Field label="Password" invalid={!!errors.password} error={errors?.password?.message}>
+            <PasswordField
+              id="new-password"
+              autoFocus
+              autoComplete="new-password"
+              {...register('password', { required: 'Password is required' })}
+            />
+          </Field>
+          <Field label="Confirm password" invalid={!!errors.confirm} error={errors?.confirm?.message}>
+            <PasswordField
+              id="confirm-new-password"
+              autoComplete="new-password"
+              {...register('confirm', {
+                required: 'Confirmed password is required',
+                validate: (v) => v === getValues().password || 'Passwords must match!',
+              })}
+            />
+          </Field>
+
+          <Stack>
+            <Button type="submit">Submit</Button>
+            <LinkButton fill="text" href={getConfig().appSubUrl + '/login'}>
+              Back to login
+            </LinkButton>
+          </Stack>
+        </form>
       </InnerBox>
     </LoginLayout>
   );
diff --git a/public/app/core/components/Signup/VerifyEmail.tsx b/public/app/core/components/Signup/VerifyEmail.tsx
index e372217e06ce9..cc255572863b8 100644
--- a/public/app/core/components/Signup/VerifyEmail.tsx
+++ b/public/app/core/components/Signup/VerifyEmail.tsx
@@ -1,7 +1,8 @@
 import React, { useState } from 'react';
+import { useForm } from 'react-hook-form';
 
 import { getBackendSrv } from '@grafana/runtime';
-import { Form, Field, Input, Button, Legend, Container, HorizontalGroup, LinkButton } from '@grafana/ui';
+import { Field, Input, Button, Legend, Container, LinkButton, Stack } from '@grafana/ui';
 import { getConfig } from 'app/core/config';
 import { useAppNotification } from 'app/core/copy/appNotification';
 import { w3cStandardEmailValidator } from 'app/features/admin/utils';
@@ -12,6 +13,11 @@ interface EmailDTO {
 
 export const VerifyEmail = () => {
   const notifyApp = useAppNotification();
+  const {
+    handleSubmit,
+    register,
+    formState: { errors },
+  } = useForm<EmailDTO>();
   const [emailSent, setEmailSent] = useState(false);
 
   const onSubmit = (formModel: EmailDTO) => {
@@ -39,36 +45,32 @@ export const VerifyEmail = () => {
   }
 
   return (
-    <Form onSubmit={onSubmit}>
-      {({ register, errors }) => (
-        <>
-          <Legend>Verify Email</Legend>
-          <Field
-            label="Email"
-            description="Enter your email address to get a verification link sent to you"
-            invalid={!!errors.email}
-            error={errors.email?.message}
-          >
-            <Input
-              id="email"
-              {...register('email', {
-                required: 'Email is required',
-                pattern: {
-                  value: w3cStandardEmailValidator,
-                  message: 'Email is invalid',
-                },
-              })}
-              placeholder="Email"
-            />
-          </Field>
-          <HorizontalGroup>
-            <Button type="submit">Send verification email</Button>
-            <LinkButton fill="text" href={getConfig().appSubUrl + '/login'}>
-              Back to login
-            </LinkButton>
-          </HorizontalGroup>
-        </>
-      )}
-    </Form>
+    <form onSubmit={handleSubmit(onSubmit)}>
+      <Legend>Verify Email</Legend>
+      <Field
+        label="Email"
+        description="Enter your email address to get a verification link sent to you"
+        invalid={!!errors.email}
+        error={errors.email?.message}
+      >
+        <Input
+          id="email"
+          {...register('email', {
+            required: 'Email is required',
+            pattern: {
+              value: w3cStandardEmailValidator,
+              message: 'Email is invalid',
+            },
+          })}
+          placeholder="Email"
+        />
+      </Field>
+      <Stack>
+        <Button type="submit">Send verification email</Button>
+        <LinkButton fill="text" href={getConfig().appSubUrl + '/login'}>
+          Back to login
+        </LinkButton>
+      </Stack>
+    </form>
   );
 };
diff --git a/public/app/core/components/Signup/VerifyEmailPage.test.tsx b/public/app/core/components/Signup/VerifyEmailPage.test.tsx
index 00dbb378a4d08..ebdf201e9cd38 100644
--- a/public/app/core/components/Signup/VerifyEmailPage.test.tsx
+++ b/public/app/core/components/Signup/VerifyEmailPage.test.tsx
@@ -12,6 +12,7 @@ jest.mock('@grafana/runtime', () => ({
     post: postMock,
   }),
   config: {
+    ...jest.requireActual('@grafana/runtime').config,
     buildInfo: {
       version: 'v1.0',
       commit: '1',
diff --git a/public/app/core/components/SplitPaneWrapper/SplitPaneWrapper.tsx b/public/app/core/components/SplitPaneWrapper/SplitPaneWrapper.tsx
index a282feb0f3bcc..54691d448451c 100644
--- a/public/app/core/components/SplitPaneWrapper/SplitPaneWrapper.tsx
+++ b/public/app/core/components/SplitPaneWrapper/SplitPaneWrapper.tsx
@@ -3,6 +3,7 @@ import React, { createRef, MutableRefObject, PureComponent } from 'react';
 import SplitPane, { Split } from 'react-split-pane';
 
 import { GrafanaTheme2 } from '@grafana/data';
+import { getDragStyles } from '@grafana/ui';
 import { config } from 'app/core/config';
 
 interface Props {
@@ -74,6 +75,7 @@ export class SplitPaneWrapper extends PureComponent<React.PropsWithChildren<Prop
 
     // Limit options pane width to 90% of screen.
     const styles = getStyles(config.theme2, splitVisible);
+    const dragStyles = getDragStyles(config.theme2);
 
     // Need to handle when width is relative. ie a percentage of the viewport
     const paneSizePx =
@@ -89,13 +91,15 @@ export class SplitPaneWrapper extends PureComponent<React.PropsWithChildren<Prop
 
     return (
       <SplitPane
-        className={styles.splitPane}
         split={splitOrientation}
         minSize={minSize}
         maxSize={maxSize}
         size={splitVisible ? paneSizePx : 0}
         primary={splitVisible ? primary : 'second'}
-        resizerClassName={splitOrientation === 'horizontal' ? styles.resizerH : styles.resizerV}
+        resizerClassName={cx(
+          styles.resizer,
+          splitOrientation === 'horizontal' ? dragStyles.dragHandleHorizontal : dragStyles.dragHandleVertical
+        )}
         onDragStarted={() => this.onDragStarted()}
         onDragFinished={(size) => this.onDragFinished(size)}
         style={parentStyle}
@@ -109,83 +113,9 @@ export class SplitPaneWrapper extends PureComponent<React.PropsWithChildren<Prop
 }
 
 const getStyles = (theme: GrafanaTheme2, hasSplit: boolean) => {
-  const handleColor = theme.v1.palette.blue95;
-  const paneSpacing = theme.spacing(2);
-
-  const resizer = css`
-    position: relative;
-    display: ${hasSplit ? 'block' : 'none'};
-
-    &::before {
-      content: '';
-      position: absolute;
-      transition: 0.2s border-color ease-in-out;
-    }
-
-    &::after {
-      background: ${theme.components.panel.borderColor};
-      content: '';
-      position: absolute;
-      left: 50%;
-      top: 50%;
-      transition: 0.2s background ease-in-out;
-      transform: translate(-50%, -50%);
-      border-radius: ${theme.shape.radius.default};
-    }
-
-    &:hover {
-      &::before {
-        border-color: ${handleColor};
-      }
-
-      &::after {
-        background: ${handleColor};
-      }
-    }
-  `;
-
   return {
-    splitPane: css({
-      overflow: 'visible !important',
+    resizer: css({
+      display: hasSplit ? 'block' : 'none',
     }),
-    resizerV: cx(
-      resizer,
-      css`
-        cursor: col-resize;
-        width: ${paneSpacing};
-
-        &::before {
-          border-right: 1px solid transparent;
-          height: 100%;
-          left: 50%;
-          transform: translateX(-50%);
-        }
-
-        &::after {
-          height: 200px;
-          width: 4px;
-        }
-      `
-    ),
-    resizerH: cx(
-      resizer,
-      css`
-        height: ${paneSpacing};
-        cursor: row-resize;
-        margin-left: ${paneSpacing};
-
-        &::before {
-          border-top: 1px solid transparent;
-          top: 50%;
-          transform: translateY(-50%);
-          width: 100%;
-        }
-
-        &::after {
-          height: 4px;
-          width: 200px;
-        }
-      `
-    ),
   };
 };
diff --git a/public/app/core/components/TimePicker/TimePickerWithHistory.test.tsx b/public/app/core/components/TimePicker/TimePickerWithHistory.test.tsx
index 87ab11d13c8ab..99883186c3e9a 100644
--- a/public/app/core/components/TimePicker/TimePickerWithHistory.test.tsx
+++ b/public/app/core/components/TimePicker/TimePickerWithHistory.test.tsx
@@ -9,8 +9,8 @@ import { TimePickerWithHistory } from './TimePickerWithHistory';
 describe('TimePickerWithHistory', () => {
   // In some of the tests we close and re-open the picker. When we do that we must re-find these inputs
   // as new elements will have been mounted
-  const getFromField = () => screen.getByLabelText('Time Range from field');
-  const getToField = () => screen.getByLabelText('Time Range to field');
+  const getFromField = () => screen.getByLabelText('From');
+  const getToField = () => screen.getByLabelText('To');
   const getApplyButton = () => screen.getByRole('button', { name: 'Apply time range' });
 
   const LOCAL_STORAGE_KEY = 'grafana.dashboard.timepicker.history';
@@ -113,7 +113,6 @@ describe('TimePickerWithHistory', () => {
 
     const timeRange = getDefaultTimeRange();
     render(<TimePickerWithHistory value={timeRange} {...props} />);
-    await userEvent.click(screen.getByLabelText(/Time range selected/));
 
     for (const [inputFrom, inputTo] of inputRanges) {
       await userEvent.click(screen.getByLabelText(/Time range selected/));
diff --git a/public/app/core/components/TimePicker/TimePickerWithHistory.tsx b/public/app/core/components/TimePicker/TimePickerWithHistory.tsx
index eb399d90f219e..570d2fb57806b 100644
--- a/public/app/core/components/TimePicker/TimePickerWithHistory.tsx
+++ b/public/app/core/components/TimePicker/TimePickerWithHistory.tsx
@@ -1,8 +1,10 @@
 import { uniqBy } from 'lodash';
 import React from 'react';
 
-import { TimeRange, isDateTime, rangeUtil } from '@grafana/data';
+import { AppEvents, TimeRange, isDateTime, rangeUtil } from '@grafana/data';
 import { TimeRangePickerProps, TimeRangePicker } from '@grafana/ui';
+import { t } from '@grafana/ui/src/utils/i18n';
+import appEvents from 'app/core/app_events';
 
 import { LocalStorageValueProvider } from '../LocalStorageValueProvider';
 
@@ -34,6 +36,12 @@ export const TimePickerWithHistory = (props: Props) => {
               onAppendToHistory(value, values, onSaveToStore);
               props.onChange(value);
             }}
+            onError={(error?: string) =>
+              appEvents.emit(AppEvents.alertError, [
+                t('time-picker.copy-paste.default-error-title', 'Invalid time range'),
+                t('time-picker.copy-paste.default-error-message', `{{error}} is not a valid time range`, { error }),
+              ])
+            }
           />
         );
       }}
diff --git a/public/app/core/components/TimeSeries/TimeSeries.tsx b/public/app/core/components/TimeSeries/TimeSeries.tsx
new file mode 100644
index 0000000000000..4ecc98b5b5119
--- /dev/null
+++ b/public/app/core/components/TimeSeries/TimeSeries.tsx
@@ -0,0 +1,64 @@
+import React, { Component } from 'react';
+
+import { DataFrame, TimeRange } from '@grafana/data';
+import { PanelContextRoot } from '@grafana/ui/src/components/PanelChrome/PanelContext';
+import { hasVisibleLegendSeries, PlotLegend } from '@grafana/ui/src/components/uPlot/PlotLegend';
+import { UPlotConfigBuilder } from '@grafana/ui/src/components/uPlot/config/UPlotConfigBuilder';
+import { withTheme2 } from '@grafana/ui/src/themes/ThemeContext';
+
+import { GraphNG, GraphNGProps, PropDiffFn } from '../GraphNG/GraphNG';
+
+import { preparePlotConfigBuilder } from './utils';
+
+const propsToDiff: Array<string | PropDiffFn> = ['legend', 'options', 'theme'];
+
+type TimeSeriesProps = Omit<GraphNGProps, 'prepConfig' | 'propsToDiff' | 'renderLegend'>;
+
+export class UnthemedTimeSeries extends Component<TimeSeriesProps> {
+  static contextType = PanelContextRoot;
+  declare context: React.ContextType<typeof PanelContextRoot>;
+
+  prepConfig = (alignedFrame: DataFrame, allFrames: DataFrame[], getTimeRange: () => TimeRange) => {
+    const { eventsScope, sync } = this.context;
+    const { theme, timeZone, options, renderers, tweakAxis, tweakScale } = this.props;
+
+    return preparePlotConfigBuilder({
+      frame: alignedFrame,
+      theme,
+      timeZones: Array.isArray(timeZone) ? timeZone : [timeZone],
+      getTimeRange,
+      sync,
+      allFrames,
+      renderers,
+      tweakScale,
+      tweakAxis,
+      eventsScope,
+      hoverProximity: options?.tooltip?.hoverProximity,
+      orientation: options?.orientation,
+    });
+  };
+
+  renderLegend = (config: UPlotConfigBuilder) => {
+    const { legend, frames } = this.props;
+
+    if (!config || (legend && !legend.showLegend) || !hasVisibleLegendSeries(config, frames)) {
+      return null;
+    }
+
+    return <PlotLegend data={frames} config={config} {...legend} />;
+  };
+
+  render() {
+    return (
+      <GraphNG
+        {...this.props}
+        prepConfig={this.prepConfig}
+        propsToDiff={propsToDiff}
+        renderLegend={this.renderLegend}
+      />
+    );
+  }
+}
+
+export const TimeSeries = withTheme2(UnthemedTimeSeries);
+TimeSeries.displayName = 'TimeSeries';
diff --git a/public/app/core/components/TimeSeries/utils.test.ts b/public/app/core/components/TimeSeries/utils.test.ts
new file mode 100644
index 0000000000000..583358c7c4c7f
--- /dev/null
+++ b/public/app/core/components/TimeSeries/utils.test.ts
@@ -0,0 +1,274 @@
+import { EventBus, FieldType } from '@grafana/data';
+import { getTheme } from '@grafana/ui';
+
+import { preparePlotConfigBuilder } from './utils';
+
+describe('when fill below to option is used', () => {
+  let eventBus: EventBus;
+  // eslint-disable-next-line
+  let renderers: any[];
+  // eslint-disable-next-line
+  let tests: any;
+
+  beforeEach(() => {
+    eventBus = {
+      publish: jest.fn(),
+      getStream: jest.fn(),
+      subscribe: jest.fn(),
+      removeAllListeners: jest.fn(),
+      newScopedBus: jest.fn(),
+    };
+    renderers = [];
+
+    tests = [
+      {
+        alignedFrame: {
+          fields: [
+            {
+              config: {},
+              values: [1667406900000, 1667407170000, 1667407185000],
+              name: 'Time',
+              state: { multipleFrames: true, displayName: 'Time', origin: { fieldIndex: 0, frameIndex: 0 } },
+              type: FieldType.time,
+            },
+            {
+              config: { displayNameFromDS: 'Test1', custom: { fillBelowTo: 'Test2' }, min: 0, max: 100 },
+              values: [1, 2, 3],
+              name: 'Value',
+              state: { multipleFrames: true, displayName: 'Test1', origin: { fieldIndex: 1, frameIndex: 0 } },
+              type: FieldType.number,
+            },
+            {
+              config: { displayNameFromDS: 'Test2', min: 0, max: 100 },
+              values: [4, 5, 6],
+              name: 'Value',
+              state: { multipleFrames: true, displayName: 'Test2', origin: { fieldIndex: 1, frameIndex: 1 } },
+              type: FieldType.number,
+            },
+          ],
+          length: 3,
+        },
+        allFrames: [
+          {
+            name: 'Test1',
+            refId: 'A',
+            fields: [
+              {
+                config: {},
+                values: [1667406900000, 1667407170000, 1667407185000],
+                name: 'Time',
+                state: { multipleFrames: true, displayName: 'Time', origin: { fieldIndex: 0, frameIndex: 0 } },
+                type: FieldType.time,
+              },
+              {
+                config: { displayNameFromDS: 'Test1', custom: { fillBelowTo: 'Test2' }, min: 0, max: 100 },
+                values: [1, 2, 3],
+                name: 'Value',
+                state: { multipleFrames: true, displayName: 'Test1', origin: { fieldIndex: 1, frameIndex: 0 } },
+                type: FieldType.number,
+              },
+            ],
+            length: 2,
+          },
+          {
+            name: 'Test2',
+            refId: 'B',
+            fields: [
+              {
+                config: {},
+                values: [1667406900000, 1667407170000, 1667407185000],
+                name: 'Time',
+                state: { multipleFrames: true, displayName: 'Time', origin: { fieldIndex: 0, frameIndex: 1 } },
+                type: FieldType.time,
+              },
+              {
+                config: { displayNameFromDS: 'Test2', min: 0, max: 100 },
+                values: [1, 2, 3],
+                name: 'Value',
+                state: { multipleFrames: true, displayName: 'Test2', origin: { fieldIndex: 1, frameIndex: 1 } },
+                type: FieldType.number,
+              },
+            ],
+            length: 2,
+          },
+        ],
+        expectedResult: 1,
+      },
+      {
+        alignedFrame: {
+          fields: [
+            {
+              config: {},
+              values: [1667406900000, 1667407170000, 1667407185000],
+              name: 'time',
+              state: { multipleFrames: true, displayName: 'time', origin: { fieldIndex: 0, frameIndex: 0 } },
+              type: FieldType.time,
+            },
+            {
+              config: { custom: { fillBelowTo: 'below_value1' } },
+              values: [1, 2, 3],
+              name: 'value1',
+              state: { multipleFrames: true, displayName: 'value1', origin: { fieldIndex: 1, frameIndex: 0 } },
+              type: FieldType.number,
+            },
+            {
+              config: { custom: { fillBelowTo: 'below_value2' } },
+              values: [4, 5, 6],
+              name: 'value2',
+              state: { multipleFrames: true, displayName: 'value2', origin: { fieldIndex: 2, frameIndex: 0 } },
+              type: FieldType.number,
+            },
+            {
+              config: {},
+              values: [4, 5, 6],
+              name: 'below_value1',
+              state: { multipleFrames: true, displayName: 'below_value1', origin: { fieldIndex: 1, frameIndex: 1 } },
+              type: FieldType.number,
+            },
+            {
+              config: {},
+              values: [4, 5, 6],
+              name: 'below_value2',
+              state: { multipleFrames: true, displayName: 'below_value2', origin: { fieldIndex: 2, frameIndex: 1 } },
+              type: FieldType.number,
+            },
+          ],
+          length: 5,
+        },
+        allFrames: [
+          {
+            refId: 'A',
+            fields: [
+              {
+                config: {},
+                values: [1667406900000, 1667407170000, 1667407185000],
+                name: 'time',
+                state: { multipleFrames: true, displayName: 'time', origin: { fieldIndex: 0, frameIndex: 0 } },
+                type: FieldType.time,
+              },
+              {
+                config: { custom: { fillBelowTo: 'below_value1' } },
+                values: [1, 2, 3],
+                name: 'value1',
+                state: { multipleFrames: true, displayName: 'value1', origin: { fieldIndex: 1, frameIndex: 0 } },
+                type: FieldType.number,
+              },
+              {
+                config: { custom: { fillBelowTo: 'below_value2' } },
+                values: [4, 5, 6],
+                name: 'value2',
+                state: { multipleFrames: true, displayName: 'value2', origin: { fieldIndex: 2, frameIndex: 0 } },
+                type: FieldType.number,
+              },
+            ],
+            length: 3,
+          },
+          {
+            refId: 'B',
+            fields: [
+              {
+                config: {},
+                values: [1667406900000, 1667407170000, 1667407185000],
+                name: 'time',
+                state: { multipleFrames: true, displayName: 'time', origin: { fieldIndex: 0, frameIndex: 1 } },
+                type: FieldType.time,
+              },
+              {
+                config: {},
+                values: [4, 5, 6],
+                name: 'below_value1',
+                state: { multipleFrames: true, displayName: 'below_value1', origin: { fieldIndex: 1, frameIndex: 1 } },
+                type: FieldType.number,
+              },
+              {
+                config: {},
+                values: [4, 5, 6],
+                name: 'below_value2',
+                state: { multipleFrames: true, displayName: 'below_value2', origin: { fieldIndex: 2, frameIndex: 1 } },
+                type: FieldType.number,
+              },
+            ],
+            length: 3,
+          },
+        ],
+        expectedResult: 2,
+      },
+    ];
+  });
+
+  it('should verify if fill below to is set then builder bands are set', () => {
+    for (const test of tests) {
+      const builder = preparePlotConfigBuilder({
+        frame: test.alignedFrame,
+        //@ts-ignore
+        theme: getTheme(),
+        timeZones: ['browser'],
+        getTimeRange: jest.fn(),
+        eventBus,
+        sync: jest.fn(),
+        allFrames: test.allFrames,
+        renderers,
+      });
+
+      //@ts-ignore
+      expect(builder.bands.length).toBe(test.expectedResult);
+    }
+  });
+
+  it('should verify if fill below to is not set then builder bands are empty', () => {
+    tests[0].alignedFrame.fields[1].config.custom.fillBelowTo = undefined;
+    tests[0].allFrames[0].fields[1].config.custom.fillBelowTo = undefined;
+    tests[1].alignedFrame.fields[1].config.custom.fillBelowTo = undefined;
+    tests[1].alignedFrame.fields[2].config.custom.fillBelowTo = undefined;
+    tests[1].allFrames[0].fields[1].config.custom.fillBelowTo = undefined;
+    tests[1].allFrames[0].fields[2].config.custom.fillBelowTo = undefined;
+    tests[0].expectedResult = 0;
+    tests[1].expectedResult = 0;
+
+    for (const test of tests) {
+      const builder = preparePlotConfigBuilder({
+        frame: test.alignedFrame,
+        //@ts-ignore
+        theme: getTheme(),
+        timeZones: ['browser'],
+        getTimeRange: jest.fn(),
+        eventBus,
+        sync: jest.fn(),
+        allFrames: test.allFrames,
+        renderers,
+      });
+
+      //@ts-ignore
+      expect(builder.bands.length).toBe(test.expectedResult);
+    }
+  });
+
+  it('should verify if fill below to is set and field name is overriden then builder bands are set', () => {
+    tests[0].alignedFrame.fields[2].config.displayName = 'newName';
+    tests[0].alignedFrame.fields[2].state.displayName = 'newName';
+    tests[0].allFrames[1].fields[1].config.displayName = 'newName';
+    tests[0].allFrames[1].fields[1].state.displayName = 'newName';
+
+    tests[1].alignedFrame.fields[3].config.displayName = 'newName';
+    tests[1].alignedFrame.fields[3].state.displayName = 'newName';
+    tests[1].allFrames[1].fields[1].config.displayName = 'newName';
+    tests[1].allFrames[1].fields[1].state.displayName = 'newName';
+
+    for (const test of tests) {
+      const builder = preparePlotConfigBuilder({
+        frame: test.alignedFrame,
+        //@ts-ignore
+        theme: getTheme(),
+        timeZones: ['browser'],
+        getTimeRange: jest.fn(),
+        eventBus,
+        sync: jest.fn(),
+        allFrames: test.allFrames,
+        renderers,
+      });
+
+      //@ts-ignore
+      expect(builder.bands.length).toBe(test.expectedResult);
+    }
+  });
+});
diff --git a/public/app/core/components/TimeSeries/utils.ts b/public/app/core/components/TimeSeries/utils.ts
new file mode 100644
index 0000000000000..82b78da39cdf6
--- /dev/null
+++ b/public/app/core/components/TimeSeries/utils.ts
@@ -0,0 +1,615 @@
+import { isNumber } from 'lodash';
+import uPlot from 'uplot';
+
+import {
+  DashboardCursorSync,
+  DataFrame,
+  FieldConfig,
+  FieldType,
+  formattedValueToString,
+  getFieldColorModeForField,
+  getFieldSeriesColor,
+  getFieldDisplayName,
+  getDisplayProcessor,
+  FieldColorModeId,
+  DecimalCount,
+} from '@grafana/data';
+// eslint-disable-next-line import/order
+import {
+  AxisPlacement,
+  GraphDrawStyle,
+  GraphFieldConfig,
+  GraphThresholdsStyleMode,
+  VisibilityMode,
+  ScaleDirection,
+  ScaleOrientation,
+  StackingMode,
+  GraphTransform,
+  AxisColorMode,
+  GraphGradientMode,
+  VizOrientation,
+} from '@grafana/schema';
+
+// unit lookup needed to determine if we want power-of-2 or power-of-10 axis ticks
+// see categories.ts is @grafana/data
+const IEC_UNITS = new Set([
+  'bytes',
+  'bits',
+  'kbytes',
+  'mbytes',
+  'gbytes',
+  'tbytes',
+  'pbytes',
+  'binBps',
+  'binbps',
+  'KiBs',
+  'Kibits',
+  'MiBs',
+  'Mibits',
+  'GiBs',
+  'Gibits',
+  'TiBs',
+  'Tibits',
+  'PiBs',
+  'Pibits',
+]);
+
+const BIN_INCRS = Array(53);
+
+for (let i = 0; i < BIN_INCRS.length; i++) {
+  BIN_INCRS[i] = 2 ** i;
+}
+
+import { UPlotConfigBuilder, UPlotConfigPrepFn } from '@grafana/ui/src/components/uPlot/config/UPlotConfigBuilder';
+import { getScaleGradientFn } from '@grafana/ui/src/components/uPlot/config/gradientFills';
+import { buildScaleKey } from '@grafana/ui/src/components/uPlot/internal';
+import { getStackingGroups, preparePlotData2 } from '@grafana/ui/src/components/uPlot/utils';
+
+const defaultFormatter = (v: any, decimals: DecimalCount = 1) => (v == null ? '-' : v.toFixed(decimals));
+
+const defaultConfig: GraphFieldConfig = {
+  drawStyle: GraphDrawStyle.Line,
+  showPoints: VisibilityMode.Auto,
+  axisPlacement: AxisPlacement.Auto,
+};
+
+export const preparePlotConfigBuilder: UPlotConfigPrepFn<{
+  sync?: () => DashboardCursorSync;
+}> = ({
+  frame,
+  theme,
+  timeZones,
+  getTimeRange,
+  sync,
+  allFrames,
+  renderers,
+  tweakScale = (opts) => opts,
+  tweakAxis = (opts) => opts,
+  eventsScope = '__global_',
+  hoverProximity,
+  orientation = VizOrientation.Horizontal,
+}) => {
+  // we want the Auto and Horizontal orientation to default to Horizontal
+  const isHorizontal = orientation !== VizOrientation.Vertical;
+  const builder = new UPlotConfigBuilder(timeZones[0]);
+
+  let alignedFrame: DataFrame;
+
+  builder.setPrepData((frames) => {
+    // cache alignedFrame
+    alignedFrame = frames[0];
+
+    return preparePlotData2(frames[0], builder.getStackingGroups());
+  });
+
+  // X is the first field in the aligned frame
+  const xField = frame.fields[0];
+  if (!xField) {
+    return builder; // empty frame with no options
+  }
+
+  const xScaleKey = 'x';
+  let yScaleKey = '';
+
+  const xFieldAxisPlacement =
+    xField.config.custom?.axisPlacement === AxisPlacement.Hidden
+      ? AxisPlacement.Hidden
+      : isHorizontal
+        ? AxisPlacement.Bottom
+        : AxisPlacement.Left;
+  const xFieldAxisShow = xField.config.custom?.axisPlacement !== AxisPlacement.Hidden;
+
+  if (xField.type === FieldType.time) {
+    builder.addScale({
+      scaleKey: xScaleKey,
+      orientation: isHorizontal ? ScaleOrientation.Horizontal : ScaleOrientation.Vertical,
+      direction: isHorizontal ? ScaleDirection.Right : ScaleDirection.Up,
+      isTime: true,
+      range: () => {
+        const r = getTimeRange();
+        return [r.from.valueOf(), r.to.valueOf()];
+      },
+    });
+
+    // filters first 2 ticks to make space for timezone labels
+    const filterTicks: uPlot.Axis.Filter | undefined =
+      timeZones.length > 1
+        ? (u, splits) => {
+            if (isHorizontal) {
+              return splits.map((v, i) => (i < 2 ? null : v));
+            }
+            return splits;
+          }
+        : undefined;
+
+    for (let i = 0; i < timeZones.length; i++) {
+      const timeZone = timeZones[i];
+      builder.addAxis({
+        scaleKey: xScaleKey,
+        isTime: true,
+        placement: xFieldAxisPlacement,
+        show: xFieldAxisShow,
+        label: xField.config.custom?.axisLabel,
+        timeZone,
+        theme,
+        grid: { show: i === 0 && xField.config.custom?.axisGridShow },
+        filter: filterTicks,
+      });
+    }
+
+    // render timezone labels
+    if (timeZones.length > 1) {
+      builder.addHook('drawAxes', (u: uPlot) => {
+        u.ctx.save();
+
+        let i = 0;
+        u.axes.forEach((a) => {
+          if (isHorizontal && a.side === 2) {
+            u.ctx.fillStyle = theme.colors.text.primary;
+            u.ctx.textAlign = 'left';
+            u.ctx.textBaseline = 'bottom';
+            //@ts-ignore
+            let cssBaseline: number = a._pos + a._size;
+            u.ctx.fillText(timeZones[i], u.bbox.left, cssBaseline * uPlot.pxRatio);
+            i++;
+          }
+        });
+
+        u.ctx.restore();
+      });
+    }
+  } else {
+    builder.addScale({
+      scaleKey: xScaleKey,
+      orientation: isHorizontal ? ScaleOrientation.Horizontal : ScaleOrientation.Vertical,
+      direction: isHorizontal ? ScaleDirection.Right : ScaleDirection.Up,
+      range: (u, dataMin, dataMax) => [xField.config.min ?? dataMin, xField.config.max ?? dataMax],
+    });
+
+    builder.addAxis({
+      scaleKey: xScaleKey,
+      placement: xFieldAxisPlacement,
+      show: xFieldAxisShow,
+      label: xField.config.custom?.axisLabel,
+      theme,
+      grid: { show: xField.config.custom?.axisGridShow },
+      formatValue: (v, decimals) => formattedValueToString(xField.display!(v, decimals)),
+    });
+  }
+
+  let customRenderedFields =
+    renderers?.flatMap((r) => Object.values(r.fieldMap).filter((name) => r.indicesOnly.indexOf(name) === -1)) ?? [];
+
+  let indexByName: Map<string, number> | undefined;
+
+  for (let i = 1; i < frame.fields.length; i++) {
+    const field = frame.fields[i];
+
+    const config: FieldConfig<GraphFieldConfig> = {
+      ...field.config,
+      custom: {
+        ...defaultConfig,
+        ...field.config.custom,
+      },
+    };
+
+    const customConfig: GraphFieldConfig = config.custom!;
+
+    if (field === xField || (field.type !== FieldType.number && field.type !== FieldType.enum)) {
+      continue;
+    }
+
+    let fmt = field.display ?? defaultFormatter;
+    if (field.config.custom?.stacking?.mode === StackingMode.Percent) {
+      fmt = getDisplayProcessor({
+        field: {
+          ...field,
+          config: {
+            ...field.config,
+            unit: 'percentunit',
+          },
+        },
+        theme,
+      });
+    }
+    const scaleKey = buildScaleKey(config, field.type);
+    const colorMode = getFieldColorModeForField(field);
+    const scaleColor = getFieldSeriesColor(field, theme);
+    const seriesColor = scaleColor.color;
+
+    // The builder will manage unique scaleKeys and combine where appropriate
+    builder.addScale(
+      tweakScale(
+        {
+          scaleKey,
+          orientation: isHorizontal ? ScaleOrientation.Vertical : ScaleOrientation.Horizontal,
+          direction: isHorizontal ? ScaleDirection.Up : ScaleDirection.Right,
+          distribution: customConfig.scaleDistribution?.type,
+          log: customConfig.scaleDistribution?.log,
+          linearThreshold: customConfig.scaleDistribution?.linearThreshold,
+          min: field.config.min,
+          max: field.config.max,
+          softMin: customConfig.axisSoftMin,
+          softMax: customConfig.axisSoftMax,
+          centeredZero: customConfig.axisCenteredZero,
+          range:
+            customConfig.stacking?.mode === StackingMode.Percent
+              ? (u: uPlot, dataMin: number, dataMax: number) => {
+                  dataMin = dataMin < 0 ? -1 : 0;
+                  dataMax = dataMax > 0 ? 1 : 0;
+                  return [dataMin, dataMax];
+                }
+              : field.type === FieldType.enum
+                ? (u: uPlot, dataMin: number, dataMax: number) => {
+                    // this is the exhaustive enum (stable)
+                    let len = field.config.type!.enum!.text!.length;
+
+                    return [-1, len];
+
+                    // these are only values that are present
+                    // return [dataMin - 1, dataMax + 1]
+                  }
+                : undefined,
+          decimals: field.config.decimals,
+        },
+        field
+      )
+    );
+
+    if (!yScaleKey) {
+      yScaleKey = scaleKey;
+    }
+
+    if (customConfig.axisPlacement !== AxisPlacement.Hidden) {
+      let axisColor: uPlot.Axis.Stroke | undefined;
+
+      if (customConfig.axisColorMode === AxisColorMode.Series) {
+        if (
+          colorMode.isByValue &&
+          field.config.custom?.gradientMode === GraphGradientMode.Scheme &&
+          colorMode.id === FieldColorModeId.Thresholds
+        ) {
+          axisColor = getScaleGradientFn(1, theme, colorMode, field.config.thresholds);
+        } else {
+          axisColor = seriesColor;
+        }
+      }
+
+      const axisDisplayOptions = {
+        border: {
+          show: customConfig.axisBorderShow || false,
+          width: 1 / devicePixelRatio,
+          stroke: axisColor || theme.colors.text.primary,
+        },
+        ticks: {
+          show: customConfig.axisBorderShow || false,
+          stroke: axisColor || theme.colors.text.primary,
+        },
+        color: axisColor || theme.colors.text.primary,
+      };
+
+      let incrs: uPlot.Axis.Incrs | undefined;
+
+      // TODO: these will be dynamic with frame updates, so need to accept getYTickLabels()
+      let values: uPlot.Axis.Values | undefined;
+      let splits: uPlot.Axis.Splits | undefined;
+
+      if (IEC_UNITS.has(config.unit!)) {
+        incrs = BIN_INCRS;
+      } else if (field.type === FieldType.enum) {
+        let text = field.config.type!.enum!.text!;
+        splits = text.map((v: string, i: number) => i);
+        values = text;
+      }
+
+      builder.addAxis(
+        tweakAxis(
+          {
+            scaleKey,
+            label: customConfig.axisLabel,
+            size: customConfig.axisWidth,
+            placement: isHorizontal ? customConfig.axisPlacement ?? AxisPlacement.Auto : AxisPlacement.Bottom,
+            formatValue: (v, decimals) => formattedValueToString(fmt(v, decimals)),
+            theme,
+            grid: { show: customConfig.axisGridShow },
+            decimals: field.config.decimals,
+            distr: customConfig.scaleDistribution?.type,
+            splits,
+            values,
+            incrs,
+            ...axisDisplayOptions,
+          },
+          field
+        )
+      );
+    }
+
+    const showPoints =
+      customConfig.drawStyle === GraphDrawStyle.Points ? VisibilityMode.Always : customConfig.showPoints;
+
+    let pointsFilter: uPlot.Series.Points.Filter = () => null;
+
+    if (customConfig.spanNulls !== true) {
+      pointsFilter = (u, seriesIdx, show, gaps) => {
+        let filtered = [];
+
+        let series = u.series[seriesIdx];
+
+        if (!show && gaps && gaps.length) {
+          const [firstIdx, lastIdx] = series.idxs!;
+          const xData = u.data[0];
+          const yData = u.data[seriesIdx];
+          const firstPos = Math.round(u.valToPos(xData[firstIdx], 'x', true));
+          const lastPos = Math.round(u.valToPos(xData[lastIdx], 'x', true));
+
+          if (gaps[0][0] === firstPos) {
+            filtered.push(firstIdx);
+          }
+
+          // show single points between consecutive gaps that share end/start
+          for (let i = 0; i < gaps.length; i++) {
+            let thisGap = gaps[i];
+            let nextGap = gaps[i + 1];
+
+            if (nextGap && thisGap[1] === nextGap[0]) {
+              // approx when data density is > 1pt/px, since gap start/end pixels are rounded
+              let approxIdx = u.posToIdx(thisGap[1], true);
+
+              if (yData[approxIdx] == null) {
+                // scan left/right alternating to find closest index with non-null value
+                for (let j = 1; j < 100; j++) {
+                  if (yData[approxIdx + j] != null) {
+                    approxIdx += j;
+                    break;
+                  }
+                  if (yData[approxIdx - j] != null) {
+                    approxIdx -= j;
+                    break;
+                  }
+                }
+              }
+
+              filtered.push(approxIdx);
+            }
+          }
+
+          if (gaps[gaps.length - 1][1] === lastPos) {
+            filtered.push(lastIdx);
+          }
+        }
+
+        return filtered.length ? filtered : null;
+      };
+    }
+
+    let { fillOpacity } = customConfig;
+
+    let pathBuilder: uPlot.Series.PathBuilder | null = null;
+    let pointsBuilder: uPlot.Series.Points.Show | null = null;
+
+    if (field.state?.origin) {
+      if (!indexByName) {
+        indexByName = getNamesToFieldIndex(frame, allFrames);
+      }
+
+      const originFrame = allFrames[field.state.origin.frameIndex];
+      const originField = originFrame?.fields[field.state.origin.fieldIndex];
+
+      const dispName = getFieldDisplayName(originField ?? field, originFrame, allFrames);
+
+      // disable default renderers
+      if (customRenderedFields.indexOf(dispName) >= 0) {
+        pathBuilder = () => null;
+        pointsBuilder = () => undefined;
+      } else if (customConfig.transform === GraphTransform.Constant) {
+        // patch some monkeys!
+        const defaultBuilder = uPlot.paths!.linear!();
+
+        pathBuilder = (u, seriesIdx) => {
+          //eslint-disable-next-line
+          const _data: any[] = (u as any)._data; // uplot.AlignedData not exposed in types
+
+          // the data we want the line renderer to pull is x at each plot edge with paired flat y values
+
+          const r = getTimeRange();
+          let xData = [r.from.valueOf(), r.to.valueOf()];
+          let firstY = _data[seriesIdx].find((v: number | null | undefined) => v != null);
+          let yData = [firstY, firstY];
+          let fauxData = _data.slice();
+          fauxData[0] = xData;
+          fauxData[seriesIdx] = yData;
+
+          //eslint-disable-next-line
+          return defaultBuilder(
+            {
+              ...u,
+              _data: fauxData,
+            } as any,
+            seriesIdx,
+            0,
+            1
+          );
+        };
+      }
+
+      if (customConfig.fillBelowTo) {
+        const fillBelowToField = frame.fields.find(
+          (f) =>
+            customConfig.fillBelowTo === f.name ||
+            customConfig.fillBelowTo === f.config?.displayNameFromDS ||
+            customConfig.fillBelowTo === getFieldDisplayName(f, frame, allFrames)
+        );
+
+        const fillBelowDispName = fillBelowToField
+          ? getFieldDisplayName(fillBelowToField, frame, allFrames)
+          : customConfig.fillBelowTo;
+
+        const t = indexByName.get(dispName);
+        const b = indexByName.get(fillBelowDispName);
+        if (isNumber(b) && isNumber(t)) {
+          builder.addBand({
+            series: [t, b],
+            fill: undefined, // using null will have the band use fill options from `t`
+          });
+
+          if (!fillOpacity) {
+            fillOpacity = 35; // default from flot
+          }
+        } else {
+          fillOpacity = 0;
+        }
+      }
+    }
+
+    let dynamicSeriesColor: ((seriesIdx: number) => string | undefined) | undefined = undefined;
+
+    if (colorMode.id === FieldColorModeId.Thresholds) {
+      dynamicSeriesColor = (seriesIdx) => getFieldSeriesColor(alignedFrame.fields[seriesIdx], theme).color;
+    }
+
+    builder.addSeries({
+      pathBuilder,
+      pointsBuilder,
+      scaleKey,
+      showPoints,
+      pointsFilter,
+      colorMode,
+      fillOpacity,
+      theme,
+      dynamicSeriesColor,
+      drawStyle: customConfig.drawStyle!,
+      lineColor: customConfig.lineColor ?? seriesColor,
+      lineWidth: customConfig.lineWidth,
+      lineInterpolation: customConfig.lineInterpolation,
+      lineStyle: customConfig.lineStyle,
+      barAlignment: customConfig.barAlignment,
+      barWidthFactor: customConfig.barWidthFactor,
+      barMaxWidth: customConfig.barMaxWidth,
+      pointSize: customConfig.pointSize,
+      spanNulls: customConfig.spanNulls || false,
+      show: !customConfig.hideFrom?.viz,
+      gradientMode: customConfig.gradientMode,
+      thresholds: config.thresholds,
+      hardMin: field.config.min,
+      hardMax: field.config.max,
+      softMin: customConfig.axisSoftMin,
+      softMax: customConfig.axisSoftMax,
+      // The following properties are not used in the uPlot config, but are utilized as transport for legend config
+      dataFrameFieldIndex: field.state?.origin,
+    });
+
+    // Render thresholds in graph
+    if (customConfig.thresholdsStyle && config.thresholds) {
+      const thresholdDisplay = customConfig.thresholdsStyle.mode ?? GraphThresholdsStyleMode.Off;
+      if (thresholdDisplay !== GraphThresholdsStyleMode.Off) {
+        builder.addThresholds({
+          config: customConfig.thresholdsStyle,
+          thresholds: config.thresholds,
+          scaleKey,
+          theme,
+          hardMin: field.config.min,
+          hardMax: field.config.max,
+          softMin: customConfig.axisSoftMin,
+          softMax: customConfig.axisSoftMax,
+        });
+      }
+    }
+  }
+
+  let stackingGroups = getStackingGroups(frame);
+
+  builder.setStackingGroups(stackingGroups);
+
+  // hook up custom/composite renderers
+  renderers?.forEach((r) => {
+    if (!indexByName) {
+      indexByName = getNamesToFieldIndex(frame, allFrames);
+    }
+    let fieldIndices: Record<string, number> = {};
+
+    for (let key in r.fieldMap) {
+      let dispName = r.fieldMap[key];
+      fieldIndices[key] = indexByName.get(dispName)!;
+    }
+
+    r.init(builder, fieldIndices);
+  });
+
+  builder.scaleKeys = [xScaleKey, yScaleKey];
+
+  // if hovered value is null, how far we may scan left/right to hover nearest non-null
+  const DEFAULT_HOVER_NULL_PROXIMITY = 15;
+  const DEFAULT_FOCUS_PROXIMITY = 30;
+
+  let cursor: Partial<uPlot.Cursor> = {
+    // horizontal proximity / point hover behavior
+    hover: {
+      prox: (self, seriesIdx, hoveredIdx) => {
+        if (hoverProximity != null) {
+          return hoverProximity;
+        }
+
+        // when hovering null values, scan data left/right up to 15px
+        const yVal = self.data[seriesIdx][hoveredIdx];
+        if (yVal === null) {
+          return DEFAULT_HOVER_NULL_PROXIMITY;
+        }
+
+        // no proximity limit
+        return null;
+      },
+      skip: [null],
+    },
+    // vertical proximity / series focus behavior
+    focus: {
+      prox: hoverProximity ?? DEFAULT_FOCUS_PROXIMITY,
+    },
+  };
+
+  if (xField.type === FieldType.time && sync && sync() !== DashboardCursorSync.Off) {
+    cursor.sync = {
+      key: eventsScope,
+      scales: [xScaleKey, null],
+      // match: [() => true, () => false],
+    };
+  }
+
+  builder.setSync();
+  builder.setCursor(cursor);
+
+  return builder;
+};
+
+export function getNamesToFieldIndex(frame: DataFrame, allFrames: DataFrame[]): Map<string, number> {
+  const originNames = new Map<string, number>();
+  frame.fields.forEach((field, i) => {
+    const origin = field.state?.origin;
+    if (origin) {
+      const origField = allFrames[origin.frameIndex]?.fields[origin.fieldIndex];
+      if (origField) {
+        originNames.set(getFieldDisplayName(origField, allFrames[origin.frameIndex], allFrames), i);
+      }
+    }
+  });
+  return originNames;
+}
diff --git a/public/app/core/components/TimelineChart/TimelineChart.tsx b/public/app/core/components/TimelineChart/TimelineChart.tsx
index ac5e2e627692e..57048baed16e1 100644
--- a/public/app/core/components/TimelineChart/TimelineChart.tsx
+++ b/public/app/core/components/TimelineChart/TimelineChart.tsx
@@ -1,17 +1,10 @@
 import React from 'react';
 
 import { DataFrame, FALLBACK_COLOR, FieldType, TimeRange } from '@grafana/data';
-import { VisibilityMode, TimelineValueAlignment } from '@grafana/schema';
-import {
-  PanelContext,
-  PanelContextRoot,
-  GraphNG,
-  GraphNGProps,
-  UPlotConfigBuilder,
-  VizLayout,
-  VizLegend,
-  VizLegendItem,
-} from '@grafana/ui';
+import { VisibilityMode, TimelineValueAlignment, TooltipDisplayMode, VizTooltipOptions } from '@grafana/schema';
+import { PanelContext, PanelContextRoot, UPlotConfigBuilder, VizLayout, VizLegend, VizLegendItem } from '@grafana/ui';
+
+import { GraphNG, GraphNGProps } from '../GraphNG/GraphNG';
 
 import { preparePlotConfigBuilder, TimelineMode } from './utils';
 
@@ -25,9 +18,10 @@ export interface TimelineProps extends Omit<GraphNGProps, 'prepConfig' | 'propsT
   alignValue?: TimelineValueAlignment;
   colWidth?: number;
   legendItems?: VizLegendItem[];
+  tooltip?: VizTooltipOptions;
 }
 
-const propsToDiff = ['rowHeight', 'colWidth', 'showValue', 'mergeValues', 'alignValue'];
+const propsToDiff = ['rowHeight', 'colWidth', 'showValue', 'mergeValues', 'alignValue', 'tooltip'];
 
 export class TimelineChart extends React.Component<TimelineProps> {
   declare context: React.ContextType<typeof PanelContextRoot>;
@@ -49,12 +43,11 @@ export class TimelineChart extends React.Component<TimelineProps> {
 
   prepConfig = (alignedFrame: DataFrame, allFrames: DataFrame[], getTimeRange: () => TimeRange) => {
     this.panelContext = this.context;
-    const { eventBus, sync } = this.panelContext;
+    const { sync } = this.panelContext;
 
     return preparePlotConfigBuilder({
       frame: alignedFrame,
       getTimeRange,
-      eventBus,
       sync,
       allFrames: this.props.frames,
       ...this.props,
@@ -65,6 +58,8 @@ export class TimelineChart extends React.Component<TimelineProps> {
       // When there is only one row, use the full space
       rowHeight: alignedFrame.fields.length > 2 ? this.props.rowHeight : 1,
       getValueColor: this.getValueColor,
+
+      hoverMulti: this.props.tooltip?.mode === TooltipDisplayMode.Multi,
     });
   };
 
@@ -97,6 +92,7 @@ export class TimelineChart extends React.Component<TimelineProps> {
         prepConfig={this.prepConfig}
         propsToDiff={propsToDiff}
         renderLegend={this.renderLegend}
+        dataLinkPostProcessor={this.panelContext?.dataLinkPostProcessor}
       />
     );
   }
diff --git a/public/app/core/components/TimelineChart/timeline.ts b/public/app/core/components/TimelineChart/timeline.ts
index 18ecfdbf33de3..5afd52afbdf6b 100644
--- a/public/app/core/components/TimelineChart/timeline.ts
+++ b/public/app/core/components/TimelineChart/timeline.ts
@@ -2,10 +2,10 @@ import uPlot, { Series } from 'uplot';
 
 import { GrafanaTheme2, TimeRange } from '@grafana/data';
 import { alpha } from '@grafana/data/src/themes/colorManipulator';
-import { VisibilityMode, TimelineValueAlignment } from '@grafana/schema';
-import { FIXED_UNIT } from '@grafana/ui/src/components/GraphNG/GraphNG';
+import { TimelineValueAlignment, VisibilityMode } from '@grafana/schema';
+import { FIXED_UNIT } from '@grafana/ui';
 import { distribute, SPACE_BETWEEN } from 'app/plugins/panel/barchart/distribute';
-import { pointWithin, Quadtree, Rect } from 'app/plugins/panel/barchart/quadtree';
+import { Quadtree, Rect } from 'app/plugins/panel/barchart/quadtree';
 import { FieldConfig as StateTimeLineFieldConfig } from 'app/plugins/panel/state-timeline/panelcfg.gen';
 import { FieldConfig as StatusHistoryFieldConfig } from 'app/plugins/panel/status-history/panelcfg.gen';
 
@@ -55,6 +55,7 @@ export interface TimelineCoreOptions {
   getFieldConfig: (seriesIdx: number) => StateTimeLineFieldConfig | StatusHistoryFieldConfig;
   onHover: (seriesIdx: number, valueIdx: number, rect: Rect) => void;
   onLeave: () => void;
+  hoverMulti: boolean;
 }
 
 /**
@@ -79,6 +80,7 @@ export function getConfig(opts: TimelineCoreOptions) {
     getFieldConfig,
     onHover,
     onLeave,
+    hoverMulti,
   } = opts;
 
   let qt: Quadtree;
@@ -133,10 +135,8 @@ export function getConfig(opts: TimelineCoreOptions) {
     value: number | null,
     discrete: boolean
   ) {
-    // do not render super small boxes
-    if (boxWidth < 1) {
-      return;
-    }
+    // clamp width to allow small boxes to be rendered
+    boxWidth = Math.max(1, boxWidth);
 
     const valueColor = getValueColor(seriesIdx + 1, value);
     const fieldConfig = getFieldConfig(seriesIdx);
@@ -357,7 +357,6 @@ export function getConfig(opts: TimelineCoreOptions) {
         };
 
   const init = (u: uPlot) => {
-    let over = u.over;
     let chars = '';
     for (let i = 32; i <= 126; i++) {
       chars += String.fromCharCode(i);
@@ -367,7 +366,6 @@ export function getConfig(opts: TimelineCoreOptions) {
     // be a bit more conservtive to prevent overlap
     pxPerChar += 2.5;
 
-    over.style.overflow = 'hidden';
     u.root.querySelectorAll<HTMLDivElement>('.u-cursor-pt').forEach((el) => {
       el.style.borderRadius = '0';
     });
@@ -386,7 +384,7 @@ export function getConfig(opts: TimelineCoreOptions) {
     });
   };
 
-  function setHovered(cx: number, cy: number, cys: number[]) {
+  function setHovered(cx: number, cy: number, viaSync = false) {
     hovered.fill(null);
     hoveredAtCursor = null;
 
@@ -394,23 +392,23 @@ export function getConfig(opts: TimelineCoreOptions) {
       return;
     }
 
-    for (let i = 0; i < cys.length; i++) {
-      let cy2 = cys[i];
-
-      qt.get(cx, cy2, 1, 1, (o) => {
-        if (pointWithin(cx, cy2, o.x, o.y, o.x + o.w, o.y + o.h)) {
+    // first gets all items in all quads intersected by a 1px wide by 10k high rect at the x cursor position and 0 y position.
+    // (we use 10k instead of plot area height for simplicity and not having to pass around the uPlot instance)
+    qt.get(cx, 0, uPlot.pxRatio, 1e4, (o) => {
+      // filter only rects that intersect along x dir
+      if (cx >= o.x && cx <= o.x + o.w) {
+        // if also intersect along y dir, set both "direct hovered" and "one-of hovered"
+        if (cy >= o.y && cy <= o.y + o.h) {
+          hovered[o.sidx] = hoveredAtCursor = o;
+        }
+        // else only set "one-of hovered" (no "direct hovered") in multi mode or when synced
+        else if (hoverMulti || viaSync) {
           hovered[o.sidx] = o;
-
-          if (Math.abs(cy - cy2) <= o.h / 2) {
-            hoveredAtCursor = o;
-          }
         }
-      });
-    }
+      }
+    });
   }
 
-  const hoverMulti = mode === TimelineMode.Changes;
-
   const cursor: uPlot.Cursor = {
     x: mode === TimelineMode.Changes,
     y: false,
@@ -430,7 +428,7 @@ export function getConfig(opts: TimelineCoreOptions) {
 
         let prevHovered = hoveredAtCursor;
 
-        setHovered(cx, cy, hoverMulti ? yMids : [cy]);
+        setHovered(cx, cy, u.cursor.event == null);
 
         if (hoveredAtCursor != null) {
           if (hoveredAtCursor !== prevHovered) {
@@ -443,6 +441,10 @@ export function getConfig(opts: TimelineCoreOptions) {
 
       return hovered[seriesIdx]?.didx;
     },
+    focus: {
+      prox: 1e3,
+      dist: (u, seriesIdx) => (hoveredAtCursor?.sidx === seriesIdx ? 0 : Infinity),
+    },
     points: {
       fill: 'rgba(255,255,255,0.2)',
       bbox: (u, seriesIdx) => {
diff --git a/public/app/core/components/TimelineChart/utils.test.ts b/public/app/core/components/TimelineChart/utils.test.ts
index 15a291602b376..baa114f5da11f 100644
--- a/public/app/core/components/TimelineChart/utils.test.ts
+++ b/public/app/core/components/TimelineChart/utils.test.ts
@@ -1,6 +1,18 @@
-import { createTheme, FieldType, ThresholdsMode, TimeRange, toDataFrame, dateTime, DataFrame } from '@grafana/data';
+import {
+  createTheme,
+  FieldType,
+  ThresholdsMode,
+  TimeRange,
+  toDataFrame,
+  dateTime,
+  DataFrame,
+  fieldMatchers,
+  FieldMatcherID,
+} from '@grafana/data';
 import { LegendDisplayMode, VizLegendOptions } from '@grafana/schema';
 
+import { preparePlotFrame } from '../GraphNG/utils';
+
 import {
   findNextStateIndex,
   fmtDuration,
@@ -87,6 +99,173 @@ describe('prepare timeline graph', () => {
     const result = prepareTimelineFields(frames, true, timeRange, theme);
     expect(result.frames?.[0].fields[0].values).toEqual([1, 2, 3, 4]);
   });
+
+  it('join multiple frames with NULL_RETAIN rather than NULL_EXPAND', () => {
+    const timeRange2: TimeRange = {
+      from: dateTime('2023-10-20T05:04:00.000Z'),
+      to: dateTime('2023-10-20T07:22:00.000Z'),
+      raw: {
+        from: dateTime('2023-10-20T05:04:00.000Z'),
+        to: dateTime('2023-10-20T07:22:00.000Z'),
+      },
+    };
+
+    const frames = [
+      toDataFrame({
+        name: 'Mix',
+        fields: [
+          { name: 'time', type: FieldType.time, values: [1697778291972, 1697778393992, 1697778986994, 1697786485890] },
+          { name: 'state', type: FieldType.string, values: ['RUN', null, 'RUN', null] },
+        ],
+      }),
+      toDataFrame({
+        name: 'Cook',
+        fields: [
+          {
+            name: 'time',
+            type: FieldType.time,
+            values: [
+              1697779163986, 1697779921045, 1697780221094, 1697780521111, 1697781186192, 1697781786291, 1697783332361,
+              1697783784395, 1697783790397, 1697784146478, 1697784517471, 1697784523487, 1697784949480, 1697785369505,
+            ],
+          },
+          {
+            name: 'state',
+            type: FieldType.string,
+            values: [
+              'Heat',
+              'Stage',
+              null,
+              'Heat',
+              'Stage',
+              null,
+              'Heat',
+              'Stage',
+              null,
+              'Heat',
+              'Stage',
+              null,
+              'CCP',
+              null,
+            ],
+          },
+        ],
+      }),
+    ];
+
+    const info = prepareTimelineFields(frames, true, timeRange2, theme);
+
+    let joined = preparePlotFrame(
+      info.frames!,
+      {
+        x: fieldMatchers.get(FieldMatcherID.firstTimeField).get({}),
+        y: fieldMatchers.get(FieldMatcherID.byType).get('string'),
+      },
+      timeRange2
+    );
+
+    let vals = joined!.fields.map((f) => f.values);
+
+    expect(vals).toEqual([
+      [
+        1697778291972, 1697778393992, 1697778986994, 1697779163986, 1697779921045, 1697780221094, 1697780521111,
+        1697781186192, 1697781786291, 1697783332361, 1697783784395, 1697783790397, 1697784146478, 1697784517471,
+        1697784523487, 1697784949480, 1697785369505, 1697786485890,
+      ],
+      [
+        'RUN',
+        null,
+        'RUN',
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        null,
+      ],
+      [
+        undefined,
+        undefined,
+        undefined,
+        'Heat',
+        'Stage',
+        null,
+        'Heat',
+        'Stage',
+        null,
+        'Heat',
+        'Stage',
+        null,
+        'Heat',
+        'Stage',
+        null,
+        'CCP',
+        null,
+        undefined,
+      ],
+    ]);
+  });
+
+  it('join multiple frames with start and end time fields', () => {
+    const timeRange2: TimeRange = {
+      from: dateTime('2024-02-28T07:47:21.428Z'),
+      to: dateTime('2024-02-28T14:12:43.391Z'),
+      raw: {
+        from: dateTime('2024-02-28T07:47:21.428Z'),
+        to: dateTime('2024-02-28T14:12:43.391Z'),
+      },
+    };
+
+    const frames = [
+      toDataFrame({
+        name: 'Channel 1',
+        fields: [
+          { name: 'starttime', type: FieldType.time, values: [1709107200000, 1709118000000] },
+          { name: 'endtime', type: FieldType.time, values: [1709114400000, 1709128800000] },
+          { name: 'state', type: FieldType.string, values: ['OK', 'NO_DATA'] },
+        ],
+      }),
+      toDataFrame({
+        name: 'Channel 2',
+        fields: [
+          { name: 'starttime', type: FieldType.time, values: [1709110800000, 1709123400000] },
+          { name: 'endtime', type: FieldType.time, values: [1709116200000, 1709127000000] },
+          { name: 'state', type: FieldType.string, values: ['ERROR', 'WARNING'] },
+        ],
+      }),
+    ];
+
+    const info = prepareTimelineFields(frames, true, timeRange2, theme);
+
+    let joined = preparePlotFrame(
+      info.frames!,
+      {
+        x: fieldMatchers.get(FieldMatcherID.firstTimeField).get({}),
+        y: fieldMatchers.get(FieldMatcherID.byType).get('string'),
+      },
+      timeRange2
+    );
+
+    let vals = joined!.fields.map((f) => f.values);
+
+    expect(vals).toEqual([
+      [
+        1709107200000, 1709110800000, 1709114400000, 1709116200000, 1709118000000, 1709123400000, 1709127000000,
+        1709128800000,
+      ],
+      ['OK', undefined, null, undefined, 'NO_DATA', undefined, undefined, null],
+      [undefined, 'ERROR', undefined, null, undefined, 'WARNING', null, undefined],
+    ]);
+  });
 });
 
 describe('findNextStateIndex', () => {
diff --git a/public/app/core/components/TimelineChart/utils.ts b/public/app/core/components/TimelineChart/utils.ts
index 02048cca457d7..6a7bccfed0ae4 100644
--- a/public/app/core/components/TimelineChart/utils.ts
+++ b/public/app/core/components/TimelineChart/utils.ts
@@ -4,9 +4,6 @@ import uPlot from 'uplot';
 import {
   DataFrame,
   DashboardCursorSync,
-  DataHoverPayload,
-  DataHoverEvent,
-  DataHoverClearEvent,
   FALLBACK_COLOR,
   Field,
   FieldColorModeId,
@@ -21,8 +18,12 @@ import {
   getFieldConfigWithMinMax,
   ThresholdsMode,
   TimeRange,
+  cacheFieldDisplayNames,
+  outerJoinDataFrames,
 } from '@grafana/data';
-import { maybeSortFrame } from '@grafana/data/src/transformations/transformers/joinDataFrames';
+import { maybeSortFrame, NULL_RETAIN } from '@grafana/data/src/transformations/transformers/joinDataFrames';
+import { applyNullInsertThreshold } from '@grafana/data/src/transformations/transformers/nulls/nullInsertThreshold';
+import { nullToValue } from '@grafana/data/src/transformations/transformers/nulls/nullToValue';
 import {
   VizLegendOptions,
   AxisPlacement,
@@ -40,8 +41,6 @@ import {
   UPlotConfigPrepFn,
   VizLegendItem,
 } from '@grafana/ui';
-import { applyNullInsertThreshold } from '@grafana/ui/src/components/GraphNG/nullInsertThreshold';
-import { nullToValue } from '@grafana/ui/src/components/GraphNG/nullToValue';
 import { PlotTooltipInterpolator } from '@grafana/ui/src/components/uPlot/types';
 import { preparePlotData2, getStackingGroups } from '@grafana/ui/src/components/uPlot/utils';
 
@@ -63,6 +62,7 @@ interface UPlotConfigOptions {
   getValueColor: (frameIdx: number, fieldIdx: number, value: unknown) => string;
   // Identifies the shared key for uPlot cursor sync
   eventsScope?: string;
+  hoverMulti: boolean;
 }
 
 /**
@@ -96,7 +96,6 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<UPlotConfigOptions> = (
   timeZones,
   getTimeRange,
   mode,
-  eventBus,
   sync,
   rowHeight,
   colWidth,
@@ -105,10 +104,10 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<UPlotConfigOptions> = (
   mergeValues,
   getValueColor,
   eventsScope = '__global_',
+  hoverMulti,
 }) => {
   const builder = new UPlotConfigBuilder(timeZones[0]);
 
-  const xScaleUnit = 'time';
   const xScaleKey = 'x';
 
   const isDiscrete = (field: Field) => {
@@ -165,6 +164,7 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<UPlotConfigOptions> = (
       hoveredDataIdx = null;
       shouldChangeHover = true;
     },
+    hoverMulti,
   };
 
   let shouldChangeHover = false;
@@ -172,13 +172,6 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<UPlotConfigOptions> = (
   let hoveredDataIdx: number | null = null;
 
   const coreConfig = getConfig(opts);
-  const payload: DataHoverPayload = {
-    point: {
-      [xScaleUnit]: null,
-      [FIXED_UNIT]: null,
-    },
-    data: frame,
-  };
 
   builder.addHook('init', coreConfig.init);
   builder.addHook('drawClear', coreConfig.drawClear);
@@ -286,25 +279,6 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<UPlotConfigOptions> = (
 
     cursor.sync = {
       key: eventsScope,
-      filters: {
-        pub: (type: string, src: uPlot, x: number, y: number, w: number, h: number, dataIdx: number) => {
-          if (sync && sync() === DashboardCursorSync.Off) {
-            return false;
-          }
-          payload.rowIndex = dataIdx;
-          if (x < 0 && y < 0) {
-            payload.point[xScaleUnit] = null;
-            payload.point[FIXED_UNIT] = null;
-            eventBus.publish(new DataHoverClearEvent());
-          } else {
-            payload.point[xScaleUnit] = src.posToVal(x, xScaleKey);
-            payload.point.panelRelY = y > 0 ? y / h : 1; // used for old graph panel to position tooltip
-            payload.down = undefined;
-            eventBus.publish(new DataHoverEvent(payload));
-          }
-          return true;
-        },
-      },
       scales: [xScaleKey, null],
     };
     builder.setSync();
@@ -433,19 +407,68 @@ export function prepareTimelineFields(
   if (!series?.length) {
     return { warn: 'No data in response' };
   }
+
+  cacheFieldDisplayNames(series);
+
   let hasTimeseries = false;
   const frames: DataFrame[] = [];
 
   for (let frame of series) {
-    let isTimeseries = false;
+    let startFieldIdx = -1;
+    let endFieldIdx = -1;
+
+    for (let i = 0; i < frame.fields.length; i++) {
+      let f = frame.fields[i];
+
+      if (f.type === FieldType.time) {
+        if (startFieldIdx === -1) {
+          startFieldIdx = i;
+        } else if (endFieldIdx === -1) {
+          endFieldIdx = i;
+          break;
+        }
+      }
+    }
+
+    let isTimeseries = startFieldIdx !== -1;
     let changed = false;
-    let maybeSortedFrame = maybeSortFrame(
-      frame,
-      frame.fields.findIndex((f) => f.type === FieldType.time)
-    );
+    frame = maybeSortFrame(frame, startFieldIdx);
+
+    // if we have a second time field, assume it is state end timestamps
+    // and insert nulls into the data at the end timestamps
+    if (endFieldIdx !== -1) {
+      let startFrame: DataFrame = {
+        ...frame,
+        fields: frame.fields.filter((f, i) => i !== endFieldIdx),
+      };
+
+      let endFrame: DataFrame = {
+        length: frame.length,
+        fields: [frame.fields[endFieldIdx]],
+      };
+
+      frame = outerJoinDataFrames({
+        frames: [startFrame, endFrame],
+        keepDisplayNames: true,
+        nullMode: () => NULL_RETAIN,
+      })!;
+
+      frame.fields.forEach((f, i) => {
+        if (i > 0) {
+          let vals = f.values;
+          for (let i = 0; i < vals.length; i++) {
+            if (vals[i] == null) {
+              vals[i] = null;
+            }
+          }
+        }
+      });
+
+      changed = true;
+    }
 
     let nulledFrame = applyNullInsertThreshold({
-      frame: maybeSortedFrame,
+      frame,
       refFieldPseudoMin: timeRange.from.valueOf(),
       refFieldPseudoMax: timeRange.to.valueOf(),
     });
@@ -454,8 +477,10 @@ export function prepareTimelineFields(
       changed = true;
     }
 
+    frame = nullToValue(nulledFrame);
+
     const fields: Field[] = [];
-    for (let field of nullToValue(nulledFrame).fields) {
+    for (let field of frame.fields) {
       if (field.config.custom?.hideFrom?.viz) {
         continue;
       }
@@ -488,6 +513,7 @@ export function prepareTimelineFields(
               },
             },
           };
+          changed = true;
           fields.push(field);
           break;
         default:
@@ -498,11 +524,11 @@ export function prepareTimelineFields(
       hasTimeseries = true;
       if (changed) {
         frames.push({
-          ...maybeSortedFrame,
+          ...frame,
           fields,
         });
       } else {
-        frames.push(maybeSortedFrame);
+        frames.push(frame);
       }
     }
   }
@@ -513,6 +539,7 @@ export function prepareTimelineFields(
   if (!frames.length) {
     return { warn: 'No graphable fields' };
   }
+
   return { frames };
 }
 
@@ -693,19 +720,19 @@ export function fmtDuration(milliSeconds: number): string {
     yr > 0
       ? yr + 'y ' + (mo > 0 ? mo + 'mo ' : '') + (wk > 0 ? wk + 'w ' : '') + (d > 0 ? d + 'd ' : '')
       : mo > 0
-      ? mo + 'mo ' + (wk > 0 ? wk + 'w ' : '') + (d > 0 ? d + 'd ' : '')
-      : wk > 0
-      ? wk + 'w ' + (d > 0 ? d + 'd ' : '')
-      : d > 0
-      ? d + 'd ' + (h > 0 ? h + 'h ' : '')
-      : h > 0
-      ? h + 'h ' + (m > 0 ? m + 'm ' : '')
-      : m > 0
-      ? m + 'm ' + (s > 0 ? s + 's ' : '')
-      : s > 0
-      ? s + 's ' + (ms > 0 ? ms + 'ms ' : '')
-      : ms > 0
-      ? ms + 'ms '
-      : '0'
+        ? mo + 'mo ' + (wk > 0 ? wk + 'w ' : '') + (d > 0 ? d + 'd ' : '')
+        : wk > 0
+          ? wk + 'w ' + (d > 0 ? d + 'd ' : '')
+          : d > 0
+            ? d + 'd ' + (h > 0 ? h + 'h ' : '')
+            : h > 0
+              ? h + 'h ' + (m > 0 ? m + 'm ' : '')
+              : m > 0
+                ? m + 'm ' + (s > 0 ? s + 's ' : '')
+                : s > 0
+                  ? s + 's ' + (ms > 0 ? ms + 'ms ' : '')
+                  : ms > 0
+                    ? ms + 'ms '
+                    : '0'
   ).trim();
 }
diff --git a/public/app/core/components/TraceToLogs/TagMappingInput.tsx b/public/app/core/components/TraceToLogs/TagMappingInput.tsx
deleted file mode 100644
index e1c34f99d49fb..0000000000000
--- a/public/app/core/components/TraceToLogs/TagMappingInput.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import { css } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { SegmentInput, useStyles2, InlineLabel, Icon } from '@grafana/ui';
-
-import { TraceToLogsTag } from './TraceToLogsSettings';
-
-interface Props {
-  values: TraceToLogsTag[];
-  onChange: (values: TraceToLogsTag[]) => void;
-  id?: string;
-}
-
-export const TagMappingInput = ({ values, onChange, id }: Props) => {
-  const styles = useStyles2(getStyles);
-
-  return (
-    <div className={styles.wrapper}>
-      {values.length ? (
-        values.map((value, idx) => (
-          <div className={styles.pair} key={idx}>
-            <SegmentInput
-              id={`${id}-key-${idx}`}
-              placeholder={'Tag name'}
-              value={value.key}
-              onChange={(e) => {
-                onChange(
-                  values.map((v, i) => {
-                    if (i === idx) {
-                      return { ...v, key: String(e) };
-                    }
-                    return v;
-                  })
-                );
-              }}
-            />
-            <InlineLabel aria-label="equals" className={styles.operator}>
-              as
-            </InlineLabel>
-            <SegmentInput
-              id={`${id}-value-${idx}`}
-              placeholder={'New name (optional)'}
-              value={value.value || ''}
-              onChange={(e) => {
-                onChange(
-                  values.map((v, i) => {
-                    if (i === idx) {
-                      return { ...v, value: String(e) };
-                    }
-                    return v;
-                  })
-                );
-              }}
-            />
-            <button
-              onClick={() => onChange([...values.slice(0, idx), ...values.slice(idx + 1)])}
-              className="gf-form-label query-part"
-              aria-label="Remove tag"
-              type="button"
-            >
-              <Icon name="times" />
-            </button>
-            {idx === values.length - 1 ? (
-              <button
-                onClick={() => onChange([...values, { key: '', value: '' }])}
-                className="gf-form-label query-part"
-                aria-label="Add tag"
-                type="button"
-              >
-                <Icon name="plus" />
-              </button>
-            ) : null}
-          </div>
-        ))
-      ) : (
-        <button
-          onClick={() => onChange([...values, { key: '', value: '' }])}
-          className="gf-form-label query-part"
-          aria-label="Add tag"
-          type="button"
-        >
-          <Icon name="plus" />
-        </button>
-      )}
-    </div>
-  );
-};
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  wrapper: css`
-    display: flex;
-    flex-direction: column;
-    gap: ${theme.spacing(0.5)} 0;
-  `,
-  pair: css`
-    display: flex;
-    justify-content: start;
-    align-items: center;
-  `,
-  operator: css`
-    color: ${theme.v1.palette.orange};
-    width: auto;
-  `,
-});
diff --git a/public/app/core/components/ValidationLabels/ValidationLabels.tsx b/public/app/core/components/ValidationLabels/ValidationLabels.tsx
new file mode 100644
index 0000000000000..20f50b367083a
--- /dev/null
+++ b/public/app/core/components/ValidationLabels/ValidationLabels.tsx
@@ -0,0 +1,123 @@
+import { css, cx } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Box, Icon, Text, useStyles2 } from '@grafana/ui';
+import config from 'app/core/config';
+import { t } from 'app/core/internationalization';
+
+interface StrongPasswordValidation {
+  message: string;
+  validation: (value: string) => boolean;
+}
+
+export interface ValidationLabelsProps {
+  strongPasswordValidations: StrongPasswordValidation[];
+  password: string;
+  pristine: boolean;
+}
+
+export interface ValidationLabelProps {
+  strongPasswordValidation: StrongPasswordValidation;
+  password: string;
+  pristine: boolean;
+}
+
+export const strongPasswordValidations: StrongPasswordValidation[] = [
+  {
+    message: 'At least 12 characters',
+    validation: (value: string) => value.length >= 12,
+  },
+  {
+    message: 'One uppercase letter',
+    validation: (value: string) => /[A-Z]+/.test(value),
+  },
+  {
+    message: 'One lowercase letter',
+    validation: (value: string) => /[a-z]+/.test(value),
+  },
+  {
+    message: 'One number',
+    validation: (value: string) => /[0-9]+/.test(value),
+  },
+  {
+    message: 'One symbol',
+    validation: (value: string) => /[\W]/.test(value),
+  },
+];
+
+export const strongPasswordValidationRegister = (value: string) => {
+  return (
+    !config.auth.basicAuthStrongPasswordPolicy ||
+    strongPasswordValidations.every((validation) => validation.validation(value)) ||
+    t(
+      'profile.change-password.strong-password-validation-register',
+      'Password does not comply with the strong password policy'
+    )
+  );
+};
+
+export const ValidationLabels = ({ strongPasswordValidations, password, pristine }: ValidationLabelsProps) => {
+  return (
+    <Box marginBottom={2}>
+      {strongPasswordValidations.map((validation) => (
+        <ValidationLabel
+          key={validation.message}
+          strongPasswordValidation={validation}
+          password={password}
+          pristine={pristine}
+        />
+      ))}
+    </Box>
+  );
+};
+
+export const ValidationLabel = ({ strongPasswordValidation, password, pristine }: ValidationLabelProps) => {
+  const styles = useStyles2(getStyles);
+
+  const { basicAuthStrongPasswordPolicy } = config.auth;
+  if (!basicAuthStrongPasswordPolicy) {
+    return null;
+  }
+
+  const { message, validation } = strongPasswordValidation;
+  const result = password.length > 0 && validation(password);
+
+  const iconName = result || pristine ? 'check' : 'exclamation-triangle';
+  const textColor = result ? 'secondary' : pristine ? 'primary' : 'error';
+
+  let iconClassName = undefined;
+  if (result) {
+    iconClassName = styles.icon.valid;
+  } else if (pristine) {
+    iconClassName = styles.icon.pending;
+  } else {
+    iconClassName = styles.icon.error;
+  }
+
+  return (
+    <Box key={message} display={'flex'} alignItems={'center'} marginTop={1}>
+      <Icon className={cx(styles.icon.style, iconClassName)} name={iconName} />
+      <Text color={textColor}>{message}</Text>
+    </Box>
+  );
+};
+
+export const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    icon: {
+      style: css({
+        marginRight: theme.spacing(1),
+      }),
+      valid: css({
+        color: theme.colors.success.text,
+      }),
+      pending: css({
+        color: theme.colors.secondary.text,
+      }),
+      error: css({
+        color: theme.colors.error.text,
+      }),
+    },
+  };
+};
diff --git a/public/app/core/components/help/HelpModal.tsx b/public/app/core/components/help/HelpModal.tsx
index f13cf21700430..3d3b3f5f9049d 100644
--- a/public/app/core/components/help/HelpModal.tsx
+++ b/public/app/core/components/help/HelpModal.tsx
@@ -2,7 +2,7 @@ import { css } from '@emotion/css';
 import React, { useMemo } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Modal, useStyles2 } from '@grafana/ui';
+import { Grid, Modal, useStyles2, Text } from '@grafana/ui';
 import { t } from 'app/core/internationalization';
 import { getModKey } from 'app/core/utils/browser';
 
@@ -27,16 +27,51 @@ const getShortcuts = (modKey: string) => {
           description: t('help-modal.shortcuts-description.exit-edit/setting-views', 'Exit edit/setting views'),
         },
         {
-          keys: ['h'],
+          keys: [`${modKey} + h`],
           description: t('help-modal.shortcuts-description.show-all-shortcuts', 'Show all keyboard shortcuts'),
         },
         { keys: ['c', 't'], description: t('help-modal.shortcuts-description.change-theme', 'Change theme') },
       ],
     },
+    {
+      category: t('help-modal.shortcuts-category.time-range', 'Time range'),
+      shortcuts: [
+        {
+          keys: ['t', 'z'],
+          description: t('help-modal.shortcuts-description.zoom-out-time-range', 'Zoom out time range'),
+        },
+        {
+          keys: ['t', '←'],
+          description: t('help-modal.shortcuts-description.move-time-range-back', 'Move time range back'),
+        },
+        {
+          keys: ['t', '→'],
+          description: t('help-modal.shortcuts-description.move-time-range-forward', 'Move time range forward'),
+        },
+        {
+          keys: ['t', 'a'],
+          description: t(
+            'help-modal.shortcuts-description.make-time-range-permanent',
+            'Make time range absolute/permanent'
+          ),
+        },
+        {
+          keys: ['t', 'c'],
+          description: t('help-modal.shortcuts-description.copy-time-range', 'Copy time range'),
+        },
+        {
+          keys: ['t', 'v'],
+          description: t('help-modal.shortcuts-description.paste-time-range', 'Paste time range'),
+        },
+      ],
+    },
     {
       category: t('help-modal.shortcuts-category.dashboard', 'Dashboard'),
       shortcuts: [
-        { keys: [`${modKey}+s`], description: t('help-modal.shortcuts-description.save-dashboard', 'Save dashboard') },
+        {
+          keys: [`${modKey} + s`],
+          description: t('help-modal.shortcuts-description.save-dashboard', 'Save dashboard'),
+        },
         {
           keys: ['d', 'r'],
           description: t('help-modal.shortcuts-description.refresh-all-panels', 'Refresh all panels'),
@@ -53,8 +88,14 @@ const getShortcuts = (modKey: string) => {
           keys: ['d', 'k'],
           description: t('help-modal.shortcuts-description.toggle-kiosk', 'Toggle kiosk mode (hides top nav)'),
         },
-        { keys: ['d', 'E'], description: t('help-modal.shortcuts-description.expand-all-rows', 'Expand all rows') },
-        { keys: ['d', 'C'], description: t('help-modal.shortcuts-description.collapse-all-rows', 'Collapse all rows') },
+        {
+          keys: ['d', '⇧ + e'],
+          description: t('help-modal.shortcuts-description.expand-all-rows', 'Expand all rows'),
+        },
+        {
+          keys: ['d', '⇧ + c'],
+          description: t('help-modal.shortcuts-description.collapse-all-rows', 'Collapse all rows'),
+        },
         {
           keys: ['d', 'a'],
           description: t(
@@ -77,7 +118,7 @@ const getShortcuts = (modKey: string) => {
       ],
     },
     {
-      category: t('help-modal.shortcuts-category.focused-panel', 'Focused Panel'),
+      category: t('help-modal.shortcuts-category.focused-panel', 'Focused panel'),
       shortcuts: [
         {
           keys: ['e'],
@@ -99,30 +140,6 @@ const getShortcuts = (modKey: string) => {
         },
       ],
     },
-    {
-      category: t('help-modal.shortcuts-category.time-range', 'Time Range'),
-      shortcuts: [
-        {
-          keys: ['t', 'z'],
-          description: t('help-modal.shortcuts-description.zoom-out-time-range', 'Zoom out time range'),
-        },
-        {
-          keys: ['t', '←'],
-          description: t('help-modal.shortcuts-description.move-time-range-back', 'Move time range back'),
-        },
-        {
-          keys: ['t', '→'],
-          description: t('help-modal.shortcuts-description.move-time-range-forward', 'Move time range forward'),
-        },
-        {
-          keys: ['t', 'a'],
-          description: t(
-            'help-modal.shortcuts-description.make-time-range-permanent',
-            'Make time range absolute/permanent'
-          ),
-        },
-      ],
-    },
   ];
 };
 
@@ -132,97 +149,110 @@ export interface HelpModalProps {
 
 export const HelpModal = ({ onDismiss }: HelpModalProps): JSX.Element => {
   const styles = useStyles2(getStyles);
+
   const modKey = useMemo(() => getModKey(), []);
   const shortcuts = useMemo(() => getShortcuts(modKey), [modKey]);
   return (
     <Modal title={t('help-modal.title', 'Shortcuts')} isOpen onDismiss={onDismiss} onClickBackdrop={onDismiss}>
-      <div className={styles.categories}>
-        {Object.values(shortcuts).map(({ category, shortcuts }, i) => (
-          <div className={styles.shortcutCategory} key={i}>
-            <table className={styles.shortcutTable}>
-              <tbody>
+      <Grid columns={{ xs: 1, sm: 2 }} gap={3} tabIndex={0}>
+        {Object.values(shortcuts).map(({ category, shortcuts }) => (
+          <section key={category}>
+            <table className={styles.table}>
+              <caption>
+                <Text element="p" variant="h5">
+                  {category}
+                </Text>
+              </caption>
+              <thead className="sr-only">
                 <tr>
-                  <th className={styles.shortcutTableCategoryHeader} colSpan={2}>
-                    {category}
-                  </th>
+                  <th>Keys</th>
+                  <th>Description</th>
                 </tr>
-                {shortcuts.map((shortcut, j) => (
-                  <tr key={`${i}-${j}`}>
-                    <td className={styles.shortcutTableKeys}>
-                      {shortcut.keys.map((key, k) => (
-                        <span className={styles.shortcutTableKey} key={`${i}-${j}-${k}`}>
-                          {key}
-                        </span>
+              </thead>
+              <tbody>
+                {shortcuts.map(({ keys, description }) => (
+                  <tr key={keys.join()}>
+                    <td className={styles.keys}>
+                      {keys.map((key) => (
+                        <Key key={key}>{key}</Key>
                       ))}
                     </td>
-                    <td className={styles.shortcutTableDescription}>{shortcut.description}</td>
+                    <td>
+                      <Text variant="bodySmall" element="p">
+                        {description}
+                      </Text>
+                    </td>
                   </tr>
                 ))}
               </tbody>
             </table>
-          </div>
+          </section>
         ))}
-      </div>
+      </Grid>
     </Modal>
   );
 };
 
+interface KeyProps {
+  children: string;
+}
+
+const Key = ({ children }: KeyProps) => {
+  const styles = useStyles2(getStyles);
+  const displayText = useMemo(() => replaceCustomKeyNames(children), [children]);
+  const displayElement = <span dangerouslySetInnerHTML={{ __html: displayText }}></span>;
+  return (
+    <kbd className={styles.shortcutTableKey}>
+      <Text variant="code">{displayElement}</Text>
+    </kbd>
+  );
+};
+
+function replaceCustomKeyNames(key: string) {
+  let displayName;
+  let srName;
+
+  if (key.includes('ctrl')) {
+    displayName = 'ctrl';
+    srName = 'Control';
+  } else if (key.includes('esc')) {
+    displayName = 'esc';
+    srName = 'Escape';
+  } else {
+    return key;
+  }
+
+  return key.replace(
+    displayName,
+    `<span class="sr-only">${srName}</span><span aria-hidden="true" role="none">${displayName}</span>`
+  );
+}
+
 function getStyles(theme: GrafanaTheme2) {
   return {
-    titleDescription: css`
-      font-size: ${theme.typography.bodySmall.fontSize};
-      font-weight: ${theme.typography.bodySmall.fontWeight};
-      color: ${theme.colors.text.disabled};
-      padding-bottom: ${theme.spacing(2)};
-    `,
-    categories: css`
-      font-size: ${theme.typography.bodySmall.fontSize};
-      display: flex;
-      flex-flow: row wrap;
-      justify-content: space-between;
-      align-items: flex-start;
-    `,
-    shortcutCategory: css`
-      width: 50%;
-      font-size: ${theme.typography.bodySmall.fontSize};
-    `,
-    shortcutTable: css`
-      margin-bottom: ${theme.spacing(2)};
-    `,
-    shortcutTableCategoryHeader: css`
-      font-weight: normal;
-      font-size: ${theme.typography.h6.fontSize};
-      text-align: left;
-    `,
-    shortcutTableDescription: css`
-      text-align: left;
-      color: ${theme.colors.text.disabled};
-      width: 99%;
-      padding: ${theme.spacing(1, 2)};
-    `,
-    shortcutTableKeys: css`
-      white-space: nowrap;
-      width: 1%;
-      text-align: right;
-      color: ${theme.colors.text.primary};
-    `,
-    shortcutTableKey: css`
-      display: inline-block;
-      text-align: center;
-      margin-right: ${theme.spacing(0.5)};
-      padding: 3px 5px;
-      font:
-        11px Consolas,
-        'Liberation Mono',
-        Menlo,
-        Courier,
-        monospace;
-      line-height: 10px;
-      vertical-align: middle;
-      border: solid 1px ${theme.colors.border.medium};
-      border-radius: ${theme.shape.borderRadius(3)};
-      color: ${theme.colors.text.primary};
-      background-color: ${theme.colors.background.secondary};
-    `,
+    table: css({
+      borderCollapse: 'separate',
+      borderSpacing: theme.spacing(2),
+      '& caption': {
+        captionSide: 'top',
+      },
+    }),
+    keys: css({
+      textAlign: 'end',
+      whiteSpace: 'nowrap',
+      minWidth: 83, // To match column widths with the widest
+    }),
+    shortcutTableKey: css({
+      display: 'inline-block',
+      textAlign: 'center',
+      marginRight: theme.spacing(0.5),
+      padding: '3px 5px',
+      lineHeight: '10px',
+      verticalAlign: 'middle',
+      border: `solid 1px ${theme.colors.border.medium}`,
+      borderRadius: theme.shape.radius.default,
+      color: theme.colors.text.primary,
+      backgroundColor: theme.colors.background.secondary,
+    }),
   };
 }
diff --git a/public/app/core/components/modals/AngularModalProxy.tsx b/public/app/core/components/modals/AngularModalProxy.tsx
deleted file mode 100644
index fe21787dc3b58..0000000000000
--- a/public/app/core/components/modals/AngularModalProxy.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import React from 'react';
-
-import { ModalRoot, ModalsProvider } from '@grafana/ui';
-
-import { connectWithProvider } from '../../utils/connectWithReduxStore';
-
-/**
- * Component that enables rendering React modals from Angular
- */
-export const AngularModalProxy = connectWithProvider((props: Record<string, unknown>) => {
-  return (
-    <>
-      <ModalsProvider {...props}>
-        <ModalRoot />
-      </ModalsProvider>
-    </>
-  );
-});
diff --git a/public/app/core/context/GrafanaContext.ts b/public/app/core/context/GrafanaContext.ts
index 7acf311c36800..b53788c23cc11 100644
--- a/public/app/core/context/GrafanaContext.ts
+++ b/public/app/core/context/GrafanaContext.ts
@@ -1,10 +1,10 @@
-import React, { useContext } from 'react';
+import React, { useCallback, useContext } from 'react';
 
 import { GrafanaConfig } from '@grafana/data';
-import { LocationService } from '@grafana/runtime/src/services/LocationService';
-import { BackendSrv } from '@grafana/runtime/src/services/backendSrv';
+import { LocationService, locationService, BackendSrv } from '@grafana/runtime';
 
 import { AppChromeService } from '../components/AppChrome/AppChromeService';
+import { NewFrontendAssetsChecker } from '../services/NewFrontendAssetsChecker';
 import { KeybindingSrv } from '../services/keybindingSrv';
 
 export interface GrafanaContextType {
@@ -13,6 +13,7 @@ export interface GrafanaContextType {
   config: GrafanaConfig;
   chrome: AppChromeService;
   keybindings: KeybindingSrv;
+  newAssetsChecker: NewFrontendAssetsChecker;
 }
 
 export const GrafanaContext = React.createContext<GrafanaContextType | undefined>(undefined);
@@ -24,3 +25,19 @@ export function useGrafana(): GrafanaContextType {
   }
   return context;
 }
+
+// Implementation of useReturnToPrevious that's made available through
+// @grafana/runtime
+export function useReturnToPreviousInternal() {
+  const { chrome } = useGrafana();
+  return useCallback(
+    (title: string, href?: string) => {
+      const { pathname, search } = locationService.getLocation();
+      chrome.setReturnToPrevious({
+        title: title,
+        href: href ?? pathname + search,
+      });
+    },
+    [chrome]
+  );
+}
diff --git a/public/app/core/context/ModalsContextProvider.tsx b/public/app/core/context/ModalsContextProvider.tsx
new file mode 100644
index 0000000000000..897588a7139c7
--- /dev/null
+++ b/public/app/core/context/ModalsContextProvider.tsx
@@ -0,0 +1,124 @@
+import React, { useEffect, useMemo, useState } from 'react';
+
+import { textUtil } from '@grafana/data';
+import { locationService } from '@grafana/runtime';
+import { ConfirmModal, ConfirmModalProps, ModalsContext } from '@grafana/ui';
+import { ModalsContextState } from '@grafana/ui/src/components/Modal/ModalsContext';
+import { ShowConfirmModalEvent, ShowModalReactEvent } from 'app/types/events';
+
+import appEvents from '../app_events';
+
+export interface Props {
+  children: React.ReactNode;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+interface StateType<TProps = any> {
+  component: React.ComponentType<TProps> | null;
+  props: TProps;
+}
+
+/**
+ * Implements the ModalsContext state logic (not used that much, only needed in edge cases)
+ * Also implements the handling of the events ShowModalReactEvent and ShowConfirmModalEvent.
+ */
+export function ModalsContextProvider(props: Props) {
+  const [state, setState] = useState<StateType>({
+    component: null,
+    props: {},
+  });
+
+  const contextValue: ModalsContextState = useMemo(() => {
+    function showModal<TProps = {}>(component: React.ComponentType<TProps>, props: TProps) {
+      setState({ component, props });
+    }
+
+    function hideModal() {
+      setState({ component: null, props: {} });
+    }
+
+    return {
+      component: state.component,
+      props: {
+        ...state.props,
+        isOpen: true,
+        onDismiss: hideModal,
+      },
+      showModal,
+      hideModal,
+    };
+  }, [state]);
+
+  useEffect(() => {
+    appEvents.subscribe(ShowModalReactEvent, ({ payload }) => {
+      setState({
+        component: payload.component,
+        props: payload.props,
+      });
+    });
+
+    appEvents.subscribe(ShowConfirmModalEvent, (e) => {
+      showConfirmModal(e, setState);
+    });
+
+    // Dismiss the modal when the route changes (if there's a link in the modal)
+    let prevPath = '';
+    locationService.getHistory().listen((location) => {
+      if (location.pathname !== prevPath) {
+        setState({ component: null, props: {} });
+      }
+      prevPath = location.pathname;
+    });
+  }, []);
+
+  return <ModalsContext.Provider value={contextValue}>{props.children}</ModalsContext.Provider>;
+}
+
+function showConfirmModal({ payload }: ShowConfirmModalEvent, setState: (state: StateType) => void) {
+  const {
+    confirmText,
+    onConfirm = () => undefined,
+    onDismiss,
+    text2,
+    altActionText,
+    onAltAction,
+    noText,
+    text,
+    text2htmlBind,
+    yesText = 'Yes',
+    icon,
+    title = 'Confirm',
+    yesButtonVariant,
+  } = payload;
+
+  const hideModal = () => setState({ component: null, props: {} });
+
+  const props: ConfirmModalProps = {
+    confirmText: yesText,
+    confirmButtonVariant: yesButtonVariant,
+    confirmationText: confirmText,
+    icon,
+    title,
+    body: text,
+    description: text2 && text2htmlBind ? textUtil.sanitize(text2) : text2,
+    isOpen: true,
+    dismissText: noText,
+    onConfirm: () => {
+      onConfirm();
+      hideModal();
+    },
+    onDismiss: () => {
+      onDismiss?.();
+      hideModal();
+    },
+    onAlternative: onAltAction
+      ? () => {
+          onAltAction();
+          hideModal();
+        }
+      : undefined,
+    alternativeText: altActionText,
+  };
+
+  setState({ component: ConfirmModal, props });
+}
diff --git a/public/app/core/context/ModalsProvider.ts b/public/app/core/context/ModalsProvider.ts
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/public/app/core/history/RichHistoryLocalStorage.ts b/public/app/core/history/RichHistoryLocalStorage.ts
index 737246ca301da..ab84d420d491f 100644
--- a/public/app/core/history/RichHistoryLocalStorage.ts
+++ b/public/app/core/history/RichHistoryLocalStorage.ts
@@ -37,10 +37,16 @@ export default class RichHistoryLocalStorage implements RichHistoryStorage {
     const allQueries = getRichHistoryDTOs().map(fromDTO);
     const queries = filters.starred ? allQueries.filter((q) => q.starred === true) : allQueries;
 
-    const richHistory = filterAndSortQueries(queries, filters.sortOrder, filters.datasourceFilters, filters.search, [
-      filters.from,
-      filters.to,
-    ]);
+    const timeFilter: [number, number] | undefined =
+      filters.from && filters.to ? [filters.from, filters.to] : undefined;
+
+    const richHistory = filterAndSortQueries(
+      queries,
+      filters.sortOrder,
+      filters.datasourceFilters,
+      filters.search,
+      timeFilter
+    );
     return { richHistory, total: richHistory.length };
   }
 
diff --git a/public/app/core/history/richHistoryLocalStorageUtils.ts b/public/app/core/history/richHistoryLocalStorageUtils.ts
index f5ff6da81502e..7f58de9a860ea 100644
--- a/public/app/core/history/richHistoryLocalStorageUtils.ts
+++ b/public/app/core/history/richHistoryLocalStorageUtils.ts
@@ -57,8 +57,8 @@ function filterQueriesBySearchFilter(queries: RichHistoryQuery[], searchFilter:
 
     const listOfMatchingQueries = query.queries.filter((query) =>
       // Remove fields in which we don't want to be searching
-      Object.values(omit(query, ['datasource', 'key', 'refId', 'hide', 'queryType'])).some(
-        (value) => value?.toString().includes(searchFilter)
+      Object.values(omit(query, ['datasource', 'key', 'refId', 'hide', 'queryType'])).some((value) =>
+        value?.toString().includes(searchFilter)
       )
     );
 
diff --git a/public/app/core/history/richHistoryStorageProvider.ts b/public/app/core/history/richHistoryStorageProvider.ts
index 44337ffbb0e93..84defd0f001bb 100644
--- a/public/app/core/history/richHistoryStorageProvider.ts
+++ b/public/app/core/history/richHistoryStorageProvider.ts
@@ -10,10 +10,16 @@ import RichHistoryStorage from './RichHistoryStorage';
 const richHistoryLocalStorage = new RichHistoryLocalStorage();
 const richHistoryRemoteStorage = new RichHistoryRemoteStorage();
 
+// for query history operations
 export const getRichHistoryStorage = (): RichHistoryStorage => {
   return config.queryHistoryEnabled ? richHistoryRemoteStorage : richHistoryLocalStorage;
 };
 
+// for autocomplete read and write operations
+export const getLocalRichHistoryStorage = (): RichHistoryStorage => {
+  return richHistoryLocalStorage;
+};
+
 interface RichHistorySupportedFeatures {
   availableFilters: SortOrder[];
   lastUsedDataSourcesAvailable: boolean;
diff --git a/public/app/core/internationalization/constants.ts b/public/app/core/internationalization/constants.ts
index e96f759dfecf0..b367bb57a44bb 100644
--- a/public/app/core/internationalization/constants.ts
+++ b/public/app/core/internationalization/constants.ts
@@ -4,6 +4,7 @@ export const ENGLISH_US = 'en-US';
 export const FRENCH_FRANCE = 'fr-FR';
 export const SPANISH_SPAIN = 'es-ES';
 export const GERMAN_GERMANY = 'de-DE';
+export const BRAZILIAN_PORTUGUESE = 'pt-br';
 export const CHINESE_SIMPLIFIED = 'zh-Hans';
 export const PSEUDO_LOCALE = 'pseudo-LOCALE';
 
@@ -50,6 +51,12 @@ export const LANGUAGES: LanguageDefinitions[] = [
     name: '中文（简体）',
     loader: () => import('../../../locales/zh-Hans/grafana.json'),
   },
+
+  {
+    code: BRAZILIAN_PORTUGUESE,
+    name: 'Português Brasileiro',
+    loader: () => import('../../../locales/pt-BR/grafana.json'),
+  },
 ];
 
 if (process.env.NODE_ENV === 'development') {
diff --git a/public/app/core/internationalization/index.test.tsx b/public/app/core/internationalization/index.test.tsx
new file mode 100644
index 0000000000000..6f83245b5b0c5
--- /dev/null
+++ b/public/app/core/internationalization/index.test.tsx
@@ -0,0 +1,26 @@
+import { render } from '@testing-library/react';
+import React from 'react';
+
+import { Trans } from './index';
+
+describe('internationalization', () => {
+  describe('Trans component', () => {
+    it('should interpolate strings without escaping dangerous characters', () => {
+      const name = '<script></script>';
+      const { getByText } = render(<Trans i18nKey="explore.table.title-with-name">Table - {{ name }}</Trans>);
+
+      expect(getByText('Table - <script></script>')).toBeInTheDocument();
+    });
+
+    it('should escape dangerous characters when shouldUnescape is false', () => {
+      const name = '<script></script>';
+      const { getByText } = render(
+        <Trans i18nKey="explore.table.title-with-name" shouldUnescape={false}>
+          Table - {{ name }}
+        </Trans>
+      );
+
+      expect(getByText('Table - &lt;script&gt;&lt;&#x2F;script&gt;')).toBeInTheDocument();
+    });
+  });
+});
diff --git a/public/app/core/internationalization/index.tsx b/public/app/core/internationalization/index.tsx
index 05eca138eb742..1b9d850c6d00e 100644
--- a/public/app/core/internationalization/index.tsx
+++ b/public/app/core/internationalization/index.tsx
@@ -3,7 +3,7 @@ import LanguageDetector, { DetectorOptions } from 'i18next-browser-languagedetec
 import React from 'react';
 import { Trans as I18NextTrans, initReactI18next } from 'react-i18next'; // eslint-disable-line no-restricted-imports
 
-import { LANGUAGES, VALID_LANGUAGES } from './constants';
+import { DEFAULT_LANGUAGE, LANGUAGES, VALID_LANGUAGES } from './constants';
 
 const getLanguagePartFromCode = (code: string) => code.split('-')[0].toLowerCase();
 
@@ -23,7 +23,7 @@ const loadTranslations: BackendModule = {
   },
 };
 
-export function initializeI18n(language: string) {
+export function initializeI18n(language: string): Promise<{ language: string | undefined }> {
   // This is a placeholder so we can put a 'comment' in the message json files.
   // Starts with an underscore so it's sorted to the top of the file. Even though it is in a comment the following line is still extracted
   // t('_comment', 'This file is the source of truth for English strings. Edit this to change plurals and other phrases for the UI.');
@@ -35,19 +35,30 @@ export function initializeI18n(language: string) {
 
     // If translations are empty strings (no translation), fall back to the default value in source code
     returnEmptyString: false,
+
+    // Required to ensure that `resolvedLanguage` is set property when an invalid language is passed (such as through 'detect')
+    supportedLngs: VALID_LANGUAGES,
+    fallbackLng: DEFAULT_LANGUAGE,
   };
-  let init = i18n;
+  let i18nInstance = i18n;
   if (language === 'detect') {
-    init = init.use(LanguageDetector);
+    i18nInstance = i18nInstance.use(LanguageDetector);
     const detection: DetectorOptions = { order: ['navigator'], caches: [] };
     options.detection = detection;
   } else {
     options.lng = VALID_LANGUAGES.includes(language) ? language : undefined;
   }
-  return init
+
+  const loadPromise = i18nInstance
     .use(loadTranslations)
     .use(initReactI18next) // passes i18n down to react-i18next
     .init(options);
+
+  return loadPromise.then(() => {
+    return {
+      language: i18nInstance.resolvedLanguage,
+    };
+  });
 }
 
 export function changeLanguage(locale: string) {
@@ -56,7 +67,7 @@ export function changeLanguage(locale: string) {
 }
 
 export const Trans: typeof I18NextTrans = (props) => {
-  return <I18NextTrans {...props} />;
+  return <I18NextTrans shouldUnescape {...props} />;
 };
 
 // Reassign t() so i18next-parser doesn't warn on dynamic key, and we can have 'failOnWarnings' enabled
diff --git a/public/app/core/monacoEnv.ts b/public/app/core/monacoEnv.ts
new file mode 100644
index 0000000000000..db63c867a1e07
--- /dev/null
+++ b/public/app/core/monacoEnv.ts
@@ -0,0 +1,32 @@
+import { monacoLanguageRegistry } from '@grafana/data';
+import { CorsWorker as Worker } from 'app/core/utils/CorsWorker';
+
+export function setMonacoEnv() {
+  self.MonacoEnvironment = {
+    getWorker(_moduleId, label) {
+      const language = monacoLanguageRegistry.getIfExists(label);
+
+      if (language) {
+        return language.init();
+      }
+
+      if (label === 'json') {
+        return new Worker(new URL('monaco-editor/esm/vs/language/json/json.worker', import.meta.url));
+      }
+
+      if (label === 'css' || label === 'scss' || label === 'less') {
+        return new Worker(new URL('monaco-editor/esm/vs/language/css/css.worker', import.meta.url));
+      }
+
+      if (label === 'html' || label === 'handlebars' || label === 'razor') {
+        return new Worker(new URL('monaco-editor/esm/vs/language/html/html.worker', import.meta.url));
+      }
+
+      if (label === 'typescript' || label === 'javascript') {
+        return new Worker(new URL('monaco-editor/esm/vs/language/typescript/ts.worker', import.meta.url));
+      }
+
+      return new Worker(new URL('monaco-editor/esm/vs/editor/editor.worker', import.meta.url));
+    },
+  };
+}
diff --git a/public/app/core/navigation/GrafanaRoute.test.tsx b/public/app/core/navigation/GrafanaRoute.test.tsx
index 46c99b2413974..d599a8479f256 100644
--- a/public/app/core/navigation/GrafanaRoute.test.tsx
+++ b/public/app/core/navigation/GrafanaRoute.test.tsx
@@ -53,7 +53,7 @@ describe('GrafanaRoute', () => {
 
     setup({ route: { component: PageComponent, path: '' } });
 
-    expect(await screen.findByText('Loading...')).toBeInTheDocument();
+    expect(await screen.findByLabelText('Loading')).toBeInTheDocument();
   });
 
   it('Shows error on page error', async () => {
diff --git a/public/app/core/navigation/GrafanaRouteError.tsx b/public/app/core/navigation/GrafanaRouteError.tsx
index 6540312028a3e..33c55654fb04b 100644
--- a/public/app/core/navigation/GrafanaRouteError.tsx
+++ b/public/app/core/navigation/GrafanaRouteError.tsx
@@ -2,8 +2,8 @@ import { css } from '@emotion/css';
 import React, { ErrorInfo, useEffect } from 'react';
 import { useLocation } from 'react-router-dom';
 
-import { locationUtil, PageLayoutType } from '@grafana/data';
-import { Button, ErrorWithStack, stylesFactory } from '@grafana/ui';
+import { GrafanaTheme2, locationUtil, PageLayoutType } from '@grafana/data';
+import { Button, ErrorWithStack, useStyles2 } from '@grafana/ui';
 
 import { Page } from '../components/Page/Page';
 
@@ -15,6 +15,7 @@ interface Props {
 export function GrafanaRouteError({ error, errorInfo }: Props) {
   const location = useLocation();
   const isChunkLoadingError = error?.name === 'ChunkLoadError';
+  const styles = useStyles2(getStyles);
 
   useEffect(() => {
     // Auto reload page 1 time if we have a chunk load error
@@ -27,18 +28,16 @@ export function GrafanaRouteError({ error, errorInfo }: Props) {
 
   return (
     <Page navId="error" layout={PageLayoutType.Canvas}>
-      <div className={getStyles()}>
+      <div className={styles.container}>
         {isChunkLoadingError && (
           <div>
             <h2>Unable to find application file</h2>
             <br />
             <h2 className="page-heading">Grafana has likely been updated. Please try reloading the page.</h2>
             <br />
-            <div className="gf-form-group">
-              <Button size="md" variant="secondary" icon="repeat" onClick={() => window.location.reload()}>
-                Reload
-              </Button>
-            </div>
+            <Button size="md" variant="secondary" icon="repeat" onClick={() => window.location.reload()}>
+              Reload
+            </Button>
             <ErrorWithStack title={'Error details'} error={error} errorInfo={errorInfo} />
           </div>
         )}
@@ -50,9 +49,9 @@ export function GrafanaRouteError({ error, errorInfo }: Props) {
   );
 }
 
-const getStyles = stylesFactory(() => {
-  return css`
-    width: 500px;
-    margin: 64px auto;
-  `;
+const getStyles = (theme: GrafanaTheme2) => ({
+  container: css({
+    width: '500px',
+    margin: theme.spacing(8, 'auto'),
+  }),
 });
diff --git a/public/app/core/navigation/GrafanaRouteLoading.tsx b/public/app/core/navigation/GrafanaRouteLoading.tsx
index 558c264b0ede9..01830aa745938 100644
--- a/public/app/core/navigation/GrafanaRouteLoading.tsx
+++ b/public/app/core/navigation/GrafanaRouteLoading.tsx
@@ -1,20 +1,24 @@
 import { css } from '@emotion/css';
 import React from 'react';
 
-import { LoadingPlaceholder, useStyles2 } from '@grafana/ui';
+import { GrafanaTheme2 } from '@grafana/data';
+import { useStyles2 } from '@grafana/ui';
+
+import { BouncingLoader } from '../components/BouncingLoader/BouncingLoader';
 
 export function GrafanaRouteLoading() {
   const styles = useStyles2(getStyles);
 
   return (
     <div className={styles.loadingPage}>
-      <LoadingPlaceholder text={'Loading...'} />
+      <BouncingLoader />
     </div>
   );
 }
 
-const getStyles = () => ({
+const getStyles = (theme: GrafanaTheme2) => ({
   loadingPage: css({
+    backgroundColor: theme.colors.background.primary,
     height: '100%',
     flexDrection: 'column',
     display: 'flex',
diff --git a/public/app/core/navigation/types.ts b/public/app/core/navigation/types.ts
index 5a06963cd0e71..9469221cb6dee 100644
--- a/public/app/core/navigation/types.ts
+++ b/public/app/core/navigation/types.ts
@@ -1,5 +1,5 @@
 import React from 'react';
-import { RouteComponentProps } from 'react-router-dom';
+import { RouteComponentProps } from 'react-router';
 
 import { UrlQueryMap } from '@grafana/data';
 
diff --git a/public/app/core/reducers/appNotification.ts b/public/app/core/reducers/appNotification.ts
index 5f88fd41e9930..d9f563d364e31 100644
--- a/public/app/core/reducers/appNotification.ts
+++ b/public/app/core/reducers/appNotification.ts
@@ -1,4 +1,4 @@
-import { createSlice, PayloadAction } from '@reduxjs/toolkit';
+import { createSelector, createSlice, PayloadAction } from '@reduxjs/toolkit';
 
 import { AppNotification, AppNotificationSeverity, AppNotificationsState } from 'app/types/';
 
@@ -60,10 +60,12 @@ export const appNotificationsReducer = appNotificationsSlice.reducer;
 // Selectors
 
 export const selectLastReadTimestamp = (state: AppNotificationsState) => state.lastRead;
-export const selectAll = (state: AppNotificationsState) =>
-  Object.values(state.byId).sort((a, b) => b.timestamp - a.timestamp);
-export const selectWarningsAndErrors = (state: AppNotificationsState) => selectAll(state).filter(isAtLeastWarning);
-export const selectVisible = (state: AppNotificationsState) => Object.values(state.byId).filter((n) => n.showing);
+export const selectById = (state: AppNotificationsState) => state.byId;
+export const selectAll = createSelector(selectById, (byId) =>
+  Object.values(byId).sort((a, b) => b.timestamp - a.timestamp)
+);
+export const selectWarningsAndErrors = createSelector(selectAll, (all) => all.filter(isAtLeastWarning));
+export const selectVisible = createSelector(selectById, (byId) => Object.values(byId).filter((n) => n.showing));
 
 // Helper functions
 
diff --git a/public/app/core/reducers/root.test.ts b/public/app/core/reducers/root.test.ts
index 6bb8712b23148..3396fc0d18c8c 100644
--- a/public/app/core/reducers/root.test.ts
+++ b/public/app/core/reducers/root.test.ts
@@ -9,6 +9,7 @@ import { createRootReducer } from './root';
 jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
   config: {
+    ...jest.requireActual('@grafana/runtime').config,
     bootData: {
       navTree: [],
       user: {},
diff --git a/public/app/core/reducers/root.ts b/public/app/core/reducers/root.ts
index 9ab94dbdf07e0..c776ce8c49cc6 100644
--- a/public/app/core/reducers/root.ts
+++ b/public/app/core/reducers/root.ts
@@ -2,7 +2,6 @@ import { ReducersMapObject } from '@reduxjs/toolkit';
 import { AnyAction, combineReducers } from 'redux';
 
 import sharedReducers from 'app/core/reducers';
-import { togglesApi } from 'app/features/admin/AdminFeatureTogglesAPI';
 import ldapReducers from 'app/features/admin/state/reducers';
 import alertingReducers from 'app/features/alerting/state/reducers';
 import apiKeysReducers from 'app/features/api-keys/state/reducers';
@@ -17,6 +16,7 @@ import exploreReducers from 'app/features/explore/state/main';
 import foldersReducers from 'app/features/folders/state/reducers';
 import invitesReducers from 'app/features/invites/state/reducers';
 import importDashboardReducers from 'app/features/manage-dashboards/state/reducers';
+import { migrateToCloudAPI } from 'app/features/migrate-to-cloud/api';
 import organizationReducers from 'app/features/org/state/reducers';
 import panelsReducers from 'app/features/panel/state/reducers';
 import { reducer as pluginsReducer } from 'app/features/plugins/admin/state/reducer';
@@ -56,7 +56,7 @@ const rootReducers = {
   [alertingApi.reducerPath]: alertingApi.reducer,
   [publicDashboardApi.reducerPath]: publicDashboardApi.reducer,
   [browseDashboardsAPI.reducerPath]: browseDashboardsAPI.reducer,
-  [togglesApi.reducerPath]: togglesApi.reducer,
+  [migrateToCloudAPI.reducerPath]: migrateToCloudAPI.reducer,
 };
 
 const addedReducers = {};
diff --git a/public/app/core/selectors/navModel.ts b/public/app/core/selectors/navModel.ts
index c7c15a4fc74b9..fc758061db555 100644
--- a/public/app/core/selectors/navModel.ts
+++ b/public/app/core/selectors/navModel.ts
@@ -1,5 +1,6 @@
+import memoizeOne from 'memoize-one';
+
 import { NavModel, NavModelItem, NavIndex } from '@grafana/data';
-import { newBrowseDashboardsEnabled } from 'app/features/browse-dashboards/featureFlag';
 import { FOLDER_ID } from 'app/features/folders/state/navModel';
 
 import { HOME_NAV_ID } from '../reducers/navModel';
@@ -19,28 +20,30 @@ const getNotFoundModel = (): NavModel => {
   };
 };
 
-export const getNavModel = (navIndex: NavIndex, id: string, fallback?: NavModel, onlyChild = false): NavModel => {
-  if (navIndex[id]) {
-    const node = navIndex[id];
-    const main = onlyChild ? node : getRootSectionForNode(node);
-    const mainWithActive = enrichNodeWithActiveState(main, id);
+export const getNavModel = memoizeOne(
+  (navIndex: NavIndex, id: string, fallback?: NavModel, onlyChild = false): NavModel => {
+    if (navIndex[id]) {
+      const node = navIndex[id];
+      const main = onlyChild ? node : getRootSectionForNode(node);
+      const mainWithActive = enrichNodeWithActiveState(main, id);
 
-    return {
-      node: node,
-      main: mainWithActive,
-    };
-  }
+      return {
+        node: node,
+        main: mainWithActive,
+      };
+    }
 
-  if (fallback) {
-    return fallback;
-  }
+    if (fallback) {
+      return fallback;
+    }
 
-  return getNotFoundModel();
-};
+    return getNotFoundModel();
+  }
+);
 
 export function getRootSectionForNode(node: NavModelItem): NavModelItem {
   // Don't recurse fully up the folder tree when nested folders is enabled
-  if (newBrowseDashboardsEnabled() && node.id === FOLDER_ID) {
+  if (node.id === FOLDER_ID) {
     return node;
   } else {
     return node.parentItem && node.parentItem.id !== HOME_NAV_ID ? getRootSectionForNode(node.parentItem) : node;
diff --git a/public/app/core/services/ModalManager.ts b/public/app/core/services/ModalManager.ts
deleted file mode 100644
index 1c04169bcda58..0000000000000
--- a/public/app/core/services/ModalManager.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import React from 'react';
-import { createRoot } from 'react-dom/client';
-
-import { textUtil } from '@grafana/data';
-import { config, CopyPanelEvent } from '@grafana/runtime';
-import { ConfirmModal, ConfirmModalProps } from '@grafana/ui';
-import appEvents from 'app/core/app_events';
-import { copyPanel } from 'app/features/dashboard/utils/panel';
-
-import {
-  ShowConfirmModalEvent,
-  ShowConfirmModalPayload,
-  ShowModalReactEvent,
-  ShowModalReactPayload,
-} from '../../types/events';
-import { AngularModalProxy } from '../components/modals/AngularModalProxy';
-import { provideTheme } from '../utils/ConfigProvider';
-
-export class ModalManager {
-  reactModalRoot = document.body;
-  reactModalNode = document.createElement('div');
-  root = createRoot(this.reactModalNode);
-
-  init() {
-    appEvents.subscribe(ShowConfirmModalEvent, (e) => this.showConfirmModal(e.payload));
-    appEvents.subscribe(ShowModalReactEvent, (e) => this.showModalReact(e.payload));
-    appEvents.subscribe(CopyPanelEvent, (e) => copyPanel(e.payload));
-  }
-
-  showModalReact(options: ShowModalReactPayload) {
-    const { component, props } = options;
-    const modalProps = {
-      component,
-      props: {
-        ...props,
-        isOpen: true,
-        onDismiss: this.onReactModalDismiss,
-      },
-    };
-
-    const elem = React.createElement(provideTheme(AngularModalProxy, config.theme2), modalProps);
-    this.reactModalRoot.appendChild(this.reactModalNode);
-    this.root.render(elem);
-  }
-
-  onReactModalDismiss = () => {
-    this.root.render(null);
-    this.reactModalRoot.removeChild(this.reactModalNode);
-  };
-
-  showConfirmModal(payload: ShowConfirmModalPayload) {
-    const {
-      confirmText,
-      onConfirm = () => undefined,
-      onDismiss,
-      text2,
-      altActionText,
-      onAltAction,
-      noText,
-      text,
-      text2htmlBind,
-      yesText = 'Yes',
-      icon,
-      title = 'Confirm',
-      yesButtonVariant,
-    } = payload;
-    const props: ConfirmModalProps = {
-      confirmText: yesText,
-      confirmButtonVariant: yesButtonVariant,
-      confirmationText: confirmText,
-      icon,
-      title,
-      body: text,
-      description: text2 && text2htmlBind ? textUtil.sanitize(text2) : text2,
-      isOpen: true,
-      dismissText: noText,
-      onConfirm: () => {
-        onConfirm();
-        this.onReactModalDismiss();
-      },
-      onDismiss: () => {
-        onDismiss?.();
-        this.onReactModalDismiss();
-      },
-      onAlternative: onAltAction
-        ? () => {
-            onAltAction();
-            this.onReactModalDismiss();
-          }
-        : undefined,
-      alternativeText: altActionText,
-    };
-    const modalProps = {
-      component: ConfirmModal,
-      props,
-    };
-
-    const elem = React.createElement(provideTheme(AngularModalProxy, config.theme2), modalProps);
-    this.reactModalRoot.appendChild(this.reactModalNode);
-    this.root.render(elem);
-  }
-}
diff --git a/public/app/core/services/NewFrontendAssetsChecker.test.ts b/public/app/core/services/NewFrontendAssetsChecker.test.ts
new file mode 100644
index 0000000000000..33a45ec06401b
--- /dev/null
+++ b/public/app/core/services/NewFrontendAssetsChecker.test.ts
@@ -0,0 +1,49 @@
+import { locationService, setBackendSrv, BackendSrv } from '@grafana/runtime';
+
+import { NewFrontendAssetsChecker } from './NewFrontendAssetsChecker';
+
+describe('NewFrontendAssetsChecker', () => {
+  const backendApiGet = jest.fn().mockReturnValue(Promise.resolve({}));
+  const locationReload = jest.fn();
+
+  const originalLocation = window.location;
+
+  beforeAll(() => {
+    Object.defineProperty(window, 'location', {
+      configurable: true,
+      value: { reload: locationReload },
+    });
+  });
+
+  afterAll(() => {
+    Object.defineProperty(window, 'location', { configurable: true, value: originalLocation });
+  });
+
+  setBackendSrv({
+    get: backendApiGet,
+  } as unknown as BackendSrv);
+
+  it('Should skip update checks if below interval', () => {
+    const checker = new NewFrontendAssetsChecker();
+    checker.start();
+
+    locationService.push('/d/123');
+
+    expect(backendApiGet).toHaveBeenCalledTimes(0);
+  });
+
+  it('Should do update check when changing dashboard or going home', async () => {
+    const checker = new NewFrontendAssetsChecker(0);
+    checker.start();
+
+    locationService.push('/d/asd');
+    locationService.push('/d/other');
+    locationService.push('/d/other?viewPanel=2');
+    locationService.push('/ignored');
+    locationService.push('/ignored?asd');
+    locationService.push('/ignored/sub');
+    locationService.push('/home');
+
+    expect(backendApiGet).toHaveBeenCalledTimes(2);
+  });
+});
diff --git a/public/app/core/services/NewFrontendAssetsChecker.ts b/public/app/core/services/NewFrontendAssetsChecker.ts
new file mode 100644
index 0000000000000..6a375add6fc2f
--- /dev/null
+++ b/public/app/core/services/NewFrontendAssetsChecker.ts
@@ -0,0 +1,112 @@
+import { Location } from 'history';
+import { isEqual } from 'lodash';
+
+import { getBackendSrv, getGrafanaLiveSrv, locationService, reportInteraction } from '@grafana/runtime';
+
+export class NewFrontendAssetsChecker {
+  private hasUpdates = false;
+  private previous?: FrontendAssetsAPIDTO;
+  private interval: number;
+  private checked = Date.now();
+  private prevLocationPath = '';
+
+  public constructor(interval?: number) {
+    // Default to never check for updates if last check was 5 minutes ago
+    this.interval = interval ?? 1000 * 60 * 5;
+  }
+
+  public start() {
+    // Subscribe to live connection state changes and check for new assets when re-connected
+    const live = getGrafanaLiveSrv();
+
+    if (live) {
+      live.getConnectionState().subscribe((connected) => {
+        if (connected) {
+          this._checkForUpdates();
+        }
+      });
+    }
+
+    // Subscribe to location changes
+    locationService.getHistory().listen(this.locationUpdated.bind(this));
+    this.prevLocationPath = locationService.getLocation().pathname;
+  }
+
+  /**
+   * Tries to detect some navigation events where it's safe to trigger a reload
+   */
+  private locationUpdated(location: Location) {
+    if (this.prevLocationPath === location.pathname) {
+      return;
+    }
+
+    const newLocationSegments = location.pathname.split('/');
+
+    // We are going to home
+    if (newLocationSegments[1] === '/' && this.prevLocationPath !== '/') {
+      this.reloadIfUpdateDetected();
+    }
+    // Moving to dashboard (or changing dashboards)
+    else if (newLocationSegments[1] === 'd') {
+      this.reloadIfUpdateDetected();
+    }
+    // Track potential page change
+    else if (this.hasUpdates) {
+      reportInteraction('new_frontend_assets_reload_ignored', {
+        newLocation: location.pathname,
+        prevLocation: this.prevLocationPath,
+      });
+    }
+
+    this.prevLocationPath = location.pathname;
+  }
+
+  private async _checkForUpdates() {
+    if (this.hasUpdates) {
+      return;
+    }
+
+    // Don't check too often
+    if (Date.now() - this.checked < this.interval) {
+      return;
+    }
+
+    this.checked = Date.now();
+
+    const previous = this.previous;
+    const result: FrontendAssetsAPIDTO = await getBackendSrv().get('/api/frontend/assets');
+
+    if (previous && !isEqual(previous, result)) {
+      this.hasUpdates = true;
+
+      // Report that we detected new assets
+      reportInteraction('new_frontend_assets_detected', {
+        assets: previous.assets !== result.assets,
+        plugins: previous.plugins !== result.plugins,
+        version: previous.version !== result.version,
+        flags: previous.flags !== result.flags,
+      });
+    }
+
+    this.previous = result;
+  }
+
+  /** This is called on page navigation events */
+  public reloadIfUpdateDetected() {
+    if (this.hasUpdates) {
+      // Report that we detected new assets
+      reportInteraction('new_frontend_assets_reload', {});
+      window.location.reload();
+    }
+
+    // Async check if the assets have changed
+    this._checkForUpdates();
+  }
+}
+
+interface FrontendAssetsAPIDTO {
+  assets: string;
+  flags: string;
+  plugins: string;
+  version: string;
+}
diff --git a/public/app/core/services/backend_srv.ts b/public/app/core/services/backend_srv.ts
index ba4951b8d85df..559fbff18ff30 100644
--- a/public/app/core/services/backend_srv.ts
+++ b/public/app/core/services/backend_srv.ts
@@ -16,11 +16,10 @@ import {
 import { v4 as uuidv4 } from 'uuid';
 
 import { AppEvents, DataQueryErrorType } from '@grafana/data';
-import { GrafanaEdition } from '@grafana/data/src/types/config';
 import { BackendSrv as BackendService, BackendSrvRequest, config, FetchError, FetchResponse } from '@grafana/runtime';
 import appEvents from 'app/core/app_events';
 import { getConfig } from 'app/core/config';
-import { getSessionExpiry } from 'app/core/utils/auth';
+import { getSessionExpiry, hasSessionExpiry } from 'app/core/utils/auth';
 import { loadUrlToken } from 'app/core/utils/urlToken';
 import { DashboardModel } from 'app/features/dashboard/state';
 import { DashboardSearchItem } from 'app/features/search/types';
@@ -56,11 +55,16 @@ export interface FolderRequestOptions {
 
 const GRAFANA_TRACEID_HEADER = 'grafana-trace-id';
 
+export interface InspectorStream {
+  response: FetchResponse | FetchError;
+  requestId?: string;
+}
+
 export class BackendSrv implements BackendService {
   private inFlightRequests: Subject<string> = new Subject<string>();
   private HTTP_REQUEST_CANCELED = -1;
   private noBackendCache: boolean;
-  private inspectorStream: Subject<FetchResponse | FetchError> = new Subject<FetchResponse | FetchError>();
+  private inspectorStream: Subject<InspectorStream> = new Subject<InspectorStream>();
   private readonly fetchQueue: FetchQueue;
   private readonly responseQueue: ResponseQueue;
   private _tokenRotationInProgress?: Observable<FetchResponse> | null = null;
@@ -94,10 +98,6 @@ export class BackendSrv implements BackendService {
   }
 
   private async initGrafanaDeviceID() {
-    if (config.buildInfo?.edition === GrafanaEdition.OpenSource) {
-      return;
-    }
-
     try {
       const fp = await FingerprintJS.load();
       const result = await fp.get();
@@ -161,8 +161,7 @@ export class BackendSrv implements BackendService {
       }
     }
 
-    // Add device id header if not OSS build
-    if (config.buildInfo?.edition !== GrafanaEdition.OpenSource && this.deviceID) {
+    if (!!this.deviceID) {
       options.headers = options.headers ?? {};
       options.headers['X-Grafana-Device-Id'] = `${this.deviceID}`;
     }
@@ -339,7 +338,7 @@ export class BackendSrv implements BackendService {
       }, 50);
     }
 
-    this.inspectorStream.next(err);
+    this.inspectorStream.next({ response: err, requestId: options.requestId });
     return err;
   }
 
@@ -362,7 +361,7 @@ export class BackendSrv implements BackendService {
         }),
         tap((response) => {
           this.showSuccessAlert(response);
-          this.inspectorStream.next(response);
+          this.inspectorStream.next({ response: response, requestId: options.requestId });
         })
       );
   }
@@ -391,10 +390,11 @@ export class BackendSrv implements BackendService {
                 }
 
                 let authChecker = this.loginPing();
-
-                const expired = getSessionExpiry() * 1000 < Date.now();
-                if (config.featureToggles.clientTokenRotation && expired) {
-                  authChecker = this.rotateToken();
+                if (hasSessionExpiry()) {
+                  const expired = getSessionExpiry() * 1000 < Date.now();
+                  if (expired) {
+                    authChecker = this.rotateToken();
+                  }
                 }
 
                 return from(authChecker).pipe(
@@ -452,7 +452,7 @@ export class BackendSrv implements BackendService {
       );
   }
 
-  getInspectorStream(): Observable<FetchResponse | FetchError> {
+  getInspectorStream(): Observable<InspectorStream> {
     return this.inspectorStream;
   }
 
@@ -516,16 +516,13 @@ export class BackendSrv implements BackendService {
     return this.get<DashboardDTO>(`/api/dashboards/uid/${uid}`);
   }
 
-  validateDashboard(dashboard: DashboardModel) {
-    // We want to send the dashboard as a JSON string (in the JSON body payload) so we can get accurate error line numbers back
-    const dashboardJson = JSON.stringify(dashboard, replaceJsonNulls, 2);
-
-    return this.request<ValidateDashboardResponse>({
-      method: 'POST',
-      url: `/api/dashboards/validate`,
-      data: { dashboard: dashboardJson },
-      showSuccessAlert: false,
-      showErrorAlert: false,
+  validateDashboard(dashboard: DashboardModel): Promise<ValidateDashboardResponse> {
+    // support for this function will be implemented in the k8s flavored api-server
+    // hidden by experimental feature flag:
+    //  config.featureToggles.showDashboardValidationWarnings
+    return Promise.resolve({
+      isValid: false,
+      message: 'dashboard validation is supported',
     });
   }
 
@@ -553,10 +550,3 @@ interface ValidateDashboardResponse {
   isValid: boolean;
   message?: string;
 }
-
-function replaceJsonNulls<T extends unknown>(key: string, value: T): T | undefined {
-  if (typeof value === 'number' && !Number.isFinite(value)) {
-    return undefined;
-  }
-  return value;
-}
diff --git a/public/app/core/services/context_srv.ts b/public/app/core/services/context_srv.ts
index 6b49da8f97e25..ab1016fd71a30 100644
--- a/public/app/core/services/context_srv.ts
+++ b/public/app/core/services/context_srv.ts
@@ -15,6 +15,7 @@ export const AutoRefreshInterval = 'auto';
 export class User implements Omit<CurrentUserInternal, 'lightTheme'> {
   isSignedIn: boolean;
   id: number;
+  uid: string;
   login: string;
   email: string;
   name: string;
@@ -39,6 +40,7 @@ export class User implements Omit<CurrentUserInternal, 'lightTheme'> {
 
   constructor() {
     this.id = 0;
+    this.uid = '';
     this.isGrafanaAdmin = false;
     this.isSignedIn = false;
     this.orgRole = '';
@@ -209,11 +211,6 @@ export class ContextSrv {
       return false;
     }
 
-    // skip if feature toggle is not enabled
-    if (!config.featureToggles.clientTokenRotation) {
-      return false;
-    }
-
     // skip if there is no session to rotate
     // if a user has a session but not yet a session expiry cookie, can happen during upgrade
     // from an older version of grafana, we never schedule the job and the fallback logic
@@ -227,7 +224,7 @@ export class ContextSrv {
   }
 
   private cancelTokenRotationJob() {
-    if (config.featureToggles.clientTokenRotation && this.tokenRotationJobId > 0) {
+    if (this.tokenRotationJobId > 0) {
       clearTimeout(this.tokenRotationJobId);
     }
   }
diff --git a/public/app/core/services/echo/backends/grafana-javascript-agent/GrafanaJavascriptAgentBackend.test.ts b/public/app/core/services/echo/backends/grafana-javascript-agent/GrafanaJavascriptAgentBackend.test.ts
index 0127f44ae3d64..fd3631eec7881 100644
--- a/public/app/core/services/echo/backends/grafana-javascript-agent/GrafanaJavascriptAgentBackend.test.ts
+++ b/public/app/core/services/echo/backends/grafana-javascript-agent/GrafanaJavascriptAgentBackend.test.ts
@@ -1,25 +1,50 @@
 import { BuildInfo } from '@grafana/data';
 import { GrafanaEdition } from '@grafana/data/src/types/config';
-import { BaseTransport, Instrumentation, InternalLoggerLevel } from '@grafana/faro-core';
-import { FetchTransport, initializeFaro } from '@grafana/faro-web-sdk';
-import { EchoEventType, EchoMeta } from '@grafana/runtime';
+import { Faro, Instrumentation } from '@grafana/faro-core';
+import * as faroWebSdkModule from '@grafana/faro-web-sdk';
+import { BrowserConfig, FetchTransport } from '@grafana/faro-web-sdk';
 
+import { EchoSrvTransport } from './EchoSrvTransport';
 import { GrafanaJavascriptAgentBackend, GrafanaJavascriptAgentBackendOptions } from './GrafanaJavascriptAgentBackend';
-import { GrafanaJavascriptAgentEchoEvent } from './types';
-
-jest.mock('@grafana/faro-web-sdk', () => {
-  const originalModule = jest.requireActual('@grafana/faro-web-sdk');
-  return {
-    __esModule: true,
-    ...originalModule,
-    initializeFaro: jest.fn(),
-  };
-});
 
 describe('GrafanaJavascriptAgentEchoBackend', () => {
+  let mockedSetUser: jest.Mock;
+  let initializeFaroMock: jest.SpyInstance<Faro, [config: BrowserConfig]>;
+
   beforeEach(() => {
+    // arrange
+    mockedSetUser = jest.fn();
+    const mockedInstrumentationsForConfig: Instrumentation[] = [];
+    const mockedInstrumentations = {
+      add: jest.fn(),
+      instrumentations: mockedInstrumentationsForConfig,
+      remove: jest.fn(),
+    };
+    const mockedInternalLogger = {
+      prefix: 'Faro',
+      debug: jest.fn(),
+      info: jest.fn(),
+      warn: jest.fn(),
+      error: jest.fn(),
+    };
+
+    initializeFaroMock = jest.spyOn(faroWebSdkModule, 'initializeFaro').mockReturnValueOnce({
+      ...faroWebSdkModule.faro,
+      api: {
+        ...faroWebSdkModule.faro.api,
+        setUser: mockedSetUser,
+      },
+      config: {
+        ...faroWebSdkModule.faro.config,
+        instrumentations: mockedInstrumentationsForConfig,
+      },
+      instrumentations: mockedInstrumentations,
+      internalLogger: mockedInternalLogger,
+    });
+  });
+
+  afterEach(() => {
     jest.resetAllMocks();
-    window.fetch = jest.fn();
     jest.resetModules();
     jest.clearAllMocks();
   });
@@ -28,6 +53,7 @@ describe('GrafanaJavascriptAgentEchoBackend', () => {
     version: '1.0',
     commit: 'abcd123',
     env: 'production',
+    versionString: 'Grafana v1.0 (abcd123)',
     edition: GrafanaEdition.OpenSource,
     latestVersion: 'ba',
     hasUpdate: false,
@@ -50,106 +76,27 @@ describe('GrafanaJavascriptAgentEchoBackend', () => {
     },
   };
 
-  it('will set up FetchTransport if customEndpoint is provided', async () => {
+  it('will set up FetchTransport if customEndpoint is provided', () => {
     // arrange
-    const originalModule = jest.requireActual('@grafana/faro-web-sdk');
-    jest.mocked(initializeFaro).mockImplementation(originalModule.initializeFaro);
+    const constructorSpy = jest.spyOn(faroWebSdkModule, 'FetchTransport');
 
     //act
-    const backend = new GrafanaJavascriptAgentBackend(options);
+    new GrafanaJavascriptAgentBackend(options);
 
     //assert
-    expect(backend.transports.length).toEqual(1);
-    expect(backend.transports[0]).toBeInstanceOf(FetchTransport);
+    expect(constructorSpy).toHaveBeenCalledTimes(1);
+    expect(initializeFaroMock).toHaveBeenCalledTimes(1);
+    expect(initializeFaroMock.mock.calls[0][0].transports?.length).toEqual(2);
+    expect(initializeFaroMock.mock.calls[0][0].transports?.[0]).toBeInstanceOf(EchoSrvTransport);
+    expect(initializeFaroMock.mock.calls[0][0].transports?.[1]).toBeInstanceOf(FetchTransport);
   });
 
   it('will initialize GrafanaJavascriptAgent and set user', async () => {
-    // arrange
-    const mockedSetUser = jest.fn();
-    const mockedInstrumentationsForConfig: Instrumentation[] = [];
-    const mockedInstrumentations = {
-      add: jest.fn(),
-      instrumentations: mockedInstrumentationsForConfig,
-      remove: jest.fn(),
-    };
-    const mockedInternalLogger = {
-      prefix: 'Faro',
-      debug: jest.fn(),
-      info: jest.fn(),
-      warn: jest.fn(),
-      error: jest.fn(),
-    };
-    const mockedAgent = () => {
-      return {
-        api: {
-          setUser: mockedSetUser,
-          pushLog: jest.fn(),
-          callOriginalConsoleMethod: jest.fn(),
-          pushError: jest.fn(),
-          pushMeasurement: jest.fn(),
-          pushTraces: jest.fn(),
-          pushEvent: jest.fn(),
-          initOTEL: jest.fn(),
-          getOTEL: jest.fn(),
-          getTraceContext: jest.fn(),
-          changeStacktraceParser: jest.fn(),
-          getStacktraceParser: jest.fn(),
-          isOTELInitialized: jest.fn(),
-          setSession: jest.fn(),
-          getSession: jest.fn(),
-          resetUser: jest.fn(),
-          resetSession: jest.fn(),
-          setView: jest.fn(),
-          getView: jest.fn(),
-        },
-        config: {
-          globalObjectKey: '',
-          preventGlobalExposure: false,
-          transports: [],
-          instrumentations: mockedInstrumentationsForConfig,
-          metas: [],
-          parseStacktrace: jest.fn(),
-          app: jest.fn(),
-          paused: false,
-          dedupe: true,
-          isolate: false,
-          internalLoggerLevel: InternalLoggerLevel.ERROR,
-          unpatchedConsole: { ...console },
-        },
-        metas: {
-          add: jest.fn(),
-          remove: jest.fn(),
-          value: {},
-          addListener: jest.fn(),
-          removeListener: jest.fn(),
-        },
-        transports: {
-          add: jest.fn(),
-          execute: jest.fn(),
-          transports: [],
-          pause: jest.fn(),
-          unpause: jest.fn(),
-          addBeforeSendHooks: jest.fn(),
-          addIgnoreErrorsPatterns: jest.fn(),
-          getBeforeSendHooks: jest.fn(),
-          isPaused: jest.fn(),
-          remove: jest.fn(),
-          removeBeforeSendHooks: jest.fn(),
-        },
-        pause: jest.fn(),
-        unpause: jest.fn(),
-        instrumentations: mockedInstrumentations,
-        internalLogger: mockedInternalLogger,
-        unpatchedConsole: { ...console },
-      };
-    };
-    jest.mocked(initializeFaro).mockImplementation(mockedAgent);
-
     //act
     new GrafanaJavascriptAgentBackend(options);
 
     //assert
-    expect(initializeFaro).toHaveBeenCalledTimes(1);
+    expect(initializeFaroMock).toHaveBeenCalledTimes(1);
     expect(mockedSetUser).toHaveBeenCalledTimes(1);
     expect(mockedSetUser).toHaveBeenCalledWith({
       id: '504',
@@ -159,111 +106,6 @@ describe('GrafanaJavascriptAgentEchoBackend', () => {
     });
   });
 
-  it('will forward events to transports', async () => {
-    //arrange
-    const mockedSetUser = jest.fn();
-    const mockedInstrumentationsForConfig: Instrumentation[] = [];
-    const mockedInstrumentations = {
-      add: jest.fn(),
-      instrumentations: mockedInstrumentationsForConfig,
-      remove: jest.fn(),
-    };
-    const mockedInternalLogger = {
-      prefix: 'Faro',
-      debug: jest.fn(),
-      info: jest.fn(),
-      warn: jest.fn(),
-      error: jest.fn(),
-    };
-    const mockedAgent = () => {
-      return {
-        api: {
-          setUser: mockedSetUser,
-          pushLog: jest.fn(),
-          callOriginalConsoleMethod: jest.fn(),
-          pushError: jest.fn(),
-          pushMeasurement: jest.fn(),
-          pushTraces: jest.fn(),
-          pushEvent: jest.fn(),
-          initOTEL: jest.fn(),
-          getOTEL: jest.fn(),
-          getTraceContext: jest.fn(),
-          changeStacktraceParser: jest.fn(),
-          getStacktraceParser: jest.fn(),
-          isOTELInitialized: jest.fn(),
-          setSession: jest.fn(),
-          getSession: jest.fn(),
-          resetUser: jest.fn(),
-          resetSession: jest.fn(),
-          setView: jest.fn(),
-          getView: jest.fn(),
-        },
-        config: {
-          globalObjectKey: '',
-          preventGlobalExposure: false,
-          transports: [],
-          instrumentations: mockedInstrumentationsForConfig,
-          metas: [],
-          parseStacktrace: jest.fn(),
-          app: jest.fn(),
-          paused: false,
-          dedupe: true,
-          isolate: false,
-          internalLoggerLevel: InternalLoggerLevel.ERROR,
-          unpatchedConsole: { ...console },
-        },
-        metas: {
-          add: jest.fn(),
-          remove: jest.fn(),
-          value: {},
-          addListener: jest.fn(),
-          removeListener: jest.fn(),
-        },
-        transports: {
-          add: jest.fn(),
-          execute: jest.fn(),
-          transports: [],
-          pause: jest.fn(),
-          unpause: jest.fn(),
-          addBeforeSendHooks: jest.fn(),
-          addIgnoreErrorsPatterns: jest.fn(),
-          getBeforeSendHooks: jest.fn(),
-          isPaused: jest.fn(),
-          remove: jest.fn(),
-          removeBeforeSendHooks: jest.fn(),
-        },
-        pause: jest.fn(),
-        unpause: jest.fn(),
-        instrumentations: mockedInstrumentations,
-        internalLogger: mockedInternalLogger,
-        unpatchedConsole: { ...console },
-      };
-    };
-
-    jest.mocked(initializeFaro).mockImplementation(mockedAgent);
-    const backend = new GrafanaJavascriptAgentBackend({
-      ...options,
-      preventGlobalExposure: true,
-    });
-
-    backend.transports = [
-      /* eslint-disable */
-      { send: jest.fn() } as unknown as BaseTransport,
-      { send: jest.fn() } as unknown as BaseTransport,
-    ];
-    const event: GrafanaJavascriptAgentEchoEvent = {
-      type: EchoEventType.GrafanaJavascriptAgent,
-      payload: { foo: 'bar' } as unknown as GrafanaJavascriptAgentEchoEvent,
-      meta: {} as unknown as EchoMeta,
-    };
-    /* eslint-enable */
-    backend.addEvent(event);
-    backend.transports.forEach((transport) => {
-      expect(transport.send).toHaveBeenCalledTimes(1);
-      expect(transport.send).toHaveBeenCalledWith(event.payload);
-    });
-  });
-
   //@FIXME - make integration test work
 
   // it('integration test with EchoSrv and  GrafanaJavascriptAgent', async () => {
diff --git a/public/app/core/services/echo/backends/grafana-javascript-agent/GrafanaJavascriptAgentBackend.ts b/public/app/core/services/echo/backends/grafana-javascript-agent/GrafanaJavascriptAgentBackend.ts
index ddb78077f4eb3..c20b8ec34f1d2 100644
--- a/public/app/core/services/echo/backends/grafana-javascript-agent/GrafanaJavascriptAgentBackend.ts
+++ b/public/app/core/services/echo/backends/grafana-javascript-agent/GrafanaJavascriptAgentBackend.ts
@@ -1,13 +1,14 @@
 import { BuildInfo } from '@grafana/data';
-import { BaseTransport } from '@grafana/faro-core';
+import { BaseTransport, defaultInternalLoggerLevel } from '@grafana/faro-core';
 import {
   initializeFaro,
-  defaultMetas,
   BrowserConfig,
   ErrorsInstrumentation,
   ConsoleInstrumentation,
   WebVitalsInstrumentation,
+  SessionInstrumentation,
   FetchTransport,
+  type Instrumentation,
 } from '@grafana/faro-web-sdk';
 import { EchoBackend, EchoEvent, EchoEventType } from '@grafana/runtime';
 
@@ -28,15 +29,15 @@ export class GrafanaJavascriptAgentBackend
 {
   supportedEvents = [EchoEventType.GrafanaJavascriptAgent];
   private faroInstance;
-  transports: BaseTransport[];
 
   constructor(public options: GrafanaJavascriptAgentBackendOptions) {
-    // configure instrumentalizations
-    const instrumentations = [];
-    this.transports = [];
+    // configure instrumentations.
+    const instrumentations: Instrumentation[] = [];
+
+    const transports: BaseTransport[] = [new EchoSrvTransport()];
 
     if (options.customEndpoint) {
-      this.transports.push(new FetchTransport({ url: options.customEndpoint, apiKey: options.apiKey }));
+      transports.push(new FetchTransport({ url: options.customEndpoint, apiKey: options.apiKey }));
     }
 
     if (options.errorInstrumentalizationEnabled) {
@@ -49,6 +50,9 @@ export class GrafanaJavascriptAgentBackend
       instrumentations.push(new WebVitalsInstrumentation());
     }
 
+    // session instrumentation must be added!
+    instrumentations.push(new SessionInstrumentation());
+
     // initialize GrafanaJavascriptAgent so it can set up its hooks and start collecting errors
     const grafanaJavaScriptAgentOptions: BrowserConfig = {
       globalObjectKey: options.globalObjectKey || 'faro',
@@ -58,21 +62,19 @@ export class GrafanaJavascriptAgentBackend
         environment: options.buildInfo.env,
       },
       instrumentations,
-      transports: [new EchoSrvTransport()],
+      transports,
       ignoreErrors: [
         'ResizeObserver loop limit exceeded',
         'ResizeObserver loop completed',
         'Non-Error exception captured with keys',
       ],
-      metas: [
-        ...defaultMetas,
-        {
-          session: {
-            // new session id for every page load
-            id: (Math.random() + 1).toString(36).substring(2),
-          },
-        },
-      ],
+      sessionTracking: {
+        persistent: true,
+      },
+      batching: {
+        sendTimeout: 1000,
+      },
+      internalLoggerLevel: options.internalLoggerLevel || defaultInternalLoggerLevel,
     };
     this.faroInstance = initializeFaro(grafanaJavaScriptAgentOptions);
 
@@ -86,9 +88,8 @@ export class GrafanaJavascriptAgentBackend
     }
   }
 
-  addEvent = (e: EchoEvent) => {
-    this.transports.forEach((t) => t.send(e.payload));
-  };
+  // noop because the EchoSrvTransport registered in Faro will already broadcast all signals emitted by the Faro API
+  addEvent = (e: EchoEvent) => {};
 
   // backend will log events to stdout, and at least in case of hosted grafana they will be
   // ingested into Loki. Due to Loki limitations logs cannot be backdated,
diff --git a/public/app/core/services/keybindingSrv.ts b/public/app/core/services/keybindingSrv.ts
index 2f126c22145ed..2d48dee13c67a 100644
--- a/public/app/core/services/keybindingSrv.ts
+++ b/public/app/core/services/keybindingSrv.ts
@@ -18,6 +18,8 @@ import {
   ShowModalReactEvent,
   ZoomOutEvent,
   AbsoluteTimeEvent,
+  CopyTimeEvent,
+  PasteTimeEvent,
 } from '../../types/events';
 import { AppChromeService } from '../components/AppChrome/AppChromeService';
 import { HelpModal } from '../components/help/HelpModal';
@@ -38,7 +40,7 @@ export class KeybindingSrv {
 
     // Chromeless pages like login and signup page don't get any global bindings
     if (!route.chromeless) {
-      this.bind(['?', 'h'], this.showHelpModal);
+      this.bind(['?', 'mod+h'], this.showHelpModal);
       this.bind('g h', this.goToHome);
       this.bind('g d', this.goToDashboards);
       this.bind('g e', this.goToExplore);
@@ -203,6 +205,14 @@ export class KeybindingSrv {
     this.bind('t right', () => {
       appEvents.publish(new ShiftTimeEvent({ direction: ShiftTimeEventDirection.Right, updateUrl }));
     });
+
+    this.bind('t c', () => {
+      appEvents.publish(new CopyTimeEvent());
+    });
+
+    this.bind('t v', () => {
+      appEvents.publish(new PasteTimeEvent({ updateUrl }));
+    });
   }
 
   setupDashboardBindings(dashboard: DashboardModel) {
diff --git a/public/app/core/services/theme.ts b/public/app/core/services/theme.ts
index b19b04f324298..6368aa07f7697 100644
--- a/public/app/core/services/theme.ts
+++ b/public/app/core/services/theme.ts
@@ -18,7 +18,7 @@ export async function changeTheme(themeId: string, runtimeOnly?: boolean) {
   if (oldTheme.colors.mode !== newTheme.colors.mode) {
     const newCssLink = document.createElement('link');
     newCssLink.rel = 'stylesheet';
-    newCssLink.href = config.bootData.themePaths[newTheme.colors.mode];
+    newCssLink.href = config.bootData.assets[newTheme.colors.mode];
     newCssLink.onload = () => {
       // Remove old css file
       const bodyLinks = document.getElementsByTagName('link');
diff --git a/public/app/core/specs/backend_srv.test.ts b/public/app/core/specs/backend_srv.test.ts
index fad3b7e8665e5..075ec6f0095d4 100644
--- a/public/app/core/specs/backend_srv.test.ts
+++ b/public/app/core/specs/backend_srv.test.ts
@@ -4,7 +4,7 @@ import { fromFetch } from 'rxjs/fetch';
 import { delay } from 'rxjs/operators';
 
 import { AppEvents, DataQueryErrorType, EventBusExtended } from '@grafana/data';
-import { BackendSrvRequest, FetchError, config, FetchResponse } from '@grafana/runtime';
+import { BackendSrvRequest, FetchError, FetchResponse } from '@grafana/runtime';
 
 import { TokenRevokedModal } from '../../features/users/TokenRevokedModal';
 import { ShowModalReactEvent } from '../../types/events';
@@ -86,6 +86,11 @@ const getTestContext = (overides?: object, mockFromFetch = true) => {
   };
 };
 
+jest.mock('app/core/utils/auth', () => ({
+  getSessionExpiry: () => 1,
+  hasSessionExpiry: () => true,
+}));
+
 describe('backendSrv', () => {
   describe('parseRequestOptions', () => {
     it.each`
@@ -158,27 +163,19 @@ describe('backendSrv', () => {
       });
     });
 
-    describe('when making an unsuccessful call and conditions for retry are favorable and loginPing does not throw', () => {
+    describe('when making an unsuccessful call and conditions for retry are favorable and rotateToken does not throw', () => {
       const url = '/api/dashboard/';
       const okResponse = { ok: true, status: 200, statusText: 'OK', data: { message: 'Ok' } };
-      let fetchMock: jest.SpyInstance;
 
+      let fetchMock: jest.SpyInstance;
       afterEach(() => {
         fetchMock.mockClear();
       });
-
       afterAll(() => {
         fetchMock.mockRestore();
-        config.featureToggles.clientTokenRotation = false;
       });
 
-      it.each`
-        clientTokenRotation
-        ${true}
-        ${false}
-      `('then it should retry (clientTokenRotation = %s)', async ({ clientTokenRotation }) => {
-        config.featureToggles.clientTokenRotation = clientTokenRotation;
-
+      it('then it should retry', async () => {
         fetchMock = jest
           .spyOn(global, 'fetch')
           .mockRejectedValueOnce({
@@ -210,19 +207,13 @@ describe('backendSrv', () => {
           false
         );
 
-        backendSrv.loginPing = jest.fn().mockResolvedValue(okResponse);
-
         backendSrv.rotateToken = jest.fn().mockResolvedValue(okResponse);
 
         await backendSrv.request({ url, method: 'GET', retry: 0 }).finally(() => {
           expect(appEventsMock.emit).not.toHaveBeenCalled();
           expect(logoutMock).not.toHaveBeenCalled();
-          if (config.featureToggles.clientTokenRotation) {
-            expect(backendSrv.rotateToken).toHaveBeenCalledTimes(1);
-          } else {
-            expect(backendSrv.loginPing).toHaveBeenCalledTimes(1);
-          }
-          expect(fetchMock).toHaveBeenCalledTimes(2); // expecting 2 calls because of retry and because the loginPing/tokenRotation is mocked
+          expect(backendSrv.rotateToken).toHaveBeenCalledTimes(1);
+          expect(fetchMock).toHaveBeenCalledTimes(2); // expecting 2 calls because of retry and because the tokenRotation is mocked
         });
       });
     });
@@ -238,7 +229,7 @@ describe('backendSrv', () => {
           url,
         });
 
-        backendSrv.loginPing = jest.fn();
+        backendSrv.rotateToken = jest.fn();
 
         await backendSrv.request({ url, method: 'GET', retry: 0 }).catch(() => {
           expect(appEventsMock.publish).toHaveBeenCalledTimes(1);
@@ -250,7 +241,7 @@ describe('backendSrv', () => {
               },
             })
           );
-          expect(backendSrv.loginPing).not.toHaveBeenCalled();
+          expect(backendSrv.rotateToken).not.toHaveBeenCalled();
           expect(logoutMock).not.toHaveBeenCalled();
           expectRequestCallChain({ url, method: 'GET', retry: 0 });
         });
@@ -267,7 +258,7 @@ describe('backendSrv', () => {
           data: { message: errorMessage },
         });
 
-        backendSrv.loginPing = jest
+        backendSrv.rotateToken = jest
           .fn()
           .mockRejectedValue({ status: 403, statusText: 'Forbidden', data: { message: 'Forbidden' } });
         const url = '/api/dashboard/';
@@ -279,7 +270,7 @@ describe('backendSrv', () => {
             expect(error.statusText).toBe('Forbidden');
             expect(error.data).toEqual({ message: 'Forbidden' });
             expect(appEventsMock.emit).not.toHaveBeenCalled();
-            expect(backendSrv.loginPing).toHaveBeenCalledTimes(1);
+            expect(backendSrv.rotateToken).toHaveBeenCalledTimes(1);
             expect(logoutMock).not.toHaveBeenCalled();
             expectRequestCallChain({ url, method: 'GET', retry: 0 });
             jest.advanceTimersByTime(50);
@@ -519,27 +510,19 @@ describe('backendSrv', () => {
       });
     });
 
-    describe('when making an unsuccessful call and conditions for retry are favorable and loginPing does not throw', () => {
+    describe('when making an unsuccessful call and conditions for retry are favorable and rotateToken does not throw', () => {
       const url = '/api/dashboard/';
       const okResponse = { ok: true, status: 200, statusText: 'OK', data: { message: 'Ok' } };
-      let fetchMock: jest.SpyInstance;
 
+      let fetchMock: jest.SpyInstance;
       afterEach(() => {
         fetchMock.mockClear();
       });
-
       afterAll(() => {
         fetchMock.mockRestore();
-        config.featureToggles.clientTokenRotation = false;
       });
 
-      it.each`
-        clientTokenRotation
-        ${true}
-        ${false}
-      `('then it should retry (clientTokenRotation = %s)', async ({ clientTokenRotation }) => {
-        config.featureToggles.clientTokenRotation = clientTokenRotation;
-
+      it('then it should retry', async () => {
         fetchMock = jest
           .spyOn(global, 'fetch')
           .mockRejectedValueOnce({
@@ -570,18 +553,12 @@ describe('backendSrv', () => {
           false
         );
 
-        backendSrv.loginPing = jest.fn().mockResolvedValue(okResponse);
-
         backendSrv.rotateToken = jest.fn().mockResolvedValue(okResponse);
 
         await backendSrv.datasourceRequest({ url, method: 'GET', retry: 0 }).finally(() => {
           expect(logoutMock).not.toHaveBeenCalled();
-          if (config.featureToggles.clientTokenRotation) {
-            expect(backendSrv.rotateToken).toHaveBeenCalledTimes(1);
-          } else {
-            expect(backendSrv.loginPing).toHaveBeenCalledTimes(1);
-          }
-          expect(fetchMock).toHaveBeenCalledTimes(2); // expecting 2 calls because of retry and because the loginPing/tokenRotation is mocked
+          expect(backendSrv.rotateToken).toHaveBeenCalledTimes(1);
+          expect(fetchMock).toHaveBeenCalledTimes(2); // expecting 2 calls because of retry and because the tokenRotation is mocked
         });
       });
     });
@@ -595,7 +572,7 @@ describe('backendSrv', () => {
           data: { message: 'Token revoked', error: { id: 'ERR_TOKEN_REVOKED', maxConcurrentSessions: 3 } },
         });
 
-        backendSrv.loginPing = jest.fn();
+        backendSrv.rotateToken = jest.fn();
 
         const url = '/api/dashboard/';
 
@@ -609,7 +586,7 @@ describe('backendSrv', () => {
               },
             })
           );
-          expect(backendSrv.loginPing).not.toHaveBeenCalled();
+          expect(backendSrv.rotateToken).not.toHaveBeenCalled();
           expect(logoutMock).not.toHaveBeenCalled();
           expectRequestCallChain({ url, method: 'GET', retry: 0 });
         });
@@ -631,7 +608,7 @@ describe('backendSrv', () => {
           retry: 0,
         };
 
-        backendSrv.loginPing = jest
+        backendSrv.rotateToken = jest
           .fn()
           .mockRejectedValue({ status: 403, statusText: 'Forbidden', data: { message: 'Forbidden' } });
 
@@ -639,7 +616,7 @@ describe('backendSrv', () => {
           expect(error.status).toBe(403);
           expect(error.statusText).toBe('Forbidden');
           expect(error.data).toEqual({ message: 'Forbidden' });
-          expect(backendSrv.loginPing).toHaveBeenCalledTimes(1);
+          expect(backendSrv.rotateToken).toHaveBeenCalledTimes(1);
           expect(logoutMock).not.toHaveBeenCalled();
           expectRequestCallChain(options);
         });
@@ -692,7 +669,7 @@ describe('backendSrv', () => {
 
         let inspectorPacket: FetchResponse | FetchError;
         backendSrv.getInspectorStream().subscribe({
-          next: (rsp) => (inspectorPacket = rsp),
+          next: (rsp) => (inspectorPacket = rsp.response),
         });
 
         await backendSrv.datasourceRequest(options).catch((error) => {
diff --git a/public/app/core/specs/ticks.test.ts b/public/app/core/specs/ticks.test.ts
index 81ea8601e4fdb..727be9f7a8fb3 100644
--- a/public/app/core/specs/ticks.test.ts
+++ b/public/app/core/specs/ticks.test.ts
@@ -1,27 +1,6 @@
 import * as ticks from '../utils/ticks';
 
 describe('ticks', () => {
-  describe('getFlotTickDecimals()', () => {
-    const axis = {
-      min: null,
-      max: null,
-    };
-
-    it('should calculate decimals precision based on graph height', () => {
-      let dec = ticks.getFlotTickDecimals(0, 10, axis, 200);
-      expect(dec.tickDecimals).toBe(1);
-      expect(dec.scaledDecimals).toBe(1);
-
-      dec = ticks.getFlotTickDecimals(0, 100, axis, 200);
-      expect(dec.tickDecimals).toBe(0);
-      expect(dec.scaledDecimals).toBe(-1);
-
-      dec = ticks.getFlotTickDecimals(0, 1, axis, 200);
-      expect(dec.tickDecimals).toBe(2);
-      expect(dec.scaledDecimals).toBe(3);
-    });
-  });
-
   describe('getStringPrecision()', () => {
     it('"3.12" should return 2', () => {
       expect(ticks.getStringPrecision('3.12')).toBe(2);
diff --git a/public/app/core/specs/time_series.test.ts b/public/app/core/specs/time_series.test.ts
index df77e6731284f..87a4a1d885c06 100644
--- a/public/app/core/specs/time_series.test.ts
+++ b/public/app/core/specs/time_series.test.ts
@@ -406,7 +406,10 @@ describe('TimeSeries', () => {
 
   describe('legend decimals', () => {
     let series: TimeSeries;
-    let panel: any;
+    let panel: {
+      decimals: number | null;
+      yaxes: Array<{ decimals: number | null }>;
+    };
     const height = 200;
     beforeEach(() => {
       testData = {
diff --git a/public/app/core/utils/ConfigProvider.tsx b/public/app/core/utils/ConfigProvider.tsx
index 3a8e5c4f99e14..9febaaff0542c 100644
--- a/public/app/core/utils/ConfigProvider.tsx
+++ b/public/app/core/utils/ConfigProvider.tsx
@@ -23,8 +23,8 @@ export const ThemeProvider = ({ children, value }: { children: React.ReactNode;
   return (
     <ThemeContext.Provider value={theme}>
       <SkeletonTheme
-        baseColor={theme.colors.background.secondary}
-        highlightColor={theme.colors.emphasize(theme.colors.background.secondary)}
+        baseColor={theme.colors.emphasize(theme.colors.background.secondary)}
+        highlightColor={theme.colors.emphasize(theme.colors.background.secondary, 0.1)}
         borderRadius={theme.shape.radius.default}
       >
         {children}
diff --git a/public/app/core/utils/acl.ts b/public/app/core/utils/acl.ts
deleted file mode 100644
index eadce788d2e9e..0000000000000
--- a/public/app/core/utils/acl.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { DashboardAcl, DashboardAclDTO } from 'app/types/acl';
-
-export function processAclItems(items: DashboardAclDTO[]): DashboardAcl[] {
-  return items.map(processAclItem).sort((a, b) => b.sortRank! - a.sortRank! || a.name!.localeCompare(b.name!));
-}
-
-function processAclItem(dto: DashboardAclDTO): DashboardAcl {
-  const item: DashboardAcl = dto;
-
-  item.sortRank = 0;
-
-  if (item.userId! > 0) {
-    item.name = item.userLogin;
-    item.sortRank = 10;
-  } else if (item.teamId! > 0) {
-    item.name = item.team;
-    item.sortRank = 20;
-  } else if (item.role) {
-    item.icon = 'fa fa-fw fa-street-view';
-    item.name = item.role;
-    item.sortRank = 30;
-    if (item.role === 'Editor') {
-      item.sortRank += 1;
-    }
-  }
-
-  if (item.inherited) {
-    item.sortRank += 100;
-  }
-
-  return item;
-}
diff --git a/public/app/core/utils/auth.ts b/public/app/core/utils/auth.ts
index 42d99cd59c97a..8c6b69cc028bb 100644
--- a/public/app/core/utils/auth.ts
+++ b/public/app/core/utils/auth.ts
@@ -11,3 +11,7 @@ export function getSessionExpiry() {
 
   return parseInt(expiresStr, 10);
 }
+
+export function hasSessionExpiry() {
+  return document.cookie.split('; ').findIndex((row) => row.startsWith('grafana_session_expiry=')) > -1;
+}
diff --git a/public/app/core/utils/browser.ts b/public/app/core/utils/browser.ts
index d47b8745e4b26..ec37aa3793a10 100644
--- a/public/app/core/utils/browser.ts
+++ b/public/app/core/utils/browser.ts
@@ -1,6 +1,6 @@
 /**
  * Check to see if browser is not supported by Grafana
- * This function is copied to index-template.html but is here so we can write tests
+ * This function is copied to index.html but is here so we can write tests
  *  */
 export function checkBrowserCompatibility() {
   const isIE = navigator.userAgent.indexOf('MSIE') > -1;
@@ -39,5 +39,5 @@ export function userAgentIsApple() {
 }
 
 export function getModKey() {
-  return userAgentIsApple() ? 'cmd' : 'ctrl';
+  return userAgentIsApple() ? '⌘' : 'ctrl';
 }
diff --git a/public/app/core/utils/colors.ts b/public/app/core/utils/colors.ts
index 6d73ab9fbd892..da47ce322d018 100644
--- a/public/app/core/utils/colors.ts
+++ b/public/app/core/utils/colors.ts
@@ -1,5 +1,5 @@
 import config from 'app/core/config';
 
 export function getThemeColor(dark: string, light: string): string {
-  return config.bootData.user.lightTheme ? light : dark;
+  return config.bootData?.user?.lightTheme ? light : dark;
 }
diff --git a/public/app/core/utils/explore.test.ts b/public/app/core/utils/explore.test.ts
index f08d940f55972..658f3eefd0f88 100644
--- a/public/app/core/utils/explore.test.ts
+++ b/public/app/core/utils/explore.test.ts
@@ -2,7 +2,6 @@ import { DataSourceApi, dateTime, ExploreUrlState, LogsSortOrder } from '@grafan
 import { serializeStateToUrlParam } from '@grafana/data/src/utils/url';
 import { DataQuery } from '@grafana/schema';
 import { RefreshPicker } from '@grafana/ui';
-import store from 'app/core/store';
 import { DEFAULT_RANGE } from 'app/features/explore/state/utils';
 
 import { DatasourceSrvMock, MockDataSourceApi } from '../../../test/mocks/datasource_srv';
@@ -11,7 +10,6 @@ import {
   buildQueryTransaction,
   hasNonEmptyQuery,
   refreshIntervalToSortOrder,
-  updateHistory,
   getExploreUrl,
   GetExploreUrlArguments,
   getTimeRange,
@@ -151,27 +149,6 @@ describe('getExploreUrl', () => {
   });
 });
 
-describe('updateHistory()', () => {
-  const datasourceId = 'myDatasource';
-  const key = `grafana.explore.history.${datasourceId}`;
-
-  beforeEach(() => {
-    store.delete(key);
-    expect(store.exists(key)).toBeFalsy();
-  });
-
-  test('should save history item to localStorage', () => {
-    const expected = [
-      {
-        query: { refId: '1', expr: 'metric' },
-      },
-    ];
-    expect(updateHistory([], datasourceId, [{ refId: '1', expr: 'metric' }])).toMatchObject(expected);
-    expect(store.exists(key)).toBeTruthy();
-    expect(store.getObject(key)).toMatchObject(expected);
-  });
-});
-
 describe('hasNonEmptyQuery', () => {
   test('should return true if one query is non-empty', () => {
     expect(hasNonEmptyQuery([{ refId: '1', key: '2', context: 'explore', expr: 'foo' }])).toBeTruthy();
@@ -187,7 +164,7 @@ describe('hasNonEmptyQuery', () => {
 });
 
 describe('getTimeRange', () => {
-  describe('should flip from and to when from is after to', () => {
+  describe('should not flip from and to when from is after to', () => {
     const rawRange = {
       from: 'now',
       to: 'now-6h',
@@ -195,7 +172,7 @@ describe('getTimeRange', () => {
 
     const range = getTimeRange('utc', rawRange, 0);
 
-    expect(range.from.isBefore(range.to)).toBe(true);
+    expect(range.from.isBefore(range.to)).toBe(false);
   });
 });
 
diff --git a/public/app/core/utils/explore.ts b/public/app/core/utils/explore.ts
index 281f6fd997ef4..501a03d57d467 100644
--- a/public/app/core/utils/explore.ts
+++ b/public/app/core/utils/explore.ts
@@ -1,15 +1,15 @@
-import { nanoid } from '@reduxjs/toolkit';
+import { customAlphabet } from 'nanoid';
 import { Unsubscribable } from 'rxjs';
 import { v4 as uuidv4 } from 'uuid';
 
 import {
+  AdHocVariableFilter,
   CoreApp,
   DataQuery,
   DataQueryRequest,
   DataSourceApi,
   DataSourceRef,
   DefaultTimeZone,
-  HistoryItem,
   IntervalValues,
   LogsDedupStrategy,
   LogsSortOrder,
@@ -27,15 +27,14 @@ import store from 'app/core/store';
 import { ExpressionDatasourceUID } from 'app/features/expressions/types';
 import { QueryOptions, QueryTransaction } from 'app/types/explore';
 
-import { config } from '../config';
-
 import { getNextRefIdChar } from './query';
 
 export const DEFAULT_UI_STATE = {
   dedupStrategy: LogsDedupStrategy.none,
 };
 
-const MAX_HISTORY_ITEMS = 100;
+export const ID_ALPHABET = '0123456789abcdefghijklmnopqrstuvwxyz';
+const nanoid = customAlphabet(ID_ALPHABET, 3);
 
 const LAST_USED_DATASOURCE_KEY = 'grafana.explore.datasource';
 const lastUsedDatasourceKeyForOrgId = (orgId: number) => `${LAST_USED_DATASOURCE_KEY}.${orgId}`;
@@ -49,17 +48,24 @@ export interface GetExploreUrlArguments {
   dsRef: DataSourceRef | null | undefined;
   timeRange: TimeRange;
   scopedVars: ScopedVars | undefined;
+  adhocFilters?: AdHocVariableFilter[];
 }
 
 export function generateExploreId() {
-  return nanoid(3);
+  while (true) {
+    const id = nanoid(3);
+
+    if (!/^\d+$/.test(id)) {
+      return id;
+    }
+  }
 }
 
 /**
  * Returns an Explore-URL that contains a panel's queries and the dashboard time range.
  */
 export async function getExploreUrl(args: GetExploreUrlArguments): Promise<string | undefined> {
-  const { queries, dsRef, timeRange, scopedVars } = args;
+  const { queries, dsRef, timeRange, scopedVars, adhocFilters } = args;
   const interpolatedQueries = (
     await Promise.allSettled(
       queries
@@ -72,7 +78,7 @@ export async function getExploreUrl(args: GetExploreUrlArguments): Promise<strin
 
           return {
             // interpolate the query using its datasource `interpolateVariablesInQueries` method if defined, othewise return the query as-is.
-            ...(queryDs.interpolateVariablesInQueries?.([q], scopedVars ?? {})[0] || q),
+            ...(queryDs.interpolateVariablesInQueries?.([q], scopedVars ?? {}, adhocFilters)[0] || q),
             // But always set the datasource as it's  required in Explore.
             // NOTE: if for some reason the query has the "mixed" datasource, we omit the property;
             // Upon initialization, Explore use its own logic to determine the datasource.
@@ -92,6 +98,10 @@ export async function getExploreUrl(args: GetExploreUrlArguments): Promise<strin
   return urlUtil.renderUrl('/explore', { panes: exploreState, schemaVersion: 1 });
 }
 
+export function requestIdGenerator(exploreId: string) {
+  return `explore_${exploreId}`;
+}
+
 export function buildQueryTransaction(
   exploreId: string,
   queries: DataQuery[],
@@ -101,19 +111,9 @@ export function buildQueryTransaction(
   timeZone?: TimeZone,
   scopedVars?: ScopedVars
 ): QueryTransaction {
-  const key = queries.reduce((combinedKey, query) => {
-    combinedKey += query.key;
-    return combinedKey;
-  }, '');
-
+  const panelId = Number.parseInt(exploreId, 36);
   const { interval, intervalMs } = getIntervals(range, queryOptions.minInterval, queryOptions.maxDataPoints);
 
-  // Most datasource is using `panelId + query.refId` for cancellation logic.
-  // Using `format` here because it relates to the view panel that the request is for.
-  // However, some datasources don't use `panelId + query.refId`, but only `panelId`.
-  // Therefore panel id has to be unique.
-  const panelId = `${key}`;
-
   const request: DataQueryRequest = {
     app: CoreApp.Explore,
     // TODO probably should be taken from preferences but does not seem to be used anyway.
@@ -121,12 +121,10 @@ export function buildQueryTransaction(
     startTime: Date.now(),
     interval,
     intervalMs,
-    // TODO: the query request expects number and we are using string here. Seems like it works so far but can create
-    // issues down the road.
-    panelId: panelId as any,
+    panelId,
     targets: queries, // Datasources rely on DataQueries being passed under the targets key.
     range,
-    requestId: 'explore_' + exploreId,
+    requestId: requestIdGenerator(exploreId),
     rangeRaw: range.raw,
     scopedVars: {
       __interval: { text: interval, value: interval },
@@ -148,18 +146,6 @@ export function buildQueryTransaction(
 
 export const clearQueryKeys: (query: DataQuery) => DataQuery = ({ key, ...rest }) => rest;
 
-export const safeParseJson = (text?: string): any | undefined => {
-  if (!text) {
-    return;
-  }
-
-  try {
-    return JSON.parse(text);
-  } catch (error) {
-    console.error(error);
-  }
-};
-
 export const safeStringifyValue = (value: unknown, space?: number) => {
   if (value === undefined || value === null) {
     return '';
@@ -278,45 +264,15 @@ const validKeys = ['refId', 'key', 'context', 'datasource'];
 export function hasNonEmptyQuery<TQuery extends DataQuery>(queries: TQuery[]): boolean {
   return (
     queries &&
-    queries.some((query: any) => {
-      const keys = Object.keys(query)
-        .filter((key) => validKeys.indexOf(key) === -1)
-        .map((k) => query[k])
-        .filter((v) => v);
-      return keys.length > 0;
+    queries.some((query) => {
+      const entries = Object.entries(query)
+        .filter(([key, _]) => validKeys.indexOf(key) === -1)
+        .filter(([_, value]) => value);
+      return entries.length > 0;
     })
   );
 }
 
-/**
- * Update the query history. Side-effect: store history in local storage
- */
-export function updateHistory<T extends DataQuery>(
-  history: Array<HistoryItem<T>>,
-  datasourceId: string,
-  queries: T[]
-): Array<HistoryItem<T>> {
-  const ts = Date.now();
-  let updatedHistory = history;
-  queries.forEach((query) => {
-    updatedHistory = [{ query, ts }, ...updatedHistory];
-  });
-
-  if (updatedHistory.length > MAX_HISTORY_ITEMS) {
-    updatedHistory = updatedHistory.slice(0, MAX_HISTORY_ITEMS);
-  }
-
-  // Combine all queries of a datasource type into one history
-  const historyKey = `grafana.explore.history.${datasourceId}`;
-  try {
-    store.setObject(historyKey, updatedHistory);
-    return updatedHistory;
-  } catch (error) {
-    console.error(error);
-    return history;
-  }
-}
-
 export const getQueryKeys = (queries: DataQuery[]): string[] => {
   const queryKeys = queries.reduce<string[]>((newQueryKeys, query, index) => {
     const primaryKey = query.datasource?.uid || query.key;
@@ -329,25 +285,12 @@ export const getQueryKeys = (queries: DataQuery[]): string[] => {
 export const getTimeRange = (timeZone: TimeZone, rawRange: RawTimeRange, fiscalYearStartMonth: number): TimeRange => {
   let range = rangeUtil.convertRawToRange(rawRange, timeZone, fiscalYearStartMonth);
 
-  if (range.to.isBefore(range.from)) {
-    range = rangeUtil.convertRawToRange({ from: range.raw.to, to: range.raw.from }, timeZone, fiscalYearStartMonth);
-  }
-
   return range;
 };
 
 export const refreshIntervalToSortOrder = (refreshInterval?: string) =>
   RefreshPicker.isLive(refreshInterval) ? LogsSortOrder.Ascending : LogsSortOrder.Descending;
 
-export const convertToWebSocketUrl = (url: string) => {
-  const protocol = window.location.protocol === 'https:' ? 'wss://' : 'ws://';
-  let backend = `${protocol}${window.location.host}${config.appSubUrl}`;
-  if (backend.endsWith('/')) {
-    backend = backend.slice(0, -1);
-  }
-  return `${backend}${url}`;
-};
-
 export const stopQueryState = (querySubscription: Unsubscribable | undefined) => {
   if (querySubscription) {
     querySubscription.unsubscribe();
@@ -363,10 +306,14 @@ export function getIntervals(range: TimeRange, lowLimit?: string, resolution?: n
 }
 
 export const copyStringToClipboard = (string: string) => {
-  const el = document.createElement('textarea');
-  el.value = string;
-  document.body.appendChild(el);
-  el.select();
-  document.execCommand('copy');
-  document.body.removeChild(el);
+  if (navigator.clipboard && window.isSecureContext) {
+    navigator.clipboard.writeText(string);
+  } else {
+    const el = document.createElement('textarea');
+    el.value = string;
+    document.body.appendChild(el);
+    el.select();
+    document.execCommand('copy');
+    document.body.removeChild(el);
+  }
 };
diff --git a/public/app/core/utils/fetch.ts b/public/app/core/utils/fetch.ts
index 03b5031d7771d..49253f74a31ee 100644
--- a/public/app/core/utils/fetch.ts
+++ b/public/app/core/utils/fetch.ts
@@ -103,23 +103,29 @@ export async function parseResponseBody<T>(
   if (responseType) {
     switch (responseType) {
       case 'arraybuffer':
-        return response.arrayBuffer() as any;
+        // this specifically returns a Promise<ArrayBuffer>
+        // TODO refactor this function to remove the type assertions
+        return response.arrayBuffer() as Promise<T>;
 
       case 'blob':
-        return response.blob() as any;
+        // this specifically returns a Promise<Blob>
+        // TODO refactor this function to remove the type assertions
+        return response.blob() as Promise<T>;
 
       case 'json':
         // An empty string is not a valid JSON.
         // Sometimes (unfortunately) our APIs declare their Content-Type as JSON, however they return an empty body.
         if (response.headers.get('Content-Length') === '0') {
           console.warn(`${response.url} returned an invalid JSON`);
-          return {} as unknown as T;
+          return {} as T;
         }
 
         return await response.json();
 
       case 'text':
-        return response.text() as any;
+        // this specifically returns a Promise<string>
+        // TODO refactor this function to remove the type assertions
+        return response.text() as Promise<T>;
     }
   }
 
@@ -127,10 +133,10 @@ export async function parseResponseBody<T>(
   try {
     return JSON.parse(textData); // majority of the requests this will be something that can be parsed
   } catch {}
-  return textData as any;
+  return textData as T;
 }
 
-export function serializeParams(data: Record<string, any>): string {
+function serializeParams(data: Record<string, any>): string {
   return Object.keys(data)
     .map((key) => {
       const value = data[key];
diff --git a/public/app/core/utils/kbn.test.ts b/public/app/core/utils/kbn.test.ts
index 6e291f3d1b275..bb0130fe5f9c8 100644
--- a/public/app/core/utils/kbn.test.ts
+++ b/public/app/core/utils/kbn.test.ts
@@ -27,7 +27,7 @@ const formatTests: ValueFormatTest[] = [
   { id: 'ms', decimals: 4, value: 0.0024, result: '0.0024 ms' },
   { id: 'ms', decimals: 0, value: 100, result: '100 ms' },
   { id: 'ms', decimals: 2, value: 1250, result: '1.25 s' },
-  { id: 'ms', decimals: 1, value: 10000086.123, result: '2.8 hour' },
+  { id: 'ms', decimals: 1, value: 10000086.123, result: '2.8 hours' },
   { id: 'ms', decimals: 0, value: 1200, result: '1 s' },
   { id: 'short', decimals: 0, value: 98765, result: '99 K' },
   { id: 'short', decimals: 0, value: 9876543, result: '10 Mil' },
diff --git a/public/app/core/utils/metrics.ts b/public/app/core/utils/metrics.ts
index 97551a721ccd7..e244851aa74d3 100644
--- a/public/app/core/utils/metrics.ts
+++ b/public/app/core/utils/metrics.ts
@@ -1,7 +1,7 @@
 import { reportPerformance } from '../services/echo/EchoSrv';
 
 export function startMeasure(eventName: string) {
-  if (!performance) {
+  if (!performance || !performance.mark) {
     return;
   }
 
@@ -13,7 +13,7 @@ export function startMeasure(eventName: string) {
 }
 
 export function stopMeasure(eventName: string) {
-  if (!performance) {
+  if (!performance || !performance.mark) {
     return;
   }
 
@@ -29,7 +29,9 @@ export function stopMeasure(eventName: string) {
     performance.clearMarks(started);
     performance.clearMarks(completed);
     performance.clearMeasures(measured);
+    return measure;
   } catch (error) {
     console.error(`[Metrics] Failed to stopMeasure ${eventName}`, error);
+    return;
   }
 }
diff --git a/public/app/core/utils/navBarItem-translations.ts b/public/app/core/utils/navBarItem-translations.ts
index 2c08370ad4f19..61969eb5d0327 100644
--- a/public/app/core/utils/navBarItem-translations.ts
+++ b/public/app/core/utils/navBarItem-translations.ts
@@ -21,7 +21,7 @@ export function getNavTitle(navId: string | undefined) {
     case 'import':
       return t('nav.create-import.title', 'Import dashboard');
     case 'alert':
-      return t('nav.create-alert.title', 'Create alert rule');
+      return t('nav.create-alert.title', 'New alert rule');
     case 'starred':
       return t('nav.starred.title', 'Starred');
     case 'starred-empty':
@@ -56,10 +56,14 @@ export function getNavTitle(navId: string | undefined) {
       return t('nav.oncall.title', 'OnCall');
     case 'alerting-legacy':
       return t('nav.alerting-legacy.title', 'Alerting (legacy)');
+    case 'alerting-upgrade':
+      return t('nav.alerting-upgrade.title', 'Alerting upgrade');
     case 'alert-home':
       return t('nav.alerting-home.title', 'Home');
     case 'alert-list':
       return t('nav.alerting-list.title', 'Alert rules');
+    case 'alert-list-legacy':
+      return t('nav.alert-list-legacy.title', 'Alert rules');
     case 'receivers':
       return t('nav.alerting-receivers.title', 'Contact points');
     case 'am-routes':
@@ -114,14 +118,22 @@ export function getNavTitle(navId: string | undefined) {
       return t('nav.server-settings.title', 'Settings');
     case 'storage':
       return t('nav.storage.title', 'Storage');
+    case 'migrate-to-cloud':
+      return t('nav.migrate-to-cloud.title', 'Migrate to Grafana Cloud');
     case 'upgrading':
       return t('nav.upgrading.title', 'Stats and license');
     case 'monitoring':
       return t('nav.monitoring.title', 'Observability');
+    case 'infrastructure':
+      return t('nav.infrastructure.title', 'Infrastructure');
+    case 'frontend':
+      return t('nav.frontend.title', 'Frontend');
     case 'apps':
       return t('nav.apps.title', 'Apps');
     case 'alerts-and-incidents':
       return t('nav.alerts-and-incidents.title', 'Alerts & IRM');
+    case 'testing-and-synthetics':
+      return t('nav.testing-and-synthetics.title', 'Testing & synthetics');
     case 'plugin-page-grafana-incident-app':
       return t('nav.incidents.title', 'Incidents');
     case 'plugin-page-grafana-ml-app':
@@ -129,17 +141,17 @@ export function getNavTitle(navId: string | undefined) {
     case 'plugin-page-grafana-slo-app':
       return t('nav.slo.title', 'SLO');
     case 'plugin-page-k6-app':
-      return t('nav.performance-testing.title', 'Performance testing');
+      return t('nav.k6.title', 'Performance');
     case 'monitoring':
       return t('nav.observability.title', 'Observability');
     case 'plugin-page-grafana-k8s-app':
       return t('nav.kubernetes.title', 'Kubernetes');
     case 'plugin-page-grafana-app-observability-app':
-      return t('nav.application.title', 'Application (preview)');
+      return t('nav.application.title', 'Application');
     case 'plugin-page-grafana-pyroscope-app':
       return t('nav.profiles.title', 'Profiles');
     case 'plugin-page-grafana-kowalski-app':
-      return t('nav.frontend.title', 'Frontend');
+      return t('nav.frontend-app.title', 'Frontend');
     case 'plugin-page-grafana-synthetic-monitoring-app':
       return t('nav.synthetics.title', 'Synthetics');
     case 'help':
@@ -158,12 +170,16 @@ export function getNavTitle(navId: string | undefined) {
       return t('nav.connections.title', 'Connections');
     case 'connections-add-new-connection':
       return t('nav.add-new-connections.title', 'Add new connection');
+    case 'standalone-plugin-page-/connections/collector':
+      return t('nav.collector.title', 'Collector');
     case 'connections-datasources':
       return t('nav.data-sources.title', 'Data sources');
     case 'standalone-plugin-page-/connections/infrastructure':
-      return t('nav.infrastructure.title', 'Integrations');
+      return t('nav.integrations.title', 'Integrations');
     case 'standalone-plugin-page-/connections/connect-data':
       return t('nav.connect-data.title', 'Connect data');
+    case 'standalone-plugin-page-/connections/private-data-source-connections':
+      return t('nav.private-data-source-connections.title', 'Private data source connect');
     case 'plugin-page-grafana-detect-app':
       return t('nav.detect.title', 'Detect');
     case 'plugin-page-grafana-quaderno-app':
@@ -192,6 +208,11 @@ export function getNavSubTitle(navId: string | undefined) {
       return t('nav.library-panels.subtitle', 'Reusable panels that can be added to multiple dashboards');
     case 'alerting':
       return t('nav.alerting.subtitle', 'Learn about problems in your systems moments after they occur');
+    case 'alerting-upgrade':
+      return t(
+        'nav.alerting-upgrade.subtitle',
+        'Upgrade your existing legacy alerts and notification channels to the new Grafana Alerting'
+      );
     case 'alert-list':
       return t('nav.alerting-list.subtitle', 'Rules that determine whether an alert will fire');
     case 'receivers':
@@ -229,6 +250,11 @@ export function getNavSubTitle(navId: string | undefined) {
       return t('nav.server-settings.subtitle', 'View the settings defined in your Grafana config');
     case 'storage':
       return t('nav.storage.subtitle', 'Manage file storage');
+    case 'migrate-to-cloud':
+      return t(
+        'nav.migrate-to-cloud.subtitle',
+        'Copy configuration from your self-managed installation to a cloud stack'
+      );
     case 'support-bundles':
       return t('nav.support-bundles.subtitle', 'Download support bundles');
     case 'admin':
@@ -245,13 +271,24 @@ export function getNavSubTitle(navId: string | undefined) {
     case 'apps':
       return t('nav.apps.subtitle', 'App plugins that extend the Grafana experience');
     case 'monitoring':
-      return t('nav.monitoring.subtitle', 'Monitoring and infrastructure apps');
+      return t('nav.monitoring.subtitle', 'Out-of-the-box observability solutions');
+    case 'infrastructure':
+      return t('nav.infrastructure.subtitle', "Understand your infrastructure's health");
+    case 'frontend':
+      return t('nav.frontend.subtitle', 'Gain real user monitoring insights');
     case 'alerts-and-incidents':
       return t('nav.alerts-and-incidents.subtitle', 'Alerting and incident management apps');
+    case 'testing-and-synthetics':
+      return t('nav.testing-and-synthetics.subtitle', 'Optimize performance with k6 and Synthetic Monitoring insights');
     case 'connections-add-new-connection':
       return t('nav.connections.subtitle', 'Browse and create new connections');
     case 'connections-datasources':
       return t('nav.data-sources.subtitle', 'View and manage your connected data source connections');
+    case 'connections-private-data-source-connections':
+      return t(
+        'nav.private-data-source-connections.subtitle',
+        'Query data that lives within a secured network without opening the network to inbound traffic from Grafana Cloud. Learn more in our docs.'
+      );
     default:
       return undefined;
   }
diff --git a/public/app/core/utils/query.ts b/public/app/core/utils/query.ts
index bd5cdefe808c2..ef75c918ce168 100644
--- a/public/app/core/utils/query.ts
+++ b/public/app/core/utils/query.ts
@@ -1,5 +1,6 @@
 import { DataQuery, DataSourceRef } from '@grafana/data';
 
+// @deprecated use the `getNextRefId` function from grafana/data instead
 export const getNextRefIdChar = (queries: DataQuery[]): string => {
   for (let num = 0; ; num++) {
     const refId = getRefId(num);
diff --git a/public/app/core/utils/richHistory.test.ts b/public/app/core/utils/richHistory.test.ts
index 4e87f38e7487c..0c6a95b981df7 100644
--- a/public/app/core/utils/richHistory.test.ts
+++ b/public/app/core/utils/richHistory.test.ts
@@ -109,15 +109,13 @@ describe('richHistory', () => {
 
     it('should append query to query history', async () => {
       Date.now = jest.fn(() => 2);
-      const { limitExceeded, richHistoryStorageFull } = await addToRichHistory(
-        mock.testDatasourceUid,
-        mock.testDatasourceName,
-        mock.testQueries,
-        mock.testStarred,
-        mock.testComment,
-        true,
-        true
-      );
+      const { limitExceeded, richHistoryStorageFull } = await addToRichHistory({
+        localOverride: false,
+        datasource: { uid: mock.testDatasourceUid, name: mock.testDatasourceName },
+        queries: mock.testQueries,
+        starred: mock.testStarred,
+        comment: mock.testComment,
+      });
       expect(limitExceeded).toBeFalsy();
       expect(richHistoryStorageFull).toBeFalsy();
       expect(richHistoryStorageMock.addToRichHistory).toBeCalledWith({
@@ -142,15 +140,13 @@ describe('richHistory', () => {
         });
       });
 
-      const { richHistoryStorageFull, limitExceeded } = await addToRichHistory(
-        mock.testDatasourceUid,
-        mock.testDatasourceName,
-        mock.testQueries,
-        mock.testStarred,
-        mock.testComment,
-        true,
-        true
-      );
+      const { richHistoryStorageFull, limitExceeded } = await addToRichHistory({
+        localOverride: false,
+        datasource: { uid: mock.testDatasourceUid, name: mock.testDatasourceName },
+        queries: mock.testQueries,
+        starred: mock.testStarred,
+        comment: mock.testComment,
+      });
       expect(richHistoryStorageFull).toBeFalsy();
       expect(limitExceeded).toBeTruthy();
     });
diff --git a/public/app/core/utils/richHistory.ts b/public/app/core/utils/richHistory.ts
index 9a4b64b1454ef..ad95f6256967d 100644
--- a/public/app/core/utils/richHistory.ts
+++ b/public/app/core/utils/richHistory.ts
@@ -5,6 +5,7 @@ import { serializeStateToUrlParam } from '@grafana/data/src/utils/url';
 import { getDataSourceSrv } from '@grafana/runtime';
 import { notifyApp } from 'app/core/actions';
 import { createErrorNotification, createWarningNotification } from 'app/core/copy/appNotification';
+import { t } from 'app/core/internationalization';
 import { dispatch } from 'app/store/store';
 import { RichHistoryQuery } from 'app/types/explore';
 
@@ -14,7 +15,7 @@ import {
   RichHistoryStorageWarning,
   RichHistoryStorageWarningDetails,
 } from '../history/RichHistoryStorage';
-import { getRichHistoryStorage } from '../history/richHistoryStorageProvider';
+import { getLocalRichHistoryStorage, getRichHistoryStorage } from '../history/richHistoryStorageProvider';
 
 import { RichHistorySearchFilters, RichHistorySettings, SortOrder } from './richHistoryTypes';
 
@@ -25,15 +26,27 @@ export { RichHistorySearchFilters, RichHistorySettings, SortOrder };
  * Side-effect: store history in local storage
  */
 
+type addToRichHistoryParams = {
+  localOverride: boolean;
+  datasource: { uid: string; name?: string };
+  queries: DataQuery[];
+  starred: boolean;
+  comment?: string;
+  showNotif?: {
+    quotaExceededError?: boolean;
+    limitExceededWarning?: boolean;
+    otherErrors?: boolean;
+  };
+};
+
 export async function addToRichHistory(
-  datasourceUid: string,
-  datasourceName: string | null,
-  queries: DataQuery[],
-  starred: boolean,
-  comment: string | null,
-  showQuotaExceededError: boolean,
-  showLimitExceededWarning: boolean
+  params: addToRichHistoryParams
 ): Promise<{ richHistoryStorageFull?: boolean; limitExceeded?: boolean }> {
+  const { queries, localOverride, datasource, starred, comment, showNotif } = params;
+  // default showing of errors to true
+  const showQuotaExceededError = showNotif?.quotaExceededError ?? true;
+  const showLimitExceededWarning = showNotif?.limitExceededWarning ?? true;
+  const showOtherErrors = showNotif?.otherErrors ?? true;
   /* Save only queries, that are not falsy (e.g. empty object, null, ...) */
   const newQueriesToSave: DataQuery[] = queries && queries.filter((query) => notEmptyQuery(query));
 
@@ -43,9 +56,11 @@ export async function addToRichHistory(
     let warning: RichHistoryStorageWarningDetails | undefined;
 
     try {
-      const result = await getRichHistoryStorage().addToRichHistory({
-        datasourceUid: datasourceUid,
-        datasourceName: datasourceName ?? '',
+      // for autocomplete we want to ensure writing to local storage
+      const storage = localOverride ? getLocalRichHistoryStorage() : getRichHistoryStorage();
+      const result = await storage.addToRichHistory({
+        datasourceUid: datasource.uid,
+        datasourceName: datasource.name ?? '',
         queries: newQueriesToSave,
         starred,
         comment: comment ?? '',
@@ -56,8 +71,15 @@ export async function addToRichHistory(
         if (error.name === RichHistoryServiceError.StorageFull) {
           richHistoryStorageFull = true;
           showQuotaExceededError && dispatch(notifyApp(createErrorNotification(error.message)));
-        } else if (error.name !== RichHistoryServiceError.DuplicatedEntry) {
-          dispatch(notifyApp(createErrorNotification('Rich History update failed', error.message)));
+        } else if (showOtherErrors && error.name !== RichHistoryServiceError.DuplicatedEntry) {
+          dispatch(
+            notifyApp(
+              createErrorNotification(
+                t('explore.rich-history-utils-notification.update-failed', 'Rich History update failed'),
+                error.message
+              )
+            )
+          );
         }
       }
       // Saving failed. Do not add new entry.
@@ -98,7 +120,14 @@ export async function updateStarredInRichHistory(id: string, starred: boolean) {
     return await getRichHistoryStorage().updateStarred(id, starred);
   } catch (error) {
     if (error instanceof Error) {
-      dispatch(notifyApp(createErrorNotification('Saving rich history failed', error.message)));
+      dispatch(
+        notifyApp(
+          createErrorNotification(
+            t('explore.rich-history-utils-notification.saving-failed', 'Saving rich history failed'),
+            error.message
+          )
+        )
+      );
     }
     return undefined;
   }
@@ -109,7 +138,14 @@ export async function updateCommentInRichHistory(id: string, newComment: string
     return await getRichHistoryStorage().updateComment(id, newComment);
   } catch (error) {
     if (error instanceof Error) {
-      dispatch(notifyApp(createErrorNotification('Saving rich history failed', error.message)));
+      dispatch(
+        notifyApp(
+          createErrorNotification(
+            t('explore.rich-history-utils-notification.saving-failed', 'Saving rich history failed'),
+            error.message
+          )
+        )
+      );
     }
     return undefined;
   }
@@ -121,7 +157,14 @@ export async function deleteQueryInRichHistory(id: string) {
     return id;
   } catch (error) {
     if (error instanceof Error) {
-      dispatch(notifyApp(createErrorNotification('Saving rich history failed', error.message)));
+      dispatch(
+        notifyApp(
+          createErrorNotification(
+            t('explore.rich-history-utils-notification.saving-failed', 'Saving rich history failed'),
+            error.message
+          )
+        )
+      );
     }
     return undefined;
   }
@@ -130,7 +173,10 @@ export async function deleteQueryInRichHistory(id: string) {
 export const createUrlFromRichHistory = (query: RichHistoryQuery) => {
   const exploreState: ExploreUrlState = {
     /* Default range, as we are not saving timerange in rich history */
-    range: { from: 'now-1h', to: 'now' },
+    range: {
+      from: t('explore.rich-history-utils.default-from', 'now-1h'),
+      to: t('explore.rich-history-utils.default-to', 'now'),
+    },
     datasource: query.datasourceName,
     queries: query.queries,
   };
@@ -146,19 +192,19 @@ export const mapNumbertoTimeInSlider = (num: number) => {
   let str;
   switch (num) {
     case 0:
-      str = 'today';
+      str = t('explore.rich-history-utils.today', 'today');
       break;
     case 1:
-      str = 'yesterday';
+      str = t('explore.rich-history-utils.yesterday', 'yesterday');
       break;
     case 7:
-      str = 'a week ago';
+      str = t('explore.rich-history-utils.a-week-ago', 'a week ago');
       break;
     case 14:
-      str = 'two weeks ago';
+      str = t('explore.rich-history-utils.two-weeks-ago', 'two weeks ago');
       break;
     default:
-      str = `${num} days ago`;
+      str = t('explore.rich-history-utils.days-ago', '{{num}} days ago', { num: `${num}` });
   }
 
   return str;
diff --git a/public/app/core/utils/richHistoryTypes.ts b/public/app/core/utils/richHistoryTypes.ts
index b311b82752980..c49029c035ba2 100644
--- a/public/app/core/utils/richHistoryTypes.ts
+++ b/public/app/core/utils/richHistoryTypes.ts
@@ -23,8 +23,8 @@ export type RichHistorySearchFilters = {
   sortOrder: SortOrder;
   /** Names of data sources (not uids) - used by local and remote storage **/
   datasourceFilters: string[];
-  from: number;
-  to: number;
+  from?: number;
+  to?: number;
   starred: boolean;
   page?: number;
 };
diff --git a/public/app/core/utils/ticks.ts b/public/app/core/utils/ticks.ts
index 5f2239a4d9db3..5b65bb22a0f0e 100644
--- a/public/app/core/utils/ticks.ts
+++ b/public/app/core/utils/ticks.ts
@@ -30,127 +30,6 @@ export function getScaledDecimals(decimals: number, tickSize: number) {
   return decimals - Math.floor(Math.log(tickSize) / Math.LN10);
 }
 
-/**
- * Calculate tick size based on min and max values, number of ticks and precision.
- * Implementation from Flot.
- * @param min           Axis minimum
- * @param max           Axis maximum
- * @param noTicks       Number of ticks
- * @param tickDecimals  Tick decimal precision
- */
-export function getFlotTickSize(min: number, max: number, noTicks: number, tickDecimals: number) {
-  const delta = (max - min) / noTicks;
-  let dec = -Math.floor(Math.log(delta) / Math.LN10);
-  const maxDec = tickDecimals;
-
-  const magn = Math.pow(10, -dec);
-  const norm = delta / magn; // norm is between 1.0 and 10.0
-  let size;
-
-  if (norm < 1.5) {
-    size = 1;
-  } else if (norm < 3) {
-    size = 2;
-    // special case for 2.5, requires an extra decimal
-    if (norm > 2.25 && (maxDec == null || dec + 1 <= maxDec)) {
-      size = 2.5;
-      ++dec;
-    }
-  } else if (norm < 7.5) {
-    size = 5;
-  } else {
-    size = 10;
-  }
-
-  size *= magn;
-
-  return size;
-}
-
-/**
- * Calculate axis range (min and max).
- * Implementation from Flot.
- */
-export function getFlotRange(panelMin: any, panelMax: any, datamin: number, datamax: number) {
-  const autoscaleMargin = 0.02;
-
-  let min = +(panelMin != null ? panelMin : datamin);
-  let max = +(panelMax != null ? panelMax : datamax);
-  const delta = max - min;
-
-  if (delta === 0.0) {
-    // Grafana fix: wide Y min and max using increased wideFactor
-    // when all series values are the same
-    const wideFactor = 0.25;
-    const widen = Math.abs(max === 0 ? 1 : max * wideFactor);
-
-    if (panelMin === null) {
-      min -= widen;
-    }
-    // always widen max if we couldn't widen min to ensure we
-    // don't fall into min == max which doesn't work
-    if (panelMax == null || panelMin != null) {
-      max += widen;
-    }
-  } else {
-    // consider autoscaling
-    const margin = autoscaleMargin;
-    if (margin != null) {
-      if (panelMin == null) {
-        min -= delta * margin;
-        // make sure we don't go below zero if all values
-        // are positive
-        if (min < 0 && datamin != null && datamin >= 0) {
-          min = 0;
-        }
-      }
-      if (panelMax == null) {
-        max += delta * margin;
-        if (max > 0 && datamax != null && datamax <= 0) {
-          max = 0;
-        }
-      }
-    }
-  }
-  return { min, max };
-}
-
-/**
- * Calculate tick decimals.
- * Implementation from Flot.
- */
-export function getFlotTickDecimals(datamin: number, datamax: number, axis: { min: any; max: any }, height: number) {
-  const { min, max } = getFlotRange(axis.min, axis.max, datamin, datamax);
-  const noTicks = 0.3 * Math.sqrt(height);
-  const delta = (max - min) / noTicks;
-  const dec = -Math.floor(Math.log(delta) / Math.LN10);
-
-  const magn = Math.pow(10, -dec);
-  // norm is between 1.0 and 10.0
-  const norm = delta / magn;
-  let size;
-
-  if (norm < 1.5) {
-    size = 1;
-  } else if (norm < 3) {
-    size = 2;
-    // special case for 2.5, requires an extra decimal
-    if (norm > 2.25) {
-      size = 2.5;
-    }
-  } else if (norm < 7.5) {
-    size = 5;
-  } else {
-    size = 10;
-  }
-  size *= magn;
-
-  const tickDecimals = Math.max(0, -Math.floor(Math.log(delta) / Math.LN10) + 1);
-  // grafana addition
-  const scaledDecimals = tickDecimals - Math.floor(Math.log(size) / Math.LN10);
-  return { tickDecimals, scaledDecimals };
-}
-
 /**
  * Format timestamp similar to Grafana graph panel.
  * @param ticks Number of ticks
diff --git a/public/app/core/utils/timePicker.ts b/public/app/core/utils/timePicker.ts
index 08dd76c2531ee..ba862fb185809 100644
--- a/public/app/core/utils/timePicker.ts
+++ b/public/app/core/utils/timePicker.ts
@@ -1,4 +1,6 @@
-import { TimeRange, toUtc, AbsoluteTimeRange } from '@grafana/data';
+import { TimeRange, toUtc, AbsoluteTimeRange, RawTimeRange } from '@grafana/data';
+
+type CopiedTimeRangeResult = { range: RawTimeRange; isError: false } | { range: string; isError: true };
 
 export const getShiftedTimeRange = (direction: number, origRange: TimeRange): AbsoluteTimeRange => {
   const range = {
@@ -38,3 +40,20 @@ export const getZoomedTimeRange = (range: TimeRange, factor: number): AbsoluteTi
 
   return { from, to };
 };
+
+export async function getCopiedTimeRange(): Promise<CopiedTimeRangeResult> {
+  const raw = await navigator.clipboard.readText();
+  let range;
+
+  try {
+    range = JSON.parse(raw);
+
+    if (!range.from || !range.to) {
+      return { range: raw, isError: true };
+    }
+
+    return { range, isError: false };
+  } catch (e) {
+    return { range: raw, isError: true };
+  }
+}
diff --git a/public/app/core/utils/tracing.ts b/public/app/core/utils/tracing.ts
deleted file mode 100644
index c0e947876280a..0000000000000
--- a/public/app/core/utils/tracing.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * Get non overlapping duration of the ranges as they can overlap or have gaps.
- */
-import { FieldType, MutableDataFrame, NodeGraphDataFrameFieldNames as Fields } from '@grafana/data';
-
-export function getNonOverlappingDuration(ranges: Array<[number, number]>): number {
-  ranges.sort((a, b) => a[0] - b[0]);
-  const mergedRanges = ranges.reduce<Array<[number, number]>>((acc, range) => {
-    if (!acc.length) {
-      return [range];
-    }
-    const tail = acc.slice(-1)[0];
-    const [prevStart, prevEnd] = tail;
-    const [start, end] = range;
-    if (end < prevEnd) {
-      // In this case the range is completely inside the prev range so we can just ignore it.
-      return acc;
-    }
-
-    if (start > prevEnd) {
-      // There is no overlap so we can just add it to stack
-      return [...acc, range];
-    }
-
-    // We know there is overlap and current range ends later than previous so we can just extend the range
-    return [...acc.slice(0, -1), [prevStart, end]];
-  }, []);
-
-  return mergedRanges.reduce((acc, range) => {
-    return acc + (range[1] - range[0]);
-  }, 0);
-}
-
-/**
- * Returns a map of the spans with children array for easier processing. It will also contain empty spans in case
- * span is missing but other spans are its children. This is more generic because it needs to allow iterating over
- * both arrays and dataframe views.
- */
-export function makeSpanMap<T>(getSpan: (index: number) => { span: T; id: string; parentIds: string[] } | undefined): {
-  [id: string]: { span: T; children: string[] };
-} {
-  const spanMap: { [id: string]: { span?: T; children: string[] } } = {};
-
-  let span;
-  for (let index = 0; (span = getSpan(index)), !!span; index++) {
-    if (!spanMap[span.id]) {
-      spanMap[span.id] = {
-        span: span.span,
-        children: [],
-      };
-    } else {
-      spanMap[span.id].span = span.span;
-    }
-
-    for (const parentId of span.parentIds) {
-      if (parentId) {
-        if (!spanMap[parentId]) {
-          spanMap[parentId] = {
-            span: undefined,
-            children: [span.id],
-          };
-        } else {
-          spanMap[parentId].children.push(span.id);
-        }
-      }
-    }
-  }
-  return spanMap as { [id: string]: { span: T; children: string[] } };
-}
-
-export function getStats(duration: number, traceDuration: number, selfDuration: number) {
-  return {
-    main: `${toFixedNoTrailingZeros(duration)}ms (${toFixedNoTrailingZeros((duration / traceDuration) * 100)}%)`,
-    secondary: `${toFixedNoTrailingZeros(selfDuration)}ms (${toFixedNoTrailingZeros(
-      (selfDuration / duration) * 100
-    )}%)`,
-  };
-}
-
-function toFixedNoTrailingZeros(n: number) {
-  return parseFloat(n.toFixed(2));
-}
-
-/**
- * Create default frames used when returning data for node graph.
- */
-export function makeFrames() {
-  const nodesFrame = new MutableDataFrame({
-    fields: [
-      { name: Fields.id, type: FieldType.string },
-      { name: Fields.title, type: FieldType.string },
-      { name: Fields.subTitle, type: FieldType.string },
-      { name: Fields.mainStat, type: FieldType.string, config: { displayName: 'Total time (% of trace)' } },
-      { name: Fields.secondaryStat, type: FieldType.string, config: { displayName: 'Self time (% of total)' } },
-      {
-        name: Fields.color,
-        type: FieldType.number,
-        config: { color: { mode: 'continuous-GrYlRd' }, displayName: 'Self time / Trace duration' },
-      },
-    ],
-    meta: {
-      preferredVisualisationType: 'nodeGraph',
-    },
-  });
-
-  const edgesFrame = new MutableDataFrame({
-    fields: [
-      { name: Fields.id, type: FieldType.string },
-      { name: Fields.target, type: FieldType.string },
-      { name: Fields.source, type: FieldType.string },
-    ],
-    meta: {
-      preferredVisualisationType: 'nodeGraph',
-    },
-  });
-
-  return [nodesFrame, edgesFrame];
-}
diff --git a/public/app/features/admin/AdminEditOrgPage.tsx b/public/app/features/admin/AdminEditOrgPage.tsx
index 7c4400acc66a6..910bc8552510b 100644
--- a/public/app/features/admin/AdminEditOrgPage.tsx
+++ b/public/app/features/admin/AdminEditOrgPage.tsx
@@ -1,42 +1,21 @@
 import React, { useState, useEffect } from 'react';
+import { useForm } from 'react-hook-form';
 import { useAsyncFn } from 'react-use';
 
-import { NavModelItem, UrlQueryValue } from '@grafana/data';
-import { getBackendSrv } from '@grafana/runtime';
-import { Form, Field, Input, Button, Legend, Alert } from '@grafana/ui';
+import { NavModelItem } from '@grafana/data';
+import { Field, Input, Button, Legend, Alert } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import { contextSrv } from 'app/core/core';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
-import { accessControlQueryParam } from 'app/core/utils/accessControl';
 import { OrgUser, AccessControlAction, OrgRole } from 'app/types';
 
 import { OrgUsersTable } from './Users/OrgUsersTable';
-
-const perPage = 30;
+import { getOrg, getOrgUsers, getUsersRoles, removeOrgUser, updateOrgName, updateOrgUserRole } from './api';
 
 interface OrgNameDTO {
   orgName: string;
 }
 
-const getOrg = async (orgId: UrlQueryValue) => {
-  return await getBackendSrv().get(`/api/orgs/${orgId}`);
-};
-
-const getOrgUsers = async (orgId: UrlQueryValue, page: number) => {
-  if (contextSrv.hasPermission(AccessControlAction.OrgUsersRead)) {
-    return getBackendSrv().get(`/api/orgs/${orgId}/users/search`, accessControlQueryParam({ perpage: perPage, page }));
-  }
-  return { orgUsers: [] };
-};
-
-const updateOrgUserRole = (orgUser: OrgUser, orgId: UrlQueryValue) => {
-  return getBackendSrv().patch(`/api/orgs/${orgId}/users/${orgUser.userId}`, orgUser);
-};
-
-const removeOrgUser = (orgUser: OrgUser, orgId: UrlQueryValue) => {
-  return getBackendSrv().delete(`/api/orgs/${orgId}/users/${orgUser.userId}`);
-};
-
 interface Props extends GrafanaRouteComponentProps<{ id: string }> {}
 
 const AdminEditOrgPage = ({ match }: Props) => {
@@ -49,8 +28,18 @@ const AdminEditOrgPage = ({ match }: Props) => {
   const [totalPages, setTotalPages] = useState(1);
 
   const [orgState, fetchOrg] = useAsyncFn(() => getOrg(orgId), []);
+  const {
+    handleSubmit,
+    register,
+    formState: { errors },
+  } = useForm<OrgNameDTO>();
   const [, fetchOrgUsers] = useAsyncFn(async (page) => {
     const result = await getOrgUsers(orgId, page);
+
+    if (contextSrv.licensedAccessControlEnabled()) {
+      await getUsersRoles(orgId, result.orgUsers);
+    }
+
     const totalPages = result?.perPage !== 0 ? Math.ceil(result.totalCount / result.perPage) : 0;
     setTotalPages(totalPages);
     setUsers(result.orgUsers);
@@ -62,8 +51,8 @@ const AdminEditOrgPage = ({ match }: Props) => {
     fetchOrgUsers(page);
   }, [fetchOrg, fetchOrgUsers, page]);
 
-  const updateOrgName = async (name: string) => {
-    return await getBackendSrv().put(`/api/orgs/${orgId}`, { ...orgState.value, name });
+  const onUpdateOrgName = async ({ orgName }: OrgNameDTO) => {
+    await updateOrgName(orgName, orgId);
   };
 
   const renderMissingPermissionMessage = () => (
@@ -99,21 +88,18 @@ const AdminEditOrgPage = ({ match }: Props) => {
         <>
           <Legend>Edit organization</Legend>
           {orgState.value && (
-            <Form
-              defaultValues={{ orgName: orgState.value.name }}
-              onSubmit={(values: OrgNameDTO) => updateOrgName(values.orgName)}
-            >
-              {({ register, errors }) => (
-                <>
-                  <Field label="Name" invalid={!!errors.orgName} error="Name is required" disabled={!canWriteOrg}>
-                    <Input {...register('orgName', { required: true })} id="org-name-input" />
-                  </Field>
-                  <Button type="submit" disabled={!canWriteOrg}>
-                    Update
-                  </Button>
-                </>
-              )}
-            </Form>
+            <form onSubmit={handleSubmit(onUpdateOrgName)} style={{ maxWidth: '600px' }}>
+              <Field label="Name" invalid={!!errors.orgName} error="Name is required" disabled={!canWriteOrg}>
+                <Input
+                  {...register('orgName', { required: true })}
+                  id="org-name-input"
+                  defaultValue={orgState.value.name}
+                />
+              </Field>
+              <Button type="submit" disabled={!canWriteOrg}>
+                Update
+              </Button>
+            </form>
           )}
 
           <div style={{ marginTop: '20px' }}>
diff --git a/public/app/features/admin/AdminFeatureTogglesAPI.test.ts b/public/app/features/admin/AdminFeatureTogglesAPI.test.ts
new file mode 100644
index 0000000000000..ca6c25be5251b
--- /dev/null
+++ b/public/app/features/admin/AdminFeatureTogglesAPI.test.ts
@@ -0,0 +1,102 @@
+import { BackendSrvRequest, config } from '@grafana/runtime';
+
+import { getTogglesAPI } from './AdminFeatureTogglesAPI';
+
+// implements @grafana/runtime/BackendSrv
+class MockSrv {
+  constructor() {
+    this.apiCalls = [];
+  }
+
+  apiCalls: Array<{
+    url: string;
+    method: string;
+  }>;
+
+  async get(
+    url: string,
+    params?: BackendSrvRequest['params'],
+    requestId?: BackendSrvRequest['requestId'],
+    options?: Partial<BackendSrvRequest>
+  ) {
+    this.apiCalls.push({
+      url: url,
+      method: 'get',
+    });
+    if (config.featureToggles.kubernetesFeatureToggles && url.indexOf('current') > -1) {
+      return await { toggles: [] };
+    }
+
+    return await {};
+  }
+
+  async post(url: string, data?: unknown, options?: Partial<BackendSrvRequest>) {
+    this.apiCalls.push({
+      url: url,
+      method: 'post',
+    });
+    return await {};
+  }
+
+  async patch(url: string, data: unknown, options?: Partial<BackendSrvRequest>) {
+    this.apiCalls.push({
+      url: url,
+      method: 'patch',
+    });
+    return await {};
+  }
+
+  // these aren't needed for this test
+  async put(url: string, data: unknown, options?: Partial<BackendSrvRequest>) {
+    return await {};
+  }
+  async delete(url: string, data?: unknown, options?: Partial<BackendSrvRequest>) {
+    return await {};
+  }
+}
+
+const testBackendSrv = new MockSrv();
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getBackendSrv: () => testBackendSrv,
+  config: {
+    featureToggles: {
+      kubernetesFeatureToggles: false,
+      grafanaAPIServerWithExperimentalAPIs: false,
+    },
+  },
+}));
+
+describe('AdminFeatureTogglesApi', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    testBackendSrv.apiCalls.length = 0;
+  });
+
+  const originalToggles = { ...config.featureToggles };
+
+  afterAll(() => {
+    config.featureToggles = originalToggles;
+  });
+
+  it('uses the k8s api when the k8s toggles are on', async () => {
+    config.featureToggles.kubernetesFeatureToggles = true;
+    config.featureToggles.grafanaAPIServerWithExperimentalAPIs = true;
+
+    const togglesApi = getTogglesAPI();
+    await togglesApi.getFeatureToggles();
+    await togglesApi.updateFeatureToggles([]);
+    const expected = [
+      {
+        method: 'get',
+        url: '/apis/featuretoggle.grafana.app/v0alpha1/current',
+      },
+      {
+        method: 'patch',
+        url: '/apis/featuretoggle.grafana.app/v0alpha1/current',
+      },
+    ];
+    expect(testBackendSrv.apiCalls).toEqual(expect.arrayContaining(expected));
+  });
+});
diff --git a/public/app/features/admin/AdminFeatureTogglesAPI.ts b/public/app/features/admin/AdminFeatureTogglesAPI.ts
index 889f6f0759e03..6ecba0c8b7d6a 100644
--- a/public/app/features/admin/AdminFeatureTogglesAPI.ts
+++ b/public/app/features/admin/AdminFeatureTogglesAPI.ts
@@ -1,62 +1,77 @@
-import { createApi, BaseQueryFn } from '@reduxjs/toolkit/query/react';
-import { lastValueFrom } from 'rxjs';
-
 import { getBackendSrv } from '@grafana/runtime';
 
-type QueryArgs = {
-  url: string;
-  method?: string;
-  body?: { featureToggles: FeatureToggle[] };
-};
-
-const backendSrvBaseQuery =
-  ({ baseUrl }: { baseUrl: string }): BaseQueryFn<QueryArgs> =>
-  async ({ url, method = 'GET', body }) => {
-    try {
-      const { data } = await lastValueFrom(
-        getBackendSrv().fetch({
-          url: baseUrl + url,
-          method,
-          data: body,
-        })
-      );
-      return { data };
-    } catch (error) {
-      return { error };
-    }
-  };
-
-export const togglesApi = createApi({
-  reducerPath: 'togglesApi',
-  baseQuery: backendSrvBaseQuery({ baseUrl: '/api' }),
-  endpoints: (builder) => ({
-    getManagerState: builder.query<FeatureMgmtState, void>({
-      query: () => ({ url: '/featuremgmt/state' }),
-    }),
-    getFeatureToggles: builder.query<FeatureToggle[], void>({
-      query: () => ({ url: '/featuremgmt' }),
-    }),
-    updateFeatureToggles: builder.mutation<void, FeatureToggle[]>({
-      query: (updatedToggles) => ({
-        url: '/featuremgmt',
-        method: 'POST',
-        body: { featureToggles: updatedToggles },
-      }),
-    }),
-  }),
-});
-
-type FeatureToggle = {
+export type FeatureToggle = {
   name: string;
   description?: string;
   enabled: boolean;
+  stage: string;
   readOnly?: boolean;
+  hidden?: boolean;
 };
 
-type FeatureMgmtState = {
+export type CurrentTogglesState = {
   restartRequired: boolean;
   allowEditing: boolean;
+  toggles: FeatureToggle[];
 };
 
-export const { useGetManagerStateQuery, useGetFeatureTogglesQuery, useUpdateFeatureTogglesMutation } = togglesApi;
-export type { FeatureToggle, FeatureMgmtState };
+interface ResolvedToggleState {
+  kind: 'ResolvedToggleState';
+  restartRequired?: boolean;
+  allowEditing?: boolean;
+  toggles?: K8sToggleSpec[]; // not used in patch
+  enabled: { [key: string]: boolean };
+}
+
+interface K8sToggleSpec {
+  name: string;
+  description: string;
+  enabled: boolean;
+  writeable: boolean;
+  source: K8sToggleSource;
+  stage: string;
+}
+
+interface K8sToggleSource {
+  namespace: string;
+  name: string;
+}
+
+interface FeatureTogglesAPI {
+  getFeatureToggles(): Promise<CurrentTogglesState>;
+  updateFeatureToggles(toggles: FeatureToggle[]): Promise<void>;
+}
+
+class K8sAPI implements FeatureTogglesAPI {
+  baseURL = '/apis/featuretoggle.grafana.app/v0alpha1';
+
+  async getFeatureToggles(): Promise<CurrentTogglesState> {
+    const current = await getBackendSrv().get<ResolvedToggleState>(this.baseURL + '/current');
+    return {
+      restartRequired: Boolean(current.restartRequired),
+      allowEditing: Boolean(current.allowEditing),
+      toggles: current.toggles!.map((t) => ({
+        name: t.name,
+        description: t.description!,
+        enabled: t.enabled,
+        readOnly: !Boolean(t.writeable),
+        stage: t.stage,
+        hidden: false, // only return visible things
+      })),
+    };
+  }
+  updateFeatureToggles(toggles: FeatureToggle[]): Promise<void> {
+    const patchBody: ResolvedToggleState = {
+      kind: 'ResolvedToggleState',
+      enabled: {},
+    };
+    toggles.forEach((t) => {
+      patchBody.enabled[t.name] = t.enabled;
+    });
+    return getBackendSrv().patch(this.baseURL + '/current', patchBody);
+  }
+}
+
+export const getTogglesAPI = (): FeatureTogglesAPI => {
+  return new K8sAPI();
+};
diff --git a/public/app/features/admin/AdminFeatureTogglesPage.tsx b/public/app/features/admin/AdminFeatureTogglesPage.tsx
index 4d962d8b67eeb..0684405b3eec4 100644
--- a/public/app/features/admin/AdminFeatureTogglesPage.tsx
+++ b/public/app/features/admin/AdminFeatureTogglesPage.tsx
@@ -1,26 +1,22 @@
 import { css } from '@emotion/css';
 import React, { useState } from 'react';
+import { useAsync } from 'react-use';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { useStyles2, Icon } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 
-import { useGetFeatureTogglesQuery, useGetManagerStateQuery } from './AdminFeatureTogglesAPI';
+import { getTogglesAPI } from './AdminFeatureTogglesAPI';
 import { AdminFeatureTogglesTable } from './AdminFeatureTogglesTable';
 
 export default function AdminFeatureTogglesPage() {
-  const { data: featureToggles, isLoading, isError } = useGetFeatureTogglesQuery();
-  const { data: featureMgmtState } = useGetManagerStateQuery();
-  const [updateSuccessful, setUpdateSuccessful] = useState(false);
-
+  const [reload, setReload] = useState(1);
+  const togglesApi = getTogglesAPI();
+  const featureState = useAsync(() => togglesApi.getFeatureToggles(), [reload]);
   const styles = useStyles2(getStyles);
 
-  const getErrorMessage = () => {
-    return 'Error fetching feature toggles';
-  };
-
   const handleUpdateSuccess = () => {
-    setUpdateSuccessful(true);
+    setReload(reload + 1);
   };
 
   const EditingAlert = () => {
@@ -30,7 +26,7 @@ export default function AdminFeatureTogglesPage() {
           <Icon name="exclamation-triangle" />
         </div>
         <span className={styles.message}>
-          {featureMgmtState?.restartRequired || updateSuccessful
+          {featureState.value?.restartRequired
             ? 'A restart is pending for your Grafana instance to apply the latest feature toggle changes'
             : 'Saving feature toggle changes will prompt a restart of the instance, which may take a few minutes'}
         </span>
@@ -38,17 +34,32 @@ export default function AdminFeatureTogglesPage() {
     );
   };
 
+  const subTitle = (
+    <div>
+      View and edit feature toggles. Read more about feature toggles at{' '}
+      <a
+        className="external-link"
+        target="_new"
+        href="https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/feature-toggles/"
+      >
+        grafana.com
+      </a>
+      .
+    </div>
+  );
+
   return (
-    <Page navId="feature-toggles">
-      <Page.Contents>
+    <Page navId="feature-toggles" subTitle={subTitle}>
+      <Page.Contents isLoading={featureState.loading}>
         <>
-          {isError && getErrorMessage()}
-          {isLoading && 'Fetching feature toggles'}
-          {featureMgmtState?.allowEditing && <EditingAlert />}
-          {featureToggles && (
+          {featureState.error}
+          {featureState.loading && 'Fetching feature toggles'}
+
+          <EditingAlert />
+          {featureState.value && (
             <AdminFeatureTogglesTable
-              featureToggles={featureToggles}
-              allowEditing={featureMgmtState?.allowEditing || false}
+              featureToggles={featureState.value.toggles}
+              allowEditing={featureState.value.allowEditing || false}
               onUpdateSuccess={handleUpdateSuccess}
             />
           )}
diff --git a/public/app/features/admin/AdminFeatureTogglesTable.tsx b/public/app/features/admin/AdminFeatureTogglesTable.tsx
index d67a60c71eb1d..3be88a6fe7574 100644
--- a/public/app/features/admin/AdminFeatureTogglesTable.tsx
+++ b/public/app/features/admin/AdminFeatureTogglesTable.tsx
@@ -1,8 +1,8 @@
 import React, { useState, useRef } from 'react';
 
-import { Switch, InteractiveTable, Tooltip, type CellProps, Button, type SortByFn } from '@grafana/ui';
+import { Switch, InteractiveTable, Tooltip, type CellProps, Button, ConfirmModal, type SortByFn } from '@grafana/ui';
 
-import { type FeatureToggle, useUpdateFeatureTogglesMutation } from './AdminFeatureTogglesAPI';
+import { FeatureToggle, getTogglesAPI } from './AdminFeatureTogglesAPI';
 
 interface Props {
   featureToggles: FeatureToggle[];
@@ -30,10 +30,13 @@ const sortByEnabled: SortByFn<FeatureToggle> = (a, b) => {
 };
 
 export function AdminFeatureTogglesTable({ featureToggles, allowEditing, onUpdateSuccess }: Props) {
+  // sort manually, doesn't look like it can be automatically done in the table
+  featureToggles.sort((a, b) => a.name.localeCompare(b.name));
   const serverToggles = useRef<FeatureToggle[]>(featureToggles);
   const [localToggles, setLocalToggles] = useState<FeatureToggle[]>(featureToggles);
-  const [updateFeatureToggles] = useUpdateFeatureTogglesMutation();
   const [isSaving, setIsSaving] = useState(false);
+  const [showSaveModel, setShowSaveModal] = useState(false);
+  const togglesApi = getTogglesAPI();
 
   const handleToggleChange = (toggle: FeatureToggle, newValue: boolean) => {
     const updatedToggle = { ...toggle, enabled: newValue };
@@ -47,17 +50,23 @@ export function AdminFeatureTogglesTable({ featureToggles, allowEditing, onUpdat
     setIsSaving(true);
     try {
       const modifiedToggles = getModifiedToggles();
-      const resp = await updateFeatureToggles(modifiedToggles);
-      if (!('error' in resp)) {
-        // server toggles successfully updated
-        serverToggles.current = [...localToggles];
-        onUpdateSuccess();
-      }
+      await togglesApi.updateFeatureToggles(modifiedToggles);
+      // Pretend the values came from a new request
+      serverToggles.current = [...localToggles];
+      onUpdateSuccess(); // should trigger a new get
     } finally {
       setIsSaving(false);
     }
   };
 
+  const saveButtonRef = useRef<HTMLButtonElement | null>(null);
+  const showSaveChangesModal = (show: boolean) => () => {
+    setShowSaveModal(show);
+    if (!show && saveButtonRef.current) {
+      saveButtonRef.current.focus();
+    }
+  };
+
   const getModifiedToggles = (): FeatureToggle[] => {
     return localToggles.filter((toggle, index) => toggle.enabled !== serverToggles.current[index].enabled);
   };
@@ -72,11 +81,30 @@ export function AdminFeatureTogglesTable({ featureToggles, allowEditing, onUpdat
       return 'Feature management is not configured for editing';
     }
     if (readOnlyToggle) {
-      return 'Preview features are not editable';
+      return 'This is a non-editable feature';
     }
     return '';
   };
 
+  const getStageCell = (stage: string) => {
+    switch (stage) {
+      case 'GA':
+        return (
+          <Tooltip content={'General availability'}>
+            <div>GA</div>
+          </Tooltip>
+        );
+      case 'privatePreview':
+      case 'preview':
+      case 'experimental':
+        return 'Beta';
+      case 'deprecated':
+        return 'Deprecated';
+      default:
+        return stage;
+    }
+  };
+
   const columns = [
     {
       id: 'name',
@@ -90,11 +118,16 @@ export function AdminFeatureTogglesTable({ featureToggles, allowEditing, onUpdat
       cell: ({ cell: { value } }: CellProps<FeatureToggle, string>) => <div>{value}</div>,
       sortType: sortByDescription,
     },
+    {
+      id: 'stage',
+      header: 'Stage',
+      cell: ({ cell: { value } }: CellProps<FeatureToggle, string>) => <div>{getStageCell(value)}</div>,
+    },
     {
       id: 'enabled',
       header: 'State',
-      cell: ({ row }: CellProps<FeatureToggle, boolean>) => (
-        <Tooltip content={getToggleTooltipContent(row.original.readOnly)}>
+      cell: ({ row }: CellProps<FeatureToggle, boolean>) => {
+        const renderStateSwitch = (
           <div>
             <Switch
               value={row.original.enabled}
@@ -102,8 +135,14 @@ export function AdminFeatureTogglesTable({ featureToggles, allowEditing, onUpdat
               onChange={(e) => handleToggleChange(row.original, e.currentTarget.checked)}
             />
           </div>
-        </Tooltip>
-      ),
+        );
+
+        return row.original.readOnly ? (
+          <Tooltip content={getToggleTooltipContent(row.original.readOnly)}>{renderStateSwitch}</Tooltip>
+        ) : (
+          renderStateSwitch
+        );
+      },
       sortType: sortByEnabled,
     },
   ];
@@ -112,9 +151,28 @@ export function AdminFeatureTogglesTable({ featureToggles, allowEditing, onUpdat
     <>
       {allowEditing && (
         <div style={{ display: 'flex', justifyContent: 'flex-end', padding: '0 0 5px 0' }}>
-          <Button disabled={!hasModifications() || isSaving} onClick={handleSaveChanges}>
+          <Button disabled={!hasModifications() || isSaving} onClick={showSaveChangesModal(true)} ref={saveButtonRef}>
             {isSaving ? 'Saving...' : 'Save Changes'}
           </Button>
+          <ConfirmModal
+            isOpen={showSaveModel}
+            title="Apply feature toggle changes"
+            body={
+              <div>
+                <p>
+                  Some features are stable (GA) and enabled by default, whereas some are currently in their preliminary
+                  Beta phase, available for early adoption.
+                </p>
+                <p>We advise understanding the implications of each feature change before making modifications.</p>
+              </div>
+            }
+            confirmText="Save changes"
+            onConfirm={async () => {
+              showSaveChangesModal(false)();
+              handleSaveChanges();
+            }}
+            onDismiss={showSaveChangesModal(false)}
+          />
         </div>
       )}
       <InteractiveTable columns={columns} data={localToggles} getRowId={(featureToggle) => featureToggle.name} />
diff --git a/public/app/features/admin/AdminListOrgsPage.tsx b/public/app/features/admin/AdminListOrgsPage.tsx
index 486c6a37d1f9c..6423924c004f6 100644
--- a/public/app/features/admin/AdminListOrgsPage.tsx
+++ b/public/app/features/admin/AdminListOrgsPage.tsx
@@ -5,7 +5,7 @@ import { getBackendSrv, isFetchError } from '@grafana/runtime';
 import { LinkButton } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import { contextSrv } from 'app/core/services/context_srv';
-import { AccessControlAction } from 'app/types';
+import { AccessControlAction, Organization } from 'app/types';
 
 import { AdminOrgsTable } from './AdminOrgsTable';
 
@@ -14,7 +14,7 @@ const deleteOrg = async (orgId: number) => {
 };
 
 const getOrgs = async () => {
-  return await getBackendSrv().get('/api/orgs');
+  return await getBackendSrv().get<Organization[]>('/api/orgs');
 };
 
 const getErrorMessage = (error: Error) => {
@@ -30,26 +30,25 @@ export default function AdminListOrgsPages() {
   }, [fetchOrgs]);
 
   return (
-    <Page navId="global-orgs">
+    <Page
+      navId="global-orgs"
+      actions={
+        <LinkButton icon="plus" href="org/new" disabled={!canCreateOrg}>
+          New org
+        </LinkButton>
+      }
+    >
       <Page.Contents>
-        <>
-          <div className="page-action-bar">
-            <div className="page-action-bar__spacer" />
-            <LinkButton icon="plus" href="org/new" disabled={!canCreateOrg}>
-              New org
-            </LinkButton>
-          </div>
-          {state.error && getErrorMessage(state.error)}
-          {state.loading && 'Fetching organizations'}
-          {state.value && (
-            <AdminOrgsTable
-              orgs={state.value}
-              onDelete={(orgId) => {
-                deleteOrg(orgId).then(() => fetchOrgs());
-              }}
-            />
-          )}
-        </>
+        {state.error && getErrorMessage(state.error)}
+        {state.loading && <AdminOrgsTable.Skeleton />}
+        {state.value && (
+          <AdminOrgsTable
+            orgs={state.value}
+            onDelete={(orgId) => {
+              deleteOrg(orgId).then(() => fetchOrgs());
+            }}
+          />
+        )}
       </Page.Contents>
     </Page>
   );
diff --git a/public/app/features/admin/AdminOrgsTable.tsx b/public/app/features/admin/AdminOrgsTable.tsx
index 6a042ca6af253..8f6cd87a5717b 100644
--- a/public/app/features/admin/AdminOrgsTable.tsx
+++ b/public/app/features/admin/AdminOrgsTable.tsx
@@ -1,6 +1,10 @@
+import { css } from '@emotion/css';
 import React, { useState } from 'react';
+import Skeleton from 'react-loading-skeleton';
 
-import { Button, ConfirmModal } from '@grafana/ui';
+import { GrafanaTheme2 } from '@grafana/data';
+import { Button, ConfirmModal, useStyles2 } from '@grafana/ui';
+import { SkeletonComponent, attachSkeleton } from '@grafana/ui/src/unstable';
 import { contextSrv } from 'app/core/core';
 import { AccessControlAction, Organization } from 'app/types';
 
@@ -9,19 +13,23 @@ interface Props {
   onDelete: (orgId: number) => void;
 }
 
-export function AdminOrgsTable({ orgs, onDelete }: Props) {
+const getTableHeader = () => (
+  <thead>
+    <tr>
+      <th>ID</th>
+      <th>Name</th>
+      <th style={{ width: '1%' }}></th>
+    </tr>
+  </thead>
+);
+
+function AdminOrgsTableComponent({ orgs, onDelete }: Props) {
   const canDeleteOrgs = contextSrv.hasPermission(AccessControlAction.OrgsDelete);
 
   const [deleteOrg, setDeleteOrg] = useState<Organization>();
   return (
     <table className="filter-table form-inline filter-table--hover">
-      <thead>
-        <tr>
-          <th>ID</th>
-          <th>Name</th>
-          <th style={{ width: '1%' }}></th>
-        </tr>
-      </thead>
+      {getTableHeader()}
       <tbody>
         {orgs.map((org) => (
           <tr key={`${org.id}-${org.name}`}>
@@ -66,3 +74,38 @@ export function AdminOrgsTable({ orgs, onDelete }: Props) {
     </table>
   );
 }
+
+const AdminOrgsTableSkeleton: SkeletonComponent = ({ rootProps }) => {
+  const styles = useStyles2(getSkeletonStyles);
+  return (
+    <table className="filter-table" {...rootProps}>
+      {getTableHeader()}
+      <tbody>
+        {new Array(3).fill(null).map((_, index) => (
+          <tr key={index}>
+            <td>
+              <Skeleton width={16} />
+            </td>
+            <td>
+              <Skeleton width={240} />
+            </td>
+            <td>
+              <Skeleton containerClassName={styles.deleteButton} width={22} height={24} />
+            </td>
+          </tr>
+        ))}
+      </tbody>
+    </table>
+  );
+};
+
+export const AdminOrgsTable = attachSkeleton(AdminOrgsTableComponent, AdminOrgsTableSkeleton);
+
+const getSkeletonStyles = (theme: GrafanaTheme2) => ({
+  deleteButton: css({
+    alignItems: 'center',
+    display: 'flex',
+    height: 30,
+    lineHeight: 1,
+  }),
+});
diff --git a/public/app/features/admin/AdminSettings.tsx b/public/app/features/admin/AdminSettings.tsx
index 656709772bed7..4bd16ba2309bd 100644
--- a/public/app/features/admin/AdminSettings.tsx
+++ b/public/app/features/admin/AdminSettings.tsx
@@ -4,39 +4,24 @@ import { useAsync } from 'react-use';
 import { getBackendSrv } from '@grafana/runtime';
 import { Page } from 'app/core/components/Page/Page';
 
-type Settings = { [key: string]: { [key: string]: string } };
+import { AdminSettingsTable } from './AdminSettingsTable';
+
+export type Settings = { [key: string]: { [key: string]: string } };
 
 function AdminSettings() {
   const { loading, value: settings } = useAsync(() => getBackendSrv().get<Settings>('/api/admin/settings'), []);
 
   return (
     <Page navId="server-settings">
-      <Page.Contents isLoading={loading}>
+      <Page.Contents>
         <div className="grafana-info-box span8" style={{ margin: '20px 0 25px 0' }}>
           These system settings are defined in grafana.ini or custom.ini (or overridden in ENV variables). To change
           these you currently need to restart Grafana.
         </div>
 
-        {settings && (
-          <table className="filter-table">
-            <tbody>
-              {Object.entries(settings).map(([sectionName, sectionSettings], i) => (
-                <React.Fragment key={`section-${i}`}>
-                  <tr>
-                    <td className="admin-settings-section">{sectionName}</td>
-                    <td />
-                  </tr>
-                  {Object.entries(sectionSettings).map(([settingName, settingValue], j) => (
-                    <tr key={`property-${j}`}>
-                      <td style={{ paddingLeft: '25px' }}>{settingName}</td>
-                      <td style={{ whiteSpace: 'break-spaces' }}>{settingValue}</td>
-                    </tr>
-                  ))}
-                </React.Fragment>
-              ))}
-            </tbody>
-          </table>
-        )}
+        {loading && <AdminSettingsTable.Skeleton />}
+
+        {settings && <AdminSettingsTable settings={settings} />}
       </Page.Contents>
     </Page>
   );
diff --git a/public/app/features/admin/AdminSettingsTable.tsx b/public/app/features/admin/AdminSettingsTable.tsx
new file mode 100644
index 0000000000000..a026998aa1b53
--- /dev/null
+++ b/public/app/features/admin/AdminSettingsTable.tsx
@@ -0,0 +1,75 @@
+import React from 'react';
+import Skeleton from 'react-loading-skeleton';
+
+import { SkeletonComponent, attachSkeleton } from '@grafana/ui/src/unstable';
+
+import { Settings } from './AdminSettings';
+
+interface Props {
+  settings: Settings;
+}
+
+const AdminSettingsTableComponent = ({ settings }: Props) => {
+  return (
+    <table className="filter-table">
+      <tbody>
+        {Object.entries(settings).map(([sectionName, sectionSettings], i) => (
+          <React.Fragment key={`section-${i}`}>
+            <tr>
+              <td className="admin-settings-section">{sectionName}</td>
+              <td />
+            </tr>
+            {Object.entries(sectionSettings).map(([settingName, settingValue], j) => (
+              <tr key={`property-${j}`}>
+                <td style={{ paddingLeft: '25px' }}>{settingName}</td>
+                <td style={{ whiteSpace: 'break-spaces' }}>{settingValue}</td>
+              </tr>
+            ))}
+          </React.Fragment>
+        ))}
+      </tbody>
+    </table>
+  );
+};
+
+// note: don't want to put this in render function else it will get regenerated
+const randomValues = new Array(50).fill(null).map(() => Math.random());
+
+const AdminSettingsTableSkeleton: SkeletonComponent = ({ rootProps }) => {
+  return (
+    <table className="filter-table" {...rootProps}>
+      <tbody>
+        {randomValues.map((randomValue, index) => {
+          const isSection = index === 0 || randomValue > 0.9;
+
+          return (
+            <React.Fragment key={index}>
+              {isSection && (
+                <tr>
+                  <td className="admin-settings-section">
+                    <Skeleton width={getRandomInRange(40, 80, randomValue)} />
+                  </td>
+                  <td />
+                </tr>
+              )}
+              <tr>
+                <td style={{ paddingLeft: '25px' }}>
+                  <Skeleton width={getRandomInRange(60, 100, randomValue)} />
+                </td>
+                <td>
+                  <Skeleton width={getRandomInRange(80, 320, randomValue)} />
+                </td>
+              </tr>
+            </React.Fragment>
+          );
+        })}
+      </tbody>
+    </table>
+  );
+};
+
+function getRandomInRange(min: number, max: number, randomSeed: number) {
+  return randomSeed * (max - min) + min;
+}
+
+export const AdminSettingsTable = attachSkeleton(AdminSettingsTableComponent, AdminSettingsTableSkeleton);
diff --git a/public/app/features/admin/ServerStats.test.tsx b/public/app/features/admin/ServerStats.test.tsx
index 3bae8e74e0b88..2a88bcb7fe58e 100644
--- a/public/app/features/admin/ServerStats.test.tsx
+++ b/public/app/features/admin/ServerStats.test.tsx
@@ -1,6 +1,8 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 
+import config from 'app/core/config';
+
 import { ServerStats } from './ServerStats';
 import { ServerStat } from './state/apis';
 
@@ -10,6 +12,7 @@ const stats: ServerStat = {
   activeSessions: 1,
   activeUsers: 1,
   activeViewers: 0,
+  activeDevices: 1,
   admins: 1,
   alerts: 5,
   dashboards: 1599,
@@ -43,7 +46,15 @@ describe('ServerStats', () => {
     expect(screen.getByText('Snapshots')).toBeInTheDocument();
     expect(screen.getByRole('link', { name: 'Manage dashboards' })).toBeInTheDocument();
     expect(screen.getByRole('link', { name: 'Manage data sources' })).toBeInTheDocument();
-    expect(screen.getByRole('link', { name: 'Alerts' })).toBeInTheDocument();
+    expect(screen.getByRole('link', { name: 'Manage alerts' })).toBeInTheDocument();
     expect(screen.getByRole('link', { name: 'Manage users' })).toBeInTheDocument();
   });
+
+  it('Should render page with anonymous stats', async () => {
+    config.anonymousEnabled = true;
+    config.anonymousDeviceLimit = 10;
+    render(<ServerStats />);
+    expect(await screen.findByRole('heading', { name: /instance statistics/i })).toBeInTheDocument();
+    expect(screen.getByText('Active anonymous devices')).toBeInTheDocument();
+  });
 });
diff --git a/public/app/features/admin/ServerStats.tsx b/public/app/features/admin/ServerStats.tsx
index 116fc8e2f3227..8d3664954575e 100644
--- a/public/app/features/admin/ServerStats.tsx
+++ b/public/app/features/admin/ServerStats.tsx
@@ -2,17 +2,18 @@ import { css } from '@emotion/css';
 import React, { useEffect, useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { CardContainer, LinkButton, useStyles2 } from '@grafana/ui';
+import { config, GrafanaBootConfig } from '@grafana/runtime';
+import { LinkButton, useStyles2 } from '@grafana/ui';
 import { AccessControlAction } from 'app/types';
 
 import { contextSrv } from '../../core/services/context_srv';
-import { Loader } from '../plugins/admin/components/Loader';
 
+import { ServerStatsCard } from './ServerStatsCard';
 import { getServerStats, ServerStat } from './state/apis';
 
 export const ServerStats = () => {
   const [stats, setStats] = useState<ServerStat | null>(null);
-  const [isLoading, setIsLoading] = useState(false);
+  const [isLoading, setIsLoading] = useState(true);
   const styles = useStyles2(getStyles);
 
   const hasAccessToDataSources = contextSrv.hasPermission(AccessControlAction.DataSourcesRead);
@@ -20,7 +21,6 @@ export const ServerStats = () => {
 
   useEffect(() => {
     if (contextSrv.hasPermission(AccessControlAction.ActionServerStatsRead)) {
-      setIsLoading(true);
       getServerStats().then((stats) => {
         setStats(stats);
         setIsLoading(false);
@@ -35,18 +35,17 @@ export const ServerStats = () => {
   return (
     <>
       <h2 className={styles.title}>Instance statistics</h2>
-      {isLoading ? (
-        <div className={styles.loader}>
-          <Loader text={'Loading instance stats...'} />
-        </div>
-      ) : stats ? (
+      {!isLoading && !stats ? (
+        <p className={styles.notFound}>No stats found.</p>
+      ) : (
         <div className={styles.row}>
-          <StatCard
+          <ServerStatsCard
+            isLoading={isLoading}
             content={[
-              { name: 'Dashboards (starred)', value: `${stats.dashboards} (${stats.stars})` },
-              { name: 'Tags', value: stats.tags },
-              { name: 'Playlists', value: stats.playlists },
-              { name: 'Snapshots', value: stats.snapshots },
+              { name: 'Dashboards (starred)', value: `${stats?.dashboards} (${stats?.stars})` },
+              { name: 'Tags', value: stats?.tags },
+              { name: 'Playlists', value: stats?.playlists },
+              { name: 'Snapshots', value: stats?.snapshots },
             ]}
             footer={
               <LinkButton href={'/dashboards'} variant={'secondary'}>
@@ -56,8 +55,9 @@ export const ServerStats = () => {
           />
 
           <div className={styles.doubleRow}>
-            <StatCard
-              content={[{ name: 'Data sources', value: stats.datasources }]}
+            <ServerStatsCard
+              isLoading={isLoading}
+              content={[{ name: 'Data sources', value: stats?.datasources }]}
               footer={
                 hasAccessToDataSources && (
                   <LinkButton href={'/datasources'} variant={'secondary'}>
@@ -66,21 +66,24 @@ export const ServerStats = () => {
                 )
               }
             />
-            <StatCard
-              content={[{ name: 'Alerts', value: stats.alerts }]}
+            <ServerStatsCard
+              isLoading={isLoading}
+              content={[{ name: 'Alerts', value: stats?.alerts }]}
               footer={
                 <LinkButton href={'/alerting/list'} variant={'secondary'}>
-                  Alerts
+                  Manage alerts
                 </LinkButton>
               }
             />
           </div>
-          <StatCard
+          <ServerStatsCard
+            isLoading={isLoading}
             content={[
-              { name: 'Organisations', value: stats.orgs },
-              { name: 'Users total', value: stats.users },
-              { name: 'Active users in last 30 days', value: stats.activeUsers },
-              { name: 'Active sessions', value: stats.activeSessions },
+              { name: 'Organisations', value: stats?.orgs },
+              { name: 'Users total', value: stats?.users },
+              { name: 'Active sessions', value: stats?.activeSessions },
+              { name: 'Active users in last 30 days', value: stats?.activeUsers },
+              ...getAnonymousStatsContent(stats, config),
             ]}
             footer={
               hasAccessToAdminUsers && (
@@ -91,97 +94,65 @@ export const ServerStats = () => {
             }
           />
         </div>
-      ) : (
-        <p className={styles.notFound}>No stats found.</p>
       )}
     </>
   );
 };
 
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    title: css`
-      margin-bottom: ${theme.spacing(4)};
-    `,
-    row: css`
-      display: flex;
-      justify-content: space-between;
-      width: 100%;
-
-      & > div:not(:last-of-type) {
-        margin-right: ${theme.spacing(2)};
-      }
-
-      & > div {
-        width: 33.3%;
-      }
-    `,
-    doubleRow: css`
-      display: flex;
-      flex-direction: column;
-
-      & > div:first-of-type {
-        margin-bottom: ${theme.spacing(2)};
-      }
-    `,
-
-    loader: css`
-      height: 290px;
-    `,
-
-    notFound: css`
-      font-size: ${theme.typography.h6.fontSize};
-      text-align: center;
-      height: 290px;
-    `,
-  };
-};
-
-type StatCardProps = {
-  content: Array<Record<string, number | string>>;
-  footer?: JSX.Element | boolean;
-};
-
-const StatCard = ({ content, footer }: StatCardProps) => {
-  const styles = useStyles2(getCardStyles);
-  return (
-    <CardContainer className={styles.container} disableHover>
-      <div className={styles.inner}>
-        <div className={styles.content}>
-          {content.map((item) => {
-            return (
-              <div key={item.name} className={styles.row}>
-                <span>{item.name}</span>
-                <span>{item.value}</span>
-              </div>
-            );
-          })}
-        </div>
-        {footer && <div>{footer}</div>}
-      </div>
-    </CardContainer>
-  );
+const getAnonymousStatsContent = (stats: ServerStat | null, config: GrafanaBootConfig) => {
+  if (!config.anonymousEnabled || !stats?.activeDevices) {
+    return [];
+  }
+  if (!config.anonymousDeviceLimit) {
+    return [
+      {
+        name: 'Active anonymous devices',
+        value: `${stats.activeDevices}`,
+        tooltip: 'Detected devices that are not logged in, in last 30 days.',
+      },
+    ];
+  } else {
+    return [
+      {
+        name: 'Active anonymous devices',
+        value: `${stats.activeDevices} / ${config.anonymousDeviceLimit}`,
+        tooltip: 'Detected devices that are not logged in, in last 30 days.',
+        highlight: stats.activeDevices > config.anonymousDeviceLimit,
+      },
+    ];
+  }
 };
 
-const getCardStyles = (theme: GrafanaTheme2) => {
+const getStyles = (theme: GrafanaTheme2) => {
   return {
-    container: css`
-      padding: ${theme.spacing(2)};
-    `,
-    inner: css`
-      display: flex;
-      flex-direction: column;
-      width: 100%;
-    `,
-    content: css`
-      flex: 1 0 auto;
-    `,
-    row: css`
-      display: flex;
-      justify-content: space-between;
-      width: 100%;
-      margin-bottom: ${theme.spacing(2)};
-      align-items: center;
-    `,
+    title: css({
+      marginBottom: theme.spacing(4),
+    }),
+    row: css({
+      display: 'flex',
+      justifyContent: 'space-between',
+      width: '100%',
+
+      '& > div:not(:last-of-type)': {
+        marginRight: theme.spacing(2),
+      },
+
+      '& > div': {
+        width: '33.3%',
+      },
+    }),
+    doubleRow: css({
+      display: 'flex',
+      flexDirection: 'column',
+
+      '& > div:first-of-type': {
+        marginBottom: theme.spacing(2),
+      },
+    }),
+    notFound: css({
+      fontSize: theme.typography.h6.fontSize,
+      textAlign: 'center',
+      height: '290px',
+    }),
   };
 };
diff --git a/public/app/features/admin/ServerStatsCard.tsx b/public/app/features/admin/ServerStatsCard.tsx
new file mode 100644
index 0000000000000..66fdabde6d8de
--- /dev/null
+++ b/public/app/features/admin/ServerStatsCard.tsx
@@ -0,0 +1,68 @@
+import { css, cx } from '@emotion/css';
+import React from 'react';
+import Skeleton from 'react-loading-skeleton';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Card, Stack, useStyles2, Tooltip, Icon } from '@grafana/ui';
+
+interface StatItem {
+  name: string;
+  value: string | number | undefined;
+  tooltip?: string;
+  highlight?: boolean;
+  indent?: boolean;
+}
+
+export interface Props {
+  content: StatItem[];
+  isLoading?: boolean;
+  footer?: JSX.Element | boolean;
+}
+
+export const ServerStatsCard = ({ content, footer, isLoading }: Props) => {
+  const styles = useStyles2(getStyles);
+  return (
+    <Card className={styles.container}>
+      {content.map((item, index) => (
+        <Stack key={index} justifyContent="space-between" alignItems="center">
+          <Stack alignItems={'center'}>
+            <span className={cx({ [styles.indent]: !!item.indent })}>{item.name}</span>
+            {item.tooltip && (
+              <Tooltip content={String(item.tooltip)} placement="auto-start">
+                <Icon name="info-circle" className={styles.tooltip} />
+              </Tooltip>
+            )}
+          </Stack>
+          {isLoading ? (
+            <Skeleton width={60} />
+          ) : (
+            <span className={item.highlight ? styles.highlight : ''}>{item.value}</span>
+          )}
+        </Stack>
+      ))}
+      {footer && <div>{footer}</div>}
+    </Card>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    container: css({
+      display: 'flex',
+      flexDirection: 'column',
+      gap: theme.spacing(2),
+      padding: theme.spacing(2),
+    }),
+    indent: css({
+      marginLeft: theme.spacing(2),
+    }),
+    tooltip: css({
+      color: theme.colors.secondary.text,
+    }),
+    highlight: css({
+      color: theme.colors.warning.text,
+      padding: `${theme.spacing(0.5)} ${theme.spacing(1)}`,
+      marginRight: `-${theme.spacing(1)}`,
+    }),
+  };
+};
diff --git a/public/app/features/admin/UserAdminPage.tsx b/public/app/features/admin/UserAdminPage.tsx
index f1409bc1c7b4c..0d0109c520a56 100644
--- a/public/app/features/admin/UserAdminPage.tsx
+++ b/public/app/features/admin/UserAdminPage.tsx
@@ -3,6 +3,7 @@ import { connect, ConnectedProps } from 'react-redux';
 
 import { NavModelItem } from '@grafana/data';
 import { featureEnabled } from '@grafana/runtime';
+import { Stack } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import { contextSrv } from 'app/core/core';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
@@ -117,50 +118,52 @@ export class UserAdminPage extends PureComponent<Props> {
     return (
       <Page navId="global-users" pageNav={pageNav}>
         <Page.Contents isLoading={isLoading}>
-          {user && (
-            <>
-              <UserProfile
+          <Stack gap={5} direction="column">
+            {user && (
+              <>
+                <UserProfile
+                  user={user}
+                  onUserUpdate={this.onUserUpdate}
+                  onUserDelete={this.onUserDelete}
+                  onUserDisable={this.onUserDisable}
+                  onUserEnable={this.onUserEnable}
+                  onPasswordChange={this.onPasswordChange}
+                />
+                {isLDAPUser &&
+                  user?.isExternallySynced &&
+                  featureEnabled('ldapsync') &&
+                  ldapSyncInfo &&
+                  canReadLDAPStatus && (
+                    <UserLdapSyncInfo ldapSyncInfo={ldapSyncInfo} user={user} onUserSync={this.onUserSync} />
+                  )}
+                <UserPermissions
+                  isGrafanaAdmin={user.isGrafanaAdmin}
+                  isExternalUser={user?.isGrafanaAdminExternallySynced}
+                  lockMessage={lockMessage}
+                  onGrafanaAdminChange={this.onGrafanaAdminChange}
+                />
+              </>
+            )}
+
+            {orgs && (
+              <UserOrgs
                 user={user}
-                onUserUpdate={this.onUserUpdate}
-                onUserDelete={this.onUserDelete}
-                onUserDisable={this.onUserDisable}
-                onUserEnable={this.onUserEnable}
-                onPasswordChange={this.onPasswordChange}
+                orgs={orgs}
+                isExternalUser={user?.isExternallySynced}
+                onOrgRemove={this.onOrgRemove}
+                onOrgRoleChange={this.onOrgRoleChange}
+                onOrgAdd={this.onOrgAdd}
               />
-              {isLDAPUser &&
-                user?.isExternallySynced &&
-                featureEnabled('ldapsync') &&
-                ldapSyncInfo &&
-                canReadLDAPStatus && (
-                  <UserLdapSyncInfo ldapSyncInfo={ldapSyncInfo} user={user} onUserSync={this.onUserSync} />
-                )}
-              <UserPermissions
-                isGrafanaAdmin={user.isGrafanaAdmin}
-                isExternalUser={user?.isGrafanaAdminExternallySynced}
-                lockMessage={lockMessage}
-                onGrafanaAdminChange={this.onGrafanaAdminChange}
+            )}
+
+            {sessions && canReadSessions && (
+              <UserSessions
+                sessions={sessions}
+                onSessionRevoke={this.onSessionRevoke}
+                onAllSessionsRevoke={this.onAllSessionsRevoke}
               />
-            </>
-          )}
-
-          {orgs && (
-            <UserOrgs
-              user={user}
-              orgs={orgs}
-              isExternalUser={user?.isExternallySynced}
-              onOrgRemove={this.onOrgRemove}
-              onOrgRoleChange={this.onOrgRoleChange}
-              onOrgAdd={this.onOrgAdd}
-            />
-          )}
-
-          {sessions && canReadSessions && (
-            <UserSessions
-              sessions={sessions}
-              onSessionRevoke={this.onSessionRevoke}
-              onAllSessionsRevoke={this.onAllSessionsRevoke}
-            />
-          )}
+            )}
+          </Stack>
         </Page.Contents>
       </Page>
     );
diff --git a/public/app/features/admin/UserCreatePage.tsx b/public/app/features/admin/UserCreatePage.tsx
index da72bd30d90a3..34bdee39089d0 100644
--- a/public/app/features/admin/UserCreatePage.tsx
+++ b/public/app/features/admin/UserCreatePage.tsx
@@ -1,9 +1,10 @@
 import React, { useCallback } from 'react';
+import { useForm } from 'react-hook-form';
 import { useHistory } from 'react-router-dom';
 
 import { NavModelItem } from '@grafana/data';
 import { getBackendSrv } from '@grafana/runtime';
-import { Form, Button, Input, Field } from '@grafana/ui';
+import { Button, Input, Field } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 
 interface UserDTO {
@@ -24,6 +25,11 @@ const pageNav: NavModelItem = {
 
 const UserCreatePage = () => {
   const history = useHistory();
+  const {
+    handleSubmit,
+    register,
+    formState: { errors },
+  } = useForm<UserDTO>({ mode: 'onBlur' });
 
   const onSubmit = useCallback(
     async (data: UserDTO) => {
@@ -37,45 +43,34 @@ const UserCreatePage = () => {
   return (
     <Page navId="global-users" pageNav={pageNav}>
       <Page.Contents>
-        <Form onSubmit={onSubmit} validateOn="onBlur">
-          {({ register, errors }) => {
-            return (
-              <>
-                <Field
-                  label="Name"
-                  required
-                  invalid={!!errors.name}
-                  error={errors.name ? 'Name is required' : undefined}
-                >
-                  <Input id="name-input" {...register('name', { required: true })} />
-                </Field>
+        <form onSubmit={handleSubmit(onSubmit)} style={{ maxWidth: '600px' }}>
+          <Field label="Name" required invalid={!!errors.name} error={errors.name ? 'Name is required' : undefined}>
+            <Input id="name-input" {...register('name', { required: true })} />
+          </Field>
 
-                <Field label="Email">
-                  <Input id="email-input" {...register('email')} />
-                </Field>
+          <Field label="Email">
+            <Input id="email-input" {...register('email')} />
+          </Field>
 
-                <Field label="Username">
-                  <Input id="username-input" {...register('login')} />
-                </Field>
-                <Field
-                  label="Password"
-                  required
-                  invalid={!!errors.password}
-                  error={errors.password ? 'Password is required and must contain at least 4 characters' : undefined}
-                >
-                  <Input
-                    id="password-input"
-                    {...register('password', {
-                      validate: (value) => value.trim() !== '' && value.length >= 4,
-                    })}
-                    type="password"
-                  />
-                </Field>
-                <Button type="submit">Create user</Button>
-              </>
-            );
-          }}
-        </Form>
+          <Field label="Username">
+            <Input id="username-input" {...register('login')} />
+          </Field>
+          <Field
+            label="Password"
+            required
+            invalid={!!errors.password}
+            error={errors.password ? 'Password is required and must contain at least 4 characters' : undefined}
+          >
+            <Input
+              id="password-input"
+              {...register('password', {
+                validate: (value) => value.trim() !== '' && value.length >= 4,
+              })}
+              type="password"
+            />
+          </Field>
+          <Button type="submit">Create user</Button>
+        </form>
       </Page.Contents>
     </Page>
   );
diff --git a/public/app/features/admin/UserListAdminPage.tsx b/public/app/features/admin/UserListAdminPage.tsx
index a675cef2c2b2b..6fbbc543a5680 100644
--- a/public/app/features/admin/UserListAdminPage.tsx
+++ b/public/app/features/admin/UserListAdminPage.tsx
@@ -4,9 +4,10 @@ import { connect, ConnectedProps } from 'react-redux';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
-import { LinkButton, RadioButtonGroup, useStyles2, FilterInput } from '@grafana/ui';
+import { LinkButton, RadioButtonGroup, useStyles2, FilterInput, EmptyState } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import { contextSrv } from 'app/core/core';
+import { t } from 'app/core/internationalization';
 
 import { AccessControlAction, StoreState, UserFilter } from '../../types';
 
@@ -40,6 +41,7 @@ const mapStateToProps = (state: StoreState) => ({
   totalPages: state.userListAdmin.totalPages,
   page: state.userListAdmin.page,
   filters: state.userListAdmin.filters,
+  isLoading: state.userListAdmin.isLoading,
 });
 
 const connector = connect(mapStateToProps, mapDispatchToProps);
@@ -60,6 +62,7 @@ const UserListAdminPageUnConnected = ({
   page,
   changePage,
   changeSort,
+  isLoading,
 }: Props) => {
   const styles = useStyles2(getStyles);
 
@@ -96,14 +99,18 @@ const UserListAdminPageUnConnected = ({
           )}
         </div>
       </div>
-      <UsersTable
-        users={users}
-        showPaging={showPaging}
-        totalPages={totalPages}
-        onChangePage={changePage}
-        currentPage={page}
-        fetchData={changeSort}
-      />
+      {!isLoading && users.length === 0 ? (
+        <EmptyState message={t('users.empty-state.message', 'No users found')} variant="not-found" />
+      ) : (
+        <UsersTable
+          users={users}
+          showPaging={showPaging}
+          totalPages={totalPages}
+          onChangePage={changePage}
+          currentPage={page}
+          fetchData={changeSort}
+        />
+      )}
     </Page.Contents>
   );
 };
diff --git a/public/app/features/admin/UserListAnonymousPage.tsx b/public/app/features/admin/UserListAnonymousPage.tsx
new file mode 100644
index 0000000000000..3d4355653a9db
--- /dev/null
+++ b/public/app/features/admin/UserListAnonymousPage.tsx
@@ -0,0 +1,130 @@
+import { css } from '@emotion/css';
+import React, { useEffect } from 'react';
+import { connect, ConnectedProps } from 'react-redux';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
+import { RadioButtonGroup, useStyles2, FilterInput } from '@grafana/ui';
+import { Page } from 'app/core/components/Page/Page';
+
+import { StoreState } from '../../types';
+
+import { AnonUsersDevicesTable } from './Users/AnonUsersTable';
+import { fetchUsersAnonymousDevices, changeAnonUserSort, changeAnonPage, changeAnonQuery } from './state/actions';
+
+const mapDispatchToProps = {
+  fetchUsersAnonymousDevices,
+  changeAnonUserSort,
+  changeAnonPage,
+  changeAnonQuery,
+};
+
+const mapStateToProps = (state: StoreState) => ({
+  devices: state.userListAnonymousDevices.devices,
+  query: state.userListAnonymousDevices.query,
+  showPaging: state.userListAnonymousDevices.showPaging,
+  totalPages: state.userListAnonymousDevices.totalPages,
+  page: state.userListAnonymousDevices.page,
+  filters: state.userListAnonymousDevices.filters,
+});
+
+const selectors = e2eSelectors.pages.UserListPage.UserListAdminPage;
+
+const connector = connect(mapStateToProps, mapDispatchToProps);
+
+interface OwnProps {}
+
+type Props = OwnProps & ConnectedProps<typeof connector>;
+
+const UserListAnonymousDevicesPageUnConnected = ({
+  devices,
+  fetchUsersAnonymousDevices,
+  query,
+  changeAnonQuery,
+  filters,
+  showPaging,
+  totalPages,
+  page,
+  changeAnonPage,
+  changeAnonUserSort,
+}: Props) => {
+  const styles = useStyles2(getStyles);
+
+  useEffect(() => {
+    fetchUsersAnonymousDevices();
+  }, [fetchUsersAnonymousDevices]);
+
+  return (
+    <Page.Contents>
+      <div className={styles.actionBar} data-testid={selectors.container}>
+        <div className={styles.row}>
+          <FilterInput
+            placeholder="Search devices by ip adress."
+            autoFocus={true}
+            value={query}
+            onChange={changeAnonQuery}
+          />
+          <RadioButtonGroup
+            options={[{ label: 'Active last 30 days', value: true }]}
+            // onChange={(value) => changeFilter({ name: 'activeLast30Days', value })}
+            value={filters.find((f) => f.name === 'activeLast30Days')?.value}
+            className={styles.filter}
+          />
+        </div>
+      </div>
+      <AnonUsersDevicesTable
+        devices={devices}
+        showPaging={showPaging}
+        totalPages={totalPages}
+        onChangePage={changeAnonPage}
+        currentPage={page}
+        fetchData={changeAnonUserSort}
+      />
+    </Page.Contents>
+  );
+};
+
+export const UserListAnonymousDevicesPageContent = connector(UserListAnonymousDevicesPageUnConnected);
+
+export function UserListAnonymousDevicesPage() {
+  return (
+    <Page navId="anonymous-users">
+      <UserListAnonymousDevicesPageContent />
+    </Page>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    filter: css({
+      margin: theme.spacing(0, 1),
+      [theme.breakpoints.down('sm')]: {
+        margin: 0,
+      },
+    }),
+    actionBar: css({
+      marginBottom: theme.spacing(2),
+      display: 'flex',
+      alignItems: 'flex-start',
+      gap: theme.spacing(2),
+      [theme.breakpoints.down('sm')]: {
+        flexWrap: 'wrap',
+      },
+    }),
+    row: css({
+      display: 'flex',
+      alignItems: 'flex-start',
+      textAlign: 'left',
+      marginBottom: theme.spacing(0.5),
+      flexGrow: 1,
+
+      [theme.breakpoints.down('sm')]: {
+        flexWrap: 'wrap',
+        gap: theme.spacing(2),
+        width: '100%',
+      },
+    }),
+  };
+};
+
+export default UserListAnonymousDevicesPage;
diff --git a/public/app/features/admin/UserListPage.tsx b/public/app/features/admin/UserListPage.tsx
index 17bf9ab28bfc7..378740f95a6f8 100644
--- a/public/app/features/admin/UserListPage.tsx
+++ b/public/app/features/admin/UserListPage.tsx
@@ -5,26 +5,30 @@ import { GrafanaTheme2 } from '@grafana/data';
 import { selectors as e2eSelectors } from '@grafana/e2e-selectors';
 import { config, featureEnabled } from '@grafana/runtime';
 import { useStyles2, TabsBar, Tab } from '@grafana/ui';
+import { t } from 'app/core/internationalization';
 import { contextSrv } from 'app/core/services/context_srv';
+import { isPublicDashboardsEnabled } from 'app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils';
 
 import { Page } from '../../core/components/Page/Page';
 import { AccessControlAction } from '../../types';
 import { UsersListPageContent } from '../users/UsersListPage';
 
 import { UserListAdminPageContent } from './UserListAdminPage';
+import { UserListAnonymousDevicesPageContent } from './UserListAnonymousPage';
 import { UserListPublicDashboardPage } from './UserListPublicDashboardPage/UserListPublicDashboardPage';
 
 enum TabView {
   ADMIN = 'admin',
   ORG = 'org',
   PUBLIC_DASHBOARDS = 'public-dashboards',
+  ANON = 'anon',
 }
 
 const selectors = e2eSelectors.pages.UserListPage;
 
 const PublicDashboardsTab = ({ view, setView }: { view: TabView | null; setView: (v: TabView | null) => void }) => (
   <Tab
-    label="Public dashboard users"
+    label={t('users-access-list.tabs.public-dashboard-users-tab-title', 'Public dashboard users')}
     active={view === TabView.PUBLIC_DASHBOARDS}
     onChangeTab={() => setView(TabView.PUBLIC_DASHBOARDS)}
     data-testid={selectors.tabs.publicDashboardsUsers}
@@ -35,6 +39,7 @@ const TAB_PAGE_MAP: Record<TabView, React.ReactElement> = {
   [TabView.ADMIN]: <UserListAdminPageContent />,
   [TabView.ORG]: <UsersListPageContent />,
   [TabView.PUBLIC_DASHBOARDS]: <UserListPublicDashboardPage />,
+  [TabView.ANON]: <UserListAnonymousDevicesPageContent />,
 };
 
 export default function UserListPage() {
@@ -43,7 +48,7 @@ export default function UserListPage() {
   const hasAccessToAdminUsers = contextSrv.hasPermission(AccessControlAction.UsersRead);
   const hasAccessToOrgUsers = contextSrv.hasPermission(AccessControlAction.OrgUsersRead);
   const hasEmailSharingEnabled =
-    Boolean(config.featureToggles.publicDashboards) &&
+    isPublicDashboardsEnabled() &&
     Boolean(config.featureToggles.publicDashboardsEmailSharing) &&
     featureEnabled('publicDashboardsEmailSharing');
 
@@ -74,6 +79,14 @@ export default function UserListPage() {
             onChangeTab={() => setView(TabView.ORG)}
             data-testid={selectors.tabs.orgUsers}
           />
+          {config.anonymousEnabled && (
+            <Tab
+              label="Anonymous devices"
+              active={view === TabView.ANON}
+              onChangeTab={() => setView(TabView.ANON)}
+              data-testid={selectors.tabs.anonUserDevices}
+            />
+          )}
           {hasEmailSharingEnabled && <PublicDashboardsTab view={view} setView={setView} />}
         </TabsBar>
       ) : (
diff --git a/public/app/features/admin/UserListPublicDashboardPage/DashboardsListModalButton.tsx b/public/app/features/admin/UserListPublicDashboardPage/DashboardsListModalButton.tsx
index ae1c4ada56968..625b4075679ea 100644
--- a/public/app/features/admin/UserListPublicDashboardPage/DashboardsListModalButton.tsx
+++ b/public/app/features/admin/UserListPublicDashboardPage/DashboardsListModalButton.tsx
@@ -4,6 +4,7 @@ import React from 'react';
 import { GrafanaTheme2 } from '@grafana/data/src';
 import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
 import { Button, LoadingPlaceholder, Modal, ModalsController, useStyles2 } from '@grafana/ui/src';
+import { Trans, t } from 'app/core/internationalization';
 import {
   generatePublicDashboardConfigUrl,
   generatePublicDashboardUrl,
@@ -18,10 +19,17 @@ export const DashboardsListModal = ({ email, onDismiss }: { email: string; onDis
   const { data: dashboards, isLoading } = useGetActiveUserDashboardsQuery(email);
 
   return (
-    <Modal className={styles.modal} isOpen title="Public dashboards" onDismiss={onDismiss}>
+    <Modal
+      className={styles.modal}
+      isOpen
+      title={t('public-dashboard-users-access-list.modal.dashboard-modal-title', 'Public dashboards')}
+      onDismiss={onDismiss}
+    >
       {isLoading ? (
         <div className={styles.loading}>
-          <LoadingPlaceholder text="Loading..." />
+          <LoadingPlaceholder
+            text={t('public-dashboard-users-access-list.dashboard-modal.loading-text', 'Loading...')}
+          />
         </div>
       ) : (
         dashboards?.map((dash) => (
@@ -35,15 +43,19 @@ export const DashboardsListModal = ({ email, onDismiss }: { email: string; onDis
                 href={generatePublicDashboardUrl(dash.publicDashboardAccessToken)}
                 onClick={onDismiss}
               >
-                Public dashboard URL
+                <Trans i18nKey="public-dashboard-users-access-list.dashboard-modal.public-dashboard-link">
+                  Public dashboard URL
+                </Trans>
               </a>
               <span className={styles.urlsDivider}>•</span>
               <a
                 className={cx('external-link', styles.url)}
-                href={generatePublicDashboardConfigUrl(dash.dashboardUid)}
+                href={generatePublicDashboardConfigUrl(dash.dashboardUid, dash.slug)}
                 onClick={onDismiss}
               >
-                Public dashboard settings
+                <Trans i18nKey="public-dashboard-users-access-list.dashboard-modal.public-dashboard-setting">
+                  Public dashboard settings
+                </Trans>
               </a>
             </div>
             <hr className={styles.divider} />
@@ -54,20 +66,26 @@ export const DashboardsListModal = ({ email, onDismiss }: { email: string; onDis
   );
 };
 
-export const DashboardsListModalButton = ({ email }: { email: string }) => (
-  <ModalsController>
-    {({ showModal, hideModal }) => (
-      <Button
-        variant="secondary"
-        size="sm"
-        icon="question-circle"
-        title="Open dashboards list"
-        aria-label="Open dashboards list"
-        onClick={() => showModal(DashboardsListModal, { email, onDismiss: hideModal })}
-      />
-    )}
-  </ModalsController>
-);
+export const DashboardsListModalButton = ({ email }: { email: string }) => {
+  const translatedDashboardListModalButtonText = t(
+    'public-dashboard-users-access-list.dashboard-modal.open-dashboard-list-text',
+    'Open dashboards list'
+  );
+  return (
+    <ModalsController>
+      {({ showModal, hideModal }) => (
+        <Button
+          variant="secondary"
+          size="sm"
+          icon="question-circle"
+          title={translatedDashboardListModalButtonText}
+          aria-label={translatedDashboardListModalButtonText}
+          onClick={() => showModal(DashboardsListModal, { email, onDismiss: hideModal })}
+        />
+      )}
+    </ModalsController>
+  );
+};
 
 const getStyles = (theme: GrafanaTheme2) => ({
   modal: css`
diff --git a/public/app/features/admin/UserListPublicDashboardPage/DeleteUserModalButton.tsx b/public/app/features/admin/UserListPublicDashboardPage/DeleteUserModalButton.tsx
index d4bb06db15cb1..0ed323c7c4a45 100644
--- a/public/app/features/admin/UserListPublicDashboardPage/DeleteUserModalButton.tsx
+++ b/public/app/features/admin/UserListPublicDashboardPage/DeleteUserModalButton.tsx
@@ -3,40 +3,74 @@ import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data/src';
 import { Button, Modal, ModalsController, useStyles2 } from '@grafana/ui/src';
+import { Trans, t } from 'app/core/internationalization';
 import { SessionUser } from 'app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils';
 
-const DeleteUserModal = ({ user, onDismiss }: { user: SessionUser; onDismiss: () => void }) => {
+import { useRevokeAllAccessMutation } from '../../dashboard/api/publicDashboardApi';
+
+const DeleteUserModal = ({ user, hideModal }: { user: SessionUser; hideModal: () => void }) => {
+  const [revokeAllAccess] = useRevokeAllAccessMutation();
   const styles = useStyles2(getStyles);
 
+  const onRevokeAccessClick = () => {
+    revokeAllAccess({ email: user.email });
+    hideModal();
+  };
+
   return (
-    <Modal className={styles.modal} isOpen title="Delete" onDismiss={onDismiss}>
+    <Modal
+      className={styles.modal}
+      isOpen
+      title={t('public-dashboard-users-access-list.delete-user-modal.revoke-access-title', 'Revoke access')}
+      onDismiss={hideModal}
+    >
       <p className={styles.description}>
-        The user {user.email} is currently present in {user.totalDashboards} public dashboard(s). If you wish to remove
-        this user, please navigate to the settings of the corresponding public dashboard.
+        <Trans i18nKey="public-dashboard-users-access-list.delete-user-modal.revoke-user-access-modal-desc-line1">
+          Are you sure you want to revoke access for {{ email: user.email }}?
+        </Trans>
+      </p>
+      <p className={styles.description}>
+        <Trans
+          i18nKey="public-dashboard-users-access-list.delete-user-modal.revoke-user-access-modal-desc-line2"
+          shouldUnescape
+        >
+          This action will immediately revoke {{ email: user.email }}&apos;s access to all public dashboards.
+        </Trans>
       </p>
       <Modal.ButtonRow>
-        <Button type="button" variant="secondary" onClick={onDismiss} fill="outline">
-          Close
+        <Button type="button" variant="secondary" onClick={hideModal} fill="outline">
+          <Trans i18nKey="public-dashboard-users-access-list.delete-user-modal.delete-user-cancel-button">Cancel</Trans>
+        </Button>
+        <Button type="button" variant="destructive" onClick={onRevokeAccessClick}>
+          <Trans i18nKey="public-dashboard-users-access-list.delete-user-modal.delete-user-revoke-access-button">
+            Revoke access
+          </Trans>
         </Button>
       </Modal.ButtonRow>
     </Modal>
   );
 };
 
-export const DeleteUserModalButton = ({ user }: { user: SessionUser }) => (
-  <ModalsController>
-    {({ showModal, hideModal }) => (
-      <Button
-        size="sm"
-        variant="destructive"
-        onClick={() => showModal(DeleteUserModal, { user, onDismiss: hideModal })}
-        icon="times"
-        aria-label="Delete user"
-        title="Delete user"
-      />
-    )}
-  </ModalsController>
-);
+export const DeleteUserModalButton = ({ user }: { user: SessionUser }) => {
+  const translatedDeleteUserText = t(
+    'public-dashboard-users-access-list.delete-user-modal.delete-user-button-text',
+    'Delete user'
+  );
+  return (
+    <ModalsController>
+      {({ showModal, hideModal }) => (
+        <Button
+          size="sm"
+          variant="destructive"
+          onClick={() => showModal(DeleteUserModal, { user, hideModal })}
+          icon="times"
+          aria-label={translatedDeleteUserText}
+          title={translatedDeleteUserText}
+        />
+      )}
+    </ModalsController>
+  );
+};
 
 const getStyles = (theme: GrafanaTheme2) => ({
   modal: css`
diff --git a/public/app/features/admin/UserListPublicDashboardPage/UserListPublicDashboardPage.tsx b/public/app/features/admin/UserListPublicDashboardPage/UserListPublicDashboardPage.tsx
index cb79aec1373be..234cdca3f5d57 100644
--- a/public/app/features/admin/UserListPublicDashboardPage/UserListPublicDashboardPage.tsx
+++ b/public/app/features/admin/UserListPublicDashboardPage/UserListPublicDashboardPage.tsx
@@ -3,6 +3,7 @@ import React from 'react';
 import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
 import { HorizontalGroup, Icon, Tag, Tooltip } from '@grafana/ui/src';
 import { Page } from 'app/core/components/Page/Page';
+import { Trans, t } from 'app/core/internationalization';
 
 import { useGetActiveUsersQuery } from '../../dashboard/api/publicDashboardApi';
 
@@ -19,15 +20,32 @@ export const UserListPublicDashboardPage = () => {
       <table className="filter-table form-inline" data-testid={selectors.container}>
         <thead>
           <tr>
-            <th>Email</th>
             <th>
-              <span>Activated </span>
-              <Tooltip placement="top" content={'Earliest time user has been an active user to a dashboard'}>
+              <Trans i18nKey="public-dashboard-users-access-list.table-header.email-label">Email</Trans>
+            </th>
+            <th>
+              <span>
+                <Trans i18nKey="public-dashboard-users-access-list.table-header.activated-label">Activated</Trans>
+              </span>
+              <Tooltip
+                placement="top"
+                content={t(
+                  'public-dashboard-users-access-list.table-header.activated-tooltip',
+                  'Earliest time user has been an active user to a dashboard'
+                )}
+              >
                 <Icon name="question-circle" />
               </Tooltip>
             </th>
-            <th>Origin</th>
-            <th>Role</th>
+            <th>
+              <Trans i18nKey="public-dashboard-users-access-list.table-header.last-active-label">Last active</Trans>
+            </th>
+            <th>
+              <Trans i18nKey="public-dashboard-users-access-list.table-header.origin-label">Origin</Trans>
+            </th>
+            <th>
+              <Trans i18nKey="public-dashboard-users-access-list.table-header.role-label">Role</Trans>
+            </th>
             <th></th>
           </tr>
         </thead>
@@ -40,6 +58,7 @@ export const UserListPublicDashboardPage = () => {
                 </span>
               </td>
               <td className="max-width-10">{user.firstSeenAtAge}</td>
+              <td className="max-width-10">{user.lastSeenAtAge}</td>
               <td className="max-width-10">
                 <HorizontalGroup spacing="sm">
                   <span>{user.totalDashboards} dashboard(s)</span>
diff --git a/public/app/features/admin/UserOrgs.tsx b/public/app/features/admin/UserOrgs.tsx
index 31379631d0123..5583380263aa1 100644
--- a/public/app/features/admin/UserOrgs.tsx
+++ b/public/app/features/admin/UserOrgs.tsx
@@ -14,6 +14,7 @@ import {
   Tooltip,
   useStyles2,
   withTheme2,
+  Stack,
 } from '@grafana/ui';
 import { UserRolePicker } from 'app/core/components/RolePicker/UserRolePicker';
 import { fetchRoleOptions, updateUserRoles } from 'app/core/components/RolePicker/api';
@@ -56,32 +57,28 @@ export class UserOrgs extends PureComponent<Props, State> {
   render() {
     const { user, orgs, isExternalUser, onOrgRoleChange, onOrgRemove, onOrgAdd } = this.props;
     const { showAddOrgModal } = this.state;
-    const addToOrgContainerClass = css`
-      margin-top: 0.8rem;
-    `;
 
     const canAddToOrg = contextSrv.hasPermission(AccessControlAction.OrgUsersAdd) && !isExternalUser;
     return (
-      <>
+      <div>
         <h3 className="page-heading">Organizations</h3>
-        <div className="gf-form-group">
-          <div className="gf-form">
-            <table className="filter-table form-inline">
-              <tbody>
-                {orgs.map((org, index) => (
-                  <OrgRow
-                    key={`${org.orgId}-${index}`}
-                    isExternalUser={isExternalUser}
-                    user={user}
-                    org={org}
-                    onOrgRoleChange={onOrgRoleChange}
-                    onOrgRemove={onOrgRemove}
-                  />
-                ))}
-              </tbody>
-            </table>
-          </div>
-          <div className={addToOrgContainerClass}>
+        <Stack gap={1.5} direction="column">
+          <table className="filter-table form-inline">
+            <tbody>
+              {orgs.map((org, index) => (
+                <OrgRow
+                  key={`${org.orgId}-${index}`}
+                  isExternalUser={isExternalUser}
+                  user={user}
+                  org={org}
+                  onOrgRoleChange={onOrgRoleChange}
+                  onOrgRemove={onOrgRemove}
+                />
+              ))}
+            </tbody>
+          </table>
+
+          <div>
             {canAddToOrg && (
               <Button variant="secondary" onClick={this.showOrgAddModal} ref={this.addToOrgButtonRef}>
                 Add user to organization
@@ -95,8 +92,8 @@ export class UserOrgs extends PureComponent<Props, State> {
             onOrgAdd={onOrgAdd}
             onDismiss={this.dismissOrgAddModal}
           />
-        </div>
-      </>
+        </Stack>
+      </div>
     );
   }
 }
@@ -248,7 +245,6 @@ class UnThemedOrgRow extends PureComponent<OrgRowProps> {
                 confirmVariant="destructive"
                 onCancel={this.onCancelClick}
                 onConfirm={this.onOrgRemove}
-                autoFocus
               >
                 Remove from organization
               </ConfirmButton>
diff --git a/public/app/features/admin/UserPermissions.tsx b/public/app/features/admin/UserPermissions.tsx
index 30cc4c798d5cb..795223dfdc3af 100644
--- a/public/app/features/admin/UserPermissions.tsx
+++ b/public/app/features/admin/UserPermissions.tsx
@@ -38,57 +38,53 @@ export function UserPermissions({ isGrafanaAdmin, isExternalUser, lockMessage, o
   const styles = useStyles2(getTooltipStyles);
 
   return (
-    <>
+    <div>
       <h3 className="page-heading">Permissions</h3>
-      <div className="gf-form-group">
-        <div className="gf-form">
-          <table className="filter-table form-inline">
-            <tbody>
-              <tr>
-                <td className="width-16">Grafana Admin</td>
-                {isEditing ? (
-                  <td colSpan={2}>
-                    <RadioButtonGroup
-                      options={adminOptions}
-                      value={currentAdminOption}
-                      onChange={setCurrentAdminOption}
-                      autoFocus
-                    />
-                  </td>
+      <table className="filter-table form-inline">
+        <tbody>
+          <tr>
+            <td className="width-16">Grafana Admin</td>
+            {isEditing ? (
+              <td colSpan={2}>
+                <RadioButtonGroup
+                  options={adminOptions}
+                  value={currentAdminOption}
+                  onChange={setCurrentAdminOption}
+                  autoFocus
+                />
+              </td>
+            ) : (
+              <td colSpan={2}>
+                {isGrafanaAdmin ? (
+                  <>
+                    <Icon name="shield" /> Yes
+                  </>
                 ) : (
-                  <td colSpan={2}>
-                    {isGrafanaAdmin ? (
-                      <>
-                        <Icon name="shield" /> Yes
-                      </>
-                    ) : (
-                      <>No</>
-                    )}
-                  </td>
+                  <>No</>
                 )}
-                <td>
-                  {canChangePermissions && (
-                    <ConfirmButton
-                      onClick={onChangeClick}
-                      onConfirm={handleGrafanaAdminChange}
-                      onCancel={onCancelClick}
-                      confirmText="Change"
-                    >
-                      Change
-                    </ConfirmButton>
-                  )}
-                  {isExternalUser && (
-                    <div className={styles.lockMessageClass}>
-                      <ExternalUserTooltip lockMessage={lockMessage} />
-                    </div>
-                  )}
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </>
+              </td>
+            )}
+            <td>
+              {canChangePermissions && (
+                <ConfirmButton
+                  onClick={onChangeClick}
+                  onConfirm={handleGrafanaAdminChange}
+                  onCancel={onCancelClick}
+                  confirmText="Change"
+                >
+                  Change
+                </ConfirmButton>
+              )}
+              {isExternalUser && (
+                <div className={styles.lockMessageClass}>
+                  <ExternalUserTooltip lockMessage={lockMessage} />
+                </div>
+              )}
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
   );
 }
 
diff --git a/public/app/features/admin/UserProfile.tsx b/public/app/features/admin/UserProfile.tsx
index 847677f489030..222fc27486cbe 100644
--- a/public/app/features/admin/UserProfile.tsx
+++ b/public/app/features/admin/UserProfile.tsx
@@ -1,7 +1,7 @@
 import { css, cx } from '@emotion/css';
 import React, { PureComponent, useRef, useState } from 'react';
 
-import { Button, ConfirmButton, ConfirmModal, Input, LegacyInputStatus } from '@grafana/ui';
+import { Button, ConfirmButton, ConfirmModal, Input, LegacyInputStatus, Stack } from '@grafana/ui';
 import { contextSrv } from 'app/core/core';
 import { AccessControlAction, UserDTO } from 'app/types';
 
@@ -80,10 +80,10 @@ export function UserProfile({
   const canEnable = contextSrv.hasPermissionInMetadata(AccessControlAction.UsersEnable, user);
 
   return (
-    <>
+    <div>
       <h3 className="page-heading">User information</h3>
-      <div className="gf-form-group">
-        <div className="gf-form">
+      <Stack direction="column" gap={1.5}>
+        <div>
           <table className="filter-table form-inline">
             <tbody>
               <UserProfileRow
@@ -118,7 +118,7 @@ export function UserProfile({
             </tbody>
           </table>
         </div>
-        <div className={styles.buttonRow}>
+        <Stack gap={2}>
           {canDelete && (
             <>
               <Button variant="destructive" onClick={showDeleteUserModal(true)} ref={deleteUserRef}>
@@ -154,21 +154,12 @@ export function UserProfile({
               />
             </>
           )}
-        </div>
-      </div>
-    </>
+        </Stack>
+      </Stack>
+    </div>
   );
 }
 
-const styles = {
-  buttonRow: css`
-    margin-top: 0.8rem;
-    > * {
-      margin-right: 16px;
-    }
-  `,
-};
-
 interface UserProfileRowProps {
   label: string;
   value?: string;
diff --git a/public/app/features/admin/UserSessions.tsx b/public/app/features/admin/UserSessions.tsx
index 15846de2d6f58..1129dc7201fd5 100644
--- a/public/app/features/admin/UserSessions.tsx
+++ b/public/app/features/admin/UserSessions.tsx
@@ -1,7 +1,6 @@
-import { css } from '@emotion/css';
 import React, { PureComponent } from 'react';
 
-import { ConfirmButton, ConfirmModal, Button } from '@grafana/ui';
+import { ConfirmButton, ConfirmModal, Button, Stack } from '@grafana/ui';
 import { contextSrv } from 'app/core/core';
 import { i18nDate } from 'app/core/internationalization';
 import { AccessControlAction, UserSession } from 'app/types';
@@ -48,17 +47,13 @@ class BaseUserSessions extends PureComponent<Props, State> {
     const { sessions } = this.props;
     const { showLogoutModal } = this.state;
 
-    const logoutFromAllDevicesClass = css`
-      margin-top: 0.8rem;
-    `;
-
     const canLogout = contextSrv.hasPermission(AccessControlAction.UsersLogout);
 
     return (
-      <>
+      <div>
         <h3 className="page-heading">Sessions</h3>
-        <div className="gf-form-group">
-          <div className="gf-form">
+        <Stack direction="column" gap={1.5}>
+          <div>
             <table className="filter-table form-inline">
               <thead>
                 <tr>
@@ -83,7 +78,6 @@ class BaseUserSessions extends PureComponent<Props, State> {
                               confirmText="Confirm logout"
                               confirmVariant="destructive"
                               onConfirm={this.onSessionRevoke(session.id)}
-                              autoFocus
                             >
                               Force logout
                             </ConfirmButton>
@@ -95,7 +89,8 @@ class BaseUserSessions extends PureComponent<Props, State> {
               </tbody>
             </table>
           </div>
-          <div className={logoutFromAllDevicesClass}>
+
+          <div>
             {canLogout && sessions.length > 0 && (
               <Button variant="secondary" onClick={this.showLogoutConfirmationModal} ref={this.forceAllLogoutButton}>
                 Force logout from all devices
@@ -110,8 +105,8 @@ class BaseUserSessions extends PureComponent<Props, State> {
               onDismiss={this.dismissLogoutConfirmationModal}
             />
           </div>
-        </div>
-      </>
+        </Stack>
+      </div>
     );
   }
 }
diff --git a/public/app/features/admin/Users/AnonUsersTable.tsx b/public/app/features/admin/Users/AnonUsersTable.tsx
new file mode 100644
index 0000000000000..75c7f96aa78d4
--- /dev/null
+++ b/public/app/features/admin/Users/AnonUsersTable.tsx
@@ -0,0 +1,125 @@
+import React, { useMemo } from 'react';
+
+import {
+  Avatar,
+  CellProps,
+  Column,
+  InteractiveTable,
+  Stack,
+  Badge,
+  Tooltip,
+  Pagination,
+  FetchDataFunc,
+} from '@grafana/ui';
+import { EmptyArea } from 'app/features/alerting/unified/components/EmptyArea';
+import { UserAnonymousDeviceDTO } from 'app/types';
+
+type Cell<T extends keyof UserAnonymousDeviceDTO = keyof UserAnonymousDeviceDTO> = CellProps<
+  UserAnonymousDeviceDTO,
+  UserAnonymousDeviceDTO[T]
+>;
+
+// A helper function to parse the user agent string and extract parts
+const parseUserAgent = (userAgent: string) => {
+  // If the user agent string doesn't contain a space, it's probably just the browser name
+  // or some other entity that are accessing grafana
+  if (!userAgent.includes(' ')) {
+    return {
+      browser: userAgent,
+      computer: '',
+    };
+  }
+  const parts = userAgent.split(' ');
+  return {
+    browser: parts[0],
+    computer: parts[1],
+  };
+};
+
+// A helper function to truncate each part of the user agent
+const truncatePart = (part: string, maxLength: number) => {
+  return part.length > maxLength ? part.substring(0, maxLength) + '...' : part;
+};
+
+interface UserAgentCellProps {
+  value: string;
+}
+
+const UserAgentCell = ({ value }: UserAgentCellProps) => {
+  const parts = parseUserAgent(value);
+  return (
+    <Tooltip theme="info-alt" content={value} placement="top-end" interactive={true}>
+      <span>
+        {truncatePart(parts.browser, 10)}
+        {truncatePart(parts.computer, 10)}
+      </span>
+    </Tooltip>
+  );
+};
+
+interface AnonUsersTableProps {
+  devices: UserAnonymousDeviceDTO[];
+  // for pagination
+  showPaging?: boolean;
+  totalPages: number;
+  onChangePage: (page: number) => void;
+  currentPage: number;
+  fetchData?: FetchDataFunc<UserAnonymousDeviceDTO>;
+}
+
+export const AnonUsersDevicesTable = ({
+  devices,
+  showPaging,
+  totalPages,
+  onChangePage,
+  currentPage,
+  fetchData,
+}: AnonUsersTableProps) => {
+  const columns: Array<Column<UserAnonymousDeviceDTO>> = useMemo(
+    () => [
+      {
+        id: 'avatarUrl',
+        header: '',
+        cell: ({ cell: { value } }: Cell<'avatarUrl'>) => value && <Avatar src={value} alt={'User avatar'} />,
+      },
+      {
+        id: 'login',
+        header: 'Login',
+        cell: ({ cell: { value } }: Cell<'login'>) => 'Anonymous',
+      },
+      {
+        id: 'userAgent',
+        header: 'User Agent',
+        cell: ({ cell: { value } }: Cell<'userAgent'>) => <UserAgentCell value={value} />,
+        sortType: 'string',
+      },
+      {
+        id: 'updatedAt',
+        header: 'Last active',
+        cell: ({ cell: { value } }: Cell<'updatedAt'>) => value,
+        sortType: (a, b) => new Date(a.original.updatedAt).getTime() - new Date(b.original.updatedAt).getTime(),
+      },
+      {
+        id: 'clientIp',
+        header: 'Origin IP (address)',
+        cell: ({ cell: { value } }: Cell<'clientIp'>) => value && <Badge text={value} color="orange" />,
+      },
+    ],
+    []
+  );
+  return (
+    <Stack direction={'column'} gap={2}>
+      <InteractiveTable columns={columns} data={devices} getRowId={(user) => user.deviceId} fetchData={fetchData} />
+      {showPaging && (
+        <Stack justifyContent={'flex-end'}>
+          <Pagination numberOfPages={totalPages} currentPage={currentPage} onNavigate={onChangePage} />
+        </Stack>
+      )}
+      {devices.length === 0 && (
+        <EmptyArea>
+          <span>No anonymous users found.</span>
+        </EmptyArea>
+      )}
+    </Stack>
+  );
+};
diff --git a/public/app/features/admin/Users/OrgUnits.tsx b/public/app/features/admin/Users/OrgUnits.tsx
index 846abb95f704a..5da20ac22c371 100644
--- a/public/app/features/admin/Users/OrgUnits.tsx
+++ b/public/app/features/admin/Users/OrgUnits.tsx
@@ -1,8 +1,7 @@
 import React, { forwardRef, PropsWithChildren } from 'react';
 
 import { IconName } from '@grafana/data';
-import { Icon, Tooltip, Box } from '@grafana/ui';
-import { Flex } from '@grafana/ui/src/unstable';
+import { Icon, Tooltip, Box, Stack } from '@grafana/ui';
 import { Unit } from 'app/types';
 
 type OrgUnitProps = { units?: Unit[]; icon: IconName };
@@ -15,7 +14,7 @@ export const OrgUnits = ({ units, icon }: OrgUnitProps) => {
   return units.length > 1 ? (
     <Tooltip
       placement={'top'}
-      content={<Flex direction={'column'}>{units?.map((unit) => <span key={unit.name}>{unit.name}</span>)}</Flex>}
+      content={<Stack direction={'column'}>{units?.map((unit) => <span key={unit.name}>{unit.name}</span>)}</Stack>}
     >
       <Content icon={icon}>{units.length}</Content>
     </Tooltip>
diff --git a/public/app/features/admin/Users/OrgUsersTable.tsx b/public/app/features/admin/Users/OrgUsersTable.tsx
index be169eab5f2dc..135413ae534b7 100644
--- a/public/app/features/admin/Users/OrgUsersTable.tsx
+++ b/public/app/features/admin/Users/OrgUsersTable.tsx
@@ -3,47 +3,37 @@ import React, { useEffect, useMemo, useState } from 'react';
 import { OrgRole } from '@grafana/data';
 import { selectors as e2eSelectors } from '@grafana/e2e-selectors';
 import {
+  Avatar,
+  Box,
   Button,
-  ConfirmModal,
-  Icon,
-  Tooltip,
   CellProps,
-  Tag,
-  InteractiveTable,
   Column,
+  ConfirmModal,
   FetchDataFunc,
+  Icon,
+  InteractiveTable,
   Pagination,
-  Avatar,
-  Box,
+  Stack,
+  Tag,
+  Text,
+  Tooltip,
 } from '@grafana/ui';
-import { Flex, Stack } from '@grafana/ui/src/unstable';
 import { UserRolePicker } from 'app/core/components/RolePicker/UserRolePicker';
 import { fetchRoleOptions } from 'app/core/components/RolePicker/api';
 import { TagBadge } from 'app/core/components/TagFilter/TagBadge';
-import config from 'app/core/config';
 import { contextSrv } from 'app/core/core';
 import { AccessControlAction, OrgUser, Role } from 'app/types';
 
 import { OrgRolePicker } from '../OrgRolePicker';
 
-import { TableWrapper } from './TableWrapper';
-
 type Cell<T extends keyof OrgUser = keyof OrgUser> = CellProps<OrgUser, OrgUser[T]>;
 
 const disabledRoleMessage = `This user's role is not editable because it is synchronized from your auth provider.
 Refer to the Grafana authentication docs for details.`;
 
 const getBasicRoleDisabled = (user: OrgUser) => {
-  let basicRoleDisabled = !contextSrv.hasPermissionInMetadata(AccessControlAction.OrgUsersWrite, user);
-  let authLabel = Array.isArray(user.authLabels) && user.authLabels.length > 0 ? user.authLabels[0] : '';
-  // A GCom specific feature toggle for role locking has been introduced, as the previous implementation had a bug with locking down external users synced through GCom (https://github.com/grafana/grafana/pull/72044)
-  // Remove this conditional once FlagGcomOnlyExternalOrgRoleSync feature toggle has been removed
-  if (authLabel !== 'grafana.com' || config.featureToggles.gcomOnlyExternalOrgRoleSync) {
-    const isUserSynced = user?.isExternallySynced;
-    basicRoleDisabled = isUserSynced || basicRoleDisabled;
-  }
-
-  return basicRoleDisabled;
+  const isUserSynced = user?.isExternallySynced;
+  return !contextSrv.hasPermissionInMetadata(AccessControlAction.OrgUsersWrite, user) || isUserSynced;
 };
 
 const selectors = e2eSelectors.pages.UserListPage.UsersListPage;
@@ -57,6 +47,7 @@ export interface Props {
   changePage: (page: number) => void;
   page: number;
   totalPages: number;
+  rolesLoading?: boolean;
 }
 
 export const OrgUsersTable = ({
@@ -68,6 +59,7 @@ export const OrgUsersTable = ({
   changePage,
   page,
   totalPages,
+  rolesLoading,
 }: Props) => {
   const [userToRemove, setUserToRemove] = useState<OrgUser | null>(null);
   const [roleOptions, setRoleOptions] = useState<Role[]>([]);
@@ -116,7 +108,9 @@ export const OrgUsersTable = ({
       {
         id: 'lastSeenAtAge',
         header: 'Last active',
-        cell: ({ cell: { value } }: Cell<'lastSeenAtAge'>) => value,
+        cell: ({ cell: { value } }: Cell<'lastSeenAtAge'>) => {
+          return <>{value && <>{value === '10 years' ? <Text color={'disabled'}>Never</Text> : value}</>}</>;
+        },
         sortType: (a, b) => new Date(a.original.lastSeenAt).getTime() - new Date(b.original.lastSeenAt).getTime(),
       },
       {
@@ -127,6 +121,8 @@ export const OrgUsersTable = ({
           return contextSrv.licensedAccessControlEnabled() ? (
             <UserRolePicker
               userId={original.userId}
+              roles={original.roles || []}
+              isLoading={rolesLoading}
               orgId={orgId}
               roleOptions={roleOptions}
               basicRole={value}
@@ -211,22 +207,15 @@ export const OrgUsersTable = ({
         },
       },
     ],
-    [orgId, roleOptions, onRoleChange]
+    [rolesLoading, orgId, roleOptions, onRoleChange]
   );
 
   return (
-    <Stack gap={2} data-testid={selectors.container}>
-      <TableWrapper>
-        <InteractiveTable
-          columns={columns}
-          data={users}
-          getRowId={(user) => String(user.userId)}
-          fetchData={fetchData}
-        />
-        <Flex justifyContent="flex-end">
-          <Pagination onNavigate={changePage} currentPage={page} numberOfPages={totalPages} hideWhenSinglePage={true} />
-        </Flex>
-      </TableWrapper>
+    <Stack direction={'column'} gap={2} data-testid={selectors.container}>
+      <InteractiveTable columns={columns} data={users} getRowId={(user) => String(user.userId)} fetchData={fetchData} />
+      <Stack justifyContent="flex-end">
+        <Pagination onNavigate={changePage} currentPage={page} numberOfPages={totalPages} hideWhenSinglePage={true} />
+      </Stack>
       {Boolean(userToRemove) && (
         <ConfirmModal
           body={`Are you sure you want to delete user ${userToRemove?.login}?`}
diff --git a/public/app/features/admin/Users/TableWrapper.tsx b/public/app/features/admin/Users/TableWrapper.tsx
deleted file mode 100644
index ea3fd28809dd1..0000000000000
--- a/public/app/features/admin/Users/TableWrapper.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { css } from '@emotion/css';
-import React, { PropsWithChildren } from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { useStyles2 } from '@grafana/ui';
-
-/**
- * A wrapper component for interactive tables using RolePicker to enable overflow.
- * Should be removed when the RolePicker component uses portals to render its menu
- */
-export const TableWrapper = ({ children }: PropsWithChildren) => {
-  const styles = useStyles2(getStyles);
-  return <div className={styles.wrapper}>{children}</div>;
-};
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  // Enable RolePicker overflow
-  wrapper: css({
-    display: 'flex',
-    flexDirection: 'column',
-    overflowX: 'auto',
-    overflowY: 'hidden',
-    minHeight: '100vh',
-    width: '100%',
-    '& > div': {
-      overflowX: 'unset',
-      marginBottom: theme.spacing(2),
-    },
-  }),
-});
diff --git a/public/app/features/admin/Users/UsersTable.tsx b/public/app/features/admin/Users/UsersTable.tsx
index 209625698cd41..fd7cdbb68139b 100644
--- a/public/app/features/admin/Users/UsersTable.tsx
+++ b/public/app/features/admin/Users/UsersTable.tsx
@@ -1,18 +1,19 @@
 import React, { useMemo } from 'react';
+import { UseTableRowProps } from 'react-table';
 
 import {
-  InteractiveTable,
+  Avatar,
   CellProps,
-  Tooltip,
-  Icon,
-  Tag,
-  Pagination,
   Column,
   FetchDataFunc,
+  Icon,
+  InteractiveTable,
+  Pagination,
+  Stack,
+  Tag,
   Text,
-  Avatar,
+  Tooltip,
 } from '@grafana/ui';
-import { Flex, Stack } from '@grafana/ui/src/unstable';
 import { TagBadge } from 'app/core/components/TagFilter/TagBadge';
 import { UserDTO } from 'app/types';
 
@@ -38,6 +39,7 @@ export const UsersTable = ({
   fetchData,
 }: UsersTableProps) => {
   const showLicensedRole = useMemo(() => users.some((user) => user.licensedRole), [users]);
+  const showBelongsTo = useMemo(() => users.some((user) => user.orgs), [users]);
   const columns: Array<Column<UserDTO>> = useMemo(
     () => [
       {
@@ -63,23 +65,28 @@ export const UsersTable = ({
         cell: ({ cell: { value } }: Cell<'name'>) => value,
         sortType: 'string',
       },
-      {
-        id: 'orgs',
-        header: 'Belongs to',
-        cell: ({ cell: { value, row } }: Cell<'orgs'>) => {
-          return (
-            <Flex alignItems={'center'}>
-              <OrgUnits units={value} icon={'building'} />
-              {row.original.isAdmin && (
-                <Tooltip placement="top" content="Grafana Admin">
-                  <Icon name="shield" />
-                </Tooltip>
-              )}
-            </Flex>
-          );
-        },
-        sortType: (a, b) => (a.original.orgs?.length || 0) - (b.original.orgs?.length || 0),
-      },
+      ...(showBelongsTo
+        ? [
+            {
+              id: 'orgs',
+              header: 'Belongs to',
+              cell: ({ cell: { value, row } }: Cell<'orgs'>) => {
+                return (
+                  <Stack alignItems={'center'}>
+                    <OrgUnits units={value} icon={'building'} />
+                    {row.original.isAdmin && (
+                      <Tooltip placement="top" content="Grafana Admin">
+                        <Icon name="shield" />
+                      </Tooltip>
+                    )}
+                  </Stack>
+                );
+              },
+              sortType: (a: UseTableRowProps<UserDTO>, b: UseTableRowProps<UserDTO>) =>
+                (a.original.orgs?.length || 0) - (b.original.orgs?.length || 0),
+            },
+          ]
+        : []),
       ...(showLicensedRole
         ? [
             {
@@ -140,15 +147,15 @@ export const UsersTable = ({
         },
       },
     ],
-    [showLicensedRole]
+    [showLicensedRole, showBelongsTo]
   );
   return (
-    <Stack gap={2}>
+    <Stack direction={'column'} gap={2}>
       <InteractiveTable columns={columns} data={users} getRowId={(user) => String(user.id)} fetchData={fetchData} />
       {showPaging && (
-        <Flex justifyContent={'flex-end'}>
+        <Stack justifyContent={'flex-end'}>
           <Pagination numberOfPages={totalPages} currentPage={currentPage} onNavigate={onChangePage} />
-        </Flex>
+        </Stack>
       )}
     </Stack>
   );
diff --git a/public/app/features/admin/api.ts b/public/app/features/admin/api.ts
new file mode 100644
index 0000000000000..49542e53b36b6
--- /dev/null
+++ b/public/app/features/admin/api.ts
@@ -0,0 +1,38 @@
+import { UrlQueryValue } from '@grafana/data';
+import { getBackendSrv } from '@grafana/runtime';
+import { contextSrv } from 'app/core/core';
+import { accessControlQueryParam } from 'app/core/utils/accessControl';
+import { OrgUser, AccessControlAction } from 'app/types';
+
+const perPage = 30;
+
+export const getOrg = async (orgId: UrlQueryValue) => {
+  return await getBackendSrv().get(`/api/orgs/${orgId}`);
+};
+
+export const getOrgUsers = async (orgId: UrlQueryValue, page: number) => {
+  if (contextSrv.hasPermission(AccessControlAction.OrgUsersRead)) {
+    return getBackendSrv().get(`/api/orgs/${orgId}/users/search`, accessControlQueryParam({ perpage: perPage, page }));
+  }
+  return { orgUsers: [] };
+};
+
+export const getUsersRoles = async (orgId: number, users: OrgUser[]) => {
+  const userIds = users.map((u) => u.userId);
+  const roles = await getBackendSrv().post(`/api/access-control/users/roles/search`, { userIds, orgId });
+  users.forEach((u) => {
+    u.roles = roles ? roles[u.userId] || [] : [];
+  });
+};
+
+export const updateOrgUserRole = (orgUser: OrgUser, orgId: UrlQueryValue) => {
+  return getBackendSrv().patch(`/api/orgs/${orgId}/users/${orgUser.userId}`, orgUser);
+};
+
+export const removeOrgUser = (orgUser: OrgUser, orgId: UrlQueryValue) => {
+  return getBackendSrv().delete(`/api/orgs/${orgId}/users/${orgUser.userId}`);
+};
+
+export const updateOrgName = (name: string, orgId: number) => {
+  return getBackendSrv().put(`/api/orgs/${orgId}`, { name });
+};
diff --git a/public/app/features/admin/ldap/LdapConnectionStatus.tsx b/public/app/features/admin/ldap/LdapConnectionStatus.tsx
index 2566a3ff93cf5..bf4fc842fc8c8 100644
--- a/public/app/features/admin/ldap/LdapConnectionStatus.tsx
+++ b/public/app/features/admin/ldap/LdapConnectionStatus.tsx
@@ -1,48 +1,65 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 
-import { Alert, Icon } from '@grafana/ui';
+import { Alert, CellProps, Column, Icon, InteractiveTable, Stack, Text, Tooltip } from '@grafana/ui';
 import { AppNotificationSeverity, LdapConnectionInfo, LdapServerInfo } from 'app/types';
 
 interface Props {
   ldapConnectionInfo: LdapConnectionInfo;
 }
 
+interface ServerInfo {
+  host: string;
+  port: number;
+  available: boolean;
+}
+
 export const LdapConnectionStatus = ({ ldapConnectionInfo }: Props) => {
+  const columns = useMemo<Array<Column<ServerInfo>>>(
+    () => [
+      {
+        id: 'host',
+        header: 'Host',
+        disableGrow: true,
+      },
+      {
+        id: 'port',
+        header: 'Port',
+        disableGrow: true,
+      },
+      {
+        id: 'available',
+        cell: (serverInfo: CellProps<ServerInfo>) => {
+          return serverInfo.cell.value ? (
+            <Stack justifyContent="end">
+              <Tooltip content="Connection is available">
+                <Icon name="check" className="pull-right" />
+              </Tooltip>
+            </Stack>
+          ) : (
+            <Stack justifyContent="end">
+              <Tooltip content="Connection is not available">
+                <Icon name="exclamation-triangle" />
+              </Tooltip>
+            </Stack>
+          );
+        },
+      },
+    ],
+    []
+  );
+
+  const data = useMemo<ServerInfo[]>(() => ldapConnectionInfo, [ldapConnectionInfo]);
+
   return (
-    <>
-      <h3 className="page-heading">LDAP Connection</h3>
-      <div className="gf-form-group">
-        <div className="gf-form">
-          <table className="filter-table form-inline">
-            <thead>
-              <tr>
-                <th>Host</th>
-                <th colSpan={2}>Port</th>
-              </tr>
-            </thead>
-            <tbody>
-              {ldapConnectionInfo &&
-                ldapConnectionInfo.map((serverInfo, index) => (
-                  <tr key={index}>
-                    <td>{serverInfo.host}</td>
-                    <td>{serverInfo.port}</td>
-                    <td>
-                      {serverInfo.available ? (
-                        <Icon name="check" className="pull-right" />
-                      ) : (
-                        <Icon name="exclamation-triangle" className="pull-right" />
-                      )}
-                    </td>
-                  </tr>
-                ))}
-            </tbody>
-          </table>
-        </div>
-        <div className="gf-form-group">
-          <LdapErrorBox ldapConnectionInfo={ldapConnectionInfo} />
-        </div>
-      </div>
-    </>
+    <section>
+      <Stack direction="column" gap={2}>
+        <Text color="primary" element="h3">
+          LDAP Connection
+        </Text>
+        <InteractiveTable data={data} columns={columns} getRowId={(serverInfo) => serverInfo.host + serverInfo.port} />
+        <LdapErrorBox ldapConnectionInfo={ldapConnectionInfo} />
+      </Stack>
+    </section>
   );
 };
 
diff --git a/public/app/features/admin/ldap/LdapPage.tsx b/public/app/features/admin/ldap/LdapPage.tsx
index e82df553ddc7d..d7bf34f6b87dc 100644
--- a/public/app/features/admin/ldap/LdapPage.tsx
+++ b/public/app/features/admin/ldap/LdapPage.tsx
@@ -1,9 +1,10 @@
-import React, { PureComponent } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
+import { useForm } from 'react-hook-form';
 import { connect, ConnectedProps } from 'react-redux';
 
 import { NavModelItem } from '@grafana/data';
 import { featureEnabled } from '@grafana/runtime';
-import { Alert, Button, Field, Form, HorizontalGroup, Input } from '@grafana/ui';
+import { Alert, Button, Field, Input, Stack } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import { contextSrv } from 'app/core/core';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
@@ -37,10 +38,6 @@ interface OwnProps extends GrafanaRouteComponentProps<{}, { username?: string }>
   userError?: LdapError;
 }
 
-interface State {
-  isLoading: boolean;
-}
-
 interface FormModel {
   username: string;
 }
@@ -52,100 +49,105 @@ const pageNav: NavModelItem = {
   id: 'LDAP',
 };
 
-export class LdapPage extends PureComponent<Props, State> {
-  state = {
-    isLoading: true,
-  };
-
-  async componentDidMount() {
-    const { clearUserMappingInfo, queryParams } = this.props;
-    await clearUserMappingInfo();
-    await this.fetchLDAPStatus();
-
-    if (queryParams.username) {
-      await this.fetchUserMapping(queryParams.username);
+export const LdapPage = ({
+  clearUserMappingInfo,
+  queryParams,
+  loadLdapState,
+  loadLdapSyncStatus,
+  loadUserMapping,
+  clearUserError,
+  ldapUser,
+  userError,
+  ldapError,
+  ldapSyncInfo,
+  ldapConnectionInfo,
+}: Props) => {
+  const [isLoading, setIsLoading] = useState(true);
+  const { register, handleSubmit } = useForm<FormModel>();
+
+  const fetchUserMapping = useCallback(
+    async (username: string) => {
+      return loadUserMapping(username);
+    },
+    [loadUserMapping]
+  );
+
+  useEffect(() => {
+    const fetchLDAPStatus = async () => {
+      return Promise.all([loadLdapState(), loadLdapSyncStatus()]);
+    };
+
+    async function init() {
+      await clearUserMappingInfo();
+      await fetchLDAPStatus();
+
+      if (queryParams.username) {
+        await fetchUserMapping(queryParams.username);
+      }
+
+      setIsLoading(false);
     }
 
-    this.setState({ isLoading: false });
-  }
-
-  async fetchLDAPStatus() {
-    const { loadLdapState, loadLdapSyncStatus } = this.props;
-    return Promise.all([loadLdapState(), loadLdapSyncStatus()]);
-  }
+    init();
+  }, [clearUserMappingInfo, fetchUserMapping, loadLdapState, loadLdapSyncStatus, queryParams]);
 
-  async fetchUserMapping(username: string) {
-    const { loadUserMapping } = this.props;
-    return await loadUserMapping(username);
-  }
-
-  search = (username: string) => {
+  const search = ({ username }: FormModel) => {
     if (username) {
-      this.fetchUserMapping(username);
+      fetchUserMapping(username);
     }
   };
 
-  onClearUserError = () => {
-    this.props.clearUserError();
+  const onClearUserError = () => {
+    clearUserError();
   };
 
-  render() {
-    const { ldapUser, userError, ldapError, ldapSyncInfo, ldapConnectionInfo, queryParams } = this.props;
-    const { isLoading } = this.state;
-    const canReadLDAPUser = contextSrv.hasPermission(AccessControlAction.LDAPUsersRead);
-
-    return (
-      <Page navId="authentication" pageNav={pageNav}>
-        <Page.Contents isLoading={isLoading}>
-          <>
-            {ldapError && ldapError.title && (
-              <Alert title={ldapError.title} severity={AppNotificationSeverity.Error}>
-                {ldapError.body}
-              </Alert>
-            )}
-
-            <LdapConnectionStatus ldapConnectionInfo={ldapConnectionInfo} />
-
-            {featureEnabled('ldapsync') && ldapSyncInfo && <LdapSyncInfo ldapSyncInfo={ldapSyncInfo} />}
-
-            {canReadLDAPUser && (
-              <>
-                <h3>Test user mapping</h3>
-                <Form onSubmit={(data: FormModel) => this.search(data.username)}>
-                  {({ register }) => (
-                    <HorizontalGroup>
-                      <Field label="Username">
-                        <Input
-                          {...register('username', { required: true })}
-                          id="username"
-                          type="text"
-                          defaultValue={queryParams.username}
-                        />
-                      </Field>
+  const canReadLDAPUser = contextSrv.hasPermission(AccessControlAction.LDAPUsersRead);
+  return (
+    <Page navId="authentication" pageNav={pageNav}>
+      <Page.Contents isLoading={isLoading}>
+        <Stack direction="column" gap={4}>
+          {ldapError && ldapError.title && (
+            <Alert title={ldapError.title} severity={AppNotificationSeverity.Error}>
+              {ldapError.body}
+            </Alert>
+          )}
+
+          <LdapConnectionStatus ldapConnectionInfo={ldapConnectionInfo} />
+
+          {featureEnabled('ldapsync') && ldapSyncInfo && <LdapSyncInfo ldapSyncInfo={ldapSyncInfo} />}
+
+          {canReadLDAPUser && (
+            <section>
+              <h3>Test user mapping</h3>
+              <form onSubmit={handleSubmit(search)}>
+                <Field label="Username">
+                  <Input
+                    {...register('username', { required: true })}
+                    width={34}
+                    id="username"
+                    type="text"
+                    defaultValue={queryParams.username}
+                    addonAfter={
                       <Button variant="primary" type="submit">
                         Run
                       </Button>
-                    </HorizontalGroup>
-                  )}
-                </Form>
-                {userError && userError.title && (
-                  <Alert
-                    title={userError.title}
-                    severity={AppNotificationSeverity.Error}
-                    onRemove={this.onClearUserError}
-                  >
-                    {userError.body}
-                  </Alert>
-                )}
-                {ldapUser && <LdapUserInfo ldapUser={ldapUser} showAttributeMapping={true} />}
-              </>
-            )}
-          </>
-        </Page.Contents>
-      </Page>
-    );
-  }
-}
+                    }
+                  />
+                </Field>
+              </form>
+              {userError && userError.title && (
+                <Alert title={userError.title} severity={AppNotificationSeverity.Error} onRemove={onClearUserError}>
+                  {userError.body}
+                </Alert>
+              )}
+              {ldapUser && <LdapUserInfo ldapUser={ldapUser} />}
+            </section>
+          )}
+        </Stack>
+      </Page.Contents>
+    </Page>
+  );
+};
 
 const mapStateToProps = (state: StoreState) => ({
   ldapConnectionInfo: state.ldap.connectionInfo,
diff --git a/public/app/features/admin/ldap/LdapSyncInfo.tsx b/public/app/features/admin/ldap/LdapSyncInfo.tsx
index aabcd79358b3a..6dc3dbcf56e7c 100644
--- a/public/app/features/admin/ldap/LdapSyncInfo.tsx
+++ b/public/app/features/admin/ldap/LdapSyncInfo.tsx
@@ -1,63 +1,38 @@
-import React, { PureComponent } from 'react';
+import React from 'react';
 
 import { dateTimeFormat } from '@grafana/data';
-import { Button, Spinner } from '@grafana/ui';
+import { InteractiveTable, Text } from '@grafana/ui';
 import { SyncInfo } from 'app/types';
 
 interface Props {
   ldapSyncInfo: SyncInfo;
 }
 
-interface State {
-  isSyncing: boolean;
-}
-
 const format = 'dddd YYYY-MM-DD HH:mm zz';
 
-export class LdapSyncInfo extends PureComponent<Props, State> {
-  state = {
-    isSyncing: false,
-  };
-
-  handleSyncClick = () => {
-    this.setState({ isSyncing: !this.state.isSyncing });
-  };
-
-  render() {
-    const { ldapSyncInfo } = this.props;
-    const { isSyncing } = this.state;
-    const nextSyncTime = dateTimeFormat(ldapSyncInfo.nextSync, { format });
-
-    return (
-      <>
-        <h3 className="page-heading">
-          LDAP Synchronisation
-          <Button className="pull-right" onClick={this.handleSyncClick} hidden>
-            <span className="btn-title">Bulk-sync now</span>
-            {isSyncing && <Spinner inline={true} />}
-          </Button>
-        </h3>
-        <div className="gf-form-group">
-          <div className="gf-form">
-            <table className="filter-table form-inline">
-              <tbody>
-                <tr>
-                  <td>Active synchronisation</td>
-                  <td colSpan={2}>{ldapSyncInfo.enabled ? 'Enabled' : 'Disabled'}</td>
-                </tr>
-                <tr>
-                  <td>Scheduled</td>
-                  <td>{ldapSyncInfo.schedule}</td>
-                </tr>
-                <tr>
-                  <td>Next scheduled synchronisation</td>
-                  <td>{nextSyncTime}</td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </div>
-      </>
-    );
-  }
-}
+export const LdapSyncInfo = ({ ldapSyncInfo }: Props) => {
+  const nextSyncTime = dateTimeFormat(ldapSyncInfo.nextSync, { format });
+
+  const columns = [{ id: 'syncAttribute' }, { id: 'syncValue' }];
+  const data = [
+    {
+      syncAttribute: 'Active synchronization',
+      syncValue: ldapSyncInfo.enabled ? 'Enabled' : 'Disabled',
+    },
+    {
+      syncAttribute: 'Scheduled',
+      syncValue: ldapSyncInfo.schedule,
+    },
+    {
+      syncAttribute: 'Next synchronization',
+      syncValue: nextSyncTime,
+    },
+  ];
+
+  return (
+    <section>
+      <Text element="h3">LDAP Synchronization</Text>
+      <InteractiveTable data={data} columns={columns} getRowId={(sync) => sync.syncAttribute} />
+    </section>
+  );
+};
diff --git a/public/app/features/admin/ldap/LdapUserGroups.tsx b/public/app/features/admin/ldap/LdapUserGroups.tsx
index 0c8c1a4f83e58..ced2acdab68af 100644
--- a/public/app/features/admin/ldap/LdapUserGroups.tsx
+++ b/public/app/features/admin/ldap/LdapUserGroups.tsx
@@ -1,54 +1,52 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 
-import { Tooltip, Icon } from '@grafana/ui';
+import { Tooltip, Icon, InteractiveTable, type CellProps, Column } from '@grafana/ui';
 import { LdapRole } from 'app/types';
 
 interface Props {
   groups: LdapRole[];
-  showAttributeMapping?: boolean;
 }
 
-export const LdapUserGroups = ({ groups, showAttributeMapping }: Props) => {
-  const items = showAttributeMapping ? groups : groups.filter((item) => item.orgRole);
+export const LdapUserGroups = ({ groups }: Props) => {
+  const items = useMemo(() => groups, [groups]);
+
+  const columns = useMemo<Array<Column<LdapRole>>>(
+    () => [
+      {
+        id: 'groupDN',
+        header: 'LDAP Group',
+      },
+      {
+        id: 'orgName',
+        header: 'Organization',
+        cell: (props: CellProps<LdapRole, string | undefined>) =>
+          props.value && props.row.original.orgRole ? props.value : '',
+      },
+      {
+        id: 'orgRole',
+        header: 'Role',
+        cell: (props: CellProps<LdapRole, string | undefined>) =>
+          props.value || (
+            <>
+              No match{' '}
+              <Tooltip content="No matching organizations found">
+                <Icon name="info-circle" />
+              </Tooltip>
+            </>
+          ),
+      },
+    ],
+    []
+  );
 
   return (
-    <div className="gf-form-group">
-      <div className="gf-form">
-        <table className="filter-table form-inline">
-          <thead>
-            <tr>
-              {showAttributeMapping && <th>LDAP Group</th>}
-              <th>
-                Organization
-                <Tooltip placement="top" content="Only the first match for an Organization will be used" theme={'info'}>
-                  <Icon name="info-circle" />
-                </Tooltip>
-              </th>
-              <th>Role</th>
-            </tr>
-          </thead>
-          <tbody>
-            {items.map((group, index) => {
-              return (
-                <tr key={`${group.orgId}-${index}`}>
-                  {showAttributeMapping && <td>{group.groupDN}</td>}
-                  {group.orgName && group.orgRole ? <td>{group.orgName}</td> : <td />}
-                  {group.orgRole ? (
-                    <td>{group.orgRole}</td>
-                  ) : (
-                    <td>
-                      <span className="text-warning">No match</span>
-                      <Tooltip placement="top" content="No matching groups found" theme={'info'}>
-                        <Icon name="info-circle" />
-                      </Tooltip>
-                    </td>
-                  )}
-                </tr>
-              );
-            })}
-          </tbody>
-        </table>
-      </div>
-    </div>
+    <InteractiveTable
+      headerTooltips={{
+        orgName: { content: 'Only the first match for an Organization will be used', iconName: 'info-circle' },
+      }}
+      columns={columns}
+      data={items}
+      getRowId={(row) => row.orgId + row.orgRole + row.groupDN}
+    />
   );
 };
diff --git a/public/app/features/admin/ldap/LdapUserInfo.tsx b/public/app/features/admin/ldap/LdapUserInfo.tsx
index 441df16acdbd8..9f14a99f02f15 100644
--- a/public/app/features/admin/ldap/LdapUserInfo.tsx
+++ b/public/app/features/admin/ldap/LdapUserInfo.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 
+import { Box, Stack, Text } from '@grafana/ui';
 import { LdapUser } from 'app/types';
 
 import { LdapUserGroups } from './LdapUserGroups';
@@ -9,33 +10,22 @@ import { LdapUserTeams } from './LdapUserTeams';
 
 interface Props {
   ldapUser: LdapUser;
-  showAttributeMapping?: boolean;
 }
 
-export const LdapUserInfo = ({ ldapUser, showAttributeMapping }: Props) => {
+export const LdapUserInfo = ({ ldapUser }: Props) => {
   return (
-    <>
-      <LdapUserMappingInfo info={ldapUser.info} showAttributeMapping={showAttributeMapping} />
+    <Stack direction="column" gap={4}>
+      <LdapUserMappingInfo info={ldapUser.info} />
       <LdapUserPermissions permissions={ldapUser.permissions} />
-      {ldapUser.roles && ldapUser.roles.length > 0 && (
-        <LdapUserGroups groups={ldapUser.roles} showAttributeMapping={showAttributeMapping} />
-      )}
+      {ldapUser.roles && ldapUser.roles.length > 0 && <LdapUserGroups groups={ldapUser.roles} />}
 
       {ldapUser.teams && ldapUser.teams.length > 0 ? (
-        <LdapUserTeams teams={ldapUser.teams} showAttributeMapping={showAttributeMapping} />
+        <LdapUserTeams teams={ldapUser.teams} />
       ) : (
-        <div className="gf-form-group">
-          <div className="gf-form">
-            <table className="filter-table form-inline">
-              <tbody>
-                <tr>
-                  <td>No teams found via LDAP</td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </div>
+        <Box>
+          <Text>No teams found via LDAP</Text>
+        </Box>
       )}
-    </>
+    </Stack>
   );
 };
diff --git a/public/app/features/admin/ldap/LdapUserMappingInfo.tsx b/public/app/features/admin/ldap/LdapUserMappingInfo.tsx
index f762aefd44459..c4989e4bf4dcf 100644
--- a/public/app/features/admin/ldap/LdapUserMappingInfo.tsx
+++ b/public/app/features/admin/ldap/LdapUserMappingInfo.tsx
@@ -1,47 +1,56 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 
+import { InteractiveTable } from '@grafana/ui';
 import { LdapUserInfo } from 'app/types';
 
 interface Props {
   info: LdapUserInfo;
-  showAttributeMapping?: boolean;
 }
 
-export const LdapUserMappingInfo = ({ info, showAttributeMapping }: Props) => {
-  return (
-    <div className="gf-form-group">
-      <div className="gf-form">
-        <table className="filter-table form-inline">
-          <thead>
-            <tr>
-              <th colSpan={2}>User information</th>
-              {showAttributeMapping && <th>LDAP attribute</th>}
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td className="width-16">First name</td>
-              <td>{info.name.ldapValue}</td>
-              {showAttributeMapping && <td>{info.name.cfgAttrValue}</td>}
-            </tr>
-            <tr>
-              <td className="width-16">Surname</td>
-              <td>{info.surname.ldapValue}</td>
-              {showAttributeMapping && <td>{info.surname.cfgAttrValue}</td>}
-            </tr>
-            <tr>
-              <td className="width-16">Username</td>
-              <td>{info.login.ldapValue}</td>
-              {showAttributeMapping && <td>{info.login.cfgAttrValue}</td>}
-            </tr>
-            <tr>
-              <td className="width-16">Email</td>
-              <td>{info.email.ldapValue}</td>
-              {showAttributeMapping && <td>{info.email.cfgAttrValue}</td>}
-            </tr>
-          </tbody>
-        </table>
-      </div>
-    </div>
+export const LdapUserMappingInfo = ({ info }: Props) => {
+  const columns = useMemo(
+    () => [
+      {
+        id: 'userInfo',
+        header: 'User Information',
+        disableGrow: true,
+      },
+      {
+        id: 'ldapValue',
+      },
+      {
+        id: 'cfgAttrValue',
+        header: 'LDAP attribute',
+      },
+    ],
+    []
   );
+
+  const rows = useMemo(
+    () => [
+      {
+        userInfo: 'First name',
+        ldapValue: info.name.ldapValue,
+        cfgAttrValue: info.name.cfgAttrValue,
+      },
+      {
+        userInfo: 'Surname',
+        ldapValue: info.surname.ldapValue,
+        cfgAttrValue: info.surname.cfgAttrValue,
+      },
+      {
+        userInfo: 'Username',
+        ldapValue: info.login.ldapValue,
+        cfgAttrValue: info.login.cfgAttrValue,
+      },
+      {
+        userInfo: 'Email',
+        ldapValue: info.email.ldapValue,
+        cfgAttrValue: info.email.cfgAttrValue,
+      },
+    ],
+    [info]
+  );
+
+  return <InteractiveTable columns={columns} data={rows} getRowId={(row) => row.userInfo} />;
 };
diff --git a/public/app/features/admin/ldap/LdapUserPermissions.tsx b/public/app/features/admin/ldap/LdapUserPermissions.tsx
index f31d0410da8b4..d206ce2d03cf1 100644
--- a/public/app/features/admin/ldap/LdapUserPermissions.tsx
+++ b/public/app/features/admin/ldap/LdapUserPermissions.tsx
@@ -1,52 +1,59 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 
-import { Icon } from '@grafana/ui';
+import { Column, Icon, InteractiveTable } from '@grafana/ui';
 import { LdapPermissions } from 'app/types';
 
 interface Props {
   permissions: LdapPermissions;
 }
 
+interface TableRow {
+  permission: string;
+  value: React.ReactNode;
+}
+
 export const LdapUserPermissions = ({ permissions }: Props) => {
-  return (
-    <div className="gf-form-group">
-      <div className="gf-form">
-        <table className="filter-table form-inline">
-          <thead>
-            <tr>
-              <th colSpan={1}>Permissions</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td className="width-16"> Grafana admin</td>
-              <td>
-                {permissions.isGrafanaAdmin ? (
-                  <>
-                    <Icon name="shield" /> Yes
-                  </>
-                ) : (
-                  'No'
-                )}
-              </td>
-            </tr>
-            <tr>
-              <td className="width-16">Status</td>
-              <td>
-                {permissions.isDisabled ? (
-                  <>
-                    <Icon name="times" /> Inactive
-                  </>
-                ) : (
-                  <>
-                    <Icon name="check" /> Active
-                  </>
-                )}
-              </td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-    </div>
+  const columns = useMemo<Array<Column<TableRow>>>(
+    () => [
+      {
+        id: 'permission',
+        header: 'Permissions',
+        disableGrow: true,
+      },
+      {
+        id: 'value',
+      },
+    ],
+    []
   );
+
+  const data = useMemo<TableRow[]>(
+    () => [
+      {
+        permission: 'Grafana admin',
+        value: permissions.isGrafanaAdmin ? (
+          <>
+            <Icon name="shield" /> Yes
+          </>
+        ) : (
+          'No'
+        ),
+      },
+      {
+        permission: 'Status',
+        value: permissions.isDisabled ? (
+          <>
+            <Icon name="times" /> Inactive
+          </>
+        ) : (
+          <>
+            <Icon name="check" /> Active
+          </>
+        ),
+      },
+    ],
+    [permissions]
+  );
+
+  return <InteractiveTable data={data} columns={columns} getRowId={(row) => row.permission} />;
 };
diff --git a/public/app/features/admin/ldap/LdapUserTeams.tsx b/public/app/features/admin/ldap/LdapUserTeams.tsx
index b6edc7089dc6d..0df5926099cc7 100644
--- a/public/app/features/admin/ldap/LdapUserTeams.tsx
+++ b/public/app/features/admin/ldap/LdapUserTeams.tsx
@@ -1,59 +1,40 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 
-import { Tooltip, Icon } from '@grafana/ui';
+import { Column, InteractiveTable, CellProps } from '@grafana/ui';
 import { LdapTeam } from 'app/types';
 
 interface Props {
   teams: LdapTeam[];
-  showAttributeMapping?: boolean;
 }
 
-export const LdapUserTeams = ({ teams, showAttributeMapping }: Props) => {
-  const items = showAttributeMapping ? teams : teams.filter((item) => item.teamName);
-
-  return (
-    <div className="gf-form-group">
-      <div className="gf-form">
-        <table className="filter-table form-inline">
-          <thead>
-            <tr>
-              {showAttributeMapping && <th>LDAP Group</th>}
-              <th>Organisation</th>
-              <th>Team</th>
-            </tr>
-          </thead>
-          <tbody>
-            {items.map((team, index) => {
-              return (
-                <tr key={`${team.teamName}-${index}`}>
-                  {showAttributeMapping && (
-                    <>
-                      <td>{team.groupDN}</td>
-                      {!team.orgName && (
-                        <>
-                          <td />
-                          <td>
-                            <span className="text-warning">No match</span>
-                            <Tooltip placement="top" content="No matching teams found" theme={'info'}>
-                              <Icon name="info-circle" />
-                            </Tooltip>
-                          </td>
-                        </>
-                      )}
-                    </>
-                  )}
-                  {team.orgName && (
-                    <>
-                      <td>{team.orgName}</td>
-                      <td>{team.teamName}</td>
-                    </>
-                  )}
-                </tr>
-              );
-            })}
-          </tbody>
-        </table>
-      </div>
-    </div>
+export const LdapUserTeams = ({ teams }: Props) => {
+  const columns = useMemo<Array<Column<LdapTeam>>>(
+    () => [
+      {
+        id: 'groupDN',
+        header: 'LDAP Group',
+      },
+      {
+        id: 'orgName',
+        header: 'Organization',
+        cell: ({
+          row: {
+            original: { orgName },
+          },
+        }: CellProps<LdapTeam, void>) => <>{orgName || 'No matching teams found'}</>,
+      },
+      {
+        id: 'teamName',
+        header: 'Team',
+        cell: ({
+          row: {
+            original: { teamName, orgName },
+          },
+        }: CellProps<LdapTeam, void>) => (teamName && orgName ? teamName : ''),
+      },
+    ],
+    []
   );
+
+  return <InteractiveTable data={teams} columns={columns} getRowId={(row) => row.teamName} />;
 };
diff --git a/public/app/features/admin/state/actions.ts b/public/app/features/admin/state/actions.ts
index f1daa23c7234e..e83e9f188fe56 100644
--- a/public/app/features/admin/state/actions.ts
+++ b/public/app/features/admin/state/actions.ts
@@ -6,7 +6,15 @@ import { FetchDataArgs } from '@grafana/ui';
 import config from 'app/core/config';
 import { contextSrv } from 'app/core/core';
 import { accessControlQueryParam } from 'app/core/utils/accessControl';
-import { ThunkResult, LdapUser, UserSession, UserDTO, AccessControlAction, UserFilter } from 'app/types';
+import {
+  ThunkResult,
+  LdapUser,
+  UserSession,
+  UserDTO,
+  AccessControlAction,
+  UserFilter,
+  AnonUserFilter,
+} from 'app/types';
 
 import {
   userAdminPageLoadedAction,
@@ -28,6 +36,10 @@ import {
   usersFetchBegin,
   usersFetchEnd,
   sortChanged,
+  usersAnonymousDevicesFetched,
+  anonUserSortChanged,
+  anonPageChanged,
+  anonQueryChanged,
 } from './reducers';
 // UserAdminPage
 
@@ -334,3 +346,74 @@ export function changeSort({ sortBy }: FetchDataArgs<UserDTO>): ThunkResult<void
     }
   };
 }
+
+// UserListAnonymousPage
+const getAnonFilters = (filters: AnonUserFilter[]) => {
+  return filters
+    .map((filter) => {
+      if (Array.isArray(filter.value)) {
+        return filter.value.map((v) => `${filter.name}=${v.value}`).join('&');
+      }
+      return `${filter.name}=${filter.value}`;
+    })
+    .join('&');
+};
+
+export function fetchUsersAnonymousDevices(): ThunkResult<void> {
+  return async (dispatch, getState) => {
+    try {
+      const { perPage, page, query, filters, sort } = getState().userListAnonymousDevices;
+      let url = `/api/anonymous/search?perpage=${perPage}&page=${page}&query=${query}&${getAnonFilters(filters)}`;
+      if (sort) {
+        url += `&sort=${sort}`;
+      }
+      const result = await getBackendSrv().get(url);
+      dispatch(usersAnonymousDevicesFetched(result));
+    } catch (error) {
+      console.error(error);
+    }
+  };
+}
+
+const fetchAnonUsersWithDebounce = debounce((dispatch) => dispatch(fetchUsersAnonymousDevices()), 500);
+
+export function changeAnonUserSort({ sortBy }: FetchDataArgs<UserDTO>): ThunkResult<void> {
+  const sort = sortBy.length ? `${sortBy[0].id}-${sortBy[0].desc ? 'desc' : 'asc'}` : undefined;
+  return async (dispatch, getState) => {
+    const currentSort = getState().userListAnonymousDevices.sort;
+    if (currentSort !== sort) {
+      // dispatch(usersFetchBegin());
+      dispatch(anonUserSortChanged(sort));
+      dispatch(fetchUsersAnonymousDevices());
+    }
+  };
+}
+
+export function changeAnonQuery(query: string): ThunkResult<void> {
+  return async (dispatch) => {
+    // dispatch(usersFetchBegin());
+    dispatch(anonQueryChanged(query));
+    fetchAnonUsersWithDebounce(dispatch);
+  };
+}
+
+export function changeAnonPage(page: number): ThunkResult<void> {
+  return async (dispatch) => {
+    // dispatch(usersFetchBegin());
+    dispatch(anonPageChanged(page));
+    dispatch(fetchUsersAnonymousDevices());
+  };
+}
+
+// export function fetchUsersAnonymousDevices(): ThunkResult<void> {
+//   return async (dispatch, getState) => {
+//     try {
+//       let url = `/api/anonymous/devices`;
+//       const result = await getBackendSrv().get(url);
+//       dispatch(usersAnonymousDevicesFetched({ devices: result }));
+//     } catch (error) {
+//       usersFetchEnd();
+//       console.error(error);
+//     }
+//   };
+// }
diff --git a/public/app/features/admin/state/apis.tsx b/public/app/features/admin/state/apis.tsx
index 79c2061e4f534..a573d827ed6ea 100644
--- a/public/app/features/admin/state/apis.tsx
+++ b/public/app/features/admin/state/apis.tsx
@@ -1,6 +1,10 @@
 import { getBackendSrv } from '@grafana/runtime';
 
-export interface ServerStat {
+interface AnonServerStat {
+  activeDevices?: number;
+}
+
+export interface ServerStat extends AnonServerStat {
   activeAdmins: number;
   activeEditors: number;
   activeSessions: number;
diff --git a/public/app/features/admin/state/reducers.ts b/public/app/features/admin/state/reducers.ts
index f525c7612baa4..550e3de57b64c 100644
--- a/public/app/features/admin/state/reducers.ts
+++ b/public/app/features/admin/state/reducers.ts
@@ -13,6 +13,9 @@ import {
   UserSession,
   UserListAdminState,
   UserFilter,
+  UserListAnonymousDevicesState,
+  UserAnonymousDeviceDTO,
+  AnonUserFilter,
 } from 'app/types';
 
 const initialLdapState: LdapState = {
@@ -201,8 +204,81 @@ export const { usersFetched, usersFetchBegin, usersFetchEnd, queryChanged, pageC
   userListAdminSlice.actions;
 export const userListAdminReducer = userListAdminSlice.reducer;
 
+// UserListAnonymousPage
+
+const initialUserListAnonymousDevicesState: UserListAnonymousDevicesState = {
+  devices: [],
+  query: '',
+  page: 0,
+  perPage: 50,
+  totalPages: 1,
+  showPaging: false,
+  filters: [{ name: 'activeLast30Days', value: true }],
+};
+
+interface UsersAnonymousDevicesFetched {
+  devices: UserAnonymousDeviceDTO[];
+  perPage: number;
+  page: number;
+  totalCount: number;
+}
+
+export const userListAnonymousDevicesSlice = createSlice({
+  name: 'userListAnonymousDevices',
+  initialState: initialUserListAnonymousDevicesState,
+  reducers: {
+    usersAnonymousDevicesFetched: (state, action: PayloadAction<UsersAnonymousDevicesFetched>) => {
+      const { totalCount, perPage, ...rest } = action.payload;
+      const totalPages = Math.ceil(totalCount / perPage);
+
+      return {
+        ...state,
+        ...rest,
+        totalPages,
+        perPage,
+        showPaging: totalPages > 1,
+      };
+    },
+    anonQueryChanged: (state, action: PayloadAction<string>) => ({
+      ...state,
+      query: action.payload,
+      page: 0,
+    }),
+    anonPageChanged: (state, action: PayloadAction<number>) => ({
+      ...state,
+      page: action.payload,
+    }),
+    anonUserSortChanged: (state, action: PayloadAction<UserListAnonymousDevicesState['sort']>) => ({
+      ...state,
+      page: 0,
+      sort: action.payload,
+    }),
+    filterChanged: (state, action: PayloadAction<AnonUserFilter>) => {
+      const { name, value } = action.payload;
+
+      if (state.filters.some((filter) => filter.name === name)) {
+        return {
+          ...state,
+          page: 0,
+          filters: state.filters.map((filter) => (filter.name === name ? { ...filter, value } : filter)),
+        };
+      }
+      return {
+        ...state,
+        page: 0,
+        filters: [...state.filters, action.payload],
+      };
+    },
+  },
+});
+
+export const { usersAnonymousDevicesFetched, anonUserSortChanged, anonPageChanged, anonQueryChanged } =
+  userListAnonymousDevicesSlice.actions;
+export const userListAnonymousDevicesReducer = userListAnonymousDevicesSlice.reducer;
+
 export default {
   ldap: ldapReducer,
   userAdmin: userAdminReducer,
   userListAdmin: userListAdminReducer,
+  userListAnonymousDevices: userListAnonymousDevicesReducer,
 };
diff --git a/public/app/features/alerting/AlertHowToModal.tsx b/public/app/features/alerting/AlertHowToModal.tsx
deleted file mode 100644
index 9de9bcf7eda2c..0000000000000
--- a/public/app/features/alerting/AlertHowToModal.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import React from 'react';
-
-import { Modal, VerticalGroup } from '@grafana/ui';
-
-export interface AlertHowToModalProps {
-  onDismiss: () => void;
-}
-
-export function AlertHowToModal({ onDismiss }: AlertHowToModalProps): JSX.Element {
-  return (
-    <Modal title="Adding an Alert" isOpen onDismiss={onDismiss} onClickBackdrop={onDismiss}>
-      <VerticalGroup spacing="sm">
-        <img src="public/img/alert_howto_new.png" alt="" />
-        <p>
-          Alerts are added and configured in the Alert tab of any dashboard graph panel, letting you build and visualize
-          an alert using existing queries.
-        </p>
-        <p>Remember to save the dashboard to persist your alert rule changes.</p>
-      </VerticalGroup>
-    </Modal>
-  );
-}
diff --git a/public/app/features/alerting/AlertRuleItem.test.tsx b/public/app/features/alerting/AlertRuleItem.test.tsx
deleted file mode 100644
index 9236a78442736..0000000000000
--- a/public/app/features/alerting/AlertRuleItem.test.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { render, screen, fireEvent } from '@testing-library/react';
-import React from 'react';
-
-import AlertRuleItem, { Props } from './AlertRuleItem';
-
-const setup = (propOverrides?: object) => {
-  const props: Props = {
-    rule: {
-      id: 1,
-      dashboardId: 1,
-      panelId: 1,
-      name: 'Some rule',
-      state: 'Open',
-      stateText: 'state text',
-      stateIcon: 'anchor',
-      stateClass: 'state class',
-      stateAge: 'age',
-      url: 'https://something.something.darkside',
-    },
-    search: '',
-    onTogglePause: jest.fn(),
-  };
-
-  Object.assign(props, propOverrides);
-
-  return render(<AlertRuleItem {...props} />);
-};
-
-describe('AlertRuleItem', () => {
-  it('should render component', () => {
-    const mockToggle = jest.fn();
-    setup({ onTogglePause: mockToggle });
-
-    expect(screen.getByText('Some rule')).toBeInTheDocument();
-    expect(screen.getByText('state text')).toBeInTheDocument();
-    expect(screen.getByText('Pause')).toBeInTheDocument();
-    expect(screen.getByText('Edit alert')).toBeInTheDocument();
-
-    fireEvent.click(screen.getByText('Pause'));
-    expect(mockToggle).toHaveBeenCalled();
-  });
-});
diff --git a/public/app/features/alerting/AlertRuleItem.tsx b/public/app/features/alerting/AlertRuleItem.tsx
deleted file mode 100644
index 16949dcb034ca..0000000000000
--- a/public/app/features/alerting/AlertRuleItem.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import React, { useCallback } from 'react';
-import Highlighter from 'react-highlight-words';
-
-import { Icon, Button, LinkButton, Card } from '@grafana/ui';
-
-import { AlertRule } from '../../types';
-
-export interface Props {
-  rule: AlertRule;
-  search: string;
-  onTogglePause: () => void;
-}
-
-const AlertRuleItem = ({ rule, search, onTogglePause }: Props) => {
-  const ruleUrl = `${rule.url}?editPanel=${rule.panelId}&tab=alert`;
-  const renderText = useCallback(
-    (text: string) => (
-      <Highlighter
-        key={text}
-        highlightClassName="highlight-search-match"
-        textToHighlight={text}
-        searchWords={[search]}
-      />
-    ),
-    [search]
-  );
-
-  return (
-    <Card>
-      <Card.Heading>{renderText(rule.name)}</Card.Heading>
-      <Card.Figure>
-        <Icon size="xl" name={rule.stateIcon} className={`alert-rule-item__icon ${rule.stateClass}`} />
-      </Card.Figure>
-      <Card.Meta>
-        <span key="state">
-          <span key="text" className={`${rule.stateClass}`}>
-            {renderText(rule.stateText)}{' '}
-          </span>
-          for {rule.stateAge}
-        </span>
-        {rule.info ? renderText(rule.info) : null}
-      </Card.Meta>
-      <Card.Actions>
-        <Button
-          key="play"
-          variant="secondary"
-          icon={rule.state === 'paused' ? 'play' : 'pause'}
-          onClick={onTogglePause}
-        >
-          {rule.state === 'paused' ? 'Resume' : 'Pause'}
-        </Button>
-        <LinkButton key="edit" variant="secondary" href={ruleUrl} icon="cog">
-          Edit alert
-        </LinkButton>
-      </Card.Actions>
-    </Card>
-  );
-};
-
-export default AlertRuleItem;
diff --git a/public/app/features/alerting/AlertRuleList.test.tsx b/public/app/features/alerting/AlertRuleList.test.tsx
deleted file mode 100644
index df8f7c795de70..0000000000000
--- a/public/app/features/alerting/AlertRuleList.test.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import React from 'react';
-import { openMenu } from 'react-select-event';
-import { mockToolkitActionCreator } from 'test/core/redux/mocks';
-import { TestProvider } from 'test/helpers/TestProvider';
-
-import { locationService } from '@grafana/runtime';
-import { getRouteComponentProps } from 'app/core/navigation/__mocks__/routeProps';
-
-import appEvents from '../../core/app_events';
-import { ShowModalReactEvent } from '../../types/events';
-
-import { AlertHowToModal } from './AlertHowToModal';
-import { AlertRuleListUnconnected, Props } from './AlertRuleList';
-import { setSearchQuery } from './state/reducers';
-
-jest.mock('../../core/app_events', () => ({
-  publish: jest.fn(),
-}));
-
-const defaultProps: Props = {
-  ...getRouteComponentProps({}),
-  search: '',
-  isLoading: false,
-  alertRules: [],
-  getAlertRulesAsync: jest.fn().mockResolvedValue([]),
-  setSearchQuery: mockToolkitActionCreator(setSearchQuery),
-  togglePauseAlertRule: jest.fn(),
-};
-
-const setup = (propOverrides?: object) => {
-  const props: Props = {
-    ...defaultProps,
-    ...propOverrides,
-  };
-
-  const { rerender } = render(
-    <TestProvider>
-      <AlertRuleListUnconnected {...props} />
-    </TestProvider>
-  );
-
-  return {
-    rerender: (element: JSX.Element) => rerender(<TestProvider>{element}</TestProvider>),
-  };
-};
-
-afterEach(() => {
-  jest.clearAllMocks();
-});
-
-describe('AlertRuleList', () => {
-  it('should call fetchrules when mounting', () => {
-    jest.spyOn(AlertRuleListUnconnected.prototype, 'fetchRules');
-
-    expect(AlertRuleListUnconnected.prototype.fetchRules).not.toHaveBeenCalled();
-    setup();
-    expect(AlertRuleListUnconnected.prototype.fetchRules).toHaveBeenCalled();
-  });
-
-  it('should call fetchrules when props change', () => {
-    const fetchRulesSpy = jest.spyOn(AlertRuleListUnconnected.prototype, 'fetchRules');
-    expect(AlertRuleListUnconnected.prototype.fetchRules).not.toHaveBeenCalled();
-    const { rerender } = setup();
-    expect(AlertRuleListUnconnected.prototype.fetchRules).toHaveBeenCalled();
-
-    fetchRulesSpy.mockReset();
-    rerender(<AlertRuleListUnconnected {...defaultProps} queryParams={{ state: 'ok' }} />);
-    expect(AlertRuleListUnconnected.prototype.fetchRules).toHaveBeenCalled();
-  });
-
-  describe('Get state filter', () => {
-    it('should be all if prop is not set', () => {
-      setup();
-      expect(screen.getByText('All')).toBeInTheDocument();
-    });
-
-    it('should return state filter if set', () => {
-      setup({
-        queryParams: { state: 'not_ok' },
-      });
-      expect(screen.getByText('Not OK')).toBeInTheDocument();
-    });
-  });
-
-  describe('State filter changed', () => {
-    it('should update location', async () => {
-      setup();
-      const stateFilterSelect = screen.getByLabelText('States');
-      openMenu(stateFilterSelect);
-      await userEvent.click(screen.getByText('Not OK'));
-      expect(locationService.getSearchObject().state).toBe('not_ok');
-    });
-  });
-
-  describe('Open how to', () => {
-    it('should emit show-modal event', async () => {
-      setup();
-
-      await userEvent.click(screen.getByRole('button', { name: 'How to add an alert' }));
-      expect(appEvents.publish).toHaveBeenCalledWith(new ShowModalReactEvent({ component: AlertHowToModal }));
-    });
-  });
-
-  describe('Search query change', () => {
-    it('should set search query', async () => {
-      setup();
-
-      await userEvent.click(screen.getByPlaceholderText('Search alerts'));
-      await userEvent.paste('dashboard');
-      expect(defaultProps.setSearchQuery).toHaveBeenCalledWith('dashboard');
-    });
-  });
-});
diff --git a/public/app/features/alerting/AlertRuleList.tsx b/public/app/features/alerting/AlertRuleList.tsx
deleted file mode 100644
index 55dc35d0ca21a..0000000000000
--- a/public/app/features/alerting/AlertRuleList.tsx
+++ /dev/null
@@ -1,147 +0,0 @@
-import React, { PureComponent } from 'react';
-import { connect, ConnectedProps } from 'react-redux';
-
-import { SelectableValue } from '@grafana/data';
-import { config, locationService } from '@grafana/runtime';
-import { Button, FilterInput, LinkButton, Select, VerticalGroup } from '@grafana/ui';
-import appEvents from 'app/core/app_events';
-import { Page } from 'app/core/components/Page/Page';
-import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
-import { AlertRule, StoreState } from 'app/types';
-
-import { ShowModalReactEvent } from '../../types/events';
-
-import { AlertHowToModal } from './AlertHowToModal';
-import AlertRuleItem from './AlertRuleItem';
-import { DeprecationNotice } from './components/DeprecationNotice';
-import { getAlertRulesAsync, togglePauseAlertRule } from './state/actions';
-import { setSearchQuery } from './state/reducers';
-import { getAlertRuleItems, getSearchQuery } from './state/selectors';
-
-function mapStateToProps(state: StoreState) {
-  return {
-    alertRules: getAlertRuleItems(state),
-    search: getSearchQuery(state.alertRules),
-    isLoading: state.alertRules.isLoading,
-  };
-}
-
-const mapDispatchToProps = {
-  getAlertRulesAsync,
-  setSearchQuery,
-  togglePauseAlertRule,
-};
-
-const connector = connect(mapStateToProps, mapDispatchToProps);
-
-interface OwnProps extends GrafanaRouteComponentProps<{}, { state: string }> {}
-
-export type Props = OwnProps & ConnectedProps<typeof connector>;
-
-export class AlertRuleListUnconnected extends PureComponent<Props> {
-  stateFilters = [
-    { label: 'All', value: 'all' },
-    { label: 'OK', value: 'ok' },
-    { label: 'Not OK', value: 'not_ok' },
-    { label: 'Alerting', value: 'alerting' },
-    { label: 'No data', value: 'no_data' },
-    { label: 'Paused', value: 'paused' },
-    { label: 'Pending', value: 'pending' },
-  ];
-
-  componentDidMount() {
-    this.fetchRules();
-  }
-
-  componentDidUpdate(prevProps: Props) {
-    if (prevProps.queryParams.state !== this.props.queryParams.state) {
-      this.fetchRules();
-    }
-  }
-
-  async fetchRules() {
-    await this.props.getAlertRulesAsync({ state: this.getStateFilter() });
-  }
-
-  getStateFilter(): string {
-    return this.props.queryParams.state ?? 'all';
-  }
-
-  onStateFilterChanged = (option: SelectableValue) => {
-    locationService.partial({ state: option.value });
-  };
-
-  onOpenHowTo = () => {
-    appEvents.publish(new ShowModalReactEvent({ component: AlertHowToModal }));
-  };
-
-  onSearchQueryChange = (value: string) => {
-    this.props.setSearchQuery(value);
-  };
-
-  onTogglePause = (rule: AlertRule) => {
-    this.props.togglePauseAlertRule(rule.id, { paused: rule.state !== 'paused' });
-  };
-
-  alertStateFilterOption = ({ text, value }: { text: string; value: string }) => {
-    return (
-      <option key={value} value={value}>
-        {text}
-      </option>
-    );
-  };
-
-  render() {
-    const { alertRules, search, isLoading } = this.props;
-
-    return (
-      <Page navId="alert-list">
-        <Page.Contents isLoading={isLoading}>
-          <div className="page-action-bar">
-            <div className="gf-form gf-form--grow">
-              <FilterInput placeholder="Search alerts" value={search} onChange={this.onSearchQueryChange} />
-            </div>
-            <div className="gf-form">
-              <label className="gf-form-label" htmlFor="alert-state-filter">
-                States
-              </label>
-
-              <div className="width-13">
-                <Select
-                  inputId={'alert-state-filter'}
-                  options={this.stateFilters}
-                  onChange={this.onStateFilterChanged}
-                  value={this.getStateFilter()}
-                />
-              </div>
-            </div>
-            <div className="page-action-bar__spacer" />
-            {config.unifiedAlertingEnabled && (
-              <LinkButton variant="primary" href="alerting/ng/new">
-                Add NG Alert
-              </LinkButton>
-            )}
-            <Button variant="secondary" onClick={this.onOpenHowTo}>
-              How to add an alert
-            </Button>
-          </div>
-          <DeprecationNotice />
-          <VerticalGroup spacing="none">
-            {alertRules.map((rule) => {
-              return (
-                <AlertRuleItem
-                  rule={rule}
-                  key={rule.id}
-                  search={search}
-                  onTogglePause={() => this.onTogglePause(rule)}
-                />
-              );
-            })}
-          </VerticalGroup>
-        </Page.Contents>
-      </Page>
-    );
-  }
-}
-
-export default connector(AlertRuleListUnconnected);
diff --git a/public/app/features/alerting/AlertTab.tsx b/public/app/features/alerting/AlertTab.tsx
deleted file mode 100644
index f979e8e26a530..0000000000000
--- a/public/app/features/alerting/AlertTab.tsx
+++ /dev/null
@@ -1,275 +0,0 @@
-import React, { PureComponent } from 'react';
-import { connect, MapDispatchToProps, MapStateToProps } from 'react-redux';
-
-import { EventBusSrv } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
-import { AngularComponent, config, getAngularLoader, getDataSourceSrv } from '@grafana/runtime';
-import { Alert, Button, ConfirmModal, Container, CustomScrollbar, HorizontalGroup, Modal } from '@grafana/ui';
-import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
-import { getPanelStateForModel } from 'app/features/panel/state/selectors';
-import { AppNotificationSeverity, StoreState } from 'app/types';
-
-import { AlertState } from '../../plugins/datasource/alertmanager/types';
-import { PanelNotSupported } from '../dashboard/components/PanelEditor/PanelNotSupported';
-import { DashboardModel } from '../dashboard/state/DashboardModel';
-import { PanelModel } from '../dashboard/state/PanelModel';
-
-import StateHistory from './StateHistory';
-import { TestRuleResult } from './TestRuleResult';
-import { getAlertingValidationMessage } from './getAlertingValidationMessage';
-
-interface AngularPanelController {
-  _enableAlert: () => void;
-  alertState: AlertState | null;
-  render: () => void;
-  refresh: () => void;
-}
-
-interface OwnProps {
-  dashboard: DashboardModel;
-  panel: PanelModel;
-}
-
-interface ConnectedProps {
-  angularPanelComponent?: AngularComponent | null;
-}
-
-interface DispatchProps {}
-
-export type Props = OwnProps & ConnectedProps & DispatchProps;
-
-interface State {
-  validationMessage: string;
-  showStateHistory: boolean;
-  showDeleteConfirmation: boolean;
-  showTestRule: boolean;
-}
-
-class UnConnectedAlertTab extends PureComponent<Props, State> {
-  element?: HTMLDivElement | null;
-  component?: AngularComponent;
-  panelCtrl?: AngularPanelController;
-
-  state: State = {
-    validationMessage: '',
-    showStateHistory: false,
-    showDeleteConfirmation: false,
-    showTestRule: false,
-  };
-
-  async componentDidMount() {
-    if (config.angularSupportEnabled) {
-      await import(/* webpackChunkName: "AlertTabCtrl" */ 'app/features/alerting/AlertTabCtrl');
-      this.loadAlertTab();
-    } else {
-      // TODO probably need to migrate AlertTab to react
-      alert('Angular support disabled, legacy alerting cannot function without angular support');
-    }
-  }
-
-  onAngularPanelUpdated = () => {
-    this.forceUpdate();
-  };
-
-  componentDidUpdate(prevProps: Props) {
-    this.loadAlertTab();
-  }
-
-  componentWillUnmount() {
-    if (this.component) {
-      this.component.destroy();
-    }
-  }
-
-  async loadAlertTab() {
-    const { panel, angularPanelComponent } = this.props;
-
-    if (!this.element || this.component) {
-      return;
-    }
-
-    if (angularPanelComponent) {
-      const scope = angularPanelComponent.getScope();
-
-      // When full page reloading in edit mode the angular panel has on fully compiled & instantiated yet
-      if (!scope.$$childHead) {
-        setTimeout(() => {
-          this.forceUpdate();
-        });
-        return;
-      }
-
-      this.panelCtrl = scope.$$childHead.ctrl;
-    } else {
-      this.panelCtrl = this.getReactAlertPanelCtrl();
-    }
-
-    const loader = getAngularLoader();
-    const template = '<alert-tab />';
-    const scopeProps = { ctrl: this.panelCtrl };
-
-    this.component = loader.load(this.element, scopeProps, template);
-
-    const validationMessage = await getAlertingValidationMessage(
-      panel.transformations,
-      panel.targets,
-      getDataSourceSrv(),
-      panel.datasource
-    );
-
-    if (validationMessage) {
-      this.setState({ validationMessage });
-    }
-  }
-
-  getReactAlertPanelCtrl() {
-    return {
-      panel: this.props.panel,
-      events: new EventBusSrv(),
-      render: () => {
-        this.props.panel.render();
-      },
-    } as any;
-  }
-
-  onAddAlert = () => {
-    this.panelCtrl?._enableAlert();
-    this.component?.digest();
-    this.forceUpdate();
-  };
-
-  onToggleModal = (prop: keyof Omit<State, 'validationMessage'>) => {
-    const value = this.state[prop];
-    this.setState({ ...this.state, [prop]: !value });
-  };
-
-  renderTestRule = () => {
-    if (!this.state.showTestRule) {
-      return null;
-    }
-
-    const { panel, dashboard } = this.props;
-    const onDismiss = () => this.onToggleModal('showTestRule');
-
-    return (
-      <Modal isOpen={true} icon="bug" title="Testing rule" onDismiss={onDismiss} onClickBackdrop={onDismiss}>
-        <TestRuleResult panel={panel} dashboard={dashboard} />
-      </Modal>
-    );
-  };
-
-  renderDeleteConfirmation = () => {
-    if (!this.state.showDeleteConfirmation) {
-      return null;
-    }
-
-    const { panel } = this.props;
-    const onDismiss = () => this.onToggleModal('showDeleteConfirmation');
-
-    return (
-      <ConfirmModal
-        isOpen={true}
-        icon="trash-alt"
-        title="Delete"
-        body={
-          <div>
-            Are you sure you want to delete this alert rule?
-            <br />
-            <small>You need to save dashboard for the delete to take effect.</small>
-          </div>
-        }
-        confirmText="Delete alert"
-        onDismiss={onDismiss}
-        onConfirm={() => {
-          delete panel.alert;
-          panel.thresholds = [];
-          if (this.panelCtrl) {
-            this.panelCtrl.alertState = null;
-            this.panelCtrl.render();
-          }
-          this.component?.digest();
-          onDismiss();
-        }}
-      />
-    );
-  };
-
-  renderStateHistory = () => {
-    if (!this.state.showStateHistory) {
-      return null;
-    }
-
-    const { panel, dashboard } = this.props;
-    const onDismiss = () => this.onToggleModal('showStateHistory');
-
-    return (
-      <Modal isOpen={true} icon="history" title="State history" onDismiss={onDismiss} onClickBackdrop={onDismiss}>
-        <StateHistory dashboard={dashboard} panelId={panel.id} onRefresh={() => this.panelCtrl?.refresh()} />
-      </Modal>
-    );
-  };
-
-  render() {
-    const { alert, transformations } = this.props.panel;
-    const { validationMessage } = this.state;
-    const hasTransformations = transformations && transformations.length > 0;
-
-    if (!alert && validationMessage) {
-      return <PanelNotSupported message={validationMessage} />;
-    }
-
-    const model = {
-      title: 'Panel has no alert rule defined',
-      buttonIcon: 'bell' as const,
-      onClick: this.onAddAlert,
-      buttonTitle: 'Create Alert',
-    };
-
-    return (
-      <>
-        <CustomScrollbar autoHeightMin="100%">
-          <Container padding="md">
-            <div aria-label={selectors.components.AlertTab.content}>
-              {alert && hasTransformations && (
-                <Alert
-                  severity={AppNotificationSeverity.Error}
-                  title="Transformations are not supported in alert queries"
-                />
-              )}
-
-              <div ref={(element) => (this.element = element)} />
-              {alert && (
-                <HorizontalGroup>
-                  <Button onClick={() => this.onToggleModal('showStateHistory')} variant="secondary">
-                    State history
-                  </Button>
-                  <Button onClick={() => this.onToggleModal('showTestRule')} variant="secondary">
-                    Test rule
-                  </Button>
-                  <Button onClick={() => this.onToggleModal('showDeleteConfirmation')} variant="destructive">
-                    Delete
-                  </Button>
-                </HorizontalGroup>
-              )}
-              {!alert && !validationMessage && <EmptyListCTA {...model} />}
-            </div>
-          </Container>
-        </CustomScrollbar>
-
-        {this.renderTestRule()}
-        {this.renderDeleteConfirmation()}
-        {this.renderStateHistory()}
-      </>
-    );
-  }
-}
-
-const mapStateToProps: MapStateToProps<ConnectedProps, OwnProps, StoreState> = (state, props) => {
-  return {
-    angularPanelComponent: getPanelStateForModel(state, props.panel)?.angularComponent,
-  };
-};
-
-const mapDispatchToProps: MapDispatchToProps<DispatchProps, OwnProps> = {};
-
-export const AlertTab = connect(mapStateToProps, mapDispatchToProps)(UnConnectedAlertTab);
diff --git a/public/app/features/alerting/AlertTabCtrl.test.ts b/public/app/features/alerting/AlertTabCtrl.test.ts
deleted file mode 100644
index 7eb6012815fac..0000000000000
--- a/public/app/features/alerting/AlertTabCtrl.test.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { DashboardSrv } from '../dashboard/services/DashboardSrv';
-import { DatasourceSrv } from '../plugins/datasource_srv';
-
-import { AlertTabCtrl } from './AlertTabCtrl';
-
-interface Args {
-  notifications?: Array<{ uid?: string; id?: number; isDefault: boolean }>;
-}
-
-function setupTestContext({ notifications = [] }: Args = {}) {
-  const panel = {
-    alert: { notifications },
-    options: [],
-    title: 'Testing Alerts',
-  };
-  const $scope = {
-    ctrl: {
-      panel,
-      render: jest.fn(),
-    },
-  };
-  const dashboardSrv = {} as DashboardSrv;
-  const uiSegmentSrv = {};
-  const datasourceSrv = {} as DatasourceSrv;
-
-  const controller = new AlertTabCtrl($scope, dashboardSrv, uiSegmentSrv, datasourceSrv);
-  controller.notifications = notifications;
-  controller.alertNotifications = [];
-  controller.initModel();
-
-  return { controller };
-}
-
-describe('AlertTabCtrl', () => {
-  describe('when removeNotification is called with an uid', () => {
-    it('then the correct notifier should be removed', () => {
-      const { controller } = setupTestContext({
-        notifications: [
-          { id: 1, uid: 'one', isDefault: true },
-          { id: 2, uid: 'two', isDefault: false },
-        ],
-      });
-
-      expect(controller.alert.notifications).toEqual([
-        { id: 1, uid: 'one', isDefault: true, iconClass: 'bell' },
-        { id: 2, uid: 'two', isDefault: false, iconClass: 'bell' },
-      ]);
-      expect(controller.alertNotifications).toEqual([
-        { id: 2, uid: 'two', isDefault: false, iconClass: 'bell' },
-        { id: 1, uid: 'one', isDefault: true, iconClass: 'bell' },
-      ]);
-
-      controller.removeNotification({ uid: 'one' });
-
-      expect(controller.alert.notifications).toEqual([{ id: 2, uid: 'two', isDefault: false, iconClass: 'bell' }]);
-      expect(controller.alertNotifications).toEqual([{ id: 2, uid: 'two', isDefault: false, iconClass: 'bell' }]);
-    });
-  });
-
-  describe('when removeNotification is called with an id', () => {
-    it('then the correct notifier should be removed', () => {
-      const { controller } = setupTestContext({
-        notifications: [
-          { id: 1, uid: 'one', isDefault: true },
-          { id: 2, uid: 'two', isDefault: false },
-        ],
-      });
-
-      expect(controller.alert.notifications).toEqual([
-        { id: 1, uid: 'one', isDefault: true, iconClass: 'bell' },
-        { id: 2, uid: 'two', isDefault: false, iconClass: 'bell' },
-      ]);
-      expect(controller.alertNotifications).toEqual([
-        { id: 2, uid: 'two', isDefault: false, iconClass: 'bell' },
-        { id: 1, uid: 'one', isDefault: true, iconClass: 'bell' },
-      ]);
-
-      controller.removeNotification({ id: 2 });
-
-      expect(controller.alert.notifications).toEqual([{ id: 1, uid: 'one', isDefault: true, iconClass: 'bell' }]);
-      expect(controller.alertNotifications).toEqual([{ id: 1, uid: 'one', isDefault: true, iconClass: 'bell' }]);
-    });
-  });
-});
diff --git a/public/app/features/alerting/AlertTabCtrl.ts b/public/app/features/alerting/AlertTabCtrl.ts
deleted file mode 100644
index ad1b5a58bb09a..0000000000000
--- a/public/app/features/alerting/AlertTabCtrl.ts
+++ /dev/null
@@ -1,526 +0,0 @@
-import { find, map, reduce, remove } from 'lodash';
-
-import { DataQuery, DataSourceApi, rangeUtil } from '@grafana/data';
-import { getBackendSrv } from '@grafana/runtime';
-import coreModule from 'app/angular/core_module';
-import { promiseToDigest } from 'app/angular/promiseToDigest';
-import appEvents from 'app/core/app_events';
-import config from 'app/core/config';
-import { QueryPart } from 'app/features/alerting/state/query_part';
-import { PanelModel } from 'app/features/dashboard/state';
-import { CoreEvents } from 'app/types';
-
-import { ShowConfirmModalEvent } from '../../types/events';
-import { DashboardSrv } from '../dashboard/services/DashboardSrv';
-import { DatasourceSrv } from '../plugins/datasource_srv';
-
-import { getDefaultCondition } from './getAlertingValidationMessage';
-import { ThresholdMapper } from './state/ThresholdMapper';
-import alertDef from './state/alertDef';
-
-export class AlertTabCtrl {
-  panel: PanelModel;
-  panelCtrl: any;
-  subTabIndex: number;
-  conditionTypes: any;
-  alert: any;
-  conditionModels: any;
-  evalFunctions: any;
-  evalOperators: any;
-  noDataModes: any;
-  executionErrorModes: any;
-  addNotificationSegment: any;
-  notifications: any;
-  alertNotifications: any;
-  error?: string;
-  appSubUrl: string;
-  alertHistory: any;
-  newAlertRuleTag: any;
-  alertingMinIntervalSecs: number;
-  alertingMinInterval: string;
-  frequencyWarning: any;
-
-  static $inject = ['$scope', 'dashboardSrv', 'uiSegmentSrv', 'datasourceSrv'];
-
-  constructor(
-    private $scope: any,
-    private dashboardSrv: DashboardSrv,
-    private uiSegmentSrv: any,
-    private datasourceSrv: DatasourceSrv
-  ) {
-    this.panelCtrl = $scope.ctrl;
-    this.panel = this.panelCtrl.panel;
-    this.$scope.ctrl = this;
-    this.subTabIndex = 0;
-    this.evalFunctions = alertDef.evalFunctions;
-    this.evalOperators = alertDef.evalOperators;
-    this.conditionTypes = alertDef.conditionTypes;
-    this.noDataModes = alertDef.noDataModes;
-    this.executionErrorModes = alertDef.executionErrorModes;
-    this.appSubUrl = config.appSubUrl;
-    this.panelCtrl._enableAlert = this.enable;
-    this.alertingMinIntervalSecs = config.alertingMinInterval;
-    this.alertingMinInterval = rangeUtil.secondsToHms(config.alertingMinInterval);
-  }
-
-  $onInit() {
-    this.addNotificationSegment = this.uiSegmentSrv.newPlusButton();
-
-    // subscribe to graph threshold handle changes
-    const thresholdChangedEventHandler = this.graphThresholdChanged.bind(this);
-    this.panelCtrl.events.on(CoreEvents.thresholdChanged, thresholdChangedEventHandler);
-
-    // set panel alert edit mode
-    this.$scope.$on('$destroy', () => {
-      this.panelCtrl.events.off(CoreEvents.thresholdChanged, thresholdChangedEventHandler);
-      this.panelCtrl.editingThresholds = false;
-      this.panelCtrl.render();
-    });
-
-    // build notification model
-    this.notifications = [];
-    this.alertNotifications = [];
-    this.alertHistory = [];
-
-    return promiseToDigest(this.$scope)(
-      getBackendSrv()
-        .get('/api/alert-notifications/lookup')
-        .then((res: any) => {
-          this.notifications = res;
-
-          this.initModel();
-          this.validateModel();
-        })
-    );
-  }
-
-  getAlertHistory() {
-    promiseToDigest(this.$scope)(
-      getBackendSrv()
-        .get(`/api/annotations?dashboardId=${this.panelCtrl.dashboard.id}&panelId=${this.panel.id}&limit=50&type=alert`)
-        .then((res: any) => {
-          this.alertHistory = map(res, (ah) => {
-            ah.time = this.dashboardSrv.getCurrent()?.formatDate(ah.time, 'MMM D, YYYY HH:mm:ss');
-            ah.stateModel = alertDef.getStateDisplayModel(ah.newState);
-            ah.info = alertDef.getAlertAnnotationInfo(ah);
-            return ah;
-          });
-        })
-    );
-  }
-
-  getNotificationIcon(type: string): string {
-    switch (type) {
-      case 'email':
-        return 'envelope';
-      case 'slack':
-        return 'slack';
-      case 'victorops':
-        return 'fa fa-pagelines';
-      case 'webhook':
-        return 'cube';
-      case 'pagerduty':
-        return 'fa fa-bullhorn';
-      case 'opsgenie':
-        return 'bell';
-      case 'hipchat':
-        return 'fa fa-mail-forward';
-      case 'pushover':
-        return 'mobile-android';
-      case 'kafka':
-        return 'arrow-random';
-      case 'teams':
-        return 'fa fa-windows';
-    }
-    return 'bell';
-  }
-
-  getNotifications() {
-    return Promise.resolve(
-      this.notifications.map((item: any) => {
-        return this.uiSegmentSrv.newSegment(item.name);
-      })
-    );
-  }
-
-  notificationAdded() {
-    const model: any = find(this.notifications, {
-      name: this.addNotificationSegment.value,
-    });
-    if (!model) {
-      return;
-    }
-
-    this.alertNotifications.push({
-      name: model.name,
-      iconClass: this.getNotificationIcon(model.type),
-      isDefault: false,
-      uid: model.uid,
-    });
-
-    // avoid duplicates using both id and uid to be backwards compatible.
-    if (!find(this.alert.notifications, (n) => n.id === model.id || n.uid === model.uid)) {
-      this.alert.notifications.push({ uid: model.uid });
-    }
-
-    // reset plus button
-    this.addNotificationSegment.value = this.uiSegmentSrv.newPlusButton().value;
-    this.addNotificationSegment.html = this.uiSegmentSrv.newPlusButton().html;
-    this.addNotificationSegment.fake = true;
-  }
-
-  removeNotification(an: any) {
-    // remove notifiers referred to by id and uid to support notifiers added
-    // before and after we added support for uid
-    remove(this.alert.notifications, (n: any) => n.uid === an.uid || n.id === an.id);
-    remove(this.alertNotifications, (n: any) => n.uid === an.uid || n.id === an.id);
-  }
-
-  addAlertRuleTag() {
-    if (this.newAlertRuleTag.name) {
-      this.alert.alertRuleTags[this.newAlertRuleTag.name] = this.newAlertRuleTag.value;
-    }
-    this.newAlertRuleTag.name = '';
-    this.newAlertRuleTag.value = '';
-  }
-
-  removeAlertRuleTag(tagName: string) {
-    delete this.alert.alertRuleTags[tagName];
-  }
-
-  initModel() {
-    const alert = (this.alert = this.panel.alert);
-    if (!alert) {
-      return;
-    }
-
-    this.checkFrequency();
-
-    alert.conditions = alert.conditions || [];
-    if (alert.conditions.length === 0) {
-      alert.conditions.push(getDefaultCondition());
-    }
-
-    alert.noDataState = alert.noDataState || config.alertingNoDataOrNullValues;
-    alert.executionErrorState = alert.executionErrorState || config.alertingErrorOrTimeout;
-    alert.frequency = alert.frequency || '1m';
-    alert.handler = alert.handler || 1;
-    alert.notifications = alert.notifications || [];
-    alert.for = alert.for || '0m';
-    alert.alertRuleTags = alert.alertRuleTags || {};
-
-    const defaultName = this.panel.title + ' alert';
-    alert.name = alert.name || defaultName;
-
-    this.conditionModels = reduce(
-      alert.conditions,
-      (memo, value) => {
-        memo.push(this.buildConditionModel(value));
-        return memo;
-      },
-      [] as string[]
-    );
-
-    ThresholdMapper.alertToGraphThresholds(this.panel);
-
-    for (const addedNotification of alert.notifications) {
-      let identifier = addedNotification.uid;
-      // lookup notifier type by uid
-      let model: any = find(this.notifications, { uid: identifier });
-
-      // fallback using id if uid is missing
-      if (!model && addedNotification.id) {
-        identifier = addedNotification.id;
-        model = find(this.notifications, { id: identifier });
-      }
-
-      if (!model) {
-        appEvents.publish(
-          new ShowConfirmModalEvent({
-            title: 'Notifier with invalid identifier is detected',
-            text: `Do you want to delete notifier with invalid identifier: ${identifier} from the dashboard JSON?`,
-            text2: 'After successful deletion, make sure to save the dashboard for storing the update JSON.',
-            icon: 'trash-alt',
-            confirmText: 'Delete',
-            yesText: 'Delete',
-            onConfirm: async () => {
-              this.removeNotification(addedNotification);
-            },
-          })
-        );
-      }
-
-      if (model && model.isDefault === false) {
-        model.iconClass = this.getNotificationIcon(model.type);
-        this.alertNotifications.push(model);
-      }
-    }
-
-    for (const notification of this.notifications) {
-      if (notification.isDefault) {
-        notification.iconClass = this.getNotificationIcon(notification.type);
-        this.alertNotifications.push(notification);
-      }
-    }
-
-    this.panelCtrl.editingThresholds = true;
-    this.panelCtrl.render();
-  }
-
-  checkFrequency() {
-    this.frequencyWarning = '';
-
-    if (!this.alert.frequency) {
-      return;
-    }
-
-    if (!this.alert.frequency.match(/^\d+([dhms])$/)) {
-      this.frequencyWarning =
-        'Invalid frequency, has to be numeric followed by one of the following units: "d, h, m, s"';
-      return;
-    }
-
-    try {
-      const frequencySecs = rangeUtil.intervalToSeconds(this.alert.frequency);
-      if (frequencySecs < this.alertingMinIntervalSecs) {
-        this.frequencyWarning =
-          'A minimum evaluation interval of ' +
-          this.alertingMinInterval +
-          ' have been configured in Grafana and will be used for this alert rule. ' +
-          'Please contact the administrator to configure a lower interval.';
-      }
-    } catch (err) {
-      this.frequencyWarning = err;
-    }
-  }
-
-  graphThresholdChanged(evt: any) {
-    for (const condition of this.alert.conditions) {
-      if (condition.type === 'query') {
-        condition.evaluator.params[evt.handleIndex] = evt.threshold.value;
-        this.evaluatorParamsChanged();
-        break;
-      }
-    }
-  }
-
-  validateModel() {
-    if (!this.alert) {
-      return;
-    }
-
-    let firstTarget;
-    let foundTarget: DataQuery | null = null;
-
-    const promises: Array<Promise<any>> = [];
-    for (const condition of this.alert.conditions) {
-      if (condition.type !== 'query') {
-        continue;
-      }
-
-      for (const target of this.panel.targets) {
-        if (!firstTarget) {
-          firstTarget = target;
-        }
-        if (condition.query.params[0] === target.refId) {
-          foundTarget = target;
-          break;
-        }
-      }
-
-      if (!foundTarget) {
-        if (firstTarget) {
-          condition.query.params[0] = firstTarget.refId;
-          foundTarget = firstTarget;
-        } else {
-          this.error = 'Could not find any metric queries';
-          return;
-        }
-      }
-
-      const datasourceName = foundTarget.datasource || this.panel.datasource;
-      promises.push(
-        this.datasourceSrv.get(datasourceName).then(
-          ((foundTarget) => (ds: DataSourceApi) => {
-            if (!ds.meta.alerting) {
-              return Promise.reject('The datasource does not support alerting queries');
-            } else if (ds.targetContainsTemplate && ds.targetContainsTemplate(foundTarget)) {
-              return Promise.reject('Template variables are not supported in alert queries');
-            }
-            return Promise.resolve();
-          })(foundTarget)
-        )
-      );
-    }
-    Promise.all(promises).then(
-      () => {
-        this.error = '';
-        this.$scope.$apply();
-      },
-      (e) => {
-        this.error = e;
-        this.$scope.$apply();
-      }
-    );
-  }
-
-  buildConditionModel(source: any) {
-    const cm: any = { source: source, type: source.type };
-
-    cm.queryPart = new QueryPart(source.query, alertDef.alertQueryDef);
-    cm.reducerPart = alertDef.createReducerPart(source.reducer);
-    cm.evaluator = source.evaluator;
-    cm.operator = source.operator;
-
-    return cm;
-  }
-
-  handleQueryPartEvent(conditionModel: any, evt: any) {
-    switch (evt.name) {
-      case 'action-remove-part': {
-        break;
-      }
-      case 'get-part-actions': {
-        return Promise.resolve([]);
-      }
-      case 'part-param-changed': {
-        this.validateModel();
-      }
-      case 'get-param-options': {
-        const result = this.panel.targets.map((target) => {
-          return this.uiSegmentSrv.newSegment({ value: target.refId });
-        });
-
-        return Promise.resolve(result);
-      }
-      default: {
-        return Promise.resolve();
-      }
-    }
-
-    return Promise.resolve();
-  }
-
-  handleReducerPartEvent(conditionModel: any, evt: any) {
-    switch (evt.name) {
-      case 'action': {
-        conditionModel.source.reducer.type = evt.action.value;
-        conditionModel.reducerPart = alertDef.createReducerPart(conditionModel.source.reducer);
-        this.evaluatorParamsChanged();
-        break;
-      }
-      case 'get-part-actions': {
-        const result = [];
-        for (const type of alertDef.reducerTypes) {
-          if (type.value !== conditionModel.source.reducer.type) {
-            result.push(type);
-          }
-        }
-        return Promise.resolve(result);
-      }
-    }
-
-    return Promise.resolve();
-  }
-
-  addCondition(type: string) {
-    const condition = getDefaultCondition();
-    // add to persited model
-    this.alert.conditions.push(condition);
-    // add to view model
-    this.conditionModels.push(this.buildConditionModel(condition));
-  }
-
-  removeCondition(index: number) {
-    this.alert.conditions.splice(index, 1);
-    this.conditionModels.splice(index, 1);
-  }
-
-  delete() {
-    appEvents.publish(
-      new ShowConfirmModalEvent({
-        title: 'Delete Alert',
-        text: 'Are you sure you want to delete this alert rule?',
-        text2: 'You need to save dashboard for the delete to take effect',
-        icon: 'trash-alt',
-        yesText: 'Delete',
-        onConfirm: () => {
-          delete this.panel.alert;
-          this.alert = null;
-          this.panel.thresholds = [];
-          this.conditionModels = [];
-          this.panelCtrl.alertState = null;
-          this.panelCtrl.render();
-        },
-      })
-    );
-  }
-
-  enable = () => {
-    this.panel.alert = {};
-    this.initModel();
-    this.panel.alert.for = '5m'; //default value for new alerts. for existing alerts we use 0m to avoid breaking changes
-  };
-
-  evaluatorParamsChanged() {
-    ThresholdMapper.alertToGraphThresholds(this.panel);
-    this.panelCtrl.render();
-  }
-
-  evaluatorTypeChanged(evaluator: any) {
-    // ensure params array is correct length
-    switch (evaluator.type) {
-      case 'lt':
-      case 'gt': {
-        evaluator.params = [evaluator.params[0]];
-        break;
-      }
-      case 'within_range':
-      case 'outside_range': {
-        evaluator.params = [evaluator.params[0], evaluator.params[1]];
-        break;
-      }
-      case 'no_value': {
-        evaluator.params = [];
-      }
-    }
-
-    this.evaluatorParamsChanged();
-  }
-
-  clearHistory() {
-    appEvents.publish(
-      new ShowConfirmModalEvent({
-        title: 'Delete Alert History',
-        text: 'Are you sure you want to remove all history & annotations for this alert?',
-        icon: 'trash-alt',
-        yesText: 'Yes',
-        onConfirm: () => {
-          promiseToDigest(this.$scope)(
-            getBackendSrv()
-              .post('/api/annotations/mass-delete', {
-                dashboardId: this.panelCtrl.dashboard.id,
-                panelId: this.panel.id,
-              })
-              .then(() => {
-                this.alertHistory = [];
-                this.panelCtrl.refresh();
-              })
-          );
-        },
-      })
-    );
-  }
-}
-
-export function alertTab() {
-  'use strict';
-  return {
-    restrict: 'E',
-    scope: true,
-    templateUrl: 'public/app/features/alerting/partials/alert_tab.html',
-    controller: AlertTabCtrl,
-  };
-}
-
-coreModule.directive('alertTab', alertTab);
diff --git a/public/app/features/alerting/AlertTabIndex.tsx b/public/app/features/alerting/AlertTabIndex.tsx
deleted file mode 100644
index ec81549084988..0000000000000
--- a/public/app/features/alerting/AlertTabIndex.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import { config } from '@grafana/runtime';
-
-import { AlertTab } from './AlertTab';
-import { PanelAlertTabContent } from './unified/PanelAlertTabContent';
-
-// route between unified and "old" alerting pages based on feature flag
-
-export default config.unifiedAlertingEnabled ? PanelAlertTabContent : AlertTab;
diff --git a/public/app/features/alerting/EditNotificationChannelPage.tsx b/public/app/features/alerting/EditNotificationChannelPage.tsx
deleted file mode 100644
index 9860dd10d5aa4..0000000000000
--- a/public/app/features/alerting/EditNotificationChannelPage.tsx
+++ /dev/null
@@ -1,135 +0,0 @@
-import React, { PureComponent } from 'react';
-import { MapDispatchToProps, MapStateToProps } from 'react-redux';
-
-import { config } from '@grafana/runtime';
-import { Form, Spinner } from '@grafana/ui';
-import { Page } from 'app/core/components/Page/Page';
-import { connectWithCleanUp } from 'app/core/components/connectWithCleanUp';
-import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
-import { NotificationChannelType, NotificationChannelDTO, StoreState } from 'app/types';
-
-import { NotificationChannelForm } from './components/NotificationChannelForm';
-import { loadNotificationChannel, testNotificationChannel, updateNotificationChannel } from './state/actions';
-import { initialChannelState, resetSecureField } from './state/reducers';
-import { mapChannelsToSelectableValue, transformSubmitData, transformTestData } from './utils/notificationChannels';
-
-interface OwnProps extends GrafanaRouteComponentProps<{ id: string }> {}
-
-interface ConnectedProps {
-  notificationChannel: any;
-  notificationChannelTypes: NotificationChannelType[];
-}
-
-interface DispatchProps {
-  loadNotificationChannel: typeof loadNotificationChannel;
-  testNotificationChannel: typeof testNotificationChannel;
-  updateNotificationChannel: typeof updateNotificationChannel;
-  resetSecureField: typeof resetSecureField;
-}
-
-type Props = OwnProps & ConnectedProps & DispatchProps;
-
-export class EditNotificationChannelPage extends PureComponent<Props> {
-  componentDidMount() {
-    this.props.loadNotificationChannel(parseInt(this.props.match.params.id, 10));
-  }
-
-  onSubmit = (formData: NotificationChannelDTO) => {
-    const { notificationChannel } = this.props;
-
-    this.props.updateNotificationChannel({
-      /*
-       Some settings which lives in a collapsed section will not be registered since
-       the section will not be rendered if a user doesn't expand it. Therefore we need to
-       merge the initialData with any changes from the form.
-      */
-      ...transformSubmitData({
-        ...notificationChannel,
-        ...formData,
-        settings: { ...notificationChannel.settings, ...formData.settings },
-      }),
-      id: notificationChannel.id,
-    });
-  };
-
-  onTestChannel = (formData: NotificationChannelDTO) => {
-    const { notificationChannel } = this.props;
-    /*
-      Same as submit
-     */
-    this.props.testNotificationChannel(
-      transformTestData({
-        ...notificationChannel,
-        ...formData,
-        settings: { ...notificationChannel.settings, ...formData.settings },
-      })
-    );
-  };
-
-  render() {
-    const { notificationChannel, notificationChannelTypes } = this.props;
-
-    return (
-      <Page navId="channels">
-        <Page.Contents>
-          <h2 className="page-sub-heading">Edit notification channel</h2>
-          {notificationChannel && notificationChannel.id > 0 ? (
-            <Form
-              maxWidth={600}
-              onSubmit={this.onSubmit}
-              defaultValues={{
-                ...notificationChannel,
-                type: notificationChannelTypes.find((n) => n.value === notificationChannel.type),
-              }}
-            >
-              {({ control, errors, getValues, register, watch }) => {
-                const selectedChannel = notificationChannelTypes.find((c) => c.value === getValues().type.value);
-
-                return (
-                  <NotificationChannelForm
-                    selectableChannels={mapChannelsToSelectableValue(notificationChannelTypes, true)}
-                    selectedChannel={selectedChannel}
-                    imageRendererAvailable={config.rendererAvailable}
-                    onTestChannel={this.onTestChannel}
-                    register={register}
-                    watch={watch}
-                    errors={errors}
-                    getValues={getValues}
-                    control={control}
-                    resetSecureField={this.props.resetSecureField}
-                    secureFields={notificationChannel.secureFields}
-                  />
-                );
-              }}
-            </Form>
-          ) : (
-            <div>
-              Loading notification channel
-              <Spinner />
-            </div>
-          )}
-        </Page.Contents>
-      </Page>
-    );
-  }
-}
-
-const mapStateToProps: MapStateToProps<ConnectedProps, OwnProps, StoreState> = (state) => {
-  return {
-    notificationChannel: state.notificationChannel.notificationChannel,
-    notificationChannelTypes: state.notificationChannel.notificationChannelTypes,
-  };
-};
-
-const mapDispatchToProps: MapDispatchToProps<DispatchProps, OwnProps> = {
-  loadNotificationChannel,
-  testNotificationChannel,
-  updateNotificationChannel,
-  resetSecureField,
-};
-
-export default connectWithCleanUp(
-  mapStateToProps,
-  mapDispatchToProps,
-  (state) => (state.notificationChannel = initialChannelState)
-)(EditNotificationChannelPage);
diff --git a/public/app/features/alerting/FeatureTogglePage.tsx b/public/app/features/alerting/FeatureTogglePage.tsx
deleted file mode 100644
index e6def5ec3f581..0000000000000
--- a/public/app/features/alerting/FeatureTogglePage.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-
-import { Page } from 'app/core/components/Page/Page';
-import { useNavModel } from 'app/core/hooks/useNavModel';
-
-export default function FeatureTogglePage() {
-  const navModel = useNavModel('alert-list');
-
-  return (
-    <Page navModel={navModel}>
-      <Page.Contents>
-        <h1>Alerting is not enabled</h1>
-        To enable alerting, enable it in the Grafana config:
-        <div>
-          <pre>
-            {`[unified_alerting]
-enable = true
-`}
-          </pre>
-        </div>
-        <div>
-          For legacy alerting
-          <pre>
-            {`[alerting]
-enable = true
-`}
-          </pre>
-        </div>
-      </Page.Contents>
-    </Page>
-  );
-}
diff --git a/public/app/features/alerting/NewNotificationChannelPage.tsx b/public/app/features/alerting/NewNotificationChannelPage.tsx
deleted file mode 100644
index 93d6ca43865ce..0000000000000
--- a/public/app/features/alerting/NewNotificationChannelPage.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import React, { PureComponent } from 'react';
-import { connect, ConnectedProps } from 'react-redux';
-
-import { config } from '@grafana/runtime';
-import { Form } from '@grafana/ui';
-import { Page } from 'app/core/components/Page/Page';
-import { getNavModel } from 'app/core/selectors/navModel';
-
-import { NotificationChannelDTO, StoreState } from '../../types';
-
-import { NotificationChannelForm } from './components/NotificationChannelForm';
-import { createNotificationChannel, loadNotificationTypes, testNotificationChannel } from './state/actions';
-import { resetSecureField } from './state/reducers';
-import {
-  defaultValues,
-  mapChannelsToSelectableValue,
-  transformSubmitData,
-  transformTestData,
-} from './utils/notificationChannels';
-
-class NewNotificationChannelPage extends PureComponent<Props> {
-  componentDidMount() {
-    this.props.loadNotificationTypes();
-  }
-
-  onSubmit = (data: NotificationChannelDTO) => {
-    this.props.createNotificationChannel(transformSubmitData({ ...defaultValues, ...data }));
-  };
-
-  onTestChannel = (data: NotificationChannelDTO) => {
-    this.props.testNotificationChannel(transformTestData({ ...defaultValues, ...data }));
-  };
-
-  render() {
-    const { navModel, notificationChannelTypes } = this.props;
-
-    return (
-      <Page navModel={navModel}>
-        <Page.Contents>
-          <h2 className="page-sub-heading">New notification channel</h2>
-          <Form onSubmit={this.onSubmit} validateOn="onChange" defaultValues={defaultValues} maxWidth={600}>
-            {({ register, errors, control, getValues, watch }) => {
-              const selectedChannel = notificationChannelTypes.find((c) => c.value === getValues().type.value);
-
-              return (
-                <NotificationChannelForm
-                  selectableChannels={mapChannelsToSelectableValue(notificationChannelTypes, true)}
-                  selectedChannel={selectedChannel}
-                  onTestChannel={this.onTestChannel}
-                  register={register}
-                  errors={errors}
-                  getValues={getValues}
-                  control={control}
-                  watch={watch}
-                  imageRendererAvailable={config.rendererAvailable}
-                  resetSecureField={this.props.resetSecureField}
-                  secureFields={{}}
-                />
-              );
-            }}
-          </Form>
-        </Page.Contents>
-      </Page>
-    );
-  }
-}
-
-const mapStateToProps = (state: StoreState) => ({
-  navModel: getNavModel(state.navIndex, 'channels'),
-  notificationChannelTypes: state.notificationChannel.notificationChannelTypes,
-});
-
-const mapDispatchToProps = {
-  createNotificationChannel,
-  loadNotificationTypes,
-  testNotificationChannel,
-  resetSecureField,
-};
-
-const connector = connect(mapStateToProps, mapDispatchToProps);
-type Props = ConnectedProps<typeof connector>;
-export default connector(NewNotificationChannelPage);
diff --git a/public/app/features/alerting/NotificationsListPage.tsx b/public/app/features/alerting/NotificationsListPage.tsx
deleted file mode 100644
index 5ad60b94e04e1..0000000000000
--- a/public/app/features/alerting/NotificationsListPage.tsx
+++ /dev/null
@@ -1,124 +0,0 @@
-import React, { useState, FC, useEffect } from 'react';
-import { useAsyncFn } from 'react-use';
-
-import { getBackendSrv } from '@grafana/runtime';
-import { HorizontalGroup, Button, LinkButton } from '@grafana/ui';
-import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
-import { Page } from 'app/core/components/Page/Page';
-import { appEvents } from 'app/core/core';
-import { useNavModel } from 'app/core/hooks/useNavModel';
-import { AlertNotification } from 'app/types/alerting';
-
-import { ShowConfirmModalEvent } from '../../types/events';
-
-const NotificationsListPage: FC = () => {
-  const navModel = useNavModel('channels');
-
-  const [notifications, setNotifications] = useState<AlertNotification[]>([]);
-
-  const getNotifications = async () => {
-    return await getBackendSrv().get(`/api/alert-notifications`);
-  };
-
-  const [state, fetchNotifications] = useAsyncFn(getNotifications);
-  useEffect(() => {
-    fetchNotifications().then((res) => {
-      setNotifications(res);
-    });
-  }, [fetchNotifications]);
-
-  const deleteNotification = (id: number) => {
-    appEvents.publish(
-      new ShowConfirmModalEvent({
-        title: 'Delete',
-        text: 'Do you want to delete this notification channel?',
-        text2: `Deleting this notification channel will not delete from alerts any references to it`,
-        icon: 'trash-alt',
-        confirmText: 'Delete',
-        yesText: 'Delete',
-        onConfirm: async () => {
-          deleteNotificationConfirmed(id);
-        },
-      })
-    );
-  };
-
-  const deleteNotificationConfirmed = async (id: number) => {
-    await getBackendSrv().delete(`/api/alert-notifications/${id}`);
-    const notifications = await fetchNotifications();
-    setNotifications(notifications);
-  };
-
-  return (
-    <Page navModel={navModel}>
-      <Page.Contents>
-        {state.error && <p>{state.error.message}</p>}
-        {!!notifications.length && (
-          <>
-            <div className="page-action-bar">
-              <div className="page-action-bar__spacer" />
-              <LinkButton icon="channel-add" href="alerting/notification/new">
-                New channel
-              </LinkButton>
-            </div>
-            <table className="filter-table filter-table--hover">
-              <thead>
-                <tr>
-                  <th style={{ minWidth: '200px' }}>
-                    <strong>Name</strong>
-                  </th>
-                  <th style={{ minWidth: '100px' }}>Type</th>
-                  <th style={{ width: '1%' }}></th>
-                </tr>
-              </thead>
-              <tbody>
-                {notifications.map((notification) => (
-                  <tr key={notification.id}>
-                    <td className="link-td">
-                      <a href={`alerting/notification/${notification.id}/edit`}>{notification.name}</a>
-                    </td>
-                    <td className="link-td">
-                      <a href={`alerting/notification/${notification.id}/edit`}>{notification.type}</a>
-                    </td>
-                    <td className="text-right">
-                      <HorizontalGroup justify="flex-end">
-                        {notification.isDefault && (
-                          <Button disabled variant="secondary" size="sm">
-                            default
-                          </Button>
-                        )}
-                        <Button
-                          variant="destructive"
-                          icon="times"
-                          size="sm"
-                          onClick={() => {
-                            deleteNotification(notification.id);
-                          }}
-                        />
-                      </HorizontalGroup>
-                    </td>
-                  </tr>
-                ))}
-              </tbody>
-            </table>
-          </>
-        )}
-
-        {!(notifications.length || state.loading) && (
-          <EmptyListCTA
-            title="There are no notification channels defined yet"
-            buttonIcon="channel-add"
-            buttonLink="alerting/notification/new"
-            buttonTitle="Add channel"
-            proTip="You can include images in your alert notifications."
-            proTipLink="http://docs.grafana.org/alerting/notifications/"
-            proTipLinkTitle="Learn more"
-            proTipTarget="_blank"
-          />
-        )}
-      </Page.Contents>
-    </Page>
-  );
-};
-
-export default NotificationsListPage;
diff --git a/public/app/features/alerting/StateHistory.tsx b/public/app/features/alerting/StateHistory.tsx
deleted file mode 100644
index 158cc30fad60d..0000000000000
--- a/public/app/features/alerting/StateHistory.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import { css } from '@emotion/css';
-import React, { PureComponent } from 'react';
-
-import { getBackendSrv } from '@grafana/runtime';
-import { Icon, ConfirmButton, Button } from '@grafana/ui';
-
-import { DashboardModel } from '../dashboard/state/DashboardModel';
-
-import alertDef from './state/alertDef';
-
-interface Props {
-  dashboard: DashboardModel;
-  panelId: number;
-  onRefresh: () => void;
-}
-
-interface State {
-  stateHistoryItems: any[];
-}
-
-class StateHistory extends PureComponent<Props, State> {
-  state: State = {
-    stateHistoryItems: [],
-  };
-
-  componentDidMount(): void {
-    const { dashboard, panelId } = this.props;
-
-    getBackendSrv()
-      .get(
-        `/api/annotations?dashboardId=${dashboard.id}&panelId=${panelId}&limit=50&type=alert`,
-        {},
-        `state-history-${dashboard.id}-${panelId}`
-      )
-      .then((data) => {
-        const items = data.map((item: any) => {
-          return {
-            stateModel: alertDef.getStateDisplayModel(item.newState),
-            time: dashboard.formatDate(item.time, 'MMM D, YYYY HH:mm:ss'),
-            info: alertDef.getAlertAnnotationInfo(item),
-          };
-        });
-
-        this.setState({
-          stateHistoryItems: items,
-        });
-      });
-  }
-
-  clearHistory = async () => {
-    const { dashboard, panelId, onRefresh } = this.props;
-
-    await getBackendSrv().post('/api/annotations/mass-delete', {
-      dashboardId: dashboard.id,
-      panelId: panelId,
-    });
-
-    this.setState({ stateHistoryItems: [] });
-    onRefresh();
-  };
-
-  render() {
-    const { stateHistoryItems } = this.state;
-
-    return (
-      <div>
-        {stateHistoryItems.length > 0 && (
-          <div className="p-b-1">
-            <span className="muted">Last 50 state changes</span>
-            <ConfirmButton onConfirm={this.clearHistory} confirmVariant="destructive" confirmText="Clear">
-              <Button
-                className={css`
-                  direction: ltr;
-                `}
-                variant="destructive"
-                icon="trash-alt"
-              >
-                Clear history
-              </Button>
-            </ConfirmButton>
-          </div>
-        )}
-        <ol className="alert-rule-list">
-          {stateHistoryItems.length > 0 ? (
-            stateHistoryItems.map((item, index) => {
-              return (
-                <li className="alert-rule-item" key={`${item.time}-${index}`}>
-                  <div className={`alert-rule-item__icon ${item.stateModel.stateClass}`}>
-                    <Icon name={item.stateModel.iconClass} size="xl" />
-                  </div>
-                  <div className="alert-rule-item__body">
-                    <div className="alert-rule-item__header">
-                      <p className="alert-rule-item__name">{item.alertName}</p>
-                      <div className="alert-rule-item__text">
-                        <span className={`${item.stateModel.stateClass}`}>{item.stateModel.text}</span>
-                      </div>
-                    </div>
-                    {item.info}
-                  </div>
-                  <div className="alert-rule-item__time">{item.time}</div>
-                </li>
-              );
-            })
-          ) : (
-            <i>No state changes recorded</i>
-          )}
-        </ol>
-      </div>
-    );
-  }
-}
-
-export default StateHistory;
diff --git a/public/app/features/alerting/TestRuleResult.test.tsx b/public/app/features/alerting/TestRuleResult.test.tsx
deleted file mode 100644
index 9b44afa9f0f22..0000000000000
--- a/public/app/features/alerting/TestRuleResult.test.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import React from 'react';
-
-import { PanelModel } from '../dashboard/state';
-import { createDashboardModelFixture, createPanelSaveModel } from '../dashboard/state/__fixtures__/dashboardFixtures';
-
-import { TestRuleResult } from './TestRuleResult';
-
-const backendSrv = {
-  post: jest.fn(),
-};
-
-jest.mock('@grafana/runtime', () => {
-  const original = jest.requireActual('@grafana/runtime');
-
-  return {
-    ...original,
-    getBackendSrv: () => backendSrv,
-  };
-});
-
-const props: React.ComponentProps<typeof TestRuleResult> = {
-  panel: new PanelModel({ id: 1 }),
-  dashboard: createDashboardModelFixture({
-    panels: [createPanelSaveModel({ id: 1 })],
-  }),
-};
-
-describe('TestRuleResult', () => {
-  it('should render without error', async () => {
-    render(<TestRuleResult {...props} />);
-    await screen.findByRole('button', { name: 'Copy to Clipboard' });
-  });
-
-  it('should call testRule when mounting', async () => {
-    jest.spyOn(backendSrv, 'post');
-    render(<TestRuleResult {...props} />);
-    await screen.findByRole('button', { name: 'Copy to Clipboard' });
-
-    expect(backendSrv.post).toHaveBeenCalledWith(
-      '/api/alerts/test',
-      expect.objectContaining({
-        panelId: 1,
-      })
-    );
-  });
-});
diff --git a/public/app/features/alerting/TestRuleResult.tsx b/public/app/features/alerting/TestRuleResult.tsx
deleted file mode 100644
index a2c86c917c9a3..0000000000000
--- a/public/app/features/alerting/TestRuleResult.tsx
+++ /dev/null
@@ -1,129 +0,0 @@
-import React, { PureComponent } from 'react';
-
-import { getBackendSrv } from '@grafana/runtime';
-import {
-  LoadingPlaceholder,
-  JSONFormatter,
-  Icon,
-  HorizontalGroup,
-  ClipboardButton,
-  clearButtonStyles,
-  withTheme2,
-  Themeable2,
-} from '@grafana/ui';
-
-import { DashboardModel, PanelModel } from '../dashboard/state';
-
-export interface Props extends Themeable2 {
-  dashboard: DashboardModel;
-  panel: PanelModel;
-}
-
-interface State {
-  isLoading: boolean;
-  allNodesExpanded: boolean | null;
-  testRuleResponse: {};
-}
-
-class UnThemedTestRuleResult extends PureComponent<Props, State> {
-  readonly state: State = {
-    isLoading: false,
-    allNodesExpanded: null,
-    testRuleResponse: {},
-  };
-
-  formattedJson: any;
-  clipboard: any;
-
-  componentDidMount() {
-    this.testRule();
-  }
-
-  async testRule() {
-    const { dashboard, panel } = this.props;
-
-    // dashboard save model
-    const model = dashboard.getSaveModelCloneOld();
-
-    // now replace panel to get current edits
-    model.panels = model.panels.map((dashPanel) => {
-      return dashPanel.id === panel.id ? panel.getSaveModel() : dashPanel;
-    });
-
-    const payload = { dashboard: model, panelId: panel.id };
-
-    this.setState({ isLoading: true });
-    const testRuleResponse = await getBackendSrv().post(`/api/alerts/test`, payload);
-    this.setState({ isLoading: false, testRuleResponse });
-  }
-
-  setFormattedJson = (formattedJson: any) => {
-    this.formattedJson = formattedJson;
-  };
-
-  getTextForClipboard = () => {
-    return JSON.stringify(this.formattedJson, null, 2);
-  };
-
-  onToggleExpand = () => {
-    this.setState((prevState) => ({
-      ...prevState,
-      allNodesExpanded: !this.state.allNodesExpanded,
-    }));
-  };
-
-  getNrOfOpenNodes = () => {
-    if (this.state.allNodesExpanded === null) {
-      return 3; // 3 is default, ie when state is null
-    } else if (this.state.allNodesExpanded) {
-      return 20;
-    }
-    return 1;
-  };
-
-  renderExpandCollapse = () => {
-    const { allNodesExpanded } = this.state;
-
-    const collapse = (
-      <>
-        <Icon name="minus-circle" /> Collapse All
-      </>
-    );
-    const expand = (
-      <>
-        <Icon name="plus-circle" /> Expand All
-      </>
-    );
-    return allNodesExpanded ? collapse : expand;
-  };
-
-  render() {
-    const { testRuleResponse, isLoading } = this.state;
-    const clearButton = clearButtonStyles(this.props.theme);
-
-    if (isLoading === true) {
-      return <LoadingPlaceholder text="Evaluating rule" />;
-    }
-
-    const openNodes = this.getNrOfOpenNodes();
-
-    return (
-      <>
-        <div className="pull-right">
-          <HorizontalGroup spacing="md">
-            <button type="button" className={clearButton} onClick={this.onToggleExpand}>
-              {this.renderExpandCollapse()}
-            </button>
-            <ClipboardButton getText={this.getTextForClipboard} icon="copy">
-              Copy to Clipboard
-            </ClipboardButton>
-          </HorizontalGroup>
-        </div>
-
-        <JSONFormatter json={testRuleResponse} open={openNodes} onDidRender={this.setFormattedJson} />
-      </>
-    );
-  }
-}
-
-export const TestRuleResult = withTheme2(UnThemedTestRuleResult);
diff --git a/public/app/features/alerting/components/BasicSettings.tsx b/public/app/features/alerting/components/BasicSettings.tsx
deleted file mode 100644
index 6705da037efcf..0000000000000
--- a/public/app/features/alerting/components/BasicSettings.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import React from 'react';
-
-import { SelectableValue } from '@grafana/data';
-import { Field, Input, InputControl, Select } from '@grafana/ui';
-
-import { NotificationChannelSecureFields, NotificationChannelType } from '../../../types';
-
-import { NotificationSettingsProps } from './NotificationChannelForm';
-import { NotificationChannelOptions } from './NotificationChannelOptions';
-
-interface Props extends NotificationSettingsProps {
-  selectedChannel: NotificationChannelType;
-  channels: Array<SelectableValue<string>>;
-  secureFields: NotificationChannelSecureFields;
-  resetSecureField: (key: string) => void;
-}
-
-export const BasicSettings = ({
-  control,
-  currentFormValues,
-  errors,
-  secureFields,
-  selectedChannel,
-  channels,
-  register,
-  resetSecureField,
-}: Props) => {
-  return (
-    <>
-      <Field label="Name" invalid={!!errors.name} error={errors.name && errors.name.message}>
-        <Input {...register('name', { required: 'Name is required' })} />
-      </Field>
-      <Field label="Type">
-        <InputControl
-          name="type"
-          render={({ field: { ref, ...field } }) => <Select {...field} options={channels} />}
-          control={control}
-          rules={{ required: true }}
-        />
-      </Field>
-      <NotificationChannelOptions
-        selectedChannelOptions={selectedChannel.options.filter((o) => o.required)}
-        currentFormValues={currentFormValues}
-        secureFields={secureFields}
-        onResetSecureField={resetSecureField}
-        register={register}
-        errors={errors}
-        control={control}
-      />
-    </>
-  );
-};
diff --git a/public/app/features/alerting/components/ChannelSettings.tsx b/public/app/features/alerting/components/ChannelSettings.tsx
deleted file mode 100644
index 940863c1f3e68..0000000000000
--- a/public/app/features/alerting/components/ChannelSettings.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-
-import { Alert, CollapsableSection } from '@grafana/ui';
-
-import { NotificationChannelSecureFields, NotificationChannelType } from '../../../types';
-
-import { NotificationSettingsProps } from './NotificationChannelForm';
-import { NotificationChannelOptions } from './NotificationChannelOptions';
-
-interface Props extends NotificationSettingsProps {
-  selectedChannel: NotificationChannelType;
-  secureFields: NotificationChannelSecureFields;
-  resetSecureField: (key: string) => void;
-}
-
-export const ChannelSettings = ({
-  control,
-  currentFormValues,
-  errors,
-  selectedChannel,
-  secureFields,
-  register,
-  resetSecureField,
-}: Props) => {
-  return (
-    <CollapsableSection label={`Optional ${selectedChannel.heading}`} isOpen={false}>
-      {selectedChannel.info !== '' && <Alert severity="info" title={selectedChannel.info ?? ''} />}
-      <NotificationChannelOptions
-        selectedChannelOptions={selectedChannel.options.filter((o) => !o.required)}
-        currentFormValues={currentFormValues}
-        register={register}
-        errors={errors}
-        control={control}
-        onResetSecureField={resetSecureField}
-        secureFields={secureFields}
-      />
-    </CollapsableSection>
-  );
-};
diff --git a/public/app/features/alerting/components/DeprecationNotice.tsx b/public/app/features/alerting/components/DeprecationNotice.tsx
deleted file mode 100644
index bc3db37c7d803..0000000000000
--- a/public/app/features/alerting/components/DeprecationNotice.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react';
-
-import { Alert } from '@grafana/ui';
-
-export const LOCAL_STORAGE_KEY = 'grafana.legacyalerting.unifiedalertingpromo';
-
-const DeprecationNotice = () => (
-  <Alert severity="warning" title="Grafana legacy alerting is deprecated and will be removed in a future release.">
-    <p>
-      You are using Grafana legacy alerting, which has been deprecated since Grafana 9.0. The codebase is now staying as
-      is and will be removed in Grafana 11.0.
-      <br />
-      We recommend upgrading to Grafana Alerting as soon as possible.
-    </p>
-    <p>
-      See{' '}
-      <a href="https://grafana.com/docs/grafana/latest/alerting/migrating-alerts/">
-        how to upgrade to Grafana Alerting
-      </a>{' '}
-      to learn more.
-    </p>
-  </Alert>
-);
-
-export { DeprecationNotice };
diff --git a/public/app/features/alerting/components/NotificationChannelForm.tsx b/public/app/features/alerting/components/NotificationChannelForm.tsx
deleted file mode 100644
index 60be00150a75a..0000000000000
--- a/public/app/features/alerting/components/NotificationChannelForm.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-import { css } from '@emotion/css';
-import React, { useEffect } from 'react';
-
-import { GrafanaTheme2, SelectableValue } from '@grafana/data';
-import { Button, FormAPI, HorizontalGroup, Spinner, useStyles2 } from '@grafana/ui';
-import config from 'app/core/config';
-
-import { NotificationChannelType, NotificationChannelDTO, NotificationChannelSecureFields } from '../../../types';
-
-import { BasicSettings } from './BasicSettings';
-import { ChannelSettings } from './ChannelSettings';
-import { NotificationSettings } from './NotificationSettings';
-
-interface Props
-  extends Pick<FormAPI<NotificationChannelDTO>, 'control' | 'errors' | 'register' | 'watch' | 'getValues'> {
-  selectableChannels: Array<SelectableValue<string>>;
-  selectedChannel?: NotificationChannelType;
-  imageRendererAvailable: boolean;
-  secureFields: NotificationChannelSecureFields;
-  resetSecureField: (key: string) => void;
-  onTestChannel: (data: NotificationChannelDTO) => void;
-}
-
-export interface NotificationSettingsProps
-  extends Pick<FormAPI<NotificationChannelDTO>, 'control' | 'errors' | 'register'> {
-  currentFormValues: NotificationChannelDTO;
-}
-
-export const NotificationChannelForm = ({
-  control,
-  errors,
-  selectedChannel,
-  selectableChannels,
-  register,
-  watch,
-  getValues,
-  imageRendererAvailable,
-  onTestChannel,
-  resetSecureField,
-  secureFields,
-}: Props) => {
-  const styles = useStyles2(getStyles);
-
-  useEffect(() => {
-    /*
-      Find fields that have dependencies on other fields and removes duplicates.
-      Needs to be prefixed with settings.
-    */
-    const fieldsToWatch =
-      new Set(
-        selectedChannel?.options
-          .filter((o) => o.showWhen.field)
-          .map((option) => {
-            return `settings.${option.showWhen.field}`;
-          })
-      ) || [];
-    watch(['type', 'sendReminder', 'uploadImage', ...fieldsToWatch]);
-  }, [selectedChannel?.options, watch]);
-
-  const currentFormValues = getValues();
-
-  if (!selectedChannel) {
-    return <Spinner />;
-  }
-
-  return (
-    <div className={styles.formContainer}>
-      <div className={styles.formItem}>
-        <BasicSettings
-          selectedChannel={selectedChannel}
-          channels={selectableChannels}
-          secureFields={secureFields}
-          resetSecureField={resetSecureField}
-          currentFormValues={currentFormValues}
-          register={register}
-          errors={errors}
-          control={control}
-        />
-      </div>
-      {/* If there are no non-required fields, don't render this section*/}
-      {selectedChannel.options.filter((o) => !o.required).length > 0 && (
-        <div className={styles.formItem}>
-          <ChannelSettings
-            selectedChannel={selectedChannel}
-            secureFields={secureFields}
-            resetSecureField={resetSecureField}
-            currentFormValues={currentFormValues}
-            register={register}
-            errors={errors}
-            control={control}
-          />
-        </div>
-      )}
-      <div className={styles.formItem}>
-        <NotificationSettings
-          imageRendererAvailable={imageRendererAvailable}
-          currentFormValues={currentFormValues}
-          register={register}
-          errors={errors}
-          control={control}
-        />
-      </div>
-      <div className={styles.formButtons}>
-        <HorizontalGroup>
-          <Button type="submit">Save</Button>
-          <Button type="button" variant="secondary" onClick={() => onTestChannel(getValues())}>
-            Test
-          </Button>
-          <a href={`${config.appSubUrl}/alerting/notifications`}>
-            <Button type="button" variant="secondary">
-              Back
-            </Button>
-          </a>
-        </HorizontalGroup>
-      </div>
-    </div>
-  );
-};
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    formContainer: css``,
-    formItem: css`
-      flex-grow: 1;
-      padding-top: ${theme.spacing(2)};
-    `,
-    formButtons: css`
-      padding-top: ${theme.spacing(4)};
-    `,
-  };
-};
diff --git a/public/app/features/alerting/components/NotificationChannelOptions.tsx b/public/app/features/alerting/components/NotificationChannelOptions.tsx
deleted file mode 100644
index c94fd99489343..0000000000000
--- a/public/app/features/alerting/components/NotificationChannelOptions.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import React from 'react';
-
-import { SelectableValue } from '@grafana/data';
-import { Button, Checkbox, Field, Input } from '@grafana/ui';
-
-import { NotificationChannelDTO, NotificationChannelOption, NotificationChannelSecureFields } from '../../../types';
-
-import { NotificationSettingsProps } from './NotificationChannelForm';
-import { OptionElement } from './OptionElement';
-
-interface Props extends NotificationSettingsProps {
-  selectedChannelOptions: NotificationChannelOption[];
-  currentFormValues: NotificationChannelDTO;
-  secureFields: NotificationChannelSecureFields;
-
-  onResetSecureField: (key: string) => void;
-}
-
-export const NotificationChannelOptions = ({
-  control,
-  currentFormValues,
-  errors,
-  selectedChannelOptions,
-  register,
-  onResetSecureField,
-  secureFields,
-}: Props) => {
-  return (
-    <>
-      {selectedChannelOptions.map((option: NotificationChannelOption, index: number) => {
-        const key = `${option.label}-${index}`;
-        // Some options can be dependent on other options, this determines what is selected in the dependency options
-        // I think this needs more thought.
-        const selectedOptionValue =
-          currentFormValues[`settings.${option.showWhen.field}`] &&
-          (currentFormValues[`settings.${option.showWhen.field}`] as SelectableValue<string>).value;
-
-        if (option.showWhen.field && selectedOptionValue !== option.showWhen.is) {
-          return null;
-        }
-
-        if (option.element === 'checkbox') {
-          return (
-            <Field key={key}>
-              <Checkbox
-                {...register(
-                  option.secure ? `secureSettings.${option.propertyName}` : `settings.${option.propertyName}`
-                )}
-                label={option.label}
-                description={option.description}
-              />
-            </Field>
-          );
-        }
-        return (
-          <Field
-            key={key}
-            label={option.label}
-            description={option.description}
-            invalid={errors.settings && !!errors.settings[option.propertyName]}
-            error={errors.settings && errors.settings[option.propertyName]?.message}
-          >
-            {secureFields && secureFields[option.propertyName] ? (
-              <Input
-                readOnly={true}
-                value="Configured"
-                suffix={
-                  <Button onClick={() => onResetSecureField(option.propertyName)} fill="text" type="button" size="sm">
-                    Clear
-                  </Button>
-                }
-              />
-            ) : (
-              <OptionElement option={option} register={register} control={control} />
-            )}
-          </Field>
-        );
-      })}
-    </>
-  );
-};
diff --git a/public/app/features/alerting/components/NotificationSettings.tsx b/public/app/features/alerting/components/NotificationSettings.tsx
deleted file mode 100644
index c88191d65fe2a..0000000000000
--- a/public/app/features/alerting/components/NotificationSettings.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import React from 'react';
-
-import { Checkbox, CollapsableSection, Field, InfoBox, Input } from '@grafana/ui';
-
-import { NotificationSettingsProps } from './NotificationChannelForm';
-
-interface Props extends NotificationSettingsProps {
-  imageRendererAvailable: boolean;
-}
-
-export const NotificationSettings = ({ currentFormValues, imageRendererAvailable, register }: Props) => {
-  return (
-    <CollapsableSection label="Notification settings" isOpen={false}>
-      <Field>
-        <Checkbox {...register('isDefault')} label="Default" description="Use this notification for all alerts" />
-      </Field>
-      <Field>
-        <Checkbox
-          {...register('settings.uploadImage')}
-          label="Include image"
-          description="Captures an image and include it in the notification"
-        />
-      </Field>
-      {currentFormValues.uploadImage && !imageRendererAvailable && (
-        <InfoBox title="No image renderer available/installed">
-          Grafana cannot find an image renderer to capture an image for the notification. Please make sure the Grafana
-          Image Renderer plugin is installed. Please contact your Grafana administrator to install the plugin.
-        </InfoBox>
-      )}
-      <Field>
-        <Checkbox
-          {...register('disableResolveMessage')}
-          label="Disable Resolve Message"
-          description="Disable the resolve message [OK] that is sent when alerting state returns to false"
-        />
-      </Field>
-      <Field>
-        <Checkbox
-          {...register('sendReminder')}
-          label="Send reminders"
-          description="Send additional notifications for triggered alerts"
-        />
-      </Field>
-      {currentFormValues.sendReminder && (
-        <>
-          <Field
-            label="Send reminder every"
-            description="Specify how often reminders should be sent, e.g. every 30s, 1m, 10m, 30m', or 1h etc.
-            Alert reminders are sent after rules are evaluated. A reminder can never be sent more frequently
-            than a configured alert rule evaluation interval."
-          >
-            <Input {...register('frequency')} width={8} />
-          </Field>
-        </>
-      )}
-    </CollapsableSection>
-  );
-};
diff --git a/public/app/features/alerting/components/OptionElement.tsx b/public/app/features/alerting/components/OptionElement.tsx
deleted file mode 100644
index bc43c8dee8512..0000000000000
--- a/public/app/features/alerting/components/OptionElement.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import React from 'react';
-
-import { FormAPI, Input, InputControl, Select, TextArea } from '@grafana/ui';
-
-import { NotificationChannelOption } from '../../../types';
-
-interface Props extends Pick<FormAPI<any>, 'register' | 'control'> {
-  option: NotificationChannelOption;
-  invalid?: boolean;
-}
-
-export const OptionElement = ({ control, option, register, invalid }: Props) => {
-  const modelValue = option.secure ? `secureSettings.${option.propertyName}` : `settings.${option.propertyName}`;
-  switch (option.element) {
-    case 'input':
-      return (
-        <Input
-          {...register(`${modelValue}`, {
-            required: option.required ? 'Required' : false,
-            validate: (v) => (option.validationRule !== '' ? validateOption(v, option.validationRule) : true),
-          })}
-          invalid={invalid}
-          type={option.inputType}
-          placeholder={option.placeholder}
-        />
-      );
-
-    case 'select':
-      return (
-        <InputControl
-          control={control}
-          name={`${modelValue}`}
-          render={({ field: { ref, ...field } }) => (
-            <Select {...field} options={option.selectOptions ?? undefined} invalid={invalid} />
-          )}
-        />
-      );
-
-    case 'textarea':
-      return (
-        <TextArea
-          invalid={invalid}
-          {...register(`${modelValue}`, {
-            required: option.required ? 'Required' : false,
-            validate: (v) => (option.validationRule !== '' ? validateOption(v, option.validationRule) : true),
-          })}
-        />
-      );
-
-    default:
-      console.error('Element not supported', option.element);
-      return null;
-  }
-};
-
-const validateOption = (value: string, validationRule: string) => {
-  return RegExp(validationRule).test(value) ? true : 'Invalid format';
-};
diff --git a/public/app/features/alerting/getAlertingValidationMessage.test.ts b/public/app/features/alerting/getAlertingValidationMessage.test.ts
deleted file mode 100644
index 20f86c6e860db..0000000000000
--- a/public/app/features/alerting/getAlertingValidationMessage.test.ts
+++ /dev/null
@@ -1,200 +0,0 @@
-import {
-  DataSourceApi,
-  PluginMeta,
-  DataTransformerConfig,
-  DataSourceInstanceSettings,
-  DataSourceRef,
-  DataQuery,
-} from '@grafana/data';
-import { DataSourceSrv } from '@grafana/runtime';
-
-import { ElasticsearchQuery } from '../../plugins/datasource/elasticsearch/types';
-
-import { getAlertingValidationMessage } from './getAlertingValidationMessage';
-
-describe('getAlertingValidationMessage', () => {
-  describe('when called with some targets containing template variables', () => {
-    it('then it should return false', async () => {
-      let call = 0;
-      const datasource: DataSourceApi = {
-        meta: { alerting: true } as unknown as PluginMeta,
-        targetContainsTemplate: () => {
-          if (call === 0) {
-            call++;
-            return true;
-          }
-          return false;
-        },
-        name: 'some name',
-        uid: 'some uid',
-      } as unknown as DataSourceApi;
-      const getMock = jest.fn().mockResolvedValue(datasource);
-      const datasourceSrv: DataSourceSrv = {
-        get: (ref: DataSourceRef) => {
-          return getMock(ref.uid);
-        },
-        getList(): DataSourceInstanceSettings[] {
-          return [];
-        },
-        getInstanceSettings: jest.fn(),
-        reload: jest.fn(),
-      };
-      const targets: ElasticsearchQuery[] = [
-        { refId: 'A', query: '@hostname:$hostname' },
-        { refId: 'B', query: '@instance:instance' },
-      ];
-      const transformations: DataTransformerConfig[] = [];
-
-      const result = await getAlertingValidationMessage(transformations, targets, datasourceSrv, {
-        uid: datasource.uid,
-      });
-
-      expect(result).toBe('');
-      expect(getMock).toHaveBeenCalledTimes(2);
-      expect(getMock).toHaveBeenCalledWith(datasource.uid);
-    });
-  });
-
-  describe('when called with some targets using a datasource that does not support alerting', () => {
-    it('then it should return false', async () => {
-      const alertingDatasource: DataSourceApi = {
-        meta: { alerting: true } as unknown as PluginMeta,
-        targetContainsTemplate: () => false,
-        name: 'alertingDatasource',
-      } as unknown as DataSourceApi;
-      const datasource: DataSourceApi = {
-        meta: { alerting: false } as unknown as PluginMeta,
-        targetContainsTemplate: () => false,
-        name: 'datasource',
-      } as unknown as DataSourceApi;
-
-      const datasourceSrv: DataSourceSrv = {
-        get: (name: string) => {
-          if (name === datasource.name) {
-            return Promise.resolve(datasource);
-          }
-
-          return Promise.resolve(alertingDatasource);
-        },
-        getInstanceSettings: jest.fn(),
-        getList(): DataSourceInstanceSettings[] {
-          return [];
-        },
-        reload: jest.fn(),
-      };
-      const targets: DataQuery[] = [
-        { refId: 'A', datasource: { type: 'alertingDatasource' } },
-        { refId: 'B', datasource: { type: 'datasource' } },
-      ];
-      const transformations: DataTransformerConfig[] = [];
-
-      const result = await getAlertingValidationMessage(transformations, targets, datasourceSrv, {
-        uid: datasource.name,
-      });
-
-      expect(result).toBe('');
-    });
-  });
-
-  describe('when called with all targets containing template variables', () => {
-    it('then it should return false', async () => {
-      const datasource: DataSourceApi = {
-        meta: { alerting: true } as unknown as PluginMeta,
-        targetContainsTemplate: () => true,
-        name: 'some name',
-      } as unknown as DataSourceApi;
-      const getMock = jest.fn().mockResolvedValue(datasource);
-      const datasourceSrv: DataSourceSrv = {
-        get: (ref: DataSourceRef) => {
-          return getMock(ref.uid);
-        },
-        getInstanceSettings: jest.fn(),
-        getList(): DataSourceInstanceSettings[] {
-          return [];
-        },
-        reload: jest.fn(),
-      };
-      const targets: ElasticsearchQuery[] = [
-        { refId: 'A', query: '@hostname:$hostname' },
-        { refId: 'B', query: '@instance:$instance' },
-      ];
-      const transformations: DataTransformerConfig[] = [];
-
-      const result = await getAlertingValidationMessage(transformations, targets, datasourceSrv, {
-        uid: datasource.name,
-      });
-
-      expect(result).toBe('Template variables are not supported in alert queries');
-      expect(getMock).toHaveBeenCalledTimes(2);
-      expect(getMock).toHaveBeenCalledWith(datasource.name);
-    });
-  });
-
-  describe('when called with all targets using a datasource that does not support alerting', () => {
-    it('then it should return false', async () => {
-      const datasource: DataSourceApi = {
-        meta: { alerting: false } as unknown as PluginMeta,
-        targetContainsTemplate: () => false,
-        name: 'some name',
-        uid: 'theid',
-      } as unknown as DataSourceApi;
-      const getMock = jest.fn().mockResolvedValue(datasource);
-      const datasourceSrv: DataSourceSrv = {
-        get: (ref: DataSourceRef) => {
-          return getMock(ref.uid);
-        },
-        getInstanceSettings: jest.fn(),
-        getList(): DataSourceInstanceSettings[] {
-          return [];
-        },
-        reload: jest.fn(),
-      };
-      const targets: ElasticsearchQuery[] = [
-        { refId: 'A', query: '@hostname:hostname' },
-        { refId: 'B', query: '@instance:instance' },
-      ];
-      const transformations: DataTransformerConfig[] = [];
-
-      const result = await getAlertingValidationMessage(transformations, targets, datasourceSrv, {
-        uid: datasource.uid,
-      });
-
-      expect(result).toBe('The datasource does not support alerting queries');
-      expect(getMock).toHaveBeenCalledTimes(2);
-      expect(getMock).toHaveBeenCalledWith(datasource.uid);
-    });
-  });
-
-  describe('when called with transformations', () => {
-    it('then it should return false', async () => {
-      const datasource: DataSourceApi = {
-        meta: { alerting: true } as unknown as PluginMeta,
-        targetContainsTemplate: () => false,
-        name: 'some name',
-      } as unknown as DataSourceApi;
-      const getMock = jest.fn().mockResolvedValue(datasource);
-      const datasourceSrv: DataSourceSrv = {
-        get: (ref: DataSourceRef) => {
-          return getMock(ref.uid);
-        },
-        getInstanceSettings: jest.fn(),
-        getList(): DataSourceInstanceSettings[] {
-          return [];
-        },
-        reload: jest.fn(),
-      };
-      const targets: ElasticsearchQuery[] = [
-        { refId: 'A', query: '@hostname:hostname' },
-        { refId: 'B', query: '@instance:instance' },
-      ];
-      const transformations: DataTransformerConfig[] = [{ id: 'A', options: null }];
-
-      const result = await getAlertingValidationMessage(transformations, targets, datasourceSrv, {
-        uid: datasource.uid,
-      });
-
-      expect(result).toBe('Transformations are not supported in alert queries');
-      expect(getMock).toHaveBeenCalledTimes(0);
-    });
-  });
-});
diff --git a/public/app/features/alerting/getAlertingValidationMessage.ts b/public/app/features/alerting/getAlertingValidationMessage.ts
deleted file mode 100644
index 52184d0d1df81..0000000000000
--- a/public/app/features/alerting/getAlertingValidationMessage.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { DataQuery, DataSourceRef, DataTransformerConfig } from '@grafana/data';
-import { DataSourceSrv } from '@grafana/runtime';
-
-export const getDefaultCondition = () => ({
-  type: 'query',
-  query: { params: ['A', '5m', 'now'] },
-  reducer: { type: 'avg', params: [] as any[] },
-  evaluator: { type: 'gt', params: [null] as any[] },
-  operator: { type: 'and' },
-});
-
-export const getAlertingValidationMessage = async (
-  transformations: DataTransformerConfig[] | undefined,
-  targets: DataQuery[],
-  datasourceSrv: DataSourceSrv,
-  datasource: DataSourceRef | null
-): Promise<string> => {
-  if (targets.length === 0) {
-    return 'Could not find any metric queries';
-  }
-
-  if (transformations && transformations.length) {
-    return 'Transformations are not supported in alert queries';
-  }
-
-  let alertingNotSupported = 0;
-  let templateVariablesNotSupported = 0;
-
-  for (const target of targets) {
-    const dsRef = target.datasource || datasource;
-    const ds = await datasourceSrv.get(dsRef);
-    if (!ds.meta.alerting) {
-      alertingNotSupported++;
-    } else if (ds.targetContainsTemplate && ds.targetContainsTemplate(target)) {
-      templateVariablesNotSupported++;
-    }
-  }
-
-  if (alertingNotSupported === targets.length) {
-    return 'The datasource does not support alerting queries';
-  }
-
-  if (templateVariablesNotSupported === targets.length) {
-    return 'Template variables are not supported in alert queries';
-  }
-
-  return '';
-};
diff --git a/public/app/features/alerting/partials/alert_tab.html b/public/app/features/alerting/partials/alert_tab.html
deleted file mode 100644
index 6a4aceff32300..0000000000000
--- a/public/app/features/alerting/partials/alert_tab.html
+++ /dev/null
@@ -1,244 +0,0 @@
-<div ng-if="ctrl.panel.alert">
-  <div class="alert alert-error m-b-2" ng-show="ctrl.error">
-    <icon name="'exclamation-triangle'"></icon> {{ctrl.error}}
-  </div>
-
-  <div class="gf-form-group">
-    <h4 class="section-heading">Rule</h4>
-    <div class="gf-form-inline">
-      <div class="gf-form">
-        <span class="gf-form-label width-6">Name</span>
-        <input type="text" class="gf-form-input width-20 gf-form-input--has-help-icon" ng-model="ctrl.alert.name" />
-        <info-popover mode="right-absolute">
-          If you want to apply templating to the alert rule name, you must use the following syntax - ${Label}
-        </info-popover>
-      </div>
-      <div class="gf-form">
-        <span class="gf-form-label width-9">Evaluate every</span>
-        <input
-          class="gf-form-input max-width-6"
-          type="text"
-          ng-model="ctrl.alert.frequency"
-          ng-blur="ctrl.checkFrequency()"
-        />
-      </div>
-      <div class="gf-form max-width-11">
-        <label class="gf-form-label width-5">For</label>
-        <input
-          type="text"
-          class="gf-form-input max-width-6 gf-form-input--has-help-icon"
-          ng-model="ctrl.alert.for"
-          spellcheck="false"
-          placeholder="5m"
-          ng-pattern="/(^\d+([dhms])$)|(0)|(^$)/"
-        />
-        <info-popover mode="right-absolute">
-          If an alert rule has a configured and the query violates the configured threshold, then it goes from OK
-          to Pending. Grafana does not send any notifications for that change. Once the alert rule has been
-          firing for more than For duration, then the alert changes to Alerting and sends alert notifications.
-        </info-popover>
-      </div>
-    </div>
-    <div class="gf-form" ng-if="ctrl.frequencyWarning">
-      <label class="gf-form-label text-warning">
-        <icon name="'exclamation-triangle'"></icon> {{ctrl.frequencyWarning}}
-      </label>
-    </div>
-  </div>
-
-  <div class="gf-form-group">
-    <h4 class="section-heading">Conditions</h4>
-    <div class="gf-form-inline" ng-repeat="conditionModel in ctrl.conditionModels">
-      <div class="gf-form">
-        <metric-segment-model
-          css-class="query-keyword width-5"
-          ng-if="$index"
-          property="conditionModel.operator.type"
-          options="ctrl.evalOperators"
-          custom="false"
-        ></metric-segment-model>
-        <span class="gf-form-label query-keyword width-5" ng-if="$index===0">WHEN</span>
-      </div>
-      <div class="gf-form">
-        <query-part-editor
-          class="gf-form-label query-part width-9"
-          part="conditionModel.reducerPart"
-          handle-event="ctrl.handleReducerPartEvent(conditionModel, $event)"
-        >
-        </query-part-editor>
-        <span class="gf-form-label query-keyword">OF</span>
-      </div>
-      <div class="gf-form">
-        <query-part-editor
-          class="gf-form-label query-part"
-          part="conditionModel.queryPart"
-          handle-event="ctrl.handleQueryPartEvent(conditionModel, $event)"
-        >
-        </query-part-editor>
-      </div>
-      <div class="gf-form">
-        <metric-segment-model
-          property="conditionModel.evaluator.type"
-          options="ctrl.evalFunctions"
-          custom="false"
-          css-class="query-keyword"
-          on-change="ctrl.evaluatorTypeChanged(conditionModel.evaluator)"
-        ></metric-segment-model>
-        <input
-          class="gf-form-input max-width-9"
-          type="number"
-          step="any"
-          ng-hide="conditionModel.evaluator.params.length === 0"
-          ng-model="conditionModel.evaluator.params[0]"
-          ng-change="ctrl.evaluatorParamsChanged()"
-        />
-        <label class="gf-form-label query-keyword" ng-show="conditionModel.evaluator.params.length === 2">TO</label>
-        <input
-          class="gf-form-input max-width-9"
-          type="number"
-          step="any"
-          ng-if="conditionModel.evaluator.params.length === 2"
-          ng-model="conditionModel.evaluator.params[1]"
-          ng-change="ctrl.evaluatorParamsChanged()"
-        />
-      </div>
-      <div class="gf-form">
-        <label class="gf-form-label">
-          <a class="pointer" tabindex="1" ng-click="ctrl.removeCondition($index)">
-            <icon name="'trash-alt'"></icon>
-          </a>
-        </label>
-      </div>
-    </div>
-
-    <div class="gf-form">
-      <label class="gf-form-label dropdown">
-        <a class="pointer dropdown-toggle" data-toggle="dropdown">
-          <icon name="'plus-circle'"></icon>
-        </a>
-        <ul class="dropdown-menu" role="menu">
-          <li ng-repeat="ct in ctrl.conditionTypes" role="menuitem">
-            <a ng-click="ctrl.addCondition(ct.value);">{{ct.text}}</a>
-          </li>
-        </ul>
-      </label>
-    </div>
-  </div>
-
-  <div class="gf-form-group">
-    <h4 class="section-heading">No data and error handling</h4>
-    <div class="gf-form-inline">
-      <div class="gf-form">
-        <span class="gf-form-label width-15">If no data or all values are null</span>
-      </div>
-      <div class="gf-form">
-        <span class="gf-form-label query-keyword">set state to</span>
-        <div class="gf-form-select-wrapper">
-          <select
-            class="gf-form-input"
-            ng-model="ctrl.alert.noDataState"
-            ng-options="f.value as f.text for f in ctrl.noDataModes"
-          >
-          </select>
-        </div>
-      </div>
-    </div>
-
-    <div class="gf-form-inline">
-      <div class="gf-form">
-        <span class="gf-form-label width-15">If execution error or timeout</span>
-      </div>
-      <div class="gf-form">
-        <span class="gf-form-label query-keyword">set state to</span>
-        <div class="gf-form-select-wrapper">
-          <select
-            class="gf-form-input"
-            ng-model="ctrl.alert.executionErrorState"
-            ng-options="f.value as f.text for f in ctrl.executionErrorModes"
-          >
-          </select>
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <h4 class="section-heading">Notifications</h4>
-  <div class="gf-form-inline">
-    <div class="gf-form">
-      <span class="gf-form-label width-8">Send to</span>
-    </div>
-    <div class="gf-form" ng-repeat="nc in ctrl.alertNotifications">
-      <span class="gf-form-label">
-        <icon name="'{{nc.iconClass}}'"></icon>
-        &nbsp;{{nc.name}}&nbsp;<span ng-if="nc.isDefault">(default)</span>
-        <icon
-          name="'times'"
-          class="pointer muted"
-          ng-click="ctrl.removeNotification(nc)"
-          ng-if="nc.isDefault === false"
-        ></icon>
-      </span>
-    </div>
-    <div class="gf-form">
-      <metric-segment
-        segment="ctrl.addNotificationSegment"
-        get-options="ctrl.getNotifications()"
-        on-change="ctrl.notificationAdded()"
-      ></metric-segment>
-    </div>
-  </div>
-  <div class="gf-form gf-form--v-stretch">
-    <span class="gf-form-label width-8">Message</span>
-    <textarea
-      class="gf-form-input gf-form-input--has-help-icon"
-      rows="10"
-      ng-model="ctrl.alert.message"
-      placeholder="Notification message details..."
-    ></textarea>
-    <info-popover mode="right-absolute">
-      If you want to apply templating to the alert rule name, use the following syntax - ${Label}
-    </info-popover>
-  </div>
-  <div class="gf-form">
-    <span class="gf-form-label width-8">Tags</span>
-    <div class="gf-form-group">
-      <div class="gf-form-inline" ng-repeat="(name, value) in ctrl.alert.alertRuleTags">
-        <label class="gf-form-label width-15">{{ name }}</label>
-        <input
-          class="gf-form-input width-15"
-          placeholder="Tag value..."
-          ng-model="ctrl.alert.alertRuleTags[name]"
-          type="text"
-        />
-        <label class="gf-form-label">
-          <a class="pointer" tabindex="1" ng-click="ctrl.removeAlertRuleTag(name)">
-            <icon name="'trash-alt'"></icon>
-          </a>
-        </label>
-      </div>
-      <div class="gf-form-inline">
-        <div class="gf-form">
-          <input
-            class="gf-form-input width-15"
-            placeholder="New tag name..."
-            ng-model="ctrl.newAlertRuleTag.name"
-            type="text"
-          />
-          <input
-            class="gf-form-input width-15"
-            placeholder="New tag value..."
-            ng-model="ctrl.newAlertRuleTag.value"
-            type="text"
-          />
-        </div>
-      </div>
-      <div class="gf-form">
-        <label class="gf-form-label">
-          <a class="pointer" tabindex="1" ng-click="ctrl.addAlertRuleTag()">
-            <icon name="'plus-circle'"></icon>&nbsp;Add Tag
-          </a>
-        </label>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/public/app/features/alerting/routes.tsx b/public/app/features/alerting/routes.tsx
index 4ae31262daa88..ddc9d11277358 100644
--- a/public/app/features/alerting/routes.tsx
+++ b/public/app/features/alerting/routes.tsx
@@ -1,308 +1,223 @@
-import { uniq } from 'lodash';
-import React from 'react';
-
 import { SafeDynamicImport } from 'app/core/components/DynamicImports/SafeDynamicImport';
-import { NavLandingPage } from 'app/core/components/NavLandingPage/NavLandingPage';
 import { config } from 'app/core/config';
-import { RouteDescriptor } from 'app/core/navigation/types';
+import { GrafanaRouteComponent, RouteDescriptor } from 'app/core/navigation/types';
 import { AccessControlAction } from 'app/types';
 
 import { evaluateAccess } from './unified/utils/access-control';
 
-const commonRoutes: RouteDescriptor[] = [];
-
-const legacyRoutes: RouteDescriptor[] = [
-  ...commonRoutes,
-  {
-    path: '/alerting',
-    component: () => <NavLandingPage navId="alerting-legacy" />,
-  },
-  {
-    path: '/alerting/list',
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "AlertRuleListIndex" */ 'app/features/alerting/AlertRuleList')
-    ),
-  },
-  {
-    path: '/alerting/ng/list',
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "AlertRuleList" */ 'app/features/alerting/AlertRuleList')
-    ),
-  },
-  {
-    path: '/alerting/notifications',
-    roles: config.unifiedAlertingEnabled ? () => ['Editor', 'Admin'] : undefined,
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "NotificationsListPage" */ 'app/features/alerting/NotificationsListPage')
-    ),
-  },
-  {
-    path: '/alerting/notifications/templates/new',
-    roles: () => ['Editor', 'Admin'],
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "NotificationsListPage" */ 'app/features/alerting/NotificationsListPage')
-    ),
-  },
-  {
-    path: '/alerting/notifications/templates/:id/edit',
-    roles: () => ['Editor', 'Admin'],
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "NotificationsListPage" */ 'app/features/alerting/NotificationsListPage')
-    ),
-  },
-  {
-    path: '/alerting/notifications/receivers/new',
-    roles: () => ['Editor', 'Admin'],
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "NotificationsListPage" */ 'app/features/alerting/NotificationsListPage')
-    ),
-  },
-  {
-    path: '/alerting/notifications/receivers/:id/edit',
-    roles: () => ['Editor', 'Admin'],
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "NotificationsListPage" */ 'app/features/alerting/NotificationsListPage')
-    ),
-  },
-  {
-    path: '/alerting/notifications/global-config',
-    roles: () => ['Admin', 'Editor'],
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "NotificationsListPage" */ 'app/features/alerting/NotificationsListPage')
-    ),
-  },
-  {
-    path: '/alerting/notification/new',
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "NewNotificationChannel" */ 'app/features/alerting/NewNotificationChannelPage')
-    ),
-  },
-  {
-    path: '/alerting/notification/:id/edit',
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "EditNotificationChannel"*/ 'app/features/alerting/EditNotificationChannelPage')
-    ),
-  },
-];
-
-const unifiedRoutes: RouteDescriptor[] = [
-  ...commonRoutes,
-  {
-    path: '/alerting',
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "AlertingHome" */ 'app/features/alerting/unified/home/Home')
-    ),
-  },
-  {
-    path: '/alerting/home',
-    exact: false,
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "AlertingHome" */ 'app/features/alerting/unified/home/Home')
-    ),
-  },
-  {
-    path: '/alerting/list',
-    roles: evaluateAccess([AccessControlAction.AlertingRuleRead, AccessControlAction.AlertingRuleExternalRead]),
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "AlertRuleListIndex" */ 'app/features/alerting/unified/RuleList')
-    ),
-  },
-  {
-    path: '/alerting/routes',
-    roles: evaluateAccess([
-      AccessControlAction.AlertingNotificationsRead,
-      AccessControlAction.AlertingNotificationsExternalRead,
-    ]),
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "AlertAmRoutes" */ 'app/features/alerting/unified/NotificationPolicies')
-    ),
-  },
-  {
-    path: '/alerting/routes/mute-timing/new',
-    roles: evaluateAccess([
-      AccessControlAction.AlertingNotificationsWrite,
-      AccessControlAction.AlertingNotificationsExternalWrite,
-    ]),
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "MuteTimings" */ 'app/features/alerting/unified/MuteTimings')
-    ),
-  },
-  {
-    path: '/alerting/routes/mute-timing/edit',
-    roles: evaluateAccess([
-      AccessControlAction.AlertingNotificationsWrite,
-      AccessControlAction.AlertingNotificationsExternalWrite,
-    ]),
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "MuteTimings" */ 'app/features/alerting/unified/MuteTimings')
-    ),
-  },
-  {
-    path: '/alerting/silences',
-    roles: evaluateAccess([
-      AccessControlAction.AlertingInstanceRead,
-      AccessControlAction.AlertingInstancesExternalRead,
-    ]),
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "AlertSilences" */ 'app/features/alerting/unified/Silences')
-    ),
-  },
-  {
-    path: '/alerting/silence/new',
-    roles: evaluateAccess([
-      AccessControlAction.AlertingInstanceCreate,
-      AccessControlAction.AlertingInstancesExternalWrite,
-    ]),
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "AlertSilences" */ 'app/features/alerting/unified/Silences')
-    ),
-  },
-  {
-    path: '/alerting/silence/:id/edit',
-    roles: evaluateAccess([
-      AccessControlAction.AlertingInstanceUpdate,
-      AccessControlAction.AlertingInstancesExternalWrite,
-    ]),
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "AlertSilences" */ 'app/features/alerting/unified/Silences')
-    ),
-  },
-  {
-    path: '/alerting/notifications',
-    roles: evaluateAccess([
-      AccessControlAction.AlertingNotificationsRead,
-      AccessControlAction.AlertingNotificationsExternalRead,
-    ]),
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "NotificationsListPage" */ 'app/features/alerting/unified/Receivers')
-    ),
-  },
-  {
-    path: '/alerting/notifications/:type/new',
-    roles: evaluateAccess([
-      AccessControlAction.AlertingNotificationsWrite,
-      AccessControlAction.AlertingNotificationsExternalWrite,
-    ]),
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "NotificationsListPage" */ 'app/features/alerting/unified/Receivers')
-    ),
-  },
-  {
-    path: '/alerting/notifications/receivers/:id/edit',
-    roles: evaluateAccess([
-      AccessControlAction.AlertingNotificationsWrite,
-      AccessControlAction.AlertingNotificationsExternalWrite,
-      AccessControlAction.AlertingNotificationsRead,
-      AccessControlAction.AlertingNotificationsExternalRead,
-    ]),
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "NotificationsListPage" */ 'app/features/alerting/unified/Receivers')
-    ),
-  },
-  {
-    path: '/alerting/notifications/:type/:id/edit',
-    roles: evaluateAccess([
-      AccessControlAction.AlertingNotificationsWrite,
-      AccessControlAction.AlertingNotificationsExternalWrite,
-    ]),
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "NotificationsListPage" */ 'app/features/alerting/unified/Receivers')
-    ),
-  },
-  {
-    path: '/alerting/notifications/:type/:id/duplicate',
-    roles: evaluateAccess([
-      AccessControlAction.AlertingNotificationsWrite,
-      AccessControlAction.AlertingNotificationsExternalWrite,
-    ]),
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "NotificationsListPage" */ 'app/features/alerting/unified/Receivers')
-    ),
-  },
-  {
-    path: '/alerting/notifications/:type',
-    roles: evaluateAccess([
-      AccessControlAction.AlertingNotificationsWrite,
-      AccessControlAction.AlertingNotificationsExternalWrite,
-    ]),
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "NotificationsListPage" */ 'app/features/alerting/unified/Receivers')
-    ),
-  },
-  {
-    path: '/alerting/groups/',
-    roles: evaluateAccess([
-      AccessControlAction.AlertingInstanceRead,
-      AccessControlAction.AlertingInstancesExternalRead,
-    ]),
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "AlertGroups" */ 'app/features/alerting/unified/AlertGroups')
-    ),
-  },
-  {
-    path: '/alerting/new/:type?',
-    pageClass: 'page-alerting',
-    roles: evaluateAccess([AccessControlAction.AlertingRuleCreate, AccessControlAction.AlertingRuleExternalWrite]),
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "AlertingRuleForm"*/ 'app/features/alerting/unified/RuleEditor')
-    ),
-  },
-  {
-    path: '/alerting/:id/edit',
-    pageClass: 'page-alerting',
-    roles: evaluateAccess([AccessControlAction.AlertingRuleUpdate, AccessControlAction.AlertingRuleExternalWrite]),
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "AlertingRuleForm"*/ 'app/features/alerting/unified/RuleEditor')
-    ),
-  },
-  {
-    path: '/alerting/:id/modify-export',
-    pageClass: 'page-alerting',
-    roles: evaluateAccess([AccessControlAction.AlertingRuleRead]),
-    component: SafeDynamicImport(
-      () =>
-        import(
-          /* webpackChunkName: "AlertingRuleForm"*/ 'app/features/alerting/unified/components/export/GrafanaModifyExport'
-        )
-    ),
-  },
-  {
-    path: '/alerting/:sourceName/:id/view',
-    pageClass: 'page-alerting',
-    roles: evaluateAccess([AccessControlAction.AlertingRuleRead, AccessControlAction.AlertingRuleExternalRead]),
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "AlertingRule"*/ 'app/features/alerting/unified/RuleViewer')
-    ),
-  },
-  {
-    path: '/alerting/:sourceName/:name/find',
-    pageClass: 'page-alerting',
-    roles: evaluateAccess([AccessControlAction.AlertingRuleRead, AccessControlAction.AlertingRuleExternalRead]),
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "AlertingRedirectToRule"*/ 'app/features/alerting/unified/RedirectToRuleViewer')
-    ),
-  },
-  {
-    path: '/alerting/admin',
-    roles: () => ['Admin'],
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "AlertingAdmin" */ 'app/features/alerting/unified/Admin')
-    ),
-  },
-];
-
 export function getAlertingRoutes(cfg = config): RouteDescriptor[] {
-  if (cfg.unifiedAlertingEnabled) {
-    return unifiedRoutes;
-  } else if (cfg.alertingEnabled) {
-    return legacyRoutes;
-  }
+  const routes = [
+    {
+      path: '/alerting',
+      component: importAlertingComponent(
+        () => import(/* webpackChunkName: "AlertingHome" */ 'app/features/alerting/unified/home/Home')
+      ),
+    },
+    {
+      path: '/alerting/home',
+      exact: false,
+      component: importAlertingComponent(
+        () => import(/* webpackChunkName: "AlertingHome" */ 'app/features/alerting/unified/home/Home')
+      ),
+    },
+    {
+      path: '/alerting/list',
+      roles: evaluateAccess([AccessControlAction.AlertingRuleRead, AccessControlAction.AlertingRuleExternalRead]),
+      component: importAlertingComponent(
+        () => import(/* webpackChunkName: "AlertRuleListIndex" */ 'app/features/alerting/unified/RuleList')
+      ),
+    },
+    {
+      path: '/alerting/routes',
+      roles: evaluateAccess([
+        AccessControlAction.AlertingNotificationsRead,
+        AccessControlAction.AlertingNotificationsExternalRead,
+      ]),
+      component: importAlertingComponent(
+        () => import(/* webpackChunkName: "AlertAmRoutes" */ 'app/features/alerting/unified/NotificationPolicies')
+      ),
+    },
+    {
+      path: '/alerting/routes/mute-timing/new',
+      roles: evaluateAccess([
+        AccessControlAction.AlertingNotificationsWrite,
+        AccessControlAction.AlertingNotificationsExternalWrite,
+      ]),
+      component: importAlertingComponent(
+        () => import(/* webpackChunkName: "MuteTimings" */ 'app/features/alerting/unified/MuteTimings')
+      ),
+    },
+    {
+      path: '/alerting/routes/mute-timing/edit',
+      roles: evaluateAccess([
+        AccessControlAction.AlertingNotificationsWrite,
+        AccessControlAction.AlertingNotificationsExternalWrite,
+      ]),
+      component: importAlertingComponent(
+        () => import(/* webpackChunkName: "MuteTimings" */ 'app/features/alerting/unified/MuteTimings')
+      ),
+    },
+    {
+      path: '/alerting/silences',
+      roles: evaluateAccess([
+        AccessControlAction.AlertingInstanceRead,
+        AccessControlAction.AlertingInstancesExternalRead,
+      ]),
+      component: importAlertingComponent(
+        () => import(/* webpackChunkName: "AlertSilences" */ 'app/features/alerting/unified/Silences')
+      ),
+    },
+    {
+      path: '/alerting/silence/new',
+      roles: evaluateAccess([
+        AccessControlAction.AlertingInstanceCreate,
+        AccessControlAction.AlertingInstancesExternalWrite,
+      ]),
+      component: importAlertingComponent(
+        () => import(/* webpackChunkName: "AlertSilences" */ 'app/features/alerting/unified/Silences')
+      ),
+    },
+    {
+      path: '/alerting/silence/:id/edit',
+      roles: evaluateAccess([
+        AccessControlAction.AlertingInstanceUpdate,
+        AccessControlAction.AlertingInstancesExternalWrite,
+      ]),
+      component: importAlertingComponent(
+        () => import(/* webpackChunkName: "AlertSilences" */ 'app/features/alerting/unified/Silences')
+      ),
+    },
+    {
+      path: '/alerting/notifications',
+      roles: evaluateAccess([
+        AccessControlAction.AlertingNotificationsRead,
+        AccessControlAction.AlertingNotificationsExternalRead,
+      ]),
+      component: importAlertingComponent(
+        () => import(/* webpackChunkName: "NotificationsListPage" */ 'app/features/alerting/unified/Receivers')
+      ),
+    },
+    {
+      path: '/alerting/notifications/:type/new',
+      roles: evaluateAccess([
+        AccessControlAction.AlertingNotificationsWrite,
+        AccessControlAction.AlertingNotificationsExternalWrite,
+      ]),
+      component: importAlertingComponent(
+        () => import(/* webpackChunkName: "NotificationsListPage" */ 'app/features/alerting/unified/Receivers')
+      ),
+    },
+    {
+      path: '/alerting/notifications/receivers/:id/edit',
+      roles: evaluateAccess([
+        AccessControlAction.AlertingNotificationsWrite,
+        AccessControlAction.AlertingNotificationsExternalWrite,
+        AccessControlAction.AlertingNotificationsRead,
+        AccessControlAction.AlertingNotificationsExternalRead,
+      ]),
+      component: importAlertingComponent(
+        () => import(/* webpackChunkName: "NotificationsListPage" */ 'app/features/alerting/unified/Receivers')
+      ),
+    },
+    {
+      path: '/alerting/notifications/:type/:id/edit',
+      roles: evaluateAccess([
+        AccessControlAction.AlertingNotificationsWrite,
+        AccessControlAction.AlertingNotificationsExternalWrite,
+      ]),
+      component: importAlertingComponent(
+        () => import(/* webpackChunkName: "NotificationsListPage" */ 'app/features/alerting/unified/Receivers')
+      ),
+    },
+    {
+      path: '/alerting/notifications/:type/:id/duplicate',
+      roles: evaluateAccess([
+        AccessControlAction.AlertingNotificationsWrite,
+        AccessControlAction.AlertingNotificationsExternalWrite,
+      ]),
+      component: importAlertingComponent(
+        () => import(/* webpackChunkName: "NotificationsListPage" */ 'app/features/alerting/unified/Receivers')
+      ),
+    },
+    {
+      path: '/alerting/notifications/:type',
+      roles: evaluateAccess([
+        AccessControlAction.AlertingNotificationsWrite,
+        AccessControlAction.AlertingNotificationsExternalWrite,
+      ]),
+      component: importAlertingComponent(
+        () => import(/* webpackChunkName: "NotificationsListPage" */ 'app/features/alerting/unified/Receivers')
+      ),
+    },
+    {
+      path: '/alerting/groups/',
+      roles: evaluateAccess([
+        AccessControlAction.AlertingInstanceRead,
+        AccessControlAction.AlertingInstancesExternalRead,
+      ]),
+      component: importAlertingComponent(
+        () => import(/* webpackChunkName: "AlertGroups" */ 'app/features/alerting/unified/AlertGroups')
+      ),
+    },
+    {
+      path: '/alerting/new/:type?',
+      pageClass: 'page-alerting',
+      roles: evaluateAccess([AccessControlAction.AlertingRuleCreate, AccessControlAction.AlertingRuleExternalWrite]),
+      component: importAlertingComponent(
+        () => import(/* webpackChunkName: "AlertingRuleForm"*/ 'app/features/alerting/unified/RuleEditor')
+      ),
+    },
+    {
+      path: '/alerting/:id/edit',
+      pageClass: 'page-alerting',
+      roles: evaluateAccess([AccessControlAction.AlertingRuleUpdate, AccessControlAction.AlertingRuleExternalWrite]),
+      component: importAlertingComponent(
+        () => import(/* webpackChunkName: "AlertingRuleForm"*/ 'app/features/alerting/unified/RuleEditor')
+      ),
+    },
+    {
+      path: '/alerting/:id/modify-export',
+      pageClass: 'page-alerting',
+      roles: evaluateAccess([AccessControlAction.AlertingRuleRead]),
+      component: importAlertingComponent(
+        () =>
+          import(
+            /* webpackChunkName: "AlertingRuleForm"*/ 'app/features/alerting/unified/components/export/GrafanaModifyExport'
+          )
+      ),
+    },
+    {
+      path: '/alerting/:sourceName/:id/view',
+      pageClass: 'page-alerting',
+      roles: evaluateAccess([AccessControlAction.AlertingRuleRead, AccessControlAction.AlertingRuleExternalRead]),
+      component: importAlertingComponent(
+        () => import(/* webpackChunkName: "AlertingRule"*/ 'app/features/alerting/unified/RuleViewer')
+      ),
+    },
+    {
+      path: '/alerting/:sourceName/:name/find',
+      pageClass: 'page-alerting',
+      roles: evaluateAccess([AccessControlAction.AlertingRuleRead, AccessControlAction.AlertingRuleExternalRead]),
+      component: importAlertingComponent(
+        () =>
+          import(/* webpackChunkName: "AlertingRedirectToRule"*/ 'app/features/alerting/unified/RedirectToRuleViewer')
+      ),
+    },
+    {
+      path: '/alerting/admin',
+      roles: () => ['Admin'],
+      component: importAlertingComponent(
+        () => import(/* webpackChunkName: "AlertingAdmin" */ 'app/features/alerting/unified/Admin')
+      ),
+    },
+  ];
+
+  return routes;
+}
 
-  const uniquePaths = uniq([...legacyRoutes, ...unifiedRoutes].map((route) => route.path));
-  return uniquePaths.map((path) => ({
-    path,
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "AlertingFeatureTogglePage"*/ 'app/features/alerting/FeatureTogglePage')
-    ),
-  }));
+// this function will always load the "feature disabled" component for all alerting routes
+function importAlertingComponent(loader: () => any): GrafanaRouteComponent {
+  const featureDisabledPageLoader = () =>
+    import(/* webpackChunkName: "AlertingDisabled" */ 'app/features/alerting/unified/AlertingNotEnabled');
+  return SafeDynamicImport(config.unifiedAlertingEnabled ? loader : featureDisabledPageLoader);
 }
diff --git a/public/app/features/alerting/state/actions.ts b/public/app/features/alerting/state/actions.ts
deleted file mode 100644
index 84f5ac3c86e81..0000000000000
--- a/public/app/features/alerting/state/actions.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { getBackendSrv, isFetchError, locationService } from '@grafana/runtime';
-import { notifyApp } from 'app/core/actions';
-import { createErrorNotification, createSuccessNotification } from 'app/core/copy/appNotification';
-import { AlertRuleDTO, NotifierDTO, ThunkResult } from 'app/types';
-
-import { loadAlertRules, loadedAlertRules, notificationChannelLoaded, setNotificationChannels } from './reducers';
-
-export function getAlertRulesAsync(options: { state: string }): ThunkResult<void> {
-  return async (dispatch) => {
-    dispatch(loadAlertRules());
-    const rules: AlertRuleDTO[] = await getBackendSrv().get('/api/alerts', options);
-    dispatch(loadedAlertRules(rules));
-  };
-}
-
-export function togglePauseAlertRule(id: number, options: { paused: boolean }): ThunkResult<void> {
-  return async (dispatch) => {
-    await getBackendSrv().post(`/api/alerts/${id}/pause`, options);
-    const stateFilter = locationService.getSearchObject().state || 'all';
-    dispatch(getAlertRulesAsync({ state: stateFilter.toString() }));
-  };
-}
-
-export function createNotificationChannel(data: any): ThunkResult<Promise<void>> {
-  return async (dispatch) => {
-    try {
-      await getBackendSrv().post(`/api/alert-notifications`, data);
-      dispatch(notifyApp(createSuccessNotification('Notification created')));
-      locationService.push('/alerting/notifications');
-    } catch (error) {
-      if (isFetchError(error)) {
-        dispatch(notifyApp(createErrorNotification(error.data.error)));
-      }
-    }
-  };
-}
-
-export function updateNotificationChannel(data: any): ThunkResult<void> {
-  return async (dispatch) => {
-    try {
-      await getBackendSrv().put(`/api/alert-notifications/${data.id}`, data);
-      dispatch(notifyApp(createSuccessNotification('Notification updated')));
-    } catch (error) {
-      if (isFetchError(error)) {
-        dispatch(notifyApp(createErrorNotification(error.data.error)));
-      }
-    }
-  };
-}
-
-export function testNotificationChannel(data: any): ThunkResult<void> {
-  return async (dispatch, getState) => {
-    const channel = getState().notificationChannel.notificationChannel;
-    await getBackendSrv().post('/api/alert-notifications/test', { id: channel.id, ...data });
-  };
-}
-
-export function loadNotificationTypes(): ThunkResult<void> {
-  return async (dispatch) => {
-    const alertNotifiers: NotifierDTO[] = await getBackendSrv().get(`/api/alert-notifiers`);
-
-    const notificationTypes = alertNotifiers.sort((o1, o2) => {
-      if (o1.name > o2.name) {
-        return 1;
-      }
-      return -1;
-    });
-
-    dispatch(setNotificationChannels(notificationTypes));
-  };
-}
-
-export function loadNotificationChannel(id: number): ThunkResult<void> {
-  return async (dispatch) => {
-    await dispatch(loadNotificationTypes());
-    const notificationChannel = await getBackendSrv().get(`/api/alert-notifications/${id}`);
-    dispatch(notificationChannelLoaded(notificationChannel));
-  };
-}
diff --git a/public/app/features/alerting/state/alertDef.ts b/public/app/features/alerting/state/alertDef.ts
index 7ce82133ac5dc..348d89f91bc08 100644
--- a/public/app/features/alerting/state/alertDef.ts
+++ b/public/app/features/alerting/state/alertDef.ts
@@ -207,6 +207,25 @@ function getAlertAnnotationInfo(ah: any) {
   return '';
 }
 
+// Copy of getAlertAnnotationInfo, used in annotation tooltip
+function getAlertAnnotationText(annotationData: any) {
+  // backward compatibility, can be removed in grafana 5.x
+  // old way stored evalMatches in data property directly,
+  // new way stores it in evalMatches property on new data object
+
+  if (isArray(annotationData)) {
+    return joinEvalMatches(annotationData, ', ');
+  } else if (isArray(annotationData.evalMatches)) {
+    return joinEvalMatches(annotationData.evalMatches, ', ');
+  }
+
+  if (annotationData.error) {
+    return 'Error: ' + annotationData.error;
+  }
+
+  return '';
+}
+
 export default {
   alertQueryDef: alertQueryDef,
   getStateDisplayModel: getStateDisplayModel,
@@ -218,5 +237,6 @@ export default {
   reducerTypes: reducerTypes,
   createReducerPart: createReducerPart,
   getAlertAnnotationInfo: getAlertAnnotationInfo,
+  getAlertAnnotationText: getAlertAnnotationText,
   alertStateSortScore: alertStateSortScore,
 };
diff --git a/public/app/features/alerting/unified/Admin.tsx b/public/app/features/alerting/unified/Admin.tsx
index 87754cb6c179c..d086bfabc1378 100644
--- a/public/app/features/alerting/unified/Admin.tsx
+++ b/public/app/features/alerting/unified/Admin.tsx
@@ -8,7 +8,7 @@ import { GRAFANA_RULES_SOURCE_NAME } from './utils/datasource';
 
 export default function Admin(): JSX.Element {
   return (
-    <AlertmanagerPageWrapper pageId="alerting-admin" accessType="notification">
+    <AlertmanagerPageWrapper navId="alerting-admin" accessType="notification">
       <AdminPageContents />
     </AlertmanagerPageWrapper>
   );
diff --git a/public/app/features/alerting/unified/AlertGroups.test.tsx b/public/app/features/alerting/unified/AlertGroups.test.tsx
index 9144f619db44d..5771a29678539 100644
--- a/public/app/features/alerting/unified/AlertGroups.test.tsx
+++ b/public/app/features/alerting/unified/AlertGroups.test.tsx
@@ -1,9 +1,10 @@
-import { render, waitFor } from '@testing-library/react';
+import { render, waitFor, waitForElementToBeRemoved } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { TestProvider } from 'test/helpers/TestProvider';
 import { byRole, byTestId, byText } from 'testing-library-selector';
 
+import { selectors } from '@grafana/e2e-selectors';
 import { setDataSourceSrv } from '@grafana/runtime';
 import { AccessControlAction } from 'app/types';
 
@@ -48,13 +49,14 @@ const ui = {
   groupCollapseToggle: byTestId('alert-group-collapse-toggle'),
   groupTable: byTestId('alert-group-table'),
   row: byTestId('row'),
-  collapseToggle: byTestId('collapse-toggle'),
+  collapseToggle: byTestId(selectors.components.AlertRules.toggle),
   silenceButton: byText('Silence'),
   sourceButton: byText('See source'),
   matcherInput: byTestId('search-query-input'),
   groupByContainer: byTestId('group-by-container'),
   groupByInput: byRole('combobox', { name: /group by label keys/i }),
   clearButton: byRole('button', { name: 'Clear filters' }),
+  loadingIndicator: byText('Loading notifications'),
 };
 
 describe('AlertGroups', () => {
@@ -65,20 +67,24 @@ describe('AlertGroups', () => {
       AccessControlAction.AlertingInstancesExternalRead,
       AccessControlAction.AlertingRuleRead,
     ]);
+  });
+
+  beforeEach(() => {
+    setDataSourceSrv(new MockDataSourceSrv(dataSources));
+  });
+
+  afterEach(() => {
+    mocks.api.fetchAlertGroups.mockClear();
+  });
 
+  it('loads and shows groups', async () => {
     mocks.api.fetchAlertGroups.mockImplementation(() => {
       return Promise.resolve([
         mockAlertGroup({ labels: {}, alerts: [mockAlertmanagerAlert({ labels: { foo: 'bar' } })] }),
         mockAlertGroup(),
       ]);
     });
-  });
-
-  beforeEach(() => {
-    setDataSourceSrv(new MockDataSourceSrv(dataSources));
-  });
 
-  it('loads and shows groups', async () => {
     renderAmNotifications();
 
     await waitFor(() => expect(mocks.api.fetchAlertGroups).toHaveBeenCalled());
@@ -104,9 +110,12 @@ describe('AlertGroups', () => {
         mockAlertGroup({
           labels: { region },
           alerts: [
-            mockAlertmanagerAlert({ labels: { region, appName: 'billing', env: 'production' } }),
-            mockAlertmanagerAlert({ labels: { region, appName: 'auth', env: 'staging', uniqueLabel: 'true' } }),
-            mockAlertmanagerAlert({ labels: { region, appName: 'frontend', env: 'production' } }),
+            mockAlertmanagerAlert({ fingerprint: '1', labels: { region, appName: 'billing', env: 'production' } }),
+            mockAlertmanagerAlert({
+              fingerprint: '2',
+              labels: { region, appName: 'auth', env: 'staging', uniqueLabel: 'true' },
+            }),
+            mockAlertmanagerAlert({ fingerprint: '3', labels: { region, appName: 'frontend', env: 'production' } }),
           ],
         })
       );
@@ -160,6 +169,33 @@ describe('AlertGroups', () => {
     expect(groups[1]).toHaveTextContent('uniqueLabeltrue');
   });
 
+  it('should split custom grouping groups with the same label by receiver', async () => {
+    // The same alert is repeated in two groups with different receivers
+    const alert = mockAlertmanagerAlert({
+      fingerprint: '1',
+      labels: { region: 'NASA', appName: 'billing' },
+      receivers: [{ name: 'slack' }, { name: 'email' }],
+    });
+    const amGroups = [
+      mockAlertGroup({ receiver: { name: 'slack' }, labels: { region: 'NASA' }, alerts: [alert] }),
+      mockAlertGroup({ receiver: { name: 'email' }, labels: { region: 'NASA' }, alerts: [alert] }),
+    ];
+    mocks.api.fetchAlertGroups.mockResolvedValue(amGroups);
+
+    const user = userEvent.setup();
+
+    renderAmNotifications();
+    await waitForElementToBeRemoved(ui.loadingIndicator.query());
+
+    await user.type(ui.groupByInput.get(), 'appName{enter}');
+
+    const groups = await ui.group.findAll();
+
+    expect(groups).toHaveLength(2);
+    expect(groups[0]).toHaveTextContent('appNamebillingDelivered to slack');
+    expect(groups[1]).toHaveTextContent('appNamebillingDelivered to email');
+  });
+
   it('should combine multiple ungrouped groups', async () => {
     mocks.api.fetchAlertGroups.mockImplementation(() => {
       const groups = [
diff --git a/public/app/features/alerting/unified/AlertGroups.tsx b/public/app/features/alerting/unified/AlertGroups.tsx
index addf2cbd29a97..1f1d720616c26 100644
--- a/public/app/features/alerting/unified/AlertGroups.tsx
+++ b/public/app/features/alerting/unified/AlertGroups.tsx
@@ -91,7 +91,7 @@ const AlertGroups = () => {
 };
 
 const AlertGroupsPage = () => (
-  <AlertmanagerPageWrapper pageId="groups" accessType="instance">
+  <AlertmanagerPageWrapper navId="groups" accessType="instance">
     <AlertGroups />
   </AlertmanagerPageWrapper>
 );
diff --git a/public/app/features/alerting/unified/AlertingNotEnabled.tsx b/public/app/features/alerting/unified/AlertingNotEnabled.tsx
new file mode 100644
index 0000000000000..7d2b89ae9e5df
--- /dev/null
+++ b/public/app/features/alerting/unified/AlertingNotEnabled.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+
+import { NavModel } from '@grafana/data';
+import { Page } from 'app/core/components/Page/Page';
+
+export default function FeatureTogglePage() {
+  const navModel: NavModel = {
+    node: {
+      text: 'Alerting is not enabled',
+      hideFromBreadcrumbs: true,
+      subTitle: 'To enable alerting, enable it in the Grafana config',
+    },
+    main: {
+      text: 'Alerting is not enabled',
+    },
+  };
+
+  return (
+    <Page navModel={navModel}>
+      <Page.Contents>
+        <pre>
+          {`[unified_alerting]
+enabled = true
+`}
+        </pre>
+      </Page.Contents>
+    </Page>
+  );
+}
diff --git a/public/app/features/alerting/unified/AlertsFolderView.test.tsx b/public/app/features/alerting/unified/AlertsFolderView.test.tsx
index f7de4aedb8def..4ae40d245b4a6 100644
--- a/public/app/features/alerting/unified/AlertsFolderView.test.tsx
+++ b/public/app/features/alerting/unified/AlertsFolderView.test.tsx
@@ -8,6 +8,7 @@ import { FolderState } from 'app/types';
 import { CombinedRuleNamespace } from 'app/types/unified-alerting';
 
 import { AlertsFolderView } from './AlertsFolderView';
+import { useCombinedRuleNamespaces } from './hooks/useCombinedRuleNamespaces';
 import { mockCombinedRule } from './mocks';
 import { GRAFANA_RULES_SOURCE_NAME } from './utils/datasource';
 
@@ -21,7 +22,7 @@ const ui = {
   },
 };
 
-const combinedNamespaceMock = jest.fn<CombinedRuleNamespace[], any>();
+const combinedNamespaceMock = jest.fn(useCombinedRuleNamespaces);
 jest.mock('./hooks/useCombinedRuleNamespaces', () => ({
   useCombinedRuleNamespaces: () => combinedNamespaceMock(),
 }));
@@ -35,21 +36,20 @@ const mockFolder = (folderOverride: Partial<FolderState> = {}): FolderState => {
     canSave: false,
     url: '/folder-1',
     version: 1,
-    permissions: [],
-    canViewFolderPermissions: false,
     canDelete: false,
     ...folderOverride,
   };
 };
 
 describe('AlertsFolderView tests', () => {
-  it('Should display grafana alert rules when the namespace name matches the folder name', () => {
+  it('Should display grafana alert rules when the folder uid matches the name space uid', () => {
     // Arrange
     const folder = mockFolder();
 
     const grafanaNamespace: CombinedRuleNamespace = {
       name: folder.title,
       rulesSource: GRAFANA_RULES_SOURCE_NAME,
+      uid: 'folder-1',
       groups: [
         {
           name: 'group1',
@@ -92,13 +92,14 @@ describe('AlertsFolderView tests', () => {
     expect(alertRows[5]).toHaveTextContent('Test Alert 6');
   });
 
-  it('Should not display alert rules when the namespace name does not match the folder name', () => {
+  it('Should not display alert rules when the namespace uid does not match the folder uid', () => {
     // Arrange
     const folder = mockFolder();
 
     const grafanaNamespace: CombinedRuleNamespace = {
       name: 'Folder without alerts',
       rulesSource: GRAFANA_RULES_SOURCE_NAME,
+      uid: 'folder-2',
       groups: [
         {
           name: 'default',
@@ -131,6 +132,7 @@ describe('AlertsFolderView tests', () => {
     const grafanaNamespace: CombinedRuleNamespace = {
       name: folder.title,
       rulesSource: GRAFANA_RULES_SOURCE_NAME,
+      uid: 'folder-1',
       groups: [
         {
           name: 'default',
@@ -163,6 +165,7 @@ describe('AlertsFolderView tests', () => {
     const grafanaNamespace: CombinedRuleNamespace = {
       name: folder.title,
       rulesSource: GRAFANA_RULES_SOURCE_NAME,
+      uid: 'folder-1',
       groups: [
         {
           name: 'default',
diff --git a/public/app/features/alerting/unified/AlertsFolderView.tsx b/public/app/features/alerting/unified/AlertsFolderView.tsx
index 060ed9b370810..ff71c426a72a2 100644
--- a/public/app/features/alerting/unified/AlertsFolderView.tsx
+++ b/public/app/features/alerting/unified/AlertsFolderView.tsx
@@ -4,8 +4,7 @@ import React, { useEffect, useState } from 'react';
 import { useDebounce } from 'react-use';
 
 import { GrafanaTheme2, SelectableValue } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Card, FilterInput, Icon, Pagination, Select, TagList, useStyles2 } from '@grafana/ui';
+import { Card, FilterInput, Icon, Pagination, Select, TagList, useStyles2, Stack } from '@grafana/ui';
 import { DEFAULT_PER_PAGE_PAGINATION } from 'app/core/constants';
 import { getQueryParamValue } from 'app/core/utils/query';
 import { FolderState, useDispatch } from 'app/types';
@@ -51,7 +50,8 @@ export const AlertsFolderView = ({ folder }: Props) => {
   const { nameFilter, labelFilter, sortOrder, setNameFilter, setLabelFilter, setSortOrder } =
     useAlertsFolderViewParams();
 
-  const matchingNamespace = combinedNamespaces.find((namespace) => namespace.name === folder.title);
+  const matchingNamespace = combinedNamespaces.find((namespace) => namespace.uid === folder.uid);
+
   const alertRules = matchingNamespace?.groups.flatMap((group) => group.rules) ?? [];
 
   const filteredRules = filterAndSortRules(alertRules, nameFilter, labelFilter, sortOrder ?? SortOrder.Ascending);
@@ -87,7 +87,7 @@ export const AlertsFolderView = ({ folder }: Props) => {
           />
         </Stack>
 
-        <Stack gap={1}>
+        <Stack direction="column" gap={1}>
           {pageItems.map((currentRule) => (
             <Card
               key={currentRule.name}
@@ -141,8 +141,8 @@ function useAlertsFolderViewParams() {
     sortParam === SortOrder.Ascending
       ? SortOrder.Ascending
       : sortParam === SortOrder.Descending
-      ? SortOrder.Descending
-      : undefined
+        ? SortOrder.Descending
+        : undefined
   );
 
   useDebounce(
diff --git a/public/app/features/alerting/unified/Analytics.ts b/public/app/features/alerting/unified/Analytics.ts
index 2cc69d578ddcd..ef58a579ec255 100644
--- a/public/app/features/alerting/unified/Analytics.ts
+++ b/public/app/features/alerting/unified/Analytics.ts
@@ -1,12 +1,16 @@
+import { isEmpty } from 'lodash';
+
 import { dateTime } from '@grafana/data';
-import { faro, LogLevel as GrafanaLogLevel } from '@grafana/faro-web-sdk';
-import { getBackendSrv, logError } from '@grafana/runtime';
+import { createMonitoringLogger, getBackendSrv } from '@grafana/runtime';
 import { config, reportInteraction } from '@grafana/runtime/src';
 import { contextSrv } from 'app/core/core';
 
 import { RuleNamespace } from '../../../types/unified-alerting';
 import { RulerRulesConfigDTO } from '../../../types/unified-alerting-dto';
 
+import { getSearchFilterFromQuery, RulesFilter } from './search/rulesSearchParser';
+import { RuleFormType } from './types/rule-form';
+
 export const USER_CREATION_MIN_DAYS = 7;
 
 export const LogMessages = {
@@ -22,33 +26,29 @@ export const LogMessages = {
   unknownMessageFromError: 'unknown messageFromError',
 };
 
-// logInfo from '@grafana/runtime' should be used, but it doesn't handle Grafana JS Agent correctly
-export function logInfo(message: string, context: Record<string, string | number> = {}) {
-  if (config.grafanaJavascriptAgent.enabled) {
-    faro.api.pushLog([message], {
-      level: GrafanaLogLevel.INFO,
-      context: { ...context, module: 'Alerting' },
-    });
-  }
-}
+const { logInfo, logError, logMeasurement } = createMonitoringLogger('features.alerting', { module: 'Alerting' });
 
-export function logAlertingError(error: Error, context: Record<string, string | number> = {}) {
-  logError(error, { ...context, module: 'Alerting' });
-}
+export { logInfo, logError, logMeasurement };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function withPerformanceLogging<TFunc extends (...args: any[]) => Promise<any>>(
+  type: string,
   func: TFunc,
-  message: string,
   context: Record<string, string>
 ): (...args: Parameters<TFunc>) => Promise<Awaited<ReturnType<TFunc>>> {
   return async function (...args) {
     const startLoadingTs = performance.now();
+
     const response = await func(...args);
-    logInfo(message, {
-      loadTimeMs: (performance.now() - startLoadingTs).toFixed(0),
-      ...context,
-    });
+    const loadTimesMs = performance.now() - startLoadingTs;
+
+    logMeasurement(
+      type,
+      {
+        loadTimesMs,
+      },
+      context
+    );
 
     return response;
   };
@@ -56,8 +56,8 @@ export function withPerformanceLogging<TFunc extends (...args: any[]) => Promise
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function withPromRulesMetadataLogging<TFunc extends (...args: any[]) => Promise<RuleNamespace[]>>(
+  type: string,
   func: TFunc,
-  message: string,
   context: Record<string, string>
 ) {
   return async (...args: Parameters<TFunc>) => {
@@ -66,13 +66,16 @@ export function withPromRulesMetadataLogging<TFunc extends (...args: any[]) => P
 
     const { namespacesCount, groupsCount, rulesCount } = getPromRulesMetadata(response);
 
-    logInfo(message, {
-      loadTimeMs: (performance.now() - startLoadingTs).toFixed(0),
-      namespacesCount,
-      groupsCount,
-      rulesCount,
-      ...context,
-    });
+    logMeasurement(
+      type,
+      {
+        loadTimeMs: performance.now() - startLoadingTs,
+        namespacesCount,
+        groupsCount,
+        rulesCount,
+      },
+      context
+    );
     return response;
   };
 }
@@ -83,9 +86,9 @@ function getPromRulesMetadata(promRules: RuleNamespace[]) {
   const rulesCount = promRules.flatMap((ns) => ns.groups).flatMap((g) => g.rules).length;
 
   const metadata = {
-    namespacesCount: namespacesCount.toFixed(0),
-    groupsCount: groupsCount.toFixed(0),
-    rulesCount: rulesCount.toFixed(0),
+    namespacesCount: namespacesCount,
+    groupsCount: groupsCount,
+    rulesCount: rulesCount,
   };
 
   return metadata;
@@ -93,8 +96,8 @@ function getPromRulesMetadata(promRules: RuleNamespace[]) {
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function withRulerRulesMetadataLogging<TFunc extends (...args: any[]) => Promise<RulerRulesConfigDTO>>(
+  type: string,
   func: TFunc,
-  message: string,
   context: Record<string, string>
 ) {
   return async (...args: Parameters<TFunc>) => {
@@ -103,26 +106,29 @@ export function withRulerRulesMetadataLogging<TFunc extends (...args: any[]) =>
 
     const { namespacesCount, groupsCount, rulesCount } = getRulerRulesMetadata(response);
 
-    logInfo(message, {
-      loadTimeMs: (performance.now() - startLoadingTs).toFixed(0),
-      namespacesCount,
-      groupsCount,
-      rulesCount,
-      ...context,
-    });
+    logMeasurement(
+      type,
+      {
+        namespacesCount,
+        groupsCount,
+        rulesCount,
+        loadTimeMs: performance.now() - startLoadingTs,
+      },
+      context
+    );
     return response;
   };
 }
 
 function getRulerRulesMetadata(rulerRules: RulerRulesConfigDTO) {
-  const namespacesCount = Object.keys(rulerRules).length;
+  const namespaces = Object.keys(rulerRules);
   const groups = Object.values(rulerRules).flatMap((groups) => groups);
   const rules = groups.flatMap((group) => group.rules);
 
   return {
-    namespacesCount: namespacesCount.toFixed(0),
-    groupsCount: groups.length.toFixed(0),
-    rulesCount: rules.length.toFixed(0),
+    namespacesCount: namespaces.length,
+    groupsCount: groups.length,
+    rulesCount: rules.length,
   };
 }
 
@@ -155,27 +161,17 @@ export const trackRuleListNavigation = async (
   reportInteraction('grafana_alerting_navigation', props);
 };
 
-export const trackNewAlerRuleFormSaved = async (props: AlertRuleTrackingProps) => {
-  const isNew = await isNewUser();
-  if (isNew) {
-    return;
-  }
+export const trackAlertRuleFormSaved = (props: { formAction: 'create' | 'update'; ruleType?: RuleFormType }) => {
   reportInteraction('grafana_alerting_rule_creation', props);
 };
 
-export const trackNewAlerRuleFormCancelled = async (props: AlertRuleTrackingProps) => {
-  const isNew = await isNewUser();
-  if (isNew) {
-    return;
-  }
+export const trackAlertRuleFormCancelled = (props: { formAction: 'create' | 'update' }) => {
   reportInteraction('grafana_alerting_rule_aborted', props);
 };
 
-export const trackNewAlerRuleFormError = async (props: AlertRuleTrackingProps & { error: string }) => {
-  const isNew = await isNewUser();
-  if (isNew) {
-    return;
-  }
+export const trackAlertRuleFormError = (
+  props: AlertRuleTrackingProps & { error: string; formAction: 'create' | 'update' }
+) => {
   reportInteraction('grafana_alerting_rule_form_error', props);
 };
 
@@ -188,6 +184,55 @@ export const trackInsightsFeedback = async (props: { useful: boolean; panel: str
   reportInteraction('grafana_alerting_insights', { ...defaults, ...props });
 };
 
+interface RulesSearchInteractionPayload {
+  filter: string;
+  triggeredBy: 'typing' | 'component';
+}
+
+function trackRulesSearchInteraction(payload: RulesSearchInteractionPayload) {
+  reportInteraction('grafana_alerting_rules_search', { ...payload });
+}
+
+export function trackRulesSearchInputInteraction({ oldQuery, newQuery }: { oldQuery: string; newQuery: string }) {
+  try {
+    const oldFilter = getSearchFilterFromQuery(oldQuery);
+    const newFilter = getSearchFilterFromQuery(newQuery);
+
+    const oldFilterTerms = extractFilterKeys(oldFilter);
+    const newFilterTerms = extractFilterKeys(newFilter);
+
+    const newTerms = newFilterTerms.filter((term) => !oldFilterTerms.includes(term));
+    newTerms.forEach((term) => {
+      trackRulesSearchInteraction({ filter: term, triggeredBy: 'typing' });
+    });
+  } catch (e: unknown) {
+    if (e instanceof Error) {
+      logError(e);
+    }
+  }
+}
+
+function extractFilterKeys(filter: RulesFilter) {
+  return Object.entries(filter)
+    .filter(([_, value]) => !isEmpty(value))
+    .map(([key]) => key);
+}
+
+export function trackRulesSearchComponentInteraction(filter: keyof RulesFilter) {
+  trackRulesSearchInteraction({ filter, triggeredBy: 'component' });
+}
+
+export function trackRulesListViewChange(payload: { view: string }) {
+  reportInteraction('grafana_alerting_rules_list_mode', { ...payload });
+}
+export function trackSwitchToSimplifiedRouting() {
+  reportInteraction('grafana_alerting_switch_to_simplified_routing');
+}
+
+export function trackSwitchToPoliciesRouting() {
+  reportInteraction('grafana_alerting_switch_to_policies_routing');
+}
+
 export type AlertRuleTrackingProps = {
   user_id: number;
   grafana_version?: string;
diff --git a/public/app/features/alerting/unified/CloneRuleEditor.test.tsx b/public/app/features/alerting/unified/CloneRuleEditor.test.tsx
index 9978d9b31f2e9..747f66b4eb1e4 100644
--- a/public/app/features/alerting/unified/CloneRuleEditor.test.tsx
+++ b/public/app/features/alerting/unified/CloneRuleEditor.test.tsx
@@ -1,3 +1,4 @@
+import 'whatwg-fetch';
 import { render, waitFor, waitForElementToBeRemoved, within } from '@testing-library/react';
 import { setupServer } from 'msw/node';
 import React from 'react';
@@ -8,8 +9,8 @@ import { byRole, byTestId, byText } from 'testing-library-selector';
 import { selectors } from '@grafana/e2e-selectors/src';
 import { config, setBackendSrv, setDataSourceSrv } from '@grafana/runtime';
 import { backendSrv } from 'app/core/services/backend_srv';
+import { DashboardSearchItem, DashboardSearchItemType } from 'app/features/search/types';
 import { AlertManagerCortexConfig } from 'app/plugins/datasource/alertmanager/types';
-import 'whatwg-fetch';
 import { RuleWithLocation } from 'app/types/unified-alerting';
 
 import {
@@ -21,6 +22,7 @@ import {
 
 import { cloneRuleDefinition, CloneRuleEditor } from './CloneRuleEditor';
 import { ExpressionEditorProps } from './components/rule-editor/ExpressionEditor';
+import { mockSearchApi } from './mockApi';
 import {
   mockDataSource,
   MockDataSourceSrv,
@@ -30,7 +32,6 @@ import {
   mockStore,
 } from './mocks';
 import { mockAlertmanagerConfigResponse } from './mocks/alertmanagerApi';
-import { mockSearchApiResponse } from './mocks/grafanaApi';
 import { mockRulerRulesApiResponse, mockRulerRulesGroupApiResponse } from './mocks/rulerApi';
 import { AlertingQueryRunner } from './state/AlertingQueryRunner';
 import { RuleFormValues } from './types/rule-form';
@@ -156,7 +157,9 @@ describe('CloneRuleEditor', function () {
         'folder-one': [{ name: 'group1', interval: '20s', rules: [originRule] }],
       });
 
-      mockSearchApiResponse(server, []);
+      mockSearchApi(server).search([
+        mockDashboardSearchItem({ title: 'folder-one', uid: '123', type: DashboardSearchItemType.DashDB }),
+      ]);
       mockAlertmanagerConfigResponse(server, GRAFANA_RULES_SOURCE_NAME, amConfig);
 
       render(<CloneRuleEditor sourceRuleId={{ uid: 'grafana-rule-1', ruleSourceName: 'grafana' }} />, {
@@ -209,13 +212,20 @@ describe('CloneRuleEditor', function () {
         rules: [originRule],
       });
 
-      mockSearchApiResponse(server, []);
+      mockSearchApi(server).search([
+        mockDashboardSearchItem({
+          title: 'folder-one',
+          uid: '123',
+          type: DashboardSearchItemType.DashDB,
+          folderTitle: 'folder-one',
+          folderUid: '123',
+        }),
+      ]);
       mockAlertmanagerConfigResponse(server, GRAFANA_RULES_SOURCE_NAME, amConfig);
 
       render(
         <CloneRuleEditor
           sourceRuleId={{
-            uid: 'prom-rule-1',
             ruleSourceName: 'my-prom-ds',
             namespace: 'namespace-one',
             groupName: 'group1',
@@ -363,3 +373,18 @@ describe('CloneRuleEditor', function () {
     });
   });
 });
+
+function mockDashboardSearchItem(searchItem: Partial<DashboardSearchItem>) {
+  return {
+    title: '',
+    uid: '',
+    type: DashboardSearchItemType.DashDB,
+    url: '',
+    uri: '',
+    items: [],
+    tags: [],
+    slug: '',
+    isStarred: false,
+    ...searchItem,
+  };
+}
diff --git a/public/app/features/alerting/unified/GrafanaRuleQueryViewer.test.tsx b/public/app/features/alerting/unified/GrafanaRuleQueryViewer.test.tsx
new file mode 100644
index 0000000000000..b77aba3e2e3b0
--- /dev/null
+++ b/public/app/features/alerting/unified/GrafanaRuleQueryViewer.test.tsx
@@ -0,0 +1,85 @@
+import { render, waitFor } from '@testing-library/react';
+import React from 'react';
+import { TestProvider } from 'test/helpers/TestProvider';
+
+import { DataSourceRef } from '@grafana/schema';
+import { AlertQuery } from 'app/types/unified-alerting-dto';
+
+import { GrafanaRuleQueryViewer } from './GrafanaRuleQueryViewer';
+import { mockCombinedRule } from './mocks';
+
+describe('GrafanaRuleQueryViewer', () => {
+  it('renders without crashing', async () => {
+    const rule = mockCombinedRule();
+
+    const getDataSourceQuery = (refId: string) => {
+      const query: AlertQuery = {
+        refId: refId,
+        datasourceUid: 'abc123',
+        queryType: '',
+        relativeTimeRange: {
+          from: 600,
+          to: 0,
+        },
+        model: {
+          refId: 'A',
+        },
+      };
+      return query;
+    };
+    const queries = [
+      getDataSourceQuery('A'),
+      getDataSourceQuery('B'),
+      getDataSourceQuery('C'),
+      getDataSourceQuery('D'),
+      getDataSourceQuery('E'),
+    ];
+
+    const getExpression = (refId: string, dsRef: DataSourceRef) => {
+      const expr = {
+        refId: refId,
+        datasourceUid: '__expr__',
+        queryType: '',
+        model: {
+          refId: refId,
+          type: 'classic_conditions',
+          datasource: dsRef,
+          conditions: [
+            {
+              type: 'query',
+              evaluator: {
+                params: [3],
+                type: 'gt',
+              },
+              operator: {
+                type: 'and',
+              },
+              query: {
+                params: ['A'],
+              },
+              reducer: {
+                params: [],
+                type: 'last',
+              },
+            },
+          ],
+        },
+      };
+      return expr;
+    };
+
+    const expressions = [
+      getExpression('A', { type: '' }),
+      getExpression('B', { type: '' }),
+      getExpression('C', { type: '' }),
+      getExpression('D', { type: '' }),
+    ];
+    const { getByTestId } = render(
+      <GrafanaRuleQueryViewer queries={[...queries, ...expressions]} condition="A" rule={rule} />,
+      { wrapper: TestProvider }
+    );
+
+    await waitFor(() => expect(getByTestId('queries-container')).toHaveStyle('flex-wrap: wrap'));
+    expect(getByTestId('expressions-container')).toHaveStyle('flex-wrap: wrap');
+  });
+});
diff --git a/public/app/features/alerting/unified/GrafanaRuleQueryViewer.tsx b/public/app/features/alerting/unified/GrafanaRuleQueryViewer.tsx
index 6fdab6e5aefd0..83cf88bfe3724 100644
--- a/public/app/features/alerting/unified/GrafanaRuleQueryViewer.tsx
+++ b/public/app/features/alerting/unified/GrafanaRuleQueryViewer.tsx
@@ -1,80 +1,76 @@
 import { css, cx } from '@emotion/css';
-import { dump } from 'js-yaml';
 import { keyBy, startCase } from 'lodash';
 import React from 'react';
 
-import { DataSourceInstanceSettings, GrafanaTheme2, PanelData, RelativeTimeRange } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
+import { DataSourceInstanceSettings, DataSourceRef, GrafanaTheme2, PanelData, urlUtil } from '@grafana/data';
+import { secondsToHms } from '@grafana/data/src/datetime/rangeutil';
 import { config } from '@grafana/runtime';
-import { Badge, useStyles2 } from '@grafana/ui';
-import { mapRelativeTimeRangeToOption } from '@grafana/ui/src/components/DateTimePickers/RelativeTimeRangePicker/utils';
+import { Preview } from '@grafana/sql/src/components/visual-query-builder/Preview';
+import { Badge, ErrorBoundaryAlert, LinkButton, Stack, Text, useStyles2 } from '@grafana/ui';
+import { CombinedRule } from 'app/types/unified-alerting';
 
-import { AlertQuery } from '../../../types/unified-alerting-dto';
+import { AlertDataQuery, AlertQuery } from '../../../types/unified-alerting-dto';
 import { isExpressionQuery } from '../../expressions/guards';
 import {
   downsamplingTypes,
   ExpressionQuery,
   ExpressionQueryType,
-  reducerModes,
   ReducerMode,
+  reducerModes,
   reducerTypes,
   thresholdFunctions,
   upsamplingTypes,
 } from '../../expressions/types';
 import alertDef, { EvalFunction } from '../state/alertDef';
 
+import { Spacer } from './components/Spacer';
+import { WithReturnButton } from './components/WithReturnButton';
 import { ExpressionResult } from './components/expressions/Expression';
 import { getThresholdsForQueries, ThresholdDefinition } from './components/rule-editor/util';
 import { RuleViewerVisualization } from './components/rule-viewer/RuleViewerVisualization';
+import { DatasourceModelPreview } from './components/rule-viewer/tabs/Query/DataSourceModelPreview';
+import { AlertRuleAction, useAlertRuleAbility } from './hooks/useAbilities';
 
 interface GrafanaRuleViewerProps {
+  rule: CombinedRule;
   queries: AlertQuery[];
   condition: string;
   evalDataByQuery?: Record<string, PanelData>;
-  evalTimeRanges?: Record<string, RelativeTimeRange>;
-  onTimeRangeChange: (queryRef: string, timeRange: RelativeTimeRange) => void;
 }
 
-export function GrafanaRuleQueryViewer({
-  queries,
-  condition,
-  evalDataByQuery = {},
-  evalTimeRanges = {},
-  onTimeRangeChange,
-}: GrafanaRuleViewerProps) {
+export function GrafanaRuleQueryViewer({ rule, queries, condition, evalDataByQuery = {} }: GrafanaRuleViewerProps) {
   const dsByUid = keyBy(Object.values(config.datasources), (ds) => ds.uid);
   const dataQueries = queries.filter((q) => !isExpressionQuery(q.model));
   const expressions = queries.filter((q) => isExpressionQuery(q.model));
   const styles = useStyles2(getExpressionViewerStyles);
 
-  const thresholds = getThresholdsForQueries(queries);
+  const thresholds = getThresholdsForQueries(queries, condition);
 
   return (
-    <Stack gap={2} direction="column">
+    <Stack gap={1} direction="column" flex={'1 1 320px'}>
       <div className={styles.maxWidthContainer}>
-        <Stack gap={2}>
+        <Stack gap={1} wrap="wrap" data-testid="queries-container">
           {dataQueries.map(({ model, relativeTimeRange, refId, datasourceUid }, index) => {
             const dataSource = dsByUid[datasourceUid];
 
             return (
               <QueryPreview
+                rule={rule}
                 key={index}
                 refId={refId}
                 isAlertCondition={condition === refId}
                 model={model}
                 relativeTimeRange={relativeTimeRange}
-                evalTimeRange={evalTimeRanges[refId]}
                 dataSource={dataSource}
                 thresholds={thresholds[refId]}
                 queryData={evalDataByQuery[refId]}
-                onEvalTimeRangeChange={(timeRange) => onTimeRangeChange(refId, timeRange)}
               />
             );
           })}
         </Stack>
       </div>
       <div className={styles.maxWidthContainer}>
-        <Stack gap={1}>
+        <Stack gap={1} wrap="wrap" data-testid="expressions-container">
           {expressions.map(({ model, refId, datasourceUid }, index) => {
             const dataSource = dsByUid[datasourceUid];
 
@@ -98,56 +94,100 @@ export function GrafanaRuleQueryViewer({
 }
 
 interface QueryPreviewProps extends Pick<AlertQuery, 'refId' | 'relativeTimeRange' | 'model'> {
+  rule: CombinedRule;
   isAlertCondition: boolean;
   dataSource?: DataSourceInstanceSettings;
   queryData?: PanelData;
   thresholds?: ThresholdDefinition;
-  evalTimeRange?: RelativeTimeRange;
-  onEvalTimeRangeChange: (timeRange: RelativeTimeRange) => void;
 }
 
 export function QueryPreview({
   refId,
-  relativeTimeRange,
+  rule,
   thresholds,
   model,
   dataSource,
   queryData,
-  evalTimeRange,
-  onEvalTimeRangeChange,
+  relativeTimeRange,
 }: QueryPreviewProps) {
   const styles = useStyles2(getQueryPreviewStyles);
+  const isExpression = isExpressionQuery(model);
+  const [exploreSupported, exploreAllowed] = useAlertRuleAbility(rule, AlertRuleAction.Explore);
+  const canExplore = exploreSupported && exploreAllowed;
+
+  const headerItems: React.ReactNode[] = [];
+
+  if (dataSource) {
+    const dataSourceName = dataSource.name ?? '[[Data source not found]]';
+    const dataSourceImgUrl = dataSource.meta.info.logos.small;
+
+    headerItems.push(<DataSourceBadge name={dataSourceName} imgUrl={dataSourceImgUrl} key="datasource" />);
+  }
 
-  // relativeTimeRange is what is defined for a query
-  // evalTimeRange is temporary value which the user can change
-  const headerItems = [dataSource?.name ?? '[[Data source not found]]'];
   if (relativeTimeRange) {
-    headerItems.push(mapRelativeTimeRangeToOption(relativeTimeRange).display);
+    headerItems.push(
+      <Text color="secondary" key="timerange">
+        {secondsToHms(relativeTimeRange.from)} to now
+      </Text>
+    );
+  }
+
+  let exploreLink: string | undefined = undefined;
+  if (!isExpression && canExplore) {
+    exploreLink = dataSource && createExploreLink(dataSource, model);
   }
 
   return (
-    <QueryBox refId={refId} headerItems={headerItems} className={styles.contentBox}>
-      <pre className={styles.code}>
-        <code>{dump(model)}</code>
-      </pre>
-      {dataSource && (
-        <RuleViewerVisualization
-          refId={refId}
-          dsSettings={dataSource}
-          model={model}
-          data={queryData}
-          thresholds={thresholds}
-          relativeTimeRange={evalTimeRange}
-          onTimeRangeChange={onEvalTimeRangeChange}
-          className={styles.visualization}
-        />
-      )}
-    </QueryBox>
+    <>
+      <QueryBox refId={refId} headerItems={headerItems} exploreLink={exploreLink}>
+        <div className={styles.queryPreviewWrapper}>
+          <ErrorBoundaryAlert>
+            {model && dataSource && <DatasourceModelPreview model={model} dataSource={dataSource} />}
+          </ErrorBoundaryAlert>
+        </div>
+      </QueryBox>
+      {dataSource && <RuleViewerVisualization data={queryData} thresholds={thresholds} />}
+    </>
+  );
+}
+
+function createExploreLink(settings: DataSourceRef, model: AlertDataQuery): string {
+  const { uid, type } = settings;
+  const { refId, ...rest } = model;
+
+  /*
+    In my testing I've found some alerts that don't have a data source embedded inside the model.
+    At this moment in time it is unclear to me why some alert definitions not have a data source embedded in the model.
+
+    I don't think that should happen here, the fact that the datasource ref is sometimes missing here is a symptom of another cause. (Gilles)
+   */
+  return urlUtil.renderUrl(`${config.appSubUrl}/explore`, {
+    left: JSON.stringify({
+      datasource: settings.uid,
+      queries: [{ refId: 'A', ...rest, datasource: { type, uid } }],
+      range: { from: 'now-1h', to: 'now' },
+    }),
+  });
+}
+
+interface DataSourceBadgeProps {
+  name: string;
+  imgUrl: string;
+}
+
+function DataSourceBadge({ name, imgUrl }: DataSourceBadgeProps) {
+  const styles = useStyles2(getQueryPreviewStyles);
+
+  return (
+    <div className={styles.dataSource} key="datasource">
+      <img src={imgUrl} width={16} alt={name} />
+      {name}
+    </div>
   );
 }
 
 const getQueryPreviewStyles = (theme: GrafanaTheme2) => ({
-  code: css`
+  queryPreviewWrapper: css`
     margin: ${theme.spacing(1)};
   `,
   contentBox: css`
@@ -156,6 +196,14 @@ const getQueryPreviewStyles = (theme: GrafanaTheme2) => ({
   visualization: css`
     padding: ${theme.spacing(1)};
   `,
+  dataSource: css({
+    border: `1px solid ${theme.colors.border.weak}`,
+    borderRadius: theme.shape.radius.default,
+    padding: theme.spacing(0.5, 1),
+    display: 'flex',
+    alignItems: 'center',
+    gap: theme.spacing(1),
+  }),
 });
 
 interface ExpressionPreviewProps extends Pick<AlertQuery, 'refId'> {
@@ -183,14 +231,26 @@ function ExpressionPreview({ refId, model, evalData, isAlertCondition }: Express
       case ExpressionQueryType.threshold:
         return <ThresholdExpressionViewer model={model} />;
 
+      case ExpressionQueryType.sql:
+        return <Preview rawSql={model.expression || ''} datasourceType={model.datasource?.type} />;
+
       default:
         return <>Expression not supported: {model.type}</>;
     }
   }
 
   return (
-    <QueryBox refId={refId} headerItems={[startCase(model.type)]} isAlertCondition={isAlertCondition}>
+    <QueryBox
+      refId={refId}
+      headerItems={[
+        <Text color="secondary" key="expression-type">
+          {startCase(model.type)}
+        </Text>,
+      ]}
+      isAlertCondition={isAlertCondition}
+    >
       {renderPreview()}
+      <Spacer />
       {evalData && <ExpressionResult series={evalData.series} isAlertCondition={isAlertCondition} />}
     </QueryBox>
   );
@@ -198,27 +258,29 @@ function ExpressionPreview({ refId, model, evalData, isAlertCondition }: Express
 
 interface QueryBoxProps extends React.PropsWithChildren<unknown> {
   refId: string;
-  headerItems?: string[];
+  headerItems?: React.ReactNode;
   isAlertCondition?: boolean;
-  className?: string;
+  exploreLink?: string;
 }
 
-function QueryBox({ refId, headerItems = [], children, isAlertCondition, className }: QueryBoxProps) {
+function QueryBox({ refId, headerItems = [], children, isAlertCondition, exploreLink }: QueryBoxProps) {
   const styles = useStyles2(getQueryBoxStyles);
 
   return (
-    <div className={cx(styles.container, className)}>
+    <div className={cx(styles.container)}>
       <header className={styles.header}>
         <span className={styles.refId}>{refId}</span>
-        {headerItems.map((item, index) => (
-          <span key={index} className={styles.textBlock}>
-            {item}
-          </span>
-        ))}
-        {isAlertCondition && (
-          <div className={styles.conditionIndicator}>
-            <Badge color="green" icon="check" text="Alert condition" />
-          </div>
+        {headerItems}
+        <Spacer />
+        {isAlertCondition && <Badge color="green" icon="check" text="Alert condition" />}
+        {exploreLink && (
+          <WithReturnButton
+            component={
+              <LinkButton size="md" variant="secondary" icon="compass" href={exploreLink}>
+                View in Explore
+              </LinkButton>
+            }
+          />
         )}
       </header>
       {children}
@@ -227,11 +289,14 @@ function QueryBox({ refId, headerItems = [], children, isAlertCondition, classNa
 }
 
 const getQueryBoxStyles = (theme: GrafanaTheme2) => ({
-  container: css`
-    flex: 1 0 25%;
-    border: 1px solid ${theme.colors.border.strong};
-    max-width: 100%;
-  `,
+  container: css({
+    flex: '1 0 25%',
+    border: `1px solid ${theme.colors.border.weak}`,
+    maxWidth: '100%',
+    borderRadius: theme.shape.radius.default,
+    display: 'flex',
+    flexDirection: 'column',
+  }),
   header: css`
     display: flex;
     align-items: center;
@@ -239,19 +304,18 @@ const getQueryBoxStyles = (theme: GrafanaTheme2) => ({
     padding: ${theme.spacing(1)};
     background-color: ${theme.colors.background.secondary};
   `,
-  textBlock: css`
-    border: 1px solid ${theme.colors.border.weak};
-    padding: ${theme.spacing(0.5, 1)};
-    background-color: ${theme.colors.background.primary};
-  `,
-  refId: css`
-    color: ${theme.colors.text.link};
-    padding: ${theme.spacing(0.5, 1)};
-    border: 1px solid ${theme.colors.border.weak};
-  `,
-  conditionIndicator: css`
-    margin-left: auto;
-  `,
+  textBlock: css({
+    border: `1px solid ${theme.colors.border.weak}`,
+    padding: theme.spacing(0.5, 1),
+    backgroundColor: theme.colors.background.primary,
+    borderRadius: theme.shape.radius.default,
+  }),
+  refId: css({
+    color: theme.colors.text.link,
+    padding: theme.spacing(0.5, 1),
+    border: `1px solid ${theme.colors.border.weak}`,
+    borderRadius: theme.shape.radius.default,
+  }),
 });
 
 function ClassicConditionViewer({ model }: { model: ExpressionQuery }) {
@@ -322,7 +386,7 @@ const getReduceConditionViewerStyles = (theme: GrafanaTheme2) => ({
   container: css`
     padding: ${theme.spacing(1)};
     display: grid;
-    gap: ${theme.spacing(1)};
+    gap: ${theme.spacing(0.5)};
     grid-template-rows: 1fr 1fr;
     grid-template-columns: 1fr 1fr 1fr 1fr;
 
@@ -361,7 +425,7 @@ const getResampleExpressionViewerStyles = (theme: GrafanaTheme2) => ({
   container: css`
     padding: ${theme.spacing(1)};
     display: grid;
-    gap: ${theme.spacing(1)};
+    gap: ${theme.spacing(0.5)};
     grid-template-columns: 1fr 1fr 1fr 1fr;
     grid-template-rows: 1fr 1fr;
   `,
@@ -378,20 +442,44 @@ function ThresholdExpressionViewer({ model }: { model: ExpressionQuery }) {
 
   const isRange = evaluator ? isRangeEvaluator(evaluator) : false;
 
-  return (
-    <div className={styles.container}>
-      <div className={styles.label}>Input</div>
-      <div className={styles.value}>{expression}</div>
+  const unloadEvaluator = conditions && conditions[0]?.unloadEvaluator;
+  const unloadThresholdFunction = thresholdFunctions.find((tf) => tf.value === unloadEvaluator?.type);
 
-      {evaluator && (
-        <>
-          <div className={styles.blue}>{thresholdFunction?.label}</div>
-          <div className={styles.bold}>
-            {isRange ? `(${evaluator.params[0]}; ${evaluator.params[1]})` : evaluator.params[0]}
-          </div>
-        </>
-      )}
-    </div>
+  const unloadIsRange = unloadEvaluator ? isRangeEvaluator(unloadEvaluator) : false;
+
+  return (
+    <>
+      <div className={styles.container}>
+        <div className={styles.label}>Input</div>
+        <div className={styles.value}>{expression}</div>
+
+        {evaluator && (
+          <>
+            <div className={styles.blue}>{thresholdFunction?.label}</div>
+            <div className={styles.bold}>
+              {isRange ? `(${evaluator.params[0]}; ${evaluator.params[1]})` : evaluator.params[0]}
+            </div>
+          </>
+        )}
+      </div>
+      <div className={styles.container}>
+        {unloadEvaluator && (
+          <>
+            <div className={styles.label}>Stop alerting when </div>
+            <div className={styles.value}>{expression}</div>
+
+            <>
+              <div className={styles.blue}>{unloadThresholdFunction?.label}</div>
+              <div className={styles.bold}>
+                {unloadIsRange
+                  ? `(${unloadEvaluator.params[0]}; ${unloadEvaluator.params[1]})`
+                  : unloadEvaluator.params[0]}
+              </div>
+            </>
+          </>
+        )}
+      </div>
+    </>
   );
 }
 
@@ -406,7 +494,7 @@ const getExpressionViewerStyles = (theme: GrafanaTheme2) => {
     container: css`
       padding: ${theme.spacing(1)};
       display: flex;
-      gap: ${theme.spacing(1)};
+      gap: ${theme.spacing(0.5)};
     `,
     blue: css`
       ${blue};
@@ -447,10 +535,12 @@ const getCommonQueryStyles = (theme: GrafanaTheme2) => ({
     font-size: ${theme.typography.bodySmall.fontSize};
     line-height: ${theme.typography.bodySmall.lineHeight};
     font-weight: ${theme.typography.fontWeightBold};
+    border-radius: ${theme.shape.radius.default};
   `,
   value: css`
     padding: ${theme.spacing(0.5, 1)};
     border: 1px solid ${theme.colors.border.weak};
+    border-radius: ${theme.shape.radius.default};
   `,
 });
 
diff --git a/public/app/features/alerting/unified/MoreActionsRuleButtons.tsx b/public/app/features/alerting/unified/MoreActionsRuleButtons.tsx
deleted file mode 100644
index fcf0f5e6b48d1..0000000000000
--- a/public/app/features/alerting/unified/MoreActionsRuleButtons.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import React from 'react';
-import { useLocation } from 'react-router-dom';
-import { useToggle } from 'react-use';
-
-import { urlUtil } from '@grafana/data';
-import { Button, Dropdown, Icon, LinkButton, Menu, MenuItem } from '@grafana/ui';
-
-import { logInfo, LogMessages } from './Analytics';
-import { GrafanaRulesExporter } from './components/export/GrafanaRulesExporter';
-import { AlertSourceAction, useAlertSourceAbility } from './hooks/useAbilities';
-
-interface Props {}
-
-export function MoreActionsRuleButtons({}: Props) {
-  const [_, viewRuleAllowed] = useAlertSourceAbility(AlertSourceAction.ViewAlertRule);
-  const [createRuleSupported, createRuleAllowed] = useAlertSourceAbility(AlertSourceAction.CreateAlertRule);
-  const [createCloudRuleSupported, createCloudRuleAllowed] = useAlertSourceAbility(
-    AlertSourceAction.CreateExternalAlertRule
-  );
-
-  const canCreateGrafanaRules = createRuleSupported && createRuleAllowed;
-  const canCreateCloudRules = createCloudRuleSupported && createCloudRuleAllowed;
-
-  const location = useLocation();
-  const [showExportDrawer, toggleShowExportDrawer] = useToggle(false);
-  const newMenu = (
-    <Menu>
-      {(canCreateGrafanaRules || canCreateCloudRules) && (
-        <MenuItem
-          url={urlUtil.renderUrl(`alerting/new/recording`, {
-            returnTo: location.pathname + location.search,
-          })}
-          label="New recording rule"
-        />
-      )}
-      {viewRuleAllowed && <MenuItem onClick={toggleShowExportDrawer} label="Export all Grafana-managed rules" />}
-    </Menu>
-  );
-
-  return (
-    <>
-      {(canCreateGrafanaRules || canCreateCloudRules) && (
-        <LinkButton
-          href={urlUtil.renderUrl('alerting/new/alerting', { returnTo: location.pathname + location.search })}
-          icon="plus"
-          onClick={() => logInfo(LogMessages.alertRuleFromScratch)}
-        >
-          New alert rule
-        </LinkButton>
-      )}
-
-      <Dropdown overlay={newMenu}>
-        <Button variant="secondary">
-          More
-          <Icon name="angle-down" />
-        </Button>
-      </Dropdown>
-      {showExportDrawer && <GrafanaRulesExporter onClose={toggleShowExportDrawer} />}
-    </>
-  );
-}
diff --git a/public/app/features/alerting/unified/MuteTimings.test.tsx b/public/app/features/alerting/unified/MuteTimings.test.tsx
index e87db13b33cba..d52434ca228de 100644
--- a/public/app/features/alerting/unified/MuteTimings.test.tsx
+++ b/public/app/features/alerting/unified/MuteTimings.test.tsx
@@ -1,4 +1,4 @@
-import { render, waitFor, fireEvent, within } from '@testing-library/react';
+import { fireEvent, render, waitFor, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { TestProvider } from 'test/helpers/TestProvider';
@@ -10,7 +10,7 @@ import { AccessControlAction } from 'app/types';
 
 import MuteTimings from './MuteTimings';
 import { fetchAlertManagerConfig, updateAlertManagerConfig } from './api/alertmanager';
-import { grantUserPermissions, mockDataSource, MockDataSourceSrv } from './mocks';
+import { MockDataSourceSrv, grantUserPermissions, mockDataSource } from './mocks';
 import { DataSourceType } from './utils/datasource';
 
 jest.mock('./api/alertmanager');
@@ -71,6 +71,21 @@ const muteTimeInterval: MuteTimeInterval = {
     },
   ],
 };
+const muteTimeInterval2: MuteTimeInterval = {
+  name: 'default-mute2',
+  time_intervals: [
+    {
+      times: [
+        {
+          start_time: '12:00',
+          end_time: '24:00',
+        },
+      ],
+      days_of_month: ['15', '-1'],
+      months: ['august:december', 'march'],
+    },
+  ],
+};
 
 const defaultConfig: AlertManagerCortexConfig = {
   alertmanager_config: {
@@ -90,6 +105,44 @@ const defaultConfig: AlertManagerCortexConfig = {
   },
   template_files: {},
 };
+const defaultConfigWithNewTimeIntervalsField: AlertManagerCortexConfig = {
+  alertmanager_config: {
+    receivers: [{ name: 'default' }, { name: 'critical' }],
+    route: {
+      receiver: 'default',
+      group_by: ['alertname'],
+      routes: [
+        {
+          matchers: ['env=prod', 'region!=EU'],
+          mute_time_intervals: [muteTimeInterval.name],
+        },
+      ],
+    },
+    templates: [],
+    time_intervals: [muteTimeInterval],
+  },
+  template_files: {},
+};
+
+const defaultConfigWithBothTimeIntervalsField: AlertManagerCortexConfig = {
+  alertmanager_config: {
+    receivers: [{ name: 'default' }, { name: 'critical' }],
+    route: {
+      receiver: 'default',
+      group_by: ['alertname'],
+      routes: [
+        {
+          matchers: ['env=prod', 'region!=EU'],
+          mute_time_intervals: [muteTimeInterval.name],
+        },
+      ],
+    },
+    templates: [],
+    time_intervals: [muteTimeInterval],
+    mute_time_intervals: [muteTimeInterval2],
+  },
+  template_files: {},
+};
 
 const resetMocks = () => {
   jest.resetAllMocks();
@@ -110,7 +163,102 @@ describe('Mute timings', () => {
     grantUserPermissions(Object.values(AccessControlAction));
   });
 
-  it('creates a new mute timing', async () => {
+  it('creates a new mute timing, with mute_time_intervals in config', async () => {
+    renderMuteTimings();
+
+    await waitFor(() => expect(mocks.api.fetchAlertManagerConfig).toHaveBeenCalled());
+    expect(ui.nameField.get()).toBeInTheDocument();
+
+    await userEvent.type(ui.nameField.get(), 'maintenance period');
+    await userEvent.type(ui.startsAt.get(), '22:00');
+    await userEvent.type(ui.endsAt.get(), '24:00');
+    await userEvent.type(ui.days.get(), '-1');
+    await userEvent.type(ui.months.get(), 'january, july');
+
+    fireEvent.submit(ui.form.get());
+
+    await waitFor(() => expect(mocks.api.updateAlertManagerConfig).toHaveBeenCalled());
+
+    const { mute_time_intervals: _, ...configWithoutMuteTimings } = defaultConfig.alertmanager_config;
+    expect(mocks.api.updateAlertManagerConfig).toHaveBeenCalledWith('grafana', {
+      ...defaultConfig,
+      alertmanager_config: {
+        ...configWithoutMuteTimings,
+        mute_time_intervals: [
+          muteTimeInterval,
+          {
+            name: 'maintenance period',
+            time_intervals: [
+              {
+                days_of_month: ['-1'],
+                months: ['january', 'july'],
+                times: [
+                  {
+                    start_time: '22:00',
+                    end_time: '24:00',
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    });
+  });
+
+  it('creates a new mute timing, with time_intervals in config', async () => {
+    mocks.api.fetchAlertManagerConfig.mockImplementation(() => {
+      return Promise.resolve({
+        ...defaultConfigWithNewTimeIntervalsField,
+      });
+    });
+    renderMuteTimings();
+
+    await waitFor(() => expect(mocks.api.fetchAlertManagerConfig).toHaveBeenCalled());
+    expect(ui.nameField.get()).toBeInTheDocument();
+
+    await userEvent.type(ui.nameField.get(), 'maintenance period');
+    await userEvent.type(ui.startsAt.get(), '22:00');
+    await userEvent.type(ui.endsAt.get(), '24:00');
+    await userEvent.type(ui.days.get(), '-1');
+    await userEvent.type(ui.months.get(), 'january, july');
+
+    fireEvent.submit(ui.form.get());
+
+    await waitFor(() => expect(mocks.api.updateAlertManagerConfig).toHaveBeenCalled());
+
+    const { mute_time_intervals: _, ...configWithoutMuteTimings } = defaultConfig.alertmanager_config;
+    expect(mocks.api.updateAlertManagerConfig).toHaveBeenCalledWith('grafana', {
+      ...defaultConfig,
+      alertmanager_config: {
+        ...configWithoutMuteTimings,
+        mute_time_intervals: [
+          muteTimeInterval,
+          {
+            name: 'maintenance period',
+            time_intervals: [
+              {
+                days_of_month: ['-1'],
+                months: ['january', 'july'],
+                times: [
+                  {
+                    start_time: '22:00',
+                    end_time: '24:00',
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    });
+  });
+  it('creates a new mute timing, with time_intervals and mute_time_intervals in config', async () => {
+    mocks.api.fetchAlertManagerConfig.mockImplementation(() => {
+      return Promise.resolve({
+        ...defaultConfigWithBothTimeIntervalsField,
+      });
+    });
     renderMuteTimings();
 
     await waitFor(() => expect(mocks.api.fetchAlertManagerConfig).toHaveBeenCalled());
@@ -125,12 +273,15 @@ describe('Mute timings', () => {
     fireEvent.submit(ui.form.get());
 
     await waitFor(() => expect(mocks.api.updateAlertManagerConfig).toHaveBeenCalled());
+
+    const { mute_time_intervals, time_intervals, ...configWithoutMuteTimings } = defaultConfig.alertmanager_config;
     expect(mocks.api.updateAlertManagerConfig).toHaveBeenCalledWith('grafana', {
       ...defaultConfig,
       alertmanager_config: {
-        ...defaultConfig.alertmanager_config,
+        ...configWithoutMuteTimings,
         mute_time_intervals: [
           muteTimeInterval,
+          muteTimeInterval2,
           {
             name: 'maintenance period',
             time_intervals: [
@@ -200,7 +351,6 @@ describe('Mute timings', () => {
             name: 'default-mute',
             time_intervals: [
               {
-                times: [],
                 weekdays: ['monday'],
                 days_of_month: ['-7:-1'],
                 months: ['3', '6', '9', '12'],
diff --git a/public/app/features/alerting/unified/MuteTimings.tsx b/public/app/features/alerting/unified/MuteTimings.tsx
index 3900a8ccf5ed6..a49205c477457 100644
--- a/public/app/features/alerting/unified/MuteTimings.tsx
+++ b/public/app/features/alerting/unified/MuteTimings.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useState } from 'react';
-import { Route, Redirect, Switch, useRouteMatch } from 'react-router-dom';
+import { Redirect, Route, Switch, useRouteMatch } from 'react-router-dom';
 
 import { NavModelItem } from '@grafana/data';
 import { Alert } from '@grafana/ui';
@@ -21,8 +21,9 @@ const MuteTimings = () => {
   const config = currentData?.alertmanager_config;
 
   const getMuteTimingByName = useCallback(
-    (id: string): MuteTimeInterval | undefined => {
-      const timing = config?.mute_time_intervals?.find(({ name }: MuteTimeInterval) => name === id);
+    (id: string, fromTimeIntervals: boolean): MuteTimeInterval | undefined => {
+      const time_intervals = fromTimeIntervals ? config?.time_intervals ?? [] : config?.mute_time_intervals ?? [];
+      const timing = time_intervals.find(({ name }: MuteTimeInterval) => name === id);
 
       if (timing) {
         const provenance = config?.muteTimeProvenances?.[timing.name];
@@ -53,13 +54,17 @@ const MuteTimings = () => {
           <Route exact path="/alerting/routes/mute-timing/edit">
             {() => {
               if (queryParams['muteName']) {
-                const muteTiming = getMuteTimingByName(String(queryParams['muteName']));
+                const muteTimingInMuteTimings = getMuteTimingByName(String(queryParams['muteName']), false);
+                const muteTimingInTimeIntervals = getMuteTimingByName(String(queryParams['muteName']), true);
+                const inTimeIntervals = Boolean(muteTimingInTimeIntervals);
+                const muteTiming = inTimeIntervals ? muteTimingInTimeIntervals : muteTimingInMuteTimings;
                 const provenance = muteTiming?.provenance;
 
                 return (
                   <MuteTimingForm
                     loading={isLoading}
-                    muteTiming={muteTiming}
+                    fromLegacyTimeInterval={muteTimingInMuteTimings}
+                    fromTimeIntervals={muteTimingInTimeIntervals}
                     showError={!muteTiming && !isLoading}
                     provenance={provenance}
                   />
@@ -78,7 +83,7 @@ const MuteTimingsPage = () => {
   const pageNav = useMuteTimingNavData();
 
   return (
-    <AlertmanagerPageWrapper pageId="am-routes" pageNav={pageNav} accessType="notification">
+    <AlertmanagerPageWrapper navId="am-routes" pageNav={pageNav} accessType="notification">
       <MuteTimings />
     </AlertmanagerPageWrapper>
   );
diff --git a/public/app/features/alerting/unified/NotificationPolicies.test.tsx b/public/app/features/alerting/unified/NotificationPolicies.test.tsx
index 459ea8e4e67fa..258cab99483c0 100644
--- a/public/app/features/alerting/unified/NotificationPolicies.test.tsx
+++ b/public/app/features/alerting/unified/NotificationPolicies.test.tsx
@@ -23,7 +23,7 @@ import { fetchAlertManagerConfig, fetchStatus, updateAlertManagerConfig } from '
 import { alertmanagerApi } from './api/alertmanagerApi';
 import { discoverAlertmanagerFeatures } from './api/buildInfo';
 import * as grafanaApp from './components/receivers/grafanaAppReceivers/grafanaApp';
-import { mockDataSource, MockDataSourceSrv, someCloudAlertManagerConfig, someCloudAlertManagerStatus } from './mocks';
+import { MockDataSourceSrv, mockDataSource, someCloudAlertManagerConfig, someCloudAlertManagerStatus } from './mocks';
 import { defaultGroupBy } from './utils/amroutes';
 import { getAllDataSources } from './utils/config';
 import { ALERTMANAGER_NAME_QUERY_KEY } from './utils/constants';
@@ -759,18 +759,22 @@ describe('findRoutesMatchingFilters', () => {
     ],
   };
 
+  it('should not filter when we do not have any valid filters', () => {
+    expect(findRoutesMatchingFilters(simpleRouteTree, {})).toHaveProperty('filtersApplied', false);
+  });
+
   it('should not match non-existing', () => {
     expect(
       findRoutesMatchingFilters(simpleRouteTree, {
         labelMatchersFilter: [['foo', MatcherOperator.equal, 'bar']],
-      })
-    ).toHaveLength(0);
+      }).matchedRoutesWithPath.size
+    ).toBe(0);
 
-    expect(
-      findRoutesMatchingFilters(simpleRouteTree, {
-        contactPointFilter: 'does-not-exist',
-      })
-    ).toHaveLength(0);
+    const matchingRoutes = findRoutesMatchingFilters(simpleRouteTree, {
+      contactPointFilter: 'does-not-exist',
+    });
+
+    expect(matchingRoutes).toMatchSnapshot();
   });
 
   it('should work with only label matchers', () => {
@@ -778,8 +782,7 @@ describe('findRoutesMatchingFilters', () => {
       labelMatchersFilter: [['hello', MatcherOperator.equal, 'world']],
     });
 
-    expect(matchingRoutes).toHaveLength(1);
-    expect(matchingRoutes[0]).toHaveProperty('id', '1');
+    expect(matchingRoutes).toMatchSnapshot();
   });
 
   it('should work with only contact point and inheritance', () => {
@@ -787,9 +790,7 @@ describe('findRoutesMatchingFilters', () => {
       contactPointFilter: 'simple-receiver',
     });
 
-    expect(matchingRoutes).toHaveLength(2);
-    expect(matchingRoutes[0]).toHaveProperty('id', '1');
-    expect(matchingRoutes[1]).toHaveProperty('id', '2');
+    expect(matchingRoutes).toMatchSnapshot();
   });
 
   it('should work with non-intersecting filters', () => {
@@ -798,7 +799,7 @@ describe('findRoutesMatchingFilters', () => {
       contactPointFilter: 'does-not-exist',
     });
 
-    expect(matchingRoutes).toHaveLength(0);
+    expect(matchingRoutes).toMatchSnapshot();
   });
 
   it('should work with all filters', () => {
@@ -807,8 +808,7 @@ describe('findRoutesMatchingFilters', () => {
       contactPointFilter: 'simple-receiver',
     });
 
-    expect(matchingRoutes).toHaveLength(1);
-    expect(matchingRoutes[0]).toHaveProperty('id', '1');
+    expect(matchingRoutes).toMatchSnapshot();
   });
 });
 
diff --git a/public/app/features/alerting/unified/NotificationPolicies.tsx b/public/app/features/alerting/unified/NotificationPolicies.tsx
index 861c5658d9ec2..234d7b0feaaf3 100644
--- a/public/app/features/alerting/unified/NotificationPolicies.tsx
+++ b/public/app/features/alerting/unified/NotificationPolicies.tsx
@@ -1,11 +1,9 @@
 import { css } from '@emotion/css';
-import { intersectionBy, isEqual } from 'lodash';
 import React, { useEffect, useMemo, useState } from 'react';
 import { useAsyncFn } from 'react-use';
 
 import { GrafanaTheme2, UrlQueryMap } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Alert, LoadingPlaceholder, Tab, TabContent, TabsBar, useStyles2, withErrorBoundary } from '@grafana/ui';
+import { Alert, LoadingPlaceholder, Stack, Tab, TabContent, TabsBar, useStyles2, withErrorBoundary } from '@grafana/ui';
 import { useQueryParams } from 'app/core/hooks/useQueryParams';
 import { ObjectMatcher, Route, RouteWithID } from 'app/plugins/datasource/alertmanager/types';
 import { useDispatch } from 'app/types';
@@ -17,12 +15,17 @@ import { useGetContactPointsState } from './api/receiversApi';
 import { AlertmanagerPageWrapper } from './components/AlertingPageWrapper';
 import { GrafanaAlertmanagerDeliveryWarning } from './components/GrafanaAlertmanagerDeliveryWarning';
 import { MuteTimingsTable } from './components/mute-timings/MuteTimingsTable';
-import { findRoutesMatchingPredicate, NotificationPoliciesFilter } from './components/notification-policies/Filters';
+import { mergeTimeIntervals } from './components/mute-timings/util';
+import {
+  NotificationPoliciesFilter,
+  findRoutesByMatchers,
+  findRoutesMatchingPredicate,
+} from './components/notification-policies/Filters';
 import {
   useAddPolicyModal,
-  useEditPolicyModal,
-  useDeletePolicyModal,
   useAlertGroupsModal,
+  useDeletePolicyModal,
+  useEditPolicyModal,
 } from './components/notification-policies/Modals';
 import { Policy } from './components/notification-policies/Policy';
 import { useAlertmanagerConfig } from './hooks/useAlertmanagerConfig';
@@ -31,10 +34,15 @@ import { updateAlertManagerConfigAction } from './state/actions';
 import { FormAmRoute } from './types/amroutes';
 import { useRouteGroupsMatcher } from './useRouteGroupsMatcher';
 import { addUniqueIdentifierToRoute } from './utils/amroutes';
-import { normalizeMatchers } from './utils/matchers';
 import { computeInheritedTree } from './utils/notification-policies';
 import { initialAsyncRequestState } from './utils/redux';
-import { addRouteToParentRoute, mergePartialAmRouteWithRouteTree, omitRouteFromRouteTree } from './utils/routeTree';
+import {
+  InsertPosition,
+  addRouteToReferenceRoute,
+  cleanRouteIDs,
+  mergePartialAmRouteWithRouteTree,
+  omitRouteFromRouteTree,
+} from './utils/routeTree';
 
 enum ActiveTab {
   NotificationPolicies = 'notification_policies',
@@ -55,8 +63,8 @@ const AmRoutes = () => {
   const [contactPointFilter, setContactPointFilter] = useState<string | undefined>();
   const [labelMatchersFilter, setLabelMatchersFilter] = useState<ObjectMatcher[]>([]);
 
+  const { selectedAlertmanager, hasConfigurationAPI, isGrafanaAlertmanager } = useAlertmanager();
   const { getRouteGroupsMap } = useRouteGroupsMatcher();
-  const { selectedAlertmanager, hasConfigurationAPI } = useAlertmanager();
 
   const contactPointsState = useGetContactPointsState(selectedAlertmanager ?? '');
 
@@ -94,15 +102,21 @@ const AmRoutes = () => {
 
   useEffect(() => {
     if (rootRoute && alertGroups) {
-      triggerGetRouteGroupsMap(rootRoute, alertGroups);
+      triggerGetRouteGroupsMap(rootRoute, alertGroups, { unquoteMatchers: !isGrafanaAlertmanager });
     }
-  }, [rootRoute, alertGroups, triggerGetRouteGroupsMap]);
+  }, [rootRoute, alertGroups, triggerGetRouteGroupsMap, isGrafanaAlertmanager]);
 
   // these are computed from the contactPoint and labels matchers filter
   const routesMatchingFilters = useMemo(() => {
     if (!rootRoute) {
-      return [];
+      const emptyResult: RoutesMatchingFilters = {
+        filtersApplied: false,
+        matchedRoutesWithPath: new Map(),
+      };
+
+      return emptyResult;
     }
+
     return findRoutesMatchingFilters(rootRoute, { contactPointFilter, labelMatchersFilter });
   }, [contactPointFilter, labelMatchersFilter, rootRoute]);
 
@@ -124,20 +138,29 @@ const AmRoutes = () => {
     updateRouteTree(newRouteTree);
   }
 
-  function handleAdd(partialRoute: Partial<FormAmRoute>, parentRoute: RouteWithID) {
+  function handleAdd(partialRoute: Partial<FormAmRoute>, referenceRoute: RouteWithID, insertPosition: InsertPosition) {
     if (!rootRoute) {
       return;
     }
 
-    const newRouteTree = addRouteToParentRoute(selectedAlertmanager ?? '', partialRoute, parentRoute, rootRoute);
+    const newRouteTree = addRouteToReferenceRoute(
+      selectedAlertmanager ?? '',
+      partialRoute,
+      referenceRoute,
+      rootRoute,
+      insertPosition
+    );
     updateRouteTree(newRouteTree);
   }
 
-  function updateRouteTree(routeTree: Route) {
+  function updateRouteTree(routeTree: Route | RouteWithID) {
     if (!result) {
       return;
     }
 
+    // make sure we omit all IDs from our routes
+    const newRouteTree = cleanRouteIDs(routeTree);
+
     setUpdatingTree(true);
 
     dispatch(
@@ -146,7 +169,7 @@ const AmRoutes = () => {
           ...result,
           alertmanager_config: {
             ...result.alertmanager_config,
-            route: routeTree,
+            route: newRouteTree,
           },
         },
         oldConfig: result,
@@ -184,8 +207,9 @@ const AmRoutes = () => {
   if (!selectedAlertmanager) {
     return null;
   }
+  const time_intervals = result?.alertmanager_config ? mergeTimeIntervals(result?.alertmanager_config) : [];
 
-  const numberOfMuteTimings = result?.alertmanager_config.mute_time_intervals?.length ?? 0;
+  const numberOfMuteTimings = time_intervals.length;
   const haveData = result && !resultError && !resultLoading;
   const isFetching = !result && resultLoading;
   const haveError = resultError && !resultLoading;
@@ -232,6 +256,7 @@ const AmRoutes = () => {
                       receivers={receivers}
                       onChangeMatchers={setLabelMatchersFilter}
                       onChangeReceiver={setContactPointFilter}
+                      matchingCount={routesMatchingFilters.matchedRoutesWithPath.size}
                     />
                   )}
                   {rootRoute && (
@@ -250,6 +275,7 @@ const AmRoutes = () => {
                       onShowAlertInstances={showAlertGroupsModal}
                       routesMatchingFilters={routesMatchingFilters}
                       matchingInstancesPreview={{ groupsMap: routeAlertGroupsMap, enabled: !instancesPreviewError }}
+                      isAutoGenerated={false}
                     />
                   )}
                 </Stack>
@@ -274,35 +300,85 @@ type RouteFilters = {
   labelMatchersFilter?: ObjectMatcher[];
 };
 
-export const findRoutesMatchingFilters = (rootRoute: RouteWithID, filters: RouteFilters): RouteWithID[] => {
+type FilterResult = Map<RouteWithID, RouteWithID[]>;
+
+export interface RoutesMatchingFilters {
+  filtersApplied: boolean;
+  matchedRoutesWithPath: FilterResult;
+}
+
+export const findRoutesMatchingFilters = (rootRoute: RouteWithID, filters: RouteFilters): RoutesMatchingFilters => {
   const { contactPointFilter, labelMatchersFilter = [] } = filters;
+  const hasFilter = contactPointFilter || labelMatchersFilter.length > 0;
+  const havebothFilters = Boolean(contactPointFilter) && labelMatchersFilter.length > 0;
 
+  // if filters are empty we short-circuit this function
+  if (!hasFilter) {
+    return { filtersApplied: false, matchedRoutesWithPath: new Map() };
+  }
+
+  // we'll collect all of the routes matching the filters
+  // we track an array of matching routes, each item in the array is for 1 type of filter
+  //
+  // [contactPointMatches, labelMatcherMatches] -> [[{ a: [], b: [] }], [{ a: [], c: [] }]]
+  // later we'll use intersection to find results in all sets of filter matchers
   let matchedRoutes: RouteWithID[][] = [];
 
+  // compute fully inherited tree so all policies have their inherited receiver
   const fullRoute = computeInheritedTree(rootRoute);
 
-  const routesMatchingContactPoint = contactPointFilter
+  // find all routes for our contact point filter
+  const matchingRoutesForContactPoint = contactPointFilter
     ? findRoutesMatchingPredicate(fullRoute, (route) => route.receiver === contactPointFilter)
-    : undefined;
+    : new Map();
 
+  const routesMatchingContactPoint = Array.from(matchingRoutesForContactPoint.keys());
   if (routesMatchingContactPoint) {
     matchedRoutes.push(routesMatchingContactPoint);
   }
 
-  const routesMatchingLabelMatchers = labelMatchersFilter.length
-    ? findRoutesMatchingPredicate(fullRoute, (route) => {
-        const routeMatchers = normalizeMatchers(route);
-        return labelMatchersFilter.every((filter) => routeMatchers.some((matcher) => isEqual(filter, matcher)));
-      })
-    : undefined;
+  // find all routes matching our label matchers
+  const matchingRoutesForLabelMatchers = labelMatchersFilter.length
+    ? findRoutesMatchingPredicate(fullRoute, (route) => findRoutesByMatchers(route, labelMatchersFilter))
+    : new Map();
 
-  if (routesMatchingLabelMatchers) {
-    matchedRoutes.push(routesMatchingLabelMatchers);
+  const routesMatchingLabelFilters = Array.from(matchingRoutesForLabelMatchers.keys());
+  if (matchingRoutesForLabelMatchers.size > 0) {
+    matchedRoutes.push(routesMatchingLabelFilters);
   }
 
-  return intersectionBy(...matchedRoutes, 'id');
+  // now that we have our maps for all filters, we just need to find the intersection of all maps by route if we have both filters
+  const routesForAllFilterResults = havebothFilters
+    ? findMapIntersection(matchingRoutesForLabelMatchers, matchingRoutesForContactPoint)
+    : new Map([...matchingRoutesForLabelMatchers, ...matchingRoutesForContactPoint]);
+
+  return {
+    filtersApplied: true,
+    matchedRoutesWithPath: routesForAllFilterResults,
+  };
 };
 
+// this function takes multiple maps and creates a new map with routes that exist in all maps
+//
+// map 1: { a: [], b: [] }
+// map 2: { a: [], c: [] }
+// return: { a: [] }
+function findMapIntersection(...matchingRoutes: FilterResult[]): FilterResult {
+  const result = new Map<RouteWithID, RouteWithID[]>();
+
+  // Iterate through the keys of the first map'
+  for (const key of matchingRoutes[0].keys()) {
+    // Check if the key exists in all other maps
+    if (matchingRoutes.every((map) => map.has(key))) {
+      // If yes, add the key to the result map
+      // @ts-ignore
+      result.set(key, matchingRoutes[0].get(key));
+    }
+  }
+
+  return result;
+}
+
 const getStyles = (theme: GrafanaTheme2) => ({
   tabContent: css`
     margin-top: ${theme.spacing(2)};
@@ -330,7 +406,7 @@ function getActiveTabFromUrl(queryParams: UrlQueryMap): QueryParamValues {
 }
 
 const NotificationPoliciesPage = () => (
-  <AlertmanagerPageWrapper pageId="am-routes" accessType="notification">
+  <AlertmanagerPageWrapper navId="am-routes" accessType="notification">
     <AmRoutes />
   </AlertmanagerPageWrapper>
 );
diff --git a/public/app/features/alerting/unified/PanelAlertTab.tsx b/public/app/features/alerting/unified/PanelAlertTab.tsx
index 88e6a763f2c8e..697fe405efcb0 100644
--- a/public/app/features/alerting/unified/PanelAlertTab.tsx
+++ b/public/app/features/alerting/unified/PanelAlertTab.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { Tab, TabProps } from '@grafana/ui/src/components/Tabs/Tab';
+import { Tab, TabProps } from '@grafana/ui';
 import { DashboardModel, PanelModel } from 'app/features/dashboard/state';
 
 import { usePanelCombinedRules } from './hooks/usePanelCombinedRules';
@@ -12,6 +12,6 @@ interface Props extends Omit<TabProps, 'counter' | 'ref'> {
 
 // it will load rule count from backend
 export const PanelAlertTab = ({ panel, dashboard, ...otherProps }: Props) => {
-  const { rules, loading } = usePanelCombinedRules({ panel, dashboard });
+  const { rules, loading } = usePanelCombinedRules({ panelId: panel.id, dashboardUID: dashboard.uid });
   return <Tab {...otherProps} counter={loading ? null : rules.length} />;
 };
diff --git a/public/app/features/alerting/unified/PanelAlertTabContent.test.tsx b/public/app/features/alerting/unified/PanelAlertTabContent.test.tsx
index add93de4b6990..a1df6a1be3ee8 100644
--- a/public/app/features/alerting/unified/PanelAlertTabContent.test.tsx
+++ b/public/app/features/alerting/unified/PanelAlertTabContent.test.tsx
@@ -153,7 +153,7 @@ const dashboard = {
   },
   meta: {
     canSave: true,
-    folderId: 1,
+    folderUid: 'abc',
     folderTitle: 'super folder',
   },
 } as DashboardModel;
diff --git a/public/app/features/alerting/unified/PanelAlertTabContent.tsx b/public/app/features/alerting/unified/PanelAlertTabContent.tsx
index da91c08802f9d..40ad74a557da3 100644
--- a/public/app/features/alerting/unified/PanelAlertTabContent.tsx
+++ b/public/app/features/alerting/unified/PanelAlertTabContent.tsx
@@ -20,8 +20,8 @@ interface Props {
 export const PanelAlertTabContent = ({ dashboard, panel }: Props) => {
   const styles = useStyles2(getStyles);
   const { errors, loading, rules } = usePanelCombinedRules({
-    dashboard,
-    panel,
+    dashboardUID: dashboard.uid,
+    panelId: panel.id,
     poll: true,
   });
   const permissions = getRulesPermissions('grafana');
@@ -59,7 +59,7 @@ export const PanelAlertTabContent = ({ dashboard, panel }: Props) => {
   }
 
   return (
-    <div aria-label={selectors.components.PanelAlertTabContent.content} className={styles.noRulesWrapper}>
+    <div data-testid={selectors.components.PanelAlertTabContent.content} className={styles.noRulesWrapper}>
       {alert}
       {!!dashboard.uid && (
         <>
diff --git a/public/app/features/alerting/unified/Receivers.tsx b/public/app/features/alerting/unified/Receivers.tsx
index ccaa9128c9623..49d696933658b 100644
--- a/public/app/features/alerting/unified/Receivers.tsx
+++ b/public/app/features/alerting/unified/Receivers.tsx
@@ -1,15 +1,13 @@
 import React from 'react';
 import { Route, Switch } from 'react-router-dom';
 
-import { config } from '@grafana/runtime';
 import { withErrorBoundary } from '@grafana/ui';
-const ContactPointsV1 = SafeDynamicImport(() => import('./components/contact-points/ContactPoints.v1'));
-const ContactPointsV2 = SafeDynamicImport(() => import('./components/contact-points/ContactPoints.v2'));
+const ContactPointsV2 = SafeDynamicImport(() => import('./components/contact-points/ContactPoints'));
 const EditContactPoint = SafeDynamicImport(() => import('./components/contact-points/EditContactPoint'));
 const NewContactPoint = SafeDynamicImport(() => import('./components/contact-points/NewContactPoint'));
 const EditMessageTemplate = SafeDynamicImport(() => import('./components/contact-points/EditMessageTemplate'));
 const NewMessageTemplate = SafeDynamicImport(() => import('./components/contact-points/NewMessageTemplate'));
-const GlobalConfig = SafeDynamicImport(() => import('./components/contact-points/GlobalConfig'));
+const GlobalConfig = SafeDynamicImport(() => import('./components/contact-points/components/GlobalConfig'));
 const DuplicateMessageTemplate = SafeDynamicImport(
   () => import('./components/contact-points/DuplicateMessageTemplate')
 );
@@ -18,29 +16,21 @@ import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 
 import { AlertmanagerPageWrapper } from './components/AlertingPageWrapper';
 
-const newContactPointsListView = config.featureToggles.alertingContactPointsV2 ?? false;
-
-// TODO add pagenav back in – that way we have correct breadcrumbs and page title
-const ContactPoints = (props: GrafanaRouteComponentProps): JSX.Element => (
-  <AlertmanagerPageWrapper pageId="receivers" accessType="notification">
-    {/* TODO do we want a "routes" component for each Alerting entity? */}
-    {newContactPointsListView ? (
-      <Switch>
-        <Route exact={true} path="/alerting/notifications" component={ContactPointsV2} />
-        <Route exact={true} path="/alerting/notifications/receivers/new" component={NewContactPoint} />
-        <Route exact={true} path="/alerting/notifications/receivers/:name/edit" component={EditContactPoint} />
-        <Route exact={true} path="/alerting/notifications/templates/:name/edit" component={EditMessageTemplate} />
-        <Route exact={true} path="/alerting/notifications/templates/new" component={NewMessageTemplate} />
-        <Route
-          exact={true}
-          path="/alerting/notifications/templates/:name/duplicate"
-          component={DuplicateMessageTemplate}
-        />
-        <Route exact={true} path="/alerting/notifications/global-config" component={GlobalConfig} />
-      </Switch>
-    ) : (
-      <ContactPointsV1 {...props} />
-    )}
+const ContactPoints = (_props: GrafanaRouteComponentProps): JSX.Element => (
+  <AlertmanagerPageWrapper navId="receivers" accessType="notification">
+    <Switch>
+      <Route exact={true} path="/alerting/notifications" component={ContactPointsV2} />
+      <Route exact={true} path="/alerting/notifications/receivers/new" component={NewContactPoint} />
+      <Route exact={true} path="/alerting/notifications/receivers/:name/edit" component={EditContactPoint} />
+      <Route exact={true} path="/alerting/notifications/templates/:name/edit" component={EditMessageTemplate} />
+      <Route exact={true} path="/alerting/notifications/templates/new" component={NewMessageTemplate} />
+      <Route
+        exact={true}
+        path="/alerting/notifications/templates/:name/duplicate"
+        component={DuplicateMessageTemplate}
+      />
+      <Route exact={true} path="/alerting/notifications/global-config" component={GlobalConfig} />
+    </Switch>
   </AlertmanagerPageWrapper>
 );
 
diff --git a/public/app/features/alerting/unified/RedirectToRuleViewer.test.tsx b/public/app/features/alerting/unified/RedirectToRuleViewer.test.tsx
index 9726a8e7cea0b..5be4926cf1222 100644
--- a/public/app/features/alerting/unified/RedirectToRuleViewer.test.tsx
+++ b/public/app/features/alerting/unified/RedirectToRuleViewer.test.tsx
@@ -20,7 +20,10 @@ jest.mock('react-router-dom', () => ({
   Redirect: jest.fn(({}) => `Redirected`),
 }));
 
-jest.mock('react-use');
+jest.mock('react-use', () => ({
+  ...jest.requireActual('react-use'),
+  useLocation: jest.fn(),
+}));
 
 const renderRedirectToRuleViewer = (pathname: string, search?: string) => {
   jest.mocked(useLocation).mockReturnValue({ pathname, trigger: '', search });
diff --git a/public/app/features/alerting/unified/RuleEditor.tsx b/public/app/features/alerting/unified/RuleEditor.tsx
index 1bc056c0b5e3d..f2c82cf9187b9 100644
--- a/public/app/features/alerting/unified/RuleEditor.tsx
+++ b/public/app/features/alerting/unified/RuleEditor.tsx
@@ -90,7 +90,7 @@ const RuleEditor = ({ match }: RuleEditorProps) => {
   }, [canCreateCloudRules, canCreateGrafanaRules, canEditRules, copyFromIdentifier, id, identifier, loading]);
 
   return (
-    <AlertingPageWrapper isLoading={loading} pageId="alert-list" pageNav={getPageNav(identifier, type)}>
+    <AlertingPageWrapper isLoading={loading} navId="alert-list" pageNav={getPageNav(identifier, type)}>
       {getContent()}
     </AlertingPageWrapper>
   );
diff --git a/public/app/features/alerting/unified/RuleEditorCloudOnlyAllowed.test.tsx b/public/app/features/alerting/unified/RuleEditorCloudOnlyAllowed.test.tsx
index 8c335a5a0076c..ea2a169d9988f 100644
--- a/public/app/features/alerting/unified/RuleEditorCloudOnlyAllowed.test.tsx
+++ b/public/app/features/alerting/unified/RuleEditorCloudOnlyAllowed.test.tsx
@@ -2,7 +2,7 @@ import { screen, waitForElementToBeRemoved } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { renderRuleEditor, ui } from 'test/helpers/alertingRuleEditor';
-import { byRole, byText } from 'testing-library-selector';
+import { byText } from 'testing-library-selector';
 
 import { setDataSourceSrv } from '@grafana/runtime';
 import { contextSrv } from 'app/core/services/context_srv';
@@ -104,6 +104,7 @@ jest.mock('@grafana/runtime', () => ({
   getDataSourceSrv: jest.fn(() => ({
     getInstanceSettings: () => dataSources.prom,
     get: () => dataSources.prom,
+    getList: () => Object.values(dataSources),
   })),
 }));
 
@@ -197,7 +198,7 @@ describe('RuleEditor cloud: checking editable data sources', () => {
 
     // check that only rules sources that have ruler available are there
     const dataSourceSelect = ui.inputs.dataSource.get();
-    await userEvent.click(byRole('combobox').get(dataSourceSelect));
+    await userEvent.click(dataSourceSelect);
 
     expect(byText('cortex with ruler').query()).toBeInTheDocument();
     expect(byText('loki with ruler').query()).toBeInTheDocument();
diff --git a/public/app/features/alerting/unified/RuleEditorCloudRules.test.tsx b/public/app/features/alerting/unified/RuleEditorCloudRules.test.tsx
index e89c9c033c102..061b5dcbdb41e 100644
--- a/public/app/features/alerting/unified/RuleEditorCloudRules.test.tsx
+++ b/public/app/features/alerting/unified/RuleEditorCloudRules.test.tsx
@@ -3,8 +3,8 @@ import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { renderRuleEditor, ui } from 'test/helpers/alertingRuleEditor';
 import { clickSelectOption } from 'test/helpers/selectOptionInTest';
-import { byRole } from 'testing-library-selector';
 
+import { selectors } from '@grafana/e2e-selectors';
 import { contextSrv } from 'app/core/services/context_srv';
 import { AccessControlAction } from 'app/types';
 
@@ -139,11 +139,11 @@ describe('RuleEditor cloud', () => {
     //expressions are removed after switching to data-source managed
     expect(screen.queryAllByLabelText('Remove expression')).toHaveLength(0);
 
-    expect(screen.getByTestId('datasource-picker')).toBeInTheDocument();
+    expect(screen.getByTestId(selectors.components.DataSourcePicker.inputV2)).toBeInTheDocument();
 
-    const dataSourceSelect = ui.inputs.dataSource.get();
-    await user.click(byRole('combobox').get(dataSourceSelect));
-    await clickSelectOption(dataSourceSelect, 'Prom (default)');
+    const dataSourceSelect = await ui.inputs.dataSource.find();
+    await user.click(dataSourceSelect);
+    await user.click(screen.getByText('Prom'));
     await waitFor(() => expect(mocks.api.fetchRulerRules).toHaveBeenCalled());
 
     await user.type(await ui.inputs.expr.find(), 'up == 1');
diff --git a/public/app/features/alerting/unified/RuleEditorExisting.test.tsx b/public/app/features/alerting/unified/RuleEditorExisting.test.tsx
index a3ecbbfcb6ff8..87143007b6600 100644
--- a/public/app/features/alerting/unified/RuleEditorExisting.test.tsx
+++ b/public/app/features/alerting/unified/RuleEditorExisting.test.tsx
@@ -1,4 +1,4 @@
-import { render, waitFor, screen, within } from '@testing-library/react';
+import { render, screen, waitFor, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { Route } from 'react-router-dom';
@@ -7,7 +7,7 @@ import { ui } from 'test/helpers/alertingRuleEditor';
 
 import { locationService, setDataSourceSrv } from '@grafana/runtime';
 import { contextSrv } from 'app/core/services/context_srv';
-import { DashboardSearchHit } from 'app/features/search/types';
+import { DashboardSearchHit, DashboardSearchItemType } from 'app/features/search/types';
 import { GrafanaAlertStateDecision } from 'app/types/unified-alerting-dto';
 
 import { searchFolders } from '../../../../app/features/manage-dashboards/state/actions';
@@ -101,6 +101,7 @@ describe('RuleEditor grafana managed rules', () => {
       title: 'Folder A',
       uid: 'abcd',
       id: 1,
+      type: DashboardSearchItemType.DashDB,
     };
 
     const slashedFolder = {
@@ -136,7 +137,7 @@ describe('RuleEditor grafana managed rules', () => {
       [folder.title]: [
         {
           interval: '1m',
-          name: 'my great new rule',
+          name: 'group1',
           rules: [
             {
               annotations: { description: 'some description', summary: 'some summary' },
@@ -145,7 +146,6 @@ describe('RuleEditor grafana managed rules', () => {
               grafana_alert: {
                 uid,
                 namespace_uid: 'abcd',
-                namespace_id: 1,
                 condition: 'B',
                 data: getDefaultQueries(),
                 exec_err_state: GrafanaAlertStateDecision.Error,
@@ -200,10 +200,10 @@ describe('RuleEditor grafana managed rules', () => {
 
     expect(mocks.api.setRulerRuleGroup).toHaveBeenCalledWith(
       { dataSourceName: GRAFANA_RULES_SOURCE_NAME, apiVersion: 'legacy' },
-      'Folder A',
+      'abcd',
       {
         interval: '1m',
-        name: 'my great new rule',
+        name: 'group1',
         rules: [
           {
             annotations: { description: 'some description', summary: 'some summary', custom: 'value' },
diff --git a/public/app/features/alerting/unified/RuleEditorGrafanaRules.test.tsx b/public/app/features/alerting/unified/RuleEditorGrafanaRules.test.tsx
index cc15a0c61d1d6..d4f6f031e6fa4 100644
--- a/public/app/features/alerting/unified/RuleEditorGrafanaRules.test.tsx
+++ b/public/app/features/alerting/unified/RuleEditorGrafanaRules.test.tsx
@@ -7,7 +7,7 @@ import { byRole } from 'testing-library-selector';
 
 import { setDataSourceSrv } from '@grafana/runtime';
 import { contextSrv } from 'app/core/services/context_srv';
-import { DashboardSearchHit } from 'app/features/search/types';
+import { DashboardSearchHit, DashboardSearchItemType } from 'app/features/search/types';
 import { AccessControlAction } from 'app/types';
 import { GrafanaAlertStateDecision, PromApplication } from 'app/types/unified-alerting-dto';
 
@@ -16,7 +16,7 @@ import { searchFolders } from '../../../../app/features/manage-dashboards/state/
 import { discoverFeatures } from './api/buildInfo';
 import { fetchRulerRules, fetchRulerRulesGroup, fetchRulerRulesNamespace, setRulerRuleGroup } from './api/ruler';
 import { ExpressionEditorProps } from './components/rule-editor/ExpressionEditor';
-import { grantUserPermissions, mockDataSource, MockDataSourceSrv } from './mocks';
+import { MockDataSourceSrv, grantUserPermissions, mockDataSource } from './mocks';
 import { fetchRulerRulesIfNotFetchedYet } from './state/actions';
 import * as config from './utils/config';
 import { GRAFANA_RULES_SOURCE_NAME } from './utils/datasource';
@@ -105,29 +105,67 @@ describe('RuleEditor grafana managed rules', () => {
     mocks.api.fetchRulerRules.mockResolvedValue({
       'Folder A': [
         {
+          interval: '1m',
           name: 'group1',
-          rules: [],
+          rules: [
+            {
+              annotations: { description: 'some description', summary: 'some summary' },
+              labels: { severity: 'warn', team: 'the a-team' },
+              for: '5m',
+              grafana_alert: {
+                uid: '23',
+                namespace_uid: 'abcd',
+                condition: 'B',
+                data: getDefaultQueries(),
+                exec_err_state: GrafanaAlertStateDecision.Error,
+                no_data_state: GrafanaAlertStateDecision.NoData,
+                title: 'my great new rule',
+              },
+            },
+          ],
         },
       ],
       namespace2: [
         {
-          name: 'group2',
-          rules: [],
+          interval: '1m',
+          name: 'group1',
+          rules: [
+            {
+              annotations: { description: 'some description', summary: 'some summary' },
+              labels: { severity: 'warn', team: 'the a-team' },
+              for: '5m',
+              grafana_alert: {
+                uid: '23',
+                namespace_uid: 'b',
+                condition: 'B',
+                data: getDefaultQueries(),
+                exec_err_state: GrafanaAlertStateDecision.Error,
+                no_data_state: GrafanaAlertStateDecision.NoData,
+                title: 'my great new rule',
+              },
+            },
+          ],
         },
       ],
     });
     mocks.searchFolders.mockResolvedValue([
       {
         title: 'Folder A',
+        uid: 'abcd',
         id: 1,
+        type: DashboardSearchItemType.DashDB,
       },
       {
         title: 'Folder B',
         id: 2,
+        uid: 'b',
+        type: DashboardSearchItemType.DashDB,
       },
       {
         title: 'Folder / with slash',
+        uid: 'c',
         id: 2,
+        type: DashboardSearchItemType.DashDB,
       },
     ] as DashboardSearchHit[]);
 
@@ -163,7 +201,7 @@ describe('RuleEditor grafana managed rules', () => {
     // 9seg
     expect(mocks.api.setRulerRuleGroup).toHaveBeenCalledWith(
       { dataSourceName: GRAFANA_RULES_SOURCE_NAME, apiVersion: 'legacy' },
-      'Folder A',
+      'abcd',
       {
         interval: '1m',
         name: 'group1',
diff --git a/public/app/features/alerting/unified/RuleEditorRecordingRule.test.tsx b/public/app/features/alerting/unified/RuleEditorRecordingRule.test.tsx
index 681a84611b1ee..8b9455201f4b0 100644
--- a/public/app/features/alerting/unified/RuleEditorRecordingRule.test.tsx
+++ b/public/app/features/alerting/unified/RuleEditorRecordingRule.test.tsx
@@ -3,7 +3,7 @@ import userEvent, { PointerEventsCheckLevel } from '@testing-library/user-event'
 import React from 'react';
 import { renderRuleEditor, ui } from 'test/helpers/alertingRuleEditor';
 import { clickSelectOption } from 'test/helpers/selectOptionInTest';
-import { byRole, byText } from 'testing-library-selector';
+import { byText } from 'testing-library-selector';
 
 import { setDataSourceSrv } from '@grafana/runtime';
 import { contextSrv } from 'app/core/services/context_srv';
@@ -72,6 +72,7 @@ jest.mock('@grafana/runtime', () => ({
   getDataSourceSrv: jest.fn(() => ({
     getInstanceSettings: () => dataSources.default,
     get: () => dataSources.default,
+    getList: () => Object.values(dataSources),
   })),
 }));
 
@@ -149,9 +150,9 @@ describe('RuleEditor recording rules', () => {
     await userEvent.type(await ui.inputs.name.find(), 'my great new recording rule');
 
     const dataSourceSelect = ui.inputs.dataSource.get();
-    await userEvent.click(byRole('combobox').get(dataSourceSelect));
+    await userEvent.click(dataSourceSelect);
 
-    await clickSelectOption(dataSourceSelect, 'Prom (default)');
+    await userEvent.click(screen.getByText('Prom'));
     await clickSelectOption(ui.inputs.namespace.get(), 'namespace2');
     await clickSelectOption(ui.inputs.group.get(), 'group2');
 
diff --git a/public/app/features/alerting/unified/RuleList.test.tsx b/public/app/features/alerting/unified/RuleList.test.tsx
index 2f072caf3d062..b9bbe3ea32a31 100644
--- a/public/app/features/alerting/unified/RuleList.test.tsx
+++ b/public/app/features/alerting/unified/RuleList.test.tsx
@@ -5,7 +5,15 @@ import React from 'react';
 import { TestProvider } from 'test/helpers/TestProvider';
 import { byRole, byTestId, byText } from 'testing-library-selector';
 
-import { DataSourceSrv, locationService, setBackendSrv, setDataSourceSrv } from '@grafana/runtime';
+import { PluginExtensionTypes } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import {
+  DataSourceSrv,
+  getPluginLinkExtensions,
+  locationService,
+  setBackendSrv,
+  setDataSourceSrv,
+} from '@grafana/runtime';
 import { backendSrv } from 'app/core/services/backend_srv';
 import * as ruleActionButtons from 'app/features/alerting/unified/components/rules/RuleActionsButtons';
 import * as actions from 'app/features/alerting/unified/state/actions';
@@ -18,9 +26,9 @@ import { discoverFeatures } from './api/buildInfo';
 import { fetchRules } from './api/prometheus';
 import { deleteNamespace, deleteRulerRulesGroup, fetchRulerRules, setRulerRuleGroup } from './api/ruler';
 import {
+  MockDataSourceSrv,
   grantUserPermissions,
   mockDataSource,
-  MockDataSourceSrv,
   mockPromAlert,
   mockPromAlertingRule,
   mockPromRecordingRule,
@@ -32,6 +40,11 @@ import {
 import * as config from './utils/config';
 import { DataSourceType, GRAFANA_RULES_SOURCE_NAME } from './utils/datasource';
 
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getPluginLinkExtensions: jest.fn(),
+  useReturnToPrevious: jest.fn(),
+}));
 jest.mock('./api/buildInfo');
 jest.mock('./api/prometheus');
 jest.mock('./api/ruler');
@@ -53,6 +66,7 @@ jest.spyOn(actions, 'rulesInSameGroupHaveInvalidFor').mockReturnValue([]);
 
 const mocks = {
   getAllDataSourcesMock: jest.mocked(config.getAllDataSources),
+  getPluginLinkExtensionsMock: jest.mocked(getPluginLinkExtensions),
   rulesInSameGroupHaveInvalidForMock: jest.mocked(actions.rulesInSameGroupHaveInvalidFor),
 
   api: {
@@ -100,19 +114,16 @@ const dataSources = {
 const ui = {
   ruleGroup: byTestId('rule-group'),
   cloudRulesSourceErrors: byTestId('cloud-rulessource-errors'),
-  groupCollapseToggle: byTestId('group-collapse-toggle'),
-  ruleCollapseToggle: byTestId('collapse-toggle'),
+  groupCollapseToggle: byTestId(selectors.components.AlertRules.groupToggle),
+  ruleCollapseToggle: byTestId(selectors.components.AlertRules.toggle),
   rulesTable: byTestId('rules-table'),
   ruleRow: byTestId('row'),
-  expandedContent: byTestId('expanded-content'),
+  expandedContent: byTestId(selectors.components.AlertRules.expandedContent),
   rulesFilterInput: byTestId('search-query-input'),
   moreErrorsButton: byRole('button', { name: /more errors/ }),
   editCloudGroupIcon: byTestId('edit-group'),
-  newRuleButton: byRole('link', { name: 'New alert rule' }),
-  moreButton: byRole('button', { name: 'More' }),
-  exportButton: byRole('menuitem', {
-    name: /export all grafana\-managed rules/i,
-  }),
+  newRuleButton: byText(/new alert rule/i),
+  exportButton: byText(/export rules/i),
   editGroupModal: {
     dialog: byRole('dialog'),
     namespaceInput: byRole('textbox', { name: /^Namespace/ }),
@@ -137,6 +148,19 @@ describe('RuleList', () => {
       AccessControlAction.AlertingRuleExternalWrite,
     ]);
     mocks.rulesInSameGroupHaveInvalidForMock.mockReturnValue([]);
+    mocks.getPluginLinkExtensionsMock.mockReturnValue({
+      extensions: [
+        {
+          pluginId: 'grafana-ml-app',
+          id: '1',
+          type: PluginExtensionTypes.link,
+          title: 'Run investigation',
+          category: 'Sift',
+          description: 'Run a Sift investigation for this alert',
+          onClick: jest.fn(),
+        },
+      ],
+    });
   });
 
   afterEach(() => {
@@ -376,13 +400,13 @@ describe('RuleList', () => {
     // expand details of an instance
     await userEvent.click(ui.ruleCollapseToggle.get(instanceRows![0]));
 
-    const alertDetails = byTestId('expanded-content').get(instanceRows[0]);
+    const alertDetails = byTestId(selectors.components.AlertRules.expandedContent).get(instanceRows[0]);
     expect(alertDetails).toHaveTextContent('Value2e+10');
     expect(alertDetails).toHaveTextContent('messagefirst alert message');
 
     // collapse everything again
     await userEvent.click(ui.ruleCollapseToggle.get(instanceRows![0]));
-    expect(byTestId('expanded-content').query(instanceRows[0])).not.toBeInTheDocument();
+    expect(byTestId(selectors.components.AlertRules.expandedContent).query(instanceRows[0])).not.toBeInTheDocument();
     await userEvent.click(ui.ruleCollapseToggle.getAll(ruleRows[1])[0]);
     await userEvent.click(ui.groupCollapseToggle.get(groups[1]));
     expect(ui.rulesTable.query()).not.toBeInTheDocument();
@@ -679,7 +703,7 @@ describe('RuleList', () => {
   describe('RBAC Enabled', () => {
     describe('Export button', () => {
       it('Export button should be visible when the user has alert read permissions', async () => {
-        grantUserPermissions([AccessControlAction.AlertingRuleRead, AccessControlAction.FoldersRead]);
+        grantUserPermissions([AccessControlAction.AlertingRuleRead]);
 
         mocks.getAllDataSourcesMock.mockReturnValue([]);
         setDataSourceSrv(new MockDataSourceSrv({}));
@@ -703,7 +727,8 @@ describe('RuleList', () => {
 
         renderRuleList();
 
-        await userEvent.click(ui.moreButton.get());
+        await waitFor(() => expect(mocks.api.fetchRules).toHaveBeenCalledTimes(1));
+
         expect(ui.exportButton.get()).toBeInTheDocument();
       });
     });
diff --git a/public/app/features/alerting/unified/RuleList.tsx b/public/app/features/alerting/unified/RuleList.tsx
index a36a7eccff3d0..7bb7f40830249 100644
--- a/public/app/features/alerting/unified/RuleList.tsx
+++ b/public/app/features/alerting/unified/RuleList.tsx
@@ -1,17 +1,16 @@
 import { css } from '@emotion/css';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { useLocation } from 'react-router-dom';
 import { useAsyncFn, useInterval } from 'react-use';
 
-import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Button, useStyles2, withErrorBoundary } from '@grafana/ui';
+import { GrafanaTheme2, urlUtil } from '@grafana/data';
+import { Button, LinkButton, useStyles2, withErrorBoundary } from '@grafana/ui';
 import { useQueryParams } from 'app/core/hooks/useQueryParams';
 import { useDispatch } from 'app/types';
 
 import { CombinedRuleNamespace } from '../../../types/unified-alerting';
 
-import { trackRuleListNavigation } from './Analytics';
-import { MoreActionsRuleButtons } from './MoreActionsRuleButtons';
+import { LogMessages, logInfo, trackRuleListNavigation } from './Analytics';
 import { AlertingPageWrapper } from './components/AlertingPageWrapper';
 import { NoRulesSplash } from './components/rules/NoRulesCTA';
 import { INSTANCES_DISPLAY_LIMIT } from './components/rules/RuleDetails';
@@ -20,6 +19,7 @@ import { RuleListGroupView } from './components/rules/RuleListGroupView';
 import { RuleListStateView } from './components/rules/RuleListStateView';
 import { RuleStats } from './components/rules/RuleStats';
 import RulesFilter from './components/rules/RulesFilter';
+import { AlertingAction, useAlertingAbility } from './hooks/useAbilities';
 import { useCombinedRuleNamespaces } from './hooks/useCombinedRuleNamespaces';
 import { useFilteredRules, useRulesFilter } from './hooks/useFilteredRules';
 import { useUnifiedAlertingSelector } from './hooks/useUnifiedAlertingSelector';
@@ -99,6 +99,7 @@ const RuleList = withErrorBoundary(
     // Show splash only when we loaded all of the data sources and none of them has alerts
     const hasNoAlertRulesCreatedYet =
       allPromLoaded && allPromEmpty && promRequests.length > 0 && allRulerEmpty && allRulerLoaded;
+    const hasAlertRulesCreated = !hasNoAlertRulesCreatedYet;
 
     const combinedNamespaces: CombinedRuleNamespace[] = useCombinedRuleNamespaces();
     const filteredNamespaces = useFilteredRules(combinedNamespaces, filterState);
@@ -106,10 +107,10 @@ const RuleList = withErrorBoundary(
     return (
       // We don't want to show the Loading... indicator for the whole page.
       // We show separate indicators for Grafana-managed and Cloud rules
-      <AlertingPageWrapper pageId="alert-list" isLoading={false}>
+      <AlertingPageWrapper navId="alert-list" isLoading={false} actions={hasAlertRulesCreated && <CreateAlertButton />}>
         <RuleListErrors />
         <RulesFilter onFilterCleared={onFilterCleared} />
-        {!hasNoAlertRulesCreatedYet && (
+        {hasAlertRulesCreated && (
           <>
             <div className={styles.break} />
             <div className={styles.buttonsContainer}>
@@ -126,14 +127,11 @@ const RuleList = withErrorBoundary(
                 )}
                 <RuleStats namespaces={filteredNamespaces} />
               </div>
-              <Stack direction="row" gap={0.5}>
-                <MoreActionsRuleButtons />
-              </Stack>
             </div>
           </>
         )}
         {hasNoAlertRulesCreatedYet && <NoRulesSplash />}
-        {!hasNoAlertRulesCreatedYet && <ViewComponent expandAll={expandAll} namespaces={filteredNamespaces} />}
+        {hasAlertRulesCreated && <ViewComponent expandAll={expandAll} namespaces={filteredNamespaces} />}
       </AlertingPageWrapper>
     );
   },
@@ -163,3 +161,27 @@ const getStyles = (theme: GrafanaTheme2) => ({
 });
 
 export default RuleList;
+
+export function CreateAlertButton() {
+  const [createRuleSupported, createRuleAllowed] = useAlertingAbility(AlertingAction.CreateAlertRule);
+  const [createCloudRuleSupported, createCloudRuleAllowed] = useAlertingAbility(AlertingAction.CreateExternalAlertRule);
+
+  const location = useLocation();
+
+  const canCreateCloudRules = createCloudRuleSupported && createCloudRuleAllowed;
+
+  const canCreateGrafanaRules = createRuleSupported && createRuleAllowed;
+
+  if (canCreateGrafanaRules || canCreateCloudRules) {
+    return (
+      <LinkButton
+        href={urlUtil.renderUrl('alerting/new/alerting', { returnTo: location.pathname + location.search })}
+        icon="plus"
+        onClick={() => logInfo(LogMessages.alertRuleFromScratch)}
+      >
+        New alert rule
+      </LinkButton>
+    );
+  }
+  return null;
+}
diff --git a/public/app/features/alerting/unified/RuleViewer.tsx b/public/app/features/alerting/unified/RuleViewer.tsx
index 864d68d104e32..32064616fa992 100644
--- a/public/app/features/alerting/unified/RuleViewer.tsx
+++ b/public/app/features/alerting/unified/RuleViewer.tsx
@@ -1,15 +1,17 @@
 import React from 'react';
-import { Disable, Enable } from 'react-enable';
 
-import { withErrorBoundary } from '@grafana/ui';
-import { SafeDynamicImport } from 'app/core/components/DynamicImports/SafeDynamicImport';
+import { NavModelItem } from '@grafana/data';
+import { isFetchError } from '@grafana/runtime';
+import { Alert, withErrorBoundary } from '@grafana/ui';
+import { EntityNotFound } from 'app/core/components/PageNotFound/EntityNotFound';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 
 import { AlertingPageWrapper } from './components/AlertingPageWrapper';
-import { AlertingFeature } from './features';
-
-const DetailViewV1 = SafeDynamicImport(() => import('./components/rule-viewer/RuleViewer.v1'));
-const DetailViewV2 = SafeDynamicImport(() => import('./components/rule-viewer/v2/RuleViewer.v2'));
+import { AlertRuleProvider } from './components/rule-viewer/RuleContext';
+import DetailView from './components/rule-viewer/RuleViewer';
+import { useCombinedRule } from './hooks/useCombinedRule';
+import { stringifyErrorLike } from './utils/misc';
+import { getRuleIdFromPathname, parse as parseRuleId } from './utils/rule-id';
 
 type RuleViewerProps = GrafanaRouteComponentProps<{
   id: string;
@@ -17,16 +19,68 @@ type RuleViewerProps = GrafanaRouteComponentProps<{
 }>;
 
 const RuleViewer = (props: RuleViewerProps): JSX.Element => {
+  const id = getRuleIdFromPathname(props.match.params);
+
+  // we convert the stringified ID to a rule identifier object which contains additional
+  // type and source information
+  const identifier = React.useMemo(() => {
+    if (!id) {
+      throw new Error('Rule ID is required');
+    }
+
+    return parseRuleId(id, true);
+  }, [id]);
+
+  // we then fetch the rule from the correct API endpoint(s)
+  const { loading, error, result: rule } = useCombinedRule({ ruleIdentifier: identifier });
+
+  if (error) {
+    return (
+      <AlertingPageWrapper pageNav={defaultPageNav} navId="alert-list">
+        <ErrorMessage error={error} />
+      </AlertingPageWrapper>
+    );
+  }
+
+  if (loading) {
+    return (
+      <AlertingPageWrapper pageNav={defaultPageNav} navId="alert-list" isLoading={true}>
+        <></>
+      </AlertingPageWrapper>
+    );
+  }
+
+  if (rule) {
+    return (
+      <AlertRuleProvider identifier={identifier} rule={rule}>
+        <DetailView />
+      </AlertRuleProvider>
+    );
+  }
+
+  // if we get here assume we can't find the rule
   return (
-    <AlertingPageWrapper>
-      <Enable feature={AlertingFeature.DetailsViewV2}>
-        <DetailViewV2 {...props} />
-      </Enable>
-      <Disable feature={AlertingFeature.DetailsViewV2}>
-        <DetailViewV1 {...props} />
-      </Disable>
+    <AlertingPageWrapper pageNav={defaultPageNav} navId="alert-list">
+      <EntityNotFound entity="Rule" />
     </AlertingPageWrapper>
   );
 };
 
+export const defaultPageNav: NavModelItem = {
+  id: 'alert-rule-view',
+  text: '',
+};
+
+interface ErrorMessageProps {
+  error: unknown;
+}
+
+function ErrorMessage({ error }: ErrorMessageProps) {
+  if (isFetchError(error) && error.status === 404) {
+    return <EntityNotFound entity="Rule" />;
+  }
+
+  return <Alert title={'Something went wrong loading the rule'}>{stringifyErrorLike(error)}</Alert>;
+}
+
 export default withErrorBoundary(RuleViewer, { style: 'page' });
diff --git a/public/app/features/alerting/unified/Silences.test.tsx b/public/app/features/alerting/unified/Silences.test.tsx
index e478cb8baea31..905ed88d476c1 100644
--- a/public/app/features/alerting/unified/Silences.test.tsx
+++ b/public/app/features/alerting/unified/Silences.test.tsx
@@ -5,6 +5,7 @@ import { TestProvider } from 'test/helpers/TestProvider';
 import { byLabelText, byPlaceholderText, byRole, byTestId, byText } from 'testing-library-selector';
 
 import { dateTime } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import { config, locationService, setDataSourceSrv } from '@grafana/runtime';
 import { contextSrv } from 'app/core/services/context_srv';
 import { AlertState, MatcherOperator } from 'app/plugins/datasource/alertmanager/types';
@@ -15,6 +16,8 @@ import { SilenceState } from '../../../plugins/datasource/alertmanager/types';
 import Silences from './Silences';
 import { createOrUpdateSilence, fetchAlerts, fetchSilences } from './api/alertmanager';
 import { grantUserPermissions, mockAlertmanagerAlert, mockDataSource, MockDataSourceSrv, mockSilence } from './mocks';
+import { AlertmanagerProvider } from './state/AlertmanagerContext';
+import { setupDataSources } from './testSetup/datasources';
 import { parseMatchers } from './utils/alertmanager';
 import { DataSourceType } from './utils/datasource';
 
@@ -37,7 +40,9 @@ const renderSilences = (location = '/alerting/silences/') => {
 
   return render(
     <TestProvider>
-      <Silences />
+      <AlertmanagerProvider accessType="instance">
+        <Silences />
+      </AlertmanagerProvider>
     </TestProvider>
   );
 };
@@ -58,7 +63,7 @@ const ui = {
   addSilenceButton: byRole('link', { name: /add silence/i }),
   queryBar: byPlaceholderText('Search'),
   editor: {
-    timeRange: byLabelText('Timepicker', { exact: false }),
+    timeRange: byTestId(selectors.components.TimePicker.openButton),
     durationField: byLabelText('Duration'),
     durationInput: byRole('textbox', { name: /duration/i }),
     matchersField: byTestId('matcher'),
@@ -218,7 +223,7 @@ describe('Silence edit', () => {
 
   beforeEach(() => {
     setUserLogged(true);
-    setDataSourceSrv(new MockDataSourceSrv(dataSources));
+    setupDataSources(dataSources.am);
   });
 
   it('Should not render createdBy if user is logged in and has a name', async () => {
@@ -325,4 +330,32 @@ describe('Silence edit', () => {
     },
     TEST_TIMEOUT
   );
+
+  it(
+    'silences page should contain alertmanager parameter after creating a silence',
+    async () => {
+      const user = userEvent.setup();
+
+      renderSilences(`${baseUrlPath}?alertmanager=Alertmanager`);
+      await waitFor(() => expect(ui.editor.durationField.query()).not.toBeNull());
+
+      await user.type(ui.editor.matcherName.getAll()[0], 'foo');
+      await user.type(ui.editor.matcherOperatorSelect.getAll()[0], '=');
+      await user.type(ui.editor.matcherValue.getAll()[0], 'bar');
+
+      await user.click(ui.editor.submit.get());
+
+      await waitFor(() =>
+        expect(mocks.api.createOrUpdateSilence).toHaveBeenCalledWith(
+          'Alertmanager',
+          expect.objectContaining({
+            matchers: [{ isEqual: true, isRegex: false, name: 'foo', value: 'bar' }],
+          })
+        )
+      );
+
+      expect(locationService.getSearch().get('alertmanager')).toBe('Alertmanager');
+    },
+    TEST_TIMEOUT
+  );
 });
diff --git a/public/app/features/alerting/unified/Silences.tsx b/public/app/features/alerting/unified/Silences.tsx
index 1d4dfaf8e25c3..ec4addf133e3c 100644
--- a/public/app/features/alerting/unified/Silences.tsx
+++ b/public/app/features/alerting/unified/Silences.tsx
@@ -112,7 +112,7 @@ function SilencesPage() {
   const pageNav = useSilenceNavData();
 
   return (
-    <AlertmanagerPageWrapper pageId="silences" pageNav={pageNav} accessType="instance">
+    <AlertmanagerPageWrapper navId="silences" pageNav={pageNav} accessType="instance">
       <Silences />
     </AlertmanagerPageWrapper>
   );
diff --git a/public/app/features/alerting/unified/TODO.md b/public/app/features/alerting/unified/TODO.md
index 180125b1701f0..86e6081154802 100644
--- a/public/app/features/alerting/unified/TODO.md
+++ b/public/app/features/alerting/unified/TODO.md
@@ -17,7 +17,7 @@ If the item needs more rationale and you feel like a single sentence is inedequa
 ## Refactoring
 
 - Get rid of "+ Add new" in drop-downs : Let's see if is there a way we can make it work with `<Select allowCustomValue />`
-- There is a lot of overlap between `RuleActionButtons` and `RuleDetailsActionButtons`. As these components contain a lot of logic it would be nice to extract that logic into hoooks
+- There is a lot of overlap between `RuleActionButtons` and `RuleDetailsActionButtons`. As these components contain a lot of logic it would be nice to extract that logic into hooks
 - Create a shared timings form that can be used in both `EditDefaultPolicyForm.tsx` and `EditNotificationPolicyForm.tsx`
 
 ## Testing
diff --git a/public/app/features/alerting/unified/__snapshots__/NotificationPolicies.test.tsx.snap b/public/app/features/alerting/unified/__snapshots__/NotificationPolicies.test.tsx.snap
new file mode 100644
index 0000000000000..9011ec04694c4
--- /dev/null
+++ b/public/app/features/alerting/unified/__snapshots__/NotificationPolicies.test.tsx.snap
@@ -0,0 +1,281 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`findRoutesMatchingFilters should not match non-existing 1`] = `
+{
+  "filtersApplied": true,
+  "matchedRoutesWithPath": Map {},
+}
+`;
+
+exports[`findRoutesMatchingFilters should work with all filters 1`] = `
+{
+  "filtersApplied": true,
+  "matchedRoutesWithPath": Map {
+    {
+      "id": "1",
+      "matchers": [
+        "hello=world",
+        "foo!=bar",
+      ],
+      "receiver": "simple-receiver",
+      "routes": [
+        {
+          "id": "2",
+          "matchers": [
+            "bar=baz",
+          ],
+          "receiver": "simple-receiver",
+          "routes": undefined,
+        },
+      ],
+    } => [
+      {
+        "id": "0",
+        "receiver": "default-receiver",
+        "routes": [
+          {
+            "id": "1",
+            "matchers": [
+              "hello=world",
+              "foo!=bar",
+            ],
+            "receiver": "simple-receiver",
+            "routes": [
+              {
+                "id": "2",
+                "matchers": [
+                  "bar=baz",
+                ],
+                "receiver": "simple-receiver",
+                "routes": undefined,
+              },
+            ],
+          },
+        ],
+      },
+      {
+        "id": "1",
+        "matchers": [
+          "hello=world",
+          "foo!=bar",
+        ],
+        "receiver": "simple-receiver",
+        "routes": [
+          {
+            "id": "2",
+            "matchers": [
+              "bar=baz",
+            ],
+            "receiver": "simple-receiver",
+            "routes": undefined,
+          },
+        ],
+      },
+    ],
+  },
+}
+`;
+
+exports[`findRoutesMatchingFilters should work with non-intersecting filters 1`] = `
+{
+  "filtersApplied": true,
+  "matchedRoutesWithPath": Map {},
+}
+`;
+
+exports[`findRoutesMatchingFilters should work with only contact point and inheritance 1`] = `
+{
+  "filtersApplied": true,
+  "matchedRoutesWithPath": Map {
+    {
+      "id": "1",
+      "matchers": [
+        "hello=world",
+        "foo!=bar",
+      ],
+      "receiver": "simple-receiver",
+      "routes": [
+        {
+          "id": "2",
+          "matchers": [
+            "bar=baz",
+          ],
+          "receiver": "simple-receiver",
+          "routes": undefined,
+        },
+      ],
+    } => [
+      {
+        "id": "0",
+        "receiver": "default-receiver",
+        "routes": [
+          {
+            "id": "1",
+            "matchers": [
+              "hello=world",
+              "foo!=bar",
+            ],
+            "receiver": "simple-receiver",
+            "routes": [
+              {
+                "id": "2",
+                "matchers": [
+                  "bar=baz",
+                ],
+                "receiver": "simple-receiver",
+                "routes": undefined,
+              },
+            ],
+          },
+        ],
+      },
+      {
+        "id": "1",
+        "matchers": [
+          "hello=world",
+          "foo!=bar",
+        ],
+        "receiver": "simple-receiver",
+        "routes": [
+          {
+            "id": "2",
+            "matchers": [
+              "bar=baz",
+            ],
+            "receiver": "simple-receiver",
+            "routes": undefined,
+          },
+        ],
+      },
+    ],
+    {
+      "id": "2",
+      "matchers": [
+        "bar=baz",
+      ],
+      "receiver": "simple-receiver",
+      "routes": undefined,
+    } => [
+      {
+        "id": "0",
+        "receiver": "default-receiver",
+        "routes": [
+          {
+            "id": "1",
+            "matchers": [
+              "hello=world",
+              "foo!=bar",
+            ],
+            "receiver": "simple-receiver",
+            "routes": [
+              {
+                "id": "2",
+                "matchers": [
+                  "bar=baz",
+                ],
+                "receiver": "simple-receiver",
+                "routes": undefined,
+              },
+            ],
+          },
+        ],
+      },
+      {
+        "id": "1",
+        "matchers": [
+          "hello=world",
+          "foo!=bar",
+        ],
+        "receiver": "simple-receiver",
+        "routes": [
+          {
+            "id": "2",
+            "matchers": [
+              "bar=baz",
+            ],
+            "receiver": "simple-receiver",
+            "routes": undefined,
+          },
+        ],
+      },
+      {
+        "id": "2",
+        "matchers": [
+          "bar=baz",
+        ],
+        "receiver": "simple-receiver",
+        "routes": undefined,
+      },
+    ],
+  },
+}
+`;
+
+exports[`findRoutesMatchingFilters should work with only label matchers 1`] = `
+{
+  "filtersApplied": true,
+  "matchedRoutesWithPath": Map {
+    {
+      "id": "1",
+      "matchers": [
+        "hello=world",
+        "foo!=bar",
+      ],
+      "receiver": "simple-receiver",
+      "routes": [
+        {
+          "id": "2",
+          "matchers": [
+            "bar=baz",
+          ],
+          "receiver": "simple-receiver",
+          "routes": undefined,
+        },
+      ],
+    } => [
+      {
+        "id": "0",
+        "receiver": "default-receiver",
+        "routes": [
+          {
+            "id": "1",
+            "matchers": [
+              "hello=world",
+              "foo!=bar",
+            ],
+            "receiver": "simple-receiver",
+            "routes": [
+              {
+                "id": "2",
+                "matchers": [
+                  "bar=baz",
+                ],
+                "receiver": "simple-receiver",
+                "routes": undefined,
+              },
+            ],
+          },
+        ],
+      },
+      {
+        "id": "1",
+        "matchers": [
+          "hello=world",
+          "foo!=bar",
+        ],
+        "receiver": "simple-receiver",
+        "routes": [
+          {
+            "id": "2",
+            "matchers": [
+              "bar=baz",
+            ],
+            "receiver": "simple-receiver",
+            "routes": undefined,
+          },
+        ],
+      },
+    ],
+  },
+}
+`;
diff --git a/public/app/features/alerting/unified/__snapshots__/PanelAlertTabContent.test.tsx.snap b/public/app/features/alerting/unified/__snapshots__/PanelAlertTabContent.test.tsx.snap
index c6d28162c50bb..eecab06dfdb14 100644
--- a/public/app/features/alerting/unified/__snapshots__/PanelAlertTabContent.test.tsx.snap
+++ b/public/app/features/alerting/unified/__snapshots__/PanelAlertTabContent.test.tsx.snap
@@ -13,6 +13,10 @@ exports[`PanelAlertTabContent Will render alerts belonging to panel and a button
     },
   ],
   "condition": "C",
+  "folder": {
+    "title": "super folder",
+    "uid": "abc",
+  },
   "name": "mypanel",
   "queries": [
     {
diff --git a/public/app/features/alerting/unified/api/alertRuleApi.ts b/public/app/features/alerting/unified/api/alertRuleApi.ts
index 85c07792765a1..178833f6745e7 100644
--- a/public/app/features/alerting/unified/api/alertRuleApi.ts
+++ b/public/app/features/alerting/unified/api/alertRuleApi.ts
@@ -154,15 +154,15 @@ export const alertRuleApi = alertingApi.injectEndpoints({
 
     prometheusRuleNamespaces: build.query<
       RuleNamespace[],
-      { ruleSourceName: string; namespace?: string; groupName?: string; ruleName?: string }
+      { ruleSourceName: string; namespace?: string; groupName?: string; ruleName?: string; dashboardUid?: string }
     >({
-      query: ({ ruleSourceName, namespace, groupName, ruleName }) => {
-        const queryParams: Record<string, string | undefined> = {};
-        // if (isPrometheusRuleIdentifier(ruleIdentifier) || isCloudRuleIdentifier(ruleIdentifier)) {
-        queryParams['file'] = namespace;
-        queryParams['rule_group'] = groupName;
-        queryParams['rule_name'] = ruleName;
-        // }
+      query: ({ ruleSourceName, namespace, groupName, ruleName, dashboardUid }) => {
+        const queryParams: Record<string, string | undefined> = {
+          file: namespace,
+          rule_group: groupName,
+          rule_name: ruleName,
+          dashboard_uid: dashboardUid, // Supported only by Grafana managed rules
+        };
 
         return {
           url: `api/prometheus/${getDatasourceAPIUid(ruleSourceName)}/api/v1/rules`,
@@ -201,6 +201,7 @@ export const alertRuleApi = alertingApi.injectEndpoints({
         params: { format: format, folderUid: folderUid, group: group, ruleUid: ruleUid },
         responseType: 'text',
       }),
+      keepUnusedDataFor: 0,
     }),
     exportReceiver: build.query<string, { receiverName: string; decrypt: boolean; format: ExportFormats }>({
       query: ({ receiverName, decrypt, format }) => ({
@@ -208,6 +209,7 @@ export const alertRuleApi = alertingApi.injectEndpoints({
         params: { format: format, decrypt: decrypt, name: receiverName },
         responseType: 'text',
       }),
+      keepUnusedDataFor: 0,
     }),
     exportReceivers: build.query<string, { decrypt: boolean; format: ExportFormats }>({
       query: ({ decrypt, format }) => ({
@@ -215,6 +217,7 @@ export const alertRuleApi = alertingApi.injectEndpoints({
         params: { format: format, decrypt: decrypt },
         responseType: 'text',
       }),
+      keepUnusedDataFor: 0,
     }),
     exportPolicies: build.query<string, { format: ExportFormats }>({
       query: ({ format }) => ({
@@ -222,18 +225,35 @@ export const alertRuleApi = alertingApi.injectEndpoints({
         params: { format: format },
         responseType: 'text',
       }),
+      keepUnusedDataFor: 0,
     }),
     exportModifiedRuleGroup: build.mutation<
       string,
-      { payload: ModifyExportPayload; format: ExportFormats; nameSpace: string }
+      { payload: ModifyExportPayload; format: ExportFormats; nameSpaceUID: string }
     >({
-      query: ({ payload, format, nameSpace }) => ({
-        url: `/api/ruler/grafana/api/v1/rules/${nameSpace}/export/`,
+      query: ({ payload, format, nameSpaceUID }) => ({
+        url: `/api/ruler/grafana/api/v1/rules/${nameSpaceUID}/export/`,
         params: { format: format },
         responseType: 'text',
         data: payload,
         method: 'POST',
       }),
     }),
+    exportMuteTimings: build.query<string, { format: ExportFormats }>({
+      query: ({ format }) => ({
+        url: `/api/v1/provisioning/mute-timings/export/`,
+        params: { format: format },
+        responseType: 'text',
+      }),
+      keepUnusedDataFor: 0,
+    }),
+    exportMuteTiming: build.query<string, { format: ExportFormats; muteTiming: string }>({
+      query: ({ format, muteTiming }) => ({
+        url: `/api/v1/provisioning/mute-timings/${muteTiming}/export/`,
+        params: { format: format },
+        responseType: 'text',
+      }),
+      keepUnusedDataFor: 0,
+    }),
   }),
 });
diff --git a/public/app/features/alerting/unified/api/alertingApi.ts b/public/app/features/alerting/unified/api/alertingApi.ts
index b27f92d1e7c60..5d90c4c58a109 100644
--- a/public/app/features/alerting/unified/api/alertingApi.ts
+++ b/public/app/features/alerting/unified/api/alertingApi.ts
@@ -3,7 +3,7 @@ import { lastValueFrom } from 'rxjs';
 
 import { BackendSrvRequest, getBackendSrv } from '@grafana/runtime';
 
-import { logInfo } from '../Analytics';
+import { logMeasurement } from '../Analytics';
 
 export const backendSrvBaseQuery = (): BaseQueryFn<BackendSrvRequest> => async (requestOptions) => {
   try {
@@ -11,12 +11,17 @@ export const backendSrvBaseQuery = (): BaseQueryFn<BackendSrvRequest> => async (
 
     const { data, ...meta } = await lastValueFrom(getBackendSrv().fetch(requestOptions));
 
-    logInfo('Request finished', {
-      loadTimeMs: (performance.now() - requestStartTs).toFixed(0),
-      url: requestOptions.url,
-      method: requestOptions.method ?? '',
-      responseStatus: meta.statusText,
-    });
+    logMeasurement(
+      'backendSrvBaseQuery',
+      {
+        loadTimeMs: performance.now() - requestStartTs,
+      },
+      {
+        url: requestOptions.url,
+        method: requestOptions.method ?? 'GET',
+        responseStatus: meta.statusText,
+      }
+    );
 
     return { data, meta };
   } catch (error) {
@@ -27,6 +32,12 @@ export const backendSrvBaseQuery = (): BaseQueryFn<BackendSrvRequest> => async (
 export const alertingApi = createApi({
   reducerPath: 'alertingApi',
   baseQuery: backendSrvBaseQuery(),
-  tagTypes: ['AlertmanagerChoice', 'AlertmanagerConfiguration', 'OnCallIntegrations'],
+  tagTypes: [
+    'AlertmanagerChoice',
+    'AlertmanagerConfiguration',
+    'OnCallIntegrations',
+    'OrgMigrationState',
+    'DataSourceSettings',
+  ],
   endpoints: () => ({}),
 });
diff --git a/public/app/features/alerting/unified/api/alertmanager.ts b/public/app/features/alerting/unified/api/alertmanager.ts
index ba565453d4222..27d080a6c4a0b 100644
--- a/public/app/features/alerting/unified/api/alertmanager.ts
+++ b/public/app/features/alerting/unified/api/alertmanager.ts
@@ -1,6 +1,6 @@
 import { lastValueFrom } from 'rxjs';
 
-import { urlUtil } from '@grafana/data';
+import { isObject, urlUtil } from '@grafana/data';
 import { getBackendSrv, isFetchError } from '@grafana/runtime';
 import {
   AlertmanagerAlert,
@@ -206,18 +206,24 @@ function receiversResponseContainsErrors(result: TestReceiversResult) {
   );
 }
 
-function isTestReceiversResult(data: any): data is TestReceiversResult {
-  const receivers = data?.receivers;
-
-  if (Array.isArray(receivers)) {
-    return receivers.every(
-      (receiver: any) => typeof receiver.name === 'string' && Array.isArray(receiver.grafana_managed_receiver_configs)
-    );
+function isTestReceiversResult(data: unknown): data is TestReceiversResult {
+  if (isObject(data) && 'receivers' in data && Array.isArray(data.receivers)) {
+    return data.receivers.every(isSingleTestRecieverResult);
   }
 
   return false;
 }
 
+function isSingleTestRecieverResult(receiver: unknown): receiver is TestReceiversResult {
+  return (
+    isObject(receiver) &&
+    'name' in receiver &&
+    typeof receiver.name === 'string' &&
+    'grafana_managed_receiver_configs' in receiver &&
+    Array.isArray(receiver.grafana_managed_receiver_configs)
+  );
+}
+
 function getReceiverResultError(receiversResult: TestReceiversResult) {
   return receiversResult.receivers
     .flatMap((receiver) =>
diff --git a/public/app/features/alerting/unified/api/alertmanagerApi.ts b/public/app/features/alerting/unified/api/alertmanagerApi.ts
index e97588813def8..ea0f1e948d9b1 100644
--- a/public/app/features/alerting/unified/api/alertmanagerApi.ts
+++ b/public/app/features/alerting/unified/api/alertmanagerApi.ts
@@ -11,7 +11,9 @@ import {
   ExternalAlertmanagerConfig,
   ExternalAlertmanagers,
   ExternalAlertmanagersResponse,
+  GrafanaManagedContactPoint,
   Matcher,
+  MuteTimeInterval,
 } from '../../../../plugins/datasource/alertmanager/types';
 import { NotifierDTO } from '../../../../types';
 import { withPerformanceLogging } from '../Analytics';
@@ -162,8 +164,8 @@ export const alertmanagerApi = alertingApi.injectEndpoints({
 
         // wrap our fetchConfig function with some performance logging functions
         const fetchAMconfigWithLogging = withPerformanceLogging(
+          'unifiedalerting/fetchAmConfig',
           fetchAlertManagerConfig,
-          `[${alertmanagerSourceName}] Alertmanager config loaded`,
           {
             dataSourceName: alertmanagerSourceName,
             thunk: 'unifiedalerting/fetchAmConfig',
@@ -257,5 +259,12 @@ export const alertmanagerApi = alertingApi.injectEndpoints({
         }));
       },
     }),
+    // Grafana Managed Alertmanager only
+    getContactPointsList: build.query<GrafanaManagedContactPoint[], void>({
+      query: () => ({ url: '/api/v1/notifications/receivers' }),
+    }),
+    getMuteTimingList: build.query<MuteTimeInterval[], void>({
+      query: () => ({ url: '/api/v1/notifications/time-intervals' }),
+    }),
   }),
 });
diff --git a/public/app/features/alerting/unified/api/buildInfo.test.ts b/public/app/features/alerting/unified/api/buildInfo.test.ts
index 5bc0e7f60a280..53f9319364af9 100644
--- a/public/app/features/alerting/unified/api/buildInfo.test.ts
+++ b/public/app/features/alerting/unified/api/buildInfo.test.ts
@@ -10,7 +10,9 @@ const fetch = jest.fn();
 
 jest.mock('./prometheus');
 jest.mock('./ruler');
-jest.mock('app/core/services/context_srv', () => {});
+jest.mock('app/core/services/context_srv', () => ({
+  contextSrv: jest.fn(),
+}));
 jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
   getBackendSrv: () => ({ fetch }),
diff --git a/public/app/features/alerting/unified/api/dataSourcesApi.ts b/public/app/features/alerting/unified/api/dataSourcesApi.ts
new file mode 100644
index 0000000000000..94bb2de09371d
--- /dev/null
+++ b/public/app/features/alerting/unified/api/dataSourcesApi.ts
@@ -0,0 +1,15 @@
+import { DataSourceJsonData, DataSourceSettings } from '@grafana/data';
+
+import { alertingApi } from './alertingApi';
+
+export const dataSourcesApi = alertingApi.injectEndpoints({
+  endpoints: (build) => ({
+    getAllDataSourceSettings: build.query<Array<DataSourceSettings<DataSourceJsonData>>, void>({
+      query: () => ({ url: 'api/datasources' }),
+      // we'll create individual cache entries for each datasource UID
+      providesTags: (result) => {
+        return result ? result.map(({ uid }) => ({ type: 'DataSourceSettings', id: uid })) : ['DataSourceSettings'];
+      },
+    }),
+  }),
+});
diff --git a/public/app/features/alerting/unified/api/featureDiscoveryApi.ts b/public/app/features/alerting/unified/api/featureDiscoveryApi.ts
index 659cc191f7627..45f59b75ea7a4 100644
--- a/public/app/features/alerting/unified/api/featureDiscoveryApi.ts
+++ b/public/app/features/alerting/unified/api/featureDiscoveryApi.ts
@@ -28,8 +28,8 @@ export const featureDiscoveryApi = alertingApi.injectEndpoints({
         }
 
         const discoverFeaturesWithLogging = withPerformanceLogging(
+          'unifiedalerting/featureDiscoveryApi/discoverDsFeatures',
           discoverFeatures,
-          `[${rulesSourceName}] Rules source features discovered`,
           {
             dataSourceName: rulesSourceName,
             endpoint: 'unifiedalerting/featureDiscoveryApi/discoverDsFeatures',
diff --git a/public/app/features/alerting/unified/api/onCallApi.ts b/public/app/features/alerting/unified/api/onCallApi.ts
index 7127f4cfbe060..a3a4ebdfb6b68 100644
--- a/public/app/features/alerting/unified/api/onCallApi.ts
+++ b/public/app/features/alerting/unified/api/onCallApi.ts
@@ -42,7 +42,12 @@ export const onCallApi = alertingApi.injectEndpoints({
         url: getProxyApiUrl('/api/internal/v1/alert_receive_channels/'),
         // legacy_grafana_alerting is necessary for OnCall.
         // We do NOT need to differentiate between these two on our side
-        params: { filters: true, integration: [GRAFANA_ONCALL_INTEGRATION_TYPE, 'legacy_grafana_alerting'] },
+        params: {
+          filters: true,
+          integration: [GRAFANA_ONCALL_INTEGRATION_TYPE, 'legacy_grafana_alerting'],
+          skip_pagination: true,
+        },
+        showErrorAlert: false,
       }),
       transformResponse: (response: AlertReceiveChannelsResult) => {
         if (isPaginatedResponse(response)) {
@@ -71,6 +76,7 @@ export const onCallApi = alertingApi.injectEndpoints({
     features: build.query<OnCallFeature[], void>({
       query: () => ({
         url: getProxyApiUrl('/api/internal/v1/features/'),
+        showErrorAlert: false,
       }),
     }),
   }),
diff --git a/public/app/features/alerting/unified/api/ruler.ts b/public/app/features/alerting/unified/api/ruler.ts
index 87187461312ae..69104d16ff699 100644
--- a/public/app/features/alerting/unified/api/ruler.ts
+++ b/public/app/features/alerting/unified/api/ruler.ts
@@ -1,5 +1,6 @@
 import { lastValueFrom } from 'rxjs';
 
+import { isObject } from '@grafana/data';
 import { FetchResponse, getBackendSrv } from '@grafana/runtime';
 import { RulerDataSourceConfig } from 'app/types/unified-alerting';
 import { PostableRulerRuleGroupDTO, RulerRuleGroupDTO, RulerRulesConfigDTO } from 'app/types/unified-alerting-dto';
@@ -40,8 +41,8 @@ export function rulerUrlBuilder(rulerConfig: RulerDataSourceConfig) {
       path: `${rulerPath}/${encodeURIComponent(namespace)}`,
       params: Object.fromEntries(rulerSearchParams),
     }),
-    namespaceGroup: (namespace: string, group: string): RulerRequestUrl => ({
-      path: `${rulerPath}/${encodeURIComponent(namespace)}/${encodeURIComponent(group)}`,
+    namespaceGroup: (namespaceUID: string, group: string): RulerRequestUrl => ({
+      path: `${rulerPath}/${encodeURIComponent(namespaceUID)}/${encodeURIComponent(group)}`,
       params: Object.fromEntries(rulerSearchParams),
     }),
   };
@@ -50,10 +51,10 @@ export function rulerUrlBuilder(rulerConfig: RulerDataSourceConfig) {
 // upsert a rule group. use this to update rule
 export async function setRulerRuleGroup(
   rulerConfig: RulerDataSourceConfig,
-  namespace: string,
+  namespaceIdentifier: string,
   group: PostableRulerRuleGroupDTO
 ): Promise<void> {
-  const { path, params } = rulerUrlBuilder(rulerConfig).namespace(namespace);
+  const { path, params } = rulerUrlBuilder(rulerConfig).namespace(namespaceIdentifier);
   await lastValueFrom(
     getBackendSrv().fetch<unknown>({
       method: 'POST',
@@ -101,10 +102,10 @@ export async function fetchTestRulerRulesGroup(dataSourceName: string): Promise<
 
 export async function fetchRulerRulesGroup(
   rulerConfig: RulerDataSourceConfig,
-  namespace: string,
+  namespaceIdentifier: string, // can be the namespace name or namespace UID
   group: string
 ): Promise<RulerRuleGroupDTO | null> {
-  const { path, params } = rulerUrlBuilder(rulerConfig).namespaceGroup(namespace, group);
+  const { path, params } = rulerUrlBuilder(rulerConfig).namespaceGroup(namespaceIdentifier, group);
   return rulerGetRequest<RulerRuleGroupDTO | null>(path, null, params);
 }
 
@@ -155,8 +156,13 @@ async function rulerGetRequest<T>(url: string, empty: T, params?: Record<string,
 }
 
 function isResponseError(error: unknown): error is FetchResponse<ErrorResponseMessage> {
-  const hasErrorMessage = (error as FetchResponse<ErrorResponseMessage>).data != null;
-  const hasErrorCode = Number.isFinite((error as FetchResponse<ErrorResponseMessage>).status);
+  if (!isObject(error)) {
+    return false;
+  }
+
+  const hasErrorMessage = 'data' in error && error.data !== null && error.data !== undefined;
+  const hasErrorCode = 'status' in error && Number.isFinite(error.status);
+
   return hasErrorCode && hasErrorMessage;
 }
 
diff --git a/public/app/features/alerting/unified/api/upgradeApi.ts b/public/app/features/alerting/unified/api/upgradeApi.ts
new file mode 100644
index 0000000000000..baef6c7a06912
--- /dev/null
+++ b/public/app/features/alerting/unified/api/upgradeApi.ts
@@ -0,0 +1,444 @@
+import { FetchError, isFetchError } from '@grafana/runtime';
+
+import {
+  createErrorNotification,
+  createSuccessNotification,
+  createWarningNotification,
+} from '../../../../core/copy/appNotification';
+import { notifyApp } from '../../../../core/reducers/appNotification';
+import { ObjectMatcher } from '../../../../plugins/datasource/alertmanager/types';
+
+import { alertingApi } from './alertingApi';
+
+export interface OrgMigrationSummary {
+  newDashboards: number;
+  newAlerts: number;
+  newChannels: number;
+  removed: boolean;
+  hasErrors: boolean;
+}
+
+export interface OrgMigrationState {
+  orgId: number;
+  migratedDashboards: DashboardUpgrade[];
+  migratedChannels: ContactPair[];
+  errors: string[];
+}
+
+export interface DashboardUpgrade {
+  migratedAlerts: AlertPair[];
+  dashboardId: number;
+  dashboardUid: string;
+  dashboardName: string;
+  folderUid: string;
+  folderName: string;
+  newFolderUid?: string;
+  newFolderName?: string;
+  provisioned: boolean;
+  error?: string;
+  warning: string;
+
+  isUpgrading: boolean;
+}
+
+export interface AlertPair {
+  legacyAlert: LegacyAlert;
+  alertRule?: AlertRuleUpgrade;
+  error?: string;
+
+  isUpgrading: boolean;
+}
+
+export interface ContactPair {
+  legacyChannel: LegacyChannel;
+  contactPoint?: ContactPointUpgrade;
+  provisioned: boolean;
+  error?: string;
+
+  isUpgrading: boolean;
+}
+
+export interface LegacyAlert {
+  id: number;
+  dashboardId: number;
+  panelId: number;
+  name: string;
+}
+
+export interface AlertRuleUpgrade {
+  uid: string;
+  title: string;
+  sendsTo: string[];
+}
+
+export interface LegacyChannel {
+  id: number;
+  name: string;
+  type: string;
+}
+
+export interface ContactPointUpgrade {
+  name: string;
+  type: string;
+  routeMatchers: ObjectMatcher[];
+}
+
+function isFetchBaseQueryError(error: unknown): error is { error: FetchError } {
+  return typeof error === 'object' && error != null && 'error' in error;
+}
+
+export const upgradeApi = alertingApi.injectEndpoints({
+  endpoints: (build) => ({
+    upgradeChannel: build.mutation<OrgMigrationSummary, { channelId: number; skipExisting: boolean }>({
+      query: ({ channelId, skipExisting }) => ({
+        url: `/api/v1/upgrade/channels/${channelId}${skipExisting ? '?skipExisting=true' : ''}`,
+        method: 'POST',
+        showSuccessAlert: false,
+        showErrorAlert: false,
+      }),
+      invalidatesTags: ['OrgMigrationState'],
+      async onQueryStarted({ channelId }, { dispatch, queryFulfilled }) {
+        try {
+          dispatch(
+            upgradeApi.util.updateQueryData('getOrgUpgradeSummary', undefined, (draft) => {
+              const index = (draft.migratedChannels ?? []).findIndex((pair) => pair.legacyChannel?.id === channelId);
+              if (index !== -1) {
+                draft.migratedChannels[index].isUpgrading = true;
+              }
+            })
+          );
+          const { data } = await queryFulfilled;
+          if (data.hasErrors) {
+            dispatch(notifyApp(createWarningNotification(`Failed to upgrade notification channel '${channelId}'`)));
+          } else {
+            if (data.removed) {
+              dispatch(
+                notifyApp(
+                  createSuccessNotification(
+                    `Notification channel '${channelId}' not found, removed from list of upgrades`
+                  )
+                )
+              );
+            } else {
+              dispatch(notifyApp(createSuccessNotification(`Upgraded notification channel '${channelId}'`)));
+            }
+          }
+        } catch (e) {
+          if (isFetchBaseQueryError(e) && isFetchError(e.error)) {
+            dispatch(notifyApp(createErrorNotification('Request failed', e.error.data.message)));
+          } else {
+            dispatch(notifyApp(createErrorNotification(`Request failed`)));
+          }
+        }
+      },
+    }),
+    upgradeAllChannels: build.mutation<OrgMigrationSummary, { skipExisting: boolean }>({
+      query: ({ skipExisting }) => ({
+        url: `/api/v1/upgrade/channels${skipExisting ? '?skipExisting=true' : ''}`,
+        method: 'POST',
+        showSuccessAlert: false,
+        showErrorAlert: false,
+      }),
+      invalidatesTags: ['OrgMigrationState'],
+      async onQueryStarted({ skipExisting }, { dispatch, queryFulfilled }) {
+        try {
+          const { data } = await queryFulfilled;
+          if (data.hasErrors) {
+            dispatch(
+              notifyApp(
+                createWarningNotification(
+                  `Issues while upgrading ${data.newChannels} ${skipExisting ? 'new ' : ''}notification channels`
+                )
+              )
+            );
+          } else {
+            dispatch(
+              notifyApp(
+                createSuccessNotification(
+                  `Upgraded ${data.newChannels} ${skipExisting ? 'new ' : ''}notification channels`
+                )
+              )
+            );
+          }
+        } catch (e) {
+          if (isFetchBaseQueryError(e) && isFetchError(e.error)) {
+            dispatch(notifyApp(createErrorNotification('Request failed', e.error.data.message)));
+          } else {
+            dispatch(notifyApp(createErrorNotification(`Request failed`)));
+          }
+        }
+      },
+    }),
+    upgradeAlert: build.mutation<OrgMigrationSummary, { dashboardId: number; panelId: number; skipExisting: boolean }>({
+      query: ({ dashboardId, panelId, skipExisting }) => ({
+        url: `/api/v1/upgrade/dashboards/${dashboardId}/panels/${panelId}${skipExisting ? '?skipExisting=true' : ''}`,
+        method: 'POST',
+        showSuccessAlert: false,
+        showErrorAlert: false,
+      }),
+      invalidatesTags: ['OrgMigrationState'],
+      async onQueryStarted({ dashboardId, panelId }, { dispatch, queryFulfilled }) {
+        try {
+          dispatch(
+            upgradeApi.util.updateQueryData('getOrgUpgradeSummary', undefined, (draft) => {
+              const index = (draft.migratedDashboards ?? []).findIndex((du) => du.dashboardId === dashboardId);
+              if (index !== -1) {
+                const alertIndex = (draft.migratedDashboards[index]?.migratedAlerts ?? []).findIndex(
+                  (pair) => pair.legacyAlert?.panelId === panelId
+                );
+                if (alertIndex !== -1) {
+                  draft.migratedDashboards[index].migratedAlerts[alertIndex].isUpgrading = true;
+                }
+              }
+            })
+          );
+          const { data } = await queryFulfilled;
+          if (data.hasErrors) {
+            dispatch(
+              notifyApp(
+                createWarningNotification(`Failed to upgrade alert from dashboard '${dashboardId}', panel '${panelId}'`)
+              )
+            );
+          } else {
+            if (data.removed) {
+              dispatch(
+                notifyApp(
+                  createSuccessNotification(
+                    `Alert from dashboard '${dashboardId}', panel '${panelId}' not found, removed from list of upgrades`
+                  )
+                )
+              );
+            } else {
+              dispatch(
+                notifyApp(
+                  createSuccessNotification(`Upgraded alert from dashboard '${dashboardId}', panel '${panelId}'`)
+                )
+              );
+            }
+          }
+        } catch (e) {
+          if (isFetchBaseQueryError(e) && isFetchError(e.error)) {
+            dispatch(notifyApp(createErrorNotification('Request failed', e.error.data.message)));
+          } else {
+            dispatch(notifyApp(createErrorNotification(`Request failed`)));
+          }
+        }
+      },
+    }),
+    upgradeDashboard: build.mutation<OrgMigrationSummary, { dashboardId: number; skipExisting: boolean }>({
+      query: ({ dashboardId, skipExisting }) => ({
+        url: `/api/v1/upgrade/dashboards/${dashboardId}${skipExisting ? '?skipExisting=true' : ''}`,
+        method: 'POST',
+        showSuccessAlert: false,
+        showErrorAlert: false,
+      }),
+      invalidatesTags: ['OrgMigrationState'],
+      async onQueryStarted({ dashboardId, skipExisting }, { dispatch, queryFulfilled }) {
+        try {
+          dispatch(
+            upgradeApi.util.updateQueryData('getOrgUpgradeSummary', undefined, (draft) => {
+              const index = (draft.migratedDashboards ?? []).findIndex((du) => du.dashboardId === dashboardId);
+              if (index !== -1) {
+                draft.migratedDashboards[index].isUpgrading = true;
+              }
+            })
+          );
+          const { data } = await queryFulfilled;
+          if (data.hasErrors) {
+            dispatch(
+              notifyApp(
+                createWarningNotification(
+                  `Issues while upgrading ${data.newAlerts} ${
+                    skipExisting ? 'new ' : ''
+                  }alerts from dashboard '${dashboardId}'`
+                )
+              )
+            );
+          } else {
+            if (data.removed) {
+              dispatch(
+                notifyApp(
+                  createSuccessNotification(`Dashboard '${dashboardId}' not found, removed from list of upgrades`)
+                )
+              );
+            } else {
+              dispatch(
+                notifyApp(
+                  createSuccessNotification(
+                    `Upgraded ${data.newAlerts} ${skipExisting ? 'new ' : ''}alerts from dashboard '${dashboardId}'`
+                  )
+                )
+              );
+            }
+          }
+        } catch (e) {
+          if (isFetchBaseQueryError(e) && isFetchError(e.error)) {
+            dispatch(notifyApp(createErrorNotification('Request failed', e.error.data.message)));
+          } else {
+            dispatch(notifyApp(createErrorNotification(`Request failed`)));
+          }
+        }
+      },
+    }),
+    upgradeAllDashboards: build.mutation<OrgMigrationSummary, { skipExisting: boolean }>({
+      query: ({ skipExisting }) => ({
+        url: `/api/v1/upgrade/dashboards${skipExisting ? '?skipExisting=true' : ''}`,
+        method: 'POST',
+        showSuccessAlert: false,
+        showErrorAlert: false,
+      }),
+      invalidatesTags: ['OrgMigrationState'],
+      async onQueryStarted({ skipExisting }, { dispatch, queryFulfilled }) {
+        try {
+          const { data } = await queryFulfilled;
+          if (data.hasErrors) {
+            dispatch(
+              notifyApp(
+                createWarningNotification(
+                  `Issues while upgrading ${data.newAlerts} ${skipExisting ? 'new ' : ''}alerts in ${
+                    data.newDashboards
+                  } dashboards`
+                )
+              )
+            );
+          } else {
+            dispatch(
+              notifyApp(
+                createSuccessNotification(
+                  `Upgraded ${data.newAlerts} ${skipExisting ? 'new ' : ''}alerts in ${data.newDashboards} dashboards`
+                )
+              )
+            );
+          }
+        } catch (e) {
+          if (isFetchBaseQueryError(e) && isFetchError(e.error)) {
+            dispatch(notifyApp(createErrorNotification('Request failed', e.error.data.message)));
+          } else {
+            dispatch(notifyApp(createErrorNotification(`Request failed`)));
+          }
+        }
+      },
+    }),
+    upgradeOrg: build.mutation<OrgMigrationSummary, { skipExisting: boolean }>({
+      query: ({ skipExisting }) => ({
+        url: `/api/v1/upgrade/org${skipExisting ? '?skipExisting=true' : ''}`,
+        method: 'POST',
+        showSuccessAlert: false,
+        showErrorAlert: false,
+      }),
+      invalidatesTags: ['OrgMigrationState'],
+      async onQueryStarted({ skipExisting }, { dispatch, getCacheEntry, queryFulfilled }) {
+        try {
+          const { data } = await queryFulfilled;
+          if (data.hasErrors) {
+            dispatch(
+              notifyApp(
+                createWarningNotification(
+                  `Issues while upgrading ${data.newAlerts} ${skipExisting ? 'new ' : ''}alerts in ${
+                    data.newDashboards
+                  } dashboards and ${data.newChannels} ${skipExisting ? 'new ' : ''}notification channels`
+                )
+              )
+            );
+          } else {
+            dispatch(
+              notifyApp(
+                createSuccessNotification(
+                  `Upgraded ${data.newAlerts} ${skipExisting ? 'new ' : ''}alerts in ${
+                    data.newDashboards
+                  } dashboards and ${data.newChannels} ${skipExisting ? 'new ' : ''}notification channels`
+                )
+              )
+            );
+          }
+        } catch (e) {
+          if (isFetchBaseQueryError(e) && isFetchError(e.error)) {
+            dispatch(notifyApp(createErrorNotification('Request failed', e.error.data.message)));
+          } else {
+            dispatch(notifyApp(createErrorNotification(`Request failed`)));
+          }
+        }
+      },
+    }),
+    cancelOrgUpgrade: build.mutation<void, void>({
+      query: () => ({
+        url: `/api/v1/upgrade/org`,
+        method: 'DELETE',
+      }),
+      invalidatesTags: ['OrgMigrationState'],
+      async onQueryStarted(undefined, { dispatch }) {
+        // This helps prevent flickering of old tables after the cancel button is clicked.
+        try {
+          dispatch(
+            upgradeApi.util.updateQueryData('getOrgUpgradeSummary', undefined, (draft) => {
+              const defaultState: OrgMigrationState = {
+                orgId: 0,
+                migratedDashboards: [],
+                migratedChannels: [],
+                errors: [],
+              };
+              Object.assign(draft, defaultState);
+            })
+          );
+        } catch {}
+      },
+    }),
+    getOrgUpgradeSummary: build.query<OrgMigrationState, void>({
+      query: () => ({
+        url: `/api/v1/upgrade/org`,
+      }),
+      providesTags: ['OrgMigrationState'],
+      transformResponse: (summary: OrgMigrationState): OrgMigrationState => {
+        summary.migratedDashboards = summary.migratedDashboards ?? [];
+        summary.migratedChannels = summary.migratedChannels ?? [];
+        summary.errors = summary.errors ?? [];
+
+        // Sort to show the most problematic rows first.
+        summary.migratedDashboards.forEach((dashUpgrade) => {
+          // dashUpgrade.isUpgrading = false;
+          dashUpgrade.migratedAlerts = dashUpgrade.migratedAlerts ?? [];
+          dashUpgrade.error = dashUpgrade.error ?? '';
+          dashUpgrade.warning = dashUpgrade.warning ?? '';
+          dashUpgrade.migratedAlerts.sort((a, b) => {
+            const byError = (b.error ?? '').localeCompare(a.error ?? '');
+            if (byError !== 0) {
+              return byError;
+            }
+            return (a.legacyAlert?.name ?? '').localeCompare(b.legacyAlert?.name ?? '');
+          });
+        });
+        summary.migratedDashboards.sort((a, b) => {
+          const byErrors = (b.error ?? '').localeCompare(a.error ?? '');
+          if (byErrors !== 0) {
+            return byErrors;
+          }
+          const byNestedErrors =
+            b.migratedAlerts.filter((a) => a.error).length - a.migratedAlerts.filter((a) => a.error).length;
+          if (byNestedErrors !== 0) {
+            return byNestedErrors;
+          }
+          const byWarnings = (b.warning ?? '').localeCompare(a.warning ?? '');
+          if (byWarnings !== 0) {
+            return byWarnings;
+          }
+          const byFolder = a.folderName.localeCompare(b.folderName);
+          if (byFolder !== 0) {
+            return byFolder;
+          }
+          return a.dashboardName.localeCompare(b.dashboardName);
+        });
+
+        // Sort contacts.
+        summary.migratedChannels.sort((a, b) => {
+          const byErrors = (b.error ? 1 : 0) - (a.error ? 1 : 0);
+          if (byErrors !== 0) {
+            return byErrors;
+          }
+          return (a.legacyChannel?.name ?? '').localeCompare(b.legacyChannel?.name ?? '');
+        });
+
+        return summary;
+      },
+    }),
+  }),
+});
diff --git a/public/app/features/alerting/unified/components/AlertLabels.test.tsx b/public/app/features/alerting/unified/components/AlertLabels.test.tsx
index 381240ae05990..47eab5467bd84 100644
--- a/public/app/features/alerting/unified/components/AlertLabels.test.tsx
+++ b/public/app/features/alerting/unified/components/AlertLabels.test.tsx
@@ -12,12 +12,12 @@ describe('AlertLabels', () => {
     render(<AlertLabels labels={labels} commonLabels={commonLabels} />);
     expect(screen.getByText('+2 common labels')).toBeInTheDocument();
 
-    userEvent.click(screen.getByRole('button'));
+    await userEvent.click(screen.getByRole('button'));
     await waitFor(() => {
       expect(screen.getByText('Hide common labels')).toBeInTheDocument();
     });
 
-    userEvent.click(screen.getByRole('button'));
+    await userEvent.click(screen.getByRole('button'));
     await waitFor(() => {
       expect(screen.getByText('+2 common labels')).toBeInTheDocument();
     });
diff --git a/public/app/features/alerting/unified/components/AlertStateDot.tsx b/public/app/features/alerting/unified/components/AlertStateDot.tsx
index bdd0dbedbe17f..c48efda4af5b9 100644
--- a/public/app/features/alerting/unified/components/AlertStateDot.tsx
+++ b/public/app/features/alerting/unified/components/AlertStateDot.tsx
@@ -2,26 +2,30 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { ComponentSize, Tooltip, useStyles2 } from '@grafana/ui';
-import { GrafanaAlertState } from 'app/types/unified-alerting-dto';
+import { Stack, useStyles2 } from '@grafana/ui';
+
+interface DotStylesProps {
+  color: 'success' | 'error' | 'warning' | 'info';
+  includeState?: boolean;
+}
 
 const AlertStateDot = (props: DotStylesProps) => {
   const styles = useStyles2(getDotStyles, props);
 
   return (
-    <Tooltip content={String(props.state)} placement="top">
+    <Stack direction="row" gap={0.5}>
       <div className={styles.dot} />
-    </Tooltip>
+    </Stack>
   );
 };
 
-interface DotStylesProps {
-  state?: GrafanaAlertState;
-  size?: ComponentSize; // TODO support this
-}
-
 const getDotStyles = (theme: GrafanaTheme2, props: DotStylesProps) => {
   const size = theme.spacing(1.25);
+  const outlineSize = `calc(${size} / 2.5)`;
+
+  const errorStyle = props.color === 'error';
+  const successStyle = props.color === 'success';
+  const warningStyle = props.color === 'warning';
 
   return {
     dot: css`
@@ -31,25 +35,26 @@ const getDotStyles = (theme: GrafanaTheme2, props: DotStylesProps) => {
       border-radius: 100%;
 
       background-color: ${theme.colors.secondary.main};
-      outline: solid calc(${size} / 2.5) ${theme.colors.secondary.transparent};
-
-      ${props.state === GrafanaAlertState.Normal &&
-      css`
-        background-color: ${theme.colors.success.main};
-        outline-color: ${theme.colors.success.transparent};
-      `}
-
-      ${props.state === GrafanaAlertState.Pending &&
-      css`
-        background-color: ${theme.colors.warning.main};
-        outline-color: ${theme.colors.warning.transparent};
-      `}
-
-      ${props.state === GrafanaAlertState.Alerting &&
-      css`
-        background-color: ${theme.colors.error.main};
-        outline-color: ${theme.colors.error.transparent};
-      `}
+      outline: solid ${outlineSize} ${theme.colors.secondary.transparent};
+      margin: ${outlineSize};
+
+      ${successStyle &&
+      css({
+        backgroundColor: theme.colors.success.main,
+        outlineColor: theme.colors.success.transparent,
+      })}
+
+      ${warningStyle &&
+      css({
+        backgroundColor: theme.colors.warning.main,
+        outlineColor: theme.colors.warning.transparent,
+      })}
+
+      ${errorStyle &&
+      css({
+        backgroundColor: theme.colors.error.main,
+        outlineColor: theme.colors.error.transparent,
+      })}
     `,
   };
 };
diff --git a/public/app/features/alerting/unified/components/AlertingPageWrapper.tsx b/public/app/features/alerting/unified/components/AlertingPageWrapper.tsx
index 99e245c6f6b6f..44fe60d61e000 100644
--- a/public/app/features/alerting/unified/components/AlertingPageWrapper.tsx
+++ b/public/app/features/alerting/unified/components/AlertingPageWrapper.tsx
@@ -1,51 +1,28 @@
-import Mousetrap from 'mousetrap';
-import React, { PropsWithChildren, useEffect, useState } from 'react';
-import { Features, ToggleFeatures } from 'react-enable';
+import React, { PropsWithChildren } from 'react';
 import { useLocation } from 'react-use';
 
-import { NavModelItem } from '@grafana/data';
 import { Page } from 'app/core/components/Page/Page';
+import { PageProps } from 'app/core/components/Page/types';
 
-import FEATURES from '../features';
 import { AlertmanagerProvider, useAlertmanager } from '../state/AlertmanagerContext';
 
 import { AlertManagerPicker } from './AlertManagerPicker';
 import { NoAlertManagerWarning } from './NoAlertManagerWarning';
 
-const SHOW_TOGGLES_KEY_COMBO = 'ctrl+1';
-const combokeys = new Mousetrap(document.body);
-
 /**
  * This is the main alerting page wrapper, used by the alertmanager page wrapper and the alert rules list view
  */
-interface AlertingPageWrapperProps extends PropsWithChildren {
-  pageId?: string;
+interface AlertingPageWrapperProps extends PageProps {
   isLoading?: boolean;
-  pageNav?: NavModelItem;
-  actions?: React.ReactNode;
 }
-export const AlertingPageWrapper = ({ children, pageId, pageNav, actions, isLoading }: AlertingPageWrapperProps) => {
-  const [showFeatureToggle, setShowFeatureToggles] = useState(false);
-
-  useEffect(() => {
-    combokeys.bind(SHOW_TOGGLES_KEY_COMBO, () => {
-      setShowFeatureToggles((show) => !show);
-    });
-
-    return () => {
-      combokeys.unbind(SHOW_TOGGLES_KEY_COMBO);
-    };
-  }, []);
 
-  return (
-    <Features features={FEATURES}>
-      <Page pageNav={pageNav} navId={pageId} actions={actions}>
-        <Page.Contents isLoading={isLoading}>{children}</Page.Contents>
-      </Page>
-      {showFeatureToggle ? <ToggleFeatures defaultOpen={true} /> : null}
-    </Features>
-  );
-};
+export const AlertingPageWrapper = ({ children, isLoading, ...rest }: AlertingPageWrapperProps) => (
+  <Page {...rest}>
+    <Page.Contents isLoading={isLoading}>
+      <div>{children}</div>
+    </Page.Contents>
+  </Page>
+);
 
 /**
  * This wrapper is for pages that use the Alertmanager API
diff --git a/public/app/features/alerting/unified/components/AnnotationDetailsField.tsx b/public/app/features/alerting/unified/components/AnnotationDetailsField.tsx
index d29f0fe2f2ce9..d3ce186f37747 100644
--- a/public/app/features/alerting/unified/components/AnnotationDetailsField.tsx
+++ b/public/app/features/alerting/unified/components/AnnotationDetailsField.tsx
@@ -1,8 +1,8 @@
 import { css } from '@emotion/css';
 import React from 'react';
 
-import { GrafanaTheme2, textUtil } from '@grafana/data';
-import { Tooltip, useStyles2 } from '@grafana/ui';
+import { GrafanaTheme2 } from '@grafana/data';
+import { TextLink, Tooltip, useStyles2 } from '@grafana/ui';
 
 import { Annotation, annotationLabels } from '../utils/constants';
 
@@ -44,9 +44,9 @@ const AnnotationValue = ({ annotationKey, value, valueLink }: Props) => {
 
   if (valueLink) {
     return (
-      <a href={textUtil.sanitizeUrl(valueLink)} className={styles.link}>
+      <TextLink href={valueLink} external>
         {value}
-      </a>
+      </TextLink>
     );
   }
 
@@ -56,9 +56,9 @@ const AnnotationValue = ({ annotationKey, value, valueLink }: Props) => {
 
   if (needsExternalLink) {
     return (
-      <a href={textUtil.sanitizeUrl(value)} target="__blank" className={styles.link}>
+      <TextLink href={value} external>
         {value}
-      </a>
+      </TextLink>
     );
   }
 
@@ -69,8 +69,4 @@ export const getStyles = (theme: GrafanaTheme2) => ({
   well: css`
     word-break: break-word;
   `,
-  link: css`
-    word-break: break-all;
-    color: ${theme.colors.primary.text};
-  `,
 });
diff --git a/public/app/features/alerting/unified/components/Authorize.tsx b/public/app/features/alerting/unified/components/Authorize.tsx
index 1dead1a4e491c..cf83b38fdb407 100644
--- a/public/app/features/alerting/unified/components/Authorize.tsx
+++ b/public/app/features/alerting/unified/components/Authorize.tsx
@@ -4,19 +4,19 @@ import React, { PropsWithChildren } from 'react';
 import {
   Abilities,
   Action,
+  AlertingAction,
   AlertmanagerAction,
-  AlertSourceAction,
-  useAlertSourceAbilities,
+  useAlertingAbilities,
   useAllAlertmanagerAbilities,
 } from '../hooks/useAbilities';
 
 interface AuthorizeProps extends PropsWithChildren {
-  actions: AlertmanagerAction[] | AlertSourceAction[];
+  actions: AlertmanagerAction[] | AlertingAction[];
 }
 
 export const Authorize = ({ actions, children }: AuthorizeProps) => {
   const alertmanagerActions = filter(actions, isAlertmanagerAction) as AlertmanagerAction[];
-  const alertSourceActions = filter(actions, isAlertSourceAction) as AlertSourceAction[];
+  const alertSourceActions = filter(actions, isAlertingAction) as AlertingAction[];
 
   if (alertmanagerActions.length) {
     return <AuthorizeAlertmanager actions={alertmanagerActions}>{children}</AuthorizeAlertmanager>;
@@ -44,8 +44,8 @@ const AuthorizeAlertmanager = ({ actions, children }: ActionsProps<AlertmanagerA
   }
 };
 
-const AuthorizeAlertsource = ({ actions, children }: ActionsProps<AlertSourceAction>) => {
-  const alertSourceAbilities = useAlertSourceAbilities();
+const AuthorizeAlertsource = ({ actions, children }: ActionsProps<AlertingAction>) => {
+  const alertSourceAbilities = useAlertingAbilities();
   const allowed = actionsAllowed(alertSourceAbilities, actions);
 
   if (allowed) {
@@ -55,6 +55,8 @@ const AuthorizeAlertsource = ({ actions, children }: ActionsProps<AlertSourceAct
   }
 };
 
+// TODO add some authorize helper components for alert source and individual alert rules
+
 // check if some action is allowed from the abilities
 function actionsAllowed<T extends Action>(abilities: Abilities<T>, actions: T[]) {
   return chain(abilities)
@@ -68,6 +70,6 @@ function isAlertmanagerAction(action: AlertmanagerAction) {
   return Object.values(AlertmanagerAction).includes(action);
 }
 
-function isAlertSourceAction(action: AlertSourceAction) {
-  return Object.values(AlertSourceAction).includes(action);
+function isAlertingAction(action: AlertingAction) {
+  return Object.values(AlertingAction).includes(action);
 }
diff --git a/public/app/features/alerting/components/ConditionalWrap.tsx b/public/app/features/alerting/unified/components/ConditionalWrap.tsx
similarity index 100%
rename from public/app/features/alerting/components/ConditionalWrap.tsx
rename to public/app/features/alerting/unified/components/ConditionalWrap.tsx
diff --git a/public/app/features/alerting/unified/components/DynamicTable.tsx b/public/app/features/alerting/unified/components/DynamicTable.tsx
index d7fc5e4886433..1665ee8e6fe80 100644
--- a/public/app/features/alerting/unified/components/DynamicTable.tsx
+++ b/public/app/features/alerting/unified/components/DynamicTable.tsx
@@ -2,6 +2,7 @@ import { css, cx } from '@emotion/css';
 import React, { ReactNode, useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import { IconButton, Pagination, useStyles2 } from '@grafana/ui';
 
 import { usePagination } from '../hooks/usePagination';
@@ -53,7 +54,7 @@ export interface DynamicTableProps<T = unknown> {
     items: Array<DynamicTableItemProps<T>>
   ) => ReactNode;
 
-  footerRow?: JSX.Element;
+  footerRow?: React.ReactNode;
 }
 
 export const DynamicTable = <T extends object>({
@@ -125,7 +126,7 @@ export const DynamicTable = <T extends object>({
                 <div className={cx(styles.cell, styles.expandCell)}>
                   <IconButton
                     tooltip={`${isItemExpanded ? 'Collapse' : 'Expand'} row`}
-                    data-testid="collapse-toggle"
+                    data-testid={selectors.components.AlertRules.toggle}
                     name={isItemExpanded ? 'angle-down' : 'angle-right'}
                     onClick={() => toggleExpanded(item)}
                   />
@@ -141,7 +142,10 @@ export const DynamicTable = <T extends object>({
                 </div>
               ))}
               {isItemExpanded && renderExpandedContent && (
-                <div className={styles.expandedContentRow} data-testid="expanded-content">
+                <div
+                  className={styles.expandedContentRow}
+                  data-testid={selectors.components.AlertRules.expandedContent}
+                >
                   {renderExpandedContent(item, index, items)}
                 </div>
               )}
diff --git a/public/app/features/alerting/unified/components/Expression.test.tsx b/public/app/features/alerting/unified/components/Expression.test.tsx
deleted file mode 100644
index a1bfebc72b241..0000000000000
--- a/public/app/features/alerting/unified/components/Expression.test.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import React from 'react';
-
-import { PluginType } from '@grafana/data';
-
-import { Expression } from './Expression';
-
-const expression =
-  '100 - ( avg by ( agent_hostname ) ( rate ( node_cpu_seconds_total { mode = "idle" } [ 2h ] ) ) * 100 ) > 97';
-
-const rulesSource = {
-  id: 5,
-  uid: 'gdev-prometheus',
-  type: 'prometheus',
-  name: 'gdev-prometheus',
-  meta: {
-    id: 'prometheus',
-    type: PluginType.datasource,
-    name: 'Prometheus',
-    info: {
-      author: {
-        name: 'Grafana Labs',
-        url: 'https://grafana.com',
-      },
-      description: 'Open source time series database & alerting',
-      links: [
-        {
-          name: 'Learn more',
-          url: 'https://prometheus.io/',
-        },
-      ],
-      logos: {
-        small: 'public/app/plugins/datasource/prometheus/img/prometheus_logo.svg',
-        large: 'public/app/plugins/datasource/prometheus/img/prometheus_logo.svg',
-      },
-      build: {},
-      screenshots: [],
-      version: '',
-      updated: '',
-    },
-    module: 'app/plugins/datasource/prometheus/module',
-    baseUrl: 'public/app/plugins/datasource/prometheus',
-  },
-  url: '/api/datasources/proxy/5',
-  access: 'proxy' as const,
-  jsonData: {
-    manageAlerts: true,
-  },
-  readOnly: false,
-};
-
-describe('Expression', () => {
-  it('Should not allow to edit the text in the editor', () => {
-    render(<Expression expression={expression} rulesSource={rulesSource} />);
-
-    const editor = screen.getByTestId('expression-editor');
-    userEvent.type(editor, 'something else');
-
-    expect(editor).toHaveTextContent(expression);
-    expect(editor).not.toHaveTextContent('something else');
-  });
-});
diff --git a/public/app/features/alerting/unified/components/GrafanaAlertmanagerDeliveryWarning.test.tsx b/public/app/features/alerting/unified/components/GrafanaAlertmanagerDeliveryWarning.test.tsx
index 31fe270eaffba..9258301695990 100644
--- a/public/app/features/alerting/unified/components/GrafanaAlertmanagerDeliveryWarning.test.tsx
+++ b/public/app/features/alerting/unified/components/GrafanaAlertmanagerDeliveryWarning.test.tsx
@@ -1,10 +1,9 @@
-import { render, screen } from '@testing-library/react';
+import 'whatwg-fetch';
+import { render, screen, waitFor } from '@testing-library/react';
 import { setupServer } from 'msw/node';
 import React from 'react';
 import { Provider } from 'react-redux';
 
-import 'whatwg-fetch';
-
 import { setBackendSrv } from '@grafana/runtime';
 import { backendSrv } from 'app/core/services/backend_srv';
 import { configureStore } from 'app/store/configureStore';
@@ -76,7 +75,9 @@ describe('GrafanaAlertmanagerDeliveryWarning', () => {
       <GrafanaAlertmanagerDeliveryWarning currentAlertmanager={GRAFANA_RULES_SOURCE_NAME} />
     );
 
-    expect(container).toBeEmptyDOMElement();
+    await waitFor(() => {
+      expect(container).toBeEmptyDOMElement();
+    });
   });
 
   it('Should render no warning when choice is All but no active AM instances', async () => {
@@ -89,7 +90,9 @@ describe('GrafanaAlertmanagerDeliveryWarning', () => {
       <GrafanaAlertmanagerDeliveryWarning currentAlertmanager={GRAFANA_RULES_SOURCE_NAME} />
     );
 
-    expect(container).toBeEmptyDOMElement();
+    await waitFor(() => {
+      expect(container).toBeEmptyDOMElement();
+    });
   });
 });
 
diff --git a/public/app/features/alerting/unified/components/HoverCard.tsx b/public/app/features/alerting/unified/components/HoverCard.tsx
index dfe470be13ea5..9d20a32fd609a 100644
--- a/public/app/features/alerting/unified/components/HoverCard.tsx
+++ b/public/app/features/alerting/unified/components/HoverCard.tsx
@@ -4,8 +4,7 @@ import classnames from 'classnames';
 import React, { ReactElement, ReactNode, useRef } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Popover as GrafanaPopover, PopoverController, useStyles2 } from '@grafana/ui';
+import { Popover as GrafanaPopover, PopoverController, useStyles2, Stack } from '@grafana/ui';
 
 export interface HoverCardProps {
   children: ReactElement;
@@ -38,7 +37,7 @@ export const HoverCard = ({
   }
 
   const body = (
-    <Stack direction="column" gap={0}>
+    <Stack direction="column" gap={0} role="tooltip">
       {header && <div className={styles.card.header}>{header}</div>}
       <div className={styles.card.body}>{content}</div>
       {footer && <div className={styles.card.footer}>{footer}</div>}
@@ -54,17 +53,13 @@ export const HoverCard = ({
               <GrafanaPopover
                 {...popperProps}
                 {...rest}
-                wrapperClassName={classnames(styles.popover(arrow ? 1.25 : 0), wrapperClassName)}
+                wrapperClassName={classnames(styles.popover, wrapperClassName)}
                 onMouseLeave={hidePopper}
                 onMouseEnter={showPopper}
                 onFocus={showPopper}
                 onBlur={hidePopper}
                 referenceElement={popoverRef.current}
-                renderArrow={
-                  arrow
-                    ? ({ arrowProps, placement }) => <div className={styles.arrow(placement)} {...arrowProps} />
-                    : () => <></>
-                }
+                renderArrow={arrow}
               />
             )}
 
@@ -74,6 +69,7 @@ export const HoverCard = ({
               onMouseLeave: hidePopper,
               onFocus: showPopper,
               onBlur: hidePopper,
+              tabIndex: 0,
             })}
           </>
         );
@@ -83,55 +79,25 @@ export const HoverCard = ({
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  popover: (offset: number) => css`
-    border-radius: ${theme.shape.radius.default};
-    box-shadow: ${theme.shadows.z3};
-    background: ${theme.colors.background.primary};
-    border: 1px solid ${theme.colors.border.medium};
-
-    margin-bottom: ${theme.spacing(offset)};
-  `,
+  popover: css({
+    borderRadius: theme.shape.radius.default,
+    boxShadow: theme.shadows.z3,
+    background: theme.colors.background.primary,
+    border: `1px solid ${theme.colors.border.medium}`,
+  }),
   card: {
-    body: css`
-      padding: ${theme.spacing(1)};
-    `,
-    header: css`
-      padding: ${theme.spacing(1)};
-      background: ${theme.colors.background.secondary};
-      border-bottom: solid 1px ${theme.colors.border.medium};
-    `,
-    footer: css`
-      padding: ${theme.spacing(0.5)} ${theme.spacing(1)};
-      background: ${theme.colors.background.secondary};
-      border-top: solid 1px ${theme.colors.border.medium};
-    `,
-  },
-  // TODO currently only works with bottom placement
-  arrow: (placement: string) => {
-    const ARROW_SIZE = '9px';
-
-    return css`
-      width: 0;
-      height: 0;
-
-      border-left: ${ARROW_SIZE} solid transparent;
-      border-right: ${ARROW_SIZE} solid transparent;
-      /* using hex colors here because the border colors use alpha transparency */
-      border-top: ${ARROW_SIZE} solid ${theme.isLight ? '#d2d3d4' : '#2d3037'};
-
-      &:after {
-        content: '';
-        position: absolute;
-
-        border: ${ARROW_SIZE} solid ${theme.colors.background.primary};
-        border-bottom: 0;
-        border-left-color: transparent;
-        border-right-color: transparent;
-
-        margin-top: 1px;
-        bottom: 1px;
-        left: -${ARROW_SIZE};
-      }
-    `;
+    body: css({
+      padding: theme.spacing(1),
+    }),
+    header: css({
+      padding: theme.spacing(1),
+      background: theme.colors.background.secondary,
+      borderBottom: `solid 1px ${theme.colors.border.medium}`,
+    }),
+    footer: css({
+      padding: theme.spacing(0.5, 1),
+      background: theme.colors.background.secondary,
+      borderTop: `solid 1px ${theme.colors.border.medium}`,
+    }),
   },
 });
diff --git a/public/app/features/alerting/unified/components/Label.tsx b/public/app/features/alerting/unified/components/Label.tsx
index 42bd58d00409d..37177f3801c76 100644
--- a/public/app/features/alerting/unified/components/Label.tsx
+++ b/public/app/features/alerting/unified/components/Label.tsx
@@ -3,8 +3,7 @@ import React, { ReactNode } from 'react';
 import tinycolor2 from 'tinycolor2';
 
 import { GrafanaTheme2, IconName } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Icon, useStyles2 } from '@grafana/ui';
+import { Icon, useStyles2, Stack } from '@grafana/ui';
 
 export type LabelSize = 'md' | 'sm';
 
@@ -19,10 +18,11 @@ interface Props {
 // TODO allow customization with color prop
 const Label = ({ label, value, icon, color, size = 'md' }: Props) => {
   const styles = useStyles2(getStyles, color, size);
+  const ariaLabel = `${label}: ${value}`;
 
   return (
-    <div className={styles.wrapper} role="listitem">
-      <Stack direction="row" gap={0} alignItems="stretch" wrap={false}>
+    <div className={styles.wrapper} role="listitem" aria-label={ariaLabel}>
+      <Stack direction="row" gap={0} alignItems="stretch">
         <div className={styles.label}>
           <Stack direction="row" gap={0.5} alignItems="center">
             {icon && <Icon name={icon} />} {label ?? ''}
diff --git a/public/app/features/alerting/unified/components/MetaText.tsx b/public/app/features/alerting/unified/components/MetaText.tsx
index beb183c82308e..3d88d8cd9da6f 100644
--- a/public/app/features/alerting/unified/components/MetaText.tsx
+++ b/public/app/features/alerting/unified/components/MetaText.tsx
@@ -1,18 +1,22 @@
 import { css, cx } from '@emotion/css';
 import React, { ComponentProps, HTMLAttributes } from 'react';
 
-import { Stack } from '@grafana/experimental';
-import { Icon, IconName, useStyles2, Text } from '@grafana/ui';
+import { Icon, IconName, useStyles2, Text, Stack } from '@grafana/ui';
 
 interface Props extends HTMLAttributes<HTMLDivElement> {
   icon?: IconName;
+  direction?: 'row' | 'column';
   color?: ComponentProps<typeof Text>['color'];
 }
 
-const MetaText = ({ children, icon, color = 'secondary', ...rest }: Props) => {
+const MetaText = ({ children, icon, color = 'secondary', direction = 'row', ...rest }: Props) => {
   const styles = useStyles2(getStyles);
   const interactive = typeof rest.onClick === 'function';
 
+  const rowDirection = direction === 'row';
+  const alignItems = rowDirection ? 'center' : 'flex-start';
+  const gap = rowDirection ? 0.5 : 0;
+
   return (
     <div
       className={cx({
@@ -22,7 +26,7 @@ const MetaText = ({ children, icon, color = 'secondary', ...rest }: Props) => {
       {...rest}
     >
       <Text variant="bodySmall" color={color}>
-        <Stack direction="row" alignItems="center" gap={0.5}>
+        <Stack direction={direction} alignItems={alignItems} gap={gap} wrap={'wrap'}>
           {icon && <Icon size="sm" name={icon} />}
           {children}
         </Stack>
diff --git a/public/app/features/alerting/unified/components/MoreButton.tsx b/public/app/features/alerting/unified/components/MoreButton.tsx
index a3f824d65050e..2fea06edbc370 100644
--- a/public/app/features/alerting/unified/components/MoreButton.tsx
+++ b/public/app/features/alerting/unified/components/MoreButton.tsx
@@ -1,7 +1,6 @@
 import React, { forwardRef, Ref } from 'react';
 
-import { Stack } from '@grafana/experimental';
-import { Button, ButtonProps, Icon } from '@grafana/ui';
+import { Button, ButtonProps, Icon, Stack } from '@grafana/ui';
 
 const MoreButton = forwardRef(function MoreButton(props: ButtonProps, ref: Ref<HTMLButtonElement>) {
   return (
diff --git a/public/app/features/alerting/unified/components/PluginBridge.mock.ts b/public/app/features/alerting/unified/components/PluginBridge.mock.ts
index 3644ce5779a03..d71d70c313d32 100644
--- a/public/app/features/alerting/unified/components/PluginBridge.mock.ts
+++ b/public/app/features/alerting/unified/components/PluginBridge.mock.ts
@@ -1,20 +1,25 @@
-import { rest } from 'msw';
-import { setupServer } from 'msw/node';
-
 // bit of setup to mock HTTP request responses
 import 'whatwg-fetch';
+import { http, HttpResponse } from 'msw';
+import { setupServer } from 'msw/node';
+
 import { SupportedPlugin } from '../types/pluginBridges';
 
 export const NON_EXISTING_PLUGIN = '__does_not_exist__';
 
 const server = setupServer(
-  rest.get(`/api/plugins/${NON_EXISTING_PLUGIN}/settings`, async (_req, res, ctx) => res(ctx.status(404))),
-  rest.get(`/api/plugins/${SupportedPlugin.Incident}/settings`, async (_req, res, ctx) => {
-    return res(
-      ctx.json({
-        enabled: true,
-      })
-    );
+  http.get(`/api/plugins/${NON_EXISTING_PLUGIN}/settings`, async () =>
+    HttpResponse.json(
+      {},
+      {
+        status: 404,
+      }
+    )
+  ),
+  http.get(`/api/plugins/${SupportedPlugin.Incident}/settings`, async () => {
+    return HttpResponse.json({
+      enabled: true,
+    });
   })
 );
 
diff --git a/public/app/features/alerting/unified/components/Provisioning.tsx b/public/app/features/alerting/unified/components/Provisioning.tsx
index a5b66f73bc683..78a7c28ac08af 100644
--- a/public/app/features/alerting/unified/components/Provisioning.tsx
+++ b/public/app/features/alerting/unified/components/Provisioning.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { ComponentPropsWithoutRef } from 'react';
 
 import { Alert, Badge } from '@grafana/ui';
 
@@ -10,13 +10,16 @@ export enum ProvisionedResource {
   RootNotificationPolicy = 'root notification policy',
 }
 
-interface ProvisioningAlertProps {
+// we'll omit the props we don't want consumers to overwrite and forward the others to the alert component
+type ExtraAlertProps = Omit<ComponentPropsWithoutRef<typeof Alert>, 'title' | 'severity'>;
+
+interface ProvisioningAlertProps extends ExtraAlertProps {
   resource: ProvisionedResource;
 }
 
-export const ProvisioningAlert = ({ resource }: ProvisioningAlertProps) => {
+export const ProvisioningAlert = ({ resource, ...rest }: ProvisioningAlertProps) => {
   return (
-    <Alert title={`This ${resource} cannot be edited through the UI`} severity="info">
+    <Alert title={`This ${resource} cannot be edited through the UI`} severity="info" {...rest}>
       This {resource} has been provisioned, that means it was created by config. Please contact your server admin to
       update this {resource}.
     </Alert>
diff --git a/public/app/features/alerting/unified/components/WithReturnButton.tsx b/public/app/features/alerting/unified/components/WithReturnButton.tsx
new file mode 100644
index 0000000000000..5d8ef8c8e343a
--- /dev/null
+++ b/public/app/features/alerting/unified/components/WithReturnButton.tsx
@@ -0,0 +1,19 @@
+import React, { useCallback } from 'react';
+
+import { useReturnToPrevious } from '@grafana/runtime';
+
+interface WithReturnButtonProps {
+  component: JSX.Element;
+  title?: string;
+}
+
+// @TODO translations?
+export const WithReturnButton = ({ component, title = 'previous page' }: WithReturnButtonProps) => {
+  const returnToPrevious = useReturnToPrevious();
+
+  const returnToThisURL = useCallback(() => {
+    returnToPrevious(title);
+  }, [returnToPrevious, title]);
+
+  return React.cloneElement(component, { onClick: returnToThisURL });
+};
diff --git a/public/app/features/alerting/unified/components/admin/AlertmanagerConfig.test.tsx b/public/app/features/alerting/unified/components/admin/AlertmanagerConfig.test.tsx
index bb9fe55c4a415..598a95f867a5d 100644
--- a/public/app/features/alerting/unified/components/admin/AlertmanagerConfig.test.tsx
+++ b/public/app/features/alerting/unified/components/admin/AlertmanagerConfig.test.tsx
@@ -89,7 +89,7 @@ const ui = {
 
 describe('Admin config', () => {
   beforeEach(() => {
-    jest.resetAllMocks();
+    jest.clearAllMocks();
     // FIXME: scope down
     grantUserPermissions(Object.values(AccessControlAction));
     mocks.getAllDataSources.mockReturnValue(Object.values(dataSources));
diff --git a/public/app/features/alerting/unified/components/admin/ConfigEditor.tsx b/public/app/features/alerting/unified/components/admin/ConfigEditor.tsx
index aaf9c69a50dae..8ea38ad84cd23 100644
--- a/public/app/features/alerting/unified/components/admin/ConfigEditor.tsx
+++ b/public/app/features/alerting/unified/components/admin/ConfigEditor.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
+import { useForm } from 'react-hook-form';
 
-import { Button, CodeEditor, ConfirmModal, Field, Form, HorizontalGroup } from '@grafana/ui';
+import { Button, CodeEditor, ConfirmModal, Field, Stack } from '@grafana/ui';
 
 import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
 
@@ -29,77 +30,77 @@ export const ConfigEditor = ({
   onConfirmReset,
   onDismiss,
 }: ConfigEditorProps) => {
-  return (
-    <Form defaultValues={defaultValues} onSubmit={onSubmit} key={defaultValues.configJSON}>
-      {({ errors, setValue, register }) => {
-        register('configJSON', {
-          required: { value: true, message: 'Required' },
-          validate: (value: string) => {
-            try {
-              JSON.parse(value);
-              return true;
-            } catch (e) {
-              return e instanceof Error ? e.message : 'JSON is invalid';
-            }
-          },
-        });
+  const {
+    handleSubmit,
+    formState: { errors },
+    setValue,
+    register,
+  } = useForm({ defaultValues });
 
-        return (
-          <>
-            <Field
-              disabled={loading}
-              label="Configuration"
-              invalid={!!errors.configJSON}
-              error={errors.configJSON?.message}
-              data-testid={readOnly ? 'readonly-config' : 'config'}
-            >
-              <CodeEditor
-                language="json"
-                width="100%"
-                height={500}
-                showLineNumbers={true}
-                value={defaultValues.configJSON}
-                showMiniMap={false}
-                onSave={(value) => {
-                  setValue('configJSON', value);
-                }}
-                onBlur={(value) => {
-                  setValue('configJSON', value);
-                }}
-                readOnly={readOnly}
-              />
-            </Field>
+  register('configJSON', {
+    required: { value: true, message: 'Required' },
+    validate: (value: string) => {
+      try {
+        JSON.parse(value);
+        return true;
+      } catch (e) {
+        return e instanceof Error ? e.message : 'JSON is invalid';
+      }
+    },
+  });
+  return (
+    <form onSubmit={handleSubmit(onSubmit)} key={defaultValues.configJSON}>
+      <Field
+        disabled={loading}
+        label="Configuration"
+        invalid={!!errors.configJSON}
+        error={errors.configJSON?.message}
+        data-testid={readOnly ? 'readonly-config' : 'config'}
+      >
+        <CodeEditor
+          language="json"
+          width="100%"
+          height={500}
+          showLineNumbers={true}
+          value={defaultValues.configJSON}
+          showMiniMap={false}
+          onSave={(value) => {
+            setValue('configJSON', value);
+          }}
+          onBlur={(value) => {
+            setValue('configJSON', value);
+          }}
+          readOnly={readOnly}
+        />
+      </Field>
 
-            {!readOnly && (
-              <HorizontalGroup>
-                <Button type="submit" variant="primary" disabled={loading}>
-                  Save configuration
-                </Button>
-                {onReset && (
-                  <Button type="button" disabled={loading} variant="destructive" onClick={onReset}>
-                    Reset configuration
-                  </Button>
-                )}
-              </HorizontalGroup>
-            )}
+      {!readOnly && (
+        <Stack gap={1}>
+          <Button type="submit" variant="primary" disabled={loading}>
+            Save configuration
+          </Button>
+          {onReset && (
+            <Button type="button" disabled={loading} variant="destructive" onClick={onReset}>
+              Reset configuration
+            </Button>
+          )}
+        </Stack>
+      )}
 
-            {Boolean(showConfirmDeleteAMConfig) && onConfirmReset && onDismiss && (
-              <ConfirmModal
-                isOpen={true}
-                title="Reset Alertmanager configuration"
-                body={`Are you sure you want to reset configuration ${
-                  alertManagerSourceName === GRAFANA_RULES_SOURCE_NAME
-                    ? 'for the Grafana Alertmanager'
-                    : `for "${alertManagerSourceName}"`
-                }? Contact points and notification policies will be reset to their defaults.`}
-                confirmText="Yes, reset configuration"
-                onConfirm={onConfirmReset}
-                onDismiss={onDismiss}
-              />
-            )}
-          </>
-        );
-      }}
-    </Form>
+      {Boolean(showConfirmDeleteAMConfig) && onConfirmReset && onDismiss && (
+        <ConfirmModal
+          isOpen={true}
+          title="Reset Alertmanager configuration"
+          body={`Are you sure you want to reset configuration ${
+            alertManagerSourceName === GRAFANA_RULES_SOURCE_NAME
+              ? 'for the Grafana Alertmanager'
+              : `for "${alertManagerSourceName}"`
+          }? Contact points and notification policies will be reset to their defaults.`}
+          confirmText="Yes, reset configuration"
+          onConfirm={onConfirmReset}
+          onDismiss={onDismiss}
+        />
+      )}
+    </form>
   );
 };
diff --git a/public/app/features/alerting/unified/components/admin/ExternalAlertmanagerDataSources.tsx b/public/app/features/alerting/unified/components/admin/ExternalAlertmanagerDataSources.tsx
index d84f930d3ccb5..757346b7976fc 100644
--- a/public/app/features/alerting/unified/components/admin/ExternalAlertmanagerDataSources.tsx
+++ b/public/app/features/alerting/unified/components/admin/ExternalAlertmanagerDataSources.tsx
@@ -5,11 +5,11 @@ import React from 'react';
 import { GrafanaTheme2 } from '@grafana/data';
 import { Badge, CallToActionCard, Card, Icon, LinkButton, Tooltip, useStyles2 } from '@grafana/ui';
 
-import { ExternalDataSourceAM } from '../../hooks/useExternalAmSelector';
+import { ExternalAlertmanagerDataSourceWithStatus } from '../../hooks/useExternalAmSelector';
 import { makeDataSourceLink } from '../../utils/misc';
 
 export interface ExternalAlertManagerDataSourcesProps {
-  alertmanagers: ExternalDataSourceAM[];
+  alertmanagers: ExternalAlertmanagerDataSourceWithStatus[];
   inactive: boolean;
 }
 
@@ -39,7 +39,7 @@ export function ExternalAlertmanagerDataSources({ alertmanagers, inactive }: Ext
       {alertmanagers.length > 0 && (
         <div className={styles.externalDs}>
           {alertmanagers.map((am) => (
-            <ExternalAMdataSourceCard key={am.dataSource.uid} alertmanager={am} inactive={inactive} />
+            <ExternalAMdataSourceCard key={am.dataSourceSettings.uid} alertmanager={am} inactive={inactive} />
           ))}
         </div>
       )}
@@ -48,20 +48,20 @@ export function ExternalAlertmanagerDataSources({ alertmanagers, inactive }: Ext
 }
 
 interface ExternalAMdataSourceCardProps {
-  alertmanager: ExternalDataSourceAM;
+  alertmanager: ExternalAlertmanagerDataSourceWithStatus;
   inactive: boolean;
 }
 
 export function ExternalAMdataSourceCard({ alertmanager, inactive }: ExternalAMdataSourceCardProps) {
   const styles = useStyles2(getStyles);
 
-  const { dataSource, status, statusInconclusive, url } = alertmanager;
+  const { dataSourceSettings, status } = alertmanager;
 
   return (
     <Card>
       <Card.Heading className={styles.externalHeading}>
-        {dataSource.name}{' '}
-        {statusInconclusive && (
+        {dataSourceSettings.name}{' '}
+        {status === 'inconclusive' && (
           <Tooltip content="Multiple Alertmanagers have the same URL configured. The state might be inconclusive.">
             <Icon name="exclamation-triangle" size="md" className={styles.externalWarningIcon} />
           </Tooltip>
@@ -90,9 +90,9 @@ export function ExternalAMdataSourceCard({ alertmanager, inactive }: ExternalAMd
           />
         )}
       </Card.Tags>
-      <Card.Meta>{url}</Card.Meta>
+      <Card.Meta>{dataSourceSettings.url}</Card.Meta>
       <Card.Actions>
-        <LinkButton href={makeDataSourceLink(dataSource)} size="sm" variant="secondary">
+        <LinkButton href={makeDataSourceLink(dataSourceSettings.uid)} size="sm" variant="secondary">
           Go to datasource
         </LinkButton>
       </Card.Actions>
diff --git a/public/app/features/alerting/unified/components/admin/ExternalAlertmanagers.tsx b/public/app/features/alerting/unified/components/admin/ExternalAlertmanagers.tsx
index 1bfb98fe0181a..ddcf5b9176d49 100644
--- a/public/app/features/alerting/unified/components/admin/ExternalAlertmanagers.tsx
+++ b/public/app/features/alerting/unified/components/admin/ExternalAlertmanagers.tsx
@@ -23,6 +23,9 @@ export const ExternalAlertmanagers = () => {
   const dispatch = useDispatch();
 
   const externalDsAlertManagers = useExternalDataSourceAlertmanagers();
+  const gmaHandlingAlertmanagers = externalDsAlertManagers.filter(
+    (settings) => settings.dataSourceSettings.jsonData.handleGrafanaManagedAlerts === true
+  );
 
   const {
     useSaveExternalAlertmanagersConfigMutation,
@@ -71,7 +74,7 @@ export const ExternalAlertmanagers = () => {
       </div>
 
       <ExternalAlertmanagerDataSources
-        alertmanagers={externalDsAlertManagers}
+        alertmanagers={gmaHandlingAlertmanagers}
         inactive={alertmanagersChoice === AlertmanagerChoice.Internal}
       />
     </div>
diff --git a/public/app/features/alerting/unified/components/alert-groups/AlertGroup.tsx b/public/app/features/alerting/unified/components/alert-groups/AlertGroup.tsx
index f85d126d7c8e3..a50ff011d468d 100644
--- a/public/app/features/alerting/unified/components/alert-groups/AlertGroup.tsx
+++ b/public/app/features/alerting/unified/components/alert-groups/AlertGroup.tsx
@@ -2,8 +2,7 @@ import { css } from '@emotion/css';
 import React, { useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { useStyles2 } from '@grafana/ui';
+import { useStyles2, Stack } from '@grafana/ui';
 import { AlertmanagerGroup, AlertState } from 'app/plugins/datasource/alertmanager/types';
 
 import { AlertLabels } from '../AlertLabels';
diff --git a/public/app/features/alerting/unified/components/alert-groups/AlertGroupFilter.tsx b/public/app/features/alerting/unified/components/alert-groups/AlertGroupFilter.tsx
index 4b7afe052472e..aad3722a34355 100644
--- a/public/app/features/alerting/unified/components/alert-groups/AlertGroupFilter.tsx
+++ b/public/app/features/alerting/unified/components/alert-groups/AlertGroupFilter.tsx
@@ -39,13 +39,11 @@ export const AlertGroupFilter = ({ groups }: Props) => {
     <div className={styles.wrapper}>
       <div className={styles.filterSection}>
         <MatcherFilter
-          className={styles.filterInput}
           key={matcherFilterKey}
           defaultQueryString={queryString}
           onFilterChange={(value) => setQueryParams({ queryString: value ? value : null })}
         />
         <GroupBy
-          className={styles.filterInput}
           groups={groups}
           groupBy={groupBy}
           onGroupingChange={(keys) => setQueryParams({ groupBy: keys.length ? keys.join(',') : null })}
@@ -73,12 +71,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
     display: flex;
     flex-direction: row;
     margin-bottom: ${theme.spacing(3)};
-  `,
-  filterInput: css`
-    width: 340px;
-    & + & {
-      margin-left: ${theme.spacing(1)};
-    }
+    gap: ${theme.spacing(1)};
   `,
   clearButton: css`
     margin-left: ${theme.spacing(1)};
diff --git a/public/app/features/alerting/unified/components/alert-groups/AlertStateFilter.tsx b/public/app/features/alerting/unified/components/alert-groups/AlertStateFilter.tsx
index 507a4d693c6bf..d94e2c36b0e6e 100644
--- a/public/app/features/alerting/unified/components/alert-groups/AlertStateFilter.tsx
+++ b/public/app/features/alerting/unified/components/alert-groups/AlertStateFilter.tsx
@@ -1,8 +1,7 @@
-import { css } from '@emotion/css';
 import React from 'react';
 
-import { GrafanaTheme2, SelectableValue } from '@grafana/data';
-import { RadioButtonGroup, Label, useStyles2 } from '@grafana/ui';
+import { SelectableValue } from '@grafana/data';
+import { RadioButtonGroup, Label } from '@grafana/ui';
 import { AlertState } from 'app/plugins/datasource/alertmanager/types';
 
 interface Props {
@@ -11,7 +10,6 @@ interface Props {
 }
 
 export const AlertStateFilter = ({ onStateFilterChange, stateFilter }: Props) => {
-  const styles = useStyles2(getStyles);
   const alertStateOptions: SelectableValue[] = Object.entries(AlertState)
     .sort(([labelA], [labelB]) => (labelA < labelB ? -1 : 1))
     .map(([label, state]) => ({
@@ -20,15 +18,9 @@ export const AlertStateFilter = ({ onStateFilterChange, stateFilter }: Props) =>
     }));
 
   return (
-    <div className={styles.wrapper}>
+    <div>
       <Label>State</Label>
       <RadioButtonGroup options={alertStateOptions} value={stateFilter} onChange={onStateFilterChange} />
     </div>
   );
 };
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  wrapper: css`
-    margin-left: ${theme.spacing(1)};
-  `,
-});
diff --git a/public/app/features/alerting/unified/components/alert-groups/GroupBy.tsx b/public/app/features/alerting/unified/components/alert-groups/GroupBy.tsx
index 7d60a1631fc3a..a35dba726d161 100644
--- a/public/app/features/alerting/unified/components/alert-groups/GroupBy.tsx
+++ b/public/app/features/alerting/unified/components/alert-groups/GroupBy.tsx
@@ -6,13 +6,12 @@ import { Icon, Label, MultiSelect } from '@grafana/ui';
 import { AlertmanagerGroup } from 'app/plugins/datasource/alertmanager/types';
 
 interface Props {
-  className?: string;
   groups: AlertmanagerGroup[];
   groupBy: string[];
   onGroupingChange: (keys: string[]) => void;
 }
 
-export const GroupBy = ({ className, groups, groupBy, onGroupingChange }: Props) => {
+export const GroupBy = ({ groups, groupBy, onGroupingChange }: Props) => {
   const labelKeyOptions = uniq(groups.flatMap((group) => group.alerts).flatMap(({ labels }) => Object.keys(labels)))
     .filter((label) => !(label.startsWith('__') && label.endsWith('__'))) // Filter out private labels
     .map<SelectableValue>((key) => ({
@@ -21,7 +20,7 @@ export const GroupBy = ({ className, groups, groupBy, onGroupingChange }: Props)
     }));
 
   return (
-    <div data-testid={'group-by-container'} className={className}>
+    <div data-testid={'group-by-container'}>
       <Label>Custom group by</Label>
       <MultiSelect
         aria-label={'group by label keys'}
@@ -32,6 +31,7 @@ export const GroupBy = ({ className, groups, groupBy, onGroupingChange }: Props)
           onGroupingChange(items.map(({ value }) => value as string));
         }}
         options={labelKeyOptions}
+        width={34}
       />
     </div>
   );
diff --git a/public/app/features/alerting/unified/components/alert-groups/MatcherFilter.tsx b/public/app/features/alerting/unified/components/alert-groups/MatcherFilter.tsx
index 7c6a51d20e5c2..02dab1c9eea6e 100644
--- a/public/app/features/alerting/unified/components/alert-groups/MatcherFilter.tsx
+++ b/public/app/features/alerting/unified/components/alert-groups/MatcherFilter.tsx
@@ -3,26 +3,24 @@ import { debounce } from 'lodash';
 import React, { FormEvent, useEffect, useMemo } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Label, Tooltip, Input, Icon, useStyles2 } from '@grafana/ui';
+import { Field, Icon, Input, Label, Stack, Tooltip, useStyles2 } from '@grafana/ui';
 
 import { logInfo, LogMessages } from '../../Analytics';
+import { parseMatchers } from '../../utils/alertmanager';
 
 interface Props {
-  className?: string;
   defaultQueryString?: string;
   onFilterChange: (filterString: string) => void;
 }
 
-export const MatcherFilter = ({ className, onFilterChange, defaultQueryString }: Props) => {
+export const MatcherFilter = ({ onFilterChange, defaultQueryString }: Props) => {
   const styles = useStyles2(getStyles);
 
   const onSearchInputChanged = useMemo(
     () =>
       debounce((e: FormEvent<HTMLInputElement>) => {
         logInfo(LogMessages.filterByLabel);
-
-        const target = e.currentTarget;
+        const target = e.target as HTMLInputElement;
         onFilterChange(target.value);
       }, 600),
     [onFilterChange]
@@ -31,42 +29,56 @@ export const MatcherFilter = ({ className, onFilterChange, defaultQueryString }:
   useEffect(() => onSearchInputChanged.cancel(), [onSearchInputChanged]);
 
   const searchIcon = <Icon name={'search'} />;
+  const inputInvalid = defaultQueryString ? parseMatchers(defaultQueryString).length === 0 : false;
 
   return (
-    <div className={className}>
-      <Label>
-        <Stack gap={0.5}>
-          <span>Search by label</span>
-          <Tooltip
-            content={
-              <div>
-                Filter alerts using label querying, ex:
-                <pre>{`{severity="critical", instance=~"cluster-us-.+"}`}</pre>
-              </div>
-            }
-          >
-            <Icon className={styles.icon} name="info-circle" size="sm" />
-          </Tooltip>
-        </Stack>
-      </Label>
+    <Field
+      className={styles.fixMargin}
+      invalid={inputInvalid || undefined}
+      error={inputInvalid ? 'Query must use valid matcher syntax. See the examples in the help tooltip.' : null}
+      label={
+        <Label>
+          <Stack gap={0.5}>
+            <span>Search by label</span>
+            <Tooltip
+              content={
+                <div>
+                  Filter alerts using label querying without spaces, ex:
+                  <pre>{`{severity="critical", instance=~"cluster-us-.+"}`}</pre>
+                  Invalid use of spaces:
+                  <pre>{`{severity= "critical"}`}</pre>
+                  <pre>{`{severity ="critical"}`}</pre>
+                  Valid use of spaces:
+                  <pre>{`{severity=" critical"}`}</pre>
+                  Filter alerts using label querying without braces, ex:
+                  <pre>{`severity="critical", instance=~"cluster-us-.+"`}</pre>
+                </div>
+              }
+            >
+              <Icon name="info-circle" size="sm" />
+            </Tooltip>
+          </Stack>
+        </Label>
+      }
+    >
       <Input
         placeholder="Search"
-        defaultValue={defaultQueryString}
+        defaultValue={defaultQueryString ?? ''}
         onChange={onSearchInputChanged}
         data-testid="search-query-input"
         prefix={searchIcon}
         className={styles.inputWidth}
       />
-    </div>
+    </Field>
   );
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  icon: css`
-    margin-right: ${theme.spacing(0.5)};
-  `,
-  inputWidth: css`
-    width: 340px;
-    flex-grow: 0;
-  `,
+  fixMargin: css({
+    marginBottom: 0,
+  }),
+  inputWidth: css({
+    width: 340,
+    flexGrow: 0,
+  }),
 });
diff --git a/public/app/features/alerting/unified/components/bridges/DeclareIncidentButton.tsx b/public/app/features/alerting/unified/components/bridges/DeclareIncidentButton.tsx
index 05bb7fe83df78..fab8db3c9d562 100644
--- a/public/app/features/alerting/unified/components/bridges/DeclareIncidentButton.tsx
+++ b/public/app/features/alerting/unified/components/bridges/DeclareIncidentButton.tsx
@@ -1,6 +1,6 @@
-import React, { FC } from 'react';
+import React from 'react';
 
-import { Button, LinkButton, Tooltip } from '@grafana/ui';
+import { Button, LinkButton, Menu, Tooltip } from '@grafana/ui';
 
 import { usePluginBridge } from '../../hooks/usePluginBridge';
 import { SupportedPlugin } from '../../types/pluginBridges';
@@ -8,11 +8,11 @@ import { createBridgeURL } from '../PluginBridge';
 
 interface Props {
   title?: string;
-  severity?: 'minor' | 'major' | 'critical';
+  severity?: 'minor' | 'major' | 'critical' | '';
   url?: string;
 }
 
-export const DeclareIncident: FC<Props> = ({ title = '', severity = '', url = '' }) => {
+export const DeclareIncidentButton = ({ title = '', severity = '', url = '' }: Props) => {
   const bridgeURL = createBridgeURL(SupportedPlugin.Incident, '/incidents/declare', { title, severity, url });
 
   const { loading, installed, settings } = usePluginBridge(SupportedPlugin.Incident);
@@ -39,3 +39,21 @@ export const DeclareIncident: FC<Props> = ({ title = '', severity = '', url = ''
     </>
   );
 };
+
+export const DeclareIncidentMenuItem = ({ title = '', severity = '', url = '' }: Props) => {
+  const bridgeURL = createBridgeURL(SupportedPlugin.Incident, '/incidents/declare', { title, severity, url });
+
+  const { loading, installed, settings } = usePluginBridge(SupportedPlugin.Incident);
+
+  return (
+    <>
+      {loading === true && <Menu.Item label="Declare incident" icon="fire" disabled />}
+      {installed === false && (
+        <Tooltip content={'Grafana Incident is not installed or is not configured correctly'}>
+          <Menu.Item label="Declare incident" icon="fire" disabled />
+        </Tooltip>
+      )}
+      {settings && <Menu.Item label="Declare incident" url={bridgeURL} icon="fire" />}
+    </>
+  );
+};
diff --git a/public/app/features/alerting/unified/components/contact-points/ContactPoints.test.tsx b/public/app/features/alerting/unified/components/contact-points/ContactPoints.test.tsx
new file mode 100644
index 0000000000000..2b6ddc72922c9
--- /dev/null
+++ b/public/app/features/alerting/unified/components/contact-points/ContactPoints.test.tsx
@@ -0,0 +1,377 @@
+import { render, screen, waitFor, waitForElementToBeRemoved } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { noop } from 'lodash';
+import React, { PropsWithChildren } from 'react';
+import { TestProvider } from 'test/helpers/TestProvider';
+
+import { selectors } from '@grafana/e2e-selectors';
+import { AlertManagerDataSourceJsonData, AlertManagerImplementation } from 'app/plugins/datasource/alertmanager/types';
+import { AccessControlAction } from 'app/types';
+
+import { setupMswServer } from '../../mockApi';
+import { grantUserPermissions, mockDataSource } from '../../mocks';
+import { AlertmanagerProvider } from '../../state/AlertmanagerContext';
+import { setupDataSources } from '../../testSetup/datasources';
+import { DataSourceType } from '../../utils/datasource';
+
+import ContactPoints, { ContactPoint } from './ContactPoints';
+import setupGrafanaManagedServer from './__mocks__/grafanaManagedServer';
+import setupMimirFlavoredServer, { MIMIR_DATASOURCE_UID } from './__mocks__/mimirFlavoredServer';
+import setupVanillaAlertmanagerFlavoredServer, {
+  VANILLA_ALERTMANAGER_DATASOURCE_UID,
+} from './__mocks__/vanillaAlertmanagerServer';
+import { RouteReference } from './utils';
+
+/**
+ * There are lots of ways in which we test our pages and components. Here's my opinionated approach to testing them.
+ *
+ *  Use MSW to mock API responses, you can copy the JSON results from the network panel and use them in a __mocks__ folder.
+ *
+ * 1. Make sure we have "presentation" components we can test without mocking data,
+ *    test these if they have some logic in them (hiding / showing things) and sad paths.
+ *
+ * 2. For testing the "container" components, check if data fetching is working as intended (you can use loading state)
+ *    and check if we're not in an error state (although you can test for that too for sad path).
+ *
+ * 3. Write tests for the hooks we call in the "container" components
+ *    if those have any logic or data structure transformations in them.
+ *
+ * ⚠️ Always set up the MSW server only once – MWS does not support multiple calls to setupServer(); and causes all sorts of weird issues
+ */
+const server = setupMswServer();
+
+describe('contact points', () => {
+  describe('Contact points with Grafana managed alertmanager', () => {
+    beforeEach(() => {
+      grantUserPermissions([
+        AccessControlAction.AlertingNotificationsRead,
+        AccessControlAction.AlertingNotificationsWrite,
+      ]);
+
+      setupGrafanaManagedServer(server);
+    });
+
+    it('should show / hide loading states, have all actions enabled', async () => {
+      render(
+        <AlertmanagerProvider accessType={'notification'}>
+          <ContactPoints />
+        </AlertmanagerProvider>,
+        { wrapper: TestProvider }
+      );
+
+      await waitFor(async () => {
+        expect(screen.getByText('Loading...')).toBeInTheDocument();
+        await waitForElementToBeRemoved(screen.getByText('Loading...'));
+        expect(screen.queryByTestId(selectors.components.Alert.alertV2('error'))).not.toBeInTheDocument();
+      });
+
+      expect(screen.getByText('grafana-default-email')).toBeInTheDocument();
+      expect(screen.getAllByTestId('contact-point')).toHaveLength(4);
+
+      // check for available actions – our mock 4 contact points, 1 of them is provisioned
+      expect(screen.getByRole('link', { name: 'add contact point' })).toBeInTheDocument();
+      expect(screen.getByRole('button', { name: 'export all' })).toBeInTheDocument();
+
+      // 2 of them are unused by routes in the mock response
+      const unusedBadge = screen.getAllByLabelText('unused');
+      expect(unusedBadge).toHaveLength(2);
+
+      const viewProvisioned = screen.getByRole('link', { name: 'view-action' });
+      expect(viewProvisioned).toBeInTheDocument();
+      expect(viewProvisioned).not.toBeDisabled();
+
+      const editButtons = screen.getAllByRole('link', { name: 'edit-action' });
+      expect(editButtons).toHaveLength(3);
+      editButtons.forEach((button) => {
+        expect(button).not.toBeDisabled();
+      });
+
+      const moreActionsButtons = screen.getAllByRole('button', { name: 'more-actions' });
+      expect(moreActionsButtons).toHaveLength(4);
+      moreActionsButtons.forEach((button) => {
+        expect(button).not.toBeDisabled();
+      });
+    });
+
+    it('should disable certain actions if the user has no write permissions', async () => {
+      grantUserPermissions([AccessControlAction.AlertingNotificationsRead]);
+
+      render(
+        <AlertmanagerProvider accessType={'notification'}>
+          <ContactPoints />
+        </AlertmanagerProvider>,
+        { wrapper: TestProvider }
+      );
+
+      // wait for loading to be done
+      await waitFor(async () => {
+        expect(screen.queryByText('Loading...')).not.toBeInTheDocument();
+      });
+
+      // should disable create contact point
+      expect(screen.getByRole('link', { name: 'add contact point' })).toHaveAttribute('aria-disabled', 'true');
+
+      // there should be no edit buttons
+      expect(screen.queryAllByRole('link', { name: 'edit-action' })).toHaveLength(0);
+
+      // there should be view buttons though
+      const viewButtons = screen.getAllByRole('link', { name: 'view-action' });
+      expect(viewButtons).toHaveLength(4);
+
+      // delete should be disabled in the "more" actions
+      const moreButtons = screen.queryAllByRole('button', { name: 'more-actions' });
+      expect(moreButtons).toHaveLength(4);
+
+      // check if all of the delete buttons are disabled
+      for await (const button of moreButtons) {
+        await userEvent.click(button);
+        const deleteButton = await screen.queryByRole('menuitem', { name: 'delete' });
+        expect(deleteButton).toBeDisabled();
+        // click outside the menu to close it otherwise we can't interact with the rest of the page
+        await userEvent.click(document.body);
+      }
+
+      // check buttons in Notification Templates
+      const notificationTemplatesTab = screen.getByRole('tab', { name: 'Tab Notification Templates' });
+      await userEvent.click(notificationTemplatesTab);
+      expect(screen.getByRole('link', { name: 'Add notification template' })).toHaveAttribute('aria-disabled', 'true');
+    });
+
+    it('should call delete when clicked and not disabled', async () => {
+      const onDelete = jest.fn();
+
+      render(<ContactPoint name={'my-contact-point'} receivers={[]} onDelete={onDelete} />, {
+        wrapper,
+      });
+
+      const moreActions = screen.getByRole('button', { name: 'more-actions' });
+      await userEvent.click(moreActions);
+
+      const deleteButton = screen.getByRole('menuitem', { name: /delete/i });
+      await userEvent.click(deleteButton);
+
+      expect(onDelete).toHaveBeenCalledWith('my-contact-point');
+    });
+
+    it('should disable edit button', async () => {
+      render(<ContactPoint name={'my-contact-point'} disabled={true} receivers={[]} onDelete={noop} />, {
+        wrapper,
+      });
+
+      const moreActions = screen.getByRole('button', { name: 'more-actions' });
+      expect(moreActions).not.toBeDisabled();
+
+      const editAction = screen.getByTestId('edit-action');
+      expect(editAction).toHaveAttribute('aria-disabled', 'true');
+    });
+
+    it('should disable buttons when provisioned', async () => {
+      render(<ContactPoint name={'my-contact-point'} provisioned={true} receivers={[]} onDelete={noop} />, {
+        wrapper,
+      });
+
+      expect(screen.getByText(/provisioned/i)).toBeInTheDocument();
+
+      const editAction = screen.queryByTestId('edit-action');
+      expect(editAction).not.toBeInTheDocument();
+
+      const viewAction = screen.getByRole('link', { name: /view/i });
+      expect(viewAction).toBeInTheDocument();
+
+      const moreActions = screen.getByRole('button', { name: 'more-actions' });
+      expect(moreActions).not.toBeDisabled();
+      await userEvent.click(moreActions);
+
+      const deleteButton = screen.getByRole('menuitem', { name: /delete/i });
+      expect(deleteButton).toBeDisabled();
+    });
+
+    it('should disable delete when contact point is linked to at least one normal notification policy', async () => {
+      const policies: RouteReference[] = [
+        {
+          receiver: 'my-contact-point',
+          route: {
+            type: 'normal',
+          },
+        },
+      ];
+
+      render(<ContactPoint name={'my-contact-point'} receivers={[]} policies={policies} onDelete={noop} />, {
+        wrapper,
+      });
+
+      expect(screen.getByRole('link', { name: 'is used by 1 notification policy' })).toBeInTheDocument();
+
+      const moreActions = screen.getByRole('button', { name: 'more-actions' });
+      await userEvent.click(moreActions);
+
+      const deleteButton = screen.getByRole('menuitem', { name: /delete/i });
+      expect(deleteButton).toBeDisabled();
+    });
+
+    it('should not disable delete when contact point is linked only to auto-generated notification policy', async () => {
+      const policies: RouteReference[] = [
+        {
+          receiver: 'my-contact-point',
+          route: {
+            type: 'auto-generated',
+          },
+        },
+      ];
+
+      render(<ContactPoint name={'my-contact-point'} receivers={[]} policies={policies} onDelete={noop} />, {
+        wrapper,
+      });
+
+      const moreActions = screen.getByRole('button', { name: 'more-actions' });
+      await userEvent.click(moreActions);
+
+      const deleteButton = screen.getByRole('menuitem', { name: /delete/i });
+      expect(deleteButton).not.toBeDisabled();
+    });
+
+    it('should be able to search', async () => {
+      render(
+        <AlertmanagerProvider accessType={'notification'}>
+          <ContactPoints />
+        </AlertmanagerProvider>,
+        { wrapper: TestProvider }
+      );
+
+      const searchInput = screen.getByRole('textbox', { name: 'search contact points' });
+      await userEvent.type(searchInput, 'slack');
+      expect(searchInput).toHaveValue('slack');
+
+      await waitFor(() => {
+        expect(screen.getByText('Slack with multiple channels')).toBeInTheDocument();
+        expect(screen.getAllByTestId('contact-point')).toHaveLength(1);
+      });
+
+      // ⚠️ for some reason, the query params are preserved for all tests so don't forget to clear the input
+      const clearButton = screen.getByRole('button', { name: 'clear' });
+      await userEvent.click(clearButton);
+      expect(searchInput).toHaveValue('');
+    });
+  });
+
+  describe('Contact points with Mimir-flavored alertmanager', () => {
+    beforeEach(() => {
+      setupMimirFlavoredServer(server);
+    });
+
+    beforeAll(() => {
+      grantUserPermissions([
+        AccessControlAction.AlertingNotificationsExternalRead,
+        AccessControlAction.AlertingNotificationsExternalWrite,
+      ]);
+      setupDataSources(
+        mockDataSource({
+          type: DataSourceType.Alertmanager,
+          name: MIMIR_DATASOURCE_UID,
+          uid: MIMIR_DATASOURCE_UID,
+        })
+      );
+    });
+
+    it('should show / hide loading states, have the right actions enabled', async () => {
+      render(
+        <TestProvider>
+          <AlertmanagerProvider accessType={'notification'} alertmanagerSourceName={MIMIR_DATASOURCE_UID}>
+            <ContactPoints />
+          </AlertmanagerProvider>
+        </TestProvider>
+      );
+
+      await waitFor(async () => {
+        expect(screen.getByText('Loading...')).toBeInTheDocument();
+        await waitForElementToBeRemoved(screen.getByText('Loading...'));
+        expect(screen.queryByTestId(selectors.components.Alert.alertV2('error'))).not.toBeInTheDocument();
+      });
+
+      expect(screen.getByText('mixed')).toBeInTheDocument();
+      expect(screen.getByText('some webhook')).toBeInTheDocument();
+      expect(screen.getAllByTestId('contact-point')).toHaveLength(2);
+
+      // check for available actions – export should be disabled
+      expect(screen.getByRole('link', { name: 'add contact point' })).toBeInTheDocument();
+      expect(screen.queryByRole('button', { name: 'export all' })).not.toBeInTheDocument();
+
+      // 1 of them is used by a route in the mock response
+      const unusedBadge = screen.getAllByLabelText('unused');
+      expect(unusedBadge).toHaveLength(1);
+
+      const editButtons = screen.getAllByRole('link', { name: 'edit-action' });
+      expect(editButtons).toHaveLength(2);
+      editButtons.forEach((button) => {
+        expect(button).not.toBeDisabled();
+      });
+
+      const moreActionsButtons = screen.getAllByRole('button', { name: 'more-actions' });
+      expect(moreActionsButtons).toHaveLength(2);
+      moreActionsButtons.forEach((button) => {
+        expect(button).not.toBeDisabled();
+      });
+    });
+  });
+
+  describe('Vanilla Alertmanager ', () => {
+    beforeEach(() => {
+      setupVanillaAlertmanagerFlavoredServer(server);
+    });
+
+    beforeAll(() => {
+      grantUserPermissions([
+        AccessControlAction.AlertingNotificationsExternalRead,
+        AccessControlAction.AlertingNotificationsExternalWrite,
+      ]);
+
+      const alertManager = mockDataSource<AlertManagerDataSourceJsonData>({
+        name: VANILLA_ALERTMANAGER_DATASOURCE_UID,
+        uid: VANILLA_ALERTMANAGER_DATASOURCE_UID,
+        type: DataSourceType.Alertmanager,
+        jsonData: {
+          implementation: AlertManagerImplementation.prometheus,
+          handleGrafanaManagedAlerts: true,
+        },
+      });
+
+      setupDataSources(alertManager);
+    });
+
+    it("should not allow any editing because it's not supported", async () => {
+      render(
+        <TestProvider>
+          <AlertmanagerProvider
+            accessType={'notification'}
+            alertmanagerSourceName={VANILLA_ALERTMANAGER_DATASOURCE_UID}
+          >
+            <ContactPoints />
+          </AlertmanagerProvider>
+        </TestProvider>
+      );
+
+      await waitFor(async () => {
+        expect(screen.getByText('Loading...')).toBeInTheDocument();
+        await waitForElementToBeRemoved(screen.getByText('Loading...'));
+        expect(screen.queryByTestId(selectors.components.Alert.alertV2('error'))).not.toBeInTheDocument();
+      });
+
+      expect(screen.queryByRole('link', { name: 'add contact point' })).not.toBeInTheDocument();
+
+      const viewProvisioned = screen.getByRole('link', { name: 'view-action' });
+      expect(viewProvisioned).toBeInTheDocument();
+      expect(viewProvisioned).not.toBeDisabled();
+
+      // check buttons in Notification Templates
+      const notificationTemplatesTab = screen.getByRole('tab', { name: 'Tab Notification Templates' });
+      await userEvent.click(notificationTemplatesTab);
+      expect(screen.queryByRole('link', { name: 'Add notification template' })).not.toBeInTheDocument();
+    });
+  });
+});
+
+const wrapper = ({ children }: PropsWithChildren) => (
+  <TestProvider>
+    <AlertmanagerProvider accessType={'notification'}>{children}</AlertmanagerProvider>
+  </TestProvider>
+);
diff --git a/public/app/features/alerting/unified/components/contact-points/ContactPoints.tsx b/public/app/features/alerting/unified/components/contact-points/ContactPoints.tsx
new file mode 100644
index 0000000000000..41fc2e4c76cdf
--- /dev/null
+++ b/public/app/features/alerting/unified/components/contact-points/ContactPoints.tsx
@@ -0,0 +1,692 @@
+import { css } from '@emotion/css';
+import uFuzzy from '@leeoniya/ufuzzy';
+import { SerializedError } from '@reduxjs/toolkit';
+import { groupBy, size, uniq, upperFirst } from 'lodash';
+import pluralize from 'pluralize';
+import React, { Fragment, ReactNode, useCallback, useMemo, useState } from 'react';
+import { Link } from 'react-router-dom';
+import { useToggle } from 'react-use';
+
+import { dateTime, GrafanaTheme2 } from '@grafana/data';
+import {
+  Alert,
+  Button,
+  Dropdown,
+  Icon,
+  LinkButton,
+  LoadingPlaceholder,
+  Menu,
+  Pagination,
+  Stack,
+  Tab,
+  TabContent,
+  TabsBar,
+  Text,
+  Tooltip,
+  useStyles2,
+} from '@grafana/ui';
+import ConditionalWrap from 'app/features/alerting/unified/components/ConditionalWrap';
+import { receiverTypeNames } from 'app/plugins/datasource/alertmanager/consts';
+import { GrafanaManagedReceiverConfig } from 'app/plugins/datasource/alertmanager/types';
+import { GrafanaNotifierType, NotifierStatus } from 'app/types/alerting';
+
+import { AlertmanagerAction, useAlertmanagerAbility } from '../../hooks/useAbilities';
+import { usePagination } from '../../hooks/usePagination';
+import { useURLSearchParams } from '../../hooks/useURLSearchParams';
+import { useAlertmanager } from '../../state/AlertmanagerContext';
+import { INTEGRATION_ICONS } from '../../types/contact-points';
+import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
+import { createUrl } from '../../utils/url';
+import { GrafanaAlertmanagerDeliveryWarning } from '../GrafanaAlertmanagerDeliveryWarning';
+import { MetaText } from '../MetaText';
+import MoreButton from '../MoreButton';
+import { ProvisioningBadge } from '../Provisioning';
+import { Spacer } from '../Spacer';
+import { Strong } from '../Strong';
+import { GrafanaReceiverExporter } from '../export/GrafanaReceiverExporter';
+import { GrafanaReceiversExporter } from '../export/GrafanaReceiversExporter';
+import { ReceiverMetadataBadge } from '../receivers/grafanaAppReceivers/ReceiverMetadataBadge';
+import { ReceiverPluginMetadata } from '../receivers/grafanaAppReceivers/useReceiversMetadata';
+
+import { NotificationTemplates } from './NotificationTemplates';
+import { ContactPointsFilter } from './components/ContactPointsFilter';
+import { GlobalConfigAlert } from './components/GlobalConfigAlert';
+import { useDeleteContactPointModal } from './components/Modals';
+import { UnusedContactPointBadge } from './components/UnusedBadge';
+import {
+  RECEIVER_META_KEY,
+  RECEIVER_PLUGIN_META_KEY,
+  RECEIVER_STATUS_KEY,
+  useContactPointsWithStatus,
+  useDeleteContactPoint,
+} from './useContactPoints';
+import {
+  ContactPointWithMetadata,
+  getReceiverDescription,
+  isProvisioned,
+  ReceiverConfigWithMetadata,
+  RouteReference,
+} from './utils';
+
+enum ActiveTab {
+  ContactPoints,
+  NotificationTemplates,
+}
+
+const DEFAULT_PAGE_SIZE = 10;
+
+const ContactPoints = () => {
+  const { selectedAlertmanager } = useAlertmanager();
+  // TODO hook up to query params
+  const [activeTab, setActiveTab] = useState<ActiveTab>(ActiveTab.ContactPoints);
+  let { isLoading, error, contactPoints } = useContactPointsWithStatus();
+  const { deleteTrigger, updateAlertmanagerState } = useDeleteContactPoint(selectedAlertmanager!);
+  const [addContactPointSupported, addContactPointAllowed] = useAlertmanagerAbility(
+    AlertmanagerAction.CreateContactPoint
+  );
+  const [exportContactPointsSupported, exportContactPointsAllowed] = useAlertmanagerAbility(
+    AlertmanagerAction.ExportContactPoint
+  );
+  const [createTemplateSupported, createTemplateAllowed] = useAlertmanagerAbility(
+    AlertmanagerAction.CreateNotificationTemplate
+  );
+
+  const [DeleteModal, showDeleteModal] = useDeleteContactPointModal(deleteTrigger, updateAlertmanagerState.isLoading);
+  const [ExportDrawer, showExportDrawer] = useExportContactPoint();
+
+  const [searchParams] = useURLSearchParams();
+  const { search } = getContactPointsFilters(searchParams);
+
+  const showingContactPoints = activeTab === ActiveTab.ContactPoints;
+  const showNotificationTemplates = activeTab === ActiveTab.NotificationTemplates;
+
+  if (error) {
+    // TODO fix this type casting, when error comes from "getContactPointsStatus" it probably won't be a SerializedError
+    return <Alert title="Failed to fetch contact points">{(error as SerializedError).message}</Alert>;
+  }
+
+  const isGrafanaManagedAlertmanager = selectedAlertmanager === GRAFANA_RULES_SOURCE_NAME;
+
+  return (
+    <>
+      <GrafanaAlertmanagerDeliveryWarning currentAlertmanager={selectedAlertmanager!} />
+
+      <Stack direction="column">
+        <TabsBar>
+          <Tab
+            label="Contact Points"
+            active={showingContactPoints}
+            counter={contactPoints.length}
+            onChangeTab={() => setActiveTab(ActiveTab.ContactPoints)}
+          />
+          <Tab
+            label="Notification Templates"
+            active={showNotificationTemplates}
+            onChangeTab={() => setActiveTab(ActiveTab.NotificationTemplates)}
+          />
+        </TabsBar>
+        <TabContent>
+          <Stack direction="column">
+            <>
+              {isLoading && <LoadingPlaceholder text={'Loading...'} />}
+              {/* Contact Points tab */}
+              {showingContactPoints && (
+                <>
+                  {error ? (
+                    <Alert title="Failed to fetch contact points">{String(error)}</Alert>
+                  ) : (
+                    <>
+                      {/* TODO we can add some additional info here with a ToggleTip */}
+                      <Stack direction="row" alignItems="end">
+                        <ContactPointsFilter />
+                        <Spacer />
+                        <Stack direction="row" gap={1}>
+                          {addContactPointSupported && (
+                            <LinkButton
+                              icon="plus"
+                              aria-label="add contact point"
+                              variant="primary"
+                              href="/alerting/notifications/receivers/new"
+                              disabled={!addContactPointAllowed}
+                            >
+                              Add contact point
+                            </LinkButton>
+                          )}
+                          {exportContactPointsSupported && (
+                            <Button
+                              icon="download-alt"
+                              variant="secondary"
+                              aria-label="export all"
+                              disabled={!exportContactPointsAllowed}
+                              onClick={() => showExportDrawer(ALL_CONTACT_POINTS)}
+                            >
+                              Export all
+                            </Button>
+                          )}
+                        </Stack>
+                      </Stack>
+                      <ContactPointsList
+                        contactPoints={contactPoints}
+                        search={search}
+                        pageSize={DEFAULT_PAGE_SIZE}
+                        onDelete={(name) => showDeleteModal(name)}
+                        disabled={updateAlertmanagerState.isLoading}
+                      />
+                      {/* Grafana manager Alertmanager does not support global config, Mimir and Cortex do */}
+                      {!isGrafanaManagedAlertmanager && <GlobalConfigAlert alertManagerName={selectedAlertmanager!} />}
+                    </>
+                  )}
+                </>
+              )}
+              {/* Notification Templates tab */}
+              {showNotificationTemplates && (
+                <>
+                  <Stack direction="row" alignItems="center">
+                    <Text variant="body" color="secondary">
+                      Create notification templates to customize your notifications.
+                    </Text>
+                    <Spacer />
+                    {createTemplateSupported && (
+                      <LinkButton
+                        icon="plus"
+                        variant="primary"
+                        href="/alerting/notifications/templates/new"
+                        disabled={!createTemplateAllowed}
+                      >
+                        Add notification template
+                      </LinkButton>
+                    )}
+                  </Stack>
+                  <NotificationTemplates />
+                </>
+              )}
+            </>
+          </Stack>
+        </TabContent>
+      </Stack>
+      {DeleteModal}
+      {ExportDrawer}
+    </>
+  );
+};
+
+interface ContactPointsListProps {
+  contactPoints: ContactPointWithMetadata[];
+  search?: string;
+  disabled?: boolean;
+  onDelete: (name: string) => void;
+  pageSize?: number;
+}
+
+const ContactPointsList = ({
+  contactPoints,
+  disabled = false,
+  search,
+  pageSize = DEFAULT_PAGE_SIZE,
+  onDelete,
+}: ContactPointsListProps) => {
+  const searchResults = useContactPointsSearch(contactPoints, search);
+  const { page, pageItems, numberOfPages, onPageChange } = usePagination(searchResults, 1, pageSize);
+
+  return (
+    <>
+      {pageItems.map((contactPoint, index) => {
+        const provisioned = isProvisioned(contactPoint);
+        const policies = contactPoint.policies ?? [];
+        const key = `${contactPoint.name}-${index}`;
+
+        return (
+          <ContactPoint
+            key={key}
+            name={contactPoint.name}
+            disabled={disabled}
+            onDelete={onDelete}
+            receivers={contactPoint.grafana_managed_receiver_configs}
+            provisioned={provisioned}
+            policies={policies}
+          />
+        );
+      })}
+      <Pagination currentPage={page} numberOfPages={numberOfPages} onNavigate={onPageChange} hideWhenSinglePage />
+    </>
+  );
+};
+
+const fuzzyFinder = new uFuzzy({
+  intraMode: 1,
+  intraIns: 1,
+  intraSub: 1,
+  intraDel: 1,
+  intraTrn: 1,
+});
+
+// let's search in two different haystacks, the name of the contact point and the type of the receiver(s)
+function useContactPointsSearch(
+  contactPoints: ContactPointWithMetadata[],
+  search?: string
+): ContactPointWithMetadata[] {
+  const nameHaystack = useMemo(() => {
+    return contactPoints.map((contactPoint) => contactPoint.name);
+  }, [contactPoints]);
+
+  const typeHaystack = useMemo(() => {
+    return contactPoints.map((contactPoint) =>
+      // we're using the resolved metadata key here instead of the "type" property – ex. we alias "teams" to "microsoft teams"
+      contactPoint.grafana_managed_receiver_configs.map((receiver) => receiver[RECEIVER_META_KEY].name).join(' ')
+    );
+  }, [contactPoints]);
+
+  if (!search) {
+    return contactPoints;
+  }
+
+  const nameHits = fuzzyFinder.filter(nameHaystack, search) ?? [];
+  const typeHits = fuzzyFinder.filter(typeHaystack, search) ?? [];
+
+  const hits = [...nameHits, ...typeHits];
+
+  return uniq(hits).map((id) => contactPoints[id]) ?? [];
+}
+
+interface ContactPointProps {
+  name: string;
+  disabled?: boolean;
+  provisioned?: boolean;
+  receivers: ReceiverConfigWithMetadata[];
+  policies?: RouteReference[];
+  onDelete: (name: string) => void;
+}
+
+export const ContactPoint = ({
+  name,
+  disabled = false,
+  provisioned = false,
+  receivers,
+  policies = [],
+  onDelete,
+}: ContactPointProps) => {
+  const styles = useStyles2(getStyles);
+
+  // TODO probably not the best way to figure out if we want to show either only the summary or full metadata for the receivers?
+  const showFullMetadata = receivers.some((receiver) => Boolean(receiver[RECEIVER_STATUS_KEY]));
+
+  return (
+    <div className={styles.contactPointWrapper} data-testid="contact-point">
+      <Stack direction="column" gap={0}>
+        <ContactPointHeader
+          name={name}
+          policies={policies}
+          provisioned={provisioned}
+          disabled={disabled}
+          onDelete={onDelete}
+        />
+        {showFullMetadata ? (
+          <div>
+            {receivers.map((receiver, index) => {
+              const diagnostics = receiver[RECEIVER_STATUS_KEY];
+              const metadata = receiver[RECEIVER_META_KEY];
+              const sendingResolved = !Boolean(receiver.disableResolveMessage);
+              const pluginMetadata = receiver[RECEIVER_PLUGIN_META_KEY];
+              const key = metadata.name + index;
+
+              return (
+                <ContactPointReceiver
+                  key={key}
+                  name={metadata.name}
+                  type={receiver.type}
+                  description={getReceiverDescription(receiver)}
+                  diagnostics={diagnostics}
+                  pluginMetadata={pluginMetadata}
+                  sendingResolved={sendingResolved}
+                />
+              );
+            })}
+          </div>
+        ) : (
+          <div className={styles.integrationWrapper}>
+            <ContactPointReceiverSummary receivers={receivers} />
+          </div>
+        )}
+      </Stack>
+    </div>
+  );
+};
+
+interface ContactPointHeaderProps {
+  name: string;
+  disabled?: boolean;
+  provisioned?: boolean;
+  policies?: RouteReference[];
+  onDelete: (name: string) => void;
+}
+
+const ContactPointHeader = (props: ContactPointHeaderProps) => {
+  const { name, disabled = false, provisioned = false, policies = [], onDelete } = props;
+  const styles = useStyles2(getStyles);
+
+  const [exportSupported, exportAllowed] = useAlertmanagerAbility(AlertmanagerAction.ExportContactPoint);
+  const [editSupported, editAllowed] = useAlertmanagerAbility(AlertmanagerAction.UpdateContactPoint);
+  const [deleteSupported, deleteAllowed] = useAlertmanagerAbility(AlertmanagerAction.UpdateContactPoint);
+
+  const [ExportDrawer, openExportDrawer] = useExportContactPoint();
+
+  const numberOfPolicies = policies.length;
+  const isReferencedByAnyPolicy = numberOfPolicies > 0;
+  const isReferencedByRegularPolicies = policies.some((ref) => ref.route.type !== 'auto-generated');
+
+  const canEdit = editSupported && editAllowed && !provisioned;
+  const canDelete = deleteSupported && deleteAllowed && !provisioned && !isReferencedByRegularPolicies;
+
+  const menuActions: JSX.Element[] = [];
+
+  if (exportSupported) {
+    menuActions.push(
+      <Fragment key="export-contact-point">
+        <Menu.Item
+          icon="download-alt"
+          label="Export"
+          ariaLabel="export"
+          disabled={!exportAllowed}
+          data-testid="export"
+          onClick={() => openExportDrawer(name)}
+        />
+        <Menu.Divider />
+      </Fragment>
+    );
+  }
+
+  if (deleteSupported) {
+    menuActions.push(
+      <ConditionalWrap
+        key="delete-contact-point"
+        shouldWrap={!canDelete}
+        wrap={(children) => (
+          <Tooltip content="Contact point is currently in use by one or more notification policies" placement="top">
+            <span>{children}</span>
+          </Tooltip>
+        )}
+      >
+        <Menu.Item
+          label="Delete"
+          ariaLabel="delete"
+          icon="trash-alt"
+          destructive
+          disabled={disabled || !canDelete}
+          onClick={() => onDelete(name)}
+        />
+      </ConditionalWrap>
+    );
+  }
+
+  return (
+    <div className={styles.headerWrapper}>
+      <Stack direction="row" alignItems="center" gap={1}>
+        <Stack alignItems="center" gap={1}>
+          <Text variant="body" weight="medium">
+            {name}
+          </Text>
+        </Stack>
+        {isReferencedByAnyPolicy && (
+          <MetaText>
+            <Link to={createUrl('/alerting/routes', { contactPoint: name })}>
+              is used by <Strong>{numberOfPolicies}</Strong> {pluralize('notification policy', numberOfPolicies)}
+            </Link>
+          </MetaText>
+        )}
+        {provisioned && <ProvisioningBadge />}
+        {!isReferencedByAnyPolicy && <UnusedContactPointBadge />}
+        <Spacer />
+        <LinkButton
+          tooltipPlacement="top"
+          tooltip={provisioned ? 'Provisioned contact points cannot be edited in the UI' : undefined}
+          variant="secondary"
+          size="sm"
+          icon={canEdit ? 'pen' : 'eye'}
+          type="button"
+          disabled={disabled}
+          aria-label={`${canEdit ? 'edit' : 'view'}-action`}
+          data-testid={`${canEdit ? 'edit' : 'view'}-action`}
+          href={`/alerting/notifications/receivers/${encodeURIComponent(name)}/edit`}
+        >
+          {canEdit ? 'Edit' : 'View'}
+        </LinkButton>
+        {menuActions.length > 0 && (
+          <Dropdown overlay={<Menu>{menuActions}</Menu>}>
+            <MoreButton />
+          </Dropdown>
+        )}
+      </Stack>
+      {ExportDrawer}
+    </div>
+  );
+};
+
+interface ContactPointReceiverProps {
+  name: string;
+  type: GrafanaNotifierType | string;
+  description?: ReactNode;
+  sendingResolved?: boolean;
+  diagnostics?: NotifierStatus;
+  pluginMetadata?: ReceiverPluginMetadata;
+}
+
+const ContactPointReceiver = (props: ContactPointReceiverProps) => {
+  const { name, type, description, diagnostics, pluginMetadata, sendingResolved = true } = props;
+  const styles = useStyles2(getStyles);
+
+  const hasMetadata = diagnostics !== undefined;
+
+  return (
+    <div className={styles.integrationWrapper}>
+      <Stack direction="column" gap={0.5}>
+        <ContactPointReceiverTitleRow
+          name={name}
+          type={type}
+          description={description}
+          pluginMetadata={pluginMetadata}
+        />
+        {hasMetadata && <ContactPointReceiverMetadataRow diagnostics={diagnostics} sendingResolved={sendingResolved} />}
+      </Stack>
+    </div>
+  );
+};
+
+export interface ContactPointReceiverTitleRowProps {
+  name: string;
+  type: GrafanaNotifierType | string;
+  description?: ReactNode;
+  pluginMetadata?: ReceiverPluginMetadata;
+}
+
+export function ContactPointReceiverTitleRow(props: ContactPointReceiverTitleRowProps) {
+  const { name, type, description, pluginMetadata } = props;
+
+  const iconName = INTEGRATION_ICONS[type];
+
+  return (
+    <Stack direction="row" alignItems="center" gap={1}>
+      <Stack direction="row" alignItems="center" gap={0.5}>
+        {iconName && <Icon name={iconName} />}
+        {pluginMetadata ? (
+          <ReceiverMetadataBadge metadata={pluginMetadata} />
+        ) : (
+          <Text variant="body" color="primary">
+            {name}
+          </Text>
+        )}
+      </Stack>
+      {description && (
+        <Text variant="bodySmall" color="secondary">
+          {description}
+        </Text>
+      )}
+    </Stack>
+  );
+}
+
+interface ContactPointReceiverMetadata {
+  sendingResolved: boolean;
+  diagnostics: NotifierStatus;
+}
+
+type ContactPointReceiverSummaryProps = {
+  receivers: GrafanaManagedReceiverConfig[];
+};
+
+/**
+ * This summary is used when we're dealing with non-Grafana managed alertmanager since they
+ * don't have any metadata worth showing other than a summary of what types are configured for the contact point
+ */
+export const ContactPointReceiverSummary = ({ receivers }: ContactPointReceiverSummaryProps) => {
+  const countByType = groupBy(receivers, (receiver) => receiver.type);
+
+  return (
+    <Stack direction="column" gap={0}>
+      <Stack direction="row" alignItems="center" gap={1}>
+        {Object.entries(countByType).map(([type, receivers], index) => {
+          const iconName = INTEGRATION_ICONS[type];
+          const receiverName = receiverTypeNames[type] ?? upperFirst(type);
+          const isLastItem = size(countByType) - 1 === index;
+
+          return (
+            <React.Fragment key={type}>
+              <Stack direction="row" alignItems="center" gap={0.5}>
+                {iconName && <Icon name={iconName} />}
+                <Text variant="body">
+                  {receiverName}
+                  {receivers.length > 1 && <> ({receivers.length})</>}
+                </Text>
+              </Stack>
+              {!isLastItem && '⋅'}
+            </React.Fragment>
+          );
+        })}
+      </Stack>
+    </Stack>
+  );
+};
+
+const ContactPointReceiverMetadataRow = ({ diagnostics, sendingResolved }: ContactPointReceiverMetadata) => {
+  const styles = useStyles2(getStyles);
+
+  const failedToSend = Boolean(diagnostics.lastNotifyAttemptError);
+  const lastDeliveryAttempt = dateTime(diagnostics.lastNotifyAttempt);
+  const lastDeliveryAttemptDuration = diagnostics.lastNotifyAttemptDuration;
+  const hasDeliveryAttempt = lastDeliveryAttempt.isValid();
+
+  return (
+    <div className={styles.metadataRow}>
+      <Stack direction="row" gap={1}>
+        {/* this is shown when the last delivery failed – we don't show any additional metadata */}
+        {failedToSend ? (
+          <>
+            <MetaText color="error" icon="exclamation-circle">
+              <Tooltip content={diagnostics.lastNotifyAttemptError!}>
+                <span>Last delivery attempt failed</span>
+              </Tooltip>
+            </MetaText>
+          </>
+        ) : (
+          <>
+            {/* this is shown when we have a last delivery attempt */}
+            {hasDeliveryAttempt && (
+              <>
+                <MetaText icon="clock-nine">
+                  Last delivery attempt{' '}
+                  <Tooltip content={lastDeliveryAttempt.toLocaleString()}>
+                    <span>
+                      <Strong>{lastDeliveryAttempt.locale('en').fromNow()}</Strong>
+                    </span>
+                  </Tooltip>
+                </MetaText>
+                <MetaText icon="stopwatch">
+                  took <Strong>{lastDeliveryAttemptDuration}</Strong>
+                </MetaText>
+              </>
+            )}
+            {/* when we have no last delivery attempt */}
+            {!hasDeliveryAttempt && <MetaText icon="clock-nine">No delivery attempts</MetaText>}
+            {/* this is only shown for contact points that only want "firing" updates */}
+            {!sendingResolved && (
+              <MetaText icon="info-circle">
+                Delivering <Strong>only firing</Strong> notifications
+              </MetaText>
+            )}
+          </>
+        )}
+      </Stack>
+    </div>
+  );
+};
+
+const ALL_CONTACT_POINTS = Symbol('all contact points');
+
+type ExportProps = [JSX.Element | null, (receiver: string | typeof ALL_CONTACT_POINTS) => void];
+
+const useExportContactPoint = (): ExportProps => {
+  const [receiverName, setReceiverName] = useState<string | typeof ALL_CONTACT_POINTS | null>(null);
+  const [isExportDrawerOpen, toggleShowExportDrawer] = useToggle(false);
+  const [decryptSecretsSupported, decryptSecretsAllowed] = useAlertmanagerAbility(AlertmanagerAction.DecryptSecrets);
+
+  const canReadSecrets = decryptSecretsSupported && decryptSecretsAllowed;
+
+  const handleClose = useCallback(() => {
+    setReceiverName(null);
+    toggleShowExportDrawer(false);
+  }, [toggleShowExportDrawer]);
+
+  const handleOpen = (receiverName: string | typeof ALL_CONTACT_POINTS) => {
+    setReceiverName(receiverName);
+    toggleShowExportDrawer(true);
+  };
+
+  const drawer = useMemo(() => {
+    if (!receiverName || !isExportDrawerOpen) {
+      return null;
+    }
+
+    if (receiverName === ALL_CONTACT_POINTS) {
+      // use this drawer when we want to export all contact points
+      return <GrafanaReceiversExporter decrypt={canReadSecrets} onClose={handleClose} />;
+    } else {
+      // use this one for exporting a single contact point
+      return <GrafanaReceiverExporter receiverName={receiverName} decrypt={canReadSecrets} onClose={handleClose} />;
+    }
+  }, [canReadSecrets, isExportDrawerOpen, handleClose, receiverName]);
+
+  return [drawer, handleOpen];
+};
+
+const getContactPointsFilters = (searchParams: URLSearchParams) => ({
+  search: searchParams.get('search') ?? undefined,
+});
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  contactPointWrapper: css({
+    borderRadius: `${theme.shape.radius.default}`,
+    border: `solid 1px ${theme.colors.border.weak}`,
+    borderBottom: 'none',
+  }),
+  integrationWrapper: css({
+    position: 'relative',
+
+    background: `${theme.colors.background.primary}`,
+    padding: `${theme.spacing(1)} ${theme.spacing(1.5)}`,
+
+    borderBottom: `solid 1px ${theme.colors.border.weak}`,
+  }),
+  headerWrapper: css({
+    background: `${theme.colors.background.secondary}`,
+    padding: `${theme.spacing(1)} ${theme.spacing(1.5)}`,
+
+    borderBottom: `solid 1px ${theme.colors.border.weak}`,
+    borderTopLeftRadius: `${theme.shape.radius.default}`,
+    borderTopRightRadius: `${theme.shape.radius.default}`,
+  }),
+  metadataRow: css({
+    borderBottomLeftRadius: `${theme.shape.radius.default}`,
+    borderBottomRightRadius: `${theme.shape.radius.default}`,
+  }),
+});
+
+export default ContactPoints;
diff --git a/public/app/features/alerting/unified/components/contact-points/ContactPoints.v1.test.tsx b/public/app/features/alerting/unified/components/contact-points/ContactPoints.v1.test.tsx
deleted file mode 100644
index c16a2be72d6b6..0000000000000
--- a/public/app/features/alerting/unified/components/contact-points/ContactPoints.v1.test.tsx
+++ /dev/null
@@ -1,699 +0,0 @@
-import { render, waitFor, within, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import React from 'react';
-import { TestProvider } from 'test/helpers/TestProvider';
-import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
-import { byLabelText, byPlaceholderText, byRole, byTestId, byText } from 'testing-library-selector';
-
-import { locationService, setDataSourceSrv } from '@grafana/runtime';
-import { interceptLinkClicks } from 'app/core/navigation/patch/interceptLinkClicks';
-import { contextSrv } from 'app/core/services/context_srv';
-import store from 'app/core/store';
-import {
-  AlertmanagerChoice,
-  AlertManagerDataSourceJsonData,
-  AlertManagerImplementation,
-} from 'app/plugins/datasource/alertmanager/types';
-import { AccessControlAction, ContactPointsState } from 'app/types';
-
-import 'whatwg-fetch';
-import 'core-js/stable/structured-clone';
-
-import { fetchAlertManagerConfig, fetchStatus, testReceivers, updateAlertManagerConfig } from '../../api/alertmanager';
-import { AlertmanagersChoiceResponse } from '../../api/alertmanagerApi';
-import { discoverAlertmanagerFeatures } from '../../api/buildInfo';
-import { fetchNotifiers } from '../../api/grafana';
-import * as receiversApi from '../../api/receiversApi';
-import * as grafanaApp from '../../components/receivers/grafanaAppReceivers/grafanaApp';
-import { mockApi, setupMswServer } from '../../mockApi';
-import {
-  grantUserPermissions,
-  mockDataSource,
-  MockDataSourceSrv,
-  onCallPluginMetaMock,
-  someCloudAlertManagerConfig,
-  someCloudAlertManagerStatus,
-  someGrafanaAlertManagerConfig,
-} from '../../mocks';
-import { mockAlertmanagerChoiceResponse } from '../../mocks/alertmanagerApi';
-import { grafanaNotifiersMock } from '../../mocks/grafana-notifiers';
-import { AlertmanagerProvider } from '../../state/AlertmanagerContext';
-import { getAllDataSources } from '../../utils/config';
-import { ALERTMANAGER_NAME_LOCAL_STORAGE_KEY, ALERTMANAGER_NAME_QUERY_KEY } from '../../utils/constants';
-import { DataSourceType, GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
-
-import Receivers from './ContactPoints.v1';
-
-jest.mock('../../api/alertmanager');
-jest.mock('../../api/grafana');
-jest.mock('../../utils/config');
-jest.mock('app/core/services/context_srv');
-jest.mock('../../api/buildInfo');
-
-const mocks = {
-  getAllDataSources: jest.mocked(getAllDataSources),
-
-  api: {
-    fetchConfig: jest.mocked(fetchAlertManagerConfig),
-    fetchStatus: jest.mocked(fetchStatus),
-    updateConfig: jest.mocked(updateAlertManagerConfig),
-    fetchNotifiers: jest.mocked(fetchNotifiers),
-    testReceivers: jest.mocked(testReceivers),
-    discoverAlertmanagerFeatures: jest.mocked(discoverAlertmanagerFeatures),
-  },
-  hooks: {
-    useGetContactPointsState: jest.spyOn(receiversApi, 'useGetContactPointsState'),
-  },
-  contextSrv: jest.mocked(contextSrv),
-};
-
-const alertmanagerChoiceMockedResponse: AlertmanagersChoiceResponse = {
-  alertmanagersChoice: AlertmanagerChoice.Internal,
-  numExternalAlertmanagers: 0,
-};
-
-const dataSources = {
-  alertManager: mockDataSource({
-    name: 'CloudManager',
-    type: DataSourceType.Alertmanager,
-  }),
-  promAlertManager: mockDataSource<AlertManagerDataSourceJsonData>({
-    name: 'PromManager',
-    type: DataSourceType.Alertmanager,
-    jsonData: {
-      implementation: AlertManagerImplementation.prometheus,
-    },
-  }),
-};
-
-const renderReceivers = (alertManagerSourceName?: string) => {
-  locationService.push('/alerting/notifications');
-
-  return render(
-    <TestProvider>
-      <AlertmanagerProvider accessType="notification" alertmanagerSourceName={alertManagerSourceName}>
-        <Receivers />
-      </AlertmanagerProvider>
-    </TestProvider>
-  );
-};
-
-const ui = {
-  newContactPointButton: byRole('link', { name: /add contact point/i }),
-  saveContactButton: byRole('button', { name: /save contact point/i }),
-  newContactPointIntegrationButton: byRole('button', { name: /add contact point integration/i }),
-  testContactPointButton: byRole('button', { name: /Test/ }),
-  testContactPointModal: byRole('heading', { name: /test contact point/i }),
-  customContactPointOption: byRole('radio', { name: /custom/i }),
-  contactPointAnnotationSelect: (idx: number) => byTestId(`annotation-key-${idx}`),
-  contactPointAnnotationValue: (idx: number) => byTestId(`annotation-value-${idx}`),
-  contactPointLabelKey: (idx: number) => byTestId(`label-key-${idx}`),
-  contactPointLabelValue: (idx: number) => byTestId(`label-value-${idx}`),
-  testContactPoint: byRole('button', { name: /send test notification/i }),
-  cancelButton: byTestId('cancel-button'),
-
-  receiversTable: byTestId('dynamic-table'),
-  templatesTable: byTestId('templates-table'),
-  alertManagerPicker: byTestId('alertmanager-picker'),
-
-  channelFormContainer: byTestId('item-container'),
-
-  contactPointsCollapseToggle: byTestId('collapse-toggle'),
-
-  inputs: {
-    name: byPlaceholderText('Name'),
-    email: {
-      addresses: byLabelText(/Addresses/),
-      toEmails: byLabelText(/To/),
-    },
-    hipchat: {
-      url: byLabelText('Hip Chat Url'),
-      apiKey: byLabelText('API Key'),
-    },
-    slack: {
-      webhookURL: byLabelText(/Webhook URL/i),
-    },
-    webhook: {
-      URL: byLabelText(/The endpoint to send HTTP POST requests to/i),
-    },
-  },
-};
-
-const clickSelectOption = async (selectElement: HTMLElement, optionText: string): Promise<void> => {
-  await userEvent.click(byRole('combobox').get(selectElement));
-  await selectOptionInTest(selectElement, optionText);
-};
-
-document.addEventListener('click', interceptLinkClicks);
-const emptyContactPointsState: ContactPointsState = { receivers: {}, errorCount: 0 };
-
-const useGetGrafanaReceiverTypeCheckerMock = jest.spyOn(grafanaApp, 'useGetGrafanaReceiverTypeChecker');
-
-const server = setupMswServer();
-
-describe('Receivers', () => {
-  beforeEach(() => {
-    server.resetHandlers();
-    jest.resetAllMocks();
-
-    mockApi(server).grafanaNotifiers(grafanaNotifiersMock);
-    mockApi(server).plugins.getPluginSettings(onCallPluginMetaMock);
-
-    useGetGrafanaReceiverTypeCheckerMock.mockReturnValue(() => undefined);
-    mocks.getAllDataSources.mockReturnValue(Object.values(dataSources));
-    mocks.api.fetchNotifiers.mockResolvedValue(grafanaNotifiersMock);
-    mocks.api.discoverAlertmanagerFeatures.mockResolvedValue({ lazyConfigInit: false });
-    mocks.hooks.useGetContactPointsState.mockReturnValue(emptyContactPointsState);
-    setDataSourceSrv(new MockDataSourceSrv(dataSources));
-
-    store.delete(ALERTMANAGER_NAME_LOCAL_STORAGE_KEY);
-
-    grantUserPermissions([
-      AccessControlAction.AlertingNotificationsRead,
-      AccessControlAction.AlertingNotificationsWrite,
-      AccessControlAction.AlertingNotificationsExternalRead,
-      AccessControlAction.AlertingNotificationsExternalWrite,
-    ]);
-  });
-
-  it('Template and receiver tables are rendered, alertmanager can be selected, no notification errors', async () => {
-    mockAlertmanagerChoiceResponse(server, alertmanagerChoiceMockedResponse);
-    mocks.api.fetchConfig.mockImplementation((name) =>
-      Promise.resolve(name === GRAFANA_RULES_SOURCE_NAME ? someGrafanaAlertManagerConfig : someCloudAlertManagerConfig)
-    );
-    renderReceivers();
-
-    // check that by default grafana templates & receivers are fetched rendered in appropriate tables
-    await ui.receiversTable.find();
-    let templatesTable = await ui.templatesTable.find();
-    let templateRows = templatesTable.querySelectorAll('tbody tr');
-    expect(templateRows).toHaveLength(3);
-    expect(templateRows[0]).toHaveTextContent('first template');
-    expect(templateRows[1]).toHaveTextContent('second template');
-    expect(templateRows[2]).toHaveTextContent('third template');
-    let receiverRows = within(screen.getByTestId('dynamic-table')).getAllByTestId('row');
-    expect(receiverRows[0]).toHaveTextContent('default');
-    expect(receiverRows[1]).toHaveTextContent('critical');
-    expect(receiverRows).toHaveLength(2);
-
-    expect(mocks.api.fetchConfig).toHaveBeenCalledTimes(1);
-    expect(mocks.api.fetchConfig).toHaveBeenCalledWith(GRAFANA_RULES_SOURCE_NAME);
-    expect(mocks.api.fetchNotifiers).toHaveBeenCalledTimes(1);
-    expect(locationService.getSearchObject()[ALERTMANAGER_NAME_QUERY_KEY]).toEqual(undefined);
-  });
-
-  it('Grafana receiver can be tested', async () => {
-    mockAlertmanagerChoiceResponse(server, alertmanagerChoiceMockedResponse);
-
-    mocks.api.fetchConfig.mockResolvedValue(someGrafanaAlertManagerConfig);
-
-    renderReceivers();
-
-    // go to new contact point page
-    await userEvent.click(await ui.newContactPointButton.find());
-
-    await byRole('heading', { name: /create contact point/i }).find();
-
-    expect(locationService.getLocation().pathname).toEqual('/alerting/notifications/receivers/new');
-
-    // type in a name for the new receiver
-    await userEvent.type(ui.inputs.name.get(), 'my new receiver');
-
-    // enter some email
-    const email = ui.inputs.email.addresses.get();
-    await userEvent.clear(email);
-    await userEvent.type(email, 'tester@grafana.com');
-
-    // try to test the contact point
-    await userEvent.click(await ui.testContactPointButton.find());
-
-    await waitFor(() => expect(ui.testContactPointModal.get()).toBeInTheDocument(), { timeout: 1000 });
-    await userEvent.click(ui.customContactPointOption.get());
-
-    // enter custom annotations and labels
-    await userEvent.type(screen.getByPlaceholderText('Enter a description...'), 'Test contact point');
-    await userEvent.type(ui.contactPointLabelKey(0).get(), 'foo');
-    await userEvent.type(ui.contactPointLabelValue(0).get(), 'bar');
-    await userEvent.click(ui.testContactPoint.get());
-
-    await waitFor(() => expect(mocks.api.testReceivers).toHaveBeenCalled());
-
-    expect(mocks.api.testReceivers).toHaveBeenCalledWith(
-      'grafana',
-      [
-        {
-          grafana_managed_receiver_configs: [
-            {
-              disableResolveMessage: false,
-              name: 'test',
-              secureSettings: {},
-              settings: { addresses: 'tester@grafana.com', singleEmail: false },
-              type: 'email',
-            },
-          ],
-          name: 'test',
-        },
-      ],
-      { annotations: { description: 'Test contact point' }, labels: { foo: 'bar' } }
-    );
-  });
-
-  it('Grafana receiver can be created', async () => {
-    mockAlertmanagerChoiceResponse(server, alertmanagerChoiceMockedResponse);
-
-    mocks.api.fetchConfig.mockResolvedValue(someGrafanaAlertManagerConfig);
-    mocks.api.updateConfig.mockResolvedValue();
-    renderReceivers();
-
-    // go to new contact point page
-    await userEvent.click(await ui.newContactPointButton.find());
-
-    await byRole('heading', { name: /create contact point/i }).find();
-    expect(locationService.getLocation().pathname).toEqual('/alerting/notifications/receivers/new');
-
-    // type in a name for the new receiver
-    await userEvent.type(byPlaceholderText('Name').get(), 'my new receiver');
-
-    // check that default email form is rendered
-    await ui.inputs.email.addresses.find();
-
-    // select hipchat
-    await clickSelectOption(byTestId('items.0.type').get(), 'HipChat');
-
-    // check that email options are gone and hipchat options appear
-    expect(ui.inputs.email.addresses.query()).not.toBeInTheDocument();
-
-    const urlInput = ui.inputs.hipchat.url.get();
-    const apiKeyInput = ui.inputs.hipchat.apiKey.get();
-
-    await userEvent.type(urlInput, 'http://hipchat');
-    await userEvent.type(apiKeyInput, 'foobarbaz');
-
-    await userEvent.click(await ui.saveContactButton.find());
-
-    // see that we're back to main page and proper api calls have been made
-    await ui.receiversTable.find();
-    expect(mocks.api.updateConfig).toHaveBeenCalledTimes(1);
-    expect(mocks.api.fetchConfig).toHaveBeenCalledTimes(2);
-    expect(locationService.getLocation().pathname).toEqual('/alerting/notifications');
-    expect(mocks.api.updateConfig).toHaveBeenLastCalledWith(GRAFANA_RULES_SOURCE_NAME, {
-      ...someGrafanaAlertManagerConfig,
-      alertmanager_config: {
-        ...someGrafanaAlertManagerConfig.alertmanager_config,
-        receivers: [
-          ...(someGrafanaAlertManagerConfig.alertmanager_config.receivers ?? []),
-          {
-            name: 'my new receiver',
-            grafana_managed_receiver_configs: [
-              {
-                disableResolveMessage: false,
-                name: 'my new receiver',
-                secureSettings: {},
-                settings: {
-                  apiKey: 'foobarbaz',
-                  url: 'http://hipchat',
-                },
-                type: 'hipchat',
-              },
-            ],
-          },
-        ],
-      },
-    });
-  });
-
-  it('Hides create contact point button for users without permission', async () => {
-    mockAlertmanagerChoiceResponse(server, alertmanagerChoiceMockedResponse);
-
-    mocks.api.fetchConfig.mockResolvedValue(someGrafanaAlertManagerConfig);
-    mocks.api.updateConfig.mockResolvedValue();
-    grantUserPermissions([
-      AccessControlAction.AlertingNotificationsRead,
-      AccessControlAction.AlertingNotificationsExternalRead,
-    ]);
-    mocks.hooks.useGetContactPointsState.mockReturnValue(emptyContactPointsState);
-    renderReceivers();
-    await ui.receiversTable.find();
-
-    expect(ui.newContactPointButton.query()).not.toBeInTheDocument();
-  });
-
-  it('Cloud alertmanager receiver can be edited', async () => {
-    mockAlertmanagerChoiceResponse(server, alertmanagerChoiceMockedResponse);
-
-    mocks.api.fetchConfig.mockResolvedValue(someCloudAlertManagerConfig);
-    mocks.api.updateConfig.mockResolvedValue();
-    renderReceivers('CloudManager');
-
-    // click edit button for the receiver
-    await ui.receiversTable.find();
-    const receiverRows = within(screen.getByTestId('dynamic-table')).getAllByTestId('row');
-    expect(receiverRows[0]).toHaveTextContent('cloud-receiver');
-    await userEvent.click(byTestId('edit').get(receiverRows[0]));
-
-    // check that form is open
-    await byRole('heading', { name: /update contact point/i }).find();
-    expect(locationService.getLocation().pathname).toEqual('/alerting/notifications/receivers/cloud-receiver/edit');
-    expect(ui.channelFormContainer.queryAll()).toHaveLength(2);
-
-    // delete the email channel
-    expect(ui.channelFormContainer.queryAll()).toHaveLength(2);
-    await userEvent.click(byTestId('items.0.delete-button').get());
-    expect(ui.channelFormContainer.queryAll()).toHaveLength(1);
-
-    // modify webhook url
-    const slackContainer = ui.channelFormContainer.get();
-    await userEvent.click(byText('Optional Slack settings').get(slackContainer));
-    await userEvent.type(ui.inputs.slack.webhookURL.get(slackContainer), 'http://newgreaturl');
-
-    // add confirm button to action
-    await userEvent.click(byText(/Actions \(1\)/i).get(slackContainer));
-    await userEvent.click(await byTestId('items.1.settings.actions.0.confirm.add-button').find());
-    const confirmSubform = byTestId('items.1.settings.actions.0.confirm.container').get();
-    await userEvent.type(byLabelText('Text').get(confirmSubform), 'confirm this');
-
-    // delete a field
-    await userEvent.click(byText(/Fields \(2\)/i).get(slackContainer));
-    await userEvent.click(byTestId('items.1.settings.fields.0.delete-button').get());
-    byText(/Fields \(1\)/i).get(slackContainer);
-
-    // add another channel
-    await userEvent.click(ui.newContactPointIntegrationButton.get());
-    await clickSelectOption(await byTestId('items.2.type').find(), 'Webhook');
-    await userEvent.type(await ui.inputs.webhook.URL.find(), 'http://webhookurl');
-
-    await userEvent.click(ui.saveContactButton.get());
-
-    // see that we're back to main page and proper api calls have been made
-    await ui.receiversTable.find();
-    expect(mocks.api.updateConfig).toHaveBeenCalledTimes(1);
-    expect(mocks.api.fetchConfig).toHaveBeenCalledTimes(2);
-
-    expect(locationService.getLocation().pathname).toEqual('/alerting/notifications');
-    expect(mocks.api.updateConfig).toHaveBeenLastCalledWith('CloudManager', {
-      ...someCloudAlertManagerConfig,
-      alertmanager_config: {
-        ...someCloudAlertManagerConfig.alertmanager_config,
-        receivers: [
-          {
-            name: 'cloud-receiver',
-            slack_configs: [
-              {
-                actions: [
-                  {
-                    confirm: {
-                      text: 'confirm this',
-                    },
-                    text: 'action1text',
-                    type: 'action1type',
-                    url: 'http://action1',
-                  },
-                ],
-                api_url: 'http://slack1http://newgreaturl',
-                channel: '#mychannel',
-                fields: [
-                  {
-                    short: false,
-                    title: 'field2',
-                    value: 'text2',
-                  },
-                ],
-                link_names: false,
-                send_resolved: false,
-                short_fields: false,
-              },
-            ],
-            webhook_configs: [
-              {
-                send_resolved: true,
-                url: 'http://webhookurl',
-              },
-            ],
-          },
-        ],
-      },
-    });
-  });
-
-  it('Prometheus Alertmanager receiver cannot be edited', async () => {
-    mockAlertmanagerChoiceResponse(server, alertmanagerChoiceMockedResponse);
-
-    mocks.api.fetchStatus.mockResolvedValue({
-      ...someCloudAlertManagerStatus,
-      config: someCloudAlertManagerConfig.alertmanager_config,
-    });
-    renderReceivers(dataSources.promAlertManager.name);
-
-    await ui.receiversTable.find();
-    // there's no templates table for vanilla prom, API does not return templates
-    expect(ui.templatesTable.query()).not.toBeInTheDocument();
-
-    // click view button on the receiver
-    const receiverRows = within(screen.getByTestId('dynamic-table')).getAllByTestId('row');
-    expect(receiverRows[0]).toHaveTextContent('cloud-receiver');
-    expect(byTestId('edit').query(receiverRows[0])).not.toBeInTheDocument();
-    await userEvent.click(byTestId('view').get(receiverRows[0]));
-
-    // check that form is open
-    await byRole('heading', { name: /contact point/i }).find();
-    expect(locationService.getLocation().pathname).toEqual('/alerting/notifications/receivers/cloud-receiver/edit');
-
-    const channelForms = ui.channelFormContainer.queryAll();
-    expect(channelForms).toHaveLength(2);
-
-    // check that inputs are disabled and there is no save button
-    expect(ui.inputs.name.queryAll()[0]).toHaveAttribute('readonly');
-    expect(ui.inputs.email.toEmails.get(channelForms[0])).toHaveAttribute('readonly');
-    expect(ui.inputs.slack.webhookURL.get(channelForms[1])).toHaveAttribute('readonly');
-    expect(ui.newContactPointButton.query()).not.toBeInTheDocument();
-    expect(ui.testContactPointButton.query()).not.toBeInTheDocument();
-    expect(ui.saveContactButton.query()).not.toBeInTheDocument();
-    expect(ui.cancelButton.query()).toBeInTheDocument();
-
-    expect(mocks.api.fetchConfig).not.toHaveBeenCalled();
-    expect(mocks.api.fetchStatus).toHaveBeenCalledTimes(1);
-  });
-
-  it('Loads config from status endpoint if there is no user config', async () => {
-    mockAlertmanagerChoiceResponse(server, alertmanagerChoiceMockedResponse);
-    // loading an empty config with make it fetch config from status endpoint
-    mocks.api.fetchConfig.mockResolvedValue({
-      template_files: {},
-      alertmanager_config: {},
-    });
-    mocks.api.fetchStatus.mockResolvedValue(someCloudAlertManagerStatus);
-    renderReceivers('CloudManager');
-
-    // check that receiver from the default config is represented
-    await ui.receiversTable.find();
-    const receiverRows = within(screen.getByTestId('dynamic-table')).getAllByTestId('row');
-    expect(receiverRows[0]).toHaveTextContent('default-email');
-
-    // check that both config and status endpoints were called
-    expect(mocks.api.fetchConfig).toHaveBeenCalledTimes(1);
-    expect(mocks.api.fetchConfig).toHaveBeenLastCalledWith('CloudManager');
-    expect(mocks.api.fetchStatus).toHaveBeenCalledTimes(1);
-    expect(mocks.api.fetchStatus).toHaveBeenLastCalledWith('CloudManager');
-  });
-
-  it('Shows an empty config when config returns an error and the AM supports lazy config initialization', async () => {
-    mockAlertmanagerChoiceResponse(server, alertmanagerChoiceMockedResponse);
-
-    mocks.api.discoverAlertmanagerFeatures.mockResolvedValue({ lazyConfigInit: true });
-    mocks.api.fetchConfig.mockRejectedValue({ message: 'alertmanager storage object not found' });
-
-    renderReceivers('CloudManager');
-
-    const templatesTable = await ui.templatesTable.find();
-    const receiversTable = await ui.receiversTable.find();
-
-    expect(templatesTable).toBeInTheDocument();
-    expect(receiversTable).toBeInTheDocument();
-  });
-
-  describe('Contact points health', () => {
-    it('Should render error notifications when there are some points state ', async () => {
-      mockAlertmanagerChoiceResponse(server, alertmanagerChoiceMockedResponse);
-      mocks.api.fetchConfig.mockResolvedValue(someGrafanaAlertManagerConfig);
-      mocks.api.updateConfig.mockResolvedValue();
-
-      const receiversMock: ContactPointsState = {
-        receivers: {
-          default: {
-            active: true,
-            notifiers: {
-              email: [
-                {
-                  lastNotifyAttemptError:
-                    'establish connection to server: dial tcp: lookup smtp.example.org on 8.8.8.8:53: no such host',
-                  lastNotifyAttempt: '2022-09-19T15:34:40.696Z',
-                  lastNotifyAttemptDuration: '117.2455ms',
-                  name: 'email[0]',
-                },
-              ],
-            },
-            errorCount: 1,
-          },
-          critical: {
-            active: true,
-            notifiers: {
-              slack: [
-                {
-                  lastNotifyAttempt: '2022-09-19T15:34:40.696Z',
-                  lastNotifyAttemptDuration: '117.2455ms',
-                  name: 'slack[0]',
-                },
-              ],
-              pagerduty: [
-                {
-                  lastNotifyAttempt: '2022-09-19T15:34:40.696Z',
-                  lastNotifyAttemptDuration: '117.2455ms',
-                  name: 'pagerduty',
-                },
-              ],
-            },
-            errorCount: 0,
-          },
-        },
-        errorCount: 1,
-      };
-
-      mocks.hooks.useGetContactPointsState.mockReturnValue(receiversMock);
-      renderReceivers();
-
-      //
-      await ui.receiversTable.find();
-
-      const receiverRows = within(screen.getByTestId('dynamic-table')).getAllByTestId('row');
-      expect(receiverRows[0]).toHaveTextContent('1 error');
-      expect(receiverRows[1]).not.toHaveTextContent('error');
-      expect(receiverRows[1]).toHaveTextContent('OK');
-
-      //should show error in contact points when expanding
-      // expand contact point detail for default 2 emails - 2 errors
-      await userEvent.click(ui.contactPointsCollapseToggle.get(receiverRows[0]));
-      const defaultDetailTable = screen.getAllByTestId('dynamic-table')[1];
-      expect(byText('Error').getAll(defaultDetailTable)).toHaveLength(1);
-
-      // expand contact point detail for slack and pagerduty - 0 errors
-      await userEvent.click(ui.contactPointsCollapseToggle.get(receiverRows[1]));
-      const criticalDetailTable = screen.getAllByTestId('dynamic-table')[2];
-      expect(byText('Error').query(criticalDetailTable)).toBeNull();
-      expect(byText('OK').getAll(criticalDetailTable)).toHaveLength(2);
-    });
-    it('Should render no attempt message when there are some points state with null lastNotifyAttempt, and "-" in null values', async () => {
-      mockAlertmanagerChoiceResponse(server, alertmanagerChoiceMockedResponse);
-      mocks.api.fetchConfig.mockResolvedValue(someGrafanaAlertManagerConfig);
-      mocks.api.updateConfig.mockResolvedValue();
-
-      const receiversMock: ContactPointsState = {
-        receivers: {
-          default: {
-            active: true,
-            notifiers: {
-              email: [
-                {
-                  lastNotifyAttemptError:
-                    'establish connection to server: dial tcp: lookup smtp.example.org on 8.8.8.8:53: no such host',
-                  lastNotifyAttempt: '2022-09-19T15:34:40.696Z',
-                  lastNotifyAttemptDuration: '117.2455ms',
-                  name: 'email[0]',
-                },
-              ],
-            },
-            errorCount: 1,
-          },
-          critical: {
-            active: true,
-            notifiers: {
-              slack: [
-                {
-                  lastNotifyAttempt: '0001-01-01T00:00:00.000Z',
-                  lastNotifyAttemptDuration: '0s',
-                  name: 'slack[0]',
-                },
-              ],
-              pagerduty: [
-                {
-                  lastNotifyAttempt: '2022-09-19T15:34:40.696Z',
-                  lastNotifyAttemptDuration: '117.2455ms',
-                  name: 'pagerduty',
-                },
-              ],
-            },
-            errorCount: 0,
-          },
-        },
-        errorCount: 1,
-      };
-
-      mocks.hooks.useGetContactPointsState.mockReturnValue(receiversMock);
-      renderReceivers();
-
-      //
-      await ui.receiversTable.find();
-
-      const receiverRows = within(screen.getByTestId('dynamic-table')).getAllByTestId('row');
-      expect(receiverRows[0]).toHaveTextContent('1 error');
-      expect(receiverRows[1]).not.toHaveTextContent('error');
-      expect(receiverRows[1]).toHaveTextContent('No attempts');
-
-      //should show error in contact points when expanding
-      // expand contact point detail for default 2 emails - 2 errors
-      await userEvent.click(ui.contactPointsCollapseToggle.get(receiverRows[0]));
-      const defaultDetailTable = screen.getAllByTestId('dynamic-table')[1];
-      expect(byText('Error').getAll(defaultDetailTable)).toHaveLength(1);
-
-      // expand contact point detail for slack and pagerduty - 0 errors
-      await userEvent.click(ui.contactPointsCollapseToggle.get(receiverRows[1]));
-      const criticalDetailTableRows = within(screen.getAllByTestId('dynamic-table')[2]).getAllByTestId('row');
-      // should render slack item with no attempt
-      expect(criticalDetailTableRows[0]).toHaveTextContent('No attempt');
-      expect(criticalDetailTableRows[0]).toHaveTextContent('--');
-      //should render pagerduty with no attempt
-      expect(criticalDetailTableRows[1]).toHaveTextContent('OK');
-      expect(criticalDetailTableRows[1]).toHaveTextContent('117.2455ms');
-    });
-
-    it('Should not render error notifications when fetching contact points state raises 404 error ', async () => {
-      mockAlertmanagerChoiceResponse(server, alertmanagerChoiceMockedResponse);
-      mocks.api.fetchConfig.mockResolvedValue(someGrafanaAlertManagerConfig);
-      mocks.api.updateConfig.mockResolvedValue();
-
-      mocks.hooks.useGetContactPointsState.mockReturnValue(emptyContactPointsState);
-      renderReceivers();
-
-      await ui.receiversTable.find();
-      //contact points are not expandable
-      expect(ui.contactPointsCollapseToggle.query()).not.toBeInTheDocument();
-      //should render receivers, only one dynamic table
-      let receiverRows = within(screen.getByTestId('dynamic-table')).getAllByTestId('row');
-      expect(receiverRows[0]).toHaveTextContent('default');
-      expect(receiverRows[1]).toHaveTextContent('critical');
-      expect(receiverRows).toHaveLength(2);
-    });
-
-    it('Should render "Unused" warning if a contact point is not used in route configuration', async () => {
-      mockAlertmanagerChoiceResponse(server, alertmanagerChoiceMockedResponse);
-      mocks.api.updateConfig.mockResolvedValue();
-      mocks.api.fetchConfig.mockResolvedValue({
-        ...someGrafanaAlertManagerConfig,
-        alertmanager_config: { ...someGrafanaAlertManagerConfig.alertmanager_config, route: { receiver: 'default' } },
-      });
-
-      mocks.hooks.useGetContactPointsState.mockReturnValue(emptyContactPointsState);
-      renderReceivers();
-
-      await ui.receiversTable.find();
-      //contact points are not expandable
-      expect(ui.contactPointsCollapseToggle.query()).not.toBeInTheDocument();
-      //should render receivers, only one dynamic table
-      let receiverRows = within(screen.getByTestId('dynamic-table')).getAllByTestId('row');
-
-      expect(receiverRows).toHaveLength(2);
-      expect(receiverRows[0]).toHaveTextContent('default');
-      expect(receiverRows[1]).toHaveTextContent('critical');
-      expect(receiverRows[1]).toHaveTextContent('Unused');
-    });
-  });
-});
diff --git a/public/app/features/alerting/unified/components/contact-points/ContactPoints.v1.tsx b/public/app/features/alerting/unified/components/contact-points/ContactPoints.v1.tsx
deleted file mode 100644
index 72b8b78fef8b4..0000000000000
--- a/public/app/features/alerting/unified/components/contact-points/ContactPoints.v1.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-import React, { useEffect } from 'react';
-import { Route, RouteChildrenProps, Switch } from 'react-router-dom';
-
-import { Alert, LoadingPlaceholder } from '@grafana/ui';
-import { useDispatch } from 'app/types';
-
-import { useAlertmanagerConfig } from '../../hooks/useAlertmanagerConfig';
-import { useUnifiedAlertingSelector } from '../../hooks/useUnifiedAlertingSelector';
-import { useAlertmanager } from '../../state/AlertmanagerContext';
-import { fetchGrafanaNotifiersAction } from '../../state/actions';
-import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
-import { GrafanaAlertmanagerDeliveryWarning } from '../GrafanaAlertmanagerDeliveryWarning';
-import { DuplicateTemplateView } from '../receivers/DuplicateTemplateView';
-import { EditReceiverView } from '../receivers/EditReceiverView';
-import { EditTemplateView } from '../receivers/EditTemplateView';
-import { GlobalConfigForm } from '../receivers/GlobalConfigForm';
-import { NewReceiverView } from '../receivers/NewReceiverView';
-import { NewTemplateView } from '../receivers/NewTemplateView';
-import { ReceiversAndTemplatesView } from '../receivers/ReceiversAndTemplatesView';
-
-export interface NotificationErrorProps {
-  errorCount: number;
-}
-
-const Receivers = () => {
-  const { selectedAlertmanager: alertManagerSourceName } = useAlertmanager();
-  const dispatch = useDispatch();
-  const { currentData: config, isLoading: loading, error } = useAlertmanagerConfig(alertManagerSourceName);
-
-  const receiverTypes = useUnifiedAlertingSelector((state) => state.grafanaNotifiers);
-
-  useEffect(() => {
-    if (
-      alertManagerSourceName === GRAFANA_RULES_SOURCE_NAME &&
-      !(receiverTypes.result || receiverTypes.loading || receiverTypes.error)
-    ) {
-      dispatch(fetchGrafanaNotifiersAction());
-    }
-  }, [alertManagerSourceName, dispatch, receiverTypes]);
-
-  if (!alertManagerSourceName) {
-    return null;
-  }
-
-  return (
-    <>
-      {error && !loading && (
-        <Alert severity="error" title="Error loading Alertmanager config">
-          {error.message || 'Unknown error.'}
-        </Alert>
-      )}
-      <GrafanaAlertmanagerDeliveryWarning currentAlertmanager={alertManagerSourceName} />
-      {loading && !config && <LoadingPlaceholder text="loading configuration..." />}
-      {config && !error && (
-        <Switch>
-          <Route exact={true} path="/alerting/notifications">
-            <ReceiversAndTemplatesView config={config} alertManagerName={alertManagerSourceName} />
-          </Route>
-          <Route exact={true} path="/alerting/notifications/templates/new">
-            <NewTemplateView config={config} alertManagerSourceName={alertManagerSourceName} />
-          </Route>
-          <Route exact={true} path="/alerting/notifications/templates/:name/duplicate">
-            {({ match }: RouteChildrenProps<{ name: string }>) =>
-              match?.params.name && (
-                <DuplicateTemplateView
-                  alertManagerSourceName={alertManagerSourceName}
-                  config={config}
-                  templateName={decodeURIComponent(match?.params.name)}
-                />
-              )
-            }
-          </Route>
-          <Route exact={true} path="/alerting/notifications/templates/:name/edit">
-            {({ match }: RouteChildrenProps<{ name: string }>) =>
-              match?.params.name && (
-                <EditTemplateView
-                  alertManagerSourceName={alertManagerSourceName}
-                  config={config}
-                  templateName={decodeURIComponent(match?.params.name)}
-                />
-              )
-            }
-          </Route>
-          <Route exact={true} path="/alerting/notifications/receivers/new">
-            <NewReceiverView config={config} alertManagerSourceName={alertManagerSourceName} />
-          </Route>
-          <Route exact={true} path="/alerting/notifications/receivers/:name/edit">
-            {({ match }: RouteChildrenProps<{ name: string }>) =>
-              match?.params.name && (
-                <EditReceiverView
-                  alertManagerSourceName={alertManagerSourceName}
-                  config={config}
-                  receiverName={decodeURIComponent(match?.params.name)}
-                />
-              )
-            }
-          </Route>
-          <Route exact={true} path="/alerting/notifications/global-config">
-            <GlobalConfigForm config={config} alertManagerSourceName={alertManagerSourceName} />
-          </Route>
-        </Switch>
-      )}
-    </>
-  );
-};
-
-export default Receivers;
diff --git a/public/app/features/alerting/unified/components/contact-points/ContactPoints.v2.test.tsx b/public/app/features/alerting/unified/components/contact-points/ContactPoints.v2.test.tsx
deleted file mode 100644
index 87ba1ca634ce8..0000000000000
--- a/public/app/features/alerting/unified/components/contact-points/ContactPoints.v2.test.tsx
+++ /dev/null
@@ -1,171 +0,0 @@
-import { render, screen, waitFor, waitForElementToBeRemoved } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { noop } from 'lodash';
-import React, { PropsWithChildren } from 'react';
-import { TestProvider } from 'test/helpers/TestProvider';
-
-import { selectors } from '@grafana/e2e-selectors';
-import { AccessControlAction } from 'app/types';
-
-import { grantUserPermissions, mockDataSource } from '../../mocks';
-import { AlertmanagerProvider } from '../../state/AlertmanagerContext';
-import { setupDataSources } from '../../testSetup/datasources';
-import { DataSourceType } from '../../utils/datasource';
-
-import ContactPoints, { ContactPoint } from './ContactPoints.v2';
-import setupGrafanaManagedServer from './__mocks__/grafanaManagedServer';
-import setupMimirFlavoredServer, { MIMIR_DATASOURCE_UID } from './__mocks__/mimirFlavoredServer';
-
-/**
- * There are lots of ways in which we test our pages and components. Here's my opinionated approach to testing them.
- *
- *  Use MSW to mock API responses, you can copy the JSON results from the network panel and use them in a __mocks__ folder.
- *
- * 1. Make sure we have "presentation" components we can test without mocking data,
- *    test these if they have some logic in them (hiding / showing things) and sad paths.
- *
- * 2. For testing the "container" components, check if data fetching is working as intended (you can use loading state)
- *    and check if we're not in an error state (although you can test for that too for sad path).
- *
- * 3. Write tests for the hooks we call in the "container" components
- *    if those have any logic or data structure transformations in them.
- */
-describe('ContactPoints', () => {
-  describe('Grafana managed alertmanager', () => {
-    setupGrafanaManagedServer();
-
-    beforeAll(() => {
-      grantUserPermissions([
-        AccessControlAction.AlertingNotificationsRead,
-        AccessControlAction.AlertingNotificationsWrite,
-      ]);
-    });
-
-    it('should show / hide loading states', async () => {
-      render(
-        <AlertmanagerProvider accessType={'notification'}>
-          <ContactPoints />
-        </AlertmanagerProvider>,
-        { wrapper: TestProvider }
-      );
-
-      await waitFor(async () => {
-        expect(screen.getByText('Loading...')).toBeInTheDocument();
-        await waitForElementToBeRemoved(screen.getByText('Loading...'));
-        expect(screen.queryByTestId(selectors.components.Alert.alertV2('error'))).not.toBeInTheDocument();
-      });
-
-      expect(screen.getByText('grafana-default-email')).toBeInTheDocument();
-      expect(screen.getAllByTestId('contact-point')).toHaveLength(4);
-    });
-
-    it('should call delete when clicked and not disabled', async () => {
-      const onDelete = jest.fn();
-
-      render(<ContactPoint name={'my-contact-point'} receivers={[]} onDelete={onDelete} />, {
-        wrapper,
-      });
-
-      const moreActions = screen.getByRole('button', { name: 'more-actions' });
-      await userEvent.click(moreActions);
-
-      const deleteButton = screen.getByRole('menuitem', { name: /delete/i });
-      await userEvent.click(deleteButton);
-
-      expect(onDelete).toHaveBeenCalledWith('my-contact-point');
-    });
-
-    it('should disable edit button', async () => {
-      render(<ContactPoint name={'my-contact-point'} disabled={true} receivers={[]} onDelete={noop} />, {
-        wrapper,
-      });
-
-      const moreActions = screen.getByRole('button', { name: 'more-actions' });
-      expect(moreActions).not.toBeDisabled();
-
-      const editAction = screen.getByTestId('edit-action');
-      expect(editAction).toHaveAttribute('aria-disabled', 'true');
-    });
-
-    it('should disable buttons when provisioned', async () => {
-      render(<ContactPoint name={'my-contact-point'} provisioned={true} receivers={[]} onDelete={noop} />, {
-        wrapper,
-      });
-
-      expect(screen.getByText(/provisioned/i)).toBeInTheDocument();
-
-      const editAction = screen.queryByTestId('edit-action');
-      expect(editAction).not.toBeInTheDocument();
-
-      const viewAction = screen.getByRole('link', { name: /view/i });
-      expect(viewAction).toBeInTheDocument();
-
-      const moreActions = screen.getByRole('button', { name: 'more-actions' });
-      expect(moreActions).not.toBeDisabled();
-      await userEvent.click(moreActions);
-
-      const deleteButton = screen.getByRole('menuitem', { name: /delete/i });
-      expect(deleteButton).toBeDisabled();
-    });
-
-    it('should disable delete when contact point is linked to at least one notification policy', async () => {
-      render(
-        <ContactPoint name={'my-contact-point'} provisioned={true} receivers={[]} policies={1} onDelete={noop} />,
-        {
-          wrapper,
-        }
-      );
-
-      expect(screen.getByRole('link', { name: 'is used by 1 notification policy' })).toBeInTheDocument();
-
-      const moreActions = screen.getByRole('button', { name: 'more-actions' });
-      await userEvent.click(moreActions);
-
-      const deleteButton = screen.getByRole('menuitem', { name: /delete/i });
-      expect(deleteButton).toBeDisabled();
-    });
-  });
-
-  describe('Mimir-flavored alertmanager', () => {
-    setupMimirFlavoredServer();
-
-    beforeAll(() => {
-      grantUserPermissions([
-        AccessControlAction.AlertingNotificationsExternalRead,
-        AccessControlAction.AlertingNotificationsExternalWrite,
-      ]);
-      setupDataSources(
-        mockDataSource({
-          type: DataSourceType.Alertmanager,
-          name: MIMIR_DATASOURCE_UID,
-          uid: MIMIR_DATASOURCE_UID,
-        })
-      );
-    });
-
-    it('should show / hide loading states', async () => {
-      render(
-        <AlertmanagerProvider accessType={'notification'} alertmanagerSourceName={MIMIR_DATASOURCE_UID}>
-          <ContactPoints />
-        </AlertmanagerProvider>,
-        { wrapper: TestProvider }
-      );
-
-      await waitFor(async () => {
-        expect(screen.getByText('Loading...')).toBeInTheDocument();
-        await waitForElementToBeRemoved(screen.getByText('Loading...'));
-        expect(screen.queryByTestId(selectors.components.Alert.alertV2('error'))).not.toBeInTheDocument();
-      });
-
-      expect(screen.getByText('mixed')).toBeInTheDocument();
-      expect(screen.getByText('some webhook')).toBeInTheDocument();
-      expect(screen.getAllByTestId('contact-point')).toHaveLength(2);
-    });
-  });
-});
-
-const wrapper = ({ children }: PropsWithChildren) => (
-  <TestProvider>
-    <AlertmanagerProvider accessType={'notification'}>{children}</AlertmanagerProvider>
-  </TestProvider>
-);
diff --git a/public/app/features/alerting/unified/components/contact-points/ContactPoints.v2.tsx b/public/app/features/alerting/unified/components/contact-points/ContactPoints.v2.tsx
deleted file mode 100644
index 0881c8222a4d7..0000000000000
--- a/public/app/features/alerting/unified/components/contact-points/ContactPoints.v2.tsx
+++ /dev/null
@@ -1,602 +0,0 @@
-import { css } from '@emotion/css';
-import { SerializedError } from '@reduxjs/toolkit';
-import { groupBy, size, upperFirst } from 'lodash';
-import pluralize from 'pluralize';
-import React, { Fragment, ReactNode, useCallback, useMemo, useState } from 'react';
-import { Link } from 'react-router-dom';
-import { useToggle } from 'react-use';
-
-import { dateTime, GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import {
-  Alert,
-  Dropdown,
-  Icon,
-  LoadingPlaceholder,
-  Menu,
-  Tooltip,
-  useStyles2,
-  Text,
-  LinkButton,
-  TabsBar,
-  TabContent,
-  Tab,
-  Pagination,
-  Button,
-} from '@grafana/ui';
-import ConditionalWrap from 'app/features/alerting/components/ConditionalWrap';
-import { receiverTypeNames } from 'app/plugins/datasource/alertmanager/consts';
-import { GrafanaManagedReceiverConfig } from 'app/plugins/datasource/alertmanager/types';
-import { GrafanaNotifierType, NotifierStatus } from 'app/types/alerting';
-
-import { AlertmanagerAction, useAlertmanagerAbility } from '../../hooks/useAbilities';
-import { usePagination } from '../../hooks/usePagination';
-import { useAlertmanager } from '../../state/AlertmanagerContext';
-import { INTEGRATION_ICONS } from '../../types/contact-points';
-import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
-import { createUrl } from '../../utils/url';
-import { GrafanaAlertmanagerDeliveryWarning } from '../GrafanaAlertmanagerDeliveryWarning';
-import { MetaText } from '../MetaText';
-import MoreButton from '../MoreButton';
-import { ProvisioningBadge } from '../Provisioning';
-import { Spacer } from '../Spacer';
-import { Strong } from '../Strong';
-import { GrafanaReceiverExporter } from '../export/GrafanaReceiverExporter';
-import { GrafanaReceiversExporter } from '../export/GrafanaReceiversExporter';
-import { GlobalConfigAlert } from '../receivers/ReceiversAndTemplatesView';
-import { UnusedContactPointBadge } from '../receivers/ReceiversTable';
-import { ReceiverMetadataBadge } from '../receivers/grafanaAppReceivers/ReceiverMetadataBadge';
-import { ReceiverPluginMetadata } from '../receivers/grafanaAppReceivers/useReceiversMetadata';
-
-import { MessageTemplates } from './MessageTemplates';
-import { useDeleteContactPointModal } from './Modals';
-import {
-  RECEIVER_META_KEY,
-  RECEIVER_PLUGIN_META_KEY,
-  RECEIVER_STATUS_KEY,
-  useContactPointsWithStatus,
-  useDeleteContactPoint,
-} from './useContactPoints';
-import { ContactPointWithMetadata, getReceiverDescription, isProvisioned, ReceiverConfigWithMetadata } from './utils';
-
-enum ActiveTab {
-  ContactPoints,
-  MessageTemplates,
-}
-
-const DEFAULT_PAGE_SIZE = 10;
-
-const ContactPoints = () => {
-  const { selectedAlertmanager } = useAlertmanager();
-  // TODO hook up to query params
-  const [activeTab, setActiveTab] = useState<ActiveTab>(ActiveTab.ContactPoints);
-  let { isLoading, error, contactPoints } = useContactPointsWithStatus();
-  const { deleteTrigger, updateAlertmanagerState } = useDeleteContactPoint(selectedAlertmanager!);
-  const [addContactPointSupported, addContactPointAllowed] = useAlertmanagerAbility(
-    AlertmanagerAction.CreateContactPoint
-  );
-  const [exportContactPointsSupported, exportContactPointsAllowed] = useAlertmanagerAbility(
-    AlertmanagerAction.ExportContactPoint
-  );
-
-  const [DeleteModal, showDeleteModal] = useDeleteContactPointModal(deleteTrigger, updateAlertmanagerState.isLoading);
-  const [ExportDrawer, showExportDrawer] = useExportContactPoint();
-
-  const showingContactPoints = activeTab === ActiveTab.ContactPoints;
-  const showingMessageTemplates = activeTab === ActiveTab.MessageTemplates;
-
-  if (error) {
-    // TODO fix this type casting, when error comes from "getContactPointsStatus" it probably won't be a SerializedError
-    return <Alert title="Failed to fetch contact points">{(error as SerializedError).message}</Alert>;
-  }
-
-  const isGrafanaManagedAlertmanager = selectedAlertmanager === GRAFANA_RULES_SOURCE_NAME;
-
-  return (
-    <>
-      <GrafanaAlertmanagerDeliveryWarning currentAlertmanager={selectedAlertmanager!} />
-
-      <Stack direction="column">
-        <TabsBar>
-          <Tab
-            label="Contact Points"
-            active={showingContactPoints}
-            counter={contactPoints.length}
-            onChangeTab={() => setActiveTab(ActiveTab.ContactPoints)}
-          />
-          <Tab
-            label="Message Templates"
-            active={showingMessageTemplates}
-            onChangeTab={() => setActiveTab(ActiveTab.MessageTemplates)}
-          />
-        </TabsBar>
-        <TabContent>
-          <Stack direction="column">
-            <>
-              {isLoading && <LoadingPlaceholder text={'Loading...'} />}
-              {/* Contact Points tab */}
-              {showingContactPoints && (
-                <>
-                  {error ? (
-                    <Alert title="Failed to fetch contact points">{String(error)}</Alert>
-                  ) : (
-                    <>
-                      {/* TODO we can add some additional info here with a ToggleTip */}
-                      <Stack direction="row" alignItems="center">
-                        <Text variant="body" color="secondary">
-                          Define where notifications are sent, a contact point can contain multiple integrations.
-                        </Text>
-                        <Spacer />
-                        <Stack direction="row" gap={1}>
-                          {addContactPointSupported && (
-                            <LinkButton
-                              icon="plus"
-                              variant="primary"
-                              href="/alerting/notifications/receivers/new"
-                              disabled={!addContactPointAllowed}
-                            >
-                              Add contact point
-                            </LinkButton>
-                          )}
-                          {exportContactPointsSupported && (
-                            <Button
-                              icon="download-alt"
-                              variant="secondary"
-                              disabled={!exportContactPointsAllowed}
-                              onClick={() => showExportDrawer(ALL_CONTACT_POINTS)}
-                            >
-                              Export all
-                            </Button>
-                          )}
-                        </Stack>
-                      </Stack>
-                      <ContactPointsList
-                        contactPoints={contactPoints}
-                        pageSize={DEFAULT_PAGE_SIZE}
-                        onDelete={(name) => showDeleteModal(name)}
-                        disabled={updateAlertmanagerState.isLoading}
-                      />
-                      {/* Grafana manager Alertmanager does not support global config, Mimir and Cortex do */}
-                      {!isGrafanaManagedAlertmanager && <GlobalConfigAlert alertManagerName={selectedAlertmanager!} />}
-                    </>
-                  )}
-                </>
-              )}
-              {/* Message Templates tab */}
-              {showingMessageTemplates && (
-                <>
-                  <Stack direction="row" alignItems="center">
-                    <Text variant="body" color="secondary">
-                      Create message templates to customize your notifications.
-                    </Text>
-                    <Spacer />
-                    <LinkButton icon="plus" variant="primary" href="/alerting/notifications/templates/new">
-                      Add message template
-                    </LinkButton>
-                  </Stack>
-                  <MessageTemplates />
-                </>
-              )}
-            </>
-          </Stack>
-        </TabContent>
-      </Stack>
-      {DeleteModal}
-      {ExportDrawer}
-    </>
-  );
-};
-
-interface ContactPointsListProps {
-  contactPoints: ContactPointWithMetadata[];
-  disabled?: boolean;
-  onDelete: (name: string) => void;
-  pageSize?: number;
-}
-
-const ContactPointsList = ({
-  contactPoints,
-  disabled = false,
-  pageSize = DEFAULT_PAGE_SIZE,
-  onDelete,
-}: ContactPointsListProps) => {
-  const { page, pageItems, numberOfPages, onPageChange } = usePagination(contactPoints, 1, pageSize);
-
-  return (
-    <>
-      {pageItems.map((contactPoint, index) => {
-        const provisioned = isProvisioned(contactPoint);
-        const policies = contactPoint.numberOfPolicies;
-
-        return (
-          <ContactPoint
-            key={`${contactPoint.name}-${index}`}
-            name={contactPoint.name}
-            disabled={disabled}
-            onDelete={onDelete}
-            receivers={contactPoint.grafana_managed_receiver_configs}
-            provisioned={provisioned}
-            policies={policies}
-          />
-        );
-      })}
-      <Pagination currentPage={page} numberOfPages={numberOfPages} onNavigate={onPageChange} hideWhenSinglePage />
-    </>
-  );
-};
-
-interface ContactPointProps {
-  name: string;
-  disabled?: boolean;
-  provisioned?: boolean;
-  receivers: ReceiverConfigWithMetadata[];
-  policies?: number;
-  onDelete: (name: string) => void;
-}
-
-export const ContactPoint = ({
-  name,
-  disabled = false,
-  provisioned = false,
-  receivers,
-  policies = 0,
-  onDelete,
-}: ContactPointProps) => {
-  const styles = useStyles2(getStyles);
-
-  // TODO probably not the best way to figure out if we want to show either only the summary or full metadata for the receivers?
-  const showFullMetadata = receivers.some((receiver) => Boolean(receiver[RECEIVER_STATUS_KEY]));
-
-  return (
-    <div className={styles.contactPointWrapper} data-testid="contact-point">
-      <Stack direction="column" gap={0}>
-        <ContactPointHeader
-          name={name}
-          policies={policies}
-          provisioned={provisioned}
-          disabled={disabled}
-          onDelete={onDelete}
-        />
-        {showFullMetadata ? (
-          <div>
-            {receivers.map((receiver, index) => {
-              const diagnostics = receiver[RECEIVER_STATUS_KEY];
-              const metadata = receiver[RECEIVER_META_KEY];
-              const sendingResolved = !Boolean(receiver.disableResolveMessage);
-              const pluginMetadata = receiver[RECEIVER_PLUGIN_META_KEY];
-              const key = metadata.name + index;
-
-              return (
-                <ContactPointReceiver
-                  key={key}
-                  name={metadata.name}
-                  type={receiver.type}
-                  description={getReceiverDescription(receiver)}
-                  diagnostics={diagnostics}
-                  pluginMetadata={pluginMetadata}
-                  sendingResolved={sendingResolved}
-                />
-              );
-            })}
-          </div>
-        ) : (
-          <div>
-            <ContactPointReceiverSummary receivers={receivers} />
-          </div>
-        )}
-      </Stack>
-    </div>
-  );
-};
-
-interface ContactPointHeaderProps {
-  name: string;
-  disabled?: boolean;
-  provisioned?: boolean;
-  policies?: number;
-  onDelete: (name: string) => void;
-}
-
-const ContactPointHeader = (props: ContactPointHeaderProps) => {
-  const { name, disabled = false, provisioned = false, policies = 0, onDelete } = props;
-  const styles = useStyles2(getStyles);
-
-  const [exportSupported, exportAllowed] = useAlertmanagerAbility(AlertmanagerAction.ExportContactPoint);
-  const [editSupported, editAllowed] = useAlertmanagerAbility(AlertmanagerAction.UpdateContactPoint);
-  const [deleteSupported, deleteAllowed] = useAlertmanagerAbility(AlertmanagerAction.UpdateContactPoint);
-
-  const [ExportDrawer, openExportDrawer] = useExportContactPoint();
-
-  const isReferencedByPolicies = policies > 0;
-  const canEdit = editSupported && editAllowed && !provisioned;
-  const canDelete = deleteSupported && deleteAllowed && !provisioned && policies === 0;
-
-  const menuActions: JSX.Element[] = [];
-
-  if (exportSupported) {
-    menuActions.push(
-      <Fragment key="export-contact-point">
-        <Menu.Item
-          icon="download-alt"
-          label="Export"
-          disabled={!exportAllowed}
-          data-testid="export"
-          onClick={() => openExportDrawer(name)}
-        />
-        <Menu.Divider />
-      </Fragment>
-    );
-  }
-
-  if (deleteSupported) {
-    menuActions.push(
-      <ConditionalWrap
-        key="delete-contact-point"
-        shouldWrap={isReferencedByPolicies}
-        wrap={(children) => (
-          <Tooltip content="Contact point is currently in use by one or more notification policies" placement="top">
-            <span>{children}</span>
-          </Tooltip>
-        )}
-      >
-        <Menu.Item
-          label="Delete"
-          icon="trash-alt"
-          destructive
-          disabled={disabled || !canDelete}
-          onClick={() => onDelete(name)}
-        />
-      </ConditionalWrap>
-    );
-  }
-
-  return (
-    <div className={styles.headerWrapper}>
-      <Stack direction="row" alignItems="center" gap={1}>
-        <Stack alignItems="center" gap={1}>
-          <Text variant="body" weight="medium">
-            {name}
-          </Text>
-        </Stack>
-        {isReferencedByPolicies && (
-          <MetaText>
-            <Link to={createUrl('/alerting/routes', { contactPoint: name })}>
-              is used by <Strong>{policies}</Strong> {pluralize('notification policy', policies)}
-            </Link>
-          </MetaText>
-        )}
-        {provisioned && <ProvisioningBadge />}
-        {!isReferencedByPolicies && <UnusedContactPointBadge />}
-        <Spacer />
-        <LinkButton
-          tooltipPlacement="top"
-          tooltip={provisioned ? 'Provisioned contact points cannot be edited in the UI' : undefined}
-          variant="secondary"
-          size="sm"
-          icon={canEdit ? 'pen' : 'eye'}
-          type="button"
-          disabled={disabled}
-          aria-label={`${canEdit ? 'edit' : 'view'}-action`}
-          data-testid={`${canEdit ? 'edit' : 'view'}-action`}
-          href={`/alerting/notifications/receivers/${encodeURIComponent(name)}/edit`}
-        >
-          {canEdit ? 'Edit' : 'View'}
-        </LinkButton>
-        {menuActions.length > 0 && (
-          <Dropdown overlay={<Menu>{menuActions}</Menu>}>
-            <MoreButton />
-          </Dropdown>
-        )}
-      </Stack>
-      {ExportDrawer}
-    </div>
-  );
-};
-
-interface ContactPointReceiverProps {
-  name: string;
-  type: GrafanaNotifierType | string;
-  description?: ReactNode;
-  sendingResolved?: boolean;
-  diagnostics?: NotifierStatus;
-  pluginMetadata?: ReceiverPluginMetadata;
-}
-
-const ContactPointReceiver = (props: ContactPointReceiverProps) => {
-  const { name, type, description, diagnostics, pluginMetadata, sendingResolved = true } = props;
-  const styles = useStyles2(getStyles);
-
-  const iconName = INTEGRATION_ICONS[type];
-  const hasMetadata = diagnostics !== undefined;
-
-  return (
-    <div className={styles.integrationWrapper}>
-      <Stack direction="column" gap={0.5}>
-        <Stack direction="row" alignItems="center" gap={1}>
-          <Stack direction="row" alignItems="center" gap={0.5}>
-            {iconName && <Icon name={iconName} />}
-            {pluginMetadata ? (
-              <ReceiverMetadataBadge metadata={pluginMetadata} />
-            ) : (
-              <Text variant="body" color="primary">
-                {name}
-              </Text>
-            )}
-          </Stack>
-          {description && (
-            <Text variant="bodySmall" color="secondary">
-              {description}
-            </Text>
-          )}
-        </Stack>
-        {hasMetadata && <ContactPointReceiverMetadataRow diagnostics={diagnostics} sendingResolved={sendingResolved} />}
-      </Stack>
-    </div>
-  );
-};
-
-interface ContactPointReceiverMetadata {
-  sendingResolved: boolean;
-  diagnostics: NotifierStatus;
-}
-
-type ContactPointReceiverSummaryProps = {
-  receivers: GrafanaManagedReceiverConfig[];
-};
-
-/**
- * This summary is used when we're dealing with non-Grafana managed alertmanager since they
- * don't have any metadata worth showing other than a summary of what types are configured for the contact point
- */
-const ContactPointReceiverSummary = ({ receivers }: ContactPointReceiverSummaryProps) => {
-  const styles = useStyles2(getStyles);
-  const countByType = groupBy(receivers, (receiver) => receiver.type);
-
-  return (
-    <div className={styles.integrationWrapper}>
-      <Stack direction="column" gap={0}>
-        <Stack direction="row" alignItems="center" gap={1}>
-          {Object.entries(countByType).map(([type, receivers], index) => {
-            const iconName = INTEGRATION_ICONS[type];
-            const receiverName = receiverTypeNames[type] ?? upperFirst(type);
-            const isLastItem = size(countByType) - 1 === index;
-
-            return (
-              <React.Fragment key={type}>
-                <Stack direction="row" alignItems="center" gap={0.5}>
-                  {iconName && <Icon name={iconName} />}
-                  <Text variant="body" color="primary">
-                    {receiverName}
-                    {receivers.length > 1 && <> ({receivers.length})</>}
-                  </Text>
-                </Stack>
-                {!isLastItem && '⋅'}
-              </React.Fragment>
-            );
-          })}
-        </Stack>
-      </Stack>
-    </div>
-  );
-};
-
-const ContactPointReceiverMetadataRow = ({ diagnostics, sendingResolved }: ContactPointReceiverMetadata) => {
-  const styles = useStyles2(getStyles);
-
-  const failedToSend = Boolean(diagnostics.lastNotifyAttemptError);
-  const lastDeliveryAttempt = dateTime(diagnostics.lastNotifyAttempt);
-  const lastDeliveryAttemptDuration = diagnostics.lastNotifyAttemptDuration;
-  const hasDeliveryAttempt = lastDeliveryAttempt.isValid();
-
-  return (
-    <div className={styles.metadataRow}>
-      <Stack direction="row" gap={1}>
-        {/* this is shown when the last delivery failed – we don't show any additional metadata */}
-        {failedToSend ? (
-          <>
-            <MetaText color="error" icon="exclamation-circle">
-              <Tooltip content={diagnostics.lastNotifyAttemptError!}>
-                <span>Last delivery attempt failed</span>
-              </Tooltip>
-            </MetaText>
-          </>
-        ) : (
-          <>
-            {/* this is shown when we have a last delivery attempt */}
-            {hasDeliveryAttempt && (
-              <>
-                <MetaText icon="clock-nine">
-                  Last delivery attempt{' '}
-                  <Tooltip content={lastDeliveryAttempt.toLocaleString()}>
-                    <span>
-                      <Strong>{lastDeliveryAttempt.locale('en').fromNow()}</Strong>
-                    </span>
-                  </Tooltip>
-                </MetaText>
-                <MetaText icon="stopwatch">
-                  took <Strong>{lastDeliveryAttemptDuration}</Strong>
-                </MetaText>
-              </>
-            )}
-            {/* when we have no last delivery attempt */}
-            {!hasDeliveryAttempt && <MetaText icon="clock-nine">No delivery attempts</MetaText>}
-            {/* this is only shown for contact points that only want "firing" updates */}
-            {!sendingResolved && (
-              <MetaText icon="info-circle">
-                Delivering <Strong>only firing</Strong> notifications
-              </MetaText>
-            )}
-          </>
-        )}
-      </Stack>
-    </div>
-  );
-};
-
-const ALL_CONTACT_POINTS = Symbol('all contact points');
-
-type ExportProps = [JSX.Element | null, (receiver: string | typeof ALL_CONTACT_POINTS) => void];
-
-const useExportContactPoint = (): ExportProps => {
-  const [receiverName, setReceiverName] = useState<string | typeof ALL_CONTACT_POINTS | null>(null);
-  const [isExportDrawerOpen, toggleShowExportDrawer] = useToggle(false);
-  const [decryptSecretsSupported, decryptSecretsAllowed] = useAlertmanagerAbility(AlertmanagerAction.DecryptSecrets);
-
-  const canReadSecrets = decryptSecretsSupported && decryptSecretsAllowed;
-
-  const handleClose = useCallback(() => {
-    setReceiverName(null);
-    toggleShowExportDrawer(false);
-  }, [toggleShowExportDrawer]);
-
-  const handleOpen = (receiverName: string | typeof ALL_CONTACT_POINTS) => {
-    setReceiverName(receiverName);
-    toggleShowExportDrawer(true);
-  };
-
-  const drawer = useMemo(() => {
-    if (!receiverName || !isExportDrawerOpen) {
-      return null;
-    }
-
-    if (receiverName === ALL_CONTACT_POINTS) {
-      // use this drawer when we want to export all contact points
-      return <GrafanaReceiversExporter decrypt={canReadSecrets} onClose={handleClose} />;
-    } else {
-      // use this one for exporting a single contact point
-      return <GrafanaReceiverExporter receiverName={receiverName} decrypt={canReadSecrets} onClose={handleClose} />;
-    }
-  }, [canReadSecrets, isExportDrawerOpen, handleClose, receiverName]);
-
-  return [drawer, handleOpen];
-};
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  contactPointWrapper: css({
-    borderRadius: `${theme.shape.radius.default}`,
-    border: `solid 1px ${theme.colors.border.weak}`,
-    borderBottom: 'none',
-  }),
-  integrationWrapper: css({
-    position: 'relative',
-
-    background: `${theme.colors.background.primary}`,
-    padding: `${theme.spacing(1)} ${theme.spacing(1.5)}`,
-
-    borderBottom: `solid 1px ${theme.colors.border.weak}`,
-  }),
-  headerWrapper: css({
-    background: `${theme.colors.background.secondary}`,
-    padding: `${theme.spacing(1)} ${theme.spacing(1.5)}`,
-
-    borderBottom: `solid 1px ${theme.colors.border.weak}`,
-    borderTopLeftRadius: `${theme.shape.radius.default}`,
-    borderTopRightRadius: `${theme.shape.radius.default}`,
-  }),
-  metadataRow: css({
-    borderBottomLeftRadius: `${theme.shape.radius.default}`,
-    borderBottomRightRadius: `${theme.shape.radius.default}`,
-  }),
-});
-
-export default ContactPoints;
diff --git a/public/app/features/alerting/unified/components/contact-points/DuplicateMessageTemplate.tsx b/public/app/features/alerting/unified/components/contact-points/DuplicateMessageTemplate.tsx
index b59d348aac612..4f24ff072b22c 100644
--- a/public/app/features/alerting/unified/components/contact-points/DuplicateMessageTemplate.tsx
+++ b/public/app/features/alerting/unified/components/contact-points/DuplicateMessageTemplate.tsx
@@ -15,7 +15,7 @@ const NewMessageTemplate = ({ match }: Props) => {
 
   const name = match?.params.name;
   if (!name) {
-    return <EntityNotFound entity="Message template" />;
+    return <EntityNotFound entity="Notification template" />;
   }
 
   if (isLoading && !data) {
diff --git a/public/app/features/alerting/unified/components/contact-points/EditMessageTemplate.tsx b/public/app/features/alerting/unified/components/contact-points/EditMessageTemplate.tsx
index b8227ff1bca3c..51b10f92c9823 100644
--- a/public/app/features/alerting/unified/components/contact-points/EditMessageTemplate.tsx
+++ b/public/app/features/alerting/unified/components/contact-points/EditMessageTemplate.tsx
@@ -16,7 +16,7 @@ const EditMessageTemplate = ({ match }: Props) => {
 
   const name = match?.params.name;
   if (!name) {
-    return <EntityNotFound entity="Message template" />;
+    return <EntityNotFound entity="Notification template" />;
   }
 
   if (isLoading && !data) {
@@ -25,7 +25,7 @@ const EditMessageTemplate = ({ match }: Props) => {
 
   if (error) {
     return (
-      <Alert severity="error" title="Failed to fetch message template">
+      <Alert severity="error" title="Failed to fetch notification template">
         {String(error)}
       </Alert>
     );
diff --git a/public/app/features/alerting/unified/components/contact-points/GlobalConfig.tsx b/public/app/features/alerting/unified/components/contact-points/GlobalConfig.tsx
deleted file mode 100644
index c5a453c6ef6b3..0000000000000
--- a/public/app/features/alerting/unified/components/contact-points/GlobalConfig.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-
-import { Alert } from '@grafana/ui';
-
-import { useAlertmanagerConfig } from '../../hooks/useAlertmanagerConfig';
-import { useAlertmanager } from '../../state/AlertmanagerContext';
-import { GlobalConfigForm } from '../receivers/GlobalConfigForm';
-
-const NewMessageTemplate = () => {
-  const { selectedAlertmanager } = useAlertmanager();
-  const { data, isLoading, error } = useAlertmanagerConfig(selectedAlertmanager);
-
-  if (isLoading && !data) {
-    return 'loading...';
-  }
-
-  if (error) {
-    return (
-      <Alert severity="error" title="Failed to fetch message template">
-        {String(error)}
-      </Alert>
-    );
-  }
-
-  if (!data) {
-    return null;
-  }
-
-  return <GlobalConfigForm config={data} alertManagerSourceName={selectedAlertmanager!} />;
-};
-
-export default NewMessageTemplate;
diff --git a/public/app/features/alerting/unified/components/contact-points/MessageTemplates.tsx b/public/app/features/alerting/unified/components/contact-points/MessageTemplates.tsx
deleted file mode 100644
index 415188bc1d6d2..0000000000000
--- a/public/app/features/alerting/unified/components/contact-points/MessageTemplates.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import React from 'react';
-
-import { Alert } from '@grafana/ui';
-
-import { useAlertmanagerConfig } from '../../hooks/useAlertmanagerConfig';
-import { useAlertmanager } from '../../state/AlertmanagerContext';
-import { TemplatesTable } from '../receivers/TemplatesTable';
-
-export const MessageTemplates = () => {
-  const { selectedAlertmanager } = useAlertmanager();
-  const { data, error } = useAlertmanagerConfig(selectedAlertmanager);
-
-  if (error) {
-    return <Alert title="Failed to fetch message templates">{String(error)}</Alert>;
-  }
-
-  if (data) {
-    return <TemplatesTable config={data} alertManagerName={selectedAlertmanager!} />;
-  }
-
-  return null;
-};
diff --git a/public/app/features/alerting/unified/components/contact-points/NewContactPoint.test.tsx b/public/app/features/alerting/unified/components/contact-points/NewContactPoint.test.tsx
new file mode 100644
index 0000000000000..2269eede098d5
--- /dev/null
+++ b/public/app/features/alerting/unified/components/contact-points/NewContactPoint.test.tsx
@@ -0,0 +1,116 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { TestProvider } from 'test/helpers/TestProvider';
+import { byLabelText, byPlaceholderText, byRole, byTestId } from 'testing-library-selector';
+
+import { AccessControlAction } from 'app/types';
+
+import { setupMswServer } from '../../mockApi';
+import { grantUserPermissions } from '../../mocks';
+import { AlertmanagerProvider } from '../../state/AlertmanagerContext';
+
+import NewContactPoint from './NewContactPoint';
+import setupGrafanaManagedServer, {
+  setupSaveEndpointMock,
+  setupTestEndpointMock,
+} from './__mocks__/grafanaManagedServer';
+
+import 'core-js/stable/structured-clone';
+
+const server = setupMswServer();
+const user = userEvent.setup();
+
+beforeEach(() => {
+  grantUserPermissions([AccessControlAction.AlertingNotificationsRead, AccessControlAction.AlertingNotificationsWrite]);
+  setupGrafanaManagedServer(server);
+});
+
+it('should be able to test and save a receiver', async () => {
+  const testMock = setupTestEndpointMock(server);
+  const saveMock = setupSaveEndpointMock(server);
+
+  render(
+    <AlertmanagerProvider accessType={'notification'} alertmanagerSourceName="grafana">
+      <NewContactPoint />
+    </AlertmanagerProvider>,
+    { wrapper: TestProvider }
+  );
+
+  // wait for loading to be done
+  // type in a name for the new receiver
+  await waitFor(() => {
+    user.type(ui.inputs.name.get(), 'my new receiver');
+  });
+
+  // enter some email
+  const email = ui.inputs.email.addresses.get();
+  await user.clear(email);
+  await user.type(email, 'tester@grafana.com');
+
+  // try to test the contact point
+  await user.click(await ui.testContactPointButton.find());
+
+  await waitFor(
+    () => {
+      expect(ui.testContactPointModal.get()).toBeInTheDocument();
+    },
+    { timeout: 1000 }
+  );
+  await user.click(ui.customContactPointOption.get());
+
+  // enter custom annotations and labels
+  await user.type(screen.getByPlaceholderText('Enter a description...'), 'Test contact point');
+  await user.type(ui.contactPointLabelKey(0).get(), 'foo');
+  await user.type(ui.contactPointLabelValue(0).get(), 'bar');
+
+  // click test
+  await user.click(ui.testContactPoint.get());
+
+  // we shouldn't be testing implementation details but when the request is successful
+  // it can't seem to assert on the success toast
+  await waitFor(() => {
+    expect(testMock).toHaveBeenCalled();
+    expect(testMock.mock.lastCall).toMatchSnapshot();
+  });
+
+  await user.click(ui.saveContactButton.get());
+  await waitFor(() => {
+    expect(saveMock).toHaveBeenCalled();
+    expect(saveMock.mock.lastCall).toMatchSnapshot();
+  });
+});
+
+const ui = {
+  saveContactButton: byRole('button', { name: /save contact point/i }),
+  newContactPointIntegrationButton: byRole('button', { name: /add contact point integration/i }),
+  testContactPointButton: byRole('button', { name: /Test/ }),
+  testContactPointModal: byRole('heading', { name: /test contact point/i }),
+  customContactPointOption: byRole('radio', { name: /custom/i }),
+  contactPointAnnotationSelect: (idx: number) => byTestId(`annotation-key-${idx}`),
+  contactPointAnnotationValue: (idx: number) => byTestId(`annotation-value-${idx}`),
+  contactPointLabelKey: (idx: number) => byTestId(`label-key-${idx}`),
+  contactPointLabelValue: (idx: number) => byTestId(`label-value-${idx}`),
+  testContactPoint: byRole('button', { name: /send test notification/i }),
+  cancelButton: byTestId('cancel-button'),
+
+  channelFormContainer: byTestId('item-container'),
+
+  inputs: {
+    name: byPlaceholderText('Name'),
+    email: {
+      addresses: byLabelText(/Addresses/),
+      toEmails: byLabelText(/To/),
+    },
+    hipchat: {
+      url: byLabelText('Hip Chat Url'),
+      apiKey: byLabelText('API Key'),
+    },
+    slack: {
+      webhookURL: byLabelText(/Webhook URL/i),
+    },
+    webhook: {
+      URL: byLabelText(/The endpoint to send HTTP POST requests to/i),
+    },
+  },
+};
diff --git a/public/app/features/alerting/unified/components/contact-points/NewContactPoint.tsx b/public/app/features/alerting/unified/components/contact-points/NewContactPoint.tsx
index e1ca42cbd90bc..0151e2627683b 100644
--- a/public/app/features/alerting/unified/components/contact-points/NewContactPoint.tsx
+++ b/public/app/features/alerting/unified/components/contact-points/NewContactPoint.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import { RouteChildrenProps } from 'react-router-dom';
 
 import { Alert } from '@grafana/ui';
 
@@ -7,7 +6,7 @@ import { useAlertmanagerConfig } from '../../hooks/useAlertmanagerConfig';
 import { useAlertmanager } from '../../state/AlertmanagerContext';
 import { NewReceiverView } from '../receivers/NewReceiverView';
 
-const NewContactPoint = (_props: RouteChildrenProps) => {
+const NewContactPoint = () => {
   const { selectedAlertmanager } = useAlertmanager();
   const { data, isLoading, error } = useAlertmanagerConfig(selectedAlertmanager);
 
diff --git a/public/app/features/alerting/unified/components/contact-points/NewMessageTemplate.tsx b/public/app/features/alerting/unified/components/contact-points/NewMessageTemplate.tsx
index 5a0e658d8327f..fce6ff9505721 100644
--- a/public/app/features/alerting/unified/components/contact-points/NewMessageTemplate.tsx
+++ b/public/app/features/alerting/unified/components/contact-points/NewMessageTemplate.tsx
@@ -16,7 +16,7 @@ const NewMessageTemplate = () => {
 
   if (error) {
     return (
-      <Alert severity="error" title="Failed to fetch message template">
+      <Alert severity="error" title="Failed to fetch notification template">
         {String(error)}
       </Alert>
     );
diff --git a/public/app/features/alerting/unified/components/contact-points/NotificationTemplates.tsx b/public/app/features/alerting/unified/components/contact-points/NotificationTemplates.tsx
new file mode 100644
index 0000000000000..67077810fa905
--- /dev/null
+++ b/public/app/features/alerting/unified/components/contact-points/NotificationTemplates.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+
+import { Alert } from '@grafana/ui';
+
+import { useAlertmanagerConfig } from '../../hooks/useAlertmanagerConfig';
+import { useAlertmanager } from '../../state/AlertmanagerContext';
+import { TemplatesTable } from '../receivers/TemplatesTable';
+
+export const NotificationTemplates = () => {
+  const { selectedAlertmanager } = useAlertmanager();
+  const { data, error } = useAlertmanagerConfig(selectedAlertmanager);
+
+  if (error) {
+    return <Alert title="Failed to fetch notification templates">{String(error)}</Alert>;
+  }
+
+  if (data) {
+    return <TemplatesTable config={data} alertManagerName={selectedAlertmanager!} />;
+  }
+
+  return null;
+};
diff --git a/public/app/features/alerting/unified/components/contact-points/__mocks__/alertmanager.config.mock.json b/public/app/features/alerting/unified/components/contact-points/__mocks__/alertmanager.config.mock.json
index b5d9f3f2c82d1..5bfacc2cdcceb 100644
--- a/public/app/features/alerting/unified/components/contact-points/__mocks__/alertmanager.config.mock.json
+++ b/public/app/features/alerting/unified/components/contact-points/__mocks__/alertmanager.config.mock.json
@@ -1,6 +1,14 @@
 {
   "template_files": {},
   "alertmanager_config": {
+    "route": {
+      "receiver": "grafana-default-email",
+      "routes": [
+        {
+          "receiver": "provisioned-contact-point"
+        }
+      ]
+    },
     "receivers": [
       {
         "name": "grafana-default-email",
diff --git a/public/app/features/alerting/unified/components/contact-points/__mocks__/alertmanager.mimir.config.mock.json b/public/app/features/alerting/unified/components/contact-points/__mocks__/alertmanager.mimir.config.mock.json
index 9bcdc5ce78efb..46501c9a0d507 100644
--- a/public/app/features/alerting/unified/components/contact-points/__mocks__/alertmanager.mimir.config.mock.json
+++ b/public/app/features/alerting/unified/components/contact-points/__mocks__/alertmanager.mimir.config.mock.json
@@ -21,13 +21,9 @@
       "group_wait": "30s",
       "matchers": [],
       "mute_time_intervals": [],
-      "receiver": "email",
+      "receiver": "some webhook",
       "repeat_interval": "5h",
-      "routes": [
-        {
-          "receiver": "mixed"
-        }
-      ]
+      "routes": []
     },
     "templates": []
   }
diff --git a/public/app/features/alerting/unified/components/contact-points/__mocks__/alertmanager.vanilla.mock.json b/public/app/features/alerting/unified/components/contact-points/__mocks__/alertmanager.vanilla.mock.json
new file mode 100644
index 0000000000000..af6b05fd87bf1
--- /dev/null
+++ b/public/app/features/alerting/unified/components/contact-points/__mocks__/alertmanager.vanilla.mock.json
@@ -0,0 +1,70 @@
+{
+  "cluster": {
+    "name": "01HGAVE6N6RG55BZW8N5ZJ12T3",
+    "peers": [{ "address": "172.19.0.6:9094", "name": "01HGAVE6N6RG55BZW8N5ZJ12T3" }],
+    "status": "settling"
+  },
+  "config": {
+    "global": {
+      "resolve_timeout": "5m",
+      "http_config": {
+        "tls_config": { "insecure_skip_verify": false },
+        "follow_redirects": true,
+        "enable_http2": true,
+        "proxy_url": null
+      },
+      "smtp_hello": "localhost",
+      "smtp_smarthost": "",
+      "smtp_require_tls": true,
+      "pagerduty_url": "https://events.pagerduty.com/v2/enqueue",
+      "opsgenie_api_url": "https://api.opsgenie.com/",
+      "wechat_api_url": "https://qyapi.weixin.qq.com/cgi-bin/",
+      "victorops_api_url": "https://alert.victorops.com/integrations/generic/20131114/alert/",
+      "telegram_api_url": "https://api.telegram.org",
+      "webex_api_url": "https://webexapis.com/v1/messages"
+    },
+    "route": {
+      "receiver": "web.hook",
+      "group_by": ["alertname"],
+      "group_wait": "30s",
+      "group_interval": "5m",
+      "repeat_interval": "1h"
+    },
+    "inhibit_rules": [
+      {
+        "source_match": { "severity": "critical" },
+        "target_match": { "severity": "warning" },
+        "equal": ["alertname", "dev", "instance"]
+      }
+    ],
+    "templates": [],
+    "receivers": [
+      {
+        "name": "web.hook",
+        "webhook_configs": [
+          {
+            "send_resolved": true,
+            "http_config": {
+              "tls_config": { "insecure_skip_verify": false },
+              "follow_redirects": true,
+              "enable_http2": true,
+              "proxy_url": null
+            },
+            "url": "\u003csecret\u003e",
+            "url_file": "",
+            "max_alerts": 0
+          }
+        ]
+      }
+    ]
+  },
+  "uptime": "2023-11-28T11:36:10.663Z",
+  "versionInfo": {
+    "branch": "HEAD",
+    "buildDate": "20230824-11:09:02",
+    "buildUser": "root@520df6c16a84",
+    "goVersion": "go1.20.7",
+    "revision": "d7b4f0c7322e7151d6e3b1e31cbc15361e295d8d",
+    "version": "0.26.0"
+  }
+}
diff --git a/public/app/features/alerting/unified/components/contact-points/__mocks__/grafanaManagedServer.ts b/public/app/features/alerting/unified/components/contact-points/__mocks__/grafanaManagedServer.ts
index 72116c2598f5d..54666de1aa539 100644
--- a/public/app/features/alerting/unified/components/contact-points/__mocks__/grafanaManagedServer.ts
+++ b/public/app/features/alerting/unified/components/contact-points/__mocks__/grafanaManagedServer.ts
@@ -1,29 +1,29 @@
-import { rest } from 'msw';
+import 'whatwg-fetch';
+import { http, HttpResponse } from 'msw';
+import { SetupServer } from 'msw/node';
 
 import { AlertmanagerChoice, AlertManagerCortexConfig } from 'app/plugins/datasource/alertmanager/types';
 import { ReceiversStateDTO } from 'app/types';
 
-import { mockApi, setupMswServer } from '../../../mockApi';
+import { mockApi } from '../../../mockApi';
 import { mockAlertmanagerChoiceResponse } from '../../../mocks/alertmanagerApi';
 import { grafanaNotifiersMock } from '../../../mocks/grafana-notifiers';
 
 import alertmanagerMock from './alertmanager.config.mock.json';
 import receiversMock from './receivers.mock.json';
 
-export default () => {
-  const server = setupMswServer();
-
+export default (server: SetupServer) => {
   server.use(
     // this endpoint is a grafana built-in alertmanager
-    rest.get('/api/alertmanager/grafana/config/api/v1/alerts', (_req, res, ctx) =>
-      res(ctx.json<AlertManagerCortexConfig>(alertmanagerMock))
+    http.get('/api/alertmanager/grafana/config/api/v1/alerts', () =>
+      HttpResponse.json<AlertManagerCortexConfig>(alertmanagerMock)
     ),
     // this endpoint is only available for the built-in alertmanager
-    rest.get('/api/alertmanager/grafana/config/api/v1/receivers', (_req, res, ctx) =>
-      res(ctx.json<ReceiversStateDTO[]>(receiversMock))
+    http.get('/api/alertmanager/grafana/config/api/v1/receivers', () =>
+      HttpResponse.json<ReceiversStateDTO[]>(receiversMock)
     ),
     // this endpoint will respond if the OnCall plugin is installed
-    rest.get('/api/plugins/grafana-oncall-app/settings', (_req, res, ctx) => res(ctx.status(404)))
+    http.get('/api/plugins/grafana-oncall-app/settings', () => HttpResponse.json({}, { status: 404 }))
   );
 
   // this endpoint is for rendering the "additional AMs to configure" warning
@@ -37,3 +37,45 @@ export default () => {
 
   return server;
 };
+
+export const setupTestEndpointMock = (server: SetupServer) => {
+  const mock = jest.fn();
+
+  server.use(
+    http.post(
+      '/api/alertmanager/grafana/config/api/v1/receivers/test',
+      async ({ request }) => {
+        const requestBody = await request.json();
+        mock(requestBody);
+
+        return HttpResponse.json({});
+      },
+      {
+        once: true,
+      }
+    )
+  );
+
+  return mock;
+};
+
+export const setupSaveEndpointMock = (server: SetupServer) => {
+  const mock = jest.fn();
+
+  server.use(
+    http.post(
+      '/api/alertmanager/grafana/config/api/v1/alerts',
+      async ({ request }) => {
+        const requestBody = await request.json();
+        mock(requestBody);
+
+        return HttpResponse.json({});
+      },
+      {
+        once: true,
+      }
+    )
+  );
+
+  return mock;
+};
diff --git a/public/app/features/alerting/unified/components/contact-points/__mocks__/mimirFlavoredServer.ts b/public/app/features/alerting/unified/components/contact-points/__mocks__/mimirFlavoredServer.ts
index f27d795cf6cac..adbed73cb486a 100644
--- a/public/app/features/alerting/unified/components/contact-points/__mocks__/mimirFlavoredServer.ts
+++ b/public/app/features/alerting/unified/components/contact-points/__mocks__/mimirFlavoredServer.ts
@@ -1,25 +1,31 @@
-import { rest } from 'msw';
+import 'whatwg-fetch';
+import { http, HttpResponse } from 'msw';
+import { SetupServer } from 'msw/lib/node';
 
 import { AlertManagerCortexConfig } from 'app/plugins/datasource/alertmanager/types';
 
-import { setupMswServer } from '../../../mockApi';
-
 import mimirAlertmanagerMock from './alertmanager.mimir.config.mock.json';
 
 // this one emulates a mimir server setup
 export const MIMIR_DATASOURCE_UID = 'mimir';
 
-export default () => {
-  const server = setupMswServer();
-
+export default (server: SetupServer) => {
   server.use(
-    rest.get(`/api/alertmanager/${MIMIR_DATASOURCE_UID}/config/api/v1/alerts`, (_req, res, ctx) =>
-      res(ctx.json<AlertManagerCortexConfig>(mimirAlertmanagerMock))
+    http.get(`/api/alertmanager/${MIMIR_DATASOURCE_UID}/config/api/v1/alerts`, () =>
+      HttpResponse.json(mimirAlertmanagerMock)
     ),
-    rest.get(`/api/datasources/proxy/uid/${MIMIR_DATASOURCE_UID}/api/v1/status/buildinfo`, (_req, res, ctx) =>
-      res(ctx.status(404))
+    http.get(`/api/datasources/proxy/uid/${MIMIR_DATASOURCE_UID}/api/v1/status/buildinfo`, () =>
+      HttpResponse.json<AlertManagerCortexConfig>(
+        {
+          template_files: {},
+          alertmanager_config: {},
+        },
+        { status: 404 }
+      )
     ),
     // this endpoint will respond if the OnCall plugin is installed
-    rest.get('/api/plugins/grafana-oncall-app/settings', (_req, res, ctx) => res(ctx.status(404)))
+    http.get('/api/plugins/grafana-oncall-app/settings', () => HttpResponse.json({}, { status: 404 }))
   );
+
+  return server;
 };
diff --git a/public/app/features/alerting/unified/components/contact-points/__mocks__/server.ts b/public/app/features/alerting/unified/components/contact-points/__mocks__/server.ts
deleted file mode 100644
index 951a7bc1eff3c..0000000000000
--- a/public/app/features/alerting/unified/components/contact-points/__mocks__/server.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { rest } from 'msw';
-
-import { AlertManagerCortexConfig } from 'app/plugins/datasource/alertmanager/types';
-import { ReceiversStateDTO } from 'app/types';
-
-import { setupMswServer } from '../../../mockApi';
-
-import alertmanagerMock from './alertmanager.config.mock.json';
-import receiversMock from './receivers.mock.json';
-
-const server = setupMswServer();
-
-server.use(
-  // this endpoint is a grafana built-in alertmanager
-  rest.get('/api/alertmanager/grafana/config/api/v1/alerts', (_req, res, ctx) =>
-    res(ctx.json<AlertManagerCortexConfig>(alertmanagerMock))
-  ),
-  // this endpoint is only available for the built-in alertmanager
-  rest.get('/api/alertmanager/grafana/config/api/v1/receivers', (_req, res, ctx) =>
-    res(ctx.json<ReceiversStateDTO[]>(receiversMock))
-  )
-);
-
-export default server;
diff --git a/public/app/features/alerting/unified/components/contact-points/__mocks__/vanillaAlertmanagerServer.ts b/public/app/features/alerting/unified/components/contact-points/__mocks__/vanillaAlertmanagerServer.ts
new file mode 100644
index 0000000000000..6c4943e28a2c0
--- /dev/null
+++ b/public/app/features/alerting/unified/components/contact-points/__mocks__/vanillaAlertmanagerServer.ts
@@ -0,0 +1,22 @@
+import 'whatwg-fetch';
+import { http, HttpResponse } from 'msw';
+import { SetupServer } from 'msw/lib/node';
+
+import { AlertmanagerStatus } from 'app/plugins/datasource/alertmanager/types';
+
+import vanillaAlertManagerConfig from './alertmanager.vanilla.mock.json';
+
+// this one emulates a mimir server setup
+export const VANILLA_ALERTMANAGER_DATASOURCE_UID = 'alertmanager';
+
+export default (server: SetupServer) => {
+  server.use(
+    http.get(`/api/alertmanager/${VANILLA_ALERTMANAGER_DATASOURCE_UID}/api/v2/status`, () =>
+      HttpResponse.json<AlertmanagerStatus>(vanillaAlertManagerConfig)
+    ),
+    // this endpoint will respond if the OnCall plugin is installed
+    http.get('/api/plugins/grafana-oncall-app/settings', () => HttpResponse.json({}, { status: 404 }))
+  );
+
+  return server;
+};
diff --git a/public/app/features/alerting/unified/components/contact-points/__snapshots__/NewContactPoint.test.tsx.snap b/public/app/features/alerting/unified/components/contact-points/__snapshots__/NewContactPoint.test.tsx.snap
new file mode 100644
index 0000000000000..028e88fcac99e
--- /dev/null
+++ b/public/app/features/alerting/unified/components/contact-points/__snapshots__/NewContactPoint.test.tsx.snap
@@ -0,0 +1,147 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`should be able to test and save a receiver 1`] = `
+[
+  {
+    "alert": {
+      "annotations": {
+        "description": "Test contact point",
+      },
+      "labels": {
+        "foo": "bar",
+      },
+    },
+    "receivers": [
+      {
+        "grafana_managed_receiver_configs": [
+          {
+            "disableResolveMessage": false,
+            "name": "test",
+            "secureSettings": {},
+            "settings": {
+              "addresses": "nteews treerc@egirvaefrana.com",
+              "singleEmail": false,
+            },
+            "type": "email",
+          },
+        ],
+        "name": "test",
+      },
+    ],
+  },
+]
+`;
+
+exports[`should be able to test and save a receiver 2`] = `
+[
+  {
+    "alertmanager_config": {
+      "receivers": [
+        {
+          "grafana_managed_receiver_configs": [
+            {
+              "disableResolveMessage": false,
+              "name": "grafana-default-email",
+              "secureFields": {},
+              "settings": {
+                "addresses": "gilles.demey@grafana.com",
+                "singleEmail": false,
+              },
+              "type": "email",
+              "uid": "xeKQrBrnk",
+            },
+          ],
+          "name": "grafana-default-email",
+        },
+        {
+          "grafana_managed_receiver_configs": [
+            {
+              "disableResolveMessage": false,
+              "name": "provisioned-contact-point",
+              "provenance": "api",
+              "secureFields": {},
+              "settings": {
+                "addresses": "gilles.demey@grafana.com",
+                "singleEmail": false,
+              },
+              "type": "email",
+              "uid": "s8SdCVjnk",
+            },
+          ],
+          "name": "provisioned-contact-point",
+        },
+        {
+          "grafana_managed_receiver_configs": [
+            {
+              "disableResolveMessage": false,
+              "name": "lotsa-emails",
+              "secureFields": {},
+              "settings": {
+                "addresses": "gilles.demey+1@grafana.com, gilles.demey+2@grafana.com, gilles.demey+3@grafana.com, gilles.demey+4@grafana.com",
+                "singleEmail": false,
+              },
+              "type": "email",
+              "uid": "af306c96-35a2-4d6e-908a-4993e245dbb2",
+            },
+          ],
+          "name": "lotsa-emails",
+        },
+        {
+          "grafana_managed_receiver_configs": [
+            {
+              "disableResolveMessage": false,
+              "name": "Slack with multiple channels",
+              "secureFields": {
+                "token": true,
+              },
+              "settings": {
+                "recipient": "test-alerts",
+              },
+              "type": "slack",
+              "uid": "c02ad56a-31da-46b9-becb-4348ec0890fd",
+            },
+            {
+              "disableResolveMessage": false,
+              "name": "Slack with multiple channels",
+              "secureFields": {
+                "token": true,
+              },
+              "settings": {
+                "recipient": "test-alerts2",
+              },
+              "type": "slack",
+              "uid": "b286a3be-f690-49e2-8605-b075cbace2df",
+            },
+          ],
+          "name": "Slack with multiple channels",
+        },
+        {
+          "grafana_managed_receiver_configs": [
+            {
+              "disableResolveMessage": false,
+              "name": "my ",
+              "secureSettings": {},
+              "settings": {
+                "addresses": "nteews treerc@egirvaefrana.com",
+                "singleEmail": false,
+              },
+              "type": "email",
+            },
+          ],
+          "name": "my ",
+        },
+      ],
+      "route": {
+        "receiver": "grafana-default-email",
+        "routes": [
+          {
+            "receiver": "provisioned-contact-point",
+          },
+        ],
+      },
+    },
+    "template_file_provenances": {},
+    "template_files": {},
+  },
+]
+`;
diff --git a/public/app/features/alerting/unified/components/contact-points/__snapshots__/useContactPoints.test.tsx.snap b/public/app/features/alerting/unified/components/contact-points/__snapshots__/useContactPoints.test.tsx.snap
index 5d26e30334e5b..71e66a38f7caf 100644
--- a/public/app/features/alerting/unified/components/contact-points/__snapshots__/useContactPoints.test.tsx.snap
+++ b/public/app/features/alerting/unified/components/contact-points/__snapshots__/useContactPoints.test.tsx.snap
@@ -30,21 +30,27 @@ exports[`useContactPoints should return contact points with status 1`] = `
         },
       ],
       "name": "grafana-default-email",
-      "numberOfPolicies": 0,
+      "policies": [
+        {
+          "receiver": "grafana-default-email",
+          "route": {
+            "type": "normal",
+          },
+        },
+      ],
     },
     {
       "grafana_managed_receiver_configs": [
         {
           "disableResolveMessage": false,
-          "name": "provisioned-contact-point",
-          "provenance": "api",
+          "name": "lotsa-emails",
           "secureFields": {},
           "settings": {
-            "addresses": "gilles.demey@grafana.com",
+            "addresses": "gilles.demey+1@grafana.com, gilles.demey+2@grafana.com, gilles.demey+3@grafana.com, gilles.demey+4@grafana.com",
             "singleEmail": false,
           },
           "type": "email",
-          "uid": "s8SdCVjnk",
+          "uid": "af306c96-35a2-4d6e-908a-4993e245dbb2",
           Symbol(receiver_status): {
             "lastNotifyAttempt": "",
             "lastNotifyAttemptDuration": "",
@@ -58,21 +64,22 @@ exports[`useContactPoints should return contact points with status 1`] = `
           Symbol(receiver_plugin_metadata): undefined,
         },
       ],
-      "name": "provisioned-contact-point",
-      "numberOfPolicies": 0,
+      "name": "lotsa-emails",
+      "policies": [],
     },
     {
       "grafana_managed_receiver_configs": [
         {
           "disableResolveMessage": false,
-          "name": "lotsa-emails",
+          "name": "provisioned-contact-point",
+          "provenance": "api",
           "secureFields": {},
           "settings": {
-            "addresses": "gilles.demey+1@grafana.com, gilles.demey+2@grafana.com, gilles.demey+3@grafana.com, gilles.demey+4@grafana.com",
+            "addresses": "gilles.demey@grafana.com",
             "singleEmail": false,
           },
           "type": "email",
-          "uid": "af306c96-35a2-4d6e-908a-4993e245dbb2",
+          "uid": "s8SdCVjnk",
           Symbol(receiver_status): {
             "lastNotifyAttempt": "",
             "lastNotifyAttemptDuration": "",
@@ -86,8 +93,15 @@ exports[`useContactPoints should return contact points with status 1`] = `
           Symbol(receiver_plugin_metadata): undefined,
         },
       ],
-      "name": "lotsa-emails",
-      "numberOfPolicies": 0,
+      "name": "provisioned-contact-point",
+      "policies": [
+        {
+          "receiver": "provisioned-contact-point",
+          "route": {
+            "type": "normal",
+          },
+        },
+      ],
     },
     {
       "grafana_managed_receiver_configs": [
@@ -139,10 +153,11 @@ exports[`useContactPoints should return contact points with status 1`] = `
         },
       ],
       "name": "Slack with multiple channels",
-      "numberOfPolicies": 0,
+      "policies": [],
     },
   ],
   "error": undefined,
   "isLoading": false,
+  "refetchReceivers": [Function],
 }
 `;
diff --git a/public/app/features/alerting/unified/components/contact-points/components/ContactPointsFilter.tsx b/public/app/features/alerting/unified/components/contact-points/components/ContactPointsFilter.tsx
new file mode 100644
index 0000000000000..f1d6ee5c31a2d
--- /dev/null
+++ b/public/app/features/alerting/unified/components/contact-points/components/ContactPointsFilter.tsx
@@ -0,0 +1,61 @@
+import { css } from '@emotion/css';
+import React, { useCallback, useState } from 'react';
+import { useDebounce } from 'react-use';
+
+import { Stack } from '@grafana/experimental';
+import { Button, Field, Icon, Input, useStyles2 } from '@grafana/ui';
+
+import { useURLSearchParams } from '../../../hooks/useURLSearchParams';
+
+const ContactPointsFilter = () => {
+  const styles = useStyles2(getStyles);
+
+  const [searchParams, setSearchParams] = useURLSearchParams();
+
+  const defaultValue = searchParams.get('search') ?? '';
+  const [searchValue, setSearchValue] = useState(defaultValue);
+
+  const [_, cancel] = useDebounce(
+    () => {
+      setSearchParams({ search: searchValue }, true);
+    },
+    300,
+    [setSearchParams, searchValue]
+  );
+
+  const clear = useCallback(() => {
+    cancel();
+    setSearchValue('');
+    setSearchParams({ search: '' }, true);
+  }, [cancel, setSearchParams]);
+
+  const hasInput = Boolean(defaultValue);
+
+  return (
+    <Stack direction="row" alignItems="end" gap={0.5}>
+      <Field className={styles.noBottom} label="Search by name or type">
+        <Input
+          aria-label="search contact points"
+          placeholder="Search"
+          width={46}
+          prefix={<Icon name="search" />}
+          onChange={(event) => {
+            setSearchValue(event.currentTarget.value);
+          }}
+          value={searchValue}
+        />
+      </Field>
+      <Button variant="secondary" icon="times" onClick={() => clear()} disabled={!hasInput} aria-label="clear">
+        Clear
+      </Button>
+    </Stack>
+  );
+};
+
+const getStyles = () => ({
+  noBottom: css({
+    marginBottom: 0,
+  }),
+});
+
+export { ContactPointsFilter };
diff --git a/public/app/features/alerting/unified/components/contact-points/components/GlobalConfig.tsx b/public/app/features/alerting/unified/components/contact-points/components/GlobalConfig.tsx
new file mode 100644
index 0000000000000..1d493119eb654
--- /dev/null
+++ b/public/app/features/alerting/unified/components/contact-points/components/GlobalConfig.tsx
@@ -0,0 +1,32 @@
+import React from 'react';
+
+import { Alert } from '@grafana/ui';
+
+import { useAlertmanagerConfig } from '../../../hooks/useAlertmanagerConfig';
+import { useAlertmanager } from '../../../state/AlertmanagerContext';
+import { GlobalConfigForm } from '../../receivers/GlobalConfigForm';
+
+const NewMessageTemplate = () => {
+  const { selectedAlertmanager } = useAlertmanager();
+  const { data, isLoading, error } = useAlertmanagerConfig(selectedAlertmanager);
+
+  if (isLoading && !data) {
+    return 'loading...';
+  }
+
+  if (error) {
+    return (
+      <Alert severity="error" title="Failed to fetch notification template">
+        {String(error)}
+      </Alert>
+    );
+  }
+
+  if (!data) {
+    return null;
+  }
+
+  return <GlobalConfigForm config={data} alertManagerSourceName={selectedAlertmanager!} />;
+};
+
+export default NewMessageTemplate;
diff --git a/public/app/features/alerting/unified/components/contact-points/components/GlobalConfigAlert.tsx b/public/app/features/alerting/unified/components/contact-points/components/GlobalConfigAlert.tsx
new file mode 100644
index 0000000000000..e277b007ac676
--- /dev/null
+++ b/public/app/features/alerting/unified/components/contact-points/components/GlobalConfigAlert.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+
+import { Alert, LinkButton } from '@grafana/ui';
+
+import { AlertmanagerAction } from '../../../hooks/useAbilities';
+import { isVanillaPrometheusAlertManagerDataSource } from '../../../utils/datasource';
+import { makeAMLink } from '../../../utils/misc';
+import { Authorize } from '../../Authorize';
+
+interface GlobalConfigAlertProps {
+  alertManagerName: string;
+}
+
+export const GlobalConfigAlert = ({ alertManagerName }: GlobalConfigAlertProps) => {
+  const isVanillaAM = isVanillaPrometheusAlertManagerDataSource(alertManagerName);
+
+  return (
+    <Authorize actions={[AlertmanagerAction.UpdateExternalConfiguration]}>
+      <Alert severity="info" title="Global config for contact points">
+        <p>
+          For each external Alertmanager you can define global settings, like server addresses, usernames and password,
+          for all the supported contact points.
+        </p>
+        <LinkButton href={makeAMLink('alerting/notifications/global-config', alertManagerName)} variant="secondary">
+          {isVanillaAM ? 'View global config' : 'Edit global config'}
+        </LinkButton>
+      </Alert>
+    </Authorize>
+  );
+};
diff --git a/public/app/features/alerting/unified/components/contact-points/Modals.tsx b/public/app/features/alerting/unified/components/contact-points/components/Modals.tsx
similarity index 95%
rename from public/app/features/alerting/unified/components/contact-points/Modals.tsx
rename to public/app/features/alerting/unified/components/contact-points/components/Modals.tsx
index 6c4fe8ec7df4e..371f4c860d464 100644
--- a/public/app/features/alerting/unified/components/contact-points/Modals.tsx
+++ b/public/app/features/alerting/unified/components/contact-points/components/Modals.tsx
@@ -2,6 +2,8 @@ import React, { useCallback, useMemo, useState } from 'react';
 
 import { Button, Modal, ModalProps } from '@grafana/ui';
 
+import { stringifyErrorLike } from '../../../utils/misc';
+
 type ModalHook<T = undefined> = [JSX.Element, (item: T) => void, () => void];
 
 /**
@@ -83,7 +85,9 @@ const ErrorModal = ({ isOpen, onDismiss, error }: ErrorModalProps) => (
   >
     <p>Failed to update your configuration:</p>
     <p>
-      <code>{String(error)}</code>
+      <pre>
+        <code>{stringifyErrorLike(error)}</code>
+      </pre>
     </p>
   </Modal>
 );
diff --git a/public/app/features/alerting/unified/components/contact-points/components/UnusedBadge.tsx b/public/app/features/alerting/unified/components/contact-points/components/UnusedBadge.tsx
new file mode 100644
index 0000000000000..8d459985ee433
--- /dev/null
+++ b/public/app/features/alerting/unified/components/contact-points/components/UnusedBadge.tsx
@@ -0,0 +1,14 @@
+import React from 'react';
+
+import { Badge } from '@grafana/ui';
+
+export const UnusedContactPointBadge = () => (
+  <Badge
+    text="Unused"
+    aria-label="unused"
+    color="orange"
+    icon="exclamation-triangle"
+    // is not used in any policy, but it can receive notifications from an auto auto generated policy. Non admin users can't see auto generated policies.
+    tooltip="This contact point is not used in any notification policy"
+  />
+);
diff --git a/public/app/features/alerting/unified/components/contact-points/useContactPoints.test.tsx b/public/app/features/alerting/unified/components/contact-points/useContactPoints.test.tsx
index b5c12d7988fc2..50f4fdbd03d40 100644
--- a/public/app/features/alerting/unified/components/contact-points/useContactPoints.test.tsx
+++ b/public/app/features/alerting/unified/components/contact-points/useContactPoints.test.tsx
@@ -4,14 +4,19 @@ import { TestProvider } from 'test/helpers/TestProvider';
 
 import { AccessControlAction } from 'app/types';
 
+import { setupMswServer } from '../../mockApi';
 import { grantUserPermissions } from '../../mocks';
 import { AlertmanagerProvider } from '../../state/AlertmanagerContext';
 
 import setupGrafanaManagedServer from './__mocks__/grafanaManagedServer';
 import { useContactPointsWithStatus } from './useContactPoints';
 
+const server = setupMswServer();
+
 describe('useContactPoints', () => {
-  setupGrafanaManagedServer();
+  beforeEach(() => {
+    setupGrafanaManagedServer(server);
+  });
 
   beforeAll(() => {
     grantUserPermissions([AccessControlAction.AlertingNotificationsRead]);
diff --git a/public/app/features/alerting/unified/components/contact-points/useContactPoints.tsx b/public/app/features/alerting/unified/components/contact-points/useContactPoints.tsx
index 555341a9f7675..8d6ca99a720b5 100644
--- a/public/app/features/alerting/unified/components/contact-points/useContactPoints.tsx
+++ b/public/app/features/alerting/unified/components/contact-points/useContactPoints.tsx
@@ -7,7 +7,7 @@ import { produce } from 'immer';
 import { remove } from 'lodash';
 
 import { alertmanagerApi } from '../../api/alertmanagerApi';
-import { onCallApi } from '../../api/onCallApi';
+import { onCallApi, OnCallIntegrationDTO } from '../../api/onCallApi';
 import { usePluginBridge } from '../../hooks/usePluginBridge';
 import { useAlertmanager } from '../../state/AlertmanagerContext';
 import { SupportedPlugin } from '../../types/pluginBridges';
@@ -27,9 +27,22 @@ const RECEIVER_STATUS_POLLING_INTERVAL = 10 * 1000; // 10 seconds
  * 3. (if available) additional metadata about Grafana Managed contact points
  * 4. (if available) the OnCall plugin metadata
  */
-export function useContactPointsWithStatus() {
+interface UseContactPointsWithStatusOptions {
+  includePoliciesCount: boolean;
+  receiverStatusPollingInterval?: number;
+}
+
+const defaultHookOptions = {
+  includePoliciesCount: true,
+  receiverStatusPollingInterval: RECEIVER_STATUS_POLLING_INTERVAL,
+};
+
+export function useContactPointsWithStatus({
+  includePoliciesCount,
+  receiverStatusPollingInterval,
+}: UseContactPointsWithStatusOptions = defaultHookOptions) {
   const { selectedAlertmanager, isGrafanaAlertmanager } = useAlertmanager();
-  const { installed: onCallPluginInstalled = false, loading: onCallPluginStatusLoading } = usePluginBridge(
+  const { installed: onCallPluginInstalled, loading: onCallPluginStatusLoading } = usePluginBridge(
     SupportedPlugin.OnCall
   );
 
@@ -37,8 +50,8 @@ export function useContactPointsWithStatus() {
   const fetchContactPointsStatus = alertmanagerApi.endpoints.getContactPointsStatus.useQuery(undefined, {
     refetchOnFocus: true,
     refetchOnReconnect: true,
-    // re-fetch status every so often for up-to-date information
-    pollingInterval: RECEIVER_STATUS_POLLING_INTERVAL,
+    // re-fetch status every so often for up-to-date information, allow disabling by passing "receiverStatusPollingInterval: 0"
+    pollingInterval: receiverStatusPollingInterval,
     // skip fetching receiver statuses if not Grafana AM
     skip: !isGrafanaAlertmanager,
   });
@@ -55,7 +68,16 @@ export function useContactPointsWithStatus() {
       skip: !onCallPluginInstalled || !isGrafanaAlertmanager,
     });
 
+  // null = no installed, undefined = loading, [n] is installed with integrations
+  let onCallMetadata: null | undefined | OnCallIntegrationDTO[] = undefined;
+  if (onCallPluginInstalled) {
+    onCallMetadata = onCallIntegrations ?? [];
+  } else if (onCallPluginInstalled === false) {
+    onCallMetadata = null;
+  }
+
   // fetch the latest config from the Alertmanager
+  // we use this endpoint only when we need to get the number of policies
   const fetchAlertmanagerConfiguration = alertmanagerApi.endpoints.getAlertmanagerConfiguration.useQuery(
     selectedAlertmanager!,
     {
@@ -65,30 +87,56 @@ export function useContactPointsWithStatus() {
         ...result,
         contactPoints: result.data
           ? enhanceContactPointsWithMetadata(
-              result.data,
               fetchContactPointsStatus.data,
               fetchReceiverMetadata.data,
-              onCallPluginInstalled ? onCallIntegrations ?? [] : null
+              onCallMetadata,
+              result.data.alertmanager_config.receivers ?? [],
+              result.data
             )
           : [],
       }),
+      skip: !includePoliciesCount,
     }
   );
 
+  // for Grafana Managed Alertmanager, we use the new read-only endpoint for getting the list of contact points
+  const fetchGrafanaContactPoints = alertmanagerApi.endpoints.getContactPointsList.useQuery(undefined, {
+    refetchOnFocus: true,
+    refetchOnReconnect: true,
+    selectFromResult: (result) => ({
+      ...result,
+      contactPoints: result.data
+        ? enhanceContactPointsWithMetadata(
+            fetchContactPointsStatus.data,
+            fetchReceiverMetadata.data,
+            onCallMetadata,
+            result.data, // contact points from the new readonly endpoint
+            undefined //no config data
+          )
+        : [],
+    }),
+    skip: includePoliciesCount || !isGrafanaAlertmanager,
+  });
+
   // we will fail silently for fetching OnCall plugin status and integrations
-  const error = fetchAlertmanagerConfiguration.error ?? fetchContactPointsStatus.error;
+  const error =
+    fetchAlertmanagerConfiguration.error || fetchGrafanaContactPoints.error || fetchContactPointsStatus.error;
   const isLoading =
     fetchAlertmanagerConfiguration.isLoading ||
+    fetchGrafanaContactPoints.isLoading ||
     fetchContactPointsStatus.isLoading ||
     onCallPluginStatusLoading ||
     onCallPluginIntegrationsLoading;
 
-  const contactPoints = fetchAlertmanagerConfiguration.contactPoints;
-
+  const unsortedContactPoints = includePoliciesCount
+    ? fetchAlertmanagerConfiguration.contactPoints
+    : fetchGrafanaContactPoints.contactPoints;
+  const contactPoints = unsortedContactPoints.sort((a, b) => a.name.localeCompare(b.name));
   return {
     error,
     isLoading,
     contactPoints,
+    refetchReceivers: fetchGrafanaContactPoints.refetch,
   };
 }
 
diff --git a/public/app/features/alerting/unified/components/contact-points/utils.test.ts b/public/app/features/alerting/unified/components/contact-points/utils.test.ts
new file mode 100644
index 0000000000000..4e340e33577e2
--- /dev/null
+++ b/public/app/features/alerting/unified/components/contact-points/utils.test.ts
@@ -0,0 +1,157 @@
+import { GrafanaManagedContactPoint } from 'app/plugins/datasource/alertmanager/types';
+
+import { ReceiverTypes } from '../receivers/grafanaAppReceivers/onCall/onCall';
+
+import { RECEIVER_META_KEY, RECEIVER_PLUGIN_META_KEY } from './useContactPoints';
+import {
+  ReceiverConfigWithMetadata,
+  getReceiverDescription,
+  isAutoGeneratedPolicy,
+  isProvisioned,
+  summarizeEmailAddresses,
+} from './utils';
+
+describe('isProvisioned', () => {
+  it('should return true when at least one receiver is provisioned', () => {
+    const contactPoint: GrafanaManagedContactPoint = {
+      name: 'my-contact-point',
+      grafana_managed_receiver_configs: [
+        { name: 'email', provenance: 'api', type: 'email', disableResolveMessage: false, settings: {} },
+      ],
+    };
+
+    expect(isProvisioned(contactPoint)).toBe(true);
+  });
+
+  it('should return false when no receiver was provisioned', () => {
+    const contactPoint: GrafanaManagedContactPoint = {
+      name: 'my-contact-point',
+      grafana_managed_receiver_configs: [
+        { name: 'email', provenance: undefined, type: 'email', disableResolveMessage: false, settings: {} },
+      ],
+    };
+
+    expect(isProvisioned(contactPoint)).toBe(false);
+  });
+});
+
+describe('isAutoGeneratedPolicy', () => {
+  it('should return false when not enabled', () => {
+    expect(isAutoGeneratedPolicy({})).toBe(false);
+  });
+});
+
+describe('getReceiverDescription', () => {
+  it('should show multiple email addresses', () => {
+    const receiver: ReceiverConfigWithMetadata = {
+      name: 'email',
+      provenance: undefined,
+      type: 'email',
+      disableResolveMessage: false,
+      settings: { addresses: 'test1@test.com,test2@test.com,test3@test.com,test4@test.com' },
+      [RECEIVER_META_KEY]: {
+        name: 'Email',
+        description: 'The email receiver',
+      },
+    };
+
+    expect(getReceiverDescription(receiver)).toBe('test1@test.com, test2@test.com, test3@test.com, +1 more');
+  });
+
+  it('should work for Slack', () => {
+    const output = '#channel';
+    const receiver1: ReceiverConfigWithMetadata = {
+      name: 'slack',
+      provenance: undefined,
+      type: 'slack',
+      disableResolveMessage: false,
+      settings: { recipient: '#channel' },
+      [RECEIVER_META_KEY]: {
+        name: 'Slack',
+        description: 'The Slack receiver',
+      },
+    };
+
+    const receiver2: ReceiverConfigWithMetadata = {
+      name: 'slack',
+      provenance: undefined,
+      type: 'slack',
+      disableResolveMessage: false,
+      settings: { recipient: 'channel' },
+      [RECEIVER_META_KEY]: {
+        name: 'Slack',
+        description: 'The Slack receiver',
+      },
+    };
+
+    expect(getReceiverDescription(receiver1)).toBe(output);
+    expect(getReceiverDescription(receiver2)).toBe(output);
+  });
+
+  it('should work for OnCall', () => {
+    const output = 'The OnCall receiver';
+    const input: ReceiverConfigWithMetadata = {
+      name: 'my oncall',
+      provenance: undefined,
+      type: ReceiverTypes.OnCall,
+      disableResolveMessage: false,
+      settings: {},
+      [RECEIVER_PLUGIN_META_KEY]: {
+        description: output,
+        icon: '',
+        title: '',
+      },
+      [RECEIVER_META_KEY]: {
+        name: '',
+      },
+    };
+
+    expect(getReceiverDescription(input)).toBe(output);
+  });
+
+  it('should work for any type', () => {
+    const output = 'Some description of the receiver';
+    const input: ReceiverConfigWithMetadata = {
+      name: 'some receiver',
+      provenance: undefined,
+      type: 'some',
+      disableResolveMessage: false,
+      settings: {},
+      [RECEIVER_META_KEY]: {
+        name: 'Some Receiver',
+        description: output,
+      },
+    };
+
+    expect(getReceiverDescription(input)).toBe(output);
+  });
+
+  it('should work for any type with no description', () => {
+    const input: ReceiverConfigWithMetadata = {
+      name: 'some receiver',
+      provenance: undefined,
+      type: 'some',
+      disableResolveMessage: false,
+      settings: {},
+      [RECEIVER_META_KEY]: {
+        name: 'Some Receiver',
+      },
+    };
+
+    expect(getReceiverDescription(input)).toBe(undefined);
+  });
+});
+
+describe('summarizeEmailAddresses', () => {
+  it('should work with one email address', () => {
+    expect(summarizeEmailAddresses('test@test.com')).toBe('test@test.com');
+  });
+
+  it('should work with multiple types of separators', () => {
+    const output = 'foo@foo.com, bar@bar.com';
+
+    expect(summarizeEmailAddresses('foo@foo.com,   bar@bar.com')).toBe(output);
+    expect(summarizeEmailAddresses(' foo@foo.com;  bar@bar.com')).toBe(output);
+    expect(summarizeEmailAddresses('foo@foo.com\n bar@bar.com  ')).toBe(output);
+  });
+});
diff --git a/public/app/features/alerting/unified/components/contact-points/utils.ts b/public/app/features/alerting/unified/components/contact-points/utils.ts
index 414d7bbc00cf6..0895a2e564693 100644
--- a/public/app/features/alerting/unified/components/contact-points/utils.ts
+++ b/public/app/features/alerting/unified/components/contact-points/utils.ts
@@ -1,10 +1,13 @@
-import { countBy, split, trim, upperFirst } from 'lodash';
+import { difference, groupBy, take, trim, upperFirst } from 'lodash';
 import { ReactNode } from 'react';
 
+import { config } from '@grafana/runtime';
 import {
   AlertManagerCortexConfig,
   GrafanaManagedContactPoint,
   GrafanaManagedReceiverConfig,
+  MatcherOperator,
+  Receiver,
   Route,
 } from 'app/plugins/datasource/alertmanager/types';
 import { NotifierDTO, NotifierStatus, ReceiversStateDTO } from 'app/types';
@@ -17,6 +20,8 @@ import { getOnCallMetadata, ReceiverPluginMetadata } from '../receivers/grafanaA
 
 import { RECEIVER_META_KEY, RECEIVER_PLUGIN_META_KEY, RECEIVER_STATUS_KEY } from './useContactPoints';
 
+const AUTOGENERATED_RECEIVER_POLICY_MATCHER_KEY = '__grafana_receiver__';
+
 export function isProvisioned(contactPoint: GrafanaManagedContactPoint) {
   // for some reason the provenance is on the receiver and not the entire contact point
   const provenance = contactPoint.grafana_managed_receiver_configs?.find((receiver) => receiver.provenance)?.provenance;
@@ -26,21 +31,30 @@ export function isProvisioned(contactPoint: GrafanaManagedContactPoint) {
 
 // TODO we should really add some type information to these receiver settings...
 export function getReceiverDescription(receiver: ReceiverConfigWithMetadata): ReactNode | undefined {
+  if (!receiver.settings) {
+    return undefined;
+  }
   switch (receiver.type) {
     case 'email': {
       const hasEmailAddresses = 'addresses' in receiver.settings; // when dealing with alertmanager email_configs we don't normalize the settings
       return hasEmailAddresses ? summarizeEmailAddresses(receiver.settings['addresses']) : undefined;
     }
     case 'slack': {
-      const channelName = receiver.settings['recipient'];
-      return channelName ? `#${channelName}` : undefined;
+      const recipient: string | undefined = receiver.settings['recipient'];
+      if (!recipient) {
+        return;
+      }
+
+      // Slack channel name might have a "#" in the recipient already
+      const channelName = recipient.replace(/^#/, '');
+      return `#${channelName}`;
     }
     case 'kafka': {
-      const topicName = receiver.settings['kafkaTopic'];
+      const topicName: string | undefined = receiver.settings['kafkaTopic'];
       return topicName;
     }
     case 'webhook': {
-      const url = receiver.settings['url'];
+      const url: string | undefined = receiver.settings['url'];
       return url;
     }
     case ReceiverTypes.OnCall: {
@@ -53,20 +67,22 @@ export function getReceiverDescription(receiver: ReceiverConfigWithMetadata): Re
 
 // input: foo+1@bar.com, foo+2@bar.com, foo+3@bar.com, foo+4@bar.com
 // output: foo+1@bar.com, foo+2@bar.com, +2 more
-function summarizeEmailAddresses(addresses: string): string {
+export function summarizeEmailAddresses(addresses: string): string {
   const MAX_ADDRESSES_SHOWN = 3;
   const SUPPORTED_SEPARATORS = /,|;|\n+/g;
 
+  // split all email addresses
   const emails = addresses.trim().split(SUPPORTED_SEPARATORS).map(trim);
 
-  const notShown = emails.length - MAX_ADDRESSES_SHOWN;
+  // grab the first 3 and the rest
+  const summary = take(emails, MAX_ADDRESSES_SHOWN);
+  const rest = difference(emails, summary);
 
-  const truncatedAddresses = split(addresses, SUPPORTED_SEPARATORS, MAX_ADDRESSES_SHOWN);
-  if (notShown > 0) {
-    truncatedAddresses.push(`+${notShown} more`);
+  if (rest.length) {
+    summary.push(`+${rest.length} more`);
   }
 
-  return truncatedAddresses.join(', ');
+  return summary.join(', ');
 }
 
 // Grafana Managed contact points have receivers with additional diagnostics
@@ -83,7 +99,7 @@ export interface ReceiverConfigWithMetadata extends GrafanaManagedReceiverConfig
 }
 
 export interface ContactPointWithMetadata extends GrafanaManagedContactPoint {
-  numberOfPolicies: number;
+  policies?: RouteReference[]; // now is optional as we don't have the data from the read-only endpoint
   grafana_managed_receiver_configs: ReceiverConfigWithMetadata[];
 }
 
@@ -91,30 +107,36 @@ export interface ContactPointWithMetadata extends GrafanaManagedContactPoint {
  * This function adds the status information for each of the integrations (contact point types) in a contact point
  * 1. we iterate over all contact points
  * 2. for each contact point we "enhance" it with the status or "undefined" for vanilla Alertmanager
+ * contactPoints: list of contact points
+ * alertmanagerConfiguration: optional as is passed when we need to get number of policies for each contact point
+ * and we prefer using the data from the read-only endpoint.
  */
 export function enhanceContactPointsWithMetadata(
-  result: AlertManagerCortexConfig,
   status: ReceiversStateDTO[] = [],
   notifiers: NotifierDTO[] = [],
-  onCallIntegrations: OnCallIntegrationDTO[] | null
+  onCallIntegrations: OnCallIntegrationDTO[] | undefined | null,
+  contactPoints: Receiver[],
+  alertmanagerConfiguration?: AlertManagerCortexConfig
 ): ContactPointWithMetadata[] {
-  const contactPoints = result.alertmanager_config.receivers ?? [];
-
   // compute the entire inherited tree before finding what notification policies are using a particular contact point
-  const fullyInheritedTree = computeInheritedTree(result?.alertmanager_config?.route ?? {});
+  const fullyInheritedTree = computeInheritedTree(alertmanagerConfiguration?.alertmanager_config?.route ?? {});
   const usedContactPoints = getUsedContactPoints(fullyInheritedTree);
-  const usedContactPointsByName = countBy(usedContactPoints);
+  const usedContactPointsByName = groupBy(usedContactPoints, 'receiver');
+
+  const contactPointsList = alertmanagerConfiguration
+    ? alertmanagerConfiguration?.alertmanager_config.receivers ?? []
+    : contactPoints ?? [];
 
-  return contactPoints.map((contactPoint) => {
+  return contactPointsList.map((contactPoint) => {
     const receivers = extractReceivers(contactPoint);
     const statusForReceiver = status.find((status) => status.name === contactPoint.name);
 
     return {
       ...contactPoint,
-      numberOfPolicies: usedContactPointsByName[contactPoint.name] ?? 0,
+      policies:
+        alertmanagerConfiguration && usedContactPointsByName && (usedContactPointsByName[contactPoint.name] ?? []),
       grafana_managed_receiver_configs: receivers.map((receiver, index) => {
         const isOnCallReceiver = receiver.type === ReceiverTypes.OnCall;
-
         return {
           ...receiver,
           [RECEIVER_STATUS_KEY]: statusForReceiver?.integrations[index],
@@ -127,10 +149,43 @@ export function enhanceContactPointsWithMetadata(
   });
 }
 
-export function getUsedContactPoints(route: Route): string[] {
+export function isAutoGeneratedPolicy(route: Route) {
+  const simplifiedRoutingToggleEnabled = config.featureToggles.alertingSimplifiedRouting ?? false;
+  if (!simplifiedRoutingToggleEnabled) {
+    return false;
+  }
+  if (!route.object_matchers) {
+    return false;
+  }
+  return (
+    route.object_matchers.some((objectMatcher) => {
+      return (
+        objectMatcher[0] === AUTOGENERATED_RECEIVER_POLICY_MATCHER_KEY && objectMatcher[1] === MatcherOperator.equal
+      );
+    }) ?? false
+  );
+}
+
+export interface RouteReference {
+  receiver: string;
+  route: {
+    type: 'auto-generated' | 'normal';
+  };
+}
+
+export function getUsedContactPoints(route: Route): RouteReference[] {
   const childrenContactPoints = route.routes?.flatMap((route) => getUsedContactPoints(route)) ?? [];
+
   if (route.receiver) {
-    return [route.receiver, ...childrenContactPoints];
+    return [
+      {
+        receiver: route.receiver,
+        route: {
+          type: isAutoGeneratedPolicy(route) ? 'auto-generated' : 'normal',
+        },
+      },
+      ...childrenContactPoints,
+    ];
   }
 
   return childrenContactPoints;
diff --git a/public/app/features/alerting/unified/components/export/FileExportPreview.tsx b/public/app/features/alerting/unified/components/export/FileExportPreview.tsx
index 2a7f5c06ee6d2..df5fcfd949535 100644
--- a/public/app/features/alerting/unified/components/export/FileExportPreview.tsx
+++ b/public/app/features/alerting/unified/components/export/FileExportPreview.tsx
@@ -4,9 +4,9 @@ import React, { useCallback, useMemo } from 'react';
 import AutoSizer from 'react-virtualized-auto-sizer';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Button, ClipboardButton, CodeEditor, useStyles2 } from '@grafana/ui';
+import { Alert, Button, ClipboardButton, CodeEditor, TextLink, useStyles2 } from '@grafana/ui';
 
-import { allGrafanaExportProviders, ExportFormats } from './providers';
+import { allGrafanaExportProviders, ExportFormats, ExportProvider, ProvisioningType } from './providers';
 
 interface FileExportPreviewProps {
   format: ExportFormats;
@@ -19,6 +19,7 @@ interface FileExportPreviewProps {
 
 export function FileExportPreview({ format, textDefinition, downloadFileName, onClose }: FileExportPreviewProps) {
   const styles = useStyles2(fileExportPreviewStyles);
+  const provider = allGrafanaExportProviders[format];
 
   const onDownload = useCallback(() => {
     const blob = new Blob([textDefinition], {
@@ -28,13 +29,13 @@ export function FileExportPreview({ format, textDefinition, downloadFileName, on
   }, [textDefinition, downloadFileName, format]);
 
   const formattedTextDefinition = useMemo(() => {
-    const provider = allGrafanaExportProviders[format];
     return provider.formatter ? provider.formatter(textDefinition) : textDefinition;
-  }, [format, textDefinition]);
+  }, [provider, textDefinition]);
 
   return (
     // TODO Handle empty content
     <div className={styles.container}>
+      <FileExportInlineDocumentation exportProvider={provider} />
       <div className={styles.content}>
         <AutoSizer disableWidth>
           {({ height }) => (
@@ -87,3 +88,60 @@ const fileExportPreviewStyles = (theme: GrafanaTheme2) => ({
     gap: ${theme.spacing(1)};
   `,
 });
+
+function FileExportInlineDocumentation({ exportProvider }: { exportProvider: ExportProvider<unknown> }) {
+  const { name, type } = exportProvider;
+
+  const exportInlineDoc: Record<ProvisioningType, { title: string; component: React.ReactNode }> = {
+    file: {
+      title: 'File-provisioning format',
+      component: (
+        <>
+          {name} format is only valid for File Provisioning.{' '}
+          <TextLink
+            href="https://grafana.com/docs/grafana/latest/alerting/set-up/provision-alerting-resources/file-provisioning/"
+            external
+          >
+            Read more in the docs.
+          </TextLink>
+        </>
+      ),
+    },
+    api: {
+      title: 'API-provisioning format',
+      component: (
+        <>
+          {name} format is only valid for API Provisioning.{' '}
+          <TextLink
+            href="https://grafana.com/docs/grafana/latest/alerting/set-up/provision-alerting-resources/http-api-provisioning/"
+            external
+          >
+            Read more in the docs.
+          </TextLink>
+        </>
+      ),
+    },
+    terraform: {
+      title: 'Terraform-provisioning format',
+      component: (
+        <>
+          {name} format is only valid for Terraform Provisioning.{' '}
+          <TextLink
+            href="https://grafana.com/docs/grafana/latest/alerting/set-up/provision-alerting-resources/terraform-provisioning/"
+            external
+          >
+            Read more in the docs.
+          </TextLink>
+        </>
+      ),
+    },
+  };
+
+  const { title, component } = exportInlineDoc[type];
+
+  return (
+    <Alert title={title} severity="info" bottomSpacing={0} topSpacing={0}>
+      {component}
+    </Alert>
+  );
+}
diff --git a/public/app/features/alerting/unified/components/export/GrafanaModifyExport.test.tsx b/public/app/features/alerting/unified/components/export/GrafanaModifyExport.test.tsx
index 0f44e23c14fdf..48175f94ccfc0 100644
--- a/public/app/features/alerting/unified/components/export/GrafanaModifyExport.test.tsx
+++ b/public/app/features/alerting/unified/components/export/GrafanaModifyExport.test.tsx
@@ -2,17 +2,16 @@ import { render, waitFor, waitForElementToBeRemoved } from '@testing-library/rea
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { Route } from 'react-router-dom';
-import { AutoSizerProps } from 'react-virtualized-auto-sizer';
+import { Props } from 'react-virtualized-auto-sizer';
 import { byRole, byTestId, byText } from 'testing-library-selector';
 
-import { selectors } from '@grafana/e2e-selectors';
 import { locationService } from '@grafana/runtime';
 
 import { TestProvider } from '../../../../../../test/helpers/TestProvider';
 import { AlertmanagerChoice } from '../../../../../plugins/datasource/alertmanager/types';
 import { DashboardSearchItemType } from '../../../../search/types';
 import { mockAlertRuleApi, mockApi, mockExportApi, mockSearchApi, setupMswServer } from '../../mockApi';
-import { getGrafanaRule, mockDataSource } from '../../mocks';
+import { getGrafanaRule, mockDashboardSearchItem, mockDataSource } from '../../mocks';
 import { mockAlertmanagerChoiceResponse } from '../../mocks/alertmanagerApi';
 import { setupDataSources } from '../../testSetup/datasources';
 import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
@@ -24,7 +23,13 @@ jest.mock('app/core/components/AppChrome/AppChromeUpdate', () => ({
 }));
 
 jest.mock('react-virtualized-auto-sizer', () => {
-  return ({ children }: AutoSizerProps) => children({ height: 600, width: 1 });
+  return ({ children }: Props) =>
+    children({
+      height: 600,
+      scaledHeight: 600,
+      scaledWidth: 1,
+      width: 1,
+    });
 });
 jest.mock('@grafana/ui', () => ({
   ...jest.requireActual('@grafana/ui'),
@@ -36,7 +41,6 @@ const ui = {
   form: {
     nameInput: byRole('textbox', { name: 'name' }),
     folder: byTestId('folder-picker'),
-    folderContainer: byTestId(selectors.components.FolderPicker.containerV2),
     group: byTestId('group-picker'),
     annotationKey: (idx: number) => byTestId(`annotation-key-${idx}`),
     annotationValue: (idx: number) => byTestId(`annotation-value-${idx}`),
@@ -75,8 +79,7 @@ describe('GrafanaModifyExport', () => {
   const grafanaRule = getGrafanaRule(undefined, {
     uid: 'test-rule-uid',
     title: 'cpu-usage',
-    namespace_uid: 'folder-test-uid',
-    namespace_id: 1,
+    namespace_uid: 'folderUID1',
     data: [
       {
         refId: 'A',
@@ -96,26 +99,25 @@ describe('GrafanaModifyExport', () => {
   it('Should render edit form for the specified rule', async () => {
     mockApi(server).eval({ results: { A: { frames: [] } } });
     mockSearchApi(server).search([
-      {
+      mockDashboardSearchItem({
         title: grafanaRule.namespace.name,
-        uid: 'folder-test-uid',
-        id: 1,
+        uid: 'folderUID1',
         url: '',
         tags: [],
         type: DashboardSearchItemType.DashFolder,
-      },
+      }),
     ]);
     mockAlertRuleApi(server).rulerRules(GRAFANA_RULES_SOURCE_NAME, {
       [grafanaRule.namespace.name]: [{ name: grafanaRule.group.name, interval: '1m', rules: [grafanaRule.rulerRule!] }],
     });
-    mockAlertRuleApi(server).rulerRuleGroup(
-      GRAFANA_RULES_SOURCE_NAME,
-      grafanaRule.namespace.name,
-      grafanaRule.group.name,
-      { name: grafanaRule.group.name, interval: '1m', rules: [grafanaRule.rulerRule!] }
-    );
-    mockExportApi(server).modifiedExport(grafanaRule.namespace.name, {
+    mockAlertRuleApi(server).rulerRuleGroup(GRAFANA_RULES_SOURCE_NAME, 'folderUID1', grafanaRule.group.name, {
+      name: grafanaRule.group.name,
+      interval: '1m',
+      rules: [grafanaRule.rulerRule!],
+    });
+    mockExportApi(server).modifiedExport('folderUID1', {
       yaml: 'Yaml Export Content',
+      json: 'Json Export Content',
     });
 
     const user = userEvent.setup();
@@ -131,6 +133,7 @@ describe('GrafanaModifyExport', () => {
     expect(drawer).toBeInTheDocument();
 
     expect(ui.exportDrawer.yamlTab.get(drawer)).toHaveAttribute('aria-selected', 'true');
+
     await waitFor(() => {
       expect(ui.exportDrawer.editor.get(drawer)).toHaveTextContent('Yaml Export Content');
     });
diff --git a/public/app/features/alerting/unified/components/export/GrafanaModifyExport.tsx b/public/app/features/alerting/unified/components/export/GrafanaModifyExport.tsx
index 02a671b35eace..3e6a3b62c7633 100644
--- a/public/app/features/alerting/unified/components/export/GrafanaModifyExport.tsx
+++ b/public/app/features/alerting/unified/components/export/GrafanaModifyExport.tsx
@@ -66,7 +66,7 @@ export default function GrafanaModifyExport({ match }: GrafanaModifyExportProps)
   if (!alertRule && !loading && !loadingBuildInfo) {
     // alert rule does not exist
     return (
-      <AlertingPageWrapper isLoading={loading} pageId="alert-list" pageNav={{ text: 'Modify export' }}>
+      <AlertingPageWrapper isLoading={loading} navId="alert-list" pageNav={{ text: 'Modify export' }}>
         <Alert
           title="Cannot load the rule. The rule does not exist"
           buttonContent="Go back to alert list"
@@ -79,7 +79,7 @@ export default function GrafanaModifyExport({ match }: GrafanaModifyExportProps)
   if (alertRule && !isGrafanaRulerRule(alertRule.rule)) {
     // alert rule exists but is not a grafana-managed rule
     return (
-      <AlertingPageWrapper isLoading={loading} pageId="alert-list" pageNav={{ text: 'Modify export' }}>
+      <AlertingPageWrapper isLoading={loading} navId="alert-list" pageNav={{ text: 'Modify export' }}>
         <Alert
           title="This rule is not a Grafana-managed alert rule"
           buttonContent="Go back to alert list"
@@ -92,7 +92,7 @@ export default function GrafanaModifyExport({ match }: GrafanaModifyExportProps)
   return (
     <AlertingPageWrapper
       isLoading={loading}
-      pageId="alert-list"
+      navId="alert-list"
       pageNav={{
         text: 'Modify export',
         subTitle:
diff --git a/public/app/features/alerting/unified/components/export/GrafanaMuteTimingsExporter.tsx b/public/app/features/alerting/unified/components/export/GrafanaMuteTimingsExporter.tsx
new file mode 100644
index 0000000000000..7225337458cd5
--- /dev/null
+++ b/public/app/features/alerting/unified/components/export/GrafanaMuteTimingsExporter.tsx
@@ -0,0 +1,81 @@
+import React, { useState } from 'react';
+
+import { LoadingPlaceholder } from '@grafana/ui';
+
+import { alertRuleApi } from '../../api/alertRuleApi';
+
+import { FileExportPreview } from './FileExportPreview';
+import { GrafanaExportDrawer } from './GrafanaExportDrawer';
+import { allGrafanaExportProviders, ExportFormats } from './providers';
+interface MuteTimingsExporterPreviewProps {
+  exportFormat: ExportFormats;
+  onClose: () => void;
+}
+
+const GrafanaMuteTimingsExporterPreview = ({ exportFormat, onClose }: MuteTimingsExporterPreviewProps) => {
+  const { currentData: muteTimingsDefinition = '', isFetching } = alertRuleApi.useExportMuteTimingsQuery({
+    format: exportFormat,
+  });
+  const downloadFileName = `mute-timings-${new Date().getTime()}`;
+
+  if (isFetching) {
+    return <LoadingPlaceholder text="Loading...." />;
+  }
+  return (
+    <FileExportPreview
+      format={exportFormat}
+      textDefinition={muteTimingsDefinition}
+      downloadFileName={downloadFileName}
+      onClose={onClose}
+    />
+  );
+};
+
+interface GrafanaMuteTimingExporterPreviewProps extends MuteTimingsExporterPreviewProps {
+  muteTimingName: string;
+}
+const GrafanaMuteTimingExporterPreview = ({
+  exportFormat,
+  onClose,
+  muteTimingName,
+}: GrafanaMuteTimingExporterPreviewProps) => {
+  const { currentData: muteTimingsDefinition = '', isFetching } = alertRuleApi.useExportMuteTimingQuery({
+    format: exportFormat,
+    muteTiming: muteTimingName,
+  });
+  const downloadFileName = `mute-timing-${muteTimingName}-${new Date().getTime()}`;
+
+  if (isFetching) {
+    return <LoadingPlaceholder text="Loading...." />;
+  }
+  return (
+    <FileExportPreview
+      format={exportFormat}
+      textDefinition={muteTimingsDefinition}
+      downloadFileName={downloadFileName}
+      onClose={onClose}
+    />
+  );
+};
+interface GrafanaMuteTimingsExporterProps {
+  onClose: () => void;
+  muteTimingName?: string;
+}
+
+export const GrafanaMuteTimingsExporter = ({ onClose, muteTimingName }: GrafanaMuteTimingsExporterProps) => {
+  const [activeTab, setActiveTab] = useState<ExportFormats>('yaml');
+  return (
+    <GrafanaExportDrawer
+      activeTab={activeTab}
+      onTabChange={setActiveTab}
+      onClose={onClose}
+      formatProviders={Object.values(allGrafanaExportProviders)}
+    >
+      {muteTimingName ? (
+        <GrafanaMuteTimingExporterPreview exportFormat={activeTab} onClose={onClose} muteTimingName={muteTimingName} />
+      ) : (
+        <GrafanaMuteTimingsExporterPreview exportFormat={activeTab} onClose={onClose} />
+      )}
+    </GrafanaExportDrawer>
+  );
+};
diff --git a/public/app/features/alerting/unified/components/export/providers.ts b/public/app/features/alerting/unified/components/export/providers.ts
index 356909609bb08..518ced9e5f2c7 100644
--- a/public/app/features/alerting/unified/components/export/providers.ts
+++ b/public/app/features/alerting/unified/components/export/providers.ts
@@ -1,12 +1,16 @@
+export type ProvisioningType = 'file' | 'api' | 'terraform';
+
 export interface ExportProvider<TFormat> {
   name: string;
   exportFormat: TFormat;
+  type: ProvisioningType;
   formatter?: (raw: string) => string;
 }
 
 export const JsonExportProvider: ExportProvider<'json'> = {
   name: 'JSON',
   exportFormat: 'json',
+  type: 'file',
   formatter: (raw: string) => {
     try {
       return JSON.stringify(JSON.parse(raw), null, 4);
@@ -19,11 +23,13 @@ export const JsonExportProvider: ExportProvider<'json'> = {
 export const YamlExportProvider: ExportProvider<'yaml'> = {
   name: 'YAML',
   exportFormat: 'yaml',
+  type: 'file',
 };
 
 export const HclExportProvider: ExportProvider<'hcl'> = {
   name: 'Terraform (HCL)',
   exportFormat: 'hcl',
+  type: 'terraform',
 };
 
 export const allGrafanaExportProviders = {
diff --git a/public/app/features/alerting/unified/components/expressions/Expression.tsx b/public/app/features/alerting/unified/components/expressions/Expression.tsx
index efc5bbd6b8bd5..73db0a2f5bfaf 100644
--- a/public/app/features/alerting/unified/components/expressions/Expression.tsx
+++ b/public/app/features/alerting/unified/components/expressions/Expression.tsx
@@ -1,14 +1,15 @@
 import { css, cx } from '@emotion/css';
 import { uniqueId } from 'lodash';
 import React, { FC, useCallback, useState } from 'react';
+import { useFormContext } from 'react-hook-form';
 
 import { DataFrame, dateTimeFormat, GrafanaTheme2, isTimeSeriesFrames, LoadingState, PanelData } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { AutoSizeInput, Button, clearButtonStyles, IconButton, useStyles2 } from '@grafana/ui';
+import { Alert, AutoSizeInput, Button, clearButtonStyles, IconButton, Stack, useStyles2 } from '@grafana/ui';
 import { ClassicConditions } from 'app/features/expressions/components/ClassicConditions';
 import { Math } from 'app/features/expressions/components/Math';
 import { Reduce } from 'app/features/expressions/components/Reduce';
 import { Resample } from 'app/features/expressions/components/Resample';
+import { SqlExpr } from 'app/features/expressions/components/SqlExpr';
 import { Threshold } from 'app/features/expressions/components/Threshold';
 import {
   ExpressionQuery,
@@ -57,6 +58,19 @@ export const Expression: FC<ExpressionProps> = ({
 
   const queryType = query?.type;
 
+  const { setError, clearErrors } = useFormContext();
+
+  const onQueriesValidationError = useCallback(
+    (errorMsg: string | undefined) => {
+      if (errorMsg) {
+        setError('queries', { type: 'custom', message: errorMsg });
+      } else {
+        clearErrors('queries');
+      }
+    },
+    [setError, clearErrors]
+  );
+
   const isLoading = data && Object.values(data).some((d) => Boolean(d) && d.state === LoadingState.Loading);
   const hasResults = Array.isArray(data?.series) && !isLoading;
   const series = data?.series ?? [];
@@ -86,13 +100,25 @@ export const Expression: FC<ExpressionProps> = ({
           return <ClassicConditions onChange={onChangeQuery} query={query} refIds={availableRefIds} />;
 
         case ExpressionQueryType.threshold:
-          return <Threshold onChange={onChangeQuery} query={query} labelWidth={'auto'} refIds={availableRefIds} />;
+          return (
+            <Threshold
+              onChange={onChangeQuery}
+              query={query}
+              labelWidth={'auto'}
+              refIds={availableRefIds}
+              onError={onQueriesValidationError}
+              useHysteresis={true}
+            />
+          );
+
+        case ExpressionQueryType.sql:
+          return <SqlExpr onChange={onChangeQuery} query={query} refIds={availableRefIds} />;
 
         default:
           return <>Expression not supported: {query.type}</>;
       }
     },
-    [onChangeQuery, queries]
+    [onChangeQuery, queries, onQueriesValidationError]
   );
   const selectedExpressionType = expressionTypes.find((o) => o.value === queryType);
   const selectedExpressionDescription = selectedExpressionType?.description ?? '';
@@ -114,12 +140,20 @@ export const Expression: FC<ExpressionProps> = ({
           onUpdateRefId={(newRefId) => onUpdateRefId(query.refId, newRefId)}
           onUpdateExpressionType={(type) => onUpdateExpressionType(query.refId, type)}
           onSetCondition={onSetCondition}
-          warning={warning}
-          error={error}
           query={query}
           alertCondition={alertCondition}
         />
         <div className={styles.expression.body}>
+          {error && (
+            <Alert title="Expression failed" severity="error">
+              {error.message}
+            </Alert>
+          )}
+          {warning && (
+            <Alert title="Expression warning" severity="warning">
+              {warning.message}
+            </Alert>
+          )}
           <div className={styles.expression.description}>{selectedExpressionDescription}</div>
           {renderExpressionType(query)}
         </div>
@@ -253,8 +287,6 @@ interface HeaderProps {
   onUpdateRefId: (refId: string) => void;
   onRemoveExpression: () => void;
   onUpdateExpressionType: (type: ExpressionQueryType) => void;
-  warning?: Error;
-  error?: Error;
   onSetCondition: (refId: string) => void;
   query: ExpressionQuery;
   alertCondition: boolean;
@@ -265,11 +297,9 @@ const Header: FC<HeaderProps> = ({
   queryType,
   onUpdateRefId,
   onRemoveExpression,
-  warning,
   onSetCondition,
   alertCondition,
   query,
-  error,
 }) => {
   const styles = useStyles2(getStyles);
   const clearButton = useStyles2(clearButtonStyles);
@@ -288,7 +318,7 @@ const Header: FC<HeaderProps> = ({
   return (
     <header className={styles.header.wrapper}>
       <Stack direction="row" gap={0.5} alignItems="center">
-        <Stack direction="row" gap={1} alignItems="center" wrap={false}>
+        <Stack direction="row" gap={1} alignItems="center">
           {!editingRefId && (
             <button type="button" className={cx(clearButton, styles.editable)} onClick={() => setEditMode('refId')}>
               <div className={styles.expression.refId}>{refId}</div>
@@ -313,12 +343,7 @@ const Header: FC<HeaderProps> = ({
           <div>{getExpressionLabel(queryType)}</div>
         </Stack>
         <Spacer />
-        <ExpressionStatusIndicator
-          error={error}
-          warning={warning}
-          onSetCondition={() => onSetCondition(query.refId)}
-          isCondition={alertCondition}
-        />
+        <ExpressionStatusIndicator onSetCondition={() => onSetCondition(query.refId)} isCondition={alertCondition} />
         <IconButton
           name="trash-alt"
           variant="secondary"
diff --git a/public/app/features/alerting/unified/components/expressions/ExpressionStatusIndicator.test.tsx b/public/app/features/alerting/unified/components/expressions/ExpressionStatusIndicator.test.tsx
index 1d8add4e3d71a..bab68c9c6dc9d 100644
--- a/public/app/features/alerting/unified/components/expressions/ExpressionStatusIndicator.test.tsx
+++ b/public/app/features/alerting/unified/components/expressions/ExpressionStatusIndicator.test.tsx
@@ -4,47 +4,15 @@ import React from 'react';
 import { ExpressionStatusIndicator } from './ExpressionStatusIndicator';
 
 describe('ExpressionStatusIndicator', () => {
-  it('should render two elements when error and not condition', () => {
-    render(<ExpressionStatusIndicator isCondition={false} warning={new Error('this is a warning')} />);
-
-    expect(screen.getByText('Warning')).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: 'Set as alert condition' })).toBeInTheDocument();
-  });
-
-  it('should render one element when warning and condition', () => {
-    render(<ExpressionStatusIndicator isCondition warning={new Error('this is a warning')} />);
-
-    expect(screen.getByText('Alert condition')).toBeInTheDocument();
-    expect(screen.queryByRole('button', { name: 'Set as alert condition' })).not.toBeInTheDocument();
-  });
-
-  it('should render two elements when error and not condition', () => {
-    render(<ExpressionStatusIndicator isCondition={false} error={new Error('this is a error')} />);
-
-    expect(screen.getByText('Error')).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: 'Set as alert condition' })).toBeInTheDocument();
-  });
-
-  it('should render one element when error and condition', () => {
-    render(<ExpressionStatusIndicator isCondition error={new Error('this is a error')} />);
-
-    expect(screen.getByText('Alert condition')).toBeInTheDocument();
-    expect(screen.queryByRole('button', { name: 'Set as alert condition' })).not.toBeInTheDocument();
-  });
-
   it('should render one element if condition', () => {
     render(<ExpressionStatusIndicator isCondition />);
 
-    expect(screen.queryByText('Error')).not.toBeInTheDocument();
-    expect(screen.queryByText('Warning')).not.toBeInTheDocument();
     expect(screen.getByText('Alert condition')).toBeInTheDocument();
   });
 
   it('should render one element if not condition', () => {
     render(<ExpressionStatusIndicator isCondition={false} />);
 
-    expect(screen.queryByText('Error')).not.toBeInTheDocument();
-    expect(screen.queryByText('Warning')).not.toBeInTheDocument();
     expect(screen.queryByRole('button', { name: 'Alert condition' })).not.toBeInTheDocument();
     expect(screen.getByRole('button', { name: 'Set as alert condition' })).toBeInTheDocument();
   });
diff --git a/public/app/features/alerting/unified/components/expressions/ExpressionStatusIndicator.tsx b/public/app/features/alerting/unified/components/expressions/ExpressionStatusIndicator.tsx
index 28a668e25b03f..71dbdd91297fb 100644
--- a/public/app/features/alerting/unified/components/expressions/ExpressionStatusIndicator.tsx
+++ b/public/app/features/alerting/unified/components/expressions/ExpressionStatusIndicator.tsx
@@ -5,35 +5,17 @@ import { GrafanaTheme2 } from '@grafana/data';
 import { Badge, clearButtonStyles, useStyles2 } from '@grafana/ui';
 
 interface AlertConditionProps {
-  warning?: Error;
-  error?: Error;
   isCondition?: boolean;
   onSetCondition?: () => void;
 }
 
-export const ExpressionStatusIndicator = ({ error, warning, isCondition, onSetCondition }: AlertConditionProps) => {
+export const ExpressionStatusIndicator = ({ isCondition, onSetCondition }: AlertConditionProps) => {
   const styles = useStyles2(getStyles);
 
-  const elements: JSX.Element[] = [];
-
-  if (error && isCondition) {
-    return <Badge color="red" icon="exclamation-circle" text="Alert condition" tooltip={error.message} />;
-  } else if (error) {
-    elements.push(<Badge key="error" color="red" icon="exclamation-circle" text="Error" tooltip={error.message} />);
-  }
-
-  if (warning && isCondition) {
-    return <Badge color="orange" icon="exclamation-triangle" text="Alert condition" tooltip={warning.message} />;
-  } else if (warning) {
-    elements.push(
-      <Badge key="warning" color="orange" icon="exclamation-triangle" text="Warning" tooltip={warning.message} />
-    );
-  }
-
   if (isCondition) {
-    elements.unshift(<Badge key="condition" color="green" icon="check" text="Alert condition" />);
+    return <Badge key="condition" color="green" icon="check" text="Alert condition" />;
   } else {
-    elements.unshift(
+    return (
       <button
         key="make-condition"
         type="button"
@@ -44,8 +26,6 @@ export const ExpressionStatusIndicator = ({ error, warning, isCondition, onSetCo
       </button>
     );
   }
-
-  return <>{elements}</>;
 };
 
 const getStyles = (theme: GrafanaTheme2) => {
diff --git a/public/app/features/alerting/unified/components/expressions/util.test.ts b/public/app/features/alerting/unified/components/expressions/util.test.ts
index 7a20b352698b6..f8cb2d39d23ab 100644
--- a/public/app/features/alerting/unified/components/expressions/util.test.ts
+++ b/public/app/features/alerting/unified/components/expressions/util.test.ts
@@ -1,6 +1,18 @@
 import { DataFrame, FieldType, toDataFrame } from '@grafana/data';
+import { CombinedRuleNamespace } from 'app/types/unified-alerting';
 
-import { getSeriesName, formatLabels, getSeriesValue, isEmptySeries, getSeriesLabels } from './util';
+import { mockDataSource } from '../../mocks';
+import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
+
+import {
+  decodeGrafanaNamespace,
+  encodeGrafanaNamespace,
+  formatLabels,
+  getSeriesLabels,
+  getSeriesName,
+  getSeriesValue,
+  isEmptySeries,
+} from './util';
 
 const EMPTY_FRAME: DataFrame = toDataFrame([]);
 const NAMED_FRAME: DataFrame = {
@@ -34,6 +46,124 @@ describe('formatLabels', () => {
   });
 });
 
+describe('decodeGrafanaNamespace', () => {
+  it('should work for regular Grafana namespaces', () => {
+    const grafanaNamespace: CombinedRuleNamespace = {
+      name: `my_rule_namespace`,
+      rulesSource: GRAFANA_RULES_SOURCE_NAME,
+      groups: [
+        {
+          name: 'group1',
+          rules: [],
+          totals: {},
+        },
+      ],
+    };
+    expect(decodeGrafanaNamespace(grafanaNamespace)).toHaveProperty('name', 'my_rule_namespace');
+    expect(decodeGrafanaNamespace(grafanaNamespace)).toHaveProperty('parents', []);
+  });
+
+  it('should work for Grafana namespaces in nested folders format', () => {
+    const grafanaNamespace: CombinedRuleNamespace = {
+      name: `["parentUID","my_rule_namespace"]`,
+      rulesSource: GRAFANA_RULES_SOURCE_NAME,
+      groups: [
+        {
+          name: 'group1',
+          rules: [],
+          totals: {},
+        },
+      ],
+    };
+
+    expect(decodeGrafanaNamespace(grafanaNamespace)).toHaveProperty('name', 'my_rule_namespace');
+    expect(decodeGrafanaNamespace(grafanaNamespace)).toHaveProperty('parents', ['parentUID']);
+  });
+
+  it('should default to name if format is invalid: invalid JSON', () => {
+    const grafanaNamespace: CombinedRuleNamespace = {
+      name: `["parentUID"`,
+      rulesSource: GRAFANA_RULES_SOURCE_NAME,
+      groups: [
+        {
+          name: 'group1',
+          rules: [],
+          totals: {},
+        },
+      ],
+    };
+
+    expect(decodeGrafanaNamespace(grafanaNamespace)).toHaveProperty('name', `["parentUID"`);
+    expect(decodeGrafanaNamespace(grafanaNamespace)).toHaveProperty('parents', []);
+  });
+
+  it('should default to name if format is invalid: empty array', () => {
+    const grafanaNamespace: CombinedRuleNamespace = {
+      name: `[]`,
+      rulesSource: GRAFANA_RULES_SOURCE_NAME,
+      groups: [
+        {
+          name: 'group1',
+          rules: [],
+          totals: {},
+        },
+      ],
+    };
+
+    expect(decodeGrafanaNamespace(grafanaNamespace)).toHaveProperty('name', `[]`);
+    expect(decodeGrafanaNamespace(grafanaNamespace)).toHaveProperty('parents', []);
+  });
+
+  it('grab folder name if format is long array', () => {
+    const grafanaNamespace: CombinedRuleNamespace = {
+      name: `["parentUID","my_rule_namespace","another_part"]`,
+      rulesSource: GRAFANA_RULES_SOURCE_NAME,
+      groups: [
+        {
+          name: 'group1',
+          rules: [],
+          totals: {},
+        },
+      ],
+    };
+
+    expect(decodeGrafanaNamespace(grafanaNamespace)).toHaveProperty('name', 'another_part');
+    expect(decodeGrafanaNamespace(grafanaNamespace)).toHaveProperty('parents', ['parentUID', 'my_rule_namespace']);
+  });
+
+  it('should not change output for cloud namespaces', () => {
+    const cloudNamespace: CombinedRuleNamespace = {
+      name: `["parentUID","my_rule_namespace"]`,
+      rulesSource: mockDataSource(),
+      groups: [
+        {
+          name: 'Prom group',
+          rules: [],
+          totals: {},
+        },
+      ],
+    };
+
+    expect(decodeGrafanaNamespace(cloudNamespace)).toHaveProperty('name', `["parentUID","my_rule_namespace"]`);
+    expect(decodeGrafanaNamespace(cloudNamespace)).toHaveProperty('parents', []);
+  });
+});
+
+describe('encodeGrafanaNamespace', () => {
+  it('should encode with parents', () => {
+    const name = 'folder';
+    const parents = ['1', '2', '3'];
+
+    expect(encodeGrafanaNamespace(name, parents)).toBe(`["1","2","3","folder"]`);
+  });
+
+  it('should encode without parents', () => {
+    const name = 'folder';
+
+    expect(encodeGrafanaNamespace(name)).toBe(`["folder"]`);
+  });
+});
+
 describe('isEmptySeries', () => {
   it('should be true for empty series', () => {
     expect(isEmptySeries([EMPTY_FRAME])).toBe(true);
diff --git a/public/app/features/alerting/unified/components/expressions/util.ts b/public/app/features/alerting/unified/components/expressions/util.ts
index 2375f61e82091..07d732eb27bee 100644
--- a/public/app/features/alerting/unified/components/expressions/util.ts
+++ b/public/app/features/alerting/unified/components/expressions/util.ts
@@ -1,4 +1,9 @@
+import { dropRight, last } from 'lodash';
+
 import { DataFrame, Labels, roundDecimals } from '@grafana/data';
+import { CombinedRuleNamespace } from 'app/types/unified-alerting';
+
+import { isCloudRulesSource } from '../../utils/datasource';
 
 /**
  * ⚠️ `frame.fields` could be an empty array ⚠️
@@ -37,10 +42,66 @@ const formatLabels = (labels: Labels): string => {
     .join(', ');
 };
 
+interface DecodedNamespace {
+  name: string;
+  parents: string[];
+}
+
+/**
+ * After https://github.com/grafana/grafana/pull/74600,
+ * Grafana folder names will be returned from the API as a combination of the folder name and parent UID in a format of JSON array,
+ * where first element is parent UID and the second element is Title.
+ *
+ * Here we parse this to return the name of the last folder and the array of parent folders
+ */
+const decodeGrafanaNamespace = (namespace: CombinedRuleNamespace): DecodedNamespace => {
+  const namespaceName = namespace.name;
+
+  if (isCloudRulesSource(namespace.rulesSource)) {
+    return {
+      name: namespaceName,
+      parents: [],
+    };
+  }
+
+  // try to parse the folder as a nested folder, if it fails fall back to returning the folder name as-is.
+  try {
+    const folderParts: string[] = JSON.parse(namespaceName);
+    if (!Array.isArray(folderParts)) {
+      throw new Error('not a nested Grafana folder');
+    }
+
+    const name = last(folderParts) ?? namespaceName;
+    const parents = dropRight(folderParts, 1);
+
+    return {
+      name,
+      parents,
+    };
+  } catch {
+    return {
+      name: namespace.name,
+      parents: [],
+    };
+  }
+};
+
+const encodeGrafanaNamespace = (name: string, parents: string[] | undefined = []) => {
+  return JSON.stringify(parents.concat(name));
+};
+
 const isEmptySeries = (series: DataFrame[]): boolean => {
   const isEmpty = series.every((serie) => serie.fields.every((field) => field.values.every((value) => value == null)));
 
   return isEmpty;
 };
 
-export { getSeriesName, getSeriesValue, getSeriesLabels, formatLabels, isEmptySeries };
+export {
+  decodeGrafanaNamespace,
+  encodeGrafanaNamespace,
+  formatLabels,
+  getSeriesLabels,
+  getSeriesName,
+  getSeriesValue,
+  isEmptySeries,
+};
diff --git a/public/app/features/alerting/unified/components/extensions/AlertInstanceExtensionPoint.tsx b/public/app/features/alerting/unified/components/extensions/AlertInstanceExtensionPoint.tsx
new file mode 100644
index 0000000000000..760c25fbca45a
--- /dev/null
+++ b/public/app/features/alerting/unified/components/extensions/AlertInstanceExtensionPoint.tsx
@@ -0,0 +1,65 @@
+import React, { ReactElement, useMemo, useState } from 'react';
+
+import { PluginExtensionLink, PluginExtensionPoints } from '@grafana/data';
+import { getPluginLinkExtensions } from '@grafana/runtime';
+import { Dropdown, IconButton } from '@grafana/ui';
+import { ConfirmNavigationModal } from 'app/features/explore/extensions/ConfirmNavigationModal';
+import { Alert, CombinedRule } from 'app/types/unified-alerting';
+
+import { AlertExtensionPointMenu } from './AlertInstanceExtensionPointMenu';
+
+interface AlertInstanceExtensionPointProps {
+  rule?: CombinedRule;
+  instance: Alert;
+  extensionPointId: PluginExtensionPoints;
+}
+
+export const AlertInstanceExtensionPoint = ({
+  rule,
+  instance,
+  extensionPointId,
+}: AlertInstanceExtensionPointProps): ReactElement | null => {
+  const [selectedExtension, setSelectedExtension] = useState<PluginExtensionLink | undefined>();
+  const context = { instance, rule };
+  const extensions = useExtensionLinks(context, extensionPointId);
+
+  if (extensions.length === 0) {
+    return null;
+  }
+
+  const menu = <AlertExtensionPointMenu extensions={extensions} onSelect={setSelectedExtension} />;
+  return (
+    <>
+      <Dropdown placement="bottom-start" overlay={menu}>
+        <IconButton name="ellipsis-v" aria-label="Actions" variant="secondary" />
+      </Dropdown>
+      {!!selectedExtension && !!selectedExtension.path && (
+        <ConfirmNavigationModal
+          path={selectedExtension.path}
+          title={selectedExtension.title}
+          onDismiss={() => setSelectedExtension(undefined)}
+        />
+      )}
+    </>
+  );
+};
+
+export type PluginExtensionAlertInstanceContext = {
+  rule?: CombinedRule;
+  instance: Alert;
+};
+
+function useExtensionLinks(
+  context: PluginExtensionAlertInstanceContext,
+  extensionPointId: PluginExtensionPoints
+): PluginExtensionLink[] {
+  return useMemo(() => {
+    const { extensions } = getPluginLinkExtensions({
+      extensionPointId,
+      context,
+      limitPerPlugin: 3,
+    });
+
+    return extensions;
+  }, [context, extensionPointId]);
+}
diff --git a/public/app/features/alerting/unified/components/extensions/AlertInstanceExtensionPointMenu.tsx b/public/app/features/alerting/unified/components/extensions/AlertInstanceExtensionPointMenu.tsx
new file mode 100644
index 0000000000000..e9f270d7129f6
--- /dev/null
+++ b/public/app/features/alerting/unified/components/extensions/AlertInstanceExtensionPointMenu.tsx
@@ -0,0 +1,2 @@
+// We might want to customise this in future but right now the toolbar menu from the Explore view is fine.
+export { ToolbarExtensionPointMenu as AlertExtensionPointMenu } from 'app/features/explore/extensions/ToolbarExtensionPointMenu';
diff --git a/public/app/features/alerting/unified/components/mute-timings/MuteTimingForm.tsx b/public/app/features/alerting/unified/components/mute-timings/MuteTimingForm.tsx
index 781c25ede1bac..fbecd60d8c13e 100644
--- a/public/app/features/alerting/unified/components/mute-timings/MuteTimingForm.tsx
+++ b/public/app/features/alerting/unified/components/mute-timings/MuteTimingForm.tsx
@@ -12,14 +12,16 @@ import { useAlertmanager } from '../../state/AlertmanagerContext';
 import { updateAlertManagerConfigAction } from '../../state/actions';
 import { MuteTimingFields } from '../../types/mute-timing-form';
 import { renameMuteTimings } from '../../utils/alertmanager';
+import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
 import { makeAMLink } from '../../utils/misc';
-import { createMuteTiming, defaultTimeInterval } from '../../utils/mute-timings';
+import { createMuteTiming, defaultTimeInterval, isTimeIntervalDisabled } from '../../utils/mute-timings';
 import { ProvisionedResource, ProvisioningAlert } from '../Provisioning';
 
 import { MuteTimingTimeInterval } from './MuteTimingTimeInterval';
 
 interface Props {
-  muteTiming?: MuteTimeInterval;
+  fromLegacyTimeInterval?: MuteTimeInterval; // mute time interval when comes from the old config , mute_time_intervals
+  fromTimeIntervals?: MuteTimeInterval; // mute time interval when comes from the new config , time_intervals. These two fields are mutually exclusive
   showError?: boolean;
   provenance?: string;
   loading?: boolean;
@@ -36,12 +38,13 @@ const useDefaultValues = (muteTiming?: MuteTimeInterval): MuteTimingFields => {
   }
 
   const intervals = muteTiming.time_intervals.map((interval) => ({
-    times: interval.times ?? defaultTimeInterval.times,
-    weekdays: interval.weekdays?.join(', ') ?? defaultTimeInterval.weekdays,
-    days_of_month: interval.days_of_month?.join(', ') ?? defaultTimeInterval.days_of_month,
-    months: interval.months?.join(', ') ?? defaultTimeInterval.months,
-    years: interval.years?.join(', ') ?? defaultTimeInterval.years,
+    times: interval.times,
+    weekdays: interval.weekdays?.join(', '),
+    days_of_month: interval.days_of_month?.join(', '),
+    months: interval.months?.join(', '),
+    years: interval.years?.join(', '),
     location: interval.location ?? defaultTimeInterval.location,
+    disable: isTimeIntervalDisabled(interval),
   }));
 
   return {
@@ -50,7 +53,26 @@ const useDefaultValues = (muteTiming?: MuteTimeInterval): MuteTimingFields => {
   };
 };
 
-const MuteTimingForm = ({ muteTiming, showError, loading, provenance }: Props) => {
+const replaceMuteTiming = (
+  originalTimings: MuteTimeInterval[],
+  existingTiming: MuteTimeInterval | undefined,
+  newTiming: MuteTimeInterval,
+  addNew: boolean
+) => {
+  // we only add new timing if addNew is true. Otherwise, we just remove the existing timing
+  const originalTimingsWithoutNew = existingTiming
+    ? originalTimings?.filter(({ name }) => name !== existingTiming.name)
+    : originalTimings;
+  return addNew ? [...originalTimingsWithoutNew, newTiming] : [...originalTimingsWithoutNew];
+};
+
+const MuteTimingForm = ({
+  fromLegacyTimeInterval: fromMuteTimings,
+  fromTimeIntervals,
+  showError,
+  loading,
+  provenance,
+}: Props) => {
   const dispatch = useDispatch();
   const { selectedAlertmanager } = useAlertmanager();
   const styles = useStyles2(getStyles);
@@ -60,6 +82,12 @@ const MuteTimingForm = ({ muteTiming, showError, loading, provenance }: Props) =
   const { currentData: result } = useAlertmanagerConfig(selectedAlertmanager);
   const config = result?.alertmanager_config;
 
+  const fromIntervals = Boolean(fromTimeIntervals);
+  const muteTiming = fromIntervals ? fromTimeIntervals : fromMuteTimings;
+
+  const originalMuteTimings = config?.mute_time_intervals ?? [];
+  const originalTimeIntervals = config?.time_intervals ?? [];
+
   const defaultValues = useDefaultValues(muteTiming);
   const formApi = useForm({ defaultValues });
 
@@ -70,19 +98,44 @@ const MuteTimingForm = ({ muteTiming, showError, loading, provenance }: Props) =
 
     const newMuteTiming = createMuteTiming(values);
 
-    const muteTimings = muteTiming
-      ? config?.mute_time_intervals?.filter(({ name }) => name !== muteTiming.name)
-      : config?.mute_time_intervals;
-
+    const isGrafanaDataSource = selectedAlertmanager === GRAFANA_RULES_SOURCE_NAME;
+    const isNewMuteTiming = fromTimeIntervals === undefined && fromMuteTimings === undefined;
+
+    // If is Grafana data source, we wil save mute timings in the alertmanager_config.mute_time_intervals
+    // Otherwise, we will save it on alertmanager_config.time_intervals or alertmanager_config.mute_time_intervals depending on the original config
+
+    const newMutetimeIntervals = isGrafanaDataSource
+      ? {
+          // for Grafana data source, we will save mute timings in the alertmanager_config.mute_time_intervals
+          mute_time_intervals: [
+            ...replaceMuteTiming(originalTimeIntervals, fromTimeIntervals, newMuteTiming, false),
+            ...replaceMuteTiming(originalMuteTimings, fromMuteTimings, newMuteTiming, true),
+          ],
+        }
+      : {
+          // for non-Grafana data source, we will save mute timings in the alertmanager_config.time_intervals or alertmanager_config.mute_time_intervals depending on the original config
+          time_intervals: replaceMuteTiming(
+            originalTimeIntervals,
+            fromTimeIntervals,
+            newMuteTiming,
+            Boolean(fromTimeIntervals) || isNewMuteTiming
+          ),
+          mute_time_intervals:
+            Boolean(fromMuteTimings) && !isNewMuteTiming
+              ? replaceMuteTiming(originalMuteTimings, fromMuteTimings, newMuteTiming, true)
+              : undefined,
+        };
+
+    const { mute_time_intervals: _, time_intervals: __, ...configWithoutMuteTimings } = config ?? {};
     const newConfig: AlertManagerCortexConfig = {
       ...result,
       alertmanager_config: {
-        ...config,
+        ...configWithoutMuteTimings,
         route:
           muteTiming && newMuteTiming.name !== muteTiming.name
             ? renameMuteTimings(newMuteTiming.name, muteTiming.name, config?.route ?? {})
             : config?.route,
-        mute_time_intervals: [...(muteTimings || []), newMuteTiming],
+        ...newMutetimeIntervals,
       },
     };
 
@@ -123,13 +176,8 @@ const MuteTimingForm = ({ muteTiming, showError, loading, provenance }: Props) =
                 <Input
                   {...formApi.register('name', {
                     required: true,
-                    validate: (value) => {
-                      if (!muteTiming) {
-                        const existingMuteTiming = config?.mute_time_intervals?.find(({ name }) => value === name);
-                        return existingMuteTiming ? `Mute timing already exists for "${value}"` : true;
-                      }
-                      return;
-                    },
+                    validate: (value) =>
+                      validateMuteTiming(value, muteTiming, originalMuteTimings, originalTimeIntervals),
                   })}
                   className={styles.input}
                   data-testid={'mute-timing-name'}
@@ -156,6 +204,22 @@ const MuteTimingForm = ({ muteTiming, showError, loading, provenance }: Props) =
   );
 };
 
+function validateMuteTiming(
+  value: string,
+  muteTiming: MuteTimeInterval | undefined,
+  originalMuteTimings: MuteTimeInterval[],
+  originalTimeIntervals: MuteTimeInterval[]
+) {
+  if (!muteTiming) {
+    const existingMuteTimingInMuteTimings = originalMuteTimings?.find(({ name }) => value === name);
+    const existingMuteTimingInTimeIntervals = originalTimeIntervals?.find(({ name }) => value === name);
+    return existingMuteTimingInMuteTimings || existingMuteTimingInTimeIntervals
+      ? `Mute timing already exists for "${value}"`
+      : true;
+  }
+  return;
+}
+
 const getStyles = (theme: GrafanaTheme2) => ({
   input: css`
     width: 400px;
diff --git a/public/app/features/alerting/unified/components/mute-timings/MuteTimingTimeInterval.tsx b/public/app/features/alerting/unified/components/mute-timings/MuteTimingTimeInterval.tsx
index 36dce42c54350..3962b622ab616 100644
--- a/public/app/features/alerting/unified/components/mute-timings/MuteTimingTimeInterval.tsx
+++ b/public/app/features/alerting/unified/components/mute-timings/MuteTimingTimeInterval.tsx
@@ -4,9 +4,9 @@ import React, { useEffect, useState } from 'react';
 import { useFieldArray, useFormContext } from 'react-hook-form';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Button, Field, FieldSet, Icon, Input, useStyles2 } from '@grafana/ui';
+import { Button, Field, FieldSet, Icon, InlineSwitch, Input, Stack, useStyles2 } from '@grafana/ui';
 
+import { useAlertmanager } from '../../state/AlertmanagerContext';
 import { MuteTimingFields } from '../../types/mute-timing-form';
 import { DAYS_OF_THE_WEEK, defaultTimeInterval, MONTHS, validateArrayField } from '../../utils/mute-timings';
 
@@ -15,14 +15,15 @@ import { TimezoneSelect } from './timezones';
 
 export const MuteTimingTimeInterval = () => {
   const styles = useStyles2(getStyles);
-  const { formState, register, setValue } = useFormContext();
+  const { formState, register, setValue } = useFormContext<MuteTimingFields>();
   const {
     fields: timeIntervals,
     append: addTimeInterval,
     remove: removeTimeInterval,
-  } = useFieldArray<MuteTimingFields>({
+  } = useFieldArray({
     name: 'time_intervals',
   });
+  const { isGrafanaAlertmanager } = useAlertmanager();
 
   return (
     <FieldSet label="Time intervals">
@@ -44,7 +45,11 @@ export const MuteTimingTimeInterval = () => {
             return (
               <div key={timeInterval.id} className={styles.timeIntervalSection}>
                 <MuteTimingTimeRange intervalIndex={timeIntervalIndex} />
-                <Field label="Location" invalid={Boolean(errors.location)} error={errors.location?.message}>
+                <Field
+                  label="Location"
+                  invalid={Boolean(errors.time_intervals?.[timeIntervalIndex]?.location)}
+                  error={errors.time_intervals?.[timeIntervalIndex]?.location?.message}
+                >
                   <TimezoneSelect
                     prefix={<Icon name="map-marker" />}
                     width={50}
@@ -128,15 +133,30 @@ export const MuteTimingTimeInterval = () => {
                     data-testid="mute-timing-years"
                   />
                 </Field>
-                <Button
-                  type="button"
-                  variant="destructive"
-                  fill="outline"
-                  icon="trash-alt"
-                  onClick={() => removeTimeInterval(timeIntervalIndex)}
-                >
-                  Remove time interval
-                </Button>
+                <Stack direction="row" gap={2}>
+                  <Button
+                    type="button"
+                    variant="destructive"
+                    fill="outline"
+                    icon="trash-alt"
+                    onClick={() => removeTimeInterval(timeIntervalIndex)}
+                  >
+                    Remove time interval
+                  </Button>
+                  {/* 
+                    This switch is only available for Grafana Alertmanager, as for now, Grafana alert manager doesn't support this feature
+                    It hanldes empty list as undefined making impossible the use of an empty list for disabling time interval
+                  */}
+                  {!isGrafanaAlertmanager && (
+                    <InlineSwitch
+                      id={`time_intervals.${timeIntervalIndex}.disable`}
+                      label="Disable"
+                      showLabel
+                      transparent
+                      {...register(`time_intervals.${timeIntervalIndex}.disable`)}
+                    />
+                  )}
+                </Stack>
               </div>
             );
           })}
diff --git a/public/app/features/alerting/unified/components/mute-timings/MuteTimingTimeRange.tsx b/public/app/features/alerting/unified/components/mute-timings/MuteTimingTimeRange.tsx
index 1e5517b63cc3e..b057a01e95af1 100644
--- a/public/app/features/alerting/unified/components/mute-timings/MuteTimingTimeRange.tsx
+++ b/public/app/features/alerting/unified/components/mute-timings/MuteTimingTimeRange.tsx
@@ -3,9 +3,10 @@ import React from 'react';
 import { useFieldArray, useFormContext } from 'react-hook-form';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Button, Field, Icon, IconButton, InlineField, InlineFieldRow, Input, useStyles2 } from '@grafana/ui';
+import { Button, Field, Icon, IconButton, InlineField, InlineFieldRow, Input, Tooltip, useStyles2 } from '@grafana/ui';
 
 import { MuteTimingFields } from '../../types/mute-timing-form';
+import ConditionalWrap from '../ConditionalWrap';
 
 import { isValidStartAndEndTime, isvalidTimeFormat } from './util';
 
@@ -17,7 +18,8 @@ const INVALID_FORMAT_MESSAGE = 'Times must be between 00:00 and 24:00 UTC';
 
 export const MuteTimingTimeRange = ({ intervalIndex }: Props) => {
   const styles = useStyles2(getStyles);
-  const { register, formState, getValues } = useFormContext<MuteTimingFields>();
+  const { register, formState, getValues, watch } = useFormContext<MuteTimingFields>();
+  const isDisabled = watch(`time_intervals.${intervalIndex}.disable`);
 
   const {
     fields: timeRanges,
@@ -28,14 +30,14 @@ export const MuteTimingTimeRange = ({ intervalIndex }: Props) => {
   });
 
   const formErrors = formState.errors.time_intervals?.[intervalIndex];
-  const timeRangeInvalid = formErrors?.times?.some((value) => value?.start_time || value?.end_time) ?? false;
+  const timeRangeInvalid = formErrors?.times?.some?.((value) => value?.start_time || value?.end_time) ?? false;
 
   return (
     <div>
       <Field
         className={styles.field}
         label="Time range"
-        description="The time inclusive of the starting time and exclusive of the end time in UTC"
+        description="The time inclusive of the start and exclusive of the end time (in UTC if no location has been selected, otherwise local time)"
         invalid={timeRangeInvalid}
       >
         <>
@@ -81,6 +83,7 @@ export const MuteTimingTimeRange = ({ intervalIndex }: Props) => {
                       })}
                       className={styles.timeRangeInput}
                       maxLength={5}
+                      readOnly={isDisabled}
                       suffix={<Icon name="clock-nine" />}
                       // @ts-ignore react-hook-form doesn't handle nested field arrays well
                       defaultValue={timeRange.start_time}
@@ -112,6 +115,7 @@ export const MuteTimingTimeRange = ({ intervalIndex }: Props) => {
                       })}
                       className={styles.timeRangeInput}
                       maxLength={5}
+                      readOnly={isDisabled}
                       suffix={<Icon name="clock-nine" />}
                       // @ts-ignore react-hook-form doesn't handle nested field arrays well
                       defaultValue={timeRange.end_time}
@@ -135,15 +139,25 @@ export const MuteTimingTimeRange = ({ intervalIndex }: Props) => {
           })}
         </>
       </Field>
-      <Button
-        className={styles.addTimeRange}
-        variant="secondary"
-        type="button"
-        icon="plus"
-        onClick={() => addTimeRange({ start_time: '', end_time: '' })}
+      <ConditionalWrap
+        shouldWrap={isDisabled}
+        wrap={(children) => (
+          <Tooltip content="This time interval is disabled" placement="right-start">
+            {children}
+          </Tooltip>
+        )}
       >
-        Add another time range
-      </Button>
+        <Button
+          className={styles.addTimeRange}
+          variant="secondary"
+          type="button"
+          icon="plus"
+          disabled={isDisabled}
+          onClick={() => addTimeRange({ start_time: '', end_time: '' })}
+        >
+          Add another time range
+        </Button>
+      </ConditionalWrap>
     </div>
   );
 };
diff --git a/public/app/features/alerting/unified/components/mute-timings/MuteTimingsTable.test.tsx b/public/app/features/alerting/unified/components/mute-timings/MuteTimingsTable.test.tsx
new file mode 100644
index 0000000000000..17976633b01a1
--- /dev/null
+++ b/public/app/features/alerting/unified/components/mute-timings/MuteTimingsTable.test.tsx
@@ -0,0 +1,62 @@
+import { render, waitFor } from '@testing-library/react';
+import React from 'react';
+import { Provider } from 'react-redux';
+import { Router } from 'react-router-dom';
+
+import { locationService } from '@grafana/runtime';
+import { configureStore } from 'app/store/configureStore';
+import { AccessControlAction } from 'app/types';
+
+import { grantUserPermissions } from '../../mocks';
+import { AlertmanagerProvider } from '../../state/AlertmanagerContext';
+import { GRAFANA_DATASOURCE_NAME } from '../../utils/datasource';
+
+import { MuteTimingsTable } from './MuteTimingsTable';
+
+jest.mock('app/types', () => ({
+  ...jest.requireActual('app/types'),
+  useDispatch: () => jest.fn(),
+}));
+const renderWithProvider = (alertManagerSource?: string) => {
+  const store = configureStore();
+
+  return render(
+    <Provider store={store}>
+      <Router history={locationService.getHistory()}>
+        <AlertmanagerProvider accessType={'notification'} alertmanagerSourceName={alertManagerSource}>
+          <MuteTimingsTable alertManagerSourceName={alertManagerSource ?? GRAFANA_DATASOURCE_NAME} />
+        </AlertmanagerProvider>
+      </Router>
+    </Provider>
+  );
+};
+
+describe('MuteTimingsTable', () => {
+  it(' shows export button when allowed and supported', async () => {
+    grantUserPermissions([
+      AccessControlAction.AlertingNotificationsRead,
+      AccessControlAction.AlertingNotificationsWrite,
+    ]);
+    const { findByRole } = renderWithProvider();
+    expect(await findByRole('button', { name: /export all/i })).toBeInTheDocument();
+  });
+  it('It does not show export button when not allowed ', async () => {
+    // when not allowed
+    grantUserPermissions([]);
+    const { queryByRole } = renderWithProvider();
+    await waitFor(() => {
+      expect(queryByRole('button', { name: /export all/i })).not.toBeInTheDocument();
+    });
+  });
+  it('It does not show export button when not supported ', async () => {
+    // when not supported
+    grantUserPermissions([
+      AccessControlAction.AlertingNotificationsRead,
+      AccessControlAction.AlertingNotificationsWrite,
+    ]);
+    const { queryByRole } = renderWithProvider('potato');
+    await waitFor(() => {
+      expect(queryByRole('button', { name: /export all/i })).not.toBeInTheDocument();
+    });
+  });
+});
diff --git a/public/app/features/alerting/unified/components/mute-timings/MuteTimingsTable.tsx b/public/app/features/alerting/unified/components/mute-timings/MuteTimingsTable.tsx
index 8c8017e0a6e6d..69dec20bbc41b 100644
--- a/public/app/features/alerting/unified/components/mute-timings/MuteTimingsTable.tsx
+++ b/public/app/features/alerting/unified/components/mute-timings/MuteTimingsTable.tsx
@@ -1,9 +1,9 @@
 import { css } from '@emotion/css';
-import React, { useMemo, useState } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
+import { useToggle } from 'react-use';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { IconButton, LinkButton, Link, useStyles2, ConfirmModal } from '@grafana/ui';
+import { Badge, Button, ConfirmModal, IconButton, Link, LinkButton, Menu, Stack, useStyles2 } from '@grafana/ui';
 import { MuteTimeInterval } from 'app/plugins/datasource/alertmanager/types';
 import { useDispatch } from 'app/types/store';
 
@@ -11,21 +11,59 @@ import { Authorize } from '../../components/Authorize';
 import { AlertmanagerAction, useAlertmanagerAbilities, useAlertmanagerAbility } from '../../hooks/useAbilities';
 import { useAlertmanagerConfig } from '../../hooks/useAlertmanagerConfig';
 import { deleteMuteTimingAction } from '../../state/actions';
+import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
 import { makeAMLink } from '../../utils/misc';
-import { DynamicTable, DynamicTableItemProps, DynamicTableColumnProps } from '../DynamicTable';
+import { isDisabled } from '../../utils/mute-timings';
+import { DynamicTable, DynamicTableColumnProps, DynamicTableItemProps } from '../DynamicTable';
 import { EmptyAreaWithCTA } from '../EmptyAreaWithCTA';
 import { ProvisioningBadge } from '../Provisioning';
 import { Spacer } from '../Spacer';
+import { GrafanaMuteTimingsExporter } from '../export/GrafanaMuteTimingsExporter';
 
-import { renderTimeIntervals } from './util';
+import { mergeTimeIntervals, renderTimeIntervals } from './util';
 
-interface Props {
+const ALL_MUTE_TIMINGS = Symbol('all mute timings');
+
+type ExportProps = [JSX.Element | null, (muteTiming: string | typeof ALL_MUTE_TIMINGS) => void];
+
+const useExportMuteTiming = (): ExportProps => {
+  const [muteTimingName, setMuteTimingName] = useState<string | typeof ALL_MUTE_TIMINGS | null>(null);
+  const [isExportDrawerOpen, toggleShowExportDrawer] = useToggle(false);
+
+  const handleClose = useCallback(() => {
+    setMuteTimingName(null);
+    toggleShowExportDrawer(false);
+  }, [toggleShowExportDrawer]);
+
+  const handleOpen = (receiverName: string | typeof ALL_MUTE_TIMINGS) => {
+    setMuteTimingName(receiverName);
+    toggleShowExportDrawer(true);
+  };
+
+  const drawer = useMemo(() => {
+    if (!muteTimingName || !isExportDrawerOpen) {
+      return null;
+    }
+
+    if (muteTimingName === ALL_MUTE_TIMINGS) {
+      // use this drawer when we want to export all mute timings
+      return <GrafanaMuteTimingsExporter onClose={handleClose} />;
+    } else {
+      // use this one for exporting a single mute timing
+      return <GrafanaMuteTimingsExporter muteTimingName={muteTimingName} onClose={handleClose} />;
+    }
+  }, [isExportDrawerOpen, handleClose, muteTimingName]);
+
+  return [drawer, handleOpen];
+};
+
+interface MuteTimingsTableProps {
   alertManagerSourceName: string;
   muteTimingNames?: string[];
   hideActions?: boolean;
 }
 
-export const MuteTimingsTable = ({ alertManagerSourceName, muteTimingNames, hideActions }: Props) => {
+export const MuteTimingsTable = ({ alertManagerSourceName, muteTimingNames, hideActions }: MuteTimingsTableProps) => {
   const styles = useStyles2(getStyles);
   const dispatch = useDispatch();
 
@@ -36,9 +74,9 @@ export const MuteTimingsTable = ({ alertManagerSourceName, muteTimingNames, hide
   const config = currentData?.alertmanager_config;
 
   const [muteTimingName, setMuteTimingName] = useState<string>('');
-
   const items = useMemo((): Array<DynamicTableItemProps<MuteTimeInterval>> => {
-    const muteTimings = config?.mute_time_intervals ?? [];
+    // merge both fields mute_time_intervals and time_intervals to support both old and new config
+    const muteTimings = config ? mergeTimeIntervals(config) : [];
     const muteTimingsProvenances = config?.muteTimeProvenances ?? {};
 
     return muteTimings
@@ -52,11 +90,16 @@ export const MuteTimingsTable = ({ alertManagerSourceName, muteTimingNames, hide
           },
         };
       });
-  }, [config?.mute_time_intervals, config?.muteTimeProvenances, muteTimingNames]);
+  }, [muteTimingNames, config]);
 
-  const columns = useColumns(alertManagerSourceName, hideActions, setMuteTimingName);
   const [_, allowedToCreateMuteTiming] = useAlertmanagerAbility(AlertmanagerAction.CreateMuteTiming);
 
+  const [ExportDrawer, showExportDrawer] = useExportMuteTiming();
+  const [exportMuteTimingsSupported, exportMuteTimingsAllowed] = useAlertmanagerAbility(
+    AlertmanagerAction.ExportMuteTimings
+  );
+  const columns = useColumns(alertManagerSourceName, hideActions, setMuteTimingName, showExportDrawer);
+
   return (
     <div className={styles.container}>
       <Stack direction="row" alignItems="center">
@@ -68,7 +111,7 @@ export const MuteTimingsTable = ({ alertManagerSourceName, muteTimingNames, hide
         {!hideActions && items.length > 0 && (
           <Authorize actions={[AlertmanagerAction.CreateMuteTiming]}>
             <LinkButton
-              className={styles.addMuteButton}
+              className={styles.muteTimingsButtons}
               icon="plus"
               variant="primary"
               href={makeAMLink('alerting/routes/mute-timing/new', alertManagerSourceName)}
@@ -77,6 +120,18 @@ export const MuteTimingsTable = ({ alertManagerSourceName, muteTimingNames, hide
             </LinkButton>
           </Authorize>
         )}
+        {exportMuteTimingsSupported && (
+          <Button
+            icon="download-alt"
+            className={styles.muteTimingsButtons}
+            variant="secondary"
+            aria-label="export all"
+            disabled={!exportMuteTimingsAllowed}
+            onClick={() => showExportDrawer(ALL_MUTE_TIMINGS)}
+          >
+            Export all
+          </Button>
+        )}
       </Stack>
       {items.length > 0 ? (
         <DynamicTable items={items} cols={columns} pagination={{ itemsPerPage: 25 }} />
@@ -105,17 +160,26 @@ export const MuteTimingsTable = ({ alertManagerSourceName, muteTimingNames, hide
           onDismiss={() => setMuteTimingName('')}
         />
       )}
+      {ExportDrawer}
     </div>
   );
 };
 
-function useColumns(alertManagerSourceName: string, hideActions = false, setMuteTimingName: (name: string) => void) {
+function useColumns(
+  alertManagerSourceName: string,
+  hideActions = false,
+  setMuteTimingName: (name: string) => void,
+  openExportDrawer: (muteTiming: string | typeof ALL_MUTE_TIMINGS) => void
+) {
   const [[_editSupported, allowedToEdit], [_deleteSupported, allowedToDelete]] = useAlertmanagerAbilities([
     AlertmanagerAction.UpdateMuteTiming,
     AlertmanagerAction.DeleteMuteTiming,
   ]);
   const showActions = !hideActions && (allowedToEdit || allowedToDelete);
 
+  const [exportSupported, exportAllowed] = useAlertmanagerAbility(AlertmanagerAction.ExportMuteTimings);
+  const styles = useStyles2(getStyles);
+
   return useMemo((): Array<DynamicTableColumnProps<MuteTimeInterval>> => {
     const columns: Array<DynamicTableColumnProps<MuteTimeInterval>> = [
       {
@@ -141,39 +205,35 @@ function useColumns(alertManagerSourceName: string, hideActions = false, setMute
     if (showActions) {
       columns.push({
         id: 'actions',
-        label: 'Actions',
+        label: '',
+        renderCell: function renderActions({ data }) {
+          return (
+            <ActionsAndBadge
+              muteTiming={data}
+              alertManagerSourceName={alertManagerSourceName}
+              setMuteTimingName={setMuteTimingName}
+            />
+          );
+        },
+        size: '150px',
+        className: styles.actionsColumn,
+      });
+    }
+    if (exportSupported) {
+      columns.push({
+        id: 'actions',
+        label: '',
         renderCell: function renderActions({ data }) {
-          if (data.provenance) {
-            return (
-              <div>
-                <Link
-                  href={makeAMLink(`/alerting/routes/mute-timing/edit`, alertManagerSourceName, {
-                    muteName: data.name,
-                  })}
-                >
-                  <IconButton name="file-alt" tooltip="View mute timing" />
-                </Link>
-              </div>
-            );
-          }
           return (
             <div>
-              <Authorize actions={[AlertmanagerAction.UpdateMuteTiming]}>
-                <Link
-                  href={makeAMLink(`/alerting/routes/mute-timing/edit`, alertManagerSourceName, {
-                    muteName: data.name,
-                  })}
-                >
-                  <IconButton name="edit" tooltip="Edit mute timing" />
-                </Link>
-              </Authorize>
-              <Authorize actions={[AlertmanagerAction.DeleteMuteTiming]}>
-                <IconButton
-                  name="trash-alt"
-                  tooltip="Delete mute timing"
-                  onClick={() => setMuteTimingName(data.name)}
-                />
-              </Authorize>
+              <Menu.Item
+                icon="download-alt"
+                label="Export"
+                ariaLabel="export"
+                disabled={!exportAllowed}
+                data-testid="export"
+                onClick={() => openExportDrawer(data.name)}
+              />
             </div>
           );
         },
@@ -181,7 +241,62 @@ function useColumns(alertManagerSourceName: string, hideActions = false, setMute
       });
     }
     return columns;
-  }, [alertManagerSourceName, setMuteTimingName, showActions]);
+  }, [
+    alertManagerSourceName,
+    setMuteTimingName,
+    showActions,
+    exportSupported,
+    exportAllowed,
+    openExportDrawer,
+    styles.actionsColumn,
+  ]);
+}
+
+interface ActionsAndBadgeProps {
+  muteTiming: MuteTimeInterval;
+  alertManagerSourceName: string;
+  setMuteTimingName: (name: string) => void;
+}
+
+function ActionsAndBadge({ muteTiming, alertManagerSourceName, setMuteTimingName }: ActionsAndBadgeProps) {
+  const styles = useStyles2(getStyles);
+  const isGrafanaDataSource = alertManagerSourceName === GRAFANA_RULES_SOURCE_NAME;
+
+  if (muteTiming.provenance) {
+    return (
+      <Stack direction="row" alignItems="center" justifyContent="flex-end">
+        {isDisabled(muteTiming) && !isGrafanaDataSource && (
+          <Badge text="Disabled" color="orange" className={styles.disabledBadge} />
+        )}
+        <Link
+          href={makeAMLink(`/alerting/routes/mute-timing/edit`, alertManagerSourceName, {
+            muteName: muteTiming.name,
+          })}
+        >
+          <IconButton name="file-alt" tooltip="View mute timing" />
+        </Link>
+      </Stack>
+    );
+  }
+  return (
+    <Stack direction="row" alignItems="center" justifyContent="flex-end">
+      {isDisabled(muteTiming) && !isGrafanaDataSource && (
+        <Badge text="Disabled" color="orange" className={styles.disabledBadge} />
+      )}
+      <Authorize actions={[AlertmanagerAction.UpdateMuteTiming]}>
+        <Link
+          href={makeAMLink(`/alerting/routes/mute-timing/edit`, alertManagerSourceName, {
+            muteName: muteTiming.name,
+          })}
+        >
+          <IconButton name="edit" tooltip="Edit mute timing" className={styles.editButton} />
+        </Link>
+      </Authorize>
+      <Authorize actions={[AlertmanagerAction.DeleteMuteTiming]}>
+        <IconButton name="trash-alt" tooltip="Delete mute timing" onClick={() => setMuteTimingName(muteTiming.name)} />
+      </Authorize>
+    </Stack>
+  );
 }
 
 const getStyles = (theme: GrafanaTheme2) => ({
@@ -189,8 +304,17 @@ const getStyles = (theme: GrafanaTheme2) => ({
     display: flex;
     flex-flow: column nowrap;
   `,
-  addMuteButton: css`
+  muteTimingsButtons: css`
     margin-bottom: ${theme.spacing(2)};
     align-self: flex-end;
   `,
+  disabledBadge: css({
+    height: 'fit-content',
+  }),
+  editButton: css({
+    display: 'flex',
+  }),
+  actionsColumn: css({
+    justifyContent: 'flex-end',
+  }),
 });
diff --git a/public/app/features/alerting/unified/components/mute-timings/util.tsx b/public/app/features/alerting/unified/components/mute-timings/util.tsx
index dda90ae1b39ed..00a52f5e8ff1e 100644
--- a/public/app/features/alerting/unified/components/mute-timings/util.tsx
+++ b/public/app/features/alerting/unified/components/mute-timings/util.tsx
@@ -1,7 +1,7 @@
 import moment from 'moment';
 import React from 'react';
 
-import { MuteTimeInterval } from 'app/plugins/datasource/alertmanager/types';
+import { AlertmanagerConfig, MuteTimeInterval } from 'app/plugins/datasource/alertmanager/types';
 
 import {
   getDaysOfMonthString,
@@ -18,6 +18,12 @@ const isvalidTimeFormat = (timeString: string): boolean => {
   return timeString ? TIME_RANGE_REGEX.test(timeString) : true;
 };
 
+// merge both fields mute_time_intervals and time_intervals to support both old and new config
+export const mergeTimeIntervals = (alertManagerConfig: AlertmanagerConfig) => {
+  return [...(alertManagerConfig.mute_time_intervals ?? []), ...(alertManagerConfig.time_intervals ?? [])];
+};
+
+// Usage
 const isValidStartAndEndTime = (startTime?: string, endTime?: string): boolean => {
   // empty time range is perfactly valid for a mute timing
   if (!startTime && !endTime) {
@@ -67,4 +73,4 @@ function renderTimeIntervals(muteTiming: MuteTimeInterval) {
   });
 }
 
-export { isvalidTimeFormat, isValidStartAndEndTime, renderTimeIntervals };
+export { isValidStartAndEndTime, isvalidTimeFormat, renderTimeIntervals };
diff --git a/public/app/features/alerting/unified/components/notification-policies/AlertGroupsSummary.tsx b/public/app/features/alerting/unified/components/notification-policies/AlertGroupsSummary.tsx
index db731352eecc2..29daa987f2281 100644
--- a/public/app/features/alerting/unified/components/notification-policies/AlertGroupsSummary.tsx
+++ b/public/app/features/alerting/unified/components/notification-policies/AlertGroupsSummary.tsx
@@ -1,8 +1,7 @@
 import pluralize from 'pluralize';
 import React, { Fragment } from 'react';
 
-import { Stack } from '@grafana/experimental';
-import { Badge } from '@grafana/ui';
+import { Badge, Stack } from '@grafana/ui';
 
 interface Props {
   active?: number;
diff --git a/public/app/features/alerting/unified/components/notification-policies/ContactPointSelector.tsx b/public/app/features/alerting/unified/components/notification-policies/ContactPointSelector.tsx
index 0a543be22b371..a5d9677287689 100644
--- a/public/app/features/alerting/unified/components/notification-policies/ContactPointSelector.tsx
+++ b/public/app/features/alerting/unified/components/notification-policies/ContactPointSelector.tsx
@@ -1,8 +1,7 @@
 import React from 'react';
 
 import { SelectableValue } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Select, SelectCommonProps, Text } from '@grafana/ui';
+import { Select, SelectCommonProps, Text, Stack } from '@grafana/ui';
 
 import {
   RECEIVER_META_KEY,
@@ -36,7 +35,7 @@ interface ReceiversProps {
 
 const ReceiversSummary = ({ receivers }: ReceiversProps) => {
   return (
-    <Stack direction="row" wrap={false}>
+    <Stack direction="row">
       {receivers.map((receiver, index) => (
         <Stack key={receiver.uid ?? index} direction="row" gap={0.5}>
           {receiver[RECEIVER_PLUGIN_META_KEY]?.icon && (
diff --git a/public/app/features/alerting/unified/components/notification-policies/EditDefaultPolicyForm.tsx b/public/app/features/alerting/unified/components/notification-policies/EditDefaultPolicyForm.tsx
index fbfab072ad502..2ae8f5f58d7ea 100644
--- a/public/app/features/alerting/unified/components/notification-policies/EditDefaultPolicyForm.tsx
+++ b/public/app/features/alerting/unified/components/notification-policies/EditDefaultPolicyForm.tsx
@@ -1,6 +1,7 @@
 import React, { ReactNode, useState } from 'react';
+import { useForm, Controller } from 'react-hook-form';
 
-import { Collapse, Field, Form, InputControl, Link, MultiSelect, Select, useStyles2 } from '@grafana/ui';
+import { Collapse, Field, Link, MultiSelect, Select, useStyles2 } from '@grafana/ui';
 import { RouteWithID } from 'app/plugins/datasource/alertmanager/types';
 
 import { FormAmRoute } from '../../types/amroutes';
@@ -41,125 +42,131 @@ export const AmRootRouteForm = ({
   const [groupByOptions, setGroupByOptions] = useState(stringsToSelectableValues(route.group_by));
 
   const defaultValues = amRouteToFormAmRoute(route);
-
+  const {
+    handleSubmit,
+    register,
+    control,
+    formState: { errors },
+    setValue,
+    getValues,
+  } = useForm<FormAmRoute>({
+    defaultValues: {
+      ...defaultValues,
+      overrideTimings: true,
+      overrideGrouping: true,
+    },
+  });
   return (
-    <Form defaultValues={{ ...defaultValues, overrideTimings: true, overrideGrouping: true }} onSubmit={onSubmit}>
-      {({ register, control, errors, setValue, getValues }) => (
+    <form onSubmit={handleSubmit(onSubmit)}>
+      <Field label="Default contact point" invalid={!!errors.receiver} error={errors.receiver?.message}>
         <>
-          <Field label="Default contact point" invalid={!!errors.receiver} error={errors.receiver?.message}>
-            <>
-              <div className={styles.container} data-testid="am-receiver-select">
-                <InputControl
-                  render={({ field: { onChange, ref, ...field } }) => (
-                    <Select
-                      aria-label="Default contact point"
-                      {...field}
-                      className={styles.input}
-                      onChange={(value) => onChange(mapSelectValueToString(value))}
-                      options={receivers}
-                    />
-                  )}
-                  control={control}
-                  name="receiver"
-                  rules={{ required: { value: true, message: 'Required.' } }}
-                />
-                <span>or</span>
-                <Link
-                  className={styles.linkText}
-                  href={makeAMLink('/alerting/notifications/receivers/new', alertManagerSourceName)}
-                >
-                  Create a contact point
-                </Link>
-              </div>
-            </>
-          </Field>
-          <Field
-            label="Group by"
-            description="Group alerts when you receive a notification based on labels."
-            data-testid="am-group-select"
-          >
-            {/* @ts-ignore-check: react-hook-form made me do this */}
-            <InputControl
+          <div className={styles.container} data-testid="am-receiver-select">
+            <Controller
               render={({ field: { onChange, ref, ...field } }) => (
-                <MultiSelect
-                  aria-label="Group by"
+                <Select
+                  aria-label="Default contact point"
                   {...field}
-                  allowCustomValue
                   className={styles.input}
-                  onCreateOption={(opt: string) => {
-                    setGroupByOptions((opts) => [...opts, stringToSelectableValue(opt)]);
-
-                    // @ts-ignore-check: react-hook-form made me do this
-                    setValue('groupBy', [...field.value, opt]);
-                  }}
-                  onChange={(value) => onChange(mapMultiSelectValueToStrings(value))}
-                  options={[...commonGroupByOptions, ...groupByOptions]}
+                  onChange={(value) => onChange(mapSelectValueToString(value))}
+                  options={receivers}
                 />
               )}
               control={control}
-              name="groupBy"
+              name="receiver"
+              rules={{ required: { value: true, message: 'Required.' } }}
+            />
+            <span>or</span>
+            <Link
+              className={styles.linkText}
+              href={makeAMLink('/alerting/notifications/receivers/new', alertManagerSourceName)}
+            >
+              Create a contact point
+            </Link>
+          </div>
+        </>
+      </Field>
+      <Field
+        label="Group by"
+        description="Group alerts when you receive a notification based on labels."
+        data-testid="am-group-select"
+      >
+        <Controller
+          render={({ field: { onChange, ref, ...field } }) => (
+            <MultiSelect
+              aria-label="Group by"
+              {...field}
+              allowCustomValue
+              className={styles.input}
+              onCreateOption={(opt: string) => {
+                setGroupByOptions((opts) => [...opts, stringToSelectableValue(opt)]);
+                setValue('groupBy', [...(field.value || []), opt]);
+              }}
+              onChange={(value) => onChange(mapMultiSelectValueToStrings(value))}
+              options={[...commonGroupByOptions, ...groupByOptions]}
+            />
+          )}
+          control={control}
+          name="groupBy"
+        />
+      </Field>
+      <Collapse
+        collapsible
+        className={styles.collapse}
+        isOpen={isTimingOptionsExpanded}
+        label="Timing options"
+        onToggle={setIsTimingOptionsExpanded}
+      >
+        <div className={styles.timingFormContainer}>
+          <Field
+            label="Group wait"
+            description="The waiting time until the initial notification is sent for a new group created by an incoming alert. Default 30 seconds."
+            invalid={!!errors.groupWaitValue}
+            error={errors.groupWaitValue?.message}
+            data-testid="am-group-wait"
+          >
+            <PromDurationInput
+              {...register('groupWaitValue', { validate: promDurationValidator })}
+              placeholder={TIMING_OPTIONS_DEFAULTS.group_wait}
+              className={styles.promDurationInput}
+              aria-label="Group wait"
             />
           </Field>
-          <Collapse
-            collapsible
-            className={styles.collapse}
-            isOpen={isTimingOptionsExpanded}
-            label="Timing options"
-            onToggle={setIsTimingOptionsExpanded}
+          <Field
+            label="Group interval"
+            description="The waiting time to send a batch of new alerts for that group after the first notification was sent. Default 5 minutes."
+            invalid={!!errors.groupIntervalValue}
+            error={errors.groupIntervalValue?.message}
+            data-testid="am-group-interval"
           >
-            <div className={styles.timingFormContainer}>
-              <Field
-                label="Group wait"
-                description="The waiting time until the initial notification is sent for a new group created by an incoming alert. Default 30 seconds."
-                invalid={!!errors.groupWaitValue}
-                error={errors.groupWaitValue?.message}
-                data-testid="am-group-wait"
-              >
-                <PromDurationInput
-                  {...register('groupWaitValue', { validate: promDurationValidator })}
-                  placeholder={TIMING_OPTIONS_DEFAULTS.group_wait}
-                  className={styles.promDurationInput}
-                  aria-label="Group wait"
-                />
-              </Field>
-              <Field
-                label="Group interval"
-                description="The waiting time to send a batch of new alerts for that group after the first notification was sent. Default 5 minutes."
-                invalid={!!errors.groupIntervalValue}
-                error={errors.groupIntervalValue?.message}
-                data-testid="am-group-interval"
-              >
-                <PromDurationInput
-                  {...register('groupIntervalValue', { validate: promDurationValidator })}
-                  placeholder={TIMING_OPTIONS_DEFAULTS.group_interval}
-                  className={styles.promDurationInput}
-                  aria-label="Group interval"
-                />
-              </Field>
-              <Field
-                label="Repeat interval"
-                description="The waiting time to resend an alert after they have successfully been sent. Default 4 hours. Should be a multiple of Group interval."
-                invalid={!!errors.repeatIntervalValue}
-                error={errors.repeatIntervalValue?.message}
-                data-testid="am-repeat-interval"
-              >
-                <PromDurationInput
-                  {...register('repeatIntervalValue', {
-                    validate: (value: string) => {
-                      const groupInterval = getValues('groupIntervalValue');
-                      return repeatIntervalValidator(value, groupInterval);
-                    },
-                  })}
-                  placeholder={TIMING_OPTIONS_DEFAULTS.repeat_interval}
-                  className={styles.promDurationInput}
-                  aria-label="Repeat interval"
-                />
-              </Field>
-            </div>
-          </Collapse>
-          <div className={styles.container}>{actionButtons}</div>
-        </>
-      )}
-    </Form>
+            <PromDurationInput
+              {...register('groupIntervalValue', { validate: promDurationValidator })}
+              placeholder={TIMING_OPTIONS_DEFAULTS.group_interval}
+              className={styles.promDurationInput}
+              aria-label="Group interval"
+            />
+          </Field>
+          <Field
+            label="Repeat interval"
+            description="The waiting time to resend an alert after they have successfully been sent. Default 4 hours. Should be a multiple of Group interval."
+            invalid={!!errors.repeatIntervalValue}
+            error={errors.repeatIntervalValue?.message}
+            data-testid="am-repeat-interval"
+          >
+            <PromDurationInput
+              {...register('repeatIntervalValue', {
+                validate: (value: string) => {
+                  const groupInterval = getValues('groupIntervalValue');
+                  return repeatIntervalValidator(value, groupInterval);
+                },
+              })}
+              placeholder={TIMING_OPTIONS_DEFAULTS.repeat_interval}
+              className={styles.promDurationInput}
+              aria-label="Repeat interval"
+            />
+          </Field>
+        </div>
+      </Collapse>
+      <div className={styles.container}>{actionButtons}</div>
+    </form>
   );
 };
diff --git a/public/app/features/alerting/unified/components/notification-policies/EditNotificationPolicyForm.tsx b/public/app/features/alerting/unified/components/notification-policies/EditNotificationPolicyForm.tsx
index 718a47d559321..b4ef37fd02682 100644
--- a/public/app/features/alerting/unified/components/notification-policies/EditNotificationPolicyForm.tsx
+++ b/public/app/features/alerting/unified/components/notification-policies/EditNotificationPolicyForm.tsx
@@ -1,22 +1,20 @@
 import { css } from '@emotion/css';
 import React, { ReactNode, useState } from 'react';
+import { useForm, Controller, useFieldArray } from 'react-hook-form';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
 import {
+  Badge,
   Button,
   Field,
-  FieldArray,
-  Form,
+  FieldValidationMessage,
   IconButton,
   Input,
-  InputControl,
   MultiSelect,
   Select,
+  Stack,
   Switch,
   useStyles2,
-  Badge,
-  FieldValidationMessage,
 } from '@grafana/ui';
 import { MatcherOperator, RouteWithID } from 'app/plugins/datasource/alertmanager/types';
 
@@ -25,20 +23,21 @@ import { FormAmRoute } from '../../types/amroutes';
 import { SupportedPlugin } from '../../types/pluginBridges';
 import { matcherFieldOptions } from '../../utils/alertmanager';
 import {
+  amRouteToFormAmRoute,
+  commonGroupByOptions,
   emptyArrayFieldMatcher,
   mapMultiSelectValueToStrings,
   mapSelectValueToString,
-  stringToSelectableValue,
-  stringsToSelectableValues,
-  commonGroupByOptions,
-  amRouteToFormAmRoute,
   promDurationValidator,
   repeatIntervalValidator,
+  stringToSelectableValue,
+  stringsToSelectableValues,
 } from '../../utils/amroutes';
 import { AmRouteReceiver } from '../receivers/grafanaAppReceivers/types';
 
 import { PromDurationInput } from './PromDurationInput';
 import { getFormStyles } from './formStyles';
+import { routeTimingsFields } from './routeTimingsFields';
 
 export interface AmRoutesExpandedFormProps {
   receivers: AmRouteReceiver[];
@@ -74,224 +73,228 @@ export const AmRoutesExpandedForm = ({
     object_matchers: route ? formAmRoute.object_matchers : emptyMatcher,
   };
 
+  const {
+    handleSubmit,
+    control,
+    register,
+    formState: { errors },
+    setValue,
+    watch,
+    getValues,
+  } = useForm<FormAmRoute>({
+    defaultValues,
+  });
+  const { fields, append, remove } = useFieldArray({
+    control,
+    name: 'object_matchers',
+  });
+
   return (
-    <Form defaultValues={defaultValues} onSubmit={onSubmit} maxWidth="none">
-      {({ control, register, errors, setValue, watch, getValues }) => (
-        <>
-          <input type="hidden" {...register('id')} />
-          {/* @ts-ignore-check: react-hook-form made me do this */}
-          <FieldArray name="object_matchers" control={control}>
-            {({ fields, append, remove }) => (
-              <>
-                <Stack direction="column" alignItems="flex-start">
-                  <div>Matching labels</div>
-                  {fields.length === 0 && (
-                    <Badge
-                      color="orange"
-                      className={styles.noMatchersWarning}
-                      icon="exclamation-triangle"
-                      text="If no matchers are specified, this notification policy will handle all alert instances."
+    <form onSubmit={handleSubmit(onSubmit)}>
+      <input type="hidden" {...register('id')} />
+      <Stack direction="column" alignItems="flex-start">
+        <div>Matching labels</div>
+        {fields.length === 0 && (
+          <Badge
+            color="orange"
+            className={styles.noMatchersWarning}
+            icon="exclamation-triangle"
+            text="If no matchers are specified, this notification policy will handle all alert instances."
+          />
+        )}
+        {fields.length > 0 && (
+          <div className={styles.matchersContainer}>
+            {fields.map((field, index) => {
+              return (
+                <Stack direction="row" key={field.id} alignItems="center">
+                  <Field
+                    label="Label"
+                    invalid={!!errors.object_matchers?.[index]?.name}
+                    error={errors.object_matchers?.[index]?.name?.message}
+                  >
+                    <Input
+                      {...register(`object_matchers.${index}.name`, { required: 'Field is required' })}
+                      defaultValue={field.name}
+                      placeholder="label"
+                      autoFocus
+                    />
+                  </Field>
+                  <Field label={'Operator'}>
+                    <Controller
+                      render={({ field: { onChange, ref, ...field } }) => (
+                        <Select
+                          {...field}
+                          className={styles.matchersOperator}
+                          onChange={(value) => onChange(value?.value)}
+                          options={matcherFieldOptions}
+                          aria-label="Operator"
+                        />
+                      )}
+                      defaultValue={field.operator}
+                      control={control}
+                      name={`object_matchers.${index}.operator`}
+                      rules={{ required: { value: true, message: 'Required.' } }}
                     />
-                  )}
-                  {fields.length > 0 && (
-                    <div className={styles.matchersContainer}>
-                      {fields.map((field, index) => {
-                        return (
-                          <Stack direction="row" key={field.id} alignItems="center">
-                            <Field
-                              label="Label"
-                              invalid={!!errors.object_matchers?.[index]?.name}
-                              error={errors.object_matchers?.[index]?.name?.message}
-                            >
-                              <Input
-                                {...register(`object_matchers.${index}.name`, { required: 'Field is required' })}
-                                defaultValue={field.name}
-                                placeholder="label"
-                                autoFocus
-                              />
-                            </Field>
-                            <Field label={'Operator'}>
-                              <InputControl
-                                render={({ field: { onChange, ref, ...field } }) => (
-                                  <Select
-                                    {...field}
-                                    className={styles.matchersOperator}
-                                    onChange={(value) => onChange(value?.value)}
-                                    options={matcherFieldOptions}
-                                    aria-label="Operator"
-                                  />
-                                )}
-                                defaultValue={field.operator}
-                                control={control}
-                                name={`object_matchers.${index}.operator`}
-                                rules={{ required: { value: true, message: 'Required.' } }}
-                              />
-                            </Field>
-                            <Field
-                              label="Value"
-                              invalid={!!errors.object_matchers?.[index]?.value}
-                              error={errors.object_matchers?.[index]?.value?.message}
-                            >
-                              <Input
-                                {...register(`object_matchers.${index}.value`, { required: 'Field is required' })}
-                                defaultValue={field.value}
-                                placeholder="value"
-                              />
-                            </Field>
-                            <IconButton tooltip="Remove matcher" name={'trash-alt'} onClick={() => remove(index)}>
-                              Remove
-                            </IconButton>
-                          </Stack>
-                        );
-                      })}
-                    </div>
-                  )}
-                  <Button
-                    className={styles.addMatcherBtn}
-                    icon="plus"
-                    onClick={() => append(emptyArrayFieldMatcher)}
-                    variant="secondary"
-                    type="button"
+                  </Field>
+                  <Field
+                    label="Value"
+                    invalid={!!errors.object_matchers?.[index]?.value}
+                    error={errors.object_matchers?.[index]?.value?.message}
                   >
-                    Add matcher
-                  </Button>
+                    <Input
+                      {...register(`object_matchers.${index}.value`)}
+                      defaultValue={field.value}
+                      placeholder="value"
+                    />
+                  </Field>
+                  <IconButton tooltip="Remove matcher" name={'trash-alt'} onClick={() => remove(index)}>
+                    Remove
+                  </IconButton>
                 </Stack>
-              </>
-            )}
-          </FieldArray>
-          <Field label="Contact point">
-            <InputControl
-              render={({ field: { onChange, ref, ...field } }) => (
-                <Select
-                  aria-label="Contact point"
+              );
+            })}
+          </div>
+        )}
+        <Button
+          className={styles.addMatcherBtn}
+          icon="plus"
+          onClick={() => append(emptyArrayFieldMatcher)}
+          variant="secondary"
+          type="button"
+        >
+          Add matcher
+        </Button>
+      </Stack>
+
+      <Field label="Contact point">
+        <Controller
+          render={({ field: { onChange, ref, ...field } }) => (
+            <Select
+              aria-label="Contact point"
+              {...field}
+              className={formStyles.input}
+              onChange={(value) => onChange(mapSelectValueToString(value))}
+              options={receiversWithOnCallOnTop}
+              isClearable
+            />
+          )}
+          control={control}
+          name="receiver"
+        />
+      </Field>
+      <Field label="Continue matching subsequent sibling nodes">
+        <Switch id="continue-toggle" {...register('continue')} />
+      </Field>
+      <Field label="Override grouping">
+        <Switch id="override-grouping-toggle" {...register('overrideGrouping')} />
+      </Field>
+      {watch().overrideGrouping && (
+        <Field
+          label="Group by"
+          description="Group alerts when you receive a notification based on labels. If empty it will be inherited from the parent policy."
+        >
+          <Controller
+            rules={{
+              validate: (value) => {
+                if (!value || value.length === 0) {
+                  return 'At least one group by option is required.';
+                }
+                return true;
+              },
+            }}
+            render={({ field: { onChange, ref, ...field }, fieldState: { error } }) => (
+              <>
+                <MultiSelect
+                  aria-label="Group by"
                   {...field}
+                  invalid={Boolean(error)}
+                  allowCustomValue
                   className={formStyles.input}
-                  onChange={(value) => onChange(mapSelectValueToString(value))}
-                  options={receiversWithOnCallOnTop}
-                  isClearable
+                  onCreateOption={(opt: string) => {
+                    setGroupByOptions((opts) => [...opts, stringToSelectableValue(opt)]);
+                    setValue('groupBy', [...(field.value || []), opt]);
+                  }}
+                  onChange={(value) => onChange(mapMultiSelectValueToStrings(value))}
+                  options={[...commonGroupByOptions, ...groupByOptions]}
                 />
-              )}
-              control={control}
-              name="receiver"
+                {error && <FieldValidationMessage>{error.message}</FieldValidationMessage>}
+              </>
+            )}
+            control={control}
+            name="groupBy"
+          />
+        </Field>
+      )}
+      <Field label="Override general timings">
+        <Switch id="override-timings-toggle" {...register('overrideTimings')} />
+      </Field>
+      {watch().overrideTimings && (
+        <>
+          <Field
+            label={routeTimingsFields.groupWait.label}
+            description={routeTimingsFields.groupWait.description}
+            invalid={!!errors.groupWaitValue}
+            error={errors.groupWaitValue?.message}
+          >
+            <PromDurationInput
+              {...register('groupWaitValue', { validate: promDurationValidator })}
+              aria-label={routeTimingsFields.groupWait.ariaLabel}
+              className={formStyles.promDurationInput}
             />
           </Field>
-          <Field label="Continue matching subsequent sibling nodes">
-            <Switch id="continue-toggle" {...register('continue')} />
-          </Field>
-          <Field label="Override grouping">
-            <Switch id="override-grouping-toggle" {...register('overrideGrouping')} />
-          </Field>
-          {watch().overrideGrouping && (
-            <Field
-              label="Group by"
-              description="Group alerts when you receive a notification based on labels. If empty it will be inherited from the parent policy."
-            >
-              <InputControl
-                rules={{
-                  validate: (value) => {
-                    if (!value || value.length === 0) {
-                      return 'At least one group by option is required.';
-                    }
-                    return true;
-                  },
-                }}
-                render={({ field: { onChange, ref, ...field }, fieldState: { error } }) => (
-                  <>
-                    <MultiSelect
-                      aria-label="Group by"
-                      {...field}
-                      invalid={Boolean(error)}
-                      allowCustomValue
-                      className={formStyles.input}
-                      onCreateOption={(opt: string) => {
-                        setGroupByOptions((opts) => [...opts, stringToSelectableValue(opt)]);
-
-                        // @ts-ignore-check: react-hook-form made me do this
-                        setValue('groupBy', [...field.value, opt]);
-                      }}
-                      onChange={(value) => onChange(mapMultiSelectValueToStrings(value))}
-                      options={[...commonGroupByOptions, ...groupByOptions]}
-                    />
-                    {error && <FieldValidationMessage>{error.message}</FieldValidationMessage>}
-                  </>
-                )}
-                control={control}
-                name="groupBy"
-              />
-            </Field>
-          )}
-          <Field label="Override general timings">
-            <Switch id="override-timings-toggle" {...register('overrideTimings')} />
+          <Field
+            label={routeTimingsFields.groupInterval.label}
+            description={routeTimingsFields.groupInterval.description}
+            invalid={!!errors.groupIntervalValue}
+            error={errors.groupIntervalValue?.message}
+          >
+            <PromDurationInput
+              {...register('groupIntervalValue', { validate: promDurationValidator })}
+              aria-label={routeTimingsFields.groupInterval.ariaLabel}
+              className={formStyles.promDurationInput}
+            />
           </Field>
-          {watch().overrideTimings && (
-            <>
-              <Field
-                label="Group wait"
-                description="The waiting time until the initial notification is sent for a new group created by an incoming alert. If empty it will be inherited from the parent policy."
-                invalid={!!errors.groupWaitValue}
-                error={errors.groupWaitValue?.message}
-              >
-                <PromDurationInput
-                  {...register('groupWaitValue', { validate: promDurationValidator })}
-                  aria-label="Group wait value"
-                  className={formStyles.promDurationInput}
-                />
-              </Field>
-              <Field
-                label="Group interval"
-                description="The waiting time to send a batch of new alerts for that group after the first notification was sent. If empty it will be inherited from the parent policy."
-                invalid={!!errors.groupIntervalValue}
-                error={errors.groupIntervalValue?.message}
-              >
-                <PromDurationInput
-                  {...register('groupIntervalValue', { validate: promDurationValidator })}
-                  aria-label="Group interval value"
-                  className={formStyles.promDurationInput}
-                />
-              </Field>
-              <Field
-                label="Repeat interval"
-                description="The waiting time to resend an alert after they have successfully been sent."
-                invalid={!!errors.repeatIntervalValue}
-                error={errors.repeatIntervalValue?.message}
-              >
-                <PromDurationInput
-                  {...register('repeatIntervalValue', {
-                    validate: (value: string) => {
-                      const groupInterval = getValues('groupIntervalValue');
-                      return repeatIntervalValidator(value, groupInterval);
-                    },
-                  })}
-                  aria-label="Repeat interval value"
-                  className={formStyles.promDurationInput}
-                />
-              </Field>
-            </>
-          )}
           <Field
-            label="Mute timings"
-            data-testid="am-mute-timing-select"
-            description="Add mute timing to policy"
-            invalid={!!errors.muteTimeIntervals}
+            label={routeTimingsFields.repeatInterval.label}
+            description={routeTimingsFields.repeatInterval.description}
+            invalid={!!errors.repeatIntervalValue}
+            error={errors.repeatIntervalValue?.message}
           >
-            <InputControl
-              render={({ field: { onChange, ref, ...field } }) => (
-                <MultiSelect
-                  aria-label="Mute timings"
-                  {...field}
-                  className={formStyles.input}
-                  onChange={(value) => onChange(mapMultiSelectValueToStrings(value))}
-                  options={muteTimingOptions}
-                />
-              )}
-              control={control}
-              name="muteTimeIntervals"
+            <PromDurationInput
+              {...register('repeatIntervalValue', {
+                validate: (value = '') => {
+                  const groupInterval = getValues('groupIntervalValue');
+                  return repeatIntervalValidator(value, groupInterval);
+                },
+              })}
+              aria-label={routeTimingsFields.repeatInterval.ariaLabel}
+              className={formStyles.promDurationInput}
             />
           </Field>
-          {actionButtons}
         </>
       )}
-    </Form>
+      <Field
+        label="Mute timings"
+        data-testid="am-mute-timing-select"
+        description="Add mute timing to policy"
+        invalid={!!errors.muteTimeIntervals}
+      >
+        <Controller
+          render={({ field: { onChange, ref, ...field } }) => (
+            <MultiSelect
+              aria-label="Mute timings"
+              {...field}
+              className={formStyles.input}
+              onChange={(value) => onChange(mapMultiSelectValueToStrings(value))}
+              options={muteTimingOptions}
+            />
+          )}
+          control={control}
+          name="muteTimeIntervals"
+        />
+      </Field>
+      {actionButtons}
+    </form>
   );
 };
 
@@ -321,6 +324,7 @@ const getStyles = (theme: GrafanaTheme2) => {
     `,
     noMatchersWarning: css`
       padding: ${theme.spacing(1)} ${theme.spacing(2)};
+      margin-bottom: ${theme.spacing(1)};
     `,
   };
 };
diff --git a/public/app/features/alerting/unified/components/notification-policies/Filters.tsx b/public/app/features/alerting/unified/components/notification-policies/Filters.tsx
index 5457aa8f5cd26..66b2ee0cd3041 100644
--- a/public/app/features/alerting/unified/components/notification-policies/Filters.tsx
+++ b/public/app/features/alerting/unified/components/notification-policies/Filters.tsx
@@ -1,25 +1,27 @@
 import { css } from '@emotion/css';
-import { debounce } from 'lodash';
+import { debounce, isEqual } from 'lodash';
 import React, { useCallback, useEffect, useRef } from 'react';
 
 import { SelectableValue } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Button, Field, Icon, Input, Label as LabelElement, Select, Tooltip, useStyles2 } from '@grafana/ui';
+import { Button, Field, Icon, Input, Label, Select, Stack, Text, Tooltip, useStyles2 } from '@grafana/ui';
 import { ObjectMatcher, Receiver, RouteWithID } from 'app/plugins/datasource/alertmanager/types';
 
 import { useURLSearchParams } from '../../hooks/useURLSearchParams';
 import { matcherToObjectMatcher, parseMatchers } from '../../utils/alertmanager';
+import { normalizeMatchers } from '../../utils/matchers';
 
 interface NotificationPoliciesFilterProps {
   receivers: Receiver[];
   onChangeMatchers: (labels: ObjectMatcher[]) => void;
   onChangeReceiver: (receiver: string | undefined) => void;
+  matchingCount: number;
 }
 
 const NotificationPoliciesFilter = ({
   receivers,
   onChangeReceiver,
   onChangeMatchers,
+  matchingCount,
 }: NotificationPoliciesFilterProps) => {
   const [searchParams, setSearchParams] = useURLSearchParams();
   const searchInputRef = useRef<HTMLInputElement | null>(null);
@@ -51,11 +53,11 @@ const NotificationPoliciesFilter = ({
   const inputInvalid = queryString && queryString.length > 3 ? parseMatchers(queryString).length === 0 : false;
 
   return (
-    <Stack direction="row" alignItems="flex-start" gap={0.5}>
+    <Stack direction="row" alignItems="flex-end" gap={1}>
       <Field
         className={styles.noBottom}
         label={
-          <LabelElement>
+          <Label>
             <Stack gap={0.5}>
               <span>Search by matchers</span>
               <Tooltip
@@ -69,7 +71,7 @@ const NotificationPoliciesFilter = ({
                 <Icon name="info-circle" size="sm" />
               </Tooltip>
             </Stack>
-          </LabelElement>
+          </Label>
         }
         invalid={inputInvalid}
         error={inputInvalid ? 'Query must use valid matcher syntax' : null}
@@ -100,9 +102,16 @@ const NotificationPoliciesFilter = ({
         />
       </Field>
       {hasFilters && (
-        <Button variant="secondary" icon="times" onClick={clearFilters} style={{ marginTop: 19 }}>
-          Clear filters
-        </Button>
+        <Stack alignItems="center">
+          <Button variant="secondary" icon="times" onClick={clearFilters}>
+            Clear filters
+          </Button>
+          <Text variant="bodySmall" color="secondary">
+            {matchingCount === 0 && 'No policies matching filters.'}
+            {matchingCount === 1 && `${matchingCount} policy matches the filters.`}
+            {matchingCount > 1 && `${matchingCount} policies match the filters.`}
+          </Text>
+        </Stack>
       )}
     </Stack>
   );
@@ -113,19 +122,46 @@ const NotificationPoliciesFilter = ({
  */
 type FilterPredicate = (route: RouteWithID) => boolean;
 
-export function findRoutesMatchingPredicate(routeTree: RouteWithID, predicateFn: FilterPredicate): RouteWithID[] {
-  const matches: RouteWithID[] = [];
+/**
+ * Find routes int the tree that match the given predicate function
+ * @param routeTree the route tree to search
+ * @param predicateFn the predicate function to match routes
+ * @returns
+ * - matches: list of routes that match the predicate
+ * - matchingRouteIdsWithPath: map with routeids that are part of the path of a matching route
+ *  key is the route id, value is an array of route ids that are part of its path
+ */
+export function findRoutesMatchingPredicate(
+  routeTree: RouteWithID,
+  predicateFn: FilterPredicate
+): Map<RouteWithID, RouteWithID[]> {
+  // map with routids that are part of the path of a matching route
+  // key is the route id, value is an array of route ids that are part of the path
+  const matchingRouteIdsWithPath = new Map<RouteWithID, RouteWithID[]>();
+
+  function findMatch(route: RouteWithID, path: RouteWithID[]) {
+    const newPath = [...path, route];
 
-  function findMatch(route: RouteWithID) {
     if (predicateFn(route)) {
-      matches.push(route);
+      // if the route matches the predicate, we need to add the path to the map of matching routes
+      const previousPath = matchingRouteIdsWithPath.get(route) ?? [];
+      // add the current route id to the map with its path
+      matchingRouteIdsWithPath.set(route, [...previousPath, ...newPath]);
     }
 
-    route.routes?.forEach(findMatch);
+    // if the route has subroutes, call findMatch recursively
+    route.routes?.forEach((route) => findMatch(route, newPath));
   }
 
-  findMatch(routeTree);
-  return matches;
+  findMatch(routeTree, []);
+
+  return matchingRouteIdsWithPath;
+}
+
+export function findRoutesByMatchers(route: RouteWithID, labelMatchersFilter: ObjectMatcher[]): boolean {
+  const routeMatchers = normalizeMatchers(route);
+
+  return labelMatchersFilter.every((filter) => routeMatchers.some((matcher) => isEqual(filter, matcher)));
 }
 
 const toOption = (receiver: Receiver) => ({
@@ -139,9 +175,9 @@ const getNotificationPoliciesFilters = (searchParams: URLSearchParams) => ({
 });
 
 const getStyles = () => ({
-  noBottom: css`
-    margin-bottom: 0;
-  `,
+  noBottom: css({
+    marginBottom: 0,
+  }),
 });
 
 export { NotificationPoliciesFilter };
diff --git a/public/app/features/alerting/unified/components/notification-policies/Matchers.tsx b/public/app/features/alerting/unified/components/notification-policies/Matchers.tsx
index cd320ad193e6b..458dc4a0258f0 100644
--- a/public/app/features/alerting/unified/components/notification-policies/Matchers.tsx
+++ b/public/app/features/alerting/unified/components/notification-policies/Matchers.tsx
@@ -3,16 +3,16 @@ import { take, takeRight, uniqueId } from 'lodash';
 import React, { FC } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { getTagColorsFromName, useStyles2 } from '@grafana/ui';
+import { getTagColorsFromName, useStyles2, Stack } from '@grafana/ui';
 import { ObjectMatcher } from 'app/plugins/datasource/alertmanager/types';
 
+import { MatcherFormatter, matcherFormatter } from '../../utils/matchers';
 import { HoverCard } from '../HoverCard';
 
-type MatchersProps = { matchers: ObjectMatcher[] };
+type MatchersProps = { matchers: ObjectMatcher[]; formatter?: MatcherFormatter };
 
 // renders the first N number of matchers
-const Matchers: FC<MatchersProps> = ({ matchers }) => {
+const Matchers: FC<MatchersProps> = ({ matchers, formatter = 'default' }) => {
   const styles = useStyles2(getStyles);
 
   const NUM_MATCHERS = 5;
@@ -23,9 +23,9 @@ const Matchers: FC<MatchersProps> = ({ matchers }) => {
 
   return (
     <span data-testid="label-matchers">
-      <Stack direction="row" gap={1} alignItems="center">
+      <Stack direction="row" gap={1} alignItems="center" wrap={'wrap'}>
         {firstFew.map((matcher) => (
-          <MatcherBadge key={uniqueId()} matcher={matcher} />
+          <MatcherBadge key={uniqueId()} matcher={matcher} formatter={formatter} />
         ))}
         {/* TODO hover state to show all matchers we're not showing */}
         {hasMoreMatchers && (
@@ -52,15 +52,16 @@ const Matchers: FC<MatchersProps> = ({ matchers }) => {
 
 interface MatcherBadgeProps {
   matcher: ObjectMatcher;
+  formatter?: MatcherFormatter;
 }
 
-const MatcherBadge: FC<MatcherBadgeProps> = ({ matcher: [label, operator, value] }) => {
+const MatcherBadge: FC<MatcherBadgeProps> = ({ matcher, formatter = 'default' }) => {
   const styles = useStyles2(getStyles);
 
   return (
-    <div className={styles.matcher(label).wrapper}>
+    <div className={styles.matcher(matcher[0]).wrapper}>
       <Stack direction="row" gap={0} alignItems="baseline">
-        {label} {operator} {value}
+        {matcherFormatter[formatter](matcher)}
       </Stack>
     </div>
   );
diff --git a/public/app/features/alerting/unified/components/notification-policies/Modals.tsx b/public/app/features/alerting/unified/components/notification-policies/Modals.tsx
index 7719426d6ad57..43338fdbdcf43 100644
--- a/public/app/features/alerting/unified/components/notification-policies/Modals.tsx
+++ b/public/app/features/alerting/unified/components/notification-policies/Modals.tsx
@@ -1,8 +1,7 @@
 import { groupBy } from 'lodash';
 import React, { FC, useCallback, useMemo, useState } from 'react';
 
-import { Stack } from '@grafana/experimental';
-import { Button, Icon, Modal, ModalProps, Spinner } from '@grafana/ui';
+import { Button, Icon, Modal, ModalProps, Spinner, Stack } from '@grafana/ui';
 import {
   AlertmanagerGroup,
   AlertState,
@@ -12,6 +11,8 @@ import {
 } from 'app/plugins/datasource/alertmanager/types';
 
 import { FormAmRoute } from '../../types/amroutes';
+import { MatcherFormatter } from '../../utils/matchers';
+import { InsertPosition } from '../../utils/routeTree';
 import { AlertGroup } from '../alert-groups/AlertGroup';
 import { useGetAmRouteReceiverWithGrafanaAppTypes } from '../receivers/grafanaAppReceivers/grafanaApp';
 
@@ -21,24 +22,28 @@ import { AmRoutesExpandedForm } from './EditNotificationPolicyForm';
 import { Matchers } from './Matchers';
 
 type ModalHook<T = undefined> = [JSX.Element, (item: T) => void, () => void];
+type AddModalHook<T = undefined> = [JSX.Element, (item: T, position: InsertPosition) => void, () => void];
 type EditModalHook = [JSX.Element, (item: RouteWithID, isDefaultRoute?: boolean) => void, () => void];
 
 const useAddPolicyModal = (
   receivers: Receiver[] = [],
-  handleAdd: (route: Partial<FormAmRoute>, parentRoute: RouteWithID) => void,
+  handleAdd: (route: Partial<FormAmRoute>, referenceRoute: RouteWithID, position: InsertPosition) => void,
   loading: boolean
-): ModalHook<RouteWithID> => {
+): AddModalHook<RouteWithID> => {
   const [showModal, setShowModal] = useState(false);
-  const [parentRoute, setParentRoute] = useState<RouteWithID>();
+  const [insertPosition, setInsertPosition] = useState<InsertPosition | undefined>(undefined);
+  const [referenceRoute, setReferenceRoute] = useState<RouteWithID>();
   const AmRouteReceivers = useGetAmRouteReceiverWithGrafanaAppTypes(receivers);
 
   const handleDismiss = useCallback(() => {
-    setParentRoute(undefined);
+    setReferenceRoute(undefined);
+    setInsertPosition(undefined);
     setShowModal(false);
   }, []);
 
-  const handleShow = useCallback((parentRoute: RouteWithID) => {
-    setParentRoute(parentRoute);
+  const handleShow = useCallback((referenceRoute: RouteWithID, position: InsertPosition) => {
+    setReferenceRoute(referenceRoute);
+    setInsertPosition(position);
     setShowModal(true);
   }, []);
 
@@ -57,9 +62,13 @@ const useAddPolicyModal = (
           <AmRoutesExpandedForm
             receivers={AmRouteReceivers}
             defaults={{
-              groupBy: parentRoute?.group_by,
+              groupBy: referenceRoute?.group_by,
+            }}
+            onSubmit={(newRoute) => {
+              if (referenceRoute && insertPosition) {
+                handleAdd(newRoute, referenceRoute, insertPosition);
+              }
             }}
-            onSubmit={(newRoute) => parentRoute && handleAdd(newRoute, parentRoute)}
             actionButtons={
               <Modal.ButtonRow>
                 <Button type="button" variant="secondary" onClick={handleDismiss} fill="outline">
@@ -71,7 +80,7 @@ const useAddPolicyModal = (
           />
         </Modal>
       ),
-    [AmRouteReceivers, handleAdd, handleDismiss, loading, parentRoute, showModal]
+    [AmRouteReceivers, handleAdd, handleDismiss, insertPosition, loading, referenceRoute, showModal]
   );
 
   return [modalElement, handleShow, handleDismiss];
@@ -211,6 +220,7 @@ const useAlertGroupsModal = (): [
   const [showModal, setShowModal] = useState(false);
   const [alertGroups, setAlertGroups] = useState<AlertmanagerGroup[]>([]);
   const [matchers, setMatchers] = useState<ObjectMatcher[]>([]);
+  const [formatter, setFormatter] = useState<MatcherFormatter>('default');
 
   const handleDismiss = useCallback(() => {
     setShowModal(false);
@@ -218,13 +228,19 @@ const useAlertGroupsModal = (): [
     setMatchers([]);
   }, []);
 
-  const handleShow = useCallback((alertGroups: AlertmanagerGroup[], matchers?: ObjectMatcher[]) => {
-    setAlertGroups(alertGroups);
-    if (matchers) {
-      setMatchers(matchers);
-    }
-    setShowModal(true);
-  }, []);
+  const handleShow = useCallback(
+    (alertGroups: AlertmanagerGroup[], matchers?: ObjectMatcher[], formatter?: MatcherFormatter) => {
+      setAlertGroups(alertGroups);
+      if (matchers) {
+        setMatchers(matchers);
+      }
+      if (formatter) {
+        setFormatter(formatter);
+      }
+      setShowModal(true);
+    },
+    []
+  );
 
   const instancesByState = useMemo(() => {
     const instances = alertGroups.flatMap((group) => group.alerts);
@@ -239,11 +255,11 @@ const useAlertGroupsModal = (): [
         closeOnBackdropClick={true}
         closeOnEscape={true}
         title={
-          <Stack direction="row" alignItems="center" gap={1} flexGrow={1}>
+          <Stack direction="row" alignItems="center" gap={1} wrap={'wrap'}>
             <Stack direction="row" alignItems="center" gap={0.5}>
               <Icon name="x" /> Matchers
             </Stack>
-            <Matchers matchers={matchers} />
+            <Matchers matchers={matchers} formatter={formatter} />
           </Stack>
         }
       >
@@ -266,7 +282,7 @@ const useAlertGroupsModal = (): [
         </Modal.ButtonRow>
       </Modal>
     ),
-    [alertGroups, handleDismiss, instancesByState, matchers, showModal]
+    [alertGroups, handleDismiss, instancesByState, matchers, formatter, showModal]
   );
 
   return [modalElement, handleShow, handleDismiss];
diff --git a/public/app/features/alerting/unified/components/notification-policies/Policy.test.tsx b/public/app/features/alerting/unified/components/notification-policies/Policy.test.tsx
index 3631d7dfa0684..88e43ab5a7101 100644
--- a/public/app/features/alerting/unified/components/notification-policies/Policy.test.tsx
+++ b/public/app/features/alerting/unified/components/notification-policies/Policy.test.tsx
@@ -1,10 +1,10 @@
-import { render, screen, within } from '@testing-library/react';
+import { render, renderHook, screen, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { noop } from 'lodash';
 import React from 'react';
 import { Router } from 'react-router-dom';
 
-import { locationService } from '@grafana/runtime';
+import { config, locationService } from '@grafana/runtime';
 import { contextSrv } from 'app/core/core';
 import {
   AlertmanagerGroup,
@@ -19,7 +19,12 @@ import { mockAlertGroup, mockAlertmanagerAlert, mockReceiversState } from '../..
 import { AlertmanagerProvider } from '../../state/AlertmanagerContext';
 import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
 
-import { Policy } from './Policy';
+import {
+  AUTOGENERATED_ROOT_LABEL_NAME,
+  Policy,
+  isAutoGeneratedRootAndSimplifiedEnabled,
+  useCreateDropdownMenuActions,
+} from './Policy';
 
 jest.mock('../../hooks/useAbilities', () => ({
   ...jest.requireActual('../../hooks/useAbilities'),
@@ -134,7 +139,7 @@ describe('Policy', () => {
     expect(within(secondPolicy).getByTestId('label-matchers')).toHaveTextContent(/^region \= EMEA$/);
     expect(within(secondPolicy).queryByTestId('continue-matching')).not.toBeInTheDocument();
     expect(within(secondPolicy).queryByTestId('mute-timings')).not.toBeInTheDocument();
-    expect(within(secondPolicy).getByTestId('inherited-properties')).toHaveTextContent('Inherited4 properties');
+    expect(within(secondPolicy).getByTestId('inherited-properties')).toHaveTextContent('Inherited3 properties');
 
     // third custom policy should be correct
     const thirdPolicy = customPolicies[2];
@@ -163,6 +168,7 @@ describe('Policy', () => {
         onAddPolicy={onAddPolicy}
         onDeletePolicy={onDeletePolicy}
         onShowAlertInstances={onShowAlertInstances}
+        isAutoGenerated={false}
       />
     );
     // should have default policy
@@ -379,3 +385,104 @@ const mockRoutes: RouteWithID = {
   group_interval: undefined,
   repeat_interval: undefined,
 };
+
+describe('isAutoGeneratedRootAndSimplifiedEnabled', () => {
+  it('returns false when simplified routing is not enabled', () => {
+    const route: RouteWithID = {
+      id: '1',
+      object_matchers: [['label', MatcherOperator.equal, 'true']],
+    };
+    config.featureToggles.alertingSimplifiedRouting = false;
+    expect(isAutoGeneratedRootAndSimplifiedEnabled(route)).toBe(false);
+  });
+
+  it('returns false when object_matchers is not defined', () => {
+    const route: RouteWithID = {
+      id: '1',
+    };
+    config.featureToggles.alertingSimplifiedRouting = true;
+    expect(isAutoGeneratedRootAndSimplifiedEnabled(route)).toBe(false);
+  });
+
+  it('returns true when object_matchers contains AUTOGENERATED_ROOT_LABEL_NAME, and simplified routing is enabled', () => {
+    const route: RouteWithID = {
+      id: '1',
+      object_matchers: [[AUTOGENERATED_ROOT_LABEL_NAME, MatcherOperator.equal, 'true']],
+    };
+    config.featureToggles.alertingSimplifiedRouting = true;
+    expect(isAutoGeneratedRootAndSimplifiedEnabled(route)).toBe(true);
+  });
+
+  it('returns false when object_matchers does not contain AUTOGENERATED_ROOT_LABEL_NAME, and simplified routing is enabled', () => {
+    const route: RouteWithID = {
+      id: '1',
+      object_matchers: [['label', MatcherOperator.equal, 'true']],
+    };
+    config.featureToggles.alertingSimplifiedRouting = true;
+    expect(isAutoGeneratedRootAndSimplifiedEnabled(route)).toBe(false);
+  });
+});
+
+describe('useCreateDropdownMenuActions', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+  const openDetailModal = jest.fn();
+  const currentRoute: RouteWithID = { id: '0', routes: [{ id: '1' }] };
+  const toggleShowExportDrawer = jest.fn();
+  const onDeletePolicy = jest.fn();
+  const testCases = [
+    {
+      isAutoGenerated: false,
+      isDefaultPolicy: true,
+      provisioned: false,
+      expectedMenu: ['edit-policy', 'export-policy'],
+    },
+    {
+      isAutoGenerated: false,
+      isDefaultPolicy: true,
+      provisioned: true,
+      expectedMenu: ['edit-policy', 'export-policy'],
+    },
+    {
+      isAutoGenerated: false,
+      isDefaultPolicy: false,
+      provisioned: false,
+      expectedMenu: ['edit-policy', 'delete-policy'],
+    },
+    {
+      isAutoGenerated: false,
+      isDefaultPolicy: false,
+      provisioned: true,
+      expectedMenu: ['edit-policy', 'delete-policy'],
+    },
+    { isAutoGenerated: true, isDefaultPolicy: true, provisioned: true, expectedMenu: ['edit-policy'] },
+    { isAutoGenerated: true, isDefaultPolicy: false, provisioned: false, expectedMenu: ['edit-policy'] },
+    { isAutoGenerated: true, isDefaultPolicy: true, provisioned: false, expectedMenu: ['edit-policy'] },
+    { isAutoGenerated: true, isDefaultPolicy: false, provisioned: true, expectedMenu: ['edit-policy'] },
+  ];
+
+  testCases.forEach(({ isAutoGenerated, isDefaultPolicy, provisioned, expectedMenu }) => {
+    it(`Having all the permissions returns ${expectedMenu.length} menu items for isAutoGenerated=${isAutoGenerated}, isDefaultPolicy=${isDefaultPolicy}, provisioned=${provisioned}`, () => {
+      useAlertmanagerAbilitiesMock.mockReturnValue([
+        [true, true],
+        [true, true],
+        [true, true],
+      ]);
+      const { result } = renderHook(() =>
+        useCreateDropdownMenuActions(
+          isAutoGenerated,
+          isDefaultPolicy,
+          provisioned,
+          openDetailModal,
+          currentRoute,
+          toggleShowExportDrawer,
+          onDeletePolicy
+        )
+      );
+
+      const menuItemsKeys = result.current.map((item) => item.key ?? '');
+      expect(menuItemsKeys).toEqual(expectedMenu);
+    });
+  });
+});
diff --git a/public/app/features/alerting/unified/components/notification-policies/Policy.tsx b/public/app/features/alerting/unified/components/notification-policies/Policy.tsx
index a8defc8261409..129734656b732 100644
--- a/public/app/features/alerting/unified/components/notification-policies/Policy.tsx
+++ b/public/app/features/alerting/unified/components/notification-policies/Policy.tsx
@@ -1,22 +1,43 @@
 import { css } from '@emotion/css';
 import { defaults, groupBy, isArray, sumBy, uniqueId, upperFirst } from 'lodash';
 import pluralize from 'pluralize';
-import React, { FC, Fragment, ReactNode } from 'react';
+import React, { FC, Fragment, ReactNode, useState } from 'react';
 import { Link } from 'react-router-dom';
 import { useToggle } from 'react-use';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Badge, Button, Dropdown, getTagColorsFromName, Icon, Menu, Text, Tooltip, useStyles2 } from '@grafana/ui';
-import ConditionalWrap from 'app/features/alerting/components/ConditionalWrap';
-import { AlertmanagerGroup, ObjectMatcher, Receiver, RouteWithID } from 'app/plugins/datasource/alertmanager/types';
+import { config } from '@grafana/runtime';
+import {
+  Badge,
+  Button,
+  Dropdown,
+  Icon,
+  IconButton,
+  Menu,
+  Stack,
+  Text,
+  Tooltip,
+  getTagColorsFromName,
+  useStyles2,
+} from '@grafana/ui';
+import ConditionalWrap from 'app/features/alerting/unified/components/ConditionalWrap';
+import {
+  AlertmanagerGroup,
+  MatcherOperator,
+  ObjectMatcher,
+  Receiver,
+  RouteWithID,
+} from 'app/plugins/datasource/alertmanager/types';
 import { ReceiversState } from 'app/types';
 
-import { AlertmanagerAction, useAlertmanagerAbilities } from '../../hooks/useAbilities';
+import { RoutesMatchingFilters } from '../../NotificationPolicies';
+import { AlertmanagerAction, useAlertmanagerAbilities, useAlertmanagerAbility } from '../../hooks/useAbilities';
 import { INTEGRATION_ICONS } from '../../types/contact-points';
-import { normalizeMatchers } from '../../utils/matchers';
+import { getAmMatcherFormatter } from '../../utils/alertmanager';
+import { MatcherFormatter, normalizeMatchers } from '../../utils/matchers';
 import { createContactPointLink, createMuteTimingLink } from '../../utils/misc';
-import { getInheritedProperties, InhertitableProperties } from '../../utils/notification-policies';
+import { InheritableProperties, getInheritedProperties } from '../../utils/notification-policies';
+import { InsertPosition } from '../../utils/routeTree';
 import { Authorize } from '../Authorize';
 import { HoverCard } from '../HoverCard';
 import { Label } from '../Label';
@@ -27,7 +48,7 @@ import { Strong } from '../Strong';
 import { GrafanaPoliciesExporter } from '../export/GrafanaPoliciesExporter';
 
 import { Matchers } from './Matchers';
-import { TimingOptions, TIMING_OPTIONS_DEFAULTS } from './timingOptions';
+import { TIMING_OPTIONS_DEFAULTS, TimingOptions } from './timingOptions';
 
 interface PolicyComponentProps {
   receivers?: Receiver[];
@@ -35,65 +56,70 @@ interface PolicyComponentProps {
   contactPointsState?: ReceiversState;
   readOnly?: boolean;
   provisioned?: boolean;
-  inheritedProperties?: Partial<InhertitableProperties>;
-  routesMatchingFilters?: RouteWithID[];
-  // routeAlertGroupsMap?: Map<string, AlertmanagerGroup[]>;
+  inheritedProperties?: Partial<InheritableProperties>;
+  routesMatchingFilters?: RoutesMatchingFilters;
 
-  matchingInstancesPreview?: { groupsMap?: Map<string, AlertmanagerGroup[]>; enabled: boolean };
+  matchingInstancesPreview?: {
+    groupsMap?: Map<string, AlertmanagerGroup[]>;
+    enabled: boolean;
+  };
 
   routeTree: RouteWithID;
   currentRoute: RouteWithID;
   alertManagerSourceName: string;
-  onEditPolicy: (route: RouteWithID, isDefault?: boolean) => void;
-  onAddPolicy: (route: RouteWithID) => void;
+  onEditPolicy: (route: RouteWithID, isDefault?: boolean, isAutogenerated?: boolean) => void;
+  onAddPolicy: (route: RouteWithID, position: InsertPosition) => void;
   onDeletePolicy: (route: RouteWithID) => void;
-  onShowAlertInstances: (alertGroups: AlertmanagerGroup[], matchers?: ObjectMatcher[]) => void;
+  onShowAlertInstances: (
+    alertGroups: AlertmanagerGroup[],
+    matchers?: ObjectMatcher[],
+    formatter?: MatcherFormatter
+  ) => void;
+  isAutoGenerated?: boolean;
 }
 
-const Policy: FC<PolicyComponentProps> = ({
-  receivers = [],
-  contactPointsState,
-  readOnly = false,
-  provisioned = false,
-  alertGroups = [],
-  alertManagerSourceName,
-  currentRoute,
-  routeTree,
-  inheritedProperties,
-  routesMatchingFilters = [],
-  matchingInstancesPreview = { enabled: false },
-  onEditPolicy,
-  onAddPolicy,
-  onDeletePolicy,
-  onShowAlertInstances,
-}) => {
+const Policy = (props: PolicyComponentProps) => {
+  const {
+    receivers = [],
+    contactPointsState,
+    readOnly = false,
+    provisioned = false,
+    alertGroups = [],
+    alertManagerSourceName,
+    currentRoute,
+    routeTree,
+    inheritedProperties,
+    routesMatchingFilters = {
+      filtersApplied: false,
+      matchedRoutesWithPath: new Map<RouteWithID, RouteWithID[]>(),
+    },
+    matchingInstancesPreview = { enabled: false },
+    onEditPolicy,
+    onAddPolicy,
+    onDeletePolicy,
+    onShowAlertInstances,
+    isAutoGenerated = false,
+  } = props;
+
   const styles = useStyles2(getStyles);
-  const isDefaultPolicy = currentRoute === routeTree;
 
-  const [
-    [updatePoliciesSupported, updatePoliciesAllowed],
-    [deletePolicySupported, deletePolicyAllowed],
-    [exportPoliciesSupported, exportPoliciesAllowed],
-  ] = useAlertmanagerAbilities([
-    AlertmanagerAction.UpdateNotificationPolicyTree,
-    AlertmanagerAction.DeleteNotificationPolicy,
-    AlertmanagerAction.ExportNotificationPolicies,
-  ]);
+  const isDefaultPolicy = currentRoute === routeTree;
 
   const contactPoint = currentRoute.receiver;
   const continueMatching = currentRoute.continue ?? false;
-  const groupBy = currentRoute.group_by;
-  const muteTimings = currentRoute.mute_time_intervals ?? [];
-  const timingOptions: TimingOptions = {
-    group_wait: currentRoute.group_wait,
-    group_interval: currentRoute.group_interval,
-    repeat_interval: currentRoute.repeat_interval,
-  };
 
   const matchers = normalizeMatchers(currentRoute);
   const hasMatchers = Boolean(matchers && matchers.length);
-  const hasMuteTimings = Boolean(muteTimings.length);
-  const hasFocus = routesMatchingFilters.some((route) => route.id === currentRoute.id);
+
+  const { filtersApplied, matchedRoutesWithPath } = routesMatchingFilters;
+  const matchedRoutes = Array.from(matchedRoutesWithPath.keys());
+
+  // check if this route matches the filters
+  const hasFocus = filtersApplied && matchedRoutes.some((route) => route.id === currentRoute.id);
+
+  // check if this route belongs to a path that matches the filters
+  const routesPath = Array.from(matchedRoutesWithPath.values()).flat();
+  const belongsToMatchPath = routesPath.some((route: RouteWithID) => route.id === currentRoute.id);
 
   // gather errors here
   const errors: ReactNode[] = [];
@@ -106,33 +132,402 @@ const Policy: FC<PolicyComponentProps> = ({
   const actualContactPoint = contactPoint ?? inheritedProperties?.receiver ?? '';
   const contactPointErrors = contactPointsState ? getContactPointErrors(actualContactPoint, contactPointsState) : [];
 
+  const allChildPolicies = currentRoute.routes ?? [];
+
+  // filter child policies that match
+  const childPolicies = filtersApplied
+    ? // filter by the ones that belong to the path that matches the filters
+      allChildPolicies.filter((policy) => routesPath.some((route: RouteWithID) => route.id === policy.id))
+    : allChildPolicies;
+
+  const hasChildPolicies = childPolicies.length > 0;
+
+  const [showExportDrawer, toggleShowExportDrawer] = useToggle(false);
+  const matchingAlertGroups = matchingInstancesPreview?.groupsMap?.get(currentRoute.id);
+
+  // sum all alert instances for all groups we're handling
+  const numberOfAlertInstances = matchingAlertGroups
+    ? sumBy(matchingAlertGroups, (group) => group.alerts.length)
+    : undefined;
+
+  // simplified routing permissions
+  const [isSupportedToSeeAutogeneratedChunk, isAllowedToSeeAutogeneratedChunk] = useAlertmanagerAbility(
+    AlertmanagerAction.ViewAutogeneratedPolicyTree
+  );
+
+  // we collapse the auto-generated policies by default
+  const isAutogeneratedPolicyRoot = isAutoGeneratedRootAndSimplifiedEnabled(currentRoute);
+  const [showPolicyChildren, togglePolicyChildren] = useToggle(isAutogeneratedPolicyRoot ? false : true);
+
+  const groupBy = currentRoute.group_by;
+  const muteTimings = currentRoute.mute_time_intervals ?? [];
+
+  const timingOptions: TimingOptions = {
+    group_wait: currentRoute.group_wait,
+    group_interval: currentRoute.group_interval,
+    repeat_interval: currentRoute.repeat_interval,
+  };
+
   contactPointErrors.forEach((error) => {
     errors.push(error);
   });
 
-  const hasInheritedProperties = inheritedProperties && Object.keys(inheritedProperties).length > 0;
+  const POLICIES_PER_PAGE = 20;
+
+  const [visibleChildPolicies, setVisibleChildPolicies] = useState(POLICIES_PER_PAGE);
+
+  // build the menu actions for our policy
+  const dropdownMenuActions: JSX.Element[] = useCreateDropdownMenuActions(
+    isAutoGenerated,
+    isDefaultPolicy,
+    provisioned,
+    onEditPolicy,
+    currentRoute,
+    toggleShowExportDrawer,
+    onDeletePolicy
+  );
+
+  // check if this policy should be visible. If it's autogenerated and the user is not allowed to see autogenerated
+  // policies then we should not show it. Same if the user is not supported to see autogenerated policies.
+  const hideCurrentPolicy =
+    isAutoGenerated && (!isAllowedToSeeAutogeneratedChunk || !isSupportedToSeeAutogeneratedChunk);
+  const hideCurrentPolicyForFilters = filtersApplied && !belongsToMatchPath;
+
+  if (hideCurrentPolicy || hideCurrentPolicyForFilters) {
+    return null;
+  }
 
-  const childPolicies = currentRoute.routes ?? [];
+  const isImmutablePolicy = isDefaultPolicy || isAutogeneratedPolicyRoot;
+  // TODO dead branch detection, warnings for all sort of configs that won't work or will never be activated
+
+  const childPoliciesBelongingToMatchPath = childPolicies.filter((child) =>
+    routesPath.some((route: RouteWithID) => route.id === child.id)
+  );
+
+  // child policies to render are the ones that belong to the path that matches the filters
+  const childPoliciesToRender = filtersApplied ? childPoliciesBelongingToMatchPath : childPolicies;
+  const pageOfChildren = childPoliciesToRender.slice(0, visibleChildPolicies);
+
+  const moreCount = childPoliciesToRender.length - pageOfChildren.length;
+  const showMore = moreCount > 0;
+
+  return (
+    <>
+      <Stack direction="column" gap={1.5}>
+        <div
+          className={styles.policyWrapper(hasFocus)}
+          data-testid={isDefaultPolicy ? 'am-root-route-container' : 'am-route-container'}
+        >
+          {/* continueMatching and showMatchesAllLabelsWarning are mutually exclusive so the icons can't overlap */}
+          {continueMatching && <ContinueMatchingIndicator />}
+          {showMatchesAllLabelsWarning && <AllMatchesIndicator />}
+
+          <div className={styles.policyItemWrapper}>
+            <Stack direction="column" gap={1}>
+              {/* Matchers and actions */}
+              <div>
+                <Stack direction="row" alignItems="center" gap={1}>
+                  {hasChildPolicies ? (
+                    <IconButton
+                      name={showPolicyChildren ? 'angle-down' : 'angle-right'}
+                      onClick={togglePolicyChildren}
+                      aria-label={showPolicyChildren ? 'Collapse' : 'Expand'}
+                    />
+                  ) : null}
+                  {isImmutablePolicy ? (
+                    isAutogeneratedPolicyRoot ? (
+                      <AutogeneratedRootIndicator />
+                    ) : (
+                      <DefaultPolicyIndicator />
+                    )
+                  ) : hasMatchers ? (
+                    <Matchers matchers={matchers ?? []} formatter={getAmMatcherFormatter(alertManagerSourceName)} />
+                  ) : (
+                    <span className={styles.metadata}>No matchers</span>
+                  )}
+                  <Spacer />
+                  {/* TODO maybe we should move errors to the gutter instead? */}
+                  {errors.length > 0 && <Errors errors={errors} />}
+                  {provisioned && <ProvisioningBadge />}
+                  <Stack direction="row" gap={0.5}>
+                    {!isAutoGenerated && !readOnly && (
+                      <Authorize actions={[AlertmanagerAction.CreateNotificationPolicy]}>
+                        <ConditionalWrap shouldWrap={provisioned} wrap={ProvisionedTooltip}>
+                          {isDefaultPolicy ? (
+                            <Button
+                              variant="secondary"
+                              icon="plus"
+                              size="sm"
+                              disabled={provisioned}
+                              type="button"
+                              onClick={() => onAddPolicy(currentRoute, 'child')}
+                            >
+                              New child policy
+                            </Button>
+                          ) : (
+                            <Dropdown
+                              overlay={
+                                <Menu>
+                                  <Menu.Item
+                                    label="Insert above"
+                                    icon="arrow-up"
+                                    onClick={() => onAddPolicy(currentRoute, 'above')}
+                                  />
+                                  <Menu.Item
+                                    label="Insert below"
+                                    icon="arrow-down"
+                                    onClick={() => onAddPolicy(currentRoute, 'below')}
+                                  />
+                                  <Menu.Divider />
+                                  <Menu.Item
+                                    label="New child policy"
+                                    icon="plus"
+                                    onClick={() => onAddPolicy(currentRoute, 'child')}
+                                  />
+                                </Menu>
+                              }
+                            >
+                              <Button
+                                size="sm"
+                                variant="secondary"
+                                disabled={provisioned}
+                                icon="angle-down"
+                                type="button"
+                              >
+                                Add new policy
+                              </Button>
+                            </Dropdown>
+                          )}
+                        </ConditionalWrap>
+                      </Authorize>
+                    )}
+                    {dropdownMenuActions.length > 0 && (
+                      <Dropdown overlay={<Menu>{dropdownMenuActions}</Menu>}>
+                        <Button
+                          icon="ellipsis-h"
+                          variant="secondary"
+                          size="sm"
+                          type="button"
+                          aria-label="more-actions"
+                          data-testid="more-actions"
+                        />
+                      </Dropdown>
+                    )}
+                  </Stack>
+                </Stack>
+              </div>
+
+              {/* Metadata row */}
+              <MetadataRow
+                matchingInstancesPreview={matchingInstancesPreview}
+                numberOfAlertInstances={numberOfAlertInstances}
+                contactPoint={contactPoint ?? undefined}
+                groupBy={groupBy}
+                muteTimings={muteTimings}
+                timingOptions={timingOptions}
+                inheritedProperties={inheritedProperties}
+                alertManagerSourceName={alertManagerSourceName}
+                receivers={receivers}
+                matchingAlertGroups={matchingAlertGroups}
+                matchers={matchers}
+                isDefaultPolicy={isDefaultPolicy}
+                onShowAlertInstances={onShowAlertInstances}
+              />
+            </Stack>
+          </div>
+        </div>
+        <div className={styles.childPolicies}>
+          {showPolicyChildren && (
+            <>
+              {pageOfChildren.map((child) => {
+                const childInheritedProperties = getInheritedProperties(currentRoute, child, inheritedProperties);
+                // This child is autogenerated if it's the autogenerated root or if it's a child of an autogenerated policy.
+                const isThisChildAutoGenerated = isAutoGeneratedRootAndSimplifiedEnabled(child) || isAutoGenerated;
+                /* pass the "readOnly" prop from the parent, because for any child policy , if its parent it's not editable,
+                then the child policy should not be editable either */
+                const isThisChildReadOnly = readOnly || provisioned || isAutoGenerated;
+
+                return (
+                  <Policy
+                    key={child.id}
+                    routeTree={routeTree}
+                    currentRoute={child}
+                    receivers={receivers}
+                    contactPointsState={contactPointsState}
+                    readOnly={isThisChildReadOnly}
+                    inheritedProperties={childInheritedProperties}
+                    onAddPolicy={onAddPolicy}
+                    onEditPolicy={onEditPolicy}
+                    onDeletePolicy={onDeletePolicy}
+                    onShowAlertInstances={onShowAlertInstances}
+                    alertManagerSourceName={alertManagerSourceName}
+                    alertGroups={alertGroups}
+                    routesMatchingFilters={routesMatchingFilters}
+                    matchingInstancesPreview={matchingInstancesPreview}
+                    isAutoGenerated={isThisChildAutoGenerated}
+                    provisioned={provisioned}
+                  />
+                );
+              })}
+              {showMore && (
+                <Button
+                  size="sm"
+                  icon="angle-down"
+                  variant="secondary"
+                  className={styles.moreButtons}
+                  onClick={() => setVisibleChildPolicies(visibleChildPolicies + POLICIES_PER_PAGE)}
+                >
+                  {moreCount} additional {pluralize('policy', moreCount)}
+                </Button>
+              )}
+            </>
+          )}
+        </div>
+        {showExportDrawer && <GrafanaPoliciesExporter onClose={toggleShowExportDrawer} />}
+      </Stack>
+    </>
+  );
+};
+
+interface MetadataRowProps {
+  matchingInstancesPreview: { groupsMap?: Map<string, AlertmanagerGroup[]>; enabled: boolean };
+  numberOfAlertInstances?: number;
+  contactPoint?: string;
+  groupBy?: string[];
+  muteTimings?: string[];
+  timingOptions?: TimingOptions;
+  inheritedProperties?: Partial<InheritableProperties>;
+  alertManagerSourceName: string;
+  receivers: Receiver[];
+  matchingAlertGroups?: AlertmanagerGroup[];
+  matchers?: ObjectMatcher[];
+  isDefaultPolicy: boolean;
+  onShowAlertInstances: (
+    alertGroups: AlertmanagerGroup[],
+    matchers?: ObjectMatcher[],
+    formatter?: MatcherFormatter
+  ) => void;
+}
+
+function MetadataRow({
+  numberOfAlertInstances,
+  isDefaultPolicy,
+  timingOptions,
+  groupBy,
+  muteTimings = [],
+  matchingInstancesPreview,
+  inheritedProperties,
+  matchingAlertGroups,
+  onShowAlertInstances,
+  matchers,
+  contactPoint,
+  alertManagerSourceName,
+  receivers,
+}: MetadataRowProps) {
+  const styles = useStyles2(getStyles);
+
+  const inheritedGrouping = inheritedProperties && inheritedProperties.group_by;
+  const hasInheritedProperties = inheritedProperties && Object.keys(inheritedProperties).length > 0;
 
-  const inheritedGrouping = hasInheritedProperties && inheritedProperties.group_by;
   const noGrouping = isArray(groupBy) && groupBy[0] === '...';
   const customGrouping = !noGrouping && isArray(groupBy) && groupBy.length > 0;
   const singleGroup = isDefaultPolicy && isArray(groupBy) && groupBy.length === 0;
 
-  const matchingAlertGroups = matchingInstancesPreview?.groupsMap?.get(currentRoute.id);
+  const hasMuteTimings = Boolean(muteTimings.length);
 
-  // sum all alert instances for all groups we're handling
-  const numberOfAlertInstances = matchingAlertGroups
-    ? sumBy(matchingAlertGroups, (group) => group.alerts.length)
-    : undefined;
+  return (
+    <div className={styles.metadataRow}>
+      <Stack direction="row" alignItems="center" gap={1}>
+        {matchingInstancesPreview.enabled && (
+          <MetaText
+            icon="layers-alt"
+            onClick={() => {
+              matchingAlertGroups &&
+                onShowAlertInstances(matchingAlertGroups, matchers, getAmMatcherFormatter(alertManagerSourceName));
+            }}
+            data-testid="matching-instances"
+          >
+            <Strong>{numberOfAlertInstances ?? '-'}</Strong>
+            <span>{pluralize('instance', numberOfAlertInstances)}</span>
+          </MetaText>
+        )}
+        {contactPoint && (
+          <MetaText icon="at" data-testid="contact-point">
+            <span>Delivered to</span>
+            <ContactPointsHoverDetails
+              alertManagerSourceName={alertManagerSourceName}
+              receivers={receivers}
+              contactPoint={contactPoint}
+            />
+          </MetaText>
+        )}
+        {!inheritedGrouping && (
+          <>
+            {customGrouping && (
+              <MetaText icon="layer-group" data-testid="grouping">
+                <span>Grouped by</span>
+                <Strong>{groupBy.join(', ')}</Strong>
+              </MetaText>
+            )}
+            {singleGroup && (
+              <MetaText icon="layer-group">
+                <span>Single group</span>
+              </MetaText>
+            )}
+            {noGrouping && (
+              <MetaText icon="layer-group">
+                <span>Not grouping</span>
+              </MetaText>
+            )}
+          </>
+        )}
+        {hasMuteTimings && (
+          <MetaText icon="calendar-slash" data-testid="mute-timings">
+            <span>Muted when</span>
+            <MuteTimings timings={muteTimings} alertManagerSourceName={alertManagerSourceName} />
+          </MetaText>
+        )}
+        {timingOptions && (
+          // for the default policy we will also merge the default timings, that way a user can observe what the timing options would be
+          <TimingOptionsMeta
+            timingOptions={isDefaultPolicy ? defaults(timingOptions, TIMING_OPTIONS_DEFAULTS) : timingOptions}
+          />
+        )}
+        {hasInheritedProperties && (
+          <>
+            <MetaText icon="corner-down-right-alt" data-testid="inherited-properties">
+              <span>Inherited</span>
+              <InheritedProperties properties={inheritedProperties} />
+            </MetaText>
+          </>
+        )}
+      </Stack>
+    </div>
+  );
+}
 
-  const [showExportDrawer, toggleShowExportDrawer] = useToggle(false);
-  const showExportAction = exportPoliciesAllowed && exportPoliciesSupported && isDefaultPolicy;
+export const useCreateDropdownMenuActions = (
+  isAutoGenerated: boolean,
+  isDefaultPolicy: boolean,
+  provisioned: boolean,
+  onEditPolicy: (route: RouteWithID, isDefault?: boolean, readOnly?: boolean) => void,
+  currentRoute: RouteWithID,
+  toggleShowExportDrawer: (nextValue?: any) => void,
+  onDeletePolicy: (route: RouteWithID) => void
+) => {
+  const [
+    [updatePoliciesSupported, updatePoliciesAllowed],
+    [deletePolicySupported, deletePolicyAllowed],
+    [exportPoliciesSupported, exportPoliciesAllowed],
+  ] = useAlertmanagerAbilities([
+    AlertmanagerAction.UpdateNotificationPolicyTree,
+    AlertmanagerAction.DeleteNotificationPolicy,
+    AlertmanagerAction.ExportNotificationPolicies,
+  ]);
+  const dropdownMenuActions = [];
+  const showExportAction = exportPoliciesAllowed && exportPoliciesSupported && isDefaultPolicy && !isAutoGenerated;
   const showEditAction = updatePoliciesSupported && updatePoliciesAllowed;
-  const showDeleteAction = deletePolicySupported && deletePolicyAllowed && !isDefaultPolicy;
-
-  // build the menu actions for our policy
-  const dropdownMenuActions: JSX.Element[] = [];
+  const showDeleteAction = deletePolicySupported && deletePolicyAllowed && !isDefaultPolicy && !isAutoGenerated;
 
   if (showEditAction) {
     dropdownMenuActions.push(
@@ -140,7 +535,7 @@ const Policy: FC<PolicyComponentProps> = ({
         <ConditionalWrap shouldWrap={provisioned} wrap={ProvisionedTooltip}>
           <Menu.Item
             icon="edit"
-            disabled={provisioned}
+            disabled={provisioned || isAutoGenerated}
             label="Edit"
             onClick={() => onEditPolicy(currentRoute, isDefaultPolicy)}
           />
@@ -163,7 +558,7 @@ const Policy: FC<PolicyComponentProps> = ({
           <Menu.Item
             destructive
             icon="trash-alt"
-            disabled={provisioned}
+            disabled={provisioned || isAutoGenerated}
             label="Delete"
             onClick={() => onDeletePolicy(currentRoute)}
           />
@@ -171,166 +566,30 @@ const Policy: FC<PolicyComponentProps> = ({
       </Fragment>
     );
   }
+  return dropdownMenuActions;
+};
 
-  // TODO dead branch detection, warnings for all sort of configs that won't work or will never be activated
-  return (
-    <Stack direction="column" gap={1.5}>
-      <div
-        className={styles.policyWrapper(hasFocus)}
-        data-testid={isDefaultPolicy ? 'am-root-route-container' : 'am-route-container'}
-      >
-        {/* continueMatching and showMatchesAllLabelsWarning are mutually exclusive so the icons can't overlap */}
-        {continueMatching && <ContinueMatchingIndicator />}
-        {showMatchesAllLabelsWarning && <AllMatchesIndicator />}
-        <div className={styles.policyItemWrapper}>
-          <Stack direction="column" gap={1}>
-            {/* Matchers and actions */}
-            <div>
-              <Stack direction="row" alignItems="center" gap={1}>
-                {isDefaultPolicy ? (
-                  <DefaultPolicyIndicator />
-                ) : hasMatchers ? (
-                  <Matchers matchers={matchers ?? []} />
-                ) : (
-                  <span className={styles.metadata}>No matchers</span>
-                )}
-                <Spacer />
-                {/* TODO maybe we should move errors to the gutter instead? */}
-                {errors.length > 0 && <Errors errors={errors} />}
-                {provisioned && <ProvisioningBadge />}
-                {!readOnly && (
-                  <Stack direction="row" gap={0.5}>
-                    <Authorize actions={[AlertmanagerAction.CreateNotificationPolicy]}>
-                      <ConditionalWrap shouldWrap={provisioned} wrap={ProvisionedTooltip}>
-                        <Button
-                          variant="secondary"
-                          icon="plus"
-                          size="sm"
-                          onClick={() => onAddPolicy(currentRoute)}
-                          disabled={provisioned}
-                          type="button"
-                        >
-                          New nested policy
-                        </Button>
-                      </ConditionalWrap>
-                    </Authorize>
-                    {dropdownMenuActions.length > 0 && (
-                      <Dropdown overlay={<Menu>{dropdownMenuActions}</Menu>}>
-                        <Button
-                          icon="ellipsis-h"
-                          variant="secondary"
-                          size="sm"
-                          type="button"
-                          aria-label="more-actions"
-                          data-testid="more-actions"
-                        />
-                      </Dropdown>
-                    )}
-                  </Stack>
-                )}
-              </Stack>
-            </div>
-
-            {/* Metadata row */}
-            <div className={styles.metadataRow}>
-              <Stack direction="row" alignItems="center" gap={1}>
-                {matchingInstancesPreview.enabled && (
-                  <MetaText
-                    icon="layers-alt"
-                    onClick={() => {
-                      matchingAlertGroups && onShowAlertInstances(matchingAlertGroups, matchers);
-                    }}
-                    data-testid="matching-instances"
-                  >
-                    <Strong>{numberOfAlertInstances ?? '-'}</Strong>
-                    <span>{pluralize('instance', numberOfAlertInstances)}</span>
-                  </MetaText>
-                )}
-                {contactPoint && (
-                  <MetaText icon="at" data-testid="contact-point">
-                    <span>Delivered to</span>
-                    <ContactPointsHoverDetails
-                      alertManagerSourceName={alertManagerSourceName}
-                      receivers={receivers}
-                      contactPoint={contactPoint}
-                    />
-                  </MetaText>
-                )}
-                {!inheritedGrouping && (
-                  <>
-                    {customGrouping && (
-                      <MetaText icon="layer-group" data-testid="grouping">
-                        <span>Grouped by</span>
-                        <Strong>{groupBy.join(', ')}</Strong>
-                      </MetaText>
-                    )}
-                    {singleGroup && (
-                      <MetaText icon="layer-group">
-                        <span>Single group</span>
-                      </MetaText>
-                    )}
-                    {noGrouping && (
-                      <MetaText icon="layer-group">
-                        <span>Not grouping</span>
-                      </MetaText>
-                    )}
-                  </>
-                )}
-                {hasMuteTimings && (
-                  <MetaText icon="calendar-slash" data-testid="mute-timings">
-                    <span>Muted when</span>
-                    <MuteTimings timings={muteTimings} alertManagerSourceName={alertManagerSourceName} />
-                  </MetaText>
-                )}
-                {timingOptions && (
-                  // for the default policy we will also merge the default timings, that way a user can observe what the timing options would be
-                  <TimingOptionsMeta
-                    timingOptions={isDefaultPolicy ? defaults(timingOptions, TIMING_OPTIONS_DEFAULTS) : timingOptions}
-                  />
-                )}
-                {hasInheritedProperties && (
-                  <>
-                    <MetaText icon="corner-down-right-alt" data-testid="inherited-properties">
-                      <span>Inherited</span>
-                      <InheritedProperties properties={inheritedProperties} />
-                    </MetaText>
-                  </>
-                )}
-              </Stack>
-            </div>
-          </Stack>
-        </div>
-      </div>
-      <div className={styles.childPolicies}>
-        {/* pass the "readOnly" prop from the parent, because if you can't edit the parent you can't edit children */}
-        {childPolicies.map((child) => {
-          const childInheritedProperties = getInheritedProperties(currentRoute, child, inheritedProperties);
+export const AUTOGENERATED_ROOT_LABEL_NAME = '__grafana_autogenerated__';
 
-          return (
-            <Policy
-              key={uniqueId()}
-              routeTree={routeTree}
-              currentRoute={child}
-              receivers={receivers}
-              contactPointsState={contactPointsState}
-              readOnly={readOnly || provisioned}
-              inheritedProperties={childInheritedProperties}
-              onAddPolicy={onAddPolicy}
-              onEditPolicy={onEditPolicy}
-              onDeletePolicy={onDeletePolicy}
-              onShowAlertInstances={onShowAlertInstances}
-              alertManagerSourceName={alertManagerSourceName}
-              alertGroups={alertGroups}
-              routesMatchingFilters={routesMatchingFilters}
-              matchingInstancesPreview={matchingInstancesPreview}
-            />
-          );
-        })}
-      </div>
-      {showExportDrawer && <GrafanaPoliciesExporter onClose={toggleShowExportDrawer} />}
-    </Stack>
+export function isAutoGeneratedRootAndSimplifiedEnabled(route: RouteWithID) {
+  const simplifiedRoutingToggleEnabled = config.featureToggles.alertingSimplifiedRouting ?? false;
+  if (!simplifiedRoutingToggleEnabled) {
+    return false;
+  }
+  if (!route.object_matchers) {
+    return false;
+  }
+  return (
+    route.object_matchers.some((objectMatcher) => {
+      return (
+        objectMatcher[0] === AUTOGENERATED_ROOT_LABEL_NAME &&
+        objectMatcher[1] === MatcherOperator.equal &&
+        objectMatcher[2] === 'true'
+      );
+    }) ?? false
   );
-};
+  // return simplifiedRoutingToggleEnabled && route.receiver === 'contact_point_5';
+}
 
 const ProvisionedTooltip = (children: ReactNode) => (
   <Tooltip content="Provisioned items cannot be edited in the UI" placement="top">
@@ -378,7 +637,7 @@ const AllMatchesIndicator: FC = () => {
   );
 };
 
-const DefaultPolicyIndicator: FC = () => {
+function DefaultPolicyIndicator() {
   const styles = useStyles2(getStyles);
   return (
     <>
@@ -388,21 +647,31 @@ const DefaultPolicyIndicator: FC = () => {
       </span>
     </>
   );
-};
+}
 
-const InheritedProperties: FC<{ properties: InhertitableProperties }> = ({ properties }) => (
+function AutogeneratedRootIndicator() {
+  return <strong> Auto-generated policies</strong>;
+}
+
+const InheritedProperties: FC<{ properties: InheritableProperties }> = ({ properties }) => (
   <HoverCard
     arrow
     placement="top"
     content={
       <Stack direction="row" gap={0.5}>
-        {Object.entries(properties).map(([key, value]) => (
-          <Label
-            key={key}
-            label={routePropertyToLabel(key)}
-            value={<Strong>{routePropertyToValue(key, value)}</Strong>}
-          />
-        ))}
+        {Object.entries(properties).map(([key, value]) => {
+          if (!value) {
+            return null;
+          }
+
+          return (
+            <Label
+              key={key}
+              label={routePropertyToLabel(key)}
+              value={<Strong>{routePropertyToValue(key, value)}</Strong>}
+            />
+          );
+        })}
       </Stack>
     }
   >
@@ -569,7 +838,7 @@ function getContactPointErrors(contactPoint: string, contactPointsState: Receive
   return contactPointErrors;
 }
 
-const routePropertyToLabel = (key: keyof InhertitableProperties | string): string => {
+const routePropertyToLabel = (key: keyof InheritableProperties | string): string => {
   switch (key) {
     case 'receiver':
       return 'Contact Point';
@@ -579,8 +848,6 @@ const routePropertyToLabel = (key: keyof InhertitableProperties | string): strin
       return 'Group interval';
     case 'group_wait':
       return 'Group wait';
-    case 'mute_time_intervals':
-      return 'Mute timings';
     case 'repeat_interval':
       return 'Repeat interval';
     default:
@@ -588,10 +855,7 @@ const routePropertyToLabel = (key: keyof InhertitableProperties | string): strin
   }
 };
 
-const routePropertyToValue = (
-  key: keyof InhertitableProperties | string,
-  value: string | string[]
-): React.ReactNode => {
+const routePropertyToValue = (key: keyof InheritableProperties | string, value: string | string[]): React.ReactNode => {
   const isNotGrouping = key === 'group_by' && Array.isArray(value) && value[0] === '...';
   const isSingleGroup = key === 'group_by' && Array.isArray(value) && value.length === 0;
 
@@ -619,84 +883,75 @@ const getStyles = (theme: GrafanaTheme2) => ({
     const { color, borderColor } = getTagColorsFromName(label);
 
     return {
-      wrapper: css`
-        color: #fff;
-        background: ${color};
-        padding: ${theme.spacing(0.33)} ${theme.spacing(0.66)};
-        font-size: ${theme.typography.bodySmall.fontSize};
-
-        border: solid 1px ${borderColor};
-        border-radius: ${theme.shape.radius.default};
-      `,
+      wrapper: css({
+        color: '#fff',
+        background: color,
+        padding: `${theme.spacing(0.33)} ${theme.spacing(0.66)}`,
+        fontSize: theme.typography.bodySmall.fontSize,
+        border: `solid 1px ${borderColor}`,
+        borderRadius: theme.shape.radius.default,
+      }),
     };
   },
-  childPolicies: css`
-    margin-left: ${theme.spacing(4)};
-    position: relative;
-
-    &:before {
-      content: '';
-      position: absolute;
-      height: calc(100% - 10px);
-
-      border-left: solid 1px ${theme.colors.border.weak};
-
-      margin-top: 0;
-      margin-left: -20px;
-    }
-  `,
-  policyItemWrapper: css`
-    padding: ${theme.spacing(1.5)};
-  `,
-  metadataRow: css`
-    background: ${theme.colors.background.secondary};
-
-    border-bottom-left-radius: ${theme.shape.borderRadius(2)};
-    border-bottom-right-radius: ${theme.shape.borderRadius(2)};
-  `,
-  policyWrapper: (hasFocus = false) => css`
-    flex: 1;
-    position: relative;
-    background: ${theme.colors.background.secondary};
-
-    border-radius: ${theme.shape.radius.default};
-    border: solid 1px ${theme.colors.border.weak};
-
-    ${hasFocus &&
-    css`
-      border-color: ${theme.colors.primary.border};
-    `}
-  `,
-  metadata: css`
-    color: ${theme.colors.text.secondary};
-
-    font-size: ${theme.typography.bodySmall.fontSize};
-    font-weight: ${theme.typography.bodySmall.fontWeight};
-  `,
-  break: css`
-    width: 100%;
-    height: 0;
-    margin-bottom: ${theme.spacing(2)};
-  `,
-  gutterIcon: css`
-    position: absolute;
-
-    top: 0;
-    transform: translateY(50%);
-    left: -${theme.spacing(4)};
-
-    color: ${theme.colors.text.secondary};
-    background: ${theme.colors.background.primary};
-
-    width: 25px;
-    height: 25px;
-    text-align: center;
-
-    border: solid 1px ${theme.colors.border.weak};
-    border-radius: ${theme.shape.radius.default};
-
-    padding: 0;
-  `,
+  childPolicies: css({
+    marginLeft: theme.spacing(4),
+    position: 'relative',
+    '&:before': {
+      content: '""',
+      position: 'absolute',
+      height: 'calc(100% - 10px)',
+      borderLeft: `solid 1px ${theme.colors.border.weak}`,
+      marginTop: 0,
+      marginLeft: '-20px',
+    },
+  }),
+  policyItemWrapper: css({
+    padding: theme.spacing(1.5),
+  }),
+  metadataRow: css({
+    borderBottomLeftRadius: theme.shape.borderRadius(2),
+    borderBottomRightRadius: theme.shape.borderRadius(2),
+  }),
+  policyWrapper: (hasFocus = false) =>
+    css({
+      flex: 1,
+      position: 'relative',
+      background: theme.colors.background.secondary,
+      borderRadius: theme.shape.radius.default,
+      border: `solid 1px ${theme.colors.border.weak}`,
+      ...(hasFocus && {
+        borderColor: theme.colors.primary.border,
+        background: theme.colors.primary.transparent,
+      }),
+    }),
+  metadata: css({
+    color: theme.colors.text.secondary,
+    fontSize: theme.typography.bodySmall.fontSize,
+    fontWeight: theme.typography.bodySmall.fontWeight,
+  }),
+  break: css({
+    width: '100%',
+    height: 0,
+    marginBottom: theme.spacing(2),
+  }),
+  gutterIcon: css({
+    position: 'absolute',
+    top: 0,
+    transform: 'translateY(50%)',
+    left: `-${theme.spacing(4)}`,
+    color: theme.colors.text.secondary,
+    background: theme.colors.background.primary,
+    width: '25px',
+    height: '25px',
+    textAlign: 'center',
+    border: `solid 1px ${theme.colors.border.weak}`,
+    borderRadius: theme.shape.radius.default,
+    padding: 0,
+  }),
+  moreButtons: css({
+    marginTop: theme.spacing(0.5),
+    marginBottom: theme.spacing(1.5),
+  }),
 });
 
 export { Policy };
diff --git a/public/app/features/alerting/unified/components/notification-policies/routeTimingsFields.ts b/public/app/features/alerting/unified/components/notification-policies/routeTimingsFields.ts
new file mode 100644
index 0000000000000..159fd419f6da2
--- /dev/null
+++ b/public/app/features/alerting/unified/components/notification-policies/routeTimingsFields.ts
@@ -0,0 +1,19 @@
+export const routeTimingsFields = {
+  groupWait: {
+    label: 'Group wait',
+    description:
+      'The waiting time until the initial notification is sent for a new group created by an incoming alert. If empty it will be inherited from the parent policy.',
+    ariaLabel: 'Group wait value',
+  },
+  groupInterval: {
+    label: 'Group interval',
+    description:
+      'The waiting time to send a batch of new alerts for that group after the first notification was sent. If empty it will be inherited from the parent policy.',
+    ariaLabel: 'Group interval value',
+  },
+  repeatInterval: {
+    label: 'Repeat interval',
+    description: 'The waiting time to resend an alert after they have successfully been sent.',
+    ariaLabel: 'Repeat interval value',
+  },
+};
diff --git a/public/app/features/alerting/unified/components/panel-alerts-tab/NewRuleFromPanelButton.test.tsx b/public/app/features/alerting/unified/components/panel-alerts-tab/NewRuleFromPanelButton.test.tsx
index e1baefbd61d2c..eac3ccdf92779 100644
--- a/public/app/features/alerting/unified/components/panel-alerts-tab/NewRuleFromPanelButton.test.tsx
+++ b/public/app/features/alerting/unified/components/panel-alerts-tab/NewRuleFromPanelButton.test.tsx
@@ -26,6 +26,7 @@ jest.mock('react-router-dom', () => ({
 jest.spyOn(analytics, 'logInfo');
 
 jest.mock('react-use', () => ({
+  ...jest.requireActual('react-use'),
   useAsync: () => ({ loading: false, value: {} }),
 }));
 
@@ -39,7 +40,7 @@ describe('Analytics', () => {
     });
     render(<NewRuleFromPanelButton panel={panel} dashboard={dashboard} />);
 
-    const button = screen.getByText('Create alert rule from this panel');
+    const button = screen.getByText('New alert rule');
 
     button.addEventListener('click', (event) => event.preventDefault(), false);
 
diff --git a/public/app/features/alerting/unified/components/panel-alerts-tab/NewRuleFromPanelButton.tsx b/public/app/features/alerting/unified/components/panel-alerts-tab/NewRuleFromPanelButton.tsx
index cac61a795d472..4ab427e8341e0 100644
--- a/public/app/features/alerting/unified/components/panel-alerts-tab/NewRuleFromPanelButton.tsx
+++ b/public/app/features/alerting/unified/components/panel-alerts-tab/NewRuleFromPanelButton.tsx
@@ -30,7 +30,7 @@ export const NewRuleFromPanelButton = ({ dashboard, panel, className }: Props) =
   );
 
   if (loading) {
-    return <Button disabled={true}>Create alert rule from this panel</Button>;
+    return <Button disabled={true}>New alert rule</Button>;
   }
 
   if (!formValues) {
@@ -54,7 +54,7 @@ export const NewRuleFromPanelButton = ({ dashboard, panel, className }: Props) =
       className={className}
       data-testid="create-alert-rule-button"
     >
-      Create alert rule from this panel
+      New alert rule
     </LinkButton>
   );
 };
diff --git a/public/app/features/alerting/unified/components/receivers/DuplicateTemplateView.tsx b/public/app/features/alerting/unified/components/receivers/DuplicateTemplateView.tsx
index 96489e6c2eb94..91f28e94c79fa 100644
--- a/public/app/features/alerting/unified/components/receivers/DuplicateTemplateView.tsx
+++ b/public/app/features/alerting/unified/components/receivers/DuplicateTemplateView.tsx
@@ -20,7 +20,7 @@ export const DuplicateTemplateView = ({ config, templateName, alertManagerSource
   if (!template) {
     return (
       <Alert severity="error" title="Template not found">
-        Sorry, this template does not seem to exists.
+        Sorry, this template does not seem to exist.
       </Alert>
     );
   }
diff --git a/public/app/features/alerting/unified/components/receivers/EditTemplateView.tsx b/public/app/features/alerting/unified/components/receivers/EditTemplateView.tsx
index b8271e2d98ed0..062d2f58bece6 100644
--- a/public/app/features/alerting/unified/components/receivers/EditTemplateView.tsx
+++ b/public/app/features/alerting/unified/components/receivers/EditTemplateView.tsx
@@ -18,7 +18,7 @@ export const EditTemplateView = ({ config, templateName, alertManagerSourceName
   if (!template) {
     return (
       <Alert severity="error" title="Template not found">
-        Sorry, this template does not seem to exists.
+        Sorry, this template does not seem to exist.
       </Alert>
     );
   }
diff --git a/public/app/features/alerting/unified/components/receivers/PayloadEditor.test.tsx b/public/app/features/alerting/unified/components/receivers/PayloadEditor.test.tsx
index bb7a52fb4fd42..cd8137f239120 100644
--- a/public/app/features/alerting/unified/components/receivers/PayloadEditor.test.tsx
+++ b/public/app/features/alerting/unified/components/receivers/PayloadEditor.test.tsx
@@ -2,7 +2,7 @@ import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { default as React, useState } from 'react';
 import { Provider } from 'react-redux';
-import { AutoSizerProps } from 'react-virtualized-auto-sizer';
+import { Props } from 'react-virtualized-auto-sizer';
 
 import { configureStore } from 'app/store/configureStore';
 
@@ -30,7 +30,13 @@ jest.mock('@grafana/ui', () => ({
 }));
 
 jest.mock('react-virtualized-auto-sizer', () => {
-  return ({ children }: AutoSizerProps) => children({ height: 1, width: 1 });
+  return ({ children }: Props) =>
+    children({
+      height: 1,
+      scaledHeight: 1,
+      scaledWidth: 1,
+      width: 1,
+    });
 });
 
 const PayloadEditorWithState = () => {
diff --git a/public/app/features/alerting/unified/components/receivers/ReceiversAndTemplatesView.tsx b/public/app/features/alerting/unified/components/receivers/ReceiversAndTemplatesView.tsx
deleted file mode 100644
index a4de80591013e..0000000000000
--- a/public/app/features/alerting/unified/components/receivers/ReceiversAndTemplatesView.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import React from 'react';
-
-import { Stack } from '@grafana/experimental';
-import { Alert, LinkButton } from '@grafana/ui';
-import { AlertManagerCortexConfig } from 'app/plugins/datasource/alertmanager/types';
-
-import { AlertmanagerAction, useAlertmanagerAbility } from '../../hooks/useAbilities';
-import { GRAFANA_RULES_SOURCE_NAME, isVanillaPrometheusAlertManagerDataSource } from '../../utils/datasource';
-import { makeAMLink } from '../../utils/misc';
-import { Authorize } from '../Authorize';
-
-import { ReceiversSection } from './ReceiversSection';
-import { ReceiversTable } from './ReceiversTable';
-import { TemplatesTable } from './TemplatesTable';
-
-interface Props {
-  config: AlertManagerCortexConfig;
-  alertManagerName: string;
-}
-
-export const ReceiversAndTemplatesView = ({ config, alertManagerName }: Props) => {
-  const isGrafanaManagedAlertmanager = alertManagerName === GRAFANA_RULES_SOURCE_NAME;
-  const isVanillaAM = isVanillaPrometheusAlertManagerDataSource(alertManagerName);
-
-  return (
-    <Stack direction="column" gap={4}>
-      <ReceiversTable config={config} alertManagerName={alertManagerName} />
-      {/* Vanilla flavored Alertmanager does not support editing message templates via the UI */}
-      {!isVanillaAM && <TemplatesView config={config} alertManagerName={alertManagerName} />}
-      {/* Grafana manager Alertmanager does not support global config, Mimir and Cortex do */}
-      {!isGrafanaManagedAlertmanager && <GlobalConfigAlert alertManagerName={alertManagerName} />}
-    </Stack>
-  );
-};
-
-export const TemplatesView = ({ config, alertManagerName }: Props) => {
-  const [createNotificationTemplateSupported, createNotificationTemplateAllowed] = useAlertmanagerAbility(
-    AlertmanagerAction.CreateNotificationTemplate
-  );
-
-  return (
-    <ReceiversSection
-      title="Notification templates"
-      description="Create notification templates to customize your notifications."
-      addButtonLabel="Add template"
-      addButtonTo={makeAMLink('/alerting/notifications/templates/new', alertManagerName)}
-      showButton={createNotificationTemplateSupported && createNotificationTemplateAllowed}
-    >
-      <TemplatesTable config={config} alertManagerName={alertManagerName} />
-    </ReceiversSection>
-  );
-};
-
-interface GlobalConfigAlertProps {
-  alertManagerName: string;
-}
-
-export const GlobalConfigAlert = ({ alertManagerName }: GlobalConfigAlertProps) => {
-  const isVanillaAM = isVanillaPrometheusAlertManagerDataSource(alertManagerName);
-
-  return (
-    <Authorize actions={[AlertmanagerAction.UpdateExternalConfiguration]}>
-      <Alert severity="info" title="Global config for contact points">
-        <p>
-          For each external Alertmanager you can define global settings, like server addresses, usernames and password,
-          for all the supported contact points.
-        </p>
-        <LinkButton href={makeAMLink('alerting/notifications/global-config', alertManagerName)} variant="secondary">
-          {isVanillaAM ? 'View global config' : 'Edit global config'}
-        </LinkButton>
-      </Alert>
-    </Authorize>
-  );
-};
diff --git a/public/app/features/alerting/unified/components/receivers/ReceiversSection.tsx b/public/app/features/alerting/unified/components/receivers/ReceiversSection.tsx
index 405caa7ec7745..b083b91808eb9 100644
--- a/public/app/features/alerting/unified/components/receivers/ReceiversSection.tsx
+++ b/public/app/features/alerting/unified/components/receivers/ReceiversSection.tsx
@@ -4,8 +4,7 @@ import { Link } from 'react-router-dom';
 import { useToggle } from 'react-use';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Button, Dropdown, Icon, Menu, MenuItem, useStyles2 } from '@grafana/ui';
+import { Button, Dropdown, Icon, Menu, MenuItem, useStyles2, Stack } from '@grafana/ui';
 
 import { GrafanaReceiversExporter } from '../export/GrafanaReceiversExporter';
 
diff --git a/public/app/features/alerting/unified/components/receivers/ReceiversTable.test.tsx b/public/app/features/alerting/unified/components/receivers/ReceiversTable.test.tsx
deleted file mode 100644
index fe025f0ed3633..0000000000000
--- a/public/app/features/alerting/unified/components/receivers/ReceiversTable.test.tsx
+++ /dev/null
@@ -1,258 +0,0 @@
-import { render, screen, waitFor, within } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import React from 'react';
-import { AutoSizerProps } from 'react-virtualized-auto-sizer';
-import { TestProvider } from 'test/helpers/TestProvider';
-import { byRole, byTestId } from 'testing-library-selector';
-
-import { setBackendSrv } from '@grafana/runtime';
-import {
-  AlertManagerCortexConfig,
-  GrafanaManagedReceiverConfig,
-  Receiver,
-} from 'app/plugins/datasource/alertmanager/types';
-import { configureStore } from 'app/store/configureStore';
-import { AccessControlAction, ContactPointsState, NotifierDTO, NotifierType } from 'app/types';
-
-import { backendSrv } from '../../../../../core/services/backend_srv';
-import * as receiversApi from '../../api/receiversApi';
-import { mockProvisioningApi, setupMswServer } from '../../mockApi';
-import { grantUserPermissions } from '../../mocks';
-import { AlertmanagerProvider } from '../../state/AlertmanagerContext';
-import { fetchGrafanaNotifiersAction } from '../../state/actions';
-import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
-
-import { ReceiversTable } from './ReceiversTable';
-import * as receiversMeta from './grafanaAppReceivers/useReceiversMetadata';
-import { ReceiverPluginMetadata } from './grafanaAppReceivers/useReceiversMetadata';
-
-jest.mock('react-virtualized-auto-sizer', () => {
-  return ({ children }: AutoSizerProps) => children({ height: 600, width: 1 });
-});
-jest.mock('@grafana/ui', () => ({
-  ...jest.requireActual('@grafana/ui'),
-  CodeEditor: ({ value }: { value: string }) => <textarea data-testid="code-editor" value={value} readOnly />,
-}));
-
-const renderReceieversTable = async (
-  receivers: Receiver[],
-  notifiers: NotifierDTO[],
-  alertmanagerName = 'alertmanager-1'
-) => {
-  const config: AlertManagerCortexConfig = {
-    template_files: {},
-    alertmanager_config: {
-      receivers,
-    },
-  };
-
-  const store = configureStore();
-  await store.dispatch(fetchGrafanaNotifiersAction.fulfilled(notifiers, 'initial'));
-
-  return render(
-    <TestProvider store={store}>
-      <AlertmanagerProvider accessType={'notification'}>
-        <ReceiversTable config={config} alertManagerName={alertmanagerName} />
-      </AlertmanagerProvider>
-    </TestProvider>
-  );
-};
-
-const mockGrafanaReceiver = (type: string): GrafanaManagedReceiverConfig => ({
-  type,
-  disableResolveMessage: false,
-  secureFields: {},
-  settings: {},
-  name: type,
-});
-
-const mockNotifier = (type: NotifierType, name: string): NotifierDTO => ({
-  type,
-  name,
-  description: 'its a mock',
-  heading: 'foo',
-  options: [],
-});
-
-const useReceiversMetadata = jest.spyOn(receiversMeta, 'useReceiversMetadata');
-const useGetContactPointsStateMock = jest.spyOn(receiversApi, 'useGetContactPointsState');
-
-setBackendSrv(backendSrv);
-
-const server = setupMswServer();
-
-afterEach(() => {
-  server.resetHandlers();
-});
-
-const ui = {
-  export: {
-    dialog: byRole('dialog', { name: 'Drawer title Export' }),
-    jsonTab: byRole('tab', { name: /JSON/ }),
-    yamlTab: byRole('tab', { name: /YAML/ }),
-    editor: byTestId('code-editor'),
-    copyCodeButton: byRole('button', { name: 'Copy code' }),
-    downloadButton: byRole('button', { name: 'Download' }),
-  },
-};
-
-describe('ReceiversTable', () => {
-  beforeEach(() => {
-    jest.resetAllMocks();
-    const emptyContactPointsState: ContactPointsState = { receivers: {}, errorCount: 0 };
-    useGetContactPointsStateMock.mockReturnValue(emptyContactPointsState);
-    useReceiversMetadata.mockReturnValue(new Map<Receiver, ReceiverPluginMetadata>());
-  });
-
-  it('render receivers with grafana notifiers', async () => {
-    const receivers: Receiver[] = [
-      {
-        name: 'with receivers',
-        grafana_managed_receiver_configs: [mockGrafanaReceiver('googlechat'), mockGrafanaReceiver('sensugo')],
-      },
-      {
-        name: 'without receivers',
-        grafana_managed_receiver_configs: [],
-      },
-    ];
-
-    const notifiers: NotifierDTO[] = [mockNotifier('googlechat', 'Google Chat'), mockNotifier('sensugo', 'Sensu Go')];
-
-    await renderReceieversTable(receivers, notifiers);
-
-    const rows = within(screen.getByTestId('dynamic-table')).getAllByTestId('row');
-    expect(rows).toHaveLength(2);
-    expect(rows[0]).toHaveTextContent('with receivers');
-    expect(rows[0].querySelector('[data-column="Type"]')).toHaveTextContent('Google Chat, Sensu Go');
-    expect(rows[1]).toHaveTextContent('without receivers');
-    expect(rows[1].querySelector('[data-column="Type"]')).toHaveTextContent('');
-  });
-
-  it('render receivers with alertmanager notifers', async () => {
-    const receivers: Receiver[] = [
-      {
-        name: 'with receivers',
-        email_configs: [
-          {
-            to: 'domas.lapinskas@grafana.com',
-          },
-        ],
-        slack_configs: [],
-        webhook_configs: [
-          {
-            url: 'http://example.com',
-          },
-        ],
-        opsgenie_configs: [
-          {
-            foo: 'bar',
-          },
-        ],
-        foo_configs: [
-          {
-            url: 'bar',
-          },
-        ],
-      },
-      {
-        name: 'without receivers',
-      },
-    ];
-
-    await renderReceieversTable(receivers, []);
-
-    const rows = within(screen.getByTestId('dynamic-table')).getAllByTestId('row');
-    expect(rows).toHaveLength(2);
-    expect(rows[0]).toHaveTextContent('with receivers');
-    expect(rows[0].querySelector('[data-column="Type"]')).toHaveTextContent('Email, Webhook, OpsGenie, Foo');
-    expect(rows[1]).toHaveTextContent('without receivers');
-    expect(rows[1].querySelector('[data-column="Type"]')).toHaveTextContent('');
-  });
-
-  describe('RBAC Enabled', () => {
-    describe('Export button', () => {
-      const receivers: Receiver[] = [
-        {
-          name: 'with receivers',
-          grafana_managed_receiver_configs: [mockGrafanaReceiver('googlechat'), mockGrafanaReceiver('sensugo')],
-        },
-        {
-          name: 'no receivers',
-        },
-      ];
-
-      const notifiers: NotifierDTO[] = [mockNotifier('googlechat', 'Google Chat'), mockNotifier('sensugo', 'Sensu Go')];
-
-      it('should be visible when user has permissions to read provisioning', async () => {
-        grantUserPermissions([AccessControlAction.AlertingProvisioningRead]);
-
-        await renderReceieversTable(receivers, notifiers, GRAFANA_RULES_SOURCE_NAME);
-
-        const buttons = within(screen.getByTestId('dynamic-table')).getAllByTestId('export');
-        expect(buttons).toHaveLength(2);
-      });
-      it('should be visible when user has permissions to read provisioning with secrets', async () => {
-        grantUserPermissions([AccessControlAction.AlertingProvisioningReadSecrets]);
-
-        await renderReceieversTable(receivers, notifiers, GRAFANA_RULES_SOURCE_NAME);
-
-        const buttons = within(screen.getByTestId('dynamic-table')).getAllByTestId('export');
-        expect(buttons).toHaveLength(2);
-      });
-      it('should not be visible when user has no provisioning permissions', async () => {
-        grantUserPermissions([AccessControlAction.AlertingNotificationsRead]);
-
-        await renderReceieversTable(receivers, [], GRAFANA_RULES_SOURCE_NAME);
-
-        const buttons = within(screen.getByTestId('dynamic-table')).queryAllByTestId('export');
-        expect(buttons).toHaveLength(0);
-      });
-    });
-  });
-
-  describe('Exporter functionality', () => {
-    it('Should allow exporting receiver', async () => {
-      // Arrange
-      mockProvisioningApi(server).exportReceiver({
-        yaml: 'Yaml Export Content',
-        json: 'Json Export Content',
-      });
-
-      const user = userEvent.setup();
-
-      const receivers: Receiver[] = [
-        {
-          name: 'with receivers',
-          grafana_managed_receiver_configs: [mockGrafanaReceiver('googlechat'), mockGrafanaReceiver('sensugo')],
-        },
-        {
-          name: 'no receivers',
-        },
-      ];
-
-      const notifiers: NotifierDTO[] = [mockNotifier('googlechat', 'Google Chat'), mockNotifier('sensugo', 'Sensu Go')];
-
-      grantUserPermissions([AccessControlAction.AlertingProvisioningRead]);
-
-      // Act
-      await renderReceieversTable(receivers, notifiers, GRAFANA_RULES_SOURCE_NAME);
-
-      const buttons = within(screen.getByTestId('dynamic-table')).getAllByTestId('export');
-      // click first export button
-      await user.click(buttons[0]);
-      const drawer = await ui.export.dialog.find();
-
-      // Assert
-      expect(ui.export.yamlTab.get(drawer)).toHaveAttribute('aria-selected', 'true');
-      await waitFor(() => {
-        expect(ui.export.editor.get(drawer)).toHaveTextContent('Yaml Export Content');
-      });
-      await user.click(ui.export.jsonTab.get(drawer));
-      await waitFor(() => {
-        expect(ui.export.editor.get(drawer)).toHaveTextContent('Json Export Content');
-      });
-      expect(ui.export.copyCodeButton.get(drawer)).toBeInTheDocument();
-      expect(ui.export.downloadButton.get(drawer)).toBeInTheDocument();
-    });
-  });
-});
diff --git a/public/app/features/alerting/unified/components/receivers/ReceiversTable.tsx b/public/app/features/alerting/unified/components/receivers/ReceiversTable.tsx
deleted file mode 100644
index cebab895040a1..0000000000000
--- a/public/app/features/alerting/unified/components/receivers/ReceiversTable.tsx
+++ /dev/null
@@ -1,523 +0,0 @@
-import pluralize from 'pluralize';
-import React, { useMemo, useState } from 'react';
-import { useToggle } from 'react-use';
-
-import { dateTime, dateTimeFormat } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Badge, Button, ConfirmModal, Icon, Modal, useStyles2 } from '@grafana/ui';
-import { AlertManagerCortexConfig } from 'app/plugins/datasource/alertmanager/types';
-import { ContactPointsState, NotifiersState, ReceiversState, useDispatch } from 'app/types';
-
-import { useGetContactPointsState } from '../../api/receiversApi';
-import { Authorize } from '../../components/Authorize';
-import { AlertmanagerAction, useAlertmanagerAbility } from '../../hooks/useAbilities';
-import { useUnifiedAlertingSelector } from '../../hooks/useUnifiedAlertingSelector';
-import { deleteReceiverAction } from '../../state/actions';
-import { getAlertTableStyles } from '../../styles/table';
-import { SupportedPlugin } from '../../types/pluginBridges';
-import { isReceiverUsed } from '../../utils/alertmanager';
-import { GRAFANA_RULES_SOURCE_NAME, isVanillaPrometheusAlertManagerDataSource } from '../../utils/datasource';
-import { makeAMLink } from '../../utils/misc';
-import { extractNotifierTypeCounts } from '../../utils/receivers';
-import { DynamicTable, DynamicTableColumnProps, DynamicTableItemProps } from '../DynamicTable';
-import { ProvisioningBadge } from '../Provisioning';
-import { GrafanaReceiverExporter } from '../export/GrafanaReceiverExporter';
-import { ActionIcon } from '../rules/ActionIcon';
-
-import { ReceiversSection } from './ReceiversSection';
-import { ReceiverMetadataBadge } from './grafanaAppReceivers/ReceiverMetadataBadge';
-import { ReceiverPluginMetadata, useReceiversMetadata } from './grafanaAppReceivers/useReceiversMetadata';
-import { AlertmanagerConfigHealth, useAlertmanagerConfigHealth } from './useAlertmanagerConfigHealth';
-
-interface UpdateActionProps extends ActionProps {
-  onClickDeleteReceiver: (receiverName: string) => void;
-}
-
-function UpdateActions({ alertManagerName, receiverName, onClickDeleteReceiver }: UpdateActionProps) {
-  return (
-    <>
-      <Authorize actions={[AlertmanagerAction.UpdateContactPoint]}>
-        <ActionIcon
-          aria-label="Edit"
-          data-testid="edit"
-          to={makeAMLink(
-            `/alerting/notifications/receivers/${encodeURIComponent(receiverName)}/edit`,
-            alertManagerName
-          )}
-          tooltip="Edit contact point"
-          icon="pen"
-        />
-      </Authorize>
-      <Authorize actions={[AlertmanagerAction.DeleteContactPoint]}>
-        <ActionIcon
-          onClick={() => onClickDeleteReceiver(receiverName)}
-          tooltip="Delete contact point"
-          icon="trash-alt"
-        />
-      </Authorize>
-    </>
-  );
-}
-
-interface ActionProps {
-  alertManagerName: string;
-  receiverName: string;
-  canReadSecrets?: boolean;
-}
-
-function ViewAction({ alertManagerName, receiverName }: ActionProps) {
-  return (
-    <Authorize actions={[AlertmanagerAction.UpdateContactPoint]}>
-      <ActionIcon
-        data-testid="view"
-        to={makeAMLink(`/alerting/notifications/receivers/${encodeURIComponent(receiverName)}/edit`, alertManagerName)}
-        tooltip="View contact point"
-        icon="file-alt"
-      />
-    </Authorize>
-  );
-}
-
-function ExportAction({ receiverName, canReadSecrets = false }: ActionProps) {
-  const [showExportDrawer, toggleShowExportDrawer] = useToggle(false);
-
-  return (
-    <Authorize actions={[AlertmanagerAction.ExportContactPoint]}>
-      <ActionIcon
-        data-testid="export"
-        tooltip={
-          canReadSecrets ? 'Export contact point with decrypted secrets' : 'Export contact point with redacted secrets'
-        }
-        icon="download-alt"
-        onClick={toggleShowExportDrawer}
-      />
-      {showExportDrawer && (
-        <GrafanaReceiverExporter
-          receiverName={receiverName}
-          decrypt={canReadSecrets}
-          onClose={toggleShowExportDrawer}
-        />
-      )}
-    </Authorize>
-  );
-}
-
-interface ReceiverErrorProps {
-  errorCount: number;
-  errorDetail?: string;
-  showErrorCount: boolean;
-  tooltip?: string;
-}
-
-function ReceiverError({ errorCount, errorDetail, showErrorCount, tooltip }: ReceiverErrorProps) {
-  const text = showErrorCount ? `${errorCount} ${pluralize('error', errorCount)}` : 'Error';
-  const tooltipToRender = tooltip ?? errorDetail ?? 'Error';
-
-  return <Badge color="red" icon="exclamation-circle" text={text} tooltip={tooltipToRender} />;
-}
-
-interface NotifierHealthProps {
-  errorsByNotifier: number;
-  errorDetail?: string;
-  lastNotify: string;
-}
-
-function NotifierHealth({ errorsByNotifier, errorDetail, lastNotify }: NotifierHealthProps) {
-  const hasErrors = errorsByNotifier > 0;
-  const noAttempts = isLastNotifyNullDate(lastNotify);
-
-  if (hasErrors) {
-    return <ReceiverError errorCount={errorsByNotifier} errorDetail={errorDetail} showErrorCount={false} />;
-  }
-
-  if (noAttempts) {
-    return <>No attempts</>;
-  }
-
-  return <Badge color="green" text="OK" />;
-}
-
-interface ReceiverHealthProps {
-  errorsByReceiver: number;
-  someWithNoAttempt: boolean;
-}
-
-function ReceiverHealth({ errorsByReceiver, someWithNoAttempt }: ReceiverHealthProps) {
-  const hasErrors = errorsByReceiver > 0;
-
-  if (hasErrors) {
-    return (
-      <ReceiverError
-        errorCount={errorsByReceiver}
-        showErrorCount={true}
-        tooltip="Expand the contact point to see error details."
-      />
-    );
-  }
-
-  if (someWithNoAttempt) {
-    return <>No attempts</>;
-  }
-
-  return <Badge color="green" text="OK" />;
-}
-
-const useContactPointsState = (alertManagerName: string) => {
-  const contactPointsState = useGetContactPointsState(alertManagerName);
-  const receivers: ReceiversState = contactPointsState?.receivers ?? {};
-  const errorStateAvailable = Object.keys(receivers).length > 0;
-  return { contactPointsState, errorStateAvailable };
-};
-
-interface ReceiverItem {
-  name: string;
-  types: string[];
-  provisioned?: boolean;
-  grafanaAppReceiverType?: SupportedPlugin;
-  metadata?: ReceiverPluginMetadata;
-}
-
-interface NotifierStatus {
-  lastError?: null | string;
-  lastNotify: string;
-  lastNotifyDuration: string;
-  type: string;
-  sendResolved?: boolean;
-}
-
-type RowTableColumnProps = DynamicTableColumnProps<ReceiverItem>;
-type RowItemTableProps = DynamicTableItemProps<ReceiverItem>;
-
-type NotifierTableColumnProps = DynamicTableColumnProps<NotifierStatus>;
-type NotifierItemTableProps = DynamicTableItemProps<NotifierStatus>;
-
-interface NotifiersTableProps {
-  notifiersState: NotifiersState;
-}
-
-const isLastNotifyNullDate = (lastNotify: string) => lastNotify === '0001-01-01T00:00:00.000Z';
-
-function LastNotify({ lastNotifyDate }: { lastNotifyDate: string }) {
-  if (isLastNotifyNullDate(lastNotifyDate)) {
-    return <>{'-'}</>;
-  } else {
-    return (
-      <Stack alignItems="center">
-        <div>{`${dateTime(lastNotifyDate).locale('en').fromNow(true)} ago`}</div>
-        <Icon name="clock-nine" />
-        <div>{`${dateTimeFormat(lastNotifyDate, { format: 'YYYY-MM-DD HH:mm:ss' })}`}</div>
-      </Stack>
-    );
-  }
-}
-
-const possibleNullDurations = ['', '0', '0ms', '0s', '0m', '0h', '0d', '0w', '0y'];
-const durationIsNull = (duration: string) => possibleNullDurations.includes(duration);
-
-function NotifiersTable({ notifiersState }: NotifiersTableProps) {
-  function getNotifierColumns(): NotifierTableColumnProps[] {
-    return [
-      {
-        id: 'health',
-        label: 'Health',
-        renderCell: ({ data: { lastError, lastNotify } }) => {
-          return (
-            <NotifierHealth
-              errorsByNotifier={lastError ? 1 : 0}
-              errorDetail={lastError ?? undefined}
-              lastNotify={lastNotify}
-            />
-          );
-        },
-        size: 0.5,
-      },
-      {
-        id: 'name',
-        label: 'Name',
-        renderCell: ({ data: { type }, id }) => <>{`${type}[${id}]`}</>,
-        size: 1,
-      },
-      {
-        id: 'lastNotify',
-        label: 'Last delivery attempt',
-        renderCell: ({ data: { lastNotify } }) => <LastNotify lastNotifyDate={lastNotify} />,
-        size: 3,
-      },
-      {
-        id: 'lastNotifyDuration',
-        label: 'Last duration',
-        renderCell: ({ data: { lastNotify, lastNotifyDuration } }) => (
-          <>{isLastNotifyNullDate(lastNotify) && durationIsNull(lastNotifyDuration) ? '-' : lastNotifyDuration}</>
-        ),
-        size: 1,
-      },
-      {
-        id: 'sendResolved',
-        label: 'Send resolved',
-        renderCell: ({ data: { sendResolved } }) => <>{String(Boolean(sendResolved))}</>,
-        size: 1,
-      },
-    ];
-  }
-
-  const notifierRows: NotifierItemTableProps[] = Object.entries(notifiersState).flatMap((typeState) =>
-    typeState[1].map((notifierStatus, index) => {
-      return {
-        id: index,
-        data: {
-          type: typeState[0],
-          lastError: notifierStatus.lastNotifyAttemptError,
-          lastNotify: notifierStatus.lastNotifyAttempt,
-          lastNotifyDuration: notifierStatus.lastNotifyAttemptDuration,
-          sendResolved: notifierStatus.sendResolved,
-        },
-      };
-    })
-  );
-
-  return <DynamicTable items={notifierRows} cols={getNotifierColumns()} pagination={{ itemsPerPage: 25 }} />;
-}
-
-interface Props {
-  config: AlertManagerCortexConfig;
-  alertManagerName: string;
-}
-
-export const ReceiversTable = ({ config, alertManagerName }: Props) => {
-  const dispatch = useDispatch();
-  const isVanillaAM = isVanillaPrometheusAlertManagerDataSource(alertManagerName);
-  const grafanaNotifiers = useUnifiedAlertingSelector((state) => state.grafanaNotifiers);
-
-  const configHealth = useAlertmanagerConfigHealth(config.alertmanager_config);
-  const { contactPointsState, errorStateAvailable } = useContactPointsState(alertManagerName);
-  const receiversMetadata = useReceiversMetadata(config.alertmanager_config.receivers ?? []);
-
-  // receiver name slated for deletion. If this is set, a confirmation modal is shown. If user approves, this receiver is deleted
-  const [receiverToDelete, setReceiverToDelete] = useState<string>();
-  const [showCannotDeleteReceiverModal, setShowCannotDeleteReceiverModal] = useState(false);
-
-  const [supportsExport, allowedToExport] = useAlertmanagerAbility(AlertmanagerAction.ExportContactPoint);
-  const showExport = supportsExport && allowedToExport;
-
-  const onClickDeleteReceiver = (receiverName: string): void => {
-    if (isReceiverUsed(receiverName, config)) {
-      setShowCannotDeleteReceiverModal(true);
-    } else {
-      setReceiverToDelete(receiverName);
-    }
-  };
-
-  const deleteReceiver = () => {
-    if (receiverToDelete) {
-      dispatch(deleteReceiverAction(receiverToDelete, alertManagerName));
-    }
-    setReceiverToDelete(undefined);
-  };
-
-  const rows: RowItemTableProps[] = useMemo(() => {
-    const receivers = config.alertmanager_config.receivers ?? [];
-
-    return (
-      receivers.map((receiver) => ({
-        id: receiver.name,
-        data: {
-          name: receiver.name,
-          types: Object.entries(extractNotifierTypeCounts(receiver, grafanaNotifiers.result ?? [])).map(
-            ([type, count]) => {
-              if (count > 1) {
-                return `${type} (${count})`;
-              }
-              return type;
-            }
-          ),
-          provisioned: receiver.grafana_managed_receiver_configs?.some((receiver) => receiver.provenance),
-          metadata: receiversMetadata.get(receiver),
-        },
-      })) ?? []
-    );
-  }, [grafanaNotifiers.result, config.alertmanager_config, receiversMetadata]);
-
-  const [createSupported, createAllowed] = useAlertmanagerAbility(AlertmanagerAction.CreateContactPoint);
-
-  const [_, canReadSecrets] = useAlertmanagerAbility(AlertmanagerAction.DecryptSecrets);
-
-  const columns = useGetColumns(
-    alertManagerName,
-    errorStateAvailable,
-    contactPointsState,
-    configHealth,
-    onClickDeleteReceiver,
-    isVanillaAM,
-    canReadSecrets
-  );
-
-  return (
-    <ReceiversSection
-      canReadSecrets={canReadSecrets}
-      title="Contact points"
-      description="Define where notifications are sent, for example, email or Slack."
-      showButton={createSupported && createAllowed}
-      addButtonLabel={'Add contact point'}
-      addButtonTo={makeAMLink('/alerting/notifications/receivers/new', alertManagerName)}
-      showExport={showExport}
-    >
-      <DynamicTable
-        pagination={{ itemsPerPage: 25 }}
-        items={rows}
-        cols={columns}
-        isExpandable={errorStateAvailable}
-        renderExpandedContent={
-          errorStateAvailable
-            ? ({ data: { name } }) => (
-                <NotifiersTable notifiersState={contactPointsState?.receivers[name]?.notifiers ?? {}} />
-              )
-            : undefined
-        }
-      />
-      {!!showCannotDeleteReceiverModal && (
-        <Modal
-          isOpen={true}
-          title="Cannot delete contact point"
-          onDismiss={() => setShowCannotDeleteReceiverModal(false)}
-        >
-          <p>
-            Contact point cannot be deleted because it is used in more policies. Please update or delete these policies
-            first.
-          </p>
-          <Modal.ButtonRow>
-            <Button variant="secondary" onClick={() => setShowCannotDeleteReceiverModal(false)} fill="outline">
-              Close
-            </Button>
-          </Modal.ButtonRow>
-        </Modal>
-      )}
-      {!!receiverToDelete && (
-        <ConfirmModal
-          isOpen={true}
-          title="Delete contact point"
-          body={`Are you sure you want to delete contact point "${receiverToDelete}"?`}
-          confirmText="Yes, delete"
-          onConfirm={deleteReceiver}
-          onDismiss={() => setReceiverToDelete(undefined)}
-        />
-      )}
-    </ReceiversSection>
-  );
-};
-const errorsByReceiver = (contactPointsState: ContactPointsState, receiverName: string) =>
-  contactPointsState?.receivers[receiverName]?.errorCount ?? 0;
-
-const someNotifiersWithNoAttempt = (contactPointsState: ContactPointsState, receiverName: string) => {
-  const notifiers = Object.values(contactPointsState?.receivers[receiverName]?.notifiers ?? {});
-
-  if (notifiers.length === 0) {
-    return false;
-  }
-
-  const hasSomeWitNoAttempt = notifiers.flat().some((status) => isLastNotifyNullDate(status.lastNotifyAttempt));
-  return hasSomeWitNoAttempt;
-};
-
-function useGetColumns(
-  alertManagerName: string,
-  errorStateAvailable: boolean,
-  contactPointsState: ContactPointsState | undefined,
-  configHealth: AlertmanagerConfigHealth,
-  onClickDeleteReceiver: (receiverName: string) => void,
-  isVanillaAM: boolean,
-  canReadSecrets: boolean
-): RowTableColumnProps[] {
-  const tableStyles = useStyles2(getAlertTableStyles);
-
-  const enableHealthColumn =
-    errorStateAvailable || Object.values(configHealth.contactPoints).some((cp) => cp.matchingRoutes === 0);
-
-  const isGrafanaAlertManager = alertManagerName === GRAFANA_RULES_SOURCE_NAME;
-
-  const baseColumns: RowTableColumnProps[] = [
-    {
-      id: 'name',
-      label: 'Contact point name',
-      renderCell: ({ data: { name, provisioned } }) => (
-        <>
-          <div>{name}</div>
-          {provisioned && <ProvisioningBadge />}
-        </>
-      ),
-      size: 3,
-      className: tableStyles.nameCell,
-    },
-    {
-      id: 'type',
-      label: 'Type',
-      renderCell: ({ data: { types, metadata } }) => (
-        <>{metadata ? <ReceiverMetadataBadge metadata={metadata} /> : types.join(', ')}</>
-      ),
-      size: 2,
-    },
-  ];
-  const healthColumn: RowTableColumnProps = {
-    id: 'health',
-    label: 'Health',
-    renderCell: ({ data: { name } }) => {
-      if (configHealth.contactPoints[name]?.matchingRoutes === 0) {
-        return <UnusedContactPointBadge />;
-      }
-
-      return (
-        contactPointsState &&
-        Object.entries(contactPointsState.receivers).length > 0 && (
-          <ReceiverHealth
-            errorsByReceiver={errorsByReceiver(contactPointsState, name)}
-            someWithNoAttempt={someNotifiersWithNoAttempt(contactPointsState, name)}
-          />
-        )
-      );
-    },
-    size: '160px',
-  };
-
-  return [
-    ...baseColumns,
-    ...(enableHealthColumn ? [healthColumn] : []),
-    {
-      id: 'actions',
-      label: 'Actions',
-      renderCell: ({ data: { provisioned, name } }) => (
-        <Authorize
-          actions={[
-            AlertmanagerAction.UpdateContactPoint,
-            AlertmanagerAction.DeleteContactPoint,
-            AlertmanagerAction.ExportContactPoint,
-          ]}
-        >
-          <div className={tableStyles.actionsCell}>
-            {!isVanillaAM && !provisioned && (
-              <UpdateActions
-                alertManagerName={alertManagerName}
-                receiverName={name}
-                onClickDeleteReceiver={onClickDeleteReceiver}
-              />
-            )}
-            {(isVanillaAM || provisioned) && <ViewAction alertManagerName={alertManagerName} receiverName={name} />}
-            {isGrafanaAlertManager && (
-              <ExportAction alertManagerName={alertManagerName} receiverName={name} canReadSecrets={canReadSecrets} />
-            )}
-          </div>
-        </Authorize>
-      ),
-      size: '100px',
-    },
-  ];
-}
-
-export function UnusedContactPointBadge() {
-  return (
-    <Badge
-      text="Unused"
-      color="orange"
-      icon="exclamation-triangle"
-      tooltip="This contact point is not used in any notification policy and it will not receive any alerts"
-    />
-  );
-}
diff --git a/public/app/features/alerting/unified/components/receivers/TemplateDataDocs.tsx b/public/app/features/alerting/unified/components/receivers/TemplateDataDocs.tsx
index 3e1dbe0e85d5c..bbf5b49dbc2e3 100644
--- a/public/app/features/alerting/unified/components/receivers/TemplateDataDocs.tsx
+++ b/public/app/features/alerting/unified/components/receivers/TemplateDataDocs.tsx
@@ -2,8 +2,7 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { useStyles2 } from '@grafana/ui';
+import { useStyles2, Stack } from '@grafana/ui';
 
 import { HoverCard } from '../HoverCard';
 
@@ -30,7 +29,7 @@ export function TemplateDataDocs() {
   );
 
   return (
-    <Stack gap={2} flexGrow={1}>
+    <Stack gap={2}>
       <TemplateDataTable
         caption={<h4 className={styles.header}>Template Data</h4>}
         dataItems={GlobalTemplateData}
diff --git a/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx b/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx
index 2fa2eb4f66c40..6ed886fc8536c 100644
--- a/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx
+++ b/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx
@@ -7,7 +7,6 @@ import { useLocation } from 'react-router-dom';
 import AutoSizer from 'react-virtualized-auto-sizer';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
 import { isFetchError } from '@grafana/runtime';
 import {
   Alert,
@@ -21,6 +20,7 @@ import {
   Tab,
   TabsBar,
   useStyles2,
+  Stack,
 } from '@grafana/ui';
 import { useCleanup } from 'app/core/hooks/useCleanup';
 import { AlertManagerCortexConfig } from 'app/plugins/datasource/alertmanager/types';
@@ -147,7 +147,7 @@ export const TemplateForm = ({ existing, alertManagerSourceName, config, provena
     watch,
   } = formApi;
 
-  const validateNameIsUnique: Validate<string> = (name: string) => {
+  const validateNameIsUnique: Validate<string, TemplateFormValues> = (name: string) => {
     return !config.template_files[name] || existing?.name === name
       ? true
       : 'Another template with this name already exists.';
@@ -280,7 +280,7 @@ function TemplatingGuideline() {
       </Stack>
 
       <div className={styles.snippets}>
-        To make templating easier, we provide a few snippets in the content editor to help you speed up your workflow.
+        For auto-completion of common templating code, type the following keywords in the content editor:
         <div className={styles.code}>
           {Object.values(snippets)
             .map((s) => s.label)
diff --git a/public/app/features/alerting/unified/components/receivers/form/ChannelOptions.tsx b/public/app/features/alerting/unified/components/receivers/form/ChannelOptions.tsx
index c0a2ef50d7933..57f58f132713d 100644
--- a/public/app/features/alerting/unified/components/receivers/form/ChannelOptions.tsx
+++ b/public/app/features/alerting/unified/components/receivers/form/ChannelOptions.tsx
@@ -42,7 +42,7 @@ export function ChannelOptions<R extends ChannelValues>({
         // pathPrefix = items.index.
         const paths = pathPrefix.split('.');
         const selectedOptionValue =
-          paths.length >= 2 ? currentFormValues.items[Number(paths[1])].settings[option.showWhen.field] : undefined;
+          paths.length >= 2 ? currentFormValues.items?.[Number(paths[1])].settings?.[option.showWhen.field] : undefined;
 
         if (option.showWhen.field && selectedOptionValue !== option.showWhen.is) {
           return null;
diff --git a/public/app/features/alerting/unified/components/receivers/form/ChannelSubForm.tsx b/public/app/features/alerting/unified/components/receivers/form/ChannelSubForm.tsx
index 8fd3f9056a16a..9ea1c7a05de4f 100644
--- a/public/app/features/alerting/unified/components/receivers/form/ChannelSubForm.tsx
+++ b/public/app/features/alerting/unified/components/receivers/form/ChannelSubForm.tsx
@@ -1,10 +1,10 @@
 import { css } from '@emotion/css';
 import { sortBy } from 'lodash';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { useFormContext, FieldErrors, FieldValues } from 'react-hook-form';
+import { useFormContext, FieldErrors, FieldValues, Controller } from 'react-hook-form';
 
 import { GrafanaTheme2, SelectableValue } from '@grafana/data';
-import { Alert, Button, Field, InputControl, Select, useStyles2 } from '@grafana/ui';
+import { Alert, Button, Field, Select, useStyles2 } from '@grafana/ui';
 
 import { useUnifiedAlertingSelector } from '../../../hooks/useUnifiedAlertingSelector';
 import { ChannelValues, CommonSettingsComponentType } from '../../../types/receiver-form';
@@ -69,7 +69,8 @@ export function ChannelSubForm<R extends ChannelValues>({
   // Prevent forgetting about initial values when switching the integration type and the oncall integration type
   useEffect(() => {
     // Restore values when switching back from a changed integration to the default one
-    const subscription = watch((_, { name, type, value }) => {
+    const subscription = watch((v, { name, type }) => {
+      const value = name ? v[name] : '';
       if (initialValues && name === fieldName('type') && value === initialValues.type && type === 'change') {
         setValue(fieldName('settings'), initialValues.settings);
       }
@@ -133,7 +134,7 @@ export function ChannelSubForm<R extends ChannelValues>({
       <div className={styles.topRow}>
         <div>
           <Field label="Integration" htmlFor={contactPointTypeInputId} data-testid={`${pathPrefix}type`}>
-            <InputControl
+            <Controller
               name={fieldName('type')}
               defaultValue={defaultValues.type}
               render={({ field: { ref, onChange, ...field } }) => (
diff --git a/public/app/features/alerting/unified/components/receivers/form/GenerateAlertDataModal.tsx b/public/app/features/alerting/unified/components/receivers/form/GenerateAlertDataModal.tsx
index 5b2e6d87a355c..4d4879cfb19de 100644
--- a/public/app/features/alerting/unified/components/receivers/form/GenerateAlertDataModal.tsx
+++ b/public/app/features/alerting/unified/components/receivers/form/GenerateAlertDataModal.tsx
@@ -4,8 +4,7 @@ import React, { useState } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Button, Card, Modal, RadioButtonGroup, useStyles2 } from '@grafana/ui';
+import { Button, Card, Modal, RadioButtonGroup, useStyles2, Stack } from '@grafana/ui';
 import { TestTemplateAlert } from 'app/plugins/datasource/alertmanager/types';
 
 import { KeyValueField } from '../../../api/templateApi';
diff --git a/public/app/features/alerting/unified/components/receivers/form/ReceiverForm.tsx b/public/app/features/alerting/unified/components/receivers/form/ReceiverForm.tsx
index 5f0476e945637..a5bc8ccf2879e 100644
--- a/public/app/features/alerting/unified/components/receivers/form/ReceiverForm.tsx
+++ b/public/app/features/alerting/unified/components/receivers/form/ReceiverForm.tsx
@@ -10,7 +10,7 @@ import { useCleanup } from 'app/core/hooks/useCleanup';
 import { AlertManagerCortexConfig } from 'app/plugins/datasource/alertmanager/types';
 
 import { getMessageFromError } from '../../../../../../core/utils/errors';
-import { logAlertingError } from '../../../Analytics';
+import { logError } from '../../../Analytics';
 import { isOnCallFetchError } from '../../../api/onCallApi';
 import { useControlledFieldArray } from '../../../hooks/useControlledFieldArray';
 import { ChannelValues, CommonSettingsComponentType, ReceiverFormValues } from '../../../types/receiver-form';
@@ -83,7 +83,7 @@ export function ReceiverForm<R extends ChannelValues>({
 
   const { fields, append, remove } = useControlledFieldArray<R>({ name: 'items', formAPI, softDelete: true });
 
-  const validateNameIsAvailable: Validate<string> = useCallback(
+  const validateNameIsAvailable: Validate<string, ReceiverFormValues<R>> = useCallback(
     (name: string) =>
       takenReceiverNames.map((name) => name.trim().toLowerCase()).includes(name.trim().toLowerCase())
         ? 'Another receiver with this name already exists.'
@@ -103,7 +103,7 @@ export function ReceiverForm<R extends ChannelValues>({
 
         const error = new Error('Failed to save the contact point');
         error.cause = e;
-        logAlertingError(error);
+        logError(error);
       }
       throw e;
     }
@@ -177,7 +177,7 @@ export function ReceiverForm<R extends ChannelValues>({
               type="button"
               icon="plus"
               variant="secondary"
-              onClick={() => append({ ...defaultItem, __id: String(Math.random()) } as R)}
+              onClick={() => append({ ...defaultItem, __id: String(Math.random()) })}
             >
               Add contact point integration
             </Button>
diff --git a/public/app/features/alerting/unified/components/receivers/form/fields/OptionField.tsx b/public/app/features/alerting/unified/components/receivers/form/fields/OptionField.tsx
index 7083b0024aead..fe7c202cea796 100644
--- a/public/app/features/alerting/unified/components/receivers/form/fields/OptionField.tsx
+++ b/public/app/features/alerting/unified/components/receivers/form/fields/OptionField.tsx
@@ -1,10 +1,10 @@
 import { css } from '@emotion/css';
 import { isEmpty } from 'lodash';
 import React, { FC, useEffect } from 'react';
-import { useFormContext, FieldError, DeepMap } from 'react-hook-form';
+import { useFormContext, FieldError, DeepMap, Controller } from 'react-hook-form';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Checkbox, Field, Input, InputControl, RadioButtonList, Select, TextArea, useStyles2 } from '@grafana/ui';
+import { Checkbox, Field, Input, RadioButtonList, Select, TextArea, useStyles2 } from '@grafana/ui';
 import { NotificationChannelOption } from 'app/types';
 
 import { KeyValueMapInput } from './KeyValueMapInput';
@@ -41,7 +41,7 @@ export const OptionField: FC<Props> = ({
         readOnly={readOnly}
         defaultValue={defaultValue}
         option={option}
-        errors={error as DeepMap<any, FieldError> | undefined}
+        errors={error}
         pathPrefix={optionPath}
       />
     );
@@ -122,7 +122,8 @@ const OptionInput: FC<Props & { id: string; pathIndex?: string }> = ({
           {...register(name, {
             required: determineRequired(option, getValues, pathIndex),
             validate: {
-              validationRule: (v) => (option.validationRule ? validateOption(v, option.validationRule) : true),
+              validationRule: (v) =>
+                option.validationRule ? validateOption(v, option.validationRule, option.required) : true,
               customValidator: (v) => (customValidator ? customValidator(v) : true),
             },
             setValueAs: option.setValueAs,
@@ -133,7 +134,7 @@ const OptionInput: FC<Props & { id: string; pathIndex?: string }> = ({
 
     case 'select':
       return (
-        <InputControl
+        <Controller
           render={({ field: { onChange, ref, ...field } }) => (
             <Select
               disabled={readOnly}
@@ -157,7 +158,7 @@ const OptionInput: FC<Props & { id: string; pathIndex?: string }> = ({
       return (
         <>
           <legend className={styles.legend}>{option.label}</legend>
-          <InputControl
+          <Controller
             render={({ field: { ref, ...field } }) => (
               <RadioButtonList disabled={readOnly} options={option.selectOptions ?? []} {...field} />
             )}
@@ -167,7 +168,8 @@ const OptionInput: FC<Props & { id: string; pathIndex?: string }> = ({
             rules={{
               required: option.required ? 'Option is required' : false,
               validate: {
-                validationRule: (v) => (option.validationRule ? validateOption(v, option.validationRule) : true),
+                validationRule: (v) =>
+                  option.validationRule ? validateOption(v, option.validationRule, option.required) : true,
                 customValidator: (v) => (customValidator ? customValidator(v) : true),
               },
             }}
@@ -183,13 +185,14 @@ const OptionInput: FC<Props & { id: string; pathIndex?: string }> = ({
           placeholder={option.placeholder}
           {...register(name, {
             required: option.required ? 'Required' : false,
-            validate: (v) => (option.validationRule !== '' ? validateOption(v, option.validationRule) : true),
+            validate: (v) =>
+              option.validationRule !== '' ? validateOption(v, option.validationRule, option.required) : true,
           })}
         />
       );
     case 'string_array':
       return (
-        <InputControl
+        <Controller
           render={({ field: { value, onChange } }) => (
             <StringArrayInput readOnly={readOnly} value={value} onChange={onChange} />
           )}
@@ -199,7 +202,7 @@ const OptionInput: FC<Props & { id: string; pathIndex?: string }> = ({
       );
     case 'key_value_map':
       return (
-        <InputControl
+        <Controller
           render={({ field: { value, onChange } }) => (
             <KeyValueMapInput readOnly={readOnly} value={value} onChange={onChange} />
           )}
@@ -223,7 +226,11 @@ const getStyles = (theme: GrafanaTheme2) => ({
   `,
 });
 
-const validateOption = (value: string, validationRule: string) => {
+const validateOption = (value: string, validationRule: string, required: boolean) => {
+  if (value === '' && !required) {
+    return true;
+  }
+
   return RegExp(validationRule).test(value) ? true : 'Invalid format';
 };
 
diff --git a/public/app/features/alerting/unified/components/receivers/grafanaAppReceivers/ReceiverMetadataBadge.tsx b/public/app/features/alerting/unified/components/receivers/grafanaAppReceivers/ReceiverMetadataBadge.tsx
index fe4fbd2c1b440..41101cf21c16a 100644
--- a/public/app/features/alerting/unified/components/receivers/grafanaAppReceivers/ReceiverMetadataBadge.tsx
+++ b/public/app/features/alerting/unified/components/receivers/grafanaAppReceivers/ReceiverMetadataBadge.tsx
@@ -2,8 +2,7 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Icon, LinkButton, Tooltip, useStyles2 } from '@grafana/ui';
+import { Icon, LinkButton, Tooltip, useStyles2, Stack } from '@grafana/ui';
 
 import { ReceiverPluginMetadata } from './useReceiversMetadata';
 
diff --git a/public/app/features/alerting/unified/components/receivers/grafanaAppReceivers/grafanaApp.ts b/public/app/features/alerting/unified/components/receivers/grafanaAppReceivers/grafanaApp.ts
index d0687b83226ef..eb9ec72c25188 100644
--- a/public/app/features/alerting/unified/components/receivers/grafanaAppReceivers/grafanaApp.ts
+++ b/public/app/features/alerting/unified/components/receivers/grafanaAppReceivers/grafanaApp.ts
@@ -5,7 +5,7 @@ import { usePluginBridge } from '../../../hooks/usePluginBridge';
 import { SupportedPlugin } from '../../../types/pluginBridges';
 
 import { isOnCallReceiver } from './onCall/onCall';
-import { AmRouteReceiver, ReceiverWithTypes } from './types';
+import { AmRouteReceiver } from './types';
 
 export const useGetGrafanaReceiverTypeChecker = () => {
   const { installed: isOnCallEnabled } = usePluginBridge(SupportedPlugin.OnCall);
@@ -38,13 +38,3 @@ export const useGetAmRouteReceiverWithGrafanaAppTypes = (receivers: Receiver[])
 
   return receivers.map(receiverToSelectableContactPointValue);
 };
-
-export const useGetReceiversWithGrafanaAppTypes = (receivers: Receiver[]): ReceiverWithTypes[] => {
-  const getGrafanaReceiverType = useGetGrafanaReceiverTypeChecker();
-  return receivers.map((receiver: Receiver) => {
-    return {
-      ...receiver,
-      grafanaAppReceiverType: getGrafanaReceiverType(receiver),
-    };
-  });
-};
diff --git a/public/app/features/alerting/unified/components/receivers/grafanaAppReceivers/types.ts b/public/app/features/alerting/unified/components/receivers/grafanaAppReceivers/types.ts
index 099a73b8fc837..5da2361827195 100644
--- a/public/app/features/alerting/unified/components/receivers/grafanaAppReceivers/types.ts
+++ b/public/app/features/alerting/unified/components/receivers/grafanaAppReceivers/types.ts
@@ -1,4 +1,3 @@
-import { GrafanaManagedContactPoint } from '../../../../../../plugins/datasource/alertmanager/types';
 import { SupportedPlugin } from '../../../types/pluginBridges';
 
 export interface AmRouteReceiver {
@@ -7,9 +6,6 @@ export interface AmRouteReceiver {
   grafanaAppReceiverType?: SupportedPlugin;
 }
 
-export interface ReceiverWithTypes extends GrafanaManagedContactPoint {
-  grafanaAppReceiverType?: SupportedPlugin;
-}
 export const GRAFANA_APP_RECEIVERS_SOURCE_IMAGE: Record<SupportedPlugin, string> = {
   [SupportedPlugin.OnCall]: 'public/img/alerting/oncall_logo.svg',
 
diff --git a/public/app/features/alerting/unified/components/receivers/grafanaAppReceivers/useReceiversMetadata.ts b/public/app/features/alerting/unified/components/receivers/grafanaAppReceivers/useReceiversMetadata.ts
index 8f00947029ed2..ba3f923ea1ac1 100644
--- a/public/app/features/alerting/unified/components/receivers/grafanaAppReceivers/useReceiversMetadata.ts
+++ b/public/app/features/alerting/unified/components/receivers/grafanaAppReceivers/useReceiversMetadata.ts
@@ -1,12 +1,8 @@
-import { useMemo } from 'react';
-
-import { GrafanaManagedReceiverConfig, Receiver } from '../../../../../../plugins/datasource/alertmanager/types';
-import { onCallApi, OnCallIntegrationDTO } from '../../../api/onCallApi';
-import { usePluginBridge } from '../../../hooks/usePluginBridge';
+import { GrafanaManagedReceiverConfig } from '../../../../../../plugins/datasource/alertmanager/types';
+import { OnCallIntegrationDTO } from '../../../api/onCallApi';
 import { SupportedPlugin } from '../../../types/pluginBridges';
 import { createBridgeURL } from '../../PluginBridge';
 
-import { ReceiverTypes } from './onCall/onCall';
 import { GRAFANA_APP_RECEIVERS_SOURCE_IMAGE } from './types';
 
 export interface ReceiverPluginMetadata {
@@ -25,36 +21,15 @@ const onCallReceiverMeta: ReceiverPluginMetadata = {
   icon: onCallReceiverICon,
 };
 
-export const useReceiversMetadata = (receivers: Receiver[]): Map<Receiver, ReceiverPluginMetadata> => {
-  const { installed: isOnCallEnabled } = usePluginBridge(SupportedPlugin.OnCall);
-  const { data: onCallIntegrations = [] } = onCallApi.useGrafanaOnCallIntegrationsQuery(undefined, {
-    skip: !isOnCallEnabled,
-  });
-
-  return useMemo(() => {
-    const result = new Map<Receiver, ReceiverPluginMetadata>();
-
-    receivers.forEach((receiver) => {
-      const onCallReceiver = receiver.grafana_managed_receiver_configs?.find((c) => c.type === ReceiverTypes.OnCall);
-
-      if (onCallReceiver) {
-        if (!isOnCallEnabled) {
-          result.set(receiver, getOnCallMetadata(null, onCallReceiver));
-          return;
-        }
-
-        result.set(receiver, getOnCallMetadata(onCallIntegrations, onCallReceiver));
-      }
-    });
-
-    return result;
-  }, [isOnCallEnabled, receivers, onCallIntegrations]);
-};
-
 export function getOnCallMetadata(
-  onCallIntegrations: OnCallIntegrationDTO[] | null,
+  onCallIntegrations: OnCallIntegrationDTO[] | undefined | null,
   receiver: GrafanaManagedReceiverConfig
 ): ReceiverPluginMetadata {
+  // oncall status is still loading
+  if (onCallIntegrations === undefined) {
+    return onCallReceiverMeta;
+  }
+
   // indication that onCall is not enabled
   if (onCallIntegrations == null) {
     return {
@@ -64,7 +39,7 @@ export function getOnCallMetadata(
   }
 
   const matchingOnCallIntegration = onCallIntegrations.find(
-    (integration) => integration.integration_url === receiver.settings.url
+    (integration) => integration.integration_url === receiver.settings?.url
   );
 
   return {
diff --git a/public/app/features/alerting/unified/components/receivers/useAlertmanagerConfigHealth.ts b/public/app/features/alerting/unified/components/receivers/useAlertmanagerConfigHealth.ts
deleted file mode 100644
index 65c84e61f5ca7..0000000000000
--- a/public/app/features/alerting/unified/components/receivers/useAlertmanagerConfigHealth.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { countBy } from 'lodash';
-
-import { AlertmanagerConfig } from '../../../../../plugins/datasource/alertmanager/types';
-import { getUsedContactPoints } from '../contact-points/utils';
-
-export interface ContactPointConfigHealth {
-  matchingRoutes: number;
-}
-
-export interface AlertmanagerConfigHealth {
-  contactPoints: Record<string, ContactPointConfigHealth>;
-}
-
-export function useAlertmanagerConfigHealth(config: AlertmanagerConfig): AlertmanagerConfigHealth {
-  if (!config.receivers) {
-    return { contactPoints: {} };
-  }
-
-  if (!config.route) {
-    return { contactPoints: Object.fromEntries(config.receivers.map((r) => [r.name, { matchingRoutes: 0 }])) };
-  }
-
-  const definedContactPointNames = config.receivers?.map((receiver) => receiver.name) ?? [];
-  const usedContactPoints = getUsedContactPoints(config.route);
-  const usedContactPointCounts = countBy(usedContactPoints);
-
-  const contactPointsHealth: AlertmanagerConfigHealth['contactPoints'] = {};
-  const configHealth: AlertmanagerConfigHealth = { contactPoints: contactPointsHealth };
-
-  definedContactPointNames.forEach((contactPointName) => {
-    contactPointsHealth[contactPointName] = { matchingRoutes: usedContactPointCounts[contactPointName] ?? 0 };
-  });
-
-  return configHealth;
-}
diff --git a/public/app/features/alerting/unified/components/rule-editor/AlertRuleNameInput.tsx b/public/app/features/alerting/unified/components/rule-editor/AlertRuleNameInput.tsx
index 5849565febbaa..f96d308e08eaa 100644
--- a/public/app/features/alerting/unified/components/rule-editor/AlertRuleNameInput.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/AlertRuleNameInput.tsx
@@ -18,7 +18,7 @@ export const AlertRuleNameInput = () => {
     register,
     watch,
     formState: { errors },
-  } = useFormContext<RuleFormValues & { location?: string }>();
+  } = useFormContext<RuleFormValues>();
 
   const ruleFormType = watch('type');
   const entityName = ruleFormType === RuleFormType.cloudRecording ? 'recording rule' : 'alert rule';
diff --git a/public/app/features/alerting/unified/components/rule-editor/AnnotationHeaderField.tsx b/public/app/features/alerting/unified/components/rule-editor/AnnotationHeaderField.tsx
index 4c996df2261ae..a939d86c98448 100644
--- a/public/app/features/alerting/unified/components/rule-editor/AnnotationHeaderField.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/AnnotationHeaderField.tsx
@@ -1,8 +1,7 @@
 import React from 'react';
-import { FieldArrayWithId, useFormContext } from 'react-hook-form';
+import { FieldArrayWithId, useFormContext, Controller } from 'react-hook-form';
 
-import { Stack } from '@grafana/experimental';
-import { InputControl, Text } from '@grafana/ui';
+import { Text, Stack } from '@grafana/ui';
 
 import { RuleFormValues } from '../../types/rule-form';
 import { Annotation, annotationDescriptions, annotationLabels } from '../../utils/constants';
@@ -26,7 +25,7 @@ const AnnotationHeaderField = ({
     <Stack direction="column" gap={0}>
       <label>
         {
-          <InputControl
+          <Controller
             name={`annotations.${index}.key`}
             defaultValue={annotationField.key}
             render={({ field: { ref, ...field } }) => {
@@ -39,8 +38,10 @@ const AnnotationHeaderField = ({
               switch (annotationField.key) {
                 case Annotation.dashboardUID:
                   label = 'Dashboard and panel';
+                  break;
                 case Annotation.panelID:
                   label = '';
+                  break;
                 default:
                   label = annotationLabels[annotation] && annotationLabels[annotation] + ' (optional)';
               }
diff --git a/public/app/features/alerting/unified/components/rule-editor/AnnotationsField.test.tsx b/public/app/features/alerting/unified/components/rule-editor/AnnotationsField.test.tsx
deleted file mode 100644
index c9b25fe59b5a9..0000000000000
--- a/public/app/features/alerting/unified/components/rule-editor/AnnotationsField.test.tsx
+++ /dev/null
@@ -1,363 +0,0 @@
-import { findByRole, findByText, findByTitle, getByTestId, queryByText, render } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { rest } from 'msw';
-import { setupServer } from 'msw/node';
-import React from 'react';
-import { FormProvider, useForm } from 'react-hook-form';
-import { TestProvider } from 'test/helpers/TestProvider';
-import { byRole, byTestId } from 'testing-library-selector';
-
-import { setBackendSrv } from '@grafana/runtime';
-import { defaultDashboard } from '@grafana/schema';
-import { backendSrv } from 'app/core/services/backend_srv';
-
-import { DashboardDTO } from '../../../../../types';
-import { DashboardSearchItem, DashboardSearchItemType } from '../../../../search/types';
-import { mockStore } from '../../mocks';
-import { mockSearchApiResponse } from '../../mocks/grafanaApi';
-import { RuleFormValues } from '../../types/rule-form';
-import { Annotation } from '../../utils/constants';
-import { getDefaultFormValues } from '../../utils/rule-form';
-
-import 'whatwg-fetch';
-
-import AnnotationsStep from './AnnotationsStep';
-
-// To get anything displayed inside the Autosize component we need to mock it
-// Ref https://github.com/bvaughn/react-window/issues/454#issuecomment-646031139
-jest.mock(
-  'react-virtualized-auto-sizer',
-  () =>
-    ({ children }: { children: ({ height, width }: { height: number; width: number }) => JSX.Element }) =>
-      children({ height: 500, width: 330 })
-);
-
-const ui = {
-  setDashboardButton: byRole('button', { name: 'Link dashboard and panel' }),
-  annotationKeys: byTestId('annotation-key-', { exact: false }),
-  annotationValues: byTestId('annotation-value-', { exact: false }),
-  dashboardPicker: {
-    dialog: byRole('dialog'),
-    heading: byRole('heading', { name: 'Select dashboard and panel' }),
-    confirmButton: byRole('button', { name: 'Confirm' }),
-  },
-} as const;
-
-const server = setupServer();
-
-beforeAll(() => {
-  setBackendSrv(backendSrv);
-  server.listen({ onUnhandledRequest: 'error' });
-});
-
-beforeEach(() => {
-  server.resetHandlers();
-});
-
-afterAll(() => {
-  server.close();
-});
-
-function FormWrapper({ formValues }: { formValues?: Partial<RuleFormValues> }) {
-  const store = mockStore(() => null);
-  const formApi = useForm<RuleFormValues>({ defaultValues: { ...getDefaultFormValues(), ...formValues } });
-
-  return (
-    <TestProvider store={store}>
-      <FormProvider {...formApi}>
-        <AnnotationsStep />
-      </FormProvider>
-    </TestProvider>
-  );
-}
-
-describe('AnnotationsField', function () {
-  it('should display default list of annotations', function () {
-    render(<FormWrapper />);
-
-    const annotationElements = ui.annotationKeys.getAll();
-
-    expect(annotationElements).toHaveLength(3);
-    expect(annotationElements[0]).toHaveTextContent('Summary');
-    expect(annotationElements[1]).toHaveTextContent('Description');
-    expect(annotationElements[2]).toHaveTextContent('Runbook URL');
-  });
-
-  describe('Dashboard and panel picker', function () {
-    it('should display dashboard and panel selector when select button clicked', async function () {
-      mockSearchApiResponse(server, []);
-
-      const user = userEvent.setup();
-
-      render(<FormWrapper />);
-
-      await user.click(ui.setDashboardButton.get());
-
-      expect(ui.dashboardPicker.dialog.get()).toBeInTheDocument();
-      expect(ui.dashboardPicker.heading.get()).toBeInTheDocument();
-    });
-
-    it('should enable Confirm button only when dashboard and panel selected', async function () {
-      mockSearchApiResponse(server, [
-        mockDashboardSearchItem({ title: 'My dashboard', uid: 'dash-test-uid', type: DashboardSearchItemType.DashDB }),
-      ]);
-
-      mockGetDashboardResponse(
-        mockDashboardDto({
-          title: 'My dashboard',
-          uid: 'dash-test-uid',
-          panels: [
-            { id: 1, title: 'First panel', type: 'timeseries' },
-            { id: 2, title: 'Second panel', type: 'timeseries' },
-          ],
-        })
-      );
-
-      const user = userEvent.setup();
-
-      render(<FormWrapper />);
-
-      await user.click(ui.setDashboardButton.get());
-      expect(ui.dashboardPicker.confirmButton.get()).toBeDisabled();
-
-      await user.click(await findByTitle(ui.dashboardPicker.dialog.get(), 'My dashboard'));
-      expect(ui.dashboardPicker.confirmButton.get()).toBeDisabled();
-
-      await user.click(await findByText(ui.dashboardPicker.dialog.get(), 'First panel'));
-      expect(ui.dashboardPicker.confirmButton.get()).toBeEnabled();
-    });
-
-    it('should add selected dashboard and panel as annotations', async function () {
-      mockSearchApiResponse(server, [
-        mockDashboardSearchItem({ title: 'My dashboard', uid: 'dash-test-uid', type: DashboardSearchItemType.DashDB }),
-      ]);
-
-      mockGetDashboardResponse(
-        mockDashboardDto({
-          title: 'My dashboard',
-          uid: 'dash-test-uid',
-          panels: [
-            { id: 1, title: 'First panel', type: 'graph' },
-            { id: 2, title: 'Second panel', type: 'graph' },
-          ],
-        })
-      );
-
-      const user = userEvent.setup();
-
-      render(<FormWrapper formValues={{ annotations: [] }} />);
-
-      await user.click(ui.setDashboardButton.get());
-      await user.click(await findByTitle(ui.dashboardPicker.dialog.get(), 'My dashboard'));
-
-      await user.click(await findByText(ui.dashboardPicker.dialog.get(), 'Second panel'));
-
-      await user.click(ui.dashboardPicker.confirmButton.get());
-
-      const annotationValueElements = ui.annotationValues.getAll();
-
-      expect(ui.dashboardPicker.dialog.query()).not.toBeInTheDocument();
-
-      expect(annotationValueElements).toHaveLength(2);
-      expect(annotationValueElements[0]).toHaveTextContent('dash-test-uid');
-      expect(annotationValueElements[1]).toHaveTextContent('2');
-    });
-
-    it('should not show rows as panels', async function () {
-      mockSearchApiResponse(server, [
-        mockDashboardSearchItem({ title: 'My dashboard', uid: 'dash-test-uid', type: DashboardSearchItemType.DashDB }),
-      ]);
-
-      mockGetDashboardResponse(
-        mockDashboardDto({
-          title: 'My dashboard',
-          uid: 'dash-test-uid',
-          panels: [
-            { id: 1, title: 'Row panel', type: 'row' },
-            { id: 2, title: 'First panel', type: 'timeseries' },
-          ],
-        })
-      );
-
-      const user = userEvent.setup();
-
-      render(<FormWrapper />);
-
-      await user.click(ui.setDashboardButton.get());
-      expect(ui.dashboardPicker.confirmButton.get()).toBeDisabled();
-
-      await user.click(await findByTitle(ui.dashboardPicker.dialog.get(), 'My dashboard'));
-
-      expect(await findByText(ui.dashboardPicker.dialog.get(), 'First panel')).toBeInTheDocument();
-      expect(await queryByText(ui.dashboardPicker.dialog.get(), 'Row panel')).not.toBeInTheDocument();
-    });
-
-    it('should show panels within collapsed rows', async function () {
-      mockSearchApiResponse(server, [
-        mockDashboardSearchItem({ title: 'My dashboard', uid: 'dash-test-uid', type: DashboardSearchItemType.DashDB }),
-      ]);
-
-      mockGetDashboardResponse(
-        mockDashboardDto({
-          title: 'My dashboard',
-          uid: 'dash-test-uid',
-          panels: [
-            { id: 1, title: 'First panel', type: 'timeseries' },
-            {
-              id: 2,
-              title: 'Row panel',
-              collapsed: true,
-              type: 'row',
-              panels: [{ id: 3, title: 'Panel within collapsed row', type: 'timeseries' }],
-            },
-          ],
-        })
-      );
-
-      const user = userEvent.setup();
-
-      render(<FormWrapper />);
-
-      await user.click(ui.setDashboardButton.get());
-      expect(ui.dashboardPicker.confirmButton.get()).toBeDisabled();
-
-      await user.click(await findByTitle(ui.dashboardPicker.dialog.get(), 'My dashboard'));
-
-      expect(await findByText(ui.dashboardPicker.dialog.get(), 'First panel')).toBeInTheDocument();
-      expect(await queryByText(ui.dashboardPicker.dialog.get(), 'Row panel')).not.toBeInTheDocument();
-      expect(await findByText(ui.dashboardPicker.dialog.get(), 'Panel within collapsed row')).toBeInTheDocument();
-    });
-
-    // this test _should_ work in theory but something is stopping the 'onClick' function on the dashboard item
-    // to trigger "handleDashboardChange" – skipping it for now but has been manually tested.
-    it.skip('should update existing dashboard and panel identifies', async function () {
-      mockSearchApiResponse(server, [
-        mockDashboardSearchItem({ title: 'My dashboard', uid: 'dash-test-uid', type: DashboardSearchItemType.DashDB }),
-        mockDashboardSearchItem({
-          title: 'My other dashboard',
-          uid: 'dash-other-uid',
-          type: DashboardSearchItemType.DashDB,
-        }),
-      ]);
-
-      mockGetDashboardResponse(
-        mockDashboardDto({
-          title: 'My dashboard',
-          uid: 'dash-test-uid',
-          panels: [
-            { id: 1, title: 'First panel', type: 'timeseries' },
-            { id: 2, title: 'Second panel', type: 'timeseries' },
-          ],
-        })
-      );
-      mockGetDashboardResponse(
-        mockDashboardDto({
-          title: 'My other dashboard',
-          uid: 'dash-other-uid',
-          panels: [{ id: 3, title: 'Third panel', type: 'timeseries' }],
-        })
-      );
-
-      const user = userEvent.setup();
-
-      render(
-        <FormWrapper
-          formValues={{
-            annotations: [
-              { key: Annotation.dashboardUID, value: 'dash-test-uid' },
-              { key: Annotation.panelID, value: '1' },
-            ],
-          }}
-        />
-      );
-
-      let annotationValueElements = ui.annotationValues.getAll();
-      expect(annotationValueElements[0]).toHaveTextContent('dash-test-uid');
-      expect(annotationValueElements[1]).toHaveTextContent('1');
-
-      const { confirmButton, dialog } = ui.dashboardPicker;
-
-      await user.click(ui.setDashboardButton.get());
-      await user.click(await findByRole(dialog.get(), 'button', { name: /My other dashboard/ }));
-      await user.click(await findByRole(dialog.get(), 'button', { name: /Third panel/ }));
-      await user.click(confirmButton.get());
-
-      expect(ui.dashboardPicker.dialog.query()).not.toBeInTheDocument();
-
-      const annotationKeyElements = ui.annotationKeys.getAll();
-      annotationValueElements = ui.annotationValues.getAll();
-
-      expect(annotationKeyElements).toHaveLength(2);
-      expect(annotationValueElements).toHaveLength(2);
-
-      expect(annotationKeyElements[0]).toHaveTextContent('Dashboard UID');
-      expect(annotationValueElements[0]).toHaveTextContent('dash-other-uid');
-
-      expect(annotationKeyElements[1]).toHaveTextContent('Panel ID');
-      expect(annotationValueElements[1]).toHaveTextContent('3');
-    });
-  });
-});
-
-it('should render warning icon for panels of type other than graph and timeseries', async function () {
-  mockSearchApiResponse(server, [
-    mockDashboardSearchItem({ title: 'My dashboard', uid: 'dash-test-uid', type: DashboardSearchItemType.DashDB }),
-  ]);
-
-  mockGetDashboardResponse(
-    mockDashboardDto({
-      title: 'My dashboard',
-      uid: 'dash-test-uid',
-      panels: [
-        { id: 1, title: 'First panel', type: 'bar' },
-        { id: 2, title: 'Second panel', type: 'graph' },
-      ],
-    })
-  );
-
-  const user = userEvent.setup();
-
-  render(<FormWrapper formValues={{ annotations: [] }} />);
-
-  const { dialog } = ui.dashboardPicker;
-
-  await user.click(ui.setDashboardButton.get());
-  await user.click(await findByTitle(dialog.get(), 'My dashboard'));
-
-  const warnedPanel = await findByRole(dialog.get(), 'button', { name: /First panel/ });
-
-  expect(getByTestId(warnedPanel, 'warning-icon')).toBeInTheDocument();
-});
-
-function mockGetDashboardResponse(dashboard: DashboardDTO) {
-  server.use(
-    rest.get(`/api/dashboards/uid/${dashboard.dashboard.uid}`, (req, res, ctx) =>
-      res(ctx.json<DashboardDTO>(dashboard))
-    )
-  );
-}
-
-function mockDashboardSearchItem(searchItem: Partial<DashboardSearchItem>) {
-  return {
-    title: '',
-    uid: '',
-    type: DashboardSearchItemType.DashDB,
-    url: '',
-    uri: '',
-    items: [],
-    tags: [],
-    slug: '',
-    isStarred: false,
-    ...searchItem,
-  };
-}
-
-function mockDashboardDto(dashboard: Partial<DashboardDTO['dashboard']>): DashboardDTO {
-  return {
-    dashboard: {
-      ...defaultDashboard,
-      ...dashboard,
-    } as DashboardDTO['dashboard'],
-    meta: {},
-  };
-}
diff --git a/public/app/features/alerting/unified/components/rule-editor/AnnotationsStep.test.tsx b/public/app/features/alerting/unified/components/rule-editor/AnnotationsStep.test.tsx
new file mode 100644
index 0000000000000..0d8e4dcfa728f
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-editor/AnnotationsStep.test.tsx
@@ -0,0 +1,360 @@
+import { findByRole, findByText, findByTitle, getByTestId, queryByText, render } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { setupServer } from 'msw/node';
+import React from 'react';
+import { FormProvider, useForm } from 'react-hook-form';
+import { TestProvider } from 'test/helpers/TestProvider';
+import { byRole, byTestId } from 'testing-library-selector';
+
+import 'core-js/stable/structured-clone';
+import { setBackendSrv } from '@grafana/runtime';
+import { backendSrv } from 'app/core/services/backend_srv';
+
+import { DashboardSearchItemType } from '../../../../search/types';
+import { mockDashboardApi } from '../../mockApi';
+import { mockDashboardDto, mockDashboardSearchItem, mockStore } from '../../mocks';
+import { RuleFormValues } from '../../types/rule-form';
+import { Annotation } from '../../utils/constants';
+import { getDefaultFormValues } from '../../utils/rule-form';
+
+import 'whatwg-fetch';
+
+import AnnotationsStep from './AnnotationsStep';
+
+// To get anything displayed inside the Autosize component we need to mock it
+// Ref https://github.com/bvaughn/react-window/issues/454#issuecomment-646031139
+jest.mock(
+  'react-virtualized-auto-sizer',
+  () =>
+    ({ children }: { children: ({ height, width }: { height: number; width: number }) => JSX.Element }) =>
+      children({ height: 500, width: 330 })
+);
+
+const ui = {
+  setDashboardButton: byRole('button', { name: 'Link dashboard and panel' }),
+  annotationKeys: byTestId('annotation-key-', { exact: false }),
+  annotationValues: byTestId('annotation-value-', { exact: false }),
+  dashboardAnnotation: byTestId('dashboard-annotation'),
+  panelAnnotation: byTestId('panel-annotation'),
+  dashboardPicker: {
+    dialog: byRole('dialog'),
+    heading: byRole('heading', { name: 'Select dashboard and panel' }),
+    confirmButton: byRole('button', { name: 'Confirm' }),
+  },
+} as const;
+
+const server = setupServer();
+
+beforeAll(() => {
+  setBackendSrv(backendSrv);
+  server.listen({ onUnhandledRequest: 'error' });
+});
+
+beforeEach(() => {
+  server.resetHandlers();
+});
+
+afterAll(() => {
+  server.close();
+});
+
+function FormWrapper({ formValues }: { formValues?: Partial<RuleFormValues> }) {
+  const store = mockStore(() => null);
+  const formApi = useForm<RuleFormValues>({ defaultValues: { ...getDefaultFormValues(), ...formValues } });
+
+  return (
+    <TestProvider store={store}>
+      <FormProvider {...formApi}>
+        <AnnotationsStep />
+      </FormProvider>
+    </TestProvider>
+  );
+}
+
+describe('AnnotationsField', function () {
+  it('should display default list of annotations', function () {
+    render(<FormWrapper />);
+
+    const annotationElements = ui.annotationKeys.getAll();
+
+    expect(annotationElements).toHaveLength(3);
+    expect(annotationElements[0]).toHaveTextContent('Summary');
+    expect(annotationElements[1]).toHaveTextContent('Description');
+    expect(annotationElements[2]).toHaveTextContent('Runbook URL');
+  });
+
+  describe('Dashboard and panel picker', function () {
+    it('should display dashboard and panel selector when select button clicked', async function () {
+      mockDashboardApi(server).search([]);
+
+      const user = userEvent.setup();
+
+      render(<FormWrapper />);
+
+      await user.click(ui.setDashboardButton.get());
+
+      expect(ui.dashboardPicker.dialog.get()).toBeInTheDocument();
+      expect(ui.dashboardPicker.heading.get()).toBeInTheDocument();
+    });
+
+    it('should enable Confirm button only when dashboard and panel selected', async function () {
+      mockDashboardApi(server).search([
+        mockDashboardSearchItem({ title: 'My dashboard', uid: 'dash-test-uid', type: DashboardSearchItemType.DashDB }),
+      ]);
+
+      mockDashboardApi(server).dashboard(
+        mockDashboardDto({
+          title: 'My dashboard',
+          uid: 'dash-test-uid',
+          panels: [
+            { id: 1, title: 'First panel', type: 'timeseries' },
+            { id: 2, title: 'Second panel', type: 'timeseries' },
+          ],
+        })
+      );
+
+      const user = userEvent.setup();
+
+      render(<FormWrapper />);
+
+      await user.click(ui.setDashboardButton.get());
+      expect(ui.dashboardPicker.confirmButton.get()).toBeDisabled();
+
+      await user.click(await findByTitle(ui.dashboardPicker.dialog.get(), 'My dashboard'));
+      expect(ui.dashboardPicker.confirmButton.get()).toBeDisabled();
+
+      await user.click(await findByText(ui.dashboardPicker.dialog.get(), 'First panel'));
+      expect(ui.dashboardPicker.confirmButton.get()).toBeEnabled();
+    });
+
+    it('should add selected dashboard and panel as annotations', async function () {
+      mockDashboardApi(server).search([
+        mockDashboardSearchItem({ title: 'My dashboard', uid: 'dash-test-uid', type: DashboardSearchItemType.DashDB }),
+      ]);
+
+      mockDashboardApi(server).dashboard(
+        mockDashboardDto({
+          title: 'My dashboard',
+          uid: 'dash-test-uid',
+          panels: [
+            { id: 1, title: 'First panel', type: 'graph' },
+            { id: 2, title: 'Second panel', type: 'graph' },
+          ],
+        })
+      );
+
+      const user = userEvent.setup();
+
+      render(<FormWrapper formValues={{ annotations: [] }} />);
+
+      await user.click(ui.setDashboardButton.get());
+      await user.click(await findByTitle(ui.dashboardPicker.dialog.get(), 'My dashboard'));
+
+      await user.click(await findByText(ui.dashboardPicker.dialog.get(), 'Second panel'));
+
+      await user.click(ui.dashboardPicker.confirmButton.get());
+
+      const annotationValueElements = ui.annotationValues.getAll();
+
+      expect(ui.dashboardPicker.dialog.query()).not.toBeInTheDocument();
+
+      expect(annotationValueElements).toHaveLength(2);
+      expect(annotationValueElements[0]).toHaveTextContent('dash-test-uid');
+      expect(annotationValueElements[1]).toHaveTextContent('2');
+    });
+
+    it('should not show rows as panels', async function () {
+      mockDashboardApi(server).search([
+        mockDashboardSearchItem({ title: 'My dashboard', uid: 'dash-test-uid', type: DashboardSearchItemType.DashDB }),
+      ]);
+
+      mockDashboardApi(server).dashboard(
+        mockDashboardDto({
+          title: 'My dashboard',
+          uid: 'dash-test-uid',
+          panels: [
+            { id: 1, title: 'Row panel', type: 'row' },
+            { id: 2, title: 'First panel', type: 'timeseries' },
+          ],
+        })
+      );
+
+      const user = userEvent.setup();
+
+      render(<FormWrapper />);
+
+      await user.click(ui.setDashboardButton.get());
+      expect(ui.dashboardPicker.confirmButton.get()).toBeDisabled();
+
+      await user.click(await findByTitle(ui.dashboardPicker.dialog.get(), 'My dashboard'));
+
+      expect(await findByText(ui.dashboardPicker.dialog.get(), 'First panel')).toBeInTheDocument();
+      expect(await queryByText(ui.dashboardPicker.dialog.get(), 'Row panel')).not.toBeInTheDocument();
+    });
+
+    it('should show panels within collapsed rows', async function () {
+      mockDashboardApi(server).search([
+        mockDashboardSearchItem({ title: 'My dashboard', uid: 'dash-test-uid', type: DashboardSearchItemType.DashDB }),
+      ]);
+
+      mockDashboardApi(server).dashboard(
+        mockDashboardDto({
+          title: 'My dashboard',
+          uid: 'dash-test-uid',
+          panels: [
+            { id: 1, title: 'First panel', type: 'timeseries' },
+            {
+              id: 2,
+              title: 'Row panel',
+              collapsed: true,
+              type: 'row',
+              panels: [{ id: 3, title: 'Panel within collapsed row', type: 'timeseries' }],
+            },
+          ],
+        })
+      );
+
+      const user = userEvent.setup();
+
+      render(<FormWrapper />);
+
+      await user.click(ui.setDashboardButton.get());
+      expect(ui.dashboardPicker.confirmButton.get()).toBeDisabled();
+
+      await user.click(await findByTitle(ui.dashboardPicker.dialog.get(), 'My dashboard'));
+
+      expect(await findByText(ui.dashboardPicker.dialog.get(), 'First panel')).toBeInTheDocument();
+      expect(await queryByText(ui.dashboardPicker.dialog.get(), 'Row panel')).not.toBeInTheDocument();
+      expect(await findByText(ui.dashboardPicker.dialog.get(), 'Panel within collapsed row')).toBeInTheDocument();
+    });
+
+    // this test _should_ work in theory but something is stopping the 'onClick' function on the dashboard item
+    // to trigger "handleDashboardChange" – skipping it for now but has been manually tested.
+    it.skip('should update existing dashboard and panel identifies', async function () {
+      mockDashboardApi(server).search([
+        mockDashboardSearchItem({ title: 'My dashboard', uid: 'dash-test-uid', type: DashboardSearchItemType.DashDB }),
+        mockDashboardSearchItem({
+          title: 'My other dashboard',
+          uid: 'dash-other-uid',
+          type: DashboardSearchItemType.DashDB,
+        }),
+      ]);
+
+      mockDashboardApi(server).dashboard(
+        mockDashboardDto({
+          title: 'My dashboard',
+          uid: 'dash-test-uid',
+          panels: [
+            { id: 1, title: 'First panel', type: 'timeseries' },
+            { id: 2, title: 'Second panel', type: 'timeseries' },
+          ],
+        })
+      );
+      mockDashboardApi(server).dashboard(
+        mockDashboardDto({
+          title: 'My other dashboard',
+          uid: 'dash-other-uid',
+          panels: [{ id: 3, title: 'Third panel', type: 'timeseries' }],
+        })
+      );
+
+      const user = userEvent.setup();
+
+      render(
+        <FormWrapper
+          formValues={{
+            annotations: [
+              { key: Annotation.dashboardUID, value: 'dash-test-uid' },
+              { key: Annotation.panelID, value: '1' },
+            ],
+          }}
+        />
+      );
+
+      let annotationValueElements = ui.annotationValues.getAll();
+      expect(annotationValueElements[0]).toHaveTextContent('dash-test-uid');
+      expect(annotationValueElements[1]).toHaveTextContent('1');
+
+      const { confirmButton, dialog } = ui.dashboardPicker;
+
+      await user.click(ui.setDashboardButton.get());
+      await user.click(await findByRole(dialog.get(), 'button', { name: /My other dashboard/ }));
+      await user.click(await findByRole(dialog.get(), 'button', { name: /Third panel/ }));
+      await user.click(confirmButton.get());
+
+      expect(ui.dashboardPicker.dialog.query()).not.toBeInTheDocument();
+
+      const annotationKeyElements = ui.annotationKeys.getAll();
+      annotationValueElements = ui.annotationValues.getAll();
+
+      expect(annotationKeyElements).toHaveLength(2);
+      expect(annotationValueElements).toHaveLength(2);
+
+      expect(annotationKeyElements[0]).toHaveTextContent('Dashboard UID');
+      expect(annotationValueElements[0]).toHaveTextContent('dash-other-uid');
+
+      expect(annotationKeyElements[1]).toHaveTextContent('Panel ID');
+      expect(annotationValueElements[1]).toHaveTextContent('3');
+    });
+  });
+
+  it('should render warning icon for panels of type other than graph and timeseries', async function () {
+    mockDashboardApi(server).search([
+      mockDashboardSearchItem({ title: 'My dashboard', uid: 'dash-test-uid', type: DashboardSearchItemType.DashDB }),
+    ]);
+
+    mockDashboardApi(server).dashboard(
+      mockDashboardDto({
+        title: 'My dashboard',
+        uid: 'dash-test-uid',
+        panels: [
+          { id: 1, title: 'First panel', type: 'bar' },
+          { id: 2, title: 'Second panel', type: 'graph' },
+          { type: 'timeseries' }, // Panels might NOT have id and title fields
+        ],
+      })
+    );
+
+    const user = userEvent.setup();
+
+    render(<FormWrapper formValues={{ annotations: [] }} />);
+
+    const { dialog } = ui.dashboardPicker;
+
+    await user.click(ui.setDashboardButton.get());
+    await user.click(await findByTitle(dialog.get(), 'My dashboard'));
+
+    const warnedPanel = await findByRole(dialog.get(), 'button', { name: /First panel/ });
+
+    expect(getByTestId(warnedPanel, 'warning-icon')).toBeInTheDocument();
+  });
+
+  it('should render when panels do not contain certain fields', async () => {
+    mockDashboardApi(server).search([
+      mockDashboardSearchItem({ title: 'My dashboard', uid: 'dash-test-uid', type: DashboardSearchItemType.DashDB }),
+    ]);
+
+    mockDashboardApi(server).dashboard(
+      mockDashboardDto({
+        title: 'My dashboard',
+        uid: 'dash-test-uid',
+        panels: [{ type: 'row' }, { type: 'timeseries' }, { id: 4, type: 'graph' }, { title: 'Graph', type: 'graph' }],
+      })
+    );
+
+    render(
+      <FormWrapper
+        formValues={{
+          annotations: [
+            { key: Annotation.dashboardUID, value: 'dash-test-uid' },
+            { key: Annotation.panelID, value: '1' },
+          ],
+        }}
+      />
+    );
+
+    expect(await ui.dashboardAnnotation.find()).toBeInTheDocument();
+    expect(ui.dashboardAnnotation.get()).toHaveTextContent('My dashboard');
+    expect(ui.panelAnnotation.query()).not.toBeInTheDocument();
+  });
+});
diff --git a/public/app/features/alerting/unified/components/rule-editor/AnnotationsStep.tsx b/public/app/features/alerting/unified/components/rule-editor/AnnotationsStep.tsx
index 7617ff84438ae..588d42394c75d 100644
--- a/public/app/features/alerting/unified/components/rule-editor/AnnotationsStep.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/AnnotationsStep.tsx
@@ -5,19 +5,18 @@ import { useFieldArray, useFormContext } from 'react-hook-form';
 import { useToggle } from 'react-use';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Button, Field, Input, Text, TextArea, useStyles2 } from '@grafana/ui';
-import { DashboardDataDTO } from 'app/types';
+import { Button, Field, Input, Text, TextArea, useStyles2, Stack } from '@grafana/ui';
 
-import { dashboardApi } from '../../api/dashboardApi';
+import { DashboardModel } from '../../../../dashboard/state';
 import { RuleFormValues } from '../../types/rule-form';
 import { Annotation, annotationLabels } from '../../utils/constants';
 
 import AnnotationHeaderField from './AnnotationHeaderField';
 import DashboardAnnotationField from './DashboardAnnotationField';
-import { DashboardPicker, mergePanels, PanelDTO } from './DashboardPicker';
+import { DashboardPicker, getVisualPanels, PanelDTO } from './DashboardPicker';
 import { NeedHelpInfo } from './NeedHelpInfo';
 import { RuleEditorSection } from './RuleEditorSection';
+import { useDashboardQuery } from './useDashboardQuery';
 
 const AnnotationsStep = () => {
   const styles = useStyles2(getStyles);
@@ -35,31 +34,26 @@ const AnnotationsStep = () => {
   const { fields, append, remove } = useFieldArray({ control, name: 'annotations' });
 
   const selectedDashboardUid = annotations.find((annotation) => annotation.key === Annotation.dashboardUID)?.value;
-  const selectedPanelId = annotations.find((annotation) => annotation.key === Annotation.panelID)?.value;
+  const selectedPanelId = Number(annotations.find((annotation) => annotation.key === Annotation.panelID)?.value);
 
-  const [selectedDashboard, setSelectedDashboard] = useState<DashboardDataDTO | undefined>(undefined);
+  const [selectedDashboard, setSelectedDashboard] = useState<DashboardModel | undefined>(undefined);
   const [selectedPanel, setSelectedPanel] = useState<PanelDTO | undefined>(undefined);
 
-  const { useDashboardQuery } = dashboardApi;
-
-  const { currentData: dashboardResult, isFetching: isDashboardFetching } = useDashboardQuery(
-    { uid: selectedDashboardUid ?? '' },
-    { skip: !selectedDashboardUid }
-  );
+  const { dashboardModel, isFetching: isDashboardFetching } = useDashboardQuery(selectedDashboardUid);
 
   useEffect(() => {
-    if (isDashboardFetching) {
+    if (isDashboardFetching || !dashboardModel) {
       return;
     }
 
-    setSelectedDashboard(dashboardResult?.dashboard);
+    setSelectedDashboard(dashboardModel);
 
-    const allPanels = mergePanels(dashboardResult);
-    const currentPanel = allPanels.find((panel) => panel.id.toString() === selectedPanelId);
+    const allPanels = getVisualPanels(dashboardModel);
+    const currentPanel = allPanels.find((panel) => panel.id === selectedPanelId);
     setSelectedPanel(currentPanel);
-  }, [selectedPanelId, dashboardResult, isDashboardFetching]);
+  }, [selectedPanelId, dashboardModel, isDashboardFetching]);
 
-  const setSelectedDashboardAndPanelId = (dashboardUid: string, panelId: string) => {
+  const setSelectedDashboardAndPanelId = (dashboardUid: string, panelId: number) => {
     const updatedAnnotations = produce(annotations, (draft) => {
       const dashboardAnnotation = draft.find((a) => a.key === Annotation.dashboardUID);
       const panelAnnotation = draft.find((a) => a.key === Annotation.panelID);
@@ -71,9 +65,9 @@ const AnnotationsStep = () => {
       }
 
       if (panelAnnotation) {
-        panelAnnotation.value = panelId;
+        panelAnnotation.value = panelId.toString();
       } else {
-        draft.push({ key: Annotation.panelID, value: panelId });
+        draft.push({ key: Annotation.panelID, value: panelId.toString() });
       }
     });
 
@@ -95,20 +89,15 @@ const AnnotationsStep = () => {
   };
 
   function getAnnotationsSectionDescription() {
-    const docsLink =
-      'https://grafana.com/docs/grafana/latest/alerting/fundamentals/annotation-label/variables-label-annotation';
-
     return (
       <Stack direction="row" gap={0.5} alignItems="baseline">
         <Text variant="bodySmall" color="secondary">
-          Add annotations to provide more context in your alert notifications.
+          Add more context in your notification messages.
         </Text>
         <NeedHelpInfo
-          contentText={`Annotations add metadata to provide more information on the alert in your alert notifications.
+          contentText={`Annotations add metadata to provide more information on the alert in your alert notification messages.
           For example, add a Summary annotation to tell you which value caused the alert to fire or which server it happened on.
           Annotations can contain a combination of text and template code.`}
-          externalLink={docsLink}
-          linkText={`Read about annotations`}
           title="Annotations"
         />
       </Stack>
@@ -116,7 +105,7 @@ const AnnotationsStep = () => {
   }
 
   return (
-    <RuleEditorSection stepNo={4} title="Add annotations" description={getAnnotationsSectionDescription()} fullWidth>
+    <RuleEditorSection stepNo={5} title="Add annotations" description={getAnnotationsSectionDescription()} fullWidth>
       <Stack direction="column" gap={1}>
         {fields.map((annotationField, index: number) => {
           const isUrl = annotations[index]?.key?.toLocaleLowerCase().endsWith('url');
diff --git a/public/app/features/alerting/unified/components/rule-editor/CloudEvaluationBehavior.tsx b/public/app/features/alerting/unified/components/rule-editor/CloudEvaluationBehavior.tsx
index 467150f24ffc9..3796b5266d291 100644
--- a/public/app/features/alerting/unified/components/rule-editor/CloudEvaluationBehavior.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/CloudEvaluationBehavior.tsx
@@ -1,9 +1,9 @@
 import { css } from '@emotion/css';
 import React from 'react';
-import { useFormContext } from 'react-hook-form';
+import { useFormContext, Controller } from 'react-hook-form';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Field, Input, InputControl, Select, useStyles2 } from '@grafana/ui';
+import { Field, Input, Select, useStyles2 } from '@grafana/ui';
 
 import { RuleFormType, RuleFormValues } from '../../types/rule-form';
 import { timeOptions } from '../../utils/time';
@@ -37,7 +37,7 @@ export const CloudEvaluationBehavior = () => {
               width={8}
             />
           </Field>
-          <InputControl
+          <Controller
             name="forTimeUnit"
             render={({ field: { onChange, ref, ...field } }) => (
               <Select
diff --git a/public/app/features/alerting/unified/components/rule-editor/DashboardPicker.test.tsx b/public/app/features/alerting/unified/components/rule-editor/DashboardPicker.test.tsx
new file mode 100644
index 0000000000000..7532f9b7376b0
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-editor/DashboardPicker.test.tsx
@@ -0,0 +1,80 @@
+import { render, waitFor } from '@testing-library/react';
+import { noop } from 'lodash';
+import React from 'react';
+import { Props } from 'react-virtualized-auto-sizer';
+import { byRole } from 'testing-library-selector';
+
+import 'core-js/stable/structured-clone';
+
+import { TestProvider } from '../../../../../../test/helpers/TestProvider';
+import { DashboardSearchItemType } from '../../../../search/types';
+import { mockDashboardApi, setupMswServer } from '../../mockApi';
+import { mockDashboardDto, mockDashboardSearchItem } from '../../mocks';
+
+import { DashboardPicker } from './DashboardPicker';
+
+jest.mock('react-virtualized-auto-sizer', () => {
+  return ({ children }: Props) =>
+    children({
+      height: 600,
+      scaledHeight: 600,
+      scaledWidth: 1,
+      width: 1,
+    });
+});
+
+const server = setupMswServer();
+
+mockDashboardApi(server).search([
+  mockDashboardSearchItem({ uid: 'dash-1', type: DashboardSearchItemType.DashDB, title: 'Dashboard 1' }),
+  mockDashboardSearchItem({ uid: 'dash-2', type: DashboardSearchItemType.DashDB, title: 'Dashboard 2' }),
+  mockDashboardSearchItem({ uid: 'dash-3', type: DashboardSearchItemType.DashDB, title: 'Dashboard 3' }),
+]);
+
+mockDashboardApi(server).dashboard(
+  mockDashboardDto({
+    uid: 'dash-2',
+    title: 'Dashboard 2',
+    panels: [
+      {
+        type: 'graph',
+      },
+      {
+        type: 'timeseries',
+      },
+      // this one is a library panel
+      {
+        type: undefined,
+        libraryPanel: {
+          name: 'my library panel',
+          uid: 'abc123',
+        },
+      },
+    ],
+  })
+);
+
+const ui = {
+  dashboardButton: (name: RegExp) => byRole('button', { name }),
+};
+
+describe('DashboardPicker', () => {
+  it('Renders panels without ids', async () => {
+    render(<DashboardPicker isOpen={true} onChange={noop} onDismiss={noop} dashboardUid="dash-2" panelId={2} />, {
+      wrapper: TestProvider,
+    });
+
+    await waitFor(() => {
+      expect(ui.dashboardButton(/Dashboard 1/).get()).toBeInTheDocument();
+      expect(ui.dashboardButton(/Dashboard 2/).get()).toBeInTheDocument();
+      expect(ui.dashboardButton(/Dashboard 3/).get()).toBeInTheDocument();
+
+      const panels = ui.dashboardButton(/<No title>/).getAll();
+      expect(panels).toHaveLength(3);
+
+      panels.forEach((panel) => {
+        expect(panel).not.toBeDisabled();
+      });
+    });
+  });
+});
diff --git a/public/app/features/alerting/unified/components/rule-editor/DashboardPicker.tsx b/public/app/features/alerting/unified/components/rule-editor/DashboardPicker.tsx
index 444325c253581..cea1fa5212788 100644
--- a/public/app/features/alerting/unified/components/rule-editor/DashboardPicker.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/DashboardPicker.tsx
@@ -17,14 +17,17 @@ import {
   Tooltip,
   useStyles2,
 } from '@grafana/ui';
-import { DashboardDTO } from 'app/types';
 
+import { DashboardModel } from '../../../../dashboard/state';
 import { dashboardApi } from '../../api/dashboardApi';
 
+import { useDashboardQuery } from './useDashboardQuery';
+
 export interface PanelDTO {
   id?: number;
   title?: string;
   type: string;
+  collapsed?: boolean;
 }
 
 function panelSort(a: PanelDTO, b: PanelDTO) {
@@ -42,24 +45,12 @@ function panelSort(a: PanelDTO, b: PanelDTO) {
 
 interface DashboardPickerProps {
   isOpen: boolean;
-  dashboardUid?: string | undefined;
-  panelId?: string | undefined;
-  onChange: (dashboardUid: string, panelId: string) => void;
+  dashboardUid?: string;
+  panelId?: number;
+  onChange: (dashboardUid: string, panelId: number) => void;
   onDismiss: () => void;
 }
 
-export function mergePanels(dashboardResult: DashboardDTO | undefined) {
-  const panels = dashboardResult?.dashboard?.panels?.filter((panel) => panel.type !== 'row') || [];
-  const nestedPanels =
-    dashboardResult?.dashboard?.panels
-      ?.filter((row: { collapsed: boolean }) => row.collapsed)
-      .map((collapsedRow: { panels: PanelDTO[] }) => collapsedRow.panels) || [];
-
-  const allDashboardPanels = [...panels, ...nestedPanels.flat()];
-
-  return allDashboardPanels;
-}
-
 export const DashboardPicker = ({ dashboardUid, panelId, isOpen, onChange, onDismiss }: DashboardPickerProps) => {
   const styles = useStyles2(getPickerStyles);
 
@@ -70,30 +61,27 @@ export const DashboardPicker = ({ dashboardUid, panelId, isOpen, onChange, onDis
   const [debouncedDashboardFilter, setDebouncedDashboardFilter] = useState('');
 
   const [panelFilter, setPanelFilter] = useState('');
-  const { useSearchQuery, useDashboardQuery } = dashboardApi;
+  const { useSearchQuery } = dashboardApi;
 
   const { currentData: filteredDashboards = [], isFetching: isDashSearchFetching } = useSearchQuery({
     query: debouncedDashboardFilter,
   });
-  const { currentData: dashboardResult, isFetching: isDashboardFetching } = useDashboardQuery(
-    { uid: selectedDashboardUid ?? '' },
-    { skip: !selectedDashboardUid }
-  );
+  const { dashboardModel, isFetching: isDashboardFetching } = useDashboardQuery(selectedDashboardUid);
 
   const handleDashboardChange = useCallback((dashboardUid: string) => {
     setSelectedDashboardUid(dashboardUid);
     setSelectedPanelId(undefined);
   }, []);
 
-  const allDashboardPanels = mergePanels(dashboardResult);
+  const allDashboardPanels = getVisualPanels(dashboardModel);
 
   const filteredPanels =
     allDashboardPanels
-      ?.filter((panel) => panel.title?.toLowerCase().includes(panelFilter.toLowerCase()))
+      .filter((panel) => panel.title?.toLowerCase().includes(panelFilter.toLowerCase()))
       .sort(panelSort) ?? [];
 
   const currentPanel: PanelDTO | undefined = allDashboardPanels.find(
-    (panel: PanelDTO) => isValidPanelIdentifier(panel) && panel.id?.toString() === selectedPanelId
+    (panel: PanelDTO) => isValidPanel(panel) && panel.id?.toString() === selectedPanelId
   );
 
   const selectedDashboardIndex = useMemo(() => {
@@ -145,9 +133,9 @@ export const DashboardPicker = ({ dashboardUid, panelId, isOpen, onChange, onDis
   const PanelRow = ({ index, style }: { index: number; style: CSSProperties }) => {
     const panel = filteredPanels[index];
     const panelTitle = panel.title || '<No title>';
-    const isSelected = panel.id && selectedPanelId === panel.id?.toString();
+    const isSelected = Boolean(panel.id) && selectedPanelId === panel.id;
     const isAlertingCompatible = panel.type === 'graph' || panel.type === 'timeseries';
-    const disabled = !isValidPanelIdentifier(panel);
+    const disabled = !isValidPanel(panel);
 
     return (
       <button
@@ -158,13 +146,13 @@ export const DashboardPicker = ({ dashboardUid, panelId, isOpen, onChange, onDis
           [styles.rowOdd]: index % 2 === 1,
           [styles.rowSelected]: isSelected,
         })}
-        onClick={() => (disabled ? noop : setSelectedPanelId(panel.id?.toString()))}
+        onClick={() => (disabled ? noop : setSelectedPanelId(panel.id))}
       >
         <div className={styles.rowButtonTitle} title={panelTitle}>
           {panelTitle}
         </div>
         {!isAlertingCompatible && !disabled && (
-          <Tooltip content="Alert tab will be disabled for this panel. It is only supported on graph and timeseries panels">
+          <Tooltip content="The alert tab and alert annotations are only supported on graph and timeseries panels.">
             <Icon name="exclamation-triangle" className={styles.warnIcon} data-testid="warning-icon" />
           </Tooltip>
         )}
@@ -187,11 +175,11 @@ export const DashboardPicker = ({ dashboardUid, panelId, isOpen, onChange, onDis
       contentClassName={styles.modalContent}
     >
       {/* This alert shows if the selected dashboard is not found in the first page of dashboards */}
-      {!selectedDashboardIsInPageResult && dashboardUid && (
+      {!selectedDashboardIsInPageResult && dashboardUid && dashboardModel && (
         <Alert title="Current selection" severity="info" topSpacing={0} bottomSpacing={1} className={styles.modalAlert}>
           <div>
-            Dashboard: {dashboardResult?.dashboard.title} ({dashboardResult?.dashboard.uid}) in folder{' '}
-            {dashboardResult?.meta.folderTitle ?? 'General'}
+            Dashboard: {dashboardModel.title} ({dashboardModel.uid}) in folder{' '}
+            {dashboardModel.meta?.folderTitle ?? 'General'}
           </div>
           {currentPanel && (
             <div>
@@ -274,8 +262,26 @@ export const DashboardPicker = ({ dashboardUid, panelId, isOpen, onChange, onDis
   );
 };
 
-const isValidPanelIdentifier = (panel: PanelDTO): boolean => {
-  return typeof panel.id === 'number' && typeof panel.type === 'string';
+export function getVisualPanels(dashboardModel: DashboardModel | undefined) {
+  if (!dashboardModel) {
+    return [];
+  }
+
+  const panelsWithoutRows = dashboardModel.panels.filter((panel) => panel.type !== 'row');
+  const panelsNestedInRows = dashboardModel.panels
+    .filter((rowPanel) => rowPanel.collapsed)
+    .flatMap((collapsedRow) => collapsedRow.panels ?? []);
+
+  const allDashboardPanels = [...panelsWithoutRows, ...panelsNestedInRows];
+  return allDashboardPanels;
+}
+
+const isValidPanel = (panel: PanelDTO): boolean => {
+  const hasValidID = typeof panel.id === 'number';
+  const isValidPanelType = typeof panel.type === 'string';
+  const isLibraryPanel = 'libraryPanel' in panel;
+
+  return hasValidID && (isValidPanelType || isLibraryPanel);
 };
 
 const getPickerStyles = (theme: GrafanaTheme2) => {
diff --git a/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx b/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx
index 6349303e7958b..f36ed62992a78 100644
--- a/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx
@@ -1,11 +1,10 @@
 import { css } from '@emotion/css';
 import { debounce, take, uniqueId } from 'lodash';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { FormProvider, useForm, useFormContext } from 'react-hook-form';
+import { FormProvider, useForm, useFormContext, Controller } from 'react-hook-form';
 
 import { AppEvents, GrafanaTheme2, SelectableValue } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { AsyncSelect, Button, Field, Input, InputControl, Label, Modal, Text, useStyles2 } from '@grafana/ui';
+import { AsyncSelect, Box, Button, Field, Input, Label, Modal, Stack, Text, useStyles2 } from '@grafana/ui';
 import appEvents from 'app/core/app_events';
 import { contextSrv } from 'app/core/services/context_srv';
 import { createFolder } from 'app/features/manage-dashboards/state/actions';
@@ -28,7 +27,7 @@ import { checkForPathSeparator } from './util';
 
 export const MAX_GROUP_RESULTS = 1000;
 
-export const useFolderGroupOptions = (folderTitle: string, enableProvisionedGroups: boolean) => {
+export const useFolderGroupOptions = (folderUid: string, enableProvisionedGroups: boolean) => {
   const dispatch = useDispatch();
 
   // fetch the ruler rules from the database so we can figure out what other "groups" are already defined
@@ -41,7 +40,7 @@ export const useFolderGroupOptions = (folderTitle: string, enableProvisionedGrou
   const groupfoldersForGrafana = rulerRuleRequests[GRAFANA_RULES_SOURCE_NAME];
 
   const grafanaFolders = useCombinedRuleNamespaces(GRAFANA_RULES_SOURCE_NAME);
-  const folderGroups = grafanaFolders.find((f) => f.name === folderTitle)?.groups ?? [];
+  const folderGroups = grafanaFolders.find((f) => f.uid === folderUid)?.groups ?? [];
 
   const groupOptions = folderGroups
     .map<SelectableValue<string>>((group) => {
@@ -94,7 +93,7 @@ export function FolderAndGroup({
   const folder = watch('folder');
   const group = watch('group');
 
-  const { groupOptions, loading } = useFolderGroupOptions(folder?.title ?? '', enableProvisionedGroups);
+  const { groupOptions, loading } = useFolderGroupOptions(folder?.uid ?? '', enableProvisionedGroups);
 
   const [isCreatingFolder, setIsCreatingFolder] = useState(false);
   const [isCreatingEvaluationGroup, setIsCreatingEvaluationGroup] = useState(false);
@@ -134,7 +133,7 @@ export function FolderAndGroup({
 
   return (
     <div className={styles.container}>
-      <div>
+      <Stack alignItems="center">
         {
           <Field
             label={
@@ -144,17 +143,17 @@ export function FolderAndGroup({
             }
             className={styles.formInput}
             error={errors.folder?.message}
-            invalid={!!errors.folder?.message}
             data-testid="folder-picker"
           >
             <Stack direction="row" alignItems="center">
               {(!isCreatingFolder && (
                 <>
-                  <InputControl
+                  <Controller
                     render={({ field: { ref, ...field } }) => (
                       <div style={{ width: 420 }}>
                         <RuleFolderPicker
                           inputId="folder"
+                          invalid={!!errors.folder?.message}
                           {...field}
                           enableReset={true}
                           onChange={({ title, uid }) => {
@@ -168,7 +167,7 @@ export function FolderAndGroup({
                     rules={{
                       required: { value: true, message: 'Select a folder' },
                       validate: {
-                        pathSeparator: (folder: Folder) => checkForPathSeparator(folder.title),
+                        pathSeparator: (folder: Folder) => checkForPathSeparator(folder.uid),
                       },
                     }}
                   />
@@ -191,50 +190,52 @@ export function FolderAndGroup({
         {isCreatingFolder && (
           <FolderCreationModal onCreate={handleFolderCreation} onClose={() => setIsCreatingFolder(false)} />
         )}
-      </div>
+      </Stack>
 
-      <div>
-        <Field
-          label="Evaluation group"
-          data-testid="group-picker"
-          description="Rules within the same group are evaluated sequentially over the same time interval."
-          className={styles.formInput}
-          error={errors.group?.message}
-          invalid={!!errors.group?.message}
-        >
-          <Stack direction="row" alignItems="center">
-            <InputControl
+      {isCreatingFolder && (
+        <FolderCreationModal onCreate={handleFolderCreation} onClose={() => setIsCreatingFolder(false)} />
+      )}
+
+      <Stack alignItems="center">
+        <div style={{ width: 420 }}>
+          <Field
+            label="Evaluation group"
+            data-testid="group-picker"
+            description="Rules within the same group are evaluated concurrently over the same time interval."
+            className={styles.formInput}
+            error={errors.group?.message}
+            invalid={!!errors.group?.message}
+          >
+            <Controller
               render={({ field: { ref, ...field }, fieldState }) => (
-                <div style={{ width: 420 }}>
-                  <AsyncSelect
-                    disabled={!folder || loading}
-                    inputId="group"
-                    key={uniqueId()}
-                    {...field}
-                    onChange={(group) => {
-                      field.onChange(group.label ?? '');
-                    }}
-                    isLoading={loading}
-                    invalid={Boolean(folder) && !group && Boolean(fieldState.error)}
-                    loadOptions={debouncedSearch}
-                    cacheOptions
-                    loadingMessage={'Loading groups...'}
-                    defaultValue={defaultGroupValue}
-                    defaultOptions={groupOptions}
-                    getOptionLabel={(option: SelectableValue<string>) => (
-                      <div>
-                        <span>{option.label}</span>
-                        {option['isProvisioned'] && (
-                          <>
-                            {' '}
-                            <ProvisioningBadge />
-                          </>
-                        )}
-                      </div>
-                    )}
-                    placeholder={'Select an evaluation group...'}
-                  />
-                </div>
+                <AsyncSelect
+                  disabled={!folder || loading}
+                  inputId="group"
+                  key={uniqueId()}
+                  {...field}
+                  onChange={(group) => {
+                    field.onChange(group.label ?? '');
+                  }}
+                  isLoading={loading}
+                  invalid={Boolean(folder) && !group && Boolean(fieldState.error)}
+                  loadOptions={debouncedSearch}
+                  cacheOptions
+                  loadingMessage={'Loading groups...'}
+                  defaultValue={defaultGroupValue}
+                  defaultOptions={groupOptions}
+                  getOptionLabel={(option: SelectableValue<string>) => (
+                    <div>
+                      <span>{option.label}</span>
+                      {option['isProvisioned'] && (
+                        <>
+                          {' '}
+                          <ProvisioningBadge />
+                        </>
+                      )}
+                    </div>
+                  )}
+                  placeholder={'Select an evaluation group...'}
+                />
               )}
               name="group"
               control={control}
@@ -245,19 +246,21 @@ export function FolderAndGroup({
                 },
               }}
             />
-            <Text color="secondary">or</Text>
-            <Button
-              onClick={onOpenEvaluationGroupCreationModal}
-              type="button"
-              icon="plus"
-              fill="outline"
-              variant="secondary"
-              disabled={!folder}
-            >
-              New evaluation group
-            </Button>
-          </Stack>
-        </Field>
+          </Field>
+        </div>
+        <Box marginTop={4} gap={1} display={'flex'} alignItems={'center'}>
+          <Text color="secondary">or</Text>
+          <Button
+            onClick={onOpenEvaluationGroupCreationModal}
+            type="button"
+            icon="plus"
+            fill="outline"
+            variant="secondary"
+            disabled={!folder}
+          >
+            New evaluation group
+          </Button>
+        </Box>
         {isCreatingEvaluationGroup && (
           <EvaluationGroupCreationModal
             onCreate={handleEvalGroupCreation}
@@ -265,7 +268,7 @@ export function FolderAndGroup({
             groupfoldersForGrafana={groupfoldersForGrafana}
           />
         )}
-      </div>
+      </Stack>
     </div>
   );
 }
diff --git a/public/app/features/alerting/unified/components/rule-editor/GrafanaAlertStatePicker.tsx b/public/app/features/alerting/unified/components/rule-editor/GrafanaAlertStatePicker.tsx
index ee732387de360..1494cc9a1359b 100644
--- a/public/app/features/alerting/unified/components/rule-editor/GrafanaAlertStatePicker.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/GrafanaAlertStatePicker.tsx
@@ -15,6 +15,7 @@ const options: SelectableValue[] = [
   { value: GrafanaAlertStateDecision.NoData, label: 'No Data' },
   { value: GrafanaAlertStateDecision.OK, label: 'OK' },
   { value: GrafanaAlertStateDecision.Error, label: 'Error' },
+  { value: GrafanaAlertStateDecision.KeepLast, label: 'Keep Last State' },
 ];
 
 export const GrafanaAlertStatePicker = ({ includeNoData, includeError, ...props }: Props) => {
diff --git a/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx b/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx
index 0d640760a14c4..054bdc8d6a823 100644
--- a/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx
@@ -1,13 +1,12 @@
 import { css } from '@emotion/css';
 import React, { useCallback, useEffect, useState } from 'react';
-import { RegisterOptions, useFormContext } from 'react-hook-form';
+import { RegisterOptions, useFormContext, Controller } from 'react-hook-form';
 
 import { GrafanaTheme2, SelectableValue } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Field, Icon, IconButton, Input, InputControl, Label, Switch, Text, Tooltip, useStyles2 } from '@grafana/ui';
+import { Field, Icon, IconButton, Input, Label, Stack, Switch, Text, Tooltip, useStyles2 } from '@grafana/ui';
 
 import { CombinedRuleGroup, CombinedRuleNamespace } from '../../../../../types/unified-alerting';
-import { logInfo, LogMessages } from '../../Analytics';
+import { LogMessages, logInfo } from '../../Analytics';
 import { useCombinedRuleNamespaces } from '../../hooks/useCombinedRuleNamespaces';
 import { useUnifiedAlertingSelector } from '../../hooks/useUnifiedAlertingSelector';
 import { RuleFormValues } from '../../types/rule-form';
@@ -46,7 +45,7 @@ const forValidationOptions = (evaluateEvery: string): RegisterOptions => ({
         const millisEvery = parsePrometheusDuration(evaluateEvery);
         return millisFor >= millisEvery
           ? true
-          : 'For duration must be greater than or equal to the evaluation interval.';
+          : 'Pending period must be greater than or equal to the evaluation interval.';
       } catch (err) {
         // if we fail to parse "every", assume validation is successful, or the error messages
         // will overlap in the UI
@@ -81,16 +80,16 @@ function FolderGroupAndEvaluationInterval({
   const { watch, setValue, getValues } = useFormContext<RuleFormValues>();
   const [isEditingGroup, setIsEditingGroup] = useState(false);
 
-  const [groupName, folderName] = watch(['group', 'folder.title']);
+  const [groupName, folderUid, folderName] = watch(['group', 'folder.uid', 'folder.title']);
 
   const rulerRuleRequests = useUnifiedAlertingSelector((state) => state.rulerRules);
   const groupfoldersForGrafana = rulerRuleRequests[GRAFANA_RULES_SOURCE_NAME];
 
   const grafanaNamespaces = useCombinedRuleNamespaces(GRAFANA_RULES_SOURCE_NAME);
-  const existingNamespace = grafanaNamespaces.find((ns) => ns.name === folderName);
+  const existingNamespace = grafanaNamespaces.find((ns) => ns.uid === folderUid);
   const existingGroup = existingNamespace?.groups.find((g) => g.name === groupName);
 
-  const isNewGroup = useIsNewGroup(folderName ?? '', groupName);
+  const isNewGroup = useIsNewGroup(folderUid ?? '', groupName);
 
   useEffect(() => {
     if (!isNewGroup && existingGroup?.interval) {
@@ -107,7 +106,7 @@ function FolderGroupAndEvaluationInterval({
 
   const onOpenEditGroupModal = () => setIsEditingGroup(true);
 
-  const editGroupDisabled = groupfoldersForGrafana?.loading || isNewGroup || !folderName || !groupName;
+  const editGroupDisabled = groupfoldersForGrafana?.loading || isNewGroup || !folderUid || !groupName;
 
   const emptyNamespace: CombinedRuleNamespace = {
     name: folderName,
@@ -126,6 +125,7 @@ function FolderGroupAndEvaluationInterval({
         <EditCloudGroupModal
           namespace={existingNamespace ?? emptyNamespace}
           group={existingGroup ?? emptyGroup}
+          folderUid={folderUid}
           onClose={() => closeEditGroupModal()}
           intervalEditOnly
           hideFolder={true}
@@ -238,7 +238,7 @@ export function GrafanaEvaluationBehavior({
 
         {existing && (
           <Field htmlFor="pause-alert-switch">
-            <InputControl
+            <Controller
               render={() => (
                 <Stack gap={1} direction="row" alignItems="center">
                   <Switch
@@ -269,7 +269,7 @@ export function GrafanaEvaluationBehavior({
       {showErrorHandling && (
         <>
           <Field htmlFor="no-data-state-input" label="Alert state if no data or all values are null">
-            <InputControl
+            <Controller
               render={({ field: { onChange, ref, ...field } }) => (
                 <GrafanaAlertStatePicker
                   {...field}
@@ -284,7 +284,7 @@ export function GrafanaEvaluationBehavior({
             />
           </Field>
           <Field htmlFor="exec-err-state-input" label="Alert state if execution error or timeout">
-            <InputControl
+            <Controller
               render={({ field: { onChange, ref, ...field } }) => (
                 <GrafanaAlertStatePicker
                   {...field}
diff --git a/public/app/features/alerting/unified/components/rule-editor/GroupAndNamespaceFields.tsx b/public/app/features/alerting/unified/components/rule-editor/GroupAndNamespaceFields.tsx
index 6c4497b9119bf..9b4ee949709ee 100644
--- a/public/app/features/alerting/unified/components/rule-editor/GroupAndNamespaceFields.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/GroupAndNamespaceFields.tsx
@@ -1,9 +1,9 @@
 import { css } from '@emotion/css';
 import React, { useEffect, useMemo } from 'react';
-import { useFormContext } from 'react-hook-form';
+import { useFormContext, Controller } from 'react-hook-form';
 
 import { GrafanaTheme2, SelectableValue } from '@grafana/data';
-import { Field, InputControl, useStyles2, VirtualizedSelect } from '@grafana/ui';
+import { Field, useStyles2, VirtualizedSelect } from '@grafana/ui';
 import { useDispatch } from 'app/types';
 
 import { useUnifiedAlertingSelector } from '../../hooks/useUnifiedAlertingSelector';
@@ -56,7 +56,7 @@ export const GroupAndNamespaceFields = ({ rulesSourceName }: Props) => {
         error={errors.namespace?.message}
         invalid={!!errors.namespace?.message}
       >
-        <InputControl
+        <Controller
           render={({ field: { onChange, ref, ...field } }) => (
             <VirtualizedSelect
               {...field}
@@ -81,7 +81,7 @@ export const GroupAndNamespaceFields = ({ rulesSourceName }: Props) => {
         />
       </Field>
       <Field data-testid="group-picker" label="Group" error={errors.group?.message} invalid={!!errors.group?.message}>
-        <InputControl
+        <Controller
           render={({ field: { ref, ...field } }) => (
             <VirtualizedSelect
               {...field}
diff --git a/public/app/features/alerting/unified/components/rule-editor/LabelsField.tsx b/public/app/features/alerting/unified/components/rule-editor/LabelsField.tsx
index 034b1e69f9644..69f14d36315de 100644
--- a/public/app/features/alerting/unified/components/rule-editor/LabelsField.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/LabelsField.tsx
@@ -1,36 +1,24 @@
 import { css, cx } from '@emotion/css';
-import { flattenDeep, compact } from 'lodash';
 import React, { FC, useCallback, useEffect, useMemo, useState } from 'react';
-import { FieldArrayMethodProps, useFieldArray, useFormContext } from 'react-hook-form';
+import { useFieldArray, UseFieldArrayAppend, useFormContext, Controller } from 'react-hook-form';
 
 import { GrafanaTheme2, SelectableValue } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import {
-  Button,
-  Field,
-  InlineLabel,
-  Label,
-  useStyles2,
-  Text,
-  Tooltip,
-  Icon,
-  Input,
-  LoadingPlaceholder,
-} from '@grafana/ui';
+import { Button, Field, InlineLabel, Input, LoadingPlaceholder, Stack, Text, useStyles2 } from '@grafana/ui';
 import { useDispatch } from 'app/types';
-import { RulerRuleGroupDTO } from 'app/types/unified-alerting-dto';
 
 import { useUnifiedAlertingSelector } from '../../hooks/useUnifiedAlertingSelector';
 import { fetchRulerRulesIfNotFetchedYet } from '../../state/actions';
 import { RuleFormValues } from '../../types/rule-form';
 import AlertLabelDropdown from '../AlertLabelDropdown';
 
+import { NeedHelpInfo } from './NeedHelpInfo';
+
 interface Props {
   className?: string;
   dataSourceName?: string | null;
 }
 
-const useGetCustomLabels = (dataSourceName: string): { loading: boolean; labelsByKey: Record<string, string[]> } => {
+const useGetCustomLabels = (dataSourceName: string): { loading: boolean; labelsByKey: Record<string, Set<string>> } => {
   const dispatch = useDispatch();
 
   useEffect(() => {
@@ -38,33 +26,45 @@ const useGetCustomLabels = (dataSourceName: string): { loading: boolean; labelsB
   }, [dispatch, dataSourceName]);
 
   const rulerRuleRequests = useUnifiedAlertingSelector((state) => state.rulerRules);
-
   const rulerRequest = rulerRuleRequests[dataSourceName];
 
-  const result = rulerRequest?.result || {};
-
-  //store all labels in a flat array and remove empty values
-  const labels = compact(
-    flattenDeep(
-      Object.keys(result).map((ruleGroupKey) =>
-        result[ruleGroupKey].map((ruleItem: RulerRuleGroupDTO) => ruleItem.rules.map((item) => item.labels))
-      )
-    )
-  );
-
-  const labelsByKey: Record<string, string[]> = {};
-
-  labels.forEach((label: Record<string, string>) => {
-    Object.entries(label).forEach(([key, value]) => {
-      labelsByKey[key] = [...new Set([...(labelsByKey[key] || []), value])];
+  const labelsByKeyResult = useMemo<Record<string, Set<string>>>(() => {
+    const labelsByKey: Record<string, Set<string>> = {};
+
+    const rulerRulesConfig = rulerRequest?.result;
+    if (!rulerRulesConfig) {
+      return labelsByKey;
+    }
+
+    const allRules = Object.values(rulerRulesConfig)
+      .flatMap((groups) => groups)
+      .flatMap((group) => group.rules);
+
+    allRules.forEach((rule) => {
+      if (rule.labels) {
+        Object.entries(rule.labels).forEach(([key, value]) => {
+          if (!value) {
+            return;
+          }
+
+          const labelEntry = labelsByKey[key];
+          if (labelEntry) {
+            labelEntry.add(value);
+          } else {
+            labelsByKey[key] = new Set([value]);
+          }
+        });
+      }
     });
-  });
 
-  return { loading: rulerRequest?.loading, labelsByKey };
+    return labelsByKey;
+  }, [rulerRequest]);
+
+  return { loading: rulerRequest?.loading, labelsByKey: labelsByKeyResult };
 };
 
-function mapLabelsToOptions(items: string[] = []): Array<SelectableValue<string>> {
-  return items.map((item) => ({ label: item, value: item }));
+function mapLabelsToOptions(items: Iterable<string> = []): Array<SelectableValue<string>> {
+  return Array.from(items, (item) => ({ label: item, value: item }));
 }
 
 const RemoveButton: FC<{
@@ -85,10 +85,7 @@ const RemoveButton: FC<{
 );
 
 const AddButton: FC<{
-  append: (
-    value: Partial<{ key: string; value: string }> | Array<Partial<{ key: string; value: string }>>,
-    options?: FieldArrayMethodProps | undefined
-  ) => void;
+  append: UseFieldArrayAppend<RuleFormValues, 'labels'>;
   className: string;
 }> = ({ append, className }) => (
   <Button
@@ -107,11 +104,9 @@ const AddButton: FC<{
 const LabelsWithSuggestions: FC<{ dataSourceName: string }> = ({ dataSourceName }) => {
   const styles = useStyles2(getStyles);
   const {
-    register,
     control,
     watch,
     formState: { errors },
-    setValue,
   } = useFormContext<RuleFormValues>();
 
   const labels = watch('labels');
@@ -151,17 +146,24 @@ const LabelsWithSuggestions: FC<{ dataSourceName: string }> = ({ dataSourceName
                     error={errors.labels?.[index]?.key?.message}
                     data-testid={`label-key-${index}`}
                   >
-                    <AlertLabelDropdown
-                      {...register(`labels.${index}.key`, {
-                        required: { value: Boolean(labels[index]?.value), message: 'Required.' },
-                      })}
-                      defaultValue={field.key ? { label: field.key, value: field.key } : undefined}
-                      options={keys}
-                      onChange={(newValue: SelectableValue) => {
-                        setValue(`labels.${index}.key`, newValue.value);
-                        setSelectedKey(newValue.value);
+                    <Controller
+                      name={`labels.${index}.key`}
+                      control={control}
+                      rules={{ required: Boolean(labels[index]?.value) ? 'Required.' : false }}
+                      render={({ field: { onChange, ref, ...rest } }) => {
+                        return (
+                          <AlertLabelDropdown
+                            {...rest}
+                            defaultValue={field.key ? { label: field.key, value: field.key } : undefined}
+                            options={keys}
+                            onChange={(newValue: SelectableValue) => {
+                              onChange(newValue.value);
+                              setSelectedKey(newValue.value);
+                            }}
+                            type="key"
+                          />
+                        );
                       }}
-                      type="key"
                     />
                   </Field>
                   <InlineLabel className={styles.equalSign}>=</InlineLabel>
@@ -171,19 +173,26 @@ const LabelsWithSuggestions: FC<{ dataSourceName: string }> = ({ dataSourceName
                     error={errors.labels?.[index]?.value?.message}
                     data-testid={`label-value-${index}`}
                   >
-                    <AlertLabelDropdown
-                      {...register(`labels.${index}.value`, {
-                        required: { value: Boolean(labels[index]?.key), message: 'Required.' },
-                      })}
-                      defaultValue={field.value ? { label: field.value, value: field.value } : undefined}
-                      options={values}
-                      onChange={(newValue: SelectableValue) => {
-                        setValue(`labels.${index}.value`, newValue.value);
-                      }}
-                      onOpenMenu={() => {
-                        setSelectedKey(labels[index].key);
+                    <Controller
+                      control={control}
+                      name={`labels.${index}.value`}
+                      rules={{ required: Boolean(labels[index]?.value) ? 'Required.' : false }}
+                      render={({ field: { onChange, ref, ...rest } }) => {
+                        return (
+                          <AlertLabelDropdown
+                            {...rest}
+                            defaultValue={field.value ? { label: field.value, value: field.value } : undefined}
+                            options={values}
+                            onChange={(newValue: SelectableValue) => {
+                              onChange(newValue.value);
+                            }}
+                            onOpenMenu={() => {
+                              setSelectedKey(labels[index].key);
+                            }}
+                            type="value"
+                          />
+                        );
                       }}
-                      type="value"
                     />
                   </Field>
 
@@ -261,23 +270,20 @@ const LabelsField: FC<Props> = ({ dataSourceName }) => {
 
   return (
     <div>
-      <Label description="A set of default labels is automatically added. Add additional labels as required.">
-        <Stack gap={0.5} alignItems="center">
-          <Text variant="bodySmall" color="primary">
-            Labels
+      <Stack direction="column" gap={1}>
+        <Text element="h5">Labels</Text>
+        <Stack direction={'row'} gap={1}>
+          <Text variant="bodySmall" color="secondary">
+            Add labels to your rule for searching, silencing, or routing to a notification policy.
           </Text>
-          <Tooltip
-            content={
-              <div>
-                The dropdown only displays labels that you have previously used for alerts. Select a label from the
-                dropdown or type in a new one.
-              </div>
-            }
-          >
-            <Icon className={styles.icon} name="info-circle" size="sm" />
-          </Tooltip>
+          <NeedHelpInfo
+            contentText="The dropdown only displays labels that you have previously used for alerts.
+            Select a label from the options below or type in a new one."
+            title="Labels"
+          />
         </Stack>
-      </Label>
+      </Stack>
+      <div className={styles.labelsContainer}></div>
       {dataSourceName ? <LabelsWithSuggestions dataSourceName={dataSourceName} /> : <LabelsWithoutSuggestions />}
     </div>
   );
@@ -285,47 +291,48 @@ const LabelsField: FC<Props> = ({ dataSourceName }) => {
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
-    icon: css`
-      margin-right: ${theme.spacing(0.5)};
-    `,
-    flexColumn: css`
-      display: flex;
-      flex-direction: column;
-    `,
-    flexRow: css`
-      display: flex;
-      flex-direction: row;
-      justify-content: flex-start;
-
-      & + button {
-        margin-left: ${theme.spacing(0.5)};
-      }
-    `,
-    deleteLabelButton: css`
-      margin-left: ${theme.spacing(0.5)};
-      align-self: flex-start;
-    `,
-    addLabelButton: css`
-      flex-grow: 0;
-      align-self: flex-start;
-    `,
-    centerAlignRow: css`
-      align-items: baseline;
-    `,
-    equalSign: css`
-      align-self: flex-start;
-      width: 28px;
-      justify-content: center;
-      margin-left: ${theme.spacing(0.5)};
-    `,
-    labelInput: css`
-      width: 175px;
-      margin-bottom: -${theme.spacing(1)};
-
-      & + & {
-        margin-left: ${theme.spacing(1)};
-      }
-    `,
+    icon: css({
+      marginRight: theme.spacing(0.5),
+    }),
+    flexColumn: css({
+      display: 'flex',
+      flexDirection: 'column',
+    }),
+    flexRow: css({
+      display: 'flex',
+      flexDirection: 'row',
+      justifyContent: 'flex-start',
+      '& + button': {
+        marginLeft: theme.spacing(0.5),
+      },
+    }),
+    deleteLabelButton: css({
+      marginLeft: theme.spacing(0.5),
+      alignSelf: 'flex-start',
+    }),
+    addLabelButton: css({
+      flexGrow: 0,
+      alignSelf: 'flex-start',
+    }),
+    centerAlignRow: css({
+      alignItems: 'baseline',
+    }),
+    equalSign: css({
+      alignSelf: 'flex-start',
+      width: '28px',
+      justifyContent: 'center',
+      marginLeft: theme.spacing(0.5),
+    }),
+    labelInput: css({
+      width: '175px',
+      marginBottom: `-${theme.spacing(1)}`,
+      '& + &': {
+        marginLeft: theme.spacing(1),
+      },
+    }),
+    labelsContainer: css({
+      marginBottom: theme.spacing(3),
+    }),
   };
 };
 
diff --git a/public/app/features/alerting/unified/components/rule-editor/NeedHelpInfo.tsx b/public/app/features/alerting/unified/components/rule-editor/NeedHelpInfo.tsx
index 70e27b0a2c6b4..7d1cc340c08d5 100644
--- a/public/app/features/alerting/unified/components/rule-editor/NeedHelpInfo.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/NeedHelpInfo.tsx
@@ -2,8 +2,7 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Icon, Text, Toggletip, useStyles2 } from '@grafana/ui';
+import { Icon, Text, Toggletip, useStyles2, Stack } from '@grafana/ui';
 
 interface NeedHelpInfoProps {
   contentText: string | JSX.Element;
diff --git a/public/app/features/alerting/unified/components/rule-editor/NotificationsStep.tsx b/public/app/features/alerting/unified/components/rule-editor/NotificationsStep.tsx
index 7ce8541a99fb5..d4c9a8af1eef6 100644
--- a/public/app/features/alerting/unified/components/rule-editor/NotificationsStep.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/NotificationsStep.tsx
@@ -1,8 +1,10 @@
+import { css } from '@emotion/css';
 import React from 'react';
 import { useFormContext } from 'react-hook-form';
 
-import { Stack } from '@grafana/experimental';
-import { Icon, Text } from '@grafana/ui';
+import { GrafanaTheme2 } from '@grafana/data';
+import { config } from '@grafana/runtime';
+import { Icon, RadioButtonGroup, Stack, Text, useStyles2 } from '@grafana/ui';
 
 import { RuleFormType, RuleFormValues } from '../../types/rule-form';
 import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
@@ -10,80 +12,33 @@ import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
 import LabelsField from './LabelsField';
 import { NeedHelpInfo } from './NeedHelpInfo';
 import { RuleEditorSection } from './RuleEditorSection';
+import { SimplifiedRouting } from './alert-rule-form/simplifiedRouting/SimplifiedRouting';
 import { NotificationPreview } from './notificaton-preview/NotificationPreview';
 
 type NotificationsStepProps = {
   alertUid?: string;
 };
+
+enum RoutingOptions {
+  NotificationPolicy = 'notification policy',
+  ContactPoint = 'contact point',
+}
+
 export const NotificationsStep = ({ alertUid }: NotificationsStepProps) => {
-  const { watch } = useFormContext<RuleFormValues & { location?: string }>();
+  const { watch } = useFormContext<RuleFormValues>();
+  const styles = useStyles2(getStyles);
 
-  const [type, labels, queries, condition, folder, alertName] = watch([
-    'type',
-    'labels',
-    'queries',
-    'condition',
-    'folder',
-    'name',
-  ]);
+  const [type] = watch(['type', 'labels', 'queries', 'condition', 'folder', 'name', 'manualRouting']);
 
   const dataSourceName = watch('dataSourceName') ?? GRAFANA_RULES_SOURCE_NAME;
-
-  const shouldRenderPreview = type === RuleFormType.grafana;
-
-  const NotificationsStepDescription = () => {
-    return (
-      <Stack direction="row" gap={0.5} alignItems="baseline">
-        <Text variant="bodySmall" color="secondary">
-          Add custom labels to change the way your notifications are routed.
-        </Text>
-        <NeedHelpInfo
-          contentText={
-            <Stack gap={1}>
-              <Stack direction="row" gap={0}>
-                <>
-                  Firing alert rule instances are routed to notification policies based on matching labels. All alert
-                  rules and instances, irrespective of their labels, match the default notification policy. If there are
-                  no nested policies, or no nested policies match the labels in the alert rule or alert instance, then
-                  the default notification policy is the matching policy.
-                </>
-                <a
-                  href={`https://grafana.com/docs/grafana/latest/alerting/fundamentals/notification-policies/notifications/`}
-                  target="_blank"
-                  rel="noreferrer"
-                >
-                  <Text color="link">
-                    Read about notification routing. <Icon name="external-link-alt" />
-                  </Text>
-                </a>
-              </Stack>
-              <Stack direction="row" gap={0}>
-                <>
-                  Custom labels change the way your notifications are routed. First, add labels to your alert rule and
-                  then connect them to your notification policy by adding label matchers.
-                </>
-                <a
-                  href={`https://grafana.com/docs/grafana/latest/alerting/fundamentals/annotation-label/`}
-                  target="_blank"
-                  rel="noreferrer"
-                >
-                  <Text color="link">
-                    Read about Labels and annotations. <Icon name="external-link-alt" />
-                  </Text>
-                </a>
-              </Stack>
-            </Stack>
-          }
-          title="Notification routing"
-        />
-      </Stack>
-    );
-  };
+  const simplifiedRoutingToggleEnabled = config.featureToggles.alertingSimplifiedRouting ?? false;
+  const shouldRenderpreview = type === RuleFormType.grafana;
+  const shouldAllowSimplifiedRouting = type === RuleFormType.grafana && simplifiedRoutingToggleEnabled;
 
   return (
     <RuleEditorSection
-      stepNo={type === RuleFormType.cloudRecording ? 4 : 5}
-      title={type === RuleFormType.cloudRecording ? 'Add labels' : 'Configure notifications'}
+      stepNo={4}
+      title={type === RuleFormType.cloudRecording ? 'Add labels' : 'Configure labels and notifications'}
       description={
         <Stack direction="row" gap={0.5} alignItems="baseline">
           {type === RuleFormType.cloudRecording ? (
@@ -91,23 +46,212 @@ export const NotificationsStep = ({ alertUid }: NotificationsStepProps) => {
               Add labels to help you better manage your recording rules
             </Text>
           ) : (
-            <NotificationsStepDescription />
+            shouldAllowSimplifiedRouting && (
+              <Text variant="bodySmall" color="secondary">
+                Select who should receive a notification when an alert rule fires.
+              </Text>
+            )
           )}
         </Stack>
       }
       fullWidth
     >
       <LabelsField dataSourceName={dataSourceName} />
-      {shouldRenderPreview && (
-        <NotificationPreview
-          alertQueries={queries}
-          customLabels={labels}
-          condition={condition}
-          folder={folder}
-          alertName={alertName}
-          alertUid={alertUid}
-        />
+      {shouldAllowSimplifiedRouting && (
+        <div className={styles.configureNotifications}>
+          <Text element="h5">Notifications</Text>
+          <Text variant="bodySmall" color="secondary">
+            Select who should receive a notification when an alert rule fires.
+          </Text>
+        </div>
       )}
+      {shouldAllowSimplifiedRouting ? ( // when simplified routing is enabled and is grafana rule
+        <ManualAndAutomaticRouting alertUid={alertUid} />
+      ) : // when simplified routing is not enabled, render the notification preview as we did before
+      shouldRenderpreview ? (
+        <AutomaticRooting alertUid={alertUid} />
+      ) : null}
     </RuleEditorSection>
   );
 };
+
+/**
+ * Preconditions:
+ * - simplified routing is enabled
+ * - the alert rule is a grafana rule
+ *
+ * This component will render the switch between the select contact point routing and the notification policy routing.
+ * It also renders the section body of the NotificationsStep, depending on the routing option selected.
+ * If select contact point routing is selected, it will render the SimplifiedRouting component.
+ * If notification policy routing is selected, it will render the AutomaticRouting component.
+ *
+ */
+function ManualAndAutomaticRouting({ alertUid }: { alertUid?: string }) {
+  const { watch, setValue } = useFormContext<RuleFormValues>();
+  const styles = useStyles2(getStyles);
+
+  const [manualRouting] = watch(['manualRouting']);
+
+  const routingOptions = [
+    { label: 'Select contact point', value: RoutingOptions.ContactPoint },
+    { label: 'Use notification policy', value: RoutingOptions.NotificationPolicy },
+  ];
+
+  const onRoutingOptionChange = (option: RoutingOptions) => {
+    setValue('manualRouting', option === RoutingOptions.ContactPoint);
+  };
+
+  return (
+    <Stack direction="column">
+      <Stack direction="column">
+        <RadioButtonGroup
+          options={routingOptions}
+          value={manualRouting ? RoutingOptions.ContactPoint : RoutingOptions.NotificationPolicy}
+          onChange={onRoutingOptionChange}
+          className={styles.routingOptions}
+        />
+      </Stack>
+
+      <RoutingOptionDescription manualRouting={manualRouting} />
+
+      {manualRouting ? <SimplifiedRouting /> : <AutomaticRooting alertUid={alertUid} />}
+    </Stack>
+  );
+}
+
+interface AutomaticRootingProps {
+  alertUid?: string;
+}
+
+function AutomaticRooting({ alertUid }: AutomaticRootingProps) {
+  const { watch } = useFormContext<RuleFormValues>();
+  const [labels, queries, condition, folder, alertName] = watch([
+    'labels',
+    'queries',
+    'condition',
+    'folder',
+    'name',
+    'manualRouting',
+  ]);
+  return (
+    <NotificationPreview
+      alertQueries={queries}
+      customLabels={labels}
+      condition={condition}
+      folder={folder}
+      alertName={alertName}
+      alertUid={alertUid}
+    />
+  );
+}
+
+// Auxiliar components to build the texts and descriptions in the NotificationsStep
+function NeedHelpInfoForNotificationPolicy() {
+  return (
+    <NeedHelpInfo
+      contentText={
+        <Stack gap={1} direction="column">
+          <Stack direction="column" gap={0}>
+            <>
+              Firing alert rule instances are routed to notification policies based on matching labels. All alert rules
+              and instances, irrespective of their labels, match the default notification policy. If there are no nested
+              policies, or no nested policies match the labels in the alert rule or alert instance, then the default
+              notification policy is the matching policy.
+            </>
+            <a
+              href={`https://grafana.com/docs/grafana/latest/alerting/fundamentals/notification-policies/notifications/`}
+              target="_blank"
+              rel="noreferrer"
+            >
+              <Text color="link">
+                Read about notification routing. <Icon name="external-link-alt" />
+              </Text>
+            </a>
+          </Stack>
+          <Stack direction="column" gap={0}>
+            <>
+              Custom labels change the way your notifications are routed. First, add labels to your alert rule and then
+              connect them to your notification policy by adding label matchers.
+            </>
+            <a
+              href={`https://grafana.com/docs/grafana/latest/alerting/fundamentals/annotation-label/`}
+              target="_blank"
+              rel="noreferrer"
+            >
+              <Text color="link">
+                Read about Labels and annotations. <Icon name="external-link-alt" />
+              </Text>
+            </a>
+          </Stack>
+        </Stack>
+      }
+      title="Notification routing"
+    />
+  );
+}
+
+function NeedHelpInfoForContactpoint() {
+  return (
+    <NeedHelpInfo
+      contentText={
+        <>
+          Select a contact point to notify all recipients in it.
+          <br />
+          <br />
+          Notifications for firing alert instances are grouped based on folder and alert rule name.
+          <br />
+          The waiting time until the initial notification is sent for a new group created by an incoming alert is 30
+          seconds.
+          <br />
+          The waiting time to send a batch of new alerts for that group after the first notification was sent is 5
+          minutes.
+          <br />
+          The waiting time to resend an alert after they have successfully been sent is 4 hours.
+          <br />
+          Grouping and wait time values are defined in your default notification policy.
+        </>
+      }
+      // todo: update the link with the new documentation about simplified routing
+      externalLink="`https://grafana.com/docs/grafana/latest/alerting/fundamentals/notification-policies/notifications/`"
+      linkText="Read more about notifiying contact points"
+      title="Notify contact points"
+    />
+  );
+}
+interface NotificationsStepDescriptionProps {
+  manualRouting: boolean;
+}
+
+export const RoutingOptionDescription = ({ manualRouting }: NotificationsStepDescriptionProps) => {
+  const styles = useStyles2(getStyles);
+  return (
+    <div className={styles.notificationsOptionDescription}>
+      <Text variant="bodySmall" color="secondary">
+        {manualRouting
+          ? 'Notifications for firing alerts are routed to a selected contact point.'
+          : 'Notifications for firing alerts are routed to contact points based on matching labels and the notification policy tree.'}
+      </Text>
+      {manualRouting ? <NeedHelpInfoForContactpoint /> : <NeedHelpInfoForNotificationPolicy />}
+    </div>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  routingOptions: css({
+    marginTop: theme.spacing(2),
+    width: 'fit-content',
+  }),
+  configureNotifications: css({
+    display: 'flex',
+    flexDirection: 'column',
+    gap: theme.spacing(1),
+    marginTop: theme.spacing(2),
+  }),
+  notificationsOptionDescription: css({
+    marginTop: theme.spacing(1),
+    display: 'flex',
+    flexDirection: 'row',
+    alignItems: 'baseline',
+    gap: theme.spacing(0.5),
+  }),
+});
diff --git a/public/app/features/alerting/unified/components/rule-editor/QueryOptions.tsx b/public/app/features/alerting/unified/components/rule-editor/QueryOptions.tsx
index 87e6443b76538..ba7857e015357 100644
--- a/public/app/features/alerting/unified/components/rule-editor/QueryOptions.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/QueryOptions.tsx
@@ -55,11 +55,7 @@ export const QueryOptions = ({
       </Toggletip>
 
       <div className={styles.staticValues}>
-        <span>
-          {dateTime(timeRange?.from)
-            .locale('en')
-            .fromNow(true)}
-        </span>
+        <span>{dateTime(timeRange?.from).locale('en').fromNow(true)}</span>
         {queryOptions.maxDataPoints && <span>, MD = {queryOptions.maxDataPoints}</span>}
         {queryOptions.minInterval && <span>, Min. Interval = {queryOptions.minInterval}</span>}
       </div>
diff --git a/public/app/features/alerting/unified/components/rule-editor/QueryRows.tsx b/public/app/features/alerting/unified/components/rule-editor/QueryRows.tsx
index ed5941fd90c17..55cb20a1dac9a 100644
--- a/public/app/features/alerting/unified/components/rule-editor/QueryRows.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/QueryRows.tsx
@@ -10,9 +10,8 @@ import {
   rangeUtil,
   RelativeTimeRange,
 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
 import { getDataSourceSrv } from '@grafana/runtime';
-import { Button, Card, Icon } from '@grafana/ui';
+import { Button, Card, Icon, Stack } from '@grafana/ui';
 import { QueryOperationRow } from 'app/core/components/QueryOperationRow/QueryOperationRow';
 import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
 import { AlertDataQuery, AlertQuery } from 'app/types/unified-alerting-dto';
@@ -145,8 +144,8 @@ export class QueryRows extends PureComponent<Props> {
   };
 
   render() {
-    const { queries, expressions } = this.props;
-    const thresholdByRefId = getThresholdsForQueries([...queries, ...expressions]);
+    const { queries, expressions, condition } = this.props;
+    const thresholdByRefId = getThresholdsForQueries([...queries, ...expressions], condition);
 
     return (
       <DragDropContext onDragEnd={this.onDragEnd}>
diff --git a/public/app/features/alerting/unified/components/rule-editor/QueryWrapper.tsx b/public/app/features/alerting/unified/components/rule-editor/QueryWrapper.tsx
index 45c06c5afa557..377170f157668 100644
--- a/public/app/features/alerting/unified/components/rule-editor/QueryWrapper.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/QueryWrapper.tsx
@@ -12,9 +12,8 @@ import {
   RelativeTimeRange,
   ThresholdsConfig,
 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
 import { DataQuery } from '@grafana/schema';
-import { GraphTresholdsStyleMode, Icon, InlineField, Input, Tooltip, useStyles2 } from '@grafana/ui';
+import { GraphThresholdsStyleMode, Icon, InlineField, Input, Tooltip, useStyles2, Stack } from '@grafana/ui';
 import { QueryEditorRow } from 'app/features/query/components/QueryEditorRow';
 import { AlertQuery } from 'app/types/unified-alerting-dto';
 
@@ -46,7 +45,7 @@ interface Props {
   onRunQueries: () => void;
   index: number;
   thresholds: ThresholdsConfig;
-  thresholdsType?: GraphTresholdsStyleMode;
+  thresholdsType?: GraphThresholdsStyleMode;
   onChangeThreshold?: (thresholds: ThresholdsConfig, index: number) => void;
   condition: string | null;
   onSetCondition: (refId: string) => void;
@@ -131,16 +130,15 @@ export const QueryWrapper = ({
           onChangeQueryOptions={onChangeQueryOptions}
           index={index}
         />
-        <ExpressionStatusIndicator
-          error={error}
-          onSetCondition={() => onSetCondition(query.refId)}
-          isCondition={isAlertCondition}
-        />
+        <ExpressionStatusIndicator onSetCondition={() => onSetCondition(query.refId)} isCondition={isAlertCondition} />
       </Stack>
     );
   }
 
   const showVizualisation = data.state !== LoadingState.NotStarted;
+  // ⚠️ the query editors want the entire array of queries passed as "DataQuery" NOT "AlertQuery"
+  // TypeScript isn't complaining here because the interfaces just happen to be compatible
+  const editorQueries = cloneDeep(queries.map((query) => query.model));
 
   return (
     <Stack direction="column" gap={0.5}>
@@ -160,10 +158,10 @@ export const QueryWrapper = ({
           onRemoveQuery={onRemoveQuery}
           onAddQuery={() => onDuplicateQuery(cloneDeep(query))}
           onRunQuery={onRunQueries}
-          queries={queries}
+          queries={editorQueries}
           renderHeaderExtras={() => <HeaderExtras query={query} index={index} error={error} />}
           app={CoreApp.UnifiedAlerting}
-          hideDisableQuery={true}
+          hideHideQueryButton={true}
         />
       </div>
       {showVizualisation && (
@@ -214,7 +212,7 @@ export function MaxDataPointsOption({
       <Input
         type="number"
         width={10}
-        placeholder={DEFAULT_MAX_DATA_POINTS.toLocaleString()}
+        placeholder={DEFAULT_MAX_DATA_POINTS.toString()}
         spellCheck={false}
         onBlur={onMaxDataPointsBlur}
         defaultValue={value}
@@ -244,12 +242,12 @@ export function MinIntervalOption({
 
   return (
     <InlineField
-      label="Min interval"
+      label="Interval"
       labelWidth={24}
       tooltip={
         <>
-          A lower limit for the interval. Recommended to be set to write frequency, for example <code>1m</code> if your
-          data is written every minute.
+          Interval sent to the data source. Recommended to be set to write frequency, for example <code>1m</code> if
+          your data is written every minute.
         </>
       }
     >
diff --git a/public/app/features/alerting/unified/components/rule-editor/RecordingRuleEditor.tsx b/public/app/features/alerting/unified/components/rule-editor/RecordingRuleEditor.tsx
index 3fe2feb640f21..60a0d44fe6198 100644
--- a/public/app/features/alerting/unified/components/rule-editor/RecordingRuleEditor.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/RecordingRuleEditor.tsx
@@ -68,8 +68,11 @@ export const RecordingRuleEditor: FC<RecordingRuleEditorProps> = ({
         datasource: changedQuery.datasource,
         refId: changedQuery.refId,
         editorMode: changedQuery.editorMode,
-        instant: Boolean(changedQuery.instant),
-        range: Boolean(changedQuery.range),
+        // Instant and range are used by Prometheus queries
+        instant: changedQuery.instant,
+        range: changedQuery.range,
+        // Query type is used by Loki queries
+        queryType: changedQuery.queryType,
         legendFormat: changedQuery.legendFormat,
       },
     };
diff --git a/public/app/features/alerting/unified/components/rule-editor/RecordingRulesNameSpaceAndGroupStep.tsx b/public/app/features/alerting/unified/components/rule-editor/RecordingRulesNameSpaceAndGroupStep.tsx
index 04bc6d5e89e51..ad1af3184cd9c 100644
--- a/public/app/features/alerting/unified/components/rule-editor/RecordingRulesNameSpaceAndGroupStep.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/RecordingRulesNameSpaceAndGroupStep.tsx
@@ -7,7 +7,7 @@ import { GroupAndNamespaceFields } from './GroupAndNamespaceFields';
 import { RuleEditorSection } from './RuleEditorSection';
 
 export function RecordingRulesNameSpaceAndGroupStep() {
-  const { watch } = useFormContext<RuleFormValues & { location?: string }>();
+  const { watch } = useFormContext<RuleFormValues>();
 
   const dataSourceName = watch('dataSourceName');
 
diff --git a/public/app/features/alerting/unified/components/rule-editor/RuleEditorSection.tsx b/public/app/features/alerting/unified/components/rule-editor/RuleEditorSection.tsx
index f291440327d9d..cf3b0676adbaa 100644
--- a/public/app/features/alerting/unified/components/rule-editor/RuleEditorSection.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/RuleEditorSection.tsx
@@ -2,8 +2,7 @@ import { css, cx } from '@emotion/css';
 import React, { ReactElement } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { FieldSet, Text, useStyles2 } from '@grafana/ui';
+import { FieldSet, Text, useStyles2, Stack } from '@grafana/ui';
 
 export interface RuleEditorSectionProps {
   title: string;
diff --git a/public/app/features/alerting/unified/components/rule-editor/RuleFolderPicker.tsx b/public/app/features/alerting/unified/components/rule-editor/RuleFolderPicker.tsx
index 98318fd3a8bf9..a5ffba920d685 100644
--- a/public/app/features/alerting/unified/components/rule-editor/RuleFolderPicker.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/RuleFolderPicker.tsx
@@ -2,12 +2,11 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Icon, Tooltip, useStyles2 } from '@grafana/ui';
-import { OldFolderPicker, Props as FolderPickerProps } from 'app/core/components/Select/OldFolderPicker';
+import { Icon, Stack, Tooltip, useStyles2 } from '@grafana/ui';
+import { Props as FolderPickerProps, OldFolderPicker } from 'app/core/components/Select/OldFolderPicker';
 import { PermissionLevelString, SearchQueryType } from 'app/types';
 
-import { FolderWarning, CustomAdd } from '../../../../../core/components/Select/OldFolderPicker';
+import { CustomAdd, FolderWarning } from '../../../../../core/components/Select/OldFolderPicker';
 
 export interface Folder {
   title: string;
@@ -16,6 +15,7 @@ export interface Folder {
 
 export interface RuleFolderPickerProps extends Omit<FolderPickerProps, 'initialTitle' | 'initialFolderId'> {
   value?: Folder;
+  invalid?: boolean;
 }
 
 const SlashesWarning = () => {
@@ -52,7 +52,6 @@ export function RuleFolderPicker(props: RuleFolderPickerProps) {
       showRoot={false}
       rootName=""
       allowEmpty={true}
-      initialTitle={value?.title}
       initialFolderUid={value?.uid}
       searchQueryType={SearchQueryType.AlertFolder}
       {...props}
diff --git a/public/app/features/alerting/unified/components/rule-editor/VizWrapper.tsx b/public/app/features/alerting/unified/components/rule-editor/VizWrapper.tsx
index 347738dce3656..bb679e030f9a4 100644
--- a/public/app/features/alerting/unified/components/rule-editor/VizWrapper.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/VizWrapper.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import AutoSizer from 'react-virtualized-auto-sizer';
 
 import { GrafanaTheme2, isTimeSeriesFrames, PanelData, ThresholdsConfig } from '@grafana/data';
-import { GraphTresholdsStyleMode } from '@grafana/schema';
+import { GraphThresholdsStyleMode } from '@grafana/schema';
 import { useStyles2 } from '@grafana/ui';
 import appEvents from 'app/core/app_events';
 import { GraphContainer } from 'app/features/explore/Graph/GraphContainer';
@@ -15,7 +15,7 @@ import { getStatusMessage } from './util';
 interface Props {
   data: PanelData;
   thresholds?: ThresholdsConfig;
-  thresholdsType?: GraphTresholdsStyleMode;
+  thresholdsType?: GraphThresholdsStyleMode;
   onThresholdsChange?: (thresholds: ThresholdsConfig) => void;
 }
 
diff --git a/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/AlertRuleForm.tsx b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/AlertRuleForm.tsx
index d4a7990ba92a9..645320c32e7da 100644
--- a/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/AlertRuleForm.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/AlertRuleForm.tsx
@@ -1,12 +1,11 @@
 import { css } from '@emotion/css';
 import React, { useEffect, useMemo, useState } from 'react';
-import { DeepMap, FieldError, FormProvider, useForm, UseFormWatch } from 'react-hook-form';
+import { FormProvider, SubmitErrorHandler, UseFormWatch, useForm } from 'react-hook-form';
 import { Link, useParams } from 'react-router-dom';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
 import { config } from '@grafana/runtime';
-import { Button, ConfirmModal, CustomScrollbar, HorizontalGroup, Spinner, useStyles2 } from '@grafana/ui';
+import { Button, ConfirmModal, CustomScrollbar, HorizontalGroup, Spinner, Stack, useStyles2 } from '@grafana/ui';
 import { AppChromeUpdate } from 'app/core/components/AppChrome/AppChromeUpdate';
 import { useAppNotification } from 'app/core/copy/appNotification';
 import { contextSrv } from 'app/core/core';
@@ -15,17 +14,24 @@ import { useQueryParams } from 'app/core/hooks/useQueryParams';
 import { useDispatch } from 'app/types';
 import { RuleWithLocation } from 'app/types/unified-alerting';
 
-import { logInfo, LogMessages, trackNewAlerRuleFormError } from '../../../Analytics';
+import {
+  LogMessages,
+  logInfo,
+  trackAlertRuleFormError,
+  trackAlertRuleFormCancelled,
+  trackAlertRuleFormSaved,
+} from '../../../Analytics';
 import { useUnifiedAlertingSelector } from '../../../hooks/useUnifiedAlertingSelector';
 import { deleteRuleAction, saveRuleFormAction } from '../../../state/actions';
 import { RuleFormType, RuleFormValues } from '../../../types/rule-form';
 import { initialAsyncRequestState } from '../../../utils/redux';
 import {
+  MANUAL_ROUTING_KEY,
+  MINUTE,
   formValuesFromExistingRule,
   getDefaultFormValues,
   getDefaultQueries,
   ignoreHiddenQueries,
-  MINUTE,
   normalizeDefaultAnnotations,
 } from '../../../utils/rule-form';
 import * as ruleId from '../../../utils/rule-id';
@@ -110,6 +116,17 @@ export const AlertRuleForm = ({ existing, prefill }: Props) => {
       return;
     }
 
+    trackAlertRuleFormSaved({ formAction: existing ? 'update' : 'create', ruleType: values.type });
+
+    // when creating a new rule, we save the manual routing setting in local storage
+    if (!existing) {
+      if (values.manualRouting) {
+        localStorage.setItem(MANUAL_ROUTING_KEY, 'true');
+      } else {
+        localStorage.setItem(MANUAL_ROUTING_KEY, 'false');
+      }
+    }
+
     dispatch(
       saveRuleFormAction({
         values: {
@@ -145,21 +162,22 @@ export const AlertRuleForm = ({ existing, prefill }: Props) => {
     }
   };
 
-  const onInvalid = (errors: DeepMap<RuleFormValues, FieldError>): void => {
-    if (!existing) {
-      trackNewAlerRuleFormError({
-        grafana_version: config.buildInfo.version,
-        org_id: contextSrv.user.orgId,
-        user_id: contextSrv.user.id,
-        error: Object.keys(errors).toString(),
-      });
-    }
+  const onInvalid: SubmitErrorHandler<RuleFormValues> = (errors): void => {
+    trackAlertRuleFormError({
+      grafana_version: config.buildInfo.version,
+      org_id: contextSrv.user.orgId,
+      user_id: contextSrv.user.id,
+      error: Object.keys(errors).toString(),
+      formAction: existing ? 'update' : 'create',
+    });
     notifyApp.error('There are errors in the form. Please correct them and try again!');
   };
 
   const cancelRuleCreation = () => {
     logInfo(LogMessages.cancelSavingAlertRule);
+    trackAlertRuleFormCancelled({ formAction: existing ? 'update' : 'create' });
   };
+
   const evaluateEveryInForm = watch('evaluateEvery');
   useEffect(() => setEvaluateEvery(evaluateEveryInForm), [evaluateEveryInForm]);
 
@@ -241,10 +259,10 @@ export const AlertRuleForm = ({ existing, prefill }: Props) => {
                   {type === RuleFormType.cloudRecording && <RecordingRulesNameSpaceAndGroupStep />}
 
                   {/* Step 4 & 5 */}
-                  {/* Annotations only for cloud and Grafana */}
-                  {type !== RuleFormType.cloudRecording && <AnnotationsStep />}
                   {/* Notifications step*/}
                   <NotificationsStep alertUid={uidFromParams} />
+                  {/* Annotations only for cloud and Grafana */}
+                  {type !== RuleFormType.cloudRecording && <AnnotationsStep />}
                 </>
               )}
             </Stack>
diff --git a/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/ModifyExportRuleForm.tsx b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/ModifyExportRuleForm.tsx
index c503301017179..87f44a6c2b9d9 100644
--- a/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/ModifyExportRuleForm.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/ModifyExportRuleForm.tsx
@@ -2,8 +2,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { useAsync } from 'react-use';
 
-import { Stack } from '@grafana/experimental';
-import { Button, CustomScrollbar, LinkButton, LoadingPlaceholder } from '@grafana/ui';
+import { Button, CustomScrollbar, LinkButton, LoadingPlaceholder, Stack } from '@grafana/ui';
 import { useAppNotification } from 'app/core/copy/appNotification';
 import { useQueryParams } from 'app/core/hooks/useQueryParams';
 
@@ -47,6 +46,10 @@ export function ModifyExportRuleForm({ ruleForm, alertUid }: ModifyExportRuleFor
   const [conditionErrorMsg, setConditionErrorMsg] = useState('');
   const [evaluateEvery, setEvaluateEvery] = useState(ruleForm?.evaluateEvery ?? MINUTE);
 
+  const onInvalid = (): void => {
+    notifyApp.error('There are errors in the form. Please correct them and try again!');
+  };
+
   const checkAlertCondition = (msg = '') => {
     setConditionErrorMsg(msg);
   };
@@ -67,7 +70,7 @@ export function ModifyExportRuleForm({ ruleForm, alertUid }: ModifyExportRuleFor
     <LinkButton href={returnTo} key="cancel" size="sm" variant="secondary" onClick={() => submit(undefined)}>
       Cancel
     </LinkButton>,
-    <Button key="export-rule" size="sm" onClick={formAPI.handleSubmit((formValues) => submit(formValues))}>
+    <Button key="export-rule" size="sm" onClick={formAPI.handleSubmit((formValues) => submit(formValues), onInvalid)}>
       Export
     </Button>,
   ];
@@ -94,10 +97,10 @@ export function ModifyExportRuleForm({ ruleForm, alertUid }: ModifyExportRuleFor
                 />
 
                 {/* Step 4 & 5 */}
-                {/* Annotations only for cloud and Grafana */}
-                <AnnotationsStep />
                 {/* Notifications step*/}
                 <NotificationsStep alertUid={alertUid} />
+                {/* Annotations only for cloud and Grafana */}
+                <AnnotationsStep />
               </Stack>
             </CustomScrollbar>
           </div>
@@ -108,14 +111,14 @@ export function ModifyExportRuleForm({ ruleForm, alertUid }: ModifyExportRuleFor
   );
 }
 
-const useGetGroup = (nameSpace: string, group: string) => {
+const useGetGroup = (nameSpaceUID: string, group: string) => {
   const { dsFeatures } = useDataSourceFeatures(GRAFANA_RULES_SOURCE_NAME);
 
   const rulerConfig = dsFeatures?.rulerConfig;
 
   const targetGroup = useAsync(async () => {
-    return rulerConfig ? await fetchRulerRulesGroup(rulerConfig, nameSpace, group) : undefined;
-  }, [rulerConfig, nameSpace, group]);
+    return rulerConfig ? await fetchRulerRulesGroup(rulerConfig, nameSpaceUID, group) : undefined;
+  }, [rulerConfig, nameSpaceUID, group]);
 
   return targetGroup;
 };
@@ -163,7 +166,7 @@ export const getPayloadToExport = (
 };
 
 const useGetPayloadToExport = (values: RuleFormValues, uid: string) => {
-  const rulerGroupDto = useGetGroup(values.folder?.title ?? '', values.group);
+  const rulerGroupDto = useGetGroup(values.folder?.uid ?? '', values.group);
   const payload: ModifyExportPayload = useMemo(() => {
     return getPayloadToExport(uid, values, rulerGroupDto?.value);
   }, [uid, rulerGroupDto, values]);
@@ -179,11 +182,11 @@ const GrafanaRuleDesignExportPreview = ({
   const [getExport, exportData] = alertRuleApi.endpoints.exportModifiedRuleGroup.useMutation();
   const { loadingGroup, payload } = useGetPayloadToExport(exportValues, uid);
 
-  const nameSpace = exportValues.folder?.title ?? '';
+  const nameSpaceUID = exportValues.folder?.uid ?? '';
 
   useEffect(() => {
-    !loadingGroup && getExport({ payload, format: exportFormat, nameSpace: nameSpace });
-  }, [nameSpace, exportFormat, payload, getExport, loadingGroup]);
+    !loadingGroup && getExport({ payload, format: exportFormat, nameSpaceUID });
+  }, [nameSpaceUID, exportFormat, payload, getExport, loadingGroup]);
 
   if (exportData.isLoading) {
     return <LoadingPlaceholder text="Loading...." />;
diff --git a/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/AlertManagerRouting.tsx b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/AlertManagerRouting.tsx
new file mode 100644
index 0000000000000..2012a49ec4a19
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/AlertManagerRouting.tsx
@@ -0,0 +1,132 @@
+import { css } from '@emotion/css';
+import React, { useState } from 'react';
+import { useFormContext } from 'react-hook-form';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Alert, CollapsableSection, LoadingPlaceholder, Stack, useStyles2 } from '@grafana/ui';
+import { RuleFormValues } from 'app/features/alerting/unified/types/rule-form';
+import { AlertManagerDataSource } from 'app/features/alerting/unified/utils/datasource';
+
+import { ContactPointReceiverSummary } from '../../../contact-points/ContactPoints';
+import { useContactPointsWithStatus } from '../../../contact-points/useContactPoints';
+import { ContactPointWithMetadata } from '../../../contact-points/utils';
+
+import { ContactPointDetails } from './contactPoint/ContactPointDetails';
+import { ContactPointSelector } from './contactPoint/ContactPointSelector';
+import { MuteTimingFields } from './route-settings/MuteTimingFields';
+import { RoutingSettings } from './route-settings/RouteSettings';
+
+interface AlertManagerManualRoutingProps {
+  alertManager: AlertManagerDataSource;
+}
+
+export function AlertManagerManualRouting({ alertManager }: AlertManagerManualRoutingProps) {
+  const styles = useStyles2(getStyles);
+
+  const alertManagerName = alertManager.name;
+  const {
+    isLoading,
+    error: errorInContactPointStatus,
+    contactPoints,
+    refetchReceivers,
+  } = useContactPointsWithStatus({ includePoliciesCount: false, receiverStatusPollingInterval: 0 });
+  const [selectedContactPointWithMetadata, setSelectedContactPointWithMetadata] = useState<
+    ContactPointWithMetadata | undefined
+  >();
+
+  const onSelectContactPoint = (contactPoint?: ContactPointWithMetadata) => {
+    setSelectedContactPointWithMetadata(contactPoint);
+  };
+
+  const { watch } = useFormContext<RuleFormValues>();
+  const hasRouteSettings =
+    watch(`contactPoints.${alertManagerName}.overrideGrouping`) ||
+    watch(`contactPoints.${alertManagerName}.overrideTimings`) ||
+    watch(`contactPoints.${alertManagerName}.muteTimeIntervals`)?.length > 0;
+
+  const options = contactPoints.map((receiver) => {
+    const integrations = receiver?.grafana_managed_receiver_configs;
+    const description = <ContactPointReceiverSummary receivers={integrations ?? []} />;
+
+    return { label: receiver.name, value: receiver, description };
+  });
+
+  if (errorInContactPointStatus) {
+    return <Alert title="Failed to fetch contact points" severity="error" />;
+  }
+  if (isLoading) {
+    return <LoadingPlaceholder text={'Loading...'} />;
+  }
+  return (
+    <Stack direction="column">
+      <Stack direction="row" alignItems="center">
+        <div className={styles.firstAlertManagerLine}></div>
+        <div className={styles.alertManagerName}>
+          Alert manager:
+          <img src={alertManager.imgUrl} alt="Alert manager logo" className={styles.img} />
+          {alertManagerName}
+        </div>
+        <div className={styles.secondAlertManagerLine}></div>
+      </Stack>
+      <Stack direction="row" gap={1} alignItems="center">
+        <ContactPointSelector
+          alertManager={alertManagerName}
+          options={options}
+          onSelectContactPoint={onSelectContactPoint}
+          refetchReceivers={refetchReceivers}
+        />
+      </Stack>
+      {selectedContactPointWithMetadata?.grafana_managed_receiver_configs && (
+        <ContactPointDetails receivers={selectedContactPointWithMetadata.grafana_managed_receiver_configs} />
+      )}
+      <div className={styles.routingSection}>
+        <CollapsableSection
+          label="Muting, grouping and timings (optional)"
+          isOpen={hasRouteSettings}
+          className={styles.collapsableSection}
+        >
+          <Stack direction="column" gap={1}>
+            <MuteTimingFields alertManager={alertManagerName} />
+            <RoutingSettings alertManager={alertManagerName} />
+          </Stack>
+        </CollapsableSection>
+      </div>
+    </Stack>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  firstAlertManagerLine: css({
+    height: 1,
+    width: theme.spacing(4),
+    backgroundColor: theme.colors.secondary.main,
+  }),
+  alertManagerName: css({
+    with: 'fit-content',
+  }),
+  secondAlertManagerLine: css({
+    height: '1px',
+    width: '100%',
+    flex: 1,
+    backgroundColor: theme.colors.secondary.main,
+  }),
+  img: css({
+    marginLeft: theme.spacing(2),
+    width: theme.spacing(3),
+    height: theme.spacing(3),
+    marginRight: theme.spacing(1),
+  }),
+  collapsableSection: css({
+    width: 'fit-content',
+    fontSize: theme.typography.body.fontSize,
+  }),
+  routingSection: css({
+    display: 'flex',
+    flexDirection: 'column',
+    maxWidth: theme.breakpoints.values.xl,
+    border: `solid 1px ${theme.colors.border.weak}`,
+    borderRadius: theme.shape.radius.default,
+    padding: `${theme.spacing(1)} ${theme.spacing(2)}`,
+    marginTop: theme.spacing(2),
+  }),
+});
diff --git a/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/SimplifiedRouting.tsx b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/SimplifiedRouting.tsx
new file mode 100644
index 0000000000000..5b15982411ec1
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/SimplifiedRouting.tsx
@@ -0,0 +1,58 @@
+import React, { useMemo } from 'react';
+import { useFormContext } from 'react-hook-form';
+
+import { AlertmanagerProvider } from 'app/features/alerting/unified/state/AlertmanagerContext';
+import { RuleFormValues } from 'app/features/alerting/unified/types/rule-form';
+import { getAlertManagerDataSourcesByPermission } from 'app/features/alerting/unified/utils/datasource';
+
+import { AlertManagerManualRouting } from './AlertManagerRouting';
+
+export function SimplifiedRouting() {
+  const { getValues } = useFormContext<RuleFormValues>();
+  const contactPointsInAlert = getValues('contactPoints');
+
+  const allAlertManagersByPermission = getAlertManagerDataSourcesByPermission('notification');
+
+  // We decided to only show internal alert manager for now. Once we want to show external alert managers we can use this code
+  // const alertManagersDataSources = allAlertManagersByPermission.availableInternalDataSources.concat(
+  //   allAlertManagersByPermission.availableExternalDataSources
+  // );
+
+  const alertManagersDataSources = allAlertManagersByPermission.availableInternalDataSources;
+
+  const alertManagersDataSourcesWithConfigAPI = alertManagersDataSources.filter((am) => am.hasConfigurationAPI);
+
+  // we merge the selected contact points data for each alert manager, with the alert manager meta data
+  const alertManagersWithSelectedContactPoints = useMemo(
+    () =>
+      alertManagersDataSourcesWithConfigAPI.map((am) => {
+        const selectedContactPoint = contactPointsInAlert ? contactPointsInAlert[am.name] : undefined;
+        return {
+          alertManager: am,
+          selectedContactPoint: selectedContactPoint?.selectedContactPoint ?? '',
+          routeSettings: {
+            muteTimeIntervals: selectedContactPoint?.muteTimeIntervals ?? [],
+            overrideGrouping: selectedContactPoint?.overrideGrouping ?? false,
+            groupBy: selectedContactPoint?.groupBy ?? [],
+            overrideTimings: selectedContactPoint?.overrideTimings ?? false,
+            groupWaitValue: selectedContactPoint?.groupWaitValue ?? '',
+            groupIntervalValue: selectedContactPoint?.groupIntervalValue ?? '',
+            repeatIntervalValue: selectedContactPoint?.repeatIntervalValue ?? '',
+          },
+        };
+      }),
+    [alertManagersDataSourcesWithConfigAPI, contactPointsInAlert]
+  );
+
+  return alertManagersWithSelectedContactPoints.map((alertManagerContactPoint, index) => {
+    return (
+      <AlertmanagerProvider
+        accessType={'notification'}
+        alertmanagerSourceName={alertManagerContactPoint.alertManager.name}
+        key={alertManagerContactPoint.alertManager.name + index}
+      >
+        <AlertManagerManualRouting alertManager={alertManagerContactPoint.alertManager} />
+      </AlertmanagerProvider>
+    );
+  });
+}
diff --git a/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/SimplifiedRuleEditor.test.tsx b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/SimplifiedRuleEditor.test.tsx
new file mode 100644
index 0000000000000..2472e9ae7be94
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/SimplifiedRuleEditor.test.tsx
@@ -0,0 +1,434 @@
+import { render, screen, waitFor, waitForElementToBeRemoved } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { Route } from 'react-router-dom';
+import { TestProvider } from 'test/helpers/TestProvider';
+import { ui } from 'test/helpers/alertingRuleEditor';
+import { clickSelectOption } from 'test/helpers/selectOptionInTest';
+import { byRole } from 'testing-library-selector';
+
+import { config, locationService, setDataSourceSrv } from '@grafana/runtime';
+import { contextSrv } from 'app/core/services/context_srv';
+import RuleEditor from 'app/features/alerting/unified/RuleEditor';
+import { discoverFeatures } from 'app/features/alerting/unified/api/buildInfo';
+import {
+  fetchRulerRules,
+  fetchRulerRulesGroup,
+  fetchRulerRulesNamespace,
+  setRulerRuleGroup,
+} from 'app/features/alerting/unified/api/ruler';
+import * as useContactPoints from 'app/features/alerting/unified/components/contact-points/useContactPoints';
+import * as dsByPermission from 'app/features/alerting/unified/hooks/useAlertManagerSources';
+import { MockDataSourceSrv, grantUserPermissions, mockDataSource } from 'app/features/alerting/unified/mocks';
+import { AlertmanagerProvider } from 'app/features/alerting/unified/state/AlertmanagerContext';
+import { fetchRulerRulesIfNotFetchedYet } from 'app/features/alerting/unified/state/actions';
+import * as utils_config from 'app/features/alerting/unified/utils/config';
+import {
+  AlertManagerDataSource,
+  DataSourceType,
+  GRAFANA_DATASOURCE_NAME,
+  GRAFANA_RULES_SOURCE_NAME,
+  getAlertManagerDataSourcesByPermission,
+  useGetAlertManagerDataSourcesByPermissionAndConfig,
+} from 'app/features/alerting/unified/utils/datasource';
+import { getDefaultQueries } from 'app/features/alerting/unified/utils/rule-form';
+import { searchFolders } from 'app/features/manage-dashboards/state/actions';
+import { DashboardSearchHit, DashboardSearchItemType } from 'app/features/search/types';
+import { AccessControlAction } from 'app/types';
+import { GrafanaAlertStateDecision, PromApplication } from 'app/types/unified-alerting-dto';
+
+import { RECEIVER_META_KEY } from '../../../contact-points/useContactPoints';
+import { ContactPointWithMetadata } from '../../../contact-points/utils';
+import { ExpressionEditorProps } from '../../ExpressionEditor';
+
+jest.mock('app/features/alerting/unified/components/rule-editor/ExpressionEditor', () => ({
+  // eslint-disable-next-line react/display-name
+  ExpressionEditor: ({ value, onChange }: ExpressionEditorProps) => (
+    <input value={value} data-testid="expr" onChange={(e) => onChange(e.target.value)} />
+  ),
+}));
+
+jest.mock('app/features/alerting/unified/api/buildInfo');
+jest.mock('app/features/alerting/unified/api/ruler');
+jest.mock('app/features/manage-dashboards/state/actions');
+
+jest.mock('app/core/components/AppChrome/AppChromeUpdate', () => ({
+  AppChromeUpdate: ({ actions }: { actions: React.ReactNode }) => <div>{actions}</div>,
+}));
+
+// there's no angular scope in test and things go terribly wrong when trying to render the query editor row.
+// lets just skip it
+jest.mock('app/features/query/components/QueryEditorRow', () => ({
+  // eslint-disable-next-line react/display-name
+  QueryEditorRow: () => <p>hi</p>,
+}));
+
+// simplified routing mocks
+const grafanaAlertManagerDataSource: AlertManagerDataSource = {
+  name: GRAFANA_RULES_SOURCE_NAME,
+  imgUrl: 'public/img/grafana_icon.svg',
+  hasConfigurationAPI: true,
+};
+jest.mock('app/features/alerting/unified/utils/datasource', () => {
+  return {
+    ...jest.requireActual('app/features/alerting/unified/utils/datasource'),
+    getAlertManagerDataSourcesByPermission: jest.fn(),
+    useGetAlertManagerDataSourcesByPermissionAndConfig: jest.fn(),
+    getAlertmanagerDataSourceByName: jest.fn(),
+  };
+});
+
+const user = userEvent.setup();
+
+jest.spyOn(utils_config, 'getAllDataSources');
+jest.spyOn(dsByPermission, 'useAlertManagersByPermission');
+jest.spyOn(useContactPoints, 'useContactPointsWithStatus');
+
+jest.setTimeout(60 * 1000);
+
+const mocks = {
+  getAllDataSources: jest.mocked(utils_config.getAllDataSources),
+  searchFolders: jest.mocked(searchFolders),
+  useContactPointsWithStatus: jest.mocked(useContactPoints.useContactPointsWithStatus),
+  useGetAlertManagerDataSourcesByPermissionAndConfig: jest.mocked(useGetAlertManagerDataSourcesByPermissionAndConfig),
+  getAlertManagerDataSourcesByPermission: jest.mocked(getAlertManagerDataSourcesByPermission),
+  api: {
+    discoverFeatures: jest.mocked(discoverFeatures),
+    fetchRulerRulesGroup: jest.mocked(fetchRulerRulesGroup),
+    setRulerRuleGroup: jest.mocked(setRulerRuleGroup),
+    fetchRulerRulesNamespace: jest.mocked(fetchRulerRulesNamespace),
+    fetchRulerRules: jest.mocked(fetchRulerRules),
+    fetchRulerRulesIfNotFetchedYet: jest.mocked(fetchRulerRulesIfNotFetchedYet),
+  },
+};
+
+describe('Can create a new grafana managed alert unsing simplified routing', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    contextSrv.isEditor = true;
+    contextSrv.hasEditPermissionInFolders = true;
+    grantUserPermissions([
+      AccessControlAction.AlertingRuleRead,
+      AccessControlAction.AlertingRuleUpdate,
+      AccessControlAction.AlertingRuleDelete,
+      AccessControlAction.AlertingRuleCreate,
+      AccessControlAction.DataSourcesRead,
+      AccessControlAction.DataSourcesWrite,
+      AccessControlAction.DataSourcesCreate,
+      AccessControlAction.FoldersWrite,
+      AccessControlAction.FoldersRead,
+      AccessControlAction.AlertingRuleExternalRead,
+      AccessControlAction.AlertingRuleExternalWrite,
+      AccessControlAction.AlertingNotificationsRead,
+      AccessControlAction.AlertingNotificationsWrite,
+    ]);
+    mocks.getAlertManagerDataSourcesByPermission.mockReturnValue({
+      availableInternalDataSources: [grafanaAlertManagerDataSource],
+      availableExternalDataSources: [],
+    });
+
+    mocks.useGetAlertManagerDataSourcesByPermissionAndConfig.mockReturnValue([grafanaAlertManagerDataSource]);
+
+    jest.mocked(dsByPermission.useAlertManagersByPermission).mockReturnValue({
+      availableInternalDataSources: [grafanaAlertManagerDataSource],
+      availableExternalDataSources: [],
+    });
+  });
+
+  const dataSources = {
+    default: mockDataSource(
+      {
+        type: 'prometheus',
+        name: 'Prom',
+        isDefault: true,
+      },
+      { alerting: false }
+    ),
+    am: mockDataSource({
+      name: 'Alertmanager',
+      type: DataSourceType.Alertmanager,
+    }),
+  };
+
+  it('cannot create new grafana managed alert when using simplified routing and not selecting a contact point', async () => {
+    // no contact points found
+    mocks.useContactPointsWithStatus.mockReturnValue({
+      contactPoints: [],
+      isLoading: false,
+      error: undefined,
+      refetchReceivers: jest.fn(),
+    });
+
+    setDataSourceSrv(new MockDataSourceSrv(dataSources));
+    mocks.getAllDataSources.mockReturnValue(Object.values(dataSources));
+    mocks.api.setRulerRuleGroup.mockResolvedValue();
+    mocks.api.fetchRulerRulesNamespace.mockResolvedValue([]);
+    mocks.api.fetchRulerRulesGroup.mockResolvedValue({
+      name: 'group2',
+      rules: [],
+    });
+    mocks.api.fetchRulerRules.mockResolvedValue({
+      'Folder A': [
+        {
+          interval: '1m',
+          name: 'group1',
+          rules: [
+            {
+              annotations: { description: 'some description', summary: 'some summary' },
+              labels: { severity: 'warn', team: 'the a-team' },
+              for: '5m',
+              grafana_alert: {
+                uid: '23',
+                namespace_uid: 'abcd',
+                condition: 'B',
+                data: getDefaultQueries(),
+                exec_err_state: GrafanaAlertStateDecision.Error,
+                no_data_state: GrafanaAlertStateDecision.NoData,
+                title: 'my great new rule',
+              },
+            },
+          ],
+        },
+      ],
+      namespace2: [
+        {
+          interval: '1m',
+          name: 'group1',
+          rules: [
+            {
+              annotations: { description: 'some description', summary: 'some summary' },
+              labels: { severity: 'warn', team: 'the a-team' },
+              for: '5m',
+              grafana_alert: {
+                uid: '23',
+                namespace_uid: 'b',
+                condition: 'B',
+                data: getDefaultQueries(),
+                exec_err_state: GrafanaAlertStateDecision.Error,
+                no_data_state: GrafanaAlertStateDecision.NoData,
+                title: 'my great new rule',
+              },
+            },
+          ],
+        },
+      ],
+    });
+    mocks.searchFolders.mockResolvedValue([
+      {
+        title: 'Folder A',
+        uid: 'abcd',
+        id: 1,
+        type: DashboardSearchItemType.DashDB,
+      },
+      {
+        title: 'Folder B',
+        id: 2,
+      },
+      {
+        title: 'Folder / with slash',
+        id: 2,
+        uid: 'b',
+        type: DashboardSearchItemType.DashDB,
+      },
+    ] as DashboardSearchHit[]);
+
+    mocks.api.discoverFeatures.mockResolvedValue({
+      application: PromApplication.Prometheus,
+      features: {
+        rulerApiEnabled: false,
+      },
+    });
+    config.featureToggles.alertingSimplifiedRouting = true;
+    renderSimplifiedRuleEditor();
+    await waitForElementToBeRemoved(screen.getAllByTestId('Spinner'));
+
+    await user.type(await ui.inputs.name.find(), 'my great new rule');
+
+    const folderInput = await ui.inputs.folder.find();
+    await clickSelectOption(folderInput, 'Folder A');
+    const groupInput = await ui.inputs.group.find();
+    await user.click(byRole('combobox').get(groupInput));
+    await clickSelectOption(groupInput, 'group1');
+    //select contact point routing
+    await user.click(ui.inputs.simplifiedRouting.contactPointRouting.get());
+    // do not select a contact point
+    // save and check that call to backend was not made
+    await user.click(ui.buttons.saveAndExit.get());
+    await waitFor(() => {
+      expect(screen.getByText('Contact point is required.')).toBeInTheDocument();
+      expect(mocks.api.setRulerRuleGroup).not.toHaveBeenCalled();
+    });
+  });
+
+  it('can create new grafana managed alert when using simplified routing and selecting a contact point', async () => {
+    const contactPointsAvailable: ContactPointWithMetadata[] = [
+      {
+        name: 'contact_point1',
+        grafana_managed_receiver_configs: [
+          {
+            name: 'contact_point1',
+            type: 'email',
+            disableResolveMessage: false,
+            [RECEIVER_META_KEY]: {
+              name: 'contact_point1',
+              description: 'contact_point1 description',
+            },
+            settings: {},
+          },
+        ],
+        policies: [],
+      },
+    ];
+    mocks.useContactPointsWithStatus.mockReturnValue({
+      contactPoints: contactPointsAvailable,
+      isLoading: false,
+      error: undefined,
+      refetchReceivers: jest.fn(),
+    });
+
+    setDataSourceSrv(new MockDataSourceSrv(dataSources));
+    mocks.getAllDataSources.mockReturnValue(Object.values(dataSources));
+    mocks.api.setRulerRuleGroup.mockResolvedValue();
+    mocks.api.fetchRulerRulesNamespace.mockResolvedValue([]);
+    mocks.api.fetchRulerRulesGroup.mockResolvedValue({
+      name: 'group2',
+      rules: [],
+    });
+    mocks.api.fetchRulerRules.mockResolvedValue({
+      'Folder A': [
+        {
+          interval: '1m',
+          name: 'group1',
+          rules: [
+            {
+              annotations: { description: 'some description', summary: 'some summary' },
+              labels: { severity: 'warn', team: 'the a-team' },
+              for: '5m',
+              grafana_alert: {
+                uid: '23',
+                namespace_uid: 'abcd',
+                condition: 'B',
+                data: getDefaultQueries(),
+                exec_err_state: GrafanaAlertStateDecision.Error,
+                no_data_state: GrafanaAlertStateDecision.NoData,
+                title: 'my great new rule',
+              },
+            },
+          ],
+        },
+      ],
+      namespace2: [
+        {
+          interval: '1m',
+          name: 'group1',
+          rules: [
+            {
+              annotations: { description: 'some description', summary: 'some summary' },
+              labels: { severity: 'warn', team: 'the a-team' },
+              for: '5m',
+              grafana_alert: {
+                uid: '23',
+                namespace_uid: 'b',
+                condition: 'B',
+                data: getDefaultQueries(),
+                exec_err_state: GrafanaAlertStateDecision.Error,
+                no_data_state: GrafanaAlertStateDecision.NoData,
+                title: 'my great new rule',
+              },
+            },
+          ],
+        },
+      ],
+    });
+    mocks.searchFolders.mockResolvedValue([
+      {
+        title: 'Folder A',
+        uid: 'abcd',
+        id: 1,
+        type: DashboardSearchItemType.DashDB,
+      },
+      {
+        title: 'Folder B',
+        id: 2,
+        uid: 'b',
+        type: DashboardSearchItemType.DashDB,
+      },
+      {
+        title: 'Folder / with slash',
+        uid: 'c',
+        id: 2,
+        type: DashboardSearchItemType.DashDB,
+      },
+    ] as DashboardSearchHit[]);
+
+    mocks.api.discoverFeatures.mockResolvedValue({
+      application: PromApplication.Prometheus,
+      features: {
+        rulerApiEnabled: false,
+      },
+    });
+    config.featureToggles.alertingSimplifiedRouting = true;
+    renderSimplifiedRuleEditor();
+    await waitForElementToBeRemoved(screen.getAllByTestId('Spinner'));
+
+    await user.type(await ui.inputs.name.find(), 'my great new rule');
+
+    const folderInput = await ui.inputs.folder.find();
+    await clickSelectOption(folderInput, 'Folder A');
+    const groupInput = await ui.inputs.group.find();
+    await user.click(byRole('combobox').get(groupInput));
+    await clickSelectOption(groupInput, 'group1');
+    //select contact point routing
+    await user.click(ui.inputs.simplifiedRouting.contactPointRouting.get());
+    const contactPointInput = await ui.inputs.simplifiedRouting.contactPoint.find();
+    await user.click(byRole('combobox').get(contactPointInput));
+    await clickSelectOption(contactPointInput, 'contact_point1');
+
+    // save and check what was sent to backend
+    await user.click(ui.buttons.saveAndExit.get());
+    await waitFor(() => expect(mocks.api.setRulerRuleGroup).toHaveBeenCalled());
+    expect(mocks.api.setRulerRuleGroup).toHaveBeenCalledWith(
+      { dataSourceName: GRAFANA_RULES_SOURCE_NAME, apiVersion: 'legacy' },
+      'abcd',
+      {
+        interval: '1m',
+        name: 'group1',
+        rules: [
+          {
+            annotations: {},
+            labels: {},
+            for: '5m',
+            grafana_alert: {
+              condition: 'B',
+              data: getDefaultQueries(),
+              exec_err_state: GrafanaAlertStateDecision.Error,
+              is_paused: false,
+              no_data_state: 'NoData',
+              title: 'my great new rule',
+              notification_settings: {
+                group_by: undefined,
+                group_interval: undefined,
+                group_wait: undefined,
+                mute_timings: undefined,
+                receiver: 'contact_point1',
+                repeat_interval: undefined,
+              },
+            },
+          },
+        ],
+      }
+    );
+  });
+});
+
+function renderSimplifiedRuleEditor() {
+  locationService.push(`/alerting/new/alerting`);
+
+  return render(
+    <TestProvider>
+      <AlertmanagerProvider alertmanagerSourceName={GRAFANA_DATASOURCE_NAME} accessType="notification">
+        <Route path={['/alerting/new/:type', '/alerting/:id/edit']} component={RuleEditor} />
+      </AlertmanagerProvider>
+    </TestProvider>
+  );
+}
diff --git a/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/contactPoint/ContactPointDetails.tsx b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/contactPoint/ContactPointDetails.tsx
new file mode 100644
index 0000000000000..251b6a6095e40
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/contactPoint/ContactPointDetails.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+
+import { Stack } from '@grafana/ui';
+
+import { ContactPointReceiverTitleRow } from '../../../../contact-points/ContactPoints';
+import { RECEIVER_META_KEY, RECEIVER_PLUGIN_META_KEY } from '../../../../contact-points/useContactPoints';
+import { ReceiverConfigWithMetadata, getReceiverDescription } from '../../../../contact-points/utils';
+
+interface ContactPointDetailsProps {
+  receivers: ReceiverConfigWithMetadata[];
+}
+
+export const ContactPointDetails = ({ receivers }: ContactPointDetailsProps) => {
+  return (
+    <Stack direction="column" gap={0}>
+      <div>
+        {receivers.map((receiver, index) => {
+          const metadata = receiver[RECEIVER_META_KEY];
+          const pluginMetadata = receiver[RECEIVER_PLUGIN_META_KEY];
+          const key = metadata.name + index;
+          return (
+            <ContactPointReceiverTitleRow
+              key={key}
+              name={metadata.name}
+              type={receiver.type}
+              description={getReceiverDescription(receiver)}
+              pluginMetadata={pluginMetadata}
+            />
+          );
+        })}
+      </div>
+    </Stack>
+  );
+};
diff --git a/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/contactPoint/ContactPointSelector.tsx b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/contactPoint/ContactPointSelector.tsx
new file mode 100644
index 0000000000000..7914bd495b036
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/contactPoint/ContactPointSelector.tsx
@@ -0,0 +1,188 @@
+import { css, cx } from '@emotion/css';
+import React, { useCallback, useEffect, useState } from 'react';
+import { useFormContext, Controller } from 'react-hook-form';
+
+import { GrafanaTheme2, SelectableValue } from '@grafana/data';
+import {
+  ActionMeta,
+  Field,
+  FieldValidationMessage,
+  IconButton,
+  Select,
+  Stack,
+  TextLink,
+  useStyles2,
+} from '@grafana/ui';
+import { RuleFormValues } from 'app/features/alerting/unified/types/rule-form';
+import { createUrl } from 'app/features/alerting/unified/utils/url';
+
+import { ContactPointWithMetadata } from '../../../../contact-points/utils';
+
+export interface ContactPointSelectorProps {
+  alertManager: string;
+  options: Array<{
+    label: string;
+    value: ContactPointWithMetadata;
+    description: React.JSX.Element;
+  }>;
+  onSelectContactPoint: (contactPoint?: ContactPointWithMetadata) => void;
+  refetchReceivers: () => Promise<unknown>;
+}
+
+const MAX_CONTACT_POINTS_RENDERED = 500;
+
+export function ContactPointSelector({
+  alertManager,
+  options,
+  onSelectContactPoint,
+  refetchReceivers,
+}: ContactPointSelectorProps) {
+  const styles = useStyles2(getStyles);
+  const { control, watch, trigger } = useFormContext<RuleFormValues>();
+
+  const contactPointInForm = watch(`contactPoints.${alertManager}.selectedContactPoint`);
+
+  const selectedContactPointWithMetadata = options.find((option) => option.value.name === contactPointInForm)?.value;
+  const selectedContactPointSelectableValue: SelectableValue<ContactPointWithMetadata> =
+    selectedContactPointWithMetadata
+      ? { value: selectedContactPointWithMetadata, label: selectedContactPointWithMetadata.name }
+      : { value: undefined, label: '' };
+
+  const LOADING_SPINNER_DURATION = 1000;
+
+  const [loadingContactPoints, setLoadingContactPoints] = useState(false);
+  // we need to keep track if the fetching takes more than 1 second, so we can show the loading spinner until the fetching is done
+  const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
+
+  // if we have a contact point selected, check if it still exists in the event that someone has deleted it
+  const validateContactPoint = useCallback(() => {
+    if (contactPointInForm) {
+      trigger(`contactPoints.${alertManager}.selectedContactPoint`, { shouldFocus: true });
+    }
+  }, [alertManager, contactPointInForm, trigger]);
+
+  const onClickRefresh = () => {
+    setLoadingContactPoints(true);
+    Promise.all([refetchReceivers(), sleep(LOADING_SPINNER_DURATION)]).finally(() => {
+      setLoadingContactPoints(false);
+      validateContactPoint();
+    });
+  };
+
+  // validate the contact point and check if it still exists when mounting the component
+  useEffect(() => {
+    validateContactPoint();
+  }, [validateContactPoint]);
+
+  return (
+    <Stack direction="column">
+      <Stack direction="row" alignItems="center">
+        <Field label="Contact point" data-testid="contact-point-picker">
+          <Controller
+            render={({ field: { onChange, ref, ...field }, fieldState: { error } }) => (
+              <>
+                <div className={styles.contactPointsSelector}>
+                  <Select<ContactPointWithMetadata>
+                    virtualized={options.length > MAX_CONTACT_POINTS_RENDERED}
+                    aria-label="Contact point"
+                    defaultValue={selectedContactPointSelectableValue}
+                    onChange={(value: SelectableValue<ContactPointWithMetadata>, _: ActionMeta) => {
+                      onChange(value?.value?.name);
+                      onSelectContactPoint(value?.value);
+                    }}
+                    // We are passing a JSX.Element into the "description" for options, which isn't how the TS typings are defined.
+                    // The regular Select component will render it just fine, but we can't update the typings because SelectableValue
+                    // is shared with other components where the "description" _has_ to be a string.
+                    // I've tried unsuccessfully to separate the typings just I'm giving up :'(
+                    // @ts-ignore
+                    options={options}
+                    width={50}
+                  />
+                  <div className={styles.contactPointsInfo}>
+                    <IconButton
+                      name="sync"
+                      onClick={onClickRefresh}
+                      aria-label="Refresh contact points"
+                      tooltip="Refresh contact points list"
+                      className={cx(styles.refreshButton, {
+                        [styles.loading]: loadingContactPoints,
+                      })}
+                    />
+                    <LinkToContactPoints />
+                  </div>
+                </div>
+
+                {/* Error can come from the required validation we have in here, or from the manual setError we do in the parent component.
+                The only way I found to check the custom error is to check if the field has a value and if it's not in the options. */}
+
+                {error && <FieldValidationMessage>{error?.message}</FieldValidationMessage>}
+              </>
+            )}
+            rules={{
+              required: {
+                value: true,
+                message: 'Contact point is required.',
+              },
+              validate: {
+                contactPointExists: (value: string) => {
+                  if (options.some((option) => option.value.name === value)) {
+                    return true;
+                  }
+                  return `Contact point ${contactPointInForm} does not exist.`;
+                },
+              },
+            }}
+            control={control}
+            name={`contactPoints.${alertManager}.selectedContactPoint`}
+          />
+        </Field>
+      </Stack>
+    </Stack>
+  );
+}
+function LinkToContactPoints() {
+  const hrefToContactPoints = '/alerting/notifications';
+  return (
+    <TextLink external href={createUrl(hrefToContactPoints)} aria-label="View or create contact points">
+      View or create contact points
+    </TextLink>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  contactPointsSelector: css({
+    display: 'flex',
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: theme.spacing(1),
+    marginTop: theme.spacing(1),
+  }),
+  contactPointsInfo: css({
+    display: 'flex',
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'center',
+    gap: theme.spacing(1),
+  }),
+  refreshButton: css({
+    color: theme.colors.text.secondary,
+    cursor: 'pointer',
+    borderRadius: theme.shape.radius.circle,
+    overflow: 'hidden',
+  }),
+  loading: css({
+    pointerEvents: 'none',
+    animation: 'rotation 2s infinite linear',
+    '@keyframes rotation': {
+      from: {
+        transform: 'rotate(720deg)',
+      },
+      to: {
+        transform: 'rotate(0deg)',
+      },
+    },
+  }),
+  warn: css({
+    color: theme.colors.warning.text,
+  }),
+});
diff --git a/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/route-settings/MuteTimingFields.tsx b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/route-settings/MuteTimingFields.tsx
new file mode 100644
index 0000000000000..d52230f4e9482
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/route-settings/MuteTimingFields.tsx
@@ -0,0 +1,66 @@
+import React from 'react';
+import { useFormContext, Controller } from 'react-hook-form';
+
+import { SelectableValue } from '@grafana/data';
+import { Field, MultiSelect, useStyles2 } from '@grafana/ui';
+import { alertmanagerApi } from 'app/features/alerting/unified/api/alertmanagerApi';
+import { RuleFormValues } from 'app/features/alerting/unified/types/rule-form';
+import { timeIntervalToString } from 'app/features/alerting/unified/utils/alertmanager';
+import { mapMultiSelectValueToStrings } from 'app/features/alerting/unified/utils/amroutes';
+
+import { getFormStyles } from '../../../../notification-policies/formStyles';
+
+export interface MuteTimingFieldsProps {
+  alertManager: string;
+}
+
+export function MuteTimingFields({ alertManager }: MuteTimingFieldsProps) {
+  const styles = useStyles2(getFormStyles);
+  const {
+    control,
+    formState: { errors },
+  } = useFormContext<RuleFormValues>();
+
+  const muteTimingOptions = useSelectableMuteTimings();
+  return (
+    <Field
+      label="Mute timings"
+      data-testid="am-mute-timing-select"
+      description="Select a mute timing to define when not to send notifications for this alert rule"
+      invalid={!!errors.contactPoints?.[alertManager]?.muteTimeIntervals}
+    >
+      <Controller
+        render={({ field: { onChange, ref, ...field } }) => (
+          <MultiSelect
+            aria-label="Mute timings"
+            {...field}
+            className={styles.input}
+            onChange={(value) => onChange(mapMultiSelectValueToStrings(value))}
+            options={muteTimingOptions}
+            placeholder="Select mute timings..."
+          />
+        )}
+        control={control}
+        name={`contactPoints.${alertManager}.muteTimeIntervals`}
+      />
+    </Field>
+  );
+}
+
+function useSelectableMuteTimings(): Array<SelectableValue<string>> {
+  const fetchGrafanaMuteTimings = alertmanagerApi.endpoints.getMuteTimingList.useQuery(undefined, {
+    refetchOnFocus: true,
+    refetchOnReconnect: true,
+    selectFromResult: (result) => ({
+      ...result,
+      mutetimings: result.data
+        ? result.data.map((value) => ({
+            value: value.name,
+            label: value.name,
+            description: value.time_intervals.map((interval) => timeIntervalToString(interval)).join(', AND '),
+          }))
+        : [],
+    }),
+  });
+  return fetchGrafanaMuteTimings.mutetimings;
+}
diff --git a/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/route-settings/RouteSettings.tsx b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/route-settings/RouteSettings.tsx
new file mode 100644
index 0000000000000..82861c08d0efe
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/route-settings/RouteSettings.tsx
@@ -0,0 +1,169 @@
+import { css } from '@emotion/css';
+import React, { useEffect, useState } from 'react';
+import { useFormContext, Controller } from 'react-hook-form';
+
+import { GrafanaTheme2, SelectableValue } from '@grafana/data';
+import { Field, FieldValidationMessage, InlineField, MultiSelect, Stack, Switch, Text, useStyles2 } from '@grafana/ui';
+import { MultiValueRemove, MultiValueRemoveProps } from '@grafana/ui/src/components/Select/MultiValue';
+import { RuleFormValues } from 'app/features/alerting/unified/types/rule-form';
+import {
+  commonGroupByOptions,
+  mapMultiSelectValueToStrings,
+  stringToSelectableValue,
+  stringsToSelectableValues,
+} from 'app/features/alerting/unified/utils/amroutes';
+
+import { getFormStyles } from '../../../../notification-policies/formStyles';
+import { TIMING_OPTIONS_DEFAULTS } from '../../../../notification-policies/timingOptions';
+
+import { RouteTimings } from './RouteTimings';
+
+const REQUIRED_FIELDS_IN_GROUPBY = ['grafana_folder', 'alertname'];
+
+const DEFAULTS_TIMINGS = {
+  groupWaitValue: TIMING_OPTIONS_DEFAULTS.group_wait,
+  groupIntervalValue: TIMING_OPTIONS_DEFAULTS.group_interval,
+  repeatIntervalValue: TIMING_OPTIONS_DEFAULTS.repeat_interval,
+};
+const DISABLE_GROUPING = '...';
+
+export interface RoutingSettingsProps {
+  alertManager: string;
+}
+export const RoutingSettings = ({ alertManager }: RoutingSettingsProps) => {
+  const formStyles = useStyles2(getFormStyles);
+  const {
+    control,
+    watch,
+    register,
+    setValue,
+    formState: { errors },
+  } = useFormContext<RuleFormValues>();
+  const [groupByOptions, setGroupByOptions] = useState(stringsToSelectableValues([]));
+  const { groupIntervalValue, groupWaitValue, repeatIntervalValue } = DEFAULTS_TIMINGS;
+  const overrideGrouping = watch(`contactPoints.${alertManager}.overrideGrouping`);
+  const overrideTimings = watch(`contactPoints.${alertManager}.overrideTimings`);
+  const groupByCount = watch(`contactPoints.${alertManager}.groupBy`)?.length ?? 0;
+
+  const styles = useStyles2(getStyles);
+  useEffect(() => {
+    if (overrideGrouping && groupByCount === 0) {
+      setValue(`contactPoints.${alertManager}.groupBy`, REQUIRED_FIELDS_IN_GROUPBY);
+    }
+  }, [overrideGrouping, setValue, alertManager, groupByCount]);
+
+  return (
+    <Stack direction="column">
+      <Stack direction="row" gap={1} alignItems="center" justifyContent="space-between">
+        <InlineField label="Override grouping" transparent={true} className={styles.switchElement}>
+          <Switch id="override-grouping-toggle" {...register(`contactPoints.${alertManager}.overrideGrouping`)} />
+        </InlineField>
+        {!overrideGrouping && (
+          <Text variant="body" color="secondary">
+            Grouping: <strong>{REQUIRED_FIELDS_IN_GROUPBY.join(', ')}</strong>
+          </Text>
+        )}
+      </Stack>
+      {overrideGrouping && (
+        <Field
+          label="Group by"
+          description="Group alerts when you receive a notification based on labels. If empty it will be inherited from the default notification policy."
+          {...register(`contactPoints.${alertManager}.groupBy`)}
+          invalid={!!errors.contactPoints?.[alertManager]?.groupBy}
+          className={styles.optionalContent}
+        >
+          <Controller
+            rules={{
+              validate: (value: string[]) => {
+                if (!value || value.length === 0) {
+                  return 'At least one group by option is required.';
+                }
+                if (value.length === 1 && value[0] === DISABLE_GROUPING) {
+                  return true;
+                }
+                // we need to make sure that the required fields are included
+                const requiredFieldsIncluded = REQUIRED_FIELDS_IN_GROUPBY.every((field) => value.includes(field));
+                if (!requiredFieldsIncluded) {
+                  return `Group by must include ${REQUIRED_FIELDS_IN_GROUPBY.join(', ')}`;
+                }
+                return true;
+              },
+            }}
+            render={({ field: { onChange, ref, ...field }, fieldState: { error } }) => (
+              <>
+                <MultiSelect
+                  aria-label="Group by"
+                  {...field}
+                  allowCustomValue
+                  className={formStyles.input}
+                  onCreateOption={(opt: string) => {
+                    setGroupByOptions((opts) => [...opts, stringToSelectableValue(opt)]);
+
+                    // @ts-ignore-check: react-hook-form made me do this
+                    setValue(`contactPoints.${alertManager}.groupBy`, [...field.value, opt]);
+                  }}
+                  onChange={(value) => {
+                    return onChange(mapMultiSelectValueToStrings(value));
+                  }}
+                  options={[...commonGroupByOptions, ...groupByOptions]}
+                  components={{
+                    MultiValueRemove(
+                      props: React.PropsWithChildren<
+                        MultiValueRemoveProps &
+                          Array<SelectableValue<string>> & {
+                            data: {
+                              label: string;
+                              value: string;
+                              isFixed: boolean;
+                            };
+                          }
+                      >
+                    ) {
+                      const { data } = props;
+                      if (data.isFixed) {
+                        return null;
+                      }
+                      return MultiValueRemove(props);
+                    },
+                  }}
+                />
+                {error && <FieldValidationMessage>{error.message}</FieldValidationMessage>}
+              </>
+            )}
+            name={`contactPoints.${alertManager}.groupBy`}
+            control={control}
+          />
+        </Field>
+      )}
+      <Stack direction="row" gap={1} alignItems="center" justifyContent="space-between">
+        <InlineField label="Override timings" transparent={true} className={styles.switchElement}>
+          <Switch id="override-timings-toggle" {...register(`contactPoints.${alertManager}.overrideTimings`)} />
+        </InlineField>
+        {!overrideTimings && (
+          <Text variant="body" color="secondary">
+            Group wait: <strong>{groupWaitValue}, </strong>
+            Group interval: <strong>{groupIntervalValue}, </strong>
+            Repeat interval: <strong>{repeatIntervalValue}</strong>
+          </Text>
+        )}
+      </Stack>
+      {overrideTimings && (
+        <div className={styles.optionalContent}>
+          <RouteTimings alertManager={alertManager} />
+        </div>
+      )}
+    </Stack>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  switchElement: css({
+    flexFlow: 'row-reverse',
+    gap: theme.spacing(1),
+    alignItems: 'center',
+  }),
+  optionalContent: css({
+    marginLeft: '49px',
+    marginBottom: theme.spacing(1),
+  }),
+});
diff --git a/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/route-settings/RouteTimings.tsx b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/route-settings/RouteTimings.tsx
new file mode 100644
index 0000000000000..02eb7e4ede426
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/route-settings/RouteTimings.tsx
@@ -0,0 +1,74 @@
+import React from 'react';
+import { useFormContext } from 'react-hook-form';
+
+import { Field, useStyles2 } from '@grafana/ui';
+import { RuleFormValues } from 'app/features/alerting/unified/types/rule-form';
+import { promDurationValidator, repeatIntervalValidator } from 'app/features/alerting/unified/utils/amroutes';
+
+import { PromDurationInput } from '../../../../notification-policies/PromDurationInput';
+import { getFormStyles } from '../../../../notification-policies/formStyles';
+import { routeTimingsFields } from '../../../../notification-policies/routeTimingsFields';
+import { TIMING_OPTIONS_DEFAULTS } from '../../../../notification-policies/timingOptions';
+
+interface RouteTimingsProps {
+  alertManager: string;
+}
+
+export function RouteTimings({ alertManager }: RouteTimingsProps) {
+  const formStyles = useStyles2(getFormStyles);
+  const {
+    register,
+    formState: { errors },
+    getValues,
+  } = useFormContext<RuleFormValues>();
+  return (
+    <>
+      <Field
+        label={routeTimingsFields.groupWait.label}
+        description={routeTimingsFields.groupWait.description}
+        invalid={!!errors.contactPoints?.[alertManager]?.groupWaitValue}
+        error={errors.contactPoints?.[alertManager]?.groupWaitValue?.message}
+      >
+        <PromDurationInput
+          {...register(`contactPoints.${alertManager}.groupWaitValue`, { validate: promDurationValidator })}
+          aria-label={routeTimingsFields.groupWait.ariaLabel}
+          className={formStyles.promDurationInput}
+          placeholder={TIMING_OPTIONS_DEFAULTS.group_wait}
+        />
+      </Field>
+      <Field
+        label={routeTimingsFields.groupInterval.label}
+        description={routeTimingsFields.groupInterval.description}
+        invalid={!!errors.contactPoints?.[alertManager]?.groupIntervalValue}
+        error={errors.contactPoints?.[alertManager]?.groupIntervalValue?.message}
+      >
+        <PromDurationInput
+          {...register(`contactPoints.${alertManager}.groupIntervalValue`, {
+            validate: promDurationValidator,
+          })}
+          aria-label={routeTimingsFields.groupInterval.ariaLabel}
+          className={formStyles.promDurationInput}
+          placeholder={TIMING_OPTIONS_DEFAULTS.group_interval}
+        />
+      </Field>
+      <Field
+        label={routeTimingsFields.repeatInterval.label}
+        description={routeTimingsFields.repeatInterval.description}
+        invalid={!!errors.contactPoints?.[alertManager]?.repeatIntervalValue}
+        error={errors.contactPoints?.[alertManager]?.repeatIntervalValue?.message}
+      >
+        <PromDurationInput
+          {...register(`contactPoints.${alertManager}.repeatIntervalValue`, {
+            validate: (value: string) => {
+              const groupInterval = getValues(`contactPoints.${alertManager}.repeatIntervalValue`);
+              return repeatIntervalValidator(value, groupInterval);
+            },
+          })}
+          aria-label={routeTimingsFields.repeatInterval.ariaLabel}
+          className={formStyles.promDurationInput}
+          placeholder={TIMING_OPTIONS_DEFAULTS.repeat_interval}
+        />
+      </Field>
+    </>
+  );
+}
diff --git a/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationPolicyMatchers.tsx b/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationPolicyMatchers.tsx
index ad459deedb00b..cb7c4492d1cfd 100644
--- a/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationPolicyMatchers.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationPolicyMatchers.tsx
@@ -4,18 +4,24 @@ import React from 'react';
 import { GrafanaTheme2 } from '@grafana/data';
 import { useStyles2 } from '@grafana/ui';
 
+import { MatcherFormatter } from '../../../utils/matchers';
 import { Matchers } from '../../notification-policies/Matchers';
 
 import { hasEmptyMatchers, isDefaultPolicy, RouteWithPath } from './route';
 
-export function NotificationPolicyMatchers({ route }: { route: RouteWithPath }) {
+interface Props {
+  route: RouteWithPath;
+  matcherFormatter: MatcherFormatter;
+}
+
+export function NotificationPolicyMatchers({ route, matcherFormatter }: Props) {
   const styles = useStyles2(getStyles);
   if (isDefaultPolicy(route)) {
     return <div className={styles.defaultPolicy}>Default policy</div>;
   } else if (hasEmptyMatchers(route)) {
     return <div className={styles.textMuted}>No matchers</div>;
   } else {
-    return <Matchers matchers={route.object_matchers ?? []} />;
+    return <Matchers matchers={route.object_matchers ?? []} formatter={matcherFormatter} />;
   }
 }
 
diff --git a/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationPreview.test.tsx b/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationPreview.test.tsx
index 5a2ef4156cd37..294dab53cc4a0 100644
--- a/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationPreview.test.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationPreview.test.tsx
@@ -13,30 +13,28 @@ import { mockApi, setupMswServer } from '../../../mockApi';
 import { grantUserPermissions, mockAlertQuery } from '../../../mocks';
 import { mockPreviewApiResponse } from '../../../mocks/alertRuleApi';
 import * as dataSource from '../../../utils/datasource';
-import { GRAFANA_RULES_SOURCE_NAME } from '../../../utils/datasource';
+import {
+  AlertManagerDataSource,
+  GRAFANA_RULES_SOURCE_NAME,
+  useGetAlertManagerDataSourcesByPermissionAndConfig,
+} from '../../../utils/datasource';
 import { Folder } from '../RuleFolderPicker';
 
 import { NotificationPreview } from './NotificationPreview';
 import NotificationPreviewByAlertManager from './NotificationPreviewByAlertManager';
-import * as notificationPreview from './useGetAlertManagersSourceNamesAndImage';
-import { useGetAlertManagersSourceNamesAndImage } from './useGetAlertManagersSourceNamesAndImage';
 
 jest.mock('../../../useRouteGroupsMatcher');
 
 jest
-  .spyOn(notificationPreview, 'useGetAlertManagersSourceNamesAndImage')
-  .mockReturnValue([{ name: GRAFANA_RULES_SOURCE_NAME, img: '' }]);
-
-jest.spyOn(notificationPreview, 'useGetAlertManagersSourceNamesAndImage').mockReturnValue([
-  { name: GRAFANA_RULES_SOURCE_NAME, img: '' },
-  { name: GRAFANA_RULES_SOURCE_NAME, img: '' },
-]);
+  .spyOn(dataSource, 'useGetAlertManagerDataSourcesByPermissionAndConfig')
+  .mockReturnValue([{ name: GRAFANA_RULES_SOURCE_NAME, imgUrl: '', hasConfigurationAPI: true }]);
 
 jest.spyOn(dataSource, 'getDatasourceAPIUid').mockImplementation((ds: string) => ds);
 
-const useGetAlertManagersSourceNamesAndImageMock = useGetAlertManagersSourceNamesAndImage as jest.MockedFunction<
-  typeof useGetAlertManagersSourceNamesAndImage
->;
+const getAlertManagerDataSourcesByPermissionAndConfigMock =
+  useGetAlertManagerDataSourcesByPermissionAndConfig as jest.MockedFunction<
+    typeof useGetAlertManagerDataSourcesByPermissionAndConfig
+  >;
 
 const ui = {
   route: byTestId('matching-policy-route'),
@@ -62,8 +60,14 @@ beforeEach(() => {
 
 const alertQuery = mockAlertQuery({ datasourceUid: 'whatever', refId: 'A' });
 
+const grafanaAlertManagerDataSource: AlertManagerDataSource = {
+  name: GRAFANA_RULES_SOURCE_NAME,
+  imgUrl: '',
+  hasConfigurationAPI: true,
+};
+
 function mockOneAlertManager() {
-  useGetAlertManagersSourceNamesAndImageMock.mockReturnValue([{ name: GRAFANA_RULES_SOURCE_NAME, img: '' }]);
+  getAlertManagerDataSourcesByPermissionAndConfigMock.mockReturnValue([grafanaAlertManagerDataSource]);
   mockApi(server).getAlertmanagerConfig(GRAFANA_RULES_SOURCE_NAME, (amConfigBuilder) =>
     amConfigBuilder
       .withRoute((routeBuilder) =>
@@ -79,10 +83,11 @@ function mockOneAlertManager() {
 }
 
 function mockTwoAlertManagers() {
-  useGetAlertManagersSourceNamesAndImageMock.mockReturnValue([
-    { name: GRAFANA_RULES_SOURCE_NAME, img: '' },
-    { name: 'OTHER_AM', img: '' },
+  getAlertManagerDataSourcesByPermissionAndConfigMock.mockReturnValue([
+    { name: 'OTHER_AM', imgUrl: '', hasConfigurationAPI: true },
+    grafanaAlertManagerDataSource,
   ]);
+
   mockApi(server).getAlertmanagerConfig(GRAFANA_RULES_SOURCE_NAME, (amConfigBuilder) =>
     amConfigBuilder
       .withRoute((routeBuilder) =>
@@ -272,7 +277,7 @@ describe('NotificationPreviewByAlertmanager', () => {
 
     render(
       <NotificationPreviewByAlertManager
-        alertManagerSource={{ name: GRAFANA_RULES_SOURCE_NAME, img: '' }}
+        alertManagerSource={grafanaAlertManagerDataSource}
         potentialInstances={potentialInstances}
         onlyOneAM={true}
       />,
@@ -327,7 +332,7 @@ describe('NotificationPreviewByAlertmanager', () => {
 
     render(
       <NotificationPreviewByAlertManager
-        alertManagerSource={{ name: GRAFANA_RULES_SOURCE_NAME, img: '' }}
+        alertManagerSource={grafanaAlertManagerDataSource}
         potentialInstances={potentialInstances}
         onlyOneAM={true}
       />,
@@ -382,7 +387,7 @@ describe('NotificationPreviewByAlertmanager', () => {
 
     render(
       <NotificationPreviewByAlertManager
-        alertManagerSource={{ name: GRAFANA_RULES_SOURCE_NAME, img: '' }}
+        alertManagerSource={grafanaAlertManagerDataSource}
         potentialInstances={potentialInstances}
         onlyOneAM={true}
       />,
diff --git a/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationPreview.tsx b/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationPreview.tsx
index 49e54dc76ed70..89752ea69f802 100644
--- a/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationPreview.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationPreview.tsx
@@ -3,15 +3,14 @@ import { compact } from 'lodash';
 import React, { lazy, Suspense } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Button, LoadingPlaceholder, useStyles2, Text } from '@grafana/ui';
+import { Button, LoadingPlaceholder, Text, useStyles2 } from '@grafana/ui';
 import { alertRuleApi } from 'app/features/alerting/unified/api/alertRuleApi';
 import { Stack } from 'app/plugins/datasource/parca/QueryEditor/Stack';
 import { AlertQuery } from 'app/types/unified-alerting-dto';
 
+import { useGetAlertManagerDataSourcesByPermissionAndConfig } from '../../../utils/datasource';
 import { Folder } from '../RuleFolderPicker';
 
-import { useGetAlertManagersSourceNamesAndImage } from './useGetAlertManagersSourceNamesAndImage';
-
 const NotificationPreviewByAlertManager = lazy(() => import('./NotificationPreviewByAlertManager'));
 
 interface NotificationPreviewProps {
@@ -63,16 +62,16 @@ export const NotificationPreview = ({
     });
   };
 
-  // Get list of alert managers source name + image
-  const alertManagerSourceNamesAndImage = useGetAlertManagersSourceNamesAndImage();
+  //  Get alert managers's data source information
+  const alertManagerDataSources = useGetAlertManagerDataSourcesByPermissionAndConfig('notification');
 
-  const onlyOneAM = alertManagerSourceNamesAndImage.length === 1;
+  const onlyOneAM = alertManagerDataSources.length === 1;
 
   return (
     <Stack direction="column">
       <div className={styles.routePreviewHeaderRow}>
         <div className={styles.previewHeader}>
-          <Text element="h4">Alert instance routing preview</Text>
+          <Text element="h5">Alert instance routing preview</Text>
           {isLoading && previewUninitialized && (
             <Text color="secondary" variant="bodySmall">
               Loading...
@@ -98,7 +97,7 @@ export const NotificationPreview = ({
       </div>
       {!isLoading && !previewUninitialized && potentialInstances.length > 0 && (
         <Suspense fallback={<LoadingPlaceholder text="Loading preview..." />}>
-          {alertManagerSourceNamesAndImage.map((alertManagerSource) => (
+          {alertManagerDataSources.map((alertManagerSource) => (
             <NotificationPreviewByAlertManager
               alertManagerSource={alertManagerSource}
               potentialInstances={potentialInstances}
@@ -125,6 +124,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
     flex-direction: row;
     justify-content: space-between;
     align-items: flex-start;
+    margin-top: ${theme.spacing(1)};
   `,
   collapseLabel: css`
     flex: 1;
diff --git a/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationPreviewByAlertManager.tsx b/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationPreviewByAlertManager.tsx
index 1d8cb6d2cb058..16b2be16519d4 100644
--- a/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationPreviewByAlertManager.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationPreviewByAlertManager.tsx
@@ -6,17 +6,17 @@ import { Alert, LoadingPlaceholder, useStyles2, withErrorBoundary } from '@grafa
 
 import { Stack } from '../../../../../../plugins/datasource/parca/QueryEditor/Stack';
 import { Labels } from '../../../../../../types/unified-alerting-dto';
+import { AlertManagerDataSource } from '../../../utils/datasource';
 
 import { NotificationRoute } from './NotificationRoute';
 import { useAlertmanagerNotificationRoutingPreview } from './useAlertmanagerNotificationRoutingPreview';
-import { AlertManagerNameWithImage } from './useGetAlertManagersSourceNamesAndImage';
 
 function NotificationPreviewByAlertManager({
   alertManagerSource,
   potentialInstances,
   onlyOneAM,
 }: {
-  alertManagerSource: AlertManagerNameWithImage;
+  alertManagerSource: AlertManagerDataSource;
   potentialInstances: Labels[];
   onlyOneAM: boolean;
 }) {
@@ -49,7 +49,7 @@ function NotificationPreviewByAlertManager({
           <div className={styles.alertManagerName}>
             {' '}
             Alert manager:
-            <img src={alertManagerSource.img} alt="" className={styles.img} />
+            <img src={alertManagerSource.imgUrl} alt="" className={styles.img} />
             {alertManagerSource.name}
           </div>
           <div className={styles.secondAlertManagerLine}></div>
diff --git a/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationRoute.tsx b/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationRoute.tsx
index 1a7f9a1394494..a95e1bbb8a658 100644
--- a/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationRoute.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationRoute.tsx
@@ -9,6 +9,7 @@ import { Button, getTagColorIndexFromName, TagList, useStyles2 } from '@grafana/
 
 import { Receiver } from '../../../../../../plugins/datasource/alertmanager/types';
 import { Stack } from '../../../../../../plugins/datasource/parca/QueryEditor/Stack';
+import { getAmMatcherFormatter } from '../../../utils/alertmanager';
 import { AlertInstanceMatch } from '../../../utils/notification-policies';
 import { CollapseToggle } from '../../CollapseToggle';
 import { MetaText } from '../../MetaText';
@@ -58,7 +59,10 @@ function NotificationRouteHeader({
         <div onClick={() => onExpandRouteClick(!expandRoute)} className={styles.expandable}>
           <Stack gap={1} direction="row" alignItems="center">
             Notification policy
-            <NotificationPolicyMatchers route={route} />
+            <NotificationPolicyMatchers
+              route={route}
+              matcherFormatter={getAmMatcherFormatter(alertManagerSourceName)}
+            />
           </Stack>
         </div>
         <Spacer />
diff --git a/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationRouteDetailsModal.tsx b/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationRouteDetailsModal.tsx
index f66e525f8a1c8..8de20bc227dfa 100644
--- a/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationRouteDetailsModal.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/NotificationRouteDetailsModal.tsx
@@ -3,20 +3,26 @@ import { compact } from 'lodash';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Button, Icon, Modal, useStyles2 } from '@grafana/ui';
+import { Button, Icon, Modal, Stack, useStyles2 } from '@grafana/ui';
 
 import { Receiver } from '../../../../../../plugins/datasource/alertmanager/types';
-import { Stack } from '../../../../../../plugins/datasource/parca/QueryEditor/Stack';
 import { AlertmanagerAction } from '../../../hooks/useAbilities';
 import { AlertmanagerProvider } from '../../../state/AlertmanagerContext';
-import { GRAFANA_DATASOURCE_NAME } from '../../../utils/datasource';
+import { getAmMatcherFormatter } from '../../../utils/alertmanager';
+import { MatcherFormatter } from '../../../utils/matchers';
 import { makeAMLink } from '../../../utils/misc';
 import { Authorize } from '../../Authorize';
 import { Matchers } from '../../notification-policies/Matchers';
 
 import { hasEmptyMatchers, isDefaultPolicy, RouteWithPath } from './route';
 
-function PolicyPath({ route, routesByIdMap }: { routesByIdMap: Map<string, RouteWithPath>; route: RouteWithPath }) {
+interface Props {
+  routesByIdMap: Map<string, RouteWithPath>;
+  route: RouteWithPath;
+  matcherFormatter: MatcherFormatter;
+}
+
+function PolicyPath({ route, routesByIdMap, matcherFormatter }: Props) {
   const styles = useStyles2(getStyles);
   const routePathIds = route.path?.slice(1) ?? [];
   const routePathObjects = [...compact(routePathIds.map((id) => routesByIdMap.get(id))), route];
@@ -31,7 +37,7 @@ function PolicyPath({ route, routesByIdMap }: { routesByIdMap: Map<string, Route
               {hasEmptyMatchers(pathRoute) ? (
                 <div className={styles.textMuted}>No matchers</div>
               ) : (
-                <Matchers matchers={pathRoute.object_matchers ?? []} />
+                <Matchers matchers={pathRoute.object_matchers ?? []} formatter={matcherFormatter} />
               )}
             </div>
           </div>
@@ -60,7 +66,7 @@ export function NotificationRouteDetailsModal({
   const isDefault = isDefaultPolicy(route);
 
   return (
-    <AlertmanagerProvider accessType="notification" alertmanagerSourceName={GRAFANA_DATASOURCE_NAME}>
+    <AlertmanagerProvider accessType="notification" alertmanagerSourceName={alertManagerSourceName}>
       <Modal
         className={styles.detailsModal}
         isOpen={true}
@@ -77,7 +83,11 @@ export function NotificationRouteDetailsModal({
           <div className={styles.separator(1)} />
           {!isDefault && (
             <>
-              <PolicyPath route={route} routesByIdMap={routesByIdMap} />
+              <PolicyPath
+                route={route}
+                routesByIdMap={routesByIdMap}
+                matcherFormatter={getAmMatcherFormatter(alertManagerSourceName)}
+              />
             </>
           )}
           <div className={styles.separator(4)} />
diff --git a/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/useAlertmanagerNotificationRoutingPreview.ts b/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/useAlertmanagerNotificationRoutingPreview.ts
index 0762ae77aa2e6..a8df723da120d 100644
--- a/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/useAlertmanagerNotificationRoutingPreview.ts
+++ b/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/useAlertmanagerNotificationRoutingPreview.ts
@@ -6,6 +6,7 @@ import { Labels } from '../../../../../../types/unified-alerting-dto';
 import { useAlertmanagerConfig } from '../../../hooks/useAlertmanagerConfig';
 import { useRouteGroupsMatcher } from '../../../useRouteGroupsMatcher';
 import { addUniqueIdentifierToRoute } from '../../../utils/amroutes';
+import { GRAFANA_RULES_SOURCE_NAME } from '../../../utils/datasource';
 import { AlertInstanceMatch, computeInheritedTree, normalizeRoute } from '../../../utils/notification-policies';
 
 import { getRoutesByIdMap, RouteWithPath } from './route';
@@ -55,7 +56,9 @@ export const useAlertmanagerNotificationRoutingPreview = (
     if (!rootRoute) {
       return;
     }
-    return await matchInstancesToRoute(rootRoute, potentialInstances);
+    return await matchInstancesToRoute(rootRoute, potentialInstances, {
+      unquoteMatchers: alertManagerSourceName !== GRAFANA_RULES_SOURCE_NAME,
+    });
   }, [rootRoute, potentialInstances]);
 
   return {
diff --git a/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/useGetAlertManagersSourceNamesAndImage.tsx b/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/useGetAlertManagersSourceNamesAndImage.tsx
deleted file mode 100644
index 289da5be638db..0000000000000
--- a/public/app/features/alerting/unified/components/rule-editor/notificaton-preview/useGetAlertManagersSourceNamesAndImage.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { AlertmanagerChoice } from '../../../../../../plugins/datasource/alertmanager/types';
-import { alertmanagerApi } from '../../../api/alertmanagerApi';
-import { getExternalDsAlertManagers, GRAFANA_RULES_SOURCE_NAME } from '../../../utils/datasource';
-
-export interface AlertManagerNameWithImage {
-  name: string;
-  img: string;
-}
-
-export const useGetAlertManagersSourceNamesAndImage = () => {
-  //get current alerting config
-  const { currentData: amConfigStatus } = alertmanagerApi.useGetAlertmanagerChoiceStatusQuery(undefined);
-
-  const externalDsAlertManagers = getExternalDsAlertManagers().map((ds) => ({
-    name: ds.name,
-    img: ds.meta.info.logos.small,
-  }));
-
-  const alertmanagerChoice = amConfigStatus?.alertmanagersChoice;
-  const alertManagerSourceNamesWithImage: AlertManagerNameWithImage[] =
-    alertmanagerChoice === AlertmanagerChoice.Internal
-      ? [{ name: GRAFANA_RULES_SOURCE_NAME, img: 'public/img/grafana_icon.svg' }]
-      : alertmanagerChoice === AlertmanagerChoice.External
-      ? externalDsAlertManagers
-      : [{ name: GRAFANA_RULES_SOURCE_NAME, img: 'public/img/grafana_icon.svg' }, ...externalDsAlertManagers];
-
-  return alertManagerSourceNamesWithImage;
-};
diff --git a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/CloudDataSourceSelector.tsx b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/CloudDataSourceSelector.tsx
index 510b50c4a3d6c..447be8edd9d90 100644
--- a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/CloudDataSourceSelector.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/CloudDataSourceSelector.tsx
@@ -1,9 +1,9 @@
 import { css } from '@emotion/css';
 import React from 'react';
-import { useFormContext } from 'react-hook-form';
+import { useFormContext, Controller } from 'react-hook-form';
 
 import { DataSourceInstanceSettings, GrafanaTheme2 } from '@grafana/data';
-import { Field, InputControl, useStyles2 } from '@grafana/ui';
+import { Field, useStyles2 } from '@grafana/ui';
 
 import { RuleFormType, RuleFormValues } from '../../../types/rule-form';
 import { CloudRulesSourcePicker } from '../CloudRulesSourcePicker';
@@ -18,7 +18,7 @@ export const CloudDataSourceSelector = ({ disabled, onChangeCloudDatasource }: C
     formState: { errors },
     setValue,
     watch,
-  } = useFormContext<RuleFormValues & { location?: string }>();
+  } = useFormContext<RuleFormValues>();
 
   const styles = useStyles2(getStyles);
   const ruleFormType = watch('type');
@@ -32,16 +32,13 @@ export const CloudDataSourceSelector = ({ disabled, onChangeCloudDatasource }: C
             label={disabled ? 'Data source' : 'Select data source'}
             error={errors.dataSourceName?.message}
             invalid={!!errors.dataSourceName?.message}
-            data-testid="datasource-picker"
           >
-            <InputControl
+            <Controller
               render={({ field: { onChange, ref, ...field } }) => (
                 <CloudRulesSourcePicker
                   {...field}
                   disabled={disabled}
                   onChange={(ds: DataSourceInstanceSettings) => {
-                    // reset location if switching data sources, as different rules source will have different groups and namespaces
-                    setValue('location', undefined);
                     // reset expression as they don't need to persist after changing datasources
                     setValue('expression', '');
                     onChange(ds?.name ?? null);
diff --git a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/QueryAndExpressionsStep.tsx b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/QueryAndExpressionsStep.tsx
index b1b56b46e48ee..9a40a1a3d5566 100644
--- a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/QueryAndExpressionsStep.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/QueryAndExpressionsStep.tsx
@@ -1,13 +1,12 @@
 import { css } from '@emotion/css';
 import { cloneDeep } from 'lodash';
 import React, { useCallback, useEffect, useMemo, useReducer, useState } from 'react';
-import { useFormContext } from 'react-hook-form';
+import { useFormContext, Controller } from 'react-hook-form';
 
 import { getDefaultRelativeTimeRange, GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { Stack } from '@grafana/experimental';
 import { config, getDataSourceSrv } from '@grafana/runtime';
-import { Alert, Button, Dropdown, Field, Icon, InputControl, Menu, MenuItem, Tooltip, useStyles2 } from '@grafana/ui';
+import { Alert, Button, Dropdown, Field, Icon, Menu, MenuItem, Stack, Tooltip, useStyles2 } from '@grafana/ui';
 import { Text } from '@grafana/ui/src/components/Text/Text';
 import { isExpressionQuery } from 'app/features/expressions/guards';
 import { ExpressionDatasourceUID, ExpressionQueryType, expressionTypes } from 'app/features/expressions/types';
@@ -29,6 +28,7 @@ import { errorFromCurrentCondition, errorFromPreviewData, findRenamedDataQueryRe
 
 import { CloudDataSourceSelector } from './CloudDataSourceSelector';
 import { SmartAlertTypeDetector } from './SmartAlertTypeDetector';
+import { DESCRIPTIONS } from './descriptions';
 import {
   addExpressions,
   addNewDataQuery,
@@ -81,15 +81,18 @@ export const QueryAndExpressionsStep = ({ editingExistingRule, onDataChange }: P
 
   const rulesSourcesWithRuler = useRulesSourcesWithRuler();
 
-  const runQueriesPreview = useCallback(() => {
-    if (isCloudAlertRuleType) {
-      // we will skip preview for cloud rules, these do not have any time series preview
-      // Grafana Managed rules and recording rules do
-      return;
-    }
+  const runQueriesPreview = useCallback(
+    (condition?: string) => {
+      if (isCloudAlertRuleType) {
+        // we will skip preview for cloud rules, these do not have any time series preview
+        // Grafana Managed rules and recording rules do
+        return;
+      }
 
-    runQueries(getValues('queries'));
-  }, [isCloudAlertRuleType, runQueries, getValues]);
+      runQueries(getValues('queries'), condition || (getValues('condition') ?? ''));
+    },
+    [isCloudAlertRuleType, runQueries, getValues]
+  );
 
   // whenever we update the queries we have to update the form too
   useEffect(() => {
@@ -138,7 +141,7 @@ export const QueryAndExpressionsStep = ({ editingExistingRule, onDataChange }: P
         return;
       }
 
-      runQueriesPreview(); //we need to run the queries to know if the condition is valid
+      runQueriesPreview(refId); //we need to run the queries to know if the condition is valid
 
       setValue('condition', refId);
     },
@@ -172,8 +175,9 @@ export const QueryAndExpressionsStep = ({ editingExistingRule, onDataChange }: P
       // Invocation cycle => onChange -> dispatch(setDataQueries) -> onRunQueries -> setDataQueries Reducer
       // As a workaround we update form values as soon as possible to avoid stale state
       // This way we can access up to date queries in runQueriesPreview without waiting for re-render
-      setValue('queries', updatedQueries, { shouldValidate: false });
-
+      const previousQueries = getValues('queries');
+      const expressionQueries = previousQueries.filter((query) => isExpressionQuery(query.model));
+      setValue('queries', [...updatedQueries, ...expressionQueries], { shouldValidate: false });
       updateExpressionAndDatasource(updatedQueries);
 
       dispatch(setDataQueries(updatedQueries));
@@ -185,7 +189,7 @@ export const QueryAndExpressionsStep = ({ editingExistingRule, onDataChange }: P
         dispatch(rewireExpressions({ oldRefId, newRefId }));
       }
     },
-    [queries, setValue, updateExpressionAndDatasource]
+    [queries, updateExpressionAndDatasource, getValues, setValue]
   );
 
   const onChangeRecordingRulesQueries = useCallback(
@@ -228,6 +232,7 @@ export const QueryAndExpressionsStep = ({ editingExistingRule, onDataChange }: P
         queryType: '',
         relativeTimeRange: getDefaultRelativeTimeRange(),
         expr,
+        instant: true,
         model: {
           refId: 'A',
           hide: false,
@@ -355,23 +360,22 @@ export const QueryAndExpressionsStep = ({ editingExistingRule, onDataChange }: P
     condition,
   ]);
 
+  const { sectionTitle, helpLabel, helpContent, helpLink } = DESCRIPTIONS[type ?? RuleFormType.grafana];
+
   return (
     <RuleEditorSection
       stepNo={2}
-      title={type !== RuleFormType.cloudRecording ? 'Define query and alert condition' : 'Define query'}
+      title={sectionTitle}
       description={
-        <Stack direction="row" gap={0.5} alignItems="baseline">
+        <Stack direction="row" gap={0.5} alignItems="center">
           <Text variant="bodySmall" color="secondary">
-            Define queries and/or expressions and then choose one of them as the alert rule condition. This is the
-            threshold that an alert rule must meet or exceed in order to fire.
+            {helpLabel}
           </Text>
           <NeedHelpInfo
-            contentText={`An alert rule consists of one or more queries and expressions that select the data you want to measure.
-          Define queries and/or expressions and then choose one of them as the alert rule condition. This is the threshold that an alert rule must meet or exceed in order to fire.
-          For more information on queries and expressions, see Query and transform data.`}
-            externalLink={`https://grafana.com/docs/grafana/latest/panels-visualizations/query-transform-data/`}
-            linkText={`Read about query and condition`}
-            title="Define query and alert condition"
+            contentText={helpContent}
+            externalLink={helpLink}
+            linkText={'Read more on our documentation website'}
+            title={helpLabel}
           />
         </Stack>
       }
@@ -398,7 +402,7 @@ export const QueryAndExpressionsStep = ({ editingExistingRule, onDataChange }: P
       {isCloudAlertRuleType && dataSourceName && (
         <Stack direction="column">
           <Field error={errors.expression?.message} invalid={!!errors.expression?.message}>
-            <InputControl
+            <Controller
               name="expression"
               render={({ field: { ref, ...field } }) => {
                 return (
@@ -432,7 +436,7 @@ export const QueryAndExpressionsStep = ({ editingExistingRule, onDataChange }: P
           <QueryEditor
             queries={dataQueries}
             expressions={expressionQueries}
-            onRunQueries={runQueriesPreview}
+            onRunQueries={() => runQueriesPreview()}
             onChangeQueries={onChangeQueries}
             onDuplicateQuery={onDuplicateQuery}
             panelData={queryPreviewData}
@@ -446,7 +450,7 @@ export const QueryAndExpressionsStep = ({ editingExistingRule, onDataChange }: P
                 dispatch(addNewDataQuery());
               }}
               variant="secondary"
-              aria-label={selectors.components.QueryTab.addQuery}
+              data-testid={selectors.components.QueryTab.addQuery}
               disabled={noCompatibleDataSources}
               className={styles.addQueryButton}
             >
@@ -493,7 +497,7 @@ export const QueryAndExpressionsStep = ({ editingExistingRule, onDataChange }: P
               </Button>
             )}
             {!isPreviewLoading && (
-              <Button icon="sync" type="button" onClick={runQueriesPreview} disabled={emptyQueries}>
+              <Button icon="sync" type="button" onClick={() => runQueriesPreview()} disabled={emptyQueries}>
                 Preview
               </Button>
             )}
diff --git a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/SmartAlertTypeDetector.tsx b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/SmartAlertTypeDetector.tsx
index 86144503a02da..5a526fc8443da 100644
--- a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/SmartAlertTypeDetector.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/SmartAlertTypeDetector.tsx
@@ -2,9 +2,8 @@ import React from 'react';
 import { useFormContext } from 'react-hook-form';
 
 import { DataSourceInstanceSettings } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
 import { DataSourceJsonData } from '@grafana/schema';
-import { RadioButtonGroup, Text } from '@grafana/ui';
+import { RadioButtonGroup, Text, Stack } from '@grafana/ui';
 import { contextSrv } from 'app/core/core';
 import { ExpressionDatasourceUID } from 'app/features/expressions/types';
 import { AccessControlAction } from 'app/types';
diff --git a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/descriptions.tsx b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/descriptions.tsx
new file mode 100644
index 0000000000000..fced3fa06a5b9
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/descriptions.tsx
@@ -0,0 +1,32 @@
+import { RuleFormType } from '../../../types/rule-form';
+
+type FormDescriptions = {
+  sectionTitle: string;
+  helpLabel: string;
+  helpContent: string;
+  helpLink: string;
+};
+
+export const DESCRIPTIONS: Record<RuleFormType, FormDescriptions> = {
+  [RuleFormType.cloudRecording]: {
+    sectionTitle: 'Define recording rule',
+    helpLabel: 'Define your recording rule',
+    helpContent:
+      'Pre-compute frequently needed or computationally expensive expressions and save their result as a new set of time series.',
+    helpLink: '',
+  },
+  [RuleFormType.grafana]: {
+    sectionTitle: 'Define query and alert condition',
+    helpLabel: 'Define query and alert condition',
+    helpContent:
+      'An alert rule consists of one or more queries and expressions that select the data you want to measure. Define queries and/or expressions and then choose one of them as the alert rule condition. This is the threshold that an alert rule must meet or exceed in order to fire. For more information on queries and expressions, see Query and transform data.',
+    helpLink: 'https://grafana.com/docs/grafana/latest/panels-visualizations/query-transform-data/',
+  },
+  [RuleFormType.cloudAlerting]: {
+    sectionTitle: 'Define query and alert condition',
+    helpLabel: 'Define query and alert condition',
+    helpContent:
+      'An alert rule consists of one or more queries and expressions that select the data you want to measure. Define queries and/or expressions and then choose one of them as the alert rule condition. This is the threshold that an alert rule must meet or exceed in order to fire. For more information on queries and expressions, see Query and transform data.',
+    helpLink: 'https://grafana.com/docs/grafana/latest/panels-visualizations/query-transform-data/',
+  },
+};
diff --git a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/reducer.ts b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/reducer.ts
index 08aecf832f90e..7072e664d1463 100644
--- a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/reducer.ts
+++ b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/reducer.ts
@@ -2,7 +2,7 @@ import { createAction, createReducer } from '@reduxjs/toolkit';
 
 import { DataQuery, getDefaultRelativeTimeRange, rangeUtil, RelativeTimeRange } from '@grafana/data';
 import { getNextRefIdChar } from 'app/core/utils/query';
-import { findDataSourceFromExpressionRecursive } from 'app/features/alerting/utils/dataSourceFromExpression';
+import { findDataSourceFromExpressionRecursive } from 'app/features/alerting/unified/utils/dataSourceFromExpression';
 import { dataSource as expressionDatasource } from 'app/features/expressions/ExpressionDatasource';
 import { isExpressionQuery } from 'app/features/expressions/guards';
 import { ExpressionDatasourceUID, ExpressionQuery, ExpressionQueryType } from 'app/features/expressions/types';
diff --git a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/useAlertQueryRunner.tsx b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/useAlertQueryRunner.tsx
index de0dbbc19ee83..1b5f0f4da9b8f 100644
--- a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/useAlertQueryRunner.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/useAlertQueryRunner.tsx
@@ -30,8 +30,8 @@ export function useAlertQueryRunner() {
     runner.current.cancel();
   }, []);
 
-  const runQueries = useCallback((queriesToPreview: AlertQuery[]) => {
-    runner.current.run(queriesToPreview);
+  const runQueries = useCallback((queriesToPreview: AlertQuery[], condition: string) => {
+    runner.current.run(queriesToPreview, condition);
   }, []);
 
   const isPreviewLoading = useMemo(() => {
diff --git a/public/app/features/alerting/unified/components/rule-editor/rule-types/RuleTypePicker.tsx b/public/app/features/alerting/unified/components/rule-editor/rule-types/RuleTypePicker.tsx
index 9f51d74e4f164..60d54a0df97c8 100644
--- a/public/app/features/alerting/unified/components/rule-editor/rule-types/RuleTypePicker.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/rule-types/RuleTypePicker.tsx
@@ -3,8 +3,7 @@ import { isEmpty } from 'lodash';
 import React, { useEffect } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data/src';
-import { Stack } from '@grafana/experimental';
-import { useStyles2 } from '@grafana/ui';
+import { useStyles2, Stack } from '@grafana/ui';
 import { dispatch } from 'app/store/store';
 
 import { useRulesSourcesWithRuler } from '../../../hooks/useRuleSourcesWithRuler';
diff --git a/public/app/features/alerting/unified/components/rule-editor/useDashboardQuery.ts b/public/app/features/alerting/unified/components/rule-editor/useDashboardQuery.ts
new file mode 100644
index 0000000000000..56db0ce526f09
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-editor/useDashboardQuery.ts
@@ -0,0 +1,27 @@
+import memoizeOne from 'memoize-one';
+
+import { DashboardDTO } from '../../../../../types';
+import { DashboardModel } from '../../../../dashboard/state';
+import { dashboardApi } from '../../api/dashboardApi';
+
+const convertToDashboardModel = memoizeOne((dashboardDTO: DashboardDTO) => {
+  // RTKQuery freezes all returned objects. DashboardModel constructor runs migrations which might change the internal object
+  // Hence we need to add structuredClone to make a deep copy of the API response object
+  const { dashboard, meta } = structuredClone(dashboardDTO);
+  return new DashboardModel(dashboard, meta);
+});
+
+export function useDashboardQuery(dashboardUid?: string) {
+  const queryData = dashboardApi.endpoints.dashboard.useQuery(
+    { uid: dashboardUid ?? '' },
+    {
+      skip: !dashboardUid,
+      selectFromResult: ({ currentData, data, ...rest }) => ({
+        dashboardModel: currentData ? convertToDashboardModel(currentData) : undefined,
+        ...rest,
+      }),
+    }
+  );
+
+  return queryData;
+}
diff --git a/public/app/features/alerting/unified/components/rule-editor/util.test.ts b/public/app/features/alerting/unified/components/rule-editor/util.test.ts
index fda4601ead380..ec51a60f31edb 100644
--- a/public/app/features/alerting/unified/components/rule-editor/util.test.ts
+++ b/public/app/features/alerting/unified/components/rule-editor/util.test.ts
@@ -245,12 +245,12 @@ describe('checkForPathSeparator', () => {
 
 describe('getThresholdsForQueries', () => {
   it('should work for threshold condition', () => {
-    const queries = createThresholdExample('gt');
-    expect(getThresholdsForQueries(queries)).toMatchSnapshot();
+    const [queries, condition] = createThresholdExample('gt');
+    expect(getThresholdsForQueries(queries, condition)).toMatchSnapshot();
   });
 
   it('should work for classic_condition', () => {
-    const [dataQuery] = createThresholdExample('gt');
+    const [[dataQuery]] = createThresholdExample('gt');
 
     const classicCondition = {
       refId: 'B',
@@ -282,7 +282,7 @@ describe('getThresholdsForQueries', () => {
       },
     };
 
-    const thresholdsClassic = getThresholdsForQueries([dataQuery, classicCondition]);
+    const thresholdsClassic = getThresholdsForQueries([dataQuery, classicCondition], classicCondition.refId);
     expect(thresholdsClassic).toMatchSnapshot();
   });
 
@@ -331,30 +331,32 @@ describe('getThresholdsForQueries', () => {
     };
 
     expect(() => {
-      const thresholds = getThresholdsForQueries([dataQuery, classicCondition]);
+      const thresholds = getThresholdsForQueries([dataQuery, classicCondition], classicCondition.refId);
       expect(thresholds).toStrictEqual({});
     }).not.toThrowError();
   });
 
   it('should work for within_range', () => {
-    const queries = createThresholdExample('within_range');
-    const thresholds = getThresholdsForQueries(queries);
+    const [queries, condition] = createThresholdExample('within_range');
+    const thresholds = getThresholdsForQueries(queries, condition);
     expect(thresholds).toMatchSnapshot();
   });
 
   it('should work for lt and gt', () => {
-    expect(getThresholdsForQueries(createThresholdExample('gt'))).toMatchSnapshot();
-    expect(getThresholdsForQueries(createThresholdExample('lt'))).toMatchSnapshot();
+    const [gtQueries, qtCondition] = createThresholdExample('gt');
+    const [ltQueries, ltCondition] = createThresholdExample('lt');
+    expect(getThresholdsForQueries(gtQueries, qtCondition)).toMatchSnapshot();
+    expect(getThresholdsForQueries(ltQueries, ltCondition)).toMatchSnapshot();
   });
 
   it('should work for outside_range', () => {
-    const queries = createThresholdExample('outside_range');
-    const thresholds = getThresholdsForQueries(queries);
+    const [queries, condition] = createThresholdExample('outside_range');
+    const thresholds = getThresholdsForQueries(queries, condition);
     expect(thresholds).toMatchSnapshot();
   });
 });
 
-function createThresholdExample(thresholdType: string): AlertQuery[] {
+function createThresholdExample(thresholdType: string): [AlertQuery[], string] {
   const dataQuery: AlertQuery = {
     refId: 'A',
     datasourceUid: 'abc123',
@@ -403,7 +405,7 @@ function createThresholdExample(thresholdType: string): AlertQuery[] {
     },
   };
 
-  return [dataQuery, reduceExpression, thresholdExpression];
+  return [[dataQuery, reduceExpression, thresholdExpression], thresholdExpression.refId];
 }
 
 describe('findRenamedReferences', () => {
diff --git a/public/app/features/alerting/unified/components/rule-editor/util.ts b/public/app/features/alerting/unified/components/rule-editor/util.ts
index 3bc456259a613..258ffc749646f 100644
--- a/public/app/features/alerting/unified/components/rule-editor/util.ts
+++ b/public/app/features/alerting/unified/components/rule-editor/util.ts
@@ -9,7 +9,7 @@ import {
   ThresholdsConfig,
   ThresholdsMode,
 } from '@grafana/data';
-import { GraphTresholdsStyleMode } from '@grafana/schema';
+import { GraphThresholdsStyleMode } from '@grafana/schema';
 import { config } from 'app/core/config';
 import { EvalFunction } from 'app/features/alerting/state/alertDef';
 import { isExpressionQuery } from 'app/features/expressions/guards';
@@ -136,7 +136,7 @@ export function warningFromSeries(series: DataFrame[]): Error | undefined {
 
 export type ThresholdDefinition = {
   config: ThresholdsConfig;
-  mode: GraphTresholdsStyleMode;
+  mode: GraphThresholdsStyleMode;
 };
 
 export type ThresholdDefinitions = Record<string, ThresholdDefinition>;
@@ -144,10 +144,14 @@ export type ThresholdDefinitions = Record<string, ThresholdDefinition>;
 /**
  * This function will retrieve threshold definitions for the given array of data and expression queries.
  */
-export function getThresholdsForQueries(queries: AlertQuery[]) {
+export function getThresholdsForQueries(queries: AlertQuery[], condition: string | null) {
   const thresholds: ThresholdDefinitions = {};
   const SUPPORTED_EXPRESSION_TYPES = [ExpressionQueryType.threshold, ExpressionQueryType.classic];
 
+  if (!condition) {
+    return thresholds;
+  }
+
   for (const query of queries) {
     if (!isExpressionQuery(query.model)) {
       continue;
@@ -162,6 +166,10 @@ export function getThresholdsForQueries(queries: AlertQuery[]) {
       continue;
     }
 
+    if (query.model.refId !== condition) {
+      continue;
+    }
+
     // if any of the conditions are a "range" we switch to an "area" threshold view and ignore single threshold values
     // the time series panel does not support both.
     const hasRangeThreshold = query.model.conditions.some(isRangeCondition);
@@ -202,7 +210,7 @@ export function getThresholdsForQueries(queries: AlertQuery[]) {
                 mode: ThresholdsMode.Absolute,
                 steps: [],
               },
-              mode: GraphTresholdsStyleMode.Line,
+              mode: GraphThresholdsStyleMode.Line,
             };
           }
 
@@ -210,7 +218,7 @@ export function getThresholdsForQueries(queries: AlertQuery[]) {
             appendSingleThreshold(originRefID, threshold[0]);
           } else if (originRefID && hasValidOrigin && isRangeThreshold) {
             appendRangeThreshold(originRefID, threshold, condition.evaluator.type);
-            thresholds[originRefID].mode = GraphTresholdsStyleMode.LineAndArea;
+            thresholds[originRefID].mode = GraphThresholdsStyleMode.LineAndArea;
           }
         });
       } catch (err) {
diff --git a/public/app/features/alerting/unified/components/rule-viewer/Actions.tsx b/public/app/features/alerting/unified/components/rule-viewer/Actions.tsx
new file mode 100644
index 0000000000000..8dd2226018984
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-viewer/Actions.tsx
@@ -0,0 +1,113 @@
+import React from 'react';
+
+import { AppEvents } from '@grafana/data';
+import { Dropdown, LinkButton, Menu } from '@grafana/ui';
+import appEvents from 'app/core/app_events';
+import { CombinedRule, RuleIdentifier } from 'app/types/unified-alerting';
+
+import { AlertRuleAction, useAlertRuleAbility } from '../../hooks/useAbilities';
+import { createShareLink, isLocalDevEnv, isOpenSourceEdition, makeRuleBasedSilenceLink } from '../../utils/misc';
+import * as ruleId from '../../utils/rule-id';
+import { createUrl } from '../../utils/url';
+import MoreButton from '../MoreButton';
+import { DeclareIncidentMenuItem } from '../bridges/DeclareIncidentButton';
+
+import { useAlertRule } from './RuleContext';
+
+interface Props {
+  handleDelete: (rule: CombinedRule) => void;
+  handleDuplicateRule: (identifier: RuleIdentifier) => void;
+}
+
+export const useAlertRulePageActions = ({ handleDelete, handleDuplicateRule }: Props) => {
+  const { rule, identifier } = useAlertRule();
+
+  // check all abilities and permissions
+  const [editSupported, editAllowed] = useAlertRuleAbility(rule, AlertRuleAction.Update);
+  const canEdit = editSupported && editAllowed;
+
+  const [deleteSupported, deleteAllowed] = useAlertRuleAbility(rule, AlertRuleAction.Delete);
+  const canDelete = deleteSupported && deleteAllowed;
+
+  const [duplicateSupported, duplicateAllowed] = useAlertRuleAbility(rule, AlertRuleAction.Duplicate);
+  const canDuplicate = duplicateSupported && duplicateAllowed;
+
+  const [silenceSupported, silenceAllowed] = useAlertRuleAbility(rule, AlertRuleAction.Silence);
+  const canSilence = silenceSupported && silenceAllowed;
+
+  const [exportSupported, exportAllowed] = useAlertRuleAbility(rule, AlertRuleAction.ModifyExport);
+  const canExport = exportSupported && exportAllowed;
+
+  /**
+   * Since Incident isn't available as an open-source product we shouldn't show it for Open-Source licenced editions of Grafana.
+   * We should show it in development mode
+   */
+  const shouldShowDeclareIncidentButton = !isOpenSourceEdition() || isLocalDevEnv();
+  const shareUrl = createShareLink(rule.namespace.rulesSource, rule);
+
+  return [
+    canEdit && <EditButton key="edit-action" identifier={identifier} />,
+    <Dropdown
+      key="more-actions"
+      overlay={
+        <Menu>
+          {canSilence && (
+            <Menu.Item
+              label="Silence"
+              icon="bell-slash"
+              url={makeRuleBasedSilenceLink(identifier.ruleSourceName, rule)}
+            />
+          )}
+          {shouldShowDeclareIncidentButton && <DeclareIncidentMenuItem title={rule.name} url={''} />}
+          {canDuplicate && <Menu.Item label="Duplicate" icon="copy" onClick={() => handleDuplicateRule(identifier)} />}
+          <Menu.Divider />
+          <Menu.Item label="Copy link" icon="share-alt" onClick={() => copyToClipboard(shareUrl)} />
+          {canExport && (
+            <Menu.Item
+              label="Export"
+              icon="download-alt"
+              childItems={[<ExportMenuItem key="export-with-modifications" identifier={identifier} />]}
+            />
+          )}
+          {canDelete && (
+            <>
+              <Menu.Divider />
+              <Menu.Item label="Delete" icon="trash-alt" destructive onClick={() => handleDelete(rule)} />
+            </>
+          )}
+        </Menu>
+      }
+    >
+      <MoreButton size="md" />
+    </Dropdown>,
+  ];
+};
+
+function copyToClipboard(text: string) {
+  navigator.clipboard?.writeText(text).then(() => {
+    appEvents.emit(AppEvents.alertSuccess, ['URL copied to clipboard']);
+  });
+}
+
+type PropsWithIdentifier = { identifier: RuleIdentifier };
+
+const ExportMenuItem = ({ identifier }: PropsWithIdentifier) => {
+  const returnTo = location.pathname + location.search;
+  const url = createUrl(`/alerting/${encodeURIComponent(ruleId.stringifyIdentifier(identifier))}/modify-export`, {
+    returnTo,
+  });
+
+  return <Menu.Item key="with-modifications" label="With modifications" icon="file-edit-alt" url={url} />;
+};
+
+const EditButton = ({ identifier }: PropsWithIdentifier) => {
+  const returnTo = location.pathname + location.search;
+  const ruleIdentifier = ruleId.stringifyIdentifier(identifier);
+  const editURL = createUrl(`/alerting/${encodeURIComponent(ruleIdentifier)}/edit`, { returnTo });
+
+  return (
+    <LinkButton variant="secondary" icon="pen" href={editURL}>
+      Edit
+    </LinkButton>
+  );
+};
diff --git a/public/app/features/alerting/unified/components/rule-viewer/DeleteModal.tsx b/public/app/features/alerting/unified/components/rule-viewer/DeleteModal.tsx
new file mode 100644
index 0000000000000..ef5c1cdac4ad3
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-viewer/DeleteModal.tsx
@@ -0,0 +1,57 @@
+import React, { useState, useCallback, useMemo } from 'react';
+
+import { ConfirmModal } from '@grafana/ui';
+import { dispatch } from 'app/store/store';
+import { CombinedRule } from 'app/types/unified-alerting';
+
+import { deleteRuleAction } from '../../state/actions';
+import { getRulesSourceName } from '../../utils/datasource';
+import { fromRulerRule } from '../../utils/rule-id';
+
+type DeleteModalHook = [JSX.Element, (rule: CombinedRule) => void, () => void];
+
+export const useDeleteModal = (): DeleteModalHook => {
+  const [ruleToDelete, setRuleToDelete] = useState<CombinedRule | undefined>();
+
+  const dismissModal = useCallback(() => {
+    setRuleToDelete(undefined);
+  }, []);
+
+  const showModal = useCallback((rule: CombinedRule) => {
+    setRuleToDelete(rule);
+  }, []);
+
+  const deleteRule = useCallback(
+    (ruleToDelete?: CombinedRule) => {
+      if (ruleToDelete && ruleToDelete.rulerRule) {
+        const identifier = fromRulerRule(
+          getRulesSourceName(ruleToDelete.namespace.rulesSource),
+          ruleToDelete.namespace.name,
+          ruleToDelete.group.name,
+          ruleToDelete.rulerRule
+        );
+
+        dispatch(deleteRuleAction(identifier, { navigateTo: '/alerting/list' }));
+        dismissModal();
+      }
+    },
+    [dismissModal]
+  );
+
+  const modal = useMemo(
+    () => (
+      <ConfirmModal
+        isOpen={Boolean(ruleToDelete)}
+        title="Delete rule"
+        body="Deleting this rule will permanently remove it from your alert rule list. Are you sure you want to delete this rule?"
+        confirmText="Yes, delete"
+        icon="exclamation-triangle"
+        onConfirm={() => deleteRule(ruleToDelete)}
+        onDismiss={dismissModal}
+      />
+    ),
+    [deleteRule, dismissModal, ruleToDelete]
+  );
+
+  return [modal, showModal, dismissModal];
+};
diff --git a/public/app/features/alerting/unified/components/rule-viewer/FederatedRuleWarning.tsx b/public/app/features/alerting/unified/components/rule-viewer/FederatedRuleWarning.tsx
new file mode 100644
index 0000000000000..76bf9317abf93
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-viewer/FederatedRuleWarning.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+
+import { Alert, Button, Stack } from '@grafana/ui';
+
+export function FederatedRuleWarning() {
+  return (
+    <Alert severity="info" title="This rule is part of a federated rule group." bottomSpacing={0} topSpacing={2}>
+      <Stack direction="column">
+        Federated rule groups are currently an experimental feature.
+        <Button fill="text" icon="book">
+          <a href="https://grafana.com/docs/metrics-enterprise/latest/tenant-management/tenant-federation/#cross-tenant-alerting-and-recording-rule-federation">
+            Read documentation
+          </a>
+        </Button>
+      </Stack>
+    </Alert>
+  );
+}
diff --git a/public/app/features/alerting/unified/components/rule-viewer/RuleContext.tsx b/public/app/features/alerting/unified/components/rule-viewer/RuleContext.tsx
new file mode 100644
index 0000000000000..7a191a0f72179
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-viewer/RuleContext.tsx
@@ -0,0 +1,33 @@
+import * as React from 'react';
+
+import { CombinedRule, RuleIdentifier } from 'app/types/unified-alerting';
+
+interface Context {
+  rule: CombinedRule;
+  identifier: RuleIdentifier;
+}
+
+const AlertRuleContext = React.createContext<Context | undefined>(undefined);
+
+type Props = Context & React.PropsWithChildren & {};
+
+const AlertRuleProvider = ({ children, rule, identifier }: Props) => {
+  const value: Context = {
+    rule,
+    identifier,
+  };
+
+  return <AlertRuleContext.Provider value={value}>{children}</AlertRuleContext.Provider>;
+};
+
+const useAlertRule = () => {
+  const context = React.useContext(AlertRuleContext);
+
+  if (context === undefined) {
+    throw new Error('useAlertRule must be used within a AlertRuleContext');
+  }
+
+  return context;
+};
+
+export { AlertRuleProvider, useAlertRule };
diff --git a/public/app/features/alerting/unified/components/rule-viewer/RuleViewer.test.tsx b/public/app/features/alerting/unified/components/rule-viewer/RuleViewer.test.tsx
new file mode 100644
index 0000000000000..1a82e0561947f
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-viewer/RuleViewer.test.tsx
@@ -0,0 +1,174 @@
+import { render, waitFor, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { TestProvider } from 'test/helpers/TestProvider';
+import { byText, byRole } from 'testing-library-selector';
+
+import { setBackendSrv } from '@grafana/runtime';
+import { backendSrv } from 'app/core/services/backend_srv';
+import { AccessControlAction } from 'app/types';
+import { CombinedRule, RuleIdentifier } from 'app/types/unified-alerting';
+
+import { getCloudRule, getGrafanaRule, grantUserPermissions } from '../../mocks';
+import { Annotation } from '../../utils/constants';
+import * as ruleId from '../../utils/rule-id';
+
+import { AlertRuleProvider } from './RuleContext';
+import RuleViewer from './RuleViewer';
+import { createMockGrafanaServer } from './__mocks__/server';
+
+// metadata and interactive elements
+const ELEMENTS = {
+  loading: byText(/Loading rule/i),
+  metadata: {
+    summary: (text: string) => byText(text),
+    runbook: (url: string) => byRole('link', { name: url }),
+    dashboardAndPanel: byRole('link', { name: 'View panel' }),
+    evaluationInterval: (interval: string) => byText(`Every ${interval}`),
+    label: ([key, value]: [string, string]) => byRole('listitem', { name: `${key}: ${value}` }),
+  },
+  actions: {
+    edit: byRole('link', { name: 'Edit' }),
+    more: {
+      button: byRole('button', { name: /More/i }),
+      actions: {
+        silence: byRole('link', { name: /Silence/i }),
+        declareIncident: byRole('menuitem', { name: /Declare incident/i }),
+        duplicate: byRole('menuitem', { name: /Duplicate/i }),
+        copyLink: byRole('menuitem', { name: /Copy link/i }),
+        export: byRole('menuitem', { name: /Export/i }),
+        delete: byRole('menuitem', { name: /Delete/i }),
+      },
+    },
+  },
+};
+
+describe('RuleViewer', () => {
+  describe('Grafana managed alert rule', () => {
+    const server = createMockGrafanaServer();
+
+    const mockRule = getGrafanaRule(
+      {
+        name: 'Test alert',
+        annotations: {
+          [Annotation.dashboardUID]: 'dashboard-1',
+          [Annotation.panelID]: 'panel-1',
+          [Annotation.summary]: 'This is the summary for the rule',
+          [Annotation.runbookURL]: 'https://runbook.site/',
+        },
+        labels: {
+          team: 'operations',
+          severity: 'low',
+        },
+        group: {
+          name: 'my-group',
+          interval: '15m',
+          rules: [],
+          totals: { alerting: 1 },
+        },
+      },
+      { uid: 'test1' }
+    );
+    const mockRuleIdentifier = ruleId.fromCombinedRule('grafana', mockRule);
+
+    beforeAll(() => {
+      grantUserPermissions([
+        AccessControlAction.AlertingRuleCreate,
+        AccessControlAction.AlertingRuleRead,
+        AccessControlAction.AlertingRuleUpdate,
+        AccessControlAction.AlertingRuleDelete,
+        AccessControlAction.AlertingInstanceCreate,
+      ]);
+      setBackendSrv(backendSrv);
+    });
+
+    beforeEach(() => {
+      server.listen();
+    });
+
+    afterAll(() => {
+      server.close();
+    });
+
+    afterEach(() => {
+      server.resetHandlers();
+    });
+
+    it('should render a Grafana managed alert rule', async () => {
+      await renderRuleViewer(mockRule, mockRuleIdentifier);
+
+      // assert on basic info to be visible
+      expect(screen.getByText('Test alert')).toBeInTheDocument();
+      expect(screen.getByText('Firing')).toBeInTheDocument();
+
+      // alert rule metadata
+      const ruleSummary = mockRule.annotations[Annotation.summary];
+      const runBookURL = mockRule.annotations[Annotation.runbookURL];
+      const groupInterval = mockRule.group.interval;
+      const labels = mockRule.labels;
+
+      expect(ELEMENTS.metadata.summary(ruleSummary).get()).toBeInTheDocument();
+      expect(ELEMENTS.metadata.dashboardAndPanel.get()).toBeInTheDocument();
+      expect(ELEMENTS.metadata.runbook(runBookURL).get()).toBeInTheDocument();
+      expect(ELEMENTS.metadata.evaluationInterval(groupInterval!).get()).toBeInTheDocument();
+
+      for (const label in labels) {
+        expect(ELEMENTS.metadata.label([label, labels[label]]).get()).toBeInTheDocument();
+      }
+
+      // actions
+      await waitFor(() => {
+        expect(ELEMENTS.actions.edit.get()).toBeInTheDocument();
+        expect(ELEMENTS.actions.more.button.get()).toBeInTheDocument();
+      });
+
+      // check the "more actions" button
+      await userEvent.click(ELEMENTS.actions.more.button.get());
+      const menuItems = Object.values(ELEMENTS.actions.more.actions);
+      for (const menuItem of menuItems) {
+        expect(menuItem.get()).toBeInTheDocument();
+      }
+    });
+  });
+
+  describe.skip('Data source managed alert rule', () => {
+    const mockRule = getCloudRule({ name: 'cloud test alert' });
+    const mockRuleIdentifier = ruleId.fromCombinedRule('mimir-1', mockRule);
+
+    beforeAll(() => {
+      grantUserPermissions([
+        AccessControlAction.AlertingRuleExternalRead,
+        AccessControlAction.AlertingRuleExternalWrite,
+      ]);
+    });
+
+    it('should render a data source managed alert rule', () => {
+      renderRuleViewer(mockRule, mockRuleIdentifier);
+
+      // assert on basic info to be vissible
+      expect(screen.getByText('Test alert')).toBeInTheDocument();
+      expect(screen.getByText('Firing')).toBeInTheDocument();
+
+      expect(screen.getByText(mockRule.annotations[Annotation.summary])).toBeInTheDocument();
+      expect(screen.getByRole('link', { name: 'View panel' })).toBeInTheDocument();
+      expect(screen.getByRole('link', { name: mockRule.annotations[Annotation.runbookURL] })).toBeInTheDocument();
+      expect(screen.getByText(`Every ${mockRule.group.interval}`)).toBeInTheDocument();
+    });
+  });
+});
+
+const renderRuleViewer = async (rule: CombinedRule, identifier: RuleIdentifier) => {
+  render(
+    <AlertRuleProvider identifier={identifier} rule={rule}>
+      <RuleViewer />
+    </AlertRuleProvider>,
+    { wrapper: TestProvider }
+  );
+
+  await waitFor(() => expect(ELEMENTS.loading.query()).not.toBeInTheDocument());
+};
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  useReturnToPrevious: jest.fn(),
+}));
diff --git a/public/app/features/alerting/unified/components/rule-viewer/RuleViewer.tsx b/public/app/features/alerting/unified/components/rule-viewer/RuleViewer.tsx
new file mode 100644
index 0000000000000..e82a9d76eba94
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-viewer/RuleViewer.tsx
@@ -0,0 +1,335 @@
+import { css } from '@emotion/css';
+import { isEmpty, truncate } from 'lodash';
+import React, { useState } from 'react';
+
+import { NavModelItem, UrlQueryValue } from '@grafana/data';
+import { Alert, LinkButton, Stack, TabContent, Text, TextLink, useStyles2 } from '@grafana/ui';
+import { PageInfoItem } from 'app/core/components/Page/types';
+import { useQueryParams } from 'app/core/hooks/useQueryParams';
+import { CombinedRule, RuleHealth, RuleIdentifier } from 'app/types/unified-alerting';
+import { PromAlertingRuleState, PromRuleType } from 'app/types/unified-alerting-dto';
+
+import { defaultPageNav } from '../../RuleViewer';
+import { Annotation } from '../../utils/constants';
+import { makeDashboardLink, makePanelLink } from '../../utils/misc';
+import { isAlertingRule, isFederatedRuleGroup, isGrafanaRulerRule, isRecordingRule } from '../../utils/rules';
+import { createUrl } from '../../utils/url';
+import { AlertLabels } from '../AlertLabels';
+import { AlertingPageWrapper } from '../AlertingPageWrapper';
+import { ProvisionedResource, ProvisioningAlert } from '../Provisioning';
+import { WithReturnButton } from '../WithReturnButton';
+import { decodeGrafanaNamespace } from '../expressions/util';
+import { RedirectToCloneRule } from '../rules/CloneRule';
+
+import { useAlertRulePageActions } from './Actions';
+import { useDeleteModal } from './DeleteModal';
+import { FederatedRuleWarning } from './FederatedRuleWarning';
+import { useAlertRule } from './RuleContext';
+import { RecordingBadge, StateBadge } from './StateBadges';
+import { Details } from './tabs/Details';
+import { History } from './tabs/History';
+import { InstancesList } from './tabs/Instances';
+import { QueryResults } from './tabs/Query';
+import { Routing } from './tabs/Routing';
+
+enum ActiveTab {
+  Query = 'query',
+  Instances = 'instances',
+  History = 'history',
+  Routing = 'routing',
+  Details = 'details',
+}
+
+const RuleViewer = () => {
+  const { rule } = useAlertRule();
+  const { pageNav, activeTab } = usePageNav(rule);
+
+  // this will be used to track if we are in the process of cloning a rule
+  // we want to be able to show a modal if the rule has been provisioned explain the limitations
+  // of duplicating provisioned alert rules
+  const [duplicateRuleIdentifier, setDuplicateRuleIdentifier] = useState<RuleIdentifier>();
+
+  const [deleteModal, showDeleteModal] = useDeleteModal();
+  const actions = useAlertRulePageActions({
+    handleDuplicateRule: setDuplicateRuleIdentifier,
+    handleDelete: showDeleteModal,
+  });
+
+  const { annotations, promRule } = rule;
+  const hasError = isErrorHealth(rule.promRule?.health);
+
+  const isAlertType = isAlertingRule(promRule);
+
+  const isFederatedRule = isFederatedRuleGroup(rule.group);
+  const isProvisioned = isGrafanaRulerRule(rule.rulerRule) && Boolean(rule.rulerRule.grafana_alert.provenance);
+
+  const summary = annotations[Annotation.summary];
+
+  return (
+    <AlertingPageWrapper
+      pageNav={pageNav}
+      navId="alert-list"
+      isLoading={false}
+      renderTitle={(title) => (
+        <Title
+          name={title}
+          state={isAlertType ? promRule.state : undefined}
+          health={rule.promRule?.health}
+          ruleType={rule.promRule?.type}
+        />
+      )}
+      actions={actions}
+      info={createMetadata(rule)}
+      subTitle={
+        <Stack direction="column">
+          {summary}
+          {/* alerts and notifications and stuff */}
+          {isFederatedRule && <FederatedRuleWarning />}
+          {/* indicator for rules in a provisioned group */}
+          {isProvisioned && (
+            <ProvisioningAlert resource={ProvisionedResource.AlertRule} bottomSpacing={0} topSpacing={2} />
+          )}
+          {/* error state */}
+          {hasError && (
+            <Alert title="Something went wrong when evaluating this alert rule" bottomSpacing={0} topSpacing={2}>
+              <pre style={{ marginBottom: 0 }}>
+                <code>{rule.promRule?.lastError ?? 'No error message'}</code>
+              </pre>
+            </Alert>
+          )}
+        </Stack>
+      }
+    >
+      <Stack direction="column" gap={2}>
+        {/* tabs and tab content */}
+        <TabContent>
+          {activeTab === ActiveTab.Query && <QueryResults rule={rule} />}
+          {activeTab === ActiveTab.Instances && <InstancesList rule={rule} />}
+          {activeTab === ActiveTab.History && isGrafanaRulerRule(rule.rulerRule) && <History rule={rule.rulerRule} />}
+          {activeTab === ActiveTab.Routing && <Routing />}
+          {activeTab === ActiveTab.Details && <Details rule={rule} />}
+        </TabContent>
+      </Stack>
+
+      {deleteModal}
+      {duplicateRuleIdentifier && (
+        <RedirectToCloneRule
+          redirectTo={true}
+          identifier={duplicateRuleIdentifier}
+          isProvisioned={isProvisioned}
+          onDismiss={() => setDuplicateRuleIdentifier(undefined)}
+        />
+      )}
+    </AlertingPageWrapper>
+  );
+};
+
+const createMetadata = (rule: CombinedRule): PageInfoItem[] => {
+  const { labels, annotations, group } = rule;
+  const metadata: PageInfoItem[] = [];
+
+  const runbookUrl = annotations[Annotation.runbookURL];
+  const dashboardUID = annotations[Annotation.dashboardUID];
+  const panelID = annotations[Annotation.panelID];
+
+  const hasDashboardAndPanel = dashboardUID && panelID;
+  const hasDashboard = dashboardUID;
+  const hasLabels = !isEmpty(labels);
+
+  const interval = group.interval;
+
+  if (runbookUrl) {
+    metadata.push({
+      label: 'Runbook',
+      value: (
+        <TextLink variant="bodySmall" href={runbookUrl} external>
+          {/* TODO instead of truncating the string, we should use flex and text overflow properly to allow it to take up all of the horizontal space available */}
+          {truncate(runbookUrl, { length: 42 })}
+        </TextLink>
+      ),
+    });
+  }
+
+  if (hasDashboardAndPanel) {
+    metadata.push({
+      label: 'Dashboard and panel',
+      value: (
+        <WithReturnButton
+          title={rule.name}
+          component={
+            <TextLink variant="bodySmall" href={makePanelLink(dashboardUID, panelID)}>
+              View panel
+            </TextLink>
+          }
+        />
+      ),
+    });
+  } else if (hasDashboard) {
+    metadata.push({
+      label: 'Dashboard',
+      value: (
+        <WithReturnButton
+          title={rule.name}
+          component={
+            <TextLink title={rule.name} variant="bodySmall" href={makeDashboardLink(dashboardUID)}>
+              View dashboard
+            </TextLink>
+          }
+        />
+      ),
+    });
+  }
+
+  if (interval) {
+    metadata.push({
+      label: 'Evaluation interval',
+      value: <Text color="primary">Every {interval}</Text>,
+    });
+  }
+
+  if (hasLabels) {
+    metadata.push({
+      label: 'Labels',
+      /* TODO truncate number of labels, maybe build in to component? */
+      value: <AlertLabels labels={labels} size="sm" />,
+    });
+  }
+
+  return metadata;
+};
+
+// TODO move somewhere else
+export const createListFilterLink = (values: Array<[string, string]>) => {
+  const params = new URLSearchParams([['search', values.map(([key, value]) => `${key}:"${value}"`).join(' ')]]);
+  return createUrl(`/alerting/list?` + params.toString());
+};
+
+interface TitleProps {
+  name: string;
+  // recording rules don't have a state
+  state?: PromAlertingRuleState;
+  health?: RuleHealth;
+  ruleType?: PromRuleType;
+}
+
+export const Title = ({ name, state, health, ruleType }: TitleProps) => {
+  const styles = useStyles2(getStyles);
+  const isRecordingRule = ruleType === PromRuleType.Recording;
+
+  return (
+    <div className={styles.title}>
+      <LinkButton variant="secondary" icon="angle-left" href="/alerting/list" />
+      <Text variant="h1" truncate>
+        {name}
+      </Text>
+      {/* recording rules won't have a state */}
+      {state && <StateBadge state={state} health={health} />}
+      {isRecordingRule && <RecordingBadge health={health} />}
+    </div>
+  );
+};
+
+export const isErrorHealth = (health?: RuleHealth) => health === 'error' || health === 'err';
+
+function useActiveTab(): [ActiveTab, (tab: ActiveTab) => void] {
+  const [queryParams, setQueryParams] = useQueryParams();
+  const tabFromQuery = queryParams['tab'];
+
+  const activeTab = isValidTab(tabFromQuery) ? tabFromQuery : ActiveTab.Query;
+
+  const setActiveTab = (tab: ActiveTab) => {
+    setQueryParams({ tab });
+  };
+
+  return [activeTab, setActiveTab];
+}
+
+function isValidTab(tab: UrlQueryValue): tab is ActiveTab {
+  const isString = typeof tab === 'string';
+  // @ts-ignore
+  return isString && Object.values(ActiveTab).includes(tab);
+}
+
+function usePageNav(rule: CombinedRule) {
+  const [activeTab, setActiveTab] = useActiveTab();
+
+  const { annotations, promRule } = rule;
+
+  const summary = annotations[Annotation.summary];
+  const isAlertType = isAlertingRule(promRule);
+  const numberOfInstance = isAlertType ? (promRule.alerts ?? []).length : undefined;
+
+  const namespaceName = decodeGrafanaNamespace(rule.namespace).name;
+  const groupName = rule.group.name;
+
+  const isGrafanaAlertRule = isGrafanaRulerRule(rule.rulerRule) && isAlertType;
+  const isRecordingRuleType = isRecordingRule(rule.promRule);
+
+  const pageNav: NavModelItem = {
+    ...defaultPageNav,
+    text: rule.name,
+    subTitle: summary,
+    children: [
+      {
+        text: 'Query and conditions',
+        active: activeTab === ActiveTab.Query,
+        onClick: () => {
+          setActiveTab(ActiveTab.Query);
+        },
+      },
+      {
+        text: 'Instances',
+        active: activeTab === ActiveTab.Instances,
+        onClick: () => {
+          setActiveTab(ActiveTab.Instances);
+        },
+        tabCounter: numberOfInstance,
+        hideFromTabs: isRecordingRuleType,
+      },
+      {
+        text: 'History',
+        active: activeTab === ActiveTab.History,
+        onClick: () => {
+          setActiveTab(ActiveTab.History);
+        },
+        // alert state history is only available for Grafana managed alert rules
+        hideFromTabs: !isGrafanaAlertRule,
+      },
+      {
+        text: 'Details',
+        active: activeTab === ActiveTab.Details,
+        onClick: () => {
+          setActiveTab(ActiveTab.Details);
+        },
+      },
+    ],
+    parentItem: {
+      text: groupName,
+      url: createListFilterLink([
+        ['namespace', namespaceName],
+        ['group', groupName],
+      ]),
+      // @TODO support nested folders here
+      parentItem: {
+        text: namespaceName,
+        url: createListFilterLink([['namespace', namespaceName]]),
+      },
+    },
+  };
+
+  return {
+    pageNav,
+    activeTab,
+  };
+}
+
+const getStyles = () => ({
+  title: css({
+    display: 'flex',
+    alignItems: 'center',
+    gap: 8,
+    minWidth: 0,
+  }),
+});
+
+export default RuleViewer;
diff --git a/public/app/features/alerting/unified/components/rule-viewer/RuleViewer.v1.test.tsx b/public/app/features/alerting/unified/components/rule-viewer/RuleViewer.v1.test.tsx
deleted file mode 100644
index dce2c07b1e234..0000000000000
--- a/public/app/features/alerting/unified/components/rule-viewer/RuleViewer.v1.test.tsx
+++ /dev/null
@@ -1,352 +0,0 @@
-import { render, screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import React from 'react';
-import { TestProvider } from 'test/helpers/TestProvider';
-import { byRole, byText } from 'testing-library-selector';
-
-import { locationService, setBackendSrv } from '@grafana/runtime';
-import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
-import { backendSrv } from 'app/core/services/backend_srv';
-import { contextSrv } from 'app/core/services/context_srv';
-import { AlertmanagerChoice } from 'app/plugins/datasource/alertmanager/types';
-import { AccessControlAction } from 'app/types';
-import { CombinedRule } from 'app/types/unified-alerting';
-import { PromAlertingRuleState, PromApplication } from 'app/types/unified-alerting-dto';
-
-import { discoverFeatures } from '../../api/buildInfo';
-import { useIsRuleEditable } from '../../hooks/useIsRuleEditable';
-import { mockAlertRuleApi, setupMswServer } from '../../mockApi';
-import {
-  getCloudRule,
-  getGrafanaRule,
-  grantUserPermissions,
-  mockDataSource,
-  mockPromAlertingRule,
-  mockRulerAlertingRule,
-  promRuleFromRulerRule,
-} from '../../mocks';
-import { mockAlertmanagerChoiceResponse } from '../../mocks/alertmanagerApi';
-import { mockPluginSettings } from '../../mocks/plugins';
-import { setupDataSources } from '../../testSetup/datasources';
-import { SupportedPlugin } from '../../types/pluginBridges';
-import * as ruleId from '../../utils/rule-id';
-
-import { RuleViewer } from './RuleViewer.v1';
-
-const mockGrafanaRule = getGrafanaRule({ name: 'Test alert' }, { uid: 'test1', title: 'Test alert' });
-const mockCloudRule = getCloudRule({ name: 'cloud test alert' });
-
-const mockRoute = (id?: string): GrafanaRouteComponentProps<{ id?: string; sourceName?: string }> => ({
-  route: {
-    path: '/',
-    component: RuleViewer,
-  },
-  queryParams: { returnTo: '/alerting/list' },
-  match: { params: { id: id ?? 'test1', sourceName: 'grafana' }, isExact: false, url: 'asdf', path: '' },
-  history: locationService.getHistory(),
-  location: { pathname: '', hash: '', search: '', state: '' },
-  staticContext: {},
-});
-
-jest.mock('../../hooks/useIsRuleEditable');
-jest.mock('../../api/buildInfo');
-
-const mocks = {
-  useIsRuleEditable: jest.mocked(useIsRuleEditable),
-};
-
-const ui = {
-  actionButtons: {
-    edit: byRole('link', { name: /edit/i }),
-    silence: byRole('link', { name: 'Silence' }),
-  },
-  moreButton: byRole('button', { name: /More/i }),
-  moreButtons: {
-    duplicate: byRole('menuitem', { name: /^Duplicate$/i }),
-    delete: byRole('menuitem', { name: /delete/i }),
-  },
-  loadingIndicator: byText(/Loading rule/i),
-};
-
-const renderRuleViewer = async (ruleId: string) => {
-  locationService.push(`/alerting/grafana/${ruleId}/view`);
-  render(
-    <TestProvider>
-      <RuleViewer {...mockRoute(ruleId)} />
-    </TestProvider>
-  );
-
-  await waitFor(() => expect(ui.loadingIndicator.query()).not.toBeInTheDocument());
-};
-
-const server = setupMswServer();
-
-const dsName = 'prometheus';
-const rulerRule = mockRulerAlertingRule({ alert: 'cloud test alert' });
-const rulerRuleIdentifier = ruleId.fromRulerRule('prometheus', 'ns-default', 'group-default', rulerRule);
-
-beforeAll(() => {
-  setBackendSrv(backendSrv);
-
-  // some action buttons need to check what Alertmanager setup we have for Grafana managed rules
-  mockAlertmanagerChoiceResponse(server, {
-    alertmanagersChoice: AlertmanagerChoice.Internal,
-    numExternalAlertmanagers: 1,
-  });
-  // we need to mock this one for the "declare incident" button
-  mockPluginSettings(server, SupportedPlugin.Incident);
-
-  const promDsSettings = mockDataSource({
-    name: dsName,
-    uid: dsName,
-  });
-
-  setupDataSources(promDsSettings);
-
-  mockAlertRuleApi(server).rulerRules('grafana', {
-    [mockGrafanaRule.namespace.name]: [
-      { name: mockGrafanaRule.group.name, interval: '1m', rules: [mockGrafanaRule.rulerRule!] },
-    ],
-  });
-
-  const { name, query, labels, annotations } = mockGrafanaRule;
-  mockAlertRuleApi(server).prometheusRuleNamespaces('grafana', {
-    data: {
-      groups: [
-        {
-          file: mockGrafanaRule.namespace.name,
-          interval: 60,
-          name: mockGrafanaRule.group.name,
-          rules: [mockPromAlertingRule({ name, query, labels, annotations })],
-        },
-      ],
-    },
-    status: 'success',
-  });
-
-  mockAlertRuleApi(server).rulerRuleGroup(dsName, 'ns-default', 'group-default', {
-    name: 'group-default',
-    interval: '1m',
-    rules: [rulerRule],
-  });
-
-  mockAlertRuleApi(server).prometheusRuleNamespaces(dsName, {
-    data: {
-      groups: [
-        {
-          file: 'ns-default',
-          interval: 60,
-          name: 'group-default',
-          rules: [promRuleFromRulerRule(rulerRule, { state: PromAlertingRuleState.Inactive })],
-        },
-      ],
-    },
-    status: 'success',
-  });
-});
-
-describe('RuleViewer', () => {
-  let mockCombinedRule = jest.fn();
-
-  afterEach(() => {
-    mockCombinedRule.mockReset();
-  });
-
-  it('should render page with grafana alert', async () => {
-    mocks.useIsRuleEditable.mockReturnValue({ loading: false, isEditable: false });
-    await renderRuleViewer('test1');
-
-    expect(screen.getByText(/test alert/i)).toBeInTheDocument();
-  });
-
-  it('should render page with cloud alert', async () => {
-    jest.spyOn(contextSrv, 'hasPermission').mockReturnValue(true);
-
-    jest
-      .mocked(discoverFeatures)
-      .mockResolvedValue({ application: PromApplication.Mimir, features: { rulerApiEnabled: true } });
-
-    mocks.useIsRuleEditable.mockReturnValue({ loading: false, isEditable: false });
-    await renderRuleViewer(ruleId.stringifyIdentifier(rulerRuleIdentifier));
-
-    expect(screen.getByText(/cloud test alert/i)).toBeInTheDocument();
-  });
-});
-
-describe('RuleDetails RBAC', () => {
-  describe('Grafana rules action buttons in details', () => {
-    let mockCombinedRule = jest.fn();
-
-    beforeEach(() => {
-      // mockCombinedRule = jest.mocked(useCombinedRule);
-    });
-
-    afterEach(() => {
-      mockCombinedRule.mockReset();
-    });
-    it('Should render Edit button for users with the update permission', async () => {
-      // Arrange
-      mocks.useIsRuleEditable.mockReturnValue({ loading: false, isEditable: true });
-      mockCombinedRule.mockReturnValue({
-        result: mockGrafanaRule as CombinedRule,
-        loading: false,
-        dispatched: true,
-        requestId: 'A',
-        error: undefined,
-      });
-
-      // Act
-      await renderRuleViewer('test1');
-
-      // Assert
-      expect(ui.actionButtons.edit.get()).toBeInTheDocument();
-    });
-
-    it('Should render Delete button for users with the delete permission', async () => {
-      // Arrange
-      mockCombinedRule.mockReturnValue({
-        result: mockGrafanaRule as CombinedRule,
-        loading: false,
-        dispatched: true,
-        requestId: 'A',
-        error: undefined,
-      });
-      mocks.useIsRuleEditable.mockReturnValue({ loading: false, isRemovable: true });
-
-      const user = userEvent.setup();
-
-      // Act
-      await renderRuleViewer('test1');
-      await user.click(ui.moreButton.get());
-
-      // Assert
-      expect(ui.moreButtons.delete.get()).toBeInTheDocument();
-    });
-
-    it('Should not render Silence button for users wihout the instance create permission', async () => {
-      // Arrange
-      mockCombinedRule.mockReturnValue({
-        result: mockGrafanaRule as CombinedRule,
-        loading: false,
-        dispatched: true,
-        requestId: 'A',
-        error: undefined,
-      });
-      jest.spyOn(contextSrv, 'hasPermission').mockReturnValue(false);
-
-      // Act
-      await renderRuleViewer('test1');
-
-      // Assert
-      await waitFor(() => {
-        expect(ui.actionButtons.silence.query()).not.toBeInTheDocument();
-      });
-    });
-
-    it('Should render Silence button for users with the instance create permissions', async () => {
-      // Arrange
-      mockCombinedRule.mockReturnValue({
-        result: mockGrafanaRule as CombinedRule,
-        loading: false,
-        dispatched: true,
-        requestId: 'A',
-        error: undefined,
-      });
-      jest
-        .spyOn(contextSrv, 'hasPermission')
-        .mockImplementation((action) => action === AccessControlAction.AlertingInstanceCreate);
-
-      // Act
-      await renderRuleViewer('test1');
-
-      // Assert
-      await waitFor(() => {
-        expect(ui.actionButtons.silence.query()).toBeInTheDocument();
-      });
-    });
-
-    it('Should render clone button for users having create rule permission', async () => {
-      mocks.useIsRuleEditable.mockReturnValue({ loading: false, isEditable: false });
-      mockCombinedRule.mockReturnValue({
-        result: getGrafanaRule({ name: 'Grafana rule' }),
-        loading: false,
-        dispatched: true,
-      });
-      grantUserPermissions([AccessControlAction.AlertingRuleCreate]);
-
-      const user = userEvent.setup();
-
-      await renderRuleViewer('test1');
-      await user.click(ui.moreButton.get());
-
-      expect(ui.moreButtons.duplicate.get()).toBeInTheDocument();
-    });
-
-    it('Should NOT render clone button for users without create rule permission', async () => {
-      mocks.useIsRuleEditable.mockReturnValue({ loading: false, isEditable: true });
-      mockCombinedRule.mockReturnValue({
-        result: getGrafanaRule({ name: 'Grafana rule' }),
-        loading: false,
-        dispatched: true,
-      });
-
-      const { AlertingRuleRead, AlertingRuleUpdate, AlertingRuleDelete } = AccessControlAction;
-      grantUserPermissions([AlertingRuleRead, AlertingRuleUpdate, AlertingRuleDelete]);
-      const user = userEvent.setup();
-
-      await renderRuleViewer('test1');
-      await user.click(ui.moreButton.get());
-
-      expect(ui.moreButtons.duplicate.query()).not.toBeInTheDocument();
-    });
-  });
-  describe('Cloud rules action buttons', () => {
-    let mockCombinedRule = jest.fn();
-
-    beforeEach(() => {
-      // mockCombinedRule = jest.mocked(useCombinedRule);
-    });
-
-    afterEach(() => {
-      mockCombinedRule.mockReset();
-    });
-    it('Should render edit button for users with the update permission', async () => {
-      // Arrange
-      mocks.useIsRuleEditable.mockReturnValue({ loading: false, isEditable: true });
-      mockCombinedRule.mockReturnValue({
-        result: mockCloudRule as CombinedRule,
-        loading: false,
-        dispatched: true,
-        requestId: 'A',
-        error: undefined,
-      });
-
-      // Act
-      await renderRuleViewer('test1');
-
-      // Assert
-      expect(ui.actionButtons.edit.query()).toBeInTheDocument();
-    });
-
-    it('Should render Delete button for users with the delete permission', async () => {
-      // Arrange
-      mockCombinedRule.mockReturnValue({
-        result: mockCloudRule as CombinedRule,
-        loading: false,
-        dispatched: true,
-        requestId: 'A',
-        error: undefined,
-      });
-      mocks.useIsRuleEditable.mockReturnValue({ loading: false, isRemovable: true });
-
-      const user = userEvent.setup();
-
-      // Act
-      await renderRuleViewer('test1');
-      await user.click(ui.moreButton.get());
-
-      // Assert
-      expect(ui.moreButtons.delete.query()).toBeInTheDocument();
-    });
-  });
-});
diff --git a/public/app/features/alerting/unified/components/rule-viewer/RuleViewer.v1.tsx b/public/app/features/alerting/unified/components/rule-viewer/RuleViewer.v1.tsx
deleted file mode 100644
index 6081d1b1a0757..0000000000000
--- a/public/app/features/alerting/unified/components/rule-viewer/RuleViewer.v1.tsx
+++ /dev/null
@@ -1,333 +0,0 @@
-import { css } from '@emotion/css';
-import { produce } from 'immer';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { useObservable, useToggle } from 'react-use';
-
-import { GrafanaTheme2, LoadingState, PanelData, RelativeTimeRange } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { config, isFetchError } from '@grafana/runtime';
-import { Alert, Button, Collapse, Icon, IconButton, LoadingPlaceholder, useStyles2, VerticalGroup } from '@grafana/ui';
-import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
-
-import { DEFAULT_PER_PAGE_PAGINATION } from '../../../../../core/constants';
-import { AlertQuery, GrafanaRuleDefinition } from '../../../../../types/unified-alerting-dto';
-import { GrafanaRuleQueryViewer, QueryPreview } from '../../GrafanaRuleQueryViewer';
-import { useAlertQueriesStatus } from '../../hooks/useAlertQueriesStatus';
-import { useCombinedRule } from '../../hooks/useCombinedRule';
-import { AlertingQueryRunner } from '../../state/AlertingQueryRunner';
-import { useCleanAnnotations } from '../../utils/annotations';
-import { getRulesSourceByName } from '../../utils/datasource';
-import { alertRuleToQueries } from '../../utils/query';
-import * as ruleId from '../../utils/rule-id';
-import { isFederatedRuleGroup, isGrafanaRulerRule } from '../../utils/rules';
-import { AlertLabels } from '../AlertLabels';
-import { DetailsField } from '../DetailsField';
-import { ProvisionedResource, ProvisioningAlert } from '../Provisioning';
-import { RuleViewerLayout, RuleViewerLayoutContent } from '../rule-viewer/RuleViewerLayout';
-import { RuleDetailsActionButtons } from '../rules/RuleDetailsActionButtons';
-import { RuleDetailsAnnotations } from '../rules/RuleDetailsAnnotations';
-import { RuleDetailsDataSources } from '../rules/RuleDetailsDataSources';
-import { RuleDetailsExpression } from '../rules/RuleDetailsExpression';
-import { RuleDetailsFederatedSources } from '../rules/RuleDetailsFederatedSources';
-import { RuleDetailsMatchingInstances } from '../rules/RuleDetailsMatchingInstances';
-import { RuleHealth } from '../rules/RuleHealth';
-import { RuleState } from '../rules/RuleState';
-
-type RuleViewerProps = GrafanaRouteComponentProps<{ id?: string; sourceName?: string }>;
-
-const errorMessage = 'Could not find data source for rule';
-const errorTitle = 'Could not view rule';
-const pageTitle = 'View rule';
-
-export function RuleViewer({ match }: RuleViewerProps) {
-  const styles = useStyles2(getStyles);
-  const [expandQuery, setExpandQuery] = useToggle(false);
-
-  const identifier = useMemo(() => {
-    const id = ruleId.getRuleIdFromPathname(match.params);
-    if (!id) {
-      throw new Error('Rule ID is required');
-    }
-
-    return ruleId.parse(id, true);
-  }, [match.params]);
-
-  const { loading, error, result: rule } = useCombinedRule({ ruleIdentifier: identifier });
-
-  const runner = useMemo(() => new AlertingQueryRunner(), []);
-  const data = useObservable(runner.get());
-  const queries = useMemo(() => alertRuleToQueries(rule), [rule]);
-  const annotations = useCleanAnnotations(rule?.annotations || {});
-
-  const [evaluationTimeRanges, setEvaluationTimeRanges] = useState<Record<string, RelativeTimeRange>>({});
-
-  const { allDataSourcesAvailable } = useAlertQueriesStatus(queries);
-
-  const onRunQueries = useCallback(() => {
-    if (queries.length > 0 && allDataSourcesAvailable) {
-      const evalCustomizedQueries = queries.map<AlertQuery>((q) => ({
-        ...q,
-        relativeTimeRange: evaluationTimeRanges[q.refId] ?? q.relativeTimeRange,
-      }));
-
-      runner.run(evalCustomizedQueries);
-    }
-  }, [queries, evaluationTimeRanges, runner, allDataSourcesAvailable]);
-
-  useEffect(() => {
-    const alertQueries = alertRuleToQueries(rule);
-    const defaultEvalTimeRanges = Object.fromEntries(
-      alertQueries.map((q) => [q.refId, q.relativeTimeRange ?? { from: 0, to: 0 }])
-    );
-
-    setEvaluationTimeRanges(defaultEvalTimeRanges);
-  }, [rule]);
-
-  useEffect(() => {
-    if (allDataSourcesAvailable && expandQuery) {
-      onRunQueries();
-    }
-  }, [onRunQueries, allDataSourcesAvailable, expandQuery]);
-
-  useEffect(() => {
-    return () => runner.destroy();
-  }, [runner]);
-
-  const onQueryTimeRangeChange = useCallback(
-    (refId: string, timeRange: RelativeTimeRange) => {
-      const newEvalTimeRanges = produce(evaluationTimeRanges, (draft) => {
-        draft[refId] = timeRange;
-      });
-      setEvaluationTimeRanges(newEvalTimeRanges);
-    },
-    [evaluationTimeRanges, setEvaluationTimeRanges]
-  );
-
-  if (!identifier?.ruleSourceName) {
-    return (
-      <RuleViewerLayout title={pageTitle}>
-        <Alert title={errorTitle}>
-          <details className={styles.errorMessage}>{errorMessage}</details>
-        </Alert>
-      </RuleViewerLayout>
-    );
-  }
-
-  const rulesSource = getRulesSourceByName(identifier.ruleSourceName);
-
-  if (loading) {
-    return (
-      <RuleViewerLayout title={pageTitle}>
-        <LoadingPlaceholder text="Loading rule..." />
-      </RuleViewerLayout>
-    );
-  }
-
-  if (error || !rulesSource) {
-    return (
-      <Alert title={errorTitle}>
-        <details className={styles.errorMessage}>
-          {isFetchError(error) ? error.message : errorMessage}
-          <br />
-          {/* TODO  Fix typescript */}
-          {/* {error && error?.stack} */}
-        </details>
-      </Alert>
-    );
-  }
-
-  if (!rule) {
-    return (
-      <RuleViewerLayout title={pageTitle}>
-        <span>Rule could not be found.</span>
-      </RuleViewerLayout>
-    );
-  }
-
-  const isFederatedRule = isFederatedRuleGroup(rule.group);
-  const isProvisioned = isGrafanaRulerRule(rule.rulerRule) && Boolean(rule.rulerRule.grafana_alert.provenance);
-
-  return (
-    <>
-      {isFederatedRule && (
-        <Alert severity="info" title="This rule is part of a federated rule group.">
-          <VerticalGroup>
-            Federated rule groups are currently an experimental feature.
-            <Button fill="text" icon="book">
-              <a href="https://grafana.com/docs/metrics-enterprise/latest/tenant-management/tenant-federation/#cross-tenant-alerting-and-recording-rule-federation">
-                Read documentation
-              </a>
-            </Button>
-          </VerticalGroup>
-        </Alert>
-      )}
-      {isProvisioned && <ProvisioningAlert resource={ProvisionedResource.AlertRule} />}
-      <RuleViewerLayoutContent>
-        <div>
-          <Stack direction="row" alignItems="center" wrap={false} gap={1}>
-            <Icon name="bell" size="lg" /> <span className={styles.title}>{rule.name}</span>
-          </Stack>
-          <RuleState rule={rule} isCreating={false} isDeleting={false} />
-          <RuleDetailsActionButtons rule={rule} rulesSource={rulesSource} isViewMode={true} />
-        </div>
-        <div className={styles.details}>
-          <div className={styles.leftSide}>
-            {rule.promRule && (
-              <DetailsField label="Health" horizontal={true}>
-                <RuleHealth rule={rule.promRule} />
-              </DetailsField>
-            )}
-            {!!rule.labels && !!Object.keys(rule.labels).length && (
-              <DetailsField label="Labels" horizontal={true}>
-                <AlertLabels labels={rule.labels} />
-              </DetailsField>
-            )}
-            <RuleDetailsExpression rulesSource={rulesSource} rule={rule} annotations={annotations} />
-            <RuleDetailsAnnotations annotations={annotations} />
-          </div>
-          <div className={styles.rightSide}>
-            <RuleDetailsDataSources rule={rule} rulesSource={rulesSource} />
-            {isFederatedRule && <RuleDetailsFederatedSources group={rule.group} />}
-            <DetailsField label="Namespace / Group" className={styles.rightSideDetails}>
-              {rule.namespace.name} / {rule.group.name}
-            </DetailsField>
-            {isGrafanaRulerRule(rule.rulerRule) && <GrafanaRuleUID rule={rule.rulerRule.grafana_alert} />}
-          </div>
-        </div>
-        <div>
-          <RuleDetailsMatchingInstances
-            rule={rule}
-            pagination={{ itemsPerPage: DEFAULT_PER_PAGE_PAGINATION }}
-            enableFiltering
-          />
-        </div>
-      </RuleViewerLayoutContent>
-      <Collapse
-        label="Query & Results"
-        isOpen={expandQuery}
-        onToggle={setExpandQuery}
-        loading={data && isLoading(data)}
-        collapsible={true}
-        className={styles.collapse}
-      >
-        {isGrafanaRulerRule(rule.rulerRule) && !isFederatedRule && (
-          <GrafanaRuleQueryViewer
-            condition={rule.rulerRule.grafana_alert.condition}
-            queries={queries}
-            evalDataByQuery={data}
-            evalTimeRanges={evaluationTimeRanges}
-            onTimeRangeChange={onQueryTimeRangeChange}
-          />
-        )}
-
-        {!isGrafanaRulerRule(rule.rulerRule) && !isFederatedRule && data && Object.keys(data).length > 0 && (
-          <div className={styles.queries}>
-            {queries.map((query) => {
-              return (
-                <QueryPreview
-                  key={query.refId}
-                  refId={query.refId}
-                  model={query.model}
-                  dataSource={Object.values(config.datasources).find((ds) => ds.uid === query.datasourceUid)}
-                  queryData={data[query.refId]}
-                  relativeTimeRange={query.relativeTimeRange}
-                  evalTimeRange={evaluationTimeRanges[query.refId]}
-                  onEvalTimeRangeChange={(timeRange) => onQueryTimeRangeChange(query.refId, timeRange)}
-                  isAlertCondition={false}
-                />
-              );
-            })}
-          </div>
-        )}
-        {!isFederatedRule && !allDataSourcesAvailable && (
-          <Alert title="Query not available" severity="warning" className={styles.queryWarning}>
-            Cannot display the query preview. Some of the data sources used in the queries are not available.
-          </Alert>
-        )}
-      </Collapse>
-    </>
-  );
-}
-
-function GrafanaRuleUID({ rule }: { rule: GrafanaRuleDefinition }) {
-  const styles = useStyles2(getStyles);
-  const copyUID = () => navigator.clipboard && navigator.clipboard.writeText(rule.uid);
-
-  return (
-    <DetailsField label="Rule UID" childrenWrapperClassName={styles.ruleUid}>
-      {rule.uid} <IconButton name="copy" onClick={copyUID} tooltip="Copy rule UID" />
-    </DetailsField>
-  );
-}
-
-function isLoading(data: Record<string, PanelData>): boolean {
-  return !!Object.values(data).find((d) => d.state === LoadingState.Loading);
-}
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    errorMessage: css`
-      white-space: pre-wrap;
-    `,
-    queries: css`
-      height: 100%;
-      width: 100%;
-    `,
-    collapse: css`
-      margin-top: ${theme.spacing(2)};
-      border-color: ${theme.colors.border.weak};
-      border-radius: ${theme.shape.radius.default};
-    `,
-    queriesTitle: css`
-      padding: ${theme.spacing(2, 0.5)};
-      font-size: ${theme.typography.h5.fontSize};
-      font-weight: ${theme.typography.fontWeightBold};
-      font-family: ${theme.typography.h5.fontFamily};
-    `,
-    query: css`
-      border-bottom: 1px solid ${theme.colors.border.medium};
-      padding: ${theme.spacing(2)};
-    `,
-    queryWarning: css`
-      margin: ${theme.spacing(4, 0)};
-    `,
-    title: css`
-      font-size: ${theme.typography.h4.fontSize};
-      font-weight: ${theme.typography.fontWeightBold};
-      overflow: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-    `,
-    details: css`
-      display: flex;
-      flex-direction: row;
-      gap: ${theme.spacing(4)};
-    `,
-    leftSide: css`
-      flex: 1;
-      overflow: hidden;
-    `,
-    rightSide: css`
-      padding-right: ${theme.spacing(3)};
-
-      max-width: 360px;
-      word-break: break-all;
-      overflow: hidden;
-    `,
-    rightSideDetails: css`
-      & > div:first-child {
-        width: auto;
-      }
-    `,
-    labels: css`
-      justify-content: flex-start;
-    `,
-    ruleUid: css`
-      display: flex;
-      align-items: center;
-      gap: ${theme.spacing(1)};
-    `,
-  };
-};
-
-export default RuleViewer;
diff --git a/public/app/features/alerting/unified/components/rule-viewer/RuleViewerLayout.tsx b/public/app/features/alerting/unified/components/rule-viewer/RuleViewerLayout.tsx
index e3a4c435f46b5..1fb81e436b48f 100644
--- a/public/app/features/alerting/unified/components/rule-viewer/RuleViewerLayout.tsx
+++ b/public/app/features/alerting/unified/components/rule-viewer/RuleViewerLayout.tsx
@@ -4,10 +4,12 @@ import React from 'react';
 import { GrafanaTheme2, NavModelItem } from '@grafana/data';
 import { useStyles2 } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
+import { PageProps } from 'app/core/components/Page/types';
 
 type Props = {
   children: React.ReactNode | React.ReactNode[];
   title: string;
+  renderTitle?: PageProps['renderTitle'];
   wrapInContent?: boolean;
 };
 
@@ -17,11 +19,11 @@ const defaultPageNav: Partial<NavModelItem> = {
 };
 
 export function RuleViewerLayout(props: Props): JSX.Element | null {
-  const { wrapInContent = true, children, title } = props;
+  const { wrapInContent = true, children, title, renderTitle } = props;
   const styles = useStyles2(getPageStyles);
 
   return (
-    <Page pageNav={{ ...defaultPageNav, text: title }} navId="alert-list">
+    <Page pageNav={{ ...defaultPageNav, text: title }} renderTitle={renderTitle} navId="alert-list">
       <Page.Contents>
         <div className={styles.content}>{wrapInContent ? <RuleViewerLayoutContent {...props} /> : children}</div>
       </Page.Contents>
diff --git a/public/app/features/alerting/unified/components/rule-viewer/RuleViewerVisualization.tsx b/public/app/features/alerting/unified/components/rule-viewer/RuleViewerVisualization.tsx
index ead6e0cf27f69..7cba1c7386dfa 100644
--- a/public/app/features/alerting/unified/components/rule-viewer/RuleViewerVisualization.tsx
+++ b/public/app/features/alerting/unified/components/rule-viewer/RuleViewerVisualization.tsx
@@ -1,141 +1,19 @@
-import { css } from '@emotion/css';
-import React, { useCallback } from 'react';
+import React from 'react';
 
-import {
-  DataSourceInstanceSettings,
-  DataSourceJsonData,
-  DateTime,
-  dateTime,
-  GrafanaTheme2,
-  PanelData,
-  RelativeTimeRange,
-  urlUtil,
-} from '@grafana/data';
-import { config } from '@grafana/runtime';
-import { DataSourceRef } from '@grafana/schema';
-import { DateTimePicker, LinkButton, useStyles2 } from '@grafana/ui';
-import { contextSrv } from 'app/core/core';
-import { isExpressionQuery } from 'app/features/expressions/guards';
-import { AlertDataQuery, AlertQuery } from 'app/types/unified-alerting-dto';
+import { PanelData } from '@grafana/data';
 
 import { VizWrapper } from '../rule-editor/VizWrapper';
 import { ThresholdDefinition } from '../rule-editor/util';
 
-interface RuleViewerVisualizationProps extends Pick<AlertQuery, 'refId' | 'model' | 'relativeTimeRange'> {
-  dsSettings: DataSourceInstanceSettings<DataSourceJsonData>;
+interface RuleViewerVisualizationProps {
   data?: PanelData;
   thresholds?: ThresholdDefinition;
-  onTimeRangeChange: (range: RelativeTimeRange) => void;
-  className?: string;
 }
 
-const headerHeight = 4;
-
-export function RuleViewerVisualization({
-  data,
-  model,
-  thresholds,
-  dsSettings,
-  relativeTimeRange,
-  onTimeRangeChange,
-  className,
-}: RuleViewerVisualizationProps): JSX.Element | null {
-  const styles = useStyles2(getStyles);
-  const isExpression = isExpressionQuery(model);
-
-  const onTimeChange = useCallback(
-    (newDateTime: DateTime) => {
-      const now = dateTime().unix() - newDateTime.unix();
-
-      if (relativeTimeRange) {
-        const interval = relativeTimeRange.from - relativeTimeRange.to;
-        onTimeRangeChange({ from: now + interval, to: now });
-      }
-    },
-    [onTimeRangeChange, relativeTimeRange]
-  );
-
-  const setDateTime = useCallback((relativeTimeRangeTo: number) => {
-    return relativeTimeRangeTo === 0 ? dateTime() : dateTime().subtract(relativeTimeRangeTo, 'seconds');
-  }, []);
-
+export function RuleViewerVisualization({ data, thresholds }: RuleViewerVisualizationProps): JSX.Element | null {
   if (!data) {
     return null;
   }
 
-  const allowedToExploreDataSources = contextSrv.hasAccessToExplore();
-
-  return (
-    <div className={className}>
-      <div className={styles.header}>
-        <div className={styles.actions}>
-          {!isExpression && relativeTimeRange ? (
-            <DateTimePicker date={setDateTime(relativeTimeRange.to)} onChange={onTimeChange} maxDate={new Date()} />
-          ) : null}
-
-          {allowedToExploreDataSources && !isExpression && (
-            <LinkButton
-              size="md"
-              variant="secondary"
-              icon="compass"
-              target="_blank"
-              href={createExploreLink(dsSettings, model)}
-            >
-              View in Explore
-            </LinkButton>
-          )}
-        </div>
-      </div>
-      <VizWrapper data={data} thresholds={thresholds?.config} thresholdsType={thresholds?.mode} />
-    </div>
-  );
-}
-
-function createExploreLink(settings: DataSourceRef, model: AlertDataQuery): string {
-  const { uid, type } = settings;
-  const { refId, ...rest } = model;
-
-  /*
-    In my testing I've found some alerts that don't have a data source embedded inside the model.
-    At this moment in time it is unclear to me why some alert definitions not have a data source embedded in the model.
-
-    I don't think that should happen here, the fact that the datasource ref is sometimes missing here is a symptom of another cause. (Gilles)
-   */
-  return urlUtil.renderUrl(`${config.appSubUrl}/explore`, {
-    left: JSON.stringify({
-      datasource: settings.uid,
-      queries: [{ refId: 'A', ...rest, datasource: { type, uid } }],
-      range: { from: 'now-1h', to: 'now' },
-    }),
-  });
+  return <VizWrapper data={data} thresholds={thresholds?.config} thresholdsType={thresholds?.mode} />;
 }
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    header: css`
-      height: ${theme.spacing(headerHeight)};
-      display: flex;
-      align-items: center;
-      justify-content: flex-end;
-      white-space: nowrap;
-      margin-bottom: ${theme.spacing(2)};
-    `,
-    refId: css`
-      font-weight: ${theme.typography.fontWeightMedium};
-      color: ${theme.colors.text.link};
-      overflow: hidden;
-    `,
-    dataSource: css`
-      margin-left: ${theme.spacing(1)};
-      font-style: italic;
-      color: ${theme.colors.text.secondary};
-    `,
-    actions: css`
-      display: flex;
-      align-items: center;
-    `,
-    errorMessage: css`
-      white-space: pre-wrap;
-    `,
-  };
-};
diff --git a/public/app/features/alerting/unified/components/rule-viewer/StateBadges.tsx b/public/app/features/alerting/unified/components/rule-viewer/StateBadges.tsx
new file mode 100644
index 0000000000000..8c478be41dea6
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-viewer/StateBadges.tsx
@@ -0,0 +1,80 @@
+import React, { ReactNode } from 'react';
+
+import { Stack, Text } from '@grafana/ui';
+import { RuleHealth } from 'app/types/unified-alerting';
+import { PromAlertingRuleState } from 'app/types/unified-alerting-dto';
+
+import { AlertStateDot } from '../AlertStateDot';
+
+import { isErrorHealth } from './RuleViewer';
+
+interface RecordingBadgeProps {
+  health?: RuleHealth;
+}
+
+export const RecordingBadge = ({ health }: RecordingBadgeProps) => {
+  const hasError = isErrorHealth(health);
+
+  const color = hasError ? 'error' : 'success';
+  const text = hasError ? 'Recording error' : 'Recording';
+
+  return <Badge color={color} text={text} />;
+};
+
+// we're making a distinction here between the "state" of the rule and its "health".
+interface StateBadgeProps {
+  state: PromAlertingRuleState;
+  health?: RuleHealth;
+}
+
+export const StateBadge = ({ state, health }: StateBadgeProps) => {
+  let stateLabel: string;
+  let color: BadgeColor;
+
+  switch (state) {
+    case PromAlertingRuleState.Inactive:
+      color = 'success';
+      stateLabel = 'Normal';
+      break;
+    case PromAlertingRuleState.Firing:
+      color = 'error';
+      stateLabel = 'Firing';
+      break;
+    case PromAlertingRuleState.Pending:
+      color = 'warning';
+      stateLabel = 'Pending';
+      break;
+  }
+
+  // if the rule is in "error" health we don't really care about the state
+  if (isErrorHealth(health)) {
+    color = 'error';
+    stateLabel = 'Error';
+  }
+
+  if (health === 'nodata') {
+    color = 'warning';
+    stateLabel = 'No data';
+  }
+
+  return <Badge color={color} text={stateLabel} />;
+};
+
+// the generic badge component
+type BadgeColor = 'success' | 'error' | 'warning';
+
+interface BadgeProps {
+  color: BadgeColor;
+  text: NonNullable<ReactNode>;
+}
+
+function Badge({ color, text }: BadgeProps) {
+  return (
+    <Stack direction="row" gap={0.5} wrap={'nowrap'} flex={'0 0 auto'}>
+      <AlertStateDot color={color} />
+      <Text variant="bodySmall" color={color}>
+        {text}
+      </Text>
+    </Stack>
+  );
+}
diff --git a/public/app/features/alerting/unified/components/rule-viewer/__mocks__/server.ts b/public/app/features/alerting/unified/components/rule-viewer/__mocks__/server.ts
new file mode 100644
index 0000000000000..83584bb415572
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-viewer/__mocks__/server.ts
@@ -0,0 +1,57 @@
+import 'whatwg-fetch';
+import { http, HttpResponse } from 'msw';
+import { SetupServer, setupServer } from 'msw/node';
+
+import { AlertmanagersChoiceResponse } from 'app/features/alerting/unified/api/alertmanagerApi';
+import { mockAlertmanagerChoiceResponse } from 'app/features/alerting/unified/mocks/alertmanagerApi';
+import { AlertmanagerChoice } from 'app/plugins/datasource/alertmanager/types';
+import { AccessControlAction } from 'app/types';
+
+const alertmanagerChoiceMockedResponse: AlertmanagersChoiceResponse = {
+  alertmanagersChoice: AlertmanagerChoice.Internal,
+  numExternalAlertmanagers: 0,
+};
+
+const folderAccess = {
+  [AccessControlAction.AlertingRuleCreate]: true,
+  [AccessControlAction.AlertingRuleRead]: true,
+  [AccessControlAction.AlertingRuleUpdate]: true,
+  [AccessControlAction.AlertingRuleDelete]: true,
+};
+
+export function createMockGrafanaServer() {
+  const server = setupServer();
+
+  mockFolderAccess(server, folderAccess);
+  mockAlertmanagerChoiceResponse(server, alertmanagerChoiceMockedResponse);
+  mockGrafanaIncidentPluginSettings(server);
+
+  return server;
+}
+
+// this endpoint is used to determine of we have edit / delete permissions for the Grafana managed alert rule
+// a user must alsso have permissions for the folder (namespace) in which the alert rule is stored
+function mockFolderAccess(server: SetupServer, accessControl: Partial<Record<AccessControlAction, boolean>>) {
+  server.use(
+    http.get('/api/folders/:uid', ({ request }) => {
+      const url = new URL(request.url);
+      const uid = url.searchParams.get('uid');
+
+      return HttpResponse.json({
+        title: 'My Folder',
+        uid,
+        accessControl,
+      });
+    })
+  );
+
+  return server;
+}
+
+function mockGrafanaIncidentPluginSettings(server: SetupServer) {
+  server.use(
+    http.get('/api/plugins/grafana-incident-app/settings', () => {
+      return HttpResponse.json({});
+    })
+  );
+}
diff --git a/public/app/features/alerting/unified/components/rule-viewer/tabs/Details.tsx b/public/app/features/alerting/unified/components/rule-viewer/tabs/Details.tsx
new file mode 100644
index 0000000000000..6ff99b02903bd
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-viewer/tabs/Details.tsx
@@ -0,0 +1,167 @@
+import { css } from '@emotion/css';
+import { formatDistanceToNowStrict } from 'date-fns';
+import React, { useCallback } from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Text, Stack, useStyles2, ClipboardButton, TextLink } from '@grafana/ui';
+import { CombinedRule } from 'app/types/unified-alerting';
+import { Annotations } from 'app/types/unified-alerting-dto';
+
+import { isGrafanaRulerRule, isRecordingRulerRule } from '../../../utils/rules';
+import { MetaText } from '../../MetaText';
+import { Tokenize } from '../../Tokenize';
+
+interface DetailsProps {
+  rule: CombinedRule;
+}
+
+enum RuleType {
+  GrafanaManagedAlertRule = 'Grafana-managed alert rule',
+  CloudAlertRule = 'Cloud alert rule',
+  CloudRecordingRule = 'Cloud recording rule',
+}
+
+const Details = ({ rule }: DetailsProps) => {
+  const styles = useStyles2(getStyles);
+
+  let ruleType: RuleType;
+
+  if (isGrafanaRulerRule(rule.rulerRule)) {
+    ruleType = RuleType.GrafanaManagedAlertRule;
+  } else if (isRecordingRulerRule(rule.rulerRule)) {
+    ruleType = RuleType.CloudRecordingRule;
+  } else {
+    // probably not the greatest assumption
+    ruleType = RuleType.CloudAlertRule;
+  }
+
+  const evaluationDuration = rule.promRule?.evaluationTime;
+  const evaluationTimestamp = rule.promRule?.lastEvaluation;
+
+  const copyRuleUID = useCallback(() => {
+    if (isGrafanaRulerRule(rule.rulerRule)) {
+      return rule.rulerRule.grafana_alert.uid;
+    } else {
+      return '';
+    }
+  }, [rule.rulerRule]);
+
+  const annotations: Annotations | undefined = !isRecordingRulerRule(rule.rulerRule)
+    ? rule.annotations ?? []
+    : undefined;
+
+  const hasEvaluationDuration = Number.isFinite(evaluationDuration);
+
+  return (
+    <Stack direction="column" gap={3}>
+      <div className={styles.metadataWrapper}>
+        {/* type and identifier (optional) */}
+        <MetaText direction="column">
+          Rule type
+          <Text color="primary">{ruleType}</Text>
+        </MetaText>
+        <MetaText direction="column">
+          {isGrafanaRulerRule(rule.rulerRule) && (
+            <>
+              Rule Identifier
+              <Stack direction="row" alignItems="center" gap={0.5}>
+                <Text color="primary">
+                  {rule.rulerRule.grafana_alert.uid}
+                  <ClipboardButton fill="text" variant="secondary" icon="copy" size="sm" getText={copyRuleUID} />
+                </Text>
+              </Stack>
+            </>
+          )}
+        </MetaText>
+
+        {/* evaluation duration and pending period */}
+        <MetaText direction="column">
+          {hasEvaluationDuration && (
+            <>
+              Last evaluation
+              {evaluationTimestamp && evaluationDuration && (
+                <span>
+                  <Text color="primary">{formatDistanceToNowStrict(new Date(evaluationTimestamp))} ago</Text>, took{' '}
+                  <Text color="primary">{evaluationDuration}ms</Text>
+                </span>
+              )}
+            </>
+          )}
+        </MetaText>
+        <MetaText direction="column">
+          {!isRecordingRulerRule(rule.rulerRule) && (
+            <>
+              Pending period
+              <Text color="primary">{rule.rulerRule?.for ?? '0s'}</Text>
+            </>
+          )}
+        </MetaText>
+
+        {/* nodata and execution error state mapping */}
+        {isGrafanaRulerRule(rule.rulerRule) && (
+          <>
+            <MetaText direction="column">
+              Alert state if no data or all values are null
+              <Text color="primary">{rule.rulerRule.grafana_alert.no_data_state}</Text>
+            </MetaText>
+            <MetaText direction="column">
+              Alert state if execution error or timeout
+              <Text color="primary">{rule.rulerRule.grafana_alert.exec_err_state}</Text>
+            </MetaText>
+          </>
+        )}
+      </div>
+
+      {/* annotations go here */}
+      {annotations && (
+        <>
+          <Text variant="h4">Annotations</Text>
+          {Object.keys(annotations).length === 0 ? (
+            <Text variant="bodySmall" color="secondary" italic>
+              No annotations
+            </Text>
+          ) : (
+            <div className={styles.metadataWrapper}>
+              {Object.entries(annotations).map(([name, value]) => (
+                <MetaText direction="column" key={name}>
+                  {name}
+                  <AnnotationValue value={value} />
+                </MetaText>
+              ))}
+            </div>
+          )}
+        </>
+      )}
+    </Stack>
+  );
+};
+
+interface AnnotationValueProps {
+  value: string;
+}
+
+function AnnotationValue({ value }: AnnotationValueProps) {
+  const needsExternalLink = value && value.startsWith('http');
+  const tokenizeValue = <Tokenize input={value} delimiter={['{{', '}}']} />;
+
+  if (needsExternalLink) {
+    return (
+      <TextLink variant="bodySmall" href={value} external>
+        {value}
+      </TextLink>
+    );
+  }
+
+  return <Text color="primary">{tokenizeValue}</Text>;
+}
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  metadataWrapper: css({
+    display: 'grid',
+    gridTemplateColumns: 'auto auto',
+    rowGap: theme.spacing(3),
+    columnGap: theme.spacing(12),
+  }),
+});
+
+export { Details };
diff --git a/public/app/features/alerting/unified/components/rule-viewer/tabs/History.tsx b/public/app/features/alerting/unified/components/rule-viewer/tabs/History.tsx
index 7d805f13cb1d7..e2843dab278ea 100644
--- a/public/app/features/alerting/unified/components/rule-viewer/tabs/History.tsx
+++ b/public/app/features/alerting/unified/components/rule-viewer/tabs/History.tsx
@@ -1,5 +1,40 @@
-import React from 'react';
+import React, { lazy, Suspense } from 'react';
 
-const History = () => <>History</>;
+import { config } from '@grafana/runtime';
+import { RulerGrafanaRuleDTO } from 'app/types/unified-alerting-dto';
+
+import { StateHistoryImplementation } from '../../../hooks/useStateHistoryModal';
+
+const AnnotationsStateHistory = lazy(() => import('../../../components/rules/state-history/StateHistory'));
+const LokiStateHistory = lazy(() => import('../../../components/rules/state-history/LokiStateHistory'));
+
+interface HistoryProps {
+  rule: RulerGrafanaRuleDTO;
+}
+
+const History = ({ rule }: HistoryProps) => {
+  // can be "loki", "multiple" or "annotations"
+  const stateHistoryBackend = config.unifiedAlerting.alertStateHistoryBackend;
+  // can be "loki" or "annotations"
+  const stateHistoryPrimary = config.unifiedAlerting.alertStateHistoryPrimary;
+
+  // if "loki" is either the backend or the primary, show the new state history implementation
+  const usingNewAlertStateHistory = [stateHistoryBackend, stateHistoryPrimary].some(
+    (implementation) => implementation === StateHistoryImplementation.Loki
+  );
+  const implementation = usingNewAlertStateHistory
+    ? StateHistoryImplementation.Loki
+    : StateHistoryImplementation.Annotations;
+
+  const ruleID = rule.grafana_alert.id ?? '';
+  const ruleUID = rule.grafana_alert.uid;
+
+  return (
+    <Suspense fallback={'Loading...'}>
+      {implementation === StateHistoryImplementation.Loki && <LokiStateHistory ruleUID={ruleUID} />}
+      {implementation === StateHistoryImplementation.Annotations && <AnnotationsStateHistory alertId={ruleID} />}
+    </Suspense>
+  );
+};
 
 export { History };
diff --git a/public/app/features/alerting/unified/components/rule-viewer/tabs/Instances.tsx b/public/app/features/alerting/unified/components/rule-viewer/tabs/Instances.tsx
index 3504f6e28cac8..3ad8da071f9e8 100644
--- a/public/app/features/alerting/unified/components/rule-viewer/tabs/Instances.tsx
+++ b/public/app/features/alerting/unified/components/rule-viewer/tabs/Instances.tsx
@@ -1,5 +1,20 @@
 import React from 'react';
 
-const InstancesList = () => <>Instances</>;
+import { DEFAULT_PER_PAGE_PAGINATION } from 'app/core/constants';
+import { CombinedRule } from 'app/types/unified-alerting';
+
+import { RuleDetailsMatchingInstances } from '../../rules/RuleDetailsMatchingInstances';
+
+interface Props {
+  rule: CombinedRule;
+}
+
+const InstancesList = ({ rule }: Props) => (
+  <RuleDetailsMatchingInstances
+    rule={rule}
+    pagination={{ itemsPerPage: DEFAULT_PER_PAGE_PAGINATION }}
+    enableFiltering
+  />
+);
 
 export { InstancesList };
diff --git a/public/app/features/alerting/unified/components/rule-viewer/tabs/Query.tsx b/public/app/features/alerting/unified/components/rule-viewer/tabs/Query.tsx
index 8ec527a5bec59..8988d3a6d99fe 100644
--- a/public/app/features/alerting/unified/components/rule-viewer/tabs/Query.tsx
+++ b/public/app/features/alerting/unified/components/rule-viewer/tabs/Query.tsx
@@ -1,5 +1,102 @@
-import React from 'react';
+import React, { useCallback, useEffect, useMemo } from 'react';
+import { useObservable } from 'react-use';
 
-const QueryResults = () => <>Query results</>;
+import { LoadingState, PanelData } from '@grafana/data';
+import { config } from '@grafana/runtime';
+import { Alert, Stack } from '@grafana/ui';
+import { CombinedRule } from 'app/types/unified-alerting';
+
+import { GrafanaRuleQueryViewer, QueryPreview } from '../../../GrafanaRuleQueryViewer';
+import { useAlertQueriesStatus } from '../../../hooks/useAlertQueriesStatus';
+import { AlertingQueryRunner } from '../../../state/AlertingQueryRunner';
+import { alertRuleToQueries } from '../../../utils/query';
+import { isFederatedRuleGroup, isGrafanaRulerRule } from '../../../utils/rules';
+
+interface Props {
+  rule: CombinedRule;
+}
+
+const QueryResults = ({ rule }: Props) => {
+  const runner = useMemo(() => new AlertingQueryRunner(), []);
+  const data = useObservable(runner.get());
+  const loadingData = isLoading(data);
+
+  const queries = useMemo(() => alertRuleToQueries(rule), [rule]);
+
+  const { allDataSourcesAvailable } = useAlertQueriesStatus(queries);
+
+  const onRunQueries = useCallback(() => {
+    if (queries.length > 0 && allDataSourcesAvailable) {
+      let condition;
+      if (rule && isGrafanaRulerRule(rule.rulerRule)) {
+        condition = rule.rulerRule.grafana_alert.condition;
+      }
+      runner.run(queries, condition ?? 'A');
+    }
+  }, [queries, allDataSourcesAvailable, rule, runner]);
+
+  useEffect(() => {
+    if (allDataSourcesAvailable) {
+      onRunQueries();
+    }
+  }, [allDataSourcesAvailable, onRunQueries]);
+
+  useEffect(() => {
+    return () => runner.destroy();
+  }, [runner]);
+
+  const isFederatedRule = isFederatedRuleGroup(rule.group);
+
+  return (
+    <>
+      {loadingData ? (
+        'Loading...'
+      ) : (
+        <>
+          {isGrafanaRulerRule(rule.rulerRule) && !isFederatedRule && (
+            <GrafanaRuleQueryViewer
+              rule={rule}
+              condition={rule.rulerRule.grafana_alert.condition}
+              queries={queries}
+              evalDataByQuery={data}
+            />
+          )}
+
+          {!isGrafanaRulerRule(rule.rulerRule) && !isFederatedRule && data && Object.keys(data).length > 0 && (
+            <Stack direction="column" gap={1}>
+              {queries.map((query) => {
+                return (
+                  <QueryPreview
+                    key={query.refId}
+                    rule={rule}
+                    refId={query.refId}
+                    model={query.model}
+                    dataSource={Object.values(config.datasources).find((ds) => ds.uid === query.datasourceUid)}
+                    queryData={data[query.refId]}
+                    relativeTimeRange={query.relativeTimeRange}
+                    isAlertCondition={false}
+                  />
+                );
+              })}
+            </Stack>
+          )}
+          {!isFederatedRule && !allDataSourcesAvailable && (
+            <Alert title="Query not available" severity="warning">
+              Cannot display the query preview. Some of the data sources used in the queries are not available.
+            </Alert>
+          )}
+        </>
+      )}
+    </>
+  );
+};
+
+function isLoading(data?: Record<string, PanelData>): boolean {
+  if (!data) {
+    return true;
+  }
+
+  return !!Object.values(data).find((d) => d.state === LoadingState.Loading);
+}
 
 export { QueryResults };
diff --git a/public/app/features/alerting/unified/components/rule-viewer/tabs/Query/DataSourceModelPreview.tsx b/public/app/features/alerting/unified/components/rule-viewer/tabs/Query/DataSourceModelPreview.tsx
new file mode 100644
index 0000000000000..c0349bb88dc03
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-viewer/tabs/Query/DataSourceModelPreview.tsx
@@ -0,0 +1,40 @@
+import { dump } from 'js-yaml';
+import React from 'react';
+
+import { DataSourceInstanceSettings } from '@grafana/data';
+import { AlertDataQuery } from 'app/types/unified-alerting-dto';
+
+import { DataSourceType } from '../../../../utils/datasource';
+import { isPromOrLokiQuery } from '../../../../utils/rule-form';
+
+import { isSQLLikeQuery, SQLQueryPreview } from './SQLQueryPreview';
+
+const PrometheusQueryPreview = React.lazy(() => import('./PrometheusQueryPreview'));
+const LokiQueryPreview = React.lazy(() => import('./LokiQueryPreview'));
+
+interface DatasourceModelPreviewProps {
+  model: AlertDataQuery;
+  dataSource: DataSourceInstanceSettings;
+}
+
+function DatasourceModelPreview({ model, dataSource: datasource }: DatasourceModelPreviewProps): React.ReactNode {
+  if (datasource.type === DataSourceType.Prometheus && isPromOrLokiQuery(model)) {
+    return <PrometheusQueryPreview query={model.expr} />;
+  }
+
+  if (datasource.type === DataSourceType.Loki && isPromOrLokiQuery(model)) {
+    return <LokiQueryPreview query={model.expr ?? ''} />;
+  }
+
+  if (isSQLLikeQuery(model)) {
+    return <SQLQueryPreview expression={model.rawSql} />;
+  }
+
+  return (
+    <pre>
+      <code>{dump(model)}</code>
+    </pre>
+  );
+}
+
+export { DatasourceModelPreview };
diff --git a/public/app/features/alerting/unified/components/rule-viewer/tabs/Query/LokiQueryPreview.tsx b/public/app/features/alerting/unified/components/rule-viewer/tabs/Query/LokiQueryPreview.tsx
new file mode 100644
index 0000000000000..123f15c55829e
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-viewer/tabs/Query/LokiQueryPreview.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+
+import { RawQuery } from '@grafana/experimental';
+import lokiGrammar from 'app/plugins/datasource/loki/syntax';
+
+interface Props {
+  query: string;
+}
+
+const LokiQueryPreview = ({ query }: Props) => {
+  return (
+    <pre>
+      <RawQuery query={query} language={{ grammar: lokiGrammar, name: 'promql' }} />
+    </pre>
+  );
+};
+
+export default LokiQueryPreview;
diff --git a/public/app/features/alerting/unified/components/rule-viewer/tabs/Query/PrometheusQueryPreview.tsx b/public/app/features/alerting/unified/components/rule-viewer/tabs/Query/PrometheusQueryPreview.tsx
new file mode 100644
index 0000000000000..6db93b7e35861
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-viewer/tabs/Query/PrometheusQueryPreview.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+
+import { RawQuery } from '@grafana/experimental';
+import { promqlGrammar } from '@grafana/prometheus';
+
+interface Props {
+  query: string;
+}
+
+const PrometheusQueryPreview = ({ query }: Props) => {
+  return (
+    <pre>
+      <RawQuery query={query} language={{ grammar: promqlGrammar, name: 'promql' }} />
+    </pre>
+  );
+};
+
+export default PrometheusQueryPreview;
diff --git a/public/app/features/alerting/unified/components/rule-viewer/tabs/Query/SQLQueryPreview.tsx b/public/app/features/alerting/unified/components/rule-viewer/tabs/Query/SQLQueryPreview.tsx
new file mode 100644
index 0000000000000..d491690980e36
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rule-viewer/tabs/Query/SQLQueryPreview.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+
+import { ReactMonacoEditor } from '@grafana/ui';
+import { AlertDataQuery } from 'app/types/unified-alerting-dto';
+
+interface Props {
+  expression: string;
+}
+
+export const SQLQueryPreview = ({ expression }: Props) => (
+  <ReactMonacoEditor
+    options={{
+      readOnly: true,
+      minimap: {
+        enabled: false,
+      },
+      scrollBeyondLastColumn: 0,
+      scrollBeyondLastLine: false,
+      lineNumbers: 'off',
+      cursorWidth: 0,
+      overviewRulerLanes: 0,
+    }}
+    defaultLanguage="sql"
+    height={80}
+    defaultValue={expression}
+    width="100%"
+  />
+);
+
+export interface SQLLike {
+  refId: string;
+  rawSql: string;
+}
+
+export function isSQLLikeQuery(model: AlertDataQuery): model is SQLLike {
+  return 'rawSql' in model;
+}
+
+export default SQLQueryPreview;
diff --git a/public/app/features/alerting/unified/components/rule-viewer/v2/RuleViewer.v2.tsx b/public/app/features/alerting/unified/components/rule-viewer/v2/RuleViewer.v2.tsx
deleted file mode 100644
index 9ddc8761e97a2..0000000000000
--- a/public/app/features/alerting/unified/components/rule-viewer/v2/RuleViewer.v2.tsx
+++ /dev/null
@@ -1,181 +0,0 @@
-import React, { useMemo, useState } from 'react';
-
-import { Stack } from '@grafana/experimental';
-import { Alert, Button, Icon, LoadingPlaceholder, Tab, TabContent, TabsBar, Text } from '@grafana/ui';
-import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
-import { GrafanaAlertState } from 'app/types/unified-alerting-dto';
-
-import { useRuleViewerPageTitle } from '../../../hooks/alert-details/useRuleViewerPageTitle';
-import { useCombinedRule } from '../../../hooks/useCombinedRule';
-import * as ruleId from '../../../utils/rule-id';
-import { isAlertingRule, isFederatedRuleGroup, isGrafanaRulerRule } from '../../../utils/rules';
-import { AlertStateDot } from '../../AlertStateDot';
-import { ProvisionedResource, ProvisioningAlert } from '../../Provisioning';
-import { Spacer } from '../../Spacer';
-import { History } from '../tabs/History';
-import { InstancesList } from '../tabs/Instances';
-import { QueryResults } from '../tabs/Query';
-import { Routing } from '../tabs/Routing';
-
-type RuleViewerProps = GrafanaRouteComponentProps<{
-  id: string;
-  sourceName: string;
-}>;
-
-enum Tabs {
-  Instances,
-  Query,
-  Routing,
-  History,
-}
-
-// @TODO
-// hook up tabs to query params or path segment
-// figure out why we needed <AlertingPageWrapper>
-// add provisioning and federation stuff back in
-const RuleViewer = ({ match }: RuleViewerProps) => {
-  const [activeTab, setActiveTab] = useState<Tabs>(Tabs.Instances);
-
-  const id = ruleId.getRuleIdFromPathname(match.params);
-  const identifier = useMemo(() => {
-    if (!id) {
-      throw new Error('Rule ID is required');
-    }
-
-    return ruleId.parse(id, true);
-  }, [id]);
-
-  const { loading, error, result: rule } = useCombinedRule({ ruleIdentifier: identifier });
-
-  // we're setting the document title and the breadcrumb manually
-  useRuleViewerPageTitle(rule);
-
-  if (loading) {
-    return <LoadingPlaceholder text={'Loading...'} />;
-  }
-
-  if (error) {
-    return String(error);
-  }
-
-  if (rule) {
-    const summary = rule.annotations['summary'];
-    const promRule = rule.promRule;
-
-    const isAlertType = isAlertingRule(promRule);
-    const numberOfInstance = isAlertType ? promRule.alerts?.length : undefined;
-
-    const isFederatedRule = isFederatedRuleGroup(rule.group);
-    const isProvisioned = isGrafanaRulerRule(rule.rulerRule) && Boolean(rule.rulerRule.grafana_alert.provenance);
-
-    return (
-      <>
-        <Stack direction="column" gap={3}>
-          {/* breadcrumb and actions */}
-          <Stack>
-            <BreadCrumb folder={rule.namespace.name} evaluationGroup={rule.group.name} />
-            <Spacer />
-            <Stack gap={1}>
-              <Button variant="secondary" icon="pen">
-                Edit
-              </Button>
-              <Button variant="secondary">
-                <Stack alignItems="center" gap={1}>
-                  More <Icon name="angle-down" />
-                </Stack>
-              </Button>
-            </Stack>
-          </Stack>
-          {/* header */}
-          <Stack direction="column" gap={1}>
-            <Stack alignItems="center">
-              <Title name={rule.name} state={GrafanaAlertState.Alerting} />
-            </Stack>
-            {summary && <Summary text={summary} />}
-          </Stack>
-          {/* alerts and notifications and stuff */}
-          {isFederatedRule && (
-            <Alert severity="info" title="This rule is part of a federated rule group.">
-              <Stack direction="column">
-                Federated rule groups are currently an experimental feature.
-                <Button fill="text" icon="book">
-                  <a href="https://grafana.com/docs/metrics-enterprise/latest/tenant-management/tenant-federation/#cross-tenant-alerting-and-recording-rule-federation">
-                    Read documentation
-                  </a>
-                </Button>
-              </Stack>
-            </Alert>
-          )}
-          {isProvisioned && <ProvisioningAlert resource={ProvisionedResource.AlertRule} />}
-          {/* tabs and tab content */}
-          <TabsBar>
-            <Tab label="Instances" active counter={numberOfInstance} onChangeTab={() => setActiveTab(Tabs.Instances)} />
-            <Tab label="Query" onChangeTab={() => setActiveTab(Tabs.Query)} />
-            <Tab label="Routing" onChangeTab={() => setActiveTab(Tabs.Routing)} />
-            <Tab label="History" onChangeTab={() => setActiveTab(Tabs.History)} />
-          </TabsBar>
-          <TabContent>
-            {activeTab === Tabs.Instances && <InstancesList />}
-            {activeTab === Tabs.Query && <QueryResults />}
-            {activeTab === Tabs.Routing && <Routing />}
-            {activeTab === Tabs.History && <History />}
-          </TabContent>
-        </Stack>
-      </>
-    );
-  }
-
-  return null;
-};
-
-interface BreadcrumbProps {
-  folder: string;
-  evaluationGroup: string;
-}
-
-const BreadCrumb = ({ folder, evaluationGroup }: BreadcrumbProps) => (
-  <Stack alignItems="center" gap={0.5}>
-    <Text color="secondary">
-      <Icon name="folder" />
-    </Text>
-    <Text variant="body" color="primary">
-      {folder}
-    </Text>
-    <Text variant="body" color="secondary">
-      <Icon name="angle-right" />
-    </Text>
-    <Text variant="body" color="primary">
-      {evaluationGroup}
-    </Text>
-  </Stack>
-);
-
-interface TitleProps {
-  name: string;
-  state: GrafanaAlertState;
-}
-
-const Title = ({ name, state }: TitleProps) => (
-  <header>
-    <Stack alignItems={'center'} gap={1}>
-      <AlertStateDot size="md" state={state} />
-      {/* <Button variant="secondary" fill="outline" icon="angle-left" /> */}
-      <Text element="h1" variant="h2" weight="bold">
-        {name}
-      </Text>
-      {/* <Badge color="red" text={state} icon="exclamation-circle" /> */}
-    </Stack>
-  </header>
-);
-
-interface SummaryProps {
-  text: string;
-}
-
-const Summary = ({ text }: SummaryProps) => (
-  <Text variant="body" color="secondary">
-    {text}
-  </Text>
-);
-
-export default RuleViewer;
diff --git a/public/app/features/alerting/unified/components/rules/AlertInstancesTable.tsx b/public/app/features/alerting/unified/components/rules/AlertInstancesTable.tsx
index 4096e0e1792c1..fd32c83574f6c 100644
--- a/public/app/features/alerting/unified/components/rules/AlertInstancesTable.tsx
+++ b/public/app/features/alerting/unified/components/rules/AlertInstancesTable.tsx
@@ -1,29 +1,36 @@
 import React, { useMemo } from 'react';
 
-import { dateTime, findCommonLabels } from '@grafana/data';
-import { Alert, PaginationProps } from 'app/types/unified-alerting';
+import { PluginExtensionPoints, dateTime, findCommonLabels } from '@grafana/data';
+import { Alert, CombinedRule, PaginationProps } from 'app/types/unified-alerting';
 
 import { alertInstanceKey } from '../../utils/rules';
 import { AlertLabels } from '../AlertLabels';
 import { DynamicTable, DynamicTableColumnProps, DynamicTableItemProps } from '../DynamicTable';
+import { AlertInstanceExtensionPoint } from '../extensions/AlertInstanceExtensionPoint';
 
 import { AlertInstanceDetails } from './AlertInstanceDetails';
 import { AlertStateTag } from './AlertStateTag';
 
 interface Props {
+  rule?: CombinedRule;
   instances: Alert[];
   pagination?: PaginationProps;
-  footerRow?: JSX.Element;
+  footerRow?: React.ReactNode;
 }
 
 interface AlertWithCommonLabels extends Alert {
   commonLabels?: Record<string, string>;
 }
 
-type AlertTableColumnProps = DynamicTableColumnProps<AlertWithCommonLabels>;
-type AlertTableItemProps = DynamicTableItemProps<AlertWithCommonLabels>;
+interface RuleAndAlert {
+  rule?: CombinedRule;
+  alert: AlertWithCommonLabels;
+}
+
+type AlertTableColumnProps = DynamicTableColumnProps<RuleAndAlert>;
+type AlertTableItemProps = DynamicTableItemProps<RuleAndAlert>;
 
-export const AlertInstancesTable = ({ instances, pagination, footerRow }: Props) => {
+export const AlertInstancesTable = ({ rule, instances, pagination, footerRow }: Props) => {
   const commonLabels = useMemo(() => {
     // only compute the common labels if we have more than 1 instance, if we don't then that single instance
     // will have the complete set of common labels and no unique ones
@@ -33,10 +40,10 @@ export const AlertInstancesTable = ({ instances, pagination, footerRow }: Props)
   const items = useMemo(
     (): AlertTableItemProps[] =>
       instances.map((instance) => ({
-        data: { ...instance, commonLabels },
+        data: { rule, alert: { ...instance, commonLabels } },
         id: alertInstanceKey(instance),
       })),
-    [commonLabels, instances]
+    [commonLabels, instances, rule]
   );
 
   return (
@@ -44,7 +51,7 @@ export const AlertInstancesTable = ({ instances, pagination, footerRow }: Props)
       cols={columns}
       isExpandable={true}
       items={items}
-      renderExpandedContent={({ data }) => <AlertInstanceDetails instance={data} />}
+      renderExpandedContent={({ data }) => <AlertInstanceDetails instance={data.alert} />}
       pagination={pagination}
       footerRow={footerRow}
     />
@@ -56,24 +63,45 @@ const columns: AlertTableColumnProps[] = [
     id: 'state',
     label: 'State',
     // eslint-disable-next-line react/display-name
-    renderCell: ({ data: { state } }) => <AlertStateTag state={state} />,
+    renderCell: ({
+      data: {
+        alert: { state },
+      },
+    }) => <AlertStateTag state={state} />,
     size: '80px',
   },
   {
     id: 'labels',
     label: 'Labels',
     // eslint-disable-next-line react/display-name
-    renderCell: ({ data: { labels, commonLabels } }) => (
-      <AlertLabels labels={labels} commonLabels={commonLabels} size="sm" />
-    ),
+    renderCell: ({
+      data: {
+        alert: { labels, commonLabels },
+      },
+    }) => <AlertLabels labels={labels} commonLabels={commonLabels} size="sm" />,
   },
   {
     id: 'created',
     label: 'Created',
     // eslint-disable-next-line react/display-name
-    renderCell: ({ data: { activeAt } }) => (
-      <>{activeAt.startsWith('0001') ? '-' : dateTime(activeAt).format('YYYY-MM-DD HH:mm:ss')}</>
-    ),
+    renderCell: ({
+      data: {
+        alert: { activeAt },
+      },
+    }) => <>{activeAt.startsWith('0001') ? '-' : dateTime(activeAt).format('YYYY-MM-DD HH:mm:ss')}</>,
     size: '150px',
   },
+  {
+    id: 'actions',
+    label: '',
+    renderCell: ({ data: { alert, rule } }) => (
+      <AlertInstanceExtensionPoint
+        rule={rule}
+        instance={alert}
+        extensionPointId={PluginExtensionPoints.AlertInstanceAction}
+        key="alert-instance-extension-point"
+      />
+    ),
+    size: '40px',
+  },
 ];
diff --git a/public/app/features/alerting/unified/components/rules/CloneRule.tsx b/public/app/features/alerting/unified/components/rules/CloneRule.tsx
index c422796823cbb..d8cd6af4e882a 100644
--- a/public/app/features/alerting/unified/components/rules/CloneRule.tsx
+++ b/public/app/features/alerting/unified/components/rules/CloneRule.tsx
@@ -1,9 +1,7 @@
-import { css } from '@emotion/css';
 import React, { useState } from 'react';
-import { Redirect } from 'react-router-dom';
+import { Redirect, useLocation } from 'react-router-dom';
 
-import { GrafanaTheme2 } from '@grafana/data';
-import { Button, ConfirmModal, useStyles2 } from '@grafana/ui';
+import { Button, ConfirmModal } from '@grafana/ui';
 import { RuleIdentifier } from 'app/types/unified-alerting';
 
 import * as ruleId from '../../utils/rule-id';
@@ -11,19 +9,31 @@ import * as ruleId from '../../utils/rule-id';
 interface ConfirmCloneRuleModalProps {
   identifier: RuleIdentifier;
   isProvisioned: boolean;
+  redirectTo?: boolean;
   onDismiss: () => void;
 }
 
-export function RedirectToCloneRule({ identifier, isProvisioned, onDismiss }: ConfirmCloneRuleModalProps) {
-  const styles = useStyles2(getStyles);
-
+export function RedirectToCloneRule({
+  identifier,
+  isProvisioned,
+  redirectTo = false,
+  onDismiss,
+}: ConfirmCloneRuleModalProps) {
   // For provisioned rules an additional confirmation step is required
   // Users have to be aware that the cloned rule will NOT be marked as provisioned
+  const location = useLocation();
   const [stage, setStage] = useState<'redirect' | 'confirm'>(isProvisioned ? 'confirm' : 'redirect');
 
   if (stage === 'redirect') {
-    const cloneUrl = `/alerting/new?copyFrom=${encodeURIComponent(ruleId.stringifyIdentifier(identifier))}`;
-    return <Redirect to={cloneUrl} push />;
+    const copyFrom = ruleId.stringifyIdentifier(identifier);
+    const returnTo = location.pathname + location.search;
+
+    const queryParams = new URLSearchParams({
+      copyFrom,
+      returnTo: redirectTo ? returnTo : '',
+    });
+
+    return <Redirect to={`/alerting/new?` + queryParams.toString()} push />;
   }
 
   return (
@@ -33,7 +43,7 @@ export function RedirectToCloneRule({ identifier, isProvisioned, onDismiss }: Co
       body={
         <div>
           <p>
-            The new rule will <span className={styles.bold}>NOT</span> be marked as a provisioned rule.
+            The new rule will <strong>not</strong> be marked as a provisioned rule.
           </p>
           <p>
             You will need to set a new evaluation group for the copied rule because the original one has been
@@ -87,9 +97,3 @@ export const CloneRuleButton = React.forwardRef<HTMLButtonElement, CloneRuleButt
 );
 
 CloneRuleButton.displayName = 'CloneRuleButton';
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  bold: css`
-    font-weight: ${theme.typography.fontWeightBold};
-  `,
-});
diff --git a/public/app/features/alerting/unified/components/rules/CloudRules.tsx b/public/app/features/alerting/unified/components/rules/CloudRules.tsx
index 398fcea48b989..6c5cfc3a355af 100644
--- a/public/app/features/alerting/unified/components/rules/CloudRules.tsx
+++ b/public/app/features/alerting/unified/components/rules/CloudRules.tsx
@@ -1,12 +1,14 @@
 import { css } from '@emotion/css';
 import pluralize from 'pluralize';
 import React, { useMemo } from 'react';
+import { useLocation } from 'react-router-dom';
 
-import { GrafanaTheme2 } from '@grafana/data';
-import { LoadingPlaceholder, Pagination, Spinner, useStyles2 } from '@grafana/ui';
+import { GrafanaTheme2, urlUtil } from '@grafana/data';
+import { LinkButton, LoadingPlaceholder, Pagination, Spinner, useStyles2 } from '@grafana/ui';
 import { CombinedRuleNamespace } from 'app/types/unified-alerting';
 
 import { DEFAULT_PER_PAGE_PAGINATION } from '../../../../../core/constants';
+import { AlertingAction, useAlertingAbility } from '../../hooks/useAbilities';
 import { usePagination } from '../../hooks/usePagination';
 import { useUnifiedAlertingSelector } from '../../hooks/useUnifiedAlertingSelector';
 import { getPaginationStyles } from '../../styles/pagination';
@@ -52,15 +54,18 @@ export const CloudRules = ({ namespaces, expandAll }: Props) => {
   return (
     <section className={styles.wrapper}>
       <div className={styles.sectionHeader}>
-        <h5>Mimir / Cortex / Loki</h5>
-        {dataSourcesLoading.length ? (
-          <LoadingPlaceholder
-            className={styles.loader}
-            text={`Loading rules from ${dataSourcesLoading.length} ${pluralize('source', dataSourcesLoading.length)}`}
-          />
-        ) : (
-          <div />
-        )}
+        <div className={styles.headerRow}>
+          <h5>Mimir / Cortex / Loki</h5>
+          {dataSourcesLoading.length ? (
+            <LoadingPlaceholder
+              className={styles.loader}
+              text={`Loading rules from ${dataSourcesLoading.length} ${pluralize('source', dataSourcesLoading.length)}`}
+            />
+          ) : (
+            <div />
+          )}
+          <CreateRecordingRuleButton />
+        </div>
       </div>
 
       {pageItems.map(({ group, namespace }) => {
@@ -106,4 +111,35 @@ const getStyles = (theme: GrafanaTheme2) => ({
     padding: ${theme.spacing(2)};
   `,
   pagination: getPaginationStyles(theme),
+  headerRow: css({
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    width: '100%',
+    marginBottom: theme.spacing(1),
+  }),
 });
+
+export function CreateRecordingRuleButton() {
+  const [createCloudRuleSupported, createCloudRuleAllowed] = useAlertingAbility(AlertingAction.CreateExternalAlertRule);
+
+  const location = useLocation();
+
+  const canCreateCloudRules = createCloudRuleSupported && createCloudRuleAllowed;
+
+  if (canCreateCloudRules) {
+    return (
+      <LinkButton
+        key="new-recording-rule"
+        href={urlUtil.renderUrl(`alerting/new/recording`, {
+          returnTo: location.pathname + location.search,
+        })}
+        icon="plus"
+        variant="secondary"
+      >
+        New recording rule
+      </LinkButton>
+    );
+  }
+  return null;
+}
diff --git a/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx b/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx
index 421720fc86520..4864237c17ccb 100644
--- a/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx
+++ b/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx
@@ -4,8 +4,7 @@ import React, { useEffect, useMemo } from 'react';
 import { FormProvider, RegisterOptions, useForm, useFormContext } from 'react-hook-form';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Badge, Button, Field, Input, Label, LinkButton, Modal, useStyles2 } from '@grafana/ui';
+import { Badge, Button, Field, Input, Label, LinkButton, Modal, useStyles2, Stack } from '@grafana/ui';
 import { useAppNotification } from 'app/core/copy/appNotification';
 import { useCleanup } from 'app/core/hooks/useCleanup';
 import { useDispatch } from 'app/types';
@@ -21,6 +20,7 @@ import { AlertInfo, getAlertInfo, isRecordingRulerRule } from '../../utils/rules
 import { parsePrometheusDuration, safeParseDurationstr } from '../../utils/time';
 import { DynamicTable, DynamicTableColumnProps, DynamicTableItemProps } from '../DynamicTable';
 import { EvaluationIntervalLimitExceeded } from '../InvalidIntervalWarning';
+import { decodeGrafanaNamespace, encodeGrafanaNamespace } from '../expressions/util';
 import { MIN_TIME_RANGE_STEP_S } from '../rule-editor/GrafanaEvaluationBehavior';
 
 const ITEMS_PER_PAGE = 10;
@@ -83,7 +83,7 @@ export const RulesForGroupTable = ({ rulesWithoutRecordingRules }: { rulesWithou
       },
       {
         id: 'for',
-        label: 'For',
+        label: 'Pending period',
         renderCell: ({ data: { forDuration } }) => {
           return <>{forDuration}</>;
         },
@@ -159,11 +159,12 @@ export interface ModalProps {
   onClose: (saved?: boolean) => void;
   intervalEditOnly?: boolean;
   folderUrl?: string;
+  folderUid?: string;
   hideFolder?: boolean;
 }
 
 export function EditCloudGroupModal(props: ModalProps): React.ReactElement {
-  const { namespace, group, onClose, intervalEditOnly } = props;
+  const { namespace, group, onClose, intervalEditOnly, folderUid } = props;
 
   const styles = useStyles2(getStyles);
   const dispatch = useDispatch();
@@ -173,7 +174,7 @@ export function EditCloudGroupModal(props: ModalProps): React.ReactElement {
 
   const defaultValues = useMemo(
     (): FormValues => ({
-      namespaceName: namespace.name,
+      namespaceName: decodeGrafanaNamespace(namespace).name,
       groupName: group.name,
       groupInterval: group.interval ?? '',
     }),
@@ -183,6 +184,9 @@ export function EditCloudGroupModal(props: ModalProps): React.ReactElement {
   const rulesSourceName = getRulesSourceName(namespace.rulesSource);
   const isGrafanaManagedGroup = rulesSourceName === GRAFANA_RULES_SOURCE_NAME;
 
+  // parse any parent folders the alert rule might be stored in
+  const nestedFolderParents = decodeGrafanaNamespace(namespace).parents;
+
   const nameSpaceLabel = isGrafanaManagedGroup ? 'Folder' : 'Namespace';
 
   // close modal if successfully saved
@@ -194,14 +198,20 @@ export function EditCloudGroupModal(props: ModalProps): React.ReactElement {
 
   useCleanup((state) => (state.unifiedAlerting.updateLotexNamespaceAndGroup = initialAsyncRequestState));
   const onSubmit = (values: FormValues) => {
+    // make sure that when dealing with a nested folder for Grafana managed rules we encode the folder properly
+    const newNamespaceName = isGrafanaManagedGroup
+      ? encodeGrafanaNamespace(values.namespaceName, nestedFolderParents)
+      : values.namespaceName;
+
     dispatch(
       updateLotexNamespaceAndGroupAction({
         rulesSourceName: rulesSourceName,
         groupName: group.name,
         newGroupName: values.groupName,
         namespaceName: namespace.name,
-        newNamespaceName: values.namespaceName,
+        newNamespaceName: newNamespaceName,
         groupInterval: values.groupInterval || undefined,
+        folderUid,
       })
     );
   };
@@ -211,6 +221,7 @@ export function EditCloudGroupModal(props: ModalProps): React.ReactElement {
     defaultValues,
     shouldFocusError: true,
   });
+
   const {
     handleSubmit,
     register,
@@ -235,41 +246,41 @@ export function EditCloudGroupModal(props: ModalProps): React.ReactElement {
         <form onSubmit={(e) => e.preventDefault()} key={JSON.stringify(defaultValues)}>
           <>
             {!props.hideFolder && (
-              <Field
-                label={
-                  <Label
-                    htmlFor="namespaceName"
-                    description={
-                      !isGrafanaManagedGroup &&
-                      'Change the current namespace name. Moving groups between namespaces is not supported'
-                    }
-                  >
-                    {nameSpaceLabel}
-                  </Label>
-                }
-                invalid={!!errors.namespaceName}
-                error={errors.namespaceName?.message}
-              >
-                <Stack gap={1} direction="row">
+              <Stack gap={1} alignItems={'center'}>
+                <Field
+                  className={styles.formInput}
+                  label={
+                    <Label
+                      htmlFor="namespaceName"
+                      description={
+                        !isGrafanaManagedGroup &&
+                        'Change the current namespace name. Moving groups between namespaces is not supported'
+                      }
+                    >
+                      {nameSpaceLabel}
+                    </Label>
+                  }
+                  invalid={!!errors.namespaceName}
+                  error={errors.namespaceName?.message}
+                >
                   <Input
                     id="namespaceName"
                     readOnly={intervalEditOnly || isGrafanaManagedGroup}
                     {...register('namespaceName', {
                       required: 'Namespace name is required.',
                     })}
-                    className={styles.formInput}
                   />
-                  {isGrafanaManagedGroup && props.folderUrl && (
-                    <LinkButton
-                      href={props.folderUrl}
-                      title="Go to folder"
-                      variant="secondary"
-                      icon="folder-open"
-                      target="_blank"
-                    />
-                  )}
-                </Stack>
-              </Field>
+                </Field>
+                {isGrafanaManagedGroup && props.folderUrl && (
+                  <LinkButton
+                    href={props.folderUrl}
+                    title="Go to folder"
+                    variant="secondary"
+                    icon="folder-open"
+                    target="_blank"
+                  />
+                )}
+              </Stack>
             )}
             <Field
               label={<Label htmlFor="groupName">Evaluation group name</Label>}
diff --git a/public/app/features/alerting/unified/components/rules/GrafanaRules.tsx b/public/app/features/alerting/unified/components/rules/GrafanaRules.tsx
index a5272c5d7d94a..7c846272b4e21 100644
--- a/public/app/features/alerting/unified/components/rules/GrafanaRules.tsx
+++ b/public/app/features/alerting/unified/components/rules/GrafanaRules.tsx
@@ -1,18 +1,21 @@
 import { css } from '@emotion/css';
 import React from 'react';
+import { useToggle } from 'react-use';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { LoadingPlaceholder, Pagination, Spinner, useStyles2 } from '@grafana/ui';
+import { Button, LoadingPlaceholder, Pagination, Spinner, useStyles2 } from '@grafana/ui';
 import { useQueryParams } from 'app/core/hooks/useQueryParams';
 import { CombinedRuleNamespace } from 'app/types/unified-alerting';
 
 import { DEFAULT_PER_PAGE_PAGINATION } from '../../../../../core/constants';
+import { AlertingAction, useAlertingAbility } from '../../hooks/useAbilities';
 import { flattenGrafanaManagedRules } from '../../hooks/useCombinedRuleNamespaces';
 import { usePagination } from '../../hooks/usePagination';
 import { useUnifiedAlertingSelector } from '../../hooks/useUnifiedAlertingSelector';
 import { getPaginationStyles } from '../../styles/pagination';
 import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
 import { initialAsyncRequestState } from '../../utils/redux';
+import { GrafanaRulesExporter } from '../export/GrafanaRulesExporter';
 
 import { RulesGroup } from './RulesGroup';
 import { useCombinedGroupNamespace } from './useCombinedGroupNamespace';
@@ -45,11 +48,31 @@ export const GrafanaRules = ({ namespaces, expandAll }: Props) => {
     DEFAULT_PER_PAGE_PAGINATION
   );
 
+  const [exportRulesSupported, exportRulesAllowed] = useAlertingAbility(AlertingAction.ExportGrafanaManagedRules);
+  const canExportRules = exportRulesSupported && exportRulesAllowed;
+
+  const [showExportDrawer, toggleShowExportDrawer] = useToggle(false);
+  const hasGrafanaAlerts = namespaces.length > 0;
+
   return (
     <section className={styles.wrapper}>
       <div className={styles.sectionHeader}>
-        <h5>Grafana</h5>
-        {loading ? <LoadingPlaceholder className={styles.loader} text="Loading..." /> : <div />}
+        <div className={styles.headerRow}>
+          <h5>Grafana</h5>
+          {loading ? <LoadingPlaceholder className={styles.loader} text="Loading..." /> : <div />}
+          {hasGrafanaAlerts && canExportRules && (
+            <Button
+              aria-label="export all grafana rules"
+              data-testid="export-all-grafana-rules"
+              icon="download-alt"
+              tooltip="Export all Grafana-managed rules"
+              onClick={toggleShowExportDrawer}
+              variant="secondary"
+            >
+              Export rules
+            </Button>
+          )}
+        </div>
       </div>
 
       {pageItems.map(({ group, namespace }) => (
@@ -70,6 +93,7 @@ export const GrafanaRules = ({ namespaces, expandAll }: Props) => {
         onNavigate={onPageChange}
         hideWhenSinglePage
       />
+      {canExportRules && showExportDrawer && <GrafanaRulesExporter onClose={toggleShowExportDrawer} />}
     </section>
   );
 };
@@ -91,4 +115,11 @@ const getStyles = (theme: GrafanaTheme2) => ({
     padding: ${theme.spacing(2)};
   `,
   pagination: getPaginationStyles(theme),
+  headerRow: css({
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    width: '100%',
+    flexDirection: 'row',
+  }),
 });
diff --git a/public/app/features/alerting/unified/components/rules/NoRulesCTA.tsx b/public/app/features/alerting/unified/components/rules/NoRulesCTA.tsx
index ee64d3795d97d..c1104a10a5d8c 100644
--- a/public/app/features/alerting/unified/components/rules/NoRulesCTA.tsx
+++ b/public/app/features/alerting/unified/components/rules/NoRulesCTA.tsx
@@ -2,8 +2,7 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data/src/themes';
-import { Stack } from '@grafana/experimental';
-import { CallToActionCard, useStyles2 } from '@grafana/ui';
+import { CallToActionCard, useStyles2, Stack } from '@grafana/ui';
 import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
 
 import { logInfo, LogMessages } from '../../Analytics';
@@ -16,7 +15,7 @@ export const NoRulesSplash = () => {
     return (
       <div>
         <p>{"You haven't created any alert rules yet"}</p>
-        <Stack direction="row" gap={1} alignItems="stretch" flexGrow={1}>
+        <Stack gap={1}>
           <div className={styles.newRuleCard}>
             <EmptyListCTA
               title=""
diff --git a/public/app/features/alerting/unified/components/rules/ReorderRuleGroupModal.tsx b/public/app/features/alerting/unified/components/rules/ReorderRuleGroupModal.tsx
index e720ec9d8fb74..063f0b6d6ac39 100644
--- a/public/app/features/alerting/unified/components/rules/ReorderRuleGroupModal.tsx
+++ b/public/app/features/alerting/unified/components/rules/ReorderRuleGroupModal.tsx
@@ -27,12 +27,13 @@ interface ModalProps {
   namespace: CombinedRuleNamespace;
   group: CombinedRuleGroup;
   onClose: () => void;
+  folderUid?: string;
 }
 
 type CombinedRuleWithUID = { uid: string } & CombinedRule;
 
 export const ReorderCloudGroupModal = (props: ModalProps) => {
-  const { group, namespace, onClose } = props;
+  const { group, namespace, onClose, folderUid } = props;
   const [pending, setPending] = useState<boolean>(false);
   const [rulesList, setRulesList] = useState<CombinedRule[]>(group.rules);
 
@@ -63,6 +64,7 @@ export const ReorderCloudGroupModal = (props: ModalProps) => {
           groupName: group.name,
           rulesSourceName: rulesSourceName,
           newRules: rulerRules,
+          folderUid: folderUid || namespace.name,
         })
       )
         .unwrap()
@@ -70,7 +72,7 @@ export const ReorderCloudGroupModal = (props: ModalProps) => {
           setPending(false);
         });
     },
-    [group.name, namespace.name, namespace.rulesSource, rulesList]
+    [group.name, namespace.name, namespace.rulesSource, rulesList, folderUid]
   );
 
   // assign unique but stable identifiers to each (alerting / recording) rule
diff --git a/public/app/features/alerting/unified/components/rules/RuleActionsButtons.tsx b/public/app/features/alerting/unified/components/rules/RuleActionsButtons.tsx
index 80e42a858decb..426e7b0961d27 100644
--- a/public/app/features/alerting/unified/components/rules/RuleActionsButtons.tsx
+++ b/public/app/features/alerting/unified/components/rules/RuleActionsButtons.tsx
@@ -4,8 +4,6 @@ import React, { useState } from 'react';
 import { useLocation } from 'react-router-dom';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { locationService } from '@grafana/runtime';
 import {
   Button,
   ClipboardButton,
@@ -16,17 +14,18 @@ import {
   Menu,
   Tooltip,
   useStyles2,
+  Stack,
 } from '@grafana/ui';
 import { useAppNotification } from 'app/core/copy/appNotification';
 import { useDispatch } from 'app/types';
 import { CombinedRule, RuleIdentifier, RulesSource } from 'app/types/unified-alerting';
 
-import { useIsRuleEditable } from '../../hooks/useIsRuleEditable';
+import { AlertRuleAction, useAlertRuleAbility } from '../../hooks/useAbilities';
 import { deleteRuleAction } from '../../state/actions';
 import { getRulesSourceName } from '../../utils/datasource';
 import { createShareLink, createViewLink } from '../../utils/misc';
 import * as ruleId from '../../utils/rule-id';
-import { isFederatedRuleGroup, isGrafanaRulerRule } from '../../utils/rules';
+import { isGrafanaRulerRule } from '../../utils/rules';
 import { createUrl } from '../../utils/url';
 
 import { RedirectToCloneRule } from './CloneRule';
@@ -51,18 +50,24 @@ export const RuleActionsButtons = ({ rule, rulesSource }: Props) => {
   const { namespace, group, rulerRule } = rule;
   const [ruleToDelete, setRuleToDelete] = useState<CombinedRule>();
 
-  const rulesSourceName = getRulesSourceName(rulesSource);
+  const returnTo = location.pathname + location.search;
+  const isViewMode = inViewMode(location.pathname);
 
   const isProvisioned = isGrafanaRulerRule(rule.rulerRule) && Boolean(rule.rulerRule.grafana_alert.provenance);
 
+  const [editRuleSupported, editRuleAllowed] = useAlertRuleAbility(rule, AlertRuleAction.Update);
+  const [deleteRuleSupported, deleteRuleAllowed] = useAlertRuleAbility(rule, AlertRuleAction.Delete);
+  const [duplicateRuleSupported, duplicateRuleAllowed] = useAlertRuleAbility(rule, AlertRuleAction.Duplicate);
+  const [modifyExportSupported, modifyExportAllowed] = useAlertRuleAbility(rule, AlertRuleAction.ModifyExport);
+
+  const canEditRule = editRuleSupported && editRuleAllowed;
+  const canDeleteRule = deleteRuleSupported && deleteRuleAllowed;
+  const canDuplicateRule = duplicateRuleSupported && duplicateRuleAllowed;
+  const canModifyExport = modifyExportSupported && modifyExportAllowed;
+
   const buttons: JSX.Element[] = [];
   const moreActions: JSX.Element[] = [];
 
-  const isFederated = isFederatedRuleGroup(group);
-  const { isEditable, isRemovable } = useIsRuleEditable(rulesSourceName, rulerRule);
-  const returnTo = location.pathname + location.search;
-  const isViewMode = inViewMode(location.pathname);
-
   const deleteRule = () => {
     if (ruleToDelete && ruleToDelete.rulerRule) {
       const identifier = ruleId.fromRulerRule(
@@ -97,71 +102,67 @@ export const RuleActionsButtons = ({ rule, rulesSource }: Props) => {
     );
   }
 
-  if (rulerRule && !isFederated) {
+  if (rulerRule) {
     const identifier = ruleId.fromRulerRule(sourceName, namespace.name, group.name, rulerRule);
 
-    if (isEditable) {
-      if (!isProvisioned) {
-        const editURL = createUrl(`/alerting/${encodeURIComponent(ruleId.stringifyIdentifier(identifier))}/edit`, {
-          returnTo,
-        });
-
-        if (isViewMode) {
-          buttons.push(
-            <ClipboardButton
-              key="copy"
-              icon="copy"
-              onClipboardError={(copiedText) => {
-                notifyApp.error('Error while copying URL', copiedText);
-              }}
-              className={style.button}
-              size="sm"
-              getText={buildShareUrl}
-            >
-              Copy link to rule
-            </ClipboardButton>
-          );
-        }
-
-        buttons.push(
-          <Tooltip placement="top" content={'Edit'}>
-            <LinkButton
-              title="Edit"
-              className={style.button}
-              size="sm"
-              key="edit"
-              variant="secondary"
-              icon="pen"
-              href={editURL}
-            />
-          </Tooltip>
-        );
-      }
+    if (canEditRule) {
+      const editURL = createUrl(`/alerting/${encodeURIComponent(ruleId.stringifyIdentifier(identifier))}/edit`, {
+        returnTo,
+      });
+
+      buttons.push(
+        <Tooltip placement="top" content={'Edit'}>
+          <LinkButton
+            title="Edit"
+            className={style.button}
+            size="sm"
+            key="edit"
+            variant="secondary"
+            icon="pen"
+            href={editURL}
+          />
+        </Tooltip>
+      );
+    }
 
+    if (isViewMode) {
+      buttons.push(
+        <ClipboardButton
+          key="copy"
+          icon="copy"
+          onClipboardError={(copiedText) => {
+            notifyApp.error('Error while copying URL', copiedText);
+          }}
+          className={style.button}
+          size="sm"
+          getText={buildShareUrl}
+        >
+          Copy link to rule
+        </ClipboardButton>
+      );
+    }
+
+    if (canDuplicateRule) {
       moreActions.push(
         <Menu.Item label="Duplicate" icon="copy" onClick={() => setRedirectToClone({ identifier, isProvisioned })} />
       );
     }
 
-    if (isGrafanaRulerRule(rulerRule)) {
+    if (canModifyExport) {
       moreActions.push(
         <Menu.Item
           label="Modify export"
           icon="edit"
-          onClick={() =>
-            locationService.push(
-              createUrl(`/alerting/${encodeURIComponent(ruleId.stringifyIdentifier(identifier))}/modify-export`, {
-                returnTo: location.pathname + location.search,
-              })
-            )
-          }
+          url={createUrl(`/alerting/${encodeURIComponent(ruleId.stringifyIdentifier(identifier))}/modify-export`, {
+            returnTo: location.pathname + location.search,
+          })}
         />
       );
     }
-  }
 
-  if (isRemovable && rulerRule && !isFederated && !isProvisioned) {
-    moreActions.push(<Menu.Item label="Delete" icon="trash-alt" onClick={() => setRuleToDelete(rule)} />);
+    if (canDeleteRule) {
+      moreActions.push(<Menu.Item label="Delete" icon="trash-alt" onClick={() => setRuleToDelete(rule)} />);
+    }
   }
 
   if (buttons.length || moreActions.length) {
diff --git a/public/app/features/alerting/unified/components/rules/RuleDetails.test.tsx b/public/app/features/alerting/unified/components/rules/RuleDetails.test.tsx
index d8b07efe7dc6c..59e8900988174 100644
--- a/public/app/features/alerting/unified/components/rules/RuleDetails.test.tsx
+++ b/public/app/features/alerting/unified/components/rules/RuleDetails.test.tsx
@@ -1,11 +1,14 @@
+import 'whatwg-fetch';
 import { render, screen, waitFor } from '@testing-library/react';
+import { http, HttpResponse } from 'msw';
 import { setupServer } from 'msw/node';
 import React from 'react';
 import { Provider } from 'react-redux';
 import { MemoryRouter } from 'react-router-dom';
 import { byRole } from 'testing-library-selector';
 
-import { setBackendSrv } from '@grafana/runtime';
+import { PluginExtensionTypes } from '@grafana/data';
+import { getPluginLinkExtensions, setBackendSrv } from '@grafana/runtime';
 import { backendSrv } from 'app/core/services/backend_srv';
 import { contextSrv } from 'app/core/services/context_srv';
 import { AlertmanagerChoice } from 'app/plugins/datasource/alertmanager/types';
@@ -17,12 +20,20 @@ import { AlertmanagersChoiceResponse } from '../../api/alertmanagerApi';
 import { useIsRuleEditable } from '../../hooks/useIsRuleEditable';
 import { getCloudRule, getGrafanaRule } from '../../mocks';
 import { mockAlertmanagerChoiceResponse } from '../../mocks/alertmanagerApi';
+import { SupportedPlugin } from '../../types/pluginBridges';
 
 import { RuleDetails } from './RuleDetails';
 
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getPluginLinkExtensions: jest.fn(),
+  useReturnToPrevious: jest.fn(),
+}));
+
 jest.mock('../../hooks/useIsRuleEditable');
 
 const mocks = {
+  getPluginLinkExtensionsMock: jest.mocked(getPluginLinkExtensions),
   useIsRuleEditable: jest.mocked(useIsRuleEditable),
 };
 
@@ -34,7 +45,13 @@ const ui = {
   },
 };
 
-const server = setupServer();
+const server = setupServer(
+  http.get(`/api/plugins/${SupportedPlugin.Incident}/settings`, async () => {
+    return HttpResponse.json({
+      enabled: false,
+    });
+  })
+);
 
 const alertmanagerChoiceMockedResponse: AlertmanagersChoiceResponse = {
   alertmanagersChoice: AlertmanagerChoice.Internal,
@@ -52,7 +69,21 @@ afterAll(() => {
 });
 
 beforeEach(() => {
+  mocks.getPluginLinkExtensionsMock.mockReturnValue({
+    extensions: [
+      {
+        pluginId: 'grafana-ml-app',
+        id: '1',
+        type: PluginExtensionTypes.link,
+        title: 'Run investigation',
+        category: 'Sift',
+        description: 'Run a Sift investigation for this alert',
+        onClick: jest.fn(),
+      },
+    ],
+  });
   server.resetHandlers();
+  mockAlertmanagerChoiceResponse(server, alertmanagerChoiceMockedResponse);
 });
 
 describe('RuleDetails RBAC', () => {
@@ -86,7 +117,6 @@ describe('RuleDetails RBAC', () => {
     it('Should not render Silence button for users wihout the instance create permission', async () => {
       // Arrange
       jest.spyOn(contextSrv, 'hasPermission').mockReturnValue(false);
-      mockAlertmanagerChoiceResponse(server, alertmanagerChoiceMockedResponse);
 
       // Act
       renderRuleDetails(grafanaRule);
@@ -97,8 +127,6 @@ describe('RuleDetails RBAC', () => {
     });
 
     it('Should render Silence button for users with the instance create permissions', async () => {
-      mockAlertmanagerChoiceResponse(server, alertmanagerChoiceMockedResponse);
-
       // Arrange
       jest
         .spyOn(contextSrv, 'hasPermission')
diff --git a/public/app/features/alerting/unified/components/rules/RuleDetails.tsx b/public/app/features/alerting/unified/components/rules/RuleDetails.tsx
index c38efc5bd45aa..3e42e25f1465b 100644
--- a/public/app/features/alerting/unified/components/rules/RuleDetails.tsx
+++ b/public/app/features/alerting/unified/components/rules/RuleDetails.tsx
@@ -37,7 +37,7 @@ export const RuleDetails = ({ rule }: Props) => {
 
   return (
     <div>
-      <RuleDetailsActionButtons rule={rule} rulesSource={rulesSource} isViewMode={false} />
+      <RuleDetailsActionButtons rule={rule} rulesSource={rulesSource} />
       <div className={styles.wrapper}>
         <div className={styles.leftSide}>
           {<EvaluationBehaviorSummary rule={rule} />}
@@ -53,7 +53,9 @@ export const RuleDetails = ({ rule }: Props) => {
           <RuleDetailsDataSources rulesSource={rulesSource} rule={rule} />
         </div>
       </div>
-      <RuleDetailsMatchingInstances rule={rule} itemsDisplayLimit={INSTANCES_DISPLAY_LIMIT} />
+      <DetailsField label="Matching instances" horizontal={true}>
+        <RuleDetailsMatchingInstances rule={rule} itemsDisplayLimit={INSTANCES_DISPLAY_LIMIT} />
+      </DetailsField>
     </div>
   );
 };
@@ -70,7 +72,7 @@ const EvaluationBehaviorSummary = ({ rule }: EvaluationBehaviorSummaryProps) =>
 
   // recording rules don't have a for duration
   if (!isRecordingRulerRule(rule.rulerRule)) {
-    forDuration = rule.rulerRule?.for;
+    forDuration = rule.rulerRule?.for ?? '0s';
   }
 
   return (
@@ -80,11 +82,10 @@ const EvaluationBehaviorSummary = ({ rule }: EvaluationBehaviorSummaryProps) =>
           Every {every}
         </DetailsField>
       )}
-      {forDuration && (
-        <DetailsField label="For" horizontal={true}>
-          {forDuration}
-        </DetailsField>
-      )}
+
+      <DetailsField label="Pending period" horizontal={true}>
+        {forDuration}
+      </DetailsField>
 
       {lastEvaluation && !isNullDate(lastEvaluation) && (
         <DetailsField label="Last evaluation" horizontal={true}>
diff --git a/public/app/features/alerting/unified/components/rules/RuleDetailsActionButtons.tsx b/public/app/features/alerting/unified/components/rules/RuleDetailsActionButtons.tsx
index 44cd3979713d7..a9a6014380f77 100644
--- a/public/app/features/alerting/unified/components/rules/RuleDetailsActionButtons.tsx
+++ b/public/app/features/alerting/unified/components/rules/RuleDetailsActionButtons.tsx
@@ -1,33 +1,17 @@
 import { css } from '@emotion/css';
 import { uniqueId } from 'lodash';
 import React, { Fragment, useState } from 'react';
-import { useLocation } from 'react-router-dom';
 
-import { GrafanaTheme2, textUtil, urlUtil } from '@grafana/data';
-import { config, locationService } from '@grafana/runtime';
-import {
-  Button,
-  ClipboardButton,
-  ConfirmModal,
-  Dropdown,
-  HorizontalGroup,
-  Icon,
-  LinkButton,
-  Menu,
-  useStyles2,
-} from '@grafana/ui';
-import { useAppNotification } from 'app/core/copy/appNotification';
-import { contextSrv } from 'app/core/services/context_srv';
-import { AlertmanagerChoice } from 'app/plugins/datasource/alertmanager/types';
-import { AccessControlAction, useDispatch } from 'app/types';
+import { GrafanaTheme2, textUtil } from '@grafana/data';
+import { config, useReturnToPrevious } from '@grafana/runtime';
+import { Button, ConfirmModal, Dropdown, HorizontalGroup, Icon, LinkButton, Menu, useStyles2 } from '@grafana/ui';
+import { useDispatch } from 'app/types';
 import { CombinedRule, RuleIdentifier, RulesSource } from 'app/types/unified-alerting';
 import { PromAlertingRuleState } from 'app/types/unified-alerting-dto';
 
-import { alertmanagerApi } from '../../api/alertmanagerApi';
-import { useIsRuleEditable } from '../../hooks/useIsRuleEditable';
+import { AlertRuleAction, useAlertRuleAbility } from '../../hooks/useAbilities';
 import { useStateHistoryModal } from '../../hooks/useStateHistoryModal';
 import { deleteRuleAction } from '../../state/actions';
-import { getRulesPermissions } from '../../utils/access-control';
 import { getAlertmanagerByUid } from '../../utils/alertmanager';
 import { Annotation } from '../../utils/constants';
 import { getRulesSourceName, isCloudRulesSource, isGrafanaRulesSource } from '../../utils/datasource';
@@ -40,24 +24,22 @@ import {
 } from '../../utils/misc';
 import * as ruleId from '../../utils/rule-id';
 import { isAlertingRule, isFederatedRuleGroup, isGrafanaRulerRule } from '../../utils/rules';
-import { createUrl } from '../../utils/url';
-import { DeclareIncident } from '../bridges/DeclareIncidentButton';
+import { DeclareIncidentButton } from '../bridges/DeclareIncidentButton';
 
 import { RedirectToCloneRule } from './CloneRule';
 
 interface Props {
   rule: CombinedRule;
   rulesSource: RulesSource;
-  isViewMode: boolean;
 }
 
-export const RuleDetailsActionButtons = ({ rule, rulesSource, isViewMode }: Props) => {
+export const RuleDetailsActionButtons = ({ rule, rulesSource }: Props) => {
   const style = useStyles2(getStyles);
-  const { namespace, group, rulerRule } = rule;
+  const { group } = rule;
   const { StateHistoryModal, showStateHistoryModal } = useStateHistoryModal();
   const dispatch = useDispatch();
-  const location = useLocation();
-  const notifyApp = useAppNotification();
+
+  const setReturnToPrevious = useReturnToPrevious();
 
   const [ruleToDelete, setRuleToDelete] = useState<CombinedRule>();
   const [redirectToClone, setRedirectToClone] = useState<
@@ -68,7 +50,8 @@ export const RuleDetailsActionButtons = ({ rule, rulesSource, isViewMode }: Prop
     ? rulesSource
     : getAlertmanagerByUid(rulesSource.jsonData.alertmanagerUid)?.name;
 
-  const hasExplorePermission = contextSrv.hasPermission(AccessControlAction.DataSourcesExplore);
+  const [silenceSupported, silenceAllowed] = useAlertRuleAbility(rule, AlertRuleAction.Silence);
+  const [exploreSupported, exploreAllowed] = useAlertRuleAbility(rule, AlertRuleAction.Explore);
 
   const buttons: JSX.Element[] = [];
   const rightButtons: JSX.Element[] = [];
@@ -83,35 +66,29 @@ export const RuleDetailsActionButtons = ({ rule, rulesSource, isViewMode }: Prop
         ruleToDelete.rulerRule
       );
 
-      dispatch(deleteRuleAction(identifier, { navigateTo: isViewMode ? '/alerting/list' : undefined }));
+      dispatch(deleteRuleAction(identifier, { navigateTo: undefined }));
       setRuleToDelete(undefined);
     }
   };
 
   const isFederated = isFederatedRuleGroup(group);
-  const rulesSourceName = getRulesSourceName(rulesSource);
-  const isProvisioned = isGrafanaRulerRule(rule.rulerRule) && Boolean(rule.rulerRule.grafana_alert.provenance);
 
   const isFiringRule = isAlertingRule(rule.promRule) && rule.promRule.state === PromAlertingRuleState.Firing;
 
-  const rulesPermissions = getRulesPermissions(rulesSourceName);
-  const hasCreateRulePermission = contextSrv.hasPermission(rulesPermissions.create);
-  const { isEditable, isRemovable } = useIsRuleEditable(rulesSourceName, rulerRule);
-  const canSilence = useCanSilence(rule);
+  const canSilence = silenceSupported && silenceAllowed && alertmanagerSourceName;
 
   const buildShareUrl = () => createShareLink(rulesSource, rule);
 
-  const returnTo = location.pathname + location.search;
   // explore does not support grafana rule queries atm
   // neither do "federated rules"
-  if (isCloudRulesSource(rulesSource) && hasExplorePermission && !isFederated) {
+  if (isCloudRulesSource(rulesSource) && exploreSupported && exploreAllowed && !isFederated) {
     buttons.push(
       <LinkButton
         size="sm"
         key="explore"
         variant="primary"
         icon="chart-line"
-        target="__blank"
+        target="_blank"
         href={createExploreLink(rulesSource, rule.query)}
       >
         See graph
@@ -125,7 +102,7 @@ export const RuleDetailsActionButtons = ({ rule, rulesSource, isViewMode }: Prop
         key="runbook"
         variant="primary"
         icon="book"
-        target="__blank"
+        target="_blank"
         href={textUtil.sanitizeUrl(rule.annotations[Annotation.runbookURL])}
       >
         View runbook
@@ -134,6 +111,7 @@ export const RuleDetailsActionButtons = ({ rule, rulesSource, isViewMode }: Prop
   }
   if (rule.annotations[Annotation.dashboardUID]) {
     const dashboardUID = rule.annotations[Annotation.dashboardUID];
+    const isReturnToPreviousEnabled = config.featureToggles.returnToPrevious;
     if (dashboardUID) {
       buttons.push(
         <LinkButton
@@ -141,8 +119,11 @@ export const RuleDetailsActionButtons = ({ rule, rulesSource, isViewMode }: Prop
           key="dashboard"
           variant="primary"
           icon="apps"
-          target="__blank"
+          target={isReturnToPreviousEnabled ? undefined : '_blank'}
           href={`d/${encodeURIComponent(dashboardUID)}`}
+          onClick={() => {
+            setReturnToPrevious(rule.name);
+          }}
         >
           Go to dashboard
         </LinkButton>
@@ -155,8 +136,11 @@ export const RuleDetailsActionButtons = ({ rule, rulesSource, isViewMode }: Prop
             key="panel"
             variant="primary"
             icon="apps"
-            target="__blank"
+            target={isReturnToPreviousEnabled ? undefined : '_blank'}
             href={`d/${encodeURIComponent(dashboardUID)}?viewPanel=${encodeURIComponent(panelId)}`}
+            onClick={() => {
+              setReturnToPrevious(rule.name);
+            }}
           >
             Go to panel
           </LinkButton>
@@ -165,13 +149,13 @@ export const RuleDetailsActionButtons = ({ rule, rulesSource, isViewMode }: Prop
     }
   }
 
-  if (canSilence && alertmanagerSourceName) {
+  if (canSilence) {
     buttons.push(
       <LinkButton
         size="sm"
         key="silence"
         icon="bell-slash"
-        target="__blank"
+        target="_blank"
         href={makeRuleBasedSilenceLink(alertmanagerSourceName, rule)}
       >
         Silence
@@ -197,74 +181,11 @@ export const RuleDetailsActionButtons = ({ rule, rulesSource, isViewMode }: Prop
   if (isFiringRule && shouldShowDeclareIncidentButton()) {
     buttons.push(
       <Fragment key="declare-incident">
-        <DeclareIncident title={rule.name} url={buildShareUrl()} />
+        <DeclareIncidentButton title={rule.name} url={buildShareUrl()} />
       </Fragment>
     );
   }
 
-  if (isViewMode && rulerRule) {
-    const sourceName = getRulesSourceName(rulesSource);
-    const identifier = ruleId.fromRulerRule(sourceName, namespace.name, group.name, rulerRule);
-
-    if (isEditable && !isFederated) {
-      rightButtons.push(
-        <ClipboardButton
-          key="copy"
-          icon="copy"
-          onClipboardError={(copiedText) => {
-            notifyApp.error('Error while copying URL', copiedText);
-          }}
-          size="sm"
-          getText={buildShareUrl}
-        >
-          Copy link to rule
-        </ClipboardButton>
-      );
-
-      if (!isProvisioned) {
-        const editURL = urlUtil.renderUrl(
-          `${config.appSubUrl}/alerting/${encodeURIComponent(ruleId.stringifyIdentifier(identifier))}/edit`,
-          {
-            returnTo,
-          }
-        );
-
-        rightButtons.push(
-          <LinkButton size="sm" key="edit" variant="secondary" icon="pen" href={editURL}>
-            Edit
-          </LinkButton>
-        );
-      }
-    }
-
-    if (isGrafanaRulerRule(rulerRule)) {
-      moreActionsButtons.push(
-        <Menu.Item
-          label="Modify export"
-          icon="edit"
-          onClick={() =>
-            locationService.push(
-              createUrl(`/alerting/${encodeURIComponent(ruleId.stringifyIdentifier(identifier))}/modify-export`)
-            )
-          }
-        />
-      );
-    }
-
-    if (hasCreateRulePermission && !isFederated) {
-      moreActionsButtons.push(
-        <Menu.Item label="Duplicate" icon="copy" onClick={() => setRedirectToClone({ identifier, isProvisioned })} />
-      );
-    }
-
-    if (isRemovable && !isFederated && !isProvisioned) {
-      moreActionsButtons.push(<Menu.Divider />);
-      moreActionsButtons.push(
-        <Menu.Item key="delete" label="Delete" icon="trash-alt" onClick={() => setRuleToDelete(rule)} />
-      );
-    }
-  }
-
   if (buttons.length || rightButtons.length || moreActionsButtons.length) {
     return (
       <>
@@ -323,34 +244,10 @@ function shouldShowDeclareIncidentButton() {
   return !isOpenSourceEdition() || isLocalDevEnv();
 }
 
-/**
- * We don't want to show the silence button if either
- * 1. the user has no permissions to create silences
- * 2. the admin has configured to only send instances to external AMs
- */
-function useCanSilence(rule: CombinedRule) {
-  const isGrafanaManagedRule = isGrafanaRulerRule(rule.rulerRule);
-
-  const { useGetAlertmanagerChoiceStatusQuery } = alertmanagerApi;
-  const { currentData: amConfigStatus, isLoading } = useGetAlertmanagerChoiceStatusQuery(undefined, {
-    skip: !isGrafanaManagedRule,
-  });
-
-  if (!isGrafanaManagedRule || isLoading) {
-    return false;
-  }
-
-  const hasPermissions = contextSrv.hasPermission(AccessControlAction.AlertingInstanceCreate);
-
-  const interactsOnlyWithExternalAMs = amConfigStatus?.alertmanagersChoice === AlertmanagerChoice.External;
-  const interactsWithAll = amConfigStatus?.alertmanagersChoice === AlertmanagerChoice.All;
-
-  return hasPermissions && (!interactsOnlyWithExternalAMs || interactsWithAll);
-}
-
 export const getStyles = (theme: GrafanaTheme2) => ({
   wrapper: css`
-    padding: ${theme.spacing(2)} 0;
+    padding: 0 0 ${theme.spacing(2)} 0;
+    gap: ${theme.spacing(1)};
     display: flex;
     flex-direction: row;
     justify-content: space-between;
diff --git a/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.test.tsx b/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.test.tsx
index 774f2ea7c7981..d9bfcb6b6e202 100644
--- a/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.test.tsx
+++ b/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.test.tsx
@@ -4,6 +4,9 @@ import { times } from 'lodash';
 import React from 'react';
 import { byLabelText, byRole, byTestId } from 'testing-library-selector';
 
+import { PluginExtensionTypes } from '@grafana/data';
+import { getPluginLinkExtensions } from '@grafana/runtime';
+
 import { CombinedRuleNamespace } from '../../../../../types/unified-alerting';
 import { GrafanaAlertState, PromAlertingRuleState } from '../../../../../types/unified-alerting-dto';
 import { mockCombinedRule, mockDataSource, mockPromAlert, mockPromAlertingRule } from '../../mocks';
@@ -11,6 +14,15 @@ import { alertStateToReadable } from '../../utils/rules';
 
 import { RuleDetailsMatchingInstances } from './RuleDetailsMatchingInstances';
 
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getPluginLinkExtensions: jest.fn(),
+}));
+
+const mocks = {
+  getPluginLinkExtensionsMock: jest.mocked(getPluginLinkExtensions),
+};
+
 const ui = {
   stateFilter: byTestId('alert-instance-state-filter'),
   stateButton: byRole('radio'),
@@ -30,6 +42,22 @@ const ui = {
 };
 
 describe('RuleDetailsMatchingInstances', () => {
+  beforeEach(() => {
+    mocks.getPluginLinkExtensionsMock.mockReturnValue({
+      extensions: [
+        {
+          pluginId: 'grafana-ml-app',
+          id: '1',
+          type: PluginExtensionTypes.link,
+          title: 'Run investigation',
+          category: 'Sift',
+          description: 'Run a Sift investigation for this alert',
+          onClick: jest.fn(),
+        },
+      ],
+    });
+  });
+
   describe('Filtering', () => {
     it('For Grafana Managed rules instances filter should contain five states', () => {
       const rule = mockCombinedRule();
diff --git a/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.tsx b/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.tsx
index 76add623041a3..70b67368ba95f 100644
--- a/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.tsx
+++ b/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.tsx
@@ -1,10 +1,9 @@
 import { css, cx } from '@emotion/css';
 import { countBy, sum } from 'lodash';
 import React, { useMemo, useState } from 'react';
-import { useHistory } from 'react-router-dom';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Button, useStyles2 } from '@grafana/ui';
+import { LinkButton, useStyles2 } from '@grafana/ui';
 import { MatcherFilter } from 'app/features/alerting/unified/components/alert-groups/MatcherFilter';
 import {
   AlertInstanceStateFilter,
@@ -18,7 +17,6 @@ import { mapStateWithReasonToBaseState } from 'app/types/unified-alerting-dto';
 
 import { GRAFANA_RULES_SOURCE_NAME, isGrafanaRulesSource } from '../../utils/datasource';
 import { isAlertingRule } from '../../utils/rules';
-import { DetailsField } from '../DetailsField';
 
 import { AlertInstancesTable } from './AlertInstancesTable';
 import { getComponentsFromStats } from './RuleStats';
@@ -35,30 +33,30 @@ interface ShowMoreStats {
   visibleItemsCount: number;
 }
 
-function ShowMoreInstances(props: { onClick: () => void; stats: ShowMoreStats }) {
+interface ShowMoreInstancesProps {
+  stats: ShowMoreStats;
+  onClick?: React.ComponentProps<typeof LinkButton>['onClick'];
+  href?: React.ComponentProps<typeof LinkButton>['href'];
+}
+
+function ShowMoreInstances({ stats, onClick, href }: ShowMoreInstancesProps) {
   const styles = useStyles2(getStyles);
-  const { onClick, stats } = props;
 
   return (
     <div className={styles.footerRow}>
       <div>
         Showing {stats.visibleItemsCount} out of {stats.totalItemsCount} instances
       </div>
-      <Button size="sm" variant="secondary" data-testid="show-all" onClick={onClick}>
+      <LinkButton size="sm" variant="secondary" data-testid="show-all" onClick={onClick} href={href}>
         Show all {stats.totalItemsCount} alert instances
-      </Button>
+      </LinkButton>
     </div>
   );
 }
 
-export function RuleDetailsMatchingInstances(props: Props): JSX.Element | null {
-  const history = useHistory();
-  const {
-    rule: { promRule, namespace, instanceTotals },
-    itemsDisplayLimit = Number.POSITIVE_INFINITY,
-    pagination,
-    enableFiltering = false,
-  } = props;
+export function RuleDetailsMatchingInstances(props: Props) {
+  const { rule, itemsDisplayLimit = Number.POSITIVE_INFINITY, pagination, enableFiltering = false } = props;
+  const { promRule, namespace, instanceTotals } = rule;
 
   const [queryString, setQueryString] = useState<string>();
   const [alertState, setAlertState] = useState<InstanceStateFilter>();
@@ -87,7 +85,14 @@ export function RuleDetailsMatchingInstances(props: Props): JSX.Element | null {
 
   // Count All By State is used only when filtering is enabled and we have access to all instances
   const countAllByState = countBy(promRule.alerts, (alert) => mapStateWithReasonToBaseState(alert.state));
-  const totalInstancesCount = sum(Object.values(instanceTotals));
+
+  // error state is not a separate state
+  const totalInstancesCount = sum([
+    instanceTotals.alerting,
+    instanceTotals.inactive,
+    instanceTotals.pending,
+    instanceTotals.nodata,
+  ]);
   const hiddenInstancesCount = totalInstancesCount - visibleInstances.length;
 
   const stats: ShowMoreStats = {
@@ -95,31 +100,32 @@ export function RuleDetailsMatchingInstances(props: Props): JSX.Element | null {
     visibleItemsCount: visibleInstances.length,
   };
 
+  // createViewLink returns a link containing the app subpath prefix hence cannot be used
+  // in locationService.push as it will result in a double prefix
   const ruleViewPageLink = createViewLink(namespace.rulesSource, props.rule, location.pathname + location.search);
   const statsComponents = getComponentsFromStats(instanceTotals);
 
   const resetFilter = () => setAlertState(undefined);
-  const navigateToDetailView = () => history.push(ruleViewPageLink);
-
-  const onShowMoreInstances = enableFiltering ? resetFilter : navigateToDetailView;
 
   const footerRow = hiddenInstancesCount ? (
-    <ShowMoreInstances stats={stats} onClick={onShowMoreInstances} />
+    <ShowMoreInstances
+      stats={stats}
+      onClick={enableFiltering ? resetFilter : undefined}
+      href={!enableFiltering ? ruleViewPageLink : undefined}
+    />
   ) : undefined;
 
   return (
-    <DetailsField label="Matching instances" horizontal={true}>
+    <>
       {enableFiltering && (
         <div className={cx(styles.flexRow, styles.spaceBetween)}>
           <div className={styles.flexRow}>
             <MatcherFilter
-              className={styles.rowChild}
               key={queryStringKey}
               defaultQueryString={queryString}
               onFilterChange={(value) => setQueryString(value)}
             />
             <AlertInstanceStateFilter
-              className={styles.rowChild}
               filterType={stateFilterType}
               stateFilter={alertState}
               onStateFilterChange={setAlertState}
@@ -129,8 +135,8 @@ export function RuleDetailsMatchingInstances(props: Props): JSX.Element | null {
         </div>
       )}
       {!enableFiltering && <div className={styles.stats}>{statsComponents}</div>}
-      <AlertInstancesTable instances={visibleInstances} pagination={pagination} footerRow={footerRow} />
-    </DetailsField>
+      <AlertInstancesTable rule={rule} instances={visibleInstances} pagination={pagination} footerRow={footerRow} />
+    </>
   );
 }
 
@@ -162,13 +168,11 @@ const getStyles = (theme: GrafanaTheme2) => {
       width: 100%;
       flex-wrap: wrap;
       margin-bottom: ${theme.spacing(1)};
+      gap: ${theme.spacing(1)};
     `,
     spaceBetween: css`
       justify-content: space-between;
     `,
-    rowChild: css`
-      margin-right: ${theme.spacing(1)};
-    `,
     footerRow: css`
       display: flex;
       flex-direction: column;
diff --git a/public/app/features/alerting/unified/components/rules/RuleHealth.tsx b/public/app/features/alerting/unified/components/rules/RuleHealth.tsx
index 8016e5f255c74..66e4e33919971 100644
--- a/public/app/features/alerting/unified/components/rules/RuleHealth.tsx
+++ b/public/app/features/alerting/unified/components/rules/RuleHealth.tsx
@@ -5,6 +5,8 @@ import { GrafanaTheme2 } from '@grafana/data';
 import { Icon, Tooltip, useStyles2 } from '@grafana/ui';
 import { Rule } from 'app/types/unified-alerting';
 
+import { isErrorHealth } from '../rule-viewer/RuleViewer';
+
 interface Prom {
   rule: Rule;
 }
@@ -12,7 +14,7 @@ interface Prom {
 export const RuleHealth = ({ rule }: Prom) => {
   const style = useStyles2(getStyle);
 
-  if (rule.health === 'err' || rule.health === 'error') {
+  if (isErrorHealth(rule.health)) {
     return (
       <Tooltip theme="error" content={rule.lastError || 'No error message provided.'}>
         <div className={style.warn}>
diff --git a/public/app/features/alerting/unified/components/rules/RuleListErrors.tsx b/public/app/features/alerting/unified/components/rules/RuleListErrors.tsx
index c595014ac9693..16da99ee314c4 100644
--- a/public/app/features/alerting/unified/components/rules/RuleListErrors.tsx
+++ b/public/app/features/alerting/unified/components/rules/RuleListErrors.tsx
@@ -53,7 +53,7 @@ export function RuleListErrors(): ReactElement {
       result.push(
         <>
           Failed to load the data source configuration for{' '}
-          <a href={makeDataSourceLink(dataSource)} className={styles.dsLink}>
+          <a href={makeDataSourceLink(dataSource.uid)} className={styles.dsLink}>
             {dataSource.name}
           </a>
           : {error.message || 'Unknown error.'}
@@ -65,7 +65,7 @@ export function RuleListErrors(): ReactElement {
       result.push(
         <>
           Failed to load rules state from{' '}
-          <a href={makeDataSourceLink(dataSource)} className={styles.dsLink}>
+          <a href={makeDataSourceLink(dataSource.uid)} className={styles.dsLink}>
             {dataSource.name}
           </a>
           : {error.message || 'Unknown error.'}
@@ -77,7 +77,7 @@ export function RuleListErrors(): ReactElement {
       result.push(
         <>
           Failed to load rules config from{' '}
-          <a href={makeDataSourceLink(dataSource)} className={styles.dsLink}>
+          <a href={makeDataSourceLink(dataSource.uid)} className={styles.dsLink}>
             {dataSource.name}
           </a>
           : {error.message || 'Unknown error.'}
diff --git a/public/app/features/alerting/unified/components/rules/RuleListGroupView.tsx b/public/app/features/alerting/unified/components/rules/RuleListGroupView.tsx
index 8ceffc20cba4e..a1438fc383bfe 100644
--- a/public/app/features/alerting/unified/components/rules/RuleListGroupView.tsx
+++ b/public/app/features/alerting/unified/components/rules/RuleListGroupView.tsx
@@ -3,7 +3,7 @@ import React, { useEffect, useMemo } from 'react';
 import { CombinedRuleNamespace } from 'app/types/unified-alerting';
 
 import { LogMessages, logInfo } from '../../Analytics';
-import { AlertSourceAction } from '../../hooks/useAbilities';
+import { AlertingAction } from '../../hooks/useAbilities';
 import { isCloudRulesSource, isGrafanaRulesSource } from '../../utils/datasource';
 import { Authorize } from '../Authorize';
 
@@ -35,10 +35,10 @@ export const RuleListGroupView = ({ namespaces, expandAll }: Props) => {
 
   return (
     <>
-      <Authorize actions={[AlertSourceAction.ViewAlertRule]}>
+      <Authorize actions={[AlertingAction.ViewAlertRule]}>
         <GrafanaRules namespaces={grafanaNamespaces} expandAll={expandAll} />
       </Authorize>
-      <Authorize actions={[AlertSourceAction.ViewExternalAlertRule]}>
+      <Authorize actions={[AlertingAction.ViewExternalAlertRule]}>
         <CloudRules namespaces={cloudNamespaces} expandAll={expandAll} />
       </Authorize>
     </>
diff --git a/public/app/features/alerting/unified/components/rules/RuleState.tsx b/public/app/features/alerting/unified/components/rules/RuleState.tsx
index 11d95a99982d6..d2627ad833977 100644
--- a/public/app/features/alerting/unified/components/rules/RuleState.tsx
+++ b/public/app/features/alerting/unified/components/rules/RuleState.tsx
@@ -2,8 +2,7 @@ import { css } from '@emotion/css';
 import React, { useMemo } from 'react';
 
 import { GrafanaTheme2, intervalToAbbreviatedDurationString } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Spinner, useStyles2 } from '@grafana/ui';
+import { Spinner, useStyles2, Stack } from '@grafana/ui';
 import { CombinedRule } from 'app/types/unified-alerting';
 import { PromAlertingRuleState } from 'app/types/unified-alerting-dto';
 
diff --git a/public/app/features/alerting/unified/components/rules/RuleStats.tsx b/public/app/features/alerting/unified/components/rules/RuleStats.tsx
index 46148dee69943..f9d67ac072b7a 100644
--- a/public/app/features/alerting/unified/components/rules/RuleStats.tsx
+++ b/public/app/features/alerting/unified/components/rules/RuleStats.tsx
@@ -2,8 +2,7 @@ import { isUndefined, omitBy, sum } from 'lodash';
 import pluralize from 'pluralize';
 import React, { Fragment } from 'react';
 
-import { Stack } from '@grafana/experimental';
-import { Badge } from '@grafana/ui';
+import { Badge, Stack } from '@grafana/ui';
 import {
   AlertGroupTotals,
   AlertInstanceTotalState,
diff --git a/public/app/features/alerting/unified/components/rules/RulesFilter.tsx b/public/app/features/alerting/unified/components/rules/RulesFilter.tsx
index 25e95cbd72f26..2f77f19184ac9 100644
--- a/public/app/features/alerting/unified/components/rules/RulesFilter.tsx
+++ b/public/app/features/alerting/unified/components/rules/RulesFilter.tsx
@@ -3,12 +3,18 @@ import React, { useEffect, useRef, useState } from 'react';
 import { useForm } from 'react-hook-form';
 
 import { DataSourceInstanceSettings, GrafanaTheme2, SelectableValue } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Button, Field, Icon, Input, Label, RadioButtonGroup, Tooltip, useStyles2 } from '@grafana/ui';
+import { Button, Field, Icon, Input, Label, RadioButtonGroup, Stack, Tooltip, useStyles2 } from '@grafana/ui';
+import { DashboardPicker } from 'app/core/components/Select/DashboardPicker';
 import { useQueryParams } from 'app/core/hooks/useQueryParams';
 import { PromAlertingRuleState, PromRuleType } from 'app/types/unified-alerting-dto';
 
-import { logInfo, LogMessages } from '../../Analytics';
+import {
+  logInfo,
+  LogMessages,
+  trackRulesListViewChange,
+  trackRulesSearchComponentInteraction,
+  trackRulesSearchInputInteraction,
+} from '../../Analytics';
 import { useRulesFilter } from '../../hooks/useFilteredRules';
 import { RuleHealth } from '../../search/rulesSearchParser';
 import { alertStateToReadable } from '../../utils/rules';
@@ -90,6 +96,12 @@ const RulesFilter = ({ onFilterCleared = () => undefined }: RulesFilerProps) =>
     });
 
     setFilterKey((key) => key + 1);
+    trackRulesSearchComponentInteraction('dataSourceNames');
+  };
+
+  const handleDashboardChange = (dashboardUid: string | undefined) => {
+    updateFilters({ ...filterState, dashboardUid });
+    trackRulesSearchComponentInteraction('dashboardUid');
   };
 
   const clearDataSource = () => {
@@ -100,21 +112,17 @@ const RulesFilter = ({ onFilterCleared = () => undefined }: RulesFilerProps) =>
   const handleAlertStateChange = (value: PromAlertingRuleState) => {
     logInfo(LogMessages.clickingAlertStateFilters);
     updateFilters({ ...filterState, ruleState: value });
-    setFilterKey((key) => key + 1);
-  };
-
-  const handleViewChange = (view: string) => {
-    setQueryParams({ view });
+    trackRulesSearchComponentInteraction('ruleState');
   };
 
   const handleRuleTypeChange = (ruleType: PromRuleType) => {
     updateFilters({ ...filterState, ruleType });
-    setFilterKey((key) => key + 1);
+    trackRulesSearchComponentInteraction('ruleType');
   };
 
   const handleRuleHealthChange = (ruleHealth: RuleHealth) => {
     updateFilters({ ...filterState, ruleHealth });
-    setFilterKey((key) => key + 1);
+    trackRulesSearchComponentInteraction('ruleHealth');
   };
 
   const handleClearFiltersClick = () => {
@@ -124,11 +132,16 @@ const RulesFilter = ({ onFilterCleared = () => undefined }: RulesFilerProps) =>
     setTimeout(() => setFilterKey(filterKey + 1), 100);
   };
 
+  const handleViewChange = (view: string) => {
+    setQueryParams({ view });
+    trackRulesListViewChange({ view });
+  };
+
   const searchIcon = <Icon name={'search'} />;
   return (
     <div className={styles.container}>
       <Stack direction="column" gap={1}>
-        <Stack direction="row" gap={1}>
+        <Stack direction="row" gap={1} wrap="wrap">
           <Field
             className={styles.dsPickerContainer}
             label={
@@ -149,7 +162,7 @@ const RulesFilter = ({ onFilterCleared = () => undefined }: RulesFilerProps) =>
                       </div>
                     }
                   >
-                    <Icon name="info-circle" size="sm" />
+                    <Icon id="data-source-picker-inline-help" name="info-circle" size="sm" />
                   </Tooltip>
                 </Stack>
               </Label>
@@ -166,6 +179,22 @@ const RulesFilter = ({ onFilterCleared = () => undefined }: RulesFilerProps) =>
             />
           </Field>
 
+          <Field
+            className={styles.dashboardPickerContainer}
+            label={<Label htmlFor="filters-dashboard-picker">Dashboard</Label>}
+          >
+            {/* The key prop is to clear the picker value */}
+            {/* DashboardPicker doesn't do that itself when value is undefined */}
+            <DashboardPicker
+              inputId="filters-dashboard-picker"
+              key={filterState.dashboardUid ? 'dashboard-defined' : 'dashboard-not-defined'}
+              value={filterState.dashboardUid}
+              onChange={(value) => handleDashboardChange(value?.uid)}
+              isClearable
+              cacheOptions
+            />
+          </Field>
+
           <div>
             <Label>State</Label>
             <RadioButtonGroup
@@ -194,6 +223,7 @@ const RulesFilter = ({ onFilterCleared = () => undefined }: RulesFilerProps) =>
               onSubmit={handleSubmit((data) => {
                 setSearchQuery(data.searchQuery);
                 searchQueryRef.current?.blur();
+                trackRulesSearchInputInteraction({ oldQuery: searchQuery, newQuery: data.searchQuery });
               })}
             >
               <Field
@@ -247,18 +277,21 @@ const RulesFilter = ({ onFilterCleared = () => undefined }: RulesFilerProps) =>
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
-    container: css`
-      margin-bottom: ${theme.spacing(1)};
-    `,
-    dsPickerContainer: css`
-      width: 550px;
-      flex-grow: 0;
-      margin: 0;
-    `,
-    searchInput: css`
-      flex: 1;
-      margin: 0;
-    `,
+    container: css({
+      marginBottom: theme.spacing(1),
+    }),
+    dsPickerContainer: css({
+      width: theme.spacing(60),
+      flexGrow: 0,
+      margin: 0,
+    }),
+    dashboardPickerContainer: css({
+      minWidth: theme.spacing(50),
+    }),
+    searchInput: css({
+      flex: 1,
+      margin: 0,
+    }),
   };
 };
 
@@ -280,6 +313,7 @@ function SearchQueryHelp() {
         <HelpRow title="State" expr="state:firing|normal|pending" />
         <HelpRow title="Type" expr="type:alerting|recording" />
         <HelpRow title="Health" expr="health:ok|nodata|error" />
+        <HelpRow title="Dashboard UID" expr="dashboard:eadde4c7-54e6-4964-85c0-484ab852fd04" />
       </div>
     </div>
   );
@@ -297,16 +331,16 @@ function HelpRow({ title, expr }: { title: string; expr: string }) {
 }
 
 const helpStyles = (theme: GrafanaTheme2) => ({
-  grid: css`
-    display: grid;
-    grid-template-columns: max-content auto;
-    gap: ${theme.spacing(1)};
-    align-items: center;
-  `,
-  code: css`
-    display: block;
-    text-align: center;
-  `,
+  grid: css({
+    display: 'grid',
+    gridTemplateColumns: 'max-content auto',
+    gap: theme.spacing(1),
+    alignItems: 'center',
+  }),
+  code: css({
+    display: 'block',
+    textAlign: 'center',
+  }),
 });
 
 export default RulesFilter;
diff --git a/public/app/features/alerting/unified/components/rules/RulesGroup.test.tsx b/public/app/features/alerting/unified/components/rules/RulesGroup.test.tsx
index 33f1411e3d122..3093caf579c37 100644
--- a/public/app/features/alerting/unified/components/rules/RulesGroup.test.tsx
+++ b/public/app/features/alerting/unified/components/rules/RulesGroup.test.tsx
@@ -2,7 +2,7 @@ import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { Provider } from 'react-redux';
-import { AutoSizerProps } from 'react-virtualized-auto-sizer';
+import { Props } from 'react-virtualized-auto-sizer';
 import { byRole, byTestId, byText } from 'testing-library-selector';
 
 import { contextSrv } from 'app/core/services/context_srv';
@@ -22,7 +22,13 @@ jest.mock('../../hooks/useHasRuler');
 jest.spyOn(analytics, 'logInfo');
 
 jest.mock('react-virtualized-auto-sizer', () => {
-  return ({ children }: AutoSizerProps) => children({ height: 600, width: 1 });
+  return ({ children }: Props) =>
+    children({
+      height: 600,
+      scaledHeight: 600,
+      scaledWidth: 1,
+      width: 1,
+    });
 });
 jest.mock('@grafana/ui', () => ({
   ...jest.requireActual('@grafana/ui'),
@@ -102,10 +108,12 @@ describe('Rules group tests', () => {
       groups: [group],
     };
 
-    it('Should hide delete and edit group buttons', () => {
+    it('Should hide delete and edit group buttons', async () => {
       // Act
       mockUseHasRuler(true, true);
+      mockFolderApi(server).folder('cpu-usage', mockFolder({ uid: 'cpu-usage', canSave: false }));
       renderRulesGroup(namespace, group);
+      expect(await screen.findByTestId('rule-group')).toBeInTheDocument();
 
       // Assert
       expect(ui.deleteGroupButton.query()).not.toBeInTheDocument();
diff --git a/public/app/features/alerting/unified/components/rules/RulesGroup.tsx b/public/app/features/alerting/unified/components/rules/RulesGroup.tsx
index 5c26d5a402e16..dab832d429856 100644
--- a/public/app/features/alerting/unified/components/rules/RulesGroup.tsx
+++ b/public/app/features/alerting/unified/components/rules/RulesGroup.tsx
@@ -3,12 +3,12 @@ import pluralize from 'pluralize';
 import React, { useEffect, useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Badge, ConfirmModal, HorizontalGroup, Icon, Spinner, Tooltip, useStyles2 } from '@grafana/ui';
+import { selectors } from '@grafana/e2e-selectors';
+import { Badge, ConfirmModal, HorizontalGroup, Icon, Spinner, Stack, Tooltip, useStyles2 } from '@grafana/ui';
 import { useDispatch } from 'app/types';
 import { CombinedRuleGroup, CombinedRuleNamespace } from 'app/types/unified-alerting';
 
-import { logInfo, LogMessages } from '../../Analytics';
+import { LogMessages, logInfo } from '../../Analytics';
 import { useFolder } from '../../hooks/useFolder';
 import { useHasRuler } from '../../hooks/useHasRuler';
 import { deleteRulesGroupAction } from '../../state/actions';
@@ -20,6 +20,7 @@ import { CollapseToggle } from '../CollapseToggle';
 import { RuleLocation } from '../RuleLocation';
 import { GrafanaRuleFolderExporter } from '../export/GrafanaRuleFolderExporter';
 import { GrafanaRuleGroupExporter } from '../export/GrafanaRuleGroupExporter';
+import { decodeGrafanaNamespace } from '../expressions/util';
 
 import { ActionIcon } from './ActionIcon';
 import { EditCloudGroupModal } from './EditRuleGroupModal';
@@ -205,9 +206,9 @@ export const RulesGroup = React.memo(({ group, namespace, expandAll, viewMode }:
 
   // ungrouped rules are rules that are in the "default" group name
   const groupName = isListView ? (
-    <RuleLocation namespace={namespace.name} />
+    <RuleLocation namespace={decodeGrafanaNamespace(namespace).name} />
   ) : (
-    <RuleLocation namespace={namespace.name} group={group.name} />
+    <RuleLocation namespace={decodeGrafanaNamespace(namespace).name} group={group.name} />
   );
 
   const closeEditModal = (saved = false) => {
@@ -225,7 +226,7 @@ export const RulesGroup = React.memo(({ group, namespace, expandAll, viewMode }:
           className={styles.collapseToggle}
           isCollapsed={isCollapsed}
           onToggle={setIsCollapsed}
-          data-testid="group-collapse-toggle"
+          data-testid={selectors.components.AlertRules.groupToggle}
         />
         <Icon name={isCollapsed ? 'folder' : 'folder-open'} />
         {isCloudRulesSource(rulesSource) && (
@@ -278,11 +279,17 @@ export const RulesGroup = React.memo(({ group, namespace, expandAll, viewMode }:
           namespace={namespace}
           group={group}
           onClose={() => closeEditModal()}
-          folderUrl={folder?.canEdit ? makeFolderSettingsLink(folder) : undefined}
+          folderUrl={folder?.canEdit ? makeFolderSettingsLink(folder.uid) : undefined}
+          folderUid={folderUID}
         />
       )}
       {isReorderingGroup && (
-        <ReorderCloudGroupModal group={group} namespace={namespace} onClose={() => setIsReorderingGroup(false)} />
+        <ReorderCloudGroupModal
+          group={group}
+          folderUid={folderUID}
+          namespace={namespace}
+          onClose={() => setIsReorderingGroup(false)}
+        />
       )}
       <ConfirmModal
         isOpen={isDeletingGroup}
diff --git a/public/app/features/alerting/unified/components/rules/RulesTable.test.tsx b/public/app/features/alerting/unified/components/rules/RulesTable.test.tsx
index ce123239e6389..3065719d8c050 100644
--- a/public/app/features/alerting/unified/components/rules/RulesTable.test.tsx
+++ b/public/app/features/alerting/unified/components/rules/RulesTable.test.tsx
@@ -8,15 +8,15 @@ import { byRole } from 'testing-library-selector';
 import { configureStore } from 'app/store/configureStore';
 import { CombinedRule } from 'app/types/unified-alerting';
 
-import { useIsRuleEditable } from '../../hooks/useIsRuleEditable';
+import { AlertRuleAction, useAlertRuleAbility } from '../../hooks/useAbilities';
 import { getCloudRule, getGrafanaRule } from '../../mocks';
 
 import { RulesTable } from './RulesTable';
 
-jest.mock('../../hooks/useIsRuleEditable');
+jest.mock('../../hooks/useAbilities');
 
 const mocks = {
-  useIsRuleEditable: jest.mocked(useIsRuleEditable),
+  useAlertRuleAbility: jest.mocked(useAlertRuleAbility),
 };
 
 const ui = {
@@ -42,18 +42,25 @@ function renderRulesTable(rule: CombinedRule) {
   );
 }
 
+const user = userEvent.setup();
+
 describe('RulesTable RBAC', () => {
   describe('Grafana rules action buttons', () => {
     const grafanaRule = getGrafanaRule({ name: 'Grafana' });
-    it('Should not render Edit button for users without the update permission', () => {
-      mocks.useIsRuleEditable.mockReturnValue({ loading: false, isEditable: false });
+
+    it('Should not render Edit button for users without the update permission', async () => {
+      mocks.useAlertRuleAbility.mockImplementation((_rule, action) => {
+        return action === AlertRuleAction.Update ? [true, false] : [true, true];
+      });
       renderRulesTable(grafanaRule);
+
       expect(ui.actionButtons.edit.query()).not.toBeInTheDocument();
     });
 
     it('Should not render Delete button for users without the delete permission', async () => {
-      mocks.useIsRuleEditable.mockReturnValue({ loading: false, isRemovable: false });
-      const user = userEvent.setup();
+      mocks.useAlertRuleAbility.mockImplementation((_rule, action) => {
+        return action === AlertRuleAction.Delete ? [true, false] : [true, true];
+      });
 
       renderRulesTable(grafanaRule);
       await user.click(ui.actionButtons.more.get());
@@ -62,14 +69,17 @@ describe('RulesTable RBAC', () => {
     });
 
     it('Should render Edit button for users with the update permission', () => {
-      mocks.useIsRuleEditable.mockReturnValue({ loading: false, isEditable: true });
+      mocks.useAlertRuleAbility.mockImplementation((_rule, action) => {
+        return action === AlertRuleAction.Update ? [true, true] : [false, false];
+      });
       renderRulesTable(grafanaRule);
       expect(ui.actionButtons.edit.get()).toBeInTheDocument();
     });
 
     it('Should render Delete button for users with the delete permission', async () => {
-      mocks.useIsRuleEditable.mockReturnValue({ loading: false, isRemovable: true });
-      const user = userEvent.setup();
+      mocks.useAlertRuleAbility.mockImplementation((_rule, action) => {
+        return action === AlertRuleAction.Delete ? [true, true] : [false, false];
+      });
 
       renderRulesTable(grafanaRule);
 
@@ -81,28 +91,39 @@ describe('RulesTable RBAC', () => {
 
   describe('Cloud rules action buttons', () => {
     const cloudRule = getCloudRule({ name: 'Cloud' });
+
     it('Should not render Edit button for users without the update permission', () => {
-      mocks.useIsRuleEditable.mockReturnValue({ loading: false, isEditable: false });
+      mocks.useAlertRuleAbility.mockImplementation((_rule, action) => {
+        return action === AlertRuleAction.Update ? [true, false] : [true, true];
+      });
+
       renderRulesTable(cloudRule);
       expect(ui.actionButtons.edit.query()).not.toBeInTheDocument();
     });
 
     it('Should not render Delete button for users without the delete permission', async () => {
-      mocks.useIsRuleEditable.mockReturnValue({ loading: false, isRemovable: false });
+      mocks.useAlertRuleAbility.mockImplementation((_rule, action) => {
+        return action === AlertRuleAction.Delete ? [true, false] : [true, true];
+      });
 
       renderRulesTable(cloudRule);
-      expect(ui.actionButtons.more.query()).not.toBeInTheDocument();
+      await user.click(ui.actionButtons.more.get());
+      expect(ui.moreActionItems.delete.query()).not.toBeInTheDocument();
     });
 
     it('Should render Edit button for users with the update permission', () => {
-      mocks.useIsRuleEditable.mockReturnValue({ loading: false, isEditable: true });
+      mocks.useAlertRuleAbility.mockImplementation((_rule, action) => {
+        return action === AlertRuleAction.Update ? [true, true] : [false, false];
+      });
+
       renderRulesTable(cloudRule);
       expect(ui.actionButtons.edit.get()).toBeInTheDocument();
     });
 
     it('Should render Delete button for users with the delete permission', async () => {
-      mocks.useIsRuleEditable.mockReturnValue({ loading: false, isRemovable: true });
-      const user = userEvent.setup();
+      mocks.useAlertRuleAbility.mockImplementation((_rule, action) => {
+        return action === AlertRuleAction.Delete ? [true, true] : [false, false];
+      });
 
       renderRulesTable(cloudRule);
       await user.click(ui.actionButtons.more.get());
diff --git a/public/app/features/alerting/unified/components/rules/state-history/LogRecordViewer.tsx b/public/app/features/alerting/unified/components/rules/state-history/LogRecordViewer.tsx
index eaa8cd9bc0576..fdfe4a54e9e7d 100644
--- a/public/app/features/alerting/unified/components/rules/state-history/LogRecordViewer.tsx
+++ b/public/app/features/alerting/unified/components/rules/state-history/LogRecordViewer.tsx
@@ -4,8 +4,7 @@ import { groupBy, uniqueId } from 'lodash';
 import React, { useEffect } from 'react';
 
 import { dateTimeFormat, GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Icon, TagList, useStyles2 } from '@grafana/ui';
+import { Icon, TagList, useStyles2, Stack } from '@grafana/ui';
 
 import { Label } from '../../Label';
 import { AlertStateTag } from '../AlertStateTag';
@@ -64,7 +63,7 @@ export const LogRecordViewerByTimestamp = React.memo(
                     <AlertStateTag state={line.previous} size="sm" muted />
                     <Icon name="arrow-right" size="sm" />
                     <AlertStateTag state={line.current} />
-                    <Stack direction="row">{line.values && <AlertInstanceValues record={line.values} />}</Stack>
+                    <Stack>{line.values && <AlertInstanceValues record={line.values} />}</Stack>
                     <div>
                       {line.labels && (
                         <TagList
@@ -112,7 +111,7 @@ export function LogRecordViewerByInstance({ records, commonLabels }: LogRecordVi
                   <AlertStateTag state={line.previous} size="sm" muted />
                   <Icon name="arrow-right" size="sm" />
                   <AlertStateTag state={line.current} />
-                  <Stack direction="row">{line.values && <AlertInstanceValues record={line.values} />}</Stack>
+                  <Stack>{line.values && <AlertInstanceValues record={line.values} />}</Stack>
                   <div>{dateTimeFormat(timestamp)}</div>
                 </div>
               ))}
@@ -134,7 +133,7 @@ const Timestamp = ({ time }: TimestampProps) => {
 
   return (
     <div className={styles.timestampWrapper}>
-      <Stack direction="row" alignItems="center" gap={1}>
+      <Stack alignItems="center" gap={1}>
         <Icon name="clock-nine" size="sm" />
         <span className={styles.timestampText}>{dateTimeFormat(dateTime)}</span>
         <small>({formatDistanceToNowStrict(dateTime)} ago)</small>
diff --git a/public/app/features/alerting/unified/components/rules/state-history/LogTimelineViewer.tsx b/public/app/features/alerting/unified/components/rules/state-history/LogTimelineViewer.tsx
index b0d2d286b50ca..f0e2d72fc3b3e 100644
--- a/public/app/features/alerting/unified/components/rules/state-history/LogTimelineViewer.tsx
+++ b/public/app/features/alerting/unified/components/rules/state-history/LogTimelineViewer.tsx
@@ -3,7 +3,7 @@ import React, { useEffect, useRef } from 'react';
 import AutoSizer from 'react-virtualized-auto-sizer';
 import { BehaviorSubject } from 'rxjs';
 
-import { DataFrame, TimeRange } from '@grafana/data';
+import { DataFrame, InterpolateFunction, TimeRange } from '@grafana/data';
 import { VisibilityMode } from '@grafana/schema';
 import { LegendDisplayMode, UPlotConfigBuilder, useTheme2 } from '@grafana/ui';
 import { TimelineChart } from 'app/core/components/TimelineChart/TimelineChart';
@@ -15,6 +15,9 @@ interface LogTimelineViewerProps {
   onPointerMove?: (seriesIdx: number, pointerIdx: number) => void;
 }
 
+// noop
+const replaceVariables: InterpolateFunction = (v) => v;
+
 export const LogTimelineViewer = React.memo(({ frames, timeRange, onPointerMove = noop }: LogTimelineViewerProps) => {
   const theme = useTheme2();
   const { setupCursorTracking } = useCursorTimelinePosition(onPointerMove);
@@ -45,6 +48,7 @@ export const LogTimelineViewer = React.memo(({ frames, timeRange, onPointerMove
             { label: 'NoData', color: theme.colors.info.main, yAxis: 1 },
             { label: 'Mixed', color: theme.colors.text.secondary, yAxis: 1 },
           ]}
+          replaceVariables={replaceVariables}
         >
           {(builder) => {
             setupCursorTracking(builder);
diff --git a/public/app/features/alerting/unified/components/rules/state-history/LokiStateHistory.test.tsx b/public/app/features/alerting/unified/components/rules/state-history/LokiStateHistory.test.tsx
index 24380f45f3fba..3925cab0c315a 100644
--- a/public/app/features/alerting/unified/components/rules/state-history/LokiStateHistory.test.tsx
+++ b/public/app/features/alerting/unified/components/rules/state-history/LokiStateHistory.test.tsx
@@ -1,9 +1,10 @@
+import 'whatwg-fetch';
 import { render, waitFor } from '@testing-library/react';
-import { rest } from 'msw';
+import { http, HttpResponse } from 'msw';
 import { setupServer } from 'msw/node';
 import React from 'react';
-import { byRole, byText } from 'testing-library-selector';
-import 'whatwg-fetch';
+import { Props } from 'react-virtualized-auto-sizer';
+import { byRole, byTestId, byText } from 'testing-library-selector';
 
 import { DataFrameJSON } from '@grafana/data';
 import { setBackendSrv } from '@grafana/runtime';
@@ -15,58 +16,66 @@ import LokiStateHistory from './LokiStateHistory';
 
 const server = setupServer();
 
+jest.mock('react-virtualized-auto-sizer', () => {
+  return ({ children }: Props) =>
+    children({
+      height: 600,
+      scaledHeight: 600,
+      scaledWidth: 1,
+      width: 1,
+    });
+});
+
 beforeAll(() => {
   setBackendSrv(backendSrv);
   server.listen({ onUnhandledRequest: 'error' });
 
   server.use(
-    rest.get('/api/v1/rules/history', (req, res, ctx) =>
-      res(
-        ctx.json<DataFrameJSON>({
-          data: {
-            values: [
-              [1681739580000, 1681739580000, 1681739580000],
-              [
-                {
-                  previous: 'Normal',
-                  current: 'Pending',
-                  values: {
-                    B: 0.010344684900897919,
-                    C: 1,
-                  },
-                  labels: {
-                    handler: '/api/prometheus/grafana/api/v1/rules',
-                  },
+    http.get('/api/v1/rules/history', () =>
+      HttpResponse.json<DataFrameJSON>({
+        data: {
+          values: [
+            [1681739580000, 1681739580000, 1681739580000],
+            [
+              {
+                previous: 'Normal',
+                current: 'Pending',
+                values: {
+                  B: 0.010344684900897919,
+                  C: 1,
+                },
+                labels: {
+                  handler: '/api/prometheus/grafana/api/v1/rules',
+                },
+              },
+              {
+                previous: 'Normal',
+                current: 'Pending',
+                values: {
+                  B: 0.010344684900897919,
+                  C: 1,
+                },
+                dashboardUID: '',
+                panelID: 0,
+                labels: {
+                  handler: '/api/live/ws',
                 },
-                {
-                  previous: 'Normal',
-                  current: 'Pending',
-                  values: {
-                    B: 0.010344684900897919,
-                    C: 1,
-                  },
-                  dashboardUID: '',
-                  panelID: 0,
-                  labels: {
-                    handler: '/api/live/ws',
-                  },
+              },
+              {
+                previous: 'Normal',
+                current: 'Pending',
+                values: {
+                  B: 0.010344684900897919,
+                  C: 1,
                 },
-                {
-                  previous: 'Normal',
-                  current: 'Pending',
-                  values: {
-                    B: 0.010344684900897919,
-                    C: 1,
-                  },
-                  labels: {
-                    handler: '/api/folders/:uid/',
-                  },
+                labels: {
+                  handler: '/api/folders/:uid/',
                 },
-              ],
+              },
             ],
-          },
-        })
-      )
+          ],
+        },
+      })
     )
   );
 });
@@ -82,6 +91,7 @@ const ui = {
   timestampViewer: byRole('list', { name: 'State history by timestamp' }),
   record: byRole('listitem'),
   noRecords: byText('No state transitions have occurred in the last 30 days'),
+  timelineChart: byTestId('uplot-main-div'),
 };
 
 describe('LokiStateHistory', () => {
@@ -98,10 +108,18 @@ describe('LokiStateHistory', () => {
     expect(timestampViewerElement).toHaveTextContent('/api/folders/:uid/');
   });
 
+  it('should render timeline chart', async () => {
+    render(<LokiStateHistory ruleUID="ABC123" />, { wrapper: TestProvider });
+
+    await waitFor(() => expect(ui.loadingIndicator.query()).not.toBeInTheDocument());
+
+    expect(ui.timelineChart.get()).toBeInTheDocument();
+  });
+
   it('should render no entries message when no records are returned', async () => {
     server.use(
-      rest.get('/api/v1/rules/history', (req, res, ctx) =>
-        res(ctx.json<DataFrameJSON>({ data: { values: [] }, schema: { fields: [] } }))
+      http.get('/api/v1/rules/history', () =>
+        HttpResponse.json<DataFrameJSON>({ data: { values: [] }, schema: { fields: [] } })
       )
     );
 
diff --git a/public/app/features/alerting/unified/components/rules/state-history/LokiStateHistory.tsx b/public/app/features/alerting/unified/components/rules/state-history/LokiStateHistory.tsx
index 115a127d65e6d..dd1a16b690847 100644
--- a/public/app/features/alerting/unified/components/rules/state-history/LokiStateHistory.tsx
+++ b/public/app/features/alerting/unified/components/rules/state-history/LokiStateHistory.tsx
@@ -1,14 +1,14 @@
 import { css } from '@emotion/css';
-import { isEmpty, sortBy, take, uniq } from 'lodash';
+import { fromPairs, isEmpty, sortBy, take, uniq } from 'lodash';
 import React, { useCallback, useMemo, useRef, useState } from 'react';
 import { useForm } from 'react-hook-form';
 
 import { DataFrame, dateTime, GrafanaTheme2, TimeRange } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Alert, Button, Field, Icon, Input, Label, TagList, Tooltip, useStyles2 } from '@grafana/ui';
+import { Alert, Button, Field, Icon, Input, Label, Tooltip, useStyles2, Stack } from '@grafana/ui';
 
 import { stateHistoryApi } from '../../../api/stateHistoryApi';
 import { combineMatcherStrings } from '../../../utils/alertmanager';
+import { AlertLabels } from '../../AlertLabels';
 import { HoverCard } from '../../HoverCard';
 
 import { LogRecordViewerByTimestamp } from './LogRecordViewer';
@@ -120,8 +120,8 @@ const LokiStateHistory = ({ ruleUID }: Props) => {
             <Tooltip content="Common labels are the ones attached to all of the alert instances">
               <Icon name="info-circle" />
             </Tooltip>
+            <AlertLabels labels={fromPairs(commonLabels)} size="sm" />
           </Stack>
-          <TagList tags={commonLabels.map((label) => label.join('='))} />
         </div>
       )}
       {isEmpty(frameSubset) ? (
diff --git a/public/app/features/alerting/unified/components/rules/state-history/StateHistory.tsx b/public/app/features/alerting/unified/components/rules/state-history/StateHistory.tsx
index 1ba413adf6c9c..2162bd7c9a19a 100644
--- a/public/app/features/alerting/unified/components/rules/state-history/StateHistory.tsx
+++ b/public/app/features/alerting/unified/components/rules/state-history/StateHistory.tsx
@@ -3,8 +3,7 @@ import { groupBy } from 'lodash';
 import React, { FormEvent, useCallback, useState } from 'react';
 
 import { AlertState, dateTimeFormat, GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Alert, Field, Icon, Input, Label, LoadingPlaceholder, Tooltip, useStyles2 } from '@grafana/ui';
+import { Alert, Field, Icon, Input, Label, LoadingPlaceholder, Tooltip, useStyles2, Stack } from '@grafana/ui';
 import { StateHistoryItem, StateHistoryItemData } from 'app/types/unified-alerting';
 import { GrafanaAlertStateWithReason, PromAlertingRuleState } from 'app/types/unified-alerting-dto';
 
@@ -68,7 +67,9 @@ const StateHistory = ({ alertId }: Props) => {
       return (
         <div key={groupKey}>
           <header className={styles.tableGroupKey}>
-            <code>{groupKey}</code>
+            <code className={styles.goupKeyText} aria-label={groupKey}>
+              {groupKey}
+            </code>
           </header>
           <DynamicTable cols={columns} items={tableItems} pagination={{ itemsPerPage: 25 }} />
         </div>
@@ -199,6 +200,12 @@ const getStyles = (theme: GrafanaTheme2) => ({
     margin-top: ${theme.spacing(2)};
     margin-bottom: ${theme.spacing(2)};
   `,
+  goupKeyText: css({
+    overflowX: 'auto',
+    textOverflow: 'ellipsis',
+    whiteSpace: 'nowrap',
+    display: 'block',
+  }),
 });
 
 export default StateHistory;
diff --git a/public/app/features/alerting/unified/components/silences/MatchersField.tsx b/public/app/features/alerting/unified/components/silences/MatchersField.tsx
index 2400274d5c8fe..fa2b82a5b943e 100644
--- a/public/app/features/alerting/unified/components/silences/MatchersField.tsx
+++ b/public/app/features/alerting/unified/components/silences/MatchersField.tsx
@@ -1,9 +1,9 @@
 import { css, cx } from '@emotion/css';
 import React from 'react';
-import { useFormContext, useFieldArray } from 'react-hook-form';
+import { useFormContext, useFieldArray, Controller } from 'react-hook-form';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Button, Field, Input, IconButton, InputControl, useStyles2, Select } from '@grafana/ui';
+import { Button, Field, Input, IconButton, useStyles2, Select } from '@grafana/ui';
 import { MatcherOperator } from 'app/plugins/datasource/alertmanager/types';
 
 import { SilenceFormFields } from '../../types/silence-form';
@@ -46,7 +46,7 @@ const MatchersField = ({ className }: Props) => {
                     />
                   </Field>
                   <Field label={'Operator'}>
-                    <InputControl
+                    <Controller
                       control={control}
                       render={({ field: { onChange, ref, ...field } }) => (
                         <Select
diff --git a/public/app/features/alerting/unified/components/silences/SilencesFilter.tsx b/public/app/features/alerting/unified/components/silences/SilencesFilter.tsx
index acb6b61aa6625..c8bbd93926370 100644
--- a/public/app/features/alerting/unified/components/silences/SilencesFilter.tsx
+++ b/public/app/features/alerting/unified/components/silences/SilencesFilter.tsx
@@ -3,8 +3,7 @@ import { debounce, uniqueId } from 'lodash';
 import React, { FormEvent, useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Button, Field, Icon, Input, Label, Tooltip, useStyles2 } from '@grafana/ui';
+import { Button, Field, Icon, Input, Label, Tooltip, useStyles2, Stack } from '@grafana/ui';
 import { useQueryParams } from 'app/core/hooks/useQueryParams';
 
 import { parseMatchers } from '../../utils/alertmanager';
diff --git a/public/app/features/alerting/unified/components/silences/SilencesTable.tsx b/public/app/features/alerting/unified/components/silences/SilencesTable.tsx
index 402df1507c37d..3d8c21c4b8313 100644
--- a/public/app/features/alerting/unified/components/silences/SilencesTable.tsx
+++ b/public/app/features/alerting/unified/components/silences/SilencesTable.tsx
@@ -2,8 +2,7 @@ import { css } from '@emotion/css';
 import React, { useMemo } from 'react';
 
 import { dateMath, GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { CollapsableSection, Icon, Link, LinkButton, useStyles2 } from '@grafana/ui';
+import { CollapsableSection, Icon, Link, LinkButton, useStyles2, Stack } from '@grafana/ui';
 import { useQueryParams } from 'app/core/hooks/useQueryParams';
 import { AlertmanagerAlert, Silence, SilenceState } from 'app/plugins/datasource/alertmanager/types';
 import { useDispatch } from 'app/types';
@@ -147,15 +146,14 @@ const useFilteredSilences = (silences: Silence[], expired = false) => {
       }
       if (queryString) {
         const matchers = parseMatchers(queryString);
-        const matchersMatch = matchers.every(
-          (matcher) =>
-            silence.matchers?.some(
-              ({ name, value, isEqual, isRegex }) =>
-                matcher.name === name &&
-                matcher.value === value &&
-                matcher.isEqual === isEqual &&
-                matcher.isRegex === isRegex
-            )
+        const matchersMatch = matchers.every((matcher) =>
+          silence.matchers?.some(
+            ({ name, value, isEqual, isRegex }) =>
+              matcher.name === name &&
+              matcher.value === value &&
+              matcher.isEqual === isEqual &&
+              matcher.isRegex === isRegex
+          )
         );
         if (!matchersMatch) {
           return false;
diff --git a/public/app/features/alerting/unified/features.ts b/public/app/features/alerting/unified/features.ts
deleted file mode 100644
index a21910db187a7..0000000000000
--- a/public/app/features/alerting/unified/features.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { FeatureDescription } from 'react-enable/dist/FeatureState';
-
-import { config } from '@grafana/runtime';
-
-export enum AlertingFeature {
-  NotificationPoliciesV2MatchingInstances = 'notification-policies.v2.matching-instances',
-  DetailsViewV2 = 'details-view.v2',
-  ContactPointsV2 = 'contact-points.v2',
-}
-
-const FEATURES: FeatureDescription[] = [
-  {
-    name: AlertingFeature.NotificationPoliciesV2MatchingInstances,
-    defaultValue: config.featureToggles.alertingNotificationsPoliciesMatchingInstances,
-  },
-  {
-    name: AlertingFeature.DetailsViewV2,
-    defaultValue: false,
-  },
-];
-export default FEATURES;
diff --git a/public/app/features/alerting/unified/home/GettingStarted.tsx b/public/app/features/alerting/unified/home/GettingStarted.tsx
index 263dd94428d87..6415801a0585e 100644
--- a/public/app/features/alerting/unified/home/GettingStarted.tsx
+++ b/public/app/features/alerting/unified/home/GettingStarted.tsx
@@ -3,9 +3,8 @@ import React from 'react';
 import SVG from 'react-inlinesvg';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
 import { EmbeddedScene, SceneFlexLayout, SceneFlexItem, SceneReactObject } from '@grafana/scenes';
-import { Icon, useStyles2, useTheme2 } from '@grafana/ui';
+import { useStyles2, useTheme2, Stack, Text, TextLink } from '@grafana/ui';
 
 export const getOverviewScene = () => {
   return new EmbeddedScene({
@@ -21,16 +20,15 @@ export const getOverviewScene = () => {
   });
 };
 
-export default function GettingStarted({ showWelcomeHeader }: { showWelcomeHeader?: boolean }) {
+export default function GettingStarted() {
   const theme = useTheme2();
   const styles = useStyles2(getWelcomePageStyles);
 
   return (
     <div className={styles.grid}>
-      {showWelcomeHeader && <WelcomeHeader className={styles.ctaContainer} />}
-      <ContentBox className={styles.flowBlock}>
-        <div>
-          <h3>How it works</h3>
+      <ContentBox>
+        <Stack direction="column" gap={1}>
+          <Text element="h3">How it works</Text>
           <ul className={styles.list}>
             <li>
               Grafana alerting periodically queries data sources and evaluates the condition defined in the alert rule
@@ -39,106 +37,73 @@ export default function GettingStarted({ showWelcomeHeader }: { showWelcomeHeade
             <li>Firing instances are routed to notification policies based on matching labels</li>
             <li>Notifications are sent out to the contact points specified in the notification policy</li>
           </ul>
-        </div>
-        <SVG
-          src={`public/img/alerting/at_a_glance_${theme.name.toLowerCase()}.svg`}
-          width={undefined}
-          height={undefined}
-        />
+          <div className={styles.svgContainer}>
+            <Stack justifyContent={'center'}>
+              <SVG
+                src={`public/img/alerting/at_a_glance_${theme.name.toLowerCase()}.svg`}
+                width={undefined}
+                height={undefined}
+              />
+            </Stack>
+          </div>
+        </Stack>
       </ContentBox>
-      <ContentBox className={styles.gettingStartedBlock}>
-        <h3>Get started</h3>
-        <Stack direction="column" alignItems="space-between">
+      <ContentBox>
+        <Stack direction="column" gap={1}>
+          <Text element="h3">Get started</Text>
           <ul className={styles.list}>
             <li>
-              <strong>Create an alert rule</strong> by adding queries and expressions from multiple data sources.
+              <Text weight="bold">Create an alert rule</Text> by adding queries and expressions from multiple data
+              sources.
             </li>
             <li>
-              <strong>Add labels</strong> to your alert rules <strong>to connect them to notification policies</strong>
+              <Text weight="bold">Add labels</Text> to your alert rules{' '}
+              <Text weight="bold">to connect them to notification policies</Text>
             </li>
             <li>
-              <strong>Configure contact points</strong> to define where to send your notifications to.
+              <Text weight="bold">Configure contact points</Text> to define where to send your notifications to.
             </li>
             <li>
-              <strong>Configure notification policies</strong> to route your alert instances to contact points.
+              <Text weight="bold">Configure notification policies</Text> to route your alert instances to contact
+              points.
             </li>
           </ul>
-          <div>
-            <ArrowLink href="https://grafana.com/docs/grafana/latest/alerting/" title="Read more in the Docs" />
-          </div>
+          <TextLink href="https://grafana.com/docs/grafana/latest/alerting/" icon="angle-right" inline={false} external>
+            Read more in the docs
+          </TextLink>
         </Stack>
       </ContentBox>
-      <ContentBox className={styles.videoBlock}>
-        <iframe
-          title="Alerting - Introductory video"
-          src="https://player.vimeo.com/video/720001629?h=c6c1732f92"
-          width="960"
-          height="540"
-          allow="autoplay; fullscreen"
-          allowFullScreen
-          frameBorder="0"
-          // This is necessary because color-scheme defined on :root has impact on iframe elements
-          // More about how color-scheme works for iframes https://github.com/w3c/csswg-drafts/issues/4772
-          // Summary: If the color scheme of an iframe differs from embedding document iframe gets an opaque canvas bg appropriate to its color scheme
-          style={{ colorScheme: 'light dark' }}
-        ></iframe>
-      </ContentBox>
     </div>
   );
 }
 
 const getWelcomePageStyles = (theme: GrafanaTheme2) => ({
-  grid: css`
-    display: grid;
-    grid-template-rows: min-content auto auto;
-    grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
-    gap: ${theme.spacing(2)};
-  `,
-  ctaContainer: css`
-    grid-column: 1 / span 5;
-  `,
-  flowBlock: css`
-    grid-column: 1 / span 5;
-
-    display: flex;
-    flex-wrap: wrap;
-    gap: ${theme.spacing(1)};
-
-    & > div {
-      flex: 2;
-      min-width: 350px;
-    }
-    & > svg {
-      flex: 3;
-      min-width: 500px;
-    }
-  `,
-  videoBlock: css`
-    grid-column: 3 / span 3;
-
-    // Video required
-    position: relative;
-    padding: 56.25% 0 0 0; /* 16:9 */
-
-    iframe {
-      position: absolute;
-      top: ${theme.spacing(2)};
-      left: ${theme.spacing(2)};
-      width: calc(100% - ${theme.spacing(4)});
-      height: calc(100% - ${theme.spacing(4)});
-      border: none;
-    }
-  `,
-  gettingStartedBlock: css`
-    grid-column: 1 / span 2;
-    justify-content: space-between;
-  `,
-  list: css`
-    margin: ${theme.spacing(0, 2)};
-    & > li {
-      margin-bottom: ${theme.spacing(1)};
-    }
-  `,
+  grid: css({
+    display: 'grid',
+    gridTemplateRows: 'min-content auto auto',
+    gridTemplateColumns: '1fr',
+    gap: theme.spacing(2),
+    width: '100%',
+
+    [theme.breakpoints.up('lg')]: {
+      gridTemplateColumns: '3fr 2fr',
+    },
+  }),
+  ctaContainer: css({
+    gridColumn: '1 / span 5',
+  }),
+  svgContainer: css({
+    '& svg': {
+      maxWidth: '900px',
+      flex: 1,
+    },
+  }),
+  list: css({
+    margin: theme.spacing(0, 2),
+    '& > li': {
+      marginBottom: theme.spacing(1),
+    },
+  }),
 });
 
 export function WelcomeHeader({ className }: { className?: string }) {
@@ -182,26 +147,25 @@ const getWelcomeHeaderStyles = (theme: GrafanaTheme2) => ({
     color: theme.colors.text.secondary,
     paddingBottom: theme.spacing(2),
   }),
-  ctaContainer: css`
-    padding: ${theme.spacing(4, 2)};
-    display: flex;
-    gap: ${theme.spacing(4)};
-    justify-content: space-between;
-    flex-wrap: wrap;
-
-    ${theme.breakpoints.down('lg')} {
-      flex-direction: column;
-    }
-  `,
-
-  separator: css`
-    width: 1px;
-    background-color: ${theme.colors.border.medium};
+  ctaContainer: css({
+    padding: theme.spacing(2),
+    display: 'flex',
+    gap: theme.spacing(4),
+    justifyContent: 'space-between',
+    flexWrap: 'wrap',
+
+    [theme.breakpoints.down('lg')]: {
+      flexDirection: 'column',
+    },
+  }),
+  separator: css({
+    width: '1px',
+    backgroundColor: theme.colors.border.medium,
 
-    ${theme.breakpoints.down('lg')} {
-      display: none;
-    }
-  `,
+    [theme.breakpoints.down('lg')]: {
+      display: 'none',
+    },
+  }),
 });
 
 interface WelcomeCTABoxProps {
@@ -216,47 +180,45 @@ function WelcomeCTABox({ title, description, href, hrefText }: WelcomeCTABoxProp
 
   return (
     <div className={styles.container}>
-      <h3 className={styles.title}>{title}</h3>
+      <Text element="h2" variant="h3">
+        {title}
+      </Text>
       <div className={styles.desc}>{description}</div>
       <div className={styles.actionRow}>
-        <a href={href} className={styles.link}>
+        <TextLink href={href} inline={false}>
           {hrefText}
-        </a>
+        </TextLink>
       </div>
     </div>
   );
 }
 
 const getWelcomeCTAButtonStyles = (theme: GrafanaTheme2) => ({
-  container: css`
-    flex: 1;
-    min-width: 240px;
-    display: grid;
-    gap: ${theme.spacing(1)};
-    grid-template-columns: min-content 1fr 1fr 1fr;
-    grid-template-rows: min-content auto min-content;
-  `,
-
-  title: css`
-    margin-bottom: 0;
-    grid-column: 2 / span 3;
-    grid-row: 1;
-  `,
-
-  desc: css`
-    grid-column: 2 / span 3;
-    grid-row: 2;
-  `,
+  container: css({
+    flex: 1,
+    minWidth: '240px',
+    display: 'grid',
+    rowGap: theme.spacing(1),
+    gridTemplateColumns: 'min-content 1fr 1fr 1fr',
+    gridTemplateRows: 'min-content auto min-content',
+
+    '& h2': {
+      marginBottom: 0,
+      gridColumn: '2 / span 3',
+      gridRow: 1,
+    },
+  }),
 
-  actionRow: css`
-    grid-column: 2 / span 3;
-    grid-row: 3;
-    max-width: 240px;
-  `,
+  desc: css({
+    gridColumn: '2 / span 3',
+    gridRow: 2,
+  }),
 
-  link: css`
-    color: ${theme.colors.text.link};
-  `,
+  actionRow: css({
+    gridColumn: '2 / span 3',
+    gridRow: 3,
+    maxWidth: '240px',
+  }),
 });
 
 function ContentBox({ children, className }: React.PropsWithChildren<{ className?: string }>) {
@@ -266,26 +228,9 @@ function ContentBox({ children, className }: React.PropsWithChildren<{ className
 }
 
 const getContentBoxStyles = (theme: GrafanaTheme2) => ({
-  box: css`
-    padding: ${theme.spacing(2)};
-    background-color: ${theme.colors.background.secondary};
-    border-radius: ${theme.shape.radius.default};
-  `,
-});
-
-function ArrowLink({ href, title }: { href: string; title: string }) {
-  const styles = useStyles2(getArrowLinkStyles);
-
-  return (
-    <a href={href} className={styles.link} rel="noreferrer">
-      {title} <Icon name="angle-right" size="xl" />
-    </a>
-  );
-}
-
-const getArrowLinkStyles = (theme: GrafanaTheme2) => ({
-  link: css`
-    display: block;
-    color: ${theme.colors.text.link};
-  `,
+  box: css({
+    padding: theme.spacing(2),
+    backgroundColor: theme.colors.background.secondary,
+    borderRadius: theme.shape.radius.default,
+  }),
 });
diff --git a/public/app/features/alerting/unified/home/Insights.tsx b/public/app/features/alerting/unified/home/Insights.tsx
index b172d36009428..29fed164d73f2 100644
--- a/public/app/features/alerting/unified/home/Insights.tsx
+++ b/public/app/features/alerting/unified/home/Insights.tsx
@@ -17,11 +17,12 @@ import {
   VariableValueSelectors,
 } from '@grafana/scenes';
 
+import { config } from '../../../../core/config';
 import { SectionFooter } from '../insights/SectionFooter';
 import { SectionSubheader } from '../insights/SectionSubheader';
+import { getActiveGrafanaAlertsScene } from '../insights/grafana/Active';
 import { getGrafanaInstancesByStateScene } from '../insights/grafana/AlertsByStateScene';
 import { getGrafanaEvalSuccessVsFailuresScene } from '../insights/grafana/EvalSuccessVsFailuresScene';
-import { getFiringGrafanaAlertsScene } from '../insights/grafana/Firing';
 import { getInstanceStatByStatusScene } from '../insights/grafana/InstanceStatusScene';
 import { getGrafanaMissedIterationsScene } from '../insights/grafana/MissedIterationsScene';
 import { getMostFiredInstancesScene } from '../insights/grafana/MostFiredInstancesTable';
@@ -95,6 +96,10 @@ export const PANEL_STYLES = { minHeight: 300 };
 
 const THIS_WEEK_TIME_RANGE = new SceneTimeRange({ from: 'now-1w', to: 'now' });
 
+const namespace = config.bootData.settings.namespace;
+
+export const INSTANCE_ID = namespace.includes('stack-') ? namespace.replace('stack-', '') : undefined;
+
 export function getInsightsScenes() {
   const dataSourceSrv = getDataSourceSrv();
 
@@ -187,7 +192,7 @@ function getGrafanaManagedScenes() {
             new SceneFlexLayout({
               children: [
                 getMostFiredInstancesScene(ashDs, 'Top 10 firing instances'),
-                getFiringGrafanaAlertsScene(cloudUsageDs, 'Firing rules'),
+                getActiveGrafanaAlertsScene(cloudUsageDs, 'Active rules'),
                 getPausedGrafanaAlertsScene(cloudUsageDs, 'Paused rules'),
               ],
             }),
diff --git a/public/app/features/alerting/unified/hooks/__snapshots__/useAbilities.test.tsx.snap b/public/app/features/alerting/unified/hooks/__snapshots__/useAbilities.test.tsx.snap
index 752ef4150f20d..2b0417df56542 100644
--- a/public/app/features/alerting/unified/hooks/__snapshots__/useAbilities.test.tsx.snap
+++ b/public/app/features/alerting/unified/hooks/__snapshots__/useAbilities.test.tsx.snap
@@ -1,5 +1,71 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`AlertRule abilities should report no permissions while we are loading data for cloud rule 1`] = `
+{
+  "delete-alert-rule": [
+    false,
+    false,
+  ],
+  "duplicate-alert-rule": [
+    false,
+    false,
+  ],
+  "explore-alert-rule": [
+    true,
+    false,
+  ],
+  "modify-export-rule": [
+    false,
+    false,
+  ],
+  "silence-alert-rule": [
+    false,
+    false,
+  ],
+  "update-alert-rule": [
+    false,
+    false,
+  ],
+  "view-alert-rule": [
+    true,
+    false,
+  ],
+}
+`;
+
+exports[`AlertRule abilities should report that all actions are supported for a Grafana Managed alert rule 1`] = `
+{
+  "delete-alert-rule": [
+    true,
+    false,
+  ],
+  "duplicate-alert-rule": [
+    true,
+    false,
+  ],
+  "explore-alert-rule": [
+    true,
+    false,
+  ],
+  "modify-export-rule": [
+    true,
+    false,
+  ],
+  "silence-alert-rule": [
+    true,
+    false,
+  ],
+  "update-alert-rule": [
+    true,
+    false,
+  ],
+  "view-alert-rule": [
+    true,
+    false,
+  ],
+}
+`;
+
 exports[`alertmanager abilities should report Create / Update / Delete actions aren't supported for external vanilla alertmanager 1`] = `
 {
   "create-contact-point": [
@@ -19,7 +85,7 @@ exports[`alertmanager abilities should report Create / Update / Delete actions a
     false,
   ],
   "create-silence": [
-    false,
+    true,
     false,
   ],
   "decrypt-secrets": [
@@ -54,6 +120,10 @@ exports[`alertmanager abilities should report Create / Update / Delete actions a
     false,
     false,
   ],
+  "export-mute-timings": [
+    false,
+    false,
+  ],
   "export-notification-policies": [
     false,
     false,
@@ -71,6 +141,10 @@ exports[`alertmanager abilities should report Create / Update / Delete actions a
     false,
   ],
   "update-silence": [
+    true,
+    false,
+  ],
+  "view-autogenerated-policy-tree": [
     false,
     false,
   ],
@@ -153,11 +227,15 @@ exports[`alertmanager abilities should report everything except exporting for Mi
   ],
   "export-contact-point": [
     false,
+    true,
+  ],
+  "export-mute-timings": [
     false,
+    true,
   ],
   "export-notification-policies": [
     false,
-    false,
+    true,
   ],
   "update-external-configuration": [
     true,
@@ -175,6 +253,10 @@ exports[`alertmanager abilities should report everything except exporting for Mi
     true,
     true,
   ],
+  "view-autogenerated-policy-tree": [
+    false,
+    false,
+  ],
   "view-contact-point": [
     true,
     true,
@@ -254,11 +336,15 @@ exports[`alertmanager abilities should report everything is supported for builti
   ],
   "export-contact-point": [
     true,
-    false,
+    true,
+  ],
+  "export-mute-timings": [
+    true,
+    true,
   ],
   "export-notification-policies": [
     true,
-    false,
+    true,
   ],
   "update-external-configuration": [
     true,
@@ -276,6 +362,10 @@ exports[`alertmanager abilities should report everything is supported for builti
     true,
     false,
   ],
+  "view-autogenerated-policy-tree": [
+    true,
+    false,
+  ],
   "view-contact-point": [
     true,
     true,
diff --git a/public/app/features/alerting/unified/hooks/useAbilities.test.tsx b/public/app/features/alerting/unified/hooks/useAbilities.test.tsx
index f434d260f250a..b0f12275dd4cd 100644
--- a/public/app/features/alerting/unified/hooks/useAbilities.test.tsx
+++ b/public/app/features/alerting/unified/hooks/useAbilities.test.tsx
@@ -1,12 +1,13 @@
-import { renderHook } from '@testing-library/react';
+import { renderHook, waitFor } from '@testing-library/react';
 import { createBrowserHistory } from 'history';
 import React, { PropsWithChildren } from 'react';
 import { Router } from 'react-router-dom';
+import { TestProvider } from 'test/helpers/TestProvider';
 
 import { AlertManagerDataSourceJsonData, AlertManagerImplementation } from 'app/plugins/datasource/alertmanager/types';
 import { AccessControlAction } from 'app/types';
 
-import { grantUserPermissions, mockDataSource } from '../mocks';
+import { getCloudRule, getGrafanaRule, grantUserPermissions, mockDataSource } from '../mocks';
 import { AlertmanagerProvider } from '../state/AlertmanagerContext';
 import { setupDataSources } from '../testSetup/datasources';
 import { DataSourceType, GRAFANA_RULES_SOURCE_NAME } from '../utils/datasource';
@@ -15,6 +16,7 @@ import {
   AlertmanagerAction,
   useAlertmanagerAbilities,
   useAlertmanagerAbility,
+  useAllAlertRuleAbilities,
   useAllAlertmanagerAbilities,
 } from './useAbilities';
 
@@ -32,7 +34,9 @@ describe('alertmanager abilities', () => {
       })
     );
 
-    const abilities = renderHook(() => useAllAlertmanagerAbilities(), { wrapper: createWrapper('does-not-exist') });
+    const abilities = renderHook(() => useAllAlertmanagerAbilities(), {
+      wrapper: createAlertmanagerWrapper('does-not-exist'),
+    });
     expect(abilities.result.current).toMatchSnapshot();
   });
 
@@ -47,7 +51,7 @@ describe('alertmanager abilities', () => {
     grantUserPermissions([AccessControlAction.AlertingNotificationsRead, AccessControlAction.AlertingInstanceRead]);
 
     const abilities = renderHook(() => useAllAlertmanagerAbilities(), {
-      wrapper: createWrapper(GRAFANA_RULES_SOURCE_NAME),
+      wrapper: createAlertmanagerWrapper(GRAFANA_RULES_SOURCE_NAME),
     });
 
     Object.values(abilities.result.current).forEach(([supported]) => {
@@ -56,7 +60,7 @@ describe('alertmanager abilities', () => {
 
     // since we only granted "read" permissions, only those should be allowed
     const viewAbility = renderHook(() => useAlertmanagerAbility(AlertmanagerAction.ViewSilence), {
-      wrapper: createWrapper(GRAFANA_RULES_SOURCE_NAME),
+      wrapper: createAlertmanagerWrapper(GRAFANA_RULES_SOURCE_NAME),
     });
 
     const [viewSupported, viewAllowed] = viewAbility.result.current;
@@ -66,7 +70,7 @@ describe('alertmanager abilities', () => {
 
     // editing should not be allowed, but supported
     const editAbility = renderHook(() => useAlertmanagerAbility(AlertmanagerAction.ViewSilence), {
-      wrapper: createWrapper(GRAFANA_RULES_SOURCE_NAME),
+      wrapper: createAlertmanagerWrapper(GRAFANA_RULES_SOURCE_NAME),
     });
 
     const [editSupported, editAllowed] = editAbility.result.current;
@@ -97,7 +101,7 @@ describe('alertmanager abilities', () => {
     ]);
 
     const abilities = renderHook(() => useAllAlertmanagerAbilities(), {
-      wrapper: createWrapper('mimir'),
+      wrapper: createAlertmanagerWrapper('mimir'),
     });
 
     expect(abilities.result.current).toMatchSnapshot();
@@ -121,18 +125,52 @@ describe('alertmanager abilities', () => {
           AlertmanagerAction.ExportContactPoint,
         ]),
       {
-        wrapper: createWrapper(GRAFANA_RULES_SOURCE_NAME),
+        wrapper: createAlertmanagerWrapper(GRAFANA_RULES_SOURCE_NAME),
       }
     );
 
     expect(abilities.result.current).toHaveLength(3);
     expect(abilities.result.current[0]).toStrictEqual([true, true]);
     expect(abilities.result.current[1]).toStrictEqual([true, false]);
-    expect(abilities.result.current[2]).toStrictEqual([true, false]);
+    expect(abilities.result.current[2]).toStrictEqual([true, true]);
   });
 });
 
-function createWrapper(alertmanagerSourceName: string) {
+describe('AlertRule abilities', () => {
+  it('should report that all actions are supported for a Grafana Managed alert rule', async () => {
+    const rule = getGrafanaRule();
+
+    const abilities = renderHook(() => useAllAlertRuleAbilities(rule), { wrapper: TestProvider });
+
+    await waitFor(() => {
+      const results = Object.values(abilities.result.current);
+
+      for (const [supported, _allowed] of results) {
+        expect(supported).toBe(true);
+      }
+    });
+
+    expect(abilities.result.current).toMatchSnapshot();
+  });
+
+  it('should report no permissions while we are loading data for cloud rule', async () => {
+    const rule = getCloudRule();
+
+    const abilities = renderHook(() => useAllAlertRuleAbilities(rule), { wrapper: TestProvider });
+
+    await waitFor(() => {
+      expect(abilities.result.current).not.toBeUndefined();
+    });
+
+    expect(abilities.result.current).toMatchSnapshot();
+  });
+
+  it('should not allow certain actions for provisioned rules', () => {});
+
+  it('should not allow certain actions for federated rules', () => {});
+});
+
+function createAlertmanagerWrapper(alertmanagerSourceName: string) {
   const wrapper = (props: PropsWithChildren) => (
     <Router history={createBrowserHistory()}>
       <AlertmanagerProvider accessType={'notification'} alertmanagerSourceName={alertmanagerSourceName}>
diff --git a/public/app/features/alerting/unified/hooks/useAbilities.ts b/public/app/features/alerting/unified/hooks/useAbilities.ts
index eb520364b6eed..9906553bf7b42 100644
--- a/public/app/features/alerting/unified/hooks/useAbilities.ts
+++ b/public/app/features/alerting/unified/hooks/useAbilities.ts
@@ -1,16 +1,25 @@
 import { useMemo } from 'react';
 
-import { contextSrv as ctx } from 'app/core/services/context_srv';
+import { contextSrv, contextSrv as ctx } from 'app/core/services/context_srv';
+import { AlertmanagerChoice } from 'app/plugins/datasource/alertmanager/types';
 import { AccessControlAction } from 'app/types';
+import { CombinedRule, RulesSource } from 'app/types/unified-alerting';
 
+import { alertmanagerApi } from '../api/alertmanagerApi';
 import { useAlertmanager } from '../state/AlertmanagerContext';
-import { getInstancesPermissions, getNotificationsPermissions } from '../utils/access-control';
+import { getInstancesPermissions, getNotificationsPermissions, getRulesPermissions } from '../utils/access-control';
+import { GRAFANA_RULES_SOURCE_NAME } from '../utils/datasource';
+import { isFederatedRuleGroup, isGrafanaRulerRule } from '../utils/rules';
+
+import { useIsRuleEditable } from './useIsRuleEditable';
 
 /**
  * These hooks will determine if
- *  1. the action is supported in the current alertmanager or data source context
+ *  1. the action is supported in the current context (alertmanager, alert rule or general context)
  *  2. user is allowed to perform actions based on their set of permissions / assigned role
  */
+
+// this enum lists all of the available actions we can perform within the context of an alertmanager
 export enum AlertmanagerAction {
   // configuration
   ViewExternalConfiguration = 'view-external-configuration',
@@ -36,6 +45,7 @@ export enum AlertmanagerAction {
   UpdateNotificationPolicyTree = 'update-notification-policy-tree',
   DeleteNotificationPolicy = 'delete-notification-policy',
   ExportNotificationPolicies = 'export-notification-policies',
+  ViewAutogeneratedPolicyTree = 'view-autogenerated-policy-tree',
 
   // silences – these cannot be deleted only "expired" (updated)
   CreateSilence = 'create-silence',
@@ -47,14 +57,30 @@ export enum AlertmanagerAction {
   CreateMuteTiming = 'create-mute-timing',
   UpdateMuteTiming = 'update-mute-timing',
   DeleteMuteTiming = 'delete-mute-timing',
+  ExportMuteTimings = 'export-mute-timings',
+}
+
+// this enum lists all of the available actions we can take on a single alert rule
+export enum AlertRuleAction {
+  Duplicate = 'duplicate-alert-rule',
+  View = 'view-alert-rule',
+  Update = 'update-alert-rule',
+  Delete = 'delete-alert-rule',
+  Explore = 'explore-alert-rule',
+  Silence = 'silence-alert-rule',
+  ModifyExport = 'modify-export-rule',
 }
 
-export enum AlertSourceAction {
+// this enum lists all of the actions we can perform within alerting in general, not linked to a specific
+// alert source, rule or alertmanager
+export enum AlertingAction {
   // internal (Grafana managed)
   CreateAlertRule = 'create-alert-rule',
   ViewAlertRule = 'view-alert-rule',
   UpdateAlertRule = 'update-alert-rule',
   DeleteAlertRule = 'delete-alert-rule',
+  ExportGrafanaManagedRules = 'export-grafana-managed-rules',
+
   // external (any compatible alerting data source)
   CreateExternalAlertRule = 'create-external-alert-rule',
   ViewExternalAlertRule = 'view-external-alert-rule',
@@ -62,39 +88,92 @@ export enum AlertSourceAction {
   DeleteExternalAlertRule = 'delete-external-alert-rule',
 }
 
-const AlwaysSupported = true; // this just makes it easier to understand the code
-export type Action = AlertmanagerAction | AlertSourceAction;
+// these just makes it easier to read the code :)
+const AlwaysSupported = true;
+const NotSupported = false;
 
+export type Action = AlertmanagerAction | AlertingAction | AlertRuleAction;
 export type Ability = [actionSupported: boolean, actionAllowed: boolean];
 export type Abilities<T extends Action> = Record<T, Ability>;
 
-export function useAlertSourceAbilities(): Abilities<AlertSourceAction> {
-  // TODO add the "supported" booleans here, we currently only do authorization
-
-  const abilities: Abilities<AlertSourceAction> = {
-    // -- Grafana managed alert rules --
-    [AlertSourceAction.CreateAlertRule]: [AlwaysSupported, ctx.hasPermission(AccessControlAction.AlertingRuleCreate)],
-    [AlertSourceAction.ViewAlertRule]: [AlwaysSupported, ctx.hasPermission(AccessControlAction.AlertingRuleRead)],
-    [AlertSourceAction.UpdateAlertRule]: [AlwaysSupported, ctx.hasPermission(AccessControlAction.AlertingRuleUpdate)],
-    [AlertSourceAction.DeleteAlertRule]: [AlwaysSupported, ctx.hasPermission(AccessControlAction.AlertingRuleDelete)],
-    // -- External alert rules (Mimir / Loki / etc) --
-    // for these we only have "read" and "write" permissions
-    [AlertSourceAction.CreateExternalAlertRule]: [
-      AlwaysSupported,
-      ctx.hasPermission(AccessControlAction.AlertingRuleExternalWrite),
-    ],
-    [AlertSourceAction.ViewExternalAlertRule]: [
-      AlwaysSupported,
-      ctx.hasPermission(AccessControlAction.AlertingRuleExternalRead),
-    ],
-    [AlertSourceAction.UpdateExternalAlertRule]: [
-      AlwaysSupported,
-      ctx.hasPermission(AccessControlAction.AlertingRuleExternalWrite),
-    ],
-    [AlertSourceAction.DeleteExternalAlertRule]: [
-      AlwaysSupported,
-      ctx.hasPermission(AccessControlAction.AlertingRuleExternalWrite),
-    ],
+/**
+ * This one will check for alerting abilities that don't apply to any particular alert source or alert rule
+ */
+export const useAlertingAbilities = (): Abilities<AlertingAction> => {
+  return {
+    // internal (Grafana managed)
+    [AlertingAction.CreateAlertRule]: toAbility(AlwaysSupported, AccessControlAction.AlertingRuleCreate),
+    [AlertingAction.ViewAlertRule]: toAbility(AlwaysSupported, AccessControlAction.AlertingRuleRead),
+    [AlertingAction.UpdateAlertRule]: toAbility(AlwaysSupported, AccessControlAction.AlertingRuleUpdate),
+    [AlertingAction.DeleteAlertRule]: toAbility(AlwaysSupported, AccessControlAction.AlertingRuleDelete),
+    [AlertingAction.ExportGrafanaManagedRules]: toAbility(AlwaysSupported, AccessControlAction.AlertingRuleRead),
+
+    // external
+    [AlertingAction.CreateExternalAlertRule]: toAbility(AlwaysSupported, AccessControlAction.AlertingRuleExternalWrite),
+    [AlertingAction.ViewExternalAlertRule]: toAbility(AlwaysSupported, AccessControlAction.AlertingRuleExternalRead),
+    [AlertingAction.UpdateExternalAlertRule]: toAbility(AlwaysSupported, AccessControlAction.AlertingRuleExternalWrite),
+    [AlertingAction.DeleteExternalAlertRule]: toAbility(AlwaysSupported, AccessControlAction.AlertingRuleExternalWrite),
+  };
+};
+
+export const useAlertingAbility = (action: AlertingAction): Ability => {
+  const allAbilities = useAlertingAbilities();
+  return allAbilities[action];
+};
+
+/**
+ * This hook will check if we support the action and have sufficient permissions for it on a single alert rule
+ */
+export function useAlertRuleAbility(rule: CombinedRule, action: AlertRuleAction): Ability {
+  const abilities = useAllAlertRuleAbilities(rule);
+
+  return useMemo(() => {
+    return abilities[action];
+  }, [abilities, action]);
+}
+
+export function useAlertRuleAbilities(rule: CombinedRule, actions: AlertRuleAction[]): Ability[] {
+  const abilities = useAllAlertRuleAbilities(rule);
+
+  return useMemo(() => {
+    return actions.map((action) => abilities[action]);
+  }, [abilities, actions]);
+}
+
+export function useAllAlertRuleAbilities(rule: CombinedRule): Abilities<AlertRuleAction> {
+  const rulesSource = rule.namespace.rulesSource;
+  const rulesSourceName = typeof rulesSource === 'string' ? rulesSource : rulesSource.name;
+
+  const isProvisioned = isGrafanaRulerRule(rule.rulerRule) && Boolean(rule.rulerRule.grafana_alert.provenance);
+  const isFederated = isFederatedRuleGroup(rule.group);
+  const isGrafanaManagedAlertRule = isGrafanaRulerRule(rule.rulerRule);
+
+  // if a rule is either provisioned or a federated rule, we don't allow it to be removed or edited
+  const immutableRule = isProvisioned || isFederated;
+
+  const {
+    isEditable,
+    isRemovable,
+    isRulerAvailable = false,
+    loading,
+  } = useIsRuleEditable(rulesSourceName, rule.rulerRule);
+  const [_, exportAllowed] = useAlertingAbility(AlertingAction.ExportGrafanaManagedRules);
+
+  // while we gather info, pretend it's not supported
+  const MaybeSupported = loading ? NotSupported : isRulerAvailable;
+  const MaybeSupportedUnlessImmutable = immutableRule ? NotSupported : MaybeSupported;
+
+  const rulesPermissions = getRulesPermissions(rulesSourceName);
+  const canSilence = useCanSilence(rulesSource);
+
+  const abilities: Abilities<AlertRuleAction> = {
+    [AlertRuleAction.Duplicate]: toAbility(MaybeSupported, rulesPermissions.create),
+    [AlertRuleAction.View]: toAbility(AlwaysSupported, rulesPermissions.read),
+    [AlertRuleAction.Update]: [MaybeSupportedUnlessImmutable, isEditable ?? false],
+    [AlertRuleAction.Delete]: [MaybeSupportedUnlessImmutable, isRemovable ?? false],
+    [AlertRuleAction.Explore]: toAbility(AlwaysSupported, AccessControlAction.DataSourcesExplore),
+    [AlertRuleAction.Silence]: canSilence,
+    [AlertRuleAction.ModifyExport]: [isGrafanaManagedAlertRule, exportAllowed],
   };
 
   return abilities;
@@ -112,77 +191,57 @@ export function useAllAlertmanagerAbilities(): Abilities<AlertmanagerAction> {
   const notificationsPermissions = getNotificationsPermissions(selectedAlertmanager!);
   const instancePermissions = getInstancesPermissions(selectedAlertmanager!);
 
+  //we need to know user role to determine if they can view autogenerated policy tree
+  const isAdmin = contextSrv.hasRole('Admin') || contextSrv.isGrafanaAdmin;
+
   // list out all of the abilities, and if the user has permissions to perform them
   const abilities: Abilities<AlertmanagerAction> = {
     // -- configuration --
-    [AlertmanagerAction.ViewExternalConfiguration]: [
+    [AlertmanagerAction.ViewExternalConfiguration]: toAbility(
       AlwaysSupported,
-      ctx.hasPermission(AccessControlAction.AlertingNotificationsExternalRead),
-    ],
-    [AlertmanagerAction.UpdateExternalConfiguration]: [
+      AccessControlAction.AlertingNotificationsExternalRead
+    ),
+    [AlertmanagerAction.UpdateExternalConfiguration]: toAbility(
       hasConfigurationAPI,
-      ctx.hasPermission(AccessControlAction.AlertingNotificationsExternalWrite),
-    ],
+      AccessControlAction.AlertingNotificationsExternalWrite
+    ),
     // -- contact points --
-    [AlertmanagerAction.CreateContactPoint]: [hasConfigurationAPI, ctx.hasPermission(notificationsPermissions.create)],
-    [AlertmanagerAction.ViewContactPoint]: [AlwaysSupported, ctx.hasPermission(notificationsPermissions.read)],
-    [AlertmanagerAction.UpdateContactPoint]: [hasConfigurationAPI, ctx.hasPermission(notificationsPermissions.update)],
-    [AlertmanagerAction.DeleteContactPoint]: [hasConfigurationAPI, ctx.hasPermission(notificationsPermissions.delete)],
+    [AlertmanagerAction.CreateContactPoint]: toAbility(hasConfigurationAPI, notificationsPermissions.create),
+    [AlertmanagerAction.ViewContactPoint]: toAbility(AlwaysSupported, notificationsPermissions.read),
+    [AlertmanagerAction.UpdateContactPoint]: toAbility(hasConfigurationAPI, notificationsPermissions.update),
+    [AlertmanagerAction.DeleteContactPoint]: toAbility(hasConfigurationAPI, notificationsPermissions.delete),
     // only Grafana flavored alertmanager supports exporting
-    [AlertmanagerAction.ExportContactPoint]: [
-      isGrafanaFlavoredAlertmanager,
-      ctx.hasPermission(notificationsPermissions.provisioning.read) ||
-        ctx.hasPermission(notificationsPermissions.provisioning.readSecrets),
-    ],
+    [AlertmanagerAction.ExportContactPoint]: toAbility(isGrafanaFlavoredAlertmanager, notificationsPermissions.read),
     // -- notification templates --
-    [AlertmanagerAction.CreateNotificationTemplate]: [
-      hasConfigurationAPI,
-      ctx.hasPermission(notificationsPermissions.create),
-    ],
-    [AlertmanagerAction.ViewNotificationTemplate]: [AlwaysSupported, ctx.hasPermission(notificationsPermissions.read)],
-    [AlertmanagerAction.UpdateNotificationTemplate]: [
-      hasConfigurationAPI,
-      ctx.hasPermission(notificationsPermissions.update),
-    ],
-    [AlertmanagerAction.DeleteNotificationTemplate]: [
-      hasConfigurationAPI,
-      ctx.hasPermission(notificationsPermissions.delete),
-    ],
+    [AlertmanagerAction.CreateNotificationTemplate]: toAbility(hasConfigurationAPI, notificationsPermissions.create),
+    [AlertmanagerAction.ViewNotificationTemplate]: toAbility(AlwaysSupported, notificationsPermissions.read),
+    [AlertmanagerAction.UpdateNotificationTemplate]: toAbility(hasConfigurationAPI, notificationsPermissions.update),
+    [AlertmanagerAction.DeleteNotificationTemplate]: toAbility(hasConfigurationAPI, notificationsPermissions.delete),
     // -- notification policies --
-    [AlertmanagerAction.CreateNotificationPolicy]: [
-      hasConfigurationAPI,
-      ctx.hasPermission(notificationsPermissions.create),
-    ],
-    [AlertmanagerAction.ViewNotificationPolicyTree]: [
-      AlwaysSupported,
-      ctx.hasPermission(notificationsPermissions.read),
-    ],
-    [AlertmanagerAction.UpdateNotificationPolicyTree]: [
-      hasConfigurationAPI,
-      ctx.hasPermission(notificationsPermissions.update),
-    ],
-    [AlertmanagerAction.DeleteNotificationPolicy]: [
-      hasConfigurationAPI,
-      ctx.hasPermission(notificationsPermissions.delete),
-    ],
-    [AlertmanagerAction.ExportNotificationPolicies]: [
+    [AlertmanagerAction.CreateNotificationPolicy]: toAbility(hasConfigurationAPI, notificationsPermissions.create),
+    [AlertmanagerAction.ViewNotificationPolicyTree]: toAbility(AlwaysSupported, notificationsPermissions.read),
+    [AlertmanagerAction.UpdateNotificationPolicyTree]: toAbility(hasConfigurationAPI, notificationsPermissions.update),
+    [AlertmanagerAction.DeleteNotificationPolicy]: toAbility(hasConfigurationAPI, notificationsPermissions.delete),
+    [AlertmanagerAction.ExportNotificationPolicies]: toAbility(
       isGrafanaFlavoredAlertmanager,
-      ctx.hasPermission(notificationsPermissions.provisioning.read) ||
-        ctx.hasPermission(notificationsPermissions.provisioning.readSecrets),
-    ],
-    [AlertmanagerAction.DecryptSecrets]: [
+      notificationsPermissions.read
+    ),
+    [AlertmanagerAction.DecryptSecrets]: toAbility(
       isGrafanaFlavoredAlertmanager,
-      ctx.hasPermission(notificationsPermissions.provisioning.readSecrets),
-    ],
+      notificationsPermissions.provisioning.readSecrets
+    ),
+    [AlertmanagerAction.ViewAutogeneratedPolicyTree]: [isGrafanaFlavoredAlertmanager, isAdmin],
     // -- silences --
-    [AlertmanagerAction.CreateSilence]: [hasConfigurationAPI, ctx.hasPermission(instancePermissions.create)],
-    [AlertmanagerAction.ViewSilence]: [AlwaysSupported, ctx.hasPermission(instancePermissions.read)],
-    [AlertmanagerAction.UpdateSilence]: [hasConfigurationAPI, ctx.hasPermission(instancePermissions.update)],
+    // for now, all supported Alertmanager flavors have API endpoints for managing silences
+    [AlertmanagerAction.CreateSilence]: toAbility(AlwaysSupported, instancePermissions.create),
+    [AlertmanagerAction.ViewSilence]: toAbility(AlwaysSupported, instancePermissions.read),
+    [AlertmanagerAction.UpdateSilence]: toAbility(AlwaysSupported, instancePermissions.update),
     // -- mute timtings --
-    [AlertmanagerAction.CreateMuteTiming]: [hasConfigurationAPI, ctx.hasPermission(notificationsPermissions.create)],
-    [AlertmanagerAction.ViewMuteTiming]: [AlwaysSupported, ctx.hasPermission(notificationsPermissions.read)],
-    [AlertmanagerAction.UpdateMuteTiming]: [hasConfigurationAPI, ctx.hasPermission(notificationsPermissions.update)],
-    [AlertmanagerAction.DeleteMuteTiming]: [hasConfigurationAPI, ctx.hasPermission(notificationsPermissions.delete)],
+    [AlertmanagerAction.CreateMuteTiming]: toAbility(hasConfigurationAPI, notificationsPermissions.create),
+    [AlertmanagerAction.ViewMuteTiming]: toAbility(AlwaysSupported, notificationsPermissions.read),
+    [AlertmanagerAction.UpdateMuteTiming]: toAbility(hasConfigurationAPI, notificationsPermissions.update),
+    [AlertmanagerAction.DeleteMuteTiming]: toAbility(hasConfigurationAPI, notificationsPermissions.delete),
+    [AlertmanagerAction.ExportMuteTimings]: toAbility(isGrafanaFlavoredAlertmanager, notificationsPermissions.read),
   };
 
   return abilities;
@@ -204,7 +263,31 @@ export function useAlertmanagerAbilities(actions: AlertmanagerAction[]): Ability
   }, [abilities, actions]);
 }
 
-export function useAlertSourceAbility(action: AlertSourceAction): Ability {
-  const abilities = useAlertSourceAbilities();
-  return useMemo(() => abilities[action], [abilities, action]);
+/**
+ * We don't want to show the silence button if either
+ * 1. the user has no permissions to create silences
+ * 2. the admin has configured to only send instances to external AMs
+ */
+function useCanSilence(rulesSource: RulesSource): [boolean, boolean] {
+  const isGrafanaManagedRule = rulesSource === GRAFANA_RULES_SOURCE_NAME;
+
+  const { useGetAlertmanagerChoiceStatusQuery } = alertmanagerApi;
+  const { currentData: amConfigStatus, isLoading } = useGetAlertmanagerChoiceStatusQuery(undefined, {
+    skip: !isGrafanaManagedRule,
+  });
+
+  // we don't support silencing when the rule is not a Grafana managed rule
+  // we simply don't know what Alertmanager the ruler is sending alerts to
+  if (!isGrafanaManagedRule || isLoading) {
+    return [false, false];
+  }
+
+  const interactsOnlyWithExternalAMs = amConfigStatus?.alertmanagersChoice === AlertmanagerChoice.External;
+  const interactsWithAll = amConfigStatus?.alertmanagersChoice === AlertmanagerChoice.All;
+  const silenceSupported = !interactsOnlyWithExternalAMs || interactsWithAll;
+
+  return toAbility(silenceSupported, AccessControlAction.AlertingInstanceCreate);
 }
+
+// just a convenient function
+const toAbility = (supported: boolean, action: AccessControlAction): Ability => [supported, ctx.hasPermission(action)];
diff --git a/public/app/features/alerting/unified/hooks/useCombinedRule.ts b/public/app/features/alerting/unified/hooks/useCombinedRule.ts
index 21c64a2e4b5d6..b3070d219049d 100644
--- a/public/app/features/alerting/unified/hooks/useCombinedRule.ts
+++ b/public/app/features/alerting/unified/hooks/useCombinedRule.ts
@@ -67,7 +67,7 @@ export function useCloudCombinedRulesMatching(
   const { dsFeatures, isLoadingDsFeatures } = useDataSourceFeatures(ruleSourceName);
 
   const {
-    currentData: promRuleNs = [],
+    currentData,
     isLoading: isLoadingPromRules,
     error: promRuleNsError,
   } = alertRuleApi.endpoints.prometheusRuleNamespaces.useQuery({
@@ -87,6 +87,7 @@ export function useCloudCombinedRulesMatching(
     if (promRuleNsError) {
       throw new Error('Unable to obtain Prometheus rules');
     }
+    const promRuleNs = currentData || [];
 
     const rulerGroups: RulerRuleGroupDTO[] = [];
     if (dsFeatures?.rulerConfig) {
@@ -114,7 +115,7 @@ export function useCloudCombinedRulesMatching(
     const rules = namespaces.flatMap((ns) => ns.groups.flatMap((group) => group.rules));
 
     return rules;
-  }, [dsSettings, dsFeatures, isLoadingPromRules, promRuleNsError, promRuleNs, fetchRulerRuleGroup]);
+  }, [dsSettings, dsFeatures, isLoadingPromRules, promRuleNsError, currentData, fetchRulerRuleGroup]);
 
   return { loading: isLoadingDsFeatures || loading, error: error, rules: value };
 }
diff --git a/public/app/features/alerting/unified/hooks/useCombinedRuleNamespaces.ts b/public/app/features/alerting/unified/hooks/useCombinedRuleNamespaces.ts
index eb9f5f7380198..18fc75e3755ac 100644
--- a/public/app/features/alerting/unified/hooks/useCombinedRuleNamespaces.ts
+++ b/public/app/features/alerting/unified/hooks/useCombinedRuleNamespaces.ts
@@ -91,6 +91,13 @@ export function useCombinedRuleNamespaces(
             name: namespaceName,
             groups: [],
           };
+
+          // We need to set the namespace_uid for grafana rules as it's required to obtain the rule's groups
+          // All rules from all groups have the same namespace_uid so we're taking the first one.
+          if (isGrafanaRulerRule(groups[0].rules[0])) {
+            namespace.uid = groups[0].rules[0].grafana_alert.namespace_uid;
+          }
+
           namespaces[namespaceName] = namespace;
           addRulerGroupsToCombinedNamespace(namespace, groups);
         });
@@ -275,11 +282,11 @@ export function calculateRuleTotals(rule: Pick<AlertingRule, 'alerts' | 'totals'
   }
 
   return {
-    alerting: result[AlertInstanceTotalState.Alerting],
+    alerting: result[AlertInstanceTotalState.Alerting] || result['firing'],
     pending: result[AlertInstanceTotalState.Pending],
     inactive: result[AlertInstanceTotalState.Normal],
     nodata: result[AlertInstanceTotalState.NoData],
-    error: result[AlertInstanceTotalState.Error] + result['err'], // Prometheus uses "err" instead of "error"
+    error: result[AlertInstanceTotalState.Error] || result['err'] || undefined, // Prometheus uses "err" instead of "error"
   };
 }
 
@@ -366,28 +373,28 @@ function rulerRuleToCombinedRule(
         filteredInstanceTotals: {},
       }
     : isRecordingRulerRule(rule)
-    ? {
-        name: rule.record,
-        query: rule.expr,
-        labels: rule.labels || {},
-        annotations: {},
-        rulerRule: rule,
-        namespace,
-        group,
-        instanceTotals: {},
-        filteredInstanceTotals: {},
-      }
-    : {
-        name: rule.grafana_alert.title,
-        query: '',
-        labels: rule.labels || {},
-        annotations: rule.annotations || {},
-        rulerRule: rule,
-        namespace,
-        group,
-        instanceTotals: {},
-        filteredInstanceTotals: {},
-      };
+      ? {
+          name: rule.record,
+          query: rule.expr,
+          labels: rule.labels || {},
+          annotations: {},
+          rulerRule: rule,
+          namespace,
+          group,
+          instanceTotals: {},
+          filteredInstanceTotals: {},
+        }
+      : {
+          name: rule.grafana_alert.title,
+          query: '',
+          labels: rule.labels || {},
+          annotations: rule.annotations || {},
+          rulerRule: rule,
+          namespace,
+          group,
+          instanceTotals: {},
+          filteredInstanceTotals: {},
+        };
 }
 
 // find existing rule in group that matches the given prom rule
diff --git a/public/app/features/alerting/unified/hooks/useExternalAMSelector.test.tsx b/public/app/features/alerting/unified/hooks/useExternalAMSelector.test.tsx
index f45b2bc0ffe96..1e15071190b1d 100644
--- a/public/app/features/alerting/unified/hooks/useExternalAMSelector.test.tsx
+++ b/public/app/features/alerting/unified/hooks/useExternalAMSelector.test.tsx
@@ -1,16 +1,14 @@
-import { renderHook, waitFor } from '@testing-library/react';
-import { setupServer } from 'msw/node';
-import React from 'react';
-import { Provider } from 'react-redux';
-
 import 'whatwg-fetch';
+import { renderHook, waitFor } from '@testing-library/react';
+import { http, HttpResponse } from 'msw';
+import { SetupServer, setupServer } from 'msw/node';
+import { TestProvider } from 'test/helpers/TestProvider';
 
-import { DataSourceJsonData, DataSourceSettings } from '@grafana/data';
-import { config, setBackendSrv } from '@grafana/runtime';
+import { DataSourceSettings } from '@grafana/data';
+import { setBackendSrv } from '@grafana/runtime';
 import { backendSrv } from 'app/core/services/backend_srv';
 import { AlertManagerDataSourceJsonData } from 'app/plugins/datasource/alertmanager/types';
 
-import { mockDataSource, mockDataSourcesStore, mockStore } from '../mocks';
 import { mockAlertmanagersResponse } from '../mocks/alertmanagerApi';
 
 import { useExternalDataSourceAlertmanagers } from './useExternalAmSelector';
@@ -31,46 +29,42 @@ afterAll(() => {
 });
 
 describe('useExternalDataSourceAlertmanagers', () => {
-  it('Should merge data sources information from config and api responses', async () => {
+  it('Should get the correct data source settings', async () => {
     // Arrange
-    const { dsSettings, dsInstanceSettings } = setupAlertmanagerDataSource({ url: 'http://grafana.com' });
+    setupAlertmanagerDataSource(server, { url: 'http://grafana.com' });
+    mockAlertmanagersResponse(server, { data: { activeAlertManagers: [], droppedAlertManagers: [] } });
 
-    config.datasources = {
-      'External Alertmanager': dsInstanceSettings,
-    };
+    // Act
+    const { result } = renderHook(() => useExternalDataSourceAlertmanagers(), { wrapper: TestProvider });
+    await waitFor(() => {
+      // Assert
+      const { current } = result;
 
-    const store = mockDataSourcesStore({
-      dataSources: [dsSettings],
+      expect(current).toHaveLength(1);
+      expect(current[0].dataSourceSettings.uid).toBe('1');
+      expect(current[0].dataSourceSettings.url).toBe('http://grafana.com');
     });
+  });
 
+  it('Should have uninterested state if data source does not want alerts', async () => {
+    // Arrange
+    setupAlertmanagerDataSource(server, { url: 'http://grafana.com', jsonData: { handleGrafanaManagedAlerts: false } });
     mockAlertmanagersResponse(server, { data: { activeAlertManagers: [], droppedAlertManagers: [] } });
 
-    const wrapper = ({ children }: React.PropsWithChildren<{}>) => <Provider store={store}>{children}</Provider>;
-
     // Act
-    const { result } = renderHook(() => useExternalDataSourceAlertmanagers(), { wrapper });
+    const { result } = renderHook(() => useExternalDataSourceAlertmanagers(), { wrapper: TestProvider });
     await waitFor(() => {
       // Assert
       const { current } = result;
 
       expect(current).toHaveLength(1);
-      expect(current[0].dataSource.uid).toBe('1');
-      expect(current[0].url).toBe('http://grafana.com');
+      expect(current[0].status).toBe('uninterested');
     });
   });
 
   it('Should have active state if available in the activeAlertManagers', async () => {
     // Arrange
-    const { dsSettings, dsInstanceSettings } = setupAlertmanagerDataSource({ url: 'http://grafana.com' });
-
-    config.datasources = {
-      'External Alertmanager': dsInstanceSettings,
-    };
-
-    const store = mockStore((state) => {
-      state.dataSources.dataSources = [dsSettings];
-    });
-
+    setupAlertmanagerDataSource(server, { url: 'http://grafana.com' });
     mockAlertmanagersResponse(server, {
       data: {
         activeAlertManagers: [{ url: 'http://grafana.com/api/v2/alerts' }],
@@ -78,32 +72,20 @@ describe('useExternalDataSourceAlertmanagers', () => {
       },
     });
 
-    const wrapper = ({ children }: React.PropsWithChildren<{}>) => <Provider store={store}>{children}</Provider>;
-
     // Act
-    const { result } = renderHook(() => useExternalDataSourceAlertmanagers(), { wrapper });
+    const { result } = renderHook(() => useExternalDataSourceAlertmanagers(), { wrapper: TestProvider });
     await waitFor(() => {
       // Assert
       const { current } = result;
 
       expect(current).toHaveLength(1);
       expect(current[0].status).toBe('active');
-      expect(current[0].statusInconclusive).toBe(false);
     });
   });
 
   it('Should have dropped state if available in the droppedAlertManagers', async () => {
     // Arrange
-    const { dsSettings, dsInstanceSettings } = setupAlertmanagerDataSource({ url: 'http://grafana.com' });
-
-    config.datasources = {
-      'External Alertmanager': dsInstanceSettings,
-    };
-
-    const store = mockStore((state) => {
-      state.dataSources.dataSources = [dsSettings];
-    });
-
+    setupAlertmanagerDataSource(server, { url: 'http://grafana.com' });
     mockAlertmanagersResponse(server, {
       data: {
         activeAlertManagers: [],
@@ -111,10 +93,8 @@ describe('useExternalDataSourceAlertmanagers', () => {
       },
     });
 
-    const wrapper = ({ children }: React.PropsWithChildren<{}>) => <Provider store={store}>{children}</Provider>;
-
     // Act
-    const { result } = renderHook(() => useExternalDataSourceAlertmanagers(), { wrapper });
+    const { result } = renderHook(() => useExternalDataSourceAlertmanagers(), { wrapper: TestProvider });
 
     await waitFor(() => {
       // Assert
@@ -122,22 +102,12 @@ describe('useExternalDataSourceAlertmanagers', () => {
 
       expect(current).toHaveLength(1);
       expect(current[0].status).toBe('dropped');
-      expect(current[0].statusInconclusive).toBe(false);
     });
   });
 
   it('Should have pending state if not available neither in dropped nor in active alertManagers', async () => {
     // Arrange
-    const { dsSettings, dsInstanceSettings } = setupAlertmanagerDataSource();
-
-    config.datasources = {
-      'External Alertmanager': dsInstanceSettings,
-    };
-
-    const store = mockStore((state) => {
-      state.dataSources.dataSources = [dsSettings];
-    });
-
+    setupAlertmanagerDataSource(server);
     mockAlertmanagersResponse(server, {
       data: {
         activeAlertManagers: [],
@@ -145,10 +115,8 @@ describe('useExternalDataSourceAlertmanagers', () => {
       },
     });
 
-    const wrapper = ({ children }: React.PropsWithChildren<{}>) => <Provider store={store}>{children}</Provider>;
-
     // Act
-    const { result } = renderHook(() => useExternalDataSourceAlertmanagers(), { wrapper });
+    const { result } = renderHook(() => useExternalDataSourceAlertmanagers(), { wrapper: TestProvider });
 
     await waitFor(() => {
       // Assert
@@ -156,22 +124,12 @@ describe('useExternalDataSourceAlertmanagers', () => {
 
       expect(current).toHaveLength(1);
       expect(current[0].status).toBe('pending');
-      expect(current[0].statusInconclusive).toBe(false);
     });
   });
 
   it('Should match Alertmanager url when datasource url does not have protocol specified', async () => {
     // Arrange
-    const { dsSettings, dsInstanceSettings } = setupAlertmanagerDataSource({ url: 'localhost:9093' });
-
-    config.datasources = {
-      'External Alertmanager': dsInstanceSettings,
-    };
-
-    const store = mockStore((state) => {
-      state.dataSources.dataSources = [dsSettings];
-    });
-
+    setupAlertmanagerDataSource(server, { url: 'localhost:9093' });
     mockAlertmanagersResponse(server, {
       data: {
         activeAlertManagers: [{ url: 'http://localhost:9093/api/v2/alerts' }],
@@ -179,10 +137,8 @@ describe('useExternalDataSourceAlertmanagers', () => {
       },
     });
 
-    const wrapper = ({ children }: React.PropsWithChildren<{}>) => <Provider store={store}>{children}</Provider>;
-
     // Act
-    const { result } = renderHook(() => useExternalDataSourceAlertmanagers(), { wrapper });
+    const { result } = renderHook(() => useExternalDataSourceAlertmanagers(), { wrapper: TestProvider });
 
     await waitFor(() => {
       // Assert
@@ -190,85 +146,76 @@ describe('useExternalDataSourceAlertmanagers', () => {
 
       expect(current).toHaveLength(1);
       expect(current[0].status).toBe('active');
-      expect(current[0].url).toBe('localhost:9093');
+      expect(current[0].dataSourceSettings.url).toBe('localhost:9093');
     });
   });
 
-  it('Should have inconclusive state when there are many Alertmanagers of the same URL', async () => {
+  it('Should have inconclusive state when there are many Alertmanagers of the same URL on both active and inactive', async () => {
     // Arrange
     mockAlertmanagersResponse(server, {
       data: {
-        activeAlertManagers: [{ url: 'http://grafana.com/api/v2/alerts' }, { url: 'http://grafana.com/api/v2/alerts' }],
-        droppedAlertManagers: [],
+        activeAlertManagers: [{ url: 'http://grafana.com/api/v2/alerts' }],
+        droppedAlertManagers: [{ url: 'http://grafana.com/api/v2/alerts' }],
       },
     });
 
-    const { dsSettings, dsInstanceSettings } = setupAlertmanagerDataSource({ url: 'http://grafana.com' });
+    setupAlertmanagerDataSource(server, { url: 'http://grafana.com' });
 
-    config.datasources = {
-      'External Alertmanager': dsInstanceSettings,
-    };
+    // Act
+    const { result } = renderHook(() => useExternalDataSourceAlertmanagers(), {
+      wrapper: TestProvider,
+    });
+
+    await waitFor(() => {
+      // Assert
+      expect(result.current).toHaveLength(1);
+      expect(result.current[0].status).toBe('inconclusive');
+    });
+  });
 
-    const store = mockStore((state) => {
-      state.dataSources.dataSources = [dsSettings];
+  it('Should have not have inconclusive state when all Alertmanagers of the same URL are active', async () => {
+    // Arrange
+    mockAlertmanagersResponse(server, {
+      data: {
+        activeAlertManagers: [{ url: 'http://grafana.com/api/v2/alerts' }, { url: 'http://grafana.com/api/v2/alerts' }],
+        droppedAlertManagers: [],
+      },
     });
 
-    const wrapper = ({ children }: React.PropsWithChildren<{}>) => <Provider store={store}>{children}</Provider>;
+    setupAlertmanagerDataSource(server, { url: 'http://grafana.com' });
 
     // Act
     const { result } = renderHook(() => useExternalDataSourceAlertmanagers(), {
-      wrapper,
+      wrapper: TestProvider,
     });
 
     await waitFor(() => {
       // Assert
       expect(result.current).toHaveLength(1);
       expect(result.current[0].status).toBe('active');
-      expect(result.current[0].statusInconclusive).toBe(true);
     });
   });
 });
 
-function setupAlertmanagerDataSource(partialDsSettings?: Partial<DataSourceSettings<AlertManagerDataSourceJsonData>>) {
+function setupAlertmanagerDataSource(
+  server: SetupServer,
+  partialDsSettings?: Partial<DataSourceSettings<AlertManagerDataSourceJsonData>>
+) {
   const dsCommonConfig = {
     uid: '1',
     name: 'External Alertmanager',
     type: 'alertmanager',
-    jsonData: { handleGrafanaManagedAlerts: true } as AlertManagerDataSourceJsonData,
+    jsonData: { handleGrafanaManagedAlerts: true },
   };
 
-  const dsInstanceSettings = mockDataSource(dsCommonConfig);
-
-  const dsSettings = mockApiDataSource({
+  const dsSettings = {
     ...dsCommonConfig,
     ...partialDsSettings,
-  });
-
-  return { dsSettings, dsInstanceSettings };
-}
-
-function mockApiDataSource(partial: Partial<DataSourceSettings<DataSourceJsonData, {}>> = {}) {
-  const dsSettings: DataSourceSettings<DataSourceJsonData, {}> = {
-    uid: '1',
-    id: 1,
-    name: '',
-    url: '',
-    type: '',
-    access: '',
-    orgId: 1,
-    typeLogoUrl: '',
-    typeName: '',
-    user: '',
-    database: '',
-    basicAuth: false,
-    isDefault: false,
-    basicAuthUser: '',
-    jsonData: { handleGrafanaManagedAlerts: true } as AlertManagerDataSourceJsonData,
-    secureJsonFields: {},
-    readOnly: false,
-    withCredentials: false,
-    ...partial,
   };
 
-  return dsSettings;
+  server.use(
+    http.get('/api/datasources', () => {
+      return HttpResponse.json([dsSettings]);
+    })
+  );
 }
diff --git a/public/app/features/alerting/unified/hooks/useExternalAmSelector.ts b/public/app/features/alerting/unified/hooks/useExternalAmSelector.ts
index 65f20eb0384fb..8cbe722869850 100644
--- a/public/app/features/alerting/unified/hooks/useExternalAmSelector.ts
+++ b/public/app/features/alerting/unified/hooks/useExternalAmSelector.ts
@@ -1,75 +1,114 @@
-import { countBy, keyBy } from 'lodash';
-
-import { DataSourceInstanceSettings, DataSourceJsonData, DataSourceSettings } from '@grafana/data';
-import { AlertManagerDataSourceJsonData } from 'app/plugins/datasource/alertmanager/types';
-import { useSelector } from 'app/types';
+import { DataSourceSettings } from '@grafana/data';
+import { AlertManagerDataSourceJsonData, ExternalAlertmanagers } from 'app/plugins/datasource/alertmanager/types';
 
 import { alertmanagerApi } from '../api/alertmanagerApi';
-import { getAlertManagerDataSources } from '../utils/datasource';
+import { dataSourcesApi } from '../api/dataSourcesApi';
+import { isAlertmanagerDataSource } from '../utils/datasource';
 
-export interface ExternalDataSourceAM {
-  dataSource: DataSourceInstanceSettings<AlertManagerDataSourceJsonData>;
-  url?: string;
-  status: 'active' | 'pending' | 'dropped';
-  statusInconclusive?: boolean;
-}
+type ConnectionStatus = 'active' | 'pending' | 'dropped' | 'inconclusive' | 'uninterested' | 'unknown';
 
-export function useExternalDataSourceAlertmanagers(): ExternalDataSourceAM[] {
-  const { useGetExternalAlertmanagersQuery } = alertmanagerApi;
-  const { currentData: discoveredAlertmanagers } = useGetExternalAlertmanagersQuery();
+export interface ExternalAlertmanagerDataSourceWithStatus {
+  dataSourceSettings: DataSourceSettings<AlertManagerDataSourceJsonData>;
+  status: ConnectionStatus;
+}
 
-  const externalDsAlertManagers = getAlertManagerDataSources().filter((ds) => ds.jsonData.handleGrafanaManagedAlerts);
+/**
+ * Returns all configured Alertmanager data sources and their connection status with the internal ruler
+ */
+export function useExternalDataSourceAlertmanagers(): ExternalAlertmanagerDataSourceWithStatus[] {
+  // firstly we'll fetch the settings for all datasources and filter for "alertmanager" type
+  const { alertmanagerDataSources } = dataSourcesApi.endpoints.getAllDataSourceSettings.useQuery(undefined, {
+    refetchOnReconnect: true,
+    selectFromResult: (result) => {
+      const alertmanagerDataSources = result.currentData?.filter(isAlertmanagerDataSource) ?? [];
+      return { ...result, alertmanagerDataSources };
+    },
+  });
 
-  const alertmanagerDatasources = useSelector((state) =>
-    keyBy(
-      state.dataSources.dataSources.filter((ds) => ds.type === 'alertmanager'),
-      (ds) => ds.uid
-    )
+  // we'll also fetch the configuration for which Alertmanagers we are forwarding Grafana-managed alerts too
+  // @TODO use polling when we have one or more alertmanagers in pending state
+  const { currentData: externalAlertmanagers } = alertmanagerApi.endpoints.getExternalAlertmanagers.useQuery(
+    undefined,
+    { refetchOnReconnect: true }
   );
 
-  const droppedAMUrls = countBy(discoveredAlertmanagers?.droppedAlertManagers, (x) => x.url);
-  const activeAMUrls = countBy(discoveredAlertmanagers?.activeAlertManagers, (x) => x.url);
+  if (!alertmanagerDataSources) {
+    return [];
+  }
+
+  return alertmanagerDataSources.map<ExternalAlertmanagerDataSourceWithStatus>((dataSourceSettings) => {
+    const status = externalAlertmanagers
+      ? determineAlertmanagerConnectionStatus(externalAlertmanagers, dataSourceSettings)
+      : 'unknown';
 
-  return externalDsAlertManagers.map<ExternalDataSourceAM>((dsAm) => {
-    const dsSettings = alertmanagerDatasources[dsAm.uid];
+    return {
+      dataSourceSettings,
+      status,
+    };
+  });
+}
 
-    if (!dsSettings) {
-      return {
-        dataSource: dsAm,
-        status: 'pending',
-      };
-    }
+// using the information from /api/v1/ngalert/alertmanagers we should derive the connection status of a single data source
+function determineAlertmanagerConnectionStatus(
+  externalAlertmanagers: ExternalAlertmanagers,
+  dataSourceSettings: DataSourceSettings<AlertManagerDataSourceJsonData>
+): ConnectionStatus {
+  const isInterestedInAlerts = dataSourceSettings.jsonData.handleGrafanaManagedAlerts;
+  if (!isInterestedInAlerts) {
+    return 'uninterested';
+  }
 
-    const amUrl = getDataSourceUrlWithProtocol(dsSettings);
-    const amStatusUrl = `${amUrl}/api/v2/alerts`;
+  const isActive =
+    externalAlertmanagers?.activeAlertManagers.some((am) => {
+      return isAlertmanagerMatchByURL(dataSourceSettings.url, am.url);
+    }) ?? [];
 
-    const matchingDroppedUrls = droppedAMUrls[amStatusUrl] ?? 0;
-    const matchingActiveUrls = activeAMUrls[amStatusUrl] ?? 0;
+  const isDropped =
+    externalAlertmanagers?.droppedAlertManagers.some((am) => {
+      return isAlertmanagerMatchByURL(dataSourceSettings.url, am.url);
+    }) ?? [];
 
-    const isDropped = matchingDroppedUrls > 0;
-    const isActive = matchingActiveUrls > 0;
+  // the Alertmanager is being adopted (pending) if it is interested in handling alerts but not in either "active" or "dropped"
+  const isPending = !isActive && !isDropped;
+  if (isPending) {
+    return 'pending';
+  }
 
-    // Multiple Alertmanagers of the same URL may exist (e.g. with different credentials)
-    // Alertmanager response only contains URLs, so in case of duplication, we are not able
-    // to distinguish which is which, resulting in an inconclusive status.
-    const isStatusInconclusive = matchingDroppedUrls + matchingActiveUrls > 1;
+  // Multiple Alertmanagers of the same URL may exist (e.g. with different credentials)
+  // Alertmanager response only contains URLs, so when the URL exists in both active and dropped, we are not able
+  // to distinguish which is which, resulting in an inconclusive status.
+  const isInconclusive = isActive && isDropped;
+  if (isInconclusive) {
+    return 'inconclusive';
+  }
 
-    const status = isDropped ? 'dropped' : isActive ? 'active' : 'pending';
+  // if we get here, it's neither "uninterested", nor "inconclusive" nor "pending"
+  if (isActive) {
+    return 'active';
+  } else if (isDropped) {
+    return 'dropped';
+  }
 
-    return {
-      dataSource: dsAm,
-      url: dsSettings.url,
-      status,
-      statusInconclusive: isStatusInconclusive,
-    };
-  });
+  return 'unknown';
 }
 
-function getDataSourceUrlWithProtocol<T extends DataSourceJsonData>(dsSettings: DataSourceSettings<T>) {
-  const hasProtocol = new RegExp('^[^:]*://').test(dsSettings.url);
-  if (!hasProtocol) {
-    return `http://${dsSettings.url}`; // Grafana append http protocol if there is no any
-  }
+// the vanilla Alertmanager and Mimir Alertmanager mount their API endpoints on different sub-paths
+// Cortex also uses the same paths as Mimir
+const MIMIR_ALERTMANAGER_PATH = '/alertmanager/api/v2/alerts';
+const VANILLA_ALERTMANAGER_PATH = '/api/v2/alerts';
+
+// when using the Mimir Alertmanager, those paths are mounted under "/alertmanager"
+function isAlertmanagerMatchByURL(dataSourceUrl: string, alertmanagerUrl: string) {
+  const normalizedUrl = normalizeDataSourceURL(dataSourceUrl);
+
+  const prometheusAlertmanagerMatch = alertmanagerUrl === `${normalizedUrl}${VANILLA_ALERTMANAGER_PATH}`;
+  const mimirAlertmanagerMatch = alertmanagerUrl === `${normalizedUrl}${MIMIR_ALERTMANAGER_PATH}`;
+
+  return prometheusAlertmanagerMatch || mimirAlertmanagerMatch;
+}
 
-  return dsSettings.url;
+// Grafana prepends the http protocol if there isn't one, but it doesn't store that in the datasource settings
+function normalizeDataSourceURL(url: string) {
+  const hasProtocol = new RegExp('^[^:]*://').test(url);
+  return hasProtocol ? url : `http://${url}`;
 }
diff --git a/public/app/features/alerting/unified/hooks/useFilteredRules.test.ts b/public/app/features/alerting/unified/hooks/useFilteredRules.test.ts
index d0e7a36f9dfe3..b102a5b20c673 100644
--- a/public/app/features/alerting/unified/hooks/useFilteredRules.test.ts
+++ b/public/app/features/alerting/unified/hooks/useFilteredRules.test.ts
@@ -2,7 +2,9 @@ import { setDataSourceSrv } from '@grafana/runtime';
 
 import { PromAlertingRuleState } from '../../../../types/unified-alerting-dto';
 import {
+  getCloudRule,
   mockAlertQuery,
+  mockCombinedCloudRuleNamespace,
   mockCombinedRule,
   mockCombinedRuleGroup,
   mockCombinedRuleNamespace,
@@ -13,6 +15,7 @@ import {
   mockRulerGrafanaRule,
 } from '../mocks';
 import { RuleHealth } from '../search/rulesSearchParser';
+import { Annotation } from '../utils/constants';
 import { getFilter } from '../utils/search';
 
 import { filterRules } from './useFilteredRules';
@@ -154,16 +157,58 @@ describe('filterRules', function () {
           data: [mockAlertQuery({ datasourceUid: dataSources.loki.uid })],
         }),
       }),
+      getCloudRule({ name: 'Cloud' }),
     ];
 
     const ns = mockCombinedRuleNamespace({
       groups: [mockCombinedRuleGroup('Resources usage group', rules)],
     });
+    const cloudNs = mockCombinedCloudRuleNamespace(
+      {
+        groups: [mockCombinedRuleGroup('Resources usage group', rules)],
+      },
+      'Prometheus-ds'
+    );
 
-    const filtered = filterRules([ns], getFilter({ dataSourceNames: ['loki'] }));
+    const filtered = filterRules([ns, cloudNs], getFilter({ dataSourceNames: ['loki', 'Prometheus-ds'] }));
 
-    expect(filtered[0].groups[0].rules).toHaveLength(1);
+    expect(filtered[0].groups[0].rules).toHaveLength(2);
     expect(filtered[0].groups[0].rules[0].name).toBe('Memory too low');
+    expect(filtered[0].groups[0].rules[1].name).toBe('Cloud');
+  });
+
+  it('should be able to combine multiple predicates with AND', () => {
+    const rules = [
+      mockCombinedRule({
+        name: 'Memory too low',
+        labels: { team: 'operations', region: 'EMEA' },
+        promRule: mockPromAlertingRule({
+          health: RuleHealth.Ok,
+        }),
+      }),
+      mockCombinedRule({
+        name: 'Memory too low',
+        labels: { team: 'operations', region: 'NASA' },
+        promRule: mockPromAlertingRule({
+          health: RuleHealth.Ok,
+        }),
+      }),
+    ];
+
+    const ns = mockCombinedRuleNamespace({
+      groups: [mockCombinedRuleGroup('Resources usage group', rules)],
+    });
+
+    const filtered = filterRules(
+      [ns],
+      getFilter({
+        ruleHealth: RuleHealth.Ok,
+        labels: ['team=operations', 'region=EMEA'],
+      })
+    );
+
+    expect(filtered[0]?.groups[0]?.rules).toHaveLength(1);
+    expect(filtered[0]?.groups[0]?.rules[0]?.name).toBe('Memory too low');
   });
 
   // Typos there are deliberate to test the fuzzy search
@@ -186,4 +231,29 @@ describe('filterRules', function () {
     expect(filtered[0].groups[0].rules).toHaveLength(1);
     expect(filtered[0].groups[0].rules[0].name).toBe('Memory too low');
   });
+
+  it('should filter out rules by dashboard UID', () => {
+    const rules = [
+      mockCombinedRule({
+        name: 'Memory too low',
+        annotations: { [Annotation.dashboardUID]: 'dashboard-memory' },
+      }),
+      mockCombinedRule({
+        name: 'CPU too high',
+        annotations: { [Annotation.dashboardUID]: 'dashboard-cpu' },
+      }),
+      mockCombinedRule({
+        name: 'Disk is dead',
+      }),
+    ];
+
+    const ns = mockCombinedRuleNamespace({
+      groups: [mockCombinedRuleGroup('Resources usage group', rules)],
+    });
+
+    const filtered = filterRules([ns], getFilter({ dashboardUid: 'dashboard-cpu' }));
+
+    expect(filtered[0]?.groups[0]?.rules).toHaveLength(1);
+    expect(filtered[0]?.groups[0]?.rules[0]?.name).toBe('CPU too high');
+  });
 });
diff --git a/public/app/features/alerting/unified/hooks/useFilteredRules.ts b/public/app/features/alerting/unified/hooks/useFilteredRules.ts
index 2d98221faf9b0..a71c8790f3a08 100644
--- a/public/app/features/alerting/unified/hooks/useFilteredRules.ts
+++ b/public/app/features/alerting/unified/hooks/useFilteredRules.ts
@@ -1,6 +1,6 @@
 import uFuzzy from '@leeoniya/ufuzzy';
 import { produce } from 'immer';
-import { compact, isEmpty } from 'lodash';
+import { chain, compact, isEmpty } from 'lodash';
 import { useCallback, useEffect, useMemo } from 'react';
 
 import { getDataSourceSrv } from '@grafana/runtime';
@@ -10,6 +10,7 @@ import { isPromAlertingRuleState, PromRuleType, RulerGrafanaRuleDTO } from 'app/
 
 import { applySearchFilterToQuery, getSearchFilterFromQuery, RulesFilter } from '../search/rulesSearchParser';
 import { labelsMatchMatchers, matcherToMatcherField, parseMatchers } from '../utils/alertmanager';
+import { Annotation } from '../utils/constants';
 import { isCloudRulesSource } from '../utils/datasource';
 import { parseMatcher } from '../utils/matchers';
 import { getRuleHealth, isAlertingRule, isGrafanaRulerRule, isPromRuleType } from '../utils/rules';
@@ -17,6 +18,10 @@ import { getRuleHealth, isAlertingRule, isGrafanaRulerRule, isPromRuleType } fro
 import { calculateGroupTotals, calculateRuleFilteredTotals, calculateRuleTotals } from './useCombinedRuleNamespaces';
 import { useURLSearchParams } from './useURLSearchParams';
 
+// if the search term is longer than MAX_NEEDLE_SIZE we disable Levenshtein distance
+const MAX_NEEDLE_SIZE = 25;
+const INFO_THRESHOLD = Infinity;
+
 export function useRulesFilter() {
   const [queryParams, updateQueryParams] = useURLSearchParams();
   const searchQuery = queryParams.get('search') ?? '';
@@ -99,17 +104,6 @@ export const useFilteredRules = (namespaces: CombinedRuleNamespace[], filterStat
   }, [namespaces, filterState]);
 };
 
-// Options details can be found here https://github.com/leeoniya/uFuzzy#options
-// The following configuration complies with Damerau-Levenshtein distance
-// https://en.wikipedia.org/wiki/Damerau%E2%80%93Levenshtein_distance
-const ufuzzy = new uFuzzy({
-  intraMode: 1,
-  intraIns: 1,
-  intraSub: 1,
-  intraTrn: 1,
-  intraDel: 1,
-});
-
 export const filterRules = (
   namespaces: CombinedRuleNamespace[],
   filterState: RulesFilter = { dataSourceNames: [], labels: [], freeFormWords: [] }
@@ -124,10 +118,17 @@ export const filterRules = (
   }
 
   const namespaceFilter = filterState.namespace;
+
   if (namespaceFilter) {
     const namespaceHaystack = filteredNamespaces.map((ns) => ns.name);
 
-    const [idxs, info, order] = ufuzzy.search(namespaceHaystack, namespaceFilter);
+    const ufuzzy = getSearchInstance(namespaceFilter);
+    const [idxs, info, order] = ufuzzy.search(
+      namespaceHaystack,
+      namespaceFilter,
+      getOutOfOrderLimit(namespaceFilter),
+      INFO_THRESHOLD
+    );
     if (info && order) {
       filteredNamespaces = order.map((idx) => filteredNamespaces[info.idx[idx]]);
     } else if (idxs) {
@@ -146,7 +147,14 @@ const reduceNamespaces = (filterState: RulesFilter) => {
 
     if (groupNameFilter) {
       const groupsHaystack = filteredGroups.map((g) => g.name);
-      const [idxs, info, order] = ufuzzy.search(groupsHaystack, groupNameFilter);
+      const ufuzzy = getSearchInstance(groupNameFilter);
+
+      const [idxs, info, order] = ufuzzy.search(
+        groupsHaystack,
+        groupNameFilter,
+        getOutOfOrderLimit(groupNameFilter),
+        INFO_THRESHOLD
+      );
       if (info && order) {
         filteredGroups = order.map((idx) => filteredGroups[info.idx[idx]]);
       } else if (idxs) {
@@ -176,7 +184,14 @@ const reduceGroups = (filterState: RulesFilter) => {
 
     if (ruleNameQuery) {
       const rulesHaystack = filteredRules.map((r) => r.name);
-      const [idxs, info, order] = ufuzzy.search(rulesHaystack, ruleNameQuery);
+      const ufuzzy = getSearchInstance(ruleNameQuery);
+
+      const [idxs, info, order] = ufuzzy.search(
+        rulesHaystack,
+        ruleNameQuery,
+        getOutOfOrderLimit(ruleNameQuery),
+        INFO_THRESHOLD
+      );
       if (info && order) {
         filteredRules = order.map((idx) => filteredRules[info.idx[idx]]);
       } else if (idxs) {
@@ -185,45 +200,83 @@ const reduceGroups = (filterState: RulesFilter) => {
     }
 
     filteredRules = filteredRules.filter((rule) => {
-      if (filterState.ruleType && filterState.ruleType !== rule.promRule?.type) {
-        return false;
+      const promRuleDefition = rule.promRule;
+
+      // this will track what properties we're checking predicates for
+      // all predicates must be "true" to include the rule in the result set
+      // (this will result in an AND operation for our matchers)
+      const matchesFilterFor = chain(filterState)
+        // ⚠️ keep this list of properties we filter for here up-to-date ⚠️
+        // We are ignoring predicates we've matched before we get here (like "freeFormWords")
+        .pick(['ruleType', 'dataSourceNames', 'ruleHealth', 'labels', 'ruleState', 'dashboardUid'])
+        .omitBy(isEmpty)
+        .mapValues(() => false)
+        .value();
+
+      if ('ruleType' in matchesFilterFor && filterState.ruleType === promRuleDefition?.type) {
+        matchesFilterFor.ruleType = true;
       }
 
-      const doesNotQueryDs = isGrafanaRulerRule(rule.rulerRule) && !isQueryingDataSource(rule.rulerRule, filterState);
-      if (filterState.dataSourceNames?.length && doesNotQueryDs) {
-        return false;
+      if ('dataSourceNames' in matchesFilterFor) {
+        if (isGrafanaRulerRule(rule.rulerRule)) {
+          const doesNotQueryDs = isQueryingDataSource(rule.rulerRule, filterState);
+
+          if (doesNotQueryDs) {
+            matchesFilterFor.dataSourceNames = true;
+          }
+        } else {
+          matchesFilterFor.dataSourceNames = true;
+        }
       }
 
-      if (filterState.ruleHealth && rule.promRule) {
-        const ruleHealth = getRuleHealth(rule.promRule.health);
-        return filterState.ruleHealth === ruleHealth;
+      if ('ruleHealth' in filterState && promRuleDefition) {
+        const ruleHealth = getRuleHealth(promRuleDefition.health);
+        const match = filterState.ruleHealth === ruleHealth;
+
+        if (match) {
+          matchesFilterFor.ruleHealth = true;
+        }
       }
 
       // Query strings can match alert name, label keys, and label values
-      if (filterState.labels.length > 0) {
-        // const matchers = parseMatchers(filters.queryString);
+      if ('labels' in matchesFilterFor) {
         const matchers = compact(filterState.labels.map(looseParseMatcher));
 
+        // check if the label we query for exists in _either_ the rule definition or in any of its alerts
         const doRuleLabelsMatchQuery = matchers.length > 0 && labelsMatchMatchers(rule.labels, matchers);
         const doAlertsContainMatchingLabels =
           matchers.length > 0 &&
-          rule.promRule &&
-          rule.promRule.type === PromRuleType.Alerting &&
-          rule.promRule.alerts &&
-          rule.promRule.alerts.some((alert) => labelsMatchMatchers(alert.labels, matchers));
+          promRuleDefition &&
+          promRuleDefition.type === PromRuleType.Alerting &&
+          promRuleDefition.alerts &&
+          promRuleDefition.alerts.some((alert) => labelsMatchMatchers(alert.labels, matchers));
 
-        if (!(doRuleLabelsMatchQuery || doAlertsContainMatchingLabels)) {
-          return false;
+        if (doRuleLabelsMatchQuery || doAlertsContainMatchingLabels) {
+          matchesFilterFor.labels = true;
         }
       }
+
+      if ('ruleState' in matchesFilterFor) {
+        const promRule = rule.promRule;
+        const hasPromRuleDefinition = promRule && isAlertingRule(promRule);
+
+        const ruleStateMatches = hasPromRuleDefinition && promRule.state === filterState.ruleState;
+
+        if (ruleStateMatches) {
+          matchesFilterFor.ruleState = true;
+        }
+      }
+
       if (
-        filterState.ruleState &&
-        !(rule.promRule && isAlertingRule(rule.promRule) && rule.promRule.state === filterState.ruleState)
+        'dashboardUid' in matchesFilterFor &&
+        rule.annotations[Annotation.dashboardUID] === filterState.dashboardUid
       ) {
-        return false;
+        matchesFilterFor.dashboardUid = true;
       }
-      return true;
+
+      return Object.values(matchesFilterFor).every((match) => match === true);
     });
+
     // Add rules to the group that match the rule list filters
     if (filteredRules.length) {
       groupAcc.push({
@@ -235,6 +288,15 @@ const reduceGroups = (filterState: RulesFilter) => {
   };
 };
 
+// apply an outOfOrder limit which helps to limit the number of permutations to search for
+// and prevents the browser from hanging
+function getOutOfOrderLimit(searchTerm: string) {
+  const ufuzzy = getSearchInstance(searchTerm);
+
+  const termCount = ufuzzy.split(searchTerm).length;
+  return termCount < 5 ? 4 : 0;
+}
+
 function looseParseMatcher(matcherQuery: string): Matcher | undefined {
   try {
     return parseMatcher(matcherQuery);
@@ -244,6 +306,23 @@ function looseParseMatcher(matcherQuery: string): Matcher | undefined {
   }
 }
 
+// determine which search instance to use, very long search terms should match without checking for Levenshtein distance
+function getSearchInstance(searchTerm: string): uFuzzy {
+  const searchTermExeedsMaxNeedleSize = searchTerm.length > MAX_NEEDLE_SIZE;
+
+  // Options details can be found here https://github.com/leeoniya/uFuzzy#options
+  // The following configuration complies with Damerau-Levenshtein distance
+  // https://en.wikipedia.org/wiki/Damerau%E2%80%93Levenshtein_distance
+  return new uFuzzy({
+    // we will disable Levenshtein distance for very long search terms – this will help with performance
+    // as it will avoid creating a very complex regular expression
+    intraMode: searchTermExeedsMaxNeedleSize ? 0 : 1,
+    // split search terms only on whitespace, this will significantly reduce the amount of regex permutations to test
+    // and is important for performance with large amount of rules and large needle
+    interSplit: '\\s+',
+  });
+}
+
 const isQueryingDataSource = (rulerRule: RulerGrafanaRuleDTO, filterState: RulesFilter): boolean => {
   if (!filterState.dataSourceNames?.length) {
     return true;
diff --git a/public/app/features/alerting/unified/hooks/useGroupedAlerts.ts b/public/app/features/alerting/unified/hooks/useGroupedAlerts.ts
index 4a0897e45ce5a..2c18c077f9034 100644
--- a/public/app/features/alerting/unified/hooks/useGroupedAlerts.ts
+++ b/public/app/features/alerting/unified/hooks/useGroupedAlerts.ts
@@ -27,31 +27,45 @@ export const useGroupedAlerts = (groups: AlertmanagerGroup[], groupBy: string[])
         return groups;
       }
     }
-    const alerts = groups.flatMap(({ alerts }) => alerts);
+
+    // api/v2/alerts/groups returns alerts grouped by labels AND receiver.
+    // It means that the same alert can be in multiple groups if it has multiple receivers.
+    // Hence, to get the list of unique alerts we need to get unique alerts by fingerprint.
+    const alerts = uniqBy(
+      groups.flatMap(({ alerts }) => alerts),
+      (alert) => alert.fingerprint
+    );
     return alerts.reduce<AlertmanagerGroup[]>((groupings, alert) => {
       const alertContainsGroupings = groupBy.every((groupByLabel) => Object.keys(alert.labels).includes(groupByLabel));
 
       if (alertContainsGroupings) {
-        const existingGrouping = groupings.find((group) => {
-          return groupBy.every((groupKey) => {
-            return group.labels[groupKey] === alert.labels[groupKey];
-          });
-        });
-        if (!existingGrouping) {
-          const labels = groupBy.reduce<Labels>((acc, key) => {
+        // We need to create a group for each receiver. This is how Alertmanager groups alerts.
+        // Alertmanager not only does grouping by labels but also by receiver.
+        const receiverAlertGroups = alert.receivers.map<AlertmanagerGroup>((receiver) => ({
+          alerts: [alert],
+          labels: groupBy.reduce<Labels>((acc, key) => {
             acc = { ...acc, [key]: alert.labels[key] };
             return acc;
-          }, {});
-          groupings.push({
-            alerts: [alert],
-            labels,
-            receiver: {
-              name: 'NONE',
-            },
+          }, {}),
+          receiver,
+        }));
+
+        // Merge the same groupings - groupings are the same if they have the same labels and receiver
+        receiverAlertGroups.forEach((receiverAlertGroup) => {
+          const existingGroup = groupings.find((grouping) => {
+            return (
+              Object.keys(receiverAlertGroup.labels).every(
+                (key) => grouping.labels[key] === receiverAlertGroup.labels[key]
+              ) && grouping.receiver.name === receiverAlertGroup.receiver.name
+            );
           });
-        } else {
-          existingGrouping.alerts.push(alert);
-        }
+
+          if (existingGroup) {
+            existingGroup.alerts.push(alert);
+          } else {
+            groupings.push(receiverAlertGroup);
+          }
+        });
       } else {
         const noGroupingGroup = groupings.find((group) => Object.keys(group.labels).length === 0);
         if (!noGroupingGroup) {
diff --git a/public/app/features/alerting/unified/hooks/useIsRuleEditable.ts b/public/app/features/alerting/unified/hooks/useIsRuleEditable.ts
index 44008d00d1e9b..40637f50845ef 100644
--- a/public/app/features/alerting/unified/hooks/useIsRuleEditable.ts
+++ b/public/app/features/alerting/unified/hooks/useIsRuleEditable.ts
@@ -9,6 +9,7 @@ import { useFolder } from './useFolder';
 import { useUnifiedAlertingSelector } from './useUnifiedAlertingSelector';
 
 interface ResultBag {
+  isRulerAvailable?: boolean;
   isEditable?: boolean;
   isRemovable?: boolean;
   loading: boolean;
@@ -42,6 +43,7 @@ export function useIsRuleEditable(rulesSourceName: string, rule?: RulerRuleDTO):
     if (!folder) {
       // Loading or invalid folder UID
       return {
+        isRulerAvailable: true,
         isEditable: false,
         isRemovable: false,
         loading,
@@ -52,6 +54,7 @@ export function useIsRuleEditable(rulesSourceName: string, rule?: RulerRuleDTO):
     const canRemoveGrafanaRules = contextSrv.hasPermissionInMetadata(rulePermission.delete, folder);
 
     return {
+      isRulerAvailable: true,
       isEditable: canEditGrafanaRules,
       isRemovable: canRemoveGrafanaRules,
       loading: loading || isLoading,
@@ -65,6 +68,7 @@ export function useIsRuleEditable(rulesSourceName: string, rule?: RulerRuleDTO):
   const canRemoveCloudRules = contextSrv.hasPermission(rulePermission.delete);
 
   return {
+    isRulerAvailable,
     isEditable: canEditCloudRules && isRulerAvailable,
     isRemovable: canRemoveCloudRules && isRulerAvailable,
     loading: isLoading || dataSources[rulesSourceName]?.loading,
diff --git a/public/app/features/alerting/unified/hooks/useMuteTimingOptions.ts b/public/app/features/alerting/unified/hooks/useMuteTimingOptions.ts
index 675c92197586e..777f615edecde 100644
--- a/public/app/features/alerting/unified/hooks/useMuteTimingOptions.ts
+++ b/public/app/features/alerting/unified/hooks/useMuteTimingOptions.ts
@@ -2,6 +2,7 @@ import { useMemo } from 'react';
 
 import { SelectableValue } from '@grafana/data';
 
+import { mergeTimeIntervals } from '../components/mute-timings/util';
 import { useAlertmanager } from '../state/AlertmanagerContext';
 import { timeIntervalToString } from '../utils/alertmanager';
 
@@ -13,8 +14,9 @@ export function useMuteTimingOptions(): Array<SelectableValue<string>> {
   const config = currentData?.alertmanager_config;
 
   return useMemo(() => {
+    const time_intervals = config ? mergeTimeIntervals(config) : [];
     const muteTimingsOptions: Array<SelectableValue<string>> =
-      config?.mute_time_intervals?.map((value) => ({
+      time_intervals?.map((value) => ({
         value: value.name,
         label: value.name,
         description: value.time_intervals.map((interval) => timeIntervalToString(interval)).join(', AND '),
diff --git a/public/app/features/alerting/unified/hooks/usePanelCombinedRules.ts b/public/app/features/alerting/unified/hooks/usePanelCombinedRules.ts
index a0a88f1d83e54..eb8b176b40d9e 100644
--- a/public/app/features/alerting/unified/hooks/usePanelCombinedRules.ts
+++ b/public/app/features/alerting/unified/hooks/usePanelCombinedRules.ts
@@ -1,7 +1,6 @@
 import { SerializedError } from '@reduxjs/toolkit';
 import { useEffect, useMemo } from 'react';
 
-import { DashboardModel, PanelModel } from 'app/features/dashboard/state';
 import { useDispatch } from 'app/types';
 import { CombinedRule } from 'app/types/unified-alerting';
 
@@ -14,8 +13,8 @@ import { useCombinedRuleNamespaces } from './useCombinedRuleNamespaces';
 import { useUnifiedAlertingSelector } from './useUnifiedAlertingSelector';
 
 interface Options {
-  dashboard: DashboardModel;
-  panel: PanelModel;
+  dashboardUID: string;
+  panelId: number;
 
   poll?: boolean;
 }
@@ -27,7 +26,7 @@ interface ReturnBag {
   loading?: boolean;
 }
 
-export function usePanelCombinedRules({ dashboard, panel, poll = false }: Options): ReturnBag {
+export function usePanelCombinedRules({ dashboardUID, panelId, poll = false }: Options): ReturnBag {
   const dispatch = useDispatch();
 
   const promRuleRequest =
@@ -41,13 +40,13 @@ export function usePanelCombinedRules({ dashboard, panel, poll = false }: Option
       dispatch(
         fetchPromRulesAction({
           rulesSourceName: GRAFANA_RULES_SOURCE_NAME,
-          filter: { dashboardUID: dashboard.uid, panelId: panel.id },
+          filter: { dashboardUID, panelId },
         })
       );
       dispatch(
         fetchRulerRulesAction({
           rulesSourceName: GRAFANA_RULES_SOURCE_NAME,
-          filter: { dashboardUID: dashboard.uid, panelId: panel.id },
+          filter: { dashboardUID, panelId },
         })
       );
     };
@@ -59,7 +58,7 @@ export function usePanelCombinedRules({ dashboard, panel, poll = false }: Option
       };
     }
     return () => {};
-  }, [dispatch, poll, panel.id, dashboard.uid]);
+  }, [dispatch, poll, panelId, dashboardUID]);
 
   const loading = promRuleRequest.loading || rulerRuleRequest.loading;
   const errors = [promRuleRequest.error, rulerRuleRequest.error].filter(
@@ -76,10 +75,10 @@ export function usePanelCombinedRules({ dashboard, panel, poll = false }: Option
         .flatMap((group) => group.rules)
         .filter(
           (rule) =>
-            rule.annotations[Annotation.dashboardUID] === dashboard.uid &&
-            rule.annotations[Annotation.panelID] === String(panel.id)
+            rule.annotations[Annotation.dashboardUID] === dashboardUID &&
+            rule.annotations[Annotation.panelID] === String(panelId)
         ),
-    [combinedNamespaces, dashboard, panel]
+    [combinedNamespaces, dashboardUID, panelId]
   );
 
   return {
diff --git a/public/app/features/alerting/unified/hooks/useStateHistoryModal.tsx b/public/app/features/alerting/unified/hooks/useStateHistoryModal.tsx
index 2d08ec52875da..078dbca0f2785 100644
--- a/public/app/features/alerting/unified/hooks/useStateHistoryModal.tsx
+++ b/public/app/features/alerting/unified/hooks/useStateHistoryModal.tsx
@@ -9,7 +9,7 @@ import { RulerGrafanaRuleDTO } from 'app/types/unified-alerting-dto';
 const AnnotationsStateHistory = lazy(() => import('../components/rules/state-history/StateHistory'));
 const LokiStateHistory = lazy(() => import('../components/rules/state-history/LokiStateHistory'));
 
-enum StateHistoryImplementation {
+export enum StateHistoryImplementation {
   Loki = 'loki',
   Annotations = 'annotations',
 }
diff --git a/public/app/features/alerting/unified/hooks/useUnifiedAlertingSelector.ts b/public/app/features/alerting/unified/hooks/useUnifiedAlertingSelector.ts
index 34d6e3aa08615..7b50599934c45 100644
--- a/public/app/features/alerting/unified/hooks/useUnifiedAlertingSelector.ts
+++ b/public/app/features/alerting/unified/hooks/useUnifiedAlertingSelector.ts
@@ -1,4 +1,6 @@
-import { useSelector } from 'app/types';
+import { createSelector } from 'reselect';
+
+import { StoreState, useSelector } from 'app/types';
 
 import { UnifiedAlertingState } from '../state/reducers';
 
@@ -6,5 +8,11 @@ export function useUnifiedAlertingSelector<TSelected = unknown>(
   selector: (state: UnifiedAlertingState) => TSelected,
   equalityFn?: (left: TSelected, right: TSelected) => boolean
 ): TSelected {
-  return useSelector((state) => selector(state.unifiedAlerting), equalityFn);
+  return useSelector(
+    createSelector(
+      (state: StoreState) => state.unifiedAlerting,
+      (unifiedAlerting) => selector(unifiedAlerting)
+    ),
+    equalityFn
+  );
 }
diff --git a/public/app/features/alerting/unified/initAlerting.tsx b/public/app/features/alerting/unified/initAlerting.tsx
new file mode 100644
index 0000000000000..b00d24d64576b
--- /dev/null
+++ b/public/app/features/alerting/unified/initAlerting.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+
+import { config } from '@grafana/runtime';
+import { contextSrv } from 'app/core/services/context_srv';
+
+import { addCustomRightAction } from '../../dashboard/components/DashNav/DashNav';
+
+import { getRulesPermissions } from './utils/access-control';
+import { GRAFANA_RULES_SOURCE_NAME } from './utils/datasource';
+
+const AlertRulesToolbarButton = React.lazy(
+  () => import(/* webpackChunkName: "alert-rules-toolbar-button" */ './integration/AlertRulesToolbarButton')
+);
+
+export function initAlerting() {
+  const grafanaRulesPermissions = getRulesPermissions(GRAFANA_RULES_SOURCE_NAME);
+
+  if (contextSrv.hasPermission(grafanaRulesPermissions.read)) {
+    addCustomRightAction({
+      show: () => config.unifiedAlertingEnabled,
+      component: ({ dashboard }) => (
+        <React.Suspense fallback={null} key="alert-rules-button">
+          {dashboard && <AlertRulesToolbarButton dashboardUid={dashboard.uid} />}
+        </React.Suspense>
+      ),
+      index: -2,
+    });
+  }
+}
diff --git a/public/app/features/alerting/unified/insights/grafana/Active.tsx b/public/app/features/alerting/unified/insights/grafana/Active.tsx
new file mode 100644
index 0000000000000..636780cce3b83
--- /dev/null
+++ b/public/app/features/alerting/unified/insights/grafana/Active.tsx
@@ -0,0 +1,49 @@
+import React from 'react';
+
+import { ThresholdsMode } from '@grafana/data';
+import { PanelBuilders, SceneFlexItem, SceneQueryRunner } from '@grafana/scenes';
+import { DataSourceRef } from '@grafana/schema';
+
+import { INSTANCE_ID, PANEL_STYLES } from '../../home/Insights';
+import { InsightsRatingModal } from '../RatingModal';
+
+export function getActiveGrafanaAlertsScene(datasource: DataSourceRef, panelTitle: string) {
+  const expr = INSTANCE_ID
+    ? `sum by (state) (grafanacloud_grafana_instance_alerting_rule_group_rules{state="active", id="${INSTANCE_ID}"})`
+    : `sum by (state) (grafanacloud_grafana_instance_alerting_rule_group_rules{state="active"})`;
+
+  const query = new SceneQueryRunner({
+    datasource,
+    queries: [
+      {
+        refId: 'A',
+        instant: true,
+        expr,
+      },
+    ],
+  });
+
+  return new SceneFlexItem({
+    ...PANEL_STYLES,
+    body: PanelBuilders.stat()
+      .setTitle(panelTitle)
+      .setDescription('The number of currently active alert rules')
+      .setData(query)
+      .setThresholds({
+        mode: ThresholdsMode.Absolute,
+        steps: [
+          {
+            color: 'green',
+            value: 0,
+          },
+          {
+            color: 'green',
+            value: 80,
+          },
+        ],
+      })
+      .setNoValue('0')
+      .setHeaderActions(<InsightsRatingModal panel={panelTitle} />)
+      .build(),
+  });
+}
diff --git a/public/app/features/alerting/unified/insights/grafana/AlertsByStateScene.tsx b/public/app/features/alerting/unified/insights/grafana/AlertsByStateScene.tsx
index 2d3703dfed419..96de8f16a2e09 100644
--- a/public/app/features/alerting/unified/insights/grafana/AlertsByStateScene.tsx
+++ b/public/app/features/alerting/unified/insights/grafana/AlertsByStateScene.tsx
@@ -3,16 +3,20 @@ import React from 'react';
 import { PanelBuilders, SceneDataTransformer, SceneFlexItem, SceneQueryRunner } from '@grafana/scenes';
 import { DataSourceRef, GraphDrawStyle, TooltipDisplayMode } from '@grafana/schema';
 
-import { overrideToFixedColor, PANEL_STYLES } from '../../home/Insights';
+import { INSTANCE_ID, overrideToFixedColor, PANEL_STYLES } from '../../home/Insights';
 import { InsightsRatingModal } from '../RatingModal';
 
 export function getGrafanaInstancesByStateScene(datasource: DataSourceRef, panelTitle: string) {
+  const expr = INSTANCE_ID
+    ? `sum by(state) (grafanacloud_grafana_instance_alerting_alerts{id="${INSTANCE_ID}"})`
+    : 'sum by (state) (grafanacloud_grafana_instance_alerting_alerts)';
+
   const query = new SceneQueryRunner({
     datasource,
     queries: [
       {
         refId: 'A',
-        expr: 'sum by (state) (grafanacloud_grafana_instance_alerting_alerts)',
+        expr,
         range: true,
         legendFormat: '{{state}}',
       },
diff --git a/public/app/features/alerting/unified/insights/grafana/EvalSuccessVsFailuresScene.tsx b/public/app/features/alerting/unified/insights/grafana/EvalSuccessVsFailuresScene.tsx
index 51f8acabf87a6..9382f40a67150 100644
--- a/public/app/features/alerting/unified/insights/grafana/EvalSuccessVsFailuresScene.tsx
+++ b/public/app/features/alerting/unified/insights/grafana/EvalSuccessVsFailuresScene.tsx
@@ -3,22 +3,30 @@ import React from 'react';
 import { PanelBuilders, SceneFlexItem, SceneQueryRunner } from '@grafana/scenes';
 import { DataSourceRef, GraphDrawStyle, TooltipDisplayMode } from '@grafana/schema';
 
-import { overrideToFixedColor, PANEL_STYLES } from '../../home/Insights';
+import { INSTANCE_ID, overrideToFixedColor, PANEL_STYLES } from '../../home/Insights';
 import { InsightsRatingModal } from '../RatingModal';
 
 export function getGrafanaEvalSuccessVsFailuresScene(datasource: DataSourceRef, panelTitle: string) {
+  const exprA = INSTANCE_ID
+    ? `sum(grafanacloud_grafana_instance_alerting_rule_evaluations_total:rate5m{id="${INSTANCE_ID}"}) - sum(grafanacloud_grafana_instance_alerting_rule_evaluation_failures_total:rate5m{id="${INSTANCE_ID}"})`
+    : `sum(grafanacloud_grafana_instance_alerting_rule_evaluations_total:rate5m) - sum(grafanacloud_grafana_instance_alerting_rule_evaluation_failures_total:rate5m)`;
+
+  const exprB = INSTANCE_ID
+    ? `sum(grafanacloud_grafana_instance_alerting_rule_evaluation_failures_total:rate5m{id="${INSTANCE_ID}"})`
+    : `sum(grafanacloud_grafana_instance_alerting_rule_evaluation_failures_total:rate5m)`;
+
   const query = new SceneQueryRunner({
     datasource,
     queries: [
       {
         refId: 'A',
-        expr: 'sum(grafanacloud_grafana_instance_alerting_rule_evaluations_total:rate5m) - sum(grafanacloud_grafana_instance_alerting_rule_evaluation_failures_total:rate5m)',
+        exprA,
         range: true,
         legendFormat: 'success',
       },
       {
         refId: 'B',
-        expr: 'sum(grafanacloud_grafana_instance_alerting_rule_evaluation_failures_total:rate5m)',
+        exprB,
         range: true,
         legendFormat: 'failed',
       },
diff --git a/public/app/features/alerting/unified/insights/grafana/Firing.tsx b/public/app/features/alerting/unified/insights/grafana/Firing.tsx
deleted file mode 100644
index bbe6070be4a32..0000000000000
--- a/public/app/features/alerting/unified/insights/grafana/Firing.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import React from 'react';
-
-import { ThresholdsMode } from '@grafana/data';
-import { PanelBuilders, SceneFlexItem, SceneQueryRunner } from '@grafana/scenes';
-import { DataSourceRef } from '@grafana/schema';
-
-import { PANEL_STYLES } from '../../home/Insights';
-import { InsightsRatingModal } from '../RatingModal';
-
-export function getFiringGrafanaAlertsScene(datasource: DataSourceRef, panelTitle: string) {
-  const query = new SceneQueryRunner({
-    datasource,
-    queries: [
-      {
-        refId: 'A',
-        instant: true,
-        expr: 'sum by (state) (grafanacloud_grafana_instance_alerting_rule_group_rules{state="active"})',
-      },
-    ],
-  });
-
-  return new SceneFlexItem({
-    ...PANEL_STYLES,
-    body: PanelBuilders.stat()
-      .setTitle(panelTitle)
-      .setDescription('The number of currently firing alert rules')
-      .setData(query)
-      .setThresholds({
-        mode: ThresholdsMode.Absolute,
-        steps: [
-          {
-            color: 'red',
-            value: 0,
-          },
-          {
-            color: 'red',
-            value: 80,
-          },
-        ],
-      })
-      .setNoValue('0')
-      .setHeaderActions(<InsightsRatingModal panel={panelTitle} />)
-      .build(),
-  });
-}
diff --git a/public/app/features/alerting/unified/insights/grafana/InstanceStatusScene.tsx b/public/app/features/alerting/unified/insights/grafana/InstanceStatusScene.tsx
index 3600fd336f806..b561a30f39de2 100644
--- a/public/app/features/alerting/unified/insights/grafana/InstanceStatusScene.tsx
+++ b/public/app/features/alerting/unified/insights/grafana/InstanceStatusScene.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { PanelBuilders, SceneFlexItem, SceneQueryRunner } from '@grafana/scenes';
 import { DataSourceRef } from '@grafana/schema';
 
-import { overrideToFixedColor } from '../../home/Insights';
+import { INSTANCE_ID, overrideToFixedColor } from '../../home/Insights';
 import { InsightsRatingModal } from '../RatingModal';
 export function getInstanceStatByStatusScene(
   datasource: DataSourceRef,
@@ -11,13 +11,17 @@ export function getInstanceStatByStatusScene(
   panelDescription: string,
   status: 'alerting' | 'pending' | 'nodata' | 'normal' | 'error'
 ) {
+  const expr = INSTANCE_ID
+    ? `sum by (state) (grafanacloud_grafana_instance_alerting_alerts{state="${status}", id="${INSTANCE_ID}"})`
+    : `sum by (state) (grafanacloud_grafana_instance_alerting_alerts{state="${status}"})`;
+
   const query = new SceneQueryRunner({
     datasource,
     queries: [
       {
         refId: 'A',
         instant: true,
-        expr: `sum by (state) (grafanacloud_grafana_instance_alerting_alerts{state="${status}"})`,
+        expr,
         legendFormat: '{{state}}',
       },
     ],
diff --git a/public/app/features/alerting/unified/insights/grafana/MissedIterationsScene.tsx b/public/app/features/alerting/unified/insights/grafana/MissedIterationsScene.tsx
index 2055c5002ddf5..1b37c2f278328 100644
--- a/public/app/features/alerting/unified/insights/grafana/MissedIterationsScene.tsx
+++ b/public/app/features/alerting/unified/insights/grafana/MissedIterationsScene.tsx
@@ -11,16 +11,17 @@ import {
 } from '@grafana/scenes';
 import { DataSourceRef, GraphDrawStyle, TooltipDisplayMode } from '@grafana/schema';
 
-import { PANEL_STYLES } from '../../home/Insights';
+import { INSTANCE_ID, PANEL_STYLES } from '../../home/Insights';
 import { InsightsRatingModal } from '../RatingModal';
 
 export function getGrafanaMissedIterationsScene(datasource: DataSourceRef, panelTitle: string) {
+  const expr = `sum by(rule_group) (grafanacloud_instance_rule_group_iterations_missed_total:rate5m{id="${INSTANCE_ID}"})`;
   const query = new SceneQueryRunner({
     datasource,
     queries: [
       {
         refId: 'A',
-        expr: 'sum by (rule_group) (grafanacloud_instance_rule_group_iterations_missed_total:rate5m)',
+        expr,
         range: true,
         legendFormat: '{{rule_group}}',
       },
diff --git a/public/app/features/alerting/unified/insights/grafana/Paused.tsx b/public/app/features/alerting/unified/insights/grafana/Paused.tsx
index 5dcab79b5bedc..9d5b9a58c4e23 100644
--- a/public/app/features/alerting/unified/insights/grafana/Paused.tsx
+++ b/public/app/features/alerting/unified/insights/grafana/Paused.tsx
@@ -4,17 +4,21 @@ import { ThresholdsMode } from '@grafana/data';
 import { PanelBuilders, SceneFlexItem, SceneQueryRunner } from '@grafana/scenes';
 import { DataSourceRef } from '@grafana/schema';
 
-import { PANEL_STYLES } from '../../home/Insights';
+import { INSTANCE_ID, PANEL_STYLES } from '../../home/Insights';
 import { InsightsRatingModal } from '../RatingModal';
 
 export function getPausedGrafanaAlertsScene(datasource: DataSourceRef, panelTitle: string) {
+  const expr = INSTANCE_ID
+    ? `sum by (state) (grafanacloud_grafana_instance_alerting_rule_group_rules{state="paused", id="${INSTANCE_ID}"})`
+    : `sum by (state) (grafanacloud_grafana_instance_alerting_rule_group_rules{state="paused"})`;
+
   const query = new SceneQueryRunner({
     datasource,
     queries: [
       {
         refId: 'A',
         instant: true,
-        expr: 'sum by (state) (grafanacloud_grafana_instance_alerting_rule_group_rules{state="paused"})',
+        expr,
       },
     ],
   });
diff --git a/public/app/features/alerting/unified/insights/grafana/RulesByEvaluation.tsx b/public/app/features/alerting/unified/insights/grafana/RulesByEvaluation.tsx
index c331bc0192746..c5726fb77b23f 100644
--- a/public/app/features/alerting/unified/insights/grafana/RulesByEvaluation.tsx
+++ b/public/app/features/alerting/unified/insights/grafana/RulesByEvaluation.tsx
@@ -3,16 +3,20 @@ import React from 'react';
 import { PanelBuilders, SceneFlexItem, SceneQueryRunner } from '@grafana/scenes';
 import { DataSourceRef, GraphDrawStyle, TooltipDisplayMode } from '@grafana/schema';
 
-import { overrideToFixedColor, PANEL_STYLES } from '../../home/Insights';
+import { INSTANCE_ID, overrideToFixedColor, PANEL_STYLES } from '../../home/Insights';
 import { InsightsRatingModal } from '../RatingModal';
 
 export function getGrafanaRulesByEvaluationScene(datasource: DataSourceRef, panelTitle: string) {
+  const expr = INSTANCE_ID
+    ? `sum by (state) (grafanacloud_grafana_instance_alerting_rule_group_rules{id="${INSTANCE_ID}"})`
+    : `sum by (state) (grafanacloud_grafana_instance_alerting_rule_group_rules)`;
+
   const query = new SceneQueryRunner({
     datasource,
     queries: [
       {
         refId: 'A',
-        expr: 'sum by (state) (grafanacloud_grafana_instance_alerting_rule_group_rules)',
+        expr,
         range: true,
         legendFormat: '{{state}} evaluation',
       },
diff --git a/public/app/features/alerting/unified/insights/grafana/RulesByEvaluationPercentage.tsx b/public/app/features/alerting/unified/insights/grafana/RulesByEvaluationPercentage.tsx
index 826b3461206ee..0749765c30fab 100644
--- a/public/app/features/alerting/unified/insights/grafana/RulesByEvaluationPercentage.tsx
+++ b/public/app/features/alerting/unified/insights/grafana/RulesByEvaluationPercentage.tsx
@@ -3,16 +3,20 @@ import React from 'react';
 import { PanelBuilders, SceneFlexItem, SceneQueryRunner } from '@grafana/scenes';
 import { DataSourceRef, GraphDrawStyle, TooltipDisplayMode } from '@grafana/schema';
 
-import { overrideToFixedColor, PANEL_STYLES } from '../../home/Insights';
+import { INSTANCE_ID, overrideToFixedColor, PANEL_STYLES } from '../../home/Insights';
 import { InsightsRatingModal } from '../RatingModal';
 
 export function getGrafanaRulesByEvaluationPercentageScene(datasource: DataSourceRef, panelTitle: string) {
+  const expr = INSTANCE_ID
+    ? `sum by (state) (grafanacloud_grafana_instance_alerting_rule_group_rules{id="${INSTANCE_ID}"}) / ignoring(state) group_left sum(grafanacloud_grafana_instance_alerting_rule_group_rules{id="${INSTANCE_ID}"})`
+    : `sum by (state) (grafanacloud_grafana_instance_alerting_rule_group_rules) / ignoring(state) group_left sum(grafanacloud_grafana_instance_alerting_rule_group_rules)`;
+
   const query = new SceneQueryRunner({
     datasource,
     queries: [
       {
         refId: 'A',
-        expr: 'sum by (state) (grafanacloud_grafana_instance_alerting_rule_group_rules) / ignoring(state) group_left sum(grafanacloud_grafana_instance_alerting_rule_group_rules)',
+        expr,
         range: true,
         legendFormat: '{{state}} evaluation',
       },
diff --git a/public/app/features/alerting/unified/insights/grafana/alertmanager/AlertsByState.tsx b/public/app/features/alerting/unified/insights/grafana/alertmanager/AlertsByState.tsx
index 7f9162fa50338..6ee7175abd629 100644
--- a/public/app/features/alerting/unified/insights/grafana/alertmanager/AlertsByState.tsx
+++ b/public/app/features/alerting/unified/insights/grafana/alertmanager/AlertsByState.tsx
@@ -3,16 +3,20 @@ import React from 'react';
 import { PanelBuilders, SceneFlexItem, SceneQueryRunner } from '@grafana/scenes';
 import { DataSourceRef, GraphDrawStyle, TooltipDisplayMode } from '@grafana/schema';
 
-import { overrideToFixedColor, PANEL_STYLES } from '../../../home/Insights';
+import { INSTANCE_ID, overrideToFixedColor, PANEL_STYLES } from '../../../home/Insights';
 import { InsightsRatingModal } from '../../RatingModal';
 
 export function getAlertsByStateScene(datasource: DataSourceRef, panelTitle: string) {
+  const expr = INSTANCE_ID
+    ? `sum by (state) (grafanacloud_grafana_instance_alerting_alertmanager_alerts{id="${INSTANCE_ID}"})`
+    : `sum by (state) (grafanacloud_grafana_instance_alerting_alertmanager_alerts)`;
+
   const query = new SceneQueryRunner({
     datasource,
     queries: [
       {
         refId: 'A',
-        expr: 'sum by (state) (grafanacloud_grafana_instance_alerting_alertmanager_alerts)',
+        expr,
         range: true,
         legendFormat: '{{state}}',
       },
diff --git a/public/app/features/alerting/unified/insights/grafana/alertmanager/SilencesByStateScene.tsx b/public/app/features/alerting/unified/insights/grafana/alertmanager/SilencesByStateScene.tsx
index b29b58945506f..e710b591fb3f2 100644
--- a/public/app/features/alerting/unified/insights/grafana/alertmanager/SilencesByStateScene.tsx
+++ b/public/app/features/alerting/unified/insights/grafana/alertmanager/SilencesByStateScene.tsx
@@ -3,16 +3,20 @@ import React from 'react';
 import { PanelBuilders, SceneFlexItem, SceneQueryRunner } from '@grafana/scenes';
 import { DataSourceRef, GraphDrawStyle, TooltipDisplayMode } from '@grafana/schema';
 
-import { PANEL_STYLES } from '../../../home/Insights';
+import { INSTANCE_ID, PANEL_STYLES } from '../../../home/Insights';
 import { InsightsRatingModal } from '../../RatingModal';
 
 export function getGrafanaAlertmanagerSilencesScene(datasource: DataSourceRef, panelTitle: string) {
+  const expr = INSTANCE_ID
+    ? `sum by (state) (grafanacloud_grafana_instance_alerting_silences{id="${INSTANCE_ID}"})`
+    : `sum by (state) (grafanacloud_grafana_instance_alerting_silences)`;
+
   const query = new SceneQueryRunner({
     datasource,
     queries: [
       {
         refId: 'A',
-        expr: 'sum by (state) (grafanacloud_grafana_instance_alerting_silences)',
+        expr,
         range: true,
         legendFormat: '{{state}}',
       },
diff --git a/public/app/features/alerting/unified/insights/mimir/AlertsByState.tsx b/public/app/features/alerting/unified/insights/mimir/AlertsByState.tsx
index 1f3ebb7deeab9..b0b725f6bba9a 100644
--- a/public/app/features/alerting/unified/insights/mimir/AlertsByState.tsx
+++ b/public/app/features/alerting/unified/insights/mimir/AlertsByState.tsx
@@ -3,16 +3,20 @@ import React from 'react';
 import { PanelBuilders, SceneFlexItem, SceneQueryRunner } from '@grafana/scenes';
 import { DataSourceRef, GraphDrawStyle, TooltipDisplayMode } from '@grafana/schema';
 
-import { overrideToFixedColor, PANEL_STYLES } from '../../home/Insights';
+import { INSTANCE_ID, overrideToFixedColor, PANEL_STYLES } from '../../home/Insights';
 import { InsightsRatingModal } from '../RatingModal';
 
 export function getAlertsByStateScene(datasource: DataSourceRef, panelTitle: string) {
+  const expr = INSTANCE_ID
+    ? `sum by (state) (grafanacloud_instance_alertmanager_alerts{id="${INSTANCE_ID}"})`
+    : `sum by (state) (grafanacloud_instance_alertmanager_alerts)`;
+
   const query = new SceneQueryRunner({
     datasource,
     queries: [
       {
         refId: 'A',
-        expr: 'sum by (state) (grafanacloud_instance_alertmanager_alerts)',
+        expr,
         range: true,
         legendFormat: '{{state}}',
       },
diff --git a/public/app/features/alerting/unified/insights/mimir/InvalidConfig.tsx b/public/app/features/alerting/unified/insights/mimir/InvalidConfig.tsx
index 401c5303965b6..5705fd0ff8426 100644
--- a/public/app/features/alerting/unified/insights/mimir/InvalidConfig.tsx
+++ b/public/app/features/alerting/unified/insights/mimir/InvalidConfig.tsx
@@ -3,16 +3,20 @@ import React from 'react';
 import { PanelBuilders, SceneFlexItem, SceneQueryRunner } from '@grafana/scenes';
 import { BigValueGraphMode, DataSourceRef } from '@grafana/schema';
 
-import { PANEL_STYLES } from '../../home/Insights';
+import { INSTANCE_ID, PANEL_STYLES } from '../../home/Insights';
 import { InsightsRatingModal } from '../RatingModal';
 
 export function getInvalidConfigScene(datasource: DataSourceRef, panelTitle: string) {
+  const expr = INSTANCE_ID
+    ? `sum by (cluster)(grafanacloud_instance_alertmanager_invalid_config{id="${INSTANCE_ID}"})`
+    : `sum by (cluster)(grafanacloud_instance_alertmanager_invalid_config)`;
+
   const query = new SceneQueryRunner({
     datasource,
     queries: [
       {
         refId: 'A',
-        expr: 'sum by (cluster)(grafanacloud_instance_alertmanager_invalid_config)',
+        expr,
         range: true,
         legendFormat: '{{cluster}}',
       },
diff --git a/public/app/features/alerting/unified/insights/mimir/Notifications.tsx b/public/app/features/alerting/unified/insights/mimir/Notifications.tsx
index 933107dd59959..d7cc629dcbe0d 100644
--- a/public/app/features/alerting/unified/insights/mimir/Notifications.tsx
+++ b/public/app/features/alerting/unified/insights/mimir/Notifications.tsx
@@ -3,22 +3,30 @@ import React from 'react';
 import { PanelBuilders, SceneFlexItem, SceneQueryRunner } from '@grafana/scenes';
 import { DataSourceRef, GraphDrawStyle, TooltipDisplayMode } from '@grafana/schema';
 
-import { overrideToFixedColor, PANEL_STYLES } from '../../home/Insights';
+import { INSTANCE_ID, overrideToFixedColor, PANEL_STYLES } from '../../home/Insights';
 import { InsightsRatingModal } from '../RatingModal';
 
 export function getNotificationsScene(datasource: DataSourceRef, panelTitle: string) {
+  const exprA = INSTANCE_ID
+    ? `sum by(cluster)(grafanacloud_instance_alertmanager_notifications_per_second{id="${INSTANCE_ID}"}) - sum by (cluster)(grafanacloud_instance_alertmanager_notifications_failed_per_second{id="${INSTANCE_ID}"})`
+    : `sum by(cluster)(grafanacloud_instance_alertmanager_notifications_per_second) - sum by (cluster)(grafanacloud_instance_alertmanager_notifications_failed_per_second)`;
+
+  const exprB = INSTANCE_ID
+    ? `sum by(cluster)(grafanacloud_instance_alertmanager_notifications_failed_per_second{id="${INSTANCE_ID}"})`
+    : `sum by(cluster)(grafanacloud_instance_alertmanager_notifications_failed_per_second)`;
+
   const query = new SceneQueryRunner({
     datasource,
     queries: [
       {
         refId: 'A',
-        expr: 'sum by(cluster)(grafanacloud_instance_alertmanager_notifications_per_second) - sum by (cluster)(grafanacloud_instance_alertmanager_notifications_failed_per_second)',
+        exprA,
         range: true,
         legendFormat: 'success',
       },
       {
         refId: 'B',
-        expr: 'sum by(cluster)(grafanacloud_instance_alertmanager_notifications_failed_per_second)',
+        exprB,
         range: true,
         legendFormat: 'failed',
       },
diff --git a/public/app/features/alerting/unified/insights/mimir/Silences.tsx b/public/app/features/alerting/unified/insights/mimir/Silences.tsx
index 416c51061d4b5..97398bcf40405 100644
--- a/public/app/features/alerting/unified/insights/mimir/Silences.tsx
+++ b/public/app/features/alerting/unified/insights/mimir/Silences.tsx
@@ -3,16 +3,20 @@ import React from 'react';
 import { PanelBuilders, SceneFlexItem, SceneQueryRunner } from '@grafana/scenes';
 import { DataSourceRef, GraphDrawStyle, TooltipDisplayMode } from '@grafana/schema';
 
-import { PANEL_STYLES } from '../../home/Insights';
+import { INSTANCE_ID, PANEL_STYLES } from '../../home/Insights';
 import { InsightsRatingModal } from '../RatingModal';
 
 export function getSilencesScene(datasource: DataSourceRef, panelTitle: string) {
+  const expr = INSTANCE_ID
+    ? `sum by (state) (grafanacloud_instance_alertmanager_silences{id="${INSTANCE_ID}"})`
+    : `sum by (state) (grafanacloud_instance_alertmanager_silences)`;
+
   const query = new SceneQueryRunner({
     datasource,
     queries: [
       {
         refId: 'A',
-        expr: 'sum by (state) (grafanacloud_instance_alertmanager_silences)',
+        expr,
         range: true,
         legendFormat: '{{state}}',
       },
diff --git a/public/app/features/alerting/unified/insights/mimir/perGroup/RuleGroupEvaluationDurationIntervalRatioScene.tsx b/public/app/features/alerting/unified/insights/mimir/perGroup/RuleGroupEvaluationDurationIntervalRatioScene.tsx
index 9292de7952a98..b80b17779cb0d 100644
--- a/public/app/features/alerting/unified/insights/mimir/perGroup/RuleGroupEvaluationDurationIntervalRatioScene.tsx
+++ b/public/app/features/alerting/unified/insights/mimir/perGroup/RuleGroupEvaluationDurationIntervalRatioScene.tsx
@@ -3,16 +3,20 @@ import React from 'react';
 import { PanelBuilders, SceneFlexItem, SceneQueryRunner } from '@grafana/scenes';
 import { DataSourceRef, GraphDrawStyle, ThresholdsMode, TooltipDisplayMode } from '@grafana/schema';
 
-import { PANEL_STYLES } from '../../../home/Insights';
+import { INSTANCE_ID, PANEL_STYLES } from '../../../home/Insights';
 import { InsightsRatingModal } from '../../RatingModal';
 
 export function getRuleGroupEvaluationDurationIntervalRatioScene(datasource: DataSourceRef, panelTitle: string) {
+  const expr = INSTANCE_ID
+    ? `grafanacloud_instance_rule_group_last_duration_seconds{rule_group="$rule_group", id="${INSTANCE_ID}"} / grafanacloud_instance_rule_group_interval_seconds{rule_group="$rule_group", id="${INSTANCE_ID}"}`
+    : `grafanacloud_instance_rule_group_last_duration_seconds{rule_group="$rule_group"} / grafanacloud_instance_rule_group_interval_seconds{rule_group="$rule_group"}`;
+
   const query = new SceneQueryRunner({
     datasource,
     queries: [
       {
         refId: 'A',
-        expr: `grafanacloud_instance_rule_group_last_duration_seconds{rule_group="$rule_group"} / grafanacloud_instance_rule_group_interval_seconds{rule_group="$rule_group"}`,
+        expr,
         range: true,
         legendFormat: 'duration / interval',
       },
diff --git a/public/app/features/alerting/unified/insights/mimir/perGroup/RuleGroupEvaluationDurationScene.tsx b/public/app/features/alerting/unified/insights/mimir/perGroup/RuleGroupEvaluationDurationScene.tsx
index b183efc9eda9f..8676169772556 100644
--- a/public/app/features/alerting/unified/insights/mimir/perGroup/RuleGroupEvaluationDurationScene.tsx
+++ b/public/app/features/alerting/unified/insights/mimir/perGroup/RuleGroupEvaluationDurationScene.tsx
@@ -3,16 +3,20 @@ import React from 'react';
 import { PanelBuilders, SceneFlexItem, SceneQueryRunner } from '@grafana/scenes';
 import { DataSourceRef, GraphDrawStyle, TooltipDisplayMode } from '@grafana/schema';
 
-import { PANEL_STYLES } from '../../../home/Insights';
+import { INSTANCE_ID, PANEL_STYLES } from '../../../home/Insights';
 import { InsightsRatingModal } from '../../RatingModal';
 
 export function getRuleGroupEvaluationDurationScene(datasource: DataSourceRef, panelTitle: string) {
+  const expr = INSTANCE_ID
+    ? `grafanacloud_instance_rule_group_last_duration_seconds{rule_group="$rule_group", id="${INSTANCE_ID}"}`
+    : `grafanacloud_instance_rule_group_last_duration_seconds{rule_group="$rule_group"}`;
+
   const query = new SceneQueryRunner({
     datasource,
     queries: [
       {
         refId: 'A',
-        expr: `grafanacloud_instance_rule_group_last_duration_seconds{rule_group="$rule_group"}`,
+        expr,
         range: true,
         legendFormat: '{{rule_group}}',
       },
diff --git a/public/app/features/alerting/unified/insights/mimir/perGroup/RuleGroupEvaluationsScene.tsx b/public/app/features/alerting/unified/insights/mimir/perGroup/RuleGroupEvaluationsScene.tsx
index b35ac1d113b77..33a0fea7c454b 100644
--- a/public/app/features/alerting/unified/insights/mimir/perGroup/RuleGroupEvaluationsScene.tsx
+++ b/public/app/features/alerting/unified/insights/mimir/perGroup/RuleGroupEvaluationsScene.tsx
@@ -3,22 +3,30 @@ import React from 'react';
 import { PanelBuilders, SceneFlexItem, SceneQueryRunner } from '@grafana/scenes';
 import { DataSourceRef, GraphDrawStyle, TooltipDisplayMode } from '@grafana/schema';
 
-import { overrideToFixedColor, PANEL_STYLES } from '../../../home/Insights';
+import { INSTANCE_ID, overrideToFixedColor, PANEL_STYLES } from '../../../home/Insights';
 import { InsightsRatingModal } from '../../RatingModal';
 
 export function getRuleGroupEvaluationsScene(datasource: DataSourceRef, panelTitle: string) {
+  const exprA = INSTANCE_ID
+    ? `grafanacloud_instance_rule_evaluations_total:rate5m{rule_group="$rule_group", id="${INSTANCE_ID}} - grafanacloud_instance_rule_evaluation_failures_total:rate5m{rule_group=~"$rule_group", id="${INSTANCE_ID}}`
+    : `grafanacloud_instance_rule_evaluations_total:rate5m{rule_group="$rule_group"} - grafanacloud_instance_rule_evaluation_failures_total:rate5m{rule_group=~"$rule_group"}`;
+
+  const exprB = INSTANCE_ID
+    ? `grafanacloud_instance_rule_evaluation_failures_total:rate5m{rule_group=~"$rule_group", id="${INSTANCE_ID}}`
+    : `grafanacloud_instance_rule_evaluation_failures_total:rate5m{rule_group=~"$rule_group"}`;
+
   const query = new SceneQueryRunner({
     datasource,
     queries: [
       {
         refId: 'A',
-        expr: `grafanacloud_instance_rule_evaluations_total:rate5m{rule_group="$rule_group"} - grafanacloud_instance_rule_evaluation_failures_total:rate5m{rule_group=~"$rule_group"}`,
+        exprA,
         range: true,
         legendFormat: 'success',
       },
       {
         refId: 'B',
-        expr: `grafanacloud_instance_rule_evaluation_failures_total:rate5m{rule_group=~"$rule_group"}`,
+        exprB,
         range: true,
         legendFormat: 'failed',
       },
diff --git a/public/app/features/alerting/unified/insights/mimir/perGroup/RuleGroupIntervalScene.tsx b/public/app/features/alerting/unified/insights/mimir/perGroup/RuleGroupIntervalScene.tsx
index 524e597e6a274..a576a6f9429d7 100644
--- a/public/app/features/alerting/unified/insights/mimir/perGroup/RuleGroupIntervalScene.tsx
+++ b/public/app/features/alerting/unified/insights/mimir/perGroup/RuleGroupIntervalScene.tsx
@@ -3,16 +3,20 @@ import React from 'react';
 import { PanelBuilders, SceneFlexItem, SceneQueryRunner } from '@grafana/scenes';
 import { BigValueGraphMode, DataSourceRef } from '@grafana/schema';
 
-import { PANEL_STYLES } from '../../../home/Insights';
+import { INSTANCE_ID, PANEL_STYLES } from '../../../home/Insights';
 import { InsightsRatingModal } from '../../RatingModal';
 
 export function getRuleGroupIntervalScene(datasource: DataSourceRef, panelTitle: string) {
+  const expr = INSTANCE_ID
+    ? `grafanacloud_instance_rule_group_interval_seconds{rule_group="$rule_group", id="${INSTANCE_ID}"}`
+    : `grafanacloud_instance_rule_group_interval_seconds{rule_group="$rule_group"}`;
+
   const query = new SceneQueryRunner({
     datasource,
     queries: [
       {
         refId: 'A',
-        expr: `grafanacloud_instance_rule_group_interval_seconds{rule_group="$rule_group"}`,
+        expr,
         range: true,
         legendFormat: 'interval',
       },
diff --git a/public/app/features/alerting/unified/insights/mimir/perGroup/RulesPerGroupScene.tsx b/public/app/features/alerting/unified/insights/mimir/perGroup/RulesPerGroupScene.tsx
index 3be05e4debe0c..437366c95507b 100644
--- a/public/app/features/alerting/unified/insights/mimir/perGroup/RulesPerGroupScene.tsx
+++ b/public/app/features/alerting/unified/insights/mimir/perGroup/RulesPerGroupScene.tsx
@@ -3,16 +3,20 @@ import React from 'react';
 import { PanelBuilders, SceneFlexItem, SceneQueryRunner } from '@grafana/scenes';
 import { BigValueGraphMode, DataSourceRef } from '@grafana/schema';
 
-import { PANEL_STYLES } from '../../../home/Insights';
+import { INSTANCE_ID, PANEL_STYLES } from '../../../home/Insights';
 import { InsightsRatingModal } from '../../RatingModal';
 
 export function getRulesPerGroupScene(datasource: DataSourceRef, panelTitle: string) {
+  const expr = INSTANCE_ID
+    ? `sum(grafanacloud_instance_rule_group_rules{rule_group="$rule_group", id="${INSTANCE_ID}"})`
+    : `sum(grafanacloud_instance_rule_group_rules{rule_group="$rule_group"})`;
+
   const query = new SceneQueryRunner({
     datasource,
     queries: [
       {
         refId: 'A',
-        expr: `sum(grafanacloud_instance_rule_group_rules{rule_group="$rule_group"})`,
+        expr,
         range: true,
         legendFormat: 'number of rules',
       },
diff --git a/public/app/features/alerting/unified/insights/mimir/rules/EvalSuccessVsFailuresScene.tsx b/public/app/features/alerting/unified/insights/mimir/rules/EvalSuccessVsFailuresScene.tsx
index 792445ec76747..363c39364be9b 100644
--- a/public/app/features/alerting/unified/insights/mimir/rules/EvalSuccessVsFailuresScene.tsx
+++ b/public/app/features/alerting/unified/insights/mimir/rules/EvalSuccessVsFailuresScene.tsx
@@ -3,22 +3,30 @@ import React from 'react';
 import { PanelBuilders, SceneFlexItem, SceneQueryRunner } from '@grafana/scenes';
 import { DataSourceRef, GraphDrawStyle, TooltipDisplayMode } from '@grafana/schema';
 
-import { overrideToFixedColor, PANEL_STYLES } from '../../../home/Insights';
+import { INSTANCE_ID, overrideToFixedColor, PANEL_STYLES } from '../../../home/Insights';
 import { InsightsRatingModal } from '../../RatingModal';
 
 export function getEvalSuccessVsFailuresScene(datasource: DataSourceRef, panelTitle: string) {
+  const exprA = INSTANCE_ID
+    ? `sum(grafanacloud_instance_rule_evaluations_total:rate5m{id="${INSTANCE_ID}) - sum(grafanacloud_instance_rule_evaluation_failures_total:rate5m{id="${INSTANCE_ID})`
+    : `sum(grafanacloud_instance_rule_evaluations_total:rate5m) - sum(grafanacloud_instance_rule_evaluation_failures_total:rate5m)`;
+
+  const exprB = INSTANCE_ID
+    ? `sum(grafanacloud_instance_rule_evaluation_failures_total:rate5m{id="${INSTANCE_ID})`
+    : `sum(grafanacloud_instance_rule_evaluation_failures_total:rate5m)`;
+
   const query = new SceneQueryRunner({
     datasource,
     queries: [
       {
         refId: 'A',
-        expr: 'sum(grafanacloud_instance_rule_evaluations_total:rate5m) - sum(grafanacloud_instance_rule_evaluation_failures_total:rate5m)',
+        exprA,
         range: true,
         legendFormat: 'success',
       },
       {
         refId: 'B',
-        expr: 'sum(grafanacloud_instance_rule_evaluation_failures_total:rate5m)',
+        exprB,
         range: true,
         legendFormat: 'failed',
       },
diff --git a/public/app/features/alerting/unified/insights/mimir/rules/MissedIterationsScene.tsx b/public/app/features/alerting/unified/insights/mimir/rules/MissedIterationsScene.tsx
index 16d32fa5941ff..eb8b4d37dcbb5 100644
--- a/public/app/features/alerting/unified/insights/mimir/rules/MissedIterationsScene.tsx
+++ b/public/app/features/alerting/unified/insights/mimir/rules/MissedIterationsScene.tsx
@@ -3,16 +3,20 @@ import React from 'react';
 import { PanelBuilders, SceneFlexItem, SceneQueryRunner } from '@grafana/scenes';
 import { DataSourceRef, GraphDrawStyle, TooltipDisplayMode } from '@grafana/schema';
 
-import { overrideToFixedColor, PANEL_STYLES } from '../../../home/Insights';
+import { INSTANCE_ID, overrideToFixedColor, PANEL_STYLES } from '../../../home/Insights';
 import { InsightsRatingModal } from '../../RatingModal';
 
 export function getMissedIterationsScene(datasource: DataSourceRef, panelTitle: string) {
+  const expr = INSTANCE_ID
+    ? `sum(grafanacloud_instance_rule_group_iterations_missed_total:rate5m{id="${INSTANCE_ID}"})`
+    : `sum(grafanacloud_instance_rule_group_iterations_missed_total:rate5m)`;
+
   const query = new SceneQueryRunner({
     datasource,
     queries: [
       {
         refId: 'A',
-        expr: 'sum(grafanacloud_instance_rule_group_iterations_missed_total:rate5m)',
+        expr,
         range: true,
         legendFormat: 'missed',
       },
diff --git a/public/app/features/alerting/unified/integration/AlertRulesDrawer.tsx b/public/app/features/alerting/unified/integration/AlertRulesDrawer.tsx
new file mode 100644
index 0000000000000..d22ac005efd2c
--- /dev/null
+++ b/public/app/features/alerting/unified/integration/AlertRulesDrawer.tsx
@@ -0,0 +1,38 @@
+import React from 'react';
+
+import { Drawer, LoadingPlaceholder, Stack, TextLink } from '@grafana/ui';
+
+import { t } from '../../../../core/internationalization';
+import { createUrl } from '../utils/url';
+
+const AlertRulesDrawerContent = React.lazy(
+  () => import(/* webpackChunkName: "alert-rules-drawer-content" */ './AlertRulesDrawerContent')
+);
+
+interface Props {
+  dashboardUid: string;
+  onDismiss: () => void;
+}
+
+export function AlertRulesDrawer({ dashboardUid, onDismiss }: Props) {
+  return (
+    <Drawer title="Alert rules" subtitle={<DrawerSubtitle dashboardUid={dashboardUid} />} onClose={onDismiss} size="lg">
+      <React.Suspense fallback={<LoadingPlaceholder text="Loading alert rules" />}>
+        <AlertRulesDrawerContent dashboardUid={dashboardUid} />
+      </React.Suspense>
+    </Drawer>
+  );
+}
+
+function DrawerSubtitle({ dashboardUid }: { dashboardUid: string }) {
+  const searchParams = new URLSearchParams({ search: `dashboard:${dashboardUid}` });
+
+  return (
+    <Stack gap={2}>
+      <div>{t('dashboard.alert-rules-drawer.subtitle', 'Alert rules related to this dashboard')}</div>
+      <TextLink href={createUrl(`/alerting/list/?${searchParams.toString()}`)}>
+        {t('dashboard.alert-rules-drawer.redirect-link', 'List in Grafana Alerting')}
+      </TextLink>
+    </Stack>
+  );
+}
diff --git a/public/app/features/alerting/unified/integration/AlertRulesDrawerContent.tsx b/public/app/features/alerting/unified/integration/AlertRulesDrawerContent.tsx
new file mode 100644
index 0000000000000..22bd4a2a0935d
--- /dev/null
+++ b/public/app/features/alerting/unified/integration/AlertRulesDrawerContent.tsx
@@ -0,0 +1,41 @@
+import React from 'react';
+import { useAsync } from 'react-use';
+
+import { LoadingPlaceholder } from '@grafana/ui';
+import { useDispatch } from 'app/types';
+
+import { RulesTable } from '../components/rules/RulesTable';
+import { useCombinedRuleNamespaces } from '../hooks/useCombinedRuleNamespaces';
+import { fetchPromAndRulerRulesAction } from '../state/actions';
+import { Annotation } from '../utils/constants';
+import { GRAFANA_RULES_SOURCE_NAME } from '../utils/datasource';
+
+interface Props {
+  dashboardUid: string;
+}
+
+export default function AlertRulesDrawerContent({ dashboardUid }: Props) {
+  const dispatch = useDispatch();
+
+  const { loading: loadingAlertRules } = useAsync(async () => {
+    await dispatch(fetchPromAndRulerRulesAction({ rulesSourceName: GRAFANA_RULES_SOURCE_NAME }));
+  }, [dispatch]);
+
+  const grafanaNamespaces = useCombinedRuleNamespaces(GRAFANA_RULES_SOURCE_NAME);
+  const rules = grafanaNamespaces
+    .flatMap((ns) => ns.groups)
+    .flatMap((g) => g.rules)
+    .filter((rule) => rule.annotations[Annotation.dashboardUID] === dashboardUid);
+
+  const loading = loadingAlertRules;
+
+  return (
+    <>
+      {loading ? (
+        <LoadingPlaceholder text="Loading alert rules" />
+      ) : (
+        <RulesTable rules={rules} showNextEvaluationColumn={false} showGroupColumn={false} />
+      )}
+    </>
+  );
+}
diff --git a/public/app/features/alerting/unified/integration/AlertRulesToolbarButton.tsx b/public/app/features/alerting/unified/integration/AlertRulesToolbarButton.tsx
new file mode 100644
index 0000000000000..d7f4b18b857ed
--- /dev/null
+++ b/public/app/features/alerting/unified/integration/AlertRulesToolbarButton.tsx
@@ -0,0 +1,42 @@
+import React, { useContext } from 'react';
+
+import { ModalsContext, ToolbarButton } from '@grafana/ui';
+
+import { t } from '../../../../core/internationalization';
+import { alertRuleApi } from '../api/alertRuleApi';
+import { GRAFANA_RULES_SOURCE_NAME } from '../utils/datasource';
+
+import { AlertRulesDrawer } from './AlertRulesDrawer';
+
+interface AlertRulesToolbarButtonProps {
+  dashboardUid: string;
+}
+
+export default function AlertRulesToolbarButton({ dashboardUid }: AlertRulesToolbarButtonProps) {
+  const { showModal, hideModal } = useContext(ModalsContext);
+
+  const { data: namespaces = [] } = alertRuleApi.endpoints.prometheusRuleNamespaces.useQuery({
+    ruleSourceName: GRAFANA_RULES_SOURCE_NAME,
+    dashboardUid: dashboardUid,
+  });
+
+  if (namespaces.length === 0) {
+    return null;
+  }
+
+  const onShowDrawer = () => {
+    showModal(AlertRulesDrawer, {
+      dashboardUid: dashboardUid,
+      onDismiss: hideModal,
+    });
+  };
+
+  return (
+    <ToolbarButton
+      tooltip={t('dashboard.toolbar.alert-rules', 'Alert rules')}
+      icon="bell"
+      onClick={onShowDrawer}
+      key="button-alerting"
+    />
+  );
+}
diff --git a/public/app/features/alerting/unified/mockApi.ts b/public/app/features/alerting/unified/mockApi.ts
index 87814055a13a9..9c3ad1e853991 100644
--- a/public/app/features/alerting/unified/mockApi.ts
+++ b/public/app/features/alerting/unified/mockApi.ts
@@ -1,7 +1,7 @@
+import 'whatwg-fetch';
 import { uniqueId } from 'lodash';
-import { rest } from 'msw';
+import { http, HttpResponse } from 'msw';
 import { setupServer, SetupServer } from 'msw/node';
-import 'whatwg-fetch';
 
 import { DataSourceInstanceSettings, PluginMeta } from '@grafana/data';
 import { setBackendSrv } from '@grafana/runtime';
@@ -22,8 +22,8 @@ import {
   MatcherOperator,
   Route,
 } from '../../../plugins/datasource/alertmanager/types';
-import { FolderDTO, NotifierDTO } from '../../../types';
-import { DashboardSearchHit } from '../../search/types';
+import { DashboardDTO, FolderDTO, NotifierDTO } from '../../../types';
+import { DashboardSearchItem } from '../../search/types';
 
 import { CreateIntegrationDTO, NewOnCallIntegrationDTO, OnCallIntegrationDTO } from './api/onCallApi';
 import { AlertingQueryResponse } from './state/AlertingQueryRunner';
@@ -120,7 +120,9 @@ class GrafanaReceiverConfigBuilder {
   }
 
   addSetting(key: string, value: string): GrafanaReceiverConfigBuilder {
-    this.grafanaReceiverConfig.settings[key] = value;
+    if (this.grafanaReceiverConfig.settings) {
+      this.grafanaReceiverConfig.settings[key] = value;
+    }
     return this;
   }
 
@@ -190,85 +192,74 @@ export function mockApi(server: SetupServer) {
       configure(builder);
 
       server.use(
-        rest.get(`api/alertmanager/${amName}/config/api/v1/alerts`, (req, res, ctx) =>
-          res(
-            ctx.status(200),
-            ctx.json<AlertManagerCortexConfig>({
-              alertmanager_config: builder.build(),
-              template_files: {},
-            })
-          )
+        http.get(`api/alertmanager/${amName}/config/api/v1/alerts`, () =>
+          HttpResponse.json<AlertManagerCortexConfig>({
+            alertmanager_config: builder.build(),
+            template_files: {},
+          })
         )
       );
     },
 
     eval: (response: AlertingQueryResponse) => {
       server.use(
-        rest.post('/api/v1/eval', (_, res, ctx) => {
-          return res(ctx.status(200), ctx.json(response));
+        http.post('/api/v1/eval', () => {
+          return HttpResponse.json(response);
         })
       );
     },
     grafanaNotifiers: (response: NotifierDTO[]) => {
-      server.use(
-        rest.get(`api/alert-notifiers`, (req, res, ctx) => res(ctx.status(200), ctx.json<NotifierDTO[]>(response)))
-      );
+      server.use(http.get(`api/alert-notifiers`, () => HttpResponse.json(response)));
     },
 
     plugins: {
       getPluginSettings: (response: PluginMeta) => {
-        server.use(
-          rest.get(`api/plugins/${response.id}/settings`, (req, res, ctx) =>
-            res(ctx.status(200), ctx.json<PluginMeta>(response))
-          )
-        );
+        server.use(http.get(`api/plugins/${response.id}/settings`, () => HttpResponse.json(response)));
       },
     },
 
     oncall: {
       getOnCallIntegrations: (response: OnCallIntegrationDTO[]) => {
         server.use(
-          rest.get(`api/plugin-proxy/grafana-oncall-app/api/internal/v1/alert_receive_channels`, (_, res, ctx) =>
-            res(ctx.status(200), ctx.json<OnCallIntegrationDTO[]>(response))
+          http.get(`api/plugin-proxy/grafana-oncall-app/api/internal/v1/alert_receive_channels`, () =>
+            HttpResponse.json<OnCallIntegrationDTO[]>(response)
           )
         );
       },
       features: (response: string[]) => {
         server.use(
-          rest.get(`api/plugin-proxy/grafana-oncall-app/api/internal/v1/features`, (_, res, ctx) =>
-            res(ctx.status(200), ctx.json<string[]>(response))
-          )
+          http.get(`api/plugin-proxy/grafana-oncall-app/api/internal/v1/features`, () => HttpResponse.json(response))
         );
       },
       validateIntegrationName: (invalidNames: string[]) => {
         server.use(
-          rest.get(
+          http.get(
             `api/plugin-proxy/grafana-oncall-app/api/internal/v1/alert_receive_channels/validate_name`,
-            (req, res, ctx) => {
-              const isValid = !invalidNames.includes(req.url.searchParams.get('verbal_name') ?? '');
-              return res(ctx.status(isValid ? 200 : 409), ctx.json<boolean>(isValid));
+            ({ request }) => {
+              const url = new URL(request.url);
+              const isValid = !invalidNames.includes(url.searchParams.get('verbal_name') ?? '');
+              return HttpResponse.json(isValid, {
+                status: isValid ? 200 : 409,
+              });
             }
           )
         );
       },
       createIntegraion: () => {
         server.use(
-          rest.post<CreateIntegrationDTO>(
+          http.post<{}, CreateIntegrationDTO>(
             `api/plugin-proxy/grafana-oncall-app/api/internal/v1/alert_receive_channels`,
-            async (req, res, ctx) => {
-              const body = await req.json<CreateIntegrationDTO>();
+            async ({ request }) => {
+              const body = await request.json();
               const integrationId = uniqueId('oncall-integration-');
 
-              return res(
-                ctx.status(200),
-                ctx.json<NewOnCallIntegrationDTO>({
-                  id: integrationId,
-                  integration: body.integration,
-                  integration_url: `https://oncall-endpoint.example.com/${integrationId}`,
-                  verbal_name: body.verbal_name,
-                  connected_escalations_chains_count: 0,
-                })
-              );
+              return HttpResponse.json<NewOnCallIntegrationDTO>({
+                id: integrationId,
+                integration: body.integration,
+                integration_url: `https://oncall-endpoint.example.com/${integrationId}`,
+                verbal_name: body.verbal_name,
+                connected_escalations_chains_count: 0,
+              });
             }
           )
         );
@@ -281,21 +272,15 @@ export function mockAlertRuleApi(server: SetupServer) {
   return {
     prometheusRuleNamespaces: (dsName: string, response: PromRulesResponse) => {
       server.use(
-        rest.get(`api/prometheus/${dsName}/api/v1/rules`, (req, res, ctx) =>
-          res(ctx.status(200), ctx.json<PromRulesResponse>(response))
-        )
+        http.get(`api/prometheus/${dsName}/api/v1/rules`, () => HttpResponse.json<PromRulesResponse>(response))
       );
     },
     rulerRules: (dsName: string, response: RulerRulesConfigDTO) => {
-      server.use(
-        rest.get(`/api/ruler/${dsName}/api/v1/rules`, (req, res, ctx) => res(ctx.status(200), ctx.json(response)))
-      );
+      server.use(http.get(`/api/ruler/${dsName}/api/v1/rules`, () => HttpResponse.json(response)));
     },
     rulerRuleGroup: (dsName: string, namespace: string, group: string, response: RulerRuleGroupDTO) => {
       server.use(
-        rest.get(`/api/ruler/${dsName}/api/v1/rules/${namespace}/${group}`, (req, res, ctx) =>
-          res(ctx.status(200), ctx.json(response))
-        )
+        http.get(`/api/ruler/${dsName}/api/v1/rules/${namespace}/${group}`, () => HttpResponse.json(response))
       );
     },
   };
@@ -312,9 +297,7 @@ export function mockFeatureDiscoveryApi(server: SetupServer) {
      * @param response Use `buildInfoResponse` to get a pre-defined response for Prometheus and Mimir
      */
     discoverDsFeatures: (dsSettings: DataSourceInstanceSettings, response: PromBuildInfoResponse) => {
-      server.use(
-        rest.get(`${dsSettings.url}/api/v1/status/buildinfo`, (_, res, ctx) => res(ctx.status(200), ctx.json(response)))
-      );
+      server.use(http.get(`${dsSettings.url}/api/v1/status/buildinfo`, () => HttpResponse.json(response)));
     },
   };
 }
@@ -323,16 +306,20 @@ export function mockProvisioningApi(server: SetupServer) {
   return {
     exportRuleGroup: (folderUid: string, groupName: string, response: Record<string, string>) => {
       server.use(
-        rest.get(`/api/v1/provisioning/folder/${folderUid}/rule-groups/${groupName}/export`, (req, res, ctx) =>
-          res(ctx.status(200), ctx.text(response[req.url.searchParams.get('format') ?? 'yaml']))
-        )
+        http.get(`/api/v1/provisioning/folder/${folderUid}/rule-groups/${groupName}/export`, ({ request }) => {
+          const url = new URL(request.url);
+          const format = url.searchParams.get('format') ?? 'yaml';
+          return HttpResponse.text(response[format]);
+        })
       );
     },
     exportReceiver: (response: Record<string, string>) => {
       server.use(
-        rest.get(`/api/v1/provisioning/contact-points/export/`, (req, res, ctx) =>
-          res(ctx.status(200), ctx.text(response[req.url.searchParams.get('format') ?? 'yaml']))
-        )
+        http.get(`/api/v1/provisioning/contact-points/export/`, ({ request }) => {
+          const url = new URL(request.url);
+          const format = url.searchParams.get('format') ?? 'yaml';
+          return HttpResponse.text(response[format]);
+        })
       );
     },
   };
@@ -344,43 +331,51 @@ export function mockExportApi(server: SetupServer) {
     // exportRule requires ruleUid parameter and doesn't allow folderUid and group parameters
     exportRule: (ruleUid: string, response: Record<string, string>) => {
       server.use(
-        rest.get('/api/ruler/grafana/api/v1/export/rules', (req, res, ctx) => {
-          if (req.url.searchParams.get('ruleUid') === ruleUid) {
-            return res(ctx.status(200), ctx.text(response[req.url.searchParams.get('format') ?? 'yaml']));
+        http.get('/api/ruler/grafana/api/v1/export/rules', ({ request }) => {
+          const url = new URL(request.url);
+          if (url.searchParams.get('ruleUid') === ruleUid) {
+            const format = url.searchParams.get('format') ?? 'yaml';
+            return HttpResponse.text(response[format]);
           }
 
-          return res(ctx.status(500));
+          return HttpResponse.text('', { status: 500 });
         })
       );
     },
     // exportRulesGroup requires folderUid and group parameters and doesn't allow ruleUid parameter
     exportRulesGroup: (folderUid: string, group: string, response: Record<string, string>) => {
       server.use(
-        rest.get('/api/ruler/grafana/api/v1/export/rules', (req, res, ctx) => {
-          if (req.url.searchParams.get('folderUid') === folderUid && req.url.searchParams.get('group') === group) {
-            return res(ctx.status(200), ctx.text(response[req.url.searchParams.get('format') ?? 'yaml']));
+        http.get('/api/ruler/grafana/api/v1/export/rules', ({ request }) => {
+          const url = new URL(request.url);
+          if (url.searchParams.get('folderUid') === folderUid && url.searchParams.get('group') === group) {
+            const format = url.searchParams.get('format') ?? 'yaml';
+            return HttpResponse.text(response[format]);
           }
 
-          return res(ctx.status(500));
+          return HttpResponse.text('', { status: 500 });
         })
       );
     },
     // exportRulesFolder requires folderUid parameter
     exportRulesFolder: (folderUid: string, response: Record<string, string>) => {
       server.use(
-        rest.get('/api/ruler/grafana/api/v1/export/rules', (req, res, ctx) => {
-          if (req.url.searchParams.get('folderUid') === folderUid) {
-            return res(ctx.status(200), ctx.text(response[req.url.searchParams.get('format') ?? 'yaml']));
+        http.get('/api/ruler/grafana/api/v1/export/rules', ({ request }) => {
+          const url = new URL(request.url);
+          if (url.searchParams.get('folderUid') === folderUid) {
+            const format = url.searchParams.get('format') ?? 'yaml';
+            return HttpResponse.text(response[format]);
           }
 
-          return res(ctx.status(500));
+          return HttpResponse.text('', { status: 500 });
         })
       );
     },
-    modifiedExport: (namespace: string, response: Record<string, string>) => {
+    modifiedExport: (namespaceUID: string, response: Record<string, string>) => {
       server.use(
-        rest.post(`/api/ruler/grafana/api/v1/rules/${namespace}/export`, (req, res, ctx) => {
-          return res(ctx.status(200), ctx.text(response[req.url.searchParams.get('format') ?? 'yaml']));
+        http.post(`/api/ruler/grafana/api/v1/rules/${namespaceUID}/export`, ({ request }) => {
+          const url = new URL(request.url);
+          const format = url.searchParams.get('format') ?? 'yaml';
+          return HttpResponse.text(response[format]);
         })
       );
     },
@@ -390,15 +385,26 @@ export function mockExportApi(server: SetupServer) {
 export function mockFolderApi(server: SetupServer) {
   return {
     folder: (folderUid: string, response: FolderDTO) => {
-      server.use(rest.get(`/api/folders/${folderUid}`, (_, res, ctx) => res(ctx.status(200), ctx.json(response))));
+      server.use(http.get(`/api/folders/${folderUid}`, () => HttpResponse.json(response)));
     },
   };
 }
 
 export function mockSearchApi(server: SetupServer) {
   return {
-    search: (results: DashboardSearchHit[]) => {
-      server.use(rest.get(`/api/search`, (_, res, ctx) => res(ctx.status(200), ctx.json(results))));
+    search: (results: DashboardSearchItem[]) => {
+      server.use(http.get(`/api/search`, () => HttpResponse.json(results)));
+    },
+  };
+}
+
+export function mockDashboardApi(server: SetupServer) {
+  return {
+    search: (results: DashboardSearchItem[]) => {
+      server.use(http.get(`/api/search`, () => HttpResponse.json(results)));
+    },
+    dashboard: (response: DashboardDTO) => {
+      server.use(http.get(`/api/dashboards/uid/${response.dashboard.uid}`, () => HttpResponse.json(response)));
     },
   };
 }
@@ -412,6 +418,10 @@ export function setupMswServer() {
     server.listen({ onUnhandledRequest: 'error' });
   });
 
+  afterEach(() => {
+    server.resetHandlers();
+  });
+
   afterAll(() => {
     server.close();
   });
diff --git a/public/app/features/alerting/unified/mocks.ts b/public/app/features/alerting/unified/mocks.ts
index 132aba7d0a777..3683e9f56baf8 100644
--- a/public/app/features/alerting/unified/mocks.ts
+++ b/public/app/features/alerting/unified/mocks.ts
@@ -15,22 +15,23 @@ import {
   ScopedVars,
   TestDataSourceResponse,
 } from '@grafana/data';
-import { config, DataSourceSrv, GetDataSourceListFilters } from '@grafana/runtime';
+import { DataSourceSrv, GetDataSourceListFilters, config } from '@grafana/runtime';
+import { defaultDashboard } from '@grafana/schema';
 import { contextSrv } from 'app/core/services/context_srv';
 import { DatasourceSrv } from 'app/features/plugins/datasource_srv';
 import {
-  AlertmanagerAlert,
   AlertManagerCortexConfig,
+  AlertState,
+  AlertmanagerAlert,
   AlertmanagerGroup,
   AlertmanagerStatus,
-  AlertState,
   GrafanaManagedReceiverConfig,
   MatcherOperator,
   Silence,
   SilenceState,
 } from 'app/plugins/datasource/alertmanager/types';
 import { configureStore } from 'app/store/configureStore';
-import { AccessControlAction, FolderDTO, NotifiersState, ReceiversState, StoreState } from 'app/types';
+import { AccessControlAction, DashboardDTO, FolderDTO, NotifiersState, ReceiversState, StoreState } from 'app/types';
 import {
   Alert,
   AlertingRule,
@@ -55,6 +56,8 @@ import {
   RulerRulesConfigDTO,
 } from 'app/types/unified-alerting-dto';
 
+import { DashboardSearchItem, DashboardSearchItemType } from '../../search/types';
+
 let nextDataSourceId = 1;
 
 export function mockDataSource<T extends DataSourceJsonData = DataSourceJsonData>(
@@ -111,7 +114,6 @@ export const mockRulerGrafanaRule = (
       uid: '123',
       title: 'myalert',
       namespace_uid: '123',
-      namespace_id: 1,
       condition: 'A',
       no_data_state: GrafanaAlertStateDecision.Alerting,
       exec_err_state: GrafanaAlertStateDecision.Alerting,
@@ -208,8 +210,7 @@ export const mockGrafanaRulerRule = (partial: Partial<GrafanaRuleDefinition> = {
     grafana_alert: {
       uid: '',
       title: 'my rule',
-      namespace_uid: '',
-      namespace_id: 0,
+      namespace_uid: 'NAMESPACE_UID',
       condition: '',
       no_data_state: GrafanaAlertStateDecision.NoData,
       exec_err_state: GrafanaAlertStateDecision.Error,
@@ -394,10 +395,7 @@ export class MockDataSourceSrv implements DataSourceSrv {
    * Get settings and plugin metadata by name or uid
    */
   getInstanceSettings(nameOrUid: string | null | undefined): DataSourceInstanceSettings | undefined {
-    return (
-      DatasourceSrv.prototype.getInstanceSettings.call(this, nameOrUid) ||
-      ({ meta: { info: { logos: {} } } } as unknown as DataSourceInstanceSettings)
-    );
+    return DatasourceSrv.prototype.getInstanceSettings.call(this, nameOrUid);
   }
 
   async loadDatasource(name: string): Promise<DataSourceApi<any, any>> {
@@ -601,19 +599,6 @@ export const grantUserPermissions = (permissions: AccessControlAction[]) => {
     .mockImplementation((action) => permissions.includes(action as AccessControlAction));
 };
 
-export function mockDataSourcesStore(partial?: Partial<StoreState['dataSources']>) {
-  const defaultState = configureStore().getState();
-  const store = configureStore({
-    ...defaultState,
-    dataSources: {
-      ...defaultState.dataSources,
-      ...partial,
-    },
-  });
-
-  return store;
-}
-
 export function mockUnifiedAlertingStore(unifiedAlerting?: Partial<StoreState['unifiedAlerting']>) {
   const defaultState = configureStore().getState();
 
@@ -654,6 +639,17 @@ export function mockCombinedRuleNamespace(namespace: Partial<CombinedRuleNamespa
     ...namespace,
   };
 }
+export function mockCombinedCloudRuleNamespace(
+  namespace: Partial<CombinedRuleNamespace>,
+  dataSourceName: string
+): CombinedRuleNamespace {
+  return {
+    name: 'Grafana',
+    groups: [],
+    rulesSource: mockDataSource({ name: dataSourceName, uid: 'Prometheus-1' }),
+    ...namespace,
+  };
+}
 
 export function getGrafanaRule(override?: Partial<CombinedRule>, rulerOverride?: Partial<GrafanaRuleDefinition>) {
   return mockCombinedRule({
@@ -684,6 +680,36 @@ export function mockAlertWithState(state: GrafanaAlertState, labels?: {}): Alert
   return { activeAt: '', annotations: {}, labels: labels || {}, state: state, value: '' };
 }
 
+export function mockDashboardSearchItem(searchItem: Partial<DashboardSearchItem>) {
+  return {
+    title: '',
+    uid: '',
+    type: DashboardSearchItemType.DashDB,
+    url: '',
+    uri: '',
+    items: [],
+    tags: [],
+    slug: '',
+    isStarred: false,
+    ...searchItem,
+  };
+}
+
+export function mockDashboardDto(
+  dashboard: Partial<DashboardDTO['dashboard']>,
+  meta?: Partial<DashboardDTO['meta']>
+): DashboardDTO {
+  return {
+    dashboard: {
+      uid: 'dashboard-test',
+      title: 'Dashboard test',
+      schemaVersion: defaultDashboard.schemaVersion,
+      ...dashboard,
+    },
+    meta: { ...meta },
+  };
+}
+
 export const onCallPluginMetaMock: PluginMeta = {
   name: 'Grafana OnCall',
   id: 'grafana-oncall-app',
diff --git a/public/app/features/alerting/unified/mocks/alertRuleApi.ts b/public/app/features/alerting/unified/mocks/alertRuleApi.ts
index 7eb598b37fa4c..d748fb8973ae9 100644
--- a/public/app/features/alerting/unified/mocks/alertRuleApi.ts
+++ b/public/app/features/alerting/unified/mocks/alertRuleApi.ts
@@ -1,4 +1,5 @@
-import { rest } from 'msw';
+import 'whatwg-fetch';
+import { http, HttpResponse } from 'msw';
 import { SetupServer } from 'msw/node';
 
 import { PromRulesResponse } from 'app/types/unified-alerting-dto';
@@ -6,9 +7,9 @@ import { PromRulesResponse } from 'app/types/unified-alerting-dto';
 import { PreviewResponse, PREVIEW_URL, PROM_RULES_URL } from '../api/alertRuleApi';
 
 export function mockPreviewApiResponse(server: SetupServer, result: PreviewResponse) {
-  server.use(rest.post(PREVIEW_URL, (req, res, ctx) => res(ctx.json<PreviewResponse>(result))));
+  server.use(http.post(PREVIEW_URL, () => HttpResponse.json(result)));
 }
 
 export function mockPromRulesApiResponse(server: SetupServer, result: PromRulesResponse) {
-  server.use(rest.get(PROM_RULES_URL, (req, res, ctx) => res(ctx.json<PromRulesResponse>(result))));
+  server.use(http.get(PROM_RULES_URL, () => HttpResponse.json(result)));
 }
diff --git a/public/app/features/alerting/unified/mocks/alertmanagerApi.ts b/public/app/features/alerting/unified/mocks/alertmanagerApi.ts
index 492e01e74a28a..1b7e98806dcb8 100644
--- a/public/app/features/alerting/unified/mocks/alertmanagerApi.ts
+++ b/public/app/features/alerting/unified/mocks/alertmanagerApi.ts
@@ -1,4 +1,5 @@
-import { rest } from 'msw';
+import 'whatwg-fetch';
+import { http, HttpResponse } from 'msw';
 import { SetupServer } from 'msw/node';
 
 import {
@@ -14,7 +15,7 @@ export const defaultAlertmanagerChoiceResponse: AlertmanagersChoiceResponse = {
   numExternalAlertmanagers: 0,
 };
 export function mockAlertmanagerChoiceResponse(server: SetupServer, response: AlertmanagersChoiceResponse) {
-  server.use(rest.get('/api/v1/ngalert', (req, res, ctx) => res(ctx.status(200), ctx.json(response))));
+  server.use(http.get('/api/v1/ngalert', () => HttpResponse.json(response)));
 }
 
 export const emptyExternalAlertmanagersResponse: ExternalAlertmanagersResponse = {
@@ -24,7 +25,7 @@ export const emptyExternalAlertmanagersResponse: ExternalAlertmanagersResponse =
   },
 };
 export function mockAlertmanagersResponse(server: SetupServer, response: ExternalAlertmanagersResponse) {
-  server.use(rest.get('/api/v1/ngalert/alertmanagers', (req, res, ctx) => res(ctx.status(200), ctx.json(response))));
+  server.use(http.get('/api/v1/ngalert/alertmanagers', () => HttpResponse.json(response)));
 }
 
 export function mockAlertmanagerConfigResponse(
@@ -33,8 +34,8 @@ export function mockAlertmanagerConfigResponse(
   response: AlertManagerCortexConfig
 ) {
   server.use(
-    rest.get(`/api/alertmanager/${getDatasourceAPIUid(alertManagerSourceName)}/config/api/v1/alerts`, (req, res, ctx) =>
-      res(ctx.status(200), ctx.json(response))
+    http.get(`/api/alertmanager/${getDatasourceAPIUid(alertManagerSourceName)}/config/api/v1/alerts`, () =>
+      HttpResponse.json(response)
     )
   );
 }
diff --git a/public/app/features/alerting/unified/mocks/grafanaApi.ts b/public/app/features/alerting/unified/mocks/grafanaApi.ts
deleted file mode 100644
index 1062de6749fd6..0000000000000
--- a/public/app/features/alerting/unified/mocks/grafanaApi.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { rest } from 'msw';
-import { SetupServer } from 'msw/node';
-
-import { DashboardSearchItem } from '../../../search/types';
-
-export function mockSearchApiResponse(server: SetupServer, searchResult: DashboardSearchItem[]) {
-  server.use(rest.get('/api/search', (req, res, ctx) => res(ctx.json<DashboardSearchItem[]>(searchResult))));
-}
diff --git a/public/app/features/alerting/unified/mocks/plugins.ts b/public/app/features/alerting/unified/mocks/plugins.ts
index eb8a2b5eab72b..df657222de971 100644
--- a/public/app/features/alerting/unified/mocks/plugins.ts
+++ b/public/app/features/alerting/unified/mocks/plugins.ts
@@ -1,4 +1,5 @@
-import { rest } from 'msw';
+import 'whatwg-fetch';
+import { http, HttpResponse } from 'msw';
 import { SetupServer } from 'msw/lib/node';
 
 import { PluginMeta } from '@grafana/data';
@@ -7,8 +8,11 @@ import { SupportedPlugin } from '../types/pluginBridges';
 
 export function mockPluginSettings(server: SetupServer, plugin: SupportedPlugin, response?: PluginMeta) {
   server.use(
-    rest.get(`/api/plugins/${plugin}/settings`, (_req, res, ctx) => {
-      return response ? res(ctx.status(200), ctx.json(response)) : res(ctx.status(404));
+    http.get(`/api/plugins/${plugin}/settings`, () => {
+      if (response) {
+        return HttpResponse.json(response);
+      }
+      return HttpResponse.json({}, { status: 404 });
     })
   );
 }
diff --git a/public/app/features/alerting/unified/mocks/rulerApi.ts b/public/app/features/alerting/unified/mocks/rulerApi.ts
index 71339a4cf7241..d689d02382f57 100644
--- a/public/app/features/alerting/unified/mocks/rulerApi.ts
+++ b/public/app/features/alerting/unified/mocks/rulerApi.ts
@@ -1,14 +1,11 @@
-import { rest } from 'msw';
+import 'whatwg-fetch';
+import { http, HttpResponse } from 'msw';
 import { SetupServer } from 'msw/node';
 
 import { RulerRuleGroupDTO, RulerRulesConfigDTO } from '../../../../types/unified-alerting-dto';
 
 export function mockRulerRulesApiResponse(server: SetupServer, rulesSourceName: string, response: RulerRulesConfigDTO) {
-  server.use(
-    rest.get(`/api/ruler/${rulesSourceName}/api/v1/rules`, (req, res, ctx) =>
-      res(ctx.json<RulerRulesConfigDTO>(response))
-    )
-  );
+  server.use(http.get(`/api/ruler/${rulesSourceName}/api/v1/rules`, () => HttpResponse.json(response)));
 }
 
 export function mockRulerRulesGroupApiResponse(
@@ -19,8 +16,6 @@ export function mockRulerRulesGroupApiResponse(
   response: RulerRuleGroupDTO
 ) {
   server.use(
-    rest.get(`/api/ruler/${rulesSourceName}/api/v1/rules/${namespace}/${group}`, (req, res, ctx) =>
-      res(ctx.json(response))
-    )
+    http.get(`/api/ruler/${rulesSourceName}/api/v1/rules/${namespace}/${group}`, () => HttpResponse.json(response))
   );
 }
diff --git a/public/app/features/alerting/unified/mocks/templatesApi.ts b/public/app/features/alerting/unified/mocks/templatesApi.ts
index cb6d18d4cf38c..d0e591fb3c544 100644
--- a/public/app/features/alerting/unified/mocks/templatesApi.ts
+++ b/public/app/features/alerting/unified/mocks/templatesApi.ts
@@ -1,12 +1,13 @@
-import { rest } from 'msw';
+import 'whatwg-fetch';
+import { http, HttpResponse } from 'msw';
 import { SetupServer } from 'msw/node';
 
 import { previewTemplateUrl, TemplatePreviewResponse } from '../api/templateApi';
 
 export function mockPreviewTemplateResponse(server: SetupServer, response: TemplatePreviewResponse) {
-  server.use(rest.post(previewTemplateUrl, (req, res, ctx) => res(ctx.status(200), ctx.json(response))));
+  server.use(http.post(previewTemplateUrl, () => HttpResponse.json(response)));
 }
 
 export function mockPreviewTemplateResponseRejected(server: SetupServer) {
-  server.use(rest.post(previewTemplateUrl, (req, res, ctx) => res(ctx.status(500), ctx.json('error'))));
+  server.use(http.post(previewTemplateUrl, () => HttpResponse.json('error', { status: 500 })));
 }
diff --git a/public/app/features/alerting/unified/routeGroupsMatcher.ts b/public/app/features/alerting/unified/routeGroupsMatcher.ts
index 9b5dd3c8c6f26..bce330c7f786e 100644
--- a/public/app/features/alerting/unified/routeGroupsMatcher.ts
+++ b/public/app/features/alerting/unified/routeGroupsMatcher.ts
@@ -6,11 +6,20 @@ import {
   findMatchingAlertGroups,
   findMatchingRoutes,
   normalizeRoute,
+  unquoteRouteMatchers,
 } from './utils/notification-policies';
 
+export interface MatchOptions {
+  unquoteMatchers?: boolean;
+}
+
 export const routeGroupsMatcher = {
-  getRouteGroupsMap(rootRoute: RouteWithID, groups: AlertmanagerGroup[]): Map<string, AlertmanagerGroup[]> {
-    const normalizedRootRoute = normalizeRoute(rootRoute);
+  getRouteGroupsMap(
+    rootRoute: RouteWithID,
+    groups: AlertmanagerGroup[],
+    options?: MatchOptions
+  ): Map<string, AlertmanagerGroup[]> {
+    const normalizedRootRoute = getNormalizedRoute(rootRoute, options);
 
     function addRouteGroups(route: RouteWithID, acc: Map<string, AlertmanagerGroup[]>) {
       const routeGroups = findMatchingAlertGroups(normalizedRootRoute, route, groups);
@@ -25,24 +34,24 @@ export const routeGroupsMatcher = {
     return routeGroupsMap;
   },
 
-  matchInstancesToRoute(routeTree: RouteWithID, instancesToMatch: Labels[]): Map<string, AlertInstanceMatch[]> {
+  matchInstancesToRoute(
+    routeTree: RouteWithID,
+    instancesToMatch: Labels[],
+    options?: MatchOptions
+  ): Map<string, AlertInstanceMatch[]> {
     const result = new Map<string, AlertInstanceMatch[]>();
 
-    const normalizedRootRoute = normalizeRoute(routeTree);
+    const normalizedRootRoute = getNormalizedRoute(routeTree, options);
 
     instancesToMatch.forEach((instance) => {
       const matchingRoutes = findMatchingRoutes(normalizedRootRoute, Object.entries(instance));
-      matchingRoutes.forEach(({ route, details, labelsMatch }) => {
-        // Only to convert Label[] to Labels[] - needs better approach
-        const matchDetails = new Map(
-          Array.from(details.entries()).map(([matcher, labels]) => [matcher, Object.fromEntries(labels)])
-        );
-
+      matchingRoutes.forEach(({ route, labelsMatch }) => {
         const currentRoute = result.get(route.id);
+
         if (currentRoute) {
-          currentRoute.push({ instance, matchDetails, labelsMatch });
+          currentRoute.push({ instance, labelsMatch });
         } else {
-          result.set(route.id, [{ instance, matchDetails, labelsMatch }]);
+          result.set(route.id, [{ instance, labelsMatch }]);
         }
       });
     });
@@ -51,4 +60,8 @@ export const routeGroupsMatcher = {
   },
 };
 
+function getNormalizedRoute(route: RouteWithID, options?: MatchOptions): RouteWithID {
+  return options?.unquoteMatchers ? unquoteRouteMatchers(normalizeRoute(route)) : normalizeRoute(route);
+}
+
 export type RouteGroupsMatcher = typeof routeGroupsMatcher;
diff --git a/public/app/features/alerting/unified/search/rulesSearchParser.ts b/public/app/features/alerting/unified/search/rulesSearchParser.ts
index 8e9b6157180d4..d1d47f707e67b 100644
--- a/public/app/features/alerting/unified/search/rulesSearchParser.ts
+++ b/public/app/features/alerting/unified/search/rulesSearchParser.ts
@@ -20,6 +20,7 @@ export interface RulesFilter {
   dataSourceNames: string[];
   labels: string[];
   ruleHealth?: RuleHealth;
+  dashboardUid?: string;
 }
 
 const filterSupportedTerms: FilterSupportedTerm[] = [
@@ -31,6 +32,7 @@ const filterSupportedTerms: FilterSupportedTerm[] = [
   FilterSupportedTerm.state,
   FilterSupportedTerm.type,
   FilterSupportedTerm.health,
+  FilterSupportedTerm.dashboard,
 ];
 
 export enum RuleHealth {
@@ -53,6 +55,7 @@ export function getSearchFilterFromQuery(query: string): RulesFilter {
     [terms.StateToken]: (value) => (filter.ruleState = parseStateToken(value)),
     [terms.TypeToken]: (value) => (isPromRuleType(value) ? (filter.ruleType = value) : undefined),
     [terms.HealthToken]: (value) => (filter.ruleHealth = getRuleHealth(value)),
+    [terms.DashboardToken]: (value) => (filter.dashboardUid = value),
     [terms.FreeFormExpression]: (value) => filter.freeFormWords.push(value),
   };
 
@@ -92,6 +95,9 @@ export function applySearchFilterToQuery(query: string, filter: RulesFilter): st
   if (filter.labels) {
     filterStateArray.push(...filter.labels.map((l) => ({ type: terms.LabelToken, value: l })));
   }
+  if (filter.dashboardUid) {
+    filterStateArray.push({ type: terms.DashboardToken, value: filter.dashboardUid });
+  }
   if (filter.freeFormWords) {
     filterStateArray.push(...filter.freeFormWords.map((word) => ({ type: terms.FreeFormExpression, value: word })));
   }
diff --git a/public/app/features/alerting/unified/search/search.grammar b/public/app/features/alerting/unified/search/search.grammar
index a8d64b6dceb12..f1be544522016 100644
--- a/public/app/features/alerting/unified/search/search.grammar
+++ b/public/app/features/alerting/unified/search/search.grammar
@@ -1,6 +1,6 @@
 @top AlertRuleSearch { expression+ }
 
-@dialects { dataSourceFilter, nameSpaceFilter, labelFilter, groupFilter, ruleFilter, stateFilter, typeFilter, healthFilter }
+@dialects { dataSourceFilter, nameSpaceFilter, labelFilter, groupFilter, ruleFilter, stateFilter, typeFilter, healthFilter, dashboardFilter }
 
 expression { (FilterExpression | FreeFormExpression) expression }
 
@@ -14,7 +14,8 @@ FilterExpression {
  filter<RuleToken> |
  filter<StateToken> |
  filter<TypeToken> |
- filter<HealthToken>
+ filter<HealthToken> |
+ filter<DashboardToken>
 }
 
 filter<token> { token FilterValue }
@@ -41,6 +42,7 @@ filter<token> { token FilterValue }
   StateToken[@dialect=stateFilter] { filterToken<"state"> }
   TypeToken[@dialect=typeFilter] { filterToken<"type"> }
   HealthToken[@dialect=healthFilter] { filterToken<"health"> }
+  DashboardToken[@dialect=dashboardFilter] { filterToken<"dashboard"> }
 
   @precedence { DataSourceToken, word }
   @precedence { NameSpaceToken, word }
@@ -50,5 +52,6 @@ filter<token> { token FilterValue }
   @precedence { StateToken, word }
   @precedence { TypeToken, word }
   @precedence { HealthToken, word }
+  @precedence { DashboardToken, word }
 }
 
diff --git a/public/app/features/alerting/unified/search/search.js b/public/app/features/alerting/unified/search/search.js
index 8ee40ac1d7cb9..8dd0e3c309e38 100644
--- a/public/app/features/alerting/unified/search/search.js
+++ b/public/app/features/alerting/unified/search/search.js
@@ -3,28 +3,29 @@ import { LRParser } from '@lezer/lr';
 export const parser = LRParser.deserialize({
   version: 14,
   states:
-    "!vOQOPOOOrOPO'#ChOOOO'#Ch'#ChOQOPO'#ClOOOO'#Ci'#CiQQOPOOO!gOQO'#C^O!lOPO'#CjO!qOPO,59SOOOO,59W,59WOOOO-E6g-E6gOOOO,58x,58xOOOO,59U,59UOOOO-E6h-E6h",
+    "!vOQOPOOOuOPO'#CiOOOO'#Ci'#CiOQOPO'#CmOOOO'#Cj'#CjQQOPOOO!mOQO'#C^O!rOPO'#CkO!wOPO,59TOOOO,59X,59XOOOO-E6h-E6hOOOO,58x,58xOOOO,59V,59VOOOO-E6i-E6i",
   stateData:
-    '$O~ORUOTUOUUOVUOWUOXUOYUOZUOaPOcQO~ObVOR[XT[XU[XV[XW[XX[XY[XZ[Xa[Xc[X~OSZO~Oa[O~ObVOR[aT[aU[aV[aW[aX[aY[aZ[aa[ac[a~OR~T~U~V~W~Y~Z~RZYXWVUTa~',
-  goto: 'zaPPbPPPPPPPPPbgmPsVRORTQTORYTQWPR]WSSOTRXR',
+    '$[~ORUOTUOUUOVUOWUOXUOYUOZUO[UObPOdQO~OcVOR]XT]XU]XV]XW]XX]XY]XZ]X[]Xb]Xd]X~OSZO~Ob[O~OcVOR]aT]aU]aV]aW]aX]aY]aZ]a[]ab]ad]a~OR~T~U~V~W~Y~Z~[~R[ZYXWVUTb~',
+  goto: '{bPPcPPPPPPPPPPchnPtVRORTQTORYTQWPR]WSSOTRXR',
   nodeNames:
-    '⚠ AlertRuleSearch FilterExpression DataSourceToken FilterValue NameSpaceToken LabelToken GroupToken RuleToken StateToken TypeToken HealthToken FreeFormExpression',
-  maxTerm: 19,
+    '⚠ AlertRuleSearch FilterExpression DataSourceToken FilterValue NameSpaceToken LabelToken GroupToken RuleToken StateToken TypeToken HealthToken DashboardToken FreeFormExpression',
+  maxTerm: 20,
   skippedNodes: [0],
   repeatNodeCount: 2,
   tokenData:
-    "#$QRRqqr#Yrs&fst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]+h!]#W#Y#W#X,z#X#Z#Y#Z#[=b#[#]F[#]#`#Y#`#a!!n#a#b#Y#b#c!+h#c#f#Y#f#g!:f#g#h!Av#h#i!Jp#i$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR#acSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YQ$qcSQqr$lst$ltu$luv$lvw$lwx$lxy$lyz$lz{$l{|$l|!P$l!P!Q$l!Q![$l![!]$l!]$Ch$l$JU;'S$l;'S;(d%|;(d;(e&S<%lO$lQ&PP;=`<%l$lQ&VP;=`;NQ$lR&]P;=`<%l#YR&cP;=`;NQ#YR&irX^(spq(sqr(sst(stu(suv(svw(swx(sxy(syz(sz{(s{|(s|!P(s!P!Q(s!Q![(s![!](s!]#y(s#y#z(s#z$f(s$f$g(s$g#BY(s#BY#BZ(s#BZ$Ch(s$IS$I_(s$I|$JO(s$JT$JU(s$JU$KV(s$KV$KW(s$KW&FU(s&FU&FV(s&FV;'S(s;'S;(d+[;(d;(e+b<%lO(sR(vsX^(spq(sqr(srs+Tst(stu(suv(svw(swx(sxy(syz(sz{(s{|(s|!P(s!P!Q(s!Q![(s![!](s!]#y(s#y#z(s#z$f(s$f$g(s$g#BY(s#BY#BZ(s#BZ$Ch(s$IS$I_(s$I|$JO(s$JT$JU(s$JU$KV(s$KV$KW(s$KW&FU(s&FU&FV(s&FV;'S(s;'S;(d+[;(d;(e+b<%lO(sR+[OSQcPR+_P;=`<%l(sR+eP;=`;NQ(sR+ocSQbPqr$lst$ltu$luv$lvw$lwx$lxy$lyz$lz{$l{|$l|!P$l!P!Q$l!Q![$l![!]$l!]$Ch$l$JU;'S$l;'S;(d%|;(d;(e&S<%lO$lR-ReSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#T#Y#T#U.d#U$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR.keSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#h#Y#h#i/|#i$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR0TeSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#T#Y#T#U1f#U$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR1meSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#g#Y#g#h3O#h$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR3VeSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#c#Y#c#d4h#d$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR4oeSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#i#Y#i#j6Q#j$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR6XeSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#f#Y#f#g7j#g$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR7qeSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#V#Y#V#W9S#W$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR9ZeSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#X#Y#X#Y:l#Y$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR:scSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]<O!]$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR<VcSQRPqr$lst$ltu$luv$lvw$lwx$lxy$lyz$lz{$l{|$l|!P$l!P!Q$l!Q![$l![!]$l!]$Ch$l$JU;'S$l;'S;(d%|;(d;(e&S<%lO$lR=ieSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#f#Y#f#g>z#g$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR?ReSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#c#Y#c#d@d#d$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR@keSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#i#Y#i#jA|#j$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YRBTeSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#d#Y#d#eCf#e$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YRCmcSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]Dx!]$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YREPcSQVPqr$lst$ltu$luv$lvw$lwx$lxy$lyz$lz{$l{|$l|!P$l!P!Q$l!Q![$l![!]$l!]$Ch$l$JU;'S$l;'S;(d%|;(d;(e&S<%lO$lRFceSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#X#Y#X#YGt#Y$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YRG{eSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#T#Y#T#UI^#U$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YRIeeSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#`#Y#`#aJv#a$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YRJ}eSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#h#Y#h#iL`#i$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YRLgeSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#[#Y#[#]Mx#]$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YRNPcSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]! [!]$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR! ccSQZPqr$lst$ltu$luv$lvw$lwx$lxy$lyz$lz{$l{|$l|!P$l!P!Q$l!Q![$l![!]$l!]$Ch$l$JU;'S$l;'S;(d%|;(d;(e&S<%lO$lR!!ueSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#T#Y#T#U!$W#U$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!$_eSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#U#Y#U#V!%p#V$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!%weSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#X#Y#X#Y!'Y#Y$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!'aeSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#`#Y#`#a!(r#a$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!(ycSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]!*U!]$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!*]cSQUPqr$lst$ltu$luv$lvw$lwx$lxy$lyz$lz{$l{|$l|!P$l!P!Q$l!Q![$l![!]$l!]$Ch$l$JU;'S$l;'S;(d%|;(d;(e&S<%lO$lR!+oeSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#T#Y#T#U!-Q#U$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!-XeSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#a#Y#a#b!.j#b$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!.qeSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#X#Y#X#Y!0S#Y$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!0ZeSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#g#Y#g#h!1l#h$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!1seSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#d#Y#d#e!3U#e$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!3]eSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#T#Y#T#U!4n#U$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!4ueSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#V#Y#V#W!6W#W$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!6_eSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#X#Y#X#Y!7p#Y$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!7wcSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]!9S!]$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!9ZcSQTPqr$lst$ltu$luv$lvw$lwx$lxy$lyz$lz{$l{|$l|!P$l!P!Q$l!Q![$l![!]$l!]$Ch$l$JU;'S$l;'S;(d%|;(d;(e&S<%lO$lR!:meSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#i#Y#i#j!<O#j$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!<VeSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#`#Y#`#a!=h#a$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!=oeSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#X#Y#X#Y!?Q#Y$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!?XcSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]!@d!]$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!@kcSQWPqr$lst$ltu$luv$lvw$lwx$lxy$lyz$lz{$l{|$l|!P$l!P!Q$l!Q![$l![!]$l!]$Ch$l$JU;'S$l;'S;(d%|;(d;(e&S<%lO$lR!A}eSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#h#Y#h#i!C`#i$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!CgeSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#T#Y#T#U!Dx#U$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!EPeSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#h#Y#h#i!Fb#i$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!FieSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#X#Y#X#Y!Gz#Y$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!HRcSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]!I^!]$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!IecSQXPqr$lst$ltu$luv$lvw$lwx$lxy$lyz$lz{$l{|$l|!P$l!P!Q$l!Q![$l![!]$l!]$Ch$l$JU;'S$l;'S;(d%|;(d;(e&S<%lO$lR!JweSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#m#Y#m#n!LY#n$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!LaeSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#d#Y#d#e!Mr#e$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!MyeSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#X#Y#X#Y# [#Y$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR# ccSQaPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]#!n!]$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR#!ucSQYPqr$lst$ltu$luv$lvw$lwx$lxy$lyz$lz{$l{|$l|!P$l!P!Q$l!Q![$l![!]$l!]$Ch$l$JU;'S$l;'S;(d%|;(d;(e&S<%lO$l",
+    "#0PRRqqr#Yrs&fst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]+h!]#W#Y#W#X,z#X#Z#Y#Z#[Ia#[#]!$Z#]#`#Y#`#a!.m#a#b#Y#b#c!7g#c#f#Y#f#g!Fe#g#h!Mu#h#i#(o#i$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR#acSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YQ$qcSQqr$lst$ltu$luv$lvw$lwx$lxy$lyz$lz{$l{|$l|!P$l!P!Q$l!Q![$l![!]$l!]$Ch$l$JU;'S$l;'S;(d%|;(d;(e&S<%lO$lQ&PP;=`<%l$lQ&VP;=`;NQ$lR&]P;=`<%l#YR&cP;=`;NQ#YR&irX^(spq(sqr(sst(stu(suv(svw(swx(sxy(syz(sz{(s{|(s|!P(s!P!Q(s!Q![(s![!](s!]#y(s#y#z(s#z$f(s$f$g(s$g#BY(s#BY#BZ(s#BZ$Ch(s$IS$I_(s$I|$JO(s$JT$JU(s$JU$KV(s$KV$KW(s$KW&FU(s&FU&FV(s&FV;'S(s;'S;(d+[;(d;(e+b<%lO(sR(vsX^(spq(sqr(srs+Tst(stu(suv(svw(swx(sxy(syz(sz{(s{|(s|!P(s!P!Q(s!Q![(s![!](s!]#y(s#y#z(s#z$f(s$f$g(s$g#BY(s#BY#BZ(s#BZ$Ch(s$IS$I_(s$I|$JO(s$JT$JU(s$JU$KV(s$KV$KW(s$KW&FU(s&FU&FV(s&FV;'S(s;'S;(d+[;(d;(e+b<%lO(sR+[OSQdPR+_P;=`<%l(sR+eP;=`;NQ(sR+ocSQcPqr$lst$ltu$luv$lvw$lwx$lxy$lyz$lz{$l{|$l|!P$l!P!Q$l!Q![$l![!]$l!]$Ch$l$JU;'S$l;'S;(d%|;(d;(e&S<%lO$lR-ReSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#T#Y#T#U.d#U$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR.kfSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#g#Y#g#h0P#h#i;{#i$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR0WeSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#[#Y#[#]1i#]$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR1peSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#U#Y#U#V3R#V$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR3YeSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#c#Y#c#d4k#d$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR4reSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#T#Y#T#U6T#U$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR6[eSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#f#Y#f#g7m#g$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR7teSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#W#Y#W#X9V#X$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR9^cSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]:i!]$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR:pcSQ[Pqr$lst$ltu$luv$lvw$lwx$lxy$lyz$lz{$l{|$l|!P$l!P!Q$l!Q![$l![!]$l!]$Ch$l$JU;'S$l;'S;(d%|;(d;(e&S<%lO$lR<SeSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#T#Y#T#U=e#U$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR=leSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#g#Y#g#h>}#h$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR?UeSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#c#Y#c#d@g#d$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR@neSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#i#Y#i#jBP#j$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YRBWeSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#f#Y#f#gCi#g$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YRCpeSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#V#Y#V#WER#W$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YREYeSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#X#Y#X#YFk#Y$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YRFrcSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]G}!]$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YRHUcSQRPqr$lst$ltu$luv$lvw$lwx$lxy$lyz$lz{$l{|$l|!P$l!P!Q$l!Q![$l![!]$l!]$Ch$l$JU;'S$l;'S;(d%|;(d;(e&S<%lO$lRIheSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#f#Y#f#gJy#g$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YRKQeSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#c#Y#c#dLc#d$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YRLjeSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#i#Y#i#jM{#j$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YRNSeSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#d#Y#d#e! e#e$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR! lcSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]!!w!]$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!#OcSQVPqr$lst$ltu$luv$lvw$lwx$lxy$lyz$lz{$l{|$l|!P$l!P!Q$l!Q![$l![!]$l!]$Ch$l$JU;'S$l;'S;(d%|;(d;(e&S<%lO$lR!$beSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#X#Y#X#Y!%s#Y$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!%zeSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#T#Y#T#U!']#U$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!'deSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#`#Y#`#a!(u#a$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!(|eSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#h#Y#h#i!*_#i$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!*feSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#[#Y#[#]!+w#]$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!,OcSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]!-Z!]$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!-bcSQZPqr$lst$ltu$luv$lvw$lwx$lxy$lyz$lz{$l{|$l|!P$l!P!Q$l!Q![$l![!]$l!]$Ch$l$JU;'S$l;'S;(d%|;(d;(e&S<%lO$lR!.teSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#T#Y#T#U!0V#U$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!0^eSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#U#Y#U#V!1o#V$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!1veSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#X#Y#X#Y!3X#Y$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!3`eSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#`#Y#`#a!4q#a$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!4xcSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]!6T!]$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!6[cSQUPqr$lst$ltu$luv$lvw$lwx$lxy$lyz$lz{$l{|$l|!P$l!P!Q$l!Q![$l![!]$l!]$Ch$l$JU;'S$l;'S;(d%|;(d;(e&S<%lO$lR!7neSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#T#Y#T#U!9P#U$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!9WeSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#a#Y#a#b!:i#b$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!:peSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#X#Y#X#Y!<R#Y$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!<YeSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#g#Y#g#h!=k#h$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!=reSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#d#Y#d#e!?T#e$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!?[eSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#T#Y#T#U!@m#U$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!@teSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#V#Y#V#W!BV#W$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!B^eSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#X#Y#X#Y!Co#Y$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!CvcSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]!ER!]$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!EYcSQTPqr$lst$ltu$luv$lvw$lwx$lxy$lyz$lz{$l{|$l|!P$l!P!Q$l!Q![$l![!]$l!]$Ch$l$JU;'S$l;'S;(d%|;(d;(e&S<%lO$lR!FleSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#i#Y#i#j!G}#j$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!HUeSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#`#Y#`#a!Ig#a$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!IneSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#X#Y#X#Y!KP#Y$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!KWcSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]!Lc!]$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR!LjcSQWPqr$lst$ltu$luv$lvw$lwx$lxy$lyz$lz{$l{|$l|!P$l!P!Q$l!Q![$l![!]$l!]$Ch$l$JU;'S$l;'S;(d%|;(d;(e&S<%lO$lR!M|eSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#h#Y#h#i# _#i$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR# feSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#T#Y#T#U#!w#U$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR##OeSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#h#Y#h#i#$a#i$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR#$heSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#X#Y#X#Y#%y#Y$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR#&QcSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]#']!]$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR#'dcSQXPqr$lst$ltu$luv$lvw$lwx$lxy$lyz$lz{$l{|$l|!P$l!P!Q$l!Q![$l![!]$l!]$Ch$l$JU;'S$l;'S;(d%|;(d;(e&S<%lO$lR#(veSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#m#Y#m#n#*X#n$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR#*`eSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#d#Y#d#e#+q#e$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR#+xeSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]$l!]#X#Y#X#Y#-Z#Y$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR#-bcSQbPqr#Yst#Ytu#Yuv#Yvw#Ywx#Yxy#Yyz#Yz{#Y{|#Y|!P#Y!P!Q#Y!Q![#Y![!]#.m!]$Ch#Y$JU;'S#Y;'S;(d&Y;(d;(e&`<%lO#YR#.tcSQYPqr$lst$ltu$luv$lvw$lwx$lxy$lyz$lz{$l{|$l|!P$l!P!Q$l!Q![$l![!]$l!]$Ch$l$JU;'S$l;'S;(d%|;(d;(e&S<%lO$l",
   tokenizers: [0, 1],
   topRules: { AlertRuleSearch: [0, 1] },
   dialects: {
-    dataSourceFilter: 114,
-    nameSpaceFilter: 116,
-    labelFilter: 118,
-    groupFilter: 120,
-    ruleFilter: 122,
-    stateFilter: 66,
-    typeFilter: 124,
-    healthFilter: 126,
+    dataSourceFilter: 123,
+    nameSpaceFilter: 125,
+    labelFilter: 127,
+    groupFilter: 129,
+    ruleFilter: 131,
+    stateFilter: 72,
+    typeFilter: 133,
+    healthFilter: 135,
+    dashboardFilter: 137,
   },
-  tokenPrec: 128,
+  tokenPrec: 139,
 });
diff --git a/public/app/features/alerting/unified/search/search.terms.js b/public/app/features/alerting/unified/search/search.terms.js
index 0cbe635d4731b..c90c841a0853f 100644
--- a/public/app/features/alerting/unified/search/search.terms.js
+++ b/public/app/features/alerting/unified/search/search.terms.js
@@ -10,7 +10,8 @@ export const AlertRuleSearch = 1,
   StateToken = 9,
   TypeToken = 10,
   HealthToken = 11,
-  FreeFormExpression = 12,
+  DashboardToken = 12,
+  FreeFormExpression = 13,
   Dialect_dataSourceFilter = 0,
   Dialect_nameSpaceFilter = 1,
   Dialect_labelFilter = 2,
@@ -18,4 +19,5 @@ export const AlertRuleSearch = 1,
   Dialect_ruleFilter = 4,
   Dialect_stateFilter = 5,
   Dialect_typeFilter = 6,
-  Dialect_healthFilter = 7;
+  Dialect_healthFilter = 7,
+  Dialect_dashboardFilter = 8;
diff --git a/public/app/features/alerting/unified/search/searchParser.ts b/public/app/features/alerting/unified/search/searchParser.ts
index 75069558987b4..bf3e4be391ecb 100644
--- a/public/app/features/alerting/unified/search/searchParser.ts
+++ b/public/app/features/alerting/unified/search/searchParser.ts
@@ -13,6 +13,7 @@ const filterTokenToTypeMap: Record<number, string> = {
   [terms.StateToken]: 'state',
   [terms.TypeToken]: 'type',
   [terms.HealthToken]: 'health',
+  [terms.DashboardToken]: 'dashboard',
 };
 
 // This enum allows to configure parser behavior
@@ -27,6 +28,7 @@ export enum FilterSupportedTerm {
   state = 'stateFilter',
   type = 'typeFilter',
   health = 'healthFilter',
+  dashboard = 'dashboardFilter',
 }
 
 export type QueryFilterMapper = Record<number, (filter: string) => void>;
diff --git a/public/app/features/alerting/unified/state/AlertingQueryRunner.test.ts b/public/app/features/alerting/unified/state/AlertingQueryRunner.test.ts
index 5177063eaf045..a4dc6e5f57612 100644
--- a/public/app/features/alerting/unified/state/AlertingQueryRunner.test.ts
+++ b/public/app/features/alerting/unified/state/AlertingQueryRunner.test.ts
@@ -6,14 +6,14 @@ import { createFetchResponse } from 'test/helpers/createFetchResponse';
 import {
   DataFrame,
   DataFrameJSON,
+  DataSourceInstanceSettings,
   Field,
   FieldType,
-  getDefaultRelativeTimeRange,
   LoadingState,
+  getDefaultRelativeTimeRange,
   rangeUtil,
-  DataSourceInstanceSettings,
 } from '@grafana/data';
-import { DataSourceSrv, FetchResponse, DataSourceWithBackend } from '@grafana/runtime';
+import { DataSourceSrv, DataSourceWithBackend, FetchResponse } from '@grafana/runtime';
 import { DataQuery } from '@grafana/schema';
 import { BackendSrv } from 'app/core/services/backend_srv';
 import { AlertDataQuery, AlertQuery } from 'app/types/unified-alerting-dto';
@@ -37,7 +37,7 @@ describe('AlertingQueryRunner', () => {
     );
 
     const data = runner.get();
-    runner.run([createQuery('A'), createQuery('B')]);
+    runner.run([createQuery('A'), createQuery('B')], 'B');
 
     await expect(data.pipe(take(1))).toEmitValuesWith((values) => {
       const [data] = values;
@@ -94,7 +94,7 @@ describe('AlertingQueryRunner', () => {
     );
 
     const data = runner.get();
-    runner.run([createQuery('A'), createQuery('B')]);
+    runner.run([createQuery('A'), createQuery('B')], 'B');
 
     await expect(data.pipe(take(1))).toEmitValuesWith((values) => {
       const [data] = values;
@@ -126,7 +126,7 @@ describe('AlertingQueryRunner', () => {
     );
 
     const data = runner.get();
-    runner.run([createQuery('A'), createQuery('B')]);
+    runner.run([createQuery('A'), createQuery('B')], 'B');
 
     await expect(data.pipe(take(2))).toEmitValuesWith((values) => {
       const [loading, data] = values;
@@ -181,7 +181,7 @@ describe('AlertingQueryRunner', () => {
     );
 
     const data = runner.get();
-    runner.run([createQuery('A'), createQuery('B')]);
+    runner.run([createQuery('A'), createQuery('B')], 'B');
 
     await expect(data.pipe(take(1))).toEmitValuesWith((values) => {
       const [data] = values;
@@ -203,7 +203,7 @@ describe('AlertingQueryRunner', () => {
     );
 
     const data = runner.get();
-    runner.run([createQuery('A'), createQuery('B')]);
+    runner.run([createQuery('A'), createQuery('B')], 'B');
 
     await expect(data.pipe(take(1))).toEmitValuesWith((values) => {
       const [data] = values;
@@ -231,15 +231,18 @@ describe('AlertingQueryRunner', () => {
     );
 
     const data = runner.get();
-    runner.run([
-      createQuery('A', {
-        model: {
-          refId: 'A',
-          hide: true,
-        },
-      }),
-      createQuery('B'),
-    ]);
+    runner.run(
+      [
+        createQuery('A', {
+          model: {
+            refId: 'A',
+            hide: true,
+          },
+        }),
+        createQuery('B'),
+      ],
+      'B'
+    );
 
     await expect(data.pipe(take(1))).toEmitValuesWith((values) => {
       const [loading, _data] = values;
diff --git a/public/app/features/alerting/unified/state/AlertingQueryRunner.ts b/public/app/features/alerting/unified/state/AlertingQueryRunner.ts
index 45950f2520225..c92feb7c4a3b0 100644
--- a/public/app/features/alerting/unified/state/AlertingQueryRunner.ts
+++ b/public/app/features/alerting/unified/state/AlertingQueryRunner.ts
@@ -9,12 +9,12 @@ import {
   getDefaultTimeRange,
   LoadingState,
   PanelData,
+  preProcessPanelData,
   rangeUtil,
   TimeRange,
   withLoadingIndicator,
-  preProcessPanelData,
 } from '@grafana/data';
-import { FetchResponse, getDataSourceSrv, toDataQueryError, DataSourceWithBackend } from '@grafana/runtime';
+import { DataSourceWithBackend, FetchResponse, getDataSourceSrv, toDataQueryError } from '@grafana/runtime';
 import { BackendSrv, getBackendSrv } from 'app/core/services/backend_srv';
 import { isExpressionQuery } from 'app/features/expressions/guards';
 import { cancelNetworkRequestsOnUnsubscribe } from 'app/features/query/state/processing/canceler';
@@ -49,7 +49,7 @@ export class AlertingQueryRunner {
     return this.subject.asObservable();
   }
 
-  async run(queries: AlertQuery[]) {
+  async run(queries: AlertQuery[], condition: string) {
     const empty = initialState(queries, LoadingState.Done);
     const queriesToExclude: string[] = [];
 
@@ -79,7 +79,7 @@ export class AlertingQueryRunner {
       return this.subject.next(empty);
     }
 
-    this.subscription = runRequest(this.backendSrv, queriesToRun).subscribe({
+    this.subscription = runRequest(this.backendSrv, queriesToRun, condition).subscribe({
       next: (dataPerQuery) => {
         const nextResult = applyChange(dataPerQuery, (refId, data) => {
           const previous = this.lastResult[refId];
@@ -131,10 +131,14 @@ export class AlertingQueryRunner {
   }
 }
 
-const runRequest = (backendSrv: BackendSrv, queries: AlertQuery[]): Observable<Record<string, PanelData>> => {
+const runRequest = (
+  backendSrv: BackendSrv,
+  queries: AlertQuery[],
+  condition: string
+): Observable<Record<string, PanelData>> => {
   const initial = initialState(queries, LoadingState.Loading);
   const request = {
-    data: { data: queries },
+    data: { data: queries, condition },
     url: '/api/v1/eval',
     method: 'POST',
     requestId: uuidv4(),
diff --git a/public/app/features/alerting/unified/state/AlertmanagerContext.test.tsx b/public/app/features/alerting/unified/state/AlertmanagerContext.test.tsx
index b1a00a5386e66..719dedfd30e40 100644
--- a/public/app/features/alerting/unified/state/AlertmanagerContext.test.tsx
+++ b/public/app/features/alerting/unified/state/AlertmanagerContext.test.tsx
@@ -29,7 +29,9 @@ const externalAmMimir: AlertManagerDataSource = {
 
 describe('useAlertmanager', () => {
   it('Should return undefined alert manager name when there are no available alert managers', () => {
-    jest.spyOn(useAlertManagerSources, 'useAlertManagersByPermission').mockReturnValueOnce([]);
+    jest
+      .spyOn(useAlertManagerSources, 'useAlertManagersByPermission')
+      .mockReturnValueOnce({ availableExternalDataSources: [], availableInternalDataSources: [] });
     const wrapper = ({ children }: React.PropsWithChildren) => (
       <MemoryRouter>
         <AlertmanagerProvider accessType="instance">{children}</AlertmanagerProvider>
@@ -41,7 +43,11 @@ describe('useAlertmanager', () => {
   });
 
   it('Should return Grafana AM when it is available and no alert manager query param exists', () => {
-    jest.spyOn(useAlertManagerSources, 'useAlertManagersByPermission').mockReturnValueOnce([grafanaAm]);
+    jest.spyOn(useAlertManagerSources, 'useAlertManagersByPermission').mockReturnValueOnce({
+      availableExternalDataSources: [],
+      availableInternalDataSources: [{ name: GRAFANA_RULES_SOURCE_NAME, imgUrl: '', hasConfigurationAPI: true }],
+    });
+
     const wrapper = ({ children }: React.PropsWithChildren) => (
       <MemoryRouter>
         <AlertmanagerProvider accessType="instance">{children}</AlertmanagerProvider>
@@ -53,7 +59,9 @@ describe('useAlertmanager', () => {
   });
 
   it('Should return alert manager included in the query param when available', () => {
-    jest.spyOn(useAlertManagerSources, 'useAlertManagersByPermission').mockReturnValueOnce([externalAmProm]);
+    jest
+      .spyOn(useAlertManagerSources, 'useAlertManagersByPermission')
+      .mockReturnValueOnce({ availableExternalDataSources: [externalAmProm], availableInternalDataSources: [] });
 
     const history = createMemoryHistory();
     history.push({ search: `alertmanager=${externalAmProm.name}` });
@@ -69,7 +77,9 @@ describe('useAlertmanager', () => {
   });
 
   it('Should return undefined if alert manager included in the query is not available', () => {
-    jest.spyOn(useAlertManagerSources, 'useAlertManagersByPermission').mockReturnValueOnce([]);
+    jest
+      .spyOn(useAlertManagerSources, 'useAlertManagersByPermission')
+      .mockReturnValueOnce({ availableExternalDataSources: [], availableInternalDataSources: [] });
 
     const history = createMemoryHistory();
     history.push({ search: `alertmanager=Not available external AM` });
@@ -85,7 +95,9 @@ describe('useAlertmanager', () => {
   });
 
   it('Should return alert manager from store if available and query is empty', () => {
-    jest.spyOn(useAlertManagerSources, 'useAlertManagersByPermission').mockReturnValueOnce([externalAmProm]);
+    jest
+      .spyOn(useAlertManagerSources, 'useAlertManagersByPermission')
+      .mockReturnValueOnce({ availableExternalDataSources: [externalAmProm], availableInternalDataSources: [] });
 
     const wrapper = ({ children }: React.PropsWithChildren) => (
       <MemoryRouter>
@@ -100,9 +112,10 @@ describe('useAlertmanager', () => {
   });
 
   it('Should prioritize the alert manager from query over store', () => {
-    jest
-      .spyOn(useAlertManagerSources, 'useAlertManagersByPermission')
-      .mockReturnValueOnce([externalAmProm, externalAmMimir]);
+    jest.spyOn(useAlertManagerSources, 'useAlertManagersByPermission').mockReturnValueOnce({
+      availableExternalDataSources: [externalAmProm, externalAmMimir],
+      availableInternalDataSources: [],
+    });
 
     const history = createMemoryHistory();
     history.push({ search: `alertmanager=${externalAmProm.name}` });
diff --git a/public/app/features/alerting/unified/state/AlertmanagerContext.tsx b/public/app/features/alerting/unified/state/AlertmanagerContext.tsx
index 57c68ccfe62b6..f2d6e774ce8d8 100644
--- a/public/app/features/alerting/unified/state/AlertmanagerContext.tsx
+++ b/public/app/features/alerting/unified/state/AlertmanagerContext.tsx
@@ -1,15 +1,15 @@
 import * as React from 'react';
 
-import { useQueryParams } from 'app/core/hooks/useQueryParams';
 import store from 'app/core/store';
 import { AlertManagerDataSourceJsonData, AlertManagerImplementation } from 'app/plugins/datasource/alertmanager/types';
 
 import { useAlertManagersByPermission } from '../hooks/useAlertManagerSources';
+import { useURLSearchParams } from '../hooks/useURLSearchParams';
 import { ALERTMANAGER_NAME_LOCAL_STORAGE_KEY, ALERTMANAGER_NAME_QUERY_KEY } from '../utils/constants';
 import {
   AlertManagerDataSource,
-  getAlertmanagerDataSourceByName,
   GRAFANA_RULES_SOURCE_NAME,
+  getAlertmanagerDataSourceByName,
 } from '../utils/datasource';
 
 interface Context {
@@ -30,8 +30,11 @@ interface Props extends React.PropsWithChildren {
 }
 
 const AlertmanagerProvider = ({ children, accessType, alertmanagerSourceName }: Props) => {
-  const [queryParams, updateQueryParams] = useQueryParams();
-  const availableAlertManagers = useAlertManagersByPermission(accessType);
+  const [queryParams, updateQueryParams] = useURLSearchParams();
+  const allAvailableAlertManagers = useAlertManagersByPermission(accessType);
+  const availableAlertManagers = allAvailableAlertManagers.availableInternalDataSources.concat(
+    allAvailableAlertManagers.availableExternalDataSources
+  );
 
   const updateSelectedAlertmanager = React.useCallback(
     (selectedAlertManager: string) => {
@@ -41,7 +44,7 @@ const AlertmanagerProvider = ({ children, accessType, alertmanagerSourceName }:
 
       if (selectedAlertManager === GRAFANA_RULES_SOURCE_NAME) {
         store.delete(ALERTMANAGER_NAME_LOCAL_STORAGE_KEY);
-        updateQueryParams({ [ALERTMANAGER_NAME_QUERY_KEY]: null });
+        updateQueryParams({ [ALERTMANAGER_NAME_QUERY_KEY]: undefined });
       } else {
         store.set(ALERTMANAGER_NAME_LOCAL_STORAGE_KEY, selectedAlertManager);
         updateQueryParams({ [ALERTMANAGER_NAME_QUERY_KEY]: selectedAlertManager });
@@ -50,10 +53,19 @@ const AlertmanagerProvider = ({ children, accessType, alertmanagerSourceName }:
     [availableAlertManagers, updateQueryParams]
   );
 
-  const sourceFromQuery = queryParams[ALERTMANAGER_NAME_QUERY_KEY];
+  const sourceFromQuery = queryParams.get(ALERTMANAGER_NAME_QUERY_KEY);
   const sourceFromStore = store.get(ALERTMANAGER_NAME_LOCAL_STORAGE_KEY);
   const defaultSource = GRAFANA_RULES_SOURCE_NAME;
 
+  // This overrides AM in the store to be in sync with the one in the URL
+  // When the user uses multiple tabs with different AMs, the store will be changing all the time
+  // It's safest to always use URLs with alertmanager query param
+  React.useEffect(() => {
+    if (sourceFromQuery && sourceFromQuery !== sourceFromStore) {
+      store.set(ALERTMANAGER_NAME_LOCAL_STORAGE_KEY, sourceFromQuery);
+    }
+  }, [sourceFromQuery, sourceFromStore]);
+
   // queryParam > localStorage > default
   const desiredAlertmanager = alertmanagerSourceName ?? sourceFromQuery ?? sourceFromStore ?? defaultSource;
   const selectedAlertmanager = isAlertManagerAvailable(availableAlertManagers, desiredAlertmanager)
diff --git a/public/app/features/alerting/unified/state/actions.ts b/public/app/features/alerting/unified/state/actions.ts
index f6cb7a5e0a371..377877f84a448 100644
--- a/public/app/features/alerting/unified/state/actions.ts
+++ b/public/app/features/alerting/unified/state/actions.ts
@@ -2,6 +2,7 @@ import { AsyncThunk, createAsyncThunk } from '@reduxjs/toolkit';
 import { isEmpty } from 'lodash';
 
 import { locationService } from '@grafana/runtime';
+import { logMeasurement } from '@grafana/runtime/src/utils/logging';
 import {
   AlertmanagerAlert,
   AlertManagerCortexConfig,
@@ -36,6 +37,8 @@ import { backendSrv } from '../../../../core/services/backend_srv';
 import {
   logInfo,
   LogMessages,
+  trackSwitchToPoliciesRouting,
+  trackSwitchToSimplifiedRouting,
   withPerformanceLogging,
   withPromRulesMetadataLogging,
   withRulerRulesMetadataLogging,
@@ -65,6 +68,7 @@ import {
   FetchRulerRulesFilter,
   setRulerRuleGroup,
 } from '../api/ruler';
+import { encodeGrafanaNamespace } from '../components/expressions/util';
 import { RuleFormType, RuleFormValues } from '../types/rule-form';
 import { addDefaultsToAlertmanagerConfig, removeMuteTimingFromRoute } from '../utils/alertmanager';
 import {
@@ -77,7 +81,7 @@ import { makeAMLink } from '../utils/misc';
 import { AsyncRequestMapSlice, withAppEvents, withSerializedError } from '../utils/redux';
 import * as ruleId from '../utils/rule-id';
 import { getRulerClient } from '../utils/rulerClient';
-import { getAlertInfo, isRulerNotSupportedResponse } from '../utils/rules';
+import { getAlertInfo, isGrafanaRulerRule, isRulerNotSupportedResponse } from '../utils/rules';
 import { safeParseDurationstr } from '../utils/time';
 
 function getDataSourceConfig(getState: () => unknown, rulesSourceName: string) {
@@ -121,11 +125,10 @@ export const fetchPromRulesAction = createAsyncThunk(
   ): Promise<RuleNamespace[]> => {
     await thunkAPI.dispatch(fetchRulesSourceBuildInfoAction({ rulesSourceName }));
 
-    const fetchRulesWithLogging = withPromRulesMetadataLogging(
-      fetchRules,
-      `[${rulesSourceName}] Prometheus rules loaded`,
-      { dataSourceName: rulesSourceName, thunk: 'unifiedalerting/fetchPromRules' }
-    );
+    const fetchRulesWithLogging = withPromRulesMetadataLogging('unifiedalerting/fetchPromRules', fetchRules, {
+      dataSourceName: rulesSourceName,
+      thunk: 'unifiedalerting/fetchPromRules',
+    });
 
     return await withSerializedError(
       fetchRulesWithLogging(rulesSourceName, filter, limitAlerts, matcher, state, identifier)
@@ -163,8 +166,8 @@ export const fetchRulerRulesAction = createAsyncThunk(
     const rulerConfig = getDataSourceRulerConfig(getState, rulesSourceName);
 
     const fetchRulerRulesWithLogging = withRulerRulesMetadataLogging(
+      'unifiedalerting/fetchRulerRules',
       fetchRulerRules,
-      `[${rulesSourceName}] Ruler rules loaded`,
       {
         dataSourceName: rulesSourceName,
         thunk: 'unifiedalerting/fetchRulerRules',
@@ -189,7 +192,7 @@ export function fetchPromAndRulerRulesAction({
   limitAlerts?: number;
   matcher?: Matcher[];
   state?: string[];
-}): ThunkResult<void> {
+}): ThunkResult<Promise<void>> {
   return async (dispatch, getState) => {
     await dispatch(fetchRulesSourceBuildInfoAction({ rulesSourceName }));
     const dsConfig = getDataSourceConfig(getState, rulesSourceName);
@@ -204,14 +207,9 @@ export function fetchPromAndRulerRulesAction({
 export const fetchSilencesAction = createAsyncThunk(
   'unifiedalerting/fetchSilences',
   (alertManagerSourceName: string): Promise<Silence[]> => {
-    const fetchSilencesWithLogging = withPerformanceLogging(
-      fetchSilences,
-      `[${alertManagerSourceName}] Silences loaded`,
-      {
-        dataSourceName: alertManagerSourceName,
-        thunk: 'unifiedalerting/fetchSilences',
-      }
-    );
+    const fetchSilencesWithLogging = withPerformanceLogging('unifiedalerting/fetchSilences', fetchSilences, {
+      dataSourceName: alertManagerSourceName,
+    });
 
     return withSerializedError(fetchSilencesWithLogging(alertManagerSourceName));
   }
@@ -264,8 +262,8 @@ export const fetchRulesSourceBuildInfoAction = createAsyncThunk(
         const { id, name } = ds;
 
         const discoverFeaturesWithLogging = withPerformanceLogging(
+          'unifiedalerting/fetchPromBuildinfo',
           discoverFeatures,
-          `[${rulesSourceName}] Rules source features discovered`,
           {
             dataSourceName: rulesSourceName,
             thunk: 'unifiedalerting/fetchPromBuildinfo',
@@ -337,8 +335,8 @@ export function fetchAllPromAndRulerRulesAction(
       })
     );
 
-    logInfo('All Prom and Ruler rules loaded', {
-      loadTimeMs: (performance.now() - allStartLoadingTs).toFixed(0),
+    logMeasurement('unifiedalerting/fetchAllPromAndRulerRulesAction', {
+      loadTimeMs: performance.now() - allStartLoadingTs,
     });
   };
 }
@@ -456,6 +454,7 @@ export const saveRuleFormAction = createAsyncThunk(
             const rulerConfig = getDataSourceRulerConfig(thunkAPI.getState, GRAFANA_RULES_SOURCE_NAME);
             const rulerClient = getRulerClient(rulerConfig);
             identifier = await rulerClient.saveGrafanaRule(values, evaluateEvery, existing);
+            reportSwitchingRoutingType(values, existing);
             await thunkAPI.dispatch(fetchRulerRulesAction({ rulesSourceName: GRAFANA_RULES_SOURCE_NAME }));
           } else {
             throw new Error('Unexpected rule form type');
@@ -490,6 +489,24 @@ export const saveRuleFormAction = createAsyncThunk(
     )
 );
 
+function reportSwitchingRoutingType(values: RuleFormValues, existingRule: RuleWithLocation<RulerRuleDTO> | undefined) {
+  // track if the user switched from simplified routing to policies routing or vice versa
+  if (isGrafanaRulerRule(existingRule?.rule)) {
+    const ga = existingRule?.rule.grafana_alert;
+    const existingWasUsingSimplifiedRouting = Boolean(ga?.notification_settings?.receiver);
+    const newValuesUsesSimplifiedRouting = values.manualRouting;
+    const shouldTrackSwitchToSimplifiedRouting = !existingWasUsingSimplifiedRouting && newValuesUsesSimplifiedRouting;
+    const shouldTrackSwitchToPoliciesRouting = existingWasUsingSimplifiedRouting && !newValuesUsesSimplifiedRouting;
+
+    if (shouldTrackSwitchToSimplifiedRouting) {
+      trackSwitchToSimplifiedRouting();
+    }
+    if (shouldTrackSwitchToPoliciesRouting) {
+      trackSwitchToPoliciesRouting();
+    }
+  }
+}
+
 export const fetchGrafanaNotifiersAction = createAsyncThunk(
   'unifiedalerting/fetchGrafanaNotifiers',
   (): Promise<NotifierDTO[]> => withSerializedError(fetchNotifiers())
@@ -575,7 +592,7 @@ export const createOrUpdateSilenceAction = createAsyncThunk<void, UpdateSilenceA
         (async () => {
           await createOrUpdateSilence(alertManagerSourceName, payload);
           if (exitOnSave) {
-            locationService.push('/alerting/silences');
+            locationService.push(makeAMLink('/alerting/silences', alertManagerSourceName));
           }
         })()
       ),
@@ -692,10 +709,24 @@ export const deleteMuteTimingAction = (alertManagerSourceName: string, muteTimin
       alertmanagerApi.endpoints.getAlertmanagerConfiguration.initiate(alertManagerSourceName)
     ).unwrap();
 
-    const muteIntervals =
-      config?.alertmanager_config?.mute_time_intervals?.filter(({ name }) => name !== muteTimingName) ?? [];
+    const isGrafanaDatasource = alertManagerSourceName === GRAFANA_RULES_SOURCE_NAME;
+
+    const muteIntervalsFiltered =
+      (config?.alertmanager_config?.mute_time_intervals ?? [])?.filter(({ name }) => name !== muteTimingName) ?? [];
+    const timeIntervalsFiltered =
+      (config?.alertmanager_config?.time_intervals ?? [])?.filter(({ name }) => name !== muteTimingName) ?? [];
+
+    const time_intervals_without_mute_to_save = isGrafanaDatasource
+      ? {
+          mute_time_intervals: [...muteIntervalsFiltered, ...timeIntervalsFiltered],
+        }
+      : {
+          time_intervals: timeIntervalsFiltered,
+          mute_time_intervals: muteIntervalsFiltered,
+        };
 
     if (config) {
+      const { mute_time_intervals: _, ...configWithoutMuteTimings } = config?.alertmanager_config ?? {};
       withAppEvents(
         dispatch(
           updateAlertManagerConfigAction({
@@ -704,11 +735,11 @@ export const deleteMuteTimingAction = (alertManagerSourceName: string, muteTimin
             newConfig: {
               ...config,
               alertmanager_config: {
-                ...config.alertmanager_config,
+                ...configWithoutMuteTimings,
                 route: config.alertmanager_config.route
                   ? removeMuteTimingFromRoute(muteTimingName, config.alertmanager_config?.route)
                   : undefined,
-                mute_time_intervals: muteIntervals,
+                ...time_intervals_without_mute_to_save,
               },
             },
           })
@@ -745,6 +776,7 @@ interface UpdateNamespaceAndGroupOptions {
   newNamespaceName: string;
   newGroupName: string;
   groupInterval?: string;
+  folderUid?: string;
 }
 
 export const rulesInSameGroupHaveInvalidFor = (rules: RulerRuleDTO[], everyDuration: string) => {
@@ -768,13 +800,22 @@ export const updateLotexNamespaceAndGroupAction: AsyncThunk<
     return withAppEvents(
       withSerializedError(
         (async () => {
-          const { rulesSourceName, namespaceName, groupName, newNamespaceName, newGroupName, groupInterval } = options;
+          const {
+            rulesSourceName,
+            namespaceName,
+            groupName,
+            newNamespaceName,
+            newGroupName,
+            groupInterval,
+            folderUid,
+          } = options;
 
           const rulerConfig = getDataSourceRulerConfig(thunkAPI.getState, rulesSourceName);
           // fetch rules and perform sanity checks
           const rulesResult = await fetchRulerRules(rulerConfig);
 
           const existingNamespace = Boolean(rulesResult[namespaceName]);
+
           if (!existingNamespace) {
             throw new Error(`Namespace "${namespaceName}" not found.`);
           }
@@ -793,11 +834,14 @@ export const updateLotexNamespaceAndGroupAction: AsyncThunk<
           }
 
           const newNamespaceAlreadyExists = Boolean(rulesResult[newNamespaceName]);
-          if (newNamespaceName !== namespaceName && newNamespaceAlreadyExists) {
+          const isGrafanaManagedGroup = rulesSourceName === GRAFANA_RULES_SOURCE_NAME;
+          const originalNamespace = isGrafanaManagedGroup ? encodeGrafanaNamespace(namespaceName) : namespaceName;
+
+          if (newNamespaceName !== originalNamespace && newNamespaceAlreadyExists) {
             throw new Error(`Namespace "${newNamespaceName}" already exists.`);
           }
           if (
-            newNamespaceName === namespaceName &&
+            newNamespaceName === originalNamespace &&
             groupName === newGroupName &&
             groupInterval === existingGroup.interval
           ) {
@@ -819,8 +863,8 @@ export const updateLotexNamespaceAndGroupAction: AsyncThunk<
             }
           }
           // if renaming namespace - make new copies of all groups, then delete old namespace
-
-          if (newNamespaceName !== namespaceName) {
+          // this is only possible for cloud rules
+          if (newNamespaceName !== originalNamespace) {
             for (const group of rulesResult[namespaceName]) {
               await setRulerRuleGroup(
                 rulerConfig,
@@ -834,19 +878,19 @@ export const updateLotexNamespaceAndGroupAction: AsyncThunk<
                   : group
               );
             }
-            await deleteNamespace(rulerConfig, namespaceName);
+            await deleteNamespace(rulerConfig, folderUid || namespaceName);
 
             // if only modifying group...
           } else {
             // save updated group
-            await setRulerRuleGroup(rulerConfig, namespaceName, {
+            await setRulerRuleGroup(rulerConfig, folderUid || namespaceName, {
               ...existingGroup,
               name: newGroupName,
               interval: groupInterval,
             });
             // if group name was changed, delete old group
             if (newGroupName !== groupName) {
-              await deleteRulerRulesGroup(rulerConfig, namespaceName, groupName);
+              await deleteRulerRulesGroup(rulerConfig, folderUid || namespaceName, groupName);
             }
           }
 
@@ -867,6 +911,7 @@ interface UpdateRulesOrderOptions {
   namespaceName: string;
   groupName: string;
   newRules: RulerRuleDTO[];
+  folderUid: string;
 }
 
 export const updateRulesOrder = createAsyncThunk(
@@ -875,7 +920,7 @@ export const updateRulesOrder = createAsyncThunk(
     return withAppEvents(
       withSerializedError(
         (async () => {
-          const { rulesSourceName, namespaceName, groupName, newRules } = options;
+          const { rulesSourceName, namespaceName, groupName, newRules, folderUid } = options;
 
           const rulerConfig = getDataSourceRulerConfig(thunkAPI.getState, rulesSourceName);
           const rulesResult = await fetchRulerRules(rulerConfig);
@@ -891,7 +936,7 @@ export const updateRulesOrder = createAsyncThunk(
             rules: newRules,
           };
 
-          await setRulerRuleGroup(rulerConfig, namespaceName, payload);
+          await setRulerRuleGroup(rulerConfig, folderUid ?? namespaceName, payload);
 
           await thunkAPI.dispatch(fetchRulerRulesAction({ rulesSourceName }));
         })()
diff --git a/public/app/features/alerting/unified/types/mute-timing-form.ts b/public/app/features/alerting/unified/types/mute-timing-form.ts
index 241e29424f06b..c8e32e7cecd67 100644
--- a/public/app/features/alerting/unified/types/mute-timing-form.ts
+++ b/public/app/features/alerting/unified/types/mute-timing-form.ts
@@ -6,10 +6,11 @@ export type MuteTimingFields = {
 };
 
 export type MuteTimingIntervalFields = {
-  times: TimeRange[];
-  weekdays: string;
-  days_of_month: string;
-  months: string;
-  years: string;
+  times?: TimeRange[];
+  weekdays?: string;
+  days_of_month?: string;
+  months?: string;
+  years?: string;
   location?: string;
+  disable: boolean;
 };
diff --git a/public/app/features/alerting/unified/types/receiver-form.ts b/public/app/features/alerting/unified/types/receiver-form.ts
index f6c48ffae7263..d896f03f3f35a 100644
--- a/public/app/features/alerting/unified/types/receiver-form.ts
+++ b/public/app/features/alerting/unified/types/receiver-form.ts
@@ -6,7 +6,7 @@ import { CloudNotifierType, NotifierType } from 'app/types';
 import { ControlledField } from '../hooks/useControlledFieldArray';
 
 export interface ChannelValues {
-  __id: string; // used to correllate form values to original DTOs
+  __id: string; // used to correlate form values to original DTOs
   type: string;
   settings: Record<string, any>;
   secureSettings: Record<string, any>;
diff --git a/public/app/features/alerting/unified/types/rule-form.ts b/public/app/features/alerting/unified/types/rule-form.ts
index ca9aa17d0d09f..e4c787f7e219e 100644
--- a/public/app/features/alerting/unified/types/rule-form.ts
+++ b/public/app/features/alerting/unified/types/rule-form.ts
@@ -8,6 +8,22 @@ export enum RuleFormType {
   cloudRecording = 'cloud-recording',
 }
 
+export interface ContactPoint {
+  selectedContactPoint: string;
+  overrideGrouping: boolean;
+  groupBy: string[];
+  overrideTimings: boolean;
+  groupWaitValue: string;
+  groupIntervalValue: string;
+  repeatIntervalValue: string;
+  muteTimeIntervals: string[];
+}
+
+// key: name of alert manager, value ContactPoint
+export interface AlertManagerManualRouting {
+  [key: string]: ContactPoint;
+}
+
 export interface RuleFormValues {
   // common
   name: string;
@@ -27,6 +43,8 @@ export interface RuleFormValues {
   evaluateEvery: string;
   evaluateFor: string;
   isPaused?: boolean;
+  manualRouting: boolean; // if true contactPoints are used. This field will not be used for saving the rule
+  contactPoints?: AlertManagerManualRouting;
 
   // cortex / loki rules
   namespace: string;
diff --git a/public/app/features/alerting/unified/useRouteGroupsMatcher.test.tsx b/public/app/features/alerting/unified/useRouteGroupsMatcher.test.tsx
index f3f0578730894..54d1a89511dba 100644
--- a/public/app/features/alerting/unified/useRouteGroupsMatcher.test.tsx
+++ b/public/app/features/alerting/unified/useRouteGroupsMatcher.test.tsx
@@ -1,11 +1,7 @@
 import { renderHook } from '@testing-library/react';
 import * as comlink from 'comlink';
-import React from 'react';
-import { Features } from 'react-enable';
-import { FeatureDescription } from 'react-enable/dist/FeatureState';
 
 import { createWorker } from './createRouteGroupsMatcherWorker';
-import { AlertingFeature } from './features';
 import { useRouteGroupsMatcher } from './useRouteGroupsMatcher';
 
 jest.mock('./createRouteGroupsMatcherWorker');
@@ -20,24 +16,8 @@ beforeEach(() => {
 });
 
 describe('useRouteGroupsMatcher', () => {
-  it('should not load web worker if the feature flag is disabled', function () {
-    const featureFlag = getInstancePreviewFeature(false);
-
-    const { result } = renderHook(() => useRouteGroupsMatcher(), {
-      wrapper: ({ children }) => <Features features={[featureFlag]}>{children}</Features>,
-    });
-
-    expect(createWorkerMock).not.toHaveBeenCalled();
-    expect(wrapMock).not.toHaveBeenCalled();
-    expect(result.current.getRouteGroupsMap).toBeDefined();
-  });
-
   it('should load web worker if the feature flag is enabled', function () {
-    const featureFlag = getInstancePreviewFeature(true);
-
-    const { result } = renderHook(() => useRouteGroupsMatcher(), {
-      wrapper: ({ children }) => <Features features={[featureFlag]}>{children}</Features>,
-    });
+    const { result } = renderHook(() => useRouteGroupsMatcher());
 
     expect(createWorkerMock).toHaveBeenCalledTimes(1);
     expect(wrapMock).toHaveBeenCalledTimes(1);
@@ -45,14 +25,11 @@ describe('useRouteGroupsMatcher', () => {
   });
 
   it('getMatchedRouteGroups should throw error if loading worker failed', async function () {
-    const featureFlag = getInstancePreviewFeature(true);
     createWorkerMock.mockImplementation(() => {
       throw new DOMException('Failed to load worker');
     });
 
-    const { result } = renderHook(() => useRouteGroupsMatcher(), {
-      wrapper: ({ children }) => <Features features={[featureFlag]}>{children}</Features>,
-    });
+    const { result } = renderHook(() => useRouteGroupsMatcher());
 
     expect(createWorkerMock).toHaveBeenCalledTimes(1);
     expect(wrapMock).toHaveBeenCalledTimes(0); // When loading worker failed we shouldn't call wrap
@@ -61,10 +38,3 @@ describe('useRouteGroupsMatcher', () => {
     }).rejects.toThrowError(Error);
   });
 });
-
-function getInstancePreviewFeature(enabled: boolean): FeatureDescription {
-  return {
-    name: AlertingFeature.NotificationPoliciesV2MatchingInstances,
-    defaultValue: enabled,
-  };
-}
diff --git a/public/app/features/alerting/unified/useRouteGroupsMatcher.ts b/public/app/features/alerting/unified/useRouteGroupsMatcher.ts
index 36da039985133..421afe78bdee8 100644
--- a/public/app/features/alerting/unified/useRouteGroupsMatcher.ts
+++ b/public/app/features/alerting/unified/useRouteGroupsMatcher.ts
@@ -1,16 +1,12 @@
 import * as comlink from 'comlink';
 import { useCallback, useEffect } from 'react';
-import { useEnabled } from 'react-enable';
-
-import { logError } from '@grafana/runtime';
 
 import { AlertmanagerGroup, RouteWithID } from '../../../plugins/datasource/alertmanager/types';
 import { Labels } from '../../../types/unified-alerting-dto';
 
-import { logInfo } from './Analytics';
+import { logError, logInfo } from './Analytics';
 import { createWorker } from './createRouteGroupsMatcherWorker';
-import { AlertingFeature } from './features';
-import type { RouteGroupsMatcher } from './routeGroupsMatcher';
+import type { MatchOptions, RouteGroupsMatcher } from './routeGroupsMatcher';
 
 let routeMatcher: comlink.Remote<RouteGroupsMatcher> | undefined;
 
@@ -45,38 +41,25 @@ function loadWorker() {
   return { disposeWorker };
 }
 
-function validateWorker(
-  toggleEnabled: boolean,
-  matcher: typeof routeMatcher
-): asserts matcher is comlink.Remote<RouteGroupsMatcher> {
-  if (!toggleEnabled) {
-    throw new Error('Matching routes preview is disabled');
-  }
-
+function validateWorker(matcher: typeof routeMatcher): asserts matcher is comlink.Remote<RouteGroupsMatcher> {
   if (!routeMatcher) {
     throw new Error('Route Matcher has not been initialized');
   }
 }
 
 export function useRouteGroupsMatcher() {
-  const workerPreviewEnabled = useEnabled(AlertingFeature.NotificationPoliciesV2MatchingInstances);
-
   useEffect(() => {
-    if (workerPreviewEnabled) {
-      const { disposeWorker } = loadWorker();
-      return disposeWorker;
-    }
-
-    return () => null;
-  }, [workerPreviewEnabled]);
+    const { disposeWorker } = loadWorker();
+    return disposeWorker;
+  }, []);
 
   const getRouteGroupsMap = useCallback(
-    async (rootRoute: RouteWithID, alertGroups: AlertmanagerGroup[]) => {
-      validateWorker(workerPreviewEnabled, routeMatcher);
+    async (rootRoute: RouteWithID, alertGroups: AlertmanagerGroup[], options?: MatchOptions) => {
+      validateWorker(routeMatcher);
 
       const startTime = performance.now();
 
-      const result = await routeMatcher.getRouteGroupsMap(rootRoute, alertGroups);
+      const result = await routeMatcher.getRouteGroupsMap(rootRoute, alertGroups, options);
 
       const timeSpent = performance.now() - startTime;
 
@@ -89,16 +72,16 @@ export function useRouteGroupsMatcher() {
 
       return result;
     },
-    [workerPreviewEnabled]
+    []
   );
 
   const matchInstancesToRoute = useCallback(
-    async (rootRoute: RouteWithID, instancesToMatch: Labels[]) => {
-      validateWorker(workerPreviewEnabled, routeMatcher);
+    async (rootRoute: RouteWithID, instancesToMatch: Labels[], options?: MatchOptions) => {
+      validateWorker(routeMatcher);
 
       const startTime = performance.now();
 
-      const result = await routeMatcher.matchInstancesToRoute(rootRoute, instancesToMatch);
+      const result = await routeMatcher.matchInstancesToRoute(rootRoute, instancesToMatch, options);
 
       const timeSpent = performance.now() - startTime;
 
@@ -111,7 +94,7 @@ export function useRouteGroupsMatcher() {
 
       return result;
     },
-    [workerPreviewEnabled]
+    []
   );
 
   return { getRouteGroupsMap, matchInstancesToRoute };
diff --git a/public/app/features/alerting/unified/utils/__snapshots__/notification-policies.test.ts.snap b/public/app/features/alerting/unified/utils/__snapshots__/notification-policies.test.ts.snap
new file mode 100644
index 0000000000000..891dc98613326
--- /dev/null
+++ b/public/app/features/alerting/unified/utils/__snapshots__/notification-policies.test.ts.snap
@@ -0,0 +1,56 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`matchLabels should match with non-equal matchers 1`] = `
+Map {
+  [
+    "team",
+    "operations",
+  ] => {
+    "match": true,
+    "matcher": [
+      "team",
+      "=",
+      "operations",
+    ],
+  },
+}
+`;
+
+exports[`matchLabels should match with non-matching matchers 1`] = `
+Map {
+  [
+    "team",
+    "operations",
+  ] => {
+    "match": true,
+    "matcher": [
+      "team",
+      "=",
+      "operations",
+    ],
+  },
+}
+`;
+
+exports[`matchLabels should not match with a set of matchers 1`] = `
+Map {
+  [
+    "team",
+    "operations",
+  ] => {
+    "match": true,
+    "matcher": [
+      "team",
+      "=",
+      "operations",
+    ],
+  },
+  [
+    "foo",
+    "bar",
+  ] => {
+    "match": false,
+    "matcher": null,
+  },
+}
+`;
diff --git a/public/app/features/alerting/unified/utils/__snapshots__/routeTree.test.ts.snap b/public/app/features/alerting/unified/utils/__snapshots__/routeTree.test.ts.snap
new file mode 100644
index 0000000000000..bd1b648b40672
--- /dev/null
+++ b/public/app/features/alerting/unified/utils/__snapshots__/routeTree.test.ts.snap
@@ -0,0 +1,87 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`addRouteToReferenceRoute should be able to add above 1`] = `
+{
+  "id": "route-1",
+  "routes": [
+    {
+      "id": "route-2",
+    },
+    {
+      "continue": undefined,
+      "group_by": undefined,
+      "group_interval": undefined,
+      "group_wait": undefined,
+      "match": undefined,
+      "match_re": undefined,
+      "matchers": undefined,
+      "mute_time_intervals": undefined,
+      "object_matchers": undefined,
+      "receiver": "new-route",
+      "repeat_interval": undefined,
+      "routes": undefined,
+    },
+    {
+      "id": "route-3",
+    },
+  ],
+}
+`;
+
+exports[`addRouteToReferenceRoute should be able to add as child 1`] = `
+{
+  "id": "route-1",
+  "routes": [
+    {
+      "id": "route-2",
+    },
+    {
+      "id": "route-3",
+      "routes": [
+        {
+          "continue": undefined,
+          "group_by": undefined,
+          "group_interval": undefined,
+          "group_wait": undefined,
+          "match": undefined,
+          "match_re": undefined,
+          "matchers": undefined,
+          "mute_time_intervals": undefined,
+          "object_matchers": undefined,
+          "receiver": "new-route",
+          "repeat_interval": undefined,
+          "routes": undefined,
+        },
+      ],
+    },
+  ],
+}
+`;
+
+exports[`addRouteToReferenceRoute should be able to add below 1`] = `
+{
+  "id": "route-1",
+  "routes": [
+    {
+      "id": "route-2",
+    },
+    {
+      "id": "route-3",
+    },
+    {
+      "continue": undefined,
+      "group_by": undefined,
+      "group_interval": undefined,
+      "group_wait": undefined,
+      "match": undefined,
+      "match_re": undefined,
+      "matchers": undefined,
+      "mute_time_intervals": undefined,
+      "object_matchers": undefined,
+      "receiver": "new-route",
+      "repeat_interval": undefined,
+      "routes": undefined,
+    },
+  ],
+}
+`;
diff --git a/public/app/features/alerting/unified/utils/__snapshots__/rule-form.test.ts.snap b/public/app/features/alerting/unified/utils/__snapshots__/rule-form.test.ts.snap
index cde06160d0204..feca637e835a9 100644
--- a/public/app/features/alerting/unified/utils/__snapshots__/rule-form.test.ts.snap
+++ b/public/app/features/alerting/unified/utils/__snapshots__/rule-form.test.ts.snap
@@ -14,6 +14,7 @@ exports[`formValuesToRulerGrafanaRuleDTO should correctly convert rule form valu
     "exec_err_state": "Error",
     "is_paused": false,
     "no_data_state": "NoData",
+    "notification_settings": undefined,
     "title": "",
   },
   "labels": {
@@ -52,6 +53,7 @@ exports[`formValuesToRulerGrafanaRuleDTO should not save both instant and range
     "exec_err_state": "Error",
     "is_paused": false,
     "no_data_state": "NoData",
+    "notification_settings": undefined,
     "title": "",
   },
   "labels": {
diff --git a/public/app/features/alerting/unified/utils/access-control.ts b/public/app/features/alerting/unified/utils/access-control.ts
index 46ca371882ccb..ea3a1021aacab 100644
--- a/public/app/features/alerting/unified/utils/access-control.ts
+++ b/public/app/features/alerting/unified/utils/access-control.ts
@@ -124,9 +124,6 @@ export function getRulesAccess() {
     canEditRules: (rulesSourceName: string) => {
       return contextSrv.hasPermission(getRulesPermissions(rulesSourceName).update);
     },
-    canReadProvisioning:
-      contextSrv.hasPermission(provisioningPermissions.read) ||
-      contextSrv.hasPermission(provisioningPermissions.readSecrets),
   };
 }
 
diff --git a/public/app/features/alerting/unified/utils/alertmanager.ts b/public/app/features/alerting/unified/utils/alertmanager.ts
index 02488b99ad0ec..2738b70384400 100644
--- a/public/app/features/alerting/unified/utils/alertmanager.ts
+++ b/public/app/features/alerting/unified/utils/alertmanager.ts
@@ -15,7 +15,8 @@ import { Labels } from 'app/types/unified-alerting-dto';
 import { MatcherFieldValue } from '../types/silence-form';
 
 import { getAllDataSources } from './config';
-import { DataSourceType } from './datasource';
+import { DataSourceType, GRAFANA_RULES_SOURCE_NAME } from './datasource';
+import { MatcherFormatter, unquoteWithUnescape } from './matchers';
 
 export function addDefaultsToAlertmanagerConfig(config: AlertManagerCortexConfig): AlertManagerCortexConfig {
   // add default receiver if it does not exist
@@ -53,16 +54,8 @@ export function renameMuteTimings(newMuteTimingName: string, oldMuteTimingName:
   };
 }
 
-function isReceiverUsedInRoute(receiver: string, route: Route): boolean {
-  return (
-    (route.receiver === receiver || route.routes?.some((route) => isReceiverUsedInRoute(receiver, route))) ?? false
-  );
-}
-
-export function isReceiverUsed(receiver: string, config: AlertManagerCortexConfig): boolean {
-  return (
-    (config.alertmanager_config.route && isReceiverUsedInRoute(receiver, config.alertmanager_config.route)) ?? false
-  );
+export function unescapeObjectMatchers(matchers: ObjectMatcher[]): ObjectMatcher[] {
+  return matchers.map(([name, operator, value]) => [name, operator, unquoteWithUnescape(value)]);
 }
 
 export function matcherToOperator(matcher: Matcher): MatcherOperator {
@@ -189,6 +182,10 @@ export function combineMatcherStrings(...matcherStrings: string[]): string {
   return matchersToString(uniqueMatchers);
 }
 
+export function getAmMatcherFormatter(alertmanagerSourceName?: string): MatcherFormatter {
+  return alertmanagerSourceName === GRAFANA_RULES_SOURCE_NAME ? 'default' : 'unquote';
+}
+
 export function getAllAlertmanagerDataSources() {
   return getAllDataSources().filter((ds) => ds.type === DataSourceType.Alertmanager);
 }
diff --git a/public/app/features/alerting/unified/utils/amroutes.test.ts b/public/app/features/alerting/unified/utils/amroutes.test.ts
index 3c66e772d0b86..343e4587c4a04 100644
--- a/public/app/features/alerting/unified/utils/amroutes.test.ts
+++ b/public/app/features/alerting/unified/utils/amroutes.test.ts
@@ -1,8 +1,9 @@
-import { Route } from 'app/plugins/datasource/alertmanager/types';
+import { MatcherOperator, Route } from 'app/plugins/datasource/alertmanager/types';
 
 import { FormAmRoute } from '../types/amroutes';
 
 import { amRouteToFormAmRoute, emptyRoute, formAmRouteToAmRoute } from './amroutes';
+import { GRAFANA_RULES_SOURCE_NAME } from './datasource';
 
 const emptyAmRoute: Route = {
   receiver: '',
@@ -53,6 +54,84 @@ describe('formAmRouteToAmRoute', () => {
       expect(amRoute.group_by).toStrictEqual(['SHOULD BE SET']);
     });
   });
+
+  it('should quote and escape matcher values', () => {
+    // Arrange
+    const route: FormAmRoute = buildFormAmRoute({
+      id: '1',
+      object_matchers: [
+        { name: 'foo', operator: MatcherOperator.equal, value: 'bar' },
+        { name: 'foo', operator: MatcherOperator.equal, value: 'bar"baz' },
+        { name: 'foo', operator: MatcherOperator.equal, value: 'bar\\baz' },
+        { name: 'foo', operator: MatcherOperator.equal, value: '\\bar\\baz"\\' },
+      ],
+    });
+
+    // Act
+    const amRoute = formAmRouteToAmRoute('mimir-am', route, { id: 'root' });
+
+    // Assert
+    expect(amRoute.matchers).toStrictEqual([
+      '"foo"="bar"',
+      '"foo"="bar\\"baz"',
+      '"foo"="bar\\\\baz"',
+      '"foo"="\\\\bar\\\\baz\\"\\\\"',
+    ]);
+  });
+
+  it('should quote and escape matcher names', () => {
+    // Arrange
+    const route: FormAmRoute = buildFormAmRoute({
+      id: '1',
+      object_matchers: [
+        { name: 'foo', operator: MatcherOperator.equal, value: 'bar' },
+        { name: 'foo with spaces', operator: MatcherOperator.equal, value: 'bar' },
+        { name: 'foo\\slash', operator: MatcherOperator.equal, value: 'bar' },
+        { name: 'foo"quote', operator: MatcherOperator.equal, value: 'bar' },
+        { name: 'fo\\o', operator: MatcherOperator.equal, value: 'ba\\r' },
+      ],
+    });
+
+    // Act
+    const amRoute = formAmRouteToAmRoute('mimir-am', route, { id: 'root' });
+
+    // Assert
+    expect(amRoute.matchers).toStrictEqual([
+      '"foo"="bar"',
+      '"foo with spaces"="bar"',
+      '"foo\\\\slash"="bar"',
+      '"foo\\"quote"="bar"',
+      '"fo\\\\o"="ba\\\\r"',
+    ]);
+  });
+
+  it('should allow matchers with empty values for cloud AM', () => {
+    // Arrange
+    const route: FormAmRoute = buildFormAmRoute({
+      id: '1',
+      object_matchers: [{ name: 'foo', operator: MatcherOperator.equal, value: '' }],
+    });
+
+    // Act
+    const amRoute = formAmRouteToAmRoute('mimir-am', route, { id: 'root' });
+
+    // Assert
+    expect(amRoute.matchers).toStrictEqual(['"foo"=""']);
+  });
+
+  it('should allow matchers with empty values for Grafana AM', () => {
+    // Arrange
+    const route: FormAmRoute = buildFormAmRoute({
+      id: '1',
+      object_matchers: [{ name: 'foo', operator: MatcherOperator.equal, value: '' }],
+    });
+
+    // Act
+    const amRoute = formAmRouteToAmRoute(GRAFANA_RULES_SOURCE_NAME, route, { id: 'root' });
+
+    // Assert
+    expect(amRoute.object_matchers).toStrictEqual([['foo', MatcherOperator.equal, '']]);
+  });
 });
 
 describe('amRouteToFormAmRoute', () => {
@@ -101,4 +180,42 @@ describe('amRouteToFormAmRoute', () => {
       expect(formRoute.overrideGrouping).toBe(true);
     });
   });
+
+  it('should unquote and unescape matchers values', () => {
+    // Arrange
+    const amRoute = buildAmRoute({
+      matchers: ['foo=bar', 'foo="bar"', 'foo="bar"baz"', 'foo="bar\\\\baz"', 'foo="\\\\bar\\\\baz"\\\\"'],
+    });
+
+    // Act
+    const formRoute = amRouteToFormAmRoute(amRoute);
+
+    // Assert
+    expect(formRoute.object_matchers).toStrictEqual([
+      { name: 'foo', operator: MatcherOperator.equal, value: 'bar' },
+      { name: 'foo', operator: MatcherOperator.equal, value: 'bar' },
+      { name: 'foo', operator: MatcherOperator.equal, value: 'bar"baz' },
+      { name: 'foo', operator: MatcherOperator.equal, value: 'bar\\baz' },
+      { name: 'foo', operator: MatcherOperator.equal, value: '\\bar\\baz"\\' },
+    ]);
+  });
+
+  it('should unquote and unescape matcher names', () => {
+    // Arrange
+    const amRoute = buildAmRoute({
+      matchers: ['"foo"=bar', '"foo with spaces"=bar', '"foo\\\\slash"=bar', '"foo"quote"=bar', '"fo\\\\o"="ba\\\\r"'],
+    });
+
+    // Act
+    const formRoute = amRouteToFormAmRoute(amRoute);
+
+    // Assert
+    expect(formRoute.object_matchers).toStrictEqual([
+      { name: 'foo', operator: MatcherOperator.equal, value: 'bar' },
+      { name: 'foo with spaces', operator: MatcherOperator.equal, value: 'bar' },
+      { name: 'foo\\slash', operator: MatcherOperator.equal, value: 'bar' },
+      { name: 'foo"quote', operator: MatcherOperator.equal, value: 'bar' },
+      { name: 'fo\\o', operator: MatcherOperator.equal, value: 'ba\\r' },
+    ]);
+  });
 });
diff --git a/public/app/features/alerting/unified/utils/amroutes.ts b/public/app/features/alerting/unified/utils/amroutes.ts
index fdbb13b0c8e16..e8f875d14b3d1 100644
--- a/public/app/features/alerting/unified/utils/amroutes.ts
+++ b/public/app/features/alerting/unified/utils/amroutes.ts
@@ -8,7 +8,7 @@ import { MatcherFieldValue } from '../types/silence-form';
 
 import { matcherToMatcherField } from './alertmanager';
 import { GRAFANA_RULES_SOURCE_NAME } from './datasource';
-import { normalizeMatchers, parseMatcher } from './matchers';
+import { normalizeMatchers, parseMatcherToArray, quoteWithEscape, unquoteWithUnescape } from './matchers';
 import { findExistingRoute } from './routeTree';
 import { isValidPrometheusDuration, safeParseDurationstr } from './time';
 
@@ -44,8 +44,8 @@ export const defaultGroupBy = ['grafana_folder', 'alertname'];
 
 // Common route group_by options for multiselect drop-down
 export const commonGroupByOptions = [
-  { label: 'grafana_folder', value: 'grafana_folder' },
-  { label: 'alertname', value: 'alertname' },
+  { label: 'grafana_folder', value: 'grafana_folder', isFixed: true },
+  { label: 'alertname', value: 'alertname', isFixed: true },
   { label: 'Disable (...)', value: '...' },
 ];
 
@@ -94,7 +94,18 @@ export const amRouteToFormAmRoute = (route: RouteWithID | Route | undefined): Fo
 
   const objectMatchers =
     route.object_matchers?.map((matcher) => ({ name: matcher[0], operator: matcher[1], value: matcher[2] })) ?? [];
-  const matchers = route.matchers?.map((matcher) => matcherToMatcherField(parseMatcher(matcher))) ?? [];
+
+  const matchers =
+    route.matchers
+      ?.flatMap((matcher) => {
+        // parse the matcher to an array of matchers, PromQL-style matchers can contain more than one matcher (in a matcher, yes it's confusing)
+        return parseMatcherToArray(matcher).flatMap(matcherToMatcherField);
+      })
+      .map(({ name, operator, value }) => ({
+        name: unquoteWithUnescape(name),
+        operator,
+        value: unquoteWithUnescape(value),
+      })) ?? [];
 
   return {
     id,
@@ -149,8 +160,10 @@ export const formAmRouteToAmRoute = (
 
   const overrideRepeatInterval = overrideTimings && repeatIntervalValue;
   const repeat_interval = overrideRepeatInterval ? repeatIntervalValue : INHERIT_FROM_PARENT;
+
+  // Empty matcher values are valid. Such matchers require specified label to not exists
   const object_matchers: ObjectMatcher[] | undefined = formAmRoute.object_matchers
-    ?.filter((route) => route.name && route.value && route.operator)
+    ?.filter((route) => route.name && route.operator && route.value !== null && route.value !== undefined)
     .map(({ name, operator, value }) => [name, operator, value]);
 
   const routes = formAmRoute.routes?.map((subRoute) =>
@@ -176,7 +189,9 @@ export const formAmRouteToAmRoute = (
   // Grafana maintains a fork of AM to support all utf-8 characters in the "object_matchers" property values but this
   // does not exist in upstream AlertManager
   if (alertManagerSourceName !== GRAFANA_RULES_SOURCE_NAME) {
-    amRoute.matchers = formAmRoute.object_matchers?.map(({ name, operator, value }) => `${name}${operator}${value}`);
+    amRoute.matchers = formAmRoute.object_matchers?.map(
+      ({ name, operator, value }) => `${quoteWithEscape(name)}${operator}${quoteWithEscape(value)}`
+    );
     amRoute.object_matchers = undefined;
   } else {
     amRoute.object_matchers = normalizeMatchers(amRoute);
@@ -198,10 +213,10 @@ export const stringToSelectableValue = (str: string): SelectableValue<string> =>
 export const stringsToSelectableValues = (arr: string[] | undefined): Array<SelectableValue<string>> =>
   (arr ?? []).map(stringToSelectableValue);
 
-export const mapSelectValueToString = (selectableValue: SelectableValue<string>): string | undefined => {
+export const mapSelectValueToString = (selectableValue: SelectableValue<string>): string | null => {
   // this allows us to deal with cleared values
   if (selectableValue === null) {
-    return undefined;
+    return null;
   }
 
   if (!selectableValue) {
@@ -221,8 +236,8 @@ export const mapMultiSelectValueToStrings = (
   return selectableValuesToStrings(selectableValues);
 };
 
-export function promDurationValidator(duration: string) {
-  if (duration.length === 0) {
+export function promDurationValidator(duration?: string) {
+  if (!duration || duration.length === 0) {
     return true;
   }
 
@@ -237,7 +252,7 @@ export const objectMatchersToString = (matchers: ObjectMatcher[]): string[] => {
   });
 };
 
-export const repeatIntervalValidator = (repeatInterval: string, groupInterval: string) => {
+export const repeatIntervalValidator = (repeatInterval: string, groupInterval = '') => {
   if (repeatInterval.length === 0) {
     return true;
   }
diff --git a/public/app/features/alerting/unified/utils/cloud-alertmanager-notifier-types.ts b/public/app/features/alerting/unified/utils/cloud-alertmanager-notifier-types.ts
index df76463fb5acd..9c45bac800d5f 100644
--- a/public/app/features/alerting/unified/utils/cloud-alertmanager-notifier-types.ts
+++ b/public/app/features/alerting/unified/utils/cloud-alertmanager-notifier-types.ts
@@ -175,6 +175,16 @@ export const cloudNotifierTypes: Array<NotifierDTO<CloudNotifierType>> = [
           placeholder: '1h',
         }
       ),
+      option(
+        'ttl',
+        'TTL',
+        'The number of seconds before a message expires and is deleted automatically. Examples: 10s, 5m30s, 8h.',
+        {
+          // allow 30s, 4m30s, etc
+          validationRule: '^(\\d+[s|m|h])+$|^$',
+          element: 'input',
+        }
+      ),
       httpConfigOption,
     ],
   },
@@ -310,7 +320,15 @@ export const cloudNotifierTypes: Array<NotifierDTO<CloudNotifierType>> = [
         'max_alerts',
         'Max alerts',
         'The maximum number of alerts to include in a single webhook message. Alerts above this threshold are truncated. When leaving this at its default value of 0, all alerts are included.',
-        { placeholder: '0', validationRule: '(^\\d+$|^$)' }
+        {
+          placeholder: '0',
+          inputType: 'number',
+          validationRule: '(^\\d+$|^$)',
+          setValueAs: (value) => {
+            const integer = Number(value);
+            return Number.isFinite(integer) ? integer : 0;
+          },
+        }
       ),
       httpConfigOption,
     ],
diff --git a/public/app/features/alerting/unified/utils/config.ts b/public/app/features/alerting/unified/utils/config.ts
index 9472a8b543e03..d5f7817561d14 100644
--- a/public/app/features/alerting/unified/utils/config.ts
+++ b/public/app/features/alerting/unified/utils/config.ts
@@ -1,12 +1,9 @@
 import { DataSourceInstanceSettings, DataSourceJsonData } from '@grafana/data';
 import { config } from '@grafana/runtime';
-import { AlertManagerDataSourceJsonData } from 'app/plugins/datasource/alertmanager/types';
 
 import { isValidPrometheusDuration, parsePrometheusDuration } from './time';
 
-export function getAllDataSources(): Array<
-  DataSourceInstanceSettings<DataSourceJsonData | AlertManagerDataSourceJsonData>
-> {
+export function getAllDataSources(): Array<DataSourceInstanceSettings<DataSourceJsonData>> {
   return Object.values(config.datasources);
 }
 
diff --git a/public/app/features/alerting/utils/dataSourceFromExpression.ts b/public/app/features/alerting/unified/utils/dataSourceFromExpression.ts
similarity index 100%
rename from public/app/features/alerting/utils/dataSourceFromExpression.ts
rename to public/app/features/alerting/unified/utils/dataSourceFromExpression.ts
diff --git a/public/app/features/alerting/unified/utils/datasource.ts b/public/app/features/alerting/unified/utils/datasource.ts
index eb40660e36bc4..e2f70cb8586c6 100644
--- a/public/app/features/alerting/unified/utils/datasource.ts
+++ b/public/app/features/alerting/unified/utils/datasource.ts
@@ -1,10 +1,18 @@
-import { DataSourceInstanceSettings, DataSourceJsonData } from '@grafana/data';
+import { DataSourceInstanceSettings, DataSourceJsonData, DataSourceSettings } from '@grafana/data';
 import { getDataSourceSrv } from '@grafana/runtime';
 import { contextSrv } from 'app/core/services/context_srv';
-import { AlertManagerDataSourceJsonData, AlertManagerImplementation } from 'app/plugins/datasource/alertmanager/types';
+import {
+  AlertManagerDataSourceJsonData,
+  AlertManagerImplementation,
+  AlertmanagerChoice,
+} from 'app/plugins/datasource/alertmanager/types';
 import { AccessControlAction } from 'app/types';
 import { RulesSource } from 'app/types/unified-alerting';
 
+import { alertmanagerApi } from '../api/alertmanagerApi';
+import { useAlertManagersByPermission } from '../hooks/useAlertManagerSources';
+import { isAlertManagerWithConfigAPI } from '../state/AlertmanagerContext';
+
 import { instancesPermissions, notificationsPermissions } from './access-control';
 import { getAllDataSources } from './config';
 
@@ -21,6 +29,8 @@ export interface AlertManagerDataSource {
   name: string;
   imgUrl: string;
   meta?: DataSourceInstanceSettings['meta'];
+  hasConfigurationAPI?: boolean;
+  handleGrafanaManagedAlerts?: boolean;
 }
 
 export const RulesDataSourceTypes: string[] = [DataSourceType.Loki, DataSourceType.Prometheus];
@@ -41,12 +51,22 @@ export function getRulesDataSource(rulesSourceName: string) {
 
 export function getAlertManagerDataSources() {
   return getAllDataSources()
-    .filter(
-      (ds): ds is DataSourceInstanceSettings<AlertManagerDataSourceJsonData> => ds.type === DataSourceType.Alertmanager
-    )
+    .filter(isAlertmanagerDataSourceInstance)
     .sort((a, b) => a.name.localeCompare(b.name));
 }
 
+export function isAlertmanagerDataSourceInstance(
+  dataSource: DataSourceInstanceSettings
+): dataSource is DataSourceInstanceSettings<AlertManagerDataSourceJsonData> {
+  return dataSource.type === DataSourceType.Alertmanager;
+}
+
+export function isAlertmanagerDataSource(
+  dataSource: DataSourceSettings
+): dataSource is DataSourceSettings<AlertManagerDataSourceJsonData> {
+  return dataSource.type === DataSourceType.Alertmanager;
+}
+
 export function getExternalDsAlertManagers() {
   return getAlertManagerDataSources().filter((ds) => ds.jsonData.handleGrafanaManagedAlerts);
 }
@@ -54,6 +74,7 @@ export function getExternalDsAlertManagers() {
 const grafanaAlertManagerDataSource: AlertManagerDataSource = {
   name: GRAFANA_RULES_SOURCE_NAME,
   imgUrl: 'public/img/grafana_icon.svg',
+  hasConfigurationAPI: true,
 };
 
 // Used only as a fallback for Alert Group plugin
@@ -69,17 +90,53 @@ export function getAllAlertManagerDataSources(): AlertManagerDataSource[] {
   ];
 }
 
-export function getAlertManagerDataSourcesByPermission(
+/**
+ * This method gets all alert managers that the user has access, and then filter them first by being able to handle grafana managed alerts,
+ * and then depending on the current alerting configuration returns either only the internal alert managers, only the external alert managers, or both.
+ *
+ */
+export function useGetAlertManagerDataSourcesByPermissionAndConfig(
   permission: 'instance' | 'notification'
 ): AlertManagerDataSource[] {
-  const availableDataSources: AlertManagerDataSource[] = [];
+  const allAlertManagersByPermission = useAlertManagersByPermission(permission); // this hook memoizes the result of getAlertManagerDataSourcesByPermission
+
+  const externalDsAlertManagers: AlertManagerDataSource[] =
+    allAlertManagersByPermission.availableExternalDataSources.filter((ds) => ds.handleGrafanaManagedAlerts);
+  const internalDSAlertManagers = allAlertManagersByPermission.availableInternalDataSources;
+
+  //get current alerting configuration
+  const { currentData: amConfigStatus } = alertmanagerApi.useGetAlertmanagerChoiceStatusQuery(undefined);
+
+  const alertmanagerChoice = amConfigStatus?.alertmanagersChoice;
+
+  switch (alertmanagerChoice) {
+    case AlertmanagerChoice.Internal:
+      return internalDSAlertManagers;
+    case AlertmanagerChoice.External:
+      return externalDsAlertManagers;
+    default:
+      return [...internalDSAlertManagers, ...externalDsAlertManagers];
+  }
+}
+
+/**
+ * This method gets all alert managers that the user has access to and then split them into two groups:
+ * 1. Internal alert managers
+ * 2. External alert managers
+ */
+export function getAlertManagerDataSourcesByPermission(permission: 'instance' | 'notification'): {
+  availableInternalDataSources: AlertManagerDataSource[];
+  availableExternalDataSources: AlertManagerDataSource[];
+} {
+  const availableInternalDataSources: AlertManagerDataSource[] = [];
+  const availableExternalDataSources: AlertManagerDataSource[] = [];
   const permissions = {
     instance: instancesPermissions.read,
     notification: notificationsPermissions.read,
   };
 
   if (contextSrv.hasPermission(permissions[permission].grafana)) {
-    availableDataSources.push(grafanaAlertManagerDataSource);
+    availableInternalDataSources.push(grafanaAlertManagerDataSource);
   }
 
   if (contextSrv.hasPermission(permissions[permission].external)) {
@@ -88,11 +145,13 @@ export function getAlertManagerDataSourcesByPermission(
       displayName: ds.name,
       imgUrl: ds.meta.info.logos.small,
       meta: ds.meta,
+      hasConfigurationAPI: isAlertManagerWithConfigAPI(ds.jsonData),
+      handleGrafanaManagedAlerts: ds.jsonData.handleGrafanaManagedAlerts,
     }));
-    availableDataSources.push(...cloudSources);
+    availableExternalDataSources.push(...cloudSources);
   }
 
-  return availableDataSources;
+  return { availableInternalDataSources, availableExternalDataSources };
 }
 
 export function getLotexDataSourceByName(dataSourceName: string): DataSourceInstanceSettings {
@@ -156,10 +215,9 @@ export function getDataSourceByName(name: string): DataSourceInstanceSettings<Da
 }
 
 export function getAlertmanagerDataSourceByName(name: string) {
-  return getAllDataSources().find(
-    (source): source is DataSourceInstanceSettings<AlertManagerDataSourceJsonData> =>
-      source.name === name && source.type === 'alertmanager'
-  );
+  return getAllDataSources()
+    .filter(isAlertmanagerDataSourceInstance)
+    .find((source) => source.name === name);
 }
 
 export function getRulesSourceByName(name: string): RulesSource | undefined {
diff --git a/public/app/features/alerting/unified/utils/matchers.test.ts b/public/app/features/alerting/unified/utils/matchers.test.ts
index 43b3cbc2320b7..c10b03749b6e9 100644
--- a/public/app/features/alerting/unified/utils/matchers.test.ts
+++ b/public/app/features/alerting/unified/utils/matchers.test.ts
@@ -1,6 +1,16 @@
 import { MatcherOperator, Route } from '../../../../plugins/datasource/alertmanager/types';
 
-import { getMatcherQueryParams, normalizeMatchers, parseQueryParamMatchers } from './matchers';
+import {
+  getMatcherQueryParams,
+  isPromQLStyleMatcher,
+  matcherToObjectMatcher,
+  normalizeMatchers,
+  parseMatcher,
+  parsePromQLStyleMatcher,
+  parseQueryParamMatchers,
+  quoteWithEscape,
+  unquoteWithUnescape,
+} from './matchers';
 
 describe('Unified Alerting matchers', () => {
   describe('getMatcherQueryParams tests', () => {
@@ -38,6 +48,7 @@ describe('Unified Alerting matchers', () => {
 
   describe('normalizeMatchers', () => {
     const eq = MatcherOperator.equal;
+    const neq = MatcherOperator.notEqual;
 
     it('should work for object_matchers', () => {
       const route: Route = { object_matchers: [['foo', eq, 'bar']] };
@@ -59,5 +70,109 @@ describe('Unified Alerting matchers', () => {
         ['foo', MatcherOperator.equal, 'bar'],
       ]);
     });
+    it('should work with PromQL style matchers', () => {
+      const route: Route = {
+        matchers: ['{ foo=bar, baz!=qux }'],
+      };
+      expect(normalizeMatchers(route)).toEqual([
+        ['foo', eq, 'bar'],
+        ['baz', neq, 'qux'],
+      ]);
+    });
+  });
+});
+
+describe('parseMatcher', () => {
+  it('should be able to parse a simple matcher', () => {
+    expect(parseMatcher('foo=bar')).toStrictEqual({ name: 'foo', value: 'bar', isRegex: false, isEqual: true });
+  });
+  it('should throw when parsing PromQL-style matcher', () => {
+    expect(() => parseMatcher('{ foo=bar }')).toThrow();
+  });
+});
+
+describe('quoteWithEscape', () => {
+  const samples: string[][] = [
+    ['bar', '"bar"'],
+    ['b"ar"', '"b\\"ar\\""'],
+    ['b\\ar\\', '"b\\\\ar\\\\"'],
+    ['wa{r}ni$ng!', '"wa{r}ni$ng!"'],
+  ];
+
+  it.each(samples)('should escape and quote %s to %s', (raw, quoted) => {
+    const quotedMatcher = quoteWithEscape(raw);
+    expect(quotedMatcher).toBe(quoted);
+  });
+});
+
+describe('unquoteWithUnescape', () => {
+  const samples: string[][] = [
+    ['bar', 'bar'],
+    ['"bar"', 'bar'],
+    ['"b\\"ar\\""', 'b"ar"'],
+    ['"b\\\\ar\\\\"', 'b\\ar\\'],
+    ['"wa{r}ni$ng!"', 'wa{r}ni$ng!'],
+  ];
+
+  it.each(samples)('should unquote and unescape %s to %s', (quoted, raw) => {
+    const unquotedMatcher = unquoteWithUnescape(quoted);
+    expect(unquotedMatcher).toBe(raw);
+  });
+
+  it('should not unescape unquoted string', () => {
+    const unquoted = unquoteWithUnescape('un\\"quo\\\\ted');
+    expect(unquoted).toBe('un\\"quo\\\\ted');
+  });
+});
+
+describe('isPromQLStyleMatcher', () => {
+  it('should detect promQL style matcher', () => {
+    expect(isPromQLStyleMatcher('{ foo=bar }')).toBe(true);
+    expect(isPromQLStyleMatcher('foo=bar')).toBe(false);
+  });
+});
+
+describe('matcherToObjectMatcher', () => {
+  test.each([
+    { matcher: { name: 'foo', value: 'bar', isRegex: false, isEqual: true }, expected: ['foo', '=', 'bar'] },
+    { matcher: { name: 'foo', value: 'bar', isRegex: true, isEqual: true }, expected: ['foo', '=~', 'bar'] },
+    { matcher: { name: 'foo', value: 'bar', isRegex: true, isEqual: false }, expected: ['foo', '!~', 'bar'] },
+    { matcher: { name: 'foo', value: 'bar', isRegex: false, isEqual: false }, expected: ['foo', '!=', 'bar'] },
+  ])('.matcherToObjectMatcher($matcher)', ({ matcher, expected }) => {
+    expect(matcherToObjectMatcher(matcher)).toStrictEqual(expected);
+  });
+});
+
+describe('parsePromQLStyleMatcher', () => {
+  it('should decode PromQL style matcher', () => {
+    expect(parsePromQLStyleMatcher('{ foo="bar"}')).toStrictEqual([
+      {
+        name: 'foo',
+        value: 'bar',
+        isEqual: true,
+        isRegex: false,
+      },
+    ]);
+  });
+
+  it('should split only on comma when not used as a label key or value', () => {
+    expect(parsePromQLStyleMatcher('{ "key1,key2"="value1,value2"}')).toStrictEqual([
+      {
+        name: 'key1,key2',
+        value: 'value1,value2',
+        isEqual: true,
+        isRegex: false,
+      },
+    ]);
+  });
+
+  it('should remove empty matchers from array', () => {
+    expect(parsePromQLStyleMatcher('{ foo=bar, }')).toStrictEqual([
+      { name: 'foo', value: 'bar', isEqual: true, isRegex: false },
+    ]);
+  });
+
+  it('should throw when not using correct syntax', () => {
+    expect(() => parsePromQLStyleMatcher('foo="bar"')).toThrow();
   });
 });
diff --git a/public/app/features/alerting/unified/utils/matchers.ts b/public/app/features/alerting/unified/utils/matchers.ts
index acf751a11092e..2cac197f8d914 100644
--- a/public/app/features/alerting/unified/utils/matchers.ts
+++ b/public/app/features/alerting/unified/utils/matchers.ts
@@ -1,4 +1,11 @@
-import { uniqBy } from 'lodash';
+/**
+ * Functions in this file are used by the routeGroupsMatcher.worker.ts file.
+ * This is a web worker that matches active alert instances to a policy in the notification policy tree.
+ *
+ * Please keep the references to other files here to a minimum, if we reference a file that uses GrafanaBootData from `window` the worker will fail to load.
+ */
+
+import { compact, uniqBy } from 'lodash';
 
 import { Matcher, MatcherOperator, ObjectMatcher, Route } from 'app/plugins/datasource/alertmanager/types';
 
@@ -11,10 +18,18 @@ const matcherOperators = [
   MatcherOperator.equal,
 ];
 
+/**
+ * Parse a single matcher, examples:
+ *  foo="bar" => { name: foo, value: bar, isRegex: false, isEqual: true }
+ *  bar!~baz => { name: bar, value: baz, isRegex: true, isEqual: false }
+ */
 export function parseMatcher(matcher: string): Matcher {
   if (matcher.startsWith('{') && matcher.endsWith('}')) {
-    throw new Error(`PromQL matchers not supported yet, sorry! PromQL matcher found: ${matcher}`);
+    throw new Error(
+      'this function does not support PromQL-style matcher syntax, call parsePromQLStyleMatcher() instead'
+    );
   }
+
   const operatorsFound = matcherOperators
     .map((op): [MatcherOperator, number] => [op, matcher.indexOf(op)])
     .filter(([_, idx]) => idx > -1)
@@ -38,6 +53,34 @@ export function parseMatcher(matcher: string): Matcher {
   };
 }
 
+/**
+ * This function combines parseMatcher and parsePromQLStyleMatcher, always returning an array of Matcher[] regardless of input syntax
+ */
+export function parseMatcherToArray(matcher: string): Matcher[] {
+  return isPromQLStyleMatcher(matcher) ? parsePromQLStyleMatcher(matcher) : [parseMatcher(matcher)];
+}
+
+/**
+ * This function turns a PromQL-style matchers like { foo="bar", bar!=baz } in to an array of Matchers
+ */
+export function parsePromQLStyleMatcher(matcher: string): Matcher[] {
+  if (!isPromQLStyleMatcher(matcher)) {
+    throw new Error('not a PromQL style matcher');
+  }
+
+  // split by `,` but not when it's used as a label value
+  const commaUnlessQuoted = /,(?=(?:[^"]*"[^"]*")*[^"]*$)/;
+  const parts = matcher.replace(/^\{/, '').replace(/\}$/, '').trim().split(commaUnlessQuoted);
+
+  return compact(parts)
+    .flatMap(parseMatcher)
+    .map((matcher) => ({
+      ...matcher,
+      name: unquoteWithUnescape(matcher.name),
+      value: unquoteWithUnescape(matcher.value),
+    }));
+}
+
 // Parses a list of entries like like "['foo=bar', 'baz=~bad*']" into SilenceMatcher[]
 export function parseQueryParamMatchers(matcherPairs: string[]): Matcher[] {
   const parsedMatchers = matcherPairs.filter((x) => !!x.trim()).map((x) => parseMatcher(x));
@@ -65,78 +108,93 @@ export const getMatcherQueryParams = (labels: Labels) => {
  * this function will normalize all of the different ways to define matchers in to a single one.
  */
 export const normalizeMatchers = (route: Route): ObjectMatcher[] => {
-  const matchers: ObjectMatcher[] = [];
+  let routeMatchers: ObjectMatcher[] = [];
 
   if (route.matchers) {
     route.matchers.forEach((matcher) => {
-      const { name, value, isEqual, isRegex } = parseMatcher(matcher);
-      let operator = MatcherOperator.equal;
-
-      if (isEqual && isRegex) {
-        operator = MatcherOperator.regex;
-      }
-      if (!isEqual && isRegex) {
-        operator = MatcherOperator.notRegex;
-      }
-      if (isEqual && !isRegex) {
-        operator = MatcherOperator.equal;
-      }
-      if (!isEqual && !isRegex) {
-        operator = MatcherOperator.notEqual;
-      }
-
-      matchers.push([name, operator, value]);
+      const parsedMatchers = parseMatcherToArray(matcher).map(matcherToObjectMatcher);
+      routeMatchers = routeMatchers.concat(parsedMatchers);
     });
   }
 
   if (route.object_matchers) {
-    matchers.push(...route.object_matchers);
+    routeMatchers.push(...route.object_matchers);
   }
 
   if (route.match_re) {
     Object.entries(route.match_re).forEach(([label, value]) => {
-      matchers.push([label, MatcherOperator.regex, value]);
+      routeMatchers.push([label, MatcherOperator.regex, value]);
     });
   }
 
   if (route.match) {
     Object.entries(route.match).forEach(([label, value]) => {
-      matchers.push([label, MatcherOperator.equal, value]);
+      routeMatchers.push([label, MatcherOperator.equal, value]);
     });
   }
 
-  return matchers;
+  return routeMatchers;
 };
 
-export type Label = [string, string];
-type OperatorPredicate = (labelValue: string, matcherValue: string) => boolean;
-const OperatorFunctions: Record<MatcherOperator, OperatorPredicate> = {
-  [MatcherOperator.equal]: (lv, mv) => lv === mv,
-  [MatcherOperator.notEqual]: (lv, mv) => lv !== mv,
-  [MatcherOperator.regex]: (lv, mv) => new RegExp(mv).test(lv),
-  [MatcherOperator.notRegex]: (lv, mv) => !new RegExp(mv).test(lv),
-};
-
-function isLabelMatch(matcher: ObjectMatcher, label: Label) {
-  const [labelKey, labelValue] = label;
-  const [matcherKey, operator, matcherValue] = matcher;
+/**
+ * Quotes string and escapes double quote and backslash characters
+ */
+export function quoteWithEscape(input: string) {
+  const escaped = input.replace(/[\\"]/g, (c) => `\\${c}`);
+  return `"${escaped}"`;
+}
 
-  // not interested, keys don't match
-  if (labelKey !== matcherKey) {
-    return false;
+/**
+ * Unquotes and unescapes a string **if it has been quoted**
+ */
+export function unquoteWithUnescape(input: string) {
+  if (!/^"(.*)"$/.test(input)) {
+    return input;
   }
 
-  const matchFunction = OperatorFunctions[operator];
-  if (!matchFunction) {
-    throw new Error(`no such operator: ${operator}`);
-  }
+  return input
+    .replace(/^"(.*)"$/, '$1')
+    .replace(/\\"/g, '"')
+    .replace(/\\\\/g, '\\');
+}
+
+export const matcherFormatter = {
+  default: ([name, operator, value]: ObjectMatcher): string => {
+    // Value can be an empty string which we want to display as ""
+    const formattedValue = value || '';
+    return `${name} ${operator} ${formattedValue}`;
+  },
+  unquote: ([name, operator, value]: ObjectMatcher): string => {
+    const unquotedName = unquoteWithUnescape(name);
+    // Unquoted value can be an empty string which we want to display as ""
+    const unquotedValue = unquoteWithUnescape(value) || '""';
+    return `${unquotedName} ${operator} ${unquotedValue}`;
+  },
+} as const;
+
+export function isPromQLStyleMatcher(input: string): boolean {
+  return input.startsWith('{') && input.endsWith('}');
+}
 
-  return matchFunction(labelValue, matcherValue);
+export function matcherToObjectMatcher(matcher: Matcher): ObjectMatcher {
+  const operator = matcherToOperator(matcher);
+  return [matcher.name, operator, matcher.value];
 }
 
-// check if every matcher returns "true" for the set of labels
-export function labelsMatchObjectMatchers(matchers: ObjectMatcher[], labels: Label[]) {
-  return matchers.every((matcher) => {
-    return labels.some((label) => isLabelMatch(matcher, label));
-  });
+function matcherToOperator(matcher: Matcher): MatcherOperator {
+  if (matcher.isEqual) {
+    if (matcher.isRegex) {
+      return MatcherOperator.regex;
+    } else {
+      return MatcherOperator.equal;
+    }
+  } else if (matcher.isRegex) {
+    return MatcherOperator.notRegex;
+  } else {
+    return MatcherOperator.notEqual;
+  }
 }
+
+export type MatcherFormatter = keyof typeof matcherFormatter;
+
+export type Label = [string, string];
diff --git a/public/app/features/alerting/unified/utils/misc.test.ts b/public/app/features/alerting/unified/utils/misc.test.ts
index 24fe248b5f6a0..56dfde2854aaa 100644
--- a/public/app/features/alerting/unified/utils/misc.test.ts
+++ b/public/app/features/alerting/unified/utils/misc.test.ts
@@ -1,4 +1,16 @@
-import { sortAlerts, wrapWithQuotes, escapeQuotes, createExploreLink } from 'app/features/alerting/unified/utils/misc';
+import {
+  sortAlerts,
+  wrapWithQuotes,
+  escapeQuotes,
+  createExploreLink,
+  makeLabelBasedSilenceLink,
+  makeDataSourceLink,
+  makeFolderLink,
+  makeFolderAlertsLink,
+  makeFolderSettingsLink,
+  makeDashboardLink,
+  makePanelLink,
+} from 'app/features/alerting/unified/utils/misc';
 import { SortOrder } from 'app/plugins/panel/alertlist/types';
 import { Alert } from 'app/types/unified-alerting';
 import { GrafanaAlertState } from 'app/types/unified-alerting-dto';
@@ -95,3 +107,34 @@ describe('createExploreLink', () => {
     );
   });
 });
+
+describe('create links', () => {
+  it('should create silence link', () => {
+    expect(makeLabelBasedSilenceLink('grafana', { foo: 'bar', bar: 'baz' })).toBe(
+      '/alerting/silence/new?alertmanager=grafana&matcher=foo%3Dbar&matcher=bar%3Dbaz'
+    );
+  });
+
+  it('should create data source link', () => {
+    expect(makeDataSourceLink('my-data-source')).toBe('/datasources/edit/my-data-source');
+  });
+
+  it('should make folder link', () => {
+    expect(makeFolderLink('abc123')).toBe('/dashboards/f/abc123');
+  });
+
+  it('should make folder alerts link', () => {
+    expect(makeFolderAlertsLink('abc123', 'my-title')).toBe('/dashboards/f/abc123/my-title/alerting');
+  });
+
+  it('should make folder settings link', () => {
+    expect(makeFolderSettingsLink('abc123')).toBe('/dashboards/f/abc123/settings');
+  });
+
+  it('should make dashboard link', () => {
+    expect(makeDashboardLink('abc123 def456')).toBe('/d/abc123%20def456');
+  });
+  it('should make panel link', () => {
+    expect(makePanelLink('dashboard uid', '1')).toBe('/d/dashboard%20uid?viewPanel=1');
+  });
+});
diff --git a/public/app/features/alerting/unified/utils/misc.ts b/public/app/features/alerting/unified/utils/misc.ts
index d3051a0de69f7..7f956f050b0d1 100644
--- a/public/app/features/alerting/unified/utils/misc.ts
+++ b/public/app/features/alerting/unified/utils/misc.ts
@@ -1,8 +1,8 @@
 import { sortBy } from 'lodash';
 
-import { UrlQueryMap, Labels, DataSourceInstanceSettings, DataSourceJsonData } from '@grafana/data';
+import { UrlQueryMap, Labels } from '@grafana/data';
 import { GrafanaEdition } from '@grafana/data/src/types/config';
-import { config } from '@grafana/runtime';
+import { config, isFetchError } from '@grafana/runtime';
 import { DataSourceRef } from '@grafana/schema';
 import { escapePathSeparators } from 'app/features/alerting/unified/utils/rule-id';
 import { alertInstanceKey } from 'app/features/alerting/unified/utils/rules';
@@ -14,8 +14,6 @@ import {
   mapStateWithReasonToBaseState,
 } from 'app/types/unified-alerting-dto';
 
-import { FolderDTO } from '../../../../types';
-
 import { ALERTMANAGER_NAME_QUERY_KEY } from './constants';
 import { getRulesSourceName, isCloudRulesSource } from './datasource';
 import { getMatcherQueryParams } from './matchers';
@@ -105,7 +103,7 @@ export function makeAMLink(path: string, alertManagerName?: string, options?: UR
   const search = new URLSearchParams(options);
 
   if (alertManagerName) {
-    search.append(ALERTMANAGER_NAME_QUERY_KEY, alertManagerName);
+    search.set(ALERTMANAGER_NAME_QUERY_KEY, alertManagerName);
   }
   return `${path}?${search.toString()}`;
 }
@@ -137,16 +135,20 @@ export function makeLabelBasedSilenceLink(alertManagerSourceName: string, labels
   return createUrl('/alerting/silence/new', silenceUrlParams);
 }
 
-export function makeDataSourceLink<T extends DataSourceJsonData>(dataSource: DataSourceInstanceSettings<T>) {
-  return createUrl(`/datasources/edit/${dataSource.uid}`);
+export function makeDataSourceLink(uid: string) {
+  return createUrl(`/datasources/edit/${uid}`);
 }
 
 export function makeFolderLink(folderUID: string): string {
   return createUrl(`/dashboards/f/${folderUID}`);
 }
 
-export function makeFolderSettingsLink(folder: FolderDTO): string {
-  return createUrl(`/dashboards/f/${folder.uid}/${folder.title}/settings`);
+export function makeFolderAlertsLink(folderUID: string, title: string): string {
+  return createUrl(`/dashboards/f/${folderUID}/${title}/alerting`);
+}
+
+export function makeFolderSettingsLink(uid: string): string {
+  return createUrl(`/dashboards/f/${uid}/settings`);
 }
 
 export function makeDashboardLink(dashboardUID: string): string {
@@ -154,7 +156,8 @@ export function makeDashboardLink(dashboardUID: string): string {
 }
 
 export function makePanelLink(dashboardUID: string, panelId: string): string {
-  return createUrl(`/d/${encodeURIComponent(dashboardUID)}`, { viewPanel: panelId });
+  const panelParams = new URLSearchParams({ viewPanel: panelId });
+  return createUrl(`/d/${encodeURIComponent(dashboardUID)}`, panelParams);
 }
 
 // keep retrying fn if it's error passes shouldRetry(error) and timeout has not elapsed yet
@@ -221,3 +224,16 @@ export function isLocalDevEnv() {
   const buildInfo = config.buildInfo;
   return buildInfo.env === 'development';
 }
+
+export function isErrorLike(error: unknown): error is Error {
+  return 'message' in (error as Error);
+}
+
+export function stringifyErrorLike(error: unknown): string {
+  const fetchError = isFetchError(error);
+  if (fetchError) {
+    return error.data.message;
+  }
+
+  return isErrorLike(error) ? error.message : String(error);
+}
diff --git a/public/app/features/alerting/unified/utils/mute-timings.ts b/public/app/features/alerting/unified/utils/mute-timings.ts
index abac60fda0a54..fca26871e1a2e 100644
--- a/public/app/features/alerting/unified/utils/mute-timings.ts
+++ b/public/app/features/alerting/unified/utils/mute-timings.ts
@@ -1,6 +1,6 @@
-import { omitBy, isUndefined } from 'lodash';
+import { isUndefined, omitBy } from 'lodash';
 
-import { MuteTimeInterval, TimeInterval } from 'app/plugins/datasource/alertmanager/types';
+import { MuteTimeInterval, TimeInterval, TimeRange } from 'app/plugins/datasource/alertmanager/types';
 
 import { MuteTimingFields, MuteTimingIntervalFields } from '../types/mute-timing-form';
 
@@ -28,9 +28,14 @@ export const defaultTimeInterval: MuteTimingIntervalFields = {
   months: '',
   years: '',
   location: '',
+  disable: false,
 };
 
-export const validateArrayField = (value: string, validateValue: (input: string) => boolean, invalidText: string) => {
+export const validateArrayField = (
+  value: string | undefined,
+  validateValue: (input: string) => boolean,
+  invalidText: string
+) => {
   if (value) {
     return (
       value
@@ -43,15 +48,15 @@ export const validateArrayField = (value: string, validateValue: (input: string)
   }
 };
 
-const convertStringToArray = (str: string) => {
+const convertStringToArray = (str?: string) => {
   return str ? str.split(',').map((s) => s.trim()) : undefined;
 };
 
 export const createMuteTiming = (fields: MuteTimingFields): MuteTimeInterval => {
   const timeIntervals: TimeInterval[] = fields.time_intervals.map(
-    ({ times, weekdays, days_of_month, months, years, location }) => {
+    ({ times, weekdays, days_of_month, months, years, location, disable }) => {
       const interval = {
-        times: times.filter(({ start_time, end_time }) => !!start_time && !!end_time),
+        times: convertTimesToDto(times, disable),
         weekdays: convertStringToArray(weekdays)?.map((v) => v.toLowerCase()),
         days_of_month: convertStringToArray(days_of_month),
         months: convertStringToArray(months),
@@ -68,3 +73,47 @@ export const createMuteTiming = (fields: MuteTimingFields): MuteTimeInterval =>
     time_intervals: timeIntervals,
   };
 };
+
+/*
+ * Convert times from form to dto, if disable is true, then return an empty array as times
+ If the times array is empty and disable is false, then return undefined
+ * @param muteTimeInterval
+ * @returns MuteTimingFields
+ *
+ */
+function convertTimesToDto(times: TimeRange[] | undefined, disable: boolean) {
+  if (disable) {
+    return [];
+  }
+  const timesToReturn = times?.filter(({ start_time, end_time }) => !!start_time && !!end_time);
+  return timesToReturn?.length ? timesToReturn : undefined;
+}
+
+/*
+ * Get disable field from dto, if any of the lists is an empty array, then the disable field is true
+ * @param muteTimeInterval
+ * @returns MuteTimingFields
+ *
+ */
+
+export function isTimeIntervalDisabled(intervals: TimeInterval): boolean {
+  if (
+    intervals.times?.length === 0 ||
+    intervals.weekdays?.length === 0 ||
+    intervals.days_of_month?.length === 0 ||
+    intervals.months?.length === 0 ||
+    intervals.years?.length === 0
+  ) {
+    return true;
+  }
+  return false;
+}
+
+/*
+   Return true if all the time intervals are disabled
+  * @param muteTimeInterval
+  * @returns MuteTimingFields
+  * */
+export function isDisabled(muteTiming: MuteTimeInterval) {
+  return muteTiming.time_intervals.every((timeInterval) => isTimeIntervalDisabled(timeInterval));
+}
diff --git a/public/app/features/alerting/unified/utils/notification-policies.test.ts b/public/app/features/alerting/unified/utils/notification-policies.test.ts
index 2c2e351453358..b6f12be2866f7 100644
--- a/public/app/features/alerting/unified/utils/notification-policies.test.ts
+++ b/public/app/features/alerting/unified/utils/notification-policies.test.ts
@@ -1,10 +1,13 @@
 import { MatcherOperator, Route, RouteWithID } from 'app/plugins/datasource/alertmanager/types';
 
 import {
+  InheritableProperties,
+  computeInheritedTree,
   findMatchingRoutes,
-  normalizeRoute,
   getInheritedProperties,
-  computeInheritedTree,
+  matchLabels,
+  normalizeRoute,
+  unquoteRouteMatchers,
 } from './notification-policies';
 
 import 'core-js/stable/structured-clone';
@@ -22,6 +25,7 @@ describe('findMatchingRoutes', () => {
     routes: [
       {
         receiver: 'A',
+        object_matchers: [['team', MatcherOperator.equal, 'operations']],
         routes: [
           {
             receiver: 'B1',
@@ -29,10 +33,9 @@ describe('findMatchingRoutes', () => {
           },
           {
             receiver: 'B2',
-            object_matchers: [['region', MatcherOperator.notEqual, 'europe']],
+            object_matchers: [['region', MatcherOperator.equal, 'nasa']],
           },
         ],
-        object_matchers: [['team', MatcherOperator.equal, 'operations']],
       },
       {
         receiver: 'C',
@@ -55,6 +58,19 @@ describe('findMatchingRoutes', () => {
     expect(matches[0].route).toHaveProperty('receiver', 'A');
   });
 
+  it('should match route with negative matchers', () => {
+    const policiesWithNegative = {
+      ...policies,
+      routes: policies.routes?.concat({
+        receiver: 'D',
+        object_matchers: [['name', MatcherOperator.notEqual, 'gilles']],
+      }),
+    };
+    const matches = findMatchingRoutes(policiesWithNegative, [['name', 'konrad']]);
+    expect(matches).toHaveLength(1);
+    expect(matches[0].route).toHaveProperty('receiver', 'D');
+  });
+
   it('should match child route of matching parent', () => {
     const matches = findMatchingRoutes(policies, [
       ['team', 'operations'],
@@ -189,9 +205,19 @@ describe('getInheritedProperties()', () => {
       const childInherited = getInheritedProperties(parent, child);
       expect(childInherited).toHaveProperty('group_by', ['label']);
     });
+
+    it('should inherit from grandparent when parent is inheriting', () => {
+      const parentInheritedProperties: InheritableProperties = { receiver: 'grandparent' };
+      const parent: Route = { receiver: null, group_by: ['foo'] };
+      const child: Route = { receiver: null };
+
+      const childInherited = getInheritedProperties(parent, child, parentInheritedProperties);
+      expect(childInherited).toHaveProperty('receiver', 'grandparent');
+      expect(childInherited.group_by).toEqual(['foo']);
+    });
   });
 
-  describe('regular "undefined" values', () => {
+  describe('regular "undefined" or "null" values', () => {
     it('should compute inherited properties being undefined', () => {
       const parent: Route = {
         receiver: 'PARENT',
@@ -206,6 +232,20 @@ describe('getInheritedProperties()', () => {
       expect(childInherited).toHaveProperty('group_wait', '10s');
     });
 
+    it('should compute inherited properties being null', () => {
+      const parent: Route = {
+        receiver: 'PARENT',
+        group_wait: '10s',
+      };
+
+      const child: Route = {
+        receiver: null,
+      };
+
+      const childInherited = getInheritedProperties(parent, child);
+      expect(childInherited).toHaveProperty('receiver', 'PARENT');
+    });
+
     it('should compute inherited properties being undefined from parent inherited properties', () => {
       const parent: Route = {
         receiver: 'PARENT',
@@ -280,6 +320,21 @@ describe('getInheritedProperties()', () => {
       expect(childInherited).toHaveProperty('group_interval', '2m');
     });
   });
+  it('should not inherit mute timings from parent route', () => {
+    const parent: Route = {
+      receiver: 'PARENT',
+      group_by: ['parentLabel'],
+      mute_time_intervals: ['Mon-Fri 09:00-17:00'],
+    };
+
+    const child: Route = {
+      receiver: 'CHILD',
+      group_by: ['childLabel'],
+    };
+
+    const childInherited = getInheritedProperties(parent, child);
+    expect(childInherited).not.toHaveProperty('mute_time_intervals');
+  });
 });
 
 describe('computeInheritedTree', () => {
@@ -378,3 +433,83 @@ describe('normalizeRoute', () => {
     expect(normalized).not.toHaveProperty('match_re');
   });
 });
+
+describe('matchLabels', () => {
+  it('should match with non-matching matchers', () => {
+    const result = matchLabels(
+      [
+        ['foo', MatcherOperator.equal, ''],
+        ['team', MatcherOperator.equal, 'operations'],
+      ],
+      [['team', 'operations']]
+    );
+
+    expect(result).toHaveProperty('matches', true);
+    expect(result.labelsMatch).toMatchSnapshot();
+  });
+
+  it('should match with non-equal matchers', () => {
+    const result = matchLabels(
+      [
+        ['foo', MatcherOperator.notEqual, 'bar'],
+        ['team', MatcherOperator.equal, 'operations'],
+      ],
+      [['team', 'operations']]
+    );
+
+    expect(result).toHaveProperty('matches', true);
+    expect(result.labelsMatch).toMatchSnapshot();
+  });
+
+  it('should not match with a set of matchers', () => {
+    const result = matchLabels(
+      [
+        ['foo', MatcherOperator.notEqual, 'bar'],
+        ['team', MatcherOperator.equal, 'operations'],
+      ],
+      [
+        ['team', 'operations'],
+        ['foo', 'bar'],
+      ]
+    );
+
+    expect(result).toHaveProperty('matches', false);
+    expect(result.labelsMatch).toMatchSnapshot();
+  });
+});
+
+describe('unquoteRouteMatchers', () => {
+  it('should unquote and unescape matchers values', () => {
+    const route: RouteWithID = {
+      id: '1',
+      object_matchers: [
+        ['foo', MatcherOperator.equal, 'bar'],
+        ['foo', MatcherOperator.equal, '"bar"'],
+        ['foo', MatcherOperator.equal, '"b\\\\ar b\\"az"'],
+      ],
+    };
+
+    const unwrapped = unquoteRouteMatchers(route);
+
+    expect(unwrapped.object_matchers).toHaveLength(3);
+    expect(unwrapped.object_matchers).toContainEqual(['foo', MatcherOperator.equal, 'bar']);
+    expect(unwrapped.object_matchers).toContainEqual(['foo', MatcherOperator.equal, 'bar']);
+    expect(unwrapped.object_matchers).toContainEqual(['foo', MatcherOperator.equal, 'b\\ar b"az']);
+  });
+
+  it('should unquote and unescape matcher names', () => {
+    const route: RouteWithID = {
+      id: '1',
+      object_matchers: [
+        ['"f\\"oo with quote"', MatcherOperator.equal, 'bar'],
+        ['"f\\\\oo with slash"', MatcherOperator.equal, 'bar'],
+      ],
+    };
+
+    const unwrapped = unquoteRouteMatchers(route);
+
+    expect(unwrapped.object_matchers).toHaveLength(2);
+    expect(unwrapped.object_matchers).toContainEqual(['f"oo with quote', MatcherOperator.equal, 'bar']);
+    expect(unwrapped.object_matchers).toContainEqual(['f\\oo with slash', MatcherOperator.equal, 'bar']);
+  });
+});
diff --git a/public/app/features/alerting/unified/utils/notification-policies.ts b/public/app/features/alerting/unified/utils/notification-policies.ts
index 42f7c8951badf..8b419161078c9 100644
--- a/public/app/features/alerting/unified/utils/notification-policies.ts
+++ b/public/app/features/alerting/unified/utils/notification-policies.ts
@@ -1,4 +1,4 @@
-import { isArray, merge, pick, reduce } from 'lodash';
+import { isArray, pick, reduce } from 'lodash';
 
 import {
   AlertmanagerGroup,
@@ -9,113 +9,90 @@ import {
 } from 'app/plugins/datasource/alertmanager/types';
 import { Labels } from 'app/types/unified-alerting-dto';
 
-import { Label, normalizeMatchers } from './matchers';
-
-type OperatorPredicate = (labelValue: string, matcherValue: string) => boolean;
-
-const OperatorFunctions: Record<MatcherOperator, OperatorPredicate> = {
-  [MatcherOperator.equal]: (lv, mv) => lv === mv,
-  [MatcherOperator.notEqual]: (lv, mv) => lv !== mv,
-  [MatcherOperator.regex]: (lv, mv) => Boolean(lv.match(new RegExp(mv))),
-  [MatcherOperator.notRegex]: (lv, mv) => !Boolean(lv.match(new RegExp(mv))),
-};
-
-function isLabelMatch(matcher: ObjectMatcher, label: Label) {
-  const [labelKey, labelValue] = label;
-  const [matcherKey, operator, matcherValue] = matcher;
-
-  // not interested, keys don't match
-  if (labelKey !== matcherKey) {
-    return false;
-  }
-
-  const matchFunction = OperatorFunctions[operator];
-  if (!matchFunction) {
-    throw new Error(`no such operator: ${operator}`);
-  }
-
-  return matchFunction(labelValue, matcherValue);
-}
+import { Label, normalizeMatchers, unquoteWithUnescape } from './matchers';
 
+// If a policy has no matchers it still can be a match, hence matchers can be empty and match can be true
+// So we cannot use null as an indicator of no match
 interface LabelMatchResult {
   match: boolean;
-  matchers: ObjectMatcher[];
+  matcher: ObjectMatcher | null;
 }
 
+export const INHERITABLE_KEYS = ['receiver', 'group_by', 'group_wait', 'group_interval', 'repeat_interval'] as const;
+export type InheritableKeys = typeof INHERITABLE_KEYS;
+export type InheritableProperties = Pick<Route, InheritableKeys[number]>;
+
+type LabelsMatch = Map<Label, LabelMatchResult>;
+
 interface MatchingResult {
   matches: boolean;
-  details: Map<ObjectMatcher, Label[]>;
-  labelsMatch: Map<Label, LabelMatchResult>;
+  labelsMatch: LabelsMatch;
 }
 
-// check if every matcher returns "true" for the set of labels
-function matchLabels(matchers: ObjectMatcher[], labels: Label[]): MatchingResult {
-  const details = new Map<ObjectMatcher, Label[]>();
-
-  // If a policy has no matchers it still can be a match, hence matchers can be empty and match can be true
-  // So we cannot use empty array of matchers as an indicator of no match
-  const labelsMatch = new Map<Label, { match: boolean; matchers: ObjectMatcher[] }>(
-    labels.map((label) => [label, { match: false, matchers: [] }])
-  );
+// returns a match results for given set of matchers (from a policy for instance) and a set of labels
+export function matchLabels(matchers: ObjectMatcher[], labels: Label[]): MatchingResult {
+  const matches = matchLabelsSet(matchers, labels);
 
-  const matches = matchers.every((matcher) => {
-    const matchingLabels = labels.filter((label) => isLabelMatch(matcher, label));
+  // create initial map of label => match result
+  const labelsMatch: LabelsMatch = new Map(labels.map((label) => [label, { match: false, matcher: null }]));
 
-    matchingLabels.forEach((label) => {
-      const labelMatch = labelsMatch.get(label);
-      // The condition is just to satisfy TS. The map should have all the labels due to the previous map initialization
-      if (labelMatch) {
-        labelMatch.match = true;
-        labelMatch.matchers.push(matcher);
-      }
-    });
+  // for each matcher, check which label it matched for
+  matchers.forEach((matcher) => {
+    const matchingLabel = labels.find((label) => isLabelMatch(matcher, label));
 
-    if (matchingLabels.length === 0) {
-      return false;
+    // record that matcher for the label
+    if (matchingLabel) {
+      labelsMatch.set(matchingLabel, {
+        match: true,
+        matcher,
+      });
     }
-
-    details.set(matcher, matchingLabels);
-    return matchingLabels.length > 0;
   });
 
-  return { matches, details, labelsMatch };
+  return { matches, labelsMatch };
+}
+
+// Compare set of matchers to set of label
+export function matchLabelsSet(matchers: ObjectMatcher[], labels: Label[]): boolean {
+  for (const matcher of matchers) {
+    if (!isLabelMatchInSet(matcher, labels)) {
+      return false;
+    }
+  }
+  return true;
 }
 
 export interface AlertInstanceMatch {
   instance: Labels;
-  matchDetails: Map<ObjectMatcher, Labels>;
-  labelsMatch: Map<Label, LabelMatchResult>;
+  labelsMatch: LabelsMatch;
 }
 
 export interface RouteMatchResult<T extends Route> {
   route: T;
-  details: Map<ObjectMatcher, Label[]>;
-  labelsMatch: Map<Label, LabelMatchResult>;
+  labelsMatch: LabelsMatch;
 }
 
 // Match does a depth-first left-to-right search through the route tree
 // and returns the matching routing nodes.
 
 // If the current node is not a match, return nothing
-// const normalizedMatchers = normalizeMatchers(root);
 // Normalization should have happened earlier in the code
-function findMatchingRoutes<T extends Route>(root: T, labels: Label[]): Array<RouteMatchResult<T>> {
-  let matches: Array<RouteMatchResult<T>> = [];
+function findMatchingRoutes<T extends Route>(route: T, labels: Label[]): Array<RouteMatchResult<T>> {
+  let childMatches: Array<RouteMatchResult<T>> = [];
 
   // If the current node is not a match, return nothing
-  const matchResult = matchLabels(root.object_matchers ?? [], labels);
+  const matchResult = matchLabels(route.object_matchers ?? [], labels);
   if (!matchResult.matches) {
     return [];
   }
 
   // If the current node matches, recurse through child nodes
-  if (root.routes) {
-    for (let index = 0; index < root.routes.length; index++) {
-      let child = root.routes[index];
+  if (route.routes) {
+    for (const child of route.routes) {
       let matchingChildren = findMatchingRoutes(child, labels);
       // TODO how do I solve this typescript thingy? It looks correct to me /shrug
       // @ts-ignore
-      matches = matches.concat(matchingChildren);
+      childMatches = childMatches.concat(matchingChildren);
       // we have matching children and we don't want to continue, so break here
       if (matchingChildren.length && !child.continue) {
         break;
@@ -124,11 +101,11 @@ function findMatchingRoutes<T extends Route>(root: T, labels: Label[]): Array<Ro
   }
 
   // If no child nodes were matches, the current node itself is a match.
-  if (matches.length === 0) {
-    matches.push({ route: root, details: matchResult.details, labelsMatch: matchResult.labelsMatch });
+  if (childMatches.length === 0) {
+    childMatches.push({ route, labelsMatch: matchResult.labelsMatch });
   }
 
-  return matches;
+  return childMatches;
 }
 
 // This is a performance improvement to normalize matchers only once and use the normalized version later on
@@ -147,6 +124,20 @@ export function normalizeRoute(rootRoute: RouteWithID): RouteWithID {
   return normalizedRootRoute;
 }
 
+export function unquoteRouteMatchers(route: RouteWithID): RouteWithID {
+  function unquoteRoute(route: RouteWithID) {
+    route.object_matchers = route.object_matchers?.map(([name, operator, value]) => {
+      return [unquoteWithUnescape(name), operator, unquoteWithUnescape(value)];
+    });
+    route.routes?.forEach(unquoteRoute);
+  }
+
+  const unwrappedRootRoute = structuredClone(route);
+  unquoteRoute(unwrappedRootRoute);
+
+  return unwrappedRootRoute;
+}
+
 /**
  * find all of the groups that have instances that match the route, thay way we can find all instances
  * (and their grouping) for the given route
@@ -177,38 +168,27 @@ function findMatchingAlertGroups(
   }, matchingGroups);
 }
 
-export type InhertitableProperties = Pick<
-  Route,
-  'receiver' | 'group_by' | 'group_wait' | 'group_interval' | 'repeat_interval' | 'mute_time_intervals'
->;
-
 // inherited properties are config properties that exist on the parent route (or its inherited properties) but not on the child route
 function getInheritedProperties(
   parentRoute: Route,
   childRoute: Route,
-  propertiesParentInherited?: Partial<InhertitableProperties>
-) {
-  const fullParentProperties = merge({}, parentRoute, propertiesParentInherited);
-
-  const inheritableProperties: InhertitableProperties = pick(fullParentProperties, [
-    'receiver',
-    'group_by',
-    'group_wait',
-    'group_interval',
-    'repeat_interval',
-    'mute_time_intervals',
-  ]);
-
-  // TODO how to solve this TypeScript mystery?
+  propertiesParentInherited?: InheritableProperties
+): InheritableProperties {
+  const propsFromParent: InheritableProperties = pick(parentRoute, INHERITABLE_KEYS);
+  const inheritableProperties: InheritableProperties = {
+    ...propsFromParent,
+    ...propertiesParentInherited,
+  };
+
   const inherited = reduce(
     inheritableProperties,
-    (inheritedProperties: Partial<Route> = {}, parentValue, property) => {
-      const parentHasValue = parentValue !== undefined;
+    (inheritedProperties: InheritableProperties, parentValue, property) => {
+      const parentHasValue = parentValue != null;
 
+      const inheritableValues = [undefined, '', null];
       // @ts-ignore
-      const inheritFromParentUndefined = parentHasValue && childRoute[property] === undefined;
-      // @ts-ignore
-      const inheritFromParentEmptyString = parentHasValue && childRoute[property] === '';
+      const childIsInheriting = inheritableValues.some((value) => childRoute[property] === value);
+      const inheritFromValue = childIsInheriting && parentHasValue;
 
       const inheritEmptyGroupByFromParent =
         property === 'group_by' &&
@@ -216,8 +196,7 @@ function getInheritedProperties(
         isArray(childRoute[property]) &&
         childRoute[property]?.length === 0;
 
-      const inheritFromParent =
-        inheritFromParentUndefined || inheritFromParentEmptyString || inheritEmptyGroupByFromParent;
+      const inheritFromParent = inheritFromValue || inheritEmptyGroupByFromParent;
 
       if (inheritFromParent) {
         // @ts-ignore
@@ -249,4 +228,48 @@ export function computeInheritedTree<T extends Route>(parent: T): T {
   };
 }
 
-export { findMatchingAlertGroups, findMatchingRoutes, getInheritedProperties };
+type OperatorPredicate = (labelValue: string, matcherValue: string) => boolean;
+const OperatorFunctions: Record<MatcherOperator, OperatorPredicate> = {
+  [MatcherOperator.equal]: (lv, mv) => lv === mv,
+  [MatcherOperator.notEqual]: (lv, mv) => lv !== mv,
+  [MatcherOperator.regex]: (lv, mv) => new RegExp(mv).test(lv),
+  [MatcherOperator.notRegex]: (lv, mv) => !new RegExp(mv).test(lv),
+};
+
+function isLabelMatchInSet(matcher: ObjectMatcher, labels: Label[]): boolean {
+  const [matcherKey, operator, matcherValue] = matcher;
+
+  let labelValue = ''; // matchers that have no labels are treated as empty string label values
+  const labelForMatcher = Object.fromEntries(labels)[matcherKey];
+  if (labelForMatcher) {
+    labelValue = labelForMatcher;
+  }
+
+  const matchFunction = OperatorFunctions[operator];
+  if (!matchFunction) {
+    throw new Error(`no such operator: ${operator}`);
+  }
+
+  return matchFunction(labelValue, matcherValue);
+}
+
+// ⚠️ DO NOT USE THIS FUNCTION FOR ROUTE SELECTION ALGORITHM
+// for route selection algorithm, always compare a single matcher to the entire label set
+// see "matchLabelsSet"
+function isLabelMatch(matcher: ObjectMatcher, label: Label): boolean {
+  let [labelKey, labelValue] = label;
+  const [matcherKey, operator, matcherValue] = matcher;
+
+  if (labelKey !== matcherKey) {
+    return false;
+  }
+
+  const matchFunction = OperatorFunctions[operator];
+  if (!matchFunction) {
+    throw new Error(`no such operator: ${operator}`);
+  }
+
+  return matchFunction(labelValue, matcherValue);
+}
+
+export { findMatchingAlertGroups, findMatchingRoutes, getInheritedProperties, isLabelMatchInSet };
diff --git a/public/app/features/alerting/unified/utils/query.test.ts b/public/app/features/alerting/unified/utils/query.test.ts
index 21191b71f88d2..6632f291f6c87 100644
--- a/public/app/features/alerting/unified/utils/query.test.ts
+++ b/public/app/features/alerting/unified/utils/query.test.ts
@@ -88,7 +88,6 @@ describe('alertRuleToQueries', () => {
 const grafanaAlert = {
   condition: 'B',
   exec_err_state: GrafanaAlertStateDecision.Alerting,
-  namespace_id: 11,
   namespace_uid: 'namespaceuid123',
   no_data_state: GrafanaAlertStateDecision.NoData,
   title: 'Test alert',
diff --git a/public/app/features/alerting/unified/utils/query.ts b/public/app/features/alerting/unified/utils/query.ts
index 0f5648638a6f5..bde53876d92b9 100644
--- a/public/app/features/alerting/unified/utils/query.ts
+++ b/public/app/features/alerting/unified/utils/query.ts
@@ -1,3 +1,5 @@
+import { produce } from 'immer';
+
 import { DataSourceInstanceSettings } from '@grafana/data';
 import { DataQuery } from '@grafana/schema';
 import { LokiQuery } from 'app/plugins/datasource/loki/types';
@@ -5,8 +7,9 @@ import { PromQuery } from 'app/plugins/datasource/prometheus/types';
 import { CombinedRule } from 'app/types/unified-alerting';
 import { AlertQuery } from 'app/types/unified-alerting-dto';
 
-import { isCloudRulesSource, isGrafanaRulesSource } from './datasource';
+import { isCloudRulesSource } from './datasource';
 import { isGrafanaRulerRule } from './rules';
+import { safeParseDurationstr } from './time';
 
 export function alertRuleToQueries(combinedRule: CombinedRule | undefined | null): AlertQuery[] {
   if (!combinedRule) {
@@ -15,10 +18,9 @@ export function alertRuleToQueries(combinedRule: CombinedRule | undefined | null
   const { namespace, rulerRule } = combinedRule;
   const { rulesSource } = namespace;
 
-  if (isGrafanaRulesSource(rulesSource)) {
-    if (isGrafanaRulerRule(rulerRule)) {
-      return rulerRule.grafana_alert.data;
-    }
+  if (isGrafanaRulerRule(rulerRule)) {
+    const query = rulerRule.grafana_alert.data;
+    return widenRelativeTimeRanges(query, rulerRule.for, combinedRule.group.interval);
   }
 
   if (isCloudRulesSource(rulesSource)) {
@@ -30,6 +32,37 @@ export function alertRuleToQueries(combinedRule: CombinedRule | undefined | null
   return [];
 }
 
+/**
+ * This function will figure out how large the time range for visualizing the alert rule detail view should be
+ * We try to show as much data as is relevant for triaging / root cause analysis
+ *
+ * The function for it is;
+ *
+ *  Math.max(3 * pending period, query range + (2 * pending period))
+ *
+ * We can safely ignore the evaluation interval because the pending period is guaranteed to be largen than or equal that
+ */
+export function widenRelativeTimeRanges(queries: AlertQuery[], pendingPeriod: string, groupInterval?: string) {
+  // if pending period is zero that means inherit from group interval, if that is empty then assume 1m
+  const pendingPeriodDurationMillis =
+    safeParseDurationstr(pendingPeriod) ?? safeParseDurationstr(groupInterval ?? '1m');
+  const pendingPeriodDuration = Math.floor(pendingPeriodDurationMillis / 1000);
+
+  return queries.map((query) =>
+    produce(query, (draft) => {
+      const fromQueryRange = draft.relativeTimeRange?.from ?? 0;
+
+      // use whichever has the largest time range
+      const from = Math.max(pendingPeriodDuration * 3, fromQueryRange + pendingPeriodDuration * 2);
+
+      draft.relativeTimeRange = {
+        from,
+        to: 0,
+      };
+    })
+  );
+}
+
 export function dataQueryToAlertQuery(dataQuery: DataQuery, dataSourceUid: string): AlertQuery {
   return {
     refId: dataQuery.refId,
diff --git a/public/app/features/alerting/unified/utils/receivers.ts b/public/app/features/alerting/unified/utils/receivers.ts
index 11bed1bf7fc9b..d4147cae3d1e7 100644
--- a/public/app/features/alerting/unified/utils/receivers.ts
+++ b/public/app/features/alerting/unified/utils/receivers.ts
@@ -1,33 +1,6 @@
-import { capitalize, isEmpty, times } from 'lodash';
+import { isEmpty, times } from 'lodash';
 
-import { receiverTypeNames } from 'app/plugins/datasource/alertmanager/consts';
 import { GrafanaManagedReceiverConfig, Receiver } from 'app/plugins/datasource/alertmanager/types';
-import { NotifierDTO } from 'app/types';
-
-// extract notifier type name to count map, eg { Slack: 1, Email: 2 }
-
-type NotifierTypeCounts = Record<string, number>; // name : count
-
-export function extractNotifierTypeCounts(receiver: Receiver, grafanaNotifiers: NotifierDTO[]): NotifierTypeCounts {
-  if ('grafana_managed_receiver_configs' in receiver) {
-    return getGrafanaNotifierTypeCounts(receiver.grafana_managed_receiver_configs ?? [], grafanaNotifiers);
-  }
-  return getCortexAlertManagerNotifierTypeCounts(receiver);
-}
-
-function getCortexAlertManagerNotifierTypeCounts(receiver: Receiver): NotifierTypeCounts {
-  return Object.entries(receiver)
-    .filter(([key]) => key !== 'grafana_managed_receiver_configs' && key.endsWith('_configs')) // filter out only properties that are alertmanager notifier
-    .filter(([_, value]) => Array.isArray(value) && !!value.length) // check that there are actually notifiers of this type configured
-    .reduce<NotifierTypeCounts>((acc, [key, value]) => {
-      const type = key.replace('_configs', ''); // remove the `_config` part from the key, making it intto a notifier name
-      const name = receiverTypeNames[type] ?? capitalize(type);
-      return {
-        ...acc,
-        [name]: (acc[name] ?? 0) + (Array.isArray(value) ? value.length : 1),
-      };
-    }, {});
-}
 
 /**
  * This function will extract the integrations that have been defined for either grafana managed contact point
@@ -67,19 +40,3 @@ export function extractReceivers(receiver: Receiver): GrafanaManagedReceiverConf
 
   return integrations;
 }
-
-function getGrafanaNotifierTypeCounts(
-  configs: GrafanaManagedReceiverConfig[],
-  grafanaNotifiers: NotifierDTO[]
-): NotifierTypeCounts {
-  return configs
-    .map((recv) => recv.type) // extract types from config
-    .map((type) => grafanaNotifiers.find((r) => r.type === type)?.name ?? capitalize(type)) // get readable name from notifier cofnig, or if not available, just capitalize
-    .reduce<NotifierTypeCounts>(
-      (acc, type) => ({
-        ...acc,
-        [type]: (acc[type] ?? 0) + 1,
-      }),
-      {}
-    );
-}
diff --git a/public/app/features/alerting/unified/utils/routeTree.test.ts b/public/app/features/alerting/unified/utils/routeTree.test.ts
new file mode 100644
index 0000000000000..19fd6016d2cc5
--- /dev/null
+++ b/public/app/features/alerting/unified/utils/routeTree.test.ts
@@ -0,0 +1,110 @@
+import { RouteWithID } from 'app/plugins/datasource/alertmanager/types';
+
+import { FormAmRoute } from '../types/amroutes';
+
+import { GRAFANA_DATASOURCE_NAME } from './datasource';
+import { addRouteToReferenceRoute, cleanRouteIDs, findRouteInTree, omitRouteFromRouteTree } from './routeTree';
+
+describe('findRouteInTree', () => {
+  it('should find the correct route', () => {
+    const needle: RouteWithID = { id: 'route-2' };
+
+    const root: RouteWithID = {
+      id: 'route-0',
+      routes: [{ id: 'route-1' }, needle, { id: 'route-3', routes: [{ id: 'route-4' }] }],
+    };
+
+    expect(findRouteInTree(root, { id: 'route-2' })).toStrictEqual([needle, root, 1]);
+  });
+
+  it('should return undefined for unknown route', () => {
+    const root: RouteWithID = {
+      id: 'route-0',
+      routes: [{ id: 'route-1' }],
+    };
+
+    expect(findRouteInTree(root, { id: 'none' })).toStrictEqual([undefined, undefined, undefined]);
+  });
+});
+
+describe('addRouteToReferenceRoute', () => {
+  const targetRoute = { id: 'route-3' };
+  const root: RouteWithID = {
+    id: 'route-1',
+    routes: [{ id: 'route-2' }, targetRoute],
+  };
+
+  const newRoute: Partial<FormAmRoute> = {
+    id: 'new-route',
+    receiver: 'new-route',
+  };
+
+  it('should be able to add above', () => {
+    expect(addRouteToReferenceRoute(GRAFANA_DATASOURCE_NAME, newRoute, targetRoute, root, 'above')).toMatchSnapshot();
+  });
+
+  it('should be able to add below', () => {
+    expect(addRouteToReferenceRoute(GRAFANA_DATASOURCE_NAME, newRoute, targetRoute, root, 'below')).toMatchSnapshot();
+  });
+
+  it('should be able to add as child', () => {
+    expect(addRouteToReferenceRoute(GRAFANA_DATASOURCE_NAME, newRoute, targetRoute, root, 'child')).toMatchSnapshot();
+  });
+
+  it('should throw if target route does not exist', () => {
+    expect(() =>
+      addRouteToReferenceRoute(GRAFANA_DATASOURCE_NAME, newRoute, { id: 'unknown' }, root, 'child')
+    ).toThrow();
+  });
+});
+
+describe('omitRouteFromRouteTree', () => {
+  it('should omit route from tree', () => {
+    const tree: RouteWithID = {
+      id: 'route-1',
+      receiver: 'root',
+      routes: [
+        { id: 'route-2', receiver: 'receiver-2' },
+        { id: 'route-3', receiver: 'receiver-3', routes: [{ id: 'route-4', receiver: 'receiver-4' }] },
+      ],
+    };
+
+    expect(omitRouteFromRouteTree({ id: 'route-4' }, tree)).toEqual({
+      id: 'route-1',
+      receiver: 'root',
+      routes: [
+        { id: 'route-2', receiver: 'receiver-2' },
+        { id: 'route-3', receiver: 'receiver-3', routes: [] },
+      ],
+    });
+  });
+
+  it('should throw when removing root route from tree', () => {
+    const tree: RouteWithID = {
+      id: 'route-1',
+    };
+
+    expect(() => {
+      omitRouteFromRouteTree(tree, { id: 'route-1' });
+    }).toThrow();
+  });
+});
+
+describe('cleanRouteIDs', () => {
+  it('should remove IDs from routesr recursively', () => {
+    expect(
+      cleanRouteIDs({
+        id: '1',
+        receiver: '1',
+        routes: [
+          { id: '2', receiver: '2' },
+          { id: '3', receiver: '3' },
+        ],
+      })
+    ).toEqual({ receiver: '1', routes: [{ receiver: '2' }, { receiver: '3' }] });
+  });
+
+  it('should also accept regular routes', () => {
+    expect(cleanRouteIDs({ receiver: 'test' })).toEqual({ receiver: 'test' });
+  });
+});
diff --git a/public/app/features/alerting/unified/utils/routeTree.ts b/public/app/features/alerting/unified/utils/routeTree.ts
index 032c9a579be2d..4cad4826887f6 100644
--- a/public/app/features/alerting/unified/utils/routeTree.ts
+++ b/public/app/features/alerting/unified/utils/routeTree.ts
@@ -2,8 +2,10 @@
  * Various helper functions to modify (immutably) the route tree, aka "notification policies"
  */
 
+import { produce } from 'immer';
 import { omit } from 'lodash';
 
+import { insertAfterImmutably, insertBeforeImmutably } from '@grafana/data/src/utils/arrayUtils';
 import { Route, RouteWithID } from 'app/plugins/datasource/alertmanager/types';
 
 import { FormAmRoute } from '../types/amroutes';
@@ -26,22 +28,16 @@ export const mergePartialAmRouteWithRouteTree = (
 
     if (currentRoute.id === partialFormRoute.id) {
       const newRoute = formAmRouteToAmRoute(alertManagerSourceName, partialFormRoute, routeTree);
-      updatedRoute = omit(
-        {
-          ...currentRoute,
-          ...newRoute,
-        },
-        'id'
-      );
+      updatedRoute = {
+        ...currentRoute,
+        ...newRoute,
+      };
     }
 
-    return omit(
-      {
-        ...updatedRoute,
-        routes: currentRoute.routes?.map(findAndReplace),
-      },
-      'id'
-    );
+    return {
+      ...updatedRoute,
+      routes: currentRoute.routes?.map(findAndReplace),
+    };
   }
 
   return findAndReplace(routeTree);
@@ -49,69 +45,110 @@ export const mergePartialAmRouteWithRouteTree = (
 
 // remove a route from the policy tree, returns a new tree
 // make sure to omit the "id" because Prometheus / Loki / Mimir will reject the payload
-export const omitRouteFromRouteTree = (findRoute: RouteWithID, routeTree: RouteWithID): Route => {
+export const omitRouteFromRouteTree = (findRoute: RouteWithID, routeTree: RouteWithID): RouteWithID => {
   if (findRoute.id === routeTree.id) {
     throw new Error('You cant remove the root policy');
   }
 
-  function findAndOmit(currentRoute: RouteWithID): Route {
-    return omit(
-      {
-        ...currentRoute,
-        routes: currentRoute.routes?.reduce((acc: Route[] = [], route) => {
-          if (route.id === findRoute.id) {
-            return acc;
-          }
-
-          acc.push(findAndOmit(route));
+  function findAndOmit(currentRoute: RouteWithID): RouteWithID {
+    return {
+      ...currentRoute,
+      routes: currentRoute.routes?.reduce((acc: RouteWithID[] = [], route) => {
+        if (route.id === findRoute.id) {
           return acc;
-        }, []),
-      },
-      'id'
-    );
+        }
+
+        acc.push(findAndOmit(route));
+        return acc;
+      }, []),
+    };
   }
 
   return findAndOmit(routeTree);
 };
 
+export type InsertPosition = 'above' | 'below' | 'child';
+
 // add a new route to a parent route
-export const addRouteToParentRoute = (
+export const addRouteToReferenceRoute = (
   alertManagerSourceName: string,
   partialFormRoute: Partial<FormAmRoute>,
-  parentRoute: RouteWithID,
-  routeTree: RouteWithID
-): Route => {
+  referenceRoute: RouteWithID,
+  routeTree: RouteWithID,
+  position: InsertPosition
+): RouteWithID => {
   const newRoute = formAmRouteToAmRoute(alertManagerSourceName, partialFormRoute, routeTree);
 
-  function findAndAdd(currentRoute: RouteWithID): RouteWithID {
-    if (currentRoute.id === parentRoute.id) {
-      return {
-        ...currentRoute,
-        // TODO fix this typescript exception, it's... complicated
-        // @ts-ignore
-        routes: currentRoute.routes?.concat(newRoute),
-      };
+  return produce(routeTree, (draftTree) => {
+    const [routeInTree, parentRoute, positionInParent] = findRouteInTree(draftTree, referenceRoute);
+
+    if (routeInTree === undefined || parentRoute === undefined || positionInParent === undefined) {
+      throw new Error(`could not find reference route "${referenceRoute.id}" in tree`);
     }
 
-    return {
-      ...currentRoute,
-      routes: currentRoute.routes?.map(findAndAdd),
-    };
-  }
+    // if user wants to insert new child policy, append to the bottom of children
+    if (position === 'child') {
+      if (routeInTree.routes) {
+        routeInTree.routes.push(newRoute);
+      } else {
+        routeInTree.routes = [newRoute];
+      }
+    }
 
-  function findAndOmitId(currentRoute: RouteWithID): Route {
-    return omit(
-      {
-        ...currentRoute,
-        routes: currentRoute.routes?.map(findAndOmitId),
-      },
-      'id'
-    );
-  }
+    // insert new policy before / above the referenceRoute
+    if (position === 'above') {
+      parentRoute.routes = insertBeforeImmutably(parentRoute.routes ?? [], newRoute, positionInParent);
+    }
 
-  return findAndOmitId(findAndAdd(routeTree));
+    // insert new policy after / below the referenceRoute
+    if (position === 'below') {
+      parentRoute.routes = insertAfterImmutably(parentRoute.routes ?? [], newRoute, positionInParent);
+    }
+  });
 };
 
+type RouteMatch = Route | undefined;
+
+export function findRouteInTree(
+  routeTree: RouteWithID,
+  referenceRoute: RouteWithID
+): [matchingRoute: RouteMatch, parentRoute: RouteMatch, positionInParent: number | undefined] {
+  let matchingRoute: RouteMatch;
+  let matchingRouteParent: RouteMatch;
+  let matchingRoutePositionInParent: number | undefined;
+
+  // recurse through the tree to find the matching route, its parent and the position of the route in the parent
+  function findRouteInTree(currentRoute: RouteWithID, index: number, parentRoute: RouteWithID) {
+    if (matchingRoute) {
+      return;
+    }
+
+    if (currentRoute.id === referenceRoute.id) {
+      matchingRoute = currentRoute;
+      matchingRouteParent = parentRoute;
+      matchingRoutePositionInParent = index;
+    }
+
+    if (currentRoute.routes) {
+      currentRoute.routes.forEach((route, index) => findRouteInTree(route, index, currentRoute));
+    }
+  }
+
+  findRouteInTree(routeTree, 0, routeTree);
+
+  return [matchingRoute, matchingRouteParent, matchingRoutePositionInParent];
+}
+
+export function cleanRouteIDs(route: Route | RouteWithID): Route {
+  return omit(
+    {
+      ...route,
+      routes: route.routes?.map((route) => cleanRouteIDs(route)),
+    },
+    'id'
+  );
+}
+
 export function findExistingRoute(id: string, routeTree: RouteWithID): RouteWithID | undefined {
   return routeTree.id === id ? routeTree : routeTree.routes?.find((route) => findExistingRoute(id, route));
 }
diff --git a/public/app/features/alerting/unified/utils/rule-form.test.ts b/public/app/features/alerting/unified/utils/rule-form.test.ts
index 5ac93c82d7e2a..735a8f7087b3f 100644
--- a/public/app/features/alerting/unified/utils/rule-form.test.ts
+++ b/public/app/features/alerting/unified/utils/rule-form.test.ts
@@ -1,13 +1,19 @@
+import { config } from '@grafana/runtime';
 import { PromQuery } from 'app/plugins/datasource/prometheus/types';
-import { RulerAlertingRuleDTO } from 'app/types/unified-alerting-dto';
+import { GrafanaAlertStateDecision, GrafanaRuleDefinition, RulerAlertingRuleDTO } from 'app/types/unified-alerting-dto';
 
-import { RuleFormType, RuleFormValues } from '../types/rule-form';
+import { AlertManagerManualRouting, RuleFormType, RuleFormValues } from '../types/rule-form';
 
+import { GRAFANA_RULES_SOURCE_NAME } from './datasource';
 import {
+  MANUAL_ROUTING_KEY,
   alertingRulerRuleToRuleForm,
   formValuesToRulerGrafanaRuleDTO,
   formValuesToRulerRuleDTO,
+  getContactPointsFromDTO,
   getDefaultFormValues,
+  getDefautManualRouting,
+  getNotificationSettingsForDTO,
 } from './rule-form';
 
 describe('formValuesToRulerGrafanaRuleDTO', () => {
@@ -85,3 +91,152 @@ describe('formValuesToRulerGrafanaRuleDTO', () => {
     expect(alertingRulerRuleToRuleForm(rule)).toMatchSnapshot();
   });
 });
+describe('getContactPointsFromDTO', () => {
+  it('should return undefined if notification_settings is not defined', () => {
+    const ga: GrafanaRuleDefinition = {
+      uid: '123',
+      title: 'myalert',
+      namespace_uid: '123',
+      condition: 'A',
+      no_data_state: GrafanaAlertStateDecision.Alerting,
+      exec_err_state: GrafanaAlertStateDecision.Alerting,
+      data: [
+        {
+          datasourceUid: '123',
+          refId: 'A',
+          queryType: 'huh',
+          model: { refId: 'A' },
+        },
+      ],
+      notification_settings: undefined,
+    };
+
+    const result = getContactPointsFromDTO(ga);
+    expect(result).toBeUndefined();
+  });
+
+  it('should return routingSettings with correct props if notification_settings is defined', () => {
+    const ga: GrafanaRuleDefinition = {
+      uid: '123',
+      title: 'myalert',
+      namespace_uid: '123',
+      condition: 'A',
+      no_data_state: GrafanaAlertStateDecision.Alerting,
+      exec_err_state: GrafanaAlertStateDecision.Alerting,
+      data: [
+        {
+          datasourceUid: '123',
+          refId: 'A',
+          queryType: 'huh',
+          model: { refId: 'A' },
+        },
+      ],
+      notification_settings: {
+        receiver: 'receiver',
+        mute_time_intervals: ['mute_timing'],
+        group_by: ['group_by'],
+        group_wait: 'group_wait',
+        group_interval: 'group_interval',
+        repeat_interval: 'repeat_interval',
+      },
+    };
+
+    const result = getContactPointsFromDTO(ga);
+    expect(result).toEqual({
+      [GRAFANA_RULES_SOURCE_NAME]: {
+        selectedContactPoint: 'receiver',
+        muteTimeIntervals: ['mute_timing'],
+        overrideGrouping: true,
+        overrideTimings: true,
+        groupBy: ['group_by'],
+        groupWaitValue: 'group_wait',
+        groupIntervalValue: 'group_interval',
+        repeatIntervalValue: 'repeat_interval',
+      },
+    });
+  });
+});
+
+describe('getNotificationSettingsForDTO', () => {
+  it('should return undefined if manualRouting is false', () => {
+    const manualRouting = false;
+    const contactPoints: AlertManagerManualRouting = {
+      grafana: {
+        selectedContactPoint: 'receiver',
+        muteTimeIntervals: ['mute_timing'],
+        overrideGrouping: true,
+        overrideTimings: true,
+        groupBy: ['group_by'],
+        groupWaitValue: 'group_wait',
+        groupIntervalValue: 'group_interval',
+        repeatIntervalValue: 'repeat_interval',
+      },
+    };
+
+    const result = getNotificationSettingsForDTO(manualRouting, contactPoints);
+    expect(result).toBeUndefined();
+  });
+
+  it('should return undefined if selectedContactPoint is not defined', () => {
+    const manualRouting = true;
+
+    const result = getNotificationSettingsForDTO(manualRouting, undefined);
+    expect(result).toBeUndefined();
+  });
+
+  it('should return notification settings if manualRouting is true and selectedContactPoint is defined', () => {
+    const manualRouting = true;
+    const contactPoints: AlertManagerManualRouting = {
+      grafana: {
+        selectedContactPoint: 'receiver',
+        muteTimeIntervals: ['mute_timing'],
+        overrideGrouping: true,
+        overrideTimings: true,
+        groupBy: ['group_by'],
+        groupWaitValue: 'group_wait',
+        groupIntervalValue: 'group_interval',
+        repeatIntervalValue: 'repeat_interval',
+      },
+    };
+
+    const result = getNotificationSettingsForDTO(manualRouting, contactPoints);
+    expect(result).toEqual({
+      receiver: 'receiver',
+      mute_time_intervals: ['mute_timing'],
+      group_by: ['group_by'],
+      group_wait: 'group_wait',
+      group_interval: 'group_interval',
+      repeat_interval: 'repeat_interval',
+    });
+  });
+});
+
+describe('getDefautManualRouting', () => {
+  afterEach(() => {
+    window.localStorage.clear();
+  });
+
+  it('returns false if the feature toggle is not enabled', () => {
+    config.featureToggles.alertingSimplifiedRouting = false;
+    expect(getDefautManualRouting()).toBe(false);
+  });
+
+  it('returns true if the feature toggle is enabled and localStorage is not set', () => {
+    config.featureToggles.alertingSimplifiedRouting = true;
+    expect(getDefautManualRouting()).toBe(true);
+  });
+
+  it('returns false if the feature toggle is enabled and localStorage is set to "false"', () => {
+    config.featureToggles.alertingSimplifiedRouting = true;
+    localStorage.setItem(MANUAL_ROUTING_KEY, 'false');
+    expect(getDefautManualRouting()).toBe(false);
+  });
+
+  it('returns true if the feature toggle is enabled and localStorage is set to any value other than "false"', () => {
+    config.featureToggles.alertingSimplifiedRouting = true;
+    localStorage.setItem(MANUAL_ROUTING_KEY, 'true');
+    expect(getDefautManualRouting()).toBe(true);
+    localStorage.removeItem(MANUAL_ROUTING_KEY);
+    expect(getDefautManualRouting()).toBe(true);
+  });
+});
diff --git a/public/app/features/alerting/unified/utils/rule-form.ts b/public/app/features/alerting/unified/utils/rule-form.ts
index 7b3d1d2661260..f7dd7d6c43737 100644
--- a/public/app/features/alerting/unified/utils/rule-form.ts
+++ b/public/app/features/alerting/unified/utils/rule-form.ts
@@ -11,11 +11,17 @@ import {
   ScopedVars,
   TimeRange,
 } from '@grafana/data';
-import { getDataSourceSrv } from '@grafana/runtime';
+import { config, getDataSourceSrv } from '@grafana/runtime';
 import { ExpressionDatasourceRef } from '@grafana/runtime/src/utils/DataSourceWithBackend';
+import { sceneGraph, VizPanel } from '@grafana/scenes';
 import { DataSourceJsonData } from '@grafana/schema';
 import { getNextRefIdChar } from 'app/core/utils/query';
 import { DashboardModel, PanelModel } from 'app/features/dashboard/state';
+import {
+  getDashboardSceneFor,
+  getPanelIdForVizPanel,
+  getQueryRunnerFor,
+} from 'app/features/dashboard-scene/utils/utils';
 import { ExpressionDatasourceUID, ExpressionQuery, ExpressionQueryType } from 'app/features/expressions/types';
 import { LokiQuery } from 'app/plugins/datasource/loki/types';
 import { PromQuery } from 'app/plugins/datasource/prometheus/types';
@@ -25,6 +31,8 @@ import {
   AlertQuery,
   Annotations,
   GrafanaAlertStateDecision,
+  GrafanaNotificationSettings,
+  GrafanaRuleDefinition,
   Labels,
   PostableRuleGrafanaRuleDTO,
   RulerAlertingRuleDTO,
@@ -33,11 +41,11 @@ import {
 } from 'app/types/unified-alerting-dto';
 
 import { EvalFunction } from '../../state/alertDef';
-import { RuleFormType, RuleFormValues } from '../types/rule-form';
+import { AlertManagerManualRouting, ContactPoint, RuleFormType, RuleFormValues } from '../types/rule-form';
 
 import { getRulesAccess } from './access-control';
 import { Annotation, defaultAnnotations } from './constants';
-import { getDefaultOrFirstCompatibleDataSource, isGrafanaRulesSource } from './datasource';
+import { getDefaultOrFirstCompatibleDataSource, GRAFANA_RULES_SOURCE_NAME, isGrafanaRulesSource } from './datasource';
 import { arrayToRecord, recordToArray } from './misc';
 import { isAlertingRulerRule, isGrafanaRulerRule, isRecordingRulerRule } from './rules';
 import { parseInterval } from './time';
@@ -46,6 +54,8 @@ export type PromOrLokiQuery = PromQuery | LokiQuery;
 
 export const MINUTE = '1m';
 
+export const MANUAL_ROUTING_KEY = 'grafana.alerting.manualRouting';
+
 export const getDefaultFormValues = (): RuleFormValues => {
   const { canCreateGrafanaRules, canCreateCloudRules } = getRulesAccess();
 
@@ -67,6 +77,11 @@ export const getDefaultFormValues = (): RuleFormValues => {
     execErrState: GrafanaAlertStateDecision.Error,
     evaluateFor: '5m',
     evaluateEvery: MINUTE,
+    manualRouting: getDefautManualRouting(), // we default to true if the feature toggle is enabled and the user hasn't set local storage to false
+    contactPoints: {},
+    overrideGrouping: false,
+    overrideTimings: false,
+    muteTimeIntervals: [],
 
     // cortex / loki
     namespace: '',
@@ -76,6 +91,18 @@ export const getDefaultFormValues = (): RuleFormValues => {
   });
 };
 
+export const getDefautManualRouting = () => {
+  // first check if feature toggle for simplified routing is enabled
+  const simplifiedRoutingToggleEnabled = config.featureToggles.alertingSimplifiedRouting ?? false;
+  if (!simplifiedRoutingToggleEnabled) {
+    return false;
+  }
+  //then, check in local storage if the user has enabled simplified routing
+  // if it's not set, we'll default to true
+  const manualRouting = localStorage.getItem(MANUAL_ROUTING_KEY);
+  return manualRouting !== 'false';
+};
+
 export function formValuesToRulerRuleDTO(values: RuleFormValues): RulerRuleDTO {
   const { name, expression, forTime, forTimeUnit, keepFiringForTime, keepFiringForTimeUnit, type } = values;
   if (type === RuleFormType.cloudAlerting) {
@@ -133,9 +160,41 @@ export function normalizeDefaultAnnotations(annotations: Array<{ key: string; va
   return orderedAnnotations;
 }
 
+export function getNotificationSettingsForDTO(
+  manualRouting: boolean,
+  contactPoints?: AlertManagerManualRouting
+): GrafanaNotificationSettings | undefined {
+  if (contactPoints?.grafana?.selectedContactPoint && manualRouting) {
+    return {
+      receiver: contactPoints?.grafana?.selectedContactPoint,
+      mute_time_intervals: contactPoints?.grafana?.muteTimeIntervals,
+      group_by: contactPoints?.grafana?.overrideGrouping ? contactPoints?.grafana?.groupBy : undefined,
+      group_wait:
+        contactPoints?.grafana?.overrideTimings && contactPoints?.grafana?.groupWaitValue
+          ? contactPoints?.grafana?.groupWaitValue
+          : undefined,
+      group_interval:
+        contactPoints?.grafana?.overrideTimings && contactPoints?.grafana?.groupIntervalValue
+          ? contactPoints?.grafana?.groupIntervalValue
+          : undefined,
+      repeat_interval:
+        contactPoints?.grafana?.overrideTimings && contactPoints?.grafana?.repeatIntervalValue
+          ? contactPoints?.grafana?.repeatIntervalValue
+          : undefined,
+    };
+  }
+  return undefined;
+}
+
 export function formValuesToRulerGrafanaRuleDTO(values: RuleFormValues): PostableRuleGrafanaRuleDTO {
-  const { name, condition, noDataState, execErrState, evaluateFor, queries, isPaused } = values;
+  const { name, condition, noDataState, execErrState, evaluateFor, queries, isPaused, contactPoints, manualRouting } =
+    values;
   if (condition) {
+    const notificationSettings: GrafanaNotificationSettings | undefined = getNotificationSettingsForDTO(
+      manualRouting,
+      contactPoints
+    );
+
     return {
       grafana_alert: {
         title: name,
@@ -144,6 +203,7 @@ export function formValuesToRulerGrafanaRuleDTO(values: RuleFormValues): Postabl
         exec_err_state: execErrState,
         data: queries.map(fixBothInstantAndRangeQuery),
         is_paused: Boolean(isPaused),
+        notification_settings: notificationSettings,
       },
       for: evaluateFor,
       annotations: arrayToRecord(values.annotations || []),
@@ -153,6 +213,32 @@ export function formValuesToRulerGrafanaRuleDTO(values: RuleFormValues): Postabl
   throw new Error('Cannot create rule without specifying alert condition');
 }
 
+export function getContactPointsFromDTO(ga: GrafanaRuleDefinition): AlertManagerManualRouting | undefined {
+  const contactPoint: ContactPoint | undefined = ga.notification_settings
+    ? {
+        selectedContactPoint: ga.notification_settings.receiver,
+        muteTimeIntervals: ga.notification_settings.mute_time_intervals ?? [],
+        overrideGrouping:
+          Array.isArray(ga.notification_settings.group_by) && ga.notification_settings.group_by.length > 0,
+        overrideTimings: [
+          ga.notification_settings.group_wait,
+          ga.notification_settings.group_interval,
+          ga.notification_settings.repeat_interval,
+        ].some(Boolean),
+        groupBy: ga.notification_settings.group_by || [],
+        groupWaitValue: ga.notification_settings.group_wait || '',
+        groupIntervalValue: ga.notification_settings.group_interval || '',
+        repeatIntervalValue: ga.notification_settings.repeat_interval || '',
+      }
+    : undefined;
+  const routingSettings: AlertManagerManualRouting | undefined = contactPoint
+    ? {
+        [GRAFANA_RULES_SOURCE_NAME]: contactPoint,
+      }
+    : undefined;
+  return routingSettings;
+}
+
 export function rulerRuleToFormValues(ruleWithLocation: RuleWithLocation): RuleFormValues {
   const { ruleSourceName, namespace, group, rule } = ruleWithLocation;
 
@@ -161,6 +247,8 @@ export function rulerRuleToFormValues(ruleWithLocation: RuleWithLocation): RuleF
     if (isGrafanaRulerRule(rule)) {
       const ga = rule.grafana_alert;
 
+      const routingSettings: AlertManagerManualRouting | undefined = getContactPointsFromDTO(ga);
+
       return {
         ...defaultFormValues,
         name: ga.title,
@@ -176,6 +264,9 @@ export function rulerRuleToFormValues(ruleWithLocation: RuleWithLocation): RuleF
         labels: listifyLabelsOrAnnotations(rule.labels, true),
         folder: { title: namespace, uid: ga.namespace_uid },
         isPaused: ga.is_paused,
+
+        contactPoints: routingSettings,
+        manualRouting: Boolean(routingSettings),
       };
     } else {
       throw new Error('Unexpected type of rule for grafana rules source');
@@ -241,9 +332,7 @@ export function alertingRulerRuleToRuleForm(
 > {
   const defaultFormValues = getDefaultFormValues();
 
-  const [forTime, forTimeUnit] = rule.for
-    ? parseInterval(rule.for)
-    : [defaultFormValues.forTime, defaultFormValues.forTimeUnit];
+  const [forTime, forTimeUnit] = rule.for ? parseInterval(rule.for) : [0, 's'];
 
   const [keepFiringForTime, keepFiringForTimeUnit] = rule.keep_firing_for
     ? parseInterval(rule.keep_firing_for)
@@ -413,7 +502,7 @@ const dataQueriesToGrafanaQueries = async (
     };
 
     const interpolatedTarget = datasource.interpolateVariablesInQueries
-      ? await datasource.interpolateVariablesInQueries([target], queryVariables)[0]
+      ? datasource.interpolateVariablesInQueries([target], queryVariables)[0]
       : target;
 
     // expressions
@@ -510,6 +599,77 @@ export const panelToRuleFormValues = async (
   return formValues;
 };
 
+export const scenesPanelToRuleFormValues = async (vizPanel: VizPanel): Promise<Partial<RuleFormValues> | undefined> => {
+  if (!vizPanel.state.key) {
+    return undefined;
+  }
+
+  const timeRange = sceneGraph.getTimeRange(vizPanel);
+  const queryRunner = getQueryRunnerFor(vizPanel);
+  if (!queryRunner) {
+    return undefined;
+  }
+  const { queries, datasource, maxDataPoints, minInterval } = queryRunner.state;
+
+  const dashboard = getDashboardSceneFor(vizPanel);
+  if (!dashboard || !dashboard.state.uid) {
+    return undefined;
+  }
+
+  const grafanaQueries = await dataQueriesToGrafanaQueries(
+    queries,
+    rangeUtil.timeRangeToRelative(rangeUtil.convertRawToRange(timeRange.state.value.raw)),
+    { __sceneObject: { value: vizPanel } },
+    datasource,
+    maxDataPoints,
+    minInterval
+  );
+
+  // if no alerting capable queries are found, can't create a rule
+  if (!grafanaQueries.length || !grafanaQueries.find((query) => query.datasourceUid !== ExpressionDatasourceUID)) {
+    return undefined;
+  }
+
+  if (!grafanaQueries.find((query) => query.datasourceUid === ExpressionDatasourceUID)) {
+    const [reduceExpression, _thresholdExpression] = getDefaultExpressions(getNextRefIdChar(grafanaQueries), '-');
+    grafanaQueries.push(reduceExpression);
+
+    const [_reduceExpression, thresholdExpression] = getDefaultExpressions(
+      reduceExpression.refId,
+      getNextRefIdChar(grafanaQueries)
+    );
+    grafanaQueries.push(thresholdExpression);
+  }
+
+  const { folderTitle, folderUid } = dashboard.state.meta;
+
+  const formValues = {
+    type: RuleFormType.grafana,
+    folder:
+      folderUid && folderTitle
+        ? {
+            uid: folderUid,
+            title: folderTitle,
+          }
+        : undefined,
+    queries: grafanaQueries,
+    name: vizPanel.state.title,
+    condition: grafanaQueries[grafanaQueries.length - 1].refId,
+    annotations: [
+      {
+        key: Annotation.dashboardUID,
+        value: dashboard.state.uid,
+      },
+      {
+        key: Annotation.panelID,
+
+        value: String(getPanelIdForVizPanel(vizPanel)),
+      },
+    ],
+  };
+  return formValues;
+};
+
 export function getIntervals(range: TimeRange, lowLimit?: string, resolution?: number): IntervalValues {
   if (!resolution) {
     if (lowLimit && rangeUtil.intervalToMs(lowLimit) > 1000) {
diff --git a/public/app/features/alerting/unified/utils/rule-id.test.ts b/public/app/features/alerting/unified/utils/rule-id.test.ts
index d862d55475bbe..508199de2a287 100644
--- a/public/app/features/alerting/unified/utils/rule-id.test.ts
+++ b/public/app/features/alerting/unified/utils/rule-id.test.ts
@@ -46,7 +46,6 @@ describe('hashRulerRule', () => {
     const grafanaAlertDefinition: GrafanaRuleDefinition = {
       uid: RULE_UID,
       namespace_uid: 'namespace',
-      namespace_id: 0,
       title: 'my rule',
       condition: '',
       data: [],
diff --git a/public/app/features/alerting/unified/utils/rulerClient.ts b/public/app/features/alerting/unified/utils/rulerClient.ts
index ed5938020b860..1e6405ef0c24c 100644
--- a/public/app/features/alerting/unified/utils/rulerClient.ts
+++ b/public/app/features/alerting/unified/utils/rulerClient.ts
@@ -6,7 +6,7 @@ import {
   RulerRuleGroupDTO,
 } from 'app/types/unified-alerting-dto';
 
-import { deleteRulerRulesGroup, fetchRulerRulesGroup, fetchRulerRules, setRulerRuleGroup } from '../api/ruler';
+import { deleteRulerRulesGroup, fetchRulerRules, fetchRulerRulesGroup, setRulerRuleGroup } from '../api/ruler';
 import { RuleFormValues } from '../types/rule-form';
 import * as ruleId from '../utils/rule-id';
 
@@ -41,6 +41,7 @@ export function getRulerClient(rulerConfig: RulerDataSourceConfig): RulerClient
               group,
               ruleSourceName: GRAFANA_RULES_SOURCE_NAME,
               namespace: namespace,
+              namespace_uid: (isGrafanaRulerRule(rule) && rule.grafana_alert.namespace_uid) || undefined,
               rule,
             };
           }
@@ -81,15 +82,15 @@ export function getRulerClient(rulerConfig: RulerDataSourceConfig): RulerClient
   };
 
   const deleteRule = async (ruleWithLocation: RuleWithLocation): Promise<void> => {
-    const { namespace, group, rule } = ruleWithLocation;
+    const { namespace, group, rule, namespace_uid } = ruleWithLocation;
 
     // it was the last rule, delete the entire group
     if (group.rules.length === 1) {
-      await deleteRulerRulesGroup(rulerConfig, namespace, group.name);
+      await deleteRulerRulesGroup(rulerConfig, namespace_uid || namespace, group.name);
       return;
     }
     // post the group with rule removed
-    await setRulerRuleGroup(rulerConfig, namespace, {
+    await setRulerRuleGroup(rulerConfig, namespace_uid || namespace, {
       ...group,
       rules: group.rules.filter((r) => r !== rule),
     });
@@ -159,11 +160,11 @@ export function getRulerClient(rulerConfig: RulerDataSourceConfig): RulerClient
     }
 
     const newRule = formValuesToRulerGrafanaRuleDTO(values);
-    const namespace = folder.title;
+    const namespaceUID = folder.uid;
     const groupSpec = { name: group, interval: evaluateEvery };
 
     if (!existingRule) {
-      return addRuleToNamespaceAndGroup(namespace, groupSpec, newRule);
+      return addRuleToNamespaceAndGroup(namespaceUID, groupSpec, newRule);
     }
 
     // we'll fetch the existing group again, someone might have updated it while we were editing a rule
@@ -172,7 +173,7 @@ export function getRulerClient(rulerConfig: RulerDataSourceConfig): RulerClient
       throw new Error('Rule not found.');
     }
 
-    const sameNamespace = freshExisting.namespace === namespace;
+    const sameNamespace = freshExisting.namespace_uid === namespaceUID;
     const sameGroup = freshExisting.group.name === values.group;
     const sameLocation = sameNamespace && sameGroup;
 
@@ -181,16 +182,16 @@ export function getRulerClient(rulerConfig: RulerDataSourceConfig): RulerClient
       return updateGrafanaRule(freshExisting, newRule, evaluateEvery);
     } else {
       // we're moving a rule to either a different group or namespace
-      return moveGrafanaRule(namespace, groupSpec, freshExisting, newRule);
+      return moveGrafanaRule(namespaceUID, groupSpec, freshExisting, newRule);
     }
   };
 
   const addRuleToNamespaceAndGroup = async (
-    namespace: string,
+    namespaceUID: string,
     group: { name: string; interval: string },
     newRule: PostableRuleGrafanaRuleDTO
   ): Promise<RuleIdentifier> => {
-    const existingGroup = await fetchRulerRulesGroup(rulerConfig, namespace, group.name);
+    const existingGroup = await fetchRulerRulesGroup(rulerConfig, namespaceUID, group.name);
     if (!existingGroup) {
       throw new Error(`No group found with name "${group.name}"`);
     }
@@ -201,7 +202,7 @@ export function getRulerClient(rulerConfig: RulerDataSourceConfig): RulerClient
       rules: (existingGroup.rules ?? []).concat(newRule as RulerGrafanaRuleDTO),
     };
 
-    await setRulerRuleGroup(rulerConfig, namespace, payload);
+    await setRulerRuleGroup(rulerConfig, namespaceUID, payload);
 
     return { uid: newRule.grafana_alert.uid ?? '', ruleSourceName: GRAFANA_RULES_SOURCE_NAME };
   };
@@ -242,7 +243,7 @@ export function getRulerClient(rulerConfig: RulerDataSourceConfig): RulerClient
       return rule;
     });
 
-    await setRulerRuleGroup(rulerConfig, existingRule.namespace, {
+    await setRulerRuleGroup(rulerConfig, existingRule.namespace_uid ?? '', {
       name: existingRule.group.name,
       interval: interval,
       rules: newRules,
diff --git a/public/app/features/alerting/unified/utils/rules.ts b/public/app/features/alerting/unified/utils/rules.ts
index 03dd44878ff2f..3885db0d20df6 100644
--- a/public/app/features/alerting/unified/utils/rules.ts
+++ b/public/app/features/alerting/unified/utils/rules.ts
@@ -161,7 +161,8 @@ const alertStateToStateMap: Record<PromAlertingRuleState | GrafanaAlertState | A
   [AlertState.Paused]: 'warning',
   [AlertState.Alerting]: 'bad',
   [AlertState.OK]: 'good',
-  [AlertState.Pending]: 'warning',
+  // AlertState.Pending is not included because the 'pending' value is already covered by `PromAlertingRuleState.Pending`
+  // [AlertState.Pending]: 'warning',
   [AlertState.Unknown]: 'info',
 };
 
@@ -170,8 +171,7 @@ export function getFirstActiveAt(promRule?: AlertingRule) {
     return null;
   }
   return promRule.alerts.reduce<Date | null>((prev, alert) => {
-    const isNotNormal =
-      mapStateWithReasonToBaseState(alert.state as GrafanaAlertStateWithReason) !== GrafanaAlertState.Normal;
+    const isNotNormal = mapStateWithReasonToBaseState(alert.state) !== GrafanaAlertState.Normal;
     if (alert.activeAt && isNotNormal) {
       const activeAt = new Date(alert.activeAt);
       if (prev === null || prev.getTime() > activeAt.getTime()) {
@@ -229,8 +229,8 @@ export const getAlertInfo = (alert: RulerRuleDTO, currentEvaluation: string): Al
   if (isAlertingRulerRule(alert)) {
     return {
       alertName: alert.alert,
-      forDuration: alert.for ?? '1m',
-      evaluationsToFire: getNumberEvaluationsToStartAlerting(alert.for ?? '1m', currentEvaluation),
+      forDuration: alert.for ?? '0s',
+      evaluationsToFire: getNumberEvaluationsToStartAlerting(alert.for ?? '0s', currentEvaluation),
     };
   }
   return emptyAlert;
diff --git a/public/app/features/alerting/unified/utils/timeRange.ts b/public/app/features/alerting/unified/utils/timeRange.ts
index dd7b3370bd1d4..11edb6c9034da 100644
--- a/public/app/features/alerting/unified/utils/timeRange.ts
+++ b/public/app/features/alerting/unified/utils/timeRange.ts
@@ -29,6 +29,7 @@ const getReferencedIds = (model: ExpressionQuery, queries: AlertQuery[]): string
     case ExpressionQueryType.classic:
       return getReferencedIdsForClassicCondition(model);
     case ExpressionQueryType.math:
+    case ExpressionQueryType.sql:
       return getReferencedIdsForMath(model, queries);
     case ExpressionQueryType.resample:
     case ExpressionQueryType.reduce:
diff --git a/public/app/features/alerting/utils/notificationChannel.test.ts b/public/app/features/alerting/utils/notificationChannel.test.ts
deleted file mode 100644
index 757c9f3477fc2..0000000000000
--- a/public/app/features/alerting/utils/notificationChannel.test.ts
+++ /dev/null
@@ -1,210 +0,0 @@
-import { NotificationChannelDTO } from '../../../types';
-
-import { transformSubmitData } from './notificationChannels';
-
-const basicFormData: NotificationChannelDTO = {
-  id: 1,
-  uid: 'pX7fbbHGk',
-  name: 'Pete discord',
-  type: {
-    value: 'discord',
-    label: 'Discord',
-    type: 'discord',
-    name: 'Discord',
-    heading: 'Discord settings',
-    description: 'Sends notifications to Discord',
-    info: '',
-    options: [
-      {
-        element: 'input',
-        inputType: 'text',
-        label: 'Message Content',
-        description: 'Mention a group using @ or a user using <@ID> when notifying in a channel',
-        placeholder: '',
-        propertyName: 'content',
-        selectOptions: null,
-        showWhen: { field: '', is: '' },
-        required: false,
-        validationRule: '',
-        secure: false,
-      },
-      {
-        element: 'input',
-        inputType: 'text',
-        label: 'Webhook URL',
-        description: '',
-        placeholder: 'Discord webhook URL',
-        propertyName: 'url',
-        selectOptions: null,
-        showWhen: { field: '', is: '' },
-        required: true,
-        validationRule: '',
-        secure: false,
-      },
-    ],
-    typeName: 'discord',
-  },
-  isDefault: false,
-  sendReminder: false,
-  disableResolveMessage: false,
-  frequency: '',
-  created: '2020-08-24T10:46:43+02:00',
-  updated: '2020-09-02T14:08:27+02:00',
-  settings: {
-    url: 'https://discordapp.com/api/webhooks/',
-    uploadImage: true,
-    content: '',
-    autoResolve: true,
-    httpMethod: 'POST',
-    severity: 'critical',
-  },
-  secureFields: {},
-  secureSettings: {},
-};
-
-const selectFormData: NotificationChannelDTO = {
-  id: 23,
-  uid: 'BxEN9rNGk',
-  name: 'Webhook',
-  type: {
-    value: 'webhook',
-    label: 'webhook',
-    type: 'webhook',
-    name: 'webhook',
-    heading: 'Webhook settings',
-    description: 'Sends HTTP POST request to a URL',
-    info: '',
-    options: [
-      {
-        element: 'input',
-        inputType: 'text',
-        label: 'Url',
-        description: '',
-        placeholder: '',
-        propertyName: 'url',
-        selectOptions: null,
-        showWhen: { field: '', is: '' },
-        required: true,
-        validationRule: '',
-        secure: false,
-      },
-      {
-        element: 'select',
-        inputType: '',
-        label: 'Http Method',
-        description: '',
-        placeholder: '',
-        propertyName: 'httpMethod',
-        selectOptions: [
-          { value: 'POST', label: 'POST' },
-          { value: 'PUT', label: 'PUT' },
-        ],
-        showWhen: { field: '', is: '' },
-        required: false,
-        validationRule: '',
-        secure: false,
-      },
-      {
-        element: 'input',
-        inputType: 'text',
-        label: 'Username',
-        description: '',
-        placeholder: '',
-        propertyName: 'username',
-        selectOptions: null,
-        showWhen: { field: '', is: '' },
-        required: false,
-        validationRule: '',
-        secure: false,
-      },
-      {
-        element: 'input',
-        inputType: 'password',
-        label: 'Password',
-        description: '',
-        placeholder: '',
-        propertyName: 'password',
-        selectOptions: null,
-        showWhen: { field: '', is: '' },
-        required: false,
-        validationRule: '',
-        secure: true,
-      },
-    ],
-    typeName: 'webhook',
-  },
-  isDefault: false,
-  sendReminder: false,
-  disableResolveMessage: false,
-  frequency: '',
-  created: '2020-08-28T10:47:37+02:00',
-  updated: '2020-09-03T09:37:21+02:00',
-  settings: {
-    autoResolve: true,
-    httpMethod: 'POST',
-    password: '',
-    severity: 'critical',
-    uploadImage: true,
-    url: 'http://asdf',
-    username: 'asdf',
-  },
-  secureFields: { password: true },
-  secureSettings: {},
-};
-
-describe('Transform submit data', () => {
-  it('basic transform', () => {
-    const expected = {
-      id: 1,
-      name: 'Pete discord',
-      type: 'discord',
-      sendReminder: false,
-      disableResolveMessage: false,
-      frequency: '15m',
-      settings: {
-        uploadImage: true,
-        autoResolve: true,
-        httpMethod: 'POST',
-        severity: 'critical',
-        url: 'https://discordapp.com/api/webhooks/',
-        content: '',
-      },
-      secureSettings: {},
-      secureFields: {},
-      isDefault: false,
-      uid: 'pX7fbbHGk',
-      created: '2020-08-24T10:46:43+02:00',
-      updated: '2020-09-02T14:08:27+02:00',
-    };
-
-    expect(transformSubmitData(basicFormData)).toEqual(expected);
-  });
-
-  it('should transform form data with selects', () => {
-    const expected = {
-      created: '2020-08-28T10:47:37+02:00',
-      disableResolveMessage: false,
-      frequency: '15m',
-      id: 23,
-      isDefault: false,
-      name: 'Webhook',
-      secureFields: { password: true },
-      secureSettings: {},
-      sendReminder: false,
-      settings: {
-        autoResolve: true,
-        httpMethod: 'POST',
-        password: '',
-        severity: 'critical',
-        uploadImage: true,
-        url: 'http://asdf',
-        username: 'asdf',
-      },
-      type: 'webhook',
-      uid: 'BxEN9rNGk',
-      updated: '2020-09-03T09:37:21+02:00',
-    };
-
-    expect(transformSubmitData(selectFormData)).toEqual(expected);
-  });
-});
diff --git a/public/app/features/alerting/utils/notificationChannels.ts b/public/app/features/alerting/utils/notificationChannels.ts
deleted file mode 100644
index 7c9419ba39f15..0000000000000
--- a/public/app/features/alerting/utils/notificationChannels.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import memoizeOne from 'memoize-one';
-
-import { SelectableValue } from '@grafana/data';
-import { config } from '@grafana/runtime';
-import { NotificationChannelDTO, NotificationChannelType } from 'app/types';
-
-export const defaultValues: NotificationChannelDTO = {
-  id: -1,
-  name: '',
-  type: { value: 'email', label: 'Email' },
-  sendReminder: false,
-  disableResolveMessage: false,
-  frequency: '15m',
-  settings: {
-    uploadImage: config.rendererAvailable,
-    autoResolve: true,
-    httpMethod: 'POST',
-    severity: 'critical',
-  },
-  secureSettings: {},
-  secureFields: {},
-  isDefault: false,
-};
-
-export const mapChannelsToSelectableValue = memoizeOne(
-  (notificationChannels: NotificationChannelType[], includeDescription: boolean): Array<SelectableValue<string>> => {
-    return notificationChannels.map((channel) => {
-      if (includeDescription) {
-        return {
-          value: channel.value,
-          label: channel.label,
-          description: channel.description,
-        };
-      }
-      return {
-        value: channel.value,
-        label: channel.label,
-      };
-    });
-  }
-);
-
-export const transformSubmitData = (formData: NotificationChannelDTO) => {
-  /*
-    Some settings can be options in a select, in order to not save a SelectableValue<T>
-    we need to use check if it is a SelectableValue and use its value.
-  */
-  const settings = Object.fromEntries(
-    Object.entries(formData.settings).map(([key, value]) => {
-      return [key, value && value.hasOwnProperty('value') ? value.value : value];
-    })
-  );
-
-  return {
-    ...defaultValues,
-    ...formData,
-    frequency: formData.frequency === '' ? defaultValues.frequency : formData.frequency,
-    type: formData.type.value,
-    settings: { ...defaultValues.settings, ...settings },
-    secureSettings: { ...formData.secureSettings },
-  };
-};
-
-export const transformTestData = (formData: NotificationChannelDTO) => {
-  return {
-    name: formData.name,
-    type: formData.type.value,
-    frequency: formData.frequency ?? defaultValues.frequency,
-    settings: { ...Object.assign(defaultValues.settings, formData.settings) },
-    secureSettings: { ...formData.secureSettings },
-  };
-};
diff --git a/public/app/features/annotations/components/StandardAnnotationQueryEditor.tsx b/public/app/features/annotations/components/StandardAnnotationQueryEditor.tsx
index 4bce32eddb192..b07d7843759b3 100644
--- a/public/app/features/annotations/components/StandardAnnotationQueryEditor.tsx
+++ b/public/app/features/annotations/components/StandardAnnotationQueryEditor.tsx
@@ -1,5 +1,4 @@
-import { css, cx } from '@emotion/css';
-import React, { PureComponent } from 'react';
+import React, { PureComponent, ReactElement } from 'react';
 import { lastValueFrom } from 'rxjs';
 
 import {
@@ -11,7 +10,8 @@ import {
   DataSourcePluginContextProvider,
   LoadingState,
 } from '@grafana/data';
-import { Button, Icon, IconName, Spinner } from '@grafana/ui';
+import { selectors } from '@grafana/e2e-selectors';
+import { Alert, AlertVariant, Button, Space, Spinner } from '@grafana/ui';
 import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
 import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { PanelModel } from 'app/features/dashboard/state';
@@ -112,63 +112,85 @@ export default class StandardAnnotationQueryEditor extends PureComponent<Props,
     });
   };
 
+  getStatusSeverity(response: AnnotationQueryResponse): AlertVariant {
+    const { events, panelData } = response;
+
+    if (panelData?.errors || panelData?.error) {
+      return 'error';
+    }
+
+    if (!events?.length) {
+      return 'warning';
+    }
+
+    return 'success';
+  }
+
+  renderStatusText(response: AnnotationQueryResponse, running: boolean | undefined): ReactElement {
+    const { events, panelData } = response;
+
+    if (running || response?.panelData?.state === LoadingState.Loading || !response) {
+      return <p>{'loading...'}</p>;
+    }
+
+    if (panelData?.errors) {
+      return (
+        <>
+          {panelData.errors.map((e, i) => (
+            <p key={i}>{e.message}</p>
+          ))}
+        </>
+      );
+    }
+    if (panelData?.error) {
+      return <p>{panelData.error.message ?? 'There was an error fetching data'}</p>;
+    }
+
+    if (!events?.length) {
+      return <p>No events found</p>;
+    }
+
+    const frame = panelData?.series?.[0] ?? panelData?.annotations?.[0];
+    return (
+      <p>
+        {events.length} events (from {frame?.fields.length} fields)
+      </p>
+    );
+  }
+
   renderStatus() {
     const { response, running } = this.state;
-    let rowStyle = 'alert-info';
-    let text = '...';
-    let icon: IconName | undefined = undefined;
 
-    if (running || response?.panelData?.state === LoadingState.Loading || !response) {
-      text = 'loading...';
-    } else {
-      const { events, panelData } = response;
-
-      if (panelData?.error) {
-        rowStyle = 'alert-error';
-        icon = 'exclamation-triangle';
-        text = panelData.error.message ?? 'error';
-      } else if (!events?.length) {
-        rowStyle = 'alert-warning';
-        icon = 'exclamation-triangle';
-        text = 'No events found';
-      } else {
-        const frame = panelData?.series?.[0] ?? panelData?.annotations?.[0];
-
-        text = `${events.length} events (from ${frame?.fields.length} fields)`;
-      }
+    if (!response) {
+      return null;
     }
+
     return (
-      <div
-        className={cx(
-          rowStyle,
-          css`
-            margin: 4px 0px;
-            padding: 4px;
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-          `
-        )}
-      >
-        <div>
-          {icon && (
-            <>
-              <Icon name={icon} />
-              &nbsp;
-            </>
-          )}
-          {text}
-        </div>
+      <>
+        <Space v={2} />
         <div>
           {running ? (
             <Spinner />
           ) : (
-            <Button variant="secondary" size="xs" onClick={this.onRunQuery}>
-              TEST
+            <Button
+              data-testid={selectors.components.Annotations.editor.testButton}
+              variant="secondary"
+              size="xs"
+              onClick={this.onRunQuery}
+            >
+              Test annotation query
             </Button>
           )}
         </div>
-      </div>
+        <Space v={2} layout="block" />
+        <Alert
+          data-testid={selectors.components.Annotations.editor.resultContainer}
+          severity={this.getStatusSeverity(response)}
+          title="Query result"
+        >
+          {this.renderStatusText(response, running)}
+        </Alert>
+      </>
     );
   }
 
diff --git a/public/app/features/annotations/executeAnnotationQuery.test.ts b/public/app/features/annotations/executeAnnotationQuery.test.ts
new file mode 100644
index 0000000000000..b59188bf06327
--- /dev/null
+++ b/public/app/features/annotations/executeAnnotationQuery.test.ts
@@ -0,0 +1,59 @@
+import { DataSourceApi, dateTime, DataQuery } from '@grafana/data';
+
+import { PanelModel } from '../dashboard/state';
+import { createDashboardModelFixture } from '../dashboard/state/__fixtures__/dashboardFixtures';
+import { TestQuery, getMockDataSource } from '../query/state/__mocks__/mockDataSource';
+
+import { executeAnnotationQuery } from './executeAnnotationQuery';
+import { AnnotationQueryOptions } from './types';
+
+describe('executeAnnotationQuery', () => {
+  let filterQuerySpy: jest.SpyInstance;
+  let querySpy: jest.SpyInstance;
+  let ds: DataSourceApi;
+
+  const setup = ({ query, filterQuery }: { query: TestQuery; filterQuery?: typeof ds.filterQuery }) => {
+    const options: AnnotationQueryOptions = {
+      range: { from: dateTime(), to: dateTime(), raw: { from: '1h', to: 'now' } },
+      dashboard: createDashboardModelFixture({
+        panels: [{ id: 1, type: 'graph' }],
+      }),
+      panel: {} as PanelModel,
+    };
+
+    const ds = getMockDataSource();
+    if (filterQuery) {
+      ds.filterQuery = filterQuery;
+      filterQuerySpy = jest.spyOn(ds, 'filterQuery');
+    }
+    querySpy = jest.spyOn(ds, 'query');
+    executeAnnotationQuery(options, ds, {
+      name: '',
+      enable: false,
+      iconColor: '',
+      target: query,
+    });
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('Should not call query method in case query is filtered out', async () => {
+    setup({
+      query: { q: 'SUM(foo)', refId: 'A' },
+      filterQuery: (query: TestQuery) => query.q !== 'SUM(foo)',
+    });
+    expect(filterQuerySpy).toHaveBeenCalledTimes(1);
+    expect(querySpy).not.toHaveBeenCalled();
+  });
+
+  it('Should call backend in case query is not filtered out', async () => {
+    setup({
+      filterQuery: (_: DataQuery) => true,
+      query: { q: 'SUM(foo)', refId: 'A' },
+    });
+    expect(filterQuerySpy).toHaveBeenCalledTimes(1);
+    expect(querySpy).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/public/app/features/api-keys/ApiKeysPage.tsx b/public/app/features/api-keys/ApiKeysPage.tsx
index db06645a2fa18..ea9d42c8c71ff 100644
--- a/public/app/features/api-keys/ApiKeysPage.tsx
+++ b/public/app/features/api-keys/ApiKeysPage.tsx
@@ -2,9 +2,10 @@ import React, { PureComponent } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
 // Utils
-import { InlineField, InlineSwitch, VerticalGroup, Modal, Button } from '@grafana/ui';
+import { InlineField, InlineSwitch, Modal, Button, EmptyState } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import { contextSrv } from 'app/core/core';
+import { t } from 'app/core/internationalization';
 import { getTimeZone } from 'app/features/profile/state/selectors';
 import { AccessControlAction, ApiKey, ApikeyMigrationResult, StoreState } from 'app/types';
 
@@ -113,41 +114,31 @@ export class ApiKeysPageUnconnected extends PureComponent<Props, State> {
       migrationResult,
     } = this.props;
 
-    if (!hasFetched) {
-      return (
-        <Page {...defaultPageProps}>
-          <Page.Contents isLoading={true}>{}</Page.Contents>
-        </Page>
-      );
-    }
-
     const showTable = apiKeysCount > 0;
     return (
       <Page {...defaultPageProps}>
-        <Page.Contents isLoading={false}>
-          <>
-            <MigrateToServiceAccountsCard onMigrate={this.onMigrateApiKeys} apikeysCount={apiKeysCount} />
-            {showTable ? (
-              <ApiKeysActionBar
-                searchQuery={searchQuery}
-                disabled={!canCreate}
-                onSearchChange={this.onSearchQueryChange}
-              />
-            ) : null}
-            {showTable ? (
-              <VerticalGroup>
-                <InlineField disabled={includeExpiredDisabled} label="Include expired keys">
-                  <InlineSwitch id="showExpired" value={includeExpired} onChange={this.onIncludeExpiredChange} />
-                </InlineField>
-                <ApiKeysTable
-                  apiKeys={apiKeys}
-                  timeZone={timeZone}
-                  onMigrate={this.onMigrateApiKey}
-                  onDelete={this.onDeleteApiKey}
-                />
-              </VerticalGroup>
-            ) : null}
-          </>
+        <Page.Contents isLoading={!hasFetched}>
+          <MigrateToServiceAccountsCard onMigrate={this.onMigrateApiKeys} apikeysCount={apiKeysCount} />
+          {showTable ? (
+            <ApiKeysActionBar
+              searchQuery={searchQuery}
+              disabled={!canCreate}
+              onSearchChange={this.onSearchQueryChange}
+            />
+          ) : null}
+          <InlineField disabled={includeExpiredDisabled} label="Include expired keys">
+            <InlineSwitch id="showExpired" value={includeExpired} onChange={this.onIncludeExpiredChange} />
+          </InlineField>
+          {apiKeys.length > 0 ? (
+            <ApiKeysTable
+              apiKeys={apiKeys}
+              timeZone={timeZone}
+              onMigrate={this.onMigrateApiKey}
+              onDelete={this.onDeleteApiKey}
+            />
+          ) : (
+            <EmptyState variant="not-found" message={t('api-keys.empty-state.message', 'No API keys found')} />
+          )}
         </Page.Contents>
         {migrationResult && (
           <MigrationSummary
diff --git a/public/app/features/apiserver/server.ts b/public/app/features/apiserver/server.ts
new file mode 100644
index 0000000000000..6b75ef795c824
--- /dev/null
+++ b/public/app/features/apiserver/server.ts
@@ -0,0 +1,81 @@
+import { config, getBackendSrv } from '@grafana/runtime';
+
+import {
+  ListOptions,
+  ListOptionsLabelSelector,
+  MetaStatus,
+  Resource,
+  ResourceForCreate,
+  ResourceList,
+  ResourceServer,
+} from './types';
+
+export interface GroupVersionResource {
+  group: string;
+  version: string;
+  resource: string;
+}
+
+export class ScopedResourceServer<T = object, K = string> implements ResourceServer<T, K> {
+  readonly url: string;
+
+  constructor(gvr: GroupVersionResource, namespaced = true) {
+    const ns = namespaced ? `namespaces/${config.namespace}/` : '';
+
+    this.url = `/apis/${gvr.group}/${gvr.version}/${ns}${gvr.resource}`;
+  }
+
+  public async create(obj: ResourceForCreate<T, K>): Promise<void> {
+    return getBackendSrv().post(this.url, obj);
+  }
+
+  public async get(name: string): Promise<Resource<T, K>> {
+    return getBackendSrv().get<Resource<T, K>>(`${this.url}/${name}`);
+  }
+
+  public async list(opts?: ListOptions<T> | undefined): Promise<ResourceList<T, K>> {
+    const finalOpts = opts || {};
+    finalOpts.labelSelector = this.parseLabelSelector(finalOpts?.labelSelector);
+
+    return getBackendSrv().get<ResourceList<T, K>>(this.url, opts);
+  }
+
+  public async update(obj: Resource<T, K>): Promise<Resource<T, K>> {
+    return getBackendSrv().put<Resource<T, K>>(`${this.url}/${obj.metadata.name}`, obj);
+  }
+
+  public async delete(name: string): Promise<MetaStatus> {
+    return getBackendSrv().delete<MetaStatus>(`${this.url}/${name}`);
+  }
+
+  private parseLabelSelector<T>(labelSelector: ListOptionsLabelSelector<T> | undefined): string | undefined {
+    if (!Array.isArray(labelSelector)) {
+      return labelSelector;
+    }
+
+    return labelSelector
+      .map((label) => {
+        const key = String(label.key);
+        const operator = label.operator;
+
+        switch (operator) {
+          case '=':
+          case '!=':
+            return `${key}${operator}${label.value}`;
+
+          case 'in':
+          case 'notin':
+            return `${key}${operator}(${label.value.join(',')})`;
+
+          case '':
+          case '!':
+            return `${operator}${key}`;
+
+          default:
+            return null;
+        }
+      })
+      .filter(Boolean)
+      .join(',');
+  }
+}
diff --git a/public/app/features/apiserver/types.test.ts b/public/app/features/apiserver/types.test.ts
new file mode 100644
index 0000000000000..fb2a81680dd12
--- /dev/null
+++ b/public/app/features/apiserver/types.test.ts
@@ -0,0 +1,30 @@
+import { AnnoKeyCreatedBy, Resource } from './types';
+
+interface MyObjSpec {
+  value: string;
+  count: number;
+}
+
+describe('simple typescript tests', () => {
+  const val: Resource<MyObjSpec, 'MyObject'> = {
+    apiVersion: 'xxx',
+    kind: 'MyObject',
+    metadata: {
+      name: 'A',
+      resourceVersion: '1',
+      creationTimestamp: '123',
+    },
+    spec: {
+      value: 'a',
+      count: 2,
+    },
+  };
+
+  describe('typescript helper', () => {
+    it('read and write annotations', () => {
+      expect(val.metadata.annotations?.[AnnoKeyCreatedBy]).toBeUndefined();
+      val.metadata.annotations = { 'grafana.app/createdBy': 'me' };
+      expect(val.metadata.annotations?.[AnnoKeyCreatedBy]).toBe('me');
+    });
+  });
+});
diff --git a/public/app/features/apiserver/types.ts b/public/app/features/apiserver/types.ts
new file mode 100644
index 0000000000000..41a8cbba08a46
--- /dev/null
+++ b/public/app/features/apiserver/types.ts
@@ -0,0 +1,135 @@
+/**
+ * This file holds generic kubernetes compatible types.
+ *
+ * This is very much a work in progress aiming to simplify common access patterns for k8s resource
+ * Please update and improve types/utilities while we find a good pattern here!
+ *
+ * Once this is more stable and represents a more general pattern, it should be moved to @grafana/data
+ *
+ */
+
+/** The object type and version */
+export interface TypeMeta<K = string> {
+  apiVersion: string;
+  kind: K;
+}
+
+export interface ObjectMeta {
+  // Name is the unique identifier in k8s -- it maps to the "uid" value in most existing grafana objects
+  name: string;
+  // Namespace maps the owner group -- it is typically the org or stackId for most grafana resources
+  namespace?: string;
+  // Resource version will increase (not sequentially!) with any change to the saved value
+  resourceVersion: string;
+  // The first time this was saved
+  creationTimestamp: string;
+  // General resource annotations -- including the common grafana.app values
+  annotations?: GrafanaAnnotations;
+  // General application level key+value pairs
+  labels?: Record<string, string>;
+}
+
+export const AnnoKeyCreatedBy = 'grafana.app/createdBy';
+export const AnnoKeyUpdatedTimestamp = 'grafana.app/updatedTimestamp';
+export const AnnoKeyUpdatedBy = 'grafana.app/updatedBy';
+export const AnnoKeyFolder = 'grafana.app/folder';
+export const AnnoKeySlug = 'grafana.app/slug';
+
+// Identify where values came from
+const AnnoKeyOriginName = 'grafana.app/originName';
+const AnnoKeyOriginPath = 'grafana.app/originPath';
+const AnnoKeyOriginKey = 'grafana.app/originKey';
+const AnnoKeyOriginTimestamp = 'grafana.app/originTimestamp';
+
+type GrafanaAnnotations = {
+  [AnnoKeyCreatedBy]?: string;
+  [AnnoKeyUpdatedTimestamp]?: string;
+  [AnnoKeyUpdatedBy]?: string;
+  [AnnoKeyFolder]?: string;
+  [AnnoKeySlug]?: string;
+
+  [AnnoKeyOriginName]?: string;
+  [AnnoKeyOriginPath]?: string;
+  [AnnoKeyOriginKey]?: string;
+  [AnnoKeyOriginTimestamp]?: string;
+
+  // Any key value
+  [key: string]: string | undefined;
+};
+
+export interface Resource<T = object, K = string> extends TypeMeta<K> {
+  metadata: ObjectMeta;
+  spec: T;
+}
+
+export interface ResourceForCreate<T = object, K = string> extends Partial<TypeMeta<K>> {
+  metadata: Partial<ObjectMeta>;
+  spec: T;
+}
+
+export interface ListMeta {
+  resourceVersion: string;
+  continue?: string;
+  remainingItemCount?: number;
+}
+
+export interface ResourceList<T, K = string> extends TypeMeta {
+  metadata: ListMeta;
+  items: Array<Resource<T, K>>;
+}
+
+export type ListOptionsLabelSelector<T = {}> =
+  | string
+  | Array<
+      | {
+          key: keyof T;
+          operator: '=' | '!=';
+          value: string;
+        }
+      | {
+          key: keyof T;
+          operator: 'in' | 'notin';
+          value: string[];
+        }
+      | {
+          key: keyof T;
+          operator: '' | '!';
+        }
+    >;
+
+export interface ListOptions<T = {}> {
+  // continue the list at a given batch
+  continue?: string;
+
+  // Query by labels
+  // https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors
+  labelSelector?: ListOptionsLabelSelector<T>;
+
+  // Limit the response count
+  limit?: number;
+}
+
+export interface MetaStatus {
+  // Status of the operation. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
+  status: 'Success' | 'Failure';
+
+  // A human-readable description of the status of this operation.
+  message: string;
+
+  // Suggested HTTP return code for this status, 0 if not set.
+  code: number;
+
+  // A machine-readable description of why this operation is in the "Failure" status.
+  reason?: string;
+
+  // Extended data associated with the reason
+  details?: object;
+}
+
+export interface ResourceServer<T = object, K = string> {
+  create(obj: ResourceForCreate<T, K>): Promise<void>;
+  get(name: string): Promise<Resource<T, K>>;
+  list(opts?: ListOptions<T>): Promise<ResourceList<T, K>>;
+  update(obj: ResourceForCreate<T, K>): Promise<Resource<T, K>>;
+  delete(name: string): Promise<MetaStatus>;
+}
diff --git a/public/app/features/auth-config/AuthConfigPage.tsx b/public/app/features/auth-config/AuthConfigPage.tsx
deleted file mode 100644
index c72c0a363cba6..0000000000000
--- a/public/app/features/auth-config/AuthConfigPage.tsx
+++ /dev/null
@@ -1,159 +0,0 @@
-import { css } from '@emotion/css';
-import { isEmpty } from 'lodash';
-import React, { useEffect } from 'react';
-import { connect, ConnectedProps } from 'react-redux';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { reportInteraction } from '@grafana/runtime';
-import { useStyles2 } from '@grafana/ui';
-import { Page } from 'app/core/components/Page/Page';
-import { StoreState } from 'app/types';
-
-import ConfigureAuthCTA from './components/ConfigureAuthCTA';
-import { ProviderCard } from './components/ProviderCard';
-import { loadSettings } from './state/actions';
-import { AuthProviderInfo } from './types';
-import { getProviderUrl } from './utils';
-
-import { getRegisteredAuthProviders } from '.';
-
-interface OwnProps {}
-
-export type Props = OwnProps & ConnectedProps<typeof connector>;
-
-function mapStateToProps(state: StoreState) {
-  const { isLoading, providerStatuses } = state.authConfig;
-  return {
-    isLoading,
-    providerStatuses,
-  };
-}
-
-const mapDispatchToProps = {
-  loadSettings,
-};
-
-const connector = connect(mapStateToProps, mapDispatchToProps);
-
-export const AuthConfigPageUnconnected = ({ providerStatuses, isLoading, loadSettings }: Props): JSX.Element => {
-  const styles = useStyles2(getStyles);
-
-  useEffect(() => {
-    loadSettings();
-  }, [loadSettings]);
-
-  const authProviders = getRegisteredAuthProviders();
-  const enabledProviders = authProviders.filter((p) => providerStatuses[p.id]?.enabled);
-  const configuresProviders = authProviders.filter(
-    (p) => providerStatuses[p.id]?.configured && !providerStatuses[p.id]?.enabled
-  );
-  const availableProviders = authProviders.filter(
-    (p) => !providerStatuses[p.id]?.enabled && !providerStatuses[p.id]?.configured && !providerStatuses[p.id]?.hide
-  );
-  const firstAvailableProvider = availableProviders?.length ? availableProviders[0] : null;
-
-  {
-    /* TODO: make generic for the provider of the configuration or make the documentation point to a collection of all our providers */
-  }
-  const docsLink = (
-    <a
-      className="external-link"
-      href="https://grafana.com/docs/grafana/next/setup-grafana/configure-security/configure-authentication/saml-ui/"
-      target="_blank"
-      rel="noopener noreferrer"
-    >
-      documentation.
-    </a>
-  );
-
-  const subTitle = <span>Manage your auth settings and configure single sign-on. Find out more in our {docsLink}</span>;
-
-  const onCTAClick = () => {
-    reportInteraction('authentication_ui_created', { provider: firstAvailableProvider?.type });
-  };
-  const onProviderCardClick = (provider: AuthProviderInfo) => {
-    reportInteraction('authentication_ui_provider_clicked', { provider: provider.type });
-  };
-
-  return (
-    <Page navId="authentication" subTitle={subTitle}>
-      <Page.Contents isLoading={isLoading}>
-        <h3 className={styles.sectionHeader}>Configured authentication</h3>
-        {!!enabledProviders?.length && (
-          <div className={styles.cardsContainer}>
-            {enabledProviders.map((provider) => (
-              <ProviderCard
-                key={provider.id}
-                providerId={provider.id}
-                displayName={providerStatuses[provider.id]?.name || provider.displayName}
-                authType={provider.protocol}
-                enabled={providerStatuses[provider.id]?.enabled}
-                configPath={provider.configPath}
-                onClick={() => onProviderCardClick(provider)}
-              />
-            ))}
-          </div>
-        )}
-        {!enabledProviders?.length && firstAvailableProvider && !isEmpty(providerStatuses) && (
-          <ConfigureAuthCTA
-            title={`You have no ${firstAvailableProvider.type} configuration created at the moment`}
-            buttonIcon="plus-circle"
-            buttonLink={getProviderUrl(firstAvailableProvider)}
-            buttonTitle={`Configure ${firstAvailableProvider.type}`}
-            onClick={onCTAClick}
-          />
-        )}
-        {!!configuresProviders?.length && (
-          <div className={styles.cardsContainer}>
-            {configuresProviders.map((provider) => (
-              <ProviderCard
-                key={provider.id}
-                providerId={provider.id}
-                displayName={providerStatuses[provider.id]?.name || provider.displayName}
-                authType={provider.protocol}
-                enabled={providerStatuses[provider.id]?.enabled}
-                configPath={provider.configPath}
-                onClick={() => onProviderCardClick(provider)}
-              />
-            ))}
-          </div>
-        )}
-      </Page.Contents>
-    </Page>
-  );
-};
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    cardsContainer: css`
-      display: grid;
-      grid-template-columns: repeat(auto-fill, minmax(288px, 1fr));
-      gap: ${theme.spacing(3)};
-      margin-bottom: ${theme.spacing(3)};
-      margin-top: ${theme.spacing(2)};
-    `,
-    sectionHeader: css`
-      margin-bottom: ${theme.spacing(3)};
-    `,
-    settingsSection: css`
-      margin-top: ${theme.spacing(4)};
-    `,
-    settingName: css`
-      padding-left: 25px;
-    `,
-    doclink: css`
-      padding-bottom: 5px;
-      padding-top: -5px;
-      font-size: ${theme.typography.bodySmall.fontSize};
-      a {
-        color: ${theme.colors.info.name}; // use theme link color or any other color
-        text-decoration: underline; // underline or none, as you prefer
-      }
-    `,
-    settingValue: css`
-      white-space: break-spaces;
-    `,
-  };
-};
-
-export default connector(AuthConfigPageUnconnected);
diff --git a/public/app/features/auth-config/AuthDrawer.test.tsx b/public/app/features/auth-config/AuthDrawer.test.tsx
new file mode 100644
index 0000000000000..35a0fc8728701
--- /dev/null
+++ b/public/app/features/auth-config/AuthDrawer.test.tsx
@@ -0,0 +1,26 @@
+import { screen } from '@testing-library/react';
+import React from 'react';
+import { render } from 'test/redux-rtl';
+
+import { AuthDrawerUnconnected, Props } from './AuthDrawer';
+
+const defaultProps: Props = {
+  onClose: jest.fn(),
+  allowInsecureEmail: false,
+  loadSettings: jest.fn(),
+  saveSettings: jest.fn(),
+};
+
+async function getTestContext(overrides: Partial<Props> = {}) {
+  jest.clearAllMocks();
+
+  const props = { ...defaultProps, ...overrides };
+  const { rerender } = render(<AuthDrawerUnconnected {...props} />);
+
+  return { rerender, props };
+}
+
+it('should render with default props', async () => {
+  await getTestContext({});
+  expect(screen.getByText(/Enable insecure email lookup/i)).toBeInTheDocument();
+});
diff --git a/public/app/features/auth-config/AuthDrawer.tsx b/public/app/features/auth-config/AuthDrawer.tsx
new file mode 100644
index 0000000000000..bd66222ee78df
--- /dev/null
+++ b/public/app/features/auth-config/AuthDrawer.tsx
@@ -0,0 +1,122 @@
+import { css } from '@emotion/css';
+import React, { JSX } from 'react';
+import { connect, ConnectedProps } from 'react-redux';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Button, Drawer, Text, TextLink, Switch, useStyles2 } from '@grafana/ui';
+import { useAppNotification } from 'app/core/copy/appNotification';
+import { StoreState } from 'app/types';
+
+import { loadSettings, saveSettings } from './state/actions';
+
+interface OwnProps {
+  onClose: () => void;
+}
+
+export type Props = OwnProps & ConnectedProps<typeof connector>;
+
+const mapStateToProps = (state: StoreState) => {
+  const allowInsecureEmail =
+    state.authConfig.settings?.auth?.oauth_allow_insecure_email_lookup.toLowerCase() === 'true';
+  return {
+    allowInsecureEmail,
+  };
+};
+
+const mapActionsToProps = {
+  loadSettings,
+  saveSettings,
+};
+
+const connector = connect(mapStateToProps, mapActionsToProps);
+
+export const AuthDrawerUnconnected = ({
+  allowInsecureEmail,
+  loadSettings,
+  onClose,
+  saveSettings,
+}: Props): JSX.Element => {
+  const notifyApp = useAppNotification();
+
+  const oauthAllowInsecureEmailLookupOnChange = async () => {
+    try {
+      await saveSettings({
+        updates: {
+          auth: {
+            oauth_allow_insecure_email_lookup: '' + !allowInsecureEmail,
+          },
+        },
+      });
+      await loadSettings(false);
+      notifyApp.success('Settings saved');
+    } catch (error) {
+      notifyApp.error('Failed to save settings');
+    }
+  };
+
+  const resetButtonOnClick = async () => {
+    try {
+      await saveSettings({
+        removals: {
+          auth: ['oauth_allow_insecure_email_lookup'],
+        },
+      });
+      await loadSettings(false);
+      notifyApp.success('Settings saved');
+    } catch (error) {
+      notifyApp.error('Failed to save settings');
+    }
+  };
+
+  const subtitle = (
+    <>
+      Configure auth settings. Find out more in our{' '}
+      <TextLink
+        external={true}
+        href="https://grafana.com/docs/grafana/next/setup-grafana/configure-security/configure-authentication/#settings"
+      >
+        documentation
+      </TextLink>
+      .
+    </>
+  );
+
+  const styles = useStyles2(getStyles);
+
+  return (
+    <Drawer title="Auth Settings" subtitle={subtitle} size="md" onClose={onClose}>
+      <div className={styles.advancedAuth}>
+        <Text variant="h4">Advanced Auth</Text>
+        <Text variant="h5">Enable insecure email lookup</Text>
+        <Text variant="body" color="secondary">
+          Allow users to use the same email address to log into Grafana with different identity providers.
+        </Text>
+        <Switch value={allowInsecureEmail} onChange={oauthAllowInsecureEmailLookupOnChange} />
+      </div>
+      <Button
+        size="md"
+        variant="secondary"
+        className={styles.button}
+        onClick={resetButtonOnClick}
+        tooltip="This action will disregard any saved changes and load the configuration from the configuration file."
+      >
+        Reset
+      </Button>
+    </Drawer>
+  );
+};
+
+export default connector(AuthDrawerUnconnected);
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    advancedAuth: css({
+      display: 'flex',
+      flexDirection: 'column',
+      gap: theme.spacing(1),
+    }),
+    button: css({
+      marginTop: theme.spacing(2),
+    }),
+  };
+};
diff --git a/public/app/features/auth-config/AuthProvidersListPage.tsx b/public/app/features/auth-config/AuthProvidersListPage.tsx
new file mode 100644
index 0000000000000..1bf44fbf8bb3c
--- /dev/null
+++ b/public/app/features/auth-config/AuthProvidersListPage.tsx
@@ -0,0 +1,114 @@
+import React, { JSX, useEffect, useState } from 'react';
+import { connect, ConnectedProps } from 'react-redux';
+
+import { GrafanaEdition } from '@grafana/data/src/types/config';
+import { reportInteraction } from '@grafana/runtime';
+import { Grid, TextLink, ToolbarButton } from '@grafana/ui';
+import { Page } from 'app/core/components/Page/Page';
+import { config } from 'app/core/config';
+import { StoreState } from 'app/types';
+
+import AuthDrawer from './AuthDrawer';
+import ConfigureAuthCTA from './components/ConfigureAuthCTA';
+import { ProviderCard } from './components/ProviderCard';
+import { loadSettings } from './state/actions';
+
+import { getRegisteredAuthProviders } from './index';
+
+interface OwnProps {}
+
+export type Props = OwnProps & ConnectedProps<typeof connector>;
+
+function mapStateToProps(state: StoreState) {
+  const { isLoading, providerStatuses, providers } = state.authConfig;
+  return {
+    isLoading,
+    providerStatuses,
+    providers,
+  };
+}
+
+const mapDispatchToProps = {
+  loadSettings,
+};
+
+const connector = connect(mapStateToProps, mapDispatchToProps);
+
+export const AuthConfigPageUnconnected = ({
+  providerStatuses,
+  isLoading,
+  loadSettings,
+  providers,
+}: Props): JSX.Element => {
+  useEffect(() => {
+    loadSettings();
+  }, [loadSettings]);
+
+  const [showDrawer, setShowDrawer] = useState(false);
+
+  const authProviders = getRegisteredAuthProviders();
+  const availableProviders = authProviders.filter((p) => !providerStatuses[p.id]?.hide);
+  const onProviderCardClick = (providerType: string, enabled: boolean) => {
+    reportInteraction('authentication_ui_provider_clicked', { provider: providerType, enabled });
+  };
+
+  const providerList = availableProviders.length
+    ? [
+        ...availableProviders.map((p) => ({
+          provider: p.id,
+          settings: { ...providerStatuses[p.id], configPath: p.configPath, type: p.type },
+        })),
+        ...providers,
+      ]
+    : providers;
+  return (
+    <Page
+      navId="authentication"
+      subTitle={
+        <>
+          Manage your auth settings and configure single sign-on. Find out more in our{' '}
+          <TextLink
+            external={true}
+            href="https://grafana.com/docs/grafana/next/setup-grafana/configure-security/configure-authentication"
+          >
+            documentation
+          </TextLink>
+          .
+        </>
+      }
+      actions={
+        config.buildInfo.edition !== GrafanaEdition.OpenSource && (
+          <ToolbarButton icon="cog" variant="canvas" onClick={() => setShowDrawer(true)}>
+            Auth settings
+          </ToolbarButton>
+        )
+      }
+    >
+      <Page.Contents isLoading={isLoading}>
+        {!providerList.length ? (
+          <ConfigureAuthCTA />
+        ) : (
+          <Grid gap={3} minColumnWidth={34}>
+            {providerList
+              // Temporarily filter out providers that don't have the UI implemented
+              .filter(({ provider }) => !['grafana_com'].includes(provider))
+              .map(({ provider, settings }) => (
+                <ProviderCard
+                  key={provider}
+                  authType={settings.type || 'OAuth'}
+                  providerId={provider}
+                  enabled={settings.enabled}
+                  onClick={() => onProviderCardClick(provider, settings.enabled)}
+                  //@ts-expect-error Remove legacy types
+                  configPath={settings.configPath}
+                />
+              ))}
+            {showDrawer && <AuthDrawer onClose={() => setShowDrawer(false)}></AuthDrawer>}
+          </Grid>
+        )}
+      </Page.Contents>
+    </Page>
+  );
+};
+
+export default connector(AuthConfigPageUnconnected);
diff --git a/public/app/features/auth-config/FieldRenderer.tsx b/public/app/features/auth-config/FieldRenderer.tsx
new file mode 100644
index 0000000000000..856ac56b252b2
--- /dev/null
+++ b/public/app/features/auth-config/FieldRenderer.tsx
@@ -0,0 +1,149 @@
+import { css } from '@emotion/css';
+import React, { useEffect, useState } from 'react';
+import { UseFormReturn, Controller } from 'react-hook-form';
+
+import { Checkbox, Field, Input, SecretInput, Select, Switch, useTheme2 } from '@grafana/ui';
+
+import { fieldMap } from './fields';
+import { SSOProviderDTO, SSOSettingsField } from './types';
+import { isSelectableValue } from './utils/guards';
+
+interface FieldRendererProps
+  extends Pick<UseFormReturn<SSOProviderDTO>, 'register' | 'control' | 'watch' | 'setValue' | 'unregister'> {
+  field: SSOSettingsField;
+  errors: UseFormReturn['formState']['errors'];
+  secretConfigured: boolean;
+  provider: string;
+}
+
+export const FieldRenderer = ({
+  field,
+  register,
+  errors,
+  watch,
+  setValue,
+  control,
+  unregister,
+  secretConfigured,
+  provider,
+}: FieldRendererProps) => {
+  const [isSecretConfigured, setIsSecretConfigured] = useState(secretConfigured);
+  const isDependantField = typeof field !== 'string';
+  const name = isDependantField ? field.name : field;
+  const parentValue = isDependantField ? watch(field.dependsOn) : null;
+  const fieldData = fieldMap(provider)[name];
+  const theme = useTheme2();
+  // Unregister a field that depends on a toggle to clear its data
+  useEffect(() => {
+    if (isDependantField) {
+      if (!parentValue) {
+        unregister(name);
+      }
+    }
+  }, [unregister, name, parentValue, isDependantField]);
+
+  if (!field) {
+    console.log('missing field:', name);
+    return null;
+  }
+
+  if (!!fieldData.hidden) {
+    return null;
+  }
+
+  // Dependant field means the field depends on another field's value and shouldn't be rendered if the parent field is false
+  if (isDependantField) {
+    const parentValue = watch(field.dependsOn);
+    if (!parentValue) {
+      return null;
+    }
+  }
+  const fieldProps = {
+    label: fieldData.label,
+    required: !!fieldData.validation?.required,
+    invalid: !!errors[name],
+    error: fieldData.validation?.message,
+    key: name,
+    description: fieldData.description,
+    defaultValue: fieldData.defaultValue?.value,
+  };
+
+  switch (fieldData.type) {
+    case 'text':
+      return (
+        <Field {...fieldProps}>
+          <Input {...register(name, fieldData.validation)} type={fieldData.type} id={name} autoComplete={'off'} />
+        </Field>
+      );
+    case 'secret':
+      return (
+        <Field {...fieldProps} htmlFor={name}>
+          <Controller
+            name={name}
+            control={control}
+            rules={fieldData.validation}
+            render={({ field: { ref, value, ...field } }) => (
+              <SecretInput
+                {...field}
+                autoComplete={'off'}
+                id={name}
+                value={typeof value === 'string' ? value : ''}
+                isConfigured={isSecretConfigured}
+                onReset={() => {
+                  setIsSecretConfigured(false);
+                  setValue(name, '');
+                }}
+              />
+            )}
+          />
+        </Field>
+      );
+    case 'select':
+      const watchOptions = watch(name);
+      let options = fieldData.options;
+      if (!fieldData.options?.length) {
+        options = isSelectableValue(watchOptions) ? watchOptions : [];
+      }
+      return (
+        <Field {...fieldProps} htmlFor={name}>
+          <Controller
+            rules={fieldData.validation}
+            name={name}
+            control={control}
+            render={({ field: { ref, onChange, ...fieldProps }, fieldState: { invalid } }) => {
+              return (
+                <Select
+                  {...fieldProps}
+                  placeholder={fieldData.placeholder}
+                  isMulti={fieldData.multi}
+                  invalid={invalid}
+                  inputId={name}
+                  options={options}
+                  allowCustomValue={!!fieldData.allowCustomValue}
+                  defaultValue={fieldData.defaultValue}
+                  onChange={onChange}
+                  onCreateOption={(v) => {
+                    const customValue = { value: v, label: v };
+                    onChange([...(options || []), customValue]);
+                  }}
+                />
+              );
+            }}
+          />
+        </Field>
+      );
+    case 'switch':
+      return (
+        <Field {...fieldProps}>
+          <Switch {...register(name)} id={name} />
+        </Field>
+      );
+    case 'checkbox':
+      return (
+        <Checkbox {...register(name)} id={name} {...fieldProps} className={css({ marginBottom: theme.spacing(2) })} />
+      );
+    default:
+      console.error(`Unknown field type: ${fieldData.type}`);
+      return null;
+  }
+};
diff --git a/public/app/features/auth-config/ProviderConfigForm.test.tsx b/public/app/features/auth-config/ProviderConfigForm.test.tsx
new file mode 100644
index 0000000000000..a59f15d821fe5
--- /dev/null
+++ b/public/app/features/auth-config/ProviderConfigForm.test.tsx
@@ -0,0 +1,252 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React, { JSX } from 'react';
+
+import { reportInteraction } from '@grafana/runtime';
+
+import { ProviderConfigForm } from './ProviderConfigForm';
+import { SSOProvider } from './types';
+import { emptySettings } from './utils/data';
+
+const putMock = jest.fn(() => Promise.resolve({}));
+const deleteMock = jest.fn(() => Promise.resolve({}));
+
+jest.mock('@grafana/runtime', () => ({
+  getBackendSrv: () => ({
+    put: putMock,
+    delete: deleteMock,
+  }),
+  config: {
+    panels: {
+      test: {
+        id: 'test',
+        name: 'test',
+      },
+    },
+  },
+  getAppEvents: () => ({
+    publish: jest.fn(),
+  }),
+  isFetchError: () => true,
+  locationService: {
+    push: jest.fn(),
+  },
+  reportInteraction: jest.fn(),
+}));
+
+const reportInteractionMock = jest.mocked(reportInteraction);
+
+// Mock the FormPrompt component as it requires Router setup to work
+jest.mock('app/core/components/FormPrompt/FormPrompt', () => ({
+  FormPrompt: () => <></>,
+}));
+
+const testConfig: SSOProvider = {
+  id: '300f9b7c-0488-40db-9763-a22ce8bf6b3e',
+  provider: 'github',
+  source: 'database',
+  settings: {
+    ...emptySettings,
+    name: 'GitHub',
+    type: 'OAuth',
+    clientId: '12345',
+    clientSecret: 'abcde',
+    enabled: true,
+    teamIds: '',
+    allowedOrganizations: '',
+    allowedDomains: '',
+    allowedGroups: '',
+    scopes: '',
+  },
+};
+
+const emptyConfig = {
+  ...testConfig,
+  settings: { ...testConfig.settings, enabled: false, clientId: '', clientSecret: '' },
+};
+
+function setup(jsx: JSX.Element) {
+  return {
+    user: userEvent.setup(),
+    ...render(jsx),
+  };
+}
+
+describe('ProviderConfigForm', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders all general settings fields correctly', async () => {
+    setup(<ProviderConfigForm config={testConfig} provider={testConfig.provider} />);
+    expect(screen.getByRole('textbox', { name: /Client ID/i })).toBeInTheDocument();
+    expect(screen.getByRole('textbox', { name: /Client secret/i })).toBeInTheDocument();
+    expect(screen.getByRole('combobox', { name: /Scopes/i })).toBeInTheDocument();
+    expect(screen.getByRole('checkbox', { name: /Allow Sign Up/i })).toBeInTheDocument();
+    expect(screen.getByRole('checkbox', { name: /Auto login/i })).toBeInTheDocument();
+    expect(screen.getByRole('textbox', { name: /Sign out redirect URL/i })).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: /Save/i })).toBeInTheDocument();
+    expect(screen.getByRole('link', { name: /Discard/i })).toBeInTheDocument();
+  });
+
+  it('renders all user mapping fields correctly', async () => {
+    const { user } = setup(<ProviderConfigForm config={testConfig} provider={testConfig.provider} />);
+    await user.click(screen.getByText('User mapping'));
+    expect(screen.getByRole('textbox', { name: /Role attribute path/i })).toBeInTheDocument();
+    expect(screen.getByRole('checkbox', { name: /Role attribute strict mode/i })).toBeInTheDocument();
+    expect(screen.getByRole('checkbox', { name: /Skip organization role sync/i })).toBeInTheDocument();
+  });
+
+  it('renders all extra security fields correctly', async () => {
+    const { user } = setup(<ProviderConfigForm config={testConfig} provider={testConfig.provider} />);
+    await user.click(screen.getByText('Extra security measures'));
+    expect(screen.getByRole('combobox', { name: /Allowed organizations/i })).toBeInTheDocument();
+    expect(screen.getByRole('combobox', { name: /Allowed domains/i })).toBeInTheDocument();
+    expect(screen.getByRole('combobox', { name: /Team Ids/i })).toBeInTheDocument();
+    expect(screen.getByRole('checkbox', { name: /Use PKCE/i })).toBeInTheDocument();
+    expect(screen.getByRole('checkbox', { name: /Use refresh token/i })).toBeInTheDocument();
+    expect(screen.getByRole('checkbox', { name: /TLS skip verify/i })).toBeInTheDocument();
+  });
+
+  it('should save and enable on form submit', async () => {
+    const { user } = setup(<ProviderConfigForm config={emptyConfig} provider={emptyConfig.provider} />);
+
+    await user.type(screen.getByRole('textbox', { name: /Client ID/i }), 'test-client-id');
+    await user.type(screen.getByLabelText(/Client secret/i), 'test-client-secret');
+    // Type a scope and press enter to select it
+    await user.type(screen.getByRole('combobox', { name: /Scopes/i }), 'user:email{enter}');
+    await user.click(screen.getByRole('checkbox', { name: /Auto login/i }));
+
+    await user.click(screen.getByText('User mapping'));
+    await user.type(screen.getByRole('textbox', { name: /Role attribute path/i }), 'new-attribute-path');
+    await user.click(screen.getByRole('checkbox', { name: /Role attribute strict mode/i }));
+
+    await user.click(screen.getByText('Extra security measures'));
+    await user.type(screen.getByRole('combobox', { name: /Allowed domains/i }), 'grafana.com{enter}');
+    await user.click(screen.getByRole('checkbox', { name: /Use PKCE/i }));
+
+    await user.click(screen.getByRole('button', { name: /Save and enable/i }));
+
+    await waitFor(() => {
+      expect(putMock).toHaveBeenCalledWith(
+        '/api/v1/sso-settings/github',
+        {
+          id: '300f9b7c-0488-40db-9763-a22ce8bf6b3e',
+          provider: 'github',
+          settings: {
+            allowAssignGrafanaAdmin: false,
+            allowSignUp: false,
+            allowedDomains: 'grafana.com',
+            allowedOrganizations: '',
+            autoLogin: true,
+            clientId: 'test-client-id',
+            clientSecret: 'test-client-secret',
+            enabled: true,
+            name: 'GitHub',
+            roleAttributePath: 'new-attribute-path',
+            roleAttributeStrict: true,
+            scopes: 'user:email',
+            signoutRedirectUrl: '',
+            skipOrgRoleSync: false,
+            teamIds: '',
+            tlsClientCa: '',
+            tlsClientCert: '',
+            tlsClientKey: '',
+            tlsSkipVerifyInsecure: false,
+            usePkce: true,
+            useRefreshToken: false,
+          },
+        },
+        { showErrorAlert: false }
+      );
+
+      expect(reportInteractionMock).toHaveBeenCalledWith('grafana_authentication_ssosettings_saved', {
+        provider: 'github',
+        enabled: true,
+      });
+    });
+  });
+
+  it('should save on form submit', async () => {
+    const { user } = setup(<ProviderConfigForm config={emptyConfig} provider={emptyConfig.provider} />);
+    await user.type(screen.getByRole('textbox', { name: /Client ID/i }), 'test-client-id');
+    await user.type(screen.getByLabelText(/Client secret/i), 'test-client-secret');
+    // Type a scope and press enter to select it
+    await user.type(screen.getByRole('combobox', { name: /Scopes/i }), 'user:email{enter}');
+    await user.click(screen.getByRole('checkbox', { name: /Auto login/i }));
+    await user.click(screen.getByText('Save'));
+
+    await waitFor(() => {
+      expect(putMock).toHaveBeenCalledWith(
+        '/api/v1/sso-settings/github',
+        {
+          id: '300f9b7c-0488-40db-9763-a22ce8bf6b3e',
+          provider: 'github',
+          settings: {
+            allowAssignGrafanaAdmin: false,
+            allowSignUp: false,
+            allowedDomains: '',
+            allowedOrganizations: '',
+            autoLogin: true,
+            clientId: 'test-client-id',
+            clientSecret: 'test-client-secret',
+            enabled: false,
+            name: 'GitHub',
+            roleAttributePath: '',
+            roleAttributeStrict: false,
+            scopes: 'user:email',
+            signoutRedirectUrl: '',
+            skipOrgRoleSync: false,
+            teamIds: '',
+            tlsClientCa: '',
+            tlsClientCert: '',
+            tlsClientKey: '',
+            usePkce: false,
+            useRefreshToken: false,
+          },
+        },
+        { showErrorAlert: false }
+      );
+
+      expect(reportInteractionMock).toHaveBeenCalledWith('grafana_authentication_ssosettings_saved', {
+        provider: 'github',
+        enabled: false,
+      });
+    });
+  });
+
+  it('should validate required fields on Save', async () => {
+    const { user } = setup(<ProviderConfigForm config={emptyConfig} provider={emptyConfig.provider} />);
+    await user.click(screen.getByText('Save'));
+
+    // Should show an alert for empty client ID
+    expect(await screen.findAllByRole('alert')).toHaveLength(1);
+  });
+
+  it('should validate required fields on Save and enable', async () => {
+    const { user } = setup(<ProviderConfigForm config={emptyConfig} provider={emptyConfig.provider} />);
+    await user.click(screen.getByRole('button', { name: /Save and enable/i }));
+
+    // Should show an alert for empty client ID
+    expect(await screen.findAllByRole('alert')).toHaveLength(1);
+  });
+
+  it('should delete the current config', async () => {
+    const { user } = setup(<ProviderConfigForm config={emptyConfig} provider={emptyConfig.provider} />);
+    await user.click(screen.getByTitle(/More actions/i));
+
+    await user.click(screen.getByRole('menuitem', { name: /Reset to default values/i }));
+
+    expect(screen.getByRole('dialog', { name: /Reset/i })).toBeInTheDocument();
+
+    await user.click(screen.getByTestId('data-testid Confirm Modal Danger Button'));
+
+    await waitFor(() => {
+      expect(deleteMock).toHaveBeenCalledWith('/api/v1/sso-settings/github', undefined, { showSuccessAlert: false });
+
+      expect(reportInteractionMock).toHaveBeenCalledWith('grafana_authentication_ssosettings_removed', {
+        provider: 'github',
+      });
+    });
+  });
+});
diff --git a/public/app/features/auth-config/ProviderConfigForm.tsx b/public/app/features/auth-config/ProviderConfigForm.tsx
new file mode 100644
index 0000000000000..9427390d62c92
--- /dev/null
+++ b/public/app/features/auth-config/ProviderConfigForm.tsx
@@ -0,0 +1,241 @@
+import React, { useState } from 'react';
+import { useForm } from 'react-hook-form';
+
+import { AppEvents } from '@grafana/data';
+import { getAppEvents, getBackendSrv, isFetchError, locationService, reportInteraction } from '@grafana/runtime';
+import {
+  Box,
+  Button,
+  CollapsableSection,
+  ConfirmModal,
+  Dropdown,
+  Field,
+  IconButton,
+  LinkButton,
+  Menu,
+  Stack,
+  Switch,
+} from '@grafana/ui';
+
+import { FormPrompt } from '../../core/components/FormPrompt/FormPrompt';
+import { Page } from '../../core/components/Page/Page';
+
+import { FieldRenderer } from './FieldRenderer';
+import { sectionFields } from './fields';
+import { SSOProvider, SSOProviderDTO } from './types';
+import { dataToDTO, dtoToData } from './utils/data';
+
+const appEvents = getAppEvents();
+
+interface ProviderConfigProps {
+  config?: SSOProvider;
+  isLoading?: boolean;
+  provider: string;
+}
+
+export const ProviderConfigForm = ({ config, provider, isLoading }: ProviderConfigProps) => {
+  const {
+    register,
+    handleSubmit,
+    control,
+    reset,
+    watch,
+    setValue,
+    unregister,
+    formState: { errors, dirtyFields, isSubmitted },
+  } = useForm({ defaultValues: dataToDTO(config), mode: 'onSubmit', reValidateMode: 'onChange' });
+  const [isSaving, setIsSaving] = useState(false);
+  const [submitError, setSubmitError] = useState(false);
+  const dataSubmitted = isSubmitted && !submitError;
+  const sections = sectionFields[provider];
+  const [resetConfig, setResetConfig] = useState(false);
+
+  const additionalActionsMenu = (
+    <Menu>
+      <Menu.Item
+        label="Reset to default values"
+        icon="history-alt"
+        onClick={() => {
+          setResetConfig(true);
+        }}
+      />
+    </Menu>
+  );
+
+  const onSubmit = async (data: SSOProviderDTO) => {
+    setIsSaving(true);
+    setSubmitError(false);
+    const requestData = dtoToData(data, provider);
+    try {
+      await getBackendSrv().put(
+        `/api/v1/sso-settings/${provider}`,
+        {
+          id: config?.id,
+          provider: config?.provider,
+          settings: { ...requestData },
+        },
+        {
+          showErrorAlert: false,
+        }
+      );
+
+      reportInteraction('grafana_authentication_ssosettings_saved', {
+        provider,
+        enabled: requestData.enabled,
+      });
+
+      appEvents.publish({
+        type: AppEvents.alertSuccess.name,
+        payload: ['Settings saved'],
+      });
+      reset(data);
+      // Delay redirect so the form state can update
+      setTimeout(() => {
+        locationService.push(`/admin/authentication`);
+      }, 300);
+    } catch (error) {
+      let message = '';
+      if (isFetchError(error)) {
+        message = error.data.message;
+      } else if (error instanceof Error) {
+        message = error.message;
+      }
+      appEvents.publish({
+        type: AppEvents.alertError.name,
+        payload: [message],
+      });
+      setSubmitError(true);
+      setIsSaving(false);
+    }
+  };
+
+  const onResetConfig = async () => {
+    try {
+      await getBackendSrv().delete(`/api/v1/sso-settings/${provider}`, undefined, { showSuccessAlert: false });
+      reportInteraction('grafana_authentication_ssosettings_removed', {
+        provider,
+      });
+
+      appEvents.publish({
+        type: AppEvents.alertSuccess.name,
+        payload: ['Settings reset to defaults'],
+      });
+      setTimeout(() => {
+        locationService.push(`/admin/authentication`);
+      });
+    } catch (error) {
+      let message = '';
+      if (isFetchError(error)) {
+        message = error.data.message;
+      } else if (error instanceof Error) {
+        message = error.message;
+      }
+      appEvents.publish({
+        type: AppEvents.alertError.name,
+        payload: [message],
+      });
+    }
+  };
+
+  const isEnabled = config?.settings.enabled;
+
+  return (
+    <Page.Contents isLoading={isLoading}>
+      <form onSubmit={handleSubmit(onSubmit)} style={{ maxWidth: '600px' }}>
+        <FormPrompt
+          confirmRedirect={!!Object.keys(dirtyFields).length && !dataSubmitted}
+          onDiscard={() => {
+            reportInteraction('grafana_authentication_ssosettings_abandoned', {
+              provider,
+            });
+            reset();
+          }}
+        />
+        <Field label="Enabled" hidden={true}>
+          <Switch {...register('enabled')} id="enabled" label={'Enabled'} />
+        </Field>
+        <Stack gap={2} direction={'column'}>
+          {sections
+            .filter((section) => !section.hidden)
+            .map((section, index) => {
+              return (
+                <CollapsableSection label={section.name} isOpen={index === 0} key={section.name}>
+                  {section.fields
+                    .filter((field) => (typeof field !== 'string' ? !field.hidden : true))
+                    .map((field) => {
+                      return (
+                        <FieldRenderer
+                          key={typeof field === 'string' ? field : field.name}
+                          field={field}
+                          control={control}
+                          errors={errors}
+                          setValue={setValue}
+                          register={register}
+                          watch={watch}
+                          unregister={unregister}
+                          provider={provider}
+                          secretConfigured={!!config?.settings.clientSecret}
+                        />
+                      );
+                    })}
+                </CollapsableSection>
+              );
+            })}
+        </Stack>
+        <Box display={'flex'} gap={2} marginTop={5}>
+          <Stack alignItems={'center'} gap={2}>
+            <Button
+              type={'submit'}
+              disabled={isSaving}
+              onClick={() => setValue('enabled', !isEnabled)}
+              variant={isEnabled ? 'secondary' : undefined}
+            >
+              {isSaving ? (isEnabled ? 'Disabling...' : 'Saving...') : isEnabled ? 'Disable' : 'Save and enable'}
+            </Button>
+
+            <Button type={'submit'} disabled={isSaving} variant={'secondary'}>
+              {isSaving ? 'Saving...' : 'Save'}
+            </Button>
+            <LinkButton href={'/admin/authentication'} variant={'secondary'}>
+              Discard
+            </LinkButton>
+
+            <Dropdown overlay={additionalActionsMenu} placement="bottom-start">
+              <IconButton
+                tooltip="More actions"
+                title="More actions"
+                tooltipPlacement="top"
+                size="md"
+                variant="secondary"
+                name="ellipsis-v"
+                hidden={config?.source === 'system'}
+              />
+            </Dropdown>
+          </Stack>
+        </Box>
+      </form>
+      {resetConfig && (
+        <ConfirmModal
+          isOpen
+          icon="trash-alt"
+          title="Reset"
+          body={
+            <Stack direction={'column'} gap={3}>
+              <span>Are you sure you want to reset this configuration?</span>
+              <small>
+                After resetting these settings Grafana will use the provider configuration from the system (config
+                file/environment variables) if any.
+              </small>
+            </Stack>
+          }
+          confirmText="Reset"
+          onDismiss={() => setResetConfig(false)}
+          onConfirm={async () => {
+            await onResetConfig();
+            setResetConfig(false);
+          }}
+        />
+      )}
+    </Page.Contents>
+  );
+};
diff --git a/public/app/features/auth-config/ProviderConfigPage.tsx b/public/app/features/auth-config/ProviderConfigPage.tsx
new file mode 100644
index 0000000000000..c42956c7aee7e
--- /dev/null
+++ b/public/app/features/auth-config/ProviderConfigPage.tsx
@@ -0,0 +1,89 @@
+import React, { useEffect } from 'react';
+import { connect, ConnectedProps } from 'react-redux';
+
+import { NavModelItem } from '@grafana/data';
+import { Badge, Stack, Text } from '@grafana/ui';
+import { Page } from 'app/core/components/Page/Page';
+import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
+
+import { StoreState } from '../../types';
+
+import { ProviderConfigForm } from './ProviderConfigForm';
+import { UIMap } from './constants';
+import { loadProviders } from './state/actions';
+import { SSOProvider } from './types';
+
+const getPageNav = (config?: SSOProvider): NavModelItem => {
+  if (!config) {
+    return {
+      text: 'Authentication',
+      subTitle: 'Configure authentication providers',
+      icon: 'shield',
+      id: 'authentication',
+    };
+  }
+
+  const providerDisplayName = UIMap[config.provider][1] || config.provider.toUpperCase();
+
+  return {
+    text: providerDisplayName || '',
+    subTitle: `To configure ${providerDisplayName} OAuth2 you must register your application with ${providerDisplayName}. The provider will generate a Client ID and Client Secret for you to use.`,
+    icon: config.settings.icon || 'shield',
+    id: config.provider,
+  };
+};
+
+interface RouteProps extends GrafanaRouteComponentProps<{ provider: string }> {}
+
+function mapStateToProps(state: StoreState, props: RouteProps) {
+  const { isLoading, providers } = state.authConfig;
+  const { provider } = props.match.params;
+  const config = providers.find((config) => config.provider === provider);
+  return {
+    config,
+    isLoading,
+    provider,
+  };
+}
+
+const mapDispatchToProps = {
+  loadProviders,
+};
+
+const connector = connect(mapStateToProps, mapDispatchToProps);
+export type Props = ConnectedProps<typeof connector>;
+
+/**
+ * Separate the Page logic from the Content logic for easier testing.
+ */
+export const ProviderConfigPage = ({ config, loadProviders, isLoading, provider }: Props) => {
+  const pageNav = getPageNav(config);
+
+  useEffect(() => {
+    loadProviders(provider);
+  }, [loadProviders, provider]);
+
+  if (!config) {
+    return null;
+  }
+  return (
+    <Page
+      navId="authentication"
+      pageNav={pageNav}
+      renderTitle={(title) => (
+        <Stack gap={2} alignItems="center">
+          <Text variant={'h1'}>{title}</Text>
+          <Badge
+            text={config.settings.enabled ? 'Enabled' : 'Not enabled'}
+            color={config.settings.enabled ? 'green' : 'blue'}
+            icon={config.settings.enabled ? 'check' : undefined}
+          />
+        </Stack>
+      )}
+    >
+      <ProviderConfigForm config={config} isLoading={isLoading} provider={provider} />
+    </Page>
+  );
+};
+
+export default connector(ProviderConfigPage);
diff --git a/public/app/features/auth-config/components/ConfigureAuthCTA.tsx b/public/app/features/auth-config/components/ConfigureAuthCTA.tsx
index fca98251f283d..c493aee5e51e7 100644
--- a/public/app/features/auth-config/components/ConfigureAuthCTA.tsx
+++ b/public/app/features/auth-config/components/ConfigureAuthCTA.tsx
@@ -2,57 +2,40 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
-import { CallToActionCard, IconName, LinkButton, useStyles2 } from '@grafana/ui';
+import { Icon, Stack, Text, TextLink, useStyles2 } from '@grafana/ui';
 
-export interface Props {
-  title: string;
-  buttonIcon: IconName;
-  buttonLink?: string;
-  buttonTitle: string;
-  buttonDisabled?: boolean;
-  description?: string;
-  onClick?: () => void;
-}
+export interface Props {}
 
-const ConfigureAuthCTA: React.FunctionComponent<Props> = ({
-  title,
-  buttonIcon,
-  buttonLink,
-  buttonTitle,
-  buttonDisabled,
-  description,
-  onClick,
-}) => {
+const ConfigureAuthCTA: React.FunctionComponent<Props> = () => {
   const styles = useStyles2(getStyles);
-  const footer = description ? <span key="proTipFooter">{description}</span> : '';
-  const ctaElementClassName = !description ? styles.button : '';
-
-  const ctaElement = (
-    <LinkButton
-      size="lg"
-      href={buttonLink}
-      icon={buttonIcon}
-      className={ctaElementClassName}
-      data-testid={selectors.components.CallToActionCard.buttonV2(buttonTitle)}
-      disabled={buttonDisabled}
-      onClick={() => onClick && onClick()}
-    >
-      {buttonTitle}
-    </LinkButton>
+  return (
+    <div className={styles.container}>
+      <Stack gap={1} alignItems={'center'}>
+        <Icon name={'cog'} />
+        <Text>Configuration required</Text>
+      </Stack>
+      <Text variant={'bodySmall'} color={'secondary'}>
+        You have no authentication configuration created at the moment.
+      </Text>
+      <TextLink href={'https://grafana.com/docs/grafana/latest/auth/overview/'} external>
+        Refer to the documentation on how to configure authentication
+      </TextLink>
+    </div>
   );
-
-  return <CallToActionCard className={styles.cta} message={title} footer={footer} callToActionElement={ctaElement} />;
 };
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
-    cta: css`
-      text-align: center;
-    `,
-    button: css`
-      margin-bottom: ${theme.spacing(2.5)};
-    `,
+    container: css({
+      display: 'flex',
+      flexDirection: 'column',
+      gap: theme.spacing(2),
+      backgroundColor: theme.colors.background.secondary,
+      borderRadius: theme.shape.radius.default,
+      padding: theme.spacing(3),
+      width: 'max-content',
+      margin: theme.spacing(3, 'auto'),
+    }),
   };
 };
 
diff --git a/public/app/features/auth-config/components/ProviderCard.tsx b/public/app/features/auth-config/components/ProviderCard.tsx
index bac117a10e6ae..e7ddee445617e 100644
--- a/public/app/features/auth-config/components/ProviderCard.tsx
+++ b/public/app/features/auth-config/components/ProviderCard.tsx
@@ -1,92 +1,35 @@
-import { css } from '@emotion/css';
 import React from 'react';
 
-import { GrafanaTheme2 } from '@grafana/data';
-import { Badge, Card, useStyles2, Icon } from '@grafana/ui';
+import { isIconName } from '@grafana/data';
+import { Badge, Card, Icon } from '@grafana/ui';
 
-import { BASE_PATH } from '../constants';
-
-export const LOGO_SIZE = '48px';
+import { UIMap } from '../constants';
+import { getProviderUrl } from '../utils/url';
 
 type Props = {
   providerId: string;
-  displayName: string;
   enabled: boolean;
   configPath?: string;
   authType?: string;
-  badges?: JSX.Element[];
   onClick?: () => void;
 };
 
-export function ProviderCard({ providerId, displayName, enabled, configPath, authType, badges, onClick }: Props) {
-  const styles = useStyles2(getStyles);
-  configPath = BASE_PATH + (configPath || providerId);
-
+export function ProviderCard({ providerId, enabled, configPath, authType, onClick }: Props) {
+  //@ts-expect-error
+  const url = getProviderUrl({ configPath, id: providerId });
+  const [iconName, displayName] = UIMap[providerId] || ['lock', providerId.toUpperCase()];
   return (
-    <Card href={configPath} className={styles.container} onClick={() => onClick && onClick()}>
-      <div className={styles.header}>
-        <span className={styles.smallText}>{authType}</span>
-        <span className={styles.name}>{displayName}</span>
-      </div>
-      <div className={styles.footer}>
-        <div className={styles.badgeContainer}>
-          {enabled ? <Badge text="Enabled" color="green" icon="check" /> : <Badge text="Not enabled" color="blue" />}
-        </div>
-        <span className={styles.edit}>
-          Edit
-          <Icon color="blue" name={'arrow-right'} size="sm" />
-        </span>
-      </div>
+    <Card href={url} onClick={onClick}>
+      <Card.Heading>{displayName}</Card.Heading>
+      <Card.Meta>{authType}</Card.Meta>
+      {isIconName(iconName) && (
+        <Card.Figure>
+          <Icon name={iconName} size={'xxxl'} />
+        </Card.Figure>
+      )}
+      <Card.Actions>
+        <Badge text={enabled ? 'Enabled' : 'Not enabled'} color={enabled ? 'green' : 'blue'} />
+      </Card.Actions>
     </Card>
   );
 }
-
-export const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    container: css`
-      min-height: ${theme.spacing(18)};
-      display: flex;
-      flex-direction: column;
-      justify-content: space-around;
-      border-radius: ${theme.spacing(0.5)};
-      box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-    `,
-    header: css`
-      margin-top: -${theme.spacing(2)};
-      display: flex;
-      flex-direction: column;
-      justify-content: start;
-      align-items: flex-start;
-      margin-bottom: ${theme.spacing(2)};
-    `,
-    footer: css`
-      margin-top: ${theme.spacing(2)};
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-    `,
-    name: css`
-      align-self: flex-start;
-      font-size: ${theme.typography.h4.fontSize};
-      color: ${theme.colors.text.primary};
-      margin: 0;
-      margin-top: ${theme.spacing(-1)};
-    `,
-    smallText: css`
-      font-size: ${theme.typography.bodySmall.fontSize};
-      color: ${theme.colors.text.secondary};
-      padding: ${theme.spacing(1)} 0; // Add some padding
-      max-width: 90%; // Add a max-width to prevent text from stretching too wide
-    `,
-    badgeContainer: css`
-      display: flex;
-      gap: ${theme.spacing(1)};
-    `,
-    edit: css`
-      display: flex;
-      align-items: center;
-      color: ${theme.colors.text.link};
-      gap: ${theme.spacing(0.5)};
-    `,
-  };
-};
diff --git a/public/app/features/auth-config/constants.ts b/public/app/features/auth-config/constants.ts
index 1bd9e7d1c6ee7..dd23c2fd8cb02 100644
--- a/public/app/features/auth-config/constants.ts
+++ b/public/app/features/auth-config/constants.ts
@@ -1 +1,14 @@
+import { IconName } from '@grafana/data';
+
 export const BASE_PATH = 'admin/authentication/';
+
+// TODO Remove when this is available from API
+export const UIMap: Record<string, [IconName, string]> = {
+  github: ['github', 'GitHub'],
+  gitlab: ['gitlab', 'GitLab'],
+  google: ['google', 'Google'],
+  generic_oauth: ['lock', 'Generic OAuth'],
+  grafana_com: ['grafana', 'Grafana.com'],
+  azuread: ['microsoft', 'Azure AD'],
+  okta: ['okta', 'Okta'],
+};
diff --git a/public/app/features/auth-config/fields.tsx b/public/app/features/auth-config/fields.tsx
new file mode 100644
index 0000000000000..952e3af3e7b94
--- /dev/null
+++ b/public/app/features/auth-config/fields.tsx
@@ -0,0 +1,605 @@
+import React from 'react';
+import { validate as uuidValidate } from 'uuid';
+
+import { config } from '@grafana/runtime';
+import { TextLink } from '@grafana/ui';
+import { contextSrv } from 'app/core/core';
+
+import { FieldData, SSOProvider, SSOSettingsField } from './types';
+import { isSelectableValue } from './utils/guards';
+import { isUrlValid } from './utils/url';
+
+type Section = Record<
+  SSOProvider['provider'],
+  Array<{
+    name: string;
+    id: string;
+    hidden?: boolean;
+    fields: SSOSettingsField[];
+  }>
+>;
+
+export const sectionFields: Section = {
+  azuread: [
+    {
+      name: 'General settings',
+      id: 'general',
+      fields: [
+        'name',
+        'clientId',
+        'clientSecret',
+        'scopes',
+        'authUrl',
+        'tokenUrl',
+        'allowSignUp',
+        'autoLogin',
+        'signoutRedirectUrl',
+      ],
+    },
+    {
+      name: 'User mapping',
+      id: 'user',
+      fields: ['roleAttributePath', 'roleAttributeStrict', 'allowAssignGrafanaAdmin', 'skipOrgRoleSync'],
+    },
+    {
+      name: 'Extra security measures',
+      id: 'extra',
+      fields: [
+        'allowedOrganizations',
+        'allowedDomains',
+        'allowedGroups',
+        'forceUseGraphApi',
+        'usePkce',
+        'useRefreshToken',
+        'tlsSkipVerifyInsecure',
+        'tlsClientCert',
+        'tlsClientKey',
+        'tlsClientCa',
+      ],
+    },
+  ],
+  generic_oauth: [
+    {
+      name: 'General settings',
+      id: 'general',
+      fields: [
+        'name',
+        'clientId',
+        'clientSecret',
+        'authStyle',
+        'scopes',
+        'authUrl',
+        'tokenUrl',
+        'apiUrl',
+        'allowSignUp',
+        'autoLogin',
+        'signoutRedirectUrl',
+      ],
+    },
+    {
+      name: 'User mapping',
+      id: 'user',
+      fields: [
+        'nameAttributePath',
+        'loginAttributePath',
+        'emailAttributeName',
+        'emailAttributePath',
+        'idTokenAttributeName',
+        'roleAttributePath',
+        'roleAttributeStrict',
+        'allowAssignGrafanaAdmin',
+        'skipOrgRoleSync',
+      ],
+    },
+    {
+      name: 'Extra security measures',
+      id: 'extra',
+      fields: [
+        'allowedOrganizations',
+        'allowedDomains',
+        'defineAllowedGroups',
+        { name: 'allowedGroups', dependsOn: 'defineAllowedGroups' },
+        { name: 'groupsAttributePath', dependsOn: 'defineAllowedGroups' },
+        'defineAllowedTeamsIds',
+        { name: 'teamIds', dependsOn: 'defineAllowedTeamsIds' },
+        { name: 'teamsUrl', dependsOn: 'defineAllowedTeamsIds' },
+        { name: 'teamIdsAttributePath', dependsOn: 'defineAllowedTeamsIds' },
+        'usePkce',
+        'useRefreshToken',
+        'tlsSkipVerifyInsecure',
+        'tlsClientCert',
+        'tlsClientKey',
+        'tlsClientCa',
+      ],
+    },
+  ],
+  google: [
+    {
+      name: 'General settings',
+      id: 'general',
+      fields: ['name', 'clientId', 'clientSecret', 'scopes', 'allowSignUp', 'autoLogin', 'signoutRedirectUrl'],
+    },
+    {
+      name: 'User mapping',
+      id: 'user',
+      fields: ['roleAttributePath', 'roleAttributeStrict', 'allowAssignGrafanaAdmin', 'skipOrgRoleSync'],
+    },
+    {
+      name: 'Extra security measures',
+      id: 'extra',
+      fields: [
+        'validateHd',
+        'hostedDomain',
+        'allowedDomains',
+        'allowedGroups',
+        'usePkce',
+        'useRefreshToken',
+        'tlsSkipVerifyInsecure',
+        'tlsClientCert',
+        'tlsClientKey',
+        'tlsClientCa',
+      ],
+    },
+  ],
+  github: [
+    {
+      name: 'General settings',
+      id: 'general',
+      fields: ['name', 'clientId', 'clientSecret', 'scopes', 'allowSignUp', 'autoLogin', 'signoutRedirectUrl'],
+    },
+    {
+      name: 'User mapping',
+      id: 'user',
+      fields: ['roleAttributePath', 'roleAttributeStrict', 'allowAssignGrafanaAdmin', 'skipOrgRoleSync'],
+    },
+    {
+      name: 'Extra security measures',
+      id: 'extra',
+      fields: [
+        'allowedOrganizations',
+        'allowedDomains',
+        'teamIds',
+        'usePkce',
+        'useRefreshToken',
+        'tlsSkipVerifyInsecure',
+        'tlsClientCert',
+        'tlsClientKey',
+        'tlsClientCa',
+      ],
+    },
+  ],
+  gitlab: [
+    {
+      name: 'General settings',
+      id: 'general',
+      fields: ['name', 'clientId', 'clientSecret', 'scopes', 'allowSignUp', 'autoLogin', 'signoutRedirectUrl'],
+    },
+    {
+      name: 'User mapping',
+      id: 'user',
+      fields: ['roleAttributePath', 'roleAttributeStrict', 'allowAssignGrafanaAdmin', 'skipOrgRoleSync'],
+    },
+    {
+      name: 'Extra security measures',
+      id: 'extra',
+      fields: [
+        'allowedDomains',
+        'allowedGroups',
+        'usePkce',
+        'useRefreshToken',
+        'tlsSkipVerifyInsecure',
+        'tlsClientCert',
+        'tlsClientKey',
+        'tlsClientCa',
+      ],
+    },
+  ],
+  okta: [
+    {
+      name: 'General settings',
+      id: 'general',
+      fields: [
+        'name',
+        'clientId',
+        'clientSecret',
+        'scopes',
+        'authUrl',
+        'tokenUrl',
+        'apiUrl',
+        'allowSignUp',
+        'autoLogin',
+        'signoutRedirectUrl',
+      ],
+    },
+    {
+      name: 'User mapping',
+      id: 'user',
+      fields: ['roleAttributePath', 'roleAttributeStrict', 'allowAssignGrafanaAdmin', 'skipOrgRoleSync'],
+    },
+    {
+      name: 'Extra security measures',
+      id: 'extra',
+      fields: [
+        'allowedDomains',
+        'allowedGroups',
+        'usePkce',
+        'useRefreshToken',
+        'tlsSkipVerifyInsecure',
+        'tlsClientCert',
+        'tlsClientKey',
+        'tlsClientCa',
+      ],
+    },
+  ],
+};
+
+/**
+ * List all the fields that can be used in the form
+ */
+export function fieldMap(provider: string): Record<string, FieldData> {
+  return {
+    clientId: {
+      label: 'Client Id',
+      type: 'text',
+      description: 'The client Id of your OAuth2 app.',
+      validation: {
+        required: true,
+        message: 'This field is required',
+      },
+    },
+    clientSecret: {
+      label: 'Client secret',
+      type: 'secret',
+      description: 'The client secret of your OAuth2 app.',
+    },
+    allowedOrganizations: {
+      label: 'Allowed organizations',
+      type: 'select',
+      description:
+        'List of comma- or space-separated organizations. The user should be a member \n' +
+        'of at least one organization to log in.',
+      multi: true,
+      allowCustomValue: true,
+      options: [],
+      placeholder: 'Enter organizations (my-team, myteam...) and press Enter to add',
+    },
+    allowedDomains: {
+      label: 'Allowed domains',
+      type: 'select',
+      description:
+        'List of comma- or space-separated domains. The user should belong to at least \n' + 'one domain to log in.',
+      multi: true,
+      allowCustomValue: true,
+      options: [],
+    },
+    authUrl: {
+      label: 'Auth URL',
+      type: 'text',
+      description: 'The authorization endpoint of your OAuth2 provider.',
+      validation: {
+        required: true,
+        validate: (value) => {
+          return isUrlValid(value);
+        },
+        message: 'This field is required and must be a valid URL.',
+      },
+    },
+    authStyle: {
+      label: 'Auth style',
+      type: 'select',
+      description: 'It determines how client_id and client_secret are sent to Oauth2 provider. Default is AutoDetect.',
+      multi: false,
+      options: [
+        { value: 'AutoDetect', label: 'AutoDetect' },
+        { value: 'InParams', label: 'InParams' },
+        { value: 'InHeader', label: 'InHeader' },
+      ],
+      defaultValue: { value: 'AutoDetect', label: 'AutoDetect' },
+    },
+    tokenUrl: {
+      label: 'Token URL',
+      type: 'text',
+      description: 'The token endpoint of your OAuth2 provider.',
+      validation: {
+        required: true,
+        validate: (value) => {
+          return isUrlValid(value);
+        },
+        message: 'This field is required and must be a valid URL.',
+      },
+    },
+    scopes: {
+      label: 'Scopes',
+      type: 'select',
+      description: 'List of comma- or space-separated OAuth2 scopes.',
+      multi: true,
+      allowCustomValue: true,
+      options: [],
+    },
+    allowedGroups: {
+      label: 'Allowed groups',
+      type: 'select',
+      description: (
+        <>
+          List of comma- or space-separated groups. The user should be a member of at least one group to log in.{' '}
+          {provider === 'generic_oauth' &&
+            'If you configure allowed_groups, you must also configure groups_attribute_path.'}
+        </>
+      ),
+      multi: true,
+      allowCustomValue: true,
+      options: [],
+      validation:
+        provider === 'azuread'
+          ? {
+              validate: (value) => {
+                if (typeof value === 'string') {
+                  return uuidValidate(value);
+                }
+                if (isSelectableValue(value)) {
+                  return value.every((v) => v?.value && uuidValidate(v.value));
+                }
+                return true;
+              },
+              message: 'Allowed groups must be Object Ids.',
+            }
+          : undefined,
+    },
+    apiUrl: {
+      label: 'API URL',
+      type: 'text',
+      description: (
+        <>
+          The user information endpoint of your OAuth2 provider. Information returned by this endpoint must be
+          compatible with{' '}
+          <TextLink href={'https://connect2id.com/products/server/docs/api/userinfo'} external variant={'bodySmall'}>
+            OpenID UserInfo
+          </TextLink>
+          .
+        </>
+      ),
+      validation: {
+        required: false,
+        validate: (value) => {
+          if (typeof value !== 'string') {
+            return false;
+          }
+
+          if (value.length) {
+            return isUrlValid(value);
+          }
+
+          return true;
+        },
+        message: 'This field must be a valid URL if set.',
+      },
+    },
+    roleAttributePath: {
+      label: 'Role attribute path',
+      description: 'JMESPath expression to use for Grafana role lookup.',
+      type: 'text',
+      validation: {
+        required: false,
+      },
+    },
+    name: {
+      label: 'Display name',
+      description:
+        'Will be displayed on the login page as "Sign in with ...". Helpful if you use more than one identity providers or SSO protocols.',
+      type: 'text',
+    },
+    allowSignUp: {
+      label: 'Allow sign up',
+      description: 'If not enabled, only existing Grafana users can log in using OAuth.',
+      type: 'switch',
+    },
+    autoLogin: {
+      label: 'Auto login',
+      description: 'Log in automatically, skipping the login screen.',
+      type: 'switch',
+    },
+    signoutRedirectUrl: {
+      label: 'Sign out redirect URL',
+      description: 'The URL to redirect the user to after signing out from Grafana.',
+      type: 'text',
+      validation: {
+        required: false,
+      },
+    },
+    emailAttributeName: {
+      label: 'Email attribute name',
+      description: 'Name of the key to use for user email lookup within the attributes map of OAuth2 ID token.',
+      type: 'text',
+    },
+    emailAttributePath: {
+      label: 'Email attribute path',
+      description: 'JMESPath expression to use for user email lookup from the user information.',
+      type: 'text',
+    },
+    nameAttributePath: {
+      label: 'Name attribute path',
+      description:
+        'JMESPath expression to use for user name lookup from the user ID token. \n' +
+        'This name will be used as the user’s display name.',
+      type: 'text',
+    },
+    loginAttributePath: {
+      label: 'Login attribute path',
+      description: 'JMESPath expression to use for user login lookup from the user ID token.',
+      type: 'text',
+    },
+    idTokenAttributeName: {
+      label: 'ID token attribute name',
+      description: 'The name of the key used to extract the ID token from the returned OAuth2 token.',
+      type: 'text',
+    },
+    roleAttributeStrict: {
+      label: 'Role attribute strict mode',
+      description: 'If enabled, denies user login if the Grafana role cannot be extracted using Role attribute path.',
+      type: 'switch',
+    },
+    allowAssignGrafanaAdmin: {
+      label: 'Allow assign Grafana admin',
+      description: 'If enabled, it will automatically sync the Grafana server administrator role.',
+      type: 'switch',
+      hidden: !contextSrv.isGrafanaAdmin,
+    },
+    skipOrgRoleSync: {
+      label: 'Skip organization role sync',
+      description: 'Prevent synchronizing users’ organization roles from your IdP.',
+      type: 'switch',
+    },
+    defineAllowedGroups: {
+      label: 'Define allowed groups',
+      type: 'switch',
+    },
+    defineAllowedTeamsIds: {
+      label: 'Define allowed teams ids',
+      type: 'switch',
+    },
+    forceUseGraphApi: {
+      label: 'Force use Graph API',
+      description: "If enabled, Grafana will fetch the users' groups using the Microsoft Graph API.",
+      type: 'checkbox',
+    },
+    usePkce: {
+      label: 'Use PKCE',
+      description: (
+        <>
+          If enabled, Grafana will use{' '}
+          <TextLink external variant={'bodySmall'} href={'https://datatracker.ietf.org/doc/html/rfc7636'}>
+            Proof Key for Code Exchange (PKCE)
+          </TextLink>{' '}
+          with the OAuth2 Authorization Code Grant.
+        </>
+      ),
+      type: 'checkbox',
+    },
+    useRefreshToken: {
+      label: 'Use refresh token',
+      description:
+        'If enabled, Grafana will fetch a new access token using the refresh token provided by the OAuth2 provider.',
+      type: 'checkbox',
+    },
+    tlsClientCa: {
+      label: 'TLS client ca',
+      description: 'The file path to the trusted certificate authority list. Is not applicable on Grafana Cloud.',
+      type: 'text',
+      hidden: !config.localFileSystemAvailable,
+    },
+    tlsClientCert: {
+      label: 'TLS client cert',
+      description: 'The file path to the certificate. Is not applicable on Grafana Cloud.',
+      type: 'text',
+      hidden: !config.localFileSystemAvailable,
+    },
+    tlsClientKey: {
+      label: 'TLS client key',
+      description: 'The file path to the key. Is not applicable on Grafana Cloud.',
+      type: 'text',
+      hidden: !config.localFileSystemAvailable,
+    },
+    tlsSkipVerifyInsecure: {
+      label: 'TLS skip verify',
+      description:
+        'If enabled, the client accepts any certificate presented by the server and any host \n' +
+        'name in that certificate. You should only use this for testing, because this mode leaves \n' +
+        'SSL/TLS susceptible to man-in-the-middle attacks.',
+      type: 'switch',
+    },
+    groupsAttributePath: {
+      label: 'Groups attribute path',
+      description:
+        'JMESPath expression to use for user group lookup. If you configure allowed_groups, \n' +
+        'you must also configure groups_attribute_path.',
+      type: 'text',
+    },
+    teamsUrl: {
+      label: 'Teams URL',
+      description: (
+        <>
+          The URL used to query for Team Ids. If not set, the default value is /teams.{' '}
+          {provider === 'generic_oauth' &&
+            'If you configure teams_url, you must also configure team_ids_attribute_path.'}
+        </>
+      ),
+      type: 'text',
+      validation: {
+        validate: (value, formValues) => {
+          let result = true;
+          if (formValues.teamIds.length) {
+            result = !!value;
+          }
+
+          if (typeof value === 'string' && value.length) {
+            result = isUrlValid(value);
+          }
+          return result;
+        },
+        message: 'This field must be set if Team Ids are configured and must be a valid URL.',
+      },
+    },
+    teamIdsAttributePath: {
+      label: 'Team Ids attribute path',
+      description:
+        'The JMESPath expression to use for Grafana Team Id lookup within the results returned by the teams_url endpoint.',
+      type: 'text',
+      validation: {
+        validate: (value, formValues) => {
+          if (formValues.teamIds.length) {
+            return !!value;
+          }
+          return true;
+        },
+        message: 'This field must be set if Team Ids are configured.',
+      },
+    },
+    teamIds: {
+      label: 'Team Ids',
+      type: 'select',
+      description: (
+        <>
+          {provider === 'github' ? 'Integer' : 'String'} list of Team Ids. If set, the user must be a member of one of
+          the given teams to log in.{' '}
+          {provider === 'generic_oauth' &&
+            'If you configure team_ids, you must also configure teams_url and team_ids_attribute_path.'}
+        </>
+      ),
+      multi: true,
+      allowCustomValue: true,
+      options: [],
+      placeholder: 'Enter Team Ids and press Enter to add',
+      validation:
+        provider === 'github'
+          ? {
+              validate: (value) => {
+                if (typeof value === 'string') {
+                  return isNumeric(value);
+                }
+                if (isSelectableValue(value)) {
+                  return value.every((v) => v?.value && isNumeric(v.value));
+                }
+                return true;
+              },
+              message: 'Team Ids must be numbers.',
+            }
+          : undefined,
+    },
+    hostedDomain: {
+      label: 'Hosted domain',
+      description: 'The domain under which Grafana is hosted and accessible.',
+      type: 'text',
+    },
+    validateHd: {
+      label: 'Validate hosted domain',
+      description:
+        'If enabled, Grafana will match the Hosted Domain retrieved from the Google ID Token against the Allowed Domains list specified by the user.',
+      type: 'checkbox',
+    },
+  };
+}
+
+// Check if a string contains only numeric values
+function isNumeric(value: string) {
+  return /^-?\d+$/.test(value);
+}
diff --git a/public/app/features/auth-config/state/actions.ts b/public/app/features/auth-config/state/actions.ts
index 16b369523e6a4..0a930323aec29 100644
--- a/public/app/features/auth-config/state/actions.ts
+++ b/public/app/features/auth-config/state/actions.ts
@@ -1,27 +1,51 @@
 import { lastValueFrom } from 'rxjs';
 
-import { getBackendSrv, isFetchError } from '@grafana/runtime';
+import { config, getBackendSrv, isFetchError } from '@grafana/runtime';
 import { contextSrv } from 'app/core/core';
 import { AccessControlAction, Settings, ThunkResult, UpdateSettingsQuery } from 'app/types';
 
-import { getAuthProviderStatus, getRegisteredAuthProviders } from '..';
+import { getAuthProviderStatus, getRegisteredAuthProviders, SSOProvider } from '..';
 import { AuthProviderStatus, SettingsError } from '../types';
 
-import { loadingBegin, loadingEnd, providerStatusesLoaded, resetError, setError, settingsUpdated } from './reducers';
+import {
+  loadingBegin,
+  loadingEnd,
+  providersLoaded,
+  providerStatusesLoaded,
+  resetError,
+  setError,
+  settingsUpdated,
+} from './reducers';
 
-export function loadSettings(): ThunkResult<Promise<Settings>> {
+export function loadSettings(showSpinner = true): ThunkResult<Promise<Settings>> {
   return async (dispatch) => {
     if (contextSrv.hasPermission(AccessControlAction.SettingsRead)) {
-      dispatch(loadingBegin());
+      if (showSpinner) {
+        dispatch(loadingBegin());
+      }
+      dispatch(loadProviders());
       const result = await getBackendSrv().get('/api/admin/settings');
       dispatch(settingsUpdated(result));
       await dispatch(loadProviderStatuses());
-      dispatch(loadingEnd());
+      if (showSpinner) {
+        dispatch(loadingEnd());
+      }
       return result;
     }
   };
 }
 
+export function loadProviders(provider = ''): ThunkResult<Promise<SSOProvider[]>> {
+  return async (dispatch) => {
+    if (!config.featureToggles.ssoSettingsApi) {
+      return [];
+    }
+    const result = await getBackendSrv().get(`/api/v1/sso-settings${provider ? `/${provider}` : ''}`);
+    dispatch(providersLoaded(provider ? [result] : result));
+    return result;
+  };
+}
+
 export function loadProviderStatuses(): ThunkResult<void> {
   return async (dispatch) => {
     const registeredProviders = getRegisteredAuthProviders();
@@ -33,8 +57,7 @@ export function loadProviderStatuses(): ThunkResult<void> {
     const statuses = await Promise.all(getStatusPromises);
     for (let i = 0; i < registeredProviders.length; i++) {
       const provider = registeredProviders[i];
-      const status = statuses[i];
-      providerStatuses[provider.id] = status;
+      providerStatuses[provider.id] = statuses[i];
     }
     dispatch(providerStatusesLoaded(providerStatuses));
   };
diff --git a/public/app/features/auth-config/state/reducers.ts b/public/app/features/auth-config/state/reducers.ts
index 8153760f1dda4..0194ed538d0c3 100644
--- a/public/app/features/auth-config/state/reducers.ts
+++ b/public/app/features/auth-config/state/reducers.ts
@@ -2,12 +2,13 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 
 import { Settings } from 'app/types';
 
-import { SettingsError, AuthProviderStatus, AuthConfigState } from '../types';
+import { SettingsError, AuthProviderStatus, AuthConfigState, SSOProvider } from '../types';
 
 export const initialState: AuthConfigState = {
   settings: {},
   providerStatuses: {},
   isLoading: false,
+  providers: [],
 };
 
 const authConfigSlice = createSlice({
@@ -38,6 +39,9 @@ const authConfigSlice = createSlice({
     resetWarning: (state): AuthConfigState => {
       return { ...state, warning: undefined };
     },
+    providersLoaded: (state, action: PayloadAction<SSOProvider[]>): AuthConfigState => {
+      return { ...state, providers: action.payload };
+    },
   },
 });
 
@@ -50,6 +54,7 @@ export const {
   resetError,
   setWarning,
   resetWarning,
+  providersLoaded,
 } = authConfigSlice.actions;
 
 export const authConfigReducer = authConfigSlice.reducer;
diff --git a/public/app/features/auth-config/types.ts b/public/app/features/auth-config/types.ts
index 6dfb6ae5f7e7c..b139efda4fbaa 100644
--- a/public/app/features/auth-config/types.ts
+++ b/public/app/features/auth-config/types.ts
@@ -1,5 +1,8 @@
-import { Settings } from 'app/types';
+import { ReactElement } from 'react';
+import { Validate } from 'react-hook-form';
 
+import { IconName, SelectableValue } from '@grafana/data';
+import { Settings } from 'app/types';
 export interface AuthProviderInfo {
   id: string;
   type: string;
@@ -10,12 +13,82 @@ export interface AuthProviderInfo {
 
 export type GetStatusHook = () => Promise<AuthProviderStatus>;
 
+// Settings types common to the provider settings data when working with the API and forms
+export type SSOProviderSettingsBase = {
+  allowAssignGrafanaAdmin?: boolean;
+  allowSignUp?: boolean;
+  apiUrl?: string;
+  authStyle?: string;
+  authUrl?: string;
+  autoLogin?: boolean;
+  clientId: string;
+  clientSecret: string;
+  emailAttributeName?: string;
+  emailAttributePath?: string;
+  emptyScopes?: boolean;
+  enabled: boolean;
+  extra?: Record<string, string>;
+  groupsAttributePath?: string;
+  hostedDomain?: string;
+  icon?: IconName;
+  name?: string;
+  roleAttributePath?: string;
+  roleAttributeStrict?: boolean;
+  signoutRedirectUrl?: string;
+  skipOrgRoleSync?: boolean;
+  teamIdsAttributePath?: string;
+  teamsUrl?: string;
+  tlsClientCa?: string;
+  tlsClientCert?: string;
+  tlsClientKey?: string;
+  tlsSkipVerify?: boolean;
+  tokenUrl?: string;
+  type: string;
+  usePkce?: boolean;
+  useRefreshToken?: boolean;
+  nameAttributePath?: string;
+  loginAttributePath?: string;
+  idTokenAttributeName?: string;
+  defineAllowedGroups?: boolean;
+  defineAllowedTeamsIds?: boolean;
+  configureTLS?: boolean;
+  tlsSkipVerifyInsecure?: boolean;
+  // For Azure AD
+  forceUseGraphApi?: boolean;
+  // For Google
+  validateHd?: boolean;
+};
+
+// SSO data received from the API and sent to it
+export type SSOProvider = {
+  id: string;
+  provider: string;
+  source: string;
+  settings: SSOProviderSettingsBase & {
+    teamIds: string;
+    allowedOrganizations: string;
+    allowedDomains?: string;
+    allowedGroups?: string;
+    scopes?: string;
+  };
+};
+
+// SSO data format for storing in the forms
+export type SSOProviderDTO = Partial<SSOProviderSettingsBase> & {
+  teamIds: Array<SelectableValue<string>>;
+  allowedOrganizations: Array<SelectableValue<string>>;
+  allowedDomains?: Array<SelectableValue<string>>;
+  allowedGroups?: Array<SelectableValue<string>>;
+  scopes?: Array<SelectableValue<string>>;
+};
+
 export interface AuthConfigState {
   settings: Settings;
   providerStatuses: Record<string, AuthProviderStatus>;
   isLoading?: boolean;
   updateError?: SettingsError;
   warning?: SettingsError;
+  providers: SSOProvider[];
 }
 
 export interface AuthProviderStatus {
@@ -30,3 +103,25 @@ export interface SettingsError {
   message: string;
   errors: string[];
 }
+
+// Data structure used to render form fields
+export type FieldData = {
+  label: string;
+  type: string;
+  description?: string | ReactElement;
+  validation?: {
+    required?: boolean;
+    message?: string;
+    validate?: Validate<SSOProviderDTO[keyof SSOProviderDTO], SSOProviderDTO>;
+  };
+  multi?: boolean;
+  allowCustomValue?: boolean;
+  options?: Array<SelectableValue<string>>;
+  placeholder?: string;
+  defaultValue?: SelectableValue<string>;
+  hidden?: boolean;
+};
+
+export type SSOSettingsField =
+  | keyof SSOProvider['settings']
+  | { name: keyof SSOProvider['settings']; dependsOn: keyof SSOProvider['settings']; hidden?: boolean };
diff --git a/public/app/features/auth-config/utils.ts b/public/app/features/auth-config/utils.ts
deleted file mode 100644
index 872918065fbd2..0000000000000
--- a/public/app/features/auth-config/utils.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { BASE_PATH } from './constants';
-import { AuthProviderInfo } from './types';
-
-export function getProviderUrl(provider: AuthProviderInfo) {
-  return BASE_PATH + (provider.configPath || provider.id);
-}
diff --git a/public/app/features/auth-config/utils/data.ts b/public/app/features/auth-config/utils/data.ts
new file mode 100644
index 0000000000000..fa7d425939c3a
--- /dev/null
+++ b/public/app/features/auth-config/utils/data.ts
@@ -0,0 +1,125 @@
+import { SelectableValue } from '@grafana/data';
+
+import { fieldMap, sectionFields } from '../fields';
+import { FieldData, SSOProvider, SSOProviderDTO } from '../types';
+
+import { isSelectableValue } from './guards';
+
+export const emptySettings: SSOProviderDTO = {
+  allowAssignGrafanaAdmin: false,
+  allowSignUp: false,
+  allowedDomains: [],
+  allowedGroups: [],
+  allowedOrganizations: [],
+  apiUrl: '',
+  authStyle: '',
+  authUrl: '',
+  autoLogin: false,
+  clientId: '',
+  clientSecret: '',
+  emailAttributeName: '',
+  emailAttributePath: '',
+  emptyScopes: false,
+  enabled: false,
+  extra: {},
+  groupsAttributePath: '',
+  hostedDomain: '',
+  icon: 'shield',
+  name: '',
+  roleAttributePath: '',
+  roleAttributeStrict: false,
+  scopes: [],
+  signoutRedirectUrl: '',
+  skipOrgRoleSync: false,
+  teamIds: [],
+  teamIdsAttributePath: '',
+  teamsUrl: '',
+  tlsClientCa: '',
+  tlsClientCert: '',
+  tlsClientKey: '',
+  tlsSkipVerify: false,
+  tokenUrl: '',
+  type: '',
+  usePkce: false,
+  useRefreshToken: false,
+};
+
+const strToValue = (val: string | string[]): SelectableValue[] => {
+  if (!val?.length) {
+    return [];
+  }
+  if (Array.isArray(val)) {
+    return val.map((v) => ({ label: v, value: v }));
+  }
+  return val.split(/[\s,]/).map((s) => ({ label: s, value: s }));
+};
+
+export function dataToDTO(data?: SSOProvider): SSOProviderDTO {
+  if (!data) {
+    return emptySettings;
+  }
+  const providerFields = getFieldsForProvider(data.provider);
+  const arrayFields = getArrayFields(fieldMap(data.provider), providerFields);
+  const settings = { ...data.settings };
+  for (const field of arrayFields) {
+    //@ts-expect-error
+    settings[field] = strToValue(settings[field]);
+  }
+  //@ts-expect-error
+  return settings;
+}
+
+const valuesToString = (values: Array<SelectableValue<string>>) => {
+  return values.map(({ value }) => value).join(',');
+};
+
+const getFieldsForProvider = (provider: string) => {
+  const sections = sectionFields[provider];
+
+  // include the enabled field because it is not part of the fields defined for providers
+  const fields = ['enabled'];
+
+  return Object.values(sections).reduce(
+    (result, section) => [
+      ...result,
+      ...section.fields.map((field) => (typeof field === 'string' ? field : field.name)),
+    ],
+    fields
+  );
+};
+
+// Convert the DTO to the data format used by the API
+export function dtoToData(dto: SSOProviderDTO, provider: string) {
+  let current: Partial<SSOProviderDTO> = dto;
+
+  const providerFields = getFieldsForProvider(provider);
+  const arrayFields = getArrayFields(fieldMap(provider), providerFields);
+
+  // filter out the fields that are not defined on the provider
+  const settings: Partial<SSOProviderDTO> = Object.keys(current)
+    .filter((key) => providerFields.includes(key))
+    .reduce((obj, key) => {
+      //@ts-expect-error
+      return { ...obj, [key]: current[key] };
+    }, {});
+
+  for (const field of arrayFields) {
+    const value = current[field];
+    if (value) {
+      if (isSelectableValue(value)) {
+        //@ts-expect-error
+        settings[field] = valuesToString(value);
+      } else if (isSelectableValue([value])) {
+        //@ts-expect-error
+        settings[field] = value.value;
+      }
+    }
+  }
+  return settings;
+}
+
+export function getArrayFields(obj: Record<string, FieldData>, providerFields: string[]): Array<keyof SSOProviderDTO> {
+  return Object.entries(obj)
+    .filter(([key, value]) => providerFields.includes(key) && value.type === 'select')
+    .map(([key]) => key as keyof SSOProviderDTO);
+}
diff --git a/public/app/features/auth-config/utils/guards.ts b/public/app/features/auth-config/utils/guards.ts
new file mode 100644
index 0000000000000..9de8334f4d47a
--- /dev/null
+++ b/public/app/features/auth-config/utils/guards.ts
@@ -0,0 +1,5 @@
+import { SelectableValue } from '@grafana/data';
+
+export function isSelectableValue(value: unknown): value is SelectableValue[] {
+  return Array.isArray(value) && value.every((v) => typeof v === 'object' && v !== null && 'value' in v);
+}
diff --git a/public/app/features/auth-config/utils/url.ts b/public/app/features/auth-config/utils/url.ts
new file mode 100644
index 0000000000000..cf98cf311c20e
--- /dev/null
+++ b/public/app/features/auth-config/utils/url.ts
@@ -0,0 +1,18 @@
+import { BASE_PATH } from '../constants';
+import { AuthProviderInfo } from '../types';
+
+export function getProviderUrl(provider: AuthProviderInfo) {
+  return BASE_PATH + (provider.configPath || provider.id);
+}
+
+export const isUrlValid = (url: unknown): boolean => {
+  if (typeof url !== 'string') {
+    return false;
+  }
+  try {
+    const parsedUrl = new URL(url);
+    return parsedUrl.protocol.includes('http');
+  } catch (_) {
+    return false;
+  }
+};
diff --git a/public/app/features/browse-dashboards/BrowseDashboardsPage.test.tsx b/public/app/features/browse-dashboards/BrowseDashboardsPage.test.tsx
index 1d3598c1e9c00..ab005ac3d4811 100644
--- a/public/app/features/browse-dashboards/BrowseDashboardsPage.test.tsx
+++ b/public/app/features/browse-dashboards/BrowseDashboardsPage.test.tsx
@@ -1,7 +1,7 @@
-import 'whatwg-fetch'; // fetch polyfill
+import 'whatwg-fetch';
 import { render as rtlRender, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { rest } from 'msw';
+import { HttpResponse, http } from 'msw';
 import { setupServer, SetupServer } from 'msw/node';
 import React, { ComponentProps } from 'react';
 import AutoSizer from 'react-virtualized-auto-sizer';
@@ -30,7 +30,16 @@ jest.mock('react-virtualized-auto-sizer', () => {
   return {
     __esModule: true,
     default(props: ComponentProps<typeof AutoSizer>) {
-      return <div>{props.children({ width: 800, height: 600 })}</div>;
+      return (
+        <div>
+          {props.children({
+            width: 800,
+            scaledWidth: 800,
+            scaledHeight: 600,
+            height: 600,
+          })}
+        </div>
+      );
     },
   };
 });
@@ -111,25 +120,19 @@ describe('browse-dashboards BrowseDashboardsPage', () => {
 
   beforeAll(() => {
     server = setupServer(
-      rest.get('/api/folders/:uid', (_, res, ctx) => {
-        return res(
-          ctx.status(200),
-          ctx.json({
-            title: folderA.item.title,
-            uid: folderA.item.uid,
-          })
-        );
+      http.get('/api/folders/:uid', () => {
+        return HttpResponse.json({
+          title: folderA.item.title,
+          uid: folderA.item.uid,
+        });
       }),
-      rest.get('/api/search', (_, res, ctx) => {
-        return res(ctx.status(200), ctx.json({}));
+      http.get('/api/search', () => {
+        return HttpResponse.json({});
       }),
-      rest.get('/api/search/sorting', (_, res, ctx) => {
-        return res(
-          ctx.status(200),
-          ctx.json({
-            sortOptions: [],
-          })
-        );
+      http.get('/api/search/sorting', () => {
+        return HttpResponse.json({
+          sortOptions: [],
+        });
       })
     );
     server.listen();
diff --git a/public/app/features/browse-dashboards/BrowseFolderAlertingPage.test.tsx b/public/app/features/browse-dashboards/BrowseFolderAlertingPage.test.tsx
index e7f01c2a7e1b5..9c101f9bb5485 100644
--- a/public/app/features/browse-dashboards/BrowseFolderAlertingPage.test.tsx
+++ b/public/app/features/browse-dashboards/BrowseFolderAlertingPage.test.tsx
@@ -1,6 +1,6 @@
-import 'whatwg-fetch'; // fetch polyfill
+import 'whatwg-fetch';
 import { render as rtlRender, screen } from '@testing-library/react';
-import { rest } from 'msw';
+import { http, HttpResponse } from 'msw';
 import { SetupServer, setupServer } from 'msw/node';
 import React from 'react';
 import { TestProvider } from 'test/helpers/TestProvider';
@@ -47,20 +47,17 @@ describe('browse-dashboards BrowseFolderAlertingPage', () => {
 
   beforeAll(() => {
     server = setupServer(
-      rest.get('/api/folders/:uid', (_, res, ctx) => {
-        return res(
-          ctx.status(200),
-          ctx.json({
-            title: mockFolderName,
-            uid: mockFolderUid,
-          })
-        );
+      http.get('/api/folders/:uid', () => {
+        return HttpResponse.json({
+          title: mockFolderName,
+          uid: mockFolderUid,
+        });
       }),
-      rest.get('api/ruler/grafana/api/v1/rules', (_, res, ctx) => {
-        return res(ctx.status(200), ctx.json(mockRulerRulesResponse));
+      http.get('api/ruler/grafana/api/v1/rules', () => {
+        return HttpResponse.json(mockRulerRulesResponse);
       }),
-      rest.get('api/prometheus/grafana/api/v1/rules', (_, res, ctx) => {
-        return res(ctx.status(200), ctx.json(mockPrometheusRulesResponse));
+      http.get('api/prometheus/grafana/api/v1/rules', () => {
+        return HttpResponse.json(mockPrometheusRulesResponse);
       })
     );
     server.listen();
diff --git a/public/app/features/browse-dashboards/BrowseFolderLibraryPanelsPage.test.tsx b/public/app/features/browse-dashboards/BrowseFolderLibraryPanelsPage.test.tsx
index b188fd20a93b6..1c6632d580bf2 100644
--- a/public/app/features/browse-dashboards/BrowseFolderLibraryPanelsPage.test.tsx
+++ b/public/app/features/browse-dashboards/BrowseFolderLibraryPanelsPage.test.tsx
@@ -1,6 +1,6 @@
-import 'whatwg-fetch'; // fetch polyfill
+import 'whatwg-fetch';
 import { render as rtlRender, screen } from '@testing-library/react';
-import { rest } from 'msw';
+import { http, HttpResponse } from 'msw';
 import { SetupServer, setupServer } from 'msw/node';
 import React from 'react';
 import { TestProvider } from 'test/helpers/TestProvider';
@@ -47,25 +47,19 @@ describe('browse-dashboards BrowseFolderLibraryPanelsPage', () => {
 
   beforeAll(() => {
     server = setupServer(
-      rest.get('/api/folders/:uid', (_, res, ctx) => {
-        return res(
-          ctx.status(200),
-          ctx.json({
-            title: mockFolderName,
-            uid: mockFolderUid,
-          })
-        );
+      http.get('/api/folders/:uid', () => {
+        return HttpResponse.json({
+          title: mockFolderName,
+          uid: mockFolderUid,
+        });
       }),
-      rest.get('/api/library-elements', (_, res, ctx) => {
-        return res(
-          ctx.status(200),
-          ctx.json({
-            result: mockLibraryElementsResponse,
-          })
-        );
+      http.get('/api/library-elements', () => {
+        return HttpResponse.json({
+          result: mockLibraryElementsResponse,
+        });
       }),
-      rest.get('/api/search/sorting', (_, res, ctx) => {
-        return res(ctx.status(200), ctx.json({}));
+      http.get('/api/search/sorting', () => {
+        return HttpResponse.json({});
       })
     );
     server.listen();
diff --git a/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts b/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
index fc68ca8756545..264b180678502 100644
--- a/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
+++ b/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
@@ -3,12 +3,22 @@ import { lastValueFrom } from 'rxjs';
 
 import { isTruthy, locationUtil } from '@grafana/data';
 import { BackendSrvRequest, getBackendSrv, locationService } from '@grafana/runtime';
+import { Dashboard } from '@grafana/schema';
 import { notifyApp } from 'app/core/actions';
 import { createSuccessNotification } from 'app/core/copy/appNotification';
 import { contextSrv } from 'app/core/core';
 import { SaveDashboardCommand } from 'app/features/dashboard/components/SaveDashboard/types';
 import { dashboardWatcher } from 'app/features/live/dashboard/dashboardWatcher';
-import { DashboardDTO, DescendantCount, DescendantCountDTO, FolderDTO, SaveDashboardResponseDTO } from 'app/types';
+import {
+  DashboardDTO,
+  DescendantCount,
+  DescendantCountDTO,
+  FolderDTO,
+  FolderListItemDTO,
+  ImportDashboardResponseDTO,
+  PermissionLevelString,
+  SaveDashboardResponseDTO,
+} from 'app/types';
 
 import { refetchChildren, refreshParents } from '../state';
 import { DashboardTreeSelection } from '../types';
@@ -28,6 +38,20 @@ interface MoveItemsArgs extends DeleteItemsArgs {
   destinationUID: string;
 }
 
+export interface ImportInputs {
+  name: string;
+  type: string;
+  value: string;
+  pluginId?: string;
+}
+
+interface ImportOptions {
+  dashboard: Dashboard;
+  overwrite: boolean;
+  inputs: ImportInputs[];
+  folderUid: string;
+}
+
 function createBackendSrvBaseQuery({ baseURL }: { baseURL: string }): BaseQueryFn<RequestOptions> {
   async function backendSrvBaseQuery(requestOptions: RequestOptions) {
     try {
@@ -47,16 +71,32 @@ function createBackendSrvBaseQuery({ baseURL }: { baseURL: string }): BaseQueryF
   return backendSrvBaseQuery;
 }
 
+export interface ListFolderQueryArgs {
+  page: number;
+  parentUid: string | undefined;
+  limit: number;
+  permission?: PermissionLevelString;
+}
+
 export const browseDashboardsAPI = createApi({
   tagTypes: ['getFolder'],
   reducerPath: 'browseDashboardsAPI',
   baseQuery: createBackendSrvBaseQuery({ baseURL: '/api' }),
   endpoints: (builder) => ({
+    listFolders: builder.query<FolderListItemDTO[], ListFolderQueryArgs>({
+      providesTags: (result) => result?.map((folder) => ({ type: 'getFolder', id: folder.uid })) ?? [],
+      query: ({ parentUid, limit, page, permission }) => ({
+        url: '/folders',
+        params: { parentUid, limit, page, permission },
+      }),
+    }),
+
     // get folder info (e.g. title, parents) but *not* children
     getFolder: builder.query<FolderDTO, string>({
       providesTags: (_result, _error, folderUID) => [{ type: 'getFolder', id: folderUID }],
       query: (folderUID) => ({ url: `/folders/${folderUID}`, params: { accesscontrol: true } }),
     }),
+
     // create a new folder
     newFolder: builder.mutation<FolderDTO, { title: string; parentUid?: string }>({
       query: ({ title, parentUid }) => ({
@@ -81,6 +121,7 @@ export const browseDashboardsAPI = createApi({
         });
       },
     }),
+
     // save an existing folder (e.g. rename)
     saveFolder: builder.mutation<FolderDTO, FolderDTO>({
       // because the getFolder calls contain the parents, renaming a parent/grandparent/etc needs to invalidate all child folders
@@ -273,9 +314,10 @@ export const browseDashboardsAPI = createApi({
     }),
     // save an existing dashboard
     saveDashboard: builder.mutation<SaveDashboardResponseDTO, SaveDashboardCommand>({
-      query: ({ dashboard, folderUid, message, overwrite }) => ({
+      query: ({ dashboard, folderUid, message, overwrite, showErrorAlert }) => ({
         url: `/dashboards/db`,
         method: 'POST',
+        showErrorAlert,
         data: {
           dashboard,
           folderUid,
@@ -296,6 +338,30 @@ export const browseDashboardsAPI = createApi({
         });
       },
     }),
+    importDashboard: builder.mutation<ImportDashboardResponseDTO, ImportOptions>({
+      query: ({ dashboard, overwrite, inputs, folderUid }) => ({
+        method: 'POST',
+        url: '/dashboards/import',
+        data: {
+          dashboard,
+          overwrite,
+          inputs,
+          folderUid,
+        },
+      }),
+      onQueryStarted: ({ folderUid }, { queryFulfilled, dispatch }) => {
+        queryFulfilled.then(async (response) => {
+          dispatch(
+            refetchChildren({
+              parentUID: folderUid,
+              pageSize: PAGE_SIZE,
+            })
+          );
+          const dashboardUrl = locationUtil.stripBaseFromUrl(response.data.importedUrl);
+          locationService.push(dashboardUrl);
+        });
+      },
+    }),
   }),
 });
 
@@ -311,4 +377,5 @@ export const {
   useSaveDashboardMutation,
   useSaveFolderMutation,
 } = browseDashboardsAPI;
+
 export { skipToken } from '@reduxjs/toolkit/query/react';
diff --git a/public/app/features/browse-dashboards/api/services.ts b/public/app/features/browse-dashboards/api/services.ts
index d8d43c5d22271..3892593ac790c 100644
--- a/public/app/features/browse-dashboards/api/services.ts
+++ b/public/app/features/browse-dashboards/api/services.ts
@@ -4,6 +4,10 @@ import { getGrafanaSearcher, NestedFolderDTO } from 'app/features/search/service
 import { queryResultToViewItem } from 'app/features/search/service/utils';
 import { DashboardViewItem } from 'app/features/search/types';
 
+import { contextSrv } from '../../../core/core';
+import { AccessControlAction } from '../../../types';
+import { isSharedWithMe } from '../components/utils';
+
 export const PAGE_SIZE = 50;
 
 export async function listFolders(
@@ -18,11 +22,15 @@ export async function listFolders(
 
   const backendSrv = getBackendSrv();
 
-  const folders = await backendSrv.get<NestedFolderDTO[]>('/api/folders', {
-    parentUid: parentUID,
-    page,
-    limit: pageSize,
-  });
+  let folders: NestedFolderDTO[] = [];
+  if (contextSrv.hasPermission(AccessControlAction.FoldersRead)) {
+    folders = await backendSrv.get<NestedFolderDTO[]>('/api/folders', {
+      parentUid: parentUID,
+      page,
+      limit: pageSize,
+    });
+  }
+  const subUrlPrefix = config.appSubUrl ?? '';
 
   return folders.map((item) => ({
     kind: 'folder',
@@ -30,7 +38,9 @@ export async function listFolders(
     title: item.title,
     parentTitle,
     parentUID,
-    url: `/dashboards/f/${item.uid}/`,
+
+    // URLs from the backend come with subUrlPrefix already included, so match that behaviour here
+    url: isSharedWithMe(item.uid) ? undefined : `${subUrlPrefix}/dashboards/f/${item.uid}/`,
   }));
 }
 
diff --git a/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.tsx b/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.tsx
index 6a4a1604712a1..a45d644693400 100644
--- a/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.tsx
@@ -1,8 +1,7 @@
 import React, { useState } from 'react';
 
-import { Space } from '@grafana/experimental';
 import { config } from '@grafana/runtime';
-import { Alert, ConfirmModal, Text } from '@grafana/ui';
+import { Alert, ConfirmModal, Text, Space } from '@grafana/ui';
 import { Trans, t } from 'app/core/internationalization';
 
 import { useGetAffectedItemsQuery } from '../../api/browseDashboardsAPI';
diff --git a/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.test.tsx b/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.test.tsx
index 182e712f1feae..0691ad442062d 100644
--- a/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.test.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.test.tsx
@@ -4,6 +4,7 @@ import React from 'react';
 import { TestProvider } from 'test/helpers/TestProvider';
 import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
 
+import { selectors } from '@grafana/e2e-selectors';
 import { setBackendSrv } from '@grafana/runtime';
 import { backendSrv } from 'app/core/services/__mocks__/backend_srv';
 import * as api from 'app/features/manage-dashboards/state/actions';
@@ -70,7 +71,7 @@ describe('browse-dashboards MoveModal', () => {
   it('displays a folder picker', async () => {
     render(<MoveModal {...props} />);
 
-    expect(await screen.findByRole('combobox', { name: 'Select a folder' })).toBeInTheDocument();
+    expect(await screen.findByTestId(selectors.components.FolderPicker.input)).toBeInTheDocument();
   });
 
   it('displays a warning about permissions if a folder is selected', async () => {
@@ -88,7 +89,7 @@ describe('browse-dashboards MoveModal', () => {
     render(<MoveModal {...props} />);
 
     expect(await screen.findByRole('button', { name: 'Move' })).toBeDisabled();
-    const folderPicker = await screen.findByRole('combobox', { name: 'Select a folder' });
+    const folderPicker = await screen.findByTestId(selectors.components.FolderPicker.input);
 
     await selectOptionInTest(folderPicker, mockFolders[1].title);
     expect(await screen.findByRole('button', { name: 'Move' })).toBeEnabled();
@@ -96,7 +97,7 @@ describe('browse-dashboards MoveModal', () => {
 
   it('calls onConfirm when clicking the `Move` button', async () => {
     render(<MoveModal {...props} />);
-    const folderPicker = await screen.findByRole('combobox', { name: 'Select a folder' });
+    const folderPicker = await screen.findByTestId(selectors.components.FolderPicker.input);
 
     await selectOptionInTest(folderPicker, mockFolders[1].title);
     await userEvent.click(await screen.findByRole('button', { name: 'Move' }));
diff --git a/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.tsx b/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.tsx
index f36cbfd5bc515..366d3c3208c1b 100644
--- a/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseActions/MoveModal.tsx
@@ -1,7 +1,6 @@
 import React, { useState } from 'react';
 
-import { Space } from '@grafana/experimental';
-import { Alert, Button, Field, Modal, Text } from '@grafana/ui';
+import { Alert, Button, Field, Modal, Text, Space } from '@grafana/ui';
 import { FolderPicker } from 'app/core/components/Select/FolderPicker';
 import { t, Trans } from 'app/core/internationalization';
 
diff --git a/public/app/features/browse-dashboards/components/BrowseFilters.tsx b/public/app/features/browse-dashboards/components/BrowseFilters.tsx
index 34fec5064964f..43e64d57cc2b9 100644
--- a/public/app/features/browse-dashboards/components/BrowseFilters.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseFilters.tsx
@@ -10,7 +10,6 @@ export function BrowseFilters() {
   return (
     <div>
       <ActionRow
-        hideLayout
         showStarredFilter
         state={searchState}
         getTagOptions={stateManager.getTagOptions}
diff --git a/public/app/features/browse-dashboards/components/CheckboxCell.tsx b/public/app/features/browse-dashboards/components/CheckboxCell.tsx
index 83f84c9e039ae..fb8ffebfe20e1 100644
--- a/public/app/features/browse-dashboards/components/CheckboxCell.tsx
+++ b/public/app/features/browse-dashboards/components/CheckboxCell.tsx
@@ -8,26 +8,31 @@ import { t } from 'app/core/internationalization';
 
 import { DashboardsTreeCellProps, SelectionState } from '../types';
 
+import { isSharedWithMe } from './utils';
+
 export default function CheckboxCell({
   row: { original: row },
   isSelected,
   onItemSelectionChange,
 }: DashboardsTreeCellProps) {
-  const styles = useStyles2(getStyles);
   const item = row.item;
 
   if (!isSelected) {
-    return <span className={styles.checkboxSpacer} />;
+    return <CheckboxSpacer />;
   }
 
   if (item.kind === 'ui') {
     if (item.uiKind === 'pagination-placeholder') {
       return <Checkbox disabled value={false} />;
     } else {
-      return <span className={styles.checkboxSpacer} />;
+      return <CheckboxSpacer />;
     }
   }
 
+  if (isSharedWithMe(item.uid)) {
+    return <CheckboxSpacer />;
+  }
+
   const state = isSelected(item);
 
   return (
@@ -41,6 +46,11 @@ export default function CheckboxCell({
   );
 }
 
+function CheckboxSpacer() {
+  const styles = useStyles2(getStyles);
+  return <span className={styles.checkboxSpacer} />;
+}
+
 const getStyles = (theme: GrafanaTheme2) => ({
   // Should be the same size as the <IconButton /> so Dashboard name is aligned to Folder name siblings
   checkboxSpacer: css({
diff --git a/public/app/features/browse-dashboards/components/CreateNewButton.test.tsx b/public/app/features/browse-dashboards/components/CreateNewButton.test.tsx
index 2b6a1093aabe7..dfa6c6f415b4f 100644
--- a/public/app/features/browse-dashboards/components/CreateNewButton.test.tsx
+++ b/public/app/features/browse-dashboards/components/CreateNewButton.test.tsx
@@ -25,18 +25,21 @@ describe('NewActionsButton', () => {
   it('should display the correct urls with a given parent folder', async () => {
     await renderAndOpen(mockParentFolder);
 
-    expect(screen.getByText('New dashboard')).toHaveAttribute(
+    expect(screen.getByRole('link', { name: 'New dashboard' })).toHaveAttribute(
       'href',
       `/dashboard/new?folderUid=${mockParentFolder.uid}`
     );
-    expect(screen.getByText('Import')).toHaveAttribute('href', `/dashboard/import?folderUid=${mockParentFolder.uid}`);
+    expect(screen.getByRole('link', { name: 'Import' })).toHaveAttribute(
+      'href',
+      `/dashboard/import?folderUid=${mockParentFolder.uid}`
+    );
   });
 
   it('should display urls without params when there is no parent folder', async () => {
     await renderAndOpen();
 
-    expect(screen.getByText('New dashboard')).toHaveAttribute('href', '/dashboard/new');
-    expect(screen.getByText('Import')).toHaveAttribute('href', '/dashboard/import');
+    expect(screen.getByRole('link', { name: 'New dashboard' })).toHaveAttribute('href', '/dashboard/new');
+    expect(screen.getByRole('link', { name: 'Import' })).toHaveAttribute('href', '/dashboard/import');
   });
 
   it('clicking the "New folder" button opens the drawer', async () => {
@@ -57,7 +60,7 @@ describe('NewActionsButton', () => {
     const newButton = screen.getByText('New');
     await userEvent.click(newButton);
 
-    expect(screen.getByText('New dashboard')).toBeInTheDocument();
+    expect(screen.getByRole('link', { name: 'New dashboard' })).toBeInTheDocument();
     expect(screen.getByText('Import')).toBeInTheDocument();
     expect(screen.queryByText('New folder')).not.toBeInTheDocument();
   });
diff --git a/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx b/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx
index 8a58cd9c4218c..caa039829bd91 100644
--- a/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx
+++ b/public/app/features/browse-dashboards/components/DashboardsTree.test.tsx
@@ -5,8 +5,14 @@ import { TestProvider } from 'test/helpers/TestProvider';
 import { assertIsDefined } from 'test/helpers/asserts';
 
 import { selectors } from '@grafana/e2e-selectors';
+import { config } from '@grafana/runtime';
 
-import { wellFormedDashboard, wellFormedEmptyFolder, wellFormedFolder } from '../fixtures/dashboardsTreeItem.fixture';
+import {
+  sharedWithMeFolder,
+  wellFormedDashboard,
+  wellFormedEmptyFolder,
+  wellFormedFolder,
+} from '../fixtures/dashboardsTreeItem.fixture';
 import { SelectionState } from '../types';
 
 import { DashboardsTree } from './DashboardsTree';
@@ -27,6 +33,10 @@ describe('browse-dashboards DashboardsTree', () => {
   const allItemsAreLoaded = () => true;
   const requestLoadMore = () => Promise.resolve();
 
+  beforeAll(() => {
+    config.sharedWithMeFolderUID = 'sharedwithme';
+  });
+
   it('renders a dashboard item', () => {
     render(
       <DashboardsTree
@@ -82,9 +92,73 @@ describe('browse-dashboards DashboardsTree', () => {
         requestLoadMore={requestLoadMore}
       />
     );
+
     expect(screen.queryByText(folder.item.title)).toBeInTheDocument();
   });
 
+  it('renders a folder link', () => {
+    render(
+      <DashboardsTree
+        canSelect
+        items={[folder]}
+        isSelected={isSelected}
+        width={WIDTH}
+        height={HEIGHT}
+        onFolderClick={noop}
+        onItemSelectionChange={noop}
+        onAllSelectionChange={noop}
+        isItemLoaded={allItemsAreLoaded}
+        requestLoadMore={requestLoadMore}
+      />
+    );
+
+    expect(screen.queryByText(folder.item.title)).toHaveAttribute('href', folder.item.url);
+  });
+
+  it("doesn't link to the sharedwithme pseudo-folder", () => {
+    const sharedWithMe = sharedWithMeFolder(2);
+
+    render(
+      <DashboardsTree
+        canSelect
+        items={[sharedWithMe, folder]}
+        isSelected={isSelected}
+        width={WIDTH}
+        height={HEIGHT}
+        onFolderClick={noop}
+        onItemSelectionChange={noop}
+        onAllSelectionChange={noop}
+        isItemLoaded={allItemsAreLoaded}
+        requestLoadMore={requestLoadMore}
+      />
+    );
+
+    expect(screen.queryByText(sharedWithMe.item.title)).not.toHaveAttribute('href');
+  });
+
+  it("doesn't render a checkbox for the sharedwithme pseudo-folder", () => {
+    const sharedWithMe = sharedWithMeFolder(2);
+
+    render(
+      <DashboardsTree
+        canSelect
+        items={[sharedWithMe, folder]}
+        isSelected={isSelected}
+        width={WIDTH}
+        height={HEIGHT}
+        onFolderClick={noop}
+        onItemSelectionChange={noop}
+        onAllSelectionChange={noop}
+        isItemLoaded={allItemsAreLoaded}
+        requestLoadMore={requestLoadMore}
+      />
+    );
+
+    expect(
+      screen.queryByTestId(selectors.pages.BrowseDashboards.table.checkbox(sharedWithMe.item.uid))
+    ).not.toBeInTheDocument();
+  });
+
   it('calls onFolderClick when a folder button is clicked', async () => {
     const handler = jest.fn();
     render(
diff --git a/public/app/features/browse-dashboards/components/DashboardsTree.tsx b/public/app/features/browse-dashboards/components/DashboardsTree.tsx
index be3b5bee1c766..94d16c5ba77ba 100644
--- a/public/app/features/browse-dashboards/components/DashboardsTree.tsx
+++ b/public/app/features/browse-dashboards/components/DashboardsTree.tsx
@@ -1,7 +1,7 @@
 import { css, cx } from '@emotion/css';
 import React, { useCallback, useEffect, useId, useMemo, useRef } from 'react';
 import { TableInstance, useTable } from 'react-table';
-import { FixedSizeList as List } from 'react-window';
+import { VariableSizeList as List } from 'react-window';
 import InfiniteLoader from 'react-window-infinite-loader';
 
 import { GrafanaTheme2, isTruthy } from '@grafana/data';
@@ -35,6 +35,7 @@ interface DashboardsTreeProps {
 
 const HEADER_HEIGHT = 36;
 const ROW_HEIGHT = 36;
+const DIVIDER_HEIGHT = 0; // Yes - make it appear as a border on the row rather than a row itself
 
 export function DashboardsTree({
   items,
@@ -51,6 +52,7 @@ export function DashboardsTree({
   const treeID = useId();
 
   const infiniteLoaderRef = useRef<InfiniteLoader>(null);
+  const listRef = useRef<List | null>(null);
   const styles = useStyles2(getStyles);
 
   useEffect(() => {
@@ -60,6 +62,10 @@ export function DashboardsTree({
     if (infiniteLoaderRef.current) {
       infiniteLoaderRef.current.resetloadMoreItemsCache(true);
     }
+
+    if (listRef.current) {
+      listRef.current.resetAfterIndex(0);
+    }
   }, [items]);
 
   const tableColumns = useMemo(() => {
@@ -123,6 +129,18 @@ export function DashboardsTree({
     [requestLoadMore, items]
   );
 
+  const getRowHeight = useCallback(
+    (rowIndex: number) => {
+      const row = items[rowIndex];
+      if (row.item.kind === 'ui' && row.item.uiKind === 'divider') {
+        return DIVIDER_HEIGHT;
+      }
+
+      return ROW_HEIGHT;
+    },
+    [items]
+  );
+
   return (
     <div {...getTableProps()} role="table">
       {headerGroups.map((headerGroup) => {
@@ -154,12 +172,16 @@ export function DashboardsTree({
         >
           {({ onItemsRendered, ref }) => (
             <List
-              ref={ref}
+              ref={(elem) => {
+                ref(elem);
+                listRef.current = elem;
+              }}
               height={height - HEADER_HEIGHT}
               width={width}
               itemCount={items.length}
               itemData={virtualData}
-              itemSize={ROW_HEIGHT}
+              estimatedItemSize={ROW_HEIGHT}
+              itemSize={getRowHeight}
               onItemsRendered={onItemsRendered}
             >
               {VirtualListRow}
@@ -191,13 +213,23 @@ function VirtualListRow({ index, style, data }: VirtualListRowProps) {
   const row = rows[index];
   prepareRow(row);
 
+  const dashboardItem = row.original.item;
+
+  if (dashboardItem.kind === 'ui' && dashboardItem.uiKind === 'divider') {
+    return (
+      <div {...row.getRowProps({ style })}>
+        <hr className={styles.divider} />
+      </div>
+    );
+  }
+
   return (
     <div
       {...row.getRowProps({ style })}
       className={cx(styles.row, styles.bodyRow)}
-      aria-labelledby={makeRowID(treeID, row.original.item)}
+      aria-labelledby={makeRowID(treeID, dashboardItem)}
       data-testid={selectors.pages.BrowseDashboards.table.row(
-        'title' in row.original.item ? row.original.item.title : row.original.item.uid
+        'title' in dashboardItem ? dashboardItem.title : dashboardItem.uid
       )}
     >
       {row.cells.map((cell) => {
@@ -221,6 +253,12 @@ const getStyles = (theme: GrafanaTheme2) => {
       gap: theme.spacing(1),
     }),
 
+    divider: css({
+      borderTop: `1px solid ${theme.colors.border.weak}`,
+      width: '100%',
+      margin: 0,
+    }),
+
     headerRow: css({
       backgroundColor: theme.colors.background.secondary,
       height: HEADER_HEIGHT,
diff --git a/public/app/features/browse-dashboards/components/NameCell.tsx b/public/app/features/browse-dashboards/components/NameCell.tsx
index 11bbd5af23194..086d3a4d5cc17 100644
--- a/public/app/features/browse-dashboards/components/NameCell.tsx
+++ b/public/app/features/browse-dashboards/components/NameCell.tsx
@@ -7,7 +7,7 @@ import { reportInteraction } from '@grafana/runtime';
 import { Icon, IconButton, Link, Spinner, useStyles2, Text } from '@grafana/ui';
 import { getSvgSize } from '@grafana/ui/src/components/Icon/utils';
 import { t } from 'app/core/internationalization';
-import { getIconForKind } from 'app/features/search/service/utils';
+import { getIconForItem } from 'app/features/search/service/utils';
 
 import { Indent } from '../../../core/components/Indent/Indent';
 import { useChildrenByParentUIDState } from '../state';
@@ -27,7 +27,7 @@ export function NameCell({ row: { original: data }, onFolderClick, treeID }: Nam
   const { item, level, isOpen } = data;
   const childrenByParentUID = useChildrenByParentUIDState();
   const isLoading = isOpen && !childrenByParentUID[item.uid];
-  const iconName = getIconForKind(data.item.kind, isOpen);
+  const iconName = getIconForItem(data.item, isOpen);
 
   if (item.kind === 'ui') {
     return (
diff --git a/public/app/features/browse-dashboards/components/NewFolderForm.tsx b/public/app/features/browse-dashboards/components/NewFolderForm.tsx
index d201f8a4e0b58..a31594be7f351 100644
--- a/public/app/features/browse-dashboards/components/NewFolderForm.tsx
+++ b/public/app/features/browse-dashboards/components/NewFolderForm.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
+import { useForm } from 'react-hook-form';
 
 import { selectors } from '@grafana/e2e-selectors';
-import { Button, Input, Form, Field, HorizontalGroup } from '@grafana/ui';
+import { Button, Input, Field, Stack } from '@grafana/ui';
 import { Trans, t } from 'app/core/internationalization';
 
 import { validationSrv } from '../../manage-dashboards/services/ValidationSrv';
@@ -18,6 +19,12 @@ interface FormModel {
 const initialFormModel: FormModel = { folderName: '' };
 
 export function NewFolderForm({ onCancel, onConfirm }: Props) {
+  const {
+    handleSubmit,
+    register,
+    formState: { errors },
+  } = useForm<FormModel>({ defaultValues: initialFormModel });
+
   const translatedFolderNameRequiredPhrase = t(
     'browse-dashboards.action.new-folder-name-required-phrase',
     'Folder name is required.'
@@ -38,37 +45,34 @@ export function NewFolderForm({ onCancel, onConfirm }: Props) {
   const fieldNameLabel = t('browse-dashboards.new-folder-form.name-label', 'Folder name');
 
   return (
-    <Form
-      defaultValues={initialFormModel}
-      onSubmit={(form: FormModel) => onConfirm(form.folderName)}
+    <form
+      name="addFolder"
+      onSubmit={handleSubmit((form) => onConfirm(form.folderName))}
       data-testid={selectors.pages.BrowseDashboards.NewFolderForm.form}
     >
-      {({ register, errors }) => (
-        <>
-          <Field
-            label={fieldNameLabel}
-            invalid={!!errors.folderName}
-            error={errors.folderName && errors.folderName.message}
-          >
-            <Input
-              data-testid={selectors.pages.BrowseDashboards.NewFolderForm.nameInput}
-              id="folder-name-input"
-              {...register('folderName', {
-                required: translatedFolderNameRequiredPhrase,
-                validate: async (v) => await validateFolderName(v),
-              })}
-            />
-          </Field>
-          <HorizontalGroup>
-            <Button variant="secondary" fill="outline" onClick={onCancel}>
-              <Trans i18nKey="browse-dashboards.new-folder-form.cancel-label">Cancel</Trans>
-            </Button>
-            <Button type="submit">
-              <Trans i18nKey="browse-dashboards.new-folder-form.create-label">Create</Trans>
-            </Button>
-          </HorizontalGroup>
-        </>
-      )}
-    </Form>
+      <Field
+        label={fieldNameLabel}
+        invalid={!!errors.folderName}
+        error={errors.folderName && errors.folderName.message}
+      >
+        <Input
+          data-testid={selectors.pages.BrowseDashboards.NewFolderForm.nameInput}
+          id="folder-name-input"
+          defaultValue={initialFormModel.folderName}
+          {...register('folderName', {
+            required: translatedFolderNameRequiredPhrase,
+            validate: async (v) => await validateFolderName(v),
+          })}
+        />
+      </Field>
+      <Stack>
+        <Button variant="secondary" fill="outline" onClick={onCancel}>
+          <Trans i18nKey="browse-dashboards.new-folder-form.cancel-label">Cancel</Trans>
+        </Button>
+        <Button type="submit">
+          <Trans i18nKey="browse-dashboards.new-folder-form.create-label">Create</Trans>
+        </Button>
+      </Stack>
+    </form>
   );
 }
diff --git a/public/app/features/browse-dashboards/components/SearchView.tsx b/public/app/features/browse-dashboards/components/SearchView.tsx
index 52ede56baeaf8..03c72c3a6b1b8 100644
--- a/public/app/features/browse-dashboards/components/SearchView.tsx
+++ b/public/app/features/browse-dashboards/components/SearchView.tsx
@@ -1,8 +1,8 @@
 import React, { useCallback } from 'react';
 
 import { DataFrameView, toDataFrame } from '@grafana/data';
-import { Button, Card } from '@grafana/ui';
-import { Trans } from 'app/core/internationalization';
+import { Button, EmptyState } from '@grafana/ui';
+import { Trans, t } from 'app/core/internationalization';
 import { useKeyNavigationListener } from 'app/features/search/hooks/useSearchKeyboardSelection';
 import { SearchResultsProps, SearchResultsTable } from 'app/features/search/page/components/SearchResultsTable';
 import { useSearchStateManager } from 'app/features/search/state/SearchStateManager';
@@ -89,16 +89,15 @@ export function SearchView({ width, height, canSelect }: SearchViewProps) {
   if (value.totalRows === 0) {
     return (
       <div style={{ width }}>
-        <Card>
-          <Card.Heading>
-            <Trans i18nKey="browse-dashboards.no-results.text">No results found for your query.</Trans>
-          </Card.Heading>
-          <Card.Actions>
+        <EmptyState
+          button={
             <Button variant="secondary" onClick={stateManager.onClearSearchAndFilters}>
               <Trans i18nKey="browse-dashboards.no-results.clear">Clear search and filters</Trans>
             </Button>
-          </Card.Actions>
-        </Card>
+          }
+          message={t('browse-dashboards.no-results.text', 'No results found for your query')}
+          variant="not-found"
+        />
       </div>
     );
   }
diff --git a/public/app/features/browse-dashboards/components/utils.ts b/public/app/features/browse-dashboards/components/utils.ts
index 56613b82e14b4..cc4485b06b881 100644
--- a/public/app/features/browse-dashboards/components/utils.ts
+++ b/public/app/features/browse-dashboards/components/utils.ts
@@ -1,5 +1,11 @@
+import { config } from '@grafana/runtime';
+
 import { DashboardViewItemWithUIItems } from '../types';
 
 export function makeRowID(baseId: string, item: DashboardViewItemWithUIItems) {
   return baseId + item.uid;
 }
+
+export function isSharedWithMe(uid: string) {
+  return uid === config.sharedWithMeFolderUID;
+}
diff --git a/public/app/features/browse-dashboards/featureFlag.ts b/public/app/features/browse-dashboards/featureFlag.ts
deleted file mode 100644
index f2e424835d3a9..0000000000000
--- a/public/app/features/browse-dashboards/featureFlag.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { config } from '@grafana/runtime';
-
-export function newBrowseDashboardsEnabled() {
-  return config.featureToggles.nestedFolders || config.featureToggles.newBrowseDashboards;
-}
diff --git a/public/app/features/browse-dashboards/fixtures/alertRules.fixture.ts b/public/app/features/browse-dashboards/fixtures/alertRules.fixture.ts
index f3d9d146cbe5d..ab84c47a59fd1 100644
--- a/public/app/features/browse-dashboards/fixtures/alertRules.fixture.ts
+++ b/public/app/features/browse-dashboards/fixtures/alertRules.fixture.ts
@@ -44,7 +44,6 @@ export function getRulerRulesResponse(folderName: string, folderUid: string, see
               ],
               uid: random.guid(),
               namespace_uid: folderUid,
-              namespace_id: 0,
               no_data_state: GrafanaAlertStateDecision.NoData,
               exec_err_state: GrafanaAlertStateDecision.Error,
               is_paused: false,
diff --git a/public/app/features/browse-dashboards/fixtures/dashboardsTreeItem.fixture.ts b/public/app/features/browse-dashboards/fixtures/dashboardsTreeItem.fixture.ts
index 4cb15098aa3ea..4ac6515c72642 100644
--- a/public/app/features/browse-dashboards/fixtures/dashboardsTreeItem.fixture.ts
+++ b/public/app/features/browse-dashboards/fixtures/dashboardsTreeItem.fixture.ts
@@ -65,6 +65,26 @@ export function wellFormedFolder(
   };
 }
 
+export function sharedWithMeFolder(seed = 1): DashboardsTreeItem<DashboardViewItem> {
+  const folder = wellFormedFolder(seed, undefined, {
+    uid: 'sharedwithme',
+    url: undefined,
+  });
+  return folder;
+}
+
+export function treeViewersCanEdit() {
+  const [, { folderA, folderC }] = wellFormedTree();
+
+  return [
+    [folderA, folderC],
+    {
+      folderA,
+      folderC,
+    },
+  ] as const;
+}
+
 export function wellFormedTree() {
   let seed = 1;
 
diff --git a/public/app/features/browse-dashboards/state/hooks.ts b/public/app/features/browse-dashboards/state/hooks.ts
index 9d04081091920..d46f0b44708ad 100644
--- a/public/app/features/browse-dashboards/state/hooks.ts
+++ b/public/app/features/browse-dashboards/state/hooks.ts
@@ -5,6 +5,7 @@ import { DashboardViewItem } from 'app/features/search/types';
 import { useSelector, StoreState, useDispatch } from 'app/types';
 
 import { PAGE_SIZE } from '../api/services';
+import { isSharedWithMe } from '../components/utils';
 import {
   BrowseDashboardsState,
   DashboardsTreeItem,
@@ -130,7 +131,7 @@ export function useLoadNextChildrenPage(
 }
 
 /**
- * Creates a list of items, with level indicating it's 'nested' in the tree structure
+ * Creates a list of items, with level indicating it's nesting in the tree structure
  *
  * @param folderUID The UID of the folder being viewed, or undefined if at root Browse Dashboards page
  * @param rootItems Array of loaded items at the root level (without a parent). If viewing a folder, we expect this to be empty and unused
@@ -180,7 +181,22 @@ export function createFlatTree(
       isOpen,
     };
 
-    return [thisItem, ...mappedChildren];
+    const items = [thisItem, ...mappedChildren];
+
+    if (isSharedWithMe(thisItem.item.uid)) {
+      items.push({
+        item: {
+          kind: 'ui',
+          uiKind: 'divider',
+          uid: 'shared-with-me-divider',
+        },
+        parentUID,
+        level: level + 1,
+        isOpen: false,
+      });
+    }
+
+    return items;
   }
 
   const isOpen = (folderUID && openFolders[folderUID]) || level === 0;
diff --git a/public/app/features/browse-dashboards/state/reducers.test.ts b/public/app/features/browse-dashboards/state/reducers.test.ts
index e90b484c1293e..5df508e0852f2 100644
--- a/public/app/features/browse-dashboards/state/reducers.test.ts
+++ b/public/app/features/browse-dashboards/state/reducers.test.ts
@@ -1,4 +1,6 @@
-import { wellFormedDashboard, wellFormedFolder } from '../fixtures/dashboardsTreeItem.fixture';
+import { config } from '@grafana/runtime';
+
+import { sharedWithMeFolder, wellFormedDashboard, wellFormedFolder } from '../fixtures/dashboardsTreeItem.fixture';
 import { fullyLoadedViewItemCollection } from '../fixtures/state.fixtures';
 import { BrowseDashboardsState } from '../types';
 
@@ -19,6 +21,10 @@ function createInitialState(): BrowseDashboardsState {
 }
 
 describe('browse-dashboards reducers', () => {
+  beforeAll(() => {
+    config.sharedWithMeFolderUID = 'sharedwithme';
+  });
+
   describe('fetchNextChildrenPageFulfilled', () => {
     it('loads first page of root items', () => {
       const pageSize = 50;
@@ -321,11 +327,34 @@ describe('browse-dashboards reducers', () => {
 
       expect(state.selectedItems.$all).toBeFalsy();
     });
+
+    it('does not allow the sharedwithme folder to be selected', () => {
+      let seed = 1;
+      const folder = wellFormedFolder(seed++).item;
+      const dashboard = wellFormedDashboard(seed++).item;
+      const sharedWithMe = sharedWithMeFolder(seed++).item;
+      const sharedWithMeDashboard = wellFormedDashboard(seed++, {}, { parentUID: sharedWithMe.uid }).item;
+
+      const state = createInitialState();
+      state.rootItems = fullyLoadedViewItemCollection([sharedWithMe, folder, dashboard]);
+      state.childrenByParentUID[sharedWithMe.uid] = fullyLoadedViewItemCollection([sharedWithMeDashboard]);
+
+      setItemSelectionState(state, {
+        type: 'setItemSelectionState',
+        payload: { item: sharedWithMe, isSelected: true },
+      });
+
+      expect(state.selectedItems.folder[sharedWithMe.uid]).toBeFalsy();
+    });
   });
 
   describe('setAllSelection', () => {
     let seed = 1;
     const topLevelDashboard = wellFormedDashboard(seed++).item;
+
+    const sharedWithMe = sharedWithMeFolder(seed++).item;
+    const sharedWithMeDashboard = wellFormedDashboard(seed++, {}, { parentUID: sharedWithMe.uid }).item;
+
     const topLevelFolder = wellFormedFolder(seed++).item;
     const childDashboard = wellFormedDashboard(seed++, {}, { parentUID: topLevelFolder.uid }).item;
     const childFolder = wellFormedFolder(seed++, {}, { parentUID: topLevelFolder.uid }).item;
@@ -407,5 +436,35 @@ describe('browse-dashboards reducers', () => {
         panel: {},
       });
     });
+
+    it("doesn't select the sharedwithme folder when selecting all", () => {
+      const state = createInitialState();
+
+      state.rootItems = fullyLoadedViewItemCollection([topLevelFolder, sharedWithMe]);
+      state.childrenByParentUID[sharedWithMe.uid] = fullyLoadedViewItemCollection([sharedWithMeDashboard]);
+      state.childrenByParentUID[topLevelFolder.uid] = fullyLoadedViewItemCollection([childDashboard, childFolder]);
+
+      setAllSelection(state, { type: 'setAllSelection', payload: { isSelected: true, folderUID: undefined } });
+
+      expect(state.selectedItems.folder[sharedWithMe.uid]).toBeFalsy();
+      expect(state.selectedItems.dashboard[sharedWithMeDashboard.uid]).toBeFalsy();
+    });
+
+    it("doesn't select anything when on the sharedwithme folder page", () => {
+      const state = createInitialState();
+
+      state.rootItems = fullyLoadedViewItemCollection([topLevelFolder, topLevelDashboard]);
+      state.childrenByParentUID[topLevelFolder.uid] = fullyLoadedViewItemCollection([childDashboard, childFolder]);
+      state.childrenByParentUID[childFolder.uid] = fullyLoadedViewItemCollection([grandchildDashboard]);
+
+      setAllSelection(state, { type: 'setAllSelection', payload: { isSelected: true, folderUID: sharedWithMe.uid } });
+
+      expect(state.selectedItems).toEqual({
+        $all: false,
+        dashboard: {},
+        folder: {},
+        panel: {},
+      });
+    });
   });
 });
diff --git a/public/app/features/browse-dashboards/state/reducers.ts b/public/app/features/browse-dashboards/state/reducers.ts
index 0eafcb939beaa..e506748dcd679 100644
--- a/public/app/features/browse-dashboards/state/reducers.ts
+++ b/public/app/features/browse-dashboards/state/reducers.ts
@@ -2,6 +2,7 @@ import { PayloadAction } from '@reduxjs/toolkit';
 
 import { DashboardViewItem, DashboardViewItemKind } from 'app/features/search/types';
 
+import { isSharedWithMe } from '../components/utils';
 import { BrowseDashboardsState } from '../types';
 
 import { fetchNextChildrenPage, refetchChildren } from './actions';
@@ -86,6 +87,11 @@ export function setItemSelectionState(
 ) {
   const { item, isSelected } = action.payload;
 
+  // UI shouldn't allow it, but also prevent sharedwithme from being selected
+  if (isSharedWithMe(item.uid)) {
+    return;
+  }
+
   // Selecting a folder selects all children, and unselecting a folder deselects all children
   // so propagate the new selection state to all descendants
   function markChildren(kind: DashboardViewItemKind, uid: string) {
@@ -103,26 +109,24 @@ export function setItemSelectionState(
 
   markChildren(item.kind, item.uid);
 
-  // If all children of a folder are selected, then the folder is also selected.
-  // If *any* child of a folder is unselelected, then the folder is alo unselected.
-  // Reconcile all ancestors to make sure they're in the correct state.
-  let nextParentUID = item.parentUID;
+  // If we're unselecting a child, we also need to unselect all ancestors.
+  if (!isSelected) {
+    let nextParentUID = item.parentUID;
 
-  while (nextParentUID) {
-    const parent = findItem(state.rootItems?.items ?? [], state.childrenByParentUID, nextParentUID);
+    while (nextParentUID) {
+      const parent = findItem(state.rootItems?.items ?? [], state.childrenByParentUID, nextParentUID);
 
-    // This case should not happen, but a find can theortically return undefined, and it
-    // helps limit infinite loops
-    if (!parent) {
-      break;
-    }
+      // This case should not happen, but a find can theortically return undefined, and it
+      // helps limit infinite loops
+      if (!parent) {
+        break;
+      }
 
-    if (!isSelected) {
       // A folder cannot be selected if any of it's children are unselected
       state.selectedItems[parent.kind][parent.uid] = false;
-    }
 
-    nextParentUID = parent.parentUID;
+      nextParentUID = parent.parentUID;
+    }
   }
 
   // Check to see if we should mark the header checkbox selected if all root items are selected
@@ -135,6 +139,12 @@ export function setAllSelection(
 ) {
   const { isSelected, folderUID: folderUIDArg } = action.payload;
 
+  // If we're in the folder view for sharedwith me (currently not supported)
+  // bail and don't select anything
+  if (folderUIDArg && isSharedWithMe(folderUIDArg)) {
+    return;
+  }
+
   state.selectedItems.$all = isSelected;
 
   // Search works a bit differently so the state here does different things...
@@ -146,6 +156,11 @@ export function setAllSelection(
   if (isSelected) {
     // Recursively select the children of the folder in view
     function selectChildrenOfFolder(folderUID: string | undefined) {
+      // Don't descend into the sharedwithme folder
+      if (folderUID && isSharedWithMe(folderUID)) {
+        return;
+      }
+
       const collection = folderUID ? state.childrenByParentUID[folderUID] : state.rootItems;
 
       // Bail early if the collection isn't found (not loaded yet)
@@ -154,6 +169,11 @@ export function setAllSelection(
       }
 
       for (const child of collection.items) {
+        // Don't traverse into the sharedwithme folder
+        if (isSharedWithMe(child.uid)) {
+          continue;
+        }
+
         state.selectedItems[child.kind][child.uid] = isSelected;
 
         if (child.kind !== 'folder') {
diff --git a/public/app/features/browse-dashboards/types.ts b/public/app/features/browse-dashboards/types.ts
index 8b0c0dc1ed5f3..db797d0b0f61f 100644
--- a/public/app/features/browse-dashboards/types.ts
+++ b/public/app/features/browse-dashboards/types.ts
@@ -29,7 +29,7 @@ export interface BrowseDashboardsState {
 
 export interface UIDashboardViewItem {
   kind: 'ui';
-  uiKind: 'empty-folder' | 'pagination-placeholder';
+  uiKind: 'empty-folder' | 'pagination-placeholder' | 'divider';
   uid: string;
 }
 
diff --git a/public/app/features/canvas/element.ts b/public/app/features/canvas/element.ts
index 0e51e4a881534..c0707e8ab7fb7 100644
--- a/public/app/features/canvas/element.ts
+++ b/public/app/features/canvas/element.ts
@@ -42,6 +42,13 @@ export enum ConnectionPath {
   Straight = 'straight',
 }
 
+export enum ConnectionDirection {
+  Forward = 'forward',
+  Reverse = 'reverse',
+  Both = 'both',
+  None = 'none',
+}
+
 export interface CanvasConnection {
   source: ConnectionCoordinates;
   target: ConnectionCoordinates;
@@ -49,6 +56,12 @@ export interface CanvasConnection {
   path: ConnectionPath;
   color?: ColorDimensionConfig;
   size?: ScaleDimensionConfig;
+  lineStyle?: string;
+  vertices?: ConnectionCoordinates[];
+  radius?: ScaleDimensionConfig;
+  direction?: ConnectionDirection;
+  sourceOriginal?: ConnectionCoordinates;
+  targetOriginal?: ConnectionCoordinates;
   // See https://github.com/anseki/leader-line#options for more examples of more properties
 }
 
@@ -72,7 +85,7 @@ export interface CanvasElementItem<TConfig = any, TData = any> extends RegistryI
   /** The default width/height to use when adding  */
   defaultSize?: Placement;
 
-  prepareData?: (ctx: DimensionContext, cfg: TConfig) => TData;
+  prepareData?: (dimensionContext: DimensionContext, elementOptions: CanvasElementOptions<TConfig>) => TData;
 
   /** Component used to draw */
   display: ComponentType<CanvasElementProps<TConfig, TData>>;
@@ -87,6 +100,12 @@ export interface CanvasElementItem<TConfig = any, TData = any> extends RegistryI
 
   /** Optional config to customize what standard element editor options are available for the item */
   standardEditorConfig?: StandardEditorConfig;
+
+  /** Custom connection anchor coordinates, like for svg elements such as triangle, cloud, etc */
+  customConnectionAnchors?: Array<{
+    x: number;
+    y: number;
+  }>;
 }
 
 export const defaultBgColor = '#D9D9D9';
diff --git a/public/app/features/canvas/elements/button.tsx b/public/app/features/canvas/elements/button.tsx
index 18cf97713a458..a6e8980e7c3b8 100644
--- a/public/app/features/canvas/elements/button.tsx
+++ b/public/app/features/canvas/elements/button.tsx
@@ -13,7 +13,7 @@ import { ButtonStyleConfig, ButtonStyleEditor } from 'app/plugins/panel/canvas/e
 import { callApi } from 'app/plugins/panel/canvas/editor/element/utils';
 import { HttpRequestMethod } from 'app/plugins/panel/canvas/panelcfg.gen';
 
-import { CanvasElementItem, CanvasElementProps, defaultLightTextColor } from '../element';
+import { CanvasElementItem, CanvasElementOptions, CanvasElementProps, defaultLightTextColor } from '../element';
 import { Align, TextConfig, TextData } from '../types';
 
 interface ButtonData extends Omit<TextData, 'valign'> {
@@ -130,30 +130,32 @@ export const buttonItem: CanvasElementItem<ButtonConfig, ButtonData> = {
   }),
 
   // Called when data changes
-  prepareData: (ctx: DimensionContext, cfg: ButtonConfig) => {
-    const getCfgApi = () => {
-      if (cfg?.api) {
-        cfg.api = {
-          ...cfg.api,
-          method: cfg.api.method ?? defaultApiConfig.method,
-          contentType: cfg.api.contentType ?? defaultApiConfig.contentType,
+  prepareData: (dimensionContext: DimensionContext, elementOptions: CanvasElementOptions<ButtonConfig>) => {
+    const buttonConfig = elementOptions.config;
+
+    const getAPIConfig = () => {
+      if (buttonConfig?.api) {
+        buttonConfig.api = {
+          ...buttonConfig.api,
+          method: buttonConfig.api.method ?? defaultApiConfig.method,
+          contentType: buttonConfig.api.contentType ?? defaultApiConfig.contentType,
         };
-        return cfg.api;
+        return buttonConfig.api;
       }
 
       return undefined;
     };
 
     const data: ButtonData = {
-      text: cfg?.text ? ctx.getText(cfg.text).value() : '',
-      align: cfg.align ?? Align.Center,
-      size: cfg.size ?? 14,
-      api: getCfgApi(),
-      style: cfg?.style ?? defaultStyleConfig,
+      text: buttonConfig?.text ? dimensionContext.getText(buttonConfig.text).value() : '',
+      align: buttonConfig?.align ?? Align.Center,
+      size: buttonConfig?.size ?? 14,
+      api: getAPIConfig(),
+      style: buttonConfig?.style ?? defaultStyleConfig,
     };
 
-    if (cfg.color) {
-      data.color = ctx.getColor(cfg.color).value();
+    if (buttonConfig?.color) {
+      data.color = dimensionContext.getColor(buttonConfig.color).value();
     }
 
     return data;
diff --git a/public/app/features/canvas/elements/cloud.tsx b/public/app/features/canvas/elements/cloud.tsx
new file mode 100644
index 0000000000000..280d3fe7b67c3
--- /dev/null
+++ b/public/app/features/canvas/elements/cloud.tsx
@@ -0,0 +1,225 @@
+import { css } from '@emotion/css';
+import React from 'react';
+import { v4 as uuidv4 } from 'uuid';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { config } from 'app/core/config';
+import { DimensionContext } from 'app/features/dimensions';
+import { ColorDimensionEditor } from 'app/features/dimensions/editors/ColorDimensionEditor';
+import { TextDimensionEditor } from 'app/features/dimensions/editors/TextDimensionEditor';
+import { getDataLinks } from 'app/plugins/panel/canvas/utils';
+
+import {
+  CanvasElementItem,
+  CanvasElementProps,
+  CanvasElementOptions,
+  defaultBgColor,
+  defaultTextColor,
+} from '../element';
+import { Align, CanvasElementConfig, CanvasElementData, VAlign } from '../types';
+
+const Cloud = (props: CanvasElementProps<CanvasElementConfig, CanvasElementData>) => {
+  const { data } = props;
+  const styles = getStyles(config.theme2, data);
+
+  // uuid needed to avoid id conflicts when multiple elements are rendered
+  const uniqueId = uuidv4();
+
+  return (
+    <div className={styles.container}>
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        viewBox="0 0 110 70"
+        width="100%"
+        height="100%"
+        preserveAspectRatio="none"
+      >
+        <defs>
+          <pattern id={`image-${uniqueId}`} patternUnits="userSpaceOnUse" width="110" height="70">
+            <image xlinkHref={data?.backgroundImage} x="-50" y="-50" width="300" height="300"></image>
+          </pattern>
+          <clipPath id={`cloudClip-${uniqueId}`}>
+            <path d="M 23 13 C -1 13 -7 33 12.2 37 C -7 45.8 14.6 65 30.2 57 C 41 73 77 73 89 57 C 113 57 113 41 98 33 C 113 17 89 1 68 9 C 53 -3 29 -3 23 13 Z" />
+          </clipPath>
+        </defs>
+        {/* Apply background image within the clipping area */}
+        <rect
+          x="0"
+          y="0"
+          width="100%"
+          height="100%"
+          clipPath={`url(#cloudClip-${uniqueId})`}
+          style={{ fill: 'none' }}
+        />
+        <path
+          d="M 23 13 C -1 13 -7 33 12.2 37 C -7 45.8 14.6 65 30.2 57 C 41 73 77 73 89 57 C 113 57 113 41 98 33 C 113 17 89 1 68 9 C 53 -3 29 -3 23 13 Z"
+          className={styles.element}
+          style={{ fill: data?.backgroundImage ? `url(#image-${uniqueId})` : data?.backgroundColor }}
+        />
+      </svg>
+      <span className={styles.text}>{data?.text}</span>
+    </div>
+  );
+};
+
+export const cloudItem: CanvasElementItem = {
+  id: 'cloud',
+  name: 'Cloud',
+  description: 'Cloud',
+
+  display: Cloud,
+
+  defaultSize: {
+    width: 110,
+    height: 70,
+  },
+
+  getNewOptions: (options) => ({
+    ...options,
+    background: {
+      color: {
+        fixed: defaultBgColor,
+      },
+    },
+    config: {
+      align: Align.Center,
+      valign: VAlign.Middle,
+      color: {
+        fixed: defaultTextColor,
+      },
+    },
+    placement: {
+      width: options?.placement?.width ?? 110,
+      height: options?.placement?.height ?? 70,
+      top: options?.placement?.top,
+      left: options?.placement?.left,
+    },
+  }),
+
+  // Called when data changes
+  prepareData: (dimensionContext: DimensionContext, elementOptions: CanvasElementOptions<CanvasElementConfig>) => {
+    const textConfig = elementOptions.config;
+
+    const data: CanvasElementData = {
+      text: textConfig?.text ? dimensionContext.getText(textConfig.text).value() : '',
+      align: textConfig?.align ?? Align.Center,
+      valign: textConfig?.valign ?? VAlign.Middle,
+      size: textConfig?.size,
+    };
+
+    if (textConfig?.color) {
+      data.color = dimensionContext.getColor(textConfig.color).value();
+    }
+
+    data.links = getDataLinks(dimensionContext, elementOptions, data.text);
+
+    const { background, border } = elementOptions;
+    data.backgroundColor = background?.color ? dimensionContext.getColor(background.color).value() : defaultBgColor;
+    data.borderColor = border?.color ? dimensionContext.getColor(border.color).value() : defaultBgColor;
+    data.borderWidth = border?.width ?? 0;
+
+    data.backgroundImage = background?.image ? dimensionContext.getResource(background.image).value() : undefined;
+
+    return data;
+  },
+
+  registerOptionsUI: (builder) => {
+    const category = ['Cloud'];
+    builder
+      .addCustomEditor({
+        category,
+        id: 'textSelector',
+        path: 'config.text',
+        name: 'Text',
+        editor: TextDimensionEditor,
+      })
+      .addCustomEditor({
+        category,
+        id: 'config.color',
+        path: 'config.color',
+        name: 'Text color',
+        editor: ColorDimensionEditor,
+        settings: {},
+        defaultValue: {},
+      })
+      .addRadio({
+        category,
+        path: 'config.align',
+        name: 'Align text',
+        settings: {
+          options: [
+            { value: Align.Left, label: 'Left' },
+            { value: Align.Center, label: 'Center' },
+            { value: Align.Right, label: 'Right' },
+          ],
+        },
+        defaultValue: Align.Left,
+      })
+      .addRadio({
+        category,
+        path: 'config.valign',
+        name: 'Vertical align',
+        settings: {
+          options: [
+            { value: VAlign.Top, label: 'Top' },
+            { value: VAlign.Middle, label: 'Middle' },
+            { value: VAlign.Bottom, label: 'Bottom' },
+          ],
+        },
+        defaultValue: VAlign.Middle,
+      })
+      .addNumberInput({
+        category,
+        path: 'config.size',
+        name: 'Text size',
+        settings: {
+          placeholder: 'Auto',
+        },
+      });
+  },
+
+  customConnectionAnchors: [
+    { x: -0.58, y: 0.63 }, // Top Left
+    { x: -0.22, y: 0.99 }, // Top Middle
+    { x: 0.235, y: 0.75 }, // Top Right
+
+    { x: 0.8, y: 0.6 }, // Right Top
+    { x: 0.785, y: 0.06 }, // Right Middle
+    { x: 0.91, y: -0.51 }, // Right Bottom
+
+    { x: 0.62, y: -0.635 }, // Bottom Right
+    { x: 0.05, y: -0.98 }, // Bottom Middle
+    { x: -0.45, y: -0.635 }, // Bottom Left
+
+    { x: -0.8, y: -0.58 }, // Left Bottom
+    { x: -0.78, y: -0.06 }, // Left Middle
+    { x: -0.9, y: 0.48 }, // Left Top
+  ],
+};
+
+const getStyles = (theme: GrafanaTheme2, data: CanvasElementData | undefined) => {
+  const textTop = data?.valign === VAlign.Middle ? '50%' : data?.valign === VAlign.Top ? '10%' : '90%';
+  const textLeft = data?.align === Align.Center ? '50%' : data?.align === Align.Left ? '10%' : '90%';
+  const textTransform = `translate(${data?.align === Align.Center ? '-50%' : data?.align === Align.Left ? '10%' : '-90%'}, ${
+    data?.valign === VAlign.Middle ? '-50%' : data?.valign === VAlign.Top ? '10%' : '-90%'
+  })`;
+
+  return {
+    container: css({
+      height: '100%',
+      width: '100%',
+    }),
+    text: css({
+      position: 'absolute',
+      top: textTop,
+      left: textLeft,
+      transform: textTransform,
+      fontSize: `${data?.size}px`,
+      color: data?.color,
+    }),
+    element: css({
+      stroke: data?.borderColor,
+      strokeWidth: data?.borderWidth,
+    }),
+  };
+};
diff --git a/public/app/features/canvas/elements/droneFront.tsx b/public/app/features/canvas/elements/droneFront.tsx
index c91a92fe62f68..d96ce3899e755 100644
--- a/public/app/features/canvas/elements/droneFront.tsx
+++ b/public/app/features/canvas/elements/droneFront.tsx
@@ -7,7 +7,7 @@ import { useStyles2 } from '@grafana/ui';
 import { DimensionContext } from 'app/features/dimensions';
 import { ScalarDimensionEditor } from 'app/features/dimensions/editors';
 
-import { CanvasElementItem, CanvasElementProps, defaultBgColor } from '../element';
+import { CanvasElementItem, CanvasElementOptions, CanvasElementProps, defaultBgColor } from '../element';
 
 interface DroneFrontData {
   rollAngle?: number;
@@ -97,9 +97,11 @@ export const droneFrontItem: CanvasElementItem = {
   }),
 
   // Called when data changes
-  prepareData: (ctx: DimensionContext, cfg: DroneFrontConfig) => {
+  prepareData: (dimensionContext: DimensionContext, elementOptions: CanvasElementOptions<DroneFrontConfig>) => {
+    const droneFrontConfig = elementOptions.config;
+
     const data: DroneFrontData = {
-      rollAngle: cfg?.rollAngle ? ctx.getScalar(cfg.rollAngle).value() : 0,
+      rollAngle: droneFrontConfig?.rollAngle ? dimensionContext.getScalar(droneFrontConfig.rollAngle).value() : 0,
     };
 
     return data;
@@ -118,7 +120,7 @@ export const droneFrontItem: CanvasElementItem = {
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  droneFront: css`
-    transition: transform 0.4s;
-  `,
+  droneFront: css({
+    transition: 'transform 0.4s',
+  }),
 });
diff --git a/public/app/features/canvas/elements/droneSide.tsx b/public/app/features/canvas/elements/droneSide.tsx
index bc84404b19a1a..cc1821ad63fbd 100644
--- a/public/app/features/canvas/elements/droneSide.tsx
+++ b/public/app/features/canvas/elements/droneSide.tsx
@@ -7,7 +7,7 @@ import { useStyles2 } from '@grafana/ui';
 import { DimensionContext } from 'app/features/dimensions';
 import { ScalarDimensionEditor } from 'app/features/dimensions/editors';
 
-import { CanvasElementItem, CanvasElementProps, defaultBgColor } from '../element';
+import { CanvasElementItem, CanvasElementOptions, CanvasElementProps, defaultBgColor } from '../element';
 
 interface DroneSideData {
   pitchAngle?: number;
@@ -96,9 +96,11 @@ export const droneSideItem: CanvasElementItem = {
   }),
 
   // Called when data changes
-  prepareData: (ctx: DimensionContext, cfg: DroneSideConfig) => {
+  prepareData: (dimensionContext: DimensionContext, elementOptions: CanvasElementOptions<DroneSideConfig>) => {
+    const droneSideConfig = elementOptions.config;
+
     const data: DroneSideData = {
-      pitchAngle: cfg?.pitchAngle ? ctx.getScalar(cfg.pitchAngle).value() : 0,
+      pitchAngle: droneSideConfig?.pitchAngle ? dimensionContext.getScalar(droneSideConfig.pitchAngle).value() : 0,
     };
 
     return data;
@@ -117,7 +119,7 @@ export const droneSideItem: CanvasElementItem = {
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  droneSide: css`
-    transition: transform 0.4s;
-  `,
+  droneSide: css({
+    transition: 'transform 0.4s',
+  }),
 });
diff --git a/public/app/features/canvas/elements/droneTop.tsx b/public/app/features/canvas/elements/droneTop.tsx
index 84a14885b5fcc..f4c2bff38f7c9 100644
--- a/public/app/features/canvas/elements/droneTop.tsx
+++ b/public/app/features/canvas/elements/droneTop.tsx
@@ -7,7 +7,7 @@ import { useStyles2 } from '@grafana/ui';
 import { DimensionContext } from 'app/features/dimensions';
 import { ScalarDimensionEditor } from 'app/features/dimensions/editors';
 
-import { CanvasElementItem, CanvasElementProps, defaultBgColor } from '../element';
+import { CanvasElementItem, CanvasElementOptions, CanvasElementProps, defaultBgColor } from '../element';
 
 interface DroneTopData {
   bRightRotorRPM?: number;
@@ -102,13 +102,23 @@ export const droneTopItem: CanvasElementItem = {
   }),
 
   // Called when data changes
-  prepareData: (ctx: DimensionContext, cfg: DroneTopConfig) => {
+  prepareData: (dimensionContext: DimensionContext, elementOptions: CanvasElementOptions<DroneTopConfig>) => {
+    const droneTopConfig = elementOptions.config;
+
     const data: DroneTopData = {
-      bRightRotorRPM: cfg?.bRightRotorRPM ? ctx.getScalar(cfg.bRightRotorRPM).value() : 0,
-      bLeftRotorRPM: cfg?.bLeftRotorRPM ? ctx.getScalar(cfg.bLeftRotorRPM).value() : 0,
-      fRightRotorRPM: cfg?.fRightRotorRPM ? ctx.getScalar(cfg.fRightRotorRPM).value() : 0,
-      fLeftRotorRPM: cfg?.fLeftRotorRPM ? ctx.getScalar(cfg.fLeftRotorRPM).value() : 0,
-      yawAngle: cfg?.yawAngle ? ctx.getScalar(cfg.yawAngle).value() : 0,
+      bRightRotorRPM: droneTopConfig?.bRightRotorRPM
+        ? dimensionContext.getScalar(droneTopConfig.bRightRotorRPM).value()
+        : 0,
+      bLeftRotorRPM: droneTopConfig?.bLeftRotorRPM
+        ? dimensionContext.getScalar(droneTopConfig.bLeftRotorRPM).value()
+        : 0,
+      fRightRotorRPM: droneTopConfig?.fRightRotorRPM
+        ? dimensionContext.getScalar(droneTopConfig.fRightRotorRPM).value()
+        : 0,
+      fLeftRotorRPM: droneTopConfig?.fLeftRotorRPM
+        ? dimensionContext.getScalar(droneTopConfig.fLeftRotorRPM).value()
+        : 0,
+      yawAngle: droneTopConfig?.yawAngle ? dimensionContext.getScalar(droneTopConfig.yawAngle).value() : 0,
     };
 
     return data;
@@ -156,23 +166,23 @@ export const droneTopItem: CanvasElementItem = {
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  propeller: css`
-    transform-origin: 50% 50%;
-    transform-box: fill-box;
-    display: block;
-    @keyframes spin {
-      from {
-        transform: rotate(0deg);
-      }
-      to {
-        transform: rotate(360deg);
-      }
-    }
-  `,
-  propellerCW: css`
-    animation-direction: normal;
-  `,
-  propellerCCW: css`
-    animation-direction: reverse;
-  `,
+  propeller: css({
+    transformOrigin: '50% 50%',
+    transformBox: 'fill-box',
+    display: 'block',
+    '@keyframes spin': {
+      from: {
+        transform: 'rotate(0deg)',
+      },
+      to: {
+        transform: 'rotate(360deg)',
+      },
+    },
+  }),
+  propellerCW: css({
+    animationDirection: 'normal',
+  }),
+  propellerCCW: css({
+    animationDirection: 'reverse',
+  }),
 });
diff --git a/public/app/features/canvas/elements/ellipse.tsx b/public/app/features/canvas/elements/ellipse.tsx
index 00bf1b8c93645..c71354d55e960 100644
--- a/public/app/features/canvas/elements/ellipse.tsx
+++ b/public/app/features/canvas/elements/ellipse.tsx
@@ -1,55 +1,77 @@
 import { css } from '@emotion/css';
-import React, { PureComponent } from 'react';
+import React from 'react';
+import { v4 as uuidv4 } from 'uuid';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { stylesFactory } from '@grafana/ui';
 import { config } from 'app/core/config';
 import { DimensionContext } from 'app/features/dimensions/context';
 import { ColorDimensionEditor } from 'app/features/dimensions/editors/ColorDimensionEditor';
 import { TextDimensionEditor } from 'app/features/dimensions/editors/TextDimensionEditor';
+import { getDataLinks } from 'app/plugins/panel/canvas/utils';
 
-import { CanvasElementItem, CanvasElementProps, defaultBgColor, defaultTextColor } from '../element';
-import { Align, VAlign, EllipseConfig, EllipseData } from '../types';
-
-class EllipseDisplay extends PureComponent<CanvasElementProps<EllipseConfig, EllipseData>> {
-  render() {
-    const { data } = this.props;
-    const styles = getStyles(config.theme2, data);
-    return (
-      <div className={styles.container}>
-        <span className={styles.span}>{data?.text}</span>
-      </div>
-    );
-  }
-}
-
-const getStyles = stylesFactory((theme: GrafanaTheme2, data) => ({
-  container: css`
-    display: table;
-    position: absolute;
-    top: 50%;
-    transform: translateY(-50%);
-    width: 100%;
-    height: 100%;
-    background-color: ${data?.backgroundColor};
-    border: ${data?.width}px solid ${data?.borderColor};
-    border-radius: 50%;
-  `,
-  span: css`
-    display: table-cell;
-    vertical-align: ${data?.valign};
-    text-align: ${data?.align};
-    font-size: ${data?.size}px;
-    color: ${data?.color};
-  `,
-}));
-
-export const ellipseItem: CanvasElementItem<EllipseConfig, EllipseData> = {
+import {
+  CanvasElementItem,
+  CanvasElementOptions,
+  CanvasElementProps,
+  defaultBgColor,
+  defaultTextColor,
+} from '../element';
+import { Align, CanvasElementConfig, CanvasElementData, VAlign } from '../types';
+
+const Ellipse = (props: CanvasElementProps<CanvasElementConfig, CanvasElementData>) => {
+  const { data } = props;
+  const styles = getStyles(config.theme2, data);
+
+  // uuid needed to avoid id conflicts when multiple elements are rendered
+  const uniqueId = uuidv4();
+
+  return (
+    <div className={styles.container}>
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        viewBox="0 0 200 200"
+        width="100%"
+        height="100%"
+        preserveAspectRatio="none"
+      >
+        <defs>
+          <pattern id={`image-${uniqueId}`} patternUnits="userSpaceOnUse" width="200" height="200">
+            <image xlinkHref={data?.backgroundImage} x="-50" y="-50" width="300" height="300"></image>
+          </pattern>
+          <clipPath id={`ellipseClip-${uniqueId}`}>
+            <ellipse cx="50%" cy="50%" rx="50%" ry="50%" />
+          </clipPath>
+        </defs>
+        {/* Apply background image within the clipping area */}
+        <rect
+          x="0"
+          y="0"
+          width="100%"
+          height="100%"
+          clipPath={`url(#ellipseClip-${uniqueId})`}
+          style={{ fill: 'none' }}
+        />
+        <ellipse
+          cx="50%"
+          cy="50%"
+          rx="50%"
+          ry="50%"
+          className={styles.element}
+          style={{ fill: data?.backgroundImage ? `url(#image-${uniqueId})` : data?.backgroundColor }}
+        />
+      </svg>
+
+      <span className={styles.text}>{data?.text}</span>
+    </div>
+  );
+};
+
+export const ellipseItem: CanvasElementItem<CanvasElementConfig, CanvasElementData> = {
   id: 'ellipse',
   name: 'Ellipse',
   description: 'Ellipse',
 
-  display: EllipseDisplay,
+  display: Ellipse,
 
   defaultSize: {
     width: 160,
@@ -58,50 +80,52 @@ export const ellipseItem: CanvasElementItem<EllipseConfig, EllipseData> = {
 
   getNewOptions: (options) => ({
     ...options,
-    config: {
-      backgroundColor: {
+    background: {
+      color: {
         fixed: defaultBgColor,
       },
-      borderColor: {
-        fixed: 'transparent',
-      },
-      width: 1,
+    },
+    config: {
       align: Align.Center,
       valign: VAlign.Middle,
       color: {
         fixed: defaultTextColor,
       },
     },
-    background: {
-      color: {
-        fixed: 'transparent',
-      },
+    placement: {
+      width: options?.placement?.width ?? 160,
+      height: options?.placement?.height ?? 138,
+      top: options?.placement?.top,
+      left: options?.placement?.left,
     },
   }),
 
-  prepareData: (ctx: DimensionContext, cfg: EllipseConfig) => {
-    const data: EllipseData = {
-      width: cfg.width,
-      text: cfg.text ? ctx.getText(cfg.text).value() : '',
-      align: cfg.align ?? Align.Center,
-      valign: cfg.valign ?? VAlign.Middle,
-      size: cfg.size,
+  prepareData: (dimensionContext: DimensionContext, elementOptions: CanvasElementOptions<CanvasElementConfig>) => {
+    const textConfig = elementOptions.config;
+
+    const data: CanvasElementData = {
+      text: textConfig?.text ? dimensionContext.getText(textConfig.text).value() : '',
+      align: textConfig?.align ?? Align.Center,
+      valign: textConfig?.valign ?? VAlign.Middle,
+      size: textConfig?.size,
     };
 
-    if (cfg.backgroundColor) {
-      data.backgroundColor = ctx.getColor(cfg.backgroundColor).value();
-    }
-    if (cfg.borderColor) {
-      data.borderColor = ctx.getColor(cfg.borderColor).value();
-    }
-    if (cfg.color) {
-      data.color = ctx.getColor(cfg.color).value();
+    if (textConfig?.color) {
+      data.color = dimensionContext.getColor(textConfig.color).value();
     }
 
+    data.links = getDataLinks(dimensionContext, elementOptions, data.text);
+
+    const { background, border } = elementOptions;
+    data.backgroundColor = background?.color ? dimensionContext.getColor(background.color).value() : defaultBgColor;
+    data.borderColor = border?.color ? dimensionContext.getColor(border.color).value() : defaultBgColor;
+    data.borderWidth = border?.width ?? 0;
+
+    data.backgroundImage = background?.image ? dimensionContext.getResource(background.image).value() : undefined;
+
     return data;
   },
 
-  // Heatmap overlay options
   registerOptionsUI: (builder) => {
     const category = ['Ellipse'];
     builder
@@ -134,32 +158,6 @@ export const ellipseItem: CanvasElementItem<EllipseConfig, EllipseData> = {
         },
         defaultValue: Align.Left,
       })
-      .addCustomEditor({
-        category,
-        id: 'config.borderColor',
-        path: 'config.borderColor',
-        name: 'Ellipse border color',
-        editor: ColorDimensionEditor,
-        settings: {},
-        defaultValue: {},
-      })
-      .addNumberInput({
-        category,
-        path: 'config.width',
-        name: 'Ellipse border width',
-        settings: {
-          placeholder: 'Auto',
-        },
-      })
-      .addCustomEditor({
-        category,
-        id: 'config.backgroundColor',
-        path: 'config.backgroundColor',
-        name: 'Ellipse background color',
-        editor: ColorDimensionEditor,
-        settings: {},
-        defaultValue: {},
-      })
       .addRadio({
         category,
         path: 'config.valign',
@@ -182,4 +180,49 @@ export const ellipseItem: CanvasElementItem<EllipseConfig, EllipseData> = {
         },
       });
   },
+
+  customConnectionAnchors: [
+    // points along the left edge
+    { x: -1, y: 0 }, // middle left
+    { x: -0.7, y: 0.7 },
+
+    // points along the top edge
+    { x: 0, y: 1 }, // top
+    { x: 0.7, y: 0.7 },
+
+    // points along the right edge
+    { x: 1, y: 0 }, // middle right
+    { x: 0.7, y: -0.7 },
+
+    // points along the bottom edge
+    { x: 0, y: -1 }, // bottom
+    { x: -0.7, y: -0.7 },
+  ],
+};
+
+const getStyles = (theme: GrafanaTheme2, data: CanvasElementData | undefined) => {
+  const textTop = data?.valign === VAlign.Middle ? '50%' : data?.valign === VAlign.Top ? '10%' : '90%';
+  const textLeft = data?.align === Align.Center ? '50%' : data?.align === Align.Left ? '10%' : '90%';
+  const textTransform = `translate(${data?.align === Align.Center ? '-50%' : data?.align === Align.Left ? '10%' : '-90%'}, ${
+    data?.valign === VAlign.Middle ? '-50%' : data?.valign === VAlign.Top ? '10%' : '-90%'
+  })`;
+
+  return {
+    container: css({
+      height: '100%',
+      width: '100%',
+    }),
+    text: css({
+      position: 'absolute',
+      top: textTop,
+      left: textLeft,
+      transform: textTransform,
+      fontSize: `${data?.size}px`,
+      color: data?.color,
+    }),
+    element: css({
+      stroke: data?.borderColor,
+      strokeWidth: data?.borderWidth,
+    }),
+  };
 };
diff --git a/public/app/features/canvas/elements/icon.tsx b/public/app/features/canvas/elements/icon.tsx
index 8f3ad8adac334..b64996b197a66 100644
--- a/public/app/features/canvas/elements/icon.tsx
+++ b/public/app/features/canvas/elements/icon.tsx
@@ -2,13 +2,15 @@ import { css } from '@emotion/css';
 import { isString } from 'lodash';
 import React, { CSSProperties } from 'react';
 
+import { LinkModel } from '@grafana/data';
 import { ColorDimensionConfig, ResourceDimensionConfig, ResourceDimensionMode } from '@grafana/schema';
 import { SanitizedSVG } from 'app/core/components/SVG/SanitizedSVG';
 import { getPublicOrAbsoluteUrl } from 'app/features/dimensions';
 import { DimensionContext } from 'app/features/dimensions/context';
 import { ColorDimensionEditor, ResourceDimensionEditor } from 'app/features/dimensions/editors';
+import { getDataLinks } from 'app/plugins/panel/canvas/utils';
 
-import { CanvasElementItem, CanvasElementProps, defaultBgColor } from '../element';
+import { CanvasElementItem, CanvasElementOptions, CanvasElementProps, defaultBgColor } from '../element';
 import { LineConfig } from '../types';
 
 export interface IconConfig {
@@ -22,14 +24,15 @@ interface IconData {
   fill: string;
   strokeColor?: string;
   stroke?: number;
+  links?: LinkModel[];
 }
 
 // When a stoke is defined, we want the path to be in page units
-const svgStrokePathClass = css`
-  path {
-    vector-effect: non-scaling-stroke;
-  }
-`;
+const svgStrokePathClass = css({
+  path: {
+    vectorEffect: 'non-scaling-stroke',
+  },
+});
 
 export function IconDisplay(props: CanvasElementProps) {
   const { data } = props;
@@ -80,10 +83,12 @@ export const iconItem: CanvasElementItem<IconConfig, IconData> = {
   }),
 
   // Called when data changes
-  prepareData: (ctx: DimensionContext, cfg: IconConfig) => {
+  prepareData: (dimensionContext: DimensionContext, elementOptions: CanvasElementOptions<IconConfig>) => {
+    const iconConfig = elementOptions.config;
+
     let path: string | undefined = undefined;
-    if (cfg.path) {
-      path = ctx.getResource(cfg.path).value();
+    if (iconConfig?.path) {
+      path = dimensionContext.getResource(iconConfig.path).value();
     }
     if (!path || !isString(path)) {
       path = getPublicOrAbsoluteUrl('img/icons/unicons/question-circle.svg');
@@ -91,15 +96,18 @@ export const iconItem: CanvasElementItem<IconConfig, IconData> = {
 
     const data: IconData = {
       path,
-      fill: cfg.fill ? ctx.getColor(cfg.fill).value() : defaultBgColor,
+      fill: iconConfig?.fill ? dimensionContext.getColor(iconConfig.fill).value() : defaultBgColor,
     };
 
-    if (cfg.stroke?.width && cfg.stroke.color) {
-      if (cfg.stroke.width > 0) {
-        data.stroke = cfg.stroke?.width;
-        data.strokeColor = ctx.getColor(cfg.stroke.color).value();
+    if (iconConfig?.stroke?.width && iconConfig?.stroke.color) {
+      if (iconConfig.stroke.width > 0) {
+        data.stroke = iconConfig.stroke?.width;
+        data.strokeColor = dimensionContext.getColor(iconConfig.stroke.color).value();
       }
     }
+
+    data.links = getDataLinks(dimensionContext, elementOptions, data.path);
+
     return data;
   },
 
@@ -115,6 +123,7 @@ export const iconItem: CanvasElementItem<IconConfig, IconData> = {
         editor: ResourceDimensionEditor,
         settings: {
           resourceType: 'icon',
+          maxFiles: 2000,
         },
       })
       .addCustomEditor({
diff --git a/public/app/features/canvas/elements/metricValue.tsx b/public/app/features/canvas/elements/metricValue.tsx
index f98dc1979cf50..1bcc39f28089c 100644
--- a/public/app/features/canvas/elements/metricValue.tsx
+++ b/public/app/features/canvas/elements/metricValue.tsx
@@ -13,7 +13,13 @@ import { ColorDimensionEditor } from 'app/features/dimensions/editors/ColorDimen
 import { TextDimensionEditor } from 'app/features/dimensions/editors/TextDimensionEditor';
 import { getDataLinks } from 'app/plugins/panel/canvas/utils';
 
-import { CanvasElementItem, CanvasElementProps, defaultBgColor, defaultTextColor } from '../element';
+import {
+  CanvasElementItem,
+  CanvasElementOptions,
+  CanvasElementProps,
+  defaultBgColor,
+  defaultTextColor,
+} from '../element';
 import { ElementState } from '../runtime/element';
 import { Align, TextConfig, TextData, VAlign } from '../types';
 
@@ -111,26 +117,26 @@ const MetricValueEdit = (props: CanvasElementProps<TextConfig, TextData>) => {
 };
 
 const getStyles = (data: TextData | undefined) => (theme: GrafanaTheme2) => ({
-  container: css`
-    position: absolute;
-    height: 100%;
-    width: 100%;
-    display: table;
-  `,
-  inlineEditorContainer: css`
-    height: 100%;
-    width: 100%;
-    display: flex;
-    align-items: center;
-    padding: 10px;
-  `,
-  span: css`
-    display: table-cell;
-    vertical-align: ${data?.valign};
-    text-align: ${data?.align};
-    font-size: ${data?.size}px;
-    color: ${data?.color};
-  `,
+  container: css({
+    position: 'absolute',
+    height: '100%',
+    width: '100%',
+    display: 'table',
+  }),
+  inlineEditorContainer: css({
+    height: '100%',
+    width: '100%',
+    display: 'flex',
+    alignItems: 'center',
+    padding: theme.spacing(1),
+  }),
+  span: css({
+    display: 'table-cell',
+    verticalAlign: data?.valign,
+    textAlign: data?.align,
+    fontSize: `${data?.size}px`,
+    color: data?.color,
+  }),
 });
 
 export const metricValueItem: CanvasElementItem<TextConfig, TextData> = {
@@ -171,19 +177,21 @@ export const metricValueItem: CanvasElementItem<TextConfig, TextData> = {
     },
   }),
 
-  prepareData: (ctx: DimensionContext, cfg: TextConfig) => {
+  prepareData: (dimensionContext: DimensionContext, elementOptions: CanvasElementOptions<TextConfig>) => {
+    const textConfig = elementOptions.config;
+
     const data: TextData = {
-      text: cfg.text ? ctx.getText(cfg.text).value() : '',
-      align: cfg.align ?? Align.Center,
-      valign: cfg.valign ?? VAlign.Middle,
-      size: cfg.size,
+      text: textConfig?.text ? dimensionContext.getText(textConfig.text).value() : '',
+      align: textConfig?.align ?? Align.Center,
+      valign: textConfig?.valign ?? VAlign.Middle,
+      size: textConfig?.size,
     };
 
-    if (cfg.color) {
-      data.color = ctx.getColor(cfg.color).value();
+    if (textConfig?.color) {
+      data.color = dimensionContext.getColor(textConfig.color).value();
     }
 
-    data.links = getDataLinks(ctx, cfg, data.text);
+    data.links = getDataLinks(dimensionContext, elementOptions, data.text);
 
     return data;
   },
diff --git a/public/app/features/canvas/elements/parallelogram.tsx b/public/app/features/canvas/elements/parallelogram.tsx
new file mode 100644
index 0000000000000..aeb9920be56b5
--- /dev/null
+++ b/public/app/features/canvas/elements/parallelogram.tsx
@@ -0,0 +1,226 @@
+import { css } from '@emotion/css';
+import React from 'react';
+import { v4 as uuidv4 } from 'uuid';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { config } from 'app/core/config';
+import { DimensionContext } from 'app/features/dimensions';
+import { ColorDimensionEditor } from 'app/features/dimensions/editors/ColorDimensionEditor';
+import { TextDimensionEditor } from 'app/features/dimensions/editors/TextDimensionEditor';
+import { getDataLinks } from 'app/plugins/panel/canvas/utils';
+
+import {
+  CanvasElementItem,
+  CanvasElementProps,
+  CanvasElementOptions,
+  defaultBgColor,
+  defaultTextColor,
+} from '../element';
+import { Align, CanvasElementConfig, CanvasElementData, VAlign } from '../types';
+
+const Parallelogram = (props: CanvasElementProps<CanvasElementConfig, CanvasElementData>) => {
+  const { data } = props;
+  const styles = getStyles(config.theme2, data);
+
+  // uuid needed to avoid id conflicts when multiple elements are rendered
+  const uniqueId = uuidv4();
+
+  return (
+    <div className={styles.container}>
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        viewBox="0 0 250 150"
+        width="100%"
+        height="100%"
+        preserveAspectRatio="none"
+      >
+        <defs>
+          <pattern id={`image-${uniqueId}`} patternUnits="userSpaceOnUse" width="250" height="150">
+            <image xlinkHref={data?.backgroundImage} x="-50" y="-50" width="350" height="200"></image>
+          </pattern>
+          <clipPath id={`parallelogramClip-${uniqueId}`}>
+            <polygon points="0,150 50,0 250,0 200,150" />
+          </clipPath>
+        </defs>
+        {/* Apply background image within the clipping area */}
+        <rect
+          x="0"
+          y="0"
+          width="100%"
+          height="100%"
+          clipPath={`url(#parallelogramClip-${uniqueId})`}
+          style={{ fill: 'none' }}
+        />
+        <polygon
+          points="0,150 50,0 250,0 200,150"
+          className={styles.element}
+          style={{ fill: data?.backgroundImage ? `url(#image-${uniqueId})` : data?.backgroundColor }}
+        />
+      </svg>
+      <span className={styles.text}>{data?.text}</span>
+    </div>
+  );
+};
+
+export const parallelogramItem: CanvasElementItem = {
+  id: 'parallelogram',
+  name: 'Parallelogram',
+  description: 'Parallelogram',
+
+  display: Parallelogram,
+
+  defaultSize: {
+    width: 250,
+    height: 150,
+  },
+
+  getNewOptions: (options) => ({
+    ...options,
+    background: {
+      color: {
+        fixed: defaultBgColor,
+      },
+    },
+    config: {
+      align: Align.Center,
+      valign: VAlign.Middle,
+      color: {
+        fixed: defaultTextColor,
+      },
+    },
+    placement: {
+      width: options?.placement?.width ?? 250,
+      height: options?.placement?.height ?? 150,
+      top: options?.placement?.top,
+      left: options?.placement?.left,
+    },
+  }),
+
+  // Called when data changes
+  prepareData: (dimensionContext: DimensionContext, elementOptions: CanvasElementOptions<CanvasElementConfig>) => {
+    const textConfig = elementOptions.config;
+
+    const data: CanvasElementData = {
+      text: textConfig?.text ? dimensionContext.getText(textConfig.text).value() : '',
+      align: textConfig?.align ?? Align.Center,
+      valign: textConfig?.valign ?? VAlign.Middle,
+      size: textConfig?.size,
+    };
+
+    if (textConfig?.color) {
+      data.color = dimensionContext.getColor(textConfig.color).value();
+    }
+
+    data.links = getDataLinks(dimensionContext, elementOptions, data.text);
+
+    const { background, border } = elementOptions;
+    data.backgroundColor = background?.color ? dimensionContext.getColor(background.color).value() : defaultBgColor;
+    data.borderColor = border?.color ? dimensionContext.getColor(border.color).value() : defaultBgColor;
+    data.borderWidth = border?.width ?? 0;
+
+    data.backgroundImage = background?.image ? dimensionContext.getResource(background.image).value() : undefined;
+
+    return data;
+  },
+
+  registerOptionsUI: (builder) => {
+    const category = ['Parallelogram'];
+    builder
+      .addCustomEditor({
+        category,
+        id: 'textSelector',
+        path: 'config.text',
+        name: 'Text',
+        editor: TextDimensionEditor,
+      })
+      .addCustomEditor({
+        category,
+        id: 'config.color',
+        path: 'config.color',
+        name: 'Text color',
+        editor: ColorDimensionEditor,
+        settings: {},
+        defaultValue: {},
+      })
+      .addRadio({
+        category,
+        path: 'config.align',
+        name: 'Align text',
+        settings: {
+          options: [
+            { value: Align.Left, label: 'Left' },
+            { value: Align.Center, label: 'Center' },
+            { value: Align.Right, label: 'Right' },
+          ],
+        },
+        defaultValue: Align.Left,
+      })
+      .addRadio({
+        category,
+        path: 'config.valign',
+        name: 'Vertical align',
+        settings: {
+          options: [
+            { value: VAlign.Top, label: 'Top' },
+            { value: VAlign.Middle, label: 'Middle' },
+            { value: VAlign.Bottom, label: 'Bottom' },
+          ],
+        },
+        defaultValue: VAlign.Middle,
+      })
+      .addNumberInput({
+        category,
+        path: 'config.size',
+        name: 'Text size',
+        settings: {
+          placeholder: 'Auto',
+        },
+      });
+  },
+
+  customConnectionAnchors: [
+    { x: -0.6, y: 1 }, // Angled Top Left
+    { x: -0.1, y: 1 }, // Top Middle
+    { x: 0.5, y: 1 }, // Angled Top Right
+    { x: 1, y: 1 }, // Top Right
+    { x: 0.925, y: 0.6 }, // Angled Right Top
+    { x: 0.84, y: 0.2 }, // Right Middle
+    { x: 0.76, y: -0.2 }, // Angled Right Bottom
+    { x: 0.675, y: -0.6 }, // Bottom Right
+    { x: -0.5, y: -1 }, // Angled Bottom Right
+    { x: 0.1, y: -1 }, // Bottom Middle
+    { x: 0.6, y: -1 }, // Angled Bottom Left
+    { x: -1, y: -1 }, // Bottom Left
+    { x: -0.925, y: -0.6 }, // Angled Left Bottom
+    { x: -0.84, y: -0.2 }, // Left Middle
+    { x: -0.76, y: 0.2 }, // Angled Left Top
+    { x: -0.675, y: 0.6 }, // Top Left 2
+  ],
+};
+
+const getStyles = (theme: GrafanaTheme2, data: CanvasElementData | undefined) => {
+  const textTop = data?.valign === VAlign.Middle ? '50%' : data?.valign === VAlign.Top ? '10%' : '90%';
+  const textLeft = data?.align === Align.Center ? '50%' : data?.align === Align.Left ? '10%' : '90%';
+  const textTransform = `translate(${data?.align === Align.Center ? '-50%' : data?.align === Align.Left ? '10%' : '-90%'}, ${
+    data?.valign === VAlign.Middle ? '-50%' : data?.valign === VAlign.Top ? '10%' : '-90%'
+  })`;
+
+  return {
+    container: css({
+      height: '100%',
+      width: '100%',
+    }),
+    text: css({
+      position: 'absolute',
+      top: textTop,
+      left: textLeft,
+      transform: textTransform,
+      fontSize: `${data?.size}px`,
+      color: data?.color,
+    }),
+    element: css({
+      stroke: data?.borderColor,
+      strokeWidth: data?.borderWidth,
+    }),
+  };
+};
diff --git a/public/app/features/canvas/elements/rectangle.tsx b/public/app/features/canvas/elements/rectangle.tsx
index 4f0f515dc1a54..fcadaddc8570a 100644
--- a/public/app/features/canvas/elements/rectangle.tsx
+++ b/public/app/features/canvas/elements/rectangle.tsx
@@ -7,8 +7,15 @@ import { config } from 'app/core/config';
 import { DimensionContext } from 'app/features/dimensions/context';
 import { ColorDimensionEditor } from 'app/features/dimensions/editors/ColorDimensionEditor';
 import { TextDimensionEditor } from 'app/features/dimensions/editors/TextDimensionEditor';
+import { getDataLinks } from 'app/plugins/panel/canvas/utils';
 
-import { CanvasElementItem, CanvasElementProps, defaultBgColor, defaultTextColor } from '../element';
+import {
+  CanvasElementItem,
+  CanvasElementOptions,
+  CanvasElementProps,
+  defaultBgColor,
+  defaultTextColor,
+} from '../element';
 import { Align, TextConfig, TextData, VAlign } from '../types';
 
 class RectangleDisplay extends PureComponent<CanvasElementProps<TextConfig, TextData>> {
@@ -69,18 +76,22 @@ export const rectangleItem: CanvasElementItem<TextConfig, TextData> = {
   }),
 
   // Called when data changes
-  prepareData: (ctx: DimensionContext, cfg: TextConfig) => {
+  prepareData: (dimensionContext: DimensionContext, elementOptions: CanvasElementOptions<TextConfig>) => {
+    const textConfig = elementOptions.config;
+
     const data: TextData = {
-      text: cfg.text ? ctx.getText(cfg.text).value() : '',
-      align: cfg.align ?? Align.Center,
-      valign: cfg.valign ?? VAlign.Middle,
-      size: cfg.size,
+      text: textConfig?.text ? dimensionContext.getText(textConfig.text).value() : '',
+      align: textConfig?.align ?? Align.Center,
+      valign: textConfig?.valign ?? VAlign.Middle,
+      size: textConfig?.size,
     };
 
-    if (cfg.color) {
-      data.color = ctx.getColor(cfg.color).value();
+    if (textConfig?.color) {
+      data.color = dimensionContext.getColor(textConfig.color).value();
     }
 
+    data.links = getDataLinks(dimensionContext, elementOptions, data.text);
+
     return data;
   },
 
diff --git a/public/app/features/canvas/elements/server/server.tsx b/public/app/features/canvas/elements/server/server.tsx
index e56e8aa0285cc..dcd8c1393a0a7 100644
--- a/public/app/features/canvas/elements/server/server.tsx
+++ b/public/app/features/canvas/elements/server/server.tsx
@@ -1,13 +1,14 @@
 import { css } from '@emotion/css';
 import React from 'react';
 
-import { GrafanaTheme2 } from '@grafana/data';
+import { GrafanaTheme2, LinkModel } from '@grafana/data';
 import { ColorDimensionConfig, ScalarDimensionConfig } from '@grafana/schema';
 import config from 'app/core/config';
 import { DimensionContext } from 'app/features/dimensions';
 import { ColorDimensionEditor, ScalarDimensionEditor } from 'app/features/dimensions/editors';
+import { getDataLinks } from 'app/plugins/panel/canvas/utils';
 
-import { CanvasElementItem, CanvasElementProps } from '../../element';
+import { CanvasElementItem, CanvasElementOptions, CanvasElementProps } from '../../element';
 
 import { ServerDatabase } from './types/database';
 import { ServerSingle } from './types/single';
@@ -26,6 +27,7 @@ export interface ServerData {
   statusColor?: string;
   bulbColor?: string;
   type: ServerType;
+  links?: LinkModel[];
 }
 
 enum ServerType {
@@ -85,14 +87,20 @@ export const serverItem: CanvasElementItem<ServerConfig, ServerData> = {
   }),
 
   // Called when data changes
-  prepareData: (ctx: DimensionContext, cfg: ServerConfig) => {
+  prepareData: (dimensionContext: DimensionContext, elementOptions: CanvasElementOptions<ServerConfig>) => {
+    const serverConfig = elementOptions.config;
+
     const data: ServerData = {
-      blinkRate: cfg?.blinkRate ? ctx.getScalar(cfg.blinkRate).value() : 0,
-      statusColor: cfg?.statusColor ? ctx.getColor(cfg.statusColor).value() : 'transparent',
-      bulbColor: cfg?.bulbColor ? ctx.getColor(cfg.bulbColor).value() : 'green',
-      type: cfg.type,
+      blinkRate: serverConfig?.blinkRate ? dimensionContext.getScalar(serverConfig.blinkRate).value() : 0,
+      statusColor: serverConfig?.statusColor
+        ? dimensionContext.getColor(serverConfig.statusColor).value()
+        : 'transparent',
+      bulbColor: serverConfig?.bulbColor ? dimensionContext.getColor(serverConfig.bulbColor).value() : 'green',
+      type: serverConfig?.type ?? ServerType.Single,
     };
 
+    data.links = getDataLinks(dimensionContext, elementOptions, data.statusColor);
+
     return data;
   },
 
@@ -147,36 +155,36 @@ export const serverItem: CanvasElementItem<ServerConfig, ServerData> = {
 };
 
 export const getServerStyles = (data: ServerData | undefined) => (theme: GrafanaTheme2) => ({
-  bulb: css`
-    @keyframes blink {
-      0% {
-        fill-opacity: 0;
-      }
-      50% {
-        fill-opacity: 1;
-      }
-      100% {
-        fill-opacity: 0;
-      }
-    }
-  `,
-  server: css`
-    fill: ${data?.statusColor ?? 'transparent'};
-  `,
-  circle: css`
-    animation: blink ${data?.blinkRate ? 1 / data.blinkRate : 0}s infinite step-end;
-    fill: ${data?.bulbColor};
-    stroke: none;
-  `,
-  circleBack: css`
-    fill: ${outlineColor};
-    stroke: none;
-    opacity: 1;
-  `,
-  outline: css`
-    stroke: ${outlineColor};
-    stroke-linecap: round;
-    stroke-linejoin: round;
-    stroke-width: 4px;
-  `,
+  bulb: css({
+    '@keyframes blink': {
+      '0%': {
+        fillOpacity: 0,
+      },
+      '50%': {
+        fillOpacity: 1,
+      },
+      '100%': {
+        fillOpacity: 0,
+      },
+    },
+  }),
+  server: css({
+    fill: data?.statusColor ?? 'transparent',
+  }),
+  circle: css({
+    animation: `blink ${data?.blinkRate ? 1 / data.blinkRate : 0}s infinite step-end`,
+    fill: data?.bulbColor,
+    stroke: 'none',
+  }),
+  circleBack: css({
+    fill: outlineColor,
+    stroke: 'none',
+    opacity: 1,
+  }),
+  outline: css({
+    stroke: outlineColor,
+    strokeLinecap: 'round',
+    strokeLinejoin: 'round',
+    strokeWidth: '4px',
+  }),
 });
diff --git a/public/app/features/canvas/elements/text.tsx b/public/app/features/canvas/elements/text.tsx
index 92773b5057525..5f6fb6078f30b 100644
--- a/public/app/features/canvas/elements/text.tsx
+++ b/public/app/features/canvas/elements/text.tsx
@@ -10,7 +10,7 @@ import { ColorDimensionEditor } from 'app/features/dimensions/editors/ColorDimen
 import { TextDimensionEditor } from 'app/features/dimensions/editors/TextDimensionEditor';
 
 import { getDataLinks } from '../../../plugins/panel/canvas/utils';
-import { CanvasElementItem, CanvasElementProps, defaultThemeTextColor } from '../element';
+import { CanvasElementItem, CanvasElementOptions, CanvasElementProps, defaultThemeTextColor } from '../element';
 import { ElementState } from '../runtime/element';
 import { Align, TextConfig, TextData, VAlign } from '../types';
 
@@ -95,26 +95,26 @@ const TextEdit = (props: CanvasElementProps<TextConfig, TextData>) => {
 };
 
 const getStyles = (data: TextData | undefined) => (theme: GrafanaTheme2) => ({
-  container: css`
-    position: absolute;
-    height: 100%;
-    width: 100%;
-    display: table;
-  `,
-  inlineEditorContainer: css`
-    height: 100%;
-    width: 100%;
-    display: flex;
-    align-items: center;
-    padding: 10px;
-  `,
-  span: css`
-    display: table-cell;
-    vertical-align: ${data?.valign};
-    text-align: ${data?.align};
-    font-size: ${data?.size}px;
-    color: ${data?.color};
-  `,
+  container: css({
+    position: 'absolute',
+    height: '100%',
+    width: '100%',
+    display: 'table',
+  }),
+  inlineEditorContainer: css({
+    height: '100%',
+    width: '100%',
+    display: 'flex',
+    alignItems: 'center',
+    padding: theme.spacing(1),
+  }),
+  span: css({
+    display: 'table-cell',
+    verticalAlign: data?.valign,
+    textAlign: data?.align,
+    fontSize: `${data?.size}px`,
+    color: data?.color,
+  }),
 });
 
 export const textItem: CanvasElementItem<TextConfig, TextData> = {
@@ -149,19 +149,21 @@ export const textItem: CanvasElementItem<TextConfig, TextData> = {
     },
   }),
 
-  prepareData: (ctx: DimensionContext, cfg: TextConfig) => {
+  prepareData: (dimensionContext: DimensionContext, elementOptions: CanvasElementOptions<TextConfig>) => {
+    const textConfig = elementOptions.config;
+
     const data: TextData = {
-      text: cfg.text ? ctx.getText(cfg.text).value() : '',
-      align: cfg.align ?? Align.Center,
-      valign: cfg.valign ?? VAlign.Middle,
-      size: cfg.size,
+      text: textConfig?.text ? dimensionContext.getText(textConfig.text).value() : '',
+      align: textConfig?.align ?? Align.Center,
+      valign: textConfig?.valign ?? VAlign.Middle,
+      size: textConfig?.size,
     };
 
-    if (cfg.color) {
-      data.color = ctx.getColor(cfg.color).value();
+    if (textConfig?.color) {
+      data.color = dimensionContext.getColor(textConfig.color).value();
     }
 
-    data.links = getDataLinks(ctx, cfg, data.text);
+    data.links = getDataLinks(dimensionContext, elementOptions, data.text);
 
     return data;
   },
diff --git a/public/app/features/canvas/elements/triangle.tsx b/public/app/features/canvas/elements/triangle.tsx
new file mode 100644
index 0000000000000..99340b14a2fb8
--- /dev/null
+++ b/public/app/features/canvas/elements/triangle.tsx
@@ -0,0 +1,231 @@
+import { css } from '@emotion/css';
+import React from 'react';
+import { v4 as uuidv4 } from 'uuid';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { config } from 'app/core/config';
+import { DimensionContext } from 'app/features/dimensions';
+import { ColorDimensionEditor } from 'app/features/dimensions/editors/ColorDimensionEditor';
+import { TextDimensionEditor } from 'app/features/dimensions/editors/TextDimensionEditor';
+import { getDataLinks } from 'app/plugins/panel/canvas/utils';
+
+import {
+  CanvasElementItem,
+  CanvasElementProps,
+  CanvasElementOptions,
+  defaultBgColor,
+  defaultTextColor,
+} from '../element';
+import { Align, CanvasElementConfig, CanvasElementData, VAlign } from '../types';
+
+const Triangle = (props: CanvasElementProps<CanvasElementConfig, CanvasElementData>) => {
+  const { data } = props;
+  const styles = getStyles(config.theme2, data);
+
+  // uuid needed to avoid id conflicts when multiple elements are rendered
+  const uniqueId = uuidv4();
+
+  return (
+    <div className={styles.container}>
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        viewBox="0 0 200 200"
+        width="100%"
+        height="100%"
+        preserveAspectRatio="none"
+      >
+        <defs>
+          <pattern id={`image-${uniqueId}`} patternUnits="userSpaceOnUse" width="200" height="200">
+            <image xlinkHref={data?.backgroundImage} x="-50" y="-50" width="300" height="300"></image>
+          </pattern>
+          <clipPath id={`triangleClip-${uniqueId}`}>
+            <polygon points="100,0 200,200 0,200" />
+          </clipPath>
+        </defs>
+        {/* Apply background image within the clipping area */}
+        <rect
+          x="0"
+          y="0"
+          width="100%"
+          height="100%"
+          clipPath={`url(#triangleClip-${uniqueId})`}
+          style={{ fill: 'none' }}
+        />
+        <polygon
+          points="100,0 200,200 0,200"
+          className={styles.element}
+          style={{ fill: data?.backgroundImage ? `url(#image-${uniqueId})` : data?.backgroundColor }}
+        />
+      </svg>
+
+      <span className={styles.text}>{data?.text}</span>
+    </div>
+  );
+};
+
+export const triangleItem: CanvasElementItem = {
+  id: 'triangle',
+  name: 'Triangle',
+  description: 'Triangle',
+
+  display: Triangle,
+
+  defaultSize: {
+    width: 160,
+    height: 138,
+  },
+
+  getNewOptions: (options) => ({
+    ...options,
+    background: {
+      color: {
+        fixed: defaultBgColor,
+      },
+    },
+    config: {
+      align: Align.Center,
+      valign: VAlign.Middle,
+      color: {
+        fixed: defaultTextColor,
+      },
+    },
+    placement: {
+      width: options?.placement?.width ?? 160,
+      height: options?.placement?.height ?? 138,
+      top: options?.placement?.top,
+      left: options?.placement?.left,
+    },
+  }),
+
+  // Called when data changes
+  prepareData: (dimensionContext: DimensionContext, elementOptions: CanvasElementOptions<CanvasElementConfig>) => {
+    const textConfig = elementOptions.config;
+
+    const data: CanvasElementData = {
+      text: textConfig?.text ? dimensionContext.getText(textConfig.text).value() : '',
+      align: textConfig?.align ?? Align.Center,
+      valign: textConfig?.valign ?? VAlign.Middle,
+      size: textConfig?.size,
+    };
+
+    if (textConfig?.color) {
+      data.color = dimensionContext.getColor(textConfig.color).value();
+    }
+
+    data.links = getDataLinks(dimensionContext, elementOptions, data.text);
+
+    const { background, border } = elementOptions;
+    data.backgroundColor = background?.color ? dimensionContext.getColor(background.color).value() : defaultBgColor;
+    data.borderColor = border?.color ? dimensionContext.getColor(border.color).value() : defaultBgColor;
+    data.borderWidth = border?.width ?? 0;
+
+    data.backgroundImage = background?.image ? dimensionContext.getResource(background.image).value() : undefined;
+
+    return data;
+  },
+
+  registerOptionsUI: (builder) => {
+    const category = ['Triangle'];
+    builder
+      .addCustomEditor({
+        category,
+        id: 'textSelector',
+        path: 'config.text',
+        name: 'Text',
+        editor: TextDimensionEditor,
+      })
+      .addCustomEditor({
+        category,
+        id: 'config.color',
+        path: 'config.color',
+        name: 'Text color',
+        editor: ColorDimensionEditor,
+        settings: {},
+        defaultValue: {},
+      })
+      .addRadio({
+        category,
+        path: 'config.align',
+        name: 'Align text',
+        settings: {
+          options: [
+            { value: Align.Left, label: 'Left' },
+            { value: Align.Center, label: 'Center' },
+            { value: Align.Right, label: 'Right' },
+          ],
+        },
+        defaultValue: Align.Left,
+      })
+      .addRadio({
+        category,
+        path: 'config.valign',
+        name: 'Vertical align',
+        settings: {
+          options: [
+            { value: VAlign.Top, label: 'Top' },
+            { value: VAlign.Middle, label: 'Middle' },
+            { value: VAlign.Bottom, label: 'Bottom' },
+          ],
+        },
+        defaultValue: VAlign.Middle,
+      })
+      .addNumberInput({
+        category,
+        path: 'config.size',
+        name: 'Text size',
+        settings: {
+          placeholder: 'Auto',
+        },
+      });
+  },
+
+  customConnectionAnchors: [
+    // points along the left edge
+    { x: -1, y: -1 }, // bottom left
+    { x: -0.8, y: -0.6 },
+    { x: -0.6, y: -0.2 },
+    { x: -0.4, y: 0.2 },
+    { x: -0.2, y: 0.6 },
+    { x: 0, y: 1 }, // top
+
+    // points along the right edge
+    { x: 0.2, y: 0.6 },
+    { x: 0.4, y: 0.2 },
+    { x: 0.6, y: -0.2 },
+    { x: 0.8, y: -0.6 },
+    { x: 1, y: -1 }, // bottom right
+
+    // points along the bottom edge
+    { x: 0.6, y: -1 },
+    { x: 0.2, y: -1 },
+    { x: -0.2, y: -1 },
+    { x: -0.6, y: -1 },
+  ],
+};
+
+const getStyles = (theme: GrafanaTheme2, data: CanvasElementData | undefined) => {
+  const textTop = data?.valign === VAlign.Middle ? '50%' : data?.valign === VAlign.Top ? '10%' : '90%';
+  const textLeft = data?.align === Align.Center ? '50%' : data?.align === Align.Left ? '10%' : '90%';
+  const textTransform = `translate(${data?.align === Align.Center ? '-50%' : data?.align === Align.Left ? '10%' : '-90%'}, ${
+    data?.valign === VAlign.Middle ? '-50%' : data?.valign === VAlign.Top ? '10%' : '-90%'
+  })`;
+
+  return {
+    container: css({
+      height: '100%',
+      width: '100%',
+    }),
+    text: css({
+      position: 'absolute',
+      top: textTop,
+      left: textLeft,
+      transform: textTransform,
+      fontSize: `${data?.size}px`,
+      color: data?.color,
+    }),
+    element: css({
+      stroke: data?.borderColor,
+      strokeWidth: data?.borderWidth,
+    }),
+  };
+};
diff --git a/public/app/features/canvas/elements/windTurbine.tsx b/public/app/features/canvas/elements/windTurbine.tsx
index db593e265e6f1..1ea10e13a33e9 100644
--- a/public/app/features/canvas/elements/windTurbine.tsx
+++ b/public/app/features/canvas/elements/windTurbine.tsx
@@ -1,16 +1,18 @@
 import { css } from '@emotion/css';
 import React from 'react';
 
-import { GrafanaTheme2 } from '@grafana/data';
+import { GrafanaTheme2, LinkModel } from '@grafana/data';
 import { ScalarDimensionConfig } from '@grafana/schema';
 import { useStyles2 } from '@grafana/ui';
 import { DimensionContext } from 'app/features/dimensions';
 import { ScalarDimensionEditor } from 'app/features/dimensions/editors';
+import { getDataLinks } from 'app/plugins/panel/canvas/utils';
 
-import { CanvasElementItem, CanvasElementProps, defaultBgColor } from '../element';
+import { CanvasElementItem, CanvasElementOptions, CanvasElementProps, defaultBgColor } from '../element';
 
 interface WindTurbineData {
   rpm?: number;
+  links?: LinkModel[];
 }
 
 interface WindTurbineConfig {
@@ -92,11 +94,15 @@ export const windTurbineItem: CanvasElementItem = {
   }),
 
   // Called when data changes
-  prepareData: (ctx: DimensionContext, cfg: WindTurbineConfig) => {
+  prepareData: (dimensionContext: DimensionContext, elementOptions: CanvasElementOptions<WindTurbineConfig>) => {
+    const windTurbineConfig = elementOptions.config;
+
     const data: WindTurbineData = {
-      rpm: cfg?.rpm ? ctx.getScalar(cfg.rpm).value() : 0,
+      rpm: windTurbineConfig?.rpm ? dimensionContext.getScalar(windTurbineConfig.rpm).value() : 0,
     };
 
+    data.links = getDataLinks(dimensionContext, elementOptions, `${data.rpm}`);
+
     return data;
   },
 
@@ -113,17 +119,16 @@ export const windTurbineItem: CanvasElementItem = {
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  blade: css`
-    @keyframes spin {
-      from {
-        transform: rotate(0deg);
-      }
-      to {
-        transform: rotate(360deg);
-      }
-    }
-
-    transform-origin: 94.663px 94.663px;
-    transform: rotate(15deg);
-  `,
+  blade: css({
+    transformOrigin: '94.663px 94.663px',
+    transform: 'rotate(15deg)',
+    '@keyframes spin': {
+      from: {
+        transform: 'rotate(0deg)',
+      },
+      to: {
+        transform: 'rotate(360deg)',
+      },
+    },
+  }),
 });
diff --git a/public/app/features/canvas/registry.ts b/public/app/features/canvas/registry.ts
index a99d142d6177f..61c2be7409eb2 100644
--- a/public/app/features/canvas/registry.ts
+++ b/public/app/features/canvas/registry.ts
@@ -2,15 +2,18 @@ import { Registry } from '@grafana/data';
 
 import { CanvasElementItem, CanvasElementOptions } from './element';
 import { buttonItem } from './elements/button';
+import { cloudItem } from './elements/cloud';
 import { droneFrontItem } from './elements/droneFront';
 import { droneSideItem } from './elements/droneSide';
 import { droneTopItem } from './elements/droneTop';
 import { ellipseItem } from './elements/ellipse';
 import { iconItem } from './elements/icon';
 import { metricValueItem } from './elements/metricValue';
+import { parallelogramItem } from './elements/parallelogram';
 import { rectangleItem } from './elements/rectangle';
 import { serverItem } from './elements/server/server';
 import { textItem } from './elements/text';
+import { triangleItem } from './elements/triangle';
 import { windTurbineItem } from './elements/windTurbine';
 
 export const DEFAULT_CANVAS_ELEMENT_CONFIG: CanvasElementOptions = {
@@ -27,6 +30,9 @@ export const defaultElementItems = [
   rectangleItem,
   iconItem,
   serverItem,
+  triangleItem,
+  cloudItem,
+  parallelogramItem,
 ];
 
 export const advancedElementItems = [buttonItem, windTurbineItem, droneTopItem, droneFrontItem, droneSideItem];
diff --git a/public/app/features/canvas/runtime/SceneTransformWrapper.tsx b/public/app/features/canvas/runtime/SceneTransformWrapper.tsx
new file mode 100644
index 0000000000000..52ae32fa5f285
--- /dev/null
+++ b/public/app/features/canvas/runtime/SceneTransformWrapper.tsx
@@ -0,0 +1,114 @@
+import React from 'react';
+import { TransformWrapper, TransformComponent, ReactZoomPanPinchRef } from 'react-zoom-pan-pinch';
+
+import { config } from '@grafana/runtime';
+
+import { Scene } from './scene';
+
+type SceneTransformWrapperProps = {
+  scene: Scene;
+  children: React.ReactNode;
+};
+
+export const SceneTransformWrapper = ({ scene, children: sceneDiv }: SceneTransformWrapperProps) => {
+  const onZoom = (zoomPanPinchRef: ReactZoomPanPinchRef) => {
+    const scale = zoomPanPinchRef.state.scale;
+    scene.scale = scale;
+
+    if (scene.shouldInfinitePan) {
+      const isScaleZoomedOut = scale < 1;
+
+      if (isScaleZoomedOut) {
+        scene.updateSize(scene.width / scale, scene.height / scale);
+        scene.panel.forceUpdate();
+      }
+    }
+  };
+
+  const onZoomStop = (zoomPanPinchRef: ReactZoomPanPinchRef) => {
+    const scale = zoomPanPinchRef.state.scale;
+    scene.scale = scale;
+    updateMoveable(scale);
+  };
+
+  const onTransformed = (
+    _: ReactZoomPanPinchRef,
+    state: {
+      scale: number;
+      positionX: number;
+      positionY: number;
+    }
+  ) => {
+    const scale = state.scale;
+    scene.scale = scale;
+    updateMoveable(scale);
+  };
+
+  const updateMoveable = (scale: number) => {
+    if (scene.moveable && scale > 0) {
+      scene.moveable.zoom = 1 / scale;
+      if (scale === 1) {
+        scene.moveable.snappable = true;
+      } else {
+        scene.moveable.snappable = false;
+      }
+    }
+  };
+
+  const onPanning = (_: ReactZoomPanPinchRef, event: MouseEvent | TouchEvent) => {
+    if (scene.shouldInfinitePan && event instanceof MouseEvent) {
+      // Get deltaX and deltaY from pan event and add it to current canvas dimensions
+      let deltaX = event.movementX;
+      let deltaY = event.movementY;
+      if (deltaX > 0) {
+        deltaX = 0;
+      }
+      if (deltaY > 0) {
+        deltaY = 0;
+      }
+
+      // TODO: Consider bounding to the scene elements instead of allowing "infinite" panning
+      // TODO: Consider making scene grow in all directions vs just down to the right / bottom
+      scene.updateSize(scene.width - deltaX, scene.height - deltaY);
+      scene.panel.forceUpdate();
+    }
+  };
+
+  const onSceneContainerMouseDown = (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
+    // If pan and zoom is disabled or context menu is visible, don't pan
+    if ((!scene.shouldPanZoom || scene.contextMenuVisible) && (e.button === 1 || (e.button === 2 && e.ctrlKey))) {
+      e.preventDefault();
+      e.stopPropagation();
+    }
+
+    // If context menu is hidden, ignore left mouse or non-ctrl right mouse for pan
+    if (!scene.contextMenuVisible && !scene.isPanelEditing && e.button === 2 && !e.ctrlKey) {
+      e.preventDefault();
+      e.stopPropagation();
+    }
+  };
+
+  // Set panel content overflow to hidden to prevent canvas content from overflowing
+  scene.div?.parentElement?.parentElement?.parentElement?.parentElement?.setAttribute('style', `overflow: hidden`);
+
+  return (
+    <TransformWrapper
+      doubleClick={{ mode: 'reset' }}
+      ref={scene.transformComponentRef}
+      onZoom={onZoom}
+      onZoomStop={onZoomStop}
+      onTransformed={onTransformed}
+      disabled={!config.featureToggles.canvasPanelPanZoom || !scene.shouldPanZoom}
+      panning={{ allowLeftClickPan: false }}
+      limitToBounds={!scene.shouldInfinitePan}
+      minScale={scene.shouldInfinitePan ? 0.1 : undefined}
+      onPanning={onPanning}
+    >
+      <TransformComponent>
+        {/* The <div> element has child elements that allow for mouse events, so we need to disable the linter rule */}
+        {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
+        <div onMouseDown={onSceneContainerMouseDown}>{sceneDiv}</div>
+      </TransformComponent>
+    </TransformWrapper>
+  );
+};
diff --git a/public/app/features/canvas/runtime/ables.tsx b/public/app/features/canvas/runtime/ables.tsx
index 8de918c412dd4..6130f0eadb97c 100644
--- a/public/app/features/canvas/runtime/ables.tsx
+++ b/public/app/features/canvas/runtime/ables.tsx
@@ -6,8 +6,8 @@ import { Scene } from './scene';
 
 export const settingsViewable = (scene: Scene) => ({
   name: 'settingsViewable',
-  props: {},
-  events: {},
+  props: [],
+  events: [],
   render(moveable: MoveableManagerInterface<unknown, unknown>, React: Renderer) {
     // If selection is more than 1 element don't display settings button
     if (scene.selecto?.getSelectedTargets() && scene.selecto?.getSelectedTargets().length > 1) {
@@ -63,8 +63,8 @@ export const settingsViewable = (scene: Scene) => ({
 
 export const dimensionViewable = {
   name: 'dimensionViewable',
-  props: {},
-  events: {},
+  props: [],
+  events: [],
   render(moveable: MoveableManagerInterface<unknown, unknown>, React: Renderer) {
     const rect = moveable.getRect();
     return (
@@ -95,8 +95,8 @@ export const dimensionViewable = {
 
 export const constraintViewable = (scene: Scene) => ({
   name: 'constraintViewable',
-  props: {},
-  events: {},
+  props: [],
+  events: [],
   render(moveable: MoveableManagerInterface<unknown, unknown>, React: Renderer) {
     const rect = moveable.getRect();
     const targetElement = scene.findElementByTarget(moveable.state.target!);
diff --git a/public/app/features/canvas/runtime/element.tsx b/public/app/features/canvas/runtime/element.tsx
index 5062d017edd98..b42292ba53e56 100644
--- a/public/app/features/canvas/runtime/element.tsx
+++ b/public/app/features/canvas/runtime/element.tsx
@@ -1,5 +1,5 @@
 import React, { CSSProperties } from 'react';
-import { OnDrag, OnResize } from 'react-moveable/declaration/types';
+import { OnDrag, OnResize, OnRotate } from 'react-moveable/declaration/types';
 
 import { LayerElement } from 'app/core/components/Layers/types';
 import {
@@ -20,6 +20,8 @@ import { Scene } from './scene';
 
 let counter = 0;
 
+const SVGElements = new Set<string>(['parallelogram', 'triangle', 'cloud', 'ellipse']);
+
 export class ElementState implements LayerElement {
   // UID necessary for moveable to work (for now)
   readonly UID = counter++;
@@ -50,7 +52,7 @@ export class ElementState implements LayerElement {
       vertical: VerticalConstraint.Top,
       horizontal: HorizontalConstraint.Left,
     };
-    options.placement = options.placement ?? { width: 100, height: 100, top: 0, left: 0 };
+    options.placement = options.placement ?? { width: 100, height: 100, top: 0, left: 0, rotation: 0 };
     options.background = options.background ?? { color: { fixed: 'transparent' } };
     options.border = options.border ?? { color: { fixed: 'dark-green' } };
     const scene = this.getScene();
@@ -97,6 +99,7 @@ export class ElementState implements LayerElement {
       // Minimum element size is 10x10
       minWidth: '10px',
       minHeight: '10px',
+      rotate: `${placement.rotation ?? 0}deg`,
     };
 
     const translate = ['0px', '0px'];
@@ -186,18 +189,36 @@ export class ElementState implements LayerElement {
     style.transform = `translate(${translate[0]}, ${translate[1]})`;
     this.options.placement = placement;
     this.sizeStyle = style;
+
     if (this.div) {
       for (const key in this.sizeStyle) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         this.div.style[key as any] = (this.sizeStyle as any)[key];
       }
 
-      for (const key in this.dataStyle) {
-        this.div.style[key as any] = (this.dataStyle as any)[key];
+      // TODO: This is a hack, we should have a better way to handle this
+      const elementType = this.options.type;
+      if (!SVGElements.has(elementType)) {
+        // apply styles to div if it's not an SVG element
+        for (const key in this.dataStyle) {
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          this.div.style[key as any] = (this.dataStyle as any)[key];
+        }
+      } else {
+        // ELEMENT IS SVG
+        // clean data styles from div if it's an SVG element; SVG elements have their own data styles;
+        // this is necessary for changing type of element cases;
+        // wrapper div element (this.div) doesn't re-render (has static `key` property),
+        // so we have to clean styles manually;
+        for (const key in this.dataStyle) {
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          this.div.style[key as any] = '';
+        }
       }
     }
   }
 
-  setPlacementFromConstraint(elementContainer?: DOMRect, parentContainer?: DOMRect) {
+  setPlacementFromConstraint(elementContainer?: DOMRect, parentContainer?: DOMRect, transformScale = 1) {
     const { constraint } = this.options;
     const { vertical, horizontal } = constraint ?? {};
 
@@ -212,27 +233,62 @@ export class ElementState implements LayerElement {
         : parseFloat(getComputedStyle(this.div?.parentElement!).borderWidth);
     }
 
+    // For elements with rotation, a delta needs to be applied to account for bounding box rotation
+    // TODO: Fix behavior for top+bottom, left+right, center, and scale constraints
+    let rotationTopOffset = 0;
+    let rotationLeftOffset = 0;
+    if (this.options.placement?.rotation && this.options.placement?.width && this.options.placement?.height) {
+      const rotationDegrees = this.options.placement.rotation;
+      const rotationRadians = (Math.PI / 180) * rotationDegrees;
+      let rotationOffset = rotationRadians;
+
+      switch (true) {
+        case rotationDegrees >= 0 && rotationDegrees < 90:
+          // no-op
+          break;
+        case rotationDegrees >= 90 && rotationDegrees < 180:
+          rotationOffset = Math.PI - rotationRadians;
+          break;
+        case rotationDegrees >= 180 && rotationDegrees < 270:
+          rotationOffset = Math.PI + rotationRadians;
+          break;
+        case rotationDegrees >= 270:
+          rotationOffset = -rotationRadians;
+          break;
+      }
+
+      const calculateDelta = (dimension1: number, dimension2: number) =>
+        (dimension1 / 2) * Math.sin(rotationOffset) + (dimension2 / 2) * (Math.cos(rotationOffset) - 1);
+
+      rotationTopOffset = calculateDelta(this.options.placement.width, this.options.placement.height);
+      rotationLeftOffset = calculateDelta(this.options.placement.height, this.options.placement.width);
+    }
+
     const relativeTop =
       elementContainer && parentContainer
-        ? Math.round(elementContainer.top - parentContainer.top - parentBorderWidth)
+        ? Math.round(elementContainer.top - parentContainer.top - parentBorderWidth + rotationTopOffset) /
+          transformScale
         : 0;
     const relativeBottom =
       elementContainer && parentContainer
-        ? Math.round(parentContainer.bottom - parentBorderWidth - elementContainer.bottom)
+        ? Math.round(parentContainer.bottom - parentBorderWidth - elementContainer.bottom + rotationTopOffset) /
+          transformScale
         : 0;
     const relativeLeft =
       elementContainer && parentContainer
-        ? Math.round(elementContainer.left - parentContainer.left - parentBorderWidth)
+        ? Math.round(elementContainer.left - parentContainer.left - parentBorderWidth + rotationLeftOffset) /
+          transformScale
         : 0;
     const relativeRight =
       elementContainer && parentContainer
-        ? Math.round(parentContainer.right - parentBorderWidth - elementContainer.right)
+        ? Math.round(parentContainer.right - parentBorderWidth - elementContainer.right + rotationLeftOffset) /
+          transformScale
         : 0;
 
     const placement: Placement = {};
 
-    const width = elementContainer?.width ?? 100;
-    const height = elementContainer?.height ?? 100;
+    const width = (elementContainer?.width ?? 100) / transformScale;
+    const height = (elementContainer?.height ?? 100) / transformScale;
 
     switch (vertical) {
       case VerticalConstraint.Top:
@@ -286,6 +342,12 @@ export class ElementState implements LayerElement {
         break;
     }
 
+    if (this.options.placement?.rotation) {
+      placement.rotation = this.options.placement.rotation;
+      placement.width = this.options.placement.width;
+      placement.height = this.options.placement.height;
+    }
+
     this.options.placement = placement;
 
     this.applyLayoutStylesToDiv();
@@ -296,7 +358,7 @@ export class ElementState implements LayerElement {
 
   updateData(ctx: DimensionContext) {
     if (this.item.prepareData) {
-      this.data = this.item.prepareData(ctx, this.options.config);
+      this.data = this.item.prepareData(ctx, this.options);
       this.revId++; // rerender
     }
 
@@ -351,6 +413,10 @@ export class ElementState implements LayerElement {
       }
     }
 
+    if (border && border.radius !== undefined) {
+      css.borderRadius = `${border.radius}px`;
+    }
+
     this.dataStyle = css;
     this.applyLayoutStylesToDiv();
   }
@@ -425,16 +491,39 @@ export class ElementState implements LayerElement {
     event.target.style.transform = event.transform;
   };
 
+  applyRotate = (event: OnRotate) => {
+    const rotationDelta = event.delta;
+    const placement = this.options.placement!;
+    const placementRotation = placement.rotation ?? 0;
+
+    const calculatedRotation = placementRotation + rotationDelta;
+
+    // Ensure rotation is between 0 and 360
+    placement.rotation = calculatedRotation - Math.floor(calculatedRotation / 360) * 360;
+    event.target.style.transform = event.transform;
+  };
+
   // kinda like:
   // https://github.com/grafana/grafana-edge-app/blob/main/src/panels/draw/WrapItem.tsx#L44
-  applyResize = (event: OnResize) => {
+  applyResize = (event: OnResize, transformScale = 1) => {
     const placement = this.options.placement!;
 
     const style = event.target.style;
-    const deltaX = event.delta[0];
-    const deltaY = event.delta[1];
-    const dirLR = event.direction[0];
-    const dirTB = event.direction[1];
+    let deltaX = event.delta[0] / transformScale;
+    let deltaY = event.delta[1] / transformScale;
+    let dirLR = event.direction[0];
+    let dirTB = event.direction[1];
+
+    // Handle case when element is rotated
+    if (placement.rotation) {
+      const rotation = placement.rotation ?? 0;
+      const rotationInRadians = (rotation * Math.PI) / 180;
+      const originalDirLR = dirLR;
+      const originalDirTB = dirTB;
+
+      dirLR = Math.sign(originalDirLR * Math.cos(rotationInRadians) - originalDirTB * Math.sin(rotationInRadians));
+      dirTB = Math.sign(originalDirLR * Math.sin(rotationInRadians) + originalDirTB * Math.cos(rotationInRadians));
+    }
 
     if (dirLR === 1) {
       placement.width = event.width;
@@ -459,7 +548,7 @@ export class ElementState implements LayerElement {
 
   handleMouseEnter = (event: React.MouseEvent, isSelected: boolean | undefined) => {
     const scene = this.getScene();
-    if (!scene?.isEditingEnabled) {
+    if (!scene?.isEditingEnabled && !scene?.tooltip?.isOpen) {
       this.handleTooltip(event);
     } else if (!isSelected) {
       scene?.connections.handleMouseEnter(event);
@@ -486,6 +575,7 @@ export class ElementState implements LayerElement {
   };
 
   onElementClick = (event: React.MouseEvent) => {
+    this.handleTooltip(event);
     this.onTooltipCallback();
   };
 
diff --git a/public/app/features/canvas/runtime/scene.tsx b/public/app/features/canvas/runtime/scene.tsx
index f58a723268765..23fbda432bca3 100644
--- a/public/app/features/canvas/runtime/scene.tsx
+++ b/public/app/features/canvas/runtime/scene.tsx
@@ -1,6 +1,7 @@
 import { css } from '@emotion/css';
 import Moveable from 'moveable';
-import React, { CSSProperties } from 'react';
+import React, { createRef, CSSProperties, RefObject } from 'react';
+import { ReactZoomPanPinchContentRef } from 'react-zoom-pan-pinch';
 import { BehaviorSubject, ReplaySubject, Subject, Subscription } from 'rxjs';
 import { first } from 'rxjs/operators';
 import Selecto from 'selecto';
@@ -28,13 +29,19 @@ import {
 import { CanvasContextMenu } from 'app/plugins/panel/canvas/components/CanvasContextMenu';
 import { CanvasTooltip } from 'app/plugins/panel/canvas/components/CanvasTooltip';
 import { CONNECTION_ANCHOR_DIV_ID } from 'app/plugins/panel/canvas/components/connections/ConnectionAnchors';
-import { Connections } from 'app/plugins/panel/canvas/components/connections/Connections';
+import {
+  Connections,
+  CONNECTION_VERTEX_ADD_ID,
+  CONNECTION_VERTEX_ID,
+} from 'app/plugins/panel/canvas/components/connections/Connections';
 import { AnchorPoint, CanvasTooltipPayload, LayerActionID } from 'app/plugins/panel/canvas/types';
+import { getParent, getTransformInstance } from 'app/plugins/panel/canvas/utils';
 
 import appEvents from '../../../core/app_events';
 import { CanvasPanel } from '../../../plugins/panel/canvas/CanvasPanel';
 import { HorizontalConstraint, Placement, VerticalConstraint } from '../types';
 
+import { SceneTransformWrapper } from './SceneTransformWrapper';
 import { constraintViewable, dimensionViewable, settingsViewable } from './ables';
 import { ElementState } from './element';
 import { FrameState } from './frame';
@@ -57,6 +64,7 @@ export class Scene {
 
   width = 0;
   height = 0;
+  scale = 1;
   style: CSSProperties = {};
   data?: PanelData;
   selecto?: Selecto;
@@ -66,9 +74,23 @@ export class Scene {
   currentLayer?: FrameState;
   isEditingEnabled?: boolean;
   shouldShowAdvancedTypes?: boolean;
+  shouldPanZoom?: boolean;
+  shouldInfinitePan?: boolean;
   skipNextSelectionBroadcast = false;
   ignoreDataUpdate = false;
   panel: CanvasPanel;
+  contextMenuVisible?: boolean;
+  contextMenuOnVisibilityChange = (visible: boolean) => {
+    this.contextMenuVisible = visible;
+    const transformInstance = getTransformInstance(this);
+    if (transformInstance) {
+      if (visible) {
+        transformInstance.setup.disabled = true;
+      } else {
+        transformInstance.setup.disabled = false;
+      }
+    }
+  };
 
   isPanelEditing = locationService.getSearchObject().editPanel !== undefined;
 
@@ -84,15 +106,18 @@ export class Scene {
   subscription: Subscription;
 
   targetsToSelect = new Set<HTMLDivElement>();
+  transformComponentRef: RefObject<ReactZoomPanPinchContentRef> | undefined;
 
   constructor(
     cfg: CanvasFrameOptions,
     enableEditing: boolean,
     showAdvancedTypes: boolean,
+    panZoom: boolean,
+    infinitePan: boolean,
     public onSave: (cfg: CanvasFrameOptions) => void,
     panel: CanvasPanel
   ) {
-    this.root = this.load(cfg, enableEditing, showAdvancedTypes);
+    this.root = this.load(cfg, enableEditing, showAdvancedTypes, panZoom, infinitePan);
 
     this.subscription = this.editModeEnabled.subscribe((open) => {
       if (!this.moveable || !this.isEditingEnabled) {
@@ -103,6 +128,7 @@ export class Scene {
 
     this.panel = panel;
     this.connections = new Connections(this);
+    this.transformComponentRef = createRef();
   }
 
   getNextElementName = (isFrame = false) => {
@@ -124,7 +150,13 @@ export class Scene {
     return !this.byName.has(v);
   };
 
-  load(cfg: CanvasFrameOptions, enableEditing: boolean, showAdvancedTypes: boolean) {
+  load(
+    cfg: CanvasFrameOptions,
+    enableEditing: boolean,
+    showAdvancedTypes: boolean,
+    panZoom: boolean,
+    infinitePan: boolean
+  ) {
     this.root = new RootElement(
       cfg ?? {
         type: 'frame',
@@ -136,6 +168,8 @@ export class Scene {
 
     this.isEditingEnabled = enableEditing;
     this.shouldShowAdvancedTypes = showAdvancedTypes;
+    this.shouldPanZoom = panZoom;
+    this.shouldInfinitePan = infinitePan;
 
     setTimeout(() => {
       if (this.div) {
@@ -360,6 +394,22 @@ export class Scene {
     return targetElements;
   };
 
+  disableCustomables = () => {
+    this.moveable!.props = {
+      dimensionViewable: false,
+      constraintViewable: false,
+      settingsViewable: false,
+    };
+  };
+
+  enableCustomables = () => {
+    this.moveable!.props = {
+      dimensionViewable: true,
+      constraintViewable: true,
+      settingsViewable: true,
+    };
+  };
+
   initMoveable = (destroySelecto = false, allowChanges = true) => {
     const targetElements = this.generateTargetElements(this.root.elements);
 
@@ -369,16 +419,30 @@ export class Scene {
 
     this.selecto = new Selecto({
       container: this.div,
-      rootContainer: this.div,
+      rootContainer: getParent(this),
       selectableTargets: targetElements,
       toggleContinueSelect: 'shift',
       selectFromInside: false,
       hitRate: 0,
     });
 
+    const snapDirections = { top: true, left: true, bottom: true, right: true, center: true, middle: true };
+    const elementSnapDirections = { top: true, left: true, bottom: true, right: true, center: true, middle: true };
+
     this.moveable = new Moveable(this.div!, {
       draggable: allowChanges && !this.editModeEnabled.getValue(),
       resizable: allowChanges,
+
+      // Setup rotatable
+      rotatable: allowChanges,
+      throttleRotate: 5,
+
+      // Setup snappable
+      snappable: allowChanges,
+      snapDirections: snapDirections,
+      elementSnapDirections: elementSnapDirections,
+      elementGuidelines: targetElements,
+
       ables: [dimensionViewable, constraintViewable(this), settingsViewable(this)],
       props: {
         dimensionViewable: allowChanges,
@@ -388,6 +452,29 @@ export class Scene {
       origin: false,
       className: this.styles.selected,
     })
+      .on('rotateStart', () => {
+        this.disableCustomables();
+      })
+      .on('rotate', (event) => {
+        const targetedElement = this.findElementByTarget(event.target);
+
+        if (targetedElement) {
+          targetedElement.applyRotate(event);
+        }
+      })
+      .on('rotateGroup', (e) => {
+        for (let event of e.events) {
+          const targetedElement = this.findElementByTarget(event.target);
+          if (targetedElement) {
+            targetedElement.applyRotate(event);
+          }
+        }
+      })
+      .on('rotateEnd', () => {
+        this.enableCustomables();
+        // Update the editor with the new rotation
+        this.moved.next(Date.now());
+      })
       .on('click', (event) => {
         const targetedElement = this.findElementByTarget(event.target);
         let elementSupportsEditing = false;
@@ -405,9 +492,27 @@ export class Scene {
       .on('dragStart', (event) => {
         this.ignoreDataUpdate = true;
         this.setNonTargetPointerEvents(event.target, true);
+
+        // Remove the selected element from the snappable guidelines
+        if (this.moveable && this.moveable.elementGuidelines) {
+          const targetIndex = this.moveable.elementGuidelines.indexOf(event.target);
+          if (targetIndex > -1) {
+            this.moveable.elementGuidelines.splice(targetIndex, 1);
+          }
+        }
       })
-      .on('dragGroupStart', (event) => {
+      .on('dragGroupStart', (e) => {
         this.ignoreDataUpdate = true;
+
+        // Remove the selected elements from the snappable guidelines
+        if (this.moveable && this.moveable.elementGuidelines) {
+          for (let event of e.events) {
+            const targetIndex = this.moveable.elementGuidelines.indexOf(event.target);
+            if (targetIndex > -1) {
+              this.moveable.elementGuidelines.splice(targetIndex, 1);
+            }
+          }
+        }
       })
       .on('drag', (event) => {
         const targetedElement = this.findElementByTarget(event.target);
@@ -439,7 +544,14 @@ export class Scene {
         e.events.forEach((event) => {
           const targetedElement = this.findElementByTarget(event.target);
           if (targetedElement) {
-            targetedElement.setPlacementFromConstraint();
+            if (targetedElement) {
+              targetedElement.setPlacementFromConstraint(undefined, undefined, this.scale);
+            }
+
+            // re-add the selected elements to the snappable guidelines
+            if (this.moveable && this.moveable.elementGuidelines) {
+              this.moveable.elementGuidelines.push(event.target);
+            }
           }
         });
 
@@ -449,29 +561,53 @@ export class Scene {
       .on('dragEnd', (event) => {
         const targetedElement = this.findElementByTarget(event.target);
         if (targetedElement) {
-          targetedElement.setPlacementFromConstraint();
+          targetedElement.setPlacementFromConstraint(undefined, undefined, this.scale);
         }
 
         this.moved.next(Date.now());
         this.ignoreDataUpdate = false;
         this.setNonTargetPointerEvents(event.target, false);
+
+        // re-add the selected element to the snappable guidelines
+        if (this.moveable && this.moveable.elementGuidelines) {
+          this.moveable.elementGuidelines.push(event.target);
+        }
       })
       .on('resizeStart', (event) => {
         const targetedElement = this.findElementByTarget(event.target);
 
         if (targetedElement) {
+          // Remove the selected element from the snappable guidelines
+          if (this.moveable && this.moveable.elementGuidelines) {
+            const targetIndex = this.moveable.elementGuidelines.indexOf(event.target);
+            if (targetIndex > -1) {
+              this.moveable.elementGuidelines.splice(targetIndex, 1);
+            }
+          }
+
           targetedElement.tempConstraint = { ...targetedElement.options.constraint };
           targetedElement.options.constraint = {
             vertical: VerticalConstraint.Top,
             horizontal: HorizontalConstraint.Left,
           };
-          targetedElement.setPlacementFromConstraint();
+          targetedElement.setPlacementFromConstraint(undefined, undefined, this.scale);
+        }
+      })
+      .on('resizeGroupStart', (e) => {
+        // Remove the selected elements from the snappable guidelines
+        if (this.moveable && this.moveable.elementGuidelines) {
+          for (let event of e.events) {
+            const targetIndex = this.moveable.elementGuidelines.indexOf(event.target);
+            if (targetIndex > -1) {
+              this.moveable.elementGuidelines.splice(targetIndex, 1);
+            }
+          }
         }
       })
       .on('resize', (event) => {
         const targetedElement = this.findElementByTarget(event.target);
         if (targetedElement) {
-          targetedElement.applyResize(event);
+          targetedElement.applyResize(event, this.scale);
 
           if (this.connections.connectionsNeedUpdate(targetedElement) && this.moveableActionCallback) {
             this.moveableActionCallback(true);
@@ -507,7 +643,20 @@ export class Scene {
             targetedElement.tempConstraint = undefined;
           }
 
-          targetedElement.setPlacementFromConstraint();
+          targetedElement.setPlacementFromConstraint(undefined, undefined, this.scale);
+
+          // re-add the selected element to the snappable guidelines
+          if (this.moveable && this.moveable.elementGuidelines) {
+            this.moveable.elementGuidelines.push(event.target);
+          }
+        }
+      })
+      .on('resizeGroupEnd', (e) => {
+        // re-add the selected elements to the snappable guidelines
+        if (this.moveable && this.moveable.elementGuidelines) {
+          for (let event of e.events) {
+            this.moveable.elementGuidelines.push(event.target);
+          }
         }
       });
 
@@ -522,6 +671,20 @@ export class Scene {
         return;
       }
 
+      // If selected target is a vertex, eject to handle vertex event
+      if (selectedTarget.id === CONNECTION_VERTEX_ID) {
+        this.connections.handleVertexDragStart(selectedTarget);
+        event.stop();
+        return;
+      }
+
+      // If selected target is an add vertex point, eject to handle add vertex event
+      if (selectedTarget.id === CONNECTION_VERTEX_ADD_ID) {
+        this.connections.handleVertexAddDragStart(selectedTarget);
+        event.stop();
+        return;
+      }
+
       const isTargetMoveableElement =
         this.moveable!.isMoveableElement(selectedTarget) ||
         targets.some((target) => target === selectedTarget || target.contains(selectedTarget));
@@ -642,17 +805,20 @@ export class Scene {
   };
 
   render() {
-    const canShowContextMenu = this.isPanelEditing || (!this.isPanelEditing && this.isEditingEnabled);
     const isTooltipValid = (this.tooltip?.element?.data?.links?.length ?? 0) > 0;
     const canShowElementTooltip = !this.isEditingEnabled && isTooltipValid;
 
-    return (
+    const sceneDiv = (
       <div key={this.revId} className={this.styles.wrap} style={this.style} ref={this.setRef}>
         {this.connections.render()}
         {this.root.render()}
-        {canShowContextMenu && (
+        {this.isEditingEnabled && (
           <Portal>
-            <CanvasContextMenu scene={this} panel={this.panel} />
+            <CanvasContextMenu
+              scene={this}
+              panel={this.panel}
+              onVisibilityChange={this.contextMenuOnVisibilityChange}
+            />
           </Portal>
         )}
         {canShowElementTooltip && (
@@ -662,6 +828,12 @@ export class Scene {
         )}
       </div>
     );
+
+    return config.featureToggles.canvasPanelPanZoom ? (
+      <SceneTransformWrapper scene={this}>{sceneDiv}</SceneTransformWrapper>
+    ) : (
+      sceneDiv
+    );
   }
 }
 
diff --git a/public/app/features/canvas/types.ts b/public/app/features/canvas/types.ts
index fbed99846007e..ff378e6d35e98 100644
--- a/public/app/features/canvas/types.ts
+++ b/public/app/features/canvas/types.ts
@@ -1,5 +1,5 @@
 import { LinkModel } from '@grafana/data/src';
-import { ColorDimensionConfig, TextDimensionConfig } from '@grafana/schema';
+import { ColorDimensionConfig, ResourceDimensionConfig, TextDimensionConfig } from '@grafana/schema';
 import {
   BackgroundImageSize,
   Constraint,
@@ -48,16 +48,20 @@ export interface TextConfig {
   valign: VAlign;
 }
 
-export interface EllipseConfig extends TextConfig {
+export interface CanvasElementConfig extends TextConfig {
   backgroundColor?: ColorDimensionConfig;
+  backgroundImage?: ResourceDimensionConfig;
+  backgroundSize?: BackgroundImageSize;
   borderColor?: ColorDimensionConfig;
-  width?: number;
+  borderWidth?: number;
 }
 
-export interface EllipseData extends TextData {
+export interface CanvasElementData extends TextData {
   backgroundColor?: string;
+  backgroundImage?: string;
+  backgroundSize?: string;
   borderColor?: string;
-  width?: number;
+  borderWidth?: number;
 }
 
 export interface StandardEditorConfig {
diff --git a/public/app/features/commandPalette/CommandPalette.tsx b/public/app/features/commandPalette/CommandPalette.tsx
index 93427ae8b08e4..a1e36d3a20b4d 100644
--- a/public/app/features/commandPalette/CommandPalette.tsx
+++ b/public/app/features/commandPalette/CommandPalette.tsx
@@ -16,7 +16,7 @@ import React, { useEffect, useMemo, useRef } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
-import { Icon, Spinner, useStyles2 } from '@grafana/ui';
+import { EmptyState, Icon, LoadingBar, useStyles2 } from '@grafana/ui';
 import { t } from 'app/core/internationalization';
 
 import { KBarResults } from './KBarResults';
@@ -58,14 +58,17 @@ export function CommandPalette() {
           <FocusScope contain autoFocus restoreFocus>
             <div {...overlayProps} {...dialogProps}>
               <div className={styles.searchContainer}>
-                {isFetchingSearchResults ? <Spinner className={styles.spinner} /> : <Icon name="search" size="md" />}
+                <Icon name="search" size="md" />
                 <KBarSearch
                   defaultPlaceholder={t('command-palette.search-box.placeholder', 'Search or jump to...')}
                   className={styles.search}
                 />
+                <div className={styles.loadingBarContainer}>
+                  {isFetchingSearchResults && <LoadingBar width={500} delay={0} />}
+                </div>
               </div>
               <div className={styles.resultsContainer}>
-                <RenderResults searchResults={searchResults} />
+                <RenderResults isFetchingSearchResults={isFetchingSearchResults} searchResults={searchResults} />
               </div>
             </div>
           </FocusScope>
@@ -76,10 +79,11 @@ export function CommandPalette() {
 }
 
 interface RenderResultsProps {
+  isFetchingSearchResults: boolean;
   searchResults: CommandPaletteAction[];
 }
 
-const RenderResults = ({ searchResults }: RenderResultsProps) => {
+const RenderResults = ({ isFetchingSearchResults, searchResults }: RenderResultsProps) => {
   const { results: kbarResults, rootActionId } = useMatches();
   const styles = useStyles2(getSearchStyles);
   const dashboardsSectionTitle = t('command-palette.section.dashboard-search-results', 'Dashboards');
@@ -114,7 +118,11 @@ const RenderResults = ({ searchResults }: RenderResultsProps) => {
     return results;
   }, [kbarResults, dashboardsSectionTitle, dashboardResultItems, foldersSectionTitle, folderResultItems]);
 
-  return (
+  const showEmptyState = !isFetchingSearchResults && items.length === 0;
+
+  return showEmptyState ? (
+    <EmptyState variant="not-found" message={t('command-palette.empty-state.message', 'No results found')} />
+  ) : (
     <KBarResults
       items={items}
       maxHeight={650}
@@ -161,6 +169,12 @@ const getSearchStyles = (theme: GrafanaTheme2) => {
       overflow: 'hidden',
       boxShadow: theme.shadows.z3,
     }),
+    loadingBarContainer: css({
+      position: 'absolute',
+      left: 0,
+      right: 0,
+      bottom: 0,
+    }),
     searchContainer: css({
       alignItems: 'center',
       background: theme.components.input.background,
@@ -168,6 +182,7 @@ const getSearchStyles = (theme: GrafanaTheme2) => {
       display: 'flex',
       gap: theme.spacing(1),
       padding: theme.spacing(1, 2),
+      position: 'relative',
     }),
     search: css({
       fontSize: theme.typography.fontSize,
diff --git a/public/app/features/commandPalette/KBarResults.tsx b/public/app/features/commandPalette/KBarResults.tsx
index 7dc0fa1409a2c..af01165f0b4ba 100644
--- a/public/app/features/commandPalette/KBarResults.tsx
+++ b/public/app/features/commandPalette/KBarResults.tsx
@@ -3,6 +3,8 @@ import { usePointerMovedSinceMount } from 'kbar/lib/utils';
 import * as React from 'react';
 import { useVirtual } from 'react-virtual';
 
+import { URLCallback } from './types';
+
 // From https://github.com/timc1/kbar/blob/main/src/KBarResults.tsx
 // TODO: Go back to KBarResults from kbar when https://github.com/timc1/kbar/issues/281 is fixed
 // Remember to remove dependency on react-virtual when removing this file
@@ -157,7 +159,7 @@ export const KBarResults = (props: KBarResultsProps) => {
         {rowVirtualizer.virtualItems.map((virtualRow) => {
           // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
           const item = itemsRef.current[virtualRow.index] as ActionImpl & {
-            url?: string;
+            url?: string | URLCallback;
             target?: React.HTMLAttributeAnchorTarget;
           };
 
@@ -202,7 +204,7 @@ export const KBarResults = (props: KBarResultsProps) => {
             return (
               <a
                 key={virtualRow.index}
-                href={url}
+                href={typeof url === 'function' ? url(search) : url}
                 target={target}
                 // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
                 ref={active ? (activeRef as React.RefObject<HTMLAnchorElement>) : null}
diff --git a/public/app/features/commandPalette/ResultItem.tsx b/public/app/features/commandPalette/ResultItem.tsx
index 544781a39d14b..97fecceb6ddcd 100644
--- a/public/app/features/commandPalette/ResultItem.tsx
+++ b/public/app/features/commandPalette/ResultItem.tsx
@@ -94,7 +94,8 @@ const getResultItemStyles = (theme: GrafanaTheme2) => {
         bottom: 0,
         width: theme.spacing(0.5),
         borderRadius: theme.shape.radius.default,
-        backgroundImage: theme.colors.gradients.brandVertical,
+        // Psiphon change - add Psiphon orange as active highlight color
+        background: theme.colors.psiphon.psiphonOrangeLight,
       },
     }),
     actionContainer: css({
diff --git a/public/app/features/commandPalette/actions/dashboardActions.test.ts b/public/app/features/commandPalette/actions/dashboardActions.test.ts
index cb96ea07581a8..efea227dc109d 100644
--- a/public/app/features/commandPalette/actions/dashboardActions.test.ts
+++ b/public/app/features/commandPalette/actions/dashboardActions.test.ts
@@ -87,7 +87,7 @@ describe('dashboardActions', () => {
           {
             id: 'recent-dashboards/my-dashboard-1',
             name: 'My dashboard 1',
-            priority: 5,
+            priority: 6,
             section: 'Recent dashboards',
             url: '/my-dashboard-1',
           },
diff --git a/public/app/features/commandPalette/actions/dashboardActions.ts b/public/app/features/commandPalette/actions/dashboardActions.ts
index be10a89d11c05..342d78e973018 100644
--- a/public/app/features/commandPalette/actions/dashboardActions.ts
+++ b/public/app/features/commandPalette/actions/dashboardActions.ts
@@ -8,7 +8,7 @@ import impressionSrv from 'app/core/services/impression_srv';
 import { getGrafanaSearcher } from 'app/features/search/service';
 
 import { CommandPaletteAction } from '../types';
-import { RECENT_DASHBOARDS_PRORITY, SEARCH_RESULTS_PRORITY } from '../values';
+import { RECENT_DASHBOARDS_PRIORITY, SEARCH_RESULTS_PRIORITY } from '../values';
 
 const MAX_SEARCH_RESULTS = 100;
 const MAX_RECENT_DASHBOARDS = 5;
@@ -41,7 +41,7 @@ export async function getRecentDashboardActions(): Promise<CommandPaletteAction[
       id: `recent-dashboards${url}`,
       name: `${name}`,
       section: t('command-palette.section.recent-dashboards', 'Recent dashboards'),
-      priority: RECENT_DASHBOARDS_PRORITY,
+      priority: RECENT_DASHBOARDS_PRIORITY,
       url,
     };
   });
@@ -70,7 +70,7 @@ export async function getSearchResultActions(searchQuery: string): Promise<Comma
         kind === 'dashboard'
           ? t('command-palette.section.dashboard-search-results', 'Dashboards')
           : t('command-palette.section.folder-search-results', 'Folders'),
-      priority: SEARCH_RESULTS_PRORITY,
+      priority: SEARCH_RESULTS_PRIORITY,
       url,
       subtitle: data.view.dataFrame.meta?.custom?.locationInfo[location]?.name,
     };
diff --git a/public/app/features/commandPalette/actions/extensionActions.ts b/public/app/features/commandPalette/actions/extensionActions.ts
new file mode 100644
index 0000000000000..c3df191e0213a
--- /dev/null
+++ b/public/app/features/commandPalette/actions/extensionActions.ts
@@ -0,0 +1,22 @@
+import { PluginExtensionCommandPaletteContext, PluginExtensionPoints } from '@grafana/data';
+import { getPluginLinkExtensions } from '@grafana/runtime';
+
+import { CommandPaletteAction } from '../types';
+import { EXTENSIONS_PRIORITY } from '../values';
+
+export default function getExtensionActions(): CommandPaletteAction[] {
+  const context: PluginExtensionCommandPaletteContext = {};
+  const { extensions } = getPluginLinkExtensions({
+    extensionPointId: PluginExtensionPoints.CommandPalette,
+    context,
+    limitPerPlugin: 3,
+  });
+  return extensions.map((extension) => ({
+    section: extension.category ?? 'Extensions',
+    priority: EXTENSIONS_PRIORITY,
+    id: extension.id,
+    name: extension.title,
+    target: extension.path,
+    perform: () => extension.onClick && extension.onClick(),
+  }));
+}
diff --git a/public/app/features/commandPalette/actions/staticActions.ts b/public/app/features/commandPalette/actions/staticActions.ts
index d7dd4abd9538c..c1516b77bfa44 100644
--- a/public/app/features/commandPalette/actions/staticActions.ts
+++ b/public/app/features/commandPalette/actions/staticActions.ts
@@ -1,10 +1,13 @@
 import { NavModelItem } from '@grafana/data';
 import { enrichHelpItem } from 'app/core/components/AppChrome/MegaMenu/utils';
 import { t } from 'app/core/internationalization';
-import { changeTheme } from 'app/core/services/theme';
+// Psiphon change - comment out unused imports due to theme change removal
+//import { changeTheme } from 'app/core/services/theme';
 
 import { CommandPaletteAction } from '../types';
-import { ACTIONS_PRIORITY, DEFAULT_PRIORITY, PREFERENCES_PRIORITY } from '../values';
+import { ACTIONS_PRIORITY, DEFAULT_PRIORITY /*PREFERENCES_PRIORITY*/ } from '../values';
+
+import getExtensionActions from './extensionActions';
 
 // TODO: Clean this once ID is mandatory on nav items
 function idForNavItem(navItem: NavModelItem) {
@@ -20,13 +23,25 @@ function navTreeToActions(navTree: NavModelItem[], parents: NavModelItem[] = [])
       navItem = enrichHelpItem({ ...navItem });
       delete navItem.url;
     }
-    const { url, target, text, isCreateAction, children, onClick } = navItem;
+    const { url, target, text, isCreateAction, children, onClick, keywords } = navItem;
     const hasChildren = Boolean(children?.length);
 
     if (!(url || onClick || hasChildren)) {
       continue;
     }
 
+    let urlOrCallback: CommandPaletteAction['url'] = url;
+    if (
+      url &&
+      (navItem.id === 'connections-add-new-connection' ||
+        navItem.id === 'standalone-plugin-page-/connections/add-new-connection')
+    ) {
+      urlOrCallback = (searchQuery: string) => {
+        const matchingKeyword = keywords?.find((keyword) => keyword.toLowerCase().includes(searchQuery.toLowerCase()));
+        return matchingKeyword ? `${url}?search=${matchingKeyword}` : url;
+      };
+    }
+
     const section = isCreateAction
       ? t('command-palette.section.actions', 'Actions')
       : t('command-palette.section.pages', 'Pages');
@@ -37,12 +52,13 @@ function navTreeToActions(navTree: NavModelItem[], parents: NavModelItem[] = [])
     const action: CommandPaletteAction = {
       id: idForNavItem(navItem),
       name: text,
-      section: section,
-      url,
+      section,
+      url: urlOrCallback,
       target,
       parent: parents.length > 0 && !isCreateAction ? idForNavItem(parents[parents.length - 1]) : undefined,
       perform: onClick,
-      priority: priority,
+      keywords: keywords?.join(' '),
+      priority,
       subtitle: isCreateAction ? undefined : subtitle,
     };
 
@@ -59,32 +75,35 @@ function navTreeToActions(navTree: NavModelItem[], parents: NavModelItem[] = [])
 
 export default (navBarTree: NavModelItem[]): CommandPaletteAction[] => {
   const globalActions: CommandPaletteAction[] = [
-    {
-      id: 'preferences/theme',
-      name: t('command-palette.action.change-theme', 'Change theme...'),
-      keywords: 'interface color dark light',
-      section: t('command-palette.section.preferences', 'Preferences'),
-      priority: PREFERENCES_PRIORITY,
-    },
-    {
-      id: 'preferences/dark-theme',
-      name: t('command-palette.action.dark-theme', 'Dark'),
-      keywords: 'dark theme',
-      perform: () => changeTheme('dark'),
-      parent: 'preferences/theme',
-      priority: PREFERENCES_PRIORITY,
-    },
-    {
-      id: 'preferences/light-theme',
-      name: t('command-palette.action.light-theme', 'Light'),
-      keywords: 'light theme',
-      perform: () => changeTheme('light'),
-      parent: 'preferences/theme',
-      priority: PREFERENCES_PRIORITY,
-    },
+    // Psiphon change - remove theme change option from command palette because we are not
+    // supporting dark theme
+    // {
+    //   id: 'preferences/theme',
+    //   name: t('command-palette.action.change-theme', 'Change theme...'),
+    //   keywords: 'interface color dark light',
+    //   section: t('command-palette.section.preferences', 'Preferences'),
+    //   priority: PREFERENCES_PRIORITY,
+    // },
+    // {
+    //   id: 'preferences/dark-theme',
+    //   name: t('command-palette.action.dark-theme', 'Dark'),
+    //   keywords: 'dark theme',
+    //   perform: () => changeTheme('dark'),
+    //   parent: 'preferences/theme',
+    //   priority: PREFERENCES_PRIORITY,
+    // },
+    // {
+    //   id: 'preferences/light-theme',
+    //   name: t('command-palette.action.light-theme', 'Light'),
+    //   keywords: 'light theme',
+    //   perform: () => changeTheme('light'),
+    //   parent: 'preferences/theme',
+    //   priority: PREFERENCES_PRIORITY,
+    // },
   ];
 
+  const extensionActions = getExtensionActions();
   const navBarActions = navTreeToActions(navBarTree);
 
-  return [...globalActions, ...navBarActions];
+  return [...globalActions, ...extensionActions, ...navBarActions];
 };
diff --git a/public/app/features/commandPalette/actions/useActions.ts b/public/app/features/commandPalette/actions/useActions.ts
index a3895f694cade..19e83721171cb 100644
--- a/public/app/features/commandPalette/actions/useActions.ts
+++ b/public/app/features/commandPalette/actions/useActions.ts
@@ -11,11 +11,8 @@ export default function useActions(searchQuery: string) {
   const [navTreeActions, setNavTreeActions] = useState<CommandPaletteAction[]>([]);
   const [recentDashboardActions, setRecentDashboardActions] = useState<CommandPaletteAction[]>([]);
 
-  const { navBarTree } = useSelector((state) => {
-    return {
-      navBarTree: state.navBarTree,
-    };
-  });
+  const navBarTree = useSelector((state) => state.navBarTree);
+
   // Load standard static actions
   useEffect(() => {
     const staticActionsResp = getStaticActions(navBarTree);
diff --git a/public/app/features/commandPalette/types.ts b/public/app/features/commandPalette/types.ts
index 564d691928df3..20f66a8d9f285 100644
--- a/public/app/features/commandPalette/types.ts
+++ b/public/app/features/commandPalette/types.ts
@@ -6,16 +6,18 @@ type NotNullable<T> = Exclude<T, null | undefined>;
 // Parent actions require a section, but not child actions
 export type CommandPaletteAction = RootCommandPaletteAction | ChildCommandPaletteAction;
 
+export type URLCallback = (searchQuery: string) => string;
+
 type RootCommandPaletteAction = Omit<Action, 'parent'> & {
   section: NotNullable<Action['section']>;
   priority: NotNullable<Action['priority']>;
   target?: React.HTMLAttributeAnchorTarget;
-  url?: string;
+  url?: string | URLCallback;
 };
 
 type ChildCommandPaletteAction = Action & {
   parent: NotNullable<Action['parent']>;
   priority: NotNullable<Action['priority']>;
   target?: React.HTMLAttributeAnchorTarget;
-  url?: string;
+  url?: string | URLCallback;
 };
diff --git a/public/app/features/commandPalette/useMatches.ts b/public/app/features/commandPalette/useMatches.ts
index 7c0456325c5d1..50926b10b80d2 100644
--- a/public/app/features/commandPalette/useMatches.ts
+++ b/public/app/features/commandPalette/useMatches.ts
@@ -210,9 +210,9 @@ function useInternalMatches(filtered: ActionImpl[], search: string): Match[] {
     } else {
       const termCount = ufuzzy.split(throttledSearch).length;
       const infoThresh = Infinity;
-      const oooSearch = termCount < 5;
+      const oooLimit = termCount < 5 ? 4 : 0;
 
-      const [, info, order] = ufuzzy.search(haystack, throttledSearch, oooSearch, infoThresh);
+      const [, info, order] = ufuzzy.search(haystack, throttledSearch, oooLimit, infoThresh);
 
       if (info && order) {
         for (let orderIndex = 0; orderIndex < order.length; orderIndex++) {
diff --git a/public/app/features/commandPalette/values.ts b/public/app/features/commandPalette/values.ts
index 48c30d0a93c3a..88abd798f199b 100644
--- a/public/app/features/commandPalette/values.ts
+++ b/public/app/features/commandPalette/values.ts
@@ -1,5 +1,6 @@
-export const RECENT_DASHBOARDS_PRORITY = 5;
-export const ACTIONS_PRIORITY = 4;
-export const DEFAULT_PRIORITY = 3;
-export const PREFERENCES_PRIORITY = 2;
-export const SEARCH_RESULTS_PRORITY = 1; // Dynamic actions should be below static ones so the list doesn't 'jump' when they come in
+export const RECENT_DASHBOARDS_PRIORITY = 6;
+export const ACTIONS_PRIORITY = 5;
+export const DEFAULT_PRIORITY = 4;
+export const PREFERENCES_PRIORITY = 3;
+export const EXTENSIONS_PRIORITY = 2;
+export const SEARCH_RESULTS_PRIORITY = 1; // Dynamic actions should be below static ones so the list doesn't 'jump' when they come in
diff --git a/public/app/features/connections/Connections.test.tsx b/public/app/features/connections/Connections.test.tsx
index 1eae465d76165..c246c7f6630ab 100644
--- a/public/app/features/connections/Connections.test.tsx
+++ b/public/app/features/connections/Connections.test.tsx
@@ -64,7 +64,7 @@ describe('Connections', () => {
 
     // We expect to see no results and "Data sources" as a header (we only have data sources in OSS Grafana at this point)
     expect(await screen.findByText('Data sources')).toBeVisible();
-    expect(await screen.findByText('No results matching your query were found.')).toBeVisible();
+    expect(await screen.findByText('No results matching your query were found')).toBeVisible();
   });
 
   test('does not render anything for the "Add new connection" page in case it is displayed by a standalone plugin page', async () => {
@@ -97,6 +97,6 @@ describe('Connections', () => {
 
     // We expect not to see the text that would be rendered by the core "Add new connection" page
     expect(screen.queryByText('Data sources')).not.toBeInTheDocument();
-    expect(screen.queryByText('No results matching your query were found.')).not.toBeInTheDocument();
+    expect(screen.queryByText('No results matching your query were found')).not.toBeInTheDocument();
   });
 });
diff --git a/public/app/features/connections/__mocks__/store.navIndex.mock.ts b/public/app/features/connections/__mocks__/store.navIndex.mock.ts
index 99ba0cd4fca73..1deead6feb3d1 100644
--- a/public/app/features/connections/__mocks__/store.navIndex.mock.ts
+++ b/public/app/features/connections/__mocks__/store.navIndex.mock.ts
@@ -157,7 +157,7 @@ export const navIndex: NavIndex = {
       },
       {
         id: 'alert',
-        text: 'Create alert rule',
+        text: 'New alert rule',
         subTitle: 'Create an alert rule',
         icon: 'plus',
         url: '/alerting/new',
@@ -215,7 +215,7 @@ export const navIndex: NavIndex = {
   },
   alert: {
     id: 'alert',
-    text: 'Create alert rule',
+    text: 'New alert rule',
     subTitle: 'Create an alert rule',
     icon: 'plus',
     url: '/alerting/new',
@@ -490,7 +490,7 @@ export const navIndex: NavIndex = {
   monitoring: {
     id: 'monitoring',
     text: 'Observability',
-    subTitle: 'Monitoring and infrastructure apps',
+    subTitle: 'Out-of-the-box observability solutions',
     icon: 'heart-rate',
     url: '/monitoring',
     sortWeight: -900,
diff --git a/public/app/features/connections/pages/EditDataSourcePage.tsx b/public/app/features/connections/pages/EditDataSourcePage.tsx
index 28221e47e8a84..bc4053609d750 100644
--- a/public/app/features/connections/pages/EditDataSourcePage.tsx
+++ b/public/app/features/connections/pages/EditDataSourcePage.tsx
@@ -1,31 +1,13 @@
 import * as React from 'react';
 import { useLocation, useParams } from 'react-router-dom';
 
-import { config } from '@grafana/runtime';
-import { Page } from 'app/core/components/Page/Page';
 import DataSourceTabPage from 'app/features/datasources/components/DataSourceTabPage';
-import { EditDataSource } from 'app/features/datasources/components/EditDataSource';
-import { EditDataSourceActions } from 'app/features/datasources/components/EditDataSourceActions';
-
-import { useDataSourceSettingsNav } from '../hooks/useDataSourceSettingsNav';
 
 export function EditDataSourcePage() {
   const { uid } = useParams<{ uid: string }>();
   const location = useLocation();
   const params = new URLSearchParams(location.search);
   const pageId = params.get('page');
-  const dataSourcePageHeader = config.featureToggles.dataSourcePageHeader;
-  const { navId, pageNav } = useDataSourceSettingsNav();
-
-  if (dataSourcePageHeader) {
-    return <DataSourceTabPage uid={uid} pageId={pageId} />;
-  }
 
-  return (
-    <Page navId={navId} pageNav={pageNav} actions={<EditDataSourceActions uid={uid} />}>
-      <Page.Contents>
-        <EditDataSource uid={uid} pageId={pageId} />
-      </Page.Contents>
-    </Page>
-  );
+  return <DataSourceTabPage uid={uid} pageId={pageId} />;
 }
diff --git a/public/app/features/connections/tabs/ConnectData/CardGrid/CardGrid.tsx b/public/app/features/connections/tabs/ConnectData/CardGrid/CardGrid.tsx
index 211cb81e4ac22..23f45f749b9cd 100644
--- a/public/app/features/connections/tabs/ConnectData/CardGrid/CardGrid.tsx
+++ b/public/app/features/connections/tabs/ConnectData/CardGrid/CardGrid.tsx
@@ -2,8 +2,7 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Card, useStyles2 } from '@grafana/ui';
-import { Grid } from '@grafana/ui/src/unstable';
+import { Card, Grid, useStyles2 } from '@grafana/ui';
 import { PluginAngularBadge } from 'app/features/plugins/admin/components/Badges';
 
 const getStyles = (theme: GrafanaTheme2) => ({
diff --git a/public/app/features/connections/tabs/ConnectData/ConnectData.test.tsx b/public/app/features/connections/tabs/ConnectData/ConnectData.test.tsx
index 4d8b2ad70123b..2b18442fcf32d 100644
--- a/public/app/features/connections/tabs/ConnectData/ConnectData.test.tsx
+++ b/public/app/features/connections/tabs/ConnectData/ConnectData.test.tsx
@@ -1,12 +1,12 @@
-import { fireEvent, render, RenderResult, screen, waitFor } from '@testing-library/react';
+import { render, RenderResult, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
-import { Provider } from 'react-redux';
+import { TestProvider } from 'test/helpers/TestProvider';
 
 import { PluginType } from '@grafana/data';
 import { contextSrv } from 'app/core/core';
 import { getCatalogPluginMock, getPluginsStateMock } from 'app/features/plugins/admin/__mocks__';
 import { CatalogPlugin } from 'app/features/plugins/admin/types';
-import { configureStore } from 'app/store/configureStore';
 import { AccessControlAction } from 'app/types';
 
 import { AddNewConnection } from './ConnectData';
@@ -14,13 +14,10 @@ import { AddNewConnection } from './ConnectData';
 jest.mock('app/features/datasources/api');
 
 const renderPage = (plugins: CatalogPlugin[] = []): RenderResult => {
-  // @ts-ignore
-  const store = configureStore({ plugins: getPluginsStateMock(plugins) });
-
   return render(
-    <Provider store={store}>
+    <TestProvider storeState={{ plugins: getPluginsStateMock(plugins) }}>
       <AddNewConnection />
-    </Provider>
+    </TestProvider>
   );
 };
 
@@ -30,8 +27,6 @@ const mockCatalogDataSourcePlugin = getCatalogPluginMock({
   id: 'sample-data-source',
 });
 
-const originalHasPermission = contextSrv.hasPermission;
-
 describe('Angular badge', () => {
   test('does not show angular badge for non-angular plugins', async () => {
     renderPage([
@@ -65,20 +60,16 @@ describe('Angular badge', () => {
 });
 
 describe('Add new connection', () => {
-  beforeEach(() => {
-    contextSrv.hasPermission = originalHasPermission;
-  });
-
   test('renders no results if the plugins list is empty', async () => {
     renderPage();
 
-    expect(screen.queryByText('No results matching your query were found.')).toBeInTheDocument();
+    expect(screen.queryByText('No results matching your query were found')).toBeInTheDocument();
   });
 
   test('renders no results if there is no data source plugin in the list', async () => {
     renderPage([getCatalogPluginMock()]);
 
-    expect(screen.queryByText('No results matching your query were found.')).toBeInTheDocument();
+    expect(screen.queryByText('No results matching your query were found')).toBeInTheDocument();
   });
 
   test('renders only data source plugins when list is populated', async () => {
@@ -91,15 +82,19 @@ describe('Add new connection', () => {
     renderPage([getCatalogPluginMock(), mockCatalogDataSourcePlugin]);
     const searchField = await screen.findByRole('textbox');
 
-    fireEvent.change(searchField, { target: { value: 'ampl' } });
+    await userEvent.type(searchField, 'ampl');
     expect(await screen.findByText('Sample data source')).toBeVisible();
 
-    fireEvent.change(searchField, { target: { value: 'cramp' } });
-    expect(screen.queryByText('No results matching your query were found.')).toBeInTheDocument();
+    await userEvent.clear(searchField);
+    await userEvent.type(searchField, 'cramp');
+    expect(screen.queryByText('No results matching your query were found')).toBeInTheDocument();
+
+    await userEvent.clear(searchField);
+    expect(await screen.findByText('Sample data source')).toBeVisible();
   });
 
   test('shows a "No access" modal if the user does not have permissions to create datasources', async () => {
-    (contextSrv.hasPermission as jest.Mock) = jest.fn().mockImplementation((permission: string) => {
+    jest.spyOn(contextSrv, 'hasPermission').mockImplementation((permission: string) => {
       if (permission === AccessControlAction.DataSourcesCreate) {
         return false;
       }
@@ -114,21 +109,7 @@ describe('Add new connection', () => {
     expect(screen.queryByText(new RegExp(exampleSentenceInModal))).not.toBeInTheDocument();
 
     // Should show the modal if the user has no permissions
-    fireEvent.click(await screen.findByText('Sample data source'));
+    await userEvent.click(await screen.findByText('Sample data source'));
     expect(screen.queryByText(new RegExp(exampleSentenceInModal))).toBeInTheDocument();
   });
-
-  test('does not show a "No access" modal but displays the details page if the user has the right permissions', async () => {
-    (contextSrv.hasPermission as jest.Mock) = jest.fn().mockReturnValue(true);
-
-    renderPage([getCatalogPluginMock(), mockCatalogDataSourcePlugin]);
-    const exampleSentenceInModal = 'Editors cannot add new connections.';
-
-    // Should not show the modal by default
-    expect(screen.queryByText(new RegExp(exampleSentenceInModal))).not.toBeInTheDocument();
-
-    // Should not show the modal when clicking a card
-    fireEvent.click(await screen.findByText('Sample data source'));
-    expect(screen.queryByText(new RegExp(exampleSentenceInModal))).not.toBeInTheDocument();
-  });
 });
diff --git a/public/app/features/connections/tabs/ConnectData/ConnectData.tsx b/public/app/features/connections/tabs/ConnectData/ConnectData.tsx
index a9335668c6c18..ef8b788f2eb02 100644
--- a/public/app/features/connections/tabs/ConnectData/ConnectData.tsx
+++ b/public/app/features/connections/tabs/ConnectData/ConnectData.tsx
@@ -1,9 +1,10 @@
 import { css } from '@emotion/css';
 import React, { useMemo, useState } from 'react';
 
-import { PluginType } from '@grafana/data';
-import { useStyles2, LoadingPlaceholder } from '@grafana/ui';
+import { GrafanaTheme2, PluginType } from '@grafana/data';
+import { useStyles2, LoadingPlaceholder, EmptyState } from '@grafana/ui';
 import { contextSrv } from 'app/core/core';
+import { useQueryParams } from 'app/core/hooks/useQueryParams';
 import { t } from 'app/core/internationalization';
 import { useGetAll } from 'app/features/plugins/admin/state/hooks';
 import { AccessControlAction } from 'app/types';
@@ -13,30 +14,32 @@ import { ROUTES } from '../../constants';
 import { CardGrid, type CardGridItem } from './CardGrid';
 import { CategoryHeader } from './CategoryHeader';
 import { NoAccessModal } from './NoAccessModal';
-import { NoResults } from './NoResults';
 import { Search } from './Search';
 
-const getStyles = () => ({
-  spacer: css`
-    height: 16px;
-  `,
-  modal: css`
-    width: 500px;
-  `,
-  modalContent: css`
-    overflow: visible;
-  `,
+const getStyles = (theme: GrafanaTheme2) => ({
+  spacer: css({
+    height: theme.spacing(2),
+  }),
+  modal: css({
+    width: '500px',
+  }),
+  modalContent: css({
+    overflow: 'visible',
+  }),
 });
 
 export function AddNewConnection() {
-  const [searchTerm, setSearchTerm] = useState('');
+  const [queryParams, setQueryParams] = useQueryParams();
+  const searchTerm = queryParams.search ? String(queryParams.search) : '';
   const [isNoAccessModalOpen, setIsNoAccessModalOpen] = useState(false);
   const [focusedItem, setFocusedItem] = useState<CardGridItem | null>(null);
   const styles = useStyles2(getStyles);
   const canCreateDataSources = contextSrv.hasPermission(AccessControlAction.DataSourcesCreate);
 
   const handleSearchChange = (e: React.FormEvent<HTMLInputElement>) => {
-    setSearchTerm(e.currentTarget.value.toLowerCase());
+    setQueryParams({
+      search: e.currentTarget.value.toLowerCase(),
+    });
   };
 
   const { error, plugins, isLoading } = useGetAll({
@@ -82,7 +85,7 @@ export function AddNewConnection() {
   return (
     <>
       {focusedItem && <NoAccessModal item={focusedItem} isOpen={isNoAccessModalOpen} onDismiss={closeModal} />}
-      <Search onChange={handleSearchChange} />
+      <Search onChange={handleSearchChange} value={searchTerm} />
       {/* We need this extra spacing when there are no filters */}
       <div className={styles.spacer} />
       <CategoryHeader iconName="database" label={categoryHeaderLabel} />
@@ -93,7 +96,12 @@ export function AddNewConnection() {
       ) : (
         <CardGrid items={cardGridItems} onClickItem={onClickCardGridItem} />
       )}
-      {showNoResults && <NoResults />}
+      {showNoResults && (
+        <EmptyState
+          variant="not-found"
+          message={t('connections.connect-data.empty-message', 'No results matching your query were found')}
+        />
+      )}
     </>
   );
 }
diff --git a/public/app/features/connections/tabs/ConnectData/NoResults/NoResults.tsx b/public/app/features/connections/tabs/ConnectData/NoResults/NoResults.tsx
deleted file mode 100644
index 43501a5bd47bb..0000000000000
--- a/public/app/features/connections/tabs/ConnectData/NoResults/NoResults.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { css } from '@emotion/css';
-import React from 'react';
-
-import { useStyles2 } from '@grafana/ui';
-
-const getStyles = () => ({
-  noResults: css`
-    text-align: center;
-    padding: 50px 0;
-    font-style: italic;
-  `,
-});
-
-export const NoResults = () => {
-  const styles = useStyles2(getStyles);
-
-  return <p className={styles.noResults}>No results matching your query were found.</p>;
-};
diff --git a/public/app/features/connections/tabs/ConnectData/NoResults/index.tsx b/public/app/features/connections/tabs/ConnectData/NoResults/index.tsx
deleted file mode 100644
index 20eae4db4b645..0000000000000
--- a/public/app/features/connections/tabs/ConnectData/NoResults/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export * from './NoResults';
diff --git a/public/app/features/connections/tabs/ConnectData/Search/Search.tsx b/public/app/features/connections/tabs/ConnectData/Search/Search.tsx
index 626f3b1435027..bddb9f0579f33 100644
--- a/public/app/features/connections/tabs/ConnectData/Search/Search.tsx
+++ b/public/app/features/connections/tabs/ConnectData/Search/Search.tsx
@@ -1,33 +1,42 @@
 import { css } from '@emotion/css';
-import React, { FC } from 'react';
+import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { Icon, Input, useStyles2 } from '@grafana/ui';
 import { t } from 'app/core/internationalization';
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  searchContainer: css`
-    display: flex;
-    margin: 16px 0;
-    justify-content: space-between;
+  searchContainer: css({
+    display: 'flex',
+    justifyContent: 'space-between',
 
-    position: sticky;
-    top: 0;
-    background-color: ${theme.colors.background.primary};
-    z-index: 2;
-    padding: ${theme.spacing(2)};
-    margin: 0 -${theme.spacing(2)};
-  `,
+    position: 'sticky',
+    top: 0,
+    backgroundColor: theme.colors.background.primary,
+    zIndex: 2,
+    padding: theme.spacing(2, 0),
+  }),
 });
 
 const placeholder = t('connections.search.placeholder', 'Search all');
 
-export const Search: FC<{ onChange: (e: React.FormEvent<HTMLInputElement>) => void }> = ({ onChange }) => {
+export interface Props {
+  onChange: (e: React.FormEvent<HTMLInputElement>) => void;
+  value: string | undefined;
+}
+
+export const Search = ({ onChange, value }: Props) => {
   const styles = useStyles2(getStyles);
 
   return (
     <div className={styles.searchContainer}>
-      <Input onChange={onChange} prefix={<Icon name="search" />} placeholder={placeholder} aria-label="Search all" />
+      <Input
+        value={value}
+        onChange={onChange}
+        prefix={<Icon name="search" />}
+        placeholder={placeholder}
+        aria-label="Search all"
+      />
     </div>
   );
 };
diff --git a/public/app/features/correlations/CorrelationsPage.test.tsx b/public/app/features/correlations/CorrelationsPage.test.tsx
index 478b13ee1b77a..f127acf5b0a9d 100644
--- a/public/app/features/correlations/CorrelationsPage.test.tsx
+++ b/public/app/features/correlations/CorrelationsPage.test.tsx
@@ -1,4 +1,4 @@
-import { render, waitFor, screen, fireEvent, within, Matcher, getByRole } from '@testing-library/react';
+import { render, waitFor, screen, within, Matcher, getByRole } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { merge, uniqueId } from 'lodash';
 import React from 'react';
@@ -9,6 +9,7 @@ import { MockDataSourceApi } from 'test/mocks/datasource_srv';
 import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
 
 import { DataSourcePluginMeta, SupportedTransformationType } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import { BackendSrv, setDataSourceSrv, BackendSrvRequest, reportInteraction } from '@grafana/runtime';
 import { contextSrv } from 'app/core/services/context_srv';
 import { configureStore } from 'app/store/configureStore';
@@ -270,13 +271,13 @@ describe('CorrelationsPage', () => {
 
       // step 2:
       // set target datasource picker value
-      fireEvent.keyDown(screen.getByLabelText(/^target/i), { keyCode: 40 });
+      await userEvent.click(screen.getByLabelText(/^target/i));
       await userEvent.click(screen.getByText('prometheus'));
       await userEvent.click(await screen.findByRole('button', { name: /next$/i }));
 
       // step 3:
       // set source datasource picker value
-      fireEvent.keyDown(screen.getByLabelText(/^source/i), { keyCode: 40 });
+      await userEvent.click(screen.getByLabelText(/^source/i));
       await userEvent.click(screen.getByText('loki'));
       await userEvent.click(await screen.findByRole('button', { name: /add$/i }));
 
@@ -427,14 +428,16 @@ describe('CorrelationsPage', () => {
 
       // step 2:
       // set target datasource picker value
-      fireEvent.keyDown(screen.getByLabelText(/^target/i), { keyCode: 40 });
+      await userEvent.click(screen.getByLabelText(/^target/i));
       await userEvent.click(screen.getByText('elastic'));
       await userEvent.click(await screen.findByRole('button', { name: /next$/i }));
 
       // step 3:
       // set source datasource picker value
-      fireEvent.keyDown(screen.getByLabelText(/^source/i), { keyCode: 40 });
-      await userEvent.click(within(screen.getByLabelText('Select options menu')).getByText('prometheus'));
+      await userEvent.click(screen.getByLabelText(/^source/i));
+      await userEvent.click(
+        within(screen.getByTestId(selectors.components.DataSourcePicker.dataSourceList)).getByText('prometheus')
+      );
 
       await userEvent.clear(screen.getByRole('textbox', { name: /results field/i }));
       await userEvent.type(screen.getByRole('textbox', { name: /results field/i }), 'Line');
@@ -538,7 +541,7 @@ describe('CorrelationsPage', () => {
 
       // select Regex, be sure expression field is not disabled and contains the former expression
       openMenu(typeFilterSelect[0]);
-      await userEvent.click(screen.getByText('Regular expression', { selector: 'span' }));
+      await userEvent.click(screen.getByText('Regular expression'));
       expressionInput = screen.queryByLabelText(/expression/i);
       expect(expressionInput).toBeInTheDocument();
       expect(expressionInput).toBeEnabled();
@@ -554,7 +557,8 @@ describe('CorrelationsPage', () => {
       await userEvent.click(screen.getByRole('button', { name: /add transformation/i }));
       typeFilterSelect = screen.getAllByLabelText('Type');
       openMenu(typeFilterSelect[0]);
-      await userEvent.click(screen.getByText('Regular expression'));
+      const menu = await screen.findByLabelText('Select options menu');
+      await userEvent.click(within(menu).getByText('Regular expression'));
       expressionInput = screen.queryByLabelText(/expression/i);
       expect(expressionInput).toBeInTheDocument();
       expect(expressionInput).toBeEnabled();
diff --git a/public/app/features/correlations/Forms/ConfigureCorrelationBasicInfoForm.tsx b/public/app/features/correlations/Forms/ConfigureCorrelationBasicInfoForm.tsx
index 7cd8fd739dea5..fdf12eca0941d 100644
--- a/public/app/features/correlations/Forms/ConfigureCorrelationBasicInfoForm.tsx
+++ b/public/app/features/correlations/Forms/ConfigureCorrelationBasicInfoForm.tsx
@@ -4,6 +4,7 @@ import { useFormContext } from 'react-hook-form';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { Field, FieldSet, Input, TextArea, useStyles2 } from '@grafana/ui';
+import { Trans, t } from 'app/core/internationalization';
 
 import { useCorrelationsFormContext } from './correlationsFormContext';
 import { FormDTO } from './types';
@@ -25,27 +26,40 @@ export const ConfigureCorrelationBasicInfoForm = () => {
 
   return (
     <>
-      <FieldSet label="Define correlation label (Step 1 of 3)">
-        <p>Define text that will describe the correlation.</p>
+      <FieldSet label={t('correlations.basic-info-form.title', 'Define correlation label (Step 1 of 3)')}>
+        <Trans i18nKey="correlations.basic-info-form.sub-text">
+          <p>Define text that will describe the correlation.</p>
+        </Trans>
         <input type="hidden" {...register('config.type')} />
         <Field
-          label="Label"
-          description="This name will be used as the label for the correlation. This will show as button text, a menu item, or hover text on a link."
+          label={t('correlations.basic-info-form.label-label', 'Label')}
+          description={t(
+            'correlations.basic-info-form.label-description',
+            'This name will be used as the label for the correlation. This will show as button text, a menu item, or hover text on a link.'
+          )}
           className={styles.label}
           invalid={!!formState.errors.label}
           error={formState.errors.label?.message}
         >
           <Input
             id={getInputId('label', correlation)}
-            {...register('label', { required: { value: true, message: 'This field is required.' } })}
+            {...register('label', {
+              required: {
+                value: true,
+                message: t('correlations.basic-info-form.label-required', 'This field is required.'),
+              },
+            })}
             readOnly={readOnly}
-            placeholder="e.g. Tempo traces"
+            placeholder={t('correlations.basic-info-form.label-placeholder', 'e.g. Tempo traces')}
           />
         </Field>
 
         <Field
-          label="Description"
-          description="Optional description with more information about the link"
+          label={t('correlations.basic-info-form.description-label', 'Description')}
+          description={t(
+            'correlations.basic-info-form.description-description',
+            'Optional description with more information about the link'
+          )}
           // the Field component automatically adds margin to itself, so we are forced to workaround it by overriding  its styles
           className={cx(styles.description)}
         >
diff --git a/public/app/features/correlations/Forms/ConfigureCorrelationSourceForm.tsx b/public/app/features/correlations/Forms/ConfigureCorrelationSourceForm.tsx
index a76c5a2f0eaad..f62050a187436 100644
--- a/public/app/features/correlations/Forms/ConfigureCorrelationSourceForm.tsx
+++ b/public/app/features/correlations/Forms/ConfigureCorrelationSourceForm.tsx
@@ -4,6 +4,7 @@ import { Controller, useFormContext } from 'react-hook-form';
 
 import { DataSourceInstanceSettings, GrafanaTheme2 } from '@grafana/data';
 import { Card, Field, FieldSet, Input, useStyles2 } from '@grafana/ui';
+import { Trans, t } from 'app/core/internationalization';
 import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker';
 import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
 
@@ -11,6 +12,7 @@ import { getVariableUsageInfo } from '../../explore/utils/links';
 
 import { TransformationsEditor } from './TransformationsEditor';
 import { useCorrelationsFormContext } from './correlationsFormContext';
+import { FormDTO } from './types';
 import { getInputId } from './utils';
 
 const getStyles = (theme: GrafanaTheme2) => ({
@@ -24,7 +26,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
 });
 
 export const ConfigureCorrelationSourceForm = () => {
-  const { control, formState, register, getValues } = useFormContext();
+  const { control, formState, register, getValues } = useFormContext<FormDTO>();
   const styles = useStyles2(getStyles);
   const withDsUID = (fn: Function) => (ds: DataSourceInstanceSettings) => fn(ds.uid);
 
@@ -34,26 +36,52 @@ export const ConfigureCorrelationSourceForm = () => {
   const variables = getVariableUsageInfo(currentTargetQuery, {}).variables.map(
     (variable) => variable.variableName + (variable.fieldPath ? `.${variable.fieldPath}` : '')
   );
+
+  function VariableList() {
+    return (
+      <>
+        {variables.map((name, i) => (
+          <span className={styles.variable} key={i}>
+            {name}
+            {i < variables.length - 1 ? ', ' : ''}
+          </span>
+        ))}
+      </>
+    );
+  }
+
+  const dataSourceName = getDatasourceSrv().getInstanceSettings(correlation?.targetUID)?.name;
   return (
     <>
       <FieldSet
-        label={`Configure the data source that will link to ${getDatasourceSrv().getInstanceSettings(
-          correlation?.targetUID
-        )?.name} (Step 3 of 3)`}
+        label={t(
+          'correlations.source-form.title',
+          'Configure the data source that will link to {{dataSourceName}} (Step 3 of 3)',
+          { dataSourceName }
+        )}
       >
-        <p>
-          Define what data source will display the correlation, and what data will replace previously defined variables.
-        </p>
+        <Trans i18nKey="correlations.source-form.sub-text">
+          <p>
+            Define what data source will display the correlation, and what data will replace previously defined
+            variables.
+          </p>
+        </Trans>
         <Controller
           control={control}
           name="sourceUID"
           rules={{
-            required: { value: true, message: 'This field is required.' },
+            required: {
+              value: true,
+              message: t('correlations.source-form.control-required', 'This field is required.'),
+            },
           }}
           render={({ field: { onChange, value } }) => (
             <Field
-              label="Source"
-              description="Results from selected source data source have links displayed in the panel"
+              label={t('correlations.source-form.source-label', 'Source')}
+              description={t(
+                'correlations.source-form.source-description',
+                'Results from selected source data source have links displayed in the panel'
+              )}
               htmlFor="source"
               invalid={!!formState.errors.sourceUID}
               error={formState.errors.sourceUID?.message}
@@ -71,34 +99,37 @@ export const ConfigureCorrelationSourceForm = () => {
         />
 
         <Field
-          label="Results field"
-          description="The link will be shown next to the value of this field"
+          label={t('correlations.source-form.results-label', 'Results field')}
+          description={t(
+            'correlations.source-form.results-description',
+            'The link will be shown next to the value of this field'
+          )}
           className={styles.label}
           invalid={!!formState.errors?.config?.field}
           error={formState.errors?.config?.field?.message}
         >
           <Input
             id={getInputId('field', correlation)}
-            {...register('config.field', { required: 'This field is required.' })}
+            {...register('config.field', {
+              required: t('correlations.source-form.results-required', 'This field is required.'),
+            })}
             readOnly={readOnly}
           />
         </Field>
         {variables.length > 0 && (
           <Card>
-            <Card.Heading>Variables used in the target query</Card.Heading>
+            <Card.Heading>
+              <Trans i18nKey="correlations.source-form.heading">Variables used in the target query</Trans>
+            </Card.Heading>
             <Card.Description>
-              You have used following variables in the target query:{' '}
-              {variables.map((name, i) => (
-                <span className={styles.variable} key={i}>
-                  {name}
-                  {i < variables.length - 1 ? ', ' : ''}
-                </span>
-              ))}
-              <br />A data point needs to provide values to all variables as fields or as transformations output to make
-              the correlation button appear in the visualization.
-              <br />
-              Note: Not every variable needs to be explicitly defined below. A transformation such as{' '}
-              <span className={styles.variable}>logfmt</span> will create variables for every key/value pair.
+              <Trans i18nKey="correlations.source-form.description">
+                You have used following variables in the target query: <VariableList />
+                <br />A data point needs to provide values to all variables as fields or as transformations output to
+                make the correlation button appear in the visualization.
+                <br />
+                Note: Not every variable needs to be explicitly defined below. A transformation such as{' '}
+                <span className={styles.variable}>logfmt</span> will create variables for every key/value pair.
+              </Trans>
             </Card.Description>
           </Card>
         )}
diff --git a/public/app/features/correlations/Forms/ConfigureCorrelationTargetForm.tsx b/public/app/features/correlations/Forms/ConfigureCorrelationTargetForm.tsx
index 9b66bea2a4ba3..f8f4c59104f62 100644
--- a/public/app/features/correlations/Forms/ConfigureCorrelationTargetForm.tsx
+++ b/public/app/features/correlations/Forms/ConfigureCorrelationTargetForm.tsx
@@ -3,31 +3,41 @@ import { Controller, useFormContext, useWatch } from 'react-hook-form';
 
 import { DataSourceInstanceSettings } from '@grafana/data';
 import { Field, FieldSet } from '@grafana/ui';
+import { Trans, t } from 'app/core/internationalization';
 import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker';
 
 import { QueryEditorField } from './QueryEditorField';
 import { useCorrelationsFormContext } from './correlationsFormContext';
+import { FormDTO } from './types';
 
 export const ConfigureCorrelationTargetForm = () => {
-  const { control, formState } = useFormContext();
+  const { control, formState } = useFormContext<FormDTO>();
   const withDsUID = (fn: Function) => (ds: DataSourceInstanceSettings) => fn(ds.uid);
   const { correlation } = useCorrelationsFormContext();
   const targetUID: string | undefined = useWatch({ name: 'targetUID' }) || correlation?.targetUID;
 
   return (
     <>
-      <FieldSet label="Setup the target for the correlation (Step 2 of 3)">
-        <p>
-          Define what data source the correlation will link to, and what query will run when the correlation is clicked.
-        </p>
+      <FieldSet label={t('correlations.target-form.title', 'Setup the target for the correlation (Step 2 of 3)')}>
+        <Trans i18nKey="correlations.target-form.sub-text">
+          <p>
+            Define what data source the correlation will link to, and what query will run when the correlation is
+            clicked.
+          </p>
+        </Trans>
         <Controller
           control={control}
           name="targetUID"
-          rules={{ required: { value: true, message: 'This field is required.' } }}
+          rules={{
+            required: { value: true, message: t('correlations.target-form.control-rules', 'This field is required.') },
+          }}
           render={({ field: { onChange, value } }) => (
             <Field
-              label="Target"
-              description="Specify which data source is queried when the link is clicked"
+              label={t('correlations.target-form.target-label', 'Target')}
+              description={t(
+                'correlations.target-form.target-description',
+                'Specify which data source is queried when the link is clicked'
+              )}
               htmlFor="target"
               invalid={!!formState.errors.targetUID}
               error={formState.errors.targetUID?.message}
diff --git a/public/app/features/correlations/Forms/CorrelationFormNavigation.tsx b/public/app/features/correlations/Forms/CorrelationFormNavigation.tsx
index fb08aa8d671e2..831e3a61260cd 100644
--- a/public/app/features/correlations/Forms/CorrelationFormNavigation.tsx
+++ b/public/app/features/correlations/Forms/CorrelationFormNavigation.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 
 import { Button, HorizontalGroup } from '@grafana/ui';
+import { Trans, t } from 'app/core/internationalization';
 
 import { useWizardContext } from '../components/Wizard/wizardContext';
 
@@ -12,13 +13,15 @@ export const CorrelationFormNavigation = () => {
 
   const LastPageNext = !readOnly && (
     <Button variant="primary" icon={loading ? 'spinner' : 'save'} type="submit" disabled={loading}>
-      {correlation === undefined ? 'Add' : 'Save'}
+      {correlation === undefined
+        ? t('correlations.navigation-form.add-button', 'Add')
+        : t('correlations.navigation-form.save-button', 'Save')}
     </Button>
   );
 
   const NextPage = (
     <Button variant="primary" type="submit">
-      Next
+      <Trans i18nKey="correlations.navigation-form.next-button">Next</Trans>
     </Button>
   );
 
@@ -26,7 +29,7 @@ export const CorrelationFormNavigation = () => {
     <HorizontalGroup justify="flex-start">
       {currentPage > 0 ? (
         <Button variant="secondary" onClick={prevPage}>
-          Back
+          <Trans i18nKey="correlations.navigation-form.back-button">Back</Trans>
         </Button>
       ) : undefined}
 
diff --git a/public/app/features/correlations/Forms/QueryEditorField.tsx b/public/app/features/correlations/Forms/QueryEditorField.tsx
index f246c4fc93e6b..b4cb893b1aea1 100644
--- a/public/app/features/correlations/Forms/QueryEditorField.tsx
+++ b/public/app/features/correlations/Forms/QueryEditorField.tsx
@@ -5,6 +5,7 @@ import { useAsync } from 'react-use';
 import { CoreApp } from '@grafana/data';
 import { getDataSourceSrv } from '@grafana/runtime';
 import { Field, LoadingPlaceholder, Alert } from '@grafana/ui';
+import { Trans, t } from 'app/core/internationalization';
 
 interface Props {
   dsUid?: string;
@@ -29,18 +30,20 @@ export const QueryEditorField = ({ dsUid, invalid, error, name }: Props) => {
 
   return (
     <Field
-      label="Query"
+      label={t('correlations.query-editor.query-label', 'Query')}
       description={
         <span>
-          Define the query that is run when the link is clicked. You can use{' '}
-          <a
-            href="https://grafana.com/docs/grafana/latest/panels-visualizations/configure-data-links/"
-            target="_blank"
-            rel="noreferrer"
-          >
-            variables
-          </a>{' '}
-          to access specific field values.
+          <Trans i18nKey="correlations.query-editor.query-description">
+            Define the query that is run when the link is clicked. You can use{' '}
+            <a
+              href="https://grafana.com/docs/grafana/latest/panels-visualizations/configure-data-links/"
+              target="_blank"
+              rel="noreferrer"
+            >
+              variables
+            </a>{' '}
+            to access specific field values.
+          </Trans>
         </span>
       }
       invalid={invalid}
@@ -51,25 +54,44 @@ export const QueryEditorField = ({ dsUid, invalid, error, name }: Props) => {
         rules={{
           validate: {
             hasQueryEditor: () =>
-              QueryEditor !== undefined || 'The selected target data source must export a query editor.',
+              QueryEditor !== undefined ||
+              t(
+                'correlations.query-editor.control-rules',
+                'The selected target data source must export a query editor.'
+              ),
           },
         }}
         render={({ field: { value, onChange } }) => {
           if (dsLoading) {
-            return <LoadingPlaceholder text="Loading query editor..." />;
+            return <LoadingPlaceholder text={t('correlations.query-editor.loading', 'Loading query editor...')} />;
           }
           if (dsError) {
-            return <Alert title="Error loading data source">The selected data source could not be loaded.</Alert>;
+            return (
+              <Alert title={t('correlations.query-editor.error-title', 'Error loading data source')}>
+                <Trans i18nKey="correlations.query-editor.error-text">
+                  The selected data source could not be loaded.
+                </Trans>
+              </Alert>
+            );
           }
           if (!datasource) {
             return (
-              <Alert title="No data source selected" severity="info">
-                Please select a target data source first.
+              <Alert
+                title={t('correlations.query-editor.data-source-title', 'No data source selected')}
+                severity="info"
+              >
+                <Trans i18nKey="correlations.query-editor.data-source-text">
+                  Please select a target data source first.
+                </Trans>
               </Alert>
             );
           }
           if (!QueryEditor) {
-            return <Alert title="Data source does not export a query editor."></Alert>;
+            return (
+              <Alert
+                title={t('correlations.query-editor.query-editor-title', 'Data source does not export a query editor.')}
+              ></Alert>
+            );
           }
           return (
             <>
diff --git a/public/app/features/correlations/Forms/TransformationEditorRow.tsx b/public/app/features/correlations/Forms/TransformationEditorRow.tsx
new file mode 100644
index 0000000000000..8c549c8709f7e
--- /dev/null
+++ b/public/app/features/correlations/Forms/TransformationEditorRow.tsx
@@ -0,0 +1,224 @@
+import { css } from '@emotion/css';
+import React, { useState } from 'react';
+import { useFormContext, useWatch } from 'react-hook-form';
+
+import { Field, Icon, IconButton, Input, Label, Select, Stack, Tooltip, useStyles2 } from '@grafana/ui';
+import { Trans, t } from 'app/core/internationalization';
+
+import { FormDTO, getSupportedTransTypeDetails, getTransformOptions } from './types';
+type Props = {
+  index: number;
+  value: Record<string, string>;
+  readOnly: boolean;
+  remove: (index?: number | number[]) => void;
+};
+
+const getStyles = () => ({
+  // set fixed position from the top instead of centring as the container
+  // may get bigger when the for is invalid
+  removeButton: css({
+    marginTop: '25px',
+  }),
+});
+
+const TransformationEditorRow = (props: Props) => {
+  const { index, value: defaultValue, readOnly, remove } = props;
+  const { control, formState, register, setValue, watch, getValues } = useFormContext<FormDTO>();
+
+  const [keptVals, setKeptVals] = useState<{ expression?: string; mapValue?: string }>({});
+
+  register(`config.transformations.${index}.type`, {
+    required: {
+      value: true,
+      message: t('correlations.transform-row.transform-required', 'Please select a transformation type'),
+    },
+  });
+  const typeValue = useWatch({ name: `config.transformations.${index}.type`, control });
+
+  const styles = useStyles2(getStyles);
+
+  const transformOptions = getTransformOptions();
+
+  return (
+    <Stack direction="row" key={defaultValue.id} alignItems="flex-start">
+      <Field
+        label={
+          <Stack gap={0.5}>
+            <Label htmlFor={`config.transformations.${defaultValue.id}-${index}.type`}>
+              <Trans i18nKey="correlations.transform-row.type-label">Type</Trans>
+            </Label>
+            <Tooltip
+              content={
+                <div>
+                  <p>
+                    <Trans i18nKey="correlations.transform-row.type-tooltip">
+                      The type of transformation that will be applied to the source data.
+                    </Trans>
+                  </p>
+                </div>
+              }
+            >
+              <Icon name="info-circle" size="sm" />
+            </Tooltip>
+          </Stack>
+        }
+        invalid={!!formState.errors?.config?.transformations?.[index]?.type}
+        error={formState.errors?.config?.transformations?.[index]?.message}
+        validationMessageHorizontalOverflow={true}
+      >
+        <Select
+          value={typeValue}
+          onChange={(value) => {
+            if (!readOnly) {
+              const currentValues = getValues()?.config?.transformations?.[index];
+              if (currentValues) {
+                setKeptVals({
+                  expression: currentValues.expression,
+                  mapValue: currentValues.mapValue,
+                });
+              }
+              if (value.value) {
+                const newValueDetails = getSupportedTransTypeDetails(value.value);
+
+                if (newValueDetails.expressionDetails.show) {
+                  setValue(`config.transformations.${index}.expression`, keptVals?.expression || '');
+                } else {
+                  setValue(`config.transformations.${index}.expression`, '');
+                }
+
+                if (newValueDetails.mapValueDetails.show) {
+                  setValue(`config.transformations.${index}.mapValue`, keptVals?.mapValue || '');
+                } else {
+                  setValue(`config.transformations.${index}.mapValue`, '');
+                }
+
+                setValue(`config.transformations.${index}.type`, value.value);
+              }
+            }
+          }}
+          options={transformOptions}
+          width={25}
+          inputId={`config.transformations.${defaultValue.id}-${index}.type`}
+        />
+      </Field>
+      <Field
+        label={
+          <Stack gap={0.5}>
+            <Label htmlFor={`config.transformations.${defaultValue.id}.field`}>
+              <Trans i18nKey="correlations.transform-row.field-label">Field</Trans>
+            </Label>
+            <Tooltip
+              content={
+                <div>
+                  <p>
+                    <Trans i18nKey="correlations.transform-row.field-tooltip">
+                      Optional. The field to transform. If not specified, the transformation will be applied to the
+                      results field.
+                    </Trans>
+                  </p>
+                </div>
+              }
+            >
+              <Icon name="info-circle" size="sm" />
+            </Tooltip>
+          </Stack>
+        }
+      >
+        <Input
+          {...register(`config.transformations.${index}.field`)}
+          readOnly={readOnly}
+          defaultValue={defaultValue.field}
+          label={t('correlations.transform-row.field-input', 'field')}
+          id={`config.transformations.${defaultValue.id}.field`}
+        />
+      </Field>
+      <Field
+        label={
+          <Stack gap={0.5}>
+            <Label htmlFor={`config.transformations.${defaultValue.id}.expression`}>
+              <Trans i18nKey="correlations.transform-row.expression-label">Expression</Trans>
+              {getSupportedTransTypeDetails(watch(`config.transformations.${index}.type`)).expressionDetails.required
+                ? ' *'
+                : ''}
+            </Label>
+            <Tooltip
+              content={
+                <div>
+                  <p>
+                    <Trans i18nKey="correlations.transform-row.expression-tooltip">
+                      Required for regular expression. The expression the transformation will use. Logfmt does not use
+                      further specifications.
+                    </Trans>
+                  </p>
+                </div>
+              }
+            >
+              <Icon name="info-circle" size="sm" />
+            </Tooltip>
+          </Stack>
+        }
+        invalid={!!formState.errors?.config?.transformations?.[index]?.expression}
+        error={formState.errors?.config?.transformations?.[index]?.expression?.message}
+      >
+        <Input
+          {...register(`config.transformations.${index}.expression`, {
+            required: getSupportedTransTypeDetails(watch(`config.transformations.${index}.type`)).expressionDetails
+              .required
+              ? t('correlations.transform-row.expression-required', 'Please define an expression')
+              : undefined,
+          })}
+          defaultValue={defaultValue.expression}
+          readOnly={readOnly}
+          disabled={!getSupportedTransTypeDetails(watch(`config.transformations.${index}.type`)).expressionDetails.show}
+          id={`config.transformations.${defaultValue.id}.expression`}
+        />
+      </Field>
+      <Field
+        label={
+          <Stack gap={0.5}>
+            <Label htmlFor={`config.transformations.${defaultValue.id}.mapValue`}>
+              <Trans i18nKey="correlations.transform-row.map-value-label">Map value</Trans>
+            </Label>
+            <Tooltip
+              content={
+                <div>
+                  <p>
+                    <Trans i18nKey="correlations.transform-row.map-value-tooltip">
+                      Optional. Defines the name of the variable. This is currently only valid for regular expressions
+                      with a single, unnamed capture group.
+                    </Trans>
+                  </p>
+                </div>
+              }
+            >
+              <Icon name="info-circle" size="sm" />
+            </Tooltip>
+          </Stack>
+        }
+      >
+        <Input
+          {...register(`config.transformations.${index}.mapValue`)}
+          defaultValue={defaultValue.mapValue}
+          readOnly={readOnly}
+          disabled={!getSupportedTransTypeDetails(watch(`config.transformations.${index}.type`)).mapValueDetails.show}
+          id={`config.transformations.${defaultValue.id}.mapValue`}
+        />
+      </Field>
+      {!readOnly && (
+        <div className={styles.removeButton}>
+          <IconButton
+            tooltip={t('correlations.transform-row.remove-tooltip', 'Remove transformation')}
+            name="trash-alt"
+            onClick={() => {
+              remove(index);
+            }}
+          >
+            <Trans i18nKey="correlations.transform-row.remove-button">Remove</Trans>
+          </IconButton>
+        </div>
+      )}
+    </Stack>
+  );
+};
+
+export default TransformationEditorRow;
diff --git a/public/app/features/correlations/Forms/TransformationsEditor.tsx b/public/app/features/correlations/Forms/TransformationsEditor.tsx
index 3f8117381372c..3d83c43126dec 100644
--- a/public/app/features/correlations/Forms/TransformationsEditor.tsx
+++ b/public/app/features/correlations/Forms/TransformationsEditor.tsx
@@ -1,313 +1,56 @@
-import { css } from '@emotion/css';
-import { compact, fill } from 'lodash';
-import React, { useState } from 'react';
-import { useFormContext } from 'react-hook-form';
+import React from 'react';
+import { useFormContext, useFieldArray } from 'react-hook-form';
 
-import { GrafanaTheme2, SupportedTransformationType } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import {
-  Button,
-  Field,
-  FieldArray,
-  Icon,
-  IconButton,
-  Input,
-  InputControl,
-  Label,
-  Select,
-  Tooltip,
-  useStyles2,
-} from '@grafana/ui';
+import { Button, Stack, Text } from '@grafana/ui';
+import { Trans } from 'app/core/internationalization';
 
-type Props = { readOnly: boolean };
+import TransformationsEditorRow from './TransformationEditorRow';
 
-const getStyles = (theme: GrafanaTheme2) => ({
-  heading: css`
-    font-size: ${theme.typography.h5.fontSize};
-    font-weight: ${theme.typography.fontWeightRegular};
-  `,
-  // set fixed position from the top instead of centring as the container
-  // may get bigger when the for is invalid
-  removeButton: css`
-    margin-top: 25px;
-  `,
-});
+type Props = { readOnly: boolean };
 
 export const TransformationsEditor = (props: Props) => {
-  const { control, formState, register, setValue, watch, getValues } = useFormContext();
+  const { control, register } = useFormContext();
+  const { fields, append, remove } = useFieldArray({ control, name: 'config.transformations' });
   const { readOnly } = props;
-  const [keptVals, setKeptVals] = useState<Array<{ expression?: string; mapValue?: string }>>([]);
 
-  const styles = useStyles2(getStyles);
-
-  const transformOptions = getTransformOptions();
   return (
     <>
       <input type="hidden" {...register('id')} />
-      <FieldArray name="config.transformations" control={control}>
-        {({ fields, append, remove }) => (
-          <>
-            <Stack direction="column" alignItems="flex-start">
-              <div className={styles.heading}>Transformations</div>
-              {fields.length === 0 && <div> No transformations defined.</div>}
-              {fields.length > 0 && (
-                <div>
-                  {fields.map((fieldVal, index) => {
-                    return (
-                      <Stack direction="row" key={fieldVal.id} alignItems="top">
-                        <Field
-                          label={
-                            <Stack gap={0.5}>
-                              <Label htmlFor={`config.transformations.${fieldVal.id}-${index}.type`}>Type</Label>
-                              <Tooltip
-                                content={
-                                  <div>
-                                    <p>The type of transformation that will be applied to the source data.</p>
-                                  </div>
-                                }
-                              >
-                                <Icon name="info-circle" size="sm" />
-                              </Tooltip>
-                            </Stack>
-                          }
-                          invalid={!!formState.errors?.config?.transformations?.[index]?.type}
-                          error={formState.errors?.config?.transformations?.[index]?.type?.message}
-                          validationMessageHorizontalOverflow={true}
-                        >
-                          <InputControl
-                            render={({ field: { onChange, ref, ...field } }) => {
-                              // input control field is not manipulated with remove, use value from control
-                              return (
-                                <Select
-                                  {...field}
-                                  value={fieldVal.type}
-                                  onChange={(value) => {
-                                    if (!readOnly) {
-                                      const currentValues = getValues().config.transformations[index];
-                                      let keptValsCopy = fill(Array(index + 1), {});
-                                      keptVals.forEach((keptVal, i) => (keptValsCopy[i] = keptVal));
-                                      keptValsCopy[index] = {
-                                        expression: currentValues.expression,
-                                        mapValue: currentValues.mapValue,
-                                      };
-
-                                      setKeptVals(keptValsCopy);
-
-                                      const newValueDetails = getSupportedTransTypeDetails(value.value);
-
-                                      if (newValueDetails.showExpression) {
-                                        setValue(
-                                          `config.transformations.${index}.expression`,
-                                          keptVals[index]?.expression || ''
-                                        );
-                                      } else {
-                                        setValue(`config.transformations.${index}.expression`, '');
-                                      }
-
-                                      if (newValueDetails.showMapValue) {
-                                        setValue(
-                                          `config.transformations.${index}.mapValue`,
-                                          keptVals[index]?.mapValue || ''
-                                        );
-                                      } else {
-                                        setValue(`config.transformations.${index}.mapValue`, '');
-                                      }
-
-                                      onChange(value.value);
-                                    }
-                                  }}
-                                  options={transformOptions}
-                                  width={25}
-                                  inputId={`config.transformations.${fieldVal.id}-${index}.type`}
-                                />
-                              );
-                            }}
-                            control={control}
-                            name={`config.transformations.${index}.type`}
-                            rules={{ required: { value: true, message: 'Please select a transformation type' } }}
-                          />
-                        </Field>
-                        <Field
-                          label={
-                            <Stack gap={0.5}>
-                              <Label htmlFor={`config.transformations.${fieldVal.id}.field`}>Field</Label>
-                              <Tooltip
-                                content={
-                                  <div>
-                                    <p>
-                                      Optional. The field to transform. If not specified, the transformation will be
-                                      applied to the results field.
-                                    </p>
-                                  </div>
-                                }
-                              >
-                                <Icon name="info-circle" size="sm" />
-                              </Tooltip>
-                            </Stack>
-                          }
-                        >
-                          <Input
-                            {...register(`config.transformations.${index}.field`)}
-                            readOnly={readOnly}
-                            defaultValue={fieldVal.field}
-                            label="field"
-                            id={`config.transformations.${fieldVal.id}.field`}
-                          />
-                        </Field>
-                        <Field
-                          label={
-                            <Stack gap={0.5}>
-                              <Label htmlFor={`config.transformations.${fieldVal.id}.expression`}>
-                                Expression
-                                {getSupportedTransTypeDetails(watch(`config.transformations.${index}.type`))
-                                  .requireExpression
-                                  ? ' *'
-                                  : ''}
-                              </Label>
-                              <Tooltip
-                                content={
-                                  <div>
-                                    <p>
-                                      Required for regular expression. The expression the transformation will use.
-                                      Logfmt does not use further specifications.
-                                    </p>
-                                  </div>
-                                }
-                              >
-                                <Icon name="info-circle" size="sm" />
-                              </Tooltip>
-                            </Stack>
-                          }
-                          invalid={!!formState.errors?.config?.transformations?.[index]?.expression}
-                          error={formState.errors?.config?.transformations?.[index]?.expression?.message}
-                        >
-                          <Input
-                            {...register(`config.transformations.${index}.expression`, {
-                              required: getSupportedTransTypeDetails(watch(`config.transformations.${index}.type`))
-                                .requireExpression
-                                ? 'Please define an expression'
-                                : undefined,
-                            })}
-                            defaultValue={fieldVal.expression}
-                            readOnly={readOnly}
-                            disabled={
-                              !getSupportedTransTypeDetails(watch(`config.transformations.${index}.type`))
-                                .showExpression
-                            }
-                            id={`config.transformations.${fieldVal.id}.expression`}
-                          />
-                        </Field>
-                        <Field
-                          label={
-                            <Stack gap={0.5}>
-                              <Label htmlFor={`config.transformations.${fieldVal.id}.mapValue`}>Map value</Label>
-                              <Tooltip
-                                content={
-                                  <div>
-                                    <p>
-                                      Optional. Defines the name of the variable. This is currently only valid for
-                                      regular expressions with a single, unnamed capture group.
-                                    </p>
-                                  </div>
-                                }
-                              >
-                                <Icon name="info-circle" size="sm" />
-                              </Tooltip>
-                            </Stack>
-                          }
-                        >
-                          <Input
-                            {...register(`config.transformations.${index}.mapValue`)}
-                            defaultValue={fieldVal.mapValue}
-                            readOnly={readOnly}
-                            disabled={
-                              !getSupportedTransTypeDetails(watch(`config.transformations.${index}.type`)).showMapValue
-                            }
-                            id={`config.transformations.${fieldVal.id}.mapValue`}
-                          />
-                        </Field>
-                        {!readOnly && (
-                          <div className={styles.removeButton}>
-                            <IconButton
-                              tooltip="Remove transformation"
-                              name="trash-alt"
-                              onClick={() => {
-                                remove(index);
-                                const keptValsCopy: Array<{ expression?: string; mapValue?: string } | undefined> = [
-                                  ...keptVals,
-                                ];
-                                keptValsCopy[index] = undefined;
-                                setKeptVals(compact(keptValsCopy));
-                              }}
-                            >
-                              Remove
-                            </IconButton>
-                          </div>
-                        )}
-                      </Stack>
-                    );
-                  })}
-                </div>
-              )}
-              {!readOnly && (
-                <Button
-                  icon="plus"
-                  onClick={() => append({ type: undefined }, { shouldFocus: false })}
-                  variant="secondary"
-                  type="button"
-                >
-                  Add transformation
-                </Button>
-              )}
-            </Stack>
-          </>
+      <Stack direction="column" alignItems="flex-start">
+        <Text variant={'h5'}>
+          <Trans i18nKey="correlations.transform.heading">Transformations</Trans>
+        </Text>
+        {fields.length === 0 && (
+          <div>
+            <Trans i18nKey="correlations.transform.no-transform">No transformations defined.</Trans>
+          </div>
+        )}
+        {fields.length > 0 && (
+          <div>
+            {fields.map((fieldVal, index) => {
+              return (
+                <TransformationsEditorRow
+                  key={index}
+                  value={fieldVal}
+                  index={index}
+                  readOnly={readOnly}
+                  remove={remove}
+                />
+              );
+            })}
+          </div>
         )}
-      </FieldArray>
+        {!readOnly && (
+          <Button
+            icon="plus"
+            onClick={() => append({ type: undefined }, { shouldFocus: false })}
+            variant="secondary"
+            type="button"
+          >
+            <Trans i18nKey="correlations.transform.add-button">Add transformation</Trans>
+          </Button>
+        )}
+      </Stack>
     </>
   );
 };
-
-interface SupportedTransformationTypeDetails {
-  label: string;
-  value: string;
-  description?: string;
-  showExpression: boolean;
-  showMapValue: boolean;
-  requireExpression?: boolean;
-}
-
-function getSupportedTransTypeDetails(transType: SupportedTransformationType): SupportedTransformationTypeDetails {
-  switch (transType) {
-    case SupportedTransformationType.Logfmt:
-      return {
-        label: 'Logfmt',
-        value: SupportedTransformationType.Logfmt,
-        description: 'Parse provided field with logfmt to get variables',
-        showExpression: false,
-        showMapValue: false,
-      };
-    case SupportedTransformationType.Regex:
-      return {
-        label: 'Regular expression',
-        value: SupportedTransformationType.Regex,
-        description:
-          'Field will be parsed with regex. Use named capture groups to return multiple variables, or a single unnamed capture group to add variable to named map value.',
-        showExpression: true,
-        showMapValue: true,
-        requireExpression: true,
-      };
-    default:
-      return { label: transType, value: transType, showExpression: false, showMapValue: false };
-  }
-}
-
-const getTransformOptions = () => {
-  return Object.values(SupportedTransformationType).map((transformationType) => {
-    const transType = getSupportedTransTypeDetails(transformationType);
-    return {
-      label: transType.label,
-      value: transType.value,
-      description: transType.description,
-    };
-  });
-};
diff --git a/public/app/features/correlations/Forms/types.ts b/public/app/features/correlations/Forms/types.ts
index d3e10e581c456..a86e2c33cf1df 100644
--- a/public/app/features/correlations/Forms/types.ts
+++ b/public/app/features/correlations/Forms/types.ts
@@ -1,4 +1,5 @@
 import { SupportedTransformationType } from '@grafana/data';
+import { t } from 'app/core/internationalization';
 
 import { CorrelationConfig } from '../types';
 
@@ -17,3 +18,78 @@ export type TransformationDTO = {
   expression?: string;
   mapValue?: string;
 };
+
+export interface TransformationFieldDetails {
+  show: boolean;
+  required?: boolean;
+  helpText?: string;
+}
+
+interface SupportedTransformationTypeDetails {
+  label: string;
+  value: SupportedTransformationType;
+  description?: string;
+  expressionDetails: TransformationFieldDetails;
+  mapValueDetails: TransformationFieldDetails;
+}
+
+export function getSupportedTransTypeDetails(
+  transType: SupportedTransformationType
+): SupportedTransformationTypeDetails {
+  switch (transType) {
+    case SupportedTransformationType.Logfmt:
+      return {
+        label: t('correlations.trans-details.logfmt-label', 'Logfmt'),
+        value: SupportedTransformationType.Logfmt,
+        description: t(
+          'correlations.trans-details.logfmt-description',
+          'Parse provided field with logfmt to get variables'
+        ),
+        expressionDetails: { show: false },
+        mapValueDetails: { show: false },
+      };
+    case SupportedTransformationType.Regex:
+      return {
+        label: t('correlations.trans-details.regex-label', 'Regular expression'),
+        value: SupportedTransformationType.Regex,
+        description: t(
+          'correlations.trans-details.regex-description',
+          'Field will be parsed with regex. Use named capture groups to return multiple variables, or a single unnamed capture group to add variable to named map value. Regex is case insensitive.'
+        ),
+        expressionDetails: {
+          show: true,
+          required: true,
+          helpText: t(
+            'correlations.trans-details.regex-expression',
+            'Use capture groups to extract a portion of the field.'
+          ),
+        },
+        mapValueDetails: {
+          show: true,
+          required: false,
+          helpText: t(
+            'correlations.trans-details.regex-map-values',
+            'Defines the name of the variable if the capture group is not named.'
+          ),
+        },
+      };
+    default:
+      return {
+        label: transType,
+        value: transType,
+        expressionDetails: { show: false },
+        mapValueDetails: { show: false },
+      };
+  }
+}
+
+export const getTransformOptions = () => {
+  return Object.values(SupportedTransformationType).map((transformationType) => {
+    const transType = getSupportedTransTypeDetails(transformationType);
+    return {
+      label: transType.label,
+      value: transType.value,
+      description: transType.description,
+    };
+  });
+};
diff --git a/public/app/features/correlations/components/Wizard/types.ts b/public/app/features/correlations/components/Wizard/types.ts
index 11962faba9c9e..eec5094fd2f22 100644
--- a/public/app/features/correlations/components/Wizard/types.ts
+++ b/public/app/features/correlations/components/Wizard/types.ts
@@ -1,11 +1,11 @@
 import { ComponentType } from 'react';
-import { DeepPartial, UnpackNestedValue } from 'react-hook-form';
+import { DefaultValues } from 'react-hook-form';
 
 export type WizardProps<T> = {
   /**
    * Initial values for the form
    */
-  defaultValues?: UnpackNestedValue<DeepPartial<T>>;
+  defaultValues?: DefaultValues<T>;
 
   /**
    * List of steps/pages in the wizard.
diff --git a/public/app/features/correlations/types.ts b/public/app/features/correlations/types.ts
index 1e6ca7f1f6c70..061f94204496b 100644
--- a/public/app/features/correlations/types.ts
+++ b/public/app/features/correlations/types.ts
@@ -30,7 +30,7 @@ type CorrelationConfigType = 'query';
 
 export interface CorrelationConfig {
   field: string;
-  target: object;
+  target: object; // this contains anything that would go in the query editor, so any extension off DataQuery a datasource would have, and needs to be generic
   type: CorrelationConfigType;
   transformations?: DataLinkTransformationConfig[];
 }
@@ -42,6 +42,7 @@ export interface Correlation {
   label?: string;
   description?: string;
   provisioned: boolean;
+  orgId?: number;
   config: CorrelationConfig;
 }
 
diff --git a/public/app/features/correlations/useCorrelations.ts b/public/app/features/correlations/useCorrelations.ts
index d3a64a2903e6e..7b1a9c83c8a6c 100644
--- a/public/app/features/correlations/useCorrelations.ts
+++ b/public/app/features/correlations/useCorrelations.ts
@@ -15,6 +15,7 @@ import {
   UpdateCorrelationParams,
   UpdateCorrelationResponse,
 } from './types';
+import { correlationsLogger } from './utils';
 
 export interface CorrelationsResponse {
   correlations: Correlation[];
@@ -43,6 +44,13 @@ const toEnrichedCorrelationData = ({
   const sourceDatasource = getDataSourceSrv().getInstanceSettings(sourceUID);
   const targetDatasource = getDataSourceSrv().getInstanceSettings(targetUID);
 
+  // According to #72258 we will remove logic to handle orgId=0/null as global correlations.
+  // This logging is to check if there are any customers who did not migrate existing correlations.
+  // See Deprecation Notice in https://github.com/grafana/grafana/pull/72258 for more details
+  if (correlation?.orgId === undefined || correlation?.orgId === null || correlation?.orgId === 0) {
+    correlationsLogger.logWarning('Invalid correlation config: Missing org id.');
+  }
+
   if (
     sourceDatasource &&
     sourceDatasource?.uid !== undefined &&
@@ -55,6 +63,10 @@ const toEnrichedCorrelationData = ({
       target: targetDatasource,
     };
   } else {
+    correlationsLogger.logWarning(`Invalid correlation config: Missing source or target.`, {
+      source: JSON.stringify(sourceDatasource),
+      target: JSON.stringify(targetDatasource),
+    });
     return undefined;
   }
 };
diff --git a/public/app/features/correlations/utils.test.ts b/public/app/features/correlations/utils.test.ts
index 25b5b682a00a9..8b19bf0216420 100644
--- a/public/app/features/correlations/utils.test.ts
+++ b/public/app/features/correlations/utils.test.ts
@@ -19,6 +19,7 @@ describe('correlations utils', () => {
           datasourceUid: prometheus.uid,
           datasourceName: prometheus.name,
           query: {
+            datasource: { uid: prometheus.uid },
             expr: 'target Prometheus query',
           },
         },
@@ -29,6 +30,7 @@ describe('correlations utils', () => {
           datasourceUid: elastic.uid,
           datasourceName: elastic.name,
           query: {
+            datasource: { uid: elastic.uid },
             expr: 'target Elastic query',
           },
         },
diff --git a/public/app/features/correlations/utils.ts b/public/app/features/correlations/utils.ts
index cba91591e9263..64d4cf386b972 100644
--- a/public/app/features/correlations/utils.ts
+++ b/public/app/features/correlations/utils.ts
@@ -1,7 +1,8 @@
 import { lastValueFrom } from 'rxjs';
 
 import { DataFrame, DataLinkConfigOrigin } from '@grafana/data';
-import { getBackendSrv } from '@grafana/runtime';
+import { createMonitoringLogger, getBackendSrv, getDataSourceSrv } from '@grafana/runtime';
+import { ExploreItemState } from 'app/types';
 
 import { formatValueName } from '../explore/PrometheusListView/ItemLabels';
 
@@ -53,9 +54,10 @@ const decorateDataFrameWithInternalDataLinks = (dataFrame: DataFrame, correlatio
     field.config.links = field.config.links?.filter((link) => link.origin !== DataLinkConfigOrigin.Correlations) || [];
     correlations.map((correlation) => {
       if (correlation.config?.field === field.name) {
+        const targetQuery = correlation.config?.target || {};
         field.config.links!.push({
           internal: {
-            query: correlation.config?.target,
+            query: { ...targetQuery, datasource: { uid: correlation.target.uid } },
             datasourceUid: correlation.target.uid,
             datasourceName: correlation.target.name,
             transformations: correlation.config?.transformations,
@@ -90,3 +92,21 @@ export const createCorrelation = async (
 ): Promise<CreateCorrelationResponse> => {
   return getBackendSrv().post<CreateCorrelationResponse>(`/api/datasources/uid/${sourceUID}/correlations`, correlation);
 };
+
+const getDSInstanceForPane = async (pane: ExploreItemState) => {
+  if (pane.datasourceInstance?.meta.mixed) {
+    return await getDataSourceSrv().get(pane.queries[0].datasource);
+  } else {
+    return pane.datasourceInstance;
+  }
+};
+
+export const generateDefaultLabel = async (sourcePane: ExploreItemState, targetPane: ExploreItemState) => {
+  return Promise.all([getDSInstanceForPane(sourcePane), getDSInstanceForPane(targetPane)]).then((dsInstances) => {
+    return dsInstances[0]?.name !== undefined && dsInstances[1]?.name !== undefined
+      ? `${dsInstances[0]?.name} to ${dsInstances[1]?.name}`
+      : '';
+  });
+};
+
+export const correlationsLogger = createMonitoringLogger('features.correlations');
diff --git a/public/app/features/dashboard-scene/embedding/EmbeddedDashboard.tsx b/public/app/features/dashboard-scene/embedding/EmbeddedDashboard.tsx
new file mode 100644
index 0000000000000..14390c35a8ce9
--- /dev/null
+++ b/public/app/features/dashboard-scene/embedding/EmbeddedDashboard.tsx
@@ -0,0 +1,150 @@
+import { css, cx } from '@emotion/css';
+import React, { useEffect, useState } from 'react';
+
+import { GrafanaTheme2, urlUtil } from '@grafana/data';
+import { EmbeddedDashboardProps } from '@grafana/runtime';
+import { SceneObjectStateChangedEvent, sceneUtils } from '@grafana/scenes';
+import { Spinner, Alert, useStyles2 } from '@grafana/ui';
+import { DashboardRoutes } from 'app/types';
+
+import { getDashboardScenePageStateManager } from '../pages/DashboardScenePageStateManager';
+import { DashboardScene } from '../scene/DashboardScene';
+
+export function EmbeddedDashboard(props: EmbeddedDashboardProps) {
+  const stateManager = getDashboardScenePageStateManager();
+  const { dashboard, loadError } = stateManager.useState();
+
+  useEffect(() => {
+    stateManager.loadDashboard({ uid: props.uid!, route: DashboardRoutes.Embedded });
+    return () => {
+      stateManager.clearState();
+    };
+  }, [stateManager, props.uid]);
+
+  if (loadError) {
+    return (
+      <Alert severity="error" title="Failed to load dashboard">
+        {loadError}
+      </Alert>
+    );
+  }
+
+  if (!dashboard) {
+    return <Spinner />;
+  }
+
+  return <EmbeddedDashboardRenderer model={dashboard} {...props} />;
+}
+
+interface RendererProps extends EmbeddedDashboardProps {
+  model: DashboardScene;
+}
+
+function EmbeddedDashboardRenderer({ model, initialState, onStateChange }: RendererProps) {
+  const [isActive, setIsActive] = useState(false);
+  const { controls, body, scopes } = model.useState();
+  const styles = useStyles2(getStyles);
+
+  useEffect(() => {
+    setIsActive(true);
+
+    if (initialState) {
+      const searchParms = new URLSearchParams(initialState);
+      sceneUtils.syncStateFromSearchParams(model, searchParms);
+    }
+
+    return model.activate();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [model]);
+
+  useSubscribeToEmbeddedUrlState(onStateChange, model);
+
+  if (!isActive) {
+    return null;
+  }
+
+  return (
+    <div
+      className={cx(styles.canvas, controls && !scopes && styles.canvasWithControls, scopes && styles.canvasWithScopes)}
+    >
+      {scopes && <scopes.Component model={scopes} />}
+      {controls && (
+        <div className={cx(styles.controlsWrapper, scopes && styles.controlsWrapperWithScopes)}>
+          <controls.Component model={controls} />
+        </div>
+      )}
+      <div className={styles.body}>
+        <body.Component model={body} />
+      </div>
+    </div>
+  );
+}
+
+function useSubscribeToEmbeddedUrlState(onStateChange: ((state: string) => void) | undefined, model: DashboardScene) {
+  useEffect(() => {
+    if (!onStateChange) {
+      return;
+    }
+
+    let lastState = '';
+    const sub = model.subscribeToEvent(SceneObjectStateChangedEvent, (evt) => {
+      if (evt.payload.changedObject.urlSync) {
+        const state = sceneUtils.getUrlState(model);
+        const stateAsString = urlUtil.renderUrl('', state);
+
+        if (lastState !== stateAsString) {
+          lastState = stateAsString;
+          onStateChange(stateAsString);
+        }
+      }
+    });
+
+    return () => sub.unsubscribe();
+  }, [model, onStateChange]);
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    canvas: css({
+      label: 'canvas-content',
+      display: 'grid',
+      gridTemplateAreas: `
+        "panels"`,
+      gridTemplateColumns: `1fr`,
+      gridTemplateRows: '1fr',
+      flexBasis: '100%',
+      flexGrow: 1,
+    }),
+    canvasWithControls: css({
+      gridTemplateAreas: `
+        "controls"
+        "panels"`,
+      gridTemplateRows: 'auto 1fr',
+    }),
+    canvasWithScopes: css({
+      gridTemplateAreas: `
+        "scopes controls"
+        "panels panels"`,
+      gridTemplateColumns: `${theme.spacing(32)} 1fr`,
+      gridTemplateRows: 'auto 1fr',
+    }),
+    body: css({
+      label: 'body',
+      flexGrow: 1,
+      display: 'flex',
+      gap: '8px',
+      gridArea: 'panels',
+      marginBottom: theme.spacing(2),
+    }),
+    controlsWrapper: css({
+      display: 'flex',
+      flexDirection: 'column',
+      flexGrow: 0,
+      gridArea: 'controls',
+      padding: theme.spacing(2, 0, 2, 2),
+    }),
+    controlsWrapperWithScopes: css({
+      padding: theme.spacing(2, 0),
+    }),
+  };
+}
diff --git a/public/app/features/dashboard-scene/embedding/EmbeddedDashboardLazy.tsx b/public/app/features/dashboard-scene/embedding/EmbeddedDashboardLazy.tsx
new file mode 100644
index 0000000000000..b52299cb9bcd2
--- /dev/null
+++ b/public/app/features/dashboard-scene/embedding/EmbeddedDashboardLazy.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+
+import { EmbeddedDashboardProps } from '@grafana/runtime';
+
+export function EmbeddedDashboardLazy(props: EmbeddedDashboardProps) {
+  return <Component {...props} />;
+}
+
+const Component = React.lazy(async () => {
+  const { EmbeddedDashboard } = await import(/* webpackChunkName: "EmbeddedDashboard" */ './EmbeddedDashboard');
+  return { default: EmbeddedDashboard };
+});
diff --git a/public/app/features/dashboard-scene/embedding/EmbeddedDashboardTestPage.tsx b/public/app/features/dashboard-scene/embedding/EmbeddedDashboardTestPage.tsx
new file mode 100644
index 0000000000000..747979ea6e3b1
--- /dev/null
+++ b/public/app/features/dashboard-scene/embedding/EmbeddedDashboardTestPage.tsx
@@ -0,0 +1,24 @@
+import React, { useState } from 'react';
+
+import { PageLayoutType } from '@grafana/data';
+import { Box } from '@grafana/ui';
+import { Page } from 'app/core/components/Page/Page';
+
+import { EmbeddedDashboard } from './EmbeddedDashboard';
+
+export function EmbeddedDashboardTestPage() {
+  const [state, setState] = useState('?from=now-5m&to=now');
+
+  return (
+    <Page
+      navId="dashboards/browse"
+      pageNav={{ text: 'Embedding dashboard', subTitle: 'Showing dashboard: Panel Tests - Pie chart' }}
+      layout={PageLayoutType.Canvas}
+    >
+      <Box paddingY={2}>Internal url state: {state}</Box>
+      <EmbeddedDashboard uid="lVE-2YFMz" initialState={state} onStateChange={setState} />
+    </Page>
+  );
+}
+
+export default EmbeddedDashboardTestPage;
diff --git a/public/app/features/dashboard-scene/inspect/HelpWizard/HelpWizard.test.tsx b/public/app/features/dashboard-scene/inspect/HelpWizard/HelpWizard.test.tsx
new file mode 100644
index 0000000000000..70b6d361137d3
--- /dev/null
+++ b/public/app/features/dashboard-scene/inspect/HelpWizard/HelpWizard.test.tsx
@@ -0,0 +1,88 @@
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+
+import { FieldType, getDefaultTimeRange, LoadingState, toDataFrame } from '@grafana/data';
+import { getPanelPlugin } from '@grafana/data/test/__mocks__/pluginMocks';
+import { SceneGridLayout, SceneQueryRunner, SceneTimeRange, VizPanel, VizPanelMenu } from '@grafana/scenes';
+
+import { DashboardGridItem } from '../../scene/DashboardGridItem';
+import { DashboardScene } from '../../scene/DashboardScene';
+import { VizPanelLinks, VizPanelLinksMenu } from '../../scene/PanelLinks';
+import { panelMenuBehavior } from '../../scene/PanelMenuBehavior';
+
+import { HelpWizard } from './HelpWizard';
+
+async function setup() {
+  const { panel } = await buildTestScene();
+  panel.getPlugin = () => getPanelPlugin({ skipDataQuery: false });
+
+  return render(<HelpWizard panel={panel} onClose={() => {}} />);
+}
+describe('SupportSnapshot', () => {
+  it('Can render', async () => {
+    setup();
+    expect(await screen.findByRole('button', { name: 'Dashboard (3.50 KiB)' })).toBeInTheDocument();
+  });
+});
+
+async function buildTestScene() {
+  const menu = new VizPanelMenu({
+    $behaviors: [panelMenuBehavior],
+  });
+
+  const panel = new VizPanel({
+    title: 'Panel A',
+    pluginId: 'timeseries',
+    key: 'panel-12',
+    menu,
+    titleItems: [new VizPanelLinks({ menu: new VizPanelLinksMenu({}) })],
+    $data: new SceneQueryRunner({
+      data: {
+        state: LoadingState.Done,
+        series: [
+          toDataFrame({
+            name: 'http_requests_total',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [1, 2, 3] },
+              { name: 'Value', type: FieldType.number, values: [11, 22, 33] },
+            ],
+          }),
+        ],
+        timeRange: getDefaultTimeRange(),
+      },
+      datasource: { uid: 'my-uid' },
+      queries: [{ query: 'QueryA', refId: 'A' }],
+    }),
+  });
+
+  const scene = new DashboardScene({
+    title: 'My dashboard',
+    uid: 'dash-1',
+    tags: ['database', 'panel'],
+    $timeRange: new SceneTimeRange({
+      from: 'now-5m',
+      to: 'now',
+      timeZone: 'Africa/Abidjan',
+    }),
+    meta: {
+      canEdit: true,
+      isEmbedded: false,
+    },
+    body: new SceneGridLayout({
+      children: [
+        new DashboardGridItem({
+          key: 'griditem-1',
+          x: 0,
+          y: 0,
+          width: 10,
+          height: 12,
+          body: panel,
+        }),
+      ],
+    }),
+  });
+
+  await new Promise((r) => setTimeout(r, 1));
+
+  return { scene, panel, menu };
+}
diff --git a/public/app/features/dashboard-scene/inspect/HelpWizard/HelpWizard.tsx b/public/app/features/dashboard-scene/inspect/HelpWizard/HelpWizard.tsx
new file mode 100644
index 0000000000000..ca08356354a71
--- /dev/null
+++ b/public/app/features/dashboard-scene/inspect/HelpWizard/HelpWizard.tsx
@@ -0,0 +1,229 @@
+import { css } from '@emotion/css';
+import React, { useMemo, useEffect } from 'react';
+import AutoSizer from 'react-virtualized-auto-sizer';
+
+import { GrafanaTheme2, FeatureState } from '@grafana/data';
+import { config } from '@grafana/runtime';
+import { VizPanel } from '@grafana/scenes';
+import {
+  Drawer,
+  Tab,
+  TabsBar,
+  CodeEditor,
+  useStyles2,
+  Field,
+  HorizontalGroup,
+  InlineSwitch,
+  Button,
+  Spinner,
+  Alert,
+  FeatureBadge,
+  Select,
+  ClipboardButton,
+  Icon,
+  Stack,
+} from '@grafana/ui';
+import { contextSrv } from 'app/core/services/context_srv';
+import { AccessControlAction } from 'app/types';
+
+import { ShowMessage, SnapshotTab, SupportSnapshotService } from './SupportSnapshotService';
+
+interface Props {
+  panel: VizPanel;
+  onClose: () => void;
+}
+
+export function HelpWizard({ panel, onClose }: Props) {
+  const styles = useStyles2(getStyles);
+  const service = useMemo(() => new SupportSnapshotService(panel), [panel]);
+  const plugin = panel.getPlugin();
+
+  const {
+    currentTab,
+    loading,
+    error,
+    options,
+    showMessage,
+    snapshotSize,
+    markdownText,
+    snapshotText,
+    randomize,
+    panelTitle,
+    scene,
+  } = service.useState();
+
+  useEffect(() => {
+    service.buildDebugDashboard();
+  }, [service, plugin, randomize]);
+
+  if (!plugin) {
+    return null;
+  }
+
+  const tabs = [
+    { label: 'Snapshot', value: SnapshotTab.Support },
+    { label: 'Data', value: SnapshotTab.Data },
+  ];
+
+  const hasSupportBundleAccess =
+    config.supportBundlesEnabled && contextSrv.hasPermission(AccessControlAction.ActionSupportBundlesCreate);
+
+  return (
+    <Drawer
+      title={`Get help with this panel`}
+      size="lg"
+      onClose={onClose}
+      subtitle={
+        <Stack direction="column" gap={1}>
+          <Stack direction="row" gap={1}>
+            <FeatureBadge featureState={FeatureState.beta} />
+            <a
+              href="https://grafana.com/docs/grafana/latest/troubleshooting/"
+              target="blank"
+              className="external-link"
+              rel="noopener noreferrer"
+            >
+              Troubleshooting docs <Icon name="external-link-alt" />
+            </a>
+          </Stack>
+          <span className="muted">
+            To request troubleshooting help, send a snapshot of this panel to Grafana Labs Technical Support. The
+            snapshot contains query response data and panel settings.
+          </span>
+          {hasSupportBundleAccess && (
+            <span className="muted">
+              You can also retrieve a support bundle containing information concerning your Grafana instance and
+              configured datasources in the <a href="/support-bundles">support bundles section</a>.
+            </span>
+          )}
+        </Stack>
+      }
+      tabs={
+        <TabsBar>
+          {tabs.map((t, index) => (
+            <Tab
+              key={`${t.value}-${index}`}
+              label={t.label}
+              active={t.value === currentTab}
+              onChangeTab={() => service.onCurrentTabChange(t.value!)}
+            />
+          ))}
+        </TabsBar>
+      }
+    >
+      {loading && <Spinner />}
+      {error && <Alert title={error.title}>{error.message}</Alert>}
+
+      {currentTab === SnapshotTab.Data && (
+        <div className={styles.code}>
+          <div className={styles.opts}>
+            <Field label="Template" className={styles.field}>
+              <Select options={options} value={showMessage} onChange={service.onShowMessageChange} />
+            </Field>
+
+            {showMessage === ShowMessage.GithubComment ? (
+              <ClipboardButton icon="copy" getText={service.onGetMarkdownForClipboard}>
+                Copy to clipboard
+              </ClipboardButton>
+            ) : (
+              <Button icon="download-alt" onClick={service.onDownloadDashboard}>
+                Download ({snapshotSize})
+              </Button>
+            )}
+          </div>
+          <AutoSizer disableWidth>
+            {({ height }) => (
+              <CodeEditor
+                width="100%"
+                height={height}
+                language={showMessage === ShowMessage.GithubComment ? 'markdown' : 'json'}
+                showLineNumbers={true}
+                showMiniMap={true}
+                value={showMessage === ShowMessage.GithubComment ? markdownText : snapshotText}
+                readOnly={false}
+                onBlur={service.onSetSnapshotText}
+              />
+            )}
+          </AutoSizer>
+        </div>
+      )}
+      {currentTab === SnapshotTab.Support && (
+        <>
+          <Field
+            label="Randomize data"
+            description="Modify the original data to hide sensitve information.  Note the lengths will stay the same, and duplicate values will be equal."
+          >
+            <HorizontalGroup>
+              <InlineSwitch
+                label="Labels"
+                id="randomize-labels"
+                showLabel={true}
+                value={Boolean(randomize.labels)}
+                onChange={() => service.onToggleRandomize('labels')}
+              />
+              <InlineSwitch
+                label="Field names"
+                id="randomize-field-names"
+                showLabel={true}
+                value={Boolean(randomize.names)}
+                onChange={() => service.onToggleRandomize('names')}
+              />
+              <InlineSwitch
+                label="String values"
+                id="randomize-string-values"
+                showLabel={true}
+                value={Boolean(randomize.values)}
+                onChange={() => service.onToggleRandomize('values')}
+              />
+            </HorizontalGroup>
+          </Field>
+
+          <Field label="Support snapshot" description={`Panel: ${panelTitle}`}>
+            <Stack>
+              <Button icon="download-alt" onClick={service.onDownloadDashboard}>
+                Dashboard ({snapshotSize})
+              </Button>
+              <ClipboardButton
+                icon="github"
+                getText={service.onGetMarkdownForClipboard}
+                title="Copy a complete GitHub comment to the clipboard"
+              >
+                Copy to clipboard
+              </ClipboardButton>
+            </Stack>
+          </Field>
+
+          <AutoSizer disableWidth>
+            {({ height }) => (
+              <div style={{ height, overflow: 'auto' }}>{scene && <scene.Component model={scene} />}</div>
+            )}
+          </AutoSizer>
+        </>
+      )}
+    </Drawer>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    code: css({
+      flexGrow: 1,
+      height: '100%',
+      overflow: 'scroll',
+    }),
+    field: css({
+      width: '100%',
+    }),
+    opts: css({
+      display: 'flex',
+      width: '100%',
+      flexGrow: 0,
+      alignItems: 'center',
+      justifyContent: 'flex-end',
+
+      '& button': {
+        marginLeft: theme.spacing(1),
+      },
+    }),
+  };
+};
diff --git a/public/app/features/dashboard-scene/inspect/HelpWizard/SupportSnapshotService.test.ts b/public/app/features/dashboard-scene/inspect/HelpWizard/SupportSnapshotService.test.ts
new file mode 100644
index 0000000000000..4d1fc427cbdf1
--- /dev/null
+++ b/public/app/features/dashboard-scene/inspect/HelpWizard/SupportSnapshotService.test.ts
@@ -0,0 +1,134 @@
+import { FieldType, getDefaultTimeRange, LoadingState, toDataFrame } from '@grafana/data';
+import { SceneGridLayout, SceneQueryRunner, SceneTimeRange, VizPanel, VizPanelMenu } from '@grafana/scenes';
+
+import { DashboardGridItem } from '../../scene/DashboardGridItem';
+import { DashboardScene } from '../../scene/DashboardScene';
+import { VizPanelLinks, VizPanelLinksMenu } from '../../scene/PanelLinks';
+import { panelMenuBehavior } from '../../scene/PanelMenuBehavior';
+
+import { SnapshotTab, SupportSnapshotService } from './SupportSnapshotService';
+
+async function setup() {
+  const { panel } = await buildTestScene();
+
+  return new SupportSnapshotService(panel);
+}
+
+describe('SupportSnapshotService', () => {
+  it('Can create it with default state', async () => {
+    const service = await setup();
+    expect(service.state.currentTab).toBe(SnapshotTab.Support);
+  });
+
+  it('Can can build support snapshot dashboard', async () => {
+    const service = await setup();
+    await service.buildDebugDashboard();
+    expect(service.state.snapshot.panels[0].targets[0]).toMatchInlineSnapshot(`
+      {
+        "datasource": {
+          "type": "grafana",
+          "uid": "grafana",
+        },
+        "queryType": "snapshot",
+        "refId": "A",
+        "snapshot": [
+          {
+            "data": {
+              "values": [
+                [
+                  1,
+                  2,
+                  3,
+                ],
+                [
+                  11,
+                  22,
+                  33,
+                ],
+              ],
+            },
+            "schema": {
+              "fields": [
+                {
+                  "config": {},
+                  "name": "Time",
+                  "type": "time",
+                },
+                {
+                  "config": {},
+                  "name": "Value",
+                  "type": "number",
+                },
+              ],
+              "meta": undefined,
+              "name": "http_requests_total",
+              "refId": undefined,
+            },
+          },
+        ],
+      }
+    `);
+  });
+});
+
+async function buildTestScene() {
+  const menu = new VizPanelMenu({
+    $behaviors: [panelMenuBehavior],
+  });
+
+  const panel = new VizPanel({
+    title: 'Panel A',
+    pluginId: 'timeseries',
+    key: 'panel-12',
+    menu,
+    titleItems: [new VizPanelLinks({ menu: new VizPanelLinksMenu({}) })],
+    $data: new SceneQueryRunner({
+      data: {
+        state: LoadingState.Done,
+        series: [
+          toDataFrame({
+            name: 'http_requests_total',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [1, 2, 3] },
+              { name: 'Value', type: FieldType.number, values: [11, 22, 33] },
+            ],
+          }),
+        ],
+        timeRange: getDefaultTimeRange(),
+      },
+      datasource: { uid: 'my-uid' },
+      queries: [{ query: 'QueryA', refId: 'A' }],
+    }),
+  });
+
+  const scene = new DashboardScene({
+    title: 'My dashboard',
+    uid: 'dash-1',
+    tags: ['database', 'panel'],
+    $timeRange: new SceneTimeRange({
+      from: 'now-5m',
+      to: 'now',
+      timeZone: 'Africa/Abidjan',
+    }),
+    meta: {
+      canEdit: true,
+      isEmbedded: false,
+    },
+    body: new SceneGridLayout({
+      children: [
+        new DashboardGridItem({
+          key: 'griditem-1',
+          x: 0,
+          y: 0,
+          width: 10,
+          height: 12,
+          body: panel,
+        }),
+      ],
+    }),
+  });
+
+  await new Promise((r) => setTimeout(r, 1));
+
+  return { scene, panel, menu };
+}
diff --git a/public/app/features/dashboard-scene/inspect/HelpWizard/SupportSnapshotService.ts b/public/app/features/dashboard-scene/inspect/HelpWizard/SupportSnapshotService.ts
new file mode 100644
index 0000000000000..c58e00c6667c3
--- /dev/null
+++ b/public/app/features/dashboard-scene/inspect/HelpWizard/SupportSnapshotService.ts
@@ -0,0 +1,133 @@
+import saveAs from 'file-saver';
+
+import { dateTimeFormat, formattedValueToString, getValueFormat, SelectableValue } from '@grafana/data';
+import { sceneGraph, SceneObject, VizPanel } from '@grafana/scenes';
+import { StateManagerBase } from 'app/core/services/StateManagerBase';
+
+import { transformSaveModelToScene } from '../../serialization/transformSaveModelToScene';
+
+import { Randomize } from './randomizer';
+import { getDebugDashboard, getGithubMarkdown } from './utils';
+
+interface SupportSnapshotState {
+  currentTab: SnapshotTab;
+  showMessage: ShowMessage;
+  options: Array<SelectableValue<ShowMessage>>;
+  snapshotText: string;
+  markdownText: string;
+  snapshotSize?: string;
+  randomize: Randomize;
+  loading?: boolean;
+  error?: {
+    title: string;
+    message: string;
+  };
+  panel: VizPanel;
+  panelTitle: string;
+
+  // eslint-disable-next-line
+  snapshot?: any;
+  snapshotUpdate: number;
+  scene?: SceneObject;
+}
+
+export enum SnapshotTab {
+  Support,
+  Data,
+}
+
+export enum ShowMessage {
+  PanelSnapshot,
+  GithubComment,
+}
+
+export class SupportSnapshotService extends StateManagerBase<SupportSnapshotState> {
+  constructor(panel: VizPanel) {
+    super({
+      panel,
+      panelTitle: sceneGraph.interpolate(panel, panel.state.title, {}, 'text'),
+      currentTab: SnapshotTab.Support,
+      showMessage: ShowMessage.GithubComment,
+      snapshotText: '',
+      markdownText: '',
+      randomize: {},
+      snapshotUpdate: 0,
+      options: [
+        {
+          label: 'GitHub comment',
+          description: 'Copy and paste this message into a GitHub issue or comment',
+          value: ShowMessage.GithubComment,
+        },
+        {
+          label: 'Panel support snapshot',
+          description: 'Dashboard JSON used to help troubleshoot visualization issues',
+          value: ShowMessage.PanelSnapshot,
+        },
+      ],
+    });
+  }
+
+  async buildDebugDashboard() {
+    const { panel, randomize, snapshotUpdate } = this.state;
+    const snapshot = await getDebugDashboard(panel, randomize, sceneGraph.getTimeRange(panel).state.value);
+    const snapshotText = JSON.stringify(snapshot, null, 2);
+    const markdownText = getGithubMarkdown(panel, snapshotText);
+    const snapshotSize = formattedValueToString(getValueFormat('bytes')(snapshotText?.length ?? 0));
+
+    let scene: SceneObject | undefined = undefined;
+    if (snapshot) {
+      try {
+        const dash = transformSaveModelToScene({ dashboard: snapshot, meta: { isEmbedded: true } });
+        scene = dash.state.body; // skip the wrappers
+      } catch (ex) {
+        console.log('Error creating scene:', ex);
+      }
+    }
+
+    this.setState({ snapshot, snapshotText, markdownText, snapshotSize, snapshotUpdate: snapshotUpdate + 1, scene });
+  }
+
+  onCurrentTabChange = (value: SnapshotTab) => {
+    this.setState({ currentTab: value });
+  };
+
+  onShowMessageChange = (value: SelectableValue<ShowMessage>) => {
+    this.setState({ showMessage: value.value! });
+  };
+
+  onGetMarkdownForClipboard = () => {
+    const { markdownText } = this.state;
+    const maxLen = Math.pow(1024, 2) * 1.5; // 1.5MB
+
+    if (markdownText.length > maxLen) {
+      this.setState({
+        error: {
+          title: 'Copy to clipboard failed',
+          message: 'Snapshot is too large, consider download and attaching a file instead',
+        },
+      });
+
+      return '';
+    }
+
+    return markdownText;
+  };
+
+  onDownloadDashboard = () => {
+    const { snapshotText, panelTitle } = this.state;
+    const blob = new Blob([snapshotText], {
+      type: 'text/plain',
+    });
+    const fileName = `debug-${panelTitle}-${dateTimeFormat(new Date())}.json.txt`;
+    saveAs(blob, fileName);
+  };
+
+  onSetSnapshotText = (snapshotText: string) => {
+    this.setState({ snapshotText });
+  };
+
+  onToggleRandomize = (k: keyof Randomize) => {
+    const { randomize } = this.state;
+    this.setState({ randomize: { ...randomize, [k]: !randomize[k] } });
+  };
+}
diff --git a/public/app/features/dashboard/components/HelpWizard/randomizer.test.ts b/public/app/features/dashboard-scene/inspect/HelpWizard/randomizer.test.ts
similarity index 100%
rename from public/app/features/dashboard/components/HelpWizard/randomizer.test.ts
rename to public/app/features/dashboard-scene/inspect/HelpWizard/randomizer.test.ts
diff --git a/public/app/features/dashboard/components/HelpWizard/randomizer.ts b/public/app/features/dashboard-scene/inspect/HelpWizard/randomizer.ts
similarity index 100%
rename from public/app/features/dashboard/components/HelpWizard/randomizer.ts
rename to public/app/features/dashboard-scene/inspect/HelpWizard/randomizer.ts
diff --git a/public/app/features/dashboard-scene/inspect/HelpWizard/utils.ts b/public/app/features/dashboard-scene/inspect/HelpWizard/utils.ts
new file mode 100644
index 0000000000000..b49c76637707c
--- /dev/null
+++ b/public/app/features/dashboard-scene/inspect/HelpWizard/utils.ts
@@ -0,0 +1,326 @@
+import { cloneDeep } from 'lodash';
+
+import {
+  dateTimeFormat,
+  TimeRange,
+  PanelData,
+  DataTransformerConfig,
+  DataFrameJSON,
+  LoadingState,
+  dataFrameToJSON,
+  DataTopic,
+} from '@grafana/data';
+import { config } from '@grafana/runtime';
+import { VizPanel } from '@grafana/scenes';
+import { GrafanaQueryType } from 'app/plugins/datasource/grafana/types';
+
+import { DashboardGridItem } from '../../scene/DashboardGridItem';
+import { LibraryVizPanel } from '../../scene/LibraryVizPanel';
+import { gridItemToPanel, vizPanelToPanel } from '../../serialization/transformSceneToSaveModel';
+import { getQueryRunnerFor } from '../../utils/utils';
+
+import { Randomize, randomizeData } from './randomizer';
+
+export function getPanelDataFrames(data?: PanelData): DataFrameJSON[] {
+  const frames: DataFrameJSON[] = [];
+  if (data?.series) {
+    for (const f of data.series) {
+      frames.push(dataFrameToJSON(f));
+    }
+  }
+  if (data?.annotations) {
+    for (const f of data.annotations) {
+      const json = dataFrameToJSON(f);
+      if (!json.schema?.meta) {
+        json.schema!.meta = {};
+      }
+      json.schema!.meta.dataTopic = DataTopic.Annotations;
+      frames.push(json);
+    }
+  }
+
+  return frames;
+}
+
+export function getGithubMarkdown(panel: VizPanel, snapshot: string): string {
+  const info = {
+    panelType: panel.state.pluginId,
+    datasource: '??',
+  };
+  const grafanaVersion = config.buildInfo.versionString;
+
+  let md = `| Key | Value |
+|--|--|
+| Panel | ${info.panelType} @ ${panel.state.pluginVersion ?? grafanaVersion} |
+| Grafana | ${grafanaVersion} // ${config.buildInfo.edition} |
+`;
+
+  if (snapshot) {
+    md += '<details><summary>Panel debug snapshot dashboard</summary>\n\n```json\n' + snapshot + '\n```\n</details>';
+  }
+  return md;
+}
+
+export async function getDebugDashboard(panel: VizPanel, rand: Randomize, timeRange: TimeRange) {
+  let saveModel;
+  const isLibraryPanel = panel.parent instanceof LibraryVizPanel;
+  const gridItem = (isLibraryPanel ? panel.parent.parent : panel.parent) as DashboardGridItem;
+
+  if (isLibraryPanel) {
+    saveModel = {
+      ...gridItemToPanel(gridItem),
+      ...vizPanelToPanel(panel),
+    };
+  } else {
+    saveModel = gridItemToPanel(gridItem);
+  }
+
+  const dashboard = cloneDeep(embeddedDataTemplate);
+  const info = {
+    panelType: panel.state.pluginId,
+    datasource: '??',
+  };
+
+  // reproducable
+  const queryRunner = getQueryRunnerFor(panel)!;
+
+  if (!queryRunner.state.data) {
+    return;
+  }
+
+  const data = queryRunner.state.data;
+
+  const dsref = queryRunner?.state.datasource;
+  const frames = randomizeData(getPanelDataFrames(data), rand);
+  const grafanaVersion = config.buildInfo.versionString;
+  const queries = queryRunner.state.queries ?? [];
+  const annotationsCount = data.annotations ? data.annotations.reduce((acc, c) => c.length + acc, 0) : 0;
+  const html = `<table width="100%">
+    <tr>
+      <th width="2%">Panel</th>
+      <td >${info.panelType} @ ${saveModel.pluginVersion ?? grafanaVersion}</td>
+    </tr>
+    <tr>
+      <th>Queries</th>
+      <td>${queries
+        .map((t) => {
+          const ds = t.datasource ?? dsref;
+          return `${t.refId}[${ds?.type}]`;
+        })
+        .join(', ')}</td>
+    </tr>
+    ${getTransformsRow(saveModel)}
+    ${getDataRow(data, frames)}
+    ${getAnnotationsRow(data)}
+    <tr>
+      <th>Grafana</th>
+      <td>${grafanaVersion} // ${config.buildInfo.edition}</td>
+    </tr>
+  </table>`.trim();
+
+  // Replace the panel with embedded data
+  dashboard.panels[0] = {
+    ...saveModel,
+    ...dashboard.panels[0],
+    targets: [
+      {
+        refId: 'A',
+        datasource: {
+          type: 'grafana',
+          uid: 'grafana',
+        },
+        queryType: GrafanaQueryType.Snapshot,
+        snapshot: frames,
+      },
+    ],
+  };
+
+  // delete library panel not to load the panel from the db
+  delete dashboard.panels[0].libraryPanel;
+
+  if (saveModel.transformations?.length) {
+    const last = dashboard.panels[dashboard.panels.length - 1];
+    last.title = last.title + ' (after transformations)';
+
+    const before = cloneDeep(last);
+    before.id = 100;
+    before.title = 'Data (before transformations)';
+    before.gridPos.w = 24; // full width
+    before.targets[0].withTransforms = false;
+    dashboard.panels.push(before);
+  }
+
+  if (annotationsCount > 0) {
+    dashboard.panels.push({
+      id: 7,
+      gridPos: {
+        h: 6,
+        w: 24,
+        x: 0,
+        y: 20,
+      },
+      type: 'table',
+      title: 'Annotations',
+      datasource: {
+        type: 'datasource',
+        uid: '-- Dashboard --',
+      },
+      options: {
+        showTypeIcons: true,
+      },
+      targets: [
+        {
+          datasource: {
+            type: 'datasource',
+            uid: '-- Dashboard --',
+          },
+          panelId: 2,
+          withTransforms: true,
+          topic: DataTopic.Annotations,
+          refId: 'A',
+        },
+      ],
+    });
+  }
+
+  dashboard.panels[1].options.content = html;
+  dashboard.panels[2].options.content = JSON.stringify(saveModel, null, 2);
+
+  dashboard.title = `Debug: ${saveModel.title} // ${dateTimeFormat(new Date())}`;
+  dashboard.tags = ['debug', `debug-${info.panelType}`];
+  dashboard.time = {
+    from: timeRange.from.toISOString(),
+    to: timeRange.to.toISOString(),
+  };
+
+  return dashboard;
+}
+
+// eslint-disable-next-line
+function getTransformsRow(saveModel: any): string {
+  if (!saveModel.transformations) {
+    return '';
+  }
+  return `<tr>
+      <th>Transform</th>
+      <td>${saveModel.transformations.map((t: DataTransformerConfig) => t.id).join(', ')}</td>
+  </tr>`;
+}
+
+function getDataRow(data: PanelData, frames: DataFrameJSON[]): string {
+  let frameCount = data.series.length ?? 0;
+  let fieldCount = 0;
+  let rowCount = 0;
+  for (const frame of data.series) {
+    fieldCount += frame.fields.length;
+    rowCount += frame.length;
+  }
+  return (
+    '<tr>' +
+    '<th>Data</th>' +
+    '<td>' +
+    `${data.state !== LoadingState.Done ? data.state : ''} ` +
+    `${frameCount} frames, ${fieldCount} fields, ` +
+    `${rowCount} rows ` +
+    // `(${formattedValueToString(getValueFormat('decbytes')(raw?.length))} JSON)` +
+    '</td>' +
+    '</tr>'
+  );
+}
+
+function getAnnotationsRow(data: PanelData): string {
+  if (!data.annotations?.length) {
+    return '';
+  }
+
+  return `<tr>
+  <th>Annotations</th>
+  <td>${data.annotations.reduce((acc, c) => c.length + acc, 0)}</td>
+</tr>`;
+}
+
+// eslint-disable-next-line
+const embeddedDataTemplate: any = {
+  // should be dashboard model when that is accurate enough
+  panels: [
+    {
+      id: 2,
+      title: 'Reproduced with embedded data',
+      datasource: {
+        type: 'grafana',
+        uid: 'grafana',
+      },
+      gridPos: {
+        h: 13,
+        w: 15,
+        x: 0,
+        y: 0,
+      },
+    },
+    {
+      gridPos: {
+        h: 7,
+        w: 9,
+        x: 15,
+        y: 0,
+      },
+      id: 5,
+      options: {
+        content: '...',
+        mode: 'html',
+      },
+      title: 'Debug info',
+      type: 'text',
+    },
+    {
+      id: 6,
+      title: 'Original Panel JSON',
+      type: 'text',
+      gridPos: {
+        h: 13,
+        w: 9,
+        x: 15,
+        y: 7,
+      },
+      options: {
+        content: '...',
+        mode: 'code',
+        code: {
+          language: 'json',
+          showLineNumbers: true,
+          showMiniMap: true,
+        },
+      },
+    },
+    {
+      id: 3,
+      title: 'Data from panel above',
+      type: 'table',
+      datasource: {
+        type: 'datasource',
+        uid: '-- Dashboard --',
+      },
+      gridPos: {
+        h: 7,
+        w: 15,
+        x: 0,
+        y: 13,
+      },
+      options: {
+        showTypeIcons: true,
+      },
+      targets: [
+        {
+          datasource: {
+            type: 'datasource',
+            uid: '-- Dashboard --',
+          },
+          panelId: 2,
+          withTransforms: true,
+          refId: 'A',
+        },
+      ],
+    },
+  ],
+  schemaVersion: 37,
+};
diff --git a/public/app/features/dashboard-scene/inspect/InspectJsonTab.test.tsx b/public/app/features/dashboard-scene/inspect/InspectJsonTab.test.tsx
index b1b91bc6ec18a..a357890c03406 100644
--- a/public/app/features/dashboard-scene/inspect/InspectJsonTab.test.tsx
+++ b/public/app/features/dashboard-scene/inspect/InspectJsonTab.test.tsx
@@ -1,17 +1,24 @@
-import { FieldType, getDefaultTimeRange, LoadingState, standardTransformersRegistry, toDataFrame } from '@grafana/data';
-import { getPanelPlugin } from '@grafana/data/test/__mocks__/pluginMocks';
-import { setPluginImportUtils } from '@grafana/runtime';
+import { of } from 'rxjs';
+
 import {
-  SceneCanvasText,
-  SceneDataNode,
-  SceneDataTransformer,
-  SceneGridItem,
-  SceneGridLayout,
-  VizPanel,
-} from '@grafana/scenes';
+  FieldType,
+  getDefaultTimeRange,
+  LoadingState,
+  PanelData,
+  standardTransformersRegistry,
+  toDataFrame,
+} from '@grafana/data';
+import { getPanelPlugin } from '@grafana/data/test/__mocks__/pluginMocks';
+import { setPluginImportUtils, setRunRequest } from '@grafana/runtime';
+import { SceneCanvasText, SceneDataTransformer, SceneGridLayout, SceneQueryRunner, VizPanel } from '@grafana/scenes';
+import * as libpanels from 'app/features/library-panels/state/api';
 import { getStandardTransformers } from 'app/features/transformers/standardTransformers';
 
+import { DashboardGridItem } from '../scene/DashboardGridItem';
 import { DashboardScene } from '../scene/DashboardScene';
+import { LibraryVizPanel } from '../scene/LibraryVizPanel';
+import { VizPanelLinks, VizPanelLinksMenu } from '../scene/PanelLinks';
+import { vizPanelToPanel } from '../serialization/transformSceneToSaveModel';
 import { activateFullSceneTree } from '../utils/test-utils';
 import { findVizPanelByKey } from '../utils/utils';
 
@@ -24,6 +31,51 @@ setPluginImportUtils({
   getPanelPluginFromCache: (id: string) => undefined,
 });
 
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  setPluginExtensionGetter: jest.fn(),
+  getPluginLinkExtensions: jest.fn(() => ({
+    extensions: [],
+  })),
+  getDataSourceSrv: () => {
+    return {
+      get: jest.fn().mockResolvedValue({
+        getRef: () => ({ uid: 'ds1' }),
+      }),
+      getInstanceSettings: jest.fn().mockResolvedValue({ uid: 'ds1' }),
+    };
+  },
+}));
+
+const runRequestMock = jest.fn().mockReturnValue(
+  of<PanelData>({
+    state: LoadingState.Done,
+    timeRange: getDefaultTimeRange(),
+    series: [
+      toDataFrame({
+        fields: [{ name: 'value', type: FieldType.number, values: [1, 2, 3] }],
+      }),
+    ],
+    request: {
+      app: 'dashboard',
+      requestId: 'request-id',
+      dashboardUID: 'asd',
+      interval: '1s',
+      panelId: 1,
+      range: getDefaultTimeRange(),
+      targets: [],
+      timezone: 'utc',
+      intervalMs: 1000,
+      startTime: 1,
+      scopedVars: {
+        __sceneObject: { value: new SceneCanvasText({ text: 'asd' }) },
+      },
+    },
+  })
+);
+
+setRunRequest(runRequestMock);
+
 describe('InspectJsonTab', () => {
   it('Can show panel json', async () => {
     const { tab } = await buildTestScene();
@@ -33,6 +85,15 @@ describe('InspectJsonTab', () => {
     expect(tab.isEditable()).toBe(true);
   });
 
+  it('Can show panel json for library panels', async () => {
+    const { tab } = await buildTestSceneWithLibraryPanel();
+
+    const obj = JSON.parse(tab.state.jsonText);
+    expect(obj.gridPos).toEqual({ x: 0, y: 0, w: 10, h: 12 });
+    expect(obj.type).toEqual('table');
+    expect(tab.isEditable()).toBe(false);
+  });
+
   it('Can show panel data with field config', async () => {
     const { tab } = await buildTestScene();
     tab.onChangeSource({ value: 'panel-data' });
@@ -79,17 +140,18 @@ describe('InspectJsonTab', () => {
 
     const panel2 = findVizPanelByKey(scene, panel.state.key)!;
     expect(panel2.state.title).toBe('New title');
-    expect((panel2.parent as SceneGridItem).state.width!).toBe(3);
+    expect((panel2.parent as DashboardGridItem).state.width!).toBe(3);
 
     expect(tab.state.onClose).toHaveBeenCalled();
   });
 });
 
-async function buildTestScene() {
-  const panel = new VizPanel({
+function buildTestPanel() {
+  return new VizPanel({
     title: 'Panel A',
     pluginId: 'table',
     key: 'panel-12',
+    titleItems: [new VizPanelLinks({ menu: new VizPanelLinksMenu({}) })],
     $data: new SceneDataTransformer({
       transformations: [
         {
@@ -99,35 +161,16 @@ async function buildTestScene() {
           },
         },
       ],
-      $data: new SceneDataNode({
-        data: {
-          state: LoadingState.Done,
-          series: [
-            toDataFrame({
-              fields: [{ name: 'value', type: FieldType.number, values: [1, 2, 3] }],
-            }),
-          ],
-          timeRange: getDefaultTimeRange(),
-          request: {
-            app: 'dashboard',
-            requestId: 'request-id',
-            dashboardUID: 'asd',
-            interval: '1s',
-            panelId: 1,
-            range: getDefaultTimeRange(),
-            targets: [],
-            timezone: 'utc',
-            intervalMs: 1000,
-            startTime: 1,
-            scopedVars: {
-              __sceneObject: { value: new SceneCanvasText({ text: 'asd' }) },
-            },
-          },
-        },
+      $data: new SceneQueryRunner({
+        datasource: { uid: 'abcdef' },
+        queries: [{ refId: 'A' }],
       }),
     }),
   });
+}
 
+async function buildTestScene() {
+  const panel = buildTestPanel();
   const scene = new DashboardScene({
     title: 'hello',
     uid: 'dash-1',
@@ -136,7 +179,7 @@ async function buildTestScene() {
     },
     body: new SceneGridLayout({
       children: [
-        new SceneGridItem({
+        new DashboardGridItem({
           key: 'griditem-1',
           x: 0,
           y: 0,
@@ -159,3 +202,50 @@ async function buildTestScene() {
 
   return { scene, tab, panel };
 }
+
+async function buildTestSceneWithLibraryPanel() {
+  const panel = vizPanelToPanel(buildTestPanel());
+
+  const libraryPanelState = {
+    name: 'LibraryPanel A',
+    title: 'LibraryPanel A title',
+    uid: '111',
+    panelKey: 'panel-22',
+    model: panel,
+    version: 1,
+  };
+
+  jest.spyOn(libpanels, 'getLibraryPanel').mockResolvedValue({ ...libraryPanelState, ...panel });
+  const libraryPanel = new LibraryVizPanel(libraryPanelState);
+
+  const scene = new DashboardScene({
+    title: 'hello',
+    uid: 'dash-1',
+    meta: {
+      canEdit: true,
+    },
+    body: new SceneGridLayout({
+      children: [
+        new DashboardGridItem({
+          key: 'griditem-1',
+          x: 0,
+          y: 0,
+          width: 10,
+          height: 12,
+          body: libraryPanel,
+        }),
+      ],
+    }),
+  });
+
+  activateFullSceneTree(scene);
+
+  await new Promise((r) => setTimeout(r, 1));
+
+  const tab = new InspectJsonTab({
+    panelRef: libraryPanel.state.panel!.getRef(),
+    onClose: jest.fn(),
+  });
+
+  return { scene, tab, panel };
+}
diff --git a/public/app/features/dashboard-scene/inspect/InspectJsonTab.tsx b/public/app/features/dashboard-scene/inspect/InspectJsonTab.tsx
index 0b3d2ac23c261..ce9e21371f0ce 100644
--- a/public/app/features/dashboard-scene/inspect/InspectJsonTab.tsx
+++ b/public/app/features/dashboard-scene/inspect/InspectJsonTab.tsx
@@ -8,7 +8,6 @@ import {
   SceneComponentProps,
   SceneDataTransformer,
   sceneGraph,
-  SceneGridItem,
   SceneGridItemStateLike,
   SceneObjectBase,
   SceneObjectRef,
@@ -17,6 +16,7 @@ import {
   sceneUtils,
   VizPanel,
 } from '@grafana/scenes';
+import { LibraryPanel } from '@grafana/schema/';
 import { Button, CodeEditor, Field, Select, useStyles2 } from '@grafana/ui';
 import { t } from 'app/core/internationalization';
 import { getPanelDataFrames } from 'app/features/dashboard/components/HelpWizard/utils';
@@ -26,9 +26,11 @@ import { InspectTab } from 'app/features/inspector/types';
 import { getPrettyJSON } from 'app/features/inspector/utils/utils';
 import { reportPanelInspectInteraction } from 'app/features/search/page/reporting';
 
-import { PanelRepeaterGridItem } from '../scene/PanelRepeaterGridItem';
+import { VizPanelManager } from '../panel-edit/VizPanelManager';
+import { DashboardGridItem } from '../scene/DashboardGridItem';
+import { LibraryVizPanel } from '../scene/LibraryVizPanel';
 import { buildGridItemForPanel } from '../serialization/transformSaveModelToScene';
-import { gridItemToPanel } from '../serialization/transformSceneToSaveModel';
+import { gridItemToPanel, vizPanelToPanel } from '../serialization/transformSceneToSaveModel';
 import { getDashboardSceneFor, getPanelIdForVizPanel, getQueryRunnerFor } from '../utils/utils';
 
 export type ShowContent = 'panel-json' | 'panel-data' | 'data-frames';
@@ -59,7 +61,7 @@ export class InspectJsonTab extends SceneObjectBase<InspectJsonTabState> {
 
   public getOptions(): Array<SelectableValue<ShowContent>> {
     const panel = this.state.panelRef.resolve();
-    const dataProvider = panel.state.$data;
+    const dataProvider = panel.state.$data ?? panel.parent?.state.$data;
 
     const options: Array<SelectableValue<ShowContent>> = [
       {
@@ -107,7 +109,7 @@ export class InspectJsonTab extends SceneObjectBase<InspectJsonTabState> {
     const gridItem = buildGridItemForPanel(panelModel);
     const newState = sceneUtils.cloneSceneObjectState(gridItem.state);
 
-    if (!(panel.parent instanceof SceneGridItem) || !(gridItem instanceof SceneGridItem)) {
+    if (!(panel.parent instanceof DashboardGridItem)) {
       console.error('Cannot update state of panel', panel, gridItem);
       return;
     }
@@ -140,8 +142,13 @@ export class InspectJsonTab extends SceneObjectBase<InspectJsonTabState> {
 
     const panel = this.state.panelRef.resolve();
 
+    // Library panels are not editable from the inspect
+    if (panel.parent instanceof LibraryVizPanel) {
+      return false;
+    }
+
     // Only support normal grid items for now and not repeated items
-    if (!(panel.parent instanceof SceneGridItem)) {
+    if (panel.parent instanceof DashboardGridItem && panel.parent.isRepeated()) {
       return false;
     }
 
@@ -200,9 +207,23 @@ function getJsonText(show: ShowContent, panel: VizPanel): string {
     case 'panel-json': {
       reportPanelInspectInteraction(InspectTab.JSON, 'panelData');
 
-      if (panel.parent instanceof SceneGridItem || panel.parent instanceof PanelRepeaterGridItem) {
-        objToStringify = gridItemToPanel(panel.parent);
+      const isInspectingLibraryPanel = panel.parent instanceof LibraryVizPanel;
+      const gridItem = isInspectingLibraryPanel ? panel.parent.parent : panel.parent;
+
+      if (isInspectingLibraryPanel) {
+        objToStringify = libraryPanelChildToLegacyRepresentation(panel);
+        break;
+      }
+
+      if (panel.parent instanceof VizPanelManager) {
+        objToStringify = panel.parent.getPanelSaveModel();
+        break;
       }
+
+      if (gridItem instanceof DashboardGridItem) {
+        objToStringify = gridItemToPanel(gridItem);
+      }
+
       break;
     }
 
@@ -234,6 +255,43 @@ function getJsonText(show: ShowContent, panel: VizPanel): string {
   return getPrettyJSON(objToStringify);
 }
 
+/**
+ *
+ * @param panel Must be child of a LibraryVizPanel that is in turn the child of a DashboardGridItem
+ * @returns object representation of the legacy library panel structure.
+ */
+function libraryPanelChildToLegacyRepresentation(panel: VizPanel<{}, {}>) {
+  if (!(panel.parent instanceof LibraryVizPanel)) {
+    throw 'Panel not child of LibraryVizPanel';
+  }
+
+  if (!(panel.parent.parent instanceof DashboardGridItem)) {
+    throw 'LibraryPanel not child of DashboardGridItem';
+  }
+
+  const gridItem = panel.parent.parent;
+  const gridPos = {
+    x: gridItem.state.x || 0,
+    y: gridItem.state.y || 0,
+    h: gridItem.state.height || 0,
+    w: gridItem.state.width || 0,
+  };
+  const libraryPanelObj = vizPanelToLibraryPanel(panel);
+  const panelObj = vizPanelToPanel(panel, gridPos, false, gridItem);
+
+  return { libraryPanel: { ...libraryPanelObj }, ...panelObj };
+}
+
+function vizPanelToLibraryPanel(panel: VizPanel): LibraryPanel {
+  if (!(panel.parent instanceof LibraryVizPanel)) {
+    throw new Error('Panel not a child of LibraryVizPanel');
+  }
+  if (!panel.parent.state._loadedPanel) {
+    throw new Error('Library panel not loaded');
+  }
+  return panel.parent.state._loadedPanel;
+}
+
 function hasGridPosChanged(a: SceneGridItemStateLike, b: SceneGridItemStateLike) {
   return a.x !== b.x || a.y !== b.y || a.width !== b.width || a.height !== b.height;
 }
diff --git a/public/app/features/dashboard-scene/inspect/PanelInspectDrawer.tsx b/public/app/features/dashboard-scene/inspect/PanelInspectDrawer.tsx
index 30f4f93292ebd..319798559ec4b 100644
--- a/public/app/features/dashboard-scene/inspect/PanelInspectDrawer.tsx
+++ b/public/app/features/dashboard-scene/inspect/PanelInspectDrawer.tsx
@@ -14,7 +14,12 @@ import {
 import { Alert, Drawer, Tab, TabsBar } from '@grafana/ui';
 import { getDataSourceWithInspector } from 'app/features/dashboard/components/Inspector/hooks';
 import { supportsDataQuery } from 'app/features/dashboard/components/PanelEditor/utils';
+import { InspectTab } from 'app/features/inspector/types';
 
+import { getDashboardUrl } from '../utils/urlBuilders';
+import { getDashboardSceneFor } from '../utils/utils';
+
+import { HelpWizard } from './HelpWizard/HelpWizard';
 import { InspectDataTab } from './InspectDataTab';
 import { InspectJsonTab } from './InspectJsonTab';
 import { InspectMetaDataTab } from './InspectMetaDataTab';
@@ -24,7 +29,7 @@ import { SceneInspectTab } from './types';
 
 interface PanelInspectDrawerState extends SceneObjectState {
   tabs?: SceneInspectTab[];
-  panelRef: SceneObjectRef<VizPanel>;
+  panelRef?: SceneObjectRef<VizPanel>;
   pluginNotLoaded?: boolean;
   canEdit?: boolean;
 }
@@ -47,8 +52,7 @@ export class PanelInspectDrawer extends SceneObjectBase<PanelInspectDrawerState>
    */
   async buildTabs(retry: number) {
     const panelRef = this.state.panelRef;
-    const panel = panelRef.resolve();
-    const plugin = panel.getPlugin();
+    const plugin = panelRef?.resolve()?.getPlugin();
     const tabs: SceneInspectTab[] = [];
 
     if (!plugin) {
@@ -59,36 +63,52 @@ export class PanelInspectDrawer extends SceneObjectBase<PanelInspectDrawerState>
       }
     }
 
-    if (supportsDataQuery(plugin)) {
-      const data = sceneGraph.getData(panel);
+    if (panelRef) {
+      if (supportsDataQuery(plugin)) {
+        const data = sceneGraph.getData(panelRef.resolve());
 
-      tabs.push(new InspectDataTab({ panelRef }));
-      tabs.push(new InspectStatsTab({ panelRef }));
-      tabs.push(new InspectQueryTab({ panelRef }));
+        tabs.push(new InspectDataTab({ panelRef }));
+        tabs.push(new InspectStatsTab({ panelRef }));
+        tabs.push(new InspectQueryTab({ panelRef }));
 
-      const dsWithInspector = await getDataSourceWithInspector(data.state.data);
-      if (dsWithInspector) {
-        tabs.push(new InspectMetaDataTab({ panelRef, dataSource: dsWithInspector }));
+        const dsWithInspector = await getDataSourceWithInspector(data.state.data);
+        if (dsWithInspector) {
+          tabs.push(new InspectMetaDataTab({ panelRef, dataSource: dsWithInspector }));
+        }
       }
-    }
 
-    tabs.push(new InspectJsonTab({ panelRef, onClose: this.onClose }));
+      tabs.push(new InspectJsonTab({ panelRef, onClose: this.onClose }));
+    }
 
     this.setState({ tabs });
   }
 
   getDrawerTitle() {
-    const panel = this.state.panelRef.resolve();
-    return sceneGraph.interpolate(panel, `Inspect: ${panel.state.title}`);
+    const panel = this.state.panelRef?.resolve();
+    if (panel) {
+      return sceneGraph.interpolate(panel, `Inspect: ${panel.state.title}`);
+    }
+    return `Inspect panel`;
   }
 
   onClose = () => {
-    locationService.partial({ inspect: null, inspectTab: null });
+    const dashboard = getDashboardSceneFor(this);
+    locationService.push(
+      getDashboardUrl({
+        uid: dashboard.state.uid,
+        slug: dashboard.state.meta.slug,
+        currentQueryParams: locationService.getLocation().search,
+        updateQuery: {
+          inspect: null,
+          inspectTab: null,
+        },
+      })
+    );
   };
 }
 
 function PanelInspectRenderer({ model }: SceneComponentProps<PanelInspectDrawer>) {
-  const { tabs, pluginNotLoaded } = model.useState();
+  const { tabs, pluginNotLoaded, panelRef } = model.useState();
   const location = useLocation();
   const queryParams = new URLSearchParams(location.search);
 
@@ -99,6 +119,12 @@ function PanelInspectRenderer({ model }: SceneComponentProps<PanelInspectDrawer>
   const urlTab = queryParams.get('inspectTab');
   const currentTab = tabs.find((tab) => tab.getTabValue() === urlTab) ?? tabs[0];
 
+  const vizPanel = panelRef!.resolve();
+
+  if (urlTab === InspectTab.Help) {
+    return <HelpWizard panel={vizPanel} onClose={model.onClose} />;
+  }
+
   return (
     <Drawer
       title={model.getDrawerTitle()}
diff --git a/public/app/features/dashboard-scene/pages/DashboardScenePage.test.tsx b/public/app/features/dashboard-scene/pages/DashboardScenePage.test.tsx
index debaf3a0cbf41..487397536d764 100644
--- a/public/app/features/dashboard-scene/pages/DashboardScenePage.test.tsx
+++ b/public/app/features/dashboard-scene/pages/DashboardScenePage.test.tsx
@@ -1,20 +1,29 @@
-import { act, render, screen } from '@testing-library/react';
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
+import { cloneDeep } from 'lodash';
 import React from 'react';
 import { TestProvider } from 'test/helpers/TestProvider';
 import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
 
 import { PanelProps } from '@grafana/data';
 import { getPanelPlugin } from '@grafana/data/test/__mocks__/pluginMocks';
-import { config, locationService, setPluginImportUtils } from '@grafana/runtime';
+import { config, getPluginLinkExtensions, locationService, setPluginImportUtils } from '@grafana/runtime';
+import { VizPanel } from '@grafana/scenes';
+import { Dashboard } from '@grafana/schema';
 import { getRouteComponentProps } from 'app/core/navigation/__mocks__/routeProps';
+import store from 'app/core/store';
+import { DashboardLoaderSrv, setDashboardLoaderSrv } from 'app/features/dashboard/services/DashboardLoaderSrv';
+import { DASHBOARD_FROM_LS_KEY } from 'app/features/dashboard/state/initDashboard';
 
-import { setupLoadDashboardMock } from '../utils/test-utils';
+import { dashboardSceneGraph } from '../utils/dashboardSceneGraph';
 
 import { DashboardScenePage, Props } from './DashboardScenePage';
+import { getDashboardScenePageStateManager } from './DashboardScenePageStateManager';
 
 jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
+  setPluginExtensionGetter: jest.fn(),
+  getPluginLinkExtensions: jest.fn(),
   getDataSourceSrv: () => {
     return {
       get: jest.fn().mockResolvedValue({}),
@@ -23,12 +32,14 @@ jest.mock('@grafana/runtime', () => ({
   },
 }));
 
+const getPluginLinkExtensionsMock = jest.mocked(getPluginLinkExtensions);
+
 function setup() {
   const context = getGrafanaContextMock();
   const props: Props = {
     ...getRouteComponentProps(),
   };
-  props.match.params.uid = 'd10';
+  props.match.params.uid = 'my-dash-uid';
 
   const renderResult = render(
     <TestProvider grafanaContext={context}>
@@ -36,12 +47,22 @@ function setup() {
     </TestProvider>
   );
 
-  return { renderResult, context };
+  const rerender = (newProps: Props) => {
+    renderResult.rerender(
+      <TestProvider grafanaContext={context}>
+        <DashboardScenePage {...newProps} />
+      </TestProvider>
+    );
+  };
+
+  return { rerender, context, props };
 }
 
-const simpleDashboard = {
+const simpleDashboard: Dashboard = {
   title: 'My cool dashboard',
-  uid: '10d',
+  uid: 'my-dash-uid',
+  schemaVersion: 30,
+  version: 1,
   panels: [
     {
       id: 1,
@@ -90,13 +111,26 @@ setPluginImportUtils({
   getPanelPluginFromCache: (id: string) => undefined,
 });
 
+const loadDashboardMock = jest.fn();
+
+setDashboardLoaderSrv({
+  loadDashboard: loadDashboardMock,
+  // disabling type checks since this is a test util
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+} as unknown as DashboardLoaderSrv);
+
 describe('DashboardScenePage', () => {
   beforeEach(() => {
     locationService.push('/');
-    setupLoadDashboardMock({ dashboard: simpleDashboard, meta: {} });
+    getDashboardScenePageStateManager().clearDashboardCache();
+    loadDashboardMock.mockClear();
+    loadDashboardMock.mockResolvedValue({ dashboard: simpleDashboard, meta: { slug: '123' } });
     // hacky way because mocking autosizer does not work
     Object.defineProperty(HTMLElement.prototype, 'offsetHeight', { configurable: true, value: 1000 });
     Object.defineProperty(HTMLElement.prototype, 'offsetWidth', { configurable: true, value: 1000 });
+    getPluginLinkExtensionsMock.mockRestore();
+    getPluginLinkExtensionsMock.mockReturnValue({ extensions: [] });
+    store.delete(DASHBOARD_FROM_LS_KEY);
   });
 
   it('Can render dashboard', async () => {
@@ -111,6 +145,27 @@ describe('DashboardScenePage', () => {
     expect(await screen.findByText('Content B')).toBeInTheDocument();
   });
 
+  it('routeReloadCounter should trigger reload', async () => {
+    const { rerender, props } = setup();
+
+    await waitForDashbordToRender();
+
+    expect(await screen.findByTitle('Panel A')).toBeInTheDocument();
+
+    const updatedDashboard = cloneDeep(simpleDashboard);
+    updatedDashboard.version = 11;
+    updatedDashboard.panels![0].title = 'Updated title';
+
+    getDashboardScenePageStateManager().clearDashboardCache();
+    loadDashboardMock.mockResolvedValue({ dashboard: updatedDashboard, meta: {} });
+
+    props.history.location.state = { routeReloadCounter: 1 };
+
+    rerender(props);
+
+    expect(await screen.findByTitle('Updated title')).toBeInTheDocument();
+  });
+
   it('Can inspect panel', async () => {
     setup();
 
@@ -122,12 +177,9 @@ describe('DashboardScenePage', () => {
     // Somethig with Dropdown that is not working inside react-testing
     await userEvent.click(screen.getByLabelText('Menu for panel with title Panel B'));
 
-    const inspectLink = (await screen.findByRole('link', { name: /Inspect/ })).getAttribute('href')!;
-    act(() => locationService.push(inspectLink));
+    const inspectMenuItem = await screen.findAllByText('Inspect');
 
-    // I get not implemented exception here (from navigation / js-dom).
-    // Mocking window.location.assign did not help
-    //await userEvent.click(await screen.findByRole('link', { name: /Inspect/ }));
+    act(() => fireEvent.click(inspectMenuItem[0]));
 
     expect(await screen.findByText('Inspect: Panel B')).toBeInTheDocument();
 
@@ -148,6 +200,71 @@ describe('DashboardScenePage', () => {
     expect(screen.queryByTitle('Panel A')).not.toBeInTheDocument();
     expect(await screen.findByTitle('Panel B')).toBeInTheDocument();
   });
+
+  describe('empty state', () => {
+    it('Shows empty state when dashboard is empty', async () => {
+      loadDashboardMock.mockResolvedValue({ dashboard: { panels: [] }, meta: {} });
+      setup();
+
+      expect(await screen.findByText('Start your new dashboard by adding a visualization')).toBeInTheDocument();
+    });
+
+    it('shows and hides empty state when panels are added and removed', async () => {
+      setup();
+
+      await waitForDashbordToRender();
+
+      expect(await screen.queryByText('Start your new dashboard by adding a visualization')).not.toBeInTheDocument();
+
+      // Hacking a bit, accessing private cache property to get access to the underlying DashboardScene object
+      const dashboardScenesCache = getDashboardScenePageStateManager()['cache'];
+      const dashboard = dashboardScenesCache['my-dash-uid'];
+      const panels = dashboardSceneGraph.getVizPanels(dashboard);
+
+      act(() => {
+        dashboard.removePanel(panels[0]);
+      });
+      expect(await screen.queryByText('Start your new dashboard by adding a visualization')).not.toBeInTheDocument();
+
+      act(() => {
+        dashboard.removePanel(panels[1]);
+      });
+      expect(await screen.findByText('Start your new dashboard by adding a visualization')).toBeInTheDocument();
+
+      act(() => {
+        dashboard.addPanel(new VizPanel({ title: 'Panel Added', key: 'panel-4', pluginId: 'timeseries' }));
+      });
+
+      expect(await screen.findByTitle('Panel Added')).toBeInTheDocument();
+      expect(await screen.queryByText('Start your new dashboard by adding a visualization')).not.toBeInTheDocument();
+    });
+  });
+
+  it('is in edit mode when coming from explore to an existing dashboard', async () => {
+    store.setObject(DASHBOARD_FROM_LS_KEY, { dashboard: simpleDashboard, meta: { slug: '123' } });
+
+    setup();
+
+    await waitForDashbordToRender();
+
+    const panelAMenu = await screen.findByLabelText('Menu for panel with title Panel A');
+    expect(panelAMenu).toBeInTheDocument();
+    await userEvent.click(panelAMenu);
+    const editMenuItem = await screen.findAllByText('Edit');
+    expect(editMenuItem).toHaveLength(1);
+  });
+
+  describe('home page', () => {
+    it('should not show controls', async () => {
+      getDashboardScenePageStateManager().clearDashboardCache();
+      loadDashboardMock.mockClear();
+      loadDashboardMock.mockResolvedValue({ dashboard: { panels: [] }, meta: {} });
+
+      setup();
+
+      await waitFor(() => expect(screen.queryByText('Refresh')).not.toBeInTheDocument());
+    });
+  });
 });
 
 interface VizOptions {
diff --git a/public/app/features/dashboard-scene/pages/DashboardScenePage.tsx b/public/app/features/dashboard-scene/pages/DashboardScenePage.tsx
index 5c27e37740613..28f9def31657c 100644
--- a/public/app/features/dashboard-scene/pages/DashboardScenePage.tsx
+++ b/public/app/features/dashboard-scene/pages/DashboardScenePage.tsx
@@ -1,37 +1,88 @@
 // Libraries
-import React, { useEffect } from 'react';
+import React, { useEffect, useMemo } from 'react';
 
 import { PageLayoutType } from '@grafana/data';
 import { Page } from 'app/core/components/Page/Page';
 import PageLoader from 'app/core/components/PageLoader/PageLoader';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
+import store from 'app/core/store';
+import { DashboardPageRouteParams, DashboardPageRouteSearchParams } from 'app/features/dashboard/containers/types';
+import { DASHBOARD_FROM_LS_KEY } from 'app/features/dashboard/state/initDashboard';
+import { DashboardDTO, DashboardRoutes } from 'app/types';
+
+import { DashboardPrompt } from '../saving/DashboardPrompt';
 
 import { getDashboardScenePageStateManager } from './DashboardScenePageStateManager';
 
-export interface Props extends GrafanaRouteComponentProps<{ uid: string }> {}
+export interface Props extends GrafanaRouteComponentProps<DashboardPageRouteParams, DashboardPageRouteSearchParams> {}
 
-export function DashboardScenePage({ match }: Props) {
+export function DashboardScenePage({ match, route, queryParams, history }: Props) {
   const stateManager = getDashboardScenePageStateManager();
   const { dashboard, isLoading, loadError } = stateManager.useState();
+  // After scene migration is complete and we get rid of old dashboard we should refactor dashboardWatcher so this route reload is not need
+  const routeReloadCounter = (history.location.state as any)?.routeReloadCounter;
+
+  // Check if the user is coming from Explore, it's indicated byt the dashboard existence in local storage
+  const comingFromExplore = useMemo(() => {
+    return Boolean(store.getObject<DashboardDTO>(DASHBOARD_FROM_LS_KEY));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [match.params.uid, match.params.slug, match.params.type]);
 
   useEffect(() => {
-    stateManager.loadDashboard(match.params.uid);
+    if (route.routeName === DashboardRoutes.Normal && match.params.type === 'snapshot') {
+      stateManager.loadSnapshot(match.params.slug!);
+    } else {
+      stateManager.loadDashboard({
+        uid: match.params.uid ?? '',
+        route: route.routeName as DashboardRoutes,
+        urlFolderUid: queryParams.folderUid,
+        keepDashboardFromExploreInLocalStorage: false,
+      });
+    }
 
     return () => {
       stateManager.clearState();
     };
-  }, [stateManager, match.params.uid]);
+  }, [
+    stateManager,
+    match.params.uid,
+    route.routeName,
+    queryParams.folderUid,
+    routeReloadCounter,
+    match.params.slug,
+    match.params.type,
+  ]);
+
+  // Effect that handles explore->dashboards workflow
+  useEffect(() => {
+    // When coming from explore and adding to an existing dashboard, we should enter edit mode
+    if (dashboard && comingFromExplore) {
+      if (route.routeName !== DashboardRoutes.New) {
+        dashboard.onEnterEditMode(comingFromExplore);
+      }
+    }
+  }, [dashboard, comingFromExplore, route.routeName]);
 
   if (!dashboard) {
     return (
-      <Page layout={PageLayoutType.Canvas}>
+      <Page layout={PageLayoutType.Canvas} data-testid={'dashboard-scene-page'}>
         {isLoading && <PageLoader />}
         {loadError && <h2>{loadError}</h2>}
       </Page>
     );
   }
 
-  return <dashboard.Component model={dashboard} />;
+  // Do not render anything when transitioning from one dashboard to another
+  if (dashboard.state.uid && dashboard.state.uid !== match.params.uid) {
+    return null;
+  }
+
+  return (
+    <>
+      <dashboard.Component model={dashboard} key={dashboard.state.key} />
+      <DashboardPrompt dashboard={dashboard} />
+    </>
+  );
 }
 
 export default DashboardScenePage;
diff --git a/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.test.ts b/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.test.ts
index f0a8eef1a0ca5..2d67ff875e9a7 100644
--- a/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.test.ts
+++ b/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.test.ts
@@ -1,23 +1,32 @@
-import { locationService } from '@grafana/runtime';
+import { advanceBy } from 'jest-date-mock';
+
+import { BackendSrv, locationService, setBackendSrv } from '@grafana/runtime';
 import { getUrlSyncManager } from '@grafana/scenes';
+import store from 'app/core/store';
+import { DASHBOARD_FROM_LS_KEY } from 'app/features/dashboard/state/initDashboard';
+import { DashboardRoutes } from 'app/types';
 
 import { DashboardScene } from '../scene/DashboardScene';
 import { setupLoadDashboardMock } from '../utils/test-utils';
 
-import { DashboardScenePageStateManager } from './DashboardScenePageStateManager';
+import { DashboardScenePageStateManager, DASHBOARD_CACHE_TTL } from './DashboardScenePageStateManager';
 
 describe('DashboardScenePageStateManager', () => {
+  afterEach(() => {
+    store.delete(DASHBOARD_FROM_LS_KEY);
+  });
+
   describe('when fetching/loading a dashboard', () => {
     it('should call loader from server if the dashboard is not cached', async () => {
-      const loadDashboardMock = setupLoadDashboardMock({ dashboard: { uid: 'fake-dash' }, meta: {} });
+      const loadDashboardMock = setupLoadDashboardMock({ dashboard: { uid: 'fake-dash', editable: true }, meta: {} });
 
       const loader = new DashboardScenePageStateManager({});
-      await loader.loadDashboard('fake-dash');
+      await loader.loadDashboard({ uid: 'fake-dash', route: DashboardRoutes.Normal });
 
       expect(loadDashboardMock).toHaveBeenCalledWith('db', '', 'fake-dash');
 
       // should use cache second time
-      await loader.loadDashboard('fake-dash');
+      await loader.loadDashboard({ uid: 'fake-dash', route: DashboardRoutes.Normal });
       expect(loadDashboardMock.mock.calls.length).toBe(1);
     });
 
@@ -25,18 +34,41 @@ describe('DashboardScenePageStateManager', () => {
       setupLoadDashboardMock({ dashboard: undefined, meta: {} });
 
       const loader = new DashboardScenePageStateManager({});
-      await loader.loadDashboard('fake-dash');
+      await loader.loadDashboard({ uid: 'fake-dash', route: DashboardRoutes.Normal });
 
       expect(loader.state.dashboard).toBeUndefined();
       expect(loader.state.isLoading).toBe(false);
       expect(loader.state.loadError).toBe('Error: Dashboard not found');
     });
 
+    it('should handle home dashboard redirect', async () => {
+      setBackendSrv({
+        get: () => Promise.resolve({ redirectUri: '/d/asd' }),
+      } as unknown as BackendSrv);
+
+      const loader = new DashboardScenePageStateManager({});
+      await loader.loadDashboard({ uid: '', route: DashboardRoutes.Home });
+
+      expect(loader.state.dashboard).toBeUndefined();
+      expect(loader.state.loadError).toBeUndefined();
+    });
+
+    it('shoud fetch dashboard from local storage and remove it after if it exists', async () => {
+      const loader = new DashboardScenePageStateManager({});
+      const localStorageDashboard = { uid: 'fake-dash' };
+      store.setObject(DASHBOARD_FROM_LS_KEY, localStorageDashboard);
+
+      const result = await loader.fetchDashboard({ uid: 'fake-dash', route: DashboardRoutes.Normal });
+
+      expect(result).toEqual(localStorageDashboard);
+      expect(store.getObject(DASHBOARD_FROM_LS_KEY)).toBeUndefined();
+    });
+
     it('should initialize the dashboard scene with the loaded dashboard', async () => {
       setupLoadDashboardMock({ dashboard: { uid: 'fake-dash' }, meta: {} });
 
       const loader = new DashboardScenePageStateManager({});
-      await loader.loadDashboard('fake-dash');
+      await loader.loadDashboard({ uid: 'fake-dash', route: DashboardRoutes.Normal });
 
       expect(loader.state.dashboard?.state.uid).toBe('fake-dash');
       expect(loader.state.loadError).toBe(undefined);
@@ -47,7 +79,17 @@ describe('DashboardScenePageStateManager', () => {
       setupLoadDashboardMock({ dashboard: { uid: 'fake-dash' }, meta: {} });
 
       const loader = new DashboardScenePageStateManager({});
-      await loader.loadDashboard('fake-dash');
+      await loader.loadDashboard({ uid: 'fake-dash', route: DashboardRoutes.Normal });
+
+      expect(loader.state.dashboard).toBeInstanceOf(DashboardScene);
+      expect(loader.state.isLoading).toBe(false);
+    });
+
+    it('should use DashboardScene creator to initialize the snapshot scene', async () => {
+      setupLoadDashboardMock({ dashboard: { uid: 'fake-dash' }, meta: {} });
+
+      const loader = new DashboardScenePageStateManager({});
+      await loader.loadSnapshot('fake-slug');
 
       expect(loader.state.dashboard).toBeInstanceOf(DashboardScene);
       expect(loader.state.isLoading).toBe(false);
@@ -59,7 +101,7 @@ describe('DashboardScenePageStateManager', () => {
       locationService.partial({ from: 'now-5m', to: 'now' });
 
       const loader = new DashboardScenePageStateManager({});
-      await loader.loadDashboard('fake-dash');
+      await loader.loadDashboard({ uid: 'fake-dash', route: DashboardRoutes.Normal });
       const dash = loader.state.dashboard;
 
       expect(dash!.state.$timeRange?.state.from).toEqual('now-5m');
@@ -69,10 +111,141 @@ describe('DashboardScenePageStateManager', () => {
       // try loading again (and hitting cache)
       locationService.partial({ from: 'now-10m', to: 'now' });
 
-      await loader.loadDashboard('fake-dash');
+      await loader.loadDashboard({ uid: 'fake-dash', route: DashboardRoutes.Normal });
       const dash2 = loader.state.dashboard;
 
       expect(dash2!.state.$timeRange?.state.from).toEqual('now-10m');
     });
+
+    it('should not initialize url sync for embedded dashboards', async () => {
+      setupLoadDashboardMock({ dashboard: { uid: 'fake-dash' }, meta: {} });
+
+      locationService.partial({ from: 'now-5m', to: 'now' });
+
+      const loader = new DashboardScenePageStateManager({});
+      await loader.loadDashboard({ uid: 'fake-dash', route: DashboardRoutes.Embedded });
+      const dash = loader.state.dashboard;
+
+      expect(dash!.state.$timeRange?.state.from).toEqual('now-6h');
+    });
+
+    describe('New dashboards', () => {
+      it('Should have new empty model with meta.isNew and should not be cached', async () => {
+        const loader = new DashboardScenePageStateManager({});
+
+        await loader.loadDashboard({ uid: '', route: DashboardRoutes.New });
+        const dashboard = loader.state.dashboard!;
+
+        expect(dashboard.state.meta.isNew).toBe(true);
+        expect(dashboard.state.isEditing).toBe(undefined);
+        expect(dashboard.state.isDirty).toBe(false);
+
+        dashboard.setState({ title: 'Changed' });
+
+        await loader.loadDashboard({ uid: '', route: DashboardRoutes.New });
+        const dashboard2 = loader.state.dashboard!;
+
+        expect(dashboard2.state.title).toBe('New dashboard');
+      });
+    });
+
+    describe('caching', () => {
+      it('should take scene from cache if it exists', async () => {
+        setupLoadDashboardMock({ dashboard: { uid: 'fake-dash', version: 10 }, meta: {} });
+
+        const loader = new DashboardScenePageStateManager({});
+
+        await loader.loadDashboard({ uid: 'fake-dash', route: DashboardRoutes.Normal });
+
+        loader.state.dashboard?.onEnterEditMode();
+
+        expect(loader.state.dashboard?.state.isEditing).toBe(true);
+
+        loader.clearState();
+
+        // now load it again
+        await loader.loadDashboard({ uid: 'fake-dash', route: DashboardRoutes.Normal });
+
+        // should still be editing
+        expect(loader.state.dashboard?.state.isEditing).toBe(true);
+        expect(loader.state.dashboard?.state.version).toBe(10);
+
+        loader.clearState();
+
+        loader.setDashboardCache('fake-dash', {
+          dashboard: { title: 'new version', uid: 'fake-dash', version: 11, schemaVersion: 30 },
+          meta: {},
+        });
+
+        // now load a third time
+        await loader.loadDashboard({ uid: 'fake-dash', route: DashboardRoutes.Normal });
+
+        expect(loader.state.dashboard!.state.isEditing).toBe(undefined);
+        expect(loader.state.dashboard!.state.version).toBe(11);
+      });
+
+      it('should cache the dashboard DTO', async () => {
+        setupLoadDashboardMock({ dashboard: { uid: 'fake-dash' }, meta: {} });
+
+        const loader = new DashboardScenePageStateManager({});
+
+        expect(loader.getFromCache('fake-dash')).toBeNull();
+
+        await loader.loadDashboard({ uid: 'fake-dash', route: DashboardRoutes.Normal });
+
+        expect(loader.getFromCache('fake-dash')).toBeDefined();
+      });
+
+      it('should load dashboard DTO from cache if requested again within 2s', async () => {
+        const loadDashSpy = jest.fn();
+        setupLoadDashboardMock({ dashboard: { uid: 'fake-dash' }, meta: {} }, loadDashSpy);
+
+        const loader = new DashboardScenePageStateManager({});
+
+        expect(loader.getFromCache('fake-dash')).toBeNull();
+
+        await loader.fetchDashboard({ uid: 'fake-dash', route: DashboardRoutes.Normal });
+        expect(loadDashSpy).toHaveBeenCalledTimes(1);
+
+        advanceBy(DASHBOARD_CACHE_TTL / 2);
+        await loader.fetchDashboard({ uid: 'fake-dash', route: DashboardRoutes.Normal });
+        expect(loadDashSpy).toHaveBeenCalledTimes(1);
+
+        advanceBy(DASHBOARD_CACHE_TTL / 2 + 1);
+        await loader.fetchDashboard({ uid: 'fake-dash', route: DashboardRoutes.Normal });
+        expect(loadDashSpy).toHaveBeenCalledTimes(2);
+      });
+    });
+
+    describe('When coming from explore', () => {
+      it('shoud fetch dashboard from local storage and keep it there after when asked', async () => {
+        const loader = new DashboardScenePageStateManager({});
+        const localStorageDashboard = { uid: 'fake-dash' };
+        store.setObject(DASHBOARD_FROM_LS_KEY, { dashboard: localStorageDashboard });
+
+        const result = await loader.fetchDashboard({
+          uid: 'fake-dash',
+          route: DashboardRoutes.Normal,
+          keepDashboardFromExploreInLocalStorage: true,
+        });
+
+        expect(result).toEqual({ dashboard: localStorageDashboard });
+        expect(store.getObject(DASHBOARD_FROM_LS_KEY)).toEqual({ dashboard: localStorageDashboard });
+      });
+
+      it('shoud not store dashboard in cache when coming from Explore', async () => {
+        const loader = new DashboardScenePageStateManager({});
+        const localStorageDashboard = { uid: 'fake-dash' };
+        store.setObject(DASHBOARD_FROM_LS_KEY, { dashboard: localStorageDashboard });
+
+        await loader.loadDashboard({
+          uid: 'fake-dash',
+          route: DashboardRoutes.Normal,
+          keepDashboardFromExploreInLocalStorage: false,
+        });
+
+        expect(loader.getFromCache('fake-dash')).toBeNull();
+      });
+    });
   });
 });
diff --git a/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts b/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts
index 78faff6573178..b2ba49b71bace 100644
--- a/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts
+++ b/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts
@@ -1,11 +1,23 @@
+import { locationUtil } from '@grafana/data';
+import { config, getBackendSrv, isFetchError, locationService } from '@grafana/runtime';
 import { StateManagerBase } from 'app/core/services/StateManagerBase';
+import { default as localStorageStore } from 'app/core/store';
+import { startMeasure, stopMeasure } from 'app/core/utils/metrics';
 import { dashboardLoaderSrv } from 'app/features/dashboard/services/DashboardLoaderSrv';
 import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
+import {
+  DASHBOARD_FROM_LS_KEY,
+  removeDashboardToFetchFromLocalStorage,
+} from 'app/features/dashboard/state/initDashboard';
+import { trackDashboardSceneLoaded } from 'app/features/dashboard/utils/tracking';
+import { DashboardDTO, DashboardRoutes } from 'app/types';
 
-import { buildPanelEditScene, PanelEditor } from '../panel-edit/PanelEditor';
+import { PanelEditor } from '../panel-edit/PanelEditor';
 import { DashboardScene } from '../scene/DashboardScene';
+import { buildNewDashboardSaveModel } from '../serialization/buildNewDashboardSaveModel';
 import { transformSaveModelToScene } from '../serialization/transformSaveModelToScene';
-import { getVizPanelKeyForPanelId, findVizPanelByKey } from '../utils/utils';
+
+import { updateNavModel } from './utils';
 
 export interface DashboardScenePageState {
   dashboard?: DashboardScene;
@@ -14,13 +26,130 @@ export interface DashboardScenePageState {
   loadError?: string;
 }
 
+export const DASHBOARD_CACHE_TTL = 500;
+
+const LOAD_SCENE_MEASUREMENT = 'loadDashboardScene';
+
+/** Only used by cache in loading home in DashboardPageProxy and initDashboard (Old arch), can remove this after old dashboard arch is gone */
+export const HOME_DASHBOARD_CACHE_KEY = '__grafana_home_uid__';
+
+interface DashboardCacheEntry {
+  dashboard: DashboardDTO;
+  ts: number;
+  cacheKey: string;
+}
+
+export interface LoadDashboardOptions {
+  uid: string;
+  route: DashboardRoutes;
+  urlFolderUid?: string;
+  // A temporary approach not to clean the dashboard from local storage when navigating from Explore to Dashboard
+  // We currently need it as there are two flows of fetching dashboard. The legacy one (initDashboard), uses the new one(DashboardScenePageStateManager.fetch) where the
+  // removal of the dashboard from local storage is implemented. So in the old flow we wouldn't be able to early return dashboard from local storage, if we prematurely
+  // removed it when prefetching the dashboard in DashboardPageProxy.
+  // This property will be removed when the old flow (initDashboard) is removed.
+  keepDashboardFromExploreInLocalStorage?: boolean;
+}
+
 export class DashboardScenePageStateManager extends StateManagerBase<DashboardScenePageState> {
   private cache: Record<string, DashboardScene> = {};
 
-  public async loadDashboard(uid: string) {
+  // This is a simplistic, short-term cache for DashboardDTOs to avoid fetching the same dashboard multiple times across a short time span.
+  private dashboardCache?: DashboardCacheEntry;
+
+  // To eventualy replace the fetchDashboard function from Dashboard redux state management.
+  // For now it's a simplistic version to support Home and Normal dashboard routes.
+  public async fetchDashboard({
+    uid,
+    route,
+    urlFolderUid,
+    keepDashboardFromExploreInLocalStorage,
+  }: LoadDashboardOptions): Promise<DashboardDTO | null> {
+    const model = localStorageStore.getObject<DashboardDTO>(DASHBOARD_FROM_LS_KEY);
+
+    if (model) {
+      if (!keepDashboardFromExploreInLocalStorage) {
+        removeDashboardToFetchFromLocalStorage();
+      }
+      return model;
+    }
+
+    const cacheKey = route === DashboardRoutes.Home ? HOME_DASHBOARD_CACHE_KEY : uid;
+    const cachedDashboard = this.getFromCache(cacheKey);
+
+    if (cachedDashboard) {
+      return cachedDashboard;
+    }
+
+    let rsp: DashboardDTO;
+
     try {
-      const dashboard = await this.loadScene(uid);
-      dashboard.startUrlSync();
+      switch (route) {
+        case DashboardRoutes.New:
+          rsp = buildNewDashboardSaveModel(urlFolderUid);
+          break;
+        case DashboardRoutes.Home:
+          rsp = await getBackendSrv().get('/api/dashboards/home');
+
+          if (rsp.redirectUri) {
+            return rsp;
+          }
+
+          if (rsp?.meta) {
+            rsp.meta.canSave = false;
+            rsp.meta.canShare = false;
+            rsp.meta.canStar = false;
+          }
+
+          break;
+        case DashboardRoutes.Public: {
+          return await dashboardLoaderSrv.loadDashboard('public', '', uid);
+        }
+        default:
+          rsp = await dashboardLoaderSrv.loadDashboard('db', '', uid);
+
+          if (route === DashboardRoutes.Embedded) {
+            rsp.meta.isEmbedded = true;
+          }
+      }
+
+      if (rsp.meta.url && route === DashboardRoutes.Normal) {
+        const dashboardUrl = locationUtil.stripBaseFromUrl(rsp.meta.url);
+        const currentPath = locationService.getLocation().pathname;
+
+        if (dashboardUrl !== currentPath) {
+          // Spread current location to persist search params used for navigation
+          locationService.replace({
+            ...locationService.getLocation(),
+            pathname: dashboardUrl,
+          });
+          console.log('not correct url correcting', dashboardUrl, currentPath);
+        }
+      }
+
+      // Populate nav model in global store according to the folder
+      if (rsp.meta.folderUid) {
+        await updateNavModel(rsp.meta.folderUid);
+      }
+
+      // Do not cache new dashboards
+      this.dashboardCache = { dashboard: rsp, ts: Date.now(), cacheKey };
+    } catch (e) {
+      // Ignore cancelled errors
+      if (isFetchError(e) && e.cancelled) {
+        return null;
+      }
+
+      console.error(e);
+      throw e;
+    }
+
+    return rsp;
+  }
+
+  public async loadSnapshot(slug: string) {
+    try {
+      const dashboard = await this.loadSnapshotScene(slug);
 
       this.setState({ dashboard: dashboard, isLoading: false });
     } catch (err) {
@@ -28,47 +157,107 @@ export class DashboardScenePageStateManager extends StateManagerBase<DashboardSc
     }
   }
 
-  public async loadPanelEdit(uid: string, panelId: string) {
-    try {
-      const dashboard = await this.loadScene(uid);
-      const panel = findVizPanelByKey(dashboard, getVizPanelKeyForPanelId(parseInt(panelId, 10)));
+  private async loadSnapshotScene(slug: string): Promise<DashboardScene> {
+    const rsp = await dashboardLoaderSrv.loadDashboard('snapshot', slug, '');
+
+    if (rsp?.dashboard) {
+      const scene = transformSaveModelToScene(rsp);
+      return scene;
+    }
+
+    throw new Error('Snapshot not found');
+  }
 
-      if (!panel) {
-        this.setState({ isLoading: false, loadError: 'Panel not found' });
+  public async loadDashboard(options: LoadDashboardOptions) {
+    try {
+      startMeasure(LOAD_SCENE_MEASUREMENT);
+      const dashboard = await this.loadScene(options);
+      if (!dashboard) {
         return;
       }
 
-      const panelEditor = buildPanelEditScene(dashboard, panel);
-      panelEditor.startUrlSync();
+      if (!(config.publicDashboardAccessToken && dashboard.state.controls?.state.hideTimeControls)) {
+        dashboard.startUrlSync();
+      }
 
-      this.setState({ isLoading: false, panelEditor });
+      this.setState({ dashboard: dashboard, isLoading: false });
+      const measure = stopMeasure(LOAD_SCENE_MEASUREMENT);
+      trackDashboardSceneLoaded(dashboard, measure?.duration);
     } catch (err) {
       this.setState({ isLoading: false, loadError: String(err) });
     }
   }
 
-  private async loadScene(uid: string): Promise<DashboardScene> {
-    const fromCache = this.cache[uid];
-    if (fromCache) {
-      return fromCache;
-    }
+  private async loadScene(options: LoadDashboardOptions): Promise<DashboardScene | null> {
+    const comingFromExplore = Boolean(
+      localStorageStore.getObject<DashboardDTO>(DASHBOARD_FROM_LS_KEY) &&
+        options.keepDashboardFromExploreInLocalStorage === false
+    );
 
     this.setState({ isLoading: true });
 
-    const rsp = await dashboardLoaderSrv.loadDashboard('db', '', uid);
+    const rsp = await this.fetchDashboard(options);
+
+    const fromCache = this.cache[options.uid];
+
+    // When coming from Explore, skip returnning scene from cache
+    if (!comingFromExplore) {
+      if (fromCache && fromCache.state.version === rsp?.dashboard.version) {
+        return fromCache;
+      }
+    }
 
-    if (rsp.dashboard) {
+    if (rsp?.dashboard) {
       const scene = transformSaveModelToScene(rsp);
-      this.cache[uid] = scene;
+
+      // Cache scene only if not coming from Explore, we don't want to cache temporary dashboard
+      if (options.uid && !comingFromExplore) {
+        this.cache[options.uid] = scene;
+      }
+
       return scene;
     }
 
+    if (rsp?.redirectUri) {
+      const newUrl = locationUtil.stripBaseFromUrl(rsp.redirectUri);
+      locationService.replace(newUrl);
+      return null;
+    }
+
     throw new Error('Dashboard not found');
   }
 
+  public getFromCache(cacheKey: string) {
+    const cachedDashboard = this.dashboardCache;
+
+    if (
+      cachedDashboard &&
+      cachedDashboard.cacheKey === cacheKey &&
+      Date.now() - cachedDashboard?.ts < DASHBOARD_CACHE_TTL
+    ) {
+      return cachedDashboard.dashboard;
+    }
+
+    return null;
+  }
+
   public clearState() {
     getDashboardSrv().setCurrent(undefined);
-    this.setState({ dashboard: undefined, loadError: undefined, isLoading: false, panelEditor: undefined });
+
+    this.setState({
+      dashboard: undefined,
+      loadError: undefined,
+      isLoading: false,
+      panelEditor: undefined,
+    });
+  }
+
+  public setDashboardCache(cacheKey: string, dashboard: DashboardDTO) {
+    this.dashboardCache = { dashboard, ts: Date.now(), cacheKey };
+  }
+
+  public clearDashboardCache() {
+    this.dashboardCache = undefined;
   }
 }
 
diff --git a/public/app/features/dashboard-scene/pages/PanelEditPage.tsx b/public/app/features/dashboard-scene/pages/PanelEditPage.tsx
deleted file mode 100644
index dc35c4fd807d6..0000000000000
--- a/public/app/features/dashboard-scene/pages/PanelEditPage.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-// Libraries
-import React, { useEffect } from 'react';
-
-import { PageLayoutType } from '@grafana/data';
-import { Page } from 'app/core/components/Page/Page';
-import PageLoader from 'app/core/components/PageLoader/PageLoader';
-import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
-
-import { getDashboardScenePageStateManager } from './DashboardScenePageStateManager';
-
-export interface Props extends GrafanaRouteComponentProps<{ uid: string; panelId: string }> {}
-
-export function PanelEditPage({ match }: Props) {
-  const stateManager = getDashboardScenePageStateManager();
-  const { panelEditor, isLoading, loadError } = stateManager.useState();
-
-  useEffect(() => {
-    stateManager.loadPanelEdit(match.params.uid, match.params.panelId);
-    return () => {
-      stateManager.clearState();
-    };
-  }, [stateManager, match.params.uid, match.params.panelId]);
-
-  if (!panelEditor) {
-    return (
-      <Page layout={PageLayoutType.Canvas}>
-        {isLoading && <PageLoader />}
-        {loadError && <h2>{loadError}</h2>}
-      </Page>
-    );
-  }
-
-  return <panelEditor.Component model={panelEditor} />;
-}
-
-export default PanelEditPage;
diff --git a/public/app/features/dashboard-scene/pages/PublicDashboardScenePage.test.tsx b/public/app/features/dashboard-scene/pages/PublicDashboardScenePage.test.tsx
new file mode 100644
index 0000000000000..cbcd8909ad632
--- /dev/null
+++ b/public/app/features/dashboard-scene/pages/PublicDashboardScenePage.test.tsx
@@ -0,0 +1,243 @@
+import { render, screen, waitForElementToBeRemoved } from '@testing-library/react';
+import React from 'react';
+import { of } from 'rxjs';
+import { TestProvider } from 'test/helpers/TestProvider';
+import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
+
+import { getDefaultTimeRange, LoadingState, PanelData, PanelProps } from '@grafana/data';
+import { getPanelPlugin } from '@grafana/data/test/__mocks__/pluginMocks';
+import { selectors as e2eSelectors } from '@grafana/e2e-selectors';
+import { config, getPluginLinkExtensions, setPluginImportUtils, setRunRequest } from '@grafana/runtime';
+import { Dashboard } from '@grafana/schema';
+import { getRouteComponentProps } from 'app/core/navigation/__mocks__/routeProps';
+import { DashboardRoutes } from 'app/types/dashboard';
+
+import { setupLoadDashboardMock } from '../utils/test-utils';
+
+import { getDashboardScenePageStateManager } from './DashboardScenePageStateManager';
+import { PublicDashboardScenePage, Props as PublicDashboardSceneProps } from './PublicDashboardScenePage';
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  setPluginExtensionGetter: jest.fn(),
+  getPluginLinkExtensions: jest.fn(),
+  getDataSourceSrv: () => {
+    return {
+      get: jest.fn().mockResolvedValue({}),
+      getInstanceSettings: jest.fn().mockResolvedValue({ uid: 'ds1' }),
+    };
+  },
+}));
+
+const getPluginLinkExtensionsMock = jest.mocked(getPluginLinkExtensions);
+
+function setup(props?: Partial<PublicDashboardSceneProps>) {
+  const context = getGrafanaContextMock();
+
+  const pubdashProps: PublicDashboardSceneProps = {
+    ...getRouteComponentProps({
+      match: { params: { accessToken: 'an-access-token' }, isExact: true, url: '', path: '' },
+      route: {
+        routeName: DashboardRoutes.Public,
+        path: '/public-dashboards/:accessToken',
+        component: () => null,
+      },
+    }),
+    ...props,
+  };
+
+  return render(
+    <TestProvider grafanaContext={context}>
+      <PublicDashboardScenePage {...pubdashProps} />
+    </TestProvider>
+  );
+}
+
+const simpleDashboard: Dashboard = {
+  title: 'My cool dashboard',
+  uid: 'my-dash-uid',
+  schemaVersion: 30,
+  version: 1,
+  timepicker: { hidden: false },
+  panels: [
+    {
+      id: 1,
+      type: 'custom-viz-panel',
+      title: 'Panel A',
+      options: {
+        content: `Content A`,
+      },
+      gridPos: {
+        x: 0,
+        y: 0,
+        w: 10,
+        h: 10,
+      },
+      targets: [],
+    },
+    {
+      id: 2,
+      type: 'custom-viz-panel',
+      title: 'Panel B',
+      options: {
+        content: `Content B`,
+      },
+      gridPos: {
+        x: 0,
+        y: 10,
+        w: 10,
+        h: 10,
+      },
+      targets: [],
+    },
+  ],
+};
+
+const panelPlugin = getPanelPlugin(
+  {
+    skipDataQuery: true,
+  },
+  CustomVizPanel
+);
+
+config.panels['custom-viz-panel'] = panelPlugin.meta;
+
+setPluginImportUtils({
+  importPanelPlugin: (id: string) => Promise.resolve(panelPlugin),
+  getPanelPluginFromCache: (id: string) => undefined,
+});
+
+const runRequestMock = jest.fn().mockReturnValue(
+  of<PanelData>({
+    state: LoadingState.Done,
+    series: [],
+    timeRange: getDefaultTimeRange(),
+    annotations: [],
+  })
+);
+setRunRequest(runRequestMock);
+
+const componentsSelector = e2eSelectors.components;
+const publicDashboardSelector = e2eSelectors.pages.PublicDashboard;
+const publicDashboardSceneSelector = e2eSelectors.pages.PublicDashboardScene;
+
+describe('PublicDashboardScenePage', () => {
+  beforeEach(() => {
+    config.publicDashboardAccessToken = 'an-access-token';
+    getDashboardScenePageStateManager().clearDashboardCache();
+    setupLoadDashboardMock({ dashboard: simpleDashboard, meta: {} });
+
+    // // hacky way because mocking autosizer does not work
+    Object.defineProperty(HTMLElement.prototype, 'offsetHeight', { configurable: true, value: 1000 });
+    Object.defineProperty(HTMLElement.prototype, 'offsetWidth', { configurable: true, value: 1000 });
+    getPluginLinkExtensionsMock.mockRestore();
+    getPluginLinkExtensionsMock.mockReturnValue({ extensions: [] });
+  });
+
+  it('can render public dashboard', async () => {
+    setup();
+
+    await waitForDashboardGridToRender();
+
+    expect(await screen.findByTitle('Panel A')).toBeInTheDocument();
+    expect(await screen.findByText('Content A')).toBeInTheDocument();
+
+    expect(await screen.findByTitle('Panel B')).toBeInTheDocument();
+    expect(await screen.findByText('Content B')).toBeInTheDocument();
+
+    expect(await screen.findByTestId(publicDashboardSelector.footer)).toBeInTheDocument();
+  });
+
+  it('cannot see menu panel', async () => {
+    setup();
+
+    await waitForDashboardGridToRender();
+
+    expect(screen.queryByTestId(componentsSelector.Panels.Panel.menu('Panel A'))).not.toBeInTheDocument();
+    expect(screen.queryByTestId(componentsSelector.Panels.Panel.menu('Panel B'))).not.toBeInTheDocument();
+  });
+
+  it('shows time controls when it is not hidden', async () => {
+    setup();
+
+    await waitForDashboardGridToRender();
+
+    expect(screen.queryByTestId(componentsSelector.TimePicker.openButton)).toBeInTheDocument();
+    expect(screen.queryByTestId(componentsSelector.RefreshPicker.runButtonV2)).toBeInTheDocument();
+    expect(screen.queryByTestId(componentsSelector.RefreshPicker.intervalButtonV2)).toBeInTheDocument();
+  });
+
+  it('does not render paused or deleted screen', async () => {
+    setup();
+
+    await waitForDashboardGridToRender();
+
+    expect(screen.queryByTestId(publicDashboardSelector.NotAvailable.container)).not.toBeInTheDocument();
+  });
+
+  it('does not show time controls when it is hidden', async () => {
+    const accessToken = 'hidden-time-picker-pubdash-access-token';
+    config.publicDashboardAccessToken = accessToken;
+    setupLoadDashboardMock({
+      dashboard: { ...simpleDashboard, timepicker: { hidden: true } },
+      meta: {},
+    });
+    setup({
+      match: { params: { accessToken }, isExact: true, url: '', path: '' },
+    });
+
+    await waitForDashboardGridToRender();
+
+    expect(screen.queryByTestId(componentsSelector.TimePicker.openButton)).not.toBeInTheDocument();
+    expect(screen.queryByTestId(componentsSelector.RefreshPicker.runButtonV2)).not.toBeInTheDocument();
+    expect(screen.queryByTestId(componentsSelector.RefreshPicker.intervalButtonV2)).not.toBeInTheDocument();
+  });
+});
+
+describe('given unavailable public dashboard', () => {
+  it('renders public dashboard paused screen when it is paused', async () => {
+    const accessToken = 'paused-pubdash-access-token';
+    config.publicDashboardAccessToken = accessToken;
+    setupLoadDashboardMock({
+      dashboard: simpleDashboard,
+      meta: { publicDashboardEnabled: false, dashboardNotFound: false },
+    });
+    setup({ match: { params: { accessToken }, isExact: true, url: '', path: '' } });
+
+    await waitForElementToBeRemoved(screen.getByTestId(publicDashboardSceneSelector.loadingPage));
+
+    expect(screen.queryByTestId(publicDashboardSceneSelector.page)).not.toBeInTheDocument();
+    expect(screen.getByTestId(publicDashboardSelector.NotAvailable.title)).toBeInTheDocument();
+    expect(screen.getByTestId(publicDashboardSelector.NotAvailable.pausedDescription)).toBeInTheDocument();
+  });
+
+  it('renders public dashboard not available screen when it is deleted', async () => {
+    const accessToken = 'deleted-pubdash-access-token';
+    config.publicDashboardAccessToken = accessToken;
+    setupLoadDashboardMock({
+      dashboard: simpleDashboard,
+      meta: { dashboardNotFound: true },
+    });
+    setup({ match: { params: { accessToken }, isExact: true, url: '', path: '' } });
+
+    await waitForElementToBeRemoved(screen.getByTestId(publicDashboardSceneSelector.loadingPage));
+
+    expect(screen.queryByTestId(publicDashboardSelector.page)).not.toBeInTheDocument();
+    expect(screen.queryByTestId(publicDashboardSelector.NotAvailable.pausedDescription)).not.toBeInTheDocument();
+    expect(screen.getByTestId(publicDashboardSelector.NotAvailable.title)).toBeInTheDocument();
+  });
+});
+
+interface VizOptions {
+  content: string;
+}
+interface VizProps extends PanelProps<VizOptions> {}
+
+function CustomVizPanel(props: VizProps) {
+  return <div>{props.options.content}</div>;
+}
+
+async function waitForDashboardGridToRender() {
+  expect(await screen.findByTitle('Panel A')).toBeInTheDocument();
+  expect(await screen.findByTitle('Panel B')).toBeInTheDocument();
+}
diff --git a/public/app/features/dashboard-scene/pages/PublicDashboardScenePage.tsx b/public/app/features/dashboard-scene/pages/PublicDashboardScenePage.tsx
new file mode 100644
index 0000000000000..c53917e0c60c0
--- /dev/null
+++ b/public/app/features/dashboard-scene/pages/PublicDashboardScenePage.tsx
@@ -0,0 +1,145 @@
+import { css } from '@emotion/css';
+import React, { useEffect, useState } from 'react';
+
+import { GrafanaTheme2, PageLayoutType } from '@grafana/data';
+import { selectors as e2eSelectors } from '@grafana/e2e-selectors';
+import { SceneComponentProps } from '@grafana/scenes';
+import { Icon, Stack, useStyles2 } from '@grafana/ui';
+import { Page } from 'app/core/components/Page/Page';
+import PageLoader from 'app/core/components/PageLoader/PageLoader';
+import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
+import { PublicDashboardFooter } from 'app/features/dashboard/components/PublicDashboard/PublicDashboardsFooter';
+import { PublicDashboardNotAvailable } from 'app/features/dashboard/components/PublicDashboardNotAvailable/PublicDashboardNotAvailable';
+import {
+  PublicDashboardPageRouteParams,
+  PublicDashboardPageRouteSearchParams,
+} from 'app/features/dashboard/containers/types';
+import { DashboardRoutes } from 'app/types/dashboard';
+
+import { DashboardScene } from '../scene/DashboardScene';
+
+import { getDashboardScenePageStateManager } from './DashboardScenePageStateManager';
+
+export interface Props
+  extends GrafanaRouteComponentProps<PublicDashboardPageRouteParams, PublicDashboardPageRouteSearchParams> {}
+
+const selectors = e2eSelectors.pages.PublicDashboardScene;
+
+export function PublicDashboardScenePage({ match, route }: Props) {
+  const stateManager = getDashboardScenePageStateManager();
+  const styles = useStyles2(getStyles);
+  const { dashboard, isLoading, loadError } = stateManager.useState();
+
+  useEffect(() => {
+    stateManager.loadDashboard({ uid: match.params.accessToken!, route: DashboardRoutes.Public });
+
+    return () => {
+      stateManager.clearState();
+    };
+  }, [stateManager, match.params.accessToken, route.routeName]);
+
+  if (!dashboard) {
+    return (
+      <Page layout={PageLayoutType.Custom} className={styles.loadingPage} data-testid={selectors.loadingPage}>
+        {isLoading && <PageLoader />}
+        {loadError && <h2>{loadError}</h2>}
+      </Page>
+    );
+  }
+
+  if (dashboard.state.meta.publicDashboardEnabled === false) {
+    return <PublicDashboardNotAvailable paused />;
+  }
+
+  if (dashboard.state.meta.dashboardNotFound) {
+    return <PublicDashboardNotAvailable />;
+  }
+
+  return <PublicDashboardSceneRenderer model={dashboard} />;
+}
+
+function PublicDashboardSceneRenderer({ model }: SceneComponentProps<DashboardScene>) {
+  const [isActive, setIsActive] = useState(false);
+  const { controls, title } = model.useState();
+  const { timePicker, refreshPicker, hideTimeControls } = controls!.useState();
+  const bodyToRender = model.getBodyToRender();
+  const styles = useStyles2(getStyles);
+
+  useEffect(() => {
+    setIsActive(true);
+    return model.activate();
+  }, [model]);
+
+  if (!isActive) {
+    return null;
+  }
+
+  return (
+    <Page layout={PageLayoutType.Custom} className={styles.page} data-testid={selectors.page}>
+      <div className={styles.controls}>
+        <Stack alignItems="center">
+          <div className={styles.iconTitle}>
+            <Icon name="grafana" size="lg" aria-hidden />
+          </div>
+          <span className={styles.title}>{title}</span>
+        </Stack>
+        {!hideTimeControls && (
+          <Stack>
+            <timePicker.Component model={timePicker} />
+            <refreshPicker.Component model={refreshPicker} />
+          </Stack>
+        )}
+      </div>
+      <div className={styles.body}>
+        <bodyToRender.Component model={bodyToRender} />
+      </div>
+      <PublicDashboardFooter />
+    </Page>
+  );
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    loadingPage: css({
+      justifyContent: 'center',
+    }),
+    page: css({
+      padding: theme.spacing(0, 2),
+    }),
+    controls: css({
+      display: 'flex',
+      justifyContent: 'space-between',
+      alignItems: 'center',
+      position: 'sticky',
+      top: 0,
+      zIndex: theme.zIndex.navbarFixed,
+      background: theme.colors.background.canvas,
+      padding: theme.spacing(2, 0),
+      [theme.breakpoints.down('sm')]: {
+        flexDirection: 'column',
+        gap: theme.spacing(1),
+        alignItems: 'stretch',
+      },
+    }),
+    iconTitle: css({
+      display: 'none',
+      [theme.breakpoints.up('sm')]: {
+        display: 'flex',
+        alignItems: 'center',
+      },
+    }),
+    title: css({
+      overflow: 'hidden',
+      textOverflow: 'ellipsis',
+      whiteSpace: 'nowrap',
+      display: 'flex',
+      fontSize: theme.typography.h4.fontSize,
+      margin: 0,
+    }),
+    body: css({
+      label: 'body',
+      flex: 1,
+      overflowY: 'auto',
+    }),
+  };
+}
diff --git a/public/app/features/dashboard-scene/pages/utils.test.ts b/public/app/features/dashboard-scene/pages/utils.test.ts
new file mode 100644
index 0000000000000..416181dee151a
--- /dev/null
+++ b/public/app/features/dashboard-scene/pages/utils.test.ts
@@ -0,0 +1,32 @@
+import { backendSrv } from 'app/core/services/backend_srv';
+import { configureStore } from 'app/store/configureStore';
+
+import { updateNavModel } from './utils';
+
+describe('utils', () => {
+  it('Should update nav model', async () => {
+    const reduxStore = configureStore();
+
+    jest.spyOn(backendSrv, 'getFolderByUid').mockResolvedValue({
+      id: 1,
+      uid: 'new-folder',
+      title: 'NewFolder',
+      url: '',
+      canAdmin: true,
+      canDelete: true,
+      canEdit: true,
+      canSave: true,
+      created: '',
+      createdBy: '',
+      hasAcl: false,
+      updated: '',
+      updatedBy: '',
+    });
+
+    expect(reduxStore.getState().navIndex[`folder-dashboards-new-folder`]).toBeUndefined();
+
+    await updateNavModel('new-folder');
+
+    expect(reduxStore.getState().navIndex[`folder-dashboards-new-folder`]).not.toBeUndefined();
+  });
+});
diff --git a/public/app/features/dashboard-scene/pages/utils.ts b/public/app/features/dashboard-scene/pages/utils.ts
new file mode 100644
index 0000000000000..2e06429589fbc
--- /dev/null
+++ b/public/app/features/dashboard-scene/pages/utils.ts
@@ -0,0 +1,13 @@
+import { updateNavIndex } from 'app/core/actions';
+import { backendSrv } from 'app/core/services/backend_srv';
+import { buildNavModel } from 'app/features/folders/state/navModel';
+import { store } from 'app/store/store';
+
+export async function updateNavModel(folderUid: string) {
+  try {
+    const folder = await backendSrv.getFolderByUid(folderUid);
+    store.dispatch(updateNavIndex(buildNavModel(folder)));
+  } catch (err) {
+    console.warn('Error fetching parent folder', folderUid, 'for dashboard', err);
+  }
+}
diff --git a/public/app/features/dashboard-scene/panel-edit/LibraryVizPanelInfo.tsx b/public/app/features/dashboard-scene/panel-edit/LibraryVizPanelInfo.tsx
new file mode 100644
index 0000000000000..bd741ee48fd56
--- /dev/null
+++ b/public/app/features/dashboard-scene/panel-edit/LibraryVizPanelInfo.tsx
@@ -0,0 +1,58 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2, dateTimeFormat } from '@grafana/data';
+import { useStyles2 } from '@grafana/ui';
+
+import { LibraryVizPanel } from '../scene/LibraryVizPanel';
+
+interface Props {
+  libraryPanel: LibraryVizPanel;
+}
+
+export const LibraryVizPanelInfo = ({ libraryPanel }: Props) => {
+  const styles = useStyles2(getStyles);
+
+  const libraryPanelState = libraryPanel.useState();
+  const tz = libraryPanelState.$timeRange?.getTimeZone();
+  const meta = libraryPanelState._loadedPanel?.meta;
+  if (!meta) {
+    return null;
+  }
+
+  return (
+    <div className={styles.info}>
+      <div className={styles.libraryPanelInfo}>
+        {`Used on ${meta.connectedDashboards} `}
+        {meta.connectedDashboards === 1 ? 'dashboard' : 'dashboards'}
+      </div>
+      <div className={styles.libraryPanelInfo}>
+        {dateTimeFormat(meta.updated, { format: 'L', timeZone: tz })} by
+        {meta.updatedBy.avatarUrl && (
+          <img className={styles.userAvatar} src={meta.updatedBy.avatarUrl} alt={`Avatar for ${meta.updatedBy.name}`} />
+        )}
+        {meta.updatedBy.name}
+      </div>
+    </div>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    info: css({
+      lineHeight: 1,
+    }),
+    libraryPanelInfo: css({
+      color: theme.colors.text.secondary,
+      fontSize: theme.typography.bodySmall.fontSize,
+    }),
+    userAvatar: css({
+      borderRadius: theme.shape.radius.circle,
+      boxSizing: 'content-box',
+      width: '22px',
+      height: '22px',
+      paddingLeft: theme.spacing(1),
+      paddingRight: theme.spacing(1),
+    }),
+  };
+};
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/EmptyTransformationsMessage.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/EmptyTransformationsMessage.tsx
new file mode 100644
index 0000000000000..c452a9cfd1186
--- /dev/null
+++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/EmptyTransformationsMessage.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+
+import { selectors } from '@grafana/e2e-selectors';
+import { Box, Button, Stack, Text } from '@grafana/ui';
+import { Trans } from 'app/core/internationalization';
+
+interface EmptyTransformationsProps {
+  onShowPicker: () => void;
+}
+export function EmptyTransformationsMessage(props: EmptyTransformationsProps) {
+  return (
+    <Box alignItems="center" padding={4}>
+      <Stack direction="column" alignItems="center" gap={2}>
+        <Text element="h3" textAlignment="center">
+          <Trans key="transformations.empty.add-transformation-header">Start transforming data</Trans>
+        </Text>
+        <Text element="p" textAlignment="center" data-testid={selectors.components.Transforms.noTransformationsMessage}>
+          <Trans key="transformations.empty.add-transformation-body">
+            Transformations allow data to be changed in various ways before your visualization is shown.
+            <br />
+            This includes joining data together, renaming fields, making calculations, formatting data for display, and
+            more.
+          </Trans>
+        </Text>
+        <Button
+          icon="plus"
+          variant="primary"
+          size="md"
+          onClick={props.onShowPicker}
+          data-testid={selectors.components.Transforms.addTransformationButton}
+        >
+          Add transformation
+        </Button>
+      </Stack>
+    </Box>
+  );
+}
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/NewAlertRuleButton.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/NewAlertRuleButton.tsx
new file mode 100644
index 0000000000000..1c52f7f262ff3
--- /dev/null
+++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/NewAlertRuleButton.tsx
@@ -0,0 +1,51 @@
+import React from 'react';
+import { useLocation } from 'react-router-dom';
+import { useAsync } from 'react-use';
+
+import { urlUtil } from '@grafana/data';
+import { locationService, logInfo } from '@grafana/runtime';
+import { VizPanel } from '@grafana/scenes';
+import { Alert, Button } from '@grafana/ui';
+import { LogMessages } from 'app/features/alerting/unified/Analytics';
+import { scenesPanelToRuleFormValues } from 'app/features/alerting/unified/utils/rule-form';
+
+interface ScenesNewRuleFromPanelButtonProps {
+  panel: VizPanel;
+  className?: string;
+}
+export const ScenesNewRuleFromPanelButton = ({ panel, className }: ScenesNewRuleFromPanelButtonProps) => {
+  const location = useLocation();
+
+  const { loading, value: formValues } = useAsync(() => scenesPanelToRuleFormValues(panel), [panel]);
+
+  if (loading) {
+    return <Button disabled={true}>New alert rule</Button>;
+  }
+
+  if (!formValues) {
+    return (
+      <Alert severity="info" title="No alerting capable query found">
+        Cannot create alerts from this panel because no query to an alerting capable datasource is found.
+      </Alert>
+    );
+  }
+
+  const onClick = async () => {
+    logInfo(LogMessages.alertRuleFromPanel);
+
+    const updateToDateFormValues = await scenesPanelToRuleFormValues(panel);
+
+    const ruleFormUrl = urlUtil.renderUrl('/alerting/new', {
+      defaults: JSON.stringify(updateToDateFormValues),
+      returnTo: location.pathname + location.search,
+    });
+
+    locationService.push(ruleFormUrl);
+  };
+
+  return (
+    <Button icon="bell" onClick={onClick} className={className} data-testid="create-alert-rule-button">
+      New alert rule
+    </Button>
+  );
+};
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataAlertingTab.test.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataAlertingTab.test.tsx
new file mode 100644
index 0000000000000..a261687ea1c26
--- /dev/null
+++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataAlertingTab.test.tsx
@@ -0,0 +1,357 @@
+import { act, render } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { TestProvider } from 'test/helpers/TestProvider';
+import { byTestId } from 'testing-library-selector';
+
+import { DataSourceApi } from '@grafana/data';
+import { locationService, setDataSourceSrv } from '@grafana/runtime';
+import { fetchRules } from 'app/features/alerting/unified/api/prometheus';
+import { fetchRulerRules } from 'app/features/alerting/unified/api/ruler';
+import * as ruleActionButtons from 'app/features/alerting/unified/components/rules/RuleActionsButtons';
+import {
+  MockDataSourceSrv,
+  grantUserPermissions,
+  mockDataSource,
+  mockPromAlertingRule,
+  mockPromRuleGroup,
+  mockPromRuleNamespace,
+  mockRulerGrafanaRule,
+} from 'app/features/alerting/unified/mocks';
+import { RuleFormValues } from 'app/features/alerting/unified/types/rule-form';
+import * as config from 'app/features/alerting/unified/utils/config';
+import { Annotation } from 'app/features/alerting/unified/utils/constants';
+import { DataSourceType, GRAFANA_RULES_SOURCE_NAME } from 'app/features/alerting/unified/utils/datasource';
+import { DashboardModel, PanelModel } from 'app/features/dashboard/state';
+import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
+import { PrometheusDatasource } from 'app/plugins/datasource/prometheus/datasource';
+import { PromOptions } from 'app/plugins/datasource/prometheus/types';
+import { configureStore } from 'app/store/configureStore';
+import { AccessControlAction } from 'app/types';
+import { AlertQuery } from 'app/types/unified-alerting-dto';
+
+import { createDashboardSceneFromDashboardModel } from '../../serialization/transformSaveModelToScene';
+import { findVizPanelByKey, getVizPanelKeyForPanelId } from '../../utils/utils';
+import * as utils from '../../utils/utils';
+import { VizPanelManager } from '../VizPanelManager';
+
+import { PanelDataAlertingTab, PanelDataAlertingTabRendered } from './PanelDataAlertingTab';
+
+/**
+ * These tests has been copied from public/app/features/alerting/unified/PanelAlertTabContent.test.tsx and been slightly modified to make sure the scenes alert edit tab is as close to the old alert edit tab as possible
+ */
+
+jest.mock('app/features/alerting/unified/api/prometheus');
+jest.mock('app/features/alerting/unified/api/ruler');
+
+jest.spyOn(config, 'getAllDataSources');
+jest.spyOn(ruleActionButtons, 'matchesWidth').mockReturnValue(false);
+
+const dataSources = {
+  prometheus: mockDataSource<PromOptions>({
+    name: 'Prometheus',
+    type: DataSourceType.Prometheus,
+    isDefault: false,
+  }),
+  default: mockDataSource<PromOptions>({
+    name: 'Default',
+    type: DataSourceType.Prometheus,
+    isDefault: true,
+  }),
+};
+dataSources.prometheus.meta.alerting = true;
+dataSources.default.meta.alerting = true;
+
+const mocks = {
+  getAllDataSources: jest.mocked(config.getAllDataSources),
+  api: {
+    fetchRules: jest.mocked(fetchRules),
+    fetchRulerRules: jest.mocked(fetchRulerRules),
+  },
+};
+
+const renderAlertTabContent = (model: PanelDataAlertingTab, initialStore?: ReturnType<typeof configureStore>) => {
+  render(
+    <TestProvider store={initialStore}>
+      <PanelDataAlertingTabRendered model={model}></PanelDataAlertingTabRendered>
+    </TestProvider>
+  );
+};
+
+const rules = [
+  mockPromRuleNamespace({
+    name: 'default',
+    groups: [
+      mockPromRuleGroup({
+        name: 'mygroup',
+        rules: [
+          mockPromAlertingRule({
+            name: 'dashboardrule1',
+            annotations: {
+              [Annotation.dashboardUID]: '12',
+              [Annotation.panelID]: '34',
+            },
+          }),
+        ],
+      }),
+      mockPromRuleGroup({
+        name: 'othergroup',
+        rules: [
+          mockPromAlertingRule({
+            name: 'dashboardrule2',
+            annotations: {
+              [Annotation.dashboardUID]: '121',
+              [Annotation.panelID]: '341',
+            },
+          }),
+        ],
+      }),
+    ],
+  }),
+];
+
+const rulerRules = {
+  default: [
+    {
+      name: 'mygroup',
+      rules: [
+        mockRulerGrafanaRule(
+          {
+            annotations: {
+              [Annotation.dashboardUID]: '12',
+              [Annotation.panelID]: '34',
+            },
+          },
+          {
+            title: 'dashboardrule1',
+          }
+        ),
+      ],
+    },
+    {
+      name: 'othergroup',
+      rules: [
+        mockRulerGrafanaRule(
+          {
+            annotations: {
+              [Annotation.dashboardUID]: '121',
+              [Annotation.panelID]: '341',
+            },
+          },
+          {
+            title: 'dashboardrule2',
+          }
+        ),
+      ],
+    },
+  ],
+};
+
+const dashboard = {
+  uid: '12',
+  time: {
+    from: 'now-6h',
+    to: 'now',
+  },
+  timepicker: { refresh_intervals: 5 },
+  meta: {
+    canSave: true,
+    folderId: 1,
+    folderTitle: 'super folder',
+  },
+  isSnapshot: () => false,
+} as unknown as DashboardModel;
+
+const panel = new PanelModel({
+  datasource: {
+    type: 'prometheus',
+    uid: dataSources.prometheus.uid,
+  },
+  title: 'mypanel',
+  id: 34,
+  targets: [
+    {
+      expr: 'sum(some_metric [$__interval])) by (app)',
+      refId: 'A',
+    },
+  ],
+});
+
+const ui = {
+  row: byTestId('row'),
+  createButton: byTestId<HTMLButtonElement>('create-alert-rule-button'),
+};
+
+describe('PanelAlertTabContent', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+    grantUserPermissions([
+      AccessControlAction.AlertingRuleRead,
+      AccessControlAction.AlertingRuleUpdate,
+      AccessControlAction.AlertingRuleDelete,
+      AccessControlAction.AlertingRuleCreate,
+      AccessControlAction.AlertingRuleExternalRead,
+      AccessControlAction.AlertingRuleExternalWrite,
+    ]);
+    mocks.getAllDataSources.mockReturnValue(Object.values(dataSources));
+    const dsService = new MockDataSourceSrv(dataSources);
+    dsService.datasources[dataSources.prometheus.uid] = new PrometheusDatasource(
+      dataSources.prometheus
+    ) as DataSourceApi;
+    dsService.datasources[dataSources.default.uid] = new PrometheusDatasource(dataSources.default) as DataSourceApi;
+    setDataSourceSrv(dsService);
+  });
+
+  it('Will take into account panel maxDataPoints', async () => {
+    dashboard.panels = [
+      new PanelModel({
+        ...panel,
+        maxDataPoints: 100,
+        interval: '10s',
+      }),
+    ];
+
+    renderAlertTab(dashboard);
+
+    const defaults = await clickNewButton();
+
+    expect(defaults.queries[0].model).toEqual({
+      expr: 'sum(some_metric [5m])) by (app)',
+      refId: 'A',
+      datasource: {
+        type: 'prometheus',
+        uid: 'mock-ds-2',
+      },
+      interval: '',
+      intervalMs: 300000,
+      maxDataPoints: 100,
+    });
+  });
+
+  it('Will work with default datasource', async () => {
+    dashboard.panels = [
+      new PanelModel({
+        ...panel,
+        datasource: undefined,
+        maxDataPoints: 100,
+        interval: '10s',
+      }),
+    ];
+
+    renderAlertTab(dashboard);
+    const defaults = await clickNewButton();
+
+    expect(defaults.queries[0].model).toEqual({
+      expr: 'sum(some_metric [5m])) by (app)',
+      refId: 'A',
+      datasource: {
+        type: 'prometheus',
+        uid: 'mock-ds-3',
+      },
+      interval: '',
+      intervalMs: 300000,
+      maxDataPoints: 100,
+    });
+  });
+
+  it('Will take into account datasource minInterval', async () => {
+    (getDatasourceSrv() as unknown as MockDataSourceSrv).datasources[dataSources.prometheus.uid].interval = '7m';
+
+    dashboard.panels = [
+      new PanelModel({
+        ...panel,
+        maxDataPoints: 100,
+      }),
+    ];
+
+    renderAlertTab(dashboard);
+    const defaults = await clickNewButton();
+
+    expect(defaults.queries[0].model).toEqual({
+      expr: 'sum(some_metric [7m])) by (app)',
+      refId: 'A',
+      datasource: {
+        type: 'prometheus',
+        uid: 'mock-ds-2',
+      },
+      interval: '',
+      intervalMs: 420000,
+      maxDataPoints: 100,
+    });
+  });
+
+  it('Will render alerts belonging to panel and a button to create alert from panel queries', async () => {
+    mocks.api.fetchRules.mockResolvedValue(rules);
+    mocks.api.fetchRulerRules.mockResolvedValue(rulerRules);
+
+    dashboard.panels = [panel];
+
+    renderAlertTab(dashboard);
+
+    const rows = await ui.row.findAll();
+    expect(rows).toHaveLength(1);
+    expect(rows[0]).toHaveTextContent(/dashboardrule1/);
+    expect(rows[0]).not.toHaveTextContent(/dashboardrule2/);
+
+    const defaults = await clickNewButton();
+
+    const defaultsWithDeterministicTime: Partial<RuleFormValues> = {
+      ...defaults,
+      queries: defaults.queries.map((q: AlertQuery) => {
+        return {
+          ...q,
+          // Fix computed time stamp to avoid assertion flakiness
+          ...(q.relativeTimeRange ? { relativeTimeRange: { from: 21600, to: 0 } } : {}),
+        };
+      }),
+    };
+
+    expect(defaultsWithDeterministicTime).toMatchSnapshot();
+
+    expect(mocks.api.fetchRulerRules).toHaveBeenCalledWith(
+      { dataSourceName: GRAFANA_RULES_SOURCE_NAME, apiVersion: 'legacy' },
+      {
+        dashboardUID: dashboard.uid,
+        panelId: panel.id,
+      }
+    );
+    expect(mocks.api.fetchRules).toHaveBeenCalledWith(
+      GRAFANA_RULES_SOURCE_NAME,
+      {
+        dashboardUID: dashboard.uid,
+        panelId: panel.id,
+      },
+      undefined,
+      undefined,
+      undefined,
+      undefined
+    );
+  });
+});
+
+function renderAlertTab(dashboard: DashboardModel) {
+  const model = createModel(dashboard);
+  renderAlertTabContent(model);
+}
+
+async function clickNewButton() {
+  const pushMock = jest.fn();
+  const oldPush = locationService.push;
+  locationService.push = pushMock;
+  const button = await ui.createButton.find();
+  await act(async () => {
+    await userEvent.click(button);
+  });
+  const match = pushMock.mock.lastCall[0].match(/alerting\/new\?defaults=(.*)&returnTo=/);
+  const defaults = JSON.parse(decodeURIComponent(match![1]));
+  locationService.push = oldPush;
+  return defaults;
+}
+
+function createModel(dashboard: DashboardModel) {
+  const scene = createDashboardSceneFromDashboardModel(dashboard);
+  const vizPanel = findVizPanelByKey(scene, getVizPanelKeyForPanelId(34))!;
+  const model = new PanelDataAlertingTab(VizPanelManager.createFor(vizPanel));
+  jest.spyOn(utils, 'getDashboardSceneFor').mockReturnValue(scene);
+  return model;
+}
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataAlertingTab.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataAlertingTab.tsx
new file mode 100644
index 0000000000000..754929a73f87c
--- /dev/null
+++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataAlertingTab.tsx
@@ -0,0 +1,142 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { SceneObjectBase, SceneComponentProps } from '@grafana/scenes';
+import { Alert, LoadingPlaceholder, Tab, useStyles2 } from '@grafana/ui';
+import { contextSrv } from 'app/core/core';
+import { RulesTable } from 'app/features/alerting/unified/components/rules/RulesTable';
+import { usePanelCombinedRules } from 'app/features/alerting/unified/hooks/usePanelCombinedRules';
+import { getRulesPermissions } from 'app/features/alerting/unified/utils/access-control';
+
+import { getDashboardSceneFor, getPanelIdForVizPanel } from '../../utils/utils';
+import { VizPanelManager } from '../VizPanelManager';
+
+import { ScenesNewRuleFromPanelButton } from './NewAlertRuleButton';
+import { PanelDataPaneTabState, PanelDataPaneTab, TabId, PanelDataTabHeaderProps } from './types';
+
+export class PanelDataAlertingTab extends SceneObjectBase<PanelDataPaneTabState> implements PanelDataPaneTab {
+  static Component = PanelDataAlertingTabRendered;
+  TabComponent: (props: PanelDataTabHeaderProps) => React.JSX.Element;
+
+  tabId = TabId.Alert;
+  private _panelManager: VizPanelManager;
+
+  constructor(panelManager: VizPanelManager) {
+    super({});
+    this.TabComponent = (props: PanelDataTabHeaderProps) => AlertingTab({ ...props, model: this });
+    this._panelManager = panelManager;
+  }
+
+  getTabLabel() {
+    return 'Alert';
+  }
+
+  getDashboardUID() {
+    const dashboard = this.getDashboard();
+    return dashboard.state.uid!;
+  }
+
+  getDashboard() {
+    return getDashboardSceneFor(this._panelManager);
+  }
+
+  getLegacyPanelId() {
+    return getPanelIdForVizPanel(this._panelManager.state.panel);
+  }
+
+  getCanCreateRules() {
+    const rulesPermissions = getRulesPermissions('grafana');
+    return this.getDashboard().state.meta.canSave && contextSrv.hasPermission(rulesPermissions.create);
+  }
+
+  get panelManager() {
+    return this._panelManager;
+  }
+
+  get panel() {
+    return this._panelManager.state.panel;
+  }
+}
+
+export function PanelDataAlertingTabRendered(props: SceneComponentProps<PanelDataAlertingTab>) {
+  const { model } = props;
+
+  const styles = useStyles2(getStyles);
+
+  const { errors, loading, rules } = usePanelCombinedRules({
+    dashboardUID: model.getDashboardUID(),
+    panelId: model.getLegacyPanelId(),
+  });
+
+  const alert = errors.length ? (
+    <Alert title="Errors loading rules" severity="error">
+      {errors.map((error, index) => (
+        <div key={index}>Failed to load Grafana rules state: {error.message || 'Unknown error.'}</div>
+      ))}
+    </Alert>
+  ) : null;
+
+  if (loading && !rules.length) {
+    return (
+      <>
+        {alert}
+        <LoadingPlaceholder text="Loading rules..." />
+      </>
+    );
+  }
+
+  const { panel } = model;
+  const canCreateRules = model.getCanCreateRules();
+
+  if (rules.length) {
+    return (
+      <>
+        <RulesTable rules={rules} />
+        {canCreateRules && <ScenesNewRuleFromPanelButton className={styles.newButton} panel={panel} />}
+      </>
+    );
+  }
+
+  return (
+    <div className={styles.noRulesWrapper}>
+      <p>There are no alert rules linked to this panel.</p>
+      {canCreateRules && <ScenesNewRuleFromPanelButton panel={panel}></ScenesNewRuleFromPanelButton>}
+    </div>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  newButton: css({
+    marginTop: theme.spacing(3),
+  }),
+  noRulesWrapper: css({
+    margin: theme.spacing(2),
+    backgroundColor: theme.colors.background.secondary,
+    padding: theme.spacing(3),
+  }),
+});
+interface PanelDataAlertingTabHeaderProps extends PanelDataTabHeaderProps {
+  model: PanelDataAlertingTab;
+}
+
+function AlertingTab(props: PanelDataAlertingTabHeaderProps) {
+  const { model } = props;
+
+  const { rules } = usePanelCombinedRules({
+    dashboardUID: model.getDashboardUID(),
+    panelId: model.getLegacyPanelId(),
+    poll: false,
+  });
+
+  return (
+    <Tab
+      key={props.key}
+      label={model.getTabLabel()}
+      icon="bell"
+      counter={rules.length}
+      active={props.active}
+      onChangeTab={props.onChangeTab}
+    />
+  );
+}
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataPane.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataPane.tsx
new file mode 100644
index 0000000000000..66a5c9816f543
--- /dev/null
+++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataPane.tsx
@@ -0,0 +1,193 @@
+import { css } from '@emotion/css';
+import React from 'react';
+import { Unsubscribable } from 'rxjs';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import {
+  SceneComponentProps,
+  SceneObjectBase,
+  SceneObjectState,
+  SceneObjectUrlSyncConfig,
+  SceneObjectUrlValues,
+  VizPanel,
+} from '@grafana/scenes';
+import { Container, CustomScrollbar, TabContent, TabsBar, useStyles2 } from '@grafana/ui';
+import { shouldShowAlertingTab } from 'app/features/dashboard/components/PanelEditor/state/selectors';
+
+import { VizPanelManager } from '../VizPanelManager';
+
+import { PanelDataAlertingTab } from './PanelDataAlertingTab';
+import { PanelDataQueriesTab } from './PanelDataQueriesTab';
+import { PanelDataTransformationsTab } from './PanelDataTransformationsTab';
+import { PanelDataPaneTab, TabId } from './types';
+
+export interface PanelDataPaneState extends SceneObjectState {
+  tabs?: PanelDataPaneTab[];
+  tab?: TabId;
+}
+
+export class PanelDataPane extends SceneObjectBase<PanelDataPaneState> {
+  static Component = PanelDataPaneRendered;
+  protected _urlSync = new SceneObjectUrlSyncConfig(this, { keys: ['tab'] });
+  private _initialTabsBuilt = false;
+  private panelSubscription: Unsubscribable | undefined;
+  public panelManager: VizPanelManager;
+
+  getUrlState() {
+    return {
+      tab: this.state.tab,
+    };
+  }
+
+  updateFromUrl(values: SceneObjectUrlValues) {
+    if (!values.tab) {
+      return;
+    }
+    if (typeof values.tab === 'string') {
+      this.setState({ tab: values.tab as TabId });
+    }
+  }
+
+  constructor(panelMgr: VizPanelManager) {
+    super({
+      tab: TabId.Queries,
+      tabs: [],
+    });
+
+    this.panelManager = panelMgr;
+    this.addActivationHandler(() => this.onActivate());
+  }
+
+  private onActivate() {
+    const panel = this.panelManager.state.panel;
+    this.setupPanelSubscription(panel);
+    this.buildTabs();
+
+    this._subs.add(
+      // Setup subscription for the case when panel type changed
+      this.panelManager.subscribeToState((n, p) => {
+        if (n.panel !== p.panel) {
+          this.buildTabs();
+          this.setupPanelSubscription(n.panel);
+        }
+      })
+    );
+
+    return () => {
+      if (this.panelSubscription) {
+        this.panelSubscription.unsubscribe();
+        this.panelSubscription = undefined;
+      }
+    };
+  }
+
+  private setupPanelSubscription(panel: VizPanel) {
+    if (this.panelSubscription) {
+      this._initialTabsBuilt = false;
+      this.panelSubscription.unsubscribe();
+    }
+
+    this.panelSubscription = panel.subscribeToState(() => {
+      if (panel.getPlugin() && !this._initialTabsBuilt) {
+        this.buildTabs();
+        this._initialTabsBuilt = true;
+      }
+    });
+  }
+
+  private buildTabs() {
+    const panelManager = this.panelManager;
+    const panel = panelManager.state.panel;
+
+    const runner = this.panelManager.queryRunner;
+    const tabs: PanelDataPaneTab[] = [];
+
+    if (panel) {
+      const plugin = panel.getPlugin();
+
+      if (!plugin) {
+        return;
+      }
+
+      if (plugin.meta.skipDataQuery) {
+        this.setState({ tabs });
+        return;
+      } else {
+        if (runner) {
+          tabs.push(new PanelDataQueriesTab(this.panelManager));
+        }
+
+        tabs.push(new PanelDataTransformationsTab(this.panelManager));
+
+        if (shouldShowAlertingTab(plugin)) {
+          tabs.push(new PanelDataAlertingTab(this.panelManager));
+        }
+      }
+    }
+
+    this.setState({ tabs });
+  }
+
+  onChangeTab = (tab: PanelDataPaneTab) => {
+    this.setState({ tab: tab.tabId });
+  };
+}
+
+function PanelDataPaneRendered({ model }: SceneComponentProps<PanelDataPane>) {
+  const { tab, tabs } = model.useState();
+  const styles = useStyles2(getStyles);
+
+  if (!tabs) {
+    return;
+  }
+
+  const currentTab = tabs.find((t) => t.tabId === tab);
+
+  return (
+    <div className={styles.dataPane}>
+      <TabsBar hideBorder={true} className={styles.tabsBar}>
+        {tabs.map((t, index) => {
+          return (
+            <t.TabComponent
+              key={`${t.getTabLabel()}-${index}`}
+              active={t.tabId === tab}
+              onChangeTab={() => model.onChangeTab(t)}
+            ></t.TabComponent>
+          );
+        })}
+      </TabsBar>
+      <CustomScrollbar className={styles.scroll}>
+        <TabContent className={styles.tabContent}>
+          <Container>{currentTab && <currentTab.Component model={currentTab} />}</Container>
+        </TabContent>
+      </CustomScrollbar>
+    </div>
+  );
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    dataPane: css({
+      display: 'flex',
+      flexDirection: 'column',
+      flexGrow: 1,
+      minHeight: 0,
+      height: '100%',
+    }),
+    tabContent: css({
+      padding: theme.spacing(2),
+      border: `1px solid ${theme.colors.border.weak}`,
+      borderLeft: 'none',
+      borderBottom: 'none',
+      borderTopRightRadius: theme.shape.radius.default,
+      flexGrow: 1,
+    }),
+    tabsBar: css({
+      flexShrink: 0,
+      paddingLeft: theme.spacing(2),
+    }),
+    scroll: css({
+      background: theme.colors.background.primary,
+    }),
+  };
+}
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.test.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.test.tsx
new file mode 100644
index 0000000000000..c2125ad114a18
--- /dev/null
+++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.test.tsx
@@ -0,0 +1,346 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { of, map } from 'rxjs';
+
+import {
+  DataQuery,
+  DataQueryRequest,
+  DataSourceApi,
+  DataSourceJsonData,
+  DataSourceRef,
+  FieldType,
+  LoadingState,
+  PanelData,
+  TimeRange,
+  toDataFrame,
+} from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
+import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard';
+import { DASHBOARD_DATASOURCE_PLUGIN_ID } from 'app/plugins/datasource/dashboard/types';
+import { DashboardDataDTO } from 'app/types';
+
+import { transformSaveModelToScene } from '../../serialization/transformSaveModelToScene';
+import { DashboardModelCompatibilityWrapper } from '../../utils/DashboardModelCompatibilityWrapper';
+import { findVizPanelByKey } from '../../utils/utils';
+import { VizPanelManager } from '../VizPanelManager';
+import { testDashboard } from '../testfiles/testDashboard';
+
+import { PanelDataQueriesTab, PanelDataQueriesTabRendered } from './PanelDataQueriesTab';
+
+async function createModelMock() {
+  const panelManager = setupVizPanelManger('panel-1');
+  panelManager.activate();
+  await Promise.resolve();
+  const queryTabModel = new PanelDataQueriesTab(panelManager);
+
+  // mock queryRunner data state
+  jest.spyOn(queryTabModel.queryRunner, 'state', 'get').mockReturnValue({
+    ...queryTabModel.queryRunner.state,
+    data: {
+      state: LoadingState.Done,
+      series: [
+        toDataFrame({
+          name: 'A',
+          fields: [
+            { name: 'time', type: FieldType.time, values: [100, 200, 300] },
+            { name: 'values', type: FieldType.number, values: [1, 2, 3] },
+          ],
+        }),
+      ],
+      timeRange: {} as TimeRange,
+    },
+  });
+
+  return queryTabModel;
+}
+const runRequestMock = jest.fn().mockImplementation((ds: DataSourceApi, request: DataQueryRequest) => {
+  const result: PanelData = {
+    state: LoadingState.Loading,
+    series: [],
+    timeRange: request.range,
+  };
+
+  return of([]).pipe(
+    map(() => {
+      result.state = LoadingState.Done;
+      result.series = [
+        toDataFrame({
+          name: 'A',
+          fields: [
+            { name: 'time', type: FieldType.time, values: [100, 200, 300] },
+            { name: 'values', type: FieldType.number, values: [1, 2, 3] },
+          ],
+        }),
+      ];
+
+      return result;
+    })
+  );
+});
+
+const ds1Mock: DataSourceApi = {
+  meta: {
+    id: 'grafana-testdata-datasource',
+  },
+  name: 'grafana-testdata-datasource',
+  type: 'grafana-testdata-datasource',
+  uid: 'gdev-testdata',
+  getRef: () => {
+    return { type: 'grafana-testdata-datasource', uid: 'gdev-testdata' };
+  },
+} as DataSourceApi<DataQuery, DataSourceJsonData, {}>;
+
+const ds2Mock: DataSourceApi = {
+  meta: {
+    id: 'grafana-prometheus-datasource',
+  },
+  name: 'grafana-prometheus-datasource',
+  type: 'grafana-prometheus-datasource',
+  uid: 'gdev-prometheus',
+  getRef: () => {
+    return { type: 'grafana-prometheus-datasource', uid: 'gdev-prometheus' };
+  },
+} as DataSourceApi<DataQuery, DataSourceJsonData, {}>;
+
+const ds3Mock: DataSourceApi = {
+  meta: {
+    id: DASHBOARD_DATASOURCE_PLUGIN_ID,
+  },
+  name: SHARED_DASHBOARD_QUERY,
+  type: SHARED_DASHBOARD_QUERY,
+  uid: SHARED_DASHBOARD_QUERY,
+  getRef: () => {
+    return { type: SHARED_DASHBOARD_QUERY, uid: SHARED_DASHBOARD_QUERY };
+  },
+} as DataSourceApi<DataQuery, DataSourceJsonData, {}>;
+
+const defaultDsMock: DataSourceApi = {
+  meta: {
+    id: 'grafana-testdata-datasource',
+  },
+  name: 'grafana-testdata-datasource',
+  type: 'grafana-testdata-datasource',
+  uid: 'gdev-testdata',
+  getRef: () => {
+    return { type: 'grafana-testdata-datasource', uid: 'gdev-testdata' };
+  },
+} as DataSourceApi<DataQuery, DataSourceJsonData, {}>;
+
+const instance1SettingsMock = {
+  id: 1,
+  uid: 'gdev-testdata',
+  name: 'testDs1',
+  type: 'grafana-testdata-datasource',
+  meta: {
+    id: 'grafana-testdata-datasource',
+    info: {
+      logos: {
+        small: 'test-logo.png',
+      },
+    },
+  },
+};
+
+const instance2SettingsMock = {
+  id: 1,
+  uid: 'gdev-prometheus',
+  name: 'testDs2',
+  type: 'grafana-prometheus-datasource',
+  meta: {
+    id: 'grafana-prometheus-datasource',
+  },
+};
+
+// Mocking the build in Grafana data source to avoid annotations data layer errors.
+const grafanaDs = {
+  id: 1,
+  uid: '-- Grafana --',
+  name: 'grafana',
+  type: 'grafana',
+  meta: {
+    id: 'grafana',
+  },
+};
+
+// Mocking the build in Grafana data source to avoid annotations data layer errors.
+const MixedDs = {
+  id: 5,
+  uid: '-- Mixed --',
+  name: 'Mixed',
+  type: 'datasource',
+  meta: {
+    id: 'grafana',
+    mixed: true,
+  },
+};
+
+const MixedDsSettingsMock = {
+  id: 5,
+  uid: '-- Mixed --',
+  name: 'Mixed',
+  type: 'datasource',
+  meta: {
+    id: 'grafana',
+    mixed: true,
+  },
+};
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getRunRequest: () => (ds: DataSourceApi, request: DataQueryRequest) => {
+    return runRequestMock(ds, request);
+  },
+  getDataSourceSrv: () => ({
+    get: async (ref: DataSourceRef) => {
+      // Mocking the build in Grafana data source to avoid annotations data layer errors.
+      if (ref.uid === '-- Grafana --') {
+        return grafanaDs;
+      }
+
+      if (ref.uid === 'gdev-testdata') {
+        return ds1Mock;
+      }
+
+      if (ref.uid === 'gdev-prometheus') {
+        return ds2Mock;
+      }
+
+      if (ref.uid === '-- Mixed --') {
+        return MixedDs;
+      }
+
+      if (ref.uid === SHARED_DASHBOARD_QUERY) {
+        return ds3Mock;
+      }
+
+      // if datasource is not found, return default datasource
+      return defaultDsMock;
+    },
+    getInstanceSettings: (ref: DataSourceRef) => {
+      if (ref.uid === 'gdev-testdata') {
+        return instance1SettingsMock;
+      }
+
+      if (ref.uid === 'gdev-prometheus') {
+        return instance2SettingsMock;
+      }
+
+      if (ref.uid === '-- Mixed --') {
+        return MixedDsSettingsMock;
+      }
+
+      // if datasource is not found, return default instance settings
+      return instance1SettingsMock;
+    },
+  }),
+  locationService: {
+    partial: jest.fn(),
+    getSearchObject: jest.fn().mockReturnValue({
+      firstPanel: false,
+    }),
+  },
+  config: {
+    ...jest.requireActual('@grafana/runtime').config,
+    defaultDatasource: 'gdev-testdata',
+  },
+}));
+describe('PanelDataQueriesModel', () => {
+  it('can add a new query', async () => {
+    const vizPanelManager = setupVizPanelManger('panel-1');
+    vizPanelManager.activate();
+    await Promise.resolve();
+
+    const model = new PanelDataQueriesTab(vizPanelManager);
+    model.addQueryClick();
+    expect(model.queryRunner.state.queries).toHaveLength(2);
+    expect(model.queryRunner.state.queries[1].refId).toBe('B');
+    expect(model.queryRunner.state.queries[1].hide).toBe(false);
+    expect(model.queryRunner.state.queries[1].datasource).toEqual({
+      type: 'grafana-testdata-datasource',
+      uid: 'gdev-testdata',
+    });
+  });
+
+  it('can add a new query when datasource is mixed', async () => {
+    const vizPanelManager = setupVizPanelManger('panel-7');
+    vizPanelManager.activate();
+    await Promise.resolve();
+
+    const model = new PanelDataQueriesTab(vizPanelManager);
+    expect(vizPanelManager.state.datasource?.uid).toBe('-- Mixed --');
+    expect(model.queryRunner.state.datasource?.uid).toBe('-- Mixed --');
+    model.addQueryClick();
+
+    expect(model.queryRunner.state.queries).toHaveLength(2);
+    expect(model.queryRunner.state.queries[1].refId).toBe('B');
+    expect(model.queryRunner.state.queries[1].hide).toBe(false);
+    expect(model.queryRunner.state.queries[1].datasource?.uid).toBe('gdev-testdata');
+  });
+});
+
+describe('PanelDataQueriesTab', () => {
+  it('renders query group top section', async () => {
+    const modelMock = await createModelMock();
+
+    render(<PanelDataQueriesTabRendered model={modelMock}></PanelDataQueriesTabRendered>);
+    await screen.findByTestId(selectors.components.QueryTab.queryGroupTopSection);
+  });
+
+  it('renders queries rows when queries are set', async () => {
+    const modelMock = await createModelMock();
+    render(<PanelDataQueriesTabRendered model={modelMock}></PanelDataQueriesTabRendered>);
+
+    await screen.findByTestId('query-editor-rows');
+    expect(screen.getAllByTestId('query-editor-row')).toHaveLength(1);
+  });
+
+  it('allow to add a new query when user clicks on add new', async () => {
+    const modelMock = await createModelMock();
+    jest.spyOn(modelMock, 'addQueryClick');
+    jest.spyOn(modelMock, 'onQueriesChange');
+    render(<PanelDataQueriesTabRendered model={modelMock}></PanelDataQueriesTabRendered>);
+
+    await screen.findByTestId(selectors.components.QueryTab.addQuery);
+    await userEvent.click(screen.getByTestId(selectors.components.QueryTab.addQuery));
+
+    const expectedQueries = [
+      {
+        datasource: { type: 'grafana-testdata-datasource', uid: 'gdev-testdata' },
+        refId: 'A',
+        scenarioId: 'random_walk',
+        seriesCount: 1,
+      },
+      { datasource: { type: 'grafana-testdata-datasource', uid: 'gdev-testdata' }, hide: false, refId: 'B' },
+    ];
+
+    expect(modelMock.addQueryClick).toHaveBeenCalled();
+    expect(modelMock.onQueriesChange).toHaveBeenCalledWith(expectedQueries);
+  });
+
+  it('allow to remove a query when user clicks on remove', async () => {
+    const modelMock = await createModelMock();
+    jest.spyOn(modelMock, 'addQueryClick');
+    jest.spyOn(modelMock, 'onQueriesChange');
+    render(<PanelDataQueriesTabRendered model={modelMock}></PanelDataQueriesTabRendered>);
+
+    await screen.findByTestId('data-testid Remove query');
+    await userEvent.click(screen.getByTestId('data-testid Remove query'));
+
+    expect(modelMock.onQueriesChange).toHaveBeenCalledWith([]);
+  });
+});
+
+const setupVizPanelManger = (panelId: string) => {
+  const scene = transformSaveModelToScene({ dashboard: testDashboard as unknown as DashboardDataDTO, meta: {} });
+  const panel = findVizPanelByKey(scene, panelId)!;
+
+  const vizPanelManager = VizPanelManager.createFor(panel);
+
+  // The following happens on DahsboardScene activation. For the needs of this test this activation aint needed hence we hand-call it
+  // @ts-expect-error
+  getDashboardSrv().setCurrent(new DashboardModelCompatibilityWrapper(scene));
+
+  return vizPanelManager;
+};
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.tsx
new file mode 100644
index 0000000000000..3d8b23691580a
--- /dev/null
+++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.tsx
@@ -0,0 +1,258 @@
+import React from 'react';
+
+import { CoreApp, DataSourceApi, DataSourceInstanceSettings, IconName } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { config, getDataSourceSrv } from '@grafana/runtime';
+import { SceneObjectBase, SceneComponentProps, sceneGraph, SceneQueryRunner } from '@grafana/scenes';
+import { DataQuery } from '@grafana/schema';
+import { Button, HorizontalGroup, Tab } from '@grafana/ui';
+import { addQuery } from 'app/core/utils/query';
+import { dataSource as expressionDatasource } from 'app/features/expressions/ExpressionDatasource';
+import { GroupActionComponents } from 'app/features/query/components/QueryActionComponent';
+import { QueryEditorRows } from 'app/features/query/components/QueryEditorRows';
+import { QueryGroupTopSection } from 'app/features/query/components/QueryGroup';
+import { isSharedDashboardQuery } from 'app/plugins/datasource/dashboard';
+import { GrafanaQuery } from 'app/plugins/datasource/grafana/types';
+import { QueryGroupOptions } from 'app/types';
+
+import { PanelTimeRange } from '../../scene/PanelTimeRange';
+import { VizPanelManager } from '../VizPanelManager';
+
+import { PanelDataPaneTabState, PanelDataPaneTab, TabId, PanelDataTabHeaderProps } from './types';
+
+interface PanelDataQueriesTabState extends PanelDataPaneTabState {
+  datasource?: DataSourceApi;
+  dsSettings?: DataSourceInstanceSettings;
+}
+export class PanelDataQueriesTab extends SceneObjectBase<PanelDataQueriesTabState> implements PanelDataPaneTab {
+  static Component = PanelDataQueriesTabRendered;
+  TabComponent: (props: PanelDataTabHeaderProps) => React.JSX.Element;
+
+  tabId = TabId.Queries;
+  icon: IconName = 'database';
+  private _panelManager: VizPanelManager;
+
+  getTabLabel() {
+    return 'Queries';
+  }
+
+  getItemsCount() {
+    return this.getQueries().length;
+  }
+
+  constructor(panelManager: VizPanelManager) {
+    super({});
+
+    this.TabComponent = (props: PanelDataTabHeaderProps) => {
+      return QueriesTab({ ...props, model: this });
+    };
+
+    this._panelManager = panelManager;
+  }
+
+  buildQueryOptions(): QueryGroupOptions {
+    const panelManager = this._panelManager;
+    const panelObj = this._panelManager.state.panel;
+    const queryRunner = this._panelManager.queryRunner;
+    const timeRangeObj = sceneGraph.getTimeRange(panelObj);
+
+    let timeRangeOpts: QueryGroupOptions['timeRange'] = {
+      from: undefined,
+      shift: undefined,
+      hide: undefined,
+    };
+
+    if (timeRangeObj instanceof PanelTimeRange) {
+      timeRangeOpts = {
+        from: timeRangeObj.state.timeFrom,
+        shift: timeRangeObj.state.timeShift,
+        hide: timeRangeObj.state.hideTimeOverride,
+      };
+    }
+
+    let queries: QueryGroupOptions['queries'] = queryRunner.state.queries;
+
+    return {
+      cacheTimeout: panelManager.state.dsSettings?.meta.queryOptions?.cacheTimeout
+        ? queryRunner.state.cacheTimeout
+        : undefined,
+      queryCachingTTL: panelManager.state.dsSettings?.cachingConfig?.enabled
+        ? queryRunner.state.queryCachingTTL
+        : undefined,
+      dataSource: {
+        default: panelManager.state.dsSettings?.isDefault,
+        type: panelManager.state.dsSettings?.type,
+        uid: panelManager.state.dsSettings?.uid,
+      },
+      queries,
+      maxDataPoints: queryRunner.state.maxDataPoints,
+      minInterval: queryRunner.state.minInterval,
+      timeRange: timeRangeOpts,
+    };
+  }
+
+  onOpenInspector = () => {
+    this._panelManager.inspectPanel();
+  };
+
+  onChangeDataSource = async (
+    newSettings: DataSourceInstanceSettings,
+    defaultQueries?: DataQuery[] | GrafanaQuery[]
+  ) => {
+    this._panelManager.changePanelDataSource(newSettings, defaultQueries);
+  };
+
+  onQueryOptionsChange = (options: QueryGroupOptions) => {
+    this._panelManager.changeQueryOptions(options);
+  };
+
+  onQueriesChange = (queries: DataQuery[]) => {
+    this._panelManager.changeQueries(queries);
+  };
+
+  onRunQueries = () => {
+    this._panelManager.queryRunner.runQueries();
+  };
+
+  getQueries() {
+    return this._panelManager.queryRunner.state.queries;
+  }
+
+  newQuery(): Partial<DataQuery> {
+    const { dsSettings, datasource } = this._panelManager.state;
+
+    let ds;
+    if (!dsSettings?.meta.mixed) {
+      ds = dsSettings; // Use dsSettings if it is not mixed
+    } else if (!datasource?.meta.mixed) {
+      ds = datasource; // Use datasource if dsSettings is mixed but datasource is not
+    } else {
+      // Use default datasource if both are mixed or just datasource is mixed
+      ds = getDataSourceSrv().getInstanceSettings(config.defaultDatasource);
+    }
+
+    return {
+      ...datasource?.getDefaultQuery?.(CoreApp.PanelEditor),
+      datasource: { uid: ds?.uid, type: ds?.type },
+    };
+  }
+
+  addQueryClick = () => {
+    const queries = this.getQueries();
+    this.onQueriesChange(addQuery(queries, this.newQuery()));
+  };
+
+  onAddQuery = (query: Partial<DataQuery>) => {
+    const queries = this.getQueries();
+    const dsSettings = this._panelManager.state.dsSettings;
+    this.onQueriesChange(addQuery(queries, query, { type: dsSettings?.type, uid: dsSettings?.uid }));
+  };
+
+  isExpressionsSupported(dsSettings: DataSourceInstanceSettings): boolean {
+    return (dsSettings.meta.alerting || dsSettings.meta.mixed) === true;
+  }
+
+  onAddExpressionClick = () => {
+    const queries = this.getQueries();
+    this.onQueriesChange(addQuery(queries, expressionDatasource.newQuery()));
+  };
+
+  renderExtraActions() {
+    return GroupActionComponents.getAllExtraRenderAction()
+      .map((action, index) =>
+        action({
+          onAddQuery: this.onAddQuery,
+          onChangeDataSource: this.onChangeDataSource,
+          key: index,
+        })
+      )
+      .filter(Boolean);
+  }
+
+  get queryRunner(): SceneQueryRunner {
+    return this._panelManager.queryRunner;
+  }
+
+  get panelManager() {
+    return this._panelManager;
+  }
+}
+
+export function PanelDataQueriesTabRendered({ model }: SceneComponentProps<PanelDataQueriesTab>) {
+  const { datasource, dsSettings } = model.panelManager.useState();
+  const { data, queries } = model.panelManager.queryRunner.useState();
+
+  if (!datasource || !dsSettings || !data) {
+    return null;
+  }
+
+  const showAddButton = !isSharedDashboardQuery(dsSettings.name);
+
+  return (
+    <>
+      <QueryGroupTopSection
+        data={data}
+        dsSettings={dsSettings}
+        dataSource={datasource}
+        options={model.buildQueryOptions()}
+        onDataSourceChange={model.onChangeDataSource}
+        onOptionsChange={model.onQueryOptionsChange}
+        onOpenQueryInspector={model.onOpenInspector}
+      />
+
+      <QueryEditorRows
+        data={data}
+        queries={queries}
+        dsSettings={dsSettings}
+        onAddQuery={model.onAddQuery}
+        onQueriesChange={model.onQueriesChange}
+        onRunQueries={model.onRunQueries}
+      />
+
+      <HorizontalGroup spacing="md" align="flex-start">
+        {showAddButton && (
+          <Button
+            icon="plus"
+            onClick={model.addQueryClick}
+            variant="secondary"
+            data-testid={selectors.components.QueryTab.addQuery}
+          >
+            Add query
+          </Button>
+        )}
+        {config.expressionsEnabled && model.isExpressionsSupported(dsSettings) && (
+          <Button
+            icon="plus"
+            onClick={model.onAddExpressionClick}
+            variant="secondary"
+            data-testid={selectors.components.QueryTab.addExpression}
+          >
+            <span>Expression&nbsp;</span>
+          </Button>
+        )}
+        {model.renderExtraActions()}
+      </HorizontalGroup>
+    </>
+  );
+}
+
+interface QueriesTabProps extends PanelDataTabHeaderProps {
+  model: PanelDataQueriesTab;
+}
+
+function QueriesTab(props: QueriesTabProps) {
+  const { model } = props;
+
+  const queryRunnerState = model.queryRunner.useState();
+
+  return (
+    <Tab
+      key={props.key}
+      label={model.getTabLabel()}
+      icon="database"
+      counter={queryRunnerState.queries.length}
+      active={props.active}
+      onChangeTab={props.onChangeTab}
+    />
+  );
+}
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataTransformationsTab.test.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataTransformationsTab.test.tsx
new file mode 100644
index 0000000000000..2b9766c54d191
--- /dev/null
+++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataTransformationsTab.test.tsx
@@ -0,0 +1,184 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import {
+  DataTransformerConfig,
+  FieldType,
+  LoadingState,
+  PanelData,
+  TimeRange,
+  standardTransformersRegistry,
+  toDataFrame,
+} from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { SceneDataTransformer, SceneQueryRunner } from '@grafana/scenes';
+import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
+import { getStandardTransformers } from 'app/features/transformers/standardTransformers';
+import { DashboardDataDTO } from 'app/types';
+
+import { transformSaveModelToScene } from '../../serialization/transformSaveModelToScene';
+import { DashboardModelCompatibilityWrapper } from '../../utils/DashboardModelCompatibilityWrapper';
+import { findVizPanelByKey } from '../../utils/utils';
+import { VizPanelManager } from '../VizPanelManager';
+import { testDashboard } from '../testfiles/testDashboard';
+
+import { PanelDataTransformationsTab, PanelDataTransformationsTabRendered } from './PanelDataTransformationsTab';
+
+function createModelMock(
+  panelData: PanelData,
+  transformations?: DataTransformerConfig[],
+  onChangeTransformationsMock?: Function
+) {
+  return {
+    getDataTransformer: () => new SceneDataTransformer({ data: panelData, transformations: transformations || [] }),
+    getQueryRunner: () => new SceneQueryRunner({ queries: [], data: panelData }),
+    onChangeTransformations: onChangeTransformationsMock,
+  } as unknown as PanelDataTransformationsTab;
+}
+
+const mockData = {
+  timeRange: {} as unknown as TimeRange,
+  state: {} as unknown as LoadingState,
+  series: [
+    toDataFrame({
+      name: 'A',
+      fields: [
+        { name: 'time', type: FieldType.time, values: [100, 200, 300] },
+        { name: 'values', type: FieldType.number, values: [1, 2, 3] },
+      ],
+    }),
+  ],
+};
+
+describe('PanelDataTransformationsModel', () => {
+  it('can change transformations', () => {
+    const vizPanelManager = setupVizPanelManger('panel-1');
+    const model = new PanelDataTransformationsTab(vizPanelManager);
+    model.onChangeTransformations([{ id: 'calculateField', options: {} }]);
+    expect(model.getDataTransformer().state.transformations).toEqual([{ id: 'calculateField', options: {} }]);
+  });
+});
+
+describe('PanelDataTransformationsTab', () => {
+  standardTransformersRegistry.setInit(getStandardTransformers);
+
+  it('renders empty message when there are no transformations', async () => {
+    const modelMock = createModelMock({} as PanelData);
+    render(<PanelDataTransformationsTabRendered model={modelMock}></PanelDataTransformationsTabRendered>);
+
+    await screen.findByTestId(selectors.components.Transforms.noTransformationsMessage);
+  });
+
+  it('renders transformations when there are transformations', async () => {
+    const modelMock = createModelMock(mockData, [
+      {
+        id: 'calculateField',
+        options: {},
+      },
+    ]);
+    render(<PanelDataTransformationsTabRendered model={modelMock}></PanelDataTransformationsTabRendered>);
+
+    await screen.findByText('1 - Add field from calculation');
+  });
+
+  it('shows show the transformation selection drawer', async () => {
+    const modelMock = createModelMock(mockData);
+    render(<PanelDataTransformationsTabRendered model={modelMock}></PanelDataTransformationsTabRendered>);
+    const addButton = await screen.findByTestId(selectors.components.Transforms.addTransformationButton);
+    await userEvent.click(addButton);
+    await screen.findByTestId(selectors.components.Transforms.searchInput);
+  });
+
+  it('adds a transformation when a transformation is clicked in the drawer and there are no previous transformations', async () => {
+    const onChangeTransformation = jest.fn();
+    const modelMock = createModelMock(mockData, [], onChangeTransformation);
+    render(<PanelDataTransformationsTabRendered model={modelMock}></PanelDataTransformationsTabRendered>);
+    const addButton = await screen.findByTestId(selectors.components.Transforms.addTransformationButton);
+    await userEvent.click(addButton);
+    const transformationCard = await screen.findByTestId(
+      selectors.components.TransformTab.newTransform('Add field from calculation')
+    );
+    const button = transformationCard.getElementsByTagName('button').item(0);
+    await userEvent.click(button!);
+
+    expect(onChangeTransformation).toHaveBeenCalledWith([{ id: 'calculateField', options: {} }]);
+  });
+
+  it('adds a transformation when a transformation is clicked in the drawer and there are transformations', async () => {
+    const onChangeTransformation = jest.fn();
+    const modelMock = createModelMock(
+      mockData,
+      [
+        {
+          id: 'calculateField',
+          options: {},
+        },
+      ],
+      onChangeTransformation
+    );
+    render(<PanelDataTransformationsTabRendered model={modelMock}></PanelDataTransformationsTabRendered>);
+    const addButton = await screen.findByTestId(selectors.components.Transforms.addTransformationButton);
+    await userEvent.click(addButton);
+    const transformationCard = await screen.findByTestId(
+      selectors.components.TransformTab.newTransform('Add field from calculation')
+    );
+    const button = transformationCard.getElementsByTagName('button').item(0);
+    await userEvent.click(button!);
+    expect(onChangeTransformation).toHaveBeenCalledWith([
+      { id: 'calculateField', options: {} },
+      { id: 'calculateField', options: {} },
+    ]);
+  });
+
+  it('deletes all transformations', async () => {
+    const onChangeTransformation = jest.fn();
+    const modelMock = createModelMock(
+      mockData,
+      [
+        {
+          id: 'calculateField',
+          options: {},
+        },
+      ],
+      onChangeTransformation
+    );
+    render(<PanelDataTransformationsTabRendered model={modelMock}></PanelDataTransformationsTabRendered>);
+    const removeButton = await screen.findByTestId(selectors.components.Transforms.removeAllTransformationsButton);
+    await userEvent.click(removeButton);
+    const confirmButton = await screen.findByTestId(selectors.pages.ConfirmModal.delete);
+    await userEvent.click(confirmButton);
+
+    expect(onChangeTransformation).toHaveBeenCalledWith([]);
+  });
+
+  it('can filter transformations in the drawer', async () => {
+    const modelMock = createModelMock(mockData);
+    render(<PanelDataTransformationsTabRendered model={modelMock}></PanelDataTransformationsTabRendered>);
+    const addButton = await screen.findByTestId(selectors.components.Transforms.addTransformationButton);
+    await userEvent.click(addButton);
+
+    const searchInput = await screen.findByTestId(selectors.components.Transforms.searchInput);
+
+    await screen.findByTestId(selectors.components.TransformTab.newTransform('Reduce'));
+
+    await userEvent.type(searchInput, 'add field');
+
+    await screen.findByTestId(selectors.components.TransformTab.newTransform('Add field from calculation'));
+    const reduce = screen.queryByTestId(selectors.components.TransformTab.newTransform('Reduce'));
+    expect(reduce).toBeNull();
+  });
+});
+
+const setupVizPanelManger = (panelId: string) => {
+  const scene = transformSaveModelToScene({ dashboard: testDashboard as unknown as DashboardDataDTO, meta: {} });
+  const panel = findVizPanelByKey(scene, panelId)!;
+
+  const vizPanelManager = VizPanelManager.createFor(panel);
+
+  // The following happens on DahsboardScene activation. For the needs of this test this activation aint needed hence we hand-call it
+  // @ts-expect-error
+  getDashboardSrv().setCurrent(new DashboardModelCompatibilityWrapper(scene));
+
+  return vizPanelManager;
+};
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataTransformationsTab.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataTransformationsTab.tsx
new file mode 100644
index 0000000000000..f10b53be30ffe
--- /dev/null
+++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataTransformationsTab.tsx
@@ -0,0 +1,215 @@
+import { css } from '@emotion/css';
+import React, { useState } from 'react';
+import { DragDropContext, DropResult, Droppable } from 'react-beautiful-dnd';
+
+import { DataTransformerConfig, GrafanaTheme2, IconName, PanelData } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { SceneObjectBase, SceneComponentProps, SceneDataTransformer, SceneQueryRunner } from '@grafana/scenes';
+import { Button, ButtonGroup, ConfirmModal, Tab, useStyles2 } from '@grafana/ui';
+import { TransformationOperationRows } from 'app/features/dashboard/components/TransformationsEditor/TransformationOperationRows';
+
+import { VizPanelManager } from '../VizPanelManager';
+
+import { EmptyTransformationsMessage } from './EmptyTransformationsMessage';
+import { TransformationsDrawer } from './TransformationsDrawer';
+import { PanelDataPaneTabState, PanelDataPaneTab, TabId, PanelDataTabHeaderProps } from './types';
+
+interface PanelDataTransformationsTabState extends PanelDataPaneTabState {}
+
+export class PanelDataTransformationsTab
+  extends SceneObjectBase<PanelDataTransformationsTabState>
+  implements PanelDataPaneTab
+{
+  static Component = PanelDataTransformationsTabRendered;
+  TabComponent: (props: PanelDataTabHeaderProps) => React.JSX.Element;
+
+  tabId = TabId.Transformations;
+  icon: IconName = 'process';
+  private _panelManager: VizPanelManager;
+
+  getTabLabel() {
+    return 'Transformations';
+  }
+
+  constructor(panelManager: VizPanelManager) {
+    super({});
+    this.TabComponent = (props: PanelDataTabHeaderProps) => TransformationsTab({ ...props, model: this });
+
+    this._panelManager = panelManager;
+  }
+
+  public getQueryRunner(): SceneQueryRunner {
+    return this._panelManager.queryRunner;
+  }
+
+  public getDataTransformer(): SceneDataTransformer {
+    return this._panelManager.dataTransformer;
+  }
+
+  public onChangeTransformations(transformations: DataTransformerConfig[]) {
+    this._panelManager.changeTransformations(transformations);
+  }
+
+  get panelManager() {
+    return this._panelManager;
+  }
+}
+
+export function PanelDataTransformationsTabRendered({ model }: SceneComponentProps<PanelDataTransformationsTab>) {
+  const styles = useStyles2(getStyles);
+  const sourceData = model.getQueryRunner().useState();
+  const { data, transformations: transformsWrongType } = model.getDataTransformer().useState();
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  const transformations: DataTransformerConfig[] = transformsWrongType as unknown as DataTransformerConfig[];
+
+  const [drawerOpen, setDrawerOpen] = useState<boolean>(false);
+  const [confirmModalOpen, setConfirmModalOpen] = useState<boolean>(false);
+
+  const openDrawer = () => setDrawerOpen(true);
+  const closeDrawer = () => setDrawerOpen(false);
+
+  if (!data || !sourceData.data) {
+    return;
+  }
+
+  const transformationsDrawer = (
+    <TransformationsDrawer
+      onClose={closeDrawer}
+      onTransformationAdd={(selected) => {
+        if (selected.value === undefined) {
+          return;
+        }
+        model.onChangeTransformations([...transformations, { id: selected.value, options: {} }]);
+        closeDrawer();
+      }}
+      isOpen={drawerOpen}
+      series={data.series}
+    ></TransformationsDrawer>
+  );
+
+  if (transformations.length < 1) {
+    return (
+      <>
+        <EmptyTransformationsMessage onShowPicker={openDrawer}></EmptyTransformationsMessage>
+        {transformationsDrawer}
+      </>
+    );
+  }
+
+  return (
+    <>
+      <TransformationsEditor data={sourceData.data} transformations={transformations} model={model} />
+      <ButtonGroup>
+        <Button
+          icon="plus"
+          variant="secondary"
+          onClick={openDrawer}
+          data-testid={selectors.components.Transforms.addTransformationButton}
+        >
+          Add another transformation
+        </Button>
+        <Button
+          data-testid={selectors.components.Transforms.removeAllTransformationsButton}
+          className={styles.removeAll}
+          icon="times"
+          variant="secondary"
+          onClick={() => setConfirmModalOpen(true)}
+        >
+          Delete all transformations
+        </Button>
+      </ButtonGroup>
+      <ConfirmModal
+        isOpen={confirmModalOpen}
+        title="Delete all transformations?"
+        body="By deleting all transformations, you will go back to the main selection screen."
+        confirmText="Delete all"
+        onConfirm={() => {
+          model.onChangeTransformations([]);
+          setConfirmModalOpen(false);
+        }}
+        onDismiss={() => setConfirmModalOpen(false)}
+      />
+      {transformationsDrawer}
+    </>
+  );
+}
+
+interface TransformationEditorProps {
+  transformations: DataTransformerConfig[];
+  model: PanelDataTransformationsTab;
+  data: PanelData;
+}
+
+function TransformationsEditor({ transformations, model, data }: TransformationEditorProps) {
+  const transformationEditorRows = transformations.map((t, i) => ({ id: `${i} - ${t.id}`, transformation: t }));
+
+  const onDragEnd = (result: DropResult) => {
+    if (!result || !result.destination) {
+      return;
+    }
+
+    const startIndex = result.source.index;
+    const endIndex = result.destination.index;
+    if (startIndex === endIndex) {
+      return;
+    }
+    const update = Array.from(transformationEditorRows);
+    const [removed] = update.splice(startIndex, 1);
+    update.splice(endIndex, 0, removed);
+    model.onChangeTransformations(update.map((t) => t.transformation));
+  };
+
+  return (
+    <DragDropContext onDragEnd={onDragEnd}>
+      <Droppable droppableId="transformations-list" direction="vertical">
+        {(provided) => {
+          return (
+            <div ref={provided.innerRef} {...provided.droppableProps}>
+              <TransformationOperationRows
+                onChange={(index, transformation) => {
+                  const newTransformations = transformations.slice();
+                  newTransformations[index] = transformation;
+                  model.onChangeTransformations(newTransformations);
+                }}
+                onRemove={(index) => {
+                  const newTransformations = transformations.slice();
+                  newTransformations.splice(index, 1);
+                  model.onChangeTransformations(newTransformations);
+                }}
+                configs={transformationEditorRows}
+                data={data}
+              ></TransformationOperationRows>
+              {provided.placeholder}
+            </div>
+          );
+        }}
+      </Droppable>
+    </DragDropContext>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  removeAll: css({
+    marginLeft: theme.spacing(2),
+  }),
+});
+
+interface TransformationsTabProps extends PanelDataTabHeaderProps {
+  model: PanelDataTransformationsTab;
+}
+
+function TransformationsTab(props: TransformationsTabProps) {
+  const { model } = props;
+
+  const transformerState = model.getDataTransformer().useState();
+  return (
+    <Tab
+      key={props.key}
+      label={model.getTabLabel()}
+      icon="process"
+      counter={transformerState.transformations.length}
+      active={props.active}
+      onChangeTab={props.onChangeTab}
+    />
+  );
+}
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/TransformationsDrawer.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/TransformationsDrawer.tsx
new file mode 100644
index 0000000000000..5e9e75dd394ed
--- /dev/null
+++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/TransformationsDrawer.tsx
@@ -0,0 +1,91 @@
+import React, { FormEvent, useMemo, useState } from 'react';
+
+import { DataFrame, SelectableValue, standardTransformersRegistry } from '@grafana/data';
+import { IconButton } from '@grafana/ui';
+import { TransformationPickerNg } from 'app/features/dashboard/components/TransformationsEditor/TransformationPickerNg';
+import {
+  FilterCategory,
+  VIEW_ALL_VALUE,
+} from 'app/features/dashboard/components/TransformationsEditor/TransformationsEditor';
+
+interface DrawerState {
+  search: string;
+  showIllustrations: boolean;
+  selectedFilter?: FilterCategory;
+}
+
+interface TransformationsDrawerProps {
+  series: DataFrame[];
+  isOpen: boolean;
+  onClose: () => void;
+  onTransformationAdd: (selectedItem: SelectableValue<string>) => void;
+}
+
+export function TransformationsDrawer(props: TransformationsDrawerProps) {
+  const { isOpen, series, onClose, onTransformationAdd } = props;
+
+  const [drawerState, setDrawerState] = useState<DrawerState>({
+    search: '',
+    showIllustrations: true,
+  });
+
+  const onSearchChange = (e: FormEvent<HTMLInputElement>) =>
+    setDrawerState({ ...drawerState, ...{ search: e.currentTarget.value } });
+
+  const onShowIllustrationsChange = (showIllustrations: boolean): void =>
+    setDrawerState({ ...drawerState, ...{ showIllustrations } });
+
+  const onSelectedFilterChange = (selectedFilter: FilterCategory): void =>
+    setDrawerState({ ...drawerState, ...{ selectedFilter } });
+
+  const allTransformations = useMemo(
+    () => standardTransformersRegistry.list().sort((a, b) => (a.name > b.name ? 1 : b.name > a.name ? -1 : 0)),
+    []
+  );
+
+  const transformations = allTransformations.filter((t) => {
+    if (
+      drawerState.selectedFilter &&
+      drawerState.selectedFilter !== VIEW_ALL_VALUE &&
+      !t.categories?.has(drawerState.selectedFilter)
+    ) {
+      return false;
+    }
+    return t.name.toLocaleLowerCase().includes(drawerState.search.toLocaleLowerCase());
+  });
+
+  const searchBoxSuffix = (
+    <>
+      {transformations.length} / {allTransformations.length} &nbsp;&nbsp;
+      <IconButton
+        name="times"
+        onClick={() => {
+          setDrawerState({ ...drawerState, ...{ search: '' } });
+        }}
+        tooltip="Clear search"
+      />
+    </>
+  );
+
+  if (!isOpen) {
+    return;
+  }
+
+  return (
+    <TransformationPickerNg
+      data={series}
+      onTransformationAdd={onTransformationAdd}
+      xforms={transformations}
+      search={drawerState.search}
+      noTransforms={false}
+      suffix={drawerState.search !== '' ? searchBoxSuffix : <></>}
+      selectedFilter={drawerState.selectedFilter}
+      onSearchChange={onSearchChange}
+      onSearchKeyDown={() => {}}
+      showIllustrations={drawerState.showIllustrations}
+      onShowIllustrationsChange={onShowIllustrationsChange}
+      onSelectedFilterChange={onSelectedFilterChange}
+      onClose={onClose}
+    />
+  );
+}
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/__snapshots__/PanelDataAlertingTab.test.tsx.snap b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/__snapshots__/PanelDataAlertingTab.test.tsx.snap
new file mode 100644
index 0000000000000..c6d28162c50bb
--- /dev/null
+++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/__snapshots__/PanelDataAlertingTab.test.tsx.snap
@@ -0,0 +1,113 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`PanelAlertTabContent Will render alerts belonging to panel and a button to create alert from panel queries 1`] = `
+{
+  "annotations": [
+    {
+      "key": "__dashboardUid__",
+      "value": "12",
+    },
+    {
+      "key": "__panelId__",
+      "value": "34",
+    },
+  ],
+  "condition": "C",
+  "name": "mypanel",
+  "queries": [
+    {
+      "datasourceUid": "mock-ds-2",
+      "model": {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "mock-ds-2",
+        },
+        "expr": "sum(some_metric [15s])) by (app)",
+        "interval": "",
+        "intervalMs": 15000,
+        "refId": "A",
+      },
+      "queryType": "",
+      "refId": "A",
+      "relativeTimeRange": {
+        "from": 21600,
+        "to": 0,
+      },
+    },
+    {
+      "datasourceUid": "__expr__",
+      "model": {
+        "conditions": [
+          {
+            "evaluator": {
+              "params": [],
+              "type": "gt",
+            },
+            "operator": {
+              "type": "and",
+            },
+            "query": {
+              "params": [
+                "B",
+              ],
+            },
+            "reducer": {
+              "params": [],
+              "type": "last",
+            },
+            "type": "query",
+          },
+        ],
+        "datasource": {
+          "type": "__expr__",
+          "uid": "__expr__",
+        },
+        "expression": "A",
+        "reducer": "last",
+        "refId": "B",
+        "type": "reduce",
+      },
+      "queryType": "",
+      "refId": "B",
+    },
+    {
+      "datasourceUid": "__expr__",
+      "model": {
+        "conditions": [
+          {
+            "evaluator": {
+              "params": [
+                0,
+              ],
+              "type": "gt",
+            },
+            "operator": {
+              "type": "and",
+            },
+            "query": {
+              "params": [
+                "C",
+              ],
+            },
+            "reducer": {
+              "params": [],
+              "type": "last",
+            },
+            "type": "query",
+          },
+        ],
+        "datasource": {
+          "type": "__expr__",
+          "uid": "__expr__",
+        },
+        "expression": "B",
+        "refId": "C",
+        "type": "threshold",
+      },
+      "queryType": "",
+      "refId": "C",
+    },
+  ],
+  "type": "grafana",
+}
+`;
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/types.ts b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/types.ts
new file mode 100644
index 0000000000000..5edff739a1669
--- /dev/null
+++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/types.ts
@@ -0,0 +1,21 @@
+import { SceneObject, SceneObjectState } from '@grafana/scenes';
+
+export interface PanelDataPaneTabState extends SceneObjectState {}
+
+export enum TabId {
+  Queries = 'queries',
+  Transformations = 'transformations',
+  Alert = 'alert',
+}
+
+export interface PanelDataTabHeaderProps {
+  key: string;
+  active: boolean;
+  onChangeTab?: (event: React.MouseEvent<HTMLElement>) => void;
+}
+
+export interface PanelDataPaneTab extends SceneObject {
+  TabComponent: (props: PanelDataTabHeaderProps) => React.JSX.Element;
+  getTabLabel(): string;
+  tabId: TabId;
+}
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelEditControls.tsx b/public/app/features/dashboard-scene/panel-edit/PanelEditControls.tsx
new file mode 100644
index 0000000000000..6a2478a0ac291
--- /dev/null
+++ b/public/app/features/dashboard-scene/panel-edit/PanelEditControls.tsx
@@ -0,0 +1,33 @@
+import React from 'react';
+
+import { selectors } from '@grafana/e2e-selectors';
+import { config } from '@grafana/runtime';
+import { InlineSwitch } from '@grafana/ui';
+
+import { PanelEditor } from './PanelEditor';
+
+export interface Props {
+  panelEditor: PanelEditor;
+}
+
+export function PanelEditControls({ panelEditor }: Props) {
+  const vizManager = panelEditor.state.vizManager;
+  const { panel, tableView } = vizManager.useState();
+  const skipDataQuery = config.panels[panel.state.pluginId].skipDataQuery;
+
+  return (
+    <>
+      {!skipDataQuery && (
+        <InlineSwitch
+          label="Table view"
+          showLabel={true}
+          id="table-view"
+          value={tableView ? true : false}
+          onClick={() => vizManager.toggleTableView()}
+          aria-label="toggle-table-view"
+          data-testid={selectors.components.PanelEditor.toggleTableView}
+        />
+      )}
+    </>
+  );
+}
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelEditor.test.ts b/public/app/features/dashboard-scene/panel-edit/PanelEditor.test.ts
new file mode 100644
index 0000000000000..af90d25282d59
--- /dev/null
+++ b/public/app/features/dashboard-scene/panel-edit/PanelEditor.test.ts
@@ -0,0 +1,193 @@
+import { PanelPlugin, PanelPluginMeta, PluginType } from '@grafana/data';
+import { SceneGridLayout, VizPanel } from '@grafana/scenes';
+import * as libAPI from 'app/features/library-panels/state/api';
+
+import { DashboardGridItem } from '../scene/DashboardGridItem';
+import { DashboardScene } from '../scene/DashboardScene';
+import { LibraryVizPanel } from '../scene/LibraryVizPanel';
+import { vizPanelToPanel } from '../serialization/transformSceneToSaveModel';
+import { activateFullSceneTree } from '../utils/test-utils';
+
+import { buildPanelEditScene } from './PanelEditor';
+
+let pluginToLoad: PanelPlugin | undefined;
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getPluginImportUtils: () => ({
+    getPanelPluginFromCache: jest.fn(() => pluginToLoad),
+  }),
+  config: {
+    ...jest.requireActual('@grafana/runtime').config,
+    panels: {
+      text: {
+        skipDataQuery: true,
+      },
+      timeseries: {
+        skipDataQuery: false,
+      },
+    },
+  },
+}));
+
+describe('PanelEditor', () => {
+  describe('When closing editor', () => {
+    it('should apply changes automatically', () => {
+      pluginToLoad = getTestPanelPlugin({ id: 'text', skipDataQuery: true });
+
+      const panel = new VizPanel({
+        key: 'panel-1',
+        pluginId: 'text',
+      });
+
+      const gridItem = new DashboardGridItem({ body: panel });
+
+      const editScene = buildPanelEditScene(panel);
+      const scene = new DashboardScene({
+        editPanel: editScene,
+        isEditing: true,
+        body: new SceneGridLayout({
+          children: [gridItem],
+        }),
+      });
+
+      const deactivate = activateFullSceneTree(scene);
+
+      editScene.state.vizManager.state.panel.setState({ title: 'changed title' });
+
+      deactivate();
+
+      const updatedPanel = gridItem.state.body as VizPanel;
+      expect(updatedPanel?.state.title).toBe('changed title');
+    });
+  });
+
+  describe('Handling library panels', () => {
+    it('should call the api with the updated panel', async () => {
+      pluginToLoad = getTestPanelPlugin({ id: 'text', skipDataQuery: true });
+      const panel = new VizPanel({
+        key: 'panel-1',
+        pluginId: 'text',
+      });
+
+      const libraryPanelModel = {
+        title: 'title',
+        uid: 'uid',
+        name: 'libraryPanelName',
+        model: vizPanelToPanel(panel),
+        type: 'panel',
+        version: 1,
+      };
+
+      const libraryPanel = new LibraryVizPanel({
+        isLoaded: true,
+        title: libraryPanelModel.title,
+        uid: libraryPanelModel.uid,
+        name: libraryPanelModel.name,
+        panelKey: panel.state.key!,
+        panel: panel,
+        _loadedPanel: libraryPanelModel,
+      });
+      const gridItem = new DashboardGridItem({ body: libraryPanel });
+
+      const apiCall = jest
+        .spyOn(libAPI, 'updateLibraryVizPanel')
+        .mockResolvedValue({ type: 'panel', ...libAPI.libraryVizPanelToSaveModel(libraryPanel), version: 2 });
+
+      const editScene = buildPanelEditScene(panel);
+      const scene = new DashboardScene({
+        editPanel: editScene,
+        isEditing: true,
+        body: new SceneGridLayout({
+          children: [gridItem],
+        }),
+      });
+
+      activateFullSceneTree(scene);
+
+      editScene.state.vizManager.state.panel.setState({ title: 'changed title' });
+      (editScene.state.vizManager.state.sourcePanel.resolve().parent as LibraryVizPanel).setState({
+        name: 'changed name',
+      });
+      editScene.state.vizManager.commitChanges();
+
+      const calledWith = apiCall.mock.calls[0][0].state;
+      expect(calledWith.panel?.state.title).toBe('changed title');
+      expect(calledWith.name).toBe('changed name');
+
+      await new Promise(process.nextTick); // Wait for mock api to return and update the library panel
+      expect((gridItem.state.body as LibraryVizPanel).state._loadedPanel?.version).toBe(2);
+    });
+  });
+
+  describe('PanelDataPane', () => {
+    it('should not exist if panel is skipDataQuery', () => {
+      pluginToLoad = getTestPanelPlugin({ id: 'text', skipDataQuery: true });
+
+      const panel = new VizPanel({
+        key: 'panel-1',
+        pluginId: 'text',
+      });
+      new DashboardGridItem({
+        body: panel,
+      });
+
+      const editScene = buildPanelEditScene(panel);
+      const scene = new DashboardScene({
+        editPanel: editScene,
+      });
+
+      activateFullSceneTree(scene);
+
+      expect(editScene.state.dataPane).toBeUndefined();
+    });
+
+    it('should exist if panel is supporting querying', () => {
+      pluginToLoad = getTestPanelPlugin({ id: 'timeseries' });
+
+      const panel = new VizPanel({
+        key: 'panel-1',
+        pluginId: 'timeseries',
+      });
+
+      new DashboardGridItem({
+        body: panel,
+      });
+      const editScene = buildPanelEditScene(panel);
+      const scene = new DashboardScene({
+        editPanel: editScene,
+      });
+
+      activateFullSceneTree(scene);
+      expect(editScene.state.dataPane).toBeDefined();
+    });
+  });
+});
+
+export function getTestPanelPlugin(options: Partial<PanelPluginMeta>): PanelPlugin {
+  const plugin = new PanelPlugin(() => null);
+  plugin.meta = {
+    id: options.id!,
+    type: PluginType.panel,
+    name: options.id!,
+    sort: options.sort || 1,
+    info: {
+      author: {
+        name: options.id + 'name',
+      },
+      description: '',
+      links: [],
+      logos: {
+        large: '',
+        small: '',
+      },
+      screenshots: [],
+      updated: '',
+      version: '1.0.',
+    },
+    hideFromList: options.hideFromList === true,
+    module: options.module ?? '',
+    baseUrl: '',
+    skipDataQuery: options.skipDataQuery ?? false,
+  };
+  return plugin;
+}
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelEditor.tsx b/public/app/features/dashboard-scene/panel-edit/PanelEditor.tsx
index 7d0416a645f4c..505f487dc3f5d 100644
--- a/public/app/features/dashboard-scene/panel-edit/PanelEditor.tsx
+++ b/public/app/features/dashboard-scene/panel-edit/PanelEditor.tsx
@@ -1,134 +1,181 @@
 import * as H from 'history';
 
-import { locationService } from '@grafana/runtime';
-import {
-  getUrlSyncManager,
-  SceneFlexItem,
-  SceneFlexLayout,
-  SceneObject,
-  SceneObjectBase,
-  SceneObjectRef,
-  SceneObjectState,
-  sceneUtils,
-  SplitLayout,
-  VizPanel,
-} from '@grafana/scenes';
-
-import { DashboardScene } from '../scene/DashboardScene';
-import { getDashboardUrl } from '../utils/urlBuilders';
+import { NavIndex } from '@grafana/data';
+import { config, locationService } from '@grafana/runtime';
+import { SceneObjectBase, SceneObjectState, VizPanel } from '@grafana/scenes';
 
+import { DashboardGridItem } from '../scene/DashboardGridItem';
+import { LibraryVizPanel } from '../scene/LibraryVizPanel';
+import { getDashboardSceneFor, getPanelIdForVizPanel } from '../utils/utils';
+
+import { PanelDataPane } from './PanelDataPane/PanelDataPane';
 import { PanelEditorRenderer } from './PanelEditorRenderer';
 import { PanelOptionsPane } from './PanelOptionsPane';
+import { VizPanelManager, VizPanelManagerState } from './VizPanelManager';
 
 export interface PanelEditorState extends SceneObjectState {
-  body: SceneObject;
-  controls?: SceneObject[];
   isDirty?: boolean;
-  /** Panel to inspect */
-  inspectPanelId?: string;
-  /** Scene object that handles the current drawer */
-  drawer?: SceneObject;
-
-  dashboardRef: SceneObjectRef<DashboardScene>;
-  sourcePanelRef: SceneObjectRef<VizPanel>;
-  panelRef: SceneObjectRef<VizPanel>;
+  panelId: number;
+  optionsPane: PanelOptionsPane;
+  dataPane?: PanelDataPane;
+  vizManager: VizPanelManager;
+  showLibraryPanelSaveModal?: boolean;
+  showLibraryPanelUnlinkModal?: boolean;
 }
 
 export class PanelEditor extends SceneObjectBase<PanelEditorState> {
+  private _initialRepeatOptions: Pick<VizPanelManagerState, 'repeat' | 'repeatDirection' | 'maxPerRow'> = {};
   static Component = PanelEditorRenderer;
 
+  private _discardChanges = false;
+
   public constructor(state: PanelEditorState) {
     super(state);
 
-    this.addActivationHandler(() => this._activationHandler());
+    const { repeat, repeatDirection, maxPerRow } = state.vizManager.state;
+    this._initialRepeatOptions = {
+      repeat,
+      repeatDirection,
+      maxPerRow,
+    };
+
+    this.addActivationHandler(this._activationHandler.bind(this));
   }
 
   private _activationHandler() {
-    // Deactivation logic
+    const panelManager = this.state.vizManager;
+    const panel = panelManager.state.panel;
+
+    this._subs.add(
+      panelManager.subscribeToState((n, p) => {
+        if (n.panel.state.pluginId !== p.panel.state.pluginId) {
+          this._initDataPane(n.panel.state.pluginId);
+        }
+      })
+    );
+
+    this._initDataPane(panel.state.pluginId);
+
     return () => {
-      getUrlSyncManager().cleanUp(this);
+      if (!this._discardChanges) {
+        this.commitChanges();
+      }
     };
   }
 
-  public startUrlSync() {
-    getUrlSyncManager().initSync(this);
+  private _initDataPane(pluginId: string) {
+    const skipDataQuery = config.panels[pluginId].skipDataQuery;
+
+    if (skipDataQuery && this.state.dataPane) {
+      locationService.partial({ tab: null }, true);
+      this.setState({ dataPane: undefined });
+    }
+
+    if (!skipDataQuery && !this.state.dataPane) {
+      this.setState({ dataPane: new PanelDataPane(this.state.vizManager) });
+    }
+  }
+
+  public getUrlKey() {
+    return this.state.panelId.toString();
   }
 
-  public getPageNav(location: H.Location) {
+  public getPageNav(location: H.Location, navIndex: NavIndex) {
+    const dashboard = getDashboardSceneFor(this);
+
     return {
       text: 'Edit panel',
-      parentItem: this.state.dashboardRef.resolve().getPageNav(location),
+      parentItem: dashboard.getPageNav(location, navIndex),
     };
   }
 
   public onDiscard = () => {
-    // Open question on what to preserve when going back
-    // Preserve time range, and variables state (that might have been changed while in panel edit)
-    // Preserve current panel data? (say if you just changed the time range and have new data)
-    this._navigateBackToDashboard();
-  };
-
-  public onApply = () => {
-    this._commitChanges();
-    this._navigateBackToDashboard();
-  };
-
-  public onSave = () => {
-    this._commitChanges();
-    // Open dashboard save drawer
+    this._discardChanges = true;
+    locationService.partial({ editPanel: null });
   };
 
-  private _commitChanges() {
-    const dashboard = this.state.dashboardRef.resolve();
-    const sourcePanel = this.state.sourcePanelRef.resolve();
-    const panel = this.state.panelRef.resolve();
+  public commitChanges() {
+    const dashboard = getDashboardSceneFor(this);
 
     if (!dashboard.state.isEditing) {
       dashboard.onEnterEditMode();
     }
 
-    const newState = sceneUtils.cloneSceneObjectState(panel.state);
-    sourcePanel.setState(newState);
+    const panelManager = this.state.vizManager;
+    const sourcePanel = panelManager.state.sourcePanel.resolve();
+    const sourcePanelParent = sourcePanel!.parent;
+    const isLibraryPanel = sourcePanelParent instanceof LibraryVizPanel;
 
-    // preserve time range and variables state
-    dashboard.setState({
-      $timeRange: this.state.$timeRange?.clone(),
-      $variables: this.state.$variables?.clone(),
-      isDirty: true,
-    });
+    const gridItem = isLibraryPanel ? sourcePanelParent.parent : sourcePanelParent;
+
+    if (isLibraryPanel) {
+      // Library panels handled separately
+      return;
+    }
+
+    if (gridItem instanceof DashboardGridItem) {
+      this.handleRepeatOptionChanges(gridItem);
+    } else {
+      console.error('Unsupported scene object type');
+    }
   }
 
-  private _navigateBackToDashboard() {
-    locationService.push(
-      getDashboardUrl({
-        uid: this.state.dashboardRef.resolve().state.uid,
-        currentQueryParams: locationService.getLocation().search,
-      })
-    );
+  private handleRepeatOptionChanges(panelRepeater: DashboardGridItem) {
+    let width = panelRepeater.state.width ?? 1;
+    let height = panelRepeater.state.height;
+
+    const panelManager = this.state.vizManager;
+    const horizontalToVertical =
+      this._initialRepeatOptions.repeatDirection === 'h' && panelManager.state.repeatDirection === 'v';
+    const verticalToHorizontal =
+      this._initialRepeatOptions.repeatDirection === 'v' && panelManager.state.repeatDirection === 'h';
+    if (horizontalToVertical) {
+      width = Math.floor(width / (panelRepeater.state.maxPerRow ?? 1));
+    } else if (verticalToHorizontal) {
+      width = 24;
+    }
+
+    panelRepeater.setState({
+      body: panelManager.state.panel.clone(),
+      repeatDirection: panelManager.state.repeatDirection,
+      variableName: panelManager.state.repeat,
+      maxPerRow: panelManager.state.maxPerRow,
+      width,
+      height,
+    });
   }
-}
 
-export function buildPanelEditScene(dashboard: DashboardScene, panel: VizPanel): PanelEditor {
-  const panelClone = panel.clone();
-  const dashboardStateCloned = sceneUtils.cloneSceneObjectState(dashboard.state);
+  public onSaveLibraryPanel = () => {
+    this.setState({ showLibraryPanelSaveModal: true });
+  };
+
+  public onConfirmSaveLibraryPanel = () => {
+    this.state.vizManager.commitChanges();
+    locationService.partial({ editPanel: null });
+  };
+
+  public onDismissLibraryPanelSaveModal = () => {
+    this.setState({ showLibraryPanelSaveModal: false });
+  };
+
+  public onUnlinkLibraryPanel = () => {
+    this.setState({ showLibraryPanelUnlinkModal: true });
+  };
+
+  public onDismissUnlinkLibraryPanelModal = () => {
+    this.setState({ showLibraryPanelUnlinkModal: false });
+  };
+
+  public onConfirmUnlinkLibraryPanel = () => {
+    this.state.vizManager.unlinkLibraryPanel();
+    this.setState({ showLibraryPanelUnlinkModal: false });
+  };
+}
 
+export function buildPanelEditScene(panel: VizPanel): PanelEditor {
   return new PanelEditor({
-    dashboardRef: dashboard.getRef(),
-    sourcePanelRef: panel.getRef(),
-    panelRef: panelClone.getRef(),
-    controls: dashboardStateCloned.controls,
-    $variables: dashboardStateCloned.$variables,
-    $timeRange: dashboardStateCloned.$timeRange,
-    body: new SplitLayout({
-      direction: 'row',
-      primary: new SceneFlexLayout({
-        direction: 'column',
-        children: [panelClone],
-      }),
-      secondary: new SceneFlexItem({
-        width: '300px',
-        body: new PanelOptionsPane(panelClone),
-      }),
-    }),
+    panelId: getPanelIdForVizPanel(panel),
+    optionsPane: new PanelOptionsPane({}),
+    vizManager: VizPanelManager.createFor(panel),
   });
 }
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelEditorRenderer.tsx b/public/app/features/dashboard-scene/panel-edit/PanelEditorRenderer.tsx
index 9af29338ca707..c850073a94ff1 100644
--- a/public/app/features/dashboard-scene/panel-edit/PanelEditorRenderer.tsx
+++ b/public/app/features/dashboard-scene/panel-edit/PanelEditorRenderer.tsx
@@ -1,72 +1,176 @@
-import { css } from '@emotion/css';
+import { css, cx } from '@emotion/css';
 import React from 'react';
-import { useLocation } from 'react-router-dom';
 
-import { GrafanaTheme2, PageLayoutType } from '@grafana/data';
+import { GrafanaTheme2 } from '@grafana/data';
 import { SceneComponentProps } from '@grafana/scenes';
-import { Button, useStyles2 } from '@grafana/ui';
-import { AppChromeUpdate } from 'app/core/components/AppChrome/AppChromeUpdate';
-import { NavToolbarSeparator } from 'app/core/components/AppChrome/NavToolbar/NavToolbarSeparator';
-import { Page } from 'app/core/components/Page/Page';
+import { Button, ToolbarButton, useStyles2 } from '@grafana/ui';
+
+import { NavToolbarActions } from '../scene/NavToolbarActions';
+import { UnlinkModal } from '../scene/UnlinkModal';
+import { getDashboardSceneFor, getLibraryPanel } from '../utils/utils';
 
 import { PanelEditor } from './PanelEditor';
+import { SaveLibraryVizPanelModal } from './SaveLibraryVizPanelModal';
+import { useSnappingSplitter } from './splitter/useSnappingSplitter';
 
 export function PanelEditorRenderer({ model }: SceneComponentProps<PanelEditor>) {
-  const { body, controls, drawer } = model.useState();
+  const dashboard = getDashboardSceneFor(model);
+  const { optionsPane } = model.useState();
   const styles = useStyles2(getStyles);
-  const location = useLocation();
-  const pageNav = model.getPageNav(location);
+
+  const { containerProps, primaryProps, secondaryProps, splitterProps, splitterState, onToggleCollapse } =
+    useSnappingSplitter({
+      direction: 'row',
+      dragPosition: 'end',
+      initialSize: 0.75,
+      paneOptions: {
+        collapseBelowPixels: 250,
+        snapOpenToPixels: 400,
+      },
+    });
 
   return (
-    <Page navId="scenes" pageNav={pageNav} layout={PageLayoutType.Custom}>
-      <AppChromeUpdate actions={getToolbarActions(model)} />
-      <div className={styles.canvasContent}>
-        {controls && (
-          <div className={styles.controls}>
-            {controls.map((control) => (
-              <control.Component key={control.state.key} model={control} />
-            ))}
-          </div>
-        )}
-        <div className={styles.body}>
-          <body.Component model={body} />
+    <>
+      <NavToolbarActions dashboard={dashboard} />
+      <div {...containerProps}>
+        <div {...primaryProps} className={cx(primaryProps.className, styles.body)}>
+          <VizAndDataPane model={model} />
+        </div>
+        <div {...splitterProps} />
+        <div {...secondaryProps} className={cx(secondaryProps.className, styles.optionsPane)}>
+          {splitterState.collapsed && (
+            <div className={styles.expandOptionsWrapper}>
+              <ToolbarButton
+                tooltip={'Open options pane'}
+                icon={'arrow-to-right'}
+                onClick={onToggleCollapse}
+                variant="canvas"
+                className={styles.rotate180}
+                aria-label={'Open options pane'}
+              />
+            </div>
+          )}
+          {!splitterState.collapsed && <optionsPane.Component model={optionsPane} />}
         </div>
       </div>
-      {drawer && <drawer.Component model={drawer} />}
-    </Page>
+    </>
   );
 }
 
-function getToolbarActions(editor: PanelEditor) {
-  return (
-    <>
-      <NavToolbarSeparator leftActionsSeparator key="separator" />
+function VizAndDataPane({ model }: SceneComponentProps<PanelEditor>) {
+  const dashboard = getDashboardSceneFor(model);
+  const { vizManager, dataPane, showLibraryPanelSaveModal, showLibraryPanelUnlinkModal } = model.useState();
+  const { sourcePanel } = vizManager.useState();
+  const libraryPanel = getLibraryPanel(sourcePanel.resolve());
+  const { controls, scopes } = dashboard.useState();
+  const styles = useStyles2(getStyles);
 
-      <Button
-        onClick={editor.onDiscard}
-        tooltip=""
-        key="panel-edit-discard"
-        variant="destructive"
-        fill="outline"
-        size="sm"
-      >
-        Discard
-      </Button>
+  const { containerProps, primaryProps, secondaryProps, splitterProps, splitterState, onToggleCollapse } =
+    useSnappingSplitter({
+      direction: 'column',
+      dragPosition: 'start',
+      initialSize: 0.5,
+      paneOptions: {
+        collapseBelowPixels: 150,
+      },
+    });
 
-      <Button onClick={editor.onApply} tooltip="" key="panel-edit-apply" variant="primary" size="sm">
-        Apply
-      </Button>
-    </>
+  containerProps.className = cx(containerProps.className, styles.container);
+
+  if (!dataPane) {
+    primaryProps.style.flexGrow = 1;
+  }
+
+  return (
+    <div
+      className={cx(
+        styles.pageContainer,
+        controls && !scopes && styles.pageContainerWithControls,
+        scopes && styles.pageContainerWithScopes
+      )}
+    >
+      {scopes && <scopes.Component model={scopes} />}
+      {controls && (
+        <div className={cx(styles.controlsWrapper, scopes && styles.controlsWrapperWithScopes)}>
+          <controls.Component model={controls} />
+        </div>
+      )}
+      <div {...containerProps}>
+        <div {...primaryProps}>
+          <vizManager.Component model={vizManager} />
+        </div>
+        {showLibraryPanelSaveModal && libraryPanel && (
+          <SaveLibraryVizPanelModal
+            libraryPanel={libraryPanel}
+            onDismiss={model.onDismissLibraryPanelSaveModal}
+            onConfirm={model.onConfirmSaveLibraryPanel}
+            onDiscard={model.onDiscard}
+          ></SaveLibraryVizPanelModal>
+        )}
+        {showLibraryPanelUnlinkModal && libraryPanel && (
+          <UnlinkModal
+            onDismiss={model.onDismissUnlinkLibraryPanelModal}
+            onConfirm={model.onConfirmUnlinkLibraryPanel}
+            isOpen
+          />
+        )}
+        {dataPane && (
+          <>
+            <div {...splitterProps} />
+            <div {...secondaryProps}>
+              {splitterState.collapsed && (
+                <div className={styles.expandDataPane}>
+                  <Button
+                    tooltip={'Open query pane'}
+                    icon={'arrow-to-right'}
+                    onClick={onToggleCollapse}
+                    variant="secondary"
+                    size="sm"
+                    className={styles.openDataPaneButton}
+                    aria-label={'Open query pane'}
+                  />
+                </div>
+              )}
+              {!splitterState.collapsed && <dataPane.Component model={dataPane} />}
+            </div>
+          </>
+        )}
+      </div>
+    </div>
   );
 }
 
 function getStyles(theme: GrafanaTheme2) {
   return {
+    pageContainer: css({
+      display: 'grid',
+      gridTemplateAreas: `
+        "panels"`,
+      gridTemplateColumns: `1fr`,
+      gridTemplateRows: '1fr',
+      height: '100%',
+    }),
+    pageContainerWithControls: css({
+      gridTemplateAreas: `
+        "controls"
+        "panels"`,
+      gridTemplateRows: 'auto 1fr',
+    }),
+    pageContainerWithScopes: css({
+      gridTemplateAreas: `
+        "scopes controls"
+        "panels panels"`,
+      gridTemplateColumns: `${theme.spacing(32)} 1fr`,
+      gridTemplateRows: 'auto 1fr',
+    }),
+    container: css({
+      gridArea: 'panels',
+      height: '100%',
+    }),
     canvasContent: css({
       label: 'canvas-content',
       display: 'flex',
       flexDirection: 'column',
-      padding: theme.spacing(0, 2),
       flexBasis: '100%',
       flexGrow: 1,
       minHeight: 0,
@@ -76,17 +180,48 @@ function getStyles(theme: GrafanaTheme2) {
       label: 'body',
       flexGrow: 1,
       display: 'flex',
-      position: 'relative',
+      flexDirection: 'column',
       minHeight: 0,
-      gap: '8px',
-      marginBottom: theme.spacing(2),
     }),
-    controls: css({
+    optionsPane: css({
+      flexDirection: 'column',
+      borderLeft: `1px solid ${theme.colors.border.weak}`,
+      background: theme.colors.background.primary,
+    }),
+    expandOptionsWrapper: css({
+      display: 'flex',
+      flexDirection: 'column',
+      padding: theme.spacing(2, 1),
+    }),
+    expandDataPane: css({
       display: 'flex',
-      flexWrap: 'wrap',
-      alignItems: 'center',
-      gap: theme.spacing(1),
+      flexDirection: 'row',
+      padding: theme.spacing(1),
+      borderTop: `1px solid ${theme.colors.border.weak}`,
+      borderRight: `1px solid ${theme.colors.border.weak}`,
+      background: theme.colors.background.primary,
+      flexGrow: 1,
+      justifyContent: 'space-around',
+    }),
+    rotate180: css({
+      rotate: '180deg',
+    }),
+    controlsWrapper: css({
+      display: 'flex',
+      flexDirection: 'column',
+      flexGrow: 0,
+      gridArea: 'controls',
+      padding: theme.spacing(2, 0, 2, 2),
+    }),
+    controlsWrapperWithScopes: css({
       padding: theme.spacing(2, 0),
     }),
+    openDataPaneButton: css({
+      width: theme.spacing(8),
+      justifyContent: 'center',
+      svg: {
+        rotate: '-90deg',
+      },
+    }),
   };
 }
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelOptions.test.tsx b/public/app/features/dashboard-scene/panel-edit/PanelOptions.test.tsx
new file mode 100644
index 0000000000000..e8d70ee76d751
--- /dev/null
+++ b/public/app/features/dashboard-scene/panel-edit/PanelOptions.test.tsx
@@ -0,0 +1,129 @@
+import { act, fireEvent, render, screen } from '@testing-library/react';
+import React from 'react';
+
+import { selectors } from '@grafana/e2e-selectors';
+import { VizPanel } from '@grafana/scenes';
+import { OptionFilter } from 'app/features/dashboard/components/PanelEditor/OptionsPaneOptions';
+
+import { DashboardGridItem } from '../scene/DashboardGridItem';
+import { DashboardScene } from '../scene/DashboardScene';
+import { LibraryVizPanel } from '../scene/LibraryVizPanel';
+import { vizPanelToPanel } from '../serialization/transformSceneToSaveModel';
+import * as utils from '../utils/utils';
+
+import { PanelOptions } from './PanelOptions';
+import { VizPanelManager } from './VizPanelManager';
+
+const OptionsPaneSelector = selectors.components.PanelEditor.OptionsPane;
+
+jest.mock('react-router-dom', () => ({
+  useLocation: () => ({
+    pathname: '',
+  }),
+}));
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getPluginImportUtils: () => ({
+    getPanelPluginFromCache: jest.fn(),
+  }),
+}));
+
+// Needed when the panel is not part of an DashboardScene
+jest.spyOn(utils, 'getDashboardSceneFor').mockReturnValue(new DashboardScene({}));
+
+interface SetupOptions {
+  panel?: VizPanel;
+}
+
+function setup(options: SetupOptions = {}) {
+  let panel = options.panel;
+
+  if (!panel) {
+    panel = new VizPanel({
+      key: 'panel-1',
+      pluginId: 'text',
+      title: 'My title',
+    });
+
+    new DashboardGridItem({ body: panel });
+  }
+
+  const vizManager = VizPanelManager.createFor(panel);
+
+  const panelOptions = <PanelOptions vizManager={vizManager} searchQuery="" listMode={OptionFilter.All}></PanelOptions>;
+
+  const renderResult = render(panelOptions);
+
+  return { renderResult, vizManager };
+}
+
+describe('PanelOptions', () => {
+  describe('Can render and edit panel frame options', () => {
+    it('Can edit title', async () => {
+      const { vizManager } = setup();
+
+      expect(screen.getByLabelText(OptionsPaneSelector.fieldLabel('Panel options Title'))).toBeInTheDocument();
+
+      const input = screen.getByTestId('panel-edit-panel-title-input');
+      fireEvent.change(input, { target: { value: 'New title' } });
+
+      expect(vizManager.state.panel.state.title).toBe('New title');
+    });
+
+    it('Clearing title should set hoverHeader to true', async () => {
+      const { vizManager } = setup();
+
+      expect(screen.getByLabelText(OptionsPaneSelector.fieldLabel('Panel options Title'))).toBeInTheDocument();
+
+      const input = screen.getByTestId('panel-edit-panel-title-input');
+      fireEvent.change(input, { target: { value: '' } });
+
+      expect(vizManager.state.panel.state.title).toBe('');
+      expect(vizManager.state.panel.state.hoverHeader).toBe(true);
+
+      fireEvent.change(input, { target: { value: 'Muu' } });
+      expect(vizManager.state.panel.state.hoverHeader).toBe(false);
+    });
+  });
+
+  it('gets library panel options when the editing a library panel', async () => {
+    const panel = new VizPanel({
+      key: 'panel-1',
+      pluginId: 'text',
+    });
+
+    const libraryPanelModel = {
+      title: 'title',
+      uid: 'uid',
+      name: 'libraryPanelName',
+      model: vizPanelToPanel(panel),
+      type: 'panel',
+      version: 1,
+    };
+
+    const libraryPanel = new LibraryVizPanel({
+      isLoaded: true,
+      title: libraryPanelModel.title,
+      uid: libraryPanelModel.uid,
+      name: libraryPanelModel.name,
+      panelKey: panel.state.key!,
+      panel: panel,
+      _loadedPanel: libraryPanelModel,
+    });
+
+    new DashboardGridItem({ body: libraryPanel });
+
+    const { renderResult, vizManager } = setup({ panel: panel });
+
+    const input = await renderResult.findByTestId('library panel name input');
+
+    await act(async () => {
+      fireEvent.blur(input, { target: { value: 'new library panel name' } });
+    });
+
+    expect((vizManager.state.sourcePanel.resolve().parent as LibraryVizPanel).state.name).toBe(
+      'new library panel name'
+    );
+  });
+});
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelOptions.tsx b/public/app/features/dashboard-scene/panel-edit/PanelOptions.tsx
new file mode 100644
index 0000000000000..7da739a385ad2
--- /dev/null
+++ b/public/app/features/dashboard-scene/panel-edit/PanelOptions.tsx
@@ -0,0 +1,114 @@
+import React, { useMemo } from 'react';
+
+import { PanelData } from '@grafana/data';
+import { OptionFilter, renderSearchHits } from 'app/features/dashboard/components/PanelEditor/OptionsPaneOptions';
+import { getFieldOverrideCategories } from 'app/features/dashboard/components/PanelEditor/getFieldOverrideElements';
+import {
+  getLibraryVizPanelOptionsCategory,
+  getVisualizationOptions2,
+} from 'app/features/dashboard/components/PanelEditor/getVisualizationOptions';
+
+import { LibraryVizPanel } from '../scene/LibraryVizPanel';
+
+import { VizPanelManager } from './VizPanelManager';
+import { getPanelFrameCategory2 } from './getPanelFrameOptions';
+
+interface Props {
+  vizManager: VizPanelManager;
+  searchQuery: string;
+  listMode: OptionFilter;
+  data?: PanelData;
+}
+
+export const PanelOptions = React.memo<Props>(({ vizManager, searchQuery, listMode, data }) => {
+  const { panel, sourcePanel, repeat } = vizManager.useState();
+  const parent = sourcePanel.resolve().parent;
+  const { options, fieldConfig, _pluginInstanceState } = panel.useState();
+
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  const panelFrameOptions = useMemo(
+    () => getPanelFrameCategory2(vizManager, panel, repeat),
+    [vizManager, panel, repeat]
+  );
+
+  const visualizationOptions = useMemo(() => {
+    const plugin = panel.getPlugin();
+    if (!plugin) {
+      return undefined;
+    }
+
+    return getVisualizationOptions2({
+      panel,
+      data,
+      plugin: plugin,
+      eventBus: panel.getPanelContext().eventBus,
+      instanceState: _pluginInstanceState,
+    });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [panel, options, fieldConfig, _pluginInstanceState]);
+
+  const libraryPanelOptions = useMemo(() => {
+    if (parent instanceof LibraryVizPanel) {
+      return getLibraryVizPanelOptionsCategory(parent);
+    }
+    return;
+  }, [parent]);
+
+  const justOverrides = useMemo(
+    () =>
+      getFieldOverrideCategories(
+        fieldConfig,
+        panel.getPlugin()?.fieldConfigRegistry!,
+        data?.series ?? [],
+        searchQuery,
+        (newConfig) => {
+          panel.setState({
+            fieldConfig: newConfig,
+          });
+        }
+      ),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [searchQuery, panel, fieldConfig]
+  );
+
+  const isSearching = searchQuery.length > 0;
+  const mainBoxElements: React.ReactNode[] = [];
+
+  if (isSearching) {
+    mainBoxElements.push(
+      renderSearchHits(
+        [panelFrameOptions, ...(libraryPanelOptions ? [libraryPanelOptions] : []), ...(visualizationOptions ?? [])],
+        justOverrides,
+        searchQuery
+      )
+    );
+  } else {
+    switch (listMode) {
+      case OptionFilter.All:
+        if (libraryPanelOptions) {
+          // Library Panel options first
+          mainBoxElements.push(libraryPanelOptions.render());
+        }
+        mainBoxElements.push(panelFrameOptions.render());
+
+        for (const item of visualizationOptions ?? []) {
+          mainBoxElements.push(item.render());
+        }
+
+        for (const item of justOverrides) {
+          mainBoxElements.push(item.render());
+        }
+        break;
+      case OptionFilter.Overrides:
+        for (const item of justOverrides) {
+          mainBoxElements.push(item.render());
+        }
+      default:
+        break;
+    }
+  }
+
+  return mainBoxElements;
+});
+
+PanelOptions.displayName = 'PanelOptions';
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelOptionsPane.tsx b/public/app/features/dashboard-scene/panel-edit/PanelOptionsPane.tsx
index 32ca6be4802c3..5eb18b2966202 100644
--- a/public/app/features/dashboard-scene/panel-edit/PanelOptionsPane.tsx
+++ b/public/app/features/dashboard-scene/panel-edit/PanelOptionsPane.tsx
@@ -1,45 +1,138 @@
 import { css } from '@emotion/css';
-import React from 'react';
+import React, { useMemo } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { SceneComponentProps, SceneObjectBase, SceneObjectState, VizPanel } from '@grafana/scenes';
-import { Field, Input, useStyles2 } from '@grafana/ui';
+import { selectors } from '@grafana/e2e-selectors';
+import { SceneComponentProps, SceneObjectBase, SceneObjectState, sceneGraph } from '@grafana/scenes';
+import { FilterInput, Stack, ToolbarButton, useStyles2 } from '@grafana/ui';
+import { OptionFilter } from 'app/features/dashboard/components/PanelEditor/OptionsPaneOptions';
+import { getAllPanelPluginMeta } from 'app/features/panel/state/util';
 
-export interface PanelOptionsPaneState extends SceneObjectState {}
+import { PanelEditor } from './PanelEditor';
+import { PanelOptions } from './PanelOptions';
+import { PanelVizTypePicker } from './PanelVizTypePicker';
+
+export interface PanelOptionsPaneState extends SceneObjectState {
+  isVizPickerOpen?: boolean;
+  searchQuery: string;
+  listMode: OptionFilter;
+}
 
 export class PanelOptionsPane extends SceneObjectBase<PanelOptionsPaneState> {
-  public panel: VizPanel;
+  public constructor(state: Partial<PanelOptionsPaneState>) {
+    super({
+      searchQuery: '',
+      listMode: OptionFilter.All,
+      ...state,
+    });
+  }
 
-  public constructor(panel: VizPanel) {
-    super({});
+  onToggleVizPicker = () => {
+    this.setState({ isVizPickerOpen: !this.state.isVizPickerOpen });
+  };
 
-    this.panel = panel;
-  }
+  onSetSearchQuery = (searchQuery: string) => {
+    this.setState({ searchQuery });
+  };
+
+  onSetListMode = (listMode: OptionFilter) => {
+    this.setState({ listMode });
+  };
 
   static Component = ({ model }: SceneComponentProps<PanelOptionsPane>) => {
-    const { panel } = model;
-    const { title } = panel.useState();
+    const { isVizPickerOpen, searchQuery, listMode } = model.useState();
+    const vizManager = sceneGraph.getAncestor(model, PanelEditor).state.vizManager;
+    const { pluginId } = vizManager.state.panel.useState();
+    const { data } = sceneGraph.getData(vizManager.state.panel).useState();
     const styles = useStyles2(getStyles);
 
     return (
-      <div className={styles.box}>
-        <Field label="Title">
-          <Input value={title} onChange={(evt) => panel.setState({ title: evt.currentTarget.value })} />
-        </Field>
-      </div>
+      <>
+        {!isVizPickerOpen && (
+          <>
+            <div className={styles.top}>
+              <VisualizationButton pluginId={pluginId} onOpen={model.onToggleVizPicker} />
+              <FilterInput
+                className={styles.searchOptions}
+                value={searchQuery}
+                placeholder="Search options"
+                onChange={model.onSetSearchQuery}
+              />
+            </div>
+            <div className={styles.listOfOptions}>
+              <PanelOptions vizManager={vizManager} searchQuery={searchQuery} listMode={listMode} data={data} />
+            </div>
+          </>
+        )}
+        {isVizPickerOpen && (
+          <PanelVizTypePicker vizManager={vizManager} onChange={model.onToggleVizPicker} data={data} />
+        )}
+      </>
     );
   };
 }
 
 function getStyles(theme: GrafanaTheme2) {
   return {
-    box: css({
+    top: css({
+      display: 'flex',
+      flexDirection: 'column',
+      padding: theme.spacing(2, 1),
+      gap: theme.spacing(2),
+    }),
+    listOfOptions: css({
       display: 'flex',
       flexDirection: 'column',
-      padding: theme.spacing(2),
-      flexBasis: '100%',
-      flexGrow: 1,
-      minHeight: 0,
+      flexGrow: '1',
+      overflow: 'auto',
+    }),
+    searchOptions: css({
+      minHeight: theme.spacing(4),
+    }),
+    searchWrapper: css({
+      padding: theme.spacing(2, 2, 2, 0),
+    }),
+    vizField: css({
+      marginBottom: theme.spacing(1),
+    }),
+    rotateIcon: css({
+      rotate: '180deg',
+    }),
+  };
+}
+
+interface VisualizationButtonProps {
+  pluginId: string;
+  onOpen: () => void;
+}
+
+export function VisualizationButton({ pluginId, onOpen }: VisualizationButtonProps) {
+  const styles = useStyles2(getVizButtonStyles);
+  const pluginMeta = useMemo(() => getAllPanelPluginMeta().filter((p) => p.id === pluginId)[0], [pluginId]);
+
+  return (
+    <Stack gap={1}>
+      <ToolbarButton
+        className={styles.vizButton}
+        tooltip="Click to change visualization"
+        imgSrc={pluginMeta.info.logos.small}
+        onClick={onOpen}
+        data-testid={selectors.components.PanelEditor.toggleVizPicker}
+        aria-label="Change Visualization"
+        variant="canvas"
+        isOpen={false}
+        fullWidth
+      >
+        {pluginMeta.name}
+      </ToolbarButton>
+    </Stack>
+  );
+}
+
+function getVizButtonStyles(theme: GrafanaTheme2) {
+  return {
+    vizButton: css({
+      textAlign: 'left',
     }),
   };
 }
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelVizTypePicker.tsx b/public/app/features/dashboard-scene/panel-edit/PanelVizTypePicker.tsx
new file mode 100644
index 0000000000000..eb376b7483a0c
--- /dev/null
+++ b/public/app/features/dashboard-scene/panel-edit/PanelVizTypePicker.tsx
@@ -0,0 +1,115 @@
+import { css } from '@emotion/css';
+import React, { useEffect, useMemo, useState } from 'react';
+import { useLocalStorage } from 'react-use';
+
+import { GrafanaTheme2, PanelData, SelectableValue } from '@grafana/data';
+import { CustomScrollbar, Field, FilterInput, RadioButtonGroup, useStyles2 } from '@grafana/ui';
+import { LS_VISUALIZATION_SELECT_TAB_KEY, LS_WIDGET_SELECT_TAB_KEY } from 'app/core/constants';
+import { VisualizationSelectPaneTab } from 'app/features/dashboard/components/PanelEditor/types';
+import { VisualizationSuggestions } from 'app/features/panel/components/VizTypePicker/VisualizationSuggestions';
+import { VizTypePicker } from 'app/features/panel/components/VizTypePicker/VizTypePicker';
+import { VizTypeChangeDetails } from 'app/features/panel/components/VizTypePicker/types';
+
+import { PanelModelCompatibilityWrapper } from '../utils/PanelModelCompatibilityWrapper';
+
+import { VizPanelManager } from './VizPanelManager';
+
+export interface Props {
+  data?: PanelData;
+  vizManager: VizPanelManager;
+  onChange: () => void;
+}
+
+export function PanelVizTypePicker({ vizManager, data, onChange }: Props) {
+  const { panel } = vizManager.useState();
+  const styles = useStyles2(getStyles);
+  const [searchQuery, setSearchQuery] = useState('');
+
+  const isWidgetEnabled = false;
+  const tabKey = isWidgetEnabled ? LS_WIDGET_SELECT_TAB_KEY : LS_VISUALIZATION_SELECT_TAB_KEY;
+  const defaultTab = isWidgetEnabled ? VisualizationSelectPaneTab.Widgets : VisualizationSelectPaneTab.Visualizations;
+  const panelModel = useMemo(() => new PanelModelCompatibilityWrapper(panel), [panel]);
+
+  const supportedListModes = useMemo(
+    () =>
+      new Set([
+        VisualizationSelectPaneTab.Widgets,
+        VisualizationSelectPaneTab.Visualizations,
+        VisualizationSelectPaneTab.Suggestions,
+      ]),
+    []
+  );
+  const [listMode, setListMode] = useLocalStorage(tabKey, defaultTab);
+  useEffect(() => {
+    if (listMode && !supportedListModes.has(listMode)) {
+      setListMode(defaultTab);
+    }
+  }, [defaultTab, listMode, setListMode, supportedListModes]);
+
+  const radioOptions: Array<SelectableValue<VisualizationSelectPaneTab>> = [
+    { label: 'Visualizations', value: VisualizationSelectPaneTab.Visualizations },
+    { label: 'Suggestions', value: VisualizationSelectPaneTab.Suggestions },
+    // {
+    //   label: 'Library panels',
+    //   value: VisualizationSelectPaneTab.LibraryPanels,
+    //   description: 'Reusable panels you can share between multiple dashboards.',
+    // },
+  ];
+
+  const onVizTypeChange = (options: VizTypeChangeDetails) => {
+    vizManager.changePluginType(options.pluginId);
+    onChange();
+  };
+
+  return (
+    <div className={styles.wrapper}>
+      <FilterInput
+        className={styles.filter}
+        value={searchQuery}
+        onChange={setSearchQuery}
+        autoFocus={true}
+        placeholder="Search for..."
+      />
+      <Field className={styles.customFieldMargin}>
+        <RadioButtonGroup options={radioOptions} value={listMode} onChange={setListMode} fullWidth />
+      </Field>
+      <CustomScrollbar>
+        {listMode === VisualizationSelectPaneTab.Visualizations && (
+          <VizTypePicker pluginId={panel.state.pluginId} searchQuery={searchQuery} onChange={onVizTypeChange} />
+        )}
+        {/* {listMode === VisualizationSelectPaneTab.Widgets && (
+                <VizTypePicker pluginId={plugin.meta.id} onChange={onVizChange} searchQuery={searchQuery} isWidget />
+              )} */}
+        {listMode === VisualizationSelectPaneTab.Suggestions && (
+          <VisualizationSuggestions
+            onChange={onVizTypeChange}
+            searchQuery={searchQuery}
+            panel={panelModel}
+            data={data}
+          />
+        )}
+      </CustomScrollbar>
+    </div>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  wrapper: css({
+    display: 'flex',
+    flexDirection: 'column',
+    flexGrow: 1,
+    padding: theme.spacing(2, 1),
+    height: '100%',
+    gap: theme.spacing(2),
+    border: `1px solid ${theme.colors.border.weak}`,
+    borderRight: 'none',
+    borderBottom: 'none',
+    borderTopLeftRadius: theme.shape.radius.default,
+  }),
+  customFieldMargin: css({
+    marginBottom: theme.spacing(1),
+  }),
+  filter: css({
+    minHeight: theme.spacing(4),
+  }),
+});
diff --git a/public/app/features/dashboard-scene/panel-edit/SaveLibraryVizPanelModal.tsx b/public/app/features/dashboard-scene/panel-edit/SaveLibraryVizPanelModal.tsx
new file mode 100644
index 0000000000000..d1178a76aa5e0
--- /dev/null
+++ b/public/app/features/dashboard-scene/panel-edit/SaveLibraryVizPanelModal.tsx
@@ -0,0 +1,107 @@
+import React, { useCallback, useState } from 'react';
+import { useAsync, useDebounce } from 'react-use';
+
+import { Button, Icon, Input, Modal, useStyles2 } from '@grafana/ui';
+import { getConnectedDashboards } from 'app/features/library-panels/state/api';
+import { getModalStyles } from 'app/features/library-panels/styles';
+
+import { LibraryVizPanel } from '../scene/LibraryVizPanel';
+
+interface Props {
+  libraryPanel: LibraryVizPanel;
+  isUnsavedPrompt?: boolean;
+  onConfirm: () => void;
+  onDismiss: () => void;
+  onDiscard: () => void;
+}
+
+export const SaveLibraryVizPanelModal = ({ libraryPanel, isUnsavedPrompt, onDismiss, onConfirm, onDiscard }: Props) => {
+  const [searchString, setSearchString] = useState('');
+  const dashState = useAsync(async () => {
+    const searchHits = await getConnectedDashboards(libraryPanel.state.uid);
+    if (searchHits.length > 0) {
+      return searchHits.map((dash) => dash.title);
+    }
+
+    return [];
+  }, [libraryPanel.state.uid]);
+
+  const [filteredDashboards, setFilteredDashboards] = useState<string[]>([]);
+  useDebounce(
+    () => {
+      if (!dashState.value) {
+        return setFilteredDashboards([]);
+      }
+
+      return setFilteredDashboards(
+        dashState.value.filter((dashName) => dashName.toLowerCase().includes(searchString.toLowerCase()))
+      );
+    },
+    300,
+    [dashState.value, searchString]
+  );
+
+  const styles = useStyles2(getModalStyles);
+  const discardAndClose = useCallback(() => {
+    onDiscard();
+  }, [onDiscard]);
+
+  const title = isUnsavedPrompt ? 'Unsaved library panel changes' : 'Save library panel';
+
+  return (
+    <Modal title={title} icon="save" onDismiss={onDismiss} isOpen={true}>
+      <div>
+        <p className={styles.textInfo}>
+          {'This update will affect '}
+          <strong>
+            {libraryPanel.state._loadedPanel?.meta?.connectedDashboards}{' '}
+            {libraryPanel.state._loadedPanel?.meta?.connectedDashboards === 1 ? 'dashboard' : 'dashboards'}.
+          </strong>
+          The following dashboards using the panel will be affected:
+        </p>
+        <Input
+          className={styles.dashboardSearch}
+          prefix={<Icon name="search" />}
+          placeholder="Search affected dashboards"
+          value={searchString}
+          onChange={(e) => setSearchString(e.currentTarget.value)}
+        />
+        {dashState.loading ? (
+          <p>Loading connected dashboards...</p>
+        ) : (
+          <table className={styles.myTable}>
+            <thead>
+              <tr>
+                <th>Dashboard name</th>
+              </tr>
+            </thead>
+            <tbody>
+              {filteredDashboards.map((dashName, i) => (
+                <tr key={`dashrow-${i}`}>
+                  <td>{dashName}</td>
+                </tr>
+              ))}
+            </tbody>
+          </table>
+        )}
+        <Modal.ButtonRow>
+          <Button variant="secondary" onClick={onDismiss} fill="outline">
+            Cancel
+          </Button>
+          {isUnsavedPrompt && (
+            <Button variant="destructive" onClick={discardAndClose}>
+              Discard
+            </Button>
+          )}
+          <Button
+            onClick={() => {
+              onConfirm();
+            }}
+          >
+            Update all
+          </Button>
+        </Modal.ButtonRow>
+      </div>
+    </Modal>
+  );
+};
diff --git a/public/app/features/dashboard-scene/panel-edit/ShareDataProvider.tsx b/public/app/features/dashboard-scene/panel-edit/ShareDataProvider.tsx
new file mode 100644
index 0000000000000..dcf9ca08a9dae
--- /dev/null
+++ b/public/app/features/dashboard-scene/panel-edit/ShareDataProvider.tsx
@@ -0,0 +1,35 @@
+import { SceneDataProvider, SceneDataState, SceneObjectBase } from '@grafana/scenes';
+
+export class ShareDataProvider extends SceneObjectBase<SceneDataState> implements SceneDataProvider {
+  public constructor(private _source: SceneDataProvider) {
+    super(_source.state);
+    this.addActivationHandler(() => this.activationHandler());
+  }
+
+  private activationHandler() {
+    this._subs.add(this._source.subscribeToState((state) => this.setState({ data: state.data })));
+    this.setState(this._source.state);
+  }
+
+  public setContainerWidth(width: number) {
+    if (this.state.$data && this.state.$data.setContainerWidth) {
+      this.state.$data.setContainerWidth(width);
+    }
+  }
+
+  public isDataReadyToDisplay() {
+    if (!this._source.isDataReadyToDisplay) {
+      return true;
+    }
+
+    return this._source.isDataReadyToDisplay?.();
+  }
+
+  public cancelQuery() {
+    this._source.cancelQuery?.();
+  }
+
+  public getResultsStream() {
+    return this._source.getResultsStream!();
+  }
+}
diff --git a/public/app/features/dashboard-scene/panel-edit/VizPanelManager.test.tsx b/public/app/features/dashboard-scene/panel-edit/VizPanelManager.test.tsx
new file mode 100644
index 0000000000000..590c519956aeb
--- /dev/null
+++ b/public/app/features/dashboard-scene/panel-edit/VizPanelManager.test.tsx
@@ -0,0 +1,829 @@
+import { map, of } from 'rxjs';
+
+import { DataQueryRequest, DataSourceApi, DataSourceInstanceSettings, LoadingState, PanelData } from '@grafana/data';
+import { calculateFieldTransformer } from '@grafana/data/src/transformations/transformers/calculateField';
+import { mockTransformationsRegistry } from '@grafana/data/src/utils/tests/mockTransformationsRegistry';
+import { config, locationService } from '@grafana/runtime';
+import { SceneQueryRunner, VizPanel } from '@grafana/scenes';
+import { DataQuery, DataSourceJsonData, DataSourceRef } from '@grafana/schema';
+import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
+import { InspectTab } from 'app/features/inspector/types';
+import * as libAPI from 'app/features/library-panels/state/api';
+import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard';
+import { DASHBOARD_DATASOURCE_PLUGIN_ID } from 'app/plugins/datasource/dashboard/types';
+
+import { DashboardGridItem } from '../scene/DashboardGridItem';
+import { LibraryVizPanel } from '../scene/LibraryVizPanel';
+import { PanelTimeRange, PanelTimeRangeState } from '../scene/PanelTimeRange';
+import { transformSaveModelToScene } from '../serialization/transformSaveModelToScene';
+import { vizPanelToPanel } from '../serialization/transformSceneToSaveModel';
+import { DashboardModelCompatibilityWrapper } from '../utils/DashboardModelCompatibilityWrapper';
+import { findVizPanelByKey } from '../utils/utils';
+
+import { buildPanelEditScene } from './PanelEditor';
+import { VizPanelManager } from './VizPanelManager';
+import { panelWithQueriesOnly, panelWithTransformations, testDashboard } from './testfiles/testDashboard';
+
+const runRequestMock = jest.fn().mockImplementation((ds: DataSourceApi, request: DataQueryRequest) => {
+  const result: PanelData = {
+    state: LoadingState.Loading,
+    series: [],
+    timeRange: request.range,
+  };
+
+  return of([]).pipe(
+    map(() => {
+      result.state = LoadingState.Done;
+      result.series = [];
+
+      return result;
+    })
+  );
+});
+
+const ds1Mock: DataSourceApi = {
+  meta: {
+    id: 'grafana-testdata-datasource',
+  },
+  name: 'grafana-testdata-datasource',
+  type: 'grafana-testdata-datasource',
+  uid: 'gdev-testdata',
+  getRef: () => {
+    return { type: 'grafana-testdata-datasource', uid: 'gdev-testdata' };
+  },
+} as DataSourceApi<DataQuery, DataSourceJsonData, {}>;
+
+const ds2Mock: DataSourceApi = {
+  meta: {
+    id: 'grafana-prometheus-datasource',
+  },
+  name: 'grafana-prometheus-datasource',
+  type: 'grafana-prometheus-datasource',
+  uid: 'gdev-prometheus',
+  getRef: () => {
+    return { type: 'grafana-prometheus-datasource', uid: 'gdev-prometheus' };
+  },
+} as DataSourceApi<DataQuery, DataSourceJsonData, {}>;
+
+const ds3Mock: DataSourceApi = {
+  meta: {
+    id: DASHBOARD_DATASOURCE_PLUGIN_ID,
+  },
+  name: SHARED_DASHBOARD_QUERY,
+  type: SHARED_DASHBOARD_QUERY,
+  uid: SHARED_DASHBOARD_QUERY,
+  getRef: () => {
+    return { type: SHARED_DASHBOARD_QUERY, uid: SHARED_DASHBOARD_QUERY };
+  },
+} as DataSourceApi<DataQuery, DataSourceJsonData, {}>;
+
+const defaultDsMock: DataSourceApi = {
+  meta: {
+    id: 'grafana-testdata-datasource',
+  },
+  name: 'grafana-testdata-datasource',
+  type: 'grafana-testdata-datasource',
+  uid: 'gdev-testdata',
+  getRef: () => {
+    return { type: 'grafana-testdata-datasource', uid: 'gdev-testdata' };
+  },
+} as DataSourceApi<DataQuery, DataSourceJsonData, {}>;
+
+const instance1SettingsMock = {
+  id: 1,
+  uid: 'gdev-testdata',
+  name: 'testDs1',
+  type: 'grafana-testdata-datasource',
+  meta: {
+    id: 'grafana-testdata-datasource',
+  },
+};
+
+const instance2SettingsMock = {
+  id: 1,
+  uid: 'gdev-prometheus',
+  name: 'testDs2',
+  type: 'grafana-prometheus-datasource',
+  meta: {
+    id: 'grafana-prometheus-datasource',
+  },
+};
+
+// Mocking the build in Grafana data source to avoid annotations data layer errors.
+const grafanaDs = {
+  id: 1,
+  uid: '-- Grafana --',
+  name: 'grafana',
+  type: 'grafana',
+  meta: {
+    id: 'grafana',
+  },
+};
+
+// Mock the store module
+jest.mock('app/core/store', () => ({
+  exists: jest.fn(),
+  get: jest.fn(),
+  getObject: jest.fn((_a, b) => b),
+  setObject: jest.fn(),
+}));
+
+const store = jest.requireMock('app/core/store');
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getRunRequest: () => (ds: DataSourceApi, request: DataQueryRequest) => {
+    return runRequestMock(ds, request);
+  },
+  getDataSourceSrv: () => ({
+    get: async (ref: DataSourceRef) => {
+      // Mocking the build in Grafana data source to avoid annotations data layer errors.
+
+      if (ref.uid === '-- Grafana --') {
+        return grafanaDs;
+      }
+
+      if (ref.uid === 'gdev-testdata') {
+        return ds1Mock;
+      }
+
+      if (ref.uid === 'gdev-prometheus') {
+        return ds2Mock;
+      }
+
+      if (ref.uid === SHARED_DASHBOARD_QUERY) {
+        return ds3Mock;
+      }
+
+      // if datasource is not found, return default datasource
+      return defaultDsMock;
+    },
+    getInstanceSettings: (ref: DataSourceRef) => {
+      if (ref.uid === 'gdev-testdata') {
+        return instance1SettingsMock;
+      }
+
+      if (ref.uid === 'gdev-prometheus') {
+        return instance2SettingsMock;
+      }
+
+      // if datasource is not found, return default instance settings
+      return instance1SettingsMock;
+    },
+  }),
+  locationService: {
+    partial: jest.fn(),
+  },
+  config: {
+    ...jest.requireActual('@grafana/runtime').config,
+    defaultDatasource: 'gdev-testdata',
+  },
+}));
+
+mockTransformationsRegistry([calculateFieldTransformer]);
+
+jest.useFakeTimers();
+
+describe('VizPanelManager', () => {
+  describe('When changing plugin', () => {
+    it('Should successfully change from one viz type to another', () => {
+      const { vizPanelManager } = setupTest('panel-1');
+      expect(vizPanelManager.state.panel.state.pluginId).toBe('timeseries');
+      vizPanelManager.changePluginType('table');
+
+      expect(vizPanelManager.state.panel.state.pluginId).toBe('table');
+    });
+
+    it('Should clear custom options', () => {
+      const overrides = [
+        {
+          matcher: { id: 'matcherOne' },
+          properties: [{ id: 'custom.propertyOne' }, { id: 'custom.propertyTwo' }, { id: 'standardProperty' }],
+        },
+      ];
+      const vizPanel = new VizPanel({
+        title: 'Panel A',
+        key: 'panel-1',
+        pluginId: 'table',
+        $data: new SceneQueryRunner({
+          key: 'data-query-runner',
+          datasource: {
+            type: 'grafana-testdata-datasource',
+            uid: 'gdev-testdata',
+          },
+          queries: [{ refId: 'A' }],
+        }),
+        options: undefined,
+        fieldConfig: {
+          defaults: {
+            custom: 'Custom',
+          },
+          overrides,
+        },
+      });
+
+      new DashboardGridItem({
+        body: vizPanel,
+      });
+
+      const vizPanelManager = VizPanelManager.createFor(vizPanel);
+
+      expect(vizPanelManager.state.panel.state.fieldConfig.defaults.custom).toBe('Custom');
+      expect(vizPanelManager.state.panel.state.fieldConfig.overrides).toBe(overrides);
+
+      vizPanelManager.changePluginType('timeseries');
+
+      expect(vizPanelManager.state.panel.state.fieldConfig.defaults.custom).toStrictEqual({});
+      expect(vizPanelManager.state.panel.state.fieldConfig.overrides[0].properties).toHaveLength(1);
+      expect(vizPanelManager.state.panel.state.fieldConfig.overrides[0].properties[0].id).toBe('standardProperty');
+    });
+
+    it('Should restore cached options/fieldConfig if they exist', () => {
+      const vizPanel = new VizPanel({
+        title: 'Panel A',
+        key: 'panel-1',
+        pluginId: 'table',
+        $data: new SceneQueryRunner({
+          key: 'data-query-runner',
+          datasource: {
+            type: 'grafana-testdata-datasource',
+            uid: 'gdev-testdata',
+          },
+          queries: [{ refId: 'A' }],
+        }),
+        options: {
+          customOption: 'A',
+        },
+        fieldConfig: { defaults: { custom: 'Custom' }, overrides: [] },
+      });
+
+      new DashboardGridItem({
+        body: vizPanel,
+      });
+
+      const vizPanelManager = VizPanelManager.createFor(vizPanel);
+
+      vizPanelManager.changePluginType('timeseries');
+      //@ts-ignore
+      expect(vizPanelManager.state.panel.state.options['customOption']).toBeUndefined();
+      expect(vizPanelManager.state.panel.state.fieldConfig.defaults.custom).toStrictEqual({});
+
+      vizPanelManager.changePluginType('table');
+
+      //@ts-ignore
+      expect(vizPanelManager.state.panel.state.options['customOption']).toBe('A');
+      expect(vizPanelManager.state.panel.state.fieldConfig.defaults.custom).toBe('Custom');
+    });
+  });
+
+  describe('library panels', () => {
+    it('saves library panels on commit', () => {
+      const panel = new VizPanel({
+        key: 'panel-1',
+        pluginId: 'text',
+      });
+
+      const libraryPanelModel = {
+        title: 'title',
+        uid: 'uid',
+        name: 'libraryPanelName',
+        model: vizPanelToPanel(panel),
+        type: 'panel',
+        version: 1,
+      };
+
+      const libraryPanel = new LibraryVizPanel({
+        isLoaded: true,
+        title: libraryPanelModel.title,
+        uid: libraryPanelModel.uid,
+        name: libraryPanelModel.name,
+        panelKey: panel.state.key!,
+        panel: panel,
+        _loadedPanel: libraryPanelModel,
+      });
+
+      new DashboardGridItem({ body: libraryPanel });
+
+      const panelManager = VizPanelManager.createFor(panel);
+
+      const apiCall = jest
+        .spyOn(libAPI, 'updateLibraryVizPanel')
+        .mockResolvedValue({ type: 'panel', ...libAPI.libraryVizPanelToSaveModel(libraryPanel) });
+
+      panelManager.state.panel.setState({ title: 'new title' });
+      panelManager.commitChanges();
+
+      expect(apiCall.mock.calls[0][0].state.panel?.state.title).toBe('new title');
+    });
+
+    it('unlinks library panel', () => {
+      const panel = new VizPanel({
+        key: 'panel-1',
+        pluginId: 'text',
+      });
+
+      const libraryPanelModel = {
+        title: 'title',
+        uid: 'uid',
+        name: 'libraryPanelName',
+        model: vizPanelToPanel(panel),
+        type: 'panel',
+        version: 1,
+      };
+
+      const libraryPanel = new LibraryVizPanel({
+        isLoaded: true,
+        title: libraryPanelModel.title,
+        uid: libraryPanelModel.uid,
+        name: libraryPanelModel.name,
+        panelKey: panel.state.key!,
+        panel: panel,
+        _loadedPanel: libraryPanelModel,
+      });
+
+      const gridItem = new DashboardGridItem({ body: libraryPanel });
+
+      const panelManager = VizPanelManager.createFor(panel);
+      panelManager.unlinkLibraryPanel();
+
+      const sourcePanel = panelManager.state.sourcePanel.resolve();
+      expect(sourcePanel.parent?.state.key).toBe(gridItem.state.key);
+    });
+  });
+
+  describe('query options', () => {
+    beforeEach(() => {
+      store.setObject.mockClear();
+    });
+
+    describe('activation', () => {
+      it('should load data source', async () => {
+        const { vizPanelManager } = setupTest('panel-1');
+        vizPanelManager.activate();
+        await Promise.resolve();
+
+        expect(vizPanelManager.state.datasource).toEqual(ds1Mock);
+        expect(vizPanelManager.state.dsSettings).toEqual(instance1SettingsMock);
+      });
+
+      it('should store loaded data source in local storage', async () => {
+        const { vizPanelManager } = setupTest('panel-1');
+        vizPanelManager.activate();
+        await Promise.resolve();
+
+        expect(store.setObject).toHaveBeenCalledWith('grafana.dashboards.panelEdit.lastUsedDatasource', {
+          dashboardUid: 'ffbe00e2-803c-4d49-adb7-41aad336234f',
+          datasourceUid: 'gdev-testdata',
+        });
+      });
+
+      it('should load default datasource if the datasource passed is not found', async () => {
+        const { vizPanelManager } = setupTest('panel-6');
+        vizPanelManager.activate();
+        await Promise.resolve();
+
+        expect(vizPanelManager.queryRunner.state.datasource).toEqual({
+          uid: 'abc',
+          type: 'datasource',
+        });
+
+        expect(config.defaultDatasource).toBe('gdev-testdata');
+        expect(vizPanelManager.state.datasource).toEqual(defaultDsMock);
+        expect(vizPanelManager.state.dsSettings).toEqual(instance1SettingsMock);
+      });
+    });
+
+    describe('data source change', () => {
+      it('should load new data source', async () => {
+        const { vizPanelManager } = setupTest('panel-1');
+        vizPanelManager.activate();
+        vizPanelManager.state.panel.state.$data?.activate();
+
+        await Promise.resolve();
+
+        await vizPanelManager.changePanelDataSource(
+          { type: 'grafana-prometheus-datasource', uid: 'gdev-prometheus' } as DataSourceInstanceSettings,
+          []
+        );
+
+        expect(store.setObject).toHaveBeenCalledTimes(2);
+        expect(store.setObject).toHaveBeenLastCalledWith('grafana.dashboards.panelEdit.lastUsedDatasource', {
+          dashboardUid: 'ffbe00e2-803c-4d49-adb7-41aad336234f',
+          datasourceUid: 'gdev-prometheus',
+        });
+
+        jest.runAllTimers(); // The detect panel changes is debounced
+        expect(vizPanelManager.state.isDirty).toBe(true);
+        expect(vizPanelManager.state.datasource).toEqual(ds2Mock);
+        expect(vizPanelManager.state.dsSettings).toEqual(instance2SettingsMock);
+      });
+    });
+
+    describe('query options change', () => {
+      describe('time overrides', () => {
+        it('should create PanelTimeRange object', async () => {
+          const { vizPanelManager } = setupTest('panel-1');
+          vizPanelManager.activate();
+          vizPanelManager.state.panel.state.$data?.activate();
+          await Promise.resolve();
+
+          const panel = vizPanelManager.state.panel;
+
+          expect(panel.state.$timeRange).toBeUndefined();
+
+          vizPanelManager.changeQueryOptions({
+            dataSource: {
+              name: 'grafana-testdata',
+              type: 'grafana-testdata-datasource',
+              default: true,
+            },
+            queries: [],
+            timeRange: {
+              from: '1h',
+            },
+          });
+
+          expect(panel.state.$timeRange).toBeInstanceOf(PanelTimeRange);
+        });
+        it('should update PanelTimeRange object on time options update', async () => {
+          const { vizPanelManager } = setupTest('panel-1');
+          vizPanelManager.activate();
+          await Promise.resolve();
+
+          const panel = vizPanelManager.state.panel;
+
+          expect(panel.state.$timeRange).toBeUndefined();
+
+          vizPanelManager.changeQueryOptions({
+            dataSource: {
+              name: 'grafana-testdata',
+              type: 'grafana-testdata-datasource',
+              default: true,
+            },
+            queries: [],
+            timeRange: {
+              from: '1h',
+            },
+          });
+
+          expect(panel.state.$timeRange).toBeInstanceOf(PanelTimeRange);
+          expect((panel.state.$timeRange?.state as PanelTimeRangeState).timeFrom).toBe('1h');
+
+          vizPanelManager.changeQueryOptions({
+            dataSource: {
+              name: 'grafana-testdata',
+              type: 'grafana-testdata-datasource',
+              default: true,
+            },
+            queries: [],
+            timeRange: {
+              from: '2h',
+            },
+          });
+
+          jest.runAllTimers(); // The detect panel changes is debounced
+          expect(vizPanelManager.state.isDirty).toBe(true);
+          expect((panel.state.$timeRange?.state as PanelTimeRangeState).timeFrom).toBe('2h');
+        });
+
+        it('should remove PanelTimeRange object on time options cleared', async () => {
+          const { vizPanelManager } = setupTest('panel-1');
+          vizPanelManager.activate();
+          await Promise.resolve();
+
+          const panel = vizPanelManager.state.panel;
+
+          expect(panel.state.$timeRange).toBeUndefined();
+
+          vizPanelManager.changeQueryOptions({
+            dataSource: {
+              name: 'grafana-testdata',
+              type: 'grafana-testdata-datasource',
+              default: true,
+            },
+            queries: [],
+            timeRange: {
+              from: '1h',
+            },
+          });
+
+          expect(panel.state.$timeRange).toBeInstanceOf(PanelTimeRange);
+
+          vizPanelManager.changeQueryOptions({
+            dataSource: {
+              name: 'grafana-testdata',
+              type: 'grafana-testdata-datasource',
+              default: true,
+            },
+            queries: [],
+            timeRange: {
+              from: null,
+            },
+          });
+
+          expect(panel.state.$timeRange).toBeUndefined();
+        });
+      });
+
+      describe('max data points and interval', () => {
+        it('should update max data points', async () => {
+          const { vizPanelManager } = setupTest('panel-1');
+          vizPanelManager.activate();
+          await Promise.resolve();
+
+          const dataObj = vizPanelManager.queryRunner;
+
+          expect(dataObj.state.maxDataPoints).toBeUndefined();
+
+          vizPanelManager.changeQueryOptions({
+            dataSource: {
+              name: 'grafana-testdata',
+              type: 'grafana-testdata-datasource',
+              default: true,
+            },
+            queries: [],
+            maxDataPoints: 100,
+          });
+
+          jest.runAllTimers(); // The detect panel changes is debounced
+          expect(vizPanelManager.state.isDirty).toBe(true);
+          expect(dataObj.state.maxDataPoints).toBe(100);
+        });
+
+        it('should update min interval', async () => {
+          const { vizPanelManager } = setupTest('panel-1');
+          vizPanelManager.activate();
+          await Promise.resolve();
+
+          const dataObj = vizPanelManager.queryRunner;
+
+          expect(dataObj.state.maxDataPoints).toBeUndefined();
+
+          vizPanelManager.changeQueryOptions({
+            dataSource: {
+              name: 'grafana-testdata',
+              type: 'grafana-testdata-datasource',
+              default: true,
+            },
+            queries: [],
+            minInterval: '1s',
+          });
+
+          jest.runAllTimers(); // The detect panel changes is debounced
+          expect(vizPanelManager.state.isDirty).toBe(true);
+          expect(dataObj.state.minInterval).toBe('1s');
+        });
+      });
+
+      describe('query caching', () => {
+        it('updates cacheTimeout and queryCachingTTL', async () => {
+          const { vizPanelManager } = setupTest('panel-1');
+          vizPanelManager.activate();
+          await Promise.resolve();
+
+          const dataObj = vizPanelManager.queryRunner;
+
+          vizPanelManager.changeQueryOptions({
+            cacheTimeout: '60',
+            queryCachingTTL: 200000,
+            dataSource: {
+              name: 'grafana-testdata',
+              type: 'grafana-testdata-datasource',
+              default: true,
+            },
+            queries: [],
+          });
+
+          jest.runAllTimers(); // The detect panel changes is debounced
+          expect(vizPanelManager.state.isDirty).toBe(true);
+          expect(dataObj.state.cacheTimeout).toBe('60');
+          expect(dataObj.state.queryCachingTTL).toBe(200000);
+        });
+      });
+    });
+
+    describe('query inspection', () => {
+      it('allows query inspection from the tab', async () => {
+        const { vizPanelManager } = setupTest('panel-1');
+        vizPanelManager.inspectPanel();
+
+        expect(locationService.partial).toHaveBeenCalledWith({ inspect: 1, inspectTab: InspectTab.Query });
+      });
+    });
+
+    describe('data source change', () => {
+      it('changing from one plugin to another', async () => {
+        const { vizPanelManager } = setupTest('panel-1');
+        vizPanelManager.activate();
+        await Promise.resolve();
+
+        expect(vizPanelManager.queryRunner.state.datasource).toEqual({
+          uid: 'gdev-testdata',
+          type: 'grafana-testdata-datasource',
+        });
+
+        await vizPanelManager.changePanelDataSource({
+          name: 'grafana-prometheus',
+          type: 'grafana-prometheus-datasource',
+          uid: 'gdev-prometheus',
+          meta: {
+            name: 'Prometheus',
+            module: 'prometheus',
+            id: 'grafana-prometheus-datasource',
+          },
+        } as DataSourceInstanceSettings);
+
+        jest.runAllTimers(); // The detect panel changes is debounced
+        expect(vizPanelManager.state.isDirty).toBe(true);
+        expect(vizPanelManager.queryRunner.state.datasource).toEqual({
+          uid: 'gdev-prometheus',
+          type: 'grafana-prometheus-datasource',
+        });
+      });
+
+      it('changing from a plugin to a dashboard data source', async () => {
+        const { vizPanelManager } = setupTest('panel-1');
+        vizPanelManager.activate();
+        await Promise.resolve();
+
+        expect(vizPanelManager.queryRunner.state.datasource).toEqual({
+          uid: 'gdev-testdata',
+          type: 'grafana-testdata-datasource',
+        });
+
+        await vizPanelManager.changePanelDataSource({
+          name: SHARED_DASHBOARD_QUERY,
+          type: 'datasource',
+          uid: SHARED_DASHBOARD_QUERY,
+          meta: {
+            name: 'Prometheus',
+            module: 'prometheus',
+            id: DASHBOARD_DATASOURCE_PLUGIN_ID,
+          },
+        } as DataSourceInstanceSettings);
+
+        jest.runAllTimers(); // The detect panel changes is debounced
+        expect(vizPanelManager.state.isDirty).toBe(true);
+        expect(vizPanelManager.queryRunner.state.datasource).toEqual({
+          uid: SHARED_DASHBOARD_QUERY,
+          type: 'datasource',
+        });
+      });
+
+      it('changing from dashboard data source to a plugin', async () => {
+        const { vizPanelManager } = setupTest('panel-3');
+        vizPanelManager.activate();
+        await Promise.resolve();
+
+        expect(vizPanelManager.queryRunner.state.datasource).toEqual({
+          uid: SHARED_DASHBOARD_QUERY,
+          type: 'datasource',
+        });
+
+        await vizPanelManager.changePanelDataSource({
+          name: 'grafana-prometheus',
+          type: 'grafana-prometheus-datasource',
+          uid: 'gdev-prometheus',
+          meta: {
+            name: 'Prometheus',
+            module: 'prometheus',
+            id: 'grafana-prometheus-datasource',
+          },
+        } as DataSourceInstanceSettings);
+
+        jest.runAllTimers(); // The detect panel changes is debounced
+        expect(vizPanelManager.state.isDirty).toBe(true);
+        expect(vizPanelManager.queryRunner.state.datasource).toEqual({
+          uid: 'gdev-prometheus',
+          type: 'grafana-prometheus-datasource',
+        });
+      });
+    });
+  });
+
+  describe('change transformations', () => {
+    it('should update and reprocess transformations', () => {
+      const { scene, panel } = setupTest('panel-3');
+      scene.setState({ editPanel: buildPanelEditScene(panel) });
+
+      const vizPanelManager = scene.state.editPanel!.state.vizManager;
+      vizPanelManager.activate();
+      vizPanelManager.state.panel.state.$data?.activate();
+
+      const reprocessMock = jest.fn();
+      vizPanelManager.dataTransformer.reprocessTransformations = reprocessMock;
+      vizPanelManager.changeTransformations([{ id: 'calculateField', options: {} }]);
+
+      jest.runAllTimers(); // The detect panel changes is debounced
+      expect(vizPanelManager.state.isDirty).toBe(true);
+      expect(reprocessMock).toHaveBeenCalledTimes(1);
+      expect(vizPanelManager.dataTransformer.state.transformations).toEqual([{ id: 'calculateField', options: {} }]);
+    });
+  });
+
+  describe('change queries', () => {
+    describe('plugin queries', () => {
+      it('should update queries', () => {
+        const { vizPanelManager } = setupTest('panel-1');
+
+        vizPanelManager.activate();
+        vizPanelManager.state.panel.state.$data?.activate();
+
+        vizPanelManager.changeQueries([
+          {
+            datasource: {
+              type: 'grafana-testdata-datasource',
+              uid: 'gdev-testdata',
+            },
+            refId: 'A',
+            scenarioId: 'random_walk',
+            seriesCount: 5,
+          },
+        ]);
+
+        jest.runAllTimers(); // The detect panel changes is debounced
+        expect(vizPanelManager.state.isDirty).toBe(true);
+        expect(vizPanelManager.queryRunner.state.queries).toEqual([
+          {
+            datasource: {
+              type: 'grafana-testdata-datasource',
+              uid: 'gdev-testdata',
+            },
+            refId: 'A',
+            scenarioId: 'random_walk',
+            seriesCount: 5,
+          },
+        ]);
+      });
+    });
+
+    describe('dashboard queries', () => {
+      it('should update queries', () => {
+        const { scene, panel } = setupTest('panel-3');
+        scene.setState({ editPanel: buildPanelEditScene(panel) });
+
+        const vizPanelManager = scene.state.editPanel!.state.vizManager;
+        vizPanelManager.activate();
+        vizPanelManager.state.panel.state.$data?.activate();
+
+        // Changing dashboard query to a panel with transformations
+        vizPanelManager.changeQueries([
+          {
+            refId: 'A',
+            datasource: {
+              type: DASHBOARD_DATASOURCE_PLUGIN_ID,
+            },
+            panelId: panelWithTransformations.id,
+          },
+        ]);
+
+        expect(vizPanelManager.queryRunner.state.queries[0].panelId).toEqual(panelWithTransformations.id);
+
+        // Changing dashboard query to a panel with queries only
+        vizPanelManager.changeQueries([
+          {
+            refId: 'A',
+            datasource: {
+              type: DASHBOARD_DATASOURCE_PLUGIN_ID,
+            },
+            panelId: panelWithQueriesOnly.id,
+          },
+        ]);
+
+        jest.runAllTimers(); // The detect panel changes is debounced
+        expect(vizPanelManager.state.isDirty).toBe(true);
+        expect(vizPanelManager.queryRunner.state.queries[0].panelId).toBe(panelWithQueriesOnly.id);
+      });
+    });
+  });
+
+  it('should load last used data source if no data source specified for a panel', async () => {
+    store.exists.mockReturnValue(true);
+    store.getObject.mockReturnValue({
+      dashboardUid: 'ffbe00e2-803c-4d49-adb7-41aad336234f',
+      datasourceUid: 'gdev-testdata',
+    });
+    const { scene, panel } = setupTest('panel-5');
+    scene.setState({ editPanel: buildPanelEditScene(panel) });
+
+    const vizPanelManager = scene.state.editPanel!.state.vizManager;
+    vizPanelManager.activate();
+    await Promise.resolve();
+
+    expect(vizPanelManager.state.datasource).toEqual(ds1Mock);
+    expect(vizPanelManager.state.dsSettings).toEqual(instance1SettingsMock);
+  });
+});
+
+const setupTest = (panelId: string) => {
+  const scene = transformSaveModelToScene({ dashboard: testDashboard, meta: {} });
+
+  const panel = findVizPanelByKey(scene, panelId)!;
+
+  const vizPanelManager = VizPanelManager.createFor(panel);
+  // The following happens on DahsboardScene activation. For the needs of this test this activation aint needed hence we hand-call it
+  // @ts-expect-error
+  getDashboardSrv().setCurrent(new DashboardModelCompatibilityWrapper(scene));
+
+  return { vizPanelManager, scene, panel };
+};
diff --git a/public/app/features/dashboard-scene/panel-edit/VizPanelManager.tsx b/public/app/features/dashboard-scene/panel-edit/VizPanelManager.tsx
new file mode 100644
index 0000000000000..2892dcd16631d
--- /dev/null
+++ b/public/app/features/dashboard-scene/panel-edit/VizPanelManager.tsx
@@ -0,0 +1,518 @@
+import { css } from '@emotion/css';
+import { debounce } from 'lodash';
+import React, { useEffect } from 'react';
+
+import {
+  DataSourceApi,
+  DataSourceInstanceSettings,
+  FieldConfigSource,
+  GrafanaTheme2,
+  PanelModel,
+  filterFieldConfigOverrides,
+  isStandardFieldProp,
+  restoreCustomOverrideRules,
+} from '@grafana/data';
+import { config, getDataSourceSrv, locationService } from '@grafana/runtime';
+import {
+  DeepPartial,
+  PanelBuilders,
+  SceneComponentProps,
+  SceneDataTransformer,
+  SceneObjectBase,
+  SceneObjectRef,
+  SceneObjectState,
+  SceneObjectStateChangedEvent,
+  SceneQueryRunner,
+  VizPanel,
+  sceneUtils,
+} from '@grafana/scenes';
+import { DataQuery, DataTransformerConfig, Panel } from '@grafana/schema';
+import { useStyles2 } from '@grafana/ui';
+import { getPluginVersion } from 'app/features/dashboard/state/PanelModel';
+import { getLastUsedDatasourceFromStorage } from 'app/features/dashboard/utils/dashboard';
+import { storeLastUsedDataSourceInLocalStorage } from 'app/features/datasources/components/picker/utils';
+import { updateLibraryVizPanel } from 'app/features/library-panels/state/api';
+import { updateQueries } from 'app/features/query/state/updateQueries';
+import { GrafanaQuery } from 'app/plugins/datasource/grafana/types';
+import { QueryGroupOptions } from 'app/types';
+
+import { DashboardSceneChangeTracker } from '../saving/DashboardSceneChangeTracker';
+import { getPanelChanges } from '../saving/getDashboardChanges';
+import { DashboardGridItem, RepeatDirection } from '../scene/DashboardGridItem';
+import { LibraryVizPanel } from '../scene/LibraryVizPanel';
+import { PanelTimeRange, PanelTimeRangeState } from '../scene/PanelTimeRange';
+import { gridItemToPanel, vizPanelToPanel } from '../serialization/transformSceneToSaveModel';
+import { getDashboardSceneFor, getPanelIdForVizPanel, getQueryRunnerFor } from '../utils/utils';
+
+export interface VizPanelManagerState extends SceneObjectState {
+  panel: VizPanel;
+  sourcePanel: SceneObjectRef<VizPanel>;
+  datasource?: DataSourceApi;
+  dsSettings?: DataSourceInstanceSettings;
+  tableView?: VizPanel;
+  repeat?: string;
+  repeatDirection?: RepeatDirection;
+  maxPerRow?: number;
+  isDirty?: boolean;
+}
+
+export enum DisplayMode {
+  Fill = 0,
+  Fit = 1,
+  Exact = 2,
+}
+
+// VizPanelManager serves as an API to manipulate VizPanel state from the outside. It allows panel type, options and  data manipulation.
+export class VizPanelManager extends SceneObjectBase<VizPanelManagerState> {
+  private _cachedPluginOptions: Record<
+    string,
+    { options: DeepPartial<{}>; fieldConfig: FieldConfigSource<DeepPartial<{}>> } | undefined
+  > = {};
+
+  public constructor(state: VizPanelManagerState) {
+    super(state);
+    this.addActivationHandler(() => this._onActivate());
+  }
+
+  /**
+   * Will clone the source panel and move the data provider to
+   * live on the VizPanelManager level instead of the VizPanel level
+   */
+  public static createFor(sourcePanel: VizPanel) {
+    let repeatOptions: Pick<VizPanelManagerState, 'repeat' | 'repeatDirection' | 'maxPerRow'> = {};
+
+    const gridItem = sourcePanel.parent instanceof LibraryVizPanel ? sourcePanel.parent.parent : sourcePanel.parent;
+
+    if (!(gridItem instanceof DashboardGridItem)) {
+      console.error('VizPanel is not a child of a dashboard grid item');
+      throw new Error('VizPanel is not a child of a dashboard grid item');
+    }
+
+    const { variableName: repeat, repeatDirection, maxPerRow } = gridItem.state;
+    repeatOptions = { repeat, repeatDirection, maxPerRow };
+
+    return new VizPanelManager({
+      panel: sourcePanel.clone(),
+      sourcePanel: sourcePanel.getRef(),
+      ...repeatOptions,
+    });
+  }
+
+  private _onActivate() {
+    this.loadDataSource();
+    const changesSub = this.subscribeToEvent(SceneObjectStateChangedEvent, this._handleStateChange);
+
+    return () => {
+      changesSub.unsubscribe();
+    };
+  }
+
+  private _detectPanelModelChanges = debounce(() => {
+    const { hasChanges } = getPanelChanges(
+      vizPanelToPanel(this.state.sourcePanel.resolve()),
+      vizPanelToPanel(this.state.panel)
+    );
+    this.setState({ isDirty: hasChanges });
+  }, 250);
+
+  private _handleStateChange = (event: SceneObjectStateChangedEvent) => {
+    if (DashboardSceneChangeTracker.isUpdatingPersistedState(event)) {
+      this._detectPanelModelChanges();
+    }
+  };
+
+  private async loadDataSource() {
+    const dataObj = this.state.panel.state.$data;
+
+    if (!dataObj) {
+      return;
+    }
+
+    let datasourceToLoad = this.queryRunner.state.datasource;
+
+    try {
+      let datasource: DataSourceApi | undefined;
+      let dsSettings: DataSourceInstanceSettings | undefined;
+
+      if (!datasourceToLoad) {
+        const dashboardScene = getDashboardSceneFor(this);
+        const dashboardUid = dashboardScene.state.uid ?? '';
+        const lastUsedDatasource = getLastUsedDatasourceFromStorage(dashboardUid!);
+
+        // do we have a last used datasource for this dashboard
+        if (lastUsedDatasource?.datasourceUid !== null) {
+          // get datasource from dashbopard uid
+          dsSettings = getDataSourceSrv().getInstanceSettings({ uid: lastUsedDatasource?.datasourceUid });
+          if (dsSettings) {
+            datasource = await getDataSourceSrv().get({
+              uid: lastUsedDatasource?.datasourceUid,
+              type: dsSettings.type,
+            });
+
+            this.queryRunner.setState({
+              datasource: {
+                uid: lastUsedDatasource?.datasourceUid,
+                type: dsSettings.type,
+              },
+            });
+          }
+        }
+      } else {
+        datasource = await getDataSourceSrv().get(datasourceToLoad);
+        dsSettings = getDataSourceSrv().getInstanceSettings(datasourceToLoad);
+      }
+
+      if (datasource && dsSettings) {
+        this.setState({ datasource, dsSettings });
+
+        storeLastUsedDataSourceInLocalStorage(
+          {
+            type: dsSettings.type,
+            uid: dsSettings.uid,
+          } || { default: true }
+        );
+      }
+    } catch (err) {
+      //set default datasource if we fail to load the datasource
+      const datasource = await getDataSourceSrv().get(config.defaultDatasource);
+      const dsSettings = getDataSourceSrv().getInstanceSettings(config.defaultDatasource);
+
+      if (datasource && dsSettings) {
+        this.setState({
+          datasource,
+          dsSettings,
+        });
+
+        this.queryRunner.setState({
+          datasource: {
+            uid: dsSettings.uid,
+            type: dsSettings.type,
+          },
+        });
+      }
+
+      console.error(err);
+    }
+  }
+
+  public changePluginType(pluginId: string) {
+    const {
+      options: prevOptions,
+      fieldConfig: prevFieldConfig,
+      pluginId: prevPluginId,
+      ...restOfOldState
+    } = sceneUtils.cloneSceneObjectState(this.state.panel.state);
+
+    // clear custom options
+    let newFieldConfig: FieldConfigSource = {
+      defaults: {
+        ...prevFieldConfig.defaults,
+        custom: {},
+      },
+      overrides: filterFieldConfigOverrides(prevFieldConfig.overrides, isStandardFieldProp),
+    };
+
+    this._cachedPluginOptions[prevPluginId] = { options: prevOptions, fieldConfig: prevFieldConfig };
+
+    const cachedOptions = this._cachedPluginOptions[pluginId]?.options;
+    const cachedFieldConfig = this._cachedPluginOptions[pluginId]?.fieldConfig;
+
+    if (cachedFieldConfig) {
+      newFieldConfig = restoreCustomOverrideRules(newFieldConfig, cachedFieldConfig);
+    }
+
+    const newPanel = new VizPanel({
+      options: cachedOptions ?? {},
+      fieldConfig: newFieldConfig,
+      pluginId: pluginId,
+      ...restOfOldState,
+    });
+
+    // When changing from non-data to data panel, we need to add a new data provider
+    if (!this.state.panel.state.$data && !config.panels[pluginId].skipDataQuery) {
+      let ds = getLastUsedDatasourceFromStorage(getDashboardSceneFor(this).state.uid!)?.datasourceUid;
+
+      if (!ds) {
+        ds = config.defaultDatasource;
+      }
+
+      newPanel.setState({
+        $data: new SceneDataTransformer({
+          $data: new SceneQueryRunner({
+            datasource: {
+              uid: ds,
+            },
+            queries: [{ refId: 'A' }],
+          }),
+          transformations: [],
+        }),
+      });
+    }
+
+    const newPlugin = newPanel.getPlugin();
+    const panel: PanelModel = {
+      title: newPanel.state.title,
+      options: newPanel.state.options,
+      fieldConfig: newPanel.state.fieldConfig,
+      id: 1,
+      type: pluginId,
+    };
+
+    const newOptions = newPlugin?.onPanelTypeChanged?.(panel, prevPluginId, prevOptions, prevFieldConfig);
+    if (newOptions) {
+      newPanel.onOptionsChange(newOptions, true);
+    }
+
+    if (newPlugin?.onPanelMigration) {
+      newPanel.setState({ pluginVersion: getPluginVersion(newPlugin) });
+    }
+
+    this.setState({ panel: newPanel });
+    this.loadDataSource();
+  }
+
+  public async changePanelDataSource(
+    newSettings: DataSourceInstanceSettings,
+    defaultQueries?: DataQuery[] | GrafanaQuery[]
+  ) {
+    const { dsSettings } = this.state;
+    const queryRunner = this.queryRunner;
+
+    const currentDS = dsSettings ? await getDataSourceSrv().get({ uid: dsSettings.uid }) : undefined;
+    const nextDS = await getDataSourceSrv().get({ uid: newSettings.uid });
+
+    const currentQueries = queryRunner.state.queries;
+
+    // We need to pass in newSettings.uid as well here as that can be a variable expression and we want to store that in the query model not the current ds variable value
+    const queries = defaultQueries || (await updateQueries(nextDS, newSettings.uid, currentQueries, currentDS));
+
+    queryRunner.setState({
+      datasource: {
+        type: newSettings.type,
+        uid: newSettings.uid,
+      },
+      queries,
+    });
+    if (defaultQueries) {
+      queryRunner.runQueries();
+    }
+
+    this.loadDataSource();
+  }
+
+  public changeQueryOptions(options: QueryGroupOptions) {
+    const panelObj = this.state.panel;
+    const dataObj = this.queryRunner;
+    const timeRangeObj = panelObj.state.$timeRange;
+
+    const dataObjStateUpdate: Partial<SceneQueryRunner['state']> = {};
+    const timeRangeObjStateUpdate: Partial<PanelTimeRangeState> = {};
+
+    if (options.maxDataPoints !== dataObj.state.maxDataPoints) {
+      dataObjStateUpdate.maxDataPoints = options.maxDataPoints ?? undefined;
+    }
+
+    if (options.minInterval !== dataObj.state.minInterval && options.minInterval !== null) {
+      dataObjStateUpdate.minInterval = options.minInterval;
+    }
+
+    if (options.timeRange) {
+      timeRangeObjStateUpdate.timeFrom = options.timeRange.from ?? undefined;
+      timeRangeObjStateUpdate.timeShift = options.timeRange.shift ?? undefined;
+      timeRangeObjStateUpdate.hideTimeOverride = options.timeRange.hide;
+    }
+
+    if (timeRangeObj instanceof PanelTimeRange) {
+      if (timeRangeObjStateUpdate.timeFrom !== undefined || timeRangeObjStateUpdate.timeShift !== undefined) {
+        // update time override
+        timeRangeObj.setState(timeRangeObjStateUpdate);
+      } else {
+        // remove time override
+        panelObj.setState({ $timeRange: undefined });
+      }
+    } else {
+      // no time override present on the panel, let's create one first
+      panelObj.setState({ $timeRange: new PanelTimeRange(timeRangeObjStateUpdate) });
+    }
+
+    if (options.cacheTimeout !== dataObj?.state.cacheTimeout) {
+      dataObjStateUpdate.cacheTimeout = options.cacheTimeout;
+    }
+
+    if (options.queryCachingTTL !== dataObj?.state.queryCachingTTL) {
+      dataObjStateUpdate.queryCachingTTL = options.queryCachingTTL;
+    }
+
+    dataObj.setState(dataObjStateUpdate);
+    dataObj.runQueries();
+  }
+
+  public changeQueries<T extends DataQuery>(queries: T[]) {
+    const runner = this.queryRunner;
+    runner.setState({ queries });
+  }
+
+  public changeTransformations(transformations: DataTransformerConfig[]) {
+    const dataprovider = this.dataTransformer;
+    dataprovider.setState({ transformations });
+    dataprovider.reprocessTransformations();
+  }
+
+  public inspectPanel() {
+    const panel = this.state.panel;
+    const panelId = getPanelIdForVizPanel(panel);
+
+    locationService.partial({
+      inspect: panelId,
+      inspectTab: 'query',
+    });
+  }
+
+  get queryRunner(): SceneQueryRunner {
+    // Panel data object is always SceneQueryRunner wrapped in a SceneDataTransformer
+    const runner = getQueryRunnerFor(this.state.panel);
+
+    if (!runner) {
+      throw new Error('Query runner not found');
+    }
+
+    return runner;
+  }
+
+  get dataTransformer(): SceneDataTransformer {
+    const provider = this.state.panel.state.$data;
+    if (!provider || !(provider instanceof SceneDataTransformer)) {
+      throw new Error('Could not find SceneDataTransformer for panel');
+    }
+    return provider;
+  }
+
+  public toggleTableView() {
+    if (this.state.tableView) {
+      this.setState({ tableView: undefined });
+      return;
+    }
+
+    this.setState({
+      tableView: PanelBuilders.table()
+        .setTitle('')
+        .setOption('showTypeIcons', true)
+        .setOption('showHeader', true)
+        // Here we are breaking a scene rule and changing the parent of the main panel data provider
+        // But we need to share this same instance as the queries tab is subscribing to it
+        .setData(this.dataTransformer)
+        .build(),
+    });
+  }
+
+  public unlinkLibraryPanel() {
+    const sourcePanel = this.state.sourcePanel.resolve();
+    if (!(sourcePanel.parent instanceof LibraryVizPanel)) {
+      throw new Error('VizPanel is not a child of a library panel');
+    }
+
+    const gridItem = sourcePanel.parent.parent;
+
+    if (!(gridItem instanceof DashboardGridItem)) {
+      throw new Error('Library panel not a child of a grid item');
+    }
+
+    const newSourcePanel = this.state.panel.clone({ $data: this.state.$data?.clone() });
+    gridItem.setState({
+      body: newSourcePanel,
+    });
+
+    this.setState({ sourcePanel: newSourcePanel.getRef() });
+  }
+
+  public commitChanges() {
+    const sourcePanel = this.state.sourcePanel.resolve();
+    this.commitChangesTo(sourcePanel);
+  }
+
+  public commitChangesTo(sourcePanel: VizPanel) {
+    const repeatUpdate = {
+      variableName: this.state.repeat,
+      repeatDirection: this.state.repeatDirection,
+      maxPerRow: this.state.maxPerRow,
+    };
+
+    if (sourcePanel.parent instanceof DashboardGridItem) {
+      sourcePanel.parent.setState({
+        ...repeatUpdate,
+        body: this.state.panel.clone(),
+      });
+    }
+
+    if (sourcePanel.parent instanceof LibraryVizPanel) {
+      if (sourcePanel.parent.parent instanceof DashboardGridItem) {
+        const newLibPanel = sourcePanel.parent.clone({
+          panel: this.state.panel.clone(),
+        });
+
+        sourcePanel.parent.parent.setState({
+          body: newLibPanel,
+          ...repeatUpdate,
+        });
+
+        updateLibraryVizPanel(newLibPanel!).then((p) => {
+          if (sourcePanel.parent instanceof LibraryVizPanel) {
+            newLibPanel.setPanelFromLibPanel(p);
+          }
+        });
+      }
+    }
+  }
+
+  /**
+   * Used from inspect json tab to view the current persisted model
+   */
+  public getPanelSaveModel(): Panel | object {
+    const sourcePanel = this.state.sourcePanel.resolve();
+
+    const isLibraryPanel = sourcePanel.parent instanceof LibraryVizPanel;
+    const gridItem = isLibraryPanel ? sourcePanel.parent.parent : sourcePanel.parent;
+
+    if (!(gridItem instanceof DashboardGridItem)) {
+      return { error: 'Unsupported panel parent' };
+    }
+
+    const parentClone = gridItem.clone({
+      body: this.state.panel.clone(),
+    });
+
+    return gridItemToPanel(parentClone);
+  }
+
+  public setPanelTitle(newTitle: string) {
+    this.state.panel.setState({ title: newTitle, hoverHeader: newTitle === '' });
+  }
+
+  public static Component = ({ model }: SceneComponentProps<VizPanelManager>) => {
+    const { panel, tableView } = model.useState();
+    const styles = useStyles2(getStyles);
+    const panelToShow = tableView ?? panel;
+    const dataProvider = panelToShow.state.$data;
+
+    // This is to preserve SceneQueryRunner stays alive when switching between visualizations and table view
+    useEffect(() => {
+      return dataProvider?.activate();
+    }, [dataProvider]);
+
+    return (
+      <>
+        <div className={styles.wrapper}>{<panelToShow.Component model={panelToShow} />}</div>
+      </>
+    );
+  };
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    wrapper: css({
+      height: '100%',
+      width: '100%',
+      paddingLeft: theme.spacing(2),
+    }),
+  };
+}
diff --git a/public/app/features/dashboard-scene/panel-edit/getPanelFrameOptions.tsx b/public/app/features/dashboard-scene/panel-edit/getPanelFrameOptions.tsx
new file mode 100644
index 0000000000000..f3d0350775e19
--- /dev/null
+++ b/public/app/features/dashboard-scene/panel-edit/getPanelFrameOptions.tsx
@@ -0,0 +1,207 @@
+import React from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { config } from '@grafana/runtime';
+import { VizPanel } from '@grafana/scenes';
+import { RadioButtonGroup, Select, DataLinksInlineEditor, Input, TextArea, Switch } from '@grafana/ui';
+import { GenAIPanelDescriptionButton } from 'app/features/dashboard/components/GenAI/GenAIPanelDescriptionButton';
+import { GenAIPanelTitleButton } from 'app/features/dashboard/components/GenAI/GenAIPanelTitleButton';
+import { OptionsPaneCategoryDescriptor } from 'app/features/dashboard/components/PanelEditor/OptionsPaneCategoryDescriptor';
+import { OptionsPaneItemDescriptor } from 'app/features/dashboard/components/PanelEditor/OptionsPaneItemDescriptor';
+import { RepeatRowSelect2 } from 'app/features/dashboard/components/RepeatRowSelect/RepeatRowSelect';
+import { getPanelLinksVariableSuggestions } from 'app/features/panel/panellinks/link_srv';
+
+import { VizPanelLinks } from '../scene/PanelLinks';
+import { vizPanelToPanel, transformSceneToSaveModel } from '../serialization/transformSceneToSaveModel';
+import { dashboardSceneGraph } from '../utils/dashboardSceneGraph';
+import { getDashboardSceneFor } from '../utils/utils';
+
+import { VizPanelManager, VizPanelManagerState } from './VizPanelManager';
+
+export function getPanelFrameCategory2(
+  vizManager: VizPanelManager,
+  panel: VizPanel,
+  repeat?: string
+): OptionsPaneCategoryDescriptor {
+  const descriptor = new OptionsPaneCategoryDescriptor({
+    title: 'Panel options',
+    id: 'Panel options',
+    isOpenDefault: true,
+  });
+
+  const panelLinksObject = dashboardSceneGraph.getPanelLinks(panel);
+  const links = panelLinksObject?.state.rawLinks ?? [];
+  const dashboard = getDashboardSceneFor(panel);
+
+  return descriptor
+    .addItem(
+      new OptionsPaneItemDescriptor({
+        title: 'Title',
+        value: panel.state.title,
+        popularRank: 1,
+        render: function renderTitle() {
+          return <PanelFrameTitle vizManager={vizManager} />;
+        },
+        addon: config.featureToggles.dashgpt && (
+          <GenAIPanelTitleButton
+            onGenerate={(title) => vizManager.setPanelTitle(title)}
+            panel={vizPanelToPanel(panel)}
+            dashboard={transformSceneToSaveModel(dashboard)}
+          />
+        ),
+      })
+    )
+    .addItem(
+      new OptionsPaneItemDescriptor({
+        title: 'Description',
+        value: panel.state.description,
+        render: function renderDescription() {
+          return <DescriptionTextArea panel={panel} />;
+        },
+        addon: config.featureToggles.dashgpt && (
+          <GenAIPanelDescriptionButton
+            onGenerate={(description) => panel.setState({ description })}
+            panel={vizPanelToPanel(panel)}
+          />
+        ),
+      })
+    )
+    .addItem(
+      new OptionsPaneItemDescriptor({
+        title: 'Transparent background',
+        render: function renderTransparent() {
+          return (
+            <Switch
+              value={panel.state.displayMode === 'transparent'}
+              id="transparent-background"
+              onChange={() => {
+                panel.setState({
+                  displayMode: panel.state.displayMode === 'transparent' ? 'default' : 'transparent',
+                });
+              }}
+            />
+          );
+        },
+      })
+    )
+    .addCategory(
+      new OptionsPaneCategoryDescriptor({
+        title: 'Panel links',
+        id: 'Panel links',
+        isOpenDefault: false,
+        itemsCount: links?.length,
+      }).addItem(
+        new OptionsPaneItemDescriptor({
+          title: 'Panel links',
+          render: () => <ScenePanelLinksEditor panelLinks={panelLinksObject ?? undefined} />,
+        })
+      )
+    )
+    .addCategory(
+      new OptionsPaneCategoryDescriptor({
+        title: 'Repeat options',
+        id: 'Repeat options',
+        isOpenDefault: false,
+      })
+        .addItem(
+          new OptionsPaneItemDescriptor({
+            title: 'Repeat by variable',
+            description:
+              'Repeat this panel for each value in the selected variable. This is not visible while in edit mode. You need to go back to dashboard and then update the variable or reload the dashboard.',
+            render: function renderRepeatOptions() {
+              return (
+                <RepeatRowSelect2
+                  id="repeat-by-variable-select"
+                  parent={panel}
+                  repeat={repeat}
+                  onChange={(value?: string) => {
+                    const stateUpdate: Partial<VizPanelManagerState> = { repeat: value };
+                    if (value && !vizManager.state.repeatDirection) {
+                      stateUpdate.repeatDirection = 'h';
+                    }
+                    vizManager.setState(stateUpdate);
+                  }}
+                />
+              );
+            },
+          })
+        )
+        .addItem(
+          new OptionsPaneItemDescriptor({
+            title: 'Repeat direction',
+            showIf: () => !!vizManager.state.repeat,
+            render: function renderRepeatOptions() {
+              const directionOptions: Array<SelectableValue<'h' | 'v'>> = [
+                { label: 'Horizontal', value: 'h' },
+                { label: 'Vertical', value: 'v' },
+              ];
+
+              return (
+                <RadioButtonGroup
+                  options={directionOptions}
+                  value={vizManager.state.repeatDirection ?? 'h'}
+                  onChange={(value) => vizManager.setState({ repeatDirection: value })}
+                />
+              );
+            },
+          })
+        )
+        .addItem(
+          new OptionsPaneItemDescriptor({
+            title: 'Max per row',
+            showIf: () => Boolean(vizManager.state.repeat && vizManager.state.repeatDirection === 'h'),
+            render: function renderOption() {
+              const maxPerRowOptions = [2, 3, 4, 6, 8, 12].map((value) => ({ label: value.toString(), value }));
+              return (
+                <Select
+                  options={maxPerRowOptions}
+                  value={vizManager.state.maxPerRow}
+                  onChange={(value) => vizManager.setState({ maxPerRow: value.value })}
+                />
+              );
+            },
+          })
+        )
+    );
+}
+
+interface ScenePanelLinksEditorProps {
+  panelLinks?: VizPanelLinks;
+}
+
+function ScenePanelLinksEditor({ panelLinks }: ScenePanelLinksEditorProps) {
+  const { rawLinks: links } = panelLinks ? panelLinks.useState() : { rawLinks: [] };
+
+  return (
+    <DataLinksInlineEditor
+      links={links}
+      onChange={(links) => panelLinks?.setState({ rawLinks: links })}
+      getSuggestions={getPanelLinksVariableSuggestions}
+      data={[]}
+    />
+  );
+}
+
+function PanelFrameTitle({ vizManager }: { vizManager: VizPanelManager }) {
+  const { title } = vizManager.state.panel.useState();
+
+  return (
+    <Input
+      data-testid="panel-edit-panel-title-input"
+      value={title}
+      onChange={(e) => vizManager.setPanelTitle(e.currentTarget.value)}
+    />
+  );
+}
+
+function DescriptionTextArea({ panel }: { panel: VizPanel }) {
+  const { description } = panel.useState();
+
+  return (
+    <TextArea
+      id="description-text-area"
+      value={description}
+      onChange={(e) => panel.setState({ description: e.currentTarget.value })}
+    />
+  );
+}
diff --git a/public/app/features/dashboard-scene/panel-edit/splitter/useSnappingSplitter.ts b/public/app/features/dashboard-scene/panel-edit/splitter/useSnappingSplitter.ts
new file mode 100644
index 0000000000000..95e78cac99c7a
--- /dev/null
+++ b/public/app/features/dashboard-scene/panel-edit/splitter/useSnappingSplitter.ts
@@ -0,0 +1,104 @@
+import React, { useCallback } from 'react';
+
+import { DragHandlePosition, useSplitter } from '@grafana/ui';
+
+export interface UseSnappingSplitterOptions {
+  /**
+   * The initial size of the primary pane between 0-1, defaults to 0.5
+   */
+  initialSize?: number;
+  direction: 'row' | 'column';
+  dragPosition?: DragHandlePosition;
+  paneOptions: PaneOptions;
+}
+
+interface PaneOptions {
+  collapseBelowPixels: number;
+  snapOpenToPixels?: number;
+}
+
+interface PaneState {
+  collapsed: boolean;
+  snapSize?: number;
+}
+
+export function useSnappingSplitter(options: UseSnappingSplitterOptions) {
+  const { paneOptions } = options;
+
+  const [state, setState] = React.useState<PaneState>({ collapsed: false });
+
+  const onResizing = useCallback(
+    (flexSize: number, pixelSize: number) => {
+      if (flexSize <= 0 && pixelSize <= 0) {
+        return;
+      }
+
+      const optionsPixelSize = (pixelSize / flexSize) * (1 - flexSize);
+
+      if (state.collapsed && optionsPixelSize > paneOptions.collapseBelowPixels) {
+        setState({ collapsed: false });
+      }
+
+      if (!state.collapsed && optionsPixelSize < paneOptions.collapseBelowPixels) {
+        setState({ collapsed: true });
+      }
+    },
+    [state, paneOptions.collapseBelowPixels]
+  );
+
+  const onSizeChanged = useCallback(
+    (flexSize: number, pixelSize: number) => {
+      if (flexSize <= 0 && pixelSize <= 0) {
+        return;
+      }
+
+      const newSecondPaneSize = 1 - flexSize;
+      const isSnappedClosed = state.snapSize === 0;
+      const sizeOfBothPanes = pixelSize / flexSize;
+      const snapOpenToPixels = paneOptions.snapOpenToPixels ?? sizeOfBothPanes / 2;
+      const snapSize = snapOpenToPixels / sizeOfBothPanes;
+
+      if (state.collapsed) {
+        if (isSnappedClosed) {
+          setState({ snapSize: Math.max(newSecondPaneSize, snapSize), collapsed: false });
+        } else {
+          setState({ snapSize: 0, collapsed: true });
+        }
+      } else if (isSnappedClosed) {
+        setState({ snapSize: newSecondPaneSize, collapsed: false });
+      }
+    },
+    [state, paneOptions.snapOpenToPixels]
+  );
+
+  const onToggleCollapse = useCallback(() => {
+    setState({ collapsed: !state.collapsed });
+  }, [state.collapsed]);
+
+  const { containerProps, primaryProps, secondaryProps, splitterProps } = useSplitter({
+    ...options,
+    onResizing,
+    onSizeChanged,
+  });
+
+  // This is to allow resizing it beyond the content dimensions
+  secondaryProps.style.overflow = 'hidden';
+  secondaryProps.style.minWidth = 'unset';
+  secondaryProps.style.minHeight = 'unset';
+
+  if (state.snapSize) {
+    primaryProps.style = {
+      ...primaryProps.style,
+      flexGrow: 1 - state.snapSize,
+    };
+    secondaryProps.style.flexGrow = state.snapSize;
+  } else if (state.snapSize === 0) {
+    primaryProps.style.flexGrow = 1;
+    secondaryProps.style.flexGrow = 0;
+    secondaryProps.style.minWidth = 'unset';
+    secondaryProps.style.minHeight = 'unset';
+    secondaryProps.style.overflow = 'unset';
+  }
+
+  return { containerProps, primaryProps, secondaryProps, splitterProps, splitterState: state, onToggleCollapse };
+}
diff --git a/public/app/features/dashboard-scene/panel-edit/testfiles/testDashboard.ts b/public/app/features/dashboard-scene/panel-edit/testfiles/testDashboard.ts
new file mode 100644
index 0000000000000..c583b089e4579
--- /dev/null
+++ b/public/app/features/dashboard-scene/panel-edit/testfiles/testDashboard.ts
@@ -0,0 +1,642 @@
+export const panelWithQueriesOnly = {
+  datasource: {
+    type: 'grafana-testdata-datasource',
+    uid: 'gdev-testdata',
+  },
+  fieldConfig: {
+    defaults: {
+      color: {
+        mode: 'palette-classic',
+      },
+      custom: {
+        axisBorderShow: false,
+        axisCenteredZero: false,
+        axisColorMode: 'text',
+        axisLabel: '',
+        axisPlacement: 'auto',
+        barAlignment: 0,
+        drawStyle: 'line',
+        fillOpacity: 0,
+        gradientMode: 'none',
+        hideFrom: {
+          legend: false,
+          tooltip: false,
+          viz: false,
+        },
+        insertNulls: false,
+        lineInterpolation: 'linear',
+        lineWidth: 1,
+        pointSize: 5,
+        scaleDistribution: {
+          type: 'linear',
+        },
+        showPoints: 'auto',
+        spanNulls: false,
+        stacking: {
+          group: 'A',
+          mode: 'none',
+        },
+        thresholdsStyle: {
+          mode: 'off',
+        },
+      },
+      mappings: [],
+      thresholds: {
+        mode: 'absolute',
+        steps: [
+          {
+            color: 'green',
+            value: null,
+          },
+          {
+            color: 'red',
+            value: 80,
+          },
+        ],
+      },
+    },
+    overrides: [],
+  },
+  gridPos: {
+    h: 8,
+    w: 12,
+    x: 0,
+    y: 0,
+  },
+  id: 1,
+  options: {
+    legend: {
+      calcs: [],
+      displayMode: 'list',
+      placement: 'bottom',
+      showLegend: true,
+    },
+    tooltip: {
+      mode: 'single',
+      sort: 'none',
+    },
+  },
+  targets: [
+    {
+      datasource: {
+        type: 'grafana-testdata-datasource',
+        uid: 'gdev-testdata',
+      },
+      refId: 'A',
+      scenarioId: 'random_walk',
+      seriesCount: 1,
+    },
+  ],
+  title: 'Panel with just queries',
+  type: 'timeseries',
+};
+
+export const panelWithTransformations = {
+  datasource: {
+    type: 'grafana-testdata-datasource',
+    uid: 'gdev-testdata',
+  },
+  fieldConfig: {
+    defaults: {
+      color: {
+        mode: 'thresholds',
+      },
+      custom: {
+        align: 'auto',
+        cellOptions: {
+          type: 'auto',
+        },
+        inspect: false,
+      },
+      mappings: [],
+      thresholds: {
+        mode: 'absolute',
+        steps: [
+          {
+            color: 'green',
+            value: null,
+          },
+          {
+            color: 'red',
+            value: 80,
+          },
+        ],
+      },
+    },
+    overrides: [],
+  },
+  gridPos: {
+    h: 8,
+    w: 12,
+    x: 12,
+    y: 0,
+  },
+  id: 2,
+  options: {
+    cellHeight: 'sm',
+    footer: {
+      countRows: false,
+      fields: '',
+      reducer: ['sum'],
+      show: false,
+    },
+    showHeader: true,
+  },
+  pluginVersion: '10.3.0-pre',
+  targets: [
+    {
+      datasource: {
+        type: 'grafana-testdata-datasource',
+        uid: 'gdev-testdata',
+      },
+      refId: 'A',
+      scenarioId: 'random_walk',
+      seriesCount: 1,
+    },
+  ],
+  title: 'Panel with transforms',
+  transformations: [
+    {
+      id: 'reduce',
+      options: {},
+    },
+  ],
+  type: 'table',
+};
+
+export const panelWithDashboardQuery = {
+  datasource: {
+    type: 'datasource',
+    uid: '-- Dashboard --',
+  },
+  fieldConfig: {
+    defaults: {
+      color: {
+        mode: 'palette-classic',
+      },
+      custom: {
+        axisBorderShow: false,
+        axisCenteredZero: false,
+        axisColorMode: 'text',
+        axisLabel: '',
+        axisPlacement: 'auto',
+        barAlignment: 0,
+        drawStyle: 'line',
+        fillOpacity: 0,
+        gradientMode: 'none',
+        hideFrom: {
+          legend: false,
+          tooltip: false,
+          viz: false,
+        },
+        insertNulls: false,
+        lineInterpolation: 'linear',
+        lineWidth: 1,
+        pointSize: 5,
+        scaleDistribution: {
+          type: 'linear',
+        },
+        showPoints: 'auto',
+        spanNulls: false,
+        stacking: {
+          group: 'A',
+          mode: 'none',
+        },
+        thresholdsStyle: {
+          mode: 'off',
+        },
+      },
+      mappings: [],
+      thresholds: {
+        mode: 'absolute',
+        steps: [
+          {
+            color: 'green',
+            value: null,
+          },
+          {
+            color: 'red',
+            value: 80,
+          },
+        ],
+      },
+    },
+    overrides: [],
+  },
+  gridPos: {
+    h: 8,
+    w: 12,
+    x: 0,
+    y: 8,
+  },
+  id: 3,
+  options: {
+    legend: {
+      calcs: [],
+      displayMode: 'list',
+      placement: 'bottom',
+      showLegend: true,
+    },
+    tooltip: {
+      mode: 'single',
+      sort: 'none',
+    },
+  },
+  targets: [
+    {
+      datasource: {
+        type: 'datasource',
+        uid: '-- Dashboard --',
+      },
+      panelId: 1,
+      refId: 'A',
+    },
+  ],
+  title: 'Panel with a Dashboard query',
+  type: 'timeseries',
+};
+
+export const panelWithDashboardQueryAndTransformations = {
+  datasource: {
+    type: 'datasource',
+    uid: '-- Dashboard --',
+  },
+  fieldConfig: {
+    defaults: {
+      color: {
+        mode: 'thresholds',
+      },
+      custom: {
+        align: 'auto',
+        cellOptions: {
+          type: 'auto',
+        },
+        inspect: false,
+      },
+      mappings: [],
+      thresholds: {
+        mode: 'absolute',
+        steps: [
+          {
+            color: 'green',
+            value: null,
+          },
+          {
+            color: 'red',
+            value: 80,
+          },
+        ],
+      },
+    },
+    overrides: [],
+  },
+  gridPos: {
+    h: 8,
+    w: 12,
+    x: 12,
+    y: 8,
+  },
+  id: 4,
+  options: {
+    cellHeight: 'sm',
+    footer: {
+      countRows: false,
+      fields: '',
+      reducer: ['sum'],
+      show: false,
+    },
+    showHeader: true,
+  },
+  pluginVersion: '10.3.0-pre',
+  targets: [
+    {
+      datasource: {
+        type: 'datasource',
+        uid: '-- Dashboard --',
+      },
+      panelId: 1,
+      refId: 'A',
+    },
+  ],
+  title: 'Panel with a dashboard query with transformations',
+  transformations: [
+    {
+      id: 'reduce',
+      options: {},
+    },
+  ],
+  type: 'table',
+};
+
+export const panelWithNoDataSource = {
+  fieldConfig: {
+    defaults: {
+      color: {
+        mode: 'palette-classic',
+      },
+      custom: {
+        axisBorderShow: false,
+        axisCenteredZero: false,
+        axisColorMode: 'text',
+        axisLabel: '',
+        axisPlacement: 'auto',
+        barAlignment: 0,
+        drawStyle: 'line',
+        fillOpacity: 0,
+        gradientMode: 'none',
+        hideFrom: {
+          legend: false,
+          tooltip: false,
+          viz: false,
+        },
+        insertNulls: false,
+        lineInterpolation: 'linear',
+        lineWidth: 1,
+        pointSize: 5,
+        scaleDistribution: {
+          type: 'linear',
+        },
+        showPoints: 'auto',
+        spanNulls: false,
+        stacking: {
+          group: 'A',
+          mode: 'none',
+        },
+        thresholdsStyle: {
+          mode: 'off',
+        },
+      },
+      mappings: [],
+      thresholds: {
+        mode: 'absolute',
+        steps: [
+          {
+            color: 'green',
+            value: null,
+          },
+          {
+            color: 'red',
+            value: 80,
+          },
+        ],
+      },
+    },
+    overrides: [],
+  },
+  gridPos: {
+    h: 8,
+    w: 12,
+    x: 0,
+    y: 0,
+  },
+  id: 5,
+  options: {
+    legend: {
+      calcs: [],
+      displayMode: 'list',
+      placement: 'bottom',
+      showLegend: true,
+    },
+    tooltip: {
+      mode: 'single',
+      sort: 'none',
+    },
+  },
+  targets: [
+    {
+      refId: 'A',
+    },
+  ],
+  title: 'Panel with no data source',
+  type: 'timeseries',
+};
+
+export const panelWithDataSourceNotFound = {
+  datasource: {
+    type: 'datasource',
+    uid: 'abc',
+  },
+  fieldConfig: {
+    defaults: {
+      color: {
+        mode: 'palette-classic',
+      },
+      custom: {
+        axisBorderShow: false,
+        axisCenteredZero: false,
+        axisColorMode: 'text',
+        axisLabel: '',
+        axisPlacement: 'auto',
+        barAlignment: 0,
+        drawStyle: 'line',
+        fillOpacity: 0,
+        gradientMode: 'none',
+        hideFrom: {
+          legend: false,
+          tooltip: false,
+          viz: false,
+        },
+        insertNulls: false,
+        lineInterpolation: 'linear',
+        lineWidth: 1,
+        pointSize: 5,
+        scaleDistribution: {
+          type: 'linear',
+        },
+        showPoints: 'auto',
+        spanNulls: false,
+        stacking: {
+          group: 'A',
+          mode: 'none',
+        },
+        thresholdsStyle: {
+          mode: 'off',
+        },
+      },
+      mappings: [],
+      thresholds: {
+        mode: 'absolute',
+        steps: [
+          {
+            color: 'green',
+            value: null,
+          },
+          {
+            color: 'red',
+            value: 80,
+          },
+        ],
+      },
+    },
+    overrides: [],
+  },
+  gridPos: {
+    h: 8,
+    w: 12,
+    x: 0,
+    y: 0,
+  },
+  id: 6,
+  options: {
+    legend: {
+      calcs: [],
+      displayMode: 'list',
+      placement: 'bottom',
+      showLegend: true,
+    },
+    tooltip: {
+      mode: 'single',
+      sort: 'none',
+    },
+  },
+  targets: [
+    {
+      refId: 'A',
+    },
+  ],
+  title: 'Panel with no data source',
+  type: 'timeseries',
+};
+
+export const panelWithQueriesAndMixedDatasource = {
+  datasource: {
+    type: 'datasource',
+    uid: '-- Mixed --',
+  },
+  fieldConfig: {
+    defaults: {
+      color: {
+        mode: 'palette-classic',
+      },
+      custom: {
+        axisBorderShow: false,
+        axisCenteredZero: false,
+        axisColorMode: 'text',
+        axisLabel: '',
+        axisPlacement: 'auto',
+        barAlignment: 0,
+        drawStyle: 'line',
+        fillOpacity: 0,
+        gradientMode: 'none',
+        hideFrom: {
+          legend: false,
+          tooltip: false,
+          viz: false,
+        },
+        insertNulls: false,
+        lineInterpolation: 'linear',
+        lineWidth: 1,
+        pointSize: 5,
+        scaleDistribution: {
+          type: 'linear',
+        },
+        showPoints: 'auto',
+        spanNulls: false,
+        stacking: {
+          group: 'A',
+          mode: 'none',
+        },
+        thresholdsStyle: {
+          mode: 'off',
+        },
+      },
+      mappings: [],
+      thresholds: {
+        mode: 'absolute',
+        steps: [
+          {
+            color: 'green',
+            value: null,
+          },
+          {
+            color: 'red',
+            value: 80,
+          },
+        ],
+      },
+    },
+    overrides: [],
+  },
+  gridPos: {
+    h: 8,
+    w: 12,
+    x: 0,
+    y: 0,
+  },
+  id: 7,
+  options: {
+    legend: {
+      calcs: [],
+      displayMode: 'list',
+      placement: 'bottom',
+      showLegend: true,
+    },
+    tooltip: {
+      mode: 'single',
+      sort: 'none',
+    },
+  },
+  targets: [
+    {
+      datasource: {
+        type: 'grafana-testdata-datasource',
+        uid: 'gdev-testdata',
+      },
+      refId: 'A',
+      scenarioId: 'random_walk',
+      seriesCount: 1,
+    },
+  ],
+  title: 'Panel with just queries',
+  type: 'timeseries',
+};
+
+export const testDashboard = {
+  annotations: {
+    list: [
+      {
+        builtIn: 1,
+        datasource: {
+          type: 'grafana',
+          uid: '-- Grafana --',
+        },
+        enable: true,
+        hide: true,
+        iconColor: 'rgba(0, 211, 255, 1)',
+        name: 'Annotations & Alerts',
+        type: 'dashboard',
+      },
+    ],
+  },
+  editable: true,
+  fiscalYearStartMonth: 0,
+  graphTooltip: 0,
+  id: 2378,
+  links: [],
+  liveNow: false,
+  panels: [
+    panelWithQueriesOnly,
+    panelWithTransformations,
+    panelWithDashboardQuery,
+    panelWithDashboardQueryAndTransformations,
+    panelWithNoDataSource,
+    panelWithDataSourceNotFound,
+    panelWithQueriesAndMixedDatasource,
+  ],
+  refresh: '',
+  schemaVersion: 39,
+  tags: [],
+  templating: {
+    list: [],
+  },
+  time: {
+    from: 'now-6h',
+    to: 'now',
+  },
+  timepicker: {},
+  timezone: '',
+  title: 'Scenes/PanelEdit/Queries: Edit',
+  uid: 'ffbe00e2-803c-4d49-adb7-41aad336234f',
+  version: 6,
+  weekStart: '',
+};
diff --git a/public/app/features/dashboard-scene/saving/DashboardPrompt.test.tsx b/public/app/features/dashboard-scene/saving/DashboardPrompt.test.tsx
new file mode 100644
index 0000000000000..76dc822344f11
--- /dev/null
+++ b/public/app/features/dashboard-scene/saving/DashboardPrompt.test.tsx
@@ -0,0 +1,157 @@
+import { SceneGridLayout, SceneQueryRunner, SceneTimeRange, VizPanel, behaviors } from '@grafana/scenes';
+import { ContextSrv, setContextSrv } from 'app/core/services/context_srv';
+
+import { DashboardControls } from '../scene/DashboardControls';
+import { DashboardGridItem } from '../scene/DashboardGridItem';
+import { DashboardScene, DashboardSceneState } from '../scene/DashboardScene';
+import { transformSceneToSaveModel } from '../serialization/transformSceneToSaveModel';
+
+import { ignoreChanges } from './DashboardPrompt';
+
+function getTestContext() {
+  const contextSrv = { isSignedIn: true, isEditor: true } as ContextSrv;
+  setContextSrv(contextSrv);
+
+  return { contextSrv };
+}
+
+describe('DashboardPrompt', () => {
+  describe('ignoreChanges', () => {
+    beforeEach(() => {
+      getTestContext();
+    });
+
+    describe('when called without original dashboard', () => {
+      it('then it should return true', () => {
+        const scene = buildTestScene();
+        expect(ignoreChanges(scene, undefined)).toBe(true);
+      });
+    });
+
+    describe('when called without current dashboard', () => {
+      it('then it should return true', () => {
+        const scene = buildTestScene();
+        expect(ignoreChanges(null, scene.getInitialSaveModel())).toBe(true);
+      });
+    });
+
+    describe('when called for a viewer without save permissions', () => {
+      it('then it should return true', () => {
+        const { contextSrv } = getTestContext();
+        const scene = buildTestScene({
+          meta: {
+            canSave: false,
+          },
+        });
+        contextSrv.isEditor = false;
+
+        expect(ignoreChanges(scene, scene.getInitialSaveModel())).toBe(true);
+      });
+    });
+
+    describe('when called for a viewer with save permissions', () => {
+      it('then it should return undefined', () => {
+        const { contextSrv } = getTestContext();
+
+        const scene = buildTestScene({
+          meta: {
+            canSave: true,
+          },
+        });
+        const initialSaveModel = transformSceneToSaveModel(scene);
+
+        contextSrv.isEditor = false;
+
+        expect(ignoreChanges(scene, initialSaveModel)).toBe(undefined);
+      });
+    });
+
+    describe('when called for an user that is not signed in', () => {
+      it('then it should return true', () => {
+        const { contextSrv } = getTestContext();
+        const scene = buildTestScene({
+          meta: {
+            canSave: true,
+          },
+        });
+        const initialSaveModel = transformSceneToSaveModel(scene);
+
+        contextSrv.isSignedIn = false;
+        expect(ignoreChanges(scene, initialSaveModel)).toBe(true);
+      });
+    });
+
+    describe('when called with fromScript', () => {
+      it('then it should return true', () => {
+        const scene = buildTestScene({
+          meta: {
+            canSave: true,
+            fromScript: true,
+          },
+        });
+        const initialSaveModel = transformSceneToSaveModel(scene);
+        expect(ignoreChanges(scene, initialSaveModel)).toBe(true);
+      });
+    });
+
+    describe('when called with fromFile', () => {
+      it('then it should return true', () => {
+        const scene = buildTestScene({
+          meta: {
+            canSave: true,
+            fromScript: undefined,
+            fromFile: true,
+          },
+        });
+        const initialSaveModel = transformSceneToSaveModel(scene);
+        expect(ignoreChanges(scene, initialSaveModel)).toBe(true);
+      });
+    });
+
+    describe('when called with canSave but without fromScript and fromFile', () => {
+      it('then it should return false', () => {
+        const scene = buildTestScene({
+          meta: {
+            canSave: true,
+            fromScript: undefined,
+            fromFile: undefined,
+          },
+        });
+        const initialSaveModel = transformSceneToSaveModel(scene);
+        expect(ignoreChanges(scene, initialSaveModel)).toBe(undefined);
+      });
+    });
+  });
+});
+
+function buildTestScene(overrides?: Partial<DashboardSceneState>) {
+  const scene = new DashboardScene({
+    title: 'hello',
+    uid: 'dash-1',
+    description: 'hello description',
+    tags: ['tag1', 'tag2'],
+    editable: true,
+    $timeRange: new SceneTimeRange({
+      timeZone: 'browser',
+    }),
+    controls: new DashboardControls({}),
+    $behaviors: [new behaviors.CursorSync({})],
+    body: new SceneGridLayout({
+      children: [
+        new DashboardGridItem({
+          key: 'griditem-1',
+          x: 0,
+          body: new VizPanel({
+            title: 'Panel A',
+            key: 'panel-1',
+            pluginId: 'table',
+            $data: new SceneQueryRunner({ key: 'data-query-runner', queries: [{ refId: 'A' }] }),
+          }),
+        }),
+      ],
+    }),
+    ...overrides,
+  });
+
+  return scene;
+}
diff --git a/public/app/features/dashboard-scene/saving/DashboardPrompt.tsx b/public/app/features/dashboard-scene/saving/DashboardPrompt.tsx
new file mode 100644
index 0000000000000..a698782225fbf
--- /dev/null
+++ b/public/app/features/dashboard-scene/saving/DashboardPrompt.tsx
@@ -0,0 +1,176 @@
+import { css } from '@emotion/css';
+import * as H from 'history';
+import React, { useContext, useEffect, useMemo } from 'react';
+import { Prompt } from 'react-router';
+
+import { locationService } from '@grafana/runtime';
+import { Dashboard } from '@grafana/schema/dist/esm/index.gen';
+import { ModalsContext, Modal, Button, useStyles2 } from '@grafana/ui';
+import { contextSrv } from 'app/core/services/context_srv';
+
+import { DashboardScene } from '../scene/DashboardScene';
+
+interface DashboardPromptProps {
+  dashboard: DashboardScene;
+}
+
+export const DashboardPrompt = React.memo(({ dashboard }: DashboardPromptProps) => {
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  const originalPath = useMemo(() => locationService.getLocation().pathname, [dashboard]);
+  const { showModal, hideModal } = useContext(ModalsContext);
+
+  useEffect(() => {
+    const handleUnload = (event: BeforeUnloadEvent) => {
+      if (ignoreChanges(dashboard, dashboard.getInitialSaveModel())) {
+        return;
+      }
+
+      if (dashboard.state.isDirty) {
+        event.preventDefault();
+        // No browser actually displays this message anymore.
+        // But Chrome requires it to be defined else the popup won't show.
+        event.returnValue = '';
+      }
+    };
+
+    window.addEventListener('beforeunload', handleUnload);
+    return () => window.removeEventListener('beforeunload', handleUnload);
+  }, [dashboard]);
+
+  const onHistoryBlock = (location: H.Location) => {
+    // const panelInEdit = dashboard.state.editPanel;
+    // const search = new URLSearchParams(location.search);
+
+    // TODO: Are we leaving panel edit & library panel?
+
+    // if (panelInEdit && panelInEdit.libraryPanel && panelInEdit.hasChanged && !search.has('editPanel')) {
+    //   showModal(SaveLibraryPanelModal, {
+    //     isUnsavedPrompt: true,
+    //     panel: dashboard.panelInEdit as PanelModelWithLibraryPanel,
+    //     folderUid: dashboard.meta.folderUid ?? '',
+    //     onConfirm: () => {
+    //       hideModal();
+    //       moveToBlockedLocationAfterReactStateUpdate(location);
+    //     },
+    //     onDiscard: () => {
+    //       dispatch(discardPanelChanges());
+    //       moveToBlockedLocationAfterReactStateUpdate(location);
+    //       hideModal();
+    //     },
+    //     onDismiss: hideModal,
+    //   });
+    //   return false;
+    // }
+
+    // Are we still on the same dashboard?
+    if (originalPath === location.pathname) {
+      return true;
+    }
+
+    if (ignoreChanges(dashboard, dashboard.getInitialSaveModel())) {
+      return true;
+    }
+
+    if (!dashboard.state.isDirty) {
+      return true;
+    }
+
+    showModal(UnsavedChangesModal, {
+      dashboard,
+      onSaveDashboardClick: () => {
+        hideModal();
+        dashboard.openSaveDrawer({
+          onSaveSuccess: () => {
+            moveToBlockedLocationAfterReactStateUpdate(location);
+          },
+        });
+      },
+
+      onDiscard: () => {
+        dashboard.exitEditMode({ skipConfirm: true });
+        hideModal();
+        moveToBlockedLocationAfterReactStateUpdate(location);
+      },
+      onDismiss: hideModal,
+    });
+
+    return false;
+  };
+
+  return <Prompt when={true} message={onHistoryBlock} />;
+});
+
+DashboardPrompt.displayName = 'DashboardPrompt';
+
+function moveToBlockedLocationAfterReactStateUpdate(location?: H.Location | null) {
+  if (location) {
+    setTimeout(() => locationService.push(location), 10);
+  }
+}
+
+interface UnsavedChangesModalProps {
+  onDiscard: () => void;
+  onDismiss: () => void;
+  onSaveDashboardClick?: () => void;
+}
+
+export const UnsavedChangesModal = ({ onDiscard, onDismiss, onSaveDashboardClick }: UnsavedChangesModalProps) => {
+  const styles = useStyles2(getStyles);
+
+  return (
+    <Modal
+      isOpen={true}
+      title="Unsaved changes"
+      onDismiss={onDismiss}
+      icon="exclamation-triangle"
+      className={styles.modal}
+    >
+      <h5>Do you want to save your changes?</h5>
+      <Modal.ButtonRow>
+        <Button variant="secondary" onClick={onDismiss} fill="outline">
+          Cancel
+        </Button>
+        <Button variant="destructive" onClick={onDiscard}>
+          Discard
+        </Button>
+        <Button onClick={onSaveDashboardClick}>Save dashboard</Button>
+      </Modal.ButtonRow>
+    </Modal>
+  );
+};
+
+const getStyles = () => ({
+  modal: css({
+    width: '500px',
+  }),
+});
+
+/**
+ * For some dashboards and users changes should be ignored *
+ */
+export function ignoreChanges(current: DashboardScene | null, original?: Dashboard) {
+  if (!original) {
+    return true;
+  }
+
+  // Ignore changes if original is unsaved
+  if (original.version === 0) {
+    return true;
+  }
+
+  // Ignore changes if the user has been signed out
+  if (!contextSrv.isSignedIn) {
+    return true;
+  }
+
+  if (!current) {
+    return true;
+  }
+
+  const { canSave, fromScript, fromFile } = current.state.meta;
+  if (!contextSrv.isEditor && !canSave) {
+    return true;
+  }
+
+  return !canSave || fromScript || fromFile;
+}
diff --git a/public/app/features/dashboard-scene/saving/DashboardSceneChangeTracker.ts b/public/app/features/dashboard-scene/saving/DashboardSceneChangeTracker.ts
new file mode 100644
index 0000000000000..4bc186849e922
--- /dev/null
+++ b/public/app/features/dashboard-scene/saving/DashboardSceneChangeTracker.ts
@@ -0,0 +1,192 @@
+import { Unsubscribable } from 'rxjs';
+
+import {
+  SceneDataLayerSet,
+  SceneDataTransformer,
+  SceneGridLayout,
+  SceneObjectStateChangedEvent,
+  SceneQueryRunner,
+  SceneRefreshPicker,
+  SceneTimeRange,
+  SceneVariableSet,
+  VizPanel,
+  behaviors,
+} from '@grafana/scenes';
+import { createWorker } from 'app/features/dashboard-scene/saving/createDetectChangesWorker';
+
+import { VizPanelManager } from '../panel-edit/VizPanelManager';
+import { DashboardAnnotationsDataLayer } from '../scene/DashboardAnnotationsDataLayer';
+import { DashboardControls } from '../scene/DashboardControls';
+import { DashboardGridItem } from '../scene/DashboardGridItem';
+import { DashboardScene, PERSISTED_PROPS } from '../scene/DashboardScene';
+import { LibraryVizPanel } from '../scene/LibraryVizPanel';
+import { VizPanelLinks } from '../scene/PanelLinks';
+import { PanelTimeRange } from '../scene/PanelTimeRange';
+import { transformSceneToSaveModel } from '../serialization/transformSceneToSaveModel';
+import { isSceneVariableInstance } from '../settings/variables/utils';
+
+import { DashboardChangeInfo } from './shared';
+
+export class DashboardSceneChangeTracker {
+  private _changeTrackerSub: Unsubscribable | undefined;
+  private _changesWorker?: Worker;
+  private _dashboard: DashboardScene;
+
+  constructor(dashboard: DashboardScene) {
+    this._dashboard = dashboard;
+  }
+
+  static isUpdatingPersistedState({ payload }: SceneObjectStateChangedEvent) {
+    // If there are no changes in the state, the check is not needed
+    if (Object.keys(payload.partialUpdate).length === 0) {
+      return false;
+    }
+
+    // Any change in the panel should trigger a change detection
+    // The VizPanelManager includes configuration for the panel like repeat
+    // The PanelTimeRange includes the overrides configuration
+    if (
+      payload.changedObject instanceof VizPanel ||
+      payload.changedObject instanceof DashboardGridItem ||
+      payload.changedObject instanceof PanelTimeRange
+    ) {
+      return true;
+    }
+    // VizPanelManager includes the repeat configuration
+    if (payload.changedObject instanceof VizPanelManager) {
+      if (
+        Object.prototype.hasOwnProperty.call(payload.partialUpdate, 'repeat') ||
+        Object.prototype.hasOwnProperty.call(payload.partialUpdate, 'repeatDirection') ||
+        Object.prototype.hasOwnProperty.call(payload.partialUpdate, 'maxPerRow')
+      ) {
+        return true;
+      }
+    }
+    // SceneQueryRunner includes the DS configuration
+    if (payload.changedObject instanceof SceneQueryRunner) {
+      if (!Object.prototype.hasOwnProperty.call(payload.partialUpdate, 'data')) {
+        return true;
+      }
+    }
+    // SceneDataTransformer includes the transformation configuration
+    if (payload.changedObject instanceof SceneDataTransformer) {
+      if (!Object.prototype.hasOwnProperty.call(payload.partialUpdate, 'data')) {
+        return true;
+      }
+    }
+    if (payload.changedObject instanceof VizPanelLinks) {
+      return true;
+    }
+    if (payload.changedObject instanceof LibraryVizPanel) {
+      if (Object.prototype.hasOwnProperty.call(payload.partialUpdate, 'name')) {
+        return true;
+      }
+    }
+    if (payload.changedObject instanceof SceneRefreshPicker) {
+      if (
+        Object.prototype.hasOwnProperty.call(payload.partialUpdate, 'intervals') ||
+        Object.prototype.hasOwnProperty.call(payload.partialUpdate, 'refresh')
+      ) {
+        return true;
+      }
+    }
+    if (payload.changedObject instanceof behaviors.CursorSync) {
+      return true;
+    }
+    if (payload.changedObject instanceof SceneDataLayerSet) {
+      return true;
+    }
+    if (payload.changedObject instanceof DashboardGridItem) {
+      return true;
+    }
+    if (payload.changedObject instanceof SceneGridLayout) {
+      return true;
+    }
+    if (payload.changedObject instanceof DashboardScene) {
+      if (Object.keys(payload.partialUpdate).some((key) => PERSISTED_PROPS.includes(key))) {
+        return true;
+      }
+    }
+    if (payload.changedObject instanceof SceneTimeRange) {
+      return true;
+    }
+    if (payload.changedObject instanceof DashboardControls) {
+      if (Object.prototype.hasOwnProperty.call(payload.partialUpdate, 'hideTimeControls')) {
+        return true;
+      }
+    }
+    if (payload.changedObject instanceof SceneVariableSet) {
+      return true;
+    }
+    if (payload.changedObject instanceof DashboardAnnotationsDataLayer) {
+      if (!Object.prototype.hasOwnProperty.call(payload.partialUpdate, 'data')) {
+        return true;
+      }
+    }
+    if (payload.changedObject instanceof behaviors.LiveNowTimer) {
+      return true;
+    }
+    if (isSceneVariableInstance(payload.changedObject)) {
+      return true;
+    }
+    return false;
+  }
+
+  private onStateChanged(event: SceneObjectStateChangedEvent) {
+    if (DashboardSceneChangeTracker.isUpdatingPersistedState(event)) {
+      this.detectSaveModelChanges();
+    }
+  }
+
+  private detectSaveModelChanges() {
+    this._changesWorker?.postMessage({
+      changed: transformSceneToSaveModel(this._dashboard),
+      initial: this._dashboard.getInitialSaveModel(),
+    });
+  }
+
+  private hasMetadataChanges() {
+    return this._dashboard.state.meta.folderUid !== this._dashboard.getInitialState()?.meta.folderUid;
+  }
+
+  private updateIsDirty(result: DashboardChangeInfo) {
+    const { hasChanges } = result;
+
+    if (hasChanges || this.hasMetadataChanges()) {
+      if (!this._dashboard.state.isDirty) {
+        this._dashboard.setState({ isDirty: true });
+      }
+    } else {
+      if (this._dashboard.state.isDirty) {
+        this._dashboard.setState({ isDirty: false });
+      }
+    }
+  }
+
+  private init() {
+    this._changesWorker = createWorker();
+  }
+
+  public startTrackingChanges() {
+    if (!this._changesWorker) {
+      this.init();
+    }
+    this._changesWorker!.onmessage = (e: MessageEvent<DashboardChangeInfo>) => {
+      this.updateIsDirty(e.data);
+    };
+
+    this._changeTrackerSub = this._dashboard.subscribeToEvent(
+      SceneObjectStateChangedEvent,
+      this.onStateChanged.bind(this)
+    );
+  }
+
+  public stopTrackingChanges() {
+    this._changeTrackerSub?.unsubscribe();
+  }
+
+  public terminate() {
+    this.stopTrackingChanges();
+    this._changesWorker?.terminate();
+  }
+}
diff --git a/public/app/features/dashboard-scene/saving/DetectChangesWorker.ts b/public/app/features/dashboard-scene/saving/DetectChangesWorker.ts
new file mode 100644
index 0000000000000..3dc6e7ec8b0fb
--- /dev/null
+++ b/public/app/features/dashboard-scene/saving/DetectChangesWorker.ts
@@ -0,0 +1,10 @@
+// Worker is not three shakable, so we should not import the whole loadash library
+// eslint-disable-next-line lodash/import-scope
+import debounce from 'lodash/debounce';
+
+import { getDashboardChanges } from './getDashboardChanges';
+
+self.onmessage = debounce((e: MessageEvent<{ initial: any; changed: any }>) => {
+  const result = getDashboardChanges(e.data.initial, e.data.changed, false, false, false);
+  self.postMessage(result);
+}, 500);
diff --git a/public/app/features/dashboard-scene/saving/SaveDashboardAsForm.tsx b/public/app/features/dashboard-scene/saving/SaveDashboardAsForm.tsx
new file mode 100644
index 0000000000000..0a9fb858accea
--- /dev/null
+++ b/public/app/features/dashboard-scene/saving/SaveDashboardAsForm.tsx
@@ -0,0 +1,200 @@
+import debounce from 'debounce-promise';
+import React, { ChangeEvent } from 'react';
+import { UseFormSetValue, useForm } from 'react-hook-form';
+
+import { selectors } from '@grafana/e2e-selectors';
+import { Dashboard } from '@grafana/schema';
+import { Button, Input, Switch, Field, Label, TextArea, Stack, Alert, Box } from '@grafana/ui';
+import { FolderPicker } from 'app/core/components/Select/FolderPicker';
+import { validationSrv } from 'app/features/manage-dashboards/services/ValidationSrv';
+
+import { DashboardScene } from '../scene/DashboardScene';
+
+import { DashboardChangeInfo, NameAlreadyExistsError, SaveButton, isNameExistsError } from './shared';
+import { useSaveDashboard } from './useSaveDashboard';
+
+interface SaveDashboardAsFormDTO {
+  firstName?: string;
+  title: string;
+  description: string;
+  folder: { uid?: string; title?: string };
+  copyTags: boolean;
+}
+
+export interface Props {
+  dashboard: DashboardScene;
+  changeInfo: DashboardChangeInfo;
+}
+
+export function SaveDashboardAsForm({ dashboard, changeInfo }: Props) {
+  const { changedSaveModel } = changeInfo;
+
+  const { register, handleSubmit, setValue, formState, getValues, watch } = useForm<SaveDashboardAsFormDTO>({
+    mode: 'onBlur',
+    defaultValues: {
+      title: changeInfo.isNew ? changedSaveModel.title! : `${changedSaveModel.title} Copy`,
+      description: changedSaveModel.description ?? '',
+      folder: {
+        uid: dashboard.state.meta.folderUid,
+        title: dashboard.state.meta.folderTitle,
+      },
+      copyTags: false,
+    },
+  });
+
+  const { errors, isValid, defaultValues } = formState;
+  const formValues = watch();
+
+  const { state, onSaveDashboard } = useSaveDashboard(false);
+
+  const onSave = async (overwrite: boolean) => {
+    const data = getValues();
+
+    const dashboardToSave: Dashboard = getSaveAsDashboardSaveModel(changedSaveModel, data, changeInfo.isNew);
+    const result = await onSaveDashboard(dashboard, dashboardToSave, { overwrite, folderUid: data.folder.uid });
+
+    if (result.status === 'success') {
+      dashboard.closeModal();
+    }
+  };
+
+  const cancelButton = (
+    <Button variant="secondary" onClick={() => dashboard.closeModal()} fill="outline">
+      Cancel
+    </Button>
+  );
+
+  const saveButton = (overwrite: boolean) => (
+    <SaveButton isValid={isValid} isLoading={state.loading} onSave={onSave} overwrite={overwrite} />
+  );
+
+  function renderFooter(error?: Error) {
+    if (isNameExistsError(error)) {
+      return <NameAlreadyExistsError cancelButton={cancelButton} saveButton={saveButton} />;
+    }
+
+    return (
+      <>
+        {error && (
+          <Alert title="Failed to save dashboard" severity="error">
+            <p>{error.message}</p>
+          </Alert>
+        )}
+        <Stack alignItems="center">
+          {cancelButton}
+          {saveButton(false)}
+        </Stack>
+      </>
+    );
+  }
+
+  return (
+    <form onSubmit={handleSubmit(() => onSave(false))}>
+      <Field
+        label={<TitleFieldLabel dashboard={changedSaveModel} onChange={setValue} />}
+        invalid={!!errors.title}
+        error={errors.title?.message}
+      >
+        <Input
+          {...register('title', { required: 'Required', validate: validateDashboardName })}
+          aria-label="Save dashboard title field"
+          data-testid={selectors.components.Drawer.DashboardSaveDrawer.saveAsTitleInput}
+          onChange={debounce(async (e: ChangeEvent<HTMLInputElement>) => {
+            setValue('title', e.target.value, { shouldValidate: true });
+          }, 400)}
+        />
+      </Field>
+      <Field
+        label={<DescriptionLabel dashboard={changedSaveModel} onChange={setValue} />}
+        invalid={!!errors.description}
+        error={errors.description?.message}
+      >
+        <TextArea
+          {...register('description', { required: false })}
+          aria-label="Save dashboard description field"
+          autoFocus
+        />
+      </Field>
+
+      <Field label="Folder">
+        <FolderPicker
+          onChange={(uid: string | undefined, title: string | undefined) => setValue('folder', { uid, title })}
+          // Old folder picker fields
+          value={formValues.folder?.uid}
+          initialTitle={defaultValues!.folder!.title}
+          dashboardId={changedSaveModel.id ?? undefined}
+          enableCreateNew
+        />
+      </Field>
+      {!changeInfo.isNew && (
+        <Field label="Copy tags">
+          <Switch {...register('copyTags')} />
+        </Field>
+      )}
+      <Box paddingTop={2}>{renderFooter(state.error)}</Box>
+    </form>
+  );
+}
+
+export interface TitleLabelProps {
+  dashboard: Dashboard;
+  onChange: UseFormSetValue<SaveDashboardAsFormDTO>;
+}
+
+export function TitleFieldLabel(props: TitleLabelProps) {
+  return (
+    <Stack justifyContent="space-between">
+      <Label htmlFor="description">Title</Label>
+      {/* {config.featureToggles.dashgpt && isNew && (
+                <GenAIDashDescriptionButton
+                  onGenerate={(description) => field.onChange(description)}
+                  dashboard={dashboard}
+                />
+              )} */}
+    </Stack>
+  );
+}
+
+export interface DescriptionLabelProps {
+  dashboard: Dashboard;
+  onChange: UseFormSetValue<SaveDashboardAsFormDTO>;
+}
+
+export function DescriptionLabel(props: DescriptionLabelProps) {
+  return (
+    <Stack justifyContent="space-between">
+      <Label htmlFor="description">Description</Label>
+      {/* {config.featureToggles.dashgpt && isNew && (
+                <GenAIDashDescriptionButton
+                  onGenerate={(description) => field.onChange(description)}
+                  dashboard={dashboard}
+                />
+              )} */}
+    </Stack>
+  );
+}
+
+async function validateDashboardName(title: string, formValues: SaveDashboardAsFormDTO) {
+  if (title === formValues.folder.title?.trim()) {
+    return 'Dashboard name cannot be the same as folder name';
+  }
+
+  try {
+    await validationSrv.validateNewDashboardName(formValues.folder.uid ?? 'general', title);
+    return true;
+  } catch (e) {
+    return e instanceof Error ? e.message : 'Dashboard name is invalid';
+  }
+}
+
+function getSaveAsDashboardSaveModel(source: Dashboard, form: SaveDashboardAsFormDTO, isNew?: boolean): Dashboard {
+  // TODO remove old alerts and thresholds when copying (See getSaveAsDashboardClone)
+  return {
+    ...source,
+    id: null,
+    uid: '',
+    title: form.title,
+    description: form.description,
+    tags: isNew || form.copyTags ? source.tags : [],
+  };
+}
diff --git a/public/app/features/dashboard-scene/saving/SaveDashboardDrawer.test.tsx b/public/app/features/dashboard-scene/saving/SaveDashboardDrawer.test.tsx
new file mode 100644
index 0000000000000..9deedbb5fb09e
--- /dev/null
+++ b/public/app/features/dashboard-scene/saving/SaveDashboardDrawer.test.tsx
@@ -0,0 +1,240 @@
+import { screen, render } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { TestProvider } from 'test/helpers/TestProvider';
+
+import { selectors } from '@grafana/e2e-selectors';
+import { sceneGraph, SceneRefreshPicker } from '@grafana/scenes';
+import { SaveDashboardResponseDTO } from 'app/types';
+
+import { transformSaveModelToScene } from '../serialization/transformSaveModelToScene';
+import { transformSceneToSaveModel } from '../serialization/transformSceneToSaveModel';
+
+import { SaveDashboardDrawer } from './SaveDashboardDrawer';
+
+jest.mock('app/features/manage-dashboards/services/ValidationSrv', () => ({
+  validationSrv: {
+    validateNewDashboardName: () => true,
+  },
+}));
+
+const saveDashboardMutationMock = jest.fn();
+
+jest.mock('app/features/browse-dashboards/api/browseDashboardsAPI', () => ({
+  ...jest.requireActual('app/features/browse-dashboards/api/browseDashboardsAPI'),
+  useSaveDashboardMutation: () => [saveDashboardMutationMock],
+}));
+
+describe('SaveDashboardDrawer', () => {
+  describe('Given an already saved dashboard', () => {
+    it('should render save drawer with only message textarea', async () => {
+      setup().openAndRender();
+
+      expect(await screen.findByText('Save dashboard')).toBeInTheDocument();
+      expect(screen.queryByTestId(selectors.pages.SaveDashboardModal.saveTimerange)).not.toBeInTheDocument();
+      expect(screen.getByText('No changes to save')).toBeInTheDocument();
+      expect(screen.queryByLabelText('Tab Changes')).not.toBeInTheDocument();
+    });
+
+    it('When there are no changes', async () => {
+      setup().openAndRender();
+      expect(screen.getByText('No changes to save')).toBeInTheDocument();
+    });
+
+    it('When time range changed show save time range option', async () => {
+      const { dashboard, openAndRender } = setup();
+
+      sceneGraph.getTimeRange(dashboard).setState({ from: 'now-1h', to: 'now' });
+
+      openAndRender();
+
+      expect(await screen.findByText('Save dashboard')).toBeInTheDocument();
+      expect(screen.queryByTestId(selectors.pages.SaveDashboardModal.saveTimerange)).toBeInTheDocument();
+    });
+
+    it('Should update diff when including time range is', async () => {
+      const { dashboard, openAndRender } = setup();
+
+      sceneGraph.getTimeRange(dashboard).setState({ from: 'now-1h', to: 'now' });
+
+      openAndRender();
+
+      expect(await screen.findByText('Save dashboard')).toBeInTheDocument();
+      expect(screen.queryByTestId(selectors.pages.SaveDashboardModal.saveTimerange)).toBeInTheDocument();
+      expect(screen.queryByLabelText('Tab Changes')).not.toBeInTheDocument();
+
+      await userEvent.click(screen.getByTestId(selectors.pages.SaveDashboardModal.saveTimerange));
+
+      expect(await screen.findByLabelText('Tab Changes')).toBeInTheDocument();
+    });
+
+    it('When refresh changed show save refresh option', async () => {
+      const { dashboard, openAndRender } = setup();
+
+      const refreshPicker = sceneGraph.findObject(dashboard, (obj) => obj instanceof SceneRefreshPicker);
+      if (refreshPicker instanceof SceneRefreshPicker) {
+        refreshPicker.setState({ refresh: '5s' });
+      }
+
+      openAndRender();
+
+      expect(await screen.findByText('Save dashboard')).toBeInTheDocument();
+      expect(screen.queryByTestId(selectors.pages.SaveDashboardModal.saveRefresh)).toBeInTheDocument();
+    });
+
+    it('Should update diff when including time range is', async () => {
+      const { dashboard, openAndRender } = setup();
+
+      const refreshPicker = sceneGraph.findObject(dashboard, (obj) => obj instanceof SceneRefreshPicker);
+      if (refreshPicker instanceof SceneRefreshPicker) {
+        refreshPicker.setState({ refresh: '5s' });
+      }
+
+      openAndRender();
+
+      expect(await screen.findByText('Save dashboard')).toBeInTheDocument();
+      expect(screen.getByTestId(selectors.pages.SaveDashboardModal.saveRefresh)).toBeInTheDocument();
+      expect(screen.queryByLabelText('Tab Changes')).not.toBeInTheDocument();
+
+      await userEvent.click(screen.getByTestId(selectors.pages.SaveDashboardModal.saveRefresh));
+
+      expect(await screen.findByLabelText('Tab Changes')).toBeInTheDocument();
+    });
+
+    it('Can show changes', async () => {
+      const { dashboard, openAndRender } = setup();
+
+      dashboard.setState({ title: 'New title' });
+
+      openAndRender();
+
+      await userEvent.click(await screen.findByLabelText('Tab Changes'));
+
+      expect(await screen.findByText('Full JSON diff')).toBeInTheDocument();
+    });
+
+    it('Can save', async () => {
+      const { dashboard, openAndRender } = setup();
+
+      dashboard.setState({ title: 'New title' });
+
+      openAndRender();
+
+      mockSaveDashboard();
+
+      await userEvent.click(await screen.findByTestId(selectors.components.Drawer.DashboardSaveDrawer.saveButton));
+
+      const dataSent = saveDashboardMutationMock.mock.calls[0][0];
+      expect(dataSent.dashboard.title).toEqual('New title');
+      expect(dashboard.state.version).toEqual(11);
+      expect(dashboard.state.uid).toEqual('my-uid-from-resp');
+      expect(dashboard.state.isDirty).toEqual(false);
+    });
+
+    it('Can handle save errors and overwrite', async () => {
+      const { dashboard, openAndRender } = setup();
+
+      dashboard.setState({ title: 'New title' });
+
+      openAndRender();
+
+      mockSaveDashboard({ saveError: 'version-mismatch' });
+
+      await userEvent.click(await screen.findByTestId(selectors.components.Drawer.DashboardSaveDrawer.saveButton));
+
+      expect(await screen.findByText('Someone else has updated this dashboard')).toBeInTheDocument();
+      expect(await screen.findByText('Save and overwrite')).toBeInTheDocument();
+
+      // Now save and overwrite
+      await userEvent.click(await screen.findByTestId(selectors.components.Drawer.DashboardSaveDrawer.saveButton));
+
+      const dataSent = saveDashboardMutationMock.mock.calls[1][0];
+      expect(dataSent.overwrite).toEqual(true);
+    });
+  });
+
+  describe('Save as copy', () => {
+    it('Should show save as form', async () => {
+      const { openAndRender } = setup();
+      openAndRender(true);
+
+      expect(await screen.findByText('Save dashboard copy')).toBeInTheDocument();
+
+      mockSaveDashboard();
+
+      await userEvent.click(await screen.findByTestId(selectors.components.Drawer.DashboardSaveDrawer.saveButton));
+
+      const dataSent = saveDashboardMutationMock.mock.calls[0][0];
+      expect(dataSent.dashboard.uid).toEqual('');
+    });
+  });
+});
+
+interface MockBackendApiOptions {
+  saveError: 'version-mismatch' | 'name-exists' | 'plugin-dashboard';
+}
+
+function mockSaveDashboard(options: Partial<MockBackendApiOptions> = {}) {
+  saveDashboardMutationMock.mockClear();
+
+  if (options.saveError) {
+    saveDashboardMutationMock.mockResolvedValue({
+      error: { status: 412, data: { status: 'version-mismatch', message: 'sad face' } },
+    });
+
+    return;
+  }
+
+  saveDashboardMutationMock.mockResolvedValue({
+    data: {
+      id: 10,
+      uid: 'my-uid-from-resp',
+      slug: 'my-slug-from-resp',
+      status: 'success',
+      url: 'my-url',
+      version: 11,
+      ...options,
+    } as SaveDashboardResponseDTO,
+  });
+}
+
+let cleanUp = () => {};
+
+function setup() {
+  const dashboard = transformSaveModelToScene({
+    dashboard: {
+      title: 'hello',
+      uid: 'my-uid',
+      schemaVersion: 30,
+      panels: [],
+      version: 10,
+    },
+    meta: {},
+  });
+
+  // Clear any data layers
+  dashboard.setState({ $data: undefined });
+
+  const initialSaveModel = transformSceneToSaveModel(dashboard);
+  dashboard.setInitialSaveModel(initialSaveModel);
+
+  cleanUp();
+  cleanUp = dashboard.activate();
+
+  dashboard.onEnterEditMode();
+
+  const openAndRender = (saveAsCopy?: boolean) => {
+    dashboard.openSaveDrawer({ saveAsCopy });
+    const drawer = dashboard.state.overlay as SaveDashboardDrawer;
+    render(
+      <TestProvider>
+        <drawer.Component model={drawer} />
+      </TestProvider>
+    );
+
+    return drawer;
+  };
+
+  //  await act(() => Promise.resolve());
+  return { dashboard, openAndRender };
+}
diff --git a/public/app/features/dashboard-scene/saving/SaveDashboardDrawer.tsx b/public/app/features/dashboard-scene/saving/SaveDashboardDrawer.tsx
new file mode 100644
index 0000000000000..9e25e914f07fc
--- /dev/null
+++ b/public/app/features/dashboard-scene/saving/SaveDashboardDrawer.tsx
@@ -0,0 +1,107 @@
+import React from 'react';
+
+import { SceneComponentProps, SceneObjectBase, SceneObjectState, SceneObjectRef } from '@grafana/scenes';
+import { Drawer, Tab, TabsBar } from '@grafana/ui';
+import { SaveDashboardDiff } from 'app/features/dashboard/components/SaveDashboard/SaveDashboardDiff';
+
+import { DashboardScene } from '../scene/DashboardScene';
+
+import { SaveDashboardAsForm } from './SaveDashboardAsForm';
+import { SaveDashboardForm } from './SaveDashboardForm';
+import { SaveProvisionedDashboardForm } from './SaveProvisionedDashboardForm';
+import { getDashboardChangesFromScene } from './getDashboardChangesFromScene';
+
+interface SaveDashboardDrawerState extends SceneObjectState {
+  dashboardRef: SceneObjectRef<DashboardScene>;
+  showDiff?: boolean;
+  saveTimeRange?: boolean;
+  saveVariables?: boolean;
+  saveRefresh?: boolean;
+  saveAsCopy?: boolean;
+  onSaveSuccess?: () => void;
+}
+
+export class SaveDashboardDrawer extends SceneObjectBase<SaveDashboardDrawerState> {
+  public onClose = () => {
+    this.state.dashboardRef.resolve().setState({ overlay: undefined });
+  };
+
+  public onToggleSaveTimeRange = () => {
+    this.setState({ saveTimeRange: !this.state.saveTimeRange });
+  };
+
+  public onToggleSaveVariables = () => {
+    this.setState({ saveVariables: !this.state.saveVariables });
+  };
+
+  public onToggleSaveRefresh = () => {
+    this.setState({ saveRefresh: !this.state.saveRefresh });
+  };
+
+  static Component = ({ model }: SceneComponentProps<SaveDashboardDrawer>) => {
+    const { showDiff, saveAsCopy, saveTimeRange, saveVariables, saveRefresh } = model.useState();
+    const changeInfo = getDashboardChangesFromScene(
+      model.state.dashboardRef.resolve(),
+      saveTimeRange,
+      saveVariables,
+      saveRefresh
+    );
+    const { changedSaveModel, initialSaveModel, diffs, diffCount, hasFolderChanges } = changeInfo;
+    const changesCount = diffCount + (hasFolderChanges ? 1 : 0);
+    const dashboard = model.state.dashboardRef.resolve();
+    const { meta } = dashboard.useState();
+    const { provisioned: isProvisioned, folderTitle } = meta;
+
+    const tabs = (
+      <TabsBar>
+        <Tab label={'Details'} active={!showDiff} onChangeTab={() => model.setState({ showDiff: false })} />
+        {changesCount > 0 && (
+          <Tab
+            label={'Changes'}
+            active={showDiff}
+            onChangeTab={() => model.setState({ showDiff: true })}
+            counter={changesCount}
+          />
+        )}
+      </TabsBar>
+    );
+
+    let title = 'Save dashboard';
+    if (saveAsCopy) {
+      title = 'Save dashboard copy';
+    } else if (isProvisioned) {
+      title = 'Provisioned dashboard';
+    }
+
+    const renderBody = () => {
+      if (showDiff) {
+        return (
+          <SaveDashboardDiff
+            diff={diffs}
+            oldValue={initialSaveModel}
+            newValue={changedSaveModel}
+            hasFolderChanges={hasFolderChanges}
+            oldFolder={dashboard.getInitialState()?.meta.folderTitle}
+            newFolder={folderTitle}
+          />
+        );
+      }
+
+      if (saveAsCopy || changeInfo.isNew) {
+        return <SaveDashboardAsForm dashboard={dashboard} changeInfo={changeInfo} />;
+      }
+
+      if (isProvisioned) {
+        return <SaveProvisionedDashboardForm dashboard={dashboard} changeInfo={changeInfo} drawer={model} />;
+      }
+
+      return <SaveDashboardForm dashboard={dashboard} changeInfo={changeInfo} drawer={model} />;
+    };
+
+    return (
+      <Drawer title={title} subtitle={dashboard.state.title} onClose={model.onClose} tabs={tabs}>
+        {renderBody()}
+      </Drawer>
+    );
+  };
+}
diff --git a/public/app/features/dashboard-scene/saving/SaveDashboardForm.tsx b/public/app/features/dashboard-scene/saving/SaveDashboardForm.tsx
new file mode 100644
index 0000000000000..2ebef87618d61
--- /dev/null
+++ b/public/app/features/dashboard-scene/saving/SaveDashboardForm.tsx
@@ -0,0 +1,169 @@
+import React, { useState } from 'react';
+
+import { selectors } from '@grafana/e2e-selectors';
+import { Button, Checkbox, TextArea, Stack, Alert, Box, Field } from '@grafana/ui';
+import { SaveDashboardOptions } from 'app/features/dashboard/components/SaveDashboard/types';
+
+import { DashboardScene } from '../scene/DashboardScene';
+
+import { SaveDashboardDrawer } from './SaveDashboardDrawer';
+import {
+  DashboardChangeInfo,
+  NameAlreadyExistsError,
+  SaveButton,
+  isNameExistsError,
+  isPluginDashboardError,
+  isVersionMismatchError,
+} from './shared';
+import { useSaveDashboard } from './useSaveDashboard';
+
+export interface Props {
+  dashboard: DashboardScene;
+  drawer: SaveDashboardDrawer;
+  changeInfo: DashboardChangeInfo;
+}
+
+export function SaveDashboardForm({ dashboard, drawer, changeInfo }: Props) {
+  const { changedSaveModel, hasChanges } = changeInfo;
+
+  const { state, onSaveDashboard } = useSaveDashboard(false);
+  const [options, setOptions] = useState<SaveDashboardOptions>({
+    folderUid: dashboard.state.meta.folderUid,
+  });
+
+  const onSave = async (overwrite: boolean) => {
+    const result = await onSaveDashboard(dashboard, changedSaveModel, { ...options, overwrite });
+    if (result.status === 'success') {
+      dashboard.closeModal();
+      drawer.state.onSaveSuccess?.();
+    }
+  };
+
+  const cancelButton = (
+    <Button variant="secondary" onClick={() => dashboard.closeModal()} fill="outline">
+      Cancel
+    </Button>
+  );
+
+  const saveButton = (overwrite: boolean) => (
+    <SaveButton isValid={hasChanges} isLoading={state.loading} onSave={onSave} overwrite={overwrite} />
+  );
+
+  function renderFooter(error?: Error) {
+    if (isVersionMismatchError(error)) {
+      return (
+        <Alert title="Someone else has updated this dashboard" severity="error">
+          <p>Would you still like to save this dashboard?</p>
+          <Box paddingTop={2}>
+            <Stack alignItems="center">
+              {cancelButton}
+              {saveButton(true)}
+            </Stack>
+          </Box>
+        </Alert>
+      );
+    }
+
+    if (isNameExistsError(error)) {
+      return <NameAlreadyExistsError cancelButton={cancelButton} saveButton={saveButton} />;
+    }
+
+    if (isPluginDashboardError(error)) {
+      return (
+        <Alert title="Plugin dashboard" severity="error">
+          <p>
+            Your changes will be lost when you update the plugin. Use <strong>Save As</strong> to create custom version.
+          </p>
+          <Box paddingTop={2}>
+            <Stack alignItems="center">
+              {cancelButton}
+              {saveButton(true)}
+            </Stack>
+          </Box>
+        </Alert>
+      );
+    }
+
+    return (
+      <>
+        {error && (
+          <Alert title="Failed to save dashboard" severity="error">
+            <p>{error.message}</p>
+          </Alert>
+        )}
+        <Stack alignItems="center">
+          {cancelButton}
+          {saveButton(false)}
+          {!hasChanges && <div>No changes to save</div>}
+        </Stack>
+      </>
+    );
+  }
+
+  return (
+    <Stack gap={0} direction="column">
+      <SaveDashboardFormCommonOptions drawer={drawer} changeInfo={changeInfo} />
+      <Field label="Message">
+        <TextArea
+          aria-label="message"
+          value={options.message ?? ''}
+          onChange={(e) => {
+            setOptions({
+              ...options,
+              message: e.currentTarget.value,
+            });
+          }}
+          placeholder="Add a note to describe your changes (optional)."
+          autoFocus
+          rows={5}
+        />
+      </Field>
+      <Box paddingTop={2}>{renderFooter(state.error)}</Box>
+    </Stack>
+  );
+}
+
+export interface SaveDashboardFormCommonOptionsProps {
+  drawer: SaveDashboardDrawer;
+  changeInfo: DashboardChangeInfo;
+}
+
+export function SaveDashboardFormCommonOptions({ drawer, changeInfo }: SaveDashboardFormCommonOptionsProps) {
+  const { saveVariables = false, saveTimeRange = false, saveRefresh = false } = drawer.useState();
+  const { hasTimeChanges, hasVariableValueChanges, hasRefreshChange } = changeInfo;
+
+  return (
+    <>
+      {hasTimeChanges && (
+        <Field label="Update default time range" description="Will make current time range the new default">
+          <Checkbox
+            id="save-timerange"
+            checked={saveTimeRange}
+            onChange={drawer.onToggleSaveTimeRange}
+            data-testid={selectors.pages.SaveDashboardModal.saveTimerange}
+          />
+        </Field>
+      )}
+      {hasRefreshChange && (
+        <Field label="Update default refresh value" description="Will make the current refresh the new default">
+          <Checkbox
+            id="save-refresh"
+            checked={saveRefresh}
+            onChange={drawer.onToggleSaveRefresh}
+            data-testid={selectors.pages.SaveDashboardModal.saveRefresh}
+          />
+        </Field>
+      )}
+      {hasVariableValueChanges && (
+        <Field label="Update default variable values" description="Will make the current values the new default">
+          <Checkbox
+            id="save-variables"
+            checked={saveVariables}
+            onChange={drawer.onToggleSaveVariables}
+            data-testid={selectors.pages.SaveDashboardModal.saveVariables}
+          />
+        </Field>
+      )}
+    </>
+  );
+}
diff --git a/public/app/features/dashboard-scene/saving/SaveProvisionedDashboardForm.tsx b/public/app/features/dashboard-scene/saving/SaveProvisionedDashboardForm.tsx
new file mode 100644
index 0000000000000..ded8752360007
--- /dev/null
+++ b/public/app/features/dashboard-scene/saving/SaveProvisionedDashboardForm.tsx
@@ -0,0 +1,97 @@
+import { css } from '@emotion/css';
+import { saveAs } from 'file-saver';
+import React, { useCallback, useMemo } from 'react';
+import AutoSizer from 'react-virtualized-auto-sizer';
+
+import { Button, ClipboardButton, Stack, CodeEditor, Box } from '@grafana/ui';
+
+import { DashboardScene } from '../scene/DashboardScene';
+
+import { SaveDashboardDrawer } from './SaveDashboardDrawer';
+import { SaveDashboardFormCommonOptions } from './SaveDashboardForm';
+import { DashboardChangeInfo } from './shared';
+
+export interface Props {
+  dashboard: DashboardScene;
+  drawer: SaveDashboardDrawer;
+  changeInfo: DashboardChangeInfo;
+}
+
+export function SaveProvisionedDashboardForm({ dashboard, drawer, changeInfo }: Props) {
+  const dashboardJSON = useMemo(() => JSON.stringify(changeInfo.changedSaveModel, null, 2), [changeInfo]);
+
+  const saveToFile = useCallback(() => {
+    const blob = new Blob([dashboardJSON], {
+      type: 'application/json;charset=utf-8',
+    });
+    saveAs(blob, changeInfo.changedSaveModel.title + '-' + new Date().getTime() + '.json');
+  }, [changeInfo.changedSaveModel, dashboardJSON]);
+
+  return (
+    <div className={styles.container}>
+      <Stack direction="column" gap={2} grow={1}>
+        <div>
+          This dashboard cannot be saved from the Grafana UI because it has been provisioned from another source. Copy
+          the JSON or save it to a file below, then you can update your dashboard in the provisioning source.
+          <br />
+          <i>
+            See{' '}
+            <a
+              className="external-link"
+              href="https://grafana.com/docs/grafana/latest/administration/provisioning/#dashboards"
+              target="_blank"
+              rel="noreferrer"
+            >
+              documentation
+            </a>{' '}
+            for more information about provisioning.
+          </i>
+          <br /> <br />
+          <strong>File path: </strong> {dashboard.state.meta.provisionedExternalId}
+        </div>
+        <Stack direction="column" gap={0}>
+          <SaveDashboardFormCommonOptions drawer={drawer} changeInfo={changeInfo} />
+        </Stack>
+        <div className={styles.json}>
+          <AutoSizer disableWidth>
+            {({ height }) => (
+              <CodeEditor
+                width="100%"
+                height={height}
+                language="json"
+                showLineNumbers={true}
+                showMiniMap={dashboardJSON.length > 100}
+                value={dashboardJSON}
+                readOnly={true}
+              />
+            )}
+          </AutoSizer>
+        </div>
+        <Box paddingTop={2}>
+          <Stack gap={2}>
+            <Button variant="secondary" onClick={drawer.onClose} fill="outline">
+              Cancel
+            </Button>
+            <ClipboardButton icon="copy" getText={() => dashboardJSON}>
+              Copy JSON to clipboard
+            </ClipboardButton>
+            <Button type="submit" onClick={saveToFile}>
+              Save JSON to file
+            </Button>
+          </Stack>
+        </Box>
+      </Stack>
+    </div>
+  );
+}
+
+const styles = {
+  container: css({
+    height: '100%',
+    display: 'flex',
+  }),
+  json: css({
+    flexGrow: 1,
+    maxHeight: '800px',
+  }),
+};
diff --git a/public/app/features/dashboard-scene/saving/__mocks__/createDetectChangesWorker.ts b/public/app/features/dashboard-scene/saving/__mocks__/createDetectChangesWorker.ts
new file mode 100644
index 0000000000000..746a759c558d1
--- /dev/null
+++ b/public/app/features/dashboard-scene/saving/__mocks__/createDetectChangesWorker.ts
@@ -0,0 +1,19 @@
+const worker = {
+  postMessage: jest.fn(),
+  onmessage: jest.fn(),
+  terminate: jest.fn(),
+};
+
+jest.mocked(worker.postMessage).mockImplementation(() => {
+  worker.onmessage?.({
+    data: {
+      hasChanges: true,
+      hasTimeChanges: true,
+      hasVariableValueChanges: true,
+    },
+  } as unknown as MessageEvent);
+});
+
+const createWorker = () => worker;
+
+export { createWorker };
diff --git a/public/app/features/dashboard-scene/saving/createDetectChangesWorker.ts b/public/app/features/dashboard-scene/saving/createDetectChangesWorker.ts
new file mode 100644
index 0000000000000..f2a835fbf5ec7
--- /dev/null
+++ b/public/app/features/dashboard-scene/saving/createDetectChangesWorker.ts
@@ -0,0 +1,3 @@
+import { CorsWorker as Worker } from 'app/core/utils/CorsWorker';
+
+export const createWorker = () => new Worker(new URL('./DetectChangesWorker.ts', import.meta.url));
diff --git a/public/app/features/dashboard-scene/saving/getDashboardChanges.test.ts b/public/app/features/dashboard-scene/saving/getDashboardChanges.test.ts
new file mode 100644
index 0000000000000..1820d71733f13
--- /dev/null
+++ b/public/app/features/dashboard-scene/saving/getDashboardChanges.test.ts
@@ -0,0 +1,423 @@
+import { Dashboard, Panel } from '@grafana/schema';
+
+import { getDashboardChanges, getPanelChanges } from './getDashboardChanges';
+
+describe('getDashboardChanges', () => {
+  const initial: Dashboard = {
+    id: 1,
+    title: 'Dashboard 1',
+    time: {
+      from: 'now-7d',
+      to: 'now',
+    },
+    refresh: '1h',
+    version: 1,
+    schemaVersion: 1,
+    templating: {
+      list: [
+        {
+          name: 'var1',
+          type: 'query',
+          query: 'query1',
+          current: {
+            value: 'value1',
+            text: 'text1',
+          },
+          options: [],
+        },
+      ],
+    },
+  };
+  it('should return the correct result when no changes', () => {
+    const changed = { ...initial };
+
+    const expectedChanges = {
+      initialSaveModel: {
+        ...initial,
+      },
+      changedSaveModel: {
+        ...changed,
+      },
+      diffs: {},
+      diffCount: 0,
+      hasChanges: false,
+      hasTimeChanges: false,
+      isNew: false,
+      hasVariableValueChanges: false,
+      hasRefreshChange: false,
+    };
+
+    const result = getDashboardChanges(initial, changed, false, false, false);
+
+    expect(result).toEqual(expectedChanges);
+  });
+
+  it('should return the correct result when is new', () => {
+    const newDashInitial = {
+      ...initial,
+      version: 0,
+    };
+    const changed = {
+      ...newDashInitial,
+      version: 0,
+    };
+
+    const expectedChanges = {
+      changedSaveModel: {
+        ...newDashInitial,
+      },
+      initialSaveModel: {
+        ...changed,
+      },
+      diffs: {},
+      diffCount: 0,
+      hasChanges: false,
+      hasTimeChanges: false,
+      isNew: true,
+      hasVariableValueChanges: false,
+      hasRefreshChange: false,
+    };
+
+    const result = getDashboardChanges(newDashInitial, changed, false, false, false);
+
+    expect(result).toEqual(expectedChanges);
+  });
+
+  it('should return the correct result when the time changes but they are not preserved', () => {
+    const changed = {
+      ...initial,
+      time: {
+        from: 'now-1d',
+        to: 'now',
+      },
+    };
+
+    const expectedChanges = {
+      initialSaveModel: {
+        ...initial,
+      },
+      changedSaveModel: {
+        ...initial,
+      },
+      diffs: {},
+      diffCount: 0,
+      hasChanges: false,
+      hasTimeChanges: true,
+      isNew: false,
+      hasVariableValueChanges: false,
+      hasRefreshChange: false,
+    };
+
+    const result = getDashboardChanges(initial, changed, false, false, false);
+
+    expect(result).toEqual(expectedChanges);
+  });
+
+  it('should return the correct result when the time changes and they are preserved', () => {
+    const changed = {
+      ...initial,
+      time: {
+        from: 'now-1d',
+        to: 'now',
+      },
+    };
+
+    const expectedChanges = {
+      initialSaveModel: {
+        ...initial,
+      },
+      changedSaveModel: {
+        ...changed,
+      },
+      diffs: {
+        time: [
+          {
+            endLineNumber: expect.any(Number),
+            op: 'replace',
+            originalValue: 'now-7d',
+            path: ['time', 'from'],
+            startLineNumber: expect.any(Number),
+            value: 'now-1d',
+          },
+        ],
+      },
+      diffCount: 1,
+      hasChanges: true,
+      hasTimeChanges: true,
+      isNew: false,
+      hasVariableValueChanges: false,
+      hasRefreshChange: false,
+    };
+
+    const result = getDashboardChanges(initial, changed, true, false, false);
+
+    expect(result).toEqual(expectedChanges);
+  });
+
+  it('should return the correct result when the refresh changes but it is not preserved', () => {
+    const changed = {
+      ...initial,
+      refresh: '2h',
+    };
+
+    const expectedChanges = {
+      initialSaveModel: {
+        ...initial,
+      },
+      changedSaveModel: {
+        ...initial,
+      },
+      diffs: {},
+      diffCount: 0,
+      hasChanges: false,
+      hasTimeChanges: false,
+      isNew: false,
+      hasVariableValueChanges: false,
+      hasRefreshChange: true,
+    };
+
+    const result = getDashboardChanges(initial, changed, false, false, false);
+
+    expect(result).toEqual(expectedChanges);
+  });
+
+  it('should return the correct result when the refresh changes and it is preserved', () => {
+    const changed = {
+      ...initial,
+      refresh: '2h',
+    };
+
+    const expectedChanges = {
+      initialSaveModel: {
+        ...initial,
+      },
+      changedSaveModel: {
+        ...changed,
+      },
+      diffs: {
+        refresh: [
+          {
+            endLineNumber: expect.any(Number),
+            op: 'replace',
+            originalValue: '1h',
+            path: ['refresh'],
+            startLineNumber: expect.any(Number),
+            value: '2h',
+          },
+        ],
+      },
+      diffCount: 1,
+      hasChanges: true,
+      hasTimeChanges: false,
+      isNew: false,
+      hasVariableValueChanges: false,
+      hasRefreshChange: true,
+    };
+
+    const result = getDashboardChanges(initial, changed, false, false, true);
+
+    expect(result).toEqual(expectedChanges);
+  });
+
+  it('should return the correct result when the variable value changes but it is not preserved', () => {
+    const changed = {
+      ...initial,
+      templating: {
+        list: [
+          {
+            name: 'var1',
+            type: 'query',
+            query: 'query1',
+            current: {
+              value: 'value2',
+              text: 'text1',
+            },
+            options: [],
+          },
+        ],
+      },
+    } as Dashboard;
+
+    const expectedChanges = {
+      initialSaveModel: {
+        ...initial,
+      },
+      changedSaveModel: {
+        ...initial,
+      },
+      diffs: {},
+      diffCount: 0,
+      hasChanges: false,
+      hasTimeChanges: false,
+      isNew: false,
+      hasVariableValueChanges: true,
+      hasRefreshChange: false,
+    };
+
+    const result = getDashboardChanges(initial, changed, false, false, false);
+
+    expect(result).toEqual(expectedChanges);
+  });
+
+  it('should return the correct result when the variable value changes', () => {
+    const changed = {
+      ...initial,
+      templating: {
+        list: [
+          {
+            name: 'var1',
+            type: 'query',
+            query: 'query1',
+            current: {
+              value: 'value2',
+              text: 'text1',
+            },
+            options: [],
+          },
+        ],
+      },
+    } as Dashboard;
+
+    const expectedChanges = {
+      initialSaveModel: {
+        ...initial,
+      },
+      changedSaveModel: {
+        ...changed,
+      },
+      diffs: {
+        templating: [
+          {
+            endLineNumber: 17,
+            op: 'replace',
+            originalValue: 'value1',
+            path: ['templating', 'list', '0', 'current', 'value'],
+            startLineNumber: 17,
+            value: 'value2',
+          },
+        ],
+      },
+      diffCount: 1,
+      hasChanges: true,
+      hasTimeChanges: false,
+      isNew: false,
+      hasVariableValueChanges: true,
+      hasRefreshChange: false,
+    };
+
+    const result = getDashboardChanges(initial, changed, false, true, false);
+
+    expect(result).toEqual(expectedChanges);
+  });
+});
+
+describe('getPanelChanges', () => {
+  const initial: Panel = {
+    id: 1,
+    type: 'graph',
+    title: 'Panel 1',
+    gridPos: {
+      x: 0,
+      y: 0,
+      w: 12,
+      h: 8,
+    },
+    targets: [
+      {
+        refId: 'A',
+        query: 'query1',
+      },
+    ],
+  };
+
+  it('should return the correct result when no changes', () => {
+    const changed = { ...initial };
+
+    const expectedChanges = {
+      initialSaveModel: {
+        ...initial,
+      },
+      changedSaveModel: {
+        ...changed,
+      },
+      diffs: {},
+      diffCount: 0,
+      hasChanges: false,
+    };
+
+    expect(getPanelChanges(initial, changed)).toEqual(expectedChanges);
+  });
+
+  it('should return the correct result when there is some changes', () => {
+    const changed = {
+      ...initial,
+      title: 'Panel 2',
+      type: 'table',
+      gridPos: {
+        ...initial.gridPos,
+        x: 1,
+      },
+      targets: [
+        {
+          refId: 'A',
+          query: 'query2',
+        },
+      ],
+    } as Panel;
+
+    const expectedChanges = {
+      initialSaveModel: {
+        ...initial,
+      },
+      changedSaveModel: {
+        ...changed,
+      },
+      diffs: {
+        title: [
+          {
+            endLineNumber: 3,
+            op: 'replace',
+            originalValue: 'Panel 1',
+            path: ['title'],
+            startLineNumber: 3,
+            value: 'Panel 2',
+          },
+        ],
+        type: [
+          {
+            endLineNumber: 2,
+            op: 'replace',
+            originalValue: 'graph',
+            path: ['type'],
+            startLineNumber: 2,
+            value: 'table',
+          },
+        ],
+        gridPos: [
+          {
+            endLineNumber: 5,
+            op: 'replace',
+            originalValue: 0,
+            path: ['gridPos', 'x'],
+            startLineNumber: 5,
+            value: 1,
+          },
+        ],
+        targets: [
+          {
+            endLineNumber: 13,
+            op: 'replace',
+            originalValue: 'query1',
+            path: ['targets', '0', 'query'],
+            startLineNumber: 13,
+            value: 'query2',
+          },
+        ],
+      },
+      diffCount: 4,
+      hasChanges: true,
+    };
+
+    expect(getPanelChanges(changed, initial)).toEqual(expectedChanges);
+  });
+});
diff --git a/public/app/features/dashboard-scene/saving/getDashboardChanges.ts b/public/app/features/dashboard-scene/saving/getDashboardChanges.ts
new file mode 100644
index 0000000000000..74c71be1b5c9b
--- /dev/null
+++ b/public/app/features/dashboard-scene/saving/getDashboardChanges.ts
@@ -0,0 +1,120 @@
+// @ts-ignore
+import jsonMap from 'json-source-map';
+
+import type { AdHocVariableModel, TypedVariableModel } from '@grafana/data';
+import { Dashboard, Panel, VariableOption } from '@grafana/schema';
+
+import { jsonDiff } from '../settings/version-history/utils';
+
+export function get(obj: any, keys: string[]) {
+  try {
+    let val = obj;
+    for (const key of keys) {
+      val = val[key];
+    }
+    return val;
+  } catch (err) {
+    return undefined;
+  }
+}
+
+export function deepEqual(a: string | string[], b: string | string[]) {
+  return (
+    typeof a === typeof b &&
+    ((typeof a === 'string' && a === b) ||
+      (Array.isArray(a) && a.length === b.length && a.every((val, i) => val === b[i])))
+  );
+}
+
+export function isEqual(a: VariableOption | undefined, b: VariableOption | undefined) {
+  return a === b || (a && b && a.selected === b.selected && deepEqual(a.text, b.text) && deepEqual(a.value, b.value));
+}
+
+export function getDashboardChanges(
+  initial: Dashboard,
+  changed: Dashboard,
+  saveTimeRange?: boolean,
+  saveVariables?: boolean,
+  saveRefresh?: boolean
+) {
+  const initialSaveModel = initial;
+  const changedSaveModel = changed;
+  const hasTimeChanged = getHasTimeChanged(changedSaveModel, initialSaveModel);
+  const hasVariableValueChanges = applyVariableChanges(changedSaveModel, initialSaveModel, saveVariables);
+  const hasRefreshChanged = changedSaveModel.refresh !== initialSaveModel.refresh;
+
+  if (!saveTimeRange) {
+    changedSaveModel.time = initialSaveModel.time;
+  }
+
+  if (!saveRefresh) {
+    changedSaveModel.refresh = initialSaveModel.refresh;
+  }
+
+  const diff = jsonDiff(initialSaveModel, changedSaveModel);
+  const diffCount = Object.values(diff).reduce((acc, cur) => acc + cur.length, 0);
+
+  return {
+    changedSaveModel,
+    initialSaveModel,
+    diffs: diff,
+    diffCount,
+    hasChanges: diffCount > 0,
+    hasTimeChanges: hasTimeChanged,
+    isNew: changedSaveModel.version === 0,
+    hasVariableValueChanges,
+    hasRefreshChange: hasRefreshChanged,
+  };
+}
+
+export function getHasTimeChanged(saveModel: Dashboard, originalSaveModel: Dashboard) {
+  return saveModel.time?.from !== originalSaveModel.time?.from || saveModel.time?.to !== originalSaveModel.time?.to;
+}
+
+export function applyVariableChanges(saveModel: Dashboard, originalSaveModel: Dashboard, saveVariables?: boolean) {
+  const originalVariables = originalSaveModel.templating?.list ?? [];
+  const variablesToSave = saveModel.templating?.list ?? [];
+  let hasVariableValueChanges = false;
+
+  for (const variable of variablesToSave) {
+    const original = originalVariables.find(({ name, type }) => name === variable.name && type === variable.type);
+
+    if (!original) {
+      continue;
+    }
+
+    // Old schema property that never should be in persisted model
+    if (original.current) {
+      delete original.current.selected;
+    }
+
+    if (!isEqual(variable.current, original.current)) {
+      hasVariableValueChanges = true;
+    }
+
+    if (!saveVariables) {
+      const typed = variable as TypedVariableModel;
+      if (typed.type === 'adhoc') {
+        typed.filters = (original as AdHocVariableModel).filters;
+      } else if (typed.type !== 'groupby') {
+        variable.current = original.current;
+        variable.options = original.options;
+      }
+    }
+  }
+
+  return hasVariableValueChanges;
+}
+
+export function getPanelChanges(saveModel: Panel, originalSaveModel: Panel) {
+  const diff = jsonDiff(originalSaveModel, saveModel);
+  const diffCount = Object.values(diff).reduce((acc, cur) => acc + cur.length, 0);
+
+  return {
+    changedSaveModel: saveModel,
+    initialSaveModel: originalSaveModel,
+    diffs: diff,
+    diffCount,
+    hasChanges: diffCount > 0,
+  };
+}
diff --git a/public/app/features/dashboard-scene/saving/getDashboardChangesFromScene.test.ts b/public/app/features/dashboard-scene/saving/getDashboardChangesFromScene.test.ts
new file mode 100644
index 0000000000000..6eaef939d75fd
--- /dev/null
+++ b/public/app/features/dashboard-scene/saving/getDashboardChangesFromScene.test.ts
@@ -0,0 +1,288 @@
+import { config } from '@grafana/runtime';
+import {
+  AdHocFiltersVariable,
+  GroupByVariable,
+  MultiValueVariable,
+  sceneGraph,
+  SceneRefreshPicker,
+} from '@grafana/scenes';
+import { VariableModel } from '@grafana/schema';
+
+import { buildPanelEditScene } from '../panel-edit/PanelEditor';
+import { transformSaveModelToScene } from '../serialization/transformSaveModelToScene';
+import { transformSceneToSaveModel } from '../serialization/transformSceneToSaveModel';
+import { findVizPanelByKey } from '../utils/utils';
+
+import { getDashboardChangesFromScene } from './getDashboardChangesFromScene';
+
+describe('getDashboardChangesFromScene', () => {
+  it('Can detect no changes', () => {
+    const dashboard = setup();
+    const result = getDashboardChangesFromScene(dashboard, false);
+    expect(result.hasChanges).toBe(false);
+    expect(result.diffCount).toBe(0);
+  });
+
+  it('Can detect time changed', () => {
+    const dashboard = setup();
+
+    sceneGraph.getTimeRange(dashboard).setState({ from: 'now-1h', to: 'now' });
+
+    const result = getDashboardChangesFromScene(dashboard, false);
+    expect(result.hasChanges).toBe(false);
+    expect(result.diffCount).toBe(0);
+    expect(result.hasTimeChanges).toBe(true);
+  });
+
+  it('Can save time change', () => {
+    const dashboard = setup();
+
+    sceneGraph.getTimeRange(dashboard).setState({ from: 'now-1h', to: 'now' });
+
+    const result = getDashboardChangesFromScene(dashboard, true);
+    expect(result.hasChanges).toBe(true);
+    expect(result.diffCount).toBe(1);
+  });
+
+  it('Can detect folder change', () => {
+    const dashboard = setup();
+
+    dashboard.state.meta.folderUid = 'folder-2';
+
+    const result = getDashboardChangesFromScene(dashboard, false);
+    expect(result.hasChanges).toBe(true);
+    expect(result.diffCount).toBe(0); // Diff count is 0 because the diff contemplate only the model
+    expect(result.hasFolderChanges).toBe(true);
+  });
+
+  it('Can detect refresh changed', () => {
+    const dashboard = setup();
+
+    const refreshPicker = sceneGraph.findObject(dashboard, (obj) => obj instanceof SceneRefreshPicker);
+    if (refreshPicker instanceof SceneRefreshPicker) {
+      refreshPicker.setState({ refresh: '5s' });
+    }
+
+    const result = getDashboardChangesFromScene(dashboard, false, false, false);
+    expect(result.hasChanges).toBe(false);
+    expect(result.diffCount).toBe(0);
+    expect(result.hasRefreshChange).toBe(true);
+  });
+
+  it('Can save refresh change', () => {
+    const dashboard = setup();
+
+    const refreshPicker = sceneGraph.findObject(dashboard, (obj) => obj instanceof SceneRefreshPicker);
+    if (refreshPicker instanceof SceneRefreshPicker) {
+      refreshPicker.setState({ refresh: '5s' });
+    }
+
+    const result = getDashboardChangesFromScene(dashboard, false, false, true);
+    expect(result.hasChanges).toBe(true);
+    expect(result.diffCount).toBe(1);
+  });
+
+  describe('variable changes', () => {
+    it('Can detect variable change', () => {
+      const dashboard = setup();
+
+      const appVar = sceneGraph.lookupVariable('app', dashboard) as MultiValueVariable;
+      appVar.changeValueTo('app2');
+
+      const result = getDashboardChangesFromScene(dashboard, false, false);
+
+      expect(result.hasVariableValueChanges).toBe(true);
+      expect(result.hasChanges).toBe(false);
+      expect(result.diffCount).toBe(0);
+    });
+
+    it('Can save variable value change', () => {
+      const dashboard = setup();
+
+      const appVar = sceneGraph.lookupVariable('app', dashboard) as MultiValueVariable;
+      appVar.changeValueTo('app2');
+
+      const result = getDashboardChangesFromScene(dashboard, false, true);
+
+      expect(result.hasVariableValueChanges).toBe(true);
+      expect(result.hasChanges).toBe(true);
+      expect(result.diffCount).toBe(2);
+    });
+
+    describe('Experimental variables', () => {
+      beforeAll(() => {
+        config.featureToggles.groupByVariable = true;
+      });
+
+      afterAll(() => {
+        config.featureToggles.groupByVariable = false;
+      });
+
+      it('Can detect group by static options change', () => {
+        const dashboard = transformSaveModelToScene({
+          dashboard: {
+            title: 'hello',
+            uid: 'my-uid',
+            schemaVersion: 30,
+            panels: [
+              {
+                id: 1,
+                title: 'Panel 1',
+                type: 'text',
+              },
+            ],
+            version: 10,
+            templating: {
+              list: [
+                {
+                  type: 'groupby',
+                  datasource: {
+                    type: 'ds',
+                    uid: 'ds-uid',
+                  },
+                  name: 'GroupBy',
+                  options: [
+                    {
+                      text: 'Host',
+                      value: 'host',
+                    },
+                    {
+                      text: 'Region',
+                      value: 'region',
+                    },
+                  ],
+                },
+              ],
+            },
+          },
+          meta: {},
+        });
+        const initialSaveModel = transformSceneToSaveModel(dashboard);
+        dashboard.setInitialSaveModel(initialSaveModel);
+
+        const variable = sceneGraph.lookupVariable('GroupBy', dashboard) as GroupByVariable;
+        variable.setState({ defaultOptions: [{ text: 'Host', value: 'host' }] });
+        const result = getDashboardChangesFromScene(dashboard, false, false);
+
+        expect(result.hasVariableValueChanges).toBe(false);
+        expect(result.hasChanges).toBe(true);
+        expect(result.diffCount).toBe(1);
+      });
+
+      it('Can detect adhoc filter static options change', () => {
+        const adhocVar = {
+          id: 'adhoc',
+          name: 'adhoc',
+          label: 'Adhoc Label',
+          description: 'Adhoc Description',
+          type: 'adhoc',
+          datasource: {
+            uid: 'gdev-prometheus',
+            type: 'prometheus',
+          },
+          filters: [],
+          baseFilters: [],
+          defaultKeys: [
+            {
+              text: 'Host',
+              value: 'host',
+            },
+            {
+              text: 'Region',
+              value: 'region',
+            },
+          ],
+        } as VariableModel;
+
+        const dashboard = transformSaveModelToScene({
+          dashboard: {
+            title: 'hello',
+            uid: 'my-uid',
+            schemaVersion: 30,
+            panels: [
+              {
+                id: 1,
+                title: 'Panel 1',
+                type: 'text',
+              },
+            ],
+            version: 10,
+            templating: {
+              list: [adhocVar],
+            },
+          },
+          meta: {},
+        });
+
+        const initialSaveModel = transformSceneToSaveModel(dashboard);
+        dashboard.setInitialSaveModel(initialSaveModel);
+
+        const variable = sceneGraph.lookupVariable('adhoc', dashboard) as AdHocFiltersVariable;
+        variable.setState({ defaultKeys: [{ text: 'Host', value: 'host' }] });
+        const result = getDashboardChangesFromScene(dashboard, false, false);
+
+        expect(result.hasVariableValueChanges).toBe(false);
+        expect(result.hasChanges).toBe(true);
+        expect(result.diffCount).toBe(1);
+      });
+    });
+  });
+
+  describe('Saving from panel edit', () => {
+    it('Should commit panel edit changes', () => {
+      const dashboard = setup();
+      const panel = findVizPanelByKey(dashboard, 'panel-1')!;
+      const editScene = buildPanelEditScene(panel);
+
+      dashboard.onEnterEditMode();
+      dashboard.setState({ editPanel: editScene });
+
+      editScene.state.vizManager.state.panel.setState({ title: 'changed title' });
+      editScene.commitChanges();
+
+      const result = getDashboardChangesFromScene(dashboard, false, true);
+      const panelSaveModel = result.changedSaveModel.panels![0];
+      expect(panelSaveModel.title).toBe('changed title');
+    });
+  });
+});
+
+interface ScenarioOptions {
+  fromPanelEdit?: boolean;
+}
+
+function setup(options: ScenarioOptions = {}) {
+  const dashboard = transformSaveModelToScene({
+    dashboard: {
+      title: 'hello',
+      uid: 'my-uid',
+      schemaVersion: 30,
+      panels: [
+        {
+          id: 1,
+          title: 'Panel 1',
+          type: 'text',
+        },
+      ],
+      version: 10,
+      templating: {
+        list: [
+          {
+            name: 'app',
+            type: 'custom',
+            current: {
+              text: 'app1',
+              value: 'app1',
+            },
+          },
+        ],
+      },
+    },
+    meta: {},
+  });
+
+  const initialSaveModel = transformSceneToSaveModel(dashboard);
+  dashboard.setInitialSaveModel(initialSaveModel);
+
+  return dashboard;
+}
diff --git a/public/app/features/dashboard-scene/saving/getDashboardChangesFromScene.ts b/public/app/features/dashboard-scene/saving/getDashboardChangesFromScene.ts
new file mode 100644
index 0000000000000..5b8a4a444b0dd
--- /dev/null
+++ b/public/app/features/dashboard-scene/saving/getDashboardChangesFromScene.ts
@@ -0,0 +1,35 @@
+import { DashboardScene } from '../scene/DashboardScene';
+import { transformSceneToSaveModel } from '../serialization/transformSceneToSaveModel';
+
+import { getDashboardChanges as getDashboardSaveModelChanges } from './getDashboardChanges';
+
+/**
+ * Get changes between the initial save model and the current scene.
+ * It also checks if the folder has changed.
+ * @param scene DashboardScene object
+ * @param saveTimeRange if true, compare the time range
+ * @param saveVariables if true, compare the variables
+ * @param saveRefresh if true, compare the refresh interval
+ * @returns
+ */
+export function getDashboardChangesFromScene(
+  scene: DashboardScene,
+  saveTimeRange?: boolean,
+  saveVariables?: boolean,
+  saveRefresh?: boolean
+) {
+  const changeInfo = getDashboardSaveModelChanges(
+    scene.getInitialSaveModel()!,
+    transformSceneToSaveModel(scene),
+    saveTimeRange,
+    saveVariables,
+    saveRefresh
+  );
+  const hasFolderChanges = scene.getInitialState()?.meta.folderUid !== scene.state.meta.folderUid;
+
+  return {
+    ...changeInfo,
+    hasFolderChanges,
+    hasChanges: changeInfo.hasChanges || hasFolderChanges,
+  };
+}
diff --git a/public/app/features/dashboard-scene/saving/shared.tsx b/public/app/features/dashboard-scene/saving/shared.tsx
new file mode 100644
index 0000000000000..29b9f3a70b184
--- /dev/null
+++ b/public/app/features/dashboard-scene/saving/shared.tsx
@@ -0,0 +1,75 @@
+import React from 'react';
+
+import { selectors } from '@grafana/e2e-selectors';
+import { isFetchError } from '@grafana/runtime';
+import { Dashboard } from '@grafana/schema';
+import { Alert, Box, Button, Stack } from '@grafana/ui';
+
+import { Diffs } from '../settings/version-history/utils';
+
+export interface DashboardChangeInfo {
+  changedSaveModel: Dashboard;
+  initialSaveModel: Dashboard;
+  diffs: Diffs;
+  diffCount: number;
+  hasChanges: boolean;
+  hasTimeChanges: boolean;
+  hasVariableValueChanges: boolean;
+  hasRefreshChange: boolean;
+  isNew?: boolean;
+  hasFolderChanges?: boolean;
+}
+
+export function isVersionMismatchError(error?: Error) {
+  return isFetchError(error) && error.data && error.data.status === 'version-mismatch';
+}
+
+export function isNameExistsError(error?: Error) {
+  return isFetchError(error) && error.data && error.data.status === 'name-exists';
+}
+
+export function isPluginDashboardError(error?: Error) {
+  return isFetchError(error) && error.data && error.data.status === 'plugin-dashboard';
+}
+
+export interface NameAlreadyExistsErrorProps {
+  cancelButton: React.ReactNode;
+  saveButton: (overwrite: boolean) => React.ReactNode;
+}
+
+export function NameAlreadyExistsError({ cancelButton, saveButton }: NameAlreadyExistsErrorProps) {
+  return (
+    <Alert title="Name already exists" severity="error">
+      <p>
+        A dashboard with the same name in selected folder already exists. Would you still like to save this dashboard?
+      </p>
+      <Box paddingTop={2}>
+        <Stack alignItems="center">
+          {cancelButton}
+          {saveButton(true)}
+        </Stack>
+      </Box>
+    </Alert>
+  );
+}
+
+export interface SaveButtonProps {
+  overwrite: boolean;
+  onSave: (overwrite: boolean) => void;
+  isLoading: boolean;
+  isValid?: boolean;
+}
+
+export function SaveButton({ overwrite, isLoading, isValid, onSave }: SaveButtonProps) {
+  return (
+    <Button
+      disabled={!isValid || isLoading}
+      icon={isLoading ? 'spinner' : undefined}
+      onClick={() => onSave(overwrite)}
+      variant={overwrite ? 'destructive' : 'primary'}
+      data-testid={selectors.components.Drawer.DashboardSaveDrawer.saveButton}
+    >
+      {isLoading ? 'Saving...' : overwrite ? 'Save and overwrite' : 'Save'}
+    </Button>
+  );
+}
diff --git a/public/app/features/dashboard-scene/saving/useSaveDashboard.ts b/public/app/features/dashboard-scene/saving/useSaveDashboard.ts
new file mode 100644
index 0000000000000..c961e4a44db82
--- /dev/null
+++ b/public/app/features/dashboard-scene/saving/useSaveDashboard.ts
@@ -0,0 +1,88 @@
+import { useAsyncFn } from 'react-use';
+
+import { locationUtil } from '@grafana/data';
+import { locationService, reportInteraction } from '@grafana/runtime';
+import { Dashboard } from '@grafana/schema';
+import appEvents from 'app/core/app_events';
+import { useAppNotification } from 'app/core/copy/appNotification';
+import { updateDashboardName } from 'app/core/reducers/navBarTree';
+import { useSaveDashboardMutation } from 'app/features/browse-dashboards/api/browseDashboardsAPI';
+import { SaveDashboardOptions } from 'app/features/dashboard/components/SaveDashboard/types';
+import { useDispatch } from 'app/types';
+import { DashboardSavedEvent } from 'app/types/events';
+
+import { updateDashboardUidLastUsedDatasource } from '../../dashboard/utils/dashboard';
+import { DashboardScene } from '../scene/DashboardScene';
+
+export function useSaveDashboard(isCopy = false) {
+  const dispatch = useDispatch();
+  const notifyApp = useAppNotification();
+  const [saveDashboardRtkQuery] = useSaveDashboardMutation();
+
+  const [state, onSaveDashboard] = useAsyncFn(
+    async (scene: DashboardScene, saveModel: Dashboard, options: SaveDashboardOptions) => {
+      {
+        const result = await saveDashboardRtkQuery({
+          dashboard: saveModel,
+          folderUid: options.folderUid,
+          message: options.message,
+          overwrite: options.overwrite,
+          showErrorAlert: false,
+        });
+
+        if ('error' in result) {
+          throw result.error;
+        }
+
+        const resultData = result.data;
+        scene.saveCompleted(saveModel, resultData, options.folderUid);
+
+        // important that these happen before location redirect below
+        appEvents.publish(new DashboardSavedEvent());
+        notifyApp.success('Dashboard saved');
+
+        //Update local storage dashboard to handle things like last used datasource
+        updateDashboardUidLastUsedDatasource(resultData.uid);
+
+        if (isCopy) {
+          reportInteraction('grafana_dashboard_copied', {
+            name: saveModel.title,
+            url: resultData.url,
+          });
+        } else {
+          reportInteraction(`grafana_dashboard_${resultData.uid ? 'saved' : 'created'}`, {
+            name: saveModel.title,
+            url: resultData.url,
+          });
+        }
+
+        const currentLocation = locationService.getLocation();
+        const newUrl = locationUtil.stripBaseFromUrl(resultData.url);
+
+        if (newUrl !== currentLocation.pathname) {
+          setTimeout(() => {
+            // Because the path changes we need to stop and restart url sync
+            scene.stopUrlSync();
+            locationService.push({ pathname: newUrl, search: currentLocation.search });
+            scene.startUrlSync();
+          });
+        }
+
+        if (scene.state.meta.isStarred) {
+          dispatch(
+            updateDashboardName({
+              id: resultData.uid,
+              title: scene.state.title,
+              url: newUrl,
+            })
+          );
+        }
+
+        return result.data;
+      }
+    },
+    [dispatch, notifyApp]
+  );
+
+  return { state, onSaveDashboard };
+}
diff --git a/public/app/features/dashboard-scene/scene/AddLibraryPanelDrawer.test.tsx b/public/app/features/dashboard-scene/scene/AddLibraryPanelDrawer.test.tsx
new file mode 100644
index 0000000000000..8acd776354234
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/AddLibraryPanelDrawer.test.tsx
@@ -0,0 +1,74 @@
+import { SceneGridLayout, SceneTimeRange } from '@grafana/scenes';
+import { LibraryPanel } from '@grafana/schema/dist/esm/index.gen';
+
+import { activateFullSceneTree } from '../utils/test-utils';
+
+import { AddLibraryPanelDrawer } from './AddLibraryPanelDrawer';
+import { DashboardGridItem } from './DashboardGridItem';
+import { DashboardScene } from './DashboardScene';
+import { LibraryVizPanel } from './LibraryVizPanel';
+
+describe('AddLibraryPanelWidget', () => {
+  let dashboard: DashboardScene;
+  let addLibPanelDrawer: AddLibraryPanelDrawer;
+
+  beforeEach(async () => {
+    const result = await buildTestScene();
+    dashboard = result.dashboard;
+    addLibPanelDrawer = result.drawer;
+  });
+
+  it('should add library panel from menu', () => {
+    const panelInfo: LibraryPanel = {
+      uid: 'uid',
+      model: {
+        type: 'timeseries',
+      },
+      name: 'name',
+      version: 1,
+      type: 'timeseries',
+    };
+
+    addLibPanelDrawer.onAddLibraryPanel(panelInfo);
+
+    const layout = dashboard.state.body as SceneGridLayout;
+    const gridItem = layout.state.children[0] as DashboardGridItem;
+
+    expect(layout.state.children.length).toBe(1);
+    expect(gridItem.state.body!).toBeInstanceOf(LibraryVizPanel);
+    expect((gridItem.state.body! as LibraryVizPanel).state.panelKey).toBe('panel-1');
+  });
+
+  it('should throw error if adding lib panel in a layout that is not SceneGridLayout', () => {
+    dashboard.setState({ body: undefined });
+
+    expect(() => addLibPanelDrawer.onAddLibraryPanel({} as LibraryPanel)).toThrow(
+      'Trying to add a library panel in a layout that is not SceneGridLayout'
+    );
+  });
+});
+
+async function buildTestScene() {
+  const drawer = new AddLibraryPanelDrawer({});
+  const dashboard = new DashboardScene({
+    $timeRange: new SceneTimeRange({}),
+    title: 'hello',
+    uid: 'dash-1',
+    version: 4,
+    meta: {
+      canEdit: true,
+    },
+    body: new SceneGridLayout({
+      children: [],
+    }),
+    overlay: drawer,
+  });
+
+  activateFullSceneTree(dashboard);
+
+  await new Promise((r) => setTimeout(r, 1));
+
+  dashboard.onEnterEditMode();
+
+  return { dashboard, drawer };
+}
diff --git a/public/app/features/dashboard-scene/scene/AddLibraryPanelDrawer.tsx b/public/app/features/dashboard-scene/scene/AddLibraryPanelDrawer.tsx
new file mode 100644
index 0000000000000..831c0003506d9
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/AddLibraryPanelDrawer.tsx
@@ -0,0 +1,69 @@
+import React from 'react';
+
+import { SceneComponentProps, SceneGridLayout, SceneObjectBase, SceneObjectState } from '@grafana/scenes';
+import { LibraryPanel } from '@grafana/schema';
+import { Drawer } from '@grafana/ui';
+import { t } from 'app/core/internationalization';
+import {
+  LibraryPanelsSearch,
+  LibraryPanelsSearchVariant,
+} from 'app/features/library-panels/components/LibraryPanelsSearch/LibraryPanelsSearch';
+
+import { dashboardSceneGraph } from '../utils/dashboardSceneGraph';
+import { NEW_PANEL_HEIGHT, NEW_PANEL_WIDTH, getDashboardSceneFor, getVizPanelKeyForPanelId } from '../utils/utils';
+
+import { DashboardGridItem } from './DashboardGridItem';
+import { LibraryVizPanel } from './LibraryVizPanel';
+
+export interface AddLibraryPanelDrawerState extends SceneObjectState {}
+
+export class AddLibraryPanelDrawer extends SceneObjectBase<AddLibraryPanelDrawerState> {
+  public onClose = () => {
+    getDashboardSceneFor(this).closeModal();
+  };
+
+  public onAddLibraryPanel = (panelInfo: LibraryPanel) => {
+    const dashboard = getDashboardSceneFor(this);
+    const layout = dashboard.state.body;
+
+    if (!(layout instanceof SceneGridLayout)) {
+      throw new Error('Trying to add a library panel in a layout that is not SceneGridLayout');
+    }
+
+    const panelId = dashboardSceneGraph.getNextPanelId(dashboard);
+
+    const body = new LibraryVizPanel({
+      title: 'Panel Title',
+      uid: panelInfo.uid,
+      name: panelInfo.name,
+      panelKey: getVizPanelKeyForPanelId(panelId),
+    });
+
+    const newGridItem = new DashboardGridItem({
+      height: NEW_PANEL_HEIGHT,
+      width: NEW_PANEL_WIDTH,
+      x: 0,
+      y: 0,
+      body: body,
+      key: `grid-item-${panelId}`,
+    });
+
+    layout.setState({ children: [newGridItem, ...layout.state.children] });
+
+    this.onClose();
+  };
+
+  static Component = ({ model }: SceneComponentProps<AddLibraryPanelDrawer>) => {
+    const title = t('library-panel.add-widget.title', 'Add panel from panel library');
+
+    return (
+      <Drawer title={title} onClose={model.onClose}>
+        <LibraryPanelsSearch
+          onClick={model.onAddLibraryPanel}
+          variant={LibraryPanelsSearchVariant.Tight}
+          showPanelFilter
+        />
+      </Drawer>
+    );
+  };
+}
diff --git a/public/app/features/dashboard-scene/scene/AlertStatesDataLayer.ts b/public/app/features/dashboard-scene/scene/AlertStatesDataLayer.ts
new file mode 100644
index 0000000000000..5bea2d7b023f5
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/AlertStatesDataLayer.ts
@@ -0,0 +1,201 @@
+import { from, map, Unsubscribable } from 'rxjs';
+
+import { AlertState, AlertStateInfo, DataTopic, LoadingState, toDataFrame } from '@grafana/data';
+import { config, getBackendSrv } from '@grafana/runtime';
+import {
+  SceneDataLayerBase,
+  SceneDataLayerProvider,
+  SceneDataLayerProviderState,
+  sceneGraph,
+  SceneTimeRangeLike,
+} from '@grafana/scenes';
+import { notifyApp } from 'app/core/actions';
+import { createErrorNotification } from 'app/core/copy/appNotification';
+import { contextSrv } from 'app/core/core';
+import { getMessageFromError } from 'app/core/utils/errors';
+import { Annotation } from 'app/features/alerting/unified/utils/constants';
+import { isAlertingRule } from 'app/features/alerting/unified/utils/rules';
+import { dispatch } from 'app/store/store';
+import { AccessControlAction } from 'app/types';
+import { PromAlertingRuleState, PromRulesResponse } from 'app/types/unified-alerting-dto';
+
+import { getDashboardSceneFor } from '../utils/utils';
+
+interface AlertStatesDataLayerState extends SceneDataLayerProviderState {}
+
+export class AlertStatesDataLayer
+  extends SceneDataLayerBase<AlertStatesDataLayerState>
+  implements SceneDataLayerProvider
+{
+  private hasAlertRules = true;
+  private _timeRangeSub: Unsubscribable | undefined;
+  public topic = DataTopic.AlertStates;
+
+  public constructor(initialState: AlertStatesDataLayerState) {
+    super({
+      isEnabled: true,
+      ...initialState,
+      isHidden: true,
+    });
+  }
+
+  public onEnable(): void {
+    const timeRange = sceneGraph.getTimeRange(this);
+
+    this._timeRangeSub = timeRange.subscribeToState(() => {
+      this.runWithTimeRange(timeRange);
+    });
+  }
+
+  public onDisable(): void {
+    this._timeRangeSub?.unsubscribe();
+  }
+
+  public runLayer() {
+    const timeRange = sceneGraph.getTimeRange(this);
+    this.runWithTimeRange(timeRange);
+  }
+
+  private async runWithTimeRange(timeRange: SceneTimeRangeLike) {
+    const dashboard = getDashboardSceneFor(this);
+    const { uid, id } = dashboard.state;
+
+    if (this.querySub) {
+      this.querySub.unsubscribe();
+    }
+
+    if (!this.canWork(timeRange)) {
+      return;
+    }
+
+    const alerStatesExecution = from(
+      getBackendSrv().get(
+        '/api/prometheus/grafana/api/v1/rules',
+        {
+          dashboard_uid: uid!,
+        },
+        `dashboard-query-runner-unified-alert-states-${id}`
+      )
+    ).pipe(
+      map((result: PromRulesResponse) => {
+        if (result.status === 'success') {
+          this.hasAlertRules = false;
+          const panelIdToAlertState: Record<number, AlertStateInfo> = {};
+
+          result.data.groups.forEach((group) =>
+            group.rules.forEach((rule) => {
+              if (isAlertingRule(rule) && rule.annotations && rule.annotations[Annotation.panelID]) {
+                this.hasAlertRules = true;
+                const panelId = Number(rule.annotations[Annotation.panelID]);
+                const state = promAlertStateToAlertState(rule.state);
+
+                // there can be multiple alerts per panel, so we make sure we get the most severe state:
+                // alerting > pending > ok
+                if (!panelIdToAlertState[panelId]) {
+                  panelIdToAlertState[panelId] = {
+                    state,
+                    id: Object.keys(panelIdToAlertState).length,
+                    panelId,
+                    dashboardId: id!,
+                  };
+                } else if (
+                  state === AlertState.Alerting &&
+                  panelIdToAlertState[panelId].state !== AlertState.Alerting
+                ) {
+                  panelIdToAlertState[panelId].state = AlertState.Alerting;
+                } else if (
+                  state === AlertState.Pending &&
+                  panelIdToAlertState[panelId].state !== AlertState.Alerting &&
+                  panelIdToAlertState[panelId].state !== AlertState.Pending
+                ) {
+                  panelIdToAlertState[panelId].state = AlertState.Pending;
+                }
+              }
+            })
+          );
+          return Object.values(panelIdToAlertState);
+        }
+
+        throw new Error(`Unexpected alert rules response.`);
+      })
+    );
+
+    this.querySub = alerStatesExecution.subscribe({
+      next: (stateUpdate) => {
+        const frame = toDataFrame(stateUpdate);
+        this.publishResults({
+          state: LoadingState.Done,
+          series: [
+            {
+              ...frame,
+              meta: {
+                ...frame.meta,
+                dataTopic: DataTopic.AlertStates,
+              },
+            },
+          ],
+          timeRange: timeRange.state.value,
+        });
+      },
+      error: (err) => {
+        this.handleError(err);
+        this.publishResults({
+          state: LoadingState.Error,
+          series: [],
+          errors: [
+            {
+              message: getMessageFromError(err),
+            },
+          ],
+          timeRange: timeRange.state.value,
+        });
+      },
+    });
+  }
+
+  private canWork(timeRange: SceneTimeRangeLike): boolean {
+    const dashboard = getDashboardSceneFor(this);
+    const { uid } = dashboard.state;
+
+    if (!uid) {
+      return false;
+    }
+
+    // Cannot fetch rules while on a public dashboard since it's unauthenticated
+    if (config.publicDashboardAccessToken) {
+      return false;
+    }
+
+    if (timeRange.state.value.raw.to !== 'now') {
+      return false;
+    }
+
+    if (this.hasAlertRules === false) {
+      return false;
+    }
+
+    const hasRuleReadPermission =
+      contextSrv.hasPermission(AccessControlAction.AlertingRuleRead) &&
+      contextSrv.hasPermission(AccessControlAction.AlertingRuleExternalRead);
+
+    if (!hasRuleReadPermission) {
+      return false;
+    }
+
+    return true;
+  }
+
+  private handleError = (err: unknown) => {
+    const notification = createErrorNotification('AlertStatesDataLayer', getMessageFromError(err));
+    dispatch(notifyApp(notification));
+  };
+}
+
+export function promAlertStateToAlertState(state: PromAlertingRuleState): AlertState {
+  if (state === PromAlertingRuleState.Firing) {
+    return AlertState.Alerting;
+  } else if (state === PromAlertingRuleState.Pending) {
+    return AlertState.Pending;
+  }
+  return AlertState.OK;
+}
diff --git a/public/app/features/dashboard-scene/scene/DashboardControls.tsx b/public/app/features/dashboard-scene/scene/DashboardControls.tsx
new file mode 100644
index 0000000000000..e62cd864efea2
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/DashboardControls.tsx
@@ -0,0 +1,108 @@
+import { css, cx } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import {
+  SceneObjectState,
+  SceneObject,
+  SceneObjectBase,
+  SceneComponentProps,
+  SceneTimePicker,
+  SceneRefreshPicker,
+  SceneDebugger,
+  VariableDependencyConfig,
+} from '@grafana/scenes';
+import { Box, Stack, useStyles2 } from '@grafana/ui';
+
+import { PanelEditControls } from '../panel-edit/PanelEditControls';
+import { getDashboardSceneFor } from '../utils/utils';
+
+import { DashboardLinksControls } from './DashboardLinksControls';
+
+interface DashboardControlsState extends SceneObjectState {
+  variableControls: SceneObject[];
+  timePicker: SceneTimePicker;
+  refreshPicker: SceneRefreshPicker;
+  hideTimeControls?: boolean;
+}
+export class DashboardControls extends SceneObjectBase<DashboardControlsState> {
+  static Component = DashboardControlsRenderer;
+
+  protected _variableDependency = new VariableDependencyConfig(this, {
+    onAnyVariableChanged: this._onAnyVariableChanged.bind(this),
+  });
+
+  public constructor(state: Partial<DashboardControlsState>) {
+    super({
+      variableControls: [],
+      timePicker: state.timePicker ?? new SceneTimePicker({}),
+      refreshPicker: state.refreshPicker ?? new SceneRefreshPicker({}),
+      ...state,
+    });
+  }
+
+  /**
+   * Links can include all variables so we need to re-render when any change
+   */
+  private _onAnyVariableChanged(): void {
+    const dashboard = getDashboardSceneFor(this);
+    if (dashboard.state.links?.length > 0) {
+      this.forceRender();
+    }
+  }
+}
+
+function DashboardControlsRenderer({ model }: SceneComponentProps<DashboardControls>) {
+  const { variableControls, refreshPicker, timePicker, hideTimeControls } = model.useState();
+  const dashboard = getDashboardSceneFor(model);
+  const { links, meta, editPanel } = dashboard.useState();
+  const styles = useStyles2(getStyles);
+  const showDebugger = location.search.includes('scene-debugger');
+
+  return (
+    <div className={cx(styles.controls, meta.isEmbedded && styles.embedded)}>
+      <Stack grow={1} wrap={'wrap'}>
+        {variableControls.map((c) => (
+          <c.Component model={c} key={c.state.key} />
+        ))}
+        <Box grow={1} />
+        {!editPanel && <DashboardLinksControls links={links} uid={dashboard.state.uid} />}
+        {editPanel && <PanelEditControls panelEditor={editPanel} />}
+      </Stack>
+      {!hideTimeControls && (
+        <Stack justifyContent={'flex-end'}>
+          <timePicker.Component model={timePicker} />
+          <refreshPicker.Component model={refreshPicker} />
+        </Stack>
+      )}
+      {showDebugger && <SceneDebugger scene={model} key={'scene-debugger'} />}
+    </div>
+  );
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    controls: css({
+      display: 'flex',
+      alignItems: 'flex-start',
+      flex: '100%',
+      gap: theme.spacing(1),
+      flexDirection: 'row',
+      flexWrap: 'nowrap',
+      position: 'sticky',
+      top: 0,
+      background: theme.colors.background.canvas,
+      zIndex: theme.zIndex.activePanel,
+      width: '100%',
+      marginLeft: 'auto',
+      [theme.breakpoints.down('sm')]: {
+        flexDirection: 'column-reverse',
+        alignItems: 'stretch',
+      },
+    }),
+    embedded: css({
+      background: 'unset',
+      position: 'unset',
+    }),
+  };
+}
diff --git a/public/app/features/dashboard-scene/scene/DashboardDataLayerSet.tsx b/public/app/features/dashboard-scene/scene/DashboardDataLayerSet.tsx
new file mode 100644
index 0000000000000..453e58b81b1b3
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/DashboardDataLayerSet.tsx
@@ -0,0 +1,73 @@
+import React from 'react';
+
+import {
+  SceneDataLayerProviderState,
+  SceneDataLayerProvider,
+  SceneDataLayerSetBase,
+  SceneComponentProps,
+} from '@grafana/scenes';
+
+import { AlertStatesDataLayer } from './AlertStatesDataLayer';
+
+export interface DashboardDataLayerSetState extends SceneDataLayerProviderState {
+  alertStatesLayer?: AlertStatesDataLayer;
+  annotationLayers: SceneDataLayerProvider[];
+}
+
+export class DashboardDataLayerSet
+  extends SceneDataLayerSetBase<DashboardDataLayerSetState>
+  implements SceneDataLayerProvider
+{
+  public constructor(state: Partial<DashboardDataLayerSetState>) {
+    super({
+      ...state,
+      name: state.name ?? 'Data layers',
+      annotationLayers: state.annotationLayers ?? [],
+    });
+
+    this.addActivationHandler(() => this._onActivate());
+  }
+
+  private _onActivate() {
+    this._subs.add(
+      this.subscribeToState((newState, oldState) => {
+        if (newState.annotationLayers !== oldState.annotationLayers) {
+          this.querySub?.unsubscribe();
+          this.subscribeToAllLayers(this.getAllLayers());
+        }
+      })
+    );
+
+    this.subscribeToAllLayers(this.getAllLayers());
+
+    return () => {
+      this.querySub?.unsubscribe();
+    };
+  }
+
+  public addAnnotationLayer(layer: SceneDataLayerProvider) {
+    this.setState({ annotationLayers: [...this.state.annotationLayers, layer] });
+  }
+
+  private getAllLayers() {
+    const layers = [...this.state.annotationLayers];
+
+    if (this.state.alertStatesLayer) {
+      layers.push(this.state.alertStatesLayer);
+    }
+
+    return layers;
+  }
+
+  public static Component = ({ model }: SceneComponentProps<DashboardDataLayerSet>) => {
+    const { annotationLayers } = model.useState();
+
+    return (
+      <>
+        {annotationLayers.map((layer) => (
+          <layer.Component model={layer} key={layer.state.key} />
+        ))}
+      </>
+    );
+  };
+}
diff --git a/public/app/features/dashboard-scene/scene/DashboardDatasourceBehaviour.test.tsx b/public/app/features/dashboard-scene/scene/DashboardDatasourceBehaviour.test.tsx
new file mode 100644
index 0000000000000..de5e655eae248
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/DashboardDatasourceBehaviour.test.tsx
@@ -0,0 +1,635 @@
+import { map, of } from 'rxjs';
+
+import {
+  DataQuery,
+  DataQueryRequest,
+  DataSourceApi,
+  DataSourceJsonData,
+  DataSourceRef,
+  LoadingState,
+  PanelData,
+} from '@grafana/data';
+import { getPanelPlugin } from '@grafana/data/test/__mocks__/pluginMocks';
+import { setPluginImportUtils } from '@grafana/runtime';
+import { SceneDataTransformer, SceneGridLayout, SceneQueryRunner, VizPanel } from '@grafana/scenes';
+import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard';
+import { DASHBOARD_DATASOURCE_PLUGIN_ID } from 'app/plugins/datasource/dashboard/types';
+
+import { VizPanelManager } from '../panel-edit/VizPanelManager';
+import { activateFullSceneTree } from '../utils/test-utils';
+
+import { DashboardDatasourceBehaviour } from './DashboardDatasourceBehaviour';
+import { DashboardGridItem } from './DashboardGridItem';
+import { DashboardScene } from './DashboardScene';
+import { LibraryVizPanel } from './LibraryVizPanel';
+
+const grafanaDs = {
+  id: 1,
+  uid: '-- Grafana --',
+  name: 'grafana',
+  type: 'grafana',
+  meta: {
+    id: 'grafana',
+  },
+  getRef: () => {
+    return { type: 'grafana', uid: '-- Grafana --' };
+  },
+};
+
+const dashboardDs: DataSourceApi = {
+  meta: {
+    id: DASHBOARD_DATASOURCE_PLUGIN_ID,
+  },
+  name: SHARED_DASHBOARD_QUERY,
+  type: SHARED_DASHBOARD_QUERY,
+  uid: SHARED_DASHBOARD_QUERY,
+  getRef: () => {
+    return { type: SHARED_DASHBOARD_QUERY, uid: SHARED_DASHBOARD_QUERY };
+  },
+} as DataSourceApi<DataQuery, DataSourceJsonData, {}>;
+
+setPluginImportUtils({
+  importPanelPlugin: (id: string) => Promise.resolve(getPanelPlugin({})),
+  getPanelPluginFromCache: (id: string) => undefined,
+});
+
+const runRequestMock = jest.fn().mockImplementation((ds: DataSourceApi, request: DataQueryRequest) => {
+  const result: PanelData = {
+    state: LoadingState.Loading,
+    series: [],
+    timeRange: request.range,
+    request,
+  };
+
+  return of([]).pipe(
+    map(() => {
+      result.state = LoadingState.Done;
+      result.series = [];
+
+      return result;
+    })
+  );
+});
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getRunRequest: () => (ds: DataSourceApi, request: DataQueryRequest) => {
+    return runRequestMock(ds, request);
+  },
+  getDataSourceSrv: () => {
+    return {
+      get: async (ref: DataSourceRef) => {
+        if (ref.uid === 'grafana') {
+          return grafanaDs;
+        }
+
+        if (ref.uid === SHARED_DASHBOARD_QUERY) {
+          return dashboardDs;
+        }
+
+        return null;
+      },
+      getInstanceSettings: jest.fn().mockResolvedValue({ uid: 'ds1' }),
+    };
+  },
+}));
+
+describe('DashboardDatasourceBehaviour', () => {
+  describe('Given scene with a dashboard DS panel and a source panel', () => {
+    let scene: DashboardScene, sourcePanel: VizPanel, dashboardDSPanel: VizPanel, sceneDeactivate: () => void;
+
+    beforeEach(async () => {
+      ({ scene, sourcePanel, dashboardDSPanel, sceneDeactivate } = await buildTestScene());
+    });
+
+    it('Should re-run query of dashboardDS panel when source query re-runs', async () => {
+      // spy on runQueries that will be called by the behaviour
+      const spy = jest.spyOn(dashboardDSPanel.state.$data!.state.$data as SceneQueryRunner, 'runQueries');
+
+      // deactivate scene to mimic going into panel edit
+      sceneDeactivate();
+      // run source panel queries and update request ID
+      (sourcePanel.state.$data!.state.$data as SceneQueryRunner).runQueries();
+
+      await new Promise((r) => setTimeout(r, 1));
+
+      // activate scene to mimic coming back from panel edit
+      activateFullSceneTree(scene);
+
+      expect(spy).toHaveBeenCalledTimes(1);
+    });
+
+    it('Should not run query of dashboardDS panel when source panel queries do not change', async () => {
+      // spy on runQueries
+      const spy = jest.spyOn(dashboardDSPanel.state.$data!.state.$data as SceneQueryRunner, 'runQueries');
+
+      // deactivate scene to mimic going into panel edit
+      sceneDeactivate();
+
+      await new Promise((r) => setTimeout(r, 1));
+
+      // activate scene to mimic coming back from panel edit
+      activateFullSceneTree(scene);
+
+      expect(spy).not.toHaveBeenCalled();
+    });
+
+    it('Should not re-run queries in behaviour when adding a dashboardDS panel to the scene', async () => {
+      const sourcePanel = new VizPanel({
+        title: 'Panel A',
+        pluginId: 'table',
+        key: 'panel-1',
+        $data: new SceneQueryRunner({
+          datasource: { uid: 'grafana' },
+          queries: [{ refId: 'A', queryType: 'randomWalk' }],
+        }),
+      });
+
+      const behaviour = new DashboardDatasourceBehaviour({});
+
+      const dashboardDSPanel = new VizPanel({
+        title: 'Panel B',
+        pluginId: 'table',
+        key: 'panel-2',
+        $data: new SceneQueryRunner({
+          datasource: { uid: SHARED_DASHBOARD_QUERY },
+          queries: [{ refId: 'A', panelId: 1 }],
+          $behaviors: [behaviour],
+        }),
+      });
+
+      const scene = new DashboardScene({
+        title: 'hello',
+        uid: 'dash-1',
+        meta: {
+          canEdit: true,
+        },
+        body: new SceneGridLayout({
+          children: [
+            new DashboardGridItem({
+              key: 'griditem-1',
+              x: 0,
+              y: 0,
+              width: 10,
+              height: 12,
+              body: sourcePanel,
+            }),
+          ],
+        }),
+      });
+
+      activateFullSceneTree(scene);
+
+      await new Promise((r) => setTimeout(r, 1));
+
+      const spy = jest.spyOn(dashboardDSPanel.state.$data as SceneQueryRunner, 'runQueries');
+
+      const layout = scene.state.body as SceneGridLayout;
+
+      // we add the new panel, it should run it's query as usual
+      layout.setState({
+        children: [
+          ...layout.state.children,
+          new DashboardGridItem({
+            key: 'griditem-2',
+            x: 0,
+            y: 0,
+            width: 10,
+            height: 12,
+            body: dashboardDSPanel,
+          }),
+        ],
+      });
+
+      dashboardDSPanel.activate();
+
+      expect(spy).toHaveBeenCalledTimes(1);
+      // since there is no previous request ID on dashboard load, the behaviour should not re-run queries
+      expect(behaviour['prevRequestId']).toBeUndefined();
+    });
+
+    it('Should not re-run queries in behaviour on scene load', async () => {
+      const sourcePanel = new VizPanel({
+        title: 'Panel A',
+        pluginId: 'table',
+        key: 'panel-1',
+        $data: new SceneQueryRunner({
+          datasource: { uid: 'grafana' },
+          queries: [{ refId: 'A', queryType: 'randomWalk' }],
+        }),
+      });
+
+      const behaviour = new DashboardDatasourceBehaviour({});
+
+      const dashboardDSPanel = new VizPanel({
+        title: 'Panel B',
+        pluginId: 'table',
+        key: 'panel-2',
+        $data: new SceneQueryRunner({
+          datasource: { uid: SHARED_DASHBOARD_QUERY },
+          queries: [{ refId: 'A', panelId: 1 }],
+          $behaviors: [behaviour],
+        }),
+      });
+
+      const scene = new DashboardScene({
+        title: 'hello',
+        uid: 'dash-1',
+        meta: {
+          canEdit: true,
+        },
+        body: new SceneGridLayout({
+          children: [
+            new DashboardGridItem({
+              key: 'griditem-1',
+              x: 0,
+              y: 0,
+              width: 10,
+              height: 12,
+              body: sourcePanel,
+            }),
+            new DashboardGridItem({
+              key: 'griditem-2',
+              x: 0,
+              y: 0,
+              width: 10,
+              height: 12,
+              body: dashboardDSPanel,
+            }),
+          ],
+        }),
+      });
+
+      const spy = jest.spyOn(dashboardDSPanel.state.$data as SceneQueryRunner, 'runQueries');
+
+      activateFullSceneTree(scene);
+
+      await new Promise((r) => setTimeout(r, 1));
+
+      expect(spy).toHaveBeenCalledTimes(1);
+      // since there is no previous request ID on dashboard load, the behaviour should not re-run queries
+      expect(behaviour['prevRequestId']).toBeUndefined();
+    });
+
+    it('Should exit behaviour early if not in a dashboard scene', async () => {
+      // spy on runQueries
+      const spy = jest.spyOn(dashboardDSPanel.state.$data!.state.$data as SceneQueryRunner, 'runQueries');
+
+      const vizPanelManager = new VizPanelManager({
+        panel: dashboardDSPanel.clone(),
+        $data: dashboardDSPanel.state.$data?.clone(),
+        sourcePanel: dashboardDSPanel.getRef(),
+      });
+
+      vizPanelManager.activate();
+
+      expect(spy).not.toHaveBeenCalled();
+    });
+
+    it('Should not re-run queries if dashboard DS panel references an invalid source panel', async () => {
+      const sourcePanel = new VizPanel({
+        title: 'Panel A',
+        pluginId: 'table',
+        key: 'panel-1',
+        $data: new SceneQueryRunner({
+          datasource: { uid: 'grafana' },
+          queries: [{ refId: 'A', queryType: 'randomWalk' }],
+        }),
+      });
+
+      // query references inexistent panel
+      const dashboardDSPanel = new VizPanel({
+        title: 'Panel B',
+        pluginId: 'table',
+        key: 'panel-2',
+        $data: new SceneQueryRunner({
+          datasource: { uid: SHARED_DASHBOARD_QUERY },
+          queries: [{ refId: 'A', panelId: 10 }],
+          $behaviors: [new DashboardDatasourceBehaviour({})],
+        }),
+      });
+
+      const scene = new DashboardScene({
+        title: 'hello',
+        uid: 'dash-1',
+        meta: {
+          canEdit: true,
+        },
+        body: new SceneGridLayout({
+          children: [
+            new DashboardGridItem({
+              key: 'griditem-1',
+              x: 0,
+              y: 0,
+              width: 10,
+              height: 12,
+              body: sourcePanel,
+            }),
+            new DashboardGridItem({
+              key: 'griditem-2',
+              x: 0,
+              y: 0,
+              width: 10,
+              height: 12,
+              body: dashboardDSPanel,
+            }),
+          ],
+        }),
+      });
+
+      const sceneDeactivate = activateFullSceneTree(scene);
+
+      await new Promise((r) => setTimeout(r, 1));
+
+      // spy on runQueries
+      const spy = jest.spyOn(dashboardDSPanel.state.$data as SceneQueryRunner, 'runQueries');
+
+      // deactivate scene to mimic going into panel edit
+      sceneDeactivate();
+
+      await new Promise((r) => setTimeout(r, 1));
+
+      // activate scene to mimic coming back from panel edit
+      activateFullSceneTree(scene);
+
+      expect(spy).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('Given scene with no DashboardDS panel', () => {
+    it('Should not re-run queries and exit early in behaviour', async () => {
+      const sourcePanel = new VizPanel({
+        title: 'Panel A',
+        pluginId: 'table',
+        key: 'panel-1',
+        $data: new SceneQueryRunner({
+          datasource: { uid: 'grafana' },
+          queries: [{ refId: 'A', queryType: 'randomWalk' }],
+        }),
+      });
+
+      const anotherPanel = new VizPanel({
+        title: 'Panel B',
+        pluginId: 'table',
+        key: 'panel-2',
+        $data: new SceneQueryRunner({
+          datasource: { uid: 'grafana' },
+          queries: [{ refId: 'A', queryType: 'randomWalk' }],
+        }),
+      });
+
+      const scene = new DashboardScene({
+        title: 'hello',
+        uid: 'dash-1',
+        meta: {
+          canEdit: true,
+        },
+        body: new SceneGridLayout({
+          children: [
+            new DashboardGridItem({
+              key: 'griditem-1',
+              x: 0,
+              y: 0,
+              width: 10,
+              height: 12,
+              body: sourcePanel,
+            }),
+            new DashboardGridItem({
+              key: 'griditem-2',
+              x: 0,
+              y: 0,
+              width: 10,
+              height: 12,
+              body: anotherPanel,
+            }),
+          ],
+        }),
+      });
+
+      const sceneDeactivate = activateFullSceneTree(scene);
+
+      await new Promise((r) => setTimeout(r, 1));
+
+      // spy on runQueries
+      const spy = jest.spyOn(anotherPanel.state.$data as SceneQueryRunner, 'runQueries');
+
+      // deactivate scene to mimic going into panel edit
+      sceneDeactivate();
+      // run source panel queries and update request ID
+      (sourcePanel.state.$data as SceneQueryRunner).runQueries();
+
+      await new Promise((r) => setTimeout(r, 1));
+
+      // activate scene to mimic coming back from panel edit
+      activateFullSceneTree(scene);
+
+      expect(spy).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('Given an invalid state', () => {
+    it('Should throw an error if behaviour is not attached to a SceneQueryRunner', () => {
+      const behaviour = new DashboardDatasourceBehaviour({});
+
+      expect(() => behaviour.activate()).toThrow('DashboardDatasourceBehaviour must be attached to a SceneQueryRunner');
+    });
+
+    it('Should throw an error if source panel does not have a SceneQueryRunner', async () => {
+      const sourcePanel = new VizPanel({
+        title: 'Panel A',
+        pluginId: 'table',
+        key: 'panel-1',
+        $data: undefined,
+      });
+
+      const dashboardDSPanel = new VizPanel({
+        title: 'Panel B',
+        pluginId: 'table',
+        key: 'panel-2',
+        $data: new SceneQueryRunner({
+          datasource: { uid: SHARED_DASHBOARD_QUERY },
+          queries: [{ refId: 'A', panelId: 1 }],
+          $behaviors: [new DashboardDatasourceBehaviour({})],
+        }),
+      });
+
+      const scene = new DashboardScene({
+        title: 'hello',
+        uid: 'dash-1',
+        meta: {
+          canEdit: true,
+        },
+        body: new SceneGridLayout({
+          children: [
+            new DashboardGridItem({
+              key: 'griditem-1',
+              x: 0,
+              y: 0,
+              width: 10,
+              height: 12,
+              body: sourcePanel,
+            }),
+            new DashboardGridItem({
+              key: 'griditem-2',
+              x: 0,
+              y: 0,
+              width: 10,
+              height: 12,
+              body: dashboardDSPanel,
+            }),
+          ],
+        }),
+      });
+
+      try {
+        activateFullSceneTree(scene);
+      } catch (e) {
+        expect(e).toEqual(new Error('Could not find SceneQueryRunner for panel'));
+      }
+    });
+  });
+
+  describe('Library panels', () => {
+    it('should wait for library panel to be loaded', async () => {
+      const sourcePanel = new LibraryVizPanel({
+        name: 'My Library Panel',
+        title: 'Panel title',
+        uid: 'fdcvggvfy2qdca',
+        panelKey: 'lib-panel',
+        panel: new VizPanel({
+          key: 'panel-1',
+          title: 'Panel A',
+          pluginId: 'table',
+        }),
+      });
+
+      // query references inexistent panel
+      const dashboardDSPanel = new VizPanel({
+        title: 'Panel B',
+        pluginId: 'table',
+        key: 'panel-2',
+        $data: new SceneQueryRunner({
+          datasource: { uid: SHARED_DASHBOARD_QUERY },
+          queries: [{ refId: 'A', panelId: 1 }],
+          $behaviors: [new DashboardDatasourceBehaviour({})],
+        }),
+      });
+
+      const scene = new DashboardScene({
+        title: 'hello',
+        uid: 'dash-1',
+        meta: {
+          canEdit: true,
+        },
+        body: new SceneGridLayout({
+          children: [
+            new DashboardGridItem({
+              key: 'griditem-1',
+              x: 0,
+              y: 0,
+              width: 10,
+              height: 12,
+              body: sourcePanel,
+            }),
+            new DashboardGridItem({
+              key: 'griditem-2',
+              x: 0,
+              y: 0,
+              width: 10,
+              height: 12,
+              body: dashboardDSPanel,
+            }),
+          ],
+        }),
+      });
+
+      activateFullSceneTree(scene);
+
+      // spy on runQueries
+      const spy = jest.spyOn(dashboardDSPanel.state.$data as SceneQueryRunner, 'runQueries');
+
+      await new Promise((r) => setTimeout(r, 1));
+
+      expect(spy).not.toHaveBeenCalled();
+
+      // Simulate library panel being loaded
+      sourcePanel.setState({
+        isLoaded: true,
+        panel: new VizPanel({
+          title: 'Panel A',
+          pluginId: 'table',
+          key: 'panel-1',
+          $data: new SceneQueryRunner({
+            datasource: { uid: 'grafana' },
+            queries: [{ refId: 'A', queryType: 'randomWalk' }],
+          }),
+        }),
+      });
+
+      expect(spy).toHaveBeenCalledTimes(1);
+    });
+  });
+});
+
+async function buildTestScene() {
+  const sourcePanel = new VizPanel({
+    title: 'Panel A',
+    pluginId: 'table',
+    key: 'panel-1',
+    $data: new SceneDataTransformer({
+      transformations: [],
+      $data: new SceneQueryRunner({
+        datasource: { uid: 'grafana' },
+        queries: [{ refId: 'A', queryType: 'randomWalk' }],
+      }),
+    }),
+  });
+
+  const dashboardDSPanel = new VizPanel({
+    title: 'Panel B',
+    pluginId: 'table',
+    key: 'panel-2',
+    $data: new SceneDataTransformer({
+      transformations: [],
+      $data: new SceneQueryRunner({
+        datasource: { uid: SHARED_DASHBOARD_QUERY },
+        queries: [{ refId: 'A', panelId: 1 }],
+        $behaviors: [new DashboardDatasourceBehaviour({})],
+      }),
+    }),
+  });
+
+  const scene = new DashboardScene({
+    title: 'hello',
+    uid: 'dash-1',
+    meta: {
+      canEdit: true,
+    },
+    body: new SceneGridLayout({
+      children: [
+        new DashboardGridItem({
+          key: 'griditem-1',
+          x: 0,
+          y: 0,
+          width: 10,
+          height: 12,
+          body: sourcePanel,
+        }),
+        new DashboardGridItem({
+          key: 'griditem-2',
+          x: 0,
+          y: 0,
+          width: 10,
+          height: 12,
+          body: dashboardDSPanel,
+        }),
+      ],
+    }),
+  });
+
+  const sceneDeactivate = activateFullSceneTree(scene);
+
+  await new Promise((r) => setTimeout(r, 1));
+
+  return { scene, sourcePanel, dashboardDSPanel, sceneDeactivate };
+}
diff --git a/public/app/features/dashboard-scene/scene/DashboardDatasourceBehaviour.tsx b/public/app/features/dashboard-scene/scene/DashboardDatasourceBehaviour.tsx
new file mode 100644
index 0000000000000..d8746198e009b
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/DashboardDatasourceBehaviour.tsx
@@ -0,0 +1,105 @@
+import { Unsubscribable } from 'rxjs';
+
+import {
+  CancelActivationHandler,
+  SceneObjectBase,
+  SceneObjectState,
+  SceneQueryRunner,
+  VizPanel,
+} from '@grafana/scenes';
+import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard';
+
+import { findVizPanelByKey, getDashboardSceneFor, getQueryRunnerFor, getVizPanelKeyForPanelId } from '../utils/utils';
+
+import { DashboardScene } from './DashboardScene';
+import { LibraryVizPanel, LibraryVizPanelState } from './LibraryVizPanel';
+
+interface DashboardDatasourceBehaviourState extends SceneObjectState {}
+
+export class DashboardDatasourceBehaviour extends SceneObjectBase<DashboardDatasourceBehaviourState> {
+  private prevRequestId: string | undefined;
+  public constructor(state: DashboardDatasourceBehaviourState) {
+    super(state);
+
+    this.addActivationHandler(() => this._activationHandler());
+  }
+
+  private _activationHandler() {
+    const queryRunner = this.parent;
+    let dashboard: DashboardScene;
+    let libraryPanelSub: Unsubscribable;
+
+    if (!(queryRunner instanceof SceneQueryRunner)) {
+      throw new Error('DashboardDatasourceBehaviour must be attached to a SceneQueryRunner');
+    }
+
+    if (queryRunner.state.datasource?.uid !== SHARED_DASHBOARD_QUERY) {
+      return;
+    }
+
+    try {
+      dashboard = getDashboardSceneFor(queryRunner);
+    } catch {
+      return;
+    }
+
+    const dashboardQuery = queryRunner.state.queries.find((query) => query.panelId !== undefined);
+
+    if (!dashboardQuery) {
+      return;
+    }
+
+    const panelId = dashboardQuery.panelId;
+    const vizKey = getVizPanelKeyForPanelId(panelId);
+    const panel = findVizPanelByKey(dashboard, vizKey);
+
+    if (!(panel instanceof VizPanel)) {
+      return;
+    }
+
+    const sourcePanelQueryRunner = getQueryRunnerFor(panel);
+
+    let parentLibPanelCleanUp: undefined | CancelActivationHandler;
+
+    if (!sourcePanelQueryRunner) {
+      if (!(panel.parent instanceof LibraryVizPanel)) {
+        throw new Error('Could not find SceneQueryRunner for panel');
+      } else {
+        if (!panel.parent.isActive) {
+          parentLibPanelCleanUp = panel.parent.activate();
+        }
+        // Library panels load and create internal viz panel asynchroniously. Here we are subscribing to
+        // library panel state, and run dashboard queries when the source panel query runner is ready.
+        libraryPanelSub = panel.parent.subscribeToState((n, p) => {
+          this.handleLibPanelStateUpdates(n, p, queryRunner);
+        });
+      }
+    } else {
+      if (this.prevRequestId && this.prevRequestId !== sourcePanelQueryRunner.state.data?.request?.requestId) {
+        queryRunner.runQueries();
+      }
+    }
+
+    return () => {
+      this.prevRequestId = sourcePanelQueryRunner?.state.data?.request?.requestId;
+      if (libraryPanelSub) {
+        libraryPanelSub.unsubscribe();
+      }
+      if (parentLibPanelCleanUp) {
+        parentLibPanelCleanUp();
+      }
+    };
+  }
+
+  private handleLibPanelStateUpdates(n: LibraryVizPanelState, p: LibraryVizPanelState, queryRunner: SceneQueryRunner) {
+    if (n.panel && n.panel !== p.panel) {
+      const libPanelQueryRunner = getQueryRunnerFor(n.panel);
+
+      if (!(libPanelQueryRunner instanceof SceneQueryRunner)) {
+        throw new Error('Could not find SceneQueryRunner for panel');
+      }
+
+      queryRunner.runQueries();
+    }
+  }
+}
diff --git a/public/app/features/dashboard-scene/scene/DashboardGridItem.test.tsx b/public/app/features/dashboard-scene/scene/DashboardGridItem.test.tsx
new file mode 100644
index 0000000000000..4a0ae48f83ce5
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/DashboardGridItem.test.tsx
@@ -0,0 +1,135 @@
+import { getPanelPlugin } from '@grafana/data/test/__mocks__/pluginMocks';
+import { setPluginImportUtils } from '@grafana/runtime';
+import { SceneGridLayout, VizPanel } from '@grafana/scenes';
+
+import { activateFullSceneTree, buildPanelRepeaterScene } from '../utils/test-utils';
+
+import { DashboardGridItem } from './DashboardGridItem';
+
+setPluginImportUtils({
+  importPanelPlugin: (id: string) => Promise.resolve(getPanelPlugin({})),
+  getPanelPluginFromCache: (id: string) => undefined,
+});
+
+describe('PanelRepeaterGridItem', () => {
+  it('Given scene with variable with 2 values', async () => {
+    const { scene, repeater } = buildPanelRepeaterScene({ variableQueryTime: 0 });
+
+    activateFullSceneTree(scene);
+
+    expect(repeater.state.repeatedPanels?.length).toBe(5);
+
+    const panel1 = repeater.state.repeatedPanels![0];
+    const panel2 = repeater.state.repeatedPanels![1];
+
+    // Panels should have scoped variables
+    expect(panel1.state.$variables?.state.variables[0].getValue()).toBe('1');
+    expect(panel1.state.$variables?.state.variables[0].getValueText?.()).toBe('A');
+    expect(panel2.state.$variables?.state.variables[0].getValue()).toBe('2');
+  });
+
+  it('Should wait for variable to load', async () => {
+    const { scene, repeater } = buildPanelRepeaterScene({ variableQueryTime: 1 });
+
+    activateFullSceneTree(scene);
+
+    expect(repeater.state.repeatedPanels?.length).toBe(0);
+
+    await new Promise((r) => setTimeout(r, 10));
+
+    expect(repeater.state.repeatedPanels?.length).toBe(5);
+  });
+
+  it('Should adjust container height to fit panels direction is horizontal', async () => {
+    const { scene, repeater } = buildPanelRepeaterScene({ variableQueryTime: 0, maxPerRow: 2, itemHeight: 10 });
+
+    const layoutForceRender = jest.fn();
+    (scene.state.body as SceneGridLayout).forceRender = layoutForceRender;
+
+    activateFullSceneTree(scene);
+
+    // panels require 3 rows so total height should be 30
+    expect(repeater.state.height).toBe(30);
+    // Should update layout state by force re-render
+    expect(layoutForceRender.mock.calls.length).toBe(1);
+  });
+
+  it('Should adjust container height to fit panels when direction is vertical', async () => {
+    const { scene, repeater } = buildPanelRepeaterScene({ variableQueryTime: 0, itemHeight: 10, repeatDirection: 'v' });
+
+    activateFullSceneTree(scene);
+
+    // In vertical direction height itemCount * itemHeight
+    expect(repeater.state.height).toBe(50);
+  });
+
+  it('Should adjust itemHeight when container is resized, direction horizontal', async () => {
+    const { scene, repeater } = buildPanelRepeaterScene({
+      variableQueryTime: 0,
+      itemHeight: 10,
+      repeatDirection: 'h',
+      maxPerRow: 4,
+    });
+
+    activateFullSceneTree(scene);
+
+    // Sould be two rows (5 panels and maxPerRow 5)
+    expect(repeater.state.height).toBe(20);
+
+    // resize container
+    repeater.setState({ height: 10 });
+    // given 2 current rows, the itemHeight is halved
+    expect(repeater.state.itemHeight).toBe(5);
+  });
+
+  it('Should adjust itemHeight when container is resized, direction vertical', async () => {
+    const { scene, repeater } = buildPanelRepeaterScene({
+      variableQueryTime: 0,
+      itemHeight: 10,
+      repeatDirection: 'v',
+    });
+
+    activateFullSceneTree(scene);
+
+    // In vertical direction height itemCount * itemHeight
+    expect(repeater.state.height).toBe(50);
+
+    // resize container
+    repeater.setState({ height: 25 });
+    // given 5 rows with total height 25 gives new itemHeight of 5
+    expect(repeater.state.itemHeight).toBe(5);
+  });
+
+  it('Should update repeats when updating variable', async () => {
+    const { scene, repeater, variable } = buildPanelRepeaterScene({ variableQueryTime: 0 });
+
+    activateFullSceneTree(scene);
+
+    variable.changeValueTo(['1', '3'], ['A', 'C']);
+
+    expect(repeater.state.repeatedPanels?.length).toBe(2);
+  });
+
+  it('Should fall back to default variable if specified variable cannot be found', () => {
+    const { scene, repeater } = buildPanelRepeaterScene({ variableQueryTime: 0 });
+    scene.setState({ $variables: undefined });
+    activateFullSceneTree(scene);
+    expect(repeater.state.repeatedPanels?.[0].state.$variables?.state.variables[0].state.name).toBe(
+      '_____default_sys_repeat_var_____'
+    );
+  });
+
+  it('Should return className when repeat variable is set', () => {
+    const { repeater } = buildPanelRepeaterScene({ variableQueryTime: 0 });
+
+    expect(repeater.getClassName()).toBe('panel-repeater-grid-item');
+  });
+
+  it('Should not className variable is not set', () => {
+    const gridItem = new DashboardGridItem({
+      body: new VizPanel({ pluginId: 'text' }),
+    });
+
+    expect(gridItem.getClassName()).toBe('');
+  });
+});
diff --git a/public/app/features/dashboard-scene/scene/DashboardGridItem.tsx b/public/app/features/dashboard-scene/scene/DashboardGridItem.tsx
new file mode 100644
index 0000000000000..a6a0eeea343d8
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/DashboardGridItem.tsx
@@ -0,0 +1,261 @@
+import { css } from '@emotion/css';
+import React, { useMemo } from 'react';
+
+import { config } from '@grafana/runtime';
+import {
+  VizPanel,
+  SceneObjectBase,
+  VariableDependencyConfig,
+  SceneGridLayout,
+  SceneVariableSet,
+  SceneComponentProps,
+  SceneGridItemStateLike,
+  SceneGridItemLike,
+  sceneGraph,
+  MultiValueVariable,
+  LocalValueVariable,
+  CustomVariable,
+  VizPanelMenu,
+  VizPanelState,
+} from '@grafana/scenes';
+import { GRID_CELL_HEIGHT, GRID_CELL_VMARGIN } from 'app/core/constants';
+
+import { getMultiVariableValues } from '../utils/utils';
+
+import { AddLibraryPanelDrawer } from './AddLibraryPanelDrawer';
+import { LibraryVizPanel } from './LibraryVizPanel';
+import { repeatPanelMenuBehavior } from './PanelMenuBehavior';
+import { DashboardRepeatsProcessedEvent } from './types';
+
+interface DashboardGridItemState extends SceneGridItemStateLike {
+  body: VizPanel | LibraryVizPanel | AddLibraryPanelDrawer;
+  repeatedPanels?: VizPanel[];
+  variableName?: string;
+  itemHeight?: number;
+  repeatDirection?: RepeatDirection;
+  maxPerRow?: number;
+}
+
+export type RepeatDirection = 'v' | 'h';
+
+export class DashboardGridItem extends SceneObjectBase<DashboardGridItemState> implements SceneGridItemLike {
+  protected _variableDependency = new VariableDependencyConfig(this, {
+    variableNames: this.state.variableName ? [this.state.variableName] : [],
+    onVariableUpdateCompleted: this._onVariableUpdateCompleted.bind(this),
+  });
+
+  public constructor(state: DashboardGridItemState) {
+    super(state);
+
+    this.addActivationHandler(() => this._activationHandler());
+  }
+
+  private _activationHandler() {
+    if (this.state.variableName) {
+      this._subs.add(this.subscribeToState((newState, prevState) => this._handleGridResize(newState, prevState)));
+      this._performRepeat();
+    }
+  }
+
+  private _onVariableUpdateCompleted(): void {
+    if (this.state.variableName) {
+      this._performRepeat();
+    }
+  }
+
+  /**
+   * Uses the current repeat item count to calculate the user intended desired itemHeight
+   */
+  private _handleGridResize(newState: DashboardGridItemState, prevState: DashboardGridItemState) {
+    const itemCount = this.state.repeatedPanels?.length ?? 1;
+    const stateChange: Partial<DashboardGridItemState> = {};
+
+    // Height changed
+    if (newState.height === prevState.height) {
+      return;
+    }
+
+    if (this.getRepeatDirection() === 'v') {
+      const itemHeight = Math.ceil(newState.height! / itemCount);
+      stateChange.itemHeight = itemHeight;
+    } else {
+      const rowCount = Math.ceil(itemCount / this.getMaxPerRow());
+      stateChange.itemHeight = Math.ceil(newState.height! / rowCount);
+    }
+
+    if (stateChange.itemHeight !== this.state.itemHeight) {
+      this.setState(stateChange);
+    }
+  }
+
+  private _performRepeat() {
+    if (this.state.body instanceof AddLibraryPanelDrawer) {
+      return;
+    }
+    if (!this.state.variableName || this._variableDependency.hasDependencyInLoadingState()) {
+      return;
+    }
+
+    const variable =
+      sceneGraph.lookupVariable(this.state.variableName, this) ??
+      new CustomVariable({
+        name: '_____default_sys_repeat_var_____',
+        options: [],
+        value: '',
+        text: '',
+        query: 'A',
+      });
+
+    if (!(variable instanceof MultiValueVariable)) {
+      console.error('DashboardGridItem: Variable is not a MultiValueVariable');
+      return;
+    }
+
+    let panelToRepeat = this.state.body instanceof LibraryVizPanel ? this.state.body.state.panel! : this.state.body;
+    const { values, texts } = getMultiVariableValues(variable);
+    const repeatedPanels: VizPanel[] = [];
+
+    // Loop through variable values and create repeats
+    for (let index = 0; index < values.length; index++) {
+      const cloneState: Partial<VizPanelState> = {
+        $variables: new SceneVariableSet({
+          variables: [
+            new LocalValueVariable({ name: variable.state.name, value: values[index], text: String(texts[index]) }),
+          ],
+        }),
+        key: `${panelToRepeat.state.key}-clone-${index}`,
+      };
+      if (index > 0) {
+        cloneState.menu = new VizPanelMenu({
+          $behaviors: [repeatPanelMenuBehavior],
+        });
+      }
+      const clone = panelToRepeat.clone(cloneState);
+      repeatedPanels.push(clone);
+    }
+
+    const direction = this.getRepeatDirection();
+    const stateChange: Partial<DashboardGridItemState> = { repeatedPanels: repeatedPanels };
+    const itemHeight = this.state.itemHeight ?? 10;
+    const prevHeight = this.state.height;
+    const maxPerRow = this.getMaxPerRow();
+
+    if (direction === 'h') {
+      const rowCount = Math.ceil(repeatedPanels.length / maxPerRow);
+      stateChange.height = rowCount * itemHeight;
+    } else {
+      stateChange.height = repeatedPanels.length * itemHeight;
+    }
+
+    this.setState(stateChange);
+
+    // In case we updated our height the grid layout needs to be update
+    if (prevHeight !== this.state.height) {
+      const layout = sceneGraph.getLayout(this);
+      if (layout instanceof SceneGridLayout) {
+        layout.forceRender();
+      }
+    }
+
+    // Used from dashboard url sync
+    this.publishEvent(new DashboardRepeatsProcessedEvent({ source: this }), true);
+  }
+
+  public getMaxPerRow(): number {
+    return this.state.maxPerRow ?? 4;
+  }
+
+  public getRepeatDirection(): RepeatDirection {
+    return this.state.repeatDirection === 'v' ? 'v' : 'h';
+  }
+
+  public getClassName() {
+    return this.state.variableName ? 'panel-repeater-grid-item' : '';
+  }
+
+  public isRepeated() {
+    return this.state.variableName !== undefined;
+  }
+
+  public static Component = ({ model }: SceneComponentProps<DashboardGridItem>) => {
+    const { repeatedPanels, itemHeight, variableName, body } = model.useState();
+    const itemCount = repeatedPanels?.length ?? 0;
+    const layoutStyle = useLayoutStyle(model.getRepeatDirection(), itemCount, model.getMaxPerRow(), itemHeight ?? 10);
+
+    if (!variableName) {
+      if (body instanceof VizPanel) {
+        return <body.Component model={body} key={body.state.key} />;
+      }
+
+      if (body instanceof LibraryVizPanel) {
+        return <body.Component model={body} key={body.state.key} />;
+      }
+
+      if (body instanceof AddLibraryPanelDrawer) {
+        return <body.Component model={body} key={body.state.key} />;
+      }
+    }
+
+    if (!repeatedPanels) {
+      return null;
+    }
+
+    return (
+      <div className={layoutStyle}>
+        {repeatedPanels.map((panel) => (
+          <div className={itemStyle} key={panel.state.key}>
+            <panel.Component model={panel} key={panel.state.key} />
+          </div>
+        ))}
+      </div>
+    );
+  };
+}
+
+function useLayoutStyle(direction: RepeatDirection, itemCount: number, maxPerRow: number, itemHeight: number) {
+  return useMemo(() => {
+    const theme = config.theme2;
+
+    // In mobile responsive layout we have to calculate the absolute height
+    const mobileHeight = itemHeight * GRID_CELL_HEIGHT * itemCount + (itemCount - 1) * GRID_CELL_VMARGIN;
+
+    if (direction === 'h') {
+      const rowCount = Math.ceil(itemCount / maxPerRow);
+      const columnCount = Math.min(itemCount, maxPerRow);
+
+      return css({
+        display: 'grid',
+        height: '100%',
+        width: '100%',
+        gridTemplateColumns: `repeat(${columnCount}, 1fr)`,
+        gridTemplateRows: `repeat(${rowCount}, 1fr)`,
+        gridColumnGap: theme.spacing(1),
+        gridRowGap: theme.spacing(1),
+
+        [theme.breakpoints.down('md')]: {
+          display: 'flex',
+          flexDirection: 'column',
+          height: mobileHeight,
+        },
+      });
+    }
+
+    // Vertical is a bit simpler
+    return css({
+      display: 'flex',
+      height: '100%',
+      width: '100%',
+      flexDirection: 'column',
+      gap: theme.spacing(1),
+      [theme.breakpoints.down('md')]: {
+        height: mobileHeight,
+      },
+    });
+  }, [direction, itemCount, maxPerRow, itemHeight]);
+}
+
+const itemStyle = css({
+  display: 'flex',
+  flexGrow: 1,
+  position: 'relative',
+});
diff --git a/public/app/features/dashboard-scene/scene/DashboardLinksControls.tsx b/public/app/features/dashboard-scene/scene/DashboardLinksControls.tsx
new file mode 100644
index 0000000000000..a535b3517fef5
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/DashboardLinksControls.tsx
@@ -0,0 +1,57 @@
+import React from 'react';
+
+import { sanitizeUrl } from '@grafana/data/src/text/sanitize';
+import { selectors } from '@grafana/e2e-selectors';
+import { DashboardLink } from '@grafana/schema';
+import { Tooltip } from '@grafana/ui';
+import {
+  DashboardLinkButton,
+  DashboardLinksDashboard,
+} from 'app/features/dashboard/components/SubMenu/DashboardLinksDashboard';
+import { getLinkSrv } from 'app/features/panel/panellinks/link_srv';
+
+import { LINK_ICON_MAP } from '../settings/links/utils';
+
+export interface Props {
+  links: DashboardLink[];
+  uid?: string;
+}
+
+export function DashboardLinksControls({ links, uid }: Props) {
+  if (!links || !uid) {
+    return null;
+  }
+
+  return (
+    <>
+      {links.map((link: DashboardLink, index: number) => {
+        const linkInfo = getLinkSrv().getAnchorInfo(link);
+        const key = `${link.title}-$${index}`;
+
+        if (link.type === 'dashboards') {
+          return <DashboardLinksDashboard key={key} link={link} linkInfo={linkInfo} dashboardUID={uid} />;
+        }
+
+        const icon = LINK_ICON_MAP[link.icon];
+
+        const linkElement = (
+          <DashboardLinkButton
+            icon={icon}
+            href={sanitizeUrl(linkInfo.href)}
+            target={link.targetBlank ? '_blank' : undefined}
+            rel="noreferrer"
+            data-testid={selectors.components.DashboardLinks.link}
+          >
+            {linkInfo.title}
+          </DashboardLinkButton>
+        );
+
+        return (
+          <div key={key} data-testid={selectors.components.DashboardLinks.container}>
+            {link.tooltip ? <Tooltip content={linkInfo.tooltip}>{linkElement}</Tooltip> : linkElement}
+          </div>
+        );
+      })}
+    </>
+  );
+}
diff --git a/public/app/features/dashboard-scene/scene/DashboardMacro.ts b/public/app/features/dashboard-scene/scene/DashboardMacro.ts
new file mode 100644
index 0000000000000..cb74c7f3baf5d
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/DashboardMacro.ts
@@ -0,0 +1,40 @@
+import { FormatVariable, SceneObject, sceneUtils } from '@grafana/scenes';
+
+import { getDashboardSceneFor } from '../utils/utils';
+
+/**
+ * Handles expressions like ${__dashboard.uid}
+ */
+class DashboardMacro implements FormatVariable {
+  public state: { name: string; type: string };
+
+  public constructor(
+    name: string,
+    private _sceneObject: SceneObject
+  ) {
+    this.state = { name: name, type: 'dashboard_macro' };
+  }
+
+  public getValue(fieldPath?: string): string {
+    const dashboard = getDashboardSceneFor(this._sceneObject);
+    switch (fieldPath) {
+      case 'uid':
+        return dashboard.state.uid || '';
+      case 'title':
+      case 'name':
+      case 'id':
+      default:
+        return dashboard.state.title;
+    }
+  }
+
+  public getValueText?(): string {
+    return '';
+  }
+}
+
+export function registerDashboardMacro() {
+  const unregister = sceneUtils.registerVariableMacro('__dashboard', DashboardMacro);
+
+  return () => unregister();
+}
diff --git a/public/app/features/dashboard-scene/scene/DashboardScene.test.tsx b/public/app/features/dashboard-scene/scene/DashboardScene.test.tsx
index 4ee8261448287..041c692036fe6 100644
--- a/public/app/features/dashboard-scene/scene/DashboardScene.test.tsx
+++ b/public/app/features/dashboard-scene/scene/DashboardScene.test.tsx
@@ -1,8 +1,85 @@
-import { CoreApp } from '@grafana/data';
-import { sceneGraph, SceneGridItem, SceneGridLayout, SceneQueryRunner, VizPanel } from '@grafana/scenes';
+import { CoreApp, LoadingState, getDefaultTimeRange } from '@grafana/data';
+import { locationService } from '@grafana/runtime';
+import {
+  sceneGraph,
+  SceneGridLayout,
+  SceneTimeRange,
+  SceneQueryRunner,
+  SceneVariableSet,
+  TestVariable,
+  VizPanel,
+  SceneGridRow,
+  behaviors,
+  SceneDataTransformer,
+} from '@grafana/scenes';
+import { Dashboard, DashboardCursorSync } from '@grafana/schema';
+import appEvents from 'app/core/app_events';
 import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
+import { VariablesChanged } from 'app/features/variables/types';
 
-import { DashboardScene } from './DashboardScene';
+import { PanelEditor, buildPanelEditScene } from '../panel-edit/PanelEditor';
+import { createWorker } from '../saving/createDetectChangesWorker';
+import {
+  buildGridItemForLibPanel,
+  buildGridItemForPanel,
+  transformSaveModelToScene,
+} from '../serialization/transformSaveModelToScene';
+import { DecoratedRevisionModel } from '../settings/VersionsEditView';
+import { historySrv } from '../settings/version-history/HistorySrv';
+import { dashboardSceneGraph } from '../utils/dashboardSceneGraph';
+import { djb2Hash } from '../utils/djb2Hash';
+import { findVizPanelByKey } from '../utils/utils';
+
+import { DashboardControls } from './DashboardControls';
+import { DashboardGridItem } from './DashboardGridItem';
+import { DashboardScene, DashboardSceneState } from './DashboardScene';
+import { LibraryVizPanel } from './LibraryVizPanel';
+import { PanelTimeRange } from './PanelTimeRange';
+import { RowActions } from './row-actions/RowActions';
+
+jest.mock('../settings/version-history/HistorySrv');
+jest.mock('../serialization/transformSaveModelToScene');
+jest.mock('../saving/getDashboardChangesFromScene', () => ({
+  // It compares the initial and changed save models and returns the differences
+  // By default we assume there are differences to have the dirty state test logic tested
+  getDashboardChangesFromScene: jest.fn(() => ({
+    changedSaveModel: {},
+    initialSaveModel: {},
+    diffs: [],
+    diffCount: 0,
+    hasChanges: true,
+    hasTimeChanges: false,
+    isNew: false,
+    hasVariableValueChanges: false,
+  })),
+}));
+jest.mock('../serialization/transformSceneToSaveModel');
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getDataSourceSrv: () => {
+    return {
+      getInstanceSettings: jest.fn().mockResolvedValue({ uid: 'ds1' }),
+    };
+  },
+}));
+
+jest.mock('app/features/playlist/PlaylistSrv', () => ({
+  ...jest.requireActual('app/features/playlist/PlaylistSrv'),
+  playlistSrv: {
+    isPlaying: false,
+    next: jest.fn(),
+    prev: jest.fn(),
+    stop: jest.fn(),
+  },
+}));
+
+jest.mock('app/features/manage-dashboards/state/actions', () => ({
+  ...jest.requireActual('app/features/manage-dashboards/state/actions'),
+  deleteDashboard: jest.fn().mockResolvedValue({}),
+}));
+
+const worker = createWorker();
+mockResultsOfDetectChangesWorker({ hasChanges: true, hasTimeChanges: false, hasVariableValueChanges: false });
 
 describe('DashboardScene', () => {
   describe('DashboardSrv.getCurrent compatibility', () => {
@@ -15,30 +92,814 @@ describe('DashboardScene', () => {
   });
 
   describe('Editing and discarding', () => {
+    describe('Given scene in view mode', () => {
+      it('Should set isEditing to false', () => {
+        const scene = buildTestScene();
+        scene.activate();
+
+        expect(scene.state.isEditing).toBeFalsy();
+      });
+
+      it('Should not start the detect changes worker', () => {
+        const scene = buildTestScene();
+        scene.activate();
+
+        // @ts-expect-error it is a private property
+        expect(scene._changesWorker).toBeUndefined();
+      });
+    });
+
+    describe('Given new dashboard in edit mode', () => {
+      it('when saving it should clear isNew state', () => {
+        const scene = buildTestScene({
+          meta: { isNew: true },
+        });
+
+        scene.activate();
+        scene.onEnterEditMode();
+        scene.saveCompleted({} as Dashboard, {
+          id: 1,
+          slug: 'slug',
+          uid: 'dash-1',
+          url: 'sss',
+          version: 2,
+          status: 'aaa',
+        });
+
+        expect(scene.state.meta.isNew).toBeFalsy();
+      });
+    });
+
     describe('Given scene in edit mode', () => {
       let scene: DashboardScene;
+      let deactivateScene: () => void;
 
       beforeEach(() => {
         scene = buildTestScene();
+        deactivateScene = scene.activate();
         scene.onEnterEditMode();
+        jest.clearAllMocks();
       });
 
       it('Should set isEditing to true', () => {
         expect(scene.state.isEditing).toBe(true);
       });
 
+      it('Exiting already saved dashboard should not restore initial state', () => {
+        scene.setState({ title: 'Updated title' });
+        expect(scene.state.isDirty).toBe(true);
+
+        scene.saveCompleted({} as Dashboard, {
+          id: 1,
+          slug: 'slug',
+          uid: 'dash-1',
+          url: 'sss',
+          version: 2,
+          status: 'aaa',
+        });
+
+        expect(scene.state.isDirty).toBe(false);
+        scene.exitEditMode({ skipConfirm: true });
+        expect(scene.state.title).toEqual('Updated title');
+      });
+
+      it('Should start the detect changes worker', () => {
+        expect(worker.onmessage).toBeDefined();
+      });
+
+      it('Should terminate the detect changes worker when deactivate', () => {
+        expect(worker.terminate).toHaveBeenCalledTimes(0);
+        deactivateScene();
+        expect(worker.terminate).toHaveBeenCalledTimes(1);
+      });
+
       it('A change to griditem pos should set isDirty true', () => {
-        const gridItem = sceneGraph.findObject(scene, (p) => p.state.key === 'griditem-1') as SceneGridItem;
+        const gridItem = sceneGraph.findObject(scene, (p) => p.state.key === 'griditem-1') as DashboardGridItem;
         gridItem.setState({ x: 10, y: 0, width: 10, height: 10 });
 
         expect(scene.state.isDirty).toBe(true);
 
-        // verify can discard change
-        scene.onDiscard();
-
-        const gridItem2 = sceneGraph.findObject(scene, (p) => p.state.key === 'griditem-1') as SceneGridItem;
+        scene.exitEditMode({ skipConfirm: true });
+        const gridItem2 = sceneGraph.findObject(scene, (p) => p.state.key === 'griditem-1') as DashboardGridItem;
         expect(gridItem2.state.x).toBe(0);
       });
+
+      it('A change to gridlayout children order should set isDirty true', () => {
+        const layout = sceneGraph.findObject(scene, (p) => p instanceof SceneGridLayout) as SceneGridLayout;
+        const originalPanelOrder = layout.state.children.map((c) => c.state.key);
+
+        // Change the order of the children. This happen when panels move around, then the children are re-ordered
+        layout.setState({
+          children: [layout.state.children[1], layout.state.children[0], layout.state.children[2]],
+        });
+
+        expect(scene.state.isDirty).toBe(true);
+
+        scene.exitEditMode({ skipConfirm: true });
+        const resoredLayout = sceneGraph.findObject(scene, (p) => p instanceof SceneGridLayout) as SceneGridLayout;
+        expect(resoredLayout.state.children.map((c) => c.state.key)).toEqual(originalPanelOrder);
+      });
+
+      it.each`
+        prop             | value
+        ${'title'}       | ${'new title'}
+        ${'description'} | ${'new description'}
+        ${'tags'}        | ${['tag3', 'tag4']}
+        ${'editable'}    | ${false}
+        ${'links'}       | ${[]}
+      `(
+        'A change to $prop should set isDirty true',
+        ({ prop, value }: { prop: keyof DashboardSceneState; value: unknown }) => {
+          const prevState = scene.state[prop];
+          scene.setState({ [prop]: value });
+
+          expect(scene.state.isDirty).toBe(true);
+
+          scene.exitEditMode({ skipConfirm: true });
+          expect(scene.state[prop]).toEqual(prevState);
+        }
+      );
+
+      it('A change to folderUid should set isDirty true', () => {
+        const prevMeta = { ...scene.state.meta };
+
+        // The worker only detects changes in the model, so the folder change should be detected anyway
+        mockResultsOfDetectChangesWorker({ hasChanges: false, hasTimeChanges: false, hasVariableValueChanges: false });
+
+        scene.setState({
+          meta: {
+            ...prevMeta,
+            folderUid: 'new-folder-uid',
+            folderTitle: 'new-folder-title',
+          },
+        });
+
+        expect(scene.state.isDirty).toBe(true);
+
+        scene.exitEditMode({ skipConfirm: true });
+        expect(scene.state.meta).toEqual(prevMeta);
+      });
+
+      it('A change to refresh picker interval settings should set isDirty true', () => {
+        const refreshPicker = dashboardSceneGraph.getRefreshPicker(scene)!;
+        const prevState = [...refreshPicker.state.intervals!];
+        refreshPicker.setState({ intervals: ['10s'] });
+
+        expect(scene.state.isDirty).toBe(true);
+
+        scene.exitEditMode({ skipConfirm: true });
+        expect(dashboardSceneGraph.getRefreshPicker(scene)!.state.intervals).toEqual(prevState);
+      });
+
+      it('A enabling/disabling live now setting should set isDirty true', () => {
+        const liveNowTimer = scene.state.$behaviors?.find(
+          (b) => b instanceof behaviors.LiveNowTimer
+        ) as behaviors.LiveNowTimer;
+        liveNowTimer.enable();
+
+        expect(scene.state.isDirty).toBe(true);
+
+        scene.exitEditMode({ skipConfirm: true });
+        const restoredLiveNowTimer = scene.state.$behaviors?.find(
+          (b) => b instanceof behaviors.LiveNowTimer
+        ) as behaviors.LiveNowTimer;
+        expect(restoredLiveNowTimer.state.enabled).toBeFalsy();
+      });
+
+      it('A change to time picker visibility settings should set isDirty true', () => {
+        const dashboardControls = scene.state.controls!;
+        const prevState = dashboardControls.state.hideTimeControls;
+        dashboardControls.setState({ hideTimeControls: true });
+
+        expect(scene.state.isDirty).toBe(true);
+
+        scene.exitEditMode({ skipConfirm: true });
+        expect(scene.state.controls!.state.hideTimeControls).toEqual(prevState);
+      });
+
+      it('A change to time zone should set isDirty true', () => {
+        const timeRange = sceneGraph.getTimeRange(scene)!;
+        const prevState = timeRange.state.timeZone;
+        timeRange.setState({ timeZone: 'UTC' });
+
+        expect(scene.state.isDirty).toBe(true);
+
+        scene.exitEditMode({ skipConfirm: true });
+        expect(sceneGraph.getTimeRange(scene)!.state.timeZone).toBe(prevState);
+      });
+
+      it('A change to a cursor sync config should set isDirty true', () => {
+        const cursorSync = dashboardSceneGraph.getCursorSync(scene)!;
+        const initialState = cursorSync.state;
+
+        cursorSync.setState({
+          sync: DashboardCursorSync.Tooltip,
+        });
+
+        expect(scene.state.isDirty).toBe(true);
+
+        scene.exitEditMode({ skipConfirm: true });
+        expect(dashboardSceneGraph.getCursorSync(scene)!.state).toEqual(initialState);
+      });
+
+      it('A change to a any VizPanel state should set isDirty true', () => {
+        const panel = sceneGraph.findObject(scene, (p) => p instanceof VizPanel) as VizPanel;
+        const prevTitle = panel.state.title;
+        panel.setState({ title: 'new title' });
+
+        expect(scene.state.isDirty).toBe(true);
+
+        scene.exitEditMode({ skipConfirm: true });
+        const restoredPanel = sceneGraph.findObject(scene, (p) => p instanceof VizPanel) as VizPanel;
+        expect(restoredPanel.state.title).toBe(prevTitle);
+      });
+
+      it('A change to any DashboardGridItem state should set isDirty true', () => {
+        const dashboardGridItem = sceneGraph.findObject(
+          scene,
+          (p) => p instanceof DashboardGridItem
+        ) as DashboardGridItem;
+        const prevValue = dashboardGridItem.state.variableName;
+
+        dashboardGridItem.setState({ variableName: 'var1', repeatDirection: 'h', maxPerRow: 2 });
+
+        expect(scene.state.isDirty).toBe(true);
+
+        scene.exitEditMode({ skipConfirm: true });
+        const restoredDashboardGridItem = sceneGraph.findObject(
+          scene,
+          (p) => p instanceof DashboardGridItem
+        ) as DashboardGridItem;
+        expect(restoredDashboardGridItem.state.variableName).toBe(prevValue);
+      });
+
+      it('A change to any LibraryVizPanel name should set isDirty true', () => {
+        const libraryVizPanel = sceneGraph.findObject(scene, (p) => p instanceof LibraryVizPanel) as LibraryVizPanel;
+        const prevValue = libraryVizPanel.state.name;
+
+        libraryVizPanel.setState({ name: 'new name' });
+
+        expect(scene.state.isDirty).toBe(true);
+
+        scene.exitEditMode({ skipConfirm: true });
+        const restoredLibraryVizPanel = sceneGraph.findObject(
+          scene,
+          (p) => p instanceof LibraryVizPanel
+        ) as LibraryVizPanel;
+        expect(restoredLibraryVizPanel.state.name).toBe(prevValue);
+      });
+
+      it('A change to any PanelTimeRange state should set isDirty true', () => {
+        const panelTimeRange = sceneGraph.findObject(scene, (p) => p instanceof PanelTimeRange) as PanelTimeRange;
+        const prevValue = panelTimeRange.state.from;
+
+        panelTimeRange.setState({ from: 'now-1h', to: 'now' });
+
+        expect(scene.state.isDirty).toBe(true);
+
+        scene.exitEditMode({ skipConfirm: true });
+        const restoredPanelTimeRange = sceneGraph.findObject(
+          scene,
+          (p) => p instanceof PanelTimeRange
+        ) as PanelTimeRange;
+        expect(restoredPanelTimeRange.state.from).toEqual(prevValue);
+      });
+
+      it('A change to any SceneQueryRunner state should set isDirty true', () => {
+        const queryRunner = sceneGraph.findObject(scene, (p) => p instanceof SceneQueryRunner) as SceneQueryRunner;
+        const prevValue = queryRunner.state.queries;
+
+        queryRunner.setState({ queries: [{ refId: 'A', datasource: { uid: 'fake-uid', type: 'test' } }] });
+
+        expect(scene.state.isDirty).toBe(true);
+
+        scene.exitEditMode({ skipConfirm: true });
+        const restoredQueryRunner = sceneGraph.findObject(
+          scene,
+          (p) => p instanceof SceneQueryRunner
+        ) as SceneQueryRunner;
+        expect(restoredQueryRunner.state.queries).toEqual(prevValue);
+      });
+
+      it('A change to any SceneDataTransformer state should set isDirty true', () => {
+        const dataTransformer = sceneGraph.findObject(
+          scene,
+          (p) => p instanceof SceneDataTransformer
+        ) as SceneDataTransformer;
+        const prevValue = dataTransformer.state.transformations;
+
+        dataTransformer.setState({ transformations: [{ id: 'fake-transformation', options: {} }] });
+
+        expect(scene.state.isDirty).toBe(true);
+
+        scene.exitEditMode({ skipConfirm: true });
+        const restoredDataTransformer = sceneGraph.findObject(
+          scene,
+          (p) => p instanceof SceneDataTransformer
+        ) as SceneDataTransformer;
+        expect(restoredDataTransformer.state.transformations).toEqual(prevValue);
+      });
+
+      it('A change to any SceneDataTransformer data should NOT set isDirty true', () => {
+        const dataTransformer = sceneGraph.findObject(
+          scene,
+          (p) => p instanceof SceneDataTransformer
+        ) as SceneDataTransformer;
+        const prevValue = dataTransformer.state.data;
+        const newData = { state: LoadingState.Done, timeRange: getDefaultTimeRange(), series: [] };
+
+        dataTransformer.setState({ data: newData });
+
+        expect(scene.state.isDirty).toBeFalsy();
+
+        scene.exitEditMode({ skipConfirm: true });
+
+        const restoredDataTransformer = sceneGraph.findObject(
+          scene,
+          (p) => p instanceof SceneDataTransformer
+        ) as SceneDataTransformer;
+        expect(restoredDataTransformer.state.data).toEqual(prevValue);
+      });
+
+      it.each([
+        { hasChanges: true, hasTimeChanges: false, hasVariableValueChanges: false },
+        { hasChanges: true, hasTimeChanges: true, hasVariableValueChanges: false },
+        { hasChanges: true, hasTimeChanges: false, hasVariableValueChanges: true },
+      ])('should set the state to true if there are changes detected in the saving model', (diffResults) => {
+        mockResultsOfDetectChangesWorker(diffResults);
+        scene.setState({ title: 'hello' });
+        expect(scene.state.isDirty).toBeTruthy();
+      });
+
+      it.each([
+        { hasChanges: false, hasTimeChanges: false, hasVariableValueChanges: false },
+        { hasChanges: false, hasTimeChanges: true, hasVariableValueChanges: false },
+        { hasChanges: false, hasTimeChanges: false, hasVariableValueChanges: true },
+      ])('should not set the state to true if there are no change detected in the dashboard', (diffResults) => {
+        mockResultsOfDetectChangesWorker(diffResults);
+        scene.setState({ title: 'hello' });
+        expect(scene.state.isDirty).toBeFalsy();
+      });
+
+      it('Should throw an error when adding a panel to a layout that is not SceneGridLayout', () => {
+        const scene = buildTestScene({ body: undefined });
+
+        expect(() => {
+          scene.addPanel(new VizPanel({ title: 'Panel Title', key: 'panel-4', pluginId: 'timeseries' }));
+        }).toThrow('Trying to add a panel in a layout that is not SceneGridLayout');
+      });
+
+      it('Should add a new panel to the dashboard', () => {
+        const vizPanel = new VizPanel({
+          title: 'Panel Title',
+          key: 'panel-5',
+          pluginId: 'timeseries',
+          $data: new SceneQueryRunner({ key: 'data-query-runner', queries: [{ refId: 'A' }] }),
+        });
+
+        scene.addPanel(vizPanel);
+
+        const body = scene.state.body as SceneGridLayout;
+        const gridItem = body.state.children[0] as DashboardGridItem;
+
+        expect(body.state.children.length).toBe(6);
+        expect(gridItem.state.body!.state.key).toBe('panel-5');
+        expect(gridItem.state.y).toBe(0);
+      });
+
+      it('Should create and add a new panel to the dashboard', () => {
+        scene.exitEditMode({ skipConfirm: true });
+        expect(scene.state.isEditing).toBe(false);
+
+        scene.onCreateNewPanel();
+
+        const body = scene.state.body as SceneGridLayout;
+        const gridItem = body.state.children[0] as DashboardGridItem;
+
+        expect(scene.state.isEditing).toBe(true);
+        expect(body.state.children.length).toBe(6);
+        expect(gridItem.state.body!.state.key).toBe('panel-7');
+      });
+
+      it('Should create and add a new row to the dashboard', () => {
+        scene.onCreateNewRow();
+
+        const body = scene.state.body as SceneGridLayout;
+        const gridRow = body.state.children[0] as SceneGridRow;
+
+        expect(scene.state.isEditing).toBe(true);
+        expect(body.state.children.length).toBe(4);
+        expect(gridRow.state.key).toBe('panel-7');
+        expect(gridRow.state.children[0].state.key).toBe('griditem-1');
+        expect(gridRow.state.children[1].state.key).toBe('griditem-2');
+      });
+
+      it('Should create a row and add all panels in the dashboard under it', () => {
+        const scene = buildTestScene({
+          body: new SceneGridLayout({
+            children: [
+              new DashboardGridItem({
+                key: 'griditem-1',
+                x: 0,
+                body: new VizPanel({
+                  title: 'Panel A',
+                  key: 'panel-1',
+                  pluginId: 'table',
+                  $data: new SceneQueryRunner({ key: 'data-query-runner', queries: [{ refId: 'A' }] }),
+                }),
+              }),
+              new DashboardGridItem({
+                key: 'griditem-2',
+                body: new VizPanel({
+                  title: 'Panel B',
+                  key: 'panel-2',
+                  pluginId: 'table',
+                }),
+              }),
+            ],
+          }),
+        });
+
+        scene.onCreateNewRow();
+
+        const body = scene.state.body as SceneGridLayout;
+        const gridRow = body.state.children[0] as SceneGridRow;
+
+        expect(body.state.children.length).toBe(1);
+        expect(gridRow.state.children.length).toBe(2);
+      });
+
+      it('Should create and add two new rows, but the second has no children', () => {
+        scene.onCreateNewRow();
+        scene.onCreateNewRow();
+
+        const body = scene.state.body as SceneGridLayout;
+        const gridRow = body.state.children[0] as SceneGridRow;
+
+        expect(body.state.children.length).toBe(5);
+        expect(gridRow.state.children.length).toBe(0);
+      });
+
+      it('Should create an empty row when nothing else in dashboard', () => {
+        const scene = buildTestScene({
+          body: new SceneGridLayout({
+            children: [],
+          }),
+        });
+
+        scene.onCreateNewRow();
+
+        const body = scene.state.body as SceneGridLayout;
+        const gridRow = body.state.children[0] as SceneGridRow;
+
+        expect(body.state.children.length).toBe(1);
+        expect(gridRow.state.children.length).toBe(0);
+      });
+
+      it('Should remove a row and move its children to the grid layout', () => {
+        const body = scene.state.body as SceneGridLayout;
+        const row = body.state.children[2] as SceneGridRow;
+
+        scene.removeRow(row);
+
+        const vizPanel = (body.state.children[2] as DashboardGridItem).state.body as VizPanel;
+
+        expect(body.state.children.length).toBe(6);
+        expect(vizPanel.state.key).toBe('panel-4');
+      });
+
+      it('Should remove a row and its children', () => {
+        const body = scene.state.body as SceneGridLayout;
+        const row = body.state.children[2] as SceneGridRow;
+
+        scene.removeRow(row, true);
+
+        expect(body.state.children.length).toBe(4);
+      });
+
+      it('Should remove an empty row from the layout', () => {
+        const row = new SceneGridRow({
+          key: 'panel-1',
+        });
+
+        const scene = buildTestScene({
+          body: new SceneGridLayout({
+            children: [row],
+          }),
+        });
+
+        const body = scene.state.body as SceneGridLayout;
+
+        expect(body.state.children.length).toBe(1);
+
+        scene.removeRow(row);
+
+        expect(body.state.children.length).toBe(0);
+      });
+
+      it('Should fail to copy a panel if it does not have a grid item parent', () => {
+        const vizPanel = new VizPanel({
+          title: 'Panel Title',
+          key: 'panel-5',
+          pluginId: 'timeseries',
+        });
+
+        scene.copyPanel(vizPanel);
+
+        expect(scene.state.hasCopiedPanel).toBe(false);
+      });
+
+      it('Should fail to copy a library panel if it does not have a grid item parent', () => {
+        const libVizPanel = new LibraryVizPanel({
+          uid: 'uid',
+          name: 'libraryPanel',
+          panelKey: 'panel-4',
+          title: 'Library Panel',
+          panel: new VizPanel({
+            title: 'Library Panel',
+            key: 'panel-4',
+            pluginId: 'table',
+          }),
+        });
+
+        scene.copyPanel(libVizPanel.state.panel as VizPanel);
+
+        expect(scene.state.hasCopiedPanel).toBe(false);
+      });
+
+      it('Should copy a panel', () => {
+        const vizPanel = ((scene.state.body as SceneGridLayout).state.children[0] as DashboardGridItem).state.body;
+        scene.copyPanel(vizPanel as VizPanel);
+
+        expect(scene.state.hasCopiedPanel).toBe(true);
+      });
+
+      it('Should copy a library viz panel', () => {
+        const libVizPanel = ((scene.state.body as SceneGridLayout).state.children[4] as DashboardGridItem).state
+          .body as LibraryVizPanel;
+
+        scene.copyPanel(libVizPanel.state.panel as VizPanel);
+
+        expect(scene.state.hasCopiedPanel).toBe(true);
+      });
+
+      it('Should paste a panel', () => {
+        scene.setState({ hasCopiedPanel: true });
+        jest.spyOn(JSON, 'parse').mockReturnThis();
+        jest.mocked(buildGridItemForPanel).mockReturnValue(
+          new DashboardGridItem({
+            key: 'griditem-9',
+            body: new VizPanel({
+              title: 'Panel A',
+              key: 'panel-9',
+              pluginId: 'table',
+            }),
+          })
+        );
+
+        scene.pastePanel();
+
+        const body = scene.state.body as SceneGridLayout;
+        const gridItem = body.state.children[0] as DashboardGridItem;
+
+        expect(buildGridItemForPanel).toHaveBeenCalledTimes(1);
+        expect(body.state.children.length).toBe(6);
+        expect(gridItem.state.body!.state.key).toBe('panel-7');
+        expect(gridItem.state.y).toBe(0);
+        expect(scene.state.hasCopiedPanel).toBe(false);
+      });
+
+      it('Should paste a library viz panel', () => {
+        scene.setState({ hasCopiedPanel: true });
+        jest.spyOn(JSON, 'parse').mockReturnValue({ libraryPanel: { uid: 'uid', name: 'libraryPanel' } });
+        jest.mocked(buildGridItemForLibPanel).mockReturnValue(
+          new DashboardGridItem({
+            body: new LibraryVizPanel({
+              title: 'Library Panel',
+              uid: 'uid',
+              name: 'libraryPanel',
+              panelKey: 'panel-4',
+            }),
+          })
+        );
+
+        scene.pastePanel();
+
+        const body = scene.state.body as SceneGridLayout;
+        const gridItem = body.state.children[0] as DashboardGridItem;
+
+        const libVizPanel = gridItem.state.body as LibraryVizPanel;
+
+        expect(buildGridItemForLibPanel).toHaveBeenCalledTimes(1);
+        expect(body.state.children.length).toBe(6);
+        expect(libVizPanel.state.panelKey).toBe('panel-7');
+        expect(libVizPanel.state.panel?.state.key).toBe('panel-7');
+        expect(gridItem.state.y).toBe(0);
+        expect(scene.state.hasCopiedPanel).toBe(false);
+      });
+
+      it('Should remove a panel', () => {
+        const vizPanel = ((scene.state.body as SceneGridLayout).state.children[0] as DashboardGridItem).state.body;
+        scene.removePanel(vizPanel as VizPanel);
+
+        const body = scene.state.body as SceneGridLayout;
+        expect(body.state.children.length).toBe(4);
+      });
+
+      it('Should remove a panel within a row', () => {
+        const vizPanel = (
+          ((scene.state.body as SceneGridLayout).state.children[2] as SceneGridRow).state
+            .children[0] as DashboardGridItem
+        ).state.body;
+        scene.removePanel(vizPanel as VizPanel);
+
+        const body = scene.state.body as SceneGridLayout;
+        const gridRow = body.state.children[2] as SceneGridRow;
+
+        expect(gridRow.state.children.length).toBe(1);
+      });
+
+      it('Should remove a library panel', () => {
+        const libraryPanel = ((scene.state.body as SceneGridLayout).state.children[4] as DashboardGridItem).state.body;
+        const vizPanel = (libraryPanel as LibraryVizPanel).state.panel;
+        scene.removePanel(vizPanel as VizPanel);
+
+        const body = scene.state.body as SceneGridLayout;
+        expect(body.state.children.length).toBe(4);
+      });
+
+      it('Should remove a library panel within a row', () => {
+        const libraryPanel = (
+          ((scene.state.body as SceneGridLayout).state.children[2] as SceneGridRow).state
+            .children[1] as DashboardGridItem
+        ).state.body;
+        const vizPanel = (libraryPanel as LibraryVizPanel).state.panel;
+
+        scene.removePanel(vizPanel as VizPanel);
+
+        const body = scene.state.body as SceneGridLayout;
+        const gridRow = body.state.children[2] as SceneGridRow;
+        expect(gridRow.state.children.length).toBe(1);
+      });
+
+      it('Should duplicate a panel', () => {
+        const vizPanel = ((scene.state.body as SceneGridLayout).state.children[0] as DashboardGridItem).state.body;
+        scene.duplicatePanel(vizPanel as VizPanel);
+
+        const body = scene.state.body as SceneGridLayout;
+        const gridItem = body.state.children[5] as DashboardGridItem;
+
+        expect(body.state.children.length).toBe(6);
+        expect(gridItem.state.body!.state.key).toBe('panel-7');
+      });
+
+      it('Should duplicate a library panel', () => {
+        const libraryPanel = ((scene.state.body as SceneGridLayout).state.children[4] as DashboardGridItem).state.body;
+        const vizPanel = (libraryPanel as LibraryVizPanel).state.panel;
+        scene.duplicatePanel(vizPanel as VizPanel);
+
+        const body = scene.state.body as SceneGridLayout;
+        const gridItem = body.state.children[5] as DashboardGridItem;
+
+        const libVizPanel = gridItem.state.body as LibraryVizPanel;
+
+        expect(body.state.children.length).toBe(6);
+        expect(libVizPanel.state.panelKey).toBe('panel-7');
+        expect(libVizPanel.state.panel?.state.key).toBe('panel-7');
+      });
+
+      it('Should duplicate a repeated panel', () => {
+        const scene = buildTestScene({
+          body: new SceneGridLayout({
+            children: [
+              new DashboardGridItem({
+                key: `grid-item-1`,
+                width: 24,
+                height: 8,
+                repeatedPanels: [
+                  new VizPanel({
+                    title: 'Library Panel',
+                    key: 'panel-1',
+                    pluginId: 'table',
+                  }),
+                ],
+                body: new VizPanel({
+                  title: 'Library Panel',
+                  key: 'panel-1',
+                  pluginId: 'table',
+                }),
+                variableName: 'custom',
+              }),
+            ],
+          }),
+        });
+
+        const vizPanel = ((scene.state.body as SceneGridLayout).state.children[0] as DashboardGridItem).state
+          .repeatedPanels![0];
+
+        scene.duplicatePanel(vizPanel as VizPanel);
+
+        const body = scene.state.body as SceneGridLayout;
+        const gridItem = body.state.children[1] as DashboardGridItem;
+
+        expect(body.state.children.length).toBe(2);
+        expect(gridItem.state.body!.state.key).toBe('panel-2');
+      });
+
+      it('Should duplicate a panel in a row', () => {
+        const vizPanel = (
+          ((scene.state.body as SceneGridLayout).state.children[2] as SceneGridRow).state
+            .children[0] as DashboardGridItem
+        ).state.body;
+        scene.duplicatePanel(vizPanel as VizPanel);
+
+        const body = scene.state.body as SceneGridLayout;
+        const gridRow = body.state.children[2] as SceneGridRow;
+        const gridItem = gridRow.state.children[2] as DashboardGridItem;
+
+        expect(gridRow.state.children.length).toBe(3);
+        expect(gridItem.state.body!.state.key).toBe('panel-7');
+      });
+
+      it('Should duplicate a library panel in a row', () => {
+        const libraryPanel = (
+          ((scene.state.body as SceneGridLayout).state.children[2] as SceneGridRow).state
+            .children[1] as DashboardGridItem
+        ).state.body;
+        const vizPanel = (libraryPanel as LibraryVizPanel).state.panel;
+
+        scene.duplicatePanel(vizPanel as VizPanel);
+
+        const body = scene.state.body as SceneGridLayout;
+        const gridRow = body.state.children[2] as SceneGridRow;
+        const gridItem = gridRow.state.children[2] as DashboardGridItem;
+
+        const libVizPanel = gridItem.state.body as LibraryVizPanel;
+
+        expect(gridRow.state.children.length).toBe(3);
+        expect(libVizPanel.state.panelKey).toBe('panel-7');
+        expect(libVizPanel.state.panel?.state.key).toBe('panel-7');
+      });
+
+      it('Should fail to duplicate a panel if it does not have a grid item parent', () => {
+        const vizPanel = new VizPanel({
+          title: 'Panel Title',
+          key: 'panel-5',
+          pluginId: 'timeseries',
+        });
+
+        scene.duplicatePanel(vizPanel);
+
+        const body = scene.state.body as SceneGridLayout;
+
+        // length remains unchanged
+        expect(body.state.children.length).toBe(5);
+      });
+
+      it('Should unlink a library panel', () => {
+        const libPanel = new LibraryVizPanel({
+          title: 'title',
+          uid: 'abc',
+          name: 'lib panel',
+          panelKey: 'panel-1',
+          isLoaded: true,
+          panel: new VizPanel({
+            title: 'Panel B',
+            pluginId: 'table',
+          }),
+        });
+
+        const scene = buildTestScene({
+          body: new SceneGridLayout({
+            children: [
+              new DashboardGridItem({
+                key: 'griditem-2',
+                body: libPanel,
+              }),
+            ],
+          }),
+        });
+
+        scene.unlinkLibraryPanel(libPanel);
+
+        const body = scene.state.body as SceneGridLayout;
+        const gridItem = body.state.children[0] as DashboardGridItem;
+
+        expect(body.state.children.length).toBe(1);
+        expect(gridItem.state.body).toBeInstanceOf(VizPanel);
+      });
+    });
+  });
+
+  describe('Deleting dashboard', () => {
+    it('Should mark it non dirty before navigating to root', async () => {
+      const scene = buildTestScene();
+      scene.setState({ isDirty: true });
+
+      locationService.push('/d/adsdas');
+      await scene.deleteDashboard();
+
+      expect(scene.state.isDirty).toBe(false);
     });
   });
 
@@ -50,43 +911,339 @@ describe('DashboardScene', () => {
       scene.onEnterEditMode();
     });
 
-    it('Should add app, uid, and panelId', () => {
-      const queryRunner = sceneGraph.findObject(scene, (o) => o.state.key === 'data-query-runner')!;
-      expect(scene.enrichDataRequest(queryRunner)).toEqual({
-        app: CoreApp.Dashboard,
-        dashboardUID: 'dash-1',
-        panelId: 1,
+    describe('Should add app, uid, panelId and panelPluginId', () => {
+      test('when viewing', () => {
+        const queryRunner = sceneGraph.findObject(scene, (o) => o.state.key === 'data-query-runner')!;
+        expect(scene.enrichDataRequest(queryRunner)).toEqual({
+          app: CoreApp.Dashboard,
+          dashboardUID: 'dash-1',
+          panelId: 1,
+          panelPluginId: 'table',
+        });
+      });
+      test('when editing', () => {
+        const panel = findVizPanelByKey(scene, 'panel-1');
+        const editPanel = buildPanelEditScene(panel!);
+        scene.setState({
+          editPanel,
+        });
+
+        const queryRunner = (scene.state.editPanel as PanelEditor).state.vizManager.queryRunner;
+        expect(scene.enrichDataRequest(queryRunner)).toEqual({
+          app: CoreApp.Dashboard,
+          dashboardUID: 'dash-1',
+          panelId: 1,
+          panelPluginId: 'table',
+        });
+      });
+    });
+
+    it('Should hash the key of the cloned panels and set it as panelId', () => {
+      const queryRunner = sceneGraph.findObject(scene, (o) => o.state.key === 'data-query-runner2')!;
+      const expectedPanelId = djb2Hash('panel-2-clone-1');
+      expect(scene.enrichDataRequest(queryRunner).panelId).toEqual(expectedPanelId);
+    });
+  });
+
+  describe('When variables change', () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it('A change to variable values should trigger VariablesChanged event', () => {
+      const varA = new TestVariable({ name: 'A', query: 'A.*', value: 'A.AA', text: '', options: [], delayMs: 0 });
+      const scene = buildTestScene({
+        $variables: new SceneVariableSet({ variables: [varA] }),
+      });
+
+      scene.activate();
+
+      const eventHandler = jest.fn();
+      appEvents.subscribe(VariablesChanged, eventHandler);
+
+      varA.changeValueTo('A.AB');
+
+      expect(eventHandler).toHaveBeenCalledTimes(1);
+    });
+
+    it('A change to the variable set should set isDirty true', () => {
+      const varA = new TestVariable({ name: 'A', query: 'A.*', value: 'A.AA', text: '', options: [], delayMs: 0 });
+      const scene = buildTestScene({
+        $variables: new SceneVariableSet({ variables: [varA] }),
+      });
+
+      scene.activate();
+      scene.onEnterEditMode();
+
+      const variableSet = sceneGraph.getVariables(scene);
+      variableSet.setState({ variables: [] });
+
+      expect(scene.state.isDirty).toBe(true);
+    });
+
+    it('A change to a variable state should set isDirty true', () => {
+      mockResultsOfDetectChangesWorker({ hasChanges: true, hasTimeChanges: false, hasVariableValueChanges: true });
+      const variable = new TestVariable({ name: 'A' });
+      const scene = buildTestScene({
+        $variables: new SceneVariableSet({ variables: [variable] }),
+      });
+
+      scene.activate();
+      scene.onEnterEditMode();
+
+      variable.setState({ name: 'new-name' });
+
+      expect(variable.state.name).toBe('new-name');
+      expect(scene.state.isDirty).toBe(true);
+    });
+
+    it('A change to variable name is restored to original name should set isDirty back to false', () => {
+      const variable = new TestVariable({ name: 'A' });
+      const scene = buildTestScene({
+        $variables: new SceneVariableSet({ variables: [variable] }),
+      });
+
+      scene.activate();
+      scene.onEnterEditMode();
+
+      mockResultsOfDetectChangesWorker({ hasChanges: true, hasTimeChanges: false, hasVariableValueChanges: false });
+      variable.setState({ name: 'B' });
+      expect(scene.state.isDirty).toBe(true);
+      mockResultsOfDetectChangesWorker(
+        // No changes, it is the same name than before comparing saving models
+        { hasChanges: false, hasTimeChanges: false, hasVariableValueChanges: false }
+      );
+      variable.setState({ name: 'A' });
+      expect(scene.state.isDirty).toBe(false);
+    });
+  });
+
+  describe('When a dashboard is restored', () => {
+    let scene: DashboardScene;
+
+    beforeEach(async () => {
+      scene = buildTestScene();
+      scene.onEnterEditMode();
+    });
+
+    it('should restore the dashboard to the selected version and exit edit mode', () => {
+      const newVersion = 3;
+
+      const mockScene = new DashboardScene({
+        title: 'new name',
+        uid: 'dash-1',
+        version: 4,
+      });
+
+      jest.mocked(historySrv.restoreDashboard).mockResolvedValue({ version: newVersion });
+      jest.mocked(transformSaveModelToScene).mockReturnValue(mockScene);
+
+      return scene.onRestore(getVersionMock()).then((res) => {
+        expect(res).toBe(true);
+
+        expect(scene.state.version).toBe(newVersion);
+        expect(scene.state.isEditing).toBe(false);
+      });
+    });
+
+    it('should return early if historySrv does not return a valid version number', () => {
+      jest
+        .mocked(historySrv.restoreDashboard)
+        .mockResolvedValueOnce({ version: null })
+        .mockResolvedValueOnce({ version: undefined })
+        .mockResolvedValueOnce({ version: Infinity })
+        .mockResolvedValueOnce({ version: NaN })
+        .mockResolvedValue({ version: '10' });
+
+      for (let i = 0; i < 5; i++) {
+        scene.onRestore(getVersionMock()).then((res) => {
+          expect(res).toBe(false);
+        });
+      }
+    });
+  });
+
+  describe('When coming from explore', () => {
+    // When coming from Explore the first panel in a dashboard is a temporary panel
+    it('should remove first panel from the grid when discarding changes', () => {
+      const scene = new DashboardScene({
+        title: 'hello',
+        uid: 'dash-1',
+        description: 'hello description',
+        editable: true,
+        $timeRange: new SceneTimeRange({
+          timeZone: 'browser',
+        }),
+        controls: new DashboardControls({}),
+        $behaviors: [new behaviors.CursorSync({})],
+        body: new SceneGridLayout({
+          children: [
+            new DashboardGridItem({
+              key: 'griditem-1',
+              x: 0,
+              body: new VizPanel({
+                title: 'Panel A',
+                key: 'panel-1',
+                pluginId: 'table',
+                $data: new SceneQueryRunner({ key: 'data-query-runner', queries: [{ refId: 'A' }] }),
+              }),
+            }),
+            new DashboardGridItem({
+              key: 'griditem-2',
+              body: new VizPanel({
+                title: 'Panel B',
+                key: 'panel-2',
+                pluginId: 'table',
+              }),
+            }),
+          ],
+        }),
       });
+
+      scene.onEnterEditMode(true);
+      expect(scene.state.isEditing).toBe(true);
+      expect((scene.state.body as SceneGridLayout).state.children.length).toBe(2);
+
+      scene.exitEditMode({ skipConfirm: true });
+      expect(scene.state.isEditing).toBe(false);
+      expect((scene.state.body as SceneGridLayout).state.children.length).toBe(1);
     });
   });
 });
 
-function buildTestScene() {
+function buildTestScene(overrides?: Partial<DashboardSceneState>) {
   const scene = new DashboardScene({
     title: 'hello',
     uid: 'dash-1',
+    description: 'hello description',
+    tags: ['tag1', 'tag2'],
+    editable: true,
+    $timeRange: new SceneTimeRange({
+      timeZone: 'browser',
+    }),
+    controls: new DashboardControls({}),
+    $behaviors: [new behaviors.CursorSync({}), new behaviors.LiveNowTimer({})],
     body: new SceneGridLayout({
       children: [
-        new SceneGridItem({
+        new DashboardGridItem({
           key: 'griditem-1',
           x: 0,
           body: new VizPanel({
             title: 'Panel A',
             key: 'panel-1',
             pluginId: 'table',
-            $data: new SceneQueryRunner({ key: 'data-query-runner', queries: [{ refId: 'A' }] }),
+            $timeRange: new PanelTimeRange({
+              from: 'now-12h',
+              to: 'now',
+              timeZone: 'browser',
+            }),
+            $data: new SceneDataTransformer({
+              transformations: [],
+              $data: new SceneQueryRunner({ key: 'data-query-runner', queries: [{ refId: 'A' }] }),
+            }),
           }),
         }),
-        new SceneGridItem({
+        new DashboardGridItem({
+          key: 'griditem-2',
           body: new VizPanel({
             title: 'Panel B',
             key: 'panel-2',
             pluginId: 'table',
           }),
         }),
+        new SceneGridRow({
+          key: 'panel-3',
+          actions: new RowActions({}),
+          children: [
+            new DashboardGridItem({
+              body: new VizPanel({
+                title: 'Panel C',
+                key: 'panel-4',
+                pluginId: 'table',
+              }),
+            }),
+            new DashboardGridItem({
+              body: new LibraryVizPanel({
+                uid: 'uid',
+                name: 'libraryPanel',
+                panelKey: 'panel-5',
+                title: 'Library Panel',
+                panel: new VizPanel({
+                  title: 'Library Panel',
+                  key: 'panel-5',
+                  pluginId: 'table',
+                }),
+              }),
+            }),
+          ],
+        }),
+        new DashboardGridItem({
+          body: new VizPanel({
+            title: 'Panel B',
+            key: 'panel-2-clone-1',
+            pluginId: 'table',
+            $data: new SceneQueryRunner({ key: 'data-query-runner2', queries: [{ refId: 'A' }] }),
+          }),
+        }),
+        new DashboardGridItem({
+          body: new LibraryVizPanel({
+            uid: 'uid',
+            name: 'libraryPanel',
+            panelKey: 'panel-6',
+            title: 'Library Panel',
+            panel: new VizPanel({
+              title: 'Library Panel',
+              key: 'panel-6',
+              pluginId: 'table',
+            }),
+          }),
+        }),
       ],
     }),
+    ...overrides,
   });
 
   return scene;
 }
+
+function mockResultsOfDetectChangesWorker({
+  hasChanges,
+  hasTimeChanges,
+  hasVariableValueChanges,
+}: {
+  hasChanges: boolean;
+  hasTimeChanges: boolean;
+  hasVariableValueChanges: boolean;
+}) {
+  jest.mocked(worker.postMessage).mockImplementationOnce(() => {
+    worker.onmessage?.({
+      data: {
+        hasChanges: hasChanges ?? true,
+        hasTimeChanges: hasTimeChanges ?? true,
+        hasVariableValueChanges: hasVariableValueChanges ?? true,
+      },
+    } as unknown as MessageEvent);
+  });
+}
+
+function getVersionMock(): DecoratedRevisionModel {
+  const dash: Dashboard = {
+    title: 'new name',
+    id: 5,
+    schemaVersion: 30,
+  };
+
+  return {
+    id: 2,
+    checked: false,
+    uid: 'uid',
+    parentVersion: 1,
+    version: 2,
+    created: new Date(),
+    createdBy: 'admin',
+    message: '',
+    data: dash,
+    createdDateString: '2017-02-22 20:43:01',
+    ageString: '7 years ago',
+  };
+}
diff --git a/public/app/features/dashboard-scene/scene/DashboardScene.tsx b/public/app/features/dashboard-scene/scene/DashboardScene.tsx
index 4a849ee9c9498..3358f3f696c1d 100644
--- a/public/app/features/dashboard-scene/scene/DashboardScene.tsx
+++ b/public/app/features/dashboard-scene/scene/DashboardScene.tsx
@@ -1,34 +1,86 @@
 import * as H from 'history';
-import { Unsubscribable } from 'rxjs';
 
-import { CoreApp, DataQueryRequest, NavModelItem, UrlQueryMap } from '@grafana/data';
-import { locationService } from '@grafana/runtime';
+import { AppEvents, CoreApp, DataQueryRequest, NavIndex, NavModelItem, locationUtil } from '@grafana/data';
+import { config, locationService } from '@grafana/runtime';
 import {
   getUrlSyncManager,
   SceneFlexLayout,
-  SceneGridItem,
+  sceneGraph,
   SceneGridLayout,
+  SceneGridRow,
   SceneObject,
   SceneObjectBase,
   SceneObjectState,
-  SceneObjectStateChangedEvent,
   sceneUtils,
+  SceneVariable,
+  SceneVariableDependencyConfigLike,
+  VizPanel,
 } from '@grafana/scenes';
+import { Dashboard, DashboardLink } from '@grafana/schema';
+import appEvents from 'app/core/app_events';
+import { LS_PANEL_COPY_KEY } from 'app/core/constants';
+import { getNavModel } from 'app/core/selectors/navModel';
+import store from 'app/core/store';
 import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
-import { DashboardMeta } from 'app/types';
-
-import { DashboardSceneRenderer } from '../scene/DashboardSceneRenderer';
-import { SaveDashboardDrawer } from '../serialization/SaveDashboardDrawer';
+import { DashboardModel, PanelModel } from 'app/features/dashboard/state';
+import { dashboardWatcher } from 'app/features/live/dashboard/dashboardWatcher';
+import { deleteDashboard } from 'app/features/manage-dashboards/state/actions';
+import { VariablesChanged } from 'app/features/variables/types';
+import { DashboardDTO, DashboardMeta, SaveDashboardResponseDTO } from 'app/types';
+import { ShowConfirmModalEvent } from 'app/types/events';
+
+import { PanelEditor } from '../panel-edit/PanelEditor';
+import { DashboardSceneChangeTracker } from '../saving/DashboardSceneChangeTracker';
+import { SaveDashboardDrawer } from '../saving/SaveDashboardDrawer';
+import {
+  buildGridItemForLibPanel,
+  buildGridItemForPanel,
+  transformSaveModelToScene,
+} from '../serialization/transformSaveModelToScene';
+import { gridItemToPanel } from '../serialization/transformSceneToSaveModel';
+import { DecoratedRevisionModel } from '../settings/VersionsEditView';
+import { DashboardEditView } from '../settings/utils';
+import { historySrv } from '../settings/version-history';
 import { DashboardModelCompatibilityWrapper } from '../utils/DashboardModelCompatibilityWrapper';
+import { dashboardSceneGraph, getLibraryVizPanelFromVizPanel } from '../utils/dashboardSceneGraph';
+import { djb2Hash } from '../utils/djb2Hash';
 import { getDashboardUrl } from '../utils/urlBuilders';
-import { findVizPanelByKey, forceRenderChildren, getClosestVizPanel, getPanelIdForVizPanel } from '../utils/utils';
-
+import {
+  NEW_PANEL_HEIGHT,
+  NEW_PANEL_WIDTH,
+  forceRenderChildren,
+  getClosestVizPanel,
+  getDashboardSceneFor,
+  getDefaultRow,
+  getDefaultVizPanel,
+  getPanelIdForVizPanel,
+  getVizPanelKeyForPanelId,
+  isPanelClone,
+} from '../utils/utils';
+
+import { AddLibraryPanelDrawer } from './AddLibraryPanelDrawer';
+import { DashboardControls } from './DashboardControls';
+import { DashboardGridItem } from './DashboardGridItem';
+import { DashboardSceneRenderer } from './DashboardSceneRenderer';
 import { DashboardSceneUrlSync } from './DashboardSceneUrlSync';
+import { LibraryVizPanel } from './LibraryVizPanel';
+import { ScopesScene } from './ScopesScene';
+import { ViewPanelScene } from './ViewPanelScene';
 import { setupKeyboardShortcuts } from './keyboardShortcuts';
 
+export const PERSISTED_PROPS = ['title', 'description', 'tags', 'editable', 'graphTooltip', 'links', 'meta'];
+
 export interface DashboardSceneState extends SceneObjectState {
   /** The title */
   title: string;
+  /** The description */
+  description?: string;
+  /** Tags */
+  tags?: string[];
+  /** Links */
+  links: DashboardLink[];
+  /** Is editable */
+  editable?: boolean;
   /** A uid when saved */
   uid?: string;
   /** @deprecated */
@@ -38,19 +90,31 @@ export interface DashboardSceneState extends SceneObjectState {
   /** NavToolbar actions */
   actions?: SceneObject[];
   /** Fixed row at the top of the canvas with for example variables and time range controls */
-  controls?: SceneObject[];
+  controls?: DashboardControls;
   /** True when editing */
   isEditing?: boolean;
   /** True when user made a change */
   isDirty?: boolean;
   /** meta flags */
   meta: DashboardMeta;
+  /** Version of the dashboard */
+  version?: number;
   /** Panel to inspect */
   inspectPanelKey?: string;
-  /** Panel to view in full screen */
-  viewPanelKey?: string;
+  /** Panel to view in fullscreen */
+  viewPanelScene?: ViewPanelScene;
+  /** Edit view */
+  editview?: DashboardEditView;
+  /** Edit panel */
+  editPanel?: PanelEditor;
   /** Scene object that handles the current drawer or modal */
   overlay?: SceneObject;
+  /** True when a user copies a panel in the dashboard */
+  hasCopiedPanel?: boolean;
+  /** The dashboard doesn't have panels */
+  isEmpty?: boolean;
+  /** Scene object that handles the scopes selector */
+  scopes?: ScopesScene;
 }
 
 export class DashboardScene extends SceneObjectBase<DashboardSceneState> {
@@ -60,38 +124,73 @@ export class DashboardScene extends SceneObjectBase<DashboardSceneState> {
    * Handles url sync
    */
   protected _urlSync = new DashboardSceneUrlSync(this);
+  /**
+   * Get notified when variables change
+   */
+  protected _variableDependency = new DashboardVariableDependency();
+
   /**
    * State before editing started
    */
   private _initialState?: DashboardSceneState;
+  /**
+   * The save model which the scene was originally created from
+   */
+  private _initialSaveModel?: Dashboard;
   /**
    * Url state before editing started
    */
-  private _initiallUrlState?: UrlQueryMap;
+  private _initialUrlState?: H.Location;
   /**
-   * change tracking subscription
+   * Dashboard changes tracker
    */
-  private _changeTrackerSub?: Unsubscribable;
+  private _changeTracker: DashboardSceneChangeTracker;
+
+  /**
+   * Flag to indicate if the user came from Explore
+   */
+  private _fromExplore = false;
 
   public constructor(state: Partial<DashboardSceneState>) {
     super({
       title: 'Dashboard',
       meta: {},
+      editable: true,
       body: state.body ?? new SceneFlexLayout({ children: [] }),
+      links: state.links ?? [],
+      hasCopiedPanel: store.exists(LS_PANEL_COPY_KEY),
+      scopes: state.uid && config.featureToggles.scopeFilters ? new ScopesScene() : undefined,
       ...state,
     });
 
+    this._changeTracker = new DashboardSceneChangeTracker(this);
+
     this.addActivationHandler(() => this._activationHandler());
   }
 
   private _activationHandler() {
+    let prevSceneContext = window.__grafanaSceneContext;
+
     window.__grafanaSceneContext = this;
 
     if (this.state.isEditing) {
-      this.startTrackingChanges();
+      this._initialUrlState = locationService.getLocation();
+      this._changeTracker.startTrackingChanges();
     }
 
-    const clearKeyBindings = setupKeyboardShortcuts(this);
+    if (this.state.meta.isNew) {
+      this.onEnterEditMode();
+      this.setState({ isDirty: true });
+    }
+
+    if (!this.state.meta.isEmbedded && this.state.uid) {
+      dashboardWatcher.watch(this.state.uid);
+    }
+
+    let clearKeyBindings = () => {};
+    if (!config.publicDashboardAccessToken) {
+      clearKeyBindings = setupKeyboardShortcuts(this);
+    }
     const oldDashboardWrapper = new DashboardModelCompatibilityWrapper(this);
 
     // @ts-expect-error
@@ -99,113 +198,538 @@ export class DashboardScene extends SceneObjectBase<DashboardSceneState> {
 
     // Deactivation logic
     return () => {
-      window.__grafanaSceneContext = undefined;
+      window.__grafanaSceneContext = prevSceneContext;
       clearKeyBindings();
-      this.stopTrackingChanges();
+      this._changeTracker.terminate();
       this.stopUrlSync();
       oldDashboardWrapper.destroy();
+      dashboardWatcher.leave();
     };
   }
 
   public startUrlSync() {
-    getUrlSyncManager().initSync(this);
+    if (!this.state.meta.isEmbedded) {
+      getUrlSyncManager().initSync(this);
+    }
   }
 
   public stopUrlSync() {
     getUrlSyncManager().cleanUp(this);
   }
 
-  public onEnterEditMode = () => {
+  public onEnterEditMode = (fromExplore = false) => {
+    this._fromExplore = fromExplore;
     // Save this state
     this._initialState = sceneUtils.cloneSceneObjectState(this.state);
-    this._initiallUrlState = locationService.getSearchObject();
+
+    this._initialUrlState = locationService.getLocation();
 
     // Switch to edit mode
     this.setState({ isEditing: true });
 
     // Propagate change edit mode change to children
+    this.propagateEditModeChange();
+
+    this._changeTracker.startTrackingChanges();
+  };
+
+  public saveCompleted(saveModel: Dashboard, result: SaveDashboardResponseDTO, folderUid?: string) {
+    this._initialSaveModel = {
+      ...saveModel,
+      id: result.id,
+      uid: result.uid,
+      version: result.version,
+    };
+
+    this._changeTracker.stopTrackingChanges();
+    this.setState({
+      version: result.version,
+      isDirty: false,
+      uid: result.uid,
+      id: result.id,
+      meta: {
+        ...this.state.meta,
+        uid: result.uid,
+        url: result.url,
+        slug: result.slug,
+        folderUid: folderUid,
+        isNew: false,
+      },
+    });
+
+    this._changeTracker.startTrackingChanges();
+  }
+
+  private propagateEditModeChange() {
     if (this.state.body instanceof SceneGridLayout) {
-      this.state.body.setState({ isDraggable: true, isResizable: true });
+      this.state.body.setState({ isDraggable: this.state.isEditing, isResizable: this.state.isEditing });
       forceRenderChildren(this.state.body, true);
     }
+  }
+
+  public exitEditMode({ skipConfirm, restoreInitialState }: { skipConfirm: boolean; restoreInitialState?: boolean }) {
+    if (!this.canDiscard()) {
+      console.error('Trying to discard back to a state that does not exist, initialState undefined');
+      return;
+    }
 
-    this.startTrackingChanges();
-  };
+    if (!this.state.isDirty || skipConfirm) {
+      this.exitEditModeConfirmed(restoreInitialState || this.state.isDirty);
+      return;
+    }
 
-  public onDiscard = () => {
+    appEvents.publish(
+      new ShowConfirmModalEvent({
+        title: 'Discard changes to dashboard?',
+        text: `You have unsaved changes to this dashboard. Are you sure you want to discard them?`,
+        icon: 'trash-alt',
+        yesText: 'Discard',
+        onConfirm: this.exitEditModeConfirmed.bind(this),
+      })
+    );
+  }
+
+  private exitEditModeConfirmed(restoreInitialState = true) {
     // No need to listen to changes anymore
-    this.stopTrackingChanges();
+    this._changeTracker.stopTrackingChanges();
     // Stop url sync before updating url
     this.stopUrlSync();
-    // Now we can update url
-    locationService.partial(this._initiallUrlState!, true);
-    // Update state and disable editing
-    this.setState({ ...this._initialState, isEditing: false });
+
+    // Now we can update urls
+    // We are updating url and removing editview and editPanel.
+    // The initial url may be including edit view, edit panel or inspect query params if the user pasted the url,
+    // hence we need to cleanup those query params to get back to the dashboard view. Otherwise url sync can trigger overlays.
+    locationService.replace(
+      locationUtil.getUrlForPartial(this._initialUrlState!, {
+        editPanel: null,
+        editview: null,
+        inspect: null,
+        inspectTab: null,
+      })
+    );
+
+    if (this._fromExplore) {
+      this.cleanupStateFromExplore();
+    }
+
+    if (restoreInitialState) {
+      //  Restore initial state and disable editing
+      this.setState({ ...this._initialState, isEditing: false });
+    } else {
+      // Do not restore
+      this.setState({ isEditing: false });
+    }
     // and start url sync again
     this.startUrlSync();
-
     // Disable grid dragging
-    if (this.state.body instanceof SceneGridLayout) {
-      this.state.body.setState({ isDraggable: false, isResizable: false });
-      forceRenderChildren(this.state.body, true);
+    this.propagateEditModeChange();
+  }
+
+  private cleanupStateFromExplore() {
+    this._fromExplore = false;
+    // When coming from explore but discarding changes, remove the panel that explore is potentially adding.
+    if (this._initialSaveModel?.panels) {
+      this._initialSaveModel.panels = this._initialSaveModel.panels.slice(1);
     }
-  };
 
-  public onSave = () => {
-    this.setState({ overlay: new SaveDashboardDrawer({ dashboardRef: this.getRef() }) });
+    if (this._initialState && this._initialState.body instanceof SceneGridLayout) {
+      this._initialState.body.setState({
+        children: this._initialState.body.state.children.slice(1),
+      });
+    }
+  }
+
+  public canDiscard() {
+    return this._initialState !== undefined;
+  }
+
+  public pauseTrackingChanges() {
+    this._changeTracker.stopTrackingChanges();
+  }
+
+  public resumeTrackingChanges() {
+    this._changeTracker.startTrackingChanges();
+  }
+
+  public onRestore = async (version: DecoratedRevisionModel): Promise<boolean> => {
+    const versionRsp = await historySrv.restoreDashboard(version.uid, version.version);
+
+    if (!Number.isInteger(versionRsp.version)) {
+      return false;
+    }
+
+    const dashboardDTO: DashboardDTO = {
+      dashboard: new DashboardModel(version.data),
+      meta: this.state.meta,
+    };
+    const dashScene = transformSaveModelToScene(dashboardDTO);
+    const newState = sceneUtils.cloneSceneObjectState(dashScene.state);
+    newState.version = versionRsp.version;
+
+    this.setState(newState);
+    this.exitEditMode({ skipConfirm: true, restoreInitialState: false });
+
+    return true;
   };
 
-  public getPageNav(location: H.Location) {
+  public openSaveDrawer({ saveAsCopy, onSaveSuccess }: { saveAsCopy?: boolean; onSaveSuccess?: () => void }) {
+    if (!this.state.isEditing) {
+      return;
+    }
+
+    this.setState({
+      overlay: new SaveDashboardDrawer({
+        dashboardRef: this.getRef(),
+        saveAsCopy,
+        onSaveSuccess,
+      }),
+    });
+  }
+
+  public getPageNav(location: H.Location, navIndex: NavIndex) {
+    const { meta, viewPanelScene, editPanel } = this.state;
+
     let pageNav: NavModelItem = {
       text: this.state.title,
       url: getDashboardUrl({
         uid: this.state.uid,
+        slug: meta.slug,
         currentQueryParams: location.search,
-        updateQuery: { viewPanel: null, inspect: null },
+        updateQuery: { viewPanel: null, inspect: null, editview: null, editPanel: null, tab: null },
+        isHomeDashboard: !meta.url && !meta.slug && !meta.isNew,
       }),
     };
 
-    if (this.state.viewPanelKey) {
+    const { folderUid } = meta;
+
+    if (folderUid) {
+      const folderNavModel = getNavModel(navIndex, `folder-dashboards-${folderUid}`).main;
+      // If the folder hasn't loaded (maybe user doesn't have permission on it?) then
+      // don't show the "page not found" breadcrumb
+      if (folderNavModel.id !== 'not-found') {
+        pageNav = {
+          ...pageNav,
+          parentItem: folderNavModel,
+        };
+      }
+    }
+
+    if (viewPanelScene) {
       pageNav = {
         text: 'View panel',
         parentItem: pageNav,
       };
     }
 
+    if (editPanel) {
+      pageNav = {
+        text: 'Edit panel',
+        parentItem: pageNav,
+      };
+    }
+
     return pageNav;
   }
 
   /**
    * Returns the body (layout) or the full view panel
    */
-  public getBodyToRender(viewPanelKey?: string): SceneObject {
-    const viewPanel = findVizPanelByKey(this, viewPanelKey);
-    return viewPanel ?? this.state.body;
+  public getBodyToRender(): SceneObject {
+    return this.state.viewPanelScene ?? this.state.body;
   }
 
-  private startTrackingChanges() {
-    this._changeTrackerSub = this.subscribeToEvent(
-      SceneObjectStateChangedEvent,
-      (event: SceneObjectStateChangedEvent) => {
-        if (event.payload.changedObject instanceof SceneGridItem) {
-          this.setIsDirty();
-        }
+  public getInitialState(): DashboardSceneState | undefined {
+    return this._initialState;
+  }
+
+  public addRow(row: SceneGridRow) {
+    if (!(this.state.body instanceof SceneGridLayout)) {
+      throw new Error('Trying to add a panel in a layout that is not SceneGridLayout');
+    }
+
+    const sceneGridLayout = this.state.body;
+
+    // find all panels until the first row and put them into the newly created row. If there are no other rows,
+    // add all panels to the row. If there are no panels just create an empty row
+    const indexTillNextRow = sceneGridLayout.state.children.findIndex((child) => child instanceof SceneGridRow);
+    const rowChildren = sceneGridLayout.state.children
+      .splice(0, indexTillNextRow === -1 ? sceneGridLayout.state.children.length : indexTillNextRow)
+      .map((child) => child.clone());
+
+    if (rowChildren) {
+      row.setState({
+        children: rowChildren,
+      });
+    }
+
+    sceneGridLayout.setState({
+      children: [row, ...sceneGridLayout.state.children],
+    });
+  }
+
+  public removeRow(row: SceneGridRow, removePanels = false) {
+    if (!(this.state.body instanceof SceneGridLayout)) {
+      throw new Error('Trying to add a panel in a layout that is not SceneGridLayout');
+    }
+
+    const sceneGridLayout = this.state.body;
+
+    const children = sceneGridLayout.state.children.filter((child) => child.state.key !== row.state.key);
+
+    if (!removePanels) {
+      const rowChildren = row.state.children.map((child) => child.clone());
+      const indexOfRow = sceneGridLayout.state.children.findIndex((child) => child.state.key === row.state.key);
+
+      children.splice(indexOfRow, 0, ...rowChildren);
+    }
+
+    sceneGridLayout.setState({ children });
+  }
+
+  public addPanel(vizPanel: VizPanel): void {
+    if (!(this.state.body instanceof SceneGridLayout)) {
+      throw new Error('Trying to add a panel in a layout that is not SceneGridLayout');
+    }
+
+    const sceneGridLayout = this.state.body;
+
+    const panelId = getPanelIdForVizPanel(vizPanel);
+    const newGridItem = new DashboardGridItem({
+      height: NEW_PANEL_HEIGHT,
+      width: NEW_PANEL_WIDTH,
+      x: 0,
+      y: 0,
+      body: vizPanel,
+      key: `grid-item-${panelId}`,
+    });
+
+    sceneGridLayout.setState({
+      children: [newGridItem, ...sceneGridLayout.state.children],
+    });
+  }
+
+  public duplicatePanel(vizPanel: VizPanel) {
+    if (!vizPanel.parent) {
+      return;
+    }
+
+    const libraryPanel = getLibraryVizPanelFromVizPanel(vizPanel);
+
+    const gridItem = libraryPanel ? libraryPanel.parent : vizPanel.parent;
+
+    if (!(gridItem instanceof DashboardGridItem)) {
+      console.error('Trying to duplicate a panel in a layout that is not DashboardGridItem');
+      return;
+    }
+
+    let panelState;
+    let panelData;
+    let newGridItem;
+    const newPanelId = dashboardSceneGraph.getNextPanelId(this);
+
+    if (libraryPanel) {
+      const gridItemToDuplicateState = sceneUtils.cloneSceneObjectState(gridItem.state);
+
+      newGridItem = new DashboardGridItem({
+        x: gridItemToDuplicateState.x,
+        y: gridItemToDuplicateState.y,
+        width: gridItemToDuplicateState.width,
+        height: gridItemToDuplicateState.height,
+        body: new LibraryVizPanel({
+          title: libraryPanel.state.title,
+          uid: libraryPanel.state.uid,
+          name: libraryPanel.state.name,
+          panelKey: getVizPanelKeyForPanelId(newPanelId),
+        }),
+      });
+    } else {
+      if (gridItem instanceof DashboardGridItem) {
+        panelState = sceneUtils.cloneSceneObjectState(gridItem.state.body.state);
+        panelData = sceneGraph.getData(gridItem.state.body).clone();
+      } else {
+        panelState = sceneUtils.cloneSceneObjectState(vizPanel.state);
+        panelData = sceneGraph.getData(vizPanel).clone();
       }
-    );
+
+      // when we duplicate a panel we don't want to clone the alert state
+      delete panelData.state.data?.alertState;
+
+      newGridItem = new DashboardGridItem({
+        x: gridItem.state.x,
+        y: gridItem.state.y,
+        height: NEW_PANEL_HEIGHT,
+        width: NEW_PANEL_WIDTH,
+        body: new VizPanel({ ...panelState, $data: panelData, key: getVizPanelKeyForPanelId(newPanelId) }),
+      });
+    }
+
+    if (!(this.state.body instanceof SceneGridLayout)) {
+      console.error('Trying to duplicate a panel in a layout that is not SceneGridLayout ');
+      return;
+    }
+
+    const sceneGridLayout = this.state.body;
+
+    if (gridItem.parent instanceof SceneGridRow) {
+      const row = gridItem.parent;
+
+      row.setState({
+        children: [...row.state.children, newGridItem],
+      });
+
+      sceneGridLayout.forceRender();
+
+      return;
+    }
+
+    sceneGridLayout.setState({
+      children: [...sceneGridLayout.state.children, newGridItem],
+    });
   }
 
-  private setIsDirty() {
-    if (!this.state.isDirty) {
-      this.setState({ isDirty: true });
+  public copyPanel(vizPanel: VizPanel) {
+    if (!vizPanel.parent) {
+      return;
+    }
+
+    let gridItem = vizPanel.parent;
+
+    if (vizPanel.parent instanceof LibraryVizPanel) {
+      const libraryVizPanel = vizPanel.parent;
+
+      if (!libraryVizPanel.parent) {
+        return;
+      }
+
+      gridItem = libraryVizPanel.parent;
     }
+
+    if (!(gridItem instanceof DashboardGridItem)) {
+      console.error('Trying to copy a panel that is not DashboardGridItem child');
+      throw new Error('Trying to copy a panel that is not DashboardGridItem child');
+    }
+
+    const jsonData = gridItemToPanel(gridItem);
+
+    store.set(LS_PANEL_COPY_KEY, JSON.stringify(jsonData));
+    appEvents.emit(AppEvents.alertSuccess, ['Panel copied. Use **Paste panel** toolbar action to paste.']);
+    this.setState({ hasCopiedPanel: true });
   }
 
-  private stopTrackingChanges() {
-    this._changeTrackerSub?.unsubscribe();
+  public pastePanel() {
+    if (!(this.state.body instanceof SceneGridLayout)) {
+      throw new Error('Trying to add a panel in a layout that is not SceneGridLayout');
+    }
+
+    const jsonData = store.get(LS_PANEL_COPY_KEY);
+    const jsonObj = JSON.parse(jsonData);
+    const panelModel = new PanelModel(jsonObj);
+    const gridItem = !panelModel.libraryPanel
+      ? buildGridItemForPanel(panelModel)
+      : buildGridItemForLibPanel(panelModel);
+
+    const sceneGridLayout = this.state.body;
+
+    if (!(gridItem instanceof DashboardGridItem)) {
+      throw new Error('Cannot paste invalid grid item');
+    }
+
+    const panelId = dashboardSceneGraph.getNextPanelId(this);
+
+    if (gridItem instanceof DashboardGridItem && gridItem.state.body instanceof LibraryVizPanel) {
+      const panelKey = getVizPanelKeyForPanelId(panelId);
+
+      gridItem.state.body.setState({ panelKey });
+
+      const vizPanel = gridItem.state.body.state.panel;
+
+      if (vizPanel instanceof VizPanel) {
+        vizPanel.setState({ key: panelKey });
+      }
+    } else if (gridItem instanceof DashboardGridItem && gridItem.state.body) {
+      gridItem.state.body.setState({
+        key: getVizPanelKeyForPanelId(panelId),
+      });
+    } else if (gridItem instanceof DashboardGridItem) {
+      gridItem.state.body.setState({
+        key: getVizPanelKeyForPanelId(panelId),
+      });
+    }
+
+    gridItem.setState({
+      height: NEW_PANEL_HEIGHT,
+      width: NEW_PANEL_WIDTH,
+      x: 0,
+      y: 0,
+      key: `grid-item-${panelId}`,
+    });
+
+    sceneGridLayout.setState({
+      children: [gridItem, ...sceneGridLayout.state.children],
+    });
+
+    this.setState({ hasCopiedPanel: false });
+    store.delete(LS_PANEL_COPY_KEY);
   }
 
-  public getInitialState(): DashboardSceneState | undefined {
-    return this._initialState;
+  public removePanel(panel: VizPanel) {
+    const panels: SceneObject[] = [];
+    const key = panel.parent instanceof LibraryVizPanel ? panel.parent.parent?.state.key : panel.parent?.state.key;
+
+    if (!key) {
+      return;
+    }
+
+    let row: SceneGridRow | undefined;
+
+    try {
+      row = sceneGraph.getAncestor(panel, SceneGridRow);
+    } catch {
+      row = undefined;
+    }
+
+    if (row) {
+      row.state.children.forEach((child: SceneObject) => {
+        if (child.state.key !== key) {
+          panels.push(child);
+        }
+      });
+
+      row.setState({ children: panels });
+
+      this.state.body.forceRender();
+
+      return;
+    }
+
+    this.state.body.forEachChild((child: SceneObject) => {
+      if (child.state.key !== key) {
+        panels.push(child);
+      }
+    });
+
+    const layout = this.state.body;
+
+    if (layout instanceof SceneGridLayout || layout instanceof SceneFlexLayout) {
+      layout.setState({ children: panels });
+    }
+  }
+
+  public unlinkLibraryPanel(panel: LibraryVizPanel) {
+    if (!panel.parent) {
+      return;
+    }
+
+    const gridItem = panel.parent;
+
+    if (!(gridItem instanceof DashboardGridItem)) {
+      console.error('Trying to unlinka a lib panel in a layout that is not DashboardGridItem');
+      return;
+    }
+
+    gridItem?.setState({
+      body: panel.state.panel?.clone(),
+    });
   }
 
   public showModal(modal: SceneObject) {
@@ -216,20 +740,124 @@ export class DashboardScene extends SceneObjectBase<DashboardSceneState> {
     this.setState({ overlay: undefined });
   }
 
+  public async onStarDashboard() {
+    const { meta, uid } = this.state;
+    if (!uid) {
+      return;
+    }
+    try {
+      const result = await getDashboardSrv().starDashboard(uid, Boolean(meta.isStarred));
+
+      this.setState({
+        meta: {
+          ...meta,
+          isStarred: result,
+        },
+      });
+    } catch (err) {
+      console.error('Failed to star dashboard', err);
+    }
+  }
+
+  public onOpenSettings = () => {
+    locationService.partial({ editview: 'settings' });
+  };
+
+  public onShowAddLibraryPanelDrawer() {
+    this.setState({
+      overlay: new AddLibraryPanelDrawer({}),
+    });
+  }
+
+  public onCreateNewRow() {
+    const row = getDefaultRow(this);
+
+    this.addRow(row);
+
+    return getPanelIdForVizPanel(row);
+  }
+
+  public onCreateNewPanel(): number {
+    if (!this.state.isEditing) {
+      this.onEnterEditMode();
+    }
+
+    const vizPanel = getDefaultVizPanel(this);
+
+    this.addPanel(vizPanel);
+
+    return getPanelIdForVizPanel(vizPanel);
+  }
+
   /**
    * Called by the SceneQueryRunner to privide contextural parameters (tracking) props for the request
    */
   public enrichDataRequest(sceneObject: SceneObject): Partial<DataQueryRequest> {
-    const panel = getClosestVizPanel(sceneObject);
+    const dashboard = getDashboardSceneFor(sceneObject);
+
+    let panel = getClosestVizPanel(sceneObject);
+
+    if (dashboard.state.isEditing && dashboard.state.editPanel) {
+      panel = dashboard.state.editPanel.state.vizManager.state.panel;
+    }
+
+    let panelId = 0;
+
+    if (panel && panel.state.key) {
+      if (isPanelClone(panel.state.key)) {
+        panelId = djb2Hash(panel?.state.key);
+      } else {
+        panelId = getPanelIdForVizPanel(panel);
+      }
+    }
 
     return {
       app: CoreApp.Dashboard,
       dashboardUID: this.state.uid,
-      panelId: (panel && getPanelIdForVizPanel(panel)) ?? 0,
+      panelId,
+      panelPluginId: panel?.state.pluginId,
+      scope: this.state.scopes?.state.filters.getSelectedScope(),
     };
   }
 
   canEditDashboard() {
-    return Boolean(this.state.meta.canEdit || this.state.meta.canMakeEditable);
+    const { meta } = this.state;
+
+    return Boolean(meta.canEdit || meta.canMakeEditable);
+  }
+
+  public getInitialSaveModel() {
+    return this._initialSaveModel;
+  }
+
+  /** Hacky temp function until we refactor transformSaveModelToScene a bit */
+  public setInitialSaveModel(saveModel: Dashboard) {
+    this._initialSaveModel = saveModel;
+  }
+
+  public async deleteDashboard() {
+    await deleteDashboard(this.state.uid!, true);
+    // Need to mark it non dirty to navigate away without unsaved changes warning
+    this.setState({ isDirty: false });
+    locationService.replace('/');
+  }
+}
+
+export class DashboardVariableDependency implements SceneVariableDependencyConfigLike {
+  private _emptySet = new Set<string>();
+
+  getNames(): Set<string> {
+    return this._emptySet;
+  }
+
+  public hasDependencyOn(): boolean {
+    return false;
+  }
+
+  public variableUpdateCompleted(variable: SceneVariable, hasChanged: boolean) {
+    if (hasChanged) {
+      // Temp solution for some core panels (like dashlist) to know that variables have changed
+      appEvents.publish(new VariablesChanged({ refreshAll: true, panelIds: [] }));
+    }
   }
 }
diff --git a/public/app/features/dashboard-scene/scene/DashboardSceneRenderer.tsx b/public/app/features/dashboard-scene/scene/DashboardSceneRenderer.tsx
index 63bb7df05e685..74345295c6d28 100644
--- a/public/app/features/dashboard-scene/scene/DashboardSceneRenderer.tsx
+++ b/public/app/features/dashboard-scene/scene/DashboardSceneRenderer.tsx
@@ -1,40 +1,80 @@
-import { css } from '@emotion/css';
+import { css, cx } from '@emotion/css';
 import React from 'react';
 import { useLocation } from 'react-router-dom';
 
 import { GrafanaTheme2, PageLayoutType } from '@grafana/data';
-import { SceneComponentProps, SceneDebugger } from '@grafana/scenes';
+import { selectors } from '@grafana/e2e-selectors';
+import { SceneComponentProps } from '@grafana/scenes';
 import { CustomScrollbar, useStyles2 } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
+import { getNavModel } from 'app/core/selectors/navModel';
+import DashboardEmpty from 'app/features/dashboard/dashgrid/DashboardEmpty';
+import { useSelector } from 'app/types';
 
 import { DashboardScene } from './DashboardScene';
 import { NavToolbarActions } from './NavToolbarActions';
 
 export function DashboardSceneRenderer({ model }: SceneComponentProps<DashboardScene>) {
-  const { controls, viewPanelKey: viewPanelId, overlay } = model.useState();
+  const { controls, overlay, editview, editPanel, isEmpty, scopes, meta } = model.useState();
+  const { isExpanded: isScopesExpanded } = scopes?.useState() ?? {};
   const styles = useStyles2(getStyles);
   const location = useLocation();
-  const pageNav = model.getPageNav(location);
-  const bodyToRender = model.getBodyToRender(viewPanelId);
+  const navIndex = useSelector((state) => state.navIndex);
+  const pageNav = model.getPageNav(location, navIndex);
+  const bodyToRender = model.getBodyToRender();
+  const navModel = getNavModel(navIndex, 'dashboards/browse');
+  const isHomePage = !meta.url && !meta.slug && !meta.isNew;
+
+  if (editview) {
+    return (
+      <>
+        <editview.Component model={editview} />
+        {overlay && <overlay.Component model={overlay} />}
+      </>
+    );
+  }
+
+  const emptyState = <DashboardEmpty dashboard={model} canCreate={!!model.state.meta.canEdit} />;
+
+  const withPanels = (
+    <div className={cx(styles.body)}>
+      <bodyToRender.Component model={bodyToRender} />
+    </div>
+  );
 
   return (
-    <Page navId="scenes" pageNav={pageNav} layout={PageLayoutType.Custom}>
-      <CustomScrollbar autoHeightMin={'100%'}>
-        <div className={styles.canvasContent}>
+    <Page navModel={navModel} pageNav={pageNav} layout={PageLayoutType.Custom}>
+      {editPanel && <editPanel.Component model={editPanel} />}
+      {!editPanel && (
+        <div
+          className={cx(
+            styles.pageContainer,
+            controls && !scopes && styles.pageContainerWithControls,
+            scopes && styles.pageContainerWithScopes,
+            scopes && isScopesExpanded && styles.pageContainerWithScopesExpanded
+          )}
+        >
+          {scopes && <scopes.Component model={scopes} />}
           <NavToolbarActions dashboard={model} />
-          {controls && (
-            <div className={styles.controls}>
-              {controls.map((control) => (
-                <control.Component key={control.state.key} model={control} />
-              ))}
-              <SceneDebugger scene={model} key={'scene-debugger'} />
+          {!isHomePage && controls && (
+            <div
+              className={cx(styles.controlsWrapper, scopes && !isScopesExpanded && styles.controlsWrapperWithScopes)}
+            >
+              <controls.Component model={controls} />
             </div>
           )}
-          <div className={styles.body}>
-            <bodyToRender.Component model={bodyToRender} />
-          </div>
+          <CustomScrollbar
+            autoHeightMin={'100%'}
+            className={styles.scrollbarContainer}
+            testId={selectors.pages.Dashboard.DashNav.scrollContainer}
+          >
+            <div className={cx(styles.canvasContent, isHomePage && styles.homePagePadding)}>
+              <>{isEmpty && emptyState}</>
+              {withPanels}
+            </div>
+          </CustomScrollbar>
         </div>
-      </CustomScrollbar>
+      )}
       {overlay && <overlay.Component model={overlay} />}
     </Page>
   );
@@ -42,6 +82,48 @@ export function DashboardSceneRenderer({ model }: SceneComponentProps<DashboardS
 
 function getStyles(theme: GrafanaTheme2) {
   return {
+    pageContainer: css({
+      display: 'grid',
+      gridTemplateAreas: `
+        "panels"`,
+      gridTemplateColumns: `1fr`,
+      gridTemplateRows: '1fr',
+      height: '100%',
+    }),
+    pageContainerWithControls: css({
+      gridTemplateAreas: `
+        "controls"
+        "panels"`,
+      gridTemplateRows: 'auto 1fr',
+    }),
+    pageContainerWithScopes: css({
+      gridTemplateAreas: `
+        "scopes controls"
+        "panels panels"`,
+      gridTemplateColumns: `${theme.spacing(32)} 1fr`,
+      gridTemplateRows: 'auto 1fr',
+    }),
+    pageContainerWithScopesExpanded: css({
+      gridTemplateAreas: `
+        "scopes controls"
+        "scopes panels"`,
+    }),
+    scrollbarContainer: css({
+      gridArea: 'panels',
+    }),
+    controlsWrapper: css({
+      display: 'flex',
+      flexDirection: 'column',
+      flexGrow: 0,
+      gridArea: 'controls',
+      padding: theme.spacing(2),
+    }),
+    controlsWrapperWithScopes: css({
+      padding: theme.spacing(2, 2, 2, 0),
+    }),
+    homePagePadding: css({
+      padding: theme.spacing(2, 2),
+    }),
     canvasContent: css({
       label: 'canvas-content',
       display: 'flex',
@@ -57,16 +139,5 @@ function getStyles(theme: GrafanaTheme2) {
       gap: '8px',
       marginBottom: theme.spacing(2),
     }),
-    controls: css({
-      display: 'flex',
-      flexWrap: 'wrap',
-      alignItems: 'center',
-      gap: theme.spacing(1),
-      position: 'sticky',
-      top: 0,
-      background: theme.colors.background.canvas,
-      zIndex: 1,
-      padding: theme.spacing(2, 0),
-    }),
   };
 }
diff --git a/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.test.ts b/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.test.ts
index 951187e9d2e86..72843c523fd7e 100644
--- a/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.test.ts
+++ b/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.test.ts
@@ -1,7 +1,8 @@
 import { AppEvents } from '@grafana/data';
-import { SceneGridItem, SceneGridLayout, SceneQueryRunner, VizPanel } from '@grafana/scenes';
+import { SceneGridLayout, SceneQueryRunner, VizPanel } from '@grafana/scenes';
 import appEvents from 'app/core/app_events';
 
+import { DashboardGridItem } from './DashboardGridItem';
 import { DashboardScene } from './DashboardScene';
 import { DashboardRepeatsProcessedEvent } from './types';
 
@@ -22,7 +23,21 @@ describe('DashboardSceneUrlSync', () => {
     it('Should set viewPanelKey when url has viewPanel', () => {
       const scene = buildTestScene();
       scene.urlSync?.updateFromUrl({ viewPanel: '2' });
-      expect(scene.state.viewPanelKey).toBe('2');
+      expect(scene.state.viewPanelScene!.getUrlKey()).toBe('panel-2');
+    });
+
+    it('Should set UNSAFE_fitPanels when url has autofitpanels', () => {
+      const scene = buildTestScene();
+      scene.urlSync?.updateFromUrl({ autofitpanels: '' });
+      expect((scene.state.body as SceneGridLayout).state.UNSAFE_fitPanels).toBe(true);
+    });
+
+    it('Should get the autofitpanels from the scene state', () => {
+      const scene = buildTestScene();
+
+      expect(scene.urlSync?.getUrlState().autofitpanels).toBeUndefined();
+      (scene.state.body as SceneGridLayout).setState({ UNSAFE_fitPanels: true });
+      expect(scene.urlSync?.getUrlState().autofitpanels).toBe('true');
     });
   });
 
@@ -34,7 +49,7 @@ describe('DashboardSceneUrlSync', () => {
 
     scene.urlSync?.updateFromUrl({ viewPanel: 'panel-1-clone-1' });
 
-    expect(scene.state.viewPanelKey).toBeUndefined();
+    expect(scene.state.viewPanelScene).toBeUndefined();
     // Verify no error notice was shown
     expect(errorNotice).toBe(0);
 
@@ -42,7 +57,7 @@ describe('DashboardSceneUrlSync', () => {
     const layout = scene.state.body as SceneGridLayout;
     layout.setState({
       children: [
-        new SceneGridItem({
+        new DashboardGridItem({
           key: 'griditem-1',
           x: 0,
           body: new VizPanel({
@@ -56,7 +71,7 @@ describe('DashboardSceneUrlSync', () => {
 
     // Verify it subscribes to DashboardRepeatsProcessedEvent
     scene.publishEvent(new DashboardRepeatsProcessedEvent({ source: scene }));
-    expect(scene.state.viewPanelKey).toBe('panel-1-clone-1');
+    expect(scene.state.viewPanelScene?.getUrlKey()).toBe('panel-1-clone-1');
   });
 });
 
@@ -66,7 +81,7 @@ function buildTestScene() {
     uid: 'dash-1',
     body: new SceneGridLayout({
       children: [
-        new SceneGridItem({
+        new DashboardGridItem({
           key: 'griditem-1',
           x: 0,
           body: new VizPanel({
@@ -76,7 +91,7 @@ function buildTestScene() {
             $data: new SceneQueryRunner({ key: 'data-query-runner', queries: [{ refId: 'A' }] }),
           }),
         }),
-        new SceneGridItem({
+        new DashboardGridItem({
           body: new VizPanel({
             title: 'Panel B',
             key: 'panel-2',
diff --git a/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.ts b/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.ts
index 67e09082a4bb4..90a8a93249113 100644
--- a/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.ts
+++ b/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.ts
@@ -2,13 +2,24 @@ import { Unsubscribable } from 'rxjs';
 
 import { AppEvents } from '@grafana/data';
 import { locationService } from '@grafana/runtime';
-import { SceneObjectUrlSyncHandler, SceneObjectUrlValues } from '@grafana/scenes';
+import {
+  SceneGridLayout,
+  SceneObjectBase,
+  SceneObjectState,
+  SceneObjectUrlSyncHandler,
+  SceneObjectUrlValues,
+  VizPanel,
+} from '@grafana/scenes';
 import appEvents from 'app/core/app_events';
 
 import { PanelInspectDrawer } from '../inspect/PanelInspectDrawer';
-import { findVizPanelByKey } from '../utils/utils';
+import { buildPanelEditScene } from '../panel-edit/PanelEditor';
+import { createDashboardEditViewFor } from '../settings/utils';
+import { findVizPanelByKey, getDashboardSceneFor, getLibraryPanel, isPanelClone } from '../utils/utils';
 
 import { DashboardScene, DashboardSceneState } from './DashboardScene';
+import { LibraryVizPanel } from './LibraryVizPanel';
+import { ViewPanelScene } from './ViewPanelScene';
 import { DashboardRepeatsProcessedEvent } from './types';
 
 export class DashboardSceneUrlSync implements SceneObjectUrlSyncHandler {
@@ -17,30 +28,69 @@ export class DashboardSceneUrlSync implements SceneObjectUrlSyncHandler {
   constructor(private _scene: DashboardScene) {}
 
   getKeys(): string[] {
-    return ['inspect', 'viewPanel'];
+    return ['inspect', 'viewPanel', 'editPanel', 'editview', 'autofitpanels'];
   }
 
   getUrlState(): SceneObjectUrlValues {
     const state = this._scene.state;
-    return { inspect: state.inspectPanelKey, viewPanel: state.viewPanelKey };
+    return {
+      inspect: state.inspectPanelKey,
+      autofitpanels: state.body instanceof SceneGridLayout && !!state.body.state.UNSAFE_fitPanels ? 'true' : undefined,
+      viewPanel: state.viewPanelScene?.getUrlKey(),
+      editview: state.editview?.getUrlKey(),
+      editPanel: state.editPanel?.getUrlKey() || undefined,
+    };
   }
 
   updateFromUrl(values: SceneObjectUrlValues): void {
-    const { inspectPanelKey: inspectPanelId, viewPanelKey: viewPanelId } = this._scene.state;
+    const { inspectPanelKey, viewPanelScene, isEditing, editPanel } = this._scene.state;
     const update: Partial<DashboardSceneState> = {};
 
+    if (typeof values.editview === 'string' && this._scene.canEditDashboard()) {
+      update.editview = createDashboardEditViewFor(values.editview);
+
+      // If we are not in editing (for example after full page reload)
+      if (!isEditing) {
+        if (this._scene.state.editable) {
+          // Not sure what is best to do here.
+          // The reason for the timeout is for this change to happen after the url sync has completed
+          setTimeout(() => this._scene.onEnterEditMode());
+        } else {
+          update.editview = undefined;
+        }
+      }
+    } else if (values.hasOwnProperty('editview')) {
+      update.editview = undefined;
+    }
+
     // Handle inspect object state
     if (typeof values.inspect === 'string') {
-      const panel = findVizPanelByKey(this._scene, values.inspect);
+      let panel = findVizPanelByKey(this._scene, values.inspect);
       if (!panel) {
         appEvents.emit(AppEvents.alertError, ['Panel not found']);
         locationService.partial({ inspect: null });
         return;
       }
 
+      if (getLibraryPanel(panel)) {
+        this._handleLibraryPanel(panel, (p) => {
+          if (p.state.key === undefined) {
+            // Inspect drawer require a panel key to be set
+            throw new Error('library panel key is undefined');
+          }
+          const drawer = new PanelInspectDrawer({
+            $behaviors: [new ResolveInspectPanelByKey({ panelKey: p.state.key })],
+          });
+          this._scene.setState({ overlay: drawer, inspectPanelKey: p.state.key });
+        });
+        return;
+      }
+
       update.inspectPanelKey = values.inspect;
-      update.overlay = new PanelInspectDrawer({ panelRef: panel.getRef() });
-    } else if (inspectPanelId) {
+      update.overlay = new PanelInspectDrawer({
+        $behaviors: [new ResolveInspectPanelByKey({ panelKey: values.inspect })],
+      });
+    } else if (inspectPanelKey) {
       update.inspectPanelKey = undefined;
       update.overlay = undefined;
     }
@@ -48,9 +98,10 @@ export class DashboardSceneUrlSync implements SceneObjectUrlSyncHandler {
     // Handle view panel state
     if (typeof values.viewPanel === 'string') {
       const panel = findVizPanelByKey(this._scene, values.viewPanel);
+
       if (!panel) {
         // // If we are trying to view a repeat clone that can't be found it might be that the repeats have not been processed yet
-        if (values.viewPanel.indexOf('clone')) {
+        if (isPanelClone(values.viewPanel)) {
           this._handleViewRepeatClone(values.viewPanel);
           return;
         }
@@ -60,9 +111,45 @@ export class DashboardSceneUrlSync implements SceneObjectUrlSyncHandler {
         return;
       }
 
-      update.viewPanelKey = values.viewPanel;
-    } else if (viewPanelId) {
-      update.viewPanelKey = undefined;
+      if (getLibraryPanel(panel)) {
+        this._handleLibraryPanel(panel, (p) => this._buildLibraryPanelViewScene(p));
+        return;
+      }
+
+      update.viewPanelScene = new ViewPanelScene({ panelRef: panel.getRef() });
+    } else if (viewPanelScene && values.viewPanel === null) {
+      update.viewPanelScene = undefined;
+    }
+
+    // Handle edit panel state
+    if (typeof values.editPanel === 'string') {
+      const panel = findVizPanelByKey(this._scene, values.editPanel);
+      if (!panel) {
+        console.warn(`Panel ${values.editPanel} not found`);
+        return;
+      }
+
+      // If we are not in editing (for example after full page reload)
+      if (!isEditing) {
+        this._scene.onEnterEditMode();
+      }
+      if (getLibraryPanel(panel)) {
+        this._handleLibraryPanel(panel, (p) => {
+          this._scene.setState({ editPanel: buildPanelEditScene(p) });
+        });
+        return;
+      }
+      update.editPanel = buildPanelEditScene(panel);
+    } else if (editPanel && values.editPanel === null) {
+      update.editPanel = undefined;
+    }
+
+    if (this._scene.state.body instanceof SceneGridLayout) {
+      const UNSAFE_fitPanels = typeof values.autofitpanels === 'string';
+
+      if (!!this._scene.state.body.state.UNSAFE_fitPanels !== UNSAFE_fitPanels) {
+        this._scene.state.body.setState({ UNSAFE_fitPanels });
+      }
     }
 
     if (Object.keys(update).length > 0) {
@@ -70,15 +157,72 @@ export class DashboardSceneUrlSync implements SceneObjectUrlSyncHandler {
     }
   }
 
+  private _buildLibraryPanelViewScene(vizPanel: VizPanel) {
+    this._scene.setState({ viewPanelScene: new ViewPanelScene({ panelRef: vizPanel.getRef() }) });
+  }
+
+  private _handleLibraryPanel(vizPanel: VizPanel, cb: (p: VizPanel) => void): void {
+    if (!(vizPanel.parent instanceof LibraryVizPanel)) {
+      throw new Error('Panel is not a child of a LibraryVizPanel');
+    }
+    const libraryPanel = vizPanel.parent;
+    if (libraryPanel.state.isLoaded) {
+      cb(vizPanel);
+    } else {
+      libraryPanel.subscribeToState((n) => {
+        cb(n.panel!);
+      });
+      libraryPanel.activate();
+    }
+  }
+
   private _handleViewRepeatClone(viewPanel: string) {
     if (!this._eventSub) {
       this._eventSub = this._scene.subscribeToEvent(DashboardRepeatsProcessedEvent, () => {
         const panel = findVizPanelByKey(this._scene, viewPanel);
         if (panel) {
           this._eventSub?.unsubscribe();
-          this._scene.setState({ viewPanelKey: viewPanel });
+          this._scene.setState({ viewPanelScene: new ViewPanelScene({ panelRef: panel.getRef() }) });
         }
       });
     }
   }
 }
+
+interface ResolveInspectPanelByKeyState extends SceneObjectState {
+  panelKey: string;
+}
+
+class ResolveInspectPanelByKey extends SceneObjectBase<ResolveInspectPanelByKeyState> {
+  constructor(state: ResolveInspectPanelByKeyState) {
+    super(state);
+    this.addActivationHandler(this._onActivate);
+  }
+
+  private _onActivate = () => {
+    const parent = this.parent;
+
+    if (!parent || !(parent instanceof PanelInspectDrawer)) {
+      throw new Error('ResolveInspectPanelByKey must be attached to a PanelInspectDrawer');
+    }
+
+    const dashboard = getDashboardSceneFor(parent);
+    if (!dashboard) {
+      return;
+    }
+    const panelId = this.state.panelKey;
+    let panel = findVizPanelByKey(dashboard, panelId);
+
+    if (dashboard.state.editPanel) {
+      panel = dashboard.state.editPanel.state.vizManager.state.panel;
+    }
+
+    if (dashboard.state.viewPanelScene && dashboard.state.viewPanelScene.state.body) {
+      panel = dashboard.state.viewPanelScene.state.body;
+    }
+
+    if (panel) {
+      parent.setState({ panelRef: panel.getRef() });
+    }
+  };
+}
diff --git a/public/app/features/dashboard-scene/scene/GoToSnapshotOriginButton.test.tsx b/public/app/features/dashboard-scene/scene/GoToSnapshotOriginButton.test.tsx
new file mode 100644
index 0000000000000..6e55b4d0ab0f7
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/GoToSnapshotOriginButton.test.tsx
@@ -0,0 +1,60 @@
+import { fireEvent, render, screen } from '@testing-library/react';
+import React from 'react';
+
+import { config, locationService } from '@grafana/runtime';
+import { ConfirmModal } from '@grafana/ui';
+
+import appEvents from '../../../core/app_events';
+import { ShowModalReactEvent } from '../../../types/events';
+
+import { GoToSnapshotOriginButton } from './GoToSnapshotOriginButton';
+
+describe('GoToSnapshotOriginButton component', () => {
+  beforeEach(async () => {
+    locationService.push('/');
+    const location = window.location;
+    //@ts-ignore
+    delete window.location;
+    window.location = {
+      ...location,
+      href: 'http://snapshots.grafana.com/snapshots/dashboard/abcdefghi/my-dash',
+    };
+    jest.spyOn(appEvents, 'publish');
+  });
+  config.appUrl = 'http://snapshots.grafana.com/';
+
+  it('renders button and triggers onClick redirects to the original dashboard', () => {
+    render(<GoToSnapshotOriginButton originalURL={'/d/c0d2742f-b827-466d-9269-fb34d6af24ff'} />);
+
+    // Check if the button renders with the correct testid
+    expect(screen.getByTestId('button-snapshot')).toBeInTheDocument();
+
+    // Simulate a button click
+    fireEvent.click(screen.getByTestId('button-snapshot'));
+
+    expect(appEvents.publish).toHaveBeenCalledTimes(0);
+    expect(locationService.getLocation().pathname).toEqual('/d/c0d2742f-b827-466d-9269-fb34d6af24ff');
+    expect(window.location.href).toBe('http://snapshots.grafana.com/snapshots/dashboard/abcdefghi/my-dash');
+  });
+
+  it('renders button and triggers onClick opens a confirmation modal', () => {
+    render(<GoToSnapshotOriginButton originalURL={'http://www.anotherdomain.com/'} />);
+
+    // Check if the button renders with the correct testid
+    expect(screen.getByTestId('button-snapshot')).toBeInTheDocument();
+
+    // Simulate a button click
+    fireEvent.click(screen.getByTestId('button-snapshot'));
+
+    expect(appEvents.publish).toHaveBeenCalledTimes(1);
+    expect(appEvents.publish).toHaveBeenCalledWith(
+      new ShowModalReactEvent(
+        expect.objectContaining({
+          component: ConfirmModal,
+        })
+      )
+    );
+    expect(locationService.getLocation().pathname).toEqual('/');
+    expect(window.location.href).toBe('http://snapshots.grafana.com/snapshots/dashboard/abcdefghi/my-dash');
+  });
+});
diff --git a/public/app/features/dashboard-scene/scene/GoToSnapshotOriginButton.tsx b/public/app/features/dashboard-scene/scene/GoToSnapshotOriginButton.tsx
new file mode 100644
index 0000000000000..28c5c802f4753
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/GoToSnapshotOriginButton.tsx
@@ -0,0 +1,62 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { textUtil } from '@grafana/data';
+import { config, locationService } from '@grafana/runtime';
+import { ConfirmModal, ToolbarButton } from '@grafana/ui';
+
+import appEvents from '../../../core/app_events';
+import { t } from '../../../core/internationalization';
+import { ShowModalReactEvent } from '../../../types/events';
+
+export function GoToSnapshotOriginButton(props: { originalURL: string }) {
+  return (
+    <ToolbarButton
+      key="button-snapshot"
+      data-testid="button-snapshot"
+      tooltip={t('dashboard.toolbar.open-original', 'Open original dashboard')}
+      icon="link"
+      onClick={() => onOpenSnapshotOriginalDashboard(props.originalURL)}
+    />
+  );
+}
+
+const onOpenSnapshotOriginalDashboard = (originalUrl: string) => {
+  const relativeURL = originalUrl ?? '';
+  const sanitizedRelativeURL = textUtil.sanitizeUrl(relativeURL);
+  try {
+    const sanitizedAppUrl = new URL(sanitizedRelativeURL, config.appUrl);
+    const appUrl = new URL(config.appUrl);
+    if (sanitizedAppUrl.host !== appUrl.host) {
+      appEvents.publish(
+        new ShowModalReactEvent({
+          component: ConfirmModal,
+          props: {
+            title: 'Proceed to external site?',
+            modalClass: css({
+              width: 'max-content',
+              maxWidth: '80vw',
+            }),
+            body: (
+              <>
+                <p>
+                  {`This link connects to an external website at`} <code>{relativeURL}</code>
+                </p>
+                <p>{"Are you sure you'd like to proceed?"}</p>
+              </>
+            ),
+            confirmVariant: 'primary',
+            confirmText: 'Proceed',
+            onConfirm: () => {
+              window.location.href = sanitizedAppUrl.href;
+            },
+          },
+        })
+      );
+    } else {
+      locationService.push(sanitizedRelativeURL);
+    }
+  } catch (err) {
+    console.error('Failed to open original dashboard', err);
+  }
+};
diff --git a/public/app/features/dashboard-scene/scene/LibraryVizPanel.test.ts b/public/app/features/dashboard-scene/scene/LibraryVizPanel.test.ts
new file mode 100644
index 0000000000000..f6fdeab02ea2c
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/LibraryVizPanel.test.ts
@@ -0,0 +1,141 @@
+import 'whatwg-fetch';
+import { waitFor } from '@testing-library/dom';
+import { merge } from 'lodash';
+import { http, HttpResponse } from 'msw';
+import { setupServer, SetupServerApi } from 'msw/node';
+
+import { setBackendSrv } from '@grafana/runtime';
+import { SceneGridLayout, VizPanel } from '@grafana/scenes';
+import { LibraryPanel } from '@grafana/schema';
+import { backendSrv } from 'app/core/services/backend_srv';
+
+import { DashboardGridItem } from './DashboardGridItem';
+import { LibraryVizPanel } from './LibraryVizPanel';
+
+describe('LibraryVizPanel', () => {
+  const server = setupServer();
+
+  beforeAll(() => {
+    setBackendSrv(backendSrv);
+    server.listen();
+  });
+
+  afterAll(() => {
+    server.close();
+  });
+
+  beforeEach(() => {
+    server.resetHandlers();
+  });
+
+  it('should fetch and init', async () => {
+    setUpApiMock(server);
+    const libVizPanel = new LibraryVizPanel({
+      name: 'My Library Panel',
+      title: 'Panel title',
+      uid: 'fdcvggvfy2qdca',
+      panelKey: 'lib-panel',
+    });
+    libVizPanel.activate();
+    await waitFor(() => {
+      expect(libVizPanel.state.panel).toBeInstanceOf(VizPanel);
+    });
+  });
+
+  it('should configure repeat options of DashboardGridIem if repeat is set', async () => {
+    setUpApiMock(server, { model: { repeat: 'query0', repeatDirection: 'h' } });
+    const libVizPanel = new LibraryVizPanel({
+      name: 'My Library Panel',
+      title: 'Panel title',
+      uid: 'fdcvggvfy2qdca',
+      panelKey: 'lib-panel',
+    });
+
+    const layout = new SceneGridLayout({
+      children: [new DashboardGridItem({ body: libVizPanel })],
+    });
+
+    layout.activate();
+    libVizPanel.activate();
+
+    await waitFor(() => {
+      expect(layout.state.children[0]).toBeInstanceOf(DashboardGridItem);
+      expect((layout.state.children[0] as DashboardGridItem).state.variableName).toBe('query0');
+      expect((layout.state.children[0] as DashboardGridItem).state.repeatDirection).toBe('h');
+      expect((layout.state.children[0] as DashboardGridItem).state.maxPerRow).toBe(4);
+    });
+  });
+});
+
+function setUpApiMock(
+  server: SetupServerApi,
+  overrides: Omit<Partial<LibraryPanel>, 'model'> & { model?: Partial<LibraryPanel['model']> } = {}
+) {
+  const libPanel: LibraryPanel = merge(
+    {
+      folderUid: 'general',
+      uid: 'fdcvggvfy2qdca',
+      name: 'My Library Panel',
+      type: 'timeseries',
+      description: '',
+      model: {
+        datasource: {
+          type: 'grafana-testdata-datasource',
+          uid: 'PD8C576611E62080A',
+        },
+        description: '',
+
+        maxPerRow: 4,
+        options: {
+          legend: {
+            calcs: [],
+            displayMode: 'list',
+            placement: 'bottom',
+            showLegend: true,
+          },
+          tooltip: {
+            maxHeight: 600,
+            mode: 'single',
+            sort: 'none',
+          },
+        },
+        targets: [
+          {
+            datasource: {
+              type: 'grafana-testdata-datasource',
+              uid: 'PD8C576611E62080A',
+            },
+            refId: 'A',
+          },
+        ],
+        title: 'Panel Title',
+        type: 'timeseries',
+      },
+      version: 6,
+      meta: {
+        folderName: 'General',
+        folderUid: '',
+        connectedDashboards: 1,
+        created: '2024-02-15T15:26:46Z',
+        updated: '2024-02-28T15:54:22Z',
+        createdBy: {
+          avatarUrl: '/avatar/46d229b033af06a191ff2267bca9ae56',
+          id: 1,
+          name: 'admin',
+        },
+        updatedBy: {
+          avatarUrl: '/avatar/46d229b033af06a191ff2267bca9ae56',
+          id: 1,
+          name: 'admin',
+        },
+      },
+    },
+    overrides
+  );
+
+  const libPanelMock: { result: LibraryPanel } = {
+    result: libPanel,
+  };
+
+  server.use(http.get('/api/library-elements/:uid', () => HttpResponse.json(libPanelMock)));
+}
diff --git a/public/app/features/dashboard-scene/scene/LibraryVizPanel.tsx b/public/app/features/dashboard-scene/scene/LibraryVizPanel.tsx
index ce09b6269f649..b7a1a4d87219b 100644
--- a/public/app/features/dashboard-scene/scene/LibraryVizPanel.tsx
+++ b/public/app/features/dashboard-scene/scene/LibraryVizPanel.tsx
@@ -1,55 +1,141 @@
 import React from 'react';
 
-import { SceneComponentProps, SceneObjectBase, SceneObjectState, VizPanel } from '@grafana/scenes';
+import {
+  SceneComponentProps,
+  SceneGridLayout,
+  SceneObjectBase,
+  SceneObjectState,
+  VizPanel,
+  VizPanelMenu,
+  VizPanelState,
+} from '@grafana/scenes';
+import { LibraryPanel } from '@grafana/schema';
 import { PanelModel } from 'app/features/dashboard/state';
 import { getLibraryPanel } from 'app/features/library-panels/state/api';
 
 import { createPanelDataProvider } from '../utils/createPanelDataProvider';
 
-interface LibraryVizPanelState extends SceneObjectState {
+import { DashboardGridItem } from './DashboardGridItem';
+import { VizPanelLinks, VizPanelLinksMenu } from './PanelLinks';
+import { panelLinksBehavior, panelMenuBehavior } from './PanelMenuBehavior';
+import { PanelNotices } from './PanelNotices';
+
+export interface LibraryVizPanelState extends SceneObjectState {
   // Library panels use title from dashboard JSON's panel model, not from library panel definition, hence we pass it.
   title: string;
   uid: string;
   name: string;
   panel?: VizPanel;
+  isLoaded?: boolean;
+  panelKey: string;
+  _loadedPanel?: LibraryPanel;
 }
 
 export class LibraryVizPanel extends SceneObjectBase<LibraryVizPanelState> {
   static Component = LibraryPanelRenderer;
 
-  constructor({ uid, title, key, name }: Pick<LibraryVizPanelState, 'uid' | 'title' | 'key' | 'name'>) {
-    super({ uid, title, key, name });
+  constructor(state: LibraryVizPanelState) {
+    super({
+      panel: state.panel ?? getLoadingPanel(state.title, state.panelKey),
+      isLoaded: state.isLoaded ?? false,
+      ...state,
+    });
 
     this.addActivationHandler(this._onActivate);
   }
 
   private _onActivate = () => {
-    this.loadLibraryPanelFromPanelModel();
+    if (!this.state.isLoaded) {
+      this.loadLibraryPanelFromPanelModel();
+    }
   };
 
+  public setPanelFromLibPanel(libPanel: LibraryPanel) {
+    if (this.state._loadedPanel?.version === libPanel.version) {
+      return;
+    }
+
+    const libPanelModel = new PanelModel(libPanel.model);
+
+    const vizPanelState: VizPanelState = {
+      title: libPanelModel.title,
+      key: this.state.panelKey,
+      options: libPanelModel.options ?? {},
+      fieldConfig: libPanelModel.fieldConfig,
+      pluginId: libPanelModel.type,
+      pluginVersion: libPanelModel.pluginVersion,
+      displayMode: libPanelModel.transparent ? 'transparent' : undefined,
+      description: libPanelModel.description,
+      $data: createPanelDataProvider(libPanelModel),
+      menu: new VizPanelMenu({ $behaviors: [panelMenuBehavior] }),
+      titleItems: [
+        new VizPanelLinks({
+          rawLinks: libPanelModel.links,
+          menu: new VizPanelLinksMenu({ $behaviors: [panelLinksBehavior] }),
+        }),
+        new PanelNotices(),
+      ],
+    };
+
+    const panel = new VizPanel(vizPanelState);
+    const gridItem = this.parent;
+
+    if (libPanelModel.repeat && gridItem instanceof DashboardGridItem && gridItem.parent instanceof SceneGridLayout) {
+      this._parent = undefined;
+      const repeater = new DashboardGridItem({
+        key: gridItem.state.key,
+        x: gridItem.state.x,
+        y: gridItem.state.y,
+        width: libPanelModel.repeatDirection === 'h' ? 24 : gridItem.state.width,
+        height: gridItem.state.height,
+        itemHeight: gridItem.state.height,
+        body: this,
+        variableName: libPanelModel.repeat,
+        repeatedPanels: [],
+        repeatDirection: libPanelModel.repeatDirection === 'h' ? 'h' : 'v',
+        maxPerRow: libPanelModel.maxPerRow,
+      });
+      gridItem.parent.setState({
+        children: gridItem.parent.state.children.map((child) =>
+          child.state.key === gridItem.state.key ? repeater : child
+        ),
+      });
+    }
+
+    this.setState({ panel, _loadedPanel: libPanel, isLoaded: true, name: libPanel.name });
+  }
+
   private async loadLibraryPanelFromPanelModel() {
-    const { title } = this.state;
-    let vizPanel = new VizPanel({ title });
+    let vizPanel = this.state.panel!;
+
     try {
       const libPanel = await getLibraryPanel(this.state.uid, true);
-      const libPanelModel = new PanelModel(libPanel.model);
-      vizPanel.setState({
-        options: libPanelModel.options ?? {},
-        fieldConfig: libPanelModel.fieldConfig,
-        pluginVersion: libPanelModel.pluginVersion,
-        displayMode: libPanelModel.transparent ? 'transparent' : undefined,
-        $data: createPanelDataProvider(libPanelModel),
-      });
+      this.setPanelFromLibPanel(libPanel);
+      if (this.parent instanceof DashboardGridItem) {
+        this.parent.setState({
+          variableName: libPanel.model.repeat,
+          repeatDirection: libPanel.model.repeatDirection === 'h' ? 'h' : 'v',
+          maxPerRow: libPanel.model.maxPerRow,
+        });
+      }
     } catch (err) {
       vizPanel.setState({
-        _pluginLoadError: 'Unable to load library panel: ' + this.state.uid,
+        _pluginLoadError: `Unable to load library panel: ${this.state.uid}`,
       });
     }
-
-    this.setState({ panel: vizPanel });
   }
 }
 
+function getLoadingPanel(title: string, panelKey: string) {
+  return new VizPanel({
+    key: panelKey,
+    title,
+    menu: new VizPanelMenu({
+      $behaviors: [panelMenuBehavior],
+    }),
+  });
+}
+
 function LibraryPanelRenderer({ model }: SceneComponentProps<LibraryVizPanel>) {
   const { panel } = model.useState();
 
diff --git a/public/app/features/dashboard-scene/scene/NavToolbarActions.test.tsx b/public/app/features/dashboard-scene/scene/NavToolbarActions.test.tsx
new file mode 100644
index 0000000000000..7037971a2e655
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/NavToolbarActions.test.tsx
@@ -0,0 +1,144 @@
+import { screen, render } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { TestProvider } from 'test/helpers/TestProvider';
+import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
+
+import { selectors } from '@grafana/e2e-selectors';
+import { playlistSrv } from 'app/features/playlist/PlaylistSrv';
+
+import { transformSaveModelToScene } from '../serialization/transformSaveModelToScene';
+import { transformSceneToSaveModel } from '../serialization/transformSceneToSaveModel';
+
+import { ToolbarActions } from './NavToolbarActions';
+
+jest.mock('app/features/playlist/PlaylistSrv', () => ({
+  playlistSrv: {
+    useState: jest.fn().mockReturnValue({ isPlaying: false }),
+    setState: jest.fn(),
+    isPlaying: true,
+    start: jest.fn(),
+    next: jest.fn(),
+    prev: jest.fn(),
+    stop: jest.fn(),
+  },
+}));
+
+describe('NavToolbarActions', () => {
+  describe('Give an already saved dashboard', () => {
+    it('Should show correct buttons when not in editing', async () => {
+      setup();
+
+      expect(screen.queryByText('Save dashboard')).not.toBeInTheDocument();
+      expect(screen.queryByLabelText('Add')).not.toBeInTheDocument();
+      expect(await screen.findByText('Edit')).toBeInTheDocument();
+      expect(await screen.findByText('Share')).toBeInTheDocument();
+    });
+
+    it('Should the correct buttons when playing a playlist', async () => {
+      jest.mocked(playlistSrv).useState.mockReturnValueOnce({ isPlaying: true });
+      setup();
+
+      expect(await screen.findByTestId(selectors.pages.Dashboard.DashNav.playlistControls.prev)).toBeInTheDocument();
+      expect(await screen.findByTestId(selectors.pages.Dashboard.DashNav.playlistControls.stop)).toBeInTheDocument();
+      expect(await screen.findByTestId(selectors.pages.Dashboard.DashNav.playlistControls.next)).toBeInTheDocument();
+      expect(screen.queryByText('Edit')).not.toBeInTheDocument();
+      expect(screen.queryByText('Share')).not.toBeInTheDocument();
+    });
+
+    it('Should call the playlist srv when using playlist controls', async () => {
+      jest.mocked(playlistSrv).useState.mockReturnValueOnce({ isPlaying: true });
+      setup();
+
+      // Previous dashboard
+      expect(await screen.findByTestId(selectors.pages.Dashboard.DashNav.playlistControls.prev)).toBeInTheDocument();
+      await userEvent.click(await screen.findByTestId(selectors.pages.Dashboard.DashNav.playlistControls.prev));
+      expect(playlistSrv.prev).toHaveBeenCalledTimes(1);
+
+      // Next dashboard
+      expect(await screen.findByTestId(selectors.pages.Dashboard.DashNav.playlistControls.next)).toBeInTheDocument();
+      await userEvent.click(await screen.findByTestId(selectors.pages.Dashboard.DashNav.playlistControls.next));
+      expect(playlistSrv.next).toHaveBeenCalledTimes(1);
+
+      // Stop playlist
+      expect(await screen.findByTestId(selectors.pages.Dashboard.DashNav.playlistControls.stop)).toBeInTheDocument();
+      await userEvent.click(await screen.findByTestId(selectors.pages.Dashboard.DashNav.playlistControls.stop));
+      expect(playlistSrv.stop).toHaveBeenCalledTimes(1);
+    });
+
+    it('Should hide the playlist controls when it is not playing', async () => {
+      setup();
+      expect(screen.queryByText(selectors.pages.Dashboard.DashNav.playlistControls.prev)).not.toBeInTheDocument();
+      expect(screen.queryByText(selectors.pages.Dashboard.DashNav.playlistControls.stop)).not.toBeInTheDocument();
+      expect(screen.queryByText(selectors.pages.Dashboard.DashNav.playlistControls.next)).not.toBeInTheDocument();
+    });
+
+    it('Should show correct buttons when editing', async () => {
+      setup();
+
+      await userEvent.click(await screen.findByText('Edit'));
+
+      expect(await screen.findByText('Save dashboard')).toBeInTheDocument();
+      expect(await screen.findByText('Exit edit')).toBeInTheDocument();
+      expect(await screen.findByText('Add')).toBeInTheDocument();
+      expect(screen.queryByText('Edit')).not.toBeInTheDocument();
+      expect(screen.queryByText('Share')).not.toBeInTheDocument();
+      expect(screen.queryByText(selectors.pages.Dashboard.DashNav.playlistControls.prev)).not.toBeInTheDocument();
+      expect(screen.queryByText(selectors.pages.Dashboard.DashNav.playlistControls.stop)).not.toBeInTheDocument();
+      expect(screen.queryByText(selectors.pages.Dashboard.DashNav.playlistControls.next)).not.toBeInTheDocument();
+    });
+
+    it('Should show correct buttons when in settings menu', async () => {
+      setup();
+
+      await userEvent.click(await screen.findByText('Edit'));
+      await userEvent.click(await screen.findByText('Settings'));
+
+      expect(await screen.findByText('Save dashboard')).toBeInTheDocument();
+      expect(await screen.findByText('Back to dashboard')).toBeInTheDocument();
+      expect(screen.queryByText(selectors.pages.Dashboard.DashNav.playlistControls.prev)).not.toBeInTheDocument();
+      expect(screen.queryByText(selectors.pages.Dashboard.DashNav.playlistControls.stop)).not.toBeInTheDocument();
+      expect(screen.queryByText(selectors.pages.Dashboard.DashNav.playlistControls.next)).not.toBeInTheDocument();
+    });
+  });
+});
+
+let cleanUp = () => {};
+
+function setup() {
+  const dashboard = transformSaveModelToScene({
+    dashboard: {
+      title: 'hello',
+      uid: 'my-uid',
+      schemaVersion: 30,
+      panels: [],
+      version: 10,
+    },
+    meta: {
+      canSave: true,
+    },
+  });
+
+  // Clear any data layers
+  dashboard.setState({ $data: undefined });
+
+  const initialSaveModel = transformSceneToSaveModel(dashboard);
+  dashboard.setInitialSaveModel(initialSaveModel);
+
+  dashboard.startUrlSync();
+
+  cleanUp();
+  cleanUp = dashboard.activate();
+
+  const context = getGrafanaContextMock();
+
+  render(
+    <TestProvider grafanaContext={context}>
+      <ToolbarActions dashboard={dashboard} />
+    </TestProvider>
+  );
+
+  const actions = context.chrome.state.getValue().actions;
+
+  return { dashboard, actions };
+}
diff --git a/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx b/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx
index 2a634c2b5c59d..957f78d472429 100644
--- a/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx
+++ b/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx
@@ -1,99 +1,663 @@
-import React from 'react';
+import { css } from '@emotion/css';
+import React, { useEffect, useState } from 'react';
 
-import { locationService } from '@grafana/runtime';
-import { Button } from '@grafana/ui';
+import { GrafanaTheme2 } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { config, locationService } from '@grafana/runtime';
+import {
+  Badge,
+  Button,
+  ButtonGroup,
+  Dropdown,
+  Icon,
+  Menu,
+  ToolbarButton,
+  ToolbarButtonRow,
+  useStyles2,
+} from '@grafana/ui';
 import { AppChromeUpdate } from 'app/core/components/AppChrome/AppChromeUpdate';
 import { NavToolbarSeparator } from 'app/core/components/AppChrome/NavToolbar/NavToolbarSeparator';
-import { t } from 'app/core/internationalization';
-import { DashNavButton } from 'app/features/dashboard/components/DashNav/DashNavButton';
+import { contextSrv } from 'app/core/core';
+import { Trans, t } from 'app/core/internationalization';
+import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
+import { playlistSrv } from 'app/features/playlist/PlaylistSrv';
 
+import { PanelEditor } from '../panel-edit/PanelEditor';
 import { ShareModal } from '../sharing/ShareModal';
+import { DashboardInteractions } from '../utils/interactions';
+import { DynamicDashNavButtonModel, dynamicDashNavActions } from '../utils/registerDynamicDashNavAction';
 
 import { DashboardScene } from './DashboardScene';
+import { GoToSnapshotOriginButton } from './GoToSnapshotOriginButton';
+import { LibraryVizPanel } from './LibraryVizPanel';
 
 interface Props {
   dashboard: DashboardScene;
 }
 
 export const NavToolbarActions = React.memo<Props>(({ dashboard }) => {
-  const { actions = [], isEditing, viewPanelKey, isDirty, uid } = dashboard.useState();
-  const toolbarActions = (actions ?? []).map((action) => <action.Component key={action.state.key} model={action} />);
+  const actions = <ToolbarActions dashboard={dashboard} />;
+  return <AppChromeUpdate actions={actions} />;
+});
 
-  if (uid) {
-    toolbarActions.push(
-      <DashNavButton
-        key="share-dashboard-button"
-        tooltip={t('dashboard.toolbar.share', 'Share dashboard')}
-        icon="share-alt"
-        iconSize="lg"
+NavToolbarActions.displayName = 'NavToolbarActions';
+
+/**
+ * This part is split into a separate component to help test this
+ */
+export function ToolbarActions({ dashboard }: Props) {
+  const {
+    isEditing,
+    viewPanelScene,
+    isDirty,
+    uid,
+    meta,
+    editview,
+    editPanel,
+    editable,
+    hasCopiedPanel: copiedPanel,
+  } = dashboard.useState();
+  const { isPlaying } = playlistSrv.useState();
+  const [isAddPanelMenuOpen, setIsAddPanelMenuOpen] = useState(false);
+
+  const canSaveAs = contextSrv.hasEditPermissionInFolders;
+  const toolbarActions: ToolbarAction[] = [];
+  const styles = useStyles2(getStyles);
+  const isEditingPanel = Boolean(editPanel);
+  const isViewingPanel = Boolean(viewPanelScene);
+  const isEditedPanelDirty = useVizManagerDirty(editPanel);
+  const isEditingLibraryPanel = useEditingLibraryPanel(editPanel);
+  const hasCopiedPanel = Boolean(copiedPanel);
+  // Means we are not in settings view, fullscreen panel or edit panel
+  const isShowingDashboard = !editview && !isViewingPanel && !isEditingPanel;
+  const isEditingAndShowingDashboard = isEditing && isShowingDashboard;
+
+  if (!isEditingPanel) {
+    // This adds the precence indicators in enterprise
+    addDynamicActions(toolbarActions, dynamicDashNavActions.left, 'left-actions');
+  }
+
+  toolbarActions.push({
+    group: 'icon-actions',
+    condition: uid && Boolean(meta.canStar) && isShowingDashboard && !isEditing,
+    render: () => {
+      let desc = meta.isStarred
+        ? t('dashboard.toolbar.unmark-favorite', 'Unmark as favorite')
+        : t('dashboard.toolbar.mark-favorite', 'Mark as favorite');
+      return (
+        <ToolbarButton
+          tooltip={desc}
+          icon={
+            <Icon name={meta.isStarred ? 'favorite' : 'star'} size="lg" type={meta.isStarred ? 'mono' : 'default'} />
+          }
+          key="star-dashboard-button"
+          data-testid={selectors.components.NavToolbar.markAsFavorite}
+          onClick={() => {
+            DashboardInteractions.toolbarFavoritesClick();
+            dashboard.onStarDashboard();
+          }}
+        />
+      );
+    },
+  });
+
+  if (meta.publicDashboardEnabled) {
+    toolbarActions.push({
+      group: 'icon-actions',
+      condition: uid && Boolean(meta.canStar) && isShowingDashboard && !isEditing,
+      render: () => {
+        return (
+          <Badge
+            color="blue"
+            text="Public"
+            key="public-dashboard-button-badge"
+            className={styles.publicBadge}
+            data-testid={selectors.pages.Dashboard.DashNav.publicDashboardTag}
+          />
+        );
+      },
+    });
+  }
+
+  const isDevEnv = config.buildInfo.env === 'development';
+
+  toolbarActions.push({
+    group: 'icon-actions',
+    condition: isDevEnv && uid && isShowingDashboard && !isEditing,
+    render: () => (
+      <ToolbarButton
+        key="view-in-old-dashboard-button"
+        tooltip={'Switch to old dashboard page'}
+        icon="apps"
         onClick={() => {
-          dashboard.showModal(new ShareModal({ dashboardRef: dashboard.getRef() }));
+          locationService.partial({ scenes: false });
         }}
       />
-    );
+    ),
+  });
 
-    toolbarActions.push(
-      <DashNavButton
-        key="view-in-old-dashboard-button"
-        tooltip={'View as dashboard'}
-        icon="apps"
-        onClick={() => locationService.push(`/d/${uid}`)}
+  toolbarActions.push({
+    group: 'icon-actions',
+    condition: meta.isSnapshot && !isEditing,
+    render: () => (
+      <GoToSnapshotOriginButton
+        key="go-to-snapshot-origin"
+        originalURL={dashboard.getInitialSaveModel()?.snapshot?.originalUrl ?? ''}
       />
-    );
+    ),
+  });
+
+  if (!isEditingPanel && !isEditing) {
+    // This adds the alert rules button and the dashboard insights button
+    addDynamicActions(toolbarActions, dynamicDashNavActions.right, 'icon-actions');
   }
 
-  toolbarActions.push(<NavToolbarSeparator leftActionsSeparator key="separator" />);
+  toolbarActions.push({
+    group: 'add-panel',
+    condition: isEditingAndShowingDashboard,
+    render: () => (
+      <Dropdown
+        key="add-panel-dropdown"
+        onVisibleChange={(isOpen) => {
+          setIsAddPanelMenuOpen(isOpen);
+          DashboardInteractions.toolbarAddClick();
+        }}
+        overlay={() => (
+          <Menu>
+            <Menu.Item
+              key="add-visualization"
+              testId={selectors.pages.AddDashboard.itemButton('Add new visualization menu item')}
+              label={t('dashboard.add-menu.visualization', 'Visualization')}
+              onClick={() => {
+                const id = dashboard.onCreateNewPanel();
+                DashboardInteractions.toolbarAddButtonClicked({ item: 'add_visualization' });
+                locationService.partial({ editPanel: id });
+              }}
+            />
+            <Menu.Item
+              key="add-panel-lib"
+              testId={selectors.pages.AddDashboard.itemButton('Add new panel from panel library menu item')}
+              label={t('dashboard.add-menu.import', 'Import from library')}
+              onClick={() => {
+                dashboard.onShowAddLibraryPanelDrawer();
+                DashboardInteractions.toolbarAddButtonClicked({ item: 'add_library_panel' });
+              }}
+            />
+            <Menu.Item
+              key="add-row"
+              testId={selectors.pages.AddDashboard.itemButton('Add new row menu item')}
+              label={t('dashboard.add-menu.row', 'Row')}
+              onClick={() => {
+                dashboard.onCreateNewRow();
+                DashboardInteractions.toolbarAddButtonClicked({ item: 'add_row' });
+              }}
+            />
+            <Menu.Item
+              key="paste-panel"
+              disabled={!hasCopiedPanel}
+              testId={selectors.pages.AddDashboard.itemButton('Add new panel from clipboard menu item')}
+              label={t('dashboard.add-menu.paste-panel', 'Paste panel')}
+              onClick={() => {
+                dashboard.pastePanel();
+                DashboardInteractions.toolbarAddButtonClicked({ item: 'paste_panel' });
+              }}
+            />
+          </Menu>
+        )}
+        placement="bottom"
+        offset={[0, 6]}
+      >
+        <Button
+          key="add-panel-button"
+          variant="primary"
+          size="sm"
+          fill="outline"
+          data-testid={selectors.components.PageToolbar.itemButton('Add button')}
+        >
+          <Trans i18nKey="dashboard.toolbar.add">Add</Trans>
+          <Icon name={isAddPanelMenuOpen ? 'angle-up' : 'angle-down'} size="lg" />
+        </Button>
+      </Dropdown>
+    ),
+  });
+
+  toolbarActions.push({
+    group: 'playlist-actions',
+    condition: isPlaying && isShowingDashboard && !isEditing,
+    render: () => (
+      <ToolbarButton
+        key="play-list-prev"
+        data-testid={selectors.pages.Dashboard.DashNav.playlistControls.prev}
+        tooltip={t('dashboard.toolbar.playlist-previous', 'Go to previous dashboard')}
+        icon="backward"
+        onClick={() => playlistSrv.prev()}
+      />
+    ),
+  });
+
+  toolbarActions.push({
+    group: 'playlist-actions',
+    condition: isPlaying && isShowingDashboard && !isEditing,
+    render: () => (
+      <ToolbarButton
+        key="play-list-stop"
+        onClick={() => playlistSrv.stop()}
+        data-testid={selectors.pages.Dashboard.DashNav.playlistControls.stop}
+      >
+        <Trans i18nKey="dashboard.toolbar.playlist-stop">Stop playlist</Trans>
+      </ToolbarButton>
+    ),
+  });
 
-  if (viewPanelKey) {
-    toolbarActions.push(
+  toolbarActions.push({
+    group: 'playlist-actions',
+    condition: isPlaying && isShowingDashboard && !isEditing,
+    render: () => (
+      <ToolbarButton
+        key="play-list-next"
+        data-testid={selectors.pages.Dashboard.DashNav.playlistControls.next}
+        tooltip={t('dashboard.toolbar.playlist-next', 'Go to next dashboard')}
+        icon="forward"
+        onClick={() => playlistSrv.next()}
+        narrow
+      />
+    ),
+  });
+
+  toolbarActions.push({
+    group: 'back-button',
+    condition: (isViewingPanel || isEditingPanel) && !isEditingLibraryPanel,
+    render: () => (
       <Button
-        onClick={() => locationService.partial({ viewPanel: null })}
+        onClick={() => {
+          locationService.partial({ viewPanel: null, editPanel: null });
+        }}
+        tooltip=""
+        key="back"
+        variant="secondary"
+        size="sm"
+        icon="arrow-left"
+        data-testid={selectors.components.NavToolbar.editDashboard.backToDashboardButton}
+      >
+        Back to dashboard
+      </Button>
+    ),
+  });
+
+  toolbarActions.push({
+    group: 'back-button',
+    condition: Boolean(editview),
+    render: () => (
+      <Button
+        onClick={() => {
+          locationService.partial({ editview: null });
+        }}
         tooltip=""
         key="back"
-        variant="primary"
         fill="text"
+        variant="secondary"
+        size="sm"
+        icon="arrow-left"
+        data-testid={selectors.components.NavToolbar.editDashboard.backToDashboardButton}
       >
         Back to dashboard
       </Button>
-    );
+    ),
+  });
 
-    return <AppChromeUpdate actions={toolbarActions} />;
-  }
+  toolbarActions.push({
+    group: 'main-buttons',
+    condition: uid && !isEditing && !meta.isSnapshot && !isPlaying,
+    render: () => (
+      <Button
+        key="share-dashboard-button"
+        tooltip={t('dashboard.toolbar.share', 'Share dashboard')}
+        size="sm"
+        className={styles.buttonWithExtraMargin}
+        fill="outline"
+        onClick={() => {
+          DashboardInteractions.toolbarShareClick();
+          dashboard.showModal(new ShareModal({ dashboardRef: dashboard.getRef() }));
+        }}
+        data-testid={selectors.components.NavToolbar.shareDashboard}
+      >
+        Share
+      </Button>
+    ),
+  });
 
-  if (!isEditing) {
-    // TODO check permissions
-    toolbarActions.push(
+  toolbarActions.push({
+    group: 'main-buttons',
+    condition: !isEditing && dashboard.canEditDashboard() && !isViewingPanel && !isPlaying && editable,
+    render: () => (
       <Button
-        onClick={dashboard.onEnterEditMode}
+        onClick={() => {
+          dashboard.onEnterEditMode();
+        }}
         tooltip="Enter edit mode"
         key="edit"
+        className={styles.buttonWithExtraMargin}
         variant="primary"
-        icon="pen"
-        fill="text"
+        size="sm"
+        data-testid={selectors.components.NavToolbar.editDashboard.editButton}
       >
         Edit
       </Button>
-    );
-  } else {
-    // TODO check permissions
-    toolbarActions.push(
-      <Button onClick={dashboard.onSave} tooltip="Save as copy" fill="text" key="save-as">
-        Save as
+    ),
+  });
+
+  toolbarActions.push({
+    group: 'main-buttons',
+    condition: !isEditing && dashboard.canEditDashboard() && !isViewingPanel && !isPlaying && !editable,
+    render: () => (
+      <Button
+        onClick={() => {
+          dashboard.onEnterEditMode();
+          dashboard.setState({ editable: true, meta: { ...meta, canEdit: true } });
+        }}
+        tooltip="This dashboard was marked as read only"
+        key="edit"
+        className={styles.buttonWithExtraMargin}
+        variant="secondary"
+        size="sm"
+        data-testid={selectors.components.NavToolbar.editDashboard.editButton}
+      >
+        Make editable
+      </Button>
+    ),
+  });
+
+  toolbarActions.push({
+    group: 'settings',
+    condition: isEditing && dashboard.canEditDashboard() && isShowingDashboard,
+    render: () => (
+      <Button
+        onClick={() => {
+          dashboard.onOpenSettings();
+        }}
+        tooltip="Dashboard settings"
+        fill="text"
+        size="sm"
+        key="settings"
+        variant="secondary"
+        data-testid={selectors.components.NavToolbar.editDashboard.settingsButton}
+      >
+        Settings
+      </Button>
+    ),
+  });
+
+  toolbarActions.push({
+    group: 'main-buttons',
+    condition: isEditing && !meta.isNew && isShowingDashboard,
+    render: () => (
+      <Button
+        onClick={() => dashboard.exitEditMode({ skipConfirm: false })}
+        tooltip="Exits edit mode and discards unsaved changes"
+        size="sm"
+        key="discard"
+        fill="text"
+        variant="primary"
+        data-testid={selectors.components.NavToolbar.editDashboard.exitButton}
+      >
+        Exit edit
+      </Button>
+    ),
+  });
+
+  toolbarActions.push({
+    group: 'main-buttons',
+    condition: isEditingPanel && !isEditingLibraryPanel && !editview && !meta.isNew && !isViewingPanel,
+    render: () => (
+      <Button
+        onClick={editPanel?.onDiscard}
+        tooltip="Discard panel changes"
+        size="sm"
+        disabled={!isEditedPanelDirty || !isDirty}
+        key="discard"
+        fill="outline"
+        variant="destructive"
+        data-testid={selectors.components.NavToolbar.editDashboard.discardChangesButton}
+      >
+        Discard panel changes
       </Button>
-    );
-    toolbarActions.push(
-      <Button onClick={dashboard.onDiscard} tooltip="Save changes" fill="text" key="discard" variant="destructive">
-        Discard
+    ),
+  });
+
+  toolbarActions.push({
+    group: 'main-buttons',
+    condition: isEditingPanel && isEditingLibraryPanel && !editview && !isViewingPanel,
+    render: () => (
+      <Button
+        onClick={editPanel?.onDiscard}
+        tooltip="Discard library panel changes"
+        size="sm"
+        key="discardLibraryPanel"
+        fill="outline"
+        variant="destructive"
+        data-testid={selectors.components.NavToolbar.editDashboard.discardChangesButton}
+      >
+        Discard library panel changes
       </Button>
-    );
-    toolbarActions.push(
-      <Button onClick={dashboard.onSave} tooltip="Save changes" key="save" disabled={!isDirty}>
-        Save
+    ),
+  });
+
+  toolbarActions.push({
+    group: 'main-buttons',
+    condition: isEditingPanel && isEditingLibraryPanel && !editview && !isViewingPanel,
+    render: () => (
+      <Button
+        onClick={editPanel?.onUnlinkLibraryPanel}
+        tooltip="Unlink library panel"
+        size="sm"
+        key="unlinkLibraryPanel"
+        fill="outline"
+        variant="secondary"
+        data-testid={selectors.components.NavToolbar.editDashboard.unlinkLibraryPanelButton}
+      >
+        Unlink library panel
       </Button>
-    );
+    ),
+  });
+
+  toolbarActions.push({
+    group: 'main-buttons',
+    condition: isEditingPanel && isEditingLibraryPanel && !editview && !isViewingPanel,
+    render: () => (
+      <Button
+        onClick={editPanel?.onSaveLibraryPanel}
+        tooltip="Save library panel"
+        size="sm"
+        key="saveLibraryPanel"
+        fill="outline"
+        variant="primary"
+        data-testid={selectors.components.NavToolbar.editDashboard.saveLibraryPanelButton}
+      >
+        Save library panel
+      </Button>
+    ),
+  });
+
+  toolbarActions.push({
+    group: 'main-buttons',
+    condition: isEditing && !isEditingLibraryPanel && (meta.canSave || canSaveAs),
+    render: () => {
+      // if we  only can save
+      if (meta.isNew) {
+        return (
+          <Button
+            onClick={() => {
+              DashboardInteractions.toolbarSaveClick();
+              dashboard.openSaveDrawer({});
+            }}
+            className={styles.buttonWithExtraMargin}
+            tooltip="Save changes"
+            key="save"
+            size="sm"
+            variant={'primary'}
+            data-testid={selectors.components.NavToolbar.editDashboard.saveButton}
+          >
+            Save dashboard
+          </Button>
+        );
+      }
+
+      // If we only can save as copy
+      if (canSaveAs && !meta.canSave && !meta.canMakeEditable) {
+        return (
+          <Button
+            onClick={() => {
+              DashboardInteractions.toolbarSaveClick();
+              dashboard.openSaveDrawer({ saveAsCopy: true });
+            }}
+            className={styles.buttonWithExtraMargin}
+            tooltip="Save as copy"
+            key="save"
+            size="sm"
+            variant={isDirty ? 'primary' : 'secondary'}
+          >
+            Save as copy
+          </Button>
+        );
+      }
+
+      // If we can do both save and save as copy we show a button group with dropdown menu
+      const menu = (
+        <Menu>
+          <Menu.Item
+            label="Save"
+            icon="save"
+            onClick={() => {
+              DashboardInteractions.toolbarSaveClick();
+              dashboard.openSaveDrawer({});
+            }}
+          />
+          <Menu.Item
+            label="Save as copy"
+            icon="copy"
+            onClick={() => {
+              DashboardInteractions.toolbarSaveAsClick();
+              dashboard.openSaveDrawer({ saveAsCopy: true });
+            }}
+          />
+        </Menu>
+      );
+
+      return (
+        <ButtonGroup className={styles.buttonWithExtraMargin} key="save">
+          <Button
+            onClick={() => {
+              DashboardInteractions.toolbarSaveClick();
+              dashboard.openSaveDrawer({});
+            }}
+            tooltip="Save changes"
+            size="sm"
+            data-testid={selectors.components.NavToolbar.editDashboard.saveButton}
+            variant={isDirty ? 'primary' : 'secondary'}
+          >
+            Save dashboard
+          </Button>
+          <Dropdown overlay={menu}>
+            <Button icon="angle-down" variant={isDirty ? 'primary' : 'secondary'} size="sm" />
+          </Dropdown>
+        </ButtonGroup>
+      );
+    },
+  });
+
+  const actionElements: React.ReactNode[] = [];
+  let lastGroup = '';
+
+  for (const action of toolbarActions) {
+    if (!action.condition) {
+      continue;
+    }
+
+    if (lastGroup && lastGroup !== action.group) {
+      lastGroup && actionElements.push(<NavToolbarSeparator key={`${action.group}-separator`} />);
+    }
+
+    actionElements.push(action.render());
+    lastGroup = action.group;
   }
 
-  return <AppChromeUpdate actions={toolbarActions} />;
-});
+  return <ToolbarButtonRow alignment="right">{actionElements}</ToolbarButtonRow>;
+}
 
-NavToolbarActions.displayName = 'NavToolbarActions';
+function addDynamicActions(
+  toolbarActions: ToolbarAction[],
+  registeredActions: DynamicDashNavButtonModel[],
+  group: string
+) {
+  if (registeredActions.length > 0) {
+    for (const action of registeredActions) {
+      const props = { dashboard: getDashboardSrv().getCurrent()! };
+      if (action.show(props)) {
+        const Component = action.component;
+        toolbarActions.push({
+          group: group,
+          condition: true,
+          render: () => <Component {...props} key={toolbarActions.length} />,
+        });
+      }
+    }
+  }
+}
+
+function useEditingLibraryPanel(panelEditor?: PanelEditor) {
+  const [isEditingLibraryPanel, setEditingLibraryPanel] = useState<Boolean>(false);
+
+  useEffect(() => {
+    if (panelEditor) {
+      const unsub = panelEditor.state.vizManager.subscribeToState((vizManagerState) =>
+        setEditingLibraryPanel(vizManagerState.sourcePanel.resolve().parent instanceof LibraryVizPanel)
+      );
+      return () => {
+        unsub.unsubscribe();
+      };
+    }
+    setEditingLibraryPanel(false);
+    return;
+  }, [panelEditor]);
+
+  return isEditingLibraryPanel;
+}
+
+// This hook handles when panelEditor is not defined to avoid conditionally hook usage
+function useVizManagerDirty(panelEditor?: PanelEditor) {
+  const [isDirty, setIsDirty] = useState<Boolean>(false);
+
+  useEffect(() => {
+    if (panelEditor) {
+      const unsub = panelEditor.state.vizManager.subscribeToState((vizManagerState) =>
+        setIsDirty(vizManagerState.isDirty || false)
+      );
+      return () => {
+        unsub.unsubscribe();
+      };
+    }
+    setIsDirty(false);
+    return;
+  }, [panelEditor]);
+
+  return isDirty;
+}
+
+interface ToolbarAction {
+  group: string;
+  condition?: boolean | string;
+  render: () => React.ReactNode;
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    buttonWithExtraMargin: css({
+      margin: theme.spacing(0, 0.5),
+    }),
+    publicBadge: css({
+      color: 'grey',
+      backgroundColor: 'transparent',
+      border: '1px solid',
+    }),
+  };
+}
diff --git a/public/app/features/dashboard-scene/scene/PanelLinks.tsx b/public/app/features/dashboard-scene/scene/PanelLinks.tsx
new file mode 100644
index 0000000000000..62643f15e38ef
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/PanelLinks.tsx
@@ -0,0 +1,68 @@
+import React from 'react';
+
+import { DataLink, LinkModel } from '@grafana/data';
+import { SceneComponentProps, SceneObjectBase, SceneObjectState, VizPanel } from '@grafana/scenes';
+import { Dropdown, Icon, Menu, PanelChrome, ToolbarButton } from '@grafana/ui';
+
+import { getPanelLinks } from './PanelMenuBehavior';
+
+interface VizPanelLinksState extends SceneObjectState {
+  rawLinks?: DataLink[];
+  links?: LinkModel[];
+  menu: VizPanelLinksMenu;
+}
+
+export class VizPanelLinks extends SceneObjectBase<VizPanelLinksState> {
+  static Component = VizPanelLinksRenderer;
+}
+
+function VizPanelLinksRenderer({ model }: SceneComponentProps<VizPanelLinks>) {
+  const { menu, rawLinks } = model.useState();
+
+  if (!(model.parent instanceof VizPanel)) {
+    throw new Error('VizPanelLinks must be a child of VizPanel');
+  }
+
+  if (!rawLinks || rawLinks.length === 0) {
+    return null;
+  }
+
+  if (rawLinks.length === 1) {
+    const link = getPanelLinks(model.parent)[0];
+    return (
+      <PanelChrome.TitleItem href={link.href} onClick={link.onClick} target={link.target} title={link.title}>
+        <Icon name="external-link-alt" size="md" />
+      </PanelChrome.TitleItem>
+    );
+  }
+
+  return (
+    <Dropdown
+      overlay={() => {
+        return <menu.Component model={menu} key={menu.state.key} />;
+      }}
+    >
+      <ToolbarButton icon="external-link-alt" iconSize="md" aria-label="panel links" />
+    </Dropdown>
+  );
+}
+
+export class VizPanelLinksMenu extends SceneObjectBase<Omit<VizPanelLinksState, 'menu' | 'rawLinks'>> {
+  static Component = VizPanelLinksMenuRenderer;
+}
+
+function VizPanelLinksMenuRenderer({ model }: SceneComponentProps<VizPanelLinks>) {
+  const { links } = model.useState();
+
+  if (!links) {
+    return null;
+  }
+
+  return (
+    <Menu>
+      {links?.map((link, idx) => {
+        return <Menu.Item key={idx} label={link.title} url={link.href} target={link.target} onClick={link.onClick} />;
+      })}
+    </Menu>
+  );
+}
diff --git a/public/app/features/dashboard-scene/scene/PanelMenuBehavior.test.tsx b/public/app/features/dashboard-scene/scene/PanelMenuBehavior.test.tsx
index 383cccb445d45..5863a58fe471a 100644
--- a/public/app/features/dashboard-scene/scene/PanelMenuBehavior.test.tsx
+++ b/public/app/features/dashboard-scene/scene/PanelMenuBehavior.test.tsx
@@ -1,10 +1,31 @@
+import {
+  FieldType,
+  LoadingState,
+  PanelData,
+  PluginExtensionPanelContext,
+  PluginExtensionTypes,
+  getDefaultTimeRange,
+  toDataFrame,
+} from '@grafana/data';
 import { getPanelPlugin } from '@grafana/data/test/__mocks__/pluginMocks';
-import { locationService } from '@grafana/runtime';
-import { SceneGridItem, SceneGridLayout, SceneQueryRunner, VizPanel, VizPanelMenu } from '@grafana/scenes';
+import { getPluginLinkExtensions, locationService } from '@grafana/runtime';
+import {
+  LocalValueVariable,
+  SceneGridLayout,
+  SceneQueryRunner,
+  SceneTimeRange,
+  SceneVariableSet,
+  VizPanel,
+  VizPanelMenu,
+} from '@grafana/scenes';
 import { contextSrv } from 'app/core/services/context_srv';
 import { GetExploreUrlArguments } from 'app/core/utils/explore';
 
+import { buildPanelEditScene } from '../panel-edit/PanelEditor';
+
+import { DashboardGridItem } from './DashboardGridItem';
 import { DashboardScene } from './DashboardScene';
+import { VizPanelLinks, VizPanelLinksMenu } from './PanelLinks';
 import { panelMenuBehavior } from './PanelMenuBehavior';
 
 const mocks = {
@@ -21,15 +42,28 @@ jest.mock('app/core/utils/explore', () => ({
 
 jest.mock('app/core/services/context_srv');
 
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  setPluginExtensionGetter: jest.fn(),
+  getPluginLinkExtensions: jest.fn(),
+}));
+
+const getPluginLinkExtensionsMock = jest.mocked(getPluginLinkExtensions);
+
 describe('panelMenuBehavior', () => {
+  beforeEach(() => {
+    getPluginLinkExtensionsMock.mockRestore();
+    getPluginLinkExtensionsMock.mockReturnValue({ extensions: [] });
+  });
+
   beforeAll(() => {
-    locationService.push('/scenes/dashboard/dash-1?from=now-5m&to=now');
+    locationService.push('/d/dash-1?from=now-5m&to=now');
   });
 
   it('Given standard panel', async () => {
     const { menu, panel } = await buildTestScene({});
 
-    Object.assign(panel, 'getPlugin', () => getPanelPlugin({}));
+    panel.getPlugin = () => getPanelPlugin({ skipDataQuery: false });
 
     mocks.contextSrv.hasAccessToExplore.mockReturnValue(true);
     mocks.getExploreUrl.mockReturnValue(Promise.resolve('/explore'));
@@ -38,11 +72,11 @@ describe('panelMenuBehavior', () => {
 
     await new Promise((r) => setTimeout(r, 1));
 
-    expect(menu.state.items?.length).toBe(5);
+    expect(menu.state.items?.length).toBe(6);
     // verify view panel url keeps url params and adds viewPanel=<panel-key>
-    expect(menu.state.items?.[0].href).toBe('/scenes/dashboard/dash-1?from=now-5m&to=now&viewPanel=panel-12');
+    expect(menu.state.items?.[0].href).toBe('/d/dash-1?from=now-5m&to=now&viewPanel=panel-12');
     // verify edit url keeps url time range
-    expect(menu.state.items?.[1].href).toBe('/scenes/dashboard/dash-1/panel-edit/12?from=now-5m&to=now');
+    expect(menu.state.items?.[1].href).toBe('/d/dash-1?from=now-5m&to=now&editPanel=12');
     // verify share
     expect(menu.state.items?.[2].text).toBe('Share');
     // verify explore url
@@ -51,15 +85,475 @@ describe('panelMenuBehavior', () => {
     // Verify explore url is called with correct arguments
     const getExploreArgs: GetExploreUrlArguments = mocks.getExploreUrl.mock.calls[0][0];
     expect(getExploreArgs.dsRef).toEqual({ uid: 'my-uid' });
-    expect(getExploreArgs.queries).toEqual([{ query: 'buu', refId: 'A' }]);
+    expect(getExploreArgs.queries).toEqual([{ query: 'QueryA', refId: 'A' }]);
     expect(getExploreArgs.scopedVars?.__sceneObject?.value).toBe(panel);
 
     // verify inspect url keeps url params and adds inspect=<panel-key>
-    expect(menu.state.items?.[4].href).toBe('/scenes/dashboard/dash-1?from=now-5m&to=now&inspect=panel-12');
+    expect(menu.state.items?.[4].href).toBe('/d/dash-1?from=now-5m&to=now&inspect=panel-12');
+    expect(menu.state.items?.[4].subMenu).toBeDefined();
+
+    expect(menu.state.items?.[4].subMenu?.length).toBe(3);
+  });
+
+  it('should have reduced menu options when panel editor is open', async () => {
+    const { scene, menu, panel } = await buildTestScene({});
+    scene.setState({ editPanel: buildPanelEditScene(panel) });
+    panel.getPlugin = () => getPanelPlugin({ skipDataQuery: false });
+
+    mocks.contextSrv.hasAccessToExplore.mockReturnValue(true);
+    mocks.getExploreUrl.mockReturnValue(Promise.resolve('/explore'));
+
+    menu.activate();
+
+    await new Promise((r) => setTimeout(r, 1));
+
+    expect(menu.state.items?.length).toBe(4);
+    expect(menu.state.items?.[0].text).toBe('Share');
+    expect(menu.state.items?.[1].text).toBe('Explore');
+    expect(menu.state.items?.[2].text).toBe('Inspect');
+    expect(menu.state.items?.[3].text).toBe('More...');
+    expect(menu.state.items?.[3].subMenu).toBeDefined();
+
+    expect(menu.state.items?.[3].subMenu?.length).toBe(2);
+    expect(menu.state.items?.[3].subMenu?.[0].text).toBe('New alert rule');
+    expect(menu.state.items?.[3].subMenu?.[1].text).toBe('Get help');
+  });
+
+  describe('when extending panel menu from plugins', () => {
+    it('should contain menu item from link extension', async () => {
+      getPluginLinkExtensionsMock.mockReturnValue({
+        extensions: [
+          {
+            id: '1',
+            pluginId: '...',
+            type: PluginExtensionTypes.link,
+            title: 'Declare incident',
+            description: 'Declaring an incident in the app',
+            path: '/a/grafana-basic-app/declare-incident',
+          },
+        ],
+      });
+
+      const { menu, panel } = await buildTestScene({});
+
+      panel.getPlugin = () => getPanelPlugin({ skipDataQuery: false });
+
+      mocks.contextSrv.hasAccessToExplore.mockReturnValue(true);
+      mocks.getExploreUrl.mockReturnValue(Promise.resolve('/explore'));
+
+      menu.activate();
+
+      await new Promise((r) => setTimeout(r, 1));
+
+      expect(menu.state.items?.length).toBe(7);
+
+      const extensionsSubMenu = menu.state.items?.find((i) => i.text === 'Extensions')?.subMenu;
+
+      expect(extensionsSubMenu).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            text: 'Declare incident',
+            href: '/a/grafana-basic-app/declare-incident',
+          }),
+        ])
+      );
+    });
+
+    it('should truncate menu item title to 25 chars', async () => {
+      getPluginLinkExtensionsMock.mockReturnValue({
+        extensions: [
+          {
+            id: '1',
+            pluginId: '...',
+            type: PluginExtensionTypes.link,
+            title: 'Declare incident when pressing this amazing menu item',
+            description: 'Declaring an incident in the app',
+            path: '/a/grafana-basic-app/declare-incident',
+          },
+        ],
+      });
+
+      const { menu, panel } = await buildTestScene({});
+
+      panel.getPlugin = () => getPanelPlugin({ skipDataQuery: false });
+
+      mocks.contextSrv.hasAccessToExplore.mockReturnValue(true);
+      mocks.getExploreUrl.mockReturnValue(Promise.resolve('/explore'));
+
+      menu.activate();
+
+      await new Promise((r) => setTimeout(r, 1));
+
+      expect(menu.state.items?.length).toBe(7);
+
+      const extensionsSubMenu = menu.state.items?.find((i) => i.text === 'Extensions')?.subMenu;
+
+      expect(extensionsSubMenu).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            text: 'Declare incident when...',
+            href: '/a/grafana-basic-app/declare-incident',
+          }),
+        ])
+      );
+    });
+
+    it('should pass onClick from plugin extension link to menu item', async () => {
+      const expectedOnClick = jest.fn();
+
+      getPluginLinkExtensionsMock.mockReturnValue({
+        extensions: [
+          {
+            id: '1',
+            pluginId: '...',
+            type: PluginExtensionTypes.link,
+            title: 'Declare incident when pressing this amazing menu item',
+            description: 'Declaring an incident in the app',
+            onClick: expectedOnClick,
+          },
+        ],
+      });
+
+      const { menu, panel } = await buildTestScene({});
+
+      panel.getPlugin = () => getPanelPlugin({ skipDataQuery: false });
+
+      mocks.contextSrv.hasAccessToExplore.mockReturnValue(true);
+      mocks.getExploreUrl.mockReturnValue(Promise.resolve('/explore'));
+
+      menu.activate();
+
+      await new Promise((r) => setTimeout(r, 1));
+
+      expect(menu.state.items?.length).toBe(7);
+
+      const extensionsSubMenu = menu.state.items?.find((i) => i.text === 'Extensions')?.subMenu;
+      const menuItem = extensionsSubMenu?.find((i) => (i.text = 'Declare incident when...'));
+
+      menuItem?.onClick?.({} as React.MouseEvent);
+      expect(expectedOnClick).toBeCalledTimes(1);
+    });
+
+    it('should pass context with correct values when configuring extension', async () => {
+      const data: PanelData = {
+        series: [
+          toDataFrame({
+            fields: [
+              { name: 'time', type: FieldType.time },
+              { name: 'score', type: FieldType.number },
+            ],
+          }),
+        ],
+        timeRange: getDefaultTimeRange(),
+        state: LoadingState.Done,
+      };
+
+      const { menu, panel } = await buildTestScene({});
+
+      panel.state.$data?.setState({ data });
+      panel.getPlugin = () => getPanelPlugin({ skipDataQuery: false });
+
+      menu.activate();
+
+      await new Promise((r) => setTimeout(r, 1));
+
+      const context: PluginExtensionPanelContext = {
+        id: 12,
+        pluginId: 'table',
+        title: 'Panel A',
+        timeZone: 'Africa/Abidjan',
+        timeRange: {
+          from: 'now-5m',
+          to: 'now',
+        },
+        targets: [
+          {
+            refId: 'A',
+            // @ts-expect-error
+            query: 'QueryA',
+          },
+        ],
+        dashboard: {
+          tags: ['database', 'panel'],
+          uid: 'dash-1',
+          title: 'My dashboard',
+        },
+        scopedVars: {
+          a: {
+            text: 'a',
+            value: 'a',
+          },
+        },
+        data,
+      };
+
+      expect(getPluginLinkExtensionsMock).toBeCalledWith(expect.objectContaining({ context }));
+    });
+
+    it('should pass context with default time zone values when configuring extension', async () => {
+      const data: PanelData = {
+        series: [
+          toDataFrame({
+            fields: [
+              { name: 'time', type: FieldType.time },
+              { name: 'score', type: FieldType.number },
+            ],
+          }),
+        ],
+        timeRange: getDefaultTimeRange(),
+        state: LoadingState.Done,
+      };
+
+      const { menu, panel, scene } = await buildTestScene({});
+
+      panel.state.$data?.setState({ data });
+      panel.getPlugin = () => getPanelPlugin({ skipDataQuery: false });
+      scene.state.$timeRange?.setState({ timeZone: undefined });
+
+      menu.activate();
+
+      await new Promise((r) => setTimeout(r, 1));
+
+      const context: PluginExtensionPanelContext = {
+        id: 12,
+        pluginId: 'table',
+        title: 'Panel A',
+        timeZone: 'browser',
+        timeRange: {
+          from: 'now-5m',
+          to: 'now',
+        },
+        targets: [
+          {
+            refId: 'A',
+            // @ts-expect-error
+            query: 'QueryA',
+          },
+        ],
+        dashboard: {
+          tags: ['database', 'panel'],
+          uid: 'dash-1',
+          title: 'My dashboard',
+        },
+        scopedVars: {
+          a: {
+            text: 'a',
+            value: 'a',
+          },
+        },
+        data,
+      };
+
+      expect(getPluginLinkExtensionsMock).toBeCalledWith(expect.objectContaining({ context }));
+    });
+
+    it('should contain menu item with category', async () => {
+      getPluginLinkExtensionsMock.mockReturnValue({
+        extensions: [
+          {
+            id: '1',
+            pluginId: '...',
+            type: PluginExtensionTypes.link,
+            title: 'Declare incident',
+            description: 'Declaring an incident in the app',
+            path: '/a/grafana-basic-app/declare-incident',
+            category: 'Incident',
+          },
+        ],
+      });
+
+      const { menu, panel } = await buildTestScene({});
+
+      panel.getPlugin = () => getPanelPlugin({ skipDataQuery: false });
+
+      mocks.contextSrv.hasAccessToExplore.mockReturnValue(true);
+      mocks.getExploreUrl.mockReturnValue(Promise.resolve('/explore'));
+
+      menu.activate();
+
+      await new Promise((r) => setTimeout(r, 1));
+
+      expect(menu.state.items?.length).toBe(7);
+
+      const extensionsSubMenu = menu.state.items?.find((i) => i.text === 'Extensions')?.subMenu;
+
+      expect(extensionsSubMenu).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            text: 'Incident',
+            subMenu: expect.arrayContaining([
+              expect.objectContaining({
+                text: 'Declare incident',
+                href: '/a/grafana-basic-app/declare-incident',
+              }),
+            ]),
+          }),
+        ])
+      );
+    });
+
+    it('should truncate category to 25 chars', async () => {
+      getPluginLinkExtensionsMock.mockReturnValue({
+        extensions: [
+          {
+            id: '1',
+            pluginId: '...',
+            type: PluginExtensionTypes.link,
+            title: 'Declare incident',
+            description: 'Declaring an incident in the app',
+            path: '/a/grafana-basic-app/declare-incident',
+            category: 'Declare incident when pressing this amazing menu item',
+          },
+        ],
+      });
+
+      const { menu, panel } = await buildTestScene({});
+
+      panel.getPlugin = () => getPanelPlugin({ skipDataQuery: false });
+
+      mocks.contextSrv.hasAccessToExplore.mockReturnValue(true);
+      mocks.getExploreUrl.mockReturnValue(Promise.resolve('/explore'));
+
+      menu.activate();
+
+      await new Promise((r) => setTimeout(r, 1));
+
+      expect(menu.state.items?.length).toBe(7);
+
+      const extensionsSubMenu = menu.state.items?.find((i) => i.text === 'Extensions')?.subMenu;
+
+      expect(extensionsSubMenu).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            text: 'Declare incident when...',
+            subMenu: expect.arrayContaining([
+              expect.objectContaining({
+                text: 'Declare incident',
+                href: '/a/grafana-basic-app/declare-incident',
+              }),
+            ]),
+          }),
+        ])
+      );
+    });
+
+    it('should contain menu item with category and append items without category after divider', async () => {
+      getPluginLinkExtensionsMock.mockReturnValue({
+        extensions: [
+          {
+            id: '1',
+            pluginId: '...',
+            type: PluginExtensionTypes.link,
+            title: 'Declare incident',
+            description: 'Declaring an incident in the app',
+            path: '/a/grafana-basic-app/declare-incident',
+            category: 'Incident',
+          },
+          {
+            id: '2',
+            pluginId: '...',
+            type: PluginExtensionTypes.link,
+            title: 'Create forecast',
+            description: 'Declaring an incident in the app',
+            path: '/a/grafana-basic-app/declare-incident',
+          },
+        ],
+      });
+
+      const { menu, panel } = await buildTestScene({});
+
+      panel.getPlugin = () => getPanelPlugin({ skipDataQuery: false });
+
+      mocks.contextSrv.hasAccessToExplore.mockReturnValue(true);
+      mocks.getExploreUrl.mockReturnValue(Promise.resolve('/explore'));
+
+      menu.activate();
+
+      await new Promise((r) => setTimeout(r, 1));
+
+      expect(menu.state.items?.length).toBe(7);
+
+      const extensionsSubMenu = menu.state.items?.find((i) => i.text === 'Extensions')?.subMenu;
+
+      expect(extensionsSubMenu).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            text: 'Incident',
+            subMenu: expect.arrayContaining([
+              expect.objectContaining({
+                text: 'Declare incident',
+                href: '/a/grafana-basic-app/declare-incident',
+              }),
+            ]),
+          }),
+          expect.objectContaining({
+            type: 'divider',
+          }),
+          expect.objectContaining({
+            text: 'Create forecast',
+          }),
+        ])
+      );
+    });
+
+    it('it should not contain remove and duplicate menu items when not in edit mode', async () => {
+      const { menu, panel } = await buildTestScene({});
+
+      panel.getPlugin = () => getPanelPlugin({ skipDataQuery: false });
+
+      mocks.contextSrv.hasAccessToExplore.mockReturnValue(true);
+      mocks.getExploreUrl.mockReturnValue(Promise.resolve('/explore'));
+
+      menu.activate();
+
+      await new Promise((r) => setTimeout(r, 1));
+
+      expect(menu.state.items?.find((i) => i.text === 'Remove')).toBeUndefined();
+      const moreMenu = menu.state.items?.find((i) => i.text === 'More...')?.subMenu;
+      expect(moreMenu?.find((i) => i.text === 'Duplicate')).toBeUndefined();
+      expect(moreMenu?.find((i) => i.text === 'Create library panel')).toBeUndefined();
+    });
+
+    it('it should contain remove and duplicate menu items when in edit mode', async () => {
+      const { scene, menu, panel } = await buildTestScene({});
+      scene.setState({ isEditing: true });
+
+      panel.getPlugin = () => getPanelPlugin({ skipDataQuery: false });
+
+      mocks.contextSrv.hasAccessToExplore.mockReturnValue(true);
+      mocks.getExploreUrl.mockReturnValue(Promise.resolve('/explore'));
+
+      menu.activate();
+
+      await new Promise((r) => setTimeout(r, 1));
+
+      expect(menu.state.items?.find((i) => i.text === 'Remove')).toBeDefined();
+      const moreMenu = menu.state.items?.find((i) => i.text === 'More...')?.subMenu;
+      expect(moreMenu?.find((i) => i.text === 'Duplicate')).toBeDefined();
+      expect(moreMenu?.find((i) => i.text === 'Create library panel')).toBeDefined();
+    });
+
+    it('should only contain explore when embedded', async () => {
+      const { menu, panel } = await buildTestScene({ isEmbedded: true });
+
+      panel.getPlugin = () => getPanelPlugin({ skipDataQuery: false });
+
+      mocks.contextSrv.hasAccessToExplore.mockReturnValue(true);
+      mocks.getExploreUrl.mockReturnValue(Promise.resolve('/explore'));
+
+      menu.activate();
+
+      await new Promise((r) => setTimeout(r, 1));
+
+      expect(menu.state.items?.length).toBe(1);
+      expect(menu.state.items?.[0].text).toBe('Explore');
+    });
   });
 });
 
-interface SceneOptions {}
+interface SceneOptions {
+  isEmbedded?: boolean;
+}
 
 async function buildTestScene(options: SceneOptions) {
   const menu = new VizPanelMenu({
@@ -71,18 +565,32 @@ async function buildTestScene(options: SceneOptions) {
     pluginId: 'table',
     key: 'panel-12',
     menu,
+    titleItems: [new VizPanelLinks({ menu: new VizPanelLinksMenu({}) })],
+    $variables: new SceneVariableSet({
+      variables: [new LocalValueVariable({ name: 'a', value: 'a', text: 'a' })],
+    }),
     $data: new SceneQueryRunner({
       datasource: { uid: 'my-uid' },
-      queries: [{ query: 'buu', refId: 'A' }],
+      queries: [{ query: 'QueryA', refId: 'A' }],
     }),
   });
 
   const scene = new DashboardScene({
-    title: 'hello',
+    title: 'My dashboard',
     uid: 'dash-1',
+    tags: ['database', 'panel'],
+    $timeRange: new SceneTimeRange({
+      from: 'now-5m',
+      to: 'now',
+      timeZone: 'Africa/Abidjan',
+    }),
+    meta: {
+      canEdit: true,
+      isEmbedded: options.isEmbedded ?? false,
+    },
     body: new SceneGridLayout({
       children: [
-        new SceneGridItem({
+        new DashboardGridItem({
           key: 'griditem-1',
           x: 0,
           y: 0,
diff --git a/public/app/features/dashboard-scene/scene/PanelMenuBehavior.tsx b/public/app/features/dashboard-scene/scene/PanelMenuBehavior.tsx
index f377ab996c720..3761e8dd00f47 100644
--- a/public/app/features/dashboard-scene/scene/PanelMenuBehavior.tsx
+++ b/public/app/features/dashboard-scene/scene/PanelMenuBehavior.tsx
@@ -1,83 +1,444 @@
-import { PanelMenuItem } from '@grafana/data';
-import { locationService, reportInteraction } from '@grafana/runtime';
-import { VizPanel, VizPanelMenu } from '@grafana/scenes';
+import {
+  InterpolateFunction,
+  PanelMenuItem,
+  PanelPlugin,
+  PluginExtensionPanelContext,
+  PluginExtensionPoints,
+  getTimeZone,
+  urlUtil,
+} from '@grafana/data';
+import { config, getPluginLinkExtensions, locationService } from '@grafana/runtime';
+import { LocalValueVariable, SceneGridRow, VizPanel, VizPanelMenu, sceneGraph } from '@grafana/scenes';
+import { DataQuery, OptionsWithLegend } from '@grafana/schema';
+import appEvents from 'app/core/app_events';
 import { t } from 'app/core/internationalization';
+import { scenesPanelToRuleFormValues } from 'app/features/alerting/unified/utils/rule-form';
+import { shareDashboardType } from 'app/features/dashboard/components/ShareModal/utils';
 import { InspectTab } from 'app/features/inspector/types';
+import { getScenePanelLinksSupplier } from 'app/features/panel/panellinks/linkSuppliers';
+import { createExtensionSubMenu } from 'app/features/plugins/extensions/utils';
+import { addDataTrailPanelAction } from 'app/features/trails/Integrations/dashboardIntegration';
+import { ShowConfirmModalEvent } from 'app/types/events';
 
 import { ShareModal } from '../sharing/ShareModal';
-import { getDashboardUrl, getInspectUrl, getViewPanelUrl, tryGetExploreUrlForPanel } from '../utils/urlBuilders';
-import { getPanelIdForVizPanel } from '../utils/utils';
+import { DashboardInteractions } from '../utils/interactions';
+import { getEditPanelUrl, getInspectUrl, getViewPanelUrl, tryGetExploreUrlForPanel } from '../utils/urlBuilders';
+import { getDashboardSceneFor, getPanelIdForVizPanel, getQueryRunnerFor } from '../utils/utils';
 
 import { DashboardScene } from './DashboardScene';
+import { LibraryVizPanel } from './LibraryVizPanel';
+import { VizPanelLinks, VizPanelLinksMenu } from './PanelLinks';
+import { UnlinkLibraryPanelModal } from './UnlinkLibraryPanelModal';
 
 /**
  * Behavior is called when VizPanelMenu is activated (ie when it's opened).
  */
-export function panelMenuBehavior(menu: VizPanelMenu) {
+export function panelMenuBehavior(menu: VizPanelMenu, isRepeat = false) {
   const asyncFunc = async () => {
     // hm.. add another generic param to SceneObject to specify parent type?
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     const panel = menu.parent as VizPanel;
-    const location = locationService.getLocation();
+    const parent = panel.parent;
+    const plugin = panel.getPlugin();
+
     const items: PanelMenuItem[] = [];
-    const panelId = getPanelIdForVizPanel(panel);
-    const dashboard = panel.getRoot();
+    const moreSubMenu: PanelMenuItem[] = [];
+    const dashboard = getDashboardSceneFor(panel);
+    const { isEmbedded } = dashboard.state.meta;
+    const exploreMenuItem = await getExploreMenuItem(panel);
+
+    // For embedded dashboards we only have explore action for now
+    if (isEmbedded) {
+      if (exploreMenuItem) {
+        menu.setState({ items: [exploreMenuItem] });
+      }
+      return;
+    }
 
-    if (dashboard instanceof DashboardScene) {
+    const isEditingPanel = Boolean(dashboard.state.editPanel);
+    if (!isEditingPanel) {
       items.push({
         text: t('panel.header-menu.view', `View`),
         iconClassName: 'eye',
         shortcut: 'v',
-        onClick: () => reportInteraction('dashboards_panelheader_menu', { item: 'view' }),
+        onClick: () => DashboardInteractions.panelMenuItemClicked('view'),
         href: getViewPanelUrl(panel),
       });
+    }
 
+    if (dashboard.canEditDashboard() && dashboard.state.editable && !isRepeat && !isEditingPanel) {
       // We could check isEditing here but I kind of think this should always be in the menu,
       // and going into panel edit should make the dashboard go into edit mode is it's not already
       items.push({
         text: t('panel.header-menu.edit', `Edit`),
-        iconClassName: 'eye',
+        iconClassName: 'edit',
         shortcut: 'e',
-        onClick: () => reportInteraction('dashboards_panelheader_menu', { item: 'edit' }),
-        href: getDashboardUrl({
-          uid: dashboard.state.uid,
-          subPath: `/panel-edit/${panelId}`,
-          currentQueryParams: location.search,
-        }),
+        onClick: () => DashboardInteractions.panelMenuItemClicked('edit'),
+        href: getEditPanelUrl(getPanelIdForVizPanel(panel)),
       });
+    }
 
-      items.push({
-        text: t('panel.header-menu.share', `Share`),
-        iconClassName: 'share-alt',
+    items.push({
+      text: t('panel.header-menu.share', `Share`),
+      iconClassName: 'share-alt',
+      onClick: () => {
+        DashboardInteractions.panelMenuItemClicked('share');
+        dashboard.showModal(new ShareModal({ panelRef: panel.getRef(), dashboardRef: dashboard.getRef() }));
+      },
+      shortcut: 'p s',
+    });
+
+    if (dashboard.state.isEditing && !isRepeat && !isEditingPanel) {
+      moreSubMenu.push({
+        text: t('panel.header-menu.duplicate', `Duplicate`),
         onClick: () => {
-          reportInteraction('dashboards_panelheader_menu', { item: 'share' });
-          dashboard.showModal(new ShareModal({ panelRef: panel.getRef(), dashboardRef: dashboard.getRef() }));
+          DashboardInteractions.panelMenuItemClicked('duplicate');
+          dashboard.duplicatePanel(panel);
         },
-        shortcut: 'p s',
+        shortcut: 'p d',
       });
     }
 
-    const exploreUrl = await tryGetExploreUrlForPanel(panel);
-    if (exploreUrl) {
-      items.push({
-        text: t('panel.header-menu.explore', `Explore`),
-        iconClassName: 'compass',
-        shortcut: 'p x',
-        onClick: () => reportInteraction('dashboards_panelheader_menu', { item: 'explore' }),
-        href: exploreUrl,
+    if (!isEditingPanel) {
+      moreSubMenu.push({
+        text: t('panel.header-menu.copy', `Copy`),
+        onClick: () => {
+          DashboardInteractions.panelMenuItemClicked('copy');
+          dashboard.copyPanel(panel);
+        },
       });
     }
 
-    items.push({
-      text: t('panel.header-menu.inspect', `Inspect`),
-      iconClassName: 'info-circle',
-      shortcut: 'i',
-      onClick: () => reportInteraction('dashboards_panelheader_menu', { item: 'inspect', tab: InspectTab.Data }),
-      href: getInspectUrl(panel),
+    if (dashboard.state.isEditing && !isRepeat && !isEditingPanel) {
+      if (parent instanceof LibraryVizPanel) {
+        moreSubMenu.push({
+          text: t('panel.header-menu.unlink-library-panel', `Unlink library panel`),
+          onClick: () => {
+            DashboardInteractions.panelMenuItemClicked('unlinkLibraryPanel');
+            dashboard.showModal(
+              new UnlinkLibraryPanelModal({
+                panelRef: parent.getRef(),
+              })
+            );
+          },
+        });
+      } else {
+        moreSubMenu.push({
+          text: t('panel.header-menu.create-library-panel', `Create library panel`),
+          onClick: () => {
+            DashboardInteractions.panelMenuItemClicked('createLibraryPanel');
+            dashboard.showModal(
+              new ShareModal({
+                panelRef: panel.getRef(),
+                dashboardRef: dashboard.getRef(),
+                activeTab: shareDashboardType.libraryPanel,
+              })
+            );
+          },
+        });
+      }
+    }
+
+    moreSubMenu.push({
+      text: t('panel.header-menu.new-alert-rule', `New alert rule`),
+      onClick: (e) => onCreateAlert(panel),
     });
 
+    if (hasLegendOptions(panel.state.options) && !isEditingPanel) {
+      moreSubMenu.push({
+        text: panel.state.options.legend.showLegend
+          ? t('panel.header-menu.hide-legend', 'Hide legend')
+          : t('panel.header-menu.show-legend', 'Show legend'),
+        onClick: (e) => {
+          e.preventDefault();
+          toggleVizPanelLegend(panel);
+        },
+        shortcut: 'p l',
+      });
+    }
+
+    if (dashboard.canEditDashboard() && plugin && !plugin.meta.skipDataQuery && !isRepeat) {
+      moreSubMenu.push({
+        text: t('panel.header-menu.get-help', 'Get help'),
+        onClick: (e: React.MouseEvent) => {
+          e.preventDefault();
+          onInspectPanel(panel, InspectTab.Help);
+        },
+      });
+    }
+
+    if (config.featureToggles.exploreMetrics) {
+      await addDataTrailPanelAction(dashboard, panel, items);
+    }
+
+    if (exploreMenuItem) {
+      items.push(exploreMenuItem);
+    }
+
+    items.push(getInspectMenuItem(plugin, panel, dashboard));
+
+    const { extensions } = getPluginLinkExtensions({
+      extensionPointId: PluginExtensionPoints.DashboardPanelMenu,
+      context: createExtensionContext(panel, dashboard),
+      limitPerPlugin: 3,
+    });
+
+    if (extensions.length > 0 && !dashboard.state.isEditing) {
+      items.push({
+        text: 'Extensions',
+        iconClassName: 'plug',
+        type: 'submenu',
+        subMenu: createExtensionSubMenu(extensions),
+      });
+    }
+
+    if (moreSubMenu.length) {
+      items.push({
+        type: 'submenu',
+        text: t('panel.header-menu.more', `More...`),
+        iconClassName: 'cube',
+        subMenu: moreSubMenu,
+        onClick: (e) => {
+          e.preventDefault();
+        },
+      });
+    }
+
+    if (dashboard.state.isEditing && !isRepeat && !isEditingPanel) {
+      items.push({
+        text: '',
+        type: 'divider',
+      });
+
+      items.push({
+        text: t('panel.header-menu.remove', `Remove`),
+        iconClassName: 'trash-alt',
+        onClick: () => {
+          DashboardInteractions.panelMenuItemClicked('remove');
+          onRemovePanel(dashboard, panel);
+        },
+        shortcut: 'p r',
+      });
+    }
+
     menu.setState({ items });
   };
 
   asyncFunc();
 }
+
+export const repeatPanelMenuBehavior = (menu: VizPanelMenu) => panelMenuBehavior(menu, true);
+
+async function getExploreMenuItem(panel: VizPanel): Promise<PanelMenuItem | undefined> {
+  const exploreUrl = await tryGetExploreUrlForPanel(panel);
+  if (!exploreUrl) {
+    return undefined;
+  }
+
+  return {
+    text: t('panel.header-menu.explore', `Explore`),
+    iconClassName: 'compass',
+    shortcut: 'p x',
+    onClick: () => DashboardInteractions.panelMenuItemClicked('explore'),
+    href: exploreUrl,
+  };
+}
+
+function getInspectMenuItem(
+  plugin: PanelPlugin | undefined,
+  panel: VizPanel,
+  dashboard: DashboardScene
+): PanelMenuItem {
+  const inspectSubMenu: PanelMenuItem[] = [];
+
+  if (plugin && !plugin.meta.skipDataQuery) {
+    inspectSubMenu.push({
+      text: t('panel.header-menu.inspect-data', `Data`),
+      href: getInspectUrl(panel, InspectTab.Data),
+      onClick: (e) => {
+        e.preventDefault();
+        locationService.partial({ inspect: panel.state.key, inspectTab: InspectTab.Data });
+        DashboardInteractions.panelMenuInspectClicked(InspectTab.Data);
+      },
+    });
+
+    if (dashboard instanceof DashboardScene && dashboard.state.meta.canEdit) {
+      inspectSubMenu.push({
+        text: t('panel.header-menu.query', `Query`),
+        href: getInspectUrl(panel, InspectTab.Query),
+        onClick: (e) => {
+          e.preventDefault();
+          locationService.partial({ inspect: panel.state.key, inspectTab: InspectTab.Query });
+          DashboardInteractions.panelMenuInspectClicked(InspectTab.Query);
+        },
+      });
+    }
+  }
+
+  inspectSubMenu.push({
+    text: t('panel.header-menu.inspect-json', `Panel JSON`),
+    href: getInspectUrl(panel, InspectTab.JSON),
+    onClick: (e) => {
+      e.preventDefault();
+      locationService.partial({ inspect: panel.state.key, inspectTab: InspectTab.JSON });
+      DashboardInteractions.panelMenuInspectClicked(InspectTab.JSON);
+    },
+  });
+
+  return {
+    text: t('panel.header-menu.inspect', `Inspect`),
+    iconClassName: 'info-circle',
+    shortcut: 'i',
+    href: getInspectUrl(panel),
+    onClick: (e) => {
+      if (!e.isDefaultPrevented()) {
+        locationService.partial({ inspect: panel.state.key, inspectTab: InspectTab.Data });
+        DashboardInteractions.panelMenuInspectClicked(InspectTab.Data);
+      }
+    },
+    subMenu: inspectSubMenu.length > 0 ? inspectSubMenu : undefined,
+  };
+}
+
+/**
+ * Behavior is called when VizPanelLinksMenu is activated (when it's opened).
+ */
+export function panelLinksBehavior(panelLinksMenu: VizPanelLinksMenu) {
+  if (!(panelLinksMenu.parent instanceof VizPanelLinks)) {
+    throw new Error('parent of VizPanelLinksMenu must be VizPanelLinks');
+  }
+  const panel = panelLinksMenu.parent.parent;
+
+  if (!(panel instanceof VizPanel)) {
+    throw new Error('parent of VizPanelLinks must be VizPanel');
+  }
+
+  panelLinksMenu.setState({ links: getPanelLinks(panel) });
+}
+
+export function getPanelLinks(panel: VizPanel) {
+  const interpolate: InterpolateFunction = (v, scopedVars) => {
+    return sceneGraph.interpolate(panel, v, scopedVars);
+  };
+
+  const linkSupplier = getScenePanelLinksSupplier(panel, interpolate);
+
+  if (!linkSupplier) {
+    return [];
+  }
+
+  const panelLinks = linkSupplier.getLinks(interpolate);
+
+  return panelLinks.map((panelLink) => ({
+    ...panelLink,
+    onClick: (e: any, origin: any) => {
+      DashboardInteractions.panelLinkClicked({ has_multiple_links: panelLinks.length > 1 });
+      panelLink.onClick?.(e, origin);
+    },
+  }));
+}
+
+function createExtensionContext(panel: VizPanel, dashboard: DashboardScene): PluginExtensionPanelContext {
+  const timeRange = sceneGraph.getTimeRange(panel);
+  let queryRunner = getQueryRunnerFor(panel);
+  const targets: DataQuery[] = queryRunner?.state.queries as DataQuery[];
+  const id = getPanelIdForVizPanel(panel);
+
+  let scopedVars = {};
+
+  // Handle panel repeats scenario
+  if (panel.state.$variables) {
+    panel.state.$variables.state.variables.forEach((variable) => {
+      if (variable instanceof LocalValueVariable) {
+        scopedVars = {
+          ...scopedVars,
+          [variable.state.name]: { value: variable.getValue(), text: variable.getValueText() },
+        };
+      }
+    });
+  }
+
+  // Handle row repeats scenario
+  if (panel.parent?.parent instanceof SceneGridRow) {
+    const row = panel.parent.parent;
+    if (row.state.$variables) {
+      row.state.$variables.state.variables.forEach((variable) => {
+        if (variable instanceof LocalValueVariable) {
+          scopedVars = {
+            ...scopedVars,
+            [variable.state.name]: { value: variable.getValue(), text: variable.getValueText() },
+          };
+        }
+      });
+    }
+  }
+
+  return {
+    id,
+    pluginId: panel.state.pluginId,
+    title: panel.state.title,
+    timeRange: timeRange.state.value.raw,
+    timeZone: getTimeZone({
+      timeZone: timeRange.getTimeZone(),
+    }),
+    dashboard: {
+      uid: dashboard.state.uid!,
+      title: dashboard.state.title,
+      tags: dashboard.state.tags || [],
+    },
+    targets,
+    scopedVars,
+    data: queryRunner?.state.data,
+  };
+}
+
+export function onRemovePanel(dashboard: DashboardScene, panel: VizPanel) {
+  appEvents.publish(
+    new ShowConfirmModalEvent({
+      title: 'Remove panel',
+      text: 'Are you sure you want to remove this panel?',
+      icon: 'trash-alt',
+      yesText: 'Remove',
+      onConfirm: () => dashboard.removePanel(panel),
+    })
+  );
+}
+
+const onCreateAlert = async (panel: VizPanel) => {
+  DashboardInteractions.panelMenuItemClicked('create-alert');
+
+  const formValues = await scenesPanelToRuleFormValues(panel);
+  const ruleFormUrl = urlUtil.renderUrl('/alerting/new', {
+    defaults: JSON.stringify(formValues),
+    returnTo: location.pathname + location.search,
+  });
+
+  locationService.push(ruleFormUrl);
+
+  DashboardInteractions.panelMenuItemClicked('create-alert');
+};
+
+export function toggleVizPanelLegend(vizPanel: VizPanel): void {
+  const options = vizPanel.state.options;
+  if (hasLegendOptions(options) && typeof options.legend.showLegend === 'boolean') {
+    vizPanel.onOptionsChange({
+      legend: {
+        showLegend: options.legend.showLegend ? false : true,
+      },
+    });
+  }
+
+  DashboardInteractions.panelMenuItemClicked('toggleLegend');
+}
+
+function hasLegendOptions(optionsWithLegend: unknown): optionsWithLegend is OptionsWithLegend {
+  return optionsWithLegend != null && typeof optionsWithLegend === 'object' && 'legend' in optionsWithLegend;
+}
+
+const onInspectPanel = (vizPanel: VizPanel, tab?: InspectTab) => {
+  locationService.partial({
+    inspect: vizPanel.state.key,
+    inspectTab: tab,
+  });
+  DashboardInteractions.panelMenuInspectClicked(tab ?? InspectTab.Data);
+};
diff --git a/public/app/features/dashboard-scene/scene/PanelNotices.tsx b/public/app/features/dashboard-scene/scene/PanelNotices.tsx
new file mode 100644
index 0000000000000..673ea89ce06bf
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/PanelNotices.tsx
@@ -0,0 +1,50 @@
+import React from 'react';
+
+import { SceneComponentProps, SceneObjectBase, VizPanel, sceneGraph } from '@grafana/scenes';
+import { PanelHeaderNotices } from 'app/features/dashboard/dashgrid/PanelHeader/PanelHeaderNotices';
+
+import { getPanelIdForVizPanel } from '../utils/utils';
+
+export class PanelNotices extends SceneObjectBase {
+  static Component = PanelNoticesRenderer;
+
+  constructor() {
+    super({});
+    this.addActivationHandler(this.onActivate);
+  }
+
+  private onActivate = () => {
+    const panel = this.parent;
+    if (!panel || !(panel instanceof VizPanel)) {
+      throw new Error('PanelNotices can be used only as title items for VizPanel');
+    }
+  };
+
+  public getPanel() {
+    const panel = this.parent;
+
+    if (panel && panel instanceof VizPanel) {
+      return panel;
+    }
+
+    return null;
+  }
+}
+
+function PanelNoticesRenderer({ model }: SceneComponentProps<PanelNotices>) {
+  const panel = model.getPanel();
+  const dataObject = sceneGraph.getData(model);
+  const data = dataObject.useState();
+
+  if (!panel) {
+    return null;
+  }
+
+  const panelId = getPanelIdForVizPanel(panel);
+
+  if (data.data?.series) {
+    return <PanelHeaderNotices frames={data.data?.series} panelId={panelId} />;
+  }
+
+  return null;
+}
diff --git a/public/app/features/dashboard-scene/scene/PanelRepeaterGridItem.test.tsx b/public/app/features/dashboard-scene/scene/PanelRepeaterGridItem.test.tsx
deleted file mode 100644
index ae74628a711f2..0000000000000
--- a/public/app/features/dashboard-scene/scene/PanelRepeaterGridItem.test.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-import { getPanelPlugin } from '@grafana/data/test/__mocks__/pluginMocks';
-import { setPluginImportUtils } from '@grafana/runtime';
-import { SceneGridLayout } from '@grafana/scenes';
-
-import { activateFullSceneTree, buildPanelRepeaterScene } from '../utils/test-utils';
-
-setPluginImportUtils({
-  importPanelPlugin: (id: string) => Promise.resolve(getPanelPlugin({})),
-  getPanelPluginFromCache: (id: string) => undefined,
-});
-
-describe('PanelRepeaterGridItem', () => {
-  it('Given scene with variable with 2 values', async () => {
-    const { scene, repeater } = buildPanelRepeaterScene({ variableQueryTime: 0 });
-
-    activateFullSceneTree(scene);
-
-    expect(repeater.state.repeatedPanels?.length).toBe(5);
-
-    const panel1 = repeater.state.repeatedPanels![0];
-    const panel2 = repeater.state.repeatedPanels![1];
-
-    // Panels should have scoped variables
-    expect(panel1.state.$variables?.state.variables[0].getValue()).toBe('1');
-    expect(panel1.state.$variables?.state.variables[0].getValueText?.()).toBe('A');
-    expect(panel2.state.$variables?.state.variables[0].getValue()).toBe('2');
-  });
-
-  it('Should wait for variable to load', async () => {
-    const { scene, repeater } = buildPanelRepeaterScene({ variableQueryTime: 1 });
-
-    activateFullSceneTree(scene);
-
-    expect(repeater.state.repeatedPanels?.length).toBe(0);
-
-    await new Promise((r) => setTimeout(r, 10));
-
-    expect(repeater.state.repeatedPanels?.length).toBe(5);
-  });
-
-  it('Should adjust container height to fit panels direction is horizontal', async () => {
-    const { scene, repeater } = buildPanelRepeaterScene({ variableQueryTime: 0, maxPerRow: 2, itemHeight: 10 });
-
-    const layoutForceRender = jest.fn();
-    (scene.state.body as SceneGridLayout).forceRender = layoutForceRender;
-
-    activateFullSceneTree(scene);
-
-    // panels require 3 rows so total height should be 30
-    expect(repeater.state.height).toBe(30);
-    // Should update layout state by force re-render
-    expect(layoutForceRender.mock.calls.length).toBe(1);
-  });
-
-  it('Should adjust container height to fit panels when direction is vertical', async () => {
-    const { scene, repeater } = buildPanelRepeaterScene({ variableQueryTime: 0, itemHeight: 10, repeatDirection: 'v' });
-
-    activateFullSceneTree(scene);
-
-    // In vertical direction height itemCount * itemHeight
-    expect(repeater.state.height).toBe(50);
-  });
-
-  it('Should adjust itemHeight when container is resized, direction horizontal', async () => {
-    const { scene, repeater } = buildPanelRepeaterScene({
-      variableQueryTime: 0,
-      itemHeight: 10,
-      repeatDirection: 'h',
-      maxPerRow: 4,
-    });
-
-    activateFullSceneTree(scene);
-
-    // Sould be two rows (5 panels and maxPerRow 5)
-    expect(repeater.state.height).toBe(20);
-
-    // resize container
-    repeater.setState({ height: 10 });
-    // given 2 current rows, the itemHeight is halved
-    expect(repeater.state.itemHeight).toBe(5);
-  });
-
-  it('Should adjust itemHeight when container is resized, direction vertical', async () => {
-    const { scene, repeater } = buildPanelRepeaterScene({
-      variableQueryTime: 0,
-      itemHeight: 10,
-      repeatDirection: 'v',
-    });
-
-    activateFullSceneTree(scene);
-
-    // In vertical direction height itemCount * itemHeight
-    expect(repeater.state.height).toBe(50);
-
-    // resize container
-    repeater.setState({ height: 25 });
-    // given 5 rows with total height 25 gives new itemHeight of 5
-    expect(repeater.state.itemHeight).toBe(5);
-  });
-
-  it('When updating variable should update repeats', async () => {
-    const { scene, repeater, variable } = buildPanelRepeaterScene({ variableQueryTime: 0 });
-
-    activateFullSceneTree(scene);
-
-    variable.changeValueTo(['1', '3'], ['A', 'C']);
-
-    expect(repeater.state.repeatedPanels?.length).toBe(2);
-  });
-});
diff --git a/public/app/features/dashboard-scene/scene/PanelRepeaterGridItem.tsx b/public/app/features/dashboard-scene/scene/PanelRepeaterGridItem.tsx
deleted file mode 100644
index fc0140997db18..0000000000000
--- a/public/app/features/dashboard-scene/scene/PanelRepeaterGridItem.tsx
+++ /dev/null
@@ -1,235 +0,0 @@
-import { css } from '@emotion/css';
-import React, { useMemo } from 'react';
-
-import { config } from '@grafana/runtime';
-import {
-  VizPanel,
-  SceneObjectBase,
-  VariableDependencyConfig,
-  SceneVariable,
-  SceneGridLayout,
-  SceneVariableSet,
-  SceneComponentProps,
-  SceneGridItemStateLike,
-  SceneGridItemLike,
-  sceneGraph,
-  MultiValueVariable,
-  LocalValueVariable,
-} from '@grafana/scenes';
-import { GRID_CELL_HEIGHT, GRID_CELL_VMARGIN } from 'app/core/constants';
-
-import { getMultiVariableValues } from '../utils/utils';
-
-import { DashboardRepeatsProcessedEvent } from './types';
-
-interface PanelRepeaterGridItemState extends SceneGridItemStateLike {
-  source: VizPanel;
-  repeatedPanels?: VizPanel[];
-  variableName: string;
-  itemHeight?: number;
-  repeatDirection?: RepeatDirection | string;
-  maxPerRow?: number;
-}
-
-export type RepeatDirection = 'v' | 'h';
-
-export class PanelRepeaterGridItem extends SceneObjectBase<PanelRepeaterGridItemState> implements SceneGridItemLike {
-  protected _variableDependency = new VariableDependencyConfig(this, {
-    variableNames: [this.state.variableName],
-    onVariableUpdatesCompleted: this._onVariableChanged.bind(this),
-  });
-
-  private _isWaitingForVariables = false;
-
-  public constructor(state: PanelRepeaterGridItemState) {
-    super(state);
-
-    this.addActivationHandler(() => this._activationHandler());
-  }
-
-  private _activationHandler() {
-    this._subs.add(this.subscribeToState((newState, prevState) => this._handleGridResize(newState, prevState)));
-
-    // If we our variable is ready we can process repeats on activation
-    if (sceneGraph.hasVariableDependencyInLoadingState(this)) {
-      this._isWaitingForVariables = true;
-    } else {
-      this._performRepeat();
-    }
-  }
-
-  private _onVariableChanged(changedVariables: Set<SceneVariable>, dependencyChanged: boolean): void {
-    if (dependencyChanged) {
-      this._performRepeat();
-      return;
-    }
-
-    // If we are waiting for variables and the variable is no longer loading then we are ready to repeat as well
-    if (this._isWaitingForVariables && !sceneGraph.hasVariableDependencyInLoadingState(this)) {
-      this._isWaitingForVariables = false;
-      this._performRepeat();
-    }
-  }
-
-  /**
-   * Uses the current repeat item count to calculate the user intended desired itemHeight
-   */
-  private _handleGridResize(newState: PanelRepeaterGridItemState, prevState: PanelRepeaterGridItemState) {
-    const itemCount = this.state.repeatedPanels?.length ?? 1;
-    const stateChange: Partial<PanelRepeaterGridItemState> = {};
-
-    // Height changed
-    if (newState.height === prevState.height) {
-      return;
-    }
-
-    if (this.getRepeatDirection() === 'v') {
-      const itemHeight = Math.ceil(newState.height! / itemCount);
-      stateChange.itemHeight = itemHeight;
-    } else {
-      const rowCount = Math.ceil(itemCount / this.getMaxPerRow());
-      stateChange.itemHeight = Math.ceil(newState.height! / rowCount);
-    }
-
-    if (stateChange.itemHeight !== this.state.itemHeight) {
-      this.setState(stateChange);
-    }
-  }
-
-  private _performRepeat() {
-    const variable = sceneGraph.lookupVariable(this.state.variableName, this);
-    if (!variable) {
-      console.error('SceneGridItemRepeater: Variable not found');
-      return;
-    }
-
-    if (!(variable instanceof MultiValueVariable)) {
-      console.error('PanelRepeaterGridItem: Variable is not a MultiValueVariable');
-      return;
-    }
-
-    const panelToRepeat = this.state.source;
-    const { values, texts } = getMultiVariableValues(variable);
-    const repeatedPanels: VizPanel[] = [];
-
-    // Loop through variable values and create repeates
-    for (let index = 0; index < values.length; index++) {
-      const clone = panelToRepeat.clone({
-        $variables: new SceneVariableSet({
-          variables: [
-            new LocalValueVariable({ name: variable.state.name, value: values[index], text: String(texts[index]) }),
-          ],
-        }),
-        key: `${panelToRepeat.state.key}-clone-${index}`,
-      });
-
-      repeatedPanels.push(clone);
-    }
-
-    const direction = this.getRepeatDirection();
-    const stateChange: Partial<PanelRepeaterGridItemState> = { repeatedPanels: repeatedPanels };
-    const itemHeight = this.state.itemHeight ?? 10;
-    const prevHeight = this.state.height;
-    const maxPerRow = this.getMaxPerRow();
-
-    if (direction === 'h') {
-      const rowCount = Math.ceil(repeatedPanels.length / maxPerRow);
-      stateChange.height = rowCount * itemHeight;
-    } else {
-      stateChange.height = repeatedPanels.length * itemHeight;
-    }
-
-    this.setState(stateChange);
-
-    // In case we updated our height the grid layout needs to be update
-    if (prevHeight !== this.state.height) {
-      const layout = sceneGraph.getLayout(this);
-      if (layout instanceof SceneGridLayout) {
-        layout.forceRender();
-      }
-    }
-
-    // Used from dashboard url sync
-    this.publishEvent(new DashboardRepeatsProcessedEvent({ source: this }), true);
-  }
-
-  public getMaxPerRow(): number {
-    return this.state.maxPerRow ?? 4;
-  }
-
-  public getRepeatDirection(): RepeatDirection {
-    return this.state.repeatDirection === 'v' ? 'v' : 'h';
-  }
-
-  public getClassName() {
-    return 'panel-repeater-grid-item';
-  }
-
-  public static Component = ({ model }: SceneComponentProps<PanelRepeaterGridItem>) => {
-    const { repeatedPanels, itemHeight } = model.useState();
-    const itemCount = repeatedPanels?.length ?? 0;
-    const layoutStyle = useLayoutStyle(model.getRepeatDirection(), itemCount, model.getMaxPerRow(), itemHeight ?? 10);
-
-    if (!repeatedPanels) {
-      return null;
-    }
-
-    return (
-      <div className={layoutStyle}>
-        {repeatedPanels.map((panel) => (
-          <div className={itemStyle} key={panel.state.key}>
-            <panel.Component model={panel} key={panel.state.key} />
-          </div>
-        ))}
-      </div>
-    );
-  };
-}
-
-function useLayoutStyle(direction: RepeatDirection, itemCount: number, maxPerRow: number, itemHeight: number) {
-  return useMemo(() => {
-    const theme = config.theme2;
-
-    // In mobile responsive layout we have to calculate the absolute height
-    const mobileHeight = itemHeight * GRID_CELL_HEIGHT * itemCount + (itemCount - 1) * GRID_CELL_VMARGIN;
-
-    if (direction === 'h') {
-      const rowCount = Math.ceil(itemCount / maxPerRow);
-      const columnCount = Math.ceil(itemCount / rowCount);
-
-      return css({
-        display: 'grid',
-        height: '100%',
-        width: '100%',
-        gridTemplateColumns: `repeat(${columnCount}, 1fr)`,
-        gridTemplateRows: `repeat(${rowCount}, 1fr)`,
-        gridColumnGap: theme.spacing(1),
-        gridRowGap: theme.spacing(1),
-
-        [theme.breakpoints.down('md')]: {
-          display: 'flex',
-          flexDirection: 'column',
-          height: mobileHeight,
-        },
-      });
-    }
-
-    // Vertical is a bit simpler
-    return css({
-      display: 'flex',
-      height: '100%',
-      width: '100%',
-      flexDirection: 'column',
-      gap: theme.spacing(1),
-      [theme.breakpoints.down('md')]: {
-        height: mobileHeight,
-      },
-    });
-  }, [direction, itemCount, maxPerRow, itemHeight]);
-}
-
-const itemStyle = css({
-  display: 'flex',
-  flexGrow: 1,
-  position: 'relative',
-});
diff --git a/public/app/features/dashboard-scene/scene/PanelTimeRange.tsx b/public/app/features/dashboard-scene/scene/PanelTimeRange.tsx
index b508a25de8e78..cd4d0637c65bf 100644
--- a/public/app/features/dashboard-scene/scene/PanelTimeRange.tsx
+++ b/public/app/features/dashboard-scene/scene/PanelTimeRange.tsx
@@ -12,7 +12,7 @@ import {
 import { Icon, PanelChrome, TimePickerTooltip, Tooltip, useStyles2 } from '@grafana/ui';
 import { TimeOverrideResult } from 'app/features/dashboard/utils/panel';
 
-interface PanelTimeRangeState extends SceneTimeRangeState {
+export interface PanelTimeRangeState extends SceneTimeRangeState {
   timeFrom?: string;
   timeShift?: string;
   hideTimeOverride?: boolean;
@@ -30,8 +30,21 @@ export class PanelTimeRange extends SceneTimeRangeTransformerBase<PanelTimeRange
       to: 'now',
       value: getDefaultTimeRange(),
     });
+
+    this.addActivationHandler(() => this._onActivate());
   }
 
+  private _onActivate() {
+    this._subs.add(
+      this.subscribeToState((n, p) => {
+        // Listen to own changes and update time info when required
+        if (n.timeFrom !== p.timeFrom || n.timeShift !== p.timeShift) {
+          const { timeInfo, timeRange } = this.getTimeOverride(this.getAncestorTimeRange().state.value);
+          this.setState({ timeInfo, value: timeRange });
+        }
+      })
+    );
+  }
   protected ancestorTimeRangeChanged(timeRange: SceneTimeRangeState): void {
     const overrideResult = this.getTimeOverride(timeRange.value);
     this.setState({ value: overrideResult.timeRange, timeInfo: overrideResult.timeInfo });
@@ -104,6 +117,7 @@ const getStyles = (theme: GrafanaTheme2) => {
     timeshift: css({
       color: theme.colors.text.link,
       gap: theme.spacing(0.5),
+      whiteSpace: 'nowrap',
     }),
   };
 };
diff --git a/public/app/features/dashboard-scene/scene/RowRepeaterBehavior.test.tsx b/public/app/features/dashboard-scene/scene/RowRepeaterBehavior.test.tsx
index 204394c372f78..614139d893396 100644
--- a/public/app/features/dashboard-scene/scene/RowRepeaterBehavior.test.tsx
+++ b/public/app/features/dashboard-scene/scene/RowRepeaterBehavior.test.tsx
@@ -1,9 +1,9 @@
 import {
   EmbeddedScene,
   SceneCanvasText,
-  SceneGridItem,
   SceneGridLayout,
   SceneGridRow,
+  SceneGridItem,
   SceneTimeRange,
   SceneVariableSet,
   TestVariable,
@@ -12,7 +12,7 @@ import { ALL_VARIABLE_TEXT, ALL_VARIABLE_VALUE } from 'app/features/variables/co
 
 import { activateFullSceneTree } from '../utils/test-utils';
 
-import { RepeatDirection } from './PanelRepeaterGridItem';
+import { RepeatDirection } from './DashboardGridItem';
 import { RowRepeaterBehavior } from './RowRepeaterBehavior';
 
 describe('RowRepeaterBehavior', () => {
@@ -50,6 +50,19 @@ describe('RowRepeaterBehavior', () => {
       expect(rowAtTheBottom.state.y).toBe(40);
     });
 
+    it('Should push row at the bottom down and also offset its children', () => {
+      const rowAtTheBottom = grid.state.children[6] as SceneGridRow;
+      const rowChildOne = rowAtTheBottom.state.children[0] as SceneGridItem;
+      const rowChildTwo = rowAtTheBottom.state.children[1] as SceneGridItem;
+
+      expect(rowAtTheBottom.state.title).toBe('Row at the bottom');
+
+      // Panel at the top is 10, each row is (1+5)*5 = 30, so the grid item below it should be 40
+      expect(rowAtTheBottom.state.y).toBe(40);
+      expect(rowChildOne.state.y).toBe(41);
+      expect(rowChildTwo.state.y).toBe(49);
+    });
+
     it('Should handle second repeat cycle and update remove old repeats', async () => {
       // trigger another repeat cycle by changing the variable
       const variable = scene.state.$variables!.state.variables[0] as TestVariable;
@@ -61,6 +74,30 @@ describe('RowRepeaterBehavior', () => {
       expect(grid.state.children.length).toBe(4);
     });
   });
+
+  describe('Given scene empty row', () => {
+    let scene: EmbeddedScene;
+    let grid: SceneGridLayout;
+    let repeatBehavior: RowRepeaterBehavior;
+
+    beforeEach(async () => {
+      ({ scene, grid, repeatBehavior } = buildScene({ variableQueryTime: 0 }));
+
+      repeatBehavior.setState({ sources: [] });
+      activateFullSceneTree(scene);
+      await new Promise((r) => setTimeout(r, 1));
+    });
+
+    it('Should repeat row', () => {
+      // Verify that panel above row remains
+      expect(grid.state.children[0]).toBeInstanceOf(SceneGridItem);
+      // Verify that first row still has repeat behavior
+      const row1 = grid.state.children[1] as SceneGridRow;
+      const row2 = grid.state.children[2] as SceneGridRow;
+      expect(row1.state.y).toBe(10);
+      expect(row2.state.y).toBe(11);
+    });
+  });
 });
 
 interface SceneOptions {
@@ -71,6 +108,22 @@ interface SceneOptions {
 }
 
 function buildScene(options: SceneOptions) {
+  const repeatBehavior = new RowRepeaterBehavior({
+    variableName: 'server',
+    sources: [
+      new SceneGridItem({
+        x: 0,
+        y: 11,
+        width: 24,
+        height: 5,
+        body: new SceneCanvasText({
+          key: 'canvas-1',
+          text: 'Panel inside repeated row, server = $server',
+        }),
+      }),
+    ],
+  });
+
   const grid = new SceneGridLayout({
     children: [
       new SceneGridItem({
@@ -87,23 +140,7 @@ function buildScene(options: SceneOptions) {
         y: 10,
         width: 24,
         height: 1,
-        $behaviors: [
-          new RowRepeaterBehavior({
-            variableName: 'server',
-            sources: [
-              new SceneGridItem({
-                x: 0,
-                y: 11,
-                width: 24,
-                height: 5,
-                body: new SceneCanvasText({
-                  key: 'canvas-1',
-                  text: 'Panel inside repeated row, server = $server',
-                }),
-              }),
-            ],
-          }),
-        ],
+        $behaviors: [repeatBehavior],
       }),
       new SceneGridRow({
         x: 0,
@@ -111,6 +148,26 @@ function buildScene(options: SceneOptions) {
         width: 24,
         height: 5,
         title: 'Row at the bottom',
+        children: [
+          new SceneGridItem({
+            key: 'griditem-2',
+            x: 0,
+            y: 17,
+            body: new SceneCanvasText({
+              key: 'canvas-2',
+              text: 'Panel inside row, server = $server',
+            }),
+          }),
+          new SceneGridItem({
+            key: 'griditem-3',
+            x: 0,
+            y: 25,
+            body: new SceneCanvasText({
+              key: 'canvas-3',
+              text: 'Panel inside row, server = $server',
+            }),
+          }),
+        ],
       }),
     ],
   });
@@ -140,5 +197,5 @@ function buildScene(options: SceneOptions) {
     body: grid,
   });
 
-  return { scene, grid };
+  return { scene, grid, repeatBehavior };
 }
diff --git a/public/app/features/dashboard-scene/scene/RowRepeaterBehavior.ts b/public/app/features/dashboard-scene/scene/RowRepeaterBehavior.ts
index 70ada7a69cce8..609e983be38e0 100644
--- a/public/app/features/dashboard-scene/scene/RowRepeaterBehavior.ts
+++ b/public/app/features/dashboard-scene/scene/RowRepeaterBehavior.ts
@@ -7,7 +7,6 @@ import {
   SceneGridRow,
   SceneObjectBase,
   SceneObjectState,
-  SceneVariable,
   SceneVariableSet,
   VariableDependencyConfig,
   VariableValueSingle,
@@ -29,11 +28,9 @@ interface RowRepeaterBehaviorState extends SceneObjectState {
 export class RowRepeaterBehavior extends SceneObjectBase<RowRepeaterBehaviorState> {
   protected _variableDependency = new VariableDependencyConfig(this, {
     variableNames: [this.state.variableName],
-    onVariableUpdatesCompleted: this._onVariableChanged.bind(this),
+    onVariableUpdateCompleted: this._onVariableUpdateCompleted.bind(this),
   });
 
-  private _isWaitingForVariables = false;
-
   public constructor(state: RowRepeaterBehaviorState) {
     super(state);
 
@@ -41,28 +38,18 @@ export class RowRepeaterBehavior extends SceneObjectBase<RowRepeaterBehaviorStat
   }
 
   private _activationHandler() {
-    // If we our variable is ready we can process repeats on activation
-    if (sceneGraph.hasVariableDependencyInLoadingState(this)) {
-      this._isWaitingForVariables = true;
-    } else {
-      this._performRepeat();
-    }
+    this._performRepeat();
   }
 
-  private _onVariableChanged(changedVariables: Set<SceneVariable>, dependencyChanged: boolean): void {
-    if (dependencyChanged) {
-      this._performRepeat();
-      return;
-    }
-
-    // If we are waiting for variables and the variable is no longer loading then we are ready to repeat as well
-    if (this._isWaitingForVariables && !sceneGraph.hasVariableDependencyInLoadingState(this)) {
-      this._isWaitingForVariables = false;
-      this._performRepeat();
-    }
+  private _onVariableUpdateCompleted(): void {
+    this._performRepeat();
   }
 
   private _performRepeat() {
+    if (this._variableDependency.hasDependencyInLoadingState()) {
+      return;
+    }
+
     const variable = sceneGraph.lookupVariable(this.state.variableName, this.parent?.parent!);
 
     if (!variable) {
@@ -164,6 +151,10 @@ function getRowContentHeight(panels: SceneGridItemLike[]): number {
   let maxY = 0;
   let minY = Number.MAX_VALUE;
 
+  if (panels.length === 0) {
+    return 0;
+  }
+
   for (const panel of panels) {
     if (panel.state.y! + panel.state.height! > maxY) {
       maxY = panel.state.y! + panel.state.height!;
@@ -193,8 +184,12 @@ function updateLayout(layout: SceneGridLayout, rows: SceneGridRow[], maxYOfRows:
     const diff = maxYOfRows - firstChildAfterY;
 
     for (const child of childrenAfter) {
-      if (child.state.y! < maxYOfRows) {
-        child.setState({ y: child.state.y! + diff });
+      child.setState({ y: child.state.y! + diff });
+
+      if (child instanceof SceneGridRow) {
+        for (const rowChild of child.state.children) {
+          rowChild.setState({ y: rowChild.state.y! + diff });
+        }
       }
     }
   }
diff --git a/public/app/features/dashboard-scene/scene/ScopesDashboardsScene.tsx b/public/app/features/dashboard-scene/scene/ScopesDashboardsScene.tsx
new file mode 100644
index 0000000000000..b9c60e6fd9bf3
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/ScopesDashboardsScene.tsx
@@ -0,0 +1,148 @@
+import { css } from '@emotion/css';
+import React from 'react';
+import { Link } from 'react-router-dom';
+
+import { AppEvents, GrafanaTheme2, ScopeDashboard } from '@grafana/data';
+import { config, getAppEvents, getBackendSrv, locationService } from '@grafana/runtime';
+import { SceneComponentProps, SceneObjectBase, SceneObjectState } from '@grafana/scenes';
+import { CustomScrollbar, Icon, Input, useStyles2 } from '@grafana/ui';
+
+export interface ScopesDashboardsSceneState extends SceneObjectState {
+  dashboards: ScopeDashboard[];
+  filteredDashboards: ScopeDashboard[];
+  isLoading: boolean;
+  searchQuery: string;
+}
+
+export class ScopesDashboardsScene extends SceneObjectBase<ScopesDashboardsSceneState> {
+  static Component = ScopesDashboardsSceneRenderer;
+
+  private _url =
+    config.bootData.settings.listDashboardScopesEndpoint || '/apis/scope.grafana.app/v0alpha1/scopedashboards';
+
+  constructor() {
+    super({
+      dashboards: [],
+      filteredDashboards: [],
+      isLoading: false,
+      searchQuery: '',
+    });
+  }
+
+  public async fetchDashboards(scope: string | undefined) {
+    if (!scope) {
+      return this.setState({ dashboards: [], filteredDashboards: [], isLoading: false });
+    }
+
+    this.setState({ isLoading: true });
+
+    const dashboardUids = await this.fetchDashboardsUids(scope);
+    const dashboards = await this.fetchDashboardsDetails(dashboardUids);
+
+    this.setState({
+      dashboards,
+      filteredDashboards: this.filterDashboards(dashboards, this.state.searchQuery),
+      isLoading: false,
+    });
+  }
+
+  public changeSearchQuery(searchQuery: string) {
+    this.setState({
+      filteredDashboards: searchQuery
+        ? this.filterDashboards(this.state.dashboards, searchQuery)
+        : this.state.dashboards,
+      searchQuery: searchQuery ?? '',
+    });
+  }
+
+  private async fetchDashboardsUids(scope: string): Promise<string[]> {
+    try {
+      const response = await getBackendSrv().get<{
+        items: Array<{ spec: { dashboards: null | string[]; scope: string } }>;
+      }>(this._url, { scope });
+
+      return response.items.find((item) => !!item.spec.dashboards && item.spec.scope === scope)?.spec.dashboards ?? [];
+    } catch (err) {
+      return [];
+    }
+  }
+
+  private async fetchDashboardsDetails(dashboardUids: string[]): Promise<ScopeDashboard[]> {
+    try {
+      const dashboards = await Promise.all(
+        dashboardUids.map((dashboardUid) => this.fetchDashboardDetails(dashboardUid))
+      );
+
+      return dashboards.filter((dashboard): dashboard is ScopeDashboard => !!dashboard);
+    } catch (err) {
+      getAppEvents().publish({
+        type: AppEvents.alertError.name,
+        payload: ['Failed to fetch suggested dashboards'],
+      });
+
+      return [];
+    }
+  }
+
+  private async fetchDashboardDetails(dashboardUid: string): Promise<ScopeDashboard | undefined> {
+    try {
+      const dashboard = await getBackendSrv().get(`/api/dashboards/uid/${dashboardUid}`);
+
+      return {
+        uid: dashboard.dashboard.uid,
+        title: dashboard.dashboard.title,
+        url: dashboard.meta.url,
+      };
+    } catch (err) {
+      return undefined;
+    }
+  }
+
+  private filterDashboards(dashboards: ScopeDashboard[], searchQuery: string) {
+    const lowerCasedSearchQuery = searchQuery.toLowerCase();
+    return dashboards.filter((dashboard) => dashboard.title.toLowerCase().includes(lowerCasedSearchQuery));
+  }
+}
+
+export function ScopesDashboardsSceneRenderer({ model }: SceneComponentProps<ScopesDashboardsScene>) {
+  const { filteredDashboards, isLoading } = model.useState();
+  const styles = useStyles2(getStyles);
+
+  return (
+    <>
+      <div className={styles.searchInputContainer}>
+        <Input
+          prefix={<Icon name="search" />}
+          disabled={isLoading}
+          onChange={(evt) => model.changeSearchQuery(evt.currentTarget.value)}
+        />
+      </div>
+
+      <CustomScrollbar>
+        {filteredDashboards.map((dashboard, idx) => (
+          <div key={idx} className={styles.dashboardItem}>
+            <Link to={{ pathname: dashboard.url, search: locationService.getLocation().search }}>
+              {dashboard.title}
+            </Link>
+          </div>
+        ))}
+      </CustomScrollbar>
+    </>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    searchInputContainer: css({
+      flex: '0 1 auto',
+    }),
+    dashboardItem: css({
+      padding: theme.spacing(1, 0),
+      borderBottom: `1px solid ${theme.colors.border.weak}`,
+
+      ':first-child': {
+        paddingTop: 0,
+      },
+    }),
+  };
+};
diff --git a/public/app/features/dashboard-scene/scene/ScopesFiltersScene.tsx b/public/app/features/dashboard-scene/scene/ScopesFiltersScene.tsx
new file mode 100644
index 0000000000000..7f2dfe5e6adc8
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/ScopesFiltersScene.tsx
@@ -0,0 +1,120 @@
+import React from 'react';
+
+import { AppEvents, Scope, SelectableValue } from '@grafana/data';
+import { config, getAppEvents, getBackendSrv } from '@grafana/runtime';
+import {
+  SceneComponentProps,
+  SceneObjectBase,
+  SceneObjectState,
+  SceneObjectUrlSyncConfig,
+  SceneObjectUrlValues,
+} from '@grafana/scenes';
+import { Select } from '@grafana/ui';
+
+export interface ScopesFiltersSceneState extends SceneObjectState {
+  isLoading: boolean;
+  pendingValue: string | undefined;
+  scopes: Scope[];
+  value: string | undefined;
+}
+
+export class ScopesFiltersScene extends SceneObjectBase<ScopesFiltersSceneState> {
+  static Component = ScopesFiltersSceneRenderer;
+
+  protected _urlSync = new SceneObjectUrlSyncConfig(this, { keys: ['scope'] });
+
+  private _url = config.bootData.settings.listScopesEndpoint || '/apis/scope.grafana.app/v0alpha1/scopes';
+
+  constructor() {
+    super({
+      isLoading: true,
+      pendingValue: undefined,
+      scopes: [],
+      value: undefined,
+    });
+  }
+
+  getUrlState() {
+    return { scope: this.state.value };
+  }
+
+  updateFromUrl(values: SceneObjectUrlValues) {
+    const scope = values.scope ?? undefined;
+    this.setScope(Array.isArray(scope) ? scope[0] : scope);
+  }
+
+  public getSelectedScope(): Scope | undefined {
+    return this.state.scopes.find((scope) => scope.uid === this.state.value);
+  }
+
+  public setScope(newScope: string | undefined) {
+    if (this.state.isLoading) {
+      return this.setState({ pendingValue: newScope });
+    }
+
+    if (!this.state.scopes.find((scope) => scope.uid === newScope)) {
+      newScope = undefined;
+    }
+
+    this.setState({ value: newScope });
+  }
+
+  public async fetchScopes() {
+    this.setState({ isLoading: true });
+
+    try {
+      const response = await getBackendSrv().get<{
+        items: Array<{ metadata: { uid: string }; spec: Omit<Scope, 'uid'> }>;
+      }>(this._url);
+
+      this.setScopesAfterFetch(
+        response.items.map(({ metadata: { uid }, spec }) => ({
+          uid,
+          ...spec,
+        }))
+      );
+    } catch (err) {
+      getAppEvents().publish({
+        type: AppEvents.alertError.name,
+        payload: ['Failed to fetch scopes'],
+      });
+
+      this.setScopesAfterFetch([]);
+    } finally {
+      this.setState({ isLoading: false });
+    }
+  }
+
+  private setScopesAfterFetch(scopes: Scope[]) {
+    let value = this.state.pendingValue ?? this.state.value;
+
+    if (!scopes.find((scope) => scope.uid === value)) {
+      value = undefined;
+    }
+
+    this.setState({ scopes, pendingValue: undefined, value });
+  }
+}
+
+export function ScopesFiltersSceneRenderer({ model }: SceneComponentProps<ScopesFiltersScene>) {
+  const { scopes, isLoading, value } = model.useState();
+  const parentState = model.parent!.useState();
+  const isViewing = 'isViewing' in parentState ? !!parentState.isViewing : false;
+
+  const options: Array<SelectableValue<string>> = scopes.map(({ uid, title, category }) => ({
+    label: title,
+    value: uid,
+    description: category,
+  }));
+
+  return (
+    <Select
+      isClearable
+      isLoading={isLoading}
+      disabled={isViewing}
+      options={options}
+      value={value}
+      onChange={(selectableValue) => model.setScope(selectableValue?.value ?? undefined)}
+    />
+  );
+}
diff --git a/public/app/features/dashboard-scene/scene/ScopesScene.test.tsx b/public/app/features/dashboard-scene/scene/ScopesScene.test.tsx
new file mode 100644
index 0000000000000..0508c762ddc90
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/ScopesScene.test.tsx
@@ -0,0 +1,261 @@
+import { waitFor } from '@testing-library/react';
+
+import { config } from '@grafana/runtime';
+import {
+  behaviors,
+  sceneGraph,
+  SceneGridItem,
+  SceneGridLayout,
+  SceneQueryRunner,
+  SceneTimeRange,
+  VizPanel,
+} from '@grafana/scenes';
+
+import { DashboardControls } from './DashboardControls';
+import { DashboardScene } from './DashboardScene';
+import { ScopesDashboardsScene } from './ScopesDashboardsScene';
+import { ScopesFiltersScene } from './ScopesFiltersScene';
+import { ScopesScene } from './ScopesScene';
+
+const dashboardsMocks = {
+  dashboard1: {
+    uid: 'dashboard1',
+    title: 'Dashboard 1',
+    url: '/d/dashboard1',
+  },
+  dashboard2: {
+    uid: 'dashboard2',
+    title: 'Dashboard 2',
+    url: '/d/dashboard2',
+  },
+  dashboard3: {
+    uid: 'dashboard3',
+    title: 'Dashboard 3',
+    url: '/d/dashboard3',
+  },
+};
+
+const scopesMocks = {
+  scope1: {
+    uid: 'scope1',
+    title: 'Scope 1',
+    type: 'Type 1',
+    description: 'Description 1',
+    category: 'Category 1',
+    filters: [
+      { key: 'a-key', operator: '=', value: 'a-value' },
+      { key: 'b-key', operator: '!=', value: 'b-value' },
+    ],
+    dashboards: [dashboardsMocks.dashboard1, dashboardsMocks.dashboard2, dashboardsMocks.dashboard3],
+  },
+  scope2: {
+    uid: 'scope2',
+    title: 'Scope 2',
+    type: 'Type 2',
+    description: 'Description 2',
+    category: 'Category 2',
+    filters: [{ key: 'c-key', operator: '!=', value: 'c-value' }],
+    dashboards: [dashboardsMocks.dashboard3],
+  },
+  scope3: {
+    uid: 'scope3',
+    title: 'Scope 3',
+    type: 'Type 1',
+    description: 'Description 3',
+    category: 'Category 1',
+    filters: [{ key: 'd-key', operator: '=', value: 'd-value' }],
+    dashboards: [dashboardsMocks.dashboard1, dashboardsMocks.dashboard2],
+  },
+};
+
+jest.mock('@grafana/runtime', () => ({
+  __esModule: true,
+  ...jest.requireActual('@grafana/runtime'),
+  getBackendSrv: () => ({
+    get: jest.fn().mockImplementation((url: string) => {
+      if (url === '/apis/scope.grafana.app/v0alpha1/scopes') {
+        return {
+          items: Object.values(scopesMocks).map((scope) => ({
+            metadata: { uid: scope.uid },
+            spec: {
+              title: scope.title,
+              type: scope.type,
+              description: scope.description,
+              category: scope.category,
+              filters: scope.filters,
+            },
+          })),
+        };
+      }
+
+      if (url === '/apis/scope.grafana.app/v0alpha1/scopedashboards') {
+        return {
+          items: Object.values(scopesMocks).map((scope) => ({
+            spec: {
+              dashboards: scope.dashboards.map((dashboard) => dashboard.uid),
+              scope: scope.uid,
+            },
+          })),
+        };
+      }
+
+      if (url.startsWith('/api/dashboards/uid/')) {
+        const uid = url.split('/').pop();
+
+        if (!uid) {
+          return {};
+        }
+
+        const dashboard = Object.values(dashboardsMocks).find((dashboard) => dashboard.uid === uid);
+
+        if (!dashboard) {
+          return {};
+        }
+
+        return {
+          dashboard: {
+            title: dashboard.title,
+            uid,
+          },
+          meta: {
+            url: dashboard.url,
+          },
+        };
+      }
+
+      return {};
+    }),
+  }),
+}));
+
+describe('ScopesScene', () => {
+  describe('Feature flag off', () => {
+    beforeAll(() => {
+      config.featureToggles.scopeFilters = false;
+    });
+
+    it('Does not initialize', () => {
+      const dashboardScene = buildTestScene();
+      dashboardScene.activate();
+      const scopesScene = dashboardScene.state.scopes;
+
+      expect(scopesScene).toBeUndefined();
+    });
+  });
+
+  describe('Feature flag on', () => {
+    let dashboardScene: DashboardScene;
+    let scopesScene: ScopesScene;
+    let filtersScene: ScopesFiltersScene;
+    let dashboardsScene: ScopesDashboardsScene;
+    let fetchScopesSpy: jest.SpyInstance;
+    let fetchDashboardsSpy: jest.SpyInstance;
+
+    beforeAll(() => {
+      config.featureToggles.scopeFilters = true;
+    });
+
+    beforeEach(() => {
+      dashboardScene = buildTestScene();
+      scopesScene = dashboardScene.state.scopes!;
+      filtersScene = scopesScene.state.filters;
+      dashboardsScene = scopesScene.state.dashboards;
+      fetchScopesSpy = jest.spyOn(filtersScene!, 'fetchScopes');
+      fetchDashboardsSpy = jest.spyOn(dashboardsScene!, 'fetchDashboards');
+      dashboardScene.activate();
+      scopesScene.activate();
+      filtersScene.activate();
+      dashboardsScene.activate();
+    });
+
+    it('Initializes', () => {
+      expect(scopesScene).toBeInstanceOf(ScopesScene);
+      expect(filtersScene).toBeInstanceOf(ScopesFiltersScene);
+      expect(dashboardsScene).toBeInstanceOf(ScopesDashboardsScene);
+    });
+
+    it('Fetches scopes list', async () => {
+      expect(fetchScopesSpy).toHaveBeenCalled();
+    });
+
+    it('Fetches dashboards list', () => {
+      filtersScene.setScope(scopesMocks.scope1.uid);
+
+      waitFor(() => {
+        expect(fetchDashboardsSpy).toHaveBeenCalled();
+        expect(dashboardsScene.state.dashboards).toEqual(scopesMocks.scope1.dashboards);
+      });
+
+      filtersScene.setScope(scopesMocks.scope2.uid);
+
+      waitFor(() => {
+        expect(fetchDashboardsSpy).toHaveBeenCalled();
+        expect(dashboardsScene.state.dashboards).toEqual(scopesMocks.scope2.dashboards);
+      });
+    });
+
+    it('Enriches data requests', () => {
+      const { dashboards: _dashboards, ...scope1 } = scopesMocks.scope1;
+
+      filtersScene.setScope(scope1.uid);
+
+      const queryRunner = sceneGraph.findObject(dashboardScene, (o) => o.state.key === 'data-query-runner')!;
+
+      expect(dashboardScene.enrichDataRequest(queryRunner).scope).toEqual(scope1);
+    });
+
+    it('Toggles expanded state', async () => {
+      scopesScene.toggleIsExpanded();
+
+      expect(scopesScene.state.isExpanded).toEqual(true);
+    });
+
+    it('Enters view mode', async () => {
+      dashboardScene.onEnterEditMode();
+
+      expect(scopesScene.state.isViewing).toEqual(true);
+      expect(scopesScene.state.isExpanded).toEqual(false);
+    });
+
+    it('Exits view mode', async () => {
+      dashboardScene.onEnterEditMode();
+      dashboardScene.exitEditMode({ skipConfirm: true });
+
+      expect(scopesScene.state.isViewing).toEqual(false);
+      expect(scopesScene.state.isExpanded).toEqual(false);
+    });
+  });
+});
+
+function buildTestScene(overrides: Partial<DashboardScene> = {}) {
+  return new DashboardScene({
+    title: 'hello',
+    uid: 'dash-1',
+    description: 'hello description',
+    tags: ['tag1', 'tag2'],
+    editable: true,
+    $timeRange: new SceneTimeRange({
+      timeZone: 'browser',
+    }),
+    controls: new DashboardControls({}),
+    $behaviors: [new behaviors.CursorSync({})],
+    body: new SceneGridLayout({
+      children: [
+        new SceneGridItem({
+          key: 'griditem-1',
+          x: 0,
+          y: 0,
+          width: 300,
+          height: 300,
+          body: new VizPanel({
+            title: 'Panel A',
+            key: 'panel-1',
+            pluginId: 'table',
+            $data: new SceneQueryRunner({ key: 'data-query-runner', queries: [{ refId: 'A' }] }),
+          }),
+        }),
+      ],
+    }),
+    ...overrides,
+  });
+}
diff --git a/public/app/features/dashboard-scene/scene/ScopesScene.tsx b/public/app/features/dashboard-scene/scene/ScopesScene.tsx
new file mode 100644
index 0000000000000..e2581452c559f
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/ScopesScene.tsx
@@ -0,0 +1,132 @@
+import { css, cx } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { SceneComponentProps, sceneGraph, SceneObjectBase, SceneObjectState } from '@grafana/scenes';
+import { IconButton, useStyles2 } from '@grafana/ui';
+
+import { ScopesDashboardsScene } from './ScopesDashboardsScene';
+import { ScopesFiltersScene } from './ScopesFiltersScene';
+
+export interface ScopesSceneState extends SceneObjectState {
+  dashboards: ScopesDashboardsScene;
+  filters: ScopesFiltersScene;
+  isExpanded: boolean;
+  isViewing: boolean;
+}
+
+export class ScopesScene extends SceneObjectBase<ScopesSceneState> {
+  static Component = ScopesSceneRenderer;
+
+  constructor() {
+    super({
+      dashboards: new ScopesDashboardsScene(),
+      filters: new ScopesFiltersScene(),
+      isExpanded: false,
+      isViewing: false,
+    });
+
+    this.addActivationHandler(() => {
+      this.state.filters.fetchScopes();
+
+      const filtersValueSubscription = this.state.filters.subscribeToState((newState, prevState) => {
+        if (newState.value !== prevState.value) {
+          this.state.dashboards.fetchDashboards(newState.value);
+          sceneGraph.getTimeRange(this.parent!).onRefresh();
+        }
+      });
+
+      const dashboardEditModeSubscription = this.parent?.subscribeToState((newState) => {
+        const isEditing = 'isEditing' in newState ? !!newState.isEditing : false;
+
+        if (isEditing !== this.state.isViewing) {
+          if (isEditing) {
+            this.enterViewMode();
+          } else {
+            this.exitViewMode();
+          }
+        }
+      });
+
+      return () => {
+        filtersValueSubscription.unsubscribe();
+        dashboardEditModeSubscription?.unsubscribe();
+      };
+    });
+  }
+
+  public toggleIsExpanded() {
+    this.setState({ isExpanded: !this.state.isExpanded });
+  }
+
+  private enterViewMode() {
+    this.setState({ isExpanded: false, isViewing: true });
+  }
+
+  private exitViewMode() {
+    this.setState({ isViewing: false });
+  }
+}
+
+export function ScopesSceneRenderer({ model }: SceneComponentProps<ScopesScene>) {
+  const { filters, dashboards, isExpanded, isViewing } = model.useState();
+  const styles = useStyles2(getStyles);
+
+  return (
+    <div className={cx(styles.container, isExpanded && styles.containerExpanded)}>
+      <div className={cx(styles.filtersContainer, isExpanded && styles.filtersContainerExpanded)}>
+        {!isViewing && (
+          <IconButton
+            name="arrow-to-right"
+            aria-label={isExpanded ? 'Collapse scope filters' : 'Expand scope filters'}
+            className={cx(!isExpanded && styles.iconNotExpanded)}
+            data-testid="scopes-scene-toggle-expand-button"
+            onClick={() => model.toggleIsExpanded()}
+          />
+        )}
+        <filters.Component model={filters} />
+      </div>
+
+      {isExpanded && (
+        <div className={styles.dashboardsContainer} data-testid="scopes-scene-dashboards-container">
+          <dashboards.Component model={dashboards} />
+        </div>
+      )}
+    </div>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    container: css({
+      display: 'flex',
+      flexDirection: 'column',
+      gridArea: 'scopes',
+    }),
+    containerExpanded: css({
+      backgroundColor: theme.colors.background.primary,
+      height: '100%',
+    }),
+    filtersContainer: css({
+      display: 'flex',
+      flex: '0 1 auto',
+      flexDirection: 'row',
+      padding: theme.spacing(2, 2, 2, 2),
+    }),
+    filtersContainerExpanded: css({
+      borderBottom: `1px solid ${theme.colors.border.weak}`,
+      padding: theme.spacing(2),
+    }),
+    iconNotExpanded: css({
+      transform: 'scaleX(-1)',
+    }),
+    dashboardsContainer: css({
+      display: 'flex',
+      flex: '1 1 auto',
+      flexDirection: 'column',
+      gap: theme.spacing(3),
+      overflow: 'hidden',
+      padding: theme.spacing(2),
+    }),
+  };
+};
diff --git a/public/app/features/dashboard-scene/scene/ShareQueryDataProvider.test.ts b/public/app/features/dashboard-scene/scene/ShareQueryDataProvider.test.ts
deleted file mode 100644
index b1b4bbab8323e..0000000000000
--- a/public/app/features/dashboard-scene/scene/ShareQueryDataProvider.test.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { getDefaultTimeRange, LoadingState } from '@grafana/data';
-import {
-  SceneDataNode,
-  SceneFlexItem,
-  SceneFlexLayout,
-  sceneGraph,
-  SceneObjectBase,
-  SceneObjectState,
-} from '@grafana/scenes';
-
-import { activateFullSceneTree } from '../utils/test-utils';
-import { getVizPanelKeyForPanelId } from '../utils/utils';
-
-import { ShareQueryDataProvider } from './ShareQueryDataProvider';
-
-export class SceneDummyPanel extends SceneObjectBase<SceneObjectState> {}
-
-describe('ShareQueryDataProvider', () => {
-  it('Should find and subscribe to another VizPanels data provider', () => {
-    const panel = new SceneDummyPanel({
-      key: getVizPanelKeyForPanelId(2),
-      $data: new ShareQueryDataProvider({
-        query: { refId: 'A', panelId: 1 },
-      }),
-    });
-
-    const sourceData = new SceneDataNode({
-      data: {
-        series: [],
-        state: LoadingState.Done,
-        timeRange: getDefaultTimeRange(),
-        structureRev: 11,
-      },
-    });
-
-    const scene = new SceneFlexLayout({
-      children: [
-        new SceneFlexItem({
-          body: new SceneDummyPanel({
-            key: getVizPanelKeyForPanelId(1),
-            $data: sourceData,
-          }),
-        }),
-        new SceneFlexItem({ body: panel }),
-      ],
-    });
-
-    activateFullSceneTree(scene);
-
-    expect(sceneGraph.getData(panel).state.data?.structureRev).toBe(11);
-
-    sourceData.setState({ data: { ...sourceData.state.data!, structureRev: 12 } });
-
-    expect(sceneGraph.getData(panel).state.data?.structureRev).toBe(12);
-  });
-});
diff --git a/public/app/features/dashboard-scene/scene/ShareQueryDataProvider.ts b/public/app/features/dashboard-scene/scene/ShareQueryDataProvider.ts
deleted file mode 100644
index 713edc10e6f94..0000000000000
--- a/public/app/features/dashboard-scene/scene/ShareQueryDataProvider.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import { Observable, ReplaySubject, Unsubscribable } from 'rxjs';
-
-import { getDefaultTimeRange, LoadingState } from '@grafana/data';
-import {
-  SceneDataProvider,
-  SceneDataProviderResult,
-  SceneDataState,
-  SceneDataTransformer,
-  SceneDeactivationHandler,
-  SceneObject,
-  SceneObjectBase,
-} from '@grafana/scenes';
-import { DashboardQuery } from 'app/plugins/datasource/dashboard/types';
-
-import { getVizPanelKeyForPanelId } from '../utils/utils';
-
-export interface ShareQueryDataProviderState extends SceneDataState {
-  query: DashboardQuery;
-}
-
-export class ShareQueryDataProvider extends SceneObjectBase<ShareQueryDataProviderState> implements SceneDataProvider {
-  private _querySub: Unsubscribable | undefined;
-  private _sourceDataDeactivationHandler?: SceneDeactivationHandler;
-  private _results = new ReplaySubject<SceneDataProviderResult>();
-
-  constructor(state: ShareQueryDataProviderState) {
-    super(state);
-
-    this.addActivationHandler(() => {
-      // TODO handle changes to query model (changed panelId / withTransforms)
-      //this.subscribeToState(this._onStateChanged);
-
-      this._subscribeToSource();
-
-      return () => {
-        if (this._querySub) {
-          this._querySub.unsubscribe();
-        }
-        if (this._sourceDataDeactivationHandler) {
-          this._sourceDataDeactivationHandler();
-        }
-      };
-    });
-  }
-
-  public getResultsStream(): Observable<SceneDataProviderResult> {
-    return this._results;
-  }
-
-  private _subscribeToSource() {
-    const { query } = this.state;
-
-    if (this._querySub) {
-      this._querySub.unsubscribe();
-    }
-
-    if (!query.panelId) {
-      return;
-    }
-
-    const keyToFind = getVizPanelKeyForPanelId(query.panelId);
-    const source = findObjectInScene(this.getRoot(), (scene: SceneObject) => scene.state.key === keyToFind);
-
-    if (!source) {
-      console.log('Shared dashboard query refers to a panel that does not exist in the scene');
-      return;
-    }
-
-    let sourceData = source.state.$data;
-    if (!sourceData) {
-      console.log('No source data found for shared dashboard query');
-      return;
-    }
-
-    // This will activate if sourceData is part of hidden panel
-    // Also make sure the sourceData is not deactivated if hidden later
-    this._sourceDataDeactivationHandler = sourceData.activate();
-
-    if (sourceData instanceof SceneDataTransformer) {
-      if (!query.withTransforms) {
-        if (!sourceData.state.$data) {
-          throw new Error('No source inner query runner found in data transformer');
-        }
-        sourceData = sourceData.state.$data;
-      }
-    }
-
-    this._querySub = sourceData.subscribeToState((state) => {
-      this._results.next({
-        origin: this,
-        data: state.data || {
-          state: LoadingState.Done,
-          series: [],
-          timeRange: getDefaultTimeRange(),
-        },
-      });
-
-      this.setState({ data: state.data });
-    });
-
-    // Copy the initial state
-    this.setState({ data: sourceData.state.data });
-  }
-}
-
-export function findObjectInScene(scene: SceneObject, check: (scene: SceneObject) => boolean): SceneObject | null {
-  if (check(scene)) {
-    return scene;
-  }
-
-  let found: SceneObject | null = null;
-
-  scene.forEachChild((child) => {
-    let maybe = findObjectInScene(child, check);
-    if (maybe) {
-      found = maybe;
-    }
-  });
-
-  return found;
-}
diff --git a/public/app/features/dashboard-scene/scene/UnlinkLibraryPanelModal.tsx b/public/app/features/dashboard-scene/scene/UnlinkLibraryPanelModal.tsx
new file mode 100644
index 0000000000000..8dc2696a71d83
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/UnlinkLibraryPanelModal.tsx
@@ -0,0 +1,44 @@
+import React from 'react';
+
+import { SceneComponentProps, SceneObjectBase, SceneObjectRef, SceneObjectState } from '@grafana/scenes';
+
+import { ModalSceneObjectLike } from '../sharing/types';
+import { getDashboardSceneFor } from '../utils/utils';
+
+import { LibraryVizPanel } from './LibraryVizPanel';
+import { UnlinkModal } from './UnlinkModal';
+
+interface UnlinkLibraryPanelModalState extends SceneObjectState {
+  panelRef?: SceneObjectRef<LibraryVizPanel>;
+}
+
+export class UnlinkLibraryPanelModal
+  extends SceneObjectBase<UnlinkLibraryPanelModalState>
+  implements ModalSceneObjectLike
+{
+  static Component = UnlinkLibraryPanelModalRenderer;
+
+  public onDismiss = () => {
+    const dashboard = getDashboardSceneFor(this);
+    dashboard.closeModal();
+  };
+
+  public onConfirm = () => {
+    const dashboard = getDashboardSceneFor(this);
+    dashboard.unlinkLibraryPanel(this.state.panelRef!.resolve());
+    dashboard.closeModal();
+  };
+}
+
+function UnlinkLibraryPanelModalRenderer({ model }: SceneComponentProps<UnlinkLibraryPanelModal>) {
+  return (
+    <UnlinkModal
+      isOpen={true}
+      onConfirm={() => {
+        model.onConfirm();
+        model.onDismiss();
+      }}
+      onDismiss={model.onDismiss}
+    />
+  );
+}
diff --git a/public/app/features/library-panels/components/UnlinkModal/UnlinkModal.tsx b/public/app/features/dashboard-scene/scene/UnlinkModal.tsx
similarity index 100%
rename from public/app/features/library-panels/components/UnlinkModal/UnlinkModal.tsx
rename to public/app/features/dashboard-scene/scene/UnlinkModal.tsx
diff --git a/public/app/features/dashboard-scene/scene/ViewPanelScene.test.tsx b/public/app/features/dashboard-scene/scene/ViewPanelScene.test.tsx
new file mode 100644
index 0000000000000..d091433009432
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/ViewPanelScene.test.tsx
@@ -0,0 +1,65 @@
+import { LocalValueVariable, SceneGridLayout, SceneGridRow, SceneVariableSet, VizPanel } from '@grafana/scenes';
+
+import { DashboardGridItem } from './DashboardGridItem';
+import { DashboardScene } from './DashboardScene';
+import { ViewPanelScene } from './ViewPanelScene';
+
+describe('ViewPanelScene', () => {
+  it('Should build scene on activate', () => {
+    const { viewPanelScene } = buildScene();
+    viewPanelScene.activate();
+    expect(viewPanelScene.state.body).toBeDefined();
+  });
+
+  it('Should look copy row variable scope', () => {
+    const { viewPanelScene } = buildScene({ rowVariables: true, panelVariables: true });
+    viewPanelScene.activate();
+
+    const variables = viewPanelScene.state.body?.state.$variables;
+    expect(variables?.state.variables.length).toBe(2);
+  });
+});
+
+interface SceneOptions {
+  rowVariables?: boolean;
+  panelVariables?: boolean;
+}
+
+function buildScene(options?: SceneOptions) {
+  // builds a scene how it looks like after row and panel repeats are processed
+  const panel = new VizPanel({
+    key: 'panel-22',
+    $variables: options?.panelVariables
+      ? new SceneVariableSet({
+          variables: [new LocalValueVariable({ value: 'panel-var-value' })],
+        })
+      : undefined,
+  });
+
+  const dashboard = new DashboardScene({
+    body: new SceneGridLayout({
+      children: [
+        new SceneGridRow({
+          x: 0,
+          y: 10,
+          width: 24,
+          $variables: options?.rowVariables
+            ? new SceneVariableSet({
+                variables: [new LocalValueVariable({ value: 'row-var-value' })],
+              })
+            : undefined,
+          height: 1,
+          children: [
+            new DashboardGridItem({
+              body: panel,
+            }),
+          ],
+        }),
+      ],
+    }),
+  });
+
+  const viewPanelScene = new ViewPanelScene({ panelRef: panel.getRef() });
+
+  return { viewPanelScene, dashboard };
+}
diff --git a/public/app/features/dashboard-scene/scene/ViewPanelScene.tsx b/public/app/features/dashboard-scene/scene/ViewPanelScene.tsx
new file mode 100644
index 0000000000000..81dd1f6dc68c0
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/ViewPanelScene.tsx
@@ -0,0 +1,95 @@
+import React from 'react';
+
+import {
+  SceneComponentProps,
+  SceneObjectBase,
+  SceneObjectRef,
+  SceneObjectState,
+  VizPanel,
+  sceneUtils,
+  SceneVariables,
+  SceneGridRow,
+  sceneGraph,
+  SceneVariableSet,
+  SceneVariable,
+} from '@grafana/scenes';
+
+interface ViewPanelSceneState extends SceneObjectState {
+  panelRef: SceneObjectRef<VizPanel>;
+  body?: VizPanel;
+}
+
+export class ViewPanelScene extends SceneObjectBase<ViewPanelSceneState> {
+  public constructor(state: ViewPanelSceneState) {
+    super(state);
+
+    this.addActivationHandler(this._activationHandler.bind(this));
+  }
+
+  public _activationHandler() {
+    const panel = this.state.panelRef.resolve();
+    const panelState = sceneUtils.cloneSceneObjectState(panel.state, {
+      key: panel.state.key + '-view',
+      $variables: this.getScopedVariables(panel),
+    });
+
+    const body = new VizPanel(panelState);
+
+    this.setState({ body });
+
+    return () => {
+      // Make sure we preserve data state
+      if (body.state.$data) {
+        panel.setState({ $data: body.state.$data.clone() });
+      }
+    };
+  }
+
+  // In case the panel is inside a repeated row
+  private getScopedVariables(panel: VizPanel): SceneVariables | undefined {
+    const row = tryGetParentRow(panel);
+    const variables: SceneVariable[] = [];
+
+    // Because we are rendering the panel outside it's potential row context we need to copy the row (scoped) varables
+    if (row && row.state.$variables) {
+      for (const variable of row.state.$variables.state.variables) {
+        variables.push(variable.clone());
+      }
+    }
+
+    // If we have local scoped panel variables we need to add the row variables to it
+    if (panel.state.$variables) {
+      for (const variable of panel.state.$variables.state.variables) {
+        variables.push(variable.clone());
+      }
+    }
+
+    if (variables.length > 0) {
+      return new SceneVariableSet({ variables });
+    }
+
+    return undefined;
+  }
+
+  public getUrlKey() {
+    return this.state.panelRef.resolve().state.key;
+  }
+
+  public static Component = ({ model }: SceneComponentProps<ViewPanelScene>) => {
+    const { body } = model.useState();
+
+    if (!body) {
+      return null;
+    }
+
+    return <body.Component model={body} />;
+  };
+}
+
+function tryGetParentRow(panel: VizPanel): SceneGridRow | undefined {
+  try {
+    return sceneGraph.getAncestor(panel, SceneGridRow);
+  } catch {
+    return undefined;
+  }
+}
diff --git a/public/app/features/dashboard-scene/scene/hoverHeaderOffsetBehavior.ts b/public/app/features/dashboard-scene/scene/hoverHeaderOffsetBehavior.ts
new file mode 100644
index 0000000000000..9a8df0480ead2
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/hoverHeaderOffsetBehavior.ts
@@ -0,0 +1,18 @@
+import { VizPanel } from '@grafana/scenes';
+
+import { DashboardGridItem } from './DashboardGridItem';
+
+export const hoverHeaderOffsetBehavior = (grid: DashboardGridItem) => {
+  const sub = grid.subscribeToState((newState, prevState) => {
+    if ([newState.y, prevState.y].includes(0) && newState.y !== prevState.y) {
+      grid.forEachChild((child) => {
+        if (child instanceof VizPanel && child.state.hoverHeader) {
+          child.setState({ hoverHeaderOffset: grid.state.y === 0 ? 0 : undefined });
+        }
+      });
+    }
+  });
+  return () => {
+    sub.unsubscribe();
+  };
+};
diff --git a/public/app/features/dashboard-scene/scene/keyboardShortcuts.ts b/public/app/features/dashboard-scene/scene/keyboardShortcuts.ts
index 7d44ce2e6b274..99123eaf9ca80 100644
--- a/public/app/features/dashboard-scene/scene/keyboardShortcuts.ts
+++ b/public/app/features/dashboard-scene/scene/keyboardShortcuts.ts
@@ -1,13 +1,14 @@
 import { locationService } from '@grafana/runtime';
 import { sceneGraph, VizPanel } from '@grafana/scenes';
-import { OptionsWithLegend } from '@grafana/schema';
 import { KeybindingSet } from 'app/core/services/KeybindingSet';
 
 import { ShareModal } from '../sharing/ShareModal';
-import { getDashboardUrl, getInspectUrl, getViewPanelUrl, tryGetExploreUrlForPanel } from '../utils/urlBuilders';
+import { dashboardSceneGraph } from '../utils/dashboardSceneGraph';
+import { getEditPanelUrl, getInspectUrl, getViewPanelUrl, tryGetExploreUrlForPanel } from '../utils/urlBuilders';
 import { getPanelIdForVizPanel } from '../utils/utils';
 
 import { DashboardScene } from './DashboardScene';
+import { onRemovePanel, toggleVizPanelLegend } from './PanelMenuBehavior';
 
 export function setupKeyboardShortcuts(scene: DashboardScene) {
   const keybindings = new KeybindingSet();
@@ -16,7 +17,7 @@ export function setupKeyboardShortcuts(scene: DashboardScene) {
   keybindings.addBinding({
     key: 'v',
     onTrigger: withFocusedPanel(scene, (vizPanel: VizPanel) => {
-      if (!scene.state.viewPanelKey) {
+      if (!scene.state.viewPanelScene) {
         locationService.push(getViewPanelUrl(vizPanel));
       }
     }),
@@ -29,13 +30,9 @@ export function setupKeyboardShortcuts(scene: DashboardScene) {
       const sceneRoot = vizPanel.getRoot();
       if (sceneRoot instanceof DashboardScene) {
         const panelId = getPanelIdForVizPanel(vizPanel);
-        locationService.push(
-          getDashboardUrl({
-            uid: sceneRoot.state.uid,
-            subPath: `/panel-edit/${panelId}`,
-            currentQueryParams: location.search,
-          })
-        );
+        if (!scene.state.editPanel) {
+          locationService.push(getEditPanelUrl(panelId));
+        }
       }
     }),
   });
@@ -79,8 +76,66 @@ export function setupKeyboardShortcuts(scene: DashboardScene) {
     onTrigger: () => sceneGraph.getTimeRange(scene).onRefresh(),
   });
 
+  // Zoom out
+  keybindings.addBinding({
+    key: 't z',
+    onTrigger: () => {
+      handleZoomOut(scene);
+    },
+  });
+  keybindings.addBinding({
+    key: 'ctrl+z',
+    onTrigger: () => {
+      handleZoomOut(scene);
+    },
+  });
+
+  keybindings.addBinding({
+    key: 't left',
+    onTrigger: () => {
+      handleTimeRangeShift(scene, 'left');
+    },
+  });
+
+  keybindings.addBinding({
+    key: 't right',
+    onTrigger: () => {
+      handleTimeRangeShift(scene, 'right');
+    },
+  });
+
+  // Dashboard settings
+  keybindings.addBinding({
+    key: 'd s',
+    onTrigger: scene.onOpenSettings,
+  });
+
+  keybindings.addBinding({
+    key: 'mod+s',
+    onTrigger: () => scene.openSaveDrawer({}),
+  });
+
   // toggle all panel legends (TODO)
-  // delete panel (TODO when we work on editing)
+  // delete panel
+  keybindings.addBinding({
+    key: 'p r',
+    onTrigger: withFocusedPanel(scene, (vizPanel: VizPanel) => {
+      if (scene.state.isEditing) {
+        onRemovePanel(scene, vizPanel);
+      }
+    }),
+  });
+
+  // duplicate panel
+  keybindings.addBinding({
+    key: 'p d',
+    onTrigger: withFocusedPanel(scene, (vizPanel: VizPanel) => {
+      if (scene.state.isEditing) {
+        scene.duplicatePanel(vizPanel);
+      }
+    }),
+  });
+
   // toggle all exemplars (TODO)
   // collapse all rows (TODO)
   // expand all rows (TODO)
@@ -108,17 +163,22 @@ export function withFocusedPanel(scene: DashboardScene, fn: (vizPanel: VizPanel)
   };
 }
 
-export function toggleVizPanelLegend(vizPanel: VizPanel) {
-  const options = vizPanel.state.options;
-  if (hasLegendOptions(options) && typeof options.legend.showLegend === 'boolean') {
-    vizPanel.onOptionsChange({
-      legend: {
-        showLegend: options.legend.showLegend ? false : true,
-      },
-    });
-  }
+function handleZoomOut(scene: DashboardScene) {
+  const timePicker = dashboardSceneGraph.getTimePicker(scene);
+  timePicker?.onZoom();
 }
 
-function hasLegendOptions(optionsWithLegend: unknown): optionsWithLegend is OptionsWithLegend {
-  return optionsWithLegend != null && 'legend' in optionsWithLegend;
+function handleTimeRangeShift(scene: DashboardScene, direction: 'left' | 'right') {
+  const timePicker = dashboardSceneGraph.getTimePicker(scene);
+
+  if (!timePicker) {
+    return;
+  }
+
+  if (direction === 'left') {
+    timePicker.onMoveBackward();
+  }
+  if (direction === 'right') {
+    timePicker.onMoveForward();
+  }
 }
diff --git a/public/app/features/dashboard-scene/scene/row-actions/RowActions.tsx b/public/app/features/dashboard-scene/scene/row-actions/RowActions.tsx
new file mode 100644
index 0000000000000..cab936521170f
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/row-actions/RowActions.tsx
@@ -0,0 +1,209 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import {
+  SceneComponentProps,
+  SceneGridLayout,
+  SceneGridRow,
+  SceneObjectBase,
+  SceneObjectState,
+  VizPanel,
+} from '@grafana/scenes';
+import { Icon, TextLink, useStyles2 } from '@grafana/ui';
+import appEvents from 'app/core/app_events';
+import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard';
+import { ShowConfirmModalEvent } from 'app/types/events';
+
+import { getDashboardSceneFor, getQueryRunnerFor } from '../../utils/utils';
+import { DashboardGridItem } from '../DashboardGridItem';
+import { DashboardScene } from '../DashboardScene';
+import { RowRepeaterBehavior } from '../RowRepeaterBehavior';
+
+import { RowOptionsButton } from './RowOptionsButton';
+
+export interface RowActionsState extends SceneObjectState {}
+
+export class RowActions extends SceneObjectBase<RowActionsState> {
+  private updateLayout(rowClone: SceneGridRow): void {
+    const row = this.getParent();
+
+    const layout = this.getDashboard().state.body;
+
+    if (!(layout instanceof SceneGridLayout)) {
+      throw new Error('Layout is not a SceneGridLayout');
+    }
+
+    // remove the repeated rows
+    const children = layout.state.children.filter((child) => !child.state.key?.startsWith(`${row.state.key}-clone-`));
+
+    // get the index to replace later
+    const index = children.indexOf(row);
+
+    if (index === -1) {
+      throw new Error('Parent row not found in layout children');
+    }
+
+    // replace the row with the clone
+    layout.setState({
+      children: [...children.slice(0, index), rowClone, ...children.slice(index + 1)],
+    });
+  }
+
+  public getParent(): SceneGridRow {
+    if (!(this.parent instanceof SceneGridRow)) {
+      throw new Error('RowActions must have a SceneGridRow parent');
+    }
+
+    return this.parent;
+  }
+
+  public getDashboard(): DashboardScene {
+    return getDashboardSceneFor(this);
+  }
+
+  public onUpdate = (title: string, repeat?: string | null): void => {
+    const row = this.getParent();
+
+    // return early if there is no repeat
+    if (!repeat) {
+      const clone = row.clone();
+
+      // remove the row repeater behaviour, leave the rest
+      clone.setState({
+        title,
+        $behaviors: row.state.$behaviors?.filter((b) => !(b instanceof RowRepeaterBehavior)) ?? [],
+      });
+
+      this.updateLayout(clone);
+
+      return;
+    }
+
+    const children = row.state.children.map((child) => child.clone());
+
+    const newBehaviour = new RowRepeaterBehavior({
+      variableName: repeat,
+      sources: children,
+    });
+
+    // get rest of behaviors except the old row repeater, if any, and push new one
+    const behaviors = row.state.$behaviors?.filter((b) => !(b instanceof RowRepeaterBehavior)) ?? [];
+    behaviors.push(newBehaviour);
+
+    row.setState({
+      title,
+      $behaviors: behaviors,
+    });
+
+    newBehaviour.activate();
+  };
+
+  public onDelete = () => {
+    appEvents.publish(
+      new ShowConfirmModalEvent({
+        title: 'Delete row',
+        text: 'Are you sure you want to remove this row and all its panels?',
+        altActionText: 'Delete row only',
+        icon: 'trash-alt',
+        onConfirm: () => {
+          this.getDashboard().removeRow(this.getParent(), true);
+        },
+        onAltAction: () => {
+          this.getDashboard().removeRow(this.getParent());
+        },
+      })
+    );
+  };
+
+  public getWarning = () => {
+    const row = this.getParent();
+    const gridItems = row.state.children;
+
+    const isAnyPanelUsingDashboardDS = gridItems.some((gridItem) => {
+      if (!(gridItem instanceof DashboardGridItem)) {
+        return false;
+      }
+
+      const vizPanel = gridItem.state.body;
+      if (vizPanel instanceof VizPanel) {
+        const runner = getQueryRunnerFor(vizPanel);
+        return runner?.state.datasource?.uid === SHARED_DASHBOARD_QUERY;
+      }
+
+      return false;
+    });
+
+    if (isAnyPanelUsingDashboardDS) {
+      return (
+        <div>
+          <p>
+            Panels in this row use the {SHARED_DASHBOARD_QUERY} data source. These panels will reference the panel in
+            the original row, not the ones in the repeated rows.
+          </p>
+          <TextLink
+            external
+            href={
+              'https://grafana.com/docs/grafana/latest/dashboards/build-dashboards/create-dashboard/#configure-repeating-rows'
+            }
+          >
+            Learn more
+          </TextLink>
+        </div>
+      );
+    }
+
+    return undefined;
+  };
+
+  static Component = ({ model }: SceneComponentProps<RowActions>) => {
+    const dashboard = model.getDashboard();
+    const row = model.getParent();
+    const { title } = row.useState();
+    const { meta, isEditing } = dashboard.useState();
+    const styles = useStyles2(getStyles);
+
+    const behaviour = row.state.$behaviors?.find((b) => b instanceof RowRepeaterBehavior);
+
+    return (
+      <>
+        {meta.canEdit && isEditing && (
+          <>
+            <div className={styles.rowActions}>
+              <RowOptionsButton
+                title={title}
+                repeat={behaviour instanceof RowRepeaterBehavior ? behaviour.state.variableName : undefined}
+                parent={dashboard}
+                onUpdate={model.onUpdate}
+                warning={model.getWarning()}
+              />
+              <button type="button" onClick={model.onDelete} aria-label="Delete row">
+                <Icon name="trash-alt" />
+              </button>
+            </div>
+          </>
+        )}
+      </>
+    );
+  };
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    rowActions: css({
+      color: theme.colors.text.secondary,
+      lineHeight: '27px',
+
+      button: {
+        color: theme.colors.text.secondary,
+        paddingLeft: theme.spacing(2),
+        background: 'transparent',
+        border: 'none',
+
+        '&:hover': {
+          color: theme.colors.text.maxContrast,
+        },
+      },
+    }),
+  };
+};
diff --git a/public/app/features/dashboard-scene/scene/row-actions/RowOptionsButton.tsx b/public/app/features/dashboard-scene/scene/row-actions/RowOptionsButton.tsx
new file mode 100644
index 0000000000000..ef10894cf36e3
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/row-actions/RowOptionsButton.tsx
@@ -0,0 +1,50 @@
+import React from 'react';
+
+import { SceneObject } from '@grafana/scenes';
+import { Icon, ModalsController } from '@grafana/ui';
+
+import { OnRowOptionsUpdate } from './RowOptionsForm';
+import { RowOptionsModal } from './RowOptionsModal';
+
+export interface RowOptionsButtonProps {
+  title: string;
+  repeat?: string;
+  parent: SceneObject;
+  onUpdate: OnRowOptionsUpdate;
+  warning?: React.ReactNode;
+}
+
+export const RowOptionsButton = ({ repeat, title, parent, onUpdate, warning }: RowOptionsButtonProps) => {
+  const onUpdateChange = (hideModal: () => void) => (title: string, repeat?: string | null) => {
+    onUpdate(title, repeat);
+    hideModal();
+  };
+
+  return (
+    <ModalsController>
+      {({ showModal, hideModal }) => {
+        return (
+          <button
+            type="button"
+            className="pointer"
+            aria-label="Row options"
+            onClick={() => {
+              showModal(RowOptionsModal, {
+                title,
+                repeat,
+                parent,
+                onDismiss: hideModal,
+                onUpdate: onUpdateChange(hideModal),
+                warning,
+              });
+            }}
+          >
+            <Icon name="cog" />
+          </button>
+        );
+      }}
+    </ModalsController>
+  );
+};
+
+RowOptionsButton.displayName = 'RowOptionsButton';
diff --git a/public/app/features/dashboard-scene/scene/row-actions/RowOptionsForm.test.tsx b/public/app/features/dashboard-scene/scene/row-actions/RowOptionsForm.test.tsx
new file mode 100644
index 0000000000000..c6bcf17fb937d
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/row-actions/RowOptionsForm.test.tsx
@@ -0,0 +1,51 @@
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+import { TestProvider } from 'test/helpers/TestProvider';
+
+import { selectors } from '@grafana/e2e-selectors';
+
+import { DashboardScene } from '../DashboardScene';
+
+import { RowOptionsForm } from './RowOptionsForm';
+
+jest.mock('app/features/dashboard/components/RepeatRowSelect/RepeatRowSelect', () => ({
+  RepeatRowSelect2: () => <div />,
+}));
+describe('DashboardRow', () => {
+  const scene = new DashboardScene({
+    title: 'hello',
+    uid: 'dash-1',
+    meta: {
+      canEdit: true,
+    },
+  });
+
+  it('Should show warning component when has warningMessage prop', () => {
+    render(
+      <TestProvider>
+        <RowOptionsForm
+          repeat={'3'}
+          parent={scene}
+          title=""
+          onCancel={jest.fn()}
+          onUpdate={jest.fn()}
+          warning="a warning message"
+        />
+      </TestProvider>
+    );
+    expect(
+      screen.getByTestId(selectors.pages.Dashboard.Rows.Repeated.ConfigSection.warningMessage)
+    ).toBeInTheDocument();
+  });
+
+  it('Should not show warning component when does not have warningMessage prop', () => {
+    render(
+      <TestProvider>
+        <RowOptionsForm repeat={'3'} parent={scene} title="" onCancel={jest.fn()} onUpdate={jest.fn()} />
+      </TestProvider>
+    );
+    expect(
+      screen.queryByTestId(selectors.pages.Dashboard.Rows.Repeated.ConfigSection.warningMessage)
+    ).not.toBeInTheDocument();
+  });
+});
diff --git a/public/app/features/dashboard-scene/scene/row-actions/RowOptionsForm.tsx b/public/app/features/dashboard-scene/scene/row-actions/RowOptionsForm.tsx
new file mode 100644
index 0000000000000..538a35382e7ee
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/row-actions/RowOptionsForm.tsx
@@ -0,0 +1,61 @@
+import React, { useCallback, useState } from 'react';
+import { useForm } from 'react-hook-form';
+
+import { selectors } from '@grafana/e2e-selectors';
+import { SceneObject } from '@grafana/scenes';
+import { Button, Field, Modal, Input, Alert } from '@grafana/ui';
+import { RepeatRowSelect2 } from 'app/features/dashboard/components/RepeatRowSelect/RepeatRowSelect';
+
+export type OnRowOptionsUpdate = (title: string, repeat?: string | null) => void;
+
+export interface Props {
+  title: string;
+  repeat?: string;
+  parent: SceneObject;
+  onUpdate: OnRowOptionsUpdate;
+  onCancel: () => void;
+  warning?: React.ReactNode;
+}
+
+export const RowOptionsForm = ({ repeat, title, parent, warning, onUpdate, onCancel }: Props) => {
+  const [newRepeat, setNewRepeat] = useState<string | undefined>(repeat);
+  const onChangeRepeat = useCallback((name?: string) => setNewRepeat(name), [setNewRepeat]);
+
+  const { handleSubmit, register } = useForm({
+    defaultValues: {
+      title,
+    },
+  });
+
+  const submit = (formData: { title: string }) => {
+    onUpdate(formData.title, newRepeat);
+  };
+
+  return (
+    <form onSubmit={handleSubmit(submit)}>
+      <Field label="Title">
+        <Input {...register('title')} type="text" />
+      </Field>
+      <Field label="Repeat for">
+        <RepeatRowSelect2 parent={parent} repeat={newRepeat} onChange={onChangeRepeat} />
+      </Field>
+      {warning && (
+        <Alert
+          data-testid={selectors.pages.Dashboard.Rows.Repeated.ConfigSection.warningMessage}
+          severity="warning"
+          title=""
+          topSpacing={3}
+          bottomSpacing={0}
+        >
+          {warning}
+        </Alert>
+      )}
+      <Modal.ButtonRow>
+        <Button type="button" variant="secondary" onClick={onCancel} fill="outline">
+          Cancel
+        </Button>
+        <Button type="submit">Update</Button>
+      </Modal.ButtonRow>
+    </form>
+  );
+};
diff --git a/public/app/features/dashboard-scene/scene/row-actions/RowOptionsModal.tsx b/public/app/features/dashboard-scene/scene/row-actions/RowOptionsModal.tsx
new file mode 100644
index 0000000000000..2f23db9add73e
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/row-actions/RowOptionsModal.tsx
@@ -0,0 +1,40 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { SceneObject } from '@grafana/scenes';
+import { Modal, useStyles2 } from '@grafana/ui';
+
+import { OnRowOptionsUpdate, RowOptionsForm } from './RowOptionsForm';
+
+export interface RowOptionsModalProps {
+  title: string;
+  repeat?: string;
+  parent: SceneObject;
+  warning?: React.ReactNode;
+  onDismiss: () => void;
+  onUpdate: OnRowOptionsUpdate;
+}
+
+export const RowOptionsModal = ({ repeat, title, parent, onDismiss, onUpdate, warning }: RowOptionsModalProps) => {
+  const styles = useStyles2(getStyles);
+
+  return (
+    <Modal isOpen={true} title="Row options" onDismiss={onDismiss} className={styles.modal}>
+      <RowOptionsForm
+        parent={parent}
+        repeat={repeat}
+        title={title}
+        onCancel={onDismiss}
+        onUpdate={onUpdate}
+        warning={warning}
+      />
+    </Modal>
+  );
+};
+
+const getStyles = () => ({
+  modal: css({
+    label: 'RowOptionsModal',
+    width: '500px',
+  }),
+});
diff --git a/public/app/features/dashboard-scene/scene/setDashboardPanelContext.test.ts b/public/app/features/dashboard-scene/scene/setDashboardPanelContext.test.ts
index 149dce0d11958..36eb42d3a05d9 100644
--- a/public/app/features/dashboard-scene/scene/setDashboardPanelContext.test.ts
+++ b/public/app/features/dashboard-scene/scene/setDashboardPanelContext.test.ts
@@ -5,7 +5,7 @@ import { PanelContext } from '@grafana/ui';
 import { transformSaveModelToScene } from '../serialization/transformSaveModelToScene';
 import { findVizPanelByKey } from '../utils/utils';
 
-import { getAdHocFilterSetFor, setDashboardPanelContext } from './setDashboardPanelContext';
+import { getAdHocFilterVariableFor, setDashboardPanelContext } from './setDashboardPanelContext';
 
 const postFn = jest.fn();
 const putFn = jest.fn();
@@ -15,7 +15,7 @@ setBackendSrv({
   post: postFn,
   put: putFn,
   delete: deleteFn,
-} as any as BackendSrv);
+} as unknown as BackendSrv);
 
 describe('setDashboardPanelContext', () => {
   describe('canAddAnnotations', () => {
@@ -132,26 +132,26 @@ describe('setDashboardPanelContext', () => {
 
       context.onAddAdHocFilter!({ key: 'hello', value: 'world', operator: '=' });
 
-      const set = getAdHocFilterSetFor(scene, { uid: 'my-ds-uid' });
+      const variable = getAdHocFilterVariableFor(scene, { uid: 'my-ds-uid' });
 
-      expect(set.state.filters).toEqual([{ key: 'hello', value: 'world', operator: '=' }]);
+      expect(variable.state.filters).toEqual([{ key: 'hello', value: 'world', operator: '=' }]);
     });
 
     it('Should update and add filter to existing set', () => {
-      const { scene, context } = buildTestScene({ existingFilterSet: true });
+      const { scene, context } = buildTestScene({ existingFilterVariable: true });
 
-      const set = getAdHocFilterSetFor(scene, { uid: 'my-ds-uid' });
+      const variable = getAdHocFilterVariableFor(scene, { uid: 'my-ds-uid' });
 
-      set.setState({ filters: [{ key: 'existing', value: 'world', operator: '=' }] });
+      variable.setState({ filters: [{ key: 'existing', value: 'world', operator: '=' }] });
 
       context.onAddAdHocFilter!({ key: 'hello', value: 'world', operator: '=' });
 
-      expect(set.state.filters.length).toBe(2);
+      expect(variable.state.filters.length).toBe(2);
 
       // Can update existing filter value without adding a new filter
       context.onAddAdHocFilter!({ key: 'hello', value: 'world2', operator: '=' });
       // Verify existing filter value updated
-      expect(set.state.filters[1].value).toBe('world2');
+      expect(variable.state.filters[1].value).toBe('world2');
     });
   });
 });
@@ -163,7 +163,7 @@ interface SceneOptions {
   canEdit?: boolean;
   canDelete?: boolean;
   orgCanEdit?: boolean;
-  existingFilterSet?: boolean;
+  existingFilterVariable?: boolean;
 }
 
 function buildTestScene(options: SceneOptions) {
@@ -198,7 +198,7 @@ function buildTestScene(options: SceneOptions) {
         },
       ],
       templating: {
-        list: options.existingFilterSet
+        list: options.existingFilterVariable
           ? [
               {
                 type: 'adhoc',
diff --git a/public/app/features/dashboard-scene/scene/setDashboardPanelContext.ts b/public/app/features/dashboard-scene/scene/setDashboardPanelContext.ts
index 5689ee6c4e889..dbbf225c129f8 100644
--- a/public/app/features/dashboard-scene/scene/setDashboardPanelContext.ts
+++ b/public/app/features/dashboard-scene/scene/setDashboardPanelContext.ts
@@ -1,9 +1,10 @@
 import { AnnotationChangeEvent, AnnotationEventUIModel, CoreApp, DataFrame } from '@grafana/data';
-import { AdHocFilterSet, dataLayers, SceneDataLayers, VizPanel } from '@grafana/scenes';
+import { AdHocFiltersVariable, dataLayers, sceneGraph, sceneUtils, VizPanel } from '@grafana/scenes';
 import { DataSourceRef } from '@grafana/schema';
 import { AdHocFilterItem, PanelContext } from '@grafana/ui';
 import { deleteAnnotation, saveAnnotation, updateAnnotation } from 'app/features/annotations/api';
 
+import { dashboardSceneGraph } from '../utils/dashboardSceneGraph';
 import { getDashboardSceneFor, getPanelIdForVizPanel, getQueryRunnerFor } from '../utils/utils';
 
 import { DashboardScene } from './DashboardScene';
@@ -111,8 +112,8 @@ export function setDashboardPanelContext(vizPanel: VizPanel, context: PanelConte
       return;
     }
 
-    const filterSet = getAdHocFilterSetFor(dashboard, queryRunner.state.datasource);
-    updateAdHocFilterSet(filterSet, newFilter);
+    const filterVar = getAdHocFilterVariableFor(dashboard, queryRunner.state.datasource);
+    updateAdHocFilterVariable(filterVar, newFilter);
   };
 
   context.onUpdateData = (frames: DataFrame[]): Promise<boolean> => {
@@ -123,13 +124,13 @@ export function setDashboardPanelContext(vizPanel: VizPanel, context: PanelConte
 }
 
 function getBuiltInAnnotationsLayer(scene: DashboardScene): dataLayers.AnnotationsDataLayer | undefined {
+  const set = dashboardSceneGraph.getDataLayers(scene);
   // When there is no builtin annotations query we disable the ability to add annotations
-  if (scene.state.$data instanceof SceneDataLayers) {
-    for (const layer of scene.state.$data.state.layers) {
-      if (layer instanceof dataLayers.AnnotationsDataLayer) {
-        if (layer.state.isEnabled && layer.state.query.builtIn) {
-          return layer;
-        }
+
+  for (const layer of set.state.annotationLayers) {
+    if (layer instanceof dataLayers.AnnotationsDataLayer) {
+      if (layer.state.isEnabled && layer.state.query.builtIn) {
+        return layer;
       }
     }
   }
@@ -144,33 +145,38 @@ function reRunBuiltInAnnotationsLayer(scene: DashboardScene) {
   }
 }
 
-export function getAdHocFilterSetFor(scene: DashboardScene, ds: DataSourceRef | null | undefined) {
-  const controls = scene.state.controls ?? [];
+export function getAdHocFilterVariableFor(scene: DashboardScene, ds: DataSourceRef | null | undefined) {
+  const variables = sceneGraph.getVariables(scene);
 
-  for (const control of controls) {
-    if (control instanceof AdHocFilterSet) {
-      if (control.state.datasource === ds || control.state.datasource?.uid === ds?.uid) {
-        return control;
+  for (const variable of variables.state.variables) {
+    if (sceneUtils.isAdHocVariable(variable)) {
+      const filtersDs = variable.state.datasource;
+      if (filtersDs === ds || filtersDs?.uid === ds?.uid) {
+        return variable;
       }
     }
   }
 
-  const newSet = new AdHocFilterSet({ datasource: ds });
+  const newVariable = new AdHocFiltersVariable({
+    name: 'Filters',
+    datasource: ds,
+    useQueriesAsFilterForOptions: true,
+  });
 
   // Add it to the scene
-  scene.setState({
-    controls: [controls[0], newSet, ...controls.slice(1)],
+  variables.setState({
+    variables: [...variables.state.variables, newVariable],
   });
 
-  return newSet;
+  return newVariable;
 }
 
-function updateAdHocFilterSet(filterSet: AdHocFilterSet, newFilter: AdHocFilterItem) {
+function updateAdHocFilterVariable(filterVar: AdHocFiltersVariable, newFilter: AdHocFilterItem) {
   // Check if we need to update an existing filter
-  for (const filter of filterSet.state.filters) {
+  for (const filter of filterVar.state.filters) {
     if (filter.key === newFilter.key) {
-      filterSet.setState({
-        filters: filterSet.state.filters.map((f) => {
+      filterVar.setState({
+        filters: filterVar.state.filters.map((f) => {
           if (f.key === newFilter.key) {
             return newFilter;
           }
@@ -182,7 +188,7 @@ function updateAdHocFilterSet(filterSet: AdHocFilterSet, newFilter: AdHocFilterI
   }
 
   // Add new filter
-  filterSet.setState({
-    filters: [...filterSet.state.filters, newFilter],
+  filterVar.setState({
+    filters: [...filterVar.state.filters, newFilter],
   });
 }
diff --git a/public/app/features/dashboard-scene/serialization/SaveDashboardDrawer.tsx b/public/app/features/dashboard-scene/serialization/SaveDashboardDrawer.tsx
deleted file mode 100644
index 7106a9ce3cd4b..0000000000000
--- a/public/app/features/dashboard-scene/serialization/SaveDashboardDrawer.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react';
-
-import { SceneComponentProps, SceneObjectBase, SceneObjectState, SceneObjectRef } from '@grafana/scenes';
-import { Drawer } from '@grafana/ui';
-import { SaveDashboardDiff } from 'app/features/dashboard/components/SaveDashboard/SaveDashboardDiff';
-import { jsonDiff } from 'app/features/dashboard/components/VersionHistory/utils';
-
-import { DashboardScene } from '../scene/DashboardScene';
-
-import { transformSceneToSaveModel } from './transformSceneToSaveModel';
-
-interface SaveDashboardDrawerState extends SceneObjectState {
-  dashboardRef: SceneObjectRef<DashboardScene>;
-}
-
-export class SaveDashboardDrawer extends SceneObjectBase<SaveDashboardDrawerState> {
-  onClose = () => {
-    this.state.dashboardRef.resolve().setState({ overlay: undefined });
-  };
-
-  static Component = ({ model }: SceneComponentProps<SaveDashboardDrawer>) => {
-    const dashboard = model.state.dashboardRef.resolve();
-    const initialState = dashboard.getInitialState();
-    const initialScene = new DashboardScene(initialState!);
-    const initialSaveModel = transformSceneToSaveModel(initialScene);
-    const changedSaveModel = transformSceneToSaveModel(dashboard);
-
-    const diff = jsonDiff(initialSaveModel, changedSaveModel);
-
-    // let diffCount = 0;
-    // for (const d of Object.values(diff)) {
-    //   diffCount += d.length;
-    // }
-
-    return (
-      <Drawer title="Save dashboard" subtitle={dashboard.state.title} onClose={model.onClose}>
-        <SaveDashboardDiff diff={diff} oldValue={initialSaveModel} newValue={changedSaveModel} />
-      </Drawer>
-    );
-  };
-}
diff --git a/public/app/features/dashboard-scene/serialization/__snapshots__/transformSceneToSaveModel.test.ts.snap b/public/app/features/dashboard-scene/serialization/__snapshots__/transformSceneToSaveModel.test.ts.snap
index 022e3016f8955..11dc59ba56e3c 100644
--- a/public/app/features/dashboard-scene/serialization/__snapshots__/transformSceneToSaveModel.test.ts.snap
+++ b/public/app/features/dashboard-scene/serialization/__snapshots__/transformSceneToSaveModel.test.ts.snap
@@ -123,14 +123,8 @@ exports[`transformSceneToSaveModel Given a scene with rows Should transform back
 </div>",
         "mode": "markdown",
       },
-      "targets": [
-        {
-          "refId": "A",
-        },
-      ],
+      "pluginVersion": "10.2.0-pre",
       "title": "",
-      "transformations": [],
-      "transparent": false,
       "type": "text",
     },
     {
@@ -180,8 +174,8 @@ exports[`transformSceneToSaveModel Given a scene with rows Should transform back
 </div>",
             "mode": "markdown",
           },
-          "transformations": [],
-          "transparent": false,
+          "pluginVersion": "10.2.0-pre",
+          "title": "Text panel in collapsed row",
           "type": "text",
         },
       ],
@@ -189,8 +183,12 @@ exports[`transformSceneToSaveModel Given a scene with rows Should transform back
       "type": "row",
     },
   ],
-  "schemaVersion": 36,
-  "tags": [],
+  "refresh": "",
+  "schemaVersion": 39,
+  "tags": [
+    "templating",
+    "gdev",
+  ],
   "templating": {
     "list": [
       {
@@ -235,14 +233,16 @@ exports[`transformSceneToSaveModel Given a scene with rows Should transform back
     "from": "now-6h",
     "to": "now",
   },
+  "timepicker": {},
   "timezone": "",
   "title": "Repeating rows",
   "uid": "Repeating-rows-uid",
+  "version": 1,
   "weekStart": "",
 }
 `;
 
-exports[`transformSceneToSaveModel Given a simple scene with variables Should transform back to persisted model 1`] = `
+exports[`transformSceneToSaveModel Given a simple scene with custom settings Should transform back to persisted model 1`] = `
 {
   "annotations": {
     "list": [
@@ -305,17 +305,32 @@ exports[`transformSceneToSaveModel Given a simple scene with variables Should tr
       },
     ],
   },
-  "editable": true,
+  "description": "My custom description",
+  "editable": false,
   "fiscalYearStartMonth": 1,
-  "graphTooltip": 0,
+  "graphTooltip": 1,
   "id": 1351,
-  "links": [],
+  "links": [
+    {
+      "asDropdown": false,
+      "icon": "external link",
+      "includeVars": false,
+      "keepTime": false,
+      "tags": [],
+      "targetBlank": false,
+      "title": "Link 1",
+      "tooltip": "",
+      "type": "dashboards",
+      "url": "",
+    },
+  ],
   "panels": [
     {
       "datasource": {
         "type": "testdata",
         "uid": "PD8C576611E62080A",
       },
+      "description": "This is a simple time series graph",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -361,8 +376,6 @@ exports[`transformSceneToSaveModel Given a simple scene with variables Should tr
         },
       ],
       "title": "Simple time series graph ",
-      "transformations": [],
-      "transparent": false,
       "type": "timeseries",
     },
     {
@@ -408,8 +421,6 @@ exports[`transformSceneToSaveModel Given a simple scene with variables Should tr
         },
       ],
       "title": "panel inside row",
-      "transformations": [],
-      "transparent": false,
       "type": "timeseries",
     },
     {
@@ -433,21 +444,30 @@ exports[`transformSceneToSaveModel Given a simple scene with variables Should tr
         "content": "content",
         "mode": "markdown",
       },
-      "targets": [
-        {
-          "refId": "A",
-        },
-      ],
+      "pluginVersion": "10.2.0-pre",
       "title": "Transparent text panel",
-      "transformations": [],
       "transparent": true,
       "type": "text",
     },
   ],
-  "schemaVersion": 36,
-  "tags": [],
+  "refresh": "5m",
+  "schemaVersion": 39,
+  "tags": [
+    "tag1",
+    "tag2",
+  ],
   "templating": {
     "list": [
+      {
+        "baseFilters": [],
+        "datasource": {
+          "type": "prometheus",
+          "uid": "wc2AL7L7k",
+        },
+        "filters": [],
+        "name": "Filters",
+        "type": "adhoc",
+      },
       {
         "auto": true,
         "auto_count": 30,
@@ -456,8 +476,59 @@ exports[`transformSceneToSaveModel Given a simple scene with variables Should tr
           "text": "1m",
           "value": "1m",
         },
-        "hide": 2,
         "name": "intervalVar",
+        "options": [
+          {
+            "selected": true,
+            "text": "1m",
+            "value": "1m",
+          },
+          {
+            "selected": false,
+            "text": "10m",
+            "value": "10m",
+          },
+          {
+            "selected": false,
+            "text": "30m",
+            "value": "30m",
+          },
+          {
+            "selected": false,
+            "text": "1h",
+            "value": "1h",
+          },
+          {
+            "selected": false,
+            "text": "6h",
+            "value": "6h",
+          },
+          {
+            "selected": false,
+            "text": "12h",
+            "value": "12h",
+          },
+          {
+            "selected": false,
+            "text": "1d",
+            "value": "1d",
+          },
+          {
+            "selected": false,
+            "text": "7d",
+            "value": "7d",
+          },
+          {
+            "selected": false,
+            "text": "14d",
+            "value": "14d",
+          },
+          {
+            "selected": false,
+            "text": "30d",
+            "value": "30d",
+          },
+        ],
         "query": "1m,10m,30m,1h,6h,12h,1d,7d,14d,30d",
         "refresh": 2,
         "type": "interval",
@@ -496,6 +567,7 @@ exports[`transformSceneToSaveModel Given a simple scene with variables Should tr
           "text": "A",
           "value": "A",
         },
+        "definition": "*",
         "includeAll": false,
         "name": "query0",
         "options": [],
@@ -518,23 +590,387 @@ exports[`transformSceneToSaveModel Given a simple scene with variables Should tr
         "skipUrlSync": true,
         "type": "constant",
       },
+    ],
+  },
+  "time": {
+    "from": "now-5m",
+    "to": "now",
+  },
+  "timepicker": {
+    "hidden": true,
+    "refresh_intervals": [
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+    ],
+  },
+  "timezone": "America/New_York",
+  "title": "My custom title",
+  "uid": "nP8rcffGkasd",
+  "version": 2,
+  "weekStart": "monday",
+}
+`;
+
+exports[`transformSceneToSaveModel Given a simple scene with variables Should transform back to persisted model 1`] = `
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana",
+        },
+        "enable": true,
+        "hide": false,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard",
+      },
+      {
+        "datasource": {
+          "type": "testdata",
+          "uid": "gdev-testdata",
+        },
+        "enable": true,
+        "hide": false,
+        "iconColor": "red",
+        "name": "Enabled",
+        "target": {
+          "lines": 4,
+          "refId": "Anno",
+          "scenarioId": "annotations",
+        },
+      },
+      {
+        "datasource": {
+          "type": "testdata",
+          "uid": "gdev-testdata",
+        },
+        "enable": false,
+        "hide": false,
+        "iconColor": "yellow",
+        "name": "Disabled",
+        "target": {
+          "lines": 5,
+          "refId": "Anno",
+          "scenarioId": "annotations",
+        },
+      },
+      {
+        "datasource": {
+          "type": "testdata",
+          "uid": "gdev-testdata",
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "dark-purple",
+        "name": "Hidden",
+        "target": {
+          "lines": 6,
+          "refId": "Anno",
+          "scenarioId": "annotations",
+        },
+      },
+    ],
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 1,
+  "graphTooltip": 1,
+  "id": 1351,
+  "links": [],
+  "panels": [
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A",
+      },
+      "description": "This is a simple time series graph",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic",
+          },
+          "custom": {
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "lineWidth": 2,
+          },
+        },
+        "overrides": [],
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 0,
+      },
+      "id": 28,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true,
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none",
+        },
+      },
+      "targets": [
+        {
+          "alias": "series",
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A",
+          },
+          "refId": "A",
+          "scenarioId": "random_walk",
+          "seriesCount": 1,
+        },
+      ],
+      "title": "Simple time series graph ",
+      "type": "timeseries",
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 8,
+      },
+      "id": 5,
+      "panels": [],
+      "title": "Row title",
+      "type": "row",
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A",
+      },
+      "fieldConfig": {
+        "defaults": {},
+        "overrides": [],
+      },
+      "gridPos": {
+        "h": 10,
+        "w": 12,
+        "x": 0,
+        "y": 9,
+      },
+      "id": 29,
+      "options": {},
+      "targets": [
+        {
+          "alias": "series",
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A",
+          },
+          "refId": "A",
+          "scenarioId": "random_walk",
+          "seriesCount": 1,
+        },
+      ],
+      "title": "panel inside row",
+      "type": "timeseries",
+    },
+    {
+      "fieldConfig": {
+        "defaults": {},
+        "overrides": [],
+      },
+      "gridPos": {
+        "h": 10,
+        "w": 11,
+        "x": 12,
+        "y": 9,
+      },
+      "id": 25,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false,
+        },
+        "content": "content",
+        "mode": "markdown",
+      },
+      "pluginVersion": "10.2.0-pre",
+      "title": "Transparent text panel",
+      "transparent": true,
+      "type": "text",
+    },
+  ],
+  "refresh": "",
+  "schemaVersion": 39,
+  "tags": [
+    "gdev",
+    "graph-ng",
+    "demo",
+  ],
+  "templating": {
+    "list": [
       {
+        "baseFilters": [],
         "datasource": {
           "type": "prometheus",
           "uid": "wc2AL7L7k",
         },
+        "filters": [],
         "name": "Filters",
         "type": "adhoc",
       },
+      {
+        "auto": true,
+        "auto_count": 30,
+        "auto_min": "10s",
+        "current": {
+          "text": "1m",
+          "value": "1m",
+        },
+        "name": "intervalVar",
+        "options": [
+          {
+            "selected": true,
+            "text": "1m",
+            "value": "1m",
+          },
+          {
+            "selected": false,
+            "text": "10m",
+            "value": "10m",
+          },
+          {
+            "selected": false,
+            "text": "30m",
+            "value": "30m",
+          },
+          {
+            "selected": false,
+            "text": "1h",
+            "value": "1h",
+          },
+          {
+            "selected": false,
+            "text": "6h",
+            "value": "6h",
+          },
+          {
+            "selected": false,
+            "text": "12h",
+            "value": "12h",
+          },
+          {
+            "selected": false,
+            "text": "1d",
+            "value": "1d",
+          },
+          {
+            "selected": false,
+            "text": "7d",
+            "value": "7d",
+          },
+          {
+            "selected": false,
+            "text": "14d",
+            "value": "14d",
+          },
+          {
+            "selected": false,
+            "text": "30d",
+            "value": "30d",
+          },
+        ],
+        "query": "1m,10m,30m,1h,6h,12h,1d,7d,14d,30d",
+        "refresh": 2,
+        "type": "interval",
+      },
+      {
+        "current": {
+          "text": [
+            "a",
+          ],
+          "value": [
+            "a",
+          ],
+        },
+        "includeAll": true,
+        "multi": true,
+        "name": "customVar",
+        "options": [],
+        "query": "a, b, c",
+        "type": "custom",
+      },
+      {
+        "current": {
+          "text": "gdev-testdata",
+          "value": "PD8C576611E62080A",
+        },
+        "includeAll": false,
+        "name": "dsVar",
+        "options": [],
+        "query": "grafana-testdata-datasource",
+        "refresh": 1,
+        "regex": "",
+        "type": "datasource",
+      },
+      {
+        "current": {
+          "text": "A",
+          "value": "A",
+        },
+        "definition": "*",
+        "includeAll": false,
+        "name": "query0",
+        "options": [],
+        "query": {
+          "query": "*",
+          "refId": "StandardVariableQuery",
+        },
+        "refresh": 1,
+        "regex": "",
+        "type": "query",
+      },
+      {
+        "current": {
+          "text": "test",
+          "value": "test",
+        },
+        "hide": 2,
+        "name": "constant",
+        "query": "test",
+        "skipUrlSync": true,
+        "type": "constant",
+      },
     ],
   },
   "time": {
     "from": "now-5m",
     "to": "now",
   },
+  "timepicker": {
+    "refresh_intervals": [
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d",
+    ],
+  },
   "timezone": "America/New_York",
   "title": "Dashboard to load1",
   "uid": "nP8rcffGkasd",
+  "version": 2,
   "weekStart": "saturday",
 }
 `;
diff --git a/public/app/features/dashboard-scene/serialization/angularMigration.test.ts b/public/app/features/dashboard-scene/serialization/angularMigration.test.ts
index c8a8d8908898c..5f5ec560a9d28 100644
--- a/public/app/features/dashboard-scene/serialization/angularMigration.test.ts
+++ b/public/app/features/dashboard-scene/serialization/angularMigration.test.ts
@@ -1,3 +1,4 @@
+import { PanelTypeChangedHandler } from '@grafana/data';
 import { getPanelPlugin } from '@grafana/data/test/__mocks__/pluginMocks';
 import { PanelModel } from 'app/features/dashboard/state';
 
@@ -6,12 +7,12 @@ import { getAngularPanelMigrationHandler } from './angularMigration';
 describe('getAngularPanelMigrationHandler', () => {
   describe('Given an old angular panel', () => {
     it('Should call migration handler', () => {
-      const onPanelTypeChanged = (panel: PanelModel, prevPluginId: string, prevOptions: Record<string, any>) => {
+      const onPanelTypeChanged: PanelTypeChangedHandler = (panel, prevPluginId, prevOptions) => {
         panel.fieldConfig = { defaults: { unit: 'bytes' }, overrides: [] };
         return { name: prevOptions.angular.oldOptionProp };
       };
 
-      const reactPlugin = getPanelPlugin({ id: 'timeseries' }).setPanelChangeHandler(onPanelTypeChanged as any);
+      const reactPlugin = getPanelPlugin({ id: 'timeseries' }).setPanelChangeHandler(onPanelTypeChanged);
 
       const oldModel = new PanelModel({
         autoMigrateFrom: 'graph',
@@ -32,4 +33,24 @@ describe('getAngularPanelMigrationHandler', () => {
       expect(mutatedModel.fieldConfig).toEqual({ defaults: { unit: 'bytes' }, overrides: [] });
     });
   });
+
+  describe('Given a react panel with old angular properties', () => {
+    it('Should pass panel model with old angular properties', () => {
+      const reactPlugin = getPanelPlugin({ id: 'dashlist' });
+
+      const oldModel = new PanelModel({
+        angularProp: 'old name',
+        type: 'dashlist',
+      });
+
+      const mutatedModel: any = {
+        type: 'dashlist',
+        options: {},
+      };
+
+      getAngularPanelMigrationHandler(oldModel)(mutatedModel, reactPlugin);
+
+      expect(mutatedModel.angularProp).toEqual('old name');
+    });
+  });
 });
diff --git a/public/app/features/dashboard-scene/serialization/angularMigration.ts b/public/app/features/dashboard-scene/serialization/angularMigration.ts
index 0eb88a3288684..82115f1365f80 100644
--- a/public/app/features/dashboard-scene/serialization/angularMigration.ts
+++ b/public/app/features/dashboard-scene/serialization/angularMigration.ts
@@ -1,3 +1,5 @@
+import { defaults } from 'lodash';
+
 import { PanelModel as PanelModelFromData, PanelPlugin } from '@grafana/data';
 import { autoMigrateAngular, PanelModel } from 'app/features/dashboard/state/PanelModel';
 
@@ -8,6 +10,10 @@ export function getAngularPanelMigrationHandler(oldModel: PanelModel) {
       return;
     }
 
+    if (!oldModel.options || Object.keys(oldModel.options).length === 0) {
+      defaults(panel, oldModel.getOptionsToRemember());
+    }
+
     if (oldModel.autoMigrateFrom) {
       const wasAngular = autoMigrateAngular[oldModel.autoMigrateFrom] != null;
       const oldOptions = oldModel.getOptionsToRemember();
diff --git a/public/app/features/dashboard-scene/serialization/buildNewDashboardSaveModel.ts b/public/app/features/dashboard-scene/serialization/buildNewDashboardSaveModel.ts
new file mode 100644
index 0000000000000..dcb7460f78859
--- /dev/null
+++ b/public/app/features/dashboard-scene/serialization/buildNewDashboardSaveModel.ts
@@ -0,0 +1,26 @@
+import { defaultDashboard } from '@grafana/schema';
+import { DashboardDTO } from 'app/types';
+
+export function buildNewDashboardSaveModel(urlFolderUid?: string): DashboardDTO {
+  const data: DashboardDTO = {
+    meta: {
+      canStar: false,
+      canShare: false,
+      canDelete: false,
+      isNew: true,
+      folderUid: '',
+    },
+    dashboard: {
+      ...defaultDashboard,
+      uid: '',
+      title: 'New dashboard',
+      panels: [],
+    },
+  };
+
+  if (urlFolderUid) {
+    data.meta.folderUid = urlFolderUid;
+  }
+
+  return data;
+}
diff --git a/public/app/features/dashboard-scene/serialization/dataLayersToAnnotations.ts b/public/app/features/dashboard-scene/serialization/dataLayersToAnnotations.ts
index 1261ec4157a4d..dd16c946c0ec6 100644
--- a/public/app/features/dashboard-scene/serialization/dataLayersToAnnotations.ts
+++ b/public/app/features/dashboard-scene/serialization/dataLayersToAnnotations.ts
@@ -7,6 +7,7 @@ export function dataLayersToAnnotations(layers: SceneDataLayerProvider[]) {
     if (!(layer instanceof dataLayers.AnnotationsDataLayer)) {
       continue;
     }
+
     const result = {
       ...layer.state.query,
       enable: Boolean(layer.state.isEnabled),
diff --git a/public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.test.ts b/public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.test.ts
index 33df731b3f031..454b7721a0619 100644
--- a/public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.test.ts
+++ b/public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.test.ts
@@ -11,9 +11,19 @@ import {
   toDataFrame,
   VariableSupportType,
 } from '@grafana/data';
-import { setRunRequest } from '@grafana/runtime';
-import { ConstantVariable, CustomVariable, DataSourceVariable, QueryVariable, SceneVariableSet } from '@grafana/scenes';
-import { DataSourceRef } from '@grafana/schema';
+import { config, setRunRequest } from '@grafana/runtime';
+import {
+  AdHocFiltersVariable,
+  ConstantVariable,
+  CustomVariable,
+  DataSourceVariable,
+  GroupByVariable,
+  IntervalVariable,
+  QueryVariable,
+  SceneVariableSet,
+  TextBoxVariable,
+} from '@grafana/scenes';
+import { DataSourceRef, VariableRefresh } from '@grafana/schema';
 
 import { sceneVariablesSetToVariables } from './sceneVariablesSetToVariables';
 
@@ -91,6 +101,7 @@ describe('sceneVariablesSetToVariables', () => {
       allValue: 'test-all',
       isMulti: true,
     });
+
     const set = new SceneVariableSet({
       variables: [variable],
     });
@@ -113,6 +124,58 @@ describe('sceneVariablesSetToVariables', () => {
         "type": "fake-std",
         "uid": "fake-std",
       },
+      "definition": undefined,
+      "description": "test-desc",
+      "includeAll": true,
+      "label": "test-label",
+      "multi": true,
+      "name": "test",
+      "options": [],
+      "query": "query",
+      "refresh": 1,
+      "regex": "",
+      "type": "query",
+    }
+    `);
+  });
+
+  it('should handle QueryVariable with definition set', () => {
+    const variable = new QueryVariable({
+      name: 'test',
+      label: 'test-label',
+      description: 'test-desc',
+      value: ['selected-value'],
+      text: ['selected-value-text'],
+      datasource: { uid: 'fake-std', type: 'fake-std' },
+      query: 'query',
+      definition: 'query',
+      includeAll: true,
+      allValue: 'test-all',
+      isMulti: true,
+    });
+    const set = new SceneVariableSet({
+      variables: [variable],
+    });
+
+    const result = sceneVariablesSetToVariables(set);
+
+    expect(result).toHaveLength(1);
+    expect(result[0]).toMatchInlineSnapshot(`
+    {
+      "allValue": "test-all",
+      "current": {
+        "text": [
+          "selected-value-text",
+        ],
+        "value": [
+          "selected-value",
+        ],
+      },
+      "datasource": {
+        "type": "fake-std",
+        "uid": "fake-std",
+      },
+      "definition": "query",
       "description": "test-desc",
       "includeAll": true,
       "label": "test-label",
@@ -215,7 +278,23 @@ describe('sceneVariablesSetToVariables', () => {
       "label": "test-label",
       "multi": true,
       "name": "test",
-      "options": [],
+      "options": [
+        {
+          "selected": true,
+          "text": "test",
+          "value": "test",
+        },
+        {
+          "selected": false,
+          "text": "test1",
+          "value": "test1",
+        },
+        {
+          "selected": true,
+          "text": "test2",
+          "value": "test2",
+        },
+      ],
       "query": "test,test1,test2",
       "type": "custom",
     }
@@ -253,4 +332,329 @@ describe('sceneVariablesSetToVariables', () => {
     }
     `);
   });
+
+  it('should handle TextBoxVariable', () => {
+    const variable = new TextBoxVariable({
+      name: 'test',
+      label: 'test-label',
+      description: 'test-desc',
+      value: 'text value',
+      skipUrlSync: true,
+    });
+    const set = new SceneVariableSet({
+      variables: [variable],
+    });
+
+    const result = sceneVariablesSetToVariables(set);
+
+    expect(result).toHaveLength(1);
+    expect(result[0]).toMatchInlineSnapshot(`
+    {
+      "current": {
+        "text": "text value",
+        "value": "text value",
+      },
+      "description": "test-desc",
+      "label": "test-label",
+      "name": "test",
+      "options": [
+        {
+          "selected": true,
+          "text": "text value",
+          "value": "text value",
+        },
+      ],
+      "query": "text value",
+      "skipUrlSync": true,
+      "type": "textbox",
+    }
+    `);
+  });
+
+  it('should handle IntervalVariable', () => {
+    const variable = new IntervalVariable({
+      intervals: ['1m', '2m', '3m', '1h', '1d'],
+      value: '1m',
+      refresh: VariableRefresh.onDashboardLoad,
+    });
+    const set = new SceneVariableSet({
+      variables: [variable],
+    });
+
+    const result = sceneVariablesSetToVariables(set);
+
+    expect(result[0]).toMatchInlineSnapshot(`
+    {
+      "auto": false,
+      "auto_count": 30,
+      "auto_min": "10s",
+      "current": {
+        "text": "1m",
+        "value": "1m",
+      },
+      "description": undefined,
+      "label": undefined,
+      "name": "",
+      "options": [
+        {
+          "selected": true,
+          "text": "1m",
+          "value": "1m",
+        },
+        {
+          "selected": false,
+          "text": "2m",
+          "value": "2m",
+        },
+        {
+          "selected": false,
+          "text": "3m",
+          "value": "3m",
+        },
+        {
+          "selected": false,
+          "text": "1h",
+          "value": "1h",
+        },
+        {
+          "selected": false,
+          "text": "1d",
+          "value": "1d",
+        },
+      ],
+      "query": "1m,2m,3m,1h,1d",
+      "refresh": 1,
+      "type": "interval",
+    }
+    `);
+  });
+
+  it('should handle AdHocFiltersVariable', () => {
+    const variable = new AdHocFiltersVariable({
+      name: 'test',
+      label: 'test-label',
+      description: 'test-desc',
+      datasource: { uid: 'fake-std', type: 'fake-std' },
+      filters: [
+        {
+          key: 'filterTest',
+          operator: '=',
+          value: 'test',
+        },
+      ],
+      baseFilters: [
+        {
+          key: 'baseFilterTest',
+          operator: '=',
+          value: 'test',
+        },
+      ],
+    });
+    const set = new SceneVariableSet({
+      variables: [variable],
+    });
+
+    const result = sceneVariablesSetToVariables(set);
+
+    expect(result).toHaveLength(1);
+    expect(result[0]).toMatchInlineSnapshot(`
+    {
+      "baseFilters": [
+        {
+          "key": "baseFilterTest",
+          "operator": "=",
+          "value": "test",
+        },
+      ],
+      "datasource": {
+        "type": "fake-std",
+        "uid": "fake-std",
+      },
+      "defaultKeys": undefined,
+      "description": "test-desc",
+      "filters": [
+        {
+          "key": "filterTest",
+          "operator": "=",
+          "value": "test",
+        },
+      ],
+      "label": "test-label",
+      "name": "test",
+      "type": "adhoc",
+    }
+    `);
+  });
+
+  it('should handle AdHocFiltersVariable with defaultKeys', () => {
+    const variable = new AdHocFiltersVariable({
+      name: 'test',
+      label: 'test-label',
+      description: 'test-desc',
+      datasource: { uid: 'fake-std', type: 'fake-std' },
+      defaultKeys: [
+        {
+          text: 'some',
+          value: '1',
+        },
+        {
+          text: 'static',
+          value: '2',
+        },
+        {
+          text: 'keys',
+          value: '3',
+        },
+      ],
+      filters: [
+        {
+          key: 'filterTest',
+          operator: '=',
+          value: 'test',
+        },
+      ],
+      baseFilters: [
+        {
+          key: 'baseFilterTest',
+          operator: '=',
+          value: 'test',
+        },
+      ],
+    });
+    const set = new SceneVariableSet({
+      variables: [variable],
+    });
+
+    const result = sceneVariablesSetToVariables(set);
+
+    expect(result).toHaveLength(1);
+    expect(result[0]).toMatchInlineSnapshot(`
+    {
+      "baseFilters": [
+        {
+          "key": "baseFilterTest",
+          "operator": "=",
+          "value": "test",
+        },
+      ],
+      "datasource": {
+        "type": "fake-std",
+        "uid": "fake-std",
+      },
+      "defaultKeys": [
+        {
+          "text": "some",
+          "value": "1",
+        },
+        {
+          "text": "static",
+          "value": "2",
+        },
+        {
+          "text": "keys",
+          "value": "3",
+        },
+      ],
+      "description": "test-desc",
+      "filters": [
+        {
+          "key": "filterTest",
+          "operator": "=",
+          "value": "test",
+        },
+      ],
+      "label": "test-label",
+      "name": "test",
+      "type": "adhoc",
+    }
+    `);
+  });
+
+  describe('when the groupByVariable feature toggle is enabled', () => {
+    beforeAll(() => {
+      config.featureToggles.groupByVariable = true;
+    });
+
+    afterAll(() => {
+      config.featureToggles.groupByVariable = false;
+    });
+
+    it('should handle GroupByVariable', () => {
+      const variable = new GroupByVariable({
+        name: 'test',
+        label: 'test-label',
+        description: 'test-desc',
+        datasource: { uid: 'fake-std', type: 'fake-std' },
+        defaultOptions: [
+          {
+            text: 'Foo',
+            value: 'foo',
+          },
+          {
+            text: 'Bar',
+            value: 'bar',
+          },
+        ],
+      });
+      const set = new SceneVariableSet({
+        variables: [variable],
+      });
+
+      const result = sceneVariablesSetToVariables(set);
+
+      expect(result).toHaveLength(1);
+      expect(result[0]).toMatchInlineSnapshot(`
+      {
+        "current": {
+          "text": [],
+          "value": [],
+        },
+        "datasource": {
+          "type": "fake-std",
+          "uid": "fake-std",
+        },
+        "description": "test-desc",
+        "label": "test-label",
+        "name": "test",
+        "options": [
+          {
+            "text": "Foo",
+            "value": "foo",
+          },
+          {
+            "text": "Bar",
+            "value": "bar",
+          },
+        ],
+        "type": "groupby",
+      }
+      `);
+    });
+  });
+
+  describe('when the groupByVariable feature toggle is disabled', () => {
+    it('should not handle GroupByVariable and throw an error', () => {
+      const variable = new GroupByVariable({
+        name: 'test',
+        label: 'test-label',
+        description: 'test-desc',
+        datasource: { uid: 'fake-std', type: 'fake-std' },
+        defaultOptions: [
+          {
+            text: 'Foo',
+            value: 'foo',
+          },
+          {
+            text: 'Bar',
+            value: 'bar',
+          },
+        ],
+      });
+      const set = new SceneVariableSet({
+        variables: [variable],
+      });
+
+      expect(() => sceneVariablesSetToVariables(set)).toThrow('Unsupported variable type');
+    });
+  });
 });
diff --git a/public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.ts b/public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.ts
index 5063c6fd5945b..1ad5608a47aaa 100644
--- a/public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.ts
+++ b/public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.ts
@@ -1,27 +1,27 @@
-import {
-  SceneVariableSet,
-  QueryVariable,
-  CustomVariable,
-  DataSourceVariable,
-  ConstantVariable,
-  IntervalVariable,
-} from '@grafana/scenes';
-import { VariableModel, VariableHide, VariableRefresh, VariableSort } from '@grafana/schema';
+import { config } from '@grafana/runtime';
+import { MultiValueVariable, SceneVariables, sceneUtils } from '@grafana/scenes';
+import { VariableHide, VariableModel, VariableOption, VariableRefresh, VariableSort } from '@grafana/schema';
 
 import { getIntervalsQueryFromNewIntervalModel } from '../utils/utils';
 
-export function sceneVariablesSetToVariables(set: SceneVariableSet) {
+export function sceneVariablesSetToVariables(set: SceneVariables) {
   const variables: VariableModel[] = [];
   for (const variable of set.state.variables) {
     const commonProperties = {
       name: variable.state.name,
       label: variable.state.label,
-      description: variable.state.description,
+      description: variable.state.description ?? undefined,
       skipUrlSync: Boolean(variable.state.skipUrlSync),
       hide: variable.state.hide || VariableHide.dontHide,
       type: variable.state.type,
     };
-    if (variable instanceof QueryVariable) {
+    if (sceneUtils.isQueryVariable(variable)) {
+      let options: VariableOption[] = [];
+      // Not sure if we actually have to still support this option given
+      // that it's not exposed in the UI
+      if (variable.state.refresh === VariableRefresh.never) {
+        options = variableValueOptionsToVariableOptions(variable.state);
+      }
       variables.push({
         ...commonProperties,
         current: {
@@ -30,8 +30,9 @@ export function sceneVariablesSetToVariables(set: SceneVariableSet) {
           // @ts-expect-error
           text: variable.state.text,
         },
-        options: [],
+        options,
         query: variable.state.query,
+        definition: variable.state.definition,
         datasource: variable.state.datasource,
         sort: variable.state.sort,
         refresh: variable.state.refresh,
@@ -40,9 +41,8 @@ export function sceneVariablesSetToVariables(set: SceneVariableSet) {
         includeAll: variable.state.includeAll,
         multi: variable.state.isMulti,
         skipUrlSync: variable.state.skipUrlSync,
-        hide: variable.state.hide || VariableHide.dontHide,
       });
-    } else if (variable instanceof CustomVariable) {
+    } else if (sceneUtils.isCustomVariable(variable)) {
       variables.push({
         ...commonProperties,
         current: {
@@ -51,13 +51,13 @@ export function sceneVariablesSetToVariables(set: SceneVariableSet) {
           // @ts-expect-error
           value: variable.state.value,
         },
-        options: [],
+        options: variableValueOptionsToVariableOptions(variable.state),
         query: variable.state.query,
         multi: variable.state.isMulti,
         allValue: variable.state.allValue,
         includeAll: variable.state.includeAll,
       });
-    } else if (variable instanceof DataSourceVariable) {
+    } else if (sceneUtils.isDataSourceVariable(variable)) {
       variables.push({
         ...commonProperties,
         current: {
@@ -74,7 +74,7 @@ export function sceneVariablesSetToVariables(set: SceneVariableSet) {
         allValue: variable.state.allValue,
         includeAll: variable.state.includeAll,
       });
-    } else if (variable instanceof ConstantVariable) {
+    } else if (sceneUtils.isConstantVariable(variable)) {
       variables.push({
         ...commonProperties,
         current: {
@@ -87,7 +87,7 @@ export function sceneVariablesSetToVariables(set: SceneVariableSet) {
         query: variable.state.value,
         hide: VariableHide.hideVariable,
       });
-    } else if (variable instanceof IntervalVariable) {
+    } else if (sceneUtils.isIntervalVariable(variable)) {
       const intervals = getIntervalsQueryFromNewIntervalModel(variable.state.intervals);
       variables.push({
         ...commonProperties,
@@ -96,13 +96,56 @@ export function sceneVariablesSetToVariables(set: SceneVariableSet) {
           value: variable.state.value,
         },
         query: intervals,
-        hide: VariableHide.hideVariable,
         refresh: variable.state.refresh,
+        options: variable.state.intervals.map((interval) => ({
+          value: interval,
+          text: interval,
+          selected: interval === variable.state.value,
+        })),
         // @ts-expect-error ?? how to fix this without adding the ts-expect-error
         auto: variable.state.autoEnabled,
         auto_min: variable.state.autoMinInterval,
         auto_count: variable.state.autoStepCount,
       });
+    } else if (sceneUtils.isTextBoxVariable(variable)) {
+      const current = {
+        text: variable.state.value,
+        value: variable.state.value,
+      };
+
+      variables.push({
+        ...commonProperties,
+        current,
+        options: [{ ...current, selected: true }],
+        query: variable.state.value,
+      });
+    } else if (sceneUtils.isGroupByVariable(variable) && config.featureToggles.groupByVariable) {
+      variables.push({
+        ...commonProperties,
+        datasource: variable.state.datasource,
+        // Only persist the statically defined options
+        options: variable.state.defaultOptions?.map((option) => ({
+          text: option.text,
+          value: String(option.value),
+        })),
+        current: {
+          // @ts-expect-error
+          text: variable.state.text,
+          // @ts-expect-error
+          value: variable.state.value,
+        },
+      });
+    } else if (sceneUtils.isAdHocVariable(variable)) {
+      variables.push({
+        ...commonProperties,
+        name: variable.state.name,
+        type: 'adhoc',
+        datasource: variable.state.datasource,
+        // @ts-expect-error
+        baseFilters: variable.state.baseFilters,
+        filters: variable.state.filters,
+        defaultKeys: variable.state.defaultKeys,
+      });
     } else {
       throw new Error('Unsupported variable type');
     }
@@ -133,3 +176,11 @@ export function sceneVariablesSetToVariables(set: SceneVariableSet) {
 
   return variables;
 }
+
+function variableValueOptionsToVariableOptions(varState: MultiValueVariable['state']): VariableOption[] {
+  return varState.options.map((o) => ({
+    value: String(o.value),
+    text: o.label,
+    selected: Array.isArray(varState.value) ? varState.value.includes(o.value) : varState.value === o.value,
+  }));
+}
diff --git a/public/app/features/dashboard-scene/serialization/testfiles/dashboard_to_load1.json b/public/app/features/dashboard-scene/serialization/testfiles/dashboard_to_load1.json
index 2032a958cfd4a..7226d9fe0e472 100644
--- a/public/app/features/dashboard-scene/serialization/testfiles/dashboard_to_load1.json
+++ b/public/app/features/dashboard-scene/serialization/testfiles/dashboard_to_load1.json
@@ -60,7 +60,7 @@
   },
   "editable": true,
   "fiscalYearStartMonth": 1,
-  "graphTooltip": 0,
+  "graphTooltip": 1,
   "id": 1351,
   "links": [],
   "liveNow": false,
@@ -115,6 +115,7 @@
         }
       ],
       "title": "Simple time series graph ",
+      "description": "This is a simple time series graph",
       "type": "timeseries"
     },
     {
diff --git a/public/app/features/dashboard-scene/serialization/testfiles/repeating_rows_and_panels.json b/public/app/features/dashboard-scene/serialization/testfiles/repeating_rows_and_panels.json
index 9edb41cfcc471..5c1f178bd4042 100644
--- a/public/app/features/dashboard-scene/serialization/testfiles/repeating_rows_and_panels.json
+++ b/public/app/features/dashboard-scene/serialization/testfiles/repeating_rows_and_panels.json
@@ -182,6 +182,7 @@
             "y": 26
           },
           "id": 30,
+          "title": "Text panel in collapsed row",
           "options": {
             "code": {
               "language": "plaintext",
diff --git a/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts b/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts
index 7660265d0e464..d83a1d2011476 100644
--- a/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts
+++ b/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts
@@ -1,32 +1,55 @@
-import { LoadingState } from '@grafana/data';
+import {
+  LoadingState,
+  ConstantVariableModel,
+  CustomVariableModel,
+  DataSourceVariableModel,
+  QueryVariableModel,
+  IntervalVariableModel,
+  TypedVariableModel,
+  TextBoxVariableModel,
+  GroupByVariableModel,
+} from '@grafana/data';
 import { getPanelPlugin } from '@grafana/data/test/__mocks__/pluginMocks';
 import { config } from '@grafana/runtime';
 import {
-  AdHocFilterSet,
+  AdHocFiltersVariable,
   behaviors,
+  ConstantVariable,
   CustomVariable,
   DataSourceVariable,
+  GroupByVariable,
   QueryVariable,
   SceneDataLayerControls,
-  SceneDataLayers,
   SceneDataTransformer,
-  SceneGridItem,
   SceneGridLayout,
   SceneGridRow,
+  SceneQueryRunner,
   VizPanel,
 } from '@grafana/scenes';
-import { DashboardCursorSync, defaultDashboard, Panel, RowPanel, VariableType } from '@grafana/schema';
+import {
+  DashboardCursorSync,
+  defaultDashboard,
+  defaultTimePickerConfig,
+  Panel,
+  RowPanel,
+  VariableType,
+} from '@grafana/schema';
 import { DashboardModel, PanelModel } from 'app/features/dashboard/state';
 import { createPanelSaveModel } from 'app/features/dashboard/state/__fixtures__/dashboardFixtures';
 import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard';
 import { DASHBOARD_DATASOURCE_PLUGIN_ID } from 'app/plugins/datasource/dashboard/types';
+import { DashboardDataDTO } from 'app/types';
 
-import { PanelRepeaterGridItem } from '../scene/PanelRepeaterGridItem';
+import { DashboardDataLayerSet } from '../scene/DashboardDataLayerSet';
+import { DashboardGridItem } from '../scene/DashboardGridItem';
+import { LibraryVizPanel } from '../scene/LibraryVizPanel';
 import { PanelTimeRange } from '../scene/PanelTimeRange';
 import { RowRepeaterBehavior } from '../scene/RowRepeaterBehavior';
-import { ShareQueryDataProvider } from '../scene/ShareQueryDataProvider';
+import { NEW_LINK } from '../settings/links/utils';
 import { getQueryRunnerFor } from '../utils/utils';
 
+import { buildNewDashboardSaveModel } from './buildNewDashboardSaveModel';
+import { GRAFANA_DATASOURCE_REF } from './const';
 import dashboard_to_load1 from './testfiles/dashboard_to_load1.json';
 import repeatingRowsAndPanelsDashboardJson from './testfiles/repeating_rows_and_panels.json';
 import {
@@ -34,6 +57,8 @@ import {
   buildGridItemForPanel,
   createSceneVariableFromVariableModel,
   transformSaveModelToScene,
+  convertOldSnapshotToScenesSnapshot,
+  buildGridItemForLibPanel,
 } from './transformSaveModelToScene';
 
 describe('transformSaveModelToScene', () => {
@@ -47,6 +72,11 @@ describe('transformSaveModelToScene', () => {
         weekStart: 'saturday',
         fiscalYearStartMonth: 2,
         timezone: 'America/New_York',
+        timepicker: {
+          ...defaultTimePickerConfig,
+          hidden: true,
+        },
+        links: [{ ...NEW_LINK, title: 'Link 1' }],
         templating: {
           list: [
             {
@@ -82,17 +112,24 @@ describe('transformSaveModelToScene', () => {
       const oldModel = new DashboardModel(dash);
 
       const scene = createDashboardSceneFromDashboardModel(oldModel);
+      const dashboardControls = scene.state.controls!;
 
       expect(scene.state.title).toBe('test');
       expect(scene.state.uid).toBe('test-uid');
+      expect(scene.state.links).toHaveLength(1);
+      expect(scene.state.links![0].title).toBe('Link 1');
       expect(scene.state?.$timeRange?.state.value.raw).toEqual(dash.time);
       expect(scene.state?.$timeRange?.state.fiscalYearStartMonth).toEqual(2);
       expect(scene.state?.$timeRange?.state.timeZone).toEqual('America/New_York');
       expect(scene.state?.$timeRange?.state.weekStart).toEqual('saturday');
-      expect(scene.state?.$variables?.state.variables).toHaveLength(1);
-      expect(scene.state.controls).toBeDefined();
-      expect(scene.state.controls![1]).toBeInstanceOf(AdHocFilterSet);
-      expect((scene.state.controls![1] as AdHocFilterSet).state.name).toBe('CoolFilters');
+
+      expect(scene.state?.$variables?.state.variables).toHaveLength(2);
+      expect(scene.state?.$variables?.getByName('constant')).toBeInstanceOf(ConstantVariable);
+      expect(scene.state?.$variables?.getByName('CoolFilters')).toBeInstanceOf(AdHocFiltersVariable);
+      expect(dashboardControls).toBeDefined();
+
+      expect(dashboardControls.state.refreshPicker.state.intervals).toEqual(defaultTimePickerConfig.refresh_intervals);
+      expect(dashboardControls.state.hideTimeControls).toBe(true);
     });
 
     it('should apply cursor sync behavior', () => {
@@ -104,9 +141,45 @@ describe('transformSaveModelToScene', () => {
 
       const scene = createDashboardSceneFromDashboardModel(oldModel);
 
-      expect(scene.state.$behaviors).toHaveLength(1);
-      expect(scene.state.$behaviors![0]).toBeInstanceOf(behaviors.CursorSync);
-      expect((scene.state.$behaviors![0] as behaviors.CursorSync).state.sync).toEqual(DashboardCursorSync.Crosshair);
+      const cursorSync = scene.state.$behaviors?.find((b) => b instanceof behaviors.CursorSync);
+      expect(cursorSync).toBeInstanceOf(behaviors.CursorSync);
+      expect((cursorSync as behaviors.CursorSync).state.sync).toEqual(DashboardCursorSync.Crosshair);
+    });
+
+    it('should apply live now timer behavior', () => {
+      const oldModel = new DashboardModel(defaultDashboard);
+      const scene = createDashboardSceneFromDashboardModel(oldModel);
+
+      const liveNowTimer = scene.state.$behaviors?.find((b) => b instanceof behaviors.LiveNowTimer);
+      expect(liveNowTimer).toBeInstanceOf(behaviors.LiveNowTimer);
+    });
+
+    it('should initialize the Dashboard Scene with empty template variables', () => {
+      const dash = {
+        ...defaultDashboard,
+        title: 'test empty dashboard with no variables',
+        uid: 'test-uid',
+        time: { from: 'now-10h', to: 'now' },
+        weekStart: 'saturday',
+        fiscalYearStartMonth: 2,
+        timezone: 'America/New_York',
+        templating: {
+          list: [],
+        },
+      };
+      const oldModel = new DashboardModel(dash);
+
+      const scene = createDashboardSceneFromDashboardModel(oldModel);
+      expect(scene.state.$variables?.state.variables).toBeDefined();
+    });
+  });
+
+  describe('When creating a new dashboard', () => {
+    it('should initialize the DashboardScene in edit mode and dirty', () => {
+      const rsp = buildNewDashboardSaveModel();
+      const scene = transformSaveModelToScene(rsp);
+      expect(scene.state.isEditing).toBe(undefined);
+      expect(scene.state.isDirty).toBe(false);
     });
   });
 
@@ -117,12 +190,21 @@ describe('transformSaveModelToScene', () => {
         gridPos: { x: 1, y: 0, w: 12, h: 8 },
       }) as Panel;
 
+      const libPanel = createPanelSaveModel({
+        title: 'Library Panel',
+        gridPos: { x: 0, y: 0, w: 12, h: 8 },
+        libraryPanel: {
+          uid: '123',
+          name: 'My Panel',
+        },
+      });
+
       const row = createPanelSaveModel({
         title: 'test',
         type: 'row',
         gridPos: { x: 0, y: 0, w: 12, h: 1 },
         collapsed: true,
-        panels: [panel],
+        panels: [panel, libPanel],
       }) as unknown as RowPanel;
 
       const dashboard = {
@@ -141,8 +223,12 @@ describe('transformSaveModelToScene', () => {
       expect(rowScene.state.title).toEqual(row.title);
       expect(rowScene.state.y).toEqual(row.gridPos!.y);
       expect(rowScene.state.isCollapsed).toEqual(row.collapsed);
-      expect(rowScene.state.children).toHaveLength(1);
-      expect(rowScene.state.children[0]).toBeInstanceOf(SceneGridItem);
+      expect(rowScene.state.children).toHaveLength(2);
+      expect(rowScene.state.children[0]).toBeInstanceOf(DashboardGridItem);
+      expect(rowScene.state.children[1]).toBeInstanceOf(DashboardGridItem);
+      // Panels are sorted by position in the row
+      expect((rowScene.state.children[0] as DashboardGridItem).state.body!).toBeInstanceOf(LibraryVizPanel);
+      expect((rowScene.state.children[1] as DashboardGridItem).state.body!).toBeInstanceOf(VizPanel);
     });
 
     it('should create panels within expanded row', () => {
@@ -155,6 +241,16 @@ describe('transformSaveModelToScene', () => {
           y: 0,
         },
       });
+
+      const libPanelOutOfRow = createPanelSaveModel({
+        title: 'Library Panel',
+        gridPos: { x: 0, y: 8, w: 12, h: 8 },
+        libraryPanel: {
+          uid: '123',
+          name: 'My Panel',
+        },
+      });
+
       const rowWithPanel = createPanelSaveModel({
         title: 'Row with panel',
         type: 'row',
@@ -164,36 +260,48 @@ describe('transformSaveModelToScene', () => {
           h: 1,
           w: 24,
           x: 0,
-          y: 8,
+          y: 16,
         },
         // This panels array is not used if the row is not collapsed
         panels: [],
       });
+
       const panelInRow = createPanelSaveModel({
         gridPos: {
           h: 8,
           w: 12,
           x: 0,
-          y: 9,
+          y: 17,
         },
         title: 'In row 1',
       });
+
+      const libPanelInRow = createPanelSaveModel({
+        title: 'Library Panel',
+        gridPos: { x: 0, y: 25, w: 12, h: 8 },
+        libraryPanel: {
+          uid: '123',
+          name: 'My Panel',
+        },
+      });
+
       const emptyRow = createPanelSaveModel({
         collapsed: false,
         gridPos: {
           h: 1,
           w: 24,
           x: 0,
-          y: 17,
+          y: 26,
         },
         // This panels array is not used if the row is not collapsed
         panels: [],
         title: 'Empty row',
         type: 'row',
       });
+
       const dashboard = {
         ...defaultDashboard,
-        panels: [panelOutOfRow, rowWithPanel, panelInRow, emptyRow],
+        panels: [panelOutOfRow, libPanelOutOfRow, rowWithPanel, panelInRow, libPanelInRow, emptyRow],
       };
 
       const oldModel = new DashboardModel(dashboard);
@@ -201,25 +309,31 @@ describe('transformSaveModelToScene', () => {
       const scene = createDashboardSceneFromDashboardModel(oldModel);
       const body = scene.state.body as SceneGridLayout;
 
-      expect(body.state.children).toHaveLength(3);
+      expect(body.state.children).toHaveLength(4);
       expect(body).toBeInstanceOf(SceneGridLayout);
       // Panel out of row
-      expect(body.state.children[0]).toBeInstanceOf(SceneGridItem);
-      const panelOutOfRowVizPanel = body.state.children[0] as SceneGridItem;
+      expect(body.state.children[0]).toBeInstanceOf(DashboardGridItem);
+      const panelOutOfRowVizPanel = body.state.children[0] as DashboardGridItem;
       expect((panelOutOfRowVizPanel.state.body as VizPanel)?.state.title).toBe(panelOutOfRow.title);
-      // Row with panel
-      expect(body.state.children[1]).toBeInstanceOf(SceneGridRow);
-      const rowWithPanelsScene = body.state.children[1] as SceneGridRow;
+      // lib panel out of row
+      expect(body.state.children[1]).toBeInstanceOf(DashboardGridItem);
+      const panelOutOfRowLibVizPanel = body.state.children[1] as DashboardGridItem;
+      expect(panelOutOfRowLibVizPanel.state.body!).toBeInstanceOf(LibraryVizPanel);
+      // Row with panels
+      expect(body.state.children[2]).toBeInstanceOf(SceneGridRow);
+      const rowWithPanelsScene = body.state.children[2] as SceneGridRow;
       expect(rowWithPanelsScene.state.title).toBe(rowWithPanel.title);
       expect(rowWithPanelsScene.state.key).toBe('panel-10');
-      expect(rowWithPanelsScene.state.children).toHaveLength(1);
+      expect(rowWithPanelsScene.state.children).toHaveLength(2);
+      const libPanel = rowWithPanelsScene.state.children[1] as DashboardGridItem;
+      expect(libPanel.state.body!).toBeInstanceOf(LibraryVizPanel);
       // Panel within row
-      expect(rowWithPanelsScene.state.children[0]).toBeInstanceOf(SceneGridItem);
-      const panelInRowVizPanel = rowWithPanelsScene.state.children[0] as SceneGridItem;
+      expect(rowWithPanelsScene.state.children[0]).toBeInstanceOf(DashboardGridItem);
+      const panelInRowVizPanel = rowWithPanelsScene.state.children[0] as DashboardGridItem;
       expect((panelInRowVizPanel.state.body as VizPanel).state.title).toBe(panelInRow.title);
       // Empty row
-      expect(body.state.children[2]).toBeInstanceOf(SceneGridRow);
-      const emptyRowScene = body.state.children[2] as SceneGridRow;
+      expect(body.state.children[3]).toBeInstanceOf(SceneGridRow);
+      const emptyRowScene = body.state.children[3] as SceneGridRow;
       expect(emptyRowScene.state.title).toBe(emptyRow.title);
       expect(emptyRowScene.state.children).toHaveLength(0);
     });
@@ -303,6 +417,20 @@ describe('transformSaveModelToScene', () => {
       expect(vizPanel.state.hoverHeader).toEqual(true);
     });
 
+    it('should initalize the VizPanel with min interval set', () => {
+      const panel = {
+        title: '',
+        type: 'test-plugin',
+        gridPos: { x: 0, y: 0, w: 12, h: 8 },
+        interval: '20m',
+      };
+
+      const { vizPanel } = buildGridItemForTest(panel);
+
+      const queryRunner = getQueryRunnerFor(vizPanel);
+      expect(queryRunner?.state.minInterval).toBe('20m');
+    });
+
     it('should set PanelTimeRange when timeFrom or timeShift is present', () => {
       const panel = {
         type: 'test-plugin',
@@ -329,7 +457,9 @@ describe('transformSaveModelToScene', () => {
       };
 
       const { vizPanel } = buildGridItemForTest(panel);
-      expect(vizPanel.state.$data).toBeInstanceOf(ShareQueryDataProvider);
+      expect(vizPanel.state.$data).toBeInstanceOf(SceneDataTransformer);
+      expect(vizPanel.state.$data?.state.$data).toBeInstanceOf(SceneQueryRunner);
+      expect((vizPanel.state.$data?.state.$data as SceneQueryRunner).state.queries).toEqual(panel.targets);
     });
 
     it('should not set SceneQueryRunner for plugins with skipDataQuery', () => {
@@ -361,7 +491,7 @@ describe('transformSaveModelToScene', () => {
       };
 
       const gridItem = buildGridItemForPanel(new PanelModel(panel));
-      const repeater = gridItem as PanelRepeaterGridItem;
+      const repeater = gridItem as DashboardGridItem;
 
       expect(repeater.state.maxPerRow).toBe(8);
       expect(repeater.state.variableName).toBe('server');
@@ -370,11 +500,47 @@ describe('transformSaveModelToScene', () => {
       expect(repeater.state.repeatDirection).toBe('v');
       expect(repeater.state.maxPerRow).toBe(8);
     });
+
+    it('should apply query caching options to SceneQueryRunner', () => {
+      const panel = {
+        title: '',
+        type: 'test-plugin',
+        gridPos: { x: 0, y: 0, w: 12, h: 8 },
+        transparent: true,
+        cacheTimeout: '10',
+        queryCachingTTL: 200000,
+      };
+
+      const { vizPanel } = buildGridItemForTest(panel);
+      const runner = getQueryRunnerFor(vizPanel)!;
+      expect(runner.state.cacheTimeout).toBe('10');
+      expect(runner.state.queryCachingTTL).toBe(200000);
+    });
+
+    it('should convert saved lib panel to LibraryVizPanel', () => {
+      const panel = {
+        title: 'Panel',
+        gridPos: { x: 0, y: 0, w: 12, h: 8 },
+        transparent: true,
+        libraryPanel: {
+          uid: '123',
+          name: 'My Panel',
+          folderUid: '456',
+        },
+      };
+
+      const gridItem = buildGridItemForLibPanel(new PanelModel(panel))!;
+      const libVizPanel = gridItem.state.body as LibraryVizPanel;
+
+      expect(libVizPanel.state.uid).toEqual(panel.libraryPanel.uid);
+      expect(libVizPanel.state.name).toEqual(panel.libraryPanel.name);
+      expect(libVizPanel.state.title).toEqual(panel.title);
+    });
   });
 
   describe('when creating variables objects', () => {
     it('should migrate custom variable', () => {
-      const variable = {
+      const variable: CustomVariableModel = {
         current: {
           selected: false,
           text: 'a',
@@ -408,12 +574,12 @@ describe('transformSaveModelToScene', () => {
         ],
         query: 'a,b,c,d',
         skipUrlSync: false,
-        type: 'custom' as VariableType,
+        type: 'custom',
         rootStateKey: 'N4XLmH5Vz',
         id: 'query0',
         global: false,
         index: 0,
-        state: 'Done',
+        state: LoadingState.Done,
         error: null,
         description: null,
         allValue: null,
@@ -441,8 +607,8 @@ describe('transformSaveModelToScene', () => {
       });
     });
 
-    it('should migrate query variable', () => {
-      const variable = {
+    it('should migrate query variable with definition', () => {
+      const variable: QueryVariableModel = {
         allValue: null,
         current: {
           text: 'America',
@@ -453,7 +619,7 @@ describe('transformSaveModelToScene', () => {
           uid: 'P15396BDD62B2BE29',
           type: 'influxdb',
         },
-        definition: '',
+        definition: 'SHOW TAG VALUES  WITH KEY = "datacenter"',
         hide: 0,
         includeAll: false,
         label: 'Datacenter',
@@ -486,15 +652,12 @@ describe('transformSaveModelToScene', () => {
         regex: '',
         skipUrlSync: false,
         sort: 0,
-        tagValuesQuery: null,
-        tagsQuery: null,
-        type: 'query' as VariableType,
-        useTags: false,
+        type: 'query',
         rootStateKey: '000000002',
         id: 'datacenter',
         global: false,
         index: 0,
-        state: 'Done',
+        state: LoadingState.Done,
         error: null,
         description: null,
       };
@@ -525,20 +688,21 @@ describe('transformSaveModelToScene', () => {
         type: 'query',
         value: 'America',
         hide: 0,
+        definition: 'SHOW TAG VALUES  WITH KEY = "datacenter"',
       });
     });
 
     it('should migrate datasource variable', () => {
-      const variable = {
+      const variable: DataSourceVariableModel = {
         id: 'query1',
         rootStateKey: 'N4XLmH5Vz',
         name: 'query1',
-        type: 'datasource' as VariableType,
+        type: 'datasource',
         global: false,
         index: 1,
         hide: 0,
         skipUrlSync: false,
-        state: 'Done',
+        state: LoadingState.Done,
         error: null,
         description: null,
         current: {
@@ -595,12 +759,12 @@ describe('transformSaveModelToScene', () => {
     });
 
     it('should migrate constant variable', () => {
-      const variable = {
+      const variable: ConstantVariableModel = {
         hide: 2,
         label: 'constant',
         name: 'constant',
         skipUrlSync: false,
-        type: 'constant' as VariableType,
+        type: 'constant',
         rootStateKey: 'N4XLmH5Vz',
         current: {
           selected: true,
@@ -618,7 +782,7 @@ describe('transformSaveModelToScene', () => {
         id: 'constant',
         global: false,
         index: 3,
-        state: 'Done',
+        state: LoadingState.Done,
         error: null,
         description: null,
       };
@@ -638,10 +802,10 @@ describe('transformSaveModelToScene', () => {
     });
 
     it('should migrate interval variable', () => {
-      const variable = {
+      const variable: IntervalVariableModel = {
         name: 'intervalVar',
         label: 'Interval Label',
-        type: 'interval' as VariableType,
+        type: 'interval',
         rootStateKey: 'N4XLmH5Vz',
         auto: false,
         refresh: 2,
@@ -665,10 +829,11 @@ describe('transformSaveModelToScene', () => {
         index: 4,
         hide: 0,
         skipUrlSync: false,
-        state: 'Done',
+        state: LoadingState.Done,
         error: null,
         description: null,
       };
+
       const migrated = createSceneVariableFromVariableModel(variable);
       const { key, ...rest } = migrated.state;
       expect(rest).toEqual({
@@ -686,13 +851,329 @@ describe('transformSaveModelToScene', () => {
         value: '1m',
       });
     });
-    it.each(['textbox', 'system'])('should throw for unsupported (yet) variables', (type) => {
+
+    it('should migrate textbox variable', () => {
+      const variable: TextBoxVariableModel = {
+        id: 'query0',
+        global: false,
+        index: 0,
+        state: LoadingState.Done,
+        error: null,
+        name: 'textboxVar',
+        label: 'Textbox Label',
+        description: 'Textbox Description',
+        type: 'textbox',
+        rootStateKey: 'N4XLmH5Vz',
+        current: {},
+        hide: 0,
+        options: [],
+        query: 'defaultValue',
+        originalQuery: 'defaultValue',
+        skipUrlSync: false,
+      };
+
+      const migrated = createSceneVariableFromVariableModel(variable);
+      const { key, ...rest } = migrated.state;
+      expect(rest).toEqual({
+        description: 'Textbox Description',
+        hide: 0,
+        label: 'Textbox Label',
+        name: 'textboxVar',
+        skipUrlSync: false,
+        type: 'textbox',
+        value: 'defaultValue',
+      });
+    });
+
+    it('should migrate adhoc variable', () => {
+      const variable: TypedVariableModel = {
+        id: 'adhoc',
+        global: false,
+        index: 0,
+        state: LoadingState.Done,
+        error: null,
+        name: 'adhoc',
+        label: 'Adhoc Label',
+        description: 'Adhoc Description',
+        type: 'adhoc',
+        rootStateKey: 'N4XLmH5Vz',
+        datasource: {
+          uid: 'gdev-prometheus',
+          type: 'prometheus',
+        },
+        filters: [
+          {
+            key: 'filterTest',
+            operator: '=',
+            value: 'test',
+          },
+        ],
+        baseFilters: [
+          {
+            key: 'baseFilterTest',
+            operator: '=',
+            value: 'test',
+          },
+        ],
+        hide: 0,
+        skipUrlSync: false,
+      };
+
+      const migrated = createSceneVariableFromVariableModel(variable) as AdHocFiltersVariable;
+      const filterVarState = migrated.state;
+
+      expect(migrated).toBeInstanceOf(AdHocFiltersVariable);
+      expect(filterVarState).toEqual({
+        key: expect.any(String),
+        description: 'Adhoc Description',
+        hide: 0,
+        label: 'Adhoc Label',
+        name: 'adhoc',
+        skipUrlSync: false,
+        type: 'adhoc',
+        filterExpression: 'filterTest="test"',
+        filters: [{ key: 'filterTest', operator: '=', value: 'test' }],
+        baseFilters: [{ key: 'baseFilterTest', operator: '=', value: 'test' }],
+        datasource: { uid: 'gdev-prometheus', type: 'prometheus' },
+        applyMode: 'auto',
+      });
+    });
+
+    it('should migrate adhoc variable with default keys', () => {
+      const variable: TypedVariableModel = {
+        id: 'adhoc',
+        global: false,
+        index: 0,
+        state: LoadingState.Done,
+        error: null,
+        name: 'adhoc',
+        label: 'Adhoc Label',
+        description: 'Adhoc Description',
+        type: 'adhoc',
+        rootStateKey: 'N4XLmH5Vz',
+        datasource: {
+          uid: 'gdev-prometheus',
+          type: 'prometheus',
+        },
+        filters: [
+          {
+            key: 'filterTest',
+            operator: '=',
+            value: 'test',
+          },
+        ],
+        baseFilters: [
+          {
+            key: 'baseFilterTest',
+            operator: '=',
+            value: 'test',
+          },
+        ],
+        defaultKeys: [
+          {
+            text: 'some',
+            value: '1',
+          },
+          {
+            text: 'static',
+            value: '2',
+          },
+          {
+            text: 'keys',
+            value: '3',
+          },
+        ],
+        hide: 0,
+        skipUrlSync: false,
+      };
+
+      const migrated = createSceneVariableFromVariableModel(variable) as AdHocFiltersVariable;
+      const filterVarState = migrated.state;
+
+      expect(migrated).toBeInstanceOf(AdHocFiltersVariable);
+      expect(filterVarState).toEqual({
+        key: expect.any(String),
+        description: 'Adhoc Description',
+        hide: 0,
+        label: 'Adhoc Label',
+        name: 'adhoc',
+        skipUrlSync: false,
+        type: 'adhoc',
+        filterExpression: 'filterTest="test"',
+        filters: [{ key: 'filterTest', operator: '=', value: 'test' }],
+        baseFilters: [{ key: 'baseFilterTest', operator: '=', value: 'test' }],
+        datasource: { uid: 'gdev-prometheus', type: 'prometheus' },
+        applyMode: 'auto',
+        defaultKeys: [
+          {
+            text: 'some',
+            value: '1',
+          },
+          {
+            text: 'static',
+            value: '2',
+          },
+          {
+            text: 'keys',
+            value: '3',
+          },
+        ],
+      });
+    });
+
+    describe('when groupByVariable feature toggle is enabled', () => {
+      beforeAll(() => {
+        config.featureToggles.groupByVariable = true;
+      });
+
+      afterAll(() => {
+        config.featureToggles.groupByVariable = false;
+      });
+
+      it('should migrate groupby variable', () => {
+        const variable: GroupByVariableModel = {
+          id: 'groupby',
+          global: false,
+          index: 0,
+          state: LoadingState.Done,
+          error: null,
+          name: 'groupby',
+          label: 'GroupBy Label',
+          description: 'GroupBy Description',
+          type: 'groupby',
+          rootStateKey: 'N4XLmH5Vz',
+          datasource: {
+            uid: 'gdev-prometheus',
+            type: 'prometheus',
+          },
+          multi: true,
+          options: [
+            {
+              selected: false,
+              text: 'Foo',
+              value: 'foo',
+            },
+            {
+              selected: false,
+              text: 'Bar',
+              value: 'bar',
+            },
+          ],
+          current: {},
+          query: '',
+          hide: 0,
+          skipUrlSync: false,
+        };
+
+        const migrated = createSceneVariableFromVariableModel(variable) as GroupByVariable;
+        const groupbyVarState = migrated.state;
+
+        expect(migrated).toBeInstanceOf(GroupByVariable);
+        expect(groupbyVarState).toEqual({
+          key: expect.any(String),
+          description: 'GroupBy Description',
+          hide: 0,
+          defaultOptions: [
+            {
+              selected: false,
+              text: 'Foo',
+              value: 'foo',
+            },
+            {
+              selected: false,
+              text: 'Bar',
+              value: 'bar',
+            },
+          ],
+          isMulti: true,
+          layout: 'horizontal',
+          noValueOnClear: true,
+          label: 'GroupBy Label',
+          name: 'groupby',
+          skipUrlSync: false,
+          type: 'groupby',
+          baseFilters: [],
+          options: [],
+          text: [],
+          value: [],
+          datasource: { uid: 'gdev-prometheus', type: 'prometheus' },
+          applyMode: 'auto',
+        });
+      });
+    });
+
+    describe('when groupByVariable feature toggle is disabled', () => {
+      it('should not migrate groupby variable and throw an error instead', () => {
+        const variable: GroupByVariableModel = {
+          id: 'groupby',
+          global: false,
+          index: 0,
+          state: LoadingState.Done,
+          error: null,
+          name: 'groupby',
+          label: 'GroupBy Label',
+          description: 'GroupBy Description',
+          type: 'groupby',
+          rootStateKey: 'N4XLmH5Vz',
+          datasource: {
+            uid: 'gdev-prometheus',
+            type: 'prometheus',
+          },
+          multi: true,
+          options: [],
+          current: {},
+          query: '',
+          hide: 0,
+          skipUrlSync: false,
+        };
+
+        expect(() => createSceneVariableFromVariableModel(variable)).toThrow('Scenes: Unsupported variable type');
+      });
+    });
+
+    it.each(['system'])('should throw for unsupported (yet) variables', (type) => {
       const variable = {
         name: 'query0',
         type: type as VariableType,
       };
 
-      expect(() => createSceneVariableFromVariableModel(variable)).toThrow();
+      expect(() => createSceneVariableFromVariableModel(variable as TypedVariableModel)).toThrow();
+    });
+
+    it('should handle variable without current', () => {
+      // @ts-expect-error
+      const variable: TypedVariableModel = {
+        id: 'query1',
+        name: 'query1',
+        type: 'datasource',
+        global: false,
+        regex: '/^gdev/',
+        options: [],
+        query: 'prometheus',
+        multi: true,
+        includeAll: true,
+        refresh: 1,
+        allValue: 'Custom all',
+      };
+
+      const migrated = createSceneVariableFromVariableModel(variable);
+      const { key, ...rest } = migrated.state;
+
+      expect(migrated).toBeInstanceOf(DataSourceVariable);
+      expect(rest).toEqual({
+        allValue: 'Custom all',
+        defaultToAll: true,
+        includeAll: true,
+        label: undefined,
+        name: 'query1',
+        options: [],
+        pluginId: 'prometheus',
+        regex: '/^gdev/',
+        text: '',
+        type: 'datasource',
+        value: '',
+        isMulti: true,
+      });
     });
   });
 
@@ -716,35 +1197,107 @@ describe('transformSaveModelToScene', () => {
     it('Should build correct scene model', () => {
       const scene = transformSaveModelToScene({ dashboard: dashboard_to_load1 as any, meta: {} });
 
-      expect(scene.state.$data).toBeInstanceOf(SceneDataLayers);
-      expect(scene.state.controls![2]).toBeInstanceOf(SceneDataLayerControls);
+      expect(scene.state.$data).toBeInstanceOf(DashboardDataLayerSet);
+      expect(scene.state.controls!.state.variableControls[1]).toBeInstanceOf(SceneDataLayerControls);
+
+      const dataLayers = scene.state.$data as DashboardDataLayerSet;
+      expect(dataLayers.state.annotationLayers).toHaveLength(4);
+      expect(dataLayers.state.annotationLayers[0].state.name).toBe('Annotations & Alerts');
+      expect(dataLayers.state.annotationLayers[0].state.isEnabled).toBe(true);
+      expect(dataLayers.state.annotationLayers[0].state.isHidden).toBe(false);
+
+      expect(dataLayers.state.annotationLayers[1].state.name).toBe('Enabled');
+      expect(dataLayers.state.annotationLayers[1].state.isEnabled).toBe(true);
+      expect(dataLayers.state.annotationLayers[1].state.isHidden).toBe(false);
+
+      expect(dataLayers.state.annotationLayers[2].state.name).toBe('Disabled');
+      expect(dataLayers.state.annotationLayers[2].state.isEnabled).toBe(false);
+      expect(dataLayers.state.annotationLayers[2].state.isHidden).toBe(false);
+
+      expect(dataLayers.state.annotationLayers[3].state.name).toBe('Hidden');
+      expect(dataLayers.state.annotationLayers[3].state.isEnabled).toBe(true);
+      expect(dataLayers.state.annotationLayers[3].state.isHidden).toBe(true);
+    });
+  });
+
+  describe('Alerting data layer', () => {
+    it('Should add alert states data layer if unified alerting enabled', () => {
+      config.unifiedAlertingEnabled = true;
+      const scene = transformSaveModelToScene({ dashboard: dashboard_to_load1 as any, meta: {} });
+
+      expect(scene.state.$data).toBeInstanceOf(DashboardDataLayerSet);
+      expect(scene.state.controls!.state.variableControls[1]).toBeInstanceOf(SceneDataLayerControls);
+
+      const dataLayers = scene.state.$data as DashboardDataLayerSet;
+      expect(dataLayers.state.alertStatesLayer).toBeDefined();
+    });
+
+    it('Should add alert states data layer if any panel has a legacy alert defined', () => {
+      config.unifiedAlertingEnabled = false;
+      const dashboard = { ...dashboard_to_load1 } as unknown as DashboardDataDTO;
+      dashboard.panels![0].alert = {};
+      const scene = transformSaveModelToScene({ dashboard: dashboard_to_load1 as any, meta: {} });
 
-      const dataLayers = scene.state.$data as SceneDataLayers;
-      expect(dataLayers.state.layers).toHaveLength(4);
-      expect(dataLayers.state.layers[0].state.name).toBe('Annotations & Alerts');
-      expect(dataLayers.state.layers[0].state.isEnabled).toBe(true);
-      expect(dataLayers.state.layers[0].state.isHidden).toBe(false);
+      expect(scene.state.$data).toBeInstanceOf(DashboardDataLayerSet);
+      expect(scene.state.controls!.state.variableControls[1]).toBeInstanceOf(SceneDataLayerControls);
 
-      expect(dataLayers.state.layers[1].state.name).toBe('Enabled');
-      expect(dataLayers.state.layers[1].state.isEnabled).toBe(true);
-      expect(dataLayers.state.layers[1].state.isHidden).toBe(false);
+      const dataLayers = scene.state.$data as DashboardDataLayerSet;
+      expect(dataLayers.state.alertStatesLayer).toBeDefined();
+    });
+  });
 
-      expect(dataLayers.state.layers[2].state.name).toBe('Disabled');
-      expect(dataLayers.state.layers[2].state.isEnabled).toBe(false);
-      expect(dataLayers.state.layers[2].state.isHidden).toBe(false);
+  describe('when rendering a legacy snapshot as scene', () => {
+    it('should convert snapshotData to snapshot inside targets', () => {
+      const panel = createPanelSaveModel({
+        title: 'test',
+        gridPos: { x: 1, y: 0, w: 12, h: 8 },
+        // @ts-ignore
+        snapshotData: [
+          {
+            fields: [
+              {
+                name: 'Field 1',
+                type: 'time',
+                values: ['value1', 'value2'],
+                config: {},
+              },
+              {
+                name: 'Field 2',
+                type: 'number',
+                values: [1],
+                config: {},
+              },
+            ],
+          },
+        ],
+      }) as Panel;
 
-      expect(dataLayers.state.layers[3].state.name).toBe('Hidden');
-      expect(dataLayers.state.layers[3].state.isEnabled).toBe(true);
-      expect(dataLayers.state.layers[3].state.isHidden).toBe(true);
+      const oldPanelModel = new PanelModel(panel);
+      convertOldSnapshotToScenesSnapshot(oldPanelModel);
+
+      expect(oldPanelModel.snapshotData?.length).toStrictEqual(0);
+      expect(oldPanelModel.targets.length).toStrictEqual(1);
+      expect(oldPanelModel.datasource).toStrictEqual(GRAFANA_DATASOURCE_REF);
+      expect(oldPanelModel.targets[0].datasource).toStrictEqual(GRAFANA_DATASOURCE_REF);
+      expect(oldPanelModel.targets[0].queryType).toStrictEqual('snapshot');
+      // @ts-ignore
+      expect(oldPanelModel.targets[0].snapshot.length).toBe(1);
+      // @ts-ignore
+      expect(oldPanelModel.targets[0].snapshot[0].data.values).toStrictEqual([['value1', 'value2'], [1]]);
+      // @ts-ignore
+      expect(oldPanelModel.targets[0].snapshot[0].schema.fields).toStrictEqual([
+        { config: {}, name: 'Field 1', type: 'time' },
+        { config: {}, name: 'Field 2', type: 'number' },
+      ]);
     });
   });
 });
 
-function buildGridItemForTest(saveModel: Partial<Panel>): { gridItem: SceneGridItem; vizPanel: VizPanel } {
+function buildGridItemForTest(saveModel: Partial<Panel>): { gridItem: DashboardGridItem; vizPanel: VizPanel } {
   const gridItem = buildGridItemForPanel(new PanelModel(saveModel));
-  if (gridItem instanceof SceneGridItem) {
+  if (gridItem instanceof DashboardGridItem) {
     return { gridItem, vizPanel: gridItem.state.body as VizPanel };
   }
 
-  throw new Error('buildGridItemForPanel to return SceneGridItem');
+  throw new Error('buildGridItemForPanel to return DashboardGridItem');
 }
diff --git a/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.ts b/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.ts
index cd57d23a13661..e389aa2651d11 100644
--- a/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.ts
+++ b/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.ts
@@ -1,12 +1,7 @@
-import {
-  AdHocVariableModel,
-  ConstantVariableModel,
-  CustomVariableModel,
-  DataSourceVariableModel,
-  IntervalVariableModel,
-  QueryVariableModel,
-  VariableModel,
-} from '@grafana/data';
+import { uniqueId } from 'lodash';
+
+import { DataFrameDTO, DataFrameJSON, TypedVariableModel } from '@grafana/data';
+import { config } from '@grafana/runtime';
 import {
   VizPanel,
   SceneTimePicker,
@@ -22,37 +17,48 @@ import {
   ConstantVariable,
   IntervalVariable,
   SceneRefreshPicker,
-  SceneGridItem,
   SceneObject,
-  SceneControlsSpacer,
   VizPanelMenu,
   behaviors,
   VizPanelState,
   SceneGridItemLike,
-  SceneDataLayers,
   SceneDataLayerProvider,
   SceneDataLayerControls,
-  AdHocFilterSet,
+  TextBoxVariable,
+  UserActionEvent,
+  GroupByVariable,
+  AdHocFiltersVariable,
 } from '@grafana/scenes';
 import { DashboardModel, PanelModel } from 'app/features/dashboard/state';
 import { DashboardDTO } from 'app/types';
 
+import { AlertStatesDataLayer } from '../scene/AlertStatesDataLayer';
 import { DashboardAnnotationsDataLayer } from '../scene/DashboardAnnotationsDataLayer';
+import { DashboardControls } from '../scene/DashboardControls';
+import { DashboardDataLayerSet } from '../scene/DashboardDataLayerSet';
+import { DashboardGridItem, RepeatDirection } from '../scene/DashboardGridItem';
+import { registerDashboardMacro } from '../scene/DashboardMacro';
 import { DashboardScene } from '../scene/DashboardScene';
 import { LibraryVizPanel } from '../scene/LibraryVizPanel';
-import { panelMenuBehavior } from '../scene/PanelMenuBehavior';
-import { PanelRepeaterGridItem } from '../scene/PanelRepeaterGridItem';
+import { VizPanelLinks, VizPanelLinksMenu } from '../scene/PanelLinks';
+import { panelLinksBehavior, panelMenuBehavior } from '../scene/PanelMenuBehavior';
+import { PanelNotices } from '../scene/PanelNotices';
 import { PanelTimeRange } from '../scene/PanelTimeRange';
 import { RowRepeaterBehavior } from '../scene/RowRepeaterBehavior';
+import { hoverHeaderOffsetBehavior } from '../scene/hoverHeaderOffsetBehavior';
+import { RowActions } from '../scene/row-actions/RowActions';
 import { setDashboardPanelContext } from '../scene/setDashboardPanelContext';
 import { createPanelDataProvider } from '../utils/createPanelDataProvider';
+import { DashboardInteractions } from '../utils/interactions';
 import {
   getCurrentValueForOldIntervalModel,
-  getIntervalsFromOldIntervalModel,
+  getDashboardSceneFor,
+  getIntervalsFromQueryString,
   getVizPanelKeyForPanelId,
 } from '../utils/utils';
 
 import { getAngularPanelMigrationHandler } from './angularMigration';
+import { GRAFANA_DATASOURCE_REF } from './const';
 
 export interface DashboardLoaderState {
   dashboard?: DashboardScene;
@@ -60,13 +66,19 @@ export interface DashboardLoaderState {
   loadError?: string;
 }
 
+export interface SaveModelToSceneOptions {
+  isEmbedded?: boolean;
+}
+
 export function transformSaveModelToScene(rsp: DashboardDTO): DashboardScene {
   // Just to have migrations run
-  const oldModel = new DashboardModel(rsp.dashboard, rsp.meta, {
-    autoMigrateOldPanels: false,
-  });
+  const oldModel = new DashboardModel(rsp.dashboard, rsp.meta);
+
+  const scene = createDashboardSceneFromDashboardModel(oldModel);
+  // TODO: refactor createDashboardSceneFromDashboardModel to work on Dashboard schema model
+  scene.setInitialSaveModel(rsp.dashboard);
 
-  return createDashboardSceneFromDashboardModel(oldModel);
+  return scene;
 }
 
 export function createSceneObjectsForPanels(oldPanels: PanelModel[]): SceneGridItemLike[] {
@@ -100,10 +112,22 @@ export function createSceneObjectsForPanels(oldPanels: PanelModel[]): SceneGridI
       }
     } else if (panel.libraryPanel?.uid && !('model' in panel.libraryPanel)) {
       const gridItem = buildGridItemForLibPanel(panel);
-      if (gridItem) {
+
+      if (!gridItem) {
+        continue;
+      }
+
+      if (currentRow) {
+        currentRowPanels.push(gridItem);
+      } else {
         panels.push(gridItem);
       }
     } else {
+      // when rendering a snapshot created with the legacy Dashboards convert data to new snapshot format to be compatible with Scenes
+      if (panel.snapshotData) {
+        convertOldSnapshotToScenesSnapshot(panel);
+      }
+
       const panelObject = buildGridItemForPanel(panel);
 
       // when processing an expanded row, collect its panels
@@ -126,7 +150,24 @@ export function createSceneObjectsForPanels(oldPanels: PanelModel[]): SceneGridI
 function createRowFromPanelModel(row: PanelModel, content: SceneGridItemLike[]): SceneGridItemLike {
   if (Boolean(row.collapsed)) {
     if (row.panels) {
-      content = row.panels.map(buildGridItemForPanel);
+      content = row.panels.map((saveModel) => {
+        // Collapsed panels are not actually PanelModel instances
+        if (!(saveModel instanceof PanelModel)) {
+          saveModel = new PanelModel(saveModel);
+        }
+
+        if (saveModel.libraryPanel?.uid && !('model' in saveModel.libraryPanel)) {
+          const gridItem = buildGridItemForLibPanel(saveModel);
+
+          if (!gridItem) {
+            throw new Error('Failed to build grid item for library panel');
+          }
+
+          return gridItem;
+        }
+
+        return buildGridItemForPanel(saveModel);
+      });
     }
   }
 
@@ -151,30 +192,19 @@ function createRowFromPanelModel(row: PanelModel, content: SceneGridItemLike[]):
     isCollapsed: row.collapsed,
     children: children,
     $behaviors: behaviors,
+    actions: new RowActions({}),
   });
 }
 
 export function createDashboardSceneFromDashboardModel(oldModel: DashboardModel) {
-  let variables: SceneVariableSet | undefined = undefined;
-  let layers: SceneDataLayerProvider[] = [];
-  let filtersSets: AdHocFilterSet[] = [];
+  let variables: SceneVariableSet | undefined;
+  let annotationLayers: SceneDataLayerProvider[] = [];
+  let alertStatesLayer: AlertStatesDataLayer | undefined;
 
   if (oldModel.templating?.list?.length) {
     const variableObjects = oldModel.templating.list
       .map((v) => {
         try {
-          if (isAdhocVariable(v)) {
-            filtersSets.push(
-              new AdHocFilterSet({
-                name: v.name,
-                datasource: v.datasource,
-                filters: v.filters ?? [],
-                baseFilters: v.baseFilters ?? [],
-              })
-            );
-            return null;
-          }
-
           return createSceneVariableFromVariableModel(v);
         } catch (err) {
           console.error(err);
@@ -188,12 +218,18 @@ export function createDashboardSceneFromDashboardModel(oldModel: DashboardModel)
     variables = new SceneVariableSet({
       variables: variableObjects,
     });
+  } else {
+    // Create empty variable set
+    variables = new SceneVariableSet({
+      variables: [],
+    });
   }
 
-  if (oldModel.annotations?.list?.length) {
-    layers = oldModel.annotations?.list.map((a) => {
+  if (oldModel.annotations?.list?.length && !oldModel.isSnapshot()) {
+    annotationLayers = oldModel.annotations?.list.map((a) => {
       // Each annotation query is an individual data layer
       return new DashboardAnnotationsDataLayer({
+        key: uniqueId('annotations-'),
         query: a,
         name: a.name,
         isEnabled: Boolean(a.enable),
@@ -202,26 +238,35 @@ export function createDashboardSceneFromDashboardModel(oldModel: DashboardModel)
     });
   }
 
-  const controls: SceneObject[] = [
-    new VariableValueSelectors({}),
-    ...filtersSets,
-    new SceneDataLayerControls(),
-    new SceneControlsSpacer(),
-    new SceneTimePicker({}),
-    new SceneRefreshPicker({
-      refresh: oldModel.refresh,
-      intervals: oldModel.timepicker.refresh_intervals,
-    }),
-  ];
+  let shouldUseAlertStatesLayer = config.unifiedAlertingEnabled;
+  if (!shouldUseAlertStatesLayer) {
+    if (oldModel.panels.find((panel) => Boolean(panel.alert))) {
+      shouldUseAlertStatesLayer = true;
+    }
+  }
 
-  return new DashboardScene({
-    title: oldModel.title,
-    uid: oldModel.uid,
+  if (shouldUseAlertStatesLayer) {
+    alertStatesLayer = new AlertStatesDataLayer({
+      key: 'alert-states',
+      name: 'Alert States',
+    });
+  }
+
+  const dashboardScene = new DashboardScene({
+    description: oldModel.description,
+    editable: oldModel.editable,
     id: oldModel.id,
+    isDirty: false,
+    links: oldModel.links || [],
     meta: oldModel.meta,
+    tags: oldModel.tags || [],
+    title: oldModel.title,
+    uid: oldModel.uid,
+    version: oldModel.version,
     body: new SceneGridLayout({
       isLazy: true,
       children: createSceneObjectsForPanels(oldModel.panels),
+      $behaviors: [trackIfEmpty],
     }),
     $timeRange: new SceneTimeRange({
       from: oldModel.time.from,
@@ -229,34 +274,59 @@ export function createDashboardSceneFromDashboardModel(oldModel: DashboardModel)
       fiscalYearStartMonth: oldModel.fiscalYearStartMonth,
       timeZone: oldModel.timezone,
       weekStart: oldModel.weekStart,
+      UNSAFE_nowDelay: oldModel.timepicker?.nowDelay,
     }),
     $variables: variables,
     $behaviors: [
       new behaviors.CursorSync({
         sync: oldModel.graphTooltip,
       }),
+      new behaviors.SceneQueryController(),
+      registerDashboardMacro,
+      registerPanelInteractionsReporter,
+      new behaviors.LiveNowTimer({ enabled: oldModel.liveNow }),
     ],
-    $data:
-      layers.length > 0
-        ? new SceneDataLayers({
-            layers,
-          })
-        : undefined,
-    controls: controls,
+    $data: new DashboardDataLayerSet({ annotationLayers, alertStatesLayer }),
+    controls: new DashboardControls({
+      variableControls: [new VariableValueSelectors({}), new SceneDataLayerControls()],
+      timePicker: new SceneTimePicker({}),
+      refreshPicker: new SceneRefreshPicker({
+        refresh: oldModel.refresh,
+        intervals: oldModel.timepicker.refresh_intervals,
+        withText: true,
+      }),
+      hideTimeControls: oldModel.timepicker.hidden,
+    }),
   });
+
+  return dashboardScene;
 }
 
-export function createSceneVariableFromVariableModel(variable: VariableModel): SceneVariable {
+export function createSceneVariableFromVariableModel(variable: TypedVariableModel): SceneVariable {
   const commonProperties = {
     name: variable.name,
     label: variable.label,
+    description: variable.description,
   };
-  if (isCustomVariable(variable)) {
-    return new CustomVariable({
+  if (variable.type === 'adhoc') {
+    return new AdHocFiltersVariable({
       ...commonProperties,
-      value: variable.current.value,
-      text: variable.current.text,
       description: variable.description,
+      skipUrlSync: variable.skipUrlSync,
+      hide: variable.hide,
+      datasource: variable.datasource,
+      applyMode: 'auto',
+      filters: variable.filters ?? [],
+      baseFilters: variable.baseFilters ?? [],
+      defaultKeys: variable.defaultKeys,
+    });
+  }
+  if (variable.type === 'custom') {
+    return new CustomVariable({
+      ...commonProperties,
+      value: variable.current?.value ?? '',
+      text: variable.current?.text ?? '',
+
       query: variable.query,
       isMulti: variable.multi,
       allValue: variable.allValue || undefined,
@@ -265,12 +335,12 @@ export function createSceneVariableFromVariableModel(variable: VariableModel): S
       skipUrlSync: variable.skipUrlSync,
       hide: variable.hide,
     });
-  } else if (isQueryVariable(variable)) {
+  } else if (variable.type === 'query') {
     return new QueryVariable({
       ...commonProperties,
-      value: variable.current.value,
-      text: variable.current.text,
-      description: variable.description,
+      value: variable.current?.value ?? '',
+      text: variable.current?.text ?? '',
+
       query: variable.query,
       datasource: variable.datasource,
       sort: variable.sort,
@@ -282,13 +352,13 @@ export function createSceneVariableFromVariableModel(variable: VariableModel): S
       isMulti: variable.multi,
       skipUrlSync: variable.skipUrlSync,
       hide: variable.hide,
+      definition: variable.definition,
     });
-  } else if (isDataSourceVariable(variable)) {
+  } else if (variable.type === 'datasource') {
     return new DataSourceVariable({
       ...commonProperties,
-      value: variable.current.value,
-      text: variable.current.text,
-      description: variable.description,
+      value: variable.current?.value ?? '',
+      text: variable.current?.text ?? '',
       regex: variable.regex,
       pluginId: variable.query,
       allValue: variable.allValue || undefined,
@@ -298,13 +368,12 @@ export function createSceneVariableFromVariableModel(variable: VariableModel): S
       isMulti: variable.multi,
       hide: variable.hide,
     });
-  } else if (isIntervalVariable(variable)) {
-    const intervals = getIntervalsFromOldIntervalModel(variable);
+  } else if (variable.type === 'interval') {
+    const intervals = getIntervalsFromQueryString(variable.query);
     const currentInterval = getCurrentValueForOldIntervalModel(variable, intervals);
     return new IntervalVariable({
       ...commonProperties,
       value: currentInterval,
-      description: variable.description,
       intervals: intervals,
       autoEnabled: variable.auto,
       autoStepCount: variable.auto_count,
@@ -313,14 +382,42 @@ export function createSceneVariableFromVariableModel(variable: VariableModel): S
       skipUrlSync: variable.skipUrlSync,
       hide: variable.hide,
     });
-  } else if (isConstantVariable(variable)) {
+  } else if (variable.type === 'constant') {
     return new ConstantVariable({
       ...commonProperties,
-      description: variable.description,
       value: variable.query,
       skipUrlSync: variable.skipUrlSync,
       hide: variable.hide,
     });
+  } else if (variable.type === 'textbox') {
+    let val;
+    if (!variable?.current?.value) {
+      val = variable.query;
+    } else {
+      if (typeof variable.current.value === 'string') {
+        val = variable.current.value;
+      } else {
+        val = variable.current.value[0];
+      }
+    }
+
+    return new TextBoxVariable({
+      ...commonProperties,
+      value: val,
+      skipUrlSync: variable.skipUrlSync,
+      hide: variable.hide,
+    });
+  } else if (config.featureToggles.groupByVariable && variable.type === 'groupby') {
+    return new GroupByVariable({
+      ...commonProperties,
+      datasource: variable.datasource,
+      value: variable.current?.value || [],
+      text: variable.current?.text || [],
+      skipUrlSync: variable.skipUrlSync,
+      hide: variable.hide,
+      // @ts-expect-error
+      defaultOptions: variable.options,
+    });
   } else {
     throw new Error(`Scenes: Unsupported variable type ${variable.type}`);
   }
@@ -331,24 +428,48 @@ export function buildGridItemForLibPanel(panel: PanelModel) {
     return null;
   }
 
-  return new SceneGridItem({
-    body: new LibraryVizPanel({
-      title: panel.title,
-      uid: panel.libraryPanel.uid,
-      name: panel.libraryPanel.name,
-      key: getVizPanelKeyForPanelId(panel.id),
-    }),
+  const body = new LibraryVizPanel({
+    title: panel.title,
+    uid: panel.libraryPanel.uid,
+    name: panel.libraryPanel.name,
+    panelKey: getVizPanelKeyForPanelId(panel.id),
+  });
+
+  return new DashboardGridItem({
+    key: `grid-item-${panel.id}`,
     y: panel.gridPos.y,
     x: panel.gridPos.x,
     width: panel.gridPos.w,
     height: panel.gridPos.h,
+    itemHeight: panel.gridPos.h,
+    body,
   });
 }
 
-export function buildGridItemForPanel(panel: PanelModel): SceneGridItemLike {
+export function buildGridItemForPanel(panel: PanelModel): DashboardGridItem {
+  const repeatDirection: RepeatDirection = panel.repeatDirection === 'h' ? 'h' : 'v';
+  const repeatOptions = panel.repeat
+    ? {
+        variableName: panel.repeat,
+        repeatDirection,
+      }
+    : {};
+
+  const titleItems: SceneObject[] = [];
+
+  titleItems.push(
+    new VizPanelLinks({
+      rawLinks: panel.links,
+      menu: new VizPanelLinksMenu({ $behaviors: [panelLinksBehavior] }),
+    })
+  );
+
+  titleItems.push(new PanelNotices());
+
   const vizPanelState: VizPanelState = {
     key: getVizPanelKeyForPanelId(panel.id),
     title: panel.title,
+    description: panel.description,
     pluginId: panel.type,
     options: panel.options ?? {},
     fieldConfig: panel.fieldConfig,
@@ -356,14 +477,20 @@ export function buildGridItemForPanel(panel: PanelModel): SceneGridItemLike {
     displayMode: panel.transparent ? 'transparent' : undefined,
     // To be replaced with it's own option persited option instead derived
     hoverHeader: !panel.title && !panel.timeFrom && !panel.timeShift,
+    hoverHeaderOffset: (panel.gridPos?.y ?? 0) === 0 ? 0 : undefined,
     $data: createPanelDataProvider(panel),
-    menu: new VizPanelMenu({
-      $behaviors: [panelMenuBehavior],
-    }),
+    titleItems,
+
     extendPanelContext: setDashboardPanelContext,
     _UNSAFE_customMigrationHandler: getAngularPanelMigrationHandler(panel),
   };
 
+  if (!config.publicDashboardAccessToken) {
+    vizPanelState.menu = new VizPanelMenu({
+      $behaviors: [panelMenuBehavior],
+    });
+  }
+
   if (panel.timeFrom || panel.timeShift) {
     vizPanelState.$timeRange = new PanelTimeRange({
       timeFrom: panel.timeFrom,
@@ -372,36 +499,85 @@ export function buildGridItemForPanel(panel: PanelModel): SceneGridItemLike {
     });
   }
 
-  if (panel.repeat) {
-    const repeatDirection = panel.repeatDirection ?? 'h';
-    return new PanelRepeaterGridItem({
-      key: `grid-item-${panel.id}`,
-      x: panel.gridPos.x,
-      y: panel.gridPos.y,
-      width: repeatDirection === 'h' ? 24 : panel.gridPos.w,
-      height: panel.gridPos.h,
-      itemHeight: panel.gridPos.h,
-      source: new VizPanel(vizPanelState),
-      variableName: panel.repeat,
-      repeatedPanels: [],
-      repeatDirection: panel.repeatDirection,
-      maxPerRow: panel.maxPerRow,
-    });
-  }
+  const body = new VizPanel(vizPanelState);
 
-  return new SceneGridItem({
+  return new DashboardGridItem({
     key: `grid-item-${panel.id}`,
     x: panel.gridPos.x,
     y: panel.gridPos.y,
-    width: panel.gridPos.w,
+    width: repeatDirection === 'h' ? 24 : panel.gridPos.w,
     height: panel.gridPos.h,
-    body: new VizPanel(vizPanelState),
+    itemHeight: panel.gridPos.h,
+    body,
+    maxPerRow: panel.maxPerRow,
+    ...repeatOptions,
+    $behaviors: [hoverHeaderOffsetBehavior],
   });
 }
 
-const isCustomVariable = (v: VariableModel): v is CustomVariableModel => v.type === 'custom';
-const isQueryVariable = (v: VariableModel): v is QueryVariableModel => v.type === 'query';
-const isDataSourceVariable = (v: VariableModel): v is DataSourceVariableModel => v.type === 'datasource';
-const isConstantVariable = (v: VariableModel): v is ConstantVariableModel => v.type === 'constant';
-const isIntervalVariable = (v: VariableModel): v is IntervalVariableModel => v.type === 'interval';
-const isAdhocVariable = (v: VariableModel): v is AdHocVariableModel => v.type === 'adhoc';
+function registerPanelInteractionsReporter(scene: DashboardScene) {
+  // Subscriptions set with subscribeToEvent are automatically unsubscribed when the scene deactivated
+  scene.subscribeToEvent(UserActionEvent, (e) => {
+    const { interaction } = e.payload;
+    switch (interaction) {
+      case 'panel-status-message-clicked':
+        DashboardInteractions.panelStatusMessageClicked();
+        break;
+      case 'panel-cancel-query-clicked':
+        DashboardInteractions.panelCancelQueryClicked();
+        break;
+      case 'panel-menu-shown':
+        DashboardInteractions.panelMenuShown();
+        break;
+    }
+  });
+}
+
+const convertSnapshotData = (snapshotData: DataFrameDTO[]): DataFrameJSON[] => {
+  return snapshotData.map((data) => {
+    return {
+      data: {
+        values: data.fields.map((field) => field.values).filter((values): values is unknown[] => values !== undefined),
+      },
+      schema: {
+        fields: data.fields.map((field) => ({
+          name: field.name,
+          type: field.type,
+          config: field.config,
+        })),
+      },
+    };
+  });
+};
+
+// override panel datasource and targets with snapshot data using the Grafana datasource
+export const convertOldSnapshotToScenesSnapshot = (panel: PanelModel) => {
+  // only old snapshots created with old dashboards contains snapshotData
+  if (panel.snapshotData) {
+    panel.datasource = GRAFANA_DATASOURCE_REF;
+    panel.targets = [
+      {
+        refId: panel.snapshotData[0]?.refId ?? '',
+        datasource: panel.datasource,
+        queryType: 'snapshot',
+        // @ts-ignore
+        snapshot: convertSnapshotData(panel.snapshotData),
+      },
+    ];
+    panel.snapshotData = [];
+  }
+};
+
+function trackIfEmpty(grid: SceneGridLayout) {
+  getDashboardSceneFor(grid).setState({ isEmpty: grid.state.children.length === 0 });
+
+  const sub = grid.subscribeToState((n, p) => {
+    if (n.children.length !== p.children.length || n.children !== p.children) {
+      getDashboardSceneFor(grid).setState({ isEmpty: n.children.length === 0 });
+    }
+  });
+
+  return () => {
+    sub.unsubscribe();
+  };
+}
diff --git a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.test.ts b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.test.ts
index 4e5fd59503239..50e04a9e20449 100644
--- a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.test.ts
+++ b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.test.ts
@@ -1,3 +1,4 @@
+import 'whatwg-fetch';
 import { advanceTo } from 'jest-date-mock';
 import { map, of } from 'rxjs';
 
@@ -14,23 +15,21 @@ import {
   VariableSupportType,
 } from '@grafana/data';
 import { getPanelPlugin } from '@grafana/data/test/__mocks__/pluginMocks';
-import { setPluginImportUtils } from '@grafana/runtime';
-import {
-  MultiValueVariable,
-  SceneDataLayers,
-  SceneGridItemLike,
-  SceneGridLayout,
-  SceneGridRow,
-  SceneVariable,
-  VizPanel,
-} from '@grafana/scenes';
+import { getPluginLinkExtensions, setPluginImportUtils } from '@grafana/runtime';
+import { MultiValueVariable, SceneGridLayout, SceneGridRow, SceneTimeRange, VizPanel } from '@grafana/scenes';
 import { Dashboard, LoadingState, Panel, RowPanel, VariableRefresh } from '@grafana/schema';
 import { PanelModel } from 'app/features/dashboard/state';
 import { getTimeRange } from 'app/features/dashboard/utils/timeRange';
 import { reduceTransformRegistryItem } from 'app/features/transformers/editors/ReduceTransformerEditor';
 import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard';
 
+import { buildPanelEditScene } from '../panel-edit/PanelEditor';
+import { DashboardDataLayerSet } from '../scene/DashboardDataLayerSet';
+import { DashboardGridItem } from '../scene/DashboardGridItem';
+import { DashboardScene } from '../scene/DashboardScene';
+import { LibraryVizPanel } from '../scene/LibraryVizPanel';
 import { RowRepeaterBehavior } from '../scene/RowRepeaterBehavior';
+import { NEW_LINK } from '../settings/links/utils';
 import { activateFullSceneTree, buildPanelRepeaterScene } from '../utils/test-utils';
 import { getVizPanelKeyForPanelId } from '../utils/utils';
 
@@ -120,6 +119,7 @@ const runRequestMock = jest.fn().mockImplementation((ds: DataSourceApi, request:
     })
   );
 });
+
 jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
   getDataSourceSrv: () => ({
@@ -135,15 +135,65 @@ jest.mock('@grafana/runtime', () => ({
     return runRequestMock(ds, request);
   },
   config: {
-    panels: [],
+    panels: {
+      text: { skipDataQuery: true },
+    },
+    featureToggles: {
+      dataTrails: false,
+    },
     theme2: {
       visualization: {
         getColorByName: jest.fn().mockReturnValue('red'),
       },
     },
   },
+  setPluginExtensionGetter: jest.fn(),
+  getPluginLinkExtensions: jest.fn(),
 }));
+
+const getPluginLinkExtensionsMock = jest.mocked(getPluginLinkExtensions);
+
+jest.mock('@grafana/scenes', () => ({
+  ...jest.requireActual('@grafana/scenes'),
+  sceneUtils: {
+    ...jest.requireActual('@grafana/scenes').sceneUtils,
+    registerVariableMacro: jest.fn(),
+  },
+}));
+
 describe('transformSceneToSaveModel', () => {
+  beforeEach(() => {
+    getPluginLinkExtensionsMock.mockRestore();
+    getPluginLinkExtensionsMock.mockReturnValue({ extensions: [] });
+  });
+
+  describe('Given a simple scene with custom settings', () => {
+    it('Should transform back to persisted model', () => {
+      const dashboardWithCustomSettings = {
+        ...dashboard_to_load1,
+        title: 'My custom title',
+        description: 'My custom description',
+        tags: ['tag1', 'tag2'],
+        timezone: 'America/New_York',
+        weekStart: 'monday',
+        graphTooltip: 1,
+        editable: false,
+        refresh: '5m',
+        timepicker: {
+          ...dashboard_to_load1.timepicker,
+          refresh_intervals: ['5m', '15m', '30m', '1h'],
+          time_options: ['5m', '15m', '30m'],
+          hidden: true,
+        },
+        links: [{ ...NEW_LINK, title: 'Link 1' }],
+      };
+      const scene = transformSaveModelToScene({ dashboard: dashboardWithCustomSettings as any, meta: {} });
+      const saveModel = transformSceneToSaveModel(scene);
+
+      expect(saveModel).toMatchSnapshot();
+    });
+  });
+
   describe('Given a simple scene with variables', () => {
     it('Should transform back to persisted model', () => {
       const scene = transformSaveModelToScene({ dashboard: dashboard_to_load1 as any, meta: {} });
@@ -156,7 +206,9 @@ describe('transformSceneToSaveModel', () => {
   describe('Given a scene with rows', () => {
     it('Should transform back to persisted model', () => {
       const scene = transformSaveModelToScene({ dashboard: repeatingRowsAndPanelsDashboardJson as any, meta: {} });
+
       const saveModel = transformSceneToSaveModel(scene);
+
       const row2: RowPanel = saveModel.panels![2] as RowPanel;
 
       expect(row2.type).toBe('row');
@@ -175,7 +227,7 @@ describe('transformSceneToSaveModel', () => {
       const rowRepeater = rowWithRepeat.state.$behaviors![0] as RowRepeaterBehavior;
 
       // trigger row repeater
-      rowRepeater.variableDependency?.variableUpdatesCompleted(new Set<SceneVariable>([variable]));
+      rowRepeater.variableDependency?.variableUpdateCompleted(variable, true);
 
       // Make sure the repeated rows have been added to runtime scene model
       expect(grid.state.children.length).toBe(5);
@@ -208,6 +260,29 @@ describe('transformSceneToSaveModel', () => {
       expect(saveModel.transparent).toBe(true);
     });
 
+    it('interval', () => {
+      const gridItem = buildGridItemFromPanelSchema({ interval: '20m' });
+      const saveModel = gridItemToPanel(gridItem);
+
+      expect(saveModel.interval).toBe('20m');
+    });
+
+    it('With angular options', () => {
+      const gridItem = buildGridItemFromPanelSchema({});
+      const vizPanel = gridItem.state.body as VizPanel;
+      vizPanel.setState({
+        options: {
+          angularOptions: {
+            bars: true,
+          },
+        },
+      });
+
+      const saveModel = gridItemToPanel(gridItem);
+      expect(saveModel.options?.angularOptions).toBe(undefined);
+      expect((saveModel as any).bars).toBe(true);
+    });
+
     it('Given panel with repeat', () => {
       const gridItem = buildGridItemFromPanelSchema({
         title: '',
@@ -227,28 +302,78 @@ describe('transformSceneToSaveModel', () => {
       expect(saveModel.gridPos?.w).toBe(12);
       expect(saveModel.gridPos?.h).toBe(8);
     });
+    it('Given panel with links', () => {
+      const gridItem = buildGridItemFromPanelSchema({
+        title: '',
+        type: 'text-plugin-34',
+        gridPos: { x: 1, y: 2, w: 12, h: 8 },
+        links: [
+          // @ts-expect-error Panel link is wrongly typed as DashboardLink
+          {
+            title: 'Link 1',
+            url: 'http://some.test.link1',
+          },
+          // @ts-expect-error Panel link is wrongly typed as DashboardLink
+          {
+            targetBlank: true,
+            title: 'Link 2',
+            url: 'http://some.test.link2',
+          },
+        ],
+      });
+
+      const saveModel = gridItemToPanel(gridItem);
+      expect(saveModel.links).toEqual([
+        {
+          title: 'Link 1',
+          url: 'http://some.test.link1',
+        },
+        {
+          targetBlank: true,
+          title: 'Link 2',
+          url: 'http://some.test.link2',
+        },
+      ]);
+    });
   });
 
   describe('Library panels', () => {
     it('given a library panel', () => {
-      const panel = buildGridItemFromPanelSchema({
-        id: 4,
-        gridPos: {
-          h: 8,
-          w: 12,
-          x: 0,
-          y: 0,
-        },
-        libraryPanel: {
-          name: 'Some lib panel panel',
-          uid: 'lib-panel-uid',
-        },
+      // Not using buildGridItemFromPanelSchema since it strips options/fieldConfig
+      const libVizPanel = new LibraryVizPanel({
+        name: 'Some lib panel panel',
         title: 'A panel',
-        transformations: [],
-        fieldConfig: {
-          defaults: {},
-          overrides: [],
-        },
+        uid: 'lib-panel-uid',
+        panelKey: 'lib-panel',
+        panel: new VizPanel({
+          key: 'panel-4',
+          title: 'Panel blahh blah',
+          fieldConfig: {
+            defaults: {},
+            overrides: [],
+          },
+          options: {
+            legend: {
+              calcs: [],
+              displayMode: 'list',
+              placement: 'bottom',
+              showLegend: true,
+            },
+            tooltip: {
+              maxHeight: 600,
+              mode: 'single',
+              sort: 'none',
+            },
+          },
+        }),
+      });
+
+      const panel = new DashboardGridItem({
+        body: libVizPanel,
+        y: 0,
+        x: 0,
+        width: 12,
+        height: 8,
       });
 
       const result = gridItemToPanel(panel);
@@ -267,6 +392,31 @@ describe('transformSceneToSaveModel', () => {
       expect(result.title).toBe('A panel');
       expect(result.transformations).toBeUndefined();
       expect(result.fieldConfig).toBeUndefined();
+      expect(result.options).toBeUndefined();
+    });
+
+    it('given a library panel widget', () => {
+      const panel = buildGridItemFromPanelSchema({
+        id: 4,
+        gridPos: {
+          h: 8,
+          w: 12,
+          x: 0,
+          y: 0,
+        },
+        type: 'add-library-panel',
+      });
+
+      const result = gridItemToPanel(panel);
+
+      expect(result.id).toBe(4);
+      expect(result.gridPos).toEqual({
+        h: 8,
+        w: 12,
+        x: 0,
+        y: 0,
+      });
+      expect(result.type).toBe('add-library-panel');
     });
   });
 
@@ -278,10 +428,11 @@ describe('transformSceneToSaveModel', () => {
       expect(saveModel.annotations?.list?.length).toBe(4);
       expect(saveModel.annotations?.list).toMatchSnapshot();
     });
+
     it('should transform annotations to save model after state changes', () => {
       const scene = transformSaveModelToScene({ dashboard: dashboard_to_load1 as any, meta: {} });
 
-      const layers = (scene.state.$data as SceneDataLayers)?.state.layers;
+      const layers = (scene.state.$data as DashboardDataLayerSet)?.state.annotationLayers;
       const enabledLayer = layers[1];
       const hiddenLayer = layers[3];
 
@@ -481,6 +632,37 @@ describe('transformSceneToSaveModel', () => {
         uid: SHARED_DASHBOARD_QUERY,
       });
     });
+
+    it('Given panel with query caching options', () => {
+      const panel = buildGridItemFromPanelSchema({
+        datasource: {
+          type: 'grafana-testdata',
+          uid: 'abc',
+        },
+        cacheTimeout: '10',
+        queryCachingTTL: 200000,
+        maxDataPoints: 100,
+        targets: [
+          {
+            refId: 'A',
+            expr: 'A',
+            datasource: {
+              type: 'grafana-testdata',
+              uid: 'abc',
+            },
+          },
+          {
+            refId: 'B',
+            expr: 'B',
+          },
+        ],
+      });
+
+      const result = gridItemToPanel(panel);
+
+      expect(result.cacheTimeout).toBe('10');
+      expect(result.queryCachingTTL).toBe(200000);
+    });
   });
 
   describe('Snapshots', () => {
@@ -502,7 +684,6 @@ describe('transformSceneToSaveModel', () => {
       expect(snapshot.panels?.length).toBe(3);
 
       // Regular panel with SceneQueryRunner
-      // @ts-expect-error
       expect(snapshot.panels?.[0].datasource).toEqual(GRAFANA_DATASOURCE_REF);
       // @ts-expect-error
       expect(snapshot.panels?.[0].targets?.[0].datasource).toEqual(GRAFANA_DATASOURCE_REF);
@@ -515,7 +696,6 @@ describe('transformSceneToSaveModel', () => {
       });
 
       // Panel with transformations
-      // @ts-expect-error
       expect(snapshot.panels?.[1].datasource).toEqual(GRAFANA_DATASOURCE_REF);
       // @ts-expect-error
       expect(snapshot.panels?.[1].targets?.[0].datasource).toEqual(GRAFANA_DATASOURCE_REF);
@@ -535,7 +715,6 @@ describe('transformSceneToSaveModel', () => {
       ]);
 
       // Panel with a shared query (dahsboard query)
-      // @ts-expect-error
       expect(snapshot.panels?.[2].datasource).toEqual(GRAFANA_DATASOURCE_REF);
       // @ts-expect-error
       expect(snapshot.panels?.[2].targets?.[0].datasource).toEqual(GRAFANA_DATASOURCE_REF);
@@ -610,7 +789,7 @@ describe('transformSceneToSaveModel', () => {
         activateFullSceneTree(scene);
 
         expect(repeater.state.repeatedPanels?.length).toBe(2);
-        const result = panelRepeaterToPanels(repeater, true);
+        const result = panelRepeaterToPanels(repeater, undefined, true);
 
         expect(result).toHaveLength(2);
 
@@ -633,6 +812,53 @@ describe('transformSceneToSaveModel', () => {
         expect(result[1].title).toEqual('Panel $server');
       });
 
+      it('handles repeated library panels', () => {
+        const { scene, repeater } = buildPanelRepeaterScene(
+          { variableQueryTime: 0, numberOfOptions: 2 },
+          new LibraryVizPanel({
+            name: 'Some lib panel panel',
+            title: 'A panel',
+            uid: 'lib-panel-uid',
+            panelKey: 'lib-panel',
+            panel: new VizPanel({
+              key: 'panel-4',
+              title: 'Panel blahh blah',
+              fieldConfig: {
+                defaults: {},
+                overrides: [],
+              },
+              options: {
+                legend: {
+                  calcs: [],
+                  displayMode: 'list',
+                  placement: 'bottom',
+                  showLegend: true,
+                },
+                tooltip: {
+                  maxHeight: 600,
+                  mode: 'single',
+                  sort: 'none',
+                },
+              },
+            }),
+          })
+        );
+
+        activateFullSceneTree(scene);
+        const result = panelRepeaterToPanels(repeater, undefined, true);
+
+        expect(result).toHaveLength(1);
+
+        expect(result[0]).toMatchObject({
+          id: 4,
+          title: 'A panel',
+          libraryPanel: {
+            name: 'Some lib panel panel',
+            uid: 'lib-panel-uid',
+          },
+        });
+      });
+
       it('handles row repeats ', () => {
         const { scene, row } = buildPanelRepeaterScene({
           variableQueryTime: 0,
@@ -644,7 +870,7 @@ describe('transformSceneToSaveModel', () => {
         activateFullSceneTree(scene);
 
         let panels: Panel[] = [];
-        gridRowToSaveModel(row, panels, true);
+        gridRowToSaveModel(row, panels, undefined, true);
 
         expect(panels).toHaveLength(2);
         expect(panels[0].repeat).toBe('handler');
@@ -672,7 +898,7 @@ describe('transformSceneToSaveModel', () => {
         activateFullSceneTree(scene);
 
         let panels: Panel[] = [];
-        gridRowToSaveModel(row, panels, true);
+        gridRowToSaveModel(row, panels, undefined, true);
 
         expect(panels[0].repeat).toBe('handler');
 
@@ -768,26 +994,113 @@ describe('transformSceneToSaveModel', () => {
 
         expect(snapshot.panels?.length).toBe(3);
         expect(result.panels?.length).toBe(1);
-        // @ts-expect-error
         expect(result.panels?.[0].gridPos).toEqual({ w: 24, x: 0, y: 0, h: 20 });
       });
 
-      // TODO: Uncomment when we support links
-      // it('should remove links', async () => {
-      //   const scene = transformSaveModelToScene({ dashboard: snapshotableDashboardJson as any, meta: {} });
-      //   activateFullSceneTree(scene);
-      //   const snapshot = transformSceneToSaveModel(scene, true);
-      //   expect(snapshot.links?.length).toBe(1);
-      //   const result = trimDashboardForSnapshot('Snap title', getTimeRange({ from: 'now-6h', to: 'now' }), snapshot);
-      //   expect(result.links?.length).toBe(0);
-      // });
+      it('should remove links', async () => {
+        const scene = transformSaveModelToScene({ dashboard: snapshotableDashboardJson as any, meta: {} });
+        activateFullSceneTree(scene);
+        const snapshot = transformSceneToSaveModel(scene, true);
+        expect(snapshot.links?.length).toBe(1);
+        const result = trimDashboardForSnapshot('Snap title', getTimeRange({ from: 'now-6h', to: 'now' }), snapshot);
+        expect(result.links?.length).toBe(0);
+      });
+    });
+  });
+
+  describe('Given a scene with an open panel editor', () => {
+    it('should persist changes to panel model', async () => {
+      const panel = new VizPanel({
+        key: 'panel-1',
+        pluginId: 'text',
+      });
+
+      const gridItem = new DashboardGridItem({ body: panel });
+
+      const editScene = buildPanelEditScene(panel);
+      const scene = new DashboardScene({
+        editPanel: editScene,
+        isEditing: true,
+        body: new SceneGridLayout({
+          children: [gridItem],
+        }),
+        $timeRange: new SceneTimeRange({
+          from: 'now-6h',
+          to: 'now',
+          timeZone: '',
+        }),
+      });
+
+      editScene!.state.vizManager.state.panel.setState({
+        options: {
+          mode: 'markdown',
+          code: {
+            language: 'plaintext',
+            showLineNumbers: false,
+            showMiniMap: false,
+          },
+          content: 'new content',
+        },
+      });
+      activateFullSceneTree(scene);
+      const saveModel = transformSceneToSaveModel(scene);
+      expect((saveModel.panels![0] as any).options.content).toBe('new content');
+    });
+
+    it('should persist changes to panel model in row', async () => {
+      const panel = new VizPanel({
+        key: 'panel-1',
+        pluginId: 'text',
+        options: {
+          content: 'old content',
+        },
+      });
+
+      const gridItem = new DashboardGridItem({ body: panel });
+
+      const editScene = buildPanelEditScene(panel);
+      const scene = new DashboardScene({
+        editPanel: editScene,
+        isEditing: true,
+        body: new SceneGridLayout({
+          children: [
+            new SceneGridRow({
+              key: '23',
+              isCollapsed: false,
+              children: [gridItem],
+            }),
+          ],
+        }),
+        $timeRange: new SceneTimeRange({
+          from: 'now-6h',
+          to: 'now',
+          timeZone: '',
+        }),
+      });
+      activateFullSceneTree(scene);
+
+      editScene!.state.vizManager.state.panel.setState({
+        options: {
+          mode: 'markdown',
+          code: {
+            language: 'plaintext',
+            showLineNumbers: false,
+            showMiniMap: false,
+          },
+          content: 'new content',
+        },
+      });
+
+      const saveModel = transformSceneToSaveModel(scene);
+      expect((saveModel.panels![1] as any).options.content).toBe('new content');
     });
   });
 });
 
-export function buildGridItemFromPanelSchema(panel: Partial<Panel>): SceneGridItemLike {
+export function buildGridItemFromPanelSchema(panel: Partial<Panel>) {
   if (panel.libraryPanel) {
     return buildGridItemForLibPanel(new PanelModel(panel))!;
   }
+
   return buildGridItemForPanel(new PanelModel(panel));
 }
diff --git a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.ts b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.ts
index 26d9cd660cd39..c6c0b3941a9e6 100644
--- a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.ts
+++ b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.ts
@@ -1,40 +1,44 @@
+import { defaults, isEqual } from 'lodash';
+
 import { isEmptyObject, ScopedVars, TimeRange } from '@grafana/data';
 import {
-  SceneDataLayers,
-  SceneGridItem,
+  behaviors,
   SceneGridItemLike,
   SceneGridLayout,
   SceneGridRow,
   VizPanel,
-  SceneQueryRunner,
   SceneDataTransformer,
   SceneVariableSet,
-  AdHocFilterSet,
   LocalValueVariable,
 } from '@grafana/scenes';
 import {
   AnnotationQuery,
   Dashboard,
+  DashboardLink,
   DataTransformerConfig,
   defaultDashboard,
+  defaultTimePickerConfig,
   FieldConfigSource,
+  GridPos,
   Panel,
   RowPanel,
+  TimePickerConfig,
   VariableModel,
   VariableRefresh,
 } from '@grafana/schema';
 import { sortedDeepCloneWithoutNulls } from 'app/core/utils/object';
 import { getPanelDataFrames } from 'app/features/dashboard/components/HelpWizard/utils';
-import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard';
+import { DASHBOARD_SCHEMA_VERSION } from 'app/features/dashboard/state/DashboardMigrator';
 import { GrafanaQueryType } from 'app/plugins/datasource/grafana/types';
 
-import { DashboardScene } from '../scene/DashboardScene';
+import { DashboardDataLayerSet } from '../scene/DashboardDataLayerSet';
+import { DashboardGridItem } from '../scene/DashboardGridItem';
+import { DashboardScene, DashboardSceneState } from '../scene/DashboardScene';
 import { LibraryVizPanel } from '../scene/LibraryVizPanel';
-import { PanelRepeaterGridItem } from '../scene/PanelRepeaterGridItem';
 import { PanelTimeRange } from '../scene/PanelTimeRange';
 import { RowRepeaterBehavior } from '../scene/RowRepeaterBehavior';
-import { ShareQueryDataProvider } from '../scene/ShareQueryDataProvider';
-import { getPanelIdForVizPanel } from '../utils/utils';
+import { dashboardSceneGraph } from '../utils/dashboardSceneGraph';
+import { getPanelIdForVizPanel, getQueryRunnerFor } from '../utils/utils';
 
 import { GRAFANA_DATASOURCE_REF } from './const';
 import { dataLayersToAnnotations } from './dataLayersToAnnotations';
@@ -46,18 +50,19 @@ export function transformSceneToSaveModel(scene: DashboardScene, isSnapshot = fa
   const data = state.$data;
   const variablesSet = state.$variables;
   const body = state.body;
-  let panels: Panel[] = [];
 
+  let panels: Panel[] = [];
   let variables: VariableModel[] = [];
 
   if (body instanceof SceneGridLayout) {
     for (const child of body.state.children) {
-      if (child instanceof SceneGridItem) {
-        panels.push(gridItemToPanel(child, isSnapshot));
-      }
-
-      if (child instanceof PanelRepeaterGridItem) {
-        panels = panels.concat(panelRepeaterToPanels(child, isSnapshot));
+      if (child instanceof DashboardGridItem) {
+        // handle panel repeater scenario
+        if (child.state.variableName) {
+          panels = panels.concat(panelRepeaterToPanels(child, state, isSnapshot));
+        } else {
+          panels.push(gridItemToPanel(child, state, isSnapshot));
+        }
       }
 
       if (child instanceof SceneGridRow) {
@@ -65,43 +70,53 @@ export function transformSceneToSaveModel(scene: DashboardScene, isSnapshot = fa
         if (child.state.key!.indexOf('-clone-') > 0 && !isSnapshot) {
           continue;
         }
-        gridRowToSaveModel(child, panels, isSnapshot);
+        gridRowToSaveModel(child, panels, state, isSnapshot);
       }
     }
   }
 
   let annotations: AnnotationQuery[] = [];
-  if (data instanceof SceneDataLayers) {
-    const layers = data.state.layers;
 
-    annotations = dataLayersToAnnotations(layers);
+  if (data instanceof DashboardDataLayerSet) {
+    annotations = dataLayersToAnnotations(data.state.annotationLayers);
   }
 
   if (variablesSet instanceof SceneVariableSet) {
     variables = sceneVariablesSetToVariables(variablesSet);
   }
 
-  if (state.controls) {
-    for (const control of state.controls) {
-      if (control instanceof AdHocFilterSet) {
-        variables.push({
-          name: control.state.name!,
-          type: 'adhoc',
-          datasource: control.state.datasource,
-        });
-      }
-    }
-  }
+  const controlsState = state.controls?.state;
+
+  const refreshPicker = controlsState?.refreshPicker;
+
+  const timePickerWithoutDefaults = removeDefaults<TimePickerConfig>(
+    {
+      refresh_intervals: refreshPicker?.state.intervals,
+      hidden: controlsState?.hideTimeControls,
+      nowDelay: timeRange.UNSAFE_nowDelay,
+    },
+    defaultTimePickerConfig
+  );
+
+  const graphTooltip =
+    state.$behaviors?.find((b): b is behaviors.CursorSync => b instanceof behaviors.CursorSync)?.state.sync ??
+    defaultDashboard.graphTooltip;
+  const liveNow =
+    state.$behaviors?.find((b): b is behaviors.LiveNowTimer => b instanceof behaviors.LiveNowTimer)?.isEnabled ||
+    undefined;
 
   const dashboard: Dashboard = {
     ...defaultDashboard,
     title: state.title,
+    description: state.description || undefined,
     uid: state.uid,
     id: state.id,
+    editable: state.editable,
     time: {
       from: timeRange.from,
       to: timeRange.to,
     },
+    timepicker: timePickerWithoutDefaults,
     panels,
     annotations: {
       list: annotations,
@@ -109,75 +124,121 @@ export function transformSceneToSaveModel(scene: DashboardScene, isSnapshot = fa
     templating: {
       list: variables,
     },
+    version: state.version,
     timezone: timeRange.timeZone,
     fiscalYearStartMonth: timeRange.fiscalYearStartMonth,
     weekStart: timeRange.weekStart,
+    tags: state.tags,
+    links: state.links,
+    graphTooltip,
+    liveNow,
+    schemaVersion: DASHBOARD_SCHEMA_VERSION,
+    refresh: refreshPicker?.state.refresh,
   };
 
   return sortedDeepCloneWithoutNulls(dashboard);
 }
 
-export function gridItemToPanel(gridItem: SceneGridItemLike, isSnapshot = false): Panel {
+export function libraryVizPanelToPanel(libPanel: LibraryVizPanel, gridPos: GridPos): Panel {
+  if (!libPanel.state.panel) {
+    throw new Error('Library panel has no panel');
+  }
+
+  return {
+    id: getPanelIdForVizPanel(libPanel.state.panel),
+    title: libPanel.state.title,
+    gridPos: gridPos,
+    libraryPanel: {
+      name: libPanel.state.name,
+      uid: libPanel.state.uid,
+    },
+  } as Panel;
+}
+
+export function gridItemToPanel(
+  gridItem: DashboardGridItem,
+  sceneState?: DashboardSceneState,
+  isSnapshot = false
+): Panel {
   let vizPanel: VizPanel | undefined;
   let x = 0,
     y = 0,
     w = 0,
     h = 0;
 
-  if (gridItem instanceof SceneGridItem) {
-    // Handle library panels, early exit
-    if (gridItem.state.body instanceof LibraryVizPanel) {
-      x = gridItem.state.x ?? 0;
-      y = gridItem.state.y ?? 0;
-      w = gridItem.state.width ?? 0;
-      h = gridItem.state.height ?? 0;
-
-      return {
-        id: getPanelIdForVizPanel(gridItem.state.body),
-        title: gridItem.state.body.state.title,
-        gridPos: { x, y, w, h },
-        libraryPanel: {
-          name: gridItem.state.body.state.name,
-          uid: gridItem.state.body.state.uid,
-        },
-      } as Panel;
-    }
-
-    if (!(gridItem.state.body instanceof VizPanel)) {
-      throw new Error('SceneGridItem body expected to be VizPanel');
-    }
-
-    vizPanel = gridItem.state.body;
+  // Handle library panels, early exit
+  if (gridItem.state.body instanceof LibraryVizPanel) {
     x = gridItem.state.x ?? 0;
     y = gridItem.state.y ?? 0;
     w = gridItem.state.width ?? 0;
     h = gridItem.state.height ?? 0;
+
+    return libraryVizPanelToPanel(gridItem.state.body, { x, y, w, h });
   }
 
-  if (gridItem instanceof PanelRepeaterGridItem) {
-    vizPanel = gridItem.state.source;
-    x = gridItem.state.x ?? 0;
-    y = gridItem.state.y ?? 0;
-    w = gridItem.state.width ?? 0;
-    h = gridItem.state.height ?? 0;
+  let gridItem_ = gridItem;
+
+  // If we're saving while the panel editor is open, we need to persist those changes in the panel model
+  if (
+    sceneState &&
+    sceneState.editPanel?.state.vizManager &&
+    sceneState.editPanel.state.vizManager.state.sourcePanel.resolve() === gridItem.state.body
+  ) {
+    const gridItemClone = gridItem.clone();
+    if (gridItemClone.state.body instanceof VizPanel) {
+      sceneState.editPanel.state.vizManager.commitChangesTo(gridItemClone.state.body);
+      gridItem_ = gridItemClone;
+    }
   }
 
+  if (!(gridItem_.state.body instanceof VizPanel)) {
+    throw new Error('DashboardGridItem body expected to be VizPanel');
+  }
+
+  vizPanel = gridItem_.state.body;
+  x = gridItem_.state.x ?? 0;
+  y = gridItem_.state.y ?? 0;
+  w = gridItem_.state.width ?? 0;
+  h = gridItem_.state.height ?? 0;
+
   if (!vizPanel) {
     throw new Error('Unsupported grid item type');
   }
 
+  const panel: Panel = vizPanelToPanel(vizPanel, { x, y, h, w }, isSnapshot, gridItem_);
+
+  return panel;
+}
+
+export function vizPanelToPanel(
+  vizPanel: VizPanel,
+  gridPos?: GridPos,
+  isSnapshot = false,
+  gridItem?: SceneGridItemLike
+) {
   const panel: Panel = {
     id: getPanelIdForVizPanel(vizPanel),
     type: vizPanel.state.pluginId,
     title: vizPanel.state.title,
-    gridPos: { x, y, w, h },
-    options: vizPanel.state.options,
+    description: vizPanel.state.description ?? undefined,
+    gridPos,
     fieldConfig: (vizPanel.state.fieldConfig as FieldConfigSource) ?? { defaults: {}, overrides: [] },
     transformations: [],
     transparent: vizPanel.state.displayMode === 'transparent',
+    pluginVersion: vizPanel.state.pluginVersion,
     ...vizPanelDataToPanel(vizPanel, isSnapshot),
   };
 
+  if (vizPanel.state.options) {
+    const { angularOptions, ...rest } = vizPanel.state.options as any;
+    panel.options = rest;
+
+    if (angularOptions) {
+      // Allow angularOptions to overwrite non system level root properties
+      defaults(panel, angularOptions);
+    }
+  }
+
   const panelTime = vizPanel.state.$timeRange;
 
   if (panelTime instanceof PanelTimeRange) {
@@ -186,10 +247,32 @@ export function gridItemToPanel(gridItem: SceneGridItemLike, isSnapshot = false)
     panel.hideTimeOverride = panelTime.state.hideTimeOverride;
   }
 
-  if (gridItem instanceof PanelRepeaterGridItem) {
-    panel.repeat = gridItem.state.variableName;
-    panel.maxPerRow = gridItem.state.maxPerRow;
-    panel.repeatDirection = gridItem.getRepeatDirection();
+  if (gridItem instanceof DashboardGridItem) {
+    if (gridItem.state.variableName) {
+      panel.repeat = gridItem.state.variableName;
+    }
+
+    if (gridItem.state.maxPerRow) {
+      panel.maxPerRow = gridItem.state.maxPerRow;
+    }
+    if (gridItem.state.repeatDirection) {
+      panel.repeatDirection = gridItem.getRepeatDirection();
+    }
+  }
+
+  const panelLinks = dashboardSceneGraph.getPanelLinks(vizPanel);
+  panel.links = (panelLinks?.state.rawLinks as DashboardLink[]) ?? [];
+
+  if (panel.links.length === 0) {
+    delete panel.links;
+  }
+
+  if (panel.transformations?.length === 0) {
+    delete panel.transformations;
+  }
+
+  if (!panel.transparent) {
+    delete panel.transparent;
   }
 
   return panel;
@@ -201,54 +284,30 @@ function vizPanelDataToPanel(
 ): Pick<Panel, 'datasource' | 'targets' | 'maxDataPoints' | 'transformations'> {
   const dataProvider = vizPanel.state.$data;
 
-  const panel: Pick<Panel, 'datasource' | 'targets' | 'maxDataPoints' | 'transformations'> = {};
-  // Dashboard datasource handling
-  if (dataProvider instanceof ShareQueryDataProvider) {
-    panel.datasource = {
-      type: 'datasource',
-      uid: SHARED_DASHBOARD_QUERY,
-    };
-    panel.targets = [
-      {
-        datasource: { ...panel.datasource },
-        refId: 'A',
-        panelId: dataProvider.state.query.panelId,
-        topic: dataProvider.state.query.topic,
-      },
-    ];
-  }
+  const panel: Pick<
+    Panel,
+    'datasource' | 'targets' | 'maxDataPoints' | 'transformations' | 'cacheTimeout' | 'queryCachingTTL' | 'interval'
+  > = {};
+  const queryRunner = getQueryRunnerFor(vizPanel);
 
-  // Regular queries handling
-  if (dataProvider instanceof SceneQueryRunner) {
-    panel.targets = dataProvider.state.queries;
-    panel.maxDataPoints = dataProvider.state.maxDataPoints;
-    panel.datasource = dataProvider.state.datasource;
-  }
+  if (queryRunner) {
+    panel.targets = queryRunner.state.queries;
+    panel.maxDataPoints = queryRunner.state.maxDataPoints;
+    panel.datasource = queryRunner.state.datasource;
 
-  // Transformations handling
-  if (dataProvider instanceof SceneDataTransformer) {
-    const panelData = dataProvider.state.$data;
-    if (panelData instanceof ShareQueryDataProvider) {
-      panel.datasource = {
-        type: 'datasource',
-        uid: SHARED_DASHBOARD_QUERY,
-      };
-      panel.targets = [
-        {
-          datasource: { ...panel.datasource },
-          refId: 'A',
-          panelId: panelData.state.query.panelId,
-          topic: panelData.state.query.topic,
-        },
-      ];
+    if (queryRunner.state.cacheTimeout) {
+      panel.cacheTimeout = queryRunner.state.cacheTimeout;
     }
 
-    if (panelData instanceof SceneQueryRunner) {
-      panel.targets = panelData.state.queries;
-      panel.maxDataPoints = panelData.state.maxDataPoints;
-      panel.datasource = panelData.state.datasource;
+    if (queryRunner.state.queryCachingTTL) {
+      panel.queryCachingTTL = queryRunner.state.queryCachingTTL;
+    }
+    if (queryRunner.state.minInterval) {
+      panel.interval = queryRunner.state.minInterval;
     }
+  }
 
+  if (dataProvider instanceof SceneDataTransformer) {
     panel.transformations = dataProvider.state.transformations as DataTransformerConfig[];
   }
 
@@ -274,10 +333,20 @@ function vizPanelDataToPanel(
   return panel;
 }
 
-export function panelRepeaterToPanels(repeater: PanelRepeaterGridItem, isSnapshot = false): Panel[] {
+export function panelRepeaterToPanels(
+  repeater: DashboardGridItem,
+  sceneState?: DashboardSceneState,
+  isSnapshot = false
+): Panel[] {
   if (!isSnapshot) {
-    return [gridItemToPanel(repeater)];
+    return [gridItemToPanel(repeater, sceneState)];
   } else {
+    if (repeater.state.body instanceof LibraryVizPanel) {
+      const { x = 0, y = 0, width: w = 0, height: h = 0 } = repeater.state;
+      return [libraryVizPanelToPanel(repeater.state.body, { x, y, w, h })];
+    }
+
+    // console.log('repeater.state', repeater.state);
     if (repeater.state.repeatedPanels) {
       const itemHeight = repeater.state.itemHeight ?? 10;
       const rowCount = Math.ceil(repeater.state.repeatedPanels!.length / repeater.getMaxPerRow());
@@ -327,7 +396,12 @@ export function panelRepeaterToPanels(repeater: PanelRepeaterGridItem, isSnapsho
   }
 }
 
-export function gridRowToSaveModel(gridRow: SceneGridRow, panelsArray: Array<Panel | RowPanel>, isSnapshot = false) {
+export function gridRowToSaveModel(
+  gridRow: SceneGridRow,
+  panelsArray: Array<Panel | RowPanel>,
+  sceneState?: DashboardSceneState,
+  isSnapshot = false
+) {
   const collapsed = Boolean(gridRow.state.isCollapsed);
   const rowPanel: RowPanel = {
     type: 'row',
@@ -374,16 +448,23 @@ export function gridRowToSaveModel(gridRow: SceneGridRow, panelsArray: Array<Pan
 
   if (isSnapshot) {
     gridRow.state.children.forEach((c) => {
-      if (c instanceof PanelRepeaterGridItem) {
-        // Perform snapshot only for uncollapsed rows
-        panelsInsideRow = panelsInsideRow.concat(panelRepeaterToPanels(c, !collapsed));
-      } else {
-        // Perform snapshot only for uncollapsed panels
-        panelsInsideRow.push(gridItemToPanel(c, !collapsed));
+      if (c instanceof DashboardGridItem) {
+        if (c.state.variableName) {
+          // Perform snapshot only for uncollapsed rows
+          panelsInsideRow = panelsInsideRow.concat(panelRepeaterToPanels(c, sceneState, !collapsed));
+        } else {
+          // Perform snapshot only for uncollapsed panels
+          panelsInsideRow.push(gridItemToPanel(c, sceneState, !collapsed));
+        }
       }
     });
   } else {
-    panelsInsideRow = gridRow.state.children.map((c) => gridItemToPanel(c));
+    panelsInsideRow = gridRow.state.children.map((c) => {
+      if (!(c instanceof DashboardGridItem)) {
+        throw new Error('Row child expected to be DashboardGridItem');
+      }
+      return gridItemToPanel(c, sceneState);
+    });
   }
 
   if (gridRow.state.isCollapsed) {
@@ -407,10 +488,8 @@ export function trimDashboardForSnapshot(title: string, time: TimeRange, dash: D
   // When VizPanel is present, we are snapshoting a single panel. The rest of the panels is removed from the dashboard,
   // and the panel is resized to 24x20 grid and placed at the top of the dashboard.
   if (panel) {
-    // @ts-expect-error Due to legacy panels types. Id is present on such panels too.
     const singlePanel = dash.panels?.find((p) => p.id === getPanelIdForVizPanel(panel));
     if (singlePanel) {
-      // @ts-expect-error Due to legacy panels types. Id is present on such panels too.
       singlePanel.gridPos = { w: 24, x: 0, y: 0, h: 20 };
       result = {
         ...result,
@@ -464,3 +543,14 @@ export function trimDashboardForSnapshot(title: string, time: TimeRange, dash: D
 
   return result;
 }
+
+function removeDefaults<T>(object: T, defaults: T): T {
+  const newObj = { ...object };
+  for (const key in defaults) {
+    if (isEqual(newObj[key], defaults[key])) {
+      delete newObj[key];
+    }
+  }
+
+  return newObj;
+}
diff --git a/public/app/features/dashboard-scene/settings/AnnotationsEditView.test.tsx b/public/app/features/dashboard-scene/settings/AnnotationsEditView.test.tsx
new file mode 100644
index 0000000000000..105f747a86727
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/AnnotationsEditView.test.tsx
@@ -0,0 +1,183 @@
+import { map, of } from 'rxjs';
+
+import { AnnotationQuery, DataQueryRequest, DataSourceApi, LoadingState, PanelData } from '@grafana/data';
+import { SceneGridLayout, SceneTimeRange, dataLayers } from '@grafana/scenes';
+
+import { DashboardAnnotationsDataLayer } from '../scene/DashboardAnnotationsDataLayer';
+import { DashboardDataLayerSet } from '../scene/DashboardDataLayerSet';
+import { DashboardScene } from '../scene/DashboardScene';
+import { dashboardSceneGraph } from '../utils/dashboardSceneGraph';
+import { activateFullSceneTree } from '../utils/test-utils';
+
+import { AnnotationsEditView, MoveDirection } from './AnnotationsEditView';
+import { newAnnotationName } from './annotations/AnnotationSettingsEdit';
+
+const runRequestMock = jest.fn().mockImplementation((ds: DataSourceApi, request: DataQueryRequest) => {
+  const result: PanelData = {
+    state: LoadingState.Loading,
+    series: [],
+    timeRange: request.range,
+  };
+
+  return of([]).pipe(
+    map(() => {
+      result.state = LoadingState.Done;
+      result.series = [];
+
+      return result;
+    })
+  );
+});
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getDataSourceSrv: () => {
+    return {
+      getInstanceSettings: jest.fn().mockResolvedValue({ uid: 'ds1' }),
+    };
+  },
+  getRunRequest: () => (ds: DataSourceApi, request: DataQueryRequest) => {
+    return runRequestMock(ds, request);
+  },
+  config: {
+    ...jest.requireActual('@grafana/runtime').config,
+    publicDashboardAccessToken: 'ac123',
+  },
+}));
+
+describe('AnnotationsEditView', () => {
+  describe('Dashboard annotations state', () => {
+    let annotationsView: AnnotationsEditView;
+
+    beforeEach(async () => {
+      const result = await buildTestScene();
+      annotationsView = result.annotationsView;
+    });
+
+    it('should return the correct urlKey', () => {
+      expect(annotationsView.getUrlKey()).toBe('annotations');
+    });
+
+    it('should add a new annotation and group it with the other annotations', () => {
+      const dataLayers = dashboardSceneGraph.getDataLayers(annotationsView.getDashboard());
+
+      expect(dataLayers?.state.annotationLayers.length).toBe(1);
+
+      annotationsView.onNew();
+
+      expect(dataLayers?.state.annotationLayers.length).toBe(2);
+      expect(dataLayers?.state.annotationLayers[1].state.name).toBe(newAnnotationName);
+      expect(dataLayers?.state.annotationLayers[1].isActive).toBe(true);
+    });
+
+    it('should move an annotation up one position', () => {
+      const dataLayers = dashboardSceneGraph.getDataLayers(annotationsView.getDashboard());
+
+      annotationsView.onNew();
+
+      expect(dataLayers?.state.annotationLayers.length).toBe(2);
+      expect(dataLayers?.state.annotationLayers[0].state.name).toBe('test');
+
+      annotationsView.onMove(1, MoveDirection.UP);
+
+      expect(dataLayers?.state.annotationLayers.length).toBe(2);
+      expect(dataLayers?.state.annotationLayers[0].state.name).toBe(newAnnotationName);
+    });
+
+    it('should move an annotation down one position', () => {
+      const dataLayers = dashboardSceneGraph.getDataLayers(annotationsView.getDashboard());
+
+      annotationsView.onNew();
+
+      expect(dataLayers?.state.annotationLayers.length).toBe(2);
+      expect(dataLayers?.state.annotationLayers[0].state.name).toBe('test');
+
+      annotationsView.onMove(0, MoveDirection.DOWN);
+
+      expect(dataLayers?.state.annotationLayers.length).toBe(2);
+      expect(dataLayers?.state.annotationLayers[0].state.name).toBe(newAnnotationName);
+    });
+
+    it('should delete annotation at index', () => {
+      const dataLayers = dashboardSceneGraph.getDataLayers(annotationsView.getDashboard());
+
+      expect(dataLayers?.state.annotationLayers.length).toBe(1);
+
+      annotationsView.onDelete(0);
+
+      expect(dataLayers?.state.annotationLayers.length).toBe(0);
+    });
+
+    it('should update an annotation at index', () => {
+      const dataLayers = dashboardSceneGraph.getDataLayers(annotationsView.getDashboard());
+
+      expect(dataLayers?.state.annotationLayers[0].state.name).toBe('test');
+
+      const annotation: AnnotationQuery = {
+        ...(dataLayers?.state.annotationLayers[0] as dataLayers.AnnotationsDataLayer).state.query,
+      };
+
+      annotation.name = 'new name';
+      annotation.hide = true;
+      annotation.enable = false;
+      annotation.iconColor = 'blue';
+      annotationsView.onUpdate(annotation, 0);
+
+      expect(dataLayers?.state.annotationLayers.length).toBe(1);
+      expect(dataLayers?.state.annotationLayers[0].state.name).toBe('new name');
+      expect((dataLayers?.state.annotationLayers[0] as dataLayers.AnnotationsDataLayer).state.query.name).toBe(
+        'new name'
+      );
+      expect((dataLayers?.state.annotationLayers[0] as dataLayers.AnnotationsDataLayer).state.query.hide).toBe(true);
+      expect((dataLayers?.state.annotationLayers[0] as dataLayers.AnnotationsDataLayer).state.query.enable).toBe(false);
+      expect((dataLayers?.state.annotationLayers[0] as dataLayers.AnnotationsDataLayer).state.query.iconColor).toBe(
+        'blue'
+      );
+    });
+  });
+});
+
+async function buildTestScene() {
+  const annotationsView = new AnnotationsEditView({});
+  const dashboard = new DashboardScene({
+    $timeRange: new SceneTimeRange({}),
+    title: 'hello',
+    uid: 'dash-1',
+    version: 4,
+    meta: {
+      canEdit: true,
+    },
+    $data: new DashboardDataLayerSet({
+      annotationLayers: [
+        new DashboardAnnotationsDataLayer({
+          key: `annotations-test`,
+          query: {
+            enable: true,
+            iconColor: 'red',
+            name: 'test',
+            datasource: {
+              type: 'grafana',
+              uid: '-- Grafana --',
+            },
+          },
+          name: 'test',
+          isEnabled: true,
+          isHidden: false,
+        }),
+      ],
+    }),
+    body: new SceneGridLayout({
+      children: [],
+    }),
+    editview: annotationsView,
+  });
+
+  activateFullSceneTree(dashboard);
+
+  await new Promise((r) => setTimeout(r, 1));
+
+  dashboard.onEnterEditMode();
+  annotationsView.activate();
+
+  return { dashboard, annotationsView };
+}
diff --git a/public/app/features/dashboard-scene/settings/AnnotationsEditView.tsx b/public/app/features/dashboard-scene/settings/AnnotationsEditView.tsx
new file mode 100644
index 0000000000000..ded0738d7591b
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/AnnotationsEditView.tsx
@@ -0,0 +1,205 @@
+import React from 'react';
+
+import { AnnotationQuery, NavModel, NavModelItem, PageLayoutType, getDataSourceRef } from '@grafana/data';
+import { getDataSourceSrv } from '@grafana/runtime';
+import { SceneComponentProps, SceneObjectBase, VizPanel, dataLayers } from '@grafana/scenes';
+import { Page } from 'app/core/components/Page/Page';
+
+import { DashboardAnnotationsDataLayer } from '../scene/DashboardAnnotationsDataLayer';
+import { DashboardScene } from '../scene/DashboardScene';
+import { NavToolbarActions } from '../scene/NavToolbarActions';
+import { dataLayersToAnnotations } from '../serialization/dataLayersToAnnotations';
+import { dashboardSceneGraph } from '../utils/dashboardSceneGraph';
+import { getDashboardSceneFor } from '../utils/utils';
+
+import { EditListViewSceneUrlSync } from './EditListViewSceneUrlSync';
+import { AnnotationSettingsEdit, AnnotationSettingsList, newAnnotationName } from './annotations';
+import { DashboardEditView, DashboardEditViewState, useDashboardEditPageNav } from './utils';
+
+export enum MoveDirection {
+  UP = -1,
+  DOWN = 1,
+}
+
+export interface AnnotationsEditViewState extends DashboardEditViewState {
+  editIndex?: number | undefined;
+}
+
+export class AnnotationsEditView extends SceneObjectBase<AnnotationsEditViewState> implements DashboardEditView {
+  static Component = AnnotationsSettingsView;
+
+  public getUrlKey(): string {
+    return 'annotations';
+  }
+
+  protected _urlSync = new EditListViewSceneUrlSync(this);
+
+  private get _dashboard(): DashboardScene {
+    return getDashboardSceneFor(this);
+  }
+
+  public getDataLayer(editIndex: number): dataLayers.AnnotationsDataLayer {
+    const data = dashboardSceneGraph.getDataLayers(this._dashboard);
+    const layer = data.state.annotationLayers[editIndex];
+
+    if (!(layer instanceof dataLayers.AnnotationsDataLayer)) {
+      throw new Error('AnnotationsDataLayer not found at index ' + editIndex);
+    }
+
+    return layer;
+  }
+
+  public getDashboard(): DashboardScene {
+    return this._dashboard;
+  }
+
+  public onNew = () => {
+    const newAnnotationQuery: AnnotationQuery = {
+      name: newAnnotationName,
+      enable: true,
+      datasource: getDataSourceRef(getDataSourceSrv().getInstanceSettings(null)!),
+      iconColor: 'red',
+    };
+
+    const newAnnotation = new DashboardAnnotationsDataLayer({
+      query: newAnnotationQuery,
+      name: newAnnotationQuery.name,
+      isEnabled: Boolean(newAnnotationQuery.enable),
+      isHidden: Boolean(newAnnotationQuery.hide),
+    });
+
+    const data = dashboardSceneGraph.getDataLayers(this._dashboard);
+
+    data.addAnnotationLayer(newAnnotation);
+
+    this.setState({ editIndex: data.state.annotationLayers.length - 1 });
+  };
+
+  public onEdit = (idx: number) => {
+    this.setState({ editIndex: idx });
+  };
+
+  public onBackToList = () => {
+    this.setState({ editIndex: undefined });
+  };
+
+  public onMove = (idx: number, direction: MoveDirection) => {
+    const data = dashboardSceneGraph.getDataLayers(this._dashboard);
+    const layers = [...data.state.annotationLayers];
+
+    const [layer] = layers.splice(idx, 1);
+    layers.splice(idx + direction, 0, layer);
+
+    data.setState({ annotationLayers: layers });
+  };
+
+  public onDelete = (idx: number) => {
+    const data = dashboardSceneGraph.getDataLayers(this._dashboard);
+    const layers = [...data.state.annotationLayers];
+
+    layers.splice(idx, 1);
+
+    data.setState({ annotationLayers: layers });
+  };
+
+  public onUpdate = (annotation: AnnotationQuery, editIndex: number) => {
+    const layer = this.getDataLayer(editIndex);
+
+    layer.setState({
+      name: annotation.name,
+      isEnabled: Boolean(annotation.enable),
+      isHidden: Boolean(annotation.hide),
+      query: annotation,
+    });
+
+    //need to rerun the layer to update the query and
+    //see the annotation on the panel
+    layer.runLayer();
+  };
+}
+
+function AnnotationsSettingsView({ model }: SceneComponentProps<AnnotationsEditView>) {
+  const dashboard = model.getDashboard();
+  const { annotationLayers } = dashboardSceneGraph.getDataLayers(dashboard).useState();
+  const { navModel, pageNav } = useDashboardEditPageNav(dashboard, model.getUrlKey());
+  const { editIndex } = model.useState();
+  const panels = dashboardSceneGraph.getVizPanels(dashboard);
+
+  const annotations: AnnotationQuery[] = dataLayersToAnnotations(annotationLayers);
+
+  if (editIndex != null && editIndex < annotationLayers.length) {
+    return (
+      <AnnotationsSettingsEditView
+        annotationLayer={model.getDataLayer(editIndex)}
+        pageNav={pageNav}
+        panels={panels}
+        editIndex={editIndex}
+        navModel={navModel}
+        dashboard={dashboard}
+        onUpdate={model.onUpdate}
+        onBackToList={model.onBackToList}
+        onDelete={model.onDelete}
+      />
+    );
+  }
+
+  return (
+    <Page navModel={navModel} pageNav={pageNav} layout={PageLayoutType.Standard}>
+      <NavToolbarActions dashboard={dashboard} />
+      <AnnotationSettingsList
+        annotations={annotations}
+        onNew={model.onNew}
+        onEdit={model.onEdit}
+        onDelete={model.onDelete}
+        onMove={model.onMove}
+      />
+    </Page>
+  );
+}
+
+interface AnnotationsSettingsEditViewProps {
+  annotationLayer: dataLayers.AnnotationsDataLayer;
+  pageNav: NavModelItem;
+  panels: VizPanel[];
+  editIndex: number;
+  navModel: NavModel;
+  dashboard: DashboardScene;
+  onUpdate: (annotation: AnnotationQuery, editIndex: number) => void;
+  onBackToList: () => void;
+  onDelete: (idx: number) => void;
+}
+
+function AnnotationsSettingsEditView({
+  annotationLayer,
+  pageNav,
+  navModel,
+  panels,
+  editIndex,
+  dashboard,
+  onUpdate,
+  onBackToList,
+  onDelete,
+}: AnnotationsSettingsEditViewProps) {
+  const parentTab = pageNav.children!.find((p) => p.active)!;
+  parentTab.parentItem = pageNav;
+  const { name, query } = annotationLayer.useState();
+
+  const editAnnotationPageNav = {
+    text: name,
+    parentItem: parentTab,
+  };
+
+  return (
+    <Page navModel={navModel} pageNav={editAnnotationPageNav} layout={PageLayoutType.Standard}>
+      <NavToolbarActions dashboard={dashboard} />
+      <AnnotationSettingsEdit
+        annotation={query}
+        editIndex={editIndex}
+        panels={panels}
+        onUpdate={onUpdate}
+        onBackToList={onBackToList}
+        onDelete={onDelete}
+      />
+    </Page>
+  );
+}
diff --git a/public/app/features/dashboard-scene/settings/DashboardLinksEditView.test.tsx b/public/app/features/dashboard-scene/settings/DashboardLinksEditView.test.tsx
new file mode 100644
index 0000000000000..810d1125de098
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/DashboardLinksEditView.test.tsx
@@ -0,0 +1,240 @@
+import { render as RTLRender } from '@testing-library/react';
+import React from 'react';
+import { TestProvider } from 'test/helpers/TestProvider';
+
+import { SceneGridLayout, SceneTimeRange, behaviors } from '@grafana/scenes';
+import { DashboardCursorSync } from '@grafana/schema';
+
+import { DashboardControls } from '../scene/DashboardControls';
+import { DashboardScene } from '../scene/DashboardScene';
+import { activateFullSceneTree } from '../utils/test-utils';
+
+import { DashboardLinksEditView } from './DashboardLinksEditView';
+import { NEW_LINK } from './links/utils';
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useLocation: jest.fn().mockReturnValue({
+    pathname: '/d/dash-1/settings/links',
+    search: '',
+    hash: '',
+    state: null,
+    key: '5nvxpbdafa',
+  }),
+}));
+
+function render(component: React.ReactNode) {
+  return RTLRender(<TestProvider>{component}</TestProvider>);
+}
+
+describe('DashboardLinksEditView', () => {
+  describe('Url state', () => {
+    let settings: DashboardLinksEditView;
+
+    beforeEach(async () => {
+      const result = await buildTestScene();
+      settings = result.settings;
+    });
+
+    it('should return the correct urlKey', () => {
+      expect(settings.getUrlKey()).toBe('links');
+    });
+  });
+
+  describe('Dashboard updates', () => {
+    let dashboard: DashboardScene;
+    let settings: DashboardLinksEditView;
+
+    beforeEach(async () => {
+      const result = await buildTestScene();
+      dashboard = result.dashboard;
+      settings = result.settings;
+    });
+
+    it('should have isDirty false', () => {
+      expect(dashboard.state.isDirty).toBeFalsy();
+    });
+
+    it('should update dashboard state when adding a link', () => {
+      settings.onNewLink();
+
+      expect(dashboard.state.links[0]).toEqual(NEW_LINK);
+    });
+
+    it('should update dashboard state when deleting a link', () => {
+      dashboard.setState({ links: [NEW_LINK] });
+      settings.onDelete(0);
+
+      expect(dashboard.state.links).toEqual([]);
+    });
+
+    it('should update dashboard state when duplicating a link', () => {
+      dashboard.setState({ links: [NEW_LINK] });
+      settings.onDuplicate(NEW_LINK);
+
+      expect(dashboard.state.links).toEqual([NEW_LINK, NEW_LINK]);
+    });
+
+    it('should update dashboard state when reordering a link', () => {
+      dashboard.setState({
+        links: [
+          { ...NEW_LINK, title: 'link-1' },
+          { ...NEW_LINK, title: 'link-2' },
+        ],
+      });
+      settings.onOrderChange(0, 1);
+
+      expect(dashboard.state.links).toEqual([
+        { ...NEW_LINK, title: 'link-2' },
+        { ...NEW_LINK, title: 'link-1' },
+      ]);
+    });
+
+    it('should update dashboard state when editing a link', () => {
+      dashboard.setState({ links: [{ ...NEW_LINK, title: 'old title' }] });
+      settings.setState({ editIndex: 0 });
+      settings.onUpdateLink({ ...NEW_LINK, title: 'new title' });
+
+      expect(dashboard.state.links[0].title).toEqual('new title');
+    });
+  });
+
+  describe('Edit a link', () => {
+    let dashboard: DashboardScene;
+    let settings: DashboardLinksEditView;
+
+    beforeEach(async () => {
+      const result = await buildTestScene();
+      dashboard = result.dashboard;
+      settings = result.settings;
+    });
+
+    it('should set editIndex when editing a link', () => {
+      dashboard.setState({ links: [{ ...NEW_LINK, title: 'old title' }] });
+      settings.onEdit(0);
+
+      expect(settings.state.editIndex).toEqual(0);
+    });
+
+    it('should set editIndex when editing a link that does not exist', () => {
+      dashboard.setState({ links: [{ ...NEW_LINK, title: 'old title' }] });
+      settings.onEdit(1);
+
+      expect(settings.state.editIndex).toBe(1);
+    });
+
+    it('should update dashboard state when editing a link', () => {
+      dashboard.setState({ links: [{ ...NEW_LINK, title: 'old title' }] });
+      settings.setState({ editIndex: 0 });
+      settings.onUpdateLink({ ...NEW_LINK, title: 'new title' });
+
+      expect(dashboard.state.links[0].title).toEqual('new title');
+    });
+
+    it('should update dashboard state when going back', () => {
+      settings.setState({ editIndex: 0 });
+      settings.onGoBack();
+
+      expect(settings.state.editIndex).toBeUndefined();
+    });
+  });
+
+  describe('Render the views', () => {
+    let dashboard: DashboardScene;
+    let settings: DashboardLinksEditView;
+
+    beforeEach(async () => {
+      const result = await buildTestScene();
+      dashboard = result.dashboard;
+      settings = result.settings;
+    });
+
+    it('should render with no errors', () => {
+      expect(() => render(<settings.Component model={settings} />)).not.toThrow();
+    });
+
+    it('should render the empty state when no links', () => {
+      dashboard.setState({ links: [] });
+      const { getByText } = render(<settings.Component model={settings} />);
+
+      expect(getByText('Add dashboard link')).toBeInTheDocument();
+    });
+
+    it('should render the empty state when no links', () => {
+      dashboard.setState({ links: [] });
+      const { getByText } = render(<settings.Component model={settings} />);
+
+      expect(getByText('Add dashboard link')).toBeInTheDocument();
+    });
+
+    it('should render the list of link when there are links', () => {
+      dashboard.setState({
+        links: [
+          { ...NEW_LINK, title: 'link-1' },
+          { ...NEW_LINK, title: 'link-2' },
+        ],
+      });
+      const { getByText } = render(<settings.Component model={settings} />);
+
+      expect(getByText('link-1')).toBeInTheDocument();
+      expect(getByText('link-2')).toBeInTheDocument();
+      expect(getByText('New link')).toBeInTheDocument();
+    });
+
+    it('should render the list of link when the editing link does not exist', () => {
+      dashboard.setState({
+        links: [
+          { ...NEW_LINK, title: 'link-1' },
+          { ...NEW_LINK, title: 'link-2' },
+        ],
+      });
+      settings.setState({ editIndex: 2 });
+      const { getByText } = render(<settings.Component model={settings} />);
+
+      expect(getByText('link-1')).toBeInTheDocument();
+      expect(getByText('link-2')).toBeInTheDocument();
+      expect(getByText('New link')).toBeInTheDocument();
+    });
+
+    it('should render the link form when the editing link does exist', () => {
+      dashboard.setState({
+        links: [
+          { ...NEW_LINK, title: 'link-1' },
+          { ...NEW_LINK, title: 'link-2' },
+        ],
+      });
+      settings.setState({ editIndex: 1 });
+      const { getByText } = render(<settings.Component model={settings} />);
+
+      expect(getByText('Edit link')).toBeInTheDocument();
+      expect(getByText('Back to list')).toBeInTheDocument();
+    });
+  });
+});
+
+async function buildTestScene() {
+  const settings = new DashboardLinksEditView({});
+  const dashboard = new DashboardScene({
+    $timeRange: new SceneTimeRange({}),
+    $behaviors: [new behaviors.CursorSync({ sync: DashboardCursorSync.Off })],
+    controls: new DashboardControls({}),
+    title: 'hello',
+    uid: 'dash-1',
+    meta: {
+      canEdit: true,
+    },
+    body: new SceneGridLayout({
+      children: [],
+    }),
+    editview: settings,
+  });
+
+  activateFullSceneTree(dashboard);
+
+  await new Promise((r) => setTimeout(r, 1));
+
+  dashboard.onEnterEditMode();
+  settings.activate();
+
+  return { dashboard, settings };
+}
diff --git a/public/app/features/dashboard-scene/settings/DashboardLinksEditView.tsx b/public/app/features/dashboard-scene/settings/DashboardLinksEditView.tsx
new file mode 100644
index 0000000000000..91d8fef4c8ee6
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/DashboardLinksEditView.tsx
@@ -0,0 +1,138 @@
+import React from 'react';
+
+import { NavModel, NavModelItem, PageLayoutType, arrayUtils } from '@grafana/data';
+import { SceneComponentProps, SceneObjectBase } from '@grafana/scenes';
+import { DashboardLink } from '@grafana/schema';
+import { Page } from 'app/core/components/Page/Page';
+
+import { DashboardScene } from '../scene/DashboardScene';
+import { NavToolbarActions } from '../scene/NavToolbarActions';
+import { DashboardLinkForm } from '../settings/links/DashboardLinkForm';
+import { DashboardLinkList } from '../settings/links/DashboardLinkList';
+import { NEW_LINK } from '../settings/links/utils';
+import { getDashboardSceneFor } from '../utils/utils';
+
+import { EditListViewSceneUrlSync } from './EditListViewSceneUrlSync';
+import { DashboardEditView, DashboardEditListViewState, useDashboardEditPageNav } from './utils';
+
+export interface DashboardLinksEditViewState extends DashboardEditListViewState {}
+
+export class DashboardLinksEditView extends SceneObjectBase<DashboardLinksEditViewState> implements DashboardEditView {
+  static Component = DashboardLinksEditViewRenderer;
+
+  protected _urlSync = new EditListViewSceneUrlSync(this);
+
+  public getUrlKey(): string {
+    return 'links';
+  }
+
+  private get dashboard(): DashboardScene {
+    return getDashboardSceneFor(this);
+  }
+
+  private get links(): DashboardLink[] {
+    return this.dashboard.state.links;
+  }
+
+  private set links(links: DashboardLink[]) {
+    this.dashboard.setState({ links });
+  }
+
+  public onNewLink = () => {
+    this.links = [...this.links, NEW_LINK];
+    this.setState({ editIndex: this.links.length - 1 });
+  };
+
+  public onDelete = (idx: number) => {
+    this.links = [...this.links.slice(0, idx), ...this.links.slice(idx + 1)];
+
+    this.setState({ editIndex: undefined });
+  };
+
+  public onDuplicate = (link: DashboardLink) => {
+    this.links = [...this.links, { ...link }];
+  };
+
+  public onOrderChange = (idx: number, direction: number) => {
+    this.links = arrayUtils.moveItemImmutably(this.links, idx, idx + direction);
+  };
+
+  public onEdit = (editIndex: number) => {
+    this.setState({ editIndex });
+  };
+
+  public onUpdateLink = (link: DashboardLink) => {
+    const idx = this.state.editIndex;
+
+    if (idx === undefined) {
+      return;
+    }
+
+    this.links = [...this.links.slice(0, idx), link, ...this.links.slice(idx + 1)];
+  };
+
+  public onGoBack = () => {
+    this.setState({ editIndex: undefined });
+  };
+}
+
+function DashboardLinksEditViewRenderer({ model }: SceneComponentProps<DashboardLinksEditView>) {
+  const { editIndex } = model.useState();
+  const dashboard = getDashboardSceneFor(model);
+  const { links } = dashboard.useState();
+  const { navModel, pageNav } = useDashboardEditPageNav(dashboard, model.getUrlKey());
+  const linkToEdit = editIndex !== undefined ? links[editIndex] : undefined;
+
+  if (linkToEdit) {
+    return (
+      <EditLinkView
+        pageNav={pageNav}
+        navModel={navModel}
+        link={linkToEdit}
+        dashboard={dashboard}
+        onChange={model.onUpdateLink}
+        onGoBack={model.onGoBack}
+      />
+    );
+  }
+
+  return (
+    <Page navModel={navModel} pageNav={pageNav} layout={PageLayoutType.Standard}>
+      <NavToolbarActions dashboard={dashboard} />
+      <DashboardLinkList
+        links={links}
+        onNew={model.onNewLink}
+        onEdit={model.onEdit}
+        onDelete={model.onDelete}
+        onDuplicate={model.onDuplicate}
+        onOrderChange={model.onOrderChange}
+      />
+    </Page>
+  );
+}
+
+interface EditLinkViewProps {
+  link?: DashboardLink;
+  pageNav: NavModelItem;
+  navModel: NavModel;
+  dashboard: DashboardScene;
+  onChange: (link: DashboardLink) => void;
+  onGoBack: () => void;
+}
+
+function EditLinkView({ pageNav, link, navModel, dashboard, onChange, onGoBack }: EditLinkViewProps) {
+  const parentTab = pageNav.children!.find((p) => p.active)!;
+  parentTab.parentItem = pageNav;
+
+  const editLinkPageNav = {
+    text: 'Edit link',
+    parentItem: parentTab,
+  };
+
+  return (
+    <Page navModel={navModel} pageNav={editLinkPageNav} layout={PageLayoutType.Standard}>
+      <NavToolbarActions dashboard={dashboard} />
+      <DashboardLinkForm link={link!} onUpdate={onChange} onGoBack={onGoBack} />
+    </Page>
+  );
+}
diff --git a/public/app/features/dashboard-scene/settings/DeleteDashboardButton.tsx b/public/app/features/dashboard-scene/settings/DeleteDashboardButton.tsx
new file mode 100644
index 0000000000000..a896816dc7ad1
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/DeleteDashboardButton.tsx
@@ -0,0 +1,90 @@
+import React from 'react';
+import { useAsyncFn, useToggle } from 'react-use';
+
+import { Button, ConfirmModal, Modal } from '@grafana/ui';
+import { Trans } from 'app/core/internationalization';
+
+import { DashboardScene } from '../scene/DashboardScene';
+
+interface ButtonProps {
+  dashboard: DashboardScene;
+}
+
+export function DeleteDashboardButton({ dashboard }: ButtonProps) {
+  const [showModal, toggleModal] = useToggle(false);
+
+  return (
+    <>
+      <Button variant="destructive" onClick={toggleModal} aria-label="Dashboard settings page delete dashboard button">
+        <Trans i18nKey="dashboard-settings.dashboard-delete-button">Delete dashboard</Trans>
+      </Button>
+
+      {showModal && <DeleteDashboardModal dashboard={dashboard} onClose={toggleModal} />}
+    </>
+  );
+}
+
+interface ModalProps {
+  dashboard: DashboardScene;
+  onClose: () => void;
+}
+
+function DeleteDashboardModal({ dashboard, onClose }: ModalProps) {
+  const [, onConfirm] = useAsyncFn(async () => {
+    onClose();
+    await dashboard.deleteDashboard();
+  }, [dashboard, onClose]);
+
+  if (dashboard.state.meta.provisioned) {
+    return <ProvisionedDeleteModal dashboard={dashboard} onClose={onClose} />;
+  }
+
+  return (
+    <ConfirmModal
+      isOpen={true}
+      body={
+        <>
+          <p>Do you want to delete this dashboard?</p>
+          <p>{dashboard.state.title}</p>
+        </>
+      }
+      onConfirm={onConfirm}
+      onDismiss={onClose}
+      title="Delete"
+      icon="trash-alt"
+      confirmText="Delete"
+    />
+  );
+}
+
+function ProvisionedDeleteModal({ dashboard, onClose }: ModalProps) {
+  return (
+    <Modal isOpen={true} title="Cannot delete provisioned dashboard" icon="trash-alt" onDismiss={onClose}>
+      <p>
+        This dashboard is managed by Grafana provisioning and cannot be deleted. Remove the dashboard from the config
+        file to delete it.
+      </p>
+      <p>
+        <i>
+          See{' '}
+          <a
+            className="external-link"
+            href="https://grafana.com/docs/grafana/latest/administration/provisioning/#dashboards"
+            target="_blank"
+            rel="noreferrer"
+          >
+            documentation
+          </a>{' '}
+          for more information about provisioning.
+        </i>
+        <br />
+        File path: {dashboard.state.meta.provisionedExternalId}
+      </p>
+      <Modal.ButtonRow>
+        <Button variant="primary" onClick={onClose}>
+          OK
+        </Button>
+      </Modal.ButtonRow>
+    </Modal>
+  );
+}
diff --git a/public/app/features/dashboard-scene/settings/EditListViewSceneUrlSync.ts b/public/app/features/dashboard-scene/settings/EditListViewSceneUrlSync.ts
new file mode 100644
index 0000000000000..9821bcf13c5ff
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/EditListViewSceneUrlSync.ts
@@ -0,0 +1,35 @@
+import { SceneObjectUrlSyncHandler, SceneObjectUrlValues } from '@grafana/scenes';
+
+import { AnnotationsEditView, AnnotationsEditViewState } from './AnnotationsEditView';
+import { DashboardLinksEditView, DashboardLinksEditViewState } from './DashboardLinksEditView';
+import { VariablesEditView, VariablesEditViewState } from './VariablesEditView';
+
+type EditListViewUrlSync = DashboardLinksEditView | VariablesEditView | AnnotationsEditView;
+type EditListViewState = DashboardLinksEditViewState | VariablesEditViewState | AnnotationsEditViewState;
+export class EditListViewSceneUrlSync implements SceneObjectUrlSyncHandler {
+  constructor(private _scene: EditListViewUrlSync) {}
+
+  getKeys(): string[] {
+    return ['editIndex'];
+  }
+
+  getUrlState(): SceneObjectUrlValues {
+    const state = this._scene.state;
+    return {
+      editIndex: state.editIndex !== undefined ? String(state.editIndex) : undefined,
+    };
+  }
+
+  updateFromUrl(values: SceneObjectUrlValues): void {
+    let update: Partial<EditListViewState> = {};
+    if (typeof values.editIndex === 'string') {
+      update = { editIndex: Number(values.editIndex) };
+    } else {
+      update = { editIndex: undefined };
+    }
+
+    if (Object.keys(update).length > 0) {
+      this._scene.setState(update);
+    }
+  }
+}
diff --git a/public/app/features/dashboard-scene/settings/GeneralSettingsEditView.test.tsx b/public/app/features/dashboard-scene/settings/GeneralSettingsEditView.test.tsx
new file mode 100644
index 0000000000000..e2f343c383c26
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/GeneralSettingsEditView.test.tsx
@@ -0,0 +1,142 @@
+import { behaviors, SceneGridLayout, SceneTimeRange } from '@grafana/scenes';
+import { DashboardCursorSync } from '@grafana/schema';
+
+import * as utils from '../pages/utils';
+import { DashboardControls } from '../scene/DashboardControls';
+import { DashboardScene } from '../scene/DashboardScene';
+import { activateFullSceneTree } from '../utils/test-utils';
+
+import { GeneralSettingsEditView } from './GeneralSettingsEditView';
+
+describe('GeneralSettingsEditView', () => {
+  describe('Dashboard state', () => {
+    let dashboard: DashboardScene;
+    let settings: GeneralSettingsEditView;
+
+    beforeEach(async () => {
+      const result = await buildTestScene();
+      dashboard = result.dashboard;
+      settings = result.settings;
+    });
+
+    it('should return the correct urlKey', () => {
+      expect(settings.getUrlKey()).toBe('settings');
+    });
+
+    it('should return the dashboard', () => {
+      expect(settings.getDashboard()).toBe(dashboard);
+    });
+
+    it('should return the dashboard time range', () => {
+      expect(settings.getTimeRange()).toBe(dashboard.state.$timeRange);
+    });
+
+    it('should return the cursor sync', () => {
+      expect(settings.getCursorSync()).toBe(dashboard.state.$behaviors?.[0]);
+    });
+  });
+
+  describe('Dashboard updates', () => {
+    let dashboard: DashboardScene;
+    let settings: GeneralSettingsEditView;
+
+    beforeEach(async () => {
+      const result = await buildTestScene();
+      dashboard = result.dashboard;
+      settings = result.settings;
+    });
+
+    it('should have isDirty false', () => {
+      expect(dashboard.state.isDirty).toBeFalsy();
+    });
+
+    it('A change to title updates the dashboard state', () => {
+      settings.onTitleChange('new title');
+
+      expect(dashboard.state.title).toBe('new title');
+    });
+
+    it('A change to description updates the dashboard state', () => {
+      settings.onDescriptionChange('new description');
+
+      expect(dashboard.state.description).toBe('new description');
+    });
+
+    it('A change to description updates the dashboard state', () => {
+      settings.onTagsChange(['tag1', 'tag2']);
+
+      expect(dashboard.state.tags).toEqual(['tag1', 'tag2']);
+    });
+
+    it('A change to editable permissions updates the dashboard state', () => {
+      settings.onEditableChange(false);
+
+      expect(dashboard.state.editable).toBe(false);
+    });
+
+    it('A change to timezone updates the dashboard state', () => {
+      settings.onTimeZoneChange('UTC');
+      expect(dashboard.state.$timeRange?.state.timeZone).toBe('UTC');
+    });
+
+    it('A change to week start updates the dashboard state', () => {
+      settings.onWeekStartChange('monday');
+
+      expect(settings.getTimeRange().state.weekStart).toBe('monday');
+    });
+
+    it('A change to refresh interval updates the dashboard state', () => {
+      settings.onRefreshIntervalChange(['5s']);
+      expect(settings.getRefreshPicker()?.state?.intervals).toEqual(['5s']);
+    });
+
+    it('A change to folder updates the dashboard state', async () => {
+      const updateNavModel = jest.spyOn(utils, 'updateNavModel').mockImplementation(jest.fn());
+
+      await settings.onFolderChange('folder-2', 'folder 2');
+
+      expect(dashboard.state.meta.folderUid).toBe('folder-2');
+      expect(dashboard.state.meta.folderTitle).toBe('folder 2');
+      expect(updateNavModel).toHaveBeenCalledWith('folder-2');
+    });
+
+    it('A change to tooltip settings updates the dashboard state', () => {
+      settings.onTooltipChange(DashboardCursorSync.Crosshair);
+
+      expect(settings.getCursorSync()?.state.sync).toBe(DashboardCursorSync.Crosshair);
+    });
+
+    it('A change to time picker visiblity settings updates the dashboard state', () => {
+      settings.onHideTimePickerChange(true);
+
+      expect(settings.getDashboardControls()?.state.hideTimeControls).toBe(true);
+    });
+  });
+});
+
+async function buildTestScene() {
+  const settings = new GeneralSettingsEditView({});
+  const dashboard = new DashboardScene({
+    $timeRange: new SceneTimeRange({}),
+    $behaviors: [new behaviors.CursorSync({ sync: DashboardCursorSync.Off })],
+    controls: new DashboardControls({}),
+    title: 'hello',
+    uid: 'dash-1',
+    meta: {
+      canEdit: true,
+    },
+    body: new SceneGridLayout({
+      children: [],
+    }),
+    editview: settings,
+  });
+
+  activateFullSceneTree(dashboard);
+
+  await new Promise((r) => setTimeout(r, 1));
+
+  dashboard.onEnterEditMode();
+  settings.activate();
+
+  return { dashboard, settings };
+}
diff --git a/public/app/features/dashboard-scene/settings/GeneralSettingsEditView.tsx b/public/app/features/dashboard-scene/settings/GeneralSettingsEditView.tsx
new file mode 100644
index 0000000000000..ec68a8db96444
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/GeneralSettingsEditView.tsx
@@ -0,0 +1,281 @@
+import React, { ChangeEvent } from 'react';
+
+import { PageLayoutType } from '@grafana/data';
+import { config } from '@grafana/runtime';
+import { SceneComponentProps, SceneObjectBase, behaviors, sceneGraph } from '@grafana/scenes';
+import { TimeZone } from '@grafana/schema';
+import {
+  Box,
+  CollapsableSection,
+  Field,
+  Input,
+  Label,
+  RadioButtonGroup,
+  Stack,
+  TagsInput,
+  TextArea,
+} from '@grafana/ui';
+import { Page } from 'app/core/components/Page/Page';
+import { FolderPicker } from 'app/core/components/Select/FolderPicker';
+import { t, Trans } from 'app/core/internationalization';
+import { TimePickerSettings } from 'app/features/dashboard/components/DashboardSettings/TimePickerSettings';
+import { GenAIDashDescriptionButton } from 'app/features/dashboard/components/GenAI/GenAIDashDescriptionButton';
+import { GenAIDashTitleButton } from 'app/features/dashboard/components/GenAI/GenAIDashTitleButton';
+
+import { updateNavModel } from '../pages/utils';
+import { DashboardScene } from '../scene/DashboardScene';
+import { NavToolbarActions } from '../scene/NavToolbarActions';
+import { dashboardSceneGraph } from '../utils/dashboardSceneGraph';
+import { getDashboardSceneFor } from '../utils/utils';
+
+import { DeleteDashboardButton } from './DeleteDashboardButton';
+import { DashboardEditView, DashboardEditViewState, useDashboardEditPageNav } from './utils';
+
+export interface GeneralSettingsEditViewState extends DashboardEditViewState {}
+
+const EDITABLE_OPTIONS = [
+  { label: 'Editable', value: true },
+  { label: 'Read-only', value: false },
+];
+
+const GRAPH_TOOLTIP_OPTIONS = [
+  { value: 0, label: 'Default' },
+  { value: 1, label: 'Shared crosshair' },
+  { value: 2, label: 'Shared Tooltip' },
+];
+
+export class GeneralSettingsEditView
+  extends SceneObjectBase<GeneralSettingsEditViewState>
+  implements DashboardEditView
+{
+  private get _dashboard(): DashboardScene {
+    return getDashboardSceneFor(this);
+  }
+
+  public getUrlKey(): string {
+    return 'settings';
+  }
+
+  public getDashboard(): DashboardScene {
+    return this._dashboard;
+  }
+
+  public getTimeRange() {
+    return sceneGraph.getTimeRange(this._dashboard);
+  }
+
+  public getRefreshPicker() {
+    return this.getDashboardControls().state.refreshPicker;
+  }
+
+  public getCursorSync() {
+    return dashboardSceneGraph.getCursorSync(this._dashboard);
+  }
+
+  public getLiveNowTimer(): behaviors.LiveNowTimer {
+    const liveNowTimer = sceneGraph.findObject(this._dashboard, (s) => s instanceof behaviors.LiveNowTimer);
+    if (liveNowTimer instanceof behaviors.LiveNowTimer) {
+      return liveNowTimer;
+    } else {
+      throw new Error('LiveNowTimer could not be found');
+    }
+  }
+
+  public getDashboardControls() {
+    return this._dashboard.state.controls!;
+  }
+
+  public onTitleChange = (value: string) => {
+    this._dashboard.setState({ title: value });
+  };
+
+  public onDescriptionChange = (value: string) => {
+    this._dashboard.setState({ description: value });
+  };
+
+  public onTagsChange = (value: string[]) => {
+    this._dashboard.setState({ tags: value });
+  };
+
+  public onFolderChange = async (newUID: string | undefined, newTitle: string | undefined) => {
+    const newMeta = {
+      ...this._dashboard.state.meta,
+      folderUid: newUID || this._dashboard.state.meta.folderUid,
+      folderTitle: newTitle || this._dashboard.state.meta.folderTitle,
+    };
+
+    if (newMeta.folderUid) {
+      await updateNavModel(newMeta.folderUid);
+    }
+
+    this._dashboard.setState({ meta: newMeta });
+  };
+
+  public onEditableChange = (value: boolean) => {
+    this._dashboard.setState({ editable: value });
+  };
+
+  public onTimeZoneChange = (value: TimeZone) => {
+    this.getTimeRange().setState({
+      timeZone: value,
+    });
+  };
+
+  public onWeekStartChange = (value: string) => {
+    this.getTimeRange().setState({
+      weekStart: value,
+    });
+  };
+
+  public onRefreshIntervalChange = (value: string[]) => {
+    const control = this.getRefreshPicker();
+    control?.setState({
+      intervals: value,
+    });
+  };
+
+  public onNowDelayChange = (value: string) => {
+    const timeRange = this.getTimeRange();
+
+    timeRange?.setState({
+      UNSAFE_nowDelay: value,
+    });
+  };
+
+  public onHideTimePickerChange = (value: boolean) => {
+    this.getDashboardControls()?.setState({
+      hideTimeControls: value,
+    });
+  };
+
+  public onLiveNowChange = (enable: boolean) => {
+    try {
+      const liveNow = this.getLiveNowTimer();
+      enable ? liveNow.enable() : liveNow.disable();
+    } catch (err) {
+      console.error(err);
+    }
+  };
+
+  public onTooltipChange = (value: number) => {
+    this.getCursorSync()?.setState({ sync: value });
+  };
+
+  public onDeleteDashboard = () => {};
+
+  static Component = ({ model }: SceneComponentProps<GeneralSettingsEditView>) => {
+    const dashboard = model.getDashboard();
+    const { navModel, pageNav } = useDashboardEditPageNav(dashboard, model.getUrlKey());
+    const { title, description, tags, meta, editable } = dashboard.useState();
+    const { sync: graphTooltip } = model.getCursorSync()?.useState() || {};
+    const { timeZone, weekStart, UNSAFE_nowDelay: nowDelay } = model.getTimeRange().useState();
+    const { intervals } = model.getRefreshPicker().useState();
+    const { hideTimeControls } = model.getDashboardControls().useState();
+    const { enabled: liveNow } = model.getLiveNowTimer().useState();
+
+    return (
+      <Page navModel={navModel} pageNav={pageNav} layout={PageLayoutType.Standard}>
+        <NavToolbarActions dashboard={dashboard} />
+        <div style={{ maxWidth: '600px' }}>
+          <Box marginBottom={5}>
+            <Field
+              label={
+                <Stack justifyContent="space-between">
+                  <Label htmlFor="title-input">
+                    <Trans i18nKey="dashboard-settings.general.title-label">Title</Trans>
+                  </Label>
+                  {config.featureToggles.dashgpt && (
+                    <GenAIDashTitleButton onGenerate={(title) => model.onTitleChange(title)} />
+                  )}
+                </Stack>
+              }
+            >
+              <Input
+                id="title-input"
+                name="title"
+                value={title}
+                onChange={(e: ChangeEvent<HTMLInputElement>) => model.onTitleChange(e.target.value)}
+              />
+            </Field>
+            <Field
+              label={
+                <Stack justifyContent="space-between">
+                  <Label htmlFor="description-input">
+                    {t('dashboard-settings.general.description-label', 'Description')}
+                  </Label>
+                  {config.featureToggles.dashgpt && (
+                    <GenAIDashDescriptionButton onGenerate={(description) => model.onDescriptionChange(description)} />
+                  )}
+                </Stack>
+              }
+            >
+              <TextArea
+                id="description-input"
+                name="description"
+                value={description}
+                onChange={(e: ChangeEvent<HTMLTextAreaElement>) => model.onDescriptionChange(e.target.value)}
+              />
+            </Field>
+            <Field label={t('dashboard-settings.general.tags-label', 'Tags')}>
+              <TagsInput id="tags-input" tags={tags} onChange={model.onTagsChange} width={40} />
+            </Field>
+            <Field label={t('dashboard-settings.general.folder-label', 'Folder')}>
+              <FolderPicker
+                value={meta.folderUid}
+                onChange={model.onFolderChange}
+                // TODO deprecated props that can be removed once NestedFolderPicker is enabled by default
+                initialTitle={meta.folderTitle}
+                inputId="dashboard-folder-input"
+                enableCreateNew
+                skipInitialLoad
+              />
+            </Field>
+
+            <Field
+              label={t('dashboard-settings.general.editable-label', 'Editable')}
+              description={t(
+                'dashboard-settings.general.editable-description',
+                'Set to read-only to disable all editing. Reload the dashboard for changes to take effect'
+              )}
+            >
+              <RadioButtonGroup value={editable} options={EDITABLE_OPTIONS} onChange={model.onEditableChange} />
+            </Field>
+          </Box>
+
+          <TimePickerSettings
+            onTimeZoneChange={model.onTimeZoneChange}
+            onWeekStartChange={model.onWeekStartChange}
+            onRefreshIntervalChange={model.onRefreshIntervalChange}
+            onNowDelayChange={model.onNowDelayChange}
+            onHideTimePickerChange={model.onHideTimePickerChange}
+            onLiveNowChange={model.onLiveNowChange}
+            refreshIntervals={intervals}
+            timePickerHidden={hideTimeControls}
+            nowDelay={nowDelay || ''}
+            liveNow={liveNow}
+            timezone={timeZone || ''}
+            weekStart={weekStart || ''}
+          />
+
+          {/* @todo: Update "Graph tooltip" description to remove prompt about reloading when resolving #46581 */}
+          <CollapsableSection
+            label={t('dashboard-settings.general.panel-options-label', 'Panel options')}
+            isOpen={true}
+          >
+            <Field
+              label={t('dashboard-settings.general.panel-options-graph-tooltip-label', 'Graph tooltip')}
+              description={t(
+                'dashboard-settings.general.panel-options-graph-tooltip-description',
+                'Controls tooltip and hover highlight behavior across different panels. Reload the dashboard for changes to take effect'
+              )}
+            >
+              <RadioButtonGroup onChange={model.onTooltipChange} options={GRAPH_TOOLTIP_OPTIONS} value={graphTooltip} />
+            </Field>
+          </CollapsableSection>
+
+          <Box marginTop={3}>{meta.canDelete && <DeleteDashboardButton dashboard={dashboard} />}</Box>
+        </div>
+      </Page>
+    );
+  };
+}
diff --git a/public/app/features/dashboard-scene/settings/JsonModelEditView.tsx b/public/app/features/dashboard-scene/settings/JsonModelEditView.tsx
new file mode 100644
index 0000000000000..070dcf781c202
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/JsonModelEditView.tsx
@@ -0,0 +1,210 @@
+import { css } from '@emotion/css';
+import React, { useState } from 'react';
+
+import { GrafanaTheme2, PageLayoutType } from '@grafana/data';
+import { SceneComponentProps, SceneObjectBase, sceneUtils } from '@grafana/scenes';
+import { Dashboard } from '@grafana/schema';
+import { Alert, Box, Button, CodeEditor, Stack, useStyles2 } from '@grafana/ui';
+import { Page } from 'app/core/components/Page/Page';
+import { Trans } from 'app/core/internationalization';
+import { getPrettyJSON } from 'app/features/inspector/utils/utils';
+import { DashboardDTO, SaveDashboardResponseDTO } from 'app/types';
+
+import {
+  NameAlreadyExistsError,
+  isNameExistsError,
+  isPluginDashboardError,
+  isVersionMismatchError,
+} from '../saving/shared';
+import { useSaveDashboard } from '../saving/useSaveDashboard';
+import { DashboardScene } from '../scene/DashboardScene';
+import { NavToolbarActions } from '../scene/NavToolbarActions';
+import { transformSaveModelToScene } from '../serialization/transformSaveModelToScene';
+import { transformSceneToSaveModel } from '../serialization/transformSceneToSaveModel';
+import { getDashboardSceneFor } from '../utils/utils';
+
+import { DashboardEditView, DashboardEditViewState, useDashboardEditPageNav } from './utils';
+
+export interface JsonModelEditViewState extends DashboardEditViewState {
+  jsonText: string;
+}
+
+export class JsonModelEditView extends SceneObjectBase<JsonModelEditViewState> implements DashboardEditView {
+  constructor(state: Omit<JsonModelEditViewState, 'jsonText' | 'initialJsonText'>) {
+    super({
+      ...state,
+      jsonText: '',
+    });
+
+    this.addActivationHandler(() => this.setState({ jsonText: this.getJsonText() }));
+  }
+  public getUrlKey(): string {
+    return 'json-model';
+  }
+
+  public getDashboard(): DashboardScene {
+    return getDashboardSceneFor(this);
+  }
+
+  public getSaveModel(): Dashboard {
+    const dashboard = this.getDashboard();
+    return transformSceneToSaveModel(dashboard);
+  }
+
+  public getJsonText(): string {
+    const jsonData = this.getSaveModel();
+    return getPrettyJSON(jsonData);
+  }
+
+  public onCodeEditorBlur = (value: string) => {
+    this.setState({ jsonText: value });
+  };
+
+  public onSaveSuccess = (result: SaveDashboardResponseDTO) => {
+    const jsonModel = JSON.parse(this.state.jsonText);
+    const dashboard = this.getDashboard();
+    jsonModel.version = result.version;
+
+    const rsp: DashboardDTO = {
+      dashboard: jsonModel,
+      meta: dashboard.state.meta,
+    };
+    const newDashboardScene = transformSaveModelToScene(rsp);
+    const newState = sceneUtils.cloneSceneObjectState(newDashboardScene.state);
+
+    dashboard.pauseTrackingChanges();
+    dashboard.setInitialSaveModel(rsp.dashboard);
+    dashboard.setState(newState);
+
+    this.setState({ jsonText: this.getJsonText() });
+  };
+
+  static Component = ({ model }: SceneComponentProps<JsonModelEditView>) => {
+    const { state, onSaveDashboard } = useSaveDashboard(false);
+    const [isSaving, setIsSaving] = useState(false);
+
+    const dashboard = model.getDashboard();
+
+    const { navModel, pageNav } = useDashboardEditPageNav(dashboard, model.getUrlKey());
+    const canSave = dashboard.useState().meta.canSave;
+    const { jsonText } = model.useState();
+
+    const onSave = async (overwrite: boolean) => {
+      const result = await onSaveDashboard(dashboard, JSON.parse(model.state.jsonText), {
+        folderUid: dashboard.state.meta.folderUid,
+        overwrite,
+      });
+
+      setIsSaving(true);
+      if (result.status === 'success') {
+        model.onSaveSuccess(result);
+        setIsSaving(false);
+      } else {
+        setIsSaving(true);
+      }
+    };
+
+    const saveButton = (overwrite: boolean) => (
+      <Button
+        type="submit"
+        onClick={() => {
+          onSave(overwrite);
+        }}
+        variant={overwrite ? 'destructive' : 'primary'}
+      >
+        {overwrite ? (
+          'Save and overwrite'
+        ) : (
+          <Trans i18nKey="dashboard-settings.json-editor.save-button">Save changes</Trans>
+        )}
+      </Button>
+    );
+
+    const cancelButton = (
+      <Button variant="secondary" onClick={() => setIsSaving(false)} fill="outline">
+        Cancel
+      </Button>
+    );
+    const styles = useStyles2(getStyles);
+
+    function renderSaveButtonAndError(error?: Error) {
+      if (error && isSaving) {
+        if (isVersionMismatchError(error)) {
+          return (
+            <Alert title="Someone else has updated this dashboard" severity="error">
+              <p>Would you still like to save this dashboard?</p>
+              <Box paddingTop={2}>
+                <Stack alignItems="center">
+                  {cancelButton}
+                  {saveButton(true)}
+                </Stack>
+              </Box>
+            </Alert>
+          );
+        }
+
+        if (isNameExistsError(error)) {
+          return <NameAlreadyExistsError saveButton={saveButton} cancelButton={cancelButton} />;
+        }
+
+        if (isPluginDashboardError(error)) {
+          return (
+            <Alert title="Plugin dashboard" severity="error">
+              <p>
+                Your changes will be lost when you update the plugin. Use <strong>Save As</strong> to create custom
+                version.
+              </p>
+              <Box paddingTop={2}>
+                <Stack alignItems="center">{saveButton(true)}</Stack>
+              </Box>
+            </Alert>
+          );
+        }
+      }
+
+      return (
+        <>
+          {error && isSaving && (
+            <Alert title="Failed to save dashboard" severity="error">
+              <p>{error.message}</p>
+            </Alert>
+          )}
+          <Stack alignItems="center">{saveButton(false)}</Stack>
+        </>
+      );
+    }
+    return (
+      <Page navModel={navModel} pageNav={pageNav} layout={PageLayoutType.Standard}>
+        <NavToolbarActions dashboard={dashboard} />
+        <div className={styles.wrapper}>
+          <Trans i18nKey="dashboard-settings.json-editor.subtitle">
+            The JSON model below is the data structure that defines the dashboard. This includes dashboard settings,
+            panel settings, layout, queries, and so on.
+          </Trans>
+          <CodeEditor
+            width="100%"
+            value={jsonText}
+            language="json"
+            showLineNumbers={true}
+            showMiniMap={true}
+            containerStyles={styles.codeEditor}
+            onBlur={model.onCodeEditorBlur}
+          />
+          {canSave && <Box paddingTop={2}>{renderSaveButtonAndError(state.error)}</Box>}
+        </div>
+      </Page>
+    );
+  };
+}
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  wrapper: css({
+    display: 'flex',
+    height: '100%',
+    flexDirection: 'column',
+    gap: theme.spacing(2),
+  }),
+  codeEditor: css({
+    flexGrow: 1,
+  }),
+});
diff --git a/public/app/features/dashboard-scene/settings/PermissionsEditView.test.tsx b/public/app/features/dashboard-scene/settings/PermissionsEditView.test.tsx
new file mode 100644
index 0000000000000..4bb9868502f7c
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/PermissionsEditView.test.tsx
@@ -0,0 +1,53 @@
+import { SceneGridLayout, SceneTimeRange } from '@grafana/scenes';
+
+import { DashboardScene } from '../scene/DashboardScene';
+import { activateFullSceneTree } from '../utils/test-utils';
+
+import { PermissionsEditView } from './PermissionsEditView';
+
+describe('PermissionsEditView', () => {
+  describe('Dashboard permissions state', () => {
+    let dashboard: DashboardScene;
+    let permissionsView: PermissionsEditView;
+
+    beforeEach(async () => {
+      const result = await buildTestScene();
+      dashboard = result.dashboard;
+      permissionsView = result.permissionsView;
+    });
+
+    it('should return the correct urlKey', () => {
+      expect(permissionsView.getUrlKey()).toBe('permissions');
+    });
+
+    it('should return the dashboard', () => {
+      expect(permissionsView.getDashboard()).toBe(dashboard);
+    });
+  });
+});
+
+async function buildTestScene() {
+  const permissionsView = new PermissionsEditView({});
+  const dashboard = new DashboardScene({
+    $timeRange: new SceneTimeRange({}),
+    title: 'hello',
+    uid: 'dash-1',
+    version: 4,
+    meta: {
+      canEdit: true,
+    },
+    body: new SceneGridLayout({
+      children: [],
+    }),
+    editview: permissionsView,
+  });
+
+  activateFullSceneTree(dashboard);
+
+  await new Promise((r) => setTimeout(r, 1));
+
+  dashboard.onEnterEditMode();
+  permissionsView.activate();
+
+  return { dashboard, permissionsView };
+}
diff --git a/public/app/features/dashboard-scene/settings/PermissionsEditView.tsx b/public/app/features/dashboard-scene/settings/PermissionsEditView.tsx
new file mode 100644
index 0000000000000..b36e4b1ff7042
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/PermissionsEditView.tsx
@@ -0,0 +1,46 @@
+import React from 'react';
+
+import { PageLayoutType } from '@grafana/data';
+import { SceneComponentProps, SceneObjectBase } from '@grafana/scenes';
+import { Permissions } from 'app/core/components/AccessControl';
+import { Page } from 'app/core/components/Page/Page';
+import { contextSrv } from 'app/core/core';
+import { AccessControlAction } from 'app/types';
+
+import { DashboardScene } from '../scene/DashboardScene';
+import { NavToolbarActions } from '../scene/NavToolbarActions';
+import { getDashboardSceneFor } from '../utils/utils';
+
+import { DashboardEditView, DashboardEditViewState, useDashboardEditPageNav } from './utils';
+
+interface PermissionsEditViewState extends DashboardEditViewState {}
+
+export class PermissionsEditView extends SceneObjectBase<PermissionsEditViewState> implements DashboardEditView {
+  public static Component = PermissionsEditorSettings;
+
+  private get _dashboard(): DashboardScene {
+    return getDashboardSceneFor(this);
+  }
+
+  public getUrlKey(): string {
+    return 'permissions';
+  }
+
+  public getDashboard(): DashboardScene {
+    return this._dashboard;
+  }
+}
+
+function PermissionsEditorSettings({ model }: SceneComponentProps<PermissionsEditView>) {
+  const dashboard = model.getDashboard();
+  const { uid } = dashboard.useState();
+  const { navModel, pageNav } = useDashboardEditPageNav(dashboard, model.getUrlKey());
+  const canSetPermissions = contextSrv.hasPermission(AccessControlAction.DashboardsPermissionsWrite);
+
+  return (
+    <Page navModel={navModel} pageNav={pageNav} layout={PageLayoutType.Standard}>
+      <NavToolbarActions dashboard={dashboard} />
+      <Permissions resource={'dashboards'} resourceId={uid ?? ''} canSetPermissions={canSetPermissions} />
+    </Page>
+  );
+}
diff --git a/public/app/features/dashboard-scene/settings/VariablesEditView.test.tsx b/public/app/features/dashboard-scene/settings/VariablesEditView.test.tsx
new file mode 100644
index 0000000000000..a547fa10d4f0a
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/VariablesEditView.test.tsx
@@ -0,0 +1,370 @@
+import { of } from 'rxjs';
+
+import {
+  FieldType,
+  LoadingState,
+  PanelData,
+  VariableSupportType,
+  getDefaultTimeRange,
+  toDataFrame,
+} from '@grafana/data';
+import { getPanelPlugin } from '@grafana/data/test/__mocks__/pluginMocks';
+import { setPluginImportUtils, setRunRequest } from '@grafana/runtime';
+import {
+  SceneVariableSet,
+  CustomVariable,
+  SceneGridLayout,
+  VizPanel,
+  AdHocFiltersVariable,
+  SceneVariableState,
+  SceneTimeRange,
+} from '@grafana/scenes';
+import { mockDataSource } from 'app/features/alerting/unified/mocks';
+import { LegacyVariableQueryEditor } from 'app/features/variables/editor/LegacyVariableQueryEditor';
+
+import { DashboardGridItem } from '../scene/DashboardGridItem';
+import { DashboardScene } from '../scene/DashboardScene';
+import { activateFullSceneTree } from '../utils/test-utils';
+
+import { VariablesEditView } from './VariablesEditView';
+
+setPluginImportUtils({
+  importPanelPlugin: (id: string) => Promise.resolve(getPanelPlugin({})),
+  getPanelPluginFromCache: (id: string) => undefined,
+});
+
+const defaultDatasource = mockDataSource({
+  name: 'Default Test Data Source',
+  type: 'test',
+});
+
+const promDatasource = mockDataSource({
+  name: 'Prometheus',
+  type: 'prometheus',
+});
+
+jest.mock('@grafana/runtime/src/services/dataSourceSrv', () => ({
+  ...jest.requireActual('@grafana/runtime/src/services/dataSourceSrv'),
+  getDataSourceSrv: () => ({
+    get: async () => ({
+      ...defaultDatasource,
+      variables: {
+        getType: () => VariableSupportType.Custom,
+        query: jest.fn(),
+        editor: jest.fn().mockImplementation(LegacyVariableQueryEditor),
+      },
+    }),
+    getList: () => [defaultDatasource, promDatasource],
+    getInstanceSettings: () => ({ ...defaultDatasource }),
+  }),
+}));
+
+const runRequestMock = jest.fn().mockReturnValue(
+  of<PanelData>({
+    state: LoadingState.Done,
+    series: [
+      toDataFrame({
+        fields: [{ name: 'text', type: FieldType.string, values: ['val1', 'val2', 'val11'] }],
+      }),
+    ],
+    timeRange: getDefaultTimeRange(),
+  })
+);
+
+setRunRequest(runRequestMock);
+
+describe('VariablesEditView', () => {
+  describe('Dashboard Variables state', () => {
+    let dashboard: DashboardScene;
+    let variableView: VariablesEditView;
+
+    beforeEach(async () => {
+      const result = await buildTestScene();
+      dashboard = result.dashboard;
+      variableView = result.variableView;
+    });
+
+    it('should return the correct urlKey', () => {
+      expect(variableView.getUrlKey()).toBe('variables');
+    });
+
+    it('should return the dashboard', () => {
+      expect(variableView.getDashboard()).toBe(dashboard);
+    });
+
+    it('should return the list of variables', () => {
+      const expectedVariables = [
+        {
+          type: 'custom',
+          name: 'customVar',
+          query: 'test, test2',
+          value: 'test',
+        },
+        {
+          type: 'custom',
+          name: 'customVar2',
+          query: 'test3, test4, $customVar',
+          value: 'test3',
+        },
+        {
+          type: 'adhoc',
+          name: 'adhoc',
+        },
+      ];
+      const variables = variableView.getVariables();
+      expect(variables).toHaveLength(3);
+      expect(variables[0].state).toMatchObject(expectedVariables[0]);
+      expect(variables[1].state).toMatchObject(expectedVariables[1]);
+      expect(variables[2].state).toMatchObject(expectedVariables[2]);
+    });
+  });
+
+  describe('Dashboard Variables actions', () => {
+    let variableView: VariablesEditView;
+
+    beforeEach(async () => {
+      const result = await buildTestScene();
+      variableView = result.variableView;
+    });
+
+    it('should duplicate a variable', () => {
+      const variables = variableView.getVariables();
+      const variable = variables[0];
+      variableView.onDuplicated(variable.state.name);
+      expect(variableView.getVariables()).toHaveLength(4);
+      expect(variableView.getVariables()[1].state.name).toBe('copy_of_customVar');
+    });
+
+    it('should handle name when duplicating a variable twice', () => {
+      const variableIdentifier = 'customVar';
+      variableView.onDuplicated(variableIdentifier);
+      variableView.onDuplicated(variableIdentifier);
+      expect(variableView.getVariables()).toHaveLength(5);
+      expect(variableView.getVariables()[1].state.name).toBe('copy_of_customVar_1');
+      expect(variableView.getVariables()[2].state.name).toBe('copy_of_customVar');
+    });
+
+    it('should delete a variable', () => {
+      const variableIdentifier = 'customVar';
+
+      variableView.onEdit(variableIdentifier);
+      expect(variableView.state.editIndex).toBe(0);
+
+      variableView.onDelete(variableIdentifier);
+      expect(variableView.getVariables()).toHaveLength(2);
+      expect(variableView.getVariables()[0].state.name).toBe('customVar2');
+      expect(variableView.state.editIndex).toBeUndefined();
+    });
+
+    it('should change order of variables', () => {
+      const fromIndex = 0; // customVar is first
+      const toIndex = 1;
+      variableView.onOrderChanged(fromIndex, toIndex);
+      expect(variableView.getVariables()[0].state.name).toBe('customVar2');
+      expect(variableView.getVariables()[1].state.name).toBe('customVar');
+    });
+
+    it('should keep the same order of variables with invalid indexes', () => {
+      const fromIndex = 0;
+      const toIndex = 3;
+
+      const errorSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
+
+      variableView.onOrderChanged(fromIndex, toIndex);
+      expect(errorSpy).toHaveBeenCalledTimes(1);
+      expect(variableView.getVariables()[0].state.name).toBe('customVar');
+      expect(variableView.getVariables()[1].state.name).toBe('customVar2');
+
+      errorSpy.mockRestore();
+    });
+
+    it('should change the variable type creating a new variable object', () => {
+      const previousVariable = variableView.getVariables()[1] as CustomVariable;
+      variableView.onEdit('customVar2');
+
+      variableView.onTypeChange('adhoc');
+      expect(variableView.getVariables()).toHaveLength(3);
+      const variable = variableView.getVariables()[1];
+      expect(variable).not.toBe(previousVariable);
+      expect(variable.state.type).toBe('adhoc');
+
+      // Values to be kept between the old and new variable
+      expect(variable.state.name).toEqual(previousVariable.state.name);
+      expect(variable.state.label).toEqual(previousVariable.state.label);
+    });
+
+    it('should reset editing variable when going back', () => {
+      variableView.onEdit('customVar2');
+      expect(variableView.state.editIndex).toBe(1);
+
+      variableView.onGoBack();
+      expect(variableView.state.editIndex).toBeUndefined();
+    });
+
+    it('should add default new query variable when onAdd is called', () => {
+      variableView.onAdd();
+      expect(variableView.getVariables()).toHaveLength(4);
+      expect(variableView.getVariables()[3].state.name).toBe('query0');
+      expect(variableView.getVariables()[3].state.type).toBe('query');
+    });
+
+    afterEach(() => {
+      jest.clearAllMocks();
+    });
+  });
+
+  describe('Variables name validation', () => {
+    let variableView: VariablesEditView;
+    let variable1: SceneVariableState;
+    let variable2: SceneVariableState;
+
+    beforeAll(async () => {
+      const result = await buildTestScene();
+      variableView = result.variableView;
+
+      const variables = variableView.getVariables();
+      variable1 = variables[0].state;
+      variable2 = variables[1].state;
+    });
+
+    it('should not return error on same name and key', () => {
+      expect(variableView.onValidateVariableName(variable1.name, variable1.key)[0]).toBe(false);
+    });
+
+    it('should not return error if name is unique', () => {
+      expect(variableView.onValidateVariableName('unique_variable_name', variable1.key)[0]).toBe(false);
+    });
+
+    it('should return error if global variable name is used', () => {
+      expect(variableView.onValidateVariableName('__', variable1.key)[0]).toBe(true);
+    });
+
+    it('should not return error if global variable name is used not at the beginning ', () => {
+      expect(variableView.onValidateVariableName('test__', variable1.key)[0]).toBe(false);
+    });
+
+    it('should return error if name is empty', () => {
+      expect(variableView.onValidateVariableName('', variable1.key)[0]).toBe(true);
+    });
+
+    it('should return error if non word characters are used', () => {
+      expect(variableView.onValidateVariableName('-', variable1.key)[0]).toBe(true);
+    });
+
+    it('should return error if variable name is taken', () => {
+      expect(variableView.onValidateVariableName(variable2.name, variable1.key)[0]).toBe(true);
+    });
+  });
+
+  describe('Dashboard Variables dependencies', () => {
+    let variableView: VariablesEditView;
+    let dashboard: DashboardScene;
+
+    beforeEach(async () => {
+      const result = await buildTestScene();
+      variableView = result.variableView;
+      dashboard = result.dashboard;
+    });
+
+    // FIXME: This is not working because the variable is replaced or it is not resolved yet
+    it.skip('should keep dependencies between variables the type is changed so the variable is replaced', () => {
+      // Uses function to avoid store reference to previous existing variables
+      const getSourceVariable = () => variableView.getVariables()[0] as CustomVariable;
+      const getDependantVariable = () => variableView.getVariables()[1] as CustomVariable;
+
+      expect(getSourceVariable().getValue()).toBe('test');
+      // Using getOptionsForSelect to get the interpolated values
+      expect(getDependantVariable().getOptionsForSelect()[2].label).toBe('test');
+
+      variableView.onEdit(getSourceVariable().state.name);
+      // Simulating changing the type and update the value
+      variableView.onTypeChange('constant');
+      getSourceVariable().setState({ value: 'newValue' });
+
+      expect(getSourceVariable().getValue()).toBe('newValue');
+      expect(getDependantVariable().getOptionsForSelect()[2].label).toBe('newValue');
+    });
+
+    it('should keep dependencies with panels when the type is changed so the variable is replaced', async () => {
+      // Uses function to avoid store reference to previous existing variables
+      const getSourceVariable = () => variableView.getVariables()[0] as CustomVariable;
+      const getDependantPanel = () =>
+        ((dashboard.state.body as SceneGridLayout).state.children[0] as DashboardGridItem).state.body as VizPanel;
+
+      expect(getSourceVariable().getValue()).toBe('test');
+      // Using description to get the interpolated value
+      expect(getDependantPanel().getDescription()).toContain('Panel A depends on customVar with current value test');
+
+      variableView.onEdit(getSourceVariable().state.name);
+      // Simulating changing the type and update the value
+      variableView.onTypeChange('constant');
+      getSourceVariable().setState({ value: 'newValue' });
+
+      expect(getSourceVariable().getValue()).toBe('newValue');
+      expect(getDependantPanel().getDescription()).toContain('newValue');
+    });
+  });
+});
+
+async function buildTestScene() {
+  const variableView = new VariablesEditView({});
+  const dashboard = new DashboardScene({
+    title: 'Dashboard with variables',
+    uid: 'dash-variables',
+    meta: {
+      canEdit: true,
+    },
+    $timeRange: new SceneTimeRange({}),
+    $variables: new SceneVariableSet({
+      variables: [
+        new CustomVariable({
+          name: 'customVar',
+          query: 'test, test2',
+          value: 'test',
+          text: 'test',
+        }),
+        new CustomVariable({
+          name: 'customVar2',
+          query: 'test3, test4, $customVar',
+          value: '$customVar',
+          text: '$customVar',
+        }),
+        new AdHocFiltersVariable({
+          type: 'adhoc',
+          name: 'adhoc',
+          filters: [
+            {
+              key: 'test',
+              operator: '=',
+              value: 'testValue',
+            },
+          ],
+        }),
+      ],
+    }),
+    body: new SceneGridLayout({
+      children: [
+        new DashboardGridItem({
+          key: 'griditem-1',
+          x: 0,
+          body: new VizPanel({
+            title: 'Panel A',
+            description: 'Panel A depends on customVar with current value $customVar',
+            key: 'panel-1',
+            pluginId: 'table',
+          }),
+        }),
+      ],
+    }),
+    editview: variableView,
+  });
+
+  activateFullSceneTree(dashboard);
+
+  await new Promise((r) => setTimeout(r, 1));
+
+  dashboard.onEnterEditMode();
+  variableView.activate();
+
+  return { dashboard, variableView };
+}
diff --git a/public/app/features/dashboard-scene/settings/VariablesEditView.tsx b/public/app/features/dashboard-scene/settings/VariablesEditView.tsx
new file mode 100644
index 0000000000000..be8dea55b3ca1
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/VariablesEditView.tsx
@@ -0,0 +1,288 @@
+import React from 'react';
+
+import { NavModel, NavModelItem, PageLayoutType } from '@grafana/data';
+import { SceneComponentProps, SceneObjectBase, SceneVariable, SceneVariables, sceneGraph } from '@grafana/scenes';
+import { Page } from 'app/core/components/Page/Page';
+
+import { DashboardScene } from '../scene/DashboardScene';
+import { NavToolbarActions } from '../scene/NavToolbarActions';
+import { getDashboardSceneFor } from '../utils/utils';
+
+import { EditListViewSceneUrlSync } from './EditListViewSceneUrlSync';
+import { DashboardEditView, DashboardEditViewState, useDashboardEditPageNav } from './utils';
+import { VariableEditorForm } from './variables/VariableEditorForm';
+import { VariableEditorList } from './variables/VariableEditorList';
+import {
+  EditableVariableType,
+  RESERVED_GLOBAL_VARIABLE_NAME_REGEX,
+  WORD_CHARACTERS_REGEX,
+  getVariableDefault,
+  getVariableScene,
+} from './variables/utils';
+export interface VariablesEditViewState extends DashboardEditViewState {
+  editIndex?: number | undefined;
+}
+
+export class VariablesEditView extends SceneObjectBase<VariablesEditViewState> implements DashboardEditView {
+  public static Component = VariableEditorSettingsListView;
+
+  public getUrlKey(): string {
+    return 'variables';
+  }
+
+  protected _urlSync = new EditListViewSceneUrlSync(this);
+
+  public getDashboard(): DashboardScene {
+    return getDashboardSceneFor(this);
+  }
+
+  public getVariableSet(): SceneVariables {
+    return sceneGraph.getVariables(this.getDashboard());
+  }
+
+  private getVariableIndex = (identifier: string) => {
+    const variables = this.getVariables();
+    return variables.findIndex((variable) => variable.state.name === identifier);
+  };
+
+  private replaceEditVariable = (newVariable: SceneVariable) => {
+    // Find the index of the variable to be deleted
+    const variableIndex = this.state.editIndex ?? -1;
+    const { variables } = this.getVariableSet().state;
+    const variable = variables[variableIndex];
+
+    if (!variable) {
+      // Handle the case where the variable is not found
+      console.error('Variable not found');
+      return;
+    }
+
+    const updatedVariables = [...variables.slice(0, variableIndex), newVariable, ...variables.slice(variableIndex + 1)];
+
+    // Update the state or the variables array
+    this.getVariableSet().setState({ variables: updatedVariables });
+  };
+
+  public onDelete = (identifier: string) => {
+    // Find the index of the variable to be deleted
+    const variableIndex = this.getVariableIndex(identifier);
+    const { variables } = this.getVariableSet().state;
+    if (variableIndex === -1) {
+      // Handle the case where the variable is not found
+      console.error('Variable not found');
+      return;
+    }
+
+    // Create a new array excluding the variable to be deleted
+    const updatedVariables = [...variables.slice(0, variableIndex), ...variables.slice(variableIndex + 1)];
+
+    // Update the state or the variables array
+    this.getVariableSet().setState({ variables: updatedVariables });
+    // Remove editIndex otherwise switches to next variable in list
+    this.setState({ editIndex: undefined });
+  };
+
+  public getVariables() {
+    return this.getVariableSet().state.variables;
+  }
+
+  public onDuplicated = (identifier: string) => {
+    const variableIndex = this.getVariableIndex(identifier);
+    const variables = this.getVariableSet().state.variables;
+
+    if (variableIndex === -1) {
+      console.error('Variable not found');
+      return;
+    }
+
+    const variableToUpdate = variables[variableIndex];
+    let copyNumber = 0;
+    let newName = `copy_of_${variableToUpdate.state.name}`;
+
+    // Check if the name is unique, if not, increment the copy number
+    while (variables.some((v) => v.state.name === newName)) {
+      copyNumber++;
+      newName = `copy_of_${variableToUpdate.state.name}_${copyNumber}`;
+    }
+
+    //clone the original variable
+    const newVariable = variableToUpdate.clone(variableToUpdate.state);
+    // update state name of the new variable
+    newVariable.setState({ name: newName });
+
+    const updatedVariables = [
+      ...variables.slice(0, variableIndex + 1),
+      newVariable,
+      ...variables.slice(variableIndex + 1),
+    ];
+
+    this.getVariableSet().setState({ variables: updatedVariables });
+  };
+
+  public onOrderChanged = (fromIndex: number, toIndex: number) => {
+    const variables = this.getVariableSet().state.variables;
+    if (!this.getVariableSet()) {
+      return;
+    }
+    // check the index are within the variables array
+    if (fromIndex < 0 || fromIndex >= variables.length || toIndex < 0 || toIndex >= variables.length) {
+      console.error('Invalid index');
+      return;
+    }
+    const updatedVariables = [...variables];
+    // Remove the variable from the array
+    const movedItem = updatedVariables.splice(fromIndex, 1);
+    updatedVariables.splice(toIndex, 0, movedItem[0]);
+    const variablesScene = this.getVariableSet();
+    variablesScene.setState({ variables: updatedVariables });
+  };
+
+  public onEdit = (identifier: string) => {
+    const variableIndex = this.getVariableIndex(identifier);
+    if (variableIndex === -1) {
+      console.error('Variable not found');
+      return;
+    }
+    this.setState({ editIndex: variableIndex });
+  };
+
+  public onAdd = () => {
+    const variables = this.getVariables();
+    const variableIndex = variables.length;
+    //add the new variable to the end of the array
+    const defaultNewVariable = getVariableDefault(variables);
+
+    this.getVariableSet().setState({ variables: [...this.getVariables(), defaultNewVariable] });
+    this.setState({ editIndex: variableIndex });
+  };
+
+  public onTypeChange = (type: EditableVariableType) => {
+    // Find the index of the variable to be deleted
+    const variableIndex = this.state.editIndex ?? -1;
+    const { variables } = this.getVariableSet().state;
+    const variable = variables[variableIndex];
+
+    if (!variable) {
+      // Handle the case where the variable is not found
+      console.error('Variable not found');
+      return;
+    }
+
+    const { name, label } = variable.state;
+    const newVariable = getVariableScene(type, { name, label });
+    this.replaceEditVariable(newVariable);
+  };
+
+  public onGoBack = () => {
+    this.setState({ editIndex: undefined });
+  };
+
+  public onValidateVariableName = (name: string, key: string | undefined): [true, string] | [false, null] => {
+    let errorText = null;
+    if (!RESERVED_GLOBAL_VARIABLE_NAME_REGEX.test(name)) {
+      errorText = "Template names cannot begin with '__', that's reserved for Grafana's global variables";
+    }
+
+    if (!WORD_CHARACTERS_REGEX.test(name)) {
+      errorText = 'Only word characters are allowed in variable names';
+    }
+
+    const variable = this.getVariableSet().getByName(name)?.state;
+
+    if (variable && variable.key !== key) {
+      errorText = 'Variable with the same name already exists';
+    }
+
+    if (errorText) {
+      return [true, errorText];
+    }
+
+    return [false, null];
+  };
+}
+
+function VariableEditorSettingsListView({ model }: SceneComponentProps<VariablesEditView>) {
+  const dashboard = model.getDashboard();
+  const { navModel, pageNav } = useDashboardEditPageNav(dashboard, model.getUrlKey());
+  // get variables from dashboard state
+  const { onDelete, onDuplicated, onOrderChanged, onEdit, onTypeChange, onGoBack, onAdd } = model;
+  const { variables } = model.getVariableSet().useState();
+  const { editIndex } = model.useState();
+
+  if (editIndex !== undefined && variables[editIndex]) {
+    const variable = variables[editIndex];
+    if (variable) {
+      return (
+        <VariableEditorSettingsView
+          variable={variable}
+          onTypeChange={onTypeChange}
+          onGoBack={onGoBack}
+          pageNav={pageNav}
+          navModel={navModel}
+          dashboard={dashboard}
+          onDelete={onDelete}
+          onValidateVariableName={model.onValidateVariableName}
+        />
+      );
+    }
+  }
+
+  return (
+    <Page navModel={navModel} pageNav={pageNav} layout={PageLayoutType.Standard}>
+      <NavToolbarActions dashboard={dashboard} />
+      <VariableEditorList
+        variables={variables}
+        onDelete={onDelete}
+        onDuplicate={onDuplicated}
+        onChangeOrder={onOrderChanged}
+        onAdd={onAdd}
+        onEdit={onEdit}
+      />
+    </Page>
+  );
+}
+
+interface VariableEditorSettingsEditViewProps {
+  variable: SceneVariable;
+  pageNav: NavModelItem;
+  navModel: NavModel;
+  dashboard: DashboardScene;
+  onTypeChange: (variableType: EditableVariableType) => void;
+  onGoBack: () => void;
+  onDelete: (variableName: string) => void;
+  onValidateVariableName: (name: string, key: string | undefined) => [true, string] | [false, null];
+}
+
+function VariableEditorSettingsView({
+  variable,
+  pageNav,
+  navModel,
+  dashboard,
+  onTypeChange,
+  onGoBack,
+  onDelete,
+  onValidateVariableName,
+}: VariableEditorSettingsEditViewProps) {
+  const parentTab = pageNav.children!.find((p) => p.active)!;
+  parentTab.parentItem = pageNav;
+  const { name } = variable.useState();
+
+  const editVariablePageNav = {
+    text: name,
+    parentItem: parentTab,
+  };
+  return (
+    <Page navModel={navModel} pageNav={editVariablePageNav} layout={PageLayoutType.Standard}>
+      <NavToolbarActions dashboard={dashboard} />
+      <VariableEditorForm
+        variable={variable}
+        onTypeChange={onTypeChange}
+        onGoBack={onGoBack}
+        onDelete={onDelete}
+        onValidateVariableName={onValidateVariableName}
+        // force refresh when navigating using back/forward between variables
+        key={variable.state.key}
+      />
+    </Page>
+  );
+}
diff --git a/public/app/features/dashboard-scene/settings/VersionsEditView.test.tsx b/public/app/features/dashboard-scene/settings/VersionsEditView.test.tsx
new file mode 100644
index 0000000000000..f9024d2b8edda
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/VersionsEditView.test.tsx
@@ -0,0 +1,179 @@
+import { SceneGridLayout, SceneTimeRange } from '@grafana/scenes';
+
+import { DashboardScene } from '../scene/DashboardScene';
+import { activateFullSceneTree } from '../utils/test-utils';
+
+import { VERSIONS_FETCH_LIMIT, VersionsEditView } from './VersionsEditView';
+import { historySrv } from './version-history';
+
+jest.mock('./version-history/HistorySrv');
+
+describe('VersionsEditView', () => {
+  describe('Dashboard versions state', () => {
+    let dashboard: DashboardScene;
+    let versionsView: VersionsEditView;
+    const mockEvent = {
+      preventDefault: jest.fn(),
+      currentTarget: {
+        checked: true,
+      },
+    } as unknown as React.FormEvent<HTMLInputElement>;
+
+    beforeEach(async () => {
+      jest.mocked(historySrv.getHistoryList).mockResolvedValue(getVersions());
+
+      const result = await buildTestScene();
+      dashboard = result.dashboard;
+      versionsView = result.versionsView;
+    });
+
+    it('should return the correct urlKey', () => {
+      expect(versionsView.getUrlKey()).toBe('versions');
+    });
+
+    it('should return the dashboard', () => {
+      expect(versionsView.getDashboard()).toBe(dashboard);
+    });
+
+    it('should return the decorated list of versions', () => {
+      const versions = versionsView.versions;
+
+      expect(versions).toHaveLength(3);
+      expect(versions[0].createdDateString).toBe('2017-02-22 20:43:01');
+      expect(versions[0].ageString).toBe('7 years ago');
+      expect(versions[1].createdDateString).toBe('2017-02-22 20:43:01');
+      expect(versions[1].ageString).toBe('7 years ago');
+      expect(versions[2].createdDateString).toBe('2017-02-23 20:43:01');
+      expect(versions[2].ageString).toBe('7 years ago');
+    });
+
+    it('should bump the start threshold when fetching more versions', async () => {
+      expect(versionsView.start).toBe(VERSIONS_FETCH_LIMIT);
+
+      versionsView.fetchVersions(true);
+      await new Promise(process.nextTick);
+
+      expect(versionsView.start).toBe(VERSIONS_FETCH_LIMIT * 2);
+    });
+
+    it('should set the state of a version as checked when onCheck is called', () => {
+      versionsView.onCheck(mockEvent, 3);
+
+      expect(versionsView.versions[0].checked).toBe(false);
+      expect(versionsView.versions[1].checked).toBe(true);
+      expect(versionsView.versions[2].checked).toBe(false);
+    });
+
+    it('should reset the state of all versions when reset is called', () => {
+      versionsView.onCheck(mockEvent, 3);
+
+      expect(versionsView.versions[1].checked).toBe(true);
+
+      versionsView.reset();
+
+      expect(versionsView.versions[0].checked).toBe(false);
+      expect(versionsView.versions[1].checked).toBe(false);
+      expect(versionsView.versions[2].checked).toBe(false);
+    });
+
+    it('should set the diffData', async () => {
+      versionsView.onCheck(mockEvent, 3);
+      versionsView.onCheck(mockEvent, 4);
+
+      jest
+        .mocked(historySrv.getDashboardVersion)
+        .mockResolvedValueOnce({ data: 'lhs' })
+        .mockResolvedValue({ data: 'rhs' });
+
+      await versionsView.getDiff();
+
+      expect(versionsView.diffData).toEqual({
+        lhs: 'lhs',
+        rhs: 'rhs',
+      });
+      expect(versionsView.state.baseInfo).toHaveProperty('version', 3);
+      expect(versionsView.state.newInfo).toHaveProperty('version', 4);
+    });
+
+    it('should set the isNewLatest flag if the new selected version is latest', async () => {
+      versionsView.onCheck(mockEvent, 4);
+      versionsView.onCheck(mockEvent, 2);
+
+      jest
+        .mocked(historySrv.getDashboardVersion)
+        .mockResolvedValueOnce({ data: 'lhs' })
+        .mockResolvedValue({ data: 'rhs' });
+
+      await versionsView.getDiff();
+
+      expect(versionsView.state.isNewLatest).toBe(true);
+    });
+  });
+});
+
+function getVersions() {
+  return [
+    {
+      id: 4,
+      dashboardId: 1,
+      dashboardUID: '_U4zObQMz',
+      parentVersion: 3,
+      restoredFrom: 0,
+      version: 4,
+      created: '2017-02-22T17:43:01-08:00',
+      createdBy: 'admin',
+      message: '',
+      checked: false,
+    },
+    {
+      id: 3,
+      dashboardId: 1,
+      dashboardUID: '_U4zObQMz',
+      parentVersion: 1,
+      restoredFrom: 1,
+      version: 3,
+      created: '2017-02-22T17:43:01-08:00',
+      createdBy: 'admin',
+      message: '',
+      checked: false,
+    },
+    {
+      id: 2,
+      dashboardId: 1,
+      dashboardUID: '_U4zObQMz',
+      parentVersion: 1,
+      restoredFrom: 1,
+      version: 2,
+      created: '2017-02-23T17:43:01-08:00',
+      createdBy: 'admin',
+      message: '',
+      checked: false,
+    },
+  ];
+}
+
+async function buildTestScene() {
+  const versionsView = new VersionsEditView({});
+  const dashboard = new DashboardScene({
+    $timeRange: new SceneTimeRange({}),
+    title: 'hello',
+    uid: 'dash-1',
+    version: 4,
+    meta: {
+      canEdit: true,
+    },
+    body: new SceneGridLayout({
+      children: [],
+    }),
+    editview: versionsView,
+  });
+
+  activateFullSceneTree(dashboard);
+
+  await new Promise((r) => setTimeout(r, 1));
+
+  dashboard.onEnterEditMode();
+  versionsView.activate();
+
+  return { dashboard, versionsView };
+}
diff --git a/public/app/features/dashboard-scene/settings/VersionsEditView.tsx b/public/app/features/dashboard-scene/settings/VersionsEditView.tsx
new file mode 100644
index 0000000000000..ea44185e9a8de
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/VersionsEditView.tsx
@@ -0,0 +1,252 @@
+import React from 'react';
+
+import { PageLayoutType, dateTimeFormat, dateTimeFormatTimeAgo } from '@grafana/data';
+import { SceneComponentProps, SceneObjectBase, sceneGraph } from '@grafana/scenes';
+import { HorizontalGroup, Spinner } from '@grafana/ui';
+import { Page } from 'app/core/components/Page/Page';
+
+import { DashboardScene } from '../scene/DashboardScene';
+import { NavToolbarActions } from '../scene/NavToolbarActions';
+import { getDashboardSceneFor } from '../utils/utils';
+
+import { DashboardEditView, DashboardEditViewState, useDashboardEditPageNav } from './utils';
+import {
+  RevisionsModel,
+  VersionHistoryComparison,
+  VersionHistoryHeader,
+  VersionHistoryTable,
+  VersionsHistoryButtons,
+  historySrv,
+} from './version-history';
+
+export const VERSIONS_FETCH_LIMIT = 10;
+
+export type DecoratedRevisionModel = RevisionsModel & {
+  createdDateString: string;
+  ageString: string;
+};
+
+export interface VersionsEditViewState extends DashboardEditViewState {
+  versions?: DecoratedRevisionModel[];
+  isLoading?: boolean;
+  isAppending?: boolean;
+  viewMode?: 'list' | 'compare';
+  diffData?: { lhs: string; rhs: string };
+  newInfo?: DecoratedRevisionModel;
+  baseInfo?: DecoratedRevisionModel;
+  isNewLatest?: boolean;
+}
+
+export class VersionsEditView extends SceneObjectBase<VersionsEditViewState> implements DashboardEditView {
+  public static Component = VersionsEditorSettingsListView;
+  private _limit: number = VERSIONS_FETCH_LIMIT;
+  private _start = 0;
+
+  constructor(state: VersionsEditViewState) {
+    super({
+      ...state,
+      versions: [],
+      isLoading: true,
+      isAppending: true,
+      viewMode: 'list',
+      isNewLatest: false,
+      diffData: {
+        lhs: '',
+        rhs: '',
+      },
+    });
+
+    this.addActivationHandler(() => {
+      this.fetchVersions();
+    });
+  }
+
+  private get _dashboard(): DashboardScene {
+    return getDashboardSceneFor(this);
+  }
+
+  public get diffData(): { lhs: string; rhs: string } {
+    return this.state.diffData ?? { lhs: '', rhs: '' };
+  }
+
+  public get versions(): DecoratedRevisionModel[] {
+    return this.state.versions ?? [];
+  }
+
+  public get limit(): number {
+    return this._limit;
+  }
+
+  public get start(): number {
+    return this._start;
+  }
+
+  public getUrlKey(): string {
+    return 'versions';
+  }
+
+  public getDashboard(): DashboardScene {
+    return this._dashboard;
+  }
+
+  public getTimeRange() {
+    return sceneGraph.getTimeRange(this._dashboard);
+  }
+
+  public fetchVersions = (append = false): void => {
+    const uid = this._dashboard.state.uid;
+
+    if (!uid) {
+      return;
+    }
+
+    this.setState({ isAppending: append });
+
+    historySrv
+      .getHistoryList(uid, { limit: this._limit, start: this._start })
+      .then((result) => {
+        this.setState({
+          isLoading: false,
+          versions: [...(this.state.versions ?? []), ...this.decorateVersions(result)],
+        });
+        this._start += this._limit;
+      })
+      .catch((err) => console.log(err))
+      .finally(() => this.setState({ isAppending: false }));
+  };
+
+  public getDiff = async () => {
+    const selectedVersions = this.versions.filter((version) => version.checked);
+    const [newInfo, baseInfo] = selectedVersions;
+    const isNewLatest = newInfo.version === this._dashboard.state.version;
+
+    this.setState({
+      isLoading: true,
+    });
+
+    if (!this._dashboard.state.uid) {
+      return;
+    }
+
+    const lhs = await historySrv.getDashboardVersion(this._dashboard.state.uid, baseInfo.version);
+    const rhs = await historySrv.getDashboardVersion(this._dashboard.state.uid, newInfo.version);
+
+    this.setState({
+      baseInfo,
+      isLoading: false,
+      isNewLatest,
+      newInfo,
+      viewMode: 'compare',
+      diffData: {
+        lhs: lhs.data,
+        rhs: rhs.data,
+      },
+    });
+  };
+
+  public reset = () => {
+    this.setState({
+      baseInfo: undefined,
+      diffData: {
+        lhs: '',
+        rhs: '',
+      },
+      isNewLatest: false,
+      newInfo: undefined,
+      versions: this.versions.map((version) => ({ ...version, checked: false })),
+      viewMode: 'list',
+    });
+  };
+
+  public onCheck = (ev: React.FormEvent<HTMLInputElement>, versionId: number) => {
+    this.setState({
+      versions: this.versions.map((version) =>
+        version.id === versionId ? { ...version, checked: ev.currentTarget.checked } : version
+      ),
+    });
+  };
+
+  private decorateVersions(versions: RevisionsModel[]): DecoratedRevisionModel[] {
+    const timeZone = this.getTimeRange().getTimeZone();
+
+    return versions.map((version) => {
+      return {
+        ...version,
+        createdDateString: dateTimeFormat(version.created, { timeZone: timeZone }),
+        ageString: dateTimeFormatTimeAgo(version.created, { timeZone: timeZone }),
+        checked: false,
+      };
+    });
+  }
+}
+
+function VersionsEditorSettingsListView({ model }: SceneComponentProps<VersionsEditView>) {
+  const dashboard = model.getDashboard();
+  const { isLoading, isAppending, viewMode, baseInfo, newInfo, isNewLatest } = model.useState();
+  const { navModel, pageNav } = useDashboardEditPageNav(dashboard, model.getUrlKey());
+  const canCompare = model.versions.filter((version) => version.checked).length === 2;
+  const showButtons = model.versions.length > 1;
+  const hasMore = model.versions.length >= model.limit;
+  const isLastPage = model.versions.find((rev) => rev.version === 1);
+
+  const viewModeCompare = (
+    <>
+      <VersionHistoryHeader
+        onClick={model.reset}
+        baseVersion={baseInfo?.version}
+        newVersion={newInfo?.version}
+        isNewLatest={isNewLatest}
+      />
+      {isLoading ? (
+        <VersionsHistorySpinner msg="Fetching changes&hellip;" />
+      ) : (
+        <VersionHistoryComparison
+          newInfo={newInfo!}
+          baseInfo={baseInfo!}
+          isNewLatest={isNewLatest!}
+          diffData={model.diffData}
+          onRestore={dashboard.onRestore}
+        />
+      )}
+    </>
+  );
+
+  const viewModeList = (
+    <>
+      {isLoading ? (
+        <VersionsHistorySpinner msg="Fetching history list&hellip;" />
+      ) : (
+        <VersionHistoryTable
+          versions={model.versions}
+          onCheck={model.onCheck}
+          canCompare={canCompare}
+          onRestore={dashboard.onRestore}
+        />
+      )}
+      {isAppending && <VersionsHistorySpinner msg="Fetching more entries&hellip;" />}
+      {showButtons && (
+        <VersionsHistoryButtons
+          hasMore={hasMore}
+          canCompare={canCompare}
+          getVersions={model.fetchVersions}
+          getDiff={model.getDiff}
+          isLastPage={!!isLastPage}
+        />
+      )}
+    </>
+  );
+
+  return (
+    <Page navModel={navModel} pageNav={pageNav} layout={PageLayoutType.Standard}>
+      <NavToolbarActions dashboard={dashboard} />
+      {viewMode === 'compare' ? viewModeCompare : viewModeList}
+    </Page>
+  );
+}
+
+const VersionsHistorySpinner = ({ msg }: { msg: string }) => (
+  <HorizontalGroup>
+    <Spinner />
+    <em>{msg}</em>
+  </HorizontalGroup>
+);
diff --git a/public/app/features/dashboard/components/AnnotationSettings/AngularEditorLoader.tsx b/public/app/features/dashboard-scene/settings/annotations/AngularEditorLoader.tsx
similarity index 100%
rename from public/app/features/dashboard/components/AnnotationSettings/AngularEditorLoader.tsx
rename to public/app/features/dashboard-scene/settings/annotations/AngularEditorLoader.tsx
diff --git a/public/app/features/dashboard-scene/settings/annotations/AnnotationSettingsEdit.test.tsx b/public/app/features/dashboard-scene/settings/annotations/AnnotationSettingsEdit.test.tsx
new file mode 100644
index 0000000000000..f2ce2c54bf375
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/annotations/AnnotationSettingsEdit.test.tsx
@@ -0,0 +1,226 @@
+import { act, render } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { of } from 'rxjs';
+
+import {
+  AnnotationQuery,
+  FieldType,
+  LoadingState,
+  PanelData,
+  VariableSupportType,
+  getDefaultTimeRange,
+  toDataFrame,
+} from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { setRunRequest } from '@grafana/runtime';
+import { mockDataSource } from 'app/features/alerting/unified/mocks';
+import { LegacyVariableQueryEditor } from 'app/features/variables/editor/LegacyVariableQueryEditor';
+
+import { AnnotationSettingsEdit } from './AnnotationSettingsEdit';
+
+const defaultDatasource = mockDataSource({
+  name: 'Default Test Data Source',
+  type: 'test',
+});
+
+const promDatasource = mockDataSource({
+  name: 'Prometheus',
+  type: 'prometheus',
+});
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getAngularLoader: () => ({
+    load: () => ({
+      destroy: jest.fn(),
+      digest: jest.fn(),
+      getScope: () => ({
+        $watch: jest.fn(),
+      }),
+    }),
+  }),
+}));
+
+jest.mock('@grafana/runtime/src/services/dataSourceSrv', () => ({
+  ...jest.requireActual('@grafana/runtime/src/services/dataSourceSrv'),
+  getDataSourceSrv: () => ({
+    get: async () => ({
+      ...defaultDatasource,
+      variables: {
+        getType: () => VariableSupportType.Custom,
+        query: jest.fn(),
+        editor: jest.fn().mockImplementation(LegacyVariableQueryEditor),
+      },
+    }),
+    getList: () => [defaultDatasource, promDatasource],
+    getInstanceSettings: () => ({ ...defaultDatasource }),
+  }),
+}));
+
+jest.mock('./AngularEditorLoader', () => ({ AngularEditorLoader: () => 'mocked AngularEditorLoader' }));
+
+const runRequestMock = jest.fn().mockReturnValue(
+  of<PanelData>({
+    state: LoadingState.Done,
+    series: [
+      toDataFrame({
+        fields: [{ name: 'text', type: FieldType.string, values: ['val1', 'val2', 'val11'] }],
+      }),
+    ],
+    timeRange: getDefaultTimeRange(),
+  })
+);
+
+setRunRequest(runRequestMock);
+
+describe('AnnotationSettingsEdit', () => {
+  const mockOnUpdate = jest.fn();
+  const mockGoBackToList = jest.fn();
+  const mockOnDelete = jest.fn();
+
+  async function setup() {
+    const annotationQuery: AnnotationQuery = {
+      name: 'test',
+      datasource: defaultDatasource,
+      enable: true,
+      hide: false,
+      iconColor: 'blue',
+    };
+
+    const props = {
+      annotation: annotationQuery,
+      onUpdate: mockOnUpdate,
+      editIndex: 1,
+      panels: [],
+      onBackToList: mockGoBackToList,
+      onDelete: mockOnDelete,
+    };
+
+    return {
+      anno: annotationQuery,
+      renderer: await act(async () => render(<AnnotationSettingsEdit {...props} />)),
+      user: userEvent.setup(),
+    };
+  }
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should render', async () => {
+    const {
+      renderer: { getByTestId },
+    } = await setup();
+
+    const nameInput = getByTestId(selectors.pages.Dashboard.Settings.Annotations.Settings.name);
+    const dataSourceSelect = getByTestId(selectors.components.DataSourcePicker.container);
+    const enableToggle = getByTestId(selectors.pages.Dashboard.Settings.Annotations.NewAnnotation.enable);
+    const hideToggle = getByTestId(selectors.pages.Dashboard.Settings.Annotations.NewAnnotation.hide);
+    const iconColorToggle = getByTestId(selectors.components.ColorSwatch.name);
+    const panelSelect = getByTestId(selectors.pages.Dashboard.Settings.Annotations.NewAnnotation.showInLabel);
+    const deleteAnno = getByTestId(selectors.pages.Dashboard.Settings.Annotations.NewAnnotation.delete);
+    const apply = getByTestId(selectors.pages.Dashboard.Settings.Annotations.NewAnnotation.apply);
+
+    expect(nameInput).toBeInTheDocument();
+    expect(dataSourceSelect).toBeInTheDocument();
+    expect(enableToggle).toBeInTheDocument();
+    expect(hideToggle).toBeInTheDocument();
+    expect(iconColorToggle).toBeInTheDocument();
+    expect(panelSelect).toBeInTheDocument();
+    expect(deleteAnno).toBeInTheDocument();
+    expect(apply).toBeInTheDocument();
+  });
+
+  it('should update annotation name on change', async () => {
+    const {
+      renderer: { getByTestId },
+      user,
+    } = await setup();
+
+    await user.type(getByTestId(selectors.pages.Dashboard.Settings.Annotations.Settings.name), 'new name');
+
+    expect(mockOnUpdate).toHaveBeenCalled();
+  });
+
+  it('should toggle annotation enabled on change', async () => {
+    const {
+      renderer: { getByTestId },
+      user,
+      anno,
+    } = await setup();
+
+    const annoArg = {
+      ...anno,
+      enable: !anno.enable,
+    };
+
+    const enableToggle = getByTestId(selectors.pages.Dashboard.Settings.Annotations.NewAnnotation.enable);
+
+    await user.click(enableToggle);
+
+    expect(mockOnUpdate).toHaveBeenCalledTimes(1);
+    expect(mockOnUpdate).toHaveBeenCalledWith(annoArg, 1);
+  });
+
+  it('should toggle annotation hide on change', async () => {
+    const {
+      renderer: { getByTestId },
+      user,
+      anno,
+    } = await setup();
+
+    const annoArg = {
+      ...anno,
+      hide: !anno.hide,
+    };
+
+    const hideToggle = getByTestId(selectors.pages.Dashboard.Settings.Annotations.NewAnnotation.hide);
+
+    await user.click(hideToggle);
+
+    expect(mockOnUpdate).toHaveBeenCalledTimes(1);
+    expect(mockOnUpdate).toHaveBeenCalledWith(annoArg, 1);
+  });
+
+  it('should set annotation filter', async () => {
+    const {
+      renderer: { getByTestId },
+      user,
+    } = await setup();
+
+    const panelSelect = getByTestId(selectors.components.Annotations.annotationsTypeInput);
+
+    await user.click(panelSelect);
+    await user.tab();
+
+    expect(mockOnUpdate).toHaveBeenCalledTimes(1);
+    expect(mockOnUpdate).toHaveBeenCalledWith(expect.objectContaining({ filter: undefined }), 1);
+  });
+
+  it('should delete annotation', async () => {
+    const {
+      renderer: { getByTestId },
+      user,
+    } = await setup();
+
+    const deleteAnno = getByTestId(selectors.pages.Dashboard.Settings.Annotations.NewAnnotation.delete);
+
+    await user.click(deleteAnno);
+
+    expect(mockOnDelete).toHaveBeenCalledTimes(1);
+  });
+
+  it('should go back to list annotation', async () => {
+    const {
+      renderer: { getByTestId },
+      user,
+    } = await setup();
+
+    const goBack = getByTestId(selectors.pages.Dashboard.Settings.Annotations.NewAnnotation.apply);
+
+    await user.click(goBack);
+
+    expect(mockGoBackToList).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/public/app/features/dashboard-scene/settings/annotations/AnnotationSettingsEdit.tsx b/public/app/features/dashboard-scene/settings/annotations/AnnotationSettingsEdit.tsx
new file mode 100644
index 0000000000000..59f88bad3f8ec
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/annotations/AnnotationSettingsEdit.tsx
@@ -0,0 +1,321 @@
+import { css } from '@emotion/css';
+import React, { useMemo } from 'react';
+import { useAsync } from 'react-use';
+
+import {
+  AnnotationQuery,
+  DataSourceInstanceSettings,
+  getDataSourceRef,
+  GrafanaTheme2,
+  SelectableValue,
+} from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { config, getDataSourceSrv } from '@grafana/runtime';
+import { VizPanel } from '@grafana/scenes';
+import { AnnotationPanelFilter } from '@grafana/schema/src/raw/dashboard/x/dashboard_types.gen';
+import {
+  Button,
+  Checkbox,
+  Field,
+  FieldSet,
+  HorizontalGroup,
+  Input,
+  MultiSelect,
+  Select,
+  useStyles2,
+  Stack,
+} from '@grafana/ui';
+import { ColorValueEditor } from 'app/core/components/OptionsUI/color';
+import StandardAnnotationQueryEditor from 'app/features/annotations/components/StandardAnnotationQueryEditor';
+import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker';
+
+import { getPanelIdForVizPanel } from '../../utils/utils';
+
+import { AngularEditorLoader } from './AngularEditorLoader';
+
+type Props = {
+  annotation: AnnotationQuery;
+  editIndex: number;
+  panels: VizPanel[];
+  onUpdate: (annotation: AnnotationQuery, editIndex: number) => void;
+  onBackToList: () => void;
+  onDelete: (index: number) => void;
+};
+
+export const newAnnotationName = 'New annotation';
+
+export const AnnotationSettingsEdit = ({ annotation, editIndex, panels, onUpdate, onBackToList, onDelete }: Props) => {
+  const styles = useStyles2(getStyles);
+
+  const panelFilter = useMemo(() => {
+    if (!annotation.filter) {
+      return PanelFilterType.AllPanels;
+    }
+    return annotation.filter.exclude ? PanelFilterType.ExcludePanels : PanelFilterType.IncludePanels;
+  }, [annotation.filter]);
+
+  const { value: ds } = useAsync(() => {
+    return getDataSourceSrv().get(annotation.datasource);
+  }, [annotation.datasource]);
+
+  const dsi = getDataSourceSrv().getInstanceSettings(annotation.datasource);
+
+  const onNameChange = (ev: React.FocusEvent<HTMLInputElement>) => {
+    onUpdate(
+      {
+        ...annotation,
+        name: ev.currentTarget.value,
+      },
+      editIndex
+    );
+  };
+
+  const onDataSourceChange = (ds: DataSourceInstanceSettings) => {
+    const dsRef = getDataSourceRef(ds);
+
+    if (annotation.datasource?.type !== dsRef.type) {
+      onUpdate(
+        {
+          datasource: dsRef,
+          builtIn: annotation.builtIn,
+          enable: annotation.enable,
+          iconColor: annotation.iconColor,
+          name: annotation.name,
+          hide: annotation.hide,
+          filter: annotation.filter,
+          mappings: annotation.mappings,
+          type: annotation.type,
+        },
+        editIndex
+      );
+    } else {
+      onUpdate(
+        {
+          ...annotation,
+          datasource: dsRef,
+        },
+        editIndex
+      );
+    }
+  };
+
+  const onChange = (ev: React.FocusEvent<HTMLInputElement>) => {
+    const target = ev.currentTarget;
+    onUpdate(
+      {
+        ...annotation,
+        [target.name]: target.type === 'checkbox' ? target.checked : target.value,
+      },
+      editIndex
+    );
+  };
+
+  const onColorChange = (color?: string) => {
+    onUpdate(
+      {
+        ...annotation,
+        iconColor: color!,
+      },
+      editIndex
+    );
+  };
+
+  const onFilterTypeChange = (v: SelectableValue<PanelFilterType>) => {
+    let filter =
+      v.value === PanelFilterType.AllPanels
+        ? undefined
+        : {
+            exclude: v.value === PanelFilterType.ExcludePanels,
+            ids: annotation.filter?.ids ?? [],
+          };
+    onUpdate({ ...annotation, filter }, editIndex);
+  };
+
+  const onAddFilterPanelID = (selections: Array<SelectableValue<number>>) => {
+    if (!Array.isArray(selections)) {
+      return;
+    }
+
+    const filter: AnnotationPanelFilter = {
+      exclude: panelFilter === PanelFilterType.ExcludePanels,
+      ids: [],
+    };
+
+    selections.forEach((selection) => selection.value && filter.ids.push(selection.value));
+    onUpdate({ ...annotation, filter }, editIndex);
+  };
+
+  const onDeleteAndLeavePage = () => {
+    onDelete(editIndex);
+    onBackToList();
+  };
+
+  const isNewAnnotation = annotation.name === newAnnotationName;
+
+  const sortFn = (a: SelectableValue<number>, b: SelectableValue<number>) => {
+    if (a.label && b.label) {
+      return a.label.toLowerCase().localeCompare(b.label.toLowerCase());
+    }
+
+    return -1;
+  };
+
+  const selectablePanels: Array<SelectableValue<number>> = useMemo(
+    () =>
+      panels
+        // Filtering out rows at the moment, revisit to only include panels that support annotations
+        // However the information to know if a panel supports annotations requires it to be already loaded
+        // panel.plugin?.dataSupport?.annotations
+        .filter((panel) => config.panels[panel.state.pluginId])
+        .map((panel) => ({
+          value: getPanelIdForVizPanel(panel),
+          label: panel.state.title ?? `Panel ${getPanelIdForVizPanel(panel)}`,
+          description: panel.state.description,
+          imgUrl: config.panels[panel.state.pluginId].info.logos.small,
+        }))
+        .sort(sortFn) ?? [],
+    [panels]
+  );
+
+  return (
+    <div>
+      <FieldSet className={styles.settingsForm}>
+        <Field label="Name">
+          <Input
+            data-testid={selectors.pages.Dashboard.Settings.Annotations.Settings.name}
+            name="name"
+            id="name"
+            autoFocus={isNewAnnotation}
+            value={annotation.name}
+            onChange={onNameChange}
+          />
+        </Field>
+        <Field label="Data source" htmlFor="data-source-picker">
+          <DataSourcePicker annotations variables current={annotation.datasource} onChange={onDataSourceChange} />
+        </Field>
+        <Field label="Enabled" description="When enabled the annotation query is issued every dashboard refresh">
+          <Checkbox
+            name="enable"
+            id="enable"
+            value={annotation.enable}
+            onChange={onChange}
+            data-testid={selectors.pages.Dashboard.Settings.Annotations.NewAnnotation.enable}
+          />
+        </Field>
+        <Field
+          label="Hidden"
+          description="Annotation queries can be toggled on or off at the top of the dashboard. With this option checked this toggle will be hidden."
+        >
+          <Checkbox
+            name="hide"
+            id="hide"
+            value={annotation.hide}
+            onChange={onChange}
+            data-testid={selectors.pages.Dashboard.Settings.Annotations.NewAnnotation.hide}
+          />
+        </Field>
+        <Field label="Color" description="Color to use for the annotation event markers">
+          <HorizontalGroup>
+            <ColorValueEditor value={annotation?.iconColor} onChange={onColorChange} />
+          </HorizontalGroup>
+        </Field>
+        <Field label="Show in" data-testid={selectors.pages.Dashboard.Settings.Annotations.NewAnnotation.showInLabel}>
+          <>
+            <Select
+              options={panelFilters}
+              value={panelFilter}
+              onChange={onFilterTypeChange}
+              data-testid={selectors.components.Annotations.annotationsTypeInput}
+            />
+            {panelFilter !== PanelFilterType.AllPanels && (
+              <MultiSelect
+                options={selectablePanels}
+                value={selectablePanels.filter((panel) => annotation.filter?.ids.includes(panel.value!))}
+                onChange={onAddFilterPanelID}
+                isClearable={true}
+                placeholder="Choose panels"
+                width={100}
+                closeMenuOnSelect={false}
+                className={styles.select}
+                data-testid={selectors.components.Annotations.annotationsChoosePanelInput}
+              />
+            )}
+          </>
+        </Field>
+      </FieldSet>
+      <FieldSet>
+        <h3 className="page-heading">Query</h3>
+        {ds?.annotations && dsi && (
+          <StandardAnnotationQueryEditor
+            datasource={ds}
+            datasourceInstanceSettings={dsi}
+            annotation={annotation}
+            onChange={(annotation) => onUpdate(annotation, editIndex)}
+          />
+        )}
+        {ds && !ds.annotations && (
+          <AngularEditorLoader
+            datasource={ds}
+            annotation={annotation}
+            onChange={(annotation) => onUpdate(annotation, editIndex)}
+          />
+        )}
+      </FieldSet>
+      <Stack>
+        {!annotation.builtIn && (
+          <Button
+            variant="destructive"
+            onClick={onDeleteAndLeavePage}
+            data-testid={selectors.pages.Dashboard.Settings.Annotations.NewAnnotation.delete}
+          >
+            Delete
+          </Button>
+        )}
+        <Button
+          variant="secondary"
+          onClick={onBackToList}
+          data-testid={selectors.pages.Dashboard.Settings.Annotations.NewAnnotation.apply}
+        >
+          Back to list
+        </Button>
+      </Stack>
+    </div>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    settingsForm: css({
+      maxWidth: theme.spacing(60),
+      marginBottom: theme.spacing(2),
+    }),
+    select: css({
+      marginTop: '8px',
+    }),
+  };
+};
+
+// Synthetic type
+enum PanelFilterType {
+  AllPanels,
+  IncludePanels,
+  ExcludePanels,
+}
+
+const panelFilters = [
+  {
+    label: 'All panels',
+    value: PanelFilterType.AllPanels,
+    description: 'Send the annotation data to all panels that support annotations',
+  },
+  {
+    label: 'Selected panels',
+    value: PanelFilterType.IncludePanels,
+    description: 'Send the annotations to the explicitly listed panels',
+  },
+  {
+    label: 'All panels except',
+    value: PanelFilterType.ExcludePanels,
+    description: 'Do not send annotation data to the following panels',
+  },
+];
diff --git a/public/app/features/dashboard-scene/settings/annotations/AnnotationSettingsList.test.tsx b/public/app/features/dashboard-scene/settings/annotations/AnnotationSettingsList.test.tsx
new file mode 100644
index 0000000000000..3a9d6fc28bf83
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/annotations/AnnotationSettingsList.test.tsx
@@ -0,0 +1,139 @@
+import { act, render } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { AnnotationQuery } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { mockDataSource } from 'app/features/alerting/unified/mocks';
+
+import { MoveDirection } from '../AnnotationsEditView';
+
+import { AnnotationSettingsList, BUTTON_TITLE } from './AnnotationSettingsList';
+
+const defaultDatasource = mockDataSource({
+  name: 'Default Test Data Source',
+  type: 'test',
+});
+
+jest.mock('@grafana/runtime/src/services/dataSourceSrv', () => ({
+  ...jest.requireActual('@grafana/runtime/src/services/dataSourceSrv'),
+  getDataSourceSrv: () => ({
+    getInstanceSettings: () => ({ ...defaultDatasource }),
+  }),
+}));
+
+describe('AnnotationSettingsEdit', () => {
+  const mockOnNew = jest.fn();
+  const mockOnEdit = jest.fn();
+  const mockOnMove = jest.fn();
+  const mockOnDelete = jest.fn();
+
+  async function setup(emptyList = false) {
+    const annotationQuery1: AnnotationQuery = {
+      name: 'test1',
+      datasource: defaultDatasource,
+      enable: true,
+      hide: false,
+      iconColor: 'blue',
+    };
+
+    const annotationQuery2: AnnotationQuery = {
+      name: 'test2',
+      datasource: defaultDatasource,
+      enable: true,
+      hide: false,
+      iconColor: 'red',
+    };
+
+    const props = {
+      annotations: emptyList ? [] : [annotationQuery1, annotationQuery2],
+      onNew: mockOnNew,
+      onEdit: mockOnEdit,
+      onMove: mockOnMove,
+      onDelete: mockOnDelete,
+    };
+
+    return {
+      renderer: await act(async () => render(<AnnotationSettingsList {...props} />)),
+      user: userEvent.setup(),
+    };
+  }
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should render with empty list message', async () => {
+    const {
+      renderer: { getByTestId },
+    } = await setup(true);
+
+    const emptyListBtn = getByTestId(selectors.components.CallToActionCard.buttonV2(BUTTON_TITLE));
+
+    expect(emptyListBtn).toBeInTheDocument();
+  });
+
+  it('should create new annotation when empty list button is pressed', async () => {
+    const {
+      renderer: { getByTestId },
+      user,
+    } = await setup(true);
+
+    const emptyListBtn = getByTestId(selectors.components.CallToActionCard.buttonV2(BUTTON_TITLE));
+
+    await user.click(emptyListBtn);
+
+    expect(mockOnNew).toHaveBeenCalledTimes(1);
+  });
+
+  it('should render annotation list', async () => {
+    const {
+      renderer: { getByTestId },
+    } = await setup();
+
+    const list = getByTestId(selectors.pages.Dashboard.Settings.Annotations.List.annotations);
+
+    expect(list.children.length).toBe(2);
+  });
+
+  it('should edit annotation', async () => {
+    const {
+      renderer: { getAllByRole },
+      user,
+    } = await setup();
+
+    const gridCells = getAllByRole('gridcell');
+
+    await user.click(gridCells[0]);
+
+    expect(mockOnEdit).toHaveBeenCalledTimes(1);
+  });
+
+  it('should move annotation up', async () => {
+    const {
+      renderer: { getAllByLabelText },
+      user,
+    } = await setup();
+
+    const moveBtns = getAllByLabelText('Move up');
+
+    await user.click(moveBtns[0]);
+
+    expect(mockOnMove).toHaveBeenCalledTimes(1);
+    expect(mockOnMove).toHaveBeenCalledWith(expect.anything(), MoveDirection.UP);
+  });
+
+  it('should move annotation down', async () => {
+    const {
+      renderer: { getAllByLabelText },
+      user,
+    } = await setup();
+
+    const moveBtns = getAllByLabelText('Move down');
+
+    await user.click(moveBtns[0]);
+
+    expect(mockOnMove).toHaveBeenCalledTimes(1);
+    expect(mockOnMove).toHaveBeenCalledWith(expect.anything(), MoveDirection.DOWN);
+  });
+});
diff --git a/public/app/features/dashboard-scene/settings/annotations/AnnotationSettingsList.tsx b/public/app/features/dashboard-scene/settings/annotations/AnnotationSettingsList.tsx
new file mode 100644
index 0000000000000..c36d12510d66b
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/annotations/AnnotationSettingsList.tsx
@@ -0,0 +1,139 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { AnnotationQuery } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { getDataSourceSrv } from '@grafana/runtime';
+import { Button, DeleteButton, IconButton, useStyles2, VerticalGroup } from '@grafana/ui';
+import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
+import { ListNewButton } from 'app/features/dashboard/components/DashboardSettings/ListNewButton';
+
+import { MoveDirection } from '../AnnotationsEditView';
+
+type Props = {
+  annotations: AnnotationQuery[];
+  onNew: () => void;
+  onEdit: (idx: number) => void;
+  onMove: (idx: number, dir: MoveDirection) => void;
+  onDelete: (idx: number) => void;
+};
+
+export const BUTTON_TITLE = 'Add annotation query';
+
+export const AnnotationSettingsList = ({ annotations, onNew, onEdit, onMove, onDelete }: Props) => {
+  const styles = useStyles2(getStyles);
+
+  const showEmptyListCTA = annotations.length === 0 || (annotations.length === 1 && annotations[0].builtIn);
+
+  const getAnnotationName = (anno: AnnotationQuery) => {
+    if (anno.enable === false) {
+      return <em className="muted">(Disabled) &nbsp; {anno.name}</em>;
+    }
+
+    if (anno.builtIn) {
+      return <em className="muted">{anno.name} &nbsp; (Built-in)</em>;
+    }
+
+    return <>{anno.name}</>;
+  };
+
+  const dataSourceSrv = getDataSourceSrv();
+  return (
+    <VerticalGroup>
+      {annotations.length > 0 && (
+        <div className={styles.table}>
+          <table role="grid" className="filter-table filter-table--hover">
+            <thead>
+              <tr>
+                <th>Query name</th>
+                <th>Data source</th>
+                <th colSpan={3}></th>
+              </tr>
+            </thead>
+            <tbody data-testid={selectors.pages.Dashboard.Settings.Annotations.List.annotations}>
+              {annotations.map((annotation, idx) => (
+                <tr key={`${annotation.name}-${idx}`}>
+                  {annotation.builtIn ? (
+                    <td role="gridcell" style={{ width: '90%' }} className="pointer" onClick={() => onEdit(idx)}>
+                      <Button size="sm" fill="text" variant="secondary">
+                        {getAnnotationName(annotation)}
+                      </Button>
+                    </td>
+                  ) : (
+                    <td role="gridcell" className="pointer" onClick={() => onEdit(idx)}>
+                      <Button size="sm" fill="text" variant="secondary">
+                        {getAnnotationName(annotation)}
+                      </Button>
+                    </td>
+                  )}
+                  <td role="gridcell" className="pointer" onClick={() => onEdit(idx)}>
+                    {dataSourceSrv.getInstanceSettings(annotation.datasource)?.name || annotation.datasource?.uid}
+                  </td>
+                  <td role="gridcell" style={{ width: '1%' }}>
+                    {idx !== 0 && (
+                      <IconButton name="arrow-up" onClick={() => onMove(idx, MoveDirection.UP)} tooltip="Move up" />
+                    )}
+                  </td>
+                  <td role="gridcell" style={{ width: '1%' }}>
+                    {annotations.length > 1 && idx !== annotations.length - 1 ? (
+                      <IconButton
+                        name="arrow-down"
+                        onClick={() => onMove(idx, MoveDirection.DOWN)}
+                        tooltip="Move down"
+                      />
+                    ) : null}
+                  </td>
+                  <td role="gridcell" style={{ width: '1%' }}>
+                    {!annotation.builtIn && (
+                      <DeleteButton
+                        size="sm"
+                        onConfirm={() => onDelete(idx)}
+                        aria-label={`Delete query with title "${annotation.name}"`}
+                      />
+                    )}
+                  </td>
+                </tr>
+              ))}
+            </tbody>
+          </table>
+        </div>
+      )}
+      {showEmptyListCTA && (
+        <EmptyListCTA
+          onClick={onNew}
+          title="There are no custom annotation queries added yet"
+          buttonIcon="comment-alt"
+          buttonTitle={BUTTON_TITLE}
+          infoBoxTitle="What are annotation queries?"
+          infoBox={{
+            __html: `<p>Annotations provide a way to integrate event data into your graphs. They are visualized as vertical lines
+          and icons on all graph panels. When you hover over an annotation icon you can get event text &amp; tags for
+          the event. You can add annotation events directly from grafana by holding CTRL or CMD + click on graph (or
+          drag region). These will be stored in Grafana's annotation database.
+        </p>
+        Checkout the
+        <a class='external-link' target='_blank' href='http://docs.grafana.org/reference/annotations/'
+          >Annotations documentation</a
+        >
+        for more information.`,
+          }}
+        />
+      )}
+      {!showEmptyListCTA && (
+        <ListNewButton
+          data-testid={selectors.pages.Dashboard.Settings.Annotations.List.addAnnotationCTAV2}
+          onClick={onNew}
+        >
+          New query
+        </ListNewButton>
+      )}
+    </VerticalGroup>
+  );
+};
+
+const getStyles = () => ({
+  table: css({
+    width: '100%',
+    overflowX: 'auto',
+  }),
+});
diff --git a/public/app/features/dashboard-scene/settings/annotations/index.tsx b/public/app/features/dashboard-scene/settings/annotations/index.tsx
new file mode 100644
index 0000000000000..5c5ebb6cb18f7
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/annotations/index.tsx
@@ -0,0 +1,2 @@
+export { AnnotationSettingsEdit, newAnnotationName } from './AnnotationSettingsEdit';
+export { AnnotationSettingsList } from './AnnotationSettingsList';
diff --git a/public/app/features/dashboard-scene/settings/links/DashboardLinkForm.tsx b/public/app/features/dashboard-scene/settings/links/DashboardLinkForm.tsx
new file mode 100644
index 0000000000000..eb4cd33700e2b
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/links/DashboardLinkForm.tsx
@@ -0,0 +1,109 @@
+import React from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { DashboardLink } from '@grafana/schema';
+import { CollapsableSection, TagsInput, Select, Field, Input, Checkbox, Button } from '@grafana/ui';
+
+import { LINK_ICON_MAP, NEW_LINK } from './utils';
+
+const linkTypeOptions = [
+  { value: 'dashboards', label: 'Dashboards' },
+  { value: 'link', label: 'Link' },
+];
+
+const linkIconOptions = Object.keys(LINK_ICON_MAP).map((key) => ({ label: key, value: key }));
+
+interface DashboardLinkFormProps {
+  link: DashboardLink;
+  onUpdate: (link: DashboardLink) => void;
+  onGoBack: () => void;
+}
+
+export function DashboardLinkForm({ link, onUpdate, onGoBack }: DashboardLinkFormProps) {
+  const onTagsChange = (tags: string[]) => {
+    onUpdate({ ...link, tags: tags });
+  };
+
+  const onTypeChange = (selectedItem: SelectableValue) => {
+    const update = { ...link, type: selectedItem.value };
+
+    // clear props that are no longe revant for this type
+    if (update.type === 'dashboards') {
+      update.url = '';
+      update.tooltip = '';
+    } else {
+      update.tags = [];
+    }
+
+    onUpdate(update);
+  };
+
+  const onIconChange = (selectedItem: SelectableValue) => {
+    onUpdate({ ...link, icon: selectedItem.value });
+  };
+
+  const onChange = (ev: React.FocusEvent<HTMLInputElement>) => {
+    const target = ev.currentTarget;
+    onUpdate({
+      ...link,
+      [target.name]: target.type === 'checkbox' ? target.checked : target.value,
+    });
+  };
+
+  const isNew = link.title === NEW_LINK.title;
+
+  return (
+    <div style={{ maxWidth: '600px' }}>
+      <Field label="Title">
+        <Input name="title" id="title" value={link.title} onChange={onChange} autoFocus={isNew} />
+      </Field>
+      <Field label="Type">
+        <Select inputId="link-type-input" value={link.type} options={linkTypeOptions} onChange={onTypeChange} />
+      </Field>
+      {link.type === 'dashboards' && (
+        <>
+          <Field label="With tags">
+            <TagsInput tags={link.tags} onChange={onTagsChange} />
+          </Field>
+        </>
+      )}
+      {link.type === 'link' && (
+        <>
+          <Field label="URL">
+            <Input name="url" value={link.url} onChange={onChange} />
+          </Field>
+          <Field label="Tooltip">
+            <Input name="tooltip" value={link.tooltip} onChange={onChange} placeholder="Open dashboard" />
+          </Field>
+          <Field label="Icon">
+            <Select value={link.icon} options={linkIconOptions} onChange={onIconChange} />
+          </Field>
+        </>
+      )}
+      <CollapsableSection label="Options" isOpen={true}>
+        {link.type === 'dashboards' && (
+          <Field>
+            <Checkbox label="Show as dropdown" name="asDropdown" value={link.asDropdown} onChange={onChange} />
+          </Field>
+        )}
+        <Field>
+          <Checkbox label="Include current time range" name="keepTime" value={link.keepTime} onChange={onChange} />
+        </Field>
+        <Field>
+          <Checkbox
+            label="Include current template variable values"
+            name="includeVars"
+            value={link.includeVars}
+            onChange={onChange}
+          />
+        </Field>
+        <Field>
+          <Checkbox label="Open link in new tab" name="targetBlank" value={link.targetBlank} onChange={onChange} />
+        </Field>
+      </CollapsableSection>
+      <Button variant="secondary" onClick={onGoBack}>
+        Back to list
+      </Button>
+    </div>
+  );
+}
diff --git a/public/app/features/dashboard-scene/settings/links/DashboardLinkList.tsx b/public/app/features/dashboard-scene/settings/links/DashboardLinkList.tsx
new file mode 100644
index 0000000000000..9e9f76d3d1565
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/links/DashboardLinkList.tsx
@@ -0,0 +1,115 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { DashboardLink } from '@grafana/schema';
+import { Button, DeleteButton, HorizontalGroup, Icon, IconButton, TagList, useStyles2 } from '@grafana/ui';
+import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
+
+interface DashboardLinkListProps {
+  links: DashboardLink[];
+  onNew: () => void;
+  onEdit: (idx: number) => void;
+  onDuplicate: (link: DashboardLink) => void;
+  onDelete: (idx: number) => void;
+  onOrderChange: (idx: number, direction: number) => void;
+}
+
+export function DashboardLinkList({
+  links,
+  onNew,
+  onOrderChange,
+  onEdit,
+  onDuplicate,
+  onDelete,
+}: DashboardLinkListProps) {
+  const styles = useStyles2(getStyles);
+  const isEmptyList = links.length === 0;
+
+  if (isEmptyList) {
+    return (
+      <div>
+        <EmptyListCTA
+          onClick={onNew}
+          title="There are no dashboard links added yet"
+          buttonIcon="link"
+          buttonTitle="Add dashboard link"
+          infoBoxTitle="What are dashboard links?"
+          infoBox={{
+            __html:
+              '<p>Dashboard Links allow you to place links to other dashboards and web sites directly below the dashboard header.</p>',
+          }}
+        />
+      </div>
+    );
+  }
+
+  return (
+    <>
+      <table role="grid" className="filter-table filter-table--hover">
+        <thead>
+          <tr>
+            <th>Type</th>
+            <th>Info</th>
+            <th colSpan={3} />
+          </tr>
+        </thead>
+        <tbody>
+          {links.map((link, idx) => (
+            <tr key={`${link.title}-${idx}`}>
+              <td role="gridcell" className="pointer" onClick={() => onEdit(idx)}>
+                <Icon name="external-link-alt" /> &nbsp; {link.type}
+              </td>
+              <td role="gridcell">
+                <HorizontalGroup>
+                  {link.title && <span className={styles.titleWrapper}>{link.title}</span>}
+                  {link.type === 'link' && <span className={styles.urlWrapper}>{link.url}</span>}
+                  {link.type === 'dashboards' && <TagList tags={link.tags ?? []} />}
+                </HorizontalGroup>
+              </td>
+              <td style={{ width: '1%' }} role="gridcell">
+                {idx !== 0 && (
+                  <IconButton name="arrow-up" onClick={() => onOrderChange(idx, -1)} tooltip="Move link up" />
+                )}
+              </td>
+              <td style={{ width: '1%' }} role="gridcell">
+                {links.length > 1 && idx !== links.length - 1 ? (
+                  <IconButton name="arrow-down" onClick={() => onOrderChange(idx, 1)} tooltip="Move link down" />
+                ) : null}
+              </td>
+              <td style={{ width: '1%' }} role="gridcell">
+                <IconButton name="copy" onClick={() => onDuplicate(link)} tooltip="Copy link" />
+              </td>
+              <td style={{ width: '1%' }} role="gridcell">
+                <DeleteButton
+                  aria-label={`Delete link with title "${link.title}"`}
+                  size="sm"
+                  onConfirm={() => onDelete(idx)}
+                />
+              </td>
+            </tr>
+          ))}
+        </tbody>
+      </table>
+      <Button className={styles.newLinkButton} icon="plus" onClick={onNew}>
+        New link
+      </Button>
+    </>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  titleWrapper: css({
+    width: '20vw',
+    textOverflow: 'ellipsis',
+    overflow: 'hidden',
+  }),
+  urlWrapper: css({
+    width: '40vw',
+    textOverflow: 'ellipsis',
+    overflow: 'hidden',
+  }),
+  newLinkButton: css({
+    marginTop: theme.spacing(3),
+  }),
+});
diff --git a/public/app/features/dashboard-scene/settings/links/utils.ts b/public/app/features/dashboard-scene/settings/links/utils.ts
new file mode 100644
index 0000000000000..717a2bdaf1c79
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/links/utils.ts
@@ -0,0 +1,25 @@
+import { IconName } from '@grafana/data';
+import { DashboardLink } from '@grafana/schema';
+
+export const NEW_LINK: DashboardLink = {
+  icon: 'external link',
+  title: 'New link',
+  tooltip: '',
+  type: 'dashboards',
+  url: '',
+  asDropdown: false,
+  tags: [],
+  targetBlank: false,
+  keepTime: false,
+  includeVars: false,
+};
+
+export const LINK_ICON_MAP: Record<string, IconName | undefined> = {
+  'external link': 'external-link-alt',
+  dashboard: 'apps',
+  question: 'question-circle',
+  info: 'info-circle',
+  bolt: 'bolt',
+  doc: 'file-alt',
+  cloud: 'cloud',
+};
diff --git a/public/app/features/dashboard-scene/settings/utils.ts b/public/app/features/dashboard-scene/settings/utils.ts
new file mode 100644
index 0000000000000..1f40d2be8e612
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/utils.ts
@@ -0,0 +1,112 @@
+import { useLocation } from 'react-router-dom';
+
+import { locationUtil, NavModelItem } from '@grafana/data';
+import { SceneObject, SceneObjectState } from '@grafana/scenes';
+import { contextSrv } from 'app/core/core';
+import { t } from 'app/core/internationalization';
+import { getNavModel } from 'app/core/selectors/navModel';
+import { AccessControlAction, useSelector } from 'app/types';
+
+import { DashboardScene } from '../scene/DashboardScene';
+
+import { AnnotationsEditView } from './AnnotationsEditView';
+import { DashboardLinksEditView } from './DashboardLinksEditView';
+import { GeneralSettingsEditView } from './GeneralSettingsEditView';
+import { JsonModelEditView } from './JsonModelEditView';
+import { PermissionsEditView } from './PermissionsEditView';
+import { VariablesEditView } from './VariablesEditView';
+import { VersionsEditView } from './VersionsEditView';
+
+export interface DashboardEditViewState extends SceneObjectState {}
+
+export interface DashboardEditListViewState extends DashboardEditViewState {
+  /** Index of the list item to edit */
+  editIndex?: number;
+}
+
+export interface DashboardEditView extends SceneObject {
+  getUrlKey(): string;
+}
+
+export function useDashboardEditPageNav(dashboard: DashboardScene, currentEditView: string) {
+  const location = useLocation();
+  const navIndex = useSelector((state) => state.navIndex);
+  const navModel = getNavModel(navIndex, 'dashboards/browse');
+  const dashboardPageNav = dashboard.getPageNav(location, navIndex);
+
+  const pageNav: NavModelItem = {
+    text: 'Settings',
+    url: locationUtil.getUrlForPartial(location, { editview: 'settings', editIndex: null }),
+    children: [],
+    parentItem: dashboardPageNav,
+  };
+
+  if (dashboard.state.meta.canEdit) {
+    pageNav.children!.push({
+      text: t('dashboard-settings.general.title', 'General'),
+      url: locationUtil.getUrlForPartial(location, { editview: 'settings', editIndex: null }),
+      active: currentEditView === 'settings',
+    });
+    pageNav.children!.push({
+      text: t('dashboard-settings.annotations.title', 'Annotations'),
+      url: locationUtil.getUrlForPartial(location, { editview: 'annotations', editIndex: null }),
+      active: currentEditView === 'annotations',
+    });
+    pageNav.children!.push({
+      text: t('dashboard-settings.variables.title', 'Variables'),
+      url: locationUtil.getUrlForPartial(location, { editview: 'variables', editIndex: null }),
+      active: currentEditView === 'variables',
+    });
+    pageNav.children!.push({
+      text: t('dashboard-settings.links.title', 'Links'),
+      url: locationUtil.getUrlForPartial(location, { editview: 'links', editIndex: null }),
+      active: currentEditView === 'links',
+    });
+  }
+
+  if (dashboard.state.id && dashboard.state.meta.canSave) {
+    pageNav.children!.push({
+      text: t('dashboard-settings.versions.title', 'Versions'),
+      url: locationUtil.getUrlForPartial(location, { editview: 'versions', editIndex: null }),
+      active: currentEditView === 'versions',
+    });
+  }
+
+  if (dashboard.state.id && dashboard.state.meta.canAdmin) {
+    if (contextSrv.hasPermission(AccessControlAction.DashboardsPermissionsRead)) {
+      pageNav.children!.push({
+        text: t('dashboard-settings.permissions.title', 'Permissions'),
+        url: locationUtil.getUrlForPartial(location, { editview: 'permissions', editIndex: null }),
+        active: currentEditView === 'permissions',
+      });
+    }
+  }
+
+  pageNav.children!.push({
+    text: t('dashboard-settings.json-editor.title', 'JSON Model'),
+    url: locationUtil.getUrlForPartial(location, { editview: 'json-model', editIndex: null }),
+    active: currentEditView === 'json-model',
+  });
+
+  return { navModel, pageNav };
+}
+
+export function createDashboardEditViewFor(editview: string): DashboardEditView {
+  switch (editview) {
+    case 'annotations':
+      return new AnnotationsEditView({});
+    case 'variables':
+      return new VariablesEditView({});
+    case 'links':
+      return new DashboardLinksEditView({});
+    case 'versions':
+      return new VersionsEditView({});
+    case 'json-model':
+      return new JsonModelEditView({});
+    case 'permissions':
+      return new PermissionsEditView({});
+    case 'settings':
+    default:
+      return new GeneralSettingsEditView({});
+  }
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/VariableEditorForm.tsx b/public/app/features/dashboard-scene/settings/variables/VariableEditorForm.tsx
new file mode 100644
index 0000000000000..e94b5b0904477
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/VariableEditorForm.tsx
@@ -0,0 +1,175 @@
+import { css } from '@emotion/css';
+import React, { FormEvent, useCallback, useState } from 'react';
+import { useAsyncFn } from 'react-use';
+import { lastValueFrom } from 'rxjs';
+
+import { GrafanaTheme2, SelectableValue } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { reportInteraction } from '@grafana/runtime';
+import { SceneVariable } from '@grafana/scenes';
+import { VariableHide, defaultVariableModel } from '@grafana/schema';
+import { Button, LoadingPlaceholder, ConfirmModal, ModalsController, Stack, useStyles2 } from '@grafana/ui';
+import { VariableHideSelect } from 'app/features/dashboard-scene/settings/variables/components/VariableHideSelect';
+import { VariableLegend } from 'app/features/dashboard-scene/settings/variables/components/VariableLegend';
+import { VariableTextAreaField } from 'app/features/dashboard-scene/settings/variables/components/VariableTextAreaField';
+import { VariableTextField } from 'app/features/dashboard-scene/settings/variables/components/VariableTextField';
+import { VariableValuesPreview } from 'app/features/dashboard-scene/settings/variables/components/VariableValuesPreview';
+import { VariableNameConstraints } from 'app/features/variables/editor/types';
+
+import { VariableTypeSelect } from './components/VariableTypeSelect';
+import { EditableVariableType, getVariableEditor, hasVariableOptions, isEditableVariableType } from './utils';
+
+interface VariableEditorFormProps {
+  variable: SceneVariable;
+  onTypeChange: (type: EditableVariableType) => void;
+  onGoBack: () => void;
+  onDelete: (variableName: string) => void;
+  onValidateVariableName: (name: string, key: string | undefined) => [true, string] | [false, null];
+}
+export function VariableEditorForm({
+  variable,
+  onTypeChange,
+  onGoBack,
+  onDelete,
+  onValidateVariableName,
+}: VariableEditorFormProps) {
+  const styles = useStyles2(getStyles);
+  const [nameError, setNameError] = useState<string | null>(null);
+  const { name, type, label, description, hide, key } = variable.useState();
+  const EditorToRender = isEditableVariableType(type) ? getVariableEditor(type) : undefined;
+  const [runQueryState, onRunQuery] = useAsyncFn(async () => {
+    await lastValueFrom(variable.validateAndUpdate!());
+  }, [variable]);
+  const onVariableTypeChange = (option: SelectableValue<EditableVariableType>) => {
+    if (option.value) {
+      onTypeChange(option.value);
+    }
+  };
+
+  const onNameChange = useCallback(
+    (e: FormEvent<HTMLInputElement>) => {
+      const [, errorMessage] = onValidateVariableName(e.currentTarget.value, key);
+      if (nameError !== errorMessage) {
+        setNameError(errorMessage);
+      }
+    },
+    [key, nameError, onValidateVariableName]
+  );
+
+  const onNameBlur = (e: FormEvent<HTMLInputElement>) => {
+    if (!nameError) {
+      variable.setState({ name: e.currentTarget.value });
+    }
+  };
+
+  const onLabelBlur = (e: FormEvent<HTMLInputElement>) => variable.setState({ label: e.currentTarget.value });
+  const onDescriptionBlur = (e: FormEvent<HTMLTextAreaElement>) =>
+    variable.setState({ description: e.currentTarget.value });
+  const onHideChange = (hide: VariableHide) => variable.setState({ hide });
+
+  const isHasVariableOptions = hasVariableOptions(variable);
+
+  const onDeleteVariable = (hideModal: () => void) => () => {
+    reportInteraction('Delete variable');
+    onDelete(name);
+    hideModal();
+  };
+
+  return (
+    <form aria-label="Variable editor Form">
+      <VariableTypeSelect onChange={onVariableTypeChange} type={type} />
+
+      <VariableLegend>General</VariableLegend>
+      <VariableTextField
+        name="Name"
+        description="The name of the template variable. (Max. 50 characters)"
+        placeholder="Variable name"
+        defaultValue={name ?? ''}
+        onChange={onNameChange}
+        onBlur={onNameBlur}
+        testId={selectors.pages.Dashboard.Settings.Variables.Edit.General.generalNameInputV2}
+        maxLength={VariableNameConstraints.MaxSize}
+        required
+        invalid={!!nameError}
+        error={nameError}
+      />
+      <VariableTextField
+        name="Label"
+        description="Optional display name"
+        placeholder="Label name"
+        defaultValue={label ?? ''}
+        onBlur={onLabelBlur}
+        testId={selectors.pages.Dashboard.Settings.Variables.Edit.General.generalLabelInputV2}
+      />
+      <VariableTextAreaField
+        name="Description"
+        defaultValue={description ?? ''}
+        placeholder="Descriptive text"
+        onBlur={onDescriptionBlur}
+        width={52}
+      />
+
+      <VariableHideSelect onChange={onHideChange} hide={hide || defaultVariableModel.hide!} type={type} />
+
+      {EditorToRender && <EditorToRender variable={variable} onRunQuery={onRunQuery} />}
+
+      {isHasVariableOptions && <VariableValuesPreview options={variable.getOptionsForSelect()} />}
+
+      <div className={styles.buttonContainer}>
+        <Stack gap={2}>
+          <ModalsController>
+            {({ showModal, hideModal }) => (
+              <Button
+                variant="destructive"
+                fill="outline"
+                onClick={() => {
+                  showModal(ConfirmModal, {
+                    title: 'Delete variable',
+                    body: `Are you sure you want to delete: ${name}?`,
+                    confirmText: 'Delete variable',
+                    onConfirm: onDeleteVariable(hideModal),
+                    onDismiss: hideModal,
+                    isOpen: true,
+                  });
+                }}
+              >
+                Delete
+              </Button>
+            )}
+          </ModalsController>
+          <Button
+            variant="secondary"
+            data-testid={selectors.pages.Dashboard.Settings.Variables.Edit.General.applyButton}
+            onClick={onGoBack}
+          >
+            Back to list
+          </Button>
+
+          {isHasVariableOptions && (
+            <Button
+              disabled={runQueryState.loading}
+              variant="secondary"
+              data-testid={selectors.pages.Dashboard.Settings.Variables.Edit.General.submitButton}
+              onClick={onRunQuery}
+            >
+              {runQueryState.loading ? (
+                <LoadingPlaceholder className={styles.loadingPlaceHolder} text="Running query..." />
+              ) : (
+                `Run query`
+              )}
+            </Button>
+          )}
+        </Stack>
+      </div>
+    </form>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  buttonContainer: css({
+    marginTop: theme.spacing(2),
+  }),
+  loadingPlaceHolder: css({
+    marginBottom: 0,
+  }),
+});
diff --git a/public/app/features/dashboard-scene/settings/variables/VariableEditorList.tsx b/public/app/features/dashboard-scene/settings/variables/VariableEditorList.tsx
new file mode 100644
index 0000000000000..b844531febb50
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/VariableEditorList.tsx
@@ -0,0 +1,133 @@
+import { css } from '@emotion/css';
+import React, { ReactElement } from 'react';
+import { DragDropContext, Droppable, DropResult } from 'react-beautiful-dnd';
+
+import { selectors } from '@grafana/e2e-selectors';
+import { reportInteraction } from '@grafana/runtime';
+import { SceneVariable, SceneVariableState } from '@grafana/scenes';
+import { useStyles2, Stack, Button } from '@grafana/ui';
+import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
+
+import { VariableEditorListRow } from './VariableEditorListRow';
+
+export interface Props {
+  variables: Array<SceneVariable<SceneVariableState>>;
+  onAdd: () => void;
+  onChangeOrder: (fromIndex: number, toIndex: number) => void;
+  onDuplicate: (identifier: string) => void;
+  onDelete: (identifier: string) => void;
+  onEdit: (identifier: string) => void;
+}
+
+export function VariableEditorList({
+  variables,
+  onChangeOrder,
+  onDelete,
+  onDuplicate,
+  onAdd,
+  onEdit,
+}: Props): ReactElement {
+  const styles = useStyles2(getStyles);
+  const onDragEnd = (result: DropResult) => {
+    if (!result.destination || !result.source) {
+      return;
+    }
+    reportInteraction('Variable drag and drop');
+    onChangeOrder(result.source.index, result.destination.index);
+  };
+
+  return (
+    <div>
+      <div>
+        {variables.length === 0 && <EmptyVariablesList onAdd={onAdd} />}
+
+        {variables.length > 0 && (
+          <Stack direction="column" gap={3}>
+            <div className={styles.tableContainer}>
+              <table
+                className="filter-table filter-table--hover"
+                data-testid={selectors.pages.Dashboard.Settings.Variables.List.table}
+                role="grid"
+              >
+                <thead>
+                  <tr>
+                    <th>Variable</th>
+                    <th>Definition</th>
+                    <th colSpan={5} />
+                  </tr>
+                </thead>
+                <DragDropContext onDragEnd={onDragEnd}>
+                  <Droppable droppableId="variables-list" direction="vertical">
+                    {(provided) => (
+                      <tbody ref={provided.innerRef} {...provided.droppableProps}>
+                        {variables.map((variableScene, index) => {
+                          const variableState = variableScene.state;
+                          return (
+                            <VariableEditorListRow
+                              index={index}
+                              key={`${variableState.name}-${index}`}
+                              variable={variableScene}
+                              onDelete={onDelete}
+                              onDuplicate={onDuplicate}
+                              onEdit={onEdit}
+                            />
+                          );
+                        })}
+                        {provided.placeholder}
+                      </tbody>
+                    )}
+                  </Droppable>
+                </DragDropContext>
+              </table>
+            </div>
+            <Stack>
+              <Button
+                data-testid={selectors.pages.Dashboard.Settings.Variables.List.newButton}
+                onClick={onAdd}
+                icon="plus"
+              >
+                New variable
+              </Button>
+            </Stack>
+          </Stack>
+        )}
+      </div>
+    </div>
+  );
+}
+
+function EmptyVariablesList({ onAdd }: { onAdd: () => void }): ReactElement {
+  return (
+    <div>
+      <EmptyListCTA
+        title="There are no variables yet"
+        buttonIcon="calculator-alt"
+        buttonTitle="Add variable"
+        infoBox={{
+          __html: ` <p>
+                    Variables enable more interactive and dynamic dashboards. Instead of hard-coding things like server
+                    or sensor names in your metric queries you can use variables in their place. Variables are shown as
+                    list boxes at the top of the dashboard. These drop-down lists make it easy to change the data
+                    being displayed in your dashboard. Check out the
+                    <a class="external-link" href="https://grafana.com/docs/grafana/latest/variables/" target="_blank">
+                      Templates and variables documentation
+                    </a>
+                    for more information.
+                  </p>`,
+        }}
+        infoBoxTitle="What do variables do?"
+        onClick={(event) => {
+          event.preventDefault();
+          onAdd();
+        }}
+      />
+    </div>
+  );
+}
+
+const getStyles = () => ({
+  tableContainer: css({
+    overflow: 'scroll',
+    width: '100%',
+  }),
+});
diff --git a/public/app/features/dashboard-scene/settings/variables/VariableEditorListRow.tsx b/public/app/features/dashboard-scene/settings/variables/VariableEditorListRow.tsx
new file mode 100644
index 0000000000000..0a2305e78a03c
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/VariableEditorListRow.tsx
@@ -0,0 +1,160 @@
+import { css } from '@emotion/css';
+import React, { ReactElement, useState } from 'react';
+import { Draggable } from 'react-beautiful-dnd';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { reportInteraction } from '@grafana/runtime';
+import { SceneVariable } from '@grafana/scenes';
+import { Button, ConfirmModal, Icon, IconButton, useStyles2, useTheme2 } from '@grafana/ui';
+
+import { getDefinition } from './utils';
+
+export interface VariableEditorListRowProps {
+  index: number;
+  variable: SceneVariable;
+  onEdit: (identifier: string) => void;
+  onDuplicate: (identifier: string) => void;
+  onDelete: (identifier: string) => void;
+}
+
+export function VariableEditorListRow({
+  index,
+  variable,
+  onEdit: propsOnEdit,
+  onDuplicate: propsOnDuplicate,
+  onDelete: propsOnDelete,
+}: VariableEditorListRowProps): ReactElement {
+  const theme = useTheme2();
+  const styles = useStyles2(getStyles);
+  const definition = getDefinition(variable);
+  const variableState = variable.state;
+  const identifier = variableState.name;
+  const [showDeleteModal, setShowDeleteModal] = useState(false);
+  const handleDeleteVariableModal = (show: boolean) => () => {
+    setShowDeleteModal(show);
+  };
+  const onDeleteVariable = () => {
+    reportInteraction('Delete variable');
+    propsOnDelete(identifier);
+  };
+
+  return (
+    <Draggable draggableId={JSON.stringify(identifier)} index={index}>
+      {(provided, snapshot) => (
+        <tr
+          ref={provided.innerRef}
+          {...provided.draggableProps}
+          style={{
+            userSelect: snapshot.isDragging ? 'none' : 'auto',
+            background: snapshot.isDragging ? theme.colors.background.secondary : undefined,
+            ...provided.draggableProps.style,
+          }}
+        >
+          <td role="gridcell" className={styles.column}>
+            <Button
+              size="xs"
+              fill="text"
+              onClick={(event) => {
+                event.preventDefault();
+                propsOnEdit(identifier);
+              }}
+              className={styles.nameLink}
+              data-testid={selectors.pages.Dashboard.Settings.Variables.List.tableRowNameFields(variableState.name)}
+            >
+              {variableState.name}
+            </Button>
+          </td>
+          <td
+            role="gridcell"
+            className={styles.definitionColumn}
+            onClick={(event) => {
+              event.preventDefault();
+              propsOnEdit(identifier);
+            }}
+            data-testid={selectors.pages.Dashboard.Settings.Variables.List.tableRowDefinitionFields(variableState.name)}
+          >
+            {definition}
+          </td>
+
+          <td role="gridcell" className={styles.column}>
+            <div className={styles.icons}>
+              <IconButton
+                onClick={(event) => {
+                  event.preventDefault();
+                  reportInteraction('Duplicate variable');
+                  propsOnDuplicate(identifier);
+                }}
+                name="copy"
+                tooltip="Duplicate variable"
+                data-testid={selectors.pages.Dashboard.Settings.Variables.List.tableRowDuplicateButtons(
+                  variableState.name
+                )}
+              />
+              <IconButton
+                onClick={(event) => {
+                  event.preventDefault();
+                  setShowDeleteModal(true);
+                }}
+                name="trash-alt"
+                tooltip="Remove variable"
+                data-testid={selectors.pages.Dashboard.Settings.Variables.List.tableRowRemoveButtons(
+                  variableState.name
+                )}
+              />
+              <ConfirmModal
+                isOpen={showDeleteModal}
+                title="Delete variable"
+                body={`Are you sure you want to delete: ${variableState.name}?`}
+                confirmText="Delete variable"
+                onConfirm={onDeleteVariable}
+                onDismiss={handleDeleteVariableModal(false)}
+              />
+
+              <div {...provided.dragHandleProps} className={styles.dragHandle}>
+                <Icon name="draggabledots" size="lg" />
+              </div>
+            </div>
+          </td>
+        </tr>
+      )}
+    </Draggable>
+  );
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    dragHandle: css({
+      cursor: 'grab',
+      marginLeft: theme.spacing(1),
+    }),
+    column: css({
+      width: '1%',
+    }),
+    nameLink: css({
+      cursor: 'pointer',
+      color: theme.colors.primary.text,
+    }),
+    definitionColumn: css({
+      width: '100%',
+      maxWidth: '200px',
+      cursor: 'pointer',
+      overflow: 'hidden',
+      textOverflow: 'ellipsis',
+      whiteSpace: 'nowrap',
+    }),
+    iconPassed: css({
+      color: theme.v1.palette.greenBase,
+      marginRight: theme.spacing(2),
+    }),
+    iconFailed: css({
+      color: theme.v1.palette.orange,
+      marginRight: theme.spacing(2),
+    }),
+    icons: css({
+      display: 'flex',
+      gap: theme.spacing(2),
+      alignItems: 'center',
+    }),
+  };
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/components/AdHocVariableForm.test.tsx b/public/app/features/dashboard-scene/settings/variables/components/AdHocVariableForm.test.tsx
new file mode 100644
index 0000000000000..610a2a9eea96e
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/components/AdHocVariableForm.test.tsx
@@ -0,0 +1,118 @@
+import { act, render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { selectors } from '@grafana/e2e-selectors';
+import { mockDataSource } from 'app/features/alerting/unified/mocks';
+
+import { AdHocVariableForm, AdHocVariableFormProps } from './AdHocVariableForm';
+
+const defaultDatasource = mockDataSource({
+  name: 'Default Test Data Source',
+  uid: 'test-ds',
+  type: 'test',
+});
+
+const promDatasource = mockDataSource({
+  name: 'Prometheus',
+  uid: 'prometheus',
+  type: 'prometheus',
+});
+
+jest.mock('@grafana/runtime/src/services/dataSourceSrv', () => ({
+  ...jest.requireActual('@grafana/runtime/src/services/dataSourceSrv'),
+  getDataSourceSrv: () => ({
+    get: async () => defaultDatasource,
+    getList: () => [defaultDatasource, promDatasource],
+    getInstanceSettings: () => ({ ...defaultDatasource }),
+  }),
+}));
+
+describe('AdHocVariableForm', () => {
+  const onDataSourceChange = jest.fn();
+  const defaultProps: AdHocVariableFormProps = {
+    datasource: defaultDatasource,
+    onDataSourceChange,
+    infoText: 'Test Info',
+  };
+
+  it('should render the form with the provided data source', async () => {
+    const { renderer } = await setup(defaultProps);
+
+    const dataSourcePicker = renderer.getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.AdHocFiltersVariable.datasourceSelect
+    );
+    const infoText = renderer.getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.AdHocFiltersVariable.infoText
+    );
+
+    expect(dataSourcePicker).toBeInTheDocument();
+    expect(dataSourcePicker.getAttribute('placeholder')).toBe('Default Test Data Source');
+    expect(infoText).toBeInTheDocument();
+    expect(infoText).toHaveTextContent('Test Info');
+  });
+
+  it('should call the onDataSourceChange callback when the data source is changed', async () => {
+    const { renderer, user } = await setup(defaultProps);
+
+    // Simulate changing the data source
+    await user.click(renderer.getByTestId(selectors.components.DataSourcePicker.inputV2));
+    await user.click(renderer.getByText(/prom/i));
+
+    expect(onDataSourceChange).toHaveBeenCalledTimes(1);
+    expect(onDataSourceChange).toHaveBeenCalledWith(promDatasource, undefined);
+  });
+
+  it('should not render code editor when no default keys provided', async () => {
+    await setup(defaultProps);
+
+    expect(screen.queryByTestId(selectors.components.CodeEditor.container)).not.toBeInTheDocument();
+  });
+
+  it('should render code editor when defaultKeys and onDefaultKeysChange are provided', async () => {
+    const mockOnStaticKeysChange = jest.fn();
+    await setup({
+      ...defaultProps,
+      defaultKeys: [{ text: 'test', value: 'test' }],
+      onDefaultKeysChange: mockOnStaticKeysChange,
+    });
+
+    expect(await screen.findByTestId(selectors.components.CodeEditor.container)).toBeInTheDocument();
+  });
+
+  it('should call onDefaultKeysChange when toggling on default options', async () => {
+    const mockOnStaticKeysChange = jest.fn();
+    await setup({
+      ...defaultProps,
+      onDefaultKeysChange: mockOnStaticKeysChange,
+    });
+
+    await userEvent.click(
+      screen.getByTestId(selectors.pages.Dashboard.Settings.Variables.Edit.AdHocFiltersVariable.modeToggle)
+    );
+    expect(mockOnStaticKeysChange).toHaveBeenCalledTimes(1);
+    expect(mockOnStaticKeysChange).toHaveBeenCalledWith([]);
+  });
+
+  it('should call onDefaultKeysChange when toggling off default options', async () => {
+    const mockOnStaticKeysChange = jest.fn();
+    await setup({
+      ...defaultProps,
+      defaultKeys: [{ text: 'test', value: 'test' }],
+      onDefaultKeysChange: mockOnStaticKeysChange,
+    });
+
+    await userEvent.click(
+      screen.getByTestId(selectors.pages.Dashboard.Settings.Variables.Edit.AdHocFiltersVariable.modeToggle)
+    );
+    expect(mockOnStaticKeysChange).toHaveBeenCalledTimes(1);
+    expect(mockOnStaticKeysChange).toHaveBeenCalledWith(undefined);
+  });
+});
+
+async function setup(props?: React.ComponentProps<typeof AdHocVariableForm>) {
+  return {
+    renderer: await act(() => render(<AdHocVariableForm onDataSourceChange={jest.fn()} {...props} />)),
+    user: userEvent.setup(),
+  };
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/components/AdHocVariableForm.tsx b/public/app/features/dashboard-scene/settings/variables/components/AdHocVariableForm.tsx
new file mode 100644
index 0000000000000..415e9f6cc211a
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/components/AdHocVariableForm.tsx
@@ -0,0 +1,85 @@
+import React, { useCallback } from 'react';
+
+import { DataSourceInstanceSettings, MetricFindValue, readCSV } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { DataSourceRef } from '@grafana/schema';
+import { Alert, CodeEditor, Field, Switch } from '@grafana/ui';
+import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker';
+
+import { VariableLegend } from './VariableLegend';
+
+export interface AdHocVariableFormProps {
+  datasource?: DataSourceRef;
+  onDataSourceChange: (dsSettings: DataSourceInstanceSettings) => void;
+  infoText?: string;
+  defaultKeys?: MetricFindValue[];
+  onDefaultKeysChange?: (keys?: MetricFindValue[]) => void;
+}
+
+export function AdHocVariableForm({
+  datasource,
+  infoText,
+  onDataSourceChange,
+  onDefaultKeysChange,
+  defaultKeys,
+}: AdHocVariableFormProps) {
+  const updateStaticKeys = useCallback(
+    (csvContent: string) => {
+      const df = readCSV('key,value\n' + csvContent)[0];
+      const options = [];
+      for (let i = 0; i < df.length; i++) {
+        options.push({ text: df.fields[0].values[i], value: df.fields[1].values[i] });
+      }
+
+      onDefaultKeysChange?.(options);
+    },
+    [onDefaultKeysChange]
+  );
+
+  return (
+    <>
+      <VariableLegend>Ad-hoc options</VariableLegend>
+      <Field label="Data source" htmlFor="data-source-picker">
+        <DataSourcePicker current={datasource} onChange={onDataSourceChange} width={30} variables={true} noDefault />
+      </Field>
+
+      {infoText ? (
+        <Alert
+          title={infoText}
+          severity="info"
+          data-testid={selectors.pages.Dashboard.Settings.Variables.Edit.AdHocFiltersVariable.infoText}
+        />
+      ) : null}
+
+      {onDefaultKeysChange && (
+        <>
+          <Field label="Use static key dimensions" description="Provide dimensions as CSV: dimensionName, dimensionId">
+            <Switch
+              data-testid={selectors.pages.Dashboard.Settings.Variables.Edit.AdHocFiltersVariable.modeToggle}
+              value={defaultKeys !== undefined}
+              onChange={(e) => {
+                if (defaultKeys === undefined) {
+                  onDefaultKeysChange([]);
+                } else {
+                  onDefaultKeysChange(undefined);
+                }
+              }}
+            />
+          </Field>
+
+          {defaultKeys !== undefined && (
+            <CodeEditor
+              height={300}
+              language="csv"
+              value={defaultKeys.map((o) => `${o.text},${o.value}`).join('\n')}
+              onBlur={updateStaticKeys}
+              onSave={updateStaticKeys}
+              showMiniMap={false}
+              showLineNumbers={true}
+            />
+          )}
+        </>
+      )}
+    </>
+  );
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/components/ConstantVariableForm.tsx b/public/app/features/dashboard-scene/settings/variables/components/ConstantVariableForm.tsx
new file mode 100644
index 0000000000000..262429fc62b0f
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/components/ConstantVariableForm.tsx
@@ -0,0 +1,27 @@
+import React, { FormEvent } from 'react';
+
+import { selectors } from '@grafana/e2e-selectors';
+
+import { VariableLegend } from './VariableLegend';
+import { VariableTextField } from './VariableTextField';
+
+interface ConstantVariableFormProps {
+  constantValue: string;
+  onChange: (event: FormEvent<HTMLInputElement>) => void;
+}
+
+export function ConstantVariableForm({ onChange, constantValue }: ConstantVariableFormProps) {
+  return (
+    <>
+      <VariableLegend>Constant options</VariableLegend>
+      <VariableTextField
+        defaultValue={constantValue}
+        name="Value"
+        placeholder="your metric prefix"
+        onBlur={onChange}
+        testId={selectors.pages.Dashboard.Settings.Variables.Edit.ConstantVariable.constantOptionsQueryInputV2}
+        width={30}
+      />
+    </>
+  );
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/components/CustomVariableForm.test.tsx b/public/app/features/dashboard-scene/settings/variables/components/CustomVariableForm.test.tsx
new file mode 100644
index 0000000000000..ec55c94b26dab
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/components/CustomVariableForm.test.tsx
@@ -0,0 +1,116 @@
+import { render, fireEvent } from '@testing-library/react';
+import React from 'react';
+
+import { selectors } from '@grafana/e2e-selectors';
+
+import { CustomVariableForm } from './CustomVariableForm';
+
+describe('CustomVariableForm', () => {
+  const onQueryChange = jest.fn();
+  const onMultiChange = jest.fn();
+  const onIncludeAllChange = jest.fn();
+  const onAllValueChange = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should render the form fields correctly', () => {
+    const { getByTestId } = render(
+      <CustomVariableForm
+        query="query"
+        multi={true}
+        allValue="custom value"
+        includeAll={true}
+        onQueryChange={onQueryChange}
+        onMultiChange={onMultiChange}
+        onIncludeAllChange={onIncludeAllChange}
+        onAllValueChange={onAllValueChange}
+      />
+    );
+
+    const queryInput = getByTestId(selectors.pages.Dashboard.Settings.Variables.Edit.CustomVariable.customValueInput);
+    const multiCheckbox = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsMultiSwitch
+    );
+    const includeAllCheckbox = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsIncludeAllSwitch
+    );
+    const allValueInput = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsCustomAllInput
+    );
+
+    expect(queryInput).toBeInTheDocument();
+    expect(queryInput).toHaveValue('query');
+    expect(multiCheckbox).toBeInTheDocument();
+    expect(multiCheckbox).toBeChecked();
+    expect(includeAllCheckbox).toBeInTheDocument();
+    expect(includeAllCheckbox).toBeChecked();
+    expect(allValueInput).toBeInTheDocument();
+    expect(allValueInput).toHaveValue('custom value');
+  });
+
+  it('should call the correct event handlers on input change', () => {
+    const { getByTestId } = render(
+      <CustomVariableForm
+        query=""
+        multi={true}
+        allValue=""
+        includeAll={true}
+        onQueryChange={onQueryChange}
+        onMultiChange={onMultiChange}
+        onIncludeAllChange={onIncludeAllChange}
+        onAllValueChange={onAllValueChange}
+      />
+    );
+
+    const queryInput = getByTestId(selectors.pages.Dashboard.Settings.Variables.Edit.CustomVariable.customValueInput);
+    const multiCheckbox = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsMultiSwitch
+    );
+    const includeAllCheckbox = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsIncludeAllSwitch
+    );
+    const allValueInput = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsCustomAllInput
+    );
+
+    fireEvent.click(multiCheckbox);
+    fireEvent.click(includeAllCheckbox);
+    fireEvent.change(queryInput, { currentTarget: { value: 'test query' } });
+    fireEvent.change(allValueInput, { currentTarget: { value: 'test value' } });
+
+    expect(onMultiChange).toHaveBeenCalledTimes(1);
+    expect(onIncludeAllChange).toHaveBeenCalledTimes(1);
+    expect(onQueryChange).not.toHaveBeenCalledTimes(1);
+    expect(onAllValueChange).not.toHaveBeenCalledTimes(1);
+  });
+
+  it('should call the correct event handlers on input blur', () => {
+    const { getByTestId } = render(
+      <CustomVariableForm
+        query="query value"
+        multi={true}
+        allValue="custom all value"
+        includeAll={true}
+        onQueryChange={onQueryChange}
+        onMultiChange={onMultiChange}
+        onIncludeAllChange={onIncludeAllChange}
+        onAllValueChange={onAllValueChange}
+      />
+    );
+
+    const queryInput = getByTestId(selectors.pages.Dashboard.Settings.Variables.Edit.CustomVariable.customValueInput);
+    const allValueInput = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsCustomAllInput
+    );
+
+    fireEvent.blur(queryInput);
+    fireEvent.blur(allValueInput);
+
+    expect(onQueryChange).toHaveBeenCalled();
+    expect(onAllValueChange).toHaveBeenCalled();
+    expect(onMultiChange).not.toHaveBeenCalled();
+    expect(onIncludeAllChange).not.toHaveBeenCalled();
+  });
+});
diff --git a/public/app/features/dashboard-scene/settings/variables/components/CustomVariableForm.tsx b/public/app/features/dashboard-scene/settings/variables/components/CustomVariableForm.tsx
new file mode 100644
index 0000000000000..1850b1c5774f8
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/components/CustomVariableForm.tsx
@@ -0,0 +1,57 @@
+import React, { FormEvent } from 'react';
+
+import { selectors } from '@grafana/e2e-selectors';
+
+import { VariableLegend } from '../components/VariableLegend';
+import { VariableTextAreaField } from '../components/VariableTextAreaField';
+
+import { SelectionOptionsForm } from './SelectionOptionsForm';
+
+interface CustomVariableFormProps {
+  query: string;
+  multi: boolean;
+  allValue?: string | null;
+  includeAll: boolean;
+  onQueryChange: (event: FormEvent<HTMLTextAreaElement>) => void;
+  onMultiChange: (event: FormEvent<HTMLInputElement>) => void;
+  onIncludeAllChange: (event: FormEvent<HTMLInputElement>) => void;
+  onAllValueChange: (event: FormEvent<HTMLInputElement>) => void;
+  onQueryBlur?: (event: FormEvent<HTMLTextAreaElement>) => void;
+  onAllValueBlur?: (event: FormEvent<HTMLInputElement>) => void;
+}
+
+export function CustomVariableForm({
+  query,
+  multi,
+  allValue,
+  includeAll,
+  onQueryChange,
+  onMultiChange,
+  onIncludeAllChange,
+  onAllValueChange,
+}: CustomVariableFormProps) {
+  return (
+    <>
+      <VariableLegend>Custom options</VariableLegend>
+
+      <VariableTextAreaField
+        name="Values separated by comma"
+        defaultValue={query}
+        placeholder="1, 10, mykey : myvalue, myvalue, escaped\,value"
+        onBlur={onQueryChange}
+        required
+        width={52}
+        testId={selectors.pages.Dashboard.Settings.Variables.Edit.CustomVariable.customValueInput}
+      />
+      <VariableLegend>Selection options</VariableLegend>
+      <SelectionOptionsForm
+        multi={multi}
+        includeAll={includeAll}
+        allValue={allValue}
+        onMultiChange={onMultiChange}
+        onIncludeAllChange={onIncludeAllChange}
+        onAllValueChange={onAllValueChange}
+      />
+    </>
+  );
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/components/DataSourceVariableForm.tsx b/public/app/features/dashboard-scene/settings/variables/components/DataSourceVariableForm.tsx
new file mode 100644
index 0000000000000..ac77b8c747cb0
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/components/DataSourceVariableForm.tsx
@@ -0,0 +1,79 @@
+import React, { FormEvent } from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+
+import { SelectionOptionsForm } from './SelectionOptionsForm';
+import { VariableLegend } from './VariableLegend';
+import { VariableSelectField } from './VariableSelectField';
+import { VariableTextField } from './VariableTextField';
+
+interface DataSourceVariableFormProps {
+  query: string;
+  regex: string;
+  multi: boolean;
+  allValue?: string | null;
+  includeAll: boolean;
+  onChange: (option: SelectableValue) => void;
+  optionTypes: Array<{ value: string; label: string }>;
+  onRegExBlur: (event: FormEvent<HTMLInputElement>) => void;
+  onMultiChange: (event: FormEvent<HTMLInputElement>) => void;
+  onIncludeAllChange: (event: FormEvent<HTMLInputElement>) => void;
+  onAllValueChange: (event: FormEvent<HTMLInputElement>) => void;
+  onQueryBlur?: (event: FormEvent<HTMLTextAreaElement>) => void;
+  onAllValueBlur?: (event: FormEvent<HTMLInputElement>) => void;
+}
+
+export function DataSourceVariableForm({
+  query,
+  regex,
+  optionTypes,
+  onChange,
+  onRegExBlur,
+  multi,
+  includeAll,
+  allValue,
+  onMultiChange,
+  onIncludeAllChange,
+  onAllValueChange,
+}: DataSourceVariableFormProps) {
+  const typeValue = optionTypes.find((o) => o.value === query) ?? optionTypes[0];
+
+  return (
+    <>
+      <VariableLegend>Data source options</VariableLegend>
+      <VariableSelectField
+        name="Type"
+        value={typeValue}
+        options={optionTypes}
+        onChange={onChange}
+        testId={selectors.pages.Dashboard.Settings.Variables.Edit.DatasourceVariable.datasourceSelect}
+      />
+
+      <VariableTextField
+        defaultValue={regex}
+        name="Instance name filter"
+        placeholder="/.*-(.*)-.*/"
+        onBlur={onRegExBlur}
+        description={
+          <div>
+            Regex filter for which data source instances to choose from in the variable value list. Leave empty for all.
+            <br />
+            <br />
+            Example: <code>/^prod/</code>
+          </div>
+        }
+      />
+
+      <VariableLegend>Selection options</VariableLegend>
+      <SelectionOptionsForm
+        multi={multi}
+        includeAll={includeAll}
+        allValue={allValue}
+        onMultiChange={onMultiChange}
+        onIncludeAllChange={onIncludeAllChange}
+        onAllValueChange={onAllValueChange}
+      />
+    </>
+  );
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/components/GroupByVariableForm.test.tsx b/public/app/features/dashboard-scene/settings/variables/components/GroupByVariableForm.test.tsx
new file mode 100644
index 0000000000000..e59b0e4f3e06f
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/components/GroupByVariableForm.test.tsx
@@ -0,0 +1,114 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { byTestId } from 'testing-library-selector';
+
+import { VariableSupportType } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { mockDataSource } from 'app/features/alerting/unified/mocks';
+import { LegacyVariableQueryEditor } from 'app/features/variables/editor/LegacyVariableQueryEditor';
+
+import { GroupByVariableForm, GroupByVariableFormProps } from './GroupByVariableForm';
+
+const defaultDatasource = mockDataSource({
+  name: 'Default Test Data Source',
+  type: 'test',
+});
+
+const promDatasource = mockDataSource({
+  name: 'Prometheus',
+  type: 'prometheus',
+});
+
+jest.mock('@grafana/runtime/src/services/dataSourceSrv', () => ({
+  ...jest.requireActual('@grafana/runtime/src/services/dataSourceSrv'),
+  getDataSourceSrv: () => ({
+    get: async () => ({
+      ...defaultDatasource,
+      variables: {
+        getType: () => VariableSupportType.Custom,
+        query: jest.fn(),
+        editor: jest.fn().mockImplementation(LegacyVariableQueryEditor),
+      },
+    }),
+    getList: () => [defaultDatasource, promDatasource],
+    getInstanceSettings: () => ({ ...defaultDatasource }),
+  }),
+}));
+
+describe('GroupByVariableForm', () => {
+  const onDataSourceChangeMock = jest.fn();
+  const onDefaultOptionsChangeMock = jest.fn();
+
+  const defaultProps: GroupByVariableFormProps = {
+    onDataSourceChange: onDataSourceChangeMock,
+    onDefaultOptionsChange: onDefaultOptionsChangeMock,
+  };
+
+  function setup(props?: Partial<GroupByVariableFormProps>) {
+    return {
+      renderer: render(<GroupByVariableForm {...defaultProps} {...props} />),
+      user: userEvent.setup(),
+    };
+  }
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should call onDataSourceChange when changing the datasource', async () => {
+    const {
+      renderer: { getByTestId },
+    } = setup();
+    const dataSourcePicker = getByTestId(selectors.components.DataSourcePicker.inputV2);
+    await userEvent.click(dataSourcePicker);
+    await userEvent.click(screen.getByText(/prometheus/i));
+
+    expect(onDataSourceChangeMock).toHaveBeenCalledTimes(1);
+    expect(onDataSourceChangeMock).toHaveBeenCalledWith(promDatasource, undefined);
+  });
+
+  it('should not render code editor when no default options provided', async () => {
+    const {
+      renderer: { queryByTestId },
+    } = setup();
+    const codeEditor = queryByTestId(selectors.components.CodeEditor.container);
+
+    expect(codeEditor).not.toBeInTheDocument();
+  });
+
+  it('should render code editor when default options provided', async () => {
+    const {
+      renderer: { getByTestId },
+    } = setup({ defaultOptions: [{ text: 'test', value: 'test' }] });
+    const codeEditor = getByTestId(selectors.components.CodeEditor.container);
+
+    await byTestId(selectors.components.CodeEditor.container).find();
+
+    expect(codeEditor).toBeInTheDocument();
+  });
+
+  it('should call onDefaultOptionsChange when providing static options', async () => {
+    const {
+      renderer: { getByTestId },
+    } = setup();
+
+    const toggle = getByTestId(selectors.pages.Dashboard.Settings.Variables.Edit.GroupByVariable.modeToggle);
+
+    await userEvent.click(toggle);
+    expect(onDefaultOptionsChangeMock).toHaveBeenCalledTimes(1);
+    expect(onDefaultOptionsChangeMock).toHaveBeenCalledWith([]);
+  });
+
+  it('should call onDefaultOptionsChange when toggling off static options', async () => {
+    const {
+      renderer: { getByTestId },
+    } = setup({ defaultOptions: [{ text: 'test', value: 'test' }] });
+
+    const toggle = getByTestId(selectors.pages.Dashboard.Settings.Variables.Edit.GroupByVariable.modeToggle);
+
+    await userEvent.click(toggle);
+    expect(onDefaultOptionsChangeMock).toHaveBeenCalledTimes(1);
+    expect(onDefaultOptionsChangeMock).toHaveBeenCalledWith(undefined);
+  });
+});
diff --git a/public/app/features/dashboard-scene/settings/variables/components/GroupByVariableForm.tsx b/public/app/features/dashboard-scene/settings/variables/components/GroupByVariableForm.tsx
new file mode 100644
index 0000000000000..f982ab9236105
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/components/GroupByVariableForm.tsx
@@ -0,0 +1,81 @@
+import React, { useCallback } from 'react';
+
+import { DataSourceInstanceSettings, MetricFindValue, readCSV } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { DataSourceRef } from '@grafana/schema';
+import { Alert, CodeEditor, Field, Switch } from '@grafana/ui';
+import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker';
+
+import { VariableLegend } from './VariableLegend';
+
+export interface GroupByVariableFormProps {
+  datasource?: DataSourceRef;
+  onDataSourceChange: (dsSettings: DataSourceInstanceSettings) => void;
+  onDefaultOptionsChange: (options?: MetricFindValue[]) => void;
+  infoText?: string;
+  defaultOptions?: MetricFindValue[];
+}
+
+export function GroupByVariableForm({
+  datasource,
+  defaultOptions,
+  infoText,
+  onDataSourceChange,
+  onDefaultOptionsChange,
+}: GroupByVariableFormProps) {
+  const updateDefaultOptions = useCallback(
+    (csvContent: string) => {
+      const df = readCSV('key,value\n' + csvContent)[0];
+      const options = [];
+      for (let i = 0; i < df.length; i++) {
+        options.push({ text: df.fields[0].values[i], value: df.fields[1].values[i] });
+      }
+
+      onDefaultOptionsChange(options);
+    },
+    [onDefaultOptionsChange]
+  );
+
+  return (
+    <>
+      <VariableLegend>Group by options</VariableLegend>
+      <Field label="Data source" htmlFor="data-source-picker">
+        <DataSourcePicker current={datasource} onChange={onDataSourceChange} width={30} variables={true} noDefault />
+      </Field>
+
+      {infoText ? (
+        <Alert
+          title={infoText}
+          severity="info"
+          data-testid={selectors.pages.Dashboard.Settings.Variables.Edit.GroupByVariable.infoText}
+        />
+      ) : null}
+
+      <Field label="Use static Group By dimensions" description="Provide dimensions as CSV: dimensionName, dimensionId">
+        <Switch
+          data-testid={selectors.pages.Dashboard.Settings.Variables.Edit.GroupByVariable.modeToggle}
+          value={defaultOptions !== undefined}
+          onChange={(e) => {
+            if (defaultOptions === undefined) {
+              onDefaultOptionsChange([]);
+            } else {
+              onDefaultOptionsChange(undefined);
+            }
+          }}
+        />
+      </Field>
+
+      {defaultOptions !== undefined && (
+        <CodeEditor
+          height={300}
+          language="csv"
+          value={defaultOptions.map((o) => `${o.text},${o.value}`).join('\n')}
+          onBlur={updateDefaultOptions}
+          onSave={updateDefaultOptions}
+          showMiniMap={false}
+          showLineNumbers={true}
+        />
+      )}
+    </>
+  );
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/components/IntervalVariableForm.tsx b/public/app/features/dashboard-scene/settings/variables/components/IntervalVariableForm.tsx
new file mode 100644
index 0000000000000..3f525e2d8fe41
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/components/IntervalVariableForm.tsx
@@ -0,0 +1,96 @@
+import { css } from '@emotion/css';
+import React, { ChangeEvent, FormEvent } from 'react';
+
+import { GrafanaTheme2, SelectableValue } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { useStyles2 } from '@grafana/ui';
+
+import { VariableCheckboxField } from './VariableCheckboxField';
+import { VariableLegend } from './VariableLegend';
+import { VariableSelectField } from './VariableSelectField';
+import { VariableTextField } from './VariableTextField';
+
+interface IntervalVariableFormProps {
+  intervals: string;
+  onIntervalsChange: (event: FormEvent<HTMLInputElement>) => void;
+  onAutoEnabledChange: (event: ChangeEvent<HTMLInputElement>) => void;
+  onAutoMinIntervalChanged: (event: FormEvent<HTMLInputElement>) => void;
+  onAutoCountChanged: (option: SelectableValue) => void;
+  autoEnabled: boolean;
+  autoMinInterval: string;
+  autoStepCount: number;
+}
+
+export function IntervalVariableForm({
+  intervals,
+  onIntervalsChange,
+  onAutoEnabledChange,
+  onAutoMinIntervalChanged,
+  onAutoCountChanged,
+  autoEnabled,
+  autoMinInterval,
+  autoStepCount,
+}: IntervalVariableFormProps) {
+  const STEP_OPTIONS = [1, 2, 3, 4, 5, 10, 20, 30, 40, 50, 100, 200, 300, 400, 500].map((count) => ({
+    label: `${count}`,
+    value: count,
+  }));
+  const styles = useStyles2(getStyles);
+
+  const stepCount = STEP_OPTIONS.find((option) => option.value === autoStepCount) ?? STEP_OPTIONS[0];
+
+  return (
+    <>
+      <VariableLegend>Interval options</VariableLegend>
+      <VariableTextField
+        defaultValue={intervals}
+        name="Values"
+        placeholder="1m,10m,1h,6h,1d,7d"
+        onBlur={onIntervalsChange}
+        testId={selectors.pages.Dashboard.Settings.Variables.Edit.IntervalVariable.intervalsValueInput}
+        width={32}
+        required
+      />
+
+      <VariableCheckboxField
+        value={autoEnabled}
+        name="Auto option"
+        description="Dynamically calculates interval by dividing time range by the count specified"
+        onChange={onAutoEnabledChange}
+        testId={selectors.pages.Dashboard.Settings.Variables.Edit.IntervalVariable.autoEnabledCheckbox}
+      />
+      {autoEnabled && (
+        <div className={styles.autoFields}>
+          <VariableSelectField
+            name="Step count"
+            description="How many times the current time range should be divided to calculate the value"
+            value={stepCount}
+            options={STEP_OPTIONS}
+            onChange={onAutoCountChanged}
+            width={9}
+            testId={selectors.pages.Dashboard.Settings.Variables.Edit.IntervalVariable.stepCountIntervalSelect}
+          />
+          <VariableTextField
+            value={autoMinInterval}
+            name="Min interval"
+            description="The calculated value will not go below this threshold"
+            placeholder="10s"
+            onChange={onAutoMinIntervalChanged}
+            width={11}
+            testId={selectors.pages.Dashboard.Settings.Variables.Edit.IntervalVariable.minIntervalInput}
+          />
+        </div>
+      )}
+    </>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    autoFields: css({
+      marginTop: theme.spacing(2),
+      display: 'flex',
+      flexDirection: 'column',
+    }),
+  };
+};
diff --git a/public/app/features/dashboard-scene/settings/variables/components/QueryEditor.tsx b/public/app/features/dashboard-scene/settings/variables/components/QueryEditor.tsx
new file mode 100644
index 0000000000000..18436c85c2b6f
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/components/QueryEditor.tsx
@@ -0,0 +1,78 @@
+import React from 'react';
+
+import { DataSourceApi, LoadingState, TimeRange } from '@grafana/data';
+import { getTemplateSrv } from '@grafana/runtime';
+import { QueryVariable } from '@grafana/scenes';
+import { Text, Box } from '@grafana/ui';
+import { isLegacyQueryEditor, isQueryEditor } from 'app/features/variables/guard';
+import { VariableQueryEditorType } from 'app/features/variables/types';
+
+type VariableQueryType = QueryVariable['state']['query'];
+
+interface QueryEditorProps {
+  query: VariableQueryType;
+  datasource: DataSourceApi;
+  VariableQueryEditor: VariableQueryEditorType;
+  timeRange: TimeRange;
+  onLegacyQueryChange: (query: VariableQueryType, definition: string) => void;
+  onQueryChange: (query: VariableQueryType) => void;
+}
+
+export function QueryEditor({
+  query,
+  datasource,
+  VariableQueryEditor,
+  onLegacyQueryChange,
+  onQueryChange,
+  timeRange,
+}: QueryEditorProps) {
+  let queryWithDefaults;
+  if (typeof query === 'string') {
+    queryWithDefaults = query || (datasource.variables?.getDefaultQuery?.() ?? '');
+  } else {
+    queryWithDefaults = {
+      ...datasource.variables?.getDefaultQuery?.(),
+      ...query,
+    };
+  }
+
+  if (VariableQueryEditor && isLegacyQueryEditor(VariableQueryEditor, datasource)) {
+    return (
+      <Box marginBottom={2}>
+        <Text element={'h4'}>Query</Text>
+        <Box marginTop={1}>
+          <VariableQueryEditor
+            key={datasource.uid}
+            datasource={datasource}
+            query={queryWithDefaults}
+            templateSrv={getTemplateSrv()}
+            onChange={onLegacyQueryChange}
+          />
+        </Box>
+      </Box>
+    );
+  }
+
+  if (VariableQueryEditor && isQueryEditor(VariableQueryEditor, datasource)) {
+    return (
+      <Box marginBottom={2}>
+        <Text element={'h4'}>Query</Text>
+        <Box marginTop={1}>
+          <VariableQueryEditor
+            key={datasource.uid}
+            datasource={datasource}
+            query={queryWithDefaults}
+            onChange={onQueryChange}
+            onRunQuery={() => {}}
+            data={{ series: [], state: LoadingState.Done, timeRange }}
+            range={timeRange}
+            onBlur={() => {}}
+            history={[]}
+          />
+        </Box>
+      </Box>
+    );
+  }
+
+  return null;
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/components/QueryVariableForm.test.tsx b/public/app/features/dashboard-scene/settings/variables/components/QueryVariableForm.test.tsx
new file mode 100644
index 0000000000000..0e154ed447d9b
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/components/QueryVariableForm.test.tsx
@@ -0,0 +1,273 @@
+import { act, render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React, { FormEvent } from 'react';
+import { of } from 'rxjs';
+
+import {
+  LoadingState,
+  PanelData,
+  getDefaultTimeRange,
+  toDataFrame,
+  FieldType,
+  VariableSupportType,
+} from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { setRunRequest } from '@grafana/runtime';
+import { VariableRefresh, VariableSort } from '@grafana/schema';
+import { mockDataSource } from 'app/features/alerting/unified/mocks';
+import { LegacyVariableQueryEditor } from 'app/features/variables/editor/LegacyVariableQueryEditor';
+import { getVariableQueryEditor } from 'app/features/variables/editor/getVariableQueryEditor';
+
+import { QueryVariableEditorForm } from './QueryVariableForm';
+
+const defaultDatasource = mockDataSource({
+  name: 'Default Test Data Source',
+  type: 'test',
+});
+
+const promDatasource = mockDataSource({
+  name: 'Prometheus',
+  type: 'prometheus',
+});
+
+jest.mock('@grafana/runtime/src/services/dataSourceSrv', () => ({
+  ...jest.requireActual('@grafana/runtime/src/services/dataSourceSrv'),
+  getDataSourceSrv: () => ({
+    get: async () => ({
+      ...defaultDatasource,
+      variables: {
+        getType: () => VariableSupportType.Custom,
+        query: jest.fn(),
+        editor: jest.fn().mockImplementation(LegacyVariableQueryEditor),
+      },
+    }),
+    getList: () => [defaultDatasource, promDatasource],
+    getInstanceSettings: (uid: string) => (uid === promDatasource.uid ? promDatasource : defaultDatasource),
+  }),
+}));
+
+const runRequestMock = jest.fn().mockReturnValue(
+  of<PanelData>({
+    state: LoadingState.Done,
+    series: [
+      toDataFrame({
+        fields: [{ name: 'text', type: FieldType.string, values: ['val1', 'val2', 'val11'] }],
+      }),
+    ],
+    timeRange: getDefaultTimeRange(),
+  })
+);
+
+setRunRequest(runRequestMock);
+
+jest.mock('app/features/variables/editor/getVariableQueryEditor', () => ({
+  ...jest.requireActual('app/features/variables/editor/getVariableQueryEditor'),
+  getVariableQueryEditor: jest.fn(),
+}));
+
+describe('QueryVariableEditorForm', () => {
+  const mockOnDataSourceChange = jest.fn();
+  const mockOnQueryChange = jest.fn();
+  const mockOnLegacyQueryChange = jest.fn();
+  const mockOnRegExChange = jest.fn();
+  const mockOnSortChange = jest.fn();
+  const mockOnRefreshChange = jest.fn();
+  const mockOnMultiChange = jest.fn();
+  const mockOnIncludeAllChange = jest.fn();
+  const mockOnAllValueChange = jest.fn();
+
+  const defaultProps: React.ComponentProps<typeof QueryVariableEditorForm> = {
+    datasource: { uid: defaultDatasource.uid, type: defaultDatasource.type },
+    onDataSourceChange: mockOnDataSourceChange,
+    query: 'my-query',
+    onQueryChange: mockOnQueryChange,
+    onLegacyQueryChange: mockOnLegacyQueryChange,
+    timeRange: getDefaultTimeRange(),
+    regex: '.*',
+    onRegExChange: mockOnRegExChange,
+    sort: VariableSort.alphabeticalAsc,
+    onSortChange: mockOnSortChange,
+    refresh: VariableRefresh.onDashboardLoad,
+    onRefreshChange: mockOnRefreshChange,
+    isMulti: true,
+    onMultiChange: mockOnMultiChange,
+    includeAll: true,
+    onIncludeAllChange: mockOnIncludeAllChange,
+    allValue: 'custom all value',
+    onAllValueChange: mockOnAllValueChange,
+  };
+
+  async function setup(props?: React.ComponentProps<typeof QueryVariableEditorForm>) {
+    jest.mocked(getVariableQueryEditor).mockResolvedValue(LegacyVariableQueryEditor);
+    return {
+      renderer: await act(() => render(<QueryVariableEditorForm {...defaultProps} {...props} />)),
+      user: userEvent.setup(),
+    };
+  }
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should render the component with initializing the components correctly', async () => {
+    const {
+      renderer: { getByTestId, getByRole },
+    } = await setup();
+    const dataSourcePicker = getByTestId(selectors.components.DataSourcePicker.inputV2);
+    //const queryEditor = getByTestId('query-editor');
+    const regexInput = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsRegExInputV2
+    );
+    const sortSelect = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsSortSelectV2
+    );
+    const refreshSelect = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsRefreshSelectV2
+    );
+
+    const multiSwitch = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsMultiSwitch
+    );
+    const includeAllSwitch = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsIncludeAllSwitch
+    );
+    const allValueInput = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsCustomAllInput
+    );
+
+    expect(dataSourcePicker).toBeInTheDocument();
+    expect(dataSourcePicker.getAttribute('placeholder')).toBe('Default Test Data Source');
+    expect(regexInput).toBeInTheDocument();
+    expect(regexInput).toHaveValue('.*');
+    expect(sortSelect).toBeInTheDocument();
+    expect(sortSelect).toHaveTextContent('Alphabetical (asc)');
+    expect(refreshSelect).toBeInTheDocument();
+    expect(getByRole('radio', { name: 'On dashboard load' })).toBeChecked();
+    expect(multiSwitch).toBeInTheDocument();
+    expect(multiSwitch).toBeChecked();
+    expect(includeAllSwitch).toBeInTheDocument();
+    expect(includeAllSwitch).toBeChecked();
+    expect(allValueInput).toBeInTheDocument();
+    expect(allValueInput).toHaveValue('custom all value');
+  });
+
+  it('should call onDataSourceChange when changing the datasource', async () => {
+    const {
+      renderer: { getByTestId },
+    } = await setup();
+    const dataSourcePicker = getByTestId(selectors.components.DataSourcePicker.inputV2);
+    await userEvent.click(dataSourcePicker);
+    await userEvent.click(screen.getByText(/prometheus/i));
+
+    expect(mockOnDataSourceChange).toHaveBeenCalledTimes(1);
+    expect(mockOnDataSourceChange).toHaveBeenCalledWith(promDatasource, undefined);
+  });
+
+  it('should call onQueryChange when changing the query', async () => {
+    const {
+      renderer: { getByTestId },
+    } = await setup();
+    const queryEditor = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsQueryInput
+    );
+
+    await waitFor(async () => {
+      await userEvent.type(queryEditor, '-new');
+      await userEvent.tab();
+    });
+
+    expect(mockOnLegacyQueryChange).toHaveBeenCalledTimes(1);
+    expect(mockOnLegacyQueryChange).toHaveBeenCalledWith('my-query-new', expect.anything());
+  });
+
+  it('should call onRegExChange when changing the regex', async () => {
+    const {
+      renderer: { getByTestId },
+    } = await setup();
+    const regexInput = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsRegExInputV2
+    );
+    await userEvent.type(regexInput, '{backspace}?');
+    await userEvent.tab();
+    expect(mockOnRegExChange).toHaveBeenCalledTimes(1);
+    expect(
+      ((mockOnRegExChange.mock.calls[0][0] as FormEvent<HTMLTextAreaElement>).target as HTMLTextAreaElement).value
+    ).toBe('.?');
+  });
+
+  it('should call onSortChange when changing the sort', async () => {
+    const {
+      renderer: { getByTestId },
+    } = await setup();
+    const sortSelect = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsSortSelectV2
+    );
+    await userEvent.click(sortSelect); // open the select
+    const anotherOption = await screen.getByText('Alphabetical (desc)');
+    await userEvent.click(anotherOption);
+
+    expect(mockOnSortChange).toHaveBeenCalledTimes(1);
+    expect(mockOnSortChange).toHaveBeenCalledWith(
+      expect.objectContaining({ value: VariableSort.alphabeticalDesc }),
+      expect.anything()
+    );
+  });
+
+  it('should call onRefreshChange when changing the refresh', async () => {
+    const {
+      renderer: { getByTestId },
+    } = await setup();
+    const refreshSelect = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsRefreshSelectV2
+    );
+    await userEvent.click(refreshSelect); // open the select
+    const anotherOption = await screen.getByText('On time range change');
+    await userEvent.click(anotherOption);
+
+    expect(mockOnRefreshChange).toHaveBeenCalledTimes(1);
+    expect(mockOnRefreshChange).toHaveBeenCalledWith(VariableRefresh.onTimeRangeChanged);
+  });
+
+  it('should call onMultiChange when changing the multi switch', async () => {
+    const {
+      renderer: { getByTestId },
+    } = await setup();
+    const multiSwitch = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsMultiSwitch
+    );
+    await userEvent.click(multiSwitch);
+    expect(mockOnMultiChange).toHaveBeenCalledTimes(1);
+    expect(
+      (mockOnMultiChange.mock.calls[0][0] as FormEvent<HTMLInputElement>).target as HTMLInputElement
+    ).toBeChecked();
+  });
+
+  it('should call onIncludeAllChange when changing the include all switch', async () => {
+    const {
+      renderer: { getByTestId },
+    } = await setup();
+    const includeAllSwitch = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsIncludeAllSwitch
+    );
+    await userEvent.click(includeAllSwitch);
+    expect(mockOnIncludeAllChange).toHaveBeenCalledTimes(1);
+    expect(
+      (mockOnIncludeAllChange.mock.calls[0][0] as FormEvent<HTMLInputElement>).target as HTMLInputElement
+    ).toBeChecked();
+  });
+
+  it('should call onAllValueChange when changing the all value', async () => {
+    const {
+      renderer: { getByTestId },
+    } = await setup();
+    const allValueInput = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsCustomAllInput
+    );
+    await userEvent.type(allValueInput, ' and another value');
+    await userEvent.tab();
+    expect(mockOnAllValueChange).toHaveBeenCalledTimes(1);
+    expect(
+      ((mockOnAllValueChange.mock.calls[0][0] as FormEvent<HTMLInputElement>).target as HTMLInputElement).value
+    ).toBe('custom all value and another value');
+  });
+});
diff --git a/public/app/features/dashboard-scene/settings/variables/components/QueryVariableForm.tsx b/public/app/features/dashboard-scene/settings/variables/components/QueryVariableForm.tsx
new file mode 100644
index 0000000000000..a1a9cfbc3f485
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/components/QueryVariableForm.tsx
@@ -0,0 +1,136 @@
+import React, { FormEvent } from 'react';
+import { useAsync } from 'react-use';
+
+import { DataSourceInstanceSettings, SelectableValue, TimeRange } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { getDataSourceSrv } from '@grafana/runtime';
+import { QueryVariable } from '@grafana/scenes';
+import { DataSourceRef, VariableRefresh, VariableSort } from '@grafana/schema';
+import { Field } from '@grafana/ui';
+import { QueryEditor } from 'app/features/dashboard-scene/settings/variables/components/QueryEditor';
+import { SelectionOptionsForm } from 'app/features/dashboard-scene/settings/variables/components/SelectionOptionsForm';
+import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker';
+import { getVariableQueryEditor } from 'app/features/variables/editor/getVariableQueryEditor';
+import { QueryVariableRefreshSelect } from 'app/features/variables/query/QueryVariableRefreshSelect';
+import { QueryVariableSortSelect } from 'app/features/variables/query/QueryVariableSortSelect';
+
+import { VariableLegend } from './VariableLegend';
+import { VariableTextAreaField } from './VariableTextAreaField';
+
+type VariableQueryType = QueryVariable['state']['query'];
+
+interface QueryVariableEditorFormProps {
+  datasource?: DataSourceRef;
+  onDataSourceChange: (dsSettings: DataSourceInstanceSettings) => void;
+  query: VariableQueryType;
+  onQueryChange: (query: VariableQueryType) => void;
+  onLegacyQueryChange: (query: VariableQueryType, definition: string) => void;
+  timeRange: TimeRange;
+  regex: string | null;
+  onRegExChange: (event: FormEvent<HTMLTextAreaElement>) => void;
+  sort: VariableSort;
+  onSortChange: (option: SelectableValue<VariableSort>) => void;
+  refresh: VariableRefresh;
+  onRefreshChange: (option: VariableRefresh) => void;
+  isMulti: boolean;
+  onMultiChange: (event: FormEvent<HTMLInputElement>) => void;
+  includeAll: boolean;
+  onIncludeAllChange: (event: FormEvent<HTMLInputElement>) => void;
+  allValue: string;
+  onAllValueChange: (event: FormEvent<HTMLInputElement>) => void;
+}
+
+export function QueryVariableEditorForm({
+  datasource: datasourceRef,
+  onDataSourceChange,
+  query,
+  onQueryChange,
+  onLegacyQueryChange,
+  timeRange,
+  regex,
+  onRegExChange,
+  sort,
+  onSortChange,
+  refresh,
+  onRefreshChange,
+  isMulti,
+  onMultiChange,
+  includeAll,
+  onIncludeAllChange,
+  allValue,
+  onAllValueChange,
+}: QueryVariableEditorFormProps) {
+  const { value: dsConfig } = useAsync(async () => {
+    const datasource = await getDataSourceSrv().get(datasourceRef ?? '');
+    const VariableQueryEditor = await getVariableQueryEditor(datasource);
+
+    return { datasource, VariableQueryEditor };
+  }, [datasourceRef]);
+  const { datasource, VariableQueryEditor } = dsConfig ?? {};
+
+  return (
+    <>
+      <VariableLegend>Query options</VariableLegend>
+      <Field label="Data source" htmlFor="data-source-picker">
+        <DataSourcePicker current={datasourceRef} onChange={onDataSourceChange} variables={true} width={30} />
+      </Field>
+
+      {datasource && VariableQueryEditor && (
+        <QueryEditor
+          onQueryChange={onQueryChange}
+          onLegacyQueryChange={onLegacyQueryChange}
+          datasource={datasource}
+          query={query}
+          VariableQueryEditor={VariableQueryEditor}
+          timeRange={timeRange}
+        />
+      )}
+
+      <VariableTextAreaField
+        defaultValue={regex ?? ''}
+        name="Regex"
+        description={
+          <div>
+            Optional, if you want to extract part of a series name or metric node segment.
+            <br />
+            Named capture groups can be used to separate the display text and value (
+            <a
+              className="external-link"
+              href="https://grafana.com/docs/grafana/latest/variables/filter-variables-with-regex#filter-and-modify-using-named-text-and-value-capture-groups"
+              target="__blank"
+            >
+              see examples
+            </a>
+            ).
+          </div>
+        }
+        placeholder="/.*-(?<text>.*)-(?<value>.*)-.*/"
+        onBlur={onRegExChange}
+        testId={selectors.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsRegExInputV2}
+        width={52}
+      />
+
+      <QueryVariableSortSelect
+        testId={selectors.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsSortSelectV2}
+        onChange={onSortChange}
+        sort={sort}
+      />
+
+      <QueryVariableRefreshSelect
+        testId={selectors.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsRefreshSelectV2}
+        onChange={onRefreshChange}
+        refresh={refresh}
+      />
+
+      <VariableLegend>Selection options</VariableLegend>
+      <SelectionOptionsForm
+        multi={!!isMulti}
+        includeAll={!!includeAll}
+        allValue={allValue}
+        onMultiChange={onMultiChange}
+        onIncludeAllChange={onIncludeAllChange}
+        onAllValueChange={onAllValueChange}
+      />
+    </>
+  );
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/components/SelectionOptionsForm.tsx b/public/app/features/dashboard-scene/settings/variables/components/SelectionOptionsForm.tsx
new file mode 100644
index 0000000000000..10ed2a83c277f
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/components/SelectionOptionsForm.tsx
@@ -0,0 +1,52 @@
+import React, { ChangeEvent, FormEvent } from 'react';
+
+import { selectors } from '@grafana/e2e-selectors';
+import { VerticalGroup } from '@grafana/ui';
+import { VariableCheckboxField } from 'app/features/dashboard-scene/settings/variables/components/VariableCheckboxField';
+import { VariableTextField } from 'app/features/dashboard-scene/settings/variables/components/VariableTextField';
+
+interface SelectionOptionsFormProps {
+  multi: boolean;
+  includeAll: boolean;
+  allValue?: string | null;
+  onMultiChange: (event: ChangeEvent<HTMLInputElement>) => void;
+  onIncludeAllChange: (event: ChangeEvent<HTMLInputElement>) => void;
+  onAllValueChange: (event: FormEvent<HTMLInputElement>) => void;
+}
+
+export function SelectionOptionsForm({
+  multi,
+  includeAll,
+  allValue,
+  onMultiChange,
+  onIncludeAllChange,
+  onAllValueChange,
+}: SelectionOptionsFormProps) {
+  return (
+    <VerticalGroup spacing="md" height="inherit">
+      <VariableCheckboxField
+        value={multi}
+        name="Multi-value"
+        description="Enables multiple values to be selected at the same time"
+        onChange={onMultiChange}
+        testId={selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsMultiSwitch}
+      />
+      <VariableCheckboxField
+        value={includeAll}
+        name="Include All option"
+        description="Enables an option to include all variables"
+        onChange={onIncludeAllChange}
+        testId={selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsIncludeAllSwitch}
+      />
+      {includeAll && (
+        <VariableTextField
+          defaultValue={allValue ?? ''}
+          onBlur={onAllValueChange}
+          name="Custom all value"
+          placeholder="blank = auto"
+          testId={selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsCustomAllInput}
+        />
+      )}
+    </VerticalGroup>
+  );
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/components/TextBoxVariableForm.test.tsx b/public/app/features/dashboard-scene/settings/variables/components/TextBoxVariableForm.test.tsx
new file mode 100644
index 0000000000000..a1551b0028fae
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/components/TextBoxVariableForm.test.tsx
@@ -0,0 +1,34 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { TextBoxVariableForm } from './TextBoxVariableForm';
+
+describe('TextBoxVariableForm', () => {
+  it('renders correctly', () => {
+    const onChange = jest.fn();
+    const onBlur = jest.fn();
+    const value = 'test value';
+
+    render(<TextBoxVariableForm value={value} onChange={onChange} onBlur={onBlur} />);
+
+    expect(screen.getByText('Text options')).toBeInTheDocument();
+    expect(screen.getByRole('textbox', { name: 'Default value' })).toBeInTheDocument();
+  });
+
+  it('calls onChange when input value changes', async () => {
+    const onChange = jest.fn();
+    const onBlur = jest.fn();
+    const value = 'test value';
+
+    render(<TextBoxVariableForm value={value} onChange={onChange} onBlur={onBlur} />);
+
+    const input = screen.getByRole('textbox', { name: 'Default value' });
+    expect(input).toHaveValue(value);
+
+    // change input value
+    const newValue = 'new value';
+    await userEvent.type(input, newValue);
+    expect(onChange).toHaveBeenCalledTimes(newValue.length);
+  });
+});
diff --git a/public/app/features/dashboard-scene/settings/variables/components/TextBoxVariableForm.tsx b/public/app/features/dashboard-scene/settings/variables/components/TextBoxVariableForm.tsx
new file mode 100644
index 0000000000000..9715fac4a174b
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/components/TextBoxVariableForm.tsx
@@ -0,0 +1,30 @@
+import React, { FormEvent } from 'react';
+
+import { selectors } from '@grafana/e2e-selectors';
+import { VariableLegend } from 'app/features/dashboard-scene/settings/variables/components/VariableLegend';
+import { VariableTextField } from 'app/features/dashboard-scene/settings/variables/components/VariableTextField';
+
+interface TextBoxVariableFormProps {
+  value?: string;
+  defaultValue?: string;
+  onChange?: (event: FormEvent<HTMLInputElement>) => void;
+  onBlur?: (event: FormEvent<HTMLInputElement>) => void;
+}
+
+export function TextBoxVariableForm({ defaultValue, value, onChange, onBlur }: TextBoxVariableFormProps) {
+  return (
+    <>
+      <VariableLegend>Text options</VariableLegend>
+      <VariableTextField
+        value={value}
+        defaultValue={defaultValue}
+        name="Default value"
+        placeholder="default value, if any"
+        onChange={onChange}
+        onBlur={onBlur}
+        width={30}
+        testId={selectors.pages.Dashboard.Settings.Variables.Edit.TextBoxVariable.textBoxOptionsQueryInputV2}
+      />
+    </>
+  );
+}
diff --git a/public/app/features/variables/editor/VariableCheckboxField.tsx b/public/app/features/dashboard-scene/settings/variables/components/VariableCheckboxField.tsx
similarity index 82%
rename from public/app/features/variables/editor/VariableCheckboxField.tsx
rename to public/app/features/dashboard-scene/settings/variables/components/VariableCheckboxField.tsx
index 1fd6b78825230..730cee62336e6 100644
--- a/public/app/features/variables/editor/VariableCheckboxField.tsx
+++ b/public/app/features/dashboard-scene/settings/variables/components/VariableCheckboxField.tsx
@@ -3,12 +3,13 @@ import React, { ChangeEvent, PropsWithChildren, ReactElement } from 'react';
 
 import { Checkbox } from '@grafana/ui';
 
-interface VariableCheckboxFieldProps {
+interface VariableCheckboxFieldProps extends React.HTMLAttributes<HTMLInputElement> {
   value: boolean;
   name: string;
   onChange: (event: ChangeEvent<HTMLInputElement>) => void;
   description?: string;
   ariaLabel?: string;
+  testId?: string;
 }
 
 export function VariableCheckboxField({
@@ -17,6 +18,7 @@ export function VariableCheckboxField({
   description,
   onChange,
   ariaLabel,
+  testId,
 }: PropsWithChildren<VariableCheckboxFieldProps>): ReactElement {
   const uniqueId = useId();
 
@@ -28,6 +30,7 @@ export function VariableCheckboxField({
       value={value}
       onChange={onChange}
       aria-label={ariaLabel}
+      data-testid={testId}
     />
   );
 }
diff --git a/public/app/features/variables/editor/VariableHideSelect.tsx b/public/app/features/dashboard-scene/settings/variables/components/VariableHideSelect.tsx
similarity index 100%
rename from public/app/features/variables/editor/VariableHideSelect.tsx
rename to public/app/features/dashboard-scene/settings/variables/components/VariableHideSelect.tsx
diff --git a/public/app/features/variables/editor/VariableLegend.tsx b/public/app/features/dashboard-scene/settings/variables/components/VariableLegend.tsx
similarity index 100%
rename from public/app/features/variables/editor/VariableLegend.tsx
rename to public/app/features/dashboard-scene/settings/variables/components/VariableLegend.tsx
diff --git a/public/app/features/dashboard-scene/settings/variables/components/VariableSelectField.tsx b/public/app/features/dashboard-scene/settings/variables/components/VariableSelectField.tsx
new file mode 100644
index 0000000000000..9f0024a7ab118
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/components/VariableSelectField.tsx
@@ -0,0 +1,51 @@
+import { css } from '@emotion/css';
+import React, { PropsWithChildren, useId } from 'react';
+
+import { GrafanaTheme2, SelectableValue } from '@grafana/data';
+import { Field, Select, useStyles2 } from '@grafana/ui';
+
+interface VariableSelectFieldProps<T> {
+  name: string;
+  value: SelectableValue<T>;
+  options: Array<SelectableValue<T>>;
+  onChange: (option: SelectableValue<T>) => void;
+  testId?: string;
+  width?: number;
+  description?: React.ReactNode;
+}
+
+export function VariableSelectField({
+  name,
+  description,
+  value,
+  options,
+  onChange,
+  testId,
+  width,
+}: PropsWithChildren<VariableSelectFieldProps<any>>) {
+  const styles = useStyles2(getStyles);
+  const uniqueId = useId();
+  const inputId = `variable-select-input-${name}-${uniqueId}`;
+
+  return (
+    <Field label={name} description={description} htmlFor={inputId}>
+      <Select
+        data-testid={testId}
+        inputId={inputId}
+        onChange={onChange}
+        value={value}
+        width={width ?? 30}
+        options={options}
+        className={styles.selectContainer}
+      />
+    </Field>
+  );
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    selectContainer: css({
+      marginRight: theme.spacing(0.5),
+    }),
+  };
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/components/VariableTextAreaField.tsx b/public/app/features/dashboard-scene/settings/variables/components/VariableTextAreaField.tsx
new file mode 100644
index 0000000000000..b7382c9239ada
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/components/VariableTextAreaField.tsx
@@ -0,0 +1,73 @@
+import { css } from '@emotion/css';
+import { useId } from '@react-aria/utils';
+import React, { FormEvent, PropsWithChildren, ReactElement } from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Field, TextArea, useStyles2 } from '@grafana/ui';
+
+interface VariableTextAreaFieldProps {
+  name: string;
+  value?: string;
+  defaultValue?: string;
+  placeholder: string;
+  onChange?: (event: FormEvent<HTMLTextAreaElement>) => void;
+  width: number;
+  ariaLabel?: string;
+  required?: boolean;
+  testId?: string;
+  onBlur?: (event: FormEvent<HTMLTextAreaElement>) => void;
+  description?: React.ReactNode;
+}
+
+export function VariableTextAreaField({
+  value,
+  defaultValue,
+  name,
+  description,
+  placeholder,
+  onChange,
+  onBlur,
+  ariaLabel,
+  required,
+  width,
+  testId,
+}: PropsWithChildren<VariableTextAreaFieldProps>): ReactElement {
+  const styles = useStyles2(getStyles);
+  const id = useId();
+
+  return (
+    <Field label={name} description={description} htmlFor={id}>
+      <TextArea
+        id={id}
+        rows={2}
+        value={value}
+        defaultValue={defaultValue}
+        onChange={onChange}
+        onBlur={onBlur}
+        placeholder={placeholder}
+        required={required}
+        aria-label={ariaLabel}
+        cols={width}
+        className={styles.textarea}
+        data-testid={testId}
+      />
+    </Field>
+  );
+}
+
+export function getStyles(theme: GrafanaTheme2) {
+  return {
+    textarea: css({
+      whiteSpace: 'pre-wrap',
+      minHeight: theme.spacing(4),
+      height: 'auto',
+      overflow: 'auto',
+      padding: `${theme.spacing(0.75)} ${theme.spacing(1)}`,
+      width: 'inherit',
+
+      [theme.breakpoints.down('sm')]: {
+        width: '100%',
+      },
+    }),
+  };
+}
diff --git a/public/app/features/variables/editor/VariableTextField.tsx b/public/app/features/dashboard-scene/settings/variables/components/VariableTextField.tsx
similarity index 88%
rename from public/app/features/variables/editor/VariableTextField.tsx
rename to public/app/features/dashboard-scene/settings/variables/components/VariableTextField.tsx
index 86890acf7c9c7..8b6ccf05d4815 100644
--- a/public/app/features/variables/editor/VariableTextField.tsx
+++ b/public/app/features/dashboard-scene/settings/variables/components/VariableTextField.tsx
@@ -4,10 +4,11 @@ import React, { FormEvent, PropsWithChildren } from 'react';
 import { Field, Input } from '@grafana/ui';
 
 interface VariableTextFieldProps {
-  value: string;
+  value?: string;
+  defaultValue?: string;
   name: string;
   placeholder?: string;
-  onChange: (event: FormEvent<HTMLInputElement>) => void;
+  onChange?: (event: FormEvent<HTMLInputElement>) => void;
   testId?: string;
   required?: boolean;
   width?: number;
@@ -21,6 +22,7 @@ interface VariableTextFieldProps {
 
 export function VariableTextField({
   value,
+  defaultValue,
   name,
   placeholder = '',
   onChange,
@@ -43,6 +45,7 @@ export function VariableTextField({
         id={id}
         placeholder={placeholder}
         value={value}
+        defaultValue={defaultValue}
         onChange={onChange}
         onBlur={onBlur}
         width={grow ? undefined : width ?? 30}
diff --git a/public/app/features/dashboard-scene/settings/variables/components/VariableTypeSelect.tsx b/public/app/features/dashboard-scene/settings/variables/components/VariableTypeSelect.tsx
new file mode 100644
index 0000000000000..0623559738846
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/components/VariableTypeSelect.tsx
@@ -0,0 +1,30 @@
+import React, { PropsWithChildren, useMemo } from 'react';
+
+import { SelectableValue, VariableType } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { VariableSelectField } from 'app/features/dashboard-scene/settings/variables/components/VariableSelectField';
+
+import { EditableVariableType, getVariableTypeSelectOptions } from '../utils';
+
+interface Props {
+  onChange: (option: SelectableValue<EditableVariableType>) => void;
+  type: VariableType;
+}
+
+export function VariableTypeSelect({ onChange, type }: PropsWithChildren<Props>) {
+  const options = useMemo(() => getVariableTypeSelectOptions(), []);
+  const value = useMemo(
+    () => options.find((o: SelectableValue<EditableVariableType>) => o.value === type) ?? options[0],
+    [options, type]
+  );
+
+  return (
+    <VariableSelectField
+      name="Select variable type"
+      value={value}
+      options={options}
+      onChange={onChange}
+      testId={selectors.pages.Dashboard.Settings.Variables.Edit.General.generalTypeSelectV2}
+    />
+  );
+}
diff --git a/public/app/features/variables/editor/VariableValuesPreview.tsx b/public/app/features/dashboard-scene/settings/variables/components/VariableValuesPreview.tsx
similarity index 81%
rename from public/app/features/variables/editor/VariableValuesPreview.tsx
rename to public/app/features/dashboard-scene/settings/variables/components/VariableValuesPreview.tsx
index 2c04e68198d8f..0265144ba5346 100644
--- a/public/app/features/variables/editor/VariableValuesPreview.tsx
+++ b/public/app/features/dashboard-scene/settings/variables/components/VariableValuesPreview.tsx
@@ -3,17 +3,16 @@ import React, { MouseEvent, useCallback, useEffect, useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
+import { VariableValueOption } from '@grafana/scenes';
 import { Button, InlineFieldRow, InlineLabel, useStyles2 } from '@grafana/ui';
 
-import { VariableOption, VariableWithOptions } from '../types';
-
 export interface VariableValuesPreviewProps {
-  variable: VariableWithOptions;
+  options: VariableValueOption[];
 }
 
-export const VariableValuesPreview = ({ variable: { options } }: VariableValuesPreviewProps) => {
+export const VariableValuesPreview = ({ options }: VariableValuesPreviewProps) => {
   const [previewLimit, setPreviewLimit] = useState(20);
-  const [previewOptions, setPreviewOptions] = useState<VariableOption[]>([]);
+  const [previewOptions, setPreviewOptions] = useState<VariableValueOption[]>([]);
   const showMoreOptions = useCallback(
     (event: MouseEvent) => {
       event.preventDefault();
@@ -34,8 +33,8 @@ export const VariableValuesPreview = ({ variable: { options } }: VariableValuesP
       <InlineFieldRow>
         {previewOptions.map((o, index) => (
           <InlineFieldRow key={`${o.value}-${index}`} className={styles.optionContainer}>
-            <InlineLabel aria-label={selectors.pages.Dashboard.Settings.Variables.Edit.General.previewOfValuesOption}>
-              <div className={styles.label}>{o.text}</div>
+            <InlineLabel data-testid={selectors.pages.Dashboard.Settings.Variables.Edit.General.previewOfValuesOption}>
+              <div className={styles.label}>{o.label}</div>
             </InlineLabel>
           </InlineFieldRow>
         ))}
diff --git a/public/app/features/dashboard-scene/settings/variables/editors/AdHocFiltersVariableEditor.test.tsx b/public/app/features/dashboard-scene/settings/variables/editors/AdHocFiltersVariableEditor.test.tsx
new file mode 100644
index 0000000000000..b80caf607e97d
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/editors/AdHocFiltersVariableEditor.test.tsx
@@ -0,0 +1,145 @@
+import { render, act } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { of } from 'rxjs';
+
+import {
+  FieldType,
+  LoadingState,
+  PanelData,
+  VariableSupportType,
+  getDefaultTimeRange,
+  toDataFrame,
+} from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { setRunRequest } from '@grafana/runtime/src';
+import { AdHocFiltersVariable } from '@grafana/scenes';
+import { mockDataSource } from 'app/features/alerting/unified/mocks';
+import { LegacyVariableQueryEditor } from 'app/features/variables/editor/LegacyVariableQueryEditor';
+
+import { AdHocFiltersVariableEditor } from './AdHocFiltersVariableEditor';
+
+const defaultDatasource = mockDataSource({
+  name: 'Default Test Data Source',
+  uid: 'test-ds',
+  type: 'test',
+});
+
+const promDatasource = mockDataSource({
+  name: 'Prometheus',
+  uid: 'prometheus',
+  type: 'prometheus',
+});
+
+jest.mock('@grafana/runtime/src/services/dataSourceSrv', () => ({
+  ...jest.requireActual('@grafana/runtime/src/services/dataSourceSrv'),
+  getDataSourceSrv: () => ({
+    get: async () => ({
+      ...defaultDatasource,
+      variables: {
+        getType: () => VariableSupportType.Custom,
+        query: jest.fn(),
+        editor: jest.fn().mockImplementation(LegacyVariableQueryEditor),
+      },
+    }),
+    getList: () => [defaultDatasource, promDatasource],
+    getInstanceSettings: () => ({ ...defaultDatasource }),
+  }),
+}));
+
+const runRequestMock = jest.fn().mockReturnValue(
+  of<PanelData>({
+    state: LoadingState.Done,
+    series: [
+      toDataFrame({
+        fields: [{ name: 'text', type: FieldType.string, values: ['val1', 'val2', 'val11'] }],
+      }),
+    ],
+    timeRange: getDefaultTimeRange(),
+  })
+);
+
+setRunRequest(runRequestMock);
+
+describe('AdHocFiltersVariableEditor', () => {
+  it('renders AdHocVariableForm with correct props', async () => {
+    const { renderer } = await setup();
+    const dataSourcePicker = renderer.getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.AdHocFiltersVariable.datasourceSelect
+    );
+    const infoText = renderer.getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.AdHocFiltersVariable.infoText
+    );
+
+    expect(dataSourcePicker).toBeInTheDocument();
+    expect(dataSourcePicker.getAttribute('placeholder')).toBe('Default Test Data Source');
+    expect(infoText).toBeInTheDocument();
+    expect(infoText).toHaveTextContent('This data source does not support ad hoc filters yet.');
+  });
+
+  it('should update the variable data source when data source picker is changed', async () => {
+    const { renderer, variable, user } = await setup();
+
+    // Simulate changing the data source
+    await user.click(renderer.getByTestId(selectors.components.DataSourcePicker.inputV2));
+    await user.click(renderer.getByText(/prom/i));
+
+    expect(variable.state.datasource).toEqual({ uid: 'prometheus', type: 'prometheus' });
+  });
+
+  it('should update the variable default keys when the default keys options is enabled', async () => {
+    const { renderer, variable, user } = await setup();
+
+    // Simulate toggling default options on
+    await user.click(
+      renderer.getByTestId(selectors.pages.Dashboard.Settings.Variables.Edit.AdHocFiltersVariable.modeToggle)
+    );
+
+    expect(variable.state.defaultKeys).toEqual([]);
+  });
+
+  it('should update the variable default keys when the default keys option is disabled', async () => {
+    const { renderer, variable, user } = await setup(undefined, true);
+
+    // Simulate toggling default options off
+    await user.click(
+      renderer.getByTestId(selectors.pages.Dashboard.Settings.Variables.Edit.AdHocFiltersVariable.modeToggle)
+    );
+
+    expect(variable.state.defaultKeys).toEqual(undefined);
+  });
+});
+
+async function setup(props?: React.ComponentProps<typeof AdHocFiltersVariableEditor>, withDefaultKeys = false) {
+  const onRunQuery = jest.fn();
+  const variable = new AdHocFiltersVariable({
+    name: 'adhocVariable',
+    type: 'adhoc',
+    label: 'Ad hoc filters',
+    description: 'Ad hoc filters are applied automatically to all queries that target this data source',
+    datasource: { uid: defaultDatasource.uid, type: defaultDatasource.type },
+    filters: [
+      {
+        key: 'test',
+        operator: '=',
+        value: 'testValue',
+      },
+    ],
+    baseFilters: [
+      {
+        key: 'baseTest',
+        operator: '=',
+        value: 'baseTestValue',
+      },
+    ],
+    defaultKeys: withDefaultKeys ? [{ text: 'A', value: 'A' }] : undefined,
+  });
+  return {
+    renderer: await act(() =>
+      render(<AdHocFiltersVariableEditor variable={variable} onRunQuery={onRunQuery} {...props} />)
+    ),
+    variable,
+    user: userEvent.setup(),
+    mocks: { onRunQuery },
+  };
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/editors/AdHocFiltersVariableEditor.tsx b/public/app/features/dashboard-scene/settings/variables/editors/AdHocFiltersVariableEditor.tsx
new file mode 100644
index 0000000000000..8aa2a2a6dafff
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/editors/AdHocFiltersVariableEditor.tsx
@@ -0,0 +1,54 @@
+import React from 'react';
+import { useAsync } from 'react-use';
+
+import { DataSourceInstanceSettings, MetricFindValue } from '@grafana/data';
+import { getDataSourceSrv } from '@grafana/runtime';
+import { AdHocFiltersVariable } from '@grafana/scenes';
+import { DataSourceRef } from '@grafana/schema';
+
+import { AdHocVariableForm } from '../components/AdHocVariableForm';
+
+interface AdHocFiltersVariableEditorProps {
+  variable: AdHocFiltersVariable;
+  onRunQuery: (variable: AdHocFiltersVariable) => void;
+}
+
+export function AdHocFiltersVariableEditor(props: AdHocFiltersVariableEditorProps) {
+  const { variable } = props;
+  const { datasource: datasourceRef, defaultKeys } = variable.useState();
+
+  const { value: datasourceSettings } = useAsync(async () => {
+    return await getDataSourceSrv().get(datasourceRef);
+  }, [datasourceRef]);
+
+  const message = datasourceSettings?.getTagKeys
+    ? 'Ad hoc filters are applied automatically to all queries that target this data source'
+    : 'This data source does not support ad hoc filters yet.';
+
+  const onDataSourceChange = (ds: DataSourceInstanceSettings) => {
+    const dsRef: DataSourceRef = {
+      uid: ds.uid,
+      type: ds.type,
+    };
+
+    variable.setState({
+      datasource: dsRef,
+    });
+  };
+
+  const onDefaultKeysChange = (defaultKeys?: MetricFindValue[]) => {
+    variable.setState({
+      defaultKeys,
+    });
+  };
+
+  return (
+    <AdHocVariableForm
+      datasource={datasourceRef ?? undefined}
+      infoText={message}
+      onDataSourceChange={onDataSourceChange}
+      defaultKeys={defaultKeys}
+      onDefaultKeysChange={onDefaultKeysChange}
+    />
+  );
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/editors/ConstantVariableEditor.test.tsx b/public/app/features/dashboard-scene/settings/variables/editors/ConstantVariableEditor.test.tsx
new file mode 100644
index 0000000000000..dbb1b8f7ab388
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/editors/ConstantVariableEditor.test.tsx
@@ -0,0 +1,50 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { ConstantVariable } from '@grafana/scenes';
+
+import { ConstantVariableEditor } from './ConstantVariableEditor';
+
+describe('ConstantVariableEditor', () => {
+  let constantVar: ConstantVariable;
+  beforeEach(async () => {
+    const result = await buildTestScene();
+    constantVar = result.constantVar;
+  });
+
+  it('renders constant value', () => {
+    render(<ConstantVariableEditor variable={constantVar} />);
+    const input = screen.getByRole('textbox', { name: 'Value' });
+    expect(input).toBeInTheDocument();
+    expect(input).toHaveValue('constant value');
+  });
+
+  it('changes the value', async () => {
+    render(<ConstantVariableEditor variable={constantVar} />);
+
+    const input = screen.getByRole('textbox', { name: 'Value' });
+    expect(input).toBeInTheDocument();
+    expect(input).toHaveValue('constant value');
+
+    // change input value
+    const newValue = 'new constant value';
+    await userEvent.clear(input);
+    await userEvent.type(input, newValue);
+
+    expect(input).toHaveValue(newValue);
+
+    await userEvent.tab();
+    expect(constantVar.state.value).toBe(newValue);
+  });
+});
+
+async function buildTestScene() {
+  const constantVar = new ConstantVariable({
+    name: 'constantVar',
+    type: 'constant',
+    value: 'constant value',
+  });
+
+  return { constantVar };
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/editors/ConstantVariableEditor.tsx b/public/app/features/dashboard-scene/settings/variables/editors/ConstantVariableEditor.tsx
new file mode 100644
index 0000000000000..de4d3203dbdab
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/editors/ConstantVariableEditor.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+
+import { ConstantVariable } from '@grafana/scenes';
+
+import { ConstantVariableForm } from '../components/ConstantVariableForm';
+
+interface ConstantVariableEditorProps {
+  variable: ConstantVariable;
+}
+
+export function ConstantVariableEditor({ variable }: ConstantVariableEditorProps) {
+  const { value } = variable.useState();
+
+  const onConstantValueChange = (event: React.FormEvent<HTMLInputElement>) => {
+    variable.setState({ value: event.currentTarget.value });
+  };
+
+  return <ConstantVariableForm constantValue={String(value)} onChange={onConstantValueChange} />;
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/editors/CustomVariableEditor.test.tsx b/public/app/features/dashboard-scene/settings/variables/editors/CustomVariableEditor.test.tsx
new file mode 100644
index 0000000000000..3a63f900ceae6
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/editors/CustomVariableEditor.test.tsx
@@ -0,0 +1,115 @@
+import { render, fireEvent } from '@testing-library/react';
+import React from 'react';
+
+import { selectors } from '@grafana/e2e-selectors';
+import { CustomVariable } from '@grafana/scenes';
+
+import { CustomVariableEditor } from './CustomVariableEditor';
+
+describe('CustomVariableEditor', () => {
+  it('should render the CustomVariableForm with correct initial values', () => {
+    const variable = new CustomVariable({
+      name: 'customVar',
+      query: 'test, test2',
+      value: 'test',
+      isMulti: true,
+      includeAll: true,
+      allValue: 'test',
+    });
+    const onRunQuery = jest.fn();
+
+    const { getByTestId } = render(<CustomVariableEditor variable={variable} onRunQuery={onRunQuery} />);
+
+    const queryInput = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.CustomVariable.customValueInput
+    ) as HTMLInputElement;
+    const allValueInput = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsCustomAllInput
+    ) as HTMLInputElement;
+    const multiCheckbox = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsMultiSwitch
+    ) as HTMLInputElement;
+    const includeAllCheckbox = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsIncludeAllSwitch
+    ) as HTMLInputElement;
+
+    expect(queryInput.value).toBe('test, test2');
+    expect(allValueInput.value).toBe('test');
+    expect(multiCheckbox.checked).toBe(true);
+    expect(includeAllCheckbox.checked).toBe(true);
+  });
+
+  it('should update the variable state when input values change', () => {
+    const variable = new CustomVariable({
+      name: 'customVar',
+      query: 'test, test2',
+      value: 'test',
+    });
+    const onRunQuery = jest.fn();
+
+    const { getByTestId } = render(<CustomVariableEditor variable={variable} onRunQuery={onRunQuery} />);
+
+    const multiCheckbox = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsMultiSwitch
+    );
+    const includeAllCheckbox = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsIncludeAllSwitch
+    );
+
+    // It include-all-custom input appears after include-all checkbox is checked only
+    expect(() =>
+      getByTestId(selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsCustomAllInput)
+    ).toThrow('Unable to find an element');
+
+    fireEvent.click(multiCheckbox);
+
+    fireEvent.click(includeAllCheckbox);
+    const allValueInput = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsCustomAllInput
+    );
+
+    expect(variable.state.isMulti).toBe(true);
+    expect(variable.state.includeAll).toBe(true);
+    expect(allValueInput).toBeInTheDocument();
+  });
+
+  it('should call update query and re-run query when input loses focus', async () => {
+    const variable = new CustomVariable({
+      name: 'customVar',
+      query: 'test, test2',
+      value: 'test',
+    });
+    const onRunQuery = jest.fn();
+
+    const { getByTestId } = render(<CustomVariableEditor variable={variable} onRunQuery={onRunQuery} />);
+
+    const queryInput = getByTestId(selectors.pages.Dashboard.Settings.Variables.Edit.CustomVariable.customValueInput);
+    fireEvent.change(queryInput, { target: { value: 'test3, test4' } });
+    fireEvent.blur(queryInput);
+
+    expect(onRunQuery).toHaveBeenCalled();
+    expect(variable.state.query).toBe('test3, test4');
+  });
+
+  it('should update the variable state when all-custom-value input loses focus', () => {
+    const variable = new CustomVariable({
+      name: 'customVar',
+      query: 'test, test2',
+      value: 'test',
+      isMulti: true,
+      includeAll: true,
+    });
+    const onRunQuery = jest.fn();
+
+    const { getByTestId } = render(<CustomVariableEditor variable={variable} onRunQuery={onRunQuery} />);
+
+    const allValueInput = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsCustomAllInput
+    ) as HTMLInputElement;
+
+    fireEvent.change(allValueInput, { target: { value: 'new custom all' } });
+    fireEvent.blur(allValueInput);
+
+    expect(variable.state.allValue).toBe('new custom all');
+  });
+});
diff --git a/public/app/features/dashboard-scene/settings/variables/editors/CustomVariableEditor.tsx b/public/app/features/dashboard-scene/settings/variables/editors/CustomVariableEditor.tsx
new file mode 100644
index 0000000000000..724218276b2d7
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/editors/CustomVariableEditor.tsx
@@ -0,0 +1,41 @@
+import React, { FormEvent } from 'react';
+
+import { CustomVariable } from '@grafana/scenes';
+
+import { CustomVariableForm } from '../components/CustomVariableForm';
+
+interface CustomVariableEditorProps {
+  variable: CustomVariable;
+  onRunQuery: () => void;
+}
+
+export function CustomVariableEditor({ variable, onRunQuery }: CustomVariableEditorProps) {
+  const { query, isMulti, allValue, includeAll } = variable.useState();
+
+  const onMultiChange = (event: FormEvent<HTMLInputElement>) => {
+    variable.setState({ isMulti: event.currentTarget.checked });
+  };
+  const onIncludeAllChange = (event: FormEvent<HTMLInputElement>) => {
+    variable.setState({ includeAll: event.currentTarget.checked });
+  };
+  const onQueryChange = (event: FormEvent<HTMLTextAreaElement>) => {
+    variable.setState({ query: event.currentTarget.value });
+    onRunQuery();
+  };
+  const onAllValueChange = (event: FormEvent<HTMLInputElement>) => {
+    variable.setState({ allValue: event.currentTarget.value });
+  };
+
+  return (
+    <CustomVariableForm
+      query={query ?? ''}
+      multi={!!isMulti}
+      allValue={allValue ?? ''}
+      includeAll={!!includeAll}
+      onMultiChange={onMultiChange}
+      onIncludeAllChange={onIncludeAllChange}
+      onQueryChange={onQueryChange}
+      onAllValueChange={onAllValueChange}
+    />
+  );
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/editors/DataSourceVariableEditor.test.tsx b/public/app/features/dashboard-scene/settings/variables/editors/DataSourceVariableEditor.test.tsx
new file mode 100644
index 0000000000000..0b1e4c333a921
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/editors/DataSourceVariableEditor.test.tsx
@@ -0,0 +1,157 @@
+// add unit test for the DataSourceVariableEditor component
+
+import { render } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { selectors } from '@grafana/e2e-selectors';
+import { DataSourceVariable } from '@grafana/scenes';
+
+import { DataSourceVariableEditor } from './DataSourceVariableEditor';
+
+//mock getDataSorceSrv.getList() to return a list of datasources
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getDataSourceSrv: () => ({
+    getList: () => {
+      return [
+        {
+          name: 'DataSourceInstance1',
+          uid: 'ds1',
+          meta: {
+            name: 'ds1',
+            id: 'dsTestDataSource',
+          },
+        },
+        {
+          name: 'DataSourceInstance2',
+          uid: 'ds2',
+          meta: {
+            name: 'ds1',
+            id: 'dsTestDataSource',
+          },
+        },
+        {
+          name: 'ABCDataSourceInstance',
+          uid: 'ds3',
+          meta: {
+            name: 'abDS',
+            id: 'ABCDS',
+          },
+        },
+      ];
+    },
+  }),
+}));
+
+describe('DataSourceVariableEditor', () => {
+  it('shoud render correctly with multi and all not checked', () => {
+    const variable = new DataSourceVariable({
+      name: 'dsVariable',
+      type: 'datasource',
+      label: 'Datasource',
+      pluginId: 'dsTestDataSource',
+    });
+    const onRunQuery = jest.fn();
+
+    const { getByTestId } = render(<DataSourceVariableEditor variable={variable} onRunQuery={onRunQuery} />);
+
+    const multiCheckbox = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsMultiSwitch
+    );
+    const includeAllCheckbox = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsIncludeAllSwitch
+    );
+
+    const typeSelect = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.DatasourceVariable.datasourceSelect
+    );
+    expect(typeSelect).toBeInTheDocument();
+    expect(typeSelect.textContent).toBe('ds1');
+    expect(multiCheckbox).toBeInTheDocument();
+    expect(multiCheckbox).not.toBeChecked();
+    expect(includeAllCheckbox).toBeInTheDocument();
+    expect(includeAllCheckbox).not.toBeChecked();
+  });
+
+  it('shoud render correctly with multi and includeAll checked', () => {
+    const variable = new DataSourceVariable({
+      name: 'dsVariable',
+      type: 'datasource',
+      label: 'Datasource',
+      pluginId: 'dsTestDataSource',
+      isMulti: true,
+      includeAll: true,
+    });
+    const onRunQuery = jest.fn();
+
+    const { getByTestId } = render(<DataSourceVariableEditor variable={variable} onRunQuery={onRunQuery} />);
+
+    const multiCheckbox = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsMultiSwitch
+    );
+    const includeAllCheckbox = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsIncludeAllSwitch
+    );
+
+    const typeSelect = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.DatasourceVariable.datasourceSelect
+    );
+    expect(typeSelect).toBeInTheDocument();
+    expect(typeSelect.textContent).toBe('ds1');
+    expect(multiCheckbox).toBeInTheDocument();
+    expect(multiCheckbox).toBeChecked();
+    expect(includeAllCheckbox).toBeInTheDocument();
+    expect(includeAllCheckbox).toBeChecked();
+  });
+
+  it('Should change type option when users select a different datasource type', async () => {
+    const variable = new DataSourceVariable({
+      name: 'dsVariable',
+      type: 'datasource',
+      label: 'Datasource',
+      pluginId: 'dsTestDataSource',
+      isMulti: false,
+      includeAll: false,
+    });
+    const onRunQuery = jest.fn();
+
+    const { getByTestId, user } = setup(<DataSourceVariableEditor variable={variable} onRunQuery={onRunQuery} />);
+
+    const typeSelect = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.DatasourceVariable.datasourceSelect
+    );
+    // when user change type datasource
+    await user.click(typeSelect);
+    await user.type(typeSelect, 'abDS');
+    await user.keyboard('{enter}');
+    expect(typeSelect).toBeInTheDocument();
+    expect(typeSelect.textContent).toBe('abDS');
+    expect(onRunQuery).toHaveBeenCalledTimes(1);
+
+    // when user change checkbox multi
+
+    const multiCheckbox = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsMultiSwitch
+    );
+    const includeAllCheckbox = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsIncludeAllSwitch
+    );
+
+    await user.click(multiCheckbox);
+    expect(multiCheckbox).toBeChecked();
+
+    // when user include all there is a new call to onRunQuery
+    await user.click(includeAllCheckbox);
+    expect(includeAllCheckbox).toBeChecked();
+    expect(onRunQuery).toHaveBeenCalledTimes(1);
+  });
+});
+
+// based on styleguide recomendation
+function setup(jsx: JSX.Element) {
+  return {
+    user: userEvent.setup(),
+    ...render(jsx),
+  };
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/editors/DataSourceVariableEditor.tsx b/public/app/features/dashboard-scene/settings/variables/editors/DataSourceVariableEditor.tsx
new file mode 100644
index 0000000000000..6c36f94e3ef71
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/editors/DataSourceVariableEditor.tsx
@@ -0,0 +1,62 @@
+import React, { FormEvent } from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { DataSourceVariable } from '@grafana/scenes';
+
+import { DataSourceVariableForm } from '../components/DataSourceVariableForm';
+import { getOptionDataSourceTypes } from '../utils';
+
+interface DataSourceVariableEditorProps {
+  variable: DataSourceVariable;
+  onRunQuery: () => void;
+}
+
+export function DataSourceVariableEditor({ variable, onRunQuery }: DataSourceVariableEditorProps) {
+  const { pluginId, regex, isMulti, allValue, includeAll } = variable.useState();
+
+  const optionTypes = getOptionDataSourceTypes();
+
+  const onChangeType = (option: SelectableValue) => {
+    variable.setState({
+      pluginId: option.value,
+    });
+    onRunQuery();
+  };
+
+  const onRegExChange = (event: FormEvent<HTMLInputElement>) => {
+    variable.setState({
+      regex: event.currentTarget.value,
+    });
+    onRunQuery();
+  };
+
+  const onMultiChange = (event: FormEvent<HTMLInputElement>) => {
+    variable.setState({
+      isMulti: event.currentTarget.checked,
+    });
+  };
+
+  const onIncludeAllChange = (event: FormEvent<HTMLInputElement>) => {
+    variable.setState({ includeAll: event.currentTarget.checked });
+  };
+
+  const onAllValueChange = (event: FormEvent<HTMLInputElement>) => {
+    variable.setState({ allValue: event.currentTarget.value });
+  };
+
+  return (
+    <DataSourceVariableForm
+      query={pluginId}
+      regex={regex}
+      multi={isMulti || false}
+      allValue={allValue}
+      includeAll={includeAll || false}
+      optionTypes={optionTypes}
+      onChange={onChangeType}
+      onRegExBlur={onRegExChange}
+      onMultiChange={onMultiChange}
+      onIncludeAllChange={onIncludeAllChange}
+      onAllValueChange={onAllValueChange}
+    />
+  );
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/editors/GroupByVariableEditor.test.tsx b/public/app/features/dashboard-scene/settings/variables/editors/GroupByVariableEditor.test.tsx
new file mode 100644
index 0000000000000..48b01d8f08f6e
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/editors/GroupByVariableEditor.test.tsx
@@ -0,0 +1,103 @@
+import { act, render } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { MetricFindValue, VariableSupportType } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { GroupByVariable } from '@grafana/scenes';
+import { mockDataSource } from 'app/features/alerting/unified/mocks';
+import { LegacyVariableQueryEditor } from 'app/features/variables/editor/LegacyVariableQueryEditor';
+
+import { GroupByVariableEditor } from './GroupByVariableEditor';
+
+const defaultDatasource = mockDataSource({
+  name: 'Default Test Data Source',
+  uid: 'test-ds',
+  type: 'test',
+});
+
+const promDatasource = mockDataSource({
+  name: 'Prometheus',
+  uid: 'prometheus',
+  type: 'prometheus',
+});
+
+jest.mock('@grafana/runtime/src/services/dataSourceSrv', () => ({
+  ...jest.requireActual('@grafana/runtime/src/services/dataSourceSrv'),
+  getDataSourceSrv: () => ({
+    get: async () => ({
+      ...defaultDatasource,
+      variables: {
+        getType: () => VariableSupportType.Custom,
+        query: jest.fn(),
+        editor: jest.fn().mockImplementation(LegacyVariableQueryEditor),
+      },
+    }),
+    getList: () => [defaultDatasource, promDatasource],
+    getInstanceSettings: () => ({ ...defaultDatasource }),
+  }),
+}));
+
+describe('GroupByVariableEditor', () => {
+  it('renders AdHocVariableForm with correct props', async () => {
+    const { renderer } = await setup();
+    const dataSourcePicker = renderer.getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.GroupByVariable.dataSourceSelect
+    );
+    const infoText = renderer.getByTestId(selectors.pages.Dashboard.Settings.Variables.Edit.GroupByVariable.infoText);
+
+    expect(dataSourcePicker).toBeInTheDocument();
+    expect(dataSourcePicker.getAttribute('placeholder')).toBe('Default Test Data Source');
+    expect(infoText).toBeInTheDocument();
+    expect(infoText).toHaveTextContent('This data source does not support group by variable yet.');
+  });
+
+  it('should update the variable data source when data source picker is changed', async () => {
+    const { renderer, variable, user } = await setup();
+
+    // Simulate changing the data source
+    await user.click(renderer.getByTestId(selectors.components.DataSourcePicker.inputV2));
+    await user.click(renderer.getByText(/prom/i));
+
+    expect(variable.state.datasource).toEqual({ uid: 'prometheus', type: 'prometheus' });
+  });
+
+  it('should update the variable default options when static options are enabled', async () => {
+    const { renderer, variable, user } = await setup();
+
+    // Simulate toggling static options on
+    await user.click(
+      renderer.getByTestId(selectors.pages.Dashboard.Settings.Variables.Edit.GroupByVariable.modeToggle)
+    );
+
+    expect(variable.state.defaultOptions).toEqual([]);
+  });
+
+  it('should update the variable default options when static options are disabled', async () => {
+    const { renderer, variable, user } = await setup([{ text: 'A', value: 'A' }]);
+
+    // Simulate toggling static options off
+    await user.click(
+      renderer.getByTestId(selectors.pages.Dashboard.Settings.Variables.Edit.GroupByVariable.modeToggle)
+    );
+
+    expect(variable.state.defaultOptions).toEqual(undefined);
+  });
+});
+
+async function setup(defaultOptions?: MetricFindValue[]) {
+  const onRunQuery = jest.fn();
+  const variable = new GroupByVariable({
+    name: 'groupByVariable',
+    type: 'groupby',
+    label: 'Group By',
+    datasource: { uid: defaultDatasource.uid, type: defaultDatasource.type },
+    defaultOptions,
+  });
+  return {
+    renderer: await act(() => render(<GroupByVariableEditor variable={variable} onRunQuery={onRunQuery} />)),
+    variable,
+    user: userEvent.setup(),
+    mocks: { onRunQuery },
+  };
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/editors/GroupByVariableEditor.tsx b/public/app/features/dashboard-scene/settings/variables/editors/GroupByVariableEditor.tsx
new file mode 100644
index 0000000000000..01cffb31c84e6
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/editors/GroupByVariableEditor.tsx
@@ -0,0 +1,51 @@
+import React from 'react';
+import { useAsync } from 'react-use';
+
+import { DataSourceInstanceSettings, DataSourceRef, MetricFindValue } from '@grafana/data';
+import { getDataSourceSrv } from '@grafana/runtime';
+import { GroupByVariable } from '@grafana/scenes';
+
+import { GroupByVariableForm } from '../components/GroupByVariableForm';
+
+interface GroupByVariableEditorProps {
+  variable: GroupByVariable;
+  onRunQuery: () => void;
+}
+
+export function GroupByVariableEditor(props: GroupByVariableEditorProps) {
+  const { variable, onRunQuery } = props;
+  const { datasource: datasourceRef, defaultOptions } = variable.useState();
+
+  const { value: datasource } = useAsync(async () => {
+    return await getDataSourceSrv().get(datasourceRef);
+  }, [variable.state]);
+
+  const message = datasource?.getTagKeys
+    ? 'Group by dimensions are applied automatically to all queries that target this data source'
+    : 'This data source does not support group by variable yet.';
+
+  const onDataSourceChange = async (ds: DataSourceInstanceSettings) => {
+    const dsRef: DataSourceRef = {
+      uid: ds.uid,
+      type: ds.type,
+    };
+
+    variable.setState({ datasource: dsRef });
+    onRunQuery();
+  };
+
+  const onDefaultOptionsChange = async (defaultOptions?: MetricFindValue[]) => {
+    variable.setState({ defaultOptions });
+    onRunQuery();
+  };
+
+  return (
+    <GroupByVariableForm
+      defaultOptions={defaultOptions}
+      datasource={datasourceRef ?? undefined}
+      infoText={datasourceRef ? message : undefined}
+      onDataSourceChange={onDataSourceChange}
+      onDefaultOptionsChange={onDefaultOptionsChange}
+    />
+  );
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/editors/IntervalVariableEditor.test.tsx b/public/app/features/dashboard-scene/settings/variables/editors/IntervalVariableEditor.test.tsx
new file mode 100644
index 0000000000000..5e1ddd110e2d4
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/editors/IntervalVariableEditor.test.tsx
@@ -0,0 +1,118 @@
+// unit test for IntervalVariableEditor component
+
+import { render, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { selectors } from '@grafana/e2e-selectors';
+import { IntervalVariable } from '@grafana/scenes';
+
+import { IntervalVariableEditor } from './IntervalVariableEditor';
+
+describe('IntervalVariableEditor', () => {
+  it('should render correctly', () => {
+    const variable = new IntervalVariable({
+      name: 'test',
+      type: 'interval',
+      intervals: ['1m', '10m', '1h', '6h', '1d', '7d'],
+    });
+
+    const onRunQuery = jest.fn();
+
+    const { getByTestId, queryByTestId } = render(
+      <IntervalVariableEditor variable={variable} onRunQuery={onRunQuery} />
+    );
+    const intervalsInput = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.IntervalVariable.intervalsValueInput
+    );
+    const autoEnabledCheckbox = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.IntervalVariable.autoEnabledCheckbox
+    );
+
+    expect(intervalsInput).toBeInTheDocument();
+    expect(intervalsInput).toHaveValue('1m,10m,1h,6h,1d,7d');
+    expect(autoEnabledCheckbox).toBeInTheDocument();
+    expect(autoEnabledCheckbox).not.toBeChecked();
+    expect(
+      queryByTestId(selectors.pages.Dashboard.Settings.Variables.Edit.IntervalVariable.minIntervalInput)
+    ).toBeNull();
+    expect(
+      queryByTestId(selectors.pages.Dashboard.Settings.Variables.Edit.IntervalVariable.stepCountIntervalSelect)
+    ).toBeNull();
+  });
+
+  it('should update intervals correctly', async () => {
+    const variable = new IntervalVariable({
+      name: 'test',
+      type: 'interval',
+      intervals: ['1m', '10m', '1h', '6h', '1d', '7d'],
+      value: '10m',
+    });
+
+    const onRunQuery = jest.fn();
+
+    const { user, getByTestId } = setup(<IntervalVariableEditor variable={variable} onRunQuery={onRunQuery} />);
+    const intervalsInput = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.IntervalVariable.intervalsValueInput
+    );
+
+    await user.clear(intervalsInput);
+    await user.type(intervalsInput, '7d,30d, 1y, 5y, 10y');
+    await user.tab();
+
+    expect(intervalsInput).toBeInTheDocument();
+    expect(intervalsInput).toHaveValue('7d,30d, 1y, 5y, 10y');
+    // If the value is not in the list, it should be set to the first value
+    expect(variable.state.value).toBe('7d');
+    expect(onRunQuery).toHaveBeenCalledTimes(1);
+  });
+
+  it('should handle auto enabled option correctly', async () => {
+    const variable = new IntervalVariable({
+      name: 'test',
+      type: 'interval',
+      intervals: ['1m', '10m', '1h', '6h', '1d', '7d'],
+      autoEnabled: false,
+    });
+
+    const onRunQuery = jest.fn();
+
+    const { user, getByTestId, queryByTestId } = setup(
+      <IntervalVariableEditor variable={variable} onRunQuery={onRunQuery} />
+    );
+
+    const autoEnabledCheckbox = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.IntervalVariable.autoEnabledCheckbox
+    );
+
+    await user.click(autoEnabledCheckbox);
+
+    const minIntervalInput = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.IntervalVariable.minIntervalInput
+    );
+
+    const stepCountIntervalSelect = queryByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.IntervalVariable.stepCountIntervalSelect
+    );
+
+    await waitFor(() => {
+      expect(autoEnabledCheckbox).toBeInTheDocument();
+      expect(autoEnabledCheckbox).toBeChecked();
+      expect(minIntervalInput).toBeInTheDocument();
+      expect(stepCountIntervalSelect).toBeInTheDocument();
+      expect(minIntervalInput).toHaveValue('10s');
+    });
+
+    await user.clear(minIntervalInput);
+    await user.type(minIntervalInput, '10m');
+    await user.tab();
+    expect(minIntervalInput).toHaveValue('10m');
+  });
+});
+
+function setup(jsx: JSX.Element) {
+  return {
+    user: userEvent.setup(),
+    ...render(jsx),
+  };
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/editors/IntervalVariableEditor.tsx b/public/app/features/dashboard-scene/settings/variables/editors/IntervalVariableEditor.tsx
new file mode 100644
index 0000000000000..3ffc414d7f4e0
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/editors/IntervalVariableEditor.tsx
@@ -0,0 +1,60 @@
+import React, { ChangeEvent, FormEvent } from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { IntervalVariable } from '@grafana/scenes';
+import {
+  getIntervalsFromQueryString,
+  getIntervalsQueryFromNewIntervalModel,
+} from 'app/features/dashboard-scene/utils/utils';
+
+import { IntervalVariableForm } from '../components/IntervalVariableForm';
+
+interface IntervalVariableEditorProps {
+  variable: IntervalVariable;
+  onRunQuery: () => void;
+}
+
+export function IntervalVariableEditor({ variable, onRunQuery }: IntervalVariableEditorProps) {
+  const { intervals, autoStepCount, autoEnabled, autoMinInterval, value } = variable.useState();
+
+  //transform intervals array into string
+  const intervalsCombined = getIntervalsQueryFromNewIntervalModel(intervals);
+
+  const onIntervalsChange = (event: FormEvent<HTMLInputElement>) => {
+    const newIntervals = getIntervalsFromQueryString(event.currentTarget.value);
+    // if the current value is not in the new intervals, set the value to the first interval
+    const newValue = newIntervals.includes(value) ? value : newIntervals[0];
+
+    variable.setState({
+      intervals: newIntervals,
+      value: newValue,
+    });
+
+    onRunQuery();
+  };
+
+  const onAutoCountChanged = (option: SelectableValue<number>) => {
+    variable.setState({ autoStepCount: option.value });
+  };
+
+  const onAutoEnabledChange = (event: ChangeEvent<HTMLInputElement>) => {
+    variable.setState({ autoEnabled: event.target.checked });
+  };
+
+  const onAutoMinIntervalChanged = (event: FormEvent<HTMLInputElement>) => {
+    variable.setState({ autoMinInterval: event.currentTarget.value });
+  };
+
+  return (
+    <IntervalVariableForm
+      intervals={intervalsCombined}
+      autoStepCount={autoStepCount}
+      autoEnabled={autoEnabled}
+      onAutoCountChanged={onAutoCountChanged}
+      onIntervalsChange={onIntervalsChange}
+      onAutoEnabledChange={onAutoEnabledChange}
+      onAutoMinIntervalChanged={onAutoMinIntervalChanged}
+      autoMinInterval={autoMinInterval}
+    />
+  );
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/editors/QueryVariableEditor.test.tsx b/public/app/features/dashboard-scene/settings/variables/editors/QueryVariableEditor.test.tsx
new file mode 100644
index 0000000000000..10b7832ff0571
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/editors/QueryVariableEditor.test.tsx
@@ -0,0 +1,332 @@
+import { getByRole, render, screen, act, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { lastValueFrom, of } from 'rxjs';
+
+import {
+  VariableSupportType,
+  PanelData,
+  LoadingState,
+  toDataFrame,
+  getDefaultTimeRange,
+  FieldType,
+} from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { setRunRequest } from '@grafana/runtime';
+import { QueryVariable } from '@grafana/scenes';
+import { VariableRefresh, VariableSort } from '@grafana/schema';
+import { mockDataSource } from 'app/features/alerting/unified/mocks';
+import { LegacyVariableQueryEditor } from 'app/features/variables/editor/LegacyVariableQueryEditor';
+
+import { QueryVariableEditor } from './QueryVariableEditor';
+
+const defaultDatasource = mockDataSource({
+  name: 'Default Test Data Source',
+  type: 'test',
+});
+
+const promDatasource = mockDataSource({
+  name: 'Prometheus',
+  type: 'prometheus',
+});
+
+jest.mock('@grafana/runtime/src/services/dataSourceSrv', () => ({
+  ...jest.requireActual('@grafana/runtime/src/services/dataSourceSrv'),
+  getDataSourceSrv: () => ({
+    get: async () => ({
+      ...defaultDatasource,
+      variables: {
+        getType: () => VariableSupportType.Custom,
+        query: jest.fn(),
+        editor: jest.fn().mockImplementation(LegacyVariableQueryEditor),
+      },
+    }),
+    getList: () => [defaultDatasource, promDatasource],
+    getInstanceSettings: () => ({ ...defaultDatasource }),
+  }),
+}));
+
+const runRequestMock = jest.fn().mockReturnValue(
+  of<PanelData>({
+    state: LoadingState.Done,
+    series: [
+      toDataFrame({
+        fields: [{ name: 'text', type: FieldType.string, values: ['val1', 'val2', 'val11'] }],
+      }),
+    ],
+    timeRange: getDefaultTimeRange(),
+  })
+);
+
+setRunRequest(runRequestMock);
+
+describe('QueryVariableEditor', () => {
+  const onRunQueryMock = jest.fn();
+
+  async function setup(props?: React.ComponentProps<typeof QueryVariableEditor>) {
+    const variable = new QueryVariable({
+      datasource: {
+        uid: defaultDatasource.uid,
+        type: defaultDatasource.type,
+      },
+      query: 'my-query',
+      regex: '.*',
+      sort: VariableSort.alphabeticalAsc,
+      refresh: VariableRefresh.onDashboardLoad,
+      isMulti: true,
+      includeAll: true,
+      allValue: 'custom all value',
+    });
+
+    return {
+      renderer: await act(() => {
+        return render(<QueryVariableEditor variable={variable} onRunQuery={onRunQueryMock} />);
+      }),
+      variable,
+      user: userEvent.setup(),
+    };
+  }
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should render the component with initializing the components correctly', async () => {
+    const { renderer } = await setup();
+    const dataSourcePicker = renderer.getByTestId(selectors.components.DataSourcePicker.inputV2);
+    const queryEditor = renderer.getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsQueryInput
+    );
+    const regexInput = renderer.getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsRegExInputV2
+    );
+    const sortSelect = renderer.getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsSortSelectV2
+    );
+    const refreshSelect = renderer.getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsRefreshSelectV2
+    );
+
+    const multiSwitch = renderer.getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsMultiSwitch
+    );
+    const includeAllSwitch = renderer.getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsIncludeAllSwitch
+    );
+    const allValueInput = renderer.getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsCustomAllInput
+    );
+
+    expect(dataSourcePicker).toBeInTheDocument();
+    expect(dataSourcePicker.getAttribute('placeholder')).toBe('Default Test Data Source');
+    expect(queryEditor).toBeInTheDocument();
+    expect(queryEditor).toHaveValue('my-query');
+    expect(regexInput).toBeInTheDocument();
+    expect(regexInput).toHaveValue('.*');
+    expect(sortSelect).toBeInTheDocument();
+    expect(sortSelect).toHaveTextContent('Alphabetical (asc)');
+    expect(refreshSelect).toBeInTheDocument();
+    expect(getByRole(refreshSelect, 'radio', { name: 'On dashboard load' })).toBeChecked();
+    expect(multiSwitch).toBeInTheDocument();
+    expect(multiSwitch).toBeChecked();
+    expect(includeAllSwitch).toBeInTheDocument();
+    expect(includeAllSwitch).toBeChecked();
+    expect(allValueInput).toBeInTheDocument();
+    expect(allValueInput).toHaveValue('custom all value');
+  });
+
+  it('should update variable state when changing the datasource', async () => {
+    const {
+      variable,
+      renderer: { getByTestId, getByText },
+      user,
+    } = await setup();
+
+    expect(variable.state.datasource).toEqual({ uid: 'mock-ds-2', type: 'test' });
+
+    await user.click(getByTestId(selectors.components.DataSourcePicker.inputV2));
+    await user.click(getByText(/prom/i));
+
+    await waitFor(async () => {
+      await lastValueFrom(variable.validateAndUpdate());
+    });
+
+    expect(variable.state.datasource).toEqual({ uid: 'mock-ds-3', type: 'prometheus' });
+    expect(variable.state.query).toBe('');
+    expect(variable.state.definition).toBe('');
+  });
+
+  it('should update the variable state when changing the query', async () => {
+    const {
+      variable,
+      renderer: { getByTestId },
+      user,
+    } = await setup();
+    const queryEditor = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsQueryInput
+    );
+
+    await waitFor(async () => {
+      await user.type(queryEditor, '-new');
+      await user.tab();
+      await lastValueFrom(variable.validateAndUpdate());
+    });
+
+    expect(variable.state.query).toEqual('my-query-new');
+    expect(onRunQueryMock).toHaveBeenCalledTimes(1);
+  });
+
+  it('should update the variable state when changing the regex', async () => {
+    const {
+      variable,
+      renderer: { getByTestId },
+      user,
+    } = await setup();
+    const regexInput = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsRegExInputV2
+    );
+
+    await waitFor(async () => {
+      await user.type(regexInput, '{backspace}?');
+      await user.tab();
+      await lastValueFrom(variable.validateAndUpdate());
+    });
+
+    expect(variable.state.regex).toBe('.?');
+  });
+
+  it('should update the variable state when changing the sort', async () => {
+    const {
+      variable,
+      renderer: { getByTestId },
+      user,
+    } = await setup();
+    const sortSelect = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsSortSelectV2
+    );
+
+    await waitFor(async () => {
+      await user.click(sortSelect);
+      const anotherOption = await screen.getByText('Alphabetical (desc)');
+      await user.click(anotherOption);
+      await lastValueFrom(variable.validateAndUpdate());
+    });
+
+    expect(variable.state.sort).toBe(VariableSort.alphabeticalDesc);
+  });
+
+  it('should update the variable query definition when changing the query', async () => {
+    const {
+      variable,
+      renderer: { getByTestId },
+      user,
+    } = await setup();
+    const queryEditor = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsQueryInput
+    );
+
+    await user.type(queryEditor, '-new');
+    await user.tab();
+
+    await waitFor(async () => {
+      await lastValueFrom(variable.validateAndUpdate());
+    });
+
+    expect(variable.state.definition).toEqual('my-query-new');
+
+    await user.clear(queryEditor);
+
+    await user.type(queryEditor, 'new definition');
+    await user.tab();
+
+    await waitFor(async () => {
+      await lastValueFrom(variable.validateAndUpdate());
+    });
+
+    expect(variable.state.definition).toEqual('new definition');
+
+    await user.clear(queryEditor);
+    await user.tab();
+
+    await waitFor(async () => {
+      await lastValueFrom(variable.validateAndUpdate());
+    });
+
+    expect(variable.state.definition).toEqual('');
+  });
+
+  it('should update the variable state when changing the refresh', async () => {
+    const {
+      variable,
+      renderer: { getByTestId },
+      user,
+    } = await setup();
+    const refreshSelect = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsRefreshSelectV2
+    );
+
+    await waitFor(async () => {
+      await user.click(refreshSelect);
+      const anotherOption = await screen.getByText('On time range change');
+      await user.click(anotherOption);
+      await lastValueFrom(variable.validateAndUpdate());
+    });
+
+    expect(variable.state.refresh).toBe(VariableRefresh.onTimeRangeChanged);
+  });
+
+  it('should update the variable state when changing the multi switch', async () => {
+    const {
+      variable,
+      renderer: { getByTestId },
+      user,
+    } = await setup();
+    const multiSwitch = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsMultiSwitch
+    );
+
+    await waitFor(async () => {
+      await user.click(multiSwitch);
+      await lastValueFrom(variable.validateAndUpdate());
+    });
+
+    expect(variable.state.isMulti).toBe(false);
+  });
+
+  it('should update the variable state when changing the include all switch', async () => {
+    const {
+      variable,
+      renderer: { getByTestId },
+      user,
+    } = await setup();
+    const includeAllSwitch = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsIncludeAllSwitch
+    );
+
+    await waitFor(async () => {
+      await user.click(includeAllSwitch);
+      await lastValueFrom(variable.validateAndUpdate());
+    });
+
+    expect(variable.state.includeAll).toBe(false);
+  });
+
+  it('should update the variable state when changing the all value', async () => {
+    const {
+      variable,
+      renderer: { getByTestId },
+      user,
+    } = await setup();
+    const allValueInput = getByTestId(
+      selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsCustomAllInput
+    );
+
+    await waitFor(async () => {
+      await user.type(allValueInput, ' and another value');
+      await user.tab();
+      await lastValueFrom(variable.validateAndUpdate());
+    });
+
+    expect(variable.state.allValue).toBe('custom all value and another value');
+  });
+});
diff --git a/public/app/features/dashboard-scene/settings/variables/editors/QueryVariableEditor.tsx b/public/app/features/dashboard-scene/settings/variables/editors/QueryVariableEditor.tsx
new file mode 100644
index 0000000000000..c0f64a0cb523f
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/editors/QueryVariableEditor.tsx
@@ -0,0 +1,82 @@
+import React, { FormEvent } from 'react';
+
+import { SelectableValue, DataSourceInstanceSettings } from '@grafana/data';
+import { QueryVariable, sceneGraph } from '@grafana/scenes';
+import { DataSourceRef, VariableRefresh, VariableSort } from '@grafana/schema';
+
+import { QueryVariableEditorForm } from '../components/QueryVariableForm';
+
+interface QueryVariableEditorProps {
+  variable: QueryVariable;
+  onRunQuery: () => void;
+}
+type VariableQueryType = QueryVariable['state']['query'];
+
+export function QueryVariableEditor({ variable, onRunQuery }: QueryVariableEditorProps) {
+  const { datasource, regex, sort, refresh, isMulti, includeAll, allValue, query } = variable.useState();
+  const { value: timeRange } = sceneGraph.getTimeRange(variable).useState();
+
+  const onRegExChange = (event: React.FormEvent<HTMLTextAreaElement>) => {
+    variable.setState({ regex: event.currentTarget.value });
+  };
+  const onSortChange = (sort: SelectableValue<VariableSort>) => {
+    variable.setState({ sort: sort.value });
+  };
+  const onRefreshChange = (refresh: VariableRefresh) => {
+    variable.setState({ refresh: refresh });
+  };
+  const onMultiChange = (event: FormEvent<HTMLInputElement>) => {
+    variable.setState({ isMulti: event.currentTarget.checked });
+  };
+  const onIncludeAllChange = (event: FormEvent<HTMLInputElement>) => {
+    variable.setState({ includeAll: event.currentTarget.checked });
+  };
+  const onAllValueChange = (event: FormEvent<HTMLInputElement>) => {
+    variable.setState({ allValue: event.currentTarget.value });
+  };
+  const onDataSourceChange = (dsInstanceSettings: DataSourceInstanceSettings) => {
+    const datasource: DataSourceRef = { uid: dsInstanceSettings.uid, type: dsInstanceSettings.type };
+
+    if (variable.state.datasource && variable.state.datasource.type !== datasource.type) {
+      variable.setState({ datasource, query: '', definition: '' });
+      return;
+    }
+
+    variable.setState({ datasource });
+  };
+  const onQueryChange = (query: VariableQueryType) => {
+    let definition: string;
+    if (typeof query === 'string') {
+      definition = query;
+    } else if (query.hasOwnProperty('query') && typeof query.query === 'string') {
+      definition = query.query;
+    } else {
+      definition = '';
+    }
+    variable.setState({ query, definition });
+    onRunQuery();
+  };
+
+  return (
+    <QueryVariableEditorForm
+      datasource={datasource ?? undefined}
+      onDataSourceChange={onDataSourceChange}
+      query={query}
+      onQueryChange={onQueryChange}
+      onLegacyQueryChange={onQueryChange}
+      timeRange={timeRange}
+      regex={regex}
+      onRegExChange={onRegExChange}
+      sort={sort}
+      onSortChange={onSortChange}
+      refresh={refresh}
+      onRefreshChange={onRefreshChange}
+      isMulti={!!isMulti}
+      onMultiChange={onMultiChange}
+      includeAll={!!includeAll}
+      onIncludeAllChange={onIncludeAllChange}
+      allValue={allValue ?? ''}
+      onAllValueChange={onAllValueChange}
+    />
+  );
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/editors/TextBoxVariableEditor.test.tsx b/public/app/features/dashboard-scene/settings/variables/editors/TextBoxVariableEditor.test.tsx
new file mode 100644
index 0000000000000..063a1d033f3a6
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/editors/TextBoxVariableEditor.test.tsx
@@ -0,0 +1,54 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { TextBoxVariable } from '@grafana/scenes';
+
+import { TextBoxVariableEditor } from './TextBoxVariableEditor';
+
+describe('TextBoxVariableEditor', () => {
+  let textBoxVar: TextBoxVariable;
+  beforeEach(async () => {
+    const result = await buildTestScene();
+    textBoxVar = result.textBoxVar;
+  });
+
+  it('renders default value if any', () => {
+    const onChange = jest.fn();
+    render(<TextBoxVariableEditor variable={textBoxVar} onChange={onChange} />);
+
+    const input = screen.getByRole('textbox', { name: 'Default value' });
+    expect(input).toBeInTheDocument();
+    expect(input).toHaveValue('initial value test');
+  });
+
+  it('changes the value', async () => {
+    const onChange = jest.fn();
+    render(<TextBoxVariableEditor variable={textBoxVar} onChange={onChange} />);
+
+    const input = screen.getByRole('textbox', { name: 'Default value' });
+    expect(input).toBeInTheDocument();
+    expect(input).toHaveValue('initial value test');
+
+    // change input value
+    const newValue = 'new textbox value';
+    await userEvent.clear(input);
+    await userEvent.type(input, newValue);
+
+    expect(input).toHaveValue(newValue);
+
+    await userEvent.tab();
+    expect(textBoxVar.state.value).toBe(newValue);
+  });
+});
+
+async function buildTestScene() {
+  const textBoxVar = new TextBoxVariable({
+    name: 'textBoxVar',
+    label: 'textBoxVar',
+    type: 'textbox',
+    value: 'initial value test',
+  });
+
+  return { textBoxVar };
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/editors/TextBoxVariableEditor.tsx b/public/app/features/dashboard-scene/settings/variables/editors/TextBoxVariableEditor.tsx
new file mode 100644
index 0000000000000..2f7bbe256efad
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/editors/TextBoxVariableEditor.tsx
@@ -0,0 +1,20 @@
+import React, { FormEvent } from 'react';
+
+import { TextBoxVariable } from '@grafana/scenes';
+
+import { TextBoxVariableForm } from '../components/TextBoxVariableForm';
+
+interface TextBoxVariableEditorProps {
+  variable: TextBoxVariable;
+  onChange: (variable: TextBoxVariable) => void;
+}
+
+export function TextBoxVariableEditor({ variable }: TextBoxVariableEditorProps) {
+  const { value } = variable.useState();
+
+  const onTextValueChange = (e: FormEvent<HTMLInputElement>) => {
+    variable.setState({ value: e.currentTarget.value });
+  };
+
+  return <TextBoxVariableForm defaultValue={value} onBlur={onTextValueChange} />;
+}
diff --git a/public/app/features/dashboard-scene/settings/variables/utils.test.ts b/public/app/features/dashboard-scene/settings/variables/utils.test.ts
new file mode 100644
index 0000000000000..2bc591aa0d400
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/utils.test.ts
@@ -0,0 +1,379 @@
+import { DataSourceApi } from '@grafana/data';
+import { config, setTemplateSrv, TemplateSrv } from '@grafana/runtime';
+import {
+  CustomVariable,
+  ConstantVariable,
+  IntervalVariable,
+  QueryVariable,
+  DataSourceVariable,
+  AdHocFiltersVariable,
+  GroupByVariable,
+  TextBoxVariable,
+  SceneVariableSet,
+} from '@grafana/scenes';
+import { DataQuery, DataSourceJsonData, VariableHide, VariableType } from '@grafana/schema';
+import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard';
+import { DASHBOARD_DATASOURCE_PLUGIN_ID } from 'app/plugins/datasource/dashboard/types';
+
+import { AdHocFiltersVariableEditor } from './editors/AdHocFiltersVariableEditor';
+import { ConstantVariableEditor } from './editors/ConstantVariableEditor';
+import { CustomVariableEditor } from './editors/CustomVariableEditor';
+import { DataSourceVariableEditor } from './editors/DataSourceVariableEditor';
+import { GroupByVariableEditor } from './editors/GroupByVariableEditor';
+import { IntervalVariableEditor } from './editors/IntervalVariableEditor';
+import { QueryVariableEditor } from './editors/QueryVariableEditor';
+import { TextBoxVariableEditor } from './editors/TextBoxVariableEditor';
+import {
+  isEditableVariableType,
+  EDITABLE_VARIABLES,
+  EDITABLE_VARIABLES_SELECT_ORDER,
+  getVariableTypeSelectOptions,
+  getVariableEditor,
+  getVariableScene,
+  hasVariableOptions,
+  EditableVariableType,
+  getDefinition,
+  getOptionDataSourceTypes,
+  getNextAvailableId,
+  getVariableDefault,
+  isSceneVariableInstance,
+} from './utils';
+
+const templateSrv = {
+  getAdhocFilters: jest.fn().mockReturnValue([{ key: 'origKey', operator: '=', value: '' }]),
+} as unknown as TemplateSrv;
+
+const dsMock: DataSourceApi = {
+  meta: {
+    id: DASHBOARD_DATASOURCE_PLUGIN_ID,
+  },
+  name: SHARED_DASHBOARD_QUERY,
+  type: SHARED_DASHBOARD_QUERY,
+  uid: SHARED_DASHBOARD_QUERY,
+  getRef: () => {
+    return { type: SHARED_DASHBOARD_QUERY, uid: SHARED_DASHBOARD_QUERY };
+  },
+} as DataSourceApi<DataQuery, DataSourceJsonData, {}>;
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getDataSourceSrv: () => ({
+    get: async () => dsMock,
+    getList: () => {
+      return [
+        {
+          name: 'DataSourceInstance1',
+          uid: 'ds1',
+          meta: {
+            name: 'ds1',
+            id: 'dsTestDataSource',
+          },
+        },
+      ];
+    },
+  }),
+}));
+
+describe('isEditableVariableType', () => {
+  it('should return true for editable variable types', () => {
+    const editableTypes: VariableType[] = [
+      'custom',
+      'query',
+      'constant',
+      'interval',
+      'datasource',
+      'adhoc',
+      'groupby',
+      'textbox',
+    ];
+    editableTypes.forEach((type) => {
+      expect(isEditableVariableType(type)).toBe(true);
+    });
+  });
+
+  it('should return false for non-editable variable types', () => {
+    const nonEditableTypes: VariableType[] = ['system'];
+    nonEditableTypes.forEach((type) => {
+      expect(isEditableVariableType(type)).toBe(false);
+    });
+  });
+});
+
+describe('isSceneVariableInstance', () => {
+  it.each([
+    CustomVariable,
+    QueryVariable,
+    ConstantVariable,
+    IntervalVariable,
+    DataSourceVariable,
+    AdHocFiltersVariable,
+    GroupByVariable,
+    TextBoxVariable,
+  ])('should return true for scene variable instances %s', (instanceType) => {
+    const variable = new instanceType({ name: 'MyVariable' });
+    expect(isSceneVariableInstance(variable)).toBe(true);
+  });
+
+  it('should return false for non-scene variable instances', () => {
+    const variable = {
+      name: 'MyVariable',
+      type: 'query',
+    };
+    expect(variable).not.toBeInstanceOf(QueryVariable);
+  });
+});
+
+describe('getVariableTypeSelectOptions', () => {
+  describe('when groupByVariable is enabled', () => {
+    beforeAll(() => {
+      config.featureToggles.groupByVariable = true;
+    });
+
+    afterAll(() => {
+      config.featureToggles.groupByVariable = false;
+    });
+
+    it('should contain all editable variable types', () => {
+      const options = getVariableTypeSelectOptions();
+      expect(options).toHaveLength(Object.keys(EDITABLE_VARIABLES).length);
+
+      EDITABLE_VARIABLES_SELECT_ORDER.forEach((type) => {
+        expect(EDITABLE_VARIABLES).toHaveProperty(type);
+      });
+    });
+
+    it('should return an array of selectable values for editable variable types', () => {
+      const options = getVariableTypeSelectOptions();
+      expect(options).toHaveLength(8);
+
+      options.forEach((option, index) => {
+        const editableType = EDITABLE_VARIABLES_SELECT_ORDER[index];
+        const variableTypeConfig = EDITABLE_VARIABLES[editableType];
+
+        expect(option.value).toBe(editableType);
+        expect(option.label).toBe(variableTypeConfig.name);
+        expect(option.description).toBe(variableTypeConfig.description);
+      });
+    });
+  });
+
+  describe('when groupByVariable is disabled', () => {
+    it('should contain all editable variable types except groupby', () => {
+      const options = getVariableTypeSelectOptions();
+      expect(options).toHaveLength(Object.keys(EDITABLE_VARIABLES).length - 1);
+
+      EDITABLE_VARIABLES_SELECT_ORDER.forEach((type) => {
+        expect(EDITABLE_VARIABLES).toHaveProperty(type);
+      });
+    });
+
+    it('should return an array of selectable values for editable variable types', () => {
+      const options = getVariableTypeSelectOptions();
+      expect(options).toHaveLength(7);
+
+      options.forEach((option, index) => {
+        const editableType = EDITABLE_VARIABLES_SELECT_ORDER[index];
+        const variableTypeConfig = EDITABLE_VARIABLES[editableType];
+
+        expect(option.value).toBe(editableType);
+        expect(option.label).toBe(variableTypeConfig.name);
+        expect(option.description).toBe(variableTypeConfig.description);
+      });
+    });
+  });
+});
+
+describe('getVariableEditor', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it.each(Object.keys(EDITABLE_VARIABLES) as EditableVariableType[])(
+    'should define an editor for variable type "%s"',
+    (type) => {
+      const editor = getVariableEditor(type);
+      expect(editor).toBeDefined();
+    }
+  );
+
+  it.each([
+    ['custom', CustomVariableEditor],
+    ['query', QueryVariableEditor],
+    ['constant', ConstantVariableEditor],
+    ['interval', IntervalVariableEditor],
+    ['datasource', DataSourceVariableEditor],
+    ['adhoc', AdHocFiltersVariableEditor],
+    ['groupby', GroupByVariableEditor],
+    ['textbox', TextBoxVariableEditor],
+  ])('should return the correct editor for variable type "%s"', (type, ExpectedVariableEditor) => {
+    expect(getVariableEditor(type as EditableVariableType)).toBe(ExpectedVariableEditor);
+  });
+});
+
+describe('getVariableScene', () => {
+  beforeAll(() => {
+    setTemplateSrv(templateSrv);
+  });
+
+  it.each(Object.keys(EDITABLE_VARIABLES) as EditableVariableType[])(
+    'should define a scene object for every variable type',
+    (type) => {
+      const variable = getVariableScene(type, { name: 'foo' });
+      expect(variable).toBeDefined();
+    }
+  );
+
+  it.each([
+    ['custom', CustomVariable],
+    ['query', QueryVariable],
+    ['interval', IntervalVariable],
+    ['datasource', DataSourceVariable],
+    ['adhoc', AdHocFiltersVariable],
+    ['groupby', GroupByVariable],
+    ['textbox', TextBoxVariable],
+  ])('should return the scene variable instance for the given editable variable type', (type, instanceType) => {
+    const initialState = { name: 'MyVariable' };
+    const sceneVariable = getVariableScene(type as EditableVariableType, initialState);
+    expect(sceneVariable).toBeInstanceOf(instanceType);
+    expect(sceneVariable.state.name).toBe(initialState.name);
+    expect(sceneVariable.state.hide).toBe(undefined);
+  });
+
+  it('should return the scene variable instance for the constant editable variable type', () => {
+    const initialState = { name: 'MyVariable' };
+    const sceneVariable = getVariableScene('constant' as EditableVariableType, initialState);
+    expect(sceneVariable).toBeInstanceOf(ConstantVariable);
+    expect(sceneVariable.state.name).toBe(initialState.name);
+    expect(sceneVariable.state.hide).toBe(VariableHide.hideVariable);
+  });
+});
+
+describe('hasVariableOptions', () => {
+  it('should return true for scene variables with options property', () => {
+    const variableWithOptions = new CustomVariable({
+      name: 'MyVariable',
+      options: [{ value: 'option1', label: 'Option 1' }],
+    });
+    expect(hasVariableOptions(variableWithOptions)).toBe(true);
+  });
+
+  it('should return false for scene variables without options property', () => {
+    const variableWithoutOptions = new ConstantVariable({ name: 'MyVariable' });
+    expect(hasVariableOptions(variableWithoutOptions)).toBe(false);
+  });
+});
+
+describe('getDefinition', () => {
+  it('returns the correct definition for QueryVariable when definition is defined', () => {
+    const model = new QueryVariable({
+      name: 'custom0',
+      query: '',
+      definition: 'legacy ABC query definition',
+    });
+    expect(getDefinition(model)).toBe('legacy ABC query definition');
+  });
+
+  it('returns the correct definition for QueryVariable when definition is not defined', () => {
+    const model = new QueryVariable({
+      name: 'custom0',
+      query: 'ABC query',
+      definition: '',
+    });
+    expect(getDefinition(model)).toBe('ABC query');
+  });
+
+  it('returns the correct definition for DataSourceVariable', () => {
+    const model = new DataSourceVariable({
+      name: 'ds0',
+      pluginId: 'datasource-plugin',
+      value: 'datasource-value',
+    });
+    expect(getDefinition(model)).toBe('datasource-plugin');
+  });
+
+  it('returns the correct definition for CustomVariable', () => {
+    const model = new CustomVariable({
+      name: 'custom0',
+      query: 'Custom, A, B, C',
+    });
+    expect(getDefinition(model)).toBe('Custom, A, B, C');
+  });
+
+  it('returns the correct definition for IntervalVariable', () => {
+    const model = new IntervalVariable({
+      name: 'interval0',
+      intervals: ['1m', '5m', '15m', '30m', '1h', '6h', '12h', '1d'],
+    });
+    expect(getDefinition(model)).toBe('1m,5m,15m,30m,1h,6h,12h,1d');
+  });
+
+  it('returns the correct definition for TextBoxVariable', () => {
+    const model = new TextBoxVariable({
+      name: 'textbox0',
+      value: 'TextBox Value',
+    });
+    expect(getDefinition(model)).toBe('TextBox Value');
+  });
+
+  it('returns the correct definition for ConstantVariable', () => {
+    const model = new ConstantVariable({
+      name: 'constant0',
+      value: 'Constant Value',
+    });
+    expect(getDefinition(model)).toBe('Constant Value');
+  });
+});
+
+describe('getOptionDataSourceTypes', () => {
+  it('should return all data source types when no data source types are specified', () => {
+    const optionTypes = getOptionDataSourceTypes();
+    expect(optionTypes).toHaveLength(2);
+    // in the old code we always had an empty option
+    expect(optionTypes[0].value).toBe('');
+    expect(optionTypes[1].label).toBe('ds1');
+  });
+});
+
+describe('getNextAvailableId', () => {
+  it('should return the initial ID for an empty array', () => {
+    const sceneVariables = new SceneVariableSet({
+      variables: [],
+    });
+
+    expect(getNextAvailableId('query', sceneVariables.state.variables)).toBe('query0');
+  });
+
+  it('should return a non-conflicting ID for a non-empty array', () => {
+    const variable = new QueryVariable({
+      name: 'query0',
+      label: 'test-label',
+      description: 'test-desc',
+      value: ['selected-value'],
+      text: ['selected-value-text'],
+      datasource: { uid: 'fake-std', type: 'fake-std' },
+      query: 'query',
+      includeAll: true,
+      allValue: 'test-all',
+      isMulti: true,
+    });
+
+    const sceneVariables = new SceneVariableSet({
+      variables: [variable],
+    });
+
+    expect(getNextAvailableId('query', sceneVariables.state.variables)).toBe('query1');
+  });
+});
+
+describe('getVariableDefault', () => {
+  it('should return a QueryVariable instance with the correct name', () => {
+    const sceneVariables = new SceneVariableSet({
+      variables: [],
+    });
+
+    const defaultVariable = getVariableDefault(sceneVariables.state.variables);
+
+    expect(defaultVariable).toBeInstanceOf(QueryVariable);
+    expect(defaultVariable.state.name).toBe('query0');
+  });
+});
diff --git a/public/app/features/dashboard-scene/settings/variables/utils.ts b/public/app/features/dashboard-scene/settings/variables/utils.ts
new file mode 100644
index 0000000000000..c7f5fb69588c0
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/variables/utils.ts
@@ -0,0 +1,223 @@
+import { chain } from 'lodash';
+
+import { DataSourceInstanceSettings, SelectableValue } from '@grafana/data';
+import { config, getDataSourceSrv } from '@grafana/runtime';
+import {
+  ConstantVariable,
+  CustomVariable,
+  DataSourceVariable,
+  IntervalVariable,
+  TextBoxVariable,
+  QueryVariable,
+  GroupByVariable,
+  SceneVariable,
+  MultiValueVariable,
+  sceneUtils,
+  SceneObject,
+  AdHocFiltersVariable,
+  SceneVariableState,
+} from '@grafana/scenes';
+import { VariableHide, VariableType } from '@grafana/schema';
+
+import { getIntervalsQueryFromNewIntervalModel } from '../../utils/utils';
+
+import { AdHocFiltersVariableEditor } from './editors/AdHocFiltersVariableEditor';
+import { ConstantVariableEditor } from './editors/ConstantVariableEditor';
+import { CustomVariableEditor } from './editors/CustomVariableEditor';
+import { DataSourceVariableEditor } from './editors/DataSourceVariableEditor';
+import { GroupByVariableEditor } from './editors/GroupByVariableEditor';
+import { IntervalVariableEditor } from './editors/IntervalVariableEditor';
+import { QueryVariableEditor } from './editors/QueryVariableEditor';
+import { TextBoxVariableEditor } from './editors/TextBoxVariableEditor';
+
+interface EditableVariableConfig {
+  name: string;
+  description: string;
+  editor: React.ComponentType<any>;
+}
+
+export type EditableVariableType = Exclude<VariableType, 'system'>;
+
+export function isEditableVariableType(type: VariableType): type is EditableVariableType {
+  return type !== 'system';
+}
+
+export const EDITABLE_VARIABLES: Record<EditableVariableType, EditableVariableConfig> = {
+  custom: {
+    name: 'Custom',
+    description: 'Define variable values manually',
+    editor: CustomVariableEditor,
+  },
+  query: {
+    name: 'Query',
+    description: 'Variable values are fetched from a datasource query',
+    editor: QueryVariableEditor,
+  },
+  constant: {
+    name: 'Constant',
+    description: 'Define a hidden constant variable, useful for metric prefixes in dashboards you want to share',
+    editor: ConstantVariableEditor,
+  },
+  interval: {
+    name: 'Interval',
+    description: 'Define a timespan interval (ex 1m, 1h, 1d)',
+    editor: IntervalVariableEditor,
+  },
+  datasource: {
+    name: 'Data source',
+    description: 'Enables you to dynamically switch the data source for multiple panels',
+    editor: DataSourceVariableEditor,
+  },
+  adhoc: {
+    name: 'Ad hoc filters',
+    description: 'Add key/value filters on the fly',
+    editor: AdHocFiltersVariableEditor,
+  },
+  groupby: {
+    name: 'Group by',
+    description: 'Add keys to group by on the fly',
+    editor: GroupByVariableEditor,
+  },
+  textbox: {
+    name: 'Textbox',
+    description: 'Define a textbox variable, where users can enter any arbitrary string',
+    editor: TextBoxVariableEditor,
+  },
+};
+
+export const EDITABLE_VARIABLES_SELECT_ORDER: EditableVariableType[] = [
+  'query',
+  'custom',
+  'textbox',
+  'constant',
+  'datasource',
+  'interval',
+  'adhoc',
+  'groupby',
+];
+
+export function getVariableTypeSelectOptions(): Array<SelectableValue<EditableVariableType>> {
+  const results = EDITABLE_VARIABLES_SELECT_ORDER.map((variableType) => ({
+    label: EDITABLE_VARIABLES[variableType].name,
+    value: variableType,
+    description: EDITABLE_VARIABLES[variableType].description,
+  }));
+
+  if (!config.featureToggles.groupByVariable) {
+    // Remove group by variable type if feature toggle is off
+    return results.filter((option) => option.value !== 'groupby');
+  }
+
+  return results;
+}
+
+export function getVariableEditor(type: EditableVariableType) {
+  return EDITABLE_VARIABLES[type].editor;
+}
+
+interface CommonVariableProperties {
+  name: string;
+  label?: string;
+}
+
+export function getVariableScene(type: EditableVariableType, initialState: CommonVariableProperties) {
+  switch (type) {
+    case 'custom':
+      return new CustomVariable(initialState);
+    case 'query':
+      return new QueryVariable(initialState);
+    case 'constant':
+      return new ConstantVariable({ ...initialState, hide: VariableHide.hideVariable });
+    case 'interval':
+      return new IntervalVariable(initialState);
+    case 'datasource':
+      return new DataSourceVariable(initialState);
+    case 'adhoc':
+      return new AdHocFiltersVariable(initialState);
+    case 'groupby':
+      return new GroupByVariable(initialState);
+    case 'textbox':
+      return new TextBoxVariable(initialState);
+  }
+}
+
+export function getVariableDefault(variables: Array<SceneVariable<SceneVariableState>>) {
+  const defaultVariableType = 'query';
+  const nextVariableIdName = getNextAvailableId(defaultVariableType, variables);
+  return new QueryVariable({
+    name: nextVariableIdName,
+  });
+}
+
+export function getNextAvailableId(type: VariableType, variables: Array<SceneVariable<SceneVariableState>>): string {
+  let counter = 0;
+  let nextId = `${type}${counter}`;
+
+  while (variables.find((variable) => variable.state.name === nextId)) {
+    nextId = `${type}${++counter}`;
+  }
+
+  return nextId;
+}
+
+export function hasVariableOptions(variable: SceneVariable): variable is MultiValueVariable {
+  // variable options can be defined by state.options or state.intervals in case of interval variable
+  return 'options' in variable.state || 'intervals' in variable.state;
+}
+
+export function getDefinition(model: SceneVariable): string {
+  let definition = '';
+
+  if (model instanceof QueryVariable) {
+    definition = model.state.definition || (typeof model.state.query === 'string' ? model.state.query : '');
+  } else if (model instanceof DataSourceVariable) {
+    definition = String(model.state.pluginId);
+  } else if (model instanceof CustomVariable) {
+    definition = model.state.query;
+  } else if (model instanceof IntervalVariable) {
+    definition = getIntervalsQueryFromNewIntervalModel(model.state.intervals);
+  } else if (model instanceof TextBoxVariable || model instanceof ConstantVariable) {
+    definition = String(model.state.value);
+  }
+
+  return definition;
+}
+
+export function getOptionDataSourceTypes() {
+  const datasources = getDataSourceSrv().getList({ metrics: true, variables: true });
+
+  const optionTypes = chain(datasources)
+    .uniqBy('meta.id')
+    .map((ds: DataSourceInstanceSettings) => {
+      return { label: ds.meta.name, value: ds.meta.id };
+    })
+    .value();
+
+  optionTypes.unshift({ label: '', value: '' });
+
+  return optionTypes;
+}
+
+function isSceneVariable(sceneObject: SceneObject): sceneObject is SceneVariable {
+  return 'type' in sceneObject.state && 'getValue' in sceneObject;
+}
+
+export function isSceneVariableInstance(sceneObject: SceneObject): sceneObject is SceneVariable {
+  if (!isSceneVariable(sceneObject)) {
+    return false;
+  }
+
+  return (
+    sceneUtils.isAdHocVariable(sceneObject) ||
+    sceneUtils.isConstantVariable(sceneObject) ||
+    sceneUtils.isCustomVariable(sceneObject) ||
+    sceneUtils.isDataSourceVariable(sceneObject) ||
+    sceneUtils.isIntervalVariable(sceneObject) ||
+    sceneUtils.isQueryVariable(sceneObject) ||
+    sceneUtils.isTextBoxVariable(sceneObject) ||
+    sceneUtils.isGroupByVariable(sceneObject)
+  );
+}
+
+export const RESERVED_GLOBAL_VARIABLE_NAME_REGEX = /^(?!__).*$/;
+export const WORD_CHARACTERS_REGEX = /^\w+$/;
diff --git a/public/app/features/dashboard/components/VersionHistory/DiffGroup.tsx b/public/app/features/dashboard-scene/settings/version-history/DiffGroup.tsx
similarity index 78%
rename from public/app/features/dashboard/components/VersionHistory/DiffGroup.tsx
rename to public/app/features/dashboard-scene/settings/version-history/DiffGroup.tsx
index 5e5896e0ca0c3..cbded5fd9ce3e 100644
--- a/public/app/features/dashboard/components/VersionHistory/DiffGroup.tsx
+++ b/public/app/features/dashboard-scene/settings/version-history/DiffGroup.tsx
@@ -42,16 +42,14 @@ export const DiffGroup = ({ diffs, title }: DiffGroupProps) => {
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  container: css`
-    background-color: ${theme.colors.background.secondary};
-    font-size: ${theme.typography.h6.fontSize};
-    margin-bottom: ${theme.spacing(2)};
-    padding: ${theme.spacing(2)};
-  `,
-  list: css`
-    margin-left: ${theme.spacing(4)};
-  `,
-  listItem: css`
-    margin-bottom: ${theme.spacing(1)};
-  `,
+  container: css({}),
+  list: css({
+    marginLeft: theme.spacing(4),
+  }),
+  listItem: css({
+    marginBottom: theme.spacing(1),
+    '&:last-child': {
+      marginBottom: 0,
+    },
+  }),
 });
diff --git a/public/app/features/dashboard-scene/settings/version-history/DiffTitle.tsx b/public/app/features/dashboard-scene/settings/version-history/DiffTitle.tsx
new file mode 100644
index 0000000000000..e1bfa6b3aa181
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/version-history/DiffTitle.tsx
@@ -0,0 +1,69 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { useStyles2, Icon } from '@grafana/ui';
+
+import { DiffValues } from './DiffValues';
+import { Diff, getDiffText } from './utils';
+
+type DiffTitleProps = {
+  diff?: Diff;
+  title: string;
+};
+
+const replaceDiff: Diff = {
+  op: 'replace',
+  originalValue: undefined,
+  path: [''],
+  value: undefined,
+  startLineNumber: 0,
+  endLineNumber: 0,
+};
+
+export const DiffTitle = ({ diff, title }: DiffTitleProps) => {
+  const styles = useStyles2(getDiffTitleStyles);
+
+  return diff ? (
+    <>
+      <Icon type="mono" name="circle" className={styles[diff.op]} size="xs" />{' '}
+      <span className={styles.embolden}>{title}</span> <span>{getDiffText(diff, diff.path.length > 1)}</span>{' '}
+      <DiffValues diff={diff} />
+    </>
+  ) : (
+    <div className={styles.withoutDiff}>
+      <Icon type="mono" name="circle" className={styles.replace} size="xs" />{' '}
+      <span className={styles.embolden}>{title}</span> <span>{getDiffText(replaceDiff, false)}</span>
+    </div>
+  );
+};
+
+const getDiffTitleStyles = (theme: GrafanaTheme2) => ({
+  embolden: css({
+    fontWeight: theme.typography.fontWeightBold,
+  }),
+  add: css({
+    color: theme.colors.success.main,
+  }),
+  replace: css({
+    color: theme.colors.success.main,
+  }),
+  move: css({
+    color: theme.colors.success.main,
+  }),
+  copy: css({
+    color: theme.colors.success.main,
+  }),
+  _get: css({
+    color: theme.colors.success.main,
+  }),
+  test: css({
+    color: theme.colors.success.main,
+  }),
+  remove: css({
+    color: theme.colors.success.main,
+  }),
+  withoutDiff: css({
+    marginBottom: theme.spacing(1),
+  }),
+});
diff --git a/public/app/features/dashboard-scene/settings/version-history/DiffValues.tsx b/public/app/features/dashboard-scene/settings/version-history/DiffValues.tsx
new file mode 100644
index 0000000000000..c9ff1247f9020
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/version-history/DiffValues.tsx
@@ -0,0 +1,37 @@
+import { css } from '@emotion/css';
+import { isArray, isObject, isUndefined } from 'lodash';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { useStyles2, Icon } from '@grafana/ui';
+
+import { Diff } from './utils';
+
+type DiffProps = {
+  diff: Diff;
+};
+
+export const DiffValues = ({ diff }: DiffProps) => {
+  const styles = useStyles2(getStyles);
+  const hasLeftValue =
+    !isUndefined(diff.originalValue) && !isArray(diff.originalValue) && !isObject(diff.originalValue);
+  const hasRightValue = !isUndefined(diff.value) && !isArray(diff.value) && !isObject(diff.value);
+
+  return (
+    <>
+      {hasLeftValue && <span className={styles}>{String(diff.originalValue)}</span>}
+      {hasLeftValue && hasRightValue ? <Icon name="arrow-right" /> : null}
+      {hasRightValue && <span className={styles}>{String(diff.value)}</span>}
+    </>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) =>
+  css({
+    backgroundColor: theme.colors.action.hover,
+    borderRadius: theme.shape.radius.default,
+    color: theme.colors.text.primary,
+    fontSize: theme.typography.body.fontSize,
+    margin: theme.spacing(0, 0.5),
+    padding: theme.spacing(0.25, 0.5),
+  });
diff --git a/public/app/features/dashboard/components/VersionHistory/DiffViewer.tsx b/public/app/features/dashboard-scene/settings/version-history/DiffViewer.tsx
similarity index 90%
rename from public/app/features/dashboard/components/VersionHistory/DiffViewer.tsx
rename to public/app/features/dashboard-scene/settings/version-history/DiffViewer.tsx
index b12014aa44814..27ce79b8c824d 100644
--- a/public/app/features/dashboard/components/VersionHistory/DiffViewer.tsx
+++ b/public/app/features/dashboard-scene/settings/version-history/DiffViewer.tsx
@@ -42,23 +42,23 @@ export const DiffViewer = ({ oldValue, newValue }: ReactDiffViewerProps) => {
     codeFold: {
       fontSize: theme.typography.bodySmall.fontSize,
     },
-    gutter: `
-      pre {
-        color: ${tinycolor(theme.colors.text.disabled).setAlpha(1).toString()};
-        opacity: 0.61;
-      }
-    `,
+    gutter: {
+      pre: {
+        color: tinycolor(theme.colors.text.disabled).setAlpha(1).toString(),
+        opacity: 0.61,
+      },
+    },
   };
 
   return (
     <div
-      className={css`
-        font-size: ${theme.typography.bodySmall.fontSize};
+      className={css({
+        fontSize: theme.typography.bodySmall.fontSize,
         // prevent global styles interfering with diff viewer
-        pre {
-          all: revert;
-        }
-      `}
+        pre: {
+          all: 'revert',
+        },
+      })}
     >
       <ReactDiffViewer
         styles={styles}
diff --git a/public/app/features/dashboard-scene/settings/version-history/HistorySrv.test.ts b/public/app/features/dashboard-scene/settings/version-history/HistorySrv.test.ts
new file mode 100644
index 0000000000000..c2caee31a0e3f
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/version-history/HistorySrv.test.ts
@@ -0,0 +1,97 @@
+import { createDashboardModelFixture } from 'app/features/dashboard/state/__fixtures__/dashboardFixtures';
+
+import { HistorySrv } from './HistorySrv';
+import { restore, versions } from './__mocks__/dashboardHistoryMocks';
+
+const getMock = jest.fn().mockResolvedValue({});
+const postMock = jest.fn().mockResolvedValue({});
+
+jest.mock('app/core/store', () => ({
+  get: jest.fn(),
+  getObject: jest.fn((_a, b) => b),
+}));
+
+jest.mock('@grafana/runtime', () => {
+  const original = jest.requireActual('@grafana/runtime');
+
+  return {
+    ...original,
+    getBackendSrv: () => ({
+      post: postMock,
+      get: getMock,
+    }),
+  };
+});
+
+describe('historySrv', () => {
+  const versionsResponse = versions();
+  const restoreResponse = restore;
+
+  let historySrv = new HistorySrv();
+
+  const dash = createDashboardModelFixture({ uid: '_U4zObQMz' });
+  const emptyDash = createDashboardModelFixture();
+  const historyListOpts = { limit: 10, start: 0 };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('getHistoryList', () => {
+    it('should return a versions array for the given dashboard id', () => {
+      getMock.mockImplementation(() => Promise.resolve(versionsResponse));
+      historySrv = new HistorySrv();
+
+      return historySrv.getHistoryList(dash.uid, historyListOpts).then((versions) => {
+        expect(versions).toEqual(versionsResponse);
+      });
+    });
+
+    it('should return an empty array when not given an id', () => {
+      return historySrv.getHistoryList(emptyDash.uid, historyListOpts).then((versions) => {
+        expect(versions).toEqual([]);
+      });
+    });
+
+    it('should return an empty array when not given a dashboard id', () => {
+      return historySrv.getHistoryList(null as unknown as string, historyListOpts).then((versions) => {
+        expect(versions).toEqual([]);
+      });
+    });
+  });
+
+  describe('getDashboardVersion', () => {
+    it('should return a version object for the given dashboard id and version', () => {
+      getMock.mockImplementation(() => Promise.resolve(versionsResponse[0]));
+      historySrv = new HistorySrv();
+
+      return historySrv.getDashboardVersion(dash.uid, 4).then((version) => {
+        expect(version).toEqual(versionsResponse[0]);
+      });
+    });
+
+    it('should return an empty object when not given an id', async () => {
+      historySrv = new HistorySrv();
+
+      const rsp = await historySrv.getDashboardVersion(emptyDash.uid, 6);
+      expect(rsp).toEqual({});
+    });
+  });
+
+  describe('restoreDashboard', () => {
+    it('should return a success response given valid parameters', () => {
+      const version = 6;
+      postMock.mockImplementation(() => Promise.resolve(restoreResponse(version)));
+      historySrv = new HistorySrv();
+      return historySrv.restoreDashboard(dash.uid, version).then((response) => {
+        expect(response).toEqual(restoreResponse(version));
+      });
+    });
+
+    it('should return an empty object when not given an id', async () => {
+      historySrv = new HistorySrv();
+      const rsp = await historySrv.restoreDashboard(emptyDash.uid, 6);
+      expect(rsp).toEqual({});
+    });
+  });
+});
diff --git a/public/app/features/dashboard-scene/settings/version-history/HistorySrv.ts b/public/app/features/dashboard-scene/settings/version-history/HistorySrv.ts
new file mode 100644
index 0000000000000..61312b8ad45e4
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/version-history/HistorySrv.ts
@@ -0,0 +1,50 @@
+import { getBackendSrv } from '@grafana/runtime';
+import { Dashboard } from '@grafana/schema';
+
+export interface HistoryListOpts {
+  limit: number;
+  start: number;
+}
+
+export interface RevisionsModel {
+  id: number;
+  checked: boolean;
+  uid: string;
+  parentVersion: number;
+  version: number;
+  created: Date;
+  createdBy: string;
+  message: string;
+  data: Dashboard;
+}
+
+export class HistorySrv {
+  getHistoryList(dashboardUID: string, options: HistoryListOpts) {
+    if (typeof dashboardUID !== 'string') {
+      return Promise.resolve([]);
+    }
+
+    return getBackendSrv().get(`api/dashboards/uid/${dashboardUID}/versions`, options);
+  }
+
+  getDashboardVersion(dashboardUID: string, version: number) {
+    if (typeof dashboardUID !== 'string') {
+      return Promise.resolve({});
+    }
+
+    return getBackendSrv().get(`api/dashboards/uid/${dashboardUID}/versions/${version}`);
+  }
+
+  restoreDashboard(dashboardUID: string, version: number) {
+    if (typeof dashboardUID !== 'string') {
+      return Promise.resolve({});
+    }
+
+    const url = `api/dashboards/uid/${dashboardUID}/restore`;
+
+    return getBackendSrv().post(url, { version });
+  }
+}
+
+const historySrv = new HistorySrv();
+export { historySrv };
diff --git a/public/app/features/dashboard-scene/settings/version-history/RevertDashboardModal.tsx b/public/app/features/dashboard-scene/settings/version-history/RevertDashboardModal.tsx
new file mode 100644
index 0000000000000..6d27baf3f173f
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/version-history/RevertDashboardModal.tsx
@@ -0,0 +1,44 @@
+import React from 'react';
+
+import { ConfirmModal } from '@grafana/ui';
+import { useAppNotification } from 'app/core/copy/appNotification';
+
+import { DecoratedRevisionModel } from '../VersionsEditView';
+
+export interface RevertDashboardModalProps {
+  hideModal: () => void;
+  onRestore: (version: DecoratedRevisionModel) => Promise<boolean>;
+  version: DecoratedRevisionModel;
+}
+
+export const RevertDashboardModal = ({ hideModal, onRestore, version }: RevertDashboardModalProps) => {
+  const notifyApp = useAppNotification();
+
+  const onRestoreDashboard = async () => {
+    const success = await onRestore(version);
+
+    if (success) {
+      notifyApp.success('Dashboard restored', `Restored from version ${version.version}`);
+    } else {
+      notifyApp.error('Dashboard restore failed', `Failed to restore from version ${version.version}`);
+    }
+
+    hideModal();
+  };
+
+  return (
+    <ConfirmModal
+      isOpen={true}
+      title="Restore Version"
+      icon="history"
+      onDismiss={hideModal}
+      onConfirm={onRestoreDashboard}
+      body={
+        <p>
+          Are you sure you want to restore the dashboard to version {version.version}? All unsaved changes will be lost.
+        </p>
+      }
+      confirmText={`Yes, restore to version ${version.version}`}
+    />
+  );
+};
diff --git a/public/app/features/dashboard/components/VersionHistory/VersionHistoryButtons.tsx b/public/app/features/dashboard-scene/settings/version-history/VersionHistoryButtons.tsx
similarity index 88%
rename from public/app/features/dashboard/components/VersionHistory/VersionHistoryButtons.tsx
rename to public/app/features/dashboard-scene/settings/version-history/VersionHistoryButtons.tsx
index e39fc70ac7a25..073b9c64d8dde 100644
--- a/public/app/features/dashboard/components/VersionHistory/VersionHistoryButtons.tsx
+++ b/public/app/features/dashboard-scene/settings/version-history/VersionHistoryButtons.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 
-import { Stack } from '@grafana/experimental';
-import { Tooltip, Button } from '@grafana/ui';
+import { Tooltip, Button, Stack } from '@grafana/ui';
 
 type VersionsButtonsType = {
   hasMore: boolean;
diff --git a/public/app/features/dashboard-scene/settings/version-history/VersionHistoryComparison.tsx b/public/app/features/dashboard-scene/settings/version-history/VersionHistoryComparison.tsx
new file mode 100644
index 0000000000000..7faaaa587b50c
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/version-history/VersionHistoryComparison.tsx
@@ -0,0 +1,85 @@
+import { css, cx } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Button, ModalsController, CollapsableSection, useStyles2, Stack, Icon, Box } from '@grafana/ui';
+
+import { DecoratedRevisionModel } from '../VersionsEditView';
+
+import { DiffGroup } from './DiffGroup';
+import { DiffViewer } from './DiffViewer';
+import { RevertDashboardModal } from './RevertDashboardModal';
+import { jsonDiff } from './utils';
+
+type DiffViewProps = {
+  isNewLatest: boolean;
+  newInfo: DecoratedRevisionModel;
+  baseInfo: DecoratedRevisionModel;
+  diffData: { lhs: string; rhs: string };
+  onRestore: (version: DecoratedRevisionModel) => Promise<boolean>;
+};
+
+export const VersionHistoryComparison = ({ baseInfo, newInfo, diffData, isNewLatest, onRestore }: DiffViewProps) => {
+  const diff = jsonDiff(diffData.lhs, diffData.rhs);
+  const styles = useStyles2(getStyles);
+
+  return (
+    <Stack direction="column" gap={1}>
+      <Stack justifyContent="space-between" alignItems="center">
+        <Stack alignItems="center">
+          <span className={cx(styles.versionInfo, styles.noMarginBottom)}>
+            <strong>Version {baseInfo.version}</strong> updated by {baseInfo.createdBy} {baseInfo.ageString}
+            {baseInfo.message}
+          </span>
+          <Icon name="arrow-right" size="sm" />
+          <span className={styles.versionInfo}>
+            <strong>Version {newInfo.version}</strong> updated by {newInfo.createdBy} {newInfo.ageString}
+            {newInfo.message}
+          </span>
+        </Stack>
+        {isNewLatest && (
+          <ModalsController>
+            {({ showModal, hideModal }) => (
+              <Button
+                variant="destructive"
+                icon="history"
+                onClick={() => {
+                  showModal(RevertDashboardModal, {
+                    version: baseInfo,
+                    onRestore,
+                    hideModal,
+                  });
+                }}
+              >
+                Restore to version {baseInfo.version}
+              </Button>
+            )}
+          </ModalsController>
+        )}
+      </Stack>
+
+      {Object.entries(diff).map(([key, diffs]) => (
+        <DiffGroup diffs={diffs} key={key} title={key} />
+      ))}
+
+      <Box paddingTop={2}>
+        <CollapsableSection isOpen={false} label="View JSON Diff">
+          <DiffViewer
+            oldValue={JSON.stringify(diffData.lhs, null, 2)}
+            newValue={JSON.stringify(diffData.rhs, null, 2)}
+          />
+        </CollapsableSection>
+      </Box>
+    </Stack>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  versionInfo: css({
+    color: theme.colors.text.secondary,
+    fontSize: theme.typography.bodySmall.fontSize,
+  }),
+  noMarginBottom: css({
+    marginBottom: 0,
+  }),
+});
diff --git a/public/app/features/dashboard/components/VersionHistory/VersionHistoryHeader.tsx b/public/app/features/dashboard-scene/settings/version-history/VersionHistoryHeader.tsx
similarity index 85%
rename from public/app/features/dashboard/components/VersionHistory/VersionHistoryHeader.tsx
rename to public/app/features/dashboard-scene/settings/version-history/VersionHistoryHeader.tsx
index 1205e084f9d9b..6c3738f9057bf 100644
--- a/public/app/features/dashboard/components/VersionHistory/VersionHistoryHeader.tsx
+++ b/public/app/features/dashboard-scene/settings/version-history/VersionHistoryHeader.tsx
@@ -32,10 +32,10 @@ export const VersionHistoryHeader = ({
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  header: css`
-    font-size: ${theme.typography.h3.fontSize};
-    display: flex;
-    gap: ${theme.spacing(2)};
-    margin-bottom: ${theme.spacing(3)};
-  `,
+  header: css({
+    fontSize: theme.typography.h3.fontSize,
+    display: 'flex',
+    gap: theme.spacing(2),
+    marginBottom: theme.spacing(2),
+  }),
 });
diff --git a/public/app/features/dashboard-scene/settings/version-history/VersionHistoryTable.tsx b/public/app/features/dashboard-scene/settings/version-history/VersionHistoryTable.tsx
new file mode 100644
index 0000000000000..a347c72eed52b
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/version-history/VersionHistoryTable.tsx
@@ -0,0 +1,90 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Checkbox, Button, Tag, ModalsController, useStyles2 } from '@grafana/ui';
+
+import { DecoratedRevisionModel } from '../VersionsEditView';
+
+import { RevertDashboardModal } from './RevertDashboardModal';
+
+type VersionsTableProps = {
+  versions: DecoratedRevisionModel[];
+  canCompare: boolean;
+  onCheck: (ev: React.FormEvent<HTMLInputElement>, versionId: number) => void;
+  onRestore: (version: DecoratedRevisionModel) => Promise<boolean>;
+};
+
+export const VersionHistoryTable = ({ versions, canCompare, onCheck, onRestore }: VersionsTableProps) => {
+  const styles = useStyles2(getStyles);
+
+  return (
+    <div className={styles.margin}>
+      <table className="filter-table">
+        <thead>
+          <tr>
+            <th className="width-4"></th>
+            <th className="width-4">Version</th>
+            <th className="width-14">Date</th>
+            <th className="width-10">Updated by</th>
+            <th>Notes</th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          {versions.map((version, idx) => (
+            <tr key={version.id}>
+              <td>
+                <Checkbox
+                  aria-label={`Toggle selection of version ${version.version}`}
+                  className={css({
+                    display: 'inline',
+                  })}
+                  checked={version.checked}
+                  onChange={(ev) => onCheck(ev, version.id)}
+                  disabled={!version.checked && canCompare}
+                />
+              </td>
+              <td>{version.version}</td>
+              <td>{version.createdDateString}</td>
+              <td>{version.createdBy}</td>
+              <td>{version.message}</td>
+              <td className="text-right">
+                {idx === 0 ? (
+                  <Tag name="Latest" colorIndex={17} />
+                ) : (
+                  <ModalsController>
+                    {({ showModal, hideModal }) => (
+                      <Button
+                        variant="secondary"
+                        size="sm"
+                        icon="history"
+                        onClick={() => {
+                          showModal(RevertDashboardModal, {
+                            version,
+                            hideModal,
+                            onRestore,
+                          });
+                        }}
+                      >
+                        Restore
+                      </Button>
+                    )}
+                  </ModalsController>
+                )}
+              </td>
+            </tr>
+          ))}
+        </tbody>
+      </table>
+    </div>
+  );
+};
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    margin: css({
+      marginBottom: theme.spacing(4),
+    }),
+  };
+}
diff --git a/public/app/features/dashboard/components/VersionHistory/__mocks__/dashboardHistoryMocks.ts b/public/app/features/dashboard-scene/settings/version-history/__mocks__/dashboardHistoryMocks.ts
similarity index 100%
rename from public/app/features/dashboard/components/VersionHistory/__mocks__/dashboardHistoryMocks.ts
rename to public/app/features/dashboard-scene/settings/version-history/__mocks__/dashboardHistoryMocks.ts
diff --git a/public/app/features/dashboard/components/VersionHistory/index.ts b/public/app/features/dashboard-scene/settings/version-history/index.ts
similarity index 100%
rename from public/app/features/dashboard/components/VersionHistory/index.ts
rename to public/app/features/dashboard-scene/settings/version-history/index.ts
diff --git a/public/app/features/dashboard-scene/settings/version-history/utils.test.ts b/public/app/features/dashboard-scene/settings/version-history/utils.test.ts
new file mode 100644
index 0000000000000..90db4b08325c9
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/version-history/utils.test.ts
@@ -0,0 +1,303 @@
+import { Dashboard } from '@grafana/schema';
+
+import { Diff, getDiffOperationText, getDiffText, jsonDiff } from './utils';
+
+describe('getDiffOperationText', () => {
+  const cases = [
+    ['add', 'added'],
+    ['remove', 'deleted'],
+    ['replace', 'changed'],
+    ['byDefault', 'changed'],
+  ];
+
+  test.each(cases)('it returns the correct verb for an operation', (operation, expected) => {
+    expect(getDiffOperationText(operation)).toBe(expected);
+  });
+});
+
+type DiffTextCase = [Partial<Diff>, string];
+describe('getDiffText', () => {
+  const addEmptyArray: DiffTextCase = [
+    { op: 'add', value: [], path: ['annotations', 'list'], startLineNumber: 24 },
+    'added list',
+  ];
+  const addArrayNumericProp: DiffTextCase = [
+    {
+      op: 'add',
+      value: ['tag'],
+      path: ['panels', '3'],
+    },
+    'added item 3',
+  ];
+  const addArrayProp: DiffTextCase = [
+    {
+      op: 'add',
+      value: [{ name: 'dummy target 1' }, { name: 'dummy target 2' }],
+      path: ['panels', '3', 'targets'],
+    },
+    'added 2 targets',
+  ];
+  const addValueNumericProp: DiffTextCase = [
+    {
+      op: 'add',
+      value: 'foo',
+      path: ['panels', '3'],
+    },
+    'added item 3',
+  ];
+  const addValueProp: DiffTextCase = [
+    {
+      op: 'add',
+      value: 'foo',
+      path: ['panels', '3', 'targets'],
+    },
+    'added targets',
+  ];
+
+  const removeEmptyArray: DiffTextCase = [
+    { op: 'remove', originalValue: [], path: ['annotations', 'list'], startLineNumber: 24 },
+    'deleted list',
+  ];
+  const removeArrayNumericProp: DiffTextCase = [
+    {
+      op: 'remove',
+      originalValue: ['tag'],
+      path: ['panels', '3'],
+    },
+    'deleted item 3',
+  ];
+  const removeArrayProp: DiffTextCase = [
+    {
+      op: 'remove',
+      originalValue: [{ name: 'dummy target 1' }, { name: 'dummy target 2' }],
+      path: ['panels', '3', 'targets'],
+    },
+    'deleted 2 targets',
+  ];
+  const removeValueNumericProp: DiffTextCase = [
+    {
+      op: 'remove',
+      originalValue: 'foo',
+      path: ['panels', '3'],
+    },
+    'deleted item 3',
+  ];
+  const removeValueProp: DiffTextCase = [
+    {
+      op: 'remove',
+      originalValue: 'foo',
+      path: ['panels', '3', 'targets'],
+    },
+    'deleted targets',
+  ];
+  const replaceValueNumericProp: DiffTextCase = [
+    {
+      op: 'replace',
+      originalValue: 'foo',
+      value: 'bar',
+      path: ['panels', '3'],
+    },
+    'changed item 3',
+  ];
+  const replaceValueProp: DiffTextCase = [
+    {
+      op: 'replace',
+      originalValue: 'foo',
+      value: 'bar',
+      path: ['panels', '3', 'targets'],
+    },
+    'changed targets',
+  ];
+
+  const cases = [
+    addEmptyArray,
+    addArrayNumericProp,
+    addArrayProp,
+    addValueNumericProp,
+    addValueProp,
+    removeEmptyArray,
+    removeArrayNumericProp,
+    removeArrayProp,
+    removeValueNumericProp,
+    removeValueProp,
+    replaceValueNumericProp,
+    replaceValueProp,
+  ];
+
+  test.each(cases)(
+    'returns a semantic message based on the type of diff, the values and the location of the change',
+    (diff: Partial<Diff>, expected: string) => {
+      expect(getDiffText(diff as unknown as Diff)).toBe(expected);
+    }
+  );
+});
+
+describe('jsonDiff', () => {
+  it('returns data related to each change', () => {
+    const lhs = {
+      annotations: {
+        list: [
+          {
+            builtIn: 1,
+            datasource: '-- Grafana --',
+            enable: true,
+            hide: true,
+            iconColor: 'rgba(0, 211, 255, 1)',
+            name: 'Annotations & Alerts',
+            type: 'dashboard',
+          },
+        ],
+      },
+      editable: true,
+      gnetId: null,
+      graphTooltip: 0,
+      id: 141,
+      links: [],
+      panels: [],
+      schemaVersion: 27,
+      tags: [],
+      templating: {
+        list: [],
+      },
+      time: {
+        from: 'now-6h',
+        to: 'now',
+      },
+      timepicker: {},
+      timezone: '',
+      title: 'test dashboard',
+      uid: '_U4zObQMz',
+      version: 2,
+    };
+
+    const rhs = {
+      annotations: {
+        list: [
+          {
+            builtIn: 1,
+            datasource: '-- Grafana --',
+            enable: true,
+            hide: true,
+            iconColor: 'rgba(0, 211, 255, 1)',
+            name: 'Annotations & Alerts',
+            type: 'dashboard',
+          },
+        ],
+      },
+      description: 'a description',
+      editable: true,
+      gnetId: null,
+      graphTooltip: 1,
+      id: 141,
+      links: [],
+      panels: [
+        {
+          type: 'graph',
+        },
+      ],
+      schemaVersion: 27,
+      tags: ['the tag'],
+      templating: {
+        list: [],
+      },
+      time: {
+        from: 'now-6h',
+        to: 'now',
+      },
+      timepicker: {
+        refresh_intervals: ['5s', '10s', '30s', '1m', '5m', '15m', '30m', '1h', '2h', '1d', '2d'],
+      },
+      timezone: 'utc',
+      title: 'My favourite dashboard',
+      uid: '_U4zObQMz',
+      version: 3,
+    };
+
+    const expected = {
+      description: [
+        {
+          endLineNumber: 14,
+          op: 'add',
+          originalValue: undefined,
+          path: ['description'],
+          startLineNumber: 14,
+          value: 'a description',
+        },
+      ],
+      graphTooltip: [
+        {
+          endLineNumber: 17,
+          op: 'replace',
+          originalValue: 0,
+          path: ['graphTooltip'],
+          startLineNumber: 17,
+          value: 1,
+        },
+      ],
+      panels: [
+        {
+          endLineNumber: 23,
+          op: 'add',
+          originalValue: undefined,
+          path: ['panels', '0'],
+          startLineNumber: 21,
+          value: {
+            type: 'graph',
+          },
+        },
+      ],
+      tags: [
+        {
+          endLineNumber: 27,
+          op: 'add',
+          originalValue: undefined,
+          path: ['tags', '0'],
+          startLineNumber: 27,
+          value: 'the tag',
+        },
+      ],
+      timepicker: [
+        {
+          endLineNumber: 49,
+          op: 'add',
+          originalValue: undefined,
+          path: ['timepicker', 'refresh_intervals'],
+          startLineNumber: 37,
+          value: ['5s', '10s', '30s', '1m', '5m', '15m', '30m', '1h', '2h', '1d', '2d'],
+        },
+      ],
+      timezone: [
+        {
+          endLineNumber: 51,
+          op: 'replace',
+          originalValue: '',
+          path: ['timezone'],
+          startLineNumber: 51,
+          value: 'utc',
+        },
+      ],
+      title: [
+        {
+          endLineNumber: 52,
+          op: 'replace',
+          originalValue: 'test dashboard',
+          path: ['title'],
+          startLineNumber: 52,
+          value: 'My favourite dashboard',
+        },
+      ],
+      version: [
+        {
+          endLineNumber: 54,
+          op: 'replace',
+          originalValue: 2,
+          path: ['version'],
+          startLineNumber: 54,
+          value: 3,
+        },
+      ],
+    };
+
+    expect(jsonDiff(lhs as unknown as Dashboard, rhs as unknown as Dashboard)).toStrictEqual(expected);
+  });
+});
diff --git a/public/app/features/dashboard-scene/settings/version-history/utils.ts b/public/app/features/dashboard-scene/settings/version-history/utils.ts
new file mode 100644
index 0000000000000..ef5d3a21a9848
--- /dev/null
+++ b/public/app/features/dashboard-scene/settings/version-history/utils.ts
@@ -0,0 +1,108 @@
+import { compare, Operation } from 'fast-json-patch';
+// @ts-ignore
+import jsonMap from 'json-source-map';
+import { flow, get, isArray, isEmpty, last, sortBy, tail, toNumber, isNaN } from 'lodash';
+
+export type Diff = {
+  op: 'add' | 'replace' | 'remove' | 'copy' | 'test' | '_get' | 'move';
+  value: unknown;
+  originalValue: unknown;
+  path: string[];
+  startLineNumber: number;
+  endLineNumber: number;
+};
+
+export type Diffs = {
+  [key: string]: Diff[];
+};
+
+type JSONValue = string | Object;
+
+export const jsonDiff = (lhs: JSONValue, rhs: JSONValue): Diffs => {
+  const diffs = compare(lhs, rhs);
+  const lhsMap = jsonMap.stringify(lhs, null, 2);
+  const rhsMap = jsonMap.stringify(rhs, null, 2);
+
+  const getDiffInformation = (diffs: Operation[]): Diff[] => {
+    return diffs.map((diff) => {
+      let originalValue = undefined;
+      let value = undefined;
+      let startLineNumber = 0;
+      let endLineNumber = 0;
+
+      const path = tail(diff.path.split('/'));
+
+      if (diff.op === 'replace' && rhsMap.pointers[diff.path]) {
+        originalValue = get(lhs, path);
+        value = diff.value;
+        startLineNumber = rhsMap.pointers[diff.path].value.line;
+        endLineNumber = rhsMap.pointers[diff.path].valueEnd.line;
+      }
+      if (diff.op === 'add' && rhsMap.pointers[diff.path]) {
+        value = diff.value;
+        startLineNumber = rhsMap.pointers[diff.path].value.line;
+        endLineNumber = rhsMap.pointers[diff.path].valueEnd.line;
+      }
+      if (diff.op === 'remove' && lhsMap.pointers[diff.path]) {
+        originalValue = get(lhs, path);
+        startLineNumber = lhsMap.pointers[diff.path].value.line;
+        endLineNumber = lhsMap.pointers[diff.path].valueEnd.line;
+      }
+
+      return {
+        op: diff.op,
+        value,
+        path,
+        originalValue,
+        startLineNumber,
+        endLineNumber,
+      };
+    });
+  };
+
+  const sortByLineNumber = (diffs: Diff[]) => sortBy(diffs, 'startLineNumber');
+  const groupByPath = (diffs: Diff[]) =>
+    diffs.reduce<Record<string, Diff[]>>((acc, value) => {
+      const groupKey: string = value.path[0];
+      if (!acc[groupKey]) {
+        acc[groupKey] = [];
+      }
+      acc[groupKey].push(value);
+      return acc;
+    }, {});
+
+  return flow([getDiffInformation, sortByLineNumber, groupByPath])(diffs);
+};
+
+export const getDiffText = (diff: Diff, showProp = true) => {
+  const prop = last(diff.path)!;
+  const propIsNumeric = isNumeric(prop);
+  const val = diff.op === 'remove' ? diff.originalValue : diff.value;
+  let text = getDiffOperationText(diff.op);
+
+  if (showProp) {
+    if (propIsNumeric) {
+      text += ` item ${prop}`;
+    } else {
+      if (isArray(val) && !isEmpty(val)) {
+        text += ` ${val.length} ${prop}`;
+      } else {
+        text += ` ${prop}`;
+      }
+    }
+  }
+
+  return text;
+};
+
+const isNumeric = (value: string) => !isNaN(toNumber(value));
+
+export const getDiffOperationText = (operation: string): string => {
+  if (operation === 'add') {
+    return 'added';
+  }
+  if (operation === 'remove') {
+    return 'deleted';
+  }
+  return 'changed';
+};
diff --git a/public/app/features/dashboard-scene/sharing/ShareExportTab.tsx b/public/app/features/dashboard-scene/sharing/ShareExportTab.tsx
index e6a9831ca34a0..f1e669d4ac114 100644
--- a/public/app/features/dashboard-scene/sharing/ShareExportTab.tsx
+++ b/public/app/features/dashboard-scene/sharing/ShareExportTab.tsx
@@ -3,31 +3,26 @@ import React from 'react';
 import { useAsync } from 'react-use';
 import AutoSizer from 'react-virtualized-auto-sizer';
 
-import { config, getBackendSrv } from '@grafana/runtime';
-import { SceneComponentProps, SceneObjectBase, SceneObjectRef } from '@grafana/scenes';
+import { SceneComponentProps, SceneObjectBase } from '@grafana/scenes';
 import { Button, ClipboardButton, CodeEditor, Field, Modal, Switch, VerticalGroup } from '@grafana/ui';
 import { t, Trans } from 'app/core/internationalization';
 import { DashboardExporter } from 'app/features/dashboard/components/DashExportModal';
-import { trackDashboardSharingActionPerType } from 'app/features/dashboard/components/ShareModal/analytics';
 import { shareDashboardType } from 'app/features/dashboard/components/ShareModal/utils';
 import { DashboardModel } from 'app/features/dashboard/state';
 
-import { DashboardScene } from '../scene/DashboardScene';
 import { transformSceneToSaveModel } from '../serialization/transformSceneToSaveModel';
+import { getVariablesCompatibility } from '../utils/getVariablesCompatibility';
+import { DashboardInteractions } from '../utils/interactions';
 
 import { SceneShareTabState } from './types';
 
-const exportExternallyTranslation = t('share-modal.export.share-externally-label', `Export for sharing externally`);
-const exportDefaultTranslation = t('share-modal.export.share-default-label', `Export with default values removed`);
-
 interface ShareExportTabState extends SceneShareTabState {
-  dashboardRef: SceneObjectRef<DashboardScene>;
   isSharingExternally?: boolean;
-  shouldTrimDefaults?: boolean;
   isViewingJSON?: boolean;
 }
 
 export class ShareExportTab extends SceneObjectBase<ShareExportTabState> {
+  public tabId = shareDashboardType.export;
   static Component = ShareExportTabRenderer;
 
   private _exporter = new DashboardExporter();
@@ -35,7 +30,6 @@ export class ShareExportTab extends SceneObjectBase<ShareExportTabState> {
   constructor(state: Omit<ShareExportTabState, 'panelRef'>) {
     super({
       isSharingExternally: false,
-      shouldTrimDefaults: false,
       isViewingJSON: false,
       ...state,
     });
@@ -51,12 +45,6 @@ export class ShareExportTab extends SceneObjectBase<ShareExportTabState> {
     });
   };
 
-  public onTrimDefaultsChange = () => {
-    this.setState({
-      shouldTrimDefaults: !this.state.shouldTrimDefaults,
-    });
-  };
-
   public onViewJSON = () => {
     this.setState({
       isViewingJSON: !this.state.isViewingJSON,
@@ -68,37 +56,45 @@ export class ShareExportTab extends SceneObjectBase<ShareExportTabState> {
   }
 
   public async getExportableDashboardJson() {
-    const { dashboardRef, isSharingExternally, shouldTrimDefaults } = this.state;
+    const { dashboardRef, isSharingExternally } = this.state;
     const saveModel = transformSceneToSaveModel(dashboardRef.resolve());
 
     const exportable = isSharingExternally
-      ? await this._exporter.makeExportable(new DashboardModel(saveModel))
+      ? await this._exporter.makeExportable(
+          new DashboardModel(saveModel, undefined, {
+            getVariablesFromState: () => {
+              return getVariablesCompatibility(window.__grafanaSceneContext);
+            },
+          })
+        )
       : saveModel;
 
-    if (shouldTrimDefaults) {
-      const trimmed = await getBackendSrv().post('/api/dashboards/trim', { dashboard: exportable });
-      return trimmed.dashboard;
-    } else {
-      return exportable;
-    }
+    return exportable;
   }
 
   public async onSaveAsFile() {
     const dashboardJson = await this.getExportableDashboardJson();
     const dashboardJsonPretty = JSON.stringify(dashboardJson, null, 2);
+    const { isSharingExternally } = this.state;
 
     const blob = new Blob([dashboardJsonPretty], {
       type: 'application/json;charset=utf-8',
     });
 
     const time = new Date().getTime();
-    saveAs(blob, `${dashboardJson.title}-${time}.json`);
-    trackDashboardSharingActionPerType('save_export', shareDashboardType.export);
+    let title = 'dashboard';
+    if ('title' in dashboardJson && dashboardJson.title) {
+      title = dashboardJson.title;
+    }
+    saveAs(blob, `${title}-${time}.json`);
+    DashboardInteractions.exportDownloadJsonClicked({
+      externally: isSharingExternally,
+    });
   }
 }
 
 function ShareExportTabRenderer({ model }: SceneComponentProps<ShareExportTab>) {
-  const { isSharingExternally, shouldTrimDefaults, isViewingJSON, modalRef } = model.useState();
+  const { isSharingExternally, isViewingJSON, modalRef } = model.useState();
 
   const dashboardJson = useAsync(async () => {
     if (isViewingJSON) {
@@ -109,6 +105,8 @@ function ShareExportTabRenderer({ model }: SceneComponentProps<ShareExportTab>)
     return '';
   }, [isViewingJSON]);
 
+  const exportExternallyTranslation = t('share-modal.export.share-externally-label', `Export for sharing externally`);
+
   return (
     <>
       {!isViewingJSON && (
@@ -124,12 +122,6 @@ function ShareExportTabRenderer({ model }: SceneComponentProps<ShareExportTab>)
                 onChange={model.onShareExternallyChange}
               />
             </Field>
-
-            {config.featureToggles.trimDefaults && (
-              <Field label={exportDefaultTranslation}>
-                <Switch id="trim-defaults-toggle" value={shouldTrimDefaults} onChange={model.onTrimDefaultsChange} />
-              </Field>
-            )}
           </VerticalGroup>
 
           <Modal.ButtonRow>
diff --git a/public/app/features/dashboard-scene/sharing/ShareLibraryPanelTab.tsx b/public/app/features/dashboard-scene/sharing/ShareLibraryPanelTab.tsx
new file mode 100644
index 0000000000000..601d2e3b31cd4
--- /dev/null
+++ b/public/app/features/dashboard-scene/sharing/ShareLibraryPanelTab.tsx
@@ -0,0 +1,57 @@
+import React from 'react';
+
+import { SceneComponentProps, SceneObjectBase, SceneObjectRef, VizPanel } from '@grafana/scenes';
+import { t } from 'app/core/internationalization';
+import { ShareLibraryPanel } from 'app/features/dashboard/components/ShareModal/ShareLibraryPanel';
+import { shareDashboardType } from 'app/features/dashboard/components/ShareModal/utils';
+import { DashboardModel, PanelModel } from 'app/features/dashboard/state';
+
+import { DashboardGridItem } from '../scene/DashboardGridItem';
+import { gridItemToPanel, transformSceneToSaveModel } from '../serialization/transformSceneToSaveModel';
+
+import { SceneShareTabState } from './types';
+
+export interface ShareLibraryPanelTabState extends SceneShareTabState {
+  panelRef?: SceneObjectRef<VizPanel>;
+}
+
+export class ShareLibraryPanelTab extends SceneObjectBase<ShareLibraryPanelTabState> {
+  public tabId = shareDashboardType.libraryPanel;
+  static Component = ShareLibraryPanelTabRenderer;
+
+  public getTabLabel() {
+    return t('share-modal.tab-title.library-panel', 'Library panel');
+  }
+}
+
+function ShareLibraryPanelTabRenderer({ model }: SceneComponentProps<ShareLibraryPanelTab>) {
+  const { panelRef, dashboardRef, modalRef } = model.useState();
+
+  if (!panelRef) {
+    return null;
+  }
+
+  const vizPanel = panelRef.resolve();
+
+  if (vizPanel.parent instanceof DashboardGridItem) {
+    const dashboardScene = dashboardRef.resolve();
+    const panelJson = gridItemToPanel(vizPanel.parent);
+    const panelModel = new PanelModel(panelJson);
+
+    const dashboardJson = transformSceneToSaveModel(dashboardScene);
+    const dashboardModel = new DashboardModel(dashboardJson);
+
+    return (
+      <ShareLibraryPanel
+        initialFolderUid={dashboardScene.state.meta.folderUid}
+        dashboard={dashboardModel}
+        panel={panelModel}
+        onDismiss={() => {
+          modalRef?.resolve().onDismiss();
+        }}
+      />
+    );
+  }
+
+  return null;
+}
diff --git a/public/app/features/dashboard-scene/sharing/ShareLinkTab.test.tsx b/public/app/features/dashboard-scene/sharing/ShareLinkTab.test.tsx
index 1cfe3167fc619..8ca0704e10634 100644
--- a/public/app/features/dashboard-scene/sharing/ShareLinkTab.test.tsx
+++ b/public/app/features/dashboard-scene/sharing/ShareLinkTab.test.tsx
@@ -6,8 +6,9 @@ import React from 'react';
 import { dateTime } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { config, locationService } from '@grafana/runtime';
-import { SceneGridItem, SceneGridLayout, SceneTimeRange, VizPanel } from '@grafana/scenes';
+import { SceneGridLayout, SceneTimeRange, VizPanel } from '@grafana/scenes';
 
+import { DashboardGridItem } from '../scene/DashboardGridItem';
 import { DashboardScene } from '../scene/DashboardScene';
 
 import { ShareLinkTab } from './ShareLinkTab';
@@ -29,7 +30,8 @@ describe('ShareLinkTab', () => {
     config.appUrl = 'http://dashboards.grafana.com/grafana/';
     config.rendererAvailable = true;
     config.bootData.user.orgId = 1;
-    locationService.push('/scenes/dashboard/dash-1?from=now-6h&to=now');
+    config.featureToggles.dashboardSceneForViewers = true;
+    locationService.push('/d/dash-1?from=now-6h&to=now');
   });
 
   describe('with locked time range (absolute) range', () => {
@@ -37,7 +39,7 @@ describe('ShareLinkTab', () => {
       buildAndRenderScenario({});
 
       expect(await screen.findByRole('textbox', { name: 'Link URL' })).toHaveValue(
-        'http://dashboards.grafana.com/grafana/scenes/dashboard/dash-1?from=2019-02-11T13:00:00.000Z&to=2019-02-11T19:00:00.000Z&viewPanel=panel-12'
+        'http://dashboards.grafana.com/grafana/d/dash-1?from=2019-02-11T13:00:00.000Z&to=2019-02-11T19:00:00.000Z&viewPanel=panel-12'
       );
     });
   });
@@ -48,7 +50,7 @@ describe('ShareLinkTab', () => {
       act(() => tab.onToggleLockedTime());
 
       expect(await screen.findByRole('textbox', { name: 'Link URL' })).toHaveValue(
-        'http://dashboards.grafana.com/grafana/scenes/dashboard/dash-1?from=now-6h&to=now&viewPanel=panel-12'
+        'http://dashboards.grafana.com/grafana/d/dash-1?from=now-6h&to=now&viewPanel=panel-12'
       );
     });
   });
@@ -58,7 +60,7 @@ describe('ShareLinkTab', () => {
     act(() => tab.onThemeChange('light'));
 
     expect(await screen.findByRole('textbox', { name: 'Link URL' })).toHaveValue(
-      'http://dashboards.grafana.com/grafana/scenes/dashboard/dash-1?from=2019-02-11T13:00:00.000Z&to=2019-02-11T19:00:00.000Z&viewPanel=panel-12&theme=light'
+      'http://dashboards.grafana.com/grafana/d/dash-1?from=2019-02-11T13:00:00.000Z&to=2019-02-11T19:00:00.000Z&viewPanel=panel-12&theme=light'
     );
   });
 
@@ -79,7 +81,7 @@ describe('ShareLinkTab', () => {
       await screen.findByRole('link', { name: selectors.pages.SharePanelModal.linkToRenderedImage })
     ).toHaveAttribute(
       'href',
-      'http://dashboards.grafana.com/grafana/render/d-solo/dash-1?from=2019-02-11T13:00:00.000Z&to=2019-02-11T19:00:00.000Z&viewPanel=panel-12&width=1000&height=500&tz=Pacific%2FEaster'
+      'http://dashboards.grafana.com/grafana/render/d-solo/dash-1?from=2019-02-11T13:00:00.000Z&to=2019-02-11T19:00:00.000Z&panelId=panel-12&__feature.dashboardSceneSolo&width=1000&height=500&tz=Pacific%2FEaster'
     );
   });
 });
@@ -98,10 +100,13 @@ function buildAndRenderScenario(options: ScenarioOptions) {
   const dashboard = new DashboardScene({
     title: 'hello',
     uid: 'dash-1',
+    meta: {
+      canEdit: true,
+    },
     $timeRange: new SceneTimeRange({}),
     body: new SceneGridLayout({
       children: [
-        new SceneGridItem({
+        new DashboardGridItem({
           key: 'griditem-1',
           x: 0,
           y: 0,
diff --git a/public/app/features/dashboard-scene/sharing/ShareLinkTab.tsx b/public/app/features/dashboard-scene/sharing/ShareLinkTab.tsx
index f5c2db5387af6..21a739717a022 100644
--- a/public/app/features/dashboard-scene/sharing/ShareLinkTab.tsx
+++ b/public/app/features/dashboard-scene/sharing/ShareLinkTab.tsx
@@ -9,16 +9,14 @@ import { Alert, ClipboardButton, Field, FieldSet, Icon, Input, Switch } from '@g
 import { t, Trans } from 'app/core/internationalization';
 import { createShortLink } from 'app/core/utils/shortLinks';
 import { ThemePicker } from 'app/features/dashboard/components/ShareModal/ThemePicker';
-import { trackDashboardSharingActionPerType } from 'app/features/dashboard/components/ShareModal/analytics';
 import { shareDashboardType } from 'app/features/dashboard/components/ShareModal/utils';
 
-import { DashboardScene } from '../scene/DashboardScene';
+import { DashboardInteractions } from '../utils/interactions';
 import { getDashboardUrl } from '../utils/urlBuilders';
 
 import { SceneShareTabState } from './types';
 export interface ShareLinkTabState extends SceneShareTabState, ShareOptions {
   panelRef?: SceneObjectRef<VizPanel>;
-  dashboardRef: SceneObjectRef<DashboardScene>;
 }
 
 interface ShareOptions {
@@ -30,6 +28,8 @@ interface ShareOptions {
 }
 
 export class ShareLinkTab extends SceneObjectBase<ShareLinkTabState> {
+  public tabId = shareDashboardType.link;
+
   static Component = ShareLinkTabRenderer;
 
   constructor(state: Omit<ShareLinkTabState, keyof ShareOptions>) {
@@ -71,6 +71,7 @@ export class ShareLinkTab extends SceneObjectBase<ShareLinkTabState> {
 
     let shareUrl = getDashboardUrl({
       uid: dashboard.state.uid,
+      slug: dashboard.state.meta.slug,
       currentQueryParams: location.search,
       updateQuery: urlParamsUpdate,
       absolute: true,
@@ -80,12 +81,20 @@ export class ShareLinkTab extends SceneObjectBase<ShareLinkTabState> {
       shareUrl = await createShortLink(shareUrl);
     }
 
+    // the image panel solo route uses panelId instead of viewPanel
+    let imageQueryParams = urlParamsUpdate;
+    if (panel) {
+      delete imageQueryParams.viewPanel;
+      imageQueryParams.panelId = panel.state.key;
+      // force solo route to use scenes
+      imageQueryParams['__feature.dashboardSceneSolo'] = true;
+    }
+
     const imageUrl = getDashboardUrl({
       uid: dashboard.state.uid,
       currentQueryParams: location.search,
-      updateQuery: urlParamsUpdate,
+      updateQuery: { ...urlParamsUpdate, panelId: panel?.state.key },
       absolute: true,
-
       soloRoute: true,
       render: true,
       timeZone: getRenderTimeZone(timeRange.getTimeZone()),
@@ -118,7 +127,11 @@ export class ShareLinkTab extends SceneObjectBase<ShareLinkTabState> {
   };
 
   onCopy() {
-    trackDashboardSharingActionPerType('copy_link', shareDashboardType.link);
+    DashboardInteractions.shareLinkCopied({
+      currentTimeRange: this.state.useLockedTime,
+      theme: this.state.selectedTheme,
+      shortenURL: this.state.useShortUrl,
+    });
   }
 }
 
diff --git a/public/app/features/dashboard-scene/sharing/ShareModal.tsx b/public/app/features/dashboard-scene/sharing/ShareModal.tsx
index e6ac04955a5d2..a2c8aed0bbc77 100644
--- a/public/app/features/dashboard-scene/sharing/ShareModal.tsx
+++ b/public/app/features/dashboard-scene/sharing/ShareModal.tsx
@@ -5,14 +5,20 @@ import { SceneComponentProps, SceneObjectBase, SceneObjectState, VizPanel, Scene
 import { Modal, ModalTabsHeader, TabContent } from '@grafana/ui';
 import { contextSrv } from 'app/core/core';
 import { t } from 'app/core/internationalization';
+import { isPublicDashboardsEnabled } from 'app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils';
 
 import { DashboardScene } from '../scene/DashboardScene';
+import { LibraryVizPanel } from '../scene/LibraryVizPanel';
+import { DashboardInteractions } from '../utils/interactions';
 import { getDashboardSceneFor } from '../utils/utils';
 
 import { ShareExportTab } from './ShareExportTab';
+import { ShareLibraryPanelTab } from './ShareLibraryPanelTab';
 import { ShareLinkTab } from './ShareLinkTab';
+import { SharePanelEmbedTab } from './SharePanelEmbedTab';
 import { ShareSnapshotTab } from './ShareSnapshotTab';
-import { ModalSceneObjectLike, SceneShareTab } from './types';
+import { SharePublicDashboardTab } from './public-dashboards/SharePublicDashboardTab';
+import { ModalSceneObjectLike, SceneShareTab, SceneShareTabState } from './types';
 
 interface ShareModalState extends SceneObjectState {
   dashboardRef: SceneObjectRef<DashboardScene>;
@@ -21,16 +27,23 @@ interface ShareModalState extends SceneObjectState {
   activeTab: string;
 }
 
+type customDashboardTabType = new (...args: SceneShareTabState[]) => SceneShareTab;
+const customDashboardTabs: customDashboardTabType[] = [];
+
+export function addDashboardShareTab(tab: customDashboardTabType) {
+  customDashboardTabs.push(tab);
+}
+
 /**
  * Used for full dashboard share modal and the panel level share modal
  */
 export class ShareModal extends SceneObjectBase<ShareModalState> implements ModalSceneObjectLike {
   static Component = SharePanelModalRenderer;
 
-  constructor(state: Omit<ShareModalState, 'activeTab'>) {
+  constructor(state: Omit<ShareModalState, 'activeTab'> & { activeTab?: string }) {
     super({
+      activeTab: 'link',
       ...state,
-      activeTab: 'Link',
     });
 
     this.addActivationHandler(() => this.buildTabs());
@@ -38,45 +51,39 @@ export class ShareModal extends SceneObjectBase<ShareModalState> implements Moda
 
   private buildTabs() {
     const { dashboardRef, panelRef } = this.state;
+    const modalRef = this.getRef();
 
-    const tabs: SceneShareTab[] = [new ShareLinkTab({ dashboardRef, panelRef, modalRef: this.getRef() })];
+    const tabs: SceneShareTab[] = [new ShareLinkTab({ dashboardRef, panelRef, modalRef })];
+    const dashboard = getDashboardSceneFor(this);
 
     if (!panelRef) {
-      tabs.push(new ShareExportTab({ dashboardRef, modalRef: this.getRef() }));
+      tabs.push(new ShareExportTab({ dashboardRef, modalRef }));
     }
 
-    if (contextSrv.isSignedIn && config.snapshotEnabled) {
-      tabs.push(new ShareSnapshotTab({ panelRef, dashboardRef, modalRef: this.getRef() }));
+    if (contextSrv.isSignedIn && config.snapshotEnabled && dashboard.canEditDashboard()) {
+      tabs.push(new ShareSnapshotTab({ panelRef, dashboardRef, modalRef }));
     }
 
-    this.setState({ tabs });
+    if (panelRef) {
+      tabs.push(new SharePanelEmbedTab({ panelRef, dashboardRef }));
+      const panel = panelRef.resolve();
+      const isLibraryPanel = panel.parent instanceof LibraryVizPanel;
+      if (panel instanceof VizPanel) {
+        if (!isLibraryPanel) {
+          tabs.push(new ShareLibraryPanelTab({ panelRef, dashboardRef, modalRef }));
+        }
+      }
+    }
 
-    // if (panel) {
-    //   const embedLabel = t('share-modal.tab-title.embed', 'Embed');
-    //   tabs.push({ label: embedLabel, value: shareDashboardType.embed, component: ShareEmbed });
-
-    //   if (!isPanelModelLibraryPanel(panel)) {
-    //     const libraryPanelLabel = t('share-modal.tab-title.library-panel', 'Library panel');
-    //     tabs.push({ label: libraryPanelLabel, value: shareDashboardType.libraryPanel, component: ShareLibraryPanel });
-    //   }
-    //   tabs.push(...customPanelTabs);
-    // } else {
-    //   const exportLabel = t('share-modal.tab-title.export', 'Export');
-    //   tabs.push({
-    //     label: exportLabel,
-    //     value: shareDashboardType.export,
-    //     component: ShareExport,
-    //   });
-    //   tabs.push(...customDashboardTabs);
-    // }
-
-    // if (Boolean(config.featureToggles['publicDashboards'])) {
-    //   tabs.push({
-    //     label: 'Public dashboard',
-    //     value: shareDashboardType.publicDashboard,
-    //     component: SharePublicDashboard,
-    //   });
-    // }
+    if (!panelRef) {
+      tabs.push(...customDashboardTabs.map((Tab) => new Tab({ dashboardRef, modalRef })));
+    }
+
+    if (isPublicDashboardsEnabled()) {
+      tabs.push(new SharePublicDashboardTab({ dashboardRef, modalRef }));
+    }
+
+    this.setState({ tabs });
   }
 
   onDismiss = () => {
@@ -85,6 +92,7 @@ export class ShareModal extends SceneObjectBase<ShareModalState> implements Moda
   };
 
   onChangeTab: ComponentProps<typeof ModalTabsHeader>['onChangeTab'] = (tab) => {
+    DashboardInteractions.sharingTabChanged({ item: tab.value });
     this.setState({ activeTab: tab.value });
   };
 }
@@ -99,7 +107,7 @@ function SharePanelModalRenderer({ model }: SceneComponentProps<ShareModal>) {
 
   const modalTabs = tabs?.map((tab) => ({
     label: tab.getTabLabel(),
-    value: tab.getTabLabel(),
+    value: tab.tabId,
   }));
 
   const header = (
@@ -112,7 +120,7 @@ function SharePanelModalRenderer({ model }: SceneComponentProps<ShareModal>) {
     />
   );
 
-  const currentTab = tabs.find((t) => t.getTabLabel() === activeTab);
+  const currentTab = tabs.find((t) => t.tabId === activeTab);
 
   return (
     <Modal isOpen={true} title={header} onDismiss={model.onDismiss}>
diff --git a/public/app/features/dashboard-scene/sharing/SharePanelEmbedTab.tsx b/public/app/features/dashboard-scene/sharing/SharePanelEmbedTab.tsx
new file mode 100644
index 0000000000000..1b5cf04dbc6be
--- /dev/null
+++ b/public/app/features/dashboard-scene/sharing/SharePanelEmbedTab.tsx
@@ -0,0 +1,81 @@
+import React from 'react';
+
+import { TimeRange } from '@grafana/data';
+import { SceneComponentProps, sceneGraph, SceneObjectBase, SceneObjectRef, VizPanel } from '@grafana/scenes';
+import { t } from 'app/core/internationalization';
+import { ShareEmbed } from 'app/features/dashboard/components/ShareModal/ShareEmbed';
+import { buildParams, shareDashboardType } from 'app/features/dashboard/components/ShareModal/utils';
+
+import { DashboardScene } from '../scene/DashboardScene';
+import { PanelTimeRange } from '../scene/PanelTimeRange';
+import { getDashboardUrl } from '../utils/urlBuilders';
+import { getPanelIdForVizPanel } from '../utils/utils';
+
+import { SceneShareTabState } from './types';
+
+export interface SharePanelEmbedTabState extends SceneShareTabState {
+  panelRef: SceneObjectRef<VizPanel>;
+}
+
+export class SharePanelEmbedTab extends SceneObjectBase<SharePanelEmbedTabState> {
+  public tabId = shareDashboardType.embed;
+  static Component = SharePanelEmbedTabRenderer;
+
+  public constructor(state: SharePanelEmbedTabState) {
+    super(state);
+  }
+
+  public getTabLabel() {
+    return t('share-modal.tab-title.panel-embed', 'Embed');
+  }
+}
+
+function SharePanelEmbedTabRenderer({ model }: SceneComponentProps<SharePanelEmbedTab>) {
+  const { panelRef, dashboardRef } = model.useState();
+  const p = panelRef.resolve();
+
+  const dash = dashboardRef.resolve();
+  const { uid: dashUid } = dash.useState();
+  const id = getPanelIdForVizPanel(p);
+  const timeRangeState = sceneGraph.getTimeRange(p);
+
+  const timeFrom = timeRangeState instanceof PanelTimeRange ? timeRangeState.state.timeFrom : undefined;
+
+  return (
+    <ShareEmbed
+      panel={{
+        id,
+        timeFrom,
+      }}
+      range={timeRangeState.state.value}
+      dashboard={{ uid: dashUid ?? '', time: timeRangeState.state.value }}
+      buildIframe={getIframeBuilder(dash)}
+    />
+  );
+}
+
+const getIframeBuilder =
+  (dashboard: DashboardScene) =>
+  (
+    useCurrentTimeRange: boolean,
+    _dashboardUid: string,
+    selectedTheme?: string,
+    panel?: { timeFrom?: string; id: number },
+    range?: TimeRange
+  ) => {
+    const params = buildParams({ useCurrentTimeRange, selectedTheme, panel, range });
+    const panelId = params.get('editPanel') ?? params.get('viewPanel') ?? '';
+    params.set('panelId', panelId);
+    params.delete('editPanel');
+    params.delete('viewPanel');
+    params.set('__feature.dashboardSceneSolo', 'true');
+
+    const soloUrl = getDashboardUrl({
+      absolute: true,
+      soloRoute: true,
+      uid: dashboard.state.uid,
+      slug: dashboard.state.meta.slug,
+      currentQueryParams: params.toString(),
+    });
+    return `<iframe src="${soloUrl}" width="450" height="200" frameborder="0"></iframe>`;
+  };
diff --git a/public/app/features/dashboard-scene/sharing/ShareSnapshotTab.tsx b/public/app/features/dashboard-scene/sharing/ShareSnapshotTab.tsx
index 6edda5736375c..bd733ecbd65b2 100644
--- a/public/app/features/dashboard-scene/sharing/ShareSnapshotTab.tsx
+++ b/public/app/features/dashboard-scene/sharing/ShareSnapshotTab.tsx
@@ -6,24 +6,21 @@ import { getBackendSrv } from '@grafana/runtime';
 import { SceneComponentProps, sceneGraph, SceneObjectBase, SceneObjectRef, VizPanel } from '@grafana/scenes';
 import { Button, ClipboardButton, Field, Input, Modal, RadioButtonGroup } from '@grafana/ui';
 import { t, Trans } from 'app/core/internationalization';
-import { trackDashboardSharingActionPerType } from 'app/features/dashboard/components/ShareModal/analytics';
 import { shareDashboardType } from 'app/features/dashboard/components/ShareModal/utils';
+import { getDashboardSnapshotSrv, SnapshotSharingOptions } from 'app/features/dashboard/services/SnapshotSrv';
 
-import { DashboardScene } from '../scene/DashboardScene';
 import { transformSceneToSaveModel, trimDashboardForSnapshot } from '../serialization/transformSceneToSaveModel';
+import { DashboardInteractions } from '../utils/interactions';
 
 import { SceneShareTabState } from './types';
 
-const SNAPSHOTS_API_ENDPOINT = '/api/snapshots';
-
 const getExpireOptions = () => {
   const DEFAULT_EXPIRE_OPTION: SelectableValue<number> = {
-    label: t('share-modal.snapshot.expire-never', `Never`),
-    value: 0,
+    label: t('share-modal.snapshot.expire-week', '1 Week'),
+    value: 60 * 60 * 24 * 7,
   };
 
   return [
-    DEFAULT_EXPIRE_OPTION,
     {
       label: t('share-modal.snapshot.expire-hour', '1 Hour'),
       value: 60 * 60,
@@ -32,22 +29,20 @@ const getExpireOptions = () => {
       label: t('share-modal.snapshot.expire-day', '1 Day'),
       value: 60 * 60 * 24,
     },
+    DEFAULT_EXPIRE_OPTION,
     {
-      label: t('share-modal.snapshot.expire-week', '7 Days'),
-      value: 60 * 60 * 24 * 7,
+      label: t('share-modal.snapshot.expire-never', `Never`),
+      value: 0,
     },
   ];
 };
 
-type SnapshotSharingOptions = {
-  externalEnabled: boolean;
-  externalSnapshotName: string;
-  externalSnapshotURL: string;
-  snapshotEnabled: boolean;
+const getDefaultExpireOption = () => {
+  return getExpireOptions()[2];
 };
+
 export interface ShareSnapshotTabState extends SceneShareTabState {
   panelRef?: SceneObjectRef<VizPanel>;
-  dashboardRef: SceneObjectRef<DashboardScene>;
   snapshotName?: string;
   selectedExpireOption?: SelectableValue<number>;
 
@@ -55,13 +50,14 @@ export interface ShareSnapshotTabState extends SceneShareTabState {
 }
 
 export class ShareSnapshotTab extends SceneObjectBase<ShareSnapshotTabState> {
+  public tabId = shareDashboardType.snapshot;
   static Component = ShareSnapshoTabRenderer;
 
   public constructor(state: ShareSnapshotTabState) {
     super({
       ...state,
       snapshotName: state.dashboardRef.resolve().state.title,
-      selectedExpireOption: getExpireOptions()[0],
+      selectedExpireOption: getDefaultExpireOption(),
     });
 
     this.addActivationHandler(() => {
@@ -70,9 +66,9 @@ export class ShareSnapshotTab extends SceneObjectBase<ShareSnapshotTabState> {
   }
 
   private _onActivate() {
-    getBackendSrv()
-      .get('/api/snapshot/shared-options')
-      .then((shareOptions: SnapshotSharingOptions) => {
+    getDashboardSnapshotSrv()
+      .getSharingOptions()
+      .then((shareOptions) => {
         if (this.isActive) {
           this.setState({
             snapshotSharingOptions: shareOptions,
@@ -125,10 +121,13 @@ export class ShareSnapshotTab extends SceneObjectBase<ShareSnapshotTabState> {
     };
 
     try {
-      const results: { deleteUrl: string; url: string } = await getBackendSrv().post(SNAPSHOTS_API_ENDPOINT, cmdData);
-      return results;
+      return await getDashboardSnapshotSrv().create(cmdData);
     } finally {
-      trackDashboardSharingActionPerType(external ? 'publish_snapshot' : 'local_snapshot', shareDashboardType.snapshot);
+      if (external) {
+        DashboardInteractions.publishSnapshotClicked({ expires: cmdData.expires });
+      } else {
+        DashboardInteractions.publishSnapshotLocalClicked({ expires: cmdData.expires });
+      }
     }
   };
 }
@@ -210,7 +209,7 @@ function ShareSnapshoTabRenderer({ model }: SceneComponentProps<ShareSnapshotTab
               </Button>
             )}
             <Button variant="primary" disabled={snapshotResult.loading} onClick={() => createSnapshot()}>
-              <Trans i18nKey="share-modal.snapshot.local-button">Local Snapshot</Trans>
+              <Trans i18nKey="share-modal.snapshot.local-button">Publish Snapshot</Trans>
             </Button>
           </Modal.ButtonRow>
         </>
diff --git a/public/app/features/dashboard-scene/sharing/public-dashboards/ConfigPublicDashboard.tsx b/public/app/features/dashboard-scene/sharing/public-dashboards/ConfigPublicDashboard.tsx
new file mode 100644
index 0000000000000..c4dc496a98969
--- /dev/null
+++ b/public/app/features/dashboard-scene/sharing/public-dashboards/ConfigPublicDashboard.tsx
@@ -0,0 +1,75 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { SceneComponentProps, sceneGraph } from '@grafana/scenes';
+import { useStyles2 } from '@grafana/ui';
+import { contextSrv } from 'app/core/core';
+import { useDeletePublicDashboardMutation } from 'app/features/dashboard/api/publicDashboardApi';
+import { ConfigPublicDashboardBase } from 'app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/ConfigPublicDashboard';
+import { PublicDashboard } from 'app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils';
+import { AccessControlAction } from 'app/types';
+
+import { ShareModal } from '../ShareModal';
+
+import { ConfirmModal } from './ConfirmModal';
+import { SharePublicDashboardTab } from './SharePublicDashboardTab';
+import { useUnsupportedDatasources } from './hooks';
+
+interface Props extends SceneComponentProps<SharePublicDashboardTab> {
+  publicDashboard?: PublicDashboard;
+  isGetLoading?: boolean;
+}
+
+export function ConfigPublicDashboard({ model, publicDashboard, isGetLoading }: Props) {
+  const styles = useStyles2(getStyles);
+
+  const hasWritePermissions = contextSrv.hasPermission(AccessControlAction.DashboardsPublicWrite);
+  const { dashboardRef } = model.useState();
+  const dashboard = dashboardRef.resolve();
+  const { isDirty } = dashboard.useState();
+  const [deletePublicDashboard] = useDeletePublicDashboardMutation();
+  const hasTemplateVariables = (dashboard.state.$variables?.state.variables.length ?? 0) > 0;
+  const unsupportedDataSources = useUnsupportedDatasources(dashboard);
+  const timeRangeState = sceneGraph.getTimeRange(model);
+  const timeRange = timeRangeState.useState();
+
+  return (
+    <ConfigPublicDashboardBase
+      dashboard={dashboard}
+      publicDashboard={publicDashboard}
+      unsupportedDatasources={unsupportedDataSources}
+      onRevoke={() => {
+        dashboard.showModal(
+          new ConfirmModal({
+            isOpen: true,
+            title: 'Revoke public URL',
+            icon: 'trash-alt',
+            confirmText: 'Revoke public URL',
+            body: (
+              <p className={styles.description}>
+                Are you sure you want to revoke this URL? The dashboard will no longer be public.
+              </p>
+            ),
+            onDismiss: () => {
+              dashboard.showModal(new ShareModal({ dashboardRef, activeTab: 'Public Dashboard' }));
+            },
+            onConfirm: () => {
+              deletePublicDashboard({ dashboard, dashboardUid: dashboard.state.uid!, uid: publicDashboard!.uid });
+              dashboard.closeModal();
+            },
+          })
+        );
+      }}
+      timeRange={timeRange.value}
+      showSaveChangesAlert={hasWritePermissions && isDirty}
+      hasTemplateVariables={hasTemplateVariables}
+    />
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  description: css({
+    fontSize: theme.typography.body.fontSize,
+  }),
+});
diff --git a/public/app/features/dashboard-scene/sharing/public-dashboards/ConfirmModal.tsx b/public/app/features/dashboard-scene/sharing/public-dashboards/ConfirmModal.tsx
new file mode 100644
index 0000000000000..38c2867673311
--- /dev/null
+++ b/public/app/features/dashboard-scene/sharing/public-dashboards/ConfirmModal.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+
+import { SceneComponentProps, SceneObjectBase, SceneObjectState } from '@grafana/scenes';
+import { ConfirmModal as ConfirmModalComponent, ConfirmModalProps } from '@grafana/ui';
+
+import { ModalSceneObjectLike } from '../types';
+
+interface ConfirmModalState extends ConfirmModalProps, SceneObjectState {}
+
+export class ConfirmModal extends SceneObjectBase<ConfirmModalState> implements ModalSceneObjectLike {
+  static Component = ConfirmModalRenderer;
+
+  constructor(state: ConfirmModalState) {
+    super({
+      confirmVariant: 'destructive',
+      dismissText: 'Cancel',
+      dismissVariant: 'secondary',
+      icon: 'exclamation-triangle',
+      confirmButtonVariant: 'destructive',
+      ...state,
+    });
+  }
+
+  onDismiss() {}
+}
+
+function ConfirmModalRenderer({ model }: SceneComponentProps<ConfirmModal>) {
+  const props = model.useState();
+  return <ConfirmModalComponent {...props} />;
+}
diff --git a/public/app/features/dashboard-scene/sharing/public-dashboards/CreatePublicDashboard.tsx b/public/app/features/dashboard-scene/sharing/public-dashboards/CreatePublicDashboard.tsx
new file mode 100644
index 0000000000000..5b01c56aa725e
--- /dev/null
+++ b/public/app/features/dashboard-scene/sharing/public-dashboards/CreatePublicDashboard.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+
+import { SceneComponentProps } from '@grafana/scenes';
+import { CreatePublicDashboardBase } from 'app/features/dashboard/components/ShareModal/SharePublicDashboard/CreatePublicDashboard/CreatePublicDashboard';
+
+import { SharePublicDashboardTab } from './SharePublicDashboardTab';
+import { useUnsupportedDatasources } from './hooks';
+
+export function CreatePublicDashboard({ model }: SceneComponentProps<SharePublicDashboardTab>) {
+  const { dashboardRef } = model.useState();
+  const dashboard = dashboardRef.resolve();
+  const unsupportedDataSources = useUnsupportedDatasources(dashboard);
+  const hasTemplateVariables = (dashboard.state.$variables?.state.variables.length ?? 0) > 0;
+
+  return (
+    <CreatePublicDashboardBase
+      dashboard={dashboard}
+      unsupportedDatasources={unsupportedDataSources}
+      unsupportedTemplateVariables={hasTemplateVariables}
+    />
+  );
+}
diff --git a/public/app/features/dashboard-scene/sharing/public-dashboards/SharePublicDashboardTab.tsx b/public/app/features/dashboard-scene/sharing/public-dashboards/SharePublicDashboardTab.tsx
new file mode 100644
index 0000000000000..311652d5fb85d
--- /dev/null
+++ b/public/app/features/dashboard-scene/sharing/public-dashboards/SharePublicDashboardTab.tsx
@@ -0,0 +1,40 @@
+import React from 'react';
+
+import { SceneComponentProps, SceneObjectBase } from '@grafana/scenes';
+import { t } from 'app/core/internationalization';
+import { useGetPublicDashboardQuery } from 'app/features/dashboard/api/publicDashboardApi';
+import { Loader } from 'app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard';
+import { publicDashboardPersisted } from 'app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils';
+import { shareDashboardType } from 'app/features/dashboard/components/ShareModal/utils';
+
+import { SceneShareTabState } from '../types';
+
+import { ConfigPublicDashboard } from './ConfigPublicDashboard';
+import { CreatePublicDashboard } from './CreatePublicDashboard';
+
+export class SharePublicDashboardTab extends SceneObjectBase<SceneShareTabState> {
+  public tabId = shareDashboardType.publicDashboard;
+  static Component = SharePublicDashboardTabRenderer;
+
+  public getTabLabel() {
+    return t('share-modal.tab-title.public-dashboard', 'Public Dashboard');
+  }
+}
+
+function SharePublicDashboardTabRenderer({ model }: SceneComponentProps<SharePublicDashboardTab>) {
+  const { data: publicDashboard, isLoading: isGetLoading } = useGetPublicDashboardQuery(
+    model.state.dashboardRef.resolve().state.uid!
+  );
+
+  return (
+    <>
+      {isGetLoading ? (
+        <Loader />
+      ) : !publicDashboardPersisted(publicDashboard) ? (
+        <CreatePublicDashboard model={model} />
+      ) : (
+        <ConfigPublicDashboard model={model} publicDashboard={publicDashboard} isGetLoading={isGetLoading} />
+      )}
+    </>
+  );
+}
diff --git a/public/app/features/dashboard-scene/sharing/public-dashboards/hooks.ts b/public/app/features/dashboard-scene/sharing/public-dashboards/hooks.ts
new file mode 100644
index 0000000000000..1d05385958a67
--- /dev/null
+++ b/public/app/features/dashboard-scene/sharing/public-dashboards/hooks.ts
@@ -0,0 +1,14 @@
+import { useAsync } from 'react-use';
+
+import { DashboardScene } from '../../scene/DashboardScene';
+
+import { getPanelDatasourceTypes, getUnsupportedDashboardDatasources } from './utils';
+
+export function useUnsupportedDatasources(dashboard: DashboardScene) {
+  const { value: unsupportedDataSources } = useAsync(async () => {
+    const types = getPanelDatasourceTypes(dashboard);
+    return getUnsupportedDashboardDatasources(types);
+  }, []);
+
+  return unsupportedDataSources;
+}
diff --git a/public/app/features/dashboard-scene/sharing/public-dashboards/utils.ts b/public/app/features/dashboard-scene/sharing/public-dashboards/utils.ts
new file mode 100644
index 0000000000000..ba10cb5e976cf
--- /dev/null
+++ b/public/app/features/dashboard-scene/sharing/public-dashboards/utils.ts
@@ -0,0 +1,100 @@
+import { DataSourceWithBackend } from '@grafana/runtime';
+import {
+  SceneGridItemLike,
+  VizPanel,
+  SceneQueryRunner,
+  SceneDataTransformer,
+  SceneGridLayout,
+  SceneGridRow,
+} from '@grafana/scenes';
+import { supportedDatasources } from 'app/features/dashboard/components/ShareModal/SharePublicDashboard/SupportedPubdashDatasources';
+import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
+
+import { DashboardGridItem } from '../../scene/DashboardGridItem';
+import { DashboardScene } from '../../scene/DashboardScene';
+import { LibraryVizPanel } from '../../scene/LibraryVizPanel';
+
+export const getUnsupportedDashboardDatasources = async (types: string[]): Promise<string[]> => {
+  let unsupportedDS = new Set<string>();
+
+  for (const type of types) {
+    if (!supportedDatasources.has(type)) {
+      unsupportedDS.add(type);
+    } else {
+      const ds = await getDatasourceSrv().get(type);
+      if (!(ds instanceof DataSourceWithBackend)) {
+        unsupportedDS.add(type);
+      }
+    }
+  }
+
+  return Array.from(unsupportedDS);
+};
+
+export function getPanelDatasourceTypes(scene: DashboardScene): string[] {
+  const types = new Set<string>();
+
+  const body = scene.state.body;
+  if (!(body instanceof SceneGridLayout)) {
+    return [];
+  }
+
+  for (const child of body.state.children) {
+    if (child instanceof DashboardGridItem) {
+      const ts = panelDatasourceTypes(child);
+      for (const t of ts) {
+        types.add(t);
+      }
+    }
+
+    if (child instanceof SceneGridRow) {
+      const ts = rowTypes(child);
+      for (const t of ts) {
+        types.add(t);
+      }
+    }
+  }
+
+  return Array.from(types).sort();
+}
+
+function rowTypes(gridRow: SceneGridRow) {
+  const types = new Set(gridRow.state.children.map((c) => panelDatasourceTypes(c)).flat());
+  return types;
+}
+
+function panelDatasourceTypes(gridItem: SceneGridItemLike) {
+  let vizPanel: VizPanel | LibraryVizPanel | undefined;
+
+  if (gridItem instanceof DashboardGridItem) {
+    if (gridItem.state.body instanceof LibraryVizPanel) {
+      vizPanel = gridItem.state.body.state.panel;
+    } else if (gridItem.state.body instanceof VizPanel) {
+      vizPanel = gridItem.state.body;
+    } else {
+      throw new Error('DashboardGridItem body expected to be VizPanel');
+    }
+  }
+
+  if (!vizPanel) {
+    throw new Error('Unsupported grid item type');
+  }
+  const dataProvider = vizPanel.state.$data;
+  const types = new Set<string>();
+  if (dataProvider instanceof SceneQueryRunner) {
+    for (const q of dataProvider.state.queries) {
+      types.add(q.datasource?.type ?? '');
+    }
+  }
+
+  if (dataProvider instanceof SceneDataTransformer) {
+    const panelData = dataProvider.state.$data;
+    if (panelData instanceof SceneQueryRunner) {
+      for (const q of panelData.state.queries) {
+        types.add(q.datasource?.type ?? '');
+      }
+    }
+  }
+
+  return Array.from(types);
+}
diff --git a/public/app/features/dashboard-scene/sharing/types.ts b/public/app/features/dashboard-scene/sharing/types.ts
index 3dafb3b89f281..1d4aadf09076c 100644
--- a/public/app/features/dashboard-scene/sharing/types.ts
+++ b/public/app/features/dashboard-scene/sharing/types.ts
@@ -1,13 +1,17 @@
 import { SceneObject, SceneObjectRef, SceneObjectState } from '@grafana/scenes';
 
+import { DashboardScene } from '../scene/DashboardScene';
+
 export interface ModalSceneObjectLike {
   onDismiss: () => void;
 }
 
 export interface SceneShareTabState extends SceneObjectState {
+  dashboardRef: SceneObjectRef<DashboardScene>;
   modalRef?: SceneObjectRef<ModalSceneObjectLike>;
 }
 
 export interface SceneShareTab<T extends SceneShareTabState = SceneShareTabState> extends SceneObject<T> {
   getTabLabel(): string;
+  tabId: string;
 }
diff --git a/public/app/features/dashboard-scene/solo/SoloPanelPage.tsx b/public/app/features/dashboard-scene/solo/SoloPanelPage.tsx
new file mode 100644
index 0000000000000..e875ee2f06adb
--- /dev/null
+++ b/public/app/features/dashboard-scene/solo/SoloPanelPage.tsx
@@ -0,0 +1,63 @@
+// Libraries
+import React, { useEffect } from 'react';
+
+import { Alert, Spinner } from '@grafana/ui';
+import PageLoader from 'app/core/components/PageLoader/PageLoader';
+import { EntityNotFound } from 'app/core/components/PageNotFound/EntityNotFound';
+import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
+import { DashboardPageRouteParams } from 'app/features/dashboard/containers/types';
+import { DashboardRoutes } from 'app/types';
+
+import { getDashboardScenePageStateManager } from '../pages/DashboardScenePageStateManager';
+import { DashboardScene } from '../scene/DashboardScene';
+
+import { useSoloPanel } from './useSoloPanel';
+
+export interface Props extends GrafanaRouteComponentProps<DashboardPageRouteParams, { panelId: string }> {}
+
+/**
+ * Used for iframe embedding and image rendering of single panels
+ */
+export function SoloPanelPage({ match, queryParams }: Props) {
+  const stateManager = getDashboardScenePageStateManager();
+  const { dashboard } = stateManager.useState();
+
+  useEffect(() => {
+    stateManager.loadDashboard({ uid: match.params.uid!, route: DashboardRoutes.Embedded });
+    return () => stateManager.clearState();
+  }, [stateManager, match, queryParams]);
+
+  if (!queryParams.panelId) {
+    return <EntityNotFound entity="Panel" />;
+  }
+
+  if (!dashboard) {
+    return <PageLoader />;
+  }
+
+  return <SoloPanelRenderer dashboard={dashboard} panelId={queryParams.panelId} />;
+}
+
+export default SoloPanelPage;
+
+export function SoloPanelRenderer({ dashboard, panelId }: { dashboard: DashboardScene; panelId: string }) {
+  const [panel, error] = useSoloPanel(dashboard, panelId);
+
+  if (error) {
+    return <Alert title={error} />;
+  }
+
+  if (!panel) {
+    return (
+      <span>
+        Loading <Spinner />
+      </span>
+    );
+  }
+
+  return (
+    <div className="panel-solo">
+      <panel.Component model={panel} />
+    </div>
+  );
+}
diff --git a/public/app/features/dashboard-scene/solo/useSoloPanel.ts b/public/app/features/dashboard-scene/solo/useSoloPanel.ts
new file mode 100644
index 0000000000000..27acec7d414e8
--- /dev/null
+++ b/public/app/features/dashboard-scene/solo/useSoloPanel.ts
@@ -0,0 +1,84 @@
+import { useState, useEffect } from 'react';
+
+import { VizPanel, SceneObject, SceneGridRow, getUrlSyncManager } from '@grafana/scenes';
+
+import { DashboardGridItem } from '../scene/DashboardGridItem';
+import { DashboardScene } from '../scene/DashboardScene';
+import { RowRepeaterBehavior } from '../scene/RowRepeaterBehavior';
+import { DashboardRepeatsProcessedEvent } from '../scene/types';
+import { findVizPanelByKey, isPanelClone } from '../utils/utils';
+
+export function useSoloPanel(dashboard: DashboardScene, panelId: string): [VizPanel | undefined, string | undefined] {
+  const [panel, setPanel] = useState<VizPanel>();
+  const [error, setError] = useState<string | undefined>();
+
+  useEffect(() => {
+    getUrlSyncManager().initSync(dashboard);
+
+    const cleanUp = dashboard.activate();
+
+    const panel = findVizPanelByKey(dashboard, panelId);
+    if (panel) {
+      activateParents(panel);
+      setPanel(panel);
+    } else if (isPanelClone(panelId)) {
+      findRepeatClone(dashboard, panelId).then((panel) => {
+        if (panel) {
+          setPanel(panel);
+        } else {
+          setError('Panel not found');
+        }
+      });
+    }
+
+    return cleanUp;
+  }, [dashboard, panelId]);
+
+  return [panel, error];
+}
+
+function activateParents(panel: VizPanel) {
+  let parent = panel.parent;
+
+  while (parent && !parent.isActive) {
+    parent.activate();
+    parent = parent.parent;
+  }
+}
+
+function findRepeatClone(dashboard: DashboardScene, panelId: string): Promise<VizPanel | undefined> {
+  return new Promise((resolve) => {
+    dashboard.subscribeToEvent(DashboardRepeatsProcessedEvent, () => {
+      const panel = findVizPanelByKey(dashboard, panelId);
+      if (panel) {
+        resolve(panel);
+      } else {
+        // If rows are repeated they could add new panel repeaters that needs to be activated
+        activateAllRepeaters(dashboard.state.body);
+      }
+    });
+
+    activateAllRepeaters(dashboard.state.body);
+  });
+}
+
+function activateAllRepeaters(layout: SceneObject) {
+  layout.forEachChild((child) => {
+    if (child instanceof DashboardGridItem && !child.isActive) {
+      child.activate();
+      return;
+    }
+
+    if (child instanceof SceneGridRow && child.state.$behaviors) {
+      for (const behavior of child.state.$behaviors) {
+        if (behavior instanceof RowRepeaterBehavior && !child.isActive) {
+          child.activate();
+          break;
+        }
+      }
+
+      // Activate any panel DashboardGridItem inside the row
+      activateAllRepeaters(child);
+    }
+  });
+}
diff --git a/public/app/features/dashboard-scene/utils/DashboardModelCompatibilityWrapper.test.ts b/public/app/features/dashboard-scene/utils/DashboardModelCompatibilityWrapper.test.ts
index fa705c8ab7413..a6b43edad2e06 100644
--- a/public/app/features/dashboard-scene/utils/DashboardModelCompatibilityWrapper.test.ts
+++ b/public/app/features/dashboard-scene/utils/DashboardModelCompatibilityWrapper.test.ts
@@ -1,19 +1,66 @@
 import { TimeRangeUpdatedEvent } from '@grafana/runtime';
-import { behaviors, SceneGridItem, SceneGridLayout, SceneQueryRunner, SceneTimeRange, VizPanel } from '@grafana/scenes';
+import {
+  behaviors,
+  SceneGridLayout,
+  SceneQueryRunner,
+  SceneTimeRange,
+  VizPanel,
+  SceneDataTransformer,
+  SceneDataLayerSet,
+} from '@grafana/scenes';
 import { DashboardCursorSync } from '@grafana/schema';
+import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard';
 
+import { AlertStatesDataLayer } from '../scene/AlertStatesDataLayer';
+import { DashboardAnnotationsDataLayer } from '../scene/DashboardAnnotationsDataLayer';
+import { DashboardControls } from '../scene/DashboardControls';
+import { DashboardGridItem } from '../scene/DashboardGridItem';
 import { DashboardScene } from '../scene/DashboardScene';
+import { NEW_LINK } from '../settings/links/utils';
 
 import { DashboardModelCompatibilityWrapper } from './DashboardModelCompatibilityWrapper';
 
 describe('DashboardModelCompatibilityWrapper', () => {
   it('Provide basic prop and function of compatability', () => {
-    const { wrapper } = setup();
+    const { wrapper, scene } = setup();
 
     expect(wrapper.uid).toBe('dash-1');
     expect(wrapper.title).toBe('hello');
-
+    expect(wrapper.description).toBe('hello description');
+    expect(wrapper.editable).toBe(false);
+    expect(wrapper.graphTooltip).toBe(DashboardCursorSync.Off);
+    expect(wrapper.tags).toEqual(['hello-tag']);
+    expect(wrapper.links).toEqual([NEW_LINK]);
     expect(wrapper.time.from).toBe('now-6h');
+    expect(wrapper.timezone).toBe('America/New_York');
+    expect(wrapper.weekStart).toBe('friday');
+    expect(wrapper.timepicker.refresh_intervals![0]).toEqual('5s');
+    expect(wrapper.timepicker.hidden).toEqual(true);
+    expect(wrapper.panels).toHaveLength(5);
+
+    expect(wrapper.annotations.list).toHaveLength(1);
+    expect(wrapper.annotations.list[0].name).toBe('test');
+
+    expect(wrapper.panels[0].targets).toHaveLength(1);
+    expect(wrapper.panels[0].targets[0]).toEqual({ refId: 'A' });
+    expect(wrapper.panels[1].targets).toHaveLength(0);
+    expect(wrapper.panels[2].targets).toHaveLength(1);
+    expect(wrapper.panels[2].targets).toEqual([{ refId: 'A', panelId: 1 }]);
+    expect(wrapper.panels[3].targets).toHaveLength(1);
+    expect(wrapper.panels[3].targets[0]).toEqual({ refId: 'A' });
+    expect(wrapper.panels[4].targets).toHaveLength(1);
+    expect(wrapper.panels[4].targets).toEqual([{ refId: 'A', panelId: 1 }]);
+
+    expect(wrapper.panels[0].datasource).toEqual({ uid: 'gdev-testdata', type: 'grafana-testdata-datasource' });
+    expect(wrapper.panels[1].datasource).toEqual(undefined);
+    expect(wrapper.panels[2].datasource).toEqual({ uid: SHARED_DASHBOARD_QUERY, type: 'datasource' });
+    expect(wrapper.panels[3].datasource).toEqual({ uid: 'gdev-testdata', type: 'grafana-testdata-datasource' });
+    expect(wrapper.panels[4].datasource).toEqual({ uid: SHARED_DASHBOARD_QUERY, type: 'datasource' });
+
+    scene.state.controls!.setState({ hideTimeControls: false });
+
+    const wrapper2 = new DashboardModelCompatibilityWrapper(scene);
+    expect(wrapper2.timepicker.hidden).toEqual(false);
   });
 
   it('Shared tooltip functions', () => {
@@ -25,6 +72,7 @@ describe('DashboardModelCompatibilityWrapper', () => {
 
     expect(wrapper.sharedTooltipModeEnabled()).toBe(true);
     expect(wrapper.sharedCrosshairModeOnly()).toBe(true);
+    expect(wrapper.graphTooltip).toBe(DashboardCursorSync.Crosshair);
   });
 
   it('Get timezone from time range', () => {
@@ -44,37 +92,154 @@ describe('DashboardModelCompatibilityWrapper', () => {
   it('Can get fake panel with getPanelById', () => {
     const { wrapper } = setup();
 
-    expect(wrapper.getPanelById(1)!.title).toBe('Panel A');
-    expect(wrapper.getPanelById(2)!.title).toBe('Panel B');
+    expect(wrapper.getPanelById(1)!.title).toBe('Panel with a regular data source query');
+    expect(wrapper.getPanelById(2)!.title).toBe('Panel with no queries');
+  });
+
+  it('Can remove panel', () => {
+    const { wrapper, scene } = setup();
+
+    expect((scene.state.body as SceneGridLayout).state.children.length).toBe(5);
+
+    wrapper.removePanel(wrapper.getPanelById(1)!);
+
+    expect((scene.state.body as SceneGridLayout).state.children.length).toBe(4);
+  });
+
+  it('Checks if annotations are editable', () => {
+    const { wrapper, scene } = setup();
+
+    expect(wrapper.canEditAnnotations()).toBe(true);
+    expect(wrapper.canEditAnnotations(scene.state.uid)).toBe(false);
+
+    scene.setState({
+      meta: {
+        canEdit: false,
+        canMakeEditable: false,
+      },
+    });
+
+    expect(wrapper.canEditAnnotations()).toBe(false);
   });
 });
 
 function setup() {
   const scene = new DashboardScene({
     title: 'hello',
+    description: 'hello description',
+    tags: ['hello-tag'],
+    links: [NEW_LINK],
     uid: 'dash-1',
+    editable: false,
+    meta: {
+      canEdit: true,
+      canMakeEditable: true,
+      annotationsPermissions: {
+        organization: {
+          canEdit: true,
+          canAdd: true,
+          canDelete: true,
+        },
+        dashboard: {
+          canEdit: false,
+          canAdd: false,
+          canDelete: false,
+        },
+      },
+    },
     $timeRange: new SceneTimeRange({
+      weekStart: 'friday',
       timeZone: 'America/New_York',
     }),
+    $data: new SceneDataLayerSet({
+      layers: [
+        new DashboardAnnotationsDataLayer({
+          key: `annotations-test`,
+          query: {
+            enable: true,
+            iconColor: 'red',
+            name: 'test',
+          },
+          name: 'test',
+          isEnabled: true,
+          isHidden: false,
+        }),
+        new AlertStatesDataLayer({
+          key: 'alert-states',
+          name: 'Alert States',
+        }),
+      ],
+    }),
+    controls: new DashboardControls({
+      hideTimeControls: true,
+    }),
     body: new SceneGridLayout({
       children: [
-        new SceneGridItem({
+        new DashboardGridItem({
           key: 'griditem-1',
           x: 0,
           body: new VizPanel({
-            title: 'Panel A',
+            title: 'Panel with a regular data source query',
             key: 'panel-1',
             pluginId: 'table',
-            $data: new SceneQueryRunner({ key: 'data-query-runner', queries: [{ refId: 'A' }] }),
+            $data: new SceneQueryRunner({
+              key: 'data-query-runner',
+              queries: [{ refId: 'A' }],
+              datasource: { uid: 'gdev-testdata', type: 'grafana-testdata-datasource' },
+            }),
           }),
         }),
-        new SceneGridItem({
+        new DashboardGridItem({
           body: new VizPanel({
-            title: 'Panel B',
+            title: 'Panel with no queries',
             key: 'panel-2',
             pluginId: 'table',
           }),
         }),
+
+        new DashboardGridItem({
+          body: new VizPanel({
+            title: 'Panel with a shared query',
+            key: 'panel-3',
+            pluginId: 'table',
+            $data: new SceneQueryRunner({
+              key: 'data-query-runner',
+              queries: [{ refId: 'A', panelId: 1 }],
+              datasource: { uid: SHARED_DASHBOARD_QUERY, type: 'datasource' },
+            }),
+          }),
+        }),
+
+        new DashboardGridItem({
+          body: new VizPanel({
+            title: 'Panel with a regular data source query and transformations',
+            key: 'panel-4',
+            pluginId: 'table',
+            $data: new SceneDataTransformer({
+              $data: new SceneQueryRunner({
+                key: 'data-query-runner',
+                queries: [{ refId: 'A' }],
+                datasource: { uid: 'gdev-testdata', type: 'grafana-testdata-datasource' },
+              }),
+              transformations: [],
+            }),
+          }),
+        }),
+        new DashboardGridItem({
+          body: new VizPanel({
+            title: 'Panel with a shared query and transformations',
+            key: 'panel-4',
+            pluginId: 'table',
+            $data: new SceneDataTransformer({
+              $data: new SceneQueryRunner({
+                key: 'data-query-runner',
+                queries: [{ refId: 'A', panelId: 1 }],
+                datasource: { uid: SHARED_DASHBOARD_QUERY, type: 'datasource' },
+              }),
+              transformations: [],
+            }),
+          }),
+        }),
       ],
     }),
   });
diff --git a/public/app/features/dashboard-scene/utils/DashboardModelCompatibilityWrapper.ts b/public/app/features/dashboard-scene/utils/DashboardModelCompatibilityWrapper.ts
index 6cce5418c7877..a5e25a939681c 100644
--- a/public/app/features/dashboard-scene/utils/DashboardModelCompatibilityWrapper.ts
+++ b/public/app/features/dashboard-scene/utils/DashboardModelCompatibilityWrapper.ts
@@ -2,10 +2,21 @@ import { Subscription } from 'rxjs';
 
 import { AnnotationQuery, DashboardCursorSync, dateTimeFormat, DateTimeInput, EventBusSrv } from '@grafana/data';
 import { TimeRangeUpdatedEvent } from '@grafana/runtime';
-import { behaviors, SceneDataTransformer, sceneGraph, VizPanel } from '@grafana/scenes';
-
+import {
+  behaviors,
+  SceneDataLayerSet,
+  sceneGraph,
+  SceneGridLayout,
+  SceneGridRow,
+  SceneObject,
+  VizPanel,
+} from '@grafana/scenes';
+
+import { DashboardGridItem } from '../scene/DashboardGridItem';
 import { DashboardScene } from '../scene/DashboardScene';
+import { dataLayersToAnnotations } from '../serialization/dataLayersToAnnotations';
 
+import { PanelModelCompatibilityWrapper } from './PanelModelCompatibilityWrapper';
 import { findVizPanelByKey, getVizPanelKeyForPanelId } from './utils';
 
 /**
@@ -18,6 +29,9 @@ export class DashboardModelCompatibilityWrapper {
   public constructor(private _scene: DashboardScene) {
     const timeRange = sceneGraph.getTimeRange(_scene);
 
+    // Copied from DashboardModel, as this function is passed around
+    this.formatDate = this.formatDate.bind(this);
+
     this._subs.add(
       timeRange.subscribeToState((state, prev) => {
         if (state.value !== prev.value) {
@@ -39,6 +53,41 @@ export class DashboardModelCompatibilityWrapper {
     return this._scene.state.title;
   }
 
+  public get description() {
+    return this._scene.state.description;
+  }
+
+  public get editable() {
+    return this._scene.state.editable;
+  }
+
+  public get graphTooltip() {
+    return this._getSyncMode();
+  }
+
+  public get timepicker() {
+    return {
+      refresh_intervals: this._scene.state.controls!.state.refreshPicker.state.intervals,
+      hidden: this._scene.state.controls!.state.hideTimeControls ?? false,
+    };
+  }
+
+  public get timezone() {
+    return this.getTimezone();
+  }
+
+  public get weekStart() {
+    return sceneGraph.getTimeRange(this._scene).state.weekStart;
+  }
+
+  public get tags() {
+    return this._scene.state.tags;
+  }
+
+  public get links() {
+    return this._scene.state.links;
+  }
+
   public get meta() {
     return this._scene.state.meta;
   }
@@ -51,12 +100,24 @@ export class DashboardModelCompatibilityWrapper {
     };
   }
 
+  public get panels() {
+    const panels = findAllObjects(this._scene, (o) => {
+      return Boolean(o instanceof VizPanel);
+    });
+    return panels.map((p) => new PanelModelCompatibilityWrapper(p as VizPanel));
+  }
+
   /**
    * Used from from timeseries migration handler to migrate time regions to dashboard annotations
    */
   public get annotations(): { list: AnnotationQuery[] } {
-    console.error('Scenes DashboardModelCompatibilityWrapper.annotations not implemented (yet)');
-    return { list: [] };
+    const annotations: { list: AnnotationQuery[] } = { list: [] };
+
+    if (this._scene.state.$data instanceof SceneDataLayerSet) {
+      annotations.list = dataLayersToAnnotations(this._scene.state.$data.state.layers);
+    }
+
+    return annotations;
   }
 
   public getTimezone() {
@@ -95,23 +156,70 @@ export class DashboardModelCompatibilityWrapper {
     });
   }
 
-  public getPanelById(id: number): PanelCompatibilityWrapper | null {
+  public getPanelById(id: number): PanelModelCompatibilityWrapper | null {
     const vizPanel = findVizPanelByKey(this._scene, getVizPanelKeyForPanelId(id));
     if (vizPanel) {
-      return new PanelCompatibilityWrapper(vizPanel);
+      return new PanelModelCompatibilityWrapper(vizPanel);
     }
 
     return null;
   }
 
-  public removePanel(panel: PanelCompatibilityWrapper) {
-    // TODO
-    console.error('Scenes DashboardModelCompatibilityWrapper.removePanel not implemented (yet)');
+  /**
+   * Mainly implemented to support Getting started panel's dissmis button.
+   */
+  public removePanel(panel: PanelModelCompatibilityWrapper) {
+    const vizPanel = findVizPanelByKey(this._scene, getVizPanelKeyForPanelId(panel.id));
+    if (!vizPanel) {
+      console.error('Trying to remove a panel that was not found in scene', panel);
+      return;
+    }
+
+    const gridItem = vizPanel.parent;
+    if (!(gridItem instanceof DashboardGridItem)) {
+      console.error('Trying to remove a panel that is not wrapped in DashboardGridItem');
+      return;
+    }
+
+    const layout = sceneGraph.getLayout(vizPanel);
+    if (!(layout instanceof SceneGridLayout)) {
+      console.error('Trying to remove a panel in a layout that is not SceneGridLayout ');
+      return;
+    }
+
+    // if grid item is directly in the layout just remove it
+    if (layout === gridItem.parent) {
+      layout.setState({
+        children: layout.state.children.filter((child) => child !== gridItem),
+      });
+    }
+
+    // Removing from a row is a bit more complicated
+    if (gridItem.parent instanceof SceneGridRow) {
+      // Clone the row and remove the grid item
+      const newRow = layout.clone({
+        children: layout.state.children.filter((child) => child !== gridItem),
+      });
+
+      // Now update the grid layout and replace the row with the updated one
+      if (layout.parent instanceof SceneGridLayout) {
+        layout.parent.setState({
+          children: layout.parent.state.children.map((child) => (child === layout ? newRow : child)),
+        });
+      }
+    }
   }
 
   public canEditAnnotations(dashboardUID?: string) {
-    // TOOD
-    return false;
+    if (!this._scene.canEditDashboard()) {
+      return false;
+    }
+
+    if (dashboardUID) {
+      return Boolean(this._scene.state.meta.annotationsPermissions?.dashboard.canEdit);
+    }
+
+    return Boolean(this._scene.state.meta.annotationsPermissions?.organization.canEdit);
   }
 
   public panelInitialized() {}
@@ -120,36 +228,21 @@ export class DashboardModelCompatibilityWrapper {
     this.events.removeAllListeners();
     this._subs.unsubscribe();
   }
-}
 
-class PanelCompatibilityWrapper {
-  constructor(private _vizPanel: VizPanel) {}
-
-  public get type() {
-    return this._vizPanel.state.pluginId;
-  }
-
-  public get title() {
-    return this._vizPanel.state.title;
+  public hasUnsavedChanges() {
+    return this._scene.state.isDirty;
   }
+}
 
-  public get transformations() {
-    if (this._vizPanel.state.$data instanceof SceneDataTransformer) {
-      return this._vizPanel.state.$data.state.transformations;
+function findAllObjects(root: SceneObject, check: (o: SceneObject) => boolean) {
+  let result: SceneObject[] = [];
+  root.forEachChild((child) => {
+    if (check(child)) {
+      result.push(child);
+    } else {
+      result = result.concat(findAllObjects(child, check));
     }
+  });
 
-    return [];
-  }
-
-  public refresh() {
-    console.error('Scenes PanelCompatibilityWrapper.refresh no implemented (yet)');
-  }
-
-  public render() {
-    console.error('Scenes PanelCompatibilityWrapper.render no implemented (yet)');
-  }
-
-  public getQueryRunner() {
-    console.error('Scenes PanelCompatibilityWrapper.getQueryRunner no implemented (yet)');
-  }
+  return result;
 }
diff --git a/public/app/features/dashboard-scene/utils/PanelModelCompatibilityWrapper.test.ts b/public/app/features/dashboard-scene/utils/PanelModelCompatibilityWrapper.test.ts
new file mode 100644
index 0000000000000..ed445f65cf362
--- /dev/null
+++ b/public/app/features/dashboard-scene/utils/PanelModelCompatibilityWrapper.test.ts
@@ -0,0 +1,26 @@
+import { VizPanel } from '@grafana/scenes';
+
+import { LibraryVizPanel } from '../scene/LibraryVizPanel';
+
+import { PanelModelCompatibilityWrapper } from './PanelModelCompatibilityWrapper';
+
+describe('PanelModelCompatibilityWrapper', () => {
+  it('Can get legacy id', () => {
+    const vizPanel = new VizPanel({ pluginId: 'test', title: 'test', description: 'test', key: 'panel-24' });
+    const panelModel = new PanelModelCompatibilityWrapper(vizPanel);
+    expect(panelModel.id).toBe(24);
+  });
+
+  it('Can get legacy id for lib panel', () => {
+    const libPanel = new LibraryVizPanel({
+      uid: 'a',
+      name: 'aa',
+      title: 'a',
+      panelKey: 'panel-24',
+      panel: new VizPanel({ pluginId: 'test', title: 'test', description: 'test', key: 'panel-24' }),
+    });
+
+    const panelModel = new PanelModelCompatibilityWrapper(libPanel.state.panel!);
+    expect(panelModel.id).toBe(24);
+  });
+});
diff --git a/public/app/features/dashboard-scene/utils/PanelModelCompatibilityWrapper.ts b/public/app/features/dashboard-scene/utils/PanelModelCompatibilityWrapper.ts
new file mode 100644
index 0000000000000..820fc3b51349b
--- /dev/null
+++ b/public/app/features/dashboard-scene/utils/PanelModelCompatibilityWrapper.ts
@@ -0,0 +1,66 @@
+import { PanelModel } from '@grafana/data';
+import { SceneDataTransformer, VizPanel } from '@grafana/scenes';
+import { DataSourceRef, DataTransformerConfig } from '@grafana/schema';
+
+import { getPanelIdForVizPanel, getQueryRunnerFor } from './utils';
+
+export class PanelModelCompatibilityWrapper implements PanelModel {
+  constructor(private _vizPanel: VizPanel) {}
+
+  public get id() {
+    const id = getPanelIdForVizPanel(this._vizPanel);
+
+    if (isNaN(id)) {
+      console.error('VizPanel key could not be translated to a legacy numeric panel id', this._vizPanel);
+      return 0;
+    }
+
+    return id;
+  }
+
+  public get description() {
+    return this._vizPanel.state.description;
+  }
+
+  public get type() {
+    return this._vizPanel.state.pluginId;
+  }
+
+  public get title() {
+    return this._vizPanel.state.title;
+  }
+
+  public get transformations() {
+    if (this._vizPanel.state.$data instanceof SceneDataTransformer) {
+      return this._vizPanel.state.$data.state.transformations as DataTransformerConfig[];
+    }
+
+    return [];
+  }
+
+  public get targets() {
+    const queryRunner = getQueryRunnerFor(this._vizPanel);
+    if (!queryRunner) {
+      return [];
+    }
+
+    return queryRunner.state.queries;
+  }
+
+  public get datasource(): DataSourceRef | null | undefined {
+    const queryRunner = getQueryRunnerFor(this._vizPanel);
+    return queryRunner?.state.datasource;
+  }
+
+  public get options() {
+    return this._vizPanel.state.options;
+  }
+
+  public get fieldConfig() {
+    return this._vizPanel.state.fieldConfig;
+  }
+
+  public get pluginVersion() {
+    return this._vizPanel.state.pluginVersion;
+  }
+}
diff --git a/public/app/features/dashboard-scene/utils/createPanelDataProvider.ts b/public/app/features/dashboard-scene/utils/createPanelDataProvider.ts
index 12a6d721db2ac..758d60be473a9 100644
--- a/public/app/features/dashboard-scene/utils/createPanelDataProvider.ts
+++ b/public/app/features/dashboard-scene/utils/createPanelDataProvider.ts
@@ -1,9 +1,8 @@
 import { config } from '@grafana/runtime';
 import { SceneDataProvider, SceneDataTransformer, SceneQueryRunner } from '@grafana/scenes';
 import { PanelModel } from 'app/features/dashboard/state';
-import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard';
 
-import { ShareQueryDataProvider } from '../scene/ShareQueryDataProvider';
+import { DashboardDatasourceBehaviour } from '../scene/DashboardDatasourceBehaviour';
 
 export function createPanelDataProvider(panel: PanelModel): SceneDataProvider | undefined {
   // Skip setting query runner for panels without queries
@@ -18,27 +17,23 @@ export function createPanelDataProvider(panel: PanelModel): SceneDataProvider |
 
   let dataProvider: SceneDataProvider | undefined = undefined;
 
-  if (panel.datasource?.uid === SHARED_DASHBOARD_QUERY) {
-    dataProvider = new ShareQueryDataProvider({ query: panel.targets[0] });
-  } else {
-    dataProvider = new SceneQueryRunner({
-      datasource: panel.datasource ?? undefined,
-      queries: panel.targets,
-      maxDataPoints: panel.maxDataPoints ?? undefined,
-      maxDataPointsFromWidth: true,
-      dataLayerFilter: {
-        panelId: panel.id,
-      },
-    });
-  }
+  dataProvider = new SceneQueryRunner({
+    datasource: panel.datasource ?? undefined,
+    queries: panel.targets,
+    maxDataPoints: panel.maxDataPoints ?? undefined,
+    maxDataPointsFromWidth: true,
+    cacheTimeout: panel.cacheTimeout,
+    queryCachingTTL: panel.queryCachingTTL,
+    minInterval: panel.interval ?? undefined,
+    dataLayerFilter: {
+      panelId: panel.id,
+    },
+    $behaviors: [new DashboardDatasourceBehaviour({})],
+  });
 
   // Wrap inner data provider in a data transformer
-  if (panel.transformations?.length) {
-    dataProvider = new SceneDataTransformer({
-      $data: dataProvider,
-      transformations: panel.transformations,
-    });
-  }
-
-  return dataProvider;
+  return new SceneDataTransformer({
+    $data: dataProvider,
+    transformations: panel.transformations || [],
+  });
 }
diff --git a/public/app/features/dashboard-scene/utils/dashboardSceneGraph.test.ts b/public/app/features/dashboard-scene/utils/dashboardSceneGraph.test.ts
new file mode 100644
index 0000000000000..e9cd110226dc3
--- /dev/null
+++ b/public/app/features/dashboard-scene/utils/dashboardSceneGraph.test.ts
@@ -0,0 +1,314 @@
+import { SceneGridLayout, SceneGridRow, SceneQueryRunner, SceneTimeRange, VizPanel, behaviors } from '@grafana/scenes';
+import { DashboardCursorSync } from '@grafana/schema';
+
+import { DashboardAnnotationsDataLayer } from '../scene/DashboardAnnotationsDataLayer';
+import { DashboardControls } from '../scene/DashboardControls';
+import { DashboardDataLayerSet } from '../scene/DashboardDataLayerSet';
+import { DashboardGridItem } from '../scene/DashboardGridItem';
+import { DashboardScene, DashboardSceneState } from '../scene/DashboardScene';
+import { LibraryVizPanel } from '../scene/LibraryVizPanel';
+import { VizPanelLinks, VizPanelLinksMenu } from '../scene/PanelLinks';
+
+import { dashboardSceneGraph, getNextPanelId } from './dashboardSceneGraph';
+import { findVizPanelByKey } from './utils';
+
+describe('dashboardSceneGraph', () => {
+  describe('getPanelLinks', () => {
+    it('should return null if no links object defined', () => {
+      const scene = buildTestScene();
+      const panelWithNoLinks = findVizPanelByKey(scene, 'panel-1')!;
+      expect(dashboardSceneGraph.getPanelLinks(panelWithNoLinks)).toBeNull();
+    });
+
+    it('should resolve VizPanelLinks object', () => {
+      const scene = buildTestScene();
+      const panelWithNoLinks = findVizPanelByKey(scene, 'panel-with-links')!;
+      expect(dashboardSceneGraph.getPanelLinks(panelWithNoLinks)).toBeInstanceOf(VizPanelLinks);
+    });
+  });
+
+  describe('getVizPanels', () => {
+    let scene: DashboardScene;
+
+    beforeEach(async () => {
+      scene = buildTestScene();
+    });
+
+    it('Should return all panels', () => {
+      const vizPanels = dashboardSceneGraph.getVizPanels(scene);
+
+      expect(vizPanels.length).toBe(6);
+      expect(vizPanels[0].state.title).toBe('Panel A');
+      expect(vizPanels[1].state.title).toBe('Panel B');
+      expect(vizPanels[2].state.title).toBe('Panel C');
+      expect(vizPanels[3].state.title).toBe('Panel D');
+      expect(vizPanels[4].state.title).toBe('Panel E');
+      expect(vizPanels[5].state.title).toBe('Panel F');
+    });
+
+    it('Should return an empty array when scene has no panels', () => {
+      scene.setState({
+        body: new SceneGridLayout({ children: [] }),
+      });
+
+      const vizPanels = dashboardSceneGraph.getVizPanels(scene);
+
+      expect(vizPanels.length).toBe(0);
+    });
+  });
+
+  describe('getDataLayers', () => {
+    let scene: DashboardScene;
+
+    beforeEach(async () => {
+      scene = buildTestScene();
+    });
+
+    it('should return the scene data layers', () => {
+      const dataLayers = dashboardSceneGraph.getDataLayers(scene);
+
+      expect(dataLayers).toBeInstanceOf(DashboardDataLayerSet);
+      expect(dataLayers?.state.annotationLayers.length).toBe(1);
+    });
+
+    it('should throw if there are no scene data layers', () => {
+      scene.setState({
+        $data: undefined,
+      });
+
+      expect(() => dashboardSceneGraph.getDataLayers(scene)).toThrow('DashboardDataLayerSet not found');
+    });
+  });
+
+  describe('getNextPanelId', () => {
+    it('should get next panel id in a simple 3 panel layout', () => {
+      const scene = buildTestScene({
+        body: new SceneGridLayout({
+          children: [
+            new DashboardGridItem({
+              body: new VizPanel({
+                title: 'Panel A',
+                key: 'panel-1',
+                pluginId: 'table',
+              }),
+            }),
+            new DashboardGridItem({
+              body: new VizPanel({
+                title: 'Panel B',
+                key: 'panel-2',
+                pluginId: 'table',
+              }),
+            }),
+            new DashboardGridItem({
+              body: new VizPanel({
+                title: 'Panel C',
+                key: 'panel-3',
+                pluginId: 'table',
+              }),
+            }),
+          ],
+        }),
+      });
+
+      const id = getNextPanelId(scene);
+
+      expect(id).toBe(4);
+    });
+
+    it('should take library panels, panels in rows and panel repeaters into account', () => {
+      const scene = buildTestScene({
+        body: new SceneGridLayout({
+          children: [
+            new DashboardGridItem({
+              key: 'griditem-1',
+              x: 0,
+              body: new VizPanel({
+                title: 'Panel A',
+                key: 'panel-1',
+                pluginId: 'table',
+              }),
+            }),
+            new DashboardGridItem({
+              body: new LibraryVizPanel({
+                uid: 'uid',
+                name: 'LibPanel',
+                title: 'Library Panel',
+                panelKey: 'panel-2',
+              }),
+            }),
+            new DashboardGridItem({
+              body: new VizPanel({
+                title: 'Panel C',
+                key: 'panel-2-clone-1',
+                pluginId: 'table',
+              }),
+            }),
+            new DashboardGridItem({
+              body: new VizPanel({
+                title: 'Panel C',
+                key: 'panel-4',
+                pluginId: 'table',
+              }),
+              variableName: 'repeat',
+              repeatedPanels: [],
+              repeatDirection: 'h',
+              maxPerRow: 1,
+            }),
+            new SceneGridRow({
+              key: 'key',
+              title: 'row',
+              children: [
+                new DashboardGridItem({
+                  body: new VizPanel({
+                    title: 'Panel E',
+                    key: 'panel-2-clone-2',
+                    pluginId: 'table',
+                  }),
+                }),
+                new DashboardGridItem({
+                  body: new LibraryVizPanel({
+                    uid: 'uid',
+                    name: 'LibPanel',
+                    title: 'Library Panel',
+                    panelKey: 'panel-3',
+                  }),
+                }),
+              ],
+            }),
+          ],
+        }),
+      });
+
+      const id = getNextPanelId(scene);
+
+      expect(id).toBe(5);
+    });
+
+    it('should get next panel id in a layout with rows', () => {
+      const scene = buildTestScene();
+      const id = getNextPanelId(scene);
+
+      expect(id).toBe(3);
+    });
+
+    it('should return 1 if no panels are found', () => {
+      const scene = buildTestScene({ body: new SceneGridLayout({ children: [] }) });
+      const id = getNextPanelId(scene);
+
+      expect(id).toBe(1);
+    });
+
+    it('should throw an error if body is not SceneGridLayout', () => {
+      const scene = buildTestScene({ body: undefined });
+
+      expect(() => getNextPanelId(scene)).toThrow('Dashboard body is not a SceneGridLayout');
+    });
+  });
+
+  describe('getCursorSync', () => {
+    it('should return cursor sync behavior', () => {
+      const scene = buildTestScene();
+      const cursorSync = dashboardSceneGraph.getCursorSync(scene);
+
+      expect(cursorSync).toBeInstanceOf(behaviors.CursorSync);
+    });
+
+    it('should return undefined if no cursor sync behavior', () => {
+      const scene = buildTestScene({ $behaviors: [] });
+      const cursorSync = dashboardSceneGraph.getCursorSync(scene);
+
+      expect(cursorSync).toBeUndefined();
+    });
+  });
+});
+
+function buildTestScene(overrides?: Partial<DashboardSceneState>) {
+  const scene = new DashboardScene({
+    title: 'hello',
+    uid: 'dash-1',
+    $timeRange: new SceneTimeRange({}),
+    controls: new DashboardControls({}),
+    $behaviors: [
+      new behaviors.CursorSync({
+        sync: DashboardCursorSync.Crosshair,
+      }),
+    ],
+    $data: new DashboardDataLayerSet({
+      annotationLayers: [
+        new DashboardAnnotationsDataLayer({
+          key: `annotation`,
+          query: {
+            enable: true,
+            hide: false,
+            iconColor: 'red',
+            name: 'a',
+          },
+          name: 'a',
+          isEnabled: true,
+          isHidden: false,
+        }),
+      ],
+    }),
+    body: new SceneGridLayout({
+      children: [
+        new DashboardGridItem({
+          key: 'griditem-1',
+          x: 0,
+          body: new VizPanel({
+            title: 'Panel A',
+            key: 'panel-1',
+            pluginId: 'table',
+            $data: new SceneQueryRunner({ key: 'data-query-runner', queries: [{ refId: 'A' }] }),
+          }),
+        }),
+        new DashboardGridItem({
+          body: new VizPanel({
+            title: 'Panel B',
+            key: 'panel-2',
+            pluginId: 'table',
+          }),
+        }),
+        new DashboardGridItem({
+          body: new VizPanel({
+            title: 'Panel C',
+            key: 'panel-2-clone-1',
+            pluginId: 'table',
+            $data: new SceneQueryRunner({ key: 'data-query-runner2', queries: [{ refId: 'A' }] }),
+          }),
+        }),
+        new DashboardGridItem({
+          body: new VizPanel({
+            title: 'Panel D',
+            key: 'panel-with-links',
+            pluginId: 'table',
+            $data: new SceneQueryRunner({ key: 'data-query-runner3', queries: [{ refId: 'A' }] }),
+            titleItems: [new VizPanelLinks({ menu: new VizPanelLinksMenu({}) })],
+          }),
+        }),
+        new SceneGridRow({
+          key: 'key',
+          title: 'row',
+          children: [
+            new DashboardGridItem({
+              body: new VizPanel({
+                title: 'Panel E',
+                key: 'panel-2-clone-2',
+                pluginId: 'table',
+              }),
+            }),
+            new DashboardGridItem({
+              body: new VizPanel({
+                title: 'Panel F',
+                key: 'panel-2-clone-2',
+                pluginId: 'table',
+              }),
+            }),
+          ],
+        }),
+      ],
+    }),
+    ...overrides,
+  });
+
+  return scene;
+}
diff --git a/public/app/features/dashboard-scene/utils/dashboardSceneGraph.ts b/public/app/features/dashboard-scene/utils/dashboardSceneGraph.ts
new file mode 100644
index 0000000000000..5c85b33a284a2
--- /dev/null
+++ b/public/app/features/dashboard-scene/utils/dashboardSceneGraph.ts
@@ -0,0 +1,152 @@
+import { VizPanel, SceneGridRow, sceneGraph, SceneGridLayout, behaviors } from '@grafana/scenes';
+
+import { DashboardDataLayerSet } from '../scene/DashboardDataLayerSet';
+import { DashboardGridItem } from '../scene/DashboardGridItem';
+import { DashboardScene } from '../scene/DashboardScene';
+import { LibraryVizPanel } from '../scene/LibraryVizPanel';
+import { VizPanelLinks } from '../scene/PanelLinks';
+
+import { getPanelIdForLibraryVizPanel, getPanelIdForVizPanel } from './utils';
+
+function getTimePicker(scene: DashboardScene) {
+  return scene.state.controls?.state.timePicker;
+}
+
+function getRefreshPicker(scene: DashboardScene) {
+  return scene.state.controls?.state.refreshPicker;
+}
+
+function getPanelLinks(panel: VizPanel) {
+  if (
+    panel.state.titleItems &&
+    Array.isArray(panel.state.titleItems) &&
+    panel.state.titleItems[0] instanceof VizPanelLinks
+  ) {
+    return panel.state.titleItems[0];
+  }
+
+  return null;
+}
+
+function getVizPanels(scene: DashboardScene): VizPanel[] {
+  const panels: VizPanel[] = [];
+
+  scene.state.body.forEachChild((child) => {
+    if (!(child instanceof DashboardGridItem) && !(child instanceof SceneGridRow)) {
+      throw new Error('Child is not a DashboardGridItem or SceneGridRow, invalid scene');
+    }
+
+    if (child instanceof DashboardGridItem) {
+      if (child.state.body instanceof VizPanel) {
+        panels.push(child.state.body);
+      }
+    } else if (child instanceof SceneGridRow) {
+      child.forEachChild((child) => {
+        if (child instanceof DashboardGridItem) {
+          if (child.state.body instanceof VizPanel) {
+            panels.push(child.state.body);
+          }
+        }
+      });
+    }
+  });
+
+  return panels;
+}
+
+function getDataLayers(scene: DashboardScene): DashboardDataLayerSet {
+  const data = sceneGraph.getData(scene);
+
+  if (!(data instanceof DashboardDataLayerSet)) {
+    throw new Error('DashboardDataLayerSet not found');
+  }
+
+  return data;
+}
+
+export function getCursorSync(scene: DashboardScene) {
+  const cursorSync = scene.state.$behaviors?.find((b) => b instanceof behaviors.CursorSync);
+
+  if (cursorSync instanceof behaviors.CursorSync) {
+    return cursorSync;
+  }
+
+  return;
+}
+
+export function getNextPanelId(dashboard: DashboardScene): number {
+  let max = 0;
+  const body = dashboard.state.body;
+
+  if (!(body instanceof SceneGridLayout)) {
+    throw new Error('Dashboard body is not a SceneGridLayout');
+  }
+
+  for (const child of body.state.children) {
+    if (child instanceof DashboardGridItem) {
+      const vizPanel = child.state.body;
+
+      if (vizPanel) {
+        const panelId =
+          vizPanel instanceof LibraryVizPanel
+            ? getPanelIdForLibraryVizPanel(vizPanel)
+            : getPanelIdForVizPanel(vizPanel);
+
+        if (panelId > max) {
+          max = panelId;
+        }
+      }
+    }
+
+    if (child instanceof SceneGridRow) {
+      //rows follow the same key pattern --- e.g.: `panel-6`
+      const panelId = getPanelIdForVizPanel(child);
+
+      if (panelId > max) {
+        max = panelId;
+      }
+
+      for (const rowChild of child.state.children) {
+        if (rowChild instanceof DashboardGridItem) {
+          const vizPanel = rowChild.state.body;
+
+          if (vizPanel) {
+            const panelId =
+              vizPanel instanceof LibraryVizPanel
+                ? getPanelIdForLibraryVizPanel(vizPanel)
+                : getPanelIdForVizPanel(vizPanel);
+
+            if (panelId > max) {
+              max = panelId;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  return max + 1;
+}
+
+// Returns the LibraryVizPanel that corresponds to the given VizPanel if it exists
+export const getLibraryVizPanelFromVizPanel = (vizPanel: VizPanel): LibraryVizPanel | null => {
+  if (vizPanel.parent instanceof LibraryVizPanel) {
+    return vizPanel.parent;
+  }
+
+  if (vizPanel.parent instanceof DashboardGridItem && vizPanel.parent.state.body instanceof LibraryVizPanel) {
+    return vizPanel.parent.state.body;
+  }
+
+  return null;
+};
+
+export const dashboardSceneGraph = {
+  getTimePicker,
+  getRefreshPicker,
+  getPanelLinks,
+  getVizPanels,
+  getDataLayers,
+  getNextPanelId,
+  getCursorSync,
+};
diff --git a/public/app/features/dashboard-scene/utils/djb2Hash.ts b/public/app/features/dashboard-scene/utils/djb2Hash.ts
new file mode 100644
index 0000000000000..6eb571fbef0e3
--- /dev/null
+++ b/public/app/features/dashboard-scene/utils/djb2Hash.ts
@@ -0,0 +1,12 @@
+/**
+ * Hashes a string using the DJB2 algorithm.
+ */
+export function djb2Hash(str: string): number {
+  let hash = 5381;
+
+  for (let i = 0; i < str.length; i++) {
+    hash = (hash * 33) ^ str.charCodeAt(i);
+  }
+
+  return hash >>> 0; // Ensure the result is an unsigned 32-bit integer
+}
diff --git a/public/app/features/dashboard-scene/utils/getVariablesCompatibility.ts b/public/app/features/dashboard-scene/utils/getVariablesCompatibility.ts
new file mode 100644
index 0000000000000..54c47284639ca
--- /dev/null
+++ b/public/app/features/dashboard-scene/utils/getVariablesCompatibility.ts
@@ -0,0 +1,16 @@
+import { TypedVariableModel } from '@grafana/data';
+import { sceneGraph, SceneObject } from '@grafana/scenes';
+
+import { sceneVariablesSetToVariables } from '../serialization/sceneVariablesSetToVariables';
+
+export function getVariablesCompatibility(sceneObject: SceneObject): TypedVariableModel[] {
+  const set = sceneGraph.getVariables(sceneObject);
+  const legacyModels = sceneVariablesSetToVariables(set);
+
+  // Sadly templateSrv.getVariables returns TypedVariableModel but sceneVariablesSetToVariables return persisted schema model
+  // They look close to identical (differ in what is optional in some places).
+  // The way templateSrv.getVariables is used it should not matter. it is mostly used to get names of all variables (for query editors).
+  // So type and name are important. Maybe some external data sources also check current value so that is also important.
+  // @ts-expect-error
+  return legacyModels;
+}
diff --git a/public/app/features/dashboard-scene/utils/interactions.ts b/public/app/features/dashboard-scene/utils/interactions.ts
new file mode 100644
index 0000000000000..4f45bc7b45756
--- /dev/null
+++ b/public/app/features/dashboard-scene/utils/interactions.ts
@@ -0,0 +1,159 @@
+import { reportInteraction } from '@grafana/runtime';
+import { InspectTab } from 'app/features/inspector/types';
+
+let isScenesContextSet = false;
+
+export const DashboardInteractions = {
+  // Dashboard interactions:
+  dashboardInitialized: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('init_dashboard_completed', { ...properties });
+  },
+
+  // Panel interactions:
+  panelMenuShown: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('panelheader_menu', { ...properties, item: 'menu' });
+  },
+  panelMenuItemClicked: (
+    item:
+      | 'view'
+      | 'edit'
+      | 'share'
+      | 'createLibraryPanel'
+      | 'unlinkLibraryPanel'
+      | 'duplicate'
+      | 'copy'
+      | 'remove'
+      | 'explore'
+      | 'toggleLegend'
+      | 'create-alert'
+  ) => {
+    reportDashboardInteraction('panelheader_menu', { item });
+  },
+  panelMenuInspectClicked(tab: InspectTab) {
+    reportDashboardInteraction('panelheader_menu', { item: 'inspect', tab });
+  },
+  panelLinkClicked: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('panelheader_datalink_clicked', properties);
+  },
+  panelStatusMessageClicked: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('panelheader_statusmessage_clicked', properties);
+  },
+  panelCancelQueryClicked: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('panelheader_cancelquery_clicked', properties);
+  },
+
+  // Sharing interactions:
+  sharingTabChanged: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('sharing_category_clicked', properties);
+  },
+  shareLinkCopied: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('sharing_link_copy_clicked', properties);
+  },
+  embedSnippetCopy: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('sharing_embed_copy_clicked', properties);
+  },
+  publishSnapshotClicked: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('sharing_snapshot_publish_clicked', properties);
+  },
+  publishSnapshotLocalClicked: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('sharing_snapshot_local_clicked', properties);
+  },
+  exportDownloadJsonClicked: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('sharing_export_download_json_clicked', properties);
+  },
+  exportCopyJsonClicked: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('sharing_export_copy_json_clicked', properties);
+  },
+  exportSaveJsonClicked: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('sharing_export_save_json_clicked', properties);
+  },
+  exportViewJsonClicked: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('sharing_export_view_json_clicked', properties);
+  },
+  generatePublicDashboardUrlClicked: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('sharing_public_generate_url_clicked', properties);
+  },
+  revokePublicDashboardEmailClicked: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('sharing_public_email_revoke_clicked', properties);
+  },
+  resendPublicDashboardEmailClicked: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('sharing_public_email_resend_clicked', properties);
+  },
+  publicDashboardEmailInviteClicked: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('sharing_public_email_invite_clicked', properties);
+  },
+  publicDashboardShareTypeChange: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('sharing_public_can_view_clicked', properties);
+  },
+  publicDashboardTimeSelectionChanged: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('sharing_public_time_picker_clicked', properties);
+  },
+  publicDashboardAnnotationsSelectionChanged: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('sharing_public_annotations_clicked', properties);
+  },
+  publicDashboardUrlCopied: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('sharing_public_copy_url_clicked', properties);
+  },
+  publicDashboardPauseSharingClicked: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('sharing_public_pause_clicked', properties);
+  },
+  revokePublicDashboardClicked: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('sharing_public_revoke_clicked', properties);
+  },
+
+  // Empty dashboard state interactions:
+  emptyDashboardButtonClicked: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('emptydashboard_clicked', properties);
+  },
+
+  // Toolbar interactions
+  toolbarAddButtonClicked: (properties?: Record<string, unknown>) => {
+    reportDashboardInteraction('toolbar_add_clicked', properties);
+  },
+  toolbarFavoritesClick: () => {
+    reportDashboardInteraction('toolbar_actions_clicked', { item: 'favorites' });
+  },
+  toolbarSettingsClick: () => {
+    reportDashboardInteraction('toolbar_actions_clicked', { item: 'settings' });
+  },
+  toolbarRefreshClick: () => {
+    reportDashboardInteraction('toolbar_actions_clicked', { item: 'refresh' });
+  },
+  toolbarTimePickerClick: () => {
+    reportDashboardInteraction('toolbar_actions_clicked', { item: 'time_picker' });
+  },
+  toolbarZoomClick: () => {
+    reportDashboardInteraction('toolbar_actions_clicked', { item: 'zoom_out_time_range' });
+  },
+
+  toolbarShareClick: () => {
+    reportDashboardInteraction('toolbar_actions_clicked', { item: 'share' });
+  },
+  toolbarSaveClick: () => {
+    reportDashboardInteraction('toolbar_actions_clicked', { item: 'save' });
+  },
+  toolbarSaveAsClick: () => {
+    reportDashboardInteraction('toolbar_actions_clicked', { item: 'save_as' });
+  },
+  toolbarAddClick: () => {
+    reportDashboardInteraction('toolbar_actions_clicked', { item: 'add' });
+  },
+
+  setScenesContext: () => {
+    isScenesContextSet = true;
+
+    return () => {
+      isScenesContextSet = false;
+    };
+  },
+};
+
+const reportDashboardInteraction: typeof reportInteraction = (name, properties) => {
+  const meta = isScenesContextSet ? { scenesView: true } : {};
+
+  if (properties) {
+    reportInteraction(`dashboards_${name}`, { ...properties, ...meta });
+  } else {
+    reportInteraction(`dashboards_${name}`);
+  }
+};
diff --git a/public/app/features/dashboard-scene/utils/registerDynamicDashNavAction.ts b/public/app/features/dashboard-scene/utils/registerDynamicDashNavAction.ts
new file mode 100644
index 0000000000000..46ac63e6149d3
--- /dev/null
+++ b/public/app/features/dashboard-scene/utils/registerDynamicDashNavAction.ts
@@ -0,0 +1,21 @@
+import React from 'react';
+
+import { DashboardModel } from '../../dashboard/state';
+
+interface ComponentProps {
+  dashboard: DashboardModel;
+}
+export interface DynamicDashNavButtonModel {
+  show: (props: ComponentProps) => boolean;
+  component: React.FC<Partial<ComponentProps>>;
+  index?: number | 'end';
+}
+
+export const dynamicDashNavActions: { left: DynamicDashNavButtonModel[]; right: DynamicDashNavButtonModel[] } = {
+  left: [],
+  right: [],
+};
+
+export function registerDynamicDashNavAction(side: 'left' | 'right', action: DynamicDashNavButtonModel) {
+  dynamicDashNavActions[side].push(action);
+}
diff --git a/public/app/features/dashboard-scene/utils/test-utils.ts b/public/app/features/dashboard-scene/utils/test-utils.ts
index f0fae6b310b8d..ad7b377fb2873 100644
--- a/public/app/features/dashboard-scene/utils/test-utils.ts
+++ b/public/app/features/dashboard-scene/utils/test-utils.ts
@@ -2,7 +2,6 @@ import {
   DeepPartial,
   EmbeddedScene,
   SceneDeactivationHandler,
-  SceneGridItem,
   SceneGridLayout,
   SceneGridRow,
   SceneObject,
@@ -15,11 +14,13 @@ import { DashboardLoaderSrv, setDashboardLoaderSrv } from 'app/features/dashboar
 import { ALL_VARIABLE_TEXT, ALL_VARIABLE_VALUE } from 'app/features/variables/constants';
 import { DashboardDTO } from 'app/types';
 
-import { PanelRepeaterGridItem, RepeatDirection } from '../scene/PanelRepeaterGridItem';
+import { DashboardGridItem, RepeatDirection } from '../scene/DashboardGridItem';
+import { LibraryVizPanel } from '../scene/LibraryVizPanel';
+import { VizPanelLinks, VizPanelLinksMenu } from '../scene/PanelLinks';
 import { RowRepeaterBehavior } from '../scene/RowRepeaterBehavior';
 
-export function setupLoadDashboardMock(rsp: DeepPartial<DashboardDTO>) {
-  const loadDashboardMock = jest.fn().mockResolvedValue(rsp);
+export function setupLoadDashboardMock(rsp: DeepPartial<DashboardDTO>, spy?: jest.Mock) {
+  const loadDashboardMock = (spy || jest.fn()).mockResolvedValue(rsp);
   setDashboardLoaderSrv({
     loadDashboard: loadDashboardMock,
     // disabling type checks since this is a test util
@@ -98,32 +99,38 @@ interface SceneOptions {
   useRowRepeater?: boolean;
 }
 
-export function buildPanelRepeaterScene(options: SceneOptions) {
+export function buildPanelRepeaterScene(options: SceneOptions, source?: VizPanel | LibraryVizPanel) {
   const defaults = { usePanelRepeater: true, ...options };
 
-  const repeater = new PanelRepeaterGridItem({
+  const withRepeat = new DashboardGridItem({
     variableName: 'server',
     repeatedPanels: [],
     repeatDirection: options.repeatDirection,
     maxPerRow: options.maxPerRow,
     itemHeight: options.itemHeight,
-    source: new VizPanel({
-      title: 'Panel $server',
-      pluginId: 'timeseries',
-    }),
+    body:
+      source ??
+      new VizPanel({
+        title: 'Panel $server',
+        pluginId: 'timeseries',
+      }),
     x: options.x || 0,
     y: options.y || 0,
   });
 
-  const gridItem = new SceneGridItem({
+  const withoutRepeat = new DashboardGridItem({
     x: 0,
     y: 0,
     width: 10,
     height: 10,
-    body: new VizPanel({ title: 'Panel $server', pluginId: 'timeseries' }),
+    body: new VizPanel({
+      title: 'Panel $server',
+      pluginId: 'timeseries',
+      titleItems: [new VizPanelLinks({ menu: new VizPanelLinksMenu({}) })],
+    }),
   });
 
-  const rowChildren = defaults.usePanelRepeater ? repeater : gridItem;
+  const rowChildren = defaults.usePanelRepeater ? withRepeat : withoutRepeat;
 
   const row = new SceneGridRow({
     $behaviors: defaults.useRowRepeater
@@ -181,5 +188,5 @@ export function buildPanelRepeaterScene(options: SceneOptions) {
     }),
   });
 
-  return { scene, repeater, row, variable: panelRepeatVariable };
+  return { scene, repeater: withRepeat, row, variable: panelRepeatVariable };
 }
diff --git a/public/app/features/dashboard-scene/utils/urlBuilders.test.ts b/public/app/features/dashboard-scene/utils/urlBuilders.test.ts
index 7c7e2899f4c74..16a683cace6b3 100644
--- a/public/app/features/dashboard-scene/utils/urlBuilders.test.ts
+++ b/public/app/features/dashboard-scene/utils/urlBuilders.test.ts
@@ -4,13 +4,28 @@ describe('dashboard utils', () => {
   it('Can getUrl', () => {
     const url = getDashboardUrl({ uid: 'dash-1', currentQueryParams: '?orgId=1&filter=A' });
 
-    expect(url).toBe('/scenes/dashboard/dash-1?orgId=1&filter=A');
+    expect(url).toBe('/d/dash-1?orgId=1&filter=A');
   });
 
   it('Can getUrl with subpath', () => {
-    const url = getDashboardUrl({ uid: 'dash-1', subPath: '/panel-edit/2', currentQueryParams: '?orgId=1&filter=A' });
+    const url = getDashboardUrl({
+      uid: 'dash-1',
+      subPath: '/panel-edit/2',
+      currentQueryParams: '?orgId=1&filter=A',
+    });
 
-    expect(url).toBe('/scenes/dashboard/dash-1/panel-edit/2?orgId=1&filter=A');
+    expect(url).toBe('/d/dash-1/panel-edit/2?orgId=1&filter=A');
+  });
+
+  it('Can getUrl with slug', () => {
+    const url = getDashboardUrl({
+      uid: 'dash-1',
+      slug: 'dash-1-slug',
+      subPath: '/panel-edit/2',
+      currentQueryParams: '?orgId=1&filter=A',
+    });
+
+    expect(url).toBe('/d/dash-1/dash-1-slug/panel-edit/2?orgId=1&filter=A');
   });
 
   it('Can getUrl with params removed and addded', () => {
@@ -20,6 +35,15 @@ describe('dashboard utils', () => {
       updateQuery: { filter: null, new: 'A' },
     });
 
-    expect(url).toBe('/scenes/dashboard/dash-1?orgId=1&new=A');
+    expect(url).toBe('/d/dash-1?orgId=1&new=A');
+  });
+
+  it('Empty uid should be treated as a new dashboard', () => {
+    const url = getDashboardUrl({
+      uid: '',
+      currentQueryParams: '?orgId=1&filter=A',
+    });
+
+    expect(url).toBe('/dashboard/new?orgId=1&filter=A');
   });
 });
diff --git a/public/app/features/dashboard-scene/utils/urlBuilders.ts b/public/app/features/dashboard-scene/utils/urlBuilders.ts
index 1539a04f3480f..21865c94796cd 100644
--- a/public/app/features/dashboard-scene/utils/urlBuilders.ts
+++ b/public/app/features/dashboard-scene/utils/urlBuilders.ts
@@ -3,11 +3,13 @@ import { config, locationSearchToObject, locationService } from '@grafana/runtim
 import { sceneGraph, VizPanel } from '@grafana/scenes';
 import { contextSrv } from 'app/core/core';
 import { getExploreUrl } from 'app/core/utils/explore';
+import { InspectTab } from 'app/features/inspector/types';
 
 import { getQueryRunnerFor } from './utils';
 
 export interface DashboardUrlOptions {
   uid?: string;
+  slug?: string;
   subPath?: string;
   updateQuery?: UrlQueryMap;
   /** Set to location.search to preserve current params */
@@ -20,13 +22,27 @@ export interface DashboardUrlOptions {
   absolute?: boolean;
   // Add tz to query params
   timeZone?: string;
+  // Check if we are on the home dashboard
+  isHomeDashboard?: boolean;
 }
 
 export function getDashboardUrl(options: DashboardUrlOptions) {
-  let path = `/scenes/dashboard/${options.uid}${options.subPath ?? ''}`;
+  let path = `/d/${options.uid}`;
+
+  if (!options.uid) {
+    path = '/dashboard/new';
+  }
 
   if (options.soloRoute) {
-    path = `/d-solo/${options.uid}${options.subPath ?? ''}`;
+    path = `/d-solo/${options.uid}`;
+  }
+
+  if (options.slug) {
+    path += `/${options.slug}`;
+  }
+
+  if (options.subPath) {
+    path += options.subPath;
   }
 
   if (options.render) {
@@ -40,6 +56,10 @@ export function getDashboardUrl(options: DashboardUrlOptions) {
     };
   }
 
+  if (options.isHomeDashboard) {
+    path = '/';
+  }
+
   const params = options.currentQueryParams ? locationSearchToObject(options.currentQueryParams) : {};
 
   if (options.updateQuery) {
@@ -66,8 +86,14 @@ export function getViewPanelUrl(vizPanel: VizPanel) {
   return locationUtil.getUrlForPartial(locationService.getLocation(), { viewPanel: vizPanel.state.key });
 }
 
-export function getInspectUrl(vizPanel: VizPanel) {
-  return locationUtil.getUrlForPartial(locationService.getLocation(), { inspect: vizPanel.state.key });
+export function getEditPanelUrl(panelId: number) {
+  return locationUtil.getUrlForPartial(locationService.getLocation(), { editPanel: panelId });
+}
+
+export function getInspectUrl(vizPanel: VizPanel, inspectTab?: InspectTab) {
+  const inspect = vizPanel.state.key?.replace('-view', '');
+
+  return locationUtil.getUrlForPartial(locationService.getLocation(), { inspect, inspectTab });
 }
 
 export function tryGetExploreUrlForPanel(vizPanel: VizPanel): Promise<string | undefined> {
@@ -86,5 +112,6 @@ export function tryGetExploreUrlForPanel(vizPanel: VizPanel): Promise<string | u
     dsRef: queryRunner.state.datasource,
     timeRange: timeRange.state.value,
     scopedVars: { __sceneObject: { value: vizPanel } },
+    adhocFilters: queryRunner.state.data?.request?.filters,
   });
 }
diff --git a/public/app/features/dashboard-scene/utils/utils.ts b/public/app/features/dashboard-scene/utils/utils.ts
index 1a9e8cb76b645..7a2bdf0fa0234 100644
--- a/public/app/features/dashboard-scene/utils/utils.ts
+++ b/public/app/features/dashboard-scene/utils/utils.ts
@@ -1,15 +1,29 @@
-import { IntervalVariableModel } from '@grafana/data';
+import { getDataSourceRef, IntervalVariableModel } from '@grafana/data';
+import { getDataSourceSrv } from '@grafana/runtime';
 import {
+  CustomVariable,
   MultiValueVariable,
   SceneDataTransformer,
   sceneGraph,
+  SceneGridRow,
   SceneObject,
   SceneQueryRunner,
   VizPanel,
+  VizPanelMenu,
 } from '@grafana/scenes';
 import { initialIntervalVariableModelState } from 'app/features/variables/interval/reducer';
 
+import { DashboardDatasourceBehaviour } from '../scene/DashboardDatasourceBehaviour';
 import { DashboardScene } from '../scene/DashboardScene';
+import { LibraryVizPanel } from '../scene/LibraryVizPanel';
+import { VizPanelLinks, VizPanelLinksMenu } from '../scene/PanelLinks';
+import { panelMenuBehavior } from '../scene/PanelMenuBehavior';
+import { RowActions } from '../scene/row-actions/RowActions';
+
+import { dashboardSceneGraph } from './dashboardSceneGraph';
+
+export const NEW_PANEL_HEIGHT = 8;
+export const NEW_PANEL_WIDTH = 12;
 
 export function getVizPanelKeyForPanelId(panelId: number) {
   return `panel-${panelId}`;
@@ -19,8 +33,12 @@ export function getPanelIdForVizPanel(panel: SceneObject): number {
   return parseInt(panel.state.key!.replace('panel-', ''), 10);
 }
 
+export function getPanelIdForLibraryVizPanel(panel: LibraryVizPanel): number {
+  return parseInt(panel.state.panelKey!.replace('panel-', ''), 10);
+}
+
 /**
- * This will also  try lookup based on panelId
+ * This will also try lookup based on panelId
  */
 export function findVizPanelByKey(scene: SceneObject, key: string | undefined): VizPanel | null {
   if (!key) {
@@ -78,7 +96,7 @@ export function forceRenderChildren(model: SceneObject, recursive?: boolean) {
   });
 }
 
-export function getMultiVariableValues(variable: MultiValueVariable) {
+export function getMultiVariableValues(variable: MultiValueVariable | CustomVariable) {
   const { value, text, options } = variable.state;
 
   if (variable.hasAllValue()) {
@@ -94,10 +112,10 @@ export function getMultiVariableValues(variable: MultiValueVariable) {
   };
 }
 
-// Transform old interval model to new interval model from scenes
-export function getIntervalsFromOldIntervalModel(variable: IntervalVariableModel): string[] {
+// used to transform old interval model to new interval model from scenes
+export function getIntervalsFromQueryString(query: string): string[] {
   // separate intervals by quotes either single or double
-  const matchIntervals = variable.query.match(/(["'])(.*?)\1|\w+/g);
+  const matchIntervals = query.match(/(["'])(.*?)\1|\w+/g);
 
   // If no intervals are found in query, return the initial state of the interval reducer.
   if (!matchIntervals) {
@@ -151,12 +169,14 @@ export function getQueryRunnerFor(sceneObject: SceneObject | undefined): SceneQu
     return undefined;
   }
 
-  if (sceneObject.state.$data instanceof SceneQueryRunner) {
-    return sceneObject.state.$data;
+  const dataProvider = sceneObject.state.$data ?? sceneObject.parent?.state.$data;
+
+  if (dataProvider instanceof SceneQueryRunner) {
+    return dataProvider;
   }
 
-  if (sceneObject.state.$data instanceof SceneDataTransformer) {
-    return getQueryRunnerFor(sceneObject.state.$data);
+  if (dataProvider instanceof SceneDataTransformer) {
+    return getQueryRunnerFor(dataProvider);
   }
 
   return undefined;
@@ -164,6 +184,7 @@ export function getQueryRunnerFor(sceneObject: SceneObject | undefined): SceneQu
 
 export function getDashboardSceneFor(sceneObject: SceneObject): DashboardScene {
   const root = sceneObject.getRoot();
+
   if (root instanceof DashboardScene) {
     return root;
   }
@@ -182,3 +203,47 @@ export function getClosestVizPanel(sceneObject: SceneObject): VizPanel | null {
 
   return null;
 }
+
+export function isPanelClone(key: string) {
+  return key.includes('clone');
+}
+
+export function getDefaultVizPanel(dashboard: DashboardScene): VizPanel {
+  const panelId = dashboardSceneGraph.getNextPanelId(dashboard);
+
+  return new VizPanel({
+    title: 'Panel Title',
+    key: getVizPanelKeyForPanelId(panelId),
+    pluginId: 'timeseries',
+    titleItems: [new VizPanelLinks({ menu: new VizPanelLinksMenu({}) })],
+    menu: new VizPanelMenu({
+      $behaviors: [panelMenuBehavior],
+    }),
+    $data: new SceneDataTransformer({
+      $data: new SceneQueryRunner({
+        queries: [{ refId: 'A' }],
+        datasource: getDataSourceRef(getDataSourceSrv().getInstanceSettings(null)!),
+        $behaviors: [new DashboardDatasourceBehaviour({})],
+      }),
+      transformations: [],
+    }),
+  });
+}
+
+export function getDefaultRow(dashboard: DashboardScene): SceneGridRow {
+  const id = dashboardSceneGraph.getNextPanelId(dashboard);
+
+  return new SceneGridRow({
+    key: getVizPanelKeyForPanelId(id),
+    title: 'Row title',
+    actions: new RowActions({}),
+    y: 0,
+  });
+}
+
+export function getLibraryPanel(vizPanel: VizPanel): LibraryVizPanel | undefined {
+  if (vizPanel.parent instanceof LibraryVizPanel) {
+    return vizPanel.parent;
+  }
+  return;
+}
diff --git a/public/app/features/dashboard/api/publicDashboardApi.ts b/public/app/features/dashboard/api/publicDashboardApi.ts
index c1d31e70c814f..b93888555cb48 100644
--- a/public/app/features/dashboard/api/publicDashboardApi.ts
+++ b/public/app/features/dashboard/api/publicDashboardApi.ts
@@ -11,6 +11,7 @@ import {
   SessionUser,
 } from 'app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils';
 import { DashboardModel } from 'app/features/dashboard/state';
+import { DashboardScene } from 'app/features/dashboard-scene/scene/DashboardScene';
 import {
   PublicDashboardListWithPagination,
   PublicDashboardListWithPaginationResponse,
@@ -69,40 +70,61 @@ export const publicDashboardApi = createApi({
     }),
     createPublicDashboard: builder.mutation<
       PublicDashboard,
-      { dashboard: DashboardModel; payload: Partial<PublicDashboardSettings> }
+      { dashboard: DashboardModel | DashboardScene; payload: Partial<PublicDashboardSettings> }
     >({
-      query: (params) => ({
-        url: `/dashboards/uid/${params.dashboard.uid}/public-dashboards`,
-        method: 'POST',
-        data: params.payload,
-      }),
+      query: (params) => {
+        const dashUid = params.dashboard instanceof DashboardScene ? params.dashboard.state.uid : params.dashboard.uid;
+        return {
+          url: `/dashboards/uid/${dashUid}/public-dashboards`,
+          method: 'POST',
+          data: params.payload,
+        };
+      },
       async onQueryStarted({ dashboard, payload }, { dispatch, queryFulfilled }) {
         const { data } = await queryFulfilled;
         dispatch(notifyApp(createSuccessNotification('Dashboard is public!')));
 
-        // Update runtime meta flag
-        dashboard.updateMeta({
-          publicDashboardUid: data.uid,
-          publicDashboardEnabled: data.isEnabled,
-        });
+        if (dashboard instanceof DashboardScene) {
+          dashboard.setState({
+            meta: { ...dashboard.state.meta, publicDashboardEnabled: data.isEnabled, publicDashboardUid: data.uid },
+          });
+        } else {
+          // Update runtime meta flag
+          dashboard.updateMeta({
+            publicDashboardUid: data.uid,
+            publicDashboardEnabled: data.isEnabled,
+          });
+        }
       },
-      invalidatesTags: (result, error, { dashboard }) => [{ type: 'PublicDashboard', id: dashboard.uid }],
+      invalidatesTags: (result, error, { dashboard }) => [
+        { type: 'PublicDashboard', id: dashboard instanceof DashboardScene ? dashboard.state.uid : dashboard.uid },
+      ],
     }),
     updatePublicDashboard: builder.mutation<
       PublicDashboard,
-      { dashboard: Partial<DashboardModel>; payload: Partial<PublicDashboard> }
+      {
+        dashboard: (Pick<DashboardModel, 'uid'> & Partial<Pick<DashboardModel, 'updateMeta'>>) | DashboardScene;
+        payload: Partial<PublicDashboard>;
+      }
     >({
-      query: (params) => ({
-        url: `/dashboards/uid/${params.dashboard.uid}/public-dashboards/${params.payload.uid}`,
-        method: 'PATCH',
-        data: params.payload,
-      }),
-      async onQueryStarted({ dashboard, payload }, { dispatch, queryFulfilled }) {
+      query: ({ payload, dashboard }) => {
+        const dashUid = dashboard instanceof DashboardScene ? dashboard.state.uid : dashboard.uid;
+        return {
+          url: `/dashboards/uid/${dashUid}/public-dashboards/${payload.uid}`,
+          method: 'PATCH',
+          data: payload,
+        };
+      },
+      async onQueryStarted({ dashboard }, { dispatch, queryFulfilled }) {
         const { data } = await queryFulfilled;
         dispatch(notifyApp(createSuccessNotification('Public dashboard updated!')));
 
-        if (dashboard.updateMeta) {
-          dashboard.updateMeta({
+        if (dashboard instanceof DashboardScene) {
+          dashboard.setState({
+            meta: { ...dashboard.state.meta, publicDashboardEnabled: data.isEnabled, publicDashboardUid: data.uid },
+          });
+        } else {
+          dashboard.updateMeta?.({
             publicDashboardUid: data.uid,
             publicDashboardEnabled: data.isEnabled,
           });
@@ -118,7 +140,10 @@ export const publicDashboardApi = createApi({
         url: '',
       }),
     }),
-    deleteRecipient: builder.mutation<void, { recipientUid: string; dashboardUid: string; uid: string }>({
+    deleteRecipient: builder.mutation<
+      void,
+      { recipientUid: string; recipientEmail: string; dashboardUid: string; uid: string }
+    >({
       query: () => ({
         url: '',
       }),
@@ -150,7 +175,10 @@ export const publicDashboardApi = createApi({
       }),
       providesTags: ['AuditTablePublicDashboard'],
     }),
-    deletePublicDashboard: builder.mutation<void, { dashboard?: DashboardModel; dashboardUid: string; uid: string }>({
+    deletePublicDashboard: builder.mutation<
+      void,
+      { dashboard?: DashboardModel | DashboardScene; dashboardUid: string; uid: string }
+    >({
       query: (params) => ({
         url: `/dashboards/uid/${params.dashboardUid}/public-dashboards/${params.uid}`,
         method: 'DELETE',
@@ -159,10 +187,16 @@ export const publicDashboardApi = createApi({
         await queryFulfilled;
         dispatch(notifyApp(createSuccessNotification('Public dashboard deleted!')));
 
-        dashboard?.updateMeta({
-          publicDashboardUid: uid,
-          publicDashboardEnabled: false,
-        });
+        if (dashboard instanceof DashboardScene) {
+          dashboard.setState({
+            meta: { ...dashboard.state.meta, publicDashboardUid: uid, publicDashboardEnabled: false },
+          });
+        } else {
+          dashboard?.updateMeta({
+            publicDashboardUid: uid,
+            publicDashboardEnabled: false,
+          });
+        }
       },
       invalidatesTags: (result, error, { dashboardUid }) => [
         { type: 'PublicDashboard', id: dashboardUid },
@@ -171,6 +205,11 @@ export const publicDashboardApi = createApi({
         'ActiveUserDashboards',
       ],
     }),
+    revokeAllAccess: builder.mutation<void, { email: string }>({
+      query: () => ({
+        url: '',
+      }),
+    }),
   }),
 });
 
@@ -185,4 +224,5 @@ export const {
   useReshareAccessToRecipientMutation,
   useGetActiveUsersQuery,
   useGetActiveUserDashboardsQuery,
+  useRevokeAllAccessMutation,
 } = publicDashboardApi;
diff --git a/public/app/features/dashboard/components/AddPanelButton/AddPanelButton.tsx b/public/app/features/dashboard/components/AddPanelButton/AddPanelButton.tsx
index 869cb4f8dde91..197bd4e98172e 100644
--- a/public/app/features/dashboard/components/AddPanelButton/AddPanelButton.tsx
+++ b/public/app/features/dashboard/components/AddPanelButton/AddPanelButton.tsx
@@ -1,9 +1,7 @@
-import { css, cx } from '@emotion/css';
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 
-import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { Dropdown, Button, useTheme2, Icon } from '@grafana/ui';
+import { Dropdown, Button, Icon } from '@grafana/ui';
 import { Trans } from 'app/core/internationalization';
 import { DashboardModel } from 'app/features/dashboard/state';
 
@@ -11,12 +9,18 @@ import AddPanelMenu from './AddPanelMenu';
 
 export interface Props {
   dashboard: DashboardModel;
+  onToolbarAddMenuOpen?: () => void;
 }
 
-const AddPanelButton = ({ dashboard }: Props) => {
-  const styles = getStyles(useTheme2());
+const AddPanelButton = ({ dashboard, onToolbarAddMenuOpen }: Props) => {
   const [isMenuOpen, setIsMenuOpen] = useState(false);
 
+  useEffect(() => {
+    if (isMenuOpen && onToolbarAddMenuOpen) {
+      onToolbarAddMenuOpen();
+    }
+  }, [isMenuOpen, onToolbarAddMenuOpen]);
+
   return (
     <Dropdown
       overlay={() => <AddPanelMenu dashboard={dashboard} />}
@@ -25,10 +29,9 @@ const AddPanelButton = ({ dashboard }: Props) => {
       onVisibleChange={setIsMenuOpen}
     >
       <Button
-        icon="panel-add"
-        size="lg"
-        fill="text"
-        className={cx(styles.button, styles.buttonIcon, styles.buttonText)}
+        variant="secondary"
+        size="sm"
+        fill="outline"
         data-testid={selectors.components.PageToolbar.itemButton('Add button')}
       >
         <Trans i18nKey="dashboard.toolbar.add">Add</Trans>
@@ -39,26 +42,3 @@ const AddPanelButton = ({ dashboard }: Props) => {
 };
 
 export default AddPanelButton;
-
-function getStyles(theme: GrafanaTheme2) {
-  return {
-    button: css({
-      label: 'add-panel-button',
-      padding: theme.spacing(0.5, 0.5, 0.5, 0.75),
-      height: theme.spacing((theme.components.height.sm + theme.components.height.md) / 2),
-      borderRadius: theme.shape.radius.default,
-    }),
-    buttonIcon: css({
-      svg: {
-        margin: 0,
-      },
-    }),
-    buttonText: css({
-      label: 'add-panel-button-text',
-      fontSize: theme.typography.body.fontSize,
-      span: {
-        marginLeft: theme.spacing(0.67),
-      },
-    }),
-  };
-}
diff --git a/public/app/features/dashboard/components/AddPanelButton/AddPanelMenu.test.tsx b/public/app/features/dashboard/components/AddPanelButton/AddPanelMenu.test.tsx
index b97e76ed0f419..3f82b9d7ca898 100644
--- a/public/app/features/dashboard/components/AddPanelButton/AddPanelMenu.test.tsx
+++ b/public/app/features/dashboard/components/AddPanelButton/AddPanelMenu.test.tsx
@@ -27,7 +27,6 @@ jest.mock('@grafana/runtime', () => ({
     partial: jest.fn(),
   },
   reportInteraction: jest.fn(),
-  config: {},
 }));
 
 jest.mock('app/features/dashboard/utils/dashboard', () => ({
@@ -68,7 +67,7 @@ it('renders with all buttons enabled except paste a panel', () => {
   expect(screen.getByText('visualization', { exact: false })).not.toBeDisabled();
   expect(screen.getByText('row', { exact: false })).not.toBeDisabled();
   expect(screen.getByText('library', { exact: false })).not.toBeDisabled();
-  expect(screen.getByText('paste panel', { exact: false })).toBeDisabled();
+  expect(screen.getByRole('menuitem', { name: 'Paste panel' })).toBeDisabled();
 });
 
 it('renders with all buttons enabled', () => {
diff --git a/public/app/features/dashboard/components/AddPanelButton/AddPanelMenu.tsx b/public/app/features/dashboard/components/AddPanelButton/AddPanelMenu.tsx
index 3ddd62f5aa678..796d713cc73c7 100644
--- a/public/app/features/dashboard/components/AddPanelButton/AddPanelMenu.tsx
+++ b/public/app/features/dashboard/components/AddPanelButton/AddPanelMenu.tsx
@@ -1,7 +1,7 @@
 import React, { useMemo } from 'react';
 
 import { selectors } from '@grafana/e2e-selectors';
-import { config, locationService, reportInteraction } from '@grafana/runtime';
+import { config, locationService } from '@grafana/runtime';
 import { Menu } from '@grafana/ui';
 import { t } from 'app/core/internationalization';
 import { DashboardModel } from 'app/features/dashboard/state';
@@ -12,6 +12,7 @@ import {
   onCreateNewRow,
   onPasteCopiedPanel,
 } from 'app/features/dashboard/utils/dashboard';
+import { DashboardInteractions } from 'app/features/dashboard-scene/utils/interactions';
 import { useDispatch, useSelector } from 'app/types';
 
 import { setInitialDatasource } from '../../state/reducers';
@@ -33,7 +34,7 @@ const AddPanelMenu = ({ dashboard }: Props) => {
         label={t('dashboard.add-menu.visualization', 'Visualization')}
         onClick={() => {
           const id = onCreateNewPanel(dashboard, initialDatasource);
-          reportInteraction('dashboards_toolbar_add_clicked', { item: 'add_visualization' });
+          DashboardInteractions.toolbarAddButtonClicked({ item: 'add_visualization' });
           locationService.partial({ editPanel: id });
           dispatch(setInitialDatasource(undefined));
         }}
@@ -44,7 +45,7 @@ const AddPanelMenu = ({ dashboard }: Props) => {
           testId={selectors.pages.AddDashboard.itemButton('Add new widget menu item')}
           label={t('dashboard.add-menu.widget', 'Widget')}
           onClick={() => {
-            reportInteraction('dashboards_toolbar_add_clicked', { item: 'add_widget' });
+            DashboardInteractions.toolbarAddButtonClicked({ item: 'add_widget' });
             locationService.partial({ addWidget: true });
           }}
         />
@@ -54,7 +55,7 @@ const AddPanelMenu = ({ dashboard }: Props) => {
         testId={selectors.pages.AddDashboard.itemButton('Add new row menu item')}
         label={t('dashboard.add-menu.row', 'Row')}
         onClick={() => {
-          reportInteraction('dashboards_toolbar_add_clicked', { item: 'add_row' });
+          DashboardInteractions.toolbarAddButtonClicked({ item: 'add_row' });
           onCreateNewRow(dashboard);
         }}
       />
@@ -63,7 +64,7 @@ const AddPanelMenu = ({ dashboard }: Props) => {
         testId={selectors.pages.AddDashboard.itemButton('Add new panel from panel library menu item')}
         label={t('dashboard.add-menu.import', 'Import from library')}
         onClick={() => {
-          reportInteraction('dashboards_toolbar_add_clicked', { item: 'import_from_library' });
+          DashboardInteractions.toolbarAddButtonClicked({ item: 'import_from_library' });
           onAddLibraryPanel(dashboard);
         }}
       />
@@ -72,7 +73,7 @@ const AddPanelMenu = ({ dashboard }: Props) => {
         testId={selectors.pages.AddDashboard.itemButton('Add new panel from clipboard menu item')}
         label={t('dashboard.add-menu.paste-panel', 'Paste panel')}
         onClick={() => {
-          reportInteraction('dashboards_toolbar_add_clicked', { item: 'paste_panel' });
+          DashboardInteractions.toolbarAddButtonClicked({ item: 'paste_panel' });
           onPasteCopiedPanel(dashboard, copiedPanelPlugin);
         }}
         disabled={!copiedPanelPlugin}
diff --git a/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.test.tsx b/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.test.tsx
deleted file mode 100644
index d0f0690cd4ab3..0000000000000
--- a/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.test.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import React from 'react';
-
-import { PanelModel } from '../../state';
-import { createDashboardModelFixture } from '../../state/__fixtures__/dashboardFixtures';
-
-import { AddPanelWidgetUnconnected as AddPanelWidget, Props } from './AddPanelWidget';
-
-const getTestContext = (propOverrides?: object) => {
-  const props: Props = {
-    dashboard: createDashboardModelFixture(),
-    panel: new PanelModel({}),
-    addPanel: jest.fn() as any,
-  };
-  Object.assign(props, propOverrides);
-  return render(<AddPanelWidget {...props} />);
-};
-
-describe('AddPanelWidget', () => {
-  it('should render component without error', () => {
-    expect(() => {
-      getTestContext();
-    });
-  });
-
-  it('should render the add panel actions', () => {
-    getTestContext();
-    expect(screen.getByText(/Add a new panel/i)).toBeInTheDocument();
-    expect(screen.getByText(/Add a new row/i)).toBeInTheDocument();
-    expect(screen.getByText(/Add a panel from the panel library/i)).toBeInTheDocument();
-  });
-});
diff --git a/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx b/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
deleted file mode 100644
index a1020e1a61379..0000000000000
--- a/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
+++ /dev/null
@@ -1,299 +0,0 @@
-import { css, cx, keyframes } from '@emotion/css';
-import { chain, cloneDeep, defaults, find, sortBy } from 'lodash';
-import React, { useMemo, useState } from 'react';
-import { connect, MapDispatchToProps } from 'react-redux';
-import tinycolor from 'tinycolor2';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
-import { locationService, reportInteraction } from '@grafana/runtime';
-import { Icon, IconButton, useStyles2 } from '@grafana/ui';
-import { CardButton } from 'app/core/components/CardButton';
-import config from 'app/core/config';
-import { LS_PANEL_COPY_KEY } from 'app/core/constants';
-import store from 'app/core/store';
-import { addPanel } from 'app/features/dashboard/state/reducers';
-
-import {
-  LibraryPanelsSearch,
-  LibraryPanelsSearchVariant,
-} from '../../../library-panels/components/LibraryPanelsSearch/LibraryPanelsSearch';
-import { LibraryElementDTO } from '../../../library-panels/types';
-import { DashboardModel, PanelModel } from '../../state';
-
-export type PanelPluginInfo = { id: number; defaults: { gridPos: { w: number; h: number }; title: string } };
-
-export interface OwnProps {
-  panel: PanelModel;
-  dashboard: DashboardModel;
-}
-
-export interface DispatchProps {
-  addPanel: typeof addPanel;
-}
-
-export type Props = OwnProps & DispatchProps;
-
-const getCopiedPanelPlugins = () => {
-  const panels = chain(config.panels)
-    .filter({ hideFromList: false })
-    .map((item) => item)
-    .value();
-  const copiedPanels = [];
-
-  const copiedPanelJson = store.get(LS_PANEL_COPY_KEY);
-  if (copiedPanelJson) {
-    const copiedPanel = JSON.parse(copiedPanelJson);
-    const pluginInfo: any = find(panels, { id: copiedPanel.type });
-    if (pluginInfo) {
-      const pluginCopy = cloneDeep(pluginInfo);
-      pluginCopy.name = copiedPanel.title;
-      pluginCopy.sort = -1;
-      pluginCopy.defaults = copiedPanel;
-      copiedPanels.push(pluginCopy);
-    }
-  }
-
-  return sortBy(copiedPanels, 'sort');
-};
-
-export const AddPanelWidgetUnconnected = ({ panel, dashboard }: Props) => {
-  const [addPanelView, setAddPanelView] = useState(false);
-
-  const onCancelAddPanel = (evt: React.MouseEvent<HTMLButtonElement>) => {
-    evt.preventDefault();
-    dashboard.removePanel(panel);
-  };
-
-  const onBack = () => {
-    setAddPanelView(false);
-  };
-
-  const onCreateNewPanel = () => {
-    const { gridPos } = panel;
-
-    const newPanel: Partial<PanelModel> = {
-      type: 'timeseries',
-      title: 'Panel Title',
-      datasource: panel.datasource,
-      gridPos: { x: gridPos.x, y: gridPos.y, w: gridPos.w, h: gridPos.h },
-      isNew: true,
-    };
-
-    dashboard.addPanel(newPanel);
-    dashboard.removePanel(panel);
-
-    locationService.partial({ editPanel: newPanel.id });
-  };
-
-  const onPasteCopiedPanel = (panelPluginInfo: PanelPluginInfo) => {
-    const { gridPos } = panel;
-
-    const newPanel = {
-      type: panelPluginInfo.id,
-      title: 'Panel Title',
-      gridPos: {
-        x: gridPos.x,
-        y: gridPos.y,
-        w: panelPluginInfo.defaults.gridPos.w,
-        h: panelPluginInfo.defaults.gridPos.h,
-      },
-    };
-
-    // apply panel template / defaults
-    if (panelPluginInfo.defaults) {
-      defaults(newPanel, panelPluginInfo.defaults);
-      newPanel.title = panelPluginInfo.defaults.title;
-      store.delete(LS_PANEL_COPY_KEY);
-    }
-
-    dashboard.addPanel(newPanel);
-    dashboard.removePanel(panel);
-  };
-
-  const onAddLibraryPanel = (panelInfo: LibraryElementDTO) => {
-    const { gridPos } = panel;
-
-    const newPanel = {
-      ...panelInfo.model,
-      gridPos,
-      libraryPanel: panelInfo,
-    };
-
-    dashboard.addPanel(newPanel);
-    dashboard.removePanel(panel);
-  };
-
-  const onCreateNewRow = () => {
-    const newRow = {
-      type: 'row',
-      title: 'Row title',
-      gridPos: { x: 0, y: 0 },
-    };
-
-    dashboard.addPanel(newRow);
-    dashboard.removePanel(panel);
-  };
-
-  const styles = useStyles2(getStyles);
-  const copiedPanelPlugins = useMemo(() => getCopiedPanelPlugins(), []);
-
-  return (
-    <div className={styles.wrapper}>
-      <div className={cx('panel-container', styles.callToAction)}>
-        <AddPanelWidgetHandle onCancel={onCancelAddPanel} onBack={addPanelView ? onBack : undefined} styles={styles}>
-          {addPanelView ? 'Add panel from panel library' : 'Add panel'}
-        </AddPanelWidgetHandle>
-        {addPanelView ? (
-          <LibraryPanelsSearch onClick={onAddLibraryPanel} variant={LibraryPanelsSearchVariant.Tight} showPanelFilter />
-        ) : (
-          <div className={styles.actionsWrapper}>
-            <CardButton
-              icon="file-blank"
-              aria-label={selectors.pages.AddDashboard.addNewPanel}
-              onClick={() => {
-                reportInteraction('Create new panel');
-                onCreateNewPanel();
-              }}
-            >
-              Add a new panel
-            </CardButton>
-            <CardButton
-              icon="wrap-text"
-              aria-label={selectors.pages.AddDashboard.addNewRow}
-              onClick={() => {
-                reportInteraction('Create new row');
-                onCreateNewRow();
-              }}
-            >
-              Add a new row
-            </CardButton>
-            <CardButton
-              icon="book-open"
-              aria-label={selectors.pages.AddDashboard.addNewPanelLibrary}
-              onClick={() => {
-                reportInteraction('Add a panel from the panel library');
-                setAddPanelView(true);
-              }}
-            >
-              Add a panel from the panel library
-            </CardButton>
-            {copiedPanelPlugins.length === 1 && (
-              <CardButton
-                icon="clipboard-alt"
-                aria-label={selectors.pages.AddDashboard.addNewPanelLibrary}
-                onClick={() => {
-                  reportInteraction('Paste panel from clipboard');
-                  onPasteCopiedPanel(copiedPanelPlugins[0]);
-                }}
-              >
-                Paste panel from clipboard
-              </CardButton>
-            )}
-          </div>
-        )}
-      </div>
-    </div>
-  );
-};
-
-const mapDispatchToProps: MapDispatchToProps<DispatchProps, OwnProps> = { addPanel };
-
-export const AddPanelWidget = connect(undefined, mapDispatchToProps)(AddPanelWidgetUnconnected);
-
-interface AddPanelWidgetHandleProps {
-  onCancel: (e: React.MouseEvent<HTMLButtonElement>) => void;
-  onBack?: () => void;
-  children?: string;
-  styles: AddPanelStyles;
-}
-
-const AddPanelWidgetHandle = ({ children, onBack, onCancel, styles }: AddPanelWidgetHandleProps) => {
-  return (
-    <div className={cx(styles.headerRow, 'grid-drag-handle')}>
-      {onBack && (
-        <div className={styles.backButton}>
-          <IconButton name="arrow-left" onClick={onBack} size="xl" tooltip="Go back" />
-        </div>
-      )}
-      {!onBack && (
-        <div className={styles.backButton}>
-          <Icon name="panel-add" size="xl" />
-        </div>
-      )}
-      {children && <span>{children}</span>}
-      <div className="flex-grow-1" />
-      <IconButton aria-label="Close 'Add Panel' widget" name="times" onClick={onCancel} tooltip="Close widget" />
-    </div>
-  );
-};
-
-const getStyles = (theme: GrafanaTheme2) => {
-  const pulsate = keyframes`
-    0% {box-shadow: 0 0 0 2px ${theme.colors.background.canvas}, 0 0 0px 4px ${theme.colors.primary.main};}
-    50% {box-shadow: 0 0 0 2px ${theme.components.dashboard.background}, 0 0 0px 4px ${tinycolor(
-      theme.colors.primary.main
-    )
-      .darken(20)
-      .toHexString()};}
-    100% {box-shadow: 0 0 0 2px ${theme.components.dashboard.background}, 0 0 0px 4px  ${theme.colors.primary.main};}
-  `;
-
-  return {
-    // wrapper is used to make sure box-shadow animation isn't cut off in dashboard page
-    wrapper: css`
-      height: 100%;
-      padding-top: ${theme.spacing(0.5)};
-    `,
-    callToAction: css`
-      overflow: hidden;
-      outline: 2px dotted transparent;
-      outline-offset: 2px;
-      box-shadow:
-        0 0 0 2px black,
-        0 0 0px 4px #1f60c4;
-      animation: ${pulsate} 2s ease infinite;
-    `,
-    actionsWrapper: css`
-      height: 100%;
-      display: grid;
-      grid-template-columns: repeat(2, 1fr);
-      column-gap: ${theme.spacing(1)};
-      row-gap: ${theme.spacing(1)};
-      padding: ${theme.spacing(0, 1, 1, 1)};
-
-      // This is to make the last action full width (if by itself)
-      & > div:nth-child(2n-1):nth-last-of-type(1) {
-        grid-column: span 2;
-      }
-    `,
-    headerRow: css`
-      display: flex;
-      align-items: center;
-      height: 38px;
-      flex-shrink: 0;
-      width: 100%;
-      font-size: ${theme.typography.fontSize};
-      font-weight: ${theme.typography.fontWeightMedium};
-      padding-left: ${theme.spacing(1)};
-      transition: background-color 0.1s ease-in-out;
-      cursor: move;
-
-      &:hover {
-        background: ${theme.colors.background.secondary};
-      }
-    `,
-    backButton: css`
-      display: flex;
-      align-items: center;
-      cursor: pointer;
-      padding-left: ${theme.spacing(0.5)};
-      width: ${theme.spacing(4)};
-    `,
-    noMargin: css`
-      margin: 0;
-    `,
-  };
-};
-
-type AddPanelStyles = ReturnType<typeof getStyles>;
diff --git a/public/app/features/dashboard/components/AddPanelWidget/_AddPanelWidget.scss b/public/app/features/dashboard/components/AddPanelWidget/_AddPanelWidget.scss
deleted file mode 100644
index ccb5d7fe66774..0000000000000
--- a/public/app/features/dashboard/components/AddPanelWidget/_AddPanelWidget.scss
+++ /dev/null
@@ -1,78 +0,0 @@
-.add-panel-widget-container {
-  height: 100%;
-}
-
-.add-panel-widget {
-  height: 100%;
-}
-
-.add-panel-widget__header {
-  top: 0;
-  position: absolute;
-  padding: 0 8px;
-  display: flex;
-  align-items: center;
-  width: 100%;
-  cursor: move;
-  background: $page-header-bg;
-  box-shadow: $page-header-shadow;
-  border-bottom: 1px solid $page-header-border-color;
-
-  .gicon {
-    font-size: 30px;
-    margin-right: $space-md;
-  }
-
-  &:hover {
-    transition: background-color 0.1s ease-in-out;
-    background-color: $panel-header-hover-bg;
-  }
-}
-
-.add-panel-widget__title {
-  font-size: $font-size-md;
-  font-weight: $font-weight-semi-bold;
-  margin-right: $space-xl;
-}
-
-.add-panel-widget__link {
-  margin: 0 $space-sm;
-  width: 170px;
-  height: 88px !important;
-  flex-direction: column !important;
-}
-
-.add-panel-widget__icon {
-  margin-bottom: $space-sm;
-
-  .gicon {
-    color: white;
-    height: 44px;
-    width: 53px;
-    position: relative;
-    left: 5px;
-  }
-}
-
-.add-panel-widget__create {
-  display: inherit;
-  margin-bottom: $space-lg;
-  // this is to have the big button appear centered
-  margin-top: 55px;
-}
-
-.add-panel-widget__actions {
-  display: inherit;
-}
-
-.add-panel-widget__action {
-  margin: 0 $space-xs;
-}
-
-.add-panel-widget__btn-container {
-  height: 100%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-direction: column;
-}
diff --git a/public/app/features/dashboard/components/AddPanelWidget/index.ts b/public/app/features/dashboard/components/AddPanelWidget/index.ts
deleted file mode 100644
index b96948ab1c05f..0000000000000
--- a/public/app/features/dashboard/components/AddPanelWidget/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { AddPanelWidget } from './AddPanelWidget';
diff --git a/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsEdit.tsx b/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsEdit.tsx
index 1e1daac9c335a..52d79b51e9972 100644
--- a/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsEdit.tsx
+++ b/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsEdit.tsx
@@ -10,7 +10,6 @@ import {
   SelectableValue,
 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { Stack } from '@grafana/experimental';
 import { getDataSourceSrv, locationService } from '@grafana/runtime';
 import { AnnotationPanelFilter } from '@grafana/schema/src/raw/dashboard/x/dashboard_types.gen';
 import {
@@ -23,16 +22,16 @@ import {
   MultiSelect,
   Select,
   useStyles2,
+  Stack,
 } from '@grafana/ui';
 import { ColorValueEditor } from 'app/core/components/OptionsUI/color';
 import config from 'app/core/config';
 import StandardAnnotationQueryEditor from 'app/features/annotations/components/StandardAnnotationQueryEditor';
+import { AngularEditorLoader } from 'app/features/dashboard-scene/settings/annotations/AngularEditorLoader';
 import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker';
 
 import { DashboardModel } from '../../state/DashboardModel';
 
-import { AngularEditorLoader } from './AngularEditorLoader';
-
 type Props = {
   editIdx: number;
   dashboard: DashboardModel;
@@ -72,10 +71,26 @@ export const AnnotationSettingsEdit = ({ editIdx, dashboard }: Props) => {
   };
 
   const onDataSourceChange = (ds: DataSourceInstanceSettings) => {
-    onUpdate({
-      ...annotation,
-      datasource: getDataSourceRef(ds),
-    });
+    const dsRef = getDataSourceRef(ds);
+
+    if (annotation.datasource?.type !== dsRef.type) {
+      onUpdate({
+        datasource: dsRef,
+        builtIn: annotation.builtIn,
+        enable: annotation.enable,
+        iconColor: annotation.iconColor,
+        name: annotation.name,
+        hide: annotation.hide,
+        filter: annotation.filter,
+        mappings: annotation.mappings,
+        type: annotation.type,
+      });
+    } else {
+      onUpdate({
+        ...annotation,
+        datasource: dsRef,
+      });
+    }
   };
 
   const onChange = (ev: React.FocusEvent<HTMLInputElement>) => {
diff --git a/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsList.tsx b/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsList.tsx
index 21de6545af27e..10b5e49de3db7 100644
--- a/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsList.tsx
+++ b/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsList.tsx
@@ -2,6 +2,7 @@ import { css } from '@emotion/css';
 import React, { useState } from 'react';
 
 import { arrayUtils, AnnotationQuery } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import { getDataSourceSrv } from '@grafana/runtime';
 import { Button, DeleteButton, IconButton, useStyles2, VerticalGroup } from '@grafana/ui';
 import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
@@ -127,7 +128,14 @@ export const AnnotationSettingsList = ({ dashboard, onNew, onEdit }: Props) => {
           }}
         />
       )}
-      {!showEmptyListCTA && <ListNewButton onClick={onNew}>New query</ListNewButton>}
+      {!showEmptyListCTA && (
+        <ListNewButton
+          data-testid={selectors.pages.Dashboard.Settings.Annotations.List.addAnnotationCTAV2}
+          onClick={onNew}
+        >
+          New query
+        </ListNewButton>
+      )}
     </VerticalGroup>
   );
 };
diff --git a/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts
index a886f7dba5ced..9917955f6f6ec 100644
--- a/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts
+++ b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts
@@ -16,7 +16,8 @@ import { DashboardExporter, LibraryElementExport } from './DashboardExporter';
 jest.mock('app/core/store', () => {
   return {
     getBool: jest.fn(),
-    getObject: jest.fn(),
+    getObject: jest.fn((_a, b) => b),
+    get: jest.fn(),
   };
 });
 
@@ -24,9 +25,8 @@ jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
   getDataSourceSrv: () => {
     return {
-      get: (v: any) => {
+      get: (v: string | DataSourceRef) => {
         const s = getStubInstanceSettings(v);
-        // console.log('GET', v, s);
         return Promise.resolve(s);
       },
       getInstanceSettings: getStubInstanceSettings,
@@ -168,7 +168,7 @@ it('replaces datasource ref in library panel', async () => {
 });
 
 it('If a panel queries has no datasource prop ignore it', async () => {
-  const dashboard: any = {
+  const dashboard = {
     panels: [
       {
         id: 1,
@@ -180,7 +180,7 @@ it('If a panel queries has no datasource prop ignore it', async () => {
         targets: [{ refId: 'A', a: 'A' }],
       },
     ],
-  };
+  } as unknown as Dashboard;
   const dashboardModel = new DashboardModel(dashboard, undefined, {
     getVariablesFromState: () => [],
   });
@@ -347,9 +347,9 @@ describe('given dashboard with repeated panels', () => {
   });
 
   it('should not include default datasource in __inputs unnecessarily', async () => {
-    const testJson: any = {
+    const testJson = {
       panels: [{ id: 1, datasource: { uid: 'other', type: 'other' }, type: 'graph' }],
-    };
+    } as unknown as Dashboard;
     const testDash = new DashboardModel(testJson);
     const exporter = new DashboardExporter();
     const exportedJson: any = await exporter.makeExportable(testDash);
@@ -379,7 +379,7 @@ describe('given dashboard with repeated panels', () => {
   });
 
   it('should add datasource to required', () => {
-    const require: any = find(exported.__requires, { name: 'TestDB' });
+    const require = find(exported.__requires, { name: 'TestDB' });
     expect(require.name).toBe('TestDB');
     expect(require.id).toBe('testdb');
     expect(require.type).toBe('datasource');
@@ -387,52 +387,52 @@ describe('given dashboard with repeated panels', () => {
   });
 
   it('should not add built in datasources to required', () => {
-    const require: any = find(exported.__requires, { name: 'Mixed' });
+    const require = find(exported.__requires, { name: 'Mixed' });
     expect(require).toBe(undefined);
   });
 
   it('should add datasources used in mixed mode', () => {
-    const require: any = find(exported.__requires, { name: 'OtherDB' });
+    const require = find(exported.__requires, { name: 'OtherDB' });
     expect(require).not.toBe(undefined);
   });
 
   it('should add graph panel to required', () => {
-    const require: any = find(exported.__requires, { name: 'Graph' });
+    const require = find(exported.__requires, { name: 'Graph' });
     expect(require.name).toBe('Graph');
     expect(require.id).toBe('graph');
     expect(require.version).toBe('1.1.0');
   });
 
   it('should add table panel to required', () => {
-    const require: any = find(exported.__requires, { name: 'Table' });
+    const require = find(exported.__requires, { name: 'Table' });
     expect(require.name).toBe('Table');
     expect(require.id).toBe('table');
     expect(require.version).toBe('1.1.1');
   });
 
   it('should add heatmap panel to required', () => {
-    const require: any = find(exported.__requires, { name: 'Heatmap' });
+    const require = find(exported.__requires, { name: 'Heatmap' });
     expect(require.name).toBe('Heatmap');
     expect(require.id).toBe('heatmap');
     expect(require.version).toBe('1.1.2');
   });
 
   it('should add grafana version', () => {
-    const require: any = find(exported.__requires, { name: 'Grafana' });
+    const require = find(exported.__requires, { name: 'Grafana' });
     expect(require.type).toBe('grafana');
     expect(require.id).toBe('grafana');
     expect(require.version).toBe('3.0.2');
   });
 
   it('should add constant template variables as inputs', () => {
-    const input: any = find(exported.__inputs, { name: 'VAR_PREFIX' });
+    const input = find(exported.__inputs, { name: 'VAR_PREFIX' });
     expect(input.type).toBe('constant');
     expect(input.label).toBe('prefix');
     expect(input.value).toBe('collectd');
   });
 
   it('should templatize constant variables', () => {
-    const variable: any = find(exported.templating.list, { name: 'prefix' });
+    const variable = find(exported.templating.list, { name: 'prefix' });
     expect(variable.query).toBe('${VAR_PREFIX}');
     expect(variable.current.text).toBe('${VAR_PREFIX}');
     expect(variable.current.value).toBe('${VAR_PREFIX}');
@@ -441,7 +441,7 @@ describe('given dashboard with repeated panels', () => {
   });
 
   it('should add datasources only use via datasource variable to requires', () => {
-    const require: any = find(exported.__requires, { name: 'OtherDB_2' });
+    const require = find(exported.__requires, { name: 'OtherDB_2' });
     expect(require.id).toBe('other2');
   });
 
@@ -471,25 +471,25 @@ describe('given dashboard with repeated panels', () => {
 
 function getStubInstanceSettings(v: string | DataSourceRef): DataSourceInstanceSettings {
   let key = (v as DataSourceRef)?.type ?? v;
-  return (stubs[(key as any) ?? 'gfdb'] ?? stubs['gfdb']) as any;
+  return stubs[(key as string) ?? 'gfdb'] ?? stubs['gfdb'];
 }
 
 // Stub responses
-const stubs: { [key: string]: {} } = {};
+const stubs: { [key: string]: DataSourceInstanceSettings } = {};
 stubs['gfdb'] = {
   name: 'gfdb',
   meta: { id: 'testdb', info: { version: '1.2.1' }, name: 'TestDB' },
-};
+} as DataSourceInstanceSettings;
 
 stubs['other'] = {
   name: 'other',
   meta: { id: 'other', info: { version: '1.2.1' }, name: 'OtherDB' },
-};
+} as DataSourceInstanceSettings;
 
 stubs['other2'] = {
   name: 'other2',
   meta: { id: 'other2', info: { version: '1.2.1' }, name: 'OtherDB_2' },
-};
+} as DataSourceInstanceSettings;
 
 stubs['mixed'] = {
   name: 'mixed',
@@ -499,7 +499,7 @@ stubs['mixed'] = {
     name: 'Mixed',
     builtIn: true,
   },
-};
+} as DataSourceInstanceSettings;
 
 stubs['grafana'] = {
   name: '-- Grafana --',
@@ -509,4 +509,4 @@ stubs['grafana'] = {
     name: 'grafana',
     builtIn: true,
   },
-};
+} as DataSourceInstanceSettings;
diff --git a/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts
index 1e68a587f8e3d..ebfcfd555d50b 100644
--- a/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts
+++ b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts
@@ -52,8 +52,10 @@ interface PanelWithExportableLibraryPanel {
   libraryPanel: LibraryPanel;
 }
 
-function isExportableLibraryPanel(p: any): p is PanelWithExportableLibraryPanel {
-  return p.libraryPanel && typeof p.libraryPanel.name === 'string' && typeof p.libraryPanel.uid === 'string';
+function isExportableLibraryPanel(
+  p: PanelModel | PanelWithExportableLibraryPanel
+): p is PanelWithExportableLibraryPanel {
+  return Boolean(p.libraryPanel?.name && p.libraryPanel?.uid);
 }
 
 interface DataSources {
diff --git a/public/app/features/dashboard/components/DashNav/DashNav.tsx b/public/app/features/dashboard/components/DashNav/DashNav.tsx
index 1030d84cf29ab..181677d5f2b14 100644
--- a/public/app/features/dashboard/components/DashNav/DashNav.tsx
+++ b/public/app/features/dashboard/components/DashNav/DashNav.tsx
@@ -1,5 +1,5 @@
 import { css } from '@emotion/css';
-import React, { FC, ReactNode } from 'react';
+import React, { ReactNode } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 import { useLocation } from 'react-router-dom';
 
@@ -11,9 +11,9 @@ import {
   ModalsController,
   ToolbarButton,
   useForceUpdate,
-  Tag,
   ToolbarButtonRow,
   ConfirmModal,
+  Badge,
 } from '@grafana/ui';
 import { AppChromeUpdate } from 'app/core/components/AppChrome/AppChromeUpdate';
 import { NavToolbarSeparator } from 'app/core/components/AppChrome/NavToolbar/NavToolbarSeparator';
@@ -27,11 +27,18 @@ import AddPanelButton from 'app/features/dashboard/components/AddPanelButton/Add
 import { SaveDashboardDrawer } from 'app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer';
 import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
 import { DashboardModel } from 'app/features/dashboard/state';
+import { DashboardInteractions } from 'app/features/dashboard-scene/utils/interactions';
 import { playlistSrv } from 'app/features/playlist/PlaylistSrv';
 import { updateTimeZoneForSession } from 'app/features/profile/state/reducers';
 import { KioskMode } from 'app/types';
 import { DashboardMetaChangedEvent, ShowModalReactEvent } from 'app/types/events';
 
+import {
+  DynamicDashNavButtonModel,
+  dynamicDashNavActions,
+  registerDynamicDashNavAction,
+} from '../../../dashboard-scene/utils/registerDynamicDashNavAction';
+
 import { DashNavButton } from './DashNavButton';
 import { DashNavTimeControls } from './DashNavTimeControls';
 import { ShareButton } from './ShareButton';
@@ -52,24 +59,14 @@ export interface OwnProps {
   hideTimePicker: boolean;
   folderTitle?: string;
   title: string;
-  onAddPanel: () => void;
-}
-
-interface DashNavButtonModel {
-  show: (props: Props) => boolean;
-  component: FC<Partial<Props>>;
-  index?: number | 'end';
 }
 
-const customLeftActions: DashNavButtonModel[] = [];
-const customRightActions: DashNavButtonModel[] = [];
-
-export function addCustomLeftAction(content: DashNavButtonModel) {
-  customLeftActions.push(content);
+export function addCustomLeftAction(content: DynamicDashNavButtonModel) {
+  registerDynamicDashNavAction('left', content);
 }
 
-export function addCustomRightAction(content: DashNavButtonModel) {
-  customRightActions.push(content);
+export function addCustomRightAction(content: DynamicDashNavButtonModel) {
+  registerDynamicDashNavAction('right', content);
 }
 
 type Props = OwnProps & ConnectedProps<typeof connector>;
@@ -122,6 +119,7 @@ export const DashNav = React.memo<Props>((props) => {
   };
 
   const onStarDashboard = () => {
+    DashboardInteractions.toolbarFavoritesClick();
     const dashboardSrv = getDashboardSrv();
     const { dashboard, setStarred } = props;
 
@@ -133,6 +131,7 @@ export const DashNav = React.memo<Props>((props) => {
   };
 
   const onOpenSettings = () => {
+    DashboardInteractions.toolbarSettingsClick();
     locationService.partial({ editview: 'settings' });
   };
 
@@ -149,7 +148,7 @@ export const DashNav = React.memo<Props>((props) => {
     forceUpdate();
   };
 
-  const addCustomContent = (actions: DashNavButtonModel[], buttons: ReactNode[]) => {
+  const addCustomContent = (actions: DynamicDashNavButtonModel[], buttons: ReactNode[]) => {
     actions.map((action, index) => {
       const Component = action.component;
       const element = <Component {...props} key={`button-custom-${index}`} />;
@@ -158,12 +157,12 @@ export const DashNav = React.memo<Props>((props) => {
   };
 
   const isPlaylistRunning = () => {
-    return playlistSrv.isPlaying;
+    return playlistSrv.state.isPlaying;
   };
 
   const renderLeftActions = () => {
     const { dashboard, kioskMode } = props;
-    const { canStar, canShare, isStarred } = dashboard.meta;
+    const { canStar, isStarred } = dashboard.meta;
     const buttons: ReactNode[] = [];
 
     if (kioskMode || isPlaylistRunning()) {
@@ -186,13 +185,16 @@ export const DashNav = React.memo<Props>((props) => {
       );
     }
 
-    if (canShare) {
-      buttons.push(<ShareButton key="button-share" dashboard={dashboard} />);
-    }
-
     if (dashboard.meta.publicDashboardEnabled) {
+      // TODO: This will be replaced with the new badge component. Color is required but gets override by css
       buttons.push(
-        <Tag key="public-dashboard" name="Public" colorIndex={5} data-testid={selectors.publicDashboardTag}></Tag>
+        <Badge
+          color="blue"
+          text="Public"
+          key="public-dashboard-button-badge"
+          className={publicBadgeStyle}
+          data-testid={selectors.publicDashboardTag}
+        />
       );
     }
 
@@ -203,14 +205,13 @@ export const DashNav = React.memo<Props>((props) => {
           tooltip={'View as Scene'}
           icon="apps"
           onClick={() => {
-            const location = locationService.getLocation();
-            locationService.push(`/scenes/dashboard/${dashboard.uid}${location.search}`);
+            locationService.partial({ scenes: true });
           }}
         />
       );
     }
 
-    addCustomContent(customLeftActions, buttons);
+    addCustomContent(dynamicDashNavActions.left, buttons);
     return buttons;
   };
 
@@ -242,15 +243,21 @@ export const DashNav = React.memo<Props>((props) => {
     if (hideTimePicker) {
       return null;
     }
-
     return (
-      <DashNavTimeControls dashboard={dashboard} onChangeTimeZone={updateTimeZoneForSession} key="time-controls" />
+      <DashNavTimeControls
+        dashboard={dashboard}
+        onChangeTimeZone={updateTimeZoneForSession}
+        onToolbarRefreshClick={DashboardInteractions.toolbarRefreshClick}
+        onToolbarZoomClick={DashboardInteractions.toolbarZoomClick}
+        onToolbarTimePickerClick={DashboardInteractions.toolbarTimePickerClick}
+        key="time-controls"
+      />
     );
   };
 
   const renderRightActions = () => {
-    const { dashboard, onAddPanel, isFullscreen, kioskMode } = props;
-    const { canSave, canEdit, showSettings } = dashboard.meta;
+    const { dashboard, isFullscreen, kioskMode, hideTimePicker } = props;
+    const { canSave, canEdit, showSettings, canShare } = dashboard.meta;
     const { snapshot } = dashboard;
     const snapshotUrl = snapshot && snapshot.originalUrl;
     const buttons: ReactNode[] = [];
@@ -263,20 +270,15 @@ export const DashNav = React.memo<Props>((props) => {
       return [renderTimeControls()];
     }
 
-    if (canEdit && !isFullscreen) {
-      if (config.featureToggles.emptyDashboardPage) {
-        buttons.push(<AddPanelButton dashboard={dashboard} key="panel-add-dropdown" />);
-      } else {
-        buttons.push(
-          <ToolbarButton
-            tooltip={t('dashboard.toolbar.add-panel', 'Add panel')}
-            icon="panel-add"
-            iconSize="xl"
-            onClick={onAddPanel}
-            key="button-panel-add"
-          />
-        );
-      }
+    if (snapshotUrl) {
+      buttons.push(
+        <ToolbarButton
+          tooltip={t('dashboard.toolbar.open-original', 'Open original dashboard')}
+          onClick={onOpenSnapshotOriginal}
+          icon="link"
+          key="button-snapshot"
+        />
+      );
     }
 
     if (canSave && !isFullscreen) {
@@ -287,6 +289,7 @@ export const DashNav = React.memo<Props>((props) => {
               tooltip={t('dashboard.toolbar.save', 'Save dashboard')}
               icon="save"
               onClick={() => {
+                DashboardInteractions.toolbarSaveClick();
                 showModal(SaveDashboardDrawer, {
                   dashboard,
                   onDismiss: hideModal,
@@ -298,16 +301,7 @@ export const DashNav = React.memo<Props>((props) => {
       );
     }
 
-    if (snapshotUrl) {
-      buttons.push(
-        <ToolbarButton
-          tooltip={t('dashboard.toolbar.open-original', 'Open original dashboard')}
-          onClick={onOpenSnapshotOriginal}
-          icon="link"
-          key="button-snapshot"
-        />
-      );
-    }
+    addCustomContent(dynamicDashNavActions.right, buttons);
 
     if (showSettings) {
       buttons.push(
@@ -320,7 +314,24 @@ export const DashNav = React.memo<Props>((props) => {
       );
     }
 
-    addCustomContent(customRightActions, buttons);
+    if (canEdit && !isFullscreen) {
+      buttons.push(
+        <AddPanelButton
+          dashboard={dashboard}
+          onToolbarAddMenuOpen={DashboardInteractions.toolbarAddClick}
+          key="panel-add-dropdown"
+        />
+      );
+    }
+
+    if (canShare) {
+      buttons.push(<ShareButton key="button-share" dashboard={dashboard} />);
+    }
+
+    // if the timepicker is hidden, we don't need to add this separator
+    if (!hideTimePicker) {
+      buttons.push(<NavToolbarSeparator key="toolbar-separator" />);
+    }
 
     buttons.push(renderTimeControls());
 
@@ -348,3 +359,9 @@ const modalStyles = css({
   width: 'max-content',
   maxWidth: '80vw',
 });
+
+const publicBadgeStyle = css({
+  color: 'grey',
+  backgroundColor: 'transparent',
+  border: '1px solid',
+});
diff --git a/public/app/features/dashboard/components/DashNav/DashNavTimeControls.tsx b/public/app/features/dashboard/components/DashNav/DashNavTimeControls.tsx
index 532feb9893674..aef39caf3d2a7 100644
--- a/public/app/features/dashboard/components/DashNav/DashNavTimeControls.tsx
+++ b/public/app/features/dashboard/components/DashNav/DashNavTimeControls.tsx
@@ -17,6 +17,9 @@ export interface Props {
   dashboard: DashboardModel;
   onChangeTimeZone: (timeZone: TimeZone) => void;
   isOnCanvas?: boolean;
+  onToolbarRefreshClick?: () => void;
+  onToolbarZoomClick?: () => void;
+  onToolbarTimePickerClick?: () => void;
 }
 
 export class DashNavTimeControls extends Component<Props> {
@@ -75,9 +78,19 @@ export class DashNavTimeControls extends Component<Props> {
   };
 
   onZoom = () => {
+    if (this.props.onToolbarZoomClick) {
+      this.props.onToolbarZoomClick();
+    }
     appEvents.publish(new ZoomOutEvent({ scale: 2 }));
   };
 
+  onRefreshClick = () => {
+    if (this.props.onToolbarRefreshClick) {
+      this.props.onToolbarRefreshClick();
+    }
+    this.onRefresh();
+  };
+
   render() {
     const { dashboard, isOnCanvas } = this.props;
     const { refresh_intervals } = dashboard.timepicker;
@@ -106,10 +119,11 @@ export class DashNavTimeControls extends Component<Props> {
           onChangeTimeZone={this.onChangeTimeZone}
           onChangeFiscalYearStartMonth={this.onChangeFiscalYearStartMonth}
           isOnCanvas={isOnCanvas}
+          onToolbarTimePickerClick={this.props.onToolbarTimePickerClick}
         />
         <RefreshPicker
           onIntervalChanged={this.onChangeRefreshInterval}
-          onRefresh={this.onRefresh}
+          onRefresh={this.onRefreshClick}
           value={dashboard.refresh}
           intervals={intervals}
           isOnCanvas={isOnCanvas}
diff --git a/public/app/features/dashboard/components/DashNav/ShareButton.tsx b/public/app/features/dashboard/components/DashNav/ShareButton.tsx
index f21b9f560ad87..2ff6ac53448c7 100644
--- a/public/app/features/dashboard/components/DashNav/ShareButton.tsx
+++ b/public/app/features/dashboard/components/DashNav/ShareButton.tsx
@@ -1,42 +1,24 @@
-import React, { useContext, useEffect } from 'react';
+import React from 'react';
 
-import { ModalsContext } from '@grafana/ui';
-import { useQueryParams } from 'app/core/hooks/useQueryParams';
-import { t } from 'app/core/internationalization';
+import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
+import { locationService } from '@grafana/runtime';
+import { Button } from '@grafana/ui';
+import { Trans } from 'app/core/internationalization';
 import { DashboardModel } from 'app/features/dashboard/state';
-
-import { ShareModal } from '../ShareModal';
-
-import { DashNavButton } from './DashNavButton';
+import { DashboardInteractions } from 'app/features/dashboard-scene/utils/interactions';
 
 export const ShareButton = ({ dashboard }: { dashboard: DashboardModel }) => {
-  const [queryParams] = useQueryParams();
-  const { showModal, hideModal } = useContext(ModalsContext);
-
-  useEffect(() => {
-    if (!!queryParams.shareView) {
-      showModal(ShareModal, {
-        dashboard,
-        onDismiss: hideModal,
-        activeTab: String(queryParams.shareView),
-      });
-    }
-    return () => {
-      hideModal();
-    };
-  }, [showModal, hideModal, dashboard, queryParams.shareView]);
-
   return (
-    <DashNavButton
-      tooltip={t('dashboard.toolbar.share', 'Share dashboard')}
-      icon="share-alt"
-      iconSize="lg"
+    <Button
+      data-testid={e2eSelectors.pages.Dashboard.DashNav.shareButton}
+      variant="primary"
+      size="sm"
       onClick={() => {
-        showModal(ShareModal, {
-          dashboard,
-          onDismiss: hideModal,
-        });
+        DashboardInteractions.toolbarShareClick();
+        locationService.partial({ shareView: 'link' });
       }}
-    />
+    >
+      <Trans i18nKey="dashboard.toolbar.share-button">Share</Trans>
+    </Button>
   );
 };
diff --git a/public/app/features/dashboard/components/DashboardPermissions/AccessControlDashboardPermissions.tsx b/public/app/features/dashboard/components/DashboardPermissions/AccessControlDashboardPermissions.tsx
index 0506a77f665a1..212ba319048a9 100644
--- a/public/app/features/dashboard/components/DashboardPermissions/AccessControlDashboardPermissions.tsx
+++ b/public/app/features/dashboard/components/DashboardPermissions/AccessControlDashboardPermissions.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 
-import { config } from '@grafana/runtime';
 import { Permissions } from 'app/core/components/AccessControl';
 import { Page } from 'app/core/components/Page/Page';
 import { contextSrv } from 'app/core/core';
@@ -10,7 +9,7 @@ import { SettingsPageProps } from '../DashboardSettings/types';
 
 export const AccessControlDashboardPermissions = ({ dashboard, sectionNav }: SettingsPageProps) => {
   const canSetPermissions = contextSrv.hasPermission(AccessControlAction.DashboardsPermissionsWrite);
-  const pageNav = config.featureToggles.dockedMegaMenu ? sectionNav.node.parentItem : undefined;
+  const pageNav = sectionNav.node.parentItem;
 
   return (
     <Page navModel={sectionNav} pageNav={pageNav}>
diff --git a/public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx b/public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx
deleted file mode 100644
index a75821bc6d66d..0000000000000
--- a/public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx
+++ /dev/null
@@ -1,130 +0,0 @@
-import React, { PureComponent } from 'react';
-import { connect, ConnectedProps } from 'react-redux';
-
-import { config } from '@grafana/runtime';
-import { Tooltip, Icon, Button } from '@grafana/ui';
-import { SlideDown } from 'app/core/components/Animations/SlideDown';
-import { Page } from 'app/core/components/Page/Page';
-import AddPermission from 'app/core/components/PermissionList/AddPermission';
-import PermissionList from 'app/core/components/PermissionList/PermissionList';
-import PermissionsInfo from 'app/core/components/PermissionList/PermissionsInfo';
-import { StoreState } from 'app/types';
-import { DashboardAcl, PermissionLevel, NewDashboardAclItem } from 'app/types/acl';
-
-import { checkFolderPermissions } from '../../../folders/state/actions';
-import {
-  getDashboardPermissions,
-  addDashboardPermission,
-  removeDashboardPermission,
-  updateDashboardPermission,
-} from '../../state/actions';
-import { SettingsPageProps } from '../DashboardSettings/types';
-
-const mapStateToProps = (state: StoreState) => ({
-  permissions: state.dashboard.permissions,
-  canViewFolderPermissions: state.folder.canViewFolderPermissions,
-});
-
-const mapDispatchToProps = {
-  getDashboardPermissions,
-  addDashboardPermission,
-  removeDashboardPermission,
-  updateDashboardPermission,
-  checkFolderPermissions,
-};
-
-const connector = connect(mapStateToProps, mapDispatchToProps);
-
-export type Props = SettingsPageProps & ConnectedProps<typeof connector>;
-
-export interface State {
-  isAdding: boolean;
-}
-
-export class DashboardPermissionsUnconnected extends PureComponent<Props, State> {
-  constructor(props: Props) {
-    super(props);
-
-    this.state = {
-      isAdding: false,
-    };
-  }
-
-  componentDidMount() {
-    this.props.getDashboardPermissions(this.props.dashboard.id);
-    if (this.props.dashboard.meta.folderUid) {
-      this.props.checkFolderPermissions(this.props.dashboard.meta.folderUid);
-    }
-  }
-
-  onOpenAddPermissions = () => {
-    this.setState({ isAdding: true });
-  };
-
-  onRemoveItem = (item: DashboardAcl) => {
-    this.props.removeDashboardPermission(this.props.dashboard.id, item);
-  };
-
-  onPermissionChanged = (item: DashboardAcl, level: PermissionLevel) => {
-    this.props.updateDashboardPermission(this.props.dashboard.id, item, level);
-  };
-
-  onAddPermission = (newItem: NewDashboardAclItem) => {
-    return this.props.addDashboardPermission(this.props.dashboard.id, newItem);
-  };
-
-  onCancelAddPermission = () => {
-    this.setState({ isAdding: false });
-  };
-
-  getFolder() {
-    const { dashboard, canViewFolderPermissions } = this.props;
-
-    return {
-      id: dashboard.meta.folderId,
-      title: dashboard.meta.folderTitle,
-      url: dashboard.meta.folderUrl,
-      canViewFolderPermissions,
-    };
-  }
-
-  render() {
-    const { permissions, dashboard, sectionNav } = this.props;
-    const { isAdding } = this.state;
-    const pageNav = config.featureToggles.dockedMegaMenu ? sectionNav.node.parentItem : undefined;
-
-    if (dashboard.meta.hasUnsavedFolderChange) {
-      return (
-        <Page navModel={sectionNav} pageNav={pageNav}>
-          <h5>You have changed a folder, please save to view permissions.</h5>
-        </Page>
-      );
-    }
-
-    return (
-      <Page navModel={sectionNav} pageNav={pageNav}>
-        <div className="page-action-bar">
-          <Tooltip placement="auto" content={<PermissionsInfo />}>
-            <Icon className="icon--has-hover page-sub-heading-icon" name="question-circle" />
-          </Tooltip>
-          <div className="page-action-bar__spacer" />
-          <Button className="pull-right" onClick={this.onOpenAddPermissions} disabled={isAdding}>
-            Add permission
-          </Button>
-        </div>
-        <SlideDown in={isAdding}>
-          <AddPermission onAddPermission={this.onAddPermission} onCancel={this.onCancelAddPermission} />
-        </SlideDown>
-        <PermissionList
-          items={permissions}
-          onRemoveItem={this.onRemoveItem}
-          onPermissionChanged={this.onPermissionChanged}
-          isFetching={false}
-          folderInfo={this.getFolder()}
-        />
-      </Page>
-    );
-  }
-}
-
-export const DashboardPermissions = connector(DashboardPermissionsUnconnected);
diff --git a/public/app/features/dashboard/components/DashboardPrompt/DashboardPrompt.test.tsx b/public/app/features/dashboard/components/DashboardPrompt/DashboardPrompt.test.tsx
index ce8b511ce6618..021060699b4fd 100644
--- a/public/app/features/dashboard/components/DashboardPrompt/DashboardPrompt.test.tsx
+++ b/public/app/features/dashboard/components/DashboardPrompt/DashboardPrompt.test.tsx
@@ -11,9 +11,11 @@ function getDefaultDashboardModel() {
     panels: [
       createPanelSaveModel({
         id: 1,
-        type: 'graph',
+        type: 'timeseries',
         gridPos: { x: 0, y: 0, w: 24, h: 6 },
-        legend: { show: true, sortDesc: false }, // TODO legend is marked as a non-persisted field
+        options: {
+          legend: { showLegend: true },
+        },
       }),
 
       {
@@ -22,8 +24,8 @@ function getDefaultDashboardModel() {
         gridPos: { x: 0, y: 6, w: 24, h: 2 },
         collapsed: true,
         panels: [
-          { id: 3, type: 'graph', gridPos: { x: 0, y: 6, w: 12, h: 2 } },
-          { id: 4, type: 'graph', gridPos: { x: 12, y: 6, w: 12, h: 2 } },
+          { id: 3, type: 'timeseries', gridPos: { x: 0, y: 6, w: 12, h: 2 }, options: {} },
+          { id: 4, type: 'timeseries', gridPos: { x: 12, y: 6, w: 12, h: 2 }, options: {} },
         ],
       },
       { id: 5, type: 'row', gridPos: { x: 0, y: 6, w: 1, h: 1 }, collapsed: false, panels: [] },
@@ -66,10 +68,9 @@ describe('DashboardPrompt', () => {
     expect(hasChanges(dash, original)).toBe(false);
   });
 
-  it('Should ignore panel legend changes', () => {
+  it('Should ignore panel changes as those are handled via dirty flag', () => {
     const { original, dash } = getTestContext();
-    dash.panels[0]!.legend!.sortDesc = true;
-    dash.panels[0]!.legend!.sort = 'avg';
+    dash.panels[0]!.options = { legend: { showLegend: false } };
     expect(hasChanges(dash, original)).toBe(false);
   });
 
diff --git a/public/app/features/dashboard/components/DashboardPrompt/DashboardPrompt.tsx b/public/app/features/dashboard/components/DashboardPrompt/DashboardPrompt.tsx
index c5602a8cc443f..6a1c8544a71fb 100644
--- a/public/app/features/dashboard/components/DashboardPrompt/DashboardPrompt.tsx
+++ b/public/app/features/dashboard/components/DashboardPrompt/DashboardPrompt.tsx
@@ -146,6 +146,11 @@ export function ignoreChanges(current: DashboardModel | null, original: object |
     return true;
   }
 
+  // Ignore changes if original is unsaved
+  if ((original as DashboardModel).version === 0) {
+    return true;
+  }
+
   // Ignore changes if the user has been signed out
   if (!contextSrv.isSignedIn) {
     return true;
@@ -178,7 +183,7 @@ function cleanDashboardFromIgnoredChanges(dashData: Dashboard) {
 
   // ignore time and refresh
   delete dash.time;
-  dash.refresh = '';
+  delete dash.refresh;
   dash.schemaVersion = 0;
   delete dash.timezone;
 
@@ -202,6 +207,7 @@ export function hasChanges(current: DashboardModel, original: unknown) {
   if (current.hasUnsavedChanges()) {
     return true;
   }
+
   // TODO: Make getSaveModelClone return Dashboard type instead
   const currentClean = cleanDashboardFromIgnoredChanges(current.getSaveModelCloneOld() as unknown as Dashboard);
   const originalClean = cleanDashboardFromIgnoredChanges(original as Dashboard);
diff --git a/public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx b/public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx
index 83b95dacd259c..8b496e5962ba0 100644
--- a/public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx
+++ b/public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx
@@ -55,7 +55,7 @@ export class DashboardRow extends React.Component<DashboardRowProps> {
           <TextLink
             external
             href={
-              'https://grafana.com/docs/grafana/next/dashboards/build-dashboards/create-dashboard/#configure-repeating-rows'
+              'https://grafana.com/docs/grafana/latest/dashboards/build-dashboards/create-dashboard/#configure-repeating-rows'
             }
           >
             Learn more
diff --git a/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.test.tsx b/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.test.tsx
index 733f48f9c05af..a5f0962c7998d 100644
--- a/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.test.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.test.tsx
@@ -205,10 +205,10 @@ describe('AnnotationsSettings', () => {
     await userEvent.clear(nameInput);
     await userEvent.type(nameInput, 'My Prometheus Annotation');
 
-    await userEvent.click(screen.getByText(/testdata/i));
+    await userEvent.click(screen.getByPlaceholderText(/testdata/i));
 
     expect(await screen.findByText(/Prometheus/i)).toBeVisible();
-    expect(screen.queryAllByText(/testdata/i)).toHaveLength(2);
+    expect(screen.queryAllByText(/testdata/i)).toHaveLength(1);
 
     await userEvent.click(screen.getByText(/prometheus/i));
 
diff --git a/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.tsx b/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.tsx
index b4e0487291dac..005c067ee4990 100644
--- a/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { AnnotationQuery, getDataSourceRef, NavModelItem } from '@grafana/data';
-import { config, getDataSourceSrv, locationService } from '@grafana/runtime';
+import { getDataSourceSrv, locationService } from '@grafana/runtime';
 import { Page } from 'app/core/components/Page/Page';
 
 import { DashboardModel } from '../../state';
@@ -41,7 +41,7 @@ function getSubPageNav(
   editIndex: number | undefined,
   node: NavModelItem
 ): NavModelItem | undefined {
-  const parentItem = config.featureToggles.dockedMegaMenu ? node.parentItem : undefined;
+  const parentItem = node.parentItem;
   if (editIndex == null) {
     return parentItem;
   }
diff --git a/public/app/features/dashboard/components/DashboardSettings/AutoRefreshIntervals.tsx b/public/app/features/dashboard/components/DashboardSettings/AutoRefreshIntervals.tsx
index 629845f7b12db..90e9edef10ecc 100644
--- a/public/app/features/dashboard/components/DashboardSettings/AutoRefreshIntervals.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/AutoRefreshIntervals.tsx
@@ -6,7 +6,7 @@ import { t } from 'app/core/internationalization';
 import { getTimeSrv } from '../../services/TimeSrv';
 
 export interface Props {
-  refreshIntervals: string[];
+  refreshIntervals?: string[];
   onRefreshIntervalChange: (interval: string[]) => void;
   getIntervalsFunc?: typeof getValidIntervals;
   validateIntervalsFunc?: typeof validateIntervals;
diff --git a/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx b/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
index 1f42955fe5b23..23f24987ca324 100644
--- a/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
@@ -8,7 +8,6 @@ import { locationService } from '@grafana/runtime';
 import { Button, ToolbarButtonRow } from '@grafana/ui';
 import { AppChromeUpdate } from 'app/core/components/AppChrome/AppChromeUpdate';
 import { Page } from 'app/core/components/Page/Page';
-import config from 'app/core/config';
 import { t } from 'app/core/internationalization';
 import { contextSrv } from 'app/core/services/context_srv';
 import { AccessControlAction } from 'app/types';
@@ -185,14 +184,10 @@ function getSectionNav(
     text: t('dashboard-settings.settings.title', 'Settings'),
     children: [],
     icon: 'apps',
-    hideFromBreadcrumbs: true,
+    hideFromBreadcrumbs: false,
+    url: locationUtil.getUrlForPartial(location, { editview: 'settings', editIndex: null }),
   };
 
-  if (config.featureToggles.dockedMegaMenu) {
-    main.hideFromBreadcrumbs = false;
-    main.url = locationUtil.getUrlForPartial(location, { editview: 'settings', editIndex: null });
-  }
-
   main.children = pages.map((page) => ({
     text: page.title,
     icon: page.icon,
diff --git a/public/app/features/dashboard/components/DashboardSettings/GeneralSettings.test.tsx b/public/app/features/dashboard/components/DashboardSettings/GeneralSettings.test.tsx
index dc0437baefb6d..b3af73b81bd41 100644
--- a/public/app/features/dashboard/components/DashboardSettings/GeneralSettings.test.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/GeneralSettings.test.tsx
@@ -30,13 +30,12 @@ const setupTestContext = (options: Partial<Props>) => {
         timepicker: {
           refresh_intervals: ['5s', '10s', '30s', '1m', '5m', '15m', '30m', '1h', '2h', '1d', '2d'],
           time_options: ['5m', '15m', '1h', '6h', '12h', '24h', '2d', '7d', '30d'],
-          collapse: true,
           hidden: false,
         },
         timezone: 'utc',
       },
       {
-        folderId: 1,
+        folderUid: 'abc',
         folderTitle: 'test',
       }
     ),
@@ -78,7 +77,7 @@ describe('General Settings', () => {
   });
 
   describe('when timezone is changed', () => {
-    it('should call update function', async () => {
+    it.skip('should call update function', async () => {
       const { props } = setupTestContext({});
       await userEvent.click(screen.getByTestId(selectors.components.TimeZonePicker.containerV2));
       const timeZonePicker = screen.getByTestId(selectors.components.TimeZonePicker.containerV2);
diff --git a/public/app/features/dashboard/components/DashboardSettings/GeneralSettings.tsx b/public/app/features/dashboard/components/DashboardSettings/GeneralSettings.tsx
index 85d05afbe6dde..5f86114fc0ac9 100644
--- a/public/app/features/dashboard/components/DashboardSettings/GeneralSettings.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/GeneralSettings.tsx
@@ -10,9 +10,9 @@ import {
   RadioButtonGroup,
   TagsInput,
   Label,
-  HorizontalGroup,
   TextArea,
   Box,
+  Stack,
 } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import { FolderPicker } from 'app/core/components/Select/FolderPicker';
@@ -43,9 +43,9 @@ export function GeneralSettingsUnconnected({
   const [renderCounter, setRenderCounter] = useState(0);
   const [dashboardTitle, setDashboardTitle] = useState(dashboard.title);
   const [dashboardDescription, setDashboardDescription] = useState(dashboard.description);
-  const pageNav = config.featureToggles.dockedMegaMenu ? sectionNav.node.parentItem : undefined;
+  const pageNav = sectionNav.node.parentItem;
 
-  const onFolderChange = (newUID: string, newTitle: string) => {
+  const onFolderChange = (newUID: string | undefined, newTitle: string | undefined) => {
     dashboard.meta.folderUid = newUID;
     dashboard.meta.folderTitle = newTitle;
     dashboard.meta.hasUnsavedFolderChange = true;
@@ -124,15 +124,13 @@ export function GeneralSettingsUnconnected({
         <Box marginBottom={5}>
           <Field
             label={
-              <HorizontalGroup justify="space-between">
+              <Stack justifyContent="space-between">
                 <Label htmlFor="title-input">
                   <Trans i18nKey="dashboard-settings.general.title-label">Title</Trans>
                 </Label>
 
-                {config.featureToggles.dashgpt && (
-                  <GenAIDashTitleButton onGenerate={onTitleChange} dashboard={dashboard} />
-                )}
-              </HorizontalGroup>
+                {config.featureToggles.dashgpt && <GenAIDashTitleButton onGenerate={onTitleChange} />}
+              </Stack>
             }
           >
             <Input
@@ -144,15 +142,13 @@ export function GeneralSettingsUnconnected({
           </Field>
           <Field
             label={
-              <HorizontalGroup justify="space-between">
+              <Stack justifyContent="space-between">
                 <Label htmlFor="description-input">
                   {t('dashboard-settings.general.description-label', 'Description')}
                 </Label>
 
-                {config.featureToggles.dashgpt && (
-                  <GenAIDashDescriptionButton onGenerate={onDescriptionChange} dashboard={dashboard} />
-                )}
-              </HorizontalGroup>
+                {config.featureToggles.dashgpt && <GenAIDashDescriptionButton onGenerate={onDescriptionChange} />}
+              </Stack>
             }
           >
             <TextArea
@@ -222,7 +218,7 @@ export function GeneralSettingsUnconnected({
           </Field>
         </CollapsableSection>
 
-        <Box marginTop={3}>{dashboard.meta.canDelete && <DeleteDashboardButton dashboard={dashboard} />}</Box>
+        <Box marginTop={3}>{dashboard.meta.canDelete && <DeleteDashboardButton />}</Box>
       </div>
     </Page>
   );
diff --git a/public/app/features/dashboard/components/DashboardSettings/JsonEditorSettings.tsx b/public/app/features/dashboard/components/DashboardSettings/JsonEditorSettings.tsx
index 44ebe1484c70e..95dd2d3d3f7fa 100644
--- a/public/app/features/dashboard/components/DashboardSettings/JsonEditorSettings.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/JsonEditorSettings.tsx
@@ -2,7 +2,6 @@ import { css } from '@emotion/css';
 import React, { useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { config } from '@grafana/runtime';
 import { Button, CodeEditor, useStyles2 } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import { Trans } from 'app/core/internationalization';
@@ -13,8 +12,9 @@ import { getDashboardSrv } from '../../services/DashboardSrv';
 import { SettingsPageProps } from './types';
 
 export function JsonEditorSettings({ dashboard, sectionNav }: SettingsPageProps) {
-  const [dashboardJson, setDashboardJson] = useState<string>(JSON.stringify(dashboard.getSaveModelClone(), null, 2));
-  const pageNav = config.featureToggles.dockedMegaMenu ? sectionNav.node.parentItem : undefined;
+  const dashboardSaveModel = dashboard.getSaveModelClone();
+  const [dashboardJson, setDashboardJson] = useState<string>(JSON.stringify(dashboardSaveModel, null, 2));
+  const pageNav = sectionNav.node.parentItem;
 
   const onClick = async () => {
     await getDashboardSrv().saveJSONDashboard(dashboardJson);
diff --git a/public/app/features/dashboard/components/DashboardSettings/LinksSettings.test.tsx b/public/app/features/dashboard/components/DashboardSettings/LinksSettings.test.tsx
index 4973e38beb218..f454752307524 100644
--- a/public/app/features/dashboard/components/DashboardSettings/LinksSettings.test.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/LinksSettings.test.tsx
@@ -90,7 +90,9 @@ describe('LinksSettings', () => {
     const linklessDashboard = createDashboardModelFixture({ links: [] });
     setup(linklessDashboard);
 
-    expect(screen.getByRole('heading', { name: 'Links' })).toBeInTheDocument();
+    const linksTab = screen.getByRole('tab', { name: 'Tab Links' });
+    expect(linksTab).toBeInTheDocument();
+    expect(linksTab).toHaveAttribute('aria-selected', 'true');
     expect(
       screen.getByTestId(selectors.components.CallToActionCard.buttonV2('Add dashboard link'))
     ).toBeInTheDocument();
@@ -125,14 +127,14 @@ describe('LinksSettings', () => {
     // Checking the original order
     assertRowHasText(0, links[0].title);
     assertRowHasText(1, links[1].title);
-    assertRowHasText(2, links[2].url);
+    assertRowHasText(2, links[2].url!);
 
     await userEvent.click(within(getTableBody()).getAllByRole('button', { name: 'Move link down' })[0]);
     await userEvent.click(within(getTableBody()).getAllByRole('button', { name: 'Move link down' })[1]);
     await userEvent.click(within(getTableBody()).getAllByRole('button', { name: 'Move link up' })[0]);
 
     // Checking if it has changed the sorting accordingly
-    assertRowHasText(0, links[2].url);
+    assertRowHasText(0, links[2].url!);
     assertRowHasText(1, links[1].title);
     assertRowHasText(2, links[0].title);
   });
@@ -173,7 +175,7 @@ describe('LinksSettings', () => {
     expect(screen.queryByText('Type')).toBeInTheDocument();
     expect(screen.queryByText('Title')).toBeInTheDocument();
     expect(screen.queryByText('With tags')).toBeInTheDocument();
-    expect(screen.queryByText('Apply')).toBeInTheDocument();
+    expect(screen.queryByText('Back to list')).toBeInTheDocument();
 
     expect(screen.queryByText('Url')).not.toBeInTheDocument();
     expect(screen.queryByText('Tooltip')).not.toBeInTheDocument();
@@ -192,7 +194,7 @@ describe('LinksSettings', () => {
     await userEvent.clear(screen.getByRole('textbox', { name: /title/i }));
     await userEvent.type(screen.getByRole('textbox', { name: /title/i }), 'New Dashboard Link');
 
-    await userEvent.click(screen.getByRole('button', { name: /Apply/i }));
+    await userEvent.click(screen.getByRole('button', { name: /Back to list/i }));
 
     expect(getTableBodyRows().length).toBe(4);
     expect(within(getTableBody()).queryByText('New Dashboard Link')).toBeInTheDocument();
@@ -201,7 +203,7 @@ describe('LinksSettings', () => {
     await userEvent.clear(screen.getByRole('textbox', { name: /title/i }));
     await userEvent.type(screen.getByRole('textbox', { name: /title/i }), 'The first dashboard link');
 
-    await userEvent.click(screen.getByRole('button', { name: /Apply/i }));
+    await userEvent.click(screen.getByRole('button', { name: /Back to list/i }));
 
     expect(within(getTableBody()).queryByText(originalLinks[0].title)).not.toBeInTheDocument();
     expect(within(getTableBody()).queryByText('The first dashboard link')).toBeInTheDocument();
diff --git a/public/app/features/dashboard/components/DashboardSettings/LinksSettings.tsx b/public/app/features/dashboard/components/DashboardSettings/LinksSettings.tsx
index f58ec7db4732c..edef4baf5d4d3 100644
--- a/public/app/features/dashboard/components/DashboardSettings/LinksSettings.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/LinksSettings.tsx
@@ -1,11 +1,10 @@
 import React, { useState } from 'react';
 
-import { NavModelItem } from '@grafana/data';
-import { config, locationService } from '@grafana/runtime';
+import { locationService } from '@grafana/runtime';
 import { Page } from 'app/core/components/Page/Page';
+import { NEW_LINK } from 'app/features/dashboard-scene/settings/links/utils';
 
 import { LinkSettingsEdit, LinkSettingsList } from '../LinksSettings';
-import { newLink } from '../LinksSettings/LinkSettingsEdit';
 
 import { SettingsPageProps } from './types';
 
@@ -20,7 +19,7 @@ export function LinksSettings({ dashboard, sectionNav, editIndex }: SettingsPage
   };
 
   const onNew = () => {
-    dashboard.links = [...dashboard.links, { ...newLink }];
+    dashboard.links = [...dashboard.links, { ...NEW_LINK }];
     setIsNew(true);
     locationService.partial({ editIndex: dashboard.links.length - 1 });
   };
@@ -32,11 +31,7 @@ export function LinksSettings({ dashboard, sectionNav, editIndex }: SettingsPage
 
   const isEditing = editIndex !== undefined;
 
-  let pageNav: NavModelItem | undefined;
-
-  if (config.featureToggles.dockedMegaMenu) {
-    pageNav = sectionNav.node.parentItem;
-  }
+  let pageNav = sectionNav.node.parentItem;
 
   if (isEditing) {
     const title = isNew ? 'New link' : 'Edit link';
@@ -46,13 +41,11 @@ export function LinksSettings({ dashboard, sectionNav, editIndex }: SettingsPage
       subTitle: description,
     };
 
-    if (config.featureToggles.dockedMegaMenu) {
-      const parentUrl = sectionNav.node.url;
-      pageNav.parentItem = sectionNav.node.parentItem && {
-        ...sectionNav.node.parentItem,
-        url: parentUrl,
-      };
-    }
+    const parentUrl = sectionNav.node.url;
+    pageNav.parentItem = sectionNav.node.parentItem && {
+      ...sectionNav.node.parentItem,
+      url: parentUrl,
+    };
   }
 
   return (
diff --git a/public/app/features/dashboard/components/DashboardSettings/ListNewButton.tsx b/public/app/features/dashboard/components/DashboardSettings/ListNewButton.tsx
index 24ad47e2a7fa4..eafdcb04e2ec6 100644
--- a/public/app/features/dashboard/components/DashboardSettings/ListNewButton.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/ListNewButton.tsx
@@ -10,7 +10,7 @@ export const ListNewButton = ({ children, ...restProps }: Props) => {
   const styles = useStyles2(getStyles);
   return (
     <div className={styles.buttonWrapper}>
-      <Button icon="plus" variant="secondary" {...restProps}>
+      <Button icon="plus" {...restProps}>
         {children}
       </Button>
     </div>
diff --git a/public/app/features/dashboard/components/DashboardSettings/TimePickerSettings.tsx b/public/app/features/dashboard/components/DashboardSettings/TimePickerSettings.tsx
index e10a104c3cd97..0c0845b79950b 100644
--- a/public/app/features/dashboard/components/DashboardSettings/TimePickerSettings.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/TimePickerSettings.tsx
@@ -15,12 +15,12 @@ interface Props {
   onNowDelayChange: (nowDelay: string) => void;
   onHideTimePickerChange: (hide: boolean) => void;
   onLiveNowChange: (liveNow: boolean) => void;
-  refreshIntervals: string[];
-  timePickerHidden: boolean;
-  nowDelay: string;
+  refreshIntervals?: string[];
+  timePickerHidden?: boolean;
+  nowDelay?: string;
   timezone: TimeZone;
   weekStart: string;
-  liveNow: boolean;
+  liveNow?: boolean;
 }
 
 interface State {
diff --git a/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.test.tsx b/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.test.tsx
index 2ca3aae4e0013..a9b3405345801 100644
--- a/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.test.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.test.tsx
@@ -6,15 +6,15 @@ import { BrowserRouter } from 'react-router-dom';
 import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
 
 import { GrafanaContext } from 'app/core/context/GrafanaContext';
+import { historySrv } from 'app/features/dashboard-scene/settings/version-history/HistorySrv';
 
 import { configureStore } from '../../../../store/configureStore';
 import { createDashboardModelFixture } from '../../state/__fixtures__/dashboardFixtures';
-import { historySrv } from '../VersionHistory/HistorySrv';
 
 import { VersionsSettings, VERSIONS_FETCH_LIMIT } from './VersionsSettings';
 import { versions, diffs } from './__mocks__/versions';
 
-jest.mock('../VersionHistory/HistorySrv');
+jest.mock('app/features/dashboard-scene/settings/version-history/HistorySrv');
 
 const queryByFullText = (text: string) =>
   screen.queryByText((_, node: Element | undefined | null) => {
diff --git a/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.tsx b/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.tsx
index d2b13040688b0..a741bd51a7184 100644
--- a/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.tsx
@@ -1,17 +1,16 @@
 import React, { PureComponent } from 'react';
 
-import { config } from '@grafana/runtime';
 import { Spinner, HorizontalGroup } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
-
 import {
   historySrv,
   RevisionsModel,
-  VersionHistoryTable,
   VersionHistoryHeader,
   VersionsHistoryButtons,
-  VersionHistoryComparison,
-} from '../VersionHistory';
+} from 'app/features/dashboard-scene/settings/version-history';
+
+import { VersionHistoryComparison } from '../VersionHistory/VersionHistoryComparison';
+import { VersionHistoryTable } from '../VersionHistory/VersionHistoryTable';
 
 import { SettingsPageProps } from './types';
 
@@ -22,7 +21,7 @@ type State = {
   isAppending: boolean;
   versions: DecoratedRevisionModel[];
   viewMode: 'list' | 'compare';
-  diffData: { lhs: unknown; rhs: unknown };
+  diffData: { lhs: string; rhs: string };
   newInfo?: DecoratedRevisionModel;
   baseInfo?: DecoratedRevisionModel;
   isNewLatest: boolean;
@@ -50,8 +49,8 @@ export class VersionsSettings extends PureComponent<Props, State> {
       viewMode: 'list',
       isNewLatest: false,
       diffData: {
-        lhs: {},
-        rhs: {},
+        lhs: '',
+        rhs: '',
       },
     };
   }
@@ -63,7 +62,7 @@ export class VersionsSettings extends PureComponent<Props, State> {
   getVersions = (append = false) => {
     this.setState({ isAppending: append });
     historySrv
-      .getHistoryList(this.props.dashboard, { limit: this.limit, start: this.start })
+      .getHistoryList(this.props.dashboard.uid, { limit: this.limit, start: this.start })
       .then((res) => {
         this.setState({
           isLoading: false,
@@ -124,8 +123,8 @@ export class VersionsSettings extends PureComponent<Props, State> {
     this.setState({
       baseInfo: undefined,
       diffData: {
-        lhs: {},
-        rhs: {},
+        lhs: '',
+        rhs: '',
       },
       isNewLatest: false,
       newInfo: undefined,
@@ -139,7 +138,7 @@ export class VersionsSettings extends PureComponent<Props, State> {
     const canCompare = versions.filter((version) => version.checked).length === 2;
     const showButtons = versions.length > 1;
     const hasMore = versions.length >= this.limit;
-    const pageNav = config.featureToggles.dockedMegaMenu ? this.props.sectionNav.node.parentItem : undefined;
+    const pageNav = this.props.sectionNav.node.parentItem;
 
     if (viewMode === 'compare') {
       return (
@@ -186,7 +185,7 @@ export class VersionsSettings extends PureComponent<Props, State> {
   }
 }
 
-const VersionsHistorySpinner = ({ msg }: { msg: string }) => (
+export const VersionsHistorySpinner = ({ msg }: { msg: string }) => (
   <HorizontalGroup>
     <Spinner />
     <em>{msg}</em>
diff --git a/public/app/features/dashboard/components/DeleteDashboard/DeleteDashboardButton.tsx b/public/app/features/dashboard/components/DeleteDashboard/DeleteDashboardButton.tsx
index 1220d277548cd..b1f719db84267 100644
--- a/public/app/features/dashboard/components/DeleteDashboard/DeleteDashboardButton.tsx
+++ b/public/app/features/dashboard/components/DeleteDashboard/DeleteDashboardButton.tsx
@@ -3,29 +3,28 @@ import React from 'react';
 import { Button, ModalsController } from '@grafana/ui';
 import { Trans } from 'app/core/internationalization';
 
-import { DashboardModel } from '../../state';
+import { getDashboardSrv } from '../../services/DashboardSrv';
 
 import { DeleteDashboardModal } from './DeleteDashboardModal';
 
-type Props = {
-  dashboard: DashboardModel;
+export const DeleteDashboardButton = () => {
+  const dashboard = getDashboardSrv().getCurrent()!;
+  return (
+    <ModalsController>
+      {({ showModal, hideModal }) => (
+        <Button
+          variant="destructive"
+          onClick={() => {
+            showModal(DeleteDashboardModal, {
+              dashboard,
+              hideModal,
+            });
+          }}
+          aria-label="Dashboard settings page delete dashboard button"
+        >
+          <Trans i18nKey="dashboard-settings.dashboard-delete-button">Delete Dashboard</Trans>
+        </Button>
+      )}
+    </ModalsController>
+  );
 };
-
-export const DeleteDashboardButton = ({ dashboard }: Props) => (
-  <ModalsController>
-    {({ showModal, hideModal }) => (
-      <Button
-        variant="destructive"
-        onClick={() => {
-          showModal(DeleteDashboardModal, {
-            dashboard,
-            hideModal,
-          });
-        }}
-        aria-label="Dashboard settings page delete dashboard button"
-      >
-        <Trans i18nKey="dashboard-settings.dashboard-delete-button">Delete Dashboard</Trans>
-      </Button>
-    )}
-  </ModalsController>
-);
diff --git a/public/app/features/dashboard/components/DeleteDashboard/DeleteDashboardModal.tsx b/public/app/features/dashboard/components/DeleteDashboard/DeleteDashboardModal.tsx
index 389518dc20469..1b9fb0088d4d0 100644
--- a/public/app/features/dashboard/components/DeleteDashboard/DeleteDashboardModal.tsx
+++ b/public/app/features/dashboard/components/DeleteDashboard/DeleteDashboardModal.tsx
@@ -1,15 +1,13 @@
 import { css } from '@emotion/css';
-import { sumBy } from 'lodash';
 import React from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 import useAsyncFn from 'react-use/lib/useAsyncFn';
 
+import { locationService } from '@grafana/runtime';
 import { Modal, ConfirmModal, Button } from '@grafana/ui';
-import { config } from 'app/core/config';
-import { DashboardModel, PanelModel } from 'app/features/dashboard/state';
+import { DashboardModel } from 'app/features/dashboard/state';
 import { cleanUpDashboardAndVariables } from 'app/features/dashboard/state/actions';
-
-import { useDashboardDelete } from './useDashboardDelete';
+import { deleteDashboard } from 'app/features/manage-dashboards/state/actions';
 
 type DeleteDashboardModalProps = {
   hideModal(): void;
@@ -26,15 +24,14 @@ type Props = DeleteDashboardModalProps & ConnectedProps<typeof connector>;
 
 const DeleteDashboardModalUnconnected = ({ hideModal, cleanUpDashboardAndVariables, dashboard }: Props) => {
   const isProvisioned = dashboard.meta.provisioned;
-  const { onDeleteDashboard } = useDashboardDelete(dashboard.uid, cleanUpDashboardAndVariables);
 
   const [, onConfirm] = useAsyncFn(async () => {
-    await onDeleteDashboard();
+    await deleteDashboard(dashboard.uid, true);
+    cleanUpDashboardAndVariables();
     hideModal();
+    locationService.replace('/');
   }, [hideModal]);
 
-  const modalBody = getModalBody(dashboard.panels, dashboard.title);
-
   if (isProvisioned) {
     return <ProvisionedDeleteModal hideModal={hideModal} provisionedId={dashboard.meta.provisionedExternalId!} />;
   }
@@ -42,7 +39,12 @@ const DeleteDashboardModalUnconnected = ({ hideModal, cleanUpDashboardAndVariabl
   return (
     <ConfirmModal
       isOpen={true}
-      body={modalBody}
+      body={
+        <>
+          <p>Do you want to delete this dashboard?</p>
+          <p>{dashboard.title}</p>
+        </>
+      }
       onConfirm={onConfirm}
       onDismiss={hideModal}
       title="Delete"
@@ -52,24 +54,6 @@ const DeleteDashboardModalUnconnected = ({ hideModal, cleanUpDashboardAndVariabl
   );
 };
 
-const getModalBody = (panels: PanelModel[], title: string) => {
-  const totalAlerts = sumBy(panels, (panel) => (panel.alert ? 1 : 0));
-  return totalAlerts > 0 && !config.unifiedAlertingEnabled ? (
-    <>
-      <p>Do you want to delete this dashboard?</p>
-      <p>
-        This dashboard contains {totalAlerts} alert{totalAlerts > 1 ? 's' : ''}. Deleting this dashboard also deletes
-        those alerts.
-      </p>
-    </>
-  ) : (
-    <>
-      <p>Do you want to delete this dashboard?</p>
-      <p>{title}</p>
-    </>
-  );
-};
-
 const ProvisionedDeleteModal = ({ hideModal, provisionedId }: { hideModal(): void; provisionedId: string }) => (
   <Modal
     isOpen={true}
diff --git a/public/app/features/dashboard/components/DeleteDashboard/useDashboardDelete.tsx b/public/app/features/dashboard/components/DeleteDashboard/useDashboardDelete.tsx
deleted file mode 100644
index 630ae39be285c..0000000000000
--- a/public/app/features/dashboard/components/DeleteDashboard/useDashboardDelete.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { useEffect } from 'react';
-import { useAsyncFn } from 'react-use';
-
-import { locationService } from '@grafana/runtime';
-import { useAppNotification } from 'app/core/copy/appNotification';
-import { deleteDashboard } from 'app/features/manage-dashboards/state/actions';
-
-export const useDashboardDelete = (uid: string, cleanUpDashboardAndVariables: () => void) => {
-  const [state, onDeleteDashboard] = useAsyncFn(() => deleteDashboard(uid, false), []);
-  const notifyApp = useAppNotification();
-
-  useEffect(() => {
-    if (state.value) {
-      cleanUpDashboardAndVariables();
-      locationService.replace('/');
-      notifyApp.success('Dashboard Deleted', `${state.value.title} has been deleted`);
-    }
-  }, [state, notifyApp, cleanUpDashboardAndVariables]);
-
-  return { state, onDeleteDashboard };
-};
diff --git a/public/app/features/dashboard/components/GenAI/GenAIButton.test.tsx b/public/app/features/dashboard/components/GenAI/GenAIButton.test.tsx
index dc94a9ae1e091..fc76cf269d085 100644
--- a/public/app/features/dashboard/components/GenAI/GenAIButton.test.tsx
+++ b/public/app/features/dashboard/components/GenAI/GenAIButton.test.tsx
@@ -13,6 +13,7 @@ import { EventTrackingSrc } from './tracking';
 import { Role } from './utils';
 
 const mockedUseOpenAiStreamState = {
+  messages: [],
   setMessages: jest.fn(),
   reply: 'I am a robot',
   streamStatus: StreamStatus.IDLE,
@@ -43,10 +44,12 @@ describe('GenAIButton', () => {
   describe('when LLM plugin is not configured', () => {
     beforeAll(() => {
       jest.mocked(useOpenAIStream).mockReturnValue({
+        messages: [],
         error: undefined,
         streamStatus: StreamStatus.IDLE,
         reply: 'Some completed genereated text',
         setMessages: jest.fn(),
+        setStopGeneration: jest.fn(),
         value: {
           enabled: false,
           stream: new Observable().subscribe(),
@@ -63,12 +66,18 @@ describe('GenAIButton', () => {
 
   describe('when LLM plugin is properly configured, so it is enabled', () => {
     const setMessagesMock = jest.fn();
+    const setShouldStopMock = jest.fn();
     beforeEach(() => {
+      setMessagesMock.mockClear();
+      setShouldStopMock.mockClear();
+
       jest.mocked(useOpenAIStream).mockReturnValue({
+        messages: [],
         error: undefined,
         streamStatus: StreamStatus.IDLE,
         reply: 'Some completed genereated text',
         setMessages: setMessagesMock,
+        setStopGeneration: setShouldStopMock,
         value: {
           enabled: true,
           stream: new Observable().subscribe(),
@@ -100,6 +109,20 @@ describe('GenAIButton', () => {
       expect(setMessagesMock).toHaveBeenCalledWith([{ content: 'Generate X', role: 'system' as Role }]);
     });
 
+    it('should call the messages when they are provided as callback', async () => {
+      const onGenerate = jest.fn();
+      const messages = jest.fn().mockReturnValue([{ content: 'Generate X', role: 'system' as Role }]);
+      const onClick = jest.fn();
+      setup({ onGenerate, messages, temperature: 3, onClick, eventTrackingSrc });
+
+      const generateButton = await screen.findByRole('button');
+      await fireEvent.click(generateButton);
+
+      expect(messages).toHaveBeenCalledTimes(1);
+      expect(setMessagesMock).toHaveBeenCalledTimes(1);
+      expect(setMessagesMock).toHaveBeenCalledWith([{ content: 'Generate X', role: 'system' as Role }]);
+    });
+
     it('should call the onClick callback', async () => {
       const onGenerate = jest.fn();
       const onClick = jest.fn();
@@ -114,12 +137,16 @@ describe('GenAIButton', () => {
   });
 
   describe('when it is generating data', () => {
+    const setShouldStopMock = jest.fn();
+
     beforeEach(() => {
       jest.mocked(useOpenAIStream).mockReturnValue({
+        messages: [],
         error: undefined,
         streamStatus: StreamStatus.GENERATING,
         reply: 'Some incomplete generated text',
         setMessages: jest.fn(),
+        setStopGeneration: setShouldStopMock,
         value: {
           enabled: true,
           stream: new Observable().subscribe(),
@@ -138,33 +165,86 @@ describe('GenAIButton', () => {
       waitFor(async () => expect(await screen.findByRole('button')).toBeEnabled());
     });
 
-    it('disables the button while generating', async () => {
+    it('shows the stop button while generating', async () => {
       const { getByText, getByRole } = setup();
-      const generateButton = getByText('Generating');
+      const generateButton = getByText('Stop generating');
 
-      // The loading text should be visible and the button disabled
       expect(generateButton).toBeVisible();
-      await waitFor(() => expect(getByRole('button')).toBeDisabled());
+      await waitFor(() => expect(getByRole('button')).toBeEnabled());
     });
 
-    it('should call onGenerate when the text is generating', async () => {
+    it('should not call onGenerate when the text is generating', async () => {
       const onGenerate = jest.fn();
       setup({ onGenerate, messages: [], eventTrackingSrc: eventTrackingSrc });
 
-      await waitFor(() => expect(onGenerate).toHaveBeenCalledTimes(1));
+      await waitFor(() => expect(onGenerate).not.toHaveBeenCalledTimes(1));
+    });
 
-      expect(onGenerate).toHaveBeenCalledWith('Some incomplete generated text');
+    it('should stop generating when clicking the button', async () => {
+      const onGenerate = jest.fn();
+      const { getByText } = setup({ onGenerate, messages: [], eventTrackingSrc: eventTrackingSrc });
+      const generateButton = getByText('Stop generating');
+
+      await fireEvent.click(generateButton);
+
+      expect(setShouldStopMock).toHaveBeenCalledTimes(1);
+      expect(setShouldStopMock).toHaveBeenCalledWith(true);
+      expect(onGenerate).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('when it is completed from generating data', () => {
+    const setShouldStopMock = jest.fn();
+
+    beforeEach(() => {
+      jest.mocked(useOpenAIStream).mockReturnValue({
+        messages: [],
+        error: undefined,
+        streamStatus: StreamStatus.COMPLETED,
+        reply: 'Some completed generated text',
+        setMessages: jest.fn(),
+        setStopGeneration: setShouldStopMock,
+        value: {
+          enabled: true,
+          stream: new Observable().subscribe(),
+        },
+      });
+    });
+
+    it('should render improve text ', async () => {
+      setup();
+
+      waitFor(async () => expect(await screen.findByText('Improve')).toBeInTheDocument());
+    });
+
+    it('should enable the button', async () => {
+      setup();
+      waitFor(async () => expect(await screen.findByRole('button')).toBeEnabled());
+    });
+
+    it('should call onGenerate when the text is completed', async () => {
+      const onGenerate = jest.fn();
+      setup({ onGenerate, messages: [], eventTrackingSrc: eventTrackingSrc });
+
+      await waitFor(() => expect(onGenerate).toHaveBeenCalledTimes(1));
+      expect(onGenerate).toHaveBeenCalledWith('Some completed generated text');
     });
   });
 
   describe('when there is an error generating data', () => {
     const setMessagesMock = jest.fn();
+    const setShouldStopMock = jest.fn();
     beforeEach(() => {
+      setMessagesMock.mockClear();
+      setShouldStopMock.mockClear();
+
       jest.mocked(useOpenAIStream).mockReturnValue({
+        messages: [],
         error: new Error('Something went wrong'),
         streamStatus: StreamStatus.IDLE,
         reply: '',
         setMessages: setMessagesMock,
+        setStopGeneration: setShouldStopMock,
         value: {
           enabled: true,
           stream: new Observable().subscribe(),
@@ -224,5 +304,19 @@ describe('GenAIButton', () => {
 
       await waitFor(() => expect(onClick).toHaveBeenCalledTimes(1));
     });
+
+    it('should call the messages when they are provided as callback', async () => {
+      const onGenerate = jest.fn();
+      const messages = jest.fn().mockReturnValue([{ content: 'Generate X', role: 'system' as Role }]);
+      const onClick = jest.fn();
+      setup({ onGenerate, messages, temperature: 3, onClick, eventTrackingSrc });
+
+      const generateButton = await screen.findByRole('button');
+      await fireEvent.click(generateButton);
+
+      expect(messages).toHaveBeenCalledTimes(1);
+      expect(setMessagesMock).toHaveBeenCalledTimes(1);
+      expect(setMessagesMock).toHaveBeenCalledWith([{ content: 'Generate X', role: 'system' as Role }]);
+    });
   });
 });
diff --git a/public/app/features/dashboard/components/GenAI/GenAIButton.tsx b/public/app/features/dashboard/components/GenAI/GenAIButton.tsx
index ad2ddf59a9e77..566dd8e7ede6c 100644
--- a/public/app/features/dashboard/components/GenAI/GenAIButton.tsx
+++ b/public/app/features/dashboard/components/GenAI/GenAIButton.tsx
@@ -7,34 +7,34 @@ import { Button, Spinner, useStyles2, Tooltip, Toggletip, Text } from '@grafana/
 import { GenAIHistory } from './GenAIHistory';
 import { StreamStatus, useOpenAIStream } from './hooks';
 import { AutoGenerateItem, EventTrackingSrc, reportAutoGenerateInteraction } from './tracking';
-import { OPEN_AI_MODEL, Message, sanitizeReply } from './utils';
+import { OAI_MODEL, DEFAULT_OAI_MODEL, Message, sanitizeReply } from './utils';
 
 export interface GenAIButtonProps {
   // Button label text
   text?: string;
-  // Button label text when loading
-  loadingText?: string;
   toggleTipTitle?: string;
   // Button click handler
   onClick?: (e: React.MouseEvent<HTMLButtonElement>) => void;
   // Messages to send to the LLM plugin
-  messages: Message[];
+  messages: Message[] | (() => Message[]);
   // Callback function that the LLM plugin streams responses to
   onGenerate: (response: string) => void;
   // Temperature for the LLM plugin. Default is 1.
   // Closer to 0 means more conservative, closer to 1 means more creative.
   temperature?: number;
+  model?: OAI_MODEL;
   // Event tracking source. Send as `src` to Rudderstack event
   eventTrackingSrc: EventTrackingSrc;
   // Whether the button should be disabled
   disabled?: boolean;
 }
+export const STOP_GENERATION_TEXT = 'Stop generating';
 
 export const GenAIButton = ({
   text = 'Auto-generate',
-  loadingText = 'Generating',
   toggleTipTitle = '',
   onClick: onClickProp,
+  model = DEFAULT_OAI_MODEL,
   messages,
   onGenerate,
   temperature = 1,
@@ -43,30 +43,36 @@ export const GenAIButton = ({
 }: GenAIButtonProps) => {
   const styles = useStyles2(getStyles);
 
-  const { setMessages, reply, value, error, streamStatus } = useOpenAIStream(OPEN_AI_MODEL, temperature);
+  const { setMessages, setStopGeneration, reply, value, error, streamStatus } = useOpenAIStream(model, temperature);
 
   const [history, setHistory] = useState<string[]>([]);
-  const [showHistory, setShowHistory] = useState(true);
+  const [showHistory, setShowHistory] = useState(false);
 
   const hasHistory = history.length > 0;
-  const isFirstHistoryEntry = streamStatus === StreamStatus.GENERATING && !hasHistory;
-  const isButtonDisabled = disabled || isFirstHistoryEntry || (value && !value.enabled && !error);
+  const isGenerating = streamStatus === StreamStatus.GENERATING;
+  const isFirstHistoryEntry = !hasHistory;
+  const isButtonDisabled = disabled || (value && !value.enabled && !error);
   const reportInteraction = (item: AutoGenerateItem) => reportAutoGenerateInteraction(eventTrackingSrc, item);
 
   const onClick = (e: React.MouseEvent<HTMLButtonElement>) => {
-    if (!hasHistory) {
-      onClickProp?.(e);
-      setMessages(messages);
+    if (streamStatus === StreamStatus.GENERATING) {
+      setStopGeneration(true);
     } else {
-      if (setShowHistory) {
+      if (!hasHistory) {
+        onClickProp?.(e);
+        setMessages(getMessages());
+      } else {
         setShowHistory(true);
       }
     }
+
     const buttonItem = error
       ? AutoGenerateItem.erroredRetryButton
-      : hasHistory
-      ? AutoGenerateItem.improveButton
-      : AutoGenerateItem.autoGenerateButton;
+      : isGenerating
+        ? AutoGenerateItem.stopGenerationButton
+        : isFirstHistoryEntry
+          ? AutoGenerateItem.autoGenerateButton
+          : AutoGenerateItem.improveButton;
     reportInteraction(buttonItem);
   };
 
@@ -81,10 +87,10 @@ export const GenAIButton = ({
 
   useEffect(() => {
     // Todo: Consider other options for `"` sanitation
-    if (isFirstHistoryEntry && reply) {
+    if (streamStatus === StreamStatus.COMPLETED && reply) {
       onGenerate(sanitizeReply(reply));
     }
-  }, [streamStatus, reply, onGenerate, isFirstHistoryEntry]);
+  }, [streamStatus, reply, onGenerate]);
 
   useEffect(() => {
     if (streamStatus === StreamStatus.COMPLETED) {
@@ -104,7 +110,7 @@ export const GenAIButton = ({
   };
 
   const getIcon = () => {
-    if (isFirstHistoryEntry) {
+    if (isGenerating) {
       return undefined;
     }
     if (error || (value && !value?.enabled)) {
@@ -120,8 +126,8 @@ export const GenAIButton = ({
       buttonText = 'Retry';
     }
 
-    if (isFirstHistoryEntry) {
-      buttonText = loadingText;
+    if (isGenerating) {
+      buttonText = STOP_GENERATION_TEXT;
     }
 
     if (hasHistory) {
@@ -144,6 +150,13 @@ export const GenAIButton = ({
     </Button>
   );
 
+  const getMessages = () => {
+    if (typeof messages === 'function') {
+      return messages();
+    }
+    return messages;
+  };
+
   const renderButtonWithToggletip = () => {
     if (hasHistory) {
       const title = <Text element="p">{toggleTipTitle}</Text>;
@@ -154,15 +167,17 @@ export const GenAIButton = ({
           content={
             <GenAIHistory
               history={history}
-              messages={messages}
+              messages={getMessages()}
               onApplySuggestion={onApplySuggestion}
               updateHistory={pushHistoryEntry}
               eventTrackingSrc={eventTrackingSrc}
             />
           }
-          placement="bottom-start"
+          placement="left-start"
           fitContent={true}
-          show={showHistory ? undefined : false}
+          show={showHistory}
+          onClose={() => setShowHistory(false)}
+          onOpen={() => setShowHistory(true)}
         >
           {button}
         </Toggletip>
@@ -174,8 +189,8 @@ export const GenAIButton = ({
 
   return (
     <div className={styles.wrapper}>
-      {isFirstHistoryEntry && <Spinner size="sm" />}
-      {!hasHistory && (
+      {isGenerating && <Spinner size="sm" className={styles.spinner} />}
+      {isFirstHistoryEntry ? (
         <Tooltip
           show={error ? undefined : false}
           interactive
@@ -185,8 +200,9 @@ export const GenAIButton = ({
         >
           {button}
         </Tooltip>
+      ) : (
+        renderButtonWithToggletip()
       )}
-      {hasHistory && renderButtonWithToggletip()}
     </div>
   );
 };
@@ -195,4 +211,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
   wrapper: css({
     display: 'flex',
   }),
+  spinner: css({
+    color: theme.colors.text.link,
+  }),
 });
diff --git a/public/app/features/dashboard/components/GenAI/GenAIDashDescriptionButton.tsx b/public/app/features/dashboard/components/GenAI/GenAIDashDescriptionButton.tsx
index b039735c06ea6..f2df2ef09ead8 100644
--- a/public/app/features/dashboard/components/GenAI/GenAIDashDescriptionButton.tsx
+++ b/public/app/features/dashboard/components/GenAI/GenAIDashDescriptionButton.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { DashboardModel } from '../../state';
+import { getDashboardSrv } from '../../services/DashboardSrv';
 
 import { GenAIButton } from './GenAIButton';
 import { EventTrackingSrc } from './tracking';
@@ -8,9 +8,10 @@ import { getDashboardPanelPrompt, Message, Role } from './utils';
 
 interface GenAIDashDescriptionButtonProps {
   onGenerate: (description: string) => void;
-  dashboard: DashboardModel;
 }
 
+const DASHBOARD_DESCRIPTION_CHAR_LIMIT = 300;
+
 const DESCRIPTION_GENERATION_STANDARD_PROMPT =
   'You are an expert in creating Grafana Dashboards.\n' +
   'Your goal is to write a descriptive and concise dashboard description.\n' +
@@ -19,24 +20,22 @@ const DESCRIPTION_GENERATION_STANDARD_PROMPT =
   'If the dashboard has no panels, the description should be "Empty dashboard"\n' +
   'There should be no numbers in the description except where they are important.\n' +
   'The dashboard description should not have the dashboard title or any quotation marks in it.\n' +
-  'The description should be, at most, 140 characters.\n' +
+  `The description should be, at most, ${DASHBOARD_DESCRIPTION_CHAR_LIMIT} characters.\n` +
   'Respond with only the description of the dashboard.';
 
-export const GenAIDashDescriptionButton = ({ onGenerate, dashboard }: GenAIDashDescriptionButtonProps) => {
-  const messages = React.useMemo(() => getMessages(dashboard), [dashboard]);
-
+export const GenAIDashDescriptionButton = ({ onGenerate }: GenAIDashDescriptionButtonProps) => {
   return (
     <GenAIButton
-      messages={messages}
+      messages={getMessages}
       onGenerate={onGenerate}
-      loadingText={'Generating description'}
       eventTrackingSrc={EventTrackingSrc.dashboardDescription}
       toggleTipTitle={'Improve your dashboard description'}
     />
   );
 };
 
-function getMessages(dashboard: DashboardModel): Message[] {
+function getMessages(): Message[] {
+  const dashboard = getDashboardSrv().getCurrent()!;
   const panelPrompt = getDashboardPanelPrompt(dashboard);
 
   return [
diff --git a/public/app/features/dashboard/components/GenAI/GenAIDashTitleButton.tsx b/public/app/features/dashboard/components/GenAI/GenAIDashTitleButton.tsx
index f39e7ce37bd5d..c2991f075b873 100644
--- a/public/app/features/dashboard/components/GenAI/GenAIDashTitleButton.tsx
+++ b/public/app/features/dashboard/components/GenAI/GenAIDashTitleButton.tsx
@@ -1,16 +1,17 @@
 import React from 'react';
 
-import { DashboardModel } from '../../state';
+import { getDashboardSrv } from '../../services/DashboardSrv';
 
 import { GenAIButton } from './GenAIButton';
 import { EventTrackingSrc } from './tracking';
 import { getDashboardPanelPrompt, Message, Role } from './utils';
 
 interface GenAIDashTitleButtonProps {
-  dashboard: DashboardModel;
   onGenerate: (description: string) => void;
 }
 
+const DASH_TITLE_CHAR_LIMIT = 50;
+
 const TITLE_GENERATION_STANDARD_PROMPT =
   'You are an expert in creating Grafana Dashboards.\n' +
   'Your goal is to write a concise dashboard title.\n' +
@@ -19,24 +20,23 @@ const TITLE_GENERATION_STANDARD_PROMPT =
   'If the dashboard has no panels, the title should be "Empty dashboard"\n' +
   'There should be no numbers in the title.\n' +
   'The dashboard title should not have quotation marks in it.\n' +
-  'The title should be, at most, 50 characters.\n' +
+  `The title should be, at most, ${DASH_TITLE_CHAR_LIMIT} characters.\n` +
   'Respond with only the title of the dashboard.';
 
-export const GenAIDashTitleButton = ({ onGenerate, dashboard }: GenAIDashTitleButtonProps) => {
-  const messages = React.useMemo(() => getMessages(dashboard), [dashboard]);
-
+export const GenAIDashTitleButton = ({ onGenerate }: GenAIDashTitleButtonProps) => {
   return (
     <GenAIButton
-      messages={messages}
+      messages={getMessages}
       onGenerate={onGenerate}
-      loadingText={'Generating title'}
       eventTrackingSrc={EventTrackingSrc.dashboardTitle}
       toggleTipTitle={'Improve your dashboard title'}
     />
   );
 };
 
-function getMessages(dashboard: DashboardModel): Message[] {
+function getMessages(): Message[] {
+  const dashboard = getDashboardSrv().getCurrent()!;
+
   return [
     {
       content: TITLE_GENERATION_STANDARD_PROMPT,
diff --git a/public/app/features/dashboard/components/GenAI/GenAIDashboardChangesButton.tsx b/public/app/features/dashboard/components/GenAI/GenAIDashboardChangesButton.tsx
index 1f2cd23972c3b..735774d6b7217 100644
--- a/public/app/features/dashboard/components/GenAI/GenAIDashboardChangesButton.tsx
+++ b/public/app/features/dashboard/components/GenAI/GenAIDashboardChangesButton.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import React, { useCallback } from 'react';
 
 import { DashboardModel } from '../../state';
 
@@ -12,29 +12,37 @@ interface GenAIDashboardChangesButtonProps {
   disabled?: boolean;
 }
 
-const CHANGES_GENERATION_STANDARD_PROMPT = [
+const CHANGES_GENERATION_PREFIX_PROMPT = [
   'You are an expert in Grafana Dashboards',
-  'Your goal is to write a description of the changes for a dashboard',
+  'Your goal is to write a description of the changes for a dashboard to display to the user',
+  'You will be given human-readable diffs with most irrelevant lines filtered out',
+].join('.\n');
+
+const CHANGES_GENERATION_POSTFIX_PROMPT = [
+  `Respond only with the diff description, which is meant to be loaded directly into the application for the user.`,
+  `If there are no substantial user or migration changes, the correct description is "Minor changes only"`,
+  `If there are too many changes of either kind, and those changes have a message saying 'too long', the correct response for that section is "Too many changes to auto-summarize"`,
+  'In a diff, lines beginning with - are removed, and lines beginning with + are added.',
+  'Lines with neither + nor - are included for context. Be careful not to mark them as added or removed if they do not start with + or -.',
+  'If a line is changed, it will show a previous version removed and a new version added',
   'When referring to panel changes, use the panel title',
   'When using panel title, wrap it with double quotes',
-  'When the panel changes the position, just mention the panel has changed position and not the specific change',
+  'When the panel changes position, just mention that the panel has changed position',
   'When an entire panel is added or removed, use the panel title and only say it was added or removed and disregard the rest of the changes for that panel',
-  'Group changes when all panels are affected',
-  'Do not mention line number',
+  'Group together similar changes into one line when multiple panels are affected',
   'Refer to templating elements as variables',
-  'Ignore and never mention changes about plugin version',
   'Try to make the response as short as possible',
 ].join('.\n');
 
 export const GenAIDashboardChangesButton = ({ dashboard, onGenerate, disabled }: GenAIDashboardChangesButtonProps) => {
-  const messages = useMemo(() => getMessages(dashboard), [dashboard]);
+  const messages = useCallback(() => getMessages(dashboard), [dashboard]);
 
   return (
     <GenAIButton
       messages={messages}
       onGenerate={onGenerate}
-      loadingText={'Generating changes summary'}
       temperature={0}
+      model={'gpt-3.5-turbo-16k'}
       eventTrackingSrc={EventTrackingSrc.dashboardChanges}
       toggleTipTitle={'Improve your dashboard changes summary'}
       disabled={disabled}
@@ -43,33 +51,48 @@ export const GenAIDashboardChangesButton = ({ dashboard, onGenerate, disabled }:
 };
 
 function getMessages(dashboard: DashboardModel): Message[] {
-  const { userChanges, migrationChanges } = getDashboardChanges(dashboard);
+  let { userChanges, migrationChanges } = getDashboardChanges(dashboard);
+  if (userChanges.length > 8000) {
+    userChanges =
+      "User changes were too long, fill in the user changes section with 'User changes too long to auto-summarize'";
+  }
+
+  if (migrationChanges.split('\n').length < 10) {
+    migrationChanges = 'No significant migration changes';
+  } else if (migrationChanges.length > 8000) {
+    migrationChanges =
+      "Migration changes were too long, fill in the migration changes section with 'Migration changes too long to auto-summarize'";
+  }
 
   return [
     {
-      content: CHANGES_GENERATION_STANDARD_PROMPT,
+      content: CHANGES_GENERATION_PREFIX_PROMPT,
       role: Role.system,
     },
     {
-      content: `This is the list of panel names, when referring to a panel, please use the title: ${JSON.stringify(
-        dashboard.panels.map((panel) => panel.title)
-      )}`,
+      content: `Summarize the following user changes diff under "User changes":\n${userChanges}`,
       role: Role.system,
     },
     {
-      content: `Summarize the following user changes diff under a "User changes" heading with no special formatting as a bulleted list:\n${userChanges}`,
+      content:
+        `Be sure to only include substantial user changes, such as adding or removing entire panels, changing panel titles or descriptions, etc.\n` +
+        `Do not include "User Changes" section if there are no substantial user changes to report.`,
       role: Role.system,
     },
     {
-      content: `Be sure to only include substantial user changes, such as adding or removing entire panels, changing panel titles or descriptions, etc. Ignore other changes and do not include them in the summary. Do not include "User Changes" section if there are no substantial user changes to report.`,
+      content: `Summarize the following migration changes diff under "Migration changes":\n${migrationChanges}`,
       role: Role.system,
     },
     {
-      content: `Threshold step changes of value being removed and replaced with color "green" should always be ignored`,
+      content:
+        `Be sure to only include substantial migration changes, such as adding or removing entire panels, changing panel titles or descriptions, etc.\n` +
+        `Ignore any threshold step changes or templating list changes.\n` +
+        `Ignore other changes and do not include them in the summary. Do not include "Migration Changes" section if there are no substantial migration changes to report.\n` +
+        `If there are substantial migration changes, add "Some autogenerated changes are included to update the dashboard to the latest valid schema version" at the end.`,
       role: Role.system,
     },
     {
-      content: `In addition to summarizing the user diff changes, add the following sentence at the end of the response "Some autogenerated changes are included to update the dashboard to the latest valid schema version." Only add this sentence if the following migrations diff has substantial changes. Ignore any threshold step changes, templating list changes, and ignore the entire migration diff if it is less than 10 lines long. \n This is the migrations diff:\n${migrationChanges}`,
+      content: CHANGES_GENERATION_POSTFIX_PROMPT,
       role: Role.system,
     },
   ];
diff --git a/public/app/features/dashboard/components/GenAI/GenAIHistory.tsx b/public/app/features/dashboard/components/GenAI/GenAIHistory.tsx
index 3656635a79c60..e0c67da99bf22 100644
--- a/public/app/features/dashboard/components/GenAI/GenAIHistory.tsx
+++ b/public/app/features/dashboard/components/GenAI/GenAIHistory.tsx
@@ -2,26 +2,14 @@ import { css } from '@emotion/css';
 import React, { useEffect, useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import {
-  Alert,
-  Button,
-  HorizontalGroup,
-  Icon,
-  IconButton,
-  Input,
-  Spinner,
-  Text,
-  TextLink,
-  useStyles2,
-  VerticalGroup,
-} from '@grafana/ui';
-
-import { getFeedbackMessage } from './GenAIPanelTitleButton';
+import { Alert, Button, Icon, Input, Stack, Text, TextLink, useStyles2 } from '@grafana/ui';
+
+import { STOP_GENERATION_TEXT } from './GenAIButton';
 import { GenerationHistoryCarousel } from './GenerationHistoryCarousel';
 import { QuickFeedback } from './QuickFeedback';
 import { StreamStatus, useOpenAIStream } from './hooks';
 import { AutoGenerateItem, EventTrackingSrc, reportAutoGenerateInteraction } from './tracking';
-import { Message, OPEN_AI_MODEL, QuickFeedbackType, sanitizeReply } from './utils';
+import { getFeedbackMessage, Message, DEFAULT_OAI_MODEL, QuickFeedbackType, sanitizeReply } from './utils';
 
 export interface GenAIHistoryProps {
   history: string[];
@@ -46,7 +34,10 @@ export const GenAIHistory = ({
   const [showError, setShowError] = useState(false);
   const [customFeedback, setCustomPrompt] = useState('');
 
-  const { setMessages, reply, streamStatus, error } = useOpenAIStream(OPEN_AI_MODEL, temperature);
+  const { setMessages, setStopGeneration, reply, streamStatus, error } = useOpenAIStream(
+    DEFAULT_OAI_MODEL,
+    temperature
+  );
 
   const isStreamGenerating = streamStatus === StreamStatus.GENERATING;
 
@@ -81,7 +72,14 @@ export const GenAIHistory = ({
   };
 
   const onApply = () => {
-    onApplySuggestion(history[currentIndex - 1]);
+    if (isStreamGenerating) {
+      setStopGeneration(true);
+      if (reply !== '') {
+        updateHistory(sanitizeReply(reply));
+      }
+    } else {
+      onApplySuggestion(history[currentIndex - 1]);
+    }
   };
 
   const onNavigate = (index: number) => {
@@ -91,7 +89,9 @@ export const GenAIHistory = ({
 
   const onGenerateWithFeedback = (suggestion: string | QuickFeedbackType) => {
     if (suggestion !== QuickFeedbackType.Regenerate) {
-      messages = [...messages, ...getFeedbackMessage(history[currentIndex], suggestion)];
+      messages = [...messages, ...getFeedbackMessage(history[currentIndex - 1], suggestion)];
+    } else {
+      messages = [...messages, ...getFeedbackMessage(history[currentIndex - 1], 'Please, regenerate')];
     }
 
     setMessages(messages);
@@ -113,54 +113,64 @@ export const GenAIHistory = ({
   return (
     <div className={styles.container}>
       {showError && (
-        <div>
-          <Alert title="">
-            <VerticalGroup>
-              <div>Sorry, I was unable to complete your request. Please try again.</div>
-            </VerticalGroup>
-          </Alert>
-        </div>
+        <Alert title="">
+          <Stack direction={'column'}>
+            <p>Sorry, I was unable to complete your request. Please try again.</p>
+          </Stack>
+        </Alert>
       )}
 
+      <GenerationHistoryCarousel
+        history={history}
+        index={currentIndex}
+        onNavigate={onNavigate}
+        reply={sanitizeReply(reply)}
+        streamStatus={streamStatus}
+      />
+
+      <div className={styles.actionButtons}>
+        <QuickFeedback onSuggestionClick={onGenerateWithFeedback} isGenerating={isStreamGenerating} />
+      </div>
+
       <Input
         placeholder="Tell AI what to do next..."
         suffix={
-          <IconButton
-            name="corner-down-right-alt"
+          <Button
+            icon="enter"
             variant="secondary"
+            fill="text"
             aria-label="Send custom feedback"
             onClick={onClickSubmitCustomFeedback}
             disabled={customFeedback === ''}
-          />
+          >
+            Send
+          </Button>
         }
         value={customFeedback}
         onChange={onChangeCustomFeedback}
         onKeyDown={onKeyDownCustomFeedbackInput}
       />
-      <div className={styles.actions}>
-        <QuickFeedback onSuggestionClick={onGenerateWithFeedback} isGenerating={isStreamGenerating} />
-        <GenerationHistoryCarousel
-          history={history}
-          index={currentIndex}
-          onNavigate={onNavigate}
-          reply={sanitizeReply(reply)}
-          streamStatus={streamStatus}
-        />
-      </div>
+
       <div className={styles.applySuggestion}>
-        <HorizontalGroup justify={'flex-end'}>
-          {isStreamGenerating && <Spinner />}
-          <Button onClick={onApply} disabled={isStreamGenerating}>
-            Apply
+        <Stack justifyContent={'flex-end'} direction={'row'}>
+          <Button icon={!isStreamGenerating ? 'check' : 'fa fa-spinner'} onClick={onApply}>
+            {isStreamGenerating ? STOP_GENERATION_TEXT : 'Apply'}
           </Button>
-        </HorizontalGroup>
+        </Stack>
       </div>
+
       <div className={styles.footer}>
         <Icon name="exclamation-circle" aria-label="exclamation-circle" className={styles.infoColor} />
         <Text variant="bodySmall" color="secondary">
-          This content is AI-generated.{' '}
-          <TextLink variant="bodySmall" href="https://grafana.com/grafana/dashboards/" external onClick={onClickDocs}>
-            Learn more
+          This content is AI-generated using the{' '}
+          <TextLink
+            variant="bodySmall"
+            inline={true}
+            href="https://grafana.com/docs/grafana-cloud/alerting-and-irm/machine-learning/llm-plugin/"
+            external
+            onClick={onClickDocs}
+          >
+            Grafana LLM plugin
           </TextLink>
         </Text>
       </div>
@@ -173,11 +183,12 @@ const getStyles = (theme: GrafanaTheme2) => ({
     display: 'flex',
     flexDirection: 'column',
     width: 520,
+    maxHeight: 350,
     // This is the space the footer height
-    paddingBottom: 35,
+    paddingBottom: 25,
   }),
   applySuggestion: css({
-    marginTop: theme.spacing(1),
+    paddingTop: theme.spacing(2),
   }),
   actions: css({
     display: 'flex',
@@ -203,4 +214,10 @@ const getStyles = (theme: GrafanaTheme2) => ({
   infoColor: css({
     color: theme.colors.info.main,
   }),
+  actionButtons: css({
+    display: 'flex',
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    padding: '24px 0 8px 0',
+  }),
 });
diff --git a/public/app/features/dashboard/components/GenAI/GenAIPanelDescriptionButton.tsx b/public/app/features/dashboard/components/GenAI/GenAIPanelDescriptionButton.tsx
index 570443e8759dc..e82194306feeb 100644
--- a/public/app/features/dashboard/components/GenAI/GenAIPanelDescriptionButton.tsx
+++ b/public/app/features/dashboard/components/GenAI/GenAIPanelDescriptionButton.tsx
@@ -1,17 +1,20 @@
 import React from 'react';
 
+import { Panel } from '@grafana/schema';
+
 import { getDashboardSrv } from '../../services/DashboardSrv';
-import { PanelModel } from '../../state';
 
 import { GenAIButton } from './GenAIButton';
 import { EventTrackingSrc } from './tracking';
-import { Message, Role } from './utils';
+import { Message, Role, getFilteredPanelString } from './utils';
 
 interface GenAIPanelDescriptionButtonProps {
   onGenerate: (description: string) => void;
-  panel: PanelModel;
+  panel: Panel;
 }
 
+const PANEL_DESCRIPTION_CHAR_LIMIT = 200;
+
 const DESCRIPTION_GENERATION_STANDARD_PROMPT =
   'You are an expert in creating Grafana Panels.\n' +
   'You will be given the title and description of the dashboard the panel is in as well as the JSON for the panel.\n' +
@@ -19,24 +22,22 @@ const DESCRIPTION_GENERATION_STANDARD_PROMPT =
   'The panel description is meant to explain the purpose of the panel, not just its attributes.\n' +
   'Do not refer to the panel; simply describe its purpose.\n' +
   'There should be no numbers in the description except for thresholds.\n' +
-  'The description should be, at most, 140 characters.';
+  `The description should be, at most, ${PANEL_DESCRIPTION_CHAR_LIMIT} characters.`;
 
 export const GenAIPanelDescriptionButton = ({ onGenerate, panel }: GenAIPanelDescriptionButtonProps) => {
-  const messages = React.useMemo(() => getMessages(panel), [panel]);
-
   return (
     <GenAIButton
-      messages={messages}
+      messages={() => getMessages(panel)}
       onGenerate={onGenerate}
-      loadingText={'Generating description'}
       eventTrackingSrc={EventTrackingSrc.panelDescription}
       toggleTipTitle={'Improve your panel description'}
     />
   );
 };
 
-function getMessages(panel: PanelModel): Message[] {
+function getMessages(panel: Panel): Message[] {
   const dashboard = getDashboardSrv().getCurrent()!;
+  const panelString = getFilteredPanelString(panel);
 
   return [
     {
@@ -48,11 +49,11 @@ function getMessages(panel: PanelModel): Message[] {
       role: Role.system,
     },
     {
-      content: `The panel is part of a dashboard with the description: ${dashboard.title}`,
+      content: `The panel is part of a dashboard with the description: ${dashboard.description}`,
       role: Role.system,
     },
     {
-      content: `This is the JSON which defines the panel: ${JSON.stringify(panel.getSaveModel())}`,
+      content: `This is the JSON which defines the panel: ${panelString}`,
       role: Role.user,
     },
   ];
diff --git a/public/app/features/dashboard/components/GenAI/GenAIPanelTitleButton.tsx b/public/app/features/dashboard/components/GenAI/GenAIPanelTitleButton.tsx
index 8e58103d8267f..298898450f327 100644
--- a/public/app/features/dashboard/components/GenAI/GenAIPanelTitleButton.tsx
+++ b/public/app/features/dashboard/components/GenAI/GenAIPanelTitleButton.tsx
@@ -1,38 +1,37 @@
 import React from 'react';
 
-import { getDashboardSrv } from '../../services/DashboardSrv';
-import { PanelModel } from '../../state';
+import { Dashboard, Panel } from '@grafana/schema';
 
 import { GenAIButton } from './GenAIButton';
 import { EventTrackingSrc } from './tracking';
-import { Message, QuickFeedbackType, Role } from './utils';
+import { Message, Role, getFilteredPanelString } from './utils';
 
 interface GenAIPanelTitleButtonProps {
   onGenerate: (title: string) => void;
-  panel: PanelModel;
+  panel: Panel;
+  dashboard: Dashboard;
 }
 
+const PANEL_TITLE_CHAR_LIMIT = 50;
+
 const TITLE_GENERATION_STANDARD_PROMPT =
   'You are an expert in creating Grafana Panels.' +
-  'Your goal is to write short, descriptive, and concise panel title for a panel.' +
-  'The title should be shorter than 50 characters.';
-
-export const GenAIPanelTitleButton = ({ onGenerate, panel }: GenAIPanelTitleButtonProps) => {
-  const messages = React.useMemo(() => getMessages(panel), [panel]);
+  'Your goal is to write short, descriptive, and concise panel title.' +
+  `The title should be shorter than ${PANEL_TITLE_CHAR_LIMIT} characters.`;
 
+export const GenAIPanelTitleButton = ({ onGenerate, panel, dashboard }: GenAIPanelTitleButtonProps) => {
   return (
     <GenAIButton
-      messages={messages}
+      messages={() => getMessages(panel, dashboard)}
       onGenerate={onGenerate}
-      loadingText={'Generating title'}
       eventTrackingSrc={EventTrackingSrc.panelTitle}
       toggleTipTitle={'Improve your panel title'}
     />
   );
 };
 
-function getMessages(panel: PanelModel): Message[] {
-  const dashboard = getDashboardSrv().getCurrent()!;
+function getMessages(panel: Panel, dashboard: Dashboard): Message[] {
+  const panelString = getFilteredPanelString(panel);
 
   return [
     {
@@ -44,21 +43,12 @@ function getMessages(panel: PanelModel): Message[] {
       role: Role.system,
     },
     {
-      content: `The panel is part of a dashboard with the description: ${dashboard.title}`,
+      content: `The panel is part of a dashboard with the description: ${dashboard.description}`,
       role: Role.system,
     },
     {
-      content: `Use this JSON object which defines the panel: ${JSON.stringify(panel.getSaveModel())}`,
-      role: Role.user,
-    },
-  ];
-}
-
-export const getFeedbackMessage = (previousResponse: string, feedback: string | QuickFeedbackType): Message[] => {
-  return [
-    {
+      content: `Use this JSON object which defines the panel: ${panelString}`,
       role: Role.system,
-      content: `Your previous response was: ${previousResponse}. The user has provided the following feedback: ${feedback}. Re-generate your response according to the provided feedback.`,
     },
   ];
-};
+}
diff --git a/public/app/features/dashboard/components/GenAI/GenerationHistoryCarousel.tsx b/public/app/features/dashboard/components/GenAI/GenerationHistoryCarousel.tsx
index b150696195484..58e5bdee4d0f2 100644
--- a/public/app/features/dashboard/components/GenAI/GenerationHistoryCarousel.tsx
+++ b/public/app/features/dashboard/components/GenAI/GenerationHistoryCarousel.tsx
@@ -35,18 +35,18 @@ export const GenerationHistoryCarousel = ({
 
   return (
     <>
+      <div className={styles.contentWrapper}>
+        <Text element="p" color="secondary">
+          {getHistoryText()}
+        </Text>
+      </div>
       <MinimalisticPagination
         currentPage={index}
         numberOfPages={historySize}
         onNavigate={onNavigate}
-        hideWhenSinglePage={true}
+        hideWhenSinglePage={false}
         className={styles.paginationWrapper}
       />
-      <div className={styles.contentWrapper}>
-        <Text element="p" color="secondary">
-          {getHistoryText()}
-        </Text>
-      </div>
     </>
   );
 };
@@ -63,6 +63,11 @@ const getStyles = (theme: GrafanaTheme2) => ({
     flexBasis: '100%',
     flexGrow: 3,
     whiteSpace: 'pre-wrap',
-    marginTop: 20,
+    maxHeight: 110,
+    overflowY: 'scroll',
+    backgroundColor: theme.colors.background.secondary,
+    border: `1px solid ${theme.colors.border.weak}`,
+    padding: theme.spacing(1),
+    minHeight: 60,
   }),
 });
diff --git a/public/app/features/dashboard/components/GenAI/MinimalisticPagination.tsx b/public/app/features/dashboard/components/GenAI/MinimalisticPagination.tsx
index 623532656eeaf..ce59b2a69de66 100644
--- a/public/app/features/dashboard/components/GenAI/MinimalisticPagination.tsx
+++ b/public/app/features/dashboard/components/GenAI/MinimalisticPagination.tsx
@@ -51,5 +51,6 @@ const getStyles = (theme: GrafanaTheme2) => ({
     display: 'flex',
     flexDirection: 'row',
     gap: 16,
+    userSelect: 'none',
   }),
 });
diff --git a/public/app/features/dashboard/components/GenAI/QuickFeedback.tsx b/public/app/features/dashboard/components/GenAI/QuickFeedback.tsx
index 811048fcbf069..d555368814c51 100644
--- a/public/app/features/dashboard/components/GenAI/QuickFeedback.tsx
+++ b/public/app/features/dashboard/components/GenAI/QuickFeedback.tsx
@@ -20,6 +20,7 @@ export const QuickFeedback = ({ onSuggestionClick, isGenerating }: QuickActionsP
         onClick={() => onSuggestionClick(QuickFeedbackType.Shorter)}
         size="sm"
         variant="secondary"
+        icon="paragraph"
         disabled={isGenerating}
       >
         {QuickFeedbackType.Shorter}
@@ -28,12 +29,14 @@ export const QuickFeedback = ({ onSuggestionClick, isGenerating }: QuickActionsP
         onClick={() => onSuggestionClick(QuickFeedbackType.MoreDescriptive)}
         size="sm"
         variant="secondary"
+        icon="document-layout-left"
         disabled={isGenerating}
       >
         {QuickFeedbackType.MoreDescriptive}
       </Button>
       <Button
         onClick={() => onSuggestionClick(QuickFeedbackType.Regenerate)}
+        icon="sync"
         size="sm"
         variant="secondary"
         disabled={isGenerating}
@@ -48,10 +51,6 @@ const getStyles = (theme: GrafanaTheme2) => ({
   quickSuggestionsWrapper: css({
     display: 'flex',
     flexDirection: 'row',
-    alignItems: 'center',
-    flexWrap: 'wrap',
-    flexGrow: 1,
     gap: 8,
-    paddingTop: 10,
   }),
 });
diff --git a/public/app/features/dashboard/components/GenAI/hooks.ts b/public/app/features/dashboard/components/GenAI/hooks.ts
index f945e30060e2c..80bcc806d3fcb 100644
--- a/public/app/features/dashboard/components/GenAI/hooks.ts
+++ b/public/app/features/dashboard/components/GenAI/hooks.ts
@@ -3,15 +3,17 @@ import { useAsync } from 'react-use';
 import { Subscription } from 'rxjs';
 
 import { llms } from '@grafana/experimental';
-import { logError } from '@grafana/runtime';
+import { createMonitoringLogger } from '@grafana/runtime';
 import { useAppNotification } from 'app/core/copy/appNotification';
 
-import { isLLMPluginEnabled, OPEN_AI_MODEL } from './utils';
+import { isLLMPluginEnabled, DEFAULT_OAI_MODEL } from './utils';
 
 // Declared instead of imported from utils to make this hook modular
 // Ideally we will want to move the hook itself to a different scope later.
 type Message = llms.openai.Message;
 
+const genAILogger = createMonitoringLogger('features.dashboards.genai');
+
 export enum StreamStatus {
   IDLE = 'idle',
   GENERATING = 'generating',
@@ -22,10 +24,12 @@ export const TIMEOUT = 10000;
 
 // TODO: Add tests
 export function useOpenAIStream(
-  model = OPEN_AI_MODEL,
+  model = DEFAULT_OAI_MODEL,
   temperature = 1
 ): {
   setMessages: React.Dispatch<React.SetStateAction<Message[]>>;
+  setStopGeneration: React.Dispatch<React.SetStateAction<boolean>>;
+  messages: Message[];
   reply: string;
   streamStatus: StreamStatus;
   error: Error | undefined;
@@ -42,27 +46,37 @@ export function useOpenAIStream(
 } {
   // The messages array to send to the LLM, updated when the button is clicked.
   const [messages, setMessages] = useState<Message[]>([]);
+  const [stopGeneration, setStopGeneration] = useState(false);
   // The latest reply from the LLM.
   const [reply, setReply] = useState('');
   const [streamStatus, setStreamStatus] = useState<StreamStatus>(StreamStatus.IDLE);
   const [error, setError] = useState<Error>();
   const { error: notifyError } = useAppNotification();
+  // Accumulate response and it will only update the state of the attatched component when the stream is completed.
+  let partialReply = '';
 
   const onError = useCallback(
     (e: Error) => {
       setStreamStatus(StreamStatus.IDLE);
       setMessages([]);
+      setStopGeneration(false);
       setError(e);
       notifyError(
         'Failed to generate content using OpenAI',
         `Please try again or if the problem persists, contact your organization admin.`
       );
       console.error(e);
-      logError(e, { messages: JSON.stringify(messages), model, temperature: String(temperature) });
+      genAILogger.logError(e, { messages: JSON.stringify(messages), model, temperature: String(temperature) });
     },
     [messages, model, temperature, notifyError]
   );
 
+  useEffect(() => {
+    if (messages.length > 0) {
+      setReply('');
+    }
+  }, [messages]);
+
   const { error: enabledError, value: enabled } = useAsync(
     async () => await isLLMPluginEnabled(),
     [isLLMPluginEnabled]
@@ -96,14 +110,18 @@ export function useOpenAIStream(
     return {
       enabled,
       stream: stream.subscribe({
-        next: setReply,
+        next: (reply) => {
+          partialReply = reply;
+        },
         error: onError,
         complete: () => {
+          setReply(partialReply);
           setStreamStatus(StreamStatus.COMPLETED);
           setTimeout(() => {
             setStreamStatus(StreamStatus.IDLE);
           });
           setMessages([]);
+          setStopGeneration(false);
           setError(undefined);
         },
       }),
@@ -119,6 +137,17 @@ export function useOpenAIStream(
     };
   }, [value]);
 
+  // Unsubscribe from the stream when user stops the generation.
+  useEffect(() => {
+    if (stopGeneration) {
+      value?.stream?.unsubscribe();
+      setStreamStatus(StreamStatus.IDLE);
+      setStopGeneration(false);
+      setError(undefined);
+      setMessages([]);
+    }
+  }, [stopGeneration, value?.stream]);
+
   // If the stream is generating and we haven't received a reply, it times out.
   useEffect(() => {
     let timeout: NodeJS.Timeout | undefined;
@@ -138,6 +167,8 @@ export function useOpenAIStream(
 
   return {
     setMessages,
+    setStopGeneration,
+    messages,
     reply,
     streamStatus,
     error,
diff --git a/public/app/features/dashboard/components/GenAI/jsonDiffText.test.ts b/public/app/features/dashboard/components/GenAI/jsonDiffText.test.ts
index 96f09c6d92f5a..bca3d45326fdb 100644
--- a/public/app/features/dashboard/components/GenAI/jsonDiffText.test.ts
+++ b/public/app/features/dashboard/components/GenAI/jsonDiffText.test.ts
@@ -1,6 +1,14 @@
+import { DASHBOARD_SCHEMA_VERSION } from '../../state/DashboardMigrator';
 import { createDashboardModelFixture, createPanelSaveModel } from '../../state/__fixtures__/dashboardFixtures';
 
-import { orderProperties, JSONArray, JSONValue, isObject, getDashboardStringDiff } from './jsonDiffText';
+import {
+  orderProperties,
+  JSONArray,
+  JSONValue,
+  isObject,
+  getDashboardStringDiff,
+  removeEmptyFields,
+} from './jsonDiffText';
 
 describe('orderProperties', () => {
   it('should sort simple objects', () => {
@@ -239,7 +247,7 @@ describe('isObject', () => {
 describe('getDashboardStringDiff', () => {
   const dashboard = {
     title: 'Original Title',
-    schemaVersion: 38,
+    schemaVersion: DASHBOARD_SCHEMA_VERSION,
     panels: [
       createPanelSaveModel({
         id: 1,
@@ -261,15 +269,13 @@ describe('getDashboardStringDiff', () => {
 
     expect(result).toEqual({
       migrationDiff:
-        'Index: Original Title\n' +
         '===================================================================\n' +
-        '--- Original Title\t\n' +
-        '+++ Original Title\t\n',
+        '--- Before migration changes\t\n' +
+        '+++ After migration changes\t\n',
       userDiff:
-        'Index: Original Title\n' +
         '===================================================================\n' +
-        '--- Original Title\t\n' +
-        '+++ Original Title\t\n',
+        '--- Before user changes\t\n' +
+        '+++ After user changes\t\n',
     });
   });
 
@@ -283,3 +289,151 @@ describe('getDashboardStringDiff', () => {
     expect(result.userDiff).toContain(`+  \"title\": \"New Title\",`);
   });
 });
+
+describe('removeEmptyFields', () => {
+  it('should remove "null" fields from the JSON object', () => {
+    const inputJSON = {
+      a: null,
+      b: 'Hello',
+      c: {
+        d: null,
+        e: 'World',
+      },
+    };
+
+    const result = removeEmptyFields(inputJSON);
+
+    expect(result).toEqual({
+      b: 'Hello',
+      c: {
+        e: 'World',
+      },
+    });
+  });
+
+  it('should remove empty arrays from the JSON object', () => {
+    const inputJSON = {
+      a: [1, 2, 3],
+      b: [],
+      c: [4, 5],
+    };
+
+    const result = removeEmptyFields(inputJSON);
+
+    expect(result).toEqual({
+      a: [1, 2, 3],
+      c: [4, 5],
+    });
+  });
+
+  it('should remove empty objects from the JSON object', () => {
+    const inputJSON = {
+      a: {},
+      b: 'Hello',
+      c: {
+        d: {},
+        e: 'World',
+      },
+    };
+
+    const result = removeEmptyFields(inputJSON);
+
+    expect(result).toEqual({
+      b: 'Hello',
+      c: {
+        e: 'World',
+      },
+    });
+  });
+
+  it('should handle a mix of "null", empty arrays, and empty objects', () => {
+    const inputJSON = {
+      a: null,
+      b: [],
+      c: {
+        d: null,
+        e: {},
+        f: [1, 2, 3],
+        g: 'Hello',
+      },
+    };
+
+    const result = removeEmptyFields(inputJSON);
+
+    expect(result).toEqual({
+      c: {
+        f: [1, 2, 3],
+        g: 'Hello',
+      },
+    });
+  });
+
+  it('should handle nested structures', () => {
+    const inputJSON = {
+      a: {
+        b: {
+          c: null,
+          d: {
+            e: [],
+            f: 'World',
+          },
+        },
+      },
+    };
+
+    const result = removeEmptyFields(inputJSON);
+
+    expect(result).toEqual({
+      a: {
+        b: {
+          d: {
+            f: 'World',
+          },
+        },
+      },
+    });
+  });
+
+  it('should handle complex JSON structure', () => {
+    const inputJSON = {
+      panels: [
+        {
+          fieldConfig: {
+            defaults: {
+              foo: 'bar',
+            },
+            overrides: [],
+          },
+          gridPos: {
+            h: 15,
+            w: 10,
+            x: 0,
+            y: 0,
+          },
+        },
+      ],
+      schemaVersion: 38,
+    };
+
+    const result = removeEmptyFields(inputJSON);
+
+    expect(result).toEqual({
+      panels: [
+        {
+          fieldConfig: {
+            defaults: {
+              foo: 'bar',
+            },
+          },
+          gridPos: {
+            h: 15,
+            w: 10,
+            x: 0,
+            y: 0,
+          },
+        },
+      ],
+      schemaVersion: 38,
+    });
+  });
+});
diff --git a/public/app/features/dashboard/components/GenAI/jsonDiffText.ts b/public/app/features/dashboard/components/GenAI/jsonDiffText.ts
index 56715a6f869ee..41faf84c2325b 100644
--- a/public/app/features/dashboard/components/GenAI/jsonDiffText.ts
+++ b/public/app/features/dashboard/components/GenAI/jsonDiffText.ts
@@ -135,6 +135,9 @@ export function fillBySimilarity(
           continue;
         }
         if (val1 === val2) {
+          if (key === 'id') {
+            score += 1000; // Can probably be caught earlier in the call tree.
+          }
           score++;
         }
       }
@@ -169,37 +172,99 @@ export function fillBySimilarity(
   }
 }
 
-export function jsonSanitize(obj: Dashboard | DashboardModel | null) {
+function shortenDiff(diffS: string) {
+  const diffLines = diffS.split('\n');
+  let headerEnd = diffS[0].startsWith('Index') ? 4 : 3;
+  let ret = diffLines.slice(0, headerEnd);
+
+  const titleOrBracket = /("title"|Title|\{|\}|\[|\])/i;
+  for (let i = headerEnd; i < diffLines.length; i++) {
+    let line = diffLines[i];
+    if (titleOrBracket.test(line)) {
+      ret.push(line);
+    } else if (line.startsWith('+') || line.startsWith('-')) {
+      ret.push(line);
+    }
+  }
+  return ret.join('\n') + '\n';
+}
+
+export function removeEmptyFields(input: JSONValue): JSONValue {
+  if (input === null || input === '') {
+    return null;
+  }
+
+  if (Array.isArray(input)) {
+    // Filter out empty values and recursively process the non-empty ones
+    const filteredArray = input.map((item) => removeEmptyFields(item)).filter((item) => item !== null);
+
+    return filteredArray.length > 0 ? filteredArray : null;
+  }
+
+  if (typeof input !== 'object') {
+    // If it's not an object, return as is
+    return input;
+  }
+
+  // For objects, recursively process each key-value pair
+  const result: JSONObject = {};
+  for (const key in input) {
+    const processedValue = removeEmptyFields(input[key]);
+
+    if (processedValue !== null) {
+      if (Array.isArray(processedValue) && processedValue.length === 0) {
+        continue;
+      }
+
+      if (typeof processedValue === 'object') {
+        const keys = Object.keys(processedValue);
+        if (keys.length === 0) {
+          continue;
+        }
+      }
+
+      result[key] = processedValue;
+    }
+  }
+
+  return Object.keys(result).length > 0 ? result : null;
+}
+
+function jsonSanitize(obj: Dashboard | DashboardModel | null) {
   return JSON.parse(JSON.stringify(obj, null, 2));
 }
 
-export function getDashboardStringDiff(dashboard: DashboardModel) {
-  const originalDashboard = jsonSanitize(dashboard.getOriginalDashboard());
+export function getDashboardStringDiff(dashboard: DashboardModel): { migrationDiff: string; userDiff: string } {
+  let originalDashboard = jsonSanitize(dashboard.getOriginalDashboard());
   let dashboardAfterMigration = jsonSanitize(new DashboardModel(originalDashboard).getSaveModelClone());
   let currentDashboard = jsonSanitize(dashboard.getSaveModelClone());
 
-  dashboardAfterMigration = orderProperties(originalDashboard, dashboardAfterMigration);
-  currentDashboard = orderProperties(dashboardAfterMigration, currentDashboard);
+  dashboardAfterMigration = removeEmptyFields(orderProperties(originalDashboard, dashboardAfterMigration));
+  currentDashboard = removeEmptyFields(orderProperties(dashboardAfterMigration, currentDashboard));
+  originalDashboard = removeEmptyFields(originalDashboard);
 
-  let migrationDiff = createTwoFilesPatch(
-    originalDashboard.title ?? 'Before migration changes',
-    dashboardAfterMigration.title ?? 'After migration changes',
+  let migrationDiff: string = createTwoFilesPatch(
+    'Before migration changes',
+    'After migration changes',
     JSON.stringify(originalDashboard, null, 2),
     JSON.stringify(dashboardAfterMigration, null, 2),
     '',
     '',
-    { context: 5 }
+    { context: 20 }
   );
 
-  let userDiff = createTwoFilesPatch(
-    dashboardAfterMigration.title ?? 'Before user changes',
-    currentDashboard.title ?? 'After user changes',
+  let userDiff: string = createTwoFilesPatch(
+    'Before user changes',
+    'After user changes',
     JSON.stringify(dashboardAfterMigration, null, 2),
     JSON.stringify(currentDashboard, null, 2),
     '',
     '',
-    { context: 5 }
+    { context: 20 }
   );
 
+  migrationDiff = shortenDiff(migrationDiff);
+  userDiff = shortenDiff(userDiff);
+
   return { migrationDiff, userDiff };
 }
diff --git a/public/app/features/dashboard/components/GenAI/tracking.ts b/public/app/features/dashboard/components/GenAI/tracking.ts
index 8c51e8a729e77..8327fdf430e4c 100644
--- a/public/app/features/dashboard/components/GenAI/tracking.ts
+++ b/public/app/features/dashboard/components/GenAI/tracking.ts
@@ -16,6 +16,7 @@ export enum EventTrackingSrc {
 export enum AutoGenerateItem {
   autoGenerateButton = 'auto-generate-button',
   erroredRetryButton = 'errored-retry-button',
+  stopGenerationButton = 'stop-generating-button',
   improveButton = 'improve-button',
   backHistoryItem = 'back-history-item',
   forwardHistoryItem = 'forward-history-item',
diff --git a/public/app/features/dashboard/components/GenAI/utils.test.ts b/public/app/features/dashboard/components/GenAI/utils.test.ts
index 0ad4eb886e4c2..95ffa9a4e9bca 100644
--- a/public/app/features/dashboard/components/GenAI/utils.test.ts
+++ b/public/app/features/dashboard/components/GenAI/utils.test.ts
@@ -1,5 +1,6 @@
 import { llms } from '@grafana/experimental';
 
+import { DASHBOARD_SCHEMA_VERSION } from '../../state/DashboardMigrator';
 import { createDashboardModelFixture, createPanelSaveModel } from '../../state/__fixtures__/dashboardFixtures';
 
 import { getDashboardChanges, isLLMPluginEnabled, sanitizeReply } from './utils';
@@ -10,7 +11,17 @@ jest.mock('@grafana/experimental', () => ({
     openai: {
       streamChatCompletions: jest.fn(),
       accumulateContent: jest.fn(),
-      enabled: jest.fn(),
+      health: jest.fn(),
+    },
+  },
+}));
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  config: {
+    ...jest.requireActual('@grafana/runtime').config,
+    apps: {
+      'grafana-llm-app': true,
     },
   },
 }));
@@ -21,7 +32,7 @@ describe('getDashboardChanges', () => {
     const deprecatedOptions = {
       legend: { displayMode: 'hidden', showLegend: false },
     };
-    const deprecatedVersion = 37;
+    const deprecatedVersion = DASHBOARD_SCHEMA_VERSION - 1;
     const dashboard = createDashboardModelFixture({
       schemaVersion: deprecatedVersion,
       panels: [createPanelSaveModel({ title: 'Panel 1', options: deprecatedOptions })],
@@ -40,57 +51,56 @@ describe('getDashboardChanges', () => {
     const result = getDashboardChanges(dashboard);
 
     // Assertions
-    expect(result.migrationChanges).toEqual(
-      '===================================================================\n' +
-        '--- Before migration changes\t\n' +
-        '+++ After migration changes\t\n' +
-        '@@ -1,9 +1,9 @@\n' +
-        ' {\n' +
-        '   "editable": true,\n' +
-        '   "graphTooltip": 0,\n' +
-        '-  "schemaVersion": 37,\n' +
-        '+  "schemaVersion": 38,\n' +
-        '   "timezone": "",\n' +
-        '   "panels": [\n' +
+    expect(result.migrationChanges).toContain(
+      `-  "schemaVersion": ${deprecatedVersion},\n+  "schemaVersion": ${DASHBOARD_SCHEMA_VERSION},\n`
+    );
+
+    expect(result.migrationChanges).not.toContain(
+      '   "panels": [\n' +
         '     {\n' +
-        '       "type": "timeseries",\n' +
-        '       "title": "Panel 1",\n'
+        '-      "type": "timeseries",\n' +
+        '-      "title": "Panel 1",\n' +
+        '+      "id": 1,\n'
+    );
+
+    expect(result.migrationChanges).not.toContain(
+      '-      }\n' +
+        '+      },\n' +
+        '+      "title": "New title",\n' +
+        '+      "type": "timeseries"\n' +
+        '     }\n' +
+        '   ]\n' +
+        ' }\n'
     );
-    expect(result.userChanges).toEqual(
-      '===================================================================\n' +
-        '--- Before user changes\t\n' +
-        '+++ After user changes\t\n' +
-        '@@ -3,16 +3,17 @@\n' +
-        '   "graphTooltip": 0,\n' +
-        '   "schemaVersion": 38,\n' +
-        '   "timezone": "",\n' +
-        '   "panels": [\n' +
+
+    expect(result.userChanges).not.toContain('-  "schemaVersion": 37,\n' + '+  "schemaVersion": 38,\n');
+
+    expect(result.userChanges).toContain(
+      '   "panels": [\n' +
         '     {\n' +
         '-      "type": "timeseries",\n' +
         '-      "title": "Panel 1",\n' +
-        '+      "id": 1,\n' +
-        '       "options": {\n' +
-        '         "legend": {\n' +
-        '           "displayMode": "hidden",\n' +
-        '           "showLegend": false\n' +
-        '         }\n' +
-        '-      }\n' +
+        '+      "id": 1,\n'
+    );
+
+    expect(result.userChanges).toContain(
+      '-      }\n' +
         '+      },\n' +
         '+      "title": "New title",\n' +
         '+      "type": "timeseries"\n' +
         '     }\n' +
         '   ]\n' +
-        ' }\n' +
-        '\\ No newline at end of file\n'
+        ' }\n'
     );
+
     expect(result.migrationChanges).toBeDefined();
   });
 });
 
 describe('isLLMPluginEnabled', () => {
   it('should return true if LLM plugin is enabled', async () => {
-    // Mock llms.openai.enabled to return true
-    jest.mocked(llms.openai.enabled).mockResolvedValue({ ok: true, configured: false });
+    // Mock llms.openai.health to return true
+    jest.mocked(llms.openai.health).mockResolvedValue({ ok: true, configured: false });
 
     const enabled = await isLLMPluginEnabled();
 
@@ -98,8 +108,8 @@ describe('isLLMPluginEnabled', () => {
   });
 
   it('should return false if LLM plugin is not enabled', async () => {
-    // Mock llms.openai.enabled to return false
-    jest.mocked(llms.openai.enabled).mockResolvedValue({ ok: false, configured: false });
+    // Mock llms.openai.health to return false
+    jest.mocked(llms.openai.health).mockResolvedValue({ ok: false, configured: false });
 
     const enabled = await isLLMPluginEnabled();
 
diff --git a/public/app/features/dashboard/components/GenAI/utils.ts b/public/app/features/dashboard/components/GenAI/utils.ts
index 8aa2811d5fe87..a0caf3065b495 100644
--- a/public/app/features/dashboard/components/GenAI/utils.ts
+++ b/public/app/features/dashboard/components/GenAI/utils.ts
@@ -1,4 +1,8 @@
+import { pick } from 'lodash';
+
 import { llms } from '@grafana/experimental';
+import { config } from '@grafana/runtime';
+import { Panel } from '@grafana/schema';
 
 import { DashboardModel, PanelModel } from '../../state';
 
@@ -23,7 +27,9 @@ export enum QuickFeedbackType {
 /**
  * The OpenAI model to be used.
  */
-export const OPEN_AI_MODEL = 'gpt-4';
+export const DEFAULT_OAI_MODEL = 'gpt-4';
+
+export type OAI_MODEL = 'gpt-4' | 'gpt-4-32k' | 'gpt-3.5-turbo' | 'gpt-3.5-turbo-16k';
 
 /**
  * Sanitize the reply from OpenAI by removing the leading and trailing quotes.
@@ -58,22 +64,39 @@ export function getDashboardChanges(dashboard: DashboardModel): {
  * @returns true if the LLM plugin is enabled.
  */
 export async function isLLMPluginEnabled() {
+  if (!config.apps['grafana-llm-app']) {
+    return false;
+  }
+
   // Check if the LLM plugin is enabled.
   // If not, we won't be able to make requests, so return early.
-  return llms.openai.enabled().then((response) => response.ok);
+  return llms.openai.health().then((response) => response.ok);
 }
 
+/**
+ * Get the message to be sent to OpenAI to generate a new response.
+ * @param previousResponse
+ * @param feedback
+ * @returns Message[] to be sent to OpenAI to generate a new response
+ */
+export const getFeedbackMessage = (previousResponse: string, feedback: string | QuickFeedbackType): Message[] => {
+  return [
+    {
+      role: Role.system,
+      content: `Your previous response was: ${previousResponse}. The user has provided the following feedback: ${feedback}. Re-generate your response according to the provided feedback.`,
+    },
+  ];
+};
+
 /**
  *
  * @param dashboard Dashboard to generate a title or description for
  * @returns String for inclusion in prompts stating what the dashboard's panels are
  */
 export function getDashboardPanelPrompt(dashboard: DashboardModel): string {
-  const getPanelString = (panel: PanelModel, idx: number) => `
-  - Panel ${idx}\n
-  - Title: ${panel.title}\n
-  ${panel.description ? `- Description: ${panel.description}` : ''}
-  `;
+  const getPanelString = (panel: PanelModel, idx: number) =>
+    `- Panel ${idx}
+- Title: ${panel.title}${panel.description ? `\n- Description: ${panel.description}` : ''}`;
 
   const panelStrings: string[] = dashboard.panels.map(getPanelString);
   let panelPrompt: string;
@@ -104,3 +127,17 @@ export function getDashboardPanelPrompt(dashboard: DashboardModel): string {
   // So it is possibly that if we can condense it further it would be better
   return panelPrompt;
 }
+
+export function getFilteredPanelString(panel: Panel): string {
+  const keysToKeep: Array<keyof Panel> = ['datasource', 'title', 'description', 'targets', 'type'];
+
+  const filteredPanel: Partial<Panel> = {
+    ...pick(panel, keysToKeep),
+    options: pick(panel.options, [
+      // For text panels, the content property helps generate the panel metadata
+      'content',
+    ]),
+  };
+
+  return JSON.stringify(filteredPanel, null, 2);
+}
diff --git a/public/app/features/dashboard/components/HelpWizard/HelpWizard.test.tsx b/public/app/features/dashboard/components/HelpWizard/HelpWizard.test.tsx
index c2a059ba31e0d..15a2a62e5784b 100644
--- a/public/app/features/dashboard/components/HelpWizard/HelpWizard.test.tsx
+++ b/public/app/features/dashboard/components/HelpWizard/HelpWizard.test.tsx
@@ -31,6 +31,6 @@ function setup() {
 describe('SupportSnapshot', () => {
   it('Can render', async () => {
     setup();
-    expect(await screen.findByRole('button', { name: 'Dashboard (2.97 KiB)' })).toBeInTheDocument();
+    expect(await screen.findByRole('button', { name: /Dashboard \([\d\.]+ KiB\)/ })).toBeInTheDocument();
   });
 });
diff --git a/public/app/features/dashboard/components/HelpWizard/HelpWizard.tsx b/public/app/features/dashboard/components/HelpWizard/HelpWizard.tsx
index b0fd9dc7a57c8..cb94d8c67b4d2 100644
--- a/public/app/features/dashboard/components/HelpWizard/HelpWizard.tsx
+++ b/public/app/features/dashboard/components/HelpWizard/HelpWizard.tsx
@@ -3,7 +3,6 @@ import React, { useMemo, useEffect } from 'react';
 import AutoSizer from 'react-virtualized-auto-sizer';
 
 import { PanelPlugin, GrafanaTheme2, FeatureState } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
 import { config } from '@grafana/runtime';
 import {
   Drawer,
@@ -21,6 +20,7 @@ import {
   Select,
   ClipboardButton,
   Icon,
+  Stack,
 } from '@grafana/ui';
 import { contextSrv } from 'app/core/services/context_srv';
 import { PanelModel } from 'app/features/dashboard/state';
diff --git a/public/app/features/dashboard/components/HelpWizard/SupportSnapshotService.ts b/public/app/features/dashboard/components/HelpWizard/SupportSnapshotService.ts
index f771602d0a2f1..0a1f9b39f2cff 100644
--- a/public/app/features/dashboard/components/HelpWizard/SupportSnapshotService.ts
+++ b/public/app/features/dashboard/components/HelpWizard/SupportSnapshotService.ts
@@ -4,13 +4,13 @@ import { dateTimeFormat, formattedValueToString, getValueFormat, SelectableValue
 import { config } from '@grafana/runtime';
 import { SceneObject } from '@grafana/scenes';
 import { StateManagerBase } from 'app/core/services/StateManagerBase';
+import { Randomize } from 'app/features/dashboard-scene/inspect/HelpWizard/randomizer';
 import { createDashboardSceneFromDashboardModel } from 'app/features/dashboard-scene/serialization/transformSaveModelToScene';
 
 import { getTimeSrv } from '../../services/TimeSrv';
 import { DashboardModel, PanelModel } from '../../state';
 import { setDashboardToFetchFromLocalStorage } from '../../state/initDashboard';
 
-import { Randomize } from './randomizer';
 import { getDebugDashboard, getGithubMarkdown } from './utils';
 
 interface SupportSnapshotState {
@@ -82,7 +82,7 @@ export class SupportSnapshotService extends StateManagerBase<SupportSnapshotStat
 
     if (!panel.isAngularPlugin()) {
       try {
-        const oldModel = new DashboardModel(snapshot);
+        const oldModel = new DashboardModel(snapshot, { isEmbedded: true });
         const dash = createDashboardSceneFromDashboardModel(oldModel);
         scene = dash.state.body; // skip the wrappers
       } catch (ex) {
diff --git a/public/app/features/dashboard/components/HelpWizard/utils.ts b/public/app/features/dashboard/components/HelpWizard/utils.ts
index 75fc65c320238..2260a4b0315d4 100644
--- a/public/app/features/dashboard/components/HelpWizard/utils.ts
+++ b/public/app/features/dashboard/components/HelpWizard/utils.ts
@@ -14,10 +14,9 @@ import {
 } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { PanelModel } from 'app/features/dashboard/state';
+import { Randomize, randomizeData } from 'app/features/dashboard-scene/inspect/HelpWizard/randomizer';
 import { GrafanaQueryType } from 'app/plugins/datasource/grafana/types';
 
-import { Randomize, randomizeData } from './randomizer';
-
 export function getPanelDataFrames(data?: PanelData): DataFrameJSON[] {
   const frames: DataFrameJSON[] = [];
   if (data?.series) {
@@ -44,7 +43,7 @@ export function getGithubMarkdown(panel: PanelModel, snapshot: string): string {
     panelType: saveModel.type,
     datasource: '??',
   };
-  const grafanaVersion = `${config.buildInfo.version} (${config.buildInfo.commit})`;
+  const grafanaVersion = config.buildInfo.versionString;
 
   let md = `| Key | Value |
 |--|--|
@@ -76,7 +75,7 @@ export async function getDebugDashboard(panel: PanelModel, rand: Randomize, time
 
   const dsref = panel.datasource;
   const frames = randomizeData(getPanelDataFrames(data), rand);
-  const grafanaVersion = `${config.buildInfo.version} (${config.buildInfo.commit})`;
+  const grafanaVersion = config.buildInfo.versionString;
   const queries = saveModel?.targets ?? [];
   const html = `<table width="100%">
     <tr>
diff --git a/public/app/features/dashboard/components/Inspector/PanelInspector.tsx b/public/app/features/dashboard/components/Inspector/PanelInspector.tsx
index 57a31c2a54078..3c9a56d9637b1 100644
--- a/public/app/features/dashboard/components/Inspector/PanelInspector.tsx
+++ b/public/app/features/dashboard/components/Inspector/PanelInspector.tsx
@@ -35,7 +35,7 @@ const PanelInspectorUnconnected = ({ panel, dashboard, plugin }: Props) => {
     withFieldConfig: true,
   });
 
-  const { data, isLoading, hasError } = usePanelLatestData(panel, dataOptions, true);
+  const { data, isLoading, hasError } = usePanelLatestData(panel, dataOptions, false);
   const metaDs = useDatasourceMetadata(data);
   const tabs = useInspectTabs(panel, dashboard, plugin, hasError, metaDs);
 
diff --git a/public/app/features/dashboard/components/LinksSettings/LinkSettingsEdit.tsx b/public/app/features/dashboard/components/LinksSettings/LinkSettingsEdit.tsx
index b8a2c8374a2f0..309d296aa3070 100644
--- a/public/app/features/dashboard/components/LinksSettings/LinkSettingsEdit.tsx
+++ b/public/app/features/dashboard/components/LinksSettings/LinkSettingsEdit.tsx
@@ -1,39 +1,10 @@
 import React, { useState } from 'react';
 
-import { SelectableValue } from '@grafana/data';
-import { CollapsableSection, TagsInput, Select, Field, Input, Checkbox, Button, IconName } from '@grafana/ui';
+import { DashboardLink } from '@grafana/schema';
+import { DashboardLinkForm } from 'app/features/dashboard-scene/settings/links/DashboardLinkForm';
+import { NEW_LINK } from 'app/features/dashboard-scene/settings/links/utils';
 
-import { DashboardLink, DashboardModel } from '../../state/DashboardModel';
-
-export const newLink: DashboardLink = {
-  icon: 'external link',
-  title: 'New link',
-  tooltip: '',
-  type: 'dashboards',
-  url: '',
-  asDropdown: false,
-  tags: [],
-  targetBlank: false,
-  keepTime: false,
-  includeVars: false,
-};
-
-const linkTypeOptions = [
-  { value: 'dashboards', label: 'Dashboards' },
-  { value: 'link', label: 'Link' },
-];
-
-export const linkIconMap: Record<string, IconName | undefined> = {
-  'external link': 'external-link-alt',
-  dashboard: 'apps',
-  question: 'question-circle',
-  info: 'info-circle',
-  bolt: 'bolt',
-  doc: 'file-alt',
-  cloud: 'cloud',
-};
-
-const linkIconOptions = Object.keys(linkIconMap).map((key) => ({ label: key, value: key }));
+import { DashboardModel } from '../../state/DashboardModel';
 
 type LinkSettingsEditProps = {
   editLinkIdx: number;
@@ -42,7 +13,7 @@ type LinkSettingsEditProps = {
 };
 
 export const LinkSettingsEdit = ({ editLinkIdx, dashboard, onGoBack }: LinkSettingsEditProps) => {
-  const [linkSettings, setLinkSettings] = useState(editLinkIdx !== null ? dashboard.links[editLinkIdx] : newLink);
+  const [linkSettings, setLinkSettings] = useState(editLinkIdx !== null ? dashboard.links[editLinkIdx] : NEW_LINK);
 
   const onUpdate = (link: DashboardLink) => {
     const links = [...dashboard.links];
@@ -51,98 +22,5 @@ export const LinkSettingsEdit = ({ editLinkIdx, dashboard, onGoBack }: LinkSetti
     setLinkSettings(link);
   };
 
-  const onTagsChange = (tags: string[]) => {
-    onUpdate({ ...linkSettings, tags: tags });
-  };
-
-  const onTypeChange = (selectedItem: SelectableValue) => {
-    const update = { ...linkSettings, type: selectedItem.value };
-
-    // clear props that are no longe revant for this type
-    if (update.type === 'dashboards') {
-      update.url = '';
-      update.tooltip = '';
-    } else {
-      update.tags = [];
-    }
-
-    onUpdate(update);
-  };
-
-  const onIconChange = (selectedItem: SelectableValue) => {
-    onUpdate({ ...linkSettings, icon: selectedItem.value });
-  };
-
-  const onChange = (ev: React.FocusEvent<HTMLInputElement>) => {
-    const target = ev.currentTarget;
-    onUpdate({
-      ...linkSettings,
-      [target.name]: target.type === 'checkbox' ? target.checked : target.value,
-    });
-  };
-
-  const isNew = linkSettings.title === newLink.title;
-
-  return (
-    <div style={{ maxWidth: '600px' }}>
-      <Field label="Title">
-        <Input name="title" id="title" value={linkSettings.title} onChange={onChange} autoFocus={isNew} />
-      </Field>
-      <Field label="Type">
-        <Select inputId="link-type-input" value={linkSettings.type} options={linkTypeOptions} onChange={onTypeChange} />
-      </Field>
-      {linkSettings.type === 'dashboards' && (
-        <>
-          <Field label="With tags">
-            <TagsInput tags={linkSettings.tags} onChange={onTagsChange} />
-          </Field>
-        </>
-      )}
-      {linkSettings.type === 'link' && (
-        <>
-          <Field label="URL">
-            <Input name="url" value={linkSettings.url} onChange={onChange} />
-          </Field>
-          <Field label="Tooltip">
-            <Input name="tooltip" value={linkSettings.tooltip} onChange={onChange} placeholder="Open dashboard" />
-          </Field>
-          <Field label="Icon">
-            <Select value={linkSettings.icon} options={linkIconOptions} onChange={onIconChange} />
-          </Field>
-        </>
-      )}
-      <CollapsableSection label="Options" isOpen={true}>
-        {linkSettings.type === 'dashboards' && (
-          <Field>
-            <Checkbox label="Show as dropdown" name="asDropdown" value={linkSettings.asDropdown} onChange={onChange} />
-          </Field>
-        )}
-        <Field>
-          <Checkbox
-            label="Include current time range"
-            name="keepTime"
-            value={linkSettings.keepTime}
-            onChange={onChange}
-          />
-        </Field>
-        <Field>
-          <Checkbox
-            label="Include current template variable values"
-            name="includeVars"
-            value={linkSettings.includeVars}
-            onChange={onChange}
-          />
-        </Field>
-        <Field>
-          <Checkbox
-            label="Open link in new tab"
-            name="targetBlank"
-            value={linkSettings.targetBlank}
-            onChange={onChange}
-          />
-        </Field>
-      </CollapsableSection>
-      <Button onClick={onGoBack}>Apply</Button>
-    </div>
-  );
+  return <DashboardLinkForm link={linkSettings} onUpdate={onUpdate} onGoBack={onGoBack} />;
 };
diff --git a/public/app/features/dashboard/components/LinksSettings/LinkSettingsList.tsx b/public/app/features/dashboard/components/LinksSettings/LinkSettingsList.tsx
index 39aa6a88f960a..09076805f5b50 100644
--- a/public/app/features/dashboard/components/LinksSettings/LinkSettingsList.tsx
+++ b/public/app/features/dashboard/components/LinksSettings/LinkSettingsList.tsx
@@ -1,12 +1,10 @@
-import { css } from '@emotion/css';
 import React, { useState } from 'react';
 
 import { arrayUtils } from '@grafana/data';
-import { DeleteButton, HorizontalGroup, Icon, IconButton, TagList, useStyles2 } from '@grafana/ui';
-import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
+import { DashboardLink } from '@grafana/schema';
+import { DashboardLinkList } from 'app/features/dashboard-scene/settings/links/DashboardLinkList';
 
-import { DashboardModel, DashboardLink } from '../../state/DashboardModel';
-import { ListNewButton } from '../DashboardSettings/ListNewButton';
+import { DashboardModel } from '../../state/DashboardModel';
 
 type LinkSettingsListProps = {
   dashboard: DashboardModel;
@@ -14,9 +12,11 @@ type LinkSettingsListProps = {
   onEdit: (idx: number) => void;
 };
 
+/**
+ * Used in DashboardSettings to display the list of links.
+ * It updates the DashboardModel instance when links are added, edited, duplicated or deleted.
+ */
 export const LinkSettingsList = ({ dashboard, onNew, onEdit }: LinkSettingsListProps) => {
-  const styles = useStyles2(getStyles);
-
   const [links, setLinks] = useState(dashboard.links);
 
   const moveLink = (idx: number, direction: number) => {
@@ -24,7 +24,7 @@ export const LinkSettingsList = ({ dashboard, onNew, onEdit }: LinkSettingsListP
     setLinks(dashboard.links);
   };
 
-  const duplicateLink = (link: DashboardLink, idx: number) => {
+  const duplicateLink = (link: DashboardLink) => {
     dashboard.links = [...links, { ...link }];
     setLinks(dashboard.links);
   };
@@ -34,85 +34,14 @@ export const LinkSettingsList = ({ dashboard, onNew, onEdit }: LinkSettingsListP
     setLinks(dashboard.links);
   };
 
-  const isEmptyList = dashboard.links.length === 0;
-
-  if (isEmptyList) {
-    return (
-      <div>
-        <EmptyListCTA
-          onClick={onNew}
-          title="There are no dashboard links added yet"
-          buttonIcon="link"
-          buttonTitle="Add dashboard link"
-          infoBoxTitle="What are dashboard links?"
-          infoBox={{
-            __html:
-              '<p>Dashboard Links allow you to place links to other dashboards and web sites directly below the dashboard header.</p>',
-          }}
-        />
-      </div>
-    );
-  }
-
   return (
-    <>
-      <table role="grid" className="filter-table filter-table--hover">
-        <thead>
-          <tr>
-            <th>Type</th>
-            <th>Info</th>
-            <th colSpan={3} />
-          </tr>
-        </thead>
-        <tbody>
-          {links.map((link, idx) => (
-            <tr key={`${link.title}-${idx}`}>
-              <td role="gridcell" className="pointer" onClick={() => onEdit(idx)}>
-                <Icon name="external-link-alt" /> &nbsp; {link.type}
-              </td>
-              <td role="gridcell">
-                <HorizontalGroup>
-                  {link.title && <span className={styles.titleWrapper}>{link.title}</span>}
-                  {link.type === 'link' && <span className={styles.urlWrapper}>{link.url}</span>}
-                  {link.type === 'dashboards' && <TagList tags={link.tags ?? []} />}
-                </HorizontalGroup>
-              </td>
-              <td style={{ width: '1%' }} role="gridcell">
-                {idx !== 0 && <IconButton name="arrow-up" onClick={() => moveLink(idx, -1)} tooltip="Move link up" />}
-              </td>
-              <td style={{ width: '1%' }} role="gridcell">
-                {links.length > 1 && idx !== links.length - 1 ? (
-                  <IconButton name="arrow-down" onClick={() => moveLink(idx, 1)} tooltip="Move link down" />
-                ) : null}
-              </td>
-              <td style={{ width: '1%' }} role="gridcell">
-                <IconButton name="copy" onClick={() => duplicateLink(link, idx)} tooltip="Copy link" />
-              </td>
-              <td style={{ width: '1%' }} role="gridcell">
-                <DeleteButton
-                  aria-label={`Delete link with title "${link.title}"`}
-                  size="sm"
-                  onConfirm={() => deleteLink(idx)}
-                />
-              </td>
-            </tr>
-          ))}
-        </tbody>
-      </table>
-      <ListNewButton onClick={onNew}>New link</ListNewButton>
-    </>
+    <DashboardLinkList
+      links={links}
+      onNew={onNew}
+      onEdit={onEdit}
+      onDuplicate={duplicateLink}
+      onDelete={deleteLink}
+      onOrderChange={moveLink}
+    />
   );
 };
-
-const getStyles = () => ({
-  titleWrapper: css`
-    width: 20vw;
-    text-overflow: ellipsis;
-    overflow: hidden;
-  `,
-  urlWrapper: css`
-    width: 40vw;
-    text-overflow: ellipsis;
-    overflow: hidden;
-  `,
-});
diff --git a/public/app/features/dashboard/components/PanelEditor/OptionsPaneCategory.tsx b/public/app/features/dashboard/components/PanelEditor/OptionsPaneCategory.tsx
index 9b57326a05f5c..2b224805c6dec 100644
--- a/public/app/features/dashboard/components/PanelEditor/OptionsPaneCategory.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/OptionsPaneCategory.tsx
@@ -22,7 +22,7 @@ export interface OptionsPaneCategoryProps {
   sandboxId?: string;
 }
 
-const CATEGORY_PARAM_NAME = 'showCategory';
+const CATEGORY_PARAM_NAME = 'showCategory' as const;
 
 export const OptionsPaneCategory = React.memo(
   ({
@@ -30,23 +30,21 @@ export const OptionsPaneCategory = React.memo(
     title,
     children,
     forceOpen,
-    isOpenDefault,
+    isOpenDefault = true,
     renderTitle,
     className,
     itemsCount,
     isNested = false,
     sandboxId,
   }: OptionsPaneCategoryProps) => {
-    const initialIsExpanded = isOpenDefault !== false;
     const [savedState, setSavedState] = useLocalStorage(getOptionGroupStorageKey(id), {
-      isExpanded: initialIsExpanded,
+      isExpanded: isOpenDefault,
     });
 
-    const styles = useStyles2(getStyles);
-    const [queryParams, updateQueryParams] = useQueryParams();
-    const [isExpanded, setIsExpanded] = useState(savedState?.isExpanded ?? initialIsExpanded);
+    const [isExpanded, setIsExpanded] = useState(savedState?.isExpanded ?? isOpenDefault);
     const manualClickTime = useRef(0);
     const ref = useRef<HTMLDivElement>(null);
+    const [queryParams, updateQueryParams] = useQueryParams();
     const isOpenFromUrl = queryParams[CATEGORY_PARAM_NAME] === id;
 
     useEffect(() => {
@@ -92,13 +90,13 @@ export const OptionsPaneCategory = React.memo(
       };
     }
 
+    const styles = useStyles2(getStyles);
     const boxStyles = cx(
       {
         [styles.box]: true,
         [styles.boxNestedExpanded]: isNested && isExpanded,
       },
-      className,
-      'options-group'
+      className
     );
 
     const headerStyles = cx(styles.header, {
@@ -149,61 +147,60 @@ export const OptionsPaneCategory = React.memo(
 
 OptionsPaneCategory.displayName = 'OptionsPaneCategory';
 
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    box: css`
-      border-top: 1px solid ${theme.colors.border.weak};
-    `,
-    boxNestedExpanded: css`
-      margin-bottom: ${theme.spacing(2)};
-    `,
-    title: css`
-      flex-grow: 1;
-      overflow: hidden;
-      line-height: 1.5;
-      font-size: 1rem;
-      padding-left: 6px;
-      font-weight: ${theme.typography.fontWeightMedium};
-      margin: 0;
-    `,
-    header: css`
-      display: flex;
-      cursor: pointer;
-      align-items: center;
-      padding: ${theme.spacing(0.5)};
-      color: ${theme.colors.text.primary};
-      font-weight: ${theme.typography.fontWeightMedium};
-
-      &:hover {
-        background: ${theme.colors.emphasize(theme.colors.background.primary, 0.03)};
-      }
-    `,
-    toggleButton: css`
-      align-self: baseline;
-    `,
-    headerExpanded: css`
-      color: ${theme.colors.text.primary};
-    `,
-    headerNested: css`
-      padding: ${theme.spacing(0.5, 0, 0.5, 0)};
-    `,
-    body: css`
-      padding: ${theme.spacing(1, 2, 1, 4)};
-    `,
-    bodyNested: css`
-      position: relative;
-      padding-right: 0;
-      &:before {
-        content: '';
-        position: absolute;
-        top: 0;
-        left: 8px;
-        width: 1px;
-        height: 100%;
-        background: ${theme.colors.border.weak};
-      }
-    `,
-  };
-};
-
-const getOptionGroupStorageKey = (id: string): string => `${PANEL_EDITOR_UI_STATE_STORAGE_KEY}.optionGroup[${id}]`;
+const getStyles = (theme: GrafanaTheme2) => ({
+  box: css({
+    borderTop: `1px solid ${theme.colors.border.weak}`,
+  }),
+  boxNestedExpanded: css({
+    marginBottom: theme.spacing(2),
+  }),
+  title: css({
+    flexGrow: 1,
+    overflow: 'hidden',
+    lineHeight: 1.5,
+    fontSize: '1rem',
+    paddingLeft: '6px',
+    fontWeight: theme.typography.fontWeightMedium,
+    margin: 0,
+  }),
+  header: css({
+    display: 'flex',
+    cursor: 'pointer',
+    alignItems: 'center',
+    padding: theme.spacing(0.5),
+    color: theme.colors.text.primary,
+    fontWeight: theme.typography.fontWeightMedium,
+
+    '&:hover': {
+      background: theme.colors.emphasize(theme.colors.background.primary, 0.03),
+    },
+  }),
+  toggleButton: css({
+    alignSelf: 'baseline',
+  }),
+  headerExpanded: css({
+    color: theme.colors.text.primary,
+  }),
+  headerNested: css({
+    padding: theme.spacing(0.5, 0, 0.5, 0),
+  }),
+  body: css({
+    padding: theme.spacing(1, 2, 1, 4),
+  }),
+  bodyNested: css({
+    position: 'relative',
+    paddingRight: 0,
+
+    '&:before': {
+      content: "''",
+      position: 'absolute',
+      top: 0,
+      left: '8px',
+      width: '1px',
+      height: '100%',
+      background: theme.colors.border.weak,
+    },
+  }),
+});
+
+const getOptionGroupStorageKey = (id: string) => `${PANEL_EDITOR_UI_STATE_STORAGE_KEY}.optionGroup[${id}]`;
diff --git a/public/app/features/dashboard/components/PanelEditor/OptionsPaneCategoryDescriptor.tsx b/public/app/features/dashboard/components/PanelEditor/OptionsPaneCategoryDescriptor.tsx
index 71b5a5e648be9..bc65bee8eb1f1 100644
--- a/public/app/features/dashboard/components/PanelEditor/OptionsPaneCategoryDescriptor.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/OptionsPaneCategoryDescriptor.tsx
@@ -15,10 +15,10 @@ export interface OptionsPaneCategoryDescriptorProps {
   customRender?: () => React.ReactNode;
   sandboxId?: string;
 }
+
 /**
  * This is not a real React component but an intermediary to enable deep option search without traversing a React node tree.
  */
-
 export class OptionsPaneCategoryDescriptor {
   items: OptionsPaneItemDescriptor[] = [];
   categories: OptionsPaneCategoryDescriptor[] = [];
@@ -41,14 +41,14 @@ export class OptionsPaneCategoryDescriptor {
 
   getCategory(name: string): OptionsPaneCategoryDescriptor {
     let sub = this.categories.find((c) => c.props.id === name);
-    if (sub) {
-      return sub;
+    if (!sub) {
+      sub = new OptionsPaneCategoryDescriptor({
+        title: name,
+        id: name,
+      });
+      this.addCategory(sub);
     }
-    sub = new OptionsPaneCategoryDescriptor({
-      title: name,
-      id: name,
-    });
-    this.addCategory(sub);
+
     return sub;
   }
 
diff --git a/public/app/features/dashboard/components/PanelEditor/OptionsPaneItemOverrides.tsx b/public/app/features/dashboard/components/PanelEditor/OptionsPaneItemOverrides.tsx
index 1e3fff28ca8a5..83e0c93c7a856 100644
--- a/public/app/features/dashboard/components/PanelEditor/OptionsPaneItemOverrides.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/OptionsPaneItemOverrides.tsx
@@ -1,4 +1,4 @@
-import { css, CSSObject } from '@emotion/css';
+import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
@@ -25,12 +25,11 @@ export function OptionsPaneItemOverrides({ overrides }: Props) {
 }
 
 const getStyles = (theme: GrafanaTheme2) => {
-  const common: CSSObject = {
+  const common = {
     width: 8,
     height: 8,
     borderRadius: theme.shape.radius.circle,
     marginLeft: theme.spacing(1),
-    position: 'relative',
     top: '-1px',
   };
 
@@ -40,10 +39,12 @@ const getStyles = (theme: GrafanaTheme2) => {
     }),
     rule: css({
       ...common,
+      position: 'relative',
       backgroundColor: theme.colors.primary.main,
     }),
     data: css({
       ...common,
+      position: 'relative',
       backgroundColor: theme.colors.warning.main,
     }),
   };
diff --git a/public/app/features/dashboard/components/PanelEditor/OptionsPaneOptions.tsx b/public/app/features/dashboard/components/PanelEditor/OptionsPaneOptions.tsx
index f9964372880eb..db9039bb24d03 100644
--- a/public/app/features/dashboard/components/PanelEditor/OptionsPaneOptions.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/OptionsPaneOptions.tsx
@@ -33,7 +33,14 @@ export const OptionsPaneOptions = (props: OptionPaneRenderProps) => {
   );
 
   const justOverrides = useMemo(
-    () => getFieldOverrideCategories(props, searchQuery),
+    () =>
+      getFieldOverrideCategories(
+        props.panel.fieldConfig,
+        props.plugin.fieldConfigRegistry,
+        props.data?.series ?? [],
+        searchQuery,
+        props.onFieldConfigsChange
+      ),
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [panel.configRev, props.data, props.instanceState, searchQuery]
   );
@@ -102,7 +109,7 @@ export const OptionsPaneOptions = (props: OptionPaneRenderProps) => {
   return (
     <div className={styles.wrapper}>
       <div className={styles.formBox}>
-        {panel.isAngularPlugin() && (
+        {panel.isAngularPlugin() && !plugin.meta.angular?.hideDeprecation && (
           <AngularDeprecationPluginNotice
             className={styles.angularDeprecationWrapper}
             showPluginDetailsLink={true}
@@ -143,7 +150,7 @@ export enum OptionFilter {
   Recent = 'Recent',
 }
 
-function renderSearchHits(
+export function renderSearchHits(
   allOptions: OptionsPaneCategoryDescriptor[],
   overrides: OptionsPaneCategoryDescriptor[],
   searchQuery: string
diff --git a/public/app/features/dashboard/components/PanelEditor/PanelEditor.tsx b/public/app/features/dashboard/components/PanelEditor/PanelEditor.tsx
index 4a5b75a58ff65..1577591e4bc13 100644
--- a/public/app/features/dashboard/components/PanelEditor/PanelEditor.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/PanelEditor.tsx
@@ -6,7 +6,6 @@ import { Subscription } from 'rxjs';
 
 import { FieldConfigSource, GrafanaTheme2, NavModel, NavModelItem, PageLayoutType } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { Stack } from '@grafana/experimental';
 import { locationService } from '@grafana/runtime';
 import {
   Button,
@@ -19,6 +18,7 @@ import {
   ToolbarButton,
   ToolbarButtonRow,
   withTheme2,
+  Stack,
 } from '@grafana/ui';
 import { AppChromeUpdate } from 'app/core/components/AppChrome/AppChromeUpdate';
 import { Page } from 'app/core/components/Page/Page';
@@ -33,7 +33,7 @@ import { StoreState } from 'app/types';
 import { PanelOptionsChangedEvent, ShowModalReactEvent } from 'app/types/events';
 
 import { notifyApp } from '../../../../core/actions';
-import { UnlinkModal } from '../../../library-panels/components/UnlinkModal/UnlinkModal';
+import { UnlinkModal } from '../../../dashboard-scene/scene/UnlinkModal';
 import { isPanelModelLibraryPanel } from '../../../library-panels/guard';
 import { getVariablesByKey } from '../../../variables/state/selectors';
 import { DashboardPanel } from '../../dashgrid/DashboardPanel';
diff --git a/public/app/features/dashboard/components/PanelEditor/PanelEditorQueries.tsx b/public/app/features/dashboard/components/PanelEditor/PanelEditorQueries.tsx
index 7720a5cc5b776..13babf80fad06 100644
--- a/public/app/features/dashboard/components/PanelEditor/PanelEditorQueries.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/PanelEditorQueries.tsx
@@ -2,18 +2,14 @@ import React, { PureComponent } from 'react';
 
 import { DataQuery, getDataSourceRef } from '@grafana/data';
 import { locationService } from '@grafana/runtime';
+import { storeLastUsedDataSourceInLocalStorage } from 'app/features/datasources/components/picker/utils';
 import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
 import { QueryGroup } from 'app/features/query/components/QueryGroup';
-import { MIXED_DATASOURCE_NAME } from 'app/plugins/datasource/mixed/MixedDataSource';
 import { QueryGroupDataSource, QueryGroupOptions } from 'app/types';
 
 import { getDashboardSrv } from '../../services/DashboardSrv';
 import { PanelModel } from '../../state';
-import {
-  getLastUsedDatasourceFromStorage,
-  initLastUsedDatasourceKeyForDashboard,
-  setLastUsedDatasourceKeyForDashboard,
-} from '../../utils/dashboard';
+import { getLastUsedDatasourceFromStorage } from '../../utils/dashboard';
 
 interface Props {
   /** Current panel */
@@ -29,16 +25,7 @@ export class PanelEditorQueries extends PureComponent<Props> {
 
   // store last used datasource in local storage
   updateLastUsedDatasource = (datasource: QueryGroupDataSource) => {
-    if (!datasource.uid) {
-      return;
-    }
-
-    const dashboardUid = getDashboardSrv().getCurrent()?.uid ?? '';
-    // if datasource is MIXED reset datasource uid in storage, because Mixed datasource can contain multiple ds
-    if (datasource.uid === MIXED_DATASOURCE_NAME) {
-      return initLastUsedDatasourceKeyForDashboard(dashboardUid!);
-    }
-    setLastUsedDatasourceKeyForDashboard(dashboardUid, datasource.uid);
+    storeLastUsedDataSourceInLocalStorage(datasource);
   };
 
   buildQueryOptions(panel: PanelModel): QueryGroupOptions {
diff --git a/public/app/features/dashboard/components/PanelEditor/PanelEditorTabs.tsx b/public/app/features/dashboard/components/PanelEditor/PanelEditorTabs.tsx
index 01d124c602ab5..a60f5bd5483da 100644
--- a/public/app/features/dashboard/components/PanelEditor/PanelEditorTabs.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/PanelEditorTabs.tsx
@@ -1,12 +1,12 @@
 import { css } from '@emotion/css';
-import React, { useEffect, useCallback } from 'react';
+import React, { useCallback, useEffect } from 'react';
 import { Subscription } from 'rxjs';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { config, reportInteraction } from '@grafana/runtime';
 import { Tab, TabContent, TabsBar, toIconName, useForceUpdate, useStyles2 } from '@grafana/ui';
-import AlertTabIndex from 'app/features/alerting/AlertTabIndex';
 import { PanelAlertTab } from 'app/features/alerting/unified/PanelAlertTab';
+import { PanelAlertTabContent } from 'app/features/alerting/unified/PanelAlertTabContent';
 import { PanelQueriesChangedEvent, PanelTransformationsChangedEvent } from 'app/types/events';
 
 import { DashboardModel, PanelModel } from '../../state';
@@ -55,12 +55,24 @@ export const PanelEditorTabs = React.memo(({ panel, dashboard, tabs, onChangeTab
     return null;
   }
 
+  const alertingEnabled = config.unifiedAlertingEnabled;
+
   return (
     <div className={styles.wrapper}>
       <TabsBar className={styles.tabBar} hideBorder>
         {tabs.map((tab) => {
-          if (tab.id === PanelEditorTabId.Alert) {
-            return renderAlertTab(tab, panel, dashboard, instrumentedOnChangeTab);
+          if (tab.id === PanelEditorTabId.Alert && alertingEnabled) {
+            return (
+              <PanelAlertTab
+                key={tab.id}
+                label={tab.text}
+                active={tab.active}
+                onChangeTab={() => onChangeTab(tab)}
+                icon={toIconName(tab.icon)}
+                panel={panel}
+                dashboard={dashboard}
+              />
+            );
           }
           return (
             <Tab
@@ -76,7 +88,7 @@ export const PanelEditorTabs = React.memo(({ panel, dashboard, tabs, onChangeTab
       </TabsBar>
       <TabContent className={styles.tabContent}>
         {activeTab.id === PanelEditorTabId.Query && <PanelEditorQueries panel={panel} queries={panel.targets} />}
-        {activeTab.id === PanelEditorTabId.Alert && <AlertTabIndex panel={panel} dashboard={dashboard} />}
+        {activeTab.id === PanelEditorTabId.Alert && <PanelAlertTabContent panel={panel} dashboard={dashboard} />}
         {activeTab.id === PanelEditorTabId.Transform && <TransformationsEditor panel={panel} />}
       </TabContent>
     </div>
@@ -99,48 +111,6 @@ function getCounter(panel: PanelModel, tab: PanelEditorTab) {
   return null;
 }
 
-function renderAlertTab(
-  tab: PanelEditorTab,
-  panel: PanelModel,
-  dashboard: DashboardModel,
-  onChangeTab: (tab: PanelEditorTab) => void
-) {
-  const alertingDisabled = !config.alertingEnabled && !config.unifiedAlertingEnabled;
-
-  if (alertingDisabled) {
-    return null;
-  }
-
-  if (config.unifiedAlertingEnabled) {
-    return (
-      <PanelAlertTab
-        key={tab.id}
-        label={tab.text}
-        active={tab.active}
-        onChangeTab={() => onChangeTab(tab)}
-        icon={toIconName(tab.icon)}
-        panel={panel}
-        dashboard={dashboard}
-      />
-    );
-  }
-
-  if (config.alertingEnabled) {
-    return (
-      <Tab
-        key={tab.id}
-        label={tab.text}
-        active={tab.active}
-        onChangeTab={() => onChangeTab(tab)}
-        icon={toIconName(tab.icon)}
-        counter={getCounter(panel, tab)}
-      />
-    );
-  }
-
-  return null;
-}
-
 const getStyles = (theme: GrafanaTheme2) => {
   return {
     wrapper: css`
diff --git a/public/app/features/dashboard/components/PanelEditor/VisualizationSelectPane.tsx b/public/app/features/dashboard/components/PanelEditor/VisualizationSelectPane.tsx
index ade128c9b951d..972e6f82edb79 100644
--- a/public/app/features/dashboard/components/PanelEditor/VisualizationSelectPane.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/VisualizationSelectPane.tsx
@@ -115,34 +115,14 @@ export const VisualizationSelectPane = ({ panel, data }: Props) => {
         <CustomScrollbar autoHeightMin="100%">
           <div className={styles.scrollContent}>
             {listMode === VisualizationSelectPaneTab.Visualizations && (
-              <VizTypePicker
-                current={plugin.meta}
-                onChange={onVizChange}
-                searchQuery={searchQuery}
-                data={data}
-                onClose={() => {}}
-              />
+              <VizTypePicker pluginId={plugin.meta.id} onChange={onVizChange} searchQuery={searchQuery} />
             )}
             {listMode === VisualizationSelectPaneTab.Widgets && (
-              <VizTypePicker
-                current={plugin.meta}
-                onChange={onVizChange}
-                searchQuery={searchQuery}
-                data={data}
-                onClose={() => {}}
-                isWidget
-              />
+              <VizTypePicker pluginId={plugin.meta.id} onChange={onVizChange} searchQuery={searchQuery} isWidget />
             )}
 
             {listMode === VisualizationSelectPaneTab.Suggestions && (
-              <VisualizationSuggestions
-                current={plugin.meta}
-                onChange={onVizChange}
-                searchQuery={searchQuery}
-                panel={panel}
-                data={data}
-                onClose={() => {}}
-              />
+              <VisualizationSuggestions onChange={onVizChange} searchQuery={searchQuery} panel={panel} data={data} />
             )}
             {listMode === VisualizationSelectPaneTab.LibraryPanels && (
               <PanelLibraryOptionsGroup
diff --git a/public/app/features/dashboard/components/PanelEditor/getFieldOverrideElements.tsx b/public/app/features/dashboard/components/PanelEditor/getFieldOverrideElements.tsx
index b4c63f426f92e..eca2153ba774c 100644
--- a/public/app/features/dashboard/components/PanelEditor/getFieldOverrideElements.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/getFieldOverrideElements.tsx
@@ -11,6 +11,8 @@ import {
   ConfigOverrideRule,
   GrafanaTheme2,
   fieldMatchers,
+  FieldConfigSource,
+  DataFrame,
 } from '@grafana/data';
 import { fieldMatchersUI, useStyles2, ValuePicker } from '@grafana/ui';
 import { getDataLinksVariableSuggestions } from 'app/features/panel/panellinks/link_srv';
@@ -19,31 +21,31 @@ import { DynamicConfigValueEditor } from './DynamicConfigValueEditor';
 import { OptionsPaneCategoryDescriptor } from './OptionsPaneCategoryDescriptor';
 import { OptionsPaneItemDescriptor } from './OptionsPaneItemDescriptor';
 import { OverrideCategoryTitle } from './OverrideCategoryTitle';
-import { OptionPaneRenderProps } from './types';
 
 export function getFieldOverrideCategories(
-  props: OptionPaneRenderProps,
-  searchQuery: string
+  fieldConfig: FieldConfigSource,
+  registry: FieldConfigOptionsRegistry,
+  data: DataFrame[],
+  searchQuery: string,
+  onFieldConfigsChange: (config: FieldConfigSource) => void
 ): OptionsPaneCategoryDescriptor[] {
   const categories: OptionsPaneCategoryDescriptor[] = [];
-  const currentFieldConfig = props.panel.fieldConfig;
-  const registry = props.plugin.fieldConfigRegistry;
-  const data = props.data?.series ?? [];
+  const currentFieldConfig = fieldConfig;
 
-  if (registry.isEmpty()) {
+  if (!registry || registry.isEmpty()) {
     return [];
   }
 
   const onOverrideChange = (index: number, override: ConfigOverrideRule) => {
     let overrides = cloneDeep(currentFieldConfig.overrides);
     overrides[index] = override;
-    props.onFieldConfigsChange({ ...currentFieldConfig, overrides });
+    onFieldConfigsChange({ ...currentFieldConfig, overrides });
   };
 
   const onOverrideRemove = (overrideIndex: number) => {
     let overrides = cloneDeep(currentFieldConfig.overrides);
     overrides.splice(overrideIndex, 1);
-    props.onFieldConfigsChange({ ...currentFieldConfig, overrides });
+    onFieldConfigsChange({ ...currentFieldConfig, overrides });
   };
 
   const onOverrideAdd = (value: SelectableValue<string>) => {
@@ -52,7 +54,7 @@ export function getFieldOverrideCategories(
       return;
     }
 
-    props.onFieldConfigsChange({
+    onFieldConfigsChange({
       ...currentFieldConfig,
       overrides: [
         ...currentFieldConfig.overrides,
@@ -135,7 +137,7 @@ export function getFieldOverrideCategories(
             <matcherUi.component
               id={`${matcherUi.matcher.id}-${idx}`}
               matcher={matcherUi.matcher}
-              data={props.data?.series ?? []}
+              data={data ?? []}
               options={override.matcher.options}
               onChange={onMatcherConfigChange}
             />
diff --git a/public/app/features/dashboard/components/PanelEditor/getPanelFrameOptions.tsx b/public/app/features/dashboard/components/PanelEditor/getPanelFrameOptions.tsx
index b651492c21534..0c48dcaaf41fd 100644
--- a/public/app/features/dashboard/components/PanelEditor/getPanelFrameOptions.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/getPanelFrameOptions.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 
+import { selectors } from '@grafana/e2e-selectors';
 import { config } from '@grafana/runtime';
 import { DataLinksInlineEditor, Input, RadioButtonGroup, Select, Switch, TextArea } from '@grafana/ui';
 import { getPanelLinksVariableSuggestions } from 'app/features/panel/panellinks/link_srv';
@@ -13,7 +14,7 @@ import { OptionsPaneItemDescriptor } from './OptionsPaneItemDescriptor';
 import { OptionPaneRenderProps } from './types';
 
 export function getPanelFrameCategory(props: OptionPaneRenderProps): OptionsPaneCategoryDescriptor {
-  const { panel, onPanelConfigChange } = props;
+  const { dashboard, panel, onPanelConfigChange } = props;
   const descriptor = new OptionsPaneCategoryDescriptor({
     title: 'Panel options',
     id: 'Panel options',
@@ -45,13 +46,20 @@ export function getPanelFrameCategory(props: OptionPaneRenderProps): OptionsPane
         render: function renderTitle() {
           return (
             <Input
+              data-testid={selectors.components.PanelEditor.OptionsPane.fieldInput('Title')}
               id="PanelFrameTitle"
               defaultValue={panel.title}
               onBlur={(e) => onPanelConfigChange('title', e.currentTarget.value)}
             />
           );
         },
-        addon: config.featureToggles.dashgpt && <GenAIPanelTitleButton onGenerate={setPanelTitle} panel={panel} />,
+        addon: config.featureToggles.dashgpt && (
+          <GenAIPanelTitleButton
+            onGenerate={setPanelTitle}
+            panel={panel.getSaveModel()}
+            dashboard={dashboard.getSaveModelClone()}
+          />
+        ),
       })
     )
     .addItem(
@@ -62,6 +70,7 @@ export function getPanelFrameCategory(props: OptionPaneRenderProps): OptionsPane
         render: function renderDescription() {
           return (
             <TextArea
+              data-testid={selectors.components.PanelEditor.OptionsPane.fieldInput('Description')}
               id="description-text-area"
               defaultValue={panel.description}
               onBlur={(e) => onPanelConfigChange('description', e.currentTarget.value)}
@@ -69,7 +78,7 @@ export function getPanelFrameCategory(props: OptionPaneRenderProps): OptionsPane
           );
         },
         addon: config.featureToggles.dashgpt && (
-          <GenAIPanelDescriptionButton onGenerate={setPanelDescription} panel={panel} />
+          <GenAIPanelDescriptionButton onGenerate={setPanelDescription} panel={panel.getSaveModel()} />
         ),
       })
     )
@@ -79,6 +88,7 @@ export function getPanelFrameCategory(props: OptionPaneRenderProps): OptionsPane
         render: function renderTransparent() {
           return (
             <Switch
+              data-testid={selectors.components.PanelEditor.OptionsPane.fieldInput('Transparent background')}
               value={panel.transparent}
               id="transparent-background"
               onChange={(e) => onPanelConfigChange('transparent', e.currentTarget.checked)}
@@ -125,7 +135,7 @@ export function getPanelFrameCategory(props: OptionPaneRenderProps): OptionsPane
                 <RepeatRowSelect
                   id="repeat-by-variable-select"
                   repeat={panel.repeat}
-                  onChange={(value?: string | null) => {
+                  onChange={(value?: string) => {
                     onPanelConfigChange('repeat', value);
                   }}
                 />
diff --git a/public/app/features/dashboard/components/PanelEditor/getVisualizationOptions.tsx b/public/app/features/dashboard/components/PanelEditor/getVisualizationOptions.tsx
index 5a33695a3e6ce..ebcd9658a9fa5 100644
--- a/public/app/features/dashboard/components/PanelEditor/getVisualizationOptions.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/getVisualizationOptions.tsx
@@ -5,15 +5,20 @@ import {
   EventBus,
   InterpolateFunction,
   PanelData,
+  PanelPlugin,
   StandardEditorContext,
   VariableSuggestionsScope,
 } from '@grafana/data';
 import { PanelOptionsSupplier } from '@grafana/data/src/panel/PanelPlugin';
 import {
-  isNestedPanelOptions,
   NestedValueAccess,
   PanelOptionsEditorBuilder,
+  isNestedPanelOptions,
 } from '@grafana/data/src/utils/OptionsUIBuilders';
+import { VizPanel } from '@grafana/scenes';
+import { Input } from '@grafana/ui';
+import { LibraryVizPanelInfo } from 'app/features/dashboard-scene/panel-edit/LibraryVizPanelInfo';
+import { LibraryVizPanel } from 'app/features/dashboard-scene/scene/LibraryVizPanel';
 import { getDataLinksVariableSuggestions } from 'app/features/panel/panellinks/link_srv';
 
 import { OptionsPaneCategoryDescriptor } from './OptionsPaneCategoryDescriptor';
@@ -146,6 +151,138 @@ export function getVisualizationOptions(props: OptionPaneRenderProps): OptionsPa
   return Object.values(categoryIndex);
 }
 
+export function getLibraryVizPanelOptionsCategory(libraryPanel: LibraryVizPanel): OptionsPaneCategoryDescriptor {
+  const descriptor = new OptionsPaneCategoryDescriptor({
+    title: 'Library panel options',
+    id: 'Library panel options',
+    isOpenDefault: true,
+  });
+
+  descriptor
+    .addItem(
+      new OptionsPaneItemDescriptor({
+        title: 'Name',
+        value: libraryPanel,
+        popularRank: 1,
+        render: function renderName() {
+          return (
+            <Input
+              id="LibraryPanelFrameName"
+              data-testid="library panel name input"
+              defaultValue={libraryPanel.state.name}
+              onBlur={(e) => libraryPanel.setState({ name: e.currentTarget.value })}
+            />
+          );
+        },
+      })
+    )
+    .addItem(
+      new OptionsPaneItemDescriptor({
+        title: 'Information',
+        render: function renderLibraryPanelInformation() {
+          return <LibraryVizPanelInfo libraryPanel={libraryPanel} />;
+        },
+      })
+    );
+
+  return descriptor;
+}
+
+export interface OptionPaneRenderProps2 {
+  panel: VizPanel;
+  eventBus: EventBus;
+  plugin: PanelPlugin;
+  data?: PanelData;
+  instanceState: unknown;
+}
+
+export function getVisualizationOptions2(props: OptionPaneRenderProps2): OptionsPaneCategoryDescriptor[] {
+  const { plugin, panel, data, eventBus, instanceState } = props;
+
+  const categoryIndex: Record<string, OptionsPaneCategoryDescriptor> = {};
+  const getOptionsPaneCategory = (categoryNames?: string[]): OptionsPaneCategoryDescriptor => {
+    const categoryName = categoryNames?.[0] ?? plugin.meta.name;
+    const category = categoryIndex[categoryName];
+
+    if (category) {
+      return category;
+    }
+
+    return (categoryIndex[categoryName] = new OptionsPaneCategoryDescriptor({
+      title: categoryName,
+      id: categoryName,
+      sandboxId: plugin.meta.id,
+    }));
+  };
+
+  const currentOptions = panel.state.options;
+  const access: NestedValueAccess = {
+    getValue: (path) => lodashGet(currentOptions, path),
+    onChange: (path, value) => {
+      const newOptions = setOptionImmutably(currentOptions, path, value);
+      panel.onOptionsChange(newOptions);
+    },
+  };
+
+  const context = getStandardEditorContext({
+    data,
+    replaceVariables: panel.interpolate,
+    options: currentOptions,
+    eventBus: eventBus,
+    instanceState,
+  });
+
+  // Load the options into categories
+  fillOptionsPaneItems(plugin.getPanelOptionsSupplier(), access, getOptionsPaneCategory, context);
+
+  // Field options
+  const currentFieldConfig = panel.state.fieldConfig;
+  for (const fieldOption of plugin.fieldConfigRegistry.list()) {
+    const hideOption =
+      fieldOption.showIf &&
+      (fieldOption.isCustom
+        ? !fieldOption.showIf(currentFieldConfig.defaults.custom, data?.series)
+        : !fieldOption.showIf(currentFieldConfig.defaults, data?.series));
+    if (fieldOption.hideFromDefaults || hideOption) {
+      continue;
+    }
+
+    const category = getOptionsPaneCategory(fieldOption.category);
+    const Editor = fieldOption.editor;
+
+    const defaults = currentFieldConfig.defaults;
+    const value = fieldOption.isCustom
+      ? defaults.custom
+        ? lodashGet(defaults.custom, fieldOption.path)
+        : undefined
+      : lodashGet(defaults, fieldOption.path);
+
+    if (fieldOption.getItemsCount) {
+      category.props.itemsCount = fieldOption.getItemsCount(value);
+    }
+
+    category.addItem(
+      new OptionsPaneItemDescriptor({
+        title: fieldOption.name,
+        description: fieldOption.description,
+        overrides: getOptionOverrides(fieldOption, currentFieldConfig, data?.series),
+        render: function renderEditor() {
+          const onChange = (v: unknown) => {
+            panel.onFieldConfigChange(
+              updateDefaultFieldConfigValue(currentFieldConfig, fieldOption.path, v, fieldOption.isCustom),
+              true
+            );
+          };
+
+          return <Editor value={value} onChange={onChange} item={fieldOption} context={context} id={fieldOption.id} />;
+        },
+      })
+    );
+  }
+
+  return Object.values(categoryIndex);
+}
+
 /**
  * This will iterate all options panes and add register them with the configured categories
  *
diff --git a/public/app/features/dashboard/components/PanelEditor/state/selectors.test.ts b/public/app/features/dashboard/components/PanelEditor/state/selectors.test.ts
index 03e1685a997a4..2c2ecd6e6c0d4 100644
--- a/public/app/features/dashboard/components/PanelEditor/state/selectors.test.ts
+++ b/public/app/features/dashboard/components/PanelEditor/state/selectors.test.ts
@@ -41,54 +41,6 @@ describe('getPanelEditorTabs selector', () => {
   });
 
   describe('alerts tab', () => {
-    describe('when alerting enabled', () => {
-      beforeAll(() => {
-        updateConfig({
-          alertingEnabled: true,
-        });
-      });
-
-      it('returns Alerts tab for graph panel', () => {
-        const tabs = getPanelEditorTabs(undefined, {
-          meta: {
-            id: 'graph',
-          },
-        } as PanelPlugin);
-
-        expect(tabs.length).toEqual(3);
-        expect(tabs[2].id).toEqual(PanelEditorTabId.Alert);
-      });
-
-      it('does not returns tab for panel other than graph', () => {
-        const tabs = getPanelEditorTabs(undefined, {
-          meta: {
-            id: 'table',
-          },
-        } as PanelPlugin);
-        expect(tabs.length).toEqual(2);
-        expect(tabs[1].id).toEqual(PanelEditorTabId.Transform);
-      });
-    });
-
-    describe('when alerting disabled', () => {
-      beforeAll(() => {
-        updateConfig({
-          alertingEnabled: false,
-        });
-      });
-
-      it('does not return Alerts tab', () => {
-        const tabs = getPanelEditorTabs(undefined, {
-          meta: {
-            id: 'graph',
-          },
-        } as PanelPlugin);
-
-        expect(tabs.length).toEqual(2);
-        expect(tabs[1].id).toEqual(PanelEditorTabId.Transform);
-      });
-    });
-
     describe('with unified alerting enabled', () => {
       beforeAll(() => {
         updateConfig({ unifiedAlertingEnabled: true });
diff --git a/public/app/features/dashboard/components/PanelEditor/state/selectors.ts b/public/app/features/dashboard/components/PanelEditor/state/selectors.ts
index 02bde1dbaff31..7a7da8ee00413 100644
--- a/public/app/features/dashboard/components/PanelEditor/state/selectors.ts
+++ b/public/app/features/dashboard/components/PanelEditor/state/selectors.ts
@@ -39,14 +39,7 @@ export const getPanelEditorTabs = memoizeOne((tab?: string, plugin?: PanelPlugin
     });
   }
 
-  const { alertingEnabled, unifiedAlertingEnabled } = getConfig();
-  const hasRuleReadPermissions = contextSrv.hasPermission(getRulesPermissions(GRAFANA_RULES_SOURCE_NAME).read);
-  const isAlertingAvailable = alertingEnabled || (unifiedAlertingEnabled && hasRuleReadPermissions);
-
-  const isGraph = plugin.meta.id === 'graph';
-  const isTimeseries = plugin.meta.id === 'timeseries';
-
-  if ((isAlertingAvailable && isGraph) || isTimeseries) {
+  if (shouldShowAlertingTab(plugin)) {
     tabs.push({
       id: PanelEditorTabId.Alert,
       text: 'Alert',
@@ -60,3 +53,17 @@ export const getPanelEditorTabs = memoizeOne((tab?: string, plugin?: PanelPlugin
 
   return tabs;
 });
+
+export function shouldShowAlertingTab(plugin: PanelPlugin) {
+  const { unifiedAlertingEnabled = false } = getConfig();
+  const hasRuleReadPermissions = contextSrv.hasPermission(getRulesPermissions(GRAFANA_RULES_SOURCE_NAME).read);
+  const isAlertingAvailable = unifiedAlertingEnabled && hasRuleReadPermissions;
+  if (!isAlertingAvailable) {
+    return false;
+  }
+
+  const isGraph = plugin.meta.id === 'graph';
+  const isTimeseries = plugin.meta.id === 'timeseries';
+
+  return isGraph || isTimeseries;
+}
diff --git a/public/app/features/dashboard/components/PanelEditor/types.ts b/public/app/features/dashboard/components/PanelEditor/types.ts
index 6c6148d5d6782..e95d7b1cc5f82 100644
--- a/public/app/features/dashboard/components/PanelEditor/types.ts
+++ b/public/app/features/dashboard/components/PanelEditor/types.ts
@@ -55,8 +55,8 @@ export interface OptionPaneRenderProps {
   plugin: PanelPlugin;
   data?: PanelData;
   dashboard: DashboardModel;
-  instanceState: any;
-  onPanelConfigChange: (configKey: keyof PanelModel, value: unknown) => void;
+  instanceState: unknown;
+  onPanelConfigChange: <T extends keyof PanelModel>(configKey: T, value: PanelModel[T]) => void;
   onPanelOptionsChanged: (options: PanelModel['options']) => void;
   onFieldConfigsChange: (config: FieldConfigSource) => void;
 }
diff --git a/public/app/features/dashboard/components/PublicDashboard/PublicDashboardsFooter.tsx b/public/app/features/dashboard/components/PublicDashboard/PublicDashboardsFooter.tsx
index c2b9f72dd9f88..8bfb8ba3469ca 100644
--- a/public/app/features/dashboard/components/PublicDashboard/PublicDashboardsFooter.tsx
+++ b/public/app/features/dashboard/components/PublicDashboard/PublicDashboardsFooter.tsx
@@ -2,16 +2,19 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
+import { selectors as e2eSelectors } from '@grafana/e2e-selectors';
 import { useStyles2 } from '@grafana/ui';
 
 import { useGetPublicDashboardConfig } from './usePublicDashboardConfig';
 
+const selectors = e2eSelectors.pages.PublicDashboard;
+
 export const PublicDashboardFooter = function () {
   const styles = useStyles2(getStyles);
   const conf = useGetPublicDashboardConfig();
 
   return conf.footerHide ? null : (
-    <div className={styles.footer}>
+    <div className={styles.footer} data-testid={selectors.footer}>
       <a className={styles.link} href={conf.footerLink} target="_blank" rel="noreferrer noopener">
         {conf.footerText} <img className={styles.logoImg} alt="" src={conf.footerLogo} />
       </a>
@@ -24,7 +27,11 @@ const getStyles = (theme: GrafanaTheme2) => ({
     display: 'flex',
     justifyContent: 'end',
     height: '30px',
-    padding: theme.spacing(0, 2, 0, 1),
+    backgroundColor: theme.colors.background.canvas,
+    position: 'sticky',
+    bottom: 0,
+    zIndex: theme.zIndex.navbarFixed,
+    padding: theme.spacing(0.5, 0),
   }),
   link: css({
     display: 'flex',
diff --git a/public/app/features/dashboard/components/RepeatRowSelect/RepeatRowSelect.tsx b/public/app/features/dashboard/components/RepeatRowSelect/RepeatRowSelect.tsx
index 1e79885c8a52a..de9ce1c1977f6 100644
--- a/public/app/features/dashboard/components/RepeatRowSelect/RepeatRowSelect.tsx
+++ b/public/app/features/dashboard/components/RepeatRowSelect/RepeatRowSelect.tsx
@@ -1,6 +1,7 @@
 import React, { useCallback, useMemo } from 'react';
 
 import { SelectableValue } from '@grafana/data';
+import { SceneObject, sceneGraph } from '@grafana/scenes';
 import { Select } from '@grafana/ui';
 import { useSelector } from 'app/types';
 
@@ -8,8 +9,8 @@ import { getLastKey, getVariablesByKey } from '../../../variables/state/selector
 
 export interface Props {
   id?: string;
-  repeat?: string | null;
-  onChange: (name: string | null) => void;
+  repeat?: string;
+  onChange: (name?: string) => void;
 }
 
 export const RepeatRowSelect = ({ repeat, onChange, id }: Props) => {
@@ -41,3 +42,40 @@ export const RepeatRowSelect = ({ repeat, onChange, id }: Props) => {
 
   return <Select inputId={id} value={repeat} onChange={onSelectChange} options={variableOptions} />;
 };
+
+interface Props2 {
+  parent: SceneObject;
+  repeat: string | undefined;
+  id?: string;
+  onChange: (name?: string) => void;
+}
+
+export const RepeatRowSelect2 = ({ parent, repeat, id, onChange }: Props2) => {
+  const sceneVars = useMemo(() => sceneGraph.getVariables(parent), [parent]);
+  const variables = sceneVars.useState().variables;
+
+  const variableOptions = useMemo(() => {
+    const options: Array<SelectableValue<string | null>> = variables.map((item) => ({
+      label: item.state.name,
+      value: item.state.name,
+    }));
+
+    if (options.length === 0) {
+      options.unshift({
+        label: 'No template variables found',
+        value: null,
+      });
+    }
+
+    options.unshift({
+      label: 'Disable repeating',
+      value: null,
+    });
+
+    return options;
+  }, [variables]);
+
+  const onSelectChange = useCallback((option: SelectableValue<string | null>) => onChange(option.value!), [onChange]);
+
+  return <Select inputId={id} value={repeat} onChange={onSelectChange} options={variableOptions} />;
+};
diff --git a/public/app/features/dashboard/components/RowOptions/RowOptionsButton.tsx b/public/app/features/dashboard/components/RowOptions/RowOptionsButton.tsx
index 3cae211487e19..f4d820a652b73 100644
--- a/public/app/features/dashboard/components/RowOptions/RowOptionsButton.tsx
+++ b/public/app/features/dashboard/components/RowOptions/RowOptionsButton.tsx
@@ -7,7 +7,7 @@ import { RowOptionsModal } from './RowOptionsModal';
 
 export interface RowOptionsButtonProps {
   title: string;
-  repeat?: string | null;
+  repeat?: string;
   onUpdate: OnRowOptionsUpdate;
   warning?: React.ReactNode;
 }
diff --git a/public/app/features/dashboard/components/RowOptions/RowOptionsForm.tsx b/public/app/features/dashboard/components/RowOptions/RowOptionsForm.tsx
index 1558225ee4e01..1370519341127 100644
--- a/public/app/features/dashboard/components/RowOptions/RowOptionsForm.tsx
+++ b/public/app/features/dashboard/components/RowOptions/RowOptionsForm.tsx
@@ -1,7 +1,8 @@
 import React, { useCallback, useState } from 'react';
 
 import { selectors } from '@grafana/e2e-selectors';
-import { Button, Field, Form, Modal, Input, Alert } from '@grafana/ui';
+import { Button, Field, Modal, Input, Alert } from '@grafana/ui';
+import { Form } from 'app/core/components/Form/Form';
 
 import { RepeatRowSelect } from '../RepeatRowSelect/RepeatRowSelect';
 
@@ -9,15 +10,15 @@ export type OnRowOptionsUpdate = (title: string, repeat?: string | null) => void
 
 export interface Props {
   title: string;
-  repeat?: string | null;
+  repeat?: string;
   onUpdate: OnRowOptionsUpdate;
   onCancel: () => void;
   warning?: React.ReactNode;
 }
 
 export const RowOptionsForm = ({ repeat, title, warning, onUpdate, onCancel }: Props) => {
-  const [newRepeat, setNewRepeat] = useState<string | null | undefined>(repeat);
-  const onChangeRepeat = useCallback((name?: string | null) => setNewRepeat(name), [setNewRepeat]);
+  const [newRepeat, setNewRepeat] = useState<string | undefined>(repeat);
+  const onChangeRepeat = useCallback((name?: string) => setNewRepeat(name), [setNewRepeat]);
 
   return (
     <Form
diff --git a/public/app/features/dashboard/components/RowOptions/RowOptionsModal.tsx b/public/app/features/dashboard/components/RowOptions/RowOptionsModal.tsx
index fbd811d17dc7e..d4c3979663f89 100644
--- a/public/app/features/dashboard/components/RowOptions/RowOptionsModal.tsx
+++ b/public/app/features/dashboard/components/RowOptions/RowOptionsModal.tsx
@@ -1,20 +1,21 @@
 import { css } from '@emotion/css';
 import React from 'react';
 
-import { Modal, stylesFactory } from '@grafana/ui';
+import { Modal, useStyles2 } from '@grafana/ui';
 
 import { OnRowOptionsUpdate, RowOptionsForm } from './RowOptionsForm';
 
 export interface RowOptionsModalProps {
   title: string;
-  repeat?: string | null;
+  repeat?: string;
   warning?: React.ReactNode;
   onDismiss: () => void;
   onUpdate: OnRowOptionsUpdate;
 }
 
 export const RowOptionsModal = ({ repeat, title, onDismiss, onUpdate, warning }: RowOptionsModalProps) => {
-  const styles = getStyles();
+  const styles = useStyles2(getStyles);
+
   return (
     <Modal isOpen={true} title="Row options" icon="copy" onDismiss={onDismiss} className={styles.modal}>
       <RowOptionsForm repeat={repeat} title={title} onCancel={onDismiss} onUpdate={onUpdate} warning={warning} />
@@ -22,11 +23,9 @@ export const RowOptionsModal = ({ repeat, title, onDismiss, onUpdate, warning }:
   );
 };
 
-const getStyles = stylesFactory(() => {
-  return {
-    modal: css`
-      label: RowOptionsModal;
-      width: 500px;
-    `,
-  };
+const getStyles = () => ({
+  modal: css`
+    label: RowOptionsModal;
+    width: 500px;
+  `,
 });
diff --git a/public/app/features/dashboard/components/SaveDashboard/SaveDashboardButton.tsx b/public/app/features/dashboard/components/SaveDashboard/SaveDashboardButton.tsx
index 12d51e7dd443f..34107900acb68 100644
--- a/public/app/features/dashboard/components/SaveDashboard/SaveDashboardButton.tsx
+++ b/public/app/features/dashboard/components/SaveDashboard/SaveDashboardButton.tsx
@@ -11,6 +11,7 @@ interface SaveDashboardButtonProps {
   dashboard: DashboardModel;
   onSaveSuccess?: () => void;
   size?: ComponentSize;
+  onClick?: () => void;
 }
 
 export const SaveDashboardButton = ({ dashboard, onSaveSuccess, size }: SaveDashboardButtonProps) => {
@@ -39,7 +40,7 @@ export const SaveDashboardButton = ({ dashboard, onSaveSuccess, size }: SaveDash
 
 type Props = SaveDashboardButtonProps & { variant?: ButtonVariant };
 
-export const SaveDashboardAsButton = ({ dashboard, onSaveSuccess, variant, size }: Props) => {
+export const SaveDashboardAsButton = ({ dashboard, onClick, onSaveSuccess, variant, size }: Props) => {
   return (
     <ModalsController>
       {({ showModal, hideModal }) => {
@@ -48,6 +49,7 @@ export const SaveDashboardAsButton = ({ dashboard, onSaveSuccess, variant, size
             size={size}
             onClick={() => {
               reportInteraction('grafana_dashboard_save_as_clicked');
+              onClick?.();
               showModal(SaveDashboardDrawer, {
                 dashboard,
                 onSaveSuccess,
diff --git a/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDiff.tsx b/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDiff.tsx
index 1b3746d87c541..8859c59f6cf24 100644
--- a/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDiff.tsx
+++ b/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDiff.tsx
@@ -1,13 +1,11 @@
-import { css } from '@emotion/css';
 import React, { ReactElement } from 'react';
 import { useAsync } from 'react-use';
 
-import { GrafanaTheme2 } from '@grafana/data';
-import { Spinner, useStyles2 } from '@grafana/ui';
+import { Box, Spinner, Stack } from '@grafana/ui';
+import { Diffs } from 'app/features/dashboard-scene/settings/version-history/utils';
 
-import { DiffGroup } from '../VersionHistory/DiffGroup';
-import { DiffViewer } from '../VersionHistory/DiffViewer';
-import { Diffs } from '../VersionHistory/utils';
+import { DiffGroup } from '../../../dashboard-scene/settings/version-history/DiffGroup';
+import { DiffViewer } from '../../../dashboard-scene/settings/version-history/DiffViewer';
 
 interface SaveDashboardDiffProps {
   oldValue?: unknown;
@@ -15,10 +13,19 @@ interface SaveDashboardDiffProps {
 
   // calculated by parent so we can see summary in tabs
   diff?: Diffs;
+  hasFolderChanges?: boolean;
+  oldFolder?: string;
+  newFolder?: string;
 }
 
-export const SaveDashboardDiff = ({ diff, oldValue, newValue }: SaveDashboardDiffProps) => {
-  const styles = useStyles2(getStyles);
+export const SaveDashboardDiff = ({
+  diff,
+  oldValue,
+  newValue,
+  hasFolderChanges,
+  oldFolder,
+  newFolder,
+}: SaveDashboardDiffProps) => {
   const loader = useAsync(async () => {
     const oldJSON = JSON.stringify(oldValue ?? {}, null, 2);
     const newJSON = JSON.stringify(newValue ?? {}, null, 2);
@@ -27,6 +34,7 @@ export const SaveDashboardDiff = ({ diff, oldValue, newValue }: SaveDashboardDif
     let schemaChange: ReactElement | undefined = undefined;
     const diffs: ReactElement[] = [];
     let count = 0;
+
     if (diff) {
       for (const [key, changes] of Object.entries(diff)) {
         // this takes a long time for large diffs (so this is async)
@@ -39,6 +47,7 @@ export const SaveDashboardDiff = ({ diff, oldValue, newValue }: SaveDashboardDif
         count += changes.length;
       }
     }
+
     return {
       schemaChange,
       diffs,
@@ -49,28 +58,38 @@ export const SaveDashboardDiff = ({ diff, oldValue, newValue }: SaveDashboardDif
   }, [diff, oldValue, newValue]);
 
   const { value } = loader;
-  if (!value || !oldValue) {
-    return <Spinner />;
-  }
-
-  if (value.count < 1) {
-    return <div>No changes in this dashboard</div>;
-  }
 
   return (
-    <div>
-      {value.schemaChange && <div className={styles.spacer}>{value.schemaChange}</div>}
-
-      {value.showDiffs && <div className={styles.spacer}>{value.diffs}</div>}
-
-      <h4>JSON Model</h4>
-      {value.jsonView}
-    </div>
+    <Stack direction="column" gap={1}>
+      {hasFolderChanges && (
+        <DiffGroup
+          diffs={[
+            {
+              op: 'replace',
+              value: newFolder,
+              originalValue: oldFolder,
+              path: [],
+              startLineNumber: 0,
+              endLineNumber: 0,
+            },
+          ]}
+          key={'folder'}
+          title={'folder'}
+        />
+      )}
+      {(!value || !oldValue) && <Spinner />}
+      {value && value.count >= 1 ? (
+        <>
+          {value && value.schemaChange && value.schemaChange}
+          {value && value.showDiffs && value.diffs}
+          <Box paddingTop={1}>
+            <h4>Full JSON diff</h4>
+            {value.jsonView}
+          </Box>
+        </>
+      ) : (
+        <Box paddingTop={1}>No changes in the dashboard JSON</Box>
+      )}
+    </Stack>
   );
 };
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  spacer: css`
-    margin-bottom: ${theme.v1.spacing.xl};
-  `,
-});
diff --git a/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.test.tsx b/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.test.tsx
index ee9bb67e9df18..1303bcefd1654 100644
--- a/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.test.tsx
+++ b/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.test.tsx
@@ -10,20 +10,19 @@ import { createDashboardModelFixture } from '../../state/__fixtures__/dashboardF
 
 import { SaveDashboardDrawer } from './SaveDashboardDrawer';
 
+const saveDashboardMutationMock = jest.fn();
+
 jest.mock('app/core/core', () => ({
   ...jest.requireActual('app/core/core'),
   contextSrv: {},
 }));
 
-jest.mock('@grafana/runtime', () => ({
-  ...jest.requireActual('@grafana/runtime'),
-  getBackendSrv: () => ({
-    post: mockPost,
-  }),
+jest.mock('app/features/browse-dashboards/api/browseDashboardsAPI', () => ({
+  ...jest.requireActual('app/features/browse-dashboards/api/browseDashboardsAPI'),
+  useSaveDashboardMutation: () => [saveDashboardMutationMock],
 }));
 
 const store = configureStore();
-const mockPost = jest.fn();
 const buildMocks = () => ({
   dashboard: createDashboardModelFixture({
     uid: 'mockDashboardUid',
@@ -53,13 +52,15 @@ const setup = (options: CompProps) => waitFor(() => render(<CompWithProvider {..
 
 describe('SaveDashboardDrawer', () => {
   beforeEach(() => {
-    mockPost.mockClear();
+    saveDashboardMutationMock.mockClear();
     jest.spyOn(console, 'error').mockImplementation();
   });
 
   it("renders a modal if there's an unhandled error", async () => {
     const { onDismiss, dashboard, error } = buildMocks();
-    mockPost.mockRejectedValueOnce(error);
+    saveDashboardMutationMock.mockResolvedValue({
+      error,
+    });
 
     await setup({ dashboard, onDismiss });
 
@@ -72,15 +73,20 @@ describe('SaveDashboardDrawer', () => {
 
   it('should render corresponding save modal once the error is handled', async () => {
     const { onDismiss, dashboard, error } = buildMocks();
-    mockPost.mockRejectedValueOnce(error);
+    saveDashboardMutationMock.mockResolvedValue({
+      error,
+    });
 
     const { rerender } = await setup({ dashboard, onDismiss });
 
     await userEvent.click(screen.getByRole('button', { name: /save/i }));
     rerender(<CompWithProvider dashboard={dashboard} onDismiss={onDismiss} />);
 
-    mockPost.mockClear();
-    mockPost.mockRejectedValueOnce({ ...error, isHandled: true });
+    saveDashboardMutationMock.mockClear();
+    saveDashboardMutationMock.mockResolvedValue({
+      error,
+      isHandled: true,
+    });
 
     await userEvent.click(screen.getByRole('button', { name: /save/i }));
 
diff --git a/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.tsx b/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.tsx
index 5b81085c3a029..1e5c0d5dfdf5c 100644
--- a/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.tsx
+++ b/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.tsx
@@ -2,8 +2,7 @@ import React, { useMemo, useState } from 'react';
 
 import { config, isFetchError } from '@grafana/runtime';
 import { Drawer, Tab, TabsBar } from '@grafana/ui';
-
-import { jsonDiff } from '../VersionHistory/utils';
+import { jsonDiff } from 'app/features/dashboard-scene/settings/version-history/utils';
 
 import DashboardValidation from './DashboardValidation';
 import { SaveDashboardDiff } from './SaveDashboardDiff';
@@ -19,6 +18,7 @@ export const SaveDashboardDrawer = ({ dashboard, onDismiss, onSaveSuccess, isCop
   const previous = dashboard.getOriginalDashboard();
   const isProvisioned = dashboard.meta.provisioned;
   const isNew = dashboard.version === 0;
+  const [errorIsHandled, setErrorIsHandled] = useState(false);
 
   const data = useMemo<SaveDashboardData>(() => {
     const clone = dashboard.getSaveModelClone({
@@ -89,18 +89,14 @@ export const SaveDashboardDrawer = ({ dashboard, onDismiss, onSaveSuccess, isCop
     );
   };
 
-  if (
-    state.error &&
-    isFetchError(state.error) &&
-    !state.error.isHandled &&
-    proxyHandlesError(state.error.data.status)
-  ) {
+  if (state.error && !errorIsHandled && isFetchError(state.error) && proxyHandlesError(state.error.data.status)) {
     return (
       <SaveDashboardErrorProxy
         error={state.error}
         dashboard={dashboard}
         dashboardSaveModel={data.clone}
         onDismiss={onDismiss}
+        setErrorIsHandled={setErrorIsHandled}
       />
     );
   }
diff --git a/public/app/features/dashboard/components/SaveDashboard/SaveDashboardErrorProxy.tsx b/public/app/features/dashboard/components/SaveDashboard/SaveDashboardErrorProxy.tsx
index 23882f5af6077..60d5533e1533c 100644
--- a/public/app/features/dashboard/components/SaveDashboard/SaveDashboardErrorProxy.tsx
+++ b/public/app/features/dashboard/components/SaveDashboard/SaveDashboardErrorProxy.tsx
@@ -1,5 +1,5 @@
 import { css } from '@emotion/css';
-import React, { useEffect } from 'react';
+import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { FetchError } from '@grafana/runtime';
@@ -19,6 +19,7 @@ interface SaveDashboardErrorProxyProps {
   dashboardSaveModel: Dashboard;
   error: FetchError;
   onDismiss: () => void;
+  setErrorIsHandled: React.Dispatch<React.SetStateAction<boolean>>;
 }
 
 export const SaveDashboardErrorProxy = ({
@@ -26,15 +27,10 @@ export const SaveDashboardErrorProxy = ({
   dashboardSaveModel,
   error,
   onDismiss,
+  setErrorIsHandled,
 }: SaveDashboardErrorProxyProps) => {
   const { onDashboardSave } = useDashboardSave();
 
-  useEffect(() => {
-    if (error.data && proxyHandlesError(error.data.status)) {
-      error.isHandled = true;
-    }
-  }, [error]);
-
   return (
     <>
       {error.data && error.data.status === 'version-mismatch' && (
@@ -73,7 +69,13 @@ export const SaveDashboardErrorProxy = ({
         />
       )}
       {error.data && error.data.status === 'plugin-dashboard' && (
-        <ConfirmPluginDashboardSaveModal dashboard={dashboard} onDismiss={onDismiss} />
+        <ConfirmPluginDashboardSaveModal
+          dashboard={dashboard}
+          onDismiss={() => {
+            setErrorIsHandled(true);
+            onDismiss();
+          }}
+        />
       )}
     </>
   );
@@ -96,7 +98,7 @@ const ConfirmPluginDashboardSaveModal = ({ onDismiss, dashboard }: SaveDashboard
         <Button variant="secondary" onClick={onDismiss} fill="outline">
           Cancel
         </Button>
-        <SaveDashboardAsButton dashboard={dashboard} onSaveSuccess={onDismiss} />
+        <SaveDashboardAsButton onClick={onDismiss} dashboard={dashboard} onSaveSuccess={onDismiss} />
         <Button
           variant="destructive"
           onClick={async () => {
diff --git a/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardAsForm.tsx b/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardAsForm.tsx
index 0e86fa849d34f..e5e9947896922 100644
--- a/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardAsForm.tsx
+++ b/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardAsForm.tsx
@@ -1,7 +1,7 @@
 import React, { ChangeEvent } from 'react';
 
 import { config } from '@grafana/runtime';
-import { Button, Input, Switch, Form, Field, InputControl, HorizontalGroup, Label, TextArea } from '@grafana/ui';
+import { Button, Input, Switch, Form, Field, InputControl, Label, TextArea, Stack } from '@grafana/ui';
 import { FolderPicker } from 'app/core/components/Select/FolderPicker';
 import { DashboardModel } from 'app/features/dashboard/state';
 import { validationSrv } from 'app/features/manage-dashboards/services/ValidationSrv';
@@ -110,12 +110,12 @@ export const SaveDashboardAsForm = ({
             render={({ field: { ref, ...field } }) => (
               <Field
                 label={
-                  <HorizontalGroup justify="space-between">
+                  <Stack justifyContent="space-between">
                     <Label htmlFor="title">Title</Label>
                     {config.featureToggles.dashgpt && isNew && (
-                      <GenAIDashTitleButton onGenerate={(title) => field.onChange(title)} dashboard={dashboard} />
+                      <GenAIDashTitleButton onGenerate={(title) => field.onChange(title)} />
                     )}
-                  </HorizontalGroup>
+                  </Stack>
                 }
                 invalid={!!errors.title}
                 error={errors.title?.message}
@@ -138,15 +138,12 @@ export const SaveDashboardAsForm = ({
             render={({ field: { ref, ...field } }) => (
               <Field
                 label={
-                  <HorizontalGroup justify="space-between">
+                  <Stack justifyContent="space-between">
                     <Label htmlFor="description">Description</Label>
                     {config.featureToggles.dashgpt && isNew && (
-                      <GenAIDashDescriptionButton
-                        onGenerate={(description) => field.onChange(description)}
-                        dashboard={dashboard}
-                      />
+                      <GenAIDashDescriptionButton onGenerate={(description) => field.onChange(description)} />
                     )}
-                  </HorizontalGroup>
+                  </Stack>
                 }
                 invalid={!!errors.description}
                 error={errors.description?.message}
@@ -167,7 +164,7 @@ export const SaveDashboardAsForm = ({
               render={({ field: { ref, ...field } }) => (
                 <FolderPicker
                   {...field}
-                  onChange={(uid: string, title: string) => field.onChange({ uid, title })}
+                  onChange={(uid: string | undefined, title: string | undefined) => field.onChange({ uid, title })}
                   value={field.value?.uid}
                   // Old folder picker fields
                   initialTitle={dashboard.meta.folderTitle}
@@ -184,14 +181,14 @@ export const SaveDashboardAsForm = ({
               <Switch {...register('copyTags')} />
             </Field>
           )}
-          <HorizontalGroup>
+          <Stack>
             <Button type="button" variant="secondary" onClick={onCancel} fill="outline">
               Cancel
             </Button>
             <Button disabled={isLoading} type="submit" aria-label="Save dashboard button">
               {isLoading ? 'Saving...' : 'Save'}
             </Button>
-          </HorizontalGroup>
+          </Stack>
         </>
       )}
     </Form>
diff --git a/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardForm.tsx b/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardForm.tsx
index 622eef95c90c8..d742c75550e43 100644
--- a/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardForm.tsx
+++ b/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardForm.tsx
@@ -3,19 +3,14 @@ import React, { useMemo, useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { Stack } from '@grafana/experimental';
 import { config } from '@grafana/runtime';
 import { Dashboard } from '@grafana/schema';
-import { Button, Checkbox, Form, TextArea, useStyles2 } from '@grafana/ui';
+import { Button, Checkbox, TextArea, useStyles2, Stack } from '@grafana/ui';
 import { DashboardModel } from 'app/features/dashboard/state';
 
 import { GenAIDashboardChangesButton } from '../../GenAI/GenAIDashboardChangesButton';
 import { SaveDashboardData, SaveDashboardOptions } from '../types';
 
-interface FormDTO {
-  message: string;
-}
-
 export type SaveProps = {
   dashboard: DashboardModel; // original
   isLoading: boolean;
@@ -45,8 +40,9 @@ export const SaveDashboardForm = ({
   const styles = useStyles2(getStyles);
 
   return (
-    <Form
-      onSubmit={async (data: FormDTO) => {
+    <form
+      onSubmit={async (event) => {
+        event.preventDefault();
         if (!onSubmit) {
           return;
         }
@@ -59,84 +55,81 @@ export const SaveDashboardForm = ({
           setSaving(false);
         }
       }}
+      style={{ maxWidth: 600 }}
     >
-      {({ register, errors }) => {
-        return (
-          <Stack gap={2} direction="column" alignItems="flex-start">
-            {hasTimeChanged && (
-              <Checkbox
-                checked={!!options.saveTimerange}
-                onChange={() =>
-                  onOptionsChange({
-                    ...options,
-                    saveTimerange: !options.saveTimerange,
-                  })
-                }
-                label="Save current time range as dashboard default"
-                aria-label={selectors.pages.SaveDashboardModal.saveTimerange}
-              />
-            )}
-            {hasVariableChanged && (
-              <Checkbox
-                checked={!!options.saveVariables}
-                onChange={() =>
-                  onOptionsChange({
-                    ...options,
-                    saveVariables: !options.saveVariables,
-                  })
-                }
-                label="Save current variable values as dashboard default"
-                aria-label={selectors.pages.SaveDashboardModal.saveVariables}
-              />
-            )}
-            <div className={styles.message}>
-              {config.featureToggles.dashgpt && (
-                <GenAIDashboardChangesButton
-                  dashboard={dashboard}
-                  onGenerate={(text) => {
-                    onOptionsChange({
-                      ...options,
-                      message: text,
-                    });
-                    setMessage(text);
-                  }}
-                  disabled={!saveModel.hasChanges}
-                />
-              )}
-              <TextArea
-                aria-label="message"
-                value={message}
-                onChange={(e) => {
-                  onOptionsChange({
-                    ...options,
-                    message: e.currentTarget.value,
-                  });
-                  setMessage(e.currentTarget.value);
-                }}
-                placeholder="Add a note to describe your changes."
-                autoFocus
-                rows={5}
-              />
-            </div>
+      <Stack gap={2} direction="column" alignItems="flex-start">
+        {hasTimeChanged && (
+          <Checkbox
+            checked={!!options.saveTimerange}
+            onChange={() =>
+              onOptionsChange({
+                ...options,
+                saveTimerange: !options.saveTimerange,
+              })
+            }
+            label="Save current time range as dashboard default"
+            aria-label={selectors.pages.SaveDashboardModal.saveTimerange}
+          />
+        )}
+        {hasVariableChanged && (
+          <Checkbox
+            checked={!!options.saveVariables}
+            onChange={() =>
+              onOptionsChange({
+                ...options,
+                saveVariables: !options.saveVariables,
+              })
+            }
+            label="Save current variable values as dashboard default"
+            aria-label={selectors.pages.SaveDashboardModal.saveVariables}
+          />
+        )}
+        <div className={styles.message}>
+          {config.featureToggles.aiGeneratedDashboardChanges && (
+            <GenAIDashboardChangesButton
+              dashboard={dashboard}
+              onGenerate={(text) => {
+                onOptionsChange({
+                  ...options,
+                  message: text,
+                });
+                setMessage(text);
+              }}
+              disabled={!saveModel.hasChanges}
+            />
+          )}
+          <TextArea
+            aria-label="message"
+            value={message}
+            onChange={(e) => {
+              onOptionsChange({
+                ...options,
+                message: e.currentTarget.value,
+              });
+              setMessage(e.currentTarget.value);
+            }}
+            placeholder="Add a note to describe your changes."
+            autoFocus
+            rows={5}
+          />
+        </div>
 
-            <Stack alignItems="center">
-              <Button variant="secondary" onClick={onCancel} fill="outline">
-                Cancel
-              </Button>
-              <Button
-                type="submit"
-                disabled={!saveModel.hasChanges || isLoading}
-                icon={saving ? 'spinner' : undefined}
-                aria-label={selectors.pages.SaveDashboardModal.save}
-              >
-                {isLoading ? 'Saving...' : 'Save'}
-              </Button>
-              {!saveModel.hasChanges && <div>No changes to save</div>}
-            </Stack>
-          </Stack>
-        );
-      }}
-    </Form>
+        <Stack alignItems="center">
+          <Button variant="secondary" onClick={onCancel} fill="outline">
+            Cancel
+          </Button>
+          <Button
+            type="submit"
+            disabled={!saveModel.hasChanges || isLoading}
+            icon={saving ? 'spinner' : undefined}
+            aria-label={selectors.pages.SaveDashboardModal.save}
+          >
+            {isLoading ? 'Saving...' : 'Save'}
+          </Button>
+          {!saveModel.hasChanges && <div>No changes to save</div>}
+        </Stack>
+      </Stack>
+    </form>
   );
 };
 
diff --git a/public/app/features/dashboard/components/SaveDashboard/forms/SaveProvisionedDashboardForm.tsx b/public/app/features/dashboard/components/SaveDashboard/forms/SaveProvisionedDashboardForm.tsx
index 984d5b466838c..785b568528ccd 100644
--- a/public/app/features/dashboard/components/SaveDashboard/forms/SaveProvisionedDashboardForm.tsx
+++ b/public/app/features/dashboard/components/SaveDashboard/forms/SaveProvisionedDashboardForm.tsx
@@ -2,8 +2,7 @@ import { css } from '@emotion/css';
 import { saveAs } from 'file-saver';
 import React, { useCallback, useState } from 'react';
 
-import { Stack } from '@grafana/experimental';
-import { Button, ClipboardButton, HorizontalGroup, TextArea } from '@grafana/ui';
+import { Button, ClipboardButton, HorizontalGroup, TextArea, Stack } from '@grafana/ui';
 
 import { SaveDashboardFormProps } from '../types';
 
diff --git a/public/app/features/dashboard/components/SaveDashboard/types.ts b/public/app/features/dashboard/components/SaveDashboard/types.ts
index 0baff9a2d8975..a8af17cb80667 100644
--- a/public/app/features/dashboard/components/SaveDashboard/types.ts
+++ b/public/app/features/dashboard/components/SaveDashboard/types.ts
@@ -1,8 +1,6 @@
 import { Dashboard } from '@grafana/schema';
 import { CloneOptions, DashboardModel } from 'app/features/dashboard/state/DashboardModel';
-import { DashboardDataDTO } from 'app/types';
-
-import { Diffs } from '../VersionHistory/utils';
+import { Diffs } from 'app/features/dashboard-scene/settings/version-history/utils';
 
 export interface SaveDashboardData {
   clone: Dashboard; // cloned copy
@@ -19,10 +17,11 @@ export interface SaveDashboardOptions extends CloneOptions {
 }
 
 export interface SaveDashboardCommand {
-  dashboard: DashboardDataDTO;
+  dashboard: Dashboard;
   message?: string;
   folderUid?: string;
   overwrite?: boolean;
+  showErrorAlert?: boolean;
 }
 
 export interface SaveDashboardFormProps {
diff --git a/public/app/features/dashboard/components/SaveDashboard/useDashboardSave.tsx b/public/app/features/dashboard/components/SaveDashboard/useDashboardSave.tsx
index da61281c29670..8bf16da07e904 100644
--- a/public/app/features/dashboard/components/SaveDashboard/useDashboardSave.tsx
+++ b/public/app/features/dashboard/components/SaveDashboard/useDashboardSave.tsx
@@ -5,12 +5,9 @@ import { locationService, reportInteraction } from '@grafana/runtime';
 import { Dashboard } from '@grafana/schema';
 import appEvents from 'app/core/app_events';
 import { useAppNotification } from 'app/core/copy/appNotification';
-import { contextSrv } from 'app/core/core';
 import { updateDashboardName } from 'app/core/reducers/navBarTree';
 import { useSaveDashboardMutation } from 'app/features/browse-dashboards/api/browseDashboardsAPI';
-import { newBrowseDashboardsEnabled } from 'app/features/browse-dashboards/featureFlag';
 import { DashboardModel } from 'app/features/dashboard/state';
-import { saveDashboard as saveDashboardApiCall } from 'app/features/manage-dashboards/state/actions';
 import { useDispatch } from 'app/types';
 import { DashboardSavedEvent } from 'app/types/events';
 
@@ -24,30 +21,18 @@ const saveDashboard = async (
   dashboard: DashboardModel,
   saveDashboardRtkQuery: ReturnType<typeof useSaveDashboardMutation>[0]
 ) => {
-  if (newBrowseDashboardsEnabled()) {
-    const query = await saveDashboardRtkQuery({
-      dashboard: saveModel,
-      folderUid: options.folderUid ?? dashboard.meta.folderUid ?? saveModel.meta.folderUid,
-      message: options.message,
-      overwrite: options.overwrite,
-    });
+  const query = await saveDashboardRtkQuery({
+    dashboard: saveModel,
+    folderUid: options.folderUid ?? dashboard.meta.folderUid ?? saveModel.meta?.folderUid,
+    message: options.message,
+    overwrite: options.overwrite,
+  });
 
-    if ('error' in query) {
-      throw query.error;
-    }
-
-    return query.data;
-  } else {
-    let folderUid = options.folderUid;
-    if (folderUid === undefined) {
-      folderUid = dashboard.meta.folderUid ?? saveModel.folderUid;
-    }
-
-    const result = await saveDashboardApiCall({ ...options, folderUid, dashboard: saveModel });
-    // fetch updated access control permissions
-    await contextSrv.fetchUserPermissions();
-    return result;
+  if ('error' in query) {
+    throw query.error;
   }
+
+  return query.data;
 };
 
 export const useDashboardSave = (isCopy = false) => {
diff --git a/public/app/features/dashboard/components/ShareModal/ShareEmbed.tsx b/public/app/features/dashboard/components/ShareModal/ShareEmbed.tsx
index 57bc90df24841..8d60b1e4e3a92 100644
--- a/public/app/features/dashboard/components/ShareModal/ShareEmbed.tsx
+++ b/public/app/features/dashboard/components/ShareModal/ShareEmbed.tsx
@@ -1,110 +1,96 @@
-import React, { FormEvent, PureComponent } from 'react';
+import React, { FormEvent, useEffect, useState } from 'react';
+import { useEffectOnce } from 'react-use';
 
-import { reportInteraction } from '@grafana/runtime/src';
+import { RawTimeRange, TimeRange } from '@grafana/data';
+import { reportInteraction } from '@grafana/runtime';
 import { ClipboardButton, Field, Modal, Switch, TextArea } from '@grafana/ui';
 import { t, Trans } from 'app/core/internationalization';
+import { DashboardInteractions } from 'app/features/dashboard-scene/utils/interactions';
 
 import { ThemePicker } from './ThemePicker';
 import { ShareModalTabProps } from './types';
 import { buildIframeHtml } from './utils';
 
-interface Props extends ShareModalTabProps {}
-
-interface State {
-  useCurrentTimeRange: boolean;
-  selectedTheme: string;
-  iframeHtml: string;
+interface Props extends Omit<ShareModalTabProps, 'panel' | 'dashboard'> {
+  panel?: { timeFrom?: string; id: number };
+  dashboard: { uid: string; time: RawTimeRange };
+  range?: TimeRange;
+  buildIframe?: typeof buildIframeHtml;
 }
 
-export class ShareEmbed extends PureComponent<Props, State> {
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      useCurrentTimeRange: true,
-      selectedTheme: 'current',
-      iframeHtml: '',
-    };
-  }
+export function ShareEmbed({ panel, dashboard, range, buildIframe = buildIframeHtml }: Props) {
+  const [useCurrentTimeRange, setUseCurrentTimeRange] = useState(true);
+  const [selectedTheme, setSelectedTheme] = useState('current');
+  const [iframeHtml, setIframeHtml] = useState('');
 
-  componentDidMount() {
+  useEffectOnce(() => {
     reportInteraction('grafana_dashboards_embed_share_viewed');
-    this.buildIframeHtml();
-  }
-
-  buildIframeHtml = () => {
-    const { panel, dashboard } = this.props;
-    const { useCurrentTimeRange, selectedTheme } = this.state;
-
-    const iframeHtml = buildIframeHtml(useCurrentTimeRange, dashboard.uid, selectedTheme, panel);
-    this.setState({ iframeHtml });
-  };
+  });
 
-  onIframeHtmlChange = (event: FormEvent<HTMLTextAreaElement>) => {
-    this.setState({ iframeHtml: event.currentTarget.value });
-  };
+  useEffect(() => {
+    const newIframeHtml = buildIframe(useCurrentTimeRange, dashboard.uid, selectedTheme, panel, range);
+    setIframeHtml(newIframeHtml);
+  }, [selectedTheme, useCurrentTimeRange, dashboard, panel, range, buildIframe]);
 
-  onUseCurrentTimeRangeChange = () => {
-    this.setState(
-      {
-        useCurrentTimeRange: !this.state.useCurrentTimeRange,
-      },
-      this.buildIframeHtml
-    );
+  const onIframeHtmlChange = (event: FormEvent<HTMLTextAreaElement>) => {
+    setIframeHtml(event.currentTarget.value);
   };
 
-  onThemeChange = (value: string) => {
-    this.setState({ selectedTheme: value }, this.buildIframeHtml);
+  const onUseCurrentTimeRangeChange = () => {
+    setUseCurrentTimeRange((useCurTimeRange) => !useCurTimeRange);
   };
 
-  getIframeHtml = () => {
-    return this.state.iframeHtml;
+  const onThemeChange = (value: string) => {
+    setSelectedTheme(value);
   };
 
-  render() {
-    const { useCurrentTimeRange, selectedTheme, iframeHtml } = this.state;
-    const isRelativeTime = this.props.dashboard ? this.props.dashboard.time.to === 'now' : false;
-
-    const timeRangeDescription = isRelativeTime
-      ? t(
-          'share-modal.embed.time-range-description',
-          'Transforms the current relative time range to an absolute time range'
-        )
-      : '';
+  const isRelativeTime = dashboard.time.to === 'now';
+  const timeRangeDescription = isRelativeTime
+    ? t(
+        'share-modal.embed.time-range-description',
+        'Transforms the current relative time range to an absolute time range'
+      )
+    : '';
 
-    return (
-      <>
-        <p className="share-modal-info-text">
-          <Trans i18nKey="share-modal.embed.info">Generate HTML for embedding an iframe with this panel.</Trans>
-        </p>
-        <Field label={t('share-modal.embed.time-range', 'Current time range')} description={timeRangeDescription}>
-          <Switch
-            id="share-current-time-range"
-            value={useCurrentTimeRange}
-            onChange={this.onUseCurrentTimeRangeChange}
-          />
-        </Field>
-        <ThemePicker selectedTheme={selectedTheme} onChange={this.onThemeChange} />
-        <Field
-          label={t('share-modal.embed.html', 'Embed HTML')}
-          description={t(
-            'share-modal.embed.html-description',
-            'The HTML code below can be pasted and included in another web page. Unless anonymous access is enabled, the user viewing that page need to be signed into Grafana for the graph to load.'
-          )}
+  return (
+    <>
+      <p className="share-modal-info-text">
+        <Trans i18nKey="share-modal.embed.info">Generate HTML for embedding an iframe with this panel.</Trans>
+      </p>
+      <Field label={t('share-modal.embed.time-range', 'Current time range')} description={timeRangeDescription}>
+        <Switch id="share-current-time-range" value={useCurrentTimeRange} onChange={onUseCurrentTimeRangeChange} />
+      </Field>
+      <ThemePicker selectedTheme={selectedTheme} onChange={onThemeChange} />
+      <Field
+        label={t('share-modal.embed.html', 'Embed HTML')}
+        description={t(
+          'share-modal.embed.html-description',
+          'The HTML code below can be pasted and included in another web page. Unless anonymous access is enabled, the user viewing that page need to be signed into Grafana for the graph to load.'
+        )}
+      >
+        <TextArea
+          data-testid="share-embed-html"
+          id="share-panel-embed-embed-html-textarea"
+          rows={5}
+          value={iframeHtml}
+          onChange={onIframeHtmlChange}
+        />
+      </Field>
+      <Modal.ButtonRow>
+        <ClipboardButton
+          icon="copy"
+          variant="primary"
+          getText={() => iframeHtml}
+          onClipboardCopy={() => {
+            DashboardInteractions.embedSnippetCopy({
+              currentTimeRange: useCurrentTimeRange,
+              theme: selectedTheme,
+            });
+          }}
         >
-          <TextArea
-            data-testid="share-embed-html"
-            id="share-panel-embed-embed-html-textarea"
-            rows={5}
-            value={iframeHtml}
-            onChange={this.onIframeHtmlChange}
-          />
-        </Field>
-        <Modal.ButtonRow>
-          <ClipboardButton icon="copy" variant="primary" getText={this.getIframeHtml}>
-            <Trans i18nKey="share-modal.embed.copy">Copy to clipboard</Trans>
-          </ClipboardButton>
-        </Modal.ButtonRow>
-      </>
-    );
-  }
+          <Trans i18nKey="share-modal.embed.copy">Copy to clipboard</Trans>
+        </ClipboardButton>
+      </Modal.ButtonRow>
+    </>
+  );
 }
diff --git a/public/app/features/dashboard/components/ShareModal/ShareExport.tsx b/public/app/features/dashboard/components/ShareModal/ShareExport.tsx
index a2fbf2013b4c0..6bf1bad1b8417 100644
--- a/public/app/features/dashboard/components/ShareModal/ShareExport.tsx
+++ b/public/app/features/dashboard/components/ShareModal/ShareExport.tsx
@@ -1,24 +1,20 @@
 import { saveAs } from 'file-saver';
 import React, { PureComponent } from 'react';
 
-import { config } from '@grafana/runtime';
 import { Button, Field, Modal, Switch } from '@grafana/ui';
 import { appEvents } from 'app/core/core';
 import { t, Trans } from 'app/core/internationalization';
-import { getBackendSrv } from 'app/core/services/backend_srv';
 import { DashboardExporter } from 'app/features/dashboard/components/DashExportModal';
+import { DashboardInteractions } from 'app/features/dashboard-scene/utils/interactions';
 import { ShowModalReactEvent } from 'app/types/events';
 
 import { ViewJsonModal } from './ViewJsonModal';
-import { trackDashboardSharingActionPerType } from './analytics';
 import { ShareModalTabProps } from './types';
-import { shareDashboardType } from './utils';
 
 interface Props extends ShareModalTabProps {}
 
 interface State {
   shareExternally: boolean;
-  trimDefaults: boolean;
 }
 
 export class ShareExport extends PureComponent<Props, State> {
@@ -28,7 +24,6 @@ export class ShareExport extends PureComponent<Props, State> {
     super(props);
     this.state = {
       shareExternally: false,
-      trimDefaults: false,
     };
 
     this.exporter = new DashboardExporter();
@@ -40,69 +35,32 @@ export class ShareExport extends PureComponent<Props, State> {
     });
   };
 
-  onTrimDefaultsChange = () => {
-    this.setState({
-      trimDefaults: !this.state.trimDefaults,
-    });
-  };
-
   onSaveAsFile = () => {
     const { dashboard } = this.props;
     const { shareExternally } = this.state;
-    const { trimDefaults } = this.state;
+
+    DashboardInteractions.exportSaveJsonClicked({ externally: shareExternally });
 
     if (shareExternally) {
       this.exporter.makeExportable(dashboard).then((dashboardJson) => {
-        if (trimDefaults) {
-          getBackendSrv()
-            .post('/api/dashboards/trim', { dashboard: dashboardJson })
-            .then((resp) => {
-              this.openSaveAsDialog(resp.dashboard);
-            });
-        } else {
-          this.openSaveAsDialog(dashboardJson);
-        }
+        this.openSaveAsDialog(dashboardJson);
       });
     } else {
-      if (trimDefaults) {
-        getBackendSrv()
-          .post('/api/dashboards/trim', { dashboard: dashboard.getSaveModelClone() })
-          .then((resp) => {
-            this.openSaveAsDialog(resp.dashboard);
-          });
-      } else {
-        this.openSaveAsDialog(dashboard.getSaveModelClone());
-      }
+      this.openSaveAsDialog(dashboard.getSaveModelClone());
     }
   };
 
   onViewJson = () => {
     const { dashboard } = this.props;
     const { shareExternally } = this.state;
-    const { trimDefaults } = this.state;
+    DashboardInteractions.exportViewJsonClicked({ externally: shareExternally });
 
     if (shareExternally) {
       this.exporter.makeExportable(dashboard).then((dashboardJson) => {
-        if (trimDefaults) {
-          getBackendSrv()
-            .post('/api/dashboards/trim', { dashboard: dashboardJson })
-            .then((resp) => {
-              this.openJsonModal(resp.dashboard);
-            });
-        } else {
-          this.openJsonModal(dashboardJson);
-        }
+        this.openJsonModal(dashboardJson);
       });
     } else {
-      if (trimDefaults) {
-        getBackendSrv()
-          .post('/api/dashboards/trim', { dashboard: dashboard.getSaveModelClone() })
-          .then((resp) => {
-            this.openJsonModal(resp.dashboard);
-          });
-      } else {
-        this.openJsonModal(dashboard.getSaveModelClone());
-      }
+      this.openJsonModal(dashboard.getSaveModelClone());
     }
   };
 
@@ -113,7 +71,6 @@ export class ShareExport extends PureComponent<Props, State> {
     });
     const time = new Date().getTime();
     saveAs(blob, `${dash.title}-${time}.json`);
-    trackDashboardSharingActionPerType('save_export', shareDashboardType.export);
   };
 
   openJsonModal = (clone: object) => {
@@ -132,12 +89,9 @@ export class ShareExport extends PureComponent<Props, State> {
   render() {
     const { onDismiss } = this.props;
     const { shareExternally } = this.state;
-    const { trimDefaults } = this.state;
 
     const exportExternallyTranslation = t('share-modal.export.share-externally-label', `Export for sharing externally`);
 
-    const exportDefaultTranslation = t('share-modal.export.share-default-label', `Export with default values removed`);
-
     return (
       <>
         <p className="share-modal-info-text">
@@ -146,11 +100,6 @@ export class ShareExport extends PureComponent<Props, State> {
         <Field label={exportExternallyTranslation}>
           <Switch id="share-externally-toggle" value={shareExternally} onChange={this.onShareExternallyChange} />
         </Field>
-        {config.featureToggles.trimDefaults && (
-          <Field label={exportDefaultTranslation}>
-            <Switch id="trim-defaults-toggle" value={trimDefaults} onChange={this.onTrimDefaultsChange} />
-          </Field>
-        )}
         <Modal.ButtonRow>
           <Button variant="secondary" onClick={onDismiss} fill="outline">
             <Trans i18nKey="share-modal.export.cancel-button">Cancel</Trans>
diff --git a/public/app/features/dashboard/components/ShareModal/ShareLibraryPanel.tsx b/public/app/features/dashboard/components/ShareModal/ShareLibraryPanel.tsx
index e3b65aab15500..b40dce681db55 100644
--- a/public/app/features/dashboard/components/ShareModal/ShareLibraryPanel.tsx
+++ b/public/app/features/dashboard/components/ShareModal/ShareLibraryPanel.tsx
@@ -24,7 +24,7 @@ export const ShareLibraryPanel = ({ panel, initialFolderUid, onDismiss }: Props)
       <p className="share-modal-info-text">
         <Trans i18nKey="share-modal.library.info">Create library panel.</Trans>
       </p>
-      <AddLibraryPanelContents panel={panel} initialFolderUid={initialFolderUid} onDismiss={onDismiss!} />
+      <AddLibraryPanelContents panel={panel} initialFolderUid={initialFolderUid} onDismiss={onDismiss} />
     </>
   );
 };
diff --git a/public/app/features/dashboard/components/ShareModal/ShareLink.test.tsx b/public/app/features/dashboard/components/ShareModal/ShareLink.test.tsx
index c1cd765461012..205e09e8a658c 100644
--- a/public/app/features/dashboard/components/ShareModal/ShareLink.test.tsx
+++ b/public/app/features/dashboard/components/ShareModal/ShareLink.test.tsx
@@ -105,7 +105,7 @@ describe('ShareModal', () => {
       render(<ShareLink {...props} />);
 
       const base = 'http://dashboards.grafana.com/render/d-solo/abcdefghi/my-dash';
-      const params = '?from=1000&to=2000&orgId=1&panelId=22&width=1000&height=500&tz=UTC';
+      const params = '?from=1000&to=2000&orgId=1&panelId=22&width=1000&height=500&scale=1&tz=UTC';
       expect(
         await screen.findByRole('link', { name: selectors.pages.SharePanelModal.linkToRenderedImage })
       ).toHaveAttribute('href', base + params);
@@ -116,7 +116,7 @@ describe('ShareModal', () => {
       render(<ShareLink {...props} />);
 
       const base = 'http://dashboards.grafana.com/render/dashboard-solo/script/my-dash.js';
-      const params = '?from=1000&to=2000&orgId=1&panelId=22&width=1000&height=500&tz=UTC';
+      const params = '?from=1000&to=2000&orgId=1&panelId=22&width=1000&height=500&scale=1&tz=UTC';
       expect(
         await screen.findByRole('link', { name: selectors.pages.SharePanelModal.linkToRenderedImage })
       ).toHaveAttribute('href', base + params);
@@ -144,13 +144,17 @@ describe('ShareModal', () => {
       mockLocationHref('http://server/#!/test?editPanel=1');
       render(<ShareLink {...props} />);
 
-      const base = 'http://server/#!/test';
+      const base = 'http://server';
+      const path = '/#!/test';
       expect(await screen.findByRole('textbox', { name: 'Link URL' })).toHaveValue(
-        base + '?editPanel=1&from=1000&to=2000&orgId=1'
+        base + path + '?editPanel=1&from=1000&to=2000&orgId=1'
       );
       expect(
         await screen.findByRole('link', { name: selectors.pages.SharePanelModal.linkToRenderedImage })
-      ).toHaveAttribute('href', base + '?from=1000&to=2000&orgId=1&panelId=1&width=1000&height=500&tz=UTC');
+      ).toHaveAttribute(
+        'href',
+        base + path + '?from=1000&to=2000&orgId=1&panelId=1&width=1000&height=500&scale=1&tz=UTC'
+      );
     });
 
     it('should shorten url', async () => {
@@ -161,6 +165,17 @@ describe('ShareModal', () => {
         `http://localhost:3000/goto/${mockUid}`
       );
     });
+
+    it('should generate render url without shareView param', async () => {
+      mockLocationHref('http://dashboards.grafana.com/d/abcdefghi/my-dash?shareView=link');
+      render(<ShareLink {...props} />);
+
+      const base = 'http://dashboards.grafana.com/render/d-solo/abcdefghi/my-dash';
+      const params = '?from=1000&to=2000&orgId=1&panelId=22&width=1000&height=500&scale=1&tz=UTC';
+      expect(
+        await screen.findByRole('link', { name: selectors.pages.SharePanelModal.linkToRenderedImage })
+      ).toHaveAttribute('href', base + params);
+    });
   });
 });
 
@@ -197,7 +212,7 @@ describe('when appUrl is set in the grafana config', () => {
       await screen.findByRole('link', { name: selectors.pages.SharePanelModal.linkToRenderedImage })
     ).toHaveAttribute(
       'href',
-      `http://dashboards.grafana.com/render/d-solo/${mockDashboard.uid}?orgId=1&from=1000&to=2000&panelId=${mockPanel.id}&width=1000&height=500&tz=UTC`
+      `http://dashboards.grafana.com/render/d-solo/${mockDashboard.uid}?orgId=1&from=1000&to=2000&panelId=${mockPanel.id}&width=1000&height=500&scale=1&tz=UTC`
     );
   });
 });
diff --git a/public/app/features/dashboard/components/ShareModal/ShareLink.tsx b/public/app/features/dashboard/components/ShareModal/ShareLink.tsx
index c2a8c5968f418..3ece45c6de99e 100644
--- a/public/app/features/dashboard/components/ShareModal/ShareLink.tsx
+++ b/public/app/features/dashboard/components/ShareModal/ShareLink.tsx
@@ -1,14 +1,14 @@
 import React, { PureComponent } from 'react';
 
 import { selectors as e2eSelectors } from '@grafana/e2e-selectors';
-import { Alert, ClipboardButton, Field, FieldSet, Icon, Input, Switch } from '@grafana/ui';
+import { Alert, ClipboardButton, Field, FieldSet, Input, Switch, TextLink } from '@grafana/ui';
 import config from 'app/core/config';
 import { t, Trans } from 'app/core/internationalization';
+import { DashboardInteractions } from 'app/features/dashboard-scene/utils/interactions';
 
 import { ThemePicker } from './ThemePicker';
-import { trackDashboardSharingActionPerType } from './analytics';
 import { ShareModalTabProps } from './types';
-import { buildImageUrl, buildShareUrl, shareDashboardType } from './utils';
+import { buildImageUrl, buildShareUrl } from './utils';
 
 export interface Props extends ShareModalTabProps {}
 
@@ -30,6 +30,7 @@ export class ShareLink extends PureComponent<Props, State> {
       shareUrl: '',
       imageUrl: '',
     };
+    this.onCopy = this.onCopy.bind(this);
   }
 
   componentDidMount() {
@@ -74,7 +75,11 @@ export class ShareLink extends PureComponent<Props, State> {
   };
 
   onCopy() {
-    trackDashboardSharingActionPerType('copy_link', shareDashboardType.link);
+    DashboardInteractions.shareLinkCopied({
+      currentTimeRange: this.state.useCurrentTimeRange,
+      theme: this.state.selectedTheme,
+      shortenURL: this.state.useShortUrl,
+    });
   }
 
   render() {
@@ -132,13 +137,9 @@ export class ShareLink extends PureComponent<Props, State> {
         {panel && config.rendererAvailable && (
           <>
             {isDashboardSaved && (
-              <div className="gf-form">
-                <a href={imageUrl} target="_blank" rel="noreferrer" aria-label={selectors.linkToRenderedImage}>
-                  <Icon name="camera" />
-                  &nbsp;
-                  <Trans i18nKey="share-modal.link.rendered-image">Direct link rendered image</Trans>
-                </a>
-              </div>
+              <TextLink href={imageUrl} external icon={'camera'} aria-label={selectors.linkToRenderedImage}>
+                {t('share-modal.link.rendered-image', 'Direct link rendered image')}
+              </TextLink>
             )}
 
             {!isDashboardSaved && (
@@ -163,14 +164,9 @@ export class ShareLink extends PureComponent<Props, State> {
           >
             <Trans i18nKey="share-modal.link.render-instructions">
               To render a panel image, you must install the
-              <a
-                href="https://grafana.com/grafana/plugins/grafana-image-renderer"
-                target="_blank"
-                rel="noopener noreferrer"
-                className="external-link"
-              >
+              <TextLink href="https://grafana.com/grafana/plugins/grafana-image-renderer" external>
                 Grafana image renderer plugin
-              </a>
+              </TextLink>
               . Please contact your Grafana administrator to install the plugin.
             </Trans>
           </Alert>
diff --git a/public/app/features/dashboard/components/ShareModal/ShareModal.tsx b/public/app/features/dashboard/components/ShareModal/ShareModal.tsx
index 7e3d9fe0887e6..50d31b570252e 100644
--- a/public/app/features/dashboard/components/ShareModal/ShareModal.tsx
+++ b/public/app/features/dashboard/components/ShareModal/ShareModal.tsx
@@ -5,7 +5,9 @@ import { config } from 'app/core/config';
 import { contextSrv } from 'app/core/core';
 import { t } from 'app/core/internationalization';
 import { SharePublicDashboard } from 'app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard';
+import { isPublicDashboardsEnabled } from 'app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils';
 import { DashboardModel, PanelModel } from 'app/features/dashboard/state';
+import { DashboardInteractions } from 'app/features/dashboard-scene/utils/interactions';
 import { isPanelModelLibraryPanel } from 'app/features/library-panels/guard';
 
 import { ShareEmbed } from './ShareEmbed';
@@ -13,7 +15,6 @@ import { ShareExport } from './ShareExport';
 import { ShareLibraryPanel } from './ShareLibraryPanel';
 import { ShareLink } from './ShareLink';
 import { ShareSnapshot } from './ShareSnapshot';
-import { trackDashboardSharingTypeOpen } from './analytics';
 import { ShareModalTabModel } from './types';
 import { shareDashboardType } from './utils';
 
@@ -28,11 +29,11 @@ export function addPanelShareTab(tab: ShareModalTabModel) {
   customPanelTabs.push(tab);
 }
 
-function getTabs(panel?: PanelModel, activeTab?: string) {
+function getTabs(canEditDashboard: boolean, panel?: PanelModel, activeTab?: string) {
   const linkLabel = t('share-modal.tab-title.link', 'Link');
   const tabs: ShareModalTabModel[] = [{ label: linkLabel, value: shareDashboardType.link, component: ShareLink }];
 
-  if (contextSrv.isSignedIn && config.snapshotEnabled) {
+  if (contextSrv.isSignedIn && config.snapshotEnabled && canEditDashboard) {
     const snapshotLabel = t('share-modal.tab-title.snapshot', 'Snapshot');
     tabs.push({ label: snapshotLabel, value: shareDashboardType.snapshot, component: ShareSnapshot });
   }
@@ -56,9 +57,9 @@ function getTabs(panel?: PanelModel, activeTab?: string) {
     tabs.push(...customDashboardTabs);
   }
 
-  if (Boolean(config.featureToggles['publicDashboards'])) {
+  if (isPublicDashboardsEnabled()) {
     tabs.push({
-      label: 'Public dashboard',
+      label: t('share-modal.tab-title.public-dashboard-title', 'Public dashboard'),
       value: shareDashboardType.publicDashboard,
       component: SharePublicDashboard,
     });
@@ -76,7 +77,6 @@ interface Props extends Themeable2 {
   dashboard: DashboardModel;
   panel?: PanelModel;
   activeTab?: string;
-
   onDismiss(): void;
 }
 
@@ -86,7 +86,7 @@ interface State {
 }
 
 function getInitialState(props: Props): State {
-  const { tabs, activeTab } = getTabs(props.panel, props.activeTab);
+  const { tabs, activeTab } = getTabs(props.dashboard.canEditDashboard(), props.panel, props.activeTab);
 
   return {
     tabs,
@@ -102,7 +102,9 @@ class UnthemedShareModal extends React.Component<Props, State> {
 
   onSelectTab: React.ComponentProps<typeof ModalTabsHeader>['onChangeTab'] = (t) => {
     this.setState((prevState) => ({ ...prevState, activeTab: t.value }));
-    trackDashboardSharingTypeOpen(t.value);
+    DashboardInteractions.sharingTabChanged({
+      item: t.value,
+    });
   };
 
   getActiveTab() {
@@ -114,7 +116,8 @@ class UnthemedShareModal extends React.Component<Props, State> {
     const { panel } = this.props;
     const { activeTab } = this.state;
     const title = panel ? t('share-modal.panel.title', 'Share Panel') : t('share-modal.dashboard.title', 'Share');
-    const tabs = getTabs(this.props.panel, this.state.activeTab).tabs;
+    const canEditDashboard = this.props.dashboard.canEditDashboard();
+    const tabs = getTabs(canEditDashboard, this.props.panel, this.state.activeTab).tabs;
 
     return (
       <ModalTabsHeader
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/ConfigPublicDashboard.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/ConfigPublicDashboard.tsx
index 8def97feb8c59..1655446ed2ab8 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/ConfigPublicDashboard.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/ConfigPublicDashboard.tsx
@@ -1,37 +1,47 @@
 import { css } from '@emotion/css';
-import React, { useContext } from 'react';
+import React from 'react';
 import { useForm } from 'react-hook-form';
 
-import { GrafanaTheme2 } from '@grafana/data/src';
+import { GrafanaTheme2, TimeRange } from '@grafana/data/src';
 import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
 import { config, featureEnabled } from '@grafana/runtime/src';
 import {
+  Button,
   ClipboardButton,
   Field,
   HorizontalGroup,
   Input,
   Label,
-  ModalsContext,
+  ModalsController,
   Switch,
   useStyles2,
 } from '@grafana/ui/src';
 import { Layout } from '@grafana/ui/src/components/Layout/Layout';
+import { Trans, t } from 'app/core/internationalization';
+import {
+  useDeletePublicDashboardMutation,
+  useUpdatePublicDashboardMutation,
+} from 'app/features/dashboard/api/publicDashboardApi';
+import { DashboardModel } from 'app/features/dashboard/state';
 import { getTimeRange } from 'app/features/dashboard/utils/timeRange';
+import { DashboardScene } from 'app/features/dashboard-scene/scene/DashboardScene';
+import { DashboardInteractions } from 'app/features/dashboard-scene/utils/interactions';
+import { DeletePublicDashboardModal } from 'app/features/manage-dashboards/components/PublicDashboardListTable/DeletePublicDashboardModal';
 
 import { contextSrv } from '../../../../../../core/services/context_srv';
 import { AccessControlAction, useSelector } from '../../../../../../types';
-import { DeletePublicDashboardButton } from '../../../../../manage-dashboards/components/PublicDashboardListTable/DeletePublicDashboardButton';
-import { useGetPublicDashboardQuery, useUpdatePublicDashboardMutation } from '../../../../api/publicDashboardApi';
 import { useIsDesktop } from '../../../../utils/screen';
 import { ShareModal } from '../../ShareModal';
-import { trackDashboardSharingActionPerType } from '../../analytics';
 import { shareDashboardType } from '../../utils';
 import { NoUpsertPermissionsAlert } from '../ModalAlerts/NoUpsertPermissionsAlert';
 import { SaveDashboardChangesAlert } from '../ModalAlerts/SaveDashboardChangesAlert';
 import { UnsupportedDataSourcesAlert } from '../ModalAlerts/UnsupportedDataSourcesAlert';
 import { UnsupportedTemplateVariablesAlert } from '../ModalAlerts/UnsupportedTemplateVariablesAlert';
-import { dashboardHasTemplateVariables, generatePublicDashboardUrl } from '../SharePublicDashboardUtils';
-import { useGetUnsupportedDataSources } from '../useGetUnsupportedDataSources';
+import {
+  dashboardHasTemplateVariables,
+  generatePublicDashboardUrl,
+  PublicDashboard,
+} from '../SharePublicDashboardUtils';
 
 import { Configuration } from './Configuration';
 import { EmailSharingConfiguration } from './EmailSharingConfiguration';
@@ -46,25 +56,33 @@ export interface ConfigPublicDashboardForm {
   isPaused: boolean;
 }
 
-const ConfigPublicDashboard = () => {
+interface Props {
+  unsupportedDatasources?: string[];
+  showSaveChangesAlert?: boolean;
+  publicDashboard?: PublicDashboard;
+  hasTemplateVariables?: boolean;
+  timeRange: TimeRange;
+  onRevoke: () => void;
+  dashboard: DashboardModel | DashboardScene;
+}
+
+export function ConfigPublicDashboardBase({
+  onRevoke,
+  timeRange,
+  hasTemplateVariables = false,
+  showSaveChangesAlert = false,
+  unsupportedDatasources = [],
+  publicDashboard,
+  dashboard,
+}: Props) {
   const styles = useStyles2(getStyles);
   const isDesktop = useIsDesktop();
-  const { showModal, hideModal } = useContext(ModalsContext);
 
+  const [update, { isLoading }] = useUpdatePublicDashboardMutation();
   const hasWritePermissions = contextSrv.hasPermission(AccessControlAction.DashboardsPublicWrite);
+  const disableInputs = !hasWritePermissions || isLoading;
   const hasEmailSharingEnabled =
     !!config.featureToggles.publicDashboardsEmailSharing && featureEnabled('publicDashboardsEmailSharing');
-  const dashboardState = useSelector((store) => store.dashboard);
-  const dashboard = dashboardState.getModel()!;
-  const dashboardVariables = dashboard.getVariables();
-
-  const { unsupportedDataSources } = useGetUnsupportedDataSources(dashboard);
-
-  const { data: publicDashboard, isFetching: isGetLoading } = useGetPublicDashboardQuery(dashboard.uid);
-  const [update, { isLoading: isUpdateLoading }] = useUpdatePublicDashboardMutation();
-  const isDataLoading = isUpdateLoading || isGetLoading;
-  const disableInputs = !hasWritePermissions || isDataLoading;
-  const timeRange = getTimeRange(dashboard.getDefaultTime(), dashboard);
 
   const { handleSubmit, setValue, register } = useForm<ConfigPublicDashboardForm>({
     defaultValues: {
@@ -74,51 +92,44 @@ const ConfigPublicDashboard = () => {
     },
   });
 
-  const onUpdate = async (values: ConfigPublicDashboardForm) => {
+  const onPublicDashboardUpdate = async (values: ConfigPublicDashboardForm) => {
     const { isAnnotationsEnabled, isTimeSelectionEnabled, isPaused } = values;
 
-    const req = {
-      dashboard,
+    update({
+      dashboard: dashboard,
       payload: {
         ...publicDashboard!,
         annotationsEnabled: isAnnotationsEnabled,
         timeSelectionEnabled: isTimeSelectionEnabled,
         isEnabled: !isPaused,
       },
-    };
-
-    update(req);
+    });
   };
 
   const onChange = async (name: keyof ConfigPublicDashboardForm, value: boolean) => {
     setValue(name, value);
-    await handleSubmit((data) => onUpdate(data))();
-  };
-
-  const onDismissDelete = () => {
-    showModal(ShareModal, {
-      dashboard,
-      onDismiss: hideModal,
-      activeTab: shareDashboardType.publicDashboard,
-    });
+    await handleSubmit((data) => onPublicDashboardUpdate(data))();
   };
 
   function onCopyURL() {
-    trackDashboardSharingActionPerType('copy_public_url', shareDashboardType.publicDashboard);
+    DashboardInteractions.publicDashboardUrlCopied();
   }
 
   return (
     <div className={styles.configContainer}>
-      {hasWritePermissions && dashboard.hasUnsavedChanges() && <SaveDashboardChangesAlert />}
+      {showSaveChangesAlert && <SaveDashboardChangesAlert />}
       {!hasWritePermissions && <NoUpsertPermissionsAlert mode="edit" />}
-      {dashboardHasTemplateVariables(dashboardVariables) && <UnsupportedTemplateVariablesAlert />}
-      {!!unsupportedDataSources.length && (
-        <UnsupportedDataSourcesAlert unsupportedDataSources={unsupportedDataSources.join(', ')} />
+      {hasTemplateVariables && <UnsupportedTemplateVariablesAlert />}
+      {unsupportedDatasources.length > 0 && (
+        <UnsupportedDataSourcesAlert unsupportedDataSources={unsupportedDatasources.join(', ')} />
       )}
 
-      {hasEmailSharingEnabled && <EmailSharingConfiguration />}
+      {hasEmailSharingEnabled && <EmailSharingConfiguration dashboard={dashboard} />}
 
-      <Field label="Dashboard URL" className={styles.fieldSpace}>
+      <Field
+        label={t('public-dashboard.config.dashboard-url-field-label', 'Dashboard URL')}
+        className={styles.fieldSpace}
+      >
         <Input
           value={generatePublicDashboardUrl(publicDashboard!.accessToken!)}
           readOnly
@@ -132,7 +143,7 @@ const ConfigPublicDashboard = () => {
               getText={() => generatePublicDashboardUrl(publicDashboard!.accessToken!)}
               onClipboardCopy={onCopyURL}
             >
-              Copy
+              <Trans i18nKey="public-dashboard.config.copy-button">Copy</Trans>
             </ClipboardButton>
           }
         />
@@ -144,10 +155,9 @@ const ConfigPublicDashboard = () => {
             {...register('isPaused')}
             disabled={disableInputs}
             onChange={(e) => {
-              trackDashboardSharingActionPerType(
-                e.currentTarget.checked ? 'disable_sharing' : 'enable_sharing',
-                shareDashboardType.publicDashboard
-              );
+              DashboardInteractions.publicDashboardPauseSharingClicked({
+                paused: e.currentTarget.checked,
+              });
               onChange('isPaused', e.currentTarget.checked);
             }}
             data-testid={selectors.PauseSwitch}
@@ -157,18 +167,18 @@ const ConfigPublicDashboard = () => {
               margin-bottom: 0;
             `}
           >
-            Pause sharing dashboard
+            <Trans i18nKey="public-dashboard.config.pause-sharing-dashboard-label">Pause sharing dashboard</Trans>
           </Label>
         </Layout>
       </Field>
 
       <Field className={styles.fieldSpace}>
         <SettingsBar
-          title="Settings"
+          title={t('public-dashboard.config.settings-title', 'Settings')}
           headerElement={({ className }) => (
             <SettingsSummary
               className={className}
-              isDataLoading={isDataLoading}
+              isDataLoading={isLoading}
               timeRange={timeRange}
               timeSelectionEnabled={publicDashboard?.timeSelectionEnabled}
               annotationsEnabled={publicDashboard?.annotationsEnabled}
@@ -186,27 +196,73 @@ const ConfigPublicDashboard = () => {
         align={isDesktop ? 'center' : 'normal'}
       >
         <HorizontalGroup justify="flex-end">
-          <DeletePublicDashboardButton
+          <Button
+            title={t('public-dashboard.config.revoke-public-URL-button-title', 'Revoke public URL')}
+            onClick={onRevoke}
             type="button"
             disabled={disableInputs}
             data-testid={selectors.DeleteButton}
-            onDismiss={onDismissDelete}
             variant="destructive"
             fill="outline"
-            dashboard={dashboard}
-            publicDashboard={{
-              uid: publicDashboard!.uid,
-              dashboardUid: dashboard.uid,
-              title: dashboard.title,
-            }}
           >
-            Revoke public URL
-          </DeletePublicDashboardButton>
+            <Trans i18nKey="public-dashboard.config.revoke-public-URL-button">Revoke public URL</Trans>
+          </Button>
         </HorizontalGroup>
       </Layout>
     </div>
   );
-};
+}
+
+interface ConfigPublicDashboardProps {
+  publicDashboard: PublicDashboard;
+  unsupportedDatasources: string[];
+}
+
+export function ConfigPublicDashboard({ publicDashboard, unsupportedDatasources }: ConfigPublicDashboardProps) {
+  const dashboardState = useSelector((store) => store.dashboard);
+  const dashboard = dashboardState.getModel()!;
+  const timeRange = getTimeRange(dashboard.getDefaultTime(), dashboard);
+  const hasWritePermissions = contextSrv.hasPermission(AccessControlAction.DashboardsPublicWrite);
+  const hasTemplateVariables = dashboardHasTemplateVariables(dashboard.getVariables());
+  const [deletePublicDashboard] = useDeletePublicDashboardMutation();
+  const onDeletePublicDashboardClick = (onDelete: () => void) => {
+    deletePublicDashboard({
+      dashboard,
+      uid: publicDashboard!.uid,
+      dashboardUid: dashboard.uid,
+    });
+    onDelete();
+  };
+
+  return (
+    <ModalsController>
+      {({ showModal, hideModal }) => (
+        <ConfigPublicDashboardBase
+          publicDashboard={publicDashboard}
+          dashboard={dashboard}
+          unsupportedDatasources={unsupportedDatasources}
+          timeRange={timeRange}
+          showSaveChangesAlert={hasWritePermissions && dashboard.hasUnsavedChanges()}
+          hasTemplateVariables={hasTemplateVariables}
+          onRevoke={() => {
+            DashboardInteractions.revokePublicDashboardClicked();
+            showModal(DeletePublicDashboardModal, {
+              dashboardTitle: dashboard.title,
+              onConfirm: () => onDeletePublicDashboardClick(hideModal),
+              onDismiss: () => {
+                showModal(ShareModal, {
+                  dashboard,
+                  onDismiss: hideModal,
+                  activeTab: shareDashboardType.publicDashboard,
+                });
+              },
+            });
+          }}
+        />
+      )}
+    </ModalsController>
+  );
+}
 
 const getStyles = (theme: GrafanaTheme2) => ({
   configContainer: css`
@@ -225,5 +281,3 @@ const getStyles = (theme: GrafanaTheme2) => ({
     display: 'inline-block',
   }),
 });
-
-export default ConfigPublicDashboard;
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/Configuration.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/Configuration.tsx
index 230f90d55a780..8a7eeb3e511f2 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/Configuration.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/Configuration.tsx
@@ -5,9 +5,8 @@ import { TimeRange } from '@grafana/data/src';
 import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
 import { FieldSet, Label, Switch, TimeRangeInput, VerticalGroup } from '@grafana/ui/src';
 import { Layout } from '@grafana/ui/src/components/Layout/Layout';
-
-import { trackDashboardSharingActionPerType } from '../../analytics';
-import { shareDashboardType } from '../../utils';
+import { Trans, t } from 'app/core/internationalization';
+import { DashboardInteractions } from 'app/features/dashboard-scene/utils/interactions';
 
 import { ConfigPublicDashboardForm } from './ConfigPublicDashboard';
 
@@ -29,8 +28,15 @@ export const Configuration = ({
       <FieldSet disabled={disabled}>
         <VerticalGroup spacing="md">
           <Layout orientation={1} spacing="xs" justify="space-between">
-            <Label description="The public dashboard uses the default time range settings of the dashboard">
-              Default time range
+            <Label
+              description={t(
+                'public-dashboard.settings-configuration.default-time-range-label-desc',
+                'The public dashboard uses the default time range settings of the dashboard'
+              )}
+            >
+              <Trans i18nKey="public-dashboard.settings-configuration.default-time-range-label">
+                Default time range
+              </Trans>
             </Label>
             <TimeRangeInput value={timeRange} disabled onChange={() => {}} />
           </Layout>
@@ -39,28 +45,42 @@ export const Configuration = ({
               {...register('isTimeSelectionEnabled')}
               data-testid={selectors.EnableTimeRangeSwitch}
               onChange={(e) => {
-                trackDashboardSharingActionPerType(
-                  e.currentTarget.checked ? 'enable_time' : 'disable_time',
-                  shareDashboardType.publicDashboard
-                );
                 onChange('isTimeSelectionEnabled', e.currentTarget.checked);
+                DashboardInteractions.publicDashboardTimeSelectionChanged({
+                  enabled: e.currentTarget.checked,
+                });
               }}
             />
-            <Label description="Allow viewers to change time range">Time range picker enabled</Label>
+            <Label
+              description={t(
+                'public-dashboard.settings-configuration.time-range-picker-label-desc',
+                'Allow viewers to change time range'
+              )}
+            >
+              <Trans i18nKey="public-dashboard.settings-configuration.time-range-picker-label">
+                Time range picker enabled
+              </Trans>
+            </Label>
           </Layout>
           <Layout orientation={0} spacing="sm">
             <Switch
               {...register('isAnnotationsEnabled')}
               onChange={(e) => {
-                trackDashboardSharingActionPerType(
-                  e.currentTarget.checked ? 'enable_annotations' : 'disable_annotations',
-                  shareDashboardType.publicDashboard
-                );
                 onChange('isAnnotationsEnabled', e.currentTarget.checked);
+                DashboardInteractions.publicDashboardAnnotationsSelectionChanged({
+                  enabled: e.currentTarget.checked,
+                });
               }}
               data-testid={selectors.EnableAnnotationsSwitch}
             />
-            <Label description="Show annotations on public dashboard">Show annotations</Label>
+            <Label
+              description={t(
+                'public-dashboard.settings-configuration.show-annotations-label-desc',
+                'Show annotations on public dashboard'
+              )}
+            >
+              <Trans i18nKey="public-dashboard.settings-configuration.show-annotations-label">Show annotations</Trans>
+            </Label>
           </Layout>
         </VerticalGroup>
       </FieldSet>
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/EmailSharingConfiguration.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/EmailSharingConfiguration.tsx
index 5260cae46b823..891531b4eda97 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/EmailSharingConfiguration.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/EmailSharingConfiguration.tsx
@@ -1,21 +1,12 @@
 import { css } from '@emotion/css';
 import React from 'react';
-import { useForm } from 'react-hook-form';
+import { useForm, Controller } from 'react-hook-form';
 import { useWindowSize } from 'react-use';
 
-import { GrafanaTheme2, SelectableValue } from '@grafana/data/src';
-import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
-import { FieldSet } from '@grafana/ui';
-import {
-  Button,
-  ButtonGroup,
-  Field,
-  Input,
-  InputControl,
-  RadioButtonGroup,
-  Spinner,
-  useStyles2,
-} from '@grafana/ui/src';
+import { GrafanaTheme2, SelectableValue } from '@grafana/data';
+import { selectors as e2eSelectors } from '@grafana/e2e-selectors';
+import { FieldSet, Button, ButtonGroup, Field, Input, RadioButtonGroup, Spinner, useStyles2 } from '@grafana/ui';
+import { Trans, t } from 'app/core/internationalization';
 import { contextSrv } from 'app/core/services/context_srv';
 import {
   useAddRecipientMutation,
@@ -24,10 +15,11 @@ import {
   useReshareAccessToRecipientMutation,
   useUpdatePublicDashboardMutation,
 } from 'app/features/dashboard/api/publicDashboardApi';
-import { AccessControlAction, useSelector } from 'app/types';
+import { DashboardModel } from 'app/features/dashboard/state/DashboardModel';
+import { DashboardScene } from 'app/features/dashboard-scene/scene/DashboardScene';
+import { DashboardInteractions } from 'app/features/dashboard-scene/utils/interactions';
+import { AccessControlAction } from 'app/types';
 
-import { trackDashboardSharingActionPerType } from '../../analytics';
-import { shareDashboardType } from '../../utils';
 import { PublicDashboard, PublicDashboardShareType, validEmailRegex } from '../SharePublicDashboardUtils';
 
 interface EmailSharingConfigurationForm {
@@ -35,11 +27,6 @@ interface EmailSharingConfigurationForm {
   email: string;
 }
 
-const options: Array<SelectableValue<PublicDashboardShareType>> = [
-  { label: 'Anyone with a link', value: PublicDashboardShareType.PUBLIC },
-  { label: 'Only specified people', value: PublicDashboardShareType.EMAIL },
-];
-
 const selectors = e2eSelectors.pages.ShareDashboardModal.PublicDashboard.EmailSharingConfiguration;
 
 const EmailList = ({
@@ -57,13 +44,13 @@ const EmailList = ({
 
   const isLoading = isDeleteLoading || isReshareLoading;
 
-  const onDeleteEmail = (recipientUid: string) => {
-    trackDashboardSharingActionPerType('delete_email', shareDashboardType.publicDashboard);
-    deleteEmail({ recipientUid, dashboardUid: dashboardUid, uid: publicDashboardUid });
+  const onDeleteEmail = (recipientUid: string, recipientEmail: string) => {
+    DashboardInteractions.revokePublicDashboardEmailClicked();
+    deleteEmail({ recipientUid, recipientEmail, dashboardUid: dashboardUid, uid: publicDashboardUid });
   };
 
   const onReshare = (recipientUid: string) => {
-    trackDashboardSharingActionPerType('reshare_email', shareDashboardType.publicDashboard);
+    DashboardInteractions.resendPublicDashboardEmailClicked();
     reshareAccess({ recipientUid, uid: publicDashboardUid });
   };
 
@@ -79,27 +66,25 @@ const EmailList = ({
                   type="button"
                   variant="destructive"
                   fill="text"
-                  aria-label="Revoke"
-                  title="Revoke"
+                  title={t('public-dashboard.email-sharing.revoke-button-title', 'Revoke')}
                   size="sm"
                   disabled={isLoading}
-                  onClick={() => onDeleteEmail(recipient.uid)}
+                  onClick={() => onDeleteEmail(recipient.uid, recipient.recipient)}
                   data-testid={`${selectors.DeleteEmail}-${idx}`}
                 >
-                  Revoke
+                  <Trans i18nKey="public-dashboard.email-sharing.revoke-button">Revoke</Trans>
                 </Button>
                 <Button
                   type="button"
                   variant="primary"
                   fill="text"
-                  aria-label="Resend"
-                  title="Resend"
+                  title={t('public-dashboard.email-sharing.resend-button-title', 'Resend')}
                   size="sm"
                   disabled={isLoading}
                   onClick={() => onReshare(recipient.uid)}
                   data-testid={`${selectors.ReshareLink}-${idx}`}
                 >
-                  Resend
+                  <Trans i18nKey="public-dashboard.email-sharing.resend-button">Resend</Trans>
                 </Button>
               </ButtonGroup>
             </td>
@@ -110,13 +95,12 @@ const EmailList = ({
   );
 };
 
-export const EmailSharingConfiguration = () => {
+export const EmailSharingConfiguration = ({ dashboard }: { dashboard: DashboardModel | DashboardScene }) => {
   const { width } = useWindowSize();
   const styles = useStyles2(getStyles);
-  const dashboardState = useSelector((store) => store.dashboard);
-  const dashboard = dashboardState.getModel()!;
 
-  const { data: publicDashboard } = useGetPublicDashboardQuery(dashboard.uid);
+  const dashboardUid = dashboard instanceof DashboardScene ? dashboard.state.uid : dashboard.uid;
+  const { data: publicDashboard } = useGetPublicDashboardQuery(dashboardUid);
   const [updateShareType] = useUpdatePublicDashboardMutation();
   const [addEmail, { isLoading: isAddEmailLoading }] = useAddRecipientMutation();
 
@@ -151,31 +135,42 @@ export const EmailSharingConfiguration = () => {
   };
 
   const onSubmit = async (data: EmailSharingConfigurationForm) => {
-    //TODO: add if it's domain or not when developed.
-    trackDashboardSharingActionPerType('invite_email', shareDashboardType.publicDashboard);
-    await addEmail({ recipient: data.email, uid: publicDashboard!.uid, dashboardUid: dashboard.uid }).unwrap();
+    DashboardInteractions.publicDashboardEmailInviteClicked();
+    await addEmail({ recipient: data.email, uid: publicDashboard!.uid, dashboardUid }).unwrap();
     reset({ email: '', shareType: PublicDashboardShareType.EMAIL });
   };
 
   return (
     <form onSubmit={handleSubmit(onSubmit)}>
       <FieldSet disabled={!hasWritePermissions} data-testid={selectors.Container} className={styles.container}>
-        <Field label="Can view dashboard" className={styles.field}>
-          <InputControl
+        <Field
+          label={t('public-dashboard.config.can-view-dashboard-radio-button-label', 'Can view dashboard')}
+          className={styles.field}
+        >
+          <Controller
             name="shareType"
             control={control}
             render={({ field }) => {
               const { ref, ...rest } = field;
+              const options: Array<SelectableValue<PublicDashboardShareType>> = [
+                {
+                  label: t('public-dashboard.config.public-share-type-option-label', 'Anyone with a link'),
+                  value: PublicDashboardShareType.PUBLIC,
+                },
+                {
+                  label: t('public-dashboard.config.email-share-type-option-label', 'Only specified people'),
+                  value: PublicDashboardShareType.EMAIL,
+                },
+              ];
               return (
                 <RadioButtonGroup
                   {...rest}
                   size={width < 480 ? 'sm' : 'md'}
                   options={options}
                   onChange={(shareType: PublicDashboardShareType) => {
-                    trackDashboardSharingActionPerType(
-                      `share_type_${shareType === PublicDashboardShareType.EMAIL ? 'email' : 'public'}`,
-                      shareDashboardType.publicDashboard
-                    );
+                    DashboardInteractions.publicDashboardShareTypeChange({
+                      shareType: shareType === PublicDashboardShareType.EMAIL ? 'email' : 'public',
+                    });
                     setValue('shareType', shareType);
                     onUpdateShareType(shareType);
                   }}
@@ -187,8 +182,8 @@ export const EmailSharingConfiguration = () => {
         {watch('shareType') === PublicDashboardShareType.EMAIL && (
           <>
             <Field
-              label="Invite"
-              description="Invite people by email"
+              label={t('public-dashboard.email-sharing.invite-field-label', 'Invite')}
+              description={t('public-dashboard.email-sharing.invite-field-desc', 'Invite people by email')}
               error={errors.email?.message}
               invalid={!!errors.email?.message || undefined}
               className={styles.field}
@@ -199,8 +194,11 @@ export const EmailSharingConfiguration = () => {
                   placeholder="email"
                   autoCapitalize="none"
                   {...register('email', {
-                    required: 'Email is required',
-                    pattern: { value: validEmailRegex, message: 'Invalid email' },
+                    required: t('public-dashboard.email-sharing.input-required-email-text', 'Email is required'),
+                    pattern: {
+                      value: validEmailRegex,
+                      message: t('public-dashboard.email-sharing.input-invalid-email-text', 'Invalid email'),
+                    },
                   })}
                   data-testid={selectors.EmailSharingInput}
                 />
@@ -210,14 +208,15 @@ export const EmailSharingConfiguration = () => {
                   disabled={isAddEmailLoading}
                   data-testid={selectors.EmailSharingInviteButton}
                 >
-                  Invite {isAddEmailLoading && <Spinner />}
+                  <Trans i18nKey="public-dashboard.email-sharing.invite-button">Invite</Trans>
+                  {isAddEmailLoading && <Spinner />}
                 </Button>
               </div>
             </Field>
             {!!publicDashboard?.recipients?.length && (
               <EmailList
                 recipients={publicDashboard.recipients}
-                dashboardUid={dashboard.uid}
+                dashboardUid={dashboardUid}
                 publicDashboardUid={publicDashboard.uid}
               />
             )}
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/SettingsBarHeader.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/SettingsBarHeader.tsx
index 66150a33b9925..cb74d7bc546ef 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/SettingsBarHeader.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/SettingsBarHeader.tsx
@@ -3,6 +3,7 @@ import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { IconButton, ReactUtils, useStyles2 } from '@grafana/ui';
+import { t } from 'app/core/internationalization';
 
 export interface Props {
   onRowToggle: () => void;
@@ -22,7 +23,11 @@ export function SettingsBarHeader({ headerElement, isContentVisible = false, onR
       <div className={styles.header}>
         <IconButton
           name={isContentVisible ? 'angle-down' : 'angle-right'}
-          tooltip={isContentVisible ? 'Collapse settings' : 'Expand settings'}
+          tooltip={
+            isContentVisible
+              ? t('public-dashboard.settings-bar-header.collapse-settings-tooltip', 'Collapse settings')
+              : t('public-dashboard.settings-bar-header.expand-settings-tooltip', 'Expand settings')
+          }
           className={styles.collapseIcon}
           onClick={onRowToggle}
           aria-expanded={isContentVisible}
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/SettingsSummary.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/SettingsSummary.tsx
index cd1ab210692a5..f8fb436d04219 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/SettingsSummary.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/SettingsSummary.tsx
@@ -3,6 +3,7 @@ import React from 'react';
 
 import { GrafanaTheme2, TimeRange } from '@grafana/data';
 import { Spinner, TimeRangeLabel, useStyles2 } from '@grafana/ui';
+import { Trans, t } from 'app/core/internationalization';
 
 export interface Props {
   timeRange: TimeRange;
@@ -21,6 +22,23 @@ export function SettingsSummary({
 }: Props) {
   const styles = useStyles2(getStyles);
 
+  const translatedTimeRangePickerEnabledStatus = t(
+    'public-dashboard.settings-summary.time-range-picker-enabled-text',
+    'Time range picker = enabled'
+  );
+  const translatedTimeRangePickerDisabledStatus = t(
+    'public-dashboard.settings-summary.time-range-picker-disabled-text',
+    'Time range picker = disabled'
+  );
+  const translatedAnnotationShownStatus = t(
+    'public-dashboard.settings-summary.annotations-show-text',
+    'Annotations = show'
+  );
+  const translatedAnnotationHiddenStatus = t(
+    'public-dashboard.settings-summary.annotations-hide-text',
+    'Annotations = hide'
+  );
+
   return isDataLoading ? (
     <div className={cx(styles.summaryWrapper, className)}>
       <Spinner className={styles.summary} inline={true} size="sm" />
@@ -28,11 +46,15 @@ export function SettingsSummary({
   ) : (
     <div className={cx(styles.summaryWrapper, className)}>
       <span className={styles.summary}>
-        {'Time range = '}
+        <Trans i18nKey="public-dashboard.settings-summary.time-range-text">Time range = </Trans>
         <TimeRangeLabel className={styles.timeRange} value={timeRange} />
       </span>
-      <span className={styles.summary}>{`Time range picker = ${timeSelectionEnabled ? 'enabled' : 'disabled'}`}</span>
-      <span className={styles.summary}>{`Annotations = ${annotationsEnabled ? 'show' : 'hide'}`}</span>
+      <span className={styles.summary}>
+        {timeSelectionEnabled ? translatedTimeRangePickerEnabledStatus : translatedTimeRangePickerDisabledStatus}
+      </span>
+      <span className={styles.summary}>
+        {annotationsEnabled ? translatedAnnotationShownStatus : translatedAnnotationHiddenStatus}
+      </span>
     </div>
   );
 }
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/CreatePublicDashboard/AcknowledgeCheckboxes.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/CreatePublicDashboard/AcknowledgeCheckboxes.tsx
index 46c1f8f396b38..a00e20809e19c 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/CreatePublicDashboard/AcknowledgeCheckboxes.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/CreatePublicDashboard/AcknowledgeCheckboxes.tsx
@@ -5,6 +5,7 @@ import { UseFormRegister } from 'react-hook-form';
 import { GrafanaTheme2 } from '@grafana/data/src';
 import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
 import { Checkbox, FieldSet, HorizontalGroup, LinkButton, useStyles2, VerticalGroup } from '@grafana/ui/src';
+import { t, Trans } from 'app/core/internationalization';
 
 import { SharePublicDashboardAcknowledgmentInputs } from './CreatePublicDashboard';
 
@@ -19,36 +20,6 @@ type Acknowledge = {
 };
 const selectors = e2eSelectors.pages.ShareDashboardModal.PublicDashboard;
 
-const ACKNOWLEDGES: Acknowledge[] = [
-  {
-    type: 'publicAcknowledgment',
-    description: 'Your entire dashboard will be public*',
-    testId: selectors.WillBePublicCheckbox,
-    info: {
-      href: 'https://grafana.com/docs/grafana/latest/dashboards/dashboard-public/',
-      tooltip: 'Learn more about public dashboards',
-    },
-  },
-  {
-    type: 'dataSourcesAcknowledgment',
-    description: 'Publishing currently only works with a subset of data sources*',
-    testId: selectors.LimitedDSCheckbox,
-    info: {
-      href: 'https://grafana.com/docs/grafana/latest/datasources/',
-      tooltip: 'Learn more about public datasources',
-    },
-  },
-  {
-    type: 'usageAcknowledgment',
-    description: 'Making a dashboard public will cause queries to run each time is viewed, which may increase costs*',
-    testId: selectors.CostIncreaseCheckbox,
-    info: {
-      href: 'https://grafana.com/docs/grafana/latest/enterprise/query-caching/',
-      tooltip: 'Learn more about query caching',
-    },
-  },
-];
-
 export const AcknowledgeCheckboxes = ({
   disabled,
   register,
@@ -57,10 +28,61 @@ export const AcknowledgeCheckboxes = ({
   register: UseFormRegister<SharePublicDashboardAcknowledgmentInputs>;
 }) => {
   const styles = useStyles2(getStyles);
+  const ACKNOWLEDGES: Acknowledge[] = [
+    {
+      type: 'publicAcknowledgment',
+      description: t(
+        'public-dashboard.acknowledgment-checkboxes.public-ack-desc',
+        'Your entire dashboard will be public*'
+      ),
+      testId: selectors.WillBePublicCheckbox,
+      info: {
+        href: 'https://grafana.com/docs/grafana/latest/dashboards/dashboard-public/',
+        tooltip: t(
+          'public-dashboard.acknowledgment-checkboxes.public-ack-tooltip',
+          'Learn more about public dashboards'
+        ),
+      },
+    },
+    {
+      type: 'dataSourcesAcknowledgment',
+      description: t(
+        'public-dashboard.acknowledgment-checkboxes.data-src-ack-desc',
+        'Publishing currently only works with a subset of data sources*'
+      ),
+      testId: selectors.LimitedDSCheckbox,
+      info: {
+        href: 'https://grafana.com/docs/grafana/latest/datasources/',
+        tooltip: t(
+          'public-dashboard.acknowledgment-checkboxes.data-src-ack-tooltip',
+          'Learn more about public datasources'
+        ),
+      },
+    },
+    {
+      type: 'usageAcknowledgment',
+      description: t(
+        'public-dashboard.acknowledgment-checkboxes.usage-ack-desc',
+        'Making a dashboard public will cause queries to run each time it is viewed, which may increase costs*'
+      ),
+      testId: selectors.CostIncreaseCheckbox,
+      info: {
+        href: 'https://grafana.com/docs/grafana/latest/enterprise/query-caching/',
+        tooltip: t(
+          'public-dashboard.acknowledgment-checkboxes.usage-ack-desc-tooltip',
+          'Learn more about query caching'
+        ),
+      },
+    },
+  ];
 
   return (
     <>
-      <p className={styles.title}>Before you make the dashboard public, acknowledge the following:</p>
+      <p className={styles.title}>
+        <Trans i18nKey="public-dashboard.acknowledgment-checkboxes.ack-title">
+          Before you make the dashboard public, acknowledge the following:
+        </Trans>
+      </p>
       <FieldSet disabled={disabled}>
         <VerticalGroup spacing="md">
           {ACKNOWLEDGES.map((acknowledge) => (
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/CreatePublicDashboard/CreatePublicDashboard.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/CreatePublicDashboard/CreatePublicDashboard.tsx
index 6cee539c1932b..241949ae6ea88 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/CreatePublicDashboard/CreatePublicDashboard.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/CreatePublicDashboard/CreatePublicDashboard.tsx
@@ -1,16 +1,18 @@
 import { css } from '@emotion/css';
 import React from 'react';
-import { FormState, UseFormRegister } from 'react-hook-form';
+import { useForm } from 'react-hook-form';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { selectors as e2eSelectors } from '@grafana/e2e-selectors';
+import { Button, Spinner, useStyles2 } from '@grafana/ui';
+import { Trans } from 'app/core/internationalization';
+import { contextSrv } from 'app/core/services/context_srv';
+import { useCreatePublicDashboardMutation } from 'app/features/dashboard/api/publicDashboardApi';
+import { DashboardModel } from 'app/features/dashboard/state';
+import { DashboardScene } from 'app/features/dashboard-scene/scene/DashboardScene';
+import { DashboardInteractions } from 'app/features/dashboard-scene/utils/interactions';
+import { AccessControlAction, useSelector } from 'app/types';
 
-import { GrafanaTheme2 } from '@grafana/data/src';
-import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
-import { Button, Form, Spinner, useStyles2 } from '@grafana/ui/src';
-
-import { contextSrv } from '../../../../../../core/services/context_srv';
-import { AccessControlAction, useSelector } from '../../../../../../types';
-import { useCreatePublicDashboardMutation } from '../../../../api/publicDashboardApi';
-import { trackDashboardSharingActionPerType } from '../../analytics';
-import { shareDashboardType } from '../../utils';
 import { NoUpsertPermissionsAlert } from '../ModalAlerts/NoUpsertPermissionsAlert';
 import { UnsupportedDataSourcesAlert } from '../ModalAlerts/UnsupportedDataSourcesAlert';
 import { UnsupportedTemplateVariablesAlert } from '../ModalAlerts/UnsupportedTemplateVariablesAlert';
@@ -27,61 +29,86 @@ export type SharePublicDashboardAcknowledgmentInputs = {
   usageAcknowledgment: boolean;
 };
 
-const CreatePublicDashboard = ({ isError }: { isError: boolean }) => {
+interface CreatePublicDashboarBaseProps {
+  unsupportedDatasources?: string[];
+  unsupportedTemplateVariables?: boolean;
+  dashboard: DashboardModel | DashboardScene;
+  hasError?: boolean;
+}
+
+export const CreatePublicDashboardBase = ({
+  unsupportedDatasources = [],
+  unsupportedTemplateVariables = false,
+  dashboard,
+  hasError = false,
+}: CreatePublicDashboarBaseProps) => {
   const styles = useStyles2(getStyles);
   const hasWritePermissions = contextSrv.hasPermission(AccessControlAction.DashboardsPublicWrite);
-  const dashboardState = useSelector((store) => store.dashboard);
-  const dashboard = dashboardState.getModel()!;
-
-  const { unsupportedDataSources } = useGetUnsupportedDataSources(dashboard);
-  const [createPublicDashboard, { isLoading: isSaveLoading }] = useCreatePublicDashboardMutation();
-
-  const disableInputs = !hasWritePermissions || isSaveLoading || isError;
-
-  const onCreate = async () => {
-    trackDashboardSharingActionPerType('generate_public_url', shareDashboardType.publicDashboard);
+  const [createPublicDashboard, { isLoading, isError }] = useCreatePublicDashboardMutation();
+  const onCreate = () => {
     createPublicDashboard({ dashboard, payload: { isEnabled: true } });
+    DashboardInteractions.generatePublicDashboardUrlClicked({});
   };
+  const {
+    handleSubmit,
+    register,
+    formState: { isValid },
+  } = useForm<SharePublicDashboardAcknowledgmentInputs>({ mode: 'onChange' });
+
+  const disableInputs = !hasWritePermissions || isLoading || isError || hasError;
 
   return (
     <div className={styles.container}>
       <div>
-        <p className={styles.title}>Welcome to public dashboards!</p>
-        <p className={styles.description}>Currently, we don’t support template variables or frontend data sources</p>
+        <p className={styles.title}>
+          <Trans i18nKey="public-dashboard.create-page.welcome-title">Welcome to public dashboards!</Trans>
+        </p>
+        <p className={styles.description}>
+          <Trans i18nKey="public-dashboard.create-page.unsupported-features-desc">
+            Currently, we don’t support template variables or frontend data sources
+          </Trans>
+        </p>
       </div>
 
       {!hasWritePermissions && <NoUpsertPermissionsAlert mode="create" />}
 
-      {dashboardHasTemplateVariables(dashboard.getVariables()) && <UnsupportedTemplateVariablesAlert />}
+      {unsupportedTemplateVariables && <UnsupportedTemplateVariablesAlert />}
 
-      {!!unsupportedDataSources.length && (
-        <UnsupportedDataSourcesAlert unsupportedDataSources={unsupportedDataSources.join(', ')} />
+      {unsupportedDatasources.length > 0 && (
+        <UnsupportedDataSourcesAlert unsupportedDataSources={unsupportedDatasources.join(', ')} />
       )}
 
-      <Form onSubmit={onCreate} validateOn="onChange" maxWidth="none">
-        {({
-          register,
-          formState: { isValid },
-        }: {
-          register: UseFormRegister<SharePublicDashboardAcknowledgmentInputs>;
-          formState: FormState<SharePublicDashboardAcknowledgmentInputs>;
-        }) => (
-          <>
-            <div className={styles.checkboxes}>
-              <AcknowledgeCheckboxes disabled={disableInputs} register={register} />
-            </div>
-            <div className={styles.buttonContainer}>
-              <Button type="submit" disabled={disableInputs || !isValid} data-testid={selectors.CreateButton}>
-                Generate public URL {isSaveLoading && <Spinner className={styles.loadingSpinner} />}
-              </Button>
-            </div>
-          </>
-        )}
-      </Form>
+      <form onSubmit={handleSubmit(onCreate)}>
+        <div className={styles.checkboxes}>
+          <AcknowledgeCheckboxes disabled={disableInputs} register={register} />
+        </div>
+        <div className={styles.buttonContainer}>
+          <Button type="submit" disabled={disableInputs || !isValid} data-testid={selectors.CreateButton}>
+            <Trans i18nKey="public-dashboard.create-page.generate-public-url-button">Generate public URL</Trans>
+            {isLoading && <Spinner className={styles.loadingSpinner} />}
+          </Button>
+        </div>
+      </form>
     </div>
   );
 };
 
+export function CreatePublicDashboard({ hasError }: { hasError?: boolean }) {
+  const dashboardState = useSelector((store) => store.dashboard);
+  const dashboard = dashboardState.getModel()!;
+  const { unsupportedDataSources } = useGetUnsupportedDataSources(dashboard);
+  const hasTemplateVariables = dashboardHasTemplateVariables(dashboard.getVariables());
+
+  return (
+    <CreatePublicDashboardBase
+      dashboard={dashboard}
+      unsupportedDatasources={unsupportedDataSources}
+      unsupportedTemplateVariables={hasTemplateVariables}
+      hasError={hasError}
+    />
+  );
+}
+
 const getStyles = (theme: GrafanaTheme2) => ({
   container: css`
     display: flex;
@@ -107,5 +134,3 @@ const getStyles = (theme: GrafanaTheme2) => ({
     margin-left: ${theme.spacing(1)};
   `,
 });
-
-export default CreatePublicDashboard;
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/NoUpsertPermissionsAlert.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/NoUpsertPermissionsAlert.tsx
index b850893291d1b..198a0fdbe6377 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/NoUpsertPermissionsAlert.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/NoUpsertPermissionsAlert.tsx
@@ -2,16 +2,23 @@ import React from 'react';
 
 import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
 import { Alert } from '@grafana/ui/src';
+import { Trans, t } from 'app/core/internationalization';
 
 const selectors = e2eSelectors.pages.ShareDashboardModal.PublicDashboard;
 
 export const NoUpsertPermissionsAlert = ({ mode }: { mode: 'create' | 'edit' }) => (
   <Alert
     severity="info"
-    title={`You don’t have permission to ${mode} a public dashboard`}
+    title={t(
+      'public-dashboard.modal-alerts.no-upsert-perm-alert-title',
+      'You don’t have permission to {{ mode }} a public dashboard',
+      { mode }
+    )}
     data-testid={selectors.NoUpsertPermissionsWarningAlert}
     bottomSpacing={0}
   >
-    Contact your admin to get permission to {mode} create public dashboards
+    <Trans i18nKey="public-dashboard.modal-alerts.no-upsert-perm-alert-desc">
+      Contact your admin to get permission to {{ mode }} public dashboards
+    </Trans>
   </Alert>
 );
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/SaveDashboardChangesAlert.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/SaveDashboardChangesAlert.tsx
index 3eb5d681d8ada..4534754c8dd63 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/SaveDashboardChangesAlert.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/SaveDashboardChangesAlert.tsx
@@ -1,10 +1,14 @@
 import React from 'react';
 
 import { Alert } from '@grafana/ui/src';
+import { t } from 'app/core/internationalization';
 
 export const SaveDashboardChangesAlert = () => (
   <Alert
-    title="Please save your dashboard changes before updating the public configuration"
+    title={t(
+      'public-dashboard.modal-alerts.save-dashboard-changes-alert-title',
+      'Please save your dashboard changes before updating the public configuration'
+    )}
     severity="warning"
     bottomSpacing={0}
   />
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/UnsupportedDataSourcesAlert.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/UnsupportedDataSourcesAlert.tsx
index 5a81e84764c22..20edf3983166f 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/UnsupportedDataSourcesAlert.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/UnsupportedDataSourcesAlert.tsx
@@ -5,6 +5,7 @@ import React from 'react';
 import { GrafanaTheme2 } from '@grafana/data/src';
 import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
 import { Alert, useStyles2 } from '@grafana/ui/src';
+import { Trans, t } from 'app/core/internationalization';
 
 const selectors = e2eSelectors.pages.ShareDashboardModal.PublicDashboard;
 
@@ -14,19 +15,23 @@ export const UnsupportedDataSourcesAlert = ({ unsupportedDataSources }: { unsupp
   return (
     <Alert
       severity="warning"
-      title="Unsupported data sources"
+      title={t('public-dashboard.modal-alerts.unsupported-data-source-alert-title', 'Unsupported data sources')}
       data-testid={selectors.UnsupportedDataSourcesWarningAlert}
       bottomSpacing={0}
     >
       <p className={styles.unsupportedDataSourceDescription}>
-        There are data sources in this dashboard that are unsupported for public dashboards. Panels that use these data
-        sources may not function properly: {unsupportedDataSources}.
+        <Trans i18nKey="public-dashboard.modal-alerts.unsupported-data-source-alert-desc">
+          There are data sources in this dashboard that are unsupported for public dashboards. Panels that use these
+          data sources may not function properly: {{ unsupportedDataSources }}.
+        </Trans>
       </p>
       <a
         href="https://grafana.com/docs/grafana/next/dashboards/dashboard-public/"
         className={cx('text-link', styles.unsupportedDataSourceDescription)}
       >
-        Read more about supported data sources
+        <Trans i18nKey="public-dashboard.modal-alerts.unsupport-data-source-alert-readmore-link">
+          Read more about supported data sources
+        </Trans>
       </a>
     </Alert>
   );
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/UnsupportedTemplateVariablesAlert.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/UnsupportedTemplateVariablesAlert.tsx
index 74fe2f910da4b..a8cc47ccc1f6e 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/UnsupportedTemplateVariablesAlert.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/UnsupportedTemplateVariablesAlert.tsx
@@ -2,16 +2,22 @@ import React from 'react';
 
 import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
 import { Alert } from '@grafana/ui/src';
+import { Trans, t } from 'app/core/internationalization';
 
 const selectors = e2eSelectors.pages.ShareDashboardModal.PublicDashboard;
 
 export const UnsupportedTemplateVariablesAlert = () => (
   <Alert
     severity="warning"
-    title="Template variables are not supported"
+    title={t(
+      'public-dashboard.modal-alerts.unsupported-template-variable-alert-title',
+      'Template variables are not supported'
+    )}
     data-testid={selectors.TemplateVariablesWarningAlert}
     bottomSpacing={0}
   >
-    This public dashboard may not work since it uses template variables
+    <Trans i18nKey="public-dashboard.modal-alerts.unsupported-template-variable-alert-desc">
+      This public dashboard may not work since it uses template variables
+    </Trans>
   </Alert>
 );
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx
index c0eabd9428759..56970d1487fe8 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx
@@ -1,20 +1,20 @@
+import 'whatwg-fetch';
 import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { rest } from 'msw';
+import { http, HttpResponse } from 'msw';
 import { setupServer } from 'msw/node';
 
-import 'whatwg-fetch';
 import { BootData, DataQuery } from '@grafana/data/src';
 import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
-import { setEchoSrv } from '@grafana/runtime';
+import { reportInteraction, setEchoSrv } from '@grafana/runtime';
 import { Panel } from '@grafana/schema';
 import config from 'app/core/config';
 import { backendSrv } from 'app/core/services/backend_srv';
 import { contextSrv } from 'app/core/services/context_srv';
 import { Echo } from 'app/core/services/echo/Echo';
 import { createDashboardModelFixture } from 'app/features/dashboard/state/__fixtures__/dashboardFixtures';
+import { DashboardInteractions } from 'app/features/dashboard-scene/utils/interactions';
 
-import { trackDashboardSharingTypeOpen, trackDashboardSharingActionPerType } from '../analytics';
 import { shareDashboardType } from '../utils';
 
 import * as sharePublicDashboardUtils from './SharePublicDashboardUtils';
@@ -30,12 +30,14 @@ const server = setupServer();
 jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
   getBackendSrv: () => backendSrv,
+  reportInteraction: jest.fn(),
 }));
 
-jest.mock('../analytics', () => ({
-  ...jest.requireActual('../analytics'),
-  trackDashboardSharingTypeOpen: jest.fn(),
-  trackDashboardSharingActionPerType: jest.fn(),
+jest.mock('app/features/dashboard-scene/utils/interactions', () => ({
+  DashboardInteractions: {
+    ...jest.requireActual('app/features/dashboard-scene/utils/interactions').DashboardInteractions,
+    sharingTabChanged: jest.fn(),
+  },
 }));
 
 const selectors = e2eSelectors.pages.ShareDashboardModal.PublicDashboard;
@@ -68,6 +70,7 @@ beforeAll(() => {
 
 beforeEach(() => {
   config.featureToggles.publicDashboards = true;
+  config.publicDashboardsEnabled = true;
 
   jest.spyOn(contextSrv, 'hasPermission').mockReturnValue(true);
   jest.spyOn(contextSrv, 'hasRole').mockReturnValue(true);
@@ -84,20 +87,27 @@ afterEach(() => {
 });
 
 const getNonExistentPublicDashboardResponse = () =>
-  rest.get('/api/dashboards/uid/:dashboardUid/public-dashboards', (req, res, ctx) => {
-    return res(
-      ctx.status(404),
-      ctx.json({
+  http.get('/api/dashboards/uid/:dashboardUid/public-dashboards', () => {
+    return HttpResponse.json(
+      {
         message: 'Public dashboard not found',
         messageId: 'publicdashboards.notFound',
         statusCode: 404,
         traceID: '',
-      })
+      },
+      {
+        status: 404,
+      }
     );
   });
 const getErrorPublicDashboardResponse = () =>
-  rest.get('/api/dashboards/uid/:dashboardUid/public-dashboards', (req, res, ctx) => {
-    return res(ctx.status(500));
+  http.get('/api/dashboards/uid/:dashboardUid/public-dashboards', () => {
+    return HttpResponse.json(
+      {},
+      {
+        status: 500,
+      }
+    );
   });
 
 const alertTests = () => {
@@ -135,7 +145,14 @@ describe('SharePublic', () => {
   beforeEach(() => {
     server.use(getExistentPublicDashboardResponse());
   });
-  it('does not render share panel when public dashboards feature is disabled', async () => {
+  it('does not render share panel when public dashboards feature is disabled using config setting', async () => {
+    config.publicDashboardsEnabled = false;
+    await renderSharePublicDashboard(undefined, false);
+
+    expect(screen.getByRole('tablist')).toHaveTextContent('Link');
+    expect(screen.getByRole('tablist')).not.toHaveTextContent('Public dashboard');
+  });
+  it('does not render share panel when public dashboards feature is disabled using feature toggle', async () => {
     config.featureToggles.publicDashboards = false;
     await renderSharePublicDashboard(undefined, false);
 
@@ -267,14 +284,11 @@ describe('SharePublic - Already persisted', () => {
   });
   it('when modal is opened, then time range switch is enabled and not checked when its not checked in the db', async () => {
     server.use(
-      rest.get('/api/dashboards/uid/:dashboardUid/public-dashboards', (req, res, ctx) => {
-        return res(
-          ctx.status(200),
-          ctx.json({
-            ...pubdashResponse,
-            timeSelectionEnabled: false,
-          })
-        );
+      http.get('/api/dashboards/uid/:dashboardUid/public-dashboards', () => {
+        return HttpResponse.json({
+          ...pubdashResponse,
+          timeSelectionEnabled: false,
+        });
       })
     );
 
@@ -293,17 +307,16 @@ describe('SharePublic - Already persisted', () => {
   });
   it('when pubdash is disabled in the db, then link url is not copyable and switch is checked', async () => {
     server.use(
-      rest.get('/api/dashboards/uid/:dashboardUid/public-dashboards', (req, res, ctx) => {
-        return res(
-          ctx.status(200),
-          ctx.json({
-            isEnabled: false,
-            annotationsEnabled: false,
-            uid: 'a-uid',
-            dashboardUid: req.params.dashboardUid,
-            accessToken: 'an-access-token',
-          })
-        );
+      http.get('/api/dashboards/uid/:dashboardUid/public-dashboards', ({ request }) => {
+        const url = new URL(request.url);
+        const dashboardUid = url.searchParams.get('dashboardUid');
+        return HttpResponse.json({
+          isEnabled: false,
+          annotationsEnabled: false,
+          uid: 'a-uid',
+          dashboardUid,
+          accessToken: 'an-access-token',
+        });
       })
     );
 
@@ -329,15 +342,14 @@ describe('SharePublic - Report interactions', () => {
     jest.clearAllMocks();
     server.use(getExistentPublicDashboardResponse());
     server.use(
-      rest.patch('/api/dashboards/uid/:dashboardUid/public-dashboards/:uid', (req, res, ctx) =>
-        res(
-          ctx.status(200),
-          ctx.json({
-            ...pubdashResponse,
-            dashboardUid: req.params.dashboardUid,
-          })
-        )
-      )
+      http.patch('/api/dashboards/uid/:dashboardUid/public-dashboards/:uid', ({ request }) => {
+        const url = new URL(request.url);
+        const dashboardUid = url.searchParams.get('dashboardUid');
+        return HttpResponse.json({
+          ...pubdashResponse,
+          dashboardUid,
+        });
+      })
     );
   });
 
@@ -345,8 +357,8 @@ describe('SharePublic - Report interactions', () => {
     await renderSharePublicDashboard();
 
     await waitFor(() => {
-      expect(trackDashboardSharingTypeOpen).toHaveBeenCalledTimes(1);
-      expect(trackDashboardSharingTypeOpen).lastCalledWith(shareDashboardType.publicDashboard);
+      expect(DashboardInteractions.sharingTabChanged).toHaveBeenCalledTimes(1);
+      expect(DashboardInteractions.sharingTabChanged).lastCalledWith({ item: shareDashboardType.publicDashboard });
     });
   });
 
@@ -360,12 +372,10 @@ describe('SharePublic - Report interactions', () => {
     await userEvent.click(screen.getByTestId(selectors.EnableTimeRangeSwitch));
 
     await waitFor(() => {
-      expect(trackDashboardSharingActionPerType).toHaveBeenCalledTimes(1);
-      // if time range was enabled, then the item is now disable_time
-      expect(trackDashboardSharingActionPerType).toHaveBeenLastCalledWith(
-        pubdashResponse.timeSelectionEnabled ? 'disable_time' : 'enable_time',
-        shareDashboardType.publicDashboard
-      );
+      expect(reportInteraction).toHaveBeenCalledTimes(1);
+      expect(reportInteraction).toHaveBeenLastCalledWith('dashboards_sharing_public_time_picker_clicked', {
+        enabled: !pubdashResponse.timeSelectionEnabled,
+      });
     });
   });
 
@@ -379,12 +389,10 @@ describe('SharePublic - Report interactions', () => {
     await userEvent.click(screen.getByTestId(selectors.EnableAnnotationsSwitch));
 
     await waitFor(() => {
-      expect(trackDashboardSharingActionPerType).toHaveBeenCalledTimes(1);
-      // if annotations was enabled, then the item is now disable_annotations
-      expect(trackDashboardSharingActionPerType).toHaveBeenCalledWith(
-        pubdashResponse.annotationsEnabled ? 'disable_annotations' : 'enable_annotations',
-        shareDashboardType.publicDashboard
-      );
+      expect(reportInteraction).toHaveBeenCalledTimes(1);
+      expect(reportInteraction).toHaveBeenLastCalledWith('dashboards_sharing_public_annotations_clicked', {
+        enabled: !pubdashResponse.annotationsEnabled,
+      });
     });
   });
   it('reports interaction when pause is clicked', async () => {
@@ -395,12 +403,10 @@ describe('SharePublic - Report interactions', () => {
     await userEvent.click(screen.getByTestId(selectors.PauseSwitch));
 
     await waitFor(() => {
-      expect(trackDashboardSharingActionPerType).toHaveBeenCalledTimes(1);
-      // if sharing was enabled, then the item is now disable_sharing
-      expect(trackDashboardSharingActionPerType).toHaveBeenLastCalledWith(
-        pubdashResponse.isEnabled ? 'disable_sharing' : 'enable_sharing',
-        shareDashboardType.publicDashboard
-      );
+      expect(reportInteraction).toHaveBeenCalledTimes(1);
+      expect(reportInteraction).toHaveBeenLastCalledWith('dashboards_sharing_public_pause_clicked', {
+        paused: pubdashResponse.isEnabled,
+      });
     });
   });
 });
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.tsx
index 746885fa058c3..36cbd0d3b964d 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.tsx
@@ -6,14 +6,17 @@ import { Spinner, useStyles2 } from '@grafana/ui/src';
 import { useGetPublicDashboardQuery } from 'app/features/dashboard/api/publicDashboardApi';
 import { publicDashboardPersisted } from 'app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils';
 import { ShareModalTabProps } from 'app/features/dashboard/components/ShareModal/types';
+import { useSelector } from 'app/types';
 
 import { HorizontalGroup } from '../../../../plugins/admin/components/HorizontalGroup';
 
-import ConfigPublicDashboard from './ConfigPublicDashboard/ConfigPublicDashboard';
-import CreatePublicDashboard from './CreatePublicDashboard/CreatePublicDashboard';
+import { ConfigPublicDashboard } from './ConfigPublicDashboard/ConfigPublicDashboard';
+import { CreatePublicDashboard } from './CreatePublicDashboard/CreatePublicDashboard';
+import { useGetUnsupportedDataSources } from './useGetUnsupportedDataSources';
+
 interface Props extends ShareModalTabProps {}
 
-const Loader = () => {
+export const Loader = () => {
   const styles = useStyles2(getStyles);
 
   return (
@@ -28,28 +31,31 @@ const Loader = () => {
 
 export const SharePublicDashboard = (props: Props) => {
   const { data: publicDashboard, isLoading, isError } = useGetPublicDashboardQuery(props.dashboard.uid);
+  const dashboardState = useSelector((store) => store.dashboard);
+  const dashboard = dashboardState.getModel()!;
+  const { unsupportedDataSources } = useGetUnsupportedDataSources(dashboard);
 
   return (
     <>
       {isLoading ? (
         <Loader />
       ) : !publicDashboardPersisted(publicDashboard) ? (
-        <CreatePublicDashboard isError={isError} />
+        <CreatePublicDashboard hasError={isError} />
       ) : (
-        <ConfigPublicDashboard />
+        <ConfigPublicDashboard publicDashboard={publicDashboard!} unsupportedDatasources={unsupportedDataSources} />
       )}
     </>
   );
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  loadingContainer: css`
-    height: 280px;
-    align-items: center;
-    justify-content: center;
-    gap: ${theme.spacing(1)};
-  `,
-  spinner: css`
-    margin-bottom: ${theme.spacing(0)};
-  `,
+  loadingContainer: css({
+    height: '280px',
+    alignItems: 'center',
+    justifyContent: 'center',
+    gap: theme.spacing(1),
+  }),
+  spinner: css({
+    marginBottom: theme.spacing(0),
+  }),
 });
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils.test.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils.test.tsx
index cdf09b0bcb813..7a14d0a4e4589 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils.test.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils.test.tsx
@@ -1,9 +1,9 @@
+import { TypedVariableModel } from '@grafana/data';
 import { DataSourceRef, DataQuery } from '@grafana/data/src/types/query';
 import { DataSourceWithBackend } from '@grafana/runtime';
 import { updateConfig } from 'app/core/config';
 import { mockDataSource } from 'app/features/alerting/unified/mocks';
 import { PanelModel } from 'app/features/dashboard/state/PanelModel';
-import { VariableModel } from 'app/features/variables/types';
 
 import {
   PublicDashboard,
@@ -38,13 +38,13 @@ jest.mock('@grafana/runtime/src/services/dataSourceSrv', () => {
 
 describe('dashboardHasTemplateVariables', () => {
   it('false', () => {
-    let variables: VariableModel[] = [];
+    let variables: TypedVariableModel[] = [];
     expect(dashboardHasTemplateVariables(variables)).toBe(false);
   });
 
   it('true', () => {
     //@ts-ignore
-    let variables: VariableModel[] = ['a'];
+    let variables: TypedVariableModel[] = ['a'];
     expect(dashboardHasTemplateVariables(variables)).toBe(true);
   });
 });
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils.ts b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils.ts
index cca26eb7724d0..621fde2b0f62b 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils.ts
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils.ts
@@ -1,7 +1,7 @@
-import { DataSourceWithBackend } from '@grafana/runtime';
+import { TypedVariableModel } from '@grafana/data';
+import { config, DataSourceWithBackend } from '@grafana/runtime';
 import { getConfig } from 'app/core/config';
 import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
-import { VariableModel } from 'app/features/variables/types';
 
 import { PanelModel } from '../../../state';
 import { shareDashboardType } from '../utils';
@@ -32,16 +32,18 @@ export interface SessionDashboard {
   dashboardTitle: string;
   dashboardUid: string;
   publicDashboardAccessToken: string;
+  slug: string;
 }
 
 export interface SessionUser {
   email: string;
   firstSeenAtAge: string;
+  lastSeenAtAge: string;
   totalDashboards: number;
 }
 
 // Instance methods
-export const dashboardHasTemplateVariables = (variables: VariableModel[]): boolean => {
+export const dashboardHasTemplateVariables = (variables: TypedVariableModel[]): boolean => {
   return variables.length > 0;
 };
 
@@ -86,8 +88,12 @@ export const generatePublicDashboardUrl = (accessToken: string): string => {
   return `${getConfig().appUrl}public-dashboards/${accessToken}`;
 };
 
-export const generatePublicDashboardConfigUrl = (dashboardUid: string): string => {
-  return `/d/${dashboardUid}?shareView=${shareDashboardType.publicDashboard}`;
+export const generatePublicDashboardConfigUrl = (dashboardUid: string, dashboardName: string): string => {
+  return `/d/${dashboardUid}/${dashboardName}?shareView=${shareDashboardType.publicDashboard}`;
 };
 
 export const validEmailRegex = /^[A-Z\d._%+-]+@[A-Z\d.-]+\.[A-Z]{2,}$/i;
+
+export const isPublicDashboardsEnabled = () => {
+  return Boolean(config.featureToggles.publicDashboards) && config.publicDashboardsEnabled;
+};
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SupportedPubdashDatasources.ts b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SupportedPubdashDatasources.ts
index 10b92f939befa..aac1aaaf0f559 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SupportedPubdashDatasources.ts
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SupportedPubdashDatasources.ts
@@ -2,9 +2,11 @@
 
 export const supportedDatasources = new Set<string>([
   '__expr__',
+  'aggregations-io-datasource',
   'apache-iotdb-datasource',
   'aquaqanalytics-kdbbackend-datasource',
   'axiomhq-axiom-datasource',
+  'cloudwatch',
   'cnos-cnosdb-datasource',
   'datasource',
   'dlopes7-appdynamics-datasource',
@@ -19,7 +21,6 @@ export const supportedDatasources = new Set<string>([
   'grafana-clickhouse-datasource',
   'grafana-databricks-datasource',
   'grafana-datadog-datasource',
-  'grafana-db2-datasource',
   'grafana-dynatrace-datasource',
   'grafana-es-open-distro-datasource',
   'grafana-falconlogscale-datasource',
@@ -45,6 +46,8 @@ export const supportedDatasources = new Set<string>([
   'grafana-snowflake-datasource',
   'grafana-splunk-datasource',
   'grafana-splunk-monitoring-datasource',
+  'grafana-sumologic-datasource',
+  'grafana-testdata-datasource',
   'grafana-timestream-datasource',
   'grafana-wavefront-datasource',
   'grafana-x-ray-datasource',
@@ -55,8 +58,8 @@ export const supportedDatasources = new Set<string>([
   'innius-grpc-datasource',
   'kniepdennis-neo4j-datasource',
   'loki',
+  'manassehzhou-maxcompute-datasource',
   'marcusolsson-csv-datasource',
-  'marcusolsson-ynab-datasource',
   'mssql',
   'mysql',
   'nagasudhirpulla-api-datasource',
@@ -71,6 +74,7 @@ export const supportedDatasources = new Set<string>([
   'spiceai-spicexyz-datasource',
   'stackdriver',
   'tdengine-datasource',
+  'trino-datasource',
   'vertamedia-clickhouse-datasource',
   'vertica-grafana-datasource',
   'ydbtech-ydb-datasource',
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/utilsTest.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/utilsTest.tsx
index f3578f28bc251..382c499e3a567 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/utilsTest.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/utilsTest.tsx
@@ -1,5 +1,6 @@
+import 'whatwg-fetch';
 import { fireEvent, render, screen, waitFor, waitForElementToBeRemoved } from '@testing-library/react';
-import { rest } from 'msw';
+import { http, HttpResponse } from 'msw';
 import React from 'react';
 import { Provider } from 'react-redux';
 
@@ -32,15 +33,14 @@ export const pubdashResponse: sharePublicDashboardUtils.PublicDashboard = {
 };
 
 export const getExistentPublicDashboardResponse = (publicDashboard?: Partial<PublicDashboard>) =>
-  rest.get('/api/dashboards/uid/:dashboardUid/public-dashboards', (req, res, ctx) => {
-    return res(
-      ctx.status(200),
-      ctx.json({
-        ...pubdashResponse,
-        ...publicDashboard,
-        dashboardUid: req.params.dashboardUid,
-      })
-    );
+  http.get('/api/dashboards/uid/:dashboardUid/public-dashboards', ({ request }) => {
+    const url = new URL(request.url);
+    const dashboardUid = url.searchParams.get('dashboardUid');
+    return HttpResponse.json({
+      ...pubdashResponse,
+      ...publicDashboard,
+      dashboardUid,
+    });
   });
 
 export const renderSharePublicDashboard = async (
@@ -50,7 +50,6 @@ export const renderSharePublicDashboard = async (
   const store = configureStore({
     dashboard: {
       getModel: () => props?.dashboard || mockDashboard,
-      permissions: [],
       initError: null,
       initPhase: DashboardInitPhase.Completed,
     },
diff --git a/public/app/features/dashboard/components/ShareModal/ShareSnapshot.tsx b/public/app/features/dashboard/components/ShareModal/ShareSnapshot.tsx
index d0f7b3baa8f38..aa449768aa70a 100644
--- a/public/app/features/dashboard/components/ShareModal/ShareSnapshot.tsx
+++ b/public/app/features/dashboard/components/ShareModal/ShareSnapshot.tsx
@@ -6,14 +6,12 @@ import { Button, ClipboardButton, Field, Input, LinkButton, Modal, Select, Spinn
 import { t, Trans } from 'app/core/internationalization';
 import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { DashboardModel, PanelModel } from 'app/features/dashboard/state';
+import { DashboardInteractions } from 'app/features/dashboard-scene/utils/interactions';
 
 import { VariableRefresh } from '../../../variables/types';
+import { getDashboardSnapshotSrv } from '../../services/SnapshotSrv';
 
-import { trackDashboardSharingActionPerType } from './analytics';
 import { ShareModalTabProps } from './types';
-import { shareDashboardType } from './utils';
-
-const snapshotApiUrl = '/api/snapshots';
 
 interface Props extends ShareModalTabProps {}
 
@@ -38,10 +36,6 @@ export class ShareSnapshot extends PureComponent<Props, State> {
     super(props);
     this.dashboard = props.dashboard;
     this.expireOptions = [
-      {
-        label: t('share-modal.snapshot.expire-never', `Never`),
-        value: 0,
-      },
       {
         label: t('share-modal.snapshot.expire-hour', `1 Hour`),
         value: 60 * 60,
@@ -51,15 +45,19 @@ export class ShareSnapshot extends PureComponent<Props, State> {
         value: 60 * 60 * 24,
       },
       {
-        label: t('share-modal.snapshot.expire-week', `7 Days`),
+        label: t('share-modal.snapshot.expire-week', `1 Week`),
         value: 60 * 60 * 24 * 7,
       },
+      {
+        label: t('share-modal.snapshot.expire-never', `Never`),
+        value: 0,
+      },
     ];
     this.state = {
       isLoading: false,
       step: 1,
-      selectedExpireOption: this.expireOptions[0],
-      snapshotExpires: this.expireOptions[0].value,
+      selectedExpireOption: this.expireOptions[2],
+      snapshotExpires: this.expireOptions[2].value,
       snapshotName: props.dashboard.title,
       timeoutSeconds: 4,
       snapshotUrl: '',
@@ -74,10 +72,10 @@ export class ShareSnapshot extends PureComponent<Props, State> {
   }
 
   async getSnaphotShareOptions() {
-    const shareOptions = await getBackendSrv().get('/api/snapshot/shared-options');
+    const shareOptions = await getDashboardSnapshotSrv().getSharingOptions();
     this.setState({
-      sharingButtonText: shareOptions['externalSnapshotName'],
-      externalEnabled: shareOptions['externalEnabled'],
+      sharingButtonText: shareOptions.externalSnapshotName,
+      externalEnabled: shareOptions.externalEnabled,
     });
   }
 
@@ -96,7 +94,7 @@ export class ShareSnapshot extends PureComponent<Props, State> {
   };
 
   saveSnapshot = async (dashboard: DashboardModel, external?: boolean) => {
-    const { snapshotExpires } = this.state;
+    const { snapshotExpires, timeoutSeconds } = this.state;
     const dash = this.dashboard.getSaveModelCloneOld();
 
     this.scrubDashboard(dash);
@@ -109,14 +107,24 @@ export class ShareSnapshot extends PureComponent<Props, State> {
     };
 
     try {
-      const results: { deleteUrl: string; url: string } = await getBackendSrv().post(snapshotApiUrl, cmdData);
+      const results = await getDashboardSnapshotSrv().create(cmdData);
       this.setState({
         deleteUrl: results.deleteUrl,
         snapshotUrl: results.url,
         step: 2,
       });
     } finally {
-      trackDashboardSharingActionPerType(external ? 'publish_snapshot' : 'local_snapshot', shareDashboardType.snapshot);
+      if (external) {
+        DashboardInteractions.publishSnapshotClicked({
+          expires: snapshotExpires,
+          timeout: timeoutSeconds,
+        });
+      } else {
+        DashboardInteractions.publishSnapshotLocalClicked({
+          expires: snapshotExpires,
+          timeout: timeoutSeconds,
+        });
+      }
       this.setState({ isLoading: false });
     }
   };
@@ -269,7 +277,7 @@ export class ShareSnapshot extends PureComponent<Props, State> {
             </Button>
           )}
           <Button variant="primary" disabled={isLoading} onClick={this.createSnapshot()}>
-            <Trans i18nKey="share-modal.snapshot.local-button">Local Snapshot</Trans>
+            <Trans i18nKey="share-modal.snapshot.local-button">Publish Snapshot</Trans>
           </Button>
         </Modal.ButtonRow>
       </>
diff --git a/public/app/features/dashboard/components/ShareModal/ViewJsonModal.tsx b/public/app/features/dashboard/components/ShareModal/ViewJsonModal.tsx
index 2a5fa2a262eed..93a6e56edd4b4 100644
--- a/public/app/features/dashboard/components/ShareModal/ViewJsonModal.tsx
+++ b/public/app/features/dashboard/components/ShareModal/ViewJsonModal.tsx
@@ -3,6 +3,7 @@ import AutoSizer from 'react-virtualized-auto-sizer';
 
 import { ClipboardButton, CodeEditor, Modal } from '@grafana/ui';
 import { Trans } from 'app/core/internationalization';
+import { DashboardInteractions } from 'app/features/dashboard-scene/utils/interactions';
 
 export interface ViewJsonModalProps {
   json: string;
@@ -17,7 +18,13 @@ export function ViewJsonModal({ json, onDismiss }: ViewJsonModalProps): JSX.Elem
         {({ width }) => <CodeEditor value={json} language="json" showMiniMap={false} height="500px" width={width} />}
       </AutoSizer>
       <Modal.ButtonRow>
-        <ClipboardButton icon="copy" getText={getClipboardText}>
+        <ClipboardButton
+          icon="copy"
+          getText={getClipboardText}
+          onClipboardCopy={() => {
+            DashboardInteractions.exportCopyJsonClicked();
+          }}
+        >
           <Trans i18nKey="share-modal.view-json.copy-button">Copy to Clipboard</Trans>
         </ClipboardButton>
       </Modal.ButtonRow>
diff --git a/public/app/features/dashboard/components/ShareModal/analytics.ts b/public/app/features/dashboard/components/ShareModal/analytics.ts
deleted file mode 100644
index 7e27925215e66..0000000000000
--- a/public/app/features/dashboard/components/ShareModal/analytics.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { reportInteraction } from '@grafana/runtime';
-
-export const shareAnalyticsEventNames: {
-  [key: string]: string;
-} = {
-  sharingCategoryClicked: 'dashboards_sharing_category_clicked',
-  sharingActionClicked: 'dashboards_sharing_actions_clicked',
-};
-
-export function trackDashboardSharingTypeOpen(sharingType: string) {
-  reportInteraction(shareAnalyticsEventNames.sharingCategoryClicked, { item: sharingType });
-}
-
-export function trackDashboardSharingActionPerType(action: string, sharingType: string) {
-  reportInteraction(shareAnalyticsEventNames.sharingActionClicked, {
-    item: action,
-    sharing_category: sharingType,
-  });
-}
diff --git a/public/app/features/dashboard/components/ShareModal/utils.test.ts b/public/app/features/dashboard/components/ShareModal/utils.test.ts
index 8e2a42d553a1a..f6aba62c4ffbc 100644
--- a/public/app/features/dashboard/components/ShareModal/utils.test.ts
+++ b/public/app/features/dashboard/components/ShareModal/utils.test.ts
@@ -29,6 +29,7 @@ describe('buildParams', () => {
     ${'var=%2B1&var=a+value+with+spaces&var=true'} | ${false}            | ${'current'}  | ${{ id: 3 }} | ${'var=%2B1&var=a+value+with+spaces&var=true&orgId=2&viewPanel=3'}
     ${'var=%2B1&var=a+value+with+spaces&var=true'} | ${false}            | ${'light'}    | ${undefined} | ${'var=%2B1&var=a+value+with+spaces&var=true&orgId=2&theme=light'}
     ${'var=%2B1&var=a+value+with+spaces&var=true'} | ${false}            | ${'light'}    | ${{ id: 3 }} | ${'var=%2B1&var=a+value+with+spaces&var=true&orgId=2&theme=light&viewPanel=3'}
+    ${'auth_token=1234'}                           | ${true}             | ${'current'}  | ${undefined} | ${'from=1000&to=2000&orgId=2'}
   `(
     "when called with search: '$search' and useCurrentTimeRange: '$useCurrentTimeRange' and selectedTheme: '$selectedTheme' and panel: '$panel'then result should be '$expected'",
     ({ search, useCurrentTimeRange, selectedTheme, panel, expected }) => {
diff --git a/public/app/features/dashboard/components/ShareModal/utils.ts b/public/app/features/dashboard/components/ShareModal/utils.ts
index 16fd652cb3727..90b1664c4926e 100644
--- a/public/app/features/dashboard/components/ShareModal/utils.ts
+++ b/public/app/features/dashboard/components/ShareModal/utils.ts
@@ -8,7 +8,7 @@ import { PanelModel } from '../../state';
 export interface BuildParamsArgs {
   useCurrentTimeRange: boolean;
   selectedTheme?: string;
-  panel?: PanelModel;
+  panel?: { timeFrom?: string; id: number };
   search?: string;
   range?: TimeRange;
   orgId?: number;
@@ -49,6 +49,13 @@ export function buildParams({
     searchParams.set('viewPanel', String(panel.id));
   }
 
+  // Token is unique to the authenticated identity and should not be shared with the URL,
+  // so we are stripping it from the query params as a safety measure.
+  searchParams.delete('auth_token');
+
+  // The shareView param is used to indicate that the sharing modal is open and should never be included in the URL
+  searchParams.delete('shareView');
+
   return searchParams;
 }
 
@@ -82,10 +89,11 @@ export function buildSoloUrl(
   useCurrentTimeRange: boolean,
   dashboardUid: string,
   selectedTheme?: string,
-  panel?: PanelModel
+  panel?: { timeFrom?: string; id: number },
+  range?: TimeRange
 ) {
   const baseUrl = buildBaseUrl();
-  const params = buildParams({ useCurrentTimeRange, selectedTheme, panel });
+  const params = buildParams({ useCurrentTimeRange, selectedTheme, panel, range });
 
   let soloUrl = baseUrl.replace(config.appSubUrl + '/dashboard/', config.appSubUrl + '/dashboard-solo/');
   soloUrl = soloUrl.replace(config.appSubUrl + '/d/', config.appSubUrl + '/d-solo/');
@@ -113,7 +121,12 @@ export function buildImageUrl(
   let soloUrl = buildSoloUrl(useCurrentTimeRange, dashboardUid, selectedTheme, panel);
   let imageUrl = soloUrl.replace(config.appSubUrl + '/dashboard-solo/', config.appSubUrl + '/render/dashboard-solo/');
   imageUrl = imageUrl.replace(config.appSubUrl + '/d-solo/', config.appSubUrl + '/render/d-solo/');
-  imageUrl += '&width=1000&height=500' + getLocalTimeZone();
+  imageUrl +=
+    `&width=${config.rendererDefaultImageWidth}` +
+    `&height=${config.rendererDefaultImageHeight}` +
+    `&scale=${config.rendererDefaultImageScale}` +
+    getLocalTimeZone();
+
   return imageUrl;
 }
 
@@ -121,10 +134,11 @@ export function buildIframeHtml(
   useCurrentTimeRange: boolean,
   dashboardUid: string,
   selectedTheme?: string,
-  panel?: PanelModel
+  panel?: { timeFrom?: string; id: number },
+  range?: TimeRange
 ) {
-  let soloUrl = buildSoloUrl(useCurrentTimeRange, dashboardUid, selectedTheme, panel);
-  return '<iframe src="' + soloUrl + '" width="450" height="200" frameborder="0"></iframe>';
+  let soloUrl = buildSoloUrl(useCurrentTimeRange, dashboardUid, selectedTheme, panel, range);
+  return `<iframe src="${soloUrl}" width="450" height="200" frameborder="0"></iframe>`;
 }
 
 export function getLocalTimeZone() {
diff --git a/public/app/features/dashboard/components/SubMenu/DashboardLinks.tsx b/public/app/features/dashboard/components/SubMenu/DashboardLinks.tsx
index 115641d181b39..b45ca71a03f44 100644
--- a/public/app/features/dashboard/components/SubMenu/DashboardLinks.tsx
+++ b/public/app/features/dashboard/components/SubMenu/DashboardLinks.tsx
@@ -4,14 +4,14 @@ import { useEffectOnce } from 'react-use';
 import { sanitizeUrl } from '@grafana/data/src/text/sanitize';
 import { selectors } from '@grafana/e2e-selectors';
 import { TimeRangeUpdatedEvent } from '@grafana/runtime';
-import { Icon, Tooltip, useForceUpdate } from '@grafana/ui';
+import { DashboardLink } from '@grafana/schema';
+import { Tooltip, useForceUpdate } from '@grafana/ui';
+import { LINK_ICON_MAP } from 'app/features/dashboard-scene/settings/links/utils';
 
 import { getLinkSrv } from '../../../panel/panellinks/link_srv';
 import { DashboardModel } from '../../state';
-import { DashboardLink } from '../../state/DashboardModel';
-import { linkIconMap } from '../LinksSettings/LinkSettingsEdit';
 
-import { DashboardLinksDashboard } from './DashboardLinksDashboard';
+import { DashboardLinkButton, DashboardLinksDashboard } from './DashboardLinksDashboard';
 
 export interface Props {
   dashboard: DashboardModel;
@@ -40,23 +40,22 @@ export const DashboardLinks = ({ dashboard, links }: Props) => {
           return <DashboardLinksDashboard key={key} link={link} linkInfo={linkInfo} dashboardUID={dashboard.uid} />;
         }
 
-        const icon = linkIconMap[link.icon];
+        const icon = LINK_ICON_MAP[link.icon];
 
         const linkElement = (
-          <a
-            className="gf-form-label gf-form-label--dashlink"
+          <DashboardLinkButton
             href={sanitizeUrl(linkInfo.href)}
             target={link.targetBlank ? '_blank' : undefined}
             rel="noreferrer"
             data-testid={selectors.components.DashboardLinks.link}
+            icon={icon}
           >
-            {icon && <Icon aria-hidden name={icon} style={{ marginRight: '4px' }} />}
-            <span>{linkInfo.title}</span>
-          </a>
+            {linkInfo.title}
+          </DashboardLinkButton>
         );
 
         return (
-          <div key={key} className="gf-form" data-testid={selectors.components.DashboardLinks.container}>
+          <div key={key} data-testid={selectors.components.DashboardLinks.container}>
             {link.tooltip ? <Tooltip content={linkInfo.tooltip}>{linkElement}</Tooltip> : linkElement}
           </div>
         );
diff --git a/public/app/features/dashboard/components/SubMenu/DashboardLinksDashboard.test.tsx b/public/app/features/dashboard/components/SubMenu/DashboardLinksDashboard.test.tsx
index c05ce36eac17d..8759dcef8f95b 100644
--- a/public/app/features/dashboard/components/SubMenu/DashboardLinksDashboard.test.tsx
+++ b/public/app/features/dashboard/components/SubMenu/DashboardLinksDashboard.test.tsx
@@ -1,8 +1,8 @@
+import { DashboardLink } from '@grafana/schema';
 import { backendSrv } from 'app/core/services/__mocks__/backend_srv';
 import { LinkSrv } from 'app/features/panel/panellinks/link_srv';
 
 import { DashboardSearchItem, DashboardSearchItemType } from '../../../search/types';
-import { DashboardLink } from '../../state/DashboardModel';
 
 import { resolveLinks, searchForTags } from './DashboardLinksDashboard';
 
diff --git a/public/app/features/dashboard/components/SubMenu/DashboardLinksDashboard.tsx b/public/app/features/dashboard/components/SubMenu/DashboardLinksDashboard.tsx
index 964fc3869dff7..5d02274ad8f06 100644
--- a/public/app/features/dashboard/components/SubMenu/DashboardLinksDashboard.tsx
+++ b/public/app/features/dashboard/components/SubMenu/DashboardLinksDashboard.tsx
@@ -1,77 +1,81 @@
 import { css, cx } from '@emotion/css';
-import React, { useRef, useState, useLayoutEffect } from 'react';
+import React from 'react';
 import { useAsync } from 'react-use';
 
-import { GrafanaTheme2 } from '@grafana/data';
+import { GrafanaTheme2, ScopedVars } from '@grafana/data';
 import { sanitize, sanitizeUrl } from '@grafana/data/src/text/sanitize';
 import { selectors } from '@grafana/e2e-selectors';
-import { Icon, ToolbarButton, Tooltip, useStyles2 } from '@grafana/ui';
+import { DashboardLink } from '@grafana/schema';
+import { CustomScrollbar, Dropdown, Icon, Button, Menu, useStyles2 } from '@grafana/ui';
+import { ButtonLinkProps, LinkButton } from '@grafana/ui/src/components/Button';
 import { getBackendSrv } from 'app/core/services/backend_srv';
 import { DashboardSearchItem } from 'app/features/search/types';
 
 import { getLinkSrv } from '../../../panel/panellinks/link_srv';
-import { DashboardLink } from '../../state/DashboardModel';
 
 interface Props {
   link: DashboardLink;
   linkInfo: { title: string; href: string };
   dashboardUID: string;
+  scopedVars?: ScopedVars;
 }
 
-export const DashboardLinksDashboard = (props: Props) => {
-  const { link, linkInfo } = props;
-  const listRef = useRef<HTMLUListElement>(null);
-  const [dropdownCssClass, setDropdownCssClass] = useState('invisible');
-  const [opened, setOpened] = useState(0);
-  const resolvedLinks = useResolvedLinks(props, opened);
+interface DashboardLinksMenuProps {
+  link: DashboardLink;
+  dashboardUID: string;
+}
+
+function DashboardLinksMenu({ dashboardUID, link }: DashboardLinksMenuProps) {
   const styles = useStyles2(getStyles);
+  const resolvedLinks = useResolvedLinks({ dashboardUID, link });
+
+  if (!resolvedLinks || resolveLinks.length === 0) {
+    return null;
+  }
+
+  return (
+    <Menu>
+      <div className={styles.dropdown}>
+        <CustomScrollbar>
+          {resolvedLinks.map((resolvedLink, index) => {
+            return (
+              <Menu.Item
+                url={resolvedLink.url}
+                target={link.targetBlank ? '_blank' : undefined}
+                key={`dashlinks-dropdown-item-${resolvedLink.uid}-${index}`}
+                label={resolvedLink.title}
+                testId={selectors.components.DashboardLinks.link}
+                aria-label={`${resolvedLink.title} dashboard`}
+              />
+            );
+          })}
+        </CustomScrollbar>
+      </div>
+    </Menu>
+  );
+}
 
-  useLayoutEffect(() => {
-    setDropdownCssClass(getDropdownLocationCssClass(listRef.current));
-  }, [resolvedLinks]);
+export const DashboardLinksDashboard = (props: Props) => {
+  const { link, linkInfo, dashboardUID } = props;
+  const resolvedLinks = useResolvedLinks(props);
+  const styles = useStyles2(getStyles);
 
   if (link.asDropdown) {
     return (
-      <LinkElement link={link} key="dashlinks-dropdown" data-testid={selectors.components.DashboardLinks.dropDown}>
-        <>
-          <ToolbarButton
-            onClick={() => setOpened(Date.now())}
-            className={cx('gf-form-label gf-form-label--dashlink', styles.button)}
-            data-placement="bottom"
-            data-toggle="dropdown"
-            aria-expanded={!!opened}
-            aria-controls="dropdown-list"
-            aria-haspopup="menu"
-          >
-            <Icon aria-hidden name="bars" className={styles.iconMargin} />
-            <span>{linkInfo.title}</span>
-          </ToolbarButton>
-          <ul
-            id="dropdown-list"
-            className={`dropdown-menu ${styles.dropdown} ${dropdownCssClass}`}
-            role="menu"
-            ref={listRef}
-          >
-            {resolvedLinks.length > 0 &&
-              resolvedLinks.map((resolvedLink, index) => {
-                return (
-                  <li role="none" key={`dashlinks-dropdown-item-${resolvedLink.uid}-${index}`}>
-                    <a
-                      role="menuitem"
-                      href={resolvedLink.url}
-                      target={link.targetBlank ? '_blank' : undefined}
-                      rel="noreferrer"
-                      data-testid={selectors.components.DashboardLinks.link}
-                      aria-label={`${resolvedLink.title} dashboard`}
-                    >
-                      {resolvedLink.title}
-                    </a>
-                  </li>
-                );
-              })}
-          </ul>
-        </>
-      </LinkElement>
+      <Dropdown overlay={<DashboardLinksMenu link={link} dashboardUID={dashboardUID} />}>
+        <DashboardLinkButton
+          data-placement="bottom"
+          data-toggle="dropdown"
+          aria-controls="dropdown-list"
+          aria-haspopup="menu"
+          fill="outline"
+          variant="secondary"
+          data-testid={selectors.components.DashboardLinks.dropDown}
+        >
+          <Icon aria-hidden name="bars" className={styles.iconMargin} />
+          <span>{linkInfo.title}</span>
+        </DashboardLinkButton>
+      </Dropdown>
     );
   }
 
@@ -80,49 +84,27 @@ export const DashboardLinksDashboard = (props: Props) => {
       {resolvedLinks.length > 0 &&
         resolvedLinks.map((resolvedLink, index) => {
           return (
-            <LinkElement
-              link={link}
+            <DashboardLinkButton
               key={`dashlinks-list-item-${resolvedLink.uid}-${index}`}
-              data-testid={selectors.components.DashboardLinks.container}
+              icon="apps"
+              variant="secondary"
+              fill="outline"
+              href={resolvedLink.url}
+              target={link.targetBlank ? '_blank' : undefined}
+              rel="noreferrer"
+              data-testid={selectors.components.DashboardLinks.link}
             >
-              <a
-                className="gf-form-label gf-form-label--dashlink"
-                href={resolvedLink.url}
-                target={link.targetBlank ? '_blank' : undefined}
-                rel="noreferrer"
-                data-testid={selectors.components.DashboardLinks.link}
-                aria-label={`${resolvedLink.title} dashboard`}
-              >
-                <Icon aria-hidden name="apps" style={{ marginRight: '4px' }} />
-                <span>{resolvedLink.title}</span>
-              </a>
-            </LinkElement>
+              {resolvedLink.title}
+            </DashboardLinkButton>
           );
         })}
     </>
   );
 };
 
-interface LinkElementProps {
-  link: DashboardLink;
-  key: string;
-  children: JSX.Element;
-}
-
-const LinkElement = (props: LinkElementProps) => {
-  const { link, children, ...rest } = props;
-
-  return (
-    <div {...rest} className="gf-form">
-      {link.tooltip && <Tooltip content={link.tooltip}>{children}</Tooltip>}
-      {!link.tooltip && <>{children}</>}
-    </div>
-  );
-};
-
-const useResolvedLinks = ({ link, dashboardUID }: Props, opened: number): ResolvedLinkDTO[] => {
+const useResolvedLinks = ({ link, dashboardUID }: Pick<Props, 'link' | 'dashboardUID'>): ResolvedLinkDTO[] => {
   const { tags } = link;
-  const result = useAsync(() => searchForTags(tags), [tags, opened]);
+  const result = useAsync(() => searchForTags(tags), [tags]);
   if (!result.value) {
     return [];
   }
@@ -167,25 +149,6 @@ export function resolveLinks(
     });
 }
 
-function getDropdownLocationCssClass(element: HTMLElement | null) {
-  if (!element) {
-    return 'invisible';
-  }
-
-  const wrapperPos = element.parentElement!.getBoundingClientRect();
-  const pos = element.getBoundingClientRect();
-
-  if (pos.width === 0) {
-    return 'invisible';
-  }
-
-  if (wrapperPos.left + pos.width + 10 > window.innerWidth) {
-    return 'pull-left';
-  } else {
-    return 'pull-right';
-  }
-}
-
 function getStyles(theme: GrafanaTheme2) {
   return {
     iconMargin: css({
@@ -195,14 +158,30 @@ function getStyles(theme: GrafanaTheme2) {
       maxWidth: 'max(30vw, 300px)',
       maxHeight: '70vh',
       overflowY: 'auto',
-      a: {
-        overflow: 'hidden',
-        textOverflow: 'ellipsis',
-        whiteSpace: 'nowrap',
-      },
     }),
     button: css({
       color: theme.colors.text.primary,
     }),
+    dashButton: css({
+      fontSize: theme.typography.bodySmall.fontSize,
+      paddingLeft: theme.spacing(1),
+      paddingRight: theme.spacing(1),
+    }),
   };
 }
+
+export const DashboardLinkButton = React.forwardRef<unknown, ButtonLinkProps>(({ className, ...otherProps }, ref) => {
+  const styles = useStyles2(getStyles);
+  const Component = otherProps.href ? LinkButton : Button;
+  return (
+    <Component
+      {...otherProps}
+      variant="secondary"
+      fill="outline"
+      className={cx(className, styles.dashButton)}
+      ref={ref as any}
+    />
+  );
+});
+
+DashboardLinkButton.displayName = 'DashboardLinkButton';
diff --git a/public/app/features/dashboard/components/SubMenu/SubMenu.tsx b/public/app/features/dashboard/components/SubMenu/SubMenu.tsx
index fcc57a32a4fe8..85e77fc787a15 100644
--- a/public/app/features/dashboard/components/SubMenu/SubMenu.tsx
+++ b/public/app/features/dashboard/components/SubMenu/SubMenu.tsx
@@ -2,14 +2,13 @@ import { css } from '@emotion/css';
 import React, { PureComponent } from 'react';
 import { connect, MapStateToProps } from 'react-redux';
 
-import { AnnotationQuery, DataQuery, GrafanaTheme2 } from '@grafana/data';
+import { AnnotationQuery, DataQuery, TypedVariableModel, GrafanaTheme2 } from '@grafana/data';
+import { DashboardLink } from '@grafana/schema';
 import { stylesFactory, Themeable2, withTheme2 } from '@grafana/ui';
 
 import { StoreState } from '../../../../types';
 import { getSubMenuVariables, getVariablesState } from '../../../variables/state/selectors';
-import { VariableModel } from '../../../variables/types';
 import { DashboardModel } from '../../state';
-import { DashboardLink } from '../../state/DashboardModel';
 
 import { Annotations } from './Annotations';
 import { DashboardLinks } from './DashboardLinks';
@@ -22,7 +21,7 @@ interface OwnProps extends Themeable2 {
 }
 
 interface ConnectedProps {
-  variables: VariableModel[];
+  variables: TypedVariableModel[];
 }
 
 interface DispatchProps {}
@@ -52,10 +51,6 @@ class SubMenuUnConnected extends PureComponent<Props> {
 
     const styles = getStyles(theme);
 
-    if (!dashboard.isSubMenuVisible()) {
-      return null;
-    }
-
     const readOnlyVariables = dashboard.meta.isSnapshot ?? false;
 
     return (
diff --git a/public/app/features/dashboard/components/SubMenu/SubMenuItems.tsx b/public/app/features/dashboard/components/SubMenu/SubMenuItems.tsx
index 5ddf27df91913..5bce5144f9d20 100644
--- a/public/app/features/dashboard/components/SubMenu/SubMenuItems.tsx
+++ b/public/app/features/dashboard/components/SubMenu/SubMenuItems.tsx
@@ -1,17 +1,17 @@
 import React, { useEffect, useState } from 'react';
 
+import { TypedVariableModel, VariableHide } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 
 import { PickerRenderer } from '../../../variables/pickers/PickerRenderer';
-import { VariableHide, VariableModel } from '../../../variables/types';
 
 interface Props {
-  variables: VariableModel[];
+  variables: TypedVariableModel[];
   readOnly?: boolean;
 }
 
 export const SubMenuItems = ({ variables, readOnly }: Props) => {
-  const [visibleVariables, setVisibleVariables] = useState<VariableModel[]>([]);
+  const [visibleVariables, setVisibleVariables] = useState<TypedVariableModel[]>([]);
 
   useEffect(() => {
     setVisibleVariables(variables.filter((state) => state.hide !== VariableHide.hideVariable));
@@ -23,17 +23,15 @@ export const SubMenuItems = ({ variables, readOnly }: Props) => {
 
   return (
     <>
-      {visibleVariables.map((variable) => {
-        return (
-          <div
-            key={variable.id}
-            className="submenu-item gf-form-inline"
-            data-testid={selectors.pages.Dashboard.SubMenu.submenuItem}
-          >
-            <PickerRenderer variable={variable} readOnly={readOnly} />
-          </div>
-        );
-      })}
+      {visibleVariables.map((variable) => (
+        <div
+          key={variable.id}
+          className="submenu-item gf-form-inline"
+          data-testid={selectors.pages.Dashboard.SubMenu.submenuItem}
+        >
+          <PickerRenderer variable={variable} readOnly={readOnly} />
+        </div>
+      ))}
     </>
   );
 };
diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationEditor.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationEditor.tsx
index 83a0fa747a2d8..671bbdaf5b5cd 100644
--- a/public/app/features/dashboard/components/TransformationsEditor/TransformationEditor.tsx
+++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationEditor.tsx
@@ -13,7 +13,7 @@ import {
 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { getTemplateSrv } from '@grafana/runtime';
-import { Icon, JSONFormatter, useStyles2 } from '@grafana/ui';
+import { Icon, JSONFormatter, useStyles2, Drawer } from '@grafana/ui';
 
 import { TransformationsEditorTransformation } from './types';
 
@@ -24,6 +24,7 @@ interface TransformationEditorProps {
   uiConfig: TransformerRegistryItem<any>;
   configs: TransformationsEditorTransformation[];
   onChange: (index: number, config: DataTransformerConfig) => void;
+  toggleShowDebug: () => void;
 }
 
 export const TransformationEditor = ({
@@ -33,6 +34,7 @@ export const TransformationEditor = ({
   uiConfig,
   configs,
   onChange,
+  toggleShowDebug,
 }: TransformationEditorProps) => {
   const styles = useStyles2(getStyles);
   const [input, setInput] = useState<DataFrame[]>([]);
@@ -84,32 +86,32 @@ export const TransformationEditor = ({
     <div className={styles.editor} data-testid={selectors.components.TransformTab.transformationEditor(uiConfig.name)}>
       {editor}
       {debugMode && (
-        <div
-          className={styles.debugWrapper}
-          data-testid={selectors.components.TransformTab.transformationEditorDebugger(uiConfig.name)}
-        >
-          <div className={styles.debug}>
-            <div className={styles.debugTitle}>Transformation input data</div>
-            <div className={styles.debugJson}>
-              <JSONFormatter json={input} />
+        <Drawer title="Debug transformation" subtitle={uiConfig.name} onClose={toggleShowDebug}>
+          <div
+            className={styles.debugWrapper}
+            data-testid={selectors.components.TransformTab.transformationEditorDebugger(uiConfig.name)}
+          >
+            <div className={styles.debug}>
+              <div className={styles.debugTitle}>Input data</div>
+              <div className={styles.debugJson}>
+                <JSONFormatter json={input} />
+              </div>
+            </div>
+            <div className={styles.debugSeparator}>
+              <Icon name="arrow-right" />
+            </div>
+            <div className={styles.debug}>
+              <div className={styles.debugTitle}>Output data</div>
+              <div className={styles.debugJson}>{output && <JSONFormatter json={output} />}</div>
             </div>
           </div>
-          <div className={styles.debugSeparator}>
-            <Icon name="arrow-right" />
-          </div>
-          <div className={styles.debug}>
-            <div className={styles.debugTitle}>Transformation output data</div>
-            <div className={styles.debugJson}>{output && <JSONFormatter json={output} />}</div>
-          </div>
-        </div>
+        </Drawer>
       )}
     </div>
   );
 };
 
 const getStyles = (theme: GrafanaTheme2) => {
-  const debugBorder = theme.isLight ? theme.v1.palette.gray85 : theme.v1.palette.gray15;
-
   return {
     title: css`
       display: flex;
@@ -159,7 +161,7 @@ const getStyles = (theme: GrafanaTheme2) => {
       font-family: ${theme.typography.fontFamilyMonospace};
       font-size: ${theme.typography.bodySmall.fontSize};
       color: ${theme.colors.text};
-      border-bottom: 1px solid ${debugBorder};
+      border-bottom: 1px solid ${theme.colors.border.weak};
       flex-grow: 0;
       flex-shrink: 1;
     `,
@@ -167,7 +169,7 @@ const getStyles = (theme: GrafanaTheme2) => {
     debug: css`
       margin-top: ${theme.spacing(1)};
       padding: 0 ${theme.spacing(1, 1, 1)};
-      border: 1px solid ${debugBorder};
+      border: 1px solid ${theme.colors.border.weak};
       background: ${theme.isLight ? theme.v1.palette.white : theme.v1.palette.gray05};
       border-radius: ${theme.shape.radius.default};
       width: 100%;
diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationEditorHelpDisplay.test.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationEditorHelpDisplay.test.tsx
new file mode 100644
index 0000000000000..b365b8d050432
--- /dev/null
+++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationEditorHelpDisplay.test.tsx
@@ -0,0 +1,95 @@
+import { render, screen, fireEvent } from '@testing-library/react';
+import React from 'react';
+
+import { TransformerRegistryItem } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { getStandardTransformers } from 'app/features/transformers/standardTransformers';
+
+import { TransformationEditorHelpDisplay } from './TransformationEditorHelpDisplay';
+
+// Mock the onCloseClick function
+const mockOnCloseClick = jest.fn();
+
+const standardTransformers: Array<TransformerRegistryItem<null>> = getStandardTransformers();
+
+const singleTestTransformer: TransformerRegistryItem<null> = standardTransformers[0];
+
+describe('TransformationEditorHelpDisplay', () => {
+  it('renders the modal with the correct title and content', () => {
+    // Test each transformer
+    standardTransformers.forEach((transformer) => {
+      const { unmount } = render(
+        <TransformationEditorHelpDisplay isOpen={true} onCloseClick={mockOnCloseClick} transformer={transformer} />
+      );
+
+      // Check if the modal title is rendered with the correct text
+      expect(screen.getByText(`Transformation help`)).toBeInTheDocument();
+      expect(screen.getByTestId(selectors.components.Drawer.General.subtitle)).toBeInTheDocument();
+
+      // Unmount the component to clean up
+      unmount();
+    });
+  });
+
+  it('calls onCloseClick when the modal is dismissed', () => {
+    render(
+      <TransformationEditorHelpDisplay
+        isOpen={true}
+        onCloseClick={mockOnCloseClick}
+        transformer={singleTestTransformer}
+      />
+    );
+
+    // Find and click the modal's close button
+    const closeButton = screen.getByTestId('data-testid Drawer close');
+    fireEvent.click(closeButton);
+
+    // Ensure that the onCloseClick function was called with the correct argument
+    expect(mockOnCloseClick).toHaveBeenCalledWith(false);
+  });
+
+  it('does not render when isOpen is false', () => {
+    render(
+      <TransformationEditorHelpDisplay
+        isOpen={false}
+        onCloseClick={mockOnCloseClick}
+        transformer={singleTestTransformer}
+      />
+    );
+
+    // Ensure that the modal is not rendered
+    expect(screen.queryByText(`Transformation help`)).toBeNull();
+  });
+
+  it('renders a default message when help content is not provided', () => {
+    const transformerWithoutHelp = { ...singleTestTransformer, help: undefined };
+
+    render(
+      <TransformationEditorHelpDisplay
+        isOpen={true}
+        onCloseClick={mockOnCloseClick}
+        transformer={transformerWithoutHelp}
+      />
+    );
+
+    // Check if the default message is rendered when help content is not provided
+    expect(screen.getByText('transformation documentation')).toBeInTheDocument();
+  });
+
+  it('renders with custom help content when provided', () => {
+    const customHelpContent = 'Custom help content for testing';
+
+    const transformerWithCustomHelp = { ...singleTestTransformer, help: customHelpContent };
+
+    render(
+      <TransformationEditorHelpDisplay
+        isOpen={true}
+        onCloseClick={mockOnCloseClick}
+        transformer={transformerWithCustomHelp}
+      />
+    );
+
+    // Check if the custom help content is rendered
+    expect(screen.getByText(customHelpContent)).toBeInTheDocument();
+  });
+});
diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationEditorHelpDisplay.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationEditorHelpDisplay.tsx
new file mode 100644
index 0000000000000..47fce758daa46
--- /dev/null
+++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationEditorHelpDisplay.tsx
@@ -0,0 +1,33 @@
+import React from 'react';
+
+import { TransformerRegistryItem } from '@grafana/data';
+import { Drawer } from '@grafana/ui';
+import { OperationRowHelp } from 'app/core/components/QueryOperationRow/OperationRowHelp';
+
+import { getLinkToDocs } from '../../../transformers/docs/content';
+
+interface TransformationEditorHelpDisplayProps {
+  isOpen: boolean;
+  onCloseClick: (value: boolean) => void;
+  transformer: TransformerRegistryItem<null>;
+}
+
+export const TransformationEditorHelpDisplay = ({
+  isOpen,
+  onCloseClick,
+  transformer,
+}: TransformationEditorHelpDisplayProps) => {
+  const {
+    transformation: { name },
+    help,
+  } = transformer;
+
+  const helpContent = help ? help : getLinkToDocs();
+  const helpElement = (
+    <Drawer title={name} subtitle="Transformation help" onClose={() => onCloseClick(false)}>
+      <OperationRowHelp markdown={helpContent} styleOverrides={{ borderTop: '2px solid' }} />
+    </Drawer>
+  );
+
+  return isOpen ? helpElement : null;
+};
diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationFilter.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationFilter.tsx
index af96c50c98e7d..dce12d1178138 100644
--- a/public/app/features/dashboard/components/TransformationsEditor/TransformationFilter.tsx
+++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationFilter.tsx
@@ -2,39 +2,69 @@ import { css } from '@emotion/css';
 import React, { useMemo } from 'react';
 
 import {
-  DataFrame,
   DataTransformerConfig,
   GrafanaTheme2,
   StandardEditorContext,
   StandardEditorsRegistryItem,
 } from '@grafana/data';
-import { Field, useStyles2 } from '@grafana/ui';
+import { DataTopic } from '@grafana/schema';
+import { Field, Select, useStyles2 } from '@grafana/ui';
 import { FrameSelectionEditor } from 'app/plugins/panel/geomap/editor/FrameSelectionEditor';
 
+import { TransformationData } from './TransformationsEditor';
+
 interface TransformationFilterProps {
   index: number;
   config: DataTransformerConfig;
-  data: DataFrame[];
+  data: TransformationData;
   onChange: (index: number, config: DataTransformerConfig) => void;
 }
 
 export const TransformationFilter = ({ index, data, config, onChange }: TransformationFilterProps) => {
   const styles = useStyles2(getStyles);
-  const context = useMemo(() => {
-    // eslint-disable-next-line
-    return { data } as StandardEditorContext<unknown>;
-  }, [data]);
+
+  const opts = useMemo(() => {
+    return {
+      // eslint-disable-next-line
+      context: { data: data.series } as StandardEditorContext<unknown>,
+      showTopic: true || data.annotations?.length || config.topic?.length,
+      showFilter: config.topic !== DataTopic.Annotations,
+      source: [
+        { value: DataTopic.Series, label: `Query results` },
+        { value: DataTopic.Annotations, label: `Annotation data` },
+      ],
+    };
+  }, [data, config.topic]);
 
   return (
     <div className={styles.wrapper}>
       <Field label="Apply transformation to">
-        <FrameSelectionEditor
-          value={config.filter!}
-          context={context}
-          // eslint-disable-next-line
-          item={{} as StandardEditorsRegistryItem}
-          onChange={(filter) => onChange(index, { ...config, filter })}
-        />
+        <>
+          {opts.showTopic && (
+            <Select
+              isClearable={true}
+              options={opts.source}
+              value={opts.source.find((v) => v.value === config.topic)}
+              placeholder={opts.source[0].label}
+              className={styles.padded}
+              onChange={(option) => {
+                onChange(index, {
+                  ...config,
+                  topic: option?.value,
+                });
+              }}
+            />
+          )}
+          {opts.showFilter && (
+            <FrameSelectionEditor
+              value={config.filter!}
+              context={opts.context}
+              // eslint-disable-next-line
+              item={{} as StandardEditorsRegistryItem}
+              onChange={(filter) => onChange(index, { ...config, filter })}
+            />
+          )}
+        </>
       </Field>
     </div>
   );
@@ -44,13 +74,16 @@ const getStyles = (theme: GrafanaTheme2) => {
   const borderRadius = theme.shape.radius.default;
 
   return {
-    wrapper: css`
-      padding: ${theme.spacing(2)};
-      border: 2px solid ${theme.colors.background.secondary};
-      border-top: none;
-      border-radius: 0 0 ${borderRadius} ${borderRadius};
-      position: relative;
-      top: -4px;
-    `,
+    wrapper: css({
+      padding: theme.spacing(2),
+      border: `2px solid ${theme.colors.background.secondary}`,
+      borderTop: `none`,
+      borderRadius: `0 0 ${borderRadius} ${borderRadius}`,
+      position: `relative`,
+      top: `-4px`,
+    }),
+    padded: css({
+      marginBottom: theme.spacing(1),
+    }),
   };
 };
diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationOperationRow.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationOperationRow.tsx
index 9a05c7ce58955..aa5f6df86f566 100644
--- a/public/app/features/dashboard/components/TransformationsEditor/TransformationOperationRow.tsx
+++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationOperationRow.tsx
@@ -1,29 +1,28 @@
 import React, { useCallback } from 'react';
 import { useToggle } from 'react-use';
 
-import { DataFrame, DataTransformerConfig, TransformerRegistryItem, FrameMatcherID } from '@grafana/data';
+import { DataTransformerConfig, TransformerRegistryItem, FrameMatcherID, DataTopic } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import { reportInteraction } from '@grafana/runtime';
 import { ConfirmModal } from '@grafana/ui';
-import { OperationRowHelp } from 'app/core/components/QueryOperationRow/OperationRowHelp';
 import {
   QueryOperationAction,
   QueryOperationToggleAction,
 } from 'app/core/components/QueryOperationRow/QueryOperationAction';
-import {
-  QueryOperationRow,
-  QueryOperationRowRenderProps,
-} from 'app/core/components/QueryOperationRow/QueryOperationRow';
+import { QueryOperationRow } from 'app/core/components/QueryOperationRow/QueryOperationRow';
 import config from 'app/core/config';
 import { PluginStateInfo } from 'app/features/plugins/components/PluginStateInfo';
 
 import { TransformationEditor } from './TransformationEditor';
+import { TransformationEditorHelpDisplay } from './TransformationEditorHelpDisplay';
 import { TransformationFilter } from './TransformationFilter';
+import { TransformationData } from './TransformationsEditor';
 import { TransformationsEditorTransformation } from './types';
 
 interface TransformationOperationRowProps {
   id: string;
   index: number;
-  data: DataFrame[];
+  data: TransformationData;
   uiConfig: TransformerRegistryItem<null>;
   configs: TransformationsEditorTransformation[];
   onRemove: (index: number) => void;
@@ -43,8 +42,9 @@ export const TransformationOperationRow = ({
   const [showDebug, toggleShowDebug] = useToggle(false);
   const [showHelp, toggleShowHelp] = useToggle(false);
   const disabled = !!configs[index].transformation.disabled;
-  const filter = configs[index].transformation.filter != null;
-  const showFilter = filter || data.length > 1;
+  const topic = configs[index].transformation.topic;
+  const showFilterEditor = configs[index].transformation.filter != null || topic != null;
+  const showFilterToggle = showFilterEditor || data.series.length > 1 || (data.annotations?.length ?? 0) > 0;
 
   const onDisableToggle = useCallback(
     (index: number) => {
@@ -57,16 +57,6 @@ export const TransformationOperationRow = ({
     [onChange, configs]
   );
 
-  const toggleExpand = useCallback(() => {
-    if (showHelp) {
-      return true;
-    }
-
-    // We return `undefined` here since the QueryOperationRow component ignores an `undefined` value for the `isOpen` prop.
-    // If we returned `false` here, the row would be collapsed when the user toggles off `showHelp`, which is not what we want.
-    return undefined;
-  }, [showHelp]);
-
   // Adds or removes the frame filter
   const toggleFilter = useCallback(() => {
     let current = { ...configs[index].transformation };
@@ -101,7 +91,7 @@ export const TransformationOperationRow = ({
     [configs, index]
   );
 
-  const renderActions = ({ isOpen }: QueryOperationRowRenderProps) => {
+  const renderActions = () => {
     return (
       <>
         {uiConfig.state && <PluginStateInfo state={uiConfig.state} />}
@@ -109,20 +99,19 @@ export const TransformationOperationRow = ({
           title="Show transform help"
           icon="info-circle"
           // `instrumentToggleCallback` expects a function that takes a MouseEvent, is unused in the state setter. Instead, we simply toggle the state.
-          onClick={instrumentToggleCallback((_e) => toggleShowHelp(!showHelp), 'help', showHelp)}
-          active={!!showHelp}
+          onClick={instrumentToggleCallback(toggleShowHelp, 'help', showHelp)}
+          active={showHelp}
         />
-        {showFilter && (
+        {showFilterToggle && (
           <QueryOperationToggleAction
             title="Filter"
             icon="filter"
-            onClick={instrumentToggleCallback(toggleFilter, 'filter', filter)}
-            active={filter}
+            onClick={instrumentToggleCallback(toggleFilter, 'filter', showFilterEditor)}
+            active={showFilterEditor}
           />
         )}
         <QueryOperationToggleAction
           title="Debug"
-          disabled={!isOpen}
           icon="bug"
           onClick={instrumentToggleCallback(toggleShowDebug, 'debug', showDebug)}
           active={showDebug}
@@ -132,6 +121,7 @@ export const TransformationOperationRow = ({
           icon={disabled ? 'eye-slash' : 'eye'}
           onClick={instrumentToggleCallback(() => onDisableToggle(index), 'disabled', disabled)}
           active={disabled}
+          dataTestId={selectors.components.Transforms.disableTransformationButton}
         />
         <QueryOperationAction
           title="Remove"
@@ -157,45 +147,34 @@ export const TransformationOperationRow = ({
   };
 
   return (
-    <QueryOperationRow
-      id={id}
-      index={index}
-      title={`${index + 1} - ${uiConfig.name}`}
-      draggable
-      actions={renderActions}
-      disabled={disabled}
-      isOpen={toggleExpand()}
-      // Assure that showHelp is untoggled when the row becomes collapsed.
-      onClose={() => toggleShowHelp(false)}
-      expanderMessages={{
-        close: 'Collapse transformation row',
-        open: 'Expand transformation row',
-      }}
-    >
-      {showHelp && <OperationRowHelp markdown={prepMarkdown(uiConfig)} />}
-      {filter && (
-        <TransformationFilter index={index} config={configs[index].transformation} data={data} onChange={onChange} />
-      )}
-      <TransformationEditor
-        debugMode={showDebug}
+    <>
+      <QueryOperationRow
+        id={id}
         index={index}
-        data={data}
-        configs={configs}
-        uiConfig={uiConfig}
-        onChange={onChange}
-      />
-    </QueryOperationRow>
+        title={`${index + 1} - ${uiConfig.name}`}
+        draggable
+        actions={renderActions}
+        disabled={disabled}
+        expanderMessages={{
+          close: 'Collapse transformation row',
+          open: 'Expand transformation row',
+        }}
+      >
+        {showFilterEditor && (
+          <TransformationFilter index={index} config={configs[index].transformation} data={data} onChange={onChange} />
+        )}
+
+        <TransformationEditor
+          debugMode={showDebug}
+          index={index}
+          data={topic === DataTopic.Annotations ? data.annotations ?? [] : data.series}
+          configs={configs}
+          uiConfig={uiConfig}
+          onChange={onChange}
+          toggleShowDebug={toggleShowDebug}
+        />
+      </QueryOperationRow>
+      <TransformationEditorHelpDisplay transformer={uiConfig} isOpen={showHelp} onCloseClick={toggleShowHelp} />
+    </>
   );
 };
-
-function prepMarkdown(uiConfig: TransformerRegistryItem<null>) {
-  let helpMarkdown = uiConfig.help ?? uiConfig.description;
-
-  return `
-${helpMarkdown}
-
-Go the <a href="https://grafana.com/docs/grafana/latest/panels/transformations/?utm_source=grafana" target="_blank" rel="noreferrer">
-transformation documentation
-</a> for more.
-`;
-}
diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationOperationRows.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationOperationRows.tsx
index 69c176924450e..6a3ba81a21411 100644
--- a/public/app/features/dashboard/components/TransformationsEditor/TransformationOperationRows.tsx
+++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationOperationRows.tsx
@@ -1,12 +1,13 @@
 import React from 'react';
 
-import { DataFrame, DataTransformerConfig, standardTransformersRegistry } from '@grafana/data';
+import { DataTransformerConfig, standardTransformersRegistry } from '@grafana/data';
 
 import { TransformationOperationRow } from './TransformationOperationRow';
+import { TransformationData } from './TransformationsEditor';
 import { TransformationsEditorTransformation } from './types';
 
 interface TransformationOperationRowsProps {
-  data: DataFrame[];
+  data: TransformationData;
   configs: TransformationsEditorTransformation[];
   onRemove: (index: number) => void;
   onChange: (index: number, config: DataTransformerConfig) => void;
@@ -22,6 +23,7 @@ export const TransformationOperationRows = ({
     <>
       {configs.map((t, i) => {
         const uiConfig = standardTransformersRegistry.getIfExists(t.transformation.id);
+
         if (!uiConfig) {
           return null;
         }
diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationPicker.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationPicker.tsx
new file mode 100644
index 0000000000000..48656e7289b16
--- /dev/null
+++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationPicker.tsx
@@ -0,0 +1,122 @@
+import { css } from '@emotion/css';
+import React, { FormEventHandler, KeyboardEventHandler, ReactNode } from 'react';
+
+import { DocsId, GrafanaTheme2, TransformerRegistryItem } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { Card, Container, VerticalGroup, Alert, Input, useStyles2 } from '@grafana/ui';
+import { LocalStorageValueProvider } from 'app/core/components/LocalStorageValueProvider';
+import { getDocsLink } from 'app/core/utils/docsLinks';
+import { PluginStateInfo } from 'app/features/plugins/components/PluginStateInfo';
+
+const LOCAL_STORAGE_KEY = 'dashboard.components.TransformationEditor.featureInfoBox.isDismissed';
+
+interface TransformationPickerProps {
+  noTransforms: boolean;
+  search: string;
+  onSearchChange: FormEventHandler<HTMLInputElement>;
+  onSearchKeyDown: KeyboardEventHandler<HTMLInputElement>;
+  onTransformationAdd: Function;
+  suffix: ReactNode;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  xforms: Array<TransformerRegistryItem<any>>;
+}
+
+export function TransformationPicker(props: TransformationPickerProps) {
+  const { noTransforms, search, xforms, onSearchChange, onSearchKeyDown, onTransformationAdd, suffix } = props;
+
+  return (
+    <VerticalGroup>
+      {noTransforms && (
+        <Container grow={1}>
+          <LocalStorageValueProvider<boolean> storageKey={LOCAL_STORAGE_KEY} defaultValue={false}>
+            {(isDismissed, onDismiss) => {
+              if (isDismissed) {
+                return null;
+              }
+
+              return (
+                <Alert
+                  title="Transformations"
+                  severity="info"
+                  onRemove={() => {
+                    onDismiss(true);
+                  }}
+                >
+                  <p>
+                    Transformations allow you to join, calculate, re-order, hide, and rename your query results before
+                    they are visualized. <br />
+                    Many transforms are not suitable if you&apos;re using the Graph visualization, as it currently only
+                    supports time series data. <br />
+                    It can help to switch to the Table visualization to understand what a transformation is doing.{' '}
+                  </p>
+                  <a
+                    href={getDocsLink(DocsId.Transformations)}
+                    className="external-link"
+                    target="_blank"
+                    rel="noreferrer"
+                  >
+                    Read more
+                  </a>
+                </Alert>
+              );
+            }}
+          </LocalStorageValueProvider>
+        </Container>
+      )}
+      <Input
+        data-testid={selectors.components.Transforms.searchInput}
+        value={search ?? ''}
+        autoFocus={!noTransforms}
+        placeholder="Search for transformation"
+        onChange={onSearchChange}
+        onKeyDown={onSearchKeyDown}
+        suffix={suffix}
+      />
+      {xforms.map((t) => {
+        return (
+          <TransformationCard
+            key={t.name}
+            transform={t}
+            onClick={() => {
+              onTransformationAdd({ value: t.id });
+            }}
+          />
+        );
+      })}
+    </VerticalGroup>
+  );
+}
+
+interface TransformationCardProps {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  transform: TransformerRegistryItem<any>;
+  onClick: () => void;
+}
+
+function TransformationCard({ transform, onClick }: TransformationCardProps) {
+  const styles = useStyles2(getStyles);
+  return (
+    <Card
+      className={styles.card}
+      data-testid={selectors.components.TransformTab.newTransform(transform.name)}
+      onClick={onClick}
+    >
+      <Card.Heading>{transform.name}</Card.Heading>
+      <Card.Description>{transform.description}</Card.Description>
+      {transform.state && (
+        <Card.Tags>
+          <PluginStateInfo state={transform.state} />
+        </Card.Tags>
+      )}
+    </Card>
+  );
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    card: css({
+      margin: '0',
+      padding: `${theme.spacing(1)}`,
+    }),
+  };
+}
diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationPickerNg.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationPickerNg.tsx
new file mode 100644
index 0000000000000..09304c25133a6
--- /dev/null
+++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationPickerNg.tsx
@@ -0,0 +1,315 @@
+import { cx, css } from '@emotion/css';
+import React, { FormEventHandler, KeyboardEventHandler, ReactNode, useCallback } from 'react';
+
+import {
+  DataFrame,
+  DataTransformerID,
+  TransformerRegistryItem,
+  TransformationApplicabilityLevels,
+  GrafanaTheme2,
+  standardTransformersRegistry,
+  SelectableValue,
+} from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { Card, Drawer, FilterPill, IconButton, Input, Switch, useStyles2 } from '@grafana/ui';
+import config from 'app/core/config';
+import { PluginStateInfo } from 'app/features/plugins/components/PluginStateInfo';
+import { categoriesLabels } from 'app/features/transformers/utils';
+
+import { FilterCategory } from './TransformationsEditor';
+
+const viewAllLabel = 'View all';
+const VIEW_ALL_VALUE = 'viewAll';
+const filterCategoriesLabels: Array<[FilterCategory, string]> = [
+  [VIEW_ALL_VALUE, viewAllLabel],
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  ...(Object.entries(categoriesLabels) as Array<[FilterCategory, string]>),
+];
+
+interface TransformationPickerNgProps {
+  onTransformationAdd: (selectedItem: SelectableValue<string>) => void;
+  onSearchChange: FormEventHandler<HTMLInputElement>;
+  onSearchKeyDown: KeyboardEventHandler<HTMLInputElement>;
+  onClose?: () => void;
+  noTransforms: boolean;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  xforms: Array<TransformerRegistryItem<any>>;
+  search: string;
+  suffix: ReactNode;
+  data: DataFrame[];
+  showIllustrations?: boolean;
+  onShowIllustrationsChange?: (showIllustrations: boolean) => void;
+  onSelectedFilterChange?: (category: FilterCategory) => void;
+  selectedFilter?: FilterCategory;
+}
+
+export function TransformationPickerNg(props: TransformationPickerNgProps) {
+  const styles = useStyles2(getTransformationPickerStyles);
+  const {
+    suffix,
+    xforms,
+    search,
+    onSearchChange,
+    onSearchKeyDown,
+    showIllustrations,
+    onTransformationAdd,
+    selectedFilter,
+    data,
+    onClose,
+    onShowIllustrationsChange,
+    onSelectedFilterChange,
+  } = props;
+
+  // Use a callback ref to call "click" on the search input
+  // This will focus it when it's opened
+  const searchInputRef = useCallback((input: HTMLInputElement) => {
+    input?.click();
+  }, []);
+
+  return (
+    <Drawer
+      size="md"
+      onClose={() => {
+        onClose && onClose();
+      }}
+      title="Add another transformation"
+    >
+      <div className={styles.searchWrapper}>
+        <Input
+          data-testid={selectors.components.Transforms.searchInput}
+          className={styles.searchInput}
+          value={search ?? ''}
+          placeholder="Search for transformation"
+          onChange={onSearchChange}
+          onKeyDown={onSearchKeyDown}
+          suffix={suffix}
+          ref={searchInputRef}
+        />
+        <div className={styles.showImages}>
+          <span className={styles.illustationSwitchLabel}>Show images</span>{' '}
+          <Switch
+            value={showIllustrations}
+            onChange={() => onShowIllustrationsChange && onShowIllustrationsChange(!showIllustrations)}
+          />
+        </div>
+      </div>
+
+      <div className={styles.filterWrapper}>
+        {filterCategoriesLabels.map(([slug, label]) => {
+          return (
+            <FilterPill
+              key={slug}
+              onClick={() => onSelectedFilterChange && onSelectedFilterChange(slug)}
+              label={label}
+              selected={selectedFilter === slug}
+            />
+          );
+        })}
+      </div>
+
+      <TransformationsGrid
+        showIllustrations={showIllustrations}
+        transformations={xforms}
+        data={data}
+        onClick={(id) => {
+          onTransformationAdd({ value: id });
+        }}
+      />
+    </Drawer>
+  );
+}
+
+function getTransformationPickerStyles(theme: GrafanaTheme2) {
+  return {
+    showImages: css({
+      flexBasis: '0',
+      display: 'flex',
+      gap: '8px',
+      alignItems: 'center',
+    }),
+    pickerInformationLine: css({
+      fontSize: '16px',
+      marginBottom: `${theme.spacing(2)}`,
+    }),
+    pickerInformationLineHighlight: css({
+      verticalAlign: 'middle',
+    }),
+    searchWrapper: css({
+      display: 'flex',
+      flexWrap: 'wrap',
+      columnGap: '27px',
+      rowGap: '16px',
+      width: '100%',
+    }),
+    searchInput: css({
+      flexGrow: '1',
+      width: 'initial',
+    }),
+    illustationSwitchLabel: css({
+      whiteSpace: 'nowrap',
+    }),
+    filterWrapper: css({
+      padding: `${theme.spacing(1)} 0`,
+      display: 'flex',
+      flexWrap: 'wrap',
+      rowGap: `${theme.spacing(1)}`,
+      columnGap: `${theme.spacing(0.5)}`,
+    }),
+  };
+}
+
+interface TransformationsGridProps {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  transformations: Array<TransformerRegistryItem<any>>;
+  showIllustrations?: boolean;
+  onClick: (id: string) => void;
+  data: DataFrame[];
+}
+
+function TransformationsGrid({ showIllustrations, transformations, onClick, data }: TransformationsGridProps) {
+  const styles = useStyles2(getTransformationGridStyles);
+
+  return (
+    <div className={styles.grid}>
+      {transformations.map((transform) => {
+        // Check to see if the transform
+        // is applicable to the given data
+        let applicabilityScore = TransformationApplicabilityLevels.Applicable;
+        if (transform.transformation.isApplicable !== undefined) {
+          applicabilityScore = transform.transformation.isApplicable(data);
+        }
+        const isApplicable = applicabilityScore > 0;
+
+        let applicabilityDescription = null;
+        if (transform.transformation.isApplicableDescription !== undefined) {
+          if (typeof transform.transformation.isApplicableDescription === 'function') {
+            applicabilityDescription = transform.transformation.isApplicableDescription(data);
+          } else {
+            applicabilityDescription = transform.transformation.isApplicableDescription;
+          }
+        }
+
+        // Add disabled styles to disabled
+        let cardClasses = styles.newCard;
+        if (!isApplicable) {
+          cardClasses = cx(styles.newCard, styles.cardDisabled);
+        }
+
+        return (
+          <Card
+            className={cardClasses}
+            data-testid={selectors.components.TransformTab.newTransform(transform.name)}
+            onClick={() => onClick(transform.id)}
+            key={transform.id}
+          >
+            <Card.Heading className={styles.heading}>
+              <span>{transform.name}</span>
+              <span className={styles.pluginStateInfoWrapper}>
+                <PluginStateInfo state={transform.state} />
+              </span>
+            </Card.Heading>
+            <Card.Description className={styles.description}>
+              <span>{getTransformationsRedesignDescriptions(transform.id)}</span>
+              {showIllustrations && (
+                <span>
+                  <img className={styles.image} src={getImagePath(transform.id, !isApplicable)} alt={transform.name} />
+                </span>
+              )}
+              {!isApplicable && applicabilityDescription !== null && (
+                <IconButton
+                  className={styles.cardApplicableInfo}
+                  name="info-circle"
+                  tooltip={applicabilityDescription}
+                />
+              )}
+            </Card.Description>
+          </Card>
+        );
+      })}
+    </div>
+  );
+}
+
+function getTransformationGridStyles(theme: GrafanaTheme2) {
+  return {
+    // eslint-disable-next-line @emotion/syntax-preference
+    heading: css`
+            font-weight: 400,
+            > button: {
+                width: '100%',
+                display: 'flex',
+                justify-content: 'space-between',
+                align-items: 'center',
+                flex-wrap: 'no-wrap',
+        },`,
+    description: css({
+      fontSize: '12px',
+      display: 'flex',
+      flexDirection: 'column',
+      justifyContent: 'space-between',
+    }),
+    image: css({
+      display: 'block',
+      maxEidth: '100%`',
+      marginTop: `${theme.spacing(2)}`,
+    }),
+    grid: css({
+      display: 'grid',
+      gridTemplateColumns: 'repeat(auto-fill, minmax(220px, 1fr))',
+      gridAutoRows: '1fr',
+      gap: `${theme.spacing(2)} ${theme.spacing(1)}`,
+      width: '100%',
+    }),
+    cardDisabled: css({
+      backgroundColor: 'rgb(204, 204, 220, 0.045)',
+      color: `${theme.colors.text.disabled} !important`,
+    }),
+    cardApplicableInfo: css({
+      position: 'absolute',
+      bottom: `${theme.spacing(1)}`,
+      right: `${theme.spacing(1)}`,
+    }),
+    newCard: css({
+      gridTemplateRows: 'min-content 0 1fr 0',
+    }),
+    pluginStateInfoWrapper: css({
+      marginLeft: '5px',
+    }),
+  };
+}
+
+const getImagePath = (id: string, disabled: boolean) => {
+  let folder = null;
+  if (!disabled) {
+    folder = config.theme2.isDark ? 'dark' : 'light';
+  } else {
+    folder = 'disabled';
+  }
+
+  return `public/img/transformations/${folder}/${id}.svg`;
+};
+
+const TransformationDescriptionOverrides: { [key: string]: string } = {
+  [DataTransformerID.concatenate]: 'Combine all fields into a single frame.',
+  [DataTransformerID.configFromData]: 'Set unit, min, max and more.',
+  [DataTransformerID.fieldLookup]: 'Use a field value to lookup countries, states, or airports.',
+  [DataTransformerID.filterFieldsByName]: 'Remove parts of the query results using a regex pattern.',
+  [DataTransformerID.filterByRefId]: 'Remove rows from the data based on origin query',
+  [DataTransformerID.filterByValue]: 'Remove rows from the query results using user-defined filters.',
+  [DataTransformerID.groupBy]: 'Group data by a field value and create aggregate data.',
+  [DataTransformerID.groupingToMatrix]: 'Summarize and reorganize data based on three fields.',
+  [DataTransformerID.joinByField]: 'Combine rows from 2+ tables, based on a related field.',
+  [DataTransformerID.labelsToFields]: 'Group series by time and return labels or tags as fields.',
+  [DataTransformerID.merge]: 'Merge multiple series. Values will be combined into one row.',
+  [DataTransformerID.organize]: 'Re-order, hide, or rename fields.',
+  [DataTransformerID.partitionByValues]: 'Split a one-frame dataset into multiple series.',
+  [DataTransformerID.prepareTimeSeries]: 'Stretch data frames from the wide format into the long format.',
+  [DataTransformerID.reduce]: 'Reduce all rows or data points to a single value (ex. max, mean).',
+  [DataTransformerID.renameByRegex]:
+    'Rename parts of the query results using a regular expression and replacement pattern.',
+  [DataTransformerID.seriesToRows]: 'Merge multiple series. Return time, metric and values as a row.',
+};
+
+const getTransformationsRedesignDescriptions = (id: string): string => {
+  return TransformationDescriptionOverrides[id] || standardTransformersRegistry.getIfExists(id)?.description || '';
+};
diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.test.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.test.tsx
index 16aa54cf8cedd..e272b3bf3d475 100644
--- a/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.test.tsx
+++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.test.tsx
@@ -21,17 +21,17 @@ describe('TransformationsEditor', () => {
   standardTransformersRegistry.setInit(getStandardTransformers);
 
   describe('when no transformations configured', () => {
-    function renderList() {
+    it('renders transformation list by default and without transformationsRedesign on', () => {
       setup();
-
       const cards = screen.getAllByTestId(/New transform/i);
       expect(cards.length).toEqual(standardTransformersRegistry.list().length);
-    }
+    });
 
-    it('renders transformations selection list', renderList);
-    it('renders transformations selection list with transformationsRedesign feature toggled on', () => {
+    it('renders transformation empty message with transformationsRedesign feature toggled on', () => {
       config.featureToggles.transformationsRedesign = true;
-      renderList();
+      setup();
+      const message = screen.getAllByTestId('data-testid no transformations message');
+      expect(message.length).toEqual(1);
       config.featureToggles.transformationsRedesign = false;
     });
   });
@@ -93,7 +93,7 @@ describe('TransformationsEditor', () => {
 
         expect(screen.queryByTestId(debuggerSelector)).toBeNull();
 
-        const debugButton = screen.getByLabelText(selectors.components.QueryEditorRow.actionButton('Debug'));
+        const debugButton = screen.getByTestId(selectors.components.QueryEditorRow.actionButton('Debug'));
         await userEvent.click(debugButton);
 
         expect(screen.getByTestId(debuggerSelector)).toBeInTheDocument();
diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx
index 0a714b49c5a6b..b1efc16b8d347 100644
--- a/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx
+++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx
@@ -1,4 +1,3 @@
-import { cx, css } from '@emotion/css';
 import React, { ChangeEvent } from 'react';
 import { DragDropContext, Droppable, DropResult } from 'react-beautiful-dnd';
 import { Unsubscribable } from 'rxjs';
@@ -6,67 +5,49 @@ import { Unsubscribable } from 'rxjs';
 import {
   DataFrame,
   DataTransformerConfig,
-  DocsId,
-  GrafanaTheme2,
   PanelData,
   SelectableValue,
   standardTransformersRegistry,
-  TransformerRegistryItem,
   TransformerCategory,
-  DataTransformerID,
-  TransformationApplicabilityLevels,
 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { reportInteraction } from '@grafana/runtime';
 import {
-  Alert,
   Button,
   ConfirmModal,
   Container,
   CustomScrollbar,
-  FilterPill,
   Themeable,
-  VerticalGroup,
   withTheme,
-  Input,
-  Icon,
   IconButton,
-  useStyles2,
-  Card,
-  Switch,
+  ButtonGroup,
 } from '@grafana/ui';
-import { LocalStorageValueProvider } from 'app/core/components/LocalStorageValueProvider';
 import config from 'app/core/config';
-import { getDocsLink } from 'app/core/utils/docsLinks';
-import { PluginStateInfo } from 'app/features/plugins/components/PluginStateInfo';
-import { categoriesLabels } from 'app/features/transformers/utils';
+import { EmptyTransformationsMessage } from 'app/features/dashboard-scene/panel-edit/PanelDataPane/EmptyTransformationsMessage';
 
-import { AppNotificationSeverity } from '../../../../types';
 import { PanelModel } from '../../state';
 import { PanelNotSupported } from '../PanelEditor/PanelNotSupported';
 
 import { TransformationOperationRows } from './TransformationOperationRows';
+import { TransformationPicker } from './TransformationPicker';
+import { TransformationPickerNg } from './TransformationPickerNg';
 import { TransformationsEditorTransformation } from './types';
 
-const LOCAL_STORAGE_KEY = 'dashboard.components.TransformationEditor.featureInfoBox.isDismissed';
-
 interface TransformationsEditorProps extends Themeable {
   panel: PanelModel;
 }
 
-type viewAllType = 'viewAll';
-const viewAllValue = 'viewAll';
-const viewAllLabel = 'View all';
-
-type FilterCategory = TransformerCategory | viewAllType;
+export const VIEW_ALL_VALUE = 'viewAll';
+export type viewAllType = 'viewAll';
+export type FilterCategory = TransformerCategory | viewAllType;
 
-const filterCategoriesLabels: Array<[FilterCategory, string]> = [
-  [viewAllValue, viewAllLabel],
-  ...(Object.entries(categoriesLabels) as Array<[FilterCategory, string]>),
-];
+export interface TransformationData {
+  series: DataFrame[];
+  annotations?: DataFrame[];
+}
 
 interface State {
-  data: DataFrame[];
+  data: TransformationData;
   transformations: TransformationsEditorTransformation[];
   search: string;
   showPicker?: boolean;
@@ -89,9 +70,11 @@ class UnThemedTransformationsEditor extends React.PureComponent<TransformationsE
         transformation: t,
         id: ids[i],
       })),
-      data: [],
+      data: {
+        series: [],
+      },
       search: '',
-      selectedFilter: viewAllValue,
+      selectedFilter: VIEW_ALL_VALUE,
       showIllustrations: true,
     };
   }
@@ -141,7 +124,7 @@ class UnThemedTransformationsEditor extends React.PureComponent<TransformationsE
       .getQueryRunner()
       .getData({ withTransforms: false, withFieldConfig: false })
       .subscribe({
-        next: (panelData: PanelData) => this.setState({ data: panelData.series }),
+        next: (panelData: PanelData) => this.setState({ data: panelData }),
       });
   }
 
@@ -270,41 +253,57 @@ class UnThemedTransformationsEditor extends React.PureComponent<TransformationsE
     this.onChange(update);
   };
 
+  renderEmptyMessage = () => {
+    return (
+      <EmptyTransformationsMessage
+        onShowPicker={() => {
+          this.setState({ showPicker: true });
+        }}
+      ></EmptyTransformationsMessage>
+    );
+  };
+
   renderTransformationEditors = () => {
-    const styles = getStyles(config.theme2);
-    const { data, transformations, showPicker } = this.state;
-    const hide = config.featureToggles.transformationsRedesign && showPicker;
+    const { data, transformations } = this.state;
 
     return (
-      <div className={cx({ [styles.hide]: hide })}>
-        <DragDropContext onDragEnd={this.onDragEnd}>
-          <Droppable droppableId="transformations-list" direction="vertical">
-            {(provided) => {
-              return (
-                <div ref={provided.innerRef} {...provided.droppableProps}>
-                  <TransformationOperationRows
-                    configs={transformations}
-                    data={data}
-                    onRemove={this.onTransformationRemove}
-                    onChange={this.onTransformationChange}
-                  />
-                  {provided.placeholder}
-                </div>
-              );
-            }}
-          </Droppable>
-        </DragDropContext>
-      </div>
+      <DragDropContext onDragEnd={this.onDragEnd}>
+        <Droppable droppableId="transformations-list" direction="vertical">
+          {(provided) => {
+            return (
+              <div ref={provided.innerRef} {...provided.droppableProps}>
+                <TransformationOperationRows
+                  configs={transformations}
+                  data={data}
+                  onRemove={this.onTransformationRemove}
+                  onChange={this.onTransformationChange}
+                />
+                {provided.placeholder}
+              </div>
+            );
+          }}
+        </Droppable>
+      </DragDropContext>
     );
   };
 
   renderTransformsPicker() {
-    const styles = getStyles(config.theme2);
+    let { showPicker } = this.state;
     const { transformations, search } = this.state;
+    const { transformationsRedesign } = config.featureToggles;
+    const noTransforms = !transformations?.length;
+    const hasTransforms = transformations.length > 0;
     let suffix: React.ReactNode = null;
     let xforms = standardTransformersRegistry.list().sort((a, b) => (a.name > b.name ? 1 : b.name > a.name ? -1 : 0));
 
-    if (this.state.selectedFilter !== viewAllValue) {
+    // In the case we're not on the transformation
+    // redesign and there are no transformations
+    // then we show the picker in that case
+    if (!transformationsRedesign && noTransforms) {
+      showPicker = true;
+    }
+
+    if (this.state.selectedFilter !== VIEW_ALL_VALUE) {
       xforms = xforms.filter(
         (t) =>
           t.categories &&
@@ -336,9 +335,6 @@ class UnThemedTransformationsEditor extends React.PureComponent<TransformationsE
       xforms = filtered;
     }
 
-    const noTransforms = !transformations?.length;
-    const showPicker = noTransforms || this.state.showPicker;
-
     if (!suffix && showPicker && !noTransforms) {
       suffix = (
         <IconButton
@@ -351,211 +347,121 @@ class UnThemedTransformationsEditor extends React.PureComponent<TransformationsE
       );
     }
 
-    return (
-      <>
-        {noTransforms && !config.featureToggles.transformationsRedesign && (
-          <Container grow={1}>
-            <LocalStorageValueProvider<boolean> storageKey={LOCAL_STORAGE_KEY} defaultValue={false}>
-              {(isDismissed, onDismiss) => {
-                if (isDismissed) {
-                  return null;
-                }
-
-                return (
-                  <Alert
-                    title="Transformations"
-                    severity="info"
-                    onRemove={() => {
-                      onDismiss(true);
-                    }}
-                  >
-                    <p>
-                      Transformations allow you to join, calculate, re-order, hide, and rename your query results before
-                      they are visualized. <br />
-                      Many transforms are not suitable if you&apos;re using the Graph visualization, as it currently
-                      only supports time series data. <br />
-                      It can help to switch to the Table visualization to understand what a transformation is doing.{' '}
-                    </p>
-                    <a
-                      href={getDocsLink(DocsId.Transformations)}
-                      className="external-link"
-                      target="_blank"
-                      rel="noreferrer"
-                    >
-                      Read more
-                    </a>
-                  </Alert>
-                );
-              }}
-            </LocalStorageValueProvider>
-          </Container>
-        )}
-        {showPicker ? (
-          <>
-            {config.featureToggles.transformationsRedesign && (
-              <>
-                {!noTransforms && (
-                  <Button
-                    variant="secondary"
-                    fill="text"
-                    icon="angle-left"
-                    onClick={() => {
-                      this.setState({ showPicker: false });
-                    }}
-                  >
-                    Go back to&nbsp;<i>Transformations in use</i>
-                  </Button>
-                )}
-                <div className={styles.pickerInformationLine}>
-                  <a
-                    href={getDocsLink(DocsId.Transformations)}
-                    className="external-link"
-                    target="_blank"
-                    rel="noreferrer"
-                  >
-                    <span className={styles.pickerInformationLineHighlight}>Transformations</span>{' '}
-                    <Icon name="external-link-alt" />
-                  </a>
-                  &nbsp;allow you to manipulate your data before a visualization is applied.
-                </div>
-              </>
-            )}
-            <VerticalGroup>
-              {!config.featureToggles.transformationsRedesign && (
-                <Input
-                  data-testid={selectors.components.Transforms.searchInput}
-                  value={search ?? ''}
-                  autoFocus={!noTransforms}
-                  placeholder="Search for transformation"
-                  onChange={this.onSearchChange}
-                  onKeyDown={this.onSearchKeyDown}
-                  suffix={suffix}
-                />
-              )}
-
-              {!config.featureToggles.transformationsRedesign &&
-                xforms.map((t) => {
-                  return (
-                    <TransformationCard
-                      key={t.name}
-                      transform={t}
-                      onClick={() => {
-                        this.onTransformationAdd({ value: t.id });
-                      }}
-                    />
-                  );
-                })}
-
-              {config.featureToggles.transformationsRedesign && (
-                <div className={styles.searchWrapper}>
-                  <Input
-                    data-testid={selectors.components.Transforms.searchInput}
-                    className={styles.searchInput}
-                    value={search ?? ''}
-                    autoFocus={!noTransforms}
-                    placeholder="Search for transformation"
-                    onChange={this.onSearchChange}
-                    onKeyDown={this.onSearchKeyDown}
-                    suffix={suffix}
-                  />
-                  <div className={styles.showImages}>
-                    <span className={styles.illustationSwitchLabel}>Show images</span>{' '}
-                    <Switch
-                      value={this.state.showIllustrations}
-                      onChange={() => this.setState({ showIllustrations: !this.state.showIllustrations })}
-                    />
-                  </div>
-                </div>
-              )}
-
-              {config.featureToggles.transformationsRedesign && (
-                <div className={styles.filterWrapper}>
-                  {filterCategoriesLabels.map(([slug, label]) => {
-                    return (
-                      <FilterPill
-                        key={slug}
-                        onClick={() => this.setState({ selectedFilter: slug })}
-                        label={label}
-                        selected={this.state.selectedFilter === slug}
-                      />
-                    );
-                  })}
-                </div>
-              )}
-
-              {config.featureToggles.transformationsRedesign && (
-                <TransformationsGrid
-                  showIllustrations={this.state.showIllustrations}
-                  transformations={xforms}
-                  data={this.state.data}
-                  onClick={(id) => {
-                    this.onTransformationAdd({ value: id });
-                  }}
-                />
-              )}
-            </VerticalGroup>
-          </>
-        ) : (
+    // If we're in the transformation redesign
+    // we have the add transformation add the
+    // delete all control
+    let picker = null;
+    let deleteAll = null;
+    if (transformationsRedesign) {
+      picker = (
+        <TransformationPickerNg
+          noTransforms={noTransforms}
+          search={search}
+          suffix={suffix}
+          xforms={xforms}
+          onClose={() => this.setState({ showPicker: false })}
+          onSelectedFilterChange={(filter) => this.setState({ selectedFilter: filter })}
+          onShowIllustrationsChange={(showIllustrations) => this.setState({ showIllustrations })}
+          onSearchChange={this.onSearchChange}
+          onSearchKeyDown={this.onSearchKeyDown}
+          onTransformationAdd={this.onTransformationAdd}
+          data={this.state.data.series}
+          selectedFilter={this.state.selectedFilter}
+          showIllustrations={this.state.showIllustrations}
+        />
+      );
+
+      deleteAll = (
+        <>
           <Button
-            icon="plus"
+            icon="times"
             variant="secondary"
-            onClick={() => {
-              this.setState({ showPicker: true });
-            }}
-            data-testid={selectors.components.Transforms.addTransformationButton}
+            onClick={() => this.setState({ showRemoveAllModal: true })}
+            style={{ marginLeft: this.props.theme.spacing.md }}
           >
-            Add{config.featureToggles.transformationsRedesign ? ' another ' : ' '}transformation
+            Delete all transformations
           </Button>
-        )}
+          <ConfirmModal
+            isOpen={Boolean(this.state.showRemoveAllModal)}
+            title="Delete all transformations?"
+            body="By deleting all transformations, you will go back to the main selection screen."
+            confirmText="Delete all"
+            onConfirm={() => this.onTransformationRemoveAll()}
+            onDismiss={() => this.setState({ showRemoveAllModal: false })}
+          />
+        </>
+      );
+    }
+    // Otherwise we use the old picker
+    else {
+      picker = (
+        <TransformationPicker
+          noTransforms={noTransforms}
+          search={search}
+          suffix={suffix}
+          xforms={xforms}
+          onSearchChange={this.onSearchChange}
+          onSearchKeyDown={this.onSearchKeyDown}
+          onTransformationAdd={this.onTransformationAdd}
+        />
+      );
+    }
+
+    // Compose actions, if we're in the
+    // redesign a "Delete All Transformations"
+    // button (with confirm modal) is added
+    const actions = (
+      <ButtonGroup>
+        <Button
+          icon="plus"
+          variant="secondary"
+          onClick={() => {
+            this.setState({ showPicker: true });
+          }}
+          data-testid={selectors.components.Transforms.addTransformationButton}
+        >
+          Add another transformation
+        </Button>
+        {deleteAll}
+      </ButtonGroup>
+    );
+
+    return (
+      <>
+        {showPicker && picker}
+        {
+          // If the transformation redesign is enabled
+          // and there are transforms then show actions
+          (transformationsRedesign && hasTransforms && actions) ||
+            // If it's not enabled only show actions when there are
+            // transformations and the (old) picker isn't being shown
+            (!transformationsRedesign && !showPicker && hasTransforms && actions)
+        }
       </>
     );
   }
 
   render() {
-    const styles = getStyles(config.theme2);
     const {
       panel: { alert },
     } = this.props;
     const { transformations } = this.state;
-
     const hasTransforms = transformations.length > 0;
 
-    if (!hasTransforms && alert) {
-      return <PanelNotSupported message="Transformations can't be used on a panel with existing alerts" />;
+    // If there are any alerts then
+    // we can't use transformations
+    if (alert) {
+      const message = hasTransforms
+        ? "Transformations can't be used on a panel with alerts"
+        : "Transformations can't be used on a panel with existing alerts";
+      return <PanelNotSupported message={message} />;
     }
 
     return (
       <CustomScrollbar scrollTop={this.state.scrollTop} autoHeightMin="100%">
         <Container padding="lg">
           <div data-testid={selectors.components.TransformTab.content}>
-            {hasTransforms && alert ? (
-              <Alert
-                severity={AppNotificationSeverity.Error}
-                title="Transformations can't be used on a panel with alerts"
-              />
-            ) : null}
-            {hasTransforms && config.featureToggles.transformationsRedesign && !this.state.showPicker && (
-              <div className={styles.listInformationLineWrapper}>
-                <span className={styles.listInformationLineText}>Transformations in use</span>{' '}
-                <Button
-                  size="sm"
-                  variant="secondary"
-                  onClick={() => {
-                    this.setState({ showRemoveAllModal: true });
-                  }}
-                >
-                  Delete all transformations
-                </Button>
-                <ConfirmModal
-                  isOpen={Boolean(this.state.showRemoveAllModal)}
-                  title="Delete all transformations?"
-                  body="By deleting all transformations, you will go back to the main selection screen."
-                  confirmText="Delete all"
-                  onConfirm={() => this.onTransformationRemoveAll()}
-                  onDismiss={() => this.setState({ showRemoveAllModal: false })}
-                />
-              </div>
-            )}
+            {!hasTransforms && config.featureToggles.transformationsRedesign && this.renderEmptyMessage()}
             {hasTransforms && this.renderTransformationEditors()}
             {this.renderTransformsPicker()}
           </div>
@@ -565,240 +471,4 @@ class UnThemedTransformationsEditor extends React.PureComponent<TransformationsE
   }
 }
 
-interface TransformationCardProps {
-  transform: TransformerRegistryItem<any>;
-  onClick: () => void;
-}
-
-function TransformationCard({ transform, onClick }: TransformationCardProps) {
-  const styles = useStyles2(getStyles);
-  return (
-    <Card
-      className={styles.card}
-      data-testid={selectors.components.TransformTab.newTransform(transform.name)}
-      onClick={onClick}
-    >
-      <Card.Heading>{transform.name}</Card.Heading>
-      <Card.Description>{transform.description}</Card.Description>
-      {transform.state && (
-        <Card.Tags>
-          <PluginStateInfo state={transform.state} />
-        </Card.Tags>
-      )}
-    </Card>
-  );
-}
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    hide: css({
-      display: 'none',
-    }),
-    card: css({
-      margin: '0',
-      padding: `${theme.spacing(1)}`,
-    }),
-    grid: css({
-      display: 'grid',
-      gridTemplateColumns: 'repeat(auto-fill, minmax(220px, 1fr))',
-      gridAutoRows: '1fr',
-      gap: `${theme.spacing(2)} ${theme.spacing(1)}`,
-      width: '100%',
-    }),
-    newCard: css({
-      gridTemplateRows: 'min-content 0 1fr 0',
-    }),
-    cardDisabled: css({
-      backgroundColor: 'rgb(204, 204, 220, 0.045)',
-      color: `${theme.colors.text.disabled} !important`,
-    }),
-    heading: css`
-      font-weight: 400,
-      > button: {
-        width: '100%',
-        display: 'flex',
-        justify-content: 'space-between',
-        align-items: 'center',
-        flex-wrap: 'no-wrap',
-      },
-    `,
-    description: css({
-      fontSize: '12px',
-      display: 'flex',
-      flexDirection: 'column',
-      justifyContent: 'space-between',
-    }),
-    image: css({
-      display: 'block',
-      maxEidth: '100%`',
-      marginTop: `${theme.spacing(2)}`,
-    }),
-    searchWrapper: css({
-      display: 'flex',
-      flexWrap: 'wrap',
-      columnGap: '27px',
-      rowGap: '16px',
-      width: '100%',
-    }),
-    searchInput: css({
-      flexGrow: '1',
-      width: 'initial',
-    }),
-    showImages: css({
-      flexBasis: '0',
-      display: 'flex',
-      gap: '8px',
-      alignItems: 'center',
-    }),
-    pickerInformationLine: css({
-      fontSize: '16px',
-      marginBottom: `${theme.spacing(2)}`,
-    }),
-    pickerInformationLineHighlight: css({
-      verticalAlign: 'middle',
-    }),
-    illustationSwitchLabel: css({
-      whiteSpace: 'nowrap',
-    }),
-    filterWrapper: css({
-      padding: `${theme.spacing(1)} 0`,
-      display: 'flex',
-      flexWrap: 'wrap',
-      rowGap: `${theme.spacing(1)}`,
-      columnGap: `${theme.spacing(0.5)}`,
-    }),
-    listInformationLineWrapper: css({
-      display: 'flex',
-      justifyContent: 'space-between',
-      marginBottom: '24px',
-    }),
-    listInformationLineText: css({
-      fontSize: '16px',
-    }),
-    pluginStateInfoWrapper: css({
-      marginLeft: '5px',
-    }),
-    cardApplicableInfo: css({
-      position: 'absolute',
-      bottom: `${theme.spacing(1)}`,
-      right: `${theme.spacing(1)}`,
-    }),
-  };
-};
-
-interface TransformationsGridProps {
-  transformations: Array<TransformerRegistryItem<any>>;
-  showIllustrations?: boolean;
-  onClick: (id: string) => void;
-  data: DataFrame[];
-}
-
-function TransformationsGrid({ showIllustrations, transformations, onClick, data }: TransformationsGridProps) {
-  const styles = useStyles2(getStyles);
-
-  return (
-    <div className={styles.grid}>
-      {transformations.map((transform) => {
-        // Check to see if the transform
-        // is applicable to the given data
-        let applicabilityScore = TransformationApplicabilityLevels.Applicable;
-        if (transform.transformation.isApplicable !== undefined) {
-          applicabilityScore = transform.transformation.isApplicable(data);
-        }
-        const isApplicable = applicabilityScore > 0;
-
-        let applicabilityDescription = null;
-        if (transform.transformation.isApplicableDescription !== undefined) {
-          if (typeof transform.transformation.isApplicableDescription === 'function') {
-            applicabilityDescription = transform.transformation.isApplicableDescription(data);
-          } else {
-            applicabilityDescription = transform.transformation.isApplicableDescription;
-          }
-        }
-
-        // Add disabled styles to disabled
-        let cardClasses = styles.newCard;
-        if (!isApplicable) {
-          cardClasses = cx(styles.newCard, styles.cardDisabled);
-        }
-
-        return (
-          <Card
-            className={cardClasses}
-            data-testid={selectors.components.TransformTab.newTransform(transform.name)}
-            onClick={() => onClick(transform.id)}
-            key={transform.id}
-          >
-            <Card.Heading className={styles.heading}>
-              <>
-                <span>{transform.name}</span>
-                <span className={styles.pluginStateInfoWrapper}>
-                  <PluginStateInfo state={transform.state} />
-                </span>
-              </>
-            </Card.Heading>
-            <Card.Description className={styles.description}>
-              <>
-                <span>{getTransformationsRedesignDescriptions(transform.id)}</span>
-                {showIllustrations && (
-                  <span>
-                    <img
-                      className={styles.image}
-                      src={getImagePath(transform.id, !isApplicable)}
-                      alt={transform.name}
-                    />
-                  </span>
-                )}
-                {!isApplicable && applicabilityDescription !== null && (
-                  <IconButton
-                    className={styles.cardApplicableInfo}
-                    name="info-circle"
-                    tooltip={applicabilityDescription}
-                  />
-                )}
-              </>
-            </Card.Description>
-          </Card>
-        );
-      })}
-    </div>
-  );
-}
-
-const getImagePath = (id: string, disabled: boolean) => {
-  let folder = null;
-  if (!disabled) {
-    folder = config.theme2.isDark ? 'dark' : 'light';
-  } else {
-    folder = 'disabled';
-  }
-
-  return `public/img/transformations/${folder}/${id}.svg`;
-};
-
-const getTransformationsRedesignDescriptions = (id: string): string => {
-  const overrides: { [key: string]: string } = {
-    [DataTransformerID.concatenate]: 'Combine all fields into a single frame.',
-    [DataTransformerID.configFromData]: 'Set unit, min, max and more.',
-    [DataTransformerID.fieldLookup]: 'Use a field value to lookup countries, states, or airports.',
-    [DataTransformerID.filterFieldsByName]: 'Remove parts of the query results using a regex pattern.',
-    [DataTransformerID.filterByRefId]: 'Remove rows from the data based on origin query',
-    [DataTransformerID.filterByValue]: 'Remove rows from the query results using user-defined filters.',
-    [DataTransformerID.groupBy]: 'Group data by a field value and create aggregate data.',
-    [DataTransformerID.groupingToMatrix]: 'Summarize and reorganize data based on three fields.',
-    [DataTransformerID.joinByField]: 'Combine rows from 2+ tables, based on a related field.',
-    [DataTransformerID.labelsToFields]: 'Group series by time and return labels or tags as fields.',
-    [DataTransformerID.merge]: 'Merge multiple series. Values will be combined into one row.',
-    [DataTransformerID.organize]: 'Re-order, hide, or rename fields.',
-    [DataTransformerID.partitionByValues]: 'Split a one-frame dataset into multiple series.',
-    [DataTransformerID.prepareTimeSeries]: 'Stretch data frames from the wide format into the long format.',
-    [DataTransformerID.reduce]: 'Reduce all rows or data points to a single value (ex. max, mean).',
-    [DataTransformerID.renameByRegex]:
-      'Rename parts of the query results using a regular expression and replacement pattern.',
-    [DataTransformerID.seriesToRows]: 'Merge multiple series. Return time, metric and values as a row.',
-  };
-
-  return overrides[id] || standardTransformersRegistry.getIfExists(id)?.description || '';
-};
-
 export const TransformationsEditor = withTheme(UnThemedTransformationsEditor);
diff --git a/public/app/features/dashboard/components/VersionHistory/DiffTitle.tsx b/public/app/features/dashboard/components/VersionHistory/DiffTitle.tsx
deleted file mode 100644
index c25c78c736107..0000000000000
--- a/public/app/features/dashboard/components/VersionHistory/DiffTitle.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import { css } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { useStyles2, Icon } from '@grafana/ui';
-
-import { DiffValues } from './DiffValues';
-import { Diff, getDiffText } from './utils';
-
-type DiffTitleProps = {
-  diff?: Diff;
-  title: string;
-};
-
-const replaceDiff: Diff = { op: 'replace', originalValue: undefined, path: [''], value: undefined, startLineNumber: 0 };
-
-export const DiffTitle = ({ diff, title }: DiffTitleProps) => {
-  const styles = useStyles2(getDiffTitleStyles);
-
-  return diff ? (
-    <>
-      <Icon type="mono" name="circle" className={styles[diff.op]} /> <span className={styles.embolden}>{title}</span>{' '}
-      <span>{getDiffText(diff, diff.path.length > 1)}</span> <DiffValues diff={diff} />
-    </>
-  ) : (
-    <div className={styles.withoutDiff}>
-      <Icon type="mono" name="circle" className={styles.replace} /> <span className={styles.embolden}>{title}</span>{' '}
-      <span>{getDiffText(replaceDiff, false)}</span>
-    </div>
-  );
-};
-
-const getDiffTitleStyles = (theme: GrafanaTheme2) => ({
-  embolden: css`
-    font-weight: ${theme.typography.fontWeightBold};
-  `,
-  add: css`
-    color: ${theme.colors.success.main};
-  `,
-  replace: css`
-    color: ${theme.colors.success.main};
-  `,
-  move: css`
-    color: ${theme.colors.success.main};
-  `,
-  copy: css`
-    color: ${theme.colors.success.main};
-  `,
-  _get: css`
-    color: ${theme.colors.success.main};
-  `,
-  test: css`
-    color: ${theme.colors.success.main};
-  `,
-  remove: css`
-    color: ${theme.colors.success.main};
-  `,
-  withoutDiff: css`
-    margin-bottom: ${theme.spacing(2)};
-  `,
-});
diff --git a/public/app/features/dashboard/components/VersionHistory/DiffValues.tsx b/public/app/features/dashboard/components/VersionHistory/DiffValues.tsx
deleted file mode 100644
index cff84ade26d68..0000000000000
--- a/public/app/features/dashboard/components/VersionHistory/DiffValues.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { css } from '@emotion/css';
-import { isArray, isObject, isUndefined } from 'lodash';
-import React from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { useStyles2, Icon } from '@grafana/ui';
-
-import { Diff } from './utils';
-
-type DiffProps = {
-  diff: Diff;
-};
-
-export const DiffValues = ({ diff }: DiffProps) => {
-  const styles = useStyles2(getStyles);
-  const hasLeftValue =
-    !isUndefined(diff.originalValue) && !isArray(diff.originalValue) && !isObject(diff.originalValue);
-  const hasRightValue = !isUndefined(diff.value) && !isArray(diff.value) && !isObject(diff.value);
-
-  return (
-    <>
-      {hasLeftValue && <span className={styles}>{String(diff.originalValue)}</span>}
-      {hasLeftValue && hasRightValue ? <Icon name="arrow-right" /> : null}
-      {hasRightValue && <span className={styles}>{String(diff.value)}</span>}
-    </>
-  );
-};
-
-const getStyles = (theme: GrafanaTheme2) => css`
-  background-color: ${theme.colors.action.hover};
-  border-radius: ${theme.shape.radius.default};
-  color: ${theme.colors.text.primary};
-  font-size: ${theme.typography.body.fontSize};
-  margin: 0 ${theme.spacing(0.5)};
-  padding: ${theme.spacing(0.5, 1)};
-`;
diff --git a/public/app/features/dashboard/components/VersionHistory/HistorySrv.test.ts b/public/app/features/dashboard/components/VersionHistory/HistorySrv.test.ts
deleted file mode 100644
index 8571795c054eb..0000000000000
--- a/public/app/features/dashboard/components/VersionHistory/HistorySrv.test.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { DashboardModel } from '../../state/DashboardModel';
-import { createDashboardModelFixture } from '../../state/__fixtures__/dashboardFixtures';
-
-import { HistorySrv } from './HistorySrv';
-import { restore, versions } from './__mocks__/dashboardHistoryMocks';
-
-const getMock = jest.fn().mockResolvedValue({});
-const postMock = jest.fn().mockResolvedValue({});
-
-jest.mock('app/core/store');
-jest.mock('@grafana/runtime', () => {
-  const original = jest.requireActual('@grafana/runtime');
-
-  return {
-    ...original,
-    getBackendSrv: () => ({
-      post: postMock,
-      get: getMock,
-    }),
-  };
-});
-
-describe('historySrv', () => {
-  const versionsResponse = versions();
-  const restoreResponse = restore;
-
-  let historySrv = new HistorySrv();
-
-  const dash = createDashboardModelFixture({ uid: '_U4zObQMz' });
-  const emptyDash = createDashboardModelFixture();
-  const historyListOpts = { limit: 10, start: 0 };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  describe('getHistoryList', () => {
-    it('should return a versions array for the given dashboard id', () => {
-      getMock.mockImplementation(() => Promise.resolve(versionsResponse));
-      historySrv = new HistorySrv();
-
-      return historySrv.getHistoryList(dash, historyListOpts).then((versions) => {
-        expect(versions).toEqual(versionsResponse);
-      });
-    });
-
-    it('should return an empty array when not given an id', () => {
-      return historySrv.getHistoryList(emptyDash, historyListOpts).then((versions) => {
-        expect(versions).toEqual([]);
-      });
-    });
-
-    it('should return an empty array when not given a dashboard', () => {
-      return historySrv.getHistoryList(null as unknown as DashboardModel, historyListOpts).then((versions) => {
-        expect(versions).toEqual([]);
-      });
-    });
-  });
-
-  describe('restoreDashboard', () => {
-    it('should return a success response given valid parameters', () => {
-      const version = 6;
-      postMock.mockImplementation(() => Promise.resolve(restoreResponse(version)));
-      historySrv = new HistorySrv();
-      return historySrv.restoreDashboard(dash, version).then((response) => {
-        expect(response).toEqual(restoreResponse(version));
-      });
-    });
-
-    it('should return an empty object when not given an id', async () => {
-      historySrv = new HistorySrv();
-      const rsp = await historySrv.restoreDashboard(emptyDash, 6);
-      expect(rsp).toEqual({});
-    });
-  });
-});
diff --git a/public/app/features/dashboard/components/VersionHistory/HistorySrv.ts b/public/app/features/dashboard/components/VersionHistory/HistorySrv.ts
deleted file mode 100644
index 351882ac6dc99..0000000000000
--- a/public/app/features/dashboard/components/VersionHistory/HistorySrv.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { isNumber } from 'lodash';
-
-import { getBackendSrv } from '@grafana/runtime';
-
-import { DashboardModel } from '../../state/DashboardModel';
-
-export interface HistoryListOpts {
-  limit: number;
-  start: number;
-}
-
-export interface RevisionsModel {
-  id: number;
-  checked: boolean;
-  dashboardUID: string;
-  parentVersion: number;
-  version: number;
-  created: Date;
-  createdBy: string;
-  message: string;
-}
-
-export interface DiffTarget {
-  dashboardUID: string;
-  version: number;
-  unsavedDashboard?: DashboardModel; // when doing diffs against unsaved dashboard version
-}
-
-export class HistorySrv {
-  getHistoryList(dashboard: DashboardModel, options: HistoryListOpts) {
-    const uid = dashboard && dashboard.uid ? dashboard.uid : void 0;
-    return uid ? getBackendSrv().get(`api/dashboards/uid/${uid}/versions`, options) : Promise.resolve([]);
-  }
-
-  getDashboardVersion(uid: string, version: number) {
-    return getBackendSrv().get(`api/dashboards/uid/${uid}/versions/${version}`);
-  }
-
-  restoreDashboard(dashboard: DashboardModel, version: number) {
-    const uid = dashboard && dashboard.uid ? dashboard.uid : void 0;
-    const url = `api/dashboards/uid/${uid}/restore`;
-
-    return uid && isNumber(version) ? getBackendSrv().post(url, { version }) : Promise.resolve({});
-  }
-}
-
-const historySrv = new HistorySrv();
-export { historySrv };
diff --git a/public/app/features/dashboard/components/VersionHistory/VersionHistoryComparison.tsx b/public/app/features/dashboard/components/VersionHistory/VersionHistoryComparison.tsx
index 1690197d87d35..0dab8cccf2cc4 100644
--- a/public/app/features/dashboard/components/VersionHistory/VersionHistoryComparison.tsx
+++ b/public/app/features/dashboard/components/VersionHistory/VersionHistoryComparison.tsx
@@ -2,20 +2,20 @@ import { css, cx } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Button, ModalsController, CollapsableSection, HorizontalGroup, useStyles2 } from '@grafana/ui';
+import { Button, ModalsController, CollapsableSection, useStyles2, Stack, Icon, Box } from '@grafana/ui';
+import { DiffGroup } from 'app/features/dashboard-scene/settings/version-history/DiffGroup';
+import { DiffViewer } from 'app/features/dashboard-scene/settings/version-history/DiffViewer';
+import { jsonDiff } from 'app/features/dashboard-scene/settings/version-history/utils';
 
 import { DecoratedRevisionModel } from '../DashboardSettings/VersionsSettings';
 
-import { DiffGroup } from './DiffGroup';
-import { DiffViewer } from './DiffViewer';
 import { RevertDashboardModal } from './RevertDashboardModal';
-import { jsonDiff } from './utils';
 
 type DiffViewProps = {
   isNewLatest: boolean;
   newInfo: DecoratedRevisionModel;
   baseInfo: DecoratedRevisionModel;
-  diffData: { lhs: unknown; rhs: unknown };
+  diffData: { lhs: string; rhs: string };
 };
 
 export const VersionHistoryComparison = ({ baseInfo, newInfo, diffData, isNewLatest }: DiffViewProps) => {
@@ -23,60 +23,61 @@ export const VersionHistoryComparison = ({ baseInfo, newInfo, diffData, isNewLat
   const styles = useStyles2(getStyles);
 
   return (
-    <div>
-      <div className={styles.spacer}>
-        <HorizontalGroup justify="space-between" align="center">
-          <div>
-            <p className={styles.versionInfo}>
-              <strong>Version {newInfo.version}</strong> updated by {newInfo.createdBy} {newInfo.ageString} -{' '}
-              {newInfo.message}
-            </p>
-            <p className={cx(styles.versionInfo, styles.noMarginBottom)}>
-              <strong>Version {baseInfo.version}</strong> updated by {baseInfo.createdBy} {baseInfo.ageString} -{' '}
-              {baseInfo.message}
-            </p>
-          </div>
-          {isNewLatest && (
-            <ModalsController>
-              {({ showModal, hideModal }) => (
-                <Button
-                  variant="destructive"
-                  icon="history"
-                  onClick={() => {
-                    showModal(RevertDashboardModal, {
-                      version: baseInfo.version,
-                      hideModal,
-                    });
-                  }}
-                >
-                  Restore to version {baseInfo.version}
-                </Button>
-              )}
-            </ModalsController>
-          )}
-        </HorizontalGroup>
-      </div>
-      <div className={styles.spacer}>
-        {Object.entries(diff).map(([key, diffs]) => (
-          <DiffGroup diffs={diffs} key={key} title={key} />
-        ))}
-      </div>
-      <CollapsableSection isOpen={false} label="View JSON Diff">
-        <DiffViewer oldValue={JSON.stringify(diffData.lhs, null, 2)} newValue={JSON.stringify(diffData.rhs, null, 2)} />
-      </CollapsableSection>
-    </div>
+    <Stack direction="column" gap={1}>
+      <Stack justifyContent="space-between" alignItems="center">
+        <Stack alignItems="center">
+          <span className={cx(styles.versionInfo, styles.noMarginBottom)}>
+            <strong>Version {baseInfo.version}</strong> updated by {baseInfo.createdBy} {baseInfo.ageString}
+            {baseInfo.message}
+          </span>
+          <Icon name="arrow-right" size="sm" />
+          <span className={styles.versionInfo}>
+            <strong>Version {newInfo.version}</strong> updated by {newInfo.createdBy} {newInfo.ageString}
+            {newInfo.message}
+          </span>
+        </Stack>
+        {isNewLatest && (
+          <ModalsController>
+            {({ showModal, hideModal }) => (
+              <Button
+                variant="destructive"
+                icon="history"
+                onClick={() => {
+                  showModal(RevertDashboardModal, {
+                    version: baseInfo.version,
+                    hideModal,
+                  });
+                }}
+              >
+                Restore to version {baseInfo.version}
+              </Button>
+            )}
+          </ModalsController>
+        )}
+      </Stack>
+
+      {Object.entries(diff).map(([key, diffs]) => (
+        <DiffGroup diffs={diffs} key={key} title={key} />
+      ))}
+
+      <Box paddingTop={2}>
+        <CollapsableSection isOpen={false} label="View JSON Diff">
+          <DiffViewer
+            oldValue={JSON.stringify(diffData.lhs, null, 2)}
+            newValue={JSON.stringify(diffData.rhs, null, 2)}
+          />
+        </CollapsableSection>
+      </Box>
+    </Stack>
   );
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  spacer: css`
-    margin-bottom: ${theme.spacing(4)};
-  `,
-  versionInfo: css`
-    color: ${theme.colors.text.secondary};
-    font-size: ${theme.typography.bodySmall.fontSize};
-  `,
-  noMarginBottom: css`
-    margin-bottom: 0;
-  `,
+  versionInfo: css({
+    color: theme.colors.text.secondary,
+    fontSize: theme.typography.bodySmall.fontSize,
+  }),
+  noMarginBottom: css({
+    marginBottom: 0,
+  }),
 });
diff --git a/public/app/features/dashboard/components/VersionHistory/VersionHistoryTable.tsx b/public/app/features/dashboard/components/VersionHistory/VersionHistoryTable.tsx
index 61f4c34878d3d..2f698bdc67c60 100644
--- a/public/app/features/dashboard/components/VersionHistory/VersionHistoryTable.tsx
+++ b/public/app/features/dashboard/components/VersionHistory/VersionHistoryTable.tsx
@@ -1,7 +1,8 @@
 import { css } from '@emotion/css';
 import React from 'react';
 
-import { Checkbox, Button, Tag, ModalsController } from '@grafana/ui';
+import { GrafanaTheme2 } from '@grafana/data';
+import { Checkbox, Button, Tag, ModalsController, useStyles2 } from '@grafana/ui';
 
 import { DecoratedRevisionModel } from '../DashboardSettings/VersionsSettings';
 
@@ -13,61 +14,75 @@ type VersionsTableProps = {
   onCheck: (ev: React.FormEvent<HTMLInputElement>, versionId: number) => void;
 };
 
-export const VersionHistoryTable = ({ versions, canCompare, onCheck }: VersionsTableProps) => (
-  <table className="filter-table gf-form-group">
-    <thead>
-      <tr>
-        <th className="width-4"></th>
-        <th className="width-4">Version</th>
-        <th className="width-14">Date</th>
-        <th className="width-10">Updated by</th>
-        <th>Notes</th>
-        <th></th>
-      </tr>
-    </thead>
-    <tbody>
-      {versions.map((version, idx) => (
-        <tr key={version.id}>
-          <td>
-            <Checkbox
-              aria-label={`Toggle selection of version ${version.version}`}
-              className={css`
-                display: inline;
-              `}
-              checked={version.checked}
-              onChange={(ev) => onCheck(ev, version.id)}
-              disabled={!version.checked && canCompare}
-            />
-          </td>
-          <td>{version.version}</td>
-          <td>{version.createdDateString}</td>
-          <td>{version.createdBy}</td>
-          <td>{version.message}</td>
-          <td className="text-right">
-            {idx === 0 ? (
-              <Tag name="Latest" colorIndex={17} />
-            ) : (
-              <ModalsController>
-                {({ showModal, hideModal }) => (
-                  <Button
-                    variant="secondary"
-                    size="sm"
-                    icon="history"
-                    onClick={() => {
-                      showModal(RevertDashboardModal, {
-                        version: version.version,
-                        hideModal,
-                      });
-                    }}
-                  >
-                    Restore
-                  </Button>
+export const VersionHistoryTable = ({ versions, canCompare, onCheck }: VersionsTableProps) => {
+  const styles = useStyles2(getStyles);
+
+  return (
+    <div className={styles.margin}>
+      <table className="filter-table">
+        <thead>
+          <tr>
+            <th className="width-4"></th>
+            <th className="width-4">Version</th>
+            <th className="width-14">Date</th>
+            <th className="width-10">Updated by</th>
+            <th>Notes</th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          {versions.map((version, idx) => (
+            <tr key={version.id}>
+              <td>
+                <Checkbox
+                  aria-label={`Toggle selection of version ${version.version}`}
+                  className={css({
+                    display: 'inline',
+                  })}
+                  checked={version.checked}
+                  onChange={(ev) => onCheck(ev, version.id)}
+                  disabled={!version.checked && canCompare}
+                />
+              </td>
+              <td>{version.version}</td>
+              <td>{version.createdDateString}</td>
+              <td>{version.createdBy}</td>
+              <td>{version.message}</td>
+              <td className="text-right">
+                {idx === 0 ? (
+                  <Tag name="Latest" colorIndex={17} />
+                ) : (
+                  <ModalsController>
+                    {({ showModal, hideModal }) => (
+                      <Button
+                        variant="secondary"
+                        size="sm"
+                        icon="history"
+                        onClick={() => {
+                          showModal(RevertDashboardModal, {
+                            version: version.version,
+                            hideModal,
+                          });
+                        }}
+                      >
+                        Restore
+                      </Button>
+                    )}
+                  </ModalsController>
                 )}
-              </ModalsController>
-            )}
-          </td>
-        </tr>
-      ))}
-    </tbody>
-  </table>
-);
+              </td>
+            </tr>
+          ))}
+        </tbody>
+      </table>
+    </div>
+  );
+};
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    margin: css({
+      marginBottom: theme.spacing(4),
+    }),
+  };
+}
diff --git a/public/app/features/dashboard/components/VersionHistory/useDashboardRestore.tsx b/public/app/features/dashboard/components/VersionHistory/useDashboardRestore.tsx
index b5f22045ad50e..af1f894d3f2f9 100644
--- a/public/app/features/dashboard/components/VersionHistory/useDashboardRestore.tsx
+++ b/public/app/features/dashboard/components/VersionHistory/useDashboardRestore.tsx
@@ -4,17 +4,16 @@ import { useAsyncFn } from 'react-use';
 import { locationUtil } from '@grafana/data';
 import { locationService } from '@grafana/runtime';
 import { useAppNotification } from 'app/core/copy/appNotification';
+import { historySrv } from 'app/features/dashboard-scene/settings/version-history';
 import { useSelector } from 'app/types';
 
 import { dashboardWatcher } from '../../../live/dashboard/dashboardWatcher';
 import { DashboardModel } from '../../state';
 
-import { historySrv } from './HistorySrv';
-
 const restoreDashboard = async (version: number, dashboard: DashboardModel) => {
   // Skip the watcher logic for this save since it's handled by the hook
   dashboardWatcher.ignoreNextSave();
-  return await historySrv.restoreDashboard(dashboard, version);
+  return await historySrv.restoreDashboard(dashboard.uid, version);
 };
 
 export const useDashboardRestore = (version: number) => {
diff --git a/public/app/features/dashboard/components/VersionHistory/utils.test.ts b/public/app/features/dashboard/components/VersionHistory/utils.test.ts
deleted file mode 100644
index 5523229b7dc36..0000000000000
--- a/public/app/features/dashboard/components/VersionHistory/utils.test.ts
+++ /dev/null
@@ -1,293 +0,0 @@
-import { Diff, getDiffOperationText, getDiffText, jsonDiff } from './utils';
-
-describe('getDiffOperationText', () => {
-  const cases = [
-    ['add', 'added'],
-    ['remove', 'deleted'],
-    ['replace', 'changed'],
-    ['byDefault', 'changed'],
-  ];
-
-  test.each(cases)('it returns the correct verb for an operation', (operation, expected) => {
-    expect(getDiffOperationText(operation)).toBe(expected);
-  });
-});
-
-type DiffTextCase = [Partial<Diff>, string];
-describe('getDiffText', () => {
-  const addEmptyArray: DiffTextCase = [
-    { op: 'add', value: [], path: ['annotations', 'list'], startLineNumber: 24 },
-    'added list',
-  ];
-  const addArrayNumericProp: DiffTextCase = [
-    {
-      op: 'add',
-      value: ['tag'],
-      path: ['panels', '3'],
-    },
-    'added item 3',
-  ];
-  const addArrayProp: DiffTextCase = [
-    {
-      op: 'add',
-      value: [{ name: 'dummy target 1' }, { name: 'dummy target 2' }],
-      path: ['panels', '3', 'targets'],
-    },
-    'added 2 targets',
-  ];
-  const addValueNumericProp: DiffTextCase = [
-    {
-      op: 'add',
-      value: 'foo',
-      path: ['panels', '3'],
-    },
-    'added item 3',
-  ];
-  const addValueProp: DiffTextCase = [
-    {
-      op: 'add',
-      value: 'foo',
-      path: ['panels', '3', 'targets'],
-    },
-    'added targets',
-  ];
-
-  const removeEmptyArray: DiffTextCase = [
-    { op: 'remove', originalValue: [], path: ['annotations', 'list'], startLineNumber: 24 },
-    'deleted list',
-  ];
-  const removeArrayNumericProp: DiffTextCase = [
-    {
-      op: 'remove',
-      originalValue: ['tag'],
-      path: ['panels', '3'],
-    },
-    'deleted item 3',
-  ];
-  const removeArrayProp: DiffTextCase = [
-    {
-      op: 'remove',
-      originalValue: [{ name: 'dummy target 1' }, { name: 'dummy target 2' }],
-      path: ['panels', '3', 'targets'],
-    },
-    'deleted 2 targets',
-  ];
-  const removeValueNumericProp: DiffTextCase = [
-    {
-      op: 'remove',
-      originalValue: 'foo',
-      path: ['panels', '3'],
-    },
-    'deleted item 3',
-  ];
-  const removeValueProp: DiffTextCase = [
-    {
-      op: 'remove',
-      originalValue: 'foo',
-      path: ['panels', '3', 'targets'],
-    },
-    'deleted targets',
-  ];
-  const replaceValueNumericProp: DiffTextCase = [
-    {
-      op: 'replace',
-      originalValue: 'foo',
-      value: 'bar',
-      path: ['panels', '3'],
-    },
-    'changed item 3',
-  ];
-  const replaceValueProp: DiffTextCase = [
-    {
-      op: 'replace',
-      originalValue: 'foo',
-      value: 'bar',
-      path: ['panels', '3', 'targets'],
-    },
-    'changed targets',
-  ];
-
-  const cases = [
-    addEmptyArray,
-    addArrayNumericProp,
-    addArrayProp,
-    addValueNumericProp,
-    addValueProp,
-    removeEmptyArray,
-    removeArrayNumericProp,
-    removeArrayProp,
-    removeValueNumericProp,
-    removeValueProp,
-    replaceValueNumericProp,
-    replaceValueProp,
-  ];
-
-  test.each(cases)(
-    'returns a semantic message based on the type of diff, the values and the location of the change',
-    (diff: Partial<Diff>, expected: string) => {
-      expect(getDiffText(diff as unknown as Diff)).toBe(expected);
-    }
-  );
-});
-
-describe('jsonDiff', () => {
-  it('returns data related to each change', () => {
-    const lhs = {
-      annotations: {
-        list: [
-          {
-            builtIn: 1,
-            datasource: '-- Grafana --',
-            enable: true,
-            hide: true,
-            iconColor: 'rgba(0, 211, 255, 1)',
-            name: 'Annotations & Alerts',
-            type: 'dashboard',
-          },
-        ],
-      },
-      editable: true,
-      gnetId: null,
-      graphTooltip: 0,
-      id: 141,
-      links: [],
-      panels: [],
-      schemaVersion: 27,
-      tags: [],
-      templating: {
-        list: [],
-      },
-      time: {
-        from: 'now-6h',
-        to: 'now',
-      },
-      timepicker: {},
-      timezone: '',
-      title: 'test dashboard',
-      uid: '_U4zObQMz',
-      version: 2,
-    };
-
-    const rhs = {
-      annotations: {
-        list: [
-          {
-            builtIn: 1,
-            datasource: '-- Grafana --',
-            enable: true,
-            hide: true,
-            iconColor: 'rgba(0, 211, 255, 1)',
-            name: 'Annotations & Alerts',
-            type: 'dashboard',
-          },
-        ],
-      },
-      description: 'a description',
-      editable: true,
-      gnetId: null,
-      graphTooltip: 1,
-      id: 141,
-      links: [],
-      panels: [
-        {
-          type: 'graph',
-        },
-      ],
-      schemaVersion: 27,
-      tags: ['the tag'],
-      templating: {
-        list: [],
-      },
-      time: {
-        from: 'now-6h',
-        to: 'now',
-      },
-      timepicker: {
-        refresh_intervals: ['5s', '10s', '30s', '1m', '5m', '15m', '30m', '1h', '2h', '1d', '2d'],
-      },
-      timezone: 'utc',
-      title: 'My favourite dashboard',
-      uid: '_U4zObQMz',
-      version: 3,
-    };
-
-    const expected = {
-      description: [
-        {
-          op: 'add',
-          originalValue: undefined,
-          path: ['description'],
-          startLineNumber: 14,
-          value: 'a description',
-        },
-      ],
-      graphTooltip: [
-        {
-          op: 'replace',
-          originalValue: 0,
-          path: ['graphTooltip'],
-          startLineNumber: 17,
-          value: 1,
-        },
-      ],
-      panels: [
-        {
-          op: 'add',
-          originalValue: undefined,
-          path: ['panels', '0'],
-          startLineNumber: 21,
-          value: {
-            type: 'graph',
-          },
-        },
-      ],
-      tags: [
-        {
-          op: 'add',
-          originalValue: undefined,
-          path: ['tags', '0'],
-          startLineNumber: 27,
-          value: 'the tag',
-        },
-      ],
-      timepicker: [
-        {
-          op: 'add',
-          originalValue: undefined,
-          path: ['timepicker', 'refresh_intervals'],
-          startLineNumber: 37,
-          value: ['5s', '10s', '30s', '1m', '5m', '15m', '30m', '1h', '2h', '1d', '2d'],
-        },
-      ],
-      timezone: [
-        {
-          op: 'replace',
-          originalValue: '',
-          path: ['timezone'],
-          startLineNumber: 51,
-          value: 'utc',
-        },
-      ],
-      title: [
-        {
-          op: 'replace',
-          originalValue: 'test dashboard',
-          path: ['title'],
-          startLineNumber: 52,
-          value: 'My favourite dashboard',
-        },
-      ],
-      version: [
-        {
-          op: 'replace',
-          originalValue: 2,
-          path: ['version'],
-          startLineNumber: 54,
-          value: 3,
-        },
-      ],
-    };
-
-    expect(jsonDiff(lhs, rhs)).toStrictEqual(expected);
-  });
-});
diff --git a/public/app/features/dashboard/components/VersionHistory/utils.ts b/public/app/features/dashboard/components/VersionHistory/utils.ts
deleted file mode 100644
index 9700c8a524c57..0000000000000
--- a/public/app/features/dashboard/components/VersionHistory/utils.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-import { compare, Operation } from 'fast-json-patch';
-// @ts-ignore
-import jsonMap from 'json-source-map';
-import { flow, get, isArray, isEmpty, last, sortBy, tail, toNumber, isNaN } from 'lodash';
-
-export type Diff = {
-  op: 'add' | 'replace' | 'remove' | 'copy' | 'test' | '_get' | 'move';
-  value: unknown;
-  originalValue: unknown;
-  path: string[];
-  startLineNumber: number;
-};
-
-export type Diffs = {
-  [key: string]: Diff[];
-};
-
-export const jsonDiff = (lhs: any, rhs: any): Diffs => {
-  const diffs = compare(lhs, rhs);
-  const lhsMap = jsonMap.stringify(lhs, null, 2);
-  const rhsMap = jsonMap.stringify(rhs, null, 2);
-
-  const getDiffInformation = (diffs: Operation[]): Diff[] => {
-    return diffs.map((diff) => {
-      let originalValue = undefined;
-      let value = undefined;
-      let startLineNumber = 0;
-
-      const path = tail(diff.path.split('/'));
-
-      if (diff.op === 'replace' && rhsMap.pointers[diff.path]) {
-        originalValue = get(lhs, path);
-        value = diff.value;
-        startLineNumber = rhsMap.pointers[diff.path].value.line;
-      }
-      if (diff.op === 'add' && rhsMap.pointers[diff.path]) {
-        value = diff.value;
-        startLineNumber = rhsMap.pointers[diff.path].value.line;
-      }
-      if (diff.op === 'remove' && lhsMap.pointers[diff.path]) {
-        originalValue = get(lhs, path);
-        startLineNumber = lhsMap.pointers[diff.path].value.line;
-      }
-
-      return {
-        op: diff.op,
-        value,
-        path,
-        originalValue,
-        startLineNumber,
-      };
-    });
-  };
-
-  const sortByLineNumber = (diffs: Diff[]) => sortBy(diffs, 'startLineNumber');
-  const groupByPath = (diffs: Diff[]) =>
-    diffs.reduce<Record<string, Diff[]>>((acc, value) => {
-      const groupKey: string = value.path[0];
-      if (!acc[groupKey]) {
-        acc[groupKey] = [];
-      }
-      acc[groupKey].push(value);
-      return acc;
-    }, {});
-
-  return flow([getDiffInformation, sortByLineNumber, groupByPath])(diffs);
-};
-
-export const getDiffText = (diff: Diff, showProp = true) => {
-  const prop = last(diff.path)!;
-  const propIsNumeric = isNumeric(prop);
-  const val = diff.op === 'remove' ? diff.originalValue : diff.value;
-  let text = getDiffOperationText(diff.op);
-
-  if (showProp) {
-    if (propIsNumeric) {
-      text += ` item ${prop}`;
-    } else {
-      if (isArray(val) && !isEmpty(val)) {
-        text += ` ${val.length} ${prop}`;
-      } else {
-        text += ` ${prop}`;
-      }
-    }
-  }
-
-  return text;
-};
-
-const isNumeric = (value: string) => !isNaN(toNumber(value));
-
-export const getDiffOperationText = (operation: string): string => {
-  if (operation === 'add') {
-    return 'added';
-  }
-  if (operation === 'remove') {
-    return 'deleted';
-  }
-  return 'changed';
-};
diff --git a/public/app/features/dashboard/containers/DashboardPage.test.tsx b/public/app/features/dashboard/containers/DashboardPage.test.tsx
index 0fe6cfef4a9af..004f1d951aa74 100644
--- a/public/app/features/dashboard/containers/DashboardPage.test.tsx
+++ b/public/app/features/dashboard/containers/DashboardPage.test.tsx
@@ -4,7 +4,6 @@ import React from 'react';
 import { Provider } from 'react-redux';
 import { match, Router } from 'react-router-dom';
 import { useEffectOnce } from 'react-use';
-import { AutoSizerProps } from 'react-virtualized-auto-sizer';
 import { mockToolkitActionCreator } from 'test/core/redux/mocks';
 import { TestProvider } from 'test/helpers/TestProvider';
 import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
@@ -66,11 +65,10 @@ jest.mock('app/core/core', () => ({
   },
 }));
 
-jest.mock('react-virtualized-auto-sizer', () => {
-  // The size of the children need to be small enough to be outside the view.
-  // So it does not trigger the query to be run by the PanelQueryRunner.
-  return ({ children }: AutoSizerProps) => children({ height: 1, width: 1 });
-});
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getPluginLinkExtensions: jest.fn().mockReturnValue({ extensions: [] }),
+}));
 
 function getTestDashboard(overrides?: Partial<Dashboard>, metaOverrides?: Partial<DashboardMeta>): DashboardModel {
   const data = Object.assign(
@@ -308,10 +306,12 @@ describe('DashboardPage', () => {
   });
 
   describe('No kiosk mode tv', () => {
-    it('should render dashboard page toolbar and submenu', async () => {
-      setup({ dashboard: getTestDashboard() });
+    it('should render dashboard page toolbar with no submenu', async () => {
+      setup({
+        dashboard: getTestDashboard(),
+      });
       expect(await screen.findAllByTestId(selectors.pages.Dashboard.DashNav.navV2)).toHaveLength(1);
-      expect(screen.getAllByLabelText(selectors.pages.Dashboard.SubMenu.submenu)).toHaveLength(1);
+      expect(screen.queryAllByLabelText(selectors.pages.Dashboard.SubMenu.submenu)).toHaveLength(0);
     });
   });
 
diff --git a/public/app/features/dashboard/containers/DashboardPage.tsx b/public/app/features/dashboard/containers/DashboardPage.tsx
index b2975758d84e1..870be18376329 100644
--- a/public/app/features/dashboard/containers/DashboardPage.tsx
+++ b/public/app/features/dashboard/containers/DashboardPage.tsx
@@ -14,10 +14,10 @@ import { createErrorNotification } from 'app/core/copy/appNotification';
 import { getKioskMode } from 'app/core/navigation/kiosk';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 import { getNavModel } from 'app/core/selectors/navModel';
-import { newBrowseDashboardsEnabled } from 'app/features/browse-dashboards/featureFlag';
 import { PanelModel } from 'app/features/dashboard/state';
 import { dashboardWatcher } from 'app/features/live/dashboard/dashboardWatcher';
 import { AngularDeprecationNotice } from 'app/features/plugins/angularDeprecation/AngularDeprecationNotice';
+import { AngularMigrationNotice } from 'app/features/plugins/angularDeprecation/AngularMigrationNotice';
 import { getPageNavFromSlug, getRootContentNavModel } from 'app/features/storage/StorageFolderPage';
 import { DashboardRoutes, KioskMode, StoreState } from 'app/types';
 import { PanelEditEnteredEvent, PanelEditExitedEvent } from 'app/types/events';
@@ -32,35 +32,16 @@ import { DashboardPrompt } from '../components/DashboardPrompt/DashboardPrompt';
 import { DashboardSettings } from '../components/DashboardSettings';
 import { PanelInspector } from '../components/Inspector/PanelInspector';
 import { PanelEditor } from '../components/PanelEditor/PanelEditor';
+import { ShareModal } from '../components/ShareModal';
 import { SubMenu } from '../components/SubMenu/SubMenu';
 import { DashboardGrid } from '../dashgrid/DashboardGrid';
 import { liveTimer } from '../dashgrid/liveTimer';
 import { getTimeSrv } from '../services/TimeSrv';
+import { explicitlyControlledMigrationPanels, autoMigrateAngular } from '../state/PanelModel';
 import { cleanUpDashboardAndVariables } from '../state/actions';
 import { initDashboard } from '../state/initDashboard';
-import { calculateNewPanelGridPos } from '../utils/panel';
 
-export interface DashboardPageRouteParams {
-  uid?: string;
-  type?: string;
-  slug?: string;
-  accessToken?: string;
-}
-
-export type DashboardPageRouteSearchParams = {
-  tab?: string;
-  folderUid?: string;
-  editPanel?: string;
-  viewPanel?: string;
-  editview?: string;
-  addWidget?: boolean;
-  panelType?: string;
-  inspect?: string;
-  from?: string;
-  to?: string;
-  refresh?: string;
-  kiosk?: string | true;
-};
+import { DashboardPageRouteParams, DashboardPageRouteSearchParams } from './types';
 
 export const mapStateToProps = (state: StoreState) => ({
   initPhase: state.dashboard.initPhase,
@@ -286,29 +267,6 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
     return updateStatePageNavFromProps(props, updatedState);
   }
 
-  // Todo: Remove this when we remove the emptyDashboardPage toggle
-  onAddPanel = () => {
-    const { dashboard } = this.props;
-
-    if (!dashboard) {
-      return;
-    }
-
-    // Return if the "Add panel" exists already
-    if (dashboard.panels.length > 0 && dashboard.panels[0].type === 'add-panel') {
-      return;
-    }
-
-    dashboard.addPanel({
-      type: 'add-panel',
-      gridPos: calculateNewPanelGridPos(dashboard),
-      title: 'Panel Title',
-    });
-
-    // scroll to top after adding panel
-    this.setState({ updateScrollTop: 0 });
-  };
-
   setScrollRef = (scrollElement: HTMLDivElement): void => {
     this.setState({ scrollElement });
   };
@@ -332,6 +290,10 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
     return inspectPanel;
   }
 
+  onCloseShareModal = () => {
+    locationService.partial({ shareView: null });
+  };
+
   render() {
     const { dashboard, initError, queryParams } = this.props;
     const { editPanel, viewPanel, updateScrollTop, pageNav, sectionNav } = this.state;
@@ -342,7 +304,7 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
     }
 
     const inspectPanel = this.getInspectPanel();
-    const showSubMenu = !editPanel && !kioskMode && !this.props.queryParams.editview;
+    const showSubMenu = !editPanel && !kioskMode && !this.props.queryParams.editview && dashboard.isSubMenuVisible();
 
     const showToolbar = kioskMode !== KioskMode.Full && !queryParams.editview;
 
@@ -359,6 +321,50 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
       );
     }
 
+    const migrationFeatureFlags = new Set([
+      'autoMigrateOldPanels',
+      'autoMigrateGraphPanel',
+      'autoMigrateTablePanel',
+      'autoMigratePiechartPanel',
+      'autoMigrateWorldmapPanel',
+      'autoMigrateStatPanel',
+      'disableAngular',
+    ]);
+
+    const isAutoMigrationFlagSet = () => {
+      const urlParams = new URLSearchParams(window.location.search);
+      let isFeatureFlagSet = false;
+
+      urlParams.forEach((value, key) => {
+        if (key.startsWith('__feature.')) {
+          const featureName = key.substring(10);
+          const toggleState = value === 'true' || value === '';
+          const featureToggles = config.featureToggles as Record<string, boolean>;
+
+          if (featureToggles[featureName]) {
+            return;
+          }
+
+          if (migrationFeatureFlags.has(featureName) && toggleState) {
+            isFeatureFlagSet = true;
+            return;
+          }
+        }
+      });
+
+      return isFeatureFlagSet;
+    };
+
+    const dashboardWasAngular = dashboard.panels.some(
+      (panel) => panel.autoMigrateFrom && autoMigrateAngular[panel.autoMigrateFrom] != null
+    );
+
+    const showDashboardMigrationNotice =
+      config.featureToggles.angularDeprecationUI &&
+      dashboardWasAngular &&
+      isAutoMigrationFlagSet() &&
+      dashboard.uid !== null;
+
     return (
       <>
         <Page
@@ -376,7 +382,6 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
                 title={dashboard.title}
                 folderTitle={dashboard.meta.folderTitle}
                 isFullscreen={!!viewPanel}
-                onAddPanel={this.onAddPanel}
                 kioskMode={kioskMode}
                 hideTimePicker={dashboard.timepicker.hidden}
               />
@@ -390,8 +395,14 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
             </section>
           )}
           {config.featureToggles.angularDeprecationUI && dashboard.hasAngularPlugins() && dashboard.uid !== null && (
-            <AngularDeprecationNotice dashboardUid={dashboard.uid} />
+            <AngularDeprecationNotice
+              dashboardUid={dashboard.uid}
+              showAutoMigrateLink={dashboard.panels.some((panel) =>
+                explicitlyControlledMigrationPanels.includes(panel.type)
+              )}
+            />
           )}
+          {showDashboardMigrationNotice && <AngularMigrationNotice dashboardUid={dashboard.uid} />}
           <DashboardGrid
             dashboard={dashboard}
             isEditable={!!dashboard.meta.canEdit}
@@ -400,6 +411,7 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
           />
 
           {inspectPanel && <PanelInspector dashboard={dashboard} panel={inspectPanel} />}
+          {queryParams.shareView && <ShareModal dashboard={dashboard} onDismiss={this.onCloseShareModal} />}
         </Page>
         {editPanel && (
           <PanelEditor
@@ -445,29 +457,16 @@ function updateStatePageNavFromProps(props: Props, state: State): State {
     };
   }
 
-  const { folderTitle, folderUid } = dashboard.meta;
+  const { folderUid } = dashboard.meta;
   if (folderUid && pageNav) {
-    if (newBrowseDashboardsEnabled()) {
-      const folderNavModel = getNavModel(navIndex, `folder-dashboards-${folderUid}`).main;
-      // If the folder hasn't loaded (maybe user doesn't have permission on it?) then
-      // don't show the "page not found" breadcrumb
-      if (folderNavModel.id !== 'not-found') {
-        pageNav = {
-          ...pageNav,
-          parentItem: folderNavModel,
-        };
-      }
-    } else {
-      // Check if folder changed
-      if (folderTitle && pageNav.parentItem?.text !== folderTitle) {
-        pageNav = {
-          ...pageNav,
-          parentItem: {
-            text: folderTitle,
-            url: `/dashboards/f/${dashboard.meta.folderUid}`,
-          },
-        };
-      }
+    const folderNavModel = getNavModel(navIndex, `folder-dashboards-${folderUid}`).main;
+    // If the folder hasn't loaded (maybe user doesn't have permission on it?) then
+    // don't show the "page not found" breadcrumb
+    if (folderNavModel.id !== 'not-found') {
+      pageNav = {
+        ...pageNav,
+        parentItem: folderNavModel,
+      };
     }
   }
 
diff --git a/public/app/features/dashboard/containers/DashboardPageProxy.test.tsx b/public/app/features/dashboard/containers/DashboardPageProxy.test.tsx
new file mode 100644
index 0000000000000..28df23c5a1ced
--- /dev/null
+++ b/public/app/features/dashboard/containers/DashboardPageProxy.test.tsx
@@ -0,0 +1,222 @@
+import { act, render, screen, waitFor } from '@testing-library/react';
+import React from 'react';
+import { Provider } from 'react-redux';
+import { Router } from 'react-router-dom';
+import { Props } from 'react-virtualized-auto-sizer';
+import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
+
+import { config, locationService } from '@grafana/runtime';
+import { GrafanaContext } from 'app/core/context/GrafanaContext';
+import {
+  HOME_DASHBOARD_CACHE_KEY,
+  getDashboardScenePageStateManager,
+} from 'app/features/dashboard-scene/pages/DashboardScenePageStateManager';
+import { configureStore } from 'app/store/configureStore';
+import { DashboardDTO, DashboardRoutes } from 'app/types';
+
+import DashboardPageProxy, { DashboardPageProxyProps } from './DashboardPageProxy';
+
+const dashMock: DashboardDTO = {
+  dashboard: {
+    id: 1,
+    annotations: {
+      list: [],
+    },
+    uid: 'uid',
+    title: 'title',
+    panels: [],
+    version: 1,
+    schemaVersion: 1,
+  },
+  meta: {
+    canEdit: false,
+  },
+};
+
+const homeMock = {
+  ...dashMock,
+  dashboard: {
+    ...dashMock.dashboard,
+    uid: '',
+    title: 'Home',
+  },
+};
+
+const homeMockEditable = {
+  ...homeMock,
+  meta: {
+    ...homeMock.meta,
+    canEdit: true,
+  },
+};
+
+const dashMockEditable = {
+  ...dashMock,
+  meta: {
+    ...dashMock.meta,
+    canEdit: true,
+  },
+};
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getDataSourceSrv: jest.fn().mockReturnValue({
+    getInstanceSettings: () => {
+      return { name: 'Grafana' };
+    },
+    get: jest.fn().mockResolvedValue({}),
+  }),
+}));
+
+jest.mock('react-virtualized-auto-sizer', () => {
+  return ({ children }: Props) =>
+    children({
+      height: 1,
+      scaledHeight: 1,
+      scaledWidth: 1,
+      width: 1,
+    });
+});
+
+function setup(props: Partial<DashboardPageProxyProps>) {
+  const context = getGrafanaContextMock();
+  const store = configureStore({});
+
+  return render(
+    <GrafanaContext.Provider value={context}>
+      <Provider store={store}>
+        <Router history={locationService.getHistory()}>
+          <DashboardPageProxy
+            location={locationService.getLocation()}
+            history={locationService.getHistory()}
+            queryParams={{}}
+            route={{ routeName: DashboardRoutes.Home, component: () => null, path: '/' }}
+            match={{ params: {}, isExact: true, path: '/', url: '/' }}
+            {...props}
+          />
+        </Router>
+      </Provider>
+    </GrafanaContext.Provider>
+  );
+}
+
+describe('DashboardPageProxy', () => {
+  describe('when dashboardSceneForViewers feature toggle disabled', () => {
+    beforeEach(() => {
+      config.featureToggles.dashboardSceneForViewers = false;
+    });
+
+    it('home dashboard', async () => {
+      getDashboardScenePageStateManager().setDashboardCache(HOME_DASHBOARD_CACHE_KEY, dashMock);
+      act(() => {
+        setup({
+          route: { routeName: DashboardRoutes.Home, component: () => null, path: '/' },
+          match: { params: {}, isExact: true, path: '/', url: '/' },
+        });
+      });
+
+      await waitFor(() => {
+        expect(screen.queryAllByTestId('dashboard-scene-page')).toHaveLength(0);
+      });
+    });
+
+    it('uid dashboard', async () => {
+      getDashboardScenePageStateManager().setDashboardCache('abc-def', dashMock);
+
+      act(() => {
+        setup({
+          route: { routeName: DashboardRoutes.Normal, component: () => null, path: '/' },
+          match: { params: { uid: 'abc-def' }, isExact: true, path: '/', url: '/' },
+        });
+      });
+
+      await waitFor(() => {
+        expect(screen.queryAllByTestId('dashboard-scene-page')).toHaveLength(0);
+      });
+    });
+  });
+
+  describe('when dashboardSceneForViewers feature toggle enabled', () => {
+    beforeEach(() => {
+      config.featureToggles.dashboardSceneForViewers = true;
+    });
+
+    describe('when user can edit a dashboard ', () => {
+      it('should not render DashboardScenePage if route is Home', async () => {
+        getDashboardScenePageStateManager().setDashboardCache(HOME_DASHBOARD_CACHE_KEY, homeMockEditable);
+        act(() => {
+          setup({
+            route: { routeName: DashboardRoutes.Home, component: () => null, path: '/' },
+            match: { params: { uid: '' }, isExact: true, path: '/', url: '/' },
+          });
+        });
+
+        await waitFor(() => {
+          expect(screen.queryAllByTestId('dashboard-scene-page')).toHaveLength(0);
+        });
+      });
+
+      it('should not render DashboardScenePage if route is Normal and has uid', async () => {
+        getDashboardScenePageStateManager().setDashboardCache('abc-def', dashMockEditable);
+        act(() => {
+          setup({
+            route: { routeName: DashboardRoutes.Normal, component: () => null, path: '/' },
+            match: { params: { uid: 'abc-def' }, isExact: true, path: '/', url: '/' },
+          });
+        });
+        await waitFor(() => {
+          expect(screen.queryAllByTestId('dashboard-scene-page')).toHaveLength(0);
+        });
+      });
+    });
+
+    describe('when user can only view a dashboard ', () => {
+      it('should render DashboardScenePage if route is Home', async () => {
+        getDashboardScenePageStateManager().setDashboardCache(HOME_DASHBOARD_CACHE_KEY, homeMock);
+        act(() => {
+          setup({
+            route: { routeName: DashboardRoutes.Home, component: () => null, path: '/' },
+            match: {
+              params: {
+                uid: '',
+              },
+              isExact: true,
+              path: '/',
+              url: '/',
+            },
+          });
+        });
+
+        await waitFor(() => {
+          expect(screen.queryAllByTestId('dashboard-scene-page')).toHaveLength(1);
+        });
+      });
+
+      it('should render DashboardScenePage if route is Normal and has uid', async () => {
+        getDashboardScenePageStateManager().setDashboardCache('uid', dashMock);
+        act(() => {
+          setup({
+            route: { routeName: DashboardRoutes.Normal, component: () => null, path: '/' },
+            match: { params: { uid: 'uid' }, isExact: true, path: '/', url: '/' },
+          });
+        });
+        await waitFor(() => {
+          expect(screen.queryAllByTestId('dashboard-scene-page')).toHaveLength(1);
+        });
+      });
+
+      it('should render not DashboardScenePage if dashboard UID does not match route UID', async () => {
+        getDashboardScenePageStateManager().setDashboardCache('uid', dashMock);
+        act(() => {
+          setup({
+            route: { routeName: DashboardRoutes.Normal, component: () => null, path: '/' },
+            match: { params: { uid: 'wrongUID' }, isExact: true, path: '/', url: '/' },
+          });
+        });
+        await waitFor(() => {
+          expect(screen.queryAllByTestId('dashboard-scene-page')).toHaveLength(0);
+        });
+      });
+    });
+  });
+});
diff --git a/public/app/features/dashboard/containers/DashboardPageProxy.tsx b/public/app/features/dashboard/containers/DashboardPageProxy.tsx
new file mode 100644
index 0000000000000..1a1bf22c7771b
--- /dev/null
+++ b/public/app/features/dashboard/containers/DashboardPageProxy.tsx
@@ -0,0 +1,72 @@
+import React from 'react';
+import { useAsync } from 'react-use';
+
+import { config } from '@grafana/runtime';
+import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
+import DashboardScenePage from 'app/features/dashboard-scene/pages/DashboardScenePage';
+import { getDashboardScenePageStateManager } from 'app/features/dashboard-scene/pages/DashboardScenePageStateManager';
+import { DashboardRoutes } from 'app/types';
+
+import DashboardPage from './DashboardPage';
+import { DashboardPageRouteParams, DashboardPageRouteSearchParams } from './types';
+
+export type DashboardPageProxyProps = GrafanaRouteComponentProps<
+  DashboardPageRouteParams,
+  DashboardPageRouteSearchParams
+>;
+
+// This proxy component is used for Dashboard -> Scenes migration.
+// It will render DashboardScenePage if the user is only allowed to view the dashboard.
+function DashboardPageProxy(props: DashboardPageProxyProps) {
+  const forceScenes = props.queryParams.scenes === true;
+  const forceOld = props.queryParams.scenes === false;
+
+  if (forceScenes || (config.featureToggles.dashboardScene && !forceOld)) {
+    return <DashboardScenePage {...props} />;
+  }
+
+  const stateManager = getDashboardScenePageStateManager();
+  const isScenesSupportedRoute = Boolean(
+    props.route.routeName === DashboardRoutes.Home ||
+      (props.route.routeName === DashboardRoutes.Normal && props.match.params.uid)
+  );
+
+  // We pre-fetch dashboard to render dashboard page component depending on dashboard permissions.
+  // To avoid querying single dashboard multiple times, stateManager.fetchDashboard uses a simple, short-lived cache.
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const dashboard = useAsync(async () => {
+    if (props.match.params.type === 'snapshot') {
+      return null;
+    }
+
+    return stateManager.fetchDashboard({
+      route: props.route.routeName as DashboardRoutes,
+      uid: props.match.params.uid ?? '',
+      keepDashboardFromExploreInLocalStorage: true,
+    });
+  }, [props.match.params.uid, props.route.routeName]);
+
+  if (!config.featureToggles.dashboardSceneForViewers) {
+    return <DashboardPage {...props} />;
+  }
+
+  if (dashboard.loading) {
+    return null;
+  }
+
+  if (dashboard?.value?.dashboard?.uid !== props.match.params.uid && dashboard.value?.meta?.isNew !== true) {
+    return null;
+  }
+
+  if (
+    dashboard.value &&
+    !(dashboard.value.meta?.canEdit || dashboard.value.meta?.canMakeEditable) &&
+    isScenesSupportedRoute
+  ) {
+    return <DashboardScenePage {...props} />;
+  } else {
+    return <DashboardPage {...props} />;
+  }
+}
+
+export default DashboardPageProxy;
diff --git a/public/app/features/dashboard/containers/NewDashboardWithDS.tsx b/public/app/features/dashboard/containers/NewDashboardWithDS.tsx
index 56eddbcea300a..b1a7aa041e4c5 100644
--- a/public/app/features/dashboard/containers/NewDashboardWithDS.tsx
+++ b/public/app/features/dashboard/containers/NewDashboardWithDS.tsx
@@ -1,11 +1,10 @@
 import React, { useEffect, useState } from 'react';
 
-import { config, getDataSourceSrv, locationService } from '@grafana/runtime';
+import { getDataSourceSrv, locationService } from '@grafana/runtime';
 import { Page } from 'app/core/components/Page/Page';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 import { useDispatch } from 'app/types';
 
-import { getNewDashboardModelData, setDashboardToFetchFromLocalStorage } from '../state/initDashboard';
 import { setInitialDatasource } from '../state/reducers';
 
 export default function NewDashboardWithDS(props: GrafanaRouteComponentProps<{ datasourceUid: string }>) {
@@ -20,21 +19,7 @@ export default function NewDashboardWithDS(props: GrafanaRouteComponentProps<{ d
       return;
     }
 
-    if (!config.featureToggles.emptyDashboardPage) {
-      const newDashboard = getNewDashboardModelData();
-      const { dashboard } = newDashboard;
-      dashboard.panels[0] = {
-        ...dashboard.panels[0],
-        datasource: {
-          uid: ds.uid,
-          type: ds.type,
-        },
-      };
-
-      setDashboardToFetchFromLocalStorage(newDashboard);
-    } else {
-      dispatch(setInitialDatasource(datasourceUid));
-    }
+    dispatch(setInitialDatasource(datasourceUid));
 
     locationService.replace('/dashboard/new');
   }, [datasourceUid, dispatch]);
diff --git a/public/app/features/dashboard/containers/PublicDashboardPage.test.tsx b/public/app/features/dashboard/containers/PublicDashboardPage.test.tsx
index 920a6781b1d54..da7f4a7bbb367 100644
--- a/public/app/features/dashboard/containers/PublicDashboardPage.test.tsx
+++ b/public/app/features/dashboard/containers/PublicDashboardPage.test.tsx
@@ -4,7 +4,7 @@ import React from 'react';
 import { Provider } from 'react-redux';
 import { Router } from 'react-router-dom';
 import { useEffectOnce } from 'react-use';
-import { AutoSizerProps } from 'react-virtualized-auto-sizer';
+import { Props as AutoSizerProps } from 'react-virtualized-auto-sizer';
 import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
 
 import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
@@ -37,7 +37,13 @@ jest.mock('app/features/dashboard/dashgrid/LazyLoader', () => {
 jest.mock('react-virtualized-auto-sizer', () => {
   //   //   // The size of the children need to be small enough to be outside the view.
   //   //   // So it does not trigger the query to be run by the PanelQueryRunner.
-  return ({ children }: AutoSizerProps) => children({ height: 1, width: 1 });
+  return ({ children }: AutoSizerProps) =>
+    children({
+      height: 1,
+      scaledHeight: 1,
+      scaledWidth: 1,
+      width: 1,
+    });
 });
 
 jest.mock('app/features/dashboard/state/initDashboard', () => ({
@@ -249,7 +255,7 @@ describe('PublicDashboardPage', () => {
           ...dashboardBase,
           getModel: () =>
             getTestDashboard({
-              timepicker: { hidden: false, collapse: false, refresh_intervals: [], time_options: [] },
+              timepicker: { hidden: false, refresh_intervals: [], time_options: [] },
             }),
         },
       });
diff --git a/public/app/features/dashboard/containers/PublicDashboardPage.tsx b/public/app/features/dashboard/containers/PublicDashboardPage.tsx
index a4af9556c90ed..ffdacffcbfd96 100644
--- a/public/app/features/dashboard/containers/PublicDashboardPage.tsx
+++ b/public/app/features/dashboard/containers/PublicDashboardPage.tsx
@@ -8,6 +8,10 @@ import { PageToolbar, useStyles2 } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import { useGrafana } from 'app/core/context/GrafanaContext';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
+import {
+  PublicDashboardPageRouteParams,
+  PublicDashboardPageRouteSearchParams,
+} from 'app/features/dashboard/containers/types';
 import { updateTimeZoneForSession } from 'app/features/profile/state/reducers';
 import { useSelector, useDispatch } from 'app/types';
 
@@ -22,16 +26,6 @@ import { getTimeSrv } from '../services/TimeSrv';
 import { DashboardModel } from '../state';
 import { initDashboard } from '../state/initDashboard';
 
-interface PublicDashboardPageRouteParams {
-  accessToken?: string;
-}
-
-interface PublicDashboardPageRouteSearchParams {
-  from?: string;
-  to?: string;
-  refresh?: string;
-}
-
 export type Props = GrafanaRouteComponentProps<PublicDashboardPageRouteParams, PublicDashboardPageRouteSearchParams>;
 
 const selectors = e2eSelectors.pages.PublicDashboard;
@@ -116,7 +110,9 @@ const PublicDashboardPage = (props: Props) => {
       <div className={styles.gridContainer}>
         <DashboardGrid dashboard={dashboard} isEditable={false} viewPanel={null} editPanel={null} hidePanelMenus />
       </div>
-      <PublicDashboardFooter />
+      <div className={styles.footer}>
+        <PublicDashboardFooter />
+      </div>
     </Page>
   );
 };
@@ -127,6 +123,9 @@ const getStyles = (theme: GrafanaTheme2) => ({
     padding: theme.spacing(2, 2, 2, 2),
     overflow: 'auto',
   }),
+  footer: css({
+    padding: theme.spacing(0, 2),
+  }),
 });
 
 export default PublicDashboardPage;
diff --git a/public/app/features/dashboard/containers/PublicDashboardPageProxy.test.tsx b/public/app/features/dashboard/containers/PublicDashboardPageProxy.test.tsx
new file mode 100644
index 0000000000000..897c5df9678f2
--- /dev/null
+++ b/public/app/features/dashboard/containers/PublicDashboardPageProxy.test.tsx
@@ -0,0 +1,75 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import React from 'react';
+import { Provider } from 'react-redux';
+import { Router } from 'react-router-dom';
+import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
+
+import { selectors as e2eSelectors } from '@grafana/e2e-selectors';
+import { config, locationService } from '@grafana/runtime';
+import { GrafanaContext } from 'app/core/context/GrafanaContext';
+import { configureStore } from 'app/store/configureStore';
+
+import { DashboardRoutes } from '../../../types';
+
+import PublicDashboardPageProxy, { PublicDashboardPageProxyProps } from './PublicDashboardPageProxy';
+
+const { PublicDashboardScene, PublicDashboard } = e2eSelectors.pages;
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getDataSourceSrv: jest.fn().mockReturnValue({
+    getInstanceSettings: () => {
+      return { name: 'Grafana' };
+    },
+    get: jest.fn().mockResolvedValue({}),
+  }),
+}));
+
+function setup(props: Partial<PublicDashboardPageProxyProps>) {
+  const context = getGrafanaContextMock();
+  const store = configureStore({});
+
+  return render(
+    <GrafanaContext.Provider value={context}>
+      <Provider store={store}>
+        <Router history={locationService.getHistory()}>
+          <PublicDashboardPageProxy
+            location={locationService.getLocation()}
+            history={locationService.getHistory()}
+            queryParams={{}}
+            route={{ routeName: DashboardRoutes.Public, component: () => null, path: '/:accessToken' }}
+            match={{ params: { accessToken: 'an-access-token' }, isExact: true, path: '/', url: '/' }}
+            {...props}
+          />
+        </Router>
+      </Provider>
+    </GrafanaContext.Provider>
+  );
+}
+
+describe('PublicDashboardPageProxy', () => {
+  beforeEach(() => {
+    config.featureToggles.publicDashboardsScene = false;
+  });
+
+  describe('when scene feature enabled', () => {
+    it('should render PublicDashboardScenePage if publicDashboardsScene is enabled', async () => {
+      config.featureToggles.publicDashboardsScene = true;
+      setup({});
+
+      await waitFor(() => {
+        expect(screen.queryByTestId(PublicDashboardScene.page)).toBeInTheDocument();
+      });
+    });
+  });
+
+  describe('when scene feature disabled', () => {
+    it('should render PublicDashboardPage if publicDashboardsScene is disabled', async () => {
+      setup({});
+
+      await waitFor(() => {
+        expect(screen.queryByTestId(PublicDashboard.page)).toBeInTheDocument();
+      });
+    });
+  });
+});
diff --git a/public/app/features/dashboard/containers/PublicDashboardPageProxy.tsx b/public/app/features/dashboard/containers/PublicDashboardPageProxy.tsx
new file mode 100644
index 0000000000000..f7820295318a3
--- /dev/null
+++ b/public/app/features/dashboard/containers/PublicDashboardPageProxy.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+
+import { config } from '@grafana/runtime';
+import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
+
+import { PublicDashboardScenePage } from '../../dashboard-scene/pages/PublicDashboardScenePage';
+
+import PublicDashboardPage from './PublicDashboardPage';
+import { PublicDashboardPageRouteParams, PublicDashboardPageRouteSearchParams } from './types';
+
+export type PublicDashboardPageProxyProps = GrafanaRouteComponentProps<
+  PublicDashboardPageRouteParams,
+  PublicDashboardPageRouteSearchParams
+>;
+
+function PublicDashboardPageProxy(props: PublicDashboardPageProxyProps) {
+  if (config.featureToggles.publicDashboardsScene) {
+    return <PublicDashboardScenePage {...props} />;
+  }
+
+  return <PublicDashboardPage {...props} />;
+}
+
+export default PublicDashboardPageProxy;
diff --git a/public/app/features/dashboard/containers/SoloPanelPage.tsx b/public/app/features/dashboard/containers/SoloPanelPage.tsx
index 04fc483129a5f..4628ed79685ed 100644
--- a/public/app/features/dashboard/containers/SoloPanelPage.tsx
+++ b/public/app/features/dashboard/containers/SoloPanelPage.tsx
@@ -76,7 +76,12 @@ export class SoloPanelPage extends Component<Props, State> {
         return;
       }
 
+      if (panel) {
+        dashboard.exitViewPanel(panel);
+      }
+
       this.setState({ panel });
+      dashboard.initViewPanel(panel);
     }
   }
 
diff --git a/public/app/features/dashboard/containers/types.ts b/public/app/features/dashboard/containers/types.ts
new file mode 100644
index 0000000000000..4c2b3278eab15
--- /dev/null
+++ b/public/app/features/dashboard/containers/types.ts
@@ -0,0 +1,34 @@
+export interface DashboardPageRouteParams {
+  uid?: string;
+  type?: string;
+  slug?: string;
+  accessToken?: string;
+}
+
+export type DashboardPageRouteSearchParams = {
+  tab?: string;
+  folderUid?: string;
+  editPanel?: string;
+  viewPanel?: string;
+  editview?: string;
+  addWidget?: boolean;
+  panelType?: string;
+  inspect?: string;
+  from?: string;
+  to?: string;
+  refresh?: string;
+  kiosk?: string | true;
+  scenes?: boolean;
+  shareView?: string;
+};
+
+export type PublicDashboardPageRouteParams = {
+  accessToken?: string;
+};
+
+export type PublicDashboardPageRouteSearchParams = {
+  from?: string;
+  to?: string;
+  refresh?: string;
+  scenes?: boolean;
+};
diff --git a/public/app/features/dashboard/dashgrid/DashboardEmpty.test.tsx b/public/app/features/dashboard/dashgrid/DashboardEmpty.test.tsx
index 341a67ba10ef4..bef047baa75b5 100644
--- a/public/app/features/dashboard/dashgrid/DashboardEmpty.test.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardEmpty.test.tsx
@@ -22,7 +22,6 @@ jest.mock('@grafana/runtime', () => ({
     partial: jest.fn(),
   },
   reportInteraction: jest.fn(),
-  config: {},
 }));
 
 jest.mock('app/features/dashboard/utils/dashboard', () => ({
diff --git a/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx b/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx
index 2e9e7c0eef6b3..b2fdb9f6267dc 100644
--- a/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardEmpty.tsx
@@ -3,18 +3,23 @@ import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { config, locationService, reportInteraction } from '@grafana/runtime';
-import { Button, useStyles2, Text, Box } from '@grafana/ui';
-import { Flex } from '@grafana/ui/src/unstable';
+import { config, locationService } from '@grafana/runtime';
+import { Button, useStyles2, Text, Box, Stack } from '@grafana/ui';
 import { Trans } from 'app/core/internationalization';
 import { DashboardModel } from 'app/features/dashboard/state';
-import { onAddLibraryPanel, onCreateNewPanel, onImportDashboard } from 'app/features/dashboard/utils/dashboard';
+import {
+  onAddLibraryPanel as onAddLibraryPanelImpl,
+  onCreateNewPanel,
+  onImportDashboard,
+} from 'app/features/dashboard/utils/dashboard';
+import { DashboardScene } from 'app/features/dashboard-scene/scene/DashboardScene';
+import { DashboardInteractions } from 'app/features/dashboard-scene/utils/interactions';
 import { useDispatch, useSelector } from 'app/types';
 
 import { setInitialDatasource } from '../state/reducers';
 
 export interface Props {
-  dashboard: DashboardModel;
+  dashboard: DashboardModel | DashboardScene;
   canCreate: boolean;
 }
 
@@ -23,12 +28,34 @@ const DashboardEmpty = ({ dashboard, canCreate }: Props) => {
   const dispatch = useDispatch();
   const initialDatasource = useSelector((state) => state.dashboard.initialDatasource);
 
+  const onAddVisualization = () => {
+    let id;
+    if (dashboard instanceof DashboardScene) {
+      id = dashboard.onCreateNewPanel();
+    } else {
+      id = onCreateNewPanel(dashboard, initialDatasource);
+      dispatch(setInitialDatasource(undefined));
+    }
+
+    locationService.partial({ editPanel: id, firstPanel: true });
+    DashboardInteractions.emptyDashboardButtonClicked({ item: 'add_visualization' });
+  };
+
+  const onAddLibraryPanel = () => {
+    DashboardInteractions.emptyDashboardButtonClicked({ item: 'import_from_library' });
+    if (dashboard instanceof DashboardScene) {
+      dashboard.onShowAddLibraryPanelDrawer();
+    } else {
+      onAddLibraryPanelImpl(dashboard);
+    }
+  };
+
   return (
-    <Flex alignItems="center" justifyContent="center">
+    <Stack alignItems="center" justifyContent="center">
       <div className={styles.wrapper}>
-        <Flex alignItems="stretch" justifyContent="center" gap={4} direction="column">
+        <Stack alignItems="stretch" justifyContent="center" gap={4} direction="column">
           <Box borderColor="strong" borderStyle="dashed" padding={4}>
-            <Flex direction="column" alignItems="center" gap={2}>
+            <Stack direction="column" alignItems="center" gap={2}>
               <Text element="h1" textAlignment="center" weight="medium">
                 <Trans i18nKey="dashboard.empty.add-visualization-header">
                   Start your new dashboard by adding a visualization
@@ -46,22 +73,17 @@ const DashboardEmpty = ({ dashboard, canCreate }: Props) => {
                 size="lg"
                 icon="plus"
                 data-testid={selectors.pages.AddDashboard.itemButton('Create new panel button')}
-                onClick={() => {
-                  const id = onCreateNewPanel(dashboard, initialDatasource);
-                  reportInteraction('dashboards_emptydashboard_clicked', { item: 'add_visualization' });
-                  locationService.partial({ editPanel: id, firstPanel: true });
-                  dispatch(setInitialDatasource(undefined));
-                }}
+                onClick={onAddVisualization}
                 disabled={!canCreate}
               >
                 <Trans i18nKey="dashboard.empty.add-visualization-button">Add visualization</Trans>
               </Button>
-            </Flex>
+            </Stack>
           </Box>
-          <Flex direction={{ xs: 'column', md: 'row' }} wrap="wrap" gap={4}>
+          <Stack direction={{ xs: 'column', md: 'row' }} wrap="wrap" gap={4}>
             {config.featureToggles.vizAndWidgetSplit && (
-              <Box borderColor="strong" borderStyle="dashed" padding={3} grow={1}>
-                <Flex direction="column" alignItems="center" gap={1}>
+              <Box borderColor="strong" borderStyle="dashed" padding={3} flex={1}>
+                <Stack direction="column" alignItems="center" gap={1}>
                   <Text element="h3" textAlignment="center" weight="medium">
                     <Trans i18nKey="dashboard.empty.add-widget-header">Add a widget</Trans>
                   </Text>
@@ -75,18 +97,18 @@ const DashboardEmpty = ({ dashboard, canCreate }: Props) => {
                     fill="outline"
                     data-testid={selectors.pages.AddDashboard.itemButton('Create new widget button')}
                     onClick={() => {
-                      reportInteraction('dashboards_emptydashboard_clicked', { item: 'add_widget' });
+                      DashboardInteractions.emptyDashboardButtonClicked({ item: 'add_widget' });
                       locationService.partial({ addWidget: true });
                     }}
                     disabled={!canCreate}
                   >
                     <Trans i18nKey="dashboard.empty.add-widget-button">Add widget</Trans>
                   </Button>
-                </Flex>
+                </Stack>
               </Box>
             )}
-            <Box borderColor="strong" borderStyle="dashed" padding={3} grow={1}>
-              <Flex direction="column" alignItems="center" gap={1}>
+            <Box borderColor="strong" borderStyle="dashed" padding={3} flex={1}>
+              <Stack direction="column" alignItems="center" gap={1}>
                 <Text element="h3" textAlignment="center" weight="medium">
                   <Trans i18nKey="dashboard.empty.add-library-panel-header">Import panel</Trans>
                 </Text>
@@ -101,18 +123,15 @@ const DashboardEmpty = ({ dashboard, canCreate }: Props) => {
                   icon="plus"
                   fill="outline"
                   data-testid={selectors.pages.AddDashboard.itemButton('Add a panel from the panel library button')}
-                  onClick={() => {
-                    reportInteraction('dashboards_emptydashboard_clicked', { item: 'import_from_library' });
-                    onAddLibraryPanel(dashboard);
-                  }}
+                  onClick={onAddLibraryPanel}
                   disabled={!canCreate}
                 >
                   <Trans i18nKey="dashboard.empty.add-library-panel-button">Add library panel</Trans>
                 </Button>
-              </Flex>
+              </Stack>
             </Box>
-            <Box borderColor="strong" borderStyle="dashed" padding={3} grow={1}>
-              <Flex direction="column" alignItems="center" gap={1}>
+            <Box borderColor="strong" borderStyle="dashed" padding={3} flex={1}>
+              <Stack direction="column" alignItems="center" gap={1}>
                 <Text element="h3" textAlignment="center" weight="medium">
                   <Trans i18nKey="dashboard.empty.import-a-dashboard-header">Import a dashboard</Trans>
                 </Text>
@@ -129,19 +148,19 @@ const DashboardEmpty = ({ dashboard, canCreate }: Props) => {
                   fill="outline"
                   data-testid={selectors.pages.AddDashboard.itemButton('Import dashboard button')}
                   onClick={() => {
-                    reportInteraction('dashboards_emptydashboard_clicked', { item: 'import_dashboard' });
+                    DashboardInteractions.emptyDashboardButtonClicked({ item: 'import_dashboard' });
                     onImportDashboard();
                   }}
                   disabled={!canCreate}
                 >
                   <Trans i18nKey="dashboard.empty.import-dashboard-button">Import dashboard</Trans>
                 </Button>
-              </Flex>
+              </Stack>
             </Box>
-          </Flex>
-        </Flex>
+          </Stack>
+        </Stack>
       </div>
-    </Flex>
+    </Stack>
   );
 };
 
diff --git a/public/app/features/dashboard/dashgrid/DashboardGrid.test.tsx b/public/app/features/dashboard/dashgrid/DashboardGrid.test.tsx
index 853391201a012..818f0fd05d0af 100644
--- a/public/app/features/dashboard/dashgrid/DashboardGrid.test.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardGrid.test.tsx
@@ -1,23 +1,66 @@
-import { render } from '@testing-library/react';
+import { act, render, screen } from '@testing-library/react';
 import React from 'react';
+import { Provider } from 'react-redux';
+import { Router } from 'react-router-dom';
+import { useEffectOnce } from 'react-use';
+import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
 
+import { TextBoxVariableModel } from '@grafana/data';
+import { locationService } from '@grafana/runtime';
 import { Dashboard } from '@grafana/schema';
+import appEvents from 'app/core/app_events';
+import { GrafanaContext } from 'app/core/context/GrafanaContext';
+import { GetVariables } from 'app/features/variables/state/selectors';
+import { VariablesChanged } from 'app/features/variables/types';
+import { configureStore } from 'app/store/configureStore';
 import { DashboardMeta } from 'app/types';
 
 import { DashboardModel } from '../state';
 import { createDashboardModelFixture } from '../state/__fixtures__/dashboardFixtures';
 
-import { DashboardGrid, Props } from './DashboardGrid';
+import { DashboardGrid, PANEL_FILTER_VARIABLE, Props } from './DashboardGrid';
 import { Props as LazyLoaderProps } from './LazyLoader';
 
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  config: {
+    ...jest.requireActual('@grafana/runtime').config,
+    featureToggles: {
+      panelFilterVariable: true,
+    },
+  },
+}));
+
 jest.mock('app/features/dashboard/dashgrid/LazyLoader', () => {
-  const LazyLoader = ({ children }: LazyLoaderProps) => {
-    return <>{children}</>;
+  const LazyLoader = ({ children, onLoad }: Pick<LazyLoaderProps, 'children' | 'onLoad'>) => {
+    useEffectOnce(() => {
+      onLoad?.();
+    });
+    return <>{typeof children === 'function' ? children({ isInView: true }) : children}</>;
   };
   return { LazyLoader };
 });
 
-function getTestDashboard(overrides?: Partial<Dashboard>, metaOverrides?: Partial<DashboardMeta>): DashboardModel {
+function setup(props: Props) {
+  const context = getGrafanaContextMock();
+  const store = configureStore({});
+
+  return render(
+    <GrafanaContext.Provider value={context}>
+      <Provider store={store}>
+        <Router history={locationService.getHistory()}>
+          <DashboardGrid {...props} />
+        </Router>
+      </Provider>
+    </GrafanaContext.Provider>
+  );
+}
+
+function getTestDashboard(
+  overrides?: Partial<Dashboard>,
+  metaOverrides?: Partial<DashboardMeta>,
+  getVariablesFromState?: GetVariables
+): DashboardModel {
   const data = Object.assign(
     {
       title: 'My dashboard',
@@ -30,20 +73,20 @@ function getTestDashboard(overrides?: Partial<Dashboard>, metaOverrides?: Partia
         },
         {
           id: 2,
-          type: 'graph2',
-          title: 'My graph2',
+          type: 'table',
+          title: 'My table',
           gridPos: { x: 0, y: 10, w: 25, h: 10 },
         },
         {
           id: 3,
-          type: 'graph3',
-          title: 'My graph3',
+          type: 'table',
+          title: 'My table 2',
           gridPos: { x: 0, y: 20, w: 25, h: 100 },
         },
         {
           id: 4,
-          type: 'graph4',
-          title: 'My graph4',
+          type: 'gauge',
+          title: 'My gauge',
           gridPos: { x: 0, y: 120, w: 25, h: 10 },
         },
       ],
@@ -51,17 +94,88 @@ function getTestDashboard(overrides?: Partial<Dashboard>, metaOverrides?: Partia
     overrides
   );
 
-  return createDashboardModelFixture(data, metaOverrides);
+  return createDashboardModelFixture(data, metaOverrides, getVariablesFromState);
 }
 
 describe('DashboardGrid', () => {
-  it('should render without error', () => {
+  it('Should render panels', async () => {
     const props: Props = {
       editPanel: null,
       viewPanel: null,
       isEditable: true,
       dashboard: getTestDashboard(),
     };
-    expect(() => render(<DashboardGrid {...props} />)).not.toThrow();
+
+    act(() => {
+      setup(props);
+    });
+
+    expect(await screen.findByText('My graph')).toBeInTheDocument();
+    expect(await screen.findByText('My table')).toBeInTheDocument();
+    expect(await screen.findByText('My table 2')).toBeInTheDocument();
+    expect(await screen.findByText('My gauge')).toBeInTheDocument();
+  });
+
+  it('Should allow filtering panels', async () => {
+    const props: Props = {
+      editPanel: null,
+      viewPanel: null,
+      isEditable: true,
+      dashboard: getTestDashboard(),
+    };
+    act(() => {
+      setup(props);
+    });
+
+    act(() => {
+      appEvents.publish(
+        new VariablesChanged({
+          panelIds: [],
+          refreshAll: false,
+          variable: {
+            type: 'textbox',
+            id: PANEL_FILTER_VARIABLE,
+            current: {
+              value: 'My graph',
+            },
+          } as TextBoxVariableModel,
+        })
+      );
+    });
+    const table = screen.queryByText('My table');
+    const table2 = screen.queryByText('My table 2');
+    const gauge = screen.queryByText('My gauge');
+
+    expect(await screen.findByText('My graph')).toBeInTheDocument();
+    expect(table).toBeNull();
+    expect(table2).toBeNull();
+    expect(gauge).toBeNull();
+  });
+
+  it('Should rendered filtered panels on init when filter variable is present', async () => {
+    const props: Props = {
+      editPanel: null,
+      viewPanel: null,
+      isEditable: true,
+      dashboard: getTestDashboard(undefined, undefined, () => [
+        {
+          id: PANEL_FILTER_VARIABLE,
+          type: 'textbox',
+          query: 'My tab',
+        } as TextBoxVariableModel,
+      ]),
+    };
+
+    act(() => {
+      setup(props);
+    });
+
+    const graph = screen.queryByText('My graph');
+    const gauge = screen.queryByText('My gauge');
+
+    expect(await screen.findByText('My table')).toBeInTheDocument();
+    expect(await screen.findByText('My table 2')).toBeInTheDocument();
+    expect(graph).toBeNull();
+    expect(gauge).toBeNull();
   });
 });
diff --git a/public/app/features/dashboard/dashgrid/DashboardGrid.tsx b/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
index 924944700dcba..f265fe4f52a80 100644
--- a/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
@@ -1,16 +1,16 @@
 import classNames from 'classnames';
 import React, { PureComponent, CSSProperties } from 'react';
 import ReactGridLayout, { ItemCallback } from 'react-grid-layout';
-import AutoSizer from 'react-virtualized-auto-sizer';
 import { Subscription } from 'rxjs';
 
 import { config } from '@grafana/runtime';
+import appEvents from 'app/core/app_events';
 import { GRID_CELL_HEIGHT, GRID_CELL_VMARGIN, GRID_COLUMN_COUNT } from 'app/core/constants';
 import { contextSrv } from 'app/core/services/context_srv';
+import { VariablesChanged } from 'app/features/variables/types';
 import { DashboardPanelsChangedEvent } from 'app/types/events';
 
 import { AddLibraryPanelWidget } from '../components/AddLibraryPanelWidget';
-import { AddPanelWidget } from '../components/AddPanelWidget';
 import { DashboardRow } from '../components/DashboardRow';
 import { DashboardModel, PanelModel } from '../state';
 import { GridPos } from '../state/PanelModel';
@@ -18,6 +18,8 @@ import { GridPos } from '../state/PanelModel';
 import DashboardEmpty from './DashboardEmpty';
 import { DashboardPanel } from './DashboardPanel';
 
+export const PANEL_FILTER_VARIABLE = 'systemPanelFilterVar';
+
 export interface Props {
   dashboard: DashboardModel;
   isEditable: boolean;
@@ -25,7 +27,13 @@ export interface Props {
   viewPanel: PanelModel | null;
   hidePanelMenus?: boolean;
 }
-export class DashboardGrid extends PureComponent<Props> {
+
+interface State {
+  panelFilter?: RegExp;
+  width: number;
+}
+
+export class DashboardGrid extends PureComponent<Props, State> {
   private panelMap: { [key: string]: PanelModel } = {};
   private eventSubs = new Subscription();
   private windowHeight = 1200;
@@ -37,10 +45,41 @@ export class DashboardGrid extends PureComponent<Props> {
 
   constructor(props: Props) {
     super(props);
+    this.state = {
+      panelFilter: undefined,
+      width: document.body.clientWidth, // initial very rough estimate
+    };
   }
 
   componentDidMount() {
     const { dashboard } = this.props;
+
+    if (config.featureToggles.panelFilterVariable) {
+      // If panel filter variable is set on load then
+      // update state to filter panels
+      for (const variable of dashboard.getVariables()) {
+        if (variable.id === PANEL_FILTER_VARIABLE) {
+          if ('query' in variable) {
+            this.setPanelFilter(variable.query);
+          }
+          break;
+        }
+      }
+
+      this.eventSubs.add(
+        appEvents.subscribe(VariablesChanged, (e) => {
+          if (e.payload.variable?.id === PANEL_FILTER_VARIABLE) {
+            if ('current' in e.payload.variable) {
+              let variable = e.payload.variable.current;
+              if ('value' in variable && typeof variable.value === 'string') {
+                this.setPanelFilter(variable.value);
+              }
+            }
+          }
+        })
+      );
+    }
+
     this.eventSubs.add(dashboard.events.subscribe(DashboardPanelsChangedEvent, this.triggerForceUpdate));
   }
 
@@ -48,10 +87,25 @@ export class DashboardGrid extends PureComponent<Props> {
     this.eventSubs.unsubscribe();
   }
 
+  setPanelFilter(regex: string) {
+    // Only set the panels filter if the systemPanelFilterVar variable
+    // is a non-empty string
+    let panelFilter = undefined;
+    if (regex.length > 0) {
+      panelFilter = new RegExp(regex, 'i');
+    }
+
+    this.setState({
+      panelFilter: panelFilter,
+    });
+  }
+
   buildLayout() {
     const layout: ReactGridLayout.Layout[] = [];
     this.panelMap = {};
+    const { panelFilter } = this.state;
 
+    let count = 0;
     for (const panel of this.props.dashboard.panels) {
       if (!panel.key) {
         panel.key = `panel-${panel.id}-${Date.now()}`;
@@ -78,13 +132,27 @@ export class DashboardGrid extends PureComponent<Props> {
         panelPos.isDraggable = panel.collapsed;
       }
 
-      layout.push(panelPos);
+      if (!panelFilter) {
+        layout.push(panelPos);
+      } else {
+        if (panelFilter.test(panel.title)) {
+          panelPos.isResizable = false;
+          panelPos.isDraggable = false;
+          panelPos.x = (count % 2) * GRID_COLUMN_COUNT;
+          panelPos.y = Math.floor(count / 2);
+          layout.push(panelPos);
+          count++;
+        }
+      }
     }
 
     return layout;
   }
 
   onLayoutChange = (newLayout: ReactGridLayout.Layout[]) => {
+    if (this.state.panelFilter) {
+      return;
+    }
     for (const newPos of newLayout) {
       this.panelMap[newPos.i!].updateGridPos(newPos, this.isLayoutInitialized);
     }
@@ -136,6 +204,7 @@ export class DashboardGrid extends PureComponent<Props> {
   }
 
   renderPanels(gridWidth: number, isDashboardDraggable: boolean) {
+    const { panelFilter } = this.state;
     const panelElements = [];
 
     // Reset last panel bottom
@@ -152,15 +221,10 @@ export class DashboardGrid extends PureComponent<Props> {
     for (const panel of this.props.dashboard.panels) {
       const panelClasses = classNames({ 'react-grid-item--fullscreen': panel.isViewing });
 
-      // used to allow overflowing content to show on top of the next panel
-      // requires parent create stacking context to prevent overlap with parent elements
-      const descIndex = this.props.dashboard.panels.length - panelElements.length;
-
-      panelElements.push(
+      const p = (
         <GrafanaGridItem
           key={panel.key}
           className={panelClasses}
-          descendingOrderIndex={descIndex}
           data-panelid={panel.id}
           gridPos={panel.gridPos}
           gridWidth={gridWidth}
@@ -173,6 +237,14 @@ export class DashboardGrid extends PureComponent<Props> {
           }}
         </GrafanaGridItem>
       );
+
+      if (!panelFilter) {
+        panelElements.push(p);
+      } else {
+        if (panelFilter.test(panel.title)) {
+          panelElements.push(p);
+        }
+      }
     }
 
     return panelElements;
@@ -183,11 +255,6 @@ export class DashboardGrid extends PureComponent<Props> {
       return <DashboardRow key={panel.key} panel={panel} dashboard={this.props.dashboard} />;
     }
 
-    // Todo: Remove this when we remove the emptyDashboardPage toggle
-    if (panel.type === 'add-panel') {
-      return <AddPanelWidget key={panel.key} panel={panel} dashboard={this.props.dashboard} />;
-    }
-
     if (panel.type === 'add-library-panel') {
       return <AddLibraryPanelWidget key={panel.key} panel={panel} dashboard={this.props.dashboard} />;
     }
@@ -220,22 +287,41 @@ export class DashboardGrid extends PureComponent<Props> {
     }
   };
 
+  private resizeObserver?: ResizeObserver;
+  private rootEl: HTMLDivElement | null = null;
+  onMeasureRef = (rootEl: HTMLDivElement | null) => {
+    if (!rootEl) {
+      if (this.rootEl && this.resizeObserver) {
+        this.resizeObserver.unobserve(this.rootEl);
+      }
+      return;
+    }
+
+    this.rootEl = rootEl;
+    this.resizeObserver = new ResizeObserver((entries) => {
+      entries.forEach((entry) => {
+        this.setState({ width: entry.contentRect.width });
+      });
+    });
+
+    this.resizeObserver.observe(rootEl);
+  };
+
   render() {
     const { isEditable, dashboard } = this.props;
+    const { width } = this.state;
 
-    if (config.featureToggles.emptyDashboardPage && dashboard.panels.length === 0) {
+    if (dashboard.panels.length === 0) {
       return <DashboardEmpty dashboard={dashboard} canCreate={isEditable} />;
     }
 
-    /**
-     * We have a parent with "flex: 1 1 0" we need to reset it to "flex: 1 1 auto" to have the AutoSizer
-     * properly working. For more information go here:
-     * https://github.com/bvaughn/react-virtualized/blob/master/docs/usingAutoSizer.md#can-i-use-autosizer-within-a-flex-container
-     *
-     * pos: rel + z-index is required to create a new stacking context to contain the escalating z-indexes of the panels
-     */
+    const draggable = width <= config.theme2.breakpoints.values.md ? false : isEditable;
+
+    // pos: rel + z-index is required to create a new stacking context to contain
+    // the escalating z-indexes of the panels
     return (
       <div
+        ref={this.onMeasureRef}
         style={{
           flex: '1 1 auto',
           position: 'relative',
@@ -243,46 +329,27 @@ export class DashboardGrid extends PureComponent<Props> {
           display: this.props.editPanel ? 'none' : undefined,
         }}
       >
-        <AutoSizer disableHeight>
-          {({ width }) => {
-            if (width === 0) {
-              return null;
-            }
-
-            // Disable draggable if mobile device, solving an issue with unintentionally
-            // moving panels. https://github.com/grafana/grafana/issues/18497
-            const draggable = width <= config.theme2.breakpoints.values.md ? false : isEditable;
-
-            return (
-              /**
-               * The children is using a width of 100% so we need to guarantee that it is wrapped
-               * in an element that has the calculated size given by the AutoSizer. The AutoSizer
-               * has a width of 0 and will let its content overflow its div.
-               */
-              <div style={{ width: width, height: '100%' }} ref={this.onGetWrapperDivRef}>
-                <ReactGridLayout
-                  width={width}
-                  isDraggable={draggable}
-                  isResizable={isEditable}
-                  containerPadding={[0, 0]}
-                  useCSSTransforms={true}
-                  margin={[GRID_CELL_VMARGIN, GRID_CELL_VMARGIN]}
-                  cols={GRID_COLUMN_COUNT}
-                  rowHeight={GRID_CELL_HEIGHT}
-                  draggableHandle=".grid-drag-handle"
-                  draggableCancel=".grid-drag-cancel"
-                  layout={this.buildLayout()}
-                  onDragStop={this.onDragStop}
-                  onResize={this.onResize}
-                  onResizeStop={this.onResizeStop}
-                  onLayoutChange={this.onLayoutChange}
-                >
-                  {this.renderPanels(width, draggable)}
-                </ReactGridLayout>
-              </div>
-            );
-          }}
-        </AutoSizer>
+        <div style={{ width: width, height: '100%' }} ref={this.onGetWrapperDivRef}>
+          <ReactGridLayout
+            width={width}
+            isDraggable={draggable}
+            isResizable={isEditable}
+            containerPadding={[0, 0]}
+            useCSSTransforms={true}
+            margin={[GRID_CELL_VMARGIN, GRID_CELL_VMARGIN]}
+            cols={GRID_COLUMN_COUNT}
+            rowHeight={GRID_CELL_HEIGHT}
+            draggableHandle=".grid-drag-handle"
+            draggableCancel=".grid-drag-cancel"
+            layout={this.buildLayout()}
+            onDragStop={this.onDragStop}
+            onResize={this.onResize}
+            onResizeStop={this.onResizeStop}
+            onLayoutChange={this.onLayoutChange}
+          >
+            {this.renderPanels(width, draggable)}
+          </ReactGridLayout>
+        </div>
       </div>
     );
   }
@@ -291,11 +358,10 @@ export class DashboardGrid extends PureComponent<Props> {
 interface GrafanaGridItemProps extends React.HTMLAttributes<HTMLDivElement> {
   gridWidth?: number;
   gridPos?: GridPos;
-  descendingOrderIndex?: number;
   isViewing: boolean;
   windowHeight: number;
   windowWidth: number;
-  children: any;
+  children: any; // eslint-disable-line @typescript-eslint/no-explicit-any
 }
 
 /**
@@ -306,7 +372,7 @@ const GrafanaGridItem = React.forwardRef<HTMLDivElement, GrafanaGridItemProps>((
   let width = 100;
   let height = 100;
 
-  const { gridWidth, gridPos, isViewing, windowHeight, windowWidth, descendingOrderIndex, ...divProps } = props;
+  const { gridWidth, gridPos, isViewing, windowHeight, windowWidth, ...divProps } = props;
   const style: CSSProperties = props.style ?? {};
 
   if (isViewing) {
@@ -336,7 +402,7 @@ const GrafanaGridItem = React.forwardRef<HTMLDivElement, GrafanaGridItemProps>((
 
   // props.children[0] is our main children. RGL adds the drag handle at props.children[1]
   return (
-    <div {...divProps} style={{ ...divProps.style, zIndex: descendingOrderIndex }} ref={ref}>
+    <div {...divProps} style={{ ...divProps.style }} ref={ref}>
       {/* Pass width and height to children as render props */}
       {[props.children[0](width, height), props.children.slice(1)]}
     </div>
diff --git a/public/app/features/dashboard/dashgrid/DashboardPanel.tsx b/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
index 89da60bb032e6..ffc36abee2b01 100644
--- a/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
@@ -28,7 +28,7 @@ export interface OwnProps {
 const mapStateToProps = (state: StoreState, props: OwnProps) => {
   const panelState = state.panels[props.stateKey];
   if (!panelState) {
-    return { plugin: null };
+    return { plugin: undefined };
   }
 
   return {
@@ -58,7 +58,7 @@ export class DashboardPanelUnconnected extends PureComponent<Props> {
     }
   }
 
-  onInstanceStateChange = (value: any) => {
+  onInstanceStateChange = (value: unknown) => {
     this.props.setPanelInstanceState({ key: this.props.stateKey, value });
   };
 
diff --git a/public/app/features/dashboard/dashgrid/PanelStateWrapper.test.tsx b/public/app/features/dashboard/dashgrid/PanelStateWrapper.test.tsx
index 8b6be6c4b9877..c46d74b3728d2 100644
--- a/public/app/features/dashboard/dashgrid/PanelStateWrapper.test.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelStateWrapper.test.tsx
@@ -74,6 +74,8 @@ function setupTestContext(options: Partial<Props>) {
     </Provider>
   );
 
+  // Needed so mocks work
+  props.panel.refreshWhenInView = false;
   return { rerender, props, subject, store };
 }
 
diff --git a/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx b/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx
index c8bc81ea66ca7..32cd4ba0fffe9 100644
--- a/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelStateWrapper.tsx
@@ -65,7 +65,7 @@ export interface Props {
   isDraggable?: boolean;
   width: number;
   height: number;
-  onInstanceStateChange: (value: any) => void;
+  onInstanceStateChange: (value: unknown) => void;
   timezone?: string;
   hideMenu?: boolean;
 }
@@ -74,7 +74,6 @@ export interface State {
   isFirstLoad: boolean;
   renderCounter: number;
   errorMessage?: string;
-  refreshWhenInView: boolean;
   context: PanelContext;
   data: PanelData;
   liveTime?: TimeRange;
@@ -95,7 +94,6 @@ export class PanelStateWrapper extends PureComponent<Props, State> {
     this.state = {
       isFirstLoad: true,
       renderCounter: 0,
-      refreshWhenInView: false,
       context: {
         eventsScope: '__global_',
         eventBus,
@@ -131,7 +129,7 @@ export class PanelStateWrapper extends PureComponent<Props, State> {
   // Due to a mutable panel model we get the sync settings via function that proactively reads from the model
   getSync = () => (this.props.isEditing ? DashboardCursorSync.Off : this.props.dashboard.graphTooltip);
 
-  onInstanceStateChange = (value: any) => {
+  onInstanceStateChange = (value: unknown) => {
     this.props.onInstanceStateChange(value);
 
     this.setState({
@@ -258,7 +256,7 @@ export class PanelStateWrapper extends PureComponent<Props, State> {
   }
 
   componentDidUpdate(prevProps: Props) {
-    const { isInView, width } = this.props;
+    const { isInView, width, panel } = this.props;
     const { context } = this.state;
 
     const app = this.getPanelContextApp();
@@ -276,7 +274,7 @@ export class PanelStateWrapper extends PureComponent<Props, State> {
     if (isInView !== prevProps.isInView) {
       if (isInView) {
         // Check if we need a delayed refresh
-        if (this.state.refreshWhenInView) {
+        if (panel.refreshWhenInView) {
           this.onRefresh();
         }
       }
@@ -342,8 +340,8 @@ export class PanelStateWrapper extends PureComponent<Props, State> {
   onRefresh = () => {
     const { dashboard, panel, isInView, width } = this.props;
 
-    if (!isInView) {
-      this.setState({ refreshWhenInView: true });
+    if (!dashboard.snapshot && !isInView) {
+      panel.refreshWhenInView = true;
       return;
     }
 
@@ -355,9 +353,7 @@ export class PanelStateWrapper extends PureComponent<Props, State> {
         return;
       }
 
-      if (this.state.refreshWhenInView) {
-        this.setState({ refreshWhenInView: false });
-      }
+      panel.refreshWhenInView = false;
       panel.runAllPanelQueries({
         dashboardUID: dashboard.uid,
         dashboardTimezone: dashboard.getTimezone(),
@@ -464,7 +460,12 @@ export class PanelStateWrapper extends PureComponent<Props, State> {
   };
 
   shouldSignalRenderingCompleted(loadingState: LoadingState, pluginMeta: PanelPluginMeta) {
-    return loadingState === LoadingState.Done || loadingState === LoadingState.Error || pluginMeta.skipDataQuery;
+    return (
+      loadingState === LoadingState.Done ||
+      loadingState === LoadingState.Streaming ||
+      loadingState === LoadingState.Error ||
+      pluginMeta.skipDataQuery
+    );
   }
 
   skipFirstRender(loadingState: LoadingState) {
diff --git a/public/app/features/dashboard/index.ts b/public/app/features/dashboard/index.ts
index 1a39f7495ec95..12c86883b58a2 100644
--- a/public/app/features/dashboard/index.ts
+++ b/public/app/features/dashboard/index.ts
@@ -4,5 +4,4 @@ import './services/DashboardSrv';
 // Components
 import './components/DashExportModal';
 import './components/DashNav';
-import './components/VersionHistory';
 import './components/DashboardSettings';
diff --git a/public/app/features/dashboard/routes.ts b/public/app/features/dashboard/routes.ts
index f76da677f685c..127d57b118eaa 100644
--- a/public/app/features/dashboard/routes.ts
+++ b/public/app/features/dashboard/routes.ts
@@ -4,32 +4,33 @@ import { RouteDescriptor } from '../../core/navigation/types';
 import { DashboardRoutes } from '../../types';
 
 export const getPublicDashboardRoutes = (): RouteDescriptor[] => {
-  if (config.featureToggles.publicDashboards) {
-    return [
-      {
-        path: '/dashboard/public',
-        pageClass: 'page-dashboard',
-        routeName: DashboardRoutes.Public,
-        component: SafeDynamicImport(
-          () =>
-            import(
-              /* webpackChunkName: "ListPublicDashboardPage" */ '../../features/manage-dashboards/PublicDashboardListPage'
-            )
-        ),
-      },
-      {
-        path: '/public-dashboards/:accessToken',
-        pageClass: 'page-dashboard',
-        routeName: DashboardRoutes.Public,
-        chromeless: true,
-        component: SafeDynamicImport(
-          () =>
-            import(
-              /* webpackChunkName: "PublicDashboardPage" */ '../../features/dashboard/containers/PublicDashboardPage'
-            )
-        ),
-      },
-    ];
+  if (!config.publicDashboardsEnabled || !config.featureToggles.publicDashboards) {
+    return [];
   }
-  return [];
+
+  return [
+    {
+      path: '/dashboard/public',
+      pageClass: 'page-dashboard',
+      routeName: DashboardRoutes.Public,
+      component: SafeDynamicImport(
+        () =>
+          import(
+            /* webpackChunkName: "ListPublicDashboardPage" */ '../../features/manage-dashboards/PublicDashboardListPage'
+          )
+      ),
+    },
+    {
+      path: '/public-dashboards/:accessToken',
+      pageClass: 'page-dashboard',
+      routeName: DashboardRoutes.Public,
+      chromeless: true,
+      component: SafeDynamicImport(
+        () =>
+          import(
+            /* webpackChunkName: "PublicDashboardPage" */ '../../features/dashboard/containers/PublicDashboardPageProxy'
+          )
+      ),
+    },
+  ];
 };
diff --git a/public/app/features/dashboard/services/DashboardLoaderSrv.ts b/public/app/features/dashboard/services/DashboardLoaderSrv.ts
index b11de1ddeda50..2d35c27c57ddd 100644
--- a/public/app/features/dashboard/services/DashboardLoaderSrv.ts
+++ b/public/app/features/dashboard/services/DashboardLoaderSrv.ts
@@ -7,19 +7,18 @@ import { getBackendSrv, locationService } from '@grafana/runtime';
 import { backendSrv } from 'app/core/services/backend_srv';
 import impressionSrv from 'app/core/services/impression_srv';
 import kbn from 'app/core/utils/kbn';
+import { getDashboardScenePageStateManager } from 'app/features/dashboard-scene/pages/DashboardScenePageStateManager';
 import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
-import { DashboardDataDTO, DashboardDTO, DashboardMeta } from 'app/types';
+import { DashboardDTO } from 'app/types';
 
 import { appEvents } from '../../../core/core';
 
 import { getDashboardSrv } from './DashboardSrv';
+import { getDashboardSnapshotSrv } from './SnapshotSrv';
 
 export class DashboardLoaderSrv {
   constructor() {}
-  _dashboardLoadFailed(
-    title: string,
-    snapshot?: boolean
-  ): { meta: DashboardMeta; dashboard: Partial<DashboardDataDTO> } {
+  _dashboardLoadFailed(title: string, snapshot?: boolean): DashboardDTO {
     snapshot = snapshot || false;
     return {
       meta: {
@@ -28,21 +27,25 @@ export class DashboardLoaderSrv {
         canDelete: false,
         canSave: false,
         canEdit: false,
+        canShare: false,
         dashboardNotFound: true,
       },
-      dashboard: { title },
+      dashboard: { title, uid: title, schemaVersion: 0 },
     };
   }
 
   loadDashboard(type: UrlQueryValue, slug: string | undefined, uid: string | undefined): Promise<DashboardDTO> {
+    const stateManager = getDashboardScenePageStateManager();
     let promise;
 
     if (type === 'script' && slug) {
       promise = this._loadScriptedDashboard(slug);
     } else if (type === 'snapshot' && slug) {
-      promise = backendSrv.get('/api/snapshots/' + slug).catch(() => {
-        return this._dashboardLoadFailed('Snapshot not found', true);
-      });
+      promise = getDashboardSnapshotSrv()
+        .getSnapshot(slug)
+        .catch(() => {
+          return this._dashboardLoadFailed('Snapshot not found', true);
+        });
     } else if (type === 'ds' && slug) {
       promise = this._loadFromDatasource(slug); // explore dashboards as code
     } else if (type === 'public' && uid) {
@@ -56,6 +59,8 @@ export class DashboardLoaderSrv {
             e.data.statusCode === 403 && e.data.messageId === 'publicdashboards.notEnabled';
           const isPublicDashboardNotFound =
             e.data.statusCode === 404 && e.data.messageId === 'publicdashboards.notFound';
+          const isDashboardNotFound =
+            e.data.statusCode === 404 && e.data.messageId === 'publicdashboards.dashboardNotFound';
 
           const dashboardModel = this._dashboardLoadFailed(
             isPublicDashboardPaused ? 'Public Dashboard paused' : 'Public Dashboard Not found',
@@ -66,11 +71,16 @@ export class DashboardLoaderSrv {
             meta: {
               ...dashboardModel.meta,
               publicDashboardEnabled: isPublicDashboardNotFound ? undefined : !isPublicDashboardPaused,
-              dashboardNotFound: isPublicDashboardNotFound,
+              dashboardNotFound: isPublicDashboardNotFound || isDashboardNotFound,
             },
           };
         });
     } else if (uid) {
+      const cachedDashboard = stateManager.getFromCache(uid);
+      if (cachedDashboard) {
+        return Promise.resolve(cachedDashboard);
+      }
+
       promise = backendSrv
         .getDashboardByUid(uid)
         .then((result) => {
diff --git a/public/app/features/dashboard/services/DashboardSrv.ts b/public/app/features/dashboard/services/DashboardSrv.ts
index c1168e310992e..d79ebf2253c0d 100644
--- a/public/app/features/dashboard/services/DashboardSrv.ts
+++ b/public/app/features/dashboard/services/DashboardSrv.ts
@@ -18,8 +18,6 @@ export interface SaveDashboardOptions {
   dashboard: DashboardModel;
   /** Set a commit message for the version history. */
   message?: string;
-  /** The id of the folder to save the dashboard in. */
-  folderId?: number;
   /** The UID of the folder to save the dashboard in. Overrides `folderId`. */
   folderUid?: string;
   /** Set to `true` if you want to overwrite existing dashboard with newer version,
diff --git a/public/app/features/dashboard/services/SnapshotSrv.ts b/public/app/features/dashboard/services/SnapshotSrv.ts
new file mode 100644
index 0000000000000..e3e0e9db637b4
--- /dev/null
+++ b/public/app/features/dashboard/services/SnapshotSrv.ts
@@ -0,0 +1,161 @@
+import { lastValueFrom, map } from 'rxjs';
+
+import { config, getBackendSrv, FetchResponse } from '@grafana/runtime';
+import { contextSrv } from 'app/core/core';
+import { DashboardDataDTO, DashboardDTO } from 'app/types';
+
+// Used in the snapshot list
+export interface Snapshot {
+  key: string;
+  name: string;
+  external: boolean;
+  externalUrl?: string;
+  url?: string;
+}
+
+export interface SnapshotSharingOptions {
+  externalEnabled: boolean;
+  externalSnapshotName: string;
+  externalSnapshotURL: string;
+  snapshotEnabled: boolean;
+}
+
+export interface SnapshotCreateCommand {
+  dashboard: object;
+  name: string;
+  expires?: number;
+  external?: boolean;
+}
+
+export interface SnapshotCreateResponse {
+  key: string;
+  url: string;
+  deleteUrl: string;
+}
+
+export interface DashboardSnapshotSrv {
+  create: (cmd: SnapshotCreateCommand) => Promise<SnapshotCreateResponse>;
+  getSnapshots: () => Promise<Snapshot[]>;
+  getSharingOptions: () => Promise<SnapshotSharingOptions>;
+  deleteSnapshot: (key: string) => Promise<void>;
+  getSnapshot: (key: string) => Promise<DashboardDTO>;
+}
+
+const legacyDashboardSnapshotSrv: DashboardSnapshotSrv = {
+  create: (cmd: SnapshotCreateCommand) => getBackendSrv().post<SnapshotCreateResponse>('/api/snapshots', cmd),
+  getSnapshots: () => getBackendSrv().get<Snapshot[]>('/api/dashboard/snapshots'),
+  getSharingOptions: () => getBackendSrv().get<SnapshotSharingOptions>('/api/snapshot/shared-options'),
+  deleteSnapshot: (key: string) => getBackendSrv().delete('/api/snapshots/' + key),
+  getSnapshot: async (key: string) => {
+    const dto = await getBackendSrv().get<DashboardDTO>('/api/snapshots/' + key);
+    dto.meta.canShare = false;
+    return dto;
+  },
+};
+
+interface K8sMetadata {
+  name: string;
+  namespace: string;
+  resourceVersion: string;
+  creationTimestamp: string;
+}
+
+interface K8sSnapshotInfo {
+  title: string;
+  externalUrl?: string;
+  expires?: number;
+}
+
+interface K8sSnapshotResource {
+  metadata: K8sMetadata;
+  spec: K8sSnapshotInfo;
+}
+
+interface DashboardSnapshotList {
+  items: K8sSnapshotResource[];
+}
+
+interface K8sDashboardSnapshot {
+  apiVersion: string;
+  kind: 'DashboardSnapshot';
+  metadata: K8sMetadata;
+  dashboard: DashboardDataDTO;
+}
+
+class K8sAPI implements DashboardSnapshotSrv {
+  readonly apiVersion = 'dashboardsnapshot.grafana.app/v0alpha1';
+  readonly url: string;
+
+  constructor() {
+    this.url = `/apis/${this.apiVersion}/namespaces/${config.namespace}/dashboardsnapshots`;
+  }
+
+  async create(cmd: SnapshotCreateCommand) {
+    return getBackendSrv().post<SnapshotCreateResponse>(this.url + '/create', cmd);
+  }
+
+  async getSnapshots(): Promise<Snapshot[]> {
+    const result = await getBackendSrv().get<DashboardSnapshotList>(this.url);
+    return result.items.map((r) => {
+      return {
+        key: r.metadata.name,
+        name: r.spec.title,
+        external: r.spec.externalUrl != null,
+        externalUrl: r.spec.externalUrl,
+      };
+    });
+  }
+
+  deleteSnapshot(uid: string) {
+    return getBackendSrv().delete<void>(this.url + '/' + uid);
+  }
+
+  async getSharingOptions() {
+    // TODO? should this be in a config service, or in the same service?
+    // we have http://localhost:3000/apis/dashboardsnapshot.grafana.app/v0alpha1/namespaces/default/options
+    // BUT that has an unclear user mapping story still, so lets stick with the existing shared-options endpoint
+    return getBackendSrv().get<SnapshotSharingOptions>('/api/snapshot/shared-options');
+  }
+
+  async getSnapshot(uid: string): Promise<DashboardDTO> {
+    const headers: Record<string, string> = {};
+    if (!contextSrv.isSignedIn) {
+      alert('TODO... need a barer token for anonymous use case');
+      const token = `??? TODO, get anon token for snapshots (${contextSrv.user?.name}) ???`;
+      headers['Authorization'] = `Bearer ${token}`;
+    }
+    return lastValueFrom(
+      getBackendSrv()
+        .fetch<K8sDashboardSnapshot>({
+          url: this.url + '/' + uid + '/body',
+          method: 'GET',
+          headers: headers,
+        })
+        .pipe(
+          map((response: FetchResponse<K8sDashboardSnapshot>) => {
+            return {
+              dashboard: response.data.dashboard,
+              meta: {
+                isSnapshot: true,
+                canSave: false,
+                canEdit: false,
+                canAdmin: false,
+                canStar: false,
+                canShare: false,
+                canDelete: false,
+                isFolder: false,
+                provisioned: false,
+              },
+            };
+          })
+        )
+    );
+  }
+}
+
+export function getDashboardSnapshotSrv(): DashboardSnapshotSrv {
+  if (config.featureToggles.kubernetesSnapshots) {
+    return new K8sAPI();
+  }
+  return legacyDashboardSnapshotSrv;
+}
diff --git a/public/app/features/dashboard/services/TimeSrv.test.ts b/public/app/features/dashboard/services/TimeSrv.test.ts
index aa067ae98bab2..e604828080ee6 100644
--- a/public/app/features/dashboard/services/TimeSrv.test.ts
+++ b/public/app/features/dashboard/services/TimeSrv.test.ts
@@ -24,7 +24,7 @@ describe('timeSrv', () => {
     _dashboard = {
       time: { from: 'now-6h', to: 'now' },
       getTimezone: jest.fn(() => 'browser'),
-      refresh: false,
+      refresh: '',
       timeRangeUpdated: jest.fn(() => {}),
       timepicker: {},
     };
@@ -94,7 +94,7 @@ describe('timeSrv', () => {
         _dashboard = {
           time: { from: 'now-6h', to: 'now' },
           getTimezone: jest.fn(() => 'browser'),
-          refresh: false,
+          refresh: '',
           timeRangeUpdated: jest.fn(() => {}),
           timepicker: {},
         };
@@ -210,36 +210,36 @@ describe('timeSrv', () => {
         expect(time.to.valueOf()).toEqual(1410337650000);
       });
 
-      it('corrects inverted from/to dates in ms', () => {
+      it('does not correct inverted from/to dates in ms', () => {
         locationService.push('/d/id?from=1621436828909&to=1621436818909');
 
         timeSrv = new TimeSrv(new ContextSrvStub());
 
         timeSrv.init(_dashboard);
         const time = timeSrv.timeRange();
-        expect(time.from.valueOf()).toEqual(1621436818909);
-        expect(time.to.valueOf()).toEqual(1621436828909);
+        expect(time.from.valueOf()).toEqual(1621436828909);
+        expect(time.to.valueOf()).toEqual(1621436818909);
       });
 
-      it('corrects inverted from/to dates as relative times', () => {
+      it('does not correct inverted from/to dates as relative times', () => {
         locationService.push('/d/id?from=now&to=now-1h');
 
         timeSrv = new TimeSrv(new ContextSrvStub());
 
         timeSrv.init(_dashboard);
         const time = timeSrv.timeRange();
-        expect(time.raw.from).toBe('now-1h');
-        expect(time.raw.to).toBe('now');
+        expect(time.raw.from).toBe('now');
+        expect(time.raw.to).toBe('now-1h');
       });
     });
   });
 
   describe('setTime', () => {
     it('should return disable refresh if refresh is disabled for any range', () => {
-      _dashboard.refresh = false;
+      _dashboard.refresh = '';
 
       timeSrv.setTime({ from: '2011-01-01', to: '2015-01-01' });
-      expect(_dashboard.refresh).toBe(false);
+      expect(_dashboard.refresh).toBe('');
     });
 
     it('should restore refresh for absolute time range', () => {
@@ -255,7 +255,7 @@ describe('timeSrv', () => {
         from: dateTime([2011, 1, 1]),
         to: dateTime([2015, 1, 1]),
       });
-      expect(_dashboard.refresh).toBe(false);
+      expect(_dashboard.refresh).toBe('');
       timeSrv.setTime({ from: '2011-01-01', to: 'now' });
       expect(_dashboard.refresh).toBe('10s');
     });
diff --git a/public/app/features/dashboard/services/TimeSrv.ts b/public/app/features/dashboard/services/TimeSrv.ts
index e2e2dd40a96dd..297757650bbf4 100644
--- a/public/app/features/dashboard/services/TimeSrv.ts
+++ b/public/app/features/dashboard/services/TimeSrv.ts
@@ -10,16 +10,25 @@ import {
   TimeRange,
   toUtc,
   IntervalValues,
+  AppEvents,
 } from '@grafana/data';
 import { locationService } from '@grafana/runtime';
 import { sceneGraph } from '@grafana/scenes';
+import { t } from '@grafana/ui/src/utils/i18n';
 import appEvents from 'app/core/app_events';
 import { config } from 'app/core/config';
 import { AutoRefreshInterval, contextSrv, ContextSrv } from 'app/core/services/context_srv';
-import { getShiftedTimeRange, getZoomedTimeRange } from 'app/core/utils/timePicker';
+import { getCopiedTimeRange, getShiftedTimeRange, getZoomedTimeRange } from 'app/core/utils/timePicker';
 import { getTimeRange } from 'app/features/dashboard/utils/timeRange';
 
-import { AbsoluteTimeEvent, ShiftTimeEvent, ShiftTimeEventDirection, ZoomOutEvent } from '../../../types/events';
+import {
+  AbsoluteTimeEvent,
+  CopyTimeEvent,
+  PasteTimeEvent,
+  ShiftTimeEvent,
+  ShiftTimeEventDirection,
+  ZoomOutEvent,
+} from '../../../types/events';
 import { TimeModel } from '../state/TimeModel';
 import { getRefreshFromUrl } from '../utils/getRefreshFromUrl';
 
@@ -51,6 +60,14 @@ export class TimeSrv {
       this.makeAbsoluteTime(e.payload.updateUrl);
     });
 
+    appEvents.subscribe(CopyTimeEvent, () => {
+      this.copyTimeRangeToClipboard();
+    });
+
+    appEvents.subscribe(PasteTimeEvent, (e) => {
+      this.pasteTimeRangeFromClipboard(e.payload.updateUrl);
+    });
+
     document.addEventListener('visibilitychange', () => {
       if (this.autoRefreshBlocked && document.visibilityState === 'visible') {
         this.autoRefreshBlocked = false;
@@ -70,22 +87,6 @@ export class TimeSrv {
     // remember time at load so we can go back to it
     this.timeAtLoad = cloneDeep(this.time);
 
-    const range = rangeUtil.convertRawToRange(
-      this.time,
-      this.timeModel?.getTimezone(),
-      this.timeModel?.fiscalYearStartMonth
-    );
-
-    if (range.to.isBefore(range.from)) {
-      this.setTime(
-        {
-          from: range.raw.to,
-          to: range.raw.from,
-        },
-        false
-      );
-    }
-
     if (this.refresh) {
       this.setAutoRefresh(this.refresh);
     }
@@ -169,7 +170,7 @@ export class TimeSrv {
     if (params.get('to') && params.get('to')!.indexOf('now') === -1) {
       this.refresh = false;
       if (this.timeModel) {
-        this.timeModel.refresh = false;
+        this.timeModel.refresh = undefined;
       }
     }
 
@@ -213,7 +214,7 @@ export class TimeSrv {
     return this.timeAtLoad && (this.timeAtLoad.from !== this.time.from || this.timeAtLoad.to !== this.time.to);
   }
 
-  setAutoRefresh(interval: string | false) {
+  setAutoRefresh(interval: string) {
     if (this.timeModel) {
       this.timeModel.refresh = interval;
     }
@@ -294,7 +295,7 @@ export class TimeSrv {
     // disable refresh if zoom in or zoom out
     if (isDateTime(time.to)) {
       this.oldRefresh = this.timeModel?.refresh || this.oldRefresh;
-      this.setAutoRefresh(false);
+      this.setAutoRefresh('');
     } else if (this.oldRefresh && this.oldRefresh !== this.timeModel?.refresh) {
       this.setAutoRefresh(this.oldRefresh);
       this.oldRefresh = undefined;
@@ -373,6 +374,30 @@ export class TimeSrv {
     this.setTime({ from, to }, updateUrl);
   }
 
+  copyTimeRangeToClipboard() {
+    const { raw } = this.timeRange();
+    navigator.clipboard.writeText(JSON.stringify({ from: raw.from, to: raw.to }));
+    appEvents.emit(AppEvents.alertSuccess, [
+      t('time-picker.copy-paste.copy-success-message', 'Time range copied to clipboard'),
+    ]);
+  }
+
+  async pasteTimeRangeFromClipboard(updateUrl = true) {
+    const { range, isError } = await getCopiedTimeRange();
+
+    if (isError === true) {
+      appEvents.emit(AppEvents.alertError, [
+        t('time-picker.copy-paste.default-error-title', 'Invalid time range'),
+        t('time-picker.copy-paste.default-error-message', '{{error}} is not a valid time range', { error: range }),
+      ]);
+      return;
+    }
+
+    const { from, to } = range;
+
+    this.setTime({ from, to }, updateUrl);
+  }
+
   // isRefreshOutsideThreshold function calculates the difference between last refresh and now
   // if the difference is outside 5% of the current set time range then the function will return true
   // if the difference is within 5% of the current set time range then the function will return false
diff --git a/public/app/features/dashboard/state/DashboardMigrator.test.ts b/public/app/features/dashboard/state/DashboardMigrator.test.ts
index cea0683ac3bd9..9c5c6d5dfd858 100644
--- a/public/app/features/dashboard/state/DashboardMigrator.test.ts
+++ b/public/app/features/dashboard/state/DashboardMigrator.test.ts
@@ -13,6 +13,8 @@ import { VariableHide } from '../../variables/types';
 import { DashboardModel } from '../state/DashboardModel';
 import { PanelModel } from '../state/PanelModel';
 
+import { DASHBOARD_SCHEMA_VERSION } from './DashboardMigrator';
+
 jest.mock('app/core/services/context_srv', () => ({}));
 
 const dataSources = {
@@ -44,7 +46,7 @@ setDataSourceSrv(new MockDataSourceSrv(dataSources));
 
 describe('DashboardModel', () => {
   describe('when creating dashboard with old schema', () => {
-    let model: any;
+    let model: DashboardModel;
     let graph: any;
     let singlestat: any;
     let table: any;
@@ -69,8 +71,8 @@ describe('DashboardModel', () => {
         panels: [
           {
             type: 'graph',
-            legend: { show: true },
             // @ts-expect-error
+            legend: { show: true },
             aliasYAxis: { test: 2 },
             y_formats: ['kbyte', 'ms'],
             grid: {
@@ -228,7 +230,7 @@ describe('DashboardModel', () => {
     });
 
     it('dashboard schema version should be set to latest', () => {
-      expect(model.schemaVersion).toBe(38);
+      expect(model.schemaVersion).toBe(DASHBOARD_SCHEMA_VERSION);
     });
 
     it('graph thresholds should be migrated', () => {
@@ -515,7 +517,7 @@ describe('DashboardModel', () => {
   });
 
   describe('when migrating panel links', () => {
-    let model: any;
+    let model: DashboardModel;
 
     beforeEach(() => {
       model = new DashboardModel({
@@ -562,24 +564,26 @@ describe('DashboardModel', () => {
     });
 
     it('should add keepTime as variable', () => {
-      expect(model.panels[0].links[0].url).toBe(`http://mylink.com?$${DataLinkBuiltInVars.keepTime}`);
+      expect(model.panels[0].links?.[0].url).toBe(`http://mylink.com?$${DataLinkBuiltInVars.keepTime}`);
     });
 
     it('should add params to url', () => {
-      expect(model.panels[0].links[1].url).toBe('http://mylink.com?existingParam&customParam');
+      expect(model.panels[0].links?.[1].url).toBe('http://mylink.com?existingParam&customParam');
     });
 
     it('should add includeVars to url', () => {
-      expect(model.panels[0].links[2].url).toBe(`http://mylink.com?existingParam&$${DataLinkBuiltInVars.includeVars}`);
+      expect(model.panels[0].links?.[2].url).toBe(
+        `http://mylink.com?existingParam&$${DataLinkBuiltInVars.includeVars}`
+      );
     });
 
     it('should slugify dashboard name', () => {
-      expect(model.panels[0].links[3].url).toBe(`dashboard/db/my-other-dashboard`);
+      expect(model.panels[0].links?.[3].url).toBe(`dashboard/db/my-other-dashboard`);
     });
   });
 
   describe('when migrating variables', () => {
-    let model: any;
+    let model: DashboardModel;
     beforeEach(() => {
       model = new DashboardModel({
         panels: [
@@ -646,7 +650,7 @@ describe('DashboardModel', () => {
   });
 
   describe('when migrating labels from DataFrame to Field', () => {
-    let model: any;
+    let model: DashboardModel;
     beforeEach(() => {
       model = new DashboardModel({
         panels: [
@@ -890,7 +894,7 @@ describe('DashboardModel', () => {
     });
 
     it('should migrate panels with new Text Panel id', () => {
-      const reactPanel: any = model.panels[1];
+      const reactPanel = model.panels[1];
       expect(reactPanel.id).toEqual(3);
       expect(reactPanel.type).toEqual('text');
       expect(reactPanel.title).toEqual('React Text Panel from scratch');
@@ -901,7 +905,7 @@ describe('DashboardModel', () => {
     });
 
     it('should clean up old angular options for panels with new Text Panel id', () => {
-      const reactPanel: any = model.panels[2];
+      const reactPanel = model.panels[2];
       expect(reactPanel.id).toEqual(4);
       expect(reactPanel.type).toEqual('text');
       expect(reactPanel.title).toEqual('React Text Panel from Angular Panel');
@@ -1077,12 +1081,14 @@ describe('DashboardModel', () => {
               type: 'query',
               name: 'variable_with_unknown_refresh_with_options',
               options: [{ text: 'A', value: 'A' }],
+              // @ts-expect-error
               refresh: 2001,
             },
             {
               type: 'query',
               name: 'variable_with_unknown_refresh_without_options',
               options: [],
+              // @ts-expect-error
               refresh: 2001,
             },
             {
@@ -1560,7 +1566,7 @@ describe('DashboardModel', () => {
   });
 
   describe('migrating legacy CloudWatch queries', () => {
-    let model: any;
+    let model: DashboardModel;
     let panelTargets: any;
 
     beforeEach(() => {
diff --git a/public/app/features/dashboard/state/DashboardMigrator.ts b/public/app/features/dashboard/state/DashboardMigrator.ts
index 5ebed64deea70..7e4c7c5c2d6d6 100644
--- a/public/app/features/dashboard/state/DashboardMigrator.ts
+++ b/public/app/features/dashboard/state/DashboardMigrator.ts
@@ -15,6 +15,7 @@ import {
   isEmptyObject,
   MappingType,
   PanelPlugin,
+  ReducerID,
   SpecialValueMatch,
   standardEditorsRegistry,
   standardFieldConfigEditorRegistry,
@@ -42,6 +43,10 @@ import {
 import getFactors from 'app/core/utils/factors';
 import kbn from 'app/core/utils/kbn';
 import { DatasourceSrv } from 'app/features/plugins/datasource_srv';
+import {
+  RefIdTransformerOptions,
+  TimeSeriesTableTransformerOptions,
+} from 'app/features/transformers/timeSeriesTable/timeSeriesTableTransformer';
 import { isConstant, isMulti } from 'app/features/variables/guard';
 import { alignCurrentWithMulti } from 'app/features/variables/shared/multiOptions';
 import { CloudWatchMetricsQuery, LegacyAnnotationQuery } from 'app/plugins/datasource/cloudwatch/types';
@@ -63,6 +68,14 @@ standardEditorsRegistry.setInit(getAllOptionEditors);
 standardFieldConfigEditorRegistry.setInit(getAllStandardFieldConfigs);
 
 type PanelSchemeUpgradeHandler = (panel: PanelModel) => PanelModel;
+
+/**
+ * The current version of the dashboard schema.
+ * To add a dashboard migration increment this number
+ * and then add your migration at the bottom of 'updateSchema'
+ * hint: search "Add migration here"
+ */
+export const DASHBOARD_SCHEMA_VERSION = 39;
 export class DashboardMigrator {
   dashboard: DashboardModel;
 
@@ -79,7 +92,7 @@ export class DashboardMigrator {
     let i, j, k, n;
     const oldVersion = this.dashboard.schemaVersion;
     const panelUpgrades: PanelSchemeUpgradeHandler[] = [];
-    this.dashboard.schemaVersion = 38;
+    this.dashboard.schemaVersion = DASHBOARD_SCHEMA_VERSION;
 
     if (oldVersion === this.dashboard.schemaVersion) {
       return;
@@ -174,7 +187,7 @@ export class DashboardMigrator {
 
     if (oldVersion < 6) {
       // move drop-downs to new schema
-      const annotations: any = find(old.pulldowns, { type: 'annotations' });
+      const annotations = find(old.pulldowns, { type: 'annotations' });
 
       if (annotations) {
         this.dashboard.annotations = {
@@ -305,16 +318,18 @@ export class DashboardMigrator {
 
     if (oldVersion < 12) {
       // update template variables
-      each(this.dashboard.getVariables(), (templateVariable: any) => {
-        if (templateVariable.refresh) {
-          templateVariable.refresh = 1;
-        }
-        if (!templateVariable.refresh) {
-          templateVariable.refresh = 0;
+      each(this.dashboard.getVariables(), (templateVariable) => {
+        if ('refresh' in templateVariable) {
+          if (templateVariable.refresh) {
+            templateVariable.refresh = 1;
+          }
+          if (!templateVariable.refresh) {
+            templateVariable.refresh = 0;
+          }
         }
-        if (templateVariable.hideVariable) {
+        if ('hideVariable' in templateVariable && templateVariable.hideVariable) {
           templateVariable.hide = 2;
-        } else if (templateVariable.hideLabel) {
+        } else if ('hideLabel' in templateVariable && templateVariable.hideLabel) {
           templateVariable.hide = 1;
         }
       });
@@ -849,6 +864,46 @@ export class DashboardMigrator {
       });
     }
 
+    // Update the configuration of the Timeseries to table transformation
+    // to support multiple options per query
+    if (oldVersion < 39) {
+      panelUpgrades.push((panel: PanelModel) => {
+        panel.transformations?.forEach((transformation) => {
+          // If we run into a timeSeriesTable transformation
+          // and it doesn't have undefined options then we migrate
+          if (
+            transformation.id === 'timeSeriesTable' &&
+            transformation.options !== undefined &&
+            transformation.options.refIdToStat !== undefined
+          ) {
+            let tableTransformOptions: TimeSeriesTableTransformerOptions = {};
+
+            // For each {refIdtoStat} record which maps refId to a statistic
+            // we add that to the stat property of the the new
+            // RefIdTransformerOptions interface which includes multiple settings
+            for (const [refId, stat] of Object.entries(transformation.options.refIdToStat)) {
+              let newSettings: RefIdTransformerOptions = {};
+              // In this case the easiest way is just to do a type
+              // assertion as iterated entries have unknown types
+              newSettings.stat = stat as ReducerID;
+              tableTransformOptions[refId] = newSettings;
+            }
+
+            // Update the options
+            transformation.options = tableTransformOptions;
+          }
+        });
+
+        return panel;
+      });
+    }
+
+    /**
+     * -==- Add migration here -==-
+     * Your migration should go below the previous
+     * block and above this (hopefully) helpful message.
+     */
+
     if (panelUpgrades.length === 0) {
       return;
     }
@@ -940,7 +995,7 @@ export class DashboardMigrator {
         continue;
       }
 
-      const height: any = row.height || DEFAULT_ROW_HEIGHT;
+      const height = row.height || DEFAULT_ROW_HEIGHT;
       const rowGridHeight = getGridHeight(height);
 
       const rowPanel: any = {};
@@ -1348,7 +1403,7 @@ function upgradeValueMappings(oldMappings: any, thresholds?: ThresholdsConfig):
 }
 
 function migrateTooltipOptions(panel: PanelModel) {
-  if (panel.type === 'timeseries' || panel.type === 'xychart') {
+  if (panel.type === 'timeseries' || panel.type === 'xychart' || panel.type === 'xychart2') {
     if (panel.options.tooltipOptions) {
       panel.options = {
         ...panel.options,
diff --git a/public/app/features/dashboard/state/DashboardModel.repeat.test.ts b/public/app/features/dashboard/state/DashboardModel.repeat.test.ts
index 1c6e871985619..421e8fa68558e 100644
--- a/public/app/features/dashboard/state/DashboardModel.repeat.test.ts
+++ b/public/app/features/dashboard/state/DashboardModel.repeat.test.ts
@@ -194,7 +194,7 @@ describe('given dashboard with panel repeat in horizontal direction', () => {
 });
 
 describe('given dashboard with panel repeat in vertical direction', () => {
-  let dashboard: any;
+  let dashboard: DashboardModel;
 
   beforeEach(() => {
     const dashboardJSON = {
@@ -238,7 +238,7 @@ describe('given dashboard with panel repeat in vertical direction', () => {
 });
 
 describe('given dashboard with row repeat and panel repeat in horizontal direction', () => {
-  let dashboard: any, dashboardJSON: any;
+  let dashboard: DashboardModel, dashboardJSON: any;
 
   beforeEach(() => {
     dashboardJSON = {
@@ -280,7 +280,7 @@ describe('given dashboard with row repeat and panel repeat in horizontal directi
       },
     };
     dashboard = getDashboardModel(dashboardJSON);
-    dashboard.processRepeats(false);
+    dashboard.processRepeats();
   });
 
   it('should panels in self row', () => {
@@ -325,7 +325,7 @@ describe('given dashboard with row repeat and panel repeat in horizontal directi
 });
 
 describe('given dashboard with row repeat', () => {
-  let dashboard: any, dashboardJSON: any;
+  let dashboard: DashboardModel, dashboardJSON: any;
 
   beforeEach(() => {
     dashboardJSON = {
@@ -382,7 +382,7 @@ describe('given dashboard with row repeat', () => {
 
     const scopedVars = compact(
       map(dashboard.panels, (panel) => {
-        return panel.scopedVars ? panel.scopedVars.apps.value : null;
+        return panel.scopedVars ? panel.scopedVars.apps?.value : null;
       })
     );
 
@@ -474,14 +474,14 @@ describe('given dashboard with row repeat', () => {
       'graph',
     ]);
 
-    expect(dashboard.panels[0].scopedVars['apps'].value).toBe('se1');
-    expect(dashboard.panels[1].scopedVars['apps'].value).toBe('se1');
-    expect(dashboard.panels[3].scopedVars['apps'].value).toBe('se2');
-    expect(dashboard.panels[4].scopedVars['apps'].value).toBe('se2');
-    expect(dashboard.panels[8].scopedVars['hosts'].value).toBe('backend01');
-    expect(dashboard.panels[9].scopedVars['hosts'].value).toBe('backend01');
-    expect(dashboard.panels[11].scopedVars['hosts'].value).toBe('backend02');
-    expect(dashboard.panels[12].scopedVars['hosts'].value).toBe('backend02');
+    expect(dashboard.panels[0].scopedVars?.['apps']?.value).toBe('se1');
+    expect(dashboard.panels[1].scopedVars?.['apps']?.value).toBe('se1');
+    expect(dashboard.panels[3].scopedVars?.['apps']?.value).toBe('se2');
+    expect(dashboard.panels[4].scopedVars?.['apps']?.value).toBe('se2');
+    expect(dashboard.panels[8].scopedVars?.['hosts']?.value).toBe('backend01');
+    expect(dashboard.panels[9].scopedVars?.['hosts']?.value).toBe('backend01');
+    expect(dashboard.panels[11].scopedVars?.['hosts']?.value).toBe('backend02');
+    expect(dashboard.panels[12].scopedVars?.['hosts']?.value).toBe('backend02');
   });
 
   it('should assign unique ids for repeated panels', () => {
@@ -505,7 +505,7 @@ describe('given dashboard with row repeat', () => {
 
     const panelIds = flattenDeep(
       map(dashboard.panels, (panel) => {
-        let ids = [];
+        let ids: number[] = [];
         if (panel.panels && panel.panels.length) {
           ids = map(panel.panels, 'id');
         }
diff --git a/public/app/features/dashboard/state/DashboardModel.test.ts b/public/app/features/dashboard/state/DashboardModel.test.ts
index 45294c5df9eec..3f52eda79afb1 100644
--- a/public/app/features/dashboard/state/DashboardModel.test.ts
+++ b/public/app/features/dashboard/state/DashboardModel.test.ts
@@ -1,7 +1,7 @@
 import { keys as _keys } from 'lodash';
 
 import { dateTime, TimeRange, VariableHide } from '@grafana/data';
-import { Dashboard, defaultVariableModel } from '@grafana/schema';
+import { Dashboard, defaultVariableModel, RowPanel } from '@grafana/schema';
 
 import { getDashboardModel } from '../../../../test/helpers/getDashboardModel';
 import { variableAdapters } from '../../variables/adapters';
@@ -116,17 +116,11 @@ describe('DashboardModel', () => {
       expect(keys[1]).toBe('editable');
     });
 
-    it('should remove add panel panels', () => {
+    it('should have only 1 panel after adding panel to a new dashboard', () => {
       const model = createDashboardModelFixture();
-      model.addPanel({
-        type: 'add-panel',
-      });
       model.addPanel({
         type: 'graph',
       });
-      model.addPanel({
-        type: 'add-panel',
-      });
       const saveModel = model.getSaveModelClone();
       const panels = saveModel.panels;
 
@@ -189,6 +183,16 @@ describe('DashboardModel', () => {
       expect(dashboard.panels[1].repeat).toBe(undefined);
       expect(dashboard.panels[1].scopedVars).toBe(undefined);
     });
+
+    it('remove panel should call destroy', () => {
+      dashboard.addPanel({ type: 'test', title: 'test' });
+      const panel = dashboard.panels[0];
+      panel.destroy = jest.fn();
+
+      dashboard.removePanel(panel);
+
+      expect(panel.destroy).toHaveBeenCalled();
+    });
   });
 
   describe('Given editable false dashboard', () => {
@@ -538,6 +542,14 @@ describe('DashboardModel', () => {
     let dashboard: DashboardModel;
 
     beforeEach(() => {
+      const panels: RowPanel['panels'] = [
+        // this whole test is about dealing with out-of-spec (or at least ambigious) data...
+        // @ts-expect-error
+        { id: 3, type: 'graph', gridPos: { w: 12, h: 2 } },
+        // @ts-expect-error
+        { id: 4, type: 'graph', gridPos: { w: 12, h: 2 } },
+      ];
+
       dashboard = createDashboardModelFixture({
         panels: [
           { id: 1, type: 'graph', gridPos: { x: 0, y: 0, w: 24, h: 6 } },
@@ -546,13 +558,7 @@ describe('DashboardModel', () => {
             type: 'row',
             gridPos: { x: 0, y: 6, w: 24, h: 1 },
             collapsed: true,
-            panels: [
-              // this whole test is about dealing with out-of-spec (or at least ambigious) data...
-              //@ts-expect-error
-              { id: 3, type: 'graph', gridPos: { w: 12, h: 2 } },
-              //@ts-expect-error
-              { id: 4, type: 'graph', gridPos: { w: 12, h: 2 } },
-            ],
+            panels: panels,
           },
           { id: 5, type: 'row', collapsed: false, panels: [], gridPos: { x: 0, y: 7, w: 1, h: 1 } },
         ],
@@ -898,8 +904,11 @@ describe('DashboardModel', () => {
     beforeEach(() => {
       model = createDashboardModelFixture({
         panels: [
+          // @ts-expect-error
           { id: 1, type: 'graph', gridPos: { x: 0, y: 0, w: 24, h: 2 }, legend: { show: true } },
+          // @ts-expect-error
           { id: 3, type: 'graph', gridPos: { x: 0, y: 4, w: 12, h: 2 }, legend: { show: false } },
+          // @ts-expect-error
           { id: 4, type: 'graph', gridPos: { x: 12, y: 4, w: 12, h: 2 }, legend: { show: false } },
         ],
       });
diff --git a/public/app/features/dashboard/state/DashboardModel.ts b/public/app/features/dashboard/state/DashboardModel.ts
index a42b88837b1e6..a4b2600dc5f6f 100644
--- a/public/app/features/dashboard/state/DashboardModel.ts
+++ b/public/app/features/dashboard/state/DashboardModel.ts
@@ -18,12 +18,12 @@ import {
   UrlQueryValue,
 } from '@grafana/data';
 import { RefreshEvent, TimeRangeUpdatedEvent, config } from '@grafana/runtime';
-import { Dashboard } from '@grafana/schema';
+import { Dashboard, DashboardLink } from '@grafana/schema';
 import { DEFAULT_ANNOTATION_COLOR } from '@grafana/ui';
 import { GRID_CELL_HEIGHT, GRID_CELL_VMARGIN, GRID_COLUMN_COUNT, REPEAT_DIR_VERTICAL } from 'app/core/constants';
 import { contextSrv } from 'app/core/services/context_srv';
 import { sortedDeepCloneWithoutNulls } from 'app/core/utils/object';
-import { isAngularDatasourcePlugin } from 'app/features/plugins/angularDeprecation/utils';
+import { isAngularDatasourcePluginAndNotHidden } from 'app/features/plugins/angularDeprecation/utils';
 import { variableAdapters } from 'app/features/variables/adapters';
 import { onTimeRangeUpdated } from 'app/features/variables/state/actions';
 import { GetVariables, getVariablesByKey } from 'app/features/variables/state/selectors';
@@ -44,7 +44,7 @@ import { getTimeSrv } from '../services/TimeSrv';
 import { mergePanels, PanelMergeInfo } from '../utils/panelMerge';
 
 import { DashboardMigrator } from './DashboardMigrator';
-import { PanelModel, autoMigrateAngular } from './PanelModel';
+import { explicitlyControlledMigrationPanels, PanelModel } from './PanelModel';
 import { TimeModel } from './TimeModel';
 import { deleteScopeVars, isOnTheSameGridRow } from './utils';
 
@@ -56,20 +56,6 @@ export interface CloneOptions {
 
 export type DashboardLinkType = 'link' | 'dashboards';
 
-export interface DashboardLink {
-  icon: string;
-  title: string;
-  tooltip: string;
-  type: DashboardLinkType;
-  url: string;
-  asDropdown: boolean;
-  tags: any[];
-  searchHits?: any[];
-  targetBlank: boolean;
-  keepTime: boolean;
-  includeVars: boolean;
-}
-
 export class DashboardModel implements TimeModel {
   /** @deprecated use UID */
   id: any;
@@ -84,13 +70,13 @@ export class DashboardModel implements TimeModel {
   editable: any;
   graphTooltip: DashboardCursorSync;
   time: any;
-  liveNow: boolean;
+  liveNow?: boolean;
   private originalTime: any;
   timepicker: any;
   templating: { list: any[] };
   private originalTemplating: any;
   annotations: { list: AnnotationQuery[] };
-  refresh: string;
+  refresh?: string;
   snapshot: any;
   schemaVersion: number;
   version: number;
@@ -104,7 +90,7 @@ export class DashboardModel implements TimeModel {
   private panelsAffectedByVariableChange: number[] | null;
   private appEventsSubscription: Subscription;
   private lastRefresh: number;
-  private timeRangeUpdatedDuringEdit = false;
+  private timeRangeUpdatedDuringEditOrView = false;
   private originalDashboard: Dashboard | null = null;
 
   // ------------------
@@ -141,9 +127,6 @@ export class DashboardModel implements TimeModel {
     options?: {
       // By default this uses variables from redux state
       getVariablesFromState?: GetVariables;
-
-      // Force the loader to migrate panels
-      autoMigrateOldPanels?: boolean;
     }
   ) {
     this.getVariablesFromState = options?.getVariablesFromState ?? getVariablesByKey;
@@ -161,17 +144,17 @@ export class DashboardModel implements TimeModel {
     this.graphTooltip = data.graphTooltip || 0;
     this.time = data.time ?? { from: 'now-6h', to: 'now' };
     this.timepicker = data.timepicker ?? {};
-    this.liveNow = Boolean(data.liveNow);
+    this.liveNow = data.liveNow;
     this.templating = this.ensureListExist(data.templating);
     this.annotations = this.ensureListExist(data.annotations);
-    this.refresh = data.refresh || '';
+    this.refresh = data.refresh;
     this.snapshot = data.snapshot;
     this.schemaVersion = data.schemaVersion ?? 0;
     this.fiscalYearStartMonth = data.fiscalYearStartMonth ?? 0;
     this.version = data.version ?? 0;
     this.links = data.links ?? [];
     this.gnetId = data.gnetId || null;
-    this.panels = map(data.panels ?? [], (panelData: any) => new PanelModel(panelData));
+    this.panels = map(data.panels ?? [], (panelData) => new PanelModel(panelData));
     // Deep clone original dashboard to avoid mutations by object reference
     this.originalDashboard = cloneDeep(data);
     this.originalTemplating = cloneDeep(this.templating);
@@ -183,17 +166,6 @@ export class DashboardModel implements TimeModel {
     this.initMeta(meta);
     this.updateSchema(data);
 
-    // Auto-migrate old angular panels
-    if (options?.autoMigrateOldPanels || !config.angularSupportEnabled || config.featureToggles.autoMigrateOldPanels) {
-      for (const p of this.panelIterator()) {
-        const newType = autoMigrateAngular[p.type];
-        if (!p.autoMigrateFrom && newType) {
-          p.autoMigrateFrom = p.type;
-          p.type = newType;
-        }
-      }
-    }
-
     this.addBuiltInAnnotationQuery();
     this.sortPanelsByGridPos();
     this.panelsAffectedByVariableChange = null;
@@ -316,12 +288,8 @@ export class DashboardModel implements TimeModel {
   }
 
   private getPanelSaveModels() {
-    // Todo: Remove panel.type === 'add-panel' when we remove the emptyDashboardPage toggle
     return this.panels
-      .filter(
-        (panel) =>
-          this.isSnapshotTruthy() || !(panel.type === 'add-panel' || panel.repeatPanelId || panel.repeatedByRow)
-      )
+      .filter((panel) => this.isSnapshotTruthy() || !(panel.repeatPanelId || panel.repeatedByRow))
       .map((panel) => {
         // Clean libarary panels on save
         if (panel.libraryPanel) {
@@ -345,7 +313,7 @@ export class DashboardModel implements TimeModel {
 
         return panel.getSaveModel();
       })
-      .map((model: any) => {
+      .map((model) => {
         if (this.isSnapshotTruthy()) {
           return model;
         }
@@ -402,8 +370,8 @@ export class DashboardModel implements TimeModel {
     this.events.publish(new TimeRangeUpdatedEvent(timeRange));
     dispatch(onTimeRangeUpdated(this.uid, timeRange));
 
-    if (this.panelInEdit) {
-      this.timeRangeUpdatedDuringEdit = true;
+    if (this.panelInEdit || this.panelInView) {
+      this.timeRangeUpdatedDuringEditOrView = true;
     }
   }
 
@@ -416,11 +384,22 @@ export class DashboardModel implements TimeModel {
       return;
     }
 
-    for (const panel of this.panels) {
-      if (!this.otherPanelInFullscreen(panel) && (event.refreshAll || event.panelIds.includes(panel.id))) {
-        panel.refresh();
+    const panelsToRefresh = this.panels.filter(
+      (panel) => !this.otherPanelInFullscreen(panel) && (event.refreshAll || event.panelIds.includes(panel.id))
+    );
+
+    // We have to mark every panel as refreshWhenInView /before/ we actually refresh any
+    // in case there is a shared query, as otherwise that might refresh before the source panel is
+    // marked for refresh, preventing the panel from updating
+    if (!this.isSnapshot()) {
+      for (const panel of panelsToRefresh) {
+        panel.refreshWhenInView = true;
       }
     }
+
+    for (const panel of panelsToRefresh) {
+      panel.refresh();
+    }
   }
 
   render() {
@@ -445,7 +424,7 @@ export class DashboardModel implements TimeModel {
   initEditPanel(sourcePanel: PanelModel): PanelModel {
     getTimeSrv().stopAutoRefresh();
     this.panelInEdit = sourcePanel.getEditClone();
-    this.timeRangeUpdatedDuringEdit = false;
+    this.timeRangeUpdatedDuringEditOrView = false;
     return this.panelInEdit;
   }
 
@@ -455,34 +434,30 @@ export class DashboardModel implements TimeModel {
 
     getTimeSrv().resumeAutoRefresh();
 
-    if (this.panelsAffectedByVariableChange || this.timeRangeUpdatedDuringEdit) {
-      this.startRefresh({
-        panelIds: this.panelsAffectedByVariableChange ?? [],
-        refreshAll: this.timeRangeUpdatedDuringEdit,
-      });
-      this.panelsAffectedByVariableChange = null;
-      this.timeRangeUpdatedDuringEdit = false;
-    }
+    this.refreshIfPanelsAffectedByVariableChangeOrTimeRangeChanged();
   }
 
   initViewPanel(panel: PanelModel) {
     this.panelInView = panel;
+    this.timeRangeUpdatedDuringEditOrView = false;
     panel.setIsViewing(true);
   }
 
   exitViewPanel(panel: PanelModel) {
     this.panelInView = undefined;
     panel.setIsViewing(false);
-    this.refreshIfPanelsAffectedByVariableChange();
+    this.refreshIfPanelsAffectedByVariableChangeOrTimeRangeChanged();
   }
 
-  private refreshIfPanelsAffectedByVariableChange() {
-    if (!this.panelsAffectedByVariableChange) {
-      return;
+  private refreshIfPanelsAffectedByVariableChangeOrTimeRangeChanged() {
+    if (this.panelsAffectedByVariableChange || this.timeRangeUpdatedDuringEditOrView) {
+      this.startRefresh({
+        panelIds: this.panelsAffectedByVariableChange ?? [],
+        refreshAll: this.timeRangeUpdatedDuringEditOrView,
+      });
+      this.panelsAffectedByVariableChange = null;
+      this.timeRangeUpdatedDuringEditOrView = false;
     }
-
-    this.startRefresh({ panelIds: this.panelsAffectedByVariableChange, refreshAll: false });
-    this.panelsAffectedByVariableChange = null;
   }
 
   private ensurePanelsHaveUniqueIds() {
@@ -530,12 +505,22 @@ export class DashboardModel implements TimeModel {
     }
   }
 
-  getPanelById(id: number): PanelModel | null {
+  getPanelById(id: number, includeCollapsed = false): PanelModel | null {
     if (this.panelInEdit && this.panelInEdit.id === id) {
       return this.panelInEdit;
     }
 
-    return this.panels.find((p) => p.id === id) ?? null;
+    if (includeCollapsed) {
+      for (const panel of this.panelIterator()) {
+        if (panel.id === id) {
+          return panel;
+        }
+      }
+
+      return null;
+    } else {
+      return this.panels.find((p) => p.id === id) ?? null;
+    }
   }
 
   canEditPanel(panel?: PanelModel | null): boolean | undefined | null {
@@ -878,6 +863,7 @@ export class DashboardModel implements TimeModel {
 
   removePanel(panel: PanelModel) {
     this.panels = this.panels.filter((item) => item !== panel);
+    panel.destroy();
     this.events.publish(new DashboardPanelsChangedEvent());
   }
 
@@ -1195,6 +1181,10 @@ export class DashboardModel implements TimeModel {
     } else {
       canEdit = !!this.meta.annotationsPermissions?.dashboard.canEdit;
     }
+
+    if (config.featureToggles.annotationPermissionUpdate) {
+      return canEdit;
+    }
     return this.canEditDashboard() && canEdit;
   }
 
@@ -1207,18 +1197,26 @@ export class DashboardModel implements TimeModel {
     } else {
       canDelete = !!this.meta.annotationsPermissions?.dashboard.canDelete;
     }
+
+    if (config.featureToggles.annotationPermissionUpdate) {
+      return canDelete;
+    }
     return canDelete && this.canEditDashboard();
   }
 
   canAddAnnotations() {
     // When the builtin annotations are disabled, we should not add any in the UI
     const found = this.annotations.list.find((item) => item.builtIn === 1);
-    if (found?.enable === false || !this.canEditDashboard()) {
+    if (found?.enable === false) {
       return false;
     }
 
     // If RBAC is enabled there are additional conditions to check.
-    return Boolean(this.meta.annotationsPermissions?.dashboard.canAdd);
+    if (config.featureToggles.annotationPermissionUpdate) {
+      return Boolean(this.meta.annotationsPermissions?.dashboard.canAdd);
+    }
+
+    return Boolean(this.meta.annotationsPermissions?.dashboard.canAdd) && this.canEditDashboard();
   }
 
   canEditDashboard() {
@@ -1293,10 +1291,19 @@ export class DashboardModel implements TimeModel {
   }
 
   hasAngularPlugins(): boolean {
-    return this.panels.some(
-      (panel) =>
-        panel.isAngularPlugin() || (panel.datasource?.uid ? isAngularDatasourcePlugin(panel.datasource?.uid) : false)
-    );
+    return this.panels.some((panel) => {
+      // Return false for plugins that are angular but have angular.hideDeprecation = false
+      // We cannot use panel.plugin.isAngularPlugin() because panel.plugin may not be initialized at this stage.
+      // We also have to check for old core angular plugins (explicitlyControlledMigrationPanels).
+      const isAngularPanel =
+        (config.panels[panel.type]?.angular?.detected || explicitlyControlledMigrationPanels.includes(panel.type)) &&
+        !config.panels[panel.type]?.angular?.hideDeprecation;
+      let isAngularDs = false;
+      if (panel.datasource?.uid) {
+        isAngularDs = isAngularDatasourcePluginAndNotHidden(panel.datasource?.uid);
+      }
+      return isAngularPanel || isAngularDs;
+    });
   }
 }
 
diff --git a/public/app/features/dashboard/state/PanelModel.test.ts b/public/app/features/dashboard/state/PanelModel.test.ts
index 1848b0f43bfbf..a8a7aaae420b5 100644
--- a/public/app/features/dashboard/state/PanelModel.test.ts
+++ b/public/app/features/dashboard/state/PanelModel.test.ts
@@ -9,6 +9,7 @@ import {
   dateTime,
   TimeRange,
   PanelMigrationHandler,
+  PanelTypeChangedHandler,
 } from '@grafana/data';
 import { getPanelPlugin } from '@grafana/data/test/__mocks__/pluginMocks';
 import { mockStandardFieldConfigOptions } from '@grafana/data/test/helpers/fieldConfig';
@@ -43,7 +44,7 @@ variableAdapters.setInit(() => [createQueryVariableAdapter()]);
 describe('PanelModel', () => {
   describe('when creating new panel model', () => {
     let model: any;
-    let modelJson: any;
+    let modelJson: Record<string, unknown>;
     let persistedOptionsMock;
 
     const tablePlugin = getPanelPlugin(
@@ -388,10 +389,12 @@ describe('PanelModel', () => {
     });
 
     describe('when changing to react panel from angular panel', () => {
-      let panelQueryRunner: any;
+      let panelQueryRunner: PanelQueryRunner;
 
       const onPanelTypeChanged = jest.fn();
-      const reactPlugin = getPanelPlugin({ id: 'react' }).setPanelChangeHandler(onPanelTypeChanged as any);
+      const reactPlugin = getPanelPlugin({ id: 'react' }).setPanelChangeHandler(
+        onPanelTypeChanged as PanelTypeChangedHandler
+      );
 
       beforeEach(() => {
         model.changePlugin(reactPlugin);
@@ -412,13 +415,13 @@ describe('PanelModel', () => {
     });
 
     describe('when autoMigrateFrom angular to react', () => {
-      const onPanelTypeChanged = (panel: PanelModel, prevPluginId: string, prevOptions: Record<string, any>) => {
+      const onPanelTypeChanged: PanelTypeChangedHandler = (panel, prevPluginId, prevOptions) => {
         panel.fieldConfig = { defaults: { unit: 'bytes' }, overrides: [] };
         return { name: prevOptions.angular.oldName };
       };
 
       const reactPlugin = getPanelPlugin({ id: 'timeseries' })
-        .setPanelChangeHandler(onPanelTypeChanged as any)
+        .setPanelChangeHandler(onPanelTypeChanged)
         .useFieldConfig({
           disableStandardOptions: [FieldConfigProperty.Thresholds],
         })
@@ -450,10 +453,12 @@ describe('PanelModel', () => {
     });
 
     describe('variables interpolation', () => {
-      let panelQueryRunner: any;
+      let panelQueryRunner: PanelQueryRunner;
 
       const onPanelTypeChanged = jest.fn();
-      const reactPlugin = getPanelPlugin({ id: 'react' }).setPanelChangeHandler(onPanelTypeChanged as any);
+      const reactPlugin = getPanelPlugin({ id: 'react' }).setPanelChangeHandler(
+        onPanelTypeChanged as PanelTypeChangedHandler
+      );
 
       beforeEach(() => {
         model.changePlugin(reactPlugin);
@@ -590,15 +595,6 @@ describe('PanelModel', () => {
 
         expect(model.getQueryRunner).toBeCalled();
       });
-      it('when called then it should not call all pending queries if the panel is a row', () => {
-        model.getQueryRunner = jest.fn().mockReturnValue({
-          run: jest.fn(),
-        });
-        model.type = 'row';
-        model.runAllPanelQueries({});
-
-        expect(model.getQueryRunner).not.toBeCalled();
-      });
     });
   });
 });
diff --git a/public/app/features/dashboard/state/PanelModel.ts b/public/app/features/dashboard/state/PanelModel.ts
index d053d2c756d21..97d58089a1593 100644
--- a/public/app/features/dashboard/state/PanelModel.ts
+++ b/public/app/features/dashboard/state/PanelModel.ts
@@ -36,6 +36,8 @@ import {
 import { PanelQueryRunner } from '../../query/state/PanelQueryRunner';
 import { TimeOverrideResult } from '../utils/panel';
 
+import { getPanelPluginToMigrateTo } from './getPanelPluginToMigrateTo';
+
 export interface GridPos {
   x: number;
   y: number;
@@ -67,6 +69,7 @@ const notPersistedProperties: { [str: string]: boolean } = {
   dataSupport: true,
   key: true,
   isNew: true,
+  refreshWhenInView: true,
 };
 
 // For angular panels we need to clean up properties when changing type
@@ -95,6 +98,7 @@ const mustKeepProps: { [str: string]: boolean } = {
   links: true,
   fullscreen: true,
   isEditing: true,
+  isViewing: true,
   hasRefreshed: true,
   events: true,
   cacheTimeout: true,
@@ -120,6 +124,8 @@ const defaults: any = {
   cachedPluginOptions: {},
   transparent: false,
   options: {},
+  links: [],
+  transformations: [],
   fieldConfig: {
     defaults: {},
     overrides: [],
@@ -127,6 +133,15 @@ const defaults: any = {
   title: '',
 };
 
+export const explicitlyControlledMigrationPanels = [
+  'graph',
+  'table-old',
+  'grafana-piechart-panel',
+  'grafana-worldmap-panel',
+  'singlestat',
+  'grafana-singlestat-panel',
+];
+
 export const autoMigrateAngular: Record<string, string> = {
   graph: 'timeseries',
   'table-old': 'table',
@@ -136,7 +151,7 @@ export const autoMigrateAngular: Record<string, string> = {
   'grafana-worldmap-panel': 'geomap',
 };
 
-const autoMigratePanelType: Record<string, string> = {
+export const autoMigrateRemovedPanelPlugins: Record<string, string> = {
   'heatmap-new': 'heatmap', // this was a temporary development panel that is now standard
 };
 
@@ -191,6 +206,7 @@ export class PanelModel implements DataConfigSource, IPanelModel {
   cacheTimeout?: string | null;
   queryCachingTTL?: number | null;
   isNew?: boolean;
+  refreshWhenInView = true;
 
   cachedPluginOptions: Record<string, PanelOptionsCache> = {};
   legend?: { show: boolean; sort?: string; sortDesc?: boolean };
@@ -244,7 +260,7 @@ export class PanelModel implements DataConfigSource, IPanelModel {
       (this as any)[property] = model[property];
     }
 
-    const newType = autoMigratePanelType[this.type];
+    const newType = getPanelPluginToMigrateTo(this);
     if (newType) {
       this.autoMigrateFrom = this.type;
       this.type = newType;
@@ -360,13 +376,11 @@ export class PanelModel implements DataConfigSource, IPanelModel {
   }
 
   runAllPanelQueries({ dashboardUID, dashboardTimezone, timeData, width }: RunPanelQueryOptions) {
-    if (this.type === 'row') {
-      return;
-    }
     this.getQueryRunner().run({
       datasource: this.datasource,
       queries: this.targets,
       panelId: this.id,
+      panelPluginId: this.type,
       dashboardUID: dashboardUID,
       timezone: dashboardTimezone,
       timeRange: timeData.timeRange,
@@ -617,7 +631,9 @@ export class PanelModel implements DataConfigSource, IPanelModel {
   }
 
   isAngularPlugin(): boolean {
-    return (this.plugin && this.plugin.angularPanelCtrl) !== undefined || (this.plugin?.meta?.angularDetected ?? false);
+    return (
+      (this.plugin && this.plugin.angularPanelCtrl) !== undefined || (this.plugin?.meta?.angular?.detected ?? false)
+    );
   }
 
   destroy() {
@@ -693,7 +709,7 @@ export class PanelModel implements DataConfigSource, IPanelModel {
   }
 }
 
-function getPluginVersion(plugin: PanelPlugin): string {
+export function getPluginVersion(plugin: PanelPlugin): string {
   return plugin && plugin.meta.info.version ? plugin.meta.info.version : config.buildInfo.version;
 }
 
diff --git a/public/app/features/dashboard/state/TimeModel.ts b/public/app/features/dashboard/state/TimeModel.ts
index 539f4299886fe..870e150d174cf 100644
--- a/public/app/features/dashboard/state/TimeModel.ts
+++ b/public/app/features/dashboard/state/TimeModel.ts
@@ -3,7 +3,7 @@ import { TimeRange, TimeZone } from '@grafana/data';
 export interface TimeModel {
   time: any;
   fiscalYearStartMonth?: number;
-  refresh?: string | false;
+  refresh?: string;
   timepicker: any;
   getTimezone(): TimeZone;
   timeRangeUpdated(timeRange: TimeRange): void;
diff --git a/public/app/features/dashboard/state/__fixtures__/dashboardFixtures.ts b/public/app/features/dashboard/state/__fixtures__/dashboardFixtures.ts
index d1c6f323c5afa..8dec4d283394e 100644
--- a/public/app/features/dashboard/state/__fixtures__/dashboardFixtures.ts
+++ b/public/app/features/dashboard/state/__fixtures__/dashboardFixtures.ts
@@ -3,7 +3,6 @@ import {
   Dashboard,
   defaultDashboardCursorSync,
   defaultVariableModel,
-  GraphPanel,
   Panel,
   RowPanel,
   VariableModel,
@@ -22,6 +21,7 @@ export function createDashboardModelFixture(
     editable: true,
     graphTooltip: defaultDashboardCursorSync,
     schemaVersion: 1,
+    version: 1,
     timezone: '',
     ...dashboardInput,
   };
@@ -29,7 +29,7 @@ export function createDashboardModelFixture(
   return new DashboardModel(dashboardJson, meta, { getVariablesFromState });
 }
 
-export function createPanelSaveModel(panelInput: Partial<Panel | GraphPanel | RowPanel> = {}): Panel {
+export function createPanelSaveModel(panelInput: Partial<Panel | RowPanel> = {}): Panel {
   return {
     type: 'timeseries',
     ...panelInput,
diff --git a/public/app/features/dashboard/state/actions.ts b/public/app/features/dashboard/state/actions.ts
index 7d449b7616f58..184d9251d4531 100644
--- a/public/app/features/dashboard/state/actions.ts
+++ b/public/app/features/dashboard/state/actions.ts
@@ -5,100 +5,14 @@ import { createSuccessNotification } from 'app/core/copy/appNotification';
 import { dashboardWatcher } from 'app/features/live/dashboard/dashboardWatcher';
 import { removeAllPanels } from 'app/features/panel/state/reducers';
 import { updateTimeZoneForSession, updateWeekStartForSession } from 'app/features/profile/state/reducers';
-import { DashboardAcl, DashboardAclUpdateDTO, NewDashboardAclItem, PermissionLevel, ThunkResult } from 'app/types';
+import { ThunkResult } from 'app/types';
 
 import { loadPluginDashboards } from '../../plugins/admin/state/actions';
 import { cancelVariables } from '../../variables/state/actions';
 import { getDashboardSrv } from '../services/DashboardSrv';
 import { getTimeSrv } from '../services/TimeSrv';
 
-import { cleanUpDashboard, loadDashboardPermissions } from './reducers';
-
-export function getDashboardPermissions(id: number): ThunkResult<void> {
-  return async (dispatch) => {
-    const permissions = await getBackendSrv().get(`/api/dashboards/id/${id}/permissions`);
-    dispatch(loadDashboardPermissions(permissions));
-  };
-}
-
-function toUpdateItem(item: DashboardAcl): DashboardAclUpdateDTO {
-  return {
-    userId: item.userId,
-    teamId: item.teamId,
-    role: item.role,
-    permission: item.permission,
-  };
-}
-
-export function updateDashboardPermission(
-  dashboardId: number,
-  itemToUpdate: DashboardAcl,
-  level: PermissionLevel
-): ThunkResult<void> {
-  return async (dispatch, getStore) => {
-    const { dashboard } = getStore();
-    const itemsToUpdate = [];
-
-    for (const item of dashboard.permissions) {
-      if (item.inherited) {
-        continue;
-      }
-
-      const updated = toUpdateItem(item);
-
-      // if this is the item we want to update, update its permission
-      if (itemToUpdate === item) {
-        updated.permission = level;
-      }
-
-      itemsToUpdate.push(updated);
-    }
-
-    await getBackendSrv().post(`/api/dashboards/id/${dashboardId}/permissions`, { items: itemsToUpdate });
-    await dispatch(getDashboardPermissions(dashboardId));
-  };
-}
-
-export function removeDashboardPermission(dashboardId: number, itemToDelete: DashboardAcl): ThunkResult<void> {
-  return async (dispatch, getStore) => {
-    const dashboard = getStore().dashboard;
-    const itemsToUpdate = [];
-
-    for (const item of dashboard.permissions) {
-      if (item.inherited || item === itemToDelete) {
-        continue;
-      }
-      itemsToUpdate.push(toUpdateItem(item));
-    }
-
-    await getBackendSrv().post(`/api/dashboards/id/${dashboardId}/permissions`, { items: itemsToUpdate });
-    await dispatch(getDashboardPermissions(dashboardId));
-  };
-}
-
-export function addDashboardPermission(dashboardId: number, newItem: NewDashboardAclItem): ThunkResult<void> {
-  return async (dispatch, getStore) => {
-    const { dashboard } = getStore();
-    const itemsToUpdate = [];
-
-    for (const item of dashboard.permissions) {
-      if (item.inherited) {
-        continue;
-      }
-      itemsToUpdate.push(toUpdateItem(item));
-    }
-
-    itemsToUpdate.push({
-      userId: newItem.userId,
-      teamId: newItem.teamId,
-      role: newItem.role,
-      permission: newItem.permission,
-    });
-
-    await getBackendSrv().post(`/api/dashboards/id/${dashboardId}/permissions`, { items: itemsToUpdate });
-    await dispatch(getDashboardPermissions(dashboardId));
-  };
-}
+import { cleanUpDashboard } from './reducers';
 
 export function importDashboard(data: any, dashboardTitle: string): ThunkResult<void> {
   return async (dispatch) => {
diff --git a/public/app/features/dashboard/state/getPanelPluginToMigrateTo.ts b/public/app/features/dashboard/state/getPanelPluginToMigrateTo.ts
new file mode 100644
index 0000000000000..5eb7c201ee49a
--- /dev/null
+++ b/public/app/features/dashboard/state/getPanelPluginToMigrateTo.ts
@@ -0,0 +1,79 @@
+import config from 'app/core/config';
+
+import { autoMigrateRemovedPanelPlugins, autoMigrateAngular } from './PanelModel';
+
+export function getPanelPluginToMigrateTo(panel: any, forceMigration?: boolean): string | undefined {
+  if (autoMigrateRemovedPanelPlugins[panel.type]) {
+    return autoMigrateRemovedPanelPlugins[panel.type];
+  }
+
+  const isUrlFeatureFlagEnabled = (featureName: string) => {
+    const flag = '__feature.' + featureName;
+
+    const urlParams = new URLSearchParams(window.location.search);
+    const featureFlagValue = urlParams.get(flag);
+
+    return featureFlagValue === 'true' || featureFlagValue === '';
+  };
+
+  // Auto-migrate old angular panels
+  const shouldMigrateAllAngularPanels =
+    forceMigration ||
+    !config.angularSupportEnabled ||
+    config.featureToggles.autoMigrateOldPanels ||
+    isUrlFeatureFlagEnabled('autoMigrateOldPanels') ||
+    isUrlFeatureFlagEnabled('disableAngular');
+
+  // Graph needs special logic as it can be migrated to multiple panels
+  if (
+    panel.type === 'graph' &&
+    (shouldMigrateAllAngularPanels ||
+      config.featureToggles.autoMigrateGraphPanel ||
+      isUrlFeatureFlagEnabled('autoMigrateGraphPanel'))
+  ) {
+    if (panel.xaxis?.mode === 'series') {
+      return 'barchart';
+    }
+
+    if (panel.xaxis?.mode === 'histogram') {
+      return 'histogram';
+    }
+
+    return 'timeseries';
+  }
+
+  if (shouldMigrateAllAngularPanels) {
+    return autoMigrateAngular[panel.type];
+  }
+
+  if (
+    panel.type === 'table-old' &&
+    (config.featureToggles.autoMigrateTablePanel || isUrlFeatureFlagEnabled('autoMigrateTablePanel'))
+  ) {
+    return 'table';
+  }
+
+  if (
+    panel.type === 'grafana-piechart-panel' &&
+    (config.featureToggles.autoMigratePiechartPanel || isUrlFeatureFlagEnabled('autoMigratePiechartPanel'))
+  ) {
+    return 'piechart';
+  }
+
+  if (
+    panel.type === 'grafana-worldmap-panel' &&
+    (config.featureToggles.autoMigrateWorldmapPanel || isUrlFeatureFlagEnabled('autoMigrateWorldmapPanel'))
+  ) {
+    return 'geomap';
+  }
+
+  if (
+    ((panel.type === 'singlestat' || panel.type === 'grafana-singlestat-panel') &&
+      config.featureToggles.autoMigrateStatPanel) ||
+    isUrlFeatureFlagEnabled('autoMigrateStatPanel')
+  ) {
+    return 'stat';
+  }
+
+  return undefined;
+}
diff --git a/public/app/features/dashboard/state/initDashboard.test.ts b/public/app/features/dashboard/state/initDashboard.test.ts
index 381562b4c2ab2..8b54addac7bef 100644
--- a/public/app/features/dashboard/state/initDashboard.test.ts
+++ b/public/app/features/dashboard/state/initDashboard.test.ts
@@ -1,8 +1,8 @@
-import configureMockStore from 'redux-mock-store';
+import configureMockStore, { MockStore } from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import { Subject } from 'rxjs';
 
-import { FetchError, locationService, setEchoSrv } from '@grafana/runtime';
+import { BackendSrv, FetchError, locationService, setEchoSrv } from '@grafana/runtime';
 import appEvents from 'app/core/app_events';
 import { getBackendSrv } from 'app/core/services/backend_srv';
 import { KeybindingSrv } from 'app/core/services/keybindingSrv';
@@ -21,8 +21,8 @@ import { getPreloadedState } from '../../variables/state/helpers';
 import { initialTransactionState, variablesInitTransaction } from '../../variables/state/transactionReducer';
 import { TransactionStatus } from '../../variables/types';
 import { DashboardLoaderSrv, setDashboardLoaderSrv } from '../services/DashboardLoaderSrv';
-import { getDashboardSrv, setDashboardSrv } from '../services/DashboardSrv';
-import { getTimeSrv, setTimeSrv } from '../services/TimeSrv';
+import { DashboardSrv, getDashboardSrv, setDashboardSrv } from '../services/DashboardSrv';
+import { getTimeSrv, setTimeSrv, TimeSrv } from '../services/TimeSrv';
 
 import { initDashboard, InitDashboardArgs } from './initDashboard';
 import { dashboardInitCompleted, dashboardInitFetching, dashboardInitServices } from './reducers';
@@ -68,10 +68,10 @@ const mockStore = configureMockStore([thunk]);
 
 interface ScenarioContext {
   args: InitDashboardArgs;
-  loaderSrv: any;
-  backendSrv: any;
+  loaderSrv: DashboardLoaderSrv;
+  backendSrv: jest.Mocked<BackendSrv>;
   setup: (fn: () => void) => void;
-  actions: any[];
+  actions: ReturnType<MockStore['getActions']>;
   storeState: any;
 }
 
@@ -91,7 +91,7 @@ function describeInitScenario(description: string, scenarioFn: ScenarioFn) {
           title: 'My cool dashboard',
           panels: [
             {
-              type: 'add-panel',
+              type: 'stat',
               gridPos: { x: 0, y: 0, w: 12, h: 9 },
               title: 'Panel Title',
               id: 2,
@@ -175,14 +175,14 @@ function describeInitScenario(description: string, scenarioFn: ScenarioFn) {
           uid: DASH_UID,
         },
       })),
-    };
+    } as unknown as DashboardLoaderSrv;
 
-    setDashboardLoaderSrv(loaderSrv as unknown as DashboardLoaderSrv);
+    setDashboardLoaderSrv(loaderSrv);
     setDashboardQueryRunnerFactory(() => ({
       getResult: emptyResult,
       run: jest.fn(),
       cancel: () => undefined,
-      cancellations: () => new Subject<any>(),
+      cancellations: () => new Subject(),
       destroy: () => undefined,
     }));
 
@@ -197,7 +197,7 @@ function describeInitScenario(description: string, scenarioFn: ScenarioFn) {
           setupDashboardBindings: jest.fn(),
         } as unknown as KeybindingSrv,
       },
-      backendSrv: getBackendSrv(),
+      backendSrv: getBackendSrv() as unknown as jest.Mocked<BackendSrv>,
       loaderSrv,
       actions: [],
       storeState: {
@@ -226,11 +226,11 @@ function describeInitScenario(description: string, scenarioFn: ScenarioFn) {
     beforeEach(async () => {
       setDashboardSrv({
         setCurrent: jest.fn(),
-      } as any);
+      } as unknown as DashboardSrv);
 
       setTimeSrv({
         init: jest.fn(),
-      } as any);
+      } as unknown as TimeSrv);
 
       setupFn();
       setEchoSrv(new Echo());
diff --git a/public/app/features/dashboard/state/initDashboard.ts b/public/app/features/dashboard/state/initDashboard.ts
index eae608bdaa2c8..2f91b3727c908 100644
--- a/public/app/features/dashboard/state/initDashboard.ts
+++ b/public/app/features/dashboard/state/initDashboard.ts
@@ -6,23 +6,20 @@ import { createErrorNotification } from 'app/core/copy/appNotification';
 import { backendSrv } from 'app/core/services/backend_srv';
 import { KeybindingSrv } from 'app/core/services/keybindingSrv';
 import store from 'app/core/store';
-import { newBrowseDashboardsEnabled } from 'app/features/browse-dashboards/featureFlag';
+import { startMeasure, stopMeasure } from 'app/core/utils/metrics';
 import { dashboardLoaderSrv } from 'app/features/dashboard/services/DashboardLoaderSrv';
 import { DashboardSrv, getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
 import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv';
+import {
+  HOME_DASHBOARD_CACHE_KEY,
+  getDashboardScenePageStateManager,
+} from 'app/features/dashboard-scene/pages/DashboardScenePageStateManager';
+import { buildNewDashboardSaveModel } from 'app/features/dashboard-scene/serialization/buildNewDashboardSaveModel';
 import { getFolderByUid } from 'app/features/folders/state/actions';
 import { dashboardWatcher } from 'app/features/live/dashboard/dashboardWatcher';
 import { playlistSrv } from 'app/features/playlist/PlaylistSrv';
 import { toStateKey } from 'app/features/variables/utils';
-import {
-  DashboardDTO,
-  DashboardInitPhase,
-  DashboardMeta,
-  DashboardRoutes,
-  StoreState,
-  ThunkDispatch,
-  ThunkResult,
-} from 'app/types';
+import { DashboardDTO, DashboardInitPhase, DashboardRoutes, StoreState, ThunkDispatch, ThunkResult } from 'app/types';
 
 import { createDashboardQueryRunner } from '../../query/state/DashboardQueryRunner/DashboardQueryRunner';
 import { initVariablesTransaction } from '../../variables/state/actions';
@@ -34,6 +31,8 @@ import { PanelModel } from './PanelModel';
 import { emitDashboardViewEvent } from './analyticsProcessor';
 import { dashboardInitCompleted, dashboardInitFailed, dashboardInitFetching, dashboardInitServices } from './reducers';
 
+const INIT_DASHBOARD_MEASUREMENT = 'initDashboard';
+
 export interface InitDashboardArgs {
   urlUid?: string;
   urlSlug?: string;
@@ -44,7 +43,6 @@ export interface InitDashboardArgs {
   routeName?: string;
   fixUrl: boolean;
   keybindingSrv: KeybindingSrv;
-  dashboardDto?: DashboardDTO;
 }
 
 async function fetchDashboard(
@@ -62,6 +60,13 @@ async function fetchDashboard(
   try {
     switch (args.routeName) {
       case DashboardRoutes.Home: {
+        const stateManager = getDashboardScenePageStateManager();
+        const cachedDashboard = stateManager.getFromCache(HOME_DASHBOARD_CACHE_KEY);
+
+        if (cachedDashboard) {
+          return cachedDashboard;
+        }
+
         // load home dash
         const dashDTO: DashboardDTO = await backendSrv.get('/api/dashboards/home');
 
@@ -81,18 +86,13 @@ async function fetchDashboard(
       case DashboardRoutes.Public: {
         return await dashboardLoaderSrv.loadDashboard('public', args.urlSlug, args.accessToken);
       }
-      case DashboardRoutes.Embedded: {
-        if (args.dashboardDto) {
-          return args.dashboardDto;
-        }
-      }
       case DashboardRoutes.Normal: {
         const dashDTO: DashboardDTO = await dashboardLoaderSrv.loadDashboard(args.urlType, args.urlSlug, args.urlUid);
 
         // only the folder API has information about ancestors
         // get parent folder (if it exists) and put it in the store
         // this will be used to populate the full breadcrumb trail
-        if (newBrowseDashboardsEnabled() && dashDTO.meta.folderUid) {
+        if (dashDTO.meta.folderUid) {
           try {
             await dispatch(getFolderByUid(dashDTO.meta.folderUid));
           } catch (err) {
@@ -100,7 +100,7 @@ async function fetchDashboard(
           }
         }
 
-        if (args.fixUrl && dashDTO.meta.url && !playlistSrv.isPlaying) {
+        if (args.fixUrl && dashDTO.meta.url && !playlistSrv.state.isPlaying) {
           // check if the current url is correct (might be old slug)
           const dashboardUrl = locationUtil.stripBaseFromUrl(dashDTO.meta.url);
           const currentPath = locationService.getLocation().pathname;
@@ -120,10 +120,10 @@ async function fetchDashboard(
         // only the folder API has information about ancestors
         // get parent folder (if it exists) and put it in the store
         // this will be used to populate the full breadcrumb trail
-        if (newBrowseDashboardsEnabled() && args.urlFolderUid) {
+        if (args.urlFolderUid) {
           await dispatch(getFolderByUid(args.urlFolderUid));
         }
-        return getNewDashboardModelData(args.urlFolderUid, args.panelType);
+        return buildNewDashboardSaveModel(args.urlFolderUid);
       }
       case DashboardRoutes.Path: {
         const path = args.urlSlug ?? '';
@@ -177,6 +177,8 @@ const getQueriesByDatasource = (
  */
 export function initDashboard(args: InitDashboardArgs): ThunkResult<void> {
   return async (dispatch, getState) => {
+    startMeasure(INIT_DASHBOARD_MEASUREMENT);
+
     // set fetching state
     dispatch(dashboardInitFetching());
 
@@ -250,7 +252,9 @@ export function initDashboard(args: InitDashboardArgs): ThunkResult<void> {
         dashboard.autoFitPanels(window.innerHeight, queryParams.kiosk);
       }
 
-      args.keybindingSrv.setupDashboardBindings(dashboard);
+      if (!config.publicDashboardAccessToken) {
+        args.keybindingSrv.setupDashboardBindings(dashboard);
+      }
     } catch (err) {
       if (err instanceof Error) {
         dispatch(notifyApp(createErrorNotification('Dashboard init failed', err)));
@@ -286,49 +290,15 @@ export function initDashboard(args: InitDashboardArgs): ThunkResult<void> {
       })
     );
 
-    trackDashboardLoaded(dashboard, versionBeforeMigration);
+    const measure = stopMeasure(INIT_DASHBOARD_MEASUREMENT);
+    trackDashboardLoaded(dashboard, measure?.duration, versionBeforeMigration);
 
     // yay we are done
     dispatch(dashboardInitCompleted(dashboard));
   };
 }
 
-export function getNewDashboardModelData(
-  urlFolderUid?: string,
-  panelType?: string
-): { dashboard: any; meta: DashboardMeta } {
-  const panels = config.featureToggles.emptyDashboardPage
-    ? []
-    : [
-        {
-          type: panelType ?? 'add-panel',
-          gridPos: { x: 0, y: 0, w: 12, h: 9 },
-          title: 'Panel Title',
-        },
-      ];
-
-  const data = {
-    meta: {
-      canStar: false,
-      canShare: false,
-      canDelete: false,
-      isNew: true,
-      folderUid: '',
-    },
-    dashboard: {
-      title: 'New dashboard',
-      panels,
-    },
-  };
-
-  if (urlFolderUid) {
-    data.meta.folderUid = urlFolderUid;
-  }
-
-  return data;
-}
-
-const DASHBOARD_FROM_LS_KEY = 'DASHBOARD_FROM_LS_KEY';
+export const DASHBOARD_FROM_LS_KEY = 'DASHBOARD_FROM_LS_KEY';
 
 export function setDashboardToFetchFromLocalStorage(model: DashboardDTO) {
   store.setObject(DASHBOARD_FROM_LS_KEY, model);
diff --git a/public/app/features/dashboard/state/reducers.test.ts b/public/app/features/dashboard/state/reducers.test.ts
index f2bd07126c54c..0cb8ee5cd3208 100644
--- a/public/app/features/dashboard/state/reducers.test.ts
+++ b/public/app/features/dashboard/state/reducers.test.ts
@@ -1,32 +1,15 @@
-import { DashboardInitPhase, DashboardState, OrgRole, PermissionLevel } from 'app/types';
+import { DashboardInitPhase, DashboardState } from 'app/types';
 
 import { createDashboardModelFixture, createPanelSaveModel } from './__fixtures__/dashboardFixtures';
 import {
   dashboardInitCompleted,
   dashboardInitFailed,
   dashboardInitFetching,
-  loadDashboardPermissions,
   dashboardReducer,
   initialState,
 } from './reducers';
 
 describe('dashboard reducer', () => {
-  describe('loadDashboardPermissions', () => {
-    let state: DashboardState;
-
-    beforeEach(() => {
-      const action = loadDashboardPermissions([
-        { id: 2, dashboardId: 1, role: OrgRole.Viewer, permission: PermissionLevel.View },
-        { id: 3, dashboardId: 1, role: OrgRole.Editor, permission: PermissionLevel.Edit },
-      ]);
-      state = dashboardReducer(initialState, action);
-    });
-
-    it('should add permissions to state', async () => {
-      expect(state.permissions?.length).toBe(2);
-    });
-  });
-
   describe('dashboardInitCompleted', () => {
     let state: DashboardState;
 
diff --git a/public/app/features/dashboard/state/reducers.ts b/public/app/features/dashboard/state/reducers.ts
index 71356ec6c2403..3e7265eeb5745 100644
--- a/public/app/features/dashboard/state/reducers.ts
+++ b/public/app/features/dashboard/state/reducers.ts
@@ -3,8 +3,7 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { PanelPlugin } from '@grafana/data';
 import { AngularComponent } from '@grafana/runtime';
 import { defaultDashboard } from '@grafana/schema';
-import { processAclItems } from 'app/core/utils/acl';
-import { DashboardAclDTO, DashboardInitError, DashboardInitPhase, DashboardState } from 'app/types';
+import { DashboardInitError, DashboardInitPhase, DashboardState } from 'app/types';
 
 import { DashboardModel } from './DashboardModel';
 import { PanelModel } from './PanelModel';
@@ -12,7 +11,6 @@ import { PanelModel } from './PanelModel';
 export const initialState: DashboardState = {
   initPhase: DashboardInitPhase.NotStarted,
   getModel: () => null,
-  permissions: [],
   initError: null,
   initialDatasource: undefined,
 };
@@ -21,9 +19,6 @@ const dashboardSlice = createSlice({
   name: 'dashboard',
   initialState,
   reducers: {
-    loadDashboardPermissions: (state, action: PayloadAction<DashboardAclDTO[]>) => {
-      state.permissions = processAclItems(action.payload);
-    },
     dashboardInitFetching: (state) => {
       state.initPhase = DashboardInitPhase.Fetching;
     },
@@ -70,11 +65,10 @@ export interface SetPanelAngularComponentPayload {
 
 export interface SetPanelInstanceStatePayload {
   panelId: number;
-  value: any;
+  value: unknown;
 }
 
 export const {
-  loadDashboardPermissions,
   dashboardInitFetching,
   dashboardInitFailed,
   dashboardInitCompleted,
diff --git a/public/app/features/dashboard/utils/dashboard.test.ts b/public/app/features/dashboard/utils/dashboard.test.ts
index ec9c3733038d6..c6b0299d2c394 100644
--- a/public/app/features/dashboard/utils/dashboard.test.ts
+++ b/public/app/features/dashboard/utils/dashboard.test.ts
@@ -8,8 +8,9 @@ import {
 // Mock the store module
 jest.mock('app/core/store', () => ({
   exists: jest.fn(),
-  getObject: jest.fn(),
+  getObject: jest.fn((_a, b) => b),
   setObject: jest.fn(),
+  get: jest.fn(),
 }));
 
 const store = jest.requireMock('app/core/store');
diff --git a/public/app/features/dashboard/utils/getPanelChromeProps.tsx b/public/app/features/dashboard/utils/getPanelChromeProps.tsx
index 9f7c45278047a..926a307203cf4 100644
--- a/public/app/features/dashboard/utils/getPanelChromeProps.tsx
+++ b/public/app/features/dashboard/utils/getPanelChromeProps.tsx
@@ -1,11 +1,12 @@
 import React from 'react';
 
 import { LinkModel, PanelData, PanelPlugin, renderMarkdown } from '@grafana/data';
-import { config, getTemplateSrv, locationService, reportInteraction } from '@grafana/runtime';
+import { config, getTemplateSrv, locationService } from '@grafana/runtime';
 import { PanelPadding } from '@grafana/ui';
+import { DashboardInteractions } from 'app/features/dashboard-scene/utils/interactions';
 import { InspectTab } from 'app/features/inspector/types';
 import { getPanelLinksSupplier } from 'app/features/panel/panellinks/linkSuppliers';
-import { isAngularDatasourcePlugin } from 'app/features/plugins/angularDeprecation/utils';
+import { isAngularDatasourcePluginAndNotHidden } from 'app/features/plugins/angularDeprecation/utils';
 
 import { PanelHeaderTitleItems } from '../dashgrid/PanelHeader/PanelHeaderTitleItems';
 import { DashboardModel, PanelModel } from '../state';
@@ -25,8 +26,6 @@ interface CommonProps {
 }
 
 export function getPanelChromeProps(props: CommonProps) {
-  let descriptionInteractionReported = false;
-
   function hasOverlayHeader() {
     // always show normal header if we have time override
     if (props.data.request && props.data.request.timeInfo) {
@@ -40,12 +39,6 @@ export function getPanelChromeProps(props: CommonProps) {
     const descriptionMarkdown = getTemplateSrv().replace(props.panel.description, props.panel.scopedVars);
     const interpolatedDescription = renderMarkdown(descriptionMarkdown);
 
-    if (!descriptionInteractionReported) {
-      // Description rendering function can be called multiple times due to re-renders but we want to report the interaction once.
-      reportInteraction('dashboards_panelheader_description_displayed');
-      descriptionInteractionReported = true;
-    }
-
     return interpolatedDescription;
   };
 
@@ -59,7 +52,7 @@ export function getPanelChromeProps(props: CommonProps) {
     return panelLinks.map((panelLink) => ({
       ...panelLink,
       onClick: (...args) => {
-        reportInteraction('dashboards_panelheader_datalink_clicked', { has_multiple_links: panelLinks.length > 1 });
+        DashboardInteractions.panelLinkClicked({ has_multiple_links: panelLinks.length > 1 });
         panelLink.onClick?.(...args);
       },
     }));
@@ -73,21 +66,21 @@ export function getPanelChromeProps(props: CommonProps) {
   const onOpenErrorInspect = (e: React.SyntheticEvent) => {
     e.stopPropagation();
     locationService.partial({ inspect: props.panel.id, inspectTab: InspectTab.Error });
-    reportInteraction('dashboards_panelheader_statusmessage_clicked');
+    DashboardInteractions.panelStatusMessageClicked();
   };
 
   const onCancelQuery = () => {
     props.panel.getQueryRunner().cancelQuery();
-    reportInteraction('dashboards_panelheader_cancelquery_clicked', { data_state: props.data.state });
+    DashboardInteractions.panelCancelQueryClicked({ data_state: props.data.state });
   };
 
   const padding: PanelPadding = props.plugin.noPadding ? 'none' : 'md';
   const alertState = props.data.alertState?.state;
 
   const isAngularDatasource = props.panel.datasource?.uid
-    ? isAngularDatasourcePlugin(props.panel.datasource?.uid)
+    ? isAngularDatasourcePluginAndNotHidden(props.panel.datasource?.uid)
     : false;
-  const isAngularPanel = props.panel.isAngularPlugin();
+  const isAngularPanel = props.panel.isAngularPlugin() && !props.plugin.meta.angular?.hideDeprecation;
   const showAngularNotice =
     (config.featureToggles.angularDeprecationUI ?? false) && (isAngularDatasource || isAngularPanel);
 
@@ -121,7 +114,7 @@ export function getPanelChromeProps(props: CommonProps) {
   const title = props.panel.getDisplayTitle();
 
   const onOpenMenu = () => {
-    reportInteraction('dashboards_panelheader_menu', { item: 'menu' });
+    DashboardInteractions.panelMenuShown();
   };
 
   return {
diff --git a/public/app/features/dashboard/utils/getPanelMenu.test.ts b/public/app/features/dashboard/utils/getPanelMenu.test.ts
index ad194684d10a4..6f25c38b942df 100644
--- a/public/app/features/dashboard/utils/getPanelMenu.test.ts
+++ b/public/app/features/dashboard/utils/getPanelMenu.test.ts
@@ -625,7 +625,7 @@ describe('getPanelMenu()', () => {
     });
   });
   describe('Alerting menu', () => {
-    it('should render Create alert menu item if user has permissions to read and update alerts ', () => {
+    it('should render "New alert rule" menu item if user has permissions to read and update alerts ', () => {
       const panel = new PanelModel({});
 
       const dashboard = createDashboardModelFixture({});
@@ -637,13 +637,13 @@ describe('getPanelMenu()', () => {
       expect(moreSubMenu).toEqual(
         expect.arrayContaining([
           expect.objectContaining({
-            text: 'Create alert',
+            text: 'New alert rule',
           }),
         ])
       );
     });
 
-    it('should not render Create alert menu item, if user does not have permissions to update alerts ', () => {
+    it('should not render "New alert rule" menu item, if user does not have permissions to update alerts ', () => {
       const panel = new PanelModel({});
       const dashboard = createDashboardModelFixture({});
 
@@ -657,12 +657,12 @@ describe('getPanelMenu()', () => {
       expect(moreSubMenu).toEqual(
         expect.arrayContaining([
           expect.not.objectContaining({
-            text: 'Create alert',
+            text: 'New alert rule',
           }),
         ])
       );
     });
-    it('should not render Create alert menu item, if user does not have permissions to read update alerts ', () => {
+    it('should not render "New alert rule" menu item, if user does not have permissions to read update alerts ', () => {
       const panel = new PanelModel({});
 
       const dashboard = createDashboardModelFixture({});
@@ -672,7 +672,7 @@ describe('getPanelMenu()', () => {
       const menuItems = getPanelMenu(dashboard, panel);
 
       const moreSubMenu = menuItems.find((i) => i.text === 'More...')?.subMenu;
-      const createAlertOption = moreSubMenu?.find((i) => i.text === 'Create alert')?.subMenu;
+      const createAlertOption = moreSubMenu?.find((i) => i.text === 'New alert rule')?.subMenu;
 
       expect(createAlertOption).toBeUndefined();
     });
diff --git a/public/app/features/dashboard/utils/getPanelMenu.ts b/public/app/features/dashboard/utils/getPanelMenu.ts
index 0894368211d6c..ddd8a149eb9fc 100644
--- a/public/app/features/dashboard/utils/getPanelMenu.ts
+++ b/public/app/features/dashboard/utils/getPanelMenu.ts
@@ -1,17 +1,20 @@
 import {
-  getTimeZone,
   PanelMenuItem,
-  PluginExtensionLink,
   PluginExtensionPoints,
+  getTimeZone,
   urlUtil,
   type PluginExtensionPanelContext,
 } from '@grafana/data';
-import { AngularComponent, getPluginLinkExtensions, locationService, reportInteraction } from '@grafana/runtime';
+import { AngularComponent, getPluginLinkExtensions, locationService } from '@grafana/runtime';
 import { PanelCtrl } from 'app/angular/panel/panel_ctrl';
 import config from 'app/core/config';
+import { createErrorNotification } from 'app/core/copy/appNotification';
 import { t } from 'app/core/internationalization';
+import { notifyApp } from 'app/core/reducers/appNotification';
 import { contextSrv } from 'app/core/services/context_srv';
+import { getMessageFromError } from 'app/core/utils/errors';
 import { getExploreUrl } from 'app/core/utils/explore';
+import { RuleFormValues } from 'app/features/alerting/unified/types/rule-form';
 import { panelToRuleFormValues } from 'app/features/alerting/unified/utils/rule-form';
 import { DashboardModel } from 'app/features/dashboard/state/DashboardModel';
 import { PanelModel } from 'app/features/dashboard/state/PanelModel';
@@ -24,11 +27,12 @@ import {
   toggleLegend,
   unlinkLibraryPanel,
 } from 'app/features/dashboard/utils/panel';
+import { DashboardInteractions } from 'app/features/dashboard-scene/utils/interactions';
 import { InspectTab } from 'app/features/inspector/types';
 import { isPanelModelLibraryPanel } from 'app/features/library-panels/guard';
-import { truncateTitle } from 'app/features/plugins/extensions/utils';
+import { createExtensionSubMenu } from 'app/features/plugins/extensions/utils';
 import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard';
-import { store } from 'app/store/store';
+import { dispatch, store } from 'app/store/store';
 
 import { getCreateAlertInMenuAvailability } from '../../alerting/unified/utils/access-control';
 import { navigateToExplore } from '../../explore/state/main';
@@ -44,7 +48,7 @@ export function getPanelMenu(
     locationService.partial({
       viewPanel: panel.id,
     });
-    reportInteraction('dashboards_panelheader_menu', { item: 'view' });
+    DashboardInteractions.panelMenuItemClicked('view');
   };
 
   const onEditPanel = (event: React.MouseEvent) => {
@@ -53,25 +57,25 @@ export function getPanelMenu(
       editPanel: panel.id,
     });
 
-    reportInteraction('dashboards_panelheader_menu', { item: 'edit' });
+    DashboardInteractions.panelMenuItemClicked('edit');
   };
 
   const onSharePanel = (event: React.MouseEvent) => {
     event.preventDefault();
     sharePanel(dashboard, panel);
-    reportInteraction('dashboards_panelheader_menu', { item: 'share' });
+    DashboardInteractions.panelMenuItemClicked('share');
   };
 
   const onAddLibraryPanel = (event: React.MouseEvent) => {
     event.preventDefault();
     addLibraryPanel(dashboard, panel);
-    reportInteraction('dashboards_panelheader_menu', { item: 'createLibraryPanel' });
+    DashboardInteractions.panelMenuItemClicked('createLibraryPanel');
   };
 
   const onUnlinkLibraryPanel = (event: React.MouseEvent) => {
     event.preventDefault();
     unlinkLibraryPanel(panel);
-    reportInteraction('dashboards_panelheader_menu', { item: 'unlinkLibraryPanel' });
+    DashboardInteractions.panelMenuItemClicked('unlinkLibraryPanel');
   };
 
   const onInspectPanel = (tab?: InspectTab) => {
@@ -79,7 +83,7 @@ export function getPanelMenu(
       inspect: panel.id,
       inspectTab: tab,
     });
-    reportInteraction('dashboards_panelheader_menu', { item: 'inspect', tab: tab ?? InspectTab.Data });
+    DashboardInteractions.panelMenuInspectClicked(tab ?? InspectTab.Data);
   };
 
   const onMore = (event: React.MouseEvent) => {
@@ -89,19 +93,19 @@ export function getPanelMenu(
   const onDuplicatePanel = (event: React.MouseEvent) => {
     event.preventDefault();
     duplicatePanel(dashboard, panel);
-    reportInteraction('dashboards_panelheader_menu', { item: 'duplicate' });
+    DashboardInteractions.panelMenuItemClicked('duplicate');
   };
 
   const onCopyPanel = (event: React.MouseEvent) => {
     event.preventDefault();
     copyPanel(panel);
-    reportInteraction('dashboards_panelheader_menu', { item: 'copy' });
+    DashboardInteractions.panelMenuItemClicked('copy');
   };
 
   const onRemovePanel = (event: React.MouseEvent) => {
     event.preventDefault();
     removePanel(dashboard, panel, true);
-    reportInteraction('dashboards_panelheader_menu', { item: 'remove' });
+    DashboardInteractions.panelMenuItemClicked('remove');
   };
 
   const onNavigateToExplore = (event: React.MouseEvent) => {
@@ -115,13 +119,13 @@ export function getPanelMenu(
         openInNewWindow,
       }) as any
     );
-    reportInteraction('dashboards_panelheader_menu', { item: 'explore' });
+    DashboardInteractions.panelMenuItemClicked('explore');
   };
 
   const onToggleLegend = (event: React.MouseEvent) => {
     event.preventDefault();
     toggleLegend(panel);
-    reportInteraction('dashboards_panelheader_menu', { item: 'toggleLegend' });
+    DashboardInteractions.panelMenuItemClicked('toggleLegend');
   };
 
   const menu: PanelMenuItem[] = [];
@@ -206,8 +210,14 @@ export function getPanelMenu(
   });
 
   const createAlert = async () => {
-    const formValues = await panelToRuleFormValues(panel, dashboard);
-
+    let formValues: Partial<RuleFormValues> | undefined;
+    try {
+      formValues = await panelToRuleFormValues(panel, dashboard);
+    } catch (err) {
+      const message = `Error getting rule values from the panel: ${getMessageFromError(err)}`;
+      dispatch(notifyApp(createErrorNotification(message)));
+      return;
+    }
     const ruleFormUrl = urlUtil.renderUrl('/alerting/new', {
       defaults: JSON.stringify(formValues),
       returnTo: location.pathname + location.search,
@@ -219,7 +229,7 @@ export function getPanelMenu(
   const onCreateAlert = (event: React.MouseEvent) => {
     event.preventDefault();
     createAlert();
-    reportInteraction('dashboards_panelheader_menu', { item: 'create-alert' });
+    DashboardInteractions.panelMenuItemClicked('create-alert');
   };
 
   const subMenu: PanelMenuItem[] = [];
@@ -261,7 +271,7 @@ export function getPanelMenu(
 
   if (isCreateAlertMenuOptionAvailable) {
     subMenu.push({
-      text: t('panel.header-menu.create-alert', `Create alert`),
+      text: t('panel.header-menu.new-alert-rule', `New alert rule`),
       onClick: onCreateAlert,
     });
   }
@@ -304,7 +314,7 @@ export function getPanelMenu(
     subMenu.length = 0;
     if (isCreateAlertMenuOptionAvailable) {
       subMenu.push({
-        text: t('panel.header-menu.create-alert', `Create alert`),
+        text: t('panel.header-menu.new-alert-rule', `New alert rule`),
         onClick: onCreateAlert,
       });
     }
@@ -375,53 +385,3 @@ function createExtensionContext(panel: PanelModel, dashboard: DashboardModel): P
     data: panel.getQueryRunner().getLastResult(),
   };
 }
-
-function createExtensionSubMenu(extensions: PluginExtensionLink[]): PanelMenuItem[] {
-  const categorized: Record<string, PanelMenuItem[]> = {};
-  const uncategorized: PanelMenuItem[] = [];
-
-  for (const extension of extensions) {
-    const category = extension.category;
-
-    if (!category) {
-      uncategorized.push({
-        text: truncateTitle(extension.title, 25),
-        href: extension.path,
-        onClick: extension.onClick,
-      });
-      continue;
-    }
-
-    if (!Array.isArray(categorized[category])) {
-      categorized[category] = [];
-    }
-
-    categorized[category].push({
-      text: truncateTitle(extension.title, 25),
-      href: extension.path,
-      onClick: extension.onClick,
-    });
-  }
-
-  const subMenu = Object.keys(categorized).reduce((subMenu: PanelMenuItem[], category) => {
-    subMenu.push({
-      text: truncateTitle(category, 25),
-      type: 'group',
-      subMenu: categorized[category],
-    });
-    return subMenu;
-  }, []);
-
-  if (uncategorized.length > 0) {
-    if (subMenu.length > 0) {
-      subMenu.push({
-        text: 'divider',
-        type: 'divider',
-      });
-    }
-
-    Array.prototype.push.apply(subMenu, uncategorized);
-  }
-
-  return subMenu;
-}
diff --git a/public/app/features/dashboard/utils/panel.ts b/public/app/features/dashboard/utils/panel.ts
index cd178de9a4d03..688451bc7301d 100644
--- a/public/app/features/dashboard/utils/panel.ts
+++ b/public/app/features/dashboard/utils/panel.ts
@@ -9,8 +9,8 @@ import store from 'app/core/store';
 import { ShareModal } from 'app/features/dashboard/components/ShareModal';
 import { DashboardModel } from 'app/features/dashboard/state/DashboardModel';
 import { PanelModel } from 'app/features/dashboard/state/PanelModel';
+import { UnlinkModal } from 'app/features/dashboard-scene/scene/UnlinkModal';
 import { AddLibraryPanelModal } from 'app/features/library-panels/components/AddLibraryPanelModal/AddLibraryPanelModal';
-import { UnlinkModal } from 'app/features/library-panels/components/UnlinkModal/UnlinkModal';
 import { cleanUpPanelState } from 'app/features/panel/state/actions';
 import { dispatch } from 'app/store/store';
 
@@ -19,17 +19,12 @@ import { ShowConfirmModalEvent, ShowModalReactEvent } from '../../../types/event
 export const removePanel = (dashboard: DashboardModel, panel: PanelModel, ask: boolean) => {
   // confirm deletion
   if (ask !== false) {
-    const text2 =
-      panel.alert && !config.unifiedAlertingEnabled
-        ? 'Panel includes an alert rule. removing the panel will also remove the alert rule'
-        : undefined;
     const confirmText = panel.alert ? 'YES' : undefined;
 
     appEvents.publish(
       new ShowConfirmModalEvent({
         title: 'Remove panel',
         text: 'Are you sure you want to remove this panel?',
-        text2: text2,
         icon: 'trash-alt',
         confirmText: confirmText,
         yesText: 'Remove',
diff --git a/public/app/features/dashboard/utils/tracking.test.ts b/public/app/features/dashboard/utils/tracking.test.ts
index 7b4dfc976cd65..9adb9e6d39b98 100644
--- a/public/app/features/dashboard/utils/tracking.test.ts
+++ b/public/app/features/dashboard/utils/tracking.test.ts
@@ -11,7 +11,12 @@ describe('trackDashboardLoaded', () => {
       title: 'Test Dashboard',
       panels: [
         { id: 1, type: 'row', repeat: 'dc', gridPos: { x: 0, y: 0, h: 1, w: 24 } },
-        { id: 2, repeat: 'app', repeatDirection: 'h', gridPos: { x: 0, y: 1, h: 2, w: 8 } },
+        { id: 2, type: 'stat', repeat: 'app', repeatDirection: 'h', gridPos: { x: 0, y: 1, h: 2, w: 8 } },
+        { id: 3, type: 'graph', repeatDirection: 'h', gridPos: { x: 0, y: 1, h: 2, w: 8 } },
+        { id: 4, type: 'timeseries', repeatDirection: 'h', gridPos: { x: 0, y: 1, h: 2, w: 8 } },
+        { id: 5, type: 'grafana-worldmap-panel', repeatDirection: 'h', gridPos: { x: 0, y: 1, h: 2, w: 8 } },
+        { id: 6, type: 'geomap', repeatDirection: 'h', gridPos: { x: 0, y: 1, h: 2, w: 8 } },
+        { id: 7, type: 'graph', repeatDirection: 'h', gridPos: { x: 0, y: 1, h: 2, w: 8 } },
       ],
       templating: {
         list: [
@@ -20,20 +25,34 @@ describe('trackDashboardLoaded', () => {
           { type: 'query', name: 'Query 2' },
         ],
       },
+      timepicker: {
+        nowDelay: '1m',
+      },
+      liveNow: true,
     };
     const model = getDashboardModel(dashboardJSON);
     const reportInteractionSpy = jest.spyOn(runtime, 'reportInteraction');
 
-    trackDashboardLoaded(model, 16);
+    trackDashboardLoaded(model, 200, 16);
 
     expect(reportInteractionSpy).toHaveBeenCalledWith('dashboards_init_dashboard_completed', {
+      duration: 200,
+      isScene: false,
       uid: 'dashboard-123',
       title: 'Test Dashboard',
       schemaVersion: model.schemaVersion, // This value is based on public/app/features/dashboard/state/DashboardMigrator.ts#L81
-      panels_count: 2,
+      panels_count: 7,
       variable_type_query_count: 2,
       variable_type_interval_count: 1,
       version_before_migration: 16,
+      panel_type_row_count: 1,
+      panel_type_stat_count: 1,
+      panel_type_graph_count: 2,
+      panel_type_timeseries_count: 1,
+      'panel_type_grafana-worldmap-panel_count': 1,
+      panel_type_geomap_count: 1,
+      settings_nowdelay: '1m',
+      settings_livenow: true,
     });
   });
 });
diff --git a/public/app/features/dashboard/utils/tracking.ts b/public/app/features/dashboard/utils/tracking.ts
index a3c1bc78eb853..a70c8b84ab479 100644
--- a/public/app/features/dashboard/utils/tracking.ts
+++ b/public/app/features/dashboard/utils/tracking.ts
@@ -1,25 +1,70 @@
-import { reportInteraction } from '@grafana/runtime';
+import { Panel, VariableModel } from '@grafana/schema/dist/esm/index';
+import { DashboardScene } from 'app/features/dashboard-scene/scene/DashboardScene';
+import { DashboardInteractions } from 'app/features/dashboard-scene/utils/interactions';
 
-import { DashboardModel } from '../state';
+import { DashboardModel, PanelModel } from '../state';
 
-export function trackDashboardLoaded(dashboard: DashboardModel, versionBeforeMigration?: number) {
+export function trackDashboardLoaded(dashboard: DashboardModel, duration?: number, versionBeforeMigration?: number) {
   // Count the different types of variables
-  const variables = dashboard.templating.list
-    .map((v) => v.type)
-    .reduce((r, k) => {
-      r[variableName(k)] = 1 + r[variableName(k)] || 1;
-      return r;
-    }, {});
+  const variables = getVariables(dashboard.templating.list);
+  // Count the different types of panels
+  const panels = getPanelCounts(dashboard.panels);
 
-  reportInteraction('dashboards_init_dashboard_completed', {
+  DashboardInteractions.dashboardInitialized({
     uid: dashboard.uid,
     title: dashboard.title,
     theme: dashboard.style,
     schemaVersion: dashboard.schemaVersion,
     version_before_migration: versionBeforeMigration,
     panels_count: dashboard.panels.length,
+    ...panels,
     ...variables,
+    settings_nowdelay: dashboard.timepicker.nowDelay,
+    settings_livenow: !!dashboard.liveNow,
+    duration,
+    isScene: false,
   });
 }
 
+export function trackDashboardSceneLoaded(dashboard: DashboardScene, duration?: number) {
+  const initialSaveModel = dashboard.getInitialSaveModel();
+  if (initialSaveModel) {
+    const panels = getPanelCounts(initialSaveModel.panels || []);
+    const variables = getVariables(initialSaveModel.templating?.list || []);
+    DashboardInteractions.dashboardInitialized({
+      uid: initialSaveModel.uid,
+      title: initialSaveModel.title,
+      theme: undefined,
+      schemaVersion: initialSaveModel.schemaVersion,
+      version_before_migration: initialSaveModel.version,
+      panels_count: initialSaveModel.panels?.length || 0,
+      ...panels,
+      ...variables,
+      settings_nowdelay: undefined,
+      settings_livenow: !!initialSaveModel.liveNow,
+      duration,
+      isScene: true,
+    });
+  }
+}
+
+function getPanelCounts(panels: Panel[] | PanelModel[]) {
+  return panels
+    .map((p) => p.type)
+    .reduce((r: Record<string, number>, p) => {
+      r[panelName(p)] = 1 + r[panelName(p)] || 1;
+      return r;
+    }, {});
+}
+
+function getVariables(variableList: VariableModel[]) {
+  return variableList
+    .map((v) => v.type)
+    .reduce((r: Record<string, number>, k) => {
+      r[variableName(k)] = 1 + r[variableName(k)] || 1;
+      return r;
+    }, {});
+}
+
 const variableName = (type: string) => `variable_type_${type}_count`;
+const panelName = (type: string) => `panel_type_${type}_count`;
diff --git a/public/app/features/datasources/__mocks__/store.navIndex.mock.ts b/public/app/features/datasources/__mocks__/store.navIndex.mock.ts
index b505dd42f61a9..19c3cfc531012 100644
--- a/public/app/features/datasources/__mocks__/store.navIndex.mock.ts
+++ b/public/app/features/datasources/__mocks__/store.navIndex.mock.ts
@@ -563,7 +563,7 @@ export const navIndex: NavIndex = {
       },
       {
         id: 'alert',
-        text: 'Create alert rule',
+        text: 'New alert rule',
         subTitle: 'Create an alert rule',
         icon: 'plus',
         url: '/alerting/new',
@@ -622,7 +622,7 @@ export const navIndex: NavIndex = {
         },
         {
           id: 'alert',
-          text: 'Create alert rule',
+          text: 'New alert rule',
           subTitle: 'Create an alert rule',
           icon: 'plus',
           url: '/alerting/new',
@@ -682,7 +682,7 @@ export const navIndex: NavIndex = {
         },
         {
           id: 'alert',
-          text: 'Create alert rule',
+          text: 'New alert rule',
           subTitle: 'Create an alert rule',
           icon: 'plus',
           url: '/alerting/new',
@@ -742,7 +742,7 @@ export const navIndex: NavIndex = {
         },
         {
           id: 'alert',
-          text: 'Create alert rule',
+          text: 'New alert rule',
           subTitle: 'Create an alert rule',
           icon: 'plus',
           url: '/alerting/new',
@@ -802,7 +802,7 @@ export const navIndex: NavIndex = {
         },
         {
           id: 'alert',
-          text: 'Create alert rule',
+          text: 'New alert rule',
           subTitle: 'Create an alert rule',
           icon: 'plus',
           url: '/alerting/new',
@@ -862,7 +862,7 @@ export const navIndex: NavIndex = {
         },
         {
           id: 'alert',
-          text: 'Create alert rule',
+          text: 'New alert rule',
           subTitle: 'Create an alert rule',
           icon: 'plus',
           url: '/alerting/new',
@@ -922,7 +922,7 @@ export const navIndex: NavIndex = {
         },
         {
           id: 'alert',
-          text: 'Create alert rule',
+          text: 'New alert rule',
           subTitle: 'Create an alert rule',
           icon: 'plus',
           url: '/alerting/new',
@@ -933,7 +933,7 @@ export const navIndex: NavIndex = {
   },
   alert: {
     id: 'alert',
-    text: 'Create alert rule',
+    text: 'New alert rule',
     subTitle: 'Create an alert rule',
     icon: 'plus',
     url: '/alerting/new',
@@ -984,7 +984,7 @@ export const navIndex: NavIndex = {
         },
         {
           id: 'alert',
-          text: 'Create alert rule',
+          text: 'New alert rule',
           subTitle: 'Create an alert rule',
           icon: 'plus',
           url: '/alerting/new',
diff --git a/public/app/features/datasources/components/BasicSettings.test.tsx b/public/app/features/datasources/components/BasicSettings.test.tsx
index 7a869dc8beb8f..283adbf75ce7a 100644
--- a/public/app/features/datasources/components/BasicSettings.test.tsx
+++ b/public/app/features/datasources/components/BasicSettings.test.tsx
@@ -11,7 +11,6 @@ const setup = () => {
     isDefault: false,
     onDefaultChange: jest.fn(),
     onNameChange: jest.fn(),
-    alertingSupported: false,
   };
 
   return render(<BasicSettings {...props} />);
@@ -21,7 +20,7 @@ describe('<BasicSettings>', () => {
   it('should render component', () => {
     setup();
 
-    expect(screen.getByRole('textbox', { name: selectors.pages.DataSource.name })).toBeInTheDocument();
+    expect(screen.getByTestId(selectors.pages.DataSource.name)).toBeInTheDocument();
     expect(screen.getByRole('checkbox', { name: /Default/ })).toBeInTheDocument();
   });
 });
diff --git a/public/app/features/datasources/components/BasicSettings.tsx b/public/app/features/datasources/components/BasicSettings.tsx
index 52228cc222811..243b9a946eb81 100644
--- a/public/app/features/datasources/components/BasicSettings.tsx
+++ b/public/app/features/datasources/components/BasicSettings.tsx
@@ -3,7 +3,6 @@ import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { config } from '@grafana/runtime';
 import { InlineField, InlineSwitch, Input, Badge, useStyles2 } from '@grafana/ui';
 
 export interface Props {
@@ -11,22 +10,12 @@ export interface Props {
   isDefault: boolean;
   onNameChange: (name: string) => void;
   onDefaultChange: (value: boolean) => void;
-  alertingSupported: boolean;
   disabled?: boolean;
 }
 
-export function BasicSettings({
-  dataSourceName,
-  isDefault,
-  onDefaultChange,
-  onNameChange,
-  alertingSupported,
-  disabled,
-}: Props) {
+export function BasicSettings({ dataSourceName, isDefault, onDefaultChange, onNameChange, disabled }: Props) {
   return (
     <>
-      {!config.featureToggles.dataSourcePageHeader && <AlertingEnabled enabled={alertingSupported} />}
-
       <div className="gf-form-group" aria-label="Datasource settings page basic settings">
         <div className="gf-form-inline">
           {/* Name */}
@@ -37,6 +26,7 @@ export function BasicSettings({
               'preselected in new panels."
               grow
               disabled={disabled}
+              labelWidth={14}
             >
               <Input
                 id="basic-settings-name"
@@ -45,7 +35,7 @@ export function BasicSettings({
                 placeholder="Name"
                 onChange={(event) => onNameChange(event.currentTarget.value)}
                 required
-                aria-label={selectors.pages.DataSource.name}
+                data-testid={selectors.pages.DataSource.name}
               />
             </InlineField>
           </div>
diff --git a/public/app/features/datasources/components/DashboardsTable.test.tsx b/public/app/features/datasources/components/DashboardsTable.test.tsx
index 8b463ad43439b..8ce9bcad3882d 100644
--- a/public/app/features/datasources/components/DashboardsTable.test.tsx
+++ b/public/app/features/datasources/components/DashboardsTable.test.tsx
@@ -25,7 +25,6 @@ describe('DashboardsTable', () => {
     mockDashboard = {
       dashboardId: 0,
       description: '',
-      folderId: 0,
       imported: false,
       importedRevision: 0,
       importedUri: '',
diff --git a/public/app/features/datasources/components/DataSourceReadOnlyMessage.tsx b/public/app/features/datasources/components/DataSourceReadOnlyMessage.tsx
index 6fff1faf496f1..fc47032432def 100644
--- a/public/app/features/datasources/components/DataSourceReadOnlyMessage.tsx
+++ b/public/app/features/datasources/components/DataSourceReadOnlyMessage.tsx
@@ -8,7 +8,7 @@ export const readOnlyMessage =
 
 export function DataSourceReadOnlyMessage() {
   return (
-    <Alert aria-label={e2eSelectors.pages.DataSource.readOnly} severity="info" title="Provisioned data source">
+    <Alert data-testid={e2eSelectors.pages.DataSource.readOnly} severity="info" title="Provisioned data source">
       {readOnlyMessage}
     </Alert>
   );
diff --git a/public/app/features/datasources/components/DataSourceTestingStatus.tsx b/public/app/features/datasources/components/DataSourceTestingStatus.tsx
index 86cef325da37c..f3268a61bc92b 100644
--- a/public/app/features/datasources/components/DataSourceTestingStatus.tsx
+++ b/public/app/features/datasources/components/DataSourceTestingStatus.tsx
@@ -100,7 +100,7 @@ export function DataSourceTestingStatus({ testingStatus, exploreUrl, dataSource
   if (message) {
     return (
       <div className="gf-form-group p-t-2">
-        <Alert severity={severity} title={message} aria-label={e2eSelectors.pages.DataSource.alert}>
+        <Alert severity={severity} title={message} data-testid={e2eSelectors.pages.DataSource.alert}>
           {testingStatus?.details && (
             <>
               {detailsMessage}
diff --git a/public/app/features/datasources/components/DataSourcesList.tsx b/public/app/features/datasources/components/DataSourcesList.tsx
index 8d92074cc47e8..ac15fd93cb66f 100644
--- a/public/app/features/datasources/components/DataSourcesList.tsx
+++ b/public/app/features/datasources/components/DataSourcesList.tsx
@@ -4,16 +4,16 @@ import { useLocation } from 'react-router-dom';
 
 import { DataSourceSettings, GrafanaTheme2 } from '@grafana/data';
 import { config } from '@grafana/runtime';
-import { LinkButton, Card, Tag, useStyles2 } from '@grafana/ui';
+import { EmptyState, useStyles2 } from '@grafana/ui';
 import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
-import PageLoader from 'app/core/components/PageLoader/PageLoader';
 import { contextSrv } from 'app/core/core';
+import { t } from 'app/core/internationalization';
 import { StoreState, AccessControlAction, useSelector } from 'app/types';
 
 import { getDataSources, getDataSourcesCount, useDataSourcesRoutes, useLoadDataSources } from '../state';
-import { trackCreateDashboardClicked, trackExploreClicked, trackDataSourcesListViewed } from '../tracking';
-import { constructDataSourceExploreUrl } from '../utils';
+import { trackDataSourcesListViewed } from '../tracking';
 
+import { DataSourcesListCard } from './DataSourcesListCard';
 import { DataSourcesListHeader } from './DataSourcesListHeader';
 
 export function DataSourcesList() {
@@ -65,11 +65,7 @@ export function DataSourcesListView({
     });
   }, [location]);
 
-  if (isLoading) {
-    return <PageLoader />;
-  }
-
-  if (dataSourcesCount === 0) {
+  if (!isLoading && dataSourcesCount === 0) {
     return (
       <EmptyListCTA
         buttonDisabled={!hasCreateRights}
@@ -85,74 +81,35 @@ export function DataSourcesListView({
     );
   }
 
+  const getDataSourcesList = () => {
+    if (isLoading) {
+      return new Array(20)
+        .fill(null)
+        .map((_, index) => <DataSourcesListCard.Skeleton key={index} hasExploreRights={hasExploreRights} />);
+    }
+
+    return dataSources.map((dataSource) => (
+      <li key={dataSource.uid}>
+        <DataSourcesListCard
+          dataSource={dataSource}
+          hasWriteRights={hasWriteRights}
+          hasExploreRights={hasExploreRights}
+        />
+      </li>
+    ));
+  };
+
   return (
     <>
       {/* List Header */}
       <DataSourcesListHeader />
 
       {/* List */}
-      <ul className={styles.list}>
-        {dataSources.map((dataSource) => {
-          const dsLink = config.appSubUrl + dataSourcesRoutes.Edit.replace(/:uid/gi, dataSource.uid);
-          return (
-            <li key={dataSource.uid}>
-              <Card href={hasWriteRights ? dsLink : undefined}>
-                <Card.Heading>{dataSource.name}</Card.Heading>
-                <Card.Figure>
-                  <img src={dataSource.typeLogoUrl} alt="" height="40px" width="40px" className={styles.logo} />
-                </Card.Figure>
-                <Card.Meta>
-                  {[
-                    dataSource.typeName,
-                    dataSource.url,
-                    dataSource.isDefault && <Tag key="default-tag" name={'default'} colorIndex={1} />,
-                  ]}
-                </Card.Meta>
-                <Card.Tags>
-                  {/* Build Dashboard */}
-                  <LinkButton
-                    icon="apps"
-                    fill="outline"
-                    variant="secondary"
-                    href={`dashboard/new-with-ds/${dataSource.uid}`}
-                    onClick={() => {
-                      trackCreateDashboardClicked({
-                        grafana_version: config.buildInfo.version,
-                        datasource_uid: dataSource.uid,
-                        plugin_name: dataSource.typeName,
-                        path: location.pathname,
-                      });
-                    }}
-                  >
-                    Build a dashboard
-                  </LinkButton>
-
-                  {/* Explore */}
-                  {hasExploreRights && (
-                    <LinkButton
-                      icon="compass"
-                      fill="outline"
-                      variant="secondary"
-                      className={styles.button}
-                      href={constructDataSourceExploreUrl(dataSource)}
-                      onClick={() => {
-                        trackExploreClicked({
-                          grafana_version: config.buildInfo.version,
-                          datasource_uid: dataSource.uid,
-                          plugin_name: dataSource.typeName,
-                          path: location.pathname,
-                        });
-                      }}
-                    >
-                      Explore
-                    </LinkButton>
-                  )}
-                </Card.Tags>
-              </Card>
-            </li>
-          );
-        })}
-      </ul>
+      {dataSources.length === 0 && !isLoading ? (
+        <EmptyState variant="not-found" message={t('data-sources.empty-state.message', 'No data sources found')} />
+      ) : (
+        <ul className={styles.list}>{getDataSourcesList()}</ul>
+      )}
     </>
   );
 }
@@ -164,11 +121,5 @@ const getStyles = (theme: GrafanaTheme2) => {
       display: 'grid',
       // gap: '8px', Add back when legacy support for old Card interface is dropped
     }),
-    logo: css({
-      objectFit: 'contain',
-    }),
-    button: css({
-      marginLeft: theme.spacing(2),
-    }),
   };
 };
diff --git a/public/app/features/datasources/components/DataSourcesListCard.tsx b/public/app/features/datasources/components/DataSourcesListCard.tsx
new file mode 100644
index 0000000000000..25bbed81d59e1
--- /dev/null
+++ b/public/app/features/datasources/components/DataSourcesListCard.tsx
@@ -0,0 +1,128 @@
+import { css } from '@emotion/css';
+import React from 'react';
+import Skeleton from 'react-loading-skeleton';
+
+import { DataSourceSettings, GrafanaTheme2 } from '@grafana/data';
+import { config } from '@grafana/runtime';
+import { Card, LinkButton, Stack, Tag, useStyles2 } from '@grafana/ui';
+
+import { useDataSourcesRoutes } from '../state';
+import { trackCreateDashboardClicked, trackExploreClicked } from '../tracking';
+import { constructDataSourceExploreUrl } from '../utils';
+
+export interface Props {
+  dataSource: DataSourceSettings;
+  hasWriteRights: boolean;
+  hasExploreRights: boolean;
+}
+
+export function DataSourcesListCard({ dataSource, hasWriteRights, hasExploreRights }: Props) {
+  const dataSourcesRoutes = useDataSourcesRoutes();
+  const dsLink = config.appSubUrl + dataSourcesRoutes.Edit.replace(/:uid/gi, dataSource.uid);
+  const styles = useStyles2(getStyles);
+
+  return (
+    <Card href={hasWriteRights ? dsLink : undefined}>
+      <Card.Heading>{dataSource.name}</Card.Heading>
+      <Card.Figure>
+        <img src={dataSource.typeLogoUrl} alt="" height="40px" width="40px" className={styles.logo} />
+      </Card.Figure>
+      <Card.Meta>
+        {[
+          dataSource.typeName,
+          dataSource.url,
+          dataSource.isDefault && <Tag key="default-tag" name={'default'} colorIndex={1} />,
+        ]}
+      </Card.Meta>
+      <Card.Tags>
+        {/* Build Dashboard */}
+        <LinkButton
+          icon="apps"
+          fill="outline"
+          variant="secondary"
+          href={`dashboard/new-with-ds/${dataSource.uid}`}
+          onClick={() => {
+            trackCreateDashboardClicked({
+              grafana_version: config.buildInfo.version,
+              datasource_uid: dataSource.uid,
+              plugin_name: dataSource.typeName,
+              path: location.pathname,
+            });
+          }}
+        >
+          Build a dashboard
+        </LinkButton>
+
+        {/* Explore */}
+        {hasExploreRights && (
+          <LinkButton
+            icon="compass"
+            fill="outline"
+            variant="secondary"
+            className={styles.button}
+            href={constructDataSourceExploreUrl(dataSource)}
+            onClick={() => {
+              trackExploreClicked({
+                grafana_version: config.buildInfo.version,
+                datasource_uid: dataSource.uid,
+                plugin_name: dataSource.typeName,
+                path: location.pathname,
+              });
+            }}
+          >
+            Explore
+          </LinkButton>
+        )}
+      </Card.Tags>
+    </Card>
+  );
+}
+
+function DataSourcesListCardSkeleton({ hasExploreRights }: Pick<Props, 'hasExploreRights'>) {
+  const skeletonStyles = useStyles2(getSkeletonStyles);
+  return (
+    <Card>
+      <Card.Heading>
+        <Skeleton width={140} />
+      </Card.Heading>
+      <Card.Figure>
+        <Skeleton width={40} height={40} containerClassName={skeletonStyles.figure} />
+      </Card.Figure>
+      <Card.Meta>
+        <Skeleton width={120} />
+      </Card.Meta>
+      <Card.Tags>
+        <Stack direction="row" gap={2}>
+          <Skeleton height={32} width={179} containerClassName={skeletonStyles.button} />
+
+          {/* Explore */}
+          {hasExploreRights && <Skeleton height={32} width={107} containerClassName={skeletonStyles.button} />}
+        </Stack>
+      </Card.Tags>
+    </Card>
+  );
+}
+
+DataSourcesListCard.Skeleton = DataSourcesListCardSkeleton;
+
+const getSkeletonStyles = () => {
+  return {
+    button: css({
+      lineHeight: 1,
+    }),
+    figure: css({
+      lineHeight: 1,
+    }),
+  };
+};
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    logo: css({
+      objectFit: 'contain',
+    }),
+    button: css({
+      marginLeft: theme.spacing(2),
+    }),
+  };
+};
diff --git a/public/app/features/datasources/components/EditDataSource.tsx b/public/app/features/datasources/components/EditDataSource.tsx
index a837c1ec030f0..e4802f21b491a 100644
--- a/public/app/features/datasources/components/EditDataSource.tsx
+++ b/public/app/features/datasources/components/EditDataSource.tsx
@@ -120,10 +120,6 @@ export function EditDataSourceView({
 
   const dsi = getDataSourceSrv()?.getInstanceSettings(dataSource.uid);
 
-  const hasAlertingEnabled = Boolean(dsi?.meta?.alerting ?? false);
-  const isAlertManagerDatasource = dsi?.type === 'alertmanager';
-  const alertingSupported = hasAlertingEnabled || isAlertManagerDatasource;
-
   const onSubmit = async (e: React.MouseEvent<HTMLButtonElement> | React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
     trackDsConfigClicked('save_and_test');
@@ -133,7 +129,7 @@ export function EditDataSourceView({
       trackDsConfigUpdated({ item: 'success' });
       appEvents.publish(new DataSourceUpdatedSuccessfully());
     } catch (error) {
-      trackDsConfigUpdated({ item: 'fail', error });
+      trackDsConfigUpdated({ item: 'fail' });
       return;
     }
 
@@ -143,7 +139,9 @@ export function EditDataSourceView({
   const extensions = useMemo(() => {
     const allowedPluginIds = ['grafana-pdc-app', 'grafana-auth-app'];
     const extensionPointId = PluginExtensionPoints.DataSourceConfig;
-    const { extensions } = getPluginComponentExtensions({ extensionPointId });
+    const { extensions } = getPluginComponentExtensions<{
+      context: PluginExtensionDataSourceConfigContext<DataSourceJsonData>;
+    }>({ extensionPointId });
 
     return extensions.filter((e) => allowedPluginIds.includes(e.pluginId));
   }, []);
@@ -190,7 +188,6 @@ export function EditDataSourceView({
         isDefault={dataSource.isDefault}
         onDefaultChange={onDefaultChange}
         onNameChange={onNameChange}
-        alertingSupported={alertingSupported}
         disabled={readOnly || !hasWriteRights}
       />
 
@@ -207,9 +204,7 @@ export function EditDataSourceView({
 
       {/* Extension point */}
       {extensions.map((extension) => {
-        const Component = extension.component as React.ComponentType<{
-          context: PluginExtensionDataSourceConfigContext<DataSourceJsonData>;
-        }>;
+        const Component = extension.component;
 
         return (
           <div key={extension.id}>
diff --git a/public/app/features/datasources/components/picker/BuiltInDataSourceList.tsx b/public/app/features/datasources/components/picker/BuiltInDataSourceList.tsx
index ee08899e4a281..44c90bf819c71 100644
--- a/public/app/features/datasources/components/picker/BuiltInDataSourceList.tsx
+++ b/public/app/features/datasources/components/picker/BuiltInDataSourceList.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 
 import { DataSourceInstanceSettings } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import { DataSourceRef } from '@grafana/schema';
 import { t } from 'app/core/internationalization';
 
@@ -69,7 +70,7 @@ export function BuiltInDataSourceList({
   const filteredResults = grafanaDataSources.filter((ds) => (filter ? filter?.(ds) : true) && !!ds.meta.builtIn);
 
   return (
-    <div className={className} data-testid="built-in-data-sources-list">
+    <div className={className} data-testid={selectors.components.DataSourcePicker.advancedModal.builtInDataSourceList}>
       {filteredResults.map((ds) => {
         return (
           <DataSourceCard
diff --git a/public/app/features/datasources/components/picker/DataSourceDropdown.test.tsx b/public/app/features/datasources/components/picker/DataSourceDropdown.test.tsx
deleted file mode 100644
index 5b9ba51f77893..0000000000000
--- a/public/app/features/datasources/components/picker/DataSourceDropdown.test.tsx
+++ /dev/null
@@ -1,320 +0,0 @@
-import { findByText, render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { UserEvent } from '@testing-library/user-event/dist/types/setup/setup';
-import React from 'react';
-
-import { DataSourceInstanceSettings, DataSourcePluginMeta, PluginMetaInfo, PluginType } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
-import { ModalRoot, ModalsProvider } from '@grafana/ui';
-import config from 'app/core/config';
-import { defaultFileUploadQuery } from 'app/plugins/datasource/grafana/types';
-
-import { DataSourceDropdown, DataSourceDropdownProps } from './DataSourceDropdown';
-import * as utils from './utils';
-
-const pluginMetaInfo: PluginMetaInfo = {
-  author: { name: '' },
-  description: '',
-  screenshots: [],
-  version: '',
-  updated: '',
-  links: [],
-  logos: { small: '', large: '' },
-};
-
-function createPluginMeta(name: string, builtIn: boolean): DataSourcePluginMeta {
-  return { builtIn, name, id: name, type: PluginType.datasource, baseUrl: '', info: pluginMetaInfo, module: '' };
-}
-
-function createDS(name: string, id: number, builtIn: boolean): DataSourceInstanceSettings {
-  return {
-    name: name,
-    uid: name + 'uid',
-    meta: createPluginMeta(name, builtIn),
-    id,
-    access: 'direct',
-    jsonData: {},
-    type: '',
-    readOnly: true,
-  };
-}
-
-const mockDS1 = createDS('mock.datasource.1', 1, false);
-const mockDS2 = createDS('mock.datasource.2', 2, false);
-const MockDSBuiltIn = createDS('mock.datasource.builtin', 3, true);
-
-const mockDSList = [mockDS1, mockDS2, MockDSBuiltIn];
-
-async function setupOpenDropdown(user: UserEvent, props: DataSourceDropdownProps) {
-  const dropdown = render(<DataSourceDropdown {...props}></DataSourceDropdown>);
-  const searchBox = dropdown.container.querySelector('input');
-  expect(searchBox).toBeInTheDocument();
-  await user.click(searchBox!);
-}
-
-jest.mock('@grafana/runtime', () => {
-  const actual = jest.requireActual('@grafana/runtime');
-  return {
-    ...actual,
-    getTemplateSrv: () => {
-      return {
-        getVariables: () => [{ id: 'foo', type: 'datasource' }],
-      };
-    },
-  };
-});
-
-jest.mock('@grafana/runtime/src/services/dataSourceSrv', () => {
-  return {
-    getDataSourceSrv: () => ({
-      getList: getListMock,
-      getInstanceSettings: getInstanceSettingsMock,
-    }),
-  };
-});
-
-const pushRecentlyUsedDataSourceMock = jest.fn();
-jest.mock('../../hooks', () => {
-  const actual = jest.requireActual('../../hooks');
-  return {
-    ...actual,
-    useRecentlyUsedDataSources: () => [[mockDS2.name], pushRecentlyUsedDataSourceMock],
-  };
-});
-
-beforeAll(() => {
-  window.HTMLElement.prototype.scrollIntoView = jest.fn();
-});
-
-const getListMock = jest.fn();
-const getInstanceSettingsMock = jest.fn();
-beforeEach(() => {
-  getListMock.mockReturnValue(mockDSList);
-  getInstanceSettingsMock.mockReturnValue(mockDS1);
-});
-
-describe('DataSourceDropdown', () => {
-  it('should render', () => {
-    expect(() => render(<DataSourceDropdown onChange={jest.fn()}></DataSourceDropdown>)).not.toThrow();
-  });
-
-  describe('configuration', () => {
-    const user = userEvent.setup();
-
-    it('should fetch the DS applying the correct filters consistently across lists', async () => {
-      const filters = {
-        mixed: true,
-        tracing: true,
-        dashboard: true,
-        metrics: true,
-        type: 'foo',
-        annotations: true,
-        variables: true,
-        alerting: true,
-        pluginId: 'pluginid',
-        logs: true,
-      };
-
-      const props = {
-        onChange: () => {},
-        current: mockDS1.name,
-        ...filters,
-      };
-
-      render(
-        <ModalsProvider>
-          <DataSourceDropdown {...props}></DataSourceDropdown>
-          <ModalRoot />
-        </ModalsProvider>
-      );
-
-      const searchBox = await screen.findByRole('textbox');
-      expect(searchBox).toBeInTheDocument();
-
-      getListMock.mockClear();
-      await user.click(searchBox!);
-      await user.click(await screen.findByText('Open advanced data source picker'));
-      expect(await screen.findByText('Select data source')); //Data source modal is open
-      // Every call to the service must contain same filters
-      getListMock.mock.calls.forEach((call) =>
-        expect(call[0]).toMatchObject({
-          ...filters,
-        })
-      );
-    });
-
-    it('should display the current selected DS in the selector', async () => {
-      getInstanceSettingsMock.mockReturnValue(mockDS2);
-      render(<DataSourceDropdown onChange={jest.fn()} current={mockDS2}></DataSourceDropdown>);
-      expect(screen.getByTestId(selectors.components.DataSourcePicker.inputV2)).toHaveAttribute(
-        'placeholder',
-        mockDS2.name
-      );
-      expect(screen.getByAltText(`${mockDS2.meta.name} logo`)).toBeVisible();
-    });
-
-    it('should display the current ds on top', async () => {
-      //Mock ds is set as current, it appears on top
-      getInstanceSettingsMock.mockReturnValue(mockDS1);
-      await setupOpenDropdown(user, { onChange: jest.fn(), current: mockDS1.name });
-      let cards = await screen.findAllByTestId('data-source-card');
-      expect(await findByText(cards[0], mockDS1.name, { selector: 'span' })).toBeInTheDocument();
-
-      //xMock ds is set as current, it appears on top
-      getInstanceSettingsMock.mockReturnValue(mockDS2);
-      await setupOpenDropdown(user, { onChange: jest.fn(), current: mockDS2.name });
-      cards = await screen.findAllByTestId('data-source-card');
-      expect(await findByText(cards[0], mockDS2.name, { selector: 'span' })).toBeInTheDocument();
-    });
-
-    it('should display the default DS as selected when `current` is not set', async () => {
-      getInstanceSettingsMock.mockReturnValue(mockDS2);
-      render(<DataSourceDropdown onChange={jest.fn()} current={undefined}></DataSourceDropdown>);
-      expect(screen.getByTestId(selectors.components.DataSourcePicker.inputV2)).toHaveAttribute(
-        'placeholder',
-        mockDS2.name
-      );
-      expect(screen.getByAltText(`${mockDS2.meta.name} logo`)).toBeVisible();
-    });
-
-    it('should get the sorting function using the correct parameters', async () => {
-      //The actual sorting is tested in utils.test but let's make sure we're calling getDataSourceCompareFn with the correct parameters
-      const spy = jest.spyOn(utils, 'getDataSourceCompareFn');
-      await setupOpenDropdown(user, { onChange: jest.fn(), current: mockDS1 });
-
-      expect(spy.mock.lastCall).toEqual([mockDS1, [mockDS2.name], ['${foo}']]);
-    });
-
-    it('should disable the dropdown when `disabled` is true', () => {
-      render(<DataSourceDropdown onChange={jest.fn()} disabled></DataSourceDropdown>);
-      expect(screen.getByTestId(selectors.components.DataSourcePicker.inputV2)).toBeDisabled();
-    });
-
-    it('should assign the correct `id` to the input element to pair it with a label', () => {
-      render(<DataSourceDropdown onChange={jest.fn()} inputId={'custom.input.id'}></DataSourceDropdown>);
-      expect(screen.getByTestId(selectors.components.DataSourcePicker.inputV2)).toHaveAttribute(
-        'id',
-        'custom.input.id'
-      );
-    });
-
-    it('should not set the default DS when setting `noDefault` to true and `current` is not provided', () => {
-      render(<DataSourceDropdown onChange={jest.fn()} current={null} noDefault></DataSourceDropdown>);
-      getListMock.mockClear();
-      getInstanceSettingsMock.mockClear();
-      // Doesn't try to get the default DS
-      expect(getListMock).not.toBeCalled();
-      expect(getInstanceSettingsMock).not.toBeCalled();
-      expect(screen.getByTestId(selectors.components.DataSourcePicker.inputV2)).toHaveAttribute(
-        'placeholder',
-        'Select data source'
-      );
-    });
-  });
-
-  describe('interactions', () => {
-    const user = userEvent.setup();
-
-    it('should open when clicked', async () => {
-      await setupOpenDropdown(user, { onChange: jest.fn() });
-      expect(await screen.findByText(mockDS1.name, { selector: 'span' })).toBeInTheDocument();
-    });
-
-    it('should call onChange when a data source is clicked', async () => {
-      const onChange = jest.fn();
-      await setupOpenDropdown(user, { onChange });
-
-      await user.click(await screen.findByText(mockDS2.name, { selector: 'span' }));
-      expect(onChange.mock.lastCall[0]['name']).toEqual(mockDS2.name);
-      expect(screen.queryByText(mockDS1.name, { selector: 'span' })).toBeNull();
-    });
-
-    it('should not call onChange when the currently selected data source is clicked', async () => {
-      const onChange = jest.fn();
-      await setupOpenDropdown(user, { onChange });
-
-      await user.click(await screen.findByText(mockDS1.name, { selector: 'span' }));
-      expect(onChange).not.toBeCalled();
-    });
-
-    it('should push recently used datasources when a data source is clicked', async () => {
-      const onChange = jest.fn();
-      await setupOpenDropdown(user, { onChange });
-
-      await user.click(await screen.findByText(mockDS2.name, { selector: 'span' }));
-      expect(pushRecentlyUsedDataSourceMock.mock.lastCall[0]).toEqual(mockDS2);
-    });
-
-    it('should be navigatable by keyboard', async () => {
-      const onChange = jest.fn();
-      await setupOpenDropdown(user, { onChange });
-
-      await user.keyboard('[ArrowDown]');
-      //Arrow down, second item is selected
-      const xMockDSElement = getCard(await screen.findByText(mockDS2.name, { selector: 'span' }));
-      expect(xMockDSElement?.dataset.selecteditem).toEqual('true');
-      let mockDSElement = getCard(await screen.findByText(mockDS1.name, { selector: 'span' }));
-      expect(mockDSElement?.dataset.selecteditem).toEqual('false');
-
-      await user.keyboard('[ArrowUp]');
-      //Arrow up, first item is selected again
-      mockDSElement = getCard(await screen.findByText(mockDS1.name, { selector: 'span' }));
-      expect(mockDSElement?.dataset.selecteditem).toEqual('true');
-
-      await user.keyboard('[ArrowDown]');
-      await user.keyboard('[Enter]');
-      //Arrow down to navigate to xMock, enter to select it. Assert onChange called with correct DS and dropdown closed.
-      expect(onChange.mock.lastCall[0]['name']).toEqual(mockDS2.name);
-      expect(screen.queryByText(mockDS1.name, { selector: 'span' })).toBeNull();
-    });
-
-    it('should be searchable', async () => {
-      await setupOpenDropdown(user, { onChange: jest.fn() });
-
-      await user.keyboard(mockDS2.name); //Search for xMockDS
-
-      expect(screen.queryByText(mockDS1.name, { selector: 'span' })).toBeNull();
-      const xMockCard = getCard(await screen.findByText(mockDS2.name, { selector: 'span' }));
-      expect(xMockCard).toBeInTheDocument();
-
-      expect(xMockCard?.dataset.selecteditem).toEqual('true'); //The first search result is selected
-
-      await user.keyboard('foobarbaz'); //Search for a DS that should not exist
-
-      expect(await screen.findByText('Configure a new data source')).toBeInTheDocument();
-    });
-
-    it('should call onChange with the default query when add csv is clicked', async () => {
-      config.featureToggles.editPanelCSVDragAndDrop = true;
-      const onChange = jest.fn();
-      await setupOpenDropdown(user, { onChange, uploadFile: true });
-
-      await user.click(await screen.findByText('Add csv or spreadsheet'));
-
-      expect(onChange.mock.lastCall[1]).toEqual([defaultFileUploadQuery]);
-      expect(screen.queryByText('Open advanced data source picker')).toBeNull(); //Drop down is closed
-      config.featureToggles.editPanelCSVDragAndDrop = false;
-    });
-
-    it('should open the modal when open advanced is clicked', async () => {
-      const props = { onChange: jest.fn(), current: mockDS1.name };
-      render(
-        <ModalsProvider>
-          <DataSourceDropdown {...props}></DataSourceDropdown>
-          <ModalRoot />
-        </ModalsProvider>
-      );
-
-      const searchBox = await screen.findByRole('textbox');
-      expect(searchBox).toBeInTheDocument();
-      await user.click(searchBox!);
-      await user.click(await screen.findByText('Open advanced data source picker'));
-      expect(await screen.findByText('Select data source')); //Data source modal is open
-      expect(screen.queryByText('Open advanced data source picker')).toBeNull(); //Drop down is closed
-    });
-  });
-});
-
-function getCard(element: HTMLElement) {
-  return element.parentElement?.parentElement?.parentElement?.parentElement;
-}
diff --git a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx b/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
deleted file mode 100644
index b109b63cf3405..0000000000000
--- a/public/app/features/datasources/components/picker/DataSourceDropdown.tsx
+++ /dev/null
@@ -1,437 +0,0 @@
-import { css } from '@emotion/css';
-import { useDialog } from '@react-aria/dialog';
-import { FocusScope } from '@react-aria/focus';
-import { useOverlay } from '@react-aria/overlays';
-import React, { useCallback, useEffect, useRef, useState } from 'react';
-import { usePopper } from 'react-popper';
-import { Observable } from 'rxjs';
-
-import { DataSourceInstanceSettings, GrafanaTheme2 } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
-import { reportInteraction } from '@grafana/runtime';
-import { DataQuery, DataSourceRef } from '@grafana/schema';
-import { Button, CustomScrollbar, Icon, Input, ModalsController, Portal, useStyles2 } from '@grafana/ui';
-import config from 'app/core/config';
-import { Trans } from 'app/core/internationalization';
-import { useKeyNavigationListener } from 'app/features/search/hooks/useSearchKeyboardSelection';
-import { defaultFileUploadQuery, GrafanaQuery } from 'app/plugins/datasource/grafana/types';
-
-import { useDatasource } from '../../hooks';
-
-import { DataSourceList } from './DataSourceList';
-import { DataSourceLogo, DataSourceLogoPlaceHolder } from './DataSourceLogo';
-import { DataSourceModal } from './DataSourceModal';
-import { applyMaxSize, maxSize } from './popperModifiers';
-import { dataSourceLabel, matchDataSourceWithSearch } from './utils';
-
-const INTERACTION_EVENT_NAME = 'dashboards_dspicker_clicked';
-const INTERACTION_ITEM = {
-  OPEN_DROPDOWN: 'open_dspicker',
-  SELECT_DS: 'select_ds',
-  ADD_FILE: 'add_file',
-  OPEN_ADVANCED_DS_PICKER: 'open_advanced_ds_picker',
-  CONFIG_NEW_DS_EMPTY_STATE: 'config_new_ds_empty_state',
-};
-
-export interface DataSourceDropdownProps {
-  onChange: (ds: DataSourceInstanceSettings, defaultQueries?: DataQuery[] | GrafanaQuery[]) => void;
-  current?: DataSourceInstanceSettings | string | DataSourceRef | null;
-  recentlyUsed?: string[];
-  hideTextValue?: boolean;
-  width?: number;
-  inputId?: string;
-  noDefault?: boolean;
-  disabled?: boolean;
-  placeholder?: string;
-
-  // DS filters
-  tracing?: boolean;
-  mixed?: boolean;
-  dashboard?: boolean;
-  metrics?: boolean;
-  type?: string | string[];
-  annotations?: boolean;
-  variables?: boolean;
-  alerting?: boolean;
-  pluginId?: string;
-  logs?: boolean;
-  uploadFile?: boolean;
-  filter?: (ds: DataSourceInstanceSettings) => boolean;
-}
-
-export function DataSourceDropdown(props: DataSourceDropdownProps) {
-  const {
-    current,
-    onChange,
-    hideTextValue = false,
-    width,
-    inputId,
-    noDefault = false,
-    disabled = false,
-    placeholder = 'Select data source',
-    ...restProps
-  } = props;
-
-  const styles = useStyles2(getStylesDropdown, props);
-  const [isOpen, setOpen] = useState(false);
-  const [inputHasFocus, setInputHasFocus] = useState(false);
-  const [filterTerm, setFilterTerm] = useState<string>('');
-  const { onKeyDown, keyboardEvents } = useKeyNavigationListener();
-  const ref = useRef<HTMLDivElement>(null);
-
-  // Used to position the popper correctly and to bring back the focus when navigating from footer to input
-  const [markerElement, setMarkerElement] = useState<HTMLInputElement | null>();
-  // Used to position the popper correctly
-  const [selectorElement, setSelectorElement] = useState<HTMLDivElement | null>();
-  // Used to move the focus to the footer when tabbing from the input
-  const [footerRef, setFooterRef] = useState<HTMLElement | null>();
-  const currentDataSourceInstanceSettings = useDatasource(current);
-  const grafanaDS = useDatasource('-- Grafana --');
-  const currentValue = Boolean(!current && noDefault) ? undefined : currentDataSourceInstanceSettings;
-  const prefixIcon =
-    filterTerm && isOpen ? <DataSourceLogoPlaceHolder /> : <DataSourceLogo dataSource={currentValue} />;
-
-  const popper = usePopper(markerElement, selectorElement, {
-    placement: 'bottom-start',
-    modifiers: [
-      {
-        name: 'offset',
-        options: {
-          offset: [0, 4],
-        },
-      },
-      maxSize,
-      applyMaxSize,
-    ],
-  });
-
-  const onClose = useCallback(() => {
-    setFilterTerm('');
-    setOpen(false);
-    markerElement?.focus();
-  }, [setOpen, markerElement]);
-
-  const { overlayProps, underlayProps } = useOverlay(
-    {
-      onClose: onClose,
-      isDismissable: true,
-      isOpen,
-      shouldCloseOnInteractOutside: (element) => {
-        return markerElement ? !markerElement.isSameNode(element) : false;
-      },
-    },
-    ref
-  );
-  const { dialogProps } = useDialog(
-    {
-      'aria-label': 'Opened data source picker list',
-    },
-    ref
-  );
-
-  function openDropdown() {
-    reportInteraction(INTERACTION_EVENT_NAME, { item: INTERACTION_ITEM.OPEN_DROPDOWN });
-    setOpen(true);
-    markerElement?.focus();
-  }
-
-  function onClickAddCSV() {
-    if (!grafanaDS) {
-      return;
-    }
-
-    onChange(grafanaDS, [defaultFileUploadQuery]);
-  }
-
-  function onKeyDownInput(keyEvent: React.KeyboardEvent<HTMLInputElement>) {
-    // From the input, it navigates to the footer
-    if (keyEvent.key === 'Tab' && !keyEvent.shiftKey && isOpen) {
-      keyEvent.preventDefault();
-      footerRef?.focus();
-    }
-    // From the input, if we navigate back, it closes the dropdown
-    if (keyEvent.key === 'Tab' && keyEvent.shiftKey && isOpen) {
-      onClose();
-    }
-    onKeyDown(keyEvent);
-  }
-
-  function onNavigateOutsiteFooter(e: React.KeyboardEvent<HTMLButtonElement>) {
-    // When navigating back, the dropdown keeps open and the input element is focused.
-    if (e.shiftKey) {
-      e.preventDefault();
-      markerElement?.focus();
-      // When navigating forward, the dropdown closes and and the element next to the input element is focused.
-    } else {
-      onClose();
-    }
-  }
-
-  useEffect(() => {
-    const sub = keyboardEvents.subscribe({
-      next: (keyEvent) => {
-        switch (keyEvent?.code) {
-          case 'ArrowDown':
-            openDropdown();
-            keyEvent.preventDefault();
-            break;
-          case 'ArrowUp':
-            openDropdown();
-            keyEvent.preventDefault();
-            break;
-          case 'Escape':
-            onClose();
-            keyEvent.preventDefault();
-            break;
-        }
-      },
-    });
-    return () => sub.unsubscribe();
-  });
-
-  return (
-    <div className={styles.container} data-testid={selectors.components.DataSourcePicker.container}>
-      {/* This clickable div is just extending the clickable area on the input element to include the prefix and suffix. */}
-      {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions */}
-      <div className={styles.trigger} onClick={openDropdown}>
-        <Input
-          id={inputId || 'data-source-picker'}
-          className={inputHasFocus ? undefined : styles.input}
-          data-testid={selectors.components.DataSourcePicker.inputV2}
-          aria-label="Select a data source"
-          autoComplete="off"
-          prefix={currentValue ? prefixIcon : undefined}
-          suffix={<Icon name={isOpen ? 'search' : 'angle-down'} />}
-          placeholder={hideTextValue ? '' : dataSourceLabel(currentValue) || placeholder}
-          onFocus={() => {
-            setInputHasFocus(true);
-          }}
-          onBlur={() => {
-            setInputHasFocus(false);
-          }}
-          onKeyDown={onKeyDownInput}
-          value={filterTerm}
-          onChange={(e) => {
-            openDropdown();
-            setFilterTerm(e.currentTarget.value);
-          }}
-          ref={setMarkerElement}
-          disabled={disabled}
-        ></Input>
-      </div>
-      {isOpen ? (
-        <Portal>
-          <div {...underlayProps} />
-          <div ref={ref} {...overlayProps} {...dialogProps}>
-            <PickerContent
-              {...restProps}
-              {...popper.attributes.popper}
-              style={popper.styles.popper}
-              ref={setSelectorElement}
-              footerRef={setFooterRef}
-              current={currentValue}
-              filterTerm={filterTerm}
-              keyboardEvents={keyboardEvents}
-              onChange={(ds: DataSourceInstanceSettings, defaultQueries?: DataQuery[] | GrafanaQuery[]) => {
-                onClose();
-                if (ds.uid !== currentValue?.uid) {
-                  onChange(ds, defaultQueries);
-                  reportInteraction(INTERACTION_EVENT_NAME, { item: INTERACTION_ITEM.SELECT_DS, ds_type: ds.type });
-                }
-              }}
-              onClose={onClose}
-              onClickAddCSV={onClickAddCSV}
-              onDismiss={onClose}
-              onNavigateOutsiteFooter={onNavigateOutsiteFooter}
-            />
-          </div>
-        </Portal>
-      ) : null}
-    </div>
-  );
-}
-
-function getStylesDropdown(theme: GrafanaTheme2, props: DataSourceDropdownProps) {
-  return {
-    container: css`
-      position: relative;
-      cursor: ${props.disabled ? 'not-allowed' : 'pointer'};
-      width: ${theme.spacing(props.width || 'auto')};
-    `,
-    trigger: css`
-      cursor: pointer;
-      ${props.disabled && `pointer-events: none;`}
-    `,
-    input: css`
-      input::placeholder {
-        color: ${props.disabled ? theme.colors.action.disabledText : theme.colors.text.primary};
-      }
-    `,
-  };
-}
-
-export interface PickerContentProps extends DataSourceDropdownProps {
-  onClickAddCSV?: () => void;
-  keyboardEvents: Observable<React.KeyboardEvent>;
-  style: React.CSSProperties;
-  filterTerm?: string;
-  onClose: () => void;
-  onDismiss: () => void;
-  footerRef: (element: HTMLElement | null) => void;
-  onNavigateOutsiteFooter: (e: React.KeyboardEvent<HTMLButtonElement>) => void;
-}
-
-const PickerContent = React.forwardRef<HTMLDivElement, PickerContentProps>((props, ref) => {
-  const { filterTerm, onChange, onClose, onClickAddCSV, current, filter } = props;
-
-  const changeCallback = useCallback(
-    (ds: DataSourceInstanceSettings) => {
-      onChange(ds);
-    },
-    [onChange]
-  );
-
-  const clickAddCSVCallback = useCallback(() => {
-    onClickAddCSV?.();
-    onClose();
-    reportInteraction(INTERACTION_EVENT_NAME, { item: INTERACTION_ITEM.ADD_FILE });
-  }, [onClickAddCSV, onClose]);
-
-  const styles = useStyles2(getStylesPickerContent);
-
-  return (
-    <div style={props.style} ref={ref} className={styles.container}>
-      <CustomScrollbar>
-        <DataSourceList
-          {...props}
-          enableKeyboardNavigation
-          className={styles.dataSourceList}
-          current={current}
-          onChange={changeCallback}
-          filter={(ds) => (filter ? filter?.(ds) : true) && matchDataSourceWithSearch(ds, filterTerm)}
-          onClickEmptyStateCTA={() =>
-            reportInteraction(INTERACTION_EVENT_NAME, {
-              item: INTERACTION_ITEM.CONFIG_NEW_DS_EMPTY_STATE,
-            })
-          }
-        ></DataSourceList>
-      </CustomScrollbar>
-      <FocusScope>
-        <Footer
-          {...props}
-          onClickAddCSV={clickAddCSVCallback}
-          onChange={changeCallback}
-          onNavigateOutsiteFooter={props.onNavigateOutsiteFooter}
-        />
-      </FocusScope>
-    </div>
-  );
-});
-PickerContent.displayName = 'PickerContent';
-
-function getStylesPickerContent(theme: GrafanaTheme2) {
-  return {
-    container: css`
-      display: flex;
-      flex-direction: column;
-      background: ${theme.colors.background.primary};
-      box-shadow: ${theme.shadows.z3};
-    `,
-    picker: css`
-      background: ${theme.colors.background.secondary};
-    `,
-    dataSourceList: css`
-      flex: 1;
-    `,
-    footer: css`
-      flex: 0;
-      display: flex;
-      flex-direction: row-reverse;
-      justify-content: space-between;
-      padding: ${theme.spacing(1.5)};
-      border-top: 1px solid ${theme.colors.border.weak};
-      background-color: ${theme.colors.background.secondary};
-    `,
-  };
-}
-
-export interface FooterProps extends PickerContentProps {}
-
-function Footer({ onClose, onChange, onClickAddCSV, ...props }: FooterProps) {
-  const styles = useStyles2(getStylesFooter);
-  const isUploadFileEnabled = props.uploadFile && config.featureToggles.editPanelCSVDragAndDrop;
-
-  const onKeyDownLastButton = (e: React.KeyboardEvent<HTMLButtonElement>) => {
-    if (e.key === 'Tab') {
-      props.onNavigateOutsiteFooter(e);
-    }
-  };
-  const onKeyDownFirstButton = (e: React.KeyboardEvent<HTMLButtonElement>) => {
-    if (e.key === 'Tab' && e.shiftKey) {
-      props.onNavigateOutsiteFooter(e);
-    }
-  };
-
-  return (
-    <div className={styles.footer}>
-      <ModalsController>
-        {({ showModal, hideModal }) => (
-          <Button
-            size="sm"
-            variant="secondary"
-            fill="text"
-            onClick={() => {
-              onClose();
-              showModal(DataSourceModal, {
-                reportedInteractionFrom: 'ds_picker',
-                tracing: props.tracing,
-                dashboard: props.dashboard,
-                mixed: props.mixed,
-                metrics: props.metrics,
-                type: props.type,
-                annotations: props.annotations,
-                variables: props.variables,
-                alerting: props.alerting,
-                pluginId: props.pluginId,
-                logs: props.logs,
-                filter: props.filter,
-                uploadFile: props.uploadFile,
-                current: props.current,
-                onDismiss: hideModal,
-                onChange: (ds, defaultQueries) => {
-                  onChange(ds, defaultQueries);
-                  hideModal();
-                },
-              });
-              reportInteraction(INTERACTION_EVENT_NAME, { item: INTERACTION_ITEM.OPEN_ADVANCED_DS_PICKER });
-            }}
-            ref={props.footerRef}
-            onKeyDown={isUploadFileEnabled ? onKeyDownFirstButton : onKeyDownLastButton}
-          >
-            <Trans i18nKey="data-source-picker.open-advanced-button">Open advanced data source picker</Trans>
-            <Icon name="arrow-right" />
-          </Button>
-        )}
-      </ModalsController>
-      {isUploadFileEnabled && (
-        <Button variant="secondary" size="sm" onClick={onClickAddCSV} onKeyDown={onKeyDownLastButton}>
-          Add csv or spreadsheet
-        </Button>
-      )}
-    </div>
-  );
-}
-
-function getStylesFooter(theme: GrafanaTheme2) {
-  return {
-    footer: css`
-      flex: 0;
-      display: flex;
-      flex-direction: row-reverse;
-      justify-content: space-between;
-      padding: ${theme.spacing(1.5)};
-      border-top: 1px solid ${theme.colors.border.weak};
-      background-color: ${theme.colors.background.secondary};
-    `,
-  };
-}
diff --git a/public/app/features/datasources/components/picker/DataSourceList.tsx b/public/app/features/datasources/components/picker/DataSourceList.tsx
index df286934acb0e..0d2238a882019 100644
--- a/public/app/features/datasources/components/picker/DataSourceList.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceList.tsx
@@ -3,6 +3,7 @@ import React, { useRef } from 'react';
 import { Observable } from 'rxjs';
 
 import { DataSourceInstanceSettings, DataSourceRef, GrafanaTheme2 } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import { getTemplateSrv } from '@grafana/runtime';
 import { useStyles2, useTheme2 } from '@grafana/ui';
 import { Trans } from 'app/core/internationalization';
@@ -72,7 +73,11 @@ export function DataSourceList(props: DataSourceListProps) {
   const filteredDataSources = props.filter ? dataSources.filter(props.filter) : dataSources;
 
   return (
-    <div ref={containerRef} className={cx(className, styles.container)} data-testid="data-sources-list">
+    <div
+      ref={containerRef}
+      className={cx(className, styles.container)}
+      data-testid={selectors.components.DataSourcePicker.dataSourceList}
+    >
       {filteredDataSources.length === 0 && (
         <EmptyState className={styles.emptyState} onClickCTA={onClickEmptyStateCTA} />
       )}
diff --git a/public/app/features/datasources/components/picker/DataSourcePicker.test.tsx b/public/app/features/datasources/components/picker/DataSourcePicker.test.tsx
new file mode 100644
index 0000000000000..c13140a43c3e8
--- /dev/null
+++ b/public/app/features/datasources/components/picker/DataSourcePicker.test.tsx
@@ -0,0 +1,320 @@
+import { findByText, render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { UserEvent } from '@testing-library/user-event/dist/types/setup/setup';
+import React from 'react';
+
+import { DataSourceInstanceSettings, DataSourcePluginMeta, PluginMetaInfo, PluginType } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { ModalRoot, ModalsProvider } from '@grafana/ui';
+import config from 'app/core/config';
+import { defaultFileUploadQuery } from 'app/plugins/datasource/grafana/types';
+
+import { DataSourcePicker, DataSourcePickerProps } from './DataSourcePicker';
+import * as utils from './utils';
+
+const pluginMetaInfo: PluginMetaInfo = {
+  author: { name: '' },
+  description: '',
+  screenshots: [],
+  version: '',
+  updated: '',
+  links: [],
+  logos: { small: '', large: '' },
+};
+
+function createPluginMeta(name: string, builtIn: boolean): DataSourcePluginMeta {
+  return { builtIn, name, id: name, type: PluginType.datasource, baseUrl: '', info: pluginMetaInfo, module: '' };
+}
+
+function createDS(name: string, id: number, builtIn: boolean): DataSourceInstanceSettings {
+  return {
+    name: name,
+    uid: name + 'uid',
+    meta: createPluginMeta(name, builtIn),
+    id,
+    access: 'direct',
+    jsonData: {},
+    type: '',
+    readOnly: true,
+  };
+}
+
+const mockDS1 = createDS('mock.datasource.1', 1, false);
+const mockDS2 = createDS('mock.datasource.2', 2, false);
+const MockDSBuiltIn = createDS('mock.datasource.builtin', 3, true);
+
+const mockDSList = [mockDS1, mockDS2, MockDSBuiltIn];
+
+async function setupOpenDropdown(user: UserEvent, props: DataSourcePickerProps) {
+  const dropdown = render(<DataSourcePicker {...props}></DataSourcePicker>);
+  const searchBox = dropdown.container.querySelector('input');
+  expect(searchBox).toBeInTheDocument();
+  await user.click(searchBox!);
+}
+
+jest.mock('@grafana/runtime', () => {
+  const actual = jest.requireActual('@grafana/runtime');
+  return {
+    ...actual,
+    getTemplateSrv: () => {
+      return {
+        getVariables: () => [{ id: 'foo', type: 'datasource' }],
+      };
+    },
+  };
+});
+
+jest.mock('@grafana/runtime/src/services/dataSourceSrv', () => {
+  return {
+    getDataSourceSrv: () => ({
+      getList: getListMock,
+      getInstanceSettings: getInstanceSettingsMock,
+    }),
+  };
+});
+
+const pushRecentlyUsedDataSourceMock = jest.fn();
+jest.mock('../../hooks', () => {
+  const actual = jest.requireActual('../../hooks');
+  return {
+    ...actual,
+    useRecentlyUsedDataSources: () => [[mockDS2.name], pushRecentlyUsedDataSourceMock],
+  };
+});
+
+beforeAll(() => {
+  window.HTMLElement.prototype.scrollIntoView = jest.fn();
+});
+
+const getListMock = jest.fn();
+const getInstanceSettingsMock = jest.fn();
+beforeEach(() => {
+  getListMock.mockReturnValue(mockDSList);
+  getInstanceSettingsMock.mockReturnValue(mockDS1);
+});
+
+describe('DataSourcePicker', () => {
+  it('should render', () => {
+    expect(() => render(<DataSourcePicker onChange={jest.fn()}></DataSourcePicker>)).not.toThrow();
+  });
+
+  describe('configuration', () => {
+    const user = userEvent.setup();
+
+    it('should fetch the DS applying the correct filters consistently across lists', async () => {
+      const filters = {
+        mixed: true,
+        tracing: true,
+        dashboard: true,
+        metrics: true,
+        type: 'foo',
+        annotations: true,
+        variables: true,
+        alerting: true,
+        pluginId: 'pluginid',
+        logs: true,
+      };
+
+      const props = {
+        onChange: () => {},
+        current: mockDS1.name,
+        ...filters,
+      };
+
+      render(
+        <ModalsProvider>
+          <DataSourcePicker {...props}></DataSourcePicker>
+          <ModalRoot />
+        </ModalsProvider>
+      );
+
+      const searchBox = await screen.findByRole('textbox');
+      expect(searchBox).toBeInTheDocument();
+
+      getListMock.mockClear();
+      await user.click(searchBox!);
+      await user.click(await screen.findByText('Open advanced data source picker'));
+      expect(await screen.findByText('Select data source')); //Data source modal is open
+      // Every call to the service must contain same filters
+      getListMock.mock.calls.forEach((call) =>
+        expect(call[0]).toMatchObject({
+          ...filters,
+        })
+      );
+    });
+
+    it('should display the current selected DS in the selector', async () => {
+      getInstanceSettingsMock.mockReturnValue(mockDS2);
+      render(<DataSourcePicker onChange={jest.fn()} current={mockDS2}></DataSourcePicker>);
+      expect(screen.getByTestId(selectors.components.DataSourcePicker.inputV2)).toHaveAttribute(
+        'placeholder',
+        mockDS2.name
+      );
+      expect(screen.getByAltText(`${mockDS2.meta.name} logo`)).toBeVisible();
+    });
+
+    it('should display the current ds on top', async () => {
+      //Mock ds is set as current, it appears on top
+      getInstanceSettingsMock.mockReturnValue(mockDS1);
+      await setupOpenDropdown(user, { onChange: jest.fn(), current: mockDS1.name });
+      let cards = await screen.findAllByTestId('data-source-card');
+      expect(await findByText(cards[0], mockDS1.name, { selector: 'span' })).toBeInTheDocument();
+
+      //xMock ds is set as current, it appears on top
+      getInstanceSettingsMock.mockReturnValue(mockDS2);
+      await setupOpenDropdown(user, { onChange: jest.fn(), current: mockDS2.name });
+      cards = await screen.findAllByTestId('data-source-card');
+      expect(await findByText(cards[0], mockDS2.name, { selector: 'span' })).toBeInTheDocument();
+    });
+
+    it('should display the default DS as selected when `current` is not set', async () => {
+      getInstanceSettingsMock.mockReturnValue(mockDS2);
+      render(<DataSourcePicker onChange={jest.fn()} current={undefined}></DataSourcePicker>);
+      expect(screen.getByTestId(selectors.components.DataSourcePicker.inputV2)).toHaveAttribute(
+        'placeholder',
+        mockDS2.name
+      );
+      expect(screen.getByAltText(`${mockDS2.meta.name} logo`)).toBeVisible();
+    });
+
+    it('should get the sorting function using the correct parameters', async () => {
+      //The actual sorting is tested in utils.test but let's make sure we're calling getDataSourceCompareFn with the correct parameters
+      const spy = jest.spyOn(utils, 'getDataSourceCompareFn');
+      await setupOpenDropdown(user, { onChange: jest.fn(), current: mockDS1 });
+
+      expect(spy.mock.lastCall).toEqual([mockDS1, [mockDS2.name], ['${foo}']]);
+    });
+
+    it('should disable the dropdown when `disabled` is true', () => {
+      render(<DataSourcePicker onChange={jest.fn()} disabled></DataSourcePicker>);
+      expect(screen.getByTestId(selectors.components.DataSourcePicker.inputV2)).toBeDisabled();
+    });
+
+    it('should assign the correct `id` to the input element to pair it with a label', () => {
+      render(<DataSourcePicker onChange={jest.fn()} inputId={'custom.input.id'}></DataSourcePicker>);
+      expect(screen.getByTestId(selectors.components.DataSourcePicker.inputV2)).toHaveAttribute(
+        'id',
+        'custom.input.id'
+      );
+    });
+
+    it('should not set the default DS when setting `noDefault` to true and `current` is not provided', () => {
+      render(<DataSourcePicker onChange={jest.fn()} current={null} noDefault></DataSourcePicker>);
+      getListMock.mockClear();
+      getInstanceSettingsMock.mockClear();
+      // Doesn't try to get the default DS
+      expect(getListMock).not.toBeCalled();
+      expect(getInstanceSettingsMock).not.toBeCalled();
+      expect(screen.getByTestId(selectors.components.DataSourcePicker.inputV2)).toHaveAttribute(
+        'placeholder',
+        'Select data source'
+      );
+    });
+  });
+
+  describe('interactions', () => {
+    const user = userEvent.setup();
+
+    it('should open when clicked', async () => {
+      await setupOpenDropdown(user, { onChange: jest.fn() });
+      expect(await screen.findByText(mockDS1.name, { selector: 'span' })).toBeInTheDocument();
+    });
+
+    it('should call onChange when a data source is clicked', async () => {
+      const onChange = jest.fn();
+      await setupOpenDropdown(user, { onChange });
+
+      await user.click(await screen.findByText(mockDS2.name, { selector: 'span' }));
+      expect(onChange.mock.lastCall[0]['name']).toEqual(mockDS2.name);
+      expect(screen.queryByText(mockDS1.name, { selector: 'span' })).toBeNull();
+    });
+
+    it('should not call onChange when the currently selected data source is clicked', async () => {
+      const onChange = jest.fn();
+      await setupOpenDropdown(user, { onChange });
+
+      await user.click(await screen.findByText(mockDS1.name, { selector: 'span' }));
+      expect(onChange).not.toBeCalled();
+    });
+
+    it('should push recently used datasources when a data source is clicked', async () => {
+      const onChange = jest.fn();
+      await setupOpenDropdown(user, { onChange });
+
+      await user.click(await screen.findByText(mockDS2.name, { selector: 'span' }));
+      expect(pushRecentlyUsedDataSourceMock.mock.lastCall[0]).toEqual(mockDS2);
+    });
+
+    it('should be navigatable by keyboard', async () => {
+      const onChange = jest.fn();
+      await setupOpenDropdown(user, { onChange });
+
+      await user.keyboard('[ArrowDown]');
+      //Arrow down, second item is selected
+      const xMockDSElement = getCard(await screen.findByText(mockDS2.name, { selector: 'span' }));
+      expect(xMockDSElement?.dataset.selecteditem).toEqual('true');
+      let mockDSElement = getCard(await screen.findByText(mockDS1.name, { selector: 'span' }));
+      expect(mockDSElement?.dataset.selecteditem).toEqual('false');
+
+      await user.keyboard('[ArrowUp]');
+      //Arrow up, first item is selected again
+      mockDSElement = getCard(await screen.findByText(mockDS1.name, { selector: 'span' }));
+      expect(mockDSElement?.dataset.selecteditem).toEqual('true');
+
+      await user.keyboard('[ArrowDown]');
+      await user.keyboard('[Enter]');
+      //Arrow down to navigate to xMock, enter to select it. Assert onChange called with correct DS and dropdown closed.
+      expect(onChange.mock.lastCall[0]['name']).toEqual(mockDS2.name);
+      expect(screen.queryByText(mockDS1.name, { selector: 'span' })).toBeNull();
+    });
+
+    it('should be searchable', async () => {
+      await setupOpenDropdown(user, { onChange: jest.fn() });
+
+      await user.keyboard(mockDS2.name); //Search for xMockDS
+
+      expect(screen.queryByText(mockDS1.name, { selector: 'span' })).toBeNull();
+      const xMockCard = getCard(await screen.findByText(mockDS2.name, { selector: 'span' }));
+      expect(xMockCard).toBeInTheDocument();
+
+      expect(xMockCard?.dataset.selecteditem).toEqual('true'); //The first search result is selected
+
+      await user.keyboard('foobarbaz'); //Search for a DS that should not exist
+
+      expect(await screen.findByText('Configure a new data source')).toBeInTheDocument();
+    });
+
+    it('should call onChange with the default query when add csv is clicked', async () => {
+      config.featureToggles.editPanelCSVDragAndDrop = true;
+      const onChange = jest.fn();
+      await setupOpenDropdown(user, { onChange, uploadFile: true });
+
+      await user.click(await screen.findByText('Add csv or spreadsheet'));
+
+      expect(onChange.mock.lastCall[1]).toEqual([defaultFileUploadQuery]);
+      expect(screen.queryByText('Open advanced data source picker')).toBeNull(); //Drop down is closed
+      config.featureToggles.editPanelCSVDragAndDrop = false;
+    });
+
+    it('should open the modal when open advanced is clicked', async () => {
+      const props = { onChange: jest.fn(), current: mockDS1.name };
+      render(
+        <ModalsProvider>
+          <DataSourcePicker {...props}></DataSourcePicker>
+          <ModalRoot />
+        </ModalsProvider>
+      );
+
+      const searchBox = await screen.findByRole('textbox');
+      expect(searchBox).toBeInTheDocument();
+      await user.click(searchBox!);
+      await user.click(await screen.findByText('Open advanced data source picker'));
+      expect(await screen.findByText('Select data source')); //Data source modal is open
+      expect(screen.queryByText('Open advanced data source picker')).toBeNull(); //Drop down is closed
+    });
+  });
+});
+
+function getCard(element: HTMLElement) {
+  return element.parentElement?.parentElement?.parentElement?.parentElement;
+}
diff --git a/public/app/features/datasources/components/picker/DataSourcePicker.tsx b/public/app/features/datasources/components/picker/DataSourcePicker.tsx
index 4c75756d49708..0441eeb2ab75a 100644
--- a/public/app/features/datasources/components/picker/DataSourcePicker.tsx
+++ b/public/app/features/datasources/components/picker/DataSourcePicker.tsx
@@ -1,24 +1,456 @@
-import React from 'react';
+import { css } from '@emotion/css';
+import { autoUpdate, flip, offset, shift, size, useFloating } from '@floating-ui/react';
+import { useDialog } from '@react-aria/dialog';
+import { FocusScope } from '@react-aria/focus';
+import { useOverlay } from '@react-aria/overlays';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { Observable } from 'rxjs';
 
-import {
-  DataSourcePicker as DeprecatedDataSourcePicker,
-  DataSourcePickerProps as DeprecatedDataSourcePickerProps,
-} from '@grafana/runtime';
-import { config } from 'app/core/config';
+import { DataSourceInstanceSettings, GrafanaTheme2 } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { reportInteraction } from '@grafana/runtime';
+import { DataQuery, DataSourceRef } from '@grafana/schema';
+import { Button, CustomScrollbar, Icon, Input, ModalsController, Portal, useStyles2 } from '@grafana/ui';
+import config from 'app/core/config';
+import { Trans } from 'app/core/internationalization';
+import { useKeyNavigationListener } from 'app/features/search/hooks/useSearchKeyboardSelection';
+import { defaultFileUploadQuery, GrafanaQuery } from 'app/plugins/datasource/grafana/types';
 
-import { DataSourceDropdown, DataSourceDropdownProps } from './DataSourceDropdown';
+import { useDatasource } from '../../hooks';
 
-type DataSourcePickerProps = DeprecatedDataSourcePickerProps | DataSourceDropdownProps;
+import { DataSourceList } from './DataSourceList';
+import { DataSourceLogo, DataSourceLogoPlaceHolder } from './DataSourceLogo';
+import { DataSourceModal } from './DataSourceModal';
+import { dataSourceLabel, matchDataSourceWithSearch } from './utils';
+
+const INTERACTION_EVENT_NAME = 'dashboards_dspicker_clicked';
+const INTERACTION_ITEM = {
+  OPEN_DROPDOWN: 'open_dspicker',
+  SELECT_DS: 'select_ds',
+  ADD_FILE: 'add_file',
+  OPEN_ADVANCED_DS_PICKER: 'open_advanced_ds_picker',
+  CONFIG_NEW_DS_EMPTY_STATE: 'config_new_ds_empty_state',
+};
+
+export interface DataSourcePickerProps {
+  onChange: (ds: DataSourceInstanceSettings, defaultQueries?: DataQuery[] | GrafanaQuery[]) => void;
+  current?: DataSourceInstanceSettings | string | DataSourceRef | null;
+  recentlyUsed?: string[];
+  hideTextValue?: boolean;
+  width?: number;
+  inputId?: string;
+  noDefault?: boolean;
+  disabled?: boolean;
+  placeholder?: string;
+
+  // DS filters
+  tracing?: boolean;
+  mixed?: boolean;
+  dashboard?: boolean;
+  metrics?: boolean;
+  type?: string | string[];
+  annotations?: boolean;
+  variables?: boolean;
+  alerting?: boolean;
+  pluginId?: string;
+  logs?: boolean;
+  uploadFile?: boolean;
+  filter?: (ds: DataSourceInstanceSettings) => boolean;
+}
 
-/**
- * DataSourcePicker is a wrapper around the old DataSourcePicker and the new one.
- * Depending on the feature toggle, it will render the old or the new one.
- * Feature toggle: advancedDataSourcePicker
- */
 export function DataSourcePicker(props: DataSourcePickerProps) {
-  return !config.featureToggles.advancedDataSourcePicker ? (
-    <DeprecatedDataSourcePicker {...props} />
-  ) : (
-    <DataSourceDropdown {...props} />
+  const {
+    current,
+    onChange,
+    hideTextValue = false,
+    width,
+    inputId,
+    noDefault = false,
+    disabled = false,
+    placeholder = 'Select data source',
+    ...restProps
+  } = props;
+
+  const styles = useStyles2(getStylesDropdown, props);
+  const [isOpen, setOpen] = useState(false);
+  const [inputHasFocus, setInputHasFocus] = useState(false);
+  const [filterTerm, setFilterTerm] = useState<string>('');
+  const { onKeyDown, keyboardEvents } = useKeyNavigationListener();
+  const ref = useRef<HTMLDivElement>(null);
+
+  // Used to position the popper correctly and to bring back the focus when navigating from footer to input
+  const [markerElement, setMarkerElement] = useState<HTMLInputElement | null>();
+  // Used to move the focus to the footer when tabbing from the input
+  const [footerRef, setFooterRef] = useState<HTMLElement | null>();
+  const currentDataSourceInstanceSettings = useDatasource(current);
+  const grafanaDS = useDatasource('-- Grafana --');
+  const currentValue = Boolean(!current && noDefault) ? undefined : currentDataSourceInstanceSettings;
+  const prefixIcon =
+    filterTerm && isOpen ? <DataSourceLogoPlaceHolder /> : <DataSourceLogo dataSource={currentValue} />;
+
+  // the order of middleware is important!
+  const middleware = [
+    offset(4),
+    size({
+      apply({ availableHeight, elements }) {
+        const margin = 20;
+        const minSize = 200;
+        elements.floating.style.maxHeight = `${Math.max(minSize, availableHeight - margin)}px`;
+        elements.floating.style.minHeight = `${minSize}px`;
+      },
+    }),
+    flip({
+      fallbackStrategy: 'initialPlacement',
+      // see https://floating-ui.com/docs/flip#combining-with-shift
+      crossAxis: false,
+      boundary: document.body,
+    }),
+    shift(),
+  ];
+
+  const { refs, floatingStyles } = useFloating({
+    open: isOpen,
+    placement: 'bottom-start',
+    onOpenChange: setOpen,
+    middleware,
+    whileElementsMounted: autoUpdate,
+    strategy: 'fixed',
+  });
+
+  const handleReference = useCallback(
+    (element: HTMLInputElement | null) => {
+      refs.setReference(element);
+      setMarkerElement(element);
+    },
+    [refs]
+  );
+
+  const onClose = useCallback(() => {
+    setFilterTerm('');
+    setOpen(false);
+    markerElement?.focus();
+  }, [setOpen, markerElement]);
+
+  const { overlayProps, underlayProps } = useOverlay(
+    {
+      onClose: onClose,
+      isDismissable: true,
+      isOpen,
+      shouldCloseOnInteractOutside: (element) => {
+        return markerElement ? !markerElement.isSameNode(element) : false;
+      },
+    },
+    ref
+  );
+  const { dialogProps } = useDialog(
+    {
+      'aria-label': 'Opened data source picker list',
+    },
+    ref
+  );
+
+  function openDropdown() {
+    reportInteraction(INTERACTION_EVENT_NAME, { item: INTERACTION_ITEM.OPEN_DROPDOWN });
+    setOpen(true);
+    markerElement?.focus();
+  }
+
+  function onClickAddCSV() {
+    if (!grafanaDS) {
+      return;
+    }
+
+    onChange(grafanaDS, [defaultFileUploadQuery]);
+  }
+
+  function onKeyDownInput(keyEvent: React.KeyboardEvent<HTMLInputElement>) {
+    // From the input, it navigates to the footer
+    if (keyEvent.key === 'Tab' && !keyEvent.shiftKey && isOpen) {
+      keyEvent.preventDefault();
+      footerRef?.focus();
+    }
+    // From the input, if we navigate back, it closes the dropdown
+    if (keyEvent.key === 'Tab' && keyEvent.shiftKey && isOpen) {
+      onClose();
+    }
+    onKeyDown(keyEvent);
+  }
+
+  function onNavigateOutsiteFooter(e: React.KeyboardEvent<HTMLButtonElement>) {
+    // When navigating back, the dropdown keeps open and the input element is focused.
+    if (e.shiftKey) {
+      e.preventDefault();
+      markerElement?.focus();
+      // When navigating forward, the dropdown closes and and the element next to the input element is focused.
+    } else {
+      onClose();
+    }
+  }
+
+  useEffect(() => {
+    const sub = keyboardEvents.subscribe({
+      next: (keyEvent) => {
+        switch (keyEvent?.code) {
+          case 'ArrowDown':
+            openDropdown();
+            keyEvent.preventDefault();
+            break;
+          case 'ArrowUp':
+            openDropdown();
+            keyEvent.preventDefault();
+            break;
+          case 'Escape':
+            onClose();
+            keyEvent.preventDefault();
+            break;
+        }
+      },
+    });
+    return () => sub.unsubscribe();
+  });
+
+  return (
+    <div className={styles.container} data-testid={selectors.components.DataSourcePicker.container}>
+      {/* This clickable div is just extending the clickable area on the input element to include the prefix and suffix. */}
+      {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions */}
+      <div className={styles.trigger} onClick={openDropdown}>
+        <Input
+          id={inputId || 'data-source-picker'}
+          className={inputHasFocus ? undefined : styles.input}
+          data-testid={selectors.components.DataSourcePicker.inputV2}
+          aria-label="Select a data source"
+          autoComplete="off"
+          prefix={currentValue ? prefixIcon : undefined}
+          suffix={<Icon name={isOpen ? 'search' : 'angle-down'} />}
+          placeholder={hideTextValue ? '' : dataSourceLabel(currentValue) || placeholder}
+          onFocus={() => {
+            setInputHasFocus(true);
+          }}
+          onBlur={() => {
+            setInputHasFocus(false);
+          }}
+          onKeyDown={onKeyDownInput}
+          value={filterTerm}
+          onChange={(e) => {
+            openDropdown();
+            setFilterTerm(e.currentTarget.value);
+          }}
+          ref={handleReference}
+          disabled={disabled}
+        ></Input>
+      </div>
+      {isOpen ? (
+        <Portal>
+          <div {...underlayProps} />
+          <div ref={ref} {...overlayProps} {...dialogProps}>
+            <PickerContent
+              {...restProps}
+              style={floatingStyles}
+              ref={refs.setFloating}
+              footerRef={setFooterRef}
+              current={currentValue}
+              filterTerm={filterTerm}
+              keyboardEvents={keyboardEvents}
+              onChange={(ds: DataSourceInstanceSettings, defaultQueries?: DataQuery[] | GrafanaQuery[]) => {
+                onClose();
+                if (ds.uid !== currentValue?.uid) {
+                  onChange(ds, defaultQueries);
+                  reportInteraction(INTERACTION_EVENT_NAME, { item: INTERACTION_ITEM.SELECT_DS, ds_type: ds.type });
+                }
+              }}
+              onClose={onClose}
+              onClickAddCSV={onClickAddCSV}
+              onDismiss={onClose}
+              onNavigateOutsiteFooter={onNavigateOutsiteFooter}
+            />
+          </div>
+        </Portal>
+      ) : null}
+    </div>
   );
 }
+
+function getStylesDropdown(theme: GrafanaTheme2, props: DataSourcePickerProps) {
+  return {
+    container: css({
+      position: 'relative',
+      cursor: props.disabled ? 'not-allowed' : 'pointer',
+      width: theme.spacing(props.width || 'auto'),
+    }),
+    trigger: css({
+      cursor: 'pointer',
+      pointerEvents: props.disabled ? 'none' : 'auto',
+    }),
+    input: css({
+      'input::placeholder': {
+        color: props.disabled ? theme.colors.action.disabledText : theme.colors.text.primary,
+      },
+    }),
+  };
+}
+
+export interface PickerContentProps extends DataSourcePickerProps {
+  onClickAddCSV?: () => void;
+  keyboardEvents: Observable<React.KeyboardEvent>;
+  style: React.CSSProperties;
+  filterTerm?: string;
+  onClose: () => void;
+  onDismiss: () => void;
+  footerRef: (element: HTMLElement | null) => void;
+  onNavigateOutsiteFooter: (e: React.KeyboardEvent<HTMLButtonElement>) => void;
+}
+
+const PickerContent = React.forwardRef<HTMLDivElement, PickerContentProps>((props, ref) => {
+  const { filterTerm, onChange, onClose, onClickAddCSV, current, filter } = props;
+
+  const changeCallback = useCallback(
+    (ds: DataSourceInstanceSettings) => {
+      onChange(ds);
+    },
+    [onChange]
+  );
+
+  const clickAddCSVCallback = useCallback(() => {
+    onClickAddCSV?.();
+    onClose();
+    reportInteraction(INTERACTION_EVENT_NAME, { item: INTERACTION_ITEM.ADD_FILE });
+  }, [onClickAddCSV, onClose]);
+
+  const styles = useStyles2(getStylesPickerContent);
+
+  return (
+    <div style={props.style} ref={ref} className={styles.container}>
+      <CustomScrollbar>
+        <DataSourceList
+          {...props}
+          enableKeyboardNavigation
+          className={styles.dataSourceList}
+          current={current}
+          onChange={changeCallback}
+          filter={(ds) => (filter ? filter?.(ds) : true) && matchDataSourceWithSearch(ds, filterTerm)}
+          onClickEmptyStateCTA={() =>
+            reportInteraction(INTERACTION_EVENT_NAME, {
+              item: INTERACTION_ITEM.CONFIG_NEW_DS_EMPTY_STATE,
+            })
+          }
+        ></DataSourceList>
+      </CustomScrollbar>
+      <FocusScope>
+        <Footer
+          {...props}
+          onClickAddCSV={clickAddCSVCallback}
+          onChange={changeCallback}
+          onNavigateOutsiteFooter={props.onNavigateOutsiteFooter}
+        />
+      </FocusScope>
+    </div>
+  );
+});
+PickerContent.displayName = 'PickerContent';
+
+function getStylesPickerContent(theme: GrafanaTheme2) {
+  return {
+    container: css({
+      display: 'flex',
+      flexDirection: 'column',
+      background: theme.colors.background.primary,
+      boxShadow: theme.shadows.z3,
+    }),
+    picker: css({
+      background: theme.colors.background.secondary,
+    }),
+    dataSourceList: css({
+      flex: 1,
+    }),
+    footer: css({
+      flex: 0,
+      display: 'flex',
+      flexDirection: 'row-reverse',
+      justifyContent: 'space-between',
+      padding: theme.spacing(1.5),
+      borderTop: `1px solid ${theme.colors.border.weak}`,
+      backgroundColor: theme.colors.background.secondary,
+    }),
+  };
+}
+
+export interface FooterProps extends PickerContentProps {}
+
+function Footer({ onClose, onChange, onClickAddCSV, ...props }: FooterProps) {
+  const styles = useStyles2(getStylesFooter);
+  const isUploadFileEnabled = props.uploadFile && config.featureToggles.editPanelCSVDragAndDrop;
+
+  const onKeyDownLastButton = (e: React.KeyboardEvent<HTMLButtonElement>) => {
+    if (e.key === 'Tab') {
+      props.onNavigateOutsiteFooter(e);
+    }
+  };
+  const onKeyDownFirstButton = (e: React.KeyboardEvent<HTMLButtonElement>) => {
+    if (e.key === 'Tab' && e.shiftKey) {
+      props.onNavigateOutsiteFooter(e);
+    }
+  };
+
+  return (
+    <div className={styles.footer}>
+      <ModalsController>
+        {({ showModal, hideModal }) => (
+          <Button
+            size="sm"
+            variant="secondary"
+            fill="text"
+            onClick={() => {
+              onClose();
+              showModal(DataSourceModal, {
+                reportedInteractionFrom: 'ds_picker',
+                tracing: props.tracing,
+                dashboard: props.dashboard,
+                mixed: props.mixed,
+                metrics: props.metrics,
+                type: props.type,
+                annotations: props.annotations,
+                variables: props.variables,
+                alerting: props.alerting,
+                pluginId: props.pluginId,
+                logs: props.logs,
+                filter: props.filter,
+                uploadFile: props.uploadFile,
+                current: props.current,
+                onDismiss: hideModal,
+                onChange: (ds, defaultQueries) => {
+                  onChange(ds, defaultQueries);
+                  hideModal();
+                },
+              });
+              reportInteraction(INTERACTION_EVENT_NAME, { item: INTERACTION_ITEM.OPEN_ADVANCED_DS_PICKER });
+            }}
+            ref={props.footerRef}
+            onKeyDown={isUploadFileEnabled ? onKeyDownFirstButton : onKeyDownLastButton}
+          >
+            <Trans i18nKey="data-source-picker.open-advanced-button">Open advanced data source picker</Trans>
+            <Icon name="arrow-right" />
+          </Button>
+        )}
+      </ModalsController>
+      {isUploadFileEnabled && (
+        <Button variant="secondary" size="sm" onClick={onClickAddCSV} onKeyDown={onKeyDownLastButton}>
+          Add csv or spreadsheet
+        </Button>
+      )}
+    </div>
+  );
+}
+
+function getStylesFooter(theme: GrafanaTheme2) {
+  return {
+    footer: css({
+      flex: 0,
+      display: 'flex',
+      flexDirection: 'row-reverse',
+      justifyContent: 'space-between',
+      padding: theme.spacing(1.5),
+      borderTop: `1px solid ${theme.colors.border.weak}`,
+      backgroundColor: theme.colors.background.secondary,
+    }),
+  };
+}
diff --git a/public/app/features/datasources/components/picker/popperModifiers.ts b/public/app/features/datasources/components/picker/popperModifiers.ts
deleted file mode 100644
index 733ae14649e63..0000000000000
--- a/public/app/features/datasources/components/picker/popperModifiers.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { detectOverflow, Modifier, ModifierArguments } from '@popperjs/core';
-
-const MODAL_MARGIN = 20;
-const FLIP_THRESHOLD = 200;
-
-export const maxSize: Modifier<'maxSize', {}> = {
-  name: 'maxSize',
-  enabled: true,
-  phase: 'main',
-  requires: ['offset', 'preventOverflow', 'flip'],
-  fn({ state, name, options }: ModifierArguments<{}>) {
-    const overflow = detectOverflow(state, options);
-    const { x, y } = state.modifiersData.preventOverflow || { x: 0, y: 0 };
-    const { width: contentW, height: contentH } = state.rects.popper;
-    const { width: triggerW } = state.rects.reference;
-    const [basePlacement] = state.placement.split('-');
-
-    const widthProp = basePlacement === 'left' ? 'left' : 'right';
-    const heightProp = basePlacement === 'top' ? 'top' : 'bottom';
-
-    state.modifiersData[name] = {
-      maxWidth: contentW - overflow[widthProp] - x,
-      maxHeight: contentH - overflow[heightProp] - y,
-      minWidth: triggerW,
-    };
-  },
-};
-
-export const applyMaxSize: Modifier<'applyMaxSize', {}> = {
-  name: 'applyMaxSize',
-  enabled: true,
-  phase: 'beforeWrite',
-  requires: ['maxSize'],
-  fn({ state }: ModifierArguments<{}>) {
-    const { maxHeight, maxWidth, minWidth } = state.modifiersData.maxSize;
-
-    state.styles.popper.maxHeight ??= `${maxHeight - MODAL_MARGIN}px`;
-    state.styles.popper.minHeight ??= `${FLIP_THRESHOLD}px`;
-    state.styles.popper.maxWidth ??= maxWidth;
-    state.styles.popper.minWidth ??= minWidth;
-  },
-};
diff --git a/public/app/features/datasources/components/picker/utils.ts b/public/app/features/datasources/components/picker/utils.ts
index f41e2383c58e5..c626047631c4c 100644
--- a/public/app/features/datasources/components/picker/utils.ts
+++ b/public/app/features/datasources/components/picker/utils.ts
@@ -1,4 +1,11 @@
 import { DataSourceInstanceSettings, DataSourceJsonData, DataSourceRef } from '@grafana/data';
+import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
+import {
+  initLastUsedDatasourceKeyForDashboard,
+  setLastUsedDatasourceKeyForDashboard,
+} from 'app/features/dashboard/utils/dashboard';
+import { MIXED_DATASOURCE_NAME } from 'app/plugins/datasource/mixed/MixedDataSource';
+import { QueryGroupDataSource } from 'app/types';
 
 export function isDataSourceMatch(
   ds: DataSourceInstanceSettings | undefined,
@@ -97,3 +104,17 @@ export function getDataSourceCompareFn(
 export function matchDataSourceWithSearch(ds: DataSourceInstanceSettings, searchTerm = '') {
   return ds.name.toLowerCase().includes(searchTerm.toLowerCase());
 }
+
+export function storeLastUsedDataSourceInLocalStorage(datasource: QueryGroupDataSource) {
+  if (!datasource.uid) {
+    return;
+  }
+
+  const dashboardUid = getDashboardSrv().getCurrent()?.uid ?? '';
+  // if datasource is MIXED reset datasource uid in storage, because Mixed datasource can contain multiple ds
+  if (datasource.uid === MIXED_DATASOURCE_NAME) {
+    return initLastUsedDatasourceKeyForDashboard(dashboardUid!);
+  }
+
+  setLastUsedDatasourceKeyForDashboard(dashboardUid, datasource.uid);
+}
diff --git a/public/app/features/datasources/state/actions.test.ts b/public/app/features/datasources/state/actions.test.ts
index e67fc2ca756cc..eb67937e089a0 100644
--- a/public/app/features/datasources/state/actions.test.ts
+++ b/public/app/features/datasources/state/actions.test.ts
@@ -1,8 +1,9 @@
 import { thunkTester } from 'test/core/thunk/thunkTester';
 
 import { AppPluginMeta, DataSourceSettings, PluginMetaInfo, PluginType } from '@grafana/data';
-import { FetchError } from '@grafana/runtime';
+import { DataSourceSrv, FetchError } from '@grafana/runtime';
 import { appEvents } from 'app/core/core';
+import { getBackendSrv } from 'app/core/services/backend_srv';
 import { ThunkResult, ThunkDispatch } from 'app/types';
 
 import { getMockDataSource } from '../__mocks__';
@@ -26,7 +27,6 @@ import {
   testDataSourceSucceeded,
   testDataSourceFailed,
   dataSourceLoaded,
-  dataSourcesLoaded,
 } from './reducers';
 
 jest.mock('../api');
@@ -56,7 +56,7 @@ const getBackendSrvMock = () =>
       }),
     }),
     withNoBackendCache: jest.fn().mockImplementationOnce((cb) => cb()),
-  }) as any;
+  }) as unknown as ReturnType<typeof getBackendSrv>;
 
 const failDataSourceTest = async (error: object) => {
   const dependencies: TestDataSourceDependencies = {
@@ -67,7 +67,7 @@ const failDataSourceTest = async (error: object) => {
             throw error;
           }),
         }),
-      }) as any,
+      }) as Pick<DataSourceSrv, 'get'>,
     getBackendSrv: getBackendSrvMock,
   };
   const state = {
@@ -229,7 +229,7 @@ describe('testDataSource', () => {
               type: 'cloudwatch',
               uid: 'CW1234',
             }),
-          }) as any,
+          }) as Pick<DataSourceSrv, 'get'>,
         getBackendSrv: getBackendSrvMock,
       };
       const state = {
@@ -264,7 +264,7 @@ describe('testDataSource', () => {
               type: 'azure-monitor',
               uid: 'azM0nit0R',
             }),
-          }) as any,
+          }) as Pick<DataSourceSrv, 'get'>,
         getBackendSrv: getBackendSrvMock,
       };
       const result = {
@@ -383,18 +383,12 @@ describe('addDataSource', () => {
       type: PluginType.datasource,
       name: 'test DS',
     };
-    const state = {
-      dataSources: {
-        dataSources: [],
-      },
-    };
     const dataSourceMock = { datasource: { uid: 'azure23' }, meta };
     (api.createDataSource as jest.Mock).mockResolvedValueOnce(dataSourceMock);
     (api.getDataSources as jest.Mock).mockResolvedValueOnce([]);
 
-    const dispatchedActions = await thunkTester(state).givenThunk(addDataSource).whenThunkIsDispatched(meta);
+    await thunkTester({}).givenThunk(addDataSource).whenThunkIsDispatched(meta);
 
-    expect(dispatchedActions).toEqual([dataSourcesLoaded([])]);
     expect(trackDataSourceCreated).toHaveBeenCalledWith({
       plugin_id: 'azure-monitor',
       plugin_version: '1.2.3',
diff --git a/public/app/features/datasources/state/actions.ts b/public/app/features/datasources/state/actions.ts
index fa29b0b22574c..7f7585a323aae 100644
--- a/public/app/features/datasources/state/actions.ts
+++ b/public/app/features/datasources/state/actions.ts
@@ -22,12 +22,11 @@ import { ROUTES as CONNECTIONS_ROUTES } from 'app/features/connections/constants
 import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
 import { getPluginSettings } from 'app/features/plugins/pluginSettings';
 import { importDataSourcePlugin } from 'app/features/plugins/plugin_loader';
-import { DataSourcePluginCategory, ThunkDispatch, ThunkResult } from 'app/types';
+import { AccessControlAction, DataSourcePluginCategory, ThunkDispatch, ThunkResult } from 'app/types';
 
 import * as api from '../api';
 import { DATASOURCES_ROUTES } from '../constants';
 import { trackDataSourceCreated, trackDataSourceTested } from '../tracking';
-import { findNewName, nameExits } from '../utils';
 
 import { buildCategories } from './buildCategories';
 import { buildNavModel } from './navModel';
@@ -177,6 +176,9 @@ export const testDataSource = (
 
 export function loadDataSources(): ThunkResult<Promise<void>> {
   return async (dispatch) => {
+    if (!contextSrv.hasPermission(AccessControlAction.DataSourcesRead)) {
+      return;
+    }
     dispatch(dataSourcesLoad());
     const response = await api.getDataSources();
     dispatch(dataSourcesLoaded(response));
@@ -229,27 +231,12 @@ export function addDataSource(
   plugin: DataSourcePluginMeta,
   editRoute = DATASOURCES_ROUTES.Edit
 ): ThunkResult<Promise<void>> {
-  return async (dispatch, getStore) => {
-    // update the list of datasources first.
-    // We later use this list to check whether the name of the datasource
-    // being created is unuque or not and assign a new name to it if needed.
-    const response = await api.getDataSources();
-    dispatch(dataSourcesLoaded(response));
-
-    const dataSources = getStore().dataSources.dataSources;
-    const isFirstDataSource = dataSources.length === 0;
+  return async () => {
     const newInstance = {
-      name: plugin.name,
       type: plugin.id,
       access: 'proxy',
-      isDefault: isFirstDataSource,
     };
 
-    // TODO: typo in name
-    if (nameExits(dataSources, newInstance.name)) {
-      newInstance.name = findNewName(dataSources, newInstance.name);
-    }
-
     const result = await api.createDataSource(newInstance);
     const editLink = editRoute.replace(/:uid/gi, result.datasource.uid);
 
diff --git a/public/app/features/datasources/state/buildCategories.test.ts b/public/app/features/datasources/state/buildCategories.test.ts
index d29e5839d727c..d3e3d741c39d3 100644
--- a/public/app/features/datasources/state/buildCategories.test.ts
+++ b/public/app/features/datasources/state/buildCategories.test.ts
@@ -53,7 +53,7 @@ describe('buildCategories', () => {
   it('should add enterprise phantom plugins', () => {
     const enterprisePluginsCategory = categories[3];
     expect(enterprisePluginsCategory.title).toBe('Enterprise plugins');
-    expect(enterprisePluginsCategory.plugins.length).toBe(18);
+    expect(enterprisePluginsCategory.plugins.length).toBe(19);
     expect(enterprisePluginsCategory.plugins[0].name).toBe('AppDynamics');
     expect(enterprisePluginsCategory.plugins[enterprisePluginsCategory.plugins.length - 1].name).toBe('Wavefront');
   });
diff --git a/public/app/features/datasources/state/buildCategories.ts b/public/app/features/datasources/state/buildCategories.ts
index bab9d9011a79e..2629f9226d67e 100644
--- a/public/app/features/datasources/state/buildCategories.ts
+++ b/public/app/features/datasources/state/buildCategories.ts
@@ -203,6 +203,12 @@ function getEnterprisePhantomPlugins(): DataSourcePluginMeta[] {
       name: 'SumoLogic',
       imgUrl: 'public/img/plugins/sumo.svg',
     }),
+    getPhantomPlugin({
+      id: 'grafana-pagerduty-datasource',
+      description: 'PagerDuty datasource',
+      name: 'PagerDuty',
+      imgUrl: 'public/img/plugins/pagerduty.svg',
+    }),
   ];
 }
 
diff --git a/public/app/features/datasources/state/navModel.ts b/public/app/features/datasources/state/navModel.ts
index c68e547b7f012..ec804d2933692 100644
--- a/public/app/features/datasources/state/navModel.ts
+++ b/public/app/features/datasources/state/navModel.ts
@@ -13,7 +13,6 @@ const loadingDSType = 'Loading';
 export function buildNavModel(dataSource: DataSourceSettings, plugin: GenericDataSourcePlugin): NavModelItem {
   const pluginMeta = plugin.meta;
   const highlightsEnabled = config.featureToggles.featureHighlights;
-  const dataSourcePageHeader = config.featureToggles.dataSourcePageHeader;
   const navModel: NavModelItem = {
     img: pluginMeta.info.logos.large,
     id: 'datasource-' + dataSource.uid,
@@ -30,10 +29,6 @@ export function buildNavModel(dataSource: DataSourceSettings, plugin: GenericDat
     ],
   };
 
-  if (!dataSourcePageHeader) {
-    navModel.subTitle = `Type: ${pluginMeta.name}`;
-  }
-
   if (plugin.configPages) {
     for (const page of plugin.configPages) {
       navModel.children!.push({
@@ -83,29 +78,31 @@ export function buildNavModel(dataSource: DataSourceSettings, plugin: GenericDat
     });
   }
 
-  const analyticsExperimentId = 'feature-highlights-data-source-insights-badge';
-  const analytics: NavModelItem = {
-    active: false,
-    icon: 'info-circle',
-    id: `datasource-insights-${dataSource.uid}`,
-    text: 'Insights',
-    url: `datasources/edit/${dataSource.uid}/insights`,
-  };
-
-  if (highlightTrial() && !isLoadingNav) {
-    analytics.tabSuffix = () => ProBadge({ experimentId: analyticsExperimentId, eventVariant: 'trial' });
-  }
+  if (config.analytics?.enabled) {
+    const analyticsExperimentId = 'feature-highlights-data-source-insights-badge';
+    const analytics: NavModelItem = {
+      active: false,
+      icon: 'info-circle',
+      id: `datasource-insights-${dataSource.uid}`,
+      text: 'Insights',
+      url: `datasources/edit/${dataSource.uid}/insights`,
+    };
+
+    if (highlightTrial() && !isLoadingNav) {
+      analytics.tabSuffix = () => ProBadge({ experimentId: analyticsExperimentId, eventVariant: 'trial' });
+    }
 
-  if (featureEnabled('analytics')) {
-    if (contextSrv.hasPermission(AccessControlAction.DataSourcesInsightsRead)) {
-      navModel.children!.push(analytics);
+    if (featureEnabled('analytics')) {
+      if (contextSrv.hasPermission(AccessControlAction.DataSourcesInsightsRead)) {
+        navModel.children!.push(analytics);
+      }
+    } else if (highlightsEnabled && !isLoadingNav) {
+      navModel.children!.push({
+        ...analytics,
+        url: analytics.url + '/upgrade',
+        tabSuffix: () => ProBadge({ experimentId: analyticsExperimentId }),
+      });
     }
-  } else if (highlightsEnabled && !isLoadingNav) {
-    navModel.children!.push({
-      ...analytics,
-      url: analytics.url + '/upgrade',
-      tabSuffix: () => ProBadge({ experimentId: analyticsExperimentId }),
-    });
   }
 
   const cachingExperimentId = 'feature-highlights-query-caching-badge';
diff --git a/public/app/features/datasources/state/selectors.ts b/public/app/features/datasources/state/selectors.ts
index 3585de24db051..53be4a748ddb3 100644
--- a/public/app/features/datasources/state/selectors.ts
+++ b/public/app/features/datasources/state/selectors.ts
@@ -1,7 +1,9 @@
+import memoizeOne from 'memoize-one';
+
 import { DataSourcePluginMeta, DataSourceSettings, UrlQueryValue } from '@grafana/data';
 import { DataSourcesState } from 'app/types/datasources';
 
-export const getDataSources = (state: DataSourcesState) => {
+export const getDataSources = memoizeOne((state: DataSourcesState) => {
   const regex = new RegExp(state.searchQuery, 'i');
 
   const filteredDataSources = state.dataSources.filter((dataSource: DataSourceSettings) => {
@@ -11,15 +13,15 @@ export const getDataSources = (state: DataSourcesState) => {
   return filteredDataSources.sort((a, b) =>
     state.isSortAscending ? a.name.localeCompare(b.name) : b.name.localeCompare(a.name)
   );
-};
+});
 
-export const getFilteredDataSourcePlugins = (state: DataSourcesState) => {
+export const getFilteredDataSourcePlugins = memoizeOne((state: DataSourcesState) => {
   const regex = new RegExp(state.dataSourceTypeSearchQuery, 'i');
 
   return state.plugins.filter((type: DataSourcePluginMeta) => {
     return regex.test(type.name);
   });
-};
+});
 
 export const getDataSource = (state: DataSourcesState, dataSourceId: UrlQueryValue): DataSourceSettings => {
   if (state.dataSource.uid === dataSourceId) {
diff --git a/public/app/features/datasources/utils.test.ts b/public/app/features/datasources/utils.test.ts
deleted file mode 100644
index bf3743b099404..0000000000000
--- a/public/app/features/datasources/utils.test.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { getMockPlugin, getMockPlugins } from '@grafana/data/test/__mocks__/pluginMocks';
-
-import { nameExits, findNewName } from './utils';
-
-describe('Datasources / Utils', () => {
-  describe('nameExists()', () => {
-    const plugins = getMockPlugins(5);
-
-    it('should return TRUE if an existing plugin already has the same name', () => {
-      expect(nameExits(plugins, plugins[1].name)).toEqual(true);
-    });
-
-    it('should return FALSE if no plugin has the same name yet', () => {
-      expect(nameExits(plugins, 'unknown-plugin'));
-    });
-  });
-
-  describe('findNewName()', () => {
-    it('should return with a new name in case an existing plugin already has the same name', () => {
-      const plugins = getMockPlugins(5);
-      const name = 'pretty cool plugin-1';
-
-      expect(findNewName(plugins, name)).toEqual('pretty cool plugin-6');
-    });
-
-    it('should handle names without suffixes when name already exists', () => {
-      const name = 'prometheus';
-      const plugin = getMockPlugin({ name });
-
-      expect(findNewName([plugin], name)).toEqual('prometheus-1');
-    });
-
-    it('should handle names that end with a "-" when name does not exist yet', () => {
-      const plugin = getMockPlugin();
-      const plugins = [plugin];
-      const name = 'pretty cool plugin-';
-
-      expect(findNewName(plugins, name)).toEqual('pretty cool plugin-');
-    });
-  });
-});
diff --git a/public/app/features/datasources/utils.ts b/public/app/features/datasources/utils.ts
index 7da4a2d41fc6d..f03b91af8d7e5 100644
--- a/public/app/features/datasources/utils.ts
+++ b/public/app/features/datasources/utils.ts
@@ -1,53 +1,5 @@
 import { DataSourceJsonData, DataSourceSettings, urlUtil, locationUtil } from '@grafana/data';
 
-interface ItemWithName {
-  name: string;
-}
-
-export function nameExits(dataSources: ItemWithName[], name: string) {
-  return (
-    dataSources.filter((dataSource) => {
-      return dataSource.name.toLowerCase() === name.toLowerCase();
-    }).length > 0
-  );
-}
-
-export function findNewName(dataSources: ItemWithName[], name: string) {
-  // Need to loop through current data sources to make sure
-  // the name doesn't exist
-  while (nameExits(dataSources, name)) {
-    // If there's a duplicate name that doesn't end with '-x'
-    // we can add -1 to the name and be done.
-    if (!nameHasSuffix(name)) {
-      name = `${name}-1`;
-    } else {
-      // if there's a duplicate name that ends with '-x'
-      // we can try to increment the last digit until the name is unique
-
-      // remove the 'x' part and replace it with the new number
-      name = `${getNewName(name)}${incrementLastDigit(getLastDigit(name))}`;
-    }
-  }
-
-  return name;
-}
-
-function nameHasSuffix(name: string) {
-  return name.endsWith('-', name.length - 1);
-}
-
-function getLastDigit(name: string) {
-  return parseInt(name.slice(-1), 10);
-}
-
-function incrementLastDigit(digit: number) {
-  return isNaN(digit) ? 1 : digit + 1;
-}
-
-function getNewName(name: string) {
-  return name.slice(0, name.length - 1);
-}
-
 export const constructDataSourceExploreUrl = (dataSource: DataSourceSettings<DataSourceJsonData, {}>) => {
   const exploreState = JSON.stringify({ datasource: dataSource.name, context: 'explore' });
   const exploreUrl = urlUtil.renderUrl(locationUtil.assureBaseUrl('/explore'), { left: exploreState });
diff --git a/public/app/features/dimensions/editors/ColorDimensionEditor.tsx b/public/app/features/dimensions/editors/ColorDimensionEditor.tsx
index 9ad58099f5acc..2cbbab2b3e75e 100644
--- a/public/app/features/dimensions/editors/ColorDimensionEditor.tsx
+++ b/public/app/features/dimensions/editors/ColorDimensionEditor.tsx
@@ -1,7 +1,7 @@
 import { css } from '@emotion/css';
 import React, { useCallback } from 'react';
 
-import { GrafanaTheme2, SelectableValue, StandardEditorProps } from '@grafana/data';
+import { GrafanaTheme2, SelectableValue, StandardEditorProps, FieldNamePickerBaseNameMode } from '@grafana/data';
 import { ColorDimensionConfig } from '@grafana/schema';
 import { Select, ColorPicker, useStyles2 } from '@grafana/ui';
 import { useFieldDisplayNames, useSelectOptions } from '@grafana/ui/src/components/MatchersUI/utils';
@@ -11,19 +11,30 @@ const fixedColorOption: SelectableValue<string> = {
   value: '_____fixed_____',
 };
 
-export const ColorDimensionEditor = (props: StandardEditorProps<ColorDimensionConfig>) => {
-  const { value, context, onChange } = props;
+interface ColorDimensionSettings {
+  isClearable?: boolean;
+  baseNameMode?: FieldNamePickerBaseNameMode;
+  placeholder?: string;
+}
+
+export const ColorDimensionEditor = (props: StandardEditorProps<ColorDimensionConfig, ColorDimensionSettings>) => {
+  const { value, context, onChange, item } = props;
 
   const defaultColor = 'dark-green';
 
   const styles = useStyles2(getStyles);
   const fieldName = value?.field;
-  const isFixed = Boolean(!fieldName);
+  const isFixed = value && Boolean(!fieldName) && value?.fixed;
   const names = useFieldDisplayNames(context.data);
-  const selectOptions = useSelectOptions(names, fieldName, fixedColorOption);
+  const selectOptions = useSelectOptions(names, fieldName, fixedColorOption, undefined, item.settings?.baseNameMode);
 
   const onSelectChange = useCallback(
     (selection: SelectableValue<string>) => {
+      if (!selection) {
+        onChange(undefined);
+        return;
+      }
+
       const field = selection.value;
       if (field && field !== fixedColorOption.value) {
         onChange({
@@ -61,10 +72,12 @@ export const ColorDimensionEditor = (props: StandardEditorProps<ColorDimensionCo
           options={selectOptions}
           onChange={onSelectChange}
           noOptionsMessage="No fields found"
+          isClearable={item.settings?.isClearable}
+          placeholder={item.settings?.placeholder}
         />
         {isFixed && (
           <div className={styles.picker}>
-            <ColorPicker color={value?.fixed ?? defaultColor} onChange={onColorChange} enableNamedColors={true} />
+            <ColorPicker color={value?.fixed} onChange={onColorChange} enableNamedColors={true} />
           </div>
         )}
       </div>
diff --git a/public/app/features/dimensions/editors/FolderPickerTab.tsx b/public/app/features/dimensions/editors/FolderPickerTab.tsx
index cad3463ef84f6..ec7c225502235 100644
--- a/public/app/features/dimensions/editors/FolderPickerTab.tsx
+++ b/public/app/features/dimensions/editors/FolderPickerTab.tsx
@@ -35,10 +35,11 @@ interface Props {
   folderName: ResourceFolderName;
   newValue: string;
   setNewValue: Dispatch<SetStateAction<string>>;
+  maxFiles?: number;
 }
 
 export const FolderPickerTab = (props: Props) => {
-  const { value, mediaType, folderName, newValue, setNewValue } = props;
+  const { value, mediaType, folderName, newValue, setNewValue, maxFiles } = props;
   const styles = useStyles2(getStyles);
 
   const folders = getFolders(mediaType).map((v) => ({
@@ -75,7 +76,7 @@ export const FolderPickerTab = (props: Props) => {
       getDatasourceSrv()
         .get('-- Grafana --')
         .then((ds) => {
-          (ds as GrafanaDatasource).listFiles(folder).subscribe({
+          (ds as GrafanaDatasource).listFiles(folder, maxFiles).subscribe({
             next: (frame) => {
               const cards: ResourceItem[] = [];
               frame.forEach((item) => {
@@ -95,7 +96,7 @@ export const FolderPickerTab = (props: Props) => {
           });
         });
     }
-  }, [mediaType, currentFolder]);
+  }, [mediaType, currentFolder, maxFiles]);
 
   return (
     <>
diff --git a/public/app/features/dimensions/editors/ResourceCards.tsx b/public/app/features/dimensions/editors/ResourceCards.tsx
index 156153a2dfe9d..77006929f4a95 100644
--- a/public/app/features/dimensions/editors/ResourceCards.tsx
+++ b/public/app/features/dimensions/editors/ResourceCards.tsx
@@ -4,7 +4,7 @@ import AutoSizer from 'react-virtualized-auto-sizer';
 import { areEqual, FixedSizeGrid as Grid } from 'react-window';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { useTheme2, stylesFactory } from '@grafana/ui';
+import { useStyles2 } from '@grafana/ui';
 import { SanitizedSVG } from 'app/core/components/SVG/SanitizedSVG';
 
 import { ResourceItem } from './FolderPickerTab';
@@ -26,8 +26,7 @@ const MemoizedCell = memo(function Cell(props: CellProps) {
   const { cards, columnCount, onChange, selected } = data;
   const singleColumnIndex = columnIndex + rowIndex * columnCount;
   const card = cards[singleColumnIndex];
-  const theme = useTheme2();
-  const styles = getStyles(theme);
+  const styles = useStyles2(getStyles);
 
   return (
     <div style={style}>
@@ -56,53 +55,6 @@ const MemoizedCell = memo(function Cell(props: CellProps) {
   );
 }, areEqual);
 
-const getStyles = stylesFactory((theme: GrafanaTheme2) => {
-  return {
-    card: css`
-      display: inline-block;
-      width: 90px;
-      height: 90px;
-      margin: 0.75rem;
-      margin-left: 15px;
-      text-align: center;
-      cursor: pointer;
-      position: relative;
-      background-color: transparent;
-      border: 1px solid transparent;
-      border-radius: 8px;
-      padding-top: 6px;
-      :hover {
-        border-color: ${theme.colors.action.hover};
-        box-shadow: ${theme.shadows.z2};
-      }
-    `,
-    selected: css`
-      border: 2px solid ${theme.colors.primary.main};
-      :hover {
-        border-color: ${theme.colors.primary.main};
-      }
-    `,
-    img: css`
-      width: 40px;
-      height: 40px;
-      object-fit: cover;
-      vertical-align: middle;
-      fill: ${theme.colors.text.primary};
-    `,
-    text: css`
-      color: ${theme.colors.text.primary};
-      white-space: nowrap;
-      font-size: 12px;
-      text-overflow: ellipsis;
-      display: block;
-      overflow: hidden;
-    `,
-    grid: css`
-      border: 1px solid ${theme.colors.border.medium};
-    `,
-  };
-});
-
 interface CardProps {
   onChange: (value: string) => void;
   cards: ResourceItem[];
@@ -111,8 +63,7 @@ interface CardProps {
 
 export const ResourceCards = (props: CardProps) => {
   const { onChange, cards, value } = props;
-  const theme = useTheme2();
-  const styles = getStyles(theme);
+  const styles = useStyles2(getStyles);
 
   return (
     <AutoSizer defaultWidth={680}>
@@ -139,3 +90,48 @@ export const ResourceCards = (props: CardProps) => {
     </AutoSizer>
   );
 };
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  card: css`
+    display: inline-block;
+    width: 90px;
+    height: 90px;
+    margin: 0.75rem;
+    margin-left: 15px;
+    text-align: center;
+    cursor: pointer;
+    position: relative;
+    background-color: transparent;
+    border: 1px solid transparent;
+    border-radius: 8px;
+    padding-top: 6px;
+    :hover {
+      border-color: ${theme.colors.action.hover};
+      box-shadow: ${theme.shadows.z2};
+    }
+  `,
+  selected: css`
+    border: 2px solid ${theme.colors.primary.main};
+    :hover {
+      border-color: ${theme.colors.primary.main};
+    }
+  `,
+  img: css`
+    width: 40px;
+    height: 40px;
+    object-fit: cover;
+    vertical-align: middle;
+    fill: ${theme.colors.text.primary};
+  `,
+  text: css`
+    color: ${theme.colors.text.primary};
+    white-space: nowrap;
+    font-size: 12px;
+    text-overflow: ellipsis;
+    display: block;
+    overflow: hidden;
+  `,
+  grid: css`
+    border: 1px solid ${theme.colors.border.medium};
+  `,
+});
diff --git a/public/app/features/dimensions/editors/ResourceDimensionEditor.tsx b/public/app/features/dimensions/editors/ResourceDimensionEditor.tsx
index 4141fe73a798d..925ac4fdbb781 100644
--- a/public/app/features/dimensions/editors/ResourceDimensionEditor.tsx
+++ b/public/app/features/dimensions/editors/ResourceDimensionEditor.tsx
@@ -65,6 +65,7 @@ export const ResourceDimensionEditor = (
   const showSourceRadio = item.settings?.showSourceRadio ?? true;
   const mediaType = item.settings?.resourceType ?? MediaType.Icon;
   const folderName = item.settings?.folderName ?? ResourceFolderName.Icon;
+  const maxFiles = item.settings?.maxFiles; // undefined leads to backend default
   let srcPath = '';
   if (mediaType === MediaType.Icon) {
     if (value?.fixed) {
@@ -106,6 +107,7 @@ export const ResourceDimensionEditor = (
           mediaType={mediaType}
           folderName={folderName}
           size={ResourcePickerSize.NORMAL}
+          maxFiles={maxFiles}
         />
       )}
       {mode === ResourceDimensionMode.Mapping && (
diff --git a/public/app/features/dimensions/editors/ResourcePicker.tsx b/public/app/features/dimensions/editors/ResourcePicker.tsx
index 488c32c897016..19af481161dd3 100644
--- a/public/app/features/dimensions/editors/ResourcePicker.tsx
+++ b/public/app/features/dimensions/editors/ResourcePicker.tsx
@@ -32,17 +32,24 @@ interface Props {
   name?: string;
   placeholder?: string;
   color?: string;
+  maxFiles?: number;
 }
 
 export const ResourcePicker = (props: Props) => {
-  const { value, src, name, placeholder, onChange, onClear, mediaType, folderName, size, color } = props;
+  const { value, src, name, placeholder, onChange, onClear, mediaType, folderName, size, color, maxFiles } = props;
 
   const styles = useStyles2(getStyles);
   const theme = useTheme2();
 
   const pickerTriggerRef = createRef<HTMLDivElement>();
   const popoverElement = (
-    <ResourcePickerPopover onChange={onChange} value={value} mediaType={mediaType} folderName={folderName} />
+    <ResourcePickerPopover
+      onChange={onChange}
+      value={value}
+      mediaType={mediaType}
+      folderName={folderName}
+      maxFiles={maxFiles}
+    />
   );
 
   let sanitizedSrc = src;
diff --git a/public/app/features/dimensions/editors/ResourcePickerPopover.tsx b/public/app/features/dimensions/editors/ResourcePickerPopover.tsx
index 50df16fdc2e14..2a72c20a9e24b 100644
--- a/public/app/features/dimensions/editors/ResourcePickerPopover.tsx
+++ b/public/app/features/dimensions/editors/ResourcePickerPopover.tsx
@@ -20,13 +20,14 @@ interface Props {
   onChange: (value?: string) => void;
   mediaType: MediaType;
   folderName: ResourceFolderName;
+  maxFiles?: number;
 }
 
 interface ErrorResponse {
   message: string;
 }
 export const ResourcePickerPopover = (props: Props) => {
-  const { value, onChange, mediaType, folderName } = props;
+  const { value, onChange, mediaType, folderName, maxFiles } = props;
   const styles = useStyles2(getStyles);
 
   const onClose = () => {
@@ -55,6 +56,7 @@ export const ResourcePickerPopover = (props: Props) => {
       folderName={folderName}
       newValue={newValue}
       setNewValue={setNewValue}
+      maxFiles={maxFiles}
     />
   );
 
diff --git a/public/app/features/dimensions/editors/ThresholdsEditor/thresholds.tsx b/public/app/features/dimensions/editors/ThresholdsEditor/thresholds.tsx
index 1642c083fe10f..e89003ba9f9c6 100644
--- a/public/app/features/dimensions/editors/ThresholdsEditor/thresholds.tsx
+++ b/public/app/features/dimensions/editors/ThresholdsEditor/thresholds.tsx
@@ -1,13 +1,13 @@
 import React from 'react';
 
-import { FieldConfigEditorProps, ThresholdsConfig, ThresholdsMode, ThresholdsFieldConfigSettings } from '@grafana/data';
+import { StandardEditorProps, ThresholdsConfig, ThresholdsMode, ThresholdsFieldConfigSettings } from '@grafana/data';
 
 import { ThresholdsEditor } from './ThresholdsEditor';
 
-export class ThresholdsValueEditor extends React.PureComponent<
-  FieldConfigEditorProps<ThresholdsConfig, ThresholdsFieldConfigSettings>
-> {
-  constructor(props: FieldConfigEditorProps<ThresholdsConfig, ThresholdsFieldConfigSettings>) {
+type Props = StandardEditorProps<ThresholdsConfig, ThresholdsFieldConfigSettings>;
+
+export class ThresholdsValueEditor extends React.PureComponent<Props> {
+  constructor(props: Props) {
     super(props);
   }
 
diff --git a/public/app/features/dimensions/editors/ValueMappingsEditor/ValueMappingsEditorModal.test.tsx b/public/app/features/dimensions/editors/ValueMappingsEditor/ValueMappingsEditorModal.test.tsx
index 18bc74608cde9..38eb3ff873f4f 100644
--- a/public/app/features/dimensions/editors/ValueMappingsEditor/ValueMappingsEditorModal.test.tsx
+++ b/public/app/features/dimensions/editors/ValueMappingsEditor/ValueMappingsEditorModal.test.tsx
@@ -74,12 +74,12 @@ describe('ValueMappingsEditorModal', () => {
     });
   });
 
-  describe('When adding and updating value mapp', () => {
+  describe('When adding and updating value map', () => {
     it('should be 3', async () => {
       const onChangeSpy = jest.fn();
       setup(onChangeSpy);
 
-      await userEvent.click(screen.getByLabelText(selectors.components.ValuePicker.button('Add a new mapping')));
+      await userEvent.click(screen.getByTestId(selectors.components.ValuePicker.button('Add a new mapping')));
       const selectComponent = await screen.findByLabelText(
         selectors.components.ValuePicker.select('Add a new mapping')
       );
@@ -129,7 +129,7 @@ describe('ValueMappingsEditorModal', () => {
       setup(onChangeSpy, { value: [] });
       await userEvent.click(screen.getAllByTestId('remove-value-mapping')[0]);
 
-      await userEvent.click(screen.getByLabelText(selectors.components.ValuePicker.button('Add a new mapping')));
+      await userEvent.click(screen.getByTestId(selectors.components.ValuePicker.button('Add a new mapping')));
       const selectComponent = await screen.findByLabelText(
         selectors.components.ValuePicker.select('Add a new mapping')
       );
@@ -168,7 +168,7 @@ describe('ValueMappingsEditorModal', () => {
       setup(onChangeSpy, { value: [] });
       await userEvent.click(screen.getAllByTestId('remove-value-mapping')[0]);
 
-      await userEvent.click(screen.getByLabelText(selectors.components.ValuePicker.button('Add a new mapping')));
+      await userEvent.click(screen.getByTestId(selectors.components.ValuePicker.button('Add a new mapping')));
       const selectComponent = await screen.findByLabelText(
         selectors.components.ValuePicker.select('Add a new mapping')
       );
diff --git a/public/app/features/dimensions/types.ts b/public/app/features/dimensions/types.ts
index 9e6720f4b9be0..b1c1d7ec3b053 100644
--- a/public/app/features/dimensions/types.ts
+++ b/public/app/features/dimensions/types.ts
@@ -59,6 +59,7 @@ export interface ResourceDimensionOptions {
   placeholderValue?: string;
   // If you want your icon to be driven by value of a field
   showSourceRadio?: boolean;
+  maxFiles?: number;
 }
 
 export enum ResourceFolderName {
diff --git a/public/app/features/dimensions/utils.ts b/public/app/features/dimensions/utils.ts
index e8c0c053f3223..3e762cc584179 100644
--- a/public/app/features/dimensions/utils.ts
+++ b/public/app/features/dimensions/utils.ts
@@ -93,11 +93,11 @@ export function getTextDimensionFromData(
 }
 
 export function findField(frame?: DataFrame, name?: string): Field | undefined {
-  const idx = findFieldIndex(frame, name);
+  const idx = findFieldIndex(name, frame);
   return idx == null ? undefined : frame!.fields[idx];
 }
 
-export function findFieldIndex(frame?: DataFrame, name?: string): number | undefined {
+export function findFieldIndex(name?: string, frame?: DataFrame, frames?: DataFrame[]): number | undefined {
   if (!frame || !name?.length) {
     return undefined;
   }
@@ -107,7 +107,7 @@ export function findFieldIndex(frame?: DataFrame, name?: string): number | undef
     if (name === field.name) {
       return i;
     }
-    const disp = getFieldDisplayName(field, frame);
+    const disp = getFieldDisplayName(field, frame, frames);
     if (name === disp) {
       return i;
     }
@@ -132,5 +132,5 @@ export function getLastNotNullFieldValue<T>(field: Field): T {
       return v;
     }
   }
-  return undefined as any;
+  return undefined as T;
 }
diff --git a/public/app/features/explore/ContentOutline/ContentOutline.test.tsx b/public/app/features/explore/ContentOutline/ContentOutline.test.tsx
index 88b0945b88ad5..d28093e331ade 100644
--- a/public/app/features/explore/ContentOutline/ContentOutline.test.tsx
+++ b/public/app/features/explore/ContentOutline/ContentOutline.test.tsx
@@ -1,4 +1,5 @@
-import { render, screen, fireEvent } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
 
 import { ContentOutline } from './ContentOutline';
@@ -10,13 +11,14 @@ jest.mock('./ContentOutlineContext', () => ({
 const scrollIntoViewMock = jest.fn();
 const scrollerMock = document.createElement('div');
 
-const setup = () => {
+const setup = (mergeSingleChild = false) => {
   HTMLElement.prototype.scrollIntoView = scrollIntoViewMock;
 
   scrollerMock.scroll = jest.fn();
 
   // Mock useContentOutlineContext with custom outlineItems
   const mockUseContentOutlineContext = require('./ContentOutlineContext').useContentOutlineContext;
+
   mockUseContentOutlineContext.mockReturnValue({
     outlineItems: [
       {
@@ -24,12 +26,39 @@ const setup = () => {
         icon: 'test-icon',
         title: 'Item 1',
         ref: document.createElement('div'),
+        mergeSingleChild,
+        children: [
+          {
+            id: 'item-1-1',
+            icon: 'test-icon',
+            title: 'Item 1-1',
+            ref: document.createElement('div'),
+            level: 'child',
+          },
+        ],
       },
       {
         id: 'item-2',
         icon: 'test-icon',
         title: 'Item 2',
         ref: document.createElement('div'),
+        mergeSingleChild,
+        children: [
+          {
+            id: 'item-2-1',
+            icon: 'test-icon',
+            title: 'Item 2-1',
+            ref: document.createElement('div'),
+            level: 'child',
+          },
+          {
+            id: 'item-2-2',
+            icon: 'test-icon',
+            title: 'Item 2-2',
+            ref: document.createElement('div'),
+            level: 'child',
+          },
+        ],
       },
     ],
     register: jest.fn(),
@@ -40,31 +69,78 @@ const setup = () => {
 };
 
 describe('<ContentOutline />', () => {
-  beforeEach(() => {
+  it('toggles content on button click', async () => {
     setup();
-  });
-
-  it('toggles content on button click', () => {
-    let showContentOutlineButton = screen.getByLabelText('Expand content outline');
+    let showContentOutlineButton = screen.getByRole('button', { name: 'Expand outline' });
     expect(showContentOutlineButton).toBeInTheDocument();
 
-    fireEvent.click(showContentOutlineButton);
-    const hideContentOutlineButton = screen.getByText('Collapse outline');
+    await userEvent.click(showContentOutlineButton);
+    const hideContentOutlineButton = screen.getByRole('button', { name: 'Collapse outline' });
     expect(hideContentOutlineButton).toBeInTheDocument();
 
-    fireEvent.click(hideContentOutlineButton);
-    showContentOutlineButton = screen.getByLabelText('Expand content outline');
+    await userEvent.click(hideContentOutlineButton);
+    showContentOutlineButton = screen.getByRole('button', { name: 'Expand outline' });
     expect(showContentOutlineButton).toBeInTheDocument();
   });
 
-  it('scrolls into view on content button click', () => {
-    const itemButtons = screen.getAllByLabelText(/Item/i);
+  it('scrolls into view on content button click', async () => {
+    setup();
+    const itemButtons = screen.getAllByRole('button', { name: /Item [0-9]+/ });
+
+    for (const button of itemButtons) {
+      await userEvent.click(button);
+    }
+
+    expect(scrollerMock.scroll).toHaveBeenCalledTimes(itemButtons.length);
+  });
+
+  it('doesnt merge a single child item when mergeSingleChild is false', async () => {
+    setup();
+    const expandSectionChevrons = screen.getAllByRole('button', { name: 'Content outline item collapse button' });
+    await userEvent.click(expandSectionChevrons[0]);
+
+    const child = screen.getByRole('button', { name: 'Item 1-1' });
+    expect(child).toBeInTheDocument();
+  });
 
-    itemButtons.forEach((button) => {
-      fireEvent.click(button);
+  it('merges a single child item when mergeSingleChild is true', () => {
+    setup(true);
+    const child = screen.queryByRole('button', { name: 'Item 1-1' });
 
-      //assert scrollIntoView is called
-      expect(scrollerMock.scroll).toHaveBeenCalled();
-    });
+    expect(child).not.toBeInTheDocument();
+  });
+
+  it('displays multiple children', async () => {
+    setup();
+    const expandSectionChevrons = screen.getAllByRole('button', { name: 'Content outline item collapse button' });
+    await userEvent.click(expandSectionChevrons[1]);
+
+    const child1 = screen.getByRole('button', { name: 'Item 2-1' });
+    const child2 = screen.getByRole('button', { name: 'Item 2-2' });
+    expect(child1).toBeInTheDocument();
+    expect(child2).toBeInTheDocument();
+  });
+
+  it('if item has multiple children, it displays multiple children even when mergeSingleChild is true', async () => {
+    setup(true);
+    const expandSectionChevrons = screen.getAllByRole('button', { name: 'Content outline item collapse button' });
+    // since first item has only one child, we will have only one chevron
+    await userEvent.click(expandSectionChevrons[0]);
+
+    const child1 = screen.getByRole('button', { name: 'Item 2-1' });
+    const child2 = screen.getByRole('button', { name: 'Item 2-2' });
+    expect(child1).toBeInTheDocument();
+    expect(child2).toBeInTheDocument();
+  });
+
+  it('collapse button has same aria-controls as the section content', async () => {
+    setup();
+    const expandSectionChevrons = screen.getAllByRole('button', { name: 'Content outline item collapse button' });
+    // chevron for the second item
+    const button = expandSectionChevrons[1];
+    // content for the second item
+    const sectionContent = screen.getByTestId('section-wrapper-item-2');
+    await userEvent.click(button);
+    expect(button.getAttribute('aria-controls')).toBe(sectionContent.id);
   });
 });
diff --git a/public/app/features/explore/ContentOutline/ContentOutline.tsx b/public/app/features/explore/ContentOutline/ContentOutline.tsx
index 01b9be893ae20..d11b6b7de15a2 100644
--- a/public/app/features/explore/ContentOutline/ContentOutline.tsx
+++ b/public/app/features/explore/ContentOutline/ContentOutline.tsx
@@ -1,43 +1,35 @@
-import { css } from '@emotion/css';
-import React from 'react';
-import { useToggle } from 'react-use';
+import { css, cx } from '@emotion/css';
+import React, { useEffect, useRef, useState } from 'react';
+import { useToggle, useScroll } from 'react-use';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
 import { useStyles2, PanelContainer, CustomScrollbar } from '@grafana/ui';
 
-import { useContentOutlineContext } from './ContentOutlineContext';
+import { ContentOutlineItemContextProps, useContentOutlineContext } from './ContentOutlineContext';
 import { ContentOutlineItemButton } from './ContentOutlineItemButton';
 
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    wrapper: css({
-      label: 'wrapper',
-      position: 'relative',
-      display: 'flex',
-      justifyContent: 'center',
-      marginRight: theme.spacing(1),
-      height: '100%',
-      backgroundColor: theme.colors.background.primary,
-    }),
-    content: css({
-      label: 'content',
-      top: 0,
-    }),
-    buttonStyles: css({
-      textAlign: 'left',
-      width: '100%',
-      padding: theme.spacing(0, 1.5),
-    }),
-  };
-};
-
 export function ContentOutline({ scroller, panelId }: { scroller: HTMLElement | undefined; panelId: string }) {
-  const [expanded, toggleExpanded] = useToggle(false);
-  const styles = useStyles2((theme) => getStyles(theme));
-  const { outlineItems } = useContentOutlineContext();
+  const [contentOutlineExpanded, toggleContentOutlineExpanded] = useToggle(false);
+  const styles = useStyles2(getStyles, contentOutlineExpanded);
+  const scrollerRef = useRef(scroller || null);
+  const { y: verticalScroll } = useScroll(scrollerRef);
+  const { outlineItems } = useContentOutlineContext() ?? { outlineItems: [] };
+  const [activeSectionId, setActiveSectionId] = useState(outlineItems[0]?.id);
+  const [activeSectionChildId, setActiveSectionChildId] = useState(outlineItems[0]?.children?.[0]?.id);
+
+  const outlineItemsShouldIndent = outlineItems.some(
+    (item) => item.children && !(item.mergeSingleChild && item.children?.length === 1) && item.children.length > 0
+  );
 
-  const scrollIntoView = (ref: HTMLElement | null, buttonTitle: string) => {
+  const [sectionsExpanded, setSectionsExpanded] = useState(() => {
+    return outlineItems.reduce((acc: { [key: string]: boolean }, item) => {
+      acc[item.id] = false;
+      return acc;
+    }, {});
+  });
+
+  const scrollIntoView = (ref: HTMLElement | null, itemPanelId: string, customOffsetTop = 0) => {
     let scrollValue = 0;
     let el: HTMLElement | null | undefined = ref;
 
@@ -47,48 +39,229 @@ export function ContentOutline({ scroller, panelId }: { scroller: HTMLElement |
     } while (el && el !== scroller);
 
     scroller?.scroll({
-      top: scrollValue,
+      top: scrollValue + customOffsetTop,
       behavior: 'smooth',
     });
+
     reportInteraction('explore_toolbar_contentoutline_clicked', {
       item: 'select_section',
-      type: buttonTitle,
+      type: itemPanelId,
     });
   };
 
   const toggle = () => {
-    toggleExpanded();
+    toggleContentOutlineExpanded();
     reportInteraction('explore_toolbar_contentoutline_clicked', {
       item: 'outline',
-      type: expanded ? 'minimize' : 'expand',
+      type: contentOutlineExpanded ? 'minimize' : 'expand',
+    });
+  };
+
+  const toggleSection = (itemId: string) => {
+    setSectionsExpanded((prev) => ({
+      ...prev,
+      [itemId]: !prev[itemId],
+    }));
+    reportInteraction('explore_toolbar_contentoutline_clicked', {
+      item: 'section',
+      type: !sectionsExpanded[itemId] ? 'minimize' : 'expand',
     });
   };
 
+  useEffect(() => {
+    let activeItem;
+
+    for (const item of outlineItems) {
+      let top = item?.ref?.getBoundingClientRect().top;
+
+      // Check item
+      if (top && top >= 0) {
+        activeItem = item;
+      }
+
+      // Check children
+      const activeChild = item.children?.find((child) => {
+        const offsetTop = child.customTopOffset || 0;
+        let childTop = child?.ref?.getBoundingClientRect().top;
+        return childTop && childTop >= offsetTop;
+      });
+
+      if (activeChild) {
+        setActiveSectionChildId(activeChild.id);
+        setActiveSectionId(item.id);
+        break;
+      }
+
+      if (activeItem) {
+        setActiveSectionId(activeItem.id);
+        setActiveSectionChildId(undefined);
+        break;
+      }
+    }
+  }, [outlineItems, verticalScroll]);
+
   return (
     <PanelContainer className={styles.wrapper} id={panelId}>
       <CustomScrollbar>
         <div className={styles.content}>
           <ContentOutlineItemButton
-            title={expanded ? 'Collapse outline' : undefined}
-            icon={expanded ? 'angle-left' : 'angle-right'}
+            icon={'arrow-from-right'}
+            tooltip={contentOutlineExpanded ? 'Collapse outline' : 'Expand outline'}
+            tooltipPlacement={contentOutlineExpanded ? 'right' : 'bottom'}
             onClick={toggle}
-            tooltip={!expanded ? 'Expand content outline' : undefined}
-            className={styles.buttonStyles}
-            aria-expanded={expanded}
+            className={cx(styles.toggleContentOutlineButton, {
+              [styles.justifyCenter]: !contentOutlineExpanded && !outlineItemsShouldIndent,
+            })}
+            aria-expanded={contentOutlineExpanded}
           />
 
           {outlineItems.map((item) => (
-            <ContentOutlineItemButton
-              key={item.id}
-              title={expanded ? item.title : undefined}
-              className={styles.buttonStyles}
-              icon={item.icon}
-              onClick={() => scrollIntoView(item.ref, item.title)}
-              tooltip={!expanded ? item.title : undefined}
-            />
+            <React.Fragment key={item.id}>
+              <ContentOutlineItemButton
+                key={item.id}
+                title={contentOutlineExpanded ? item.title : undefined}
+                contentOutlineExpanded={contentOutlineExpanded}
+                className={cx(styles.buttonStyles, {
+                  [styles.justifyCenter]: !contentOutlineExpanded,
+                  [styles.sectionHighlighter]: isChildActive(item, activeSectionChildId) && !contentOutlineExpanded,
+                })}
+                indentStyle={cx({
+                  [styles.indentRoot]: outlineItemsShouldIndent && item.children?.length === 0,
+                  [styles.sectionHighlighter]:
+                    isChildActive(item, activeSectionChildId) && !contentOutlineExpanded && sectionsExpanded[item.id],
+                })}
+                icon={item.icon}
+                onClick={() => scrollIntoView(item.ref, item.panelId)}
+                tooltip={item.title}
+                collapsible={isCollapsible(item)}
+                collapsed={!sectionsExpanded[item.id]}
+                toggleCollapsed={() => toggleSection(item.id)}
+                isActive={
+                  (isChildActive(item, activeSectionChildId) && !sectionsExpanded[item.id]) ||
+                  (activeSectionId === item.id && !sectionsExpanded[item.id])
+                }
+                sectionId={item.id}
+              />
+              <div id={item.id} data-testid={`section-wrapper-${item.id}`}>
+                {item.children &&
+                  (!item.mergeSingleChild || item.children.length !== 1) &&
+                  sectionsExpanded[item.id] &&
+                  item.children.map((child, i) => (
+                    <div key={child.id} className={styles.itemWrapper}>
+                      {contentOutlineExpanded && (
+                        <div
+                          className={cx(styles.itemConnector, {
+                            [styles.firstItemConnector]: i === 0,
+                            [styles.lastItemConnector]: i === (item.children?.length || 0) - 1,
+                          })}
+                        />
+                      )}
+                      <ContentOutlineItemButton
+                        key={child.id}
+                        title={contentOutlineExpanded ? child.title : undefined}
+                        contentOutlineExpanded={contentOutlineExpanded}
+                        icon={contentOutlineExpanded ? undefined : item.icon}
+                        className={cx(styles.buttonStyles, {
+                          [styles.justifyCenter]: !contentOutlineExpanded,
+                          [styles.sectionHighlighter]:
+                            isChildActive(item, activeSectionChildId) && !contentOutlineExpanded,
+                        })}
+                        indentStyle={styles.indentChild}
+                        onClick={() => scrollIntoView(child.ref, child.panelId, child.customTopOffset)}
+                        tooltip={child.title}
+                        isActive={activeSectionChildId === child.id}
+                      />
+                    </div>
+                  ))}
+              </div>
+            </React.Fragment>
           ))}
         </div>
       </CustomScrollbar>
     </PanelContainer>
   );
 }
+
+const getStyles = (theme: GrafanaTheme2, expanded: boolean) => {
+  return {
+    wrapper: css({
+      label: 'wrapper',
+      position: 'relative',
+      display: 'flex',
+      justifyContent: 'center',
+      marginRight: theme.spacing(1),
+      height: '100%',
+      backgroundColor: theme.colors.background.primary,
+      width: expanded ? '160px' : undefined,
+      minWidth: expanded ? '160px' : undefined,
+    }),
+    content: css({
+      label: 'content',
+      marginLeft: theme.spacing(0.5),
+      top: 0,
+    }),
+    buttonStyles: css({
+      display: 'flex',
+      '&:hover': {
+        color: theme.colors.text.primary,
+        textDecoration: 'underline',
+      },
+    }),
+    toggleContentOutlineButton: css({
+      '&:hover': {
+        color: theme.colors.text.primary,
+      },
+      transform: expanded ? 'rotate(180deg)' : '',
+      marginRight: expanded ? theme.spacing(0.5) : undefined,
+    }),
+    indentRoot: css({
+      paddingLeft: theme.spacing(4),
+    }),
+    indentChild: css({
+      paddingLeft: expanded ? theme.spacing(7) : theme.spacing(4),
+    }),
+    itemWrapper: css({
+      display: 'flex',
+      height: theme.spacing(4),
+      alignItems: 'center',
+    }),
+    itemConnector: css({
+      position: 'relative',
+      height: '100%',
+      width: theme.spacing(1.5),
+      '&::before': {
+        borderRight: `1px solid ${theme.colors.border.medium}`,
+        content: '""',
+        height: '100%',
+        left: 48,
+        position: 'absolute',
+        transform: 'translateX(50%)',
+      },
+    }),
+    firstItemConnector: css({
+      '&::before': {
+        top: theme.spacing(1),
+        height: `calc(100% - ${theme.spacing(1)})`,
+      },
+    }),
+    lastItemConnector: css({
+      '&::before': {
+        height: `calc(100% - ${theme.spacing(1)})`,
+      },
+    }),
+    justifyCenter: css({
+      justifyContent: 'center',
+    }),
+    sectionHighlighter: css({
+      backgroundColor: theme.colors.background.secondary,
+    }),
+  };
+};
+
+function isCollapsible(item: ContentOutlineItemContextProps): boolean {
+  return !!(item.children && item.children.length > 0 && (!item.mergeSingleChild || item.children.length !== 1));
+}
+
+function isChildActive(item: ContentOutlineItemContextProps, activeSectionChildId: string | undefined) {
+  return item.children?.some((child) => child.id === activeSectionChildId);
+}
diff --git a/public/app/features/explore/ContentOutline/ContentOutlineContext.tsx b/public/app/features/explore/ContentOutline/ContentOutlineContext.tsx
index 5ca319431e1d5..565df8c576774 100644
--- a/public/app/features/explore/ContentOutline/ContentOutlineContext.tsx
+++ b/public/app/features/explore/ContentOutline/ContentOutlineContext.tsx
@@ -1,64 +1,163 @@
 import { uniqueId } from 'lodash';
-import React, { useState, useContext, createContext, ReactNode, useCallback } from 'react';
+import React, { useState, useContext, createContext, ReactNode, useCallback, useRef, useEffect } from 'react';
 
 import { ContentOutlineItemBaseProps } from './ContentOutlineItem';
 
 export interface ContentOutlineItemContextProps extends ContentOutlineItemBaseProps {
   id: string;
   ref: HTMLElement | null;
+  children?: ContentOutlineItemContextProps[];
 }
 
-type RegisterFunction = ({ title, icon, ref }: Omit<ContentOutlineItemContextProps, 'id'>) => string;
+type RegisterFunction = (outlineItem: Omit<ContentOutlineItemContextProps, 'id'>) => string;
 
-interface ContentOutlineContextProps {
+export interface ContentOutlineContextProps {
   outlineItems: ContentOutlineItemContextProps[];
   register: RegisterFunction;
   unregister: (id: string) => void;
+  updateOutlineItems: (newItems: ContentOutlineItemContextProps[]) => void;
+}
+
+interface ContentOutlineContextProviderProps {
+  children: ReactNode;
+  /**
+   * used to resort children of an outline item when the dependencies change
+   * e.g. when the order of query rows changes on drag and drop
+   */
+  refreshDependencies?: unknown[];
+}
+
+interface ParentlessItems {
+  [panelId: string]: ContentOutlineItemContextProps[];
 }
 
 const ContentOutlineContext = createContext<ContentOutlineContextProps | undefined>(undefined);
 
-export const ContentOutlineContextProvider = ({ children }: { children: ReactNode }) => {
+export function ContentOutlineContextProvider({ children, refreshDependencies }: ContentOutlineContextProviderProps) {
   const [outlineItems, setOutlineItems] = useState<ContentOutlineItemContextProps[]>([]);
+  const parentlessItemsRef = useRef<ParentlessItems>({});
 
-  const register: RegisterFunction = useCallback(({ title, icon, ref }) => {
-    const id = uniqueId(`${title}-${icon}_`);
+  const register: RegisterFunction = useCallback((outlineItem) => {
+    const id = uniqueId(`${outlineItem.panelId}-${outlineItem.title}-${outlineItem.icon}_`);
 
     setOutlineItems((prevItems) => {
-      const updatedItems = [...prevItems, { id, title, icon, ref }];
-
-      return updatedItems.sort((a, b) => {
-        if (a.ref && b.ref) {
-          const diff = a.ref.compareDocumentPosition(b.ref);
-          if (diff === Node.DOCUMENT_POSITION_PRECEDING) {
-            return 1;
-          } else if (diff === Node.DOCUMENT_POSITION_FOLLOWING) {
-            return -1;
+      if (outlineItem.level === 'root') {
+        const mergeSingleChild = checkMergeSingleChild(parentlessItemsRef, outlineItem);
+        const updatedItems = [
+          ...prevItems,
+          {
+            ...outlineItem,
+            id,
+            children: parentlessItemsRef.current[outlineItem.panelId] || [],
+            mergeSingleChild,
+          },
+        ];
+
+        return updatedItems.sort(sortElementsByDocumentPosition);
+      }
+
+      if (outlineItem.level === 'child') {
+        const parentIndex = prevItems.findIndex(
+          (item) => item.panelId === outlineItem.panelId && item.level === 'root'
+        );
+        if (parentIndex === -1) {
+          const parentlessItemSibling = Object.keys(parentlessItemsRef.current).find(
+            (key) => key === outlineItem.panelId
+          );
+
+          if (parentlessItemSibling) {
+            parentlessItemsRef.current[outlineItem.panelId].push({
+              ...outlineItem,
+              id,
+            });
+          } else {
+            parentlessItemsRef.current[outlineItem.panelId] = [
+              {
+                ...outlineItem,
+                id,
+              },
+            ];
           }
+          return [...prevItems];
         }
-        return 0;
-      });
+
+        const newItems = [...prevItems];
+        const parent = { ...newItems[parentIndex] };
+        const childrenUpdated = [...(parent.children || []), { ...outlineItem, id }];
+        childrenUpdated.sort(sortElementsByDocumentPosition);
+        const mergeSingleChild = checkMergeSingleChild(parentlessItemsRef, parent);
+
+        newItems[parentIndex] = {
+          ...parent,
+          children: childrenUpdated,
+          mergeSingleChild,
+        };
+
+        return newItems;
+      }
+
+      return [...prevItems];
     });
 
     return id;
   }, []);
 
   const unregister = useCallback((id: string) => {
-    setOutlineItems((prevItems) => prevItems.filter((item) => item.id !== id));
+    setOutlineItems((prevItems) =>
+      prevItems
+        .filter((item) => item.id !== id)
+        .map((item) => {
+          if (item.children) {
+            item.children = item.children.filter((child) => child.id !== id);
+          }
+          return item;
+        })
+    );
+  }, []);
+
+  const updateOutlineItems = useCallback((newItems: ContentOutlineItemContextProps[]) => {
+    setOutlineItems(newItems);
   }, []);
 
+  useEffect(() => {
+    setOutlineItems((prevItems) => {
+      const newItems = [...prevItems];
+      for (const item of newItems) {
+        item.children?.sort(sortElementsByDocumentPosition);
+      }
+      return newItems;
+    });
+  }, [refreshDependencies]);
+
   return (
-    <ContentOutlineContext.Provider value={{ outlineItems, register, unregister }}>
+    <ContentOutlineContext.Provider value={{ outlineItems, register, unregister, updateOutlineItems }}>
       {children}
     </ContentOutlineContext.Provider>
   );
-};
-
-export function useContentOutlineContext() {
-  const ctx = useContext(ContentOutlineContext);
+}
 
-  if (!ctx) {
-    throw new Error('useContentOutlineContext must be used within a ContentOutlineContextProvider');
+export function sortElementsByDocumentPosition(a: ContentOutlineItemContextProps, b: ContentOutlineItemContextProps) {
+  if (a.ref && b.ref) {
+    const diff = a.ref.compareDocumentPosition(b.ref);
+    if (diff === Node.DOCUMENT_POSITION_PRECEDING) {
+      return 1;
+    } else if (diff === Node.DOCUMENT_POSITION_FOLLOWING) {
+      return -1;
+    }
   }
-  return ctx;
+  return 0;
+}
+
+function checkMergeSingleChild(
+  parentlessItemsRef: React.MutableRefObject<ParentlessItems>,
+  outlineItem: Omit<ContentOutlineItemContextProps, 'id'>
+) {
+  const children = parentlessItemsRef.current[outlineItem.panelId] || [];
+  const mergeSingleChild = children.length === 1 && outlineItem.mergeSingleChild;
+
+  return mergeSingleChild;
+}
+
+export function useContentOutlineContext() {
+  return useContext(ContentOutlineContext);
 }
diff --git a/public/app/features/explore/ContentOutline/ContentOutlineItem.tsx b/public/app/features/explore/ContentOutline/ContentOutlineItem.tsx
index df591a414b006..7c594436262f2 100644
--- a/public/app/features/explore/ContentOutline/ContentOutlineItem.tsx
+++ b/public/app/features/explore/ContentOutline/ContentOutlineItem.tsx
@@ -2,9 +2,29 @@ import React, { useEffect, useRef, ReactNode } from 'react';
 
 import { useContentOutlineContext } from './ContentOutlineContext';
 
+type INDENT_LEVELS = 'root' | 'child';
+
 export interface ContentOutlineItemBaseProps {
+  panelId: string;
   title: string;
   icon: string;
+  /**
+   * Custom offset from the top of the Explore container when scrolling to this item.
+   * Items like query row need some offset so the top of the query row is not hidden behind the header.
+   */
+  customTopOffset?: number;
+  /**
+   * The level of indentation for this item.
+   * - `root` is the top level item.
+   * - `child` is an item that is a child of an item with `root` level.
+   */
+  level?: INDENT_LEVELS;
+  /**
+   * Merges a single child of this item with this item.
+   * e.g. It doesn't make sense to nest a single query row under a queries container
+   * because user can navigate to the query row by navigating to the queries container.
+   */
+  mergeSingleChild?: boolean;
 }
 
 interface ContentOutlineItemProps extends ContentOutlineItemBaseProps {
@@ -12,17 +32,38 @@ interface ContentOutlineItemProps extends ContentOutlineItemBaseProps {
   className?: string;
 }
 
-export function ContentOutlineItem({ title, icon, children, className }: ContentOutlineItemProps) {
-  const { register, unregister } = useContentOutlineContext();
+export function ContentOutlineItem({
+  panelId,
+  title,
+  icon,
+  customTopOffset,
+  children,
+  className,
+  level = 'root',
+  mergeSingleChild,
+}: ContentOutlineItemProps) {
+  const { register, unregister } = useContentOutlineContext() ?? {};
   const ref = useRef(null);
 
   useEffect(() => {
+    if (!register || !unregister) {
+      return;
+    }
+
     // When the component mounts, register it and get its unique ID.
-    const id = register({ title: title, icon: icon, ref: ref.current });
+    const id = register({
+      panelId: panelId,
+      title: title,
+      icon: icon,
+      ref: ref.current,
+      customTopOffset: customTopOffset,
+      level: level,
+      mergeSingleChild,
+    });
 
     // When the component unmounts, unregister it using its unique ID.
     return () => unregister(id);
-  }, [title, icon, register, unregister]);
+  }, [panelId, title, icon, customTopOffset, level, mergeSingleChild, register, unregister]);
 
   return (
     <div className={className} ref={ref}>
diff --git a/public/app/features/explore/ContentOutline/ContentOutlineItemButton.tsx b/public/app/features/explore/ContentOutline/ContentOutlineItemButton.tsx
index 7f887a76899fd..6d47db2766b2e 100644
--- a/public/app/features/explore/ContentOutline/ContentOutlineItemButton.tsx
+++ b/public/app/features/explore/ContentOutline/ContentOutlineItemButton.tsx
@@ -1,32 +1,90 @@
 import { cx, css } from '@emotion/css';
-import React, { ButtonHTMLAttributes } from 'react';
+import React, { ButtonHTMLAttributes, useEffect, useRef, useState } from 'react';
 
 import { IconName, isIconName, GrafanaTheme2 } from '@grafana/data';
 import { Icon, useStyles2, Tooltip } from '@grafana/ui';
+import { TooltipPlacement } from '@grafana/ui/src/components/Tooltip';
 
 type CommonProps = {
+  contentOutlineExpanded?: boolean;
   title?: string;
-  icon: string;
+  icon?: IconName | React.ReactNode;
   tooltip?: string;
+  tooltipPlacement?: TooltipPlacement;
   className?: string;
+  indentStyle?: string;
+  collapsible?: boolean;
+  collapsed?: boolean;
+  isActive?: boolean;
+  sectionId?: string;
+  toggleCollapsed?: () => void;
 };
 
 export type ContentOutlineItemButtonProps = CommonProps & ButtonHTMLAttributes<HTMLButtonElement>;
 
-export function ContentOutlineItemButton({ title, icon, tooltip, className, ...rest }: ContentOutlineItemButtonProps) {
+export function ContentOutlineItemButton({
+  contentOutlineExpanded,
+  title,
+  icon,
+  tooltip,
+  tooltipPlacement = 'bottom',
+  className,
+  indentStyle,
+  collapsible,
+  collapsed,
+  isActive,
+  sectionId,
+  toggleCollapsed,
+  ...rest
+}: ContentOutlineItemButtonProps) {
   const styles = useStyles2(getStyles);
 
   const buttonStyles = cx(styles.button, className);
 
+  const textRef = useRef<HTMLElement>(null);
+  const [isOverflowing, setIsOverflowing] = useState(false);
+
+  useEffect(() => {
+    if (textRef.current) {
+      setIsOverflowing(textRef.current?.scrollWidth > textRef.current?.clientWidth);
+    }
+  }, [title]);
+
   const body = (
-    <button className={buttonStyles} aria-label={tooltip} {...rest}>
-      {renderIcon(icon)}
-      {title}
-    </button>
+    <div className={cx(styles.buttonContainer, indentStyle)}>
+      {collapsible && (
+        <button
+          className={styles.collapseButton}
+          onClick={toggleCollapsed}
+          aria-label="Content outline item collapse button"
+          aria-expanded={!collapsed}
+          aria-controls={sectionId}
+        >
+          <OutlineIcon icon={collapsed ? 'angle-right' : 'angle-down'} />
+        </button>
+      )}
+      <button
+        className={cx(buttonStyles, {
+          [styles.active]: isActive,
+        })}
+        aria-label={tooltip}
+        {...rest}
+      >
+        <OutlineIcon icon={icon} />
+        {title && (
+          <span className={styles.textContainer} ref={textRef}>
+            {title}
+          </span>
+        )}
+      </button>
+    </div>
   );
 
-  return tooltip ? (
-    <Tooltip content={tooltip} placement="bottom">
+  // if there's a tooltip we want to show it if the text is overflowing
+  const showTooltip = tooltip && (!contentOutlineExpanded || isOverflowing);
+
+  return showTooltip ? (
+    <Tooltip content={tooltip} placement={tooltipPlacement}>
       {body}
     </Tooltip>
   ) : (
@@ -34,13 +92,13 @@ export function ContentOutlineItemButton({ title, icon, tooltip, className, ...r
   );
 }
 
-function renderIcon(icon: IconName | React.ReactNode) {
+function OutlineIcon({ icon }: { icon: IconName | React.ReactNode }) {
   if (!icon) {
     return null;
   }
 
   if (isIconName(icon)) {
-    return <Icon name={icon} size={'lg'} />;
+    return <Icon name={icon} size={'lg'} title={icon} />;
   }
 
   return icon;
@@ -48,24 +106,64 @@ function renderIcon(icon: IconName | React.ReactNode) {
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
+    buttonContainer: css({
+      position: 'relative',
+      display: 'flex',
+      alignItems: 'center',
+      flexGrow: 1,
+      gap: theme.spacing(1),
+      overflow: 'hidden',
+      width: '100%',
+    }),
     button: css({
       label: 'content-outline-item-button',
       display: 'flex',
-      flexGrow: 1,
       alignItems: 'center',
       height: theme.spacing(theme.components.height.md),
       padding: theme.spacing(0, 1),
       gap: theme.spacing(1),
       color: theme.colors.text.secondary,
+      width: '100%',
       background: 'transparent',
       border: 'none',
-      textOverflow: 'ellipsis',
-      overflow: 'hidden',
-      whiteSpace: 'nowrap',
+    }),
+    collapseButton: css({
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'center',
+      width: theme.spacing(3),
+      height: theme.spacing(4),
+      borderRadius: theme.shape.radius.default,
+      color: theme.colors.text.secondary,
+      background: 'transparent',
+      border: 'none',
+
       '&:hover': {
         color: theme.colors.text.primary,
-        background: theme.colors.background.secondary,
-        textDecoration: 'underline',
+        background: theme.colors.secondary.shade,
+      },
+    }),
+    textContainer: css({
+      whiteSpace: 'nowrap',
+      overflow: 'hidden',
+      textOverflow: 'ellipsis',
+    }),
+    active: css({
+      backgroundColor: theme.colors.background.secondary,
+      borderTopRightRadius: theme.shape.radius.default,
+      borderBottomRightRadius: theme.shape.radius.default,
+      position: 'relative',
+
+      '&::before': {
+        backgroundImage: theme.colors.gradients.brandVertical,
+        borderRadius: theme.shape.radius.default,
+        content: '" "',
+        display: 'block',
+        height: '100%',
+        position: 'absolute',
+        transform: 'translateX(-50%)',
+        width: theme.spacing(0.5),
+        left: '2px',
       },
     }),
   };
diff --git a/public/app/features/explore/CorrelationEditorModeBar.tsx b/public/app/features/explore/CorrelationEditorModeBar.tsx
index e4f4a761b9e79..5df1b7ef04c99 100644
--- a/public/app/features/explore/CorrelationEditorModeBar.tsx
+++ b/public/app/features/explore/CorrelationEditorModeBar.tsx
@@ -9,36 +9,86 @@ import { Button, HorizontalGroup, Icon, Tooltip, useStyles2 } from '@grafana/ui'
 import { CORRELATION_EDITOR_POST_CONFIRM_ACTION, ExploreItemState, useDispatch, useSelector } from 'app/types';
 
 import { CorrelationUnsavedChangesModal } from './CorrelationUnsavedChangesModal';
+import { showModalMessage } from './correlationEditLogic';
 import { saveCurrentCorrelation } from './state/correlations';
 import { changeDatasource } from './state/datasource';
 import { changeCorrelationHelperData } from './state/explorePane';
 import { changeCorrelationEditorDetails, splitClose } from './state/main';
 import { runQueries } from './state/query';
-import { selectCorrelationDetails } from './state/selectors';
+import { selectCorrelationDetails, selectIsHelperShowing } from './state/selectors';
 
 export const CorrelationEditorModeBar = ({ panes }: { panes: Array<[string, ExploreItemState]> }) => {
   const dispatch = useDispatch();
   const styles = useStyles2(getStyles);
   const correlationDetails = useSelector(selectCorrelationDetails);
-  const [showSavePrompt, setShowSavePrompt] = useState(false);
+  const isHelperShowing = useSelector(selectIsHelperShowing);
+  const [saveMessage, setSaveMessage] = useState<string | undefined>(undefined); // undefined means do not show
 
   // handle refreshing and closing the tab
-  useBeforeUnload(correlationDetails?.dirty || false, 'Save correlation?');
+  useBeforeUnload(correlationDetails?.correlationDirty || false, 'Save correlation?');
+  useBeforeUnload(
+    (!correlationDetails?.correlationDirty && correlationDetails?.queryEditorDirty) || false,
+    'The query editor was changed. Save correlation before continuing?'
+  );
 
-  // handle exiting (staying within explore)
+  // decide if we are displaying prompt, perform action if not
   useEffect(() => {
-    if (correlationDetails?.isExiting && correlationDetails?.dirty) {
-      setShowSavePrompt(true);
-    } else if (correlationDetails?.isExiting && !correlationDetails?.dirty) {
-      dispatch(
-        changeCorrelationEditorDetails({
-          editorMode: false,
-          dirty: false,
-          isExiting: false,
-        })
-      );
+    if (correlationDetails?.isExiting) {
+      const { correlationDirty, queryEditorDirty } = correlationDetails;
+      let isActionLeft = undefined;
+      let action = undefined;
+      if (correlationDetails.postConfirmAction) {
+        isActionLeft = correlationDetails.postConfirmAction.isActionLeft;
+        action = correlationDetails.postConfirmAction.action;
+      } else {
+        // closing the editor only
+        action = CORRELATION_EDITOR_POST_CONFIRM_ACTION.CLOSE_EDITOR;
+        isActionLeft = false;
+      }
+
+      const modalMessage = showModalMessage(action, isActionLeft, correlationDirty, queryEditorDirty);
+      if (modalMessage !== undefined) {
+        setSaveMessage(modalMessage);
+      } else {
+        // if no prompt, perform action
+        if (
+          action === CORRELATION_EDITOR_POST_CONFIRM_ACTION.CHANGE_DATASOURCE &&
+          correlationDetails.postConfirmAction
+        ) {
+          const { exploreId, changeDatasourceUid } = correlationDetails?.postConfirmAction;
+          if (exploreId && changeDatasourceUid) {
+            dispatch(
+              changeDatasource({ exploreId, datasource: changeDatasourceUid, options: { importQueries: true } })
+            );
+            dispatch(
+              changeCorrelationEditorDetails({
+                isExiting: false,
+              })
+            );
+          }
+        } else if (
+          action === CORRELATION_EDITOR_POST_CONFIRM_ACTION.CLOSE_PANE &&
+          correlationDetails.postConfirmAction
+        ) {
+          const { exploreId } = correlationDetails?.postConfirmAction;
+          if (exploreId !== undefined) {
+            dispatch(splitClose(exploreId));
+            dispatch(
+              changeCorrelationEditorDetails({
+                isExiting: false,
+              })
+            );
+          }
+        } else if (action === CORRELATION_EDITOR_POST_CONFIRM_ACTION.CLOSE_EDITOR) {
+          dispatch(
+            changeCorrelationEditorDetails({
+              editorMode: false,
+            })
+          );
+        }
+      }
     }
-  }, [correlationDetails?.dirty, correlationDetails?.isExiting, dispatch]);
+  }, [correlationDetails, dispatch, isHelperShowing]);
 
   // clear data when unmounted
   useUnmount(() => {
@@ -46,7 +96,7 @@ export const CorrelationEditorModeBar = ({ panes }: { panes: Array<[string, Expl
       changeCorrelationEditorDetails({
         editorMode: false,
         isExiting: false,
-        dirty: false,
+        correlationDirty: false,
         label: undefined,
         description: undefined,
         canSave: false,
@@ -64,15 +114,12 @@ export const CorrelationEditorModeBar = ({ panes }: { panes: Array<[string, Expl
     });
   });
 
-  const closePaneAndReset = (exploreId: string) => {
-    setShowSavePrompt(false);
-    dispatch(splitClose(exploreId));
-    reportInteraction('grafana_explore_split_view_closed');
+  const resetEditor = () => {
     dispatch(
       changeCorrelationEditorDetails({
         editorMode: true,
         isExiting: false,
-        dirty: false,
+        correlationDirty: false,
         label: undefined,
         description: undefined,
         canSave: false,
@@ -90,43 +137,39 @@ export const CorrelationEditorModeBar = ({ panes }: { panes: Array<[string, Expl
     });
   };
 
-  const changeDatasourceAndReset = (exploreId: string, datasourceUid: string) => {
-    setShowSavePrompt(false);
-    dispatch(changeDatasource(exploreId, datasourceUid, { importQueries: true }));
-    dispatch(
-      changeCorrelationEditorDetails({
-        editorMode: true,
-        isExiting: false,
-        dirty: false,
-        label: undefined,
-        description: undefined,
-        canSave: false,
-      })
-    );
-    panes.forEach((pane) => {
-      dispatch(
-        changeCorrelationHelperData({
-          exploreId: pane[0],
-          correlationEditorHelperData: undefined,
-        })
-      );
-    });
+  const closePane = (exploreId: string) => {
+    setSaveMessage(undefined);
+    dispatch(splitClose(exploreId));
+    reportInteraction('grafana_explore_split_view_closed');
   };
 
-  const saveCorrelation = (skipPostConfirmAction: boolean) => {
-    dispatch(saveCurrentCorrelation(correlationDetails?.label, correlationDetails?.description));
+  const changeDatasourcePostAction = (exploreId: string, datasourceUid: string) => {
+    setSaveMessage(undefined);
+    dispatch(changeDatasource({ exploreId, datasource: datasourceUid, options: { importQueries: true } }));
+  };
+
+  const saveCorrelationPostAction = (skipPostConfirmAction: boolean) => {
+    dispatch(
+      saveCurrentCorrelation(
+        correlationDetails?.label,
+        correlationDetails?.description,
+        correlationDetails?.transformations
+      )
+    );
     if (!skipPostConfirmAction && correlationDetails?.postConfirmAction !== undefined) {
       const { exploreId, action, changeDatasourceUid } = correlationDetails?.postConfirmAction;
       if (action === CORRELATION_EDITOR_POST_CONFIRM_ACTION.CLOSE_PANE) {
-        closePaneAndReset(exploreId);
+        closePane(exploreId);
+        resetEditor();
       } else if (
         action === CORRELATION_EDITOR_POST_CONFIRM_ACTION.CHANGE_DATASOURCE &&
         changeDatasourceUid !== undefined
       ) {
-        changeDatasourceAndReset(exploreId, changeDatasourceUid);
+        changeDatasource({ exploreId, datasource: changeDatasourceUid });
+        resetEditor();
       }
     } else {
-      dispatch(changeCorrelationEditorDetails({ editorMode: false, dirty: false, isExiting: false }));
+      dispatch(changeCorrelationEditorDetails({ editorMode: false, correlationDirty: false, isExiting: false }));
     }
   };
 
@@ -138,7 +181,7 @@ export const CorrelationEditorModeBar = ({ panes }: { panes: Array<[string, Expl
           if (
             location.pathname !== '/explore' &&
             (correlationDetails?.editorMode || false) &&
-            (correlationDetails?.dirty || false)
+            (correlationDetails?.correlationDirty || false)
           ) {
             return 'You have unsaved correlation data. Continue?';
           } else {
@@ -147,19 +190,20 @@ export const CorrelationEditorModeBar = ({ panes }: { panes: Array<[string, Expl
         }}
       />
 
-      {showSavePrompt && (
+      {saveMessage !== undefined && (
         <CorrelationUnsavedChangesModal
           onDiscard={() => {
             if (correlationDetails?.postConfirmAction !== undefined) {
               const { exploreId, action, changeDatasourceUid } = correlationDetails?.postConfirmAction;
               if (action === CORRELATION_EDITOR_POST_CONFIRM_ACTION.CLOSE_PANE) {
-                closePaneAndReset(exploreId);
+                closePane(exploreId);
               } else if (
                 action === CORRELATION_EDITOR_POST_CONFIRM_ACTION.CHANGE_DATASOURCE &&
                 changeDatasourceUid !== undefined
               ) {
-                changeDatasourceAndReset(exploreId, changeDatasourceUid);
+                changeDatasourcePostAction(exploreId, changeDatasourceUid);
               }
+              dispatch(changeCorrelationEditorDetails({ isExiting: false }));
             } else {
               // exit correlations mode
               // if we are discarding the in progress correlation, reset everything
@@ -167,7 +211,7 @@ export const CorrelationEditorModeBar = ({ panes }: { panes: Array<[string, Expl
               dispatch(
                 changeCorrelationEditorDetails({
                   editorMode: false,
-                  dirty: false,
+                  correlationDirty: false,
                   isExiting: false,
                 })
               );
@@ -176,11 +220,12 @@ export const CorrelationEditorModeBar = ({ panes }: { panes: Array<[string, Expl
           onCancel={() => {
             // if we are cancelling the exit, set the editor mode back to true and hide the prompt
             dispatch(changeCorrelationEditorDetails({ isExiting: false }));
-            setShowSavePrompt(false);
+            setSaveMessage(undefined);
           }}
           onSave={() => {
-            saveCorrelation(false);
+            saveCorrelationPostAction(false);
           }}
+          message={saveMessage}
         />
       )}
       <div className={styles.correlationEditorTop}>
@@ -194,7 +239,7 @@ export const CorrelationEditorModeBar = ({ panes }: { panes: Array<[string, Expl
             fill="outline"
             className={correlationDetails?.canSave ? styles.buttonColor : styles.disabledButtonColor}
             onClick={() => {
-              saveCorrelation(true);
+              saveCorrelationPostAction(true);
             }}
           >
             Save
diff --git a/public/app/features/explore/CorrelationHelper.tsx b/public/app/features/explore/CorrelationHelper.tsx
index fecf3d03af5ce..c352410ddb596 100644
--- a/public/app/features/explore/CorrelationHelper.tsx
+++ b/public/app/features/explore/CorrelationHelper.tsx
@@ -1,14 +1,35 @@
+import { css } from '@emotion/css';
 import React, { useState, useEffect, useId } from 'react';
 import { useForm } from 'react-hook-form';
+import { useAsync } from 'react-use';
 
-import { ExploreCorrelationHelperData } from '@grafana/data';
-import { Collapse, Alert, Field, Input } from '@grafana/ui';
+import { DataLinkTransformationConfig, ExploreCorrelationHelperData, GrafanaTheme2 } from '@grafana/data';
+import {
+  Collapse,
+  Alert,
+  Field,
+  Input,
+  Button,
+  Card,
+  IconButton,
+  useStyles2,
+  DeleteButton,
+  Tooltip,
+  Icon,
+  Stack,
+} from '@grafana/ui';
 import { useDispatch, useSelector } from 'app/types';
 
+import { getTransformationVars } from '../correlations/transformations';
+import { generateDefaultLabel } from '../correlations/utils';
+
+import { CorrelationTransformationAddModal } from './CorrelationTransformationAddModal';
+import { changeCorrelationHelperData } from './state/explorePane';
 import { changeCorrelationEditorDetails } from './state/main';
-import { selectCorrelationDetails } from './state/selectors';
+import { selectCorrelationDetails, selectPanes } from './state/selectors';
 
 interface Props {
+  exploreId: string;
   correlations: ExploreCorrelationHelperData;
 }
 
@@ -17,60 +38,242 @@ interface FormValues {
   description: string;
 }
 
-export const CorrelationHelper = ({ correlations }: Props) => {
+export const CorrelationHelper = ({ exploreId, correlations }: Props) => {
   const dispatch = useDispatch();
-  const { register, watch } = useForm<FormValues>();
-  const [isOpen, setIsOpen] = useState(false);
+  const styles = useStyles2(getStyles);
+  const panes = useSelector(selectPanes);
+  const panesVals = Object.values(panes);
+  const { value: defaultLabel, loading: loadingLabel } = useAsync(
+    async () => await generateDefaultLabel(panesVals[0]!, panesVals[1]!),
+    [
+      panesVals[0]?.datasourceInstance,
+      panesVals[0]?.queries[0].datasource,
+      panesVals[1]?.datasourceInstance,
+      panesVals[1]?.queries[0].datasource,
+    ]
+  );
+
+  const { register, watch, getValues, setValue } = useForm<FormValues>();
+  const [isLabelDescOpen, setIsLabelDescOpen] = useState(false);
+  const [isTransformOpen, setIsTransformOpen] = useState(false);
+  const [showTransformationAddModal, setShowTransformationAddModal] = useState(false);
+  const [transformations, setTransformations] = useState<DataLinkTransformationConfig[]>([]);
+  const [transformationIdxToEdit, setTransformationIdxToEdit] = useState<number | undefined>(undefined);
   const correlationDetails = useSelector(selectCorrelationDetails);
   const id = useId();
 
+  // only fire once on mount to allow save button to enable / disable when unmounted
   useEffect(() => {
-    const subscription = watch((value) => {
-      let dirty = false;
+    dispatch(changeCorrelationEditorDetails({ canSave: true }));
+    return () => {
+      dispatch(changeCorrelationEditorDetails({ canSave: false }));
+    };
+  }, [dispatch]);
+
+  useEffect(() => {
+    if (
+      !loadingLabel &&
+      defaultLabel !== undefined &&
+      !correlationDetails?.correlationDirty &&
+      getValues('label') !== ''
+    ) {
+      setValue('label', defaultLabel);
+    }
+  }, [correlationDetails?.correlationDirty, defaultLabel, getValues, loadingLabel, setValue]);
 
-      if (!correlationDetails?.dirty && (value.label !== '' || value.description !== '')) {
+  useEffect(() => {
+    const subscription = watch((value) => {
+      let dirty = correlationDetails?.correlationDirty || false;
+      let description = value.description || '';
+      if (!dirty && (value.label !== defaultLabel || description !== '')) {
         dirty = true;
-      } else if (correlationDetails?.dirty && value.label.trim() === '' && value.description.trim() === '') {
+      } else if (dirty && value.label === defaultLabel && description.trim() === '') {
         dirty = false;
       }
-      dispatch(changeCorrelationEditorDetails({ label: value.label, description: value.description, dirty: dirty }));
+      dispatch(
+        changeCorrelationEditorDetails({ label: value.label, description: value.description, correlationDirty: dirty })
+      );
     });
     return () => subscription.unsubscribe();
-  }, [correlationDetails?.dirty, dispatch, watch]);
+  }, [correlationDetails?.correlationDirty, defaultLabel, dispatch, watch]);
 
-  // only fire once on mount to allow save button to enable / disable when unmounted
   useEffect(() => {
-    dispatch(changeCorrelationEditorDetails({ canSave: true }));
+    const dirty =
+      !correlationDetails?.correlationDirty && transformations.length > 0 ? true : correlationDetails?.correlationDirty;
+    dispatch(changeCorrelationEditorDetails({ transformations: transformations, correlationDirty: dirty }));
+    let transVarRecords: Record<string, string> = {};
+    transformations.forEach((transformation) => {
+      const transformationVars = getTransformationVars(
+        {
+          type: transformation.type,
+          expression: transformation.expression,
+          mapValue: transformation.mapValue,
+        },
+        correlations.vars[transformation.field!],
+        transformation.field!
+      );
 
-    return () => {
-      dispatch(changeCorrelationEditorDetails({ canSave: false }));
-    };
-  }, [dispatch]);
+      Object.keys(transformationVars).forEach((key) => {
+        transVarRecords[key] = transformationVars[key]?.value;
+      });
+    });
+
+    dispatch(
+      changeCorrelationHelperData({
+        exploreId: exploreId,
+        correlationEditorHelperData: {
+          resultField: correlations.resultField,
+          origVars: correlations.origVars,
+          vars: { ...correlations.origVars, ...transVarRecords },
+        },
+      })
+    );
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [dispatch, transformations]);
 
   return (
-    <Alert title="Correlation details" severity="info">
-      The correlation link will appear by the <code>{correlations.resultField}</code> field. You can use the following
-      variables to set up your correlations:
-      <pre>
-        {Object.entries(correlations.vars).map((entry) => {
-          return `\$\{${entry[0]}\} = ${entry[1]}\n`;
-        })}
-      </pre>
-      <Collapse
-        collapsible
-        isOpen={isOpen}
-        onToggle={() => {
-          setIsOpen(!isOpen);
-        }}
-        label="Label/Description"
-      >
-        <Field label="Label" htmlFor={`${id}-label`}>
-          <Input {...register('label')} id={`${id}-label`} />
-        </Field>
-        <Field label="Description" htmlFor={`${id}-description`}>
-          <Input {...register('description')} id={`${id}-description`} />
-        </Field>
-      </Collapse>
-    </Alert>
+    <>
+      {showTransformationAddModal && (
+        <CorrelationTransformationAddModal
+          onCancel={() => {
+            setTransformationIdxToEdit(undefined);
+            setShowTransformationAddModal(false);
+          }}
+          onSave={(transformation: DataLinkTransformationConfig) => {
+            if (transformationIdxToEdit !== undefined) {
+              const editTransformations = [...transformations];
+              editTransformations[transformationIdxToEdit] = transformation;
+              setTransformations(editTransformations);
+              setTransformationIdxToEdit(undefined);
+            } else {
+              setTransformations([...transformations, transformation]);
+            }
+            setShowTransformationAddModal(false);
+          }}
+          fieldList={correlations.origVars}
+          transformationToEdit={
+            transformationIdxToEdit !== undefined ? transformations[transformationIdxToEdit] : undefined
+          }
+        />
+      )}
+      <Alert title="Correlation details" severity="info">
+        The correlation link will appear by the <code>{correlations.resultField}</code> field. You can use the following
+        variables to set up your correlations:
+        <pre>
+          {Object.entries(correlations.vars).map((entry) => {
+            return `\$\{${entry[0]}\} = ${entry[1]}\n`;
+          })}
+        </pre>
+        <Collapse
+          collapsible
+          isOpen={isLabelDescOpen}
+          onToggle={() => {
+            setIsLabelDescOpen(!isLabelDescOpen);
+          }}
+          label={
+            <Stack gap={1} direction="row" wrap="wrap" alignItems="center">
+              Label / Description
+              {!isLabelDescOpen && !loadingLabel && (
+                <span className={styles.labelCollapseDetails}>{`Label: ${getValues('label') || defaultLabel}`}</span>
+              )}
+            </Stack>
+          }
+        >
+          <Field label="Label" htmlFor={`${id}-label`}>
+            <Input
+              {...register('label')}
+              id={`${id}-label`}
+              onBlur={() => {
+                if (getValues('label') === '' && defaultLabel !== undefined) {
+                  setValue('label', defaultLabel);
+                }
+              }}
+            />
+          </Field>
+          <Field label="Description" htmlFor={`${id}-description`}>
+            <Input {...register('description')} id={`${id}-description`} />
+          </Field>
+        </Collapse>
+        <Collapse
+          collapsible
+          isOpen={isTransformOpen}
+          onToggle={() => {
+            setIsTransformOpen(!isTransformOpen);
+          }}
+          label={
+            <Stack gap={1} direction="row" wrap="wrap" alignItems="center">
+              Transformations
+              <Tooltip content="A transformation extracts one or more variables out of a single field.">
+                <Icon name="info-circle" size="sm" />
+              </Tooltip>
+            </Stack>
+          }
+        >
+          <Button
+            variant="secondary"
+            fill="outline"
+            onClick={() => {
+              setShowTransformationAddModal(true);
+            }}
+            className={styles.transformationAction}
+          >
+            Add transformation
+          </Button>
+          {transformations.map((transformation, i) => {
+            const { type, field, expression, mapValue } = transformation;
+            const detailsString = [
+              (mapValue ?? '').length > 0 ? `Variable name: ${mapValue}` : undefined,
+              (expression ?? '').length > 0 ? (
+                <>
+                  Expression: <code>{expression}</code>
+                </>
+              ) : undefined,
+            ].filter((val) => val);
+            return (
+              <Card key={`trans-${i}`}>
+                <Card.Heading>
+                  {field}: {type}
+                </Card.Heading>
+                {detailsString.length > 0 && (
+                  <Card.Meta className={styles.transformationMeta}>{detailsString}</Card.Meta>
+                )}
+                <Card.SecondaryActions>
+                  <IconButton
+                    key="edit"
+                    name="edit"
+                    aria-label="edit transformation"
+                    onClick={() => {
+                      setTransformationIdxToEdit(i);
+                      setShowTransformationAddModal(true);
+                    }}
+                  />
+                  <DeleteButton
+                    aria-label="delete transformation"
+                    onConfirm={() => setTransformations(transformations.filter((_, idx) => i !== idx))}
+                    closeOnConfirm
+                  />
+                </Card.SecondaryActions>
+              </Card>
+            );
+          })}
+        </Collapse>
+      </Alert>
+    </>
   );
 };
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    labelCollapseDetails: css({
+      marginLeft: theme.spacing(2),
+      ...theme.typography['bodySmall'],
+      fontStyle: 'italic',
+    }),
+    transformationAction: css({
+      marginBottom: theme.spacing(2),
+    }),
+    transformationMeta: css({
+      alignItems: 'baseline',
+    }),
+  };
+};
diff --git a/public/app/features/explore/CorrelationTransformationAddModal.tsx b/public/app/features/explore/CorrelationTransformationAddModal.tsx
new file mode 100644
index 0000000000000..f99414d589035
--- /dev/null
+++ b/public/app/features/explore/CorrelationTransformationAddModal.tsx
@@ -0,0 +1,243 @@
+import { css } from '@emotion/css';
+import React, { useId, useState, useMemo, useEffect } from 'react';
+import Highlighter from 'react-highlight-words';
+import { useForm, Controller } from 'react-hook-form';
+
+import { DataLinkTransformationConfig, ScopedVars } from '@grafana/data';
+import { Button, Field, Icon, Input, Label, Modal, Select, Tooltip, Stack } from '@grafana/ui';
+
+import {
+  getSupportedTransTypeDetails,
+  getTransformOptions,
+  TransformationFieldDetails,
+} from '../correlations/Forms/types';
+import { getTransformationVars } from '../correlations/transformations';
+
+interface CorrelationTransformationAddModalProps {
+  onCancel: () => void;
+  onSave: (transformation: DataLinkTransformationConfig) => void;
+  fieldList: Record<string, string>;
+  transformationToEdit?: DataLinkTransformationConfig;
+}
+
+interface ShowFormFields {
+  expressionDetails: TransformationFieldDetails;
+  mapValueDetails: TransformationFieldDetails;
+}
+
+const LabelWithTooltip = ({ label, tooltipText }: { label: string; tooltipText: string }) => (
+  <Stack gap={1} direction="row" wrap="wrap" alignItems="flex-start">
+    <Label>{label}</Label>
+    <Tooltip content={tooltipText}>
+      <Icon name="info-circle" size="sm" />
+    </Tooltip>
+  </Stack>
+);
+
+export const CorrelationTransformationAddModal = ({
+  onSave,
+  onCancel,
+  fieldList,
+  transformationToEdit,
+}: CorrelationTransformationAddModalProps) => {
+  const [exampleValue, setExampleValue] = useState<string | undefined>(undefined);
+  const [transformationVars, setTransformationVars] = useState<ScopedVars>({});
+  const [formFieldsVis, setFormFieldsVis] = useState<ShowFormFields>({
+    mapValueDetails: { show: false },
+    expressionDetails: { show: false },
+  });
+  const [isExpValid, setIsExpValid] = useState(false); // keep the highlighter from erroring on bad expressions
+  const [validToSave, setValidToSave] = useState(false);
+  const { getValues, control, register, watch } = useForm<DataLinkTransformationConfig>({
+    defaultValues: useMemo(() => {
+      if (transformationToEdit) {
+        const exampleVal = fieldList[transformationToEdit?.field!];
+        setExampleValue(exampleVal);
+        if (transformationToEdit?.expression) {
+          setIsExpValid(true);
+        }
+        const transformationTypeDetails = getSupportedTransTypeDetails(transformationToEdit?.type!);
+        setFormFieldsVis({
+          mapValueDetails: transformationTypeDetails.mapValueDetails,
+          expressionDetails: transformationTypeDetails.expressionDetails,
+        });
+
+        const transformationVars = getTransformationVars(
+          {
+            type: transformationToEdit?.type!,
+            expression: transformationToEdit?.expression,
+            mapValue: transformationToEdit?.mapValue,
+          },
+          exampleVal || '',
+          transformationToEdit?.field!
+        );
+        setTransformationVars({ ...transformationVars });
+        setValidToSave(true);
+        return {
+          type: transformationToEdit?.type,
+          field: transformationToEdit?.field,
+          mapValue: transformationToEdit?.mapValue,
+          expression: transformationToEdit?.expression,
+        };
+      } else {
+        return undefined;
+      }
+    }, [fieldList, transformationToEdit]),
+  });
+  const id = useId();
+
+  useEffect(() => {
+    const subscription = watch((formValues) => {
+      const expression = formValues.expression;
+      let isExpressionValid = false;
+      if (expression !== undefined) {
+        isExpressionValid = true;
+        try {
+          new RegExp(expression);
+        } catch (e) {
+          isExpressionValid = false;
+        }
+      } else {
+        isExpressionValid = !formFieldsVis.expressionDetails.show;
+      }
+      setIsExpValid(isExpressionValid);
+      let transKeys = [];
+      if (formValues.type) {
+        const transformationVars = getTransformationVars(
+          {
+            type: formValues.type,
+            expression: isExpressionValid ? expression : '',
+            mapValue: formValues.mapValue,
+          },
+          fieldList[formValues.field!] || '',
+          formValues.field!
+        );
+
+        transKeys = Object.keys(transformationVars);
+        setTransformationVars(transKeys.length > 0 ? { ...transformationVars } : {});
+      }
+
+      if (transKeys.length === 0 || !isExpressionValid) {
+        setValidToSave(false);
+      } else {
+        setValidToSave(true);
+      }
+    });
+    return () => subscription.unsubscribe();
+  }, [fieldList, formFieldsVis.expressionDetails.show, watch]);
+
+  return (
+    <Modal
+      isOpen={true}
+      title={`${transformationToEdit ? 'Edit' : 'Add'} transformation`}
+      onDismiss={onCancel}
+      className={css({ width: '700px' })}
+    >
+      <p>
+        A transformation extracts variables out of a single field. These variables will be available along with your
+        field variables.
+      </p>
+      <Field label="Field">
+        <Controller
+          control={control}
+          render={({ field: { onChange, ref, ...field } }) => (
+            <Select
+              {...field}
+              onChange={(value) => {
+                if (value.value) {
+                  onChange(value.value);
+                  setExampleValue(fieldList[value.value]);
+                }
+              }}
+              options={Object.entries(fieldList).map((entry) => {
+                return { label: entry[0], value: entry[0] };
+              })}
+              aria-label="field"
+            />
+          )}
+          name={`field` as const}
+        />
+      </Field>
+
+      {exampleValue && (
+        <>
+          <pre>
+            <Highlighter
+              textToHighlight={exampleValue}
+              searchWords={[isExpValid ? getValues('expression') ?? '' : '']}
+              autoEscape={false}
+            />
+          </pre>
+          <Field label="Type">
+            <Controller
+              control={control}
+              render={({ field: { onChange, ref, ...field } }) => (
+                <Select
+                  {...field}
+                  onChange={(value) => {
+                    onChange(value.value);
+                    const transformationTypeDetails = getSupportedTransTypeDetails(value.value!);
+                    setFormFieldsVis({
+                      mapValueDetails: transformationTypeDetails.mapValueDetails,
+                      expressionDetails: transformationTypeDetails.expressionDetails,
+                    });
+                  }}
+                  options={getTransformOptions()}
+                  aria-label="type"
+                />
+              )}
+              name={`type` as const}
+            />
+          </Field>
+          {formFieldsVis.expressionDetails.show && (
+            <Field
+              label={
+                formFieldsVis.expressionDetails.helpText ? (
+                  <LabelWithTooltip label="Expression" tooltipText={formFieldsVis.expressionDetails.helpText} />
+                ) : (
+                  'Expression'
+                )
+              }
+              htmlFor={`${id}-expression`}
+              required={formFieldsVis.expressionDetails.required}
+            >
+              <Input {...register('expression')} id={`${id}-expression`} />
+            </Field>
+          )}
+          {formFieldsVis.mapValueDetails.show && (
+            <Field
+              label={
+                formFieldsVis.mapValueDetails.helpText ? (
+                  <LabelWithTooltip label="Variable Name" tooltipText={formFieldsVis.mapValueDetails.helpText} />
+                ) : (
+                  'Variable Name'
+                )
+              }
+              htmlFor={`${id}-mapValue`}
+            >
+              <Input {...register('mapValue')} id={`${id}-mapValue`} />
+            </Field>
+          )}
+          {Object.entries(transformationVars).length > 0 && (
+            <>
+              This transformation will add the following variables:
+              <pre>
+                {Object.entries(transformationVars).map((entry) => {
+                  return `\$\{${entry[0]}\} = ${entry[1]?.value}\n`;
+                })}
+              </pre>
+            </>
+          )}
+        </>
+      )}
+      <Modal.ButtonRow>
+        <Button variant="secondary" onClick={onCancel} fill="outline">
+          Cancel
+        </Button>
+        <Button variant="primary" onClick={() => onSave(getValues())} disabled={!validToSave}>
+          {transformationToEdit ? 'Edit transformation' : 'Add transformation to correlation'}
+        </Button>
+      </Modal.ButtonRow>
+    </Modal>
+  );
+};
diff --git a/public/app/features/explore/CorrelationUnsavedChangesModal.tsx b/public/app/features/explore/CorrelationUnsavedChangesModal.tsx
index 19100150fd99a..45883d7a87b73 100644
--- a/public/app/features/explore/CorrelationUnsavedChangesModal.tsx
+++ b/public/app/features/explore/CorrelationUnsavedChangesModal.tsx
@@ -4,27 +4,28 @@ import React from 'react';
 import { Button, Modal } from '@grafana/ui';
 
 interface UnsavedChangesModalProps {
+  message: string;
   onDiscard: () => void;
   onCancel: () => void;
   onSave: () => void;
 }
 
-export const CorrelationUnsavedChangesModal = ({ onSave, onDiscard, onCancel }: UnsavedChangesModalProps) => {
+export const CorrelationUnsavedChangesModal = ({ onSave, onDiscard, onCancel, message }: UnsavedChangesModalProps) => {
   return (
     <Modal
       isOpen={true}
-      title="Unsaved changes to correlation"
+      title={`Unsaved changes to correlation`}
       onDismiss={onCancel}
       icon="exclamation-triangle"
-      className={css({ width: '500px' })}
+      className={css({ width: '600px' })}
     >
-      <h5>Do you want to save changes to this Correlation?</h5>
+      <h5>{message}</h5>
       <Modal.ButtonRow>
         <Button variant="secondary" onClick={onCancel} fill="outline">
           Cancel
         </Button>
         <Button variant="destructive" onClick={onDiscard}>
-          Discard correlation
+          Continue without saving
         </Button>
         <Button variant="primary" onClick={onSave}>
           Save correlation
diff --git a/public/app/features/explore/Explore.test.tsx b/public/app/features/explore/Explore.test.tsx
index 68de610f7c43e..420fd5fd7105a 100644
--- a/public/app/features/explore/Explore.test.tsx
+++ b/public/app/features/explore/Explore.test.tsx
@@ -1,6 +1,6 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
-import { AutoSizerProps } from 'react-virtualized-auto-sizer';
+import { Props as AutoSizerProps } from 'react-virtualized-auto-sizer';
 import { TestProvider } from 'test/helpers/TestProvider';
 
 import { CoreApp, createTheme, DataSourceApi, EventBusSrv, LoadingState, PluginExtensionTypes } from '@grafana/data';
@@ -124,7 +124,13 @@ jest.mock('@grafana/runtime', () => ({
 
 // for the AutoSizer component to have a width
 jest.mock('react-virtualized-auto-sizer', () => {
-  return ({ children }: AutoSizerProps) => children({ height: 1, width: 1 });
+  return ({ children }: AutoSizerProps) =>
+    children({
+      height: 1,
+      scaledHeight: 1,
+      scaledWidth: 1,
+      width: 1,
+    });
 });
 
 const getPluginLinkExtensionsMock = jest.mocked(getPluginLinkExtensions);
diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx
index 1fca13ba665f4..da1c8540c82c3 100644
--- a/public/app/features/explore/Explore.tsx
+++ b/public/app/features/explore/Explore.tsx
@@ -1,12 +1,13 @@
 import { css, cx } from '@emotion/css';
 import { get, groupBy } from 'lodash';
 import memoizeOne from 'memoize-one';
-import React, { createRef } from 'react';
+import React from 'react';
 import { connect, ConnectedProps } from 'react-redux';
-import AutoSizer from 'react-virtualized-auto-sizer';
+import AutoSizer, { HorizontalSize } from 'react-virtualized-auto-sizer';
 
 import {
   AbsoluteTimeRange,
+  DataFrame,
   EventBus,
   GrafanaTheme2,
   hasToggleableQueryFiltersSupport,
@@ -17,7 +18,7 @@ import {
   SupplementaryQueryType,
 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { config, getDataSourceSrv, reportInteraction } from '@grafana/runtime';
+import { getDataSourceSrv, reportInteraction } from '@grafana/runtime';
 import { DataQuery } from '@grafana/schema';
 import {
   AdHocFilterItem,
@@ -92,9 +93,6 @@ const getStyles = (theme: GrafanaTheme2) => {
       paddingRight: theme.spacing(2),
       marginBottom: theme.spacing(2),
     }),
-    left: css({
-      marginBottom: theme.spacing(2),
-    }),
     wrapper: css({
       position: 'absolute',
       top: 0,
@@ -151,7 +149,6 @@ export type Props = ExploreProps & ConnectedProps<typeof connector>;
 
 export class Explore extends React.PureComponent<Props, ExploreState> {
   scrollElement: HTMLDivElement | undefined;
-  topOfViewRef = createRef<HTMLDivElement>();
   graphEventBus: EventBus;
   logsEventBus: EventBus;
   memoizedGetNodeGraphDataFrames = memoizeOne(getNodeGraphDataFrames);
@@ -205,16 +202,13 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
    * TODO: In the future, we would like to return active filters based the query that produced the log line.
    * @alpha
    */
-  isFilterLabelActive = async (key: string, value: string, refId?: string) => {
-    if (!config.featureToggles.toggleLabelsInLogsUI) {
-      return false;
-    }
+  isFilterLabelActive = async (key: string, value: string | number, refId?: string) => {
     const query = this.props.queries.find((q) => q.refId === refId);
     if (!query) {
       return false;
     }
     const ds = await getDataSourceSrv().get(query.datasource);
-    if (hasToggleableQueryFiltersSupport(ds) && ds.queryHasFilter(query, { key, value })) {
+    if (hasToggleableQueryFiltersSupport(ds) && ds.queryHasFilter(query, { key, value: value.toString() })) {
       return true;
     }
     return false;
@@ -223,15 +217,43 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
   /**
    * Used by Logs details.
    */
-  onClickFilterLabel = (key: string, value: string, refId?: string) => {
-    this.onModifyQueries({ type: 'ADD_FILTER', options: { key, value } }, refId);
+  onClickFilterLabel = (key: string, value: string | number, frame?: DataFrame) => {
+    this.onModifyQueries(
+      {
+        type: 'ADD_FILTER',
+        options: { key, value: value.toString() },
+        frame,
+      },
+      frame?.refId
+    );
   };
 
   /**
    * Used by Logs details.
    */
-  onClickFilterOutLabel = (key: string, value: string, refId?: string) => {
-    this.onModifyQueries({ type: 'ADD_FILTER_OUT', options: { key, value } }, refId);
+  onClickFilterOutLabel = (key: string, value: string | number, frame?: DataFrame) => {
+    this.onModifyQueries(
+      {
+        type: 'ADD_FILTER_OUT',
+        options: { key, value: value.toString() },
+        frame,
+      },
+      frame?.refId
+    );
+  };
+
+  /**
+   * Used by Logs Popover Menu.
+   */
+  onClickFilterValue = (value: string | number, refId?: string) => {
+    this.onModifyQueries({ type: 'ADD_STRING_FILTER', options: { value: value.toString() } }, refId);
+  };
+
+  /**
+   * Used by Logs Popover Menu.
+   */
+  onClickFilterOutValue = (value: string | number, refId?: string) => {
+    this.onModifyQueries({ type: 'ADD_STRING_FILTER_OUT', options: { value: value.toString() } }, refId);
   };
 
   onClickAddQueryRowButton = () => {
@@ -254,10 +276,12 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
         return query;
       }
       const ds = await getDataSourceSrv().get(datasource);
-      if (hasToggleableQueryFiltersSupport(ds) && config.featureToggles.toggleLabelsInLogsUI) {
+      const toggleableFilters = ['ADD_FILTER', 'ADD_FILTER_OUT'];
+      if (hasToggleableQueryFiltersSupport(ds) && toggleableFilters.includes(modification.type)) {
         return ds.toggleQueryFilter(query, {
           type: modification.type === 'ADD_FILTER' ? 'FILTER_FOR' : 'FILTER_OUT',
           options: modification.options ?? {},
+          frame: modification.frame,
         });
       }
       if (ds.modifyQuery) {
@@ -269,7 +293,7 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
     this.props.modifyQueries(this.props.exploreId, action, modifier);
   };
 
-  onResize = (size: { height: number; width: number }) => {
+  onResize = (size: HorizontalSize) => {
     this.props.changeSize(this.props.exploreId, size);
   };
 
@@ -343,7 +367,7 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
 
     return Object.entries(groupedByPlugin).map(([pluginId, frames], index) => {
       return (
-        <ContentOutlineItem title={pluginId} icon="plug" key={index}>
+        <ContentOutlineItem panelId={pluginId} title={pluginId} icon="plug" key={index}>
           <CustomContainer
             key={index}
             timeZone={timeZone}
@@ -365,7 +389,7 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
     const { graphResult, absoluteRange, timeZone, queryResponse, showFlameGraph } = this.props;
 
     return (
-      <ContentOutlineItem title="Graph" icon="graph-bar">
+      <ContentOutlineItem panelId="Graph" title="Graph" icon="graph-bar">
         <GraphContainer
           data={graphResult!}
           height={showFlameGraph ? 180 : 400}
@@ -385,7 +409,7 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
   renderTablePanel(width: number) {
     const { exploreId, timeZone } = this.props;
     return (
-      <ContentOutlineItem title="Table" icon="table">
+      <ContentOutlineItem panelId="Table" title="Table" icon="table">
         <TableContainer
           ariaLabel={selectors.pages.Explore.General.table}
           width={width}
@@ -401,7 +425,7 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
   renderRawPrometheus(width: number) {
     const { exploreId, datasourceInstance, timeZone } = this.props;
     return (
-      <ContentOutlineItem title="Raw Prometheus" icon="gf-prometheus">
+      <ContentOutlineItem panelId="Raw Prometheus" title="Raw Prometheus" icon="gf-prometheus">
         <RawPrometheusContainer
           showRawPrometheus={true}
           ariaLabel={selectors.pages.Explore.General.table}
@@ -425,7 +449,7 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
       gap: theme.spacing(1),
     });
     return (
-      <ContentOutlineItem title="Logs" icon="gf-logs" className={logsContentOutlineWrapper}>
+      <ContentOutlineItem panelId="Logs" title="Logs" icon="gf-logs" className={logsContentOutlineWrapper}>
         <LogsContainer
           exploreId={exploreId}
           loadingState={queryResponse.state}
@@ -439,6 +463,8 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
           splitOpenFn={this.onSplitOpen('logs')}
           scrollElement={this.scrollElement}
           isFilterLabelActive={this.isFilterLabelActive}
+          onClickFilterValue={this.onClickFilterValue}
+          onClickFilterOutValue={this.onClickFilterOutValue}
         />
       </ContentOutlineItem>
     );
@@ -448,7 +474,7 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
     const { logsSample, timeZone, setSupplementaryQueryEnabled, exploreId, datasourceInstance, queries } = this.props;
 
     return (
-      <ContentOutlineItem title="Logs Sample" icon="gf-logs">
+      <ContentOutlineItem panelId="Logs Sample" title="Logs Sample" icon="gf-logs">
         <LogsSamplePanel
           queryResponse={logsSample.data}
           timeZone={timeZone}
@@ -469,7 +495,7 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
     const datasourceType = datasourceInstance ? datasourceInstance?.type : 'unknown';
 
     return (
-      <ContentOutlineItem title="Node Graph" icon="code-branch">
+      <ContentOutlineItem panelId="Node Graph" title="Node Graph" icon="code-branch">
         <NodeGraphContainer
           dataFrames={this.memoizedGetNodeGraphDataFrames(queryResponse.series)}
           exploreId={exploreId}
@@ -484,7 +510,7 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
   renderFlameGraphPanel() {
     const { queryResponse } = this.props;
     return (
-      <ContentOutlineItem title="Flame Graph" icon="fire">
+      <ContentOutlineItem panelId="Flame Graph" title="Flame Graph" icon="fire">
         <FlameGraphExploreContainer dataFrames={queryResponse.flameGraphFrames} />
       </ContentOutlineItem>
     );
@@ -497,14 +523,12 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
     return (
       // If there is no data (like 404) we show a separate error so no need to show anything here
       dataFrames.length && (
-        <ContentOutlineItem title="Traces" icon="file-alt">
+        <ContentOutlineItem panelId="Traces" title="Traces" icon="file-alt">
           <TraceViewContainer
             exploreId={exploreId}
             dataFrames={dataFrames}
             splitOpenFn={this.onSplitOpen('traceView')}
             scrollElement={this.scrollElement}
-            queryResponse={queryResponse}
-            topOfViewRef={this.topOfViewRef}
           />
         </ContentOutlineItem>
       )
@@ -553,13 +577,13 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
 
     let correlationsBox = undefined;
     const isCorrelationsEditorMode = correlationEditorDetails?.editorMode;
-    const showCorrelationHelper = Boolean(isCorrelationsEditorMode || correlationEditorDetails?.dirty);
+    const showCorrelationHelper = Boolean(isCorrelationsEditorMode || correlationEditorDetails?.correlationDirty);
     if (showCorrelationHelper && correlationEditorHelperData !== undefined) {
-      correlationsBox = <CorrelationHelper correlations={correlationEditorHelperData} />;
+      correlationsBox = <CorrelationHelper exploreId={exploreId} correlations={correlationEditorHelperData} />;
     }
 
     return (
-      <ContentOutlineContextProvider>
+      <ContentOutlineContextProvider refreshDependencies={this.props.queries}>
         <ExploreToolbar
           exploreId={exploreId}
           onChangeTime={this.onChangeTime}
@@ -575,19 +599,17 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
         >
           <div className={styles.wrapper}>
             {contentOutlineVisible && (
-              <div className={styles.left}>
-                <ContentOutline scroller={this.scrollElement} panelId={`content-outline-container-${exploreId}`} />
-              </div>
+              <ContentOutline scroller={this.scrollElement} panelId={`content-outline-container-${exploreId}`} />
             )}
             <CustomScrollbar
               testId={selectors.pages.Explore.General.scrollView}
               scrollRefCallback={(scrollElement) => (this.scrollElement = scrollElement || undefined)}
               hideHorizontalTrack
             >
-              <div className={styles.exploreContainer} ref={this.topOfViewRef}>
+              <div className={styles.exploreContainer}>
                 {datasourceInstance ? (
                   <>
-                    <ContentOutlineItem title="Queries" icon="arrow">
+                    <ContentOutlineItem panelId="Queries" title="Queries" icon="arrow" mergeSingleChild={true}>
                       <PanelContainer className={styles.queryContainer}>
                         {correlationsBox}
                         <QueryRows exploreId={exploreId} />
@@ -655,6 +677,7 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
                                   width={width}
                                   onClose={this.toggleShowQueryInspector}
                                   timeZone={timeZone}
+                                  isMixed={datasourceInstance.meta.mixed || false}
                                 />
                               )}
                             </ErrorBoundaryAlert>
diff --git a/public/app/features/explore/ExploreDrawer.tsx b/public/app/features/explore/ExploreDrawer.tsx
index 1018a13dde9c8..3e6fac2735939 100644
--- a/public/app/features/explore/ExploreDrawer.tsx
+++ b/public/app/features/explore/ExploreDrawer.tsx
@@ -5,51 +5,7 @@ import React from 'react';
 
 // Services & Utils
 import { GrafanaTheme2 } from '@grafana/data';
-import { stylesFactory, useTheme2 } from '@grafana/ui';
-
-// Types
-
-const drawerSlide = (theme: GrafanaTheme2) => keyframes`
-  0% {
-    transform: translateY(${theme.components.horizontalDrawer.defaultHeight}px);
-  }
-
-  100% {
-    transform: translateY(0px);
-  }
-`;
-
-const getStyles = stylesFactory((theme: GrafanaTheme2) => {
-  return {
-    container: css`
-      position: fixed !important;
-      bottom: 0;
-      background: ${theme.colors.background.primary};
-      border-top: 1px solid ${theme.colors.border.weak};
-      margin: ${theme.spacing(0, -2, 0, -2)};
-      box-shadow: ${theme.shadows.z3};
-      z-index: ${theme.zIndex.navbarFixed};
-    `,
-    drawerActive: css`
-      opacity: 1;
-      animation: 0.5s ease-out ${drawerSlide(theme)};
-    `,
-    rzHandle: css`
-      background: ${theme.colors.secondary.main};
-      transition: 0.3s background ease-in-out;
-      position: relative;
-      width: 200px !important;
-      height: 7px !important;
-      left: calc(50% - 100px) !important;
-      top: -4px !important;
-      cursor: grab;
-      border-radius: ${theme.shape.radius.pill};
-      &:hover {
-        background: ${theme.colors.secondary.shade};
-      }
-    `,
-  };
-});
+import { getDragStyles, useStyles2, useTheme2 } from '@grafana/ui';
 
 export interface Props {
   width: number;
@@ -60,14 +16,15 @@ export interface Props {
 export function ExploreDrawer(props: Props) {
   const { width, children, onResize } = props;
   const theme = useTheme2();
-  const styles = getStyles(theme);
+  const styles = useStyles2(getStyles);
+  const dragStyles = getDragStyles(theme);
   const drawerWidth = `${width + 31.5}px`;
 
   return (
     <Resizable
-      className={cx(styles.container, styles.drawerActive)}
+      className={cx(styles.fixed, styles.container, styles.drawerActive)}
       defaultSize={{ width: drawerWidth, height: `${theme.components.horizontalDrawer.defaultHeight}px` }}
-      handleClasses={{ top: styles.rzHandle }}
+      handleClasses={{ top: dragStyles.dragHandleHorizontal }}
       enable={{
         top: true,
         right: false,
@@ -87,3 +44,32 @@ export function ExploreDrawer(props: Props) {
     </Resizable>
   );
 }
+
+const drawerSlide = (theme: GrafanaTheme2) => keyframes`
+  0% {
+    transform: translateY(${theme.components.horizontalDrawer.defaultHeight}px);
+  }
+
+  100% {
+    transform: translateY(0px);
+  }
+`;
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  // @ts-expect-error csstype doesn't allow !important. see https://github.com/frenic/csstype/issues/114
+  fixed: css({
+    position: 'fixed !important',
+  }),
+  container: css({
+    bottom: 0,
+    background: theme.colors.background.primary,
+    borderTop: `1px solid ${theme.colors.border.weak}`,
+    margin: theme.spacing(0, -2, 0, -2),
+    boxShadow: theme.shadows.z3,
+    zIndex: theme.zIndex.navbarFixed,
+  }),
+  drawerActive: css({
+    opacity: 1,
+    animation: `0.5s ease-out ${drawerSlide(theme)}`,
+  }),
+});
diff --git a/public/app/features/explore/ExplorePaneContainer.tsx b/public/app/features/explore/ExplorePaneContainer.tsx
index fb1574a081bd5..7eec0b39ed43d 100644
--- a/public/app/features/explore/ExplorePaneContainer.tsx
+++ b/public/app/features/explore/ExplorePaneContainer.tsx
@@ -2,26 +2,22 @@ import { css } from '@emotion/css';
 import React, { useEffect, useMemo, useRef } from 'react';
 import { connect } from 'react-redux';
 
-import { EventBusSrv, GrafanaTheme2 } from '@grafana/data';
+import { EventBusSrv } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { useStyles2, CustomScrollbar } from '@grafana/ui';
+import { CustomScrollbar } from '@grafana/ui';
 import { stopQueryState } from 'app/core/utils/explore';
 import { StoreState, useSelector } from 'app/types';
 
 import Explore from './Explore';
 import { getExploreItemSelector } from './state/selectors';
 
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    explore: css`
-      label: explorePaneContainer;
-      display: flex;
-      flex-direction: column;
-      min-width: 600px;
-      height: 100%;
-    `,
-  };
-};
+const containerStyles = css({
+  label: 'explorePaneContainer',
+  display: 'flex',
+  flexDirection: 'column',
+  minWidth: '600px',
+  height: '100%',
+});
 
 interface Props {
   exploreId: string;
@@ -38,7 +34,6 @@ interface Props {
 */
 function ExplorePaneContainerUnconnected({ exploreId }: Props) {
   useStopQueries(exploreId);
-  const styles = useStyles2(getStyles);
   const eventBus = useRef(new EventBusSrv());
   const ref = useRef(null);
 
@@ -48,8 +43,8 @@ function ExplorePaneContainerUnconnected({ exploreId }: Props) {
   }, []);
 
   return (
-    <CustomScrollbar>
-      <div className={styles.explore} ref={ref} data-testid={selectors.pages.Explore.General.container}>
+    <CustomScrollbar hideVerticalTrack>
+      <div className={containerStyles} ref={ref} data-testid={selectors.pages.Explore.General.container}>
         <Explore exploreId={exploreId} eventBus={eventBus.current} />
       </div>
     </CustomScrollbar>
diff --git a/public/app/features/explore/ExploreQueryInspector.test.tsx b/public/app/features/explore/ExploreQueryInspector.test.tsx
index 23f3f227c0a23..c52d0533a8815 100644
--- a/public/app/features/explore/ExploreQueryInspector.test.tsx
+++ b/public/app/features/explore/ExploreQueryInspector.test.tsx
@@ -1,8 +1,10 @@
 import { render, screen, fireEvent } from '@testing-library/react';
 import React, { ComponentProps } from 'react';
+import AutoSizer from 'react-virtualized-auto-sizer';
 import { Observable } from 'rxjs';
 
 import { LoadingState, InternalTimeZones, getDefaultTimeRange } from '@grafana/data';
+import { InspectorStream } from 'app/core/services/backend_srv';
 
 import { ExploreQueryInspector } from './ExploreQueryInspector';
 
@@ -10,6 +12,7 @@ type ExploreQueryInspectorProps = ComponentProps<typeof ExploreQueryInspector>;
 
 jest.mock('../inspector/styles', () => ({
   getPanelInspectorStyles: () => ({}),
+  getPanelInspectorStyles2: () => ({}),
 }));
 
 jest.mock('app/core/services/backend_srv', () => ({
@@ -33,12 +36,22 @@ jest.mock('@grafana/runtime', () => ({
   reportInteraction: () => null,
 }));
 
+jest.mock('react-virtualized-auto-sizer', () => {
+  return {
+    __esModule: true,
+    default(props: ComponentProps<typeof AutoSizer>) {
+      return <div>{props.children({ height: 1000, width: 1000, scaledHeight: 1000, scaledWidth: 1000 })}</div>;
+    },
+  };
+});
+
 const setup = (propOverrides = {}) => {
   const props: ExploreQueryInspectorProps = {
     width: 100,
     exploreId: 'left',
     onClose: jest.fn(),
     timeZone: InternalTimeZones.utc,
+    isMixed: false,
     queryResponse: {
       state: LoadingState.Done,
       series: [],
@@ -82,24 +95,76 @@ describe('ExploreQueryInspector', () => {
     fireEvent.click(screen.getByText(/expand all/i));
     expect(screen.getByText(/very unique test value/i)).toBeInTheDocument();
   });
+  it('should display formatted data', () => {
+    setup({
+      queryResponse: {
+        state: LoadingState.Done,
+        series: [
+          {
+            refId: 'A',
+            fields: [
+              {
+                name: 'time',
+                type: 'time',
+                typeInfo: {
+                  frame: 'time.Time',
+                  nullable: true,
+                },
+                config: {
+                  interval: 30000,
+                },
+                values: [1704285124682, 1704285154682],
+                entities: {},
+              },
+              {
+                name: 'A-series',
+                type: 'number',
+                typeInfo: {
+                  frame: 'float64',
+                  nullable: true,
+                },
+                labels: {},
+                config: {},
+                values: [71.202732378676928, 72.348839082431916],
+                entities: {},
+              },
+            ],
+            length: 2,
+          },
+        ],
+      },
+    });
+
+    fireEvent.click(screen.getByLabelText(/tab data/i));
+    // assert series values are formatted to 3 digits (xx.x or x.xx)
+    expect(screen.getByText(/71.2/i)).toBeInTheDocument();
+    expect(screen.getByText(/72.3/i)).toBeInTheDocument();
+    // assert timestamps are formatted
+    expect(screen.getByText(/2024-01-03 12:32:04.682/i)).toBeInTheDocument();
+    expect(screen.getByText(/2024-01-03 12:32:34.682/i)).toBeInTheDocument();
+  });
 });
 
-const response = (hideFromInspector = false) => ({
-  status: 1,
-  statusText: '',
-  ok: true,
-  headers: {},
-  redirected: false,
-  type: 'basic',
-  url: '',
-  request: {},
-  data: {
-    test: {
-      testKey: 'Very unique test value',
+const response = (hideFromInspector = false): InspectorStream => {
+  return {
+    response: {
+      status: 1,
+      statusText: '',
+      ok: true,
+      headers: new Headers(),
+      redirected: false,
+      type: 'basic',
+      url: '',
+      data: {
+        test: {
+          testKey: 'Very unique test value',
+        },
+      },
+      config: {
+        url: '',
+        hideFromInspector,
+      },
     },
-  },
-  config: {
-    url: '',
-    hideFromInspector,
-  },
-});
+    requestId: 'explore_left',
+  };
+};
diff --git a/public/app/features/explore/ExploreQueryInspector.tsx b/public/app/features/explore/ExploreQueryInspector.tsx
index 1af76715975db..4b611fae705e3 100644
--- a/public/app/features/explore/ExploreQueryInspector.tsx
+++ b/public/app/features/explore/ExploreQueryInspector.tsx
@@ -1,18 +1,22 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
-import { CoreApp, LoadingState, TimeZone } from '@grafana/data';
+import { CoreApp, LoadingState } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime/src';
-import { defaultTimeZone } from '@grafana/schema';
+import { defaultTimeZone, TimeZone } from '@grafana/schema';
 import { TabbedContainer, TabConfig } from '@grafana/ui';
+import { requestIdGenerator } from 'app/core/utils/explore';
 import { ExploreDrawer } from 'app/features/explore/ExploreDrawer';
 import { InspectDataTab } from 'app/features/inspector/InspectDataTab';
 import { InspectErrorTab } from 'app/features/inspector/InspectErrorTab';
 import { InspectJSONTab } from 'app/features/inspector/InspectJSONTab';
 import { InspectStatsTab } from 'app/features/inspector/InspectStatsTab';
 import { QueryInspector } from 'app/features/inspector/QueryInspector';
+import { mixedRequestId } from 'app/plugins/datasource/mixed/MixedDataSource';
 import { StoreState, ExploreItemState } from 'app/types';
 
+import { GetDataOptions } from '../query/state/PanelQueryRunner';
+
 import { runQueries } from './state/query';
 
 interface DispatchProps {
@@ -20,12 +24,17 @@ interface DispatchProps {
   exploreId: string;
   timeZone: TimeZone;
   onClose: () => void;
+  isMixed: boolean;
 }
 
 type Props = DispatchProps & ConnectedProps<typeof connector>;
 
 export function ExploreQueryInspector(props: Props) {
-  const { width, onClose, queryResponse, timeZone } = props;
+  const { width, onClose, queryResponse, timeZone, isMixed, exploreId } = props;
+  const [dataOptions, setDataOptions] = useState<GetDataOptions>({
+    withTransforms: false,
+    withFieldConfig: true,
+  });
   const dataFrames = queryResponse?.series || [];
   let errors = queryResponse?.errors;
   if (!errors?.length && queryResponse?.error) {
@@ -59,9 +68,11 @@ export function ExploreQueryInspector(props: Props) {
         data={dataFrames}
         dataName={'Explore'}
         isLoading={queryResponse.state === LoadingState.Loading}
-        options={{ withTransforms: false, withFieldConfig: false }}
+        options={dataOptions}
         timeZone={timeZone}
         app={CoreApp.Explore}
+        formattedDataDescription="Matches the format in the panel"
+        onOptionsChange={setDataOptions}
       />
     ),
   };
@@ -71,7 +82,11 @@ export function ExploreQueryInspector(props: Props) {
     value: 'query',
     icon: 'info-circle',
     content: (
-      <QueryInspector data={queryResponse} onRefreshQuery={() => props.runQueries({ exploreId: props.exploreId })} />
+      <QueryInspector
+        instanceId={isMixed ? mixedRequestId(0, requestIdGenerator(exploreId)) : requestIdGenerator(exploreId)}
+        data={queryResponse}
+        onRefreshQuery={() => props.runQueries({ exploreId })}
+      />
     ),
   };
 
diff --git a/public/app/features/explore/ExploreTimeControls.tsx b/public/app/features/explore/ExploreTimeControls.tsx
index e5cfc67fe2cee..5401395b84224 100644
--- a/public/app/features/explore/ExploreTimeControls.tsx
+++ b/public/app/features/explore/ExploreTimeControls.tsx
@@ -1,7 +1,8 @@
 import React, { Component } from 'react';
 
-import { TimeRange, TimeZone, RawTimeRange, dateTimeForTimeZone, dateMath } from '@grafana/data';
+import { TimeRange, RawTimeRange, dateTimeForTimeZone, dateMath } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
+import { TimeZone } from '@grafana/schema';
 import { TimePickerWithHistory } from 'app/core/components/TimePicker/TimePickerWithHistory';
 import { getShiftedTimeRange, getZoomedTimeRange } from 'app/core/utils/timePicker';
 
diff --git a/public/app/features/explore/ExploreToolbar.tsx b/public/app/features/explore/ExploreToolbar.tsx
index 897ddc71782fb..f88010d9d6ba2 100644
--- a/public/app/features/explore/ExploreToolbar.tsx
+++ b/public/app/features/explore/ExploreToolbar.tsx
@@ -1,6 +1,6 @@
 import { css, cx } from '@emotion/css';
 import { pick } from 'lodash';
-import React, { RefObject, useMemo } from 'react';
+import React, { useMemo } from 'react';
 import { shallowEqual } from 'react-redux';
 
 import { DataSourceInstanceSettings, RawTimeRange, GrafanaTheme2 } from '@grafana/data';
@@ -16,18 +16,17 @@ import {
 } from '@grafana/ui';
 import { AppChromeUpdate } from 'app/core/components/AppChrome/AppChromeUpdate';
 import { t, Trans } from 'app/core/internationalization';
-import { createAndCopyShortLink } from 'app/core/utils/shortLinks';
 import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker';
 import { CORRELATION_EDITOR_POST_CONFIRM_ACTION } from 'app/types/explore';
 import { StoreState, useDispatch, useSelector } from 'app/types/store';
 
 import { contextSrv } from '../../core/core';
-import { DashNavButton } from '../dashboard/components/DashNav/DashNavButton';
 import { updateFiscalYearStartMonthForSession, updateTimeZoneForSession } from '../profile/state/reducers';
 import { getFiscalYearStartMonth, getTimeZone } from '../profile/state/selectors';
 
 import { ExploreTimeControls } from './ExploreTimeControls';
 import { LiveTailButton } from './LiveTailButton';
+import { ShortLinkButtonMenu } from './ShortLinkButtonMenu';
 import { ToolbarExtensionPoint } from './extensions/ToolbarExtensionPoint';
 import { changeDatasource } from './state/datasource';
 import { changeCorrelationHelperData } from './state/explorePane';
@@ -62,16 +61,9 @@ interface Props {
   onChangeTime: (range: RawTimeRange, changedByScanner?: boolean) => void;
   onContentOutlineToogle: () => void;
   isContentOutlineOpen: boolean;
-  topOfViewRef?: RefObject<HTMLDivElement>;
 }
 
-export function ExploreToolbar({
-  exploreId,
-  topOfViewRef,
-  onChangeTime,
-  onContentOutlineToogle,
-  isContentOutlineOpen,
-}: Props) {
+export function ExploreToolbar({ exploreId, onChangeTime, onContentOutlineToogle, isContentOutlineOpen }: Props) {
   const dispatch = useDispatch();
   const splitted = useSelector(isSplit);
   const styles = useStyles2(getStyles, splitted);
@@ -106,16 +98,11 @@ export function ExploreToolbar({
     ? t('explore.toolbar.refresh-picker-cancel', 'Cancel')
     : t('explore.toolbar.refresh-picker-run', 'Run query');
 
-  const onCopyShortLink = () => {
-    createAndCopyShortLink(global.location.href);
-    reportInteraction('grafana_explore_shortened_link_clicked');
-  };
-
   const onChangeDatasource = async (dsSettings: DataSourceInstanceSettings) => {
     if (!isCorrelationsEditorMode) {
-      dispatch(changeDatasource(exploreId, dsSettings.uid, { importQueries: true }));
+      dispatch(changeDatasource({ exploreId, datasource: dsSettings.uid, options: { importQueries: true } }));
     } else {
-      if (correlationDetails?.dirty) {
+      if (correlationDetails?.correlationDirty || correlationDetails?.queryEditorDirty) {
         // prompt will handle datasource change if needed
         dispatch(
           changeCorrelationEditorDetails({
@@ -124,6 +111,7 @@ export function ExploreToolbar({
               exploreId: exploreId,
               action: CORRELATION_EDITOR_POST_CONFIRM_ACTION.CHANGE_DATASOURCE,
               changeDatasourceUid: dsSettings.uid,
+              isActionLeft: isLeftPane,
             },
           })
         );
@@ -140,7 +128,7 @@ export function ExploreToolbar({
           });
         }
 
-        dispatch(changeDatasource(exploreId, dsSettings.uid, { importQueries: true }));
+        dispatch(changeDatasource({ exploreId, datasource: dsSettings.uid, options: { importQueries: true } }));
       }
     }
   };
@@ -162,7 +150,7 @@ export function ExploreToolbar({
 
   const onCloseSplitView = () => {
     if (isCorrelationsEditorMode) {
-      if (correlationDetails?.dirty) {
+      if (correlationDetails?.correlationDirty || correlationDetails?.queryEditorDirty) {
         // if dirty, prompt
         dispatch(
           changeCorrelationEditorDetails({
@@ -170,6 +158,7 @@ export function ExploreToolbar({
             postConfirmAction: {
               exploreId: exploreId,
               action: CORRELATION_EDITOR_POST_CONFIRM_ACTION.CLOSE_PANE,
+              isActionLeft: isLeftPane,
             },
           })
         );
@@ -211,21 +200,12 @@ export function ExploreToolbar({
     dispatch(changeRefreshInterval({ exploreId, refreshInterval }));
   };
 
-  const navBarActions = [
-    <DashNavButton
-      key="share"
-      tooltip={t('explore.toolbar.copy-shortened-link', 'Copy shortened link')}
-      icon="share-alt"
-      onClick={onCopyShortLink}
-      aria-label={t('explore.toolbar.copy-shortened-link', 'Copy shortened link')}
-    />,
-    <div style={{ flex: 1 }} key="spacer0" />,
-  ];
+  const navBarActions = [<ShortLinkButtonMenu key="share" />, <div style={{ flex: 1 }} key="spacer0" />];
 
   return (
-    <div ref={topOfViewRef}>
+    <div>
       {refreshInterval && <SetInterval func={onRunQuery} interval={refreshInterval} loading={loading} />}
-      <div ref={topOfViewRef}>
+      <div>
         <AppChromeUpdate actions={navBarActions} />
       </div>
       <PageToolbar
@@ -293,12 +273,7 @@ export function ExploreToolbar({
               </ToolbarButton>
             </ButtonGroup>
           ),
-          <ToolbarExtensionPoint
-            splitted={splitted}
-            key="toolbar-extension-point"
-            exploreId={exploreId}
-            timeZone={timeZone}
-          />,
+          <ToolbarExtensionPoint key="toolbar-extension-point" exploreId={exploreId} timeZone={timeZone} />,
           !isLive && (
             <ExploreTimeControls
               key="timeControls"
diff --git a/public/app/features/explore/FeatureTogglePage.tsx b/public/app/features/explore/FeatureTogglePage.tsx
index 254da695d9397..f7ca69bd6d236 100644
--- a/public/app/features/explore/FeatureTogglePage.tsx
+++ b/public/app/features/explore/FeatureTogglePage.tsx
@@ -5,12 +5,14 @@ import { GrafanaTheme2 } from '@grafana/data';
 import { useStyles2 } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 
+function getStyles(theme: GrafanaTheme2) {
+  return css({
+    marginTop: theme.spacing(2),
+  });
+}
+
 export default function FeatureTogglePage() {
-  const styles = useStyles2(
-    (theme: GrafanaTheme2) => css`
-      margin-top: ${theme.spacing(2)};
-    `
-  );
+  const styles = useStyles2(getStyles);
 
   return (
     <Page className={styles}>
diff --git a/public/app/features/explore/FlameGraph/FlameGraphExploreContainer.tsx b/public/app/features/explore/FlameGraph/FlameGraphExploreContainer.tsx
index 2327bf171249d..43d7ceb7e5470 100644
--- a/public/app/features/explore/FlameGraph/FlameGraphExploreContainer.tsx
+++ b/public/app/features/explore/FlameGraph/FlameGraphExploreContainer.tsx
@@ -31,17 +31,18 @@ export const FlameGraphExploreContainer = (props: Props) => {
         onViewSelected={(view: string) => interaction('view_selected', { view })}
         onTextAlignSelected={(align: string) => interaction('text_align_selected', { align })}
         onTableSort={(sort: string) => interaction('table_sort_selected', { sort })}
+        disableCollapsing={!config.featureToggles.flameGraphItemCollapsing}
       />
     </div>
   );
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  container: css`
-    background: ${theme.colors.background.primary};
-    display: flow-root;
-    padding: 0 ${theme.spacing(1)} ${theme.spacing(1)} ${theme.spacing(1)};
-    border: 1px solid ${theme.components.panel.borderColor};
-    border-radius: ${theme.shape.radius.default};
-  `,
+  container: css({
+    background: theme.colors.background.primary,
+    display: 'flow-root',
+    padding: theme.spacing(0, 1, 1, 1),
+    border: `1px solid ${theme.components.panel.borderColor}`,
+    borderRadius: theme.shape.radius.default,
+  }),
 });
diff --git a/public/app/features/explore/Graph/ExploreGraph.tsx b/public/app/features/explore/Graph/ExploreGraph.tsx
index 652ccffd42be3..2d3c8a4748915 100644
--- a/public/app/features/explore/Graph/ExploreGraph.tsx
+++ b/public/app/features/explore/Graph/ExploreGraph.tsx
@@ -1,5 +1,6 @@
 import { identity } from 'lodash';
 import React, { useEffect, useMemo, useState } from 'react';
+import { usePrevious } from 'react-use';
 
 import {
   AbsoluteTimeRange,
@@ -12,7 +13,6 @@ import {
   getFrameDisplayName,
   LoadingState,
   SplitOpen,
-  TimeZone,
   ThresholdsConfig,
   DashboardCursorSync,
   EventBus,
@@ -24,6 +24,8 @@ import {
   TooltipDisplayMode,
   SortOrder,
   GraphThresholdsStyleConfig,
+  TimeZone,
+  VizLegendOptions,
 } from '@grafana/schema';
 import { PanelContext, PanelContextProvider, SeriesVisibilityChangeMode, useTheme2 } from '@grafana/ui';
 import { GraphFieldConfig } from 'app/plugins/panel/graph/types';
@@ -55,6 +57,7 @@ interface Props {
   thresholdsConfig?: ThresholdsConfig;
   thresholdsStyle?: GraphThresholdsStyleConfig;
   eventBus: EventBus;
+  vizLegendOverrides?: Partial<VizLegendOptions>;
 }
 
 export function ExploreGraph({
@@ -75,19 +78,21 @@ export function ExploreGraph({
   thresholdsConfig,
   thresholdsStyle,
   eventBus,
+  vizLegendOverrides,
 }: Props) {
   const theme = useTheme2();
-
+  const previousTimeRange = usePrevious(absoluteRange);
+  const baseTimeRange = loadingState === LoadingState.Loading && previousTimeRange ? previousTimeRange : absoluteRange;
   const timeRange = useMemo(
     () => ({
-      from: dateTime(absoluteRange.from),
-      to: dateTime(absoluteRange.to),
+      from: dateTime(baseTimeRange.from),
+      to: dateTime(baseTimeRange.to),
       raw: {
-        from: dateTime(absoluteRange.from),
-        to: dateTime(absoluteRange.to),
+        from: dateTime(baseTimeRange.from),
+        to: dateTime(baseTimeRange.to),
       },
     }),
-    [absoluteRange.from, absoluteRange.to]
+    [baseTimeRange.from, baseTimeRange.to]
   );
 
   const fieldConfigRegistry = useMemo(
@@ -163,7 +168,8 @@ export function ExploreGraph({
   const panelContext: PanelContext = {
     eventsScope: 'explore',
     eventBus,
-    sync: () => DashboardCursorSync.Crosshair,
+    // TODO: Re-enable DashboardCursorSync.Crosshair when #81505 is fixed
+    sync: () => DashboardCursorSync.Off,
     onToggleSeriesVisibility(label: string, mode: SeriesVisibilityChangeMode) {
       setFieldConfig(seriesVisibilityConfigFactory(label, mode, fieldConfig, data));
     },
@@ -178,9 +184,10 @@ export function ExploreGraph({
         showLegend: true,
         placement: 'bottom',
         calcs: [],
+        ...vizLegendOverrides,
       },
     }),
-    [tooltipDisplayMode]
+    [tooltipDisplayMode, vizLegendOverrides]
   );
 
   return (
diff --git a/public/app/features/explore/Graph/useStructureRev.test.ts b/public/app/features/explore/Graph/useStructureRev.test.ts
index dd808005929c9..650e1ac0a723c 100644
--- a/public/app/features/explore/Graph/useStructureRev.test.ts
+++ b/public/app/features/explore/Graph/useStructureRev.test.ts
@@ -51,6 +51,15 @@ beforeAll(() => {
 describe('useStructureRev', () => {
   afterEach(() => resetCounters());
 
+  // mirrors the logic in componentDidUpdate in packages/grafana-ui/src/components/GraphNG/GraphNG.tsx,
+  // which treats all falsy values for structureRev as a signal to reconfig the graph
+  it('should start from a thruthy value', () => {
+    let frames: DataFrame[] = [toDataFrame({ fields: [{ name: 'time', type: FieldType.time, values: [1, 2, 3] }] })];
+    const { result } = renderHook((frames) => useStructureRev(frames), { initialProps: frames });
+
+    expect(result.current).not.toBeFalsy();
+  });
+
   it('should increment only when relevant fields in frame change', () => {
     let frames: DataFrame[] = [toDataFrame({ fields: [{ name: 'time', type: FieldType.time, values: [1, 2, 3] }] })];
     const { result, rerender } = renderHook((frames) => useStructureRev(frames), { initialProps: frames });
diff --git a/public/app/features/explore/Graph/useStructureRev.ts b/public/app/features/explore/Graph/useStructureRev.ts
index 23490e4d1701e..cb51571a42c7e 100644
--- a/public/app/features/explore/Graph/useStructureRev.ts
+++ b/public/app/features/explore/Graph/useStructureRev.ts
@@ -4,7 +4,7 @@ import { useCounter, usePrevious } from 'react-use';
 import { DataFrame, compareArrayValues, compareDataFrameStructures } from '@grafana/data';
 
 export function useStructureRev(frames: DataFrame[]) {
-  const [structureRev, { inc }] = useCounter(0);
+  const [structureRev, { inc }] = useCounter(1);
   const previousFrames = usePrevious(frames);
 
   // We need to increment structureRev when the number of series changes.
diff --git a/public/app/features/explore/LiveTailButton.tsx b/public/app/features/explore/LiveTailButton.tsx
index e062dc0d6f768..8d6decc3e576e 100644
--- a/public/app/features/explore/LiveTailButton.tsx
+++ b/public/app/features/explore/LiveTailButton.tsx
@@ -56,26 +56,26 @@ export function LiveTailButton(props: LiveTailButtonProps) {
 }
 
 const styles = {
-  stopButtonEnter: css`
-    label: stopButtonEnter;
-    width: 0;
-    opacity: 0;
-    overflow: hidden;
-  `,
-  stopButtonEnterActive: css`
-    label: stopButtonEnterActive;
-    opacity: 1;
-    width: 32px;
-  `,
-  stopButtonExit: css`
-    label: stopButtonExit;
-    width: 32px;
-    opacity: 1;
-    overflow: hidden;
-  `,
-  stopButtonExitActive: css`
-    label: stopButtonExitActive;
-    opacity: 0;
-    width: 0;
-  `,
+  stopButtonEnter: css({
+    label: 'stopButtonEnter',
+    width: 0,
+    opacity: 0,
+    overflow: 'hidden',
+  }),
+  stopButtonEnterActive: css({
+    label: 'stopButtonEnterActive',
+    opacity: 1,
+    width: '32px',
+  }),
+  stopButtonExit: css({
+    label: 'stopButtonExit',
+    width: '32px',
+    opacity: 1,
+    overflow: 'hidden',
+  }),
+  stopButtonExitActive: css({
+    label: 'stopButtonExitActive',
+    opacity: 0,
+    width: 0,
+  }),
 };
diff --git a/public/app/features/explore/Logs/LiveLogs.tsx b/public/app/features/explore/Logs/LiveLogs.tsx
index 3439db19eae97..0a269840e2ffd 100644
--- a/public/app/features/explore/Logs/LiveLogs.tsx
+++ b/public/app/features/explore/Logs/LiveLogs.tsx
@@ -2,7 +2,8 @@ import { css, cx } from '@emotion/css';
 import React, { PureComponent } from 'react';
 import tinycolor from 'tinycolor2';
 
-import { LogRowModel, TimeZone, dateTimeFormat, GrafanaTheme2, LogsSortOrder } from '@grafana/data';
+import { LogRowModel, dateTimeFormat, GrafanaTheme2, LogsSortOrder } from '@grafana/data';
+import { TimeZone } from '@grafana/schema';
 import { Button, Themeable2, withTheme2 } from '@grafana/ui';
 
 import { LogMessageAnsi } from '../../logs/components/LogMessageAnsi';
diff --git a/public/app/features/explore/Logs/Logs.test.tsx b/public/app/features/explore/Logs/Logs.test.tsx
index b14f3db4cd96d..a8f70e472700f 100644
--- a/public/app/features/explore/Logs/Logs.test.tsx
+++ b/public/app/features/explore/Logs/Logs.test.tsx
@@ -10,17 +10,28 @@ import {
   LoadingState,
   LogLevel,
   LogRowModel,
-  MutableDataFrame,
   standardTransformersRegistry,
   toUtc,
+  createDataFrame,
 } from '@grafana/data';
 import { organizeFieldsTransformer } from '@grafana/data/src/transformations/transformers/organize';
 import { config } from '@grafana/runtime';
+import store from 'app/core/store';
 import { extractFieldsTransformer } from 'app/features/transformers/extractFields/extractFields';
 
 import { Logs } from './Logs';
+import { visualisationTypeKey } from './utils/logs';
 import { getMockElasticFrame, getMockLokiFrame } from './utils/testMocks.test';
 
+jest.mock('app/core/store', () => {
+  return {
+    getBool: jest.fn(),
+    getObject: jest.fn((_a, b) => b),
+    get: jest.fn(),
+    set: jest.fn(),
+  };
+});
+
 const reportInteraction = jest.fn();
 jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
@@ -162,65 +173,24 @@ describe('Logs', () => {
       window.innerHeight = originalInnerHeight;
     });
 
-    describe('when `exploreScrollableLogsContainer` is set', () => {
-      let featureToggle: boolean | undefined;
-      beforeEach(() => {
-        featureToggle = config.featureToggles.exploreScrollableLogsContainer;
-        config.featureToggles.exploreScrollableLogsContainer = true;
-      });
-      afterEach(() => {
-        config.featureToggles.exploreScrollableLogsContainer = featureToggle;
-        jest.clearAllMocks();
-      });
-
-      it('should call `this.state.logsContainer.scroll`', () => {
-        const scrollIntoViewSpy = jest.spyOn(window.HTMLElement.prototype, 'scrollIntoView');
-        jest.spyOn(window.HTMLElement.prototype, 'scrollTop', 'get').mockReturnValue(920);
-        const scrollSpy = jest.spyOn(window.HTMLElement.prototype, 'scroll');
-
-        const logs = [];
-        for (let i = 0; i < 50; i++) {
-          logs.push(makeLog({ uid: `uid${i}`, rowId: `id${i}`, timeEpochMs: i }));
-        }
-
-        setup({ panelState: { logs: { id: 'uid47' } } }, undefined, logs);
-
-        expect(scrollIntoViewSpy).toBeCalledTimes(1);
-        // element.getBoundingClientRect().top will always be 0 for jsdom
-        // calc will be `this.state.logsContainer.scrollTop - window.innerHeight / 2` -> 920 - 500 = 420
-        expect(scrollSpy).toBeCalledWith({ behavior: 'smooth', top: 420 });
-      });
-    });
-
-    describe('when `exploreScrollableLogsContainer` is not set', () => {
-      let featureToggle: boolean | undefined;
-      beforeEach(() => {
-        featureToggle = config.featureToggles.exploreScrollableLogsContainer;
-        config.featureToggles.exploreScrollableLogsContainer = false;
-      });
-      afterEach(() => {
-        config.featureToggles.exploreScrollableLogsContainer = featureToggle;
-      });
+    it('should call `scrollElement.scroll`', () => {
+      const logs = [];
+      for (let i = 0; i < 50; i++) {
+        logs.push(makeLog({ uid: `uid${i}`, rowId: `id${i}`, timeEpochMs: i }));
+      }
+      const scrollElementMock = {
+        scroll: jest.fn(),
+        scrollTop: 920,
+      };
+      setup(
+        { scrollElement: scrollElementMock as unknown as HTMLDivElement, panelState: { logs: { id: 'uid47' } } },
+        undefined,
+        logs
+      );
 
-      it('should call `scrollElement.scroll`', () => {
-        const logs = [];
-        for (let i = 0; i < 50; i++) {
-          logs.push(makeLog({ uid: `uid${i}`, rowId: `id${i}`, timeEpochMs: i }));
-        }
-        const scrollElementMock = {
-          scroll: jest.fn(),
-          scrollTop: 920,
-        };
-        setup(
-          { scrollElement: scrollElementMock as unknown as HTMLDivElement, panelState: { logs: { id: 'uid47' } } },
-          undefined,
-          logs
-        );
-
-        // element.getBoundingClientRect().top will always be 0 for jsdom
-        // calc will be `scrollElement.scrollTop - window.innerHeight / 2` -> 920 - 500 = 420
-        expect(scrollElementMock.scroll).toBeCalledWith({ behavior: 'smooth', top: 420 });
-      });
+      // element.getBoundingClientRect().top will always be 0 for jsdom
+      // calc will be `scrollElement.scrollTop - window.innerHeight / 2` -> 920 - 500 = 420
+      expect(scrollElementMock.scroll).toBeCalledWith({ behavior: 'smooth', top: 420 });
     });
   });
 
@@ -419,7 +389,13 @@ describe('Logs', () => {
 
     it('should call reportInteraction on permalinkClick', async () => {
       const panelState = { logs: { id: 'not-included' } };
-      setup({ loading: false, panelState });
+      const rows = [
+        makeLog({ uid: '1', rowId: 'id1', timeEpochMs: 4 }),
+        makeLog({ uid: '2', rowId: 'id2', timeEpochMs: 3 }),
+        makeLog({ uid: '3', rowId: 'id3', timeEpochMs: 2 }),
+        makeLog({ uid: '4', rowId: 'id3', timeEpochMs: 1 }),
+      ];
+      setup({ loading: false, panelState, logRows: rows });
 
       const row = screen.getAllByRole('row');
       await userEvent.hover(row[0]);
@@ -436,7 +412,13 @@ describe('Logs', () => {
 
     it('should call createAndCopyShortLink on permalinkClick - logs', async () => {
       const panelState: Partial<ExplorePanelsState> = { logs: { id: 'not-included', visualisationType: 'logs' } };
-      setup({ loading: false, panelState });
+      const rows = [
+        makeLog({ uid: '1', rowId: 'id1', timeEpochMs: 1 }),
+        makeLog({ uid: '2', rowId: 'id2', timeEpochMs: 1 }),
+        makeLog({ uid: '3', rowId: 'id3', timeEpochMs: 2 }),
+        makeLog({ uid: '4', rowId: 'id3', timeEpochMs: 2 }),
+      ];
+      setup({ loading: false, panelState, logRows: rows });
 
       const row = screen.getAllByRole('row');
       await userEvent.hover(row[0]);
@@ -451,6 +433,34 @@ describe('Logs', () => {
       );
       expect(createAndCopyShortLink).toHaveBeenCalledWith(expect.stringMatching('visualisationType%22:%22logs'));
     });
+
+    it('should call createAndCopyShortLink on permalinkClick - with infinite scrolling', async () => {
+      const featureToggleValue = config.featureToggles.logsInfiniteScrolling;
+      config.featureToggles.logsInfiniteScrolling = true;
+      const rows = [
+        makeLog({ uid: '1', rowId: 'id1', timeEpochMs: 1 }),
+        makeLog({ uid: '2', rowId: 'id2', timeEpochMs: 1 }),
+        makeLog({ uid: '3', rowId: 'id3', timeEpochMs: 2 }),
+        makeLog({ uid: '4', rowId: 'id3', timeEpochMs: 2 }),
+      ];
+
+      const panelState: Partial<ExplorePanelsState> = { logs: { id: 'not-included', visualisationType: 'logs' } };
+      setup({ loading: false, panelState, logRows: rows });
+
+      const row = screen.getAllByRole('row');
+      await userEvent.hover(row[3]);
+
+      const linkButton = screen.getByLabelText('Copy shortlink');
+      await userEvent.click(linkButton);
+
+      expect(createAndCopyShortLink).toHaveBeenCalledWith(
+        expect.stringMatching(
+          'range%22:%7B%22from%22:%222019-01-01T10:00:00.000Z%22,%22to%22:%221970-01-01T00:00:00.002Z%22%7D'
+        )
+      );
+      expect(createAndCopyShortLink).toHaveBeenCalledWith(expect.stringMatching('visualisationType%22:%22logs'));
+      config.featureToggles.logsInfiniteScrolling = featureToggleValue;
+    });
   });
 
   describe('with table visualisation', () => {
@@ -480,6 +490,26 @@ describe('Logs', () => {
       expect(table).toBeInTheDocument();
     });
 
+    it('should use default state from localstorage - table', async () => {
+      const oldGet = store.get;
+      store.get = jest.fn().mockReturnValue('table');
+      localStorage.setItem(visualisationTypeKey, 'table');
+      setup({});
+      const table = await screen.findByTestId('logRowsTable');
+      expect(table).toBeInTheDocument();
+      store.get = oldGet;
+    });
+
+    it('should use default state from localstorage - logs', async () => {
+      const oldGet = store.get;
+      store.get = jest.fn().mockReturnValue('logs');
+      localStorage.setItem(visualisationTypeKey, 'logs');
+      setup({});
+      const table = await screen.findByTestId('logRows');
+      expect(table).toBeInTheDocument();
+      store.get = oldGet;
+    });
+
     it('should change visualisation to table on toggle (elastic)', async () => {
       setup({}, getMockElasticFrame());
       const logsSection = screen.getByRole('radio', { name: 'Show results in table visualisation' });
@@ -498,7 +528,7 @@ const makeLog = (overrides: Partial<LogRowModel>): LogRowModel => {
     uid,
     entryFieldIndex: 0,
     rowIndex: 0,
-    dataFrame: new MutableDataFrame(),
+    dataFrame: createDataFrame({ fields: [] }),
     logLevel: LogLevel.debug,
     entry,
     hasAnsi: false,
diff --git a/public/app/features/explore/Logs/Logs.tsx b/public/app/features/explore/Logs/Logs.tsx
index c57915b5d4894..c5faf08dc5a76 100644
--- a/public/app/features/explore/Logs/Logs.tsx
+++ b/public/app/features/explore/Logs/Logs.tsx
@@ -1,4 +1,4 @@
-import { css } from '@emotion/css';
+import { css, cx } from '@emotion/css';
 import { capitalize } from 'lodash';
 import memoizeOne from 'memoize-one';
 import React, { createRef, PureComponent } from 'react';
@@ -13,7 +13,6 @@ import {
   EventBus,
   ExploreLogsPanelState,
   ExplorePanelsState,
-  FeatureState,
   Field,
   GrafanaTheme2,
   LinkModel,
@@ -30,14 +29,12 @@ import {
   serializeStateToUrlParam,
   SplitOpen,
   TimeRange,
-  TimeZone,
   urlUtil,
 } from '@grafana/data';
 import { config, reportInteraction } from '@grafana/runtime';
-import { DataQuery } from '@grafana/schema';
+import { DataQuery, TimeZone } from '@grafana/schema';
 import {
   Button,
-  FeatureBadge,
   InlineField,
   InlineFieldRow,
   InlineSwitch,
@@ -48,6 +45,8 @@ import {
 } from '@grafana/ui';
 import store from 'app/core/store';
 import { createAndCopyShortLink } from 'app/core/utils/shortLinks';
+import { InfiniteScroll } from 'app/features/logs/components/InfiniteScroll';
+import { getLogLevelFromKey } from 'app/features/logs/utils';
 import { dispatch, getState } from 'app/store/store';
 
 import { ExploreItemState } from '../../../types';
@@ -57,11 +56,12 @@ import { dedupLogRows, filterLogLevels } from '../../logs/logsModel';
 import { getUrlStateFromPaneState } from '../hooks/useStateSync';
 import { changePanelState } from '../state/explorePane';
 
+import { LogsFeedback } from './LogsFeedback';
 import { LogsMetaRow } from './LogsMetaRow';
 import LogsNavigation from './LogsNavigation';
-import { LogsTableWrap } from './LogsTableWrap';
+import { getLogsTableHeight, LogsTableWrap } from './LogsTableWrap';
 import { LogsVolumePanelList } from './LogsVolumePanelList';
-import { SETTINGS_KEYS } from './utils/logs';
+import { SETTINGS_KEYS, visualisationTypeKey } from './utils/logs';
 
 interface Props extends Themeable2 {
   width: number;
@@ -84,14 +84,18 @@ interface Props extends Themeable2 {
   logsVolumeData: DataQueryResponse | undefined;
   onSetLogsVolumeEnabled: (enabled: boolean) => void;
   loadLogsVolumeData: () => void;
-  showContextToggle?: (row?: LogRowModel) => boolean;
+  showContextToggle?: (row: LogRowModel) => boolean;
   onChangeTime: (range: AbsoluteTimeRange) => void;
-  onClickFilterLabel?: (key: string, value: string, refId?: string) => void;
-  onClickFilterOutLabel?: (key: string, value: string, refId?: string) => void;
+  onClickFilterLabel?: (key: string, value: string, frame?: DataFrame) => void;
+  onClickFilterOutLabel?: (key: string, value: string, frame?: DataFrame) => void;
   onStartScanning?: () => void;
   onStopScanning?: () => void;
   getRowContext?: (row: LogRowModel, origRow: LogRowModel, options: LogRowContextOptions) => Promise<any>;
-  getRowContextQuery?: (row: LogRowModel, options?: LogRowContextOptions) => Promise<DataQuery | null>;
+  getRowContextQuery?: (
+    row: LogRowModel,
+    options?: LogRowContextOptions,
+    cacheFilters?: boolean
+  ) => Promise<DataQuery | null>;
   getLogRowContextUi?: (row: LogRowModel, runContextQuery?: () => void) => React.ReactNode;
   getFieldLinks: (field: Field, rowIndex: number, dataFrame: DataFrame) => Array<LinkModel<Field>>;
   addResultsToCache: () => void;
@@ -102,6 +106,9 @@ interface Props extends Themeable2 {
   isFilterLabelActive?: (key: string, value: string, refId?: string) => Promise<boolean>;
   logsFrames?: DataFrame[];
   range: TimeRange;
+  onClickFilterValue?: (value: string, refId?: string) => void;
+  onClickFilterOutValue?: (value: string, refId?: string) => void;
+  loadMoreLogs?(range: AbsoluteTimeRange): void;
 }
 
 export type LogsVisualisationType = 'table' | 'logs';
@@ -124,8 +131,6 @@ interface State {
   logsContainer?: HTMLDivElement;
 }
 
-const scrollableLogsContainer = config.featureToggles.exploreScrollableLogsContainer;
-
 // we need to define the order of these explicitly
 const DEDUP_OPTIONS = [
   LogsDedupStrategy.none,
@@ -134,6 +139,14 @@ const DEDUP_OPTIONS = [
   LogsDedupStrategy.signature,
 ];
 
+const getDefaultVisualisationType = (): LogsVisualisationType => {
+  const visualisationType = store.get(visualisationTypeKey);
+  if (visualisationType === 'table') {
+    return 'table';
+  }
+  return 'logs';
+};
+
 class UnthemedLogs extends PureComponent<Props, State> {
   flipOrderTimer?: number;
   cancelFlippingTimer?: number;
@@ -154,7 +167,7 @@ class UnthemedLogs extends PureComponent<Props, State> {
     contextOpen: false,
     contextRow: undefined,
     tableFrame: undefined,
-    visualisationType: this.props.panelState?.logs?.visualisationType ?? 'logs',
+    visualisationType: this.props.panelState?.logs?.visualisationType ?? getDefaultVisualisationType(),
     logsContainer: undefined,
   };
 
@@ -171,6 +184,23 @@ class UnthemedLogs extends PureComponent<Props, State> {
     if (this.cancelFlippingTimer) {
       window.clearTimeout(this.cancelFlippingTimer);
     }
+
+    // If we're unmounting logs (e.g. switching to another datasource), we need to remove the table specific panel state, otherwise it will persist in the explore url
+    if (
+      this.props?.panelState?.logs?.columns ||
+      this.props?.panelState?.logs?.refId ||
+      this.props?.panelState?.logs?.labelFieldName
+    ) {
+      dispatch(
+        changePanelState(this.props.exploreId, 'logs', {
+          ...this.props.panelState?.logs,
+          columns: undefined,
+          visualisationType: this.state.visualisationType,
+          labelFieldName: undefined,
+          refId: undefined,
+        })
+      );
+    }
   }
 
   updatePanelState = (logsPanelState: Partial<ExploreLogsPanelState>) => {
@@ -181,6 +211,8 @@ class UnthemedLogs extends PureComponent<Props, State> {
           ...state.panelsState.logs,
           columns: logsPanelState.columns ?? this.props.panelState?.logs?.columns,
           visualisationType: logsPanelState.visualisationType ?? this.state.visualisationType,
+          labelFieldName: logsPanelState.labelFieldName,
+          refId: logsPanelState.refId ?? this.props.panelState?.logs?.refId,
         })
       );
     }
@@ -190,6 +222,7 @@ class UnthemedLogs extends PureComponent<Props, State> {
     if (this.props.loading && !prevProps.loading && this.props.panelState?.logs?.id) {
       // loading stopped, so we need to remove any permalinked log lines
       delete this.props.panelState.logs.id;
+
       dispatch(
         changePanelState(this.props.exploreId, 'logs', {
           ...this.props.panelState,
@@ -197,9 +230,12 @@ class UnthemedLogs extends PureComponent<Props, State> {
       );
     }
     if (this.props.panelState?.logs?.visualisationType !== prevProps.panelState?.logs?.visualisationType) {
+      const visualisationType = this.props.panelState?.logs?.visualisationType ?? getDefaultVisualisationType();
+
       this.setState({
-        visualisationType: this.props.panelState?.logs?.visualisationType ?? 'logs',
+        visualisationType: visualisationType,
       });
+      store.set(visualisationTypeKey, visualisationType);
     }
   }
 
@@ -253,6 +289,7 @@ class UnthemedLogs extends PureComponent<Props, State> {
 
     reportInteraction('grafana_explore_logs_visualisation_changed', {
       newVisualizationType: visualisation,
+      datasourceType: this.props.datasourceType ?? 'unknown',
     });
   };
 
@@ -309,7 +346,7 @@ class UnthemedLogs extends PureComponent<Props, State> {
   };
 
   onToggleLogLevel = (hiddenRawLevels: string[]) => {
-    const hiddenLogLevels = hiddenRawLevels.map((level) => LogLevel[level as LogLevel]);
+    const hiddenLogLevels = hiddenRawLevels.map((level) => getLogLevelFromKey(level));
     this.setState({ hiddenLogLevels });
   };
 
@@ -400,6 +437,46 @@ class UnthemedLogs extends PureComponent<Props, State> {
     };
   };
 
+  getPreviousLog(row: LogRowModel, allLogs: LogRowModel[]): LogRowModel | null {
+    for (let i = allLogs.indexOf(row) - 1; i >= 0; i--) {
+      if (allLogs[i].timeEpochMs > row.timeEpochMs) {
+        return allLogs[i];
+      }
+    }
+
+    return null;
+  }
+
+  getPermalinkRange(row: LogRowModel) {
+    const range = {
+      from: new Date(this.props.absoluteRange.from).toISOString(),
+      to: new Date(this.props.absoluteRange.to).toISOString(),
+    };
+    if (!config.featureToggles.logsInfiniteScrolling) {
+      return range;
+    }
+
+    // With infinite scrolling, the time range of the log line can be after the absolute range or beyond the request line limit, so we need to adjust
+    // Look for the previous sibling log, and use its timestamp
+    const allLogs = this.props.logRows.filter((logRow) => logRow.dataFrame.refId === row.dataFrame.refId);
+    const prevLog = this.getPreviousLog(row, allLogs);
+
+    if (row.timeEpochMs > this.props.absoluteRange.to && !prevLog) {
+      // Because there's no sibling and the current `to` is oldest than the log, we have no reference we can use for the interval
+      // This only happens when you scroll into the future and you want to share the first log of the list
+      return {
+        from: new Date(this.props.absoluteRange.from).toISOString(),
+        // Slide 1ms otherwise it's very likely to be omitted in the results
+        to: new Date(row.timeEpochMs + 1).toISOString(),
+      };
+    }
+
+    return {
+      from: new Date(this.props.absoluteRange.from).toISOString(),
+      to: new Date(prevLog ? prevLog.timeEpochMs : this.props.absoluteRange.to).toISOString(),
+    };
+  }
+
   onPermalinkClick = async (row: LogRowModel) => {
     // this is an extra check, to be sure that we are not
     // creating permalinks for logs without an id-field.
@@ -413,12 +490,9 @@ class UnthemedLogs extends PureComponent<Props, State> {
     const urlState = getUrlStateFromPaneState(getState().explore.panes[this.props.exploreId]!);
     urlState.panelsState = {
       ...this.props.panelState,
-      logs: { id: row.uid, visualisationType: this.state.visualisationType ?? 'logs' },
-    };
-    urlState.range = {
-      from: new Date(this.props.absoluteRange.from).toISOString(),
-      to: new Date(this.props.absoluteRange.to).toISOString(),
+      logs: { id: row.uid, visualisationType: this.state.visualisationType ?? getDefaultVisualisationType() },
     };
+    urlState.range = this.getPermalinkRange(row);
 
     // append changed urlState to baseUrl
     const serializedState = serializeStateToUrlParam(urlState);
@@ -434,7 +508,7 @@ class UnthemedLogs extends PureComponent<Props, State> {
   };
 
   scrollIntoView = (element: HTMLElement) => {
-    if (config.featureToggles.exploreScrollableLogsContainer) {
+    if (config.featureToggles.logsInfiniteScrolling) {
       if (this.state.logsContainer) {
         this.topLogsRef.current?.scrollIntoView();
         this.state.logsContainer.scroll({
@@ -484,16 +558,15 @@ class UnthemedLogs extends PureComponent<Props, State> {
   });
 
   scrollToTopLogs = () => {
-    if (config.featureToggles.exploreScrollableLogsContainer) {
+    if (config.featureToggles.logsInfiniteScrolling) {
       if (this.state.logsContainer) {
         this.state.logsContainer.scroll({
           behavior: 'auto',
           top: 0,
         });
       }
-    } else {
-      this.topLogsRef.current?.scrollIntoView();
     }
+    this.topLogsRef.current?.scrollIntoView();
   };
 
   render() {
@@ -523,6 +596,7 @@ class UnthemedLogs extends PureComponent<Props, State> {
       getRowContext,
       getLogRowContextUi,
       getRowContextQuery,
+      loadMoreLogs,
     } = this.props;
 
     const {
@@ -540,7 +614,8 @@ class UnthemedLogs extends PureComponent<Props, State> {
       contextRow,
     } = this.state;
 
-    const styles = getStyles(theme, wrapLogMessage);
+    const tableHeight = getLogsTableHeight();
+    const styles = getStyles(theme, wrapLogMessage, tableHeight);
     const hasData = logRows && logRows.length > 0;
     const hasUnescapedContent = this.checkUnescapedContent(logRows);
 
@@ -589,22 +664,13 @@ class UnthemedLogs extends PureComponent<Props, State> {
           titleItems={[
             config.featureToggles.logsExploreTableVisualisation ? (
               this.state.visualisationType === 'logs' ? null : (
-                <PanelChrome.TitleItem title="Experimental" key="A">
-                  <FeatureBadge
-                    featureState={FeatureState.beta}
-                    tooltip="This feature is experimental and may change in future versions"
-                  />
+                <PanelChrome.TitleItem title="Feedback" key="A">
+                  <LogsFeedback feedbackUrl="https://forms.gle/5YyKdRQJ5hzq4c289" />
                 </PanelChrome.TitleItem>
               )
             ) : null,
           ]}
-          title={
-            config.featureToggles.logsExploreTableVisualisation
-              ? this.state.visualisationType === 'logs'
-                ? 'Logs'
-                : 'Table'
-              : 'Logs'
-          }
+          title={'Logs'}
           actions={
             <>
               {config.featureToggles.logsExploreTableVisualisation && (
@@ -612,16 +678,16 @@ class UnthemedLogs extends PureComponent<Props, State> {
                   <RadioButtonGroup
                     className={styles.visualisationTypeRadio}
                     options={[
-                      {
-                        label: 'Table',
-                        value: 'table',
-                        description: 'Show results in table visualisation',
-                      },
                       {
                         label: 'Logs',
                         value: 'logs',
                         description: 'Show results in logs visualisation',
                       },
+                      {
+                        label: 'Table',
+                        value: 'table',
+                        description: 'Show results in table visualisation',
+                      },
                     ]}
                     size="sm"
                     value={this.state.visualisationType}
@@ -688,9 +754,13 @@ class UnthemedLogs extends PureComponent<Props, State> {
                 </InlineFieldRow>
 
                 <div>
-                  <InlineField label="Display results" className={styles.horizontalInlineLabel} transparent>
+                  <InlineField
+                    label="Display results"
+                    className={styles.horizontalInlineLabel}
+                    transparent
+                    disabled={isFlipping || loading}
+                  >
                     <RadioButtonGroup
-                      disabled={isFlipping}
                       options={[
                         {
                           label: 'Newest first',
@@ -724,7 +794,9 @@ class UnthemedLogs extends PureComponent<Props, State> {
               clearDetectedFields={this.clearDetectedFields}
             />
           </div>
-          <div className={styles.logsSection}>
+          <div
+            className={cx(styles.logsSection, this.state.visualisationType === 'table' ? styles.logsTable : undefined)}
+          >
             {this.state.visualisationType === 'table' && hasData && (
               <div className={styles.logRows} data-testid="logRowsTable">
                 {/* Width should be full width minus logs navigation and padding */}
@@ -740,39 +812,57 @@ class UnthemedLogs extends PureComponent<Props, State> {
                   panelState={this.props.panelState?.logs}
                   theme={theme}
                   updatePanelState={this.updatePanelState}
+                  datasourceType={this.props.datasourceType}
                 />
               </div>
             )}
             {this.state.visualisationType === 'logs' && hasData && (
-              <div className={styles.logRows} data-testid="logRows" ref={this.onLogsContainerRef}>
-                <LogRows
-                  logRows={logRows}
-                  deduplicatedRows={dedupedRows}
-                  dedupStrategy={dedupStrategy}
-                  onClickFilterLabel={onClickFilterLabel}
-                  onClickFilterOutLabel={onClickFilterOutLabel}
-                  showContextToggle={showContextToggle}
-                  showLabels={showLabels}
-                  showTime={showTime}
-                  enableLogDetails={true}
-                  forceEscape={forceEscape}
-                  wrapLogMessage={wrapLogMessage}
-                  prettifyLogMessage={prettifyLogMessage}
+              <div
+                className={config.featureToggles.logsInfiniteScrolling ? styles.scrollableLogRows : styles.logRows}
+                data-testid="logRows"
+                ref={this.onLogsContainerRef}
+              >
+                <InfiniteScroll
+                  loading={loading}
+                  loadMoreLogs={loadMoreLogs}
+                  range={this.props.range}
                   timeZone={timeZone}
-                  getFieldLinks={getFieldLinks}
-                  logsSortOrder={logsSortOrder}
-                  displayedFields={displayedFields}
-                  onClickShowField={this.showField}
-                  onClickHideField={this.hideField}
-                  app={CoreApp.Explore}
-                  onLogRowHover={this.onLogRowHover}
-                  onOpenContext={this.onOpenContext}
-                  onPermalinkClick={this.onPermalinkClick}
-                  permalinkedRowId={this.props.panelState?.logs?.id}
-                  scrollIntoView={this.scrollIntoView}
-                  isFilterLabelActive={this.props.isFilterLabelActive}
-                  containerRendered={!!this.state.logsContainer}
-                />
+                  rows={logRows}
+                  scrollElement={this.state.logsContainer}
+                  sortOrder={logsSortOrder}
+                >
+                  <LogRows
+                    logRows={logRows}
+                    deduplicatedRows={dedupedRows}
+                    dedupStrategy={dedupStrategy}
+                    onClickFilterLabel={onClickFilterLabel}
+                    onClickFilterOutLabel={onClickFilterOutLabel}
+                    showContextToggle={showContextToggle}
+                    getRowContextQuery={getRowContextQuery}
+                    showLabels={showLabels}
+                    showTime={showTime}
+                    enableLogDetails={true}
+                    forceEscape={forceEscape}
+                    wrapLogMessage={wrapLogMessage}
+                    prettifyLogMessage={prettifyLogMessage}
+                    timeZone={timeZone}
+                    getFieldLinks={getFieldLinks}
+                    logsSortOrder={logsSortOrder}
+                    displayedFields={displayedFields}
+                    onClickShowField={this.showField}
+                    onClickHideField={this.hideField}
+                    app={CoreApp.Explore}
+                    onLogRowHover={this.onLogRowHover}
+                    onOpenContext={this.onOpenContext}
+                    onPermalinkClick={this.onPermalinkClick}
+                    permalinkedRowId={this.props.panelState?.logs?.id}
+                    scrollIntoView={this.scrollIntoView}
+                    isFilterLabelActive={this.props.isFilterLabelActive}
+                    containerRendered={!!this.state.logsContainer}
+                    onClickFilterValue={this.props.onClickFilterValue}
+                    onClickFilterOutValue={this.props.onClickFilterOutValue}
+                  />
+                </InfiniteScroll>
               </div>
             )}
             {!loading && !hasData && !scanning && (
@@ -816,60 +906,67 @@ class UnthemedLogs extends PureComponent<Props, State> {
 
 export const Logs = withTheme2(UnthemedLogs);
 
-const getStyles = (theme: GrafanaTheme2, wrapLogMessage: boolean) => {
+const getStyles = (theme: GrafanaTheme2, wrapLogMessage: boolean, tableHeight: number) => {
   return {
-    noData: css`
-      > * {
-        margin-left: 0.5em;
-      }
-    `,
-    logOptions: css`
-      display: flex;
-      justify-content: space-between;
-      align-items: baseline;
-      flex-wrap: wrap;
-      background-color: ${theme.colors.background.primary};
-      padding: ${theme.spacing(1, 2)};
-      border-radius: ${theme.shape.radius.default};
-      margin: ${theme.spacing(0, 0, 1)};
-      border: 1px solid ${theme.colors.border.medium};
-    `,
-    headerButton: css`
-      margin: ${theme.spacing(0.5, 0, 0, 1)};
-    `,
-    horizontalInlineLabel: css`
-      > label {
-        margin-right: 0;
-      }
-    `,
-    horizontalInlineSwitch: css`
-      padding: 0 ${theme.spacing(1)} 0 0;
-    `,
-    radioButtons: css`
-      margin: 0;
-    `,
-    logsSection: css`
-      display: flex;
-      flex-direction: row;
-      justify-content: space-between;
-    `,
-    logRows: css`
-      overflow-x: ${scrollableLogsContainer ? 'scroll;' : `${wrapLogMessage ? 'unset' : 'scroll'};`}
-      overflow-y: visible;
-      width: 100%;
-      ${scrollableLogsContainer && 'max-height: calc(100vh - 170px);'}
-    `,
-    visualisationType: css`
-      display: flex;
-      flex: 1;
-      justify-content: space-between;
-    `,
-    visualisationTypeRadio: css`
-      margin: 0 0 0 ${theme.spacing(1)};
-    `,
-    stickyNavigation: css`
-      ${scrollableLogsContainer && 'margin-bottom: 0px'}
-      overflow: visible;
-    `,
+    noData: css({
+      '& > *': {
+        marginLeft: '0.5em',
+      },
+    }),
+    logOptions: css({
+      display: 'flex',
+      justifyContent: 'space-between',
+      alignItems: 'baseline',
+      flexWrap: 'wrap',
+      backgroundColor: theme.colors.background.primary,
+      padding: `${theme.spacing(1)} ${theme.spacing(2)}`,
+      borderRadius: theme.shape.radius.default,
+      margin: `${theme.spacing(0, 0, 1)}`,
+      border: `1px solid ${theme.colors.border.medium}`,
+    }),
+    headerButton: css({
+      margin: `${theme.spacing(0.5, 0, 0, 1)}`,
+    }),
+    horizontalInlineLabel: css({
+      '& > label': {
+        marginRight: '0',
+      },
+    }),
+    horizontalInlineSwitch: css({
+      padding: `0 ${theme.spacing(1)} 0 0`,
+    }),
+    radioButtons: css({
+      margin: '0',
+    }),
+    logsSection: css({
+      display: 'flex',
+      flexDirection: 'row',
+      justifyContent: 'space-between',
+    }),
+    logsTable: css({
+      maxHeight: `${tableHeight}px`,
+    }),
+    scrollableLogRows: css({
+      overflowY: 'scroll',
+      width: '100%',
+      maxHeight: '75vh',
+    }),
+    logRows: css({
+      overflowX: `${wrapLogMessage ? 'unset' : 'scroll'}`,
+      overflowY: 'visible',
+      width: '100%',
+    }),
+    visualisationType: css({
+      display: 'flex',
+      flex: '1',
+      justifyContent: 'space-between',
+    }),
+    visualisationTypeRadio: css({
+      margin: `0 0 0 ${theme.spacing(1)}`,
+    }),
+    stickyNavigation: css({
+      overflow: 'visible',
+      ...(config.featureToggles.logsInfiniteScrolling && { marginBottom: '0px' }),
+    }),
   };
 };
diff --git a/public/app/features/explore/Logs/LogsColumnSearch.tsx b/public/app/features/explore/Logs/LogsColumnSearch.tsx
index 0c362405caf4f..33faae16435d9 100644
--- a/public/app/features/explore/Logs/LogsColumnSearch.tsx
+++ b/public/app/features/explore/Logs/LogsColumnSearch.tsx
@@ -7,17 +7,17 @@ import { Field, Input, useTheme2 } from '@grafana/ui/src';
 function getStyles(theme: GrafanaTheme2) {
   return {
     searchWrap: css({
-      padding: theme.spacing(0.4),
+      padding: `${theme.spacing(0.4)} 0 ${theme.spacing(0.4)} ${theme.spacing(0.4)}`,
     }),
   };
 }
 
-export function LogsColumnSearch(props: { onChange: (e: React.FormEvent<HTMLInputElement>) => void }) {
+export function LogsColumnSearch(props: { onChange: (e: React.FormEvent<HTMLInputElement>) => void; value: string }) {
   const theme = useTheme2();
   const styles = getStyles(theme);
   return (
     <Field className={styles.searchWrap}>
-      <Input type={'text'} placeholder={'Search fields by name'} onChange={props.onChange} />
+      <Input value={props.value} type={'text'} placeholder={'Search fields by name'} onChange={props.onChange} />
     </Field>
   );
 }
diff --git a/public/app/features/explore/Logs/LogsContainer.tsx b/public/app/features/explore/Logs/LogsContainer.tsx
index f8f2034fe7779..48a173cd064e2 100644
--- a/public/app/features/explore/Logs/LogsContainer.tsx
+++ b/public/app/features/explore/Logs/LogsContainer.tsx
@@ -18,10 +18,13 @@ import {
   DataSourceWithLogsContextSupport,
   DataSourceApi,
   hasToggleableQueryFiltersSupport,
+  DataSourceWithQueryModificationSupport,
+  hasQueryModificationSupport,
 } from '@grafana/data';
 import { getDataSourceSrv } from '@grafana/runtime';
 import { DataQuery } from '@grafana/schema';
 import { Collapse } from '@grafana/ui';
+import { MIXED_DATASOURCE_NAME } from 'app/plugins/datasource/mixed/MixedDataSource';
 import { StoreState } from 'app/types';
 import { ExploreItemState } from 'app/types/explore';
 
@@ -33,7 +36,7 @@ import {
   selectIsWaitingForData,
   setSupplementaryQueryEnabled,
 } from '../state/query';
-import { updateTimeRange } from '../state/time';
+import { updateTimeRange, loadMoreLogs } from '../state/time';
 import { LiveTailControls } from '../useLiveTailControls';
 import { getFieldLinksForExplore } from '../utils/links';
 
@@ -47,57 +50,88 @@ interface LogsContainerProps extends PropsFromRedux {
   scanRange?: RawTimeRange;
   syncedTimes: boolean;
   loadingState: LoadingState;
-  onClickFilterLabel: (key: string, value: string, refId?: string) => void;
-  onClickFilterOutLabel: (key: string, value: string, refId?: string) => void;
+  onClickFilterLabel: (key: string, value: string, frame?: DataFrame) => void;
+  onClickFilterOutLabel: (key: string, value: string, frame?: DataFrame) => void;
   onStartScanning: () => void;
   onStopScanning: () => void;
   eventBus: EventBus;
   splitOpenFn: SplitOpen;
   scrollElement?: HTMLDivElement;
   isFilterLabelActive: (key: string, value: string, refId?: string) => Promise<boolean>;
+  onClickFilterValue: (value: string, refId?: string) => void;
+  onClickFilterOutValue: (value: string, refId?: string) => void;
 }
 
+type DataSourceInstance =
+  | DataSourceApi<DataQuery>
+  | (DataSourceApi<DataQuery> & DataSourceWithLogsContextSupport<DataQuery>)
+  | (DataSourceApi<DataQuery> & DataSourceWithQueryModificationSupport<DataQuery>);
+
 interface LogsContainerState {
-  logDetailsFilterAvailable: boolean;
+  dsInstances: Record<string, DataSourceInstance>;
 }
 
 class LogsContainer extends PureComponent<LogsContainerProps, LogsContainerState> {
   state: LogsContainerState = {
-    logDetailsFilterAvailable: false,
+    dsInstances: {},
   };
 
   componentDidMount() {
-    this.checkFiltersAvailability();
+    this.updateDataSourceInstances();
   }
 
   componentDidUpdate(prevProps: LogsContainerProps) {
-    this.checkFiltersAvailability();
+    if (prevProps.logsQueries !== this.props.logsQueries) {
+      this.updateDataSourceInstances();
+    }
   }
 
-  private checkFiltersAvailability() {
+  private updateDataSourceInstances() {
     const { logsQueries, datasourceInstance } = this.props;
-
-    if (!logsQueries) {
+    if (!logsQueries || !datasourceInstance) {
       return;
     }
 
-    if (datasourceInstance?.modifyQuery || hasToggleableQueryFiltersSupport(datasourceInstance)) {
-      this.setState({ logDetailsFilterAvailable: true });
+    const dsInstances: Record<string, DataSourceInstance> = {};
+
+    // Not in mixed mode.
+    if (datasourceInstance.uid !== MIXED_DATASOURCE_NAME) {
+      logsQueries.forEach(({ refId }) => {
+        dsInstances[refId] = datasourceInstance;
+      });
+      this.setState({ dsInstances });
       return;
     }
 
-    const promises = [];
+    // Mixed mode.
+    const dsPromises: Array<Promise<{ ds: DataSourceApi; refId: string }>> = [];
     for (const query of logsQueries) {
-      if (query.datasource) {
-        promises.push(getDataSourceSrv().get(query.datasource));
+      if (!query.datasource) {
+        continue;
+      }
+      const mustCheck = !dsInstances[query.refId] || dsInstances[query.refId].uid !== query.datasource.uid;
+      if (mustCheck) {
+        dsPromises.push(
+          new Promise((resolve) => {
+            getDataSourceSrv()
+              .get(query.datasource)
+              .then((ds) => {
+                resolve({ ds, refId: query.refId });
+              });
+          })
+        );
       }
     }
 
-    Promise.all(promises).then((dataSources) => {
-      const logDetailsFilterAvailable = dataSources.some(
-        (ds) => ds.modifyQuery || hasToggleableQueryFiltersSupport(ds)
-      );
-      this.setState({ logDetailsFilterAvailable });
+    if (!dsPromises.length) {
+      return;
+    }
+
+    Promise.all(dsPromises).then((instances) => {
+      instances.forEach(({ ds, refId }) => {
+        dsInstances[refId] = ds;
+      });
+      this.setState({ dsInstances });
     });
   }
 
@@ -106,6 +140,11 @@ class LogsContainer extends PureComponent<LogsContainerProps, LogsContainerState
     updateTimeRange({ exploreId, absoluteRange });
   };
 
+  loadMoreLogs = (absoluteRange: AbsoluteTimeRange) => {
+    const { exploreId, loadMoreLogs } = this.props;
+    loadMoreLogs({ exploreId, absoluteRange });
+  };
+
   private getQuery(
     logsQueries: DataQuery[] | undefined,
     row: LogRowModel,
@@ -123,46 +162,68 @@ class LogsContainer extends PureComponent<LogsContainerProps, LogsContainerState
     origRow: LogRowModel,
     options: LogRowContextOptions
   ): Promise<DataQueryResponse | []> => {
-    const { datasourceInstance, logsQueries } = this.props;
+    const { logsQueries } = this.props;
+
+    if (!origRow.dataFrame.refId || !this.state.dsInstances[origRow.dataFrame.refId]) {
+      return Promise.resolve([]);
+    }
 
-    if (hasLogsContextSupport(datasourceInstance)) {
-      const query = this.getQuery(logsQueries, origRow, datasourceInstance);
-      return datasourceInstance.getLogRowContext(row, options, query);
+    const ds = this.state.dsInstances[origRow.dataFrame.refId];
+    if (!hasLogsContextSupport(ds)) {
+      return Promise.resolve([]);
     }
 
-    return [];
+    const query = this.getQuery(logsQueries, origRow, ds);
+    return query ? ds.getLogRowContext(row, options, query) : Promise.resolve([]);
   };
 
-  getLogRowContextQuery = async (row: LogRowModel, options?: LogRowContextOptions): Promise<DataQuery | null> => {
-    const { datasourceInstance, logsQueries } = this.props;
+  getLogRowContextQuery = async (
+    row: LogRowModel,
+    options?: LogRowContextOptions,
+    cacheFilters = true
+  ): Promise<DataQuery | null> => {
+    const { logsQueries } = this.props;
+
+    if (!row.dataFrame.refId || !this.state.dsInstances[row.dataFrame.refId]) {
+      return Promise.resolve(null);
+    }
 
-    if (hasLogsContextSupport(datasourceInstance) && datasourceInstance.getLogRowContextQuery) {
-      const query = this.getQuery(logsQueries, row, datasourceInstance);
-      return datasourceInstance.getLogRowContextQuery(row, options, query);
+    const ds = this.state.dsInstances[row.dataFrame.refId];
+    if (!hasLogsContextSupport(ds)) {
+      return Promise.resolve(null);
     }
 
-    return null;
+    const query = this.getQuery(logsQueries, row, ds);
+    return query && ds.getLogRowContextQuery
+      ? ds.getLogRowContextQuery(row, options, query, cacheFilters)
+      : Promise.resolve(null);
   };
 
   getLogRowContextUi = (row: LogRowModel, runContextQuery?: () => void): React.ReactNode => {
-    const { datasourceInstance, logsQueries } = this.props;
+    const { logsQueries } = this.props;
+
+    if (!row.dataFrame.refId || !this.state.dsInstances[row.dataFrame.refId]) {
+      return <></>;
+    }
 
-    if (hasLogsContextUiSupport(datasourceInstance) && datasourceInstance.getLogRowContextUi) {
-      const query = this.getQuery(logsQueries, row, datasourceInstance);
-      return datasourceInstance.getLogRowContextUi(row, runContextQuery, query);
+    const ds = this.state.dsInstances[row.dataFrame.refId];
+    if (!hasLogsContextSupport(ds)) {
+      return <></>;
     }
 
-    return <></>;
+    const query = this.getQuery(logsQueries, row, ds);
+    return query && hasLogsContextUiSupport(ds) && ds.getLogRowContextUi ? (
+      ds.getLogRowContextUi(row, runContextQuery, query)
+    ) : (
+      <></>
+    );
   };
 
   showContextToggle = (row?: LogRowModel): boolean => {
-    const { datasourceInstance } = this.props;
-
-    if (hasLogsContextSupport(datasourceInstance)) {
-      return datasourceInstance.showContextToggle(row);
+    if (!row?.dataFrame.refId || !this.state.dsInstances[row.dataFrame.refId]) {
+      return false;
     }
-
-    return false;
+    return hasLogsContextSupport(this.state.dsInstances[row.dataFrame.refId]);
   };
 
   getFieldLinks = (field: Field, rowIndex: number, dataFrame: DataFrame) => {
@@ -170,6 +231,32 @@ class LogsContainer extends PureComponent<LogsContainerProps, LogsContainerState
     return getFieldLinksForExplore({ field, rowIndex, splitOpenFn, range, dataFrame });
   };
 
+  logDetailsFilterAvailable = () => {
+    return Object.values(this.state.dsInstances).some(
+      (ds) => ds?.modifyQuery || hasQueryModificationSupport(ds) || hasToggleableQueryFiltersSupport(ds)
+    );
+  };
+
+  filterValueAvailable = () => {
+    return Object.values(this.state.dsInstances).some(
+      (ds) => hasQueryModificationSupport(ds) && ds?.getSupportedQueryModifications().includes('ADD_STRING_FILTER')
+    );
+  };
+
+  filterOutValueAvailable = () => {
+    return Object.values(this.state.dsInstances).some(
+      (ds) => hasQueryModificationSupport(ds) && ds?.getSupportedQueryModifications().includes('ADD_STRING_FILTER_OUT')
+    );
+  };
+
+  addResultsToCache = () => {
+    this.props.addResultsToCache(this.props.exploreId);
+  };
+
+  clearCache = () => {
+    this.props.clearCache(this.props.exploreId);
+  };
+
   render() {
     const {
       loading,
@@ -193,12 +280,9 @@ class LogsContainer extends PureComponent<LogsContainerProps, LogsContainerState
       splitOpenFn,
       isLive,
       exploreId,
-      addResultsToCache,
-      clearCache,
       logsVolume,
       scrollElement,
     } = this.props;
-    const { logDetailsFilterAvailable } = this.state;
 
     if (!logRows) {
       return null;
@@ -243,8 +327,9 @@ class LogsContainer extends PureComponent<LogsContainerProps, LogsContainerState
             loadingState={loadingState}
             loadLogsVolumeData={() => loadSupplementaryQueryData(exploreId, SupplementaryQueryType.LogsVolume)}
             onChangeTime={this.onChangeTime}
-            onClickFilterLabel={logDetailsFilterAvailable ? onClickFilterLabel : undefined}
-            onClickFilterOutLabel={logDetailsFilterAvailable ? onClickFilterOutLabel : undefined}
+            loadMoreLogs={this.loadMoreLogs}
+            onClickFilterLabel={this.logDetailsFilterAvailable() ? onClickFilterLabel : undefined}
+            onClickFilterOutLabel={this.logDetailsFilterAvailable() ? onClickFilterOutLabel : undefined}
             onStartScanning={onStartScanning}
             onStopScanning={onStopScanning}
             absoluteRange={absoluteRange}
@@ -257,14 +342,16 @@ class LogsContainer extends PureComponent<LogsContainerProps, LogsContainerState
             getRowContextQuery={this.getLogRowContextQuery}
             getLogRowContextUi={this.getLogRowContextUi}
             getFieldLinks={this.getFieldLinks}
-            addResultsToCache={() => addResultsToCache(exploreId)}
-            clearCache={() => clearCache(exploreId)}
+            addResultsToCache={this.addResultsToCache}
+            clearCache={this.clearCache}
             eventBus={this.props.eventBus}
             panelState={this.props.panelState}
             logsFrames={this.props.logsFrames}
             scrollElement={scrollElement}
-            isFilterLabelActive={logDetailsFilterAvailable ? this.props.isFilterLabelActive : undefined}
+            isFilterLabelActive={this.logDetailsFilterAvailable() ? this.props.isFilterLabelActive : undefined}
             range={range}
+            onClickFilterValue={this.filterValueAvailable() ? this.props.onClickFilterValue : undefined}
+            onClickFilterOutValue={this.filterOutValueAvailable() ? this.props.onClickFilterOutValue : undefined}
           />
         </LogsCrossFadeTransition>
       </>
@@ -314,6 +401,7 @@ function mapStateToProps(state: StoreState, { exploreId }: { exploreId: string }
 
 const mapDispatchToProps = {
   updateTimeRange,
+  loadMoreLogs,
   addResultsToCache,
   clearCache,
   loadSupplementaryQueryData,
diff --git a/public/app/features/explore/Logs/LogsFeedback.tsx b/public/app/features/explore/Logs/LogsFeedback.tsx
new file mode 100644
index 0000000000000..91b3e1aa0a141
--- /dev/null
+++ b/public/app/features/explore/Logs/LogsFeedback.tsx
@@ -0,0 +1,38 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Icon, Stack, useStyles2 } from '@grafana/ui';
+
+interface Props {
+  feedbackUrl?: string;
+}
+
+export function LogsFeedback({ feedbackUrl }: Props) {
+  const styles = useStyles2(getStyles);
+  return (
+    <Stack>
+      <a
+        href={feedbackUrl}
+        className={styles.link}
+        title="The logs table is new, please let us know how we can improve it"
+        target="_blank"
+        rel="noreferrer noopener"
+      >
+        <Icon name="comment-alt-message" /> Give feedback
+      </a>
+    </Stack>
+  );
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    link: css({
+      color: theme.colors.text.secondary,
+      fontSize: theme.typography.bodySmall.fontSize,
+      ':hover': {
+        color: theme.colors.text.link,
+      },
+    }),
+  };
+}
diff --git a/public/app/features/explore/Logs/LogsMetaRow.test.tsx b/public/app/features/explore/Logs/LogsMetaRow.test.tsx
index 9e506d6b61f7c..83755343cdbba 100644
--- a/public/app/features/explore/Logs/LogsMetaRow.test.tsx
+++ b/public/app/features/explore/Logs/LogsMetaRow.test.tsx
@@ -3,10 +3,12 @@ import userEvent from '@testing-library/user-event';
 import saveAs from 'file-saver';
 import React, { ComponentProps } from 'react';
 
-import { FieldType, LogLevel, LogsDedupStrategy, toDataFrame } from '@grafana/data';
+import { FieldType, LogLevel, LogsDedupStrategy, standardTransformersRegistry, toDataFrame } from '@grafana/data';
+import { organizeFieldsTransformer } from '@grafana/data/src/transformations/transformers/organize';
 
 import { MAX_CHARACTERS } from '../../logs/components/LogRowMessage';
 import { logRowsToReadableJson } from '../../logs/utils';
+import { extractFieldsTransformer } from '../../transformers/extractFields/extractFields';
 
 import { LogsMetaRow } from './LogsMetaRow';
 
@@ -200,4 +202,112 @@ describe('LogsMetaRow', () => {
     const text = await blob.text();
     expect(text).toBe(JSON.stringify(logRowsToReadableJson(rows)));
   });
+
+  it('renders a button to download CSV', async () => {
+    const transformers = [extractFieldsTransformer, organizeFieldsTransformer];
+    standardTransformersRegistry.setInit(() => {
+      return transformers.map((t) => {
+        return {
+          id: t.id,
+          aliasIds: t.aliasIds,
+          name: t.name,
+          transformation: t,
+          description: t.description,
+          editor: () => null,
+        };
+      });
+    });
+
+    const rows = [
+      {
+        rowIndex: 1,
+        entryFieldIndex: 0,
+        dataFrame: toDataFrame({
+          name: 'logs',
+          refId: 'A',
+          fields: [
+            {
+              name: 'time',
+              type: FieldType.time,
+              values: ['1970-01-01T00:00:00Z'],
+            },
+            {
+              name: 'message',
+              type: FieldType.string,
+              values: ['INFO 1'],
+              labels: {
+                foo: 'bar',
+              },
+            },
+          ],
+        }),
+        entry: 'test entry',
+        hasAnsi: false,
+        hasUnescapedContent: false,
+        labels: {
+          foo: 'bar',
+        },
+        logLevel: LogLevel.info,
+        raw: '',
+        timeEpochMs: 10,
+        timeEpochNs: '123456789',
+        timeFromNow: '',
+        timeLocal: '',
+        timeUtc: '',
+        uid: '2',
+      },
+      {
+        rowIndex: 2,
+        entryFieldIndex: 1,
+        dataFrame: toDataFrame({
+          name: 'logs',
+          refId: 'B',
+          fields: [
+            {
+              name: 'time',
+              type: FieldType.time,
+              values: ['1970-01-02T00:00:00Z'],
+            },
+            {
+              name: 'message',
+              type: FieldType.string,
+              values: ['INFO 1'],
+              labels: {
+                foo: 'bar',
+              },
+            },
+          ],
+        }),
+        entry: 'test entry',
+        hasAnsi: false,
+        hasUnescapedContent: false,
+        labels: {
+          foo: 'bar',
+        },
+        logLevel: LogLevel.info,
+        raw: '',
+        timeEpochMs: 10,
+        timeEpochNs: '123456789',
+        timeFromNow: '',
+        timeLocal: '',
+        timeUtc: '',
+        uid: '2',
+      },
+    ];
+    setup({ logRows: rows });
+
+    await userEvent.click(screen.getByText('Download').closest('button')!);
+
+    await userEvent.click(
+      screen.getByRole('menuitem', {
+        name: 'csv',
+      })
+    );
+    expect(saveAs).toBeCalled();
+
+    const blob = (saveAs as unknown as jest.Mock).mock.lastCall[0];
+    expect(blob.type).toBe('text/csv;charset=utf-8');
+    const text = await blob.text();
+    expect(text).toBe(`"time","message bar"\r\n1970-01-02T00:00:00Z,INFO 1`);
+  });
 });
diff --git a/public/app/features/explore/Logs/LogsMetaRow.tsx b/public/app/features/explore/Logs/LogsMetaRow.tsx
index 5bf8cf7a0341d..55f5bdacc028f 100644
--- a/public/app/features/explore/Logs/LogsMetaRow.tsx
+++ b/public/app/features/explore/Logs/LogsMetaRow.tsx
@@ -1,17 +1,31 @@
 import { css } from '@emotion/css';
 import saveAs from 'file-saver';
 import React from 'react';
+import { lastValueFrom } from 'rxjs';
 
-import { LogsDedupStrategy, LogsMetaItem, LogsMetaKind, LogRowModel, CoreApp, dateTimeFormat } from '@grafana/data';
+import {
+  LogsDedupStrategy,
+  LogsMetaItem,
+  LogsMetaKind,
+  LogRowModel,
+  CoreApp,
+  dateTimeFormat,
+  transformDataFrame,
+  DataTransformerConfig,
+  CustomTransformOperator,
+} from '@grafana/data';
+import { DataFrame } from '@grafana/data/';
 import { reportInteraction } from '@grafana/runtime';
 import { Button, Dropdown, Menu, ToolbarButton, Tooltip, useStyles2 } from '@grafana/ui';
 
-import { downloadLogsModelAsTxt } from '../../inspector/utils/download';
+import { downloadDataFrameAsCsv, downloadLogsModelAsTxt } from '../../inspector/utils/download';
 import { LogLabels } from '../../logs/components/LogLabels';
 import { MAX_CHARACTERS } from '../../logs/components/LogRowMessage';
 import { logRowsToReadableJson } from '../../logs/utils';
 import { MetaInfoText, MetaItemProps } from '../MetaInfoText';
 
+import { getLogsExtractFields } from './LogsTable';
+
 const getStyles = () => ({
   metaContainer: css`
     flex: 1;
@@ -35,6 +49,7 @@ export type Props = {
 enum DownloadFormat {
   Text = 'text',
   Json = 'json',
+  CSV = 'csv',
 }
 
 export const LogsMetaRow = React.memo(
@@ -51,7 +66,7 @@ export const LogsMetaRow = React.memo(
   }: Props) => {
     const style = useStyles2(getStyles);
 
-    const downloadLogs = (format: DownloadFormat) => {
+    const downloadLogs = async (format: DownloadFormat) => {
       reportInteraction('grafana_logs_download_logs_clicked', {
         app: CoreApp.Explore,
         format,
@@ -67,10 +82,30 @@ export const LogsMetaRow = React.memo(
           const blob = new Blob([JSON.stringify(jsonLogs)], {
             type: 'application/json;charset=utf-8',
           });
-
           const fileName = `Explore-logs-${dateTimeFormat(new Date())}.json`;
           saveAs(blob, fileName);
           break;
+        case DownloadFormat.CSV:
+          const dataFrameMap = new Map<string, DataFrame>();
+          logRows.forEach((row) => {
+            if (row.dataFrame?.refId && !dataFrameMap.has(row.dataFrame?.refId)) {
+              dataFrameMap.set(row.dataFrame?.refId, row.dataFrame);
+            }
+          });
+          dataFrameMap.forEach(async (dataFrame) => {
+            const transforms: Array<DataTransformerConfig | CustomTransformOperator> = getLogsExtractFields(dataFrame);
+            transforms.push({
+              id: 'organize',
+              options: {
+                excludeByName: {
+                  ['labels']: true,
+                  ['labelTypes']: true,
+                },
+              },
+            });
+            const transformedDataFrame = await lastValueFrom(transformDataFrame(transforms, [dataFrame]));
+            downloadDataFrameAsCsv(transformedDataFrame[0], `Explore-logs-${dataFrame.refId}`);
+          });
       }
     };
 
@@ -131,6 +166,7 @@ export const LogsMetaRow = React.memo(
       <Menu>
         <Menu.Item label="txt" onClick={() => downloadLogs(DownloadFormat.Text)} />
         <Menu.Item label="json" onClick={() => downloadLogs(DownloadFormat.Json)} />
+        <Menu.Item label="csv" onClick={() => downloadLogs(DownloadFormat.CSV)} />
       </Menu>
     );
     return (
diff --git a/public/app/features/explore/Logs/LogsNavigation.test.tsx b/public/app/features/explore/Logs/LogsNavigation.test.tsx
index d045191b0603f..6c2a5153bd465 100644
--- a/public/app/features/explore/Logs/LogsNavigation.test.tsx
+++ b/public/app/features/explore/Logs/LogsNavigation.test.tsx
@@ -3,6 +3,7 @@ import userEvent from '@testing-library/user-event';
 import React, { ComponentProps } from 'react';
 
 import { LogsSortOrder } from '@grafana/data';
+import { DataQuery } from '@grafana/schema';
 
 import LogsNavigation from './LogsNavigation';
 
@@ -93,6 +94,42 @@ describe('LogsNavigation', () => {
     expect(onChangeTimeMock).toHaveBeenCalledWith({ from: 1637319338000, to: 1637322938000 });
   });
 
+  it('should correctly display the active page', async () => {
+    const queries: DataQuery[] = [];
+    const { rerender } = setup({
+      absoluteRange: { from: 1704737384139, to: 1704737684139 },
+      visibleRange: { from: 1704737384207, to: 1704737683316 },
+      queries,
+      logsSortOrder: LogsSortOrder.Descending,
+    });
+
+    expect(await screen.findByTestId('page1')).toBeInTheDocument();
+    expect(screen.getByTestId('page1').firstChild).toHaveClass('selectedBg');
+
+    expect(screen.queryByTestId('page2')).not.toBeInTheDocument();
+
+    await userEvent.click(screen.getByTestId('olderLogsButton'));
+
+    rerender(
+      <LogsNavigation
+        {...defaultProps}
+        absoluteRange={{ from: 1704737084207, to: 1704737384207 }}
+        visibleRange={{ from: 1704737084627, to: 1704737383765 }}
+        onChangeTime={jest.fn()}
+        logsSortOrder={LogsSortOrder.Descending}
+        queries={queries}
+      />
+    );
+
+    expect(await screen.findByTestId('page1')).toBeInTheDocument();
+    expect(screen.getByTestId('page1').firstChild).not.toHaveClass('selectedBg');
+
+    expect(await screen.findByTestId('page2')).toBeInTheDocument();
+    expect(screen.getByTestId('page2').firstChild).toHaveClass('selectedBg');
+
+    expect(screen.queryByTestId('page3')).not.toBeInTheDocument();
+  });
+
   it('should reset the scroll when pagination is clicked', async () => {
     const scrollToTopLogsMock = jest.fn();
     setup({ scrollToTopLogs: scrollToTopLogsMock });
@@ -101,4 +138,31 @@ describe('LogsNavigation', () => {
     await userEvent.click(screen.getByTestId('olderLogsButton'));
     expect(scrollToTopLogsMock).toHaveBeenCalled();
   });
+
+  it('should not trigger actions while loading', async () => {
+    const scrollToTopLogs = jest.fn();
+    const changeTimeMock = jest.fn();
+    setup({ scrollToTopLogs, onChangeTime: changeTimeMock, loading: true });
+
+    expect(scrollToTopLogs).not.toHaveBeenCalled();
+    expect(changeTimeMock).not.toHaveBeenCalled();
+    await userEvent.click(screen.getByTestId('olderLogsButton'));
+    await userEvent.click(screen.getByTestId('newerLogsButton'));
+    expect(scrollToTopLogs).not.toHaveBeenCalled();
+    expect(changeTimeMock).not.toHaveBeenCalled();
+  });
+
+  it('should not add results to cache unless pagination is used', async () => {
+    const addResultsToCache = jest.fn();
+    setup({ addResultsToCache });
+
+    expect(addResultsToCache).not.toHaveBeenCalled();
+    expect(screen.getByTestId('olderLogsButton')).not.toBeDisabled();
+    expect(screen.getByTestId('newerLogsButton')).toBeDisabled();
+
+    await userEvent.click(screen.getByTestId('olderLogsButton'));
+    await userEvent.click(screen.getByTestId('newerLogsButton'));
+
+    expect(addResultsToCache).toHaveBeenCalledTimes(1);
+  });
 });
diff --git a/public/app/features/explore/Logs/LogsNavigation.tsx b/public/app/features/explore/Logs/LogsNavigation.tsx
index ffd62a5c407dd..b605f284a990c 100644
--- a/public/app/features/explore/Logs/LogsNavigation.tsx
+++ b/public/app/features/explore/Logs/LogsNavigation.tsx
@@ -1,10 +1,10 @@
 import { css } from '@emotion/css';
 import { isEqual } from 'lodash';
-import React, { memo, useCallback, useEffect, useRef, useState } from 'react';
+import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
-import { AbsoluteTimeRange, GrafanaTheme2, LogsSortOrder, TimeZone } from '@grafana/data';
-import { reportInteraction } from '@grafana/runtime';
-import { DataQuery } from '@grafana/schema';
+import { AbsoluteTimeRange, GrafanaTheme2, LogsSortOrder } from '@grafana/data';
+import { config, reportInteraction } from '@grafana/runtime';
+import { DataQuery, TimeZone } from '@grafana/schema';
 import { Button, Icon, Spinner, useTheme2 } from '@grafana/ui';
 import { TOP_BAR_LEVEL_HEIGHT } from 'app/core/components/AppChrome/types';
 
@@ -41,7 +41,6 @@ function LogsNavigation({
   addResultsToCache,
 }: Props) {
   const [pages, setPages] = useState<LogsPage[]>([]);
-  const [currentPageIndex, setCurrentPageIndex] = useState(0);
 
   // These refs are to determine, if we want to clear up logs navigation when totally new query is run
   const expectedQueriesRef = useRef<DataQuery[]>();
@@ -50,6 +49,14 @@ function LogsNavigation({
   // e.g. if last 5 min selected, always run 5 min range
   const rangeSpanRef = useRef(0);
 
+  const currentPageIndex = useMemo(
+    () =>
+      pages.findIndex((page) => {
+        return page.queryRange.to === absoluteRange.to;
+      }),
+    [absoluteRange.to, pages]
+  );
+
   const oldestLogsFirst = logsSortOrder === LogsSortOrder.Ascending;
   const onFirstPage = oldestLogsFirst ? currentPageIndex === pages.length - 1 : currentPageIndex === 0;
   const onLastPage = oldestLogsFirst ? currentPageIndex === 0 : currentPageIndex === pages.length - 1;
@@ -64,7 +71,6 @@ function LogsNavigation({
     if (!isEqual(expectedRangeRef.current, absoluteRange) || !isEqual(expectedQueriesRef.current, queries)) {
       clearCache();
       setPages([newPage]);
-      setCurrentPageIndex(0);
       expectedQueriesRef.current = queries;
       rangeSpanRef.current = absoluteRange.to - absoluteRange.from;
     } else {
@@ -73,30 +79,18 @@ function LogsNavigation({
         newPages = pages.filter((page) => !isEqual(newPage.queryRange, page.queryRange));
         // Sort pages based on logsOrder so they visually align with displayed logs
         newPages = [...newPages, newPage].sort((a, b) => sortPages(a, b, logsSortOrder));
-        // Set new pages
-
         return newPages;
       });
-
-      // Set current page index
-      const index = newPages.findIndex((page) => page.queryRange.to === absoluteRange.to);
-      setCurrentPageIndex(index);
     }
-    addResultsToCache();
   }, [visibleRange, absoluteRange, logsSortOrder, queries, clearCache, addResultsToCache]);
 
-  useEffect(() => {
-    clearCache();
-    // We can't enforce the eslint rule here because we only want to run when component is mounted.
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
   const changeTime = useCallback(
     ({ from, to }: AbsoluteTimeRange) => {
+      addResultsToCache();
       expectedRangeRef.current = { from, to };
       onChangeTime({ from, to });
     },
-    [onChangeTime]
+    [onChangeTime, addResultsToCache]
   );
 
   const sortPages = (a: LogsPage, b: LogsPage, logsSortOrder?: LogsSortOrder | null) => {
@@ -173,29 +167,38 @@ function LogsNavigation({
         pageType: 'page',
         pageNumber,
       });
-      !loading && changeTime({ from: page.queryRange.from, to: page.queryRange.to });
+      changeTime({ from: page.queryRange.from, to: page.queryRange.to });
       scrollToTopLogs();
     },
-    [changeTime, loading, scrollToTopLogs]
+    [changeTime, scrollToTopLogs]
   );
 
+  const onScrollToTopClick = useCallback(() => {
+    reportInteraction('grafana_explore_logs_scroll_top_clicked');
+    scrollToTopLogs();
+  }, [scrollToTopLogs]);
+
   return (
     <div className={styles.navContainer}>
-      {oldestLogsFirst ? olderLogsButton : newerLogsButton}
-      <LogsNavigationPages
-        pages={pages}
-        currentPageIndex={currentPageIndex}
-        oldestLogsFirst={oldestLogsFirst}
-        timeZone={timeZone}
-        loading={loading}
-        onClick={onPageClick}
-      />
-      {oldestLogsFirst ? newerLogsButton : olderLogsButton}
+      {!config.featureToggles.logsInfiniteScrolling && (
+        <>
+          {oldestLogsFirst ? olderLogsButton : newerLogsButton}
+          <LogsNavigationPages
+            pages={pages}
+            currentPageIndex={currentPageIndex}
+            oldestLogsFirst={oldestLogsFirst}
+            timeZone={timeZone}
+            loading={loading}
+            onClick={onPageClick}
+          />
+          {oldestLogsFirst ? newerLogsButton : olderLogsButton}
+        </>
+      )}
       <Button
         data-testid="scrollToTop"
         className={styles.scrollToTopButton}
         variant="secondary"
-        onClick={scrollToTopLogs}
+        onClick={onScrollToTopClick}
         title="Scroll to top"
       >
         <Icon name="arrow-up" size="lg" />
@@ -213,7 +216,9 @@ const getStyles = (theme: GrafanaTheme2, oldestLogsFirst: boolean) => {
       max-height: ${navContainerHeight};
       display: flex;
       flex-direction: column;
-      justify-content: ${oldestLogsFirst ? 'flex-start' : 'space-between'};
+      ${config.featureToggles.logsInfiniteScrolling
+        ? `justify-content: flex-end;`
+        : `justify-content: ${oldestLogsFirst ? 'flex-start' : 'space-between'};`}
       position: sticky;
       top: ${theme.spacing(2)};
       right: 0;
diff --git a/public/app/features/explore/Logs/LogsNavigationPages.tsx b/public/app/features/explore/Logs/LogsNavigationPages.tsx
index 2f8de5c7d58f6..a6b1fd20108f9 100644
--- a/public/app/features/explore/Logs/LogsNavigationPages.tsx
+++ b/public/app/features/explore/Logs/LogsNavigationPages.tsx
@@ -1,7 +1,8 @@
 import { css, cx } from '@emotion/css';
 import React from 'react';
 
-import { dateTimeFormat, systemDateFormats, TimeZone, GrafanaTheme2 } from '@grafana/data';
+import { dateTimeFormat, systemDateFormats, GrafanaTheme2 } from '@grafana/data';
+import { TimeZone } from '@grafana/schema';
 import { CustomScrollbar, Spinner, useTheme2, clearButtonStyles } from '@grafana/ui';
 
 import { LogsPage } from './LogsNavigation';
@@ -48,6 +49,7 @@ export function LogsNavigationPages({ pages, currentPageIndex, oldestLogsFirst,
               onClick={() => {
                 onClick(page, index + 1);
               }}
+              disabled={loading}
             >
               <div className={cx(styles.line, { selectedBg: currentPageIndex === index })} />
               <div className={cx(styles.time, { selectedText: currentPageIndex === index })}>
diff --git a/public/app/features/explore/Logs/LogsSamplePanel.tsx b/public/app/features/explore/Logs/LogsSamplePanel.tsx
index c3afeb696e9a3..5e628b38c4b50 100644
--- a/public/app/features/explore/Logs/LogsSamplePanel.tsx
+++ b/public/app/features/explore/Logs/LogsSamplePanel.tsx
@@ -11,7 +11,7 @@ import {
   SplitOpen,
   SupplementaryQueryType,
 } from '@grafana/data';
-import { config, reportInteraction } from '@grafana/runtime';
+import { reportInteraction } from '@grafana/runtime';
 import { DataQuery, TimeZone } from '@grafana/schema';
 import { Button, Collapse, Icon, Tooltip, useStyles2 } from '@grafana/ui';
 import store from 'app/core/store';
@@ -45,6 +45,9 @@ export function LogsSamplePanel(props: Props) {
   };
 
   const OpenInSplitViewButton = () => {
+    if (!datasourceInstance) {
+      return null;
+    }
     if (!hasSupplementaryQuerySupport(datasourceInstance, SupplementaryQueryType.LogsSample)) {
       return null;
     }
@@ -107,7 +110,6 @@ export function LogsSamplePanel(props: Props) {
 
   return queryResponse?.state !== LoadingState.NotStarted ? (
     <Collapse
-      className={styles.logsSamplePanel}
       label={
         <div>
           Logs sample
@@ -126,20 +128,13 @@ export function LogsSamplePanel(props: Props) {
 }
 
 const getStyles = (theme: GrafanaTheme2) => {
-  const scrollableLogsContainer = config.featureToggles.exploreScrollableLogsContainer;
-
   return {
-    logsSamplePanel: css`
-      ${scrollableLogsContainer && 'max-height: calc(100vh - 115px);'}
-    `,
     logSamplesButton: css`
       position: absolute;
       top: ${theme.spacing(1)};
       right: ${theme.spacing(1)};
     `,
     logContainer: css`
-      ${scrollableLogsContainer && 'position: relative;'}
-      ${scrollableLogsContainer && 'height: 100%;'}
       overflow: scroll;
     `,
     infoTooltip: css`
diff --git a/public/app/features/explore/Logs/LogsTable.test.tsx b/public/app/features/explore/Logs/LogsTable.test.tsx
index 9f4c108bdd4d3..b22a227739555 100644
--- a/public/app/features/explore/Logs/LogsTable.test.tsx
+++ b/public/app/features/explore/Logs/LogsTable.test.tsx
@@ -6,6 +6,8 @@ import { organizeFieldsTransformer } from '@grafana/data/src/transformations/tra
 import { config } from '@grafana/runtime';
 import { extractFieldsTransformer } from 'app/features/transformers/extractFields/extractFields';
 
+import { parseLogsFrame } from '../../logs/logsFrame';
+
 import { LogsTable } from './LogsTable';
 import { getMockElasticFrame, getMockLokiFrame, getMockLokiFrameDataPlane } from './utils/testMocks.test';
 
@@ -52,10 +54,15 @@ const getComponent = (partialProps?: Partial<ComponentProps<typeof LogsTable>>,
     ],
     length: 3,
   };
+  const logsFrame = parseLogsFrame(testDataFrame);
   return (
     <LogsTable
+      logsFrame={logsFrame}
       height={400}
-      columnsWithMeta={{}}
+      columnsWithMeta={{
+        Time: { active: true, percentOfLinesWithLabel: 3, index: 0 },
+        line: { active: true, percentOfLinesWithLabel: 3, index: 1 },
+      }}
       logsSortOrder={LogsSortOrder.Descending}
       splitOpen={() => undefined}
       timeZone={'utc'}
@@ -65,7 +72,7 @@ const getComponent = (partialProps?: Partial<ComponentProps<typeof LogsTable>>,
         to: toUtc('2019-01-01 16:00:00'),
         raw: { from: 'now-1h', to: 'now' },
       }}
-      logsFrames={[logs ?? testDataFrame]}
+      dataFrame={logs ?? testDataFrame}
       {...partialProps}
     />
   );
@@ -121,7 +128,13 @@ describe('LogsTable', () => {
 
   it('should render extracted labels as columns (elastic)', async () => {
     setup({
-      logsFrames: [getMockElasticFrame()],
+      dataFrame: getMockElasticFrame(),
+      columnsWithMeta: {
+        level: { active: true, percentOfLinesWithLabel: 3, index: 3 },
+        counter: { active: true, percentOfLinesWithLabel: 3, index: 2 },
+        line: { active: true, percentOfLinesWithLabel: 3, index: 1 },
+        '@timestamp': { active: true, percentOfLinesWithLabel: 3, index: 0 },
+      },
     });
 
     await waitFor(() => {
@@ -136,7 +149,9 @@ describe('LogsTable', () => {
   it('should render extracted labels as columns (loki)', async () => {
     setup({
       columnsWithMeta: {
-        foo: { active: true, percentOfLinesWithLabel: 3 },
+        Time: { active: true, percentOfLinesWithLabel: 3, index: 0 },
+        line: { active: true, percentOfLinesWithLabel: 3, index: 1 },
+        foo: { active: true, percentOfLinesWithLabel: 3, index: 2 },
       },
     });
 
@@ -149,7 +164,7 @@ describe('LogsTable', () => {
     });
   });
 
-  it('should not render `tsNs`', async () => {
+  it('should not render `tsNs` column', async () => {
     setup(undefined, getMockLokiFrame());
 
     await waitFor(() => {
@@ -159,6 +174,28 @@ describe('LogsTable', () => {
     });
   });
 
+  it('should render numeric field aligned right', async () => {
+    setup(
+      {
+        columnsWithMeta: {
+          Time: { active: true, percentOfLinesWithLabel: 100, index: 0 },
+          line: { active: true, percentOfLinesWithLabel: 100, index: 1 },
+          tsNs: { active: true, percentOfLinesWithLabel: 100, index: 2 },
+        },
+      },
+      getMockLokiFrame()
+    );
+
+    await waitFor(() => {
+      const columns = screen.queryAllByRole('columnheader', { name: 'tsNs' });
+      expect(columns.length).toBe(1);
+    });
+
+    const cells = screen.queryAllByRole('cell');
+
+    expect(cells[cells.length - 1].style.textAlign).toBe('right');
+  });
+
   it('should not render `labels`', async () => {
     setup();
 
@@ -186,7 +223,15 @@ describe('LogsTable', () => {
     });
 
     it('should render 4 table rows', async () => {
-      setup(undefined, getMockLokiFrameDataPlane());
+      setup(
+        {
+          columnsWithMeta: {
+            timestamp: { active: true, percentOfLinesWithLabel: 3, index: 0 },
+            body: { active: true, percentOfLinesWithLabel: 3, index: 1 },
+          },
+        },
+        getMockLokiFrameDataPlane()
+      );
 
       await waitFor(() => {
         const rows = screen.getAllByRole('row');
@@ -196,7 +241,16 @@ describe('LogsTable', () => {
     });
 
     it('should render a datalink for each row', async () => {
-      render(getComponent({}, getMockLokiFrameDataPlane()));
+      render(
+        getComponent(
+          {
+            columnsWithMeta: {
+              traceID: { active: true, percentOfLinesWithLabel: 3, index: 0 },
+            },
+          },
+          getMockLokiFrameDataPlane()
+        )
+      );
 
       await waitFor(() => {
         const links = screen.getAllByRole('link');
@@ -205,18 +259,34 @@ describe('LogsTable', () => {
       });
     });
 
-    it('should not render `attributes`', async () => {
-      setup(undefined, getMockLokiFrameDataPlane());
+    it('should not render `labels`', async () => {
+      setup(
+        {
+          columnsWithMeta: {
+            timestamp: { active: true, percentOfLinesWithLabel: 100, index: 0 },
+            body: { active: true, percentOfLinesWithLabel: 100, index: 1 },
+          },
+        },
+        getMockLokiFrameDataPlane()
+      );
 
       await waitFor(() => {
-        const columns = screen.queryAllByRole('columnheader', { name: 'attributes' });
+        const columns = screen.queryAllByRole('columnheader', { name: 'labels' });
 
         expect(columns.length).toBe(0);
       });
     });
 
     it('should not render `tsNs`', async () => {
-      setup(undefined, getMockLokiFrameDataPlane());
+      setup(
+        {
+          columnsWithMeta: {
+            timestamp: { active: true, percentOfLinesWithLabel: 100, index: 0 },
+            body: { active: true, percentOfLinesWithLabel: 100, index: 1 },
+          },
+        },
+        getMockLokiFrameDataPlane()
+      );
 
       await waitFor(() => {
         const columns = screen.queryAllByRole('columnheader', { name: 'tsNs' });
@@ -228,13 +298,14 @@ describe('LogsTable', () => {
     it('should render extracted labels as columns (loki dataplane)', async () => {
       setup({
         columnsWithMeta: {
-          foo: { active: true, percentOfLinesWithLabel: 3 },
+          foo: { active: true, percentOfLinesWithLabel: 3, index: 2 },
+          line: { active: true, percentOfLinesWithLabel: 3, index: 1 },
+          Time: { active: true, percentOfLinesWithLabel: 3, index: 0 },
         },
       });
 
       await waitFor(() => {
         const columns = screen.getAllByRole('columnheader');
-
         expect(columns[0].textContent).toContain('Time');
         expect(columns[1].textContent).toContain('line');
         expect(columns[2].textContent).toContain('foo');
diff --git a/public/app/features/explore/Logs/LogsTable.tsx b/public/app/features/explore/Logs/LogsTable.tsx
index f53d10d3c2af7..8f50a8d8ba8de 100644
--- a/public/app/features/explore/Logs/LogsTable.tsx
+++ b/public/app/features/explore/Logs/LogsTable.tsx
@@ -9,6 +9,7 @@ import {
   DataTransformerConfig,
   Field,
   FieldType,
+  guessFieldTypeForField,
   LogsSortOrder,
   sortDataFrame,
   SplitOpen,
@@ -19,38 +20,36 @@ import {
 import { config } from '@grafana/runtime';
 import { AdHocFilterItem, Table } from '@grafana/ui';
 import { FILTER_FOR_OPERATOR, FILTER_OUT_OPERATOR } from '@grafana/ui/src/components/Table/types';
-import { separateVisibleFields } from 'app/features/logs/components/logParser';
-import { LogsFrame, parseLogsFrame } from 'app/features/logs/logsFrame';
+import { LogsFrame } from 'app/features/logs/logsFrame';
 
 import { getFieldLinksForExplore } from '../utils/links';
 
-import { fieldNameMeta } from './LogsTableWrap';
+import { FieldNameMeta } from './LogsTableWrap';
 
 interface Props {
-  logsFrames: DataFrame[];
+  dataFrame: DataFrame;
   width: number;
   timeZone: string;
   splitOpen: SplitOpen;
   range: TimeRange;
   logsSortOrder: LogsSortOrder;
-  columnsWithMeta: Record<string, fieldNameMeta>;
+  columnsWithMeta: Record<string, FieldNameMeta>;
   height: number;
-  onClickFilterLabel?: (key: string, value: string, refId?: string) => void;
-  onClickFilterOutLabel?: (key: string, value: string, refId?: string) => void;
+  onClickFilterLabel?: (key: string, value: string, frame?: DataFrame) => void;
+  onClickFilterOutLabel?: (key: string, value: string, frame?: DataFrame) => void;
+  logsFrame: LogsFrame | null;
 }
 
 export function LogsTable(props: Props) {
-  const { timeZone, splitOpen, range, logsSortOrder, width, logsFrames, columnsWithMeta } = props;
+  const { timeZone, splitOpen, range, logsSortOrder, width, dataFrame, columnsWithMeta, logsFrame } = props;
   const [tableFrame, setTableFrame] = useState<DataFrame | undefined>(undefined);
-
-  // Only a single frame (query) is supported currently
-  const logFrameRaw = logsFrames ? logsFrames[0] : undefined;
+  const timeIndex = logsFrame?.timeField.index;
 
   const prepareTableFrame = useCallback(
     (frame: DataFrame): DataFrame => {
-      // Parse the dataframe to a logFrame
-      const logsFrame = parseLogsFrame(frame);
-      const timeIndex = logsFrame?.timeField.index;
+      if (!frame.length) {
+        return frame;
+      }
 
       const sortedFrame = sortDataFrame(frame, timeIndex, logsSortOrder === LogsSortOrder.Descending);
 
@@ -82,42 +81,53 @@ export function LogsTable(props: Props) {
           custom: {
             inspect: true,
             filterable: true, // This sets the columns to be filterable
+            width: getInitialFieldWidth(field),
             ...field.config.custom,
           },
           // This sets the individual field value as filterable
-          filterable: isFieldFilterable(field, logsFrame ?? undefined),
+          filterable: isFieldFilterable(field, logsFrame?.bodyField.name ?? '', logsFrame?.timeField.name ?? ''),
         };
+
+        // If it's a string, then try to guess for a better type for numeric support in viz
+        field.type = field.type === FieldType.string ? guessFieldTypeForField(field) ?? FieldType.string : field.type;
       }
 
       return frameWithOverrides;
     },
-    [logsSortOrder, timeZone, splitOpen, range]
+    [logsSortOrder, timeZone, splitOpen, range, logsFrame?.bodyField.name, logsFrame?.timeField.name, timeIndex]
   );
 
   useEffect(() => {
     const prepare = async () => {
-      // Parse the dataframe to a logFrame
-      const logsFrame = logFrameRaw ? parseLogsFrame(logFrameRaw) : undefined;
-
-      if (!logFrameRaw || !logsFrame) {
+      if (!logsFrame?.timeField.name || !logsFrame?.bodyField.name) {
         setTableFrame(undefined);
         return;
       }
 
-      let dataFrame = logFrameRaw;
-
       // create extract JSON transformation for every field that is `json.RawMessage`
-      const transformations: Array<DataTransformerConfig | CustomTransformOperator> =
-        extractFieldsAndExclude(dataFrame);
+      const transformations: Array<DataTransformerConfig | CustomTransformOperator> = getLogsExtractFields(dataFrame);
 
-      // remove hidden fields
-      transformations.push(...removeHiddenFields(dataFrame));
-      let labelFilters = buildLabelFilters(columnsWithMeta, logsFrame);
+      let labelFilters = buildLabelFilters(columnsWithMeta);
 
       // Add the label filters to the transformations
       const transform = getLabelFiltersTransform(labelFilters);
       if (transform) {
         transformations.push(transform);
+      } else {
+        // If no fields are filtered, filter the default fields, so we don't render all columns
+        transformations.push({
+          id: 'organize',
+          options: {
+            indexByName: {
+              [logsFrame.bodyField.name]: 0,
+              [logsFrame.timeField.name]: 1,
+            },
+            includeByName: {
+              [logsFrame.bodyField.name]: true,
+              [logsFrame.timeField.name]: true,
+            },
+          },
+        });
       }
 
       if (transformations.length > 0) {
@@ -129,7 +139,14 @@ export function LogsTable(props: Props) {
       }
     };
     prepare();
-  }, [columnsWithMeta, logFrameRaw, logsSortOrder, prepareTableFrame]);
+  }, [
+    columnsWithMeta,
+    dataFrame,
+    logsSortOrder,
+    prepareTableFrame,
+    logsFrame?.bodyField.name,
+    logsFrame?.timeField.name,
+  ]);
 
   if (!tableFrame) {
     return null;
@@ -142,11 +159,11 @@ export function LogsTable(props: Props) {
       return;
     }
     if (operator === FILTER_FOR_OPERATOR) {
-      onClickFilterLabel(key, value);
+      onClickFilterLabel(key, value, dataFrame);
     }
 
     if (operator === FILTER_OUT_OPERATOR) {
-      onClickFilterOutLabel(key, value);
+      onClickFilterOutLabel(key, value, dataFrame);
     }
   };
 
@@ -161,32 +178,34 @@ export function LogsTable(props: Props) {
   );
 }
 
-const isFieldFilterable = (field: Field, logsFrame?: LogsFrame | undefined) => {
-  if (!logsFrame) {
+const isFieldFilterable = (field: Field, bodyName: string, timeName: string) => {
+  if (!bodyName || !timeName) {
     return false;
   }
-  if (logsFrame.bodyField.name === field.name) {
+  if (bodyName === field.name) {
     return false;
   }
-  if (logsFrame.timeField.name === field.name) {
+  if (timeName === field.name) {
+    return false;
+  }
+  if (field.config.links?.length) {
     return false;
   }
-  // @todo not currently excluding derived fields from filtering
 
   return true;
 };
 
 // TODO: explore if `logsFrame.ts` can help us with getting the right fields
 // TODO Why is typeInfo not defined on the Field interface?
-function extractFieldsAndExclude(dataFrame: DataFrame) {
+export function getLogsExtractFields(dataFrame: DataFrame) {
   return dataFrame.fields
     .filter((field: Field & { typeInfo?: { frame: string } }) => {
-      const isFieldLokiLabels = field.typeInfo?.frame === 'json.RawMessage' && field.name === 'labels';
+      const isFieldLokiLabels =
+        field.typeInfo?.frame === 'json.RawMessage' &&
+        field.name === 'labels' &&
+        dataFrame?.meta?.type !== DataFrameType.LogLines;
       const isFieldDataplaneLabels =
-        field.name === 'attributes' &&
-        field.type === FieldType.other &&
-        dataFrame?.meta?.type === DataFrameType.LogLines;
-
+        field.name === 'labels' && field.type === FieldType.other && dataFrame?.meta?.type === DataFrameType.LogLines;
       return isFieldLokiLabels || isFieldDataplaneLabels;
     })
     .flatMap((field: Field) => {
@@ -200,83 +219,48 @@ function extractFieldsAndExclude(dataFrame: DataFrame) {
             source: field.name,
           },
         },
-        // hide the field that was extracted
-        {
-          id: 'organize',
-          options: {
-            excludeByName: {
-              [field.name]: true,
-            },
-          },
-        },
       ];
     });
 }
 
-function removeHiddenFields(dataFrame: DataFrame): Array<DataTransformerConfig | CustomTransformOperator> {
-  const transformations: Array<DataTransformerConfig | CustomTransformOperator> = [];
-  const hiddenFields = separateVisibleFields(dataFrame, { keepBody: true, keepTimestamp: true }).hidden;
-  hiddenFields.forEach((field: Field) => {
-    transformations.push({
-      id: 'organize',
-      options: {
-        excludeByName: {
-          [field.name]: true,
-        },
-      },
-    });
-  });
-
-  return transformations;
-}
-
-function buildLabelFilters(columnsWithMeta: Record<string, fieldNameMeta>, logsFrame: LogsFrame) {
-  // Create object of label filters to filter out any columns not selected by the user
-  let labelFilters: Record<string, true> = {};
+function buildLabelFilters(columnsWithMeta: Record<string, FieldNameMeta>) {
+  // Create object of label filters to include columns selected by the user
+  let labelFilters: Record<string, number> = {};
   Object.keys(columnsWithMeta)
-    .filter((key) => !columnsWithMeta[key].active)
+    .filter((key) => columnsWithMeta[key].active)
     .forEach((key) => {
-      labelFilters[key] = true;
-    });
-
-  // We could be getting fresh data
-  const uniqueLabels = new Set<string>();
-  const logFrameLabels = logsFrame?.getAttributesAsLabels();
-
-  // Populate the set with all labels from latest dataframe
-  logFrameLabels?.forEach((labels) => {
-    Object.keys(labels).forEach((label) => {
-      uniqueLabels.add(label);
+      const index = columnsWithMeta[key].index;
+      // Index should always be defined for any active column
+      if (index !== undefined) {
+        labelFilters[key] = index;
+      }
     });
-  });
-
-  // Check if there are labels in the data, that aren't yet in the labelFilters, and set them to be hidden by the transform
-  Object.keys(labelFilters).forEach((label) => {
-    if (!uniqueLabels.has(label)) {
-      labelFilters[label] = true;
-    }
-  });
 
-  // Check if there are labels in the label filters that aren't yet in the data, and set those to also be hidden
-  // The next time the column filters are synced any extras will be removed
-  Array.from(uniqueLabels).forEach((label) => {
-    if (label in columnsWithMeta && !columnsWithMeta[label]?.active) {
-      labelFilters[label] = true;
-    } else if (!labelFilters[label] && !(label in columnsWithMeta)) {
-      labelFilters[label] = true;
-    }
-  });
   return labelFilters;
 }
 
-function getLabelFiltersTransform(labelFilters: Record<string, true>) {
+function getLabelFiltersTransform(labelFilters: Record<string, number>) {
+  let labelFiltersInclude: Record<string, boolean> = {};
+
+  for (const key in labelFilters) {
+    labelFiltersInclude[key] = true;
+  }
+
   if (Object.keys(labelFilters).length > 0) {
     return {
       id: 'organize',
       options: {
-        excludeByName: labelFilters,
+        indexByName: labelFilters,
+        includeByName: labelFiltersInclude,
       },
     };
   }
   return null;
 }
+
+function getInitialFieldWidth(field: Field): number | undefined {
+  if (field.type === FieldType.time) {
+    return 200;
+  }
+  return undefined;
+}
diff --git a/public/app/features/explore/Logs/LogsTableActiveFields.tsx b/public/app/features/explore/Logs/LogsTableActiveFields.tsx
new file mode 100644
index 0000000000000..802c59e6f9912
--- /dev/null
+++ b/public/app/features/explore/Logs/LogsTableActiveFields.tsx
@@ -0,0 +1,109 @@
+import { css, cx } from '@emotion/css';
+import React from 'react';
+import { DragDropContext, Draggable, DraggableProvided, Droppable, DropResult } from 'react-beautiful-dnd';
+
+import { GrafanaTheme2 } from '@grafana/data/src';
+import { useTheme2 } from '@grafana/ui/src';
+
+import { LogsTableEmptyFields } from './LogsTableEmptyFields';
+import { LogsTableNavField } from './LogsTableNavField';
+import { FieldNameMeta } from './LogsTableWrap';
+
+export function getLogsFieldsStyles(theme: GrafanaTheme2) {
+  return {
+    wrap: css({
+      marginTop: theme.spacing(1),
+      marginBottom: theme.spacing(1),
+      display: 'flex',
+      background: theme.colors.background.primary,
+    }),
+    dragging: css({
+      background: theme.colors.background.secondary,
+    }),
+    columnWrapper: css({
+      marginBottom: theme.spacing(1.5),
+      // need some space or the outline of the checkbox is cut off
+      paddingLeft: theme.spacing(0.5),
+    }),
+  };
+}
+
+function sortLabels(labels: Record<string, FieldNameMeta>) {
+  return (a: string, b: string) => {
+    const la = labels[a];
+    const lb = labels[b];
+
+    // Sort by index
+    if (la.index != null && lb.index != null) {
+      return la.index - lb.index;
+    }
+
+    // otherwise do not sort
+    return 0;
+  };
+}
+
+export const LogsTableActiveFields = (props: {
+  labels: Record<string, FieldNameMeta>;
+  valueFilter: (value: string) => boolean;
+  toggleColumn: (columnName: string) => void;
+  reorderColumn: (sourceIndex: number, destinationIndex: number) => void;
+  id: string;
+}): JSX.Element => {
+  const { reorderColumn, labels, valueFilter, toggleColumn } = props;
+  const theme = useTheme2();
+  const styles = getLogsFieldsStyles(theme);
+  const labelKeys = Object.keys(labels).filter((labelName) => valueFilter(labelName));
+
+  const onDragEnd = (result: DropResult) => {
+    if (!result.destination) {
+      return;
+    }
+    reorderColumn(result.source.index, result.destination.index);
+  };
+
+  const renderTitle = (labelName: string) => {
+    const label = labels[labelName];
+    if (label) {
+      return `${labelName} appears in ${label?.percentOfLinesWithLabel}% of log lines`;
+    }
+
+    return undefined;
+  };
+
+  if (labelKeys.length) {
+    return (
+      <DragDropContext onDragEnd={onDragEnd}>
+        <Droppable droppableId="order-fields" direction="vertical">
+          {(provided) => (
+            <div className={styles.columnWrapper} {...provided.droppableProps} ref={provided.innerRef}>
+              {labelKeys.sort(sortLabels(labels)).map((labelName, index) => (
+                <Draggable draggableId={labelName} key={labelName} index={index}>
+                  {(provided: DraggableProvided, snapshot) => (
+                    <div
+                      className={cx(styles.wrap, snapshot.isDragging ? styles.dragging : undefined)}
+                      ref={provided.innerRef}
+                      {...provided.draggableProps}
+                      {...provided.dragHandleProps}
+                      title={renderTitle(labelName)}
+                    >
+                      <LogsTableNavField
+                        label={labelName}
+                        onChange={() => toggleColumn(labelName)}
+                        labels={labels}
+                        draggable={true}
+                      />
+                    </div>
+                  )}
+                </Draggable>
+              ))}
+              {provided.placeholder}
+            </div>
+          )}
+        </Droppable>
+      </DragDropContext>
+    );
+  }
+
+  return <LogsTableEmptyFields />;
+};
diff --git a/public/app/features/explore/Logs/LogsTableAvailableFields.tsx b/public/app/features/explore/Logs/LogsTableAvailableFields.tsx
new file mode 100644
index 0000000000000..8ab7d480508a3
--- /dev/null
+++ b/public/app/features/explore/Logs/LogsTableAvailableFields.tsx
@@ -0,0 +1,63 @@
+import React from 'react';
+
+import { useTheme2 } from '@grafana/ui/src';
+
+import { getLogsFieldsStyles } from './LogsTableActiveFields';
+import { LogsTableEmptyFields } from './LogsTableEmptyFields';
+import { LogsTableNavField } from './LogsTableNavField';
+import { FieldNameMeta } from './LogsTableWrap';
+
+const collator = new Intl.Collator(undefined, { sensitivity: 'base' });
+
+function sortLabels(labels: Record<string, FieldNameMeta>) {
+  return (a: string, b: string) => {
+    const la = labels[a];
+    const lb = labels[b];
+
+    // ...sort by type and alphabetically
+    if (la != null && lb != null) {
+      return (
+        Number(lb.type === 'TIME_FIELD') - Number(la.type === 'TIME_FIELD') ||
+        Number(lb.type === 'BODY_FIELD') - Number(la.type === 'BODY_FIELD') ||
+        collator.compare(a, b)
+      );
+    }
+
+    // otherwise do not sort
+    return 0;
+  };
+}
+
+export const LogsTableAvailableFields = (props: {
+  labels: Record<string, FieldNameMeta>;
+  valueFilter: (value: string) => boolean;
+  toggleColumn: (columnName: string) => void;
+}): JSX.Element => {
+  const { labels, valueFilter, toggleColumn } = props;
+  const theme = useTheme2();
+  const styles = getLogsFieldsStyles(theme);
+  const labelKeys = Object.keys(labels).filter((labelName) => valueFilter(labelName));
+  if (labelKeys.length) {
+    // Otherwise show list with a hardcoded order
+    return (
+      <div className={styles.columnWrapper}>
+        {labelKeys.sort(sortLabels(labels)).map((labelName, index) => (
+          <div
+            key={labelName}
+            className={styles.wrap}
+            title={`${labelName} appears in ${labels[labelName]?.percentOfLinesWithLabel}% of log lines`}
+          >
+            <LogsTableNavField
+              showCount={true}
+              label={labelName}
+              onChange={() => toggleColumn(labelName)}
+              labels={labels}
+            />
+          </div>
+        ))}
+      </div>
+    );
+  }
+
+  return <LogsTableEmptyFields />;
+};
diff --git a/public/app/features/explore/Logs/LogsTableEmptyFields.tsx b/public/app/features/explore/Logs/LogsTableEmptyFields.tsx
new file mode 100644
index 0000000000000..a4a2c05426bd1
--- /dev/null
+++ b/public/app/features/explore/Logs/LogsTableEmptyFields.tsx
@@ -0,0 +1,21 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { useTheme2 } from '@grafana/ui';
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    empty: css({
+      marginBottom: theme.spacing(2),
+      marginLeft: theme.spacing(1.75),
+      fontSize: theme.typography.fontSize,
+    }),
+  };
+}
+
+export function LogsTableEmptyFields() {
+  const theme = useTheme2();
+  const styles = getStyles(theme);
+  return <div className={styles.empty}>No fields</div>;
+}
diff --git a/public/app/features/explore/Logs/LogsTableMultiSelect.tsx b/public/app/features/explore/Logs/LogsTableMultiSelect.tsx
index 92e0f3772801c..31b2d7c0b4036 100644
--- a/public/app/features/explore/Logs/LogsTableMultiSelect.tsx
+++ b/public/app/features/explore/Logs/LogsTableMultiSelect.tsx
@@ -4,16 +4,31 @@ import React from 'react';
 import { GrafanaTheme2 } from '@grafana/data/src';
 import { useTheme2 } from '@grafana/ui/src';
 
-import { LogsTableNavColumn } from './LogsTableNavColumn';
-import { fieldNameMeta } from './LogsTableWrap';
+import { LogsTableActiveFields } from './LogsTableActiveFields';
+import { LogsTableAvailableFields } from './LogsTableAvailableFields';
+import { FieldNameMeta } from './LogsTableWrap';
 
 function getStyles(theme: GrafanaTheme2) {
   return {
     sidebarWrap: css({
       overflowY: 'scroll',
       height: 'calc(100% - 50px)',
+      /* Hide scrollbar for Chrome, Safari, and Opera */
+      '&::-webkit-scrollbar': {
+        display: 'none',
+      },
+      /* Hide scrollbar for Firefox */
+      scrollbarWidth: 'none',
+    }),
+    columnHeaderButton: css({
+      appearance: 'none',
+      background: 'none',
+      border: 'none',
+      fontSize: theme.typography.pxToRem(11),
     }),
     columnHeader: css({
+      display: 'flex',
+      justifyContent: 'space-between',
       fontSize: theme.typography.h6.fontSize,
       background: theme.colors.background.secondary,
       position: 'sticky',
@@ -31,8 +46,10 @@ function getStyles(theme: GrafanaTheme2) {
 
 export const LogsTableMultiSelect = (props: {
   toggleColumn: (columnName: string) => void;
-  filteredColumnsWithMeta: Record<string, fieldNameMeta> | undefined;
-  columnsWithMeta: Record<string, fieldNameMeta>;
+  filteredColumnsWithMeta: Record<string, FieldNameMeta> | undefined;
+  columnsWithMeta: Record<string, FieldNameMeta>;
+  clear: () => void;
+  reorderColumn: (oldIndex: number, newIndex: number) => void;
 }) => {
   const theme = useTheme2();
   const styles = getStyles(theme);
@@ -41,11 +58,25 @@ export const LogsTableMultiSelect = (props: {
     <div className={styles.sidebarWrap}>
       {/* Sidebar columns */}
       <>
+        <div className={styles.columnHeader}>
+          Selected fields
+          <button onClick={props.clear} className={styles.columnHeaderButton}>
+            Reset
+          </button>
+        </div>
+        <LogsTableActiveFields
+          reorderColumn={props.reorderColumn}
+          toggleColumn={props.toggleColumn}
+          labels={props.filteredColumnsWithMeta ?? props.columnsWithMeta}
+          valueFilter={(value) => props.columnsWithMeta[value]?.active ?? false}
+          id={'selected-fields'}
+        />
+
         <div className={styles.columnHeader}>Fields</div>
-        <LogsTableNavColumn
+        <LogsTableAvailableFields
           toggleColumn={props.toggleColumn}
           labels={props.filteredColumnsWithMeta ?? props.columnsWithMeta}
-          valueFilter={(value) => !!value}
+          valueFilter={(value) => !props.columnsWithMeta[value]?.active}
         />
       </>
     </div>
diff --git a/public/app/features/explore/Logs/LogsTableNavColumn.tsx b/public/app/features/explore/Logs/LogsTableNavColumn.tsx
deleted file mode 100644
index 3540f54f8a9ed..0000000000000
--- a/public/app/features/explore/Logs/LogsTableNavColumn.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import { css } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data/src';
-import { Checkbox, useTheme2 } from '@grafana/ui/src';
-
-import { fieldNameMeta } from './LogsTableWrap';
-
-function getStyles(theme: GrafanaTheme2) {
-  return {
-    labelCount: css({
-      marginLeft: theme.spacing(0.5),
-      marginRight: theme.spacing(0.5),
-    }),
-    wrap: css({
-      display: 'flex',
-      alignItems: 'center',
-      marginTop: theme.spacing(1),
-      marginBottom: theme.spacing(1),
-      justifyContent: 'space-between',
-    }),
-    checkbox: css({}),
-    columnWrapper: css({
-      marginBottom: theme.spacing(1.5),
-      // need some space or the outline of the checkbox is cut off
-      paddingLeft: theme.spacing(0.5),
-    }),
-    empty: css({
-      marginBottom: theme.spacing(2),
-      marginLeft: theme.spacing(1.75),
-      fontSize: theme.typography.fontSize,
-    }),
-  };
-}
-
-export const LogsTableNavColumn = (props: {
-  labels: Record<string, fieldNameMeta>;
-  valueFilter: (value: number) => boolean;
-  toggleColumn: (columnName: string) => void;
-}): JSX.Element => {
-  const { labels, valueFilter, toggleColumn } = props;
-  const theme = useTheme2();
-  const styles = getStyles(theme);
-  const labelKeys = Object.keys(labels).filter((labelName) => valueFilter(labels[labelName].percentOfLinesWithLabel));
-  if (labelKeys.length) {
-    return (
-      <div className={styles.columnWrapper}>
-        {labelKeys.map((labelName) => (
-          <div className={styles.wrap} key={labelName}>
-            <Checkbox
-              className={styles.checkbox}
-              label={labelName}
-              onChange={() => toggleColumn(labelName)}
-              checked={labels[labelName]?.active ?? false}
-            />
-            <span className={styles.labelCount}>({labels[labelName]?.percentOfLinesWithLabel}%)</span>
-          </div>
-        ))}
-      </div>
-    );
-  }
-
-  return <div className={styles.empty}>No fields</div>;
-};
diff --git a/public/app/features/explore/Logs/LogsTableNavField.tsx b/public/app/features/explore/Logs/LogsTableNavField.tsx
new file mode 100644
index 0000000000000..d883ae8ed3004
--- /dev/null
+++ b/public/app/features/explore/Logs/LogsTableNavField.tsx
@@ -0,0 +1,83 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Checkbox, Icon, useTheme2 } from '@grafana/ui';
+
+import { FieldNameMeta } from './LogsTableWrap';
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    dragIcon: css({
+      cursor: 'drag',
+      marginLeft: theme.spacing(1),
+      opacity: 0.4,
+    }),
+    labelCount: css({
+      marginLeft: theme.spacing(0.5),
+      marginRight: theme.spacing(0.5),
+      appearance: 'none',
+      background: 'none',
+      border: 'none',
+      fontSize: theme.typography.pxToRem(11),
+      opacity: 0.6,
+    }),
+    contentWrap: css({
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'space-between',
+      width: '100%',
+    }),
+    // Hide text that overflows, had to select elements within the Checkbox component, so this is a bit fragile
+    checkboxLabel: css({
+      '> span': {
+        overflow: 'hidden',
+        textOverflow: 'ellipsis',
+        whiteSpace: 'nowrap',
+        display: 'block',
+        maxWidth: '100%',
+      },
+    }),
+  };
+}
+
+export function LogsTableNavField(props: {
+  label: string;
+  onChange: () => void;
+  labels: Record<string, FieldNameMeta>;
+  draggable?: boolean;
+  showCount?: boolean;
+}): React.JSX.Element | undefined {
+  const theme = useTheme2();
+  const styles = getStyles(theme);
+
+  if (props.labels[props.label]) {
+    return (
+      <>
+        <div className={styles.contentWrap}>
+          <Checkbox
+            className={styles.checkboxLabel}
+            label={props.label}
+            onChange={props.onChange}
+            checked={props.labels[props.label]?.active ?? false}
+          />
+          {props.showCount && (
+            <button className={styles.labelCount} onClick={props.onChange}>
+              {props.labels[props.label]?.percentOfLinesWithLabel}%
+            </button>
+          )}
+        </div>
+        {props.draggable && (
+          <Icon
+            aria-label="Drag and drop icon"
+            title="Drag and drop to reorder"
+            name="draggabledots"
+            size="lg"
+            className={styles.dragIcon}
+          />
+        )}
+      </>
+    );
+  }
+  return undefined;
+}
diff --git a/public/app/features/explore/Logs/LogsTableWrap.test.tsx b/public/app/features/explore/Logs/LogsTableWrap.test.tsx
index 0d6ebdf5fb02b..9e5b59c93f9e5 100644
--- a/public/app/features/explore/Logs/LogsTableWrap.test.tsx
+++ b/public/app/features/explore/Logs/LogsTableWrap.test.tsx
@@ -1,5 +1,6 @@
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import React, { ComponentProps } from 'react';
+import { act } from 'react-test-renderer';
 
 import {
   createTheme,
@@ -92,24 +93,31 @@ describe('LogsTableWrap', () => {
 
     expect.assertions(3);
 
-    const checkboxLabel = screen.getByLabelText('app');
-    expect(checkboxLabel).toBeInTheDocument();
+    expect(screen.getByLabelText('app')).toBeInTheDocument();
 
     // Add a new column
+    act(() => {
+      screen.getByLabelText('app').click();
+    });
+
     await waitFor(() => {
-      checkboxLabel.click();
       expect(updatePanelState).toBeCalledWith({
         visualisationType: 'table',
-        columns: { 0: 'app' },
+        columns: { 0: 'app', 1: 'Line', 2: 'Time' },
+        labelFieldName: 'labels',
       });
     });
 
     // Remove the same column
+    act(() => {
+      screen.getByLabelText('app').click();
+    });
+
     await waitFor(() => {
-      checkboxLabel.click();
       expect(updatePanelState).toBeCalledWith({
         visualisationType: 'table',
-        columns: {},
+        columns: { 0: 'Line', 1: 'Time' },
+        labelFieldName: 'labels',
       });
     });
   });
@@ -139,6 +147,27 @@ describe('LogsTableWrap', () => {
     });
   });
 
+  it('should update selected dataframe when dataFrames update', async () => {
+    const initialProps = { logsFrames: [getMockLokiFrameDataPlane(undefined, 3)] };
+    const render = setup(initialProps);
+    await waitFor(() => {
+      const rows = render.getAllByRole('row');
+      expect(rows.length).toBe(4);
+    });
+
+    render.rerender(
+      getComponent({
+        ...initialProps,
+        logsFrames: [getMockLokiFrameDataPlane(undefined, 4)],
+      })
+    );
+
+    await waitFor(() => {
+      const rows = render.getAllByRole('row');
+      expect(rows.length).toBe(5);
+    });
+  });
+
   it('search input should search matching columns (dataplane)', async () => {
     config.featureToggles.lokiLogsDataplane = true;
 
diff --git a/public/app/features/explore/Logs/LogsTableWrap.tsx b/public/app/features/explore/Logs/LogsTableWrap.tsx
index 08a662a5a0220..9580773368a81 100644
--- a/public/app/features/explore/Logs/LogsTableWrap.tsx
+++ b/public/app/features/explore/Logs/LogsTableWrap.tsx
@@ -1,6 +1,6 @@
 import { css } from '@emotion/css';
-import { debounce } from 'lodash';
-import React, { useState, useEffect, useCallback } from 'react';
+import { Resizable, ResizeCallback } from 're-resizable';
+import React, { useCallback, useEffect, useState } from 'react';
 
 import {
   DataFrame,
@@ -8,11 +8,12 @@ import {
   GrafanaTheme2,
   Labels,
   LogsSortOrder,
+  SelectableValue,
   SplitOpen,
   TimeRange,
 } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime/src';
-import { Themeable2 } from '@grafana/ui/';
+import { InlineField, Select, Themeable2 } from '@grafana/ui/';
 
 import { parseLogsFrame } from '../../logs/logsFrame';
 
@@ -30,33 +31,57 @@ interface Props extends Themeable2 {
   logsSortOrder: LogsSortOrder;
   panelState: ExploreLogsPanelState | undefined;
   updatePanelState: (panelState: Partial<ExploreLogsPanelState>) => void;
-  onClickFilterLabel?: (key: string, value: string, refId?: string) => void;
-  onClickFilterOutLabel?: (key: string, value: string, refId?: string) => void;
+  onClickFilterLabel?: (key: string, value: string, frame?: DataFrame) => void;
+  onClickFilterOutLabel?: (key: string, value: string, frame?: DataFrame) => void;
+  datasourceType?: string;
 }
 
-export type fieldNameMeta = { percentOfLinesWithLabel: number; active: boolean | undefined };
-type fieldName = string;
-type fieldNameMetaStore = Record<fieldName, fieldNameMeta>;
+type ActiveFieldMeta = {
+  active: false;
+  index: undefined; // if undefined the column is not selected
+};
+
+type InactiveFieldMeta = {
+  active: true;
+  index: number; // if undefined the column is not selected
+};
+
+type GenericMeta = {
+  percentOfLinesWithLabel: number;
+  type?: 'BODY_FIELD' | 'TIME_FIELD';
+};
+
+export type FieldNameMeta = (InactiveFieldMeta | ActiveFieldMeta) & GenericMeta;
+
+type FieldName = string;
+type FieldNameMetaStore = Record<FieldName, FieldNameMeta>;
 
 export function LogsTableWrap(props: Props) {
-  const { logsFrames } = props;
+  const { logsFrames, updatePanelState, panelState } = props;
+  const propsColumns = panelState?.columns;
   // Save the normalized cardinality of each label
-  const [columnsWithMeta, setColumnsWithMeta] = useState<fieldNameMetaStore | undefined>(undefined);
+  const [columnsWithMeta, setColumnsWithMeta] = useState<FieldNameMetaStore | undefined>(undefined);
 
   // Filtered copy of columnsWithMeta that only includes matching results
-  const [filteredColumnsWithMeta, setFilteredColumnsWithMeta] = useState<fieldNameMetaStore | undefined>(undefined);
+  const [filteredColumnsWithMeta, setFilteredColumnsWithMeta] = useState<FieldNameMetaStore | undefined>(undefined);
+  const [searchValue, setSearchValue] = useState<string>('');
 
-  const [height, setHeight] = useState<number>(600);
+  const height = getLogsTableHeight();
+  const panelStateRefId = props?.panelState?.refId;
 
-  const dataFrame = logsFrames[0];
+  // The current dataFrame containing the refId of the current query
+  const [currentDataFrame, setCurrentDataFrame] = useState<DataFrame>(
+    logsFrames.find((f) => f.refId === panelStateRefId) ?? logsFrames[0]
+  );
 
   const getColumnsFromProps = useCallback(
-    (fieldNames: fieldNameMetaStore) => {
+    (fieldNames: FieldNameMetaStore) => {
       const previouslySelected = props.panelState?.columns;
       if (previouslySelected) {
-        Object.values(previouslySelected).forEach((key) => {
+        Object.values(previouslySelected).forEach((key, index) => {
           if (fieldNames[key]) {
             fieldNames[key].active = true;
+            fieldNames[key].index = index;
           }
         });
       }
@@ -64,6 +89,28 @@ export function LogsTableWrap(props: Props) {
     },
     [props.panelState?.columns]
   );
+  const logsFrame = parseLogsFrame(currentDataFrame);
+
+  useEffect(() => {
+    if (logsFrame?.timeField.name && logsFrame?.bodyField.name && !propsColumns) {
+      const defaultColumns = { 0: logsFrame?.timeField.name ?? '', 1: logsFrame?.bodyField.name ?? '' };
+      updatePanelState({
+        columns: Object.values(defaultColumns),
+        visualisationType: 'table',
+        labelFieldName: logsFrame?.getLabelFieldName() ?? undefined,
+      });
+    }
+  }, [logsFrame, propsColumns, updatePanelState]);
+
+  /**
+   * When logs frame updates (e.g. query|range changes), we need to set the selected frame to state
+   */
+  useEffect(() => {
+    const newFrame = logsFrames.find((f) => f.refId === panelStateRefId) ?? logsFrames[0];
+    if (newFrame) {
+      setCurrentDataFrame(newFrame);
+    }
+  }, [logsFrames, panelStateRefId]);
 
   /**
    * Keeps the filteredColumnsWithMeta state in sync with the columnsWithMeta state,
@@ -96,20 +143,34 @@ export function LogsTableWrap(props: Props) {
    *
    */
   useEffect(() => {
-    const numberOfLogLines = dataFrame ? dataFrame.length : 0;
-    const logsFrame = parseLogsFrame(dataFrame);
-    const labels = logsFrame?.getAttributesAsLabels();
+    // If the data frame is empty, there's nothing to viz, it could mean the user has unselected all columns
+    if (!currentDataFrame.length) {
+      return;
+    }
+    const numberOfLogLines = currentDataFrame ? currentDataFrame.length : 0;
+    const logsFrame = parseLogsFrame(currentDataFrame);
+    const labels = logsFrame?.getLogFrameLabelsAsLabels();
+
+    const otherFields = [];
 
-    const otherFields = logsFrame ? logsFrame.extraFields.filter((field) => !field?.config?.custom?.hidden) : [];
+    if (logsFrame) {
+      otherFields.push(...logsFrame.extraFields.filter((field) => !field?.config?.custom?.hidden));
+    }
     if (logsFrame?.severityField) {
       otherFields.push(logsFrame?.severityField);
     }
+    if (logsFrame?.bodyField) {
+      otherFields.push(logsFrame?.bodyField);
+    }
+    if (logsFrame?.timeField) {
+      otherFields.push(logsFrame?.timeField);
+    }
 
     // Use a map to dedupe labels and count their occurrences in the logs
-    const labelCardinality = new Map<fieldName, fieldNameMeta>();
+    const labelCardinality = new Map<FieldName, FieldNameMeta>();
 
     // What the label state will look like
-    let pendingLabelState: fieldNameMetaStore = {};
+    let pendingLabelState: FieldNameMetaStore = {};
 
     // If we have labels and log lines
     if (labels?.length && numberOfLogLines) {
@@ -122,14 +183,23 @@ export function LogsTableWrap(props: Props) {
           if (labelCardinality.has(label)) {
             const value = labelCardinality.get(label);
             if (value) {
-              labelCardinality.set(label, {
-                percentOfLinesWithLabel: value.percentOfLinesWithLabel + 1,
-                active: value?.active,
-              });
+              if (value?.active) {
+                labelCardinality.set(label, {
+                  percentOfLinesWithLabel: value.percentOfLinesWithLabel + 1,
+                  active: true,
+                  index: value.index,
+                });
+              } else {
+                labelCardinality.set(label, {
+                  percentOfLinesWithLabel: value.percentOfLinesWithLabel + 1,
+                  active: false,
+                  index: undefined,
+                });
+              }
             }
             // Otherwise add it
           } else {
-            labelCardinality.set(label, { percentOfLinesWithLabel: 1, active: undefined });
+            labelCardinality.set(label, { percentOfLinesWithLabel: 1, active: false, index: undefined });
           }
         });
       });
@@ -148,26 +218,56 @@ export function LogsTableWrap(props: Props) {
 
     // Normalize the other fields
     otherFields.forEach((field) => {
-      pendingLabelState[field.name] = {
-        percentOfLinesWithLabel: normalize(
-          field.values.filter((value) => value !== null && value !== undefined).length,
-          numberOfLogLines
-        ),
-        active: pendingLabelState[field.name]?.active,
-      };
+      const isActive = pendingLabelState[field.name]?.active;
+      const index = pendingLabelState[field.name]?.index;
+      if (isActive && index !== undefined) {
+        pendingLabelState[field.name] = {
+          percentOfLinesWithLabel: normalize(
+            field.values.filter((value) => value !== null && value !== undefined).length,
+            numberOfLogLines
+          ),
+          active: true,
+          index: index,
+        };
+      } else {
+        pendingLabelState[field.name] = {
+          percentOfLinesWithLabel: normalize(
+            field.values.filter((value) => value !== null && value !== undefined).length,
+            numberOfLogLines
+          ),
+          active: false,
+          index: undefined,
+        };
+      }
     });
 
     pendingLabelState = getColumnsFromProps(pendingLabelState);
 
+    // Get all active columns
+    const active = Object.keys(pendingLabelState).filter((key) => pendingLabelState[key].active);
+
+    // If nothing is selected, then select the default columns
+    if (active.length === 0) {
+      if (logsFrame?.bodyField?.name) {
+        pendingLabelState[logsFrame.bodyField.name].active = true;
+      }
+      if (logsFrame?.timeField?.name) {
+        pendingLabelState[logsFrame.timeField.name].active = true;
+      }
+    }
+
+    if (logsFrame?.bodyField?.name && logsFrame?.timeField?.name) {
+      pendingLabelState[logsFrame.bodyField.name].type = 'BODY_FIELD';
+      pendingLabelState[logsFrame.timeField.name].type = 'TIME_FIELD';
+    }
+
     setColumnsWithMeta(pendingLabelState);
 
     // The panel state is updated when the user interacts with the multi-select sidebar
-  }, [dataFrame, getColumnsFromProps]);
+  }, [currentDataFrame, getColumnsFromProps]);
 
-  // As the number of rows change, so too must the height of the table
-  useEffect(() => {
-    setHeight(getTableHeight(dataFrame.length, false));
-  }, [dataFrame.length]);
+  const [sidebarWidth, setSidebarWidth] = useState(220);
+  const tableWidth = props.width - sidebarWidth;
 
   if (!columnsWithMeta) {
     return null;
@@ -180,8 +280,8 @@ export function LogsTableWrap(props: Props) {
       const event = {
         columnAction: newState ? 'add' : 'remove',
         columnCount: newState ? priorActiveCount + 1 : priorActiveCount - 1,
+        datasourceType: props.datasourceType,
       };
-
       reportInteraction('grafana_explore_logs_table_column_filter_clicked', event);
     }
   }
@@ -189,20 +289,116 @@ export function LogsTableWrap(props: Props) {
   function searchFilterEvent(searchResultCount: number) {
     reportInteraction('grafana_explore_logs_table_text_search_result_count', {
       resultCount: searchResultCount,
+      datasourceType: props.datasourceType ?? 'unknown',
     });
   }
 
+  const clearSelection = () => {
+    const pendingLabelState = { ...columnsWithMeta };
+    let index = 0;
+    Object.keys(pendingLabelState).forEach((key) => {
+      const isDefaultField = !!pendingLabelState[key].type;
+      // after reset the only active fields are the special time and body fields
+      pendingLabelState[key].active = isDefaultField;
+      // reset the index
+      pendingLabelState[key].index = isDefaultField ? index++ : undefined;
+    });
+    setColumnsWithMeta(pendingLabelState);
+  };
+
+  const reorderColumn = (sourceIndex: number, destinationIndex: number) => {
+    if (sourceIndex === destinationIndex) {
+      return;
+    }
+
+    const pendingLabelState = { ...columnsWithMeta };
+
+    const keys = Object.keys(pendingLabelState)
+      .filter((key) => pendingLabelState[key].active)
+      .map((key) => ({
+        fieldName: key,
+        index: pendingLabelState[key].index ?? 0,
+      }))
+      .sort((a, b) => a.index - b.index);
+
+    const [source] = keys.splice(sourceIndex, 1);
+    keys.splice(destinationIndex, 0, source);
+
+    keys.forEach((key, index) => {
+      pendingLabelState[key.fieldName].index = index;
+    });
+
+    // Set local state
+    setColumnsWithMeta(pendingLabelState);
+
+    // Sync the explore state
+    updateExploreState(pendingLabelState);
+  };
+
+  function updateExploreState(pendingLabelState: FieldNameMetaStore) {
+    // Get all active columns and sort by index
+    const newColumnsArray = Object.keys(pendingLabelState)
+      // Only include active filters
+      .filter((key) => pendingLabelState[key]?.active)
+      .sort((a, b) => {
+        const pa = pendingLabelState[a];
+        const pb = pendingLabelState[b];
+        if (pa.index !== undefined && pb.index !== undefined) {
+          return pa.index - pb.index; // sort by index
+        }
+        return 0;
+      });
+
+    const newColumns: Record<number, string> = Object.assign(
+      {},
+      // Get the keys of the object as an array
+      newColumnsArray
+    );
+
+    const defaultColumns = { 0: logsFrame?.timeField.name ?? '', 1: logsFrame?.bodyField.name ?? '' };
+    const newPanelState: ExploreLogsPanelState = {
+      ...props.panelState,
+      // URL format requires our array of values be an object, so we convert it using object.assign
+      columns: Object.keys(newColumns).length ? newColumns : defaultColumns,
+      refId: currentDataFrame.refId,
+      visualisationType: 'table',
+      labelFieldName: logsFrame?.getLabelFieldName() ?? undefined,
+    };
+
+    // Update url state
+    updatePanelState(newPanelState);
+  }
+
   // Toggle a column on or off when the user interacts with an element in the multi-select sidebar
-  const toggleColumn = (columnName: fieldName) => {
+  const toggleColumn = (columnName: FieldName) => {
     if (!columnsWithMeta || !(columnName in columnsWithMeta)) {
       console.warn('failed to get column', columnsWithMeta);
       return;
     }
 
-    const pendingLabelState = {
-      ...columnsWithMeta,
-      [columnName]: { ...columnsWithMeta[columnName], active: !columnsWithMeta[columnName]?.active },
-    };
+    const length = Object.keys(columnsWithMeta).filter((c) => columnsWithMeta[c].active).length;
+    const isActive = !columnsWithMeta[columnName].active ? true : undefined;
+
+    let pendingLabelState: FieldNameMetaStore;
+    if (isActive) {
+      pendingLabelState = {
+        ...columnsWithMeta,
+        [columnName]: {
+          ...columnsWithMeta[columnName],
+          active: isActive,
+          index: length,
+        },
+      };
+    } else {
+      pendingLabelState = {
+        ...columnsWithMeta,
+        [columnName]: {
+          ...columnsWithMeta[columnName],
+          active: false,
+          index: undefined,
+        },
+      };
+    }
 
     // Analytics
     columnFilterEvent(columnName);
@@ -212,34 +408,38 @@ export function LogsTableWrap(props: Props) {
 
     // If user is currently filtering, update filtered state
     if (filteredColumnsWithMeta) {
-      const pendingFilteredLabelState = {
-        ...filteredColumnsWithMeta,
-        [columnName]: { ...filteredColumnsWithMeta[columnName], active: !filteredColumnsWithMeta[columnName]?.active },
-      };
+      const active = !filteredColumnsWithMeta[columnName]?.active;
+      let pendingFilteredLabelState: FieldNameMetaStore;
+      if (active) {
+        pendingFilteredLabelState = {
+          ...filteredColumnsWithMeta,
+          [columnName]: {
+            ...filteredColumnsWithMeta[columnName],
+            active: active,
+            index: length,
+          },
+        };
+      } else {
+        pendingFilteredLabelState = {
+          ...filteredColumnsWithMeta,
+          [columnName]: {
+            ...filteredColumnsWithMeta[columnName],
+            active: false,
+            index: undefined,
+          },
+        };
+      }
+
       setFilteredColumnsWithMeta(pendingFilteredLabelState);
     }
 
-    const newPanelState: ExploreLogsPanelState = {
-      ...props.panelState,
-      // URL format requires our array of values be an object, so we convert it using object.assign
-      columns: Object.assign(
-        {},
-        // Get the keys of the object as an array
-        Object.keys(pendingLabelState)
-          // Only include active filters
-          .filter((key) => pendingLabelState[key]?.active)
-      ),
-      visualisationType: 'table',
-    };
-
-    // Update url state
-    props.updatePanelState(newPanelState);
+    updateExploreState(pendingLabelState);
   };
 
   // uFuzzy search dispatcher, adds any matches to the local state
   const dispatcher = (data: string[][]) => {
     const matches = data[0];
-    let newColumnsWithMeta: fieldNameMetaStore = {};
+    let newColumnsWithMeta: FieldNameMetaStore = {};
     let numberOfResults = 0;
     matches.forEach((match) => {
       if (match in columnsWithMeta) {
@@ -256,48 +456,96 @@ export function LogsTableWrap(props: Props) {
     fuzzySearch(Object.keys(columnsWithMeta), needle, dispatcher);
   };
 
-  // Debounce fuzzy search
-  const debouncedSearch = debounce(search, 500);
-
   // onChange handler for search input
   const onSearchInputChange = (e: React.FormEvent<HTMLInputElement>) => {
     const value = e.currentTarget?.value;
+    setSearchValue(value);
     if (value) {
-      debouncedSearch(value);
+      search(value);
     } else {
       // If the search input is empty, reset the local search state.
       setFilteredColumnsWithMeta(undefined);
     }
   };
 
-  const sidebarWidth = 220;
-  const totalWidth = props.width;
-  const tableWidth = totalWidth - sidebarWidth;
+  const onFrameSelectorChange = (value: SelectableValue<string>) => {
+    const matchingDataFrame = logsFrames.find((frame) => frame.refId === value.value);
+    if (matchingDataFrame) {
+      setCurrentDataFrame(logsFrames.find((frame) => frame.refId === value.value) ?? logsFrames[0]);
+    }
+    props.updatePanelState({ refId: value.value, labelFieldName: logsFrame?.getLabelFieldName() ?? undefined });
+  };
+
   const styles = getStyles(props.theme, height, sidebarWidth);
 
+  const getOnResize: ResizeCallback = (event, direction, ref) => {
+    const newSidebarWidth = Number(ref.style.width.slice(0, -2));
+    if (!isNaN(newSidebarWidth)) {
+      setSidebarWidth(newSidebarWidth);
+    }
+  };
+
   return (
-    <div className={styles.wrapper}>
-      <section className={styles.sidebar}>
-        <LogsColumnSearch onChange={onSearchInputChange} />
-        <LogsTableMultiSelect
-          toggleColumn={toggleColumn}
-          filteredColumnsWithMeta={filteredColumnsWithMeta}
+    <>
+      <div>
+        {logsFrames.length > 1 && (
+          <div>
+            <InlineField
+              label="Select query"
+              htmlFor="explore_logs_table_frame_selector"
+              labelWidth={22}
+              tooltip="Select a query to visualize in the table."
+            >
+              <Select
+                inputId={'explore_logs_table_frame_selector'}
+                aria-label={'Select query by name'}
+                value={currentDataFrame.refId}
+                options={logsFrames.map((frame) => {
+                  return {
+                    label: frame.refId,
+                    value: frame.refId,
+                  };
+                })}
+                onChange={onFrameSelectorChange}
+              />
+            </InlineField>
+          </div>
+        )}
+      </div>
+      <div className={styles.wrapper}>
+        <Resizable
+          enable={{
+            right: true,
+          }}
+          handleClasses={{ right: styles.rzHandle }}
+          onResize={getOnResize}
+        >
+          <section className={styles.sidebar}>
+            <LogsColumnSearch value={searchValue} onChange={onSearchInputChange} />
+            <LogsTableMultiSelect
+              reorderColumn={reorderColumn}
+              toggleColumn={toggleColumn}
+              filteredColumnsWithMeta={filteredColumnsWithMeta}
+              columnsWithMeta={columnsWithMeta}
+              clear={clearSelection}
+            />
+          </section>
+        </Resizable>
+        <LogsTable
+          logsFrame={logsFrame}
+          onClickFilterLabel={props.onClickFilterLabel}
+          onClickFilterOutLabel={props.onClickFilterOutLabel}
+          logsSortOrder={props.logsSortOrder}
+          range={props.range}
+          splitOpen={props.splitOpen}
+          timeZone={props.timeZone}
+          width={tableWidth}
+          dataFrame={currentDataFrame}
           columnsWithMeta={columnsWithMeta}
+          height={height}
         />
-      </section>
-      <LogsTable
-        onClickFilterLabel={props.onClickFilterLabel}
-        onClickFilterOutLabel={props.onClickFilterOutLabel}
-        logsSortOrder={props.logsSortOrder}
-        range={props.range}
-        splitOpen={props.splitOpen}
-        timeZone={props.timeZone}
-        width={tableWidth}
-        logsFrames={logsFrames}
-        columnsWithMeta={columnsWithMeta}
-        height={height}
-      />
-    </div>
+      </div>
+    </>
   );
 }
 
@@ -315,25 +563,29 @@ function getStyles(theme: GrafanaTheme2, height: number, width: number) {
       fontSize: theme.typography.pxToRem(11),
       overflowY: 'hidden',
       width: width,
-      paddingRight: theme.spacing(1.5),
+      paddingRight: theme.spacing(3),
+    }),
+    rzHandle: css({
+      background: theme.colors.secondary.main,
+      transition: '0.3s background ease-in-out',
+      position: 'relative',
+      height: '50% !important',
+      width: `${theme.spacing(1)} !important`,
+      top: '25% !important',
+      right: `${theme.spacing(1)} !important`,
+      cursor: 'grab',
+      borderRadius: theme.shape.radius.pill,
+      ['&:hover']: {
+        background: theme.colors.secondary.shade,
+      },
     }),
-
-    labelCount: css({}),
-    checkbox: css({}),
   };
 }
 
-/**
- * from public/app/features/explore/Table/TableContainer.tsx
- */
-const getTableHeight = (rowCount: number, hasSubFrames: boolean) => {
-  if (rowCount === 0) {
-    return 200;
-  }
-  // 600px is pretty small for taller monitors, using the innerHeight minus an arbitrary 500px so the table can be viewed in its entirety without needing to scroll outside the panel to see the top and the bottom
-  const max = Math.max(window.innerHeight - 500, 600);
-  const min = Math.max(rowCount * 36, hasSubFrames ? 300 : 0) + 40 + 46;
-  // tries to estimate table height, with a min of 300 and a max of 600
-  // if there are multiple tables, there is no min
-  return Math.min(max, min);
+export const getLogsTableHeight = () => {
+  // Instead of making the height of the table based on the content (like in the table panel itself), let's try to use the vertical space that is available.
+  // Since this table is in explore, we can expect the user to be running multiple queries that return disparate numbers of rows and labels in the same session
+  // Also changing the height of the table between queries can be and cause content to jump, so we'll set a minimum height of 500px, and a max based on the innerHeight
+  // Ideally the table container should always be able to fit in the users viewport without needing to scroll
+  return Math.max(window.innerHeight - 500, 500);
 };
diff --git a/public/app/features/explore/Logs/LogsVolumePanel.test.tsx b/public/app/features/explore/Logs/LogsVolumePanel.test.tsx
index fb973f438a3fb..46bb7db737fc1 100644
--- a/public/app/features/explore/Logs/LogsVolumePanel.test.tsx
+++ b/public/app/features/explore/Logs/LogsVolumePanel.test.tsx
@@ -25,6 +25,7 @@ function renderPanel(logsVolumeData: DataQueryResponse) {
       onHiddenSeriesChanged={() => null}
       eventBus={new EventBusSrv()}
       allLogsVolumeMaximum={20}
+      annotations={[]}
     />
   );
 }
diff --git a/public/app/features/explore/Logs/LogsVolumePanel.tsx b/public/app/features/explore/Logs/LogsVolumePanel.tsx
index cd31dcce5172c..4681cd580711f 100644
--- a/public/app/features/explore/Logs/LogsVolumePanel.tsx
+++ b/public/app/features/explore/Logs/LogsVolumePanel.tsx
@@ -7,10 +7,11 @@ import {
   DataQueryResponse,
   LoadingState,
   SplitOpen,
-  TimeZone,
   EventBus,
   GrafanaTheme2,
+  DataFrame,
 } from '@grafana/data';
+import { TimeZone } from '@grafana/schema';
 import { Icon, Tooltip, TooltipDisplayMode, useStyles2, useTheme2 } from '@grafana/ui';
 
 import { getLogsVolumeDataSourceInfo, isLogsVolumeLimited } from '../../logs/utils';
@@ -27,6 +28,7 @@ type Props = {
   onLoadLogsVolume: () => void;
   onHiddenSeriesChanged: (hiddenSeries: string[]) => void;
   eventBus: EventBus;
+  annotations: DataFrame[];
 };
 
 export function LogsVolumePanel(props: Props) {
@@ -66,6 +68,9 @@ export function LogsVolumePanel(props: Props) {
   return (
     <div style={{ height }} className={styles.contentContainer}>
       <ExploreGraph
+        vizLegendOverrides={{
+          calcs: ['sum'],
+        }}
         graphStyle="lines"
         loadingState={logsVolumeData.state ?? LoadingState.Done}
         data={logsVolumeData.data}
@@ -80,6 +85,7 @@ export function LogsVolumePanel(props: Props) {
         anchorToZero
         yAxisMaximum={allLogsVolumeMaximum}
         eventBus={props.eventBus}
+        annotations={props.annotations}
       />
       {extraInfoComponent && <div className={styles.extraInfoContainer}>{extraInfoComponent}</div>}
     </div>
diff --git a/public/app/features/explore/Logs/LogsVolumePanelList.tsx b/public/app/features/explore/Logs/LogsVolumePanelList.tsx
index 1d513abb3b174..8ca60b4ada88e 100644
--- a/public/app/features/explore/Logs/LogsVolumePanelList.tsx
+++ b/public/app/features/explore/Logs/LogsVolumePanelList.tsx
@@ -6,6 +6,7 @@ import {
   AbsoluteTimeRange,
   DataFrame,
   DataQueryResponse,
+  DataTopic,
   EventBus,
   GrafanaTheme2,
   LoadingState,
@@ -49,9 +50,13 @@ export const LogsVolumePanelList = ({
     logVolumes,
     maximumValue: allLogsVolumeMaximumValue,
     maximumRange: allLogsVolumeMaximumRange,
+    annotations,
   } = useMemo(() => {
     let maximumValue = -Infinity;
-    const sorted = sortBy(logsVolumeData?.data || [], 'meta.custom.datasourceName');
+    const data = logsVolumeData?.data.filter((frame: DataFrame) => frame.meta?.dataTopic !== DataTopic.Annotations);
+    const annotations =
+      logsVolumeData?.data.filter((frame: DataFrame) => frame.meta?.dataTopic === DataTopic.Annotations) || [];
+    const sorted = sortBy(data || [], 'meta.custom.datasourceName');
     const grouped = groupBy(sorted, 'meta.custom.datasourceName');
     const logVolumes = mapValues(grouped, (value) => {
       const mergedData = mergeLogsVolumeDataFrames(value);
@@ -63,6 +68,7 @@ export const LogsVolumePanelList = ({
       maximumValue,
       maximumRange,
       logVolumes,
+      annotations,
     };
   }, [logsVolumeData]);
 
@@ -127,6 +133,7 @@ export const LogsVolumePanelList = ({
             // TODO: Support filtering level from multiple log levels
             onHiddenSeriesChanged={numberOfLogVolumes > 1 ? () => {} : onHiddenSeriesChanged}
             eventBus={eventBus}
+            annotations={annotations}
           />
         );
       })}
diff --git a/public/app/features/explore/Logs/PopoverMenu.test.tsx b/public/app/features/explore/Logs/PopoverMenu.test.tsx
new file mode 100644
index 0000000000000..879e9fc0be5ff
--- /dev/null
+++ b/public/app/features/explore/Logs/PopoverMenu.test.tsx
@@ -0,0 +1,90 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { createLogRow } from '../../logs/components/__mocks__/logRow';
+
+import { PopoverMenu } from './PopoverMenu';
+
+const row = createLogRow();
+
+test('Does not render if the filter functions are not defined', () => {
+  render(<PopoverMenu selection="test" x={0} y={0} row={row} close={() => {}} />);
+
+  expect(screen.queryByText('Copy selection')).not.toBeInTheDocument();
+});
+
+test('Renders copy and line contains filter', async () => {
+  const onClickFilterValue = jest.fn();
+  render(
+    <PopoverMenu selection="test" x={0} y={0} row={row} close={() => {}} onClickFilterValue={onClickFilterValue} />
+  );
+
+  expect(screen.getByText('Copy selection')).toBeInTheDocument();
+  expect(screen.getByText('Add as line contains filter')).toBeInTheDocument();
+
+  await userEvent.click(screen.getByText('Add as line contains filter'));
+
+  expect(onClickFilterValue).toHaveBeenCalledTimes(1);
+  expect(onClickFilterValue).toHaveBeenCalledWith('test', row.dataFrame.refId);
+});
+
+test('Renders copy and line does not contain filter', async () => {
+  const onClickFilterOutValue = jest.fn();
+  render(
+    <PopoverMenu
+      selection="test"
+      x={0}
+      y={0}
+      row={row}
+      close={() => {}}
+      onClickFilterOutValue={onClickFilterOutValue}
+    />
+  );
+
+  expect(screen.getByText('Copy selection')).toBeInTheDocument();
+  expect(screen.getByText('Add as line does not contain filter')).toBeInTheDocument();
+
+  await userEvent.click(screen.getByText('Add as line does not contain filter'));
+
+  expect(onClickFilterOutValue).toHaveBeenCalledTimes(1);
+  expect(onClickFilterOutValue).toHaveBeenCalledWith('test', row.dataFrame.refId);
+});
+
+test('Renders copy, line contains filter, and line does not contain filter', () => {
+  render(
+    <PopoverMenu
+      selection="test"
+      x={0}
+      y={0}
+      row={row}
+      close={() => {}}
+      onClickFilterValue={() => {}}
+      onClickFilterOutValue={() => {}}
+    />
+  );
+
+  expect(screen.getByText('Copy selection')).toBeInTheDocument();
+  expect(screen.getByText('Add as line contains filter')).toBeInTheDocument();
+  expect(screen.getByText('Add as line does not contain filter')).toBeInTheDocument();
+});
+
+test('Can be dismissed with escape', async () => {
+  const close = jest.fn();
+  render(
+    <PopoverMenu
+      selection="test"
+      x={0}
+      y={0}
+      row={row}
+      close={close}
+      onClickFilterValue={() => {}}
+      onClickFilterOutValue={() => {}}
+    />
+  );
+
+  expect(close).not.toHaveBeenCalled();
+  expect(screen.getByText('Copy selection')).toBeInTheDocument();
+  await userEvent.keyboard('{Escape}');
+  expect(close).toHaveBeenCalledTimes(1);
+});
diff --git a/public/app/features/explore/Logs/PopoverMenu.tsx b/public/app/features/explore/Logs/PopoverMenu.tsx
new file mode 100644
index 0000000000000..fe62668307cc7
--- /dev/null
+++ b/public/app/features/explore/Logs/PopoverMenu.tsx
@@ -0,0 +1,100 @@
+import { css } from '@emotion/css';
+import React, { useEffect, useRef } from 'react';
+
+import { GrafanaTheme2, LogRowModel } from '@grafana/data';
+import { reportInteraction } from '@grafana/runtime';
+import { Menu, useStyles2 } from '@grafana/ui';
+
+import { copyText } from '../../logs/utils';
+
+interface PopoverMenuProps {
+  selection: string;
+  x: number;
+  y: number;
+  onClickFilterValue?: (value: string, refId?: string) => void;
+  onClickFilterOutValue?: (value: string, refId?: string) => void;
+  row: LogRowModel;
+  close: () => void;
+}
+
+export const PopoverMenu = ({
+  x,
+  y,
+  onClickFilterValue,
+  onClickFilterOutValue,
+  selection,
+  row,
+  close,
+}: PopoverMenuProps) => {
+  const containerRef = useRef<HTMLDivElement | null>(null);
+  const styles = useStyles2(getStyles);
+
+  useEffect(() => {
+    function handleEscape(e: KeyboardEvent) {
+      if (e.key === 'Escape') {
+        close();
+      }
+    }
+    document.addEventListener('keyup', handleEscape);
+
+    return () => {
+      document.removeEventListener('keyup', handleEscape);
+    };
+  }, [close]);
+
+  const supported = onClickFilterValue || onClickFilterOutValue;
+
+  if (!supported) {
+    return null;
+  }
+
+  return (
+    <div className={styles.menu} style={{ top: y, left: x }}>
+      <Menu ref={containerRef}>
+        <Menu.Item
+          label="Copy selection"
+          onClick={() => {
+            copyText(selection, containerRef);
+            close();
+            track('copy', selection.length, row.datasourceType);
+          }}
+        />
+        {onClickFilterValue && (
+          <Menu.Item
+            label="Add as line contains filter"
+            onClick={() => {
+              onClickFilterValue(selection, row.dataFrame.refId);
+              close();
+              track('line_contains', selection.length, row.datasourceType);
+            }}
+          />
+        )}
+        {onClickFilterOutValue && (
+          <Menu.Item
+            label="Add as line does not contain filter"
+            onClick={() => {
+              onClickFilterOutValue(selection, row.dataFrame.refId);
+              close();
+              track('line_does_not_contain', selection.length, row.datasourceType);
+            }}
+          />
+        )}
+      </Menu>
+    </div>
+  );
+};
+
+function track(action: string, selectionLength: number, dataSourceType: string | undefined) {
+  reportInteraction(`grafana_explore_logs_popover_menu`, {
+    action,
+    selectionLength: selectionLength,
+    datasourceType: dataSourceType || 'unknown',
+  });
+}
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  menu: css({
+    position: 'fixed',
+    zIndex: theme.zIndex.modal,
+  }),
+});
diff --git a/public/app/features/explore/Logs/utils/logs.ts b/public/app/features/explore/Logs/utils/logs.ts
index d156da0c08067..2aec91da980a3 100644
--- a/public/app/features/explore/Logs/utils/logs.ts
+++ b/public/app/features/explore/Logs/utils/logs.ts
@@ -6,3 +6,5 @@ export const SETTINGS_KEYS = {
   logsSortOrder: 'grafana.explore.logs.sortOrder',
   logContextWrapLogMessage: 'grafana.explore.logs.logContext.wrapLogMessage',
 };
+
+export const visualisationTypeKey = 'grafana.explore.logs.visualisationType';
diff --git a/public/app/features/explore/Logs/utils/testMocks.test.ts b/public/app/features/explore/Logs/utils/testMocks.test.ts
index 15dea59f695c0..55a19433b20f5 100644
--- a/public/app/features/explore/Logs/utils/testMocks.test.ts
+++ b/public/app/features/explore/Logs/utils/testMocks.test.ts
@@ -52,7 +52,10 @@ export const getMockLokiFrame = (override?: Partial<DataFrame>) => {
   };
   return { ...testDataFrame, ...override };
 };
-export const getMockLokiFrameDataPlane = (override?: Partial<DataFrame>): DataFrame => {
+export const getMockLokiFrameDataPlane = (override?: Partial<DataFrame>, howManyValues = 3): DataFrame => {
+  if (howManyValues > 6) {
+    throw new Error('only 6 or fewer values are supported');
+  }
   const testDataFrame: DataFrame = {
     meta: {
       type: DataFrameType.LogLines,
@@ -60,7 +63,7 @@ export const getMockLokiFrameDataPlane = (override?: Partial<DataFrame>): DataFr
     fields: [
       {
         config: {},
-        name: 'attributes',
+        name: 'labels',
         type: FieldType.other,
         values: [
           { app: 'grafana', cluster: 'dev-us-central-0', container: 'hg-plugins' },
@@ -72,25 +75,53 @@ export const getMockLokiFrameDataPlane = (override?: Partial<DataFrame>): DataFr
         config: {},
         name: 'timestamp',
         type: FieldType.time,
-        values: ['2019-01-01 10:00:00', '2019-01-01 11:00:00', '2019-01-01 12:00:00'],
+        values: [
+          '2019-01-01 10:00:00',
+          '2019-01-01 11:00:00',
+          '2019-01-01 12:00:00',
+          '2019-01-01 13:00:00',
+          '2019-01-01 14:00:00',
+          '2019-01-01 15:00:00',
+        ].slice(0, howManyValues),
       },
       {
         config: {},
         name: 'body',
         type: FieldType.string,
-        values: ['log message 1', 'log message 2', 'log message 3'],
+        values: [
+          'log message 1',
+          'log message 2',
+          'log message 3',
+          'log message 4',
+          'log message 5',
+          'log message 6',
+        ].slice(0, howManyValues),
       },
       {
         config: {},
         name: 'tsNs',
         type: FieldType.string,
-        values: ['1697561006608165746', '1697560998869868000', '1697561010006578474'],
+        values: [
+          '1697561006608165746',
+          '1697560998869868000',
+          '1697561010006578474',
+          '1697561010006578475',
+          '1697561010006578476',
+          '1697561010006578477',
+        ].slice(0, howManyValues),
       },
       {
         config: {},
         name: 'id',
         type: FieldType.string,
-        values: ['1697561006608165746_b4cc4b72', '1697560998869868000_eeb96c0f', '1697561010006578474_ad5e2e5a'],
+        values: [
+          '1697561006608165746_b4cc4b72',
+          '1697560998869868000_eeb96c0f',
+          '1697561010006578474_ad5e2e5a',
+          '1697561010006578474_ad5e2e5b',
+          '1697561010006578474_ad5e2e5c',
+          '1697561010006578474_ad5e2e5d',
+        ].slice(0, howManyValues),
       },
       {
         config: {
@@ -103,10 +134,10 @@ export const getMockLokiFrameDataPlane = (override?: Partial<DataFrame>): DataFr
         },
         name: 'traceID',
         type: FieldType.string,
-        values: ['trace1', 'trace2', 'trace3'],
+        values: ['trace1', 'trace2', 'trace3', 'trace4', 'trace5', 'trace6'].slice(0, howManyValues),
       },
     ],
-    length: 3,
+    length: howManyValues,
   };
   return { ...testDataFrame, ...override };
 };
diff --git a/public/app/features/explore/Logs/utils/uFuzzy.ts b/public/app/features/explore/Logs/utils/uFuzzy.ts
index 8804d6d52b3a6..7c7e5eb44ea2b 100644
--- a/public/app/features/explore/Logs/utils/uFuzzy.ts
+++ b/public/app/features/explore/Logs/utils/uFuzzy.ts
@@ -10,7 +10,7 @@ const uf = new uFuzzy({
 });
 
 export function fuzzySearch(haystack: string[], query: string, dispatcher: (data: string[][]) => void) {
-  const [idxs, info, order] = uf.search(haystack, query, false, 1e5);
+  const [idxs, info, order] = uf.search(haystack, query, 0, 1e5);
 
   let haystackOrder: string[] = [];
   let matchesSet: Set<string> = new Set();
diff --git a/public/app/features/explore/MetaInfoText.tsx b/public/app/features/explore/MetaInfoText.tsx
index 3392f6c796931..29c8528d355b8 100644
--- a/public/app/features/explore/MetaInfoText.tsx
+++ b/public/app/features/explore/MetaInfoText.tsx
@@ -5,33 +5,32 @@ import { GrafanaTheme2 } from '@grafana/data';
 import { useStyles2 } from '@grafana/ui';
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  metaContainer: css`
-    flex: 1;
-    color: ${theme.colors.text.secondary};
-    margin-bottom: ${theme.spacing(2)};
-    min-width: 30%;
-    display: flex;
-    flex-wrap: wrap;
-  `,
-  metaItem: css`
-    margin-right: ${theme.spacing(2)};
-    margin-top: ${theme.spacing(0.5)};
-    display: flex;
-    align-items: center;
-
-    .logs-meta-item__error {
-      color: ${theme.colors.error.text};
-    }
-  `,
-  metaLabel: css`
-    margin-right: calc(${theme.spacing(2)} / 2);
-    font-size: ${theme.typography.bodySmall.fontSize};
-    font-weight: ${theme.typography.fontWeightMedium};
-  `,
-  metaValue: css`
-    font-family: ${theme.typography.fontFamilyMonospace};
-    font-size: ${theme.typography.bodySmall.fontSize};
-  `,
+  metaContainer: css({
+    flex: 1,
+    color: theme.colors.text.secondary,
+    marginBottom: theme.spacing(2),
+    minWidth: '30%',
+    display: 'flex',
+    flexWrap: 'wrap',
+  }),
+  metaItem: css({
+    marginRight: theme.spacing(2),
+    marginTop: theme.spacing(0.5),
+    display: 'flex',
+    alignItems: 'center',
+    ['.logs-meta-item__error']: {
+      color: theme.colors.error.text,
+    },
+  }),
+  metaLabel: css({
+    marginRight: `calc(${theme.spacing(2)} / 2)`,
+    fontSize: theme.typography.bodySmall.fontSize,
+    fontWeight: theme.typography.fontWeightMedium,
+  }),
+  metaValue: css({
+    fontFamily: theme.typography.fontFamilyMonospace,
+    fontSize: theme.typography.bodySmall.fontSize,
+  }),
 });
 
 export interface MetaItemProps {
diff --git a/public/app/features/explore/NoData.tsx b/public/app/features/explore/NoData.tsx
index 7c5182851dd37..ed819de9ffe41 100644
--- a/public/app/features/explore/NoData.tsx
+++ b/public/app/features/explore/NoData.tsx
@@ -16,20 +16,20 @@ export const NoData = () => {
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  wrapper: css`
-    label: no-data-card;
-    padding: ${theme.spacing(3)};
-    background: ${theme.colors.background.primary};
-    border-radius: ${theme.shape.radius.default};
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    flex-grow: 1;
-  `,
-  message: css`
-    font-size: ${theme.typography.h2.fontSize};
-    padding: ${theme.spacing(4)};
-    color: ${theme.colors.text.disabled};
-  `,
+  wrapper: css({
+    label: 'no-data-card',
+    padding: theme.spacing(3),
+    background: theme.colors.background.primary,
+    borderRadius: theme.shape.radius.default,
+    display: 'flex',
+    flexDirection: 'column',
+    alignItems: 'center',
+    justifyContent: 'center',
+    flexGrow: 1,
+  }),
+  message: css({
+    fontSize: theme.typography.h2.fontSize,
+    padding: theme.spacing(4),
+    color: theme.colors.text.disabled,
+  }),
 });
diff --git a/public/app/features/explore/NoDataSourceCallToAction.tsx b/public/app/features/explore/NoDataSourceCallToAction.tsx
index 1e390cf7bdbdf..a3e773f3a57da 100644
--- a/public/app/features/explore/NoDataSourceCallToAction.tsx
+++ b/public/app/features/explore/NoDataSourceCallToAction.tsx
@@ -1,12 +1,21 @@
 import { css } from '@emotion/css';
 import React from 'react';
 
-import { LinkButton, CallToActionCard, Icon, useTheme2 } from '@grafana/ui';
+import { GrafanaTheme2 } from '@grafana/data';
+import { LinkButton, CallToActionCard, Icon, useStyles2 } from '@grafana/ui';
 import { contextSrv } from 'app/core/core';
 import { AccessControlAction } from 'app/types';
 
+function getCardStyles(theme: GrafanaTheme2) {
+  return css({
+    maxWidth: `${theme.breakpoints.values.lg}px`,
+    marginTop: theme.spacing(2),
+    alignSelf: 'center',
+  });
+}
+
 export const NoDataSourceCallToAction = () => {
-  const theme = useTheme2();
+  const cardStyles = useStyles2(getCardStyles);
 
   const canCreateDataSource =
     contextSrv.hasPermission(AccessControlAction.DataSourcesCreate) &&
@@ -35,13 +44,5 @@ export const NoDataSourceCallToAction = () => {
     </LinkButton>
   );
 
-  const cardClassName = css`
-    max-width: ${theme.breakpoints.values.lg}px;
-    margin-top: ${theme.spacing(2)};
-    align-self: center;
-  `;
-
-  return (
-    <CallToActionCard callToActionElement={ctaElement} className={cardClassName} footer={footer} message={message} />
-  );
+  return <CallToActionCard callToActionElement={ctaElement} className={cardStyles} footer={footer} message={message} />;
 };
diff --git a/public/app/features/explore/PrometheusListView/ItemValues.test.tsx b/public/app/features/explore/PrometheusListView/ItemValues.test.tsx
index 7a5a1e965d20d..f753896dbcabf 100644
--- a/public/app/features/explore/PrometheusListView/ItemValues.test.tsx
+++ b/public/app/features/explore/PrometheusListView/ItemValues.test.tsx
@@ -1,10 +1,9 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 
-import { RawPrometheusListItemEmptyValue } from '../utils/getRawPrometheusListItemsFromDataFrame';
-
 import { ItemValues } from './ItemValues';
 import { RawListValue } from './RawListItem';
+import { RawPrometheusListItemEmptyValue } from './utils/getRawPrometheusListItemsFromDataFrame';
 
 const value1 = 'value 1';
 const value2 = 'value 2';
diff --git a/public/app/features/explore/PrometheusListView/ItemValues.tsx b/public/app/features/explore/PrometheusListView/ItemValues.tsx
index c0c33146d8e09..d874f806a0145 100644
--- a/public/app/features/explore/PrometheusListView/ItemValues.tsx
+++ b/public/app/features/explore/PrometheusListView/ItemValues.tsx
@@ -4,9 +4,8 @@ import React from 'react';
 import { GrafanaTheme2 } from '@grafana/data/';
 import { useStyles2 } from '@grafana/ui/';
 
-import { RawPrometheusListItemEmptyValue } from '../utils/getRawPrometheusListItemsFromDataFrame';
-
 import { rawListItemColumnWidth, rawListPaddingToHoldSpaceForCopyIcon, RawListValue } from './RawListItem';
+import { RawPrometheusListItemEmptyValue } from './utils/getRawPrometheusListItemsFromDataFrame';
 
 const getStyles = (theme: GrafanaTheme2, totalNumberOfValues: number) => ({
   rowWrapper: css`
diff --git a/public/app/features/explore/PrometheusListView/RawListContainer.tsx b/public/app/features/explore/PrometheusListView/RawListContainer.tsx
index f3f368cd89b35..92fb50b904084 100644
--- a/public/app/features/explore/PrometheusListView/RawListContainer.tsx
+++ b/public/app/features/explore/PrometheusListView/RawListContainer.tsx
@@ -8,13 +8,12 @@ import { DataFrame, Field as DataFrameField } from '@grafana/data/';
 import { reportInteraction } from '@grafana/runtime/src';
 import { Field, Switch } from '@grafana/ui/';
 
+import { ItemLabels } from './ItemLabels';
+import RawListItem from './RawListItem';
 import {
   getRawPrometheusListItemsFromDataFrame,
   RawPrometheusListItemEmptyValue,
-} from '../utils/getRawPrometheusListItemsFromDataFrame';
-
-import { ItemLabels } from './ItemLabels';
-import RawListItem from './RawListItem';
+} from './utils/getRawPrometheusListItemsFromDataFrame';
 
 export type instantQueryRawVirtualizedListData = { Value: string; __name__: string; [index: string]: string };
 
diff --git a/public/app/features/explore/utils/getRawPrometheusListItemsFromDataFrame.test.ts b/public/app/features/explore/PrometheusListView/utils/getRawPrometheusListItemsFromDataFrame.test.ts
similarity index 98%
rename from public/app/features/explore/utils/getRawPrometheusListItemsFromDataFrame.test.ts
rename to public/app/features/explore/PrometheusListView/utils/getRawPrometheusListItemsFromDataFrame.test.ts
index 3b475b2ca8703..354ea2407b682 100644
--- a/public/app/features/explore/utils/getRawPrometheusListItemsFromDataFrame.test.ts
+++ b/public/app/features/explore/PrometheusListView/utils/getRawPrometheusListItemsFromDataFrame.test.ts
@@ -1,4 +1,4 @@
-import { DataFrame, FieldType, FormattedValue, toDataFrame } from '@grafana/data/src';
+import { DataFrame, FieldType, FormattedValue, toDataFrame } from '@grafana/data';
 
 import { getRawPrometheusListItemsFromDataFrame } from './getRawPrometheusListItemsFromDataFrame';
 
diff --git a/public/app/features/explore/utils/getRawPrometheusListItemsFromDataFrame.ts b/public/app/features/explore/PrometheusListView/utils/getRawPrometheusListItemsFromDataFrame.ts
similarity index 95%
rename from public/app/features/explore/utils/getRawPrometheusListItemsFromDataFrame.ts
rename to public/app/features/explore/PrometheusListView/utils/getRawPrometheusListItemsFromDataFrame.ts
index 79a015182f7b1..d4210eada7e69 100644
--- a/public/app/features/explore/utils/getRawPrometheusListItemsFromDataFrame.ts
+++ b/public/app/features/explore/PrometheusListView/utils/getRawPrometheusListItemsFromDataFrame.ts
@@ -1,6 +1,6 @@
-import { DataFrame, formattedValueToString } from '@grafana/data/src';
+import { DataFrame, formattedValueToString } from '@grafana/data';
 
-import { instantQueryRawVirtualizedListData } from '../PrometheusListView/RawListContainer';
+import { instantQueryRawVirtualizedListData } from '../RawListContainer';
 
 type instantQueryMetricList = { [index: string]: { [index: string]: instantQueryRawVirtualizedListData } };
 
diff --git a/public/app/features/explore/QueryRows.test.tsx b/public/app/features/explore/QueryRows.test.tsx
index 487e9d0cdb309..1bcb5111fd6dd 100644
--- a/public/app/features/explore/QueryRows.test.tsx
+++ b/public/app/features/explore/QueryRows.test.tsx
@@ -2,6 +2,7 @@ import { fireEvent, render, screen } from '@testing-library/react';
 import React from 'react';
 import { Provider } from 'react-redux';
 
+import { DataSourceApi } from '@grafana/data';
 import { DataSourceSrv, setDataSourceSrv } from '@grafana/runtime';
 import { DataQuery } from '@grafana/schema';
 import { configureStore } from 'app/store/configureStore';
@@ -22,9 +23,9 @@ function setup(queries: DataQuery[]) {
     name: 'newDs',
     uid: 'newDs-uid',
     meta: { id: 'newDs' },
-  };
+  } as DataSourceApi;
 
-  const datasources: Record<string, any> = {
+  const datasources: Record<string, DataSourceApi> = {
     'newDs-uid': defaultDs,
     'someDs-uid': {
       name: 'someDs',
@@ -33,7 +34,7 @@ function setup(queries: DataQuery[]) {
       components: {
         QueryEditor: () => 'someDs query editor',
       },
-    },
+    } as unknown as DataSourceApi,
   };
 
   setDataSourceSrv({
@@ -46,7 +47,7 @@ function setup(queries: DataQuery[]) {
     get(uid?: string) {
       return Promise.resolve(uid ? datasources[uid] || defaultDs : defaultDs);
     },
-  } as DataSourceSrv);
+  } as unknown as DataSourceSrv);
 
   const leftState = makeExplorePaneState();
   const initialState: ExploreState = {
@@ -59,7 +60,7 @@ function setup(queries: DataQuery[]) {
         correlations: [],
       },
     },
-    correlationEditorDetails: { editorMode: false, dirty: false, isExiting: false },
+    correlationEditorDetails: { editorMode: false, correlationDirty: false, queryEditorDirty: false, isExiting: false },
     syncedTimes: false,
     richHistoryStorageFull: false,
     richHistoryLimitExceededWarningShown: false,
diff --git a/public/app/features/explore/QueryRows.tsx b/public/app/features/explore/QueryRows.tsx
index e90a09bb270a2..6911ca3a49b94 100644
--- a/public/app/features/explore/QueryRows.tsx
+++ b/public/app/features/explore/QueryRows.tsx
@@ -10,6 +10,7 @@ import { useDispatch, useSelector } from 'app/types';
 import { getDatasourceSrv } from '../plugins/datasource_srv';
 import { QueryEditorRows } from '../query/components/QueryEditorRows';
 
+import { ContentOutlineItem } from './ContentOutline/ContentOutlineItem';
 import { changeQueries, runQueries } from './state/query';
 import { getExploreItemSelector } from './state/selectors';
 
@@ -88,6 +89,18 @@ export const QueryRows = ({ exploreId }: Props) => {
       app={CoreApp.Explore}
       history={history}
       eventBus={eventBridge}
+      queryRowWrapper={(children, refId) => (
+        <ContentOutlineItem
+          title={refId}
+          icon="arrow"
+          key={refId}
+          panelId="Queries"
+          customTopOffset={-10}
+          level="child"
+        >
+          {children}
+        </ContentOutlineItem>
+      )}
     />
   );
 };
diff --git a/public/app/features/explore/RawPrometheus/RawPrometheusContainer.test.tsx b/public/app/features/explore/RawPrometheus/RawPrometheusContainer.test.tsx
index a310592e37ad3..bdc901630ba95 100644
--- a/public/app/features/explore/RawPrometheus/RawPrometheusContainer.test.tsx
+++ b/public/app/features/explore/RawPrometheus/RawPrometheusContainer.test.tsx
@@ -1,7 +1,8 @@
 import { fireEvent, render, screen, within } from '@testing-library/react';
 import React from 'react';
 
-import { FieldType, getDefaultTimeRange, InternalTimeZones, toDataFrame } from '@grafana/data';
+import { FieldType, getDefaultTimeRange, InternalTimeZones, toDataFrame, LoadingState } from '@grafana/data';
+import { getTemplateSrv } from 'app/features/templating/template_srv';
 import { TABLE_RESULTS_STYLE } from 'app/types';
 
 import { RawPrometheusContainer } from './RawPrometheusContainer';
@@ -53,7 +54,7 @@ const dataFrame = toDataFrame({
 
 const defaultProps = {
   exploreId: 'left',
-  loading: false,
+  loading: LoadingState.NotStarted,
   width: 800,
   onCellFilterAdded: jest.fn(),
   tableResult: [dataFrame],
@@ -65,6 +66,10 @@ const defaultProps = {
 };
 
 describe('RawPrometheusContainer', () => {
+  beforeAll(() => {
+    getTemplateSrv();
+  });
+
   it('should render component for prometheus', () => {
     render(<RawPrometheusContainer {...defaultProps} showRawPrometheus={true} />);
 
diff --git a/public/app/features/explore/RawPrometheus/RawPrometheusContainer.tsx b/public/app/features/explore/RawPrometheus/RawPrometheusContainer.tsx
index c67485995b391..71910d544babc 100644
--- a/public/app/features/explore/RawPrometheus/RawPrometheusContainer.tsx
+++ b/public/app/features/explore/RawPrometheus/RawPrometheusContainer.tsx
@@ -2,9 +2,10 @@ import { css } from '@emotion/css';
 import React, { PureComponent } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
-import { applyFieldOverrides, DataFrame, SelectableValue, SplitOpen, TimeZone } from '@grafana/data';
+import { applyFieldOverrides, DataFrame, SelectableValue, SplitOpen } from '@grafana/data';
 import { getTemplateSrv, reportInteraction } from '@grafana/runtime';
-import { Collapse, RadioButtonGroup, Table, AdHocFilterItem } from '@grafana/ui';
+import { TimeZone } from '@grafana/schema';
+import { RadioButtonGroup, Table, AdHocFilterItem, PanelChrome } from '@grafana/ui';
 import { config } from 'app/core/config';
 import { PANEL_BORDER } from 'app/core/constants';
 import { StoreState, TABLE_RESULTS_STYLE } from 'app/types';
@@ -12,7 +13,6 @@ import { ExploreItemState, TABLE_RESULTS_STYLES, TableResultsStyle } from 'app/t
 
 import { MetaInfoText } from '../MetaInfoText';
 import RawListContainer from '../PrometheusListView/RawListContainer';
-import { selectIsWaitingForData } from '../state/query';
 import { exploreDataLinkPostProcessorFactory } from '../utils/links';
 
 interface RawPrometheusContainerProps {
@@ -32,11 +32,10 @@ interface PrometheusContainerState {
 function mapStateToProps(state: StoreState, { exploreId }: RawPrometheusContainerProps) {
   const explore = state.explore;
   const item: ExploreItemState = explore.panes[exploreId]!;
-  const { tableResult, rawPrometheusResult, range } = item;
-  const loadingInState = selectIsWaitingForData(exploreId)(state);
+  const { tableResult, rawPrometheusResult, range, queryResponse } = item;
   const rawPrometheusFrame: DataFrame[] = rawPrometheusResult ? [rawPrometheusResult] : [];
-  const result = (tableResult?.length ?? false) > 0 && rawPrometheusResult ? tableResult : rawPrometheusFrame;
-  const loading = result && result.length > 0 ? false : loadingInState;
+  const result = (tableResult?.length ?? 0) > 0 && rawPrometheusResult ? tableResult : rawPrometheusFrame;
+  const loading = queryResponse.state;
 
   return { loading, tableResult: result, range };
 }
@@ -86,7 +85,6 @@ export class RawPrometheusContainer extends PureComponent<Props, PrometheusConta
 
     return (
       <div className={spacing}>
-        {this.state.resultsStyle === TABLE_RESULTS_STYLE.raw ? 'Raw' : 'Table'}
         <RadioButtonGroup
           onClick={() => {
             const props = {
@@ -133,13 +131,14 @@ export class RawPrometheusContainer extends PureComponent<Props, PrometheusConta
       (frame: DataFrame | undefined): frame is DataFrame => !!frame && frame.length !== 0
     );
 
+    const title = this.state.resultsStyle === TABLE_RESULTS_STYLE.raw ? 'Raw' : 'Table';
     const label = this.state?.resultsStyle !== undefined ? this.renderLabel() : 'Table';
 
     // Render table as default if resultsStyle is not set.
     const renderTable = !this.state?.resultsStyle || this.state?.resultsStyle === TABLE_RESULTS_STYLE.table;
 
     return (
-      <Collapse label={label} loading={loading} isOpen>
+      <PanelChrome title={title} actions={label} loadingState={loading}>
         {frames?.length && (
           <>
             {renderTable && (
@@ -155,7 +154,7 @@ export class RawPrometheusContainer extends PureComponent<Props, PrometheusConta
           </>
         )}
         {!frames?.length && <MetaInfoText metaItems={[{ value: '0 series returned' }]} />}
-      </Collapse>
+      </PanelChrome>
     );
   }
 }
diff --git a/public/app/features/explore/RichHistory/RichHistory.test.tsx b/public/app/features/explore/RichHistory/RichHistory.test.tsx
index c14af607ea2df..d4199815da10a 100644
--- a/public/app/features/explore/RichHistory/RichHistory.test.tsx
+++ b/public/app/features/explore/RichHistory/RichHistory.test.tsx
@@ -1,7 +1,6 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 
-import { GrafanaTheme2 } from '@grafana/data';
 import { SortOrder } from 'app/core/utils/richHistory';
 
 import { RichHistory, RichHistoryProps, Tabs } from './RichHistory';
@@ -21,7 +20,6 @@ jest.mock('@grafana/runtime', () => ({
 
 const setup = (propOverrides?: Partial<RichHistoryProps>) => {
   const props: RichHistoryProps = {
-    theme: {} as GrafanaTheme2,
     exploreId: 'left',
     height: 100,
     activeDatasourceInstance: 'Test datasource',
diff --git a/public/app/features/explore/RichHistory/RichHistory.tsx b/public/app/features/explore/RichHistory/RichHistory.tsx
index 7998e2cc4dc7f..e6dfd82ec7bc5 100644
--- a/public/app/features/explore/RichHistory/RichHistory.tsx
+++ b/public/app/features/explore/RichHistory/RichHistory.tsx
@@ -1,8 +1,9 @@
 import { debounce } from 'lodash';
-import React, { PureComponent } from 'react';
+import React, { useState, useEffect } from 'react';
 
 import { SelectableValue } from '@grafana/data';
-import { Themeable2, TabbedContainer, TabConfig, withTheme2 } from '@grafana/ui';
+import { TabbedContainer, TabConfig } from '@grafana/ui';
+import { t } from 'app/core/internationalization';
 import { SortOrder, RichHistorySearchFilters, RichHistorySettings } from 'app/core/utils/richHistory';
 import { RichHistoryQuery } from 'app/types/explore';
 
@@ -20,13 +21,13 @@ export enum Tabs {
 
 export const getSortOrderOptions = () =>
   [
-    { label: 'Newest first', value: SortOrder.Descending },
-    { label: 'Oldest first', value: SortOrder.Ascending },
-    { label: 'Data source A-Z', value: SortOrder.DatasourceAZ },
-    { label: 'Data source Z-A', value: SortOrder.DatasourceZA },
+    { label: t('explore.rich-history.newest-first', 'Newest first'), value: SortOrder.Descending },
+    { label: t('explore.rich-history.oldest-first', 'Oldest first'), value: SortOrder.Ascending },
+    { label: t('explore.rich-history.datasource-a-z', 'Data source A-Z'), value: SortOrder.DatasourceAZ },
+    { label: t('explore.rich-history.datasource-z-a', 'Data source Z-A'), value: SortOrder.DatasourceZA },
   ].filter((option) => supportedFeatures().availableFilters.includes(option.value));
 
-export interface RichHistoryProps extends Themeable2 {
+export interface RichHistoryProps {
   richHistory: RichHistoryQuery[];
   richHistoryTotal?: number;
   richHistorySettings: RichHistorySettings;
@@ -44,136 +45,120 @@ export interface RichHistoryProps extends Themeable2 {
   onClose: () => void;
 }
 
-type RichHistoryState = {
-  loading: boolean;
-};
-
-class UnThemedRichHistory extends PureComponent<RichHistoryProps> {
-  state: RichHistoryState = {
-    loading: false,
-  };
-
-  updateSettings = (settingsToUpdate: Partial<RichHistorySettings>) => {
-    this.props.updateHistorySettings({ ...this.props.richHistorySettings, ...settingsToUpdate });
+export function RichHistory(props: RichHistoryProps) {
+  const {
+    richHistory,
+    richHistoryTotal,
+    height,
+    exploreId,
+    deleteRichHistory,
+    onClose,
+    firstTab,
+    activeDatasourceInstance,
+  } = props;
+
+  const [loading, setLoading] = useState(false);
+
+  const updateSettings = (settingsToUpdate: Partial<RichHistorySettings>) => {
+    props.updateHistorySettings({ ...props.richHistorySettings, ...settingsToUpdate });
   };
 
-  updateFilters = (filtersToUpdate?: Partial<RichHistorySearchFilters>) => {
+  const updateFilters = (filtersToUpdate?: Partial<RichHistorySearchFilters>) => {
     const filters = {
-      ...this.props.richHistorySearchFilters!,
+      ...props.richHistorySearchFilters!,
       ...filtersToUpdate,
       page: 1, // always load fresh results when updating filters
     };
-    this.props.updateHistorySearchFilters(this.props.exploreId, filters);
-    this.loadRichHistory();
-  };
-
-  clearResults = () => {
-    this.props.clearRichHistoryResults(this.props.exploreId);
+    props.updateHistorySearchFilters(props.exploreId, filters);
+    loadRichHistory();
   };
 
-  loadRichHistory = debounce(() => {
-    this.props.loadRichHistory(this.props.exploreId);
-    this.setState({
-      loading: true,
-    });
+  const loadRichHistory = debounce(() => {
+    props.loadRichHistory(props.exploreId);
+    setLoading(true);
   }, 300);
 
-  onChangeRetentionPeriod = (retentionPeriod: SelectableValue<number>) => {
+  const onChangeRetentionPeriod = (retentionPeriod: SelectableValue<number>) => {
     if (retentionPeriod.value !== undefined) {
-      this.updateSettings({ retentionPeriod: retentionPeriod.value });
+      updateSettings({ retentionPeriod: retentionPeriod.value });
     }
   };
 
-  toggleStarredTabAsFirstTab = () =>
-    this.updateSettings({ starredTabAsFirstTab: !this.props.richHistorySettings.starredTabAsFirstTab });
-
-  toggleActiveDatasourceOnly = () =>
-    this.updateSettings({ activeDatasourceOnly: !this.props.richHistorySettings.activeDatasourceOnly });
-
-  componentDidUpdate(prevProps: Readonly<RichHistoryProps>) {
-    if (prevProps.richHistory !== this.props.richHistory) {
-      this.setState({
-        loading: false,
-      });
-    }
-  }
-
-  render() {
-    const {
-      richHistory,
-      richHistoryTotal,
-      height,
-      exploreId,
-      deleteRichHistory,
-      onClose,
-      firstTab,
-      activeDatasourceInstance,
-    } = this.props;
-    const { loading } = this.state;
-
-    const QueriesTab: TabConfig = {
-      label: 'Query history',
-      value: Tabs.RichHistory,
-      content: (
-        <RichHistoryQueriesTab
-          queries={richHistory}
-          totalQueries={richHistoryTotal || 0}
-          loading={loading}
-          updateFilters={this.updateFilters}
-          clearRichHistoryResults={() => this.props.clearRichHistoryResults(this.props.exploreId)}
-          loadMoreRichHistory={() => this.props.loadMoreRichHistory(this.props.exploreId)}
-          activeDatasourceInstance={activeDatasourceInstance}
-          richHistorySettings={this.props.richHistorySettings}
-          richHistorySearchFilters={this.props.richHistorySearchFilters}
-          exploreId={exploreId}
-          height={height}
-        />
-      ),
-      icon: 'history',
-    };
+  const toggleStarredTabAsFirstTab = () =>
+    updateSettings({ starredTabAsFirstTab: !props.richHistorySettings.starredTabAsFirstTab });
+
+  const toggleActiveDatasourceOnly = () =>
+    updateSettings({ activeDatasourceOnly: !props.richHistorySettings.activeDatasourceOnly });
+
+  useEffect(() => {
+    setLoading(false);
+  }, [richHistory]);
+
+  const QueriesTab: TabConfig = {
+    label: t('explore.rich-history.query-history', 'Query history'),
+    value: Tabs.RichHistory,
+    content: (
+      <RichHistoryQueriesTab
+        queries={richHistory}
+        totalQueries={richHistoryTotal || 0}
+        loading={loading}
+        updateFilters={updateFilters}
+        clearRichHistoryResults={() => props.clearRichHistoryResults(props.exploreId)}
+        loadMoreRichHistory={() => props.loadMoreRichHistory(props.exploreId)}
+        activeDatasourceInstance={activeDatasourceInstance}
+        richHistorySettings={props.richHistorySettings}
+        richHistorySearchFilters={props.richHistorySearchFilters}
+        exploreId={exploreId}
+        height={height}
+      />
+    ),
+    icon: 'history',
+  };
 
-    const StarredTab: TabConfig = {
-      label: 'Starred',
-      value: Tabs.Starred,
-      content: (
-        <RichHistoryStarredTab
-          queries={richHistory}
-          totalQueries={richHistoryTotal || 0}
-          loading={loading}
-          activeDatasourceInstance={activeDatasourceInstance}
-          updateFilters={this.updateFilters}
-          clearRichHistoryResults={() => this.props.clearRichHistoryResults(this.props.exploreId)}
-          loadMoreRichHistory={() => this.props.loadMoreRichHistory(this.props.exploreId)}
-          richHistorySettings={this.props.richHistorySettings}
-          richHistorySearchFilters={this.props.richHistorySearchFilters}
-          exploreId={exploreId}
-        />
-      ),
-      icon: 'star',
-    };
+  const StarredTab: TabConfig = {
+    label: t('explore.rich-history.starred', 'Starred'),
+    value: Tabs.Starred,
+    content: (
+      <RichHistoryStarredTab
+        queries={richHistory}
+        totalQueries={richHistoryTotal || 0}
+        loading={loading}
+        activeDatasourceInstance={activeDatasourceInstance}
+        updateFilters={updateFilters}
+        clearRichHistoryResults={() => props.clearRichHistoryResults(props.exploreId)}
+        loadMoreRichHistory={() => props.loadMoreRichHistory(props.exploreId)}
+        richHistorySettings={props.richHistorySettings}
+        richHistorySearchFilters={props.richHistorySearchFilters}
+        exploreId={exploreId}
+      />
+    ),
+    icon: 'star',
+  };
 
-    const SettingsTab: TabConfig = {
-      label: 'Settings',
-      value: Tabs.Settings,
-      content: (
-        <RichHistorySettingsTab
-          retentionPeriod={this.props.richHistorySettings.retentionPeriod}
-          starredTabAsFirstTab={this.props.richHistorySettings.starredTabAsFirstTab}
-          activeDatasourceOnly={this.props.richHistorySettings.activeDatasourceOnly}
-          onChangeRetentionPeriod={this.onChangeRetentionPeriod}
-          toggleStarredTabAsFirstTab={this.toggleStarredTabAsFirstTab}
-          toggleactiveDatasourceOnly={this.toggleActiveDatasourceOnly}
-          deleteRichHistory={deleteRichHistory}
-        />
-      ),
-      icon: 'sliders-v-alt',
-    };
+  const SettingsTab: TabConfig = {
+    label: t('explore.rich-history.settings', 'Settings'),
+    value: Tabs.Settings,
+    content: (
+      <RichHistorySettingsTab
+        retentionPeriod={props.richHistorySettings.retentionPeriod}
+        starredTabAsFirstTab={props.richHistorySettings.starredTabAsFirstTab}
+        activeDatasourceOnly={props.richHistorySettings.activeDatasourceOnly}
+        onChangeRetentionPeriod={onChangeRetentionPeriod}
+        toggleStarredTabAsFirstTab={toggleStarredTabAsFirstTab}
+        toggleactiveDatasourceOnly={toggleActiveDatasourceOnly}
+        deleteRichHistory={deleteRichHistory}
+      />
+    ),
+    icon: 'sliders-v-alt',
+  };
 
-    let tabs = [QueriesTab, StarredTab, SettingsTab];
-    return (
-      <TabbedContainer tabs={tabs} onClose={onClose} defaultTab={firstTab} closeIconTooltip="Close query history" />
-    );
-  }
+  let tabs = [QueriesTab, StarredTab, SettingsTab];
+  return (
+    <TabbedContainer
+      tabs={tabs}
+      onClose={onClose}
+      defaultTab={firstTab}
+      closeIconTooltip={t('explore.rich-history.close-tooltip', 'Close query history')}
+    />
+  );
 }
-
-export const RichHistory = withTheme2(UnThemedRichHistory);
diff --git a/public/app/features/explore/RichHistory/RichHistoryCard.test.tsx b/public/app/features/explore/RichHistory/RichHistoryCard.test.tsx
index d01a61d406b21..38650bb3f2cec 100644
--- a/public/app/features/explore/RichHistory/RichHistoryCard.test.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryCard.test.tsx
@@ -106,7 +106,7 @@ interface MockQuery extends DataQuery {
 
 const setup = (propOverrides?: Partial<Props<MockQuery>>) => {
   const props: Props<MockQuery> = {
-    query: {
+    queryHistoryItem: {
       id: '1',
       createdAt: 1,
       datasourceUid: 'loki',
@@ -170,7 +170,7 @@ describe('RichHistoryCard', () => {
 
   it('should render "Data source does not exist anymore" if removed data source', async () => {
     setup({
-      query: {
+      queryHistoryItem: {
         id: '2',
         createdAt: 1,
         datasourceUid: 'non-existent DS',
@@ -191,7 +191,7 @@ describe('RichHistoryCard', () => {
   describe('copy queries to clipboard', () => {
     it('should copy query model to clipboard when copying a query from a non existent datasource', async () => {
       setup({
-        query: {
+        queryHistoryItem: {
           id: '2',
           createdAt: 1,
           datasourceUid: 'non-existent DS',
@@ -210,7 +210,7 @@ describe('RichHistoryCard', () => {
 
     it('should copy query model to clipboard when copying a query from a datasource that does not implement getQueryDisplayText', async () => {
       setup({
-        query: {
+        queryHistoryItem: {
           id: '2',
           createdAt: 1,
           datasourceUid: 'loki',
@@ -229,7 +229,7 @@ describe('RichHistoryCard', () => {
 
     it('should copy query text to clipboard when copying a query from a datasource that implements getQueryDisplayText', async () => {
       setup({
-        query: {
+        queryHistoryItem: {
           id: '2',
           createdAt: 1,
           datasourceUid: 'prometheus',
@@ -248,7 +248,7 @@ describe('RichHistoryCard', () => {
 
     it('should use each datasource getQueryDisplayText when copying queries', async () => {
       setup({
-        query: {
+        queryHistoryItem: {
           id: '2',
           createdAt: 1,
           datasourceUid: 'mixed',
@@ -280,7 +280,7 @@ describe('RichHistoryCard', () => {
       setup({
         setQueries,
         changeDatasource,
-        query: {
+        queryHistoryItem: {
           id: '2',
           createdAt: 1,
           datasourceUid: 'mixed',
@@ -305,7 +305,7 @@ describe('RichHistoryCard', () => {
       setup({
         setQueries,
         changeDatasource,
-        query: {
+        queryHistoryItem: {
           id: '2',
           createdAt: 1,
           datasourceUid: 'nonexistent-ds',
@@ -330,7 +330,7 @@ describe('RichHistoryCard', () => {
       setup({
         setQueries,
         changeDatasource,
-        query: {
+        queryHistoryItem: {
           id: '2',
           createdAt: 1,
           datasourceUid: 'loki',
@@ -358,7 +358,7 @@ describe('RichHistoryCard', () => {
       setup({
         setQueries,
         changeDatasource,
-        query: {
+        queryHistoryItem: {
           id: '2',
           createdAt: 1,
           datasourceUid: 'mixed',
@@ -374,20 +374,20 @@ describe('RichHistoryCard', () => {
 
       await waitFor(() => {
         expect(setQueries).toHaveBeenCalledWith(expect.any(String), queries);
-        expect(changeDatasource).toHaveBeenCalledWith(expect.any(String), 'mixed');
+        expect(changeDatasource).toHaveBeenCalledWith({ datasource: 'mixed', exploreId: 'left' });
       });
     });
   });
 
   describe('commenting', () => {
     it('should render comment, if comment present', async () => {
-      setup({ query: starredQueryWithComment });
+      setup({ queryHistoryItem: starredQueryWithComment });
       const queryComment = await screen.findByLabelText('Query comment');
       expect(queryComment).toBeInTheDocument();
       expect(queryComment).toHaveTextContent('test comment');
     });
     it('should have title "Edit comment" at comment icon, if comment present', async () => {
-      setup({ query: starredQueryWithComment });
+      setup({ queryHistoryItem: starredQueryWithComment });
       const editComment = await screen.findByLabelText('Edit comment');
       const addComment = screen.queryByTitle('Add comment');
       expect(editComment).toBeInTheDocument();
@@ -401,14 +401,14 @@ describe('RichHistoryCard', () => {
       expect(editComment).not.toBeInTheDocument();
     });
     it('should open update comment form when edit comment button clicked', async () => {
-      setup({ query: starredQueryWithComment });
+      setup({ queryHistoryItem: starredQueryWithComment });
       const editComment = await screen.findByLabelText('Edit comment');
       await userEvent.click(editComment);
       const updateCommentForm = await screen.findByLabelText('Update comment form');
       expect(updateCommentForm).toBeInTheDocument();
     });
     it('should close update comment form when escape key pressed', async () => {
-      setup({ query: starredQueryWithComment });
+      setup({ queryHistoryItem: starredQueryWithComment });
       const editComment = await screen.findByLabelText('Edit comment');
       await userEvent.click(editComment);
       const updateCommentForm = await screen.findByLabelText('Update comment form');
@@ -420,7 +420,7 @@ describe('RichHistoryCard', () => {
       expect(findCommentForm).not.toBeInTheDocument();
     });
     it('should close update comment form when enter and shift keys pressed', async () => {
-      setup({ query: starredQueryWithComment });
+      setup({ queryHistoryItem: starredQueryWithComment });
       const editComment = await screen.findByLabelText('Edit comment');
       await userEvent.click(editComment);
       const updateCommentForm = await screen.findByLabelText('Update comment form');
@@ -433,7 +433,7 @@ describe('RichHistoryCard', () => {
       expect(findCommentForm).not.toBeInTheDocument();
     });
     it('should close update comment form when enter and ctrl keys pressed', async () => {
-      setup({ query: starredQueryWithComment });
+      setup({ queryHistoryItem: starredQueryWithComment });
       const editComment = await screen.findByLabelText('Edit comment');
       await userEvent.click(editComment);
       const updateCommentForm = await screen.findByLabelText('Update comment form');
@@ -446,7 +446,7 @@ describe('RichHistoryCard', () => {
       expect(findCommentForm).not.toBeInTheDocument();
     });
     it('should not close update comment form when enter key pressed', async () => {
-      setup({ query: starredQueryWithComment });
+      setup({ queryHistoryItem: starredQueryWithComment });
       const editComment = await screen.findByLabelText('Edit comment');
       await userEvent.click(editComment);
       const updateCommentForm = await screen.findByLabelText('Update comment form');
@@ -469,7 +469,7 @@ describe('RichHistoryCard', () => {
       expect(starRichHistoryMock).toBeCalledWith(starredQueryWithComment.id, true);
     });
     it('should have title "Unstar query", if not starred', async () => {
-      setup({ query: starredQueryWithComment });
+      setup({ queryHistoryItem: starredQueryWithComment });
       const unstarButton = await screen.findByLabelText('Unstar query');
       expect(unstarButton).toBeInTheDocument();
       await userEvent.click(unstarButton);
@@ -486,7 +486,7 @@ describe('RichHistoryCard', () => {
       expect(deleteRichHistoryMock).toBeCalledWith(starredQueryWithComment.id);
     });
     it('should display modal before deleting if starred', async () => {
-      setup({ query: starredQueryWithComment });
+      setup({ queryHistoryItem: starredQueryWithComment });
       const deleteButton = await screen.findByLabelText('Delete query');
       await userEvent.click(deleteButton);
       expect(deleteRichHistoryMock).not.toBeCalled();
diff --git a/public/app/features/explore/RichHistory/RichHistoryCard.tsx b/public/app/features/explore/RichHistory/RichHistoryCard.tsx
index 0f6d22249fb46..5823340f9d00a 100644
--- a/public/app/features/explore/RichHistory/RichHistoryCard.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryCard.tsx
@@ -9,6 +9,7 @@ import { DataQuery } from '@grafana/schema';
 import { TextArea, Button, IconButton, useStyles2, LoadingPlaceholder } from '@grafana/ui';
 import { notifyApp } from 'app/core/actions';
 import { createSuccessNotification } from 'app/core/copy/appNotification';
+import { Trans, t } from 'app/core/internationalization';
 import { copyStringToClipboard } from 'app/core/utils/explore';
 import { createUrlFromRichHistory, createQueryText } from 'app/core/utils/richHistory';
 import { createAndCopyShortLink } from 'app/core/utils/shortLinks';
@@ -40,7 +41,7 @@ const mapDispatchToProps = {
 const connector = connect(mapStateToProps, mapDispatchToProps);
 
 interface OwnProps<T extends DataQuery = DataQuery> {
-  query: RichHistoryQuery<T>;
+  queryHistoryItem: RichHistoryQuery<T>;
 }
 
 export type Props<T extends DataQuery = DataQuery> = ConnectedProps<typeof connector> & OwnProps<T>;
@@ -141,7 +142,7 @@ const getStyles = (theme: GrafanaTheme2) => {
 
 export function RichHistoryCard(props: Props) {
   const {
-    query,
+    queryHistoryItem,
     commentHistoryItem,
     starHistoryItem,
     deleteHistoryItem,
@@ -150,25 +151,26 @@ export function RichHistoryCard(props: Props) {
     datasourceInstance,
     setQueries,
   } = props;
+
   const [activeUpdateComment, setActiveUpdateComment] = useState(false);
-  const [comment, setComment] = useState<string | undefined>(query.comment);
-  const { value, loading } = useAsync(async () => {
-    let dsInstance: DataSourceApi | undefined;
+  const [comment, setComment] = useState<string | undefined>(queryHistoryItem.comment);
+  const { value: historyCardData, loading } = useAsync(async () => {
+    let datasourceInstance: DataSourceApi | undefined;
     try {
-      dsInstance = await getDataSourceSrv().get(query.datasourceUid);
+      datasourceInstance = await getDataSourceSrv().get(queryHistoryItem.datasourceUid);
     } catch (e) {}
 
     return {
-      dsInstance,
+      datasourceInstance,
       queries: await Promise.all(
-        query.queries.map(async (query) => {
+        queryHistoryItem.queries.map(async (query) => {
           let datasource;
-          if (dsInstance?.meta.mixed) {
+          if (datasourceInstance?.meta.mixed) {
             try {
               datasource = await getDataSourceSrv().get(query.datasource);
             } catch (e) {}
           } else {
-            datasource = dsInstance;
+            datasource = datasourceInstance;
           }
 
           return {
@@ -178,15 +180,15 @@ export function RichHistoryCard(props: Props) {
         })
       ),
     };
-  }, [query.datasourceUid, query.queries]);
+  }, [queryHistoryItem.datasourceUid, queryHistoryItem.queries]);
 
   const styles = useStyles2(getStyles);
 
   const onRunQuery = async () => {
-    const queriesToRun = query.queries;
-    const differentDataSource = query.datasourceUid !== datasourceInstance?.uid;
+    const queriesToRun = queryHistoryItem.queries;
+    const differentDataSource = queryHistoryItem.datasourceUid !== datasourceInstance?.uid;
     if (differentDataSource) {
-      await changeDatasource(exploreId, query.datasourceUid);
+      await changeDatasource({ exploreId, datasource: queryHistoryItem.datasourceUid });
     }
     setQueries(exploreId, queriesToRun);
 
@@ -197,68 +199,77 @@ export function RichHistoryCard(props: Props) {
   };
 
   const onCopyQuery = async () => {
-    const datasources = [...query.queries.map((q) => q.datasource?.type || 'unknown')];
+    const datasources = [...queryHistoryItem.queries.map((query) => query.datasource?.type || 'unknown')];
     reportInteraction('grafana_explore_query_history_copy_query', {
       datasources,
-      mixed: Boolean(value?.dsInstance?.meta.mixed),
+      mixed: Boolean(historyCardData?.datasourceInstance?.meta.mixed),
     });
 
-    if (loading || !value) {
+    if (loading || !historyCardData) {
       return;
     }
 
-    const queriesText = value.queries
-      .map((q) => {
-        return createQueryText(q.query, q.datasource);
+    const queriesText = historyCardData.queries
+      .map((query) => {
+        return createQueryText(query.query, query.datasource);
       })
       .join('\n');
 
     copyStringToClipboard(queriesText);
-    dispatch(notifyApp(createSuccessNotification('Query copied to clipboard')));
+    dispatch(
+      notifyApp(
+        createSuccessNotification(t('explore.rich-history-notification.query-copied', 'Query copied to clipboard'))
+      )
+    );
   };
 
   const onCreateShortLink = async () => {
-    const link = createUrlFromRichHistory(query);
+    const link = createUrlFromRichHistory(queryHistoryItem);
     await createAndCopyShortLink(link);
   };
 
   const onDeleteQuery = () => {
     const performDelete = (queryId: string) => {
       deleteHistoryItem(queryId);
-      dispatch(notifyApp(createSuccessNotification('Query deleted')));
+      dispatch(
+        notifyApp(createSuccessNotification(t('explore.rich-history-notification.query-deleted', 'Query deleted')))
+      );
       reportInteraction('grafana_explore_query_history_deleted', {
         queryHistoryEnabled: config.queryHistoryEnabled,
       });
     };
 
     // For starred queries, we want confirmation. For non-starred, we don't.
-    if (query.starred) {
+    if (queryHistoryItem.starred) {
       getAppEvents().publish(
         new ShowConfirmModalEvent({
-          title: 'Delete',
-          text: 'Are you sure you want to permanently delete your starred query?',
-          yesText: 'Delete',
+          title: t('explore.rich-history-card.delete-query-confirmation-title', 'Delete'),
+          text: t(
+            'explore.rich-history-card.delete-starred-query-confirmation-text',
+            'Are you sure you want to permanently delete your starred query?'
+          ),
+          yesText: t('explore.rich-history-card.confirm-delete', 'Delete'),
           icon: 'trash-alt',
-          onConfirm: () => performDelete(query.id),
+          onConfirm: () => performDelete(queryHistoryItem.id),
         })
       );
     } else {
-      performDelete(query.id);
+      performDelete(queryHistoryItem.id);
     }
   };
 
   const onStarrQuery = () => {
-    starHistoryItem(query.id, !query.starred);
+    starHistoryItem(queryHistoryItem.id, !queryHistoryItem.starred);
     reportInteraction('grafana_explore_query_history_starred', {
       queryHistoryEnabled: config.queryHistoryEnabled,
-      newValue: !query.starred,
+      newValue: !queryHistoryItem.starred,
     });
   };
 
   const toggleActiveUpdateComment = () => setActiveUpdateComment(!activeUpdateComment);
 
   const onUpdateComment = () => {
-    commentHistoryItem(query.id, comment);
+    commentHistoryItem(queryHistoryItem.id, comment);
     setActiveUpdateComment(false);
     reportInteraction('grafana_explore_query_history_commented', {
       queryHistoryEnabled: config.queryHistoryEnabled,
@@ -267,7 +278,7 @@ export function RichHistoryCard(props: Props) {
 
   const onCancelUpdateComment = () => {
     setActiveUpdateComment(false);
-    setComment(query.comment);
+    setComment(queryHistoryItem.comment);
   };
 
   const onKeyDown = (keyEvent: React.KeyboardEvent) => {
@@ -281,18 +292,31 @@ export function RichHistoryCard(props: Props) {
   };
 
   const updateComment = (
-    <div className={styles.updateCommentContainer} aria-label={comment ? 'Update comment form' : 'Add comment form'}>
+    <div
+      className={styles.updateCommentContainer}
+      aria-label={
+        comment
+          ? t('explore.rich-history-card.update-comment-form', 'Update comment form')
+          : t('explore.rich-history-card.add-comment-form', 'Add comment form')
+      }
+    >
       <TextArea
         onKeyDown={onKeyDown}
         value={comment}
-        placeholder={comment ? undefined : 'An optional description of what the query does.'}
+        placeholder={
+          comment
+            ? undefined
+            : t('explore.rich-history-card.optional-description', 'An optional description of what the query does.')
+        }
         onChange={(e) => setComment(e.currentTarget.value)}
         className={styles.textArea}
       />
       <div className={styles.commentButtonRow}>
-        <Button onClick={onUpdateComment}>Save comment</Button>
+        <Button onClick={onUpdateComment}>
+          <Trans i18nKey="explore.rich-history-card.save-comment">Save comment</Trans>
+        </Button>
         <Button variant="secondary" onClick={onCancelUpdateComment}>
-          Cancel
+          <Trans i18nKey="explore.rich-history-card.cancel">Cancel</Trans>
         </Button>
       </div>
     </div>
@@ -303,18 +327,43 @@ export function RichHistoryCard(props: Props) {
       <IconButton
         name="comment-alt"
         onClick={toggleActiveUpdateComment}
-        tooltip={query.comment?.length > 0 ? 'Edit comment' : 'Add comment'}
+        tooltip={
+          queryHistoryItem.comment?.length > 0
+            ? t('explore.rich-history-card.edit-comment-tooltip', 'Edit comment')
+            : t('explore.rich-history-card.add-comment-tooltip', 'Add comment')
+        }
+      />
+      <IconButton
+        name="copy"
+        onClick={onCopyQuery}
+        tooltip={t('explore.rich-history-card.copy-query-tooltip', 'Copy query to clipboard')}
       />
-      <IconButton name="copy" onClick={onCopyQuery} tooltip="Copy query to clipboard" />
-      {value?.dsInstance && (
-        <IconButton name="share-alt" onClick={onCreateShortLink} tooltip="Copy shortened link to clipboard" />
+      {historyCardData?.datasourceInstance && (
+        <IconButton
+          name="share-alt"
+          onClick={onCreateShortLink}
+          tooltip={
+            <Trans i18nKey="explore.rich-history-card.copy-shortened-link-tooltip">
+              Copy shortened link to clipboard
+            </Trans>
+          }
+        />
       )}
-      <IconButton name="trash-alt" title="Delete query" tooltip="Delete query" onClick={onDeleteQuery} />
       <IconButton
-        name={query.starred ? 'favorite' : 'star'}
-        iconType={query.starred ? 'mono' : 'default'}
+        name="trash-alt"
+        title={t('explore.rich-history-card.delete-query-title', 'Delete query')}
+        tooltip={t('explore.rich-history-card.delete-query-tooltip', 'Delete query')}
+        onClick={onDeleteQuery}
+      />
+      <IconButton
+        name={queryHistoryItem.starred ? 'favorite' : 'star'}
+        iconType={queryHistoryItem.starred ? 'mono' : 'default'}
         onClick={onStarrQuery}
-        tooltip={query.starred ? 'Unstar query' : 'Star query'}
+        tooltip={
+          queryHistoryItem.starred
+            ? t('explore.rich-history-card.unstar-query-tooltip', 'Unstar query')
+            : t('explore.rich-history-card.star-query-tooltip', 'Star query')
+        }
       />
     </div>
   );
@@ -322,18 +371,21 @@ export function RichHistoryCard(props: Props) {
   return (
     <div className={styles.queryCard}>
       <div className={styles.cardRow}>
-        <DatasourceInfo dsApi={value?.dsInstance} size="sm" />
+        <DatasourceInfo dsApi={historyCardData?.datasourceInstance} size="sm" />
 
         {queryActionButtons}
       </div>
       <div className={cx(styles.cardRow)}>
         <div className={styles.queryContainer}>
-          {value?.queries.map((q, i) => {
-            return <Query query={q} key={`${q}-${i}`} showDsInfo={value?.dsInstance?.meta.mixed} />;
+          {historyCardData?.queries.map((q, i) => {
+            return <Query query={q} key={`${q}-${i}`} showDsInfo={historyCardData?.datasourceInstance?.meta.mixed} />;
           })}
-          {!activeUpdateComment && query.comment && (
-            <div aria-label="Query comment" className={styles.comment}>
-              {query.comment}
+          {!activeUpdateComment && queryHistoryItem.comment && (
+            <div
+              aria-label={t('explore.rich-history-card.query-comment-label', 'Query comment')}
+              className={styles.comment}
+            >
+              {queryHistoryItem.comment}
             </div>
           )}
           {activeUpdateComment && updateComment}
@@ -343,14 +395,27 @@ export function RichHistoryCard(props: Props) {
             <Button
               variant="secondary"
               onClick={onRunQuery}
-              disabled={!value?.dsInstance || value.queries.some((query) => !query.datasource)}
+              disabled={
+                !historyCardData?.datasourceInstance || historyCardData.queries.some((query) => !query.datasource)
+              }
             >
-              {datasourceInstance?.uid === query.datasourceUid ? 'Run query' : 'Switch data source and run query'}
+              {datasourceInstance?.uid === queryHistoryItem.datasourceUid ? (
+                <Trans i18nKey="explore.rich-history-card.run-query-button">Run query</Trans>
+              ) : (
+                <Trans i18nKey="explore.rich-history-card.switch-datasource-button">
+                  Switch data source and run query
+                </Trans>
+              )}
             </Button>
           </div>
         )}
       </div>
-      {loading && <LoadingPlaceholder text="loading..." className={styles.loader} />}
+      {loading && (
+        <LoadingPlaceholder
+          text={t('explore.rich-history-card.loading-text', 'loading...')}
+          className={styles.loader}
+        />
+      )}
     </div>
   );
 }
@@ -395,7 +460,7 @@ const Query = ({ query, showDsInfo = false }: QueryProps) => {
           {': '}
         </div>
       )}
-      <span aria-label="Query text" className={styles.queryText}>
+      <span aria-label={t('explore.rich-history-card.query-text-label', 'Query text')} className={styles.queryText}>
         {createQueryText(query.query, query.datasource)}
       </span>
     </div>
@@ -418,10 +483,12 @@ function DatasourceInfo({ dsApi, size }: { dsApi?: DataSourceApi; size: 'sm' | '
     <div className={styles}>
       <img
         src={dsApi?.meta.info.logos.small || 'public/img/icn-datasource.svg'}
-        alt={dsApi?.type || 'Data source does not exist anymore'}
-        aria-label="Data source icon"
+        alt={dsApi?.type || t('explore.rich-history-card.datasource-not-exist', 'Data source does not exist anymore')}
+        aria-label={t('explore.rich-history-card.datasource-icon-label', 'Data source icon')}
       />
-      <div aria-label="Data source name">{dsApi?.name || 'Data source does not exist anymore'}</div>
+      <div aria-label={t('explore.rich-history-card.datasource-name-label', 'Data source name')}>
+        {dsApi?.name || t('explore.rich-history-card.datasource-not-exist', 'Data source does not exist anymore')}
+      </div>
     </div>
   );
 }
diff --git a/public/app/features/explore/RichHistory/RichHistoryContainer.tsx b/public/app/features/explore/RichHistory/RichHistoryContainer.tsx
index e520ee1cb60c3..60a435586aae7 100644
--- a/public/app/features/explore/RichHistory/RichHistoryContainer.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryContainer.tsx
@@ -4,6 +4,7 @@ import { connect, ConnectedProps } from 'react-redux';
 
 import { config, reportInteraction } from '@grafana/runtime';
 import { useTheme2 } from '@grafana/ui';
+import { Trans } from 'app/core/internationalization';
 // Types
 import { ExploreItemState, StoreState } from 'app/types';
 
@@ -91,7 +92,11 @@ export function RichHistoryContainer(props: Props) {
   }, [initRichHistory]);
 
   if (!richHistorySettings) {
-    return <span>Loading...</span>;
+    return (
+      <span>
+        <Trans i18nKey="explore.rich-history-container.loading">Loading...</Trans>
+      </span>
+    );
   }
 
   return (
diff --git a/public/app/features/explore/RichHistory/RichHistoryQueriesTab.tsx b/public/app/features/explore/RichHistory/RichHistoryQueriesTab.tsx
index a72bd1d9b658a..7a7b5cc9d0e98 100644
--- a/public/app/features/explore/RichHistory/RichHistoryQueriesTab.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryQueriesTab.tsx
@@ -4,6 +4,7 @@ import React, { useEffect } from 'react';
 import { GrafanaTheme2, SelectableValue } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { Button, FilterInput, MultiSelect, RangeSlider, Select, useStyles2 } from '@grafana/ui';
+import { Trans, t } from 'app/core/internationalization';
 import {
   createDatasourcesList,
   mapNumbertoTimeInSlider,
@@ -93,9 +94,9 @@ const getStyles = (theme: GrafanaTheme2, height: number) => {
     `,
     footer: css`
       height: 60px;
-      margin: ${theme.spacing(3)} auto;
       display: flex;
       justify-content: center;
+      align-items: center;
       font-weight: ${theme.typography.fontWeightLight};
       font-size: ${theme.typography.bodySmall.fontSize};
       a {
@@ -152,7 +153,11 @@ export function RichHistoryQueriesTab(props: RichHistoryQueriesTabProps) {
   }, []);
 
   if (!richHistorySearchFilters) {
-    return <span>Loading...</span>;
+    return (
+      <span>
+        <Trans i18nKey="explore.rich-history-queries-tab.loading">Loading...</Trans>;
+      </span>
+    );
   }
 
   /* mappedQueriesToHeadings is an object where query headings (stringified dates/data sources)
@@ -161,19 +166,25 @@ export function RichHistoryQueriesTab(props: RichHistoryQueriesTabProps) {
   const mappedQueriesToHeadings = mapQueriesToHeadings(queries, richHistorySearchFilters.sortOrder);
   const sortOrderOptions = getSortOrderOptions();
   const partialResults = queries.length && queries.length !== totalQueries;
+  const timeFilter = [
+    richHistorySearchFilters.from || 0,
+    richHistorySearchFilters.to || richHistorySettings.retentionPeriod,
+  ];
 
   return (
     <div className={styles.container}>
       <div className={styles.containerSlider}>
         <div className={styles.fixedSlider}>
-          <div className={styles.labelSlider}>Filter history</div>
-          <div className={styles.labelSlider}>{mapNumbertoTimeInSlider(richHistorySearchFilters.from)}</div>
+          <div className={styles.labelSlider}>
+            <Trans i18nKey="explore.rich-history-queries-tab.filter-history">Filter history</Trans>
+          </div>
+          <div className={styles.labelSlider}>{mapNumbertoTimeInSlider(timeFilter[0])}</div>
           <div className={styles.slider}>
             <RangeSlider
               tooltipAlwaysVisible={false}
               min={0}
               max={richHistorySettings.retentionPeriod}
-              value={[richHistorySearchFilters.from, richHistorySearchFilters.to]}
+              value={timeFilter}
               orientation="vertical"
               formatTooltipResult={mapNumbertoTimeInSlider}
               reverse={true}
@@ -182,7 +193,7 @@ export function RichHistoryQueriesTab(props: RichHistoryQueriesTabProps) {
               }}
             />
           </div>
-          <div className={styles.labelSlider}>{mapNumbertoTimeInSlider(richHistorySearchFilters.to)}</div>
+          <div className={styles.labelSlider}>{mapNumbertoTimeInSlider(timeFilter[1])}</div>
         </div>
       </div>
 
@@ -195,8 +206,11 @@ export function RichHistoryQueriesTab(props: RichHistoryQueriesTabProps) {
                 return { value: ds.name, label: ds.name };
               })}
               value={richHistorySearchFilters.datasourceFilters}
-              placeholder="Filter queries for data sources(s)"
-              aria-label="Filter queries for data sources(s)"
+              placeholder={t(
+                'explore.rich-history-queries-tab.filter-placeholder',
+                'Filter queries for data sources(s)'
+              )}
+              aria-label={t('explore.rich-history-queries-tab.filter-aria-label', 'Filter queries for data sources(s)')}
               onChange={(options: SelectableValue[]) => {
                 updateFilters({ datasourceFilters: options.map((option) => option.value) });
               }}
@@ -205,22 +219,29 @@ export function RichHistoryQueriesTab(props: RichHistoryQueriesTabProps) {
           <div className={styles.filterInput}>
             <FilterInput
               escapeRegex={false}
-              placeholder="Search queries"
+              placeholder={t('explore.rich-history-queries-tab.search-placeholder', 'Search queries')}
               value={richHistorySearchFilters.search}
               onChange={(search: string) => updateFilters({ search })}
             />
           </div>
-          <div aria-label="Sort queries" className={styles.sort}>
+          <div
+            aria-label={t('explore.rich-history-queries-tab.sort-aria-label', 'Sort queries')}
+            className={styles.sort}
+          >
             <Select
               value={sortOrderOptions.filter((order) => order.value === richHistorySearchFilters.sortOrder)}
               options={sortOrderOptions}
-              placeholder="Sort queries by"
+              placeholder={t('explore.rich-history-queries-tab.sort-placeholder', 'Sort queries by')}
               onChange={(e: SelectableValue<SortOrder>) => updateFilters({ sortOrder: e.value })}
             />
           </div>
         </div>
 
-        {loading && <span>Loading results...</span>}
+        {loading && (
+          <span>
+            <Trans i18nKey="explore.rich-history-queries-tab.loading-results">Loading results...</Trans>
+          </span>
+        )}
 
         {!loading &&
           Object.keys(mappedQueriesToHeadings).map((heading) => {
@@ -229,23 +250,48 @@ export function RichHistoryQueriesTab(props: RichHistoryQueriesTabProps) {
                 <div className={styles.heading}>
                   {heading}{' '}
                   <span className={styles.queries}>
-                    {partialResults ? 'Displaying ' : ''}
-                    {mappedQueriesToHeadings[heading].length} queries
+                    {partialResults ? (
+                      <Trans
+                        i18nKey="explore.rich-history-queries-tab.displaying-partial-queries"
+                        defaults="Displaying {{ count }} queries"
+                        values={{ count: mappedQueriesToHeadings[heading].length }}
+                      />
+                    ) : (
+                      <Trans
+                        i18nKey="explore.rich-history-queries-tab.displaying-queries"
+                        defaults="{{ count }} queries"
+                        values={{ count: mappedQueriesToHeadings[heading].length }}
+                      />
+                    )}
                   </span>
                 </div>
                 {mappedQueriesToHeadings[heading].map((q) => {
-                  return <RichHistoryCard query={q} key={q.id} exploreId={exploreId} />;
+                  return <RichHistoryCard queryHistoryItem={q} key={q.id} exploreId={exploreId} />;
                 })}
               </div>
             );
           })}
         {partialResults ? (
           <div>
-            Showing {queries.length} of {totalQueries} <Button onClick={loadMoreRichHistory}>Load more</Button>
+            <Trans
+              i18nKey="explore.rich-history-queries-tab.showing-queries"
+              defaults="Showing {{ shown }} of {{ total }} <0>Load more</0>"
+              values={{ shown: queries.length, total: totalQueries }}
+              components={[
+                <Button onClick={loadMoreRichHistory} key="loadMoreButton">
+                  Load more
+                </Button>,
+              ]}
+            />
           </div>
         ) : null}
         <div className={styles.footer}>
-          {!config.queryHistoryEnabled ? 'The history is local to your browser and is not shared with others.' : ''}
+          {!config.queryHistoryEnabled
+            ? t(
+                'explore.rich-history-queries-tab.history-local',
+                'The history is local to your browser and is not shared with others.'
+              )
+            : ''}
         </div>
       </div>
     </div>
diff --git a/public/app/features/explore/RichHistory/RichHistorySettingsTab.tsx b/public/app/features/explore/RichHistory/RichHistorySettingsTab.tsx
index 4280d334f09c0..5da70895364aa 100644
--- a/public/app/features/explore/RichHistory/RichHistorySettingsTab.tsx
+++ b/public/app/features/explore/RichHistory/RichHistorySettingsTab.tsx
@@ -7,6 +7,7 @@ import { useStyles2, Select, Button, Field, InlineField, InlineSwitch, Alert } f
 import { notifyApp } from 'app/core/actions';
 import { createSuccessNotification } from 'app/core/copy/appNotification';
 import { MAX_HISTORY_ITEMS } from 'app/core/history/RichHistoryLocalStorage';
+import { Trans, t } from 'app/core/internationalization';
 import { dispatch } from 'app/store/store';
 
 import { supportedFeatures } from '../../../core/history/richHistoryStorageProvider';
@@ -43,10 +44,10 @@ const getStyles = (theme: GrafanaTheme2) => {
 };
 
 const retentionPeriodOptions = [
-  { value: 2, label: '2 days' },
-  { value: 5, label: '5 days' },
-  { value: 7, label: '1 week' },
-  { value: 14, label: '2 weeks' },
+  { value: 2, label: t('explore.rich-history-settings-tab.retention-period.2-days', '2 days') },
+  { value: 5, label: t('explore.rich-history-settings-tab.retention-period.5-days', '5 days') },
+  { value: 7, label: t('explore.rich-history-settings-tab.retention-period.1-week', '1 week') },
+  { value: 14, label: t('explore.rich-history-settings-tab.retention-period.2-weeks', '2 weeks') },
 ];
 
 export function RichHistorySettingsTab(props: RichHistorySettingsProps) {
@@ -65,13 +66,22 @@ export function RichHistorySettingsTab(props: RichHistorySettingsProps) {
   const onDelete = () => {
     getAppEvents().publish(
       new ShowConfirmModalEvent({
-        title: 'Delete',
-        text: 'Are you sure you want to permanently delete your query history?',
-        yesText: 'Delete',
+        title: t('explore.rich-history-settings-tab.delete-title', 'Delete'),
+        text: t(
+          'explore.rich-history-settings-tab.delete-confirm-text',
+          'Are you sure you want to permanently delete your query history?'
+        ),
+        yesText: t('explore.rich-history-settings-tab.delete-confirm', 'Delete'),
         icon: 'trash-alt',
         onConfirm: () => {
           deleteRichHistory();
-          dispatch(notifyApp(createSuccessNotification('Query history deleted')));
+          dispatch(
+            notifyApp(
+              createSuccessNotification(
+                t('explore.rich-history-settings-tab.query-history-deleted', 'Query history deleted')
+              )
+            )
+          );
         },
       })
     );
@@ -81,20 +91,33 @@ export function RichHistorySettingsTab(props: RichHistorySettingsProps) {
     <div className={styles.container}>
       {supportedFeatures().changeRetention ? (
         <Field
-          label="History time span"
-          description={`Select the period of time for which Grafana will save your query history. Up to ${MAX_HISTORY_ITEMS} entries will be stored.`}
+          label={t('explore.rich-history-settings-tab.history-time-span', 'History time span')}
+          description={t(
+            'explore.rich-history-settings-tab.history-time-span-description',
+            'Select the period of time for which Grafana will save your query history. Up to {{MAX_HISTORY_ITEMS}} entries will be stored.',
+            { MAX_HISTORY_ITEMS }
+          )}
         >
           <div className={styles.input}>
             <Select value={selectedOption} options={retentionPeriodOptions} onChange={onChangeRetentionPeriod}></Select>
           </div>
         </Field>
       ) : (
-        <Alert severity="info" title="History time span">
-          Grafana will keep entries up to {selectedOption?.label}. Starred entries won&apos;t be deleted.
+        <Alert severity="info" title={t('explore.rich-history-settings-tab.history-time-span', 'History time span')}>
+          {t(
+            'explore.rich-history-settings-tab.alert-info',
+            "Grafana will keep entries up to {{optionLabel}}.Starred entries won't be deleted.",
+            {
+              optionLabel: selectedOption?.label,
+            }
+          )}
         </Alert>
       )}
       <InlineField
-        label="Change the default active tab from “Query history” to “Starred”"
+        label={t(
+          'explore.rich-history-settings-tab.change-default-tab',
+          'Change the default active tab from “Query history” to “Starred”'
+        )}
         className={styles.spaceBetween}
       >
         <InlineSwitch
@@ -105,7 +128,10 @@ export function RichHistorySettingsTab(props: RichHistorySettingsProps) {
       </InlineField>
       {supportedFeatures().onlyActiveDataSource && (
         <InlineField
-          label="Only show queries for data source currently active in Explore"
+          label={t(
+            'explore.rich-history-settings-tab.only-show-active-datasource',
+            'Only show queries for data source currently active in Explore'
+          )}
           className={styles.spaceBetween}
         >
           <InlineSwitch
@@ -117,10 +143,16 @@ export function RichHistorySettingsTab(props: RichHistorySettingsProps) {
       )}
       {supportedFeatures().clearHistory && (
         <div>
-          <div className={styles.bold}>Clear query history</div>
-          <div className={styles.bottomMargin}>Delete all of your query history, permanently.</div>
+          <div className={styles.bold}>
+            <Trans i18nKey="explore.rich-history-settings-tab.clear-query-history">Clear query history</Trans>
+          </div>
+          <div className={styles.bottomMargin}>
+            <Trans i18nKey="explore.rich-history-settings-tab.clear-history-info">
+              Delete all of your query history, permanently.
+            </Trans>
+          </div>
           <Button variant="destructive" onClick={onDelete}>
-            Clear query history
+            <Trans i18nKey="explore.rich-history-settings-tab.clear-query-history-button">Clear query history</Trans>
           </Button>
         </div>
       )}
diff --git a/public/app/features/explore/RichHistory/RichHistoryStarredTab.tsx b/public/app/features/explore/RichHistory/RichHistoryStarredTab.tsx
index 1cd19952e3409..c8b824da52dc2 100644
--- a/public/app/features/explore/RichHistory/RichHistoryStarredTab.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryStarredTab.tsx
@@ -4,6 +4,7 @@ import React, { useEffect } from 'react';
 import { GrafanaTheme2, SelectableValue } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { useStyles2, Select, MultiSelect, FilterInput, Button } from '@grafana/ui';
+import { Trans, t } from 'app/core/internationalization';
 import {
   createDatasourcesList,
   SortOrder,
@@ -53,9 +54,9 @@ const getStyles = (theme: GrafanaTheme2) => {
     `,
     footer: css`
       height: 60px;
-      margin-top: ${theme.spacing(3)};
       display: flex;
       justify-content: center;
+      align-items: center;
       font-weight: ${theme.typography.fontWeightLight};
       font-size: ${theme.typography.bodySmall.fontSize};
       a {
@@ -105,7 +106,11 @@ export function RichHistoryStarredTab(props: RichHistoryStarredTabProps) {
   }, []);
 
   if (!richHistorySearchFilters) {
-    return <span>Loading...</span>;
+    return (
+      <span>
+        <Trans i18nKey="explore.rich-history-starred-tab.loading">Loading...</Trans>;
+      </span>
+    );
   }
 
   const sortOrderOptions = getSortOrderOptions();
@@ -121,8 +126,14 @@ export function RichHistoryStarredTab(props: RichHistoryStarredTabProps) {
                 return { value: ds.name, label: ds.name };
               })}
               value={richHistorySearchFilters.datasourceFilters}
-              placeholder="Filter queries for data sources(s)"
-              aria-label="Filter queries for data sources(s)"
+              placeholder={t(
+                'explore.rich-history-starred-tab.filter-queries-placeholder',
+                'Filter queries for data sources(s)'
+              )}
+              aria-label={t(
+                'explore.rich-history-starred-tab.filter-queries-aria-label',
+                'Filter queries for data sources(s)'
+              )}
               onChange={(options: SelectableValue[]) => {
                 updateFilters({ datasourceFilters: options.map((option) => option.value) });
               }}
@@ -131,32 +142,53 @@ export function RichHistoryStarredTab(props: RichHistoryStarredTabProps) {
           <div className={styles.filterInput}>
             <FilterInput
               escapeRegex={false}
-              placeholder="Search queries"
+              placeholder={t('explore.rich-history-starred-tab.search-queries-placeholder', 'Search queries')}
               value={richHistorySearchFilters.search}
               onChange={(search: string) => updateFilters({ search })}
             />
           </div>
-          <div aria-label="Sort queries" className={styles.sort}>
+          <div
+            aria-label={t('explore.rich-history-starred-tab.sort-queries-aria-label', 'Sort queries')}
+            className={styles.sort}
+          >
             <Select
               value={sortOrderOptions.filter((order) => order.value === richHistorySearchFilters.sortOrder)}
               options={sortOrderOptions}
-              placeholder="Sort queries by"
+              placeholder={t('explore.rich-history-starred-tab.sort-queries-placeholder', 'Sort queries by')}
               onChange={(e: SelectableValue<SortOrder>) => updateFilters({ sortOrder: e.value })}
             />
           </div>
         </div>
-        {loading && <span>Loading results...</span>}
+        {loading && (
+          <span>
+            <Trans i18nKey="explore.rich-history-starred-tab.loading-results">Loading results...</Trans>
+          </span>
+        )}
         {!loading &&
           queries.map((q) => {
-            return <RichHistoryCard query={q} key={q.id} exploreId={exploreId} />;
+            return <RichHistoryCard queryHistoryItem={q} key={q.id} exploreId={exploreId} />;
           })}
         {queries.length && queries.length !== totalQueries ? (
           <div>
-            Showing {queries.length} of {totalQueries} <Button onClick={loadMoreRichHistory}>Load more</Button>
+            <Trans
+              i18nKey="explore.rich-history-starred-tab.showing-queries"
+              defaults="Showing {{ shown }} of {{ total }} <0>Load more</0>"
+              values={{ shown: queries.length, total: totalQueries }}
+              components={[
+                <Button onClick={loadMoreRichHistory} key="loadMoreButton">
+                  Load more
+                </Button>,
+              ]}
+            />
           </div>
         ) : null}
         <div className={styles.footer}>
-          {!config.queryHistoryEnabled ? 'The history is local to your browser and is not shared with others.' : ''}
+          {!config.queryHistoryEnabled
+            ? t(
+                'explore.rich-history-starred-tab.local-history-message',
+                'The history is local to your browser and is not shared with others.'
+              )
+            : ''}
         </div>
       </div>
     </div>
diff --git a/public/app/features/explore/SecondaryActions.tsx b/public/app/features/explore/SecondaryActions.tsx
index b7ee906560880..d5c29d43e2ece 100644
--- a/public/app/features/explore/SecondaryActions.tsx
+++ b/public/app/features/explore/SecondaryActions.tsx
@@ -4,6 +4,7 @@ import React from 'react';
 import { GrafanaTheme2 } from '@grafana/data';
 import { Components } from '@grafana/e2e-selectors';
 import { ToolbarButton, useTheme2 } from '@grafana/ui';
+import { t, Trans } from 'app/core/internationalization';
 
 type Props = {
   addQueryRowButtonDisabled?: boolean;
@@ -19,12 +20,12 @@ type Props = {
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
-    containerMargin: css`
-      display: flex;
-      flex-wrap: wrap;
-      gap: ${theme.spacing(1)};
-      margin-top: ${theme.spacing(2)};
-    `,
+    containerMargin: css({
+      display: 'flex',
+      flexWrap: 'wrap',
+      gap: theme.spacing(1),
+      marginTop: theme.spacing(2),
+    }),
   };
 };
 
@@ -36,32 +37,32 @@ export function SecondaryActions(props: Props) {
       {!props.addQueryRowButtonHidden && (
         <ToolbarButton
           variant="canvas"
-          aria-label="Add query"
+          aria-label={t('explore.secondary-actions.query-add-button-aria-label', 'Add query')}
           onClick={props.onClickAddQueryRowButton}
           disabled={props.addQueryRowButtonDisabled}
           icon="plus"
         >
-          Add query
+          <Trans i18nKey="explore.secondary-actions.query-add-button">Add query</Trans>
         </ToolbarButton>
       )}
       {!props.richHistoryRowButtonHidden && (
         <ToolbarButton
           variant={props.richHistoryButtonActive ? 'active' : 'canvas'}
-          aria-label="Query history"
+          aria-label={t('explore.secondary-actions.query-history-button-aria-label', 'Query history')}
           onClick={props.onClickRichHistoryButton}
           data-testid={Components.QueryTab.queryHistoryButton}
           icon="history"
         >
-          Query history
+          <Trans i18nKey="explore.secondary-actions.query-history-button">Query history</Trans>
         </ToolbarButton>
       )}
       <ToolbarButton
         variant={props.queryInspectorButtonActive ? 'active' : 'canvas'}
-        aria-label="Query inspector"
+        aria-label={t('explore.secondary-actions.query-inspector-button-aria-label', 'Query inspector')}
         onClick={props.onClickQueryInspectorButton}
         icon="info-circle"
       >
-        Query inspector
+        <Trans i18nKey="explore.secondary-actions.query-inspector-button">Query inspector</Trans>
       </ToolbarButton>
     </div>
   );
diff --git a/public/app/features/explore/ShortLinkButtonMenu.tsx b/public/app/features/explore/ShortLinkButtonMenu.tsx
new file mode 100644
index 0000000000000..5c7bebcc00f9a
--- /dev/null
+++ b/public/app/features/explore/ShortLinkButtonMenu.tsx
@@ -0,0 +1,157 @@
+import React, { useState } from 'react';
+
+import { IconName } from '@grafana/data';
+import { reportInteraction, config } from '@grafana/runtime';
+import { ToolbarButton, Dropdown, Menu, Stack, ToolbarButtonRow, MenuGroup } from '@grafana/ui';
+import { t } from 'app/core/internationalization';
+import { copyStringToClipboard } from 'app/core/utils/explore';
+import { createAndCopyShortLink } from 'app/core/utils/shortLinks';
+import { useSelector } from 'app/types';
+
+import { selectPanes } from './state/selectors';
+import { constructAbsoluteUrl } from './utils/links';
+
+interface ShortLinkGroupData {
+  key: string;
+  label: string;
+  items: ShortLinkMenuItemData[];
+}
+
+interface ShortLinkMenuItemData {
+  key: string;
+  label: string;
+  icon: IconName;
+  getUrl: Function;
+  shorten: boolean;
+  absTime: boolean;
+}
+
+const defaultMode: ShortLinkMenuItemData = {
+  key: 'copy-link',
+  label: t('explore.toolbar.copy-shortened-link', 'Copy shortened URL'),
+  icon: 'share-alt',
+  getUrl: () => undefined,
+  shorten: true,
+  absTime: false,
+};
+
+export function ShortLinkButtonMenu() {
+  const panes = useSelector(selectPanes);
+  const [isOpen, setIsOpen] = useState(false);
+  const [lastSelected, setLastSelected] = useState(defaultMode);
+  const onCopyLink = (shorten: boolean, absTime: boolean, url?: string) => {
+    if (shorten) {
+      createAndCopyShortLink(url || global.location.href);
+      reportInteraction('grafana_explore_shortened_link_clicked', { isAbsoluteTime: absTime });
+    } else {
+      copyStringToClipboard(
+        url !== undefined
+          ? `${window.location.protocol}//${window.location.host}${config.appSubUrl}${url}`
+          : global.location.href
+      );
+      reportInteraction('grafana_explore_copy_link_clicked', { isAbsoluteTime: absTime });
+    }
+  };
+
+  const menuOptions: ShortLinkGroupData[] = [
+    {
+      key: 'normal',
+      label: t('explore.toolbar.copy-links-normal-category', 'Normal URL links'),
+      items: [
+        {
+          key: 'copy-shortened-link',
+          icon: 'link',
+          label: t('explore.toolbar.copy-shortened-link', 'Copy shortened URL'),
+          getUrl: () => undefined,
+          shorten: true,
+          absTime: false,
+        },
+        {
+          key: 'copy-link',
+          icon: 'link',
+          label: t('explore.toolbar.copy-link', 'Copy URL'),
+          getUrl: () => undefined,
+          shorten: false,
+          absTime: false,
+        },
+      ],
+    },
+    {
+      key: 'timesync',
+      label: t('explore.toolbar.copy-links-absolute-category', 'Time-sync URL links (share with time range intact)'),
+      items: [
+        {
+          key: 'copy-short-link-abs-time',
+          icon: 'clock-nine',
+          label: t('explore.toolbar.copy-shortened-link-abs-time', 'Copy Absolute Shortened URL'),
+          shorten: true,
+          getUrl: () => {
+            return constructAbsoluteUrl(panes);
+          },
+          absTime: true,
+        },
+        {
+          key: 'copy-link-abs-time',
+          icon: 'clock-nine',
+          label: t('explore.toolbar.copy-link-abs-time', 'Copy Absolute Shortened URL'),
+          shorten: false,
+          getUrl: () => {
+            return constructAbsoluteUrl(panes);
+          },
+          absTime: true,
+        },
+      ],
+    },
+  ];
+
+  const MenuActions = (
+    <Menu>
+      {menuOptions.map((groupOption) => {
+        return (
+          <MenuGroup key={groupOption.key} label={groupOption.label}>
+            {groupOption.items.map((option) => {
+              return (
+                <Menu.Item
+                  key={option.key}
+                  label={option.label}
+                  icon={option.icon}
+                  onClick={() => {
+                    const url = option.getUrl();
+                    onCopyLink(option.shorten, option.absTime, url);
+                    setLastSelected(option);
+                  }}
+                />
+              );
+            })}
+          </MenuGroup>
+        );
+      })}
+    </Menu>
+  );
+
+  // we need the Toolbar button click to be an action separate from opening/closing the menu
+  return (
+    <ToolbarButtonRow>
+      <Stack gap={0} direction="row" alignItems="center" wrap="nowrap">
+        <ToolbarButton
+          tooltip={lastSelected.label}
+          icon={lastSelected.icon}
+          iconOnly={true}
+          narrow={true}
+          onClick={() => {
+            const url = lastSelected.getUrl();
+            onCopyLink(lastSelected.shorten, lastSelected.absTime, url);
+          }}
+          aria-label={t('explore.toolbar.copy-shortened-link', 'Copy shortened URL')}
+        />
+        <Dropdown overlay={MenuActions} placement="bottom-end" onVisibleChange={setIsOpen}>
+          <ToolbarButton
+            narrow={true}
+            isOpen={isOpen}
+            aria-label={t('explore.toolbar.copy-shortened-link-menu', 'Open copy link options')}
+          />
+        </Dropdown>
+      </Stack>
+    </ToolbarButtonRow>
+  );
+}
diff --git a/public/app/features/explore/SupplementaryResultError.tsx b/public/app/features/explore/SupplementaryResultError.tsx
index 6193dc1af67c2..0ad91832057c2 100644
--- a/public/app/features/explore/SupplementaryResultError.tsx
+++ b/public/app/features/explore/SupplementaryResultError.tsx
@@ -55,18 +55,18 @@ export function SupplementaryResultError(props: Props) {
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
-    supplementaryErrorContainer: css`
-      width: 50%;
-      min-width: ${theme.breakpoints.values.sm}px;
-      margin: 0 auto;
-    `,
-    suggestedActionWrapper: css`
-      height: ${theme.spacing(6)};
-      button {
-        position: absolute;
-        right: ${theme.spacing(2)};
-        top: ${theme.spacing(7)};
-      }
-    `,
+    supplementaryErrorContainer: css({
+      width: '50%',
+      minWidth: `${theme.breakpoints.values.sm}px`,
+      margin: '0 auto',
+    }),
+    suggestedActionWrapper: css({
+      height: theme.spacing(6),
+      ['button']: {
+        position: 'absolute',
+        right: theme.spacing(2),
+        top: theme.spacing(7),
+      },
+    }),
   };
 };
diff --git a/public/app/features/explore/Table/TableContainer.test.tsx b/public/app/features/explore/Table/TableContainer.test.tsx
index c8db16caca3e8..d373617ace438 100644
--- a/public/app/features/explore/Table/TableContainer.test.tsx
+++ b/public/app/features/explore/Table/TableContainer.test.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 
 import { DataFrame, FieldType, getDefaultTimeRange, InternalTimeZones, toDataFrame } from '@grafana/data';
 
-import { TableContainer } from './TableContainer';
+import { TableContainerWithTheme } from './TableContainer';
 
 function getTables(): HTMLElement[] {
   return screen.getAllByRole('table');
@@ -57,10 +57,10 @@ const defaultProps = {
   timeZone: InternalTimeZones.utc,
 };
 
-describe('TableContainer', () => {
+describe('TableContainerWithTheme', () => {
   describe('With one main frame', () => {
     it('should render component', () => {
-      render(<TableContainer {...defaultProps} />);
+      render(<TableContainerWithTheme {...defaultProps} />);
       const tables = getTables();
       expect(tables.length).toBe(1);
       expect(tables[0]).toBeInTheDocument();
@@ -82,12 +82,12 @@ describe('TableContainer', () => {
           length: 0,
         },
       ];
-      render(<TableContainer {...defaultProps} tableResult={emptyFrames} />);
+      render(<TableContainerWithTheme {...defaultProps} tableResult={emptyFrames} />);
       expect(screen.getByText('0 series returned')).toBeInTheDocument();
     });
 
     it('should update time when timezone changes', () => {
-      const { rerender } = render(<TableContainer {...defaultProps} />);
+      const { rerender } = render(<TableContainerWithTheme {...defaultProps} />);
       const rowsBeforeChange = within(getTables()[0]).getAllByRole('row');
       expect(getRowsData(rowsBeforeChange)).toEqual([
         { time: '2021-01-01 00:00:00', text: 'test_string_1' },
@@ -96,7 +96,7 @@ describe('TableContainer', () => {
         { time: '2021-01-01 02:00:00', text: 'test_string_4' },
       ]);
 
-      rerender(<TableContainer {...defaultProps} timeZone="cest" />);
+      rerender(<TableContainerWithTheme {...defaultProps} timeZone="cest" />);
       const rowsAfterChange = within(getTables()[0]).getAllByRole('row');
       expect(getRowsData(rowsAfterChange)).toEqual([
         { time: '2020-12-31 19:00:00', text: 'test_string_1' },
@@ -105,12 +105,20 @@ describe('TableContainer', () => {
         { time: '2020-12-31 21:00:00', text: 'test_string_4' },
       ]);
     });
+
+    it('should render table title with Prometheus query', () => {
+      const dataFrames = [{ ...dataFrame, name: 'metric{label="value"}' }];
+      const tableProps = { ...defaultProps, tableResult: dataFrames };
+      render(<TableContainerWithTheme {...tableProps} />);
+      expect(screen.getByText('Table - metric{label="value"}')).toBeInTheDocument();
+    });
   });
+
   describe('With multiple main frames', () => {
     it('should render multiple tables for multiple frames', () => {
       const dataFrames = [dataFrame, dataFrame];
       const multiDefaultProps = { ...defaultProps, tableResult: dataFrames };
-      render(<TableContainer {...multiDefaultProps} />);
+      render(<TableContainerWithTheme {...multiDefaultProps} />);
       const tables = getTables();
       expect(tables.length).toBe(2);
       expect(tables[0]).toBeInTheDocument();
diff --git a/public/app/features/explore/Table/TableContainer.tsx b/public/app/features/explore/Table/TableContainer.tsx
index 57e9e6a27f718..6626977824b3d 100644
--- a/public/app/features/explore/Table/TableContainer.tsx
+++ b/public/app/features/explore/Table/TableContainer.tsx
@@ -1,9 +1,11 @@
+import { css } from '@emotion/css';
 import React, { PureComponent } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
-import { applyFieldOverrides, TimeZone, SplitOpen, DataFrame, LoadingState, FieldType } from '@grafana/data';
+import { applyFieldOverrides, SplitOpen, DataFrame, LoadingState, FieldType } from '@grafana/data';
 import { getTemplateSrv } from '@grafana/runtime';
-import { Table, AdHocFilterItem, PanelChrome } from '@grafana/ui';
+import { TimeZone } from '@grafana/schema';
+import { Table, AdHocFilterItem, PanelChrome, withTheme2, Themeable2 } from '@grafana/ui';
 import { config } from 'app/core/config';
 import { t } from 'app/core/internationalization';
 import {
@@ -17,7 +19,7 @@ import { MetaInfoText } from '../MetaInfoText';
 import { selectIsWaitingForData } from '../state/query';
 import { exploreDataLinkPostProcessorFactory } from '../utils/links';
 
-interface TableContainerProps {
+interface TableContainerProps extends Themeable2 {
   ariaLabel?: string;
   exploreId: string;
   width: number;
@@ -57,11 +59,14 @@ export class TableContainer extends PureComponent<Props> {
       name = data.refId || `${i}`;
     }
 
-    return name ? t('explore.table.title-with-name', 'Table - {{name}}', { name }) : t('explore.table.title', 'Table');
+    return name
+      ? t('explore.table.title-with-name', 'Table - {{name}}', { name, interpolation: { escapeValue: false } })
+      : t('explore.table.title', 'Table');
   }
 
   render() {
-    const { loading, onCellFilterAdded, tableResult, width, splitOpenFn, range, ariaLabel, timeZone } = this.props;
+    const { loading, onCellFilterAdded, tableResult, width, splitOpenFn, range, ariaLabel, timeZone, theme } =
+      this.props;
 
     let dataFrames = hasDeprecatedParentRowIndex(tableResult)
       ? migrateFromParentRowIndexToNestedFrames(tableResult)
@@ -93,30 +98,34 @@ export class TableContainer extends PureComponent<Props> {
             {() => <MetaInfoText metaItems={[{ value: t('explore.table.no-data', '0 series returned') }]} />}
           </PanelChrome>
         )}
-        {frames &&
-          frames.length > 0 &&
-          frames.map((data, i) => (
-            <PanelChrome
-              key={data.refId || `table-${i}`}
-              title={this.getTableTitle(dataFrames, data, i)}
-              width={width}
-              height={this.getTableHeight(data.length, this.hasSubFrames(data))}
-              loadingState={loading ? LoadingState.Loading : undefined}
-            >
-              {(innerWidth, innerHeight) => (
-                <Table
-                  ariaLabel={ariaLabel}
-                  data={data}
-                  width={innerWidth}
-                  height={innerHeight}
-                  onCellFilterAdded={onCellFilterAdded}
-                />
-              )}
-            </PanelChrome>
-          ))}
+        {frames && frames.length > 0 && (
+          <div className={css({ display: 'flex', flexDirection: 'column', gap: theme.spacing(1) })}>
+            {frames.map((data, i) => (
+              <PanelChrome
+                key={data.refId || `table-${i}`}
+                title={this.getTableTitle(dataFrames, data, i)}
+                width={width}
+                height={this.getTableHeight(data.length, this.hasSubFrames(data))}
+                loadingState={loading ? LoadingState.Loading : undefined}
+              >
+                {(innerWidth, innerHeight) => (
+                  <Table
+                    ariaLabel={ariaLabel}
+                    data={data}
+                    width={innerWidth}
+                    height={innerHeight}
+                    onCellFilterAdded={onCellFilterAdded}
+                  />
+                )}
+              </PanelChrome>
+            ))}
+          </div>
+        )}
       </>
     );
   }
 }
 
-export default connector(TableContainer);
+export const TableContainerWithTheme = withTheme2(TableContainer);
+
+export default withTheme2(connector(TableContainer));
diff --git a/public/app/features/explore/TraceView/TraceView.test.tsx b/public/app/features/explore/TraceView/TraceView.test.tsx
index fd08ed9595f6d..6a767bafbdf73 100644
--- a/public/app/features/explore/TraceView/TraceView.test.tsx
+++ b/public/app/features/explore/TraceView/TraceView.test.tsx
@@ -3,23 +3,17 @@ import userEvent from '@testing-library/user-event';
 import React, { createRef } from 'react';
 import { Provider } from 'react-redux';
 
-import { DataFrame, MutableDataFrame, getDefaultTimeRange, LoadingState } from '@grafana/data';
+import { DataFrame, MutableDataFrame } from '@grafana/data';
 import { DataSourceSrv, setDataSourceSrv } from '@grafana/runtime';
 
 import { configureStore } from '../../../store/configureStore';
 
 import { TraceView } from './TraceView';
-import { TopOfViewRefType } from './components/TraceTimelineViewer/VirtualizedTraceView';
 import { TraceData, TraceSpanData } from './components/types/trace';
 import { transformDataFrames } from './utils/transform';
 
 function getTraceView(frames: DataFrame[]) {
   const store = configureStore();
-  const mockPanelData = {
-    state: LoadingState.Done,
-    series: [],
-    timeRange: getDefaultTimeRange(),
-  };
   const topOfViewRef = createRef<HTMLDivElement>();
 
   return (
@@ -29,10 +23,8 @@ function getTraceView(frames: DataFrame[]) {
         dataFrames={frames}
         splitOpenFn={() => {}}
         traceProp={transformDataFrames(frames[0])!}
-        queryResponse={mockPanelData}
         datasource={undefined}
         topOfViewRef={topOfViewRef}
-        topOfViewRefType={TopOfViewRefType.Explore}
       />
     </Provider>
   );
diff --git a/public/app/features/explore/TraceView/TraceView.tsx b/public/app/features/explore/TraceView/TraceView.tsx
index bbe96d1b37cb6..f44534301dd85 100644
--- a/public/app/features/explore/TraceView/TraceView.tsx
+++ b/public/app/features/explore/TraceView/TraceView.tsx
@@ -12,17 +12,15 @@ import {
   GrafanaTheme2,
   LinkModel,
   mapInternalLinkToExplore,
-  PanelData,
   SplitOpen,
 } from '@grafana/data';
+import { getTraceToLogsOptions, TraceToMetricsData, TraceToProfilesData } from '@grafana/o11y-ds-frontend';
 import { getTemplateSrv } from '@grafana/runtime';
 import { DataQuery } from '@grafana/schema';
 import { useStyles2 } from '@grafana/ui';
-import { getTraceToLogsOptions } from 'app/core/components/TraceToLogs/TraceToLogsSettings';
-import { TraceToMetricsData } from 'app/core/components/TraceToMetrics/TraceToMetricsSettings';
+import { TempoQuery } from '@grafana-plugins/tempo/types';
 import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
 import { getTimeZone } from 'app/features/profile/state/selectors';
-import { TempoQuery } from 'app/plugins/datasource/tempo/types';
 import { useDispatch, useSelector } from 'app/types';
 
 import { changePanelState } from '../state/explorePane';
@@ -35,8 +33,9 @@ import {
   TraceTimelineViewer,
   TTraceTimeline,
 } from './components';
+import memoizedTraceCriticalPath from './components/CriticalPath';
 import SpanGraph from './components/TracePageHeader/SpanGraph';
-import { TopOfViewRefType } from './components/TraceTimelineViewer/VirtualizedTraceView';
+import { TraceFlameGraphs } from './components/TraceTimelineViewer/SpanDetail';
 import { createSpanLinkFactory } from './createSpanLink';
 import { useChildrenState } from './useChildrenState';
 import { useDetailState } from './useDetailState';
@@ -62,11 +61,11 @@ type Props = {
   scrollElement?: Element;
   scrollElementClass?: string;
   traceProp: Trace;
-  queryResponse: PanelData;
   datasource: DataSourceApi<DataQuery, DataSourceJsonData, {}> | undefined;
-  topOfViewRef: RefObject<HTMLDivElement>;
-  topOfViewRefType: TopOfViewRefType;
+  topOfViewRef?: RefObject<HTMLDivElement>;
   createSpanLink?: SpanLinkFunc;
+  focusedSpanId?: string;
+  createFocusSpanLink?: (traceId: string, spanId: string) => LinkModel<Field>;
 };
 
 export function TraceView(props: Props) {
@@ -74,9 +73,10 @@ export function TraceView(props: Props) {
     traceProp,
     datasource,
     topOfViewRef,
-    topOfViewRefType,
     exploreId,
     createSpanLink: createSpanLinkFromProps,
+    focusedSpanId: focusedSpanIdFromProps,
+    createFocusSpanLink: createFocusSpanLinkFromProps,
   } = props;
 
   const {
@@ -99,7 +99,10 @@ export function TraceView(props: Props) {
   const [focusedSpanIdForSearch, setFocusedSpanIdForSearch] = useState('');
   const [showSpanFilters, setShowSpanFilters] = useToggle(false);
   const [showSpanFilterMatchesOnly, setShowSpanFilterMatchesOnly] = useState(false);
+  const [showCriticalPathSpansOnly, setShowCriticalPathSpansOnly] = useState(false);
   const [headerHeight, setHeaderHeight] = useState(100);
+  const [traceFlameGraphs, setTraceFlameGraphs] = useState<TraceFlameGraphs>({});
+  const [redrawListView, setRedrawListView] = useState({});
 
   const styles = useStyles2(getStyles);
 
@@ -108,13 +111,16 @@ export function TraceView(props: Props) {
    */
   const [spanNameColumnWidth, setSpanNameColumnWidth] = useState(0.4);
 
-  const [focusedSpanId, createFocusSpanLink] = useFocusSpanLink({
+  const [focusedSpanIdExplore, createFocusSpanLinkExplore] = useFocusSpanLink({
     refId: props.dataFrames[0]?.refId,
     exploreId: props.exploreId!,
     datasource,
     splitOpenFn: props.splitOpenFn!,
   });
 
+  const focusedSpanId = focusedSpanIdFromProps ?? focusedSpanIdExplore;
+  const createFocusSpanLink = createFocusSpanLinkFromProps ?? createFocusSpanLinkExplore;
+
   const traceTimeline: TTraceTimeline = useMemo(
     () => ({
       childrenHiddenIDs,
@@ -130,6 +136,8 @@ export function TraceView(props: Props) {
   const traceToLogsOptions = getTraceToLogsOptions(instanceSettings?.jsonData);
   const traceToMetrics: TraceToMetricsData | undefined = instanceSettings?.jsonData;
   const traceToMetricsOptions = traceToMetrics?.tracesToMetrics;
+  const traceToProfilesData: TraceToProfilesData | undefined = instanceSettings?.jsonData;
+  const traceToProfilesOptions = traceToProfilesData?.tracesToProfiles;
   const spanBarOptions: SpanBarOptionsData | undefined = instanceSettings?.jsonData;
 
   const createSpanLink = useMemo(
@@ -139,6 +147,7 @@ export function TraceView(props: Props) {
         splitOpenFn: props.splitOpenFn!,
         traceToLogsOptions,
         traceToMetricsOptions,
+        traceToProfilesOptions,
         dataFrame: props.dataFrames[0],
         createFocusSpanLink,
         trace: traceProp,
@@ -147,6 +156,7 @@ export function TraceView(props: Props) {
       props.splitOpenFn,
       traceToLogsOptions,
       traceToMetricsOptions,
+      traceToProfilesOptions,
       props.dataFrames,
       createFocusSpanLink,
       traceProp,
@@ -159,6 +169,8 @@ export function TraceView(props: Props) {
     ? props.scrollElement
     : document.getElementsByClassName(props.scrollElementClass ?? '')[0];
 
+  const criticalPath = memoizedTraceCriticalPath(traceProp);
+
   return (
     <>
       {props.dataFrames?.length && traceProp ? (
@@ -173,6 +185,8 @@ export function TraceView(props: Props) {
             setShowSpanFilters={setShowSpanFilters}
             showSpanFilterMatchesOnly={showSpanFilterMatchesOnly}
             setShowSpanFilterMatchesOnly={setShowSpanFilterMatchesOnly}
+            showCriticalPathSpansOnly={showCriticalPathSpansOnly}
+            setShowCriticalPathSpansOnly={setShowCriticalPathSpansOnly}
             setFocusedSpanIdForSearch={setFocusedSpanIdForSearch}
             spanFilterMatches={spanFilterMatches}
             datasourceType={datasourceType}
@@ -188,6 +202,7 @@ export function TraceView(props: Props) {
           <TraceTimelineViewer
             findMatchesIDs={spanFilterMatches}
             trace={traceProp}
+            traceToProfilesOptions={traceToProfilesOptions}
             datasourceType={datasourceType}
             spanBarOptions={spanBarOptions?.spanBar}
             traceTimeline={traceTimeline}
@@ -218,10 +233,15 @@ export function TraceView(props: Props) {
             focusedSpanId={focusedSpanId}
             focusedSpanIdForSearch={focusedSpanIdForSearch}
             showSpanFilterMatchesOnly={showSpanFilterMatchesOnly}
+            showCriticalPathSpansOnly={showCriticalPathSpansOnly}
             createFocusSpanLink={createFocusSpanLink}
             topOfViewRef={topOfViewRef}
-            topOfViewRefType={topOfViewRefType}
             headerHeight={headerHeight}
+            criticalPath={criticalPath}
+            traceFlameGraphs={traceFlameGraphs}
+            setTraceFlameGraphs={setTraceFlameGraphs}
+            redrawListView={redrawListView}
+            setRedrawListView={setRedrawListView}
           />
         </>
       ) : (
@@ -254,8 +274,8 @@ function useFocusSpanLink(options: {
       })
     );
 
-  const query = useSelector(
-    (state) => state.explore.panes[options.exploreId]?.queries.find((query) => query.refId === options.refId)
+  const query = useSelector((state) =>
+    state.explore.panes[options.exploreId]?.queries.find((query) => query.refId === options.refId)
   );
 
   const createFocusSpanLink = (traceId: string, spanId: string) => {
@@ -290,22 +310,22 @@ function useFocusSpanLink(options: {
       onClickFn: sameTrace
         ? () => setFocusedSpanId(focusedSpanId === spanId ? undefined : spanId)
         : options.splitOpenFn
-        ? () =>
-            options.splitOpenFn({
-              datasourceUid: options.datasource?.uid!,
-              queries: [
-                {
-                  ...query!,
-                  query: traceId,
-                },
-              ],
-              panelsState: {
-                trace: {
-                  spanId,
+          ? () =>
+              options.splitOpenFn({
+                datasourceUid: options.datasource?.uid!,
+                queries: [
+                  {
+                    ...query!,
+                    query: traceId,
+                  },
+                ],
+                panelsState: {
+                  trace: {
+                    spanId,
+                  },
                 },
-              },
-            })
-        : undefined,
+              })
+          : undefined,
       replaceVariables: getTemplateSrv().replace.bind(getTemplateSrv()),
     });
   };
diff --git a/public/app/features/explore/TraceView/TraceViewContainer.test.tsx b/public/app/features/explore/TraceView/TraceViewContainer.test.tsx
index da155cec53125..dcb0347ee2317 100644
--- a/public/app/features/explore/TraceView/TraceViewContainer.test.tsx
+++ b/public/app/features/explore/TraceView/TraceViewContainer.test.tsx
@@ -1,10 +1,8 @@
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import React, { createRef } from 'react';
+import React from 'react';
 import { Provider } from 'react-redux';
 
-import { getDefaultTimeRange, LoadingState } from '@grafana/data';
-
 import { configureStore } from '../../../store/configureStore';
 
 import { frameOld } from './TraceView.test';
@@ -19,22 +17,10 @@ jest.mock('@grafana/runtime', () => {
 
 function renderTraceViewContainer(frames = [frameOld]) {
   const store = configureStore();
-  const mockPanelData = {
-    state: LoadingState.Done,
-    series: [],
-    timeRange: getDefaultTimeRange(),
-  };
-  const topOfViewRef = createRef<HTMLDivElement>();
 
   const { container, baseElement } = render(
     <Provider store={store}>
-      <TraceViewContainer
-        exploreId="left"
-        dataFrames={frames}
-        splitOpenFn={() => {}}
-        queryResponse={mockPanelData}
-        topOfViewRef={topOfViewRef}
-      />
+      <TraceViewContainer exploreId="left" dataFrames={frames} splitOpenFn={() => {}} />
     </Provider>
   );
   return {
@@ -47,14 +33,9 @@ function renderTraceViewContainer(frames = [frameOld]) {
 
 describe('TraceViewContainer', () => {
   let user: ReturnType<typeof userEvent.setup>;
+
   beforeEach(() => {
-    jest.useFakeTimers();
-    // Need to use delay: null here to work with fakeTimers
-    // see https://github.com/testing-library/user-event/issues/833
-    user = userEvent.setup({ delay: null });
-  });
-  afterEach(() => {
-    jest.useRealTimers();
+    user = userEvent.setup();
   });
 
   it('toggles children visibility', async () => {
diff --git a/public/app/features/explore/TraceView/TraceViewContainer.tsx b/public/app/features/explore/TraceView/TraceViewContainer.tsx
index 2f37c70d31bd2..d36aa60f68e94 100644
--- a/public/app/features/explore/TraceView/TraceViewContainer.tsx
+++ b/public/app/features/explore/TraceView/TraceViewContainer.tsx
@@ -1,11 +1,10 @@
-import React, { RefObject, useMemo } from 'react';
+import React, { useMemo } from 'react';
 
-import { DataFrame, SplitOpen, PanelData } from '@grafana/data';
-import { PanelChrome } from '@grafana/ui/src/components/PanelChrome/PanelChrome';
+import { DataFrame, SplitOpen } from '@grafana/data';
+import { PanelChrome } from '@grafana/ui';
 import { StoreState, useSelector } from 'app/types';
 
 import { TraceView } from './TraceView';
-import { TopOfViewRefType } from './components/TraceTimelineViewer/VirtualizedTraceView';
 import { transformDataFrames } from './utils/transform';
 
 interface Props {
@@ -13,14 +12,12 @@ interface Props {
   splitOpenFn: SplitOpen;
   exploreId: string;
   scrollElement?: Element;
-  queryResponse: PanelData;
-  topOfViewRef: RefObject<HTMLDivElement>;
 }
 
 export function TraceViewContainer(props: Props) {
   // At this point we only show single trace
   const frame = props.dataFrames[0];
-  const { dataFrames, splitOpenFn, exploreId, scrollElement, topOfViewRef, queryResponse } = props;
+  const { dataFrames, splitOpenFn, exploreId, scrollElement } = props;
   const traceProp = useMemo(() => transformDataFrames(frame), [frame]);
   const datasource = useSelector(
     (state: StoreState) => state.explore.panes[props.exploreId]?.datasourceInstance ?? undefined
@@ -38,10 +35,7 @@ export function TraceViewContainer(props: Props) {
         splitOpenFn={splitOpenFn}
         scrollElement={scrollElement}
         traceProp={traceProp}
-        queryResponse={queryResponse}
         datasource={datasource}
-        topOfViewRef={topOfViewRef}
-        topOfViewRefType={TopOfViewRefType.Explore}
       />
     </PanelChrome>
   );
diff --git a/public/app/features/explore/TraceView/components/CriticalPath/index.test.ts b/public/app/features/explore/TraceView/components/CriticalPath/index.test.ts
new file mode 100644
index 0000000000000..bdca1b8c5f991
--- /dev/null
+++ b/public/app/features/explore/TraceView/components/CriticalPath/index.test.ts
@@ -0,0 +1,35 @@
+// Copyright (c) 2023 The Jaeger Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import test1 from './testCases/test1';
+import test2 from './testCases/test2';
+import test3 from './testCases/test3';
+import test4 from './testCases/test4';
+import test5 from './testCases/test5';
+import test6 from './testCases/test6';
+import test7 from './testCases/test7';
+import test8 from './testCases/test8';
+import test9 from './testCases/test9';
+
+import TraceCriticalPath from './index';
+
+describe.each([[test1], [test2], [test3], [test4], [test5], [test6], [test7], [test8], [test9]])(
+  'Happy Path',
+  (testProps) => {
+    it('should find criticalPathSections correctly', () => {
+      const criticalPath = TraceCriticalPath(testProps.trace);
+      expect(criticalPath).toStrictEqual(testProps.criticalPathSections);
+    });
+  }
+);
diff --git a/public/app/features/explore/TraceView/components/CriticalPath/index.tsx b/public/app/features/explore/TraceView/components/CriticalPath/index.tsx
new file mode 100644
index 0000000000000..7d8a8d3dc999a
--- /dev/null
+++ b/public/app/features/explore/TraceView/components/CriticalPath/index.tsx
@@ -0,0 +1,115 @@
+// Copyright (c) 2023 The Jaeger Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import memoizeOne from 'memoize-one';
+
+import { CriticalPathSection, Trace, TraceSpan } from '../types';
+
+import findLastFinishingChildSpan from './utils/findLastFinishingChildSpan';
+import getChildOfSpans from './utils/getChildOfSpans';
+import sanitizeOverFlowingChildren from './utils/sanitizeOverFlowingChildren';
+
+/**
+ * Computes the critical path sections of a Jaeger trace.
+ * The algorithm begins with the top-level span and iterates through the last finishing children (LFCs).
+ * It recursively computes the critical path for each LFC span.
+ * Upon return from recursion, the algorithm walks backward and picks another child that
+ * finished just before the LFC's start.
+ * @param spanMap - A map associating span IDs with spans.
+ * @param spanId - The ID of the current span.
+ * @param criticalPath - An array of critical path sections.
+ * @param returningChildStartTime - Optional parameter representing the span's start time.
+ *                    It is provided only during the recursive return phase.
+ * @returns - An array of critical path sections for the trace.
+ * @example -
+ * |-------------spanA--------------|
+ *    |--spanB--|    |--spanC--|
+ * The LFC of spanA is spanC, as it finishes last among its child spans.
+ * After invoking CP recursively on LFC, for spanC there is no LFC, so the algorithm walks backward.
+ * At this point, it uses returningChildStartTime (startTime of spanC) to select another child that finished
+ * immediately before the LFC's start.
+ */
+const computeCriticalPath = (
+  spanMap: Map<string, TraceSpan>,
+  spanId: string,
+  criticalPath: CriticalPathSection[],
+  returningChildStartTime?: number
+): CriticalPathSection[] => {
+  const currentSpan = spanMap.get(spanId);
+
+  if (!currentSpan) {
+    return criticalPath;
+  }
+
+  const lastFinishingChildSpan = findLastFinishingChildSpan(spanMap, currentSpan, returningChildStartTime);
+  let spanCriticalSection: CriticalPathSection;
+
+  if (lastFinishingChildSpan) {
+    spanCriticalSection = {
+      spanId: currentSpan.spanID,
+      section_start: lastFinishingChildSpan.startTime + lastFinishingChildSpan.duration,
+      section_end: returningChildStartTime || currentSpan.startTime + currentSpan.duration,
+    };
+    if (spanCriticalSection.section_start !== spanCriticalSection.section_end) {
+      criticalPath.push(spanCriticalSection);
+    }
+    // Now focus shifts to the lastFinishingChildSpan of cuurent span
+    computeCriticalPath(spanMap, lastFinishingChildSpan.spanID, criticalPath);
+  } else {
+    // If there is no last finishing child then total section upto startTime of span is on critical path
+    spanCriticalSection = {
+      spanId: currentSpan.spanID,
+      section_start: currentSpan.startTime,
+      section_end: returningChildStartTime || currentSpan.startTime + currentSpan.duration,
+    };
+    if (spanCriticalSection.section_start !== spanCriticalSection.section_end) {
+      criticalPath.push(spanCriticalSection);
+    }
+    // Now as there are no lfc's focus shifts to parent span from startTime of span
+    // return from recursion and walk backwards to one level depth to parent span
+    // provide span's startTime as returningChildStartTime
+    if (currentSpan.references.length) {
+      const parentSpanId: string = currentSpan.references.filter((reference) => reference.refType === 'CHILD_OF')[0]
+        .spanID;
+      computeCriticalPath(spanMap, parentSpanId, criticalPath, currentSpan.startTime);
+    }
+  }
+  return criticalPath;
+};
+
+function criticalPathForTrace(trace: Trace) {
+  let criticalPath: CriticalPathSection[] = [];
+  // As spans are already sorted based on startTime first span is always rootSpan
+  const rootSpanId = trace?.spans[0].spanID;
+  // If there is root span then algorithm implements
+  if (rootSpanId) {
+    const spanMap = trace.spans.reduce((map, span) => {
+      map.set(span.spanID, span);
+      return map;
+    }, new Map<string, TraceSpan>());
+    try {
+      const refinedSpanMap = getChildOfSpans(spanMap);
+      const sanitizedSpanMap = sanitizeOverFlowingChildren(refinedSpanMap);
+      criticalPath = computeCriticalPath(sanitizedSpanMap, rootSpanId, criticalPath);
+    } catch (error) {
+      /* eslint-disable no-console */
+      console.log('error while computing critical path for a trace', error);
+    }
+  }
+  return criticalPath;
+}
+
+const memoizedTraceCriticalPath = memoizeOne(criticalPathForTrace);
+
+export default memoizedTraceCriticalPath;
diff --git a/public/app/features/explore/TraceView/components/CriticalPath/testCases/test1.ts b/public/app/features/explore/TraceView/components/CriticalPath/testCases/test1.ts
new file mode 100644
index 0000000000000..d2f0cf757fd0a
--- /dev/null
+++ b/public/app/features/explore/TraceView/components/CriticalPath/testCases/test1.ts
@@ -0,0 +1,126 @@
+// Copyright (c) 2023 The Jaeger Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/*
+
+     ┌──────────────────────────────────────┐       |
+     │             Span C                   │       |
+     └──┬──────────▲─────────┬──────────▲───┘       |           span C
+     +++│          │+++++++++│          │++++       |           /    \
+        │          │         │          │           |          /      \
+        ▼──────────┤         ▼──────────┤           |       span D     span E
+        │ Span D   │         │ Span E   │           |
+        └──────────┘         └──────────┘           |      (parent-child tree)
+        +++++++++++          ++++++++++++           |
+
+
+Here +++++ are critical path sections
+*/
+import { Trace, TraceResponse, transformTraceData } from '../../index';
+
+const testTrace: TraceResponse = {
+  traceID: 'test1-trace',
+  spans: [
+    {
+      traceID: 'test1-trace',
+      spanID: 'span-E',
+      operationName: 'operation E',
+      references: [
+        {
+          refType: 'CHILD_OF',
+          spanID: 'span-C',
+          traceID: 'test1-trace',
+        },
+      ],
+      startTime: 50,
+      duration: 10,
+      processID: 'p1',
+      logs: [],
+      flags: 0,
+    },
+    {
+      traceID: 'test1-trace',
+
+      spanID: 'span-C',
+      operationName: 'operation C',
+      references: [],
+      startTime: 1,
+      duration: 100,
+      processID: 'p1',
+      logs: [],
+      flags: 0,
+    },
+    {
+      traceID: 'test1-trace',
+
+      spanID: 'span-D',
+      operationName: 'operation D',
+      references: [
+        {
+          refType: 'CHILD_OF',
+          spanID: 'span-C',
+          traceID: 'test1-trace',
+        },
+      ],
+      startTime: 20,
+      duration: 20,
+      processID: 'p1',
+      logs: [],
+      flags: 0,
+    },
+  ],
+  processes: {
+    p1: {
+      serviceName: 'customers-service',
+      tags: [],
+    },
+  },
+};
+
+const transformedTrace: Trace = transformTraceData(testTrace)!;
+
+const criticalPathSections = [
+  {
+    spanId: 'span-C',
+    section_start: 60,
+    section_end: 101,
+  },
+  {
+    spanId: 'span-E',
+    section_start: 50,
+    section_end: 60,
+  },
+  {
+    spanId: 'span-C',
+    section_start: 40,
+    section_end: 50,
+  },
+  {
+    spanId: 'span-D',
+    section_start: 20,
+    section_end: 40,
+  },
+  {
+    spanId: 'span-C',
+    section_start: 1,
+    section_end: 20,
+  },
+];
+
+const test1 = {
+  criticalPathSections,
+  trace: transformedTrace,
+};
+
+export default test1;
diff --git a/public/app/features/explore/TraceView/components/CriticalPath/testCases/test2.ts b/public/app/features/explore/TraceView/components/CriticalPath/testCases/test2.ts
new file mode 100644
index 0000000000000..1f445a9339ecc
--- /dev/null
+++ b/public/app/features/explore/TraceView/components/CriticalPath/testCases/test2.ts
@@ -0,0 +1,116 @@
+// Copyright (c) 2023 The Jaeger Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/*                                                       |
+ ┌─────────────────────────────────────────────────┐     |
+ │                      Span X                     │     |
+ └──────┬───────┬─────────────────▲──────▲─────────┘     |
+ +++++++│+++++++│                 │      |++++++++++     |            span X
+        ▼───────┼─────────────────┤      |               |           /     \
+        │       │ Span A          │      |               |          /       \
+        └───────┼─────────────────┘      |               |      span A     span C
+                │                        |               |
+                │                        |               |
+                ▼────────────────────────┤               |     (parent-child tree)
+                │         Span C         │               |
+                └────────────────────────┘               |
+                ++++++++++++++++++++++++++               |
+                                                         |
+Here ++++++ is critical path                             |
+*/
+import { TraceResponse, transformTraceData } from '../../index';
+
+const happyTrace: TraceResponse = {
+  traceID: 'trace-123',
+  spans: [
+    {
+      traceID: 'trace-123',
+      spanID: 'span-X',
+      operationName: 'op1',
+      startTime: 1,
+      duration: 100,
+      references: [],
+      processID: 'p1',
+      logs: [],
+      flags: 0,
+    },
+    {
+      traceID: 'trace-123',
+      spanID: 'span-A',
+      operationName: 'op2',
+      startTime: 10,
+      duration: 40,
+      references: [
+        {
+          refType: 'CHILD_OF',
+          spanID: 'span-X',
+          traceID: 'trace-123',
+        },
+      ],
+      processID: 'p1',
+      logs: [],
+      flags: 0,
+    },
+    {
+      traceID: 'trace-123',
+      spanID: 'span-C',
+      operationName: 'op3',
+      startTime: 20,
+      duration: 40,
+      references: [
+        {
+          refType: 'CHILD_OF',
+          spanID: 'span-X',
+          traceID: 'trace-123',
+        },
+      ],
+      processID: 'p1',
+      logs: [],
+      flags: 0,
+    },
+  ],
+  processes: {
+    p1: {
+      serviceName: 'service1',
+      tags: [],
+    },
+  },
+};
+
+const transformedTrace = transformTraceData(happyTrace)!;
+
+const criticalPathSections = [
+  {
+    spanId: 'span-X',
+    section_start: 60,
+    section_end: 101,
+  },
+  {
+    spanId: 'span-C',
+    section_start: 20,
+    section_end: 60,
+  },
+  {
+    spanId: 'span-X',
+    section_start: 1,
+    section_end: 20,
+  },
+];
+
+const test2 = {
+  criticalPathSections,
+  trace: transformedTrace,
+};
+
+export default test2;
diff --git a/public/app/features/explore/TraceView/components/CriticalPath/testCases/test3.ts b/public/app/features/explore/TraceView/components/CriticalPath/testCases/test3.ts
new file mode 100644
index 0000000000000..ab13f8d12fb8d
--- /dev/null
+++ b/public/app/features/explore/TraceView/components/CriticalPath/testCases/test3.ts
@@ -0,0 +1,113 @@
+// Copyright (c) 2023 The Jaeger Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/*
+                                                  |
+      ┌──────────┐                                |
+      │ Span A   │                                |          span A
+      └──────────┘                                |           /
+      ++++++++++++    ┌───────────────────┐       |          /
+                      │      Span B       │       |      span B
+                      └───────────────────┘       |
+                                                  |   (parent-child tree)
+                                                  |
+Span B will be dropped.                           |
+span A is on critical path(+++++)                 |
+*/
+
+import { TraceResponse, transformTraceData } from '../../index';
+
+const trace: TraceResponse = {
+  traceID: '006c3cf93508f205',
+  spans: [
+    {
+      traceID: '006c3cf93508f205',
+      spanID: '006c3cf93508f205',
+      flags: 1,
+      operationName: 'send',
+      references: [],
+      startTime: 1679437737490189,
+      duration: 36,
+      tags: [
+        {
+          key: 'span.kind',
+          type: 'string',
+          value: 'producer',
+        },
+      ],
+      logs: [],
+      processID: 'p1',
+      warnings: null,
+    },
+    {
+      traceID: '006c3cf93508f205',
+      spanID: '2dc4b796e2127e32',
+      flags: 1,
+      operationName: 'async task 1',
+      references: [
+        {
+          refType: 'CHILD_OF',
+          traceID: '006c3cf93508f205',
+          spanID: '006c3cf93508f205',
+        },
+      ],
+      startTime: 1679437737491529,
+      duration: 79182,
+      tags: [
+        {
+          key: 'span.kind',
+          type: 'string',
+          value: 'client',
+        },
+        {
+          key: 'http.method',
+          type: 'string',
+          value: 'POST',
+        },
+      ],
+      logs: [],
+      processID: 'p2',
+      warnings: null,
+    },
+  ],
+  processes: {
+    p1: {
+      serviceName: 'service-one',
+      tags: [],
+    },
+    p2: {
+      serviceName: 'service-two',
+      tags: [],
+    },
+  },
+  warnings: null,
+};
+
+const transformedTrace = transformTraceData(trace)!;
+const traceStart = 1679437737490189;
+
+const criticalPathSections = [
+  {
+    spanId: '006c3cf93508f205',
+    section_start: traceStart,
+    section_end: traceStart + 36,
+  },
+];
+
+const test3 = {
+  criticalPathSections,
+  trace: transformedTrace,
+};
+
+export default test3;
diff --git a/public/app/features/explore/TraceView/components/CriticalPath/testCases/test4.ts b/public/app/features/explore/TraceView/components/CriticalPath/testCases/test4.ts
new file mode 100644
index 0000000000000..dfab46118891a
--- /dev/null
+++ b/public/app/features/explore/TraceView/components/CriticalPath/testCases/test4.ts
@@ -0,0 +1,106 @@
+// Copyright (c) 2023 The Jaeger Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/*
+    ┌──────────┐                         |
+    │ Span A   │                         |
+    └──────────┘                         |
+    ++++++++++++  ┌────────────┐         |              span A
+                  │  Span B    │         |              /
+                  └┬───────▲───┘         |             /
+                   │       │             |           span B
+                   │       │             |            /
+                   ▼───────┤             |           /
+                   │Span C │             |         span C
+                   └───────┘             |
+                                         |   (parent-child tree)
+Both spanB and spanC will be dropped.    |
+span A is on critical path(+++++)        |
+*/
+
+import { TraceResponse, transformTraceData } from '../../index';
+
+const trace: TraceResponse = {
+  traceID: 'trace-abc',
+  spans: [
+    {
+      traceID: 'trace-abc',
+      spanID: 'span-A',
+      operationName: 'op-A',
+      references: [],
+      startTime: 1,
+      duration: 30,
+      processID: 'p1',
+      logs: [],
+      flags: 0,
+    },
+    {
+      traceID: 'trace-abc',
+      spanID: 'span-B',
+      operationName: 'op-B',
+      references: [
+        {
+          refType: 'CHILD_OF',
+          spanID: 'span-A',
+          traceID: 'trace-abc',
+        },
+      ],
+      startTime: 40,
+      duration: 40,
+      processID: 'p1',
+      logs: [],
+      flags: 0,
+    },
+    {
+      traceID: 'trace-abc',
+      spanID: 'span-c',
+      operationName: 'op-C',
+      references: [
+        {
+          refType: 'CHILD_OF',
+          spanID: 'span-B',
+          traceID: 'trace-abc',
+        },
+      ],
+      startTime: 50,
+      duration: 10,
+      processID: 'p1',
+      logs: [],
+      flags: 0,
+    },
+  ],
+  processes: {
+    p1: {
+      serviceName: 'service-one',
+      tags: [],
+    },
+  },
+};
+
+const transformedTrace = transformTraceData(trace)!;
+
+const criticalPathSections = [
+  {
+    spanId: 'span-A',
+    section_start: 1,
+    section_end: 31,
+  },
+];
+
+const test4 = {
+  criticalPathSections,
+  trace: transformedTrace,
+};
+
+export default test4;
diff --git a/public/app/features/explore/TraceView/components/CriticalPath/testCases/test5.ts b/public/app/features/explore/TraceView/components/CriticalPath/testCases/test5.ts
new file mode 100644
index 0000000000000..0f057fe60e1bd
--- /dev/null
+++ b/public/app/features/explore/TraceView/components/CriticalPath/testCases/test5.ts
@@ -0,0 +1,105 @@
+// Copyright (c) 2023 The Jaeger Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/*
+      ┌────────────────────┐                 |
+      │     Span A         │                 |                  span A
+      └───┬────────────────┘                 |                  /
+          │                                  |                 /
+          ▼────────────┐                     |              span B(FOLLOW_FROM)
+          │  Span B    │                     |                /
+          └──────────▲─┘                     |               /
+            │        │                       |          span C(CHILD_OF)
+            ▼────────┐                       |
+            │ Span C │                       |
+            └────────┘                       |        (parent-child tree)
+                                             |
+Here span B is ref-type is 'FOLLOWS_FROM'    |
+*/
+
+import { TraceResponse, transformTraceData } from '../../index';
+
+const trace: TraceResponse = {
+  traceID: 'trace-abc',
+  spans: [
+    {
+      traceID: 'trace-abc',
+      spanID: 'span-A',
+      operationName: 'op-A',
+      references: [],
+      startTime: 1,
+      duration: 30,
+      processID: 'p1',
+      logs: [],
+      flags: 0,
+    },
+    {
+      traceID: 'trace-abc',
+      spanID: 'span-B',
+      operationName: 'op-B',
+      references: [
+        {
+          refType: 'FOLLOWS_FROM',
+          spanID: 'span-A',
+          traceID: 'trace-abc',
+        },
+      ],
+      startTime: 10,
+      duration: 10,
+      processID: 'p1',
+      logs: [],
+      flags: 0,
+    },
+    {
+      traceID: 'trace-abc',
+      spanID: 'span-C',
+      operationName: 'op-C',
+      references: [
+        {
+          refType: 'CHILD_OF',
+          spanID: 'span-B',
+          traceID: 'trace-abc',
+        },
+      ],
+      startTime: 12,
+      duration: 2,
+      processID: 'p1',
+      logs: [],
+      flags: 0,
+    },
+  ],
+  processes: {
+    p1: {
+      serviceName: 'service-one',
+      tags: [],
+    },
+  },
+};
+
+const transformedTrace = transformTraceData(trace)!;
+
+const criticalPathSections = [
+  {
+    spanId: 'span-A',
+    section_start: 1,
+    section_end: 31,
+  },
+];
+
+const test5 = {
+  criticalPathSections,
+  trace: transformedTrace,
+};
+
+export default test5;
diff --git a/public/app/features/explore/TraceView/components/CriticalPath/testCases/test6.ts b/public/app/features/explore/TraceView/components/CriticalPath/testCases/test6.ts
new file mode 100644
index 0000000000000..3d35d416f8507
--- /dev/null
+++ b/public/app/features/explore/TraceView/components/CriticalPath/testCases/test6.ts
@@ -0,0 +1,113 @@
+// Copyright (c) 2023 The Jaeger Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/*
+           ┌────────────────────────────┐           |
+           │        Span A              │           |
+           └────────────┬───────────────┘           |               span A
+                        │                           |               /
+                       ┌▼──────────────────────┐    |              /
+                       │      Span B           │    |             span B
+                       └──────────▲────────────┘    |             /
+                                  │                 |            /
+                   ┌──────────────┤                 |           span C
+                   │   Span C     │                 |
+                   └──────────────┘                 |       (parent-child tree)
+*/
+
+import { TraceResponse, transformTraceData } from '../../index';
+
+const trace: TraceResponse = {
+  traceID: 'trace-abc',
+  spans: [
+    {
+      traceID: 'trace-abc',
+      spanID: 'span-A',
+      operationName: 'op-A',
+      references: [],
+      startTime: 1,
+      duration: 29,
+      processID: 'p1',
+      logs: [],
+      flags: 0,
+    },
+    {
+      traceID: 'trace-abc',
+      spanID: 'span-B',
+      operationName: 'op-B',
+      references: [
+        {
+          refType: 'CHILD_OF',
+          spanID: 'span-A',
+          traceID: 'trace-abc',
+        },
+      ],
+      startTime: 15,
+      duration: 20,
+      processID: 'p1',
+      logs: [],
+      flags: 0,
+    },
+    {
+      traceID: 'trace-abc',
+      spanID: 'span-C',
+      operationName: 'op-C',
+      references: [
+        {
+          refType: 'CHILD_OF',
+          spanID: 'span-B',
+          traceID: 'trace-abc',
+        },
+      ],
+      startTime: 10,
+      duration: 15,
+      processID: 'p1',
+      logs: [],
+      flags: 0,
+    },
+  ],
+  processes: {
+    p1: {
+      serviceName: 'service-one',
+      tags: [],
+    },
+  },
+};
+
+const transformedTrace = transformTraceData(trace)!;
+
+const criticalPathSections = [
+  {
+    spanId: 'span-B',
+    section_start: 25,
+    section_end: 30,
+  },
+  {
+    spanId: 'span-C',
+    section_start: 15,
+    section_end: 25,
+  },
+  {
+    spanId: 'span-A',
+    section_start: 1,
+    section_end: 15,
+  },
+];
+
+const test6 = {
+  criticalPathSections,
+  trace: transformedTrace,
+};
+
+export default test6;
diff --git a/public/app/features/explore/TraceView/components/CriticalPath/testCases/test7.ts b/public/app/features/explore/TraceView/components/CriticalPath/testCases/test7.ts
new file mode 100644
index 0000000000000..ef67a54181780
--- /dev/null
+++ b/public/app/features/explore/TraceView/components/CriticalPath/testCases/test7.ts
@@ -0,0 +1,113 @@
+// Copyright (c) 2023 The Jaeger Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/*
+   ┌─────────────────┐                    |
+   │     Span A      │                    |                         spanA
+   └───────┬─────────┘                    |                          /
+           │                              |                         /
+          ┌▼──────────────┐               |                       spanB
+          │    Span B     │               |                       /
+          └─────┬─────────┘               |                      /
+                │                         |                     spanC
+               ┌▼─────────────┐           |
+               │    Span C    │           |             ((parent-child tree))
+               └──────────────┘           |
+*/
+
+import { TraceResponse, transformTraceData } from '../../index';
+
+const trace: TraceResponse = {
+  traceID: 'trace-abc',
+  spans: [
+    {
+      traceID: 'trace-abc',
+      spanID: 'span-A',
+      operationName: 'op-A',
+      references: [],
+      startTime: 1,
+      duration: 29,
+      processID: 'p1',
+      logs: [],
+      flags: 0,
+    },
+    {
+      traceID: 'trace-abc',
+      spanID: 'span-B',
+      operationName: 'op-B',
+      references: [
+        {
+          refType: 'CHILD_OF',
+          spanID: 'span-A',
+          traceID: 'trace-abc',
+        },
+      ],
+      startTime: 15,
+      duration: 20,
+      processID: 'p1',
+      logs: [],
+      flags: 0,
+    },
+    {
+      traceID: 'trace-abc',
+      spanID: 'span-C',
+      operationName: 'op-C',
+      references: [
+        {
+          refType: 'CHILD_OF',
+          spanID: 'span-B',
+          traceID: 'trace-abc',
+        },
+      ],
+      startTime: 20,
+      duration: 20,
+      processID: 'p1',
+      logs: [],
+      flags: 0,
+    },
+  ],
+  processes: {
+    p1: {
+      serviceName: 'service-one',
+      tags: [],
+    },
+  },
+};
+
+const transformedTrace = transformTraceData(trace)!;
+
+const criticalPathSections = [
+  {
+    spanId: 'span-C',
+    section_start: 20,
+    section_end: 30,
+  },
+  {
+    spanId: 'span-B',
+    section_start: 15,
+    section_end: 20,
+  },
+  {
+    spanId: 'span-A',
+    section_start: 1,
+    section_end: 15,
+  },
+];
+
+const test7 = {
+  criticalPathSections,
+  trace: transformedTrace,
+};
+
+export default test7;
diff --git a/public/app/features/explore/TraceView/components/CriticalPath/testCases/test8.ts b/public/app/features/explore/TraceView/components/CriticalPath/testCases/test8.ts
new file mode 100644
index 0000000000000..4be57aa68db23
--- /dev/null
+++ b/public/app/features/explore/TraceView/components/CriticalPath/testCases/test8.ts
@@ -0,0 +1,82 @@
+// Copyright (c) 2023 The Jaeger Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { TraceResponse, transformTraceData } from '../../index';
+
+/*
+             ┌─────────────────┐                 |
+             │     Span A      │                 |                         spanA
+             └─────────────────┘                 |                          /
+                                                 |                         /
+          ┌──────────────────────┐               |                       spanB (CHILD_OF)
+          │        Span B        │               |
+          └──────────────────────┘               |              ((parent-child tree))
+*/
+
+const trace: TraceResponse = {
+  traceID: 'trace-abc',
+  spans: [
+    {
+      traceID: 'trace-abc',
+      spanID: 'span-A',
+      operationName: 'op-A',
+      references: [],
+      startTime: 10,
+      duration: 20,
+      processID: 'p1',
+      logs: [],
+      flags: 0,
+    },
+    {
+      traceID: 'trace-abc',
+      spanID: 'span-B',
+      operationName: 'op-B',
+      references: [
+        {
+          refType: 'CHILD_OF',
+          spanID: 'span-A',
+          traceID: 'trace-abc',
+        },
+      ],
+      startTime: 5,
+      duration: 30,
+      processID: 'p1',
+      logs: [],
+      flags: 0,
+    },
+  ],
+  processes: {
+    p1: {
+      serviceName: 'service-one',
+      tags: [],
+    },
+  },
+};
+
+const transformedTrace = transformTraceData(trace)!;
+
+const criticalPathSections = [
+  {
+    spanId: 'span-B',
+    section_start: 10,
+    section_end: 30,
+  },
+];
+
+const test8 = {
+  criticalPathSections,
+  trace: transformedTrace,
+};
+
+export default test8;
diff --git a/public/app/features/explore/TraceView/components/CriticalPath/testCases/test9.ts b/public/app/features/explore/TraceView/components/CriticalPath/testCases/test9.ts
new file mode 100644
index 0000000000000..b1e52d18f22b2
--- /dev/null
+++ b/public/app/features/explore/TraceView/components/CriticalPath/testCases/test9.ts
@@ -0,0 +1,84 @@
+// Copyright (c) 2023 The Jaeger Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { TraceResponse, transformTraceData } from '../../index';
+
+/*
+                    ┌──────────┐        |
+                    │ Span A   │        |                 span A
+                    └──────────┘        |                  /
+                    ++++++++++++        |                 /
+    ┌────────────┐                      |              span B
+    │  Span B    │                      |
+    └────────────┘                      |      (parent-child tree)
+spanB will be dropped.                  |
+span A is on critical path(+++++)       |
+*/
+
+const trace: TraceResponse = {
+  traceID: 'trace-abc',
+  spans: [
+    {
+      traceID: 'trace-abc',
+      spanID: 'span-A',
+      operationName: 'op-A',
+      references: [],
+      startTime: 10,
+      duration: 20,
+      processID: 'p1',
+      logs: [],
+      flags: 0,
+    },
+    {
+      traceID: 'trace-abc',
+      spanID: 'span-B',
+      operationName: 'op-B',
+      references: [
+        {
+          refType: 'CHILD_OF',
+          spanID: 'span-A',
+          traceID: 'trace-abc',
+        },
+      ],
+      startTime: 1,
+      duration: 4,
+      processID: 'p1',
+      logs: [],
+      flags: 0,
+    },
+  ],
+  processes: {
+    p1: {
+      serviceName: 'service-one',
+      tags: [],
+    },
+  },
+};
+
+const transformedTrace = transformTraceData(trace)!;
+
+const criticalPathSections = [
+  {
+    spanId: 'span-A',
+    section_start: 10,
+    section_end: 30,
+  },
+];
+
+const test9 = {
+  criticalPathSections,
+  trace: transformedTrace,
+};
+
+export default test9;
diff --git a/public/app/features/explore/TraceView/components/CriticalPath/utils/findLastFinishingChildSpan.test.ts b/public/app/features/explore/TraceView/components/CriticalPath/utils/findLastFinishingChildSpan.test.ts
new file mode 100644
index 0000000000000..27ed01b0f78d5
--- /dev/null
+++ b/public/app/features/explore/TraceView/components/CriticalPath/utils/findLastFinishingChildSpan.test.ts
@@ -0,0 +1,48 @@
+// Copyright (c) 2023 The Jaeger Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import test1 from '../testCases/test1';
+import test2 from '../testCases/test2';
+
+import findLastFinishingChildSpanId from './findLastFinishingChildSpan';
+import getChildOfSpans from './getChildOfSpans';
+import sanitizeOverFlowingChildren from './sanitizeOverFlowingChildren';
+
+describe('findLastFinishingChildSpanId', () => {
+  it('Should find lfc of a span correctly', () => {
+    const refinedSpanData = getChildOfSpans(new Map(test1.trace.spans.map((span) => [span.spanID, span])));
+    const sanitizedSpanMap = sanitizeOverFlowingChildren(refinedSpanData);
+
+    const currentSpan = sanitizedSpanMap.get('span-C')!;
+    let lastFinishingChildSpan = findLastFinishingChildSpanId(sanitizedSpanMap, currentSpan);
+    expect(lastFinishingChildSpan).toStrictEqual(sanitizedSpanMap.get('span-E'));
+
+    // Second Case to check if it works with spawn time or not
+    lastFinishingChildSpan = findLastFinishingChildSpanId(sanitizedSpanMap, currentSpan, 50);
+    expect(lastFinishingChildSpan).toStrictEqual(sanitizedSpanMap.get('span-D'));
+  });
+
+  it('Should find lfc of a span correctly', () => {
+    const refinedSpanData = getChildOfSpans(new Map(test2.trace.spans.map((span) => [span.spanID, span])));
+    const sanitizedSpanMap = sanitizeOverFlowingChildren(refinedSpanData);
+
+    const currentSpan = sanitizedSpanMap.get('span-X')!;
+    let lastFinishingChildSpanId = findLastFinishingChildSpanId(sanitizedSpanMap, currentSpan);
+    expect(lastFinishingChildSpanId).toStrictEqual(sanitizedSpanMap.get('span-C'));
+
+    // Second Case to check if it works with spawn time or not
+    lastFinishingChildSpanId = findLastFinishingChildSpanId(sanitizedSpanMap, currentSpan, 20);
+    expect(lastFinishingChildSpanId).toBeUndefined();
+  });
+});
diff --git a/public/app/features/explore/TraceView/components/CriticalPath/utils/findLastFinishingChildSpan.tsx b/public/app/features/explore/TraceView/components/CriticalPath/utils/findLastFinishingChildSpan.tsx
new file mode 100644
index 0000000000000..21bdc7edd22a1
--- /dev/null
+++ b/public/app/features/explore/TraceView/components/CriticalPath/utils/findLastFinishingChildSpan.tsx
@@ -0,0 +1,42 @@
+// Copyright (c) 2023 The Jaeger Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { TraceSpan } from '../../types';
+
+/**
+ * @returns - Returns the span that finished last among the remaining child spans.
+ * If a `returningChildStartTime` is provided as a parameter, it returns the child span that finishes
+ * just before the specified `returningChildStartTime`.
+ */
+const findLastFinishingChildSpan = (
+  spanMap: Map<string, TraceSpan>,
+  currentSpan: TraceSpan,
+  returningChildStartTime?: number
+): TraceSpan | undefined => {
+  let lastFinishingChildSpanId: string | undefined;
+  if (returningChildStartTime) {
+    lastFinishingChildSpanId = currentSpan?.childSpanIds.find(
+      (each) =>
+        // Look up the span using the map
+        spanMap.has(each) && spanMap.get(each)!.startTime + spanMap.get(each)!.duration < returningChildStartTime
+    );
+  } else {
+    // If `returningChildStartTime` is not provided, select the first child span.
+    // As they are sorted based on endTime
+    lastFinishingChildSpanId = currentSpan.childSpanIds[0];
+  }
+  return lastFinishingChildSpanId ? spanMap.get(lastFinishingChildSpanId) : undefined;
+};
+
+export default findLastFinishingChildSpan;
diff --git a/public/app/features/explore/TraceView/components/CriticalPath/utils/getChildOfSpans.test.ts b/public/app/features/explore/TraceView/components/CriticalPath/utils/getChildOfSpans.test.ts
new file mode 100644
index 0000000000000..f479114a4aeba
--- /dev/null
+++ b/public/app/features/explore/TraceView/components/CriticalPath/utils/getChildOfSpans.test.ts
@@ -0,0 +1,46 @@
+// Copyright (c) 2023 The Jaeger Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import test2 from '../testCases/test2';
+import test5 from '../testCases/test5';
+
+import getChildOfSpans from './getChildOfSpans';
+
+describe('getChildOfSpans', () => {
+  it('Should not remove CHILD_OF child spans if there are any', () => {
+    const spanMap = test2.trace.spans.reduce((map, span) => {
+      map.set(span.spanID, span);
+      return map;
+    }, new Map());
+    const refinedSpanMap = getChildOfSpans(spanMap);
+    const expectedRefinedSpanMap = spanMap;
+
+    expect(refinedSpanMap.size).toBe(3);
+    expect(refinedSpanMap).toStrictEqual(expectedRefinedSpanMap);
+  });
+  it('Should remove FOLLOWS_FROM child spans if there are any', () => {
+    const spanMap = test5.trace.spans.reduce((map, span) => {
+      map.set(span.spanID, span);
+      return map;
+    }, new Map());
+    const refinedSpanMap = getChildOfSpans(spanMap);
+    const expectedRefinedSpanMap = new Map().set(test5.trace.spans[0].spanID, {
+      ...test5.trace.spans[0],
+      childSpanIds: [],
+    });
+
+    expect(refinedSpanMap.size).toBe(1);
+    expect(refinedSpanMap).toStrictEqual(expectedRefinedSpanMap);
+  });
+});
diff --git a/public/app/features/explore/TraceView/components/CriticalPath/utils/getChildOfSpans.tsx b/public/app/features/explore/TraceView/components/CriticalPath/utils/getChildOfSpans.tsx
new file mode 100644
index 0000000000000..850c59c04c6d1
--- /dev/null
+++ b/public/app/features/explore/TraceView/components/CriticalPath/utils/getChildOfSpans.tsx
@@ -0,0 +1,54 @@
+// Copyright (c) 2023 The Jaeger Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { TraceSpan } from '../../types';
+
+/**
+ * Removes child spans whose refType is FOLLOWS_FROM and their descendants.
+ * @param spanMap - The map containing spans.
+ * @returns - A map with spans whose refType is CHILD_OF.
+ */
+const getChildOfSpans = (spanMap: Map<string, TraceSpan>): Map<string, TraceSpan> => {
+  const followFromSpanIds: string[] = [];
+  const followFromSpansDescendantIds: string[] = [];
+
+  // First find all FOLLOWS_FROM refType spans
+  spanMap.forEach((each) => {
+    if (each.references[0]?.refType === 'FOLLOWS_FROM') {
+      followFromSpanIds.push(each.spanID);
+      // Remove the spanId from childSpanIds array of its parentSpan
+      const parentSpan = spanMap.get(each.references[0].spanID)!;
+      parentSpan.childSpanIds = parentSpan.childSpanIds.filter((a) => a !== each.spanID);
+      spanMap.set(parentSpan.spanID, { ...parentSpan });
+    }
+  });
+
+  // Recursively find all Descendants of FOLLOWS_FROM spans
+  const findDescendantSpans = (spanIds: string[]) => {
+    spanIds.forEach((spanId) => {
+      const span = spanMap.get(spanId)!;
+      if (span.hasChildren) {
+        followFromSpansDescendantIds.push(...span.childSpanIds);
+        findDescendantSpans(span.childSpanIds);
+      }
+    });
+  };
+  findDescendantSpans(followFromSpanIds);
+  // Delete all FOLLOWS_FROM spans and its descendants
+  const idsToBeDeleted = [...followFromSpanIds, ...followFromSpansDescendantIds];
+  idsToBeDeleted.forEach((id) => spanMap.delete(id));
+
+  return spanMap;
+};
+export default getChildOfSpans;
diff --git a/public/app/features/explore/TraceView/components/CriticalPath/utils/sanitizeOverFlowingChildren.test.ts b/public/app/features/explore/TraceView/components/CriticalPath/utils/sanitizeOverFlowingChildren.test.ts
new file mode 100644
index 0000000000000..c27a6eab7325f
--- /dev/null
+++ b/public/app/features/explore/TraceView/components/CriticalPath/utils/sanitizeOverFlowingChildren.test.ts
@@ -0,0 +1,53 @@
+// Copyright (c) 2023 The Jaeger Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { TraceSpan } from '../../types';
+import test3 from '../testCases/test3';
+import test4 from '../testCases/test4';
+import test6 from '../testCases/test6';
+import test7 from '../testCases/test7';
+import test8 from '../testCases/test8';
+import test9 from '../testCases/test9';
+
+import getChildOfSpans from './getChildOfSpans';
+import sanitizeOverFlowingChildren from './sanitizeOverFlowingChildren';
+
+// Function to make expected data for test6 and test7
+function getExpectedSanitizedData(spans: TraceSpan[], test: 'test6' | 'test7' | 'test8') {
+  const testSanitizedData = {
+    test6: [spans[0], { ...spans[1], duration: 15 }, { ...spans[2], duration: 10, startTime: 15 }],
+    test7: [spans[0], { ...spans[1], duration: 15 }, { ...spans[2], duration: 10 }],
+    test8: [spans[0], { ...spans[1], startTime: 10, duration: 20 }],
+  };
+  const spanMap = testSanitizedData[test].reduce((map, span) => {
+    map.set(span.spanID, span);
+    return map;
+  }, new Map());
+  return spanMap;
+}
+
+describe.each([
+  [test3, new Map().set(test3.trace.spans[0].spanID, { ...test3.trace.spans[0], childSpanIds: [] })],
+  [test4, new Map().set(test4.trace.spans[0].spanID, { ...test4.trace.spans[0], childSpanIds: [] })],
+  [test6, getExpectedSanitizedData(test6.trace.spans, 'test6')],
+  [test7, getExpectedSanitizedData(test7.trace.spans, 'test7')],
+  [test8, getExpectedSanitizedData(test8.trace.spans, 'test8')],
+  [test9, new Map().set(test9.trace.spans[0].spanID, { ...test9.trace.spans[0], childSpanIds: [] })],
+])('sanitizeOverFlowingChildren', (testProps, expectedSanitizedData) => {
+  it('Should sanitize the data(overflowing spans) correctly', () => {
+    const refinedSpanData = getChildOfSpans(new Map(testProps.trace.spans.map((span) => [span.spanID, span])));
+    const sanitizedSpanMap = sanitizeOverFlowingChildren(refinedSpanData);
+    expect(sanitizedSpanMap).toStrictEqual(expectedSanitizedData);
+  });
+});
diff --git a/public/app/features/explore/TraceView/components/CriticalPath/utils/sanitizeOverFlowingChildren.tsx b/public/app/features/explore/TraceView/components/CriticalPath/utils/sanitizeOverFlowingChildren.tsx
new file mode 100644
index 0000000000000..2b0b93eef8ee2
--- /dev/null
+++ b/public/app/features/explore/TraceView/components/CriticalPath/utils/sanitizeOverFlowingChildren.tsx
@@ -0,0 +1,115 @@
+// Copyright (c) 2023 The Jaeger Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { TraceSpan } from '../../types';
+
+/**
+ * This function resolves overflowing child spans for each span.
+ * An overflowing child span is one whose time range falls outside its parent span's time range.
+ * The function adjusts the start time and duration of overflowing child spans
+ * to ensure they fit within the time range of their parent span.
+ * @param spanMap - A Map where span IDs are keys and the corresponding spans are values.
+ * @returns - A sanitized span Map.
+ */
+const sanitizeOverFlowingChildren = (spanMap: Map<string, TraceSpan>): Map<string, TraceSpan> => {
+  let spanIds: string[] = [...spanMap.keys()];
+
+  spanIds.forEach((spanId) => {
+    const span = spanMap.get(spanId)!;
+    if (!(span && span.references.length && span.depth)) {
+      return;
+    }
+    // parentSpan will be undefined when its parentSpan is dropped previously
+    const parentSpan = spanMap.get(span.references[0].spanID);
+
+    if (!parentSpan) {
+      // Drop the child spans of dropped parent span
+      spanMap.delete(span.spanID);
+      return;
+    }
+    const childEndTime = span.startTime + span.duration;
+    const parentEndTime = parentSpan.startTime + parentSpan.duration;
+    if (span.startTime >= parentSpan.startTime) {
+      if (span.startTime >= parentEndTime) {
+        // child outside of parent range => drop the child span
+        //      |----parent----|
+        //                        |----child--|
+        // Remove the childSpan from spanMap
+        spanMap.delete(span.spanID);
+
+        // Remove the childSpanId from its parent span
+        parentSpan.childSpanIds = parentSpan.childSpanIds.filter((id) => id !== span.spanID);
+        return;
+      }
+      if (childEndTime > parentEndTime) {
+        // child end after parent, truncate is needed
+        //      |----parent----|
+        //              |----child--|
+        spanMap.set(span.spanID, {
+          ...span,
+          duration: parentEndTime - span.startTime,
+        });
+        return;
+      }
+      // everything looks good
+      // |----parent----|
+      //   |----child--|
+      return;
+    }
+    if (childEndTime <= parentSpan.startTime) {
+      // child outside of parent range => drop the child span
+      //                      |----parent----|
+      //       |----child--|
+
+      // Remove the childSpan from spanMap
+      spanMap.delete(span.spanID);
+
+      // Remove the childSpanId from its parent span
+      parentSpan.childSpanIds = parentSpan.childSpanIds.filter((id) => id !== span.spanID);
+    } else if (childEndTime <= parentEndTime) {
+      // child start before parent, truncate is needed
+      //      |----parent----|
+      //   |----child--|
+      spanMap.set(span.spanID, {
+        ...span,
+        startTime: parentSpan.startTime,
+        duration: childEndTime - parentSpan.startTime,
+      });
+    } else {
+      // child start before parent and end after parent, truncate is needed
+      //      |----parent----|
+      //  |---------child---------|
+      spanMap.set(span.spanID, {
+        ...span,
+        startTime: parentSpan.startTime,
+        duration: parentEndTime - parentSpan.startTime,
+      });
+    }
+  });
+
+  // Updated spanIds to ensure to not include dropped spans
+  spanIds = [...spanMap.keys()];
+  // Update Child Span References with updated parent span
+  spanIds.forEach((spanId) => {
+    const span = spanMap.get(spanId)!;
+    if (span.references.length) {
+      const parentSpan = spanMap.get(span.references[0].spanID);
+      span.references[0].span = parentSpan;
+      spanMap.set(spanId, { ...span });
+    }
+  });
+
+  return spanMap;
+};
+export default sanitizeOverFlowingChildren;
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/Actions/TracePageActions.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/Actions/TracePageActions.tsx
index d71b4977ce0da..5595caf1e9a86 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/Actions/TracePageActions.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/Actions/TracePageActions.tsx
@@ -12,21 +12,22 @@ import ActionButton from './ActionButton';
 
 export const getStyles = (theme: GrafanaTheme2) => {
   return {
-    TracePageActions: css`
-      label: TracePageActions;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 4px;
-    `,
-    feedback: css`
-      margin: 6px;
-      color: ${theme.colors.text.secondary};
-      font-size: ${theme.typography.bodySmall.fontSize};
-      &:hover {
-        color: ${theme.colors.text.link};
-      }
-    `,
+    TracePageActions: css({
+      label: 'TracePageActions',
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'center',
+      gap: '4px',
+      marginBottom: '10px',
+    }),
+    feedback: css({
+      margin: '6px 6px 6px 0',
+      color: theme.colors.text.secondary,
+      fontSize: theme.typography.bodySmall.fontSize,
+      '&:hover': {
+        color: theme.colors.text.link,
+      },
+    }),
   };
 };
 
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/NextPrevResult.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/NextPrevResult.test.tsx
index fa042b933ab87..31883a9a7ca1d 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/NextPrevResult.test.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/NextPrevResult.test.tsx
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { render, screen, waitFor } from '@testing-library/react';
+import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React, { useState } from 'react';
 
@@ -109,22 +109,26 @@ describe('<NextPrevResult>', () => {
     const theme = createTheme();
     const tooltip = container.querySelector('.' + getStyles(theme, true).tooltip);
     expect(screen.getByText('0 matches')).toBeDefined();
-    userEvent.hover(tooltip!);
-    jest.advanceTimersByTime(1000);
-    await waitFor(() => {
-      expect(screen.getByText(/0 span matches for the filters selected/)).toBeDefined();
+
+    await user.hover(tooltip!);
+    await act(async () => {
+      jest.advanceTimersByTime(1000);
     });
+
+    expect(await screen.findByText(/0 span matches for the filters selected/)).toBeDefined();
   });
 
   it('renders services, depth correctly', async () => {
     const { container } = render(<NextPrevResultWithProps matches={['264afda25df92413', '364afda25df92413']} />);
     const theme = createTheme();
     const tooltip = container.querySelector('.' + getStyles(theme, true).tooltip);
-    userEvent.hover(tooltip!);
-    jest.advanceTimersByTime(1000);
-    await waitFor(() => {
-      expect(screen.getByText(/Services: 2\/3/)).toBeDefined();
-      expect(screen.getByText(/Depth: 1\/1/)).toBeDefined();
+
+    await user.hover(tooltip!);
+    await act(async () => {
+      jest.advanceTimersByTime(1000);
     });
+
+    expect(await screen.findByText(/Services: 2\/3/)).toBeDefined();
+    expect(await screen.findByText(/Depth: 1/)).toBeDefined();
   });
 });
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/NextPrevResult.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/NextPrevResult.tsx
index d4abc58acdc64..424aa66308fcd 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/NextPrevResult.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/NextPrevResult.tsx
@@ -129,8 +129,6 @@ export default memo(function NextPrevResult(props: NextPrevResultProps) {
 
   const getMatchesMetadata = useCallback(
     (depth: number, services: number) => {
-      const matchedServices: string[] = [];
-      const matchedDepth: number[] = [];
       let metadata = (
         <>
           <span>{`${trace.spans.length} spans`}</span>
@@ -144,13 +142,6 @@ export default memo(function NextPrevResult(props: NextPrevResultProps) {
       );
 
       if (spanFilterMatches) {
-        spanFilterMatches.forEach((spanID) => {
-          if (trace.processes[spanID]) {
-            matchedServices.push(trace.processes[spanID].serviceName);
-            matchedDepth.push(trace.spans.find((span) => span.spanID === spanID)?.depth || 0);
-          }
-        });
-
         if (spanFilterMatches.size === 0) {
           metadata = (
             <>
@@ -167,6 +158,13 @@ export default memo(function NextPrevResult(props: NextPrevResultProps) {
               ? `${focusedSpanIndexForSearch + 1}/${spanFilterMatches.size} ${type}`
               : `${spanFilterMatches.size} ${type}`;
 
+          const matchedServices: string[] = [];
+          spanFilterMatches.forEach((spanID) => {
+            if (trace.processes[spanID]) {
+              matchedServices.push(trace.processes[spanID].serviceName);
+            }
+          });
+
           metadata = (
             <>
               <span>{text}</span>
@@ -175,9 +173,7 @@ export default memo(function NextPrevResult(props: NextPrevResultProps) {
                   <div>
                     Services: {new Set(matchedServices).size}/{services}
                   </div>
-                  <div>
-                    Depth: {new Set(matchedDepth).size}/{depth}
-                  </div>
+                  <div>Depth: {depth}</div>
                 </>
               )}
             </>
@@ -248,6 +244,7 @@ export const getStyles = (theme: GrafanaTheme2, showSpanFilters: boolean) => {
     `,
     matches: css`
       margin-right: ${theme.spacing(2)};
+      text-wrap: nowrap;
     `,
     tooltip: css`
       color: #aaa;
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/TracePageSearchBar.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/TracePageSearchBar.test.tsx
index e343e54db44a8..691a85826e027 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/TracePageSearchBar.test.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/TracePageSearchBar.test.tsx
@@ -31,10 +31,12 @@ describe('<TracePageSearchBar>', () => {
       setFocusedSpanIdForSearch: jest.fn(),
       focusedSpanIndexForSearch: -1,
       setFocusedSpanIndexForSearch: jest.fn(),
+      setShowCriticalPathSpansOnly: jest.fn(),
       datasourceType: '',
       clear: jest.fn(),
       totalSpans: 100,
       showSpanFilters: true,
+      showCriticalPathSpansOnly: false,
     };
 
     return <TracePageSearchBar {...searchBarProps} />;
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/TracePageSearchBar.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/TracePageSearchBar.tsx
index 86f574891bcf5..0a49a52546ea6 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/TracePageSearchBar.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/TracePageSearchBar.tsx
@@ -31,6 +31,8 @@ export type TracePageSearchBarProps = {
   spanFilterMatches: Set<string> | undefined;
   showSpanFilterMatchesOnly: boolean;
   setShowSpanFilterMatchesOnly: (showMatchesOnly: boolean) => void;
+  showCriticalPathSpansOnly: boolean;
+  setShowCriticalPathSpansOnly: (showCriticalPath: boolean) => void;
   focusedSpanIndexForSearch: number;
   setFocusedSpanIndexForSearch: Dispatch<SetStateAction<number>>;
   setFocusedSpanIdForSearch: Dispatch<SetStateAction<string>>;
@@ -46,6 +48,8 @@ export default memo(function TracePageSearchBar(props: TracePageSearchBarProps)
     spanFilterMatches,
     showSpanFilterMatchesOnly,
     setShowSpanFilterMatchesOnly,
+    showCriticalPathSpansOnly,
+    setShowCriticalPathSpansOnly,
     focusedSpanIndexForSearch,
     setFocusedSpanIndexForSearch,
     setFocusedSpanIdForSearch,
@@ -65,15 +69,24 @@ export default memo(function TracePageSearchBar(props: TracePageSearchBarProps)
       search.tags.some((tag) => {
         return tag.key;
       }) ||
+      (search.query && search.query !== '') ||
       showSpanFilterMatchesOnly
     );
-  }, [search.serviceName, search.spanName, search.from, search.to, search.tags, showSpanFilterMatchesOnly]);
+  }, [
+    search.serviceName,
+    search.spanName,
+    search.from,
+    search.to,
+    search.tags,
+    search.query,
+    showSpanFilterMatchesOnly,
+  ]);
 
   return (
     <div className={styles.container}>
       <div className={styles.controls}>
         <>
-          <div className={styles.clearButton}>
+          <div>
             <Button
               variant="destructive"
               disabled={!clearEnabled}
@@ -101,6 +114,21 @@ export default memo(function TracePageSearchBar(props: TracePageSearchBarProps)
                 Show matches only
               </Button>
             </div>
+            <div className={styles.matchesOnly}>
+              <Switch
+                value={showCriticalPathSpansOnly}
+                onChange={(value) => setShowCriticalPathSpansOnly(value.currentTarget.checked ?? false)}
+                label="Show critical path only switch"
+              />
+              <Button
+                onClick={() => setShowCriticalPathSpansOnly(!showCriticalPathSpansOnly)}
+                className={styles.clearMatchesButton}
+                variant="secondary"
+                fill="text"
+              >
+                Show critical path only
+              </Button>
+            </div>
           </div>
           <div className={styles.nextPrevResult}>
             <NextPrevResult
@@ -133,9 +161,6 @@ export const getStyles = (theme: GrafanaTheme2) => {
       justify-content: flex-end;
       margin: 5px 0 0 0;
     `,
-    clearButton: css`
-      order: 1;
-    `,
     matchesOnly: css`
       display: inline-flex;
       margin: 0 0 0 25px;
@@ -151,7 +176,8 @@ export const getStyles = (theme: GrafanaTheme2) => {
     `,
     nextPrevResult: css`
       margin-left: auto;
-      order: 2;
+      display: flex;
+      align-items: center;
     `,
   };
 };
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.test.tsx
index 05f52f3e6c233..0f4f697978db8 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.test.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.test.tsx
@@ -52,12 +52,15 @@ describe('SpanFilters', () => {
   const SpanFiltersWithProps = ({ showFilters = true, matches }: { showFilters?: boolean; matches?: Set<string> }) => {
     const [search, setSearch] = useState(defaultFilters);
     const [showSpanFilterMatchesOnly, setShowSpanFilterMatchesOnly] = useState(false);
+    const [showCriticalPathSpansOnly, setShowCriticalPathSpansOnly] = useState(false);
     const props = {
       trace: trace,
       showSpanFilters: showFilters,
       setShowSpanFilters: jest.fn(),
       showSpanFilterMatchesOnly,
       setShowSpanFilterMatchesOnly,
+      showCriticalPathSpansOnly,
+      setShowCriticalPathSpansOnly,
       search,
       setSearch,
       spanFilterMatches: matches,
@@ -97,8 +100,6 @@ describe('SpanFilters', () => {
     const tagKey = screen.getByLabelText('Select tag key');
     const tagOperator = screen.getByLabelText('Select tag operator');
     const tagValue = screen.getByLabelText('Select tag value');
-    const addTag = screen.getByLabelText('Add tag');
-    const removeTag = screen.getByLabelText('Remove tag');
 
     expect(serviceOperator).toBeInTheDocument();
     expect(getElemText(serviceOperator)).toBe('=');
@@ -116,8 +117,6 @@ describe('SpanFilters', () => {
     expect(tagOperator).toBeInTheDocument();
     expect(getElemText(tagOperator)).toBe('=');
     expect(tagValue).toBeInTheDocument();
-    expect(addTag).toBeInTheDocument();
-    expect(removeTag).toBeInTheDocument();
 
     await user.click(serviceValue);
     jest.advanceTimersByTime(1000);
@@ -141,6 +140,7 @@ describe('SpanFilters', () => {
       expect(screen.getByText('ProcessKey1')).toBeInTheDocument();
       expect(screen.getByText('LogKey0')).toBeInTheDocument();
       expect(screen.getByText('LogKey1')).toBeInTheDocument();
+      expect(screen.getByPlaceholderText('Find...')).toBeInTheDocument();
     });
   });
 
@@ -190,9 +190,41 @@ describe('SpanFilters', () => {
     });
   });
 
+  it('should only show add/remove tag when necessary', async () => {
+    render(<SpanFiltersWithProps />);
+    expect(screen.queryAllByLabelText('Add tag').length).toBe(0); // not filled in the default tag, so no need to add another one
+    expect(screen.queryAllByLabelText('Remove tag').length).toBe(0); // mot filled in the default tag, so no values to remove
+    expect(screen.getAllByLabelText('Select tag key').length).toBe(1);
+
+    await selectAndCheckValue(user, screen.getByLabelText('Select tag key'), 'TagKey0');
+    expect(screen.getAllByLabelText('Add tag').length).toBe(1);
+    expect(screen.getAllByLabelText('Remove tag').length).toBe(1);
+
+    await user.click(screen.getByLabelText('Add tag'));
+    jest.advanceTimersByTime(1000);
+    expect(screen.queryAllByLabelText('Add tag').length).toBe(0); // not filled in the new tag, so no need to add another one
+    expect(screen.getAllByLabelText('Remove tag').length).toBe(2); // one for each tag
+    expect(screen.getAllByLabelText('Select tag key').length).toBe(2);
+
+    await user.click(screen.getAllByLabelText('Remove tag')[1]);
+    jest.advanceTimersByTime(1000);
+    expect(screen.queryAllByLabelText('Add tag').length).toBe(1); // filled in the default tag, so can add another one
+    expect(screen.queryAllByLabelText('Remove tag').length).toBe(1); // filled in the default tag, so can remove values
+    expect(screen.getAllByLabelText('Select tag key').length).toBe(1);
+
+    await user.click(screen.getAllByLabelText('Remove tag')[0]);
+    jest.advanceTimersByTime(1000);
+    expect(screen.queryAllByLabelText('Add tag').length).toBe(0); // not filled in the default tag, so no need to add another one
+    expect(screen.queryAllByLabelText('Remove tag').length).toBe(0); // mot filled in the default tag, so no values to remove
+    expect(screen.getAllByLabelText('Select tag key').length).toBe(1);
+  });
+
   it('should allow adding/removing tags', async () => {
     render(<SpanFiltersWithProps />);
     expect(screen.getAllByLabelText('Select tag key').length).toBe(1);
+    const tagKey = screen.getByLabelText('Select tag key');
+    await selectAndCheckValue(user, tagKey, 'TagKey0');
+
     await user.click(screen.getByLabelText('Add tag'));
     jest.advanceTimersByTime(1000);
     expect(screen.getAllByLabelText('Select tag key').length).toBe(2);
@@ -228,6 +260,8 @@ describe('SpanFilters', () => {
     expect(screen.queryByText('Span0')).not.toBeInTheDocument();
     expect(screen.queryByText('TagKey0')).not.toBeInTheDocument();
     expect(screen.queryByText('TagValue0')).not.toBeInTheDocument();
+    expect(screen.queryByText('Add tag')).not.toBeInTheDocument();
+    expect(screen.queryByText('Remove tag')).not.toBeInTheDocument();
     expect(matchesSwitch).not.toBeChecked();
   });
 
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx
index d3db03719c0c5..6de82f34043ed 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx
@@ -19,10 +19,11 @@ import React, { useState, useEffect, memo, useCallback } from 'react';
 
 import { GrafanaTheme2, SelectableValue, toOption } from '@grafana/data';
 import { AccessoryButton } from '@grafana/experimental';
+import { IntervalInput } from '@grafana/o11y-ds-frontend';
 import { Collapse, HorizontalGroup, Icon, InlineField, InlineFieldRow, Select, Tooltip, useStyles2 } from '@grafana/ui';
-import { IntervalInput } from 'app/core/components/IntervalInput/IntervalInput';
 
 import { defaultFilters, randomId, SearchProps, Tag } from '../../../useSearch';
+import SearchBarInput from '../../common/SearchBarInput';
 import { KIND, LIBRARY_NAME, LIBRARY_VERSION, STATUS, STATUS_MESSAGE, TRACE_STATE, ID } from '../../constants/span';
 import { Trace } from '../../types';
 import NextPrevResult from '../SearchBar/NextPrevResult';
@@ -37,6 +38,8 @@ export type SpanFilterProps = {
   showSpanFilterMatchesOnly: boolean;
   setShowSpanFilterMatchesOnly: (showMatchesOnly: boolean) => void;
   setFocusedSpanIdForSearch: React.Dispatch<React.SetStateAction<string>>;
+  showCriticalPathSpansOnly: boolean;
+  setShowCriticalPathSpansOnly: (showCriticalPathSpansOnly: boolean) => void;
   spanFilterMatches: Set<string> | undefined;
   datasourceType: string;
 };
@@ -50,6 +53,8 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
     setShowSpanFilters,
     showSpanFilterMatchesOnly,
     setShowSpanFilterMatchesOnly,
+    showCriticalPathSpansOnly,
+    setShowCriticalPathSpansOnly,
     setFocusedSpanIdForSearch,
     spanFilterMatches,
     datasourceType,
@@ -294,7 +299,7 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
   return (
     <div className={styles.container}>
       <Collapse label={collapseLabel} collapsible={true} isOpen={showSpanFilters} onToggle={setShowSpanFilters}>
-        <InlineFieldRow>
+        <InlineFieldRow className={styles.flexContainer}>
           <InlineField label="Service Name" labelWidth={16}>
             <HorizontalGroup spacing={'xs'}>
               <Select
@@ -314,6 +319,15 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
               />
             </HorizontalGroup>
           </InlineField>
+          <SearchBarInput
+            onChange={(v) => {
+              setSpanFiltersSearch({ ...search, query: v });
+              if (v === '') {
+                setShowSpanFilterMatchesOnly(false);
+              }
+            }}
+            value={search.query || ''}
+          />
         </InlineFieldRow>
         <InlineFieldRow>
           <InlineField label="Span Name" labelWidth={16}>
@@ -338,9 +352,9 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
         </InlineFieldRow>
         <InlineFieldRow>
           <InlineField
-            label="Span Duration"
+            label="Duration"
             labelWidth={16}
-            tooltip="Filter by span duration. Accepted units are ns, us, ms, s, m, h"
+            tooltip="Filter by duration. Accepted units are ns, us, ms, s, m, h"
           >
             <HorizontalGroup spacing="xs" align="flex-start">
               <Select
@@ -425,24 +439,26 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
                         value={tag.value}
                       />
                     </span>
-                    <AccessoryButton
-                      aria-label="Remove tag"
-                      variant="secondary"
-                      icon="times"
-                      onClick={() => removeTag(tag.id)}
-                      title="Remove tag"
-                    />
-                    <span className={styles.addTag}>
-                      {search?.tags?.length && i === search.tags.length - 1 && (
+                    {(tag.key || tag.value || search.tags.length > 1) && (
+                      <AccessoryButton
+                        aria-label="Remove tag"
+                        variant="secondary"
+                        icon="times"
+                        onClick={() => removeTag(tag.id)}
+                        tooltip="Remove tag"
+                      />
+                    )}
+                    {(tag.key || tag.value) && i === search.tags.length - 1 && (
+                      <span className={styles.addTag}>
                         <AccessoryButton
                           aria-label="Add tag"
                           variant="secondary"
                           icon="plus"
                           onClick={addTag}
-                          title="Add tag"
+                          tooltip="Add tag"
                         />
-                      )}
-                    </span>
+                      </span>
+                    )}
                   </HorizontalGroup>
                 </div>
               ))}
@@ -456,6 +472,8 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
           spanFilterMatches={spanFilterMatches}
           showSpanFilterMatchesOnly={showSpanFilterMatchesOnly}
           setShowSpanFilterMatchesOnly={setShowSpanFilterMatchesOnly}
+          showCriticalPathSpansOnly={showCriticalPathSpansOnly}
+          setShowCriticalPathSpansOnly={setShowCriticalPathSpansOnly}
           setFocusedSpanIdForSearch={setFocusedSpanIdForSearch}
           focusedSpanIndexForSearch={focusedSpanIndexForSearch}
           setFocusedSpanIndexForSearch={setFocusedSpanIndexForSearch}
@@ -473,6 +491,7 @@ SpanFilters.displayName = 'SpanFilters';
 const getStyles = (theme: GrafanaTheme2) => {
   return {
     container: css`
+      label: SpanFilters;
       margin: 0.5em 0 -${theme.spacing(1)} 0;
       z-index: 5;
 
@@ -487,9 +506,13 @@ const getStyles = (theme: GrafanaTheme2) => {
         margin: -2px 0 0 10px;
       }
     `,
-    addTag: css`
-      margin: 0 0 0 10px;
-    `,
+    flexContainer: css({
+      display: 'flex',
+      justifyContent: 'space-between',
+    }),
+    addTag: css({
+      marginLeft: theme.spacing(1),
+    }),
     intervalInput: css`
       margin: 0 -4px 0 0;
     `,
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/ViewingLayer.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/ViewingLayer.tsx
index a8a12ac1e646b..eab96c7525e03 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/ViewingLayer.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/ViewingLayer.tsx
@@ -236,6 +236,7 @@ export class UnthemedViewingLayer extends React.PureComponent<ViewingLayerProps,
   };
 
   _handleReframeMouseLeave = () => {
+    this._draggerReframe.resetBounds();
     this.props.updateNextViewRangeTime({ cursor: null });
   };
 
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/index.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/index.tsx
index f7c05fa723a34..64595920cf5c4 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/index.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/index.tsx
@@ -12,18 +12,28 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import cx from 'classnames';
+import { css } from '@emotion/css';
 import memoizeOne from 'memoize-one';
 import * as React from 'react';
 
 import { TUpdateViewRangeTimeFunction, ViewRange, ViewRangeTimeUpdate } from '../../index';
 import { TraceSpan, Trace } from '../../types';
-import { ubPb2, ubPx2, ubRelative } from '../../uberUtilityStyles';
 
 import CanvasSpanGraph from './CanvasSpanGraph';
 import TickLabels from './TickLabels';
 import ViewingLayer from './ViewingLayer';
 
+const getStyles = () => {
+  return {
+    container: css({
+      padding: '0 0.5rem 0.5rem 0.5rem',
+    }),
+    canvasContainer: css({
+      position: 'relative',
+    }),
+  };
+};
+
 const DEFAULT_HEIGHT = 60;
 export const TIMELINE_TICK_INTERVAL = 4;
 
@@ -62,15 +72,17 @@ export default class SpanGraph extends React.PureComponent<SpanGraphProps> {
 
   render() {
     const { height, trace, viewRange, updateNextViewRangeTime, updateViewRangeTime } = this.props;
+    const styles = getStyles();
+
     if (!trace) {
       return <div />;
     }
 
     const items = memoizedGetitems(trace);
     return (
-      <div className={cx(ubPb2, ubPx2)}>
+      <div className={styles.container}>
         <TickLabels numTicks={TIMELINE_TICK_INTERVAL} duration={trace.duration} />
-        <div className={ubRelative}>
+        <div className={styles.canvasContainer}>
           <CanvasSpanGraph valueWidth={trace.duration} items={items} />
           <ViewingLayer
             viewRange={viewRange}
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/TracePageHeader.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/TracePageHeader.test.tsx
index 65d7298309936..428041291291e 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/TracePageHeader.test.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/TracePageHeader.test.tsx
@@ -31,6 +31,8 @@ const setup = () => {
     setShowSpanFilters: jest.fn(),
     showSpanFilterMatchesOnly: false,
     setShowSpanFilterMatchesOnly: jest.fn(),
+    showCriticalPathSpansOnly: false,
+    setShowCriticalPathSpansOnly: jest.fn(),
     spanFilterMatches: undefined,
     setFocusedSpanIdForSearch: jest.fn(),
     datasourceType: 'tempo',
@@ -86,6 +88,7 @@ export const trace = {
       hasChildren: false,
       childSpanCount: 0,
       warnings: [],
+      childSpanIds: [],
     },
     {
       traceID: '164afda25df92413',
@@ -125,6 +128,7 @@ export const trace = {
       hasChildren: false,
       childSpanCount: 0,
       warnings: [],
+      childSpanIds: [],
     },
     {
       traceID: '164afda25df92413',
@@ -164,6 +168,7 @@ export const trace = {
       hasChildren: false,
       childSpanCount: 0,
       warnings: [],
+      childSpanIds: [],
     },
   ],
   traceID: '8bb35a31-eb64-512d-aaed-ddd61887bb2b',
diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/TracePageHeader.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/TracePageHeader.tsx
index 1935ac0a0ea9b..a39672f965264 100644
--- a/public/app/features/explore/TraceView/components/TracePageHeader/TracePageHeader.tsx
+++ b/public/app/features/explore/TraceView/components/TracePageHeader/TracePageHeader.tsx
@@ -42,6 +42,8 @@ export type TracePageHeaderProps = {
   setShowSpanFilters: (isOpen: boolean) => void;
   showSpanFilterMatchesOnly: boolean;
   setShowSpanFilterMatchesOnly: (showMatchesOnly: boolean) => void;
+  showCriticalPathSpansOnly: boolean;
+  setShowCriticalPathSpansOnly: (showCriticalPathSpansOnly: boolean) => void;
   setFocusedSpanIdForSearch: React.Dispatch<React.SetStateAction<string>>;
   spanFilterMatches: Set<string> | undefined;
   datasourceType: string;
@@ -60,6 +62,8 @@ export const TracePageHeader = memo((props: TracePageHeaderProps) => {
     setShowSpanFilters,
     showSpanFilterMatchesOnly,
     setShowSpanFilterMatchesOnly,
+    showCriticalPathSpansOnly,
+    setShowCriticalPathSpansOnly,
     setFocusedSpanIdForSearch,
     spanFilterMatches,
     datasourceType,
@@ -152,6 +156,8 @@ export const TracePageHeader = memo((props: TracePageHeaderProps) => {
         setShowSpanFilters={setShowSpanFilters}
         showSpanFilterMatchesOnly={showSpanFilterMatchesOnly}
         setShowSpanFilterMatchesOnly={setShowSpanFilterMatchesOnly}
+        showCriticalPathSpansOnly={showCriticalPathSpansOnly}
+        setShowCriticalPathSpansOnly={setShowCriticalPathSpansOnly}
         search={search}
         setSearch={setSearch}
         spanFilterMatches={spanFilterMatches}
@@ -196,30 +202,34 @@ const getNewStyles = (theme: GrafanaTheme2) => {
         color: unset;
       }
     `,
-    header: css`
-      label: TracePageHeader;
-      background-color: ${theme.colors.background.primary};
-      padding: 0.5em 0 0 0;
-      position: sticky;
-      top: 0;
-      z-index: 5;
-    `,
-    titleRow: css`
-      align-items: flex-start;
-      display: flex;
-      padding: 0 8px;
-    `,
-    title: css`
-      color: inherit;
-      flex: 1;
-      font-size: 1.7em;
-      line-height: 1em;
-    `,
-    subtitle: css`
-      flex: 1;
-      line-height: 1em;
-      margin: -0.5em 0.5em 0.75em 0.5em;
-    `,
+    header: css({
+      label: 'TracePageHeader',
+      backgroundColor: theme.colors.background.primary,
+      padding: '0.5em 0 0 0',
+      position: 'sticky',
+      top: 0,
+      zIndex: 5,
+      textAlign: 'left',
+    }),
+    titleRow: css({
+      alignItems: 'flex-start',
+      display: 'flex',
+      padding: '0 8px',
+      flexWrap: 'wrap',
+    }),
+    title: css({
+      color: 'inherit',
+      flex: 1,
+      fontSize: '1.7em',
+      lineHeight: '1em',
+      marginBottom: 0,
+      minWidth: '200px',
+    }),
+    subtitle: css({
+      flex: 1,
+      lineHeight: '1em',
+      margin: '-0.5em 0.5em 0.75em 0.5em',
+    }),
     tag: css`
       margin: 0 0.5em 0 0;
     `,
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/ListView/index.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/ListView/index.test.tsx
index 0ce12997d51cf..aea197eb6a173 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/ListView/index.test.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/ListView/index.test.tsx
@@ -47,6 +47,7 @@ const props = {
   viewBuffer: 10,
   viewBufferMin: 5,
   windowScroller: true,
+  redraw: {},
 };
 
 describe('<ListView />', () => {
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/ListView/index.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/ListView/index.tsx
index 67ae5344c5e6e..91a5717239533 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/ListView/index.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/ListView/index.tsx
@@ -46,6 +46,10 @@ export type TListViewProps = {
    * Number of items to draw and add to the DOM, initially.
    */
   initialDraw?: number;
+  /**
+   * Trigger a redraw of the list view.
+   */
+  redraw: {};
   /**
    * The parent provides fallback height measurements when there is not a
    * rendered element to measure.
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBar.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBar.tsx
index c00a5d9be8dcd..4f7e4707a421f 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBar.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBar.tsx
@@ -19,76 +19,85 @@ import React, { useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { useStyles2 } from '@grafana/ui';
+import { Tooltip, useStyles2 } from '@grafana/ui';
 
 import { autoColor } from '../Theme';
 import { Popover } from '../common/Popover';
-import { TraceSpan, TNil } from '../types';
+import { TraceSpan, TNil, CriticalPathSection } from '../types';
 
 import AccordianLogs from './SpanDetail/AccordianLogs';
 import { ViewedBoundsFunctionType } from './utils';
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
-    wrapper: css`
-      label: wrapper;
-      bottom: 0;
-      left: 0;
-      position: absolute;
-      right: 0;
-      top: 0;
-      overflow: hidden;
-      z-index: 0;
-    `,
-    bar: css`
-      label: bar;
-      border-radius: 3px;
-      min-width: 2px;
-      position: absolute;
-      height: 36%;
-      top: 32%;
-    `,
-    rpc: css`
-      label: rpc;
-      position: absolute;
-      top: 35%;
-      bottom: 35%;
-      z-index: 1;
-    `,
-    label: css`
-      label: label;
-      color: #aaa;
-      font-size: 12px;
-      font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-      line-height: 1em;
-      white-space: nowrap;
-      padding: 0 0.5em;
-      position: absolute;
-    `,
-    logMarker: css`
-      label: logMarker;
-      background-color: ${autoColor(theme, '#2c3235')};
-      cursor: pointer;
-      height: 60%;
-      min-width: 1px;
-      position: absolute;
-      top: 20%;
-      &:hover {
-        background-color: ${autoColor(theme, '#464c54')};
-      }
-      &::before,
-      &::after {
-        content: '';
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        right: 0;
-        border: 1px solid transparent;
-      }
-      &::after {
-        left: 0;
-      }
-    `,
+    wrapper: css({
+      label: 'wrapper',
+      bottom: 0,
+      left: 0,
+      position: 'absolute',
+      right: 0,
+      top: 0,
+      overflow: 'hidden',
+      zIndex: 0,
+    }),
+    bar: css({
+      label: 'bar',
+      borderRadius: theme.shape.radius.default,
+      minWidth: '2px',
+      position: 'absolute',
+      height: '36%',
+      top: '32%',
+    }),
+    rpc: css({
+      label: 'rpc',
+      position: 'absolute',
+      top: '35%',
+      bottom: '35%',
+      zIndex: 1,
+    }),
+    label: css({
+      label: 'label',
+      color: '#aaa',
+      fontSize: '12px',
+      fontFamily: "'Helvetica Neue', Helvetica, Arial, sans - serif",
+      lineHeight: '1em',
+      whiteSpace: 'nowrap',
+      padding: '0 0.5em',
+      position: 'absolute',
+    }),
+    logMarker: css({
+      label: 'logMarker',
+      backgroundColor: autoColor(theme, '#2c3235'),
+      cursor: 'pointer',
+      height: '60%',
+      minWidth: '1px',
+      position: 'absolute',
+      top: '20%',
+      '&:hover': {
+        backgroundColor: autoColor(theme, '#464c54'),
+      },
+      '&::before, &::after': {
+        content: "''",
+        position: 'absolute',
+        top: 0,
+        bottom: 0,
+        right: 0,
+        border: '1px solid transparent',
+      },
+      '&::after': {
+        left: 0,
+      },
+    }),
+    criticalPath: css({
+      position: 'absolute',
+      top: '45%',
+      height: '11%',
+      zIndex: 2,
+      overflow: 'hidden',
+      background: autoColor(theme, '#f1f1f1'),
+      borderLeft: `1px solid ${autoColor(theme, '#2c3235')}`,
+      borderRight: `1px solid ${autoColor(theme, '#2c3235')}`,
+    }),
   };
 };
 
@@ -111,13 +120,19 @@ export type Props = {
   labelClassName?: string;
   longLabel: string;
   shortLabel: string;
+  criticalPath: CriticalPathSection[];
 };
 
 function toPercent(value: number) {
   return `${(value * 100).toFixed(1)}%`;
 }
 
+function toPercentInDecimal(value: number) {
+  return `${value * 100}%`;
+}
+
 function SpanBar({
+  criticalPath,
   viewEnd,
   viewStart,
   getViewedBounds,
@@ -156,7 +171,7 @@ function SpanBar({
     >
       <div
         aria-label={label}
-        className={styles.bar}
+        className={cx(styles.bar)}
         style={{
           background: color,
           left: toPercent(viewStart),
@@ -175,13 +190,13 @@ function SpanBar({
               <AccordianLogs interactive={false} isOpen logs={logGroups[positionKey]} timestamp={traceStartTime} />
             }
           >
-            <div data-testid="SpanBar--logMarker" className={styles.logMarker} style={{ left: positionKey }} />
+            <div data-testid="SpanBar--logMarker" className={cx(styles.logMarker)} style={{ left: positionKey }} />
           </Popover>
         ))}
       </div>
       {rpc && (
         <div
-          className={styles.rpc}
+          className={cx(styles.rpc)}
           style={{
             background: rpc.color,
             left: toPercent(rpc.viewStart),
@@ -189,6 +204,32 @@ function SpanBar({
           }}
         />
       )}
+      {criticalPath?.map((each, index) => {
+        const critcalPathViewBounds = getViewedBounds(each.section_start, each.section_end);
+        const criticalPathViewStart = critcalPathViewBounds.start;
+        const criticalPathViewEnd = critcalPathViewBounds.end;
+        const key = `${each.spanId}-${index}`;
+        return (
+          <Tooltip
+            key={key}
+            placement="top"
+            content={
+              <div>
+                A segment on the <em>critical path</em> of the overall trace / request / workflow.
+              </div>
+            }
+          >
+            <div
+              data-testid="SpanBar--criticalPath"
+              className={styles.criticalPath}
+              style={{
+                left: toPercentInDecimal(criticalPathViewStart),
+                width: toPercentInDecimal(criticalPathViewEnd - criticalPathViewStart),
+              }}
+            />
+          </Tooltip>
+        );
+      })}
     </div>
   );
 }
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBarRow.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBarRow.test.tsx
index 6d43873cadf50..d4a76ca054b17 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBarRow.test.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBarRow.test.tsx
@@ -16,7 +16,8 @@ import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { NONE, DURATION, TAG } from '../settings/SpanBarSettings';
+import { DURATION, NONE, TAG } from '@grafana/o11y-ds-frontend';
+
 import { SpanLinkDef, TraceSpan } from '../types';
 
 import SpanBarRow, { SpanBarRowProps } from './SpanBarRow';
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBarRow.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBarRow.tsx
index f74e8258d989b..cc864bd6ac8cf 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBarRow.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBarRow.tsx
@@ -17,11 +17,11 @@ import cx from 'classnames';
 import * as React from 'react';
 
 import { GrafanaTheme2, TraceKeyValuePair } from '@grafana/data';
+import { DURATION, NONE, TAG } from '@grafana/o11y-ds-frontend';
 import { Icon, stylesFactory, withTheme2 } from '@grafana/ui';
 
 import { autoColor } from '../Theme';
-import { DURATION, NONE, TAG } from '../settings/SpanBarSettings';
-import { SpanBarOptions, SpanLinkFunc, TraceSpan, TNil } from '../types';
+import { SpanBarOptions, SpanLinkFunc, TraceSpan, TNil, CriticalPathSection } from '../types';
 
 import SpanBar from './SpanBar';
 import { SpanLinksMenu } from './SpanLinks';
@@ -324,6 +324,7 @@ export type SpanBarRowProps = {
   createSpanLink?: SpanLinkFunc;
   datasourceType: string;
   visibleSpanIds: string[];
+  criticalPath: CriticalPathSection[];
 };
 
 /**
@@ -377,6 +378,7 @@ export class UnthemedSpanBarRow extends React.PureComponent<SpanBarRowProps> {
       datasourceType,
       showServiceName,
       visibleSpanIds,
+      criticalPath,
     } = this.props;
     const {
       duration,
@@ -530,6 +532,7 @@ export class UnthemedSpanBarRow extends React.PureComponent<SpanBarRowProps> {
         >
           <Ticks numTicks={numTicks} />
           <SpanBar
+            criticalPath={criticalPath}
             rpc={rpc}
             viewStart={viewStart}
             viewEnd={viewEnd}
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianKeyValues.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianKeyValues.tsx
index dfc31d55f8d8b..d03bbb0fdb04d 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianKeyValues.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianKeyValues.tsx
@@ -21,13 +21,17 @@ import { Icon, useStyles2 } from '@grafana/ui';
 
 import { autoColor } from '../../Theme';
 import { TraceKeyValuePair, TraceLink, TNil } from '../../types';
-import { uAlignIcon, uTxEllipsis } from '../../uberUtilityStyles';
 
 import * as markers from './AccordianKeyValues.markers';
 import KeyValuesTable from './KeyValuesTable';
 
+import { alignIcon } from '.';
+
 export const getStyles = (theme: GrafanaTheme2) => {
   return {
+    container: css({
+      textOverflow: 'ellipsis',
+    }),
     header: css`
       label: header;
       cursor: pointer;
@@ -125,7 +129,7 @@ export default function AccordianKeyValues(props: AccordianKeyValuesProps) {
   const { className, data, highContrast, interactive, isOpen, label, linksGetter, onToggle } = props;
   const isEmpty = !Array.isArray(data) || !data.length;
   const styles = useStyles2(getStyles);
-  const iconCls = cx(uAlignIcon, { [styles.emptyIcon]: isEmpty });
+  const iconCls = cx(alignIcon, { [styles.emptyIcon]: isEmpty });
   let arrow: React.ReactNode | null = null;
   let headerProps: {} | null = null;
   if (interactive) {
@@ -142,7 +146,7 @@ export default function AccordianKeyValues(props: AccordianKeyValuesProps) {
   }
 
   return (
-    <div className={cx(className, uTxEllipsis)}>
+    <div className={cx(className, styles.container)}>
       <div
         className={cx(styles.header, {
           [styles.headerEmpty]: isEmpty,
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianLogs.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianLogs.tsx
index 2eb8abefad3fd..e627d199be2eb 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianLogs.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianLogs.tsx
@@ -22,11 +22,12 @@ import { Icon, useStyles2 } from '@grafana/ui';
 import { autoColor } from '../../Theme';
 import { TNil } from '../../types';
 import { TraceLog, TraceKeyValuePair, TraceLink } from '../../types/trace';
-import { uAlignIcon, ubMb1 } from '../../uberUtilityStyles';
 import { formatDuration } from '../utils';
 
 import AccordianKeyValues from './AccordianKeyValues';
 
+import { alignIcon } from '.';
+
 const getStyles = (theme: GrafanaTheme2) => {
   return {
     AccordianLogs: css`
@@ -55,6 +56,9 @@ const getStyles = (theme: GrafanaTheme2) => {
       label: AccordianLogsFooter;
       color: ${autoColor(theme, '#999')};
     `,
+    AccordianKeyValuesItem: css({
+      marginBottom: theme.spacing(0.5),
+    }),
   };
 };
 
@@ -76,7 +80,7 @@ export default function AccordianLogs(props: AccordianLogsProps) {
   let headerProps: {} | null = null;
   if (interactive) {
     arrow = isOpen ? (
-      <Icon name={'angle-down'} className={uAlignIcon} />
+      <Icon name={'angle-down'} className={alignIcon} />
     ) : (
       <Icon name={'angle-right'} className="u-align-icon" />
     );
@@ -100,7 +104,7 @@ export default function AccordianLogs(props: AccordianLogsProps) {
             <AccordianKeyValues
               // `i` is necessary in the key because timestamps can repeat
               key={`${log.timestamp}-${i}`}
-              className={i < logs.length - 1 ? ubMb1 : null}
+              className={i < logs.length - 1 ? styles.AccordianKeyValuesItem : null}
               data={log.fields || []}
               highContrast
               interactive={interactive}
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianReferences.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianReferences.tsx
index 66bcaceece605..dfc7ac11f09c9 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianReferences.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianReferences.tsx
@@ -20,11 +20,12 @@ import { Icon, useStyles2 } from '@grafana/ui';
 
 import { autoColor } from '../../Theme';
 import { TraceSpanReference } from '../../types/trace';
-import { uAlignIcon, ubMb1 } from '../../uberUtilityStyles';
 import ReferenceLink from '../../url/ReferenceLink';
 
 import AccordianKeyValues from './AccordianKeyValues';
 
+import { alignIcon } from '.';
+
 const getStyles = (theme: GrafanaTheme2) => {
   return {
     AccordianReferenceItem: css`
@@ -59,6 +60,9 @@ const getStyles = (theme: GrafanaTheme2) => {
       label: AccordianReferencesFooter;
       color: ${autoColor(theme, '#999')};
     `,
+    AccordianKeyValuesItem: css({
+      marginBottom: theme.spacing(0.5),
+    }),
     ReferencesList: css`
       background: #fff;
       border: 1px solid #ddd;
@@ -166,7 +170,7 @@ export function References(props: ReferenceItemProps) {
           {!!reference.tags?.length && (
             <div className={styles.AccordianKeyValues}>
               <AccordianKeyValues
-                className={i < data.length - 1 ? ubMb1 : null}
+                className={i < data.length - 1 ? styles.AccordianKeyValuesItem : null}
                 data={reference.tags || []}
                 highContrast
                 interactive={interactive}
@@ -198,9 +202,9 @@ const AccordianReferences = ({
   let headerProps: {} | null = null;
   if (interactive) {
     arrow = isOpen ? (
-      <Icon name={'angle-down'} className={uAlignIcon} />
+      <Icon name={'angle-down'} className={alignIcon} />
     ) : (
-      <Icon name={'angle-right'} className={uAlignIcon} />
+      <Icon name={'angle-right'} className={alignIcon} />
     );
     HeaderComponent = 'a';
     headerProps = {
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianText.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianText.tsx
index bcc2d6fa886d9..07ffdb0854984 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianText.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianText.tsx
@@ -21,11 +21,12 @@ import { Icon, useStyles2 } from '@grafana/ui';
 
 import { autoColor } from '../../Theme';
 import { TNil } from '../../types';
-import { uAlignIcon } from '../../uberUtilityStyles';
 
 import { getStyles as getAccordianKeyValuesStyles } from './AccordianKeyValues';
 import TextList from './TextList';
 
+import { alignIcon } from '.';
+
 const getStyles = (theme: GrafanaTheme2) => {
   return {
     header: css`
@@ -70,7 +71,7 @@ export default function AccordianText(props: AccordianTextProps) {
   } = props;
   const isEmpty = !Array.isArray(data) || !data.length;
   const accordianKeyValuesStyles = useStyles2(getAccordianKeyValuesStyles);
-  const iconCls = cx(uAlignIcon, { [accordianKeyValuesStyles.emptyIcon]: isEmpty });
+  const iconCls = cx(alignIcon, { [accordianKeyValuesStyles.emptyIcon]: isEmpty });
   let arrow: React.ReactNode | null = null;
   let headerProps: {} | null = null;
   if (interactive) {
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/KeyValuesTable.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/KeyValuesTable.tsx
index 0860b1a62e6fe..6e80b457e2755 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/KeyValuesTable.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/KeyValuesTable.tsx
@@ -22,7 +22,6 @@ import { Icon, useStyles2 } from '@grafana/ui';
 import { autoColor } from '../../Theme';
 import CopyIcon from '../../common/CopyIcon';
 import { TraceKeyValuePair, TraceLink, TNil } from '../../types';
-import { ubInlineBlock, uWidth100 } from '../../uberUtilityStyles';
 
 import jsonMarkup from './jsonMarkup';
 
@@ -38,6 +37,9 @@ export const getStyles = (theme: GrafanaTheme2) => {
       max-height: 450px;
       overflow: auto;
     `,
+    table: css({
+      width: '100%',
+    }),
     body: css`
       label: body;
       vertical-align: baseline;
@@ -70,6 +72,9 @@ export const getStyles = (theme: GrafanaTheme2) => {
       vertical-align: middle;
       font-weight: bold;
     `,
+    jsonTable: css({
+      display: 'inline-block',
+    }),
   };
 };
 
@@ -109,13 +114,13 @@ export default function KeyValuesTable(props: KeyValuesTableProps) {
   const styles = useStyles2(getStyles);
   return (
     <div className={cx(styles.KeyValueTable)} data-testid="KeyValueTable">
-      <table className={uWidth100}>
+      <table className={styles.table}>
         <tbody className={styles.body}>
           {data.map((row, i) => {
             const markup = {
               __html: jsonMarkup(parseIfComplexJson(row.value)),
             };
-            const jsonTable = <div className={ubInlineBlock} dangerouslySetInnerHTML={markup} />;
+            const jsonTable = <div className={styles.jsonTable} dangerouslySetInnerHTML={markup} />;
             const links = linksGetter ? linksGetter(data, i) : null;
             let valueMarkup;
             if (links && links.length) {
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/SpanFlameGraph.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/SpanFlameGraph.tsx
new file mode 100644
index 0000000000000..b8c435175b096
--- /dev/null
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/SpanFlameGraph.tsx
@@ -0,0 +1,201 @@
+import { css } from '@emotion/css';
+import React, { useCallback, useEffect } from 'react';
+import { useMeasure } from 'react-use';
+import { lastValueFrom } from 'rxjs';
+
+import {
+  CoreApp,
+  DataFrame,
+  DataQueryRequest,
+  DataSourceInstanceSettings,
+  DataSourceJsonData,
+  dateTime,
+  TimeZone,
+} from '@grafana/data';
+import { FlameGraph } from '@grafana/flamegraph';
+import { TraceToProfilesOptions } from '@grafana/o11y-ds-frontend';
+import { config, DataSourceWithBackend, getTemplateSrv } from '@grafana/runtime';
+import { useStyles2 } from '@grafana/ui';
+import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
+import { PyroscopeQueryType } from 'app/plugins/datasource/grafana-pyroscope-datasource/dataquery.gen';
+import { Query } from 'app/plugins/datasource/grafana-pyroscope-datasource/types';
+
+import {
+  defaultProfilingKeys,
+  getFormattedTags,
+  pyroscopeProfileIdTagKey,
+  scopedVarsFromSpan,
+  scopedVarsFromTags,
+  scopedVarsFromTrace,
+} from '../../../createSpanLink';
+import { TraceSpan } from '../../types/trace';
+
+import { TraceFlameGraphs } from '.';
+
+export type SpanFlameGraphProps = {
+  span: TraceSpan;
+  traceToProfilesOptions?: TraceToProfilesOptions;
+  timeZone: TimeZone;
+  traceFlameGraphs: TraceFlameGraphs;
+  setTraceFlameGraphs: (flameGraphs: TraceFlameGraphs) => void;
+  setRedrawListView: (redraw: {}) => void;
+  traceDuration: number;
+  traceName: string;
+};
+
+export default function SpanFlameGraph(props: SpanFlameGraphProps) {
+  const {
+    span,
+    traceToProfilesOptions,
+    timeZone,
+    traceFlameGraphs,
+    setTraceFlameGraphs,
+    setRedrawListView,
+    traceDuration,
+    traceName,
+  } = props;
+  const [sizeRef, { height: containerHeight }] = useMeasure<HTMLDivElement>();
+  const styles = useStyles2(getStyles);
+
+  const profileTag = span.tags.filter((tag) => tag.key === pyroscopeProfileIdTagKey);
+  const profileTagValue = profileTag.length > 0 ? profileTag[0].value : undefined;
+
+  const getTimeRangeForProfile = useCallback(() => {
+    const spanStartMs = Math.floor(span.startTime / 1000) - 30000;
+    const spanEndMs = (span.startTime + span.duration) / 1000 + 30000;
+    const to = dateTime(spanEndMs);
+    const from = dateTime(spanStartMs);
+
+    return {
+      from,
+      to,
+      raw: {
+        from,
+        to,
+      },
+    };
+  }, [span.duration, span.startTime]);
+
+  const getFlameGraphData = async (request: DataQueryRequest<Query>, datasourceUid: string) => {
+    const ds = await getDatasourceSrv().get(datasourceUid);
+    if (ds instanceof DataSourceWithBackend) {
+      const result = await lastValueFrom(ds.query(request));
+      const frame = result.data.find((x: DataFrame) => {
+        return x.name === 'response';
+      });
+      if (frame && frame.length > 1) {
+        return frame;
+      }
+    }
+  };
+
+  const queryFlameGraph = useCallback(
+    async (
+      profilesDataSourceSettings: DataSourceInstanceSettings<DataSourceJsonData>,
+      traceToProfilesOptions: TraceToProfilesOptions,
+      span: TraceSpan
+    ) => {
+      let labelSelector = '{}';
+      if (traceToProfilesOptions.customQuery && traceToProfilesOptions.query) {
+        const scopedVars = {
+          ...scopedVarsFromTrace(traceDuration, traceName, span.traceID),
+          ...scopedVarsFromSpan(span),
+          ...scopedVarsFromTags(span, traceToProfilesOptions),
+        };
+        labelSelector = getTemplateSrv().replace(traceToProfilesOptions.query, scopedVars);
+      } else {
+        const tags =
+          traceToProfilesOptions.tags && traceToProfilesOptions.tags.length > 0
+            ? traceToProfilesOptions.tags
+            : defaultProfilingKeys;
+        labelSelector = `{${getFormattedTags(span, tags)}}`;
+      }
+
+      const request = {
+        requestId: 'span-flamegraph-requestId',
+        interval: '2s',
+        intervalMs: 2000,
+        range: getTimeRangeForProfile(),
+        scopedVars: {},
+        app: CoreApp.Unknown,
+        timezone: timeZone,
+        startTime: span.startTime,
+        targets: [
+          {
+            labelSelector,
+            groupBy: [],
+            profileTypeId: traceToProfilesOptions.profileTypeId ?? '',
+            queryType: 'profile' as PyroscopeQueryType,
+            spanSelector: [profileTagValue],
+            refId: 'span-flamegraph-refId',
+            datasource: {
+              type: profilesDataSourceSettings.type,
+              uid: profilesDataSourceSettings.uid,
+            },
+          },
+        ],
+      };
+      const flameGraph = await getFlameGraphData(request, profilesDataSourceSettings.uid);
+
+      if (flameGraph && flameGraph.length > 0) {
+        setTraceFlameGraphs({ ...traceFlameGraphs, [profileTagValue]: flameGraph });
+      }
+    },
+    [getTimeRangeForProfile, profileTagValue, setTraceFlameGraphs, timeZone, traceDuration, traceFlameGraphs, traceName]
+  );
+
+  useEffect(() => {
+    if (!Object.keys(traceFlameGraphs).includes(profileTagValue)) {
+      let profilesDataSourceSettings: DataSourceInstanceSettings<DataSourceJsonData> | undefined;
+      if (traceToProfilesOptions && traceToProfilesOptions?.datasourceUid) {
+        profilesDataSourceSettings = getDatasourceSrv().getInstanceSettings(traceToProfilesOptions.datasourceUid);
+      }
+      if (traceToProfilesOptions && profilesDataSourceSettings) {
+        queryFlameGraph(profilesDataSourceSettings, traceToProfilesOptions, span);
+      }
+    }
+  }, [
+    setTraceFlameGraphs,
+    span,
+    traceFlameGraphs,
+    traceToProfilesOptions,
+    getTimeRangeForProfile,
+    timeZone,
+    queryFlameGraph,
+    profileTagValue,
+  ]);
+
+  useEffect(() => {
+    setRedrawListView({});
+  }, [containerHeight, setRedrawListView]);
+
+  if (!traceFlameGraphs[profileTagValue]) {
+    return <></>;
+  }
+
+  return (
+    <div className={styles.flameGraph} ref={sizeRef}>
+      <div className={styles.flameGraphTitle}>Flame graph</div>
+      <FlameGraph
+        data={traceFlameGraphs[profileTagValue]}
+        getTheme={() => config.theme2}
+        showFlameGraphOnly={true}
+        disableCollapsing={true}
+      />
+    </div>
+  );
+}
+
+const getStyles = () => {
+  return {
+    flameGraph: css({
+      label: 'flameGraphInSpan',
+      margin: '5px',
+    }),
+    flameGraphTitle: css({
+      label: 'flameGraphTitleInSpan',
+      marginBottom: '5px',
+      fontWeight: 'bold',
+    }),
+  };
+};
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.test.tsx
index a048f3a4f9b25..2594bdec00bcd 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.test.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.test.tsx
@@ -14,10 +14,15 @@
 
 jest.mock('../utils');
 
-import { render, screen } from '@testing-library/react';
+import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
+import { createDataFrame, DataSourceInstanceSettings } from '@grafana/data';
+import { data } from '@grafana/flamegraph';
+import { DataSourceSrv, setDataSourceSrv } from '@grafana/runtime';
+
+import { pyroscopeProfileIdTagKey } from '../../../createSpanLink';
 import traceGenerator from '../../demo/trace-generators';
 import transformTraceData from '../../model/transform-trace-data';
 import { TraceSpanReference } from '../../types/trace';
@@ -33,10 +38,29 @@ describe('<SpanDetail>', () => {
   const detailState = new DetailState().toggleLogs().toggleProcess().toggleReferences().toggleTags();
   const traceStartTime = 5;
   const topOfExploreViewRef = jest.fn();
+  const request = {
+    targets: [{ refId: 'A', target: 'query' }],
+  };
+  const traceToProfilesOptions = {
+    datasourceUid: 'profiling1_uid',
+    tags: [{ key: 'someTag', value: 'newName' }],
+    customQuery: true,
+    query: '{${__tags}}',
+    type: 'grafana-pyroscope-datasource',
+  };
+  const pyroSettings = {
+    uid: 'profiling1_uid',
+    name: 'profiling1',
+    type: 'grafana-pyroscope-datasource',
+    meta: { info: { logos: { small: '' } } },
+  } as unknown as DataSourceInstanceSettings;
+
   const props = {
     detailState,
     span,
     traceStartTime,
+    request,
+    traceToProfilesOptions,
     topOfExploreViewRef,
     logItemToggle: jest.fn(),
     logsToggle: jest.fn(),
@@ -45,9 +69,19 @@ describe('<SpanDetail>', () => {
     warningsToggle: jest.fn(),
     referencesToggle: jest.fn(),
     createFocusSpanLink: jest.fn().mockReturnValue({}),
-    topOfViewRefType: 'Explore',
+    traceFlameGraphs: { [span.spanID]: createDataFrame(data) },
+    setRedrawListView: jest.fn(),
   };
 
+  span.tags = [
+    ...span.tags,
+    {
+      key: pyroscopeProfileIdTagKey,
+      value: span.spanID,
+    },
+  ];
+
+  span.spanID = 'test-spanID';
   span.kind = 'test-kind';
   span.statusCode = 2;
   span.statusMessage = 'test-message';
@@ -122,6 +156,15 @@ describe('<SpanDetail>', () => {
     props.processToggle.mockReset();
     props.logsToggle.mockReset();
     props.logItemToggle.mockReset();
+
+    setDataSourceSrv({
+      getList() {
+        return [pyroSettings];
+      },
+      getInstanceSettings() {
+        return pyroSettings;
+      },
+    } as unknown as DataSourceSrv);
   });
 
   it('renders without exploding', () => {
@@ -195,6 +238,14 @@ describe('<SpanDetail>', () => {
 
   it('renders deep link URL', () => {
     render(<SpanDetail {...(props as unknown as SpanDetailProps)} />);
-    expect(document.getElementsByTagName('a').length).toBeGreaterThan(1);
+    expect(screen.getByText('test-spanID')).toBeInTheDocument();
+  });
+
+  it('renders the flame graph', async () => {
+    render(<SpanDetail {...(props as unknown as SpanDetailProps)} />);
+    await act(async () => {
+      expect(screen.getByText(/16.5 Bil/)).toBeInTheDocument();
+      expect(screen.getByText(/(Count)/)).toBeInTheDocument();
+    });
   });
 });
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.tsx
index caea847d349a4..87ba15592c896 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.tsx
@@ -17,19 +17,20 @@ import { SpanStatusCode } from '@opentelemetry/api';
 import cx from 'classnames';
 import React from 'react';
 
-import { dateTimeFormat, GrafanaTheme2, LinkModel, TimeZone } from '@grafana/data';
+import { DataFrame, dateTimeFormat, GrafanaTheme2, IconName, LinkModel } from '@grafana/data';
+import { TraceToProfilesOptions } from '@grafana/o11y-ds-frontend';
 import { config, locationService, reportInteraction } from '@grafana/runtime';
-import { DataLinkButton, Icon, TextArea, useStyles2 } from '@grafana/ui';
+import { TimeZone } from '@grafana/schema';
+import { DataLinkButton, Divider, Icon, TextArea, useStyles2 } from '@grafana/ui';
+import { RelatedProfilesTitle } from '@grafana-plugins/tempo/resultTransformer';
 
+import { pyroscopeProfileIdTagKey } from '../../../createSpanLink';
 import { autoColor } from '../../Theme';
-import { Divider } from '../../common/Divider';
 import LabeledList from '../../common/LabeledList';
 import { KIND, LIBRARY_NAME, LIBRARY_VERSION, STATUS, STATUS_MESSAGE, TRACE_STATE } from '../../constants/span';
 import { SpanLinkFunc, TNil } from '../../types';
-import { SpanLinkType } from '../../types/links';
+import { SpanLinkDef, SpanLinkType } from '../../types/links';
 import { TraceKeyValuePair, TraceLink, TraceLog, TraceSpan, TraceSpanReference } from '../../types/trace';
-import { uAlignIcon, ubM0, ubMb1, ubMy1, ubTxRightAlign } from '../../uberUtilityStyles';
-import { TopOfViewRefType } from '../VirtualizedTraceView';
 import { formatDuration } from '../utils';
 
 import AccordianKeyValues from './AccordianKeyValues';
@@ -37,6 +38,7 @@ import AccordianLogs from './AccordianLogs';
 import AccordianReferences from './AccordianReferences';
 import AccordianText from './AccordianText';
 import DetailState from './DetailState';
+import SpanFlameGraph from './SpanFlameGraph';
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
@@ -50,6 +52,12 @@ const getStyles = (theme: GrafanaTheme2) => {
     listWrapper: css`
       overflow: hidden;
     `,
+    list: css({
+      textAlign: 'right',
+    }),
+    operationName: css({
+      margin: 0,
+    }),
     debugInfo: css`
       label: debugInfo;
       display: block;
@@ -96,6 +104,9 @@ const getStyles = (theme: GrafanaTheme2) => {
       label: AccordianWarningsLabel;
       color: ${autoColor(theme, '#d36c08')};
     `,
+    AccordianKeyValuesItem: css({
+      marginBottom: theme.spacing(0.5),
+    }),
     Textarea: css`
       word-break: break-all;
       white-space: pre;
@@ -106,6 +117,14 @@ const getStyles = (theme: GrafanaTheme2) => {
   };
 };
 
+export const alignIcon = css({
+  margin: '-0.2rem 0.25rem 0 0',
+});
+
+export type TraceFlameGraphs = {
+  [spanID: string]: DataFrame;
+};
+
 export type SpanDetailProps = {
   detailState: DetailState;
   linksGetter: ((links: TraceKeyValuePair[], index: number) => TraceLink[]) | TNil;
@@ -113,9 +132,12 @@ export type SpanDetailProps = {
   logsToggle: (spanID: string) => void;
   processToggle: (spanID: string) => void;
   span: TraceSpan;
+  traceToProfilesOptions?: TraceToProfilesOptions;
   timeZone: TimeZone;
   tagsToggle: (spanID: string) => void;
   traceStartTime: number;
+  traceDuration: number;
+  traceName: string;
   warningsToggle: (spanID: string) => void;
   stackTracesToggle: (spanID: string) => void;
   referenceItemToggle: (spanID: string, reference: TraceSpanReference) => void;
@@ -123,8 +145,10 @@ export type SpanDetailProps = {
   createSpanLink?: SpanLinkFunc;
   focusedSpanId?: string;
   createFocusSpanLink: (traceId: string, spanId: string) => LinkModel;
-  topOfViewRefType?: TopOfViewRefType;
   datasourceType: string;
+  traceFlameGraphs: TraceFlameGraphs;
+  setTraceFlameGraphs: (flameGraphs: TraceFlameGraphs) => void;
+  setRedrawListView: (redraw: {}) => void;
 };
 
 export default function SpanDetail(props: SpanDetailProps) {
@@ -137,14 +161,19 @@ export default function SpanDetail(props: SpanDetailProps) {
     span,
     tagsToggle,
     traceStartTime,
+    traceDuration,
+    traceName,
     warningsToggle,
     stackTracesToggle,
     referencesToggle,
     referenceItemToggle,
     createSpanLink,
     createFocusSpanLink,
-    topOfViewRefType,
     datasourceType,
+    traceFlameGraphs,
+    setTraceFlameGraphs,
+    traceToProfilesOptions,
+    setRedrawListView,
   } = props;
   const {
     isTagsOpen,
@@ -196,6 +225,8 @@ export default function SpanDetail(props: SpanDetailProps) {
       : []),
   ];
 
+  const styles = useStyles2(getStyles);
+
   if (span.kind) {
     overviewItems.push({
       key: KIND,
@@ -239,41 +270,50 @@ export default function SpanDetail(props: SpanDetailProps) {
     });
   }
 
-  const styles = useStyles2(getStyles);
+  const createLinkButton = (link: SpanLinkDef, type: SpanLinkType, title: string, icon: IconName) => {
+    return (
+      <DataLinkButton
+        link={{
+          ...link,
+          title: title,
+          target: '_blank',
+          origin: link.field,
+          onClick: (event: React.MouseEvent) => {
+            // DataLinkButton assumes if you provide an onClick event you would want to prevent default behavior like navigation
+            // In this case, if an onClick is not defined, restore navigation to the provided href while keeping the tracking
+            // this interaction will not be tracked with link right clicks
+            reportInteraction('grafana_traces_trace_view_span_link_clicked', {
+              datasourceType: datasourceType,
+              grafana_version: config.buildInfo.version,
+              type,
+              location: 'spanDetails',
+            });
+
+            if (link.onClick) {
+              link.onClick?.(event);
+            } else {
+              locationService.push(link.href);
+            }
+          },
+        }}
+        buttonProps={{ icon }}
+      />
+    );
+  };
 
-  let logLinkButton: JSX.Element | undefined = undefined;
+  let logLinkButton: JSX.Element | null = null;
+  let profileLinkButton: JSX.Element | null = null;
   if (createSpanLink) {
     const links = createSpanLink(span);
-    const logLinks = links?.filter((link) => link.type === SpanLinkType.Logs);
-    if (links && logLinks && logLinks.length > 0) {
-      logLinkButton = (
-        <DataLinkButton
-          link={{
-            ...logLinks[0],
-            title: 'Logs for this span',
-            target: '_blank',
-            origin: logLinks[0].field,
-            onClick: (event: React.MouseEvent) => {
-              // DataLinkButton assumes if you provide an onClick event you would want to prevent default behavior like navigation
-              // In this case, if an onClick is not defined, restore navigation to the provided href while keeping the tracking
-              // this interaction will not be tracked with link right clicks
-              reportInteraction('grafana_traces_trace_view_span_link_clicked', {
-                datasourceType: datasourceType,
-                grafana_version: config.buildInfo.version,
-                type: 'log',
-                location: 'spanDetails',
-              });
-
-              if (logLinks?.[0].onClick) {
-                logLinks?.[0].onClick?.(event);
-              } else {
-                locationService.push(logLinks?.[0].href);
-              }
-            },
-          }}
-          buttonProps={{ icon: 'gf-logs' }}
-        />
-      );
+    const logsLink = links?.filter((link) => link.type === SpanLinkType.Logs);
+    if (links && logsLink && logsLink.length > 0) {
+      logLinkButton = createLinkButton(logsLink[0], SpanLinkType.Logs, 'Logs for this span', 'gf-logs');
+    }
+    const profilesLink = links?.filter(
+      (link) => link.type === SpanLinkType.Profiles && link.title === RelatedProfilesTitle
+    );
+    if (links && profilesLink && profilesLink.length > 0) {
+      profileLinkButton = createLinkButton(profilesLink[0], SpanLinkType.Profiles, 'Profiles for this span', 'link');
     }
   }
 
@@ -281,13 +321,14 @@ export default function SpanDetail(props: SpanDetailProps) {
   return (
     <div data-testid="span-detail-component">
       <div className={styles.header}>
-        <h2 className={cx(ubM0)}>{operationName}</h2>
+        <h2 className={styles.operationName}>{operationName}</h2>
         <div className={styles.listWrapper}>
-          <LabeledList className={ubTxRightAlign} divider={true} items={overviewItems} />
+          <LabeledList className={styles.list} divider={true} items={overviewItems} />
         </div>
       </div>
-      {logLinkButton}
-      <Divider className={ubMy1} type={'horizontal'} />
+      <span style={{ marginRight: '10px' }}>{logLinkButton}</span>
+      {profileLinkButton}
+      <Divider spacing={1} />
       <div>
         <div>
           <AccordianKeyValues
@@ -299,7 +340,7 @@ export default function SpanDetail(props: SpanDetailProps) {
           />
           {process.tags && (
             <AccordianKeyValues
-              className={ubMb1}
+              className={styles.AccordianKeyValuesItem}
               data={process.tags}
               label="Resource Attributes"
               linksGetter={linksGetter}
@@ -367,31 +408,41 @@ export default function SpanDetail(props: SpanDetailProps) {
             createFocusSpanLink={createFocusSpanLink}
           />
         )}
-        {topOfViewRefType === TopOfViewRefType.Explore && (
-          <small className={styles.debugInfo}>
-            {/* TODO: fix keyboard a11y */}
-            {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions */}
-            <a
-              {...focusSpanLink}
-              onClick={(e) => {
-                // click handling logic copied from react router:
-                // https://github.com/remix-run/react-router/blob/997b4d67e506d39ac6571cb369d6d2d6b3dda557/packages/react-router-dom/index.tsx#L392-L394s
-                if (
-                  focusSpanLink.onClick &&
-                  e.button === 0 && // Ignore everything but left clicks
-                  (!e.currentTarget.target || e.currentTarget.target === '_self') && // Let browser handle "target=_blank" etc.
-                  !(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey) // Ignore clicks with modifier keys
-                ) {
-                  e.preventDefault();
-                  focusSpanLink.onClick(e);
-                }
-              }}
-            >
-              <Icon name={'link'} className={cx(uAlignIcon, styles.LinkIcon)}></Icon>
-            </a>
-            <span className={styles.debugLabel} data-label="SpanID:" /> {spanID}
-          </small>
+        {span.tags.some((tag) => tag.key === pyroscopeProfileIdTagKey) && (
+          <SpanFlameGraph
+            span={span}
+            timeZone={timeZone}
+            traceFlameGraphs={traceFlameGraphs}
+            setTraceFlameGraphs={setTraceFlameGraphs}
+            traceToProfilesOptions={traceToProfilesOptions}
+            setRedrawListView={setRedrawListView}
+            traceDuration={traceDuration}
+            traceName={traceName}
+          />
         )}
+        <small className={styles.debugInfo}>
+          {/* TODO: fix keyboard a11y */}
+          {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions */}
+          <a
+            {...focusSpanLink}
+            onClick={(e) => {
+              // click handling logic copied from react router:
+              // https://github.com/remix-run/react-router/blob/997b4d67e506d39ac6571cb369d6d2d6b3dda557/packages/react-router-dom/index.tsx#L392-L394s
+              if (
+                focusSpanLink.onClick &&
+                e.button === 0 && // Ignore everything but left clicks
+                (!e.currentTarget.target || e.currentTarget.target === '_self') && // Let browser handle "target=_blank" etc.
+                !(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey) // Ignore clicks with modifier keys
+              ) {
+                e.preventDefault();
+                focusSpanLink.onClick(e);
+              }
+            }}
+          >
+            <Icon name={'link'} className={cx(alignIcon, styles.LinkIcon)}></Icon>
+          </a>
+          <span className={styles.debugLabel} data-label="SpanID:" /> {spanID}
+        </small>
       </div>
     </div>
   );
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetailRow.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetailRow.test.tsx
index a73543d3c5dcd..07d93ade138f3 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetailRow.test.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetailRow.test.tsx
@@ -25,6 +25,7 @@ const testSpan = {
   spanID: 'testSpanID',
   traceID: 'testTraceID',
   depth: 3,
+  tags: [],
   process: {
     serviceName: 'some-service',
     tags: [{ key: 'tag-key', value: 'tag-value' }],
@@ -46,6 +47,7 @@ const setup = (propOverrides?: SpanDetailRowProps) => {
     tagsToggle: jest.fn(),
     traceStartTime: 1000,
     theme: createTheme(),
+    traceFlameGraphs: {},
     ...propOverrides,
   };
   return render(<UnthemedSpanDetailRow {...(props as SpanDetailRowProps)} />);
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetailRow.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetailRow.tsx
index 137f77c4ca4a5..6ecfb22889167 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetailRow.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetailRow.tsx
@@ -16,18 +16,19 @@ import { css } from '@emotion/css';
 import classNames from 'classnames';
 import React from 'react';
 
-import { GrafanaTheme2, LinkModel, TimeZone } from '@grafana/data';
+import { GrafanaTheme2, LinkModel } from '@grafana/data';
+import { TraceToProfilesOptions } from '@grafana/o11y-ds-frontend';
+import { TimeZone } from '@grafana/schema';
 import { Button, clearButtonStyles, stylesFactory, withTheme2 } from '@grafana/ui';
 
 import { autoColor } from '../Theme';
 import { SpanLinkFunc } from '../types';
 import { TraceLog, TraceSpan, TraceKeyValuePair, TraceLink, TraceSpanReference } from '../types/trace';
 
-import SpanDetail from './SpanDetail';
+import SpanDetail, { TraceFlameGraphs } from './SpanDetail';
 import DetailState from './SpanDetail/DetailState';
 import SpanTreeOffset from './SpanTreeOffset';
 import TimelineRow from './TimelineRow';
-import { TopOfViewRefType } from './VirtualizedTraceView';
 
 const getStyles = stylesFactory((theme: GrafanaTheme2) => {
   return {
@@ -85,9 +86,12 @@ export type SpanDetailRowProps = {
   warningsToggle: (spanID: string) => void;
   stackTracesToggle: (spanID: string) => void;
   span: TraceSpan;
+  traceToProfilesOptions?: TraceToProfilesOptions;
   timeZone: TimeZone;
   tagsToggle: (spanID: string) => void;
   traceStartTime: number;
+  traceDuration: number;
+  traceName: string;
   hoverIndentGuideIds: Set<string>;
   addHoverIndentGuideId: (spanID: string) => void;
   removeHoverIndentGuideId: (spanID: string) => void;
@@ -95,9 +99,11 @@ export type SpanDetailRowProps = {
   createSpanLink?: SpanLinkFunc;
   focusedSpanId?: string;
   createFocusSpanLink: (traceId: string, spanId: string) => LinkModel;
-  topOfViewRefType?: TopOfViewRefType;
   datasourceType: string;
   visibleSpanIds: string[];
+  traceFlameGraphs: TraceFlameGraphs;
+  setTraceFlameGraphs: (flameGraphs: TraceFlameGraphs) => void;
+  setRedrawListView: (redraw: {}) => void;
 };
 
 export class UnthemedSpanDetailRow extends React.PureComponent<SpanDetailRowProps> {
@@ -123,9 +129,12 @@ export class UnthemedSpanDetailRow extends React.PureComponent<SpanDetailRowProp
       warningsToggle,
       stackTracesToggle,
       span,
+      traceToProfilesOptions,
       timeZone,
       tagsToggle,
       traceStartTime,
+      traceDuration,
+      traceName,
       hoverIndentGuideIds,
       addHoverIndentGuideId,
       removeHoverIndentGuideId,
@@ -133,9 +142,11 @@ export class UnthemedSpanDetailRow extends React.PureComponent<SpanDetailRowProp
       createSpanLink,
       focusedSpanId,
       createFocusSpanLink,
-      topOfViewRefType,
       datasourceType,
       visibleSpanIds,
+      traceFlameGraphs,
+      setTraceFlameGraphs,
+      setRedrawListView,
     } = this.props;
     const styles = getStyles(theme);
     return (
@@ -170,14 +181,19 @@ export class UnthemedSpanDetailRow extends React.PureComponent<SpanDetailRowProp
               warningsToggle={warningsToggle}
               stackTracesToggle={stackTracesToggle}
               span={span}
+              traceToProfilesOptions={traceToProfilesOptions}
               timeZone={timeZone}
               tagsToggle={tagsToggle}
               traceStartTime={traceStartTime}
+              traceDuration={traceDuration}
+              traceName={traceName}
               createSpanLink={createSpanLink}
               focusedSpanId={focusedSpanId}
               createFocusSpanLink={createFocusSpanLink}
-              topOfViewRefType={topOfViewRefType}
               datasourceType={datasourceType}
+              traceFlameGraphs={traceFlameGraphs}
+              setTraceFlameGraphs={setTraceFlameGraphs}
+              setRedrawListView={setRedrawListView}
             />
           </div>
         </TimelineRow.Cell>
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineColumnResizer.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineColumnResizer.tsx
index 6e58221feb41c..d9d9f2c98aec3 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineColumnResizer.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineColumnResizer.tsx
@@ -16,12 +16,10 @@ import { css } from '@emotion/css';
 import cx from 'classnames';
 import * as React from 'react';
 
-import { stylesFactory } from '@grafana/ui';
-
 import { TNil } from '../../types';
 import DraggableManager, { DraggableBounds, DraggingUpdate } from '../../utils/DraggableManager';
 
-export const getStyles = stylesFactory(() => {
+export const getStyles = () => {
   return {
     TimelineColumnResizer: css`
       left: 0;
@@ -95,7 +93,7 @@ export const getStyles = stylesFactory(() => {
       }
     `,
   };
-});
+};
 
 export type TimelineColumnResizerProps = {
   min: number;
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineHeaderRow.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineHeaderRow.tsx
index 12af287f3ed66..67534003dc6b0 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineHeaderRow.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineHeaderRow.tsx
@@ -13,14 +13,12 @@
 // limitations under the License.
 
 import { css } from '@emotion/css';
-import cx from 'classnames';
 import * as React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { useStyles2 } from '@grafana/ui';
 
 import { autoColor } from '../../Theme';
-import { ubFlex, ubPx2 } from '../../uberUtilityStyles';
 import Ticks from '../Ticks';
 import TimelineRow from '../TimelineRow';
 import { TUpdateViewRangeTimeFunction, ViewRangeTime, ViewRangeTimeUpdate } from '../types';
@@ -52,6 +50,9 @@ const getStyles = (theme: GrafanaTheme2) => {
     TimelineHeaderWrapper: css`
       label: TimelineHeaderWrapper;
       align-items: center;
+      display: flex;
+      padding-left: ${theme.spacing(1)};
+      padding-right: ${theme.spacing(1)};
     `,
   };
 };
@@ -90,7 +91,7 @@ export default function TimelineHeaderRow(props: TimelineHeaderRowProps) {
   const styles = useStyles2(getStyles);
   return (
     <TimelineRow className={styles.TimelineHeaderRow} data-testid="TimelineHeaderRow">
-      <TimelineRow.Cell className={cx(ubFlex, ubPx2, styles.TimelineHeaderWrapper)} width={nameColumnWidth}>
+      <TimelineRow.Cell className={styles.TimelineHeaderWrapper} width={nameColumnWidth}>
         <h4 className={styles.TimelineHeaderRowTitle}>Service &amp; Operation</h4>
         <TimelineCollapser
           onCollapseAll={onCollapseAll}
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineRow.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineRow.tsx
index 7d6deba862318..c957f08e7d6e5 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineRow.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineRow.tsx
@@ -18,15 +18,16 @@ import * as React from 'react';
 
 import { useStyles2 } from '@grafana/ui';
 
-import { ubRelative } from '../uberUtilityStyles';
-
 const getStyles = () => {
   return {
-    flexRow: css`
-      display: flex;
-      flex: 0 1 auto;
-      flex-direction: row;
-    `,
+    row: css({
+      display: 'flex',
+      flex: '0 1 auto',
+      flexDirection: 'row',
+    }),
+    rowCell: css({
+      position: 'relative',
+    }),
   };
 };
 
@@ -46,7 +47,7 @@ export default function TimelineRow(props: TTimelineRowProps) {
   const { children, className = '', ...rest } = props;
   const styles = useStyles2(getStyles);
   return (
-    <div className={cx(styles.flexRow, className)} {...rest}>
+    <div className={cx(styles.row, className)} {...rest}>
       {children}
     </div>
   );
@@ -60,8 +61,9 @@ export function TimelineRowCell(props: TimelineRowCellProps) {
   const { children, className = '', width, style, ...rest } = props;
   const widthPercent = `${width * 100}%`;
   const mergedStyle = { ...style, flexBasis: widthPercent, maxWidth: widthPercent };
+  const styles = useStyles2(getStyles);
   return (
-    <div className={cx(ubRelative, className)} style={mergedStyle} data-testid="TimelineRowCell" {...rest}>
+    <div className={cx(styles.rowCell, className)} style={mergedStyle} data-testid="TimelineRowCell" {...rest}>
       {children}
     </div>
   );
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.test.tsx
index 2ceddbfb0c6d1..cf81e80bbd4e7 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.test.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.test.tsx
@@ -25,7 +25,7 @@ import VirtualizedTraceView, { VirtualizedTraceViewProps } from './VirtualizedTr
 jest.mock('./SpanTreeOffset');
 
 const trace = transformTraceData(traceGenerator.trace({ numberOfSpans: 2 }))!;
-const topOfExploreViewRef = jest.fn();
+
 let props = {
   childrenHiddenIDs: new Set(),
   childrenToggle: jest.fn(),
@@ -41,7 +41,7 @@ let props = {
   spanNameColumnWidth: 0.5,
   trace,
   uiFind: 'uiFind',
-  topOfExploreViewRef,
+  topOfViewRef: jest.fn(),
 } as unknown as VirtualizedTraceViewProps;
 
 describe('<VirtualizedTraceViewImpl>', () => {
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx
index 1c7af44fe835d..d1101c49ffa69 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx
@@ -18,18 +18,21 @@ import memoizeOne from 'memoize-one';
 import * as React from 'react';
 import { RefObject } from 'react';
 
-import { GrafanaTheme2, LinkModel, TimeZone } from '@grafana/data';
+import { GrafanaTheme2, LinkModel } from '@grafana/data';
+import { TraceToProfilesOptions } from '@grafana/o11y-ds-frontend';
 import { config, reportInteraction } from '@grafana/runtime';
+import { TimeZone } from '@grafana/schema';
 import { stylesFactory, withTheme2, ToolbarButton } from '@grafana/ui';
 
 import { PEER_SERVICE } from '../constants/tag-keys';
-import { SpanBarOptions, SpanLinkFunc, TNil } from '../types';
+import { CriticalPathSection, SpanBarOptions, SpanLinkFunc, TNil } from '../types';
 import TTraceTimeline from '../types/TTraceTimeline';
 import { TraceLog, TraceSpan, Trace, TraceKeyValuePair, TraceLink, TraceSpanReference } from '../types/trace';
 import { getColorByKey } from '../utils/color-generator';
 
 import ListView from './ListView';
 import SpanBarRow from './SpanBarRow';
+import { TraceFlameGraphs } from './SpanDetail';
 import DetailState from './SpanDetail/DetailState';
 import SpanDetailRow from './SpanDetailRow';
 import {
@@ -41,10 +44,7 @@ import {
   ViewedBoundsFunctionType,
 } from './utils';
 
-const getStyles = stylesFactory((props: TVirtualizedTraceViewOwnProps) => {
-  const { topOfViewRefType } = props;
-  const position = topOfViewRefType === TopOfViewRefType.Explore ? 'fixed' : 'absolute';
-
+const getStyles = stylesFactory(() => {
   return {
     rowsWrapper: css`
       width: 100%;
@@ -59,7 +59,7 @@ const getStyles = stylesFactory((props: TVirtualizedTraceViewOwnProps) => {
       align-items: center;
       width: 40px;
       height: 40px;
-      position: ${position};
+      position: absolute;
       bottom: 30px;
       right: 30px;
       z-index: 1;
@@ -73,16 +73,12 @@ type RowState = {
   spanIndex: number;
 };
 
-export enum TopOfViewRefType {
-  Explore = 'Explore',
-  Panel = 'Panel',
-}
-
 type TVirtualizedTraceViewOwnProps = {
   currentViewRangeTime: [number, number];
   timeZone: TimeZone;
   findMatchesIDs: Set<string> | TNil;
   trace: Trace;
+  traceToProfilesOptions?: TraceToProfilesOptions;
   spanBarOptions: SpanBarOptions | undefined;
   linksGetter: (span: TraceSpan, items: TraceKeyValuePair[], itemIndex: number) => TraceLink[];
   childrenToggle: (spanID: string) => void;
@@ -105,11 +101,16 @@ type TVirtualizedTraceViewOwnProps = {
   focusedSpanId?: string;
   focusedSpanIdForSearch: string;
   showSpanFilterMatchesOnly: boolean;
+  showCriticalPathSpansOnly: boolean;
   createFocusSpanLink: (traceId: string, spanId: string) => LinkModel;
   topOfViewRef?: RefObject<HTMLDivElement>;
-  topOfViewRefType?: TopOfViewRefType;
   datasourceType: string;
   headerHeight: number;
+  criticalPath: CriticalPathSection[];
+  traceFlameGraphs: TraceFlameGraphs;
+  setTraceFlameGraphs: (flameGraphs: TraceFlameGraphs) => void;
+  redrawListView: {};
+  setRedrawListView: (redraw: {}) => void;
 };
 
 export type VirtualizedTraceViewProps = TVirtualizedTraceViewOwnProps & TTraceTimeline;
@@ -129,7 +130,9 @@ function generateRowStates(
   childrenHiddenIDs: Set<string>,
   detailStates: Map<string, DetailState | TNil>,
   findMatchesIDs: Set<string> | TNil,
-  showSpanFilterMatchesOnly: boolean
+  showSpanFilterMatchesOnly: boolean,
+  showCriticalPathSpansOnly: boolean,
+  criticalPath: CriticalPathSection[]
 ): RowState[] {
   if (!spans) {
     return [];
@@ -138,6 +141,10 @@ function generateRowStates(
     spans = spans.filter((span) => findMatchesIDs.has(span.spanID));
   }
 
+  if (showCriticalPathSpansOnly && criticalPath) {
+    spans = spans.filter((span) => criticalPath.find((section) => section.spanId === span.spanID));
+  }
+
   let collapseDepth = null;
   const rowStates = [];
   for (let i = 0; i < spans.length; i++) {
@@ -186,16 +193,40 @@ function generateRowStatesFromTrace(
   childrenHiddenIDs: Set<string>,
   detailStates: Map<string, DetailState | TNil>,
   findMatchesIDs: Set<string> | TNil,
-  showSpanFilterMatchesOnly: boolean
+  showSpanFilterMatchesOnly: boolean,
+  showCriticalPathSpansOnly: boolean,
+  criticalPath: CriticalPathSection[]
 ): RowState[] {
   return trace
-    ? generateRowStates(trace.spans, childrenHiddenIDs, detailStates, findMatchesIDs, showSpanFilterMatchesOnly)
+    ? generateRowStates(
+        trace.spans,
+        childrenHiddenIDs,
+        detailStates,
+        findMatchesIDs,
+        showSpanFilterMatchesOnly,
+        showCriticalPathSpansOnly,
+        criticalPath
+      )
     : [];
 }
 
+function childSpansMap(trace: Trace | TNil) {
+  const childSpansMap = new Map<string, string[]>();
+  if (!trace) {
+    return childSpansMap;
+  }
+  trace.spans.forEach((span) => {
+    if (span.childSpanIds.length) {
+      childSpansMap.set(span.spanID, span.childSpanIds);
+    }
+  });
+  return childSpansMap;
+}
+
 const memoizedGenerateRowStates = memoizeOne(generateRowStatesFromTrace);
 const memoizedViewBoundsFunc = memoizeOne(createViewedBoundsFunc, isEqual);
 const memoizedGetClipping = memoizeOne(getClipping, isEqual);
+const memoizedChildSpansMap = memoizeOne(childSpansMap);
 
 // export from tests
 export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTraceViewProps> {
@@ -235,8 +266,24 @@ export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTra
   }
 
   getRowStates(): RowState[] {
-    const { childrenHiddenIDs, detailStates, trace, findMatchesIDs, showSpanFilterMatchesOnly } = this.props;
-    return memoizedGenerateRowStates(trace, childrenHiddenIDs, detailStates, findMatchesIDs, showSpanFilterMatchesOnly);
+    const {
+      childrenHiddenIDs,
+      detailStates,
+      trace,
+      findMatchesIDs,
+      showSpanFilterMatchesOnly,
+      showCriticalPathSpansOnly,
+      criticalPath,
+    } = this.props;
+    return memoizedGenerateRowStates(
+      trace,
+      childrenHiddenIDs,
+      detailStates,
+      findMatchesIDs,
+      showSpanFilterMatchesOnly,
+      showCriticalPathSpansOnly,
+      criticalPath
+    );
   }
 
   getClipping(): { left: boolean; right: boolean } {
@@ -256,6 +303,10 @@ export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTra
     });
   }
 
+  getChildSpansMap() {
+    return memoizedChildSpansMap(this.props.trace);
+  }
+
   getAccessors() {
     const lv = this.listView;
     if (!lv) {
@@ -361,7 +412,7 @@ export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTra
     attrs: {},
     visibleSpanIds: string[]
   ) {
-    const { spanID } = span;
+    const { spanID, childSpanIds } = span;
     const { serviceName } = span.process;
     const {
       childrenHiddenIDs,
@@ -381,6 +432,7 @@ export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTra
       showSpanFilterMatchesOnly,
       theme,
       datasourceType,
+      criticalPath,
     } = this.props;
     // to avert flow error
     if (!trace) {
@@ -422,7 +474,26 @@ export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTra
 
     const prevSpan = spanIndex > 0 ? trace.spans[spanIndex - 1] : null;
 
-    const styles = getStyles(this.props);
+    const allChildSpanIds = [spanID, ...childSpanIds];
+    // This function called recursively to find all descendants of a span
+    const findAllDescendants = (currentChildSpanIds: string[]) => {
+      currentChildSpanIds.forEach((eachId) => {
+        const childrenOfCurrent = this.getChildSpansMap().get(eachId);
+        if (childrenOfCurrent?.length) {
+          allChildSpanIds.push(...childrenOfCurrent);
+          findAllDescendants(childrenOfCurrent);
+        }
+      });
+    };
+    findAllDescendants(childSpanIds);
+    const criticalPathSections = criticalPath?.filter((each) => {
+      if (isCollapsed) {
+        return allChildSpanIds.includes(each.spanId);
+      }
+      return each.spanId === spanID;
+    });
+
+    const styles = getStyles();
     return (
       <div className={styles.row} key={key} style={style} {...attrs}>
         <SpanBarRow
@@ -452,6 +523,7 @@ export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTra
           datasourceType={datasourceType}
           showServiceName={prevSpan === null || prevSpan.process.serviceName !== span.process.serviceName}
           visibleSpanIds={visibleSpanIds}
+          criticalPath={criticalPathSections}
         />
       </div>
     );
@@ -473,6 +545,7 @@ export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTra
       detailToggle,
       spanNameColumnWidth,
       trace,
+      traceToProfilesOptions,
       timeZone,
       hoverIndentGuideIds,
       addHoverIndentGuideId,
@@ -481,16 +554,18 @@ export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTra
       createSpanLink,
       focusedSpanId,
       createFocusSpanLink,
-      topOfViewRefType,
       theme,
       datasourceType,
+      traceFlameGraphs,
+      setTraceFlameGraphs,
+      setRedrawListView,
     } = this.props;
     const detailState = detailStates.get(spanID);
     if (!trace || !detailState) {
       return null;
     }
     const color = getColorByKey(serviceName, theme);
-    const styles = getStyles(this.props);
+    const styles = getStyles();
 
     return (
       <div className={styles.row} key={key} style={{ ...style, zIndex: 1 }} {...attrs}>
@@ -508,18 +583,23 @@ export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTra
           warningsToggle={detailWarningsToggle}
           stackTracesToggle={detailStackTracesToggle}
           span={span}
+          traceToProfilesOptions={traceToProfilesOptions}
           timeZone={timeZone}
           tagsToggle={detailTagsToggle}
           traceStartTime={trace.startTime}
+          traceDuration={trace.duration}
+          traceName={trace.traceName}
           hoverIndentGuideIds={hoverIndentGuideIds}
           addHoverIndentGuideId={addHoverIndentGuideId}
           removeHoverIndentGuideId={removeHoverIndentGuideId}
           createSpanLink={createSpanLink}
           focusedSpanId={focusedSpanId}
           createFocusSpanLink={createFocusSpanLink}
-          topOfViewRefType={topOfViewRefType}
           datasourceType={datasourceType}
           visibleSpanIds={visibleSpanIds}
+          traceFlameGraphs={traceFlameGraphs}
+          setTraceFlameGraphs={setTraceFlameGraphs}
+          setRedrawListView={setRedrawListView}
         />
       </div>
     );
@@ -548,8 +628,8 @@ export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTra
   });
 
   render() {
-    const styles = getStyles(this.props);
-    const { scrollElement } = this.props;
+    const styles = getStyles();
+    const { scrollElement, redrawListView } = this.props;
 
     return (
       <>
@@ -565,13 +645,16 @@ export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTra
           getIndexFromKey={this.getIndexFromKey}
           windowScroller={false}
           scrollElement={scrollElement}
+          redraw={redrawListView}
         />
-        <ToolbarButton
-          className={styles.scrollToTopButton}
-          onClick={this.scrollToTop}
-          title="Scroll to top"
-          icon="arrow-up"
-        ></ToolbarButton>
+        {this.props.topOfViewRef && ( // only for panel as explore uses content outline to scroll to top
+          <ToolbarButton
+            className={styles.scrollToTopButton}
+            onClick={this.scrollToTop}
+            title="Scroll to top"
+            icon="arrow-up"
+          ></ToolbarButton>
+        )}
       </>
     );
   }
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.tsx
index fa9e36875d98d..495fec6f4c47b 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.tsx
@@ -15,19 +15,21 @@
 import { css } from '@emotion/css';
 import React, { RefObject } from 'react';
 
-import { GrafanaTheme2, LinkModel, TimeZone } from '@grafana/data';
+import { GrafanaTheme2, LinkModel } from '@grafana/data';
+import { SpanBarOptions, TraceToProfilesOptions } from '@grafana/o11y-ds-frontend';
 import { config, reportInteraction } from '@grafana/runtime';
+import { TimeZone } from '@grafana/schema';
 import { stylesFactory, withTheme2 } from '@grafana/ui';
 
 import { autoColor } from '../Theme';
 import { merge as mergeShortcuts } from '../keyboard-shortcuts';
-import { SpanBarOptions } from '../settings/SpanBarSettings';
-import { SpanLinkFunc, TNil } from '../types';
+import { CriticalPathSection, SpanLinkFunc, TNil } from '../types';
 import TTraceTimeline from '../types/TTraceTimeline';
 import { TraceSpan, Trace, TraceLog, TraceKeyValuePair, TraceLink, TraceSpanReference } from '../types/trace';
 
+import { TraceFlameGraphs } from './SpanDetail';
 import TimelineHeaderRow from './TimelineHeaderRow';
-import VirtualizedTraceView, { TopOfViewRefType } from './VirtualizedTraceView';
+import VirtualizedTraceView from './VirtualizedTraceView';
 import { TUpdateViewRangeTimeFunction, ViewRange, ViewRangeTimeUpdate } from './types';
 
 const getStyles = stylesFactory((theme: GrafanaTheme2) => {
@@ -70,6 +72,7 @@ export type TProps = {
   findMatchesIDs: Set<string> | TNil;
   traceTimeline: TTraceTimeline;
   trace: Trace;
+  traceToProfilesOptions?: TraceToProfilesOptions;
   datasourceType: string;
   spanBarOptions: SpanBarOptions | undefined;
   updateNextViewRangeTime: (update: ViewRangeTimeUpdate) => void;
@@ -102,10 +105,15 @@ export type TProps = {
   focusedSpanId?: string;
   focusedSpanIdForSearch: string;
   showSpanFilterMatchesOnly: boolean;
+  showCriticalPathSpansOnly: boolean;
   createFocusSpanLink: (traceId: string, spanId: string) => LinkModel;
   topOfViewRef?: RefObject<HTMLDivElement>;
-  topOfViewRefType?: TopOfViewRefType;
   headerHeight: number;
+  criticalPath: CriticalPathSection[];
+  traceFlameGraphs: TraceFlameGraphs;
+  setTraceFlameGraphs: (flameGraphs: TraceFlameGraphs) => void;
+  redrawListView: {};
+  setRedrawListView: (redraw: {}) => void;
 };
 
 type State = {
diff --git a/public/app/features/explore/TraceView/components/common/Divider.tsx b/public/app/features/explore/TraceView/components/common/Divider.tsx
deleted file mode 100644
index 9eab10a61e29f..0000000000000
--- a/public/app/features/explore/TraceView/components/common/Divider.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import { css, cx } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { useStyles2 } from '@grafana/ui';
-
-import { autoColor } from '../Theme';
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    Divider: css`
-      background: ${autoColor(theme, '#ddd')};
-    `,
-
-    DividerVertical: css`
-      label: DividerVertical;
-      display: inline-block;
-      width: 1px;
-      height: 0.9em;
-      margin: 0 8px;
-      vertical-align: middle;
-    `,
-
-    DividerHorizontal: css`
-      label: DividerHorizontal;
-      display: block;
-      height: 1px;
-      width: 100%;
-      margin: 24px 0;
-      clear: both;
-      vertical-align: middle;
-      position: relative;
-      top: -0.06em;
-    `,
-  };
-};
-
-interface Props {
-  className?: string;
-  style?: React.CSSProperties;
-  type?: 'vertical' | 'horizontal';
-}
-export function Divider({ className, style, type }: Props) {
-  const styles = useStyles2(getStyles);
-  return (
-    <div
-      style={style}
-      className={cx(
-        styles.Divider,
-        type === 'horizontal' ? styles.DividerHorizontal : styles.DividerVertical,
-        className
-      )}
-    />
-  );
-}
diff --git a/public/app/features/explore/TraceView/components/common/SearchBarInput.tsx b/public/app/features/explore/TraceView/components/common/SearchBarInput.tsx
index 72b1f4fb84d45..664e1e6e2b3f2 100644
--- a/public/app/features/explore/TraceView/components/common/SearchBarInput.tsx
+++ b/public/app/features/explore/TraceView/components/common/SearchBarInput.tsx
@@ -16,21 +16,13 @@ import * as React from 'react';
 
 import { IconButton, Input } from '@grafana/ui';
 
-import { TNil } from '../types';
-
 type Props = {
-  allowClear?: boolean;
-  inputProps: Record<string, unknown>;
-  location: Location;
-  trackFindFunction?: (str: string | TNil) => void;
   value: string | undefined;
   onChange: (value: string) => void;
 };
 
 export default class SearchBarInput extends React.PureComponent<Props> {
   static defaultProps: Partial<Props> = {
-    inputProps: {},
-    trackFindFunction: undefined,
     value: undefined,
   };
 
@@ -39,25 +31,21 @@ export default class SearchBarInput extends React.PureComponent<Props> {
   };
 
   render() {
-    const { allowClear, inputProps, value } = this.props;
+    const { value } = this.props;
 
     const suffix = (
-      <>
-        {inputProps.suffix}
-        {allowClear && value && value.length && (
-          <IconButton name="times" onClick={this.clearUiFind} tooltip="Clear input" />
-        )}
-      </>
+      <>{value && value.length && <IconButton name="times" onClick={this.clearUiFind} tooltip="Clear input" />}</>
     );
 
     return (
-      <Input
-        placeholder="Find..."
-        {...inputProps}
-        onChange={(e) => this.props.onChange(e.currentTarget.value)}
-        suffix={suffix}
-        value={value}
-      />
+      <div style={{ width: '200px' }}>
+        <Input
+          placeholder="Find..."
+          onChange={(e) => this.props.onChange(e.currentTarget.value)}
+          suffix={suffix}
+          value={value}
+        />
+      </div>
     );
   }
 }
diff --git a/public/app/features/explore/TraceView/components/model/link-patterns.test.ts b/public/app/features/explore/TraceView/components/model/link-patterns.test.ts
index d31063ffc7c6d..e3d5a98ffe014 100644
--- a/public/app/features/explore/TraceView/components/model/link-patterns.test.ts
+++ b/public/app/features/explore/TraceView/components/model/link-patterns.test.ts
@@ -12,17 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Trace, TraceLink, TraceSpan } from '../types';
+import { Trace } from '../types';
 
 import {
   processTemplate,
   createTestFunction,
-  getParameterInArray,
-  getParameterInAncestor,
   processLinkPattern,
   ProcessedLinkPattern,
-  computeLinks,
-  createGetLinks,
   computeTraceLink,
 } from './link-patterns';
 
@@ -67,7 +63,7 @@ describe('processTemplate()', () => {
     expect(() =>
       processTemplate(
         {
-          template: (data: { [key: string]: any }) => `a${data.b}c`,
+          template: (data: { [key: string]: unknown }) => `a${data.b}c`,
         },
         (a) => a
       )
@@ -153,179 +149,6 @@ describe('createTestFunction()', () => {
   });
 });
 
-describe('getParameterInArray()', () => {
-  const data = [
-    { key: 'mykey', value: 'ok' },
-    { key: 'otherkey', value: 'v' },
-  ];
-
-  it('returns an entry that is present', () => {
-    expect(getParameterInArray('mykey', data)).toBe(data[0]);
-    expect(getParameterInArray('otherkey', data)).toBe(data[1]);
-  });
-
-  it('returns undefined when the entry cannot be found', () => {
-    expect(getParameterInArray('myotherkey', data)).toBeUndefined();
-  });
-
-  it('returns undefined when there is no array', () => {
-    expect(getParameterInArray('otherkey')).toBeUndefined();
-    expect(getParameterInArray('otherkey', null)).toBeUndefined();
-  });
-});
-
-describe('getParameterInAncestor()', () => {
-  const spans = [
-    {
-      depth: 0,
-      process: {
-        tags: [
-          { key: 'a', value: 'a7' },
-          { key: 'b', value: 'b7' },
-          { key: 'c', value: 'c7' },
-          { key: 'd', value: 'd7' },
-          { key: 'e', value: 'e7' },
-          { key: 'f', value: 'f7' },
-          { key: 'g', value: 'g7' },
-          { key: 'h', value: 'h7' },
-        ],
-      },
-      tags: [
-        { key: 'a', value: 'a6' },
-        { key: 'b', value: 'b6' },
-        { key: 'c', value: 'c6' },
-        { key: 'd', value: 'd6' },
-        { key: 'e', value: 'e6' },
-        { key: 'f', value: 'f6' },
-        { key: 'g', value: 'g6' },
-      ],
-    },
-    {
-      depth: 1,
-      process: {
-        tags: [
-          { key: 'a', value: 'a5' },
-          { key: 'b', value: 'b5' },
-          { key: 'c', value: 'c5' },
-          { key: 'd', value: 'd5' },
-          { key: 'e', value: 'e5' },
-          { key: 'f', value: 'f5' },
-        ],
-      },
-      tags: [
-        { key: 'a', value: 'a4' },
-        { key: 'b', value: 'b4' },
-        { key: 'c', value: 'c4' },
-        { key: 'd', value: 'd4' },
-        { key: 'e', value: 'e4' },
-      ],
-    },
-    {
-      depth: 1,
-      process: {
-        tags: [
-          { key: 'a', value: 'a3' },
-          { key: 'b', value: 'b3' },
-          { key: 'c', value: 'c3' },
-          { key: 'd', value: 'd3' },
-        ],
-      },
-      tags: [
-        { key: 'a', value: 'a2' },
-        { key: 'b', value: 'b2' },
-        { key: 'c', value: 'c2' },
-      ],
-    },
-    {
-      depth: 2,
-      process: {
-        tags: [
-          { key: 'a', value: 'a1' },
-          { key: 'b', value: 'b1' },
-        ],
-      },
-      tags: [{ key: 'a', value: 'a0' }],
-    },
-  ] as TraceSpan[];
-
-  spans[1].references = [
-    {
-      spanID: 's1',
-      traceID: 't2',
-      refType: 'CHILD_OF',
-      span: spans[0],
-    },
-  ];
-  spans[2].references = [
-    {
-      spanID: 's1',
-      traceID: 't2',
-      refType: 'CHILD_OF',
-      span: spans[0],
-    },
-  ];
-  spans[3].references = [
-    {
-      spanID: 's1',
-      traceID: 't2',
-      refType: 'CHILD_OF',
-      span: spans[2],
-    },
-  ];
-
-  it('uses current span tags', () => {
-    expect(getParameterInAncestor('a', spans[3])).toEqual({ key: 'a', value: 'a0' });
-    expect(getParameterInAncestor('a', spans[2])).toEqual({ key: 'a', value: 'a2' });
-    expect(getParameterInAncestor('a', spans[1])).toEqual({ key: 'a', value: 'a4' });
-    expect(getParameterInAncestor('a', spans[0])).toEqual({ key: 'a', value: 'a6' });
-  });
-
-  it('uses current span process tags', () => {
-    expect(getParameterInAncestor('b', spans[3])).toEqual({ key: 'b', value: 'b1' });
-    expect(getParameterInAncestor('d', spans[2])).toEqual({ key: 'd', value: 'd3' });
-    expect(getParameterInAncestor('f', spans[1])).toEqual({ key: 'f', value: 'f5' });
-    expect(getParameterInAncestor('h', spans[0])).toEqual({ key: 'h', value: 'h7' });
-  });
-
-  it('uses parent span tags', () => {
-    expect(getParameterInAncestor('c', spans[3])).toEqual({ key: 'c', value: 'c2' });
-    expect(getParameterInAncestor('e', spans[2])).toEqual({ key: 'e', value: 'e6' });
-    expect(getParameterInAncestor('f', spans[2])).toEqual({ key: 'f', value: 'f6' });
-    expect(getParameterInAncestor('g', spans[2])).toEqual({ key: 'g', value: 'g6' });
-    expect(getParameterInAncestor('g', spans[1])).toEqual({ key: 'g', value: 'g6' });
-  });
-
-  it('uses parent span process tags', () => {
-    expect(getParameterInAncestor('d', spans[3])).toEqual({ key: 'd', value: 'd3' });
-    expect(getParameterInAncestor('h', spans[2])).toEqual({ key: 'h', value: 'h7' });
-    expect(getParameterInAncestor('h', spans[1])).toEqual({ key: 'h', value: 'h7' });
-  });
-
-  it('uses grand-parent span tags', () => {
-    expect(getParameterInAncestor('e', spans[3])).toEqual({ key: 'e', value: 'e6' });
-    expect(getParameterInAncestor('f', spans[3])).toEqual({ key: 'f', value: 'f6' });
-    expect(getParameterInAncestor('g', spans[3])).toEqual({ key: 'g', value: 'g6' });
-  });
-
-  it('uses grand-parent process tags', () => {
-    expect(getParameterInAncestor('h', spans[3])).toEqual({ key: 'h', value: 'h7' });
-  });
-
-  it('returns undefined when the entry cannot be found', () => {
-    expect(getParameterInAncestor('i', spans[3])).toBeUndefined();
-  });
-
-  it('does not break if some tags are not defined', () => {
-    const spansWithUndefinedTags = [
-      {
-        depth: 0,
-        process: {},
-      },
-    ] as TraceSpan[];
-    expect(getParameterInAncestor('a', spansWithUndefinedTags[0])).toBeUndefined();
-  });
-});
-
 describe('computeTraceLink()', () => {
   const linkPatterns = [
     {
@@ -359,95 +182,3 @@ describe('computeTraceLink()', () => {
     ]);
   });
 });
-
-describe('computeLinks()', () => {
-  const linkPatterns = [
-    {
-      type: 'tags',
-      key: 'myKey',
-      url: 'http://example.com/?myKey=#{myKey}',
-      text: 'first link (#{myKey})',
-    },
-    {
-      key: 'myOtherKey',
-      url: 'http://example.com/?myKey=#{myOtherKey}&myKey=#{myKey}',
-      text: 'second link (#{myOtherKey})',
-    },
-  ].map(processLinkPattern) as ProcessedLinkPattern[];
-
-  const spans = [
-    { depth: 0, process: {}, tags: [{ key: 'myKey', value: 'valueOfMyKey' }] },
-    { depth: 1, process: {}, logs: [{ fields: [{ key: 'myOtherKey', value: 'valueOfMy+Other+Key' }] }] },
-  ] as unknown as TraceSpan[];
-  spans[1].references = [
-    {
-      spanID: 's1',
-      traceID: 't2',
-      refType: 'CHILD_OF',
-      span: spans[0],
-    },
-  ];
-
-  it('correctly computes links', () => {
-    expect(computeLinks(linkPatterns, spans[0], spans[0].tags, 0)).toEqual([
-      {
-        url: 'http://example.com/?myKey=valueOfMyKey',
-        text: 'first link (valueOfMyKey)',
-      },
-    ]);
-    expect(computeLinks(linkPatterns, spans[1], spans[1].logs[0].fields, 0)).toEqual([
-      {
-        url: 'http://example.com/?myKey=valueOfMy%2BOther%2BKey&myKey=valueOfMyKey',
-        text: 'second link (valueOfMy+Other+Key)',
-      },
-    ]);
-  });
-});
-
-describe('getLinks()', () => {
-  const linkPatterns = [
-    {
-      key: 'mySpecialKey',
-      url: 'http://example.com/?mySpecialKey=#{mySpecialKey}',
-      text: 'special key link (#{mySpecialKey})',
-    },
-  ].map(processLinkPattern) as ProcessedLinkPattern[];
-  const template = jest.spyOn(linkPatterns[0]!.url, 'template');
-
-  const span = { depth: 0, process: {}, tags: [{ key: 'mySpecialKey', value: 'valueOfMyKey' }] } as TraceSpan;
-
-  let cache: WeakMap<object, any>;
-
-  beforeEach(() => {
-    cache = new WeakMap();
-    template.mockClear();
-  });
-
-  it('does not access the cache if there is no link pattern', () => {
-    cache.get = jest.fn();
-    const getLinks = createGetLinks([], cache);
-    expect(getLinks(span, span.tags, 0)).toEqual([]);
-    expect(cache.get).not.toHaveBeenCalled();
-  });
-
-  it('returns the result from the cache', () => {
-    const result: TraceLink[] = [];
-    cache.set(span.tags[0], result);
-    const getLinks = createGetLinks(linkPatterns, cache);
-    expect(getLinks(span, span.tags, 0)).toBe(result);
-    expect(template).not.toHaveBeenCalled();
-  });
-
-  it('adds the result to the cache', () => {
-    const getLinks = createGetLinks(linkPatterns, cache);
-    const result = getLinks(span, span.tags, 0);
-    expect(template).toHaveBeenCalledTimes(1);
-    expect(result).toEqual([
-      {
-        url: 'http://example.com/?mySpecialKey=valueOfMyKey',
-        text: 'special key link (valueOfMyKey)',
-      },
-    ]);
-    expect(cache.get(span.tags[0])).toBe(result);
-  });
-});
diff --git a/public/app/features/explore/TraceView/components/model/link-patterns.tsx b/public/app/features/explore/TraceView/components/model/link-patterns.tsx
index 930fc54105658..cf52965244dad 100644
--- a/public/app/features/explore/TraceView/components/model/link-patterns.tsx
+++ b/public/app/features/explore/TraceView/components/model/link-patterns.tsx
@@ -15,11 +15,9 @@
 import { uniq as _uniq } from 'lodash';
 import memoize from 'lru-memoize';
 
-import { TraceSpan, TraceLink, TraceKeyValuePair, Trace, TNil } from '../types';
+import { Trace } from '../types';
 import { getConfigValue } from '../utils/config/get-config';
 
-import { getParent } from './span';
-
 const parameterRegExp = /#\{([^{}]*)\}/g;
 
 type ProcessedTemplate = {
@@ -119,25 +117,6 @@ export function processLinkPattern(pattern: any): ProcessedLinkPattern | null {
   }
 }
 
-export function getParameterInArray(name: string, array?: TraceKeyValuePair[] | TNil) {
-  if (array) {
-    return array.find((entry) => entry.key === name);
-  }
-  return undefined;
-}
-
-export function getParameterInAncestor(name: string, span: TraceSpan) {
-  let currentSpan: TraceSpan | TNil = span;
-  while (currentSpan) {
-    const result = getParameterInArray(name, currentSpan.tags) || getParameterInArray(name, currentSpan.process.tags);
-    if (result) {
-      return result;
-    }
-    currentSpan = getParent(currentSpan);
-  }
-  return undefined;
-}
-
 function callTemplate(template: ProcessedTemplate, data: any) {
   return template.template(data);
 }
@@ -173,70 +152,6 @@ export function computeTraceLink(linkPatterns: ProcessedLinkPattern[], trace: Tr
   return result;
 }
 
-export function computeLinks(
-  linkPatterns: ProcessedLinkPattern[],
-  span: TraceSpan,
-  items: TraceKeyValuePair[],
-  itemIndex: number
-) {
-  const item = items[itemIndex];
-  let type = 'logs';
-  const processTags = span.process.tags === items;
-  if (processTags) {
-    type = 'process';
-  }
-  const spanTags = span.tags === items;
-  if (spanTags) {
-    type = 'tags';
-  }
-  const result: Array<{ url: string; text: string }> = [];
-  linkPatterns.forEach((pattern) => {
-    if (pattern.type(type) && pattern.key(item.key) && pattern.value(item.value)) {
-      const parameterValues: Record<string, any> = {};
-      const allParameters = pattern.parameters.every((parameter) => {
-        let entry = getParameterInArray(parameter, items);
-        if (!entry && !processTags) {
-          // do not look in ancestors for process tags because the same object may appear in different places in the hierarchy
-          // and the cache in getLinks uses that object as a key
-          entry = getParameterInAncestor(parameter, span);
-        }
-        if (entry) {
-          parameterValues[parameter] = entry.value;
-          return true;
-        }
-        // eslint-disable-next-line no-console
-        console.warn(
-          `Skipping link pattern, missing parameter ${parameter} for key ${item.key} in ${type}.`,
-          pattern.object
-        );
-        return false;
-      });
-      if (allParameters) {
-        result.push({
-          url: callTemplate(pattern.url, parameterValues),
-          text: callTemplate(pattern.text, parameterValues),
-        });
-      }
-    }
-  });
-  return result;
-}
-
-export function createGetLinks(linkPatterns: ProcessedLinkPattern[], cache: WeakMap<TraceKeyValuePair, TraceLink[]>) {
-  return (span: TraceSpan, items: TraceKeyValuePair[], itemIndex: number) => {
-    if (linkPatterns.length === 0) {
-      return [];
-    }
-    const item = items[itemIndex];
-    let result = cache.get(item);
-    if (!result) {
-      result = computeLinks(linkPatterns, span, items, itemIndex);
-      cache.set(item, result);
-    }
-    return result;
-  };
-}
-
 const processedLinks = (getConfigValue('linkPatterns') || [])
   .map(processLinkPattern)
   .filter((link: ProcessedLinkPattern | null): link is ProcessedLinkPattern => Boolean(link));
@@ -248,5 +163,3 @@ export const getTraceLinks: (trace: Trace | undefined) => TLinksRV = memoize(10)
   }
   return computeTraceLink(processedLinks, trace);
 });
-
-export default createGetLinks(processedLinks, new WeakMap());
diff --git a/public/app/features/explore/TraceView/components/model/span.tsx b/public/app/features/explore/TraceView/components/model/span.tsx
deleted file mode 100644
index 07764898a2462..0000000000000
--- a/public/app/features/explore/TraceView/components/model/span.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2017 The Jaeger Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { TraceSpan } from '../types';
-
-/**
- * Searches the span.references to find 'CHILD_OF' reference type or returns null.
- * @param  {TraceSpan} span The span whose parent is to be returned.
- * @returns {TraceSpan|null} The parent span if there is one, null otherwise.
- */
-export function getParent(span: TraceSpan) {
-  const parentRef = span.references ? span.references.find((ref) => ref.refType === 'CHILD_OF') : null;
-  return parentRef ? parentRef.span : null;
-}
diff --git a/public/app/features/explore/TraceView/components/model/transform-trace-data.tsx b/public/app/features/explore/TraceView/components/model/transform-trace-data.tsx
index ccd1905bd778d..e4d294c8eb245 100644
--- a/public/app/features/explore/TraceView/components/model/transform-trace-data.tsx
+++ b/public/app/features/explore/TraceView/components/model/transform-trace-data.tsx
@@ -129,13 +129,11 @@ export default function transformTraceData(data: TraceResponse | undefined): Tra
   }
   // tree is necessary to sort the spans, so children follow parents, and
   // siblings are sorted by start time
-  const tree = getTraceSpanIdsAsTree(data);
+  const tree = getTraceSpanIdsAsTree(data, spanMap);
   const spans: TraceSpan[] = [];
   const svcCounts: Record<string, number> = {};
 
-  // Eslint complains about number type not needed but then TS complains it is implicitly any.
-  // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-  tree.walk((spanID: string | number | undefined, node: TreeNode, depth: number = 0) => {
+  tree.walk((spanID: string, node: TreeNode<string>, depth = 0) => {
     if (spanID === '__root__') {
       return;
     }
@@ -155,6 +153,16 @@ export default function transformTraceData(data: TraceResponse | undefined): Tra
     span.warnings = span.warnings || [];
     span.tags = span.tags || [];
     span.references = span.references || [];
+
+    span.childSpanIds = node.children
+      .slice()
+      .sort((a, b) => {
+        const spanA = spanMap.get(a.value)!;
+        const spanB = spanMap.get(b.value)!;
+        return spanB.startTime + spanB.duration - (spanA.startTime + spanA.duration);
+      })
+      .map((each) => each.value);
+
     const tagsInfo = deduplicateTags(span.tags);
     span.tags = orderTags(tagsInfo.dedupedTags, getConfigValue('topTagPrefixes'));
     span.warnings = span.warnings.concat(tagsInfo.warnings);
diff --git a/public/app/features/explore/TraceView/components/selectors/trace.test.ts b/public/app/features/explore/TraceView/components/selectors/trace.test.ts
index 13346e359ce11..e29aa0f0e9a20 100644
--- a/public/app/features/explore/TraceView/components/selectors/trace.test.ts
+++ b/public/app/features/explore/TraceView/components/selectors/trace.test.ts
@@ -37,7 +37,7 @@ describe('getTraceSpanIdsAsTree()', () => {
     const tree = traceSelectors.getTraceSpanIdsAsTree(generatedTrace);
     const spanMap = traceSelectors.getTraceSpansAsMap(generatedTrace);
 
-    tree.walk((value: string | number | undefined, node: TreeNode) => {
+    tree.walk((value: string, node: TreeNode<string>) => {
       const expectedParentValue = value === traceSelectors.TREE_ROOT_ID ? null : value;
       node.children.forEach((childNode) => {
         expect(getSpanParentId(spanMap.get(childNode.value))).toBe(expectedParentValue);
diff --git a/public/app/features/explore/TraceView/components/selectors/trace.ts b/public/app/features/explore/TraceView/components/selectors/trace.ts
index ca944ba67ba20..7a4f40d9f71e2 100644
--- a/public/app/features/explore/TraceView/components/selectors/trace.ts
+++ b/public/app/features/explore/TraceView/components/selectors/trace.ts
@@ -41,9 +41,9 @@ export const TREE_ROOT_ID = '__root__';
  * @return {TreeNode}    A tree of spanIDs derived from the relationships
  *                       between spans in the trace.
  */
-export function getTraceSpanIdsAsTree(trace: TraceResponse) {
+export function getTraceSpanIdsAsTree(trace: TraceResponse, spanMap: Map<string, TraceSpanData> | null = null) {
   const nodesById = new Map(trace.spans.map((span: TraceSpanData) => [span.spanID, new TreeNode(span.spanID)]));
-  const spansById = new Map(trace.spans.map((span: TraceSpanData) => [span.spanID, span]));
+  const spansById = spanMap ?? new Map(trace.spans.map((span: TraceSpanData) => [span.spanID, span]));
   const root = new TreeNode(TREE_ROOT_ID);
   trace.spans.forEach((span: TraceSpanData) => {
     const node = nodesById.get(span.spanID)!;
@@ -59,13 +59,13 @@ export function getTraceSpanIdsAsTree(trace: TraceResponse) {
       root.children.push(node);
     }
   });
-  const comparator = (nodeA: TreeNode | undefined, nodeB: TreeNode | undefined) => {
+  const comparator = (nodeA: TreeNode<string>, nodeB: TreeNode<string>) => {
     const a: TraceSpanData | undefined = nodeA?.value ? spansById.get(nodeA.value.toString()) : undefined;
     const b: TraceSpanData | undefined = nodeB?.value ? spansById.get(nodeB.value.toString()) : undefined;
     return +(a?.startTime! > b?.startTime!) || +(a?.startTime === b?.startTime) - 1;
   };
   trace.spans.forEach((span: TraceSpanData) => {
-    const node: TreeNode | undefined = nodesById.get(span.spanID);
+    const node = nodesById.get(span.spanID);
     if (node!.children.length > 1) {
       node?.children.sort(comparator);
     }
@@ -73,17 +73,3 @@ export function getTraceSpanIdsAsTree(trace: TraceResponse) {
   root.children.sort(comparator);
   return root;
 }
-
-export const omitCollapsedSpans = createSelector(
-  ({ spans }: { spans: TraceSpanData[] }) => spans,
-  createSelector(({ trace }: { trace: TraceResponse }) => trace, getTraceSpanIdsAsTree),
-  ({ collapsed }: { collapsed: string[] }) => collapsed,
-  (spans, tree, collapse) => {
-    const hiddenSpanIds = collapse.reduce((result, collapsedSpanId) => {
-      tree.find(collapsedSpanId)!.walk((id: string | number | undefined) => id !== collapsedSpanId && result.add(id));
-      return result;
-    }, new Set());
-
-    return hiddenSpanIds.size > 0 ? spans.filter((span) => !hiddenSpanIds.has(getSpanId(span))) : spans;
-  }
-);
diff --git a/public/app/features/explore/TraceView/components/settings/SpanBarSettings.tsx b/public/app/features/explore/TraceView/components/settings/SpanBarSettings.tsx
index 41670d2144202..4c8ac4a99d064 100644
--- a/public/app/features/explore/TraceView/components/settings/SpanBarSettings.tsx
+++ b/public/app/features/explore/TraceView/components/settings/SpanBarSettings.tsx
@@ -8,9 +8,8 @@ import {
   toOption,
   updateDatasourcePluginJsonDataOption,
 } from '@grafana/data';
-import { ConfigSubSection } from '@grafana/experimental';
+import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/experimental';
 import { InlineField, InlineFieldRow, Input, Select, useStyles2 } from '@grafana/ui';
-import { ConfigDescriptionLink } from 'app/core/components/ConfigDescriptionLink';
 
 export interface SpanBarOptions {
   type?: string;
diff --git a/public/app/features/explore/TraceView/components/types/TTraceDiffState.tsx b/public/app/features/explore/TraceView/components/types/TTraceDiffState.tsx
deleted file mode 100644
index 2ef0eda4e3959..0000000000000
--- a/public/app/features/explore/TraceView/components/types/TTraceDiffState.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) 2017 Uber Technologies, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import TNil from './TNil';
-
-type TTraceDiffState = {
-  a?: string | TNil;
-  b?: string | TNil;
-  cohort: string[];
-};
-
-// eslint-disable-next-line no-undef
-export default TTraceDiffState;
diff --git a/public/app/features/explore/TraceView/components/types/config.tsx b/public/app/features/explore/TraceView/components/types/config.tsx
deleted file mode 100644
index 944a2a278de82..0000000000000
--- a/public/app/features/explore/TraceView/components/types/config.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) 2017 Uber Technologies, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { TNil } from './index';
-
-export type ConfigMenuItem = {
-  label: string;
-  url: string;
-  anchorTarget?: '_self' | '_blank' | '_parent' | '_top';
-};
-
-export type ConfigMenuGroup = {
-  label: string;
-  items: ConfigMenuItem[];
-};
-
-export type TScript = {
-  text: string;
-  type: 'inline';
-};
-
-export type LinkPatternsConfig = {
-  type: 'process' | 'tags' | 'logs' | 'traces';
-  key?: string;
-  url: string;
-  text: string;
-};
-
-export type Config = {
-  archiveEnabled?: boolean;
-  deepDependencies?: { menuEnabled?: boolean };
-  dependencies?: { dagMaxServicesLen?: number; menuEnabled?: boolean };
-  menu: Array<ConfigMenuGroup | ConfigMenuItem>;
-  search?: { maxLookback: { label: string; value: string }; maxLimit: number };
-  scripts?: TScript[];
-  topTagPrefixes?: string[];
-  tracking?: {
-    cookieToDimension?: Array<{
-      cookie: string;
-      dimension: string;
-    }>;
-    gaID: string | TNil;
-    trackErrors: boolean | TNil;
-  };
-  linkPatterns?: LinkPatternsConfig;
-};
diff --git a/public/app/features/explore/TraceView/components/types/index.tsx b/public/app/features/explore/TraceView/components/types/index.tsx
index a491bb9df8bc0..2c1ad3dca5ddb 100644
--- a/public/app/features/explore/TraceView/components/types/index.tsx
+++ b/public/app/features/explore/TraceView/components/types/index.tsx
@@ -12,7 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-export { TraceSpan, TraceResponse, Trace, TraceProcess, TraceKeyValuePair, TraceLink } from './trace';
+export {
+  TraceSpan,
+  TraceResponse,
+  Trace,
+  TraceProcess,
+  TraceKeyValuePair,
+  TraceLink,
+  CriticalPathSection,
+} from './trace';
 export { SpanBarOptions, SpanBarOptionsData } from '../settings/SpanBarSettings';
 export { default as TTraceTimeline } from './TTraceTimeline';
 export { default as TNil } from './TNil';
diff --git a/public/app/features/explore/TraceView/components/types/links.ts b/public/app/features/explore/TraceView/components/types/links.ts
index 3a2e5f05e0e4a..0ffe2ec5ec130 100644
--- a/public/app/features/explore/TraceView/components/types/links.ts
+++ b/public/app/features/explore/TraceView/components/types/links.ts
@@ -8,6 +8,7 @@ export enum SpanLinkType {
   Logs = 'log',
   Traces = 'trace',
   Metrics = 'metric',
+  Profiles = 'profile',
   Unknown = 'unknown',
 }
 
diff --git a/public/app/features/explore/TraceView/components/types/trace.ts b/public/app/features/explore/TraceView/components/types/trace.ts
index 178c8d864e6a3..0507287b98746 100644
--- a/public/app/features/explore/TraceView/components/types/trace.ts
+++ b/public/app/features/explore/TraceView/components/types/trace.ts
@@ -69,6 +69,7 @@ export type TraceSpanData = {
   flags: number;
   errorIconColor?: string;
   dataFrameRowIndex?: number;
+  childSpanIds?: string[];
 };
 
 export type TraceSpan = TraceSpanData & {
@@ -80,6 +81,7 @@ export type TraceSpan = TraceSpanData & {
   tags: NonNullable<TraceSpanData['tags']>;
   references: NonNullable<TraceSpanData['references']>;
   warnings: NonNullable<TraceSpanData['warnings']>;
+  childSpanIds: NonNullable<TraceSpanData['childSpanIds']>;
   subsidiarilyReferencedBy: TraceSpanReference[];
 };
 
@@ -101,3 +103,10 @@ export type Trace = TraceData & {
   traceName: string;
   services: Array<{ name: string; numberOfSpans: number }>;
 };
+
+// It is a section of span that lies on critical path
+export type CriticalPathSection = {
+  spanId: string;
+  section_start: number;
+  section_end: number;
+};
diff --git a/public/app/features/explore/TraceView/components/uberUtilityStyles.ts b/public/app/features/explore/TraceView/components/uberUtilityStyles.ts
deleted file mode 100644
index d95db6e9c8ca8..0000000000000
--- a/public/app/features/explore/TraceView/components/uberUtilityStyles.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { css } from '@emotion/css';
-
-export const ubRelative = css`
-  position: relative;
-`;
-
-export const ubMb1 = css`
-  margin-bottom: 0.25rem;
-`;
-
-export const ubMy1 = css`
-  margin-top: 0.25rem;
-  margin-bottom: 0.25rem;
-`;
-
-export const ubM0 = css`
-  margin: 0;
-`;
-
-export const ubPx2 = css`
-  padding-left: 0.5rem;
-  padding-right: 0.5rem;
-`;
-
-export const ubPb2 = css`
-  padding-bottom: 0.5rem;
-`;
-
-export const ubFlex = css`
-  display: flex;
-`;
-
-export const ubItemsCenter = css`
-  align-items: center;
-`;
-
-export const ubItemsStart = css`
-  align-items: start;
-`;
-
-export const ubFlexAuto = css`
-  flex: 1 1 auto;
-  min-width: 0; /* 1 */
-  min-height: 0; /* 1 */
-`;
-
-export const ubTxRightAlign = css`
-  text-align: right;
-`;
-
-export const ubInlineBlock = css`
-  display: inline-block;
-`;
-
-export const uAlignIcon = css`
-  margin: -0.2rem 0.25rem 0 0;
-`;
-
-export const uTxEllipsis = css`
-  text-overflow: ellipsis;
-`;
-
-export const uWidth100 = css`
-  width: 100%;
-`;
-
-export const uTxMuted = css`
-  color: #aaa;
-`;
-
-export const ubJustifyEnd = css`
-  justify-content: flex-end;
-`;
diff --git a/public/app/features/explore/TraceView/components/utils/TreeNode.test.ts b/public/app/features/explore/TraceView/components/utils/TreeNode.test.ts
index 5136cdccb2b91..2585e3618580f 100644
--- a/public/app/features/explore/TraceView/components/utils/TreeNode.test.ts
+++ b/public/app/features/explore/TraceView/components/utils/TreeNode.test.ts
@@ -29,7 +29,7 @@ it('TreeNode constructor should return a tree node', () => {
 });
 
 it('depth should work for a single node', () => {
-  expect(new TreeNode().depth).toBe(1);
+  expect(new TreeNode<number>(0).depth).toBe(1);
 });
 
 it('depth should caluclate the depth', () => {
@@ -119,8 +119,8 @@ it('find() should return the found item for a function', () => {
   treeRoot.addChild(11);
   treeRoot.addChild(12);
 
-  expect(treeRoot.find((value) => value === 6)).toEqual(secondChildNode);
-  expect(treeRoot.find(12)).toEqual(new TreeNode(12));
+  expect(treeRoot.find((value: number) => value === 6)).toEqual(secondChildNode);
+  expect(treeRoot.find((value: number) => value === 12)).toEqual(new TreeNode(12));
 });
 
 it('find() should return the found item for a value', () => {
@@ -140,8 +140,8 @@ it('find() should return the found item for a value', () => {
   treeRoot.addChild(11);
   treeRoot.addChild(12);
 
-  expect(treeRoot.find(7)).toEqual(thirdDeepestChildNode);
-  expect(treeRoot.find(12)).toEqual(new TreeNode(12));
+  expect(treeRoot.find((value: number) => value === 7)).toEqual(thirdDeepestChildNode);
+  expect(treeRoot.find((value: number) => value === 12)).toEqual(new TreeNode(12));
 });
 
 it('find() should return the found item for a treenode', () => {
@@ -182,8 +182,8 @@ it('find() should return null for none found', () => {
   treeRoot.addChild(11);
   treeRoot.addChild(12);
 
-  expect(treeRoot.find(13)).toBe(null);
-  expect(treeRoot.find((value) => value === 'foo')).toBe(null);
+  expect(treeRoot.find((value: number) => value === 13)).toBe(null);
+  expect(treeRoot.find((value: string) => value === 'foo')).toBe(null);
 });
 
 it('getPath() should return the path to the node', () => {
@@ -225,7 +225,7 @@ it('getPath() should return null if the node is not in the tree', () => {
 
   const exteriorNode = new TreeNode(15);
 
-  expect(treeRoot.getPath(exteriorNode)).toEqual(null);
+  expect(treeRoot.getPath((value: TreeNode<number>) => value === exteriorNode)).toEqual(null);
 });
 
 it('walk() should iterate over every item once in the right order', () => {
diff --git a/public/app/features/explore/TraceView/components/utils/TreeNode.ts b/public/app/features/explore/TraceView/components/utils/TreeNode.ts
index 168e1eec803c1..f6b123f2d5022 100644
--- a/public/app/features/explore/TraceView/components/utils/TreeNode.ts
+++ b/public/app/features/explore/TraceView/components/utils/TreeNode.ts
@@ -10,34 +10,34 @@
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
-// limitations under the License.
+// limitations under the License
 
-type SearchFn = (value: string | number | undefined, node: TreeNode, depth?: number) => boolean;
+export default class TreeNode<TValue> {
+  value: TValue;
+  children: Array<TreeNode<TValue>>;
 
-export default class TreeNode {
-  value: string | number | undefined;
-  children: TreeNode[];
-
-  static iterFunction(fn: SearchFn, depth = 0) {
-    return (node: TreeNode) => fn(node.value, node, depth);
+  static iterFunction<TValue>(
+    fn: ((value: TValue, node: TreeNode<TValue>, depth: number) => TreeNode<TValue> | null) | Function,
+    depth = 0
+  ) {
+    return (node: TreeNode<TValue>) => fn(node.value, node, depth);
   }
 
-  static searchFunction(search: TreeNode | number | SearchFn | string) {
+  static searchFunction<TValue>(search: Function | TreeNode<TValue>) {
     if (typeof search === 'function') {
       return search;
     }
 
-    return (value: string | number | undefined, node: TreeNode) =>
-      search instanceof TreeNode ? node === search : value === search;
+    return (value: TValue, node: TreeNode<TValue>) => (search instanceof TreeNode ? node === search : value === search);
   }
 
-  constructor(value?: string | number, children: TreeNode[] = []) {
+  constructor(value: TValue, children: Array<TreeNode<TValue>> = []) {
     this.value = value;
     this.children = children;
   }
 
   get depth(): number {
-    return this.children?.reduce((depth: number, child: { depth: number }) => Math.max(child.depth + 1, depth), 1);
+    return this.children.reduce((depth, child) => Math.max(child.depth + 1, depth), 1);
   }
 
   get size() {
@@ -46,12 +46,12 @@ export default class TreeNode {
     return i;
   }
 
-  addChild(child: string | number | TreeNode) {
-    this.children?.push(child instanceof TreeNode ? child : new TreeNode(child));
+  addChild(child: TreeNode<TValue> | TValue) {
+    this.children.push(child instanceof TreeNode ? child : new TreeNode(child));
     return this;
   }
 
-  find(search: TreeNode | number | SearchFn | string): TreeNode | null {
+  find(search: Function | TreeNode<TValue>): TreeNode<TValue> | null {
     const searchFn = TreeNode.iterFunction(TreeNode.searchFunction(search));
     if (searchFn(this)) {
       return this;
@@ -65,10 +65,13 @@ export default class TreeNode {
     return null;
   }
 
-  getPath(search: TreeNode | string) {
+  getPath(search: Function | TreeNode<TValue>) {
     const searchFn = TreeNode.iterFunction(TreeNode.searchFunction(search));
 
-    const findPath = (currentNode: TreeNode, currentPath: TreeNode[]): TreeNode[] | null => {
+    const findPath = (
+      currentNode: TreeNode<TValue>,
+      currentPath: Array<TreeNode<TValue>>
+    ): Array<TreeNode<TValue>> | null => {
       // skip if we already found the result
       const attempt = currentPath.concat([currentNode]);
       // base case: return the array when there is a match
@@ -88,22 +91,49 @@ export default class TreeNode {
     return findPath(this, []);
   }
 
-  walk(fn: (value: string | number | undefined, node: TreeNode, depth?: number) => void, depth = 0) {
-    const nodeStack: Array<{ node: TreeNode; depth?: number }> = [];
-    let actualDepth = depth;
+  walk(fn: (spanID: TValue, node: TreeNode<TValue>, depth: number) => void, startDepth = 0) {
+    type StackEntry = {
+      node: TreeNode<TValue>;
+      depth: number;
+    };
+    const nodeStack: StackEntry[] = [];
+    let actualDepth = startDepth;
     nodeStack.push({ node: this, depth: actualDepth });
     while (nodeStack.length) {
-      const popped = nodeStack.pop();
-      if (popped) {
-        const { node, depth: nodeDepth } = popped;
-        fn(node.value, node, nodeDepth);
-        actualDepth = (nodeDepth || 0) + 1;
-        let i = node.children.length - 1;
-        while (i >= 0) {
-          nodeStack.push({ node: node.children[i], depth: actualDepth });
-          i--;
+      const entry: StackEntry = nodeStack[nodeStack.length - 1];
+      nodeStack.pop();
+      const { node, depth } = entry;
+      fn(node.value, node, depth);
+      actualDepth = depth + 1;
+      let i = node.children.length - 1;
+      while (i >= 0) {
+        nodeStack.push({ node: node.children[i], depth: actualDepth });
+        i--;
+      }
+    }
+  }
+
+  paths(fn: (pathIds: TValue[]) => void) {
+    type StackEntry = {
+      node: TreeNode<TValue>;
+      childIndex: number;
+    };
+    const stack: StackEntry[] = [];
+    stack.push({ node: this, childIndex: 0 });
+    const paths: TValue[] = [];
+    while (stack.length) {
+      const { node, childIndex } = stack[stack.length - 1];
+      if (node.children.length >= childIndex + 1) {
+        stack[stack.length - 1].childIndex++;
+        stack.push({ node: node.children[childIndex], childIndex: 0 });
+      } else {
+        if (node.children.length === 0) {
+          const path = stack.map((item) => item.node.value);
+          fn(path);
         }
+        stack.pop();
       }
     }
+    return paths;
   }
 }
diff --git a/public/app/features/explore/TraceView/components/utils/filter-spans.test.ts b/public/app/features/explore/TraceView/components/utils/filter-spans.test.ts
index c5652e4b43d21..00fd835e1d9f9 100644
--- a/public/app/features/explore/TraceView/components/utils/filter-spans.test.ts
+++ b/public/app/features/explore/TraceView/components/utils/filter-spans.test.ts
@@ -465,6 +465,11 @@ describe('filterSpans', () => {
         spans
       )
     ).toEqual(new Set());
+
+    // query
+    expect(filterSpans({ ...defaultFilters, query: 'serviceName0' }, spans)).toEqual(new Set([spanID0]));
+    expect(filterSpans({ ...defaultFilters, query: 'tagKey1' }, spans)).toEqual(new Set([spanID0, spanID2]));
+    expect(filterSpans({ ...defaultFilters, query: 'does_not_exist' }, spans)).toEqual(new Set([]));
   });
 
   // Multiple
@@ -541,6 +546,38 @@ describe('filterSpans', () => {
       )
     ).toEqual(new Set([spanID2]));
 
+    // query + other
+    expect(filterSpans({ ...defaultFilters, serviceName: 'serviceName0', query: 'tag' }, spans)).toEqual(
+      new Set([spanID0])
+    );
+    expect(filterSpans({ ...defaultFilters, serviceName: 'serviceName0', query: 'tagKey2' }, spans)).toEqual(
+      new Set([])
+    );
+    expect(
+      filterSpans(
+        { ...defaultFilters, serviceName: 'serviceName2', spanName: 'operationName2', query: 'tagKey1' },
+        spans
+      )
+    ).toEqual(new Set([spanID2]));
+    expect(
+      filterSpans(
+        { ...defaultFilters, serviceName: 'serviceName2', spanName: 'operationName2', to: '6ms', query: 'kind2' },
+        spans
+      )
+    ).toEqual(new Set([spanID2]));
+    expect(
+      filterSpans(
+        {
+          ...defaultFilters,
+          serviceName: 'serviceName0',
+          spanName: 'operationName0',
+          from: '2ms',
+          query: 'logFieldKey1',
+        },
+        spans
+      )
+    ).toEqual(new Set([spanID0]));
+
     // all
     expect(
       filterSpans(
diff --git a/public/app/features/explore/TraceView/components/utils/filter-spans.tsx b/public/app/features/explore/TraceView/components/utils/filter-spans.tsx
index 03ed3fd85db58..c141ca43ce76c 100644
--- a/public/app/features/explore/TraceView/components/utils/filter-spans.tsx
+++ b/public/app/features/explore/TraceView/components/utils/filter-spans.tsx
@@ -44,9 +44,59 @@ export function filterSpans(searchProps: SearchProps, spans: TraceSpan[] | TNil)
     filteredSpans = true;
   }
 
+  if (searchProps.query) {
+    const queryMatches = getQueryMatches(searchProps.query, spans);
+    if (queryMatches) {
+      spans = queryMatches;
+      filteredSpans = true;
+    }
+  }
+
   return filteredSpans ? new Set(spans.map((span: TraceSpan) => span.spanID)) : undefined;
 }
 
+export function getQueryMatches(query: string, spans: TraceSpan[] | TNil) {
+  if (!spans) {
+    return undefined;
+  }
+
+  const queryParts: string[] = [];
+
+  // split query by whitespace, remove empty strings, and extract filters
+  query
+    .split(/\s+/)
+    .filter(Boolean)
+    .forEach((w) => {
+      queryParts.push(w.toLowerCase());
+    });
+
+  const isTextInQuery = (queryParts: string[], text: string) =>
+    queryParts.some((queryPart) => text.toLowerCase().includes(queryPart));
+
+  const isTextInKeyValues = (kvs: TraceKeyValuePair[]) =>
+    kvs
+      ? kvs.some((kv) => {
+          return isTextInQuery(queryParts, kv.key) || isTextInQuery(queryParts, kv.value.toString());
+        })
+      : false;
+
+  const isSpanAMatch = (span: TraceSpan) =>
+    isTextInQuery(queryParts, span.operationName) ||
+    isTextInQuery(queryParts, span.process.serviceName) ||
+    isTextInKeyValues(span.tags) ||
+    (span.kind && isTextInQuery(queryParts, span.kind)) ||
+    (span.statusCode !== undefined && isTextInQuery(queryParts, SpanStatusCode[span.statusCode])) ||
+    (span.statusMessage && isTextInQuery(queryParts, span.statusMessage)) ||
+    (span.instrumentationLibraryName && isTextInQuery(queryParts, span.instrumentationLibraryName)) ||
+    (span.instrumentationLibraryVersion && isTextInQuery(queryParts, span.instrumentationLibraryVersion)) ||
+    (span.traceState && isTextInQuery(queryParts, span.traceState)) ||
+    (span.logs !== null && span.logs.some((log) => isTextInKeyValues(log.fields))) ||
+    isTextInKeyValues(span.process.tags) ||
+    queryParts.some((queryPart) => queryPart === span.spanID);
+
+  return spans.filter(isSpanAMatch);
+}
+
 const getTagMatches = (spans: TraceSpan[], tags: Tag[]) => {
   // remove empty/default tags
   tags = tags.filter((tag) => {
diff --git a/public/app/features/explore/TraceView/createSpanLink.test.ts b/public/app/features/explore/TraceView/createSpanLink.test.ts
index e4517360b16ff..9c0c81fa9fe0c 100644
--- a/public/app/features/explore/TraceView/createSpanLink.test.ts
+++ b/public/app/features/explore/TraceView/createSpanLink.test.ts
@@ -5,21 +5,57 @@ import {
   SupportedTransformationType,
   DataLinkConfigOrigin,
   FieldType,
+  DataFrame,
 } from '@grafana/data';
+import { TraceToLogsOptionsV2, TraceToMetricsOptions } from '@grafana/o11y-ds-frontend';
 import { DataSourceSrv, setDataSourceSrv, setTemplateSrv } from '@grafana/runtime';
-import { TraceToMetricsOptions } from 'app/core/components/TraceToMetrics/TraceToMetricsSettings';
 import { DatasourceSrv } from 'app/features/plugins/datasource_srv';
 
-import { TraceToLogsOptionsV2 } from '../../../core/components/TraceToLogs/TraceToLogsSettings';
 import { LinkSrv, setLinkSrv } from '../../panel/panellinks/link_srv';
 import { TemplateSrv } from '../../templating/template_srv';
 
 import { Trace, TraceSpan } from './components';
 import { SpanLinkType } from './components/types/links';
-import { createSpanLinkFactory } from './createSpanLink';
+import { createSpanLinkFactory, pyroscopeProfileIdTagKey } from './createSpanLink';
 
 const dummyTraceData = { duration: 10, traceID: 'trace1', traceName: 'test trace' } as unknown as Trace;
-const dummyDataFrame = createDataFrame({ fields: [{ name: 'traceId', values: ['trace1'] }] });
+const dummyDataFrame = createDataFrame({
+  fields: [
+    { name: 'traceId', values: ['trace1'] },
+    { name: 'spanID', values: ['testSpanId'] },
+  ],
+});
+const dummyDataFrameForProfiles = createDataFrame({
+  fields: [
+    { name: 'traceId', values: ['trace1'] },
+    { name: 'spanID', values: ['testSpanId'] },
+    {
+      name: 'tags',
+      config: {
+        links: [
+          {
+            internal: {
+              query: {
+                labelSelector: '{${__tags}}',
+                groupBy: [],
+                profileTypeId: '',
+                queryType: 'profile',
+                spanSelector: ['${__span.spanId}'],
+                refId: '',
+              },
+              datasourceUid: 'pyroscopeUid',
+              datasourceName: 'pyroscope',
+            },
+            url: '',
+            title: 'Test',
+            origin: DataLinkConfigOrigin.Datasource,
+          },
+        ],
+      },
+      values: [{ key: 'test', value: 'test' }],
+    },
+  ],
+});
 
 jest.mock('app/core/services/context_srv', () => ({
   contextSrv: {
@@ -1229,6 +1265,205 @@ describe('createSpanLinkFactory', () => {
       );
     });
   });
+
+  describe('should return pyroscope link', () => {
+    beforeAll(() => {
+      setDataSourceSrv({
+        getInstanceSettings() {
+          return {
+            uid: 'pyroscopeUid',
+            name: 'pyroscope',
+            type: 'grafana-pyroscope-datasource',
+          } as unknown as DataSourceInstanceSettings;
+        },
+      } as unknown as DataSourceSrv);
+
+      setLinkSrv(new LinkSrv());
+      setTemplateSrv(new TemplateSrv());
+    });
+
+    it('with default keys when tags not configured', () => {
+      const createLink = setupSpanLinkFactory({}, '', dummyDataFrameForProfiles);
+      expect(createLink).toBeDefined();
+      const links = createLink!(createTraceSpan());
+      const linkDef = links?.[0];
+      expect(linkDef).toBeDefined();
+      expect(linkDef?.type).toBe(SpanLinkType.Profiles);
+      expect(linkDef!.href).toBe(
+        `/explore?left=${encodeURIComponent(
+          '{"range":{"from":"1602637140000","to":"1602637261000"},"datasource":"pyroscopeUid","queries":[{"labelSelector":"{service_namespace=\\"namespace1\\"}","groupBy":[],"profileTypeId":"","queryType":"profile","spanSelector":["6605c7b08e715d6c"],"refId":""}]}'
+        )}`
+      );
+    });
+
+    it('with tags that passed in and without tags that are not in the span', () => {
+      const createLink = setupSpanLinkFactory(
+        {
+          tags: [{ key: 'ip' }, { key: 'newTag' }],
+        },
+        '',
+        dummyDataFrameForProfiles
+      );
+      expect(createLink).toBeDefined();
+      const links = createLink!(
+        createTraceSpan({
+          process: {
+            serviceName: 'service',
+            tags: [
+              { key: 'hostname', value: 'hostname1' },
+              { key: 'ip', value: '192.168.0.1' },
+            ],
+          },
+        })
+      );
+      const linkDef = links?.[0];
+      expect(linkDef).toBeDefined();
+      expect(linkDef?.type).toBe(SpanLinkType.Profiles);
+      expect(linkDef!.href).toBe(
+        `/explore?left=${encodeURIComponent(
+          '{"range":{"from":"1602637140000","to":"1602637261000"},"datasource":"pyroscopeUid","queries":[{"labelSelector":"{ip=\\"192.168.0.1\\"}","groupBy":[],"profileTypeId":"","queryType":"profile","spanSelector":["6605c7b08e715d6c"],"refId":""}]}'
+        )}`
+      );
+    });
+
+    it('from tags and process tags as well', () => {
+      const createLink = setupSpanLinkFactory(
+        {
+          tags: [{ key: 'ip' }, { key: 'host' }],
+        },
+        '',
+        dummyDataFrameForProfiles
+      );
+      expect(createLink).toBeDefined();
+      const links = createLink!(
+        createTraceSpan({
+          process: {
+            serviceName: 'service',
+            tags: [
+              { key: 'hostname', value: 'hostname1' },
+              { key: 'ip', value: '192.168.0.1' },
+            ],
+          },
+        })
+      );
+      const linkDef = links?.[0];
+      expect(linkDef).toBeDefined();
+      expect(linkDef?.type).toBe(SpanLinkType.Profiles);
+      expect(linkDef!.href).toBe(
+        `/explore?left=${encodeURIComponent(
+          '{"range":{"from":"1602637140000","to":"1602637261000"},"datasource":"pyroscopeUid","queries":[{"labelSelector":"{ip=\\"192.168.0.1\\", host=\\"host\\"}","groupBy":[],"profileTypeId":"","queryType":"profile","spanSelector":["6605c7b08e715d6c"],"refId":""}]}'
+        )}`
+      );
+    });
+
+    it('creates link from dataFrame', () => {
+      const splitOpenFn = jest.fn();
+      const createLink = createSpanLinkFactory({
+        splitOpenFn,
+        dataFrame: createDataFrame({
+          fields: [
+            { name: 'traceID', values: ['testTraceId'] },
+            {
+              name: 'spanID',
+              config: { links: [{ title: 'link', url: '${__data.fields.spanID}' }] },
+              values: ['testSpanId'],
+            },
+          ],
+        }),
+        trace: dummyTraceData,
+      });
+      expect(createLink).toBeDefined();
+      const links = createLink!(createTraceSpan());
+
+      const linkDef = links?.[0];
+      expect(linkDef).toBeDefined();
+      expect(linkDef?.type).toBe(SpanLinkType.Unknown);
+      expect(linkDef!.href).toBe('testSpanId');
+    });
+
+    it('handles renamed tags', () => {
+      const createLink = setupSpanLinkFactory(
+        {
+          tags: [
+            { key: 'service.name', value: 'service' },
+            { key: 'k8s.pod.name', value: 'pod' },
+          ],
+        },
+        '',
+        dummyDataFrameForProfiles
+      );
+      expect(createLink).toBeDefined();
+      const links = createLink!(
+        createTraceSpan({
+          process: {
+            serviceName: 'service',
+            tags: [
+              { key: 'service.name', value: 'serviceName' },
+              { key: 'k8s.pod.name', value: 'podName' },
+            ],
+          },
+        })
+      );
+
+      const linkDef = links?.[0];
+      expect(linkDef).toBeDefined();
+      expect(linkDef?.type).toBe(SpanLinkType.Profiles);
+      expect(linkDef!.href).toBe(
+        `/explore?left=${encodeURIComponent(
+          '{"range":{"from":"1602637140000","to":"1602637261000"},"datasource":"pyroscopeUid","queries":[{"labelSelector":"{service=\\"serviceName\\", pod=\\"podName\\"}","groupBy":[],"profileTypeId":"","queryType":"profile","spanSelector":["6605c7b08e715d6c"],"refId":""}]}'
+        )}`
+      );
+    });
+
+    it('handles incomplete renamed tags', () => {
+      const createLink = setupSpanLinkFactory(
+        {
+          tags: [
+            { key: 'service.name', value: '' },
+            { key: 'k8s.pod.name', value: 'pod' },
+          ],
+        },
+        '',
+        dummyDataFrameForProfiles
+      );
+      expect(createLink).toBeDefined();
+      const links = createLink!(
+        createTraceSpan({
+          process: {
+            serviceName: 'service',
+            tags: [
+              { key: 'service.name', value: 'serviceName' },
+              { key: 'k8s.pod.name', value: 'podName' },
+            ],
+          },
+        })
+      );
+
+      const linkDef = links?.[0];
+      expect(linkDef).toBeDefined();
+      expect(linkDef?.type).toBe(SpanLinkType.Profiles);
+      expect(linkDef!.href).toBe(
+        `/explore?left=${encodeURIComponent(
+          '{"range":{"from":"1602637140000","to":"1602637261000"},"datasource":"pyroscopeUid","queries":[{"labelSelector":"{service.name=\\"serviceName\\", pod=\\"podName\\"}","groupBy":[],"profileTypeId":"","queryType":"profile","spanSelector":["6605c7b08e715d6c"],"refId":""}]}'
+        )}`
+      );
+    });
+
+    it('interpolates span intrinsics', () => {
+      const createLink = setupSpanLinkFactory(
+        {
+          tags: [{ key: 'name', value: 'spanName' }],
+        },
+        '',
+        dummyDataFrameForProfiles
+      );
+      expect(createLink).toBeDefined();
+      const links = createLink!(createTraceSpan());
+      expect(links).toBeDefined();
+      expect(links![0].type).toBe(SpanLinkType.Profiles);
+      expect(decodeURIComponent(links![0].href)).toContain('spanName=\\"operation\\"');
+    });
+  });
 });
 
 describe('dataFrame links', () => {
@@ -1272,7 +1507,11 @@ describe('dataFrame links', () => {
   });
 });
 
-function setupSpanLinkFactory(options: Partial<TraceToLogsOptionsV2> = {}, datasourceUid = 'lokiUid') {
+function setupSpanLinkFactory(
+  options: Partial<TraceToLogsOptionsV2> = {},
+  datasourceUid = 'lokiUid',
+  dummyDataFrameForProfiles?: DataFrame
+) {
   const splitOpenFn = jest.fn();
   return createSpanLinkFactory({
     splitOpenFn,
@@ -1281,13 +1520,18 @@ function setupSpanLinkFactory(options: Partial<TraceToLogsOptionsV2> = {}, datas
       datasourceUid,
       ...options,
     },
+    traceToProfilesOptions: {
+      customQuery: false,
+      datasourceUid: 'pyroscopeUid',
+      ...options,
+    },
     createFocusSpanLink: (traceId, spanId) => {
       return {
         href: `${traceId}-${spanId}`,
       } as unknown as LinkModel;
     },
     trace: dummyTraceData,
-    dataFrame: dummyDataFrame,
+    dataFrame: dummyDataFrameForProfiles ? dummyDataFrameForProfiles : dummyDataFrame,
   });
 }
 
@@ -1308,6 +1552,10 @@ function createTraceSpan(overrides: Partial<TraceSpan> = {}) {
         key: 'host',
         value: 'host',
       },
+      {
+        key: pyroscopeProfileIdTagKey,
+        value: 'hdgfljn23u982nj',
+      },
     ],
     process: {
       serviceName: 'test service',
diff --git a/public/app/features/explore/TraceView/createSpanLink.tsx b/public/app/features/explore/TraceView/createSpanLink.tsx
index 930edd74c8945..7b9cdd06c7684 100644
--- a/public/app/features/explore/TraceView/createSpanLink.tsx
+++ b/public/app/features/explore/TraceView/createSpanLink.tsx
@@ -14,11 +14,15 @@ import {
   SplitOpen,
   TimeRange,
 } from '@grafana/data';
+import {
+  TraceToProfilesOptions,
+  TraceToMetricsOptions,
+  TraceToLogsOptionsV2,
+  TraceToLogsTag,
+} from '@grafana/o11y-ds-frontend';
 import { getTemplateSrv } from '@grafana/runtime';
 import { DataQuery } from '@grafana/schema';
 import { Icon } from '@grafana/ui';
-import { TraceToLogsOptionsV2, TraceToLogsTag } from 'app/core/components/TraceToLogs/TraceToLogsSettings';
-import { TraceToMetricQuery, TraceToMetricsOptions } from 'app/core/components/TraceToMetrics/TraceToMetricsSettings';
 import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
 import { PromQuery } from 'app/plugins/datasource/prometheus/types';
 
@@ -37,6 +41,7 @@ export function createSpanLinkFactory({
   splitOpenFn,
   traceToLogsOptions,
   traceToMetricsOptions,
+  traceToProfilesOptions,
   dataFrame,
   createFocusSpanLink,
   trace,
@@ -44,6 +49,7 @@ export function createSpanLinkFactory({
   splitOpenFn: SplitOpen;
   traceToLogsOptions?: TraceToLogsOptionsV2;
   traceToMetricsOptions?: TraceToMetricsOptions;
+  traceToProfilesOptions?: TraceToProfilesOptions;
   dataFrame?: DataFrame;
   createFocusSpanLink?: (traceId: string, spanId: string) => LinkModel<Field>;
   trace: Trace;
@@ -52,7 +58,7 @@ export function createSpanLinkFactory({
     return undefined;
   }
 
-  let scopedVars = scopedVarsFromTrace(trace);
+  let scopedVars = scopedVarsFromTrace(trace.duration, trace.traceName, trace.traceID);
   const hasLinks = dataFrame.fields.some((f) => Boolean(f.config.links?.length));
 
   const createSpanLinks = legacyCreateSpanLinkFactory(
@@ -72,17 +78,26 @@ export function createSpanLinkFactory({
       scopedVars = {
         ...scopedVars,
         ...scopedVarsFromSpan(span),
+        ...scopedVarsFromTags(span, traceToProfilesOptions),
       };
       // We should be here only if there are some links in the dataframe
       const fields = dataFrame.fields.filter((f) => Boolean(f.config.links?.length))!;
       try {
+        let profilesDataSourceSettings: DataSourceInstanceSettings<DataSourceJsonData> | undefined;
+        if (traceToProfilesOptions?.datasourceUid) {
+          profilesDataSourceSettings = getDatasourceSrv().getInstanceSettings(traceToProfilesOptions.datasourceUid);
+        }
+        const hasConfiguredPyroscopeDS = profilesDataSourceSettings?.type === 'grafana-pyroscope-datasource';
+        const hasPyroscopeProfile = span.tags.some((tag) => tag.key === pyroscopeProfileIdTagKey);
+        const shouldCreatePyroscopeLink = hasConfiguredPyroscopeDS && hasPyroscopeProfile;
+
         let links: ExploreFieldLinkModel[] = [];
         fields.forEach((field) => {
           const fieldLinksForExplore = getFieldLinksForExplore({
             field,
             rowIndex: span.dataFrameRowIndex!,
             splitOpenFn,
-            range: getTimeRangeFromSpan(span),
+            range: getTimeRangeFromSpan(span, undefined, undefined, shouldCreatePyroscopeLink),
             dataFrame,
             vars: scopedVars,
           });
@@ -96,7 +111,7 @@ export function createSpanLinkFactory({
             onClick: link.onClick,
             content: <Icon name="link" title={link.title || 'Link'} />,
             field: link.origin,
-            type: SpanLinkType.Unknown,
+            type: shouldCreatePyroscopeLink ? SpanLinkType.Profiles : SpanLinkType.Unknown,
           };
         });
 
@@ -115,10 +130,15 @@ export function createSpanLinkFactory({
 /**
  * Default keys to use when there are no configured tags.
  */
-const defaultKeys = ['cluster', 'hostname', 'namespace', 'pod', 'service.name', 'service.namespace'].map((k) => ({
-  key: k,
-  value: k.includes('.') ? k.replace('.', '_') : undefined,
-}));
+const formatDefaultKeys = (keys: string[]) => {
+  return keys.map((k) => ({
+    key: k,
+    value: k.includes('.') ? k.replace('.', '_') : undefined,
+  }));
+};
+const defaultKeys = formatDefaultKeys(['cluster', 'hostname', 'namespace', 'pod', 'service.name', 'service.namespace']);
+export const defaultProfilingKeys = formatDefaultKeys(['service.name', 'service.namespace']);
+export const pyroscopeProfileIdTagKey = 'pyroscope.profile.id';
 
 function legacyCreateSpanLinkFactory(
   splitOpenFn: SplitOpen,
@@ -237,7 +257,9 @@ function legacyCreateSpanLinkFactory(
     // Get metrics links
     if (metricsDataSourceSettings && traceToMetricsOptions?.queries) {
       for (const query of traceToMetricsOptions.queries) {
-        const expr = buildMetricsQuery(query, traceToMetricsOptions?.tags || [], span);
+        const expr =
+          query.query ||
+          `histogram_quantile(0.5, sum(rate(traces_spanmetrics_latency_bucket{service="${span.process.serviceName}"}[5m])) by (le))`;
         const dataLink: DataLink<PromQuery> = {
           title: metricsDataSourceSettings.name,
           url: '',
@@ -251,10 +273,23 @@ function legacyCreateSpanLinkFactory(
           },
         };
 
+        const tagsToUse =
+          traceToMetricsOptions.tags && traceToMetricsOptions.tags.length > 0
+            ? traceToMetricsOptions.tags
+            : defaultKeys;
+
+        scopedVars = {
+          ...scopedVars,
+          __tags: {
+            text: 'Tags',
+            value: getFormattedTags(span, tagsToUse),
+          },
+        };
+
         const link = mapInternalLinkToExplore({
           link: dataLink,
           internalLink: dataLink.internal!,
-          scopedVars: {},
+          scopedVars,
           range: getTimeRangeFromSpan(span, {
             startMs: traceToMetricsOptions.spanStartTimeShift
               ? rangeUtil.intervalToMs(traceToMetricsOptions.spanStartTimeShift)
@@ -482,7 +517,7 @@ function getQueryForFalconLogScale(span: TraceSpan, options: TraceToLogsOptionsV
  * Creates a string representing all the tags already formatted for use in the query. The tags are filtered so that
  * only intersection of tags that exist in a span and tags that you want are serialized into the string.
  */
-function getFormattedTags(
+export function getFormattedTags(
   span: TraceSpan,
   tags: TraceToLogsTag[],
   { labelValueSign = '=', joinBy = ', ' }: { labelValueSign?: string; joinBy?: string } = {}
@@ -514,16 +549,19 @@ function getFormattedTags(
 function getTimeRangeFromSpan(
   span: TraceSpan,
   timeShift: { startMs: number; endMs: number } = { startMs: 0, endMs: 0 },
-  isSplunkDS = false
+  isSplunkDS = false,
+  shouldCreatePyroscopeLink = false
 ): TimeRange {
-  const adjustedStartTime = Math.floor(span.startTime / 1000 + timeShift.startMs);
-  const from = dateTime(adjustedStartTime);
+  let adjustedStartTime = Math.floor(span.startTime / 1000 + timeShift.startMs);
   const spanEndMs = (span.startTime + span.duration) / 1000;
   let adjustedEndTime = Math.floor(spanEndMs + timeShift.endMs);
 
   // Splunk requires a time interval of >= 1s, rather than >=1ms like Loki timerange in below elseif block
   if (isSplunkDS && adjustedEndTime - adjustedStartTime < 1000) {
     adjustedEndTime = adjustedStartTime + 1000;
+  } else if (shouldCreatePyroscopeLink) {
+    adjustedStartTime = adjustedStartTime - 60000;
+    adjustedEndTime = adjustedEndTime + 60000;
   } else if (adjustedStartTime === adjustedEndTime) {
     // Because we can only pass milliseconds in the url we need to check if they equal.
     // We need end time to be later than start time
@@ -531,6 +569,7 @@ function getTimeRangeFromSpan(
   }
 
   const to = dateTime(adjustedEndTime);
+  const from = dateTime(adjustedStartTime);
 
   // Beware that public/app/features/explore/state/main.ts SplitOpen fn uses the range from here. No matter what is in the url.
   return {
@@ -543,46 +582,18 @@ function getTimeRangeFromSpan(
   };
 }
 
-// Interpolates span attributes into trace to metric query, or returns default query
-function buildMetricsQuery(
-  query: TraceToMetricQuery,
-  tags: Array<{ key: string; value?: string }> = [],
-  span: TraceSpan
-): string {
-  if (!query.query) {
-    return `histogram_quantile(0.5, sum(rate(traces_spanmetrics_latency_bucket{service="${span.process.serviceName}"}[5m])) by (le))`;
-  }
-
-  let expr = query.query;
-  if (tags.length && expr.indexOf('$__tags') !== -1) {
-    const spanTags = [...span.process.tags, ...span.tags];
-    const labels = tags.reduce<string[]>((acc, tag) => {
-      const tagValue = spanTags.find((t) => t.key === tag.key)?.value;
-      if (tagValue) {
-        acc.push(`${tag.value ? tag.value : tag.key}="${tagValue}"`);
-      }
-      return acc;
-    }, []);
-
-    const labelsQuery = labels?.join(', ');
-    expr = expr.replace(/\$__tags/g, labelsQuery);
-  }
-
-  return expr;
-}
-
 /**
  * Variables from trace that can be used in the query
  * @param trace
  */
-function scopedVarsFromTrace(trace: Trace): ScopedVars {
+export function scopedVarsFromTrace(duration: number, name: string, traceId: string): ScopedVars {
   return {
     __trace: {
       text: 'Trace',
       value: {
-        duration: trace.duration,
-        name: trace.traceName,
-        traceId: trace.traceID,
+        duration,
+        name,
+        traceId,
       },
     },
   };
@@ -592,7 +603,7 @@ function scopedVarsFromTrace(trace: Trace): ScopedVars {
  * Variables from span that can be used in the query
  * @param span
  */
-function scopedVarsFromSpan(span: TraceSpan): ScopedVars {
+export function scopedVarsFromSpan(span: TraceSpan): ScopedVars {
   const tags: ScopedVars = {};
 
   // We put all these tags together similar way we do for the __tags variable. This means there can be some overriding
@@ -617,3 +628,30 @@ function scopedVarsFromSpan(span: TraceSpan): ScopedVars {
     },
   };
 }
+
+/**
+ * Variables from tags that can be used in the query
+ * @param span
+ */
+export function scopedVarsFromTags(
+  span: TraceSpan,
+  traceToProfilesOptions: TraceToProfilesOptions | undefined
+): ScopedVars {
+  let tags: ScopedVars = {};
+
+  if (traceToProfilesOptions) {
+    const profileTags =
+      traceToProfilesOptions.tags && traceToProfilesOptions.tags.length > 0
+        ? traceToProfilesOptions.tags
+        : defaultProfilingKeys;
+
+    tags = {
+      __tags: {
+        text: 'Tags',
+        value: getFormattedTags(span, profileTags),
+      },
+    };
+  }
+
+  return tags;
+}
diff --git a/public/app/features/explore/TraceView/useSearch.ts b/public/app/features/explore/TraceView/useSearch.ts
index 59469f2af99fe..da25987d7f35b 100644
--- a/public/app/features/explore/TraceView/useSearch.ts
+++ b/public/app/features/explore/TraceView/useSearch.ts
@@ -13,6 +13,7 @@ export interface SearchProps {
   to?: string;
   toOperator: string;
   tags: Tag[];
+  query?: string;
 }
 
 export interface Tag {
diff --git a/public/app/features/explore/__mocks__/makeLogs.ts b/public/app/features/explore/__mocks__/makeLogs.ts
index 0aaf4d9f25431..af2206681b605 100644
--- a/public/app/features/explore/__mocks__/makeLogs.ts
+++ b/public/app/features/explore/__mocks__/makeLogs.ts
@@ -1,4 +1,4 @@
-import { MutableDataFrame, LogLevel, LogRowModel, LogsSortOrder } from '@grafana/data';
+import { createDataFrame, LogLevel, LogRowModel, LogsSortOrder } from '@grafana/data';
 import { sortLogRows } from 'app/features/logs/utils';
 export const makeLogs = (numberOfLogsToCreate: number, overrides?: Partial<LogRowModel>): LogRowModel[] => {
   const array: LogRowModel[] = [];
@@ -12,7 +12,7 @@ export const makeLogs = (numberOfLogsToCreate: number, overrides?: Partial<LogRo
       uid: uuid,
       entryFieldIndex: 0,
       rowIndex: 0,
-      dataFrame: new MutableDataFrame(),
+      dataFrame: createDataFrame({ fields: [] }),
       logLevel: LogLevel.debug,
       entry,
       hasAnsi: false,
diff --git a/public/app/features/explore/correlationEditLogic.test.ts b/public/app/features/explore/correlationEditLogic.test.ts
new file mode 100644
index 0000000000000..dd3c37e95c648
--- /dev/null
+++ b/public/app/features/explore/correlationEditLogic.test.ts
@@ -0,0 +1,39 @@
+import { CORRELATION_EDITOR_POST_CONFIRM_ACTION } from 'app/types';
+
+import { showModalMessage } from './correlationEditLogic';
+
+// note, closing the editor does not care if isLeft is true or not. Both are covered for regression purposes.
+describe('correlationEditLogic', function () {
+  it.each`
+    action                                                      | isLeft   | dirCor   | dirQuer  | expected
+    ${CORRELATION_EDITOR_POST_CONFIRM_ACTION.CLOSE_PANE}        | ${false} | ${false} | ${false} | ${undefined}
+    ${CORRELATION_EDITOR_POST_CONFIRM_ACTION.CLOSE_PANE}        | ${false} | ${true}  | ${false} | ${'Closing the pane will cause the correlation in progress to be lost. Would you like to save before continuing?'}
+    ${CORRELATION_EDITOR_POST_CONFIRM_ACTION.CLOSE_PANE}        | ${false} | ${false} | ${true}  | ${'Closing the pane will lose the changed query. Would you like to save before continuing?'}
+    ${CORRELATION_EDITOR_POST_CONFIRM_ACTION.CLOSE_PANE}        | ${false} | ${true}  | ${true}  | ${'Closing the pane will cause the correlation in progress to be lost. Would you like to save before continuing?'}
+    ${CORRELATION_EDITOR_POST_CONFIRM_ACTION.CLOSE_PANE}        | ${true}  | ${false} | ${false} | ${undefined}
+    ${CORRELATION_EDITOR_POST_CONFIRM_ACTION.CLOSE_PANE}        | ${true}  | ${true}  | ${false} | ${'Closing the pane will cause the correlation in progress to be lost. Would you like to save before continuing?'}
+    ${CORRELATION_EDITOR_POST_CONFIRM_ACTION.CLOSE_PANE}        | ${true}  | ${false} | ${true}  | ${'Closing the pane will cause the query in the right pane to be re-ran and links added to that data. Would you like to save before continuing?'}
+    ${CORRELATION_EDITOR_POST_CONFIRM_ACTION.CLOSE_PANE}        | ${true}  | ${true}  | ${true}  | ${'Closing the pane will cause the correlation in progress to be lost. Would you like to save before continuing?'}
+    ${CORRELATION_EDITOR_POST_CONFIRM_ACTION.CHANGE_DATASOURCE} | ${false} | ${false} | ${false} | ${undefined}
+    ${CORRELATION_EDITOR_POST_CONFIRM_ACTION.CHANGE_DATASOURCE} | ${false} | ${true}  | ${false} | ${undefined}
+    ${CORRELATION_EDITOR_POST_CONFIRM_ACTION.CHANGE_DATASOURCE} | ${false} | ${false} | ${true}  | ${'Changing the datasource will lose the changed query. Would you like to save before continuing?'}
+    ${CORRELATION_EDITOR_POST_CONFIRM_ACTION.CHANGE_DATASOURCE} | ${false} | ${true}  | ${true}  | ${'Changing the datasource will lose the changed query. Would you like to save before continuing?'}
+    ${CORRELATION_EDITOR_POST_CONFIRM_ACTION.CHANGE_DATASOURCE} | ${true}  | ${false} | ${false} | ${undefined}
+    ${CORRELATION_EDITOR_POST_CONFIRM_ACTION.CHANGE_DATASOURCE} | ${true}  | ${true}  | ${false} | ${'Changing the datasource will cause the correlation in progress to be lost. Would you like to save before continuing?'}
+    ${CORRELATION_EDITOR_POST_CONFIRM_ACTION.CHANGE_DATASOURCE} | ${true}  | ${false} | ${true}  | ${undefined}
+    ${CORRELATION_EDITOR_POST_CONFIRM_ACTION.CHANGE_DATASOURCE} | ${true}  | ${true}  | ${true}  | ${'Changing the datasource will cause the correlation in progress to be lost. Would you like to save before continuing?'}
+    ${CORRELATION_EDITOR_POST_CONFIRM_ACTION.CLOSE_EDITOR}      | ${false} | ${false} | ${false} | ${undefined}
+    ${CORRELATION_EDITOR_POST_CONFIRM_ACTION.CLOSE_EDITOR}      | ${false} | ${true}  | ${false} | ${'Closing the editor will cause the correlation in progress to be lost. Would you like to save before continuing?'}
+    ${CORRELATION_EDITOR_POST_CONFIRM_ACTION.CLOSE_EDITOR}      | ${false} | ${false} | ${true}  | ${'Closing the editor will remove the variables, and your changed query may no longer be valid. Would you like to save before continuing?'}
+    ${CORRELATION_EDITOR_POST_CONFIRM_ACTION.CLOSE_EDITOR}      | ${false} | ${true}  | ${true}  | ${'Closing the editor will cause the correlation in progress to be lost. Would you like to save before continuing?'}
+    ${CORRELATION_EDITOR_POST_CONFIRM_ACTION.CLOSE_EDITOR}      | ${true}  | ${false} | ${false} | ${undefined}
+    ${CORRELATION_EDITOR_POST_CONFIRM_ACTION.CLOSE_EDITOR}      | ${true}  | ${true}  | ${false} | ${'Closing the editor will cause the correlation in progress to be lost. Would you like to save before continuing?'}
+    ${CORRELATION_EDITOR_POST_CONFIRM_ACTION.CLOSE_EDITOR}      | ${true}  | ${false} | ${true}  | ${'Closing the editor will remove the variables, and your changed query may no longer be valid. Would you like to save before continuing?'}
+    ${CORRELATION_EDITOR_POST_CONFIRM_ACTION.CLOSE_EDITOR}      | ${true}  | ${true}  | ${true}  | ${'Closing the editor will cause the correlation in progress to be lost. Would you like to save before continuing?'}
+  `(
+    "Action $action, isLeft=$isLeft, dirtyCorrelation=$dirCor, dirtyQueryEditor=$dirQuer should return message '$expected'",
+    ({ action, isLeft, dirCor, dirQuer, expected }) => {
+      expect(showModalMessage(action, isLeft, dirCor, dirQuer)).toEqual(expected);
+    }
+  );
+});
diff --git a/public/app/features/explore/correlationEditLogic.ts b/public/app/features/explore/correlationEditLogic.ts
new file mode 100644
index 0000000000000..326389505c709
--- /dev/null
+++ b/public/app/features/explore/correlationEditLogic.ts
@@ -0,0 +1,74 @@
+import { template } from 'lodash';
+
+import { CORRELATION_EDITOR_POST_CONFIRM_ACTION } from 'app/types';
+
+enum CONSEQUENCES {
+  SOURCE_TARGET_CHANGE = 'cause the query in the right pane to be re-ran and links added to that data',
+  FULL_QUERY_LOSS = 'lose the changed query',
+  FULL_CORR_LOSS = 'cause the correlation in progress to be lost',
+  INVALID_VAR = 'remove the variables, and your changed query may no longer be valid',
+}
+
+// returns a string if the modal should show, with what the message string should be
+// returns undefined if the modal shouldn't show
+export const showModalMessage = (
+  action: CORRELATION_EDITOR_POST_CONFIRM_ACTION,
+  isActionLeft: boolean,
+  dirtyCorrelation: boolean,
+  dirtyQueryEditor: boolean
+) => {
+  const messageTemplate = template(
+    '<%= actionStr %> will <%= consequenceStr %>. Would you like to save before continuing?'
+  );
+  let actionStr = '';
+  let consequenceStr = '';
+
+  // dirty correlation message always takes priority over dirty query
+  if (action === CORRELATION_EDITOR_POST_CONFIRM_ACTION.CLOSE_PANE) {
+    actionStr = 'Closing the pane';
+    if (isActionLeft) {
+      if (dirtyCorrelation) {
+        consequenceStr = CONSEQUENCES.FULL_CORR_LOSS;
+      } else if (dirtyQueryEditor) {
+        consequenceStr = CONSEQUENCES.SOURCE_TARGET_CHANGE;
+      } else {
+        return undefined;
+      }
+    } else {
+      // right pane close
+      if (dirtyCorrelation) {
+        consequenceStr = CONSEQUENCES.FULL_CORR_LOSS;
+      } else if (dirtyQueryEditor) {
+        consequenceStr = CONSEQUENCES.FULL_QUERY_LOSS;
+      } else {
+        return undefined;
+      }
+    }
+  } else if (action === CORRELATION_EDITOR_POST_CONFIRM_ACTION.CHANGE_DATASOURCE) {
+    actionStr = 'Changing the datasource';
+    if (isActionLeft) {
+      if (dirtyCorrelation) {
+        consequenceStr = CONSEQUENCES.FULL_CORR_LOSS;
+      } else {
+        return undefined;
+      }
+    } else {
+      // right datasource change
+      if (dirtyQueryEditor) {
+        consequenceStr = CONSEQUENCES.FULL_QUERY_LOSS;
+      } else {
+        return undefined;
+      }
+    }
+  } else if (action === CORRELATION_EDITOR_POST_CONFIRM_ACTION.CLOSE_EDITOR) {
+    actionStr = 'Closing the editor';
+    if (dirtyCorrelation) {
+      consequenceStr = CONSEQUENCES.FULL_CORR_LOSS;
+    } else if (dirtyQueryEditor) {
+      consequenceStr = CONSEQUENCES.INVALID_VAR;
+    } else {
+      return undefined;
+    }
+  }
+  return messageTemplate({ actionStr, consequenceStr });
+};
diff --git a/public/app/features/explore/extensions/AddToDashboard/AddToDashboardForm.tsx b/public/app/features/explore/extensions/AddToDashboard/AddToDashboardForm.tsx
index 83924809dcb51..b3bf2013a478f 100644
--- a/public/app/features/explore/extensions/AddToDashboard/AddToDashboardForm.tsx
+++ b/public/app/features/explore/extensions/AddToDashboard/AddToDashboardForm.tsx
@@ -1,10 +1,10 @@
 import { partial } from 'lodash';
 import React, { type ReactElement, useEffect, useState } from 'react';
-import { DeepMap, FieldError, useForm } from 'react-hook-form';
+import { DeepMap, FieldError, FieldErrors, useForm, Controller } from 'react-hook-form';
 
 import { locationUtil, SelectableValue } from '@grafana/data';
 import { config, locationService, reportInteraction } from '@grafana/runtime';
-import { Alert, Button, Field, InputControl, Modal, RadioButtonGroup } from '@grafana/ui';
+import { Alert, Button, Field, Modal, RadioButtonGroup } from '@grafana/ui';
 import { DashboardPicker } from 'app/core/components/Select/DashboardPicker';
 import { contextSrv } from 'app/core/services/context_srv';
 import { removeDashboardToFetchFromLocalStorage } from 'app/features/dashboard/state/initDashboard';
@@ -34,7 +34,7 @@ interface SaveToExistingDashboard extends SaveTargetDTO {
 type FormDTO = SaveToNewDashboardDTO | SaveToExistingDashboard;
 
 function assertIsSaveToExistingDashboardError(
-  errors: DeepMap<FormDTO, FieldError>
+  errors: FieldErrors<FormDTO>
 ): asserts errors is DeepMap<SaveToExistingDashboard, FieldError> {
   // the shape of the errors object is always compatible with the type above, but we need to
   // explicitly assert its type so that TS can narrow down FormDTO to SaveToExistingDashboard
@@ -102,12 +102,19 @@ export function AddToDashboardForm(props: Props): ReactElement {
       queries: exploreItem.queries.length,
     });
 
+    const { from, to } = exploreItem.range.raw;
+
     try {
       await setDashboardInLocalStorage({
         dashboardUid,
         datasource: exploreItem.datasourceInstance?.getRef(),
         queries: exploreItem.queries,
         queryResponse: exploreItem.queryResponse,
+        panelState: exploreItem?.panelsState,
+        time: {
+          from: typeof from === 'string' ? from : from.toISOString(),
+          to: typeof to === 'string' ? to : to.toISOString(),
+        },
       });
     } catch (error) {
       switch (error) {
@@ -149,7 +156,7 @@ export function AddToDashboardForm(props: Props): ReactElement {
   return (
     <form>
       {saveTargets.length > 1 && (
-        <InputControl
+        <Controller
           control={control}
           render={({ field: { ref, ...field } }) => (
             <Field label="Target dashboard" description="Choose where to add the panel.">
@@ -164,7 +171,7 @@ export function AddToDashboardForm(props: Props): ReactElement {
         (() => {
           assertIsSaveToExistingDashboardError(errors);
           return (
-            <InputControl
+            <Controller
               render={({ field: { ref, value, onChange, ...field } }) => (
                 <Field
                   label="Dashboard"
diff --git a/public/app/features/explore/extensions/AddToDashboard/addToDashboard.test.ts b/public/app/features/explore/extensions/AddToDashboard/addToDashboard.test.ts
index da76ee80d7ccc..c5e081b33d502 100644
--- a/public/app/features/explore/extensions/AddToDashboard/addToDashboard.test.ts
+++ b/public/app/features/explore/extensions/AddToDashboard/addToDashboard.test.ts
@@ -23,6 +23,7 @@ describe('addPanelToDashboard', () => {
       queries: [],
       queryResponse: createEmptyQueryResponse(),
       datasource: { type: 'loki', uid: 'someUid' },
+      time: { from: 'now-1h', to: 'now' },
     });
     expect(spy).toHaveBeenCalledWith(
       expect.objectContaining({
@@ -33,12 +34,30 @@ describe('addPanelToDashboard', () => {
     );
   });
 
+  it('Correct time range is used', async () => {
+    await setDashboardInLocalStorage({
+      queries: [],
+      queryResponse: createEmptyQueryResponse(),
+      datasource: { type: 'loki', uid: 'someUid' },
+      time: { from: 'now-10h', to: 'now' },
+    });
+
+    expect(spy).toHaveBeenCalledWith(
+      expect.objectContaining({
+        dashboard: expect.objectContaining({
+          time: expect.objectContaining({ from: 'now-10h', to: 'now' }),
+        }),
+      })
+    );
+  });
+
   it('All queries are correctly passed through', async () => {
     const queries: DataQuery[] = [{ refId: 'A' }, { refId: 'B', hide: true }];
 
     await setDashboardInLocalStorage({
       queries,
       queryResponse: createEmptyQueryResponse(),
+      time: { from: 'now-1h', to: 'now' },
     });
     expect(spy).toHaveBeenCalledWith(
       expect.objectContaining({
@@ -68,6 +87,7 @@ describe('addPanelToDashboard', () => {
       queryResponse: createEmptyQueryResponse(),
       dashboardUid: 'someUid',
       datasource: { type: '' },
+      time: { from: 'now-1h', to: 'now' },
     });
 
     expect(spy).toHaveBeenCalledWith(
@@ -95,7 +115,7 @@ describe('addPanelToDashboard', () => {
       ];
 
       it.each(cases)('%s', async (_, queries, queryResponse) => {
-        await setDashboardInLocalStorage({ queries, queryResponse });
+        await setDashboardInLocalStorage({ queries, queryResponse, time: { from: 'now-1h', to: 'now' } });
         expect(spy).toHaveBeenCalledWith(
           expect.objectContaining({
             dashboard: expect.objectContaining({
@@ -127,7 +147,7 @@ describe('addPanelToDashboard', () => {
             [framesType]: [new MutableDataFrame({ refId: 'A', fields: [] })],
           };
 
-          await setDashboardInLocalStorage({ queries, queryResponse });
+          await setDashboardInLocalStorage({ queries, queryResponse, time: { from: 'now-1h', to: 'now' } });
           expect(spy).toHaveBeenCalledWith(
             expect.objectContaining({
               dashboard: expect.objectContaining({
@@ -151,7 +171,7 @@ describe('addPanelToDashboard', () => {
           ],
         };
 
-        await setDashboardInLocalStorage({ queries, queryResponse });
+        await setDashboardInLocalStorage({ queries, queryResponse, time: { from: 'now-1h', to: 'now' } });
         expect(spy).toHaveBeenCalledWith(
           expect.objectContaining({
             dashboard: expect.objectContaining({
diff --git a/public/app/features/explore/extensions/AddToDashboard/addToDashboard.ts b/public/app/features/explore/extensions/AddToDashboard/addToDashboard.ts
index 3bee074b11cea..58bf7336df4b5 100644
--- a/public/app/features/explore/extensions/AddToDashboard/addToDashboard.ts
+++ b/public/app/features/explore/extensions/AddToDashboard/addToDashboard.ts
@@ -1,10 +1,9 @@
-import { DataFrame } from '@grafana/data';
-import { DataQuery, DataSourceRef } from '@grafana/schema';
+import { DataFrame, ExplorePanelsState } from '@grafana/data';
+import { Dashboard, DataQuery, DataSourceRef } from '@grafana/schema';
+import { DataTransformerConfig } from '@grafana/schema/dist/esm/raw/dashboard/x/dashboard_types.gen';
 import { backendSrv } from 'app/core/services/backend_srv';
-import {
-  getNewDashboardModelData,
-  setDashboardToFetchFromLocalStorage,
-} from 'app/features/dashboard/state/initDashboard';
+import { setDashboardToFetchFromLocalStorage } from 'app/features/dashboard/state/initDashboard';
+import { buildNewDashboardSaveModel } from 'app/features/dashboard-scene/serialization/buildNewDashboardSaveModel';
 import { DashboardDTO, ExplorePanelData } from 'app/types';
 
 export enum AddToDashboardError {
@@ -17,25 +16,64 @@ interface AddPanelToDashboardOptions {
   queryResponse: ExplorePanelData;
   datasource?: DataSourceRef;
   dashboardUid?: string;
+  panelState?: ExplorePanelsState;
+  time: Dashboard['time'];
 }
 
-function createDashboard(): DashboardDTO {
-  const dto = getNewDashboardModelData();
-
-  // getNewDashboardModelData adds by default the "add-panel" panel. We don't want that.
-  dto.dashboard.panels = [];
+/**
+ * Returns transformations for the logs table visualisation in explore.
+ * If the logs table supports a labels column, we need to extract the fields.
+ * Then we can set the columns to show in the table via the organize/includeByName transformation
+ * @param panelType
+ * @param options
+ */
+function getLogsTableTransformations(panelType: string, options: AddPanelToDashboardOptions): DataTransformerConfig[] {
+  let transformations: DataTransformerConfig[] = [];
+  if (panelType === 'table' && options.panelState?.logs?.columns) {
+    // If we have a labels column, we need to extract the fields from it
+    if (options.panelState.logs?.labelFieldName) {
+      transformations.push({
+        id: 'extractFields',
+        options: {
+          source: options.panelState.logs.labelFieldName,
+        },
+      });
+    }
 
-  return dto;
+    // Show the columns that the user selected in explore
+    transformations.push({
+      id: 'organize',
+      options: {
+        indexByName: Object.values(options.panelState.logs.columns).reduce(
+          (acc: Record<string, number>, value: string, idx) => ({
+            ...acc,
+            [value]: idx,
+          }),
+          {}
+        ),
+        includeByName: Object.values(options.panelState.logs.columns).reduce(
+          (acc: Record<string, boolean>, value: string) => ({
+            ...acc,
+            [value]: true,
+          }),
+          {}
+        ),
+      },
+    });
+  }
+  return transformations;
 }
 
 export async function setDashboardInLocalStorage(options: AddPanelToDashboardOptions) {
-  const panelType = getPanelType(options.queries, options.queryResponse);
+  const panelType = getPanelType(options.queries, options.queryResponse, options?.panelState);
+
   const panel = {
     targets: options.queries,
     type: panelType,
     title: 'New Panel',
     gridPos: { x: 0, y: 0, w: 12, h: 8 },
     datasource: options.datasource,
+    transformations: getLogsTableTransformations(panelType, options),
   };
 
   let dto: DashboardDTO;
@@ -47,11 +85,13 @@ export async function setDashboardInLocalStorage(options: AddPanelToDashboardOpt
       throw AddToDashboardError.FETCH_DASHBOARD;
     }
   } else {
-    dto = createDashboard();
+    dto = buildNewDashboardSaveModel();
   }
 
   dto.dashboard.panels = [panel, ...(dto.dashboard.panels ?? [])];
 
+  dto.dashboard.time = options.time;
+
   try {
     setDashboardToFetchFromLocalStorage(dto);
   } catch {
@@ -62,7 +102,7 @@ export async function setDashboardInLocalStorage(options: AddPanelToDashboardOpt
 const isVisible = (query: DataQuery) => !query.hide;
 const hasRefId = (refId: DataFrame['refId']) => (frame: DataFrame) => frame.refId === refId;
 
-function getPanelType(queries: DataQuery[], queryResponse: ExplorePanelData) {
+function getPanelType(queries: DataQuery[], queryResponse: ExplorePanelData, panelState?: ExplorePanelsState) {
   for (const { refId } of queries.filter(isVisible)) {
     const hasQueryRefId = hasRefId(refId);
     if (queryResponse.flameGraphFrames.some(hasQueryRefId)) {
@@ -72,6 +112,9 @@ function getPanelType(queries: DataQuery[], queryResponse: ExplorePanelData) {
       return 'timeseries';
     }
     if (queryResponse.logsFrames.some(hasQueryRefId)) {
+      if (panelState?.logs?.visualisationType) {
+        return panelState.logs.visualisationType;
+      }
       return 'logs';
     }
     if (queryResponse.nodeGraphFrames.some(hasQueryRefId)) {
diff --git a/public/app/features/explore/extensions/AddToDashboard/index.test.tsx b/public/app/features/explore/extensions/AddToDashboard/index.test.tsx
index fec15005448bf..4780b59492d69 100644
--- a/public/app/features/explore/extensions/AddToDashboard/index.test.tsx
+++ b/public/app/features/explore/extensions/AddToDashboard/index.test.tsx
@@ -24,6 +24,11 @@ const setup = (children: ReactNode, queries: DataQuery[] = [{ refId: 'A' }]) =>
     explore: {
       panes: {
         left: {
+          range: {
+            from: 'now-6h',
+            to: 'now',
+            raw: { from: 'now-6h', to: 'now' },
+          },
           queries,
           queryResponse: createEmptyQueryResponse(),
         },
diff --git a/public/app/features/explore/extensions/ToolbarExtensionPoint.test.tsx b/public/app/features/explore/extensions/ToolbarExtensionPoint.test.tsx
index 4d4106126750c..7d4e6c95c935f 100644
--- a/public/app/features/explore/extensions/ToolbarExtensionPoint.test.tsx
+++ b/public/app/features/explore/extensions/ToolbarExtensionPoint.test.tsx
@@ -78,23 +78,13 @@ describe('ToolbarExtensionPoint', () => {
     });
 
     it('should render "Add" extension point menu button', () => {
-      renderWithExploreStore(<ToolbarExtensionPoint exploreId="left" timeZone="browser" splitted={false} />);
+      renderWithExploreStore(<ToolbarExtensionPoint exploreId="left" timeZone="browser" />);
 
       expect(screen.getByRole('button', { name: 'Add' })).toBeVisible();
     });
 
-    it('should render menu with extensions when "Add" is clicked in split mode', async () => {
-      renderWithExploreStore(<ToolbarExtensionPoint exploreId={'left'} timeZone="browser" splitted={true} />);
-
-      await userEvent.click(screen.getByRole('button', { name: 'Add' }));
-
-      expect(screen.getByRole('group', { name: 'Dashboards' })).toBeVisible();
-      expect(screen.getByRole('menuitem', { name: 'Add to dashboard' })).toBeVisible();
-      expect(screen.getByRole('menuitem', { name: 'ML: Forecast' })).toBeVisible();
-    });
-
     it('should render menu with extensions when "Add" is clicked', async () => {
-      renderWithExploreStore(<ToolbarExtensionPoint exploreId="left" timeZone="browser" splitted={false} />);
+      renderWithExploreStore(<ToolbarExtensionPoint exploreId="left" timeZone="browser" />);
 
       await userEvent.click(screen.getByRole('button', { name: 'Add' }));
 
@@ -104,7 +94,7 @@ describe('ToolbarExtensionPoint', () => {
     });
 
     it('should call onClick from extension when menu item is clicked', async () => {
-      renderWithExploreStore(<ToolbarExtensionPoint exploreId="left" timeZone="browser" splitted={false} />);
+      renderWithExploreStore(<ToolbarExtensionPoint exploreId="left" timeZone="browser" />);
 
       await userEvent.click(screen.getByRole('button', { name: 'Add' }));
       await userEvent.click(screen.getByRole('menuitem', { name: 'Add to dashboard' }));
@@ -116,7 +106,7 @@ describe('ToolbarExtensionPoint', () => {
     });
 
     it('should render confirm navigation modal when extension with path is clicked', async () => {
-      renderWithExploreStore(<ToolbarExtensionPoint exploreId="left" timeZone="browser" splitted={false} />);
+      renderWithExploreStore(<ToolbarExtensionPoint exploreId="left" timeZone="browser" />);
 
       await userEvent.click(screen.getByRole('button', { name: 'Add' }));
       await userEvent.click(screen.getByRole('menuitem', { name: 'ML: Forecast' }));
@@ -130,7 +120,7 @@ describe('ToolbarExtensionPoint', () => {
       const targets = [{ refId: 'A' }];
       const data = createEmptyQueryResponse();
 
-      renderWithExploreStore(<ToolbarExtensionPoint exploreId="left" timeZone="browser" splitted={false} />, {
+      renderWithExploreStore(<ToolbarExtensionPoint exploreId="left" timeZone="browser" />, {
         targets,
         data,
       });
@@ -155,7 +145,7 @@ describe('ToolbarExtensionPoint', () => {
       const targets = [{ refId: 'A' }];
       const data = createEmptyQueryResponse();
 
-      renderWithExploreStore(<ToolbarExtensionPoint exploreId="left" timeZone="" splitted={false} />, {
+      renderWithExploreStore(<ToolbarExtensionPoint exploreId="left" timeZone="" />, {
         targets,
         data,
       });
@@ -167,7 +157,7 @@ describe('ToolbarExtensionPoint', () => {
     });
 
     it('should correct extension point id when fetching extensions', async () => {
-      renderWithExploreStore(<ToolbarExtensionPoint exploreId="left" timeZone="browser" splitted={false} />);
+      renderWithExploreStore(<ToolbarExtensionPoint exploreId="left" timeZone="browser" />);
 
       const [options] = getPluginLinkExtensionsMock.mock.calls[0];
       const { extensionPointId } = options;
@@ -201,24 +191,13 @@ describe('ToolbarExtensionPoint', () => {
     });
 
     it('should render "Add" extension point menu button', () => {
-      renderWithExploreStore(<ToolbarExtensionPoint exploreId="left" timeZone="browser" splitted={false} />);
+      renderWithExploreStore(<ToolbarExtensionPoint exploreId="left" timeZone="browser" />);
 
       expect(screen.getByRole('button', { name: 'Add' })).toBeVisible();
     });
 
-    it('should render "Add" extension point menu button in split mode', async () => {
-      renderWithExploreStore(<ToolbarExtensionPoint exploreId={'left'} timeZone="browser" splitted={true} />);
-
-      await userEvent.click(screen.getByRole('button', { name: 'Add' }));
-
-      // Make sure we don't have anything related to categories rendered
-      expect(screen.queryAllByRole('group').length).toBe(0);
-      expect(screen.getByRole('menuitem', { name: 'Dashboard' })).toBeVisible();
-      expect(screen.getByRole('menuitem', { name: 'ML: Forecast' })).toBeVisible();
-    });
-
     it('should render menu with extensions when "Add" is clicked', async () => {
-      renderWithExploreStore(<ToolbarExtensionPoint exploreId="left" timeZone="browser" splitted={false} />);
+      renderWithExploreStore(<ToolbarExtensionPoint exploreId="left" timeZone="browser" />);
 
       await userEvent.click(screen.getByRole('button', { name: 'Add' }));
 
@@ -236,7 +215,7 @@ describe('ToolbarExtensionPoint', () => {
     });
 
     it('should render "add to dashboard" action button if one pane is visible', async () => {
-      renderWithExploreStore(<ToolbarExtensionPoint exploreId="left" timeZone="browser" splitted={false} />);
+      renderWithExploreStore(<ToolbarExtensionPoint exploreId="left" timeZone="browser" />);
 
       await waitFor(() => {
         const button = screen.getByRole('button', { name: /add to dashboard/i });
@@ -254,7 +233,7 @@ describe('ToolbarExtensionPoint', () => {
     });
 
     it('should not render "add to dashboard" action button', async () => {
-      renderWithExploreStore(<ToolbarExtensionPoint exploreId="left" timeZone="browser" splitted={false} />);
+      renderWithExploreStore(<ToolbarExtensionPoint exploreId="left" timeZone="browser" />);
 
       expect(screen.queryByRole('button', { name: /add to dashboard/i })).not.toBeInTheDocument();
     });
diff --git a/public/app/features/explore/extensions/ToolbarExtensionPoint.tsx b/public/app/features/explore/extensions/ToolbarExtensionPoint.tsx
index 5e45b4977b536..1a46d5385471d 100644
--- a/public/app/features/explore/extensions/ToolbarExtensionPoint.tsx
+++ b/public/app/features/explore/extensions/ToolbarExtensionPoint.tsx
@@ -19,11 +19,10 @@ const AddToDashboard = lazy(() =>
 type Props = {
   exploreId: string;
   timeZone: TimeZone;
-  splitted: boolean;
 };
 
 export function ToolbarExtensionPoint(props: Props): ReactElement | null {
-  const { exploreId, splitted } = props;
+  const { exploreId } = props;
   const [selectedExtension, setSelectedExtension] = useState<PluginExtensionLink | undefined>();
   const [isOpen, setIsOpen] = useState<boolean>(false);
   const context = useExtensionPointContext(props);
@@ -54,14 +53,8 @@ export function ToolbarExtensionPoint(props: Props): ReactElement | null {
   return (
     <>
       <Dropdown onVisibleChange={setIsOpen} placement="bottom-start" overlay={menu}>
-        <ToolbarButton
-          aria-label="Add"
-          icon="plus"
-          disabled={!Boolean(noQueriesInPane)}
-          variant="canvas"
-          isOpen={isOpen}
-        >
-          {splitted ? ' ' : 'Add'}
+        <ToolbarButton aria-label="Add" disabled={!Boolean(noQueriesInPane)} variant="canvas" isOpen={isOpen}>
+          Add
         </ToolbarButton>
       </Dropdown>
       {!!selectedExtension && !!selectedExtension.path && (
diff --git a/public/app/features/explore/hooks/useExplorePageTitle.ts b/public/app/features/explore/hooks/useExplorePageTitle.ts
index c97f23a63b9fd..f89fb9ca6d636 100644
--- a/public/app/features/explore/hooks/useExplorePageTitle.ts
+++ b/public/app/features/explore/hooks/useExplorePageTitle.ts
@@ -3,7 +3,6 @@ import { useEffect, useRef } from 'react';
 import { NavModel } from '@grafana/data';
 import { Branding } from 'app/core/components/Branding/Branding';
 import { useNavModel } from 'app/core/hooks/useNavModel';
-import { safeParseJson } from 'app/core/utils/explore';
 import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
 import { ExploreQueryParams } from 'app/types';
 
@@ -19,8 +18,19 @@ export function useExplorePageTitle(params: ExploreQueryParams) {
       return;
     }
 
+    let panesObject: unknown;
+    try {
+      panesObject = JSON.parse(params.panes);
+    } catch {
+      return;
+    }
+
+    if (typeof panesObject !== 'object' || panesObject === null) {
+      return;
+    }
+
     Promise.allSettled(
-      Object.values(safeParseJson(params.panes)).map((pane) => {
+      Object.values(panesObject).map((pane) => {
         if (
           !pane ||
           typeof pane !== 'object' ||
diff --git a/public/app/features/explore/hooks/useKeyboardShortcuts.test.tsx b/public/app/features/explore/hooks/useKeyboardShortcuts.test.tsx
index da9d1b9969f6b..c58336af1c8b6 100644
--- a/public/app/features/explore/hooks/useKeyboardShortcuts.test.tsx
+++ b/public/app/features/explore/hooks/useKeyboardShortcuts.test.tsx
@@ -1,9 +1,16 @@
-import { render } from '@testing-library/react';
+import { render, waitFor } from '@testing-library/react';
 import React from 'react';
 
 import { dateTime, EventBusSrv } from '@grafana/data';
 import { getAppEvents } from '@grafana/runtime';
-import { AbsoluteTimeEvent, ShiftTimeEvent, ShiftTimeEventDirection, ZoomOutEvent } from 'app/types/events';
+import {
+  AbsoluteTimeEvent,
+  CopyTimeEvent,
+  PasteTimeEvent,
+  ShiftTimeEvent,
+  ShiftTimeEventDirection,
+  ZoomOutEvent,
+} from 'app/types/events';
 
 import { TestProvider } from '../../../../test/helpers/TestProvider';
 import { configureStore } from '../../../store/configureStore';
@@ -22,6 +29,15 @@ jest.mock('@grafana/runtime', () => {
   };
 });
 
+const mockClipboard = {
+  writeText: jest.fn(),
+  readText: jest.fn(),
+};
+
+Object.defineProperty(global.navigator, 'clipboard', {
+  value: mockClipboard,
+});
+
 const NOW = new Date('2020-10-10T00:00:00.000Z');
 function daysFromNow(daysDiff: number) {
   return new Date(NOW.getTime() + daysDiff * 86400000);
@@ -111,4 +127,31 @@ describe('useKeyboardShortcuts', () => {
     expect(panes[1]!.absoluteRange.from).toBe(daysFromNow(-3).getTime());
     expect(panes[1]!.absoluteRange.to).toBe(daysFromNow(1).getTime());
   });
+
+  it('copies the time range from the left pane', () => {
+    const store = setup();
+
+    getAppEvents().publish(new CopyTimeEvent());
+
+    const fromValue = store.getState().explore.panes.left!.range.raw.from;
+    const toValue = store.getState().explore.panes.left!.range.raw.to;
+
+    expect(global.navigator.clipboard.writeText).toHaveBeenCalledWith(JSON.stringify({ from: fromValue, to: toValue }));
+  });
+
+  it('pastes the time range to left pane', async () => {
+    const store = setup();
+
+    const fromValue = 'now-3d';
+    const toValue = 'now';
+
+    mockClipboard.readText.mockResolvedValue(JSON.stringify({ from: fromValue, to: toValue }));
+    getAppEvents().publish(new PasteTimeEvent({ updateUrl: false }));
+
+    await waitFor(() => {
+      const raw = store.getState().explore.panes.left!.range.raw;
+      expect(raw.from).toBe(fromValue);
+      expect(raw.to).toBe(toValue);
+    });
+  });
 });
diff --git a/public/app/features/explore/hooks/useKeyboardShortcuts.ts b/public/app/features/explore/hooks/useKeyboardShortcuts.ts
index 48c5bc43208e3..bd90b13e3f27b 100644
--- a/public/app/features/explore/hooks/useKeyboardShortcuts.ts
+++ b/public/app/features/explore/hooks/useKeyboardShortcuts.ts
@@ -4,9 +4,15 @@ import { Unsubscribable } from 'rxjs';
 import { getAppEvents } from '@grafana/runtime';
 import { useGrafana } from 'app/core/context/GrafanaContext';
 import { useDispatch } from 'app/types';
-import { AbsoluteTimeEvent, ShiftTimeEvent, ZoomOutEvent } from 'app/types/events';
+import { AbsoluteTimeEvent, CopyTimeEvent, PasteTimeEvent, ShiftTimeEvent, ZoomOutEvent } from 'app/types/events';
 
-import { makeAbsoluteTime, shiftTime, zoomOut } from '../state/time';
+import {
+  copyTimeRangeToClipboard,
+  makeAbsoluteTime,
+  pasteTimeRangeFromClipboard,
+  shiftTime,
+  zoomOut,
+} from '../state/time';
 
 export function useKeyboardShortcuts() {
   const { keybindings } = useGrafana();
@@ -35,6 +41,18 @@ export function useKeyboardShortcuts() {
       })
     );
 
+    tearDown.push(
+      getAppEvents().subscribe(CopyTimeEvent, () => {
+        dispatch(copyTimeRangeToClipboard());
+      })
+    );
+
+    tearDown.push(
+      getAppEvents().subscribe(PasteTimeEvent, () => {
+        dispatch(pasteTimeRangeFromClipboard());
+      })
+    );
+
     return () => {
       tearDown.forEach((u) => u.unsubscribe());
     };
diff --git a/public/app/features/explore/hooks/useStateSync/external.utils.ts b/public/app/features/explore/hooks/useStateSync/external.utils.ts
new file mode 100644
index 0000000000000..e691ba13b335f
--- /dev/null
+++ b/public/app/features/explore/hooks/useStateSync/external.utils.ts
@@ -0,0 +1,30 @@
+import { isEmpty, isObject, mapValues, omitBy } from 'lodash';
+
+import { ExploreUrlState, toURLRange } from '@grafana/data';
+import { clearQueryKeys } from 'app/core/utils/explore';
+import { ExploreItemState } from 'app/types';
+
+export function getUrlStateFromPaneState(pane: ExploreItemState): ExploreUrlState {
+  return {
+    // datasourceInstance should not be undefined anymore here but in case there is some path for it to be undefined
+    // lets just fallback instead of crashing.
+    datasource: pane.datasourceInstance?.uid || '',
+    queries: pane.queries.map(clearQueryKeys),
+    range: toURLRange(pane.range.raw),
+    // don't include panelsState in the url unless a piece of state is actually set
+    panelsState: pruneObject(pane.panelsState),
+  };
+}
+
+/**
+ * recursively walks an object, removing keys where the value is undefined
+ * if the resulting object is empty, returns undefined
+ **/
+function pruneObject(obj: object): object | undefined {
+  let pruned = mapValues(obj, (value) => (isObject(value) ? pruneObject(value) : value));
+  pruned = omitBy<typeof pruned>(pruned, isEmpty);
+  if (isEmpty(pruned)) {
+    return undefined;
+  }
+  return pruned;
+}
diff --git a/public/app/features/explore/hooks/useStateSync/index.test.tsx b/public/app/features/explore/hooks/useStateSync/index.test.tsx
index 1a9daf675c1fb..19a8741c0ed02 100644
--- a/public/app/features/explore/hooks/useStateSync/index.test.tsx
+++ b/public/app/features/explore/hooks/useStateSync/index.test.tsx
@@ -213,6 +213,69 @@ describe('useStateSync', () => {
     expect(queries?.[0].datasource?.uid).toBe('loki-uid');
   });
 
+  it('inits with mixed datasource if there are multiple datasources in queries and no root level datasource is defined', async () => {
+    const { location, waitForNextUpdate, store } = setup({
+      queryParams: {
+        panes: JSON.stringify({
+          one: {
+            queries: [
+              { datasource: { name: 'loki', uid: 'loki-uid' } },
+              { datasource: { name: 'elastic', uid: 'elastic-uid' } },
+            ],
+          },
+        }),
+        schemaVersion: 1,
+      },
+    });
+
+    const initialHistoryLength = location.getHistory().length;
+
+    await waitForNextUpdate();
+
+    expect(location.getHistory().length).toBe(initialHistoryLength);
+
+    const search = location.getSearchObject();
+    expect(search.panes).toBeDefined();
+
+    const paneState = store.getState().explore.panes['one'];
+    expect(paneState?.datasourceInstance?.name).toBe(MIXED_DATASOURCE_NAME);
+
+    expect(paneState?.queries).toHaveLength(2);
+    expect(paneState?.queries?.[0].datasource?.uid).toBe('loki-uid');
+    expect(paneState?.queries?.[1].datasource?.uid).toBe('elastic-uid');
+  });
+
+  it("inits with a query's datasource if there are multiple datasources in queries, no root level datasource, and only one query has a valid datsource", async () => {
+    const { location, waitForNextUpdate, store } = setup({
+      queryParams: {
+        panes: JSON.stringify({
+          one: {
+            queries: [
+              { datasource: { name: 'loki', uid: 'loki-uid' } },
+              { datasource: { name: 'UNKNOWN', uid: 'UNKNOWN-UID' } },
+            ],
+          },
+        }),
+        schemaVersion: 1,
+      },
+    });
+
+    const initialHistoryLength = location.getHistory().length;
+
+    await waitForNextUpdate();
+
+    expect(location.getHistory().length).toBe(initialHistoryLength);
+
+    const search = location.getSearchObject();
+    expect(search.panes).toBeDefined();
+
+    const paneState = store.getState().explore.panes['one'];
+    expect(paneState?.datasourceInstance?.getRef().uid).toBe('loki-uid');
+
+    expect(paneState?.queries).toHaveLength(1);
+    expect(paneState?.queries?.[0].datasource?.uid).toBe('loki-uid');
+  });
+
   it('inits with the last used datasource from localStorage', async () => {
     setLastUsedDatasourceUID(1, 'elastic-uid');
     const { waitForNextUpdate, store } = setup({
diff --git a/public/app/features/explore/hooks/useStateSync/index.ts b/public/app/features/explore/hooks/useStateSync/index.ts
index 22caa8be3ce58..1056addadbf22 100644
--- a/public/app/features/explore/hooks/useStateSync/index.ts
+++ b/public/app/features/explore/hooks/useStateSync/index.ts
@@ -1,25 +1,17 @@
-import { identity, isEmpty, isEqual, isObject, mapValues, omitBy } from 'lodash';
 import { useEffect, useRef } from 'react';
 
-import { CoreApp, ExploreUrlState, DataSourceApi, toURLRange } from '@grafana/data';
-import { DataQuery, DataSourceRef } from '@grafana/schema';
 import { useGrafana } from 'app/core/context/GrafanaContext';
-import { clearQueryKeys, getLastUsedDatasourceUID } from 'app/core/utils/explore';
-import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
-import { MIXED_DATASOURCE_NAME } from 'app/plugins/datasource/mixed/MixedDataSource';
-import { addListener, ExploreItemState, ExploreQueryParams, useDispatch, useSelector } from 'app/types';
+import { useAppNotification } from 'app/core/copy/appNotification';
+import { addListener, ExploreQueryParams, useDispatch, useSelector } from 'app/types';
 
-import { changeDatasource } from '../../state/datasource';
-import { changePanelsStateAction, initializeExplore } from '../../state/explorePane';
-import { clearPanes, splitClose, splitOpen, syncTimesAction } from '../../state/main';
-import { runQueries, setQueriesAction } from '../../state/query';
 import { selectPanes } from '../../state/selectors';
-import { changeRangeAction, updateTime } from '../../state/time';
-import { DEFAULT_RANGE, fromURLRange } from '../../state/utils';
-import { withUniqueRefIds } from '../../utils/queries';
-import { isFulfilled } from '../utils';
 
 import { parseURL } from './parseURL';
+import { syncFromURL } from './synchronizer/fromURL';
+import { initializeFromURL } from './synchronizer/init';
+import { syncToURL, syncToURLPredicate } from './synchronizer/toURL';
+
+export { getUrlStateFromPaneState } from './external.utils';
 
 /**
  * Bi-directionally syncs URL changes with Explore's state.
@@ -31,6 +23,8 @@ export function useStateSync(params: ExploreQueryParams) {
   const orgId = useSelector((state) => state.user.orgId);
   const prevParams = useRef(params);
   const initState = useRef<'notstarted' | 'pending' | 'done'>('notstarted');
+  const paused = useRef(false);
+  const { warning } = useAppNotification();
 
   useEffect(() => {
     // This happens when the user navigates to an explore "empty page" while within Explore.
@@ -44,47 +38,13 @@ export function useStateSync(params: ExploreQueryParams) {
   useEffect(() => {
     const unsubscribe = dispatch(
       addListener({
-        predicate: (action) =>
-          // We want to update the URL when:
-          // - a pane is opened or closed
-          // - a query is run
-          // - range is changed
-          // - panel state is updated
-          [
-            splitClose.type,
-            splitOpen.fulfilled.type,
-            runQueries.pending.type,
-            changeRangeAction.type,
-            changePanelsStateAction.type,
-          ].includes(action.type),
+        predicate: (action) => syncToURLPredicate(paused, action),
         effect: async (_, { cancelActiveListeners, delay, getState }) => {
-          // The following 2 lines will throttle updates to avoid creating history entries when rapid changes
+          // The following 2 lines will debounce updates to avoid creating history entries when rapid changes
           // are committed to the store.
           cancelActiveListeners();
           await delay(200);
-
-          const panesQueryParams = Object.entries(getState().explore.panes).reduce((acc, [id, paneState]) => {
-            if (!paneState) {
-              return acc;
-            }
-            return {
-              ...acc,
-              [id]: getUrlStateFromPaneState(paneState),
-            };
-          }, {});
-
-          if (!isEqual(prevParams.current.panes, JSON.stringify(panesQueryParams))) {
-            // If there's no previous state it means we are mounting explore for the first time,
-            // in this case we want to replace the URL instead of pushing a new entry to the history.
-            const replace =
-              !!prevParams.current.panes && Object.values(prevParams.current.panes).filter(Boolean).length === 0;
-
-            prevParams.current = {
-              panes: JSON.stringify(panesQueryParams),
-            };
-
-            location.partial({ panes: prevParams.current.panes }, replace);
-          }
+          syncToURL(getState().explore, prevParams, initState, location);
         },
       })
     );
@@ -96,309 +56,25 @@ export function useStateSync(params: ExploreQueryParams) {
   useEffect(() => {
     const isURLOutOfSync = prevParams.current?.panes !== params.panes;
 
-    const urlState = parseURL(params);
-
-    async function sync() {
-      // if navigating the history causes one of the time range to not being equal to all the other ones,
-      // we set syncedTimes to false to avoid inconsistent UI state.
-      // Ideally `syncedTimes` should be saved in the URL.
-      if (Object.values(urlState.panes).some(({ range }, _, [{ range: firstRange }]) => !isEqual(range, firstRange))) {
-        dispatch(syncTimesAction({ syncedTimes: false }));
-      }
-
-      Object.entries(urlState.panes).forEach(([exploreId, urlPane], i) => {
-        const { datasource, queries, range, panelsState } = urlPane;
-
-        const paneState = panesState[exploreId];
-
-        if (paneState !== undefined) {
-          const update = urlDiff(urlPane, getUrlStateFromPaneState(paneState));
-
-          Promise.resolve()
-            .then(async () => {
-              if (update.datasource && datasource) {
-                await dispatch(changeDatasource(exploreId, datasource));
-              }
-              return;
-            })
-            .then(() => {
-              if (update.range) {
-                dispatch(updateTime({ exploreId, rawRange: fromURLRange(range) }));
-              }
-
-              if (update.queries) {
-                dispatch(setQueriesAction({ exploreId, queries: withUniqueRefIds(queries) }));
-              }
-
-              if (update.queries || update.range) {
-                dispatch(runQueries({ exploreId }));
-              }
-
-              if (update.panelsState && panelsState) {
-                dispatch(changePanelsStateAction({ exploreId, panelsState }));
-              }
-            });
-        } else {
-          // This happens when browser history is used to navigate.
-          // In this case we want to initialize the pane with the data from the URL
-          // if it's not present in the store. This may happen if the user has navigated
-          // from split view to non-split view and then back to split view.
-          dispatch(
-            initializeExplore({
-              exploreId,
-              datasource: datasource || '',
-              queries: withUniqueRefIds(queries),
-              range: fromURLRange(range),
-              panelsState,
-              position: i,
-            })
-          );
-        }
-      });
-
-      // Close all the panes that are not in the URL but are still in the store
-      // ie. because the user has navigated back after opening the split view.
-      Object.keys(panesState)
-        .filter((keyInStore) => !Object.keys(urlState.panes).includes(keyInStore))
-        .forEach((paneId) => dispatch(splitClose(paneId)));
-    }
+    const [urlState, hasParseError] = parseURL(params);
+    hasParseError &&
+      warning(
+        'Could not parse Explore URL',
+        'The requested URL contains invalid parameters, a default Explore state has been loaded.'
+      );
 
     // This happens when the user first navigates to explore.
     // Here we want to initialize each pane initial data, wether it comes
     // from the url or as a result of migrations.
     if (!isURLOutOfSync && initState.current === 'notstarted') {
       initState.current = 'pending';
-
-      // Clear all the panes in the store first to avoid stale data.
-      dispatch(clearPanes());
-
-      Promise.all(
-        Object.entries(urlState.panes).map(([exploreId, { datasource, queries, range, panelsState }]) => {
-          return getPaneDatasource(datasource, queries, orgId).then((paneDatasource) => {
-            return Promise.resolve(
-              // Given the Grafana datasource will always be present, this should always be defined.
-              paneDatasource
-                ? queries.length
-                  ? // if we have queries in the URL, we use them
-                    withUniqueRefIds(queries)
-                      // but filter out the ones that are not compatible with the pane datasource
-                      .filter(getQueryFilter(paneDatasource))
-                      .map(
-                        isMixedDatasource(paneDatasource)
-                          ? identity<DataQuery>
-                          : (query) => ({ ...query, datasource: paneDatasource.getRef() })
-                      )
-                  : getDatasourceSrv()
-                      // otherwise we get a default query from the pane datasource or from the default datasource if the pane datasource is mixed
-                      .get(isMixedDatasource(paneDatasource) ? undefined : paneDatasource.getRef())
-                      .then((ds) => [getDefaultQuery(ds)])
-                : []
-            ).then(async (queries) => {
-              // we remove queries that have an invalid datasources
-              let validQueries = await removeQueriesWithInvalidDatasource(queries);
-
-              if (!validQueries.length && paneDatasource) {
-                // and in case there's no query left we add a default one.
-                validQueries = [
-                  getDefaultQuery(isMixedDatasource(paneDatasource) ? await getDatasourceSrv().get() : paneDatasource),
-                ];
-              }
-
-              return { exploreId, range, panelsState, queries: validQueries, datasource: paneDatasource };
-            });
-          });
-        })
-      ).then(async (panes) => {
-        const initializedPanes = await Promise.all(
-          panes.map(({ exploreId, range, panelsState, queries, datasource }) => {
-            return dispatch(
-              initializeExplore({
-                exploreId,
-                datasource,
-                queries,
-                range: fromURLRange(range),
-                panelsState,
-              })
-            ).unwrap();
-          })
-        );
-
-        const newParams = initializedPanes.reduce(
-          (acc, { exploreId, state }) => {
-            return {
-              ...acc,
-              panes: {
-                ...acc.panes,
-                [exploreId]: getUrlStateFromPaneState(state),
-              },
-            };
-          },
-          {
-            panes: {},
-          }
-        );
-        initState.current = 'done';
-        // we need to use partial here beacuse replace doesn't encode the query params.
-        location.partial(
-          {
-            // partial doesn't remove other parameters, so we delete (by setting them to undefined) all the current one before adding the new ones.
-            ...Object.keys(location.getSearchObject()).reduce<Record<string, unknown>>((acc, key) => {
-              acc[key] = undefined;
-              return acc;
-            }, {}),
-            panes: JSON.stringify(newParams.panes),
-            schemaVersion: urlState.schemaVersion,
-            orgId,
-          },
-          true
-        );
-      });
+      initializeFromURL(urlState, initState, orgId, dispatch, location);
     }
 
     prevParams.current = params;
 
-    isURLOutOfSync && initState.current === 'done' && sync();
-  }, [dispatch, panesState, orgId, location, params]);
-}
-
-function getDefaultQuery(ds: DataSourceApi) {
-  return { ...ds.getDefaultQuery?.(CoreApp.Explore), refId: 'A', datasource: ds.getRef() };
-}
-
-function isMixedDatasource(datasource: DataSourceApi) {
-  return datasource.name === MIXED_DATASOURCE_NAME;
-}
-
-function getQueryFilter(datasource?: DataSourceApi) {
-  // if the root datasource is mixed, filter out queries that don't have a datasource.
-  if (datasource && isMixedDatasource(datasource)) {
-    return (q: DataQuery) => !!q.datasource;
-  } else {
-    // else filter out queries that have a datasource different from the root one.
-    // Queries may not have a datasource, if so, it's assumed they are using the root datasource
-    return (q: DataQuery) => {
-      if (!q.datasource) {
-        return true;
-      }
-      // Due to legacy URLs, `datasource` in queries may be a string. This logic should probably be in the migration
-      if (typeof q.datasource === 'string') {
-        return q.datasource === datasource?.uid;
-      }
-
-      return q.datasource.uid === datasource?.uid;
-    };
-  }
-}
-
-async function removeQueriesWithInvalidDatasource(queries: DataQuery[]) {
-  const results = await Promise.allSettled(
-    queries.map((query) => {
-      return getDatasourceSrv()
-        .get(query.datasource)
-        .then((ds) => ({
-          query,
-          ds,
-        }));
-    })
-  );
-
-  return results.filter(isFulfilled).map(({ value }) => value.query);
-}
-
-/**
- * Returns the datasource that an explore pane should be using.
- * If the URL specifies a datasource and that datasource exists, it will be used unless said datasource is mixed.
- * Otherwise the datasource will be extracetd from the the first query specifying a valid datasource.
- *
- * If there's no datasource in the queries, the last used datasource will be used.
- * if there's no last used datasource, the default datasource will be used.
- *
- * @param rootDatasource the top-level datasource specified in the URL
- * @param queries the queries in the pane
- * @param orgId the orgId of the user
- *
- * @returns the datasource UID that the pane should use, undefined if no suitable datasource is found
- */
-async function getPaneDatasource(
-  rootDatasource: DataSourceRef | string | null | undefined,
-  queries: DataQuery[],
-  orgId: number
-) {
-  // If there's a root datasource, use it unless it's unavailable
-  if (rootDatasource) {
-    try {
-      return await getDatasourceSrv().get(rootDatasource);
-    } catch (_) {}
-  }
-
-  // TODO: if queries have multiple datasources we should return mixed datasource
-  // Else we try to find a datasource in the queries, returning the first one that exists
-  const queriesWithDS = queries.filter((q) => q.datasource);
-  for (const query of queriesWithDS) {
-    try {
-      return await getDatasourceSrv().get(query.datasource);
-    } catch (_) {}
-  }
-
-  // If none of the queries specify a avalid datasource, we use the last used one
-  const lastUsedDSUID = getLastUsedDatasourceUID(orgId);
-
-  return (
-    getDatasourceSrv()
-      .get(lastUsedDSUID)
-      // Or the default one
-      .catch(() => getDatasourceSrv().get())
-      .catch(() => undefined)
-  );
-}
-
-/**
- * Compare 2 explore urls and return a map of what changed. Used to update the local state with all the
- * side effects needed.
- */
-const urlDiff = (
-  oldUrlState: ExploreUrlState | undefined,
-  currentUrlState: ExploreUrlState | undefined
-): {
-  datasource: boolean;
-  queries: boolean;
-  range: boolean;
-  panelsState: boolean;
-} => {
-  const datasource = !isEqual(currentUrlState?.datasource, oldUrlState?.datasource);
-  const queries = !isEqual(currentUrlState?.queries, oldUrlState?.queries);
-  const range = !isEqual(currentUrlState?.range || DEFAULT_RANGE, oldUrlState?.range || DEFAULT_RANGE);
-  const panelsState = !isEqual(currentUrlState?.panelsState, oldUrlState?.panelsState);
-
-  return {
-    datasource,
-    queries,
-    range,
-    panelsState,
-  };
-};
-
-export function getUrlStateFromPaneState(pane: ExploreItemState): ExploreUrlState {
-  return {
-    // datasourceInstance should not be undefined anymore here but in case there is some path for it to be undefined
-    // lets just fallback instead of crashing.
-    datasource: pane.datasourceInstance?.uid || '',
-    queries: pane.queries.map(clearQueryKeys),
-    range: toURLRange(pane.range.raw),
-    // don't include panelsState in the url unless a piece of state is actually set
-    panelsState: pruneObject(pane.panelsState),
-  };
-}
-
-/**
- * recursively walks an object, removing keys where the value is undefined
- * if the resulting object is empty, returns undefined
- **/
-function pruneObject(obj: object): object | undefined {
-  let pruned = mapValues(obj, (value) => (isObject(value) ? pruneObject(value) : value));
-  pruned = omitBy<typeof pruned>(pruned, isEmpty);
-  if (isEmpty(pruned)) {
-    return undefined;
-  }
-  return pruned;
+    if (isURLOutOfSync && initState.current === 'done') {
+      syncFromURL(urlState, panesState, dispatch);
+    }
+  }, [dispatch, panesState, orgId, location, params, warning]);
 }
diff --git a/public/app/features/explore/hooks/useStateSync/internal.utils.ts b/public/app/features/explore/hooks/useStateSync/internal.utils.ts
new file mode 100644
index 0000000000000..a600de5a03a3b
--- /dev/null
+++ b/public/app/features/explore/hooks/useStateSync/internal.utils.ts
@@ -0,0 +1,146 @@
+import { isEqual } from 'lodash';
+
+import { CoreApp, DataSourceApi, ExploreUrlState, isTruthy } from '@grafana/data';
+import { DataQuery, DataSourceRef } from '@grafana/schema';
+import { getLastUsedDatasourceUID } from 'app/core/utils/explore';
+import { DEFAULT_RANGE } from 'app/features/explore/state/utils';
+import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
+import { MIXED_DATASOURCE_NAME } from 'app/plugins/datasource/mixed/MixedDataSource';
+
+import { isFulfilled } from '../utils';
+
+export type InitState = 'pending' | 'done' | 'notstarted';
+
+/**
+ * Compare 2 explore urls and return a map of what changed. Used to update the local state with all the
+ * side effects needed.
+ */
+export const urlDiff = (
+  oldUrlState: ExploreUrlState | undefined,
+  currentUrlState: ExploreUrlState | undefined
+): {
+  datasource: boolean;
+  queries: boolean;
+  range: boolean;
+  panelsState: boolean;
+} => {
+  const datasource = !isEqual(currentUrlState?.datasource, oldUrlState?.datasource);
+  const queries = !isEqual(currentUrlState?.queries, oldUrlState?.queries);
+  const range = !isEqual(currentUrlState?.range || DEFAULT_RANGE, oldUrlState?.range || DEFAULT_RANGE);
+  const panelsState = !isEqual(currentUrlState?.panelsState, oldUrlState?.panelsState);
+
+  return {
+    datasource,
+    queries,
+    range,
+    panelsState,
+  };
+};
+
+/**
+ * Returns the datasource that an explore pane should be using.
+ * If the URL specifies a datasource and that datasource exists, it will be used unless said datasource is mixed.
+ * Otherwise the datasource will be extracted from the the first query specifying a valid datasource.
+ *
+ * If there's no datasource in the queries, the last used datasource will be used.
+ * if there's no last used datasource, the default datasource will be used.
+ *
+ * @param rootDatasource the top-level datasource specified in the URL
+ * @param queries the queries in the pane
+ * @param orgId the orgId of the user
+ *
+ * @returns the datasource UID that the pane should use, undefined if no suitable datasource is found
+ */
+export async function getPaneDatasource(
+  rootDatasource: DataSourceRef | string | null | undefined,
+  queries: DataQuery[],
+  orgId: number
+) {
+  // If there's a root datasource, use it unless it's unavailable
+  if (rootDatasource) {
+    try {
+      return await getDatasourceSrv().get(rootDatasource);
+    } catch (_) {}
+  }
+
+  // Else we try to find a datasource in the queries
+  const queriesDatasources = [
+    ...new Set(
+      queries
+        .map((q) => q.datasource)
+        .filter(isTruthy)
+        .map((ds) => (typeof ds === 'string' ? ds : ds.uid))
+    ),
+  ];
+
+  try {
+    if (queriesDatasources.length >= 1) {
+      const datasources = (await Promise.allSettled(queriesDatasources.map((ds) => getDatasourceSrv().get(ds)))).filter(
+        isFulfilled
+      );
+
+      // if queries have multiple (valid) datasources, we return the mixed datasource
+      if (datasources.length > 1) {
+        return await getDatasourceSrv().get(MIXED_DATASOURCE_NAME);
+      }
+
+      // otherwise we return the first datasource.
+      if (datasources.length === 1) {
+        return await getDatasourceSrv().get(queriesDatasources[0]);
+      }
+    }
+  } catch (_) {}
+
+  // If none of the queries specify a valid datasource, we use the last used one
+  return (
+    getDatasourceSrv()
+      .get(getLastUsedDatasourceUID(orgId))
+      // Or the default one
+      .catch(() => getDatasourceSrv().get())
+      .catch(() => undefined)
+  );
+}
+
+export function getDefaultQuery(ds: DataSourceApi) {
+  return { ...ds.getDefaultQuery?.(CoreApp.Explore), refId: 'A', datasource: ds.getRef() };
+}
+
+export function isMixedDatasource(datasource: DataSourceApi) {
+  return datasource.name === MIXED_DATASOURCE_NAME;
+}
+
+export function getQueryFilter(datasource?: DataSourceApi) {
+  // if the root datasource is mixed, filter out queries that don't have a datasource.
+  if (datasource && isMixedDatasource(datasource)) {
+    return (q: DataQuery) => !!q.datasource;
+  } else {
+    // else filter out queries that have a datasource different from the root one.
+    // Queries may not have a datasource, if so, it's assumed they are using the root datasource
+    return (q: DataQuery) => {
+      if (!q.datasource) {
+        return true;
+      }
+      // Due to legacy URLs, `datasource` in queries may be a string. This logic should probably be in the migration
+      if (typeof q.datasource === 'string') {
+        return q.datasource === datasource?.uid;
+      }
+
+      return q.datasource.uid === datasource?.uid;
+    };
+  }
+}
+
+export async function removeQueriesWithInvalidDatasource(queries: DataQuery[]) {
+  const results = await Promise.allSettled(
+    queries.map((query) => {
+      return getDatasourceSrv()
+        .get(query.datasource)
+        .then((ds) => ({
+          query,
+          ds,
+        }));
+    })
+  );
+
+  return results.filter(isFulfilled).map(({ value }) => value.query);
+}
diff --git a/public/app/features/explore/hooks/useStateSync/migrators/types.ts b/public/app/features/explore/hooks/useStateSync/migrators/types.ts
index 2983caca84890..1ab41c514691d 100644
--- a/public/app/features/explore/hooks/useStateSync/migrators/types.ts
+++ b/public/app/features/explore/hooks/useStateSync/migrators/types.ts
@@ -4,7 +4,7 @@ export interface MigrationHandler<From extends BaseExploreURL | never, To> {
   /**
    * The parse function is used to parse the URL parameters into the state object.
    */
-  parse: (params: UrlQueryMap) => To;
+  parse: (params: UrlQueryMap) => { to: To; error: boolean };
   /**
    *  the migrate function takes a state object from the previous schema version and returns a new state object
    */
diff --git a/public/app/features/explore/hooks/useStateSync/migrators/v0.test.ts b/public/app/features/explore/hooks/useStateSync/migrators/v0.test.ts
index 94a746c2b6ec4..c437c603715ee 100644
--- a/public/app/features/explore/hooks/useStateSync/migrators/v0.test.ts
+++ b/public/app/features/explore/hooks/useStateSync/migrators/v0.test.ts
@@ -4,16 +4,8 @@ import { v0Migrator } from './v0';
 
 describe('v0 migrator', () => {
   describe('parse', () => {
-    beforeEach(function () {
-      jest.spyOn(console, 'error').mockImplementation(() => void 0);
-    });
-
-    afterEach(() => {
-      jest.restoreAllMocks();
-    });
-
     it('returns default state on empty string', () => {
-      expect(v0Migrator.parse({})).toMatchObject({
+      expect(v0Migrator.parse({}).to).toMatchObject({
         left: {
           datasource: null,
           queries: [],
@@ -24,7 +16,7 @@ describe('v0 migrator', () => {
 
     it('returns a valid Explore state from URL parameter', () => {
       const paramValue = '{"datasource":"Local","queries":[{"expr":"metric"}],"range":{"from":"now-1h","to":"now"}}';
-      expect(v0Migrator.parse({ left: paramValue })).toMatchObject({
+      expect(v0Migrator.parse({ left: paramValue }).to).toMatchObject({
         left: {
           datasource: 'Local',
           queries: [{ expr: 'metric' }],
@@ -38,7 +30,7 @@ describe('v0 migrator', () => {
 
     it('returns a valid Explore state from right URL parameter', () => {
       const paramValue = '{"datasource":"Local","queries":[{"expr":"metric"}],"range":{"from":"now-1h","to":"now"}}';
-      expect(v0Migrator.parse({ right: paramValue })).toMatchObject({
+      expect(v0Migrator.parse({ right: paramValue }).to).toMatchObject({
         right: {
           datasource: 'Local',
           queries: [{ expr: 'metric' }],
@@ -52,7 +44,7 @@ describe('v0 migrator', () => {
 
     it('returns a default state from invalid right URL parameter', () => {
       const paramValue = 10;
-      expect(v0Migrator.parse({ right: paramValue })).toMatchObject({
+      expect(v0Migrator.parse({ right: paramValue }).to).toMatchObject({
         right: {
           datasource: null,
           queries: [],
@@ -64,7 +56,7 @@ describe('v0 migrator', () => {
     it('returns a valid Explore state from a compact URL parameter', () => {
       const paramValue =
         '["now-1h","now","Local",{"expr":"metric"},{"ui":[true,true,true,"none"],"__panelsState":{"logs":"1"}}]';
-      expect(v0Migrator.parse({ left: paramValue })).toMatchObject({
+      expect(v0Migrator.parse({ left: paramValue }).to).toMatchObject({
         left: {
           datasource: 'Local',
           queries: [{ expr: 'metric' }],
@@ -81,21 +73,20 @@ describe('v0 migrator', () => {
 
     it('returns default state on compact URLs with too few segments ', () => {
       const paramValue = '["now-1h",{"expr":"metric"},{"ui":[true,true,true,"none"]}]';
-      expect(v0Migrator.parse({ left: paramValue })).toMatchObject({
+      expect(v0Migrator.parse({ left: paramValue }).to).toMatchObject({
         left: {
           datasource: null,
           queries: [],
           range: DEFAULT_RANGE,
         },
       });
-      expect(console.error).toHaveBeenCalledWith('Error parsing compact URL state for Explore.');
     });
 
     it('should not return a query for mode in the url', () => {
       // Previous versions of Grafana included "Explore mode" in the URL; this should not be treated as a query.
       const paramValue =
         '["now-1h","now","x-ray-datasource",{"queryType":"getTraceSummaries"},{"mode":"Metrics"},{"ui":[true,true,true,"none"]}]';
-      expect(v0Migrator.parse({ left: paramValue })).toMatchObject({
+      expect(v0Migrator.parse({ left: paramValue }).to).toMatchObject({
         left: {
           datasource: 'x-ray-datasource',
           queries: [{ queryType: 'getTraceSummaries' }],
@@ -110,7 +101,7 @@ describe('v0 migrator', () => {
     it('should return queries if queryType is present in the url', () => {
       const paramValue =
         '["now-1h","now","x-ray-datasource",{"queryType":"getTraceSummaries"},{"ui":[true,true,true,"none"]}]';
-      expect(v0Migrator.parse({ left: paramValue })).toMatchObject({
+      expect(v0Migrator.parse({ left: paramValue }).to).toMatchObject({
         left: {
           datasource: 'x-ray-datasource',
           queries: [{ queryType: 'getTraceSummaries' }],
diff --git a/public/app/features/explore/hooks/useStateSync/migrators/v0.ts b/public/app/features/explore/hooks/useStateSync/migrators/v0.ts
index c1d641facad78..a2948163f009d 100644
--- a/public/app/features/explore/hooks/useStateSync/migrators/v0.ts
+++ b/public/app/features/explore/hooks/useStateSync/migrators/v0.ts
@@ -1,5 +1,4 @@
 import { ExploreUrlState } from '@grafana/data';
-import { safeParseJson } from 'app/core/utils/explore';
 import { DEFAULT_RANGE } from 'app/features/explore/state/utils';
 
 import { BaseExploreURL, MigrationHandler } from './types';
@@ -12,12 +11,51 @@ export interface ExploreURLV0 extends BaseExploreURL {
 
 export const v0Migrator: MigrationHandler<never, ExploreURLV0> = {
   parse: (params) => {
+    // If no params are provided, return the default state without errors
+    // This means the user accessed the explore page without any params
+    if (!params.left && !params.right) {
+      return {
+        to: {
+          left: {
+            datasource: null,
+            queries: [],
+            range: {
+              from: DEFAULT_RANGE.from,
+              to: DEFAULT_RANGE.to,
+            },
+          },
+          schemaVersion: 0,
+        },
+        error: false,
+      };
+    }
+
+    let left: ExploreUrlState | undefined;
+    let right: ExploreUrlState | undefined;
+    let leftError, rightError: boolean | undefined;
+
+    if (typeof params.left === 'string') {
+      [left, leftError] = parsePaneState(params.left);
+    }
+
+    if (typeof params.right === 'string') {
+      [right, rightError] = parsePaneState(params.right);
+    } else if (params.right) {
+      right = FALLBACK_PANE_VALUE;
+      rightError = true;
+    }
+
+    if (!left) {
+      left = FALLBACK_PANE_VALUE;
+    }
+
     return {
-      schemaVersion: 0,
-      left: parseUrlState(typeof params.left === 'string' ? params.left : undefined),
-      ...(params.right && {
-        right: parseUrlState(typeof params.right === 'string' ? params.right : undefined),
-      }),
+      to: {
+        schemaVersion: 0,
+        left,
+        ...(right && { right }),
+      },
+      error: !!leftError || !!rightError,
     };
   },
 };
@@ -32,25 +70,26 @@ enum ParseUrlStateIndex {
   SegmentsStart = 3,
 }
 
-function parseUrlState(initial: string | undefined): ExploreUrlState {
-  const parsed = safeParseJson(initial);
-  const errorResult = {
-    datasource: null,
-    queries: [],
-    range: DEFAULT_RANGE,
-  };
+const FALLBACK_PANE_VALUE: ExploreUrlState = {
+  datasource: null,
+  queries: [],
+  range: DEFAULT_RANGE,
+};
 
-  if (!parsed) {
-    return errorResult;
+function parsePaneState(initial: string): [ExploreUrlState, boolean] {
+  let parsed;
+  try {
+    parsed = JSON.parse(initial);
+  } catch {
+    return [FALLBACK_PANE_VALUE, true];
   }
 
   if (!Array.isArray(parsed)) {
-    return { queries: [], range: DEFAULT_RANGE, ...parsed };
+    return [{ queries: [], range: DEFAULT_RANGE, ...parsed }, false];
   }
 
   if (parsed.length <= ParseUrlStateIndex.SegmentsStart) {
-    console.error('Error parsing compact URL state for Explore.');
-    return errorResult;
+    return [FALLBACK_PANE_VALUE, true];
   }
 
   const range = {
@@ -62,5 +101,5 @@ function parseUrlState(initial: string | undefined): ExploreUrlState {
   const queries = parsedSegments.filter((segment) => !isSegment(segment, 'ui', 'mode', '__panelsState'));
 
   const panelsState = parsedSegments.find((segment) => isSegment(segment, '__panelsState'))?.__panelsState;
-  return { datasource, queries, range, panelsState };
+  return [{ datasource, queries, range, panelsState }, false];
 }
diff --git a/public/app/features/explore/hooks/useStateSync/migrators/v1.test.ts b/public/app/features/explore/hooks/useStateSync/migrators/v1.test.ts
index 922efb9e99e8c..0f87f1bb4b5e4 100644
--- a/public/app/features/explore/hooks/useStateSync/migrators/v1.test.ts
+++ b/public/app/features/explore/hooks/useStateSync/migrators/v1.test.ts
@@ -9,16 +9,8 @@ jest.mock('app/core/utils/explore', () => ({
 
 describe('v1 migrator', () => {
   describe('parse', () => {
-    beforeEach(function () {
-      jest.spyOn(console, 'error').mockImplementation(() => void 0);
-    });
-
-    afterEach(() => {
-      jest.restoreAllMocks();
-    });
-
     it('correctly returns default state when no params are provided', () => {
-      expect(v1Migrator.parse({})).toMatchObject({
+      expect(v1Migrator.parse({}).to).toMatchObject({
         panes: {
           ID: {
             datasource: null,
@@ -30,7 +22,7 @@ describe('v1 migrator', () => {
     });
 
     it('correctly returns default state when panes param is an empty object', () => {
-      expect(v1Migrator.parse({ panes: '{}' })).toMatchObject({
+      expect(v1Migrator.parse({ panes: '{}' }).to).toMatchObject({
         panes: {
           ID: {
             datasource: null,
@@ -42,7 +34,7 @@ describe('v1 migrator', () => {
     });
 
     it('correctly returns default state when panes param is not a valid JSON object', () => {
-      expect(v1Migrator.parse({ panes: '{a malformed json}' })).toMatchObject({
+      expect(v1Migrator.parse({ panes: '{a malformed json}' }).to).toMatchObject({
         panes: {
           ID: {
             datasource: null,
@@ -51,12 +43,10 @@ describe('v1 migrator', () => {
           },
         },
       });
-
-      expect(console.error).toHaveBeenCalledTimes(1);
     });
 
     it('correctly returns default state when a pane in panes params is an empty object', () => {
-      expect(v1Migrator.parse({ panes: '{"aaa": {}}' })).toMatchObject({
+      expect(v1Migrator.parse({ panes: '{"aaa": {}}' }).to).toMatchObject({
         panes: {
           aaa: {
             datasource: null,
@@ -68,7 +58,7 @@ describe('v1 migrator', () => {
     });
 
     it('correctly returns default state when a pane in panes params is not a valid JSON object', () => {
-      expect(v1Migrator.parse({ panes: '{"aaa": "NOT A VALID URL STATE"}' })).toMatchObject({
+      expect(v1Migrator.parse({ panes: '{"aaa": "NOT A VALID URL STATE"}' }).to).toMatchObject({
         panes: {
           aaa: {
             datasource: null,
@@ -96,7 +86,7 @@ describe('v1 migrator', () => {
               }
             }
           }`,
-        })
+        }).to
       ).toMatchObject({
         panes: {
           aaa: {
diff --git a/public/app/features/explore/hooks/useStateSync/migrators/v1.ts b/public/app/features/explore/hooks/useStateSync/migrators/v1.ts
index 5dc6a9a6ca07d..57b23ce4076f3 100644
--- a/public/app/features/explore/hooks/useStateSync/migrators/v1.ts
+++ b/public/app/features/explore/hooks/useStateSync/migrators/v1.ts
@@ -1,5 +1,5 @@
 import { ExploreUrlState } from '@grafana/data';
-import { generateExploreId, safeParseJson } from 'app/core/utils/explore';
+import { ID_ALPHABET, generateExploreId } from 'app/core/utils/explore';
 import { DEFAULT_RANGE } from 'app/features/explore/state/utils';
 
 import { hasKey } from '../../utils';
@@ -18,21 +18,51 @@ export const v1Migrator: MigrationHandler<ExploreURLV0, ExploreURLV1> = {
   parse: (params) => {
     if (!params || !params.panes || typeof params.panes !== 'string') {
       return {
-        schemaVersion: 1,
-        panes: {
-          [generateExploreId()]: DEFAULT_STATE,
+        to: {
+          schemaVersion: 1,
+          panes: {
+            [generateExploreId()]: DEFAULT_STATE,
+          },
         },
+        error: false,
       };
     }
 
-    const rawPanes: Record<string, unknown> = safeParseJson(params.panes) || {};
+    let rawPanes: unknown;
+    try {
+      rawPanes = JSON.parse(params.panes);
+    } catch {}
+
+    if (rawPanes == null || typeof rawPanes !== 'object') {
+      return {
+        to: {
+          schemaVersion: 1,
+          panes: {
+            [generateExploreId()]: DEFAULT_STATE,
+          },
+        },
+        error: true,
+      };
+    }
 
     const panes = Object.entries(rawPanes)
       .map(([key, value]) => [key, applyDefaults(value)] as const)
       .reduce<Record<string, ExploreUrlState>>((acc, [key, value]) => {
+        let newKey = key;
+        // Panes IDs must be 3 characters long and contain at least one letter
+        if (
+          newKey.length !== 3 ||
+          /^\d+$/.test(newKey) ||
+          newKey.split('').some((ch) => {
+            return ID_ALPHABET.indexOf(ch) === -1;
+          })
+        ) {
+          newKey = generateExploreId();
+        }
+
         return {
           ...acc,
-          [key]: value,
+          [newKey]: value,
         };
       }, {});
 
@@ -41,8 +71,11 @@ export const v1Migrator: MigrationHandler<ExploreURLV0, ExploreURLV1> = {
     }
 
     return {
-      schemaVersion: 1,
-      panes,
+      to: {
+        schemaVersion: 1,
+        panes,
+      },
+      error: false,
     };
   },
   migrate: (params) => {
diff --git a/public/app/features/explore/hooks/useStateSync/parseURL.ts b/public/app/features/explore/hooks/useStateSync/parseURL.ts
index 0a67b625880ba..4325630c1a9c8 100644
--- a/public/app/features/explore/hooks/useStateSync/parseURL.ts
+++ b/public/app/features/explore/hooks/useStateSync/parseURL.ts
@@ -11,20 +11,20 @@ export const parseURL = (params: ExploreQueryParams) => {
 
 const migrators = [v0Migrator, v1Migrator] as const;
 
-const migrate = (params: ExploreQueryParams): ExploreURL => {
+const migrate = (params: ExploreQueryParams): [ExploreURL, boolean] => {
   const schemaVersion = getSchemaVersion(params);
 
   const [parser, ...migratorsToRun] = migrators.slice(schemaVersion);
 
-  const parsedUrl = parser.parse(params);
+  const { error, to } = parser.parse(params);
 
   // @ts-expect-error
   const final: ExploreURL = migratorsToRun.reduce((acc, migrator) => {
     // @ts-expect-error
     return migrator.migrate ? migrator.migrate(acc) : acc;
-  }, parsedUrl);
+  }, to);
 
-  return final;
+  return [final, error];
 };
 
 function getSchemaVersion(params: ExploreQueryParams): number {
diff --git a/public/app/features/explore/hooks/useStateSync/synchronizer/fromURL.ts b/public/app/features/explore/hooks/useStateSync/synchronizer/fromURL.ts
new file mode 100644
index 0000000000000..5497f4814078a
--- /dev/null
+++ b/public/app/features/explore/hooks/useStateSync/synchronizer/fromURL.ts
@@ -0,0 +1,88 @@
+import { isEqual } from 'lodash';
+
+import { EventBusSrv } from '@grafana/data';
+import { changeDatasource } from 'app/features/explore/state/datasource';
+import { changePanelsStateAction, initializeExplore } from 'app/features/explore/state/explorePane';
+import { splitClose, syncTimesAction } from 'app/features/explore/state/main';
+import { cancelQueries, runQueries, setQueriesAction } from 'app/features/explore/state/query';
+import { updateTime } from 'app/features/explore/state/time';
+import { fromURLRange } from 'app/features/explore/state/utils';
+import { withUniqueRefIds } from 'app/features/explore/utils/queries';
+import { ExploreItemState, ThunkDispatch } from 'app/types';
+
+import { getUrlStateFromPaneState } from '../index';
+import { urlDiff } from '../internal.utils';
+import { ExploreURLV1 } from '../migrators/v1';
+
+export function syncFromURL(
+  urlState: ExploreURLV1,
+  panesState: Record<string, undefined | ExploreItemState>,
+  dispatch: ThunkDispatch
+) {
+  // if navigating the history causes one of the time range to not being equal to all the other ones,
+  // we set syncedTimes to false to avoid inconsistent UI state.
+  // Ideally `syncedTimes` should be saved in the URL.
+  const paneArray = Object.values(urlState.panes);
+  if (paneArray.length > 1) {
+    const paneTimesUnequal = paneArray.some(({ range }, _, [{ range: firstRange }]) => !isEqual(range, firstRange));
+    dispatch(syncTimesAction({ syncedTimes: !paneTimesUnequal })); // if all time ranges are equal, keep them synced
+  }
+
+  Object.entries(urlState.panes).forEach(async ([exploreId, urlPane], i) => {
+    const { datasource, queries, range, panelsState } = urlPane;
+
+    const paneState = panesState[exploreId];
+
+    if (paneState !== undefined) {
+      const update = urlDiff(urlPane, getUrlStateFromPaneState(paneState));
+
+      Promise.resolve()
+        .then(async () => {
+          if (update.datasource && datasource) {
+            await dispatch(changeDatasource({ exploreId, datasource }));
+          }
+          return;
+        })
+        .then(async () => {
+          if (update.range) {
+            dispatch(updateTime({ exploreId, rawRange: fromURLRange(range) }));
+          }
+
+          if (update.queries) {
+            dispatch(setQueriesAction({ exploreId, queries: withUniqueRefIds(queries) }));
+          }
+
+          if (update.queries || update.range) {
+            await dispatch(cancelQueries(exploreId));
+            dispatch(runQueries({ exploreId }));
+          }
+
+          if (update.panelsState && panelsState) {
+            dispatch(changePanelsStateAction({ exploreId, panelsState }));
+          }
+        });
+    } else {
+      // This happens when browser history is used to navigate.
+      // In this case we want to initialize the pane with the data from the URL
+      // if it's not present in the store. This may happen if the user has navigated
+      // from split view to non-split view and then back to split view.
+      dispatch(
+        initializeExplore({
+          exploreId,
+          datasource: datasource || '',
+          queries: withUniqueRefIds(queries),
+          range: fromURLRange(range),
+          panelsState,
+          position: i,
+          eventBridge: new EventBusSrv(),
+        })
+      );
+    }
+  });
+
+  // Close all the panes that are not in the URL but are still in the store
+  // ie. because the user has navigated back after opening the split view.
+  Object.keys(panesState)
+    .filter((keyInStore) => !Object.keys(urlState.panes).includes(keyInStore))
+    .forEach((paneId) => dispatch(splitClose(paneId)));
+}
diff --git a/public/app/features/explore/hooks/useStateSync/synchronizer/init.ts b/public/app/features/explore/hooks/useStateSync/synchronizer/init.ts
new file mode 100644
index 0000000000000..dae7cd105d3fe
--- /dev/null
+++ b/public/app/features/explore/hooks/useStateSync/synchronizer/init.ts
@@ -0,0 +1,127 @@
+import { identity, isEqual } from 'lodash';
+import { MutableRefObject } from 'react';
+
+import { EventBusSrv } from '@grafana/data';
+import { LocationService } from '@grafana/runtime';
+import { DataQuery } from '@grafana/schema';
+import { initializeExplore } from 'app/features/explore/state/explorePane';
+import { clearPanes, syncTimesAction } from 'app/features/explore/state/main';
+import { fromURLRange } from 'app/features/explore/state/utils';
+import { withUniqueRefIds } from 'app/features/explore/utils/queries';
+import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
+import { ThunkDispatch } from 'app/types';
+
+import { getUrlStateFromPaneState } from '../index';
+import {
+  getDefaultQuery,
+  getPaneDatasource,
+  getQueryFilter,
+  InitState,
+  isMixedDatasource,
+  removeQueriesWithInvalidDatasource,
+} from '../internal.utils';
+import { ExploreURLV1 } from '../migrators/v1';
+
+export function initializeFromURL(
+  urlState: ExploreURLV1,
+  initState: MutableRefObject<InitState>,
+  orgId: number,
+  dispatch: ThunkDispatch,
+  location: LocationService
+) {
+  // Clear all the panes in the store first to avoid stale data.
+  dispatch(clearPanes());
+
+  Promise.all(
+    Object.entries(urlState.panes).map(([exploreId, { datasource, queries, range, panelsState }]) => {
+      return getPaneDatasource(datasource, queries, orgId).then((paneDatasource) => {
+        return Promise.resolve(
+          // Given the Grafana datasource will always be present, this should always be defined.
+          paneDatasource
+            ? queries.length
+              ? // if we have queries in the URL, we use them
+                withUniqueRefIds(queries)
+                  // but filter out the ones that are not compatible with the pane datasource
+                  .filter(getQueryFilter(paneDatasource))
+                  .map(
+                    isMixedDatasource(paneDatasource)
+                      ? identity<DataQuery>
+                      : (query) => ({ ...query, datasource: paneDatasource.getRef() })
+                  )
+              : getDatasourceSrv()
+                  // otherwise we get a default query from the pane datasource or from the default datasource if the pane datasource is mixed
+                  .get(isMixedDatasource(paneDatasource) ? undefined : paneDatasource.getRef())
+                  .then((ds) => [getDefaultQuery(ds)])
+            : []
+        ).then(async (queries) => {
+          // we remove queries that have an invalid datasources
+          let validQueries = await removeQueriesWithInvalidDatasource(queries);
+
+          if (!validQueries.length && paneDatasource) {
+            // and in case there's no query left we add a default one.
+            validQueries = [
+              getDefaultQuery(isMixedDatasource(paneDatasource) ? await getDatasourceSrv().get() : paneDatasource),
+            ];
+          }
+
+          return { exploreId, range, panelsState, queries: validQueries, datasource: paneDatasource };
+        });
+      });
+    })
+  ).then(async (panes) => {
+    const initializedPanes = await Promise.all(
+      panes.map(({ exploreId, range, panelsState, queries, datasource }) => {
+        return dispatch(
+          initializeExplore({
+            exploreId,
+            datasource,
+            queries,
+            range: fromURLRange(range),
+            panelsState,
+            eventBridge: new EventBusSrv(),
+          })
+        ).unwrap();
+      })
+    );
+
+    if (initializedPanes.length > 1) {
+      const paneTimesUnequal = initializedPanes.some(
+        ({ state }, _, [{ state: firstState }]) => !isEqual(state.range.raw, firstState.range.raw)
+      );
+      dispatch(syncTimesAction({ syncedTimes: !paneTimesUnequal })); // if all time ranges are equal, keep them synced
+    }
+
+    const panesObj = initializedPanes.reduce((acc, { exploreId, state }) => {
+      return {
+        ...acc,
+        [exploreId]: getUrlStateFromPaneState(state),
+      };
+    }, {});
+
+    // we need to use partial here beacuse replace doesn't encode the query params.
+    const oldQuery = location.getSearchObject();
+
+    // we create the default query params from the current URL, omitting all the properties we know should be in the final url.
+    // This includes params from previous schema versions and 'schemaVersion', 'panes', 'orgId' as we want to replace those.
+    let defaults: Record<string, unknown> = {};
+    for (const [key, value] of Object.entries(oldQuery).filter(
+      ([key]) => !['schemaVersion', 'panes', 'orgId', 'left', 'right'].includes(key)
+    )) {
+      defaults[key] = value;
+    }
+
+    const searchParams = new URLSearchParams({
+      // we set the schemaVersion as the first parameter so that when URLs are truncated the schemaVersion is more likely to be present.
+      schemaVersion: `${urlState.schemaVersion}`,
+      panes: JSON.stringify(panesObj),
+      orgId: `${orgId}`,
+      ...defaults,
+    });
+
+    location.replace({
+      pathname: location.getLocation().pathname,
+      search: searchParams.toString(),
+    });
+    initState.current = 'done';
+  });
+}
diff --git a/public/app/features/explore/hooks/useStateSync/synchronizer/toURL.ts b/public/app/features/explore/hooks/useStateSync/synchronizer/toURL.ts
new file mode 100644
index 0000000000000..ba164419822e0
--- /dev/null
+++ b/public/app/features/explore/hooks/useStateSync/synchronizer/toURL.ts
@@ -0,0 +1,75 @@
+import { Action } from '@reduxjs/toolkit';
+import { isEqual } from 'lodash';
+import { MutableRefObject } from 'react';
+
+import { UrlQueryMap } from '@grafana/data';
+import { LocationService } from '@grafana/runtime';
+import { changeDatasource } from 'app/features/explore/state/datasource';
+import { changePanelsStateAction } from 'app/features/explore/state/explorePane';
+import { splitClose, splitOpen } from 'app/features/explore/state/main';
+import { runQueries } from 'app/features/explore/state/query';
+import { changeRangeAction } from 'app/features/explore/state/time';
+import { ExploreState } from 'app/types';
+
+import { getUrlStateFromPaneState } from '../index';
+import { InitState } from '../internal.utils';
+
+/*
+We want to update the URL when:
+ - a pane is opened or closed
+ - a query is run
+ - range is changed
+ - panel state is updated
+ - a datasource change has completed.
+
+Note: Changing datasource causes a bunch of actions to be dispatched, we want to update the URL
+only when the change set has completed. This is done by checking if the changeDatasource.pending action
+has been dispatched and pausing the listener until the changeDatasource.fulfilled action is dispatched.
+*/
+export function syncToURLPredicate(paused: MutableRefObject<boolean>, action: Action) {
+  paused.current = changeDatasource.pending.type === action.type;
+
+  return (
+    [
+      splitClose.type,
+      splitOpen.fulfilled.type,
+      runQueries.pending.type,
+      changeRangeAction.type,
+      changePanelsStateAction.type,
+      changeDatasource.fulfilled.type,
+    ].includes(action.type) && !paused.current
+  );
+}
+
+export function syncToURL(
+  exploreState: ExploreState,
+  prevParams: MutableRefObject<UrlQueryMap>,
+  initState: MutableRefObject<InitState>,
+  location: LocationService
+) {
+  const panesQueryParams = Object.entries(exploreState.panes).reduce((acc, [id, paneState]) => {
+    if (!paneState) {
+      return acc;
+    }
+    return {
+      ...acc,
+      [id]: getUrlStateFromPaneState(paneState),
+    };
+  }, {});
+
+  if (!isEqual(prevParams.current.panes, JSON.stringify(panesQueryParams))) {
+    // If there's no previous state it means we are mounting explore for the first time,
+    // in this case we want to replace the URL instead of pushing a new entry to the history.
+    // If the init state is 'pending' it means explore still hasn't finished initializing. in that case we skip
+    // pushing a new entry in the history as the first entry will be pushed after initialization.
+    const replace =
+      (!!prevParams.current.panes && Object.values(prevParams.current.panes).filter(Boolean).length === 0) ||
+      initState.current === 'pending';
+
+    prevParams.current = {
+      panes: JSON.stringify(panesQueryParams),
+    };
+
+    location.partial({ panes: prevParams.current.panes }, replace);
+  }
+}
diff --git a/public/app/features/explore/spec/datasourceState.test.tsx b/public/app/features/explore/spec/datasourceState.test.tsx
index 158af770bd8d9..6a8c16b743337 100644
--- a/public/app/features/explore/spec/datasourceState.test.tsx
+++ b/public/app/features/explore/spec/datasourceState.test.tsx
@@ -1,4 +1,5 @@
 import { screen, waitFor } from '@testing-library/react';
+import { Props } from 'react-virtualized-auto-sizer';
 
 import { EventBusSrv } from '@grafana/data';
 
@@ -13,6 +14,16 @@ jest.mock('@grafana/runtime', () => ({
   getAppEvents: () => testEventBus,
 }));
 
+jest.mock('react-virtualized-auto-sizer', () => {
+  return ({ children }: Props) =>
+    children({
+      height: 1,
+      scaledHeight: 1,
+      scaledWidth: 1,
+      width: 1,
+    });
+});
+
 jest.mock('app/core/core', () => ({
   contextSrv: {
     hasPermission: () => true,
diff --git a/public/app/features/explore/spec/helper/assert.ts b/public/app/features/explore/spec/helper/assert.ts
index d320cffcb8a54..123db21a23332 100644
--- a/public/app/features/explore/spec/helper/assert.ts
+++ b/public/app/features/explore/spec/helper/assert.ts
@@ -1,6 +1,6 @@
-import { waitFor, within } from '@testing-library/react';
+import { waitFor } from '@testing-library/react';
 
-import { withinExplore } from './setup';
+import { getAllByRoleInQueryHistoryTab, withinExplore } from './setup';
 
 export const assertQueryHistoryExists = async (query: string, exploreId = 'left') => {
   const selector = withinExplore(exploreId);
@@ -49,10 +49,7 @@ export const assertQueryHistoryComment = async (expectedQueryComments: string[],
 };
 
 export const assertQueryHistoryIsStarred = async (expectedStars: boolean[], exploreId = 'left') => {
-  const selector = withinExplore(exploreId);
-  // Test ID is used to avoid test timeouts reported in #70158, #59116 and #47635
-  const queriesContainer = selector.getByTestId('query-history-queries-tab');
-  const starButtons = within(queriesContainer).getAllByRole('button', { name: /Star query|Unstar query/ });
+  const starButtons = getAllByRoleInQueryHistoryTab(exploreId, 'button', /Star query|Unstar query/);
 
   await waitFor(() =>
     expectedStars.forEach((starred, queryIndex) => {
diff --git a/public/app/features/explore/spec/helper/interactions.ts b/public/app/features/explore/spec/helper/interactions.ts
index 2213c82b09a2a..3afd11fef18ea 100644
--- a/public/app/features/explore/spec/helper/interactions.ts
+++ b/public/app/features/explore/spec/helper/interactions.ts
@@ -1,15 +1,15 @@
-import { fireEvent, screen, within } from '@testing-library/react';
+import { screen, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
 import { selectors } from '@grafana/e2e-selectors';
 
-import { withinExplore } from './setup';
+import { getAllByRoleInQueryHistoryTab, withinExplore } from './setup';
 
 export const changeDatasource = async (name: string) => {
   const datasourcePicker = (await screen.findByTestId(selectors.components.DataSourcePicker.container)).children[0];
-  fireEvent.keyDown(datasourcePicker, { keyCode: 40 });
-  const option = screen.getByText(name);
-  fireEvent.click(option);
+  await userEvent.click(datasourcePicker);
+  const option = within(screen.getByTestId(selectors.components.DataSourcePicker.dataSourceList)).getAllByText(name)[0];
+  await userEvent.click(option);
 };
 
 export const inputQuery = async (query: string, exploreId = 'left') => {
@@ -74,8 +74,7 @@ export const loadMoreQueryHistory = async (exploreId = 'left') => {
   await userEvent.click(button);
 };
 
-const invokeAction = async (queryIndex: number, actionAccessibleName: string, exploreId: string) => {
-  const selector = withinExplore(exploreId);
-  const buttons = selector.getAllByRole('button', { name: actionAccessibleName });
+const invokeAction = async (queryIndex: number, actionAccessibleName: string | RegExp, exploreId: string) => {
+  const buttons = getAllByRoleInQueryHistoryTab(exploreId, 'button', actionAccessibleName);
   await userEvent.click(buttons[queryIndex]);
 };
diff --git a/public/app/features/explore/spec/helper/query.ts b/public/app/features/explore/spec/helper/query.ts
index a1ec1216b6484..6fc8b313bcd4b 100644
--- a/public/app/features/explore/spec/helper/query.ts
+++ b/public/app/features/explore/spec/helper/query.ts
@@ -1,9 +1,9 @@
 import { from, Observable } from 'rxjs';
 
-import { ArrayDataFrame, DataQueryResponse, FieldType } from '@grafana/data';
+import { arrayToDataFrame, DataQueryResponse, FieldType } from '@grafana/data';
 
 export function makeLogsQueryResponse(marker = ''): Observable<DataQueryResponse> {
-  const df = new ArrayDataFrame([{ ts: Date.now(), line: `custom log line ${marker}` }]);
+  const df = arrayToDataFrame([{ ts: Date.now(), line: `custom log line ${marker}` }]);
   df.meta = {
     preferredVisualisationType: 'logs',
   };
@@ -12,7 +12,7 @@ export function makeLogsQueryResponse(marker = ''): Observable<DataQueryResponse
 }
 
 export function makeMetricsQueryResponse(): Observable<DataQueryResponse> {
-  const df = new ArrayDataFrame([{ ts: Date.now(), val: 1 }]);
+  const df = arrayToDataFrame([{ ts: Date.now(), val: 1 }]);
   df.fields[0].type = FieldType.time;
   return from([{ data: [df] }]);
 }
diff --git a/public/app/features/explore/spec/helper/setup.tsx b/public/app/features/explore/spec/helper/setup.tsx
index 5b5a392d79bf9..db5dfa966f5f6 100644
--- a/public/app/features/explore/spec/helper/setup.tsx
+++ b/public/app/features/explore/spec/helper/setup.tsx
@@ -1,4 +1,4 @@
-import { waitFor, within } from '@testing-library/dom';
+import { ByRoleMatcher, waitFor, within } from '@testing-library/dom';
 import { render, screen } from '@testing-library/react';
 import { createMemoryHistory } from 'history';
 import { fromPairs } from 'lodash';
@@ -287,3 +287,13 @@ const exploreTestsHelper: { setupExplore: typeof setupExplore; tearDownExplore?:
     setupExplore,
     tearDownExplore: undefined,
   };
+
+/**
+ * Optimized version of getAllByRole to avoid timeouts in tests. Please check #70158, #59116 and #47635, #78236.
+ */
+export const getAllByRoleInQueryHistoryTab = (exploreId: string, role: ByRoleMatcher, name: string | RegExp) => {
+  const selector = withinExplore(exploreId);
+  // Test ID is used to avoid test timeouts reported in
+  const queriesContainer = selector.getByTestId('query-history-queries-tab');
+  return within(queriesContainer).getAllByRole(role, { name });
+};
diff --git a/public/app/features/explore/spec/interpolation.test.tsx b/public/app/features/explore/spec/interpolation.test.tsx
index 969f41f424aad..9efdf2868e3b5 100644
--- a/public/app/features/explore/spec/interpolation.test.tsx
+++ b/public/app/features/explore/spec/interpolation.test.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { Props } from 'react-virtualized-auto-sizer';
 
 import { DataQueryRequest, EventBusSrv, serializeStateToUrlParam } from '@grafana/data';
 import { getTemplateSrv } from '@grafana/runtime';
@@ -25,8 +26,8 @@ jest.mock('app/core/core', () => ({
 jest.mock('react-virtualized-auto-sizer', () => {
   return {
     __esModule: true,
-    default(props: any) {
-      return <div>{props.children({ width: 1000 })}</div>;
+    default(props: Props) {
+      return <div>{props.children({ height: 1, scaledHeight: 1, scaledWidth: 1000, width: 1000 })}</div>;
     },
   };
 });
diff --git a/public/app/features/explore/spec/query.test.tsx b/public/app/features/explore/spec/query.test.tsx
index 492b9dcde2a66..185d4340cca49 100644
--- a/public/app/features/explore/spec/query.test.tsx
+++ b/public/app/features/explore/spec/query.test.tsx
@@ -1,4 +1,5 @@
 import { screen } from '@testing-library/react';
+import { Props } from 'react-virtualized-auto-sizer';
 
 import { EventBusSrv, serializeStateToUrlParam } from '@grafana/data';
 
@@ -12,6 +13,16 @@ jest.mock('@grafana/runtime', () => ({
   getAppEvents: () => testEventBus,
 }));
 
+jest.mock('react-virtualized-auto-sizer', () => {
+  return ({ children }: Props) =>
+    children({
+      height: 1,
+      scaledHeight: 1,
+      scaledWidth: 1,
+      width: 1,
+    });
+});
+
 describe('Explore: handle running/not running query', () => {
   afterEach(() => {
     tearDown();
diff --git a/public/app/features/explore/spec/queryHistory.test.tsx b/public/app/features/explore/spec/queryHistory.test.tsx
index 6db3d87335eb9..7aed7e67ba3a9 100644
--- a/public/app/features/explore/spec/queryHistory.test.tsx
+++ b/public/app/features/explore/spec/queryHistory.test.tsx
@@ -1,7 +1,9 @@
 import React from 'react';
+import { Props } from 'react-virtualized-auto-sizer';
 
-import { DataQuery, EventBusSrv, serializeStateToUrlParam } from '@grafana/data';
+import { EventBusSrv, serializeStateToUrlParam } from '@grafana/data';
 import { config } from '@grafana/runtime';
+import { DataQuery } from '@grafana/schema';
 
 import { silenceConsoleOutput } from '../../../../test/core/utils/silenceConsoleOutput';
 
@@ -72,8 +74,8 @@ jest.mock('app/core/services/PreferencesService', () => ({
 jest.mock('react-virtualized-auto-sizer', () => {
   return {
     __esModule: true,
-    default(props: any) {
-      return <div>{props.children({ width: 1000 })}</div>;
+    default(props: Props) {
+      return <div>{props.children({ height: 1, scaledHeight: 1, scaledWidth: 1000, width: 1000 })}</div>;
     },
   };
 });
@@ -205,7 +207,6 @@ describe('Explore: Query History', () => {
     await waitForExplore();
     await openQueryHistory();
     await assertQueryHistory(['{"expr":"query #1"}'], 'left');
-
     await commentQueryHistory(0, 'test comment');
     await assertQueryHistoryComment(['test comment'], 'left');
   });
diff --git a/public/app/features/explore/spec/split.test.tsx b/public/app/features/explore/spec/split.test.tsx
index fc39d8eba9631..d31e02b486c97 100644
--- a/public/app/features/explore/spec/split.test.tsx
+++ b/public/app/features/explore/spec/split.test.tsx
@@ -25,7 +25,16 @@ jest.mock('react-virtualized-auto-sizer', () => {
   return {
     __esModule: true,
     default(props: ComponentProps<typeof AutoSizer>) {
-      return <div>{props.children({ width: 1000, height: 1000 })}</div>;
+      return (
+        <div>
+          {props.children({
+            width: 1000,
+            scaledWidth: 1000,
+            scaledHeight: 1000,
+            height: 1000,
+          })}
+        </div>
+      );
     },
   };
 });
diff --git a/public/app/features/explore/state/correlations.ts b/public/app/features/explore/state/correlations.ts
index 767f9becccb7d..3d8de1466fcc4 100644
--- a/public/app/features/explore/state/correlations.ts
+++ b/public/app/features/explore/state/correlations.ts
@@ -1,11 +1,12 @@
 import { Observable } from 'rxjs';
 
+import { DataLinkTransformationConfig } from '@grafana/data';
 import { getDataSourceSrv, reportInteraction } from '@grafana/runtime';
 import { notifyApp } from 'app/core/actions';
 import { createErrorNotification } from 'app/core/copy/appNotification';
 import { CreateCorrelationParams } from 'app/features/correlations/types';
 import { CorrelationData } from 'app/features/correlations/useCorrelations';
-import { getCorrelationsBySourceUIDs, createCorrelation } from 'app/features/correlations/utils';
+import { getCorrelationsBySourceUIDs, createCorrelation, generateDefaultLabel } from 'app/features/correlations/utils';
 import { store } from 'app/store/store';
 import { ThunkResult } from 'app/types';
 
@@ -50,7 +51,11 @@ function reloadCorrelations(exploreId: string): ThunkResult<Promise<void>> {
   };
 }
 
-export function saveCurrentCorrelation(label?: string, description?: string): ThunkResult<Promise<void>> {
+export function saveCurrentCorrelation(
+  label?: string,
+  description?: string,
+  transformations?: DataLinkTransformationConfig[]
+): ThunkResult<Promise<void>> {
   return async (dispatch, getState) => {
     const keys = Object.keys(getState().explore?.panes);
     const sourcePane = getState().explore?.panes[keys[0]];
@@ -74,12 +79,13 @@ export function saveCurrentCorrelation(label?: string, description?: string): Th
       const correlation: CreateCorrelationParams = {
         sourceUID: sourceDatasource.uid,
         targetUID: targetDatasource.uid,
-        label: label || `${sourceDatasource?.name} to ${targetDatasource.name}`,
+        label: label || (await generateDefaultLabel(sourcePane, targetPane)),
         description,
         config: {
           field: targetPane.correlationEditorHelperData.resultField,
           target: targetPane.queries[0],
           type: 'query',
+          transformations: transformations,
         },
       };
       await createCorrelation(sourceDatasource.uid, correlation)
diff --git a/public/app/features/explore/state/datasource.ts b/public/app/features/explore/state/datasource.ts
index f2585d4609e13..762aebe3ee8f5 100644
--- a/public/app/features/explore/state/datasource.ts
+++ b/public/app/features/explore/state/datasource.ts
@@ -7,7 +7,7 @@ import { DataSourceRef } from '@grafana/schema';
 import { RefreshPicker } from '@grafana/ui';
 import { stopQueryState } from 'app/core/utils/explore';
 import { getCorrelationsBySourceUIDs } from 'app/features/correlations/utils';
-import { ExploreItemState, ThunkResult } from 'app/types';
+import { ExploreItemState, createAsyncThunk } from 'app/types';
 
 import { loadSupplementaryQueries } from '../utils/supplementaryQueries';
 
@@ -39,12 +39,15 @@ export const updateDatasourceInstanceAction = createAction<UpdateDatasourceInsta
 /**
  * Loads a new datasource identified by the given name.
  */
-export function changeDatasource(
-  exploreId: string,
-  datasource: string | DataSourceRef,
-  options?: { importQueries: boolean }
-): ThunkResult<Promise<void>> {
-  return async (dispatch, getState) => {
+
+interface ChangeDatasourcePayload {
+  exploreId: string;
+  datasource: string | DataSourceRef;
+  options?: { importQueries: boolean };
+}
+export const changeDatasource = createAsyncThunk(
+  'explore/changeDatasource',
+  async ({ datasource, exploreId, options }: ChangeDatasourcePayload, { getState, dispatch }) => {
     const orgId = getState().user.orgId;
     const { history, instance } = await loadAndInitDatasource(orgId, datasource);
     const currentDataSourceInstance = getState().explore.panes[exploreId]!.datasourceInstance;
@@ -80,8 +83,8 @@ export function changeDatasource(
     if (options?.importQueries) {
       dispatch(runQueries({ exploreId }));
     }
-  };
-}
+  }
+);
 
 //
 // Reducer
diff --git a/public/app/features/explore/state/explorePane.ts b/public/app/features/explore/state/explorePane.ts
index d84551add5920..e6feeda299570 100644
--- a/public/app/features/explore/state/explorePane.ts
+++ b/public/app/features/explore/state/explorePane.ts
@@ -9,6 +9,7 @@ import {
   PreferredVisualisationType,
   RawTimeRange,
   ExploreCorrelationHelperData,
+  EventBusExtended,
 } from '@grafana/data';
 import { DataQuery, DataSourceRef } from '@grafana/schema';
 import { getQueryKeys } from 'app/core/utils/explore';
@@ -19,7 +20,6 @@ import { createAsyncThunk, ThunkResult } from 'app/types';
 import { ExploreItemState } from 'app/types/explore';
 
 import { datasourceReducer } from './datasource';
-import { historyReducer } from './history';
 import { richHistorySearchFiltersUpdatedAction, richHistoryUpdatedAction } from './main';
 import { queryReducer, runQueries } from './query';
 import { timeReducer, updateTime } from './time';
@@ -98,6 +98,7 @@ interface InitializeExplorePayload {
   range: TimeRange;
   history: HistoryItem[];
   datasourceInstance?: DataSourceApi;
+  eventBridge: EventBusExtended;
 }
 const initializeExploreAction = createAction<InitializeExplorePayload>('explore/initializeExploreAction');
 
@@ -128,6 +129,7 @@ export interface InitializeExploreOptions {
   panelsState?: ExplorePanelsState;
   correlationHelperData?: ExploreCorrelationHelperData;
   position?: number;
+  eventBridge: EventBusExtended;
 }
 /**
  * Initialize Explore state with state from the URL and the React component.
@@ -140,7 +142,15 @@ export interface InitializeExploreOptions {
 export const initializeExplore = createAsyncThunk(
   'explore/initializeExplore',
   async (
-    { exploreId, datasource, queries, range, panelsState, correlationHelperData }: InitializeExploreOptions,
+    {
+      exploreId,
+      datasource,
+      queries,
+      range,
+      panelsState,
+      correlationHelperData,
+      eventBridge,
+    }: InitializeExploreOptions,
     { dispatch, getState, fulfillWithValue }
   ) => {
     let instance = undefined;
@@ -160,6 +170,7 @@ export const initializeExplore = createAsyncThunk(
         range: getRange(range, getTimeZone(getState().user)),
         datasourceInstance: instance,
         history,
+        eventBridge,
       })
     );
     if (panelsState !== undefined) {
@@ -202,7 +213,6 @@ export const paneReducer = (state: ExploreItemState = makeExplorePaneState(), ac
   state = queryReducer(state, action);
   state = datasourceReducer(state, action);
   state = timeReducer(state, action);
-  state = historyReducer(state, action);
 
   if (richHistoryUpdatedAction.match(action)) {
     const { richHistory, total } = action.payload.richHistoryResults;
@@ -244,13 +254,14 @@ export const paneReducer = (state: ExploreItemState = makeExplorePaneState(), ac
   }
 
   if (initializeExploreAction.match(action)) {
-    const { queries, range, datasourceInstance, history } = action.payload;
+    const { queries, range, datasourceInstance, history, eventBridge } = action.payload;
 
     return {
       ...state,
       range,
       queries,
       initialized: true,
+      eventBridge,
       queryKeys: getQueryKeys(queries),
       datasourceInstance,
       history,
diff --git a/public/app/features/explore/state/helpers.ts b/public/app/features/explore/state/helpers.ts
index 1437bb0a84c9b..3d4ae375043fb 100644
--- a/public/app/features/explore/state/helpers.ts
+++ b/public/app/features/explore/state/helpers.ts
@@ -1,4 +1,5 @@
-import { DefaultTimeZone, TimeRange, toUtc, SupplementaryQueryType } from '@grafana/data';
+import { TimeRange, toUtc, SupplementaryQueryType } from '@grafana/data';
+import { defaultTimeZone } from '@grafana/schema';
 
 export const createDefaultInitialState = () => {
   const t = toUtc();
@@ -14,7 +15,7 @@ export const createDefaultInitialState = () => {
   const defaultInitialState = {
     user: {
       orgId: '1',
-      timeZone: DefaultTimeZone,
+      timeZone: defaultTimeZone,
     },
     explore: {
       panes: {
diff --git a/public/app/features/explore/state/history.ts b/public/app/features/explore/state/history.ts
index 8a02945ceb101..fa8348fd8dcd2 100644
--- a/public/app/features/explore/state/history.ts
+++ b/public/app/features/explore/state/history.ts
@@ -1,6 +1,3 @@
-import { AnyAction, createAction } from '@reduxjs/toolkit';
-
-import { HistoryItem } from '@grafana/data';
 import { DataQuery } from '@grafana/schema';
 import {
   addToRichHistory,
@@ -26,16 +23,6 @@ import {
 } from './main';
 import { selectPanesEntries } from './selectors';
 
-//
-// Actions and Payloads
-//
-
-export interface HistoryUpdatedPayload {
-  exploreId: string;
-  history: HistoryItem[];
-}
-export const historyUpdatedAction = createAction<HistoryUpdatedPayload>('explore/historyUpdated');
-
 //
 // Action creators
 //
@@ -74,25 +61,33 @@ const forEachExplorePane = (state: ExploreState, callback: (item: ExploreItemSta
 };
 
 export const addHistoryItem = (
+  localOverride: boolean,
   datasourceUid: string,
   datasourceName: string,
-  queries: DataQuery[]
+  queries: DataQuery[],
+  hideAllErrorsAndWarnings: boolean
 ): ThunkResult<void> => {
   return async (dispatch, getState) => {
-    const { richHistoryStorageFull, limitExceeded } = await addToRichHistory(
-      datasourceUid,
-      datasourceName,
+    const showNotif = hideAllErrorsAndWarnings
+      ? { quotaExceededError: false, limitExceededWarning: false, otherErrors: false }
+      : {
+          quotaExceededError: !getState().explore.richHistoryStorageFull,
+          limitExceededWarning: !getState().explore.richHistoryLimitExceededWarningShown,
+        };
+    const { richHistoryStorageFull, limitExceeded } = await addToRichHistory({
+      localOverride,
+      datasource: { uid: datasourceUid, name: datasourceName },
       queries,
-      false,
-      '',
-      !getState().explore.richHistoryStorageFull,
-      !getState().explore.richHistoryLimitExceededWarningShown
-    );
-    if (richHistoryStorageFull) {
-      dispatch(richHistoryStorageFullAction());
-    }
-    if (limitExceeded) {
-      dispatch(richHistoryLimitExceededAction());
+      starred: false,
+      showNotif,
+    });
+    if (!hideAllErrorsAndWarnings) {
+      if (richHistoryStorageFull) {
+        dispatch(richHistoryStorageFullAction());
+      }
+      if (limitExceeded) {
+        dispatch(richHistoryLimitExceededAction());
+      }
     }
   };
 };
@@ -199,13 +194,3 @@ export const updateHistorySearchFilters = (exploreId: string, filters: RichHisto
     }
   };
 };
-
-export const historyReducer = (state: ExploreItemState, action: AnyAction): ExploreItemState => {
-  if (historyUpdatedAction.match(action)) {
-    return {
-      ...state,
-      history: action.payload.history,
-    };
-  }
-  return state;
-};
diff --git a/public/app/features/explore/state/main.test.ts b/public/app/features/explore/state/main.test.ts
index 3a12dd5c66d55..7174bf4e5f4f4 100644
--- a/public/app/features/explore/state/main.test.ts
+++ b/public/app/features/explore/state/main.test.ts
@@ -12,6 +12,13 @@ import { ExploreItemState, ExploreState, StoreState, ThunkDispatch } from '../..
 
 import { exploreReducer, navigateToExplore, splitClose, splitOpen } from './main';
 
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getDataSourceSrv: () => ({
+    getInstanceSettings: jest.fn().mockReturnValue({}),
+  }),
+}));
+
 const getNavigateToExploreContext = async (openInNewWindow?: (url: string) => void) => {
   const url = '/explore';
   const panel: Partial<PanelModel> = {
@@ -53,6 +60,7 @@ describe('navigateToExplore', () => {
           queries: panel.targets,
           timeRange,
           dsRef: panel.datasource,
+          adhocFilters: [],
         });
       });
     });
@@ -73,6 +81,7 @@ describe('navigateToExplore', () => {
           queries: panel.targets,
           timeRange,
           dsRef: panel.datasource,
+          adhocFilters: [],
         });
       });
 
diff --git a/public/app/features/explore/state/main.ts b/public/app/features/explore/state/main.ts
index 3ed26f8e81621..7fb7f02622f5b 100644
--- a/public/app/features/explore/state/main.ts
+++ b/public/app/features/explore/state/main.ts
@@ -1,10 +1,12 @@
 import { createAction } from '@reduxjs/toolkit';
+import { isEqual } from 'lodash';
 import { AnyAction } from 'redux';
 
-import { SplitOpenOptions, TimeRange } from '@grafana/data';
+import { SplitOpenOptions, TimeRange, EventBusSrv } from '@grafana/data';
 import { locationService } from '@grafana/runtime';
 import { generateExploreId, GetExploreUrlArguments } from 'app/core/utils/explore';
 import { PanelModel } from 'app/features/dashboard/state';
+import { getTemplateSrv } from 'app/features/templating/template_srv';
 import { CorrelationEditorDetailsUpdate, ExploreItemState, ExploreState } from 'app/types/explore';
 
 import { RichHistoryResults } from '../../../core/history/RichHistoryStorage';
@@ -59,15 +61,16 @@ export const setPaneState = createAction<SetPaneStateActionPayload>('explore/set
 export const clearPanes = createAction('explore/clearPanes');
 
 /**
- * Ensure Explore doesn't exceed supported number of panes and initializes the new pane.
+ * Creates a new Explore pane.
+ * If 2 panes already exist, the last one (right) is closed before creating a new one.
  */
 export const splitOpen = createAsyncThunk(
   'explore/splitOpen',
-  async (options: SplitOpenOptions | undefined, { getState, dispatch, requestId }) => {
+  async (options: SplitOpenOptions | undefined, { getState, dispatch }) => {
     // we currently support showing only 2 panes in explore, so if this action is dispatched we know it has been dispatched from the "first" pane.
     const originState = Object.values(getState().explore.panes)[0];
 
-    const queries = options?.queries ?? (options?.query ? [options?.query] : originState?.queries || []);
+    const queries = options?.queries ?? originState?.queries ?? [];
 
     Object.keys(getState().explore.panes).forEach((paneId, index) => {
       // Only 2 panes are supported. Remove panes before create a new one.
@@ -76,19 +79,29 @@ export const splitOpen = createAsyncThunk(
       }
     });
 
+    const splitRange = options?.range || originState?.range.raw || DEFAULT_RANGE;
+
+    let newPaneId = generateExploreId();
+    // in case we have a duplicate id, generate a new one
+    while (getState().explore.panes[newPaneId]) {
+      newPaneId = generateExploreId();
+    }
+
     await dispatch(
       createNewSplitOpenPane({
-        exploreId: requestId,
+        exploreId: newPaneId,
         datasource: options?.datasourceUid || originState?.datasourceInstance?.getRef(),
         queries: withUniqueRefIds(queries),
-        range: options?.range || originState?.range.raw || DEFAULT_RANGE,
+        range: splitRange,
         panelsState: options?.panelsState || originState?.panelsState,
         correlationHelperData: options?.correlationHelperData,
+        eventBridge: new EventBusSrv(),
       })
     );
-  },
-  {
-    idGenerator: generateExploreId,
+
+    if (originState?.range) {
+      await dispatch(syncTimesAction({ syncedTimes: isEqual(originState.range.raw, splitRange) })); // if time ranges are equal, mark times as synced
+    }
   }
 );
 
@@ -130,6 +143,7 @@ export const navigateToExplore = (
       dsRef: panel.datasource,
       scopedVars: panel.scopedVars,
       timeRange,
+      adhocFilters: getTemplateSrv().getAdhocFilters(panel.datasource?.uid ?? '', true),
     });
 
     if (openInNewWindow && path) {
@@ -148,7 +162,7 @@ const initialExploreItemState = makeExplorePaneState();
 export const initialExploreState: ExploreState = {
   syncedTimes: false,
   panes: {},
-  correlationEditorDetails: { editorMode: false, dirty: false, isExiting: false },
+  correlationEditorDetails: { editorMode: false, correlationDirty: false, queryEditorDirty: false, isExiting: false },
   richHistoryStorageFull: false,
   richHistoryLimitExceededWarningShown: false,
   largerExploreId: undefined,
@@ -262,7 +276,17 @@ export const exploreReducer = (state = initialExploreState, action: AnyAction):
   }
 
   if (changeCorrelationEditorDetails.match(action)) {
-    const { editorMode, label, description, canSave, dirty, isExiting, postConfirmAction } = action.payload;
+    const {
+      editorMode,
+      label,
+      description,
+      canSave,
+      correlationDirty,
+      queryEditorDirty,
+      isExiting,
+      postConfirmAction,
+      transformations,
+    } = action.payload;
     return {
       ...state,
       correlationEditorDetails: {
@@ -270,7 +294,9 @@ export const exploreReducer = (state = initialExploreState, action: AnyAction):
         canSave: Boolean(canSave ?? state.correlationEditorDetails?.canSave),
         label: label ?? state.correlationEditorDetails?.label,
         description: description ?? state.correlationEditorDetails?.description,
-        dirty: Boolean(dirty ?? state.correlationEditorDetails?.dirty),
+        transformations: transformations ?? state.correlationEditorDetails?.transformations,
+        correlationDirty: Boolean(correlationDirty ?? state.correlationEditorDetails?.correlationDirty),
+        queryEditorDirty: Boolean(queryEditorDirty ?? state.correlationEditorDetails?.queryEditorDirty),
         isExiting: Boolean(isExiting ?? state.correlationEditorDetails?.isExiting),
         postConfirmAction,
       },
diff --git a/public/app/features/explore/state/query.test.ts b/public/app/features/explore/state/query.test.ts
index e9aca401bdde2..334270c8f681a 100644
--- a/public/app/features/explore/state/query.test.ts
+++ b/public/app/features/explore/state/query.test.ts
@@ -16,9 +16,12 @@ import {
   SupplementaryQueryType,
 } from '@grafana/data';
 import { DataQuery, DataSourceRef } from '@grafana/schema';
+import config from 'app/core/config';
+import { queryLogsSample, queryLogsVolume } from 'app/features/logs/logsModel';
 import { createAsyncThunk, ExploreItemState, StoreState, ThunkDispatch } from 'app/types';
 
 import { reducerTester } from '../../../../test/core/redux/reducerTester';
+import * as richHistory from '../../../core/utils/richHistory';
 import { configureStore } from '../../../store/configureStore';
 import { setTimeSrv, TimeSrv } from '../../dashboard/services/TimeSrv';
 import { makeLogs } from '../__mocks__/makeLogs';
@@ -49,6 +52,8 @@ import {
 import * as actions from './query';
 import { makeExplorePaneState } from './utils';
 
+jest.mock('app/features/logs/logsModel');
+
 const { testRange, defaultInitialState } = createDefaultInitialState();
 
 const exploreId = 'left';
@@ -152,6 +157,11 @@ describe('runQueries', () => {
     } as unknown as Partial<StoreState>);
   };
 
+  beforeEach(() => {
+    config.queryHistoryEnabled = false;
+    jest.clearAllMocks();
+  });
+
   it('should pass dataFrames to state even if there is error in response', async () => {
     const { dispatch, getState } = setupTests();
     setupQueryResponse(getState());
@@ -162,11 +172,11 @@ describe('runQueries', () => {
     expect(getState().explore.panes.left!.graphResult).toBeDefined();
   });
 
-  it('should modify the request-id for all supplementary queries', () => {
+  it('should modify the request-id for all supplementary queries', async () => {
     const { dispatch, getState } = setupTests();
     setupQueryResponse(getState());
     dispatch(saveCorrelationsAction({ exploreId: 'left', correlations: [] }));
-    dispatch(runQueries({ exploreId: 'left' }));
+    await dispatch(runQueries({ exploreId: 'left' }));
 
     const state = getState().explore.panes.left!;
     expect(state.queryResponse.request?.requestId).toBe('explore_left');
@@ -199,6 +209,24 @@ describe('runQueries', () => {
     await dispatch(saveCorrelationsAction({ exploreId: 'left', correlations: [] }));
     expect(getState().explore.panes.left!.graphResult).toBeDefined();
   });
+
+  it('should add history items to both local and remote storage with the flag enabled', async () => {
+    config.queryHistoryEnabled = true;
+    const { dispatch } = setupTests();
+    jest.spyOn(richHistory, 'addToRichHistory');
+    await dispatch(runQueries({ exploreId: 'left' }));
+    expect((richHistory.addToRichHistory as jest.Mock).mock.calls).toHaveLength(2);
+    expect((richHistory.addToRichHistory as jest.Mock).mock.calls[0][0].localOverride).toBeTruthy();
+    expect((richHistory.addToRichHistory as jest.Mock).mock.calls[1][0].localOverride).toBeFalsy();
+  });
+
+  it('should add history items to local storage only with the flag disabled', async () => {
+    const { dispatch } = setupTests();
+    jest.spyOn(richHistory, 'addToRichHistory');
+    await dispatch(runQueries({ exploreId: 'left' }));
+    expect((richHistory.addToRichHistory as jest.Mock).mock.calls).toHaveLength(1);
+    expect((richHistory.addToRichHistory as jest.Mock).mock.calls[0][0].localOverride).toBeTruthy();
+  });
 });
 
 describe('running queries', () => {
@@ -846,7 +874,7 @@ describe('reducer', () => {
     });
   });
 
-  describe('supplementary queries', () => {
+  describe('legacy supplementary queries', () => {
     let dispatch: ThunkDispatch,
       getState: () => StoreState,
       unsubscribes: Function[],
@@ -878,7 +906,7 @@ describe('reducer', () => {
                 meta: {
                   id: 'something',
                 },
-                getDataProvider: () => {
+                getDataProvider: (_: SupplementaryQueryType, request: DataQueryRequest<DataQuery>) => {
                   return mockDataProvider();
                 },
                 getSupportedSupplementaryQueryTypes: () => [
@@ -898,8 +926,69 @@ describe('reducer', () => {
       setupQueryResponse(getState());
     });
 
+    it('should load supplementary queries after running the query', async () => {
+      await dispatch(runQueries({ exploreId: 'left' }));
+      expect(unsubscribes).toHaveLength(2);
+    });
+  });
+
+  describe('supplementary queries', () => {
+    let dispatch: ThunkDispatch,
+      getState: () => StoreState,
+      unsubscribes: Function[],
+      mockDataProvider: () => Observable<DataQueryResponse>;
+
+    beforeEach(() => {
+      unsubscribes = [];
+      mockDataProvider = () => {
+        return {
+          subscribe: () => {
+            const unsubscribe = jest.fn();
+            unsubscribes.push(unsubscribe);
+            return {
+              unsubscribe,
+            };
+          },
+        } as unknown as Observable<DataQueryResponse>;
+      };
+
+      jest.mocked(queryLogsVolume).mockImplementation(() => mockDataProvider());
+      jest.mocked(queryLogsSample).mockImplementation(() => mockDataProvider());
+
+      const store: { dispatch: ThunkDispatch; getState: () => StoreState } = configureStore({
+        ...defaultInitialState,
+        explore: {
+          panes: {
+            left: {
+              ...defaultInitialState.explore.panes.left,
+              datasourceInstance: {
+                query: jest.fn(),
+                getRef: jest.fn(),
+                meta: {
+                  id: 'something',
+                },
+                getSupplementaryRequest: (_: SupplementaryQueryType, request: DataQueryRequest<DataQuery>) => {
+                  return request;
+                },
+                getSupportedSupplementaryQueryTypes: () => [
+                  SupplementaryQueryType.LogsVolume,
+                  SupplementaryQueryType.LogsSample,
+                ],
+                getSupplementaryQuery: jest.fn(),
+              },
+            },
+          },
+        },
+      } as unknown as Partial<StoreState>);
+
+      dispatch = store.dispatch;
+      getState = store.getState;
+
+      setupQueryResponse(getState());
+    });
+
     it('should cancel any unfinished supplementary queries when a new query is run', async () => {
-      dispatch(runQueries({ exploreId: 'left' }));
+      await dispatch(runQueries({ exploreId: 'left' }));
       // first query is run automatically
       // loading in progress - subscriptions for both supplementary queries are created, not cleaned up yet
       expect(unsubscribes).toHaveLength(2);
@@ -907,7 +996,7 @@ describe('reducer', () => {
       expect(unsubscribes[1]).not.toBeCalled();
 
       setupQueryResponse(getState());
-      dispatch(runQueries({ exploreId: 'left' }));
+      await dispatch(runQueries({ exploreId: 'left' }));
       // a new query is run while supplementary queries are not resolve yet...
       expect(unsubscribes[0]).toBeCalled();
       expect(unsubscribes[1]).toBeCalled();
@@ -917,8 +1006,8 @@ describe('reducer', () => {
       expect(unsubscribes[3]).not.toBeCalled();
     });
 
-    it('should cancel all supported supplementary queries when the main query is canceled', () => {
-      dispatch(runQueries({ exploreId: 'left' }));
+    it('should cancel all supported supplementary queries when the main query is canceled', async () => {
+      await dispatch(runQueries({ exploreId: 'left' }));
       expect(unsubscribes).toHaveLength(2);
       expect(unsubscribes[0]).not.toBeCalled();
       expect(unsubscribes[1]).not.toBeCalled();
@@ -934,16 +1023,16 @@ describe('reducer', () => {
       }
     });
 
-    it('should load supplementary queries after running the query', () => {
-      dispatch(runQueries({ exploreId: 'left' }));
+    it('should load supplementary queries after running the query', async () => {
+      await dispatch(runQueries({ exploreId: 'left' }));
       expect(unsubscribes).toHaveLength(2);
     });
 
-    it('should clean any incomplete supplementary queries data when main query is canceled', () => {
+    it('should clean any incomplete supplementary queries data when main query is canceled', async () => {
       mockDataProvider = () => {
         return of({ state: LoadingState.Loading, error: undefined, data: [] });
       };
-      dispatch(runQueries({ exploreId: 'left' }));
+      await dispatch(runQueries({ exploreId: 'left' }));
 
       for (const type of supplementaryQueryTypes) {
         expect(getState().explore.panes.left!.supplementaryQueries[type].data).toBeDefined();
@@ -970,7 +1059,7 @@ describe('reducer', () => {
           { state: LoadingState.Done, error: undefined, data: [{}] }
         );
       };
-      dispatch(runQueries({ exploreId: 'left' }));
+      await dispatch(runQueries({ exploreId: 'left' }));
 
       for (const types of supplementaryQueryTypes) {
         expect(getState().explore.panes.left!.supplementaryQueries[types].data).toBeDefined();
@@ -987,7 +1076,7 @@ describe('reducer', () => {
       }
     });
 
-    it('do not load disabled supplementary query data', () => {
+    it('do not load disabled supplementary query data', async () => {
       mockDataProvider = () => {
         return of({ state: LoadingState.Done, error: undefined, data: [{}] });
       };
@@ -999,7 +1088,7 @@ describe('reducer', () => {
       expect(getState().explore.panes.left!.supplementaryQueries[SupplementaryQueryType.LogsSample].enabled).toBe(true);
 
       // verify that if we run a query, it will: 1) not do logs volume, 2) do logs sample 3) provider will still be set for both
-      dispatch(runQueries({ exploreId: 'left' }));
+      await dispatch(runQueries({ exploreId: 'left' }));
 
       expect(
         getState().explore.panes.left!.supplementaryQueries[SupplementaryQueryType.LogsVolume].data
@@ -1026,7 +1115,7 @@ describe('reducer', () => {
       dispatch(setSupplementaryQueryEnabled('left', false, SupplementaryQueryType.LogsSample));
 
       // runQueries sets up providers, but does not run queries
-      dispatch(runQueries({ exploreId: 'left' }));
+      await dispatch(runQueries({ exploreId: 'left' }));
       expect(
         getState().explore.panes.left!.supplementaryQueries[SupplementaryQueryType.LogsVolume].dataProvider
       ).toBeDefined();
diff --git a/public/app/features/explore/state/query.ts b/public/app/features/explore/state/query.ts
index 846ff575ab151..320f1b47108bc 100644
--- a/public/app/features/explore/state/query.ts
+++ b/public/app/features/explore/state/query.ts
@@ -10,9 +10,9 @@ import {
   DataQueryErrorType,
   DataQueryResponse,
   DataSourceApi,
+  dateTimeForTimeZone,
   hasQueryExportSupport,
   hasQueryImportSupport,
-  HistoryItem,
   LoadingState,
   LogsVolumeType,
   PanelEvents,
@@ -21,21 +21,25 @@ import {
   SupplementaryQueryType,
   toLegacyResponseData,
 } from '@grafana/data';
+import { combinePanelData } from '@grafana/o11y-ds-frontend';
 import { config, getDataSourceSrv, reportInteraction } from '@grafana/runtime';
 import { DataQuery } from '@grafana/schema';
+import store from 'app/core/store';
 import {
   buildQueryTransaction,
   ensureQueries,
   generateEmptyQuery,
   generateNewKeyAndAddRefIdIfMissing,
   getQueryKeys,
+  getTimeRange,
   hasNonEmptyQuery,
   stopQueryState,
-  updateHistory,
 } from 'app/core/utils/explore';
 import { getShiftedTimeRange } from 'app/core/utils/timePicker';
 import { getCorrelationsBySourceUIDs } from 'app/features/correlations/utils';
-import { getTimeZone } from 'app/features/profile/state/selectors';
+import { infiniteScrollRefId } from 'app/features/logs/logsModel';
+import { getFiscalYearStartMonth, getTimeZone } from 'app/features/profile/state/selectors';
+import { SupportingQueryType } from 'app/plugins/datasource/loki/types';
 import { MIXED_DATASOURCE_NAME } from 'app/plugins/datasource/mixed/MixedDataSource';
 import {
   createAsyncThunk,
@@ -51,6 +55,7 @@ import { ExploreState, QueryOptions, SupplementaryQueries } from 'app/types/expl
 import { notifyApp } from '../../../core/actions';
 import { createErrorNotification } from '../../../core/copy/appNotification';
 import { runRequest } from '../../query/state/runRequest';
+import { visualisationTypeKey } from '../Logs/utils/logs';
 import { decorateData } from '../utils/decorators';
 import {
   getSupplementaryQueryProvider,
@@ -60,10 +65,16 @@ import {
 
 import { getCorrelations } from './correlations';
 import { saveCorrelationsAction } from './explorePane';
-import { addHistoryItem, historyUpdatedAction, loadRichHistory } from './history';
+import { addHistoryItem, loadRichHistory } from './history';
 import { changeCorrelationEditorDetails } from './main';
 import { updateTime } from './time';
-import { createCacheKey, filterLogRowsByIndex, getDatasourceUIDs, getResultsFromCache } from './utils';
+import {
+  createCacheKey,
+  filterLogRowsByIndex,
+  getCorrelationsData,
+  getDatasourceUIDs,
+  getResultsFromCache,
+} from './utils';
 
 /**
  * Derives from explore state if a given Explore pane is waiting for more data to be received
@@ -324,8 +335,8 @@ export const changeQueries = createAsyncThunk<void, ChangeQueriesPayload>(
     const isCorrelationsEditorMode = correlationDetails?.editorMode || false;
     const isLeftPane = Object.keys(getState().explore.panes)[0] === exploreId;
 
-    if (!isLeftPane && isCorrelationsEditorMode && !correlationDetails?.dirty) {
-      dispatch(changeCorrelationEditorDetails({ dirty: true }));
+    if (!isLeftPane && isCorrelationsEditorMode && !correlationDetails?.queryEditorDirty) {
+      dispatch(changeCorrelationEditorDetails({ queryEditorDirty: true }));
     }
 
     for (const newQuery of queries) {
@@ -468,16 +479,18 @@ export function modifyQueries(
 async function handleHistory(
   dispatch: ThunkDispatch,
   state: ExploreState,
-  history: Array<HistoryItem<DataQuery>>,
   datasource: DataSourceApi,
-  queries: DataQuery[],
-  exploreId: string
+  queries: DataQuery[]
 ) {
-  const datasourceId = datasource.meta.id;
-  const nextHistory = updateHistory(history, datasourceId, queries);
-  dispatch(historyUpdatedAction({ exploreId, history: nextHistory }));
-
-  dispatch(addHistoryItem(datasource.uid, datasource.name, queries));
+  /*
+  Always write to local storage. If query history is enabled, we will use local storage for autocomplete only (and want to hide errors)
+  If query history is disabled, we will use local storage for query history as well, and will want to show errors
+  */
+  dispatch(addHistoryItem(true, datasource.uid, datasource.name, queries, config.queryHistoryEnabled));
+  if (config.queryHistoryEnabled) {
+    // write to remote if flag enabled
+    dispatch(addHistoryItem(false, datasource.uid, datasource.name, queries, false));
+  }
 
   // Because filtering happens in the backend we cannot add a new entry without checking if it matches currently
   // used filters. Instead, we refresh the query history list.
@@ -499,17 +512,21 @@ export const runQueries = createAsyncThunk<void, RunQueriesOptions>(
   async ({ exploreId, preserveCache }, { dispatch, getState }) => {
     dispatch(cancelQueries(exploreId));
 
-    dispatch(updateTime({ exploreId }));
-
+    const { defaultCorrelationEditorDatasource, scopedVars, showCorrelationEditorLinks } = await getCorrelationsData(
+      getState(),
+      exploreId
+    );
     const correlations$ = getCorrelations(exploreId);
 
+    dispatch(updateTime({ exploreId }));
+
     // We always want to clear cache unless we explicitly pass preserveCache parameter
     if (preserveCache !== true) {
       dispatch(clearCache(exploreId));
     }
 
-    const exploreItemState = getState().explore.panes[exploreId]!;
-
+    const exploreState = getState();
+    const exploreItemState = exploreState.explore.panes[exploreId]!;
     const {
       datasourceInstance,
       containerWidth,
@@ -522,14 +539,8 @@ export const runQueries = createAsyncThunk<void, RunQueriesOptions>(
       absoluteRange,
       cache,
       supplementaryQueries,
-      correlationEditorHelperData,
     } = exploreItemState;
-    const isCorrelationEditorMode = getState().explore.correlationEditorDetails?.editorMode || false;
-    const isLeftPane = Object.keys(getState().explore.panes)[0] === exploreId;
-    const showCorrelationEditorLinks = isCorrelationEditorMode && isLeftPane;
-    const defaultCorrelationEditorDatasource = showCorrelationEditorLinks ? await getDataSourceSrv().get() : undefined;
-    const interpolateCorrelationHelperVars =
-      isCorrelationEditorMode && !isLeftPane && correlationEditorHelperData !== undefined;
+
     let newQuerySource: Observable<ExplorePanelData>;
     let newQuerySubscription: SubscriptionLike;
 
@@ -539,7 +550,7 @@ export const runQueries = createAsyncThunk<void, RunQueriesOptions>(
     }));
 
     if (datasourceInstance != null) {
-      handleHistory(dispatch, getState().explore, exploreItemState.history, datasourceInstance, queries, exploreId);
+      handleHistory(dispatch, getState().explore, datasourceInstance, queries);
     }
 
     const cachedValue = getResultsFromCache(cache, absoluteRange);
@@ -589,13 +600,6 @@ export const runQueries = createAsyncThunk<void, RunQueriesOptions>(
         liveStreaming: live,
       };
 
-      let scopedVars: ScopedVars = {};
-      if (interpolateCorrelationHelperVars && correlationEditorHelperData !== undefined) {
-        Object.entries(correlationEditorHelperData?.vars).forEach((variable) => {
-          scopedVars[variable[0]] = { value: variable[1] };
-        });
-      }
-
       const timeZone = getTimeZone(getState().user);
       const transaction = buildQueryTransaction(
         exploreId,
@@ -633,17 +637,21 @@ export const runQueries = createAsyncThunk<void, RunQueriesOptions>(
 
       newQuerySubscription = newQuerySource.subscribe({
         next(data) {
+          const exploreState = getState().explore.panes[exploreId];
           if (data.logsResult !== null && data.state === LoadingState.Done) {
             reportInteraction('grafana_explore_logs_result_displayed', {
               datasourceType: datasourceInstance.type,
+              visualisationType:
+                exploreState?.panelsState?.logs?.visualisationType ?? store.get(visualisationTypeKey) ?? 'N/A',
+              length: data.logsResult.rows.length,
             });
           }
           dispatch(queryStreamUpdatedAction({ exploreId, response: data }));
 
           // Keep scanning for results if this was the last scanning transaction
-          if (getState().explore.panes[exploreId]!.scanning) {
+          if (exploreState!.scanning) {
             if (data.state === LoadingState.Done && data.series.length === 0) {
-              const range = getShiftedTimeRange(-1, getState().explore.panes[exploreId]!.range);
+              const range = getShiftedTimeRange(-1, exploreState!.range);
               dispatch(updateTime({ exploreId, absoluteRange: range }));
               dispatch(runQueries({ exploreId }));
             } else {
@@ -696,6 +704,97 @@ export const runQueries = createAsyncThunk<void, RunQueriesOptions>(
   }
 );
 
+interface RunLoadMoreLogsQueriesOptions {
+  exploreId: string;
+  absoluteRange: AbsoluteTimeRange;
+}
+/**
+ * Dedicated action to run log queries requesting more results.
+ */
+export const runLoadMoreLogsQueries = createAsyncThunk<void, RunLoadMoreLogsQueriesOptions>(
+  'explore/runLoadMoreQueries',
+  async ({ exploreId, absoluteRange }, { dispatch, getState }) => {
+    dispatch(cancelQueries(exploreId));
+
+    const { datasourceInstance, containerWidth, queryResponse } = getState().explore.panes[exploreId]!;
+    const { defaultCorrelationEditorDatasource, scopedVars, showCorrelationEditorLinks } = await getCorrelationsData(
+      getState(),
+      exploreId
+    );
+    const correlations$ = getCorrelations(exploreId);
+
+    let newQuerySource: Observable<ExplorePanelData>;
+
+    const queries = queryResponse.logsResult?.queries || [];
+    const logRefIds = queryResponse.logsFrames.map((frame) => frame.refId);
+    const logQueries = queries
+      .filter((query) => logRefIds.includes(query.refId))
+      .map((query: DataQuery) => ({
+        ...query,
+        datasource: query.datasource || datasourceInstance?.getRef(),
+        refId: `${infiniteScrollRefId}${query.refId}`,
+        supportingQueryType: SupportingQueryType.InfiniteScroll,
+      }));
+
+    if (!hasNonEmptyQuery(logQueries) || !datasourceInstance) {
+      return;
+    }
+
+    const queryOptions: QueryOptions = {
+      minInterval: datasourceInstance?.interval,
+      maxDataPoints: containerWidth,
+    };
+
+    const timeZone = getTimeZone(getState().user);
+    const range = getTimeRange(
+      timeZone,
+      {
+        from: dateTimeForTimeZone(timeZone, absoluteRange.from),
+        to: dateTimeForTimeZone(timeZone, absoluteRange.to),
+      },
+      getFiscalYearStartMonth(getState().user)
+    );
+    const transaction = buildQueryTransaction(exploreId, logQueries, queryOptions, range, false, timeZone, scopedVars);
+
+    dispatch(changeLoadingStateAction({ exploreId, loadingState: LoadingState.Loading }));
+
+    newQuerySource = combineLatest([runRequest(datasourceInstance, transaction.request), correlations$]).pipe(
+      mergeMap(([data, correlations]) => {
+        // For query splitting, otherwise duplicates results
+        if (data.state !== LoadingState.Done) {
+          // While loading, return the previous response and override state, otherwise it's set to Done
+          return of({ ...queryResponse, state: LoadingState.Loading });
+        }
+        return decorateData(
+          // This shouldn't be needed after https://github.com/grafana/grafana/issues/57327 is fixed
+          combinePanelData(queryResponse, data),
+          queryResponse,
+          absoluteRange,
+          undefined,
+          logQueries,
+          correlations,
+          showCorrelationEditorLinks,
+          defaultCorrelationEditorDatasource
+        );
+      })
+    );
+
+    newQuerySource.subscribe({
+      next(data) {
+        dispatch(queryStreamUpdatedAction({ exploreId, response: data }));
+      },
+      error(error) {
+        dispatch(notifyApp(createErrorNotification('Query processing error', error)));
+        dispatch(changeLoadingStateAction({ exploreId, loadingState: LoadingState.Error }));
+        console.error(error);
+      },
+      complete() {
+        dispatch(changeLoadingStateAction({ exploreId, loadingState: LoadingState.Done }));
+      },
+    });
+  }
+);
+
 const groupDataQueries = async (datasources: DataQuery[], scopedVars: ScopedVars) => {
   const nonMixedDataSources = datasources.filter((t) => {
     return t.datasource?.uid !== MIXED_DATASOURCE_NAME;
diff --git a/public/app/features/explore/state/selectors.ts b/public/app/features/explore/state/selectors.ts
index b6043f62df0a9..a836e1742703e 100644
--- a/public/app/features/explore/state/selectors.ts
+++ b/public/app/features/explore/state/selectors.ts
@@ -11,6 +11,9 @@ export const selectPanesEntries = createSelector<
 >(selectPanes, Object.entries);
 
 export const isSplit = createSelector(selectPanesEntries, (panes) => panes.length > 1);
+export const selectIsHelperShowing = createSelector(selectPanesEntries, (panes) =>
+  panes.some((pane) => pane[1].correlationEditorHelperData !== undefined)
+);
 
 export const isLeftPaneSelector = (exploreId: string) =>
   createSelector(selectPanes, (panes) => {
diff --git a/public/app/features/explore/state/time.ts b/public/app/features/explore/state/time.ts
index ddffb459ac86c..38683f45bf43c 100644
--- a/public/app/features/explore/state/time.ts
+++ b/public/app/features/explore/state/time.ts
@@ -1,17 +1,26 @@
 import { AnyAction, createAction } from '@reduxjs/toolkit';
 
-import { AbsoluteTimeRange, dateTimeForTimeZone, LoadingState, RawTimeRange, TimeRange } from '@grafana/data';
+import {
+  AbsoluteTimeRange,
+  AppEvents,
+  dateTimeForTimeZone,
+  LoadingState,
+  RawTimeRange,
+  TimeRange,
+} from '@grafana/data';
 import { getTemplateSrv } from '@grafana/runtime';
 import { RefreshPicker } from '@grafana/ui';
+import { t } from '@grafana/ui/src/utils/i18n';
+import appEvents from 'app/core/app_events';
 import { getTimeRange, refreshIntervalToSortOrder, stopQueryState } from 'app/core/utils/explore';
-import { getShiftedTimeRange, getZoomedTimeRange } from 'app/core/utils/timePicker';
+import { getCopiedTimeRange, getShiftedTimeRange, getZoomedTimeRange } from 'app/core/utils/timePicker';
 import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { sortLogsResult } from 'app/features/logs/utils';
 import { getFiscalYearStartMonth, getTimeZone } from 'app/features/profile/state/selectors';
 import { ExploreItemState, ThunkDispatch, ThunkResult } from 'app/types';
 
 import { syncTimesAction } from './main';
-import { runQueries } from './query';
+import { runLoadMoreLogsQueries, runQueries } from './query';
 
 //
 // Actions and Payloads
@@ -54,6 +63,12 @@ export const updateTimeRange = (options: {
   };
 };
 
+export const loadMoreLogs = (options: { exploreId: string; absoluteRange: AbsoluteTimeRange }): ThunkResult<void> => {
+  return (dispatch) => {
+    dispatch(runLoadMoreLogsQueries({ ...options }));
+  };
+};
+
 export const updateTime = (config: {
   exploreId: string;
   rawRange?: RawTimeRange;
@@ -160,6 +175,41 @@ export function zoomOut(scale: number): ThunkResult<void> {
   });
 }
 
+export function copyTimeRangeToClipboard(): ThunkResult<void> {
+  return (dispatch, getState) => {
+    const range = getState().explore.panes[Object.keys(getState().explore.panes)[0]]!.range.raw;
+    navigator.clipboard.writeText(JSON.stringify(range));
+
+    appEvents.emit(AppEvents.alertSuccess, [
+      t('time-picker.copy-paste.copy-success-message', 'Time range copied to clipboard'),
+    ]);
+  };
+}
+
+export function pasteTimeRangeFromClipboard(): ThunkResult<void> {
+  return async (dispatch, getState) => {
+    const { range, isError } = await getCopiedTimeRange();
+
+    if (isError === true) {
+      appEvents.emit(AppEvents.alertError, [
+        t('time-picker.copy-paste.default-error-title', 'Invalid time range'),
+        t('time-picker.copy-paste.default-error-message', `{{error}} is not a valid time range`, { error: range }),
+      ]);
+      return;
+    }
+
+    const panesSynced = getState().explore.syncedTimes;
+
+    if (panesSynced) {
+      dispatch(updateTimeRange({ exploreId: Object.keys(getState().explore.panes)[0], rawRange: range }));
+      dispatch(updateTimeRange({ exploreId: Object.keys(getState().explore.panes)[1], rawRange: range }));
+      return;
+    }
+
+    dispatch(updateTimeRange({ exploreId: Object.keys(getState().explore.panes)[0], rawRange: range }));
+  };
+}
+
 /**
  * Reducer for an Explore area, to be used by the global Explore reducer.
  */
diff --git a/public/app/features/explore/state/utils.test.ts b/public/app/features/explore/state/utils.test.ts
index e58c1fe4b43cb..e044c64728797 100644
--- a/public/app/features/explore/state/utils.test.ts
+++ b/public/app/features/explore/state/utils.test.ts
@@ -1,6 +1,9 @@
 import { dateTime } from '@grafana/data';
+import { getLocalRichHistoryStorage } from 'app/core/history/richHistoryStorageProvider';
 import * as exploreUtils from 'app/core/utils/explore';
 
+import { loadAndInitDatasource, getRange, fromURLRange, MAX_HISTORY_AUTOCOMPLETE_ITEMS } from './utils';
+
 const dataSourceMock = {
   get: jest.fn(),
 };
@@ -8,7 +11,15 @@ jest.mock('app/features/plugins/datasource_srv', () => ({
   getDatasourceSrv: jest.fn(() => dataSourceMock),
 }));
 
-import { loadAndInitDatasource, getRange, fromURLRange } from './utils';
+const mockLocalDataStorage = {
+  getRichHistory: jest.fn(),
+};
+
+jest.mock('app/core/history/richHistoryStorageProvider', () => ({
+  getLocalRichHistoryStorage: jest.fn(() => {
+    return mockLocalDataStorage;
+  }),
+}));
 
 const DEFAULT_DATASOURCE = { uid: 'abc123', name: 'Default' };
 const TEST_DATASOURCE = { uid: 'def789', name: 'Test' };
@@ -28,6 +39,7 @@ describe('loadAndInitDatasource', () => {
     setLastUsedDatasourceUIDSpy = jest.spyOn(exploreUtils, 'setLastUsedDatasourceUID');
     dataSourceMock.get.mockRejectedValueOnce(new Error('Datasource not found'));
     dataSourceMock.get.mockResolvedValue(DEFAULT_DATASOURCE);
+    mockLocalDataStorage.getRichHistory.mockResolvedValue({ total: 0, richHistory: [] });
 
     const { instance } = await loadAndInitDatasource(1, { uid: 'Unknown' });
 
@@ -41,14 +53,111 @@ describe('loadAndInitDatasource', () => {
   it('saves last loaded data source uid', async () => {
     setLastUsedDatasourceUIDSpy = jest.spyOn(exploreUtils, 'setLastUsedDatasourceUID');
     dataSourceMock.get.mockResolvedValue(TEST_DATASOURCE);
+    mockLocalDataStorage.getRichHistory.mockResolvedValue({
+      total: 0,
+      richHistory: [],
+    });
 
     const { instance } = await loadAndInitDatasource(1, { uid: 'Test' });
 
-    expect(dataSourceMock.get).toBeCalledTimes(1);
-    expect(dataSourceMock.get).toBeCalledWith({ uid: 'Test' });
+    expect(dataSourceMock.get).toHaveBeenCalledTimes(1);
+    expect(dataSourceMock.get).toHaveBeenCalledWith({ uid: 'Test' });
+    expect(getLocalRichHistoryStorage).toHaveBeenCalledTimes(1);
+
     expect(instance).toMatchObject(TEST_DATASOURCE);
     expect(setLastUsedDatasourceUIDSpy).toBeCalledWith(1, TEST_DATASOURCE.uid);
   });
+
+  it('pulls history data and returns the history by query', async () => {
+    setLastUsedDatasourceUIDSpy = jest.spyOn(exploreUtils, 'setLastUsedDatasourceUID');
+    dataSourceMock.get.mockResolvedValue(TEST_DATASOURCE);
+    mockLocalDataStorage.getRichHistory.mockResolvedValueOnce({
+      total: 1,
+      richHistory: [
+        {
+          id: '0',
+          createdAt: 0,
+          datasourceUid: 'Test',
+          datasourceName: 'Test',
+          starred: false,
+          comment: '',
+          queries: [{ refId: 'A' }, { refId: 'B' }],
+        },
+      ],
+    });
+
+    const { history } = await loadAndInitDatasource(1, { uid: 'Test' });
+    expect(getLocalRichHistoryStorage).toHaveBeenCalledTimes(1);
+    expect(history.length).toEqual(2);
+  });
+
+  it('pulls history data and returns the history by query with Mixed results', async () => {
+    setLastUsedDatasourceUIDSpy = jest.spyOn(exploreUtils, 'setLastUsedDatasourceUID');
+    dataSourceMock.get.mockResolvedValue(TEST_DATASOURCE);
+    mockLocalDataStorage.getRichHistory.mockResolvedValueOnce({
+      total: 1,
+      richHistory: [
+        {
+          id: '0',
+          createdAt: 0,
+          datasourceUid: 'Test',
+          datasourceName: 'Test',
+          starred: false,
+          comment: '',
+          queries: [{ refId: 'A' }, { refId: 'B' }],
+        },
+      ],
+    });
+
+    mockLocalDataStorage.getRichHistory.mockResolvedValueOnce({
+      total: 1,
+      richHistory: [
+        {
+          id: '0',
+          createdAt: 0,
+          datasourceUid: 'Mixed',
+          datasourceName: 'Mixed',
+          starred: false,
+          comment: '',
+          queries: [
+            { refId: 'A', datasource: { uid: 'def789' } },
+            { refId: 'B', datasource: { uid: 'def789' } },
+          ],
+        },
+      ],
+    });
+
+    const { history } = await loadAndInitDatasource(1, { uid: 'Test' });
+    expect(getLocalRichHistoryStorage).toHaveBeenCalledTimes(1);
+    expect(history.length).toEqual(4);
+  });
+
+  it('pulls history data and returns only a max of MAX_HISTORY_AUTOCOMPLETE_ITEMS items', async () => {
+    const queryList = [...Array(MAX_HISTORY_AUTOCOMPLETE_ITEMS + 50).keys()].map((i) => {
+      return { refId: `ref-${i}` };
+    });
+
+    setLastUsedDatasourceUIDSpy = jest.spyOn(exploreUtils, 'setLastUsedDatasourceUID');
+    dataSourceMock.get.mockResolvedValue(TEST_DATASOURCE);
+    mockLocalDataStorage.getRichHistory.mockResolvedValueOnce({
+      total: 1,
+      richHistory: [
+        {
+          id: '0',
+          createdAt: 0,
+          datasourceUid: 'Test',
+          datasourceName: 'Test',
+          starred: false,
+          comment: '',
+          queries: queryList,
+        },
+      ],
+    });
+
+    const { history } = await loadAndInitDatasource(1, { uid: 'Test' });
+    expect(getLocalRichHistoryStorage).toHaveBeenCalledTimes(1);
+    expect(history.length).toEqual(MAX_HISTORY_AUTOCOMPLETE_ITEMS);
+  });
 });
 
 describe('getRange', () => {
diff --git a/public/app/features/explore/state/utils.ts b/public/app/features/explore/state/utils.ts
index db1d0d28f485d..0918049c03e3e 100644
--- a/public/app/features/explore/state/utils.ts
+++ b/public/app/features/explore/state/utils.ts
@@ -13,24 +13,30 @@ import {
   LogRowModel,
   PanelData,
   RawTimeRange,
+  ScopedVars,
   TimeFragment,
   TimeRange,
   toUtc,
   URLRange,
   URLRangeValue,
 } from '@grafana/data';
-import { DataQuery, DataSourceRef, TimeZone } from '@grafana/schema';
+import { getDataSourceSrv } from '@grafana/runtime';
+import { DataQuery, DataSourceJsonData, DataSourceRef, TimeZone } from '@grafana/schema';
+import { getLocalRichHistoryStorage } from 'app/core/history/richHistoryStorageProvider';
+import { SortOrder } from 'app/core/utils/richHistory';
 import { MIXED_DATASOURCE_NAME } from 'app/plugins/datasource/mixed/MixedDataSource';
-import { ExplorePanelData } from 'app/types';
-import { ExploreItemState } from 'app/types/explore';
+import { ExplorePanelData, StoreState } from 'app/types';
+import { ExploreItemState, RichHistoryQuery } from 'app/types/explore';
 
 import store from '../../../core/store';
 import { setLastUsedDatasourceUID } from '../../../core/utils/explore';
 import { getDatasourceSrv } from '../../plugins/datasource_srv';
 import { loadSupplementaryQueries } from '../utils/supplementaryQueries';
 
+export const MAX_HISTORY_AUTOCOMPLETE_ITEMS = 100;
+
 export const DEFAULT_RANGE = {
-  from: 'now-6h',
+  from: 'now-1h',
   to: 'now',
 };
 
@@ -98,7 +104,7 @@ export async function loadAndInitDatasource(
   orgId: number,
   datasource: DataSourceRef | string
 ): Promise<{ history: HistoryItem[]; instance: DataSourceApi }> {
-  let instance;
+  let instance: DataSourceApi<DataQuery, DataSourceJsonData, {}>;
   try {
     // let datasource be a ref if we have the info, otherwise a name or uid will do for lookup
     instance = await getDatasourceSrv().get(datasource);
@@ -117,12 +123,60 @@ export async function loadAndInitDatasource(
     }
   }
 
-  const historyKey = `grafana.explore.history.${instance.meta?.id}`;
-  const history = store.getObject<HistoryItem[]>(historyKey, []);
-  // Save last-used datasource
+  let history: HistoryItem[] = [];
+
+  const localStorageHistory = getLocalRichHistoryStorage();
+
+  const historyResults = await localStorageHistory.getRichHistory({
+    search: '',
+    sortOrder: SortOrder.Ascending,
+    datasourceFilters: [instance.name],
+    starred: false,
+  });
+
+  // first, fill autocomplete with query history for that datasource
+  if ((historyResults.total || 0) > 0) {
+    historyResults.richHistory.forEach((historyResult: RichHistoryQuery) => {
+      historyResult.queries.forEach((q) => {
+        history.push({ ts: parseInt(historyResult.id, 10), query: q });
+      });
+    });
+  }
 
+  if (history.length < MAX_HISTORY_AUTOCOMPLETE_ITEMS) {
+    // check the last 100 mixed history results seperately
+    const historyMixedResults = await localStorageHistory.getRichHistory({
+      search: '',
+      sortOrder: SortOrder.Ascending,
+      datasourceFilters: [MIXED_DATASOURCE_NAME],
+      starred: false,
+    });
+
+    if ((historyMixedResults.total || 0) > 0) {
+      // second, fill autocomplete with queries for that datasource used in Mixed scenarios
+      historyMixedResults.richHistory.forEach((historyResult: RichHistoryQuery) => {
+        historyResult.queries.forEach((q) => {
+          if (q?.datasource?.uid === instance.uid) {
+            history.push({ ts: parseInt(historyResult.id, 10), query: q });
+          }
+        });
+      });
+    }
+  }
+
+  // finally, add any legacy local storage history that might exist. To be removed in Grafana 12 #83309
+  if (history.length < MAX_HISTORY_AUTOCOMPLETE_ITEMS) {
+    const historyKey = `grafana.explore.history.${instance.meta?.id}`;
+    history = [...history, ...store.getObject<HistoryItem[]>(historyKey, [])];
+  }
+
+  if (history.length > MAX_HISTORY_AUTOCOMPLETE_ITEMS) {
+    history.length = MAX_HISTORY_AUTOCOMPLETE_ITEMS;
+  }
+
+  // Save last-used datasource
   setLastUsedDatasourceUID(orgId, instance.uid);
-  return { history, instance };
+  return { history: history, instance };
 }
 
 export function createCacheKey(absRange: AbsoluteTimeRange) {
@@ -235,3 +289,23 @@ export const getDatasourceUIDs = (datasourceUID: string, queries: DataQuery[]):
     return [datasourceUID];
   }
 };
+
+export async function getCorrelationsData(state: StoreState, exploreId: string) {
+  const correlationEditorHelperData = state.explore.panes[exploreId]!.correlationEditorHelperData;
+
+  const isCorrelationEditorMode = state.explore.correlationEditorDetails?.editorMode || false;
+  const isLeftPane = Object.keys(state.explore.panes)[0] === exploreId;
+  const showCorrelationEditorLinks = isCorrelationEditorMode && isLeftPane;
+  const defaultCorrelationEditorDatasource = showCorrelationEditorLinks ? await getDataSourceSrv().get() : undefined;
+  const interpolateCorrelationHelperVars =
+    isCorrelationEditorMode && !isLeftPane && correlationEditorHelperData !== undefined;
+
+  let scopedVars: ScopedVars = {};
+  if (interpolateCorrelationHelperVars && correlationEditorHelperData !== undefined) {
+    Object.entries(correlationEditorHelperData?.vars).forEach((variable) => {
+      scopedVars[variable[0]] = { value: variable[1] };
+    });
+  }
+
+  return { defaultCorrelationEditorDatasource, scopedVars, showCorrelationEditorLinks };
+}
diff --git a/public/app/features/explore/utils/decorators.test.ts b/public/app/features/explore/utils/decorators.test.ts
index 2060d9d3ae32b..67adfacbb7369 100644
--- a/public/app/features/explore/utils/decorators.test.ts
+++ b/public/app/features/explore/utils/decorators.test.ts
@@ -1,4 +1,3 @@
-import { flattenDeep } from 'lodash';
 import { lastValueFrom } from 'rxjs';
 
 import {
@@ -409,9 +408,11 @@ describe('decorateWithCorrelations', () => {
       correlations: [],
       defaultTargetDatasource: undefined,
     })(panelData);
-    expect(
-      flattenDeep(postDecoratedPanel.series.map((frame) => frame.fields.map((field) => field.config.links)))
-    ).toEqual([]);
+
+    const flattenedLinks = postDecoratedPanel.series
+      .flatMap((frame) => frame.fields)
+      .flatMap((field) => field.config.links);
+    expect(flattenedLinks).toEqual([]);
   });
 
   it('returns one field link per field if there are no correlations, but there are editor links', () => {
@@ -430,9 +431,11 @@ describe('decorateWithCorrelations', () => {
       correlations: [],
       defaultTargetDatasource: datasource,
     })(panelData);
-    const flattenedLinks = flattenDeep(
-      postDecoratedPanel.series.map((frame) => frame.fields.map((field) => field.config.links))
-    );
+
+    const flattenedLinks = postDecoratedPanel.series
+      .flatMap((frame) => frame.fields)
+      .flatMap((field) => field.config.links);
+
     expect(flattenedLinks.length).toEqual(table.fields.length);
     expect(flattenedLinks[0]).not.toBeUndefined();
   });
@@ -454,9 +457,11 @@ describe('decorateWithCorrelations', () => {
       correlations: correlations,
       defaultTargetDatasource: datasource,
     })(panelData);
-    const flattenedLinks = flattenDeep(
-      postDecoratedPanel.series.map((frame) => frame.fields.map((field) => field.config.links))
-    );
+
+    const flattenedLinks = postDecoratedPanel.series
+      .flatMap((frame) => frame.fields)
+      .flatMap((field) => field.config.links);
+
     expect(flattenedLinks.length).toEqual(table.fields.length);
     expect(flattenedLinks[0]).not.toBeUndefined();
   });
@@ -487,8 +492,11 @@ describe('decorateWithCorrelations', () => {
       correlations: correlations,
       defaultTargetDatasource: undefined,
     })(panelData);
-    expect(
-      flattenDeep(postDecoratedPanel.series.map((frame) => frame.fields.map((field) => field.config.links))).length
-    ).toEqual(correlations.length);
+
+    const flattenedLinks = postDecoratedPanel.series
+      .flatMap((frame) => frame.fields)
+      .flatMap((field) => field.config.links);
+
+    expect(flattenedLinks.length).toEqual(correlations.length);
   });
 });
diff --git a/public/app/features/explore/utils/decorators.ts b/public/app/features/explore/utils/decorators.ts
index 4f626dd49669f..ff909ec298e2a 100644
--- a/public/app/features/explore/utils/decorators.ts
+++ b/public/app/features/explore/utils/decorators.ts
@@ -128,7 +128,7 @@ export const decorateWithCorrelations = ({
               datasourceName: defaultTargetDatasource.name,
               query: { datasource: { uid: defaultTargetDatasource.uid } },
               meta: {
-                correlationData: { resultField: field.name, vars: availableVars },
+                correlationData: { resultField: field.name, vars: availableVars, origVars: availableVars },
               },
             },
           });
diff --git a/public/app/features/explore/utils/links.ts b/public/app/features/explore/utils/links.ts
index fe686153aeb49..bc530234b244f 100644
--- a/public/app/features/explore/utils/links.ts
+++ b/public/app/features/explore/utils/links.ts
@@ -17,13 +17,17 @@ import {
   CoreApp,
   SplitOpenOptions,
   DataLinkPostProcessor,
+  ExploreUrlState,
+  urlUtil,
 } from '@grafana/data';
 import { getTemplateSrv, reportInteraction, VariableInterpolation } from '@grafana/runtime';
 import { DataQuery } from '@grafana/schema';
 import { contextSrv } from 'app/core/services/context_srv';
 import { getTransformationVars } from 'app/features/correlations/transformations';
+import { ExploreItemState } from 'app/types/explore';
 
 import { getLinkSrv } from '../../panel/panellinks/link_srv';
+import { getUrlStateFromPaneState } from '../hooks/useStateSync';
 
 type DataLinkFilter = (link: DataLink, scopedVars: ScopedVars) => boolean;
 
@@ -295,8 +299,8 @@ const builtInVariables = [
  * @param query
  * @param scopedVars
  */
-export function getVariableUsageInfo<T extends DataLink>(
-  query: T,
+export function getVariableUsageInfo(
+  query: object,
   scopedVars: ScopedVars
 ): { variables: VariableInterpolation[]; allVariablesDefined: boolean } {
   let variables: VariableInterpolation[] = [];
@@ -328,3 +332,26 @@ function getStringsFromObject(obj: Object): string {
   }
   return acc;
 }
+
+type StateEntry = [string, ExploreItemState];
+const isStateEntry = (entry: [string, ExploreItemState | undefined]): entry is StateEntry => {
+  return entry[1] !== undefined;
+};
+
+export const constructAbsoluteUrl = (panes: Record<string, ExploreItemState | undefined>) => {
+  const urlStates = Object.entries(panes)
+    .filter(isStateEntry)
+    .map(([exploreId, pane]) => {
+      const urlState = getUrlStateFromPaneState(pane);
+      urlState.range = {
+        to: pane.range.to.valueOf().toString(),
+        from: pane.range.from.valueOf().toString(),
+      };
+      const panes: [string, ExploreUrlState] = [exploreId, urlState];
+      return panes;
+    })
+    .reduce((acc, [exploreId, urlState]) => {
+      return { ...acc, [exploreId]: urlState };
+    }, {});
+  return urlUtil.renderUrl('/explore', { schemaVersion: 1, panes: JSON.stringify(urlStates) });
+};
diff --git a/public/app/features/explore/utils/supplementaryQueries.test.ts b/public/app/features/explore/utils/supplementaryQueries.test.ts
index 3f13e0d2f511d..6c231f4d20661 100644
--- a/public/app/features/explore/utils/supplementaryQueries.test.ts
+++ b/public/app/features/explore/utils/supplementaryQueries.test.ts
@@ -1,10 +1,9 @@
 import { flatten } from 'lodash';
-import { from, Observable } from 'rxjs';
+import { Observable, from } from 'rxjs';
 
 import {
   DataFrame,
   DataQueryRequest,
-  DataQueryResponse,
   DataSourceApi,
   DataSourceWithSupplementaryQueriesSupport,
   FieldType,
@@ -15,8 +14,8 @@ import {
   SupplementaryQueryType,
   SupplementaryQueryOptions,
   toDataFrame,
+  DataQueryResponse,
 } from '@grafana/data';
-import { getDataSourceSrv } from '@grafana/runtime';
 import { DataQuery } from '@grafana/schema';
 
 import { MockDataSourceApi } from '../../../../test/mocks/datasource_srv';
@@ -40,21 +39,26 @@ class MockDataSourceWithSupplementaryQuerySupport
     return this;
   }
 
-  getDataProvider(
+  query(_: DataQueryRequest): Observable<DataQueryResponse> {
+    const data =
+      this.supplementaryQueriesResults[SupplementaryQueryType.LogsVolume] ||
+      this.supplementaryQueriesResults[SupplementaryQueryType.LogsSample] ||
+      [];
+    return from([{ state: LoadingState.Done, data }]);
+  }
+
+  getSupplementaryRequest(
     type: SupplementaryQueryType,
     request: DataQueryRequest<DataQuery>
-  ): Observable<DataQueryResponse> | undefined {
+  ): DataQueryRequest<DataQuery> | undefined {
     const data = this.supplementaryQueriesResults[type];
     if (data) {
-      return from([
-        { state: LoadingState.Loading, data: [] },
-        { state: LoadingState.Done, data },
-      ]);
+      return request;
     }
     return undefined;
   }
 
-  getSupplementaryQuery(options: SupplementaryQueryOptions, query: DataQuery): DataQuery | undefined {
+  getSupplementaryQuery(_: SupplementaryQueryOptions, query: DataQuery): DataQuery | undefined {
     return query;
   }
 
@@ -136,38 +140,27 @@ const datasources: DataSourceApi[] = [
   new MockDataSourceApi('no-data-providers-2'),
 ];
 
-jest.mock('@grafana/runtime', () => ({
-  ...jest.requireActual('@grafana/runtime'),
-  getDataSourceSrv: () => {
-    return {
-      get: async ({ uid }: { uid: string }) => datasources.find((ds) => ds.name === uid) || undefined,
-    };
-  },
-}));
-
-const setup = async (targetSources: string[], type: SupplementaryQueryType) => {
+const setup = (targetSources: string[], type: SupplementaryQueryType) => {
   const requestMock = new MockDataQueryRequest({
     targets: targetSources.map((source, i) => new MockQuery(`${i}`, 'a', { uid: source })),
   });
   const explorePanelDataMock: Observable<ExplorePanelData> = mockExploreDataWithLogs();
 
-  const datasources = await Promise.all(
-    targetSources.map(async (source, i) => {
-      const datasource = await getDataSourceSrv().get({ uid: source });
-      return {
-        datasource,
-        targets: [new MockQuery(`${i}`, 'a', { uid: source })],
-      };
-    })
-  );
+  const groupedQueries = targetSources.map((source, i) => {
+    const datasource = datasources.find((datasource) => datasource.name === source) || datasources[0];
+    return {
+      datasource,
+      targets: [new MockQuery(`${i}`, 'a', { uid: datasource.name })],
+    };
+  });
 
-  return getSupplementaryQueryProvider(datasources, type, requestMock, explorePanelDataMock);
+  return getSupplementaryQueryProvider(groupedQueries, type, requestMock, explorePanelDataMock);
 };
 
 const assertDataFrom = (type: SupplementaryQueryType, ...datasources: string[]) => {
   return flatten(
     datasources.map((name: string) => {
-      return [{ refId: `1-${type}-${name}` }, { refId: `2-${type}-${name}` }];
+      return createSupplementaryQueryResponse(type, name);
     })
   );
 };
@@ -179,7 +172,7 @@ const assertDataFromLogsResults = () => {
 describe('SupplementaryQueries utils', function () {
   describe('Non-mixed data source', function () {
     it('Returns result from the provider', async () => {
-      const testProvider = await setup(['logs-volume-a'], SupplementaryQueryType.LogsVolume);
+      const testProvider = setup(['logs-volume-a'], SupplementaryQueryType.LogsVolume);
 
       await expect(testProvider).toEmitValuesWith((received) => {
         expect(received).toMatchObject([
@@ -192,7 +185,7 @@ describe('SupplementaryQueries utils', function () {
       });
     });
     it('Uses fallback for logs volume', async () => {
-      const testProvider = await setup(['no-data-providers'], SupplementaryQueryType.LogsVolume);
+      const testProvider = setup(['no-data-providers'], SupplementaryQueryType.LogsVolume);
 
       await expect(testProvider).toEmitValuesWith((received) => {
         expect(received).toMatchObject([
@@ -204,11 +197,11 @@ describe('SupplementaryQueries utils', function () {
       });
     });
     it('Returns undefined for logs sample', async () => {
-      const testProvider = await setup(['no-data-providers'], SupplementaryQueryType.LogsSample);
+      const testProvider = setup(['no-data-providers'], SupplementaryQueryType.LogsSample);
       await expect(testProvider).toBe(undefined);
     });
     it('Creates single fallback result', async () => {
-      const testProvider = await setup(['no-data-providers', 'no-data-providers-2'], SupplementaryQueryType.LogsVolume);
+      const testProvider = setup(['no-data-providers', 'no-data-providers-2'], SupplementaryQueryType.LogsVolume);
 
       await expect(testProvider).toEmitValuesWith((received) => {
         expect(received).toMatchObject([
@@ -229,7 +222,7 @@ describe('SupplementaryQueries utils', function () {
     describe('Logs volume', function () {
       describe('All data sources support full range logs volume', function () {
         it('Merges all data frames into a single response', async () => {
-          const testProvider = await setup(['logs-volume-a', 'logs-volume-b'], SupplementaryQueryType.LogsVolume);
+          const testProvider = setup(['logs-volume-a', 'logs-volume-b'], SupplementaryQueryType.LogsVolume);
           await expect(testProvider).toEmitValuesWith((received) => {
             expect(received).toMatchObject([
               { data: [], state: LoadingState.Loading },
@@ -248,10 +241,7 @@ describe('SupplementaryQueries utils', function () {
 
       describe('All data sources do not support full range logs volume', function () {
         it('Creates single fallback result', async () => {
-          const testProvider = await setup(
-            ['no-data-providers', 'no-data-providers-2'],
-            SupplementaryQueryType.LogsVolume
-          );
+          const testProvider = setup(['no-data-providers', 'no-data-providers-2'], SupplementaryQueryType.LogsVolume);
 
           await expect(testProvider).toEmitValuesWith((received) => {
             expect(received).toMatchObject([
@@ -270,7 +260,7 @@ describe('SupplementaryQueries utils', function () {
 
       describe('Some data sources support full range logs volume, while others do not', function () {
         it('Creates merged result containing full range and limited logs volume', async () => {
-          const testProvider = await setup(
+          const testProvider = setup(
             ['logs-volume-a', 'no-data-providers', 'logs-volume-b', 'no-data-providers-2'],
             SupplementaryQueryType.LogsVolume
           );
@@ -308,7 +298,7 @@ describe('SupplementaryQueries utils', function () {
     describe('Logs sample', function () {
       describe('All data sources support logs sample', function () {
         it('Merges all responses into single result', async () => {
-          const testProvider = await setup(['logs-sample-a', 'logs-sample-b'], SupplementaryQueryType.LogsSample);
+          const testProvider = setup(['logs-sample-a', 'logs-sample-b'], SupplementaryQueryType.LogsSample);
           await expect(testProvider).toEmitValuesWith((received) => {
             expect(received).toMatchObject([
               { data: [], state: LoadingState.Loading },
@@ -327,17 +317,14 @@ describe('SupplementaryQueries utils', function () {
 
       describe('All data sources do not support full range logs volume', function () {
         it('Does not provide fallback result', async () => {
-          const testProvider = await setup(
-            ['no-data-providers', 'no-data-providers-2'],
-            SupplementaryQueryType.LogsSample
-          );
+          const testProvider = setup(['no-data-providers', 'no-data-providers-2'], SupplementaryQueryType.LogsSample);
           await expect(testProvider).toBeUndefined();
         });
       });
 
       describe('Some data sources support full range logs volume, while others do not', function () {
         it('Returns results only for data sources supporting logs sample', async () => {
-          const testProvider = await setup(
+          const testProvider = setup(
             ['logs-sample-a', 'no-data-providers', 'logs-sample-b', 'no-data-providers-2'],
             SupplementaryQueryType.LogsSample
           );
diff --git a/public/app/features/explore/utils/supplementaryQueries.ts b/public/app/features/explore/utils/supplementaryQueries.ts
index 9deaca32e20c1..ae25b8902b400 100644
--- a/public/app/features/explore/utils/supplementaryQueries.ts
+++ b/public/app/features/explore/utils/supplementaryQueries.ts
@@ -18,7 +18,7 @@ import {
 import store from 'app/core/store';
 import { ExplorePanelData, SupplementaryQueries } from 'app/types';
 
-import { makeDataFramesForLogs } from '../../logs/logsModel';
+import { makeDataFramesForLogs, queryLogsSample, queryLogsVolume } from '../../logs/logsModel';
 
 export const supplementaryQueryTypes: SupplementaryQueryType[] = [
   SupplementaryQueryType.LogsVolume,
@@ -130,7 +130,19 @@ export const getSupplementaryQueryProvider = (
     dsRequest.targets = targets;
 
     if (hasSupplementaryQuerySupport(datasource, type)) {
-      return datasource.getDataProvider(type, dsRequest);
+      if (datasource.getDataProvider) {
+        return datasource.getDataProvider(type, dsRequest);
+      } else if (datasource.getSupplementaryRequest) {
+        const request = datasource.getSupplementaryRequest(type, dsRequest);
+        if (!request) {
+          return undefined;
+        }
+        return type === SupplementaryQueryType.LogsVolume
+          ? queryLogsVolume(datasource, request, { targets: dsRequest.targets })
+          : queryLogsSample(datasource, request);
+      } else {
+        return undefined;
+      }
     } else {
       return getSupplementaryQueryFallback(type, explorePanelData, targets, datasource.name);
     }
diff --git a/public/app/features/explore/utils/supplementaryQueries_legacy.test.ts b/public/app/features/explore/utils/supplementaryQueries_legacy.test.ts
new file mode 100644
index 0000000000000..fbb79119bf831
--- /dev/null
+++ b/public/app/features/explore/utils/supplementaryQueries_legacy.test.ts
@@ -0,0 +1,365 @@
+/**
+ * Test file to be removed when `getDataProvider` is removed from DataSourceWithSupplementaryQueriesSupport
+ * in packages/grafana-data/src/types/logs.ts
+ */
+import { flatten } from 'lodash';
+import { from, Observable } from 'rxjs';
+
+import {
+  DataFrame,
+  DataQueryRequest,
+  DataQueryResponse,
+  DataSourceApi,
+  DataSourceWithSupplementaryQueriesSupport,
+  FieldType,
+  LoadingState,
+  LogLevel,
+  LogsVolumeType,
+  MutableDataFrame,
+  SupplementaryQueryType,
+  SupplementaryQueryOptions,
+  toDataFrame,
+} from '@grafana/data';
+import { getDataSourceSrv } from '@grafana/runtime';
+import { DataQuery } from '@grafana/schema';
+
+import { MockDataSourceApi } from '../../../../test/mocks/datasource_srv';
+import { MockDataQueryRequest, MockQuery } from '../../../../test/mocks/query';
+import { ExplorePanelData } from '../../../types';
+import { mockExplorePanelData } from '../__mocks__/data';
+
+import { getSupplementaryQueryProvider } from './supplementaryQueries';
+
+class MockDataSourceWithSupplementaryQuerySupport
+  extends MockDataSourceApi
+  implements DataSourceWithSupplementaryQueriesSupport<DataQuery>
+{
+  private supplementaryQueriesResults: Record<SupplementaryQueryType, DataFrame[] | undefined> = {
+    [SupplementaryQueryType.LogsVolume]: undefined,
+    [SupplementaryQueryType.LogsSample]: undefined,
+  };
+
+  withSupplementaryQuerySupport(type: SupplementaryQueryType, data: DataFrame[]) {
+    this.supplementaryQueriesResults[type] = data;
+    return this;
+  }
+
+  getDataProvider(
+    type: SupplementaryQueryType,
+    request: DataQueryRequest<DataQuery>
+  ): Observable<DataQueryResponse> | undefined {
+    const data = this.supplementaryQueriesResults[type];
+    if (data) {
+      return from([
+        { state: LoadingState.Loading, data: [] },
+        { state: LoadingState.Done, data },
+      ]);
+    }
+    return undefined;
+  }
+
+  getSupplementaryQuery(options: SupplementaryQueryOptions, query: DataQuery): DataQuery | undefined {
+    return query;
+  }
+
+  getSupportedSupplementaryQueryTypes(): SupplementaryQueryType[] {
+    return Object.values(SupplementaryQueryType).filter((type) => this.supplementaryQueriesResults[type]);
+  }
+}
+
+const createSupplementaryQueryResponse = (type: SupplementaryQueryType, id: string) => {
+  return [
+    toDataFrame({
+      refId: `1-${type}-${id}`,
+      fields: [{ name: 'value', type: FieldType.string, values: [1] }],
+      meta: {
+        custom: {
+          logsVolumeType: LogsVolumeType.FullRange,
+        },
+      },
+    }),
+    toDataFrame({
+      refId: `2-${type}-${id}`,
+      fields: [{ name: 'value', type: FieldType.string, values: [2] }],
+      meta: {
+        custom: {
+          logsVolumeType: LogsVolumeType.FullRange,
+        },
+      },
+    }),
+  ];
+};
+
+const mockRow = (refId: string) => {
+  return {
+    rowIndex: 0,
+    entryFieldIndex: 0,
+    dataFrame: new MutableDataFrame({ refId, fields: [{ name: 'A', values: [] }] }),
+    entry: '',
+    hasAnsi: false,
+    hasUnescapedContent: false,
+    labels: {},
+    logLevel: LogLevel.info,
+    raw: '',
+    timeEpochMs: 0,
+    timeEpochNs: '0',
+    timeFromNow: '',
+    timeLocal: '',
+    timeUtc: '',
+    uid: '1',
+  };
+};
+
+const mockExploreDataWithLogs = () =>
+  mockExplorePanelData({
+    logsResult: {
+      rows: [mockRow('0'), mockRow('1')],
+      visibleRange: { from: 0, to: 1 },
+      bucketSize: 1000,
+    },
+  });
+
+const datasources: DataSourceApi[] = [
+  new MockDataSourceWithSupplementaryQuerySupport('logs-volume-a').withSupplementaryQuerySupport(
+    SupplementaryQueryType.LogsVolume,
+    createSupplementaryQueryResponse(SupplementaryQueryType.LogsVolume, 'logs-volume-a')
+  ),
+  new MockDataSourceWithSupplementaryQuerySupport('logs-volume-b').withSupplementaryQuerySupport(
+    SupplementaryQueryType.LogsVolume,
+    createSupplementaryQueryResponse(SupplementaryQueryType.LogsVolume, 'logs-volume-b')
+  ),
+  new MockDataSourceWithSupplementaryQuerySupport('logs-sample-a').withSupplementaryQuerySupport(
+    SupplementaryQueryType.LogsSample,
+    createSupplementaryQueryResponse(SupplementaryQueryType.LogsSample, 'logs-sample-a')
+  ),
+  new MockDataSourceWithSupplementaryQuerySupport('logs-sample-b').withSupplementaryQuerySupport(
+    SupplementaryQueryType.LogsSample,
+    createSupplementaryQueryResponse(SupplementaryQueryType.LogsSample, 'logs-sample-b')
+  ),
+  new MockDataSourceApi('no-data-providers'),
+  new MockDataSourceApi('no-data-providers-2'),
+];
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getDataSourceSrv: () => {
+    return {
+      get: async ({ uid }: { uid: string }) => datasources.find((ds) => ds.name === uid) || undefined,
+    };
+  },
+}));
+
+const setup = async (targetSources: string[], type: SupplementaryQueryType) => {
+  const requestMock = new MockDataQueryRequest({
+    targets: targetSources.map((source, i) => new MockQuery(`${i}`, 'a', { uid: source })),
+  });
+  const explorePanelDataMock: Observable<ExplorePanelData> = mockExploreDataWithLogs();
+
+  const datasources = await Promise.all(
+    targetSources.map(async (source, i) => {
+      const datasource = await getDataSourceSrv().get({ uid: source });
+      return {
+        datasource,
+        targets: [new MockQuery(`${i}`, 'a', { uid: source })],
+      };
+    })
+  );
+
+  return getSupplementaryQueryProvider(datasources, type, requestMock, explorePanelDataMock);
+};
+
+const assertDataFrom = (type: SupplementaryQueryType, ...datasources: string[]) => {
+  return flatten(
+    datasources.map((name: string) => {
+      return [{ refId: `1-${type}-${name}` }, { refId: `2-${type}-${name}` }];
+    })
+  );
+};
+
+const assertDataFromLogsResults = () => {
+  return [{ meta: { custom: { logsVolumeType: LogsVolumeType.Limited } } }];
+};
+
+describe('SupplementaryQueries utils', function () {
+  describe('Non-mixed data source', function () {
+    it('Returns result from the provider', async () => {
+      const testProvider = await setup(['logs-volume-a'], SupplementaryQueryType.LogsVolume);
+
+      await expect(testProvider).toEmitValuesWith((received) => {
+        expect(received).toMatchObject([
+          { data: [], state: LoadingState.Loading },
+          {
+            data: assertDataFrom(SupplementaryQueryType.LogsVolume, 'logs-volume-a'),
+            state: LoadingState.Done,
+          },
+        ]);
+      });
+    });
+    it('Uses fallback for logs volume', async () => {
+      const testProvider = await setup(['no-data-providers'], SupplementaryQueryType.LogsVolume);
+
+      await expect(testProvider).toEmitValuesWith((received) => {
+        expect(received).toMatchObject([
+          {
+            data: assertDataFromLogsResults(),
+            state: LoadingState.Done,
+          },
+        ]);
+      });
+    });
+    it('Returns undefined for logs sample', async () => {
+      const testProvider = await setup(['no-data-providers'], SupplementaryQueryType.LogsSample);
+      await expect(testProvider).toBe(undefined);
+    });
+    it('Creates single fallback result', async () => {
+      const testProvider = await setup(['no-data-providers', 'no-data-providers-2'], SupplementaryQueryType.LogsVolume);
+
+      await expect(testProvider).toEmitValuesWith((received) => {
+        expect(received).toMatchObject([
+          {
+            data: assertDataFromLogsResults(),
+            state: LoadingState.Done,
+          },
+          {
+            data: [...assertDataFromLogsResults(), ...assertDataFromLogsResults()],
+            state: LoadingState.Done,
+          },
+        ]);
+      });
+    });
+  });
+
+  describe('Mixed data source', function () {
+    describe('Logs volume', function () {
+      describe('All data sources support full range logs volume', function () {
+        it('Merges all data frames into a single response', async () => {
+          const testProvider = await setup(['logs-volume-a', 'logs-volume-b'], SupplementaryQueryType.LogsVolume);
+          await expect(testProvider).toEmitValuesWith((received) => {
+            expect(received).toMatchObject([
+              { data: [], state: LoadingState.Loading },
+              {
+                data: assertDataFrom(SupplementaryQueryType.LogsVolume, 'logs-volume-a'),
+                state: LoadingState.Done,
+              },
+              {
+                data: assertDataFrom(SupplementaryQueryType.LogsVolume, 'logs-volume-a', 'logs-volume-b'),
+                state: LoadingState.Done,
+              },
+            ]);
+          });
+        });
+      });
+
+      describe('All data sources do not support full range logs volume', function () {
+        it('Creates single fallback result', async () => {
+          const testProvider = await setup(
+            ['no-data-providers', 'no-data-providers-2'],
+            SupplementaryQueryType.LogsVolume
+          );
+
+          await expect(testProvider).toEmitValuesWith((received) => {
+            expect(received).toMatchObject([
+              {
+                data: assertDataFromLogsResults(),
+                state: LoadingState.Done,
+              },
+              {
+                data: [...assertDataFromLogsResults(), ...assertDataFromLogsResults()],
+                state: LoadingState.Done,
+              },
+            ]);
+          });
+        });
+      });
+
+      describe('Some data sources support full range logs volume, while others do not', function () {
+        it('Creates merged result containing full range and limited logs volume', async () => {
+          const testProvider = await setup(
+            ['logs-volume-a', 'no-data-providers', 'logs-volume-b', 'no-data-providers-2'],
+            SupplementaryQueryType.LogsVolume
+          );
+          await expect(testProvider).toEmitValuesWith((received) => {
+            expect(received).toMatchObject([
+              {
+                data: [],
+                state: LoadingState.Loading,
+              },
+              {
+                data: assertDataFrom(SupplementaryQueryType.LogsVolume, 'logs-volume-a'),
+                state: LoadingState.Done,
+              },
+              {
+                data: [
+                  ...assertDataFrom(SupplementaryQueryType.LogsVolume, 'logs-volume-a'),
+                  ...assertDataFromLogsResults(),
+                ],
+                state: LoadingState.Done,
+              },
+              {
+                data: [
+                  ...assertDataFrom(SupplementaryQueryType.LogsVolume, 'logs-volume-a'),
+                  ...assertDataFromLogsResults(),
+                  ...assertDataFrom(SupplementaryQueryType.LogsVolume, 'logs-volume-b'),
+                ],
+                state: LoadingState.Done,
+              },
+            ]);
+          });
+        });
+      });
+    });
+
+    describe('Logs sample', function () {
+      describe('All data sources support logs sample', function () {
+        it('Merges all responses into single result', async () => {
+          const testProvider = await setup(['logs-sample-a', 'logs-sample-b'], SupplementaryQueryType.LogsSample);
+          await expect(testProvider).toEmitValuesWith((received) => {
+            expect(received).toMatchObject([
+              { data: [], state: LoadingState.Loading },
+              {
+                data: assertDataFrom(SupplementaryQueryType.LogsSample, 'logs-sample-a'),
+                state: LoadingState.Done,
+              },
+              {
+                data: assertDataFrom(SupplementaryQueryType.LogsSample, 'logs-sample-a', 'logs-sample-b'),
+                state: LoadingState.Done,
+              },
+            ]);
+          });
+        });
+      });
+
+      describe('All data sources do not support full range logs volume', function () {
+        it('Does not provide fallback result', async () => {
+          const testProvider = await setup(
+            ['no-data-providers', 'no-data-providers-2'],
+            SupplementaryQueryType.LogsSample
+          );
+          await expect(testProvider).toBeUndefined();
+        });
+      });
+
+      describe('Some data sources support full range logs volume, while others do not', function () {
+        it('Returns results only for data sources supporting logs sample', async () => {
+          const testProvider = await setup(
+            ['logs-sample-a', 'no-data-providers', 'logs-sample-b', 'no-data-providers-2'],
+            SupplementaryQueryType.LogsSample
+          );
+          await expect(testProvider).toEmitValuesWith((received) => {
+            expect(received).toMatchObject([
+              { data: [], state: LoadingState.Loading },
+              {
+                data: assertDataFrom(SupplementaryQueryType.LogsSample, 'logs-sample-a'),
+                state: LoadingState.Done,
+              },
+              {
+                data: assertDataFrom(SupplementaryQueryType.LogsSample, 'logs-sample-a', 'logs-sample-b'),
+                state: LoadingState.Done,
+              },
+            ]);
+          });
+        });
+      });
+    });
+  });
+});
diff --git a/public/app/features/expressions/ExpressionDatasource.ts b/public/app/features/expressions/ExpressionDatasource.ts
index 795407c0d4a78..06d31ca675701 100644
--- a/public/app/features/expressions/ExpressionDatasource.ts
+++ b/public/app/features/expressions/ExpressionDatasource.ts
@@ -22,7 +22,7 @@ export class ExpressionDatasourceApi extends DataSourceWithBackend<ExpressionQue
     super(instanceSettings);
   }
 
-  applyTemplateVariables(query: ExpressionQuery, scopedVars: ScopedVars): Record<string, any> {
+  applyTemplateVariables(query: ExpressionQuery, scopedVars: ScopedVars) {
     const templateSrv = getTemplateSrv();
     return {
       ...query,
diff --git a/public/app/features/expressions/ExpressionQueryEditor.tsx b/public/app/features/expressions/ExpressionQueryEditor.tsx
index 90c6ba95de0cf..419fbe067fdba 100644
--- a/public/app/features/expressions/ExpressionQueryEditor.tsx
+++ b/public/app/features/expressions/ExpressionQueryEditor.tsx
@@ -7,6 +7,7 @@ import { ClassicConditions } from './components/ClassicConditions';
 import { Math } from './components/Math';
 import { Reduce } from './components/Reduce';
 import { Resample } from './components/Resample';
+import { SqlExpr } from './components/SqlExpr';
 import { Threshold } from './components/Threshold';
 import { ExpressionQuery, ExpressionQueryType, expressionTypes } from './types';
 import { getDefaults } from './utils/expressionTypes';
@@ -27,6 +28,7 @@ function useExpressionsCache() {
       case ExpressionQueryType.reduce:
       case ExpressionQueryType.resample:
       case ExpressionQueryType.threshold:
+      case ExpressionQueryType.sql:
         return expressionCache.current[queryType];
       case ExpressionQueryType.classic:
         return undefined;
@@ -47,6 +49,8 @@ function useExpressionsCache() {
         expressionCache.current.resample = value;
         expressionCache.current.threshold = value;
         break;
+      case ExpressionQueryType.sql:
+        expressionCache.current.sql = value;
     }
   }, []);
 
@@ -89,6 +93,9 @@ export function ExpressionQueryEditor(props: Props) {
 
       case ExpressionQueryType.threshold:
         return <Threshold onChange={onChange} query={query} labelWidth={labelWidth} refIds={refIds} />;
+
+      case ExpressionQueryType.sql:
+        return <SqlExpr onChange={onChange} query={query} refIds={refIds} />;
     }
   };
 
diff --git a/public/app/features/expressions/components/Condition.tsx b/public/app/features/expressions/components/Condition.tsx
index 82dbb93c68285..72fc74027fe71 100644
--- a/public/app/features/expressions/components/Condition.tsx
+++ b/public/app/features/expressions/components/Condition.tsx
@@ -2,8 +2,7 @@ import { css, cx } from '@emotion/css';
 import React, { FormEvent } from 'react';
 
 import { GrafanaTheme2, SelectableValue } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Button, ButtonSelect, Icon, InlineFieldRow, Input, Select, useStyles2 } from '@grafana/ui';
+import { Button, ButtonSelect, Icon, InlineFieldRow, Input, Select, useStyles2, Stack } from '@grafana/ui';
 
 import alertDef, { EvalFunction } from '../../alerting/state/alertDef';
 import { ClassicCondition, ReducerType } from '../types';
@@ -73,7 +72,7 @@ export const Condition = ({ condition, index, onChange, onRemoveCondition, refId
     condition.evaluator.type === EvalFunction.IsWithinRange || condition.evaluator.type === EvalFunction.IsOutsideRange;
 
   return (
-    <Stack direction="row">
+    <Stack>
       <div style={{ flex: 1 }}>
         <InlineFieldRow>
           {index === 0 ? (
diff --git a/public/app/features/expressions/components/Math.tsx b/public/app/features/expressions/components/Math.tsx
index 4a5a34f9ff30a..ecebcf2f6755d 100644
--- a/public/app/features/expressions/components/Math.tsx
+++ b/public/app/features/expressions/components/Math.tsx
@@ -2,8 +2,7 @@ import { css } from '@emotion/css';
 import React, { ChangeEvent } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Icon, InlineField, InlineLabel, TextArea, Toggletip, useStyles2 } from '@grafana/ui';
+import { Icon, InlineField, InlineLabel, TextArea, Toggletip, useStyles2, Stack } from '@grafana/ui';
 
 import { ExpressionQuery } from '../types';
 
@@ -32,7 +31,7 @@ export const Math = ({ labelWidth, onChange, query, onRunQuery }: Props) => {
   };
 
   return (
-    <Stack direction="row">
+    <Stack>
       <InlineField
         label={
           <InlineLabel width="auto">
diff --git a/public/app/features/expressions/components/SqlExpr.tsx b/public/app/features/expressions/components/SqlExpr.tsx
new file mode 100644
index 0000000000000..f5857f8892922
--- /dev/null
+++ b/public/app/features/expressions/components/SqlExpr.tsx
@@ -0,0 +1,27 @@
+import React, { useMemo } from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { SQLEditor } from '@grafana/experimental';
+
+import { ExpressionQuery } from '../types';
+
+interface Props {
+  refIds: Array<SelectableValue<string>>;
+  query: ExpressionQuery;
+  onChange: (query: ExpressionQuery) => void;
+}
+
+export const SqlExpr = ({ onChange, refIds, query }: Props) => {
+  const vars = useMemo(() => refIds.map((v) => v.value!), [refIds]);
+
+  const initialQuery = `select * from ${vars[0]} limit 1`;
+
+  const onEditorChange = (expression: string) => {
+    onChange({
+      ...query,
+      expression,
+    });
+  };
+
+  return <SQLEditor query={query.expression || initialQuery} onChange={onEditorChange}></SQLEditor>;
+};
diff --git a/public/app/features/expressions/components/Threshold.tsx b/public/app/features/expressions/components/Threshold.tsx
index 11bc65da84b14..77d0bce512306 100644
--- a/public/app/features/expressions/components/Threshold.tsx
+++ b/public/app/features/expressions/components/Threshold.tsx
@@ -1,70 +1,86 @@
 import { css } from '@emotion/css';
-import React, { FormEvent } from 'react';
+import { AnyAction } from '@reduxjs/toolkit';
+import React, { FormEvent, useEffect, useReducer } from 'react';
 
 import { GrafanaTheme2, SelectableValue } from '@grafana/data';
-import { ButtonSelect, InlineField, InlineFieldRow, Input, Select, useStyles2 } from '@grafana/ui';
+import { Stack } from '@grafana/experimental';
+import { ButtonSelect, InlineField, InlineFieldRow, InlineSwitch, Input, Select, useStyles2 } from '@grafana/ui';
+import { config } from 'app/core/config';
 import { EvalFunction } from 'app/features/alerting/state/alertDef';
 
 import { ClassicCondition, ExpressionQuery, thresholdFunctions } from '../types';
 
+import {
+  isInvalid,
+  thresholdReducer,
+  updateHysteresisChecked,
+  updateRefId,
+  updateThresholdParams,
+  updateThresholdType,
+  updateUnloadParams,
+} from './thresholdReducer';
+
 interface Props {
   labelWidth: number | 'auto';
   refIds: Array<SelectableValue<string>>;
   query: ExpressionQuery;
   onChange: (query: ExpressionQuery) => void;
+  onError?: (error: string | undefined) => void;
+  useHysteresis?: boolean;
 }
 
 const defaultThresholdFunction = EvalFunction.IsAbove;
 
-export const Threshold = ({ labelWidth, onChange, refIds, query }: Props) => {
+const defaultEvaluator: ClassicCondition = {
+  type: 'query',
+  evaluator: {
+    type: defaultThresholdFunction,
+    params: [0, 0],
+  },
+  query: {
+    params: [],
+  },
+  reducer: {
+    params: [],
+    type: 'last',
+  },
+};
+
+export const Threshold = ({ labelWidth, onChange, refIds, query, onError, useHysteresis = false }: Props) => {
   const styles = useStyles2(getStyles);
 
-  const defaultEvaluator: ClassicCondition = {
-    type: 'query',
-    evaluator: {
-      type: defaultThresholdFunction,
-      params: [0, 0],
-    },
-    query: {
-      params: [],
-    },
-    reducer: {
-      params: [],
-      type: 'last',
-    },
-  };
+  const initialExpression = { ...query, conditions: query.conditions?.length ? query.conditions : [defaultEvaluator] };
 
-  const conditions = query.conditions?.length ? query.conditions : [defaultEvaluator];
-  const condition = conditions[0];
+  // this queryState is the source of truth for the threshold component.
+  // All the changes are made to this object through the dispatch function with the thresholdReducer.
+  const [queryState, dispatch] = useReducer(thresholdReducer, initialExpression);
+  const conditionInState = queryState.conditions[0];
 
-  const thresholdFunction = thresholdFunctions.find((fn) => fn.value === conditions[0].evaluator?.type);
+  const thresholdFunction = thresholdFunctions.find((fn) => fn.value === queryState.conditions[0].evaluator?.type);
 
   const onRefIdChange = (value: SelectableValue<string>) => {
-    onChange({ ...query, expression: value.value });
+    dispatch(updateRefId(value.value));
   };
 
-  const onEvalFunctionChange = (value: SelectableValue<EvalFunction>) => {
-    const type = value.value ?? defaultThresholdFunction;
+  // any change in the queryState will trigger the onChange function.
+  useEffect(() => {
+    queryState && onChange(queryState);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [queryState]);
 
-    onChange({
-      ...query,
-      conditions: updateConditions(conditions, { type }),
-    });
+  const onEvalFunctionChange = (value: SelectableValue<EvalFunction>) => {
+    dispatch(updateThresholdType({ evalFunction: value.value ?? defaultThresholdFunction, onError }));
   };
 
   const onEvaluateValueChange = (event: FormEvent<HTMLInputElement>, index: number) => {
-    const newValue = parseFloat(event.currentTarget.value);
-    const newParams = [...condition.evaluator.params];
-    newParams[index] = newValue;
-
-    onChange({
-      ...query,
-      conditions: updateConditions(conditions, { params: newParams }),
-    });
+    dispatch(updateThresholdParams({ param: parseFloat(event.currentTarget.value), index }));
   };
 
   const isRange =
-    condition.evaluator.type === EvalFunction.IsWithinRange || condition.evaluator.type === EvalFunction.IsOutsideRange;
+    conditionInState.evaluator.type === EvalFunction.IsWithinRange ||
+    conditionInState.evaluator.type === EvalFunction.IsOutsideRange;
+
+  const hysteresisEnabled = Boolean(config.featureToggles?.recoveryThreshold) && useHysteresis;
 
   return (
     <>
@@ -86,14 +102,14 @@ export const Threshold = ({ labelWidth, onChange, refIds, query }: Props) => {
               type="number"
               width={10}
               onChange={(event) => onEvaluateValueChange(event, 0)}
-              defaultValue={condition.evaluator.params[0]}
+              defaultValue={conditionInState.evaluator.params[0]}
             />
             <div className={styles.button}>TO</div>
             <Input
               type="number"
               width={10}
               onChange={(event) => onEvaluateValueChange(event, 1)}
-              defaultValue={condition.evaluator.params[1]}
+              defaultValue={conditionInState.evaluator.params[1]}
             />
           </>
         ) : (
@@ -101,52 +117,239 @@ export const Threshold = ({ labelWidth, onChange, refIds, query }: Props) => {
             type="number"
             width={10}
             onChange={(event) => onEvaluateValueChange(event, 0)}
-            defaultValue={conditions[0].evaluator.params[0] || 0}
+            defaultValue={conditionInState.evaluator.params[0] || 0}
           />
         )}
       </InlineFieldRow>
+      {hysteresisEnabled && <HysteresisSection isRange={isRange} onError={onError} />}
     </>
   );
+  interface HysteresisSectionProps {
+    isRange: boolean;
+    onError?: (error: string | undefined) => void;
+  }
+
+  function HysteresisSection({ isRange, onError }: HysteresisSectionProps) {
+    const hasHysteresis = Boolean(conditionInState.unloadEvaluator);
+
+    const onHysteresisCheckChange = (event: FormEvent<HTMLInputElement>) => {
+      dispatch(updateHysteresisChecked({ hysteresisChecked: event.currentTarget.checked, onError }));
+      allowOnblurFromUnload.current = true;
+    };
+    const allowOnblurFromUnload = React.useRef(true);
+    const onHysteresisCheckDown: React.MouseEventHandler<HTMLDivElement> | undefined = () => {
+      allowOnblurFromUnload.current = false;
+    };
+
+    return (
+      <div className={styles.hysteresis}>
+        {/* This is to enhance the user experience for mouse users. 
+        The onBlur event in RecoveryThresholdRow inputs triggers validations, 
+        but we want to skip them when the switch is clicked as this click should inmount this component. 
+        To achieve this, we use the onMouseDown event to set a flag, which is later utilized in the onBlur event to bypass validations. 
+        The onMouseDown event precedes the onBlur event, unlike onchange. */}
+
+        {/*Disabling the a11y rules here as the InlineSwitch handles keyboard interactions */}
+        {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions */}
+        <div onMouseDown={onHysteresisCheckDown}>
+          <InlineSwitch
+            showLabel={true}
+            label="Custom recovery threshold"
+            value={hasHysteresis}
+            onChange={onHysteresisCheckChange}
+            className={styles.switch}
+          />
+        </div>
+
+        {hasHysteresis && (
+          <RecoveryThresholdRow
+            isRange={isRange}
+            condition={conditionInState}
+            onError={onError}
+            dispatch={dispatch}
+            allowOnblur={allowOnblurFromUnload}
+          />
+        )}
+      </div>
+    );
+  }
 };
 
-function updateConditions(
-  conditions: ClassicCondition[],
-  update: Partial<{
-    params: number[];
-    type: EvalFunction;
-  }>
-): ClassicCondition[] {
-  return [
-    {
-      ...conditions[0],
-      evaluator: {
-        ...conditions[0].evaluator,
-        ...update,
-      },
-    },
-  ];
+interface RecoveryThresholdRowProps {
+  isRange: boolean;
+  condition: ClassicCondition;
+  onError?: (error: string | undefined) => void;
+  dispatch: React.Dispatch<AnyAction>;
+  allowOnblur: React.MutableRefObject<boolean>;
+}
+
+function RecoveryThresholdRow({ isRange, condition, onError, dispatch, allowOnblur }: RecoveryThresholdRowProps) {
+  const styles = useStyles2(getStyles);
+
+  const onUnloadValueChange = (event: FormEvent<HTMLInputElement>, paramIndex: number) => {
+    const newValue = parseFloat(event.currentTarget.value);
+    dispatch(updateUnloadParams({ param: newValue, index: paramIndex, onError }));
+  };
+
+  // check if is valid for the current unload evaluator params
+  const error = isInvalid(condition);
+  // get the error message depending on the unload evaluator type
+  const { errorMsg: invalidErrorMsg, errorMsgFrom, errorMsgTo } = error ?? {};
+
+  if (isRange) {
+    return <RecoveryForRange allowOnblur={allowOnblur} />;
+  } else {
+    return <RecoveryForSingleValue allowOnblur={allowOnblur} />;
+  }
+
+  /* We prioritize the onMouseDown event over the onBlur event. This is because the onBlur event is executed before the onChange event that we have 
+   in the hysteresis checkbox, and because of that, we were validating when unchecking the switch.
+  We need to uncheck the switch before the onBlur event is executed.*/
+  interface RecoveryProps {
+    allowOnblur: React.MutableRefObject<boolean>;
+  }
+
+  function RecoveryForRange({ allowOnblur }: RecoveryProps) {
+    if (condition.evaluator.type === EvalFunction.IsWithinRange) {
+      return (
+        <InlineFieldRow className={styles.hysteresis}>
+          <InlineField label="Stop alerting when outside range" labelWidth={'auto'}>
+            <Stack direction="row" gap={0}>
+              <div className={styles.range}>
+                <InlineField invalid={Boolean(errorMsgFrom)} error={errorMsgFrom} className={styles.noMargin}>
+                  <Input
+                    type="number"
+                    width={10}
+                    onBlur={(event) => allowOnblur.current && onUnloadValueChange(event, 0)}
+                    defaultValue={condition.unloadEvaluator?.params[0]}
+                  />
+                </InlineField>
+              </div>
+              <div className={styles.button}>TO</div>
+              <div className={styles.range}>
+                <InlineField invalid={Boolean(errorMsgTo)} error={errorMsgTo}>
+                  <Input
+                    type="number"
+                    width={10}
+                    onBlur={(event) => allowOnblur.current && onUnloadValueChange(event, 1)}
+                    defaultValue={condition.unloadEvaluator?.params[1]}
+                  />
+                </InlineField>
+              </div>
+            </Stack>
+          </InlineField>
+        </InlineFieldRow>
+      );
+    } else {
+      return (
+        <InlineFieldRow className={styles.hysteresis}>
+          <InlineField label="Stop alerting when inside range" labelWidth={'auto'}>
+            <Stack direction="row" gap={0}>
+              <div className={styles.range}>
+                <InlineField invalid={Boolean(errorMsgFrom)} error={errorMsgFrom}>
+                  <Input
+                    type="number"
+                    width={10}
+                    onBlur={(event) => allowOnblur.current && onUnloadValueChange(event, 0)}
+                    defaultValue={condition.unloadEvaluator?.params[0]}
+                  />
+                </InlineField>
+              </div>
+
+              <div className={styles.button}>TO</div>
+              <div className={styles.range}>
+                <InlineField invalid={Boolean(errorMsgTo)} error={errorMsgTo}>
+                  <Input
+                    type="number"
+                    width={10}
+                    onBlur={(event) => allowOnblur.current && onUnloadValueChange(event, 1)}
+                    defaultValue={condition.unloadEvaluator?.params[1]}
+                  />
+                </InlineField>
+              </div>
+            </Stack>
+          </InlineField>
+        </InlineFieldRow>
+      );
+    }
+  }
+
+  function RecoveryForSingleValue({ allowOnblur }: RecoveryProps) {
+    if (condition.evaluator.type === EvalFunction.IsAbove) {
+      return (
+        <InlineFieldRow className={styles.hysteresis}>
+          <InlineField
+            label="Stop alerting when below"
+            labelWidth={'auto'}
+            invalid={Boolean(invalidErrorMsg)}
+            error={invalidErrorMsg}
+          >
+            <Input
+              type="number"
+              width={10}
+              onBlur={(event) => {
+                allowOnblur.current && onUnloadValueChange(event, 0);
+              }}
+              defaultValue={condition.unloadEvaluator?.params[0]}
+            />
+          </InlineField>
+        </InlineFieldRow>
+      );
+    } else {
+      return (
+        <InlineFieldRow className={styles.hysteresis}>
+          <InlineField
+            label="Stop alerting when above"
+            labelWidth={'auto'}
+            invalid={Boolean(invalidErrorMsg)}
+            error={invalidErrorMsg}
+          >
+            <Input
+              type="number"
+              width={10}
+              onBlur={(event) => {
+                allowOnblur.current && onUnloadValueChange(event, 0);
+              }}
+              defaultValue={condition.unloadEvaluator?.params[0]}
+            />
+          </InlineField>
+        </InlineFieldRow>
+      );
+    }
+  }
 }
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  buttonSelectText: css`
-    color: ${theme.colors.primary.text};
-    font-size: ${theme.typography.bodySmall.fontSize};
-    text-transform: uppercase;
-  `,
-  button: css`
-    height: 32px;
-
-    color: ${theme.colors.primary.text};
-    font-size: ${theme.typography.bodySmall.fontSize};
-    text-transform: uppercase;
-
-    display: flex;
-    align-items: center;
-    border-radius: ${theme.shape.radius.default};
-    font-weight: ${theme.typography.fontWeightBold};
-    border: 1px solid ${theme.colors.border.medium};
-    white-space: nowrap;
-    padding: 0 ${theme.spacing(1)};
-    background-color: ${theme.colors.background.primary};
-  `,
+  buttonSelectText: css({
+    color: theme.colors.primary.text,
+    fontSize: theme.typography.bodySmall.fontSize,
+    textTransform: 'uppercase',
+    padding: `0 ${theme.spacing(1)}`,
+  }),
+  button: css({
+    height: '32px',
+    color: theme.colors.primary.text,
+    fontSize: theme.typography.bodySmall.fontSize,
+    textTransform: 'uppercase',
+    display: 'flex',
+    alignItems: 'center',
+    borderRadius: theme.shape.radius.default,
+    fontWeight: theme.typography.fontWeightBold,
+    border: `1px solid ${theme.colors.border.medium}`,
+    whiteSpace: 'nowrap',
+    padding: `0 ${theme.spacing(1)}`,
+    backgroundColor: theme.colors.background.primary,
+  }),
+  range: css({
+    width: 'min-content',
+  }),
+  hysteresis: css({
+    marginTop: theme.spacing(2),
+  }),
+  switch: css({
+    paddingLeft: theme.spacing(1),
+  }),
+  noMargin: css({
+    margin: 0,
+  }),
 });
diff --git a/public/app/features/expressions/components/__snapshots__/hysteresis.test.ts.snap b/public/app/features/expressions/components/__snapshots__/hysteresis.test.ts.snap
new file mode 100644
index 0000000000000..452fcd7305a6a
--- /dev/null
+++ b/public/app/features/expressions/components/__snapshots__/hysteresis.test.ts.snap
@@ -0,0 +1,212 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`thresholdReducer Should update unlooadEvaluator when checking hysteresis 1`] = `
+{
+  "conditions": [
+    {
+      "evaluator": {
+        "params": [
+          10,
+          0,
+        ],
+        "type": "gt",
+      },
+      "query": {
+        "params": [
+          "A",
+          "B",
+        ],
+      },
+      "reducer": {
+        "params": [],
+        "type": "avg",
+      },
+      "type": "query",
+      "unloadEvaluator": {
+        "params": [
+          10,
+          0,
+        ],
+        "type": "lt",
+      },
+    },
+  ],
+  "refId": "A",
+  "type": "threshold",
+}
+`;
+
+exports[`thresholdReducer Should update unlooadEvaluator when unchecking hysteresis 1`] = `
+{
+  "conditions": [
+    {
+      "evaluator": {
+        "params": [
+          10,
+          0,
+        ],
+        "type": "gt",
+      },
+      "query": {
+        "params": [
+          "A",
+          "B",
+        ],
+      },
+      "reducer": {
+        "params": [],
+        "type": "avg",
+      },
+      "type": "query",
+      "unloadEvaluator": undefined,
+    },
+  ],
+  "refId": "A",
+  "type": "threshold",
+}
+`;
+
+exports[`thresholdReducer should update Threshold Type, and unloadEvaluator params and type  1`] = `
+{
+  "conditions": [
+    {
+      "evaluator": {
+        "params": [
+          10,
+          0,
+        ],
+        "type": "lt",
+      },
+      "query": {
+        "params": [
+          "A",
+          "B",
+        ],
+      },
+      "reducer": {
+        "params": [],
+        "type": "avg",
+      },
+      "type": "query",
+      "unloadEvaluator": {
+        "params": [
+          10,
+          0,
+        ],
+        "type": "gt",
+      },
+    },
+  ],
+  "refId": "A",
+  "type": "threshold",
+}
+`;
+
+exports[`thresholdReducer should update expression with RefId 1`] = `
+{
+  "conditions": [
+    {
+      "evaluator": {
+        "params": [
+          10,
+          0,
+        ],
+        "type": "gt",
+      },
+      "query": {
+        "params": [
+          "A",
+          "B",
+        ],
+      },
+      "reducer": {
+        "params": [],
+        "type": "avg",
+      },
+      "type": "query",
+      "unloadEvaluator": {
+        "params": [
+          10,
+          0,
+        ],
+        "type": "lt",
+      },
+    },
+  ],
+  "expression": "B",
+  "refId": "A",
+  "type": "threshold",
+}
+`;
+
+exports[`thresholdReducer should update unloadParams no error when are invalid 1`] = `
+{
+  "conditions": [
+    {
+      "evaluator": {
+        "params": [
+          10,
+          0,
+        ],
+        "type": "gt",
+      },
+      "query": {
+        "params": [
+          "A",
+          "B",
+        ],
+      },
+      "reducer": {
+        "params": [],
+        "type": "avg",
+      },
+      "type": "query",
+      "unloadEvaluator": {
+        "params": [
+          20,
+          0,
+        ],
+        "type": "lt",
+      },
+    },
+  ],
+  "refId": "A",
+  "type": "threshold",
+}
+`;
+
+exports[`thresholdReducer should update unloadParams with no error when are valid 1`] = `
+{
+  "conditions": [
+    {
+      "evaluator": {
+        "params": [
+          10,
+          0,
+        ],
+        "type": "gt",
+      },
+      "query": {
+        "params": [
+          "A",
+          "B",
+        ],
+      },
+      "reducer": {
+        "params": [],
+        "type": "avg",
+      },
+      "type": "query",
+      "unloadEvaluator": {
+        "params": [
+          9,
+          0,
+        ],
+        "type": "lt",
+      },
+    },
+  ],
+  "refId": "A",
+  "type": "threshold",
+}
+`;
diff --git a/public/app/features/expressions/components/hysteresis.test.ts b/public/app/features/expressions/components/hysteresis.test.ts
new file mode 100644
index 0000000000000..656e44adf5432
--- /dev/null
+++ b/public/app/features/expressions/components/hysteresis.test.ts
@@ -0,0 +1,217 @@
+import { EvalFunction } from 'app/features/alerting/state/alertDef';
+
+import { ClassicCondition, ExpressionQueryType, ThresholdExpressionQuery } from '../types';
+
+import {
+  isInvalid,
+  thresholdReducer,
+  updateHysteresisChecked,
+  updateRefId,
+  updateThresholdType,
+  updateUnloadParams,
+} from './thresholdReducer';
+
+describe('isInvalid', () => {
+  it('returns an error message if unloadEvaluator.params[0] is undefined', () => {
+    const condition: ClassicCondition = {
+      unloadEvaluator: {
+        type: EvalFunction.IsAbove,
+        params: [],
+      },
+      evaluator: { type: EvalFunction.IsAbove, params: [10] },
+      query: { params: ['A', 'B'] },
+      reducer: { type: 'avg', params: [] },
+      type: 'query',
+    };
+    expect(isInvalid(condition)).toEqual({ errorMsg: 'This value cannot be empty' });
+  });
+
+  it('When using is above, returns an error message if the value in unloadevaluator is above the threshold', () => {
+    const condition: ClassicCondition = {
+      unloadEvaluator: {
+        type: EvalFunction.IsAbove,
+        params: [15],
+      },
+      evaluator: { type: EvalFunction.IsAbove, params: [10] },
+      query: { params: ['A', 'B'] },
+      reducer: { type: 'avg', params: [] },
+      type: 'query',
+    };
+    expect(isInvalid(condition)).toEqual({ errorMsg: 'Enter a number less than or equal to 10' });
+  });
+
+  it('When using is below, returns an error message if the value in unloadevaluator is below the threshold', () => {
+    const condition: ClassicCondition = {
+      unloadEvaluator: {
+        type: EvalFunction.IsAbove,
+        params: [9],
+      },
+      evaluator: { type: EvalFunction.IsBelow, params: [10] },
+      query: { params: ['A', 'B'] },
+      reducer: { type: 'avg', params: [] },
+      type: 'query',
+    };
+    expect(isInvalid(condition)).toEqual({ errorMsg: 'Enter a number more than or equal to 10' });
+  });
+
+  it('When using is within range, returns an error message if the value in unloadevaluator is within the range', () => {
+    // first parameter is wrong
+    const condition: ClassicCondition = {
+      unloadEvaluator: {
+        type: EvalFunction.IsOutsideRange,
+        params: [11, 21],
+      },
+      evaluator: { type: EvalFunction.IsWithinRange, params: [10, 20] },
+      query: { params: ['A', 'B'] },
+      reducer: { type: 'avg', params: [] },
+      type: 'query',
+    };
+    expect(isInvalid(condition)).toEqual({ errorMsgFrom: 'Enter a number less than or equal to 10' });
+    // second parameter is wrong
+    const condition2: ClassicCondition = {
+      unloadEvaluator: {
+        type: EvalFunction.IsOutsideRange,
+        params: [9, 19],
+      },
+      evaluator: { type: EvalFunction.IsWithinRange, params: [10, 20] },
+      query: { params: ['A', 'B'] },
+      reducer: { type: 'avg', params: [] },
+      type: 'query',
+    };
+    expect(isInvalid(condition2)).toEqual({ errorMsgTo: 'Enter a number be more than or equal to 20' });
+  });
+  it('When using is outside range, returns an error message if the value in unloadevaluator is outside the range', () => {
+    // first parameter is wrong
+    const condition: ClassicCondition = {
+      unloadEvaluator: {
+        type: EvalFunction.IsWithinRange,
+        params: [8, 19],
+      },
+      evaluator: { type: EvalFunction.IsOutsideRange, params: [10, 20] },
+      query: { params: ['A', 'B'] },
+      reducer: { type: 'avg', params: [] },
+      type: 'query',
+    };
+    expect(isInvalid(condition)).toEqual({ errorMsgFrom: 'Enter a number more than or equal to 10' });
+    // second parameter is wrong
+    const condition2: ClassicCondition = {
+      unloadEvaluator: {
+        type: EvalFunction.IsWithinRange,
+        params: [11, 21],
+      },
+      evaluator: { type: EvalFunction.IsOutsideRange, params: [10, 20] },
+      query: { params: ['A', 'B'] },
+      reducer: { type: 'avg', params: [] },
+      type: 'query',
+    };
+    expect(isInvalid(condition2)).toEqual({ errorMsgTo: 'Enter a number less than or equal to 20' });
+  });
+});
+
+describe('thresholdReducer', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+  const onError = jest.fn();
+  const thresholdCondition: ClassicCondition = {
+    evaluator: { type: EvalFunction.IsAbove, params: [10, 0] },
+    unloadEvaluator: {
+      type: EvalFunction.IsBelow,
+      params: [10, 0],
+    },
+    query: { params: ['A', 'B'] },
+    reducer: { type: 'avg', params: [] },
+    type: 'query',
+  };
+
+  it('should return initial state', () => {
+    expect(thresholdReducer(undefined, { type: undefined })).toEqual({
+      type: ExpressionQueryType.threshold,
+      conditions: [],
+      refId: '',
+    });
+  });
+  it('should update expression with RefId', () => {
+    const initialState: ThresholdExpressionQuery = {
+      type: ExpressionQueryType.threshold,
+      refId: 'A',
+      conditions: [thresholdCondition],
+    };
+
+    const newState = thresholdReducer(initialState, updateRefId('B'));
+
+    expect(newState).toMatchSnapshot();
+    expect(newState.expression).toEqual('B');
+  });
+  it('should update Threshold Type, and unloadEvaluator params and type ', () => {
+    const initialState: ThresholdExpressionQuery = {
+      type: ExpressionQueryType.threshold,
+      refId: 'A',
+      conditions: [thresholdCondition],
+    };
+
+    const newState = thresholdReducer(
+      initialState,
+      updateThresholdType({ evalFunction: EvalFunction.IsBelow, onError })
+    );
+
+    expect(newState).toMatchSnapshot();
+    expect(newState.conditions[0].evaluator.type).toEqual(EvalFunction.IsBelow);
+    expect(newState.conditions[0].unloadEvaluator?.type).toEqual(EvalFunction.IsAbove);
+    expect(onError).toHaveBeenCalledWith(undefined);
+    expect(newState.conditions[0].unloadEvaluator?.params[0]).toEqual(10);
+  });
+  it('Should update unlooadEvaluator when checking hysteresis', () => {
+    const initialState: ThresholdExpressionQuery = {
+      type: ExpressionQueryType.threshold,
+      refId: 'A',
+      conditions: [thresholdCondition],
+    };
+
+    const newState = thresholdReducer(initialState, updateHysteresisChecked({ hysteresisChecked: true, onError }));
+
+    expect(newState).toMatchSnapshot();
+    expect(newState.conditions[0].unloadEvaluator?.type).toEqual(EvalFunction.IsBelow);
+    expect(newState.conditions[0].unloadEvaluator?.params[0]).toEqual(10);
+  });
+  it('Should update unlooadEvaluator when unchecking hysteresis', () => {
+    const initialState: ThresholdExpressionQuery = {
+      type: ExpressionQueryType.threshold,
+      refId: 'A',
+      conditions: [thresholdCondition],
+    };
+
+    const newState = thresholdReducer(initialState, updateHysteresisChecked({ hysteresisChecked: false, onError }));
+
+    expect(newState).toMatchSnapshot();
+    expect(newState.conditions[0].unloadEvaluator).toEqual(undefined);
+    expect(onError).toHaveBeenCalledWith(undefined);
+  });
+
+  it('should update unloadParams with no error when are valid', () => {
+    const initialState: ThresholdExpressionQuery = {
+      type: ExpressionQueryType.threshold,
+      refId: 'A',
+      conditions: [thresholdCondition],
+    };
+
+    const newState = thresholdReducer(initialState, updateUnloadParams({ param: 9, index: 0, onError }));
+
+    expect(newState).toMatchSnapshot();
+    expect(newState.conditions[0].unloadEvaluator?.params[0]).toEqual(9);
+    expect(onError).toHaveBeenCalledWith(undefined);
+  });
+  it('should update unloadParams no error when are invalid', () => {
+    const initialState: ThresholdExpressionQuery = {
+      type: ExpressionQueryType.threshold,
+      refId: 'A',
+      conditions: [thresholdCondition],
+    };
+
+    const newState = thresholdReducer(initialState, updateUnloadParams({ param: 20, index: 0, onError }));
+
+    expect(newState).toMatchSnapshot();
+    expect(newState.conditions[0].unloadEvaluator?.params[0]).toEqual(20);
+    expect(onError).toHaveBeenCalledWith('Enter a number less than or equal to 10');
+  });
+});
diff --git a/public/app/features/expressions/components/thresholdReducer.ts b/public/app/features/expressions/components/thresholdReducer.ts
new file mode 100644
index 0000000000000..7fa1e428a9867
--- /dev/null
+++ b/public/app/features/expressions/components/thresholdReducer.ts
@@ -0,0 +1,172 @@
+import { createAction, createReducer } from '@reduxjs/toolkit';
+
+import { EvalFunction } from 'app/features/alerting/state/alertDef';
+
+import { ClassicCondition, ExpressionQueryType, ThresholdExpressionQuery } from '../types';
+
+export const updateRefId = createAction<string | undefined>('thresold/updateRefId');
+export const updateThresholdType = createAction<{
+  evalFunction: EvalFunction;
+  onError: ((error: string | undefined) => void) | undefined;
+}>('thresold/updateThresholdType');
+export const updateThresholdParams = createAction<{ param: number; index: number }>('thresold/updateThresholdParams');
+export const updateHysteresisChecked = createAction<{
+  hysteresisChecked: boolean;
+  onError: ((error: string | undefined) => void) | undefined;
+}>('thresold/updateHysteresis');
+export const updateUnloadParams = createAction<{
+  param: number;
+  index: number;
+  onError: ((error: string | undefined) => void) | undefined;
+}>('thresold/updateUnloadParams');
+
+export const thresholdReducer = createReducer<ThresholdExpressionQuery>(
+  { type: ExpressionQueryType.threshold, refId: '', conditions: [] },
+  (builder) => {
+    builder.addCase(updateRefId, (state, action) => {
+      state.expression = action.payload;
+    });
+    builder.addCase(updateThresholdType, (state, action) => {
+      const typeInPayload = action.payload.evalFunction;
+      const onError = action.payload.onError;
+
+      //set new type in evaluator
+      state.conditions[0].evaluator.type = typeInPayload;
+
+      // check if hysteresis is checked
+      const hsyteresisIsChecked = Boolean(state.conditions[0].unloadEvaluator);
+
+      if (hsyteresisIsChecked) {
+        // when type whas changed and hsyteresIsChecked, we need to update the type for the unload evaluator with the opposite type
+        const updatedUnloadType = getUnloadEvaluatorTypeFromEvaluatorType(state.conditions[0].evaluator.type);
+
+        // set error to undefined when type is changed as we default to the new type that is valid
+        if (onError) {
+          onError(undefined); //clear error
+        }
+        // set newtype in evaluator
+        state.conditions[0].evaluator.type = typeInPayload;
+        // set new type and params in unload evaluator
+        const defaultUnloadEvaluator = {
+          type: updatedUnloadType,
+          params: state.conditions[0].evaluator?.params ?? [0, 0],
+        };
+        state.conditions[0].unloadEvaluator = defaultUnloadEvaluator;
+      }
+    });
+    builder.addCase(updateThresholdParams, (state, action) => {
+      const { param, index } = action.payload;
+      state.conditions[0].evaluator.params[index] = param;
+    });
+    builder.addCase(updateHysteresisChecked, (state, action) => {
+      const { hysteresisChecked, onError } = action.payload;
+      if (!hysteresisChecked) {
+        state.conditions[0].unloadEvaluator = undefined;
+        if (onError) {
+          onError(undefined); // clear error
+        }
+      } else {
+        state.conditions[0].unloadEvaluator = {
+          type: getUnloadEvaluatorTypeFromEvaluatorType(state.conditions[0].evaluator.type),
+          params: state.conditions[0].evaluator?.params ?? [0, 0],
+        };
+      }
+    });
+    builder.addCase(updateUnloadParams, (state, action) => {
+      const { param, index, onError } = action.payload;
+      // if there is no unload evaluator, we use the default evaluator params
+      if (!state.conditions[0].unloadEvaluator) {
+        state.conditions[0].unloadEvaluator = {
+          type: getUnloadEvaluatorTypeFromEvaluatorType(state.conditions[0].evaluator.type),
+          params: state.conditions[0].evaluator?.params ?? [0, 0],
+        };
+      } else {
+        // only update the param
+        state.conditions[0].unloadEvaluator!.params[index] = param;
+      }
+      // check if is valid for the new unload evaluator params
+      const error = isInvalid(state.conditions[0]);
+      const { errorMsg: invalidErrorMsg, errorMsgFrom, errorMsgTo } = error ?? {};
+      const errorMsg = invalidErrorMsg || errorMsgFrom || errorMsgTo;
+      // set error in form manually as we don't have a field for the unload evaluator
+      if (onError) {
+        onError(errorMsg);
+      }
+    });
+  }
+);
+
+function getUnloadEvaluatorTypeFromEvaluatorType(type: EvalFunction) {
+  // we don't let the user change the unload evaluator type. We just change it to the opposite of the evaluator type
+  if (type === EvalFunction.IsAbove) {
+    return EvalFunction.IsBelow;
+  }
+  if (type === EvalFunction.IsBelow) {
+    return EvalFunction.IsAbove;
+  }
+  if (type === EvalFunction.IsWithinRange) {
+    return EvalFunction.IsOutsideRange;
+  }
+  if (type === EvalFunction.IsOutsideRange) {
+    return EvalFunction.IsWithinRange;
+  }
+  return EvalFunction.IsBelow;
+}
+
+export function isInvalid(condition: ClassicCondition) {
+  // first check if the unload evaluator values are not empty
+  const { unloadEvaluator, evaluator } = condition;
+  if (!evaluator) {
+    return;
+  }
+  if (unloadEvaluator?.params[0] === undefined || Number.isNaN(unloadEvaluator?.params[0])) {
+    return { errorMsg: 'This value cannot be empty' };
+  }
+
+  const { type, params: loadParams } = evaluator;
+  const { params: unloadParams } = unloadEvaluator;
+
+  if (type === EvalFunction.IsWithinRange || type === EvalFunction.IsOutsideRange) {
+    if (unloadParams[0] === undefined || Number.isNaN(unloadParams[0])) {
+      return { errorMsgFrom: 'This value cannot be empty' };
+    }
+    if (unloadParams[1] === undefined || Number.isNaN(unloadParams[1])) {
+      return { errorMsgTo: 'This value cannot be empty' };
+    }
+  }
+  // check if the unload evaluator values are valid for the current load evaluator values
+  const [firstParamInUnloadEvaluator, secondParamInUnloadEvaluator] = unloadEvaluator.params;
+  const [firstParamInEvaluator, secondParamInEvaluator] = loadParams;
+
+  switch (type) {
+    case EvalFunction.IsAbove:
+      if (firstParamInUnloadEvaluator > firstParamInEvaluator) {
+        return { errorMsg: `Enter a number less than or equal to ${firstParamInEvaluator}` };
+      }
+      break;
+    case EvalFunction.IsBelow:
+      if (firstParamInUnloadEvaluator < firstParamInEvaluator) {
+        return { errorMsg: `Enter a number more than or equal to ${firstParamInEvaluator}` };
+      }
+      break;
+    case EvalFunction.IsOutsideRange:
+      if (firstParamInUnloadEvaluator < firstParamInEvaluator) {
+        return { errorMsgFrom: `Enter a number more than or equal to ${firstParamInEvaluator}` };
+      }
+      if (secondParamInUnloadEvaluator > secondParamInEvaluator) {
+        return { errorMsgTo: `Enter a number less than or equal to ${secondParamInEvaluator}` };
+      }
+      break;
+    case EvalFunction.IsWithinRange:
+      if (firstParamInUnloadEvaluator > firstParamInEvaluator) {
+        return { errorMsgFrom: `Enter a number less than or equal to ${firstParamInEvaluator}` };
+      }
+      if (secondParamInUnloadEvaluator < secondParamInEvaluator) {
+        return { errorMsgTo: `Enter a number be more than or equal to ${secondParamInEvaluator}` };
+      }
+      break;
+    default:
+      throw new Error(`evaluator function type ${type} not supported.`);
+  }
+  return;
+}
diff --git a/public/app/features/expressions/types.ts b/public/app/features/expressions/types.ts
index e9336353c18da..499ef9fdd3934 100644
--- a/public/app/features/expressions/types.ts
+++ b/public/app/features/expressions/types.ts
@@ -1,4 +1,5 @@
 import { DataQuery, ReducerID, SelectableValue } from '@grafana/data';
+import { config } from 'app/core/config';
 
 import { EvalFunction } from '../alerting/state/alertDef';
 
@@ -13,6 +14,7 @@ export enum ExpressionQueryType {
   resample = 'resample',
   classic = 'classic_conditions',
   threshold = 'threshold',
+  sql = 'sql',
 }
 
 export const getExpressionLabel = (type: ExpressionQueryType) => {
@@ -24,9 +26,11 @@ export const getExpressionLabel = (type: ExpressionQueryType) => {
     case ExpressionQueryType.resample:
       return 'Resample';
     case ExpressionQueryType.classic:
-      return 'Classic condition';
+      return 'Classic condition (legacy)';
     case ExpressionQueryType.threshold:
       return 'Threshold';
+    case ExpressionQueryType.sql:
+      return 'SQL';
   }
 };
 
@@ -49,7 +53,7 @@ export const expressionTypes: Array<SelectableValue<ExpressionQueryType>> = [
   },
   {
     value: ExpressionQueryType.classic,
-    label: 'Classic condition',
+    label: 'Classic condition (legacy)',
     description:
       'Takes one or more time series returned from a query or an expression and checks if any of the series match the condition. Disables multi-dimensional alerts for this rule.',
   },
@@ -59,7 +63,17 @@ export const expressionTypes: Array<SelectableValue<ExpressionQueryType>> = [
     description:
       'Takes one or more time series returned from a query or an expression and checks if any of the series match the threshold condition.',
   },
-];
+  {
+    value: ExpressionQueryType.sql,
+    label: 'SQL',
+    description: 'Transform data using SQL. Supports Aggregate/Analytics functions from DuckDB',
+  },
+].filter((expr) => {
+  if (expr.value === ExpressionQueryType.sql) {
+    return config.featureToggles?.sqlExpressions;
+  }
+  return true;
+});
 
 export const reducerTypes: Array<SelectableValue<string>> = [
   { value: ReducerID.min, label: 'Min', description: 'Get the minimum value' },
@@ -130,6 +144,9 @@ export interface ExpressionQuery extends DataQuery {
   settings?: ExpressionQuerySettings;
 }
 
+export interface ThresholdExpressionQuery extends ExpressionQuery {
+  conditions: ClassicCondition[];
+}
 export interface ExpressionQuerySettings {
   mode?: ReducerMode;
   replaceWithValue?: number;
@@ -140,6 +157,10 @@ export interface ClassicCondition {
     params: number[];
     type: EvalFunction;
   };
+  unloadEvaluator?: {
+    params: number[];
+    type: EvalFunction;
+  };
   operator?: {
     type: string;
   };
diff --git a/public/app/features/folders/AccessControlFolderPermissions.tsx b/public/app/features/folders/AccessControlFolderPermissions.tsx
deleted file mode 100644
index a3db00633b933..0000000000000
--- a/public/app/features/folders/AccessControlFolderPermissions.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import React, { useEffect } from 'react';
-import { connect, ConnectedProps } from 'react-redux';
-
-import { Permissions } from 'app/core/components/AccessControl';
-import { Page } from 'app/core/components/Page/Page';
-import { contextSrv } from 'app/core/core';
-import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
-import { getNavModel } from 'app/core/selectors/navModel';
-import { AccessControlAction, StoreState } from 'app/types';
-
-import { getFolderByUid } from './state/actions';
-import { getLoadingNav } from './state/navModel';
-
-interface RouteProps extends GrafanaRouteComponentProps<{ uid: string }> {}
-
-function mapStateToProps(state: StoreState, props: RouteProps) {
-  const uid = props.match.params.uid;
-  return {
-    uid: uid,
-    pageNav: getNavModel(state.navIndex, `folder-permissions-${uid}`, getLoadingNav(1)),
-  };
-}
-
-const mapDispatchToProps = {
-  getFolderByUid,
-};
-
-const connector = connect(mapStateToProps, mapDispatchToProps);
-export type Props = ConnectedProps<typeof connector>;
-
-export const AccessControlFolderPermissions = ({ uid, getFolderByUid, pageNav }: Props) => {
-  useEffect(() => {
-    getFolderByUid(uid);
-  }, [getFolderByUid, uid]);
-
-  const canSetPermissions = contextSrv.hasPermission(AccessControlAction.FoldersPermissionsWrite);
-
-  return (
-    <Page navId="dashboards/browse" pageNav={pageNav.main}>
-      <Page.Contents>
-        <Permissions resource="folders" resourceId={uid} canSetPermissions={canSetPermissions} />
-      </Page.Contents>
-    </Page>
-  );
-};
-
-export default connector(AccessControlFolderPermissions);
diff --git a/public/app/features/folders/FolderAlerting.tsx b/public/app/features/folders/FolderAlerting.tsx
deleted file mode 100644
index 3e44468c1ba2d..0000000000000
--- a/public/app/features/folders/FolderAlerting.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import React from 'react';
-import { useAsync } from 'react-use';
-
-import { Page } from 'app/core/components/Page/Page';
-import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
-import { getNavModel } from 'app/core/selectors/navModel';
-import { useDispatch, useSelector } from 'app/types';
-
-import { AlertsFolderView } from '../alerting/unified/AlertsFolderView';
-
-import { getFolderByUid } from './state/actions';
-import { getLoadingNav } from './state/navModel';
-
-export interface OwnProps extends GrafanaRouteComponentProps<{ uid: string }> {}
-
-const FolderAlerting = ({ match }: OwnProps) => {
-  const dispatch = useDispatch();
-  const navIndex = useSelector((state) => state.navIndex);
-  const folder = useSelector((state) => state.folder);
-
-  const uid = match.params.uid;
-  const pageNav = getNavModel(navIndex, `folder-alerting-${uid}`, getLoadingNav(1));
-
-  const { loading } = useAsync(async () => dispatch(getFolderByUid(uid)), [getFolderByUid, uid]);
-
-  return (
-    <Page navId="dashboards/browse" pageNav={pageNav.main}>
-      <Page.Contents isLoading={loading}>
-        <AlertsFolderView folder={folder} />
-      </Page.Contents>
-    </Page>
-  );
-};
-
-export default FolderAlerting;
diff --git a/public/app/features/folders/FolderLibraryPanelsPage.tsx b/public/app/features/folders/FolderLibraryPanelsPage.tsx
deleted file mode 100644
index 3708da258d05c..0000000000000
--- a/public/app/features/folders/FolderLibraryPanelsPage.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import React, { useState } from 'react';
-import { connect, ConnectedProps } from 'react-redux';
-import { useAsync } from 'react-use';
-
-import { Page } from 'app/core/components/Page/Page';
-
-import { GrafanaRouteComponentProps } from '../../core/navigation/types';
-import { getNavModel } from '../../core/selectors/navModel';
-import { StoreState } from '../../types';
-import { LibraryPanelsSearch } from '../library-panels/components/LibraryPanelsSearch/LibraryPanelsSearch';
-import { OpenLibraryPanelModal } from '../library-panels/components/OpenLibraryPanelModal/OpenLibraryPanelModal';
-import { LibraryElementDTO } from '../library-panels/types';
-
-import { getFolderByUid } from './state/actions';
-import { getLoadingNav } from './state/navModel';
-
-export interface OwnProps extends GrafanaRouteComponentProps<{ uid: string }> {}
-
-const mapStateToProps = (state: StoreState, props: OwnProps) => {
-  const uid = props.match.params.uid;
-  return {
-    pageNav: getNavModel(state.navIndex, `folder-library-panels-${uid}`, getLoadingNav(1)),
-    folderUid: uid,
-  };
-};
-
-const mapDispatchToProps = {
-  getFolderByUid,
-};
-
-const connector = connect(mapStateToProps, mapDispatchToProps);
-
-export type Props = OwnProps & ConnectedProps<typeof connector>;
-
-export function FolderLibraryPanelsPage({ pageNav, getFolderByUid, folderUid }: Props): JSX.Element {
-  const { loading } = useAsync(async () => await getFolderByUid(folderUid), [getFolderByUid, folderUid]);
-  const [selected, setSelected] = useState<LibraryElementDTO | undefined>(undefined);
-
-  return (
-    <Page navId="dashboards/browse" pageNav={pageNav.main}>
-      <Page.Contents isLoading={loading}>
-        <LibraryPanelsSearch
-          onClick={setSelected}
-          currentFolderUID={folderUid}
-          showSecondaryActions
-          showSort
-          showPanelFilter
-        />
-        {selected ? <OpenLibraryPanelModal onDismiss={() => setSelected(undefined)} libraryPanel={selected} /> : null}
-      </Page.Contents>
-    </Page>
-  );
-}
-
-export default connector(FolderLibraryPanelsPage);
diff --git a/public/app/features/folders/FolderPermissions.tsx b/public/app/features/folders/FolderPermissions.tsx
deleted file mode 100644
index e624a03a485d9..0000000000000
--- a/public/app/features/folders/FolderPermissions.tsx
+++ /dev/null
@@ -1,130 +0,0 @@
-import React, { PureComponent } from 'react';
-import { connect, ConnectedProps } from 'react-redux';
-
-import { Tooltip, Icon, Button } from '@grafana/ui';
-import { SlideDown } from 'app/core/components/Animations/SlideDown';
-import { Page } from 'app/core/components/Page/Page';
-import AddPermission from 'app/core/components/PermissionList/AddPermission';
-import PermissionList from 'app/core/components/PermissionList/PermissionList';
-import PermissionsInfo from 'app/core/components/PermissionList/PermissionsInfo';
-import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
-import { getNavModel } from 'app/core/selectors/navModel';
-import { StoreState } from 'app/types';
-import { DashboardAcl, PermissionLevel, NewDashboardAclItem } from 'app/types/acl';
-
-import {
-  getFolderByUid,
-  getFolderPermissions,
-  updateFolderPermission,
-  removeFolderPermission,
-  addFolderPermission,
-} from './state/actions';
-import { getLoadingNav } from './state/navModel';
-
-export interface OwnProps extends GrafanaRouteComponentProps<{ uid: string }> {}
-
-const mapStateToProps = (state: StoreState, props: OwnProps) => {
-  const uid = props.match.params.uid;
-  return {
-    pageNav: getNavModel(state.navIndex, `folder-permissions-${uid}`, getLoadingNav(1)),
-    folderUid: uid,
-    folder: state.folder,
-  };
-};
-
-const mapDispatchToProps = {
-  getFolderByUid,
-  getFolderPermissions,
-  updateFolderPermission,
-  removeFolderPermission,
-  addFolderPermission,
-};
-
-const connector = connect(mapStateToProps, mapDispatchToProps);
-
-export type Props = OwnProps & ConnectedProps<typeof connector>;
-
-export interface State {
-  isAdding: boolean;
-}
-
-export class FolderPermissions extends PureComponent<Props, State> {
-  constructor(props: Props) {
-    super(props);
-
-    this.state = {
-      isAdding: false,
-    };
-  }
-
-  componentDidMount() {
-    this.props.getFolderByUid(this.props.folderUid);
-    this.props.getFolderPermissions(this.props.folderUid);
-  }
-
-  onOpenAddPermissions = () => {
-    this.setState({ isAdding: true });
-  };
-
-  onRemoveItem = (item: DashboardAcl) => {
-    this.props.removeFolderPermission(item);
-  };
-
-  onPermissionChanged = (item: DashboardAcl, level: PermissionLevel) => {
-    this.props.updateFolderPermission(item, level);
-  };
-
-  onAddPermission = (newItem: NewDashboardAclItem) => {
-    return this.props.addFolderPermission(newItem);
-  };
-
-  onCancelAddPermission = () => {
-    this.setState({ isAdding: false });
-  };
-
-  render() {
-    const { pageNav, folder } = this.props;
-    const { isAdding } = this.state;
-
-    if (folder.id === 0) {
-      return (
-        <Page navId="dashboards/browse" pageNav={pageNav.main}>
-          <Page.Contents isLoading={true}>
-            <span />
-          </Page.Contents>
-        </Page>
-      );
-    }
-
-    const folderInfo = { title: folder.title, url: folder.url, id: folder.id };
-
-    return (
-      <Page navId="dashboards/browse" pageNav={pageNav.main}>
-        <Page.Contents>
-          <div className="page-action-bar">
-            <h3 className="page-sub-heading">Folder Permissions</h3>
-            <Tooltip placement="auto" content={<PermissionsInfo />}>
-              <Icon className="icon--has-hover page-sub-heading-icon" name="question-circle" />
-            </Tooltip>
-            <div className="page-action-bar__spacer" />
-            <Button className="pull-right" onClick={this.onOpenAddPermissions} disabled={isAdding}>
-              Add Permission
-            </Button>
-          </div>
-          <SlideDown in={isAdding}>
-            <AddPermission onAddPermission={this.onAddPermission} onCancel={this.onCancelAddPermission} />
-          </SlideDown>
-          <PermissionList
-            items={folder.permissions}
-            onRemoveItem={this.onRemoveItem}
-            onPermissionChanged={this.onPermissionChanged}
-            isFetching={false}
-            folderInfo={folderInfo}
-          />
-        </Page.Contents>
-      </Page>
-    );
-  }
-}
-
-export default connector(FolderPermissions);
diff --git a/public/app/features/folders/FolderSettingsPage.test.tsx b/public/app/features/folders/FolderSettingsPage.test.tsx
deleted file mode 100644
index 18b0e40ead8c4..0000000000000
--- a/public/app/features/folders/FolderSettingsPage.test.tsx
+++ /dev/null
@@ -1,191 +0,0 @@
-import { render, screen, within } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import React from 'react';
-import { mockToolkitActionCreator } from 'test/core/redux/mocks';
-import { TestProvider } from 'test/helpers/TestProvider';
-
-import { NavModel } from '@grafana/data';
-import { getRouteComponentProps } from 'app/core/navigation/__mocks__/routeProps';
-import { ModalManager } from 'app/core/services/ModalManager';
-
-import { FolderSettingsPage, Props } from './FolderSettingsPage';
-import { setFolderTitle } from './state/reducers';
-
-const setup = (propOverrides?: object) => {
-  const props: Props = {
-    ...getRouteComponentProps(),
-    pageNav: {} as NavModel,
-    folderUid: '1234',
-    folder: {
-      id: 0,
-      uid: '1234',
-      title: 'loading',
-      canSave: true,
-      canDelete: true,
-      url: 'url',
-      hasChanged: false,
-      version: 1,
-      permissions: [],
-      canViewFolderPermissions: true,
-    },
-    getFolderByUid: jest.fn(),
-    setFolderTitle: mockToolkitActionCreator(setFolderTitle),
-    saveFolder: jest.fn(),
-    deleteFolder: jest.fn(),
-  };
-
-  Object.assign(props, propOverrides);
-
-  render(
-    <TestProvider>
-      <FolderSettingsPage {...props} />
-    </TestProvider>
-  );
-};
-
-describe('FolderSettingsPage', () => {
-  it('should render without error', () => {
-    expect(() => setup()).not.toThrow();
-  });
-
-  it('should enable save button when canSave is true and hasChanged is true', () => {
-    setup({
-      folder: {
-        id: 1,
-        uid: '1234',
-        title: 'loading',
-        canSave: true,
-        canDelete: true,
-        hasChanged: true,
-        version: 1,
-      },
-    });
-    const saveButton = screen.getByRole('button', { name: 'Save' });
-    expect(saveButton).not.toBeDisabled();
-  });
-
-  it('should disable save button when canSave is false and hasChanged is false', () => {
-    setup({
-      folder: {
-        id: 1,
-        uid: '1234',
-        title: 'loading',
-        canSave: false,
-        canDelete: true,
-        hasChanged: false,
-        version: 1,
-      },
-    });
-    const saveButton = screen.getByRole('button', { name: 'Save' });
-    expect(saveButton).toBeDisabled();
-  });
-
-  it('should disable save button when canSave is true and hasChanged is false', () => {
-    setup({
-      folder: {
-        id: 1,
-        uid: '1234',
-        title: 'loading',
-        canSave: true,
-        canDelete: true,
-        hasChanged: false,
-        version: 1,
-      },
-    });
-    const saveButton = screen.getByRole('button', { name: 'Save' });
-    expect(saveButton).toBeDisabled();
-  });
-
-  it('should disable save button when canSave is false and hasChanged is true', () => {
-    setup({
-      folder: {
-        id: 1,
-        uid: '1234',
-        title: 'loading',
-        canSave: false,
-        canDelete: true,
-        hasChanged: true,
-        version: 1,
-      },
-    });
-    const saveButton = screen.getByRole('button', { name: 'Save' });
-    expect(saveButton).toBeDisabled();
-  });
-
-  it('should call onSave when the saveButton is clicked', async () => {
-    const mockSaveFolder = jest.fn();
-    const mockFolder = {
-      id: 1,
-      uid: '1234',
-      title: 'loading',
-      canSave: true,
-      canDelete: true,
-      hasChanged: true,
-      version: 1,
-    };
-    setup({
-      folder: mockFolder,
-      saveFolder: mockSaveFolder,
-    });
-    const saveButton = screen.getByRole('button', { name: 'Save' });
-    await userEvent.click(saveButton);
-    expect(mockSaveFolder).toHaveBeenCalledWith(mockFolder);
-  });
-
-  it('should disable delete button when canDelete is false', () => {
-    setup({
-      folder: {
-        id: 1,
-        uid: '1234',
-        title: 'loading',
-        canSave: true,
-        canDelete: false,
-        hasChanged: true,
-        version: 1,
-      },
-    });
-    const deleteButton = screen.getByRole('button', { name: 'Delete' });
-    expect(deleteButton).toBeDisabled();
-  });
-
-  it('should enable delete button when canDelete is true', () => {
-    setup({
-      folder: {
-        id: 1,
-        uid: '1234',
-        title: 'loading',
-        canSave: true,
-        canDelete: true,
-        hasChanged: true,
-        version: 1,
-      },
-    });
-    const deleteButton = screen.getByRole('button', { name: 'Delete' });
-    expect(deleteButton).not.toBeDisabled();
-  });
-
-  it('should call the publish event when the deleteButton is clicked', async () => {
-    new ModalManager().init();
-    const mockDeleteFolder = jest.fn();
-    const mockFolder = {
-      id: 1,
-      uid: '1234',
-      title: 'loading',
-      canSave: true,
-      canDelete: true,
-      hasChanged: true,
-      version: 1,
-    };
-    setup({
-      folder: mockFolder,
-      deleteFolder: mockDeleteFolder,
-    });
-    const deleteButton = screen.getByRole('button', { name: 'Delete' });
-    await userEvent.click(deleteButton);
-    const deleteModal = screen.getByRole('dialog', { name: 'Delete' });
-    expect(deleteModal).toBeInTheDocument();
-    const deleteButtonModal = within(deleteModal).getByRole('button', { name: 'Delete' });
-    await userEvent.click(deleteButtonModal);
-    expect(mockDeleteFolder).toHaveBeenCalledWith(mockFolder.uid);
-  });
-});
diff --git a/public/app/features/folders/FolderSettingsPage.tsx b/public/app/features/folders/FolderSettingsPage.tsx
deleted file mode 100644
index f24767c17dac6..0000000000000
--- a/public/app/features/folders/FolderSettingsPage.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-import React, { PureComponent } from 'react';
-import { connect, ConnectedProps } from 'react-redux';
-
-import { Field, Form, Button, Input, InputControl } from '@grafana/ui';
-import appEvents from 'app/core/app_events';
-import { Page } from 'app/core/components/Page/Page';
-import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
-import { getNavModel } from 'app/core/selectors/navModel';
-import { StoreState } from 'app/types';
-
-import { ShowConfirmModalEvent } from '../../types/events';
-
-import { deleteFolder, getFolderByUid, saveFolder } from './state/actions';
-import { getLoadingNav } from './state/navModel';
-import { setFolderTitle } from './state/reducers';
-
-export interface OwnProps extends GrafanaRouteComponentProps<{ uid: string }> {}
-
-const mapStateToProps = (state: StoreState, props: OwnProps) => {
-  const uid = props.match.params.uid;
-  return {
-    pageNav: getNavModel(state.navIndex, `folder-settings-${uid}`, getLoadingNav(2)),
-    folderUid: uid,
-    folder: state.folder,
-  };
-};
-
-const mapDispatchToProps = {
-  getFolderByUid,
-  saveFolder,
-  setFolderTitle,
-  deleteFolder,
-};
-
-const connector = connect(mapStateToProps, mapDispatchToProps);
-
-export type Props = OwnProps & ConnectedProps<typeof connector>;
-
-export interface State {
-  isLoading: boolean;
-}
-
-export class FolderSettingsPage extends PureComponent<Props, State> {
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      isLoading: false,
-    };
-  }
-
-  componentDidMount() {
-    this.props.getFolderByUid(this.props.folderUid);
-  }
-
-  onTitleChange = (evt: React.ChangeEvent<HTMLInputElement>) => {
-    this.props.setFolderTitle(evt.target.value);
-  };
-
-  onSave = () => {
-    this.setState({ isLoading: true });
-    this.props.saveFolder(this.props.folder);
-    this.setState({ isLoading: false });
-  };
-
-  onDelete = (evt: React.MouseEvent<HTMLButtonElement>) => {
-    evt.stopPropagation();
-    evt.preventDefault();
-
-    const confirmationText = `Do you want to delete this folder and all its dashboards and alerts?`;
-    appEvents.publish(
-      new ShowConfirmModalEvent({
-        title: 'Delete',
-        text: confirmationText,
-        icon: 'trash-alt',
-        yesText: 'Delete',
-        onConfirm: () => {
-          this.props.deleteFolder(this.props.folder.uid);
-        },
-      })
-    );
-  };
-
-  render() {
-    const { pageNav, folder } = this.props;
-
-    return (
-      <Page navId="dashboards/browse" pageNav={pageNav.main}>
-        <Page.Contents isLoading={this.state.isLoading}>
-          <h3 className="page-sub-heading">Folder settings</h3>
-          <Form name="folderSettingsForm" onSubmit={this.onSave}>
-            {({ control, errors }) => (
-              <>
-                <InputControl
-                  render={({ field: { ref, ...field } }) => (
-                    <Field label="Title" invalid={!!errors.title} error={errors.title?.message}>
-                      <Input {...field} autoFocus onChange={this.onTitleChange} value={folder.title} />
-                    </Field>
-                  )}
-                  control={control}
-                  name="title"
-                />
-                <div className="gf-form-button-row">
-                  <Button type="submit" disabled={!folder.canSave || !folder.hasChanged}>
-                    Save
-                  </Button>
-                  <Button variant="destructive" onClick={this.onDelete} disabled={!folder.canDelete}>
-                    Delete
-                  </Button>
-                </div>
-              </>
-            )}
-          </Form>
-        </Page.Contents>
-      </Page>
-    );
-  }
-}
-
-export default connector(FolderSettingsPage);
diff --git a/public/app/features/folders/components/NewDashboardsFolder.tsx b/public/app/features/folders/components/NewDashboardsFolder.tsx
deleted file mode 100644
index 8844e16207877..0000000000000
--- a/public/app/features/folders/components/NewDashboardsFolder.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import React from 'react';
-import { connect, ConnectedProps } from 'react-redux';
-
-import { NavModelItem } from '@grafana/data';
-import { config } from '@grafana/runtime';
-import { Button, Input, Form, Field, HorizontalGroup, LinkButton } from '@grafana/ui';
-import { Page } from 'app/core/components/Page/Page';
-import { useQueryParams } from 'app/core/hooks/useQueryParams';
-
-import { validationSrv } from '../../manage-dashboards/services/ValidationSrv';
-import { createNewFolder } from '../state/actions';
-
-const mapDispatchToProps = {
-  createNewFolder,
-};
-
-const connector = connect(null, mapDispatchToProps);
-
-interface OwnProps {}
-
-interface FormModel {
-  folderName: string;
-}
-
-type Props = OwnProps & ConnectedProps<typeof connector>;
-
-const initialFormModel: FormModel = { folderName: '' };
-
-const pageNav: NavModelItem = {
-  text: 'Create a new folder',
-  subTitle: 'Folders provide a way to group dashboards and alert rules.',
-};
-
-function NewDashboardsFolder({ createNewFolder }: Props) {
-  const [queryParams] = useQueryParams();
-  const onSubmit = (formData: FormModel) => {
-    const folderUid = typeof queryParams['folderUid'] === 'string' ? queryParams['folderUid'] : undefined;
-
-    createNewFolder(formData.folderName, folderUid);
-  };
-
-  const validateFolderName = (folderName: string) => {
-    return validationSrv
-      .validateNewFolderName(folderName)
-      .then(() => {
-        return true;
-      })
-      .catch((e) => {
-        return e.message;
-      });
-  };
-
-  return (
-    <Page navId="dashboards/browse" pageNav={pageNav}>
-      <Page.Contents>
-        <Form defaultValues={initialFormModel} onSubmit={onSubmit}>
-          {({ register, errors }) => (
-            <>
-              <Field
-                label="Folder name"
-                invalid={!!errors.folderName}
-                error={errors.folderName && errors.folderName.message}
-              >
-                <Input
-                  id="folder-name-input"
-                  {...register('folderName', {
-                    required: 'Folder name is required.',
-                    validate: async (v) => await validateFolderName(v),
-                  })}
-                />
-              </Field>
-              <HorizontalGroup>
-                <Button type="submit">Create</Button>
-                <LinkButton variant="secondary" href={`${config.appSubUrl}/dashboards`}>
-                  Cancel
-                </LinkButton>
-              </HorizontalGroup>
-            </>
-          )}
-        </Form>
-      </Page.Contents>
-    </Page>
-  );
-}
-
-export default connector(NewDashboardsFolder);
diff --git a/public/app/features/folders/state/actions.test.ts b/public/app/features/folders/state/actions.test.ts
deleted file mode 100644
index dd2d35e822b33..0000000000000
--- a/public/app/features/folders/state/actions.test.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { Observable, of, throwError } from 'rxjs';
-import { thunkTester } from 'test/core/thunk/thunkTester';
-
-import { FetchResponse } from '@grafana/runtime';
-import { notifyApp } from 'app/core/actions';
-import { createWarningNotification } from 'app/core/copy/appNotification';
-import { backendSrv } from 'app/core/services/backend_srv';
-
-import { checkFolderPermissions } from './actions';
-import { setCanViewFolderPermissions } from './reducers';
-
-describe('folder actions', () => {
-  let fetchSpy: jest.SpyInstance<Observable<FetchResponse<unknown>>>;
-
-  beforeAll(() => {
-    fetchSpy = jest.spyOn(backendSrv, 'fetch');
-  });
-  afterAll(() => {
-    fetchSpy.mockRestore();
-  });
-
-  function mockFetch(resp: Observable<any>) {
-    fetchSpy.mockReturnValueOnce(resp);
-  }
-
-  const folderUid = 'abc123';
-
-  describe('checkFolderPermissions', () => {
-    it('should dispatch true when the api call is successful', async () => {
-      mockFetch(of({}));
-
-      const dispatchedActions = await thunkTester({})
-        .givenThunk(checkFolderPermissions)
-        .whenThunkIsDispatched(folderUid);
-
-      expect(dispatchedActions).toEqual([setCanViewFolderPermissions(true)]);
-    });
-
-    it('should dispatch just "false" when the api call fails with 403', async () => {
-      mockFetch(throwError(() => ({ status: 403, data: { message: 'Access denied' } })));
-
-      const dispatchedActions = await thunkTester({})
-        .givenThunk(checkFolderPermissions)
-        .whenThunkIsDispatched(folderUid);
-
-      expect(dispatchedActions).toEqual([setCanViewFolderPermissions(false)]);
-    });
-
-    it('should also dispatch a notification when the api call fails with an error other than 403', async () => {
-      mockFetch(throwError(() => ({ status: 500, data: { message: 'Server error' } })));
-
-      const dispatchedActions = await thunkTester({})
-        .givenThunk(checkFolderPermissions)
-        .whenThunkIsDispatched(folderUid);
-
-      const notificationAction = notifyApp(
-        createWarningNotification('Error checking folder permissions', 'Server error')
-      );
-      notificationAction.payload.id = expect.any(String);
-      notificationAction.payload.timestamp = expect.any(Number);
-
-      expect(dispatchedActions).toEqual([
-        expect.objectContaining(notificationAction),
-        setCanViewFolderPermissions(false),
-      ]);
-    });
-  });
-});
diff --git a/public/app/features/folders/state/actions.ts b/public/app/features/folders/state/actions.ts
index 0f08ca1cf983b..e79c97f97f599 100644
--- a/public/app/features/folders/state/actions.ts
+++ b/public/app/features/folders/state/actions.ts
@@ -1,16 +1,9 @@
-import { lastValueFrom } from 'rxjs';
-
-import { locationUtil } from '@grafana/data';
-import { getBackendSrv, isFetchError, locationService } from '@grafana/runtime';
-import { notifyApp, updateNavIndex } from 'app/core/actions';
-import { createSuccessNotification, createWarningNotification } from 'app/core/copy/appNotification';
-import { contextSrv } from 'app/core/core';
+import { updateNavIndex } from 'app/core/actions';
 import { backendSrv } from 'app/core/services/backend_srv';
-import { FolderDTO, FolderState, ThunkResult } from 'app/types';
-import { DashboardAcl, DashboardAclUpdateDTO, NewDashboardAclItem, PermissionLevel } from 'app/types/acl';
+import { FolderDTO, ThunkResult } from 'app/types';
 
 import { buildNavModel } from './navModel';
-import { loadFolder, loadFolderPermissions, setCanViewFolderPermissions } from './reducers';
+import { loadFolder } from './reducers';
 
 export function getFolderByUid(uid: string): ThunkResult<Promise<FolderDTO>> {
   return async (dispatch) => {
@@ -20,136 +13,3 @@ export function getFolderByUid(uid: string): ThunkResult<Promise<FolderDTO>> {
     return folder;
   };
 }
-
-export function saveFolder(folder: FolderState): ThunkResult<void> {
-  return async (dispatch) => {
-    const res = await backendSrv.put(`/api/folders/${folder.uid}`, {
-      title: folder.title,
-      version: folder.version,
-    });
-
-    dispatch(notifyApp(createSuccessNotification('Folder saved')));
-    dispatch(loadFolder(res));
-    locationService.push(locationUtil.stripBaseFromUrl(`${res.url}/settings`));
-  };
-}
-
-export function deleteFolder(uid: string): ThunkResult<void> {
-  return async () => {
-    await backendSrv.delete(`/api/folders/${uid}?forceDeleteRules=false`);
-    locationService.push('/dashboards');
-  };
-}
-
-export function getFolderPermissions(uid: string): ThunkResult<void> {
-  return async (dispatch) => {
-    const permissions = await backendSrv.get(`/api/folders/${uid}/permissions`);
-    dispatch(loadFolderPermissions(permissions));
-  };
-}
-
-export function checkFolderPermissions(uid: string): ThunkResult<void> {
-  return async (dispatch) => {
-    try {
-      await lastValueFrom(
-        backendSrv.fetch({
-          method: 'GET',
-          showErrorAlert: false,
-          showSuccessAlert: false,
-          url: `/api/folders/${uid}/permissions`,
-        })
-      );
-      dispatch(setCanViewFolderPermissions(true));
-    } catch (err) {
-      if (isFetchError(err) && err.status !== 403) {
-        dispatch(notifyApp(createWarningNotification('Error checking folder permissions', err.data?.message)));
-      }
-
-      dispatch(setCanViewFolderPermissions(false));
-    }
-  };
-}
-
-function toUpdateItem(item: DashboardAcl): DashboardAclUpdateDTO {
-  return {
-    userId: item.userId,
-    teamId: item.teamId,
-    role: item.role,
-    permission: item.permission,
-  };
-}
-
-export function updateFolderPermission(itemToUpdate: DashboardAcl, level: PermissionLevel): ThunkResult<void> {
-  return async (dispatch, getStore) => {
-    const folder = getStore().folder;
-    const itemsToUpdate = [];
-
-    for (const item of folder.permissions) {
-      if (item.inherited) {
-        continue;
-      }
-
-      const updated = toUpdateItem(item);
-
-      // if this is the item we want to update, update its permission
-      if (itemToUpdate === item) {
-        updated.permission = level;
-      }
-
-      itemsToUpdate.push(updated);
-    }
-
-    await backendSrv.post(`/api/folders/${folder.uid}/permissions`, { items: itemsToUpdate });
-    await dispatch(getFolderPermissions(folder.uid));
-  };
-}
-
-export function removeFolderPermission(itemToDelete: DashboardAcl): ThunkResult<void> {
-  return async (dispatch, getStore) => {
-    const folder = getStore().folder;
-    const itemsToUpdate = [];
-
-    for (const item of folder.permissions) {
-      if (item.inherited || item === itemToDelete) {
-        continue;
-      }
-      itemsToUpdate.push(toUpdateItem(item));
-    }
-
-    await backendSrv.post(`/api/folders/${folder.uid}/permissions`, { items: itemsToUpdate });
-    await dispatch(getFolderPermissions(folder.uid));
-  };
-}
-
-export function addFolderPermission(newItem: NewDashboardAclItem): ThunkResult<void> {
-  return async (dispatch, getStore) => {
-    const folder = getStore().folder;
-    const itemsToUpdate = [];
-
-    for (const item of folder.permissions) {
-      if (item.inherited) {
-        continue;
-      }
-      itemsToUpdate.push(toUpdateItem(item));
-    }
-
-    itemsToUpdate.push({
-      userId: newItem.userId,
-      teamId: newItem.teamId,
-      role: newItem.role,
-      permission: newItem.permission,
-    });
-
-    await backendSrv.post(`/api/folders/${folder.uid}/permissions`, { items: itemsToUpdate });
-    await dispatch(getFolderPermissions(folder.uid));
-  };
-}
-
-export function createNewFolder(folderName: string, uid?: string): ThunkResult<void> {
-  return async (dispatch) => {
-    const newFolder = await getBackendSrv().post('/api/folders', { title: folderName, parentUid: uid });
-    await contextSrv.fetchUserPermissions();
-    dispatch(notifyApp(createSuccessNotification('Folder Created', 'OK')));
-    locationService.push(locationUtil.stripBaseFromUrl(newFolder.url));
-  };
-}
diff --git a/public/app/features/folders/state/navModel.ts b/public/app/features/folders/state/navModel.ts
index 7e714ffeb21b7..5c7e0d4ffb4a4 100644
--- a/public/app/features/folders/state/navModel.ts
+++ b/public/app/features/folders/state/navModel.ts
@@ -3,7 +3,6 @@ import { config } from '@grafana/runtime';
 import { t } from 'app/core/internationalization';
 import { contextSrv } from 'app/core/services/context_srv';
 import { getNavSubTitle } from 'app/core/utils/navBarItem-translations';
-import { newBrowseDashboardsEnabled } from 'app/features/browse-dashboards/featureFlag';
 import { AccessControlAction, FolderDTO } from 'app/types';
 
 export const FOLDER_ID = 'manage-folder';
@@ -56,28 +55,6 @@ export function buildNavModel(folder: FolderDTO, parents = folder.parents): NavM
     });
   }
 
-  if (!newBrowseDashboardsEnabled()) {
-    if (folder.canAdmin) {
-      model.children!.push({
-        active: false,
-        icon: 'lock',
-        id: getPermissionsTabID(folder.uid),
-        text: t('browse-dashboards.manage-folder-nav.permissions', 'Permissions'),
-        url: `${folder.url}/permissions`,
-      });
-    }
-
-    if (folder.canSave) {
-      model.children!.push({
-        active: false,
-        icon: 'cog',
-        id: getSettingsTabID(folder.uid),
-        text: t('browse-dashboards.manage-folder-nav.settings', 'Settings'),
-        url: `${folder.url}/settings`,
-      });
-    }
-  }
-
   return model;
 }
 
diff --git a/public/app/features/folders/state/reducers.test.ts b/public/app/features/folders/state/reducers.test.ts
index d6ea57ce82f8a..2665316f39e32 100644
--- a/public/app/features/folders/state/reducers.test.ts
+++ b/public/app/features/folders/state/reducers.test.ts
@@ -1,15 +1,8 @@
-import { FolderDTO, FolderState, OrgRole, PermissionLevel } from 'app/types';
+import { FolderDTO, FolderState } from 'app/types';
 
 import { reducerTester } from '../../../../test/core/redux/reducerTester';
 
-import {
-  folderReducer,
-  initialState,
-  loadFolder,
-  loadFolderPermissions,
-  setCanViewFolderPermissions,
-  setFolderTitle,
-} from './reducers';
+import { folderReducer, initialState, loadFolder, setFolderTitle } from './reducers';
 
 function getTestFolder(): FolderDTO {
   return {
@@ -71,102 +64,4 @@ describe('folder reducer', () => {
       });
     });
   });
-
-  describe('when loadFolderPermissions is dispatched', () => {
-    it('then state should be correct', () => {
-      reducerTester<FolderState>()
-        .givenReducer(folderReducer, { ...initialState })
-        .whenActionIsDispatched(
-          loadFolderPermissions([
-            { id: 2, dashboardId: 1, role: OrgRole.Viewer, permission: PermissionLevel.View },
-            { id: 3, dashboardId: 1, role: OrgRole.Editor, permission: PermissionLevel.Edit },
-            {
-              id: 4,
-              dashboardId: 10,
-              permission: PermissionLevel.View,
-              teamId: 1,
-              team: 'MyTestTeam',
-              inherited: true,
-            },
-            {
-              id: 5,
-              dashboardId: 1,
-              permission: PermissionLevel.View,
-              userId: 1,
-              userLogin: 'MyTestUser',
-            },
-            {
-              id: 6,
-              dashboardId: 1,
-              permission: PermissionLevel.Edit,
-              teamId: 2,
-              team: 'MyTestTeam2',
-            },
-          ])
-        )
-        .thenStateShouldEqual({
-          ...initialState,
-          permissions: [
-            {
-              dashboardId: 10,
-              id: 4,
-              inherited: true,
-              name: 'MyTestTeam',
-              permission: 1,
-              sortRank: 120,
-              team: 'MyTestTeam',
-              teamId: 1,
-            },
-            {
-              dashboardId: 1,
-              icon: 'fa fa-fw fa-street-view',
-              id: 3,
-              name: 'Editor',
-              permission: 2,
-              role: OrgRole.Editor,
-              sortRank: 31,
-            },
-            {
-              dashboardId: 1,
-              icon: 'fa fa-fw fa-street-view',
-              id: 2,
-              name: 'Viewer',
-              permission: 1,
-              role: OrgRole.Viewer,
-              sortRank: 30,
-            },
-            {
-              dashboardId: 1,
-              id: 6,
-              name: 'MyTestTeam2',
-              permission: 2,
-              sortRank: 20,
-              team: 'MyTestTeam2',
-              teamId: 2,
-            },
-            {
-              dashboardId: 1,
-              id: 5,
-              name: 'MyTestUser',
-              permission: 1,
-              sortRank: 10,
-              userId: 1,
-              userLogin: 'MyTestUser',
-            },
-          ],
-        });
-    });
-  });
-
-  describe('setCanViewFolderPermissions', () => {
-    it('should set the canViewFolderPermissions value', () => {
-      reducerTester<FolderState>()
-        .givenReducer(folderReducer, { ...initialState })
-        .whenActionIsDispatched(setCanViewFolderPermissions(true))
-        .thenStateShouldEqual({
-          ...initialState,
-          canViewFolderPermissions: true,
-        });
-    });
-  });
 });
diff --git a/public/app/features/folders/state/reducers.ts b/public/app/features/folders/state/reducers.ts
index 46bf07ec85510..f544fde391ae5 100644
--- a/public/app/features/folders/state/reducers.ts
+++ b/public/app/features/folders/state/reducers.ts
@@ -1,8 +1,7 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 
-import { processAclItems } from 'app/core/utils/acl';
 import { endpoints } from 'app/features/browse-dashboards/api/browseDashboardsAPI';
-import { DashboardAclDTO, FolderDTO, FolderState } from 'app/types';
+import { FolderDTO, FolderState } from 'app/types';
 
 export const initialState: FolderState = {
   id: 0,
@@ -13,8 +12,6 @@ export const initialState: FolderState = {
   canDelete: false,
   hasChanged: false,
   version: 1,
-  permissions: [],
-  canViewFolderPermissions: false,
 };
 
 const loadFolderReducer = (state: FolderState, action: PayloadAction<FolderDTO>): FolderState => {
@@ -37,23 +34,13 @@ const folderSlice = createSlice({
         hasChanged: action.payload.trim().length > 0,
       };
     },
-    loadFolderPermissions: (state, action: PayloadAction<DashboardAclDTO[]>): FolderState => {
-      return {
-        ...state,
-        permissions: processAclItems(action.payload),
-      };
-    },
-    setCanViewFolderPermissions: (state, action: PayloadAction<boolean>): FolderState => {
-      state.canViewFolderPermissions = action.payload;
-      return state;
-    },
   },
   extraReducers: (builder) => {
     builder.addMatcher(endpoints.getFolder.matchFulfilled, loadFolderReducer);
   },
 });
 
-export const { loadFolderPermissions, loadFolder, setFolderTitle, setCanViewFolderPermissions } = folderSlice.actions;
+export const { loadFolder, setFolderTitle } = folderSlice.actions;
 
 export const folderReducer = folderSlice.reducer;
 
diff --git a/public/app/features/geo/editor/GazetteerPathEditor.tsx b/public/app/features/geo/editor/GazetteerPathEditor.tsx
index 067b488956cc2..1d72880164924 100644
--- a/public/app/features/geo/editor/GazetteerPathEditor.tsx
+++ b/public/app/features/geo/editor/GazetteerPathEditor.tsx
@@ -1,8 +1,8 @@
 import { css } from '@emotion/css';
 import React, { useMemo, useState, useEffect } from 'react';
 
-import { StandardEditorProps, SelectableValue, GrafanaTheme2 } from '@grafana/data';
-import { Alert, Select, stylesFactory, useTheme2 } from '@grafana/ui';
+import { StandardEditorProps, SelectableValue } from '@grafana/data';
+import { Alert, Select, useStyles2 } from '@grafana/ui';
 
 import { COUNTRIES_GAZETTEER_PATH, Gazetteer, getGazetteer } from '../gazetteer/gazetteer';
 
@@ -34,7 +34,7 @@ export const GazetteerPathEditor = ({
   context,
   item,
 }: StandardEditorProps<string, GazetteerPathEditorConfigSettings>) => {
-  const styles = getStyles(useTheme2());
+  const styles = useStyles2(getStyles);
   const [gaz, setGaz] = useState<Gazetteer>();
   const settings = item.settings;
 
@@ -86,17 +86,15 @@ export const GazetteerPathEditor = ({
   );
 };
 
-const getStyles = stylesFactory((theme: GrafanaTheme2) => {
-  return {
-    keys: css`
-      margin-top: 4px;
-      text-overflow: ellipsis;
-      overflow: hidden;
-      white-space: nowrap;
+const getStyles = () => ({
+  keys: css`
+    margin-top: 4px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
 
-      > span {
-        margin-left: 4px;
-      }
-    `,
-  };
+    > span {
+      margin-left: 4px;
+    }
+  `,
 });
diff --git a/public/app/features/geo/format/geohash.ts b/public/app/features/geo/format/geohash.ts
index 1a2ebf0e0b67e..8940b1d5ff5a3 100644
--- a/public/app/features/geo/format/geohash.ts
+++ b/public/app/features/geo/format/geohash.ts
@@ -33,7 +33,7 @@ export function decodeGeohash(geohash: string): [number, number] | undefined {
   return [lonCenter, latCenter];
 }
 
-function refineInterval(interval: any[], base32Decoded: number, mask: number) {
+function refineInterval(interval: number[], base32Decoded: number, mask: number) {
   /* tslint:disable no-bitwise*/
   if (base32Decoded & mask) {
     interval[0] = (interval[0] + interval[1]) / 2;
diff --git a/public/app/features/geo/format/geojson.ts b/public/app/features/geo/format/geojson.ts
index 521c7b8d91cc3..f2969e098cda4 100644
--- a/public/app/features/geo/format/geojson.ts
+++ b/public/app/features/geo/format/geojson.ts
@@ -4,7 +4,7 @@ import { Geometry } from 'ol/geom';
 import { DataFrame, Field, FieldType, getFieldTypeFromValue } from '@grafana/data';
 
 interface FieldInfo {
-  values: any[];
+  values: Array<string | number | null | undefined>;
   types: Set<FieldType>;
   count: number;
 }
diff --git a/public/app/features/geo/gazetteer/worldmap.test.ts b/public/app/features/geo/gazetteer/worldmap.test.ts
index daaff61191b4d..127f63a40b06d 100644
--- a/public/app/features/geo/gazetteer/worldmap.test.ts
+++ b/public/app/features/geo/gazetteer/worldmap.test.ts
@@ -4,7 +4,7 @@ import countriesJSON from '../../../../gazetteer/countries.json';
 
 import { getGazetteer } from './gazetteer';
 
-let backendResults: any = { hello: 'world' };
+let backendResults: Record<string, string> | Array<Record<string, unknown>> = { hello: 'world' };
 
 jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
diff --git a/public/app/features/inspector/InspectDataOptions.tsx b/public/app/features/inspector/InspectDataOptions.tsx
index 830a1e1c3bb74..910569f2c0fee 100644
--- a/public/app/features/inspector/InspectDataOptions.tsx
+++ b/public/app/features/inspector/InspectDataOptions.tsx
@@ -19,6 +19,7 @@ interface Props {
   toggleDownloadForExcel: () => void;
   data?: DataFrame[];
   hasTransformations?: boolean;
+  formattedDataDescription?: string;
   onOptionsChange?: (options: GetDataOptions) => void;
   actions?: React.ReactNode;
 }
@@ -26,6 +27,7 @@ interface Props {
 export const InspectDataOptions = ({
   options,
   actions,
+  formattedDataDescription,
   onOptionsChange,
   hasTransformations,
   data,
@@ -129,10 +131,13 @@ export const InspectDataOptions = ({
               {onOptionsChange && (
                 <Field
                   label={t('dashboard.inspect-data.formatted-data-label', 'Formatted data')}
-                  description={t(
-                    'dashboard.inspect-data.formatted-data-description',
-                    'Table data is formatted with options defined in the Field and Override tabs.'
-                  )}
+                  description={
+                    formattedDataDescription ||
+                    t(
+                      'dashboard.inspect-data.formatted-data-description',
+                      'Table data is formatted with options defined in the Field and Override tabs.'
+                    )
+                  }
                 >
                   <Switch
                     id="formatted-data-toggle"
diff --git a/public/app/features/inspector/InspectDataTab.test.tsx b/public/app/features/inspector/InspectDataTab.test.tsx
index 0dc821cb758c4..37284933ce028 100644
--- a/public/app/features/inspector/InspectDataTab.test.tsx
+++ b/public/app/features/inspector/InspectDataTab.test.tsx
@@ -1,11 +1,22 @@
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React, { ComponentProps } from 'react';
+import { Props } from 'react-virtualized-auto-sizer';
 
 import { DataFrame, FieldType } from '@grafana/data';
 
 import { InspectDataTab } from './InspectDataTab';
 
+jest.mock('react-virtualized-auto-sizer', () => {
+  return ({ children }: Props) =>
+    children({
+      height: 1,
+      scaledHeight: 1,
+      scaledWidth: 1,
+      width: 1,
+    });
+});
+
 const createProps = (propsOverride?: Partial<ComponentProps<typeof InspectDataTab>>) => {
   const defaultProps = {
     isLoading: false,
@@ -17,18 +28,18 @@ const createProps = (propsOverride?: Partial<ComponentProps<typeof InspectDataTa
       {
         name: 'First data frame',
         fields: [
-          { name: 'time', type: FieldType.time, values: [100, 200, 300] },
-          { name: 'name', type: FieldType.string, values: ['uniqueA', 'b', 'c'] },
-          { name: 'value', type: FieldType.number, values: [1, 2, 3] },
+          { name: 'time', type: FieldType.time, values: [100, 200, 300], config: {} },
+          { name: 'name', type: FieldType.string, values: ['uniqueA', 'b', 'c'], config: {} },
+          { name: 'value', type: FieldType.number, values: [1, 2, 3], config: {} },
         ],
         length: 3,
       },
       {
         name: 'Second data frame',
         fields: [
-          { name: 'time', type: FieldType.time, values: [400, 500, 600] },
-          { name: 'name', type: FieldType.string, values: ['d', 'e', 'g'] },
-          { name: 'value', type: FieldType.number, values: [4, 5, 6] },
+          { name: 'time', type: FieldType.time, values: [400, 500, 600], config: {} },
+          { name: 'name', type: FieldType.string, values: ['d', 'e', 'g'], config: {} },
+          { name: 'value', type: FieldType.number, values: [4, 5, 6], config: {} },
         ],
         length: 3,
       },
@@ -68,9 +79,9 @@ describe('InspectDataTab', () => {
         {
           name: 'Data frame with logs',
           fields: [
-            { name: 'time', type: FieldType.time, values: [100, 200, 300] },
-            { name: 'name', type: FieldType.string, values: ['uniqueA', 'b', 'c'] },
-            { name: 'value', type: FieldType.number, values: [1, 2, 3] },
+            { name: 'time', type: FieldType.time, values: [100, 200, 300], config: {} },
+            { name: 'name', type: FieldType.string, values: ['uniqueA', 'b', 'c'], config: {} },
+            { name: 'value', type: FieldType.number, values: [1, 2, 3], config: {} },
           ],
           length: 3,
           meta: {
@@ -90,11 +101,15 @@ describe('InspectDataTab', () => {
         {
           name: 'Data frame with traces',
           fields: [
-            { name: 'traceID', values: ['3fa414edcef6ad90', '3fa414edcef6ad90'] },
-            { name: 'spanID', values: ['3fa414edcef6ad90', '0f5c1808567e4403'] },
-            { name: 'parentSpanID', values: [undefined, '3fa414edcef6ad90'] },
-            { name: 'operationName', values: ['HTTP GET - api_traces_traceid', '/tempopb.Querier/FindTraceByID'] },
-            { name: 'serviceName', values: ['tempo-querier', 'tempo-querier'] },
+            { name: 'traceID', values: ['3fa414edcef6ad90', '3fa414edcef6ad90'], config: {} },
+            { name: 'spanID', values: ['3fa414edcef6ad90', '0f5c1808567e4403'], config: {} },
+            { name: 'parentSpanID', values: [undefined, '3fa414edcef6ad90'], config: {} },
+            {
+              name: 'operationName',
+              values: ['HTTP GET - api_traces_traceid', '/tempopb.Querier/FindTraceByID'],
+              config: {},
+            },
+            { name: 'serviceName', values: ['tempo-querier', 'tempo-querier'], config: {} },
             {
               name: 'serviceTags',
               values: [
@@ -107,10 +122,11 @@ describe('InspectDataTab', () => {
                   { key: 'container', type: 'string', value: 'tempo-query' },
                 ],
               ],
+              config: {},
             },
-            { name: 'startTime', values: [1605873894680.409, 1605873894680.587] },
-            { name: 'duration', values: [1049.141, 1.847] },
-            { name: 'logs', values: [[], []] },
+            { name: 'startTime', values: [1605873894680.409, 1605873894680.587], config: {} },
+            { name: 'duration', values: [1049.141, 1.847], config: {} },
+            { name: 'logs', values: [[], []], config: {} },
             {
               name: 'tags',
               values: [
@@ -123,9 +139,10 @@ describe('InspectDataTab', () => {
                   { key: 'span.kind', type: 'string', value: 'client' },
                 ],
               ],
+              config: {},
             },
-            { name: 'warnings', values: [undefined, undefined] },
-            { name: 'stackTraces', values: [undefined, undefined] },
+            { name: 'warnings', values: [undefined, undefined], config: {} },
+            { name: 'stackTraces', values: [undefined, undefined], config: {} },
           ],
           length: 2,
           meta: {
@@ -151,6 +168,7 @@ describe('InspectDataTab', () => {
           meta: {
             preferredVisualisationType: 'nodeGraph',
           },
+          config: {},
         },
         {
           name: 'Edges',
@@ -158,6 +176,7 @@ describe('InspectDataTab', () => {
           meta: {
             preferredVisualisationType: 'nodeGraph',
           },
+          config: {},
         },
       ] as unknown as DataFrame[];
       render(
diff --git a/public/app/features/inspector/InspectDataTab.tsx b/public/app/features/inspector/InspectDataTab.tsx
index 7c070e500e043..2fa49dacaf056 100644
--- a/public/app/features/inspector/InspectDataTab.tsx
+++ b/public/app/features/inspector/InspectDataTab.tsx
@@ -14,7 +14,7 @@ import {
   transformDataFrame,
 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { reportInteraction } from '@grafana/runtime';
+import { getTemplateSrv, reportInteraction } from '@grafana/runtime';
 import { Button, Spinner, Table } from '@grafana/ui';
 import { config } from 'app/core/config';
 import { t, Trans } from 'app/core/internationalization';
@@ -37,6 +37,7 @@ interface Props {
   panelPluginId?: string;
   fieldConfig?: FieldConfigSource;
   hasTransformations?: boolean;
+  formattedDataDescription?: string;
   onOptionsChange?: (options: GetDataOptions) => void;
 }
 
@@ -176,11 +177,15 @@ export class InspectDataTab extends PureComponent<Props, State> {
     const { options, panelPluginId, fieldConfig, timeZone } = this.props;
     const data = this.state.transformedData;
 
-    if (!options.withFieldConfig || !panelPluginId || !fieldConfig) {
+    if (!options.withFieldConfig) {
       return applyRawFieldOverrides(data);
     }
 
-    const fieldConfigCleaned = this.cleanTableConfigFromFieldConfig(panelPluginId, fieldConfig);
+    let fieldConfigCleaned = fieldConfig ?? { defaults: {}, overrides: [] };
+    // Because we visualize this data in a table we have to remove any custom table display settings
+    if (panelPluginId === 'table' && fieldConfig) {
+      fieldConfigCleaned = this.cleanTableConfigFromFieldConfig(fieldConfig);
+    }
 
     // We need to apply field config as it's not done by PanelQueryRunner (even when withFieldConfig is true).
     // It's because transformers create new fields and data frames, and we need to clean field config of any table settings.
@@ -189,18 +194,12 @@ export class InspectDataTab extends PureComponent<Props, State> {
       theme: config.theme2,
       fieldConfig: fieldConfigCleaned,
       timeZone,
-      replaceVariables: (value: string) => {
-        return value;
-      },
+      replaceVariables: (value, scopedVars, format) => getTemplateSrv().replace(value, scopedVars, format),
     });
   }
 
   // Because we visualize this data in a table we have to remove any custom table display settings
-  cleanTableConfigFromFieldConfig(panelPluginId: string, fieldConfig: FieldConfigSource): FieldConfigSource {
-    if (panelPluginId !== 'table') {
-      return fieldConfig;
-    }
-
+  cleanTableConfigFromFieldConfig(fieldConfig: FieldConfigSource): FieldConfigSource {
     fieldConfig = cloneDeep(fieldConfig);
     // clear all table specific options
     fieldConfig.defaults.custom = {};
@@ -244,7 +243,7 @@ export class InspectDataTab extends PureComponent<Props, State> {
   }
 
   render() {
-    const { isLoading, options, data, onOptionsChange, hasTransformations } = this.props;
+    const { isLoading, options, data, formattedDataDescription, onOptionsChange, hasTransformations } = this.props;
     const { dataFrameIndex, transformationOptions, selectedDataFrame, downloadForExcel } = this.state;
     const styles = getPanelInspectorStyles();
 
@@ -280,6 +279,7 @@ export class InspectDataTab extends PureComponent<Props, State> {
             transformationOptions={transformationOptions}
             selectedDataFrame={selectedDataFrame}
             downloadForExcel={downloadForExcel}
+            formattedDataDescription={formattedDataDescription}
             onOptionsChange={onOptionsChange}
             onDataFrameChange={this.onDataFrameChange}
             toggleDownloadForExcel={this.onToggleDownloadForExcel}
diff --git a/public/app/features/inspector/InspectErrorTab.tsx b/public/app/features/inspector/InspectErrorTab.tsx
index 554d79b89dcad..d79768563d42e 100644
--- a/public/app/features/inspector/InspectErrorTab.tsx
+++ b/public/app/features/inspector/InspectErrorTab.tsx
@@ -7,7 +7,7 @@ interface InspectErrorTabProps {
   errors?: DataQueryError[];
 }
 
-const parseErrorMessage = (message: string): { msg: string; json?: any } => {
+const parseErrorMessage = (message: string) => {
   try {
     const [msg, json] = message.split(/(\{.+)/);
     const jsonError = JSON.parse(json);
diff --git a/public/app/features/inspector/InspectJSONTab.tsx b/public/app/features/inspector/InspectJSONTab.tsx
index ff86bf653b5e3..b49338f3843c6 100644
--- a/public/app/features/inspector/InspectJSONTab.tsx
+++ b/public/app/features/inspector/InspectJSONTab.tsx
@@ -78,22 +78,23 @@ export function InspectJSONTab({ panel, dashboard, data, onClose }: Props) {
   const onApplyPanelModel = useCallback(() => {
     if (panel && dashboard && text) {
       try {
-        if (!dashboard!.meta.canEdit) {
+        if (!dashboard.meta.canEdit) {
           appEvents.emit(AppEvents.alertError, ['Unable to apply']);
         } else {
           const updates = JSON.parse(text);
-          dashboard!.shouldUpdateDashboardPanelFromJSON(updates, panel!);
+          dashboard.shouldUpdateDashboardPanelFromJSON(updates, panel);
 
           //Report relevant updates
           reportPanelInspectInteraction(InspectTab.JSON, 'apply', {
-            panel_type_changed: panel!.type !== updates.type,
-            panel_id_changed: panel!.id !== updates.id,
-            panel_grid_pos_changed: !isEqual(panel!.gridPos, updates.gridPos),
-            panel_targets_changed: !isEqual(panel!.targets, updates.targets),
+            panel_type_changed: panel.type !== updates.type,
+            panel_id_changed: panel.id !== updates.id,
+            panel_grid_pos_changed: !isEqual(panel.gridPos, updates.gridPos),
+            panel_targets_changed: !isEqual(panel.targets, updates.targets),
           });
 
-          panel!.restoreModel(updates);
-          panel!.refresh();
+          panel.restoreModel(updates);
+          panel.configRev++;
+          panel.refresh();
           appEvents.emit(AppEvents.alertSuccess, ['Panel model updated']);
         }
       } catch (err) {
@@ -131,7 +132,7 @@ export function InspectJSONTab({ panel, dashboard, data, onClose }: Props) {
             Apply
           </Button>
         )}
-        {show === ShowContent.DataFrames && (
+        {show === ShowContent.DataFrames && dashboard !== undefined && (
           <Button className={styles.toolbarItem} onClick={onShowHelpWizard}>
             Support
           </Button>
@@ -146,7 +147,7 @@ export function InspectJSONTab({ panel, dashboard, data, onClose }: Props) {
               height={height}
               language="json"
               showLineNumbers={true}
-              showMiniMap={(text && text.length) > 100}
+              showMiniMap={text.length > 100}
               value={text || ''}
               readOnly={!isPanelJSON}
               onBlur={setText}
diff --git a/public/app/features/inspector/InspectStatsTable.tsx b/public/app/features/inspector/InspectStatsTable.tsx
index 042aedcf8a120..51ff54afb15f6 100644
--- a/public/app/features/inspector/InspectStatsTable.tsx
+++ b/public/app/features/inspector/InspectStatsTable.tsx
@@ -9,7 +9,7 @@ import {
   QueryResultMetaStat,
   TimeZone,
 } from '@grafana/data';
-import { stylesFactory, useTheme2 } from '@grafana/ui';
+import { useStyles2, useTheme2 } from '@grafana/ui';
 
 interface InspectStatsTableProps {
   timeZone: TimeZone;
@@ -19,7 +19,7 @@ interface InspectStatsTableProps {
 
 export const InspectStatsTable = ({ timeZone, name, stats }: InspectStatsTableProps) => {
   const theme = useTheme2();
-  const styles = getStyles(theme);
+  const styles = useStyles2(getStyles);
 
   if (!stats || !stats.length) {
     return null;
@@ -56,13 +56,11 @@ function formatStat(stat: QueryResultMetaStat, timeZone: TimeZone, theme: Grafan
   return formattedValueToString(display(stat.value));
 }
 
-const getStyles = stylesFactory((theme: GrafanaTheme2) => {
-  return {
-    wrapper: css`
-      padding-bottom: ${theme.spacing(2)};
-    `,
-    cell: css`
-      text-align: right;
-    `,
-  };
+const getStyles = (theme: GrafanaTheme2) => ({
+  wrapper: css`
+    padding-bottom: ${theme.spacing(2)};
+  `,
+  cell: css`
+    text-align: right;
+  `,
 });
diff --git a/public/app/features/inspector/InspectStatsTraceIdsTable.tsx b/public/app/features/inspector/InspectStatsTraceIdsTable.tsx
index ab958f9bf66a3..6c0855deb8689 100644
--- a/public/app/features/inspector/InspectStatsTraceIdsTable.tsx
+++ b/public/app/features/inspector/InspectStatsTraceIdsTable.tsx
@@ -2,16 +2,15 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { stylesFactory, useTheme2 } from '@grafana/ui';
+import { useStyles2 } from '@grafana/ui';
 
-type Props = {
+interface Props {
   name: string;
   traceIds: string[];
-};
+}
 
 export const InspectStatsTraceIdsTable = ({ name, traceIds }: Props) => {
-  const theme = useTheme2();
-  const styles = getStyles(theme);
+  const styles = useStyles2(getStyles);
 
   if (traceIds.length === 0) {
     return null;
@@ -35,13 +34,11 @@ export const InspectStatsTraceIdsTable = ({ name, traceIds }: Props) => {
   );
 };
 
-const getStyles = stylesFactory((theme: GrafanaTheme2) => {
-  return {
-    wrapper: css`
-      padding-bottom: ${theme.spacing(2)};
-    `,
-    cell: css`
-      text-align: right;
-    `,
-  };
+const getStyles = (theme: GrafanaTheme2) => ({
+  wrapper: css`
+    padding-bottom: ${theme.spacing(2)};
+  `,
+  cell: css`
+    text-align: right;
+  `,
 });
diff --git a/public/app/features/inspector/QueryInspector.tsx b/public/app/features/inspector/QueryInspector.tsx
index 81df3f209f6cf..fb1e0cd823826 100644
--- a/public/app/features/inspector/QueryInspector.tsx
+++ b/public/app/features/inspector/QueryInspector.tsx
@@ -4,13 +4,12 @@ import { Subscription } from 'rxjs';
 
 import { LoadingState, PanelData } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { Stack } from '@grafana/experimental';
 import { config } from '@grafana/runtime';
-import { Button, ClipboardButton, JSONFormatter, LoadingPlaceholder } from '@grafana/ui';
+import { Button, ClipboardButton, JSONFormatter, LoadingPlaceholder, Stack } from '@grafana/ui';
 import { Trans } from 'app/core/internationalization';
 import { backendSrv } from 'app/core/services/backend_srv';
 
-import { getPanelInspectorStyles } from './styles';
+import { getPanelInspectorStyles2 } from './styles';
 
 interface ExecutedQueryInfo {
   refId: string;
@@ -20,6 +19,7 @@ interface ExecutedQueryInfo {
 }
 
 interface Props {
+  instanceId?: string; // Must match the prefix of the requestId of the query being inspected. For updating only one instance of the inspector in case of multiple instances, ie Explore split view
   data: PanelData;
   onRefreshQuery: () => void;
 }
@@ -33,7 +33,7 @@ interface State {
 }
 
 export class QueryInspector extends PureComponent<Props, State> {
-  private formattedJson: any;
+  private formattedJson?: {};
   private subs = new Subscription();
 
   constructor(props: Props) {
@@ -50,7 +50,15 @@ export class QueryInspector extends PureComponent<Props, State> {
   componentDidMount() {
     this.subs.add(
       backendSrv.getInspectorStream().subscribe({
-        next: (response) => this.onDataSourceResponse(response),
+        next: (response) => {
+          let update = true;
+          if (this.props.instanceId && response?.requestId) {
+            update = response.requestId.startsWith(this.props.instanceId);
+          }
+          if (update) {
+            return this.onDataSourceResponse(response.response);
+          }
+        },
       })
     );
   }
@@ -147,7 +155,7 @@ export class QueryInspector extends PureComponent<Props, State> {
     });
   }
 
-  setFormattedJson = (formattedJson: any) => {
+  setFormattedJson = (formattedJson: {}) => {
     this.formattedJson = formattedJson;
   };
 
@@ -213,7 +221,7 @@ export class QueryInspector extends PureComponent<Props, State> {
     const { allNodesExpanded, executedQueries, response } = this.state;
     const { onRefreshQuery, data } = this.props;
     const openNodes = this.getNrOfOpenNodes();
-    const styles = getPanelInspectorStyles();
+    const styles = getPanelInspectorStyles2(config.theme2);
     const haveData = Object.keys(response).length > 0;
     const isLoading = data.state === LoadingState.Loading;
 
diff --git a/public/app/features/inspector/utils/download.ts b/public/app/features/inspector/utils/download.ts
index 92f5f80150e46..47c52a47f3a1c 100644
--- a/public/app/features/inspector/utils/download.ts
+++ b/public/app/features/inspector/utils/download.ts
@@ -9,9 +9,9 @@ import {
   MutableDataFrame,
   toCSV,
 } from '@grafana/data';
+import { transformToOTLP } from '@grafana-plugins/tempo/resultTransformer';
 
 import { transformToJaeger } from '../../../plugins/datasource/jaeger/responseTransform';
-import { transformToOTLP } from '../../../plugins/datasource/tempo/resultTransformer';
 import { transformToZipkin } from '../../../plugins/datasource/zipkin/utils/transforms';
 
 /**
diff --git a/public/app/features/invites/SignupInvited.tsx b/public/app/features/invites/SignupInvited.tsx
index 53ffa453c72db..bea01970007cb 100644
--- a/public/app/features/invites/SignupInvited.tsx
+++ b/public/app/features/invites/SignupInvited.tsx
@@ -2,7 +2,8 @@ import React, { useState } from 'react';
 import { useAsync } from 'react-use';
 
 import { getBackendSrv } from '@grafana/runtime';
-import { Button, Field, Form, Input } from '@grafana/ui';
+import { Button, Field, Input } from '@grafana/ui';
+import { Form } from 'app/core/components/Form/Form';
 import { Page } from 'app/core/components/Page/Page';
 import { getConfig } from 'app/core/config';
 import { contextSrv } from 'app/core/core';
diff --git a/public/app/features/invites/state/selectors.ts b/public/app/features/invites/state/selectors.ts
index daf42e464bcb3..03733071079b8 100644
--- a/public/app/features/invites/state/selectors.ts
+++ b/public/app/features/invites/state/selectors.ts
@@ -1,10 +1,12 @@
-import { createSelector } from '@reduxjs/toolkit';
+import { EntityState, createSelector } from '@reduxjs/toolkit';
+
+import { Invitee } from 'app/types';
 
 import { selectors } from './reducers';
 
 export const { selectAll, selectById, selectTotal } = selectors;
 
-const selectQuery = (_: any, query: string) => query;
+const selectQuery = (_state: EntityState<Invitee>, query: string) => query;
 export const selectInvitesMatchingQuery = createSelector([selectAll, selectQuery], (invites, searchQuery) => {
   const regex = new RegExp(searchQuery, 'i');
   const matches = invites.filter((invite) => regex.test(invite.name) || regex.test(invite.email));
diff --git a/public/app/features/library-panels/components/AddLibraryPanelModal/AddLibraryPanelModal.tsx b/public/app/features/library-panels/components/AddLibraryPanelModal/AddLibraryPanelModal.tsx
index d4b9f8db3781d..73b086913c5a2 100644
--- a/public/app/features/library-panels/components/AddLibraryPanelModal/AddLibraryPanelModal.tsx
+++ b/public/app/features/library-panels/components/AddLibraryPanelModal/AddLibraryPanelModal.tsx
@@ -12,7 +12,7 @@ import { LibraryElementDTO } from '../../types';
 import { usePanelSave } from '../../utils/usePanelSave';
 
 interface AddLibraryPanelContentsProps {
-  onDismiss: () => void;
+  onDismiss?: () => void;
   panel: PanelModel;
   initialFolderUid?: string;
 }
@@ -23,20 +23,23 @@ export const AddLibraryPanelContents = ({ panel, initialFolderUid, onDismiss }:
   const [debouncedPanelName, setDebouncedPanelName] = useState(panel.title);
   const [waiting, setWaiting] = useState(false);
 
+  console.log('folderUid', folderUid);
   useEffect(() => setWaiting(true), [panelName]);
   useDebounce(() => setDebouncedPanelName(panelName), 350, [panelName]);
 
   const { saveLibraryPanel } = usePanelSave();
+
   const onCreate = useCallback(() => {
     panel.libraryPanel = { uid: '', name: panelName };
     saveLibraryPanel(panel, folderUid!).then((res: LibraryElementDTO | FetchError) => {
       if (!isFetchError(res)) {
-        onDismiss();
+        onDismiss?.();
       } else {
         panel.libraryPanel = undefined;
       }
     });
   }, [panel, panelName, folderUid, onDismiss, saveLibraryPanel]);
+
   const isValidName = useAsync(async () => {
     try {
       return !(await getLibraryPanelByName(panelName)).some((lp) => lp.folderUid === folderUid);
@@ -50,6 +53,7 @@ export const AddLibraryPanelContents = ({ panel, initialFolderUid, onDismiss }:
     }
   }, [debouncedPanelName, folderUid]);
 
+  console.log('isValidName:', isValidName);
   const invalidInput =
     !isValidName?.value && isValidName.value !== undefined && panelName === debouncedPanelName && !waiting;
 
diff --git a/public/app/features/library-panels/components/LibraryPanelCard/LibraryPanelCard.tsx b/public/app/features/library-panels/components/LibraryPanelCard/LibraryPanelCard.tsx
index fd7c2e79b25d6..dea580a005e92 100644
--- a/public/app/features/library-panels/components/LibraryPanelCard/LibraryPanelCard.tsx
+++ b/public/app/features/library-panels/components/LibraryPanelCard/LibraryPanelCard.tsx
@@ -1,9 +1,11 @@
 import { css } from '@emotion/css';
 import React, { ReactElement, useState } from 'react';
+import Skeleton from 'react-loading-skeleton';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { Icon, Link, useStyles2 } from '@grafana/ui';
+import { SkeletonComponent, attachSkeleton } from '@grafana/ui/src/unstable';
 import { getPanelPluginNotFound } from 'app/features/panel/components/PanelPluginError';
 import { PanelTypeCard } from 'app/features/panel/components/VizTypePicker/PanelTypeCard';
 
@@ -19,7 +21,7 @@ export interface LibraryPanelCardProps {
 
 type Props = LibraryPanelCardProps & { children?: JSX.Element | JSX.Element[] };
 
-export const LibraryPanelCard = ({ libraryPanel, onClick, onDelete, showSecondaryActions }: Props) => {
+const LibraryPanelCardComponent = ({ libraryPanel, onClick, onDelete, showSecondaryActions }: Props) => {
   const [showDeletionModal, setShowDeletionModal] = useState(false);
 
   const onDeletePanel = () => {
@@ -52,6 +54,21 @@ export const LibraryPanelCard = ({ libraryPanel, onClick, onDelete, showSecondar
   );
 };
 
+const LibraryPanelCardSkeleton: SkeletonComponent<Pick<Props, 'showSecondaryActions'>> = ({
+  showSecondaryActions,
+  rootProps,
+}) => {
+  const styles = useStyles2(getStyles);
+
+  return (
+    <PanelTypeCard.Skeleton hasDelete={showSecondaryActions} {...rootProps}>
+      <Skeleton containerClassName={styles.metaContainer} width={80} />
+    </PanelTypeCard.Skeleton>
+  );
+};
+
+export const LibraryPanelCard = attachSkeleton(LibraryPanelCardComponent, LibraryPanelCardSkeleton);
+
 interface FolderLinkProps {
   libraryPanel: LibraryElementDTO;
 }
@@ -84,17 +101,17 @@ function FolderLink({ libraryPanel }: FolderLinkProps): ReactElement | null {
 
 function getStyles(theme: GrafanaTheme2) {
   return {
-    metaContainer: css`
-      display: flex;
-      align-items: center;
-      color: ${theme.colors.text.secondary};
-      font-size: ${theme.typography.bodySmall.fontSize};
-      padding-top: ${theme.spacing(0.5)};
-
-      svg {
-        margin-right: ${theme.spacing(0.5)};
-        margin-bottom: 3px;
-      }
-    `,
+    metaContainer: css({
+      display: 'flex',
+      alignItems: 'center',
+      color: theme.colors.text.secondary,
+      fontSize: theme.typography.bodySmall.fontSize,
+      paddingTop: theme.spacing(0.5),
+
+      svg: {
+        marginRight: theme.spacing(0.5),
+        marginBottom: 3,
+      },
+    }),
   };
 }
diff --git a/public/app/features/library-panels/components/LibraryPanelsSearch/LibraryPanelsSearch.test.tsx b/public/app/features/library-panels/components/LibraryPanelsSearch/LibraryPanelsSearch.test.tsx
index b35ea5810b3e9..862f34739d9a1 100644
--- a/public/app/features/library-panels/components/LibraryPanelsSearch/LibraryPanelsSearch.test.tsx
+++ b/public/app/features/library-panels/components/LibraryPanelsSearch/LibraryPanelsSearch.test.tsx
@@ -17,6 +17,7 @@ import { LibraryPanelsSearch, LibraryPanelsSearchProps } from './LibraryPanelsSe
 jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
   config: {
+    ...jest.requireActual('@grafana/runtime').config,
     panels: {
       timeseries: {
         info: { logos: { small: '' } },
@@ -104,7 +105,7 @@ describe('LibraryPanelsSearch', () => {
       await getTestContext();
 
       expect(screen.getByPlaceholderText(/search by name/i)).toBeInTheDocument();
-      expect(screen.getByText(/no library panels found./i)).toBeInTheDocument();
+      expect(screen.getByText(/no library panels found/i)).toBeInTheDocument();
     });
 
     describe('and user searches for library panel by name or description', () => {
@@ -131,7 +132,7 @@ describe('LibraryPanelsSearch', () => {
       await getTestContext({ showSort: true });
 
       expect(screen.getByPlaceholderText(/search by name/i)).toBeInTheDocument();
-      expect(screen.getByText(/no library panels found./i)).toBeInTheDocument();
+      expect(screen.getByText(/no library panels found/i)).toBeInTheDocument();
       expect(screen.getByText(/sort \(default a–z\)/i)).toBeInTheDocument();
     });
 
@@ -159,7 +160,7 @@ describe('LibraryPanelsSearch', () => {
       await getTestContext({ showPanelFilter: true });
 
       expect(screen.getByPlaceholderText(/search by name/i)).toBeInTheDocument();
-      expect(screen.getByText(/no library panels found./i)).toBeInTheDocument();
+      expect(screen.getByText(/no library panels found/i)).toBeInTheDocument();
       expect(screen.getByRole('combobox', { name: /panel type filter/i })).toBeInTheDocument();
     });
 
@@ -187,7 +188,7 @@ describe('LibraryPanelsSearch', () => {
       await getTestContext({ showFolderFilter: true });
 
       expect(screen.getByPlaceholderText(/search by name/i)).toBeInTheDocument();
-      expect(screen.getByText(/no library panels found./i)).toBeInTheDocument();
+      expect(screen.getByText(/no library panels found/i)).toBeInTheDocument();
       expect(screen.getByRole('combobox', { name: /folder filter/i })).toBeInTheDocument();
     });
 
@@ -273,7 +274,7 @@ describe('LibraryPanelsSearch', () => {
 
       const card = () => screen.getByLabelText(/plugin visualization item time series/i);
 
-      expect(screen.queryByText(/no library panels found./i)).not.toBeInTheDocument();
+      expect(screen.queryByText(/no library panels found/i)).not.toBeInTheDocument();
       expect(card()).toBeInTheDocument();
       expect(within(card()).getByText(/library panel name/i)).toBeInTheDocument();
       expect(within(card()).getByText(/library panel description/i)).toBeInTheDocument();
@@ -314,7 +315,7 @@ describe('LibraryPanelsSearch', () => {
 
       const card = () => screen.getByLabelText(/plugin visualization item time series/i);
 
-      expect(screen.queryByText(/no library panels found./i)).not.toBeInTheDocument();
+      expect(screen.queryByText(/no library panels found/i)).not.toBeInTheDocument();
       expect(card()).toBeInTheDocument();
       expect(within(card()).getByText(/library panel name/i)).toBeInTheDocument();
       expect(within(card()).getByText(/library panel description/i)).toBeInTheDocument();
diff --git a/public/app/features/library-panels/components/LibraryPanelsSearch/LibraryPanelsSearch.tsx b/public/app/features/library-panels/components/LibraryPanelsSearch/LibraryPanelsSearch.tsx
index 104e5feda14eb..7c015f60b6afa 100644
--- a/public/app/features/library-panels/components/LibraryPanelsSearch/LibraryPanelsSearch.tsx
+++ b/public/app/features/library-panels/components/LibraryPanelsSearch/LibraryPanelsSearch.tsx
@@ -1,4 +1,4 @@
-import { css } from '@emotion/css';
+import { css, cx } from '@emotion/css';
 import React, { useCallback, useState } from 'react';
 import { useDebounce } from 'react-use';
 
@@ -57,7 +57,11 @@ export const LibraryPanelsSearch = ({
   return (
     <div className={styles.container}>
       <VerticalGroup spacing={verticalGroupSpacing}>
-        <div className={styles.gridContainer}>
+        <div
+          className={cx(styles.gridContainer, {
+            [styles.tightLayout]: variant === LibraryPanelsSearchVariant.Tight,
+          })}
+        >
           <div className={styles.filterInputWrapper}>
             <FilterInput
               value={searchQuery}
@@ -99,31 +103,30 @@ export const LibraryPanelsSearch = ({
 };
 
 function getStyles(theme: GrafanaTheme2, variant: LibraryPanelsSearchVariant) {
-  const tightLayout = css`
-    flex-direction: row;
-    row-gap: ${theme.spacing(1)};
-  `;
   return {
-    filterInputWrapper: css`
-      flex-grow: ${variant === LibraryPanelsSearchVariant.Tight ? 1 : 'initial'};
-    `,
-    container: css`
-      width: 100%;
-      overflow-y: auto;
-      padding: ${theme.spacing(1)};
-    `,
-    libraryPanelsView: css`
-      width: 100%;
-    `,
-    gridContainer: css`
-      ${variant === LibraryPanelsSearchVariant.Tight ? tightLayout : ''};
-      display: flex;
-      flex-direction: column;
-      width: 100%;
-      column-gap: ${theme.spacing(1)};
-      row-gap: ${theme.spacing(1)};
-      padding-bottom: ${theme.spacing(2)};
-    `,
+    filterInputWrapper: css({
+      flexGrow: variant === LibraryPanelsSearchVariant.Tight ? 1 : 'initial',
+    }),
+    container: css({
+      width: '100%',
+      overflowY: 'auto',
+      padding: theme.spacing(1),
+    }),
+    libraryPanelsView: css({
+      width: '100%',
+    }),
+    gridContainer: css({
+      display: 'flex',
+      flexDirection: 'column',
+      width: '100%',
+      columnGap: theme.spacing(1),
+      rowGap: theme.spacing(1),
+      paddingBottom: theme.spacing(2),
+    }),
+    tightLayout: css({
+      flexDirection: 'row',
+      rowGap: theme.spacing(1),
+    }),
   };
 }
 
@@ -149,7 +152,7 @@ const SearchControls = React.memo(
     onFolderFilterChange,
     onPanelFilterChange,
   }: SearchControlsProps) => {
-    const styles = useStyles2(getRowStyles, variant);
+    const styles = useStyles2(getRowStyles);
     const panelFilterChanged = useCallback(
       (plugins: PanelPluginMeta[]) => onPanelFilterChange(plugins.map((p) => p.id)),
       [onPanelFilterChange]
@@ -160,10 +163,18 @@ const SearchControls = React.memo(
     );
 
     return (
-      <div className={styles.container}>
+      <div
+        className={cx(styles.container, {
+          [styles.containerTight]: variant === LibraryPanelsSearchVariant.Tight,
+        })}
+      >
         {showSort && <SortPicker value={sortDirection} onChange={onSortChange} filter={['alpha-asc', 'alpha-desc']} />}
         {(showFolderFilter || showPanelFilter) && (
-          <div className={styles.filterContainer}>
+          <div
+            className={cx(styles.filterContainer, {
+              [styles.filterContainerTight]: variant === LibraryPanelsSearchVariant.Tight,
+            })}
+          >
             {showFolderFilter && <FolderFilter onChange={folderFilterChanged} />}
             {showPanelFilter && <PanelTypeFilter onChange={panelFilterChanged} />}
           </div>
@@ -174,42 +185,29 @@ const SearchControls = React.memo(
 );
 SearchControls.displayName = 'SearchControls';
 
-function getRowStyles(theme: GrafanaTheme2, variant = LibraryPanelsSearchVariant.Spacious) {
-  const searchRowContainer = css`
-    display: flex;
-    gap: ${theme.spacing(1)};
-    flex-grow: 1;
-    flex-direction: row;
-    justify-content: end;
-  `;
-  const searchRowContainerTight = css`
-    ${searchRowContainer};
-    flex-grow: initial;
-    flex-direction: column;
-    justify-content: normal;
-  `;
-  const filterContainer = css`
-    display: flex;
-    flex-direction: row;
-    margin-left: auto;
-    gap: 4px;
-  `;
-  const filterContainerTight = css`
-    ${filterContainer};
-    flex-direction: column;
-    margin-left: initial;
-  `;
-
-  switch (variant) {
-    case LibraryPanelsSearchVariant.Spacious:
-      return {
-        container: searchRowContainer,
-        filterContainer: filterContainer,
-      };
-    case LibraryPanelsSearchVariant.Tight:
-      return {
-        container: searchRowContainerTight,
-        filterContainer: filterContainerTight,
-      };
-  }
+function getRowStyles(theme: GrafanaTheme2) {
+  return {
+    container: css({
+      display: 'flex',
+      gap: theme.spacing(1),
+      flexGrow: 1,
+      flexDirection: 'row',
+      justifyContent: 'space-between',
+      flexWrap: 'wrap',
+    }),
+    containerTight: css({
+      flexGrow: 'initial',
+      flexDirection: 'column',
+      justifyContent: 'normal',
+    }),
+    filterContainer: css({
+      display: 'flex',
+      flexDirection: 'row',
+      gap: theme.spacing(1),
+    }),
+    filterContainerTight: css({
+      flexDirection: 'column',
+      marginLeft: 'initial',
+    }),
+  };
 }
diff --git a/public/app/features/library-panels/components/LibraryPanelsView/LibraryPanelsView.tsx b/public/app/features/library-panels/components/LibraryPanelsView/LibraryPanelsView.tsx
index 7cfd999aadead..a401ba5bf7246 100644
--- a/public/app/features/library-panels/components/LibraryPanelsView/LibraryPanelsView.tsx
+++ b/public/app/features/library-panels/components/LibraryPanelsView/LibraryPanelsView.tsx
@@ -1,9 +1,10 @@
-import { css, cx } from '@emotion/css';
+import { css } from '@emotion/css';
 import React, { useMemo, useReducer } from 'react';
 import { useDebounce } from 'react-use';
 
 import { GrafanaTheme2, LoadingState } from '@grafana/data';
-import { Pagination, useStyles2 } from '@grafana/ui';
+import { EmptyState, Pagination, Stack, useStyles2 } from '@grafana/ui';
+import { t } from 'app/core/internationalization';
 
 import { LibraryElementDTO } from '../../types';
 import { LibraryPanelCard } from '../LibraryPanelCard/LibraryPanelCard';
@@ -12,7 +13,6 @@ import { asyncDispatcher, deleteLibraryPanel, searchForLibraryPanels } from './a
 import { changePage, initialLibraryPanelsViewState, libraryPanelsViewReducer } from './reducer';
 
 interface LibraryPanelViewProps {
-  className?: string;
   onClickCard: (panel: LibraryElementDTO) => void;
   showSecondaryActions?: boolean;
   currentPanelId?: string;
@@ -25,7 +25,6 @@ interface LibraryPanelViewProps {
 }
 
 export const LibraryPanelsView = ({
-  className,
   onClickCard,
   searchString,
   sortDirection,
@@ -77,24 +76,26 @@ export const LibraryPanelsView = ({
   const onPageChange = (page: number) => asyncDispatch(changePage({ page }));
 
   return (
-    <div className={cx(styles.container, className)}>
-      <div className={styles.libraryPanelList}>
-        {loadingState === LoadingState.Loading ? (
-          <p>Loading library panels...</p>
-        ) : libraryPanels.length < 1 ? (
-          <p className={styles.noPanelsFound}>No library panels found.</p>
-        ) : (
-          libraryPanels?.map((item, i) => (
-            <LibraryPanelCard
-              key={`library-panel=${i}`}
-              libraryPanel={item}
-              onDelete={onDelete}
-              onClick={onClickCard}
-              showSecondaryActions={showSecondaryActions}
-            />
-          ))
-        )}
-      </div>
+    <Stack direction="column" wrap="nowrap">
+      {loadingState === LoadingState.Loading ? (
+        <>
+          <LibraryPanelCard.Skeleton showSecondaryActions={showSecondaryActions} />
+          <LibraryPanelCard.Skeleton showSecondaryActions={showSecondaryActions} />
+          <LibraryPanelCard.Skeleton showSecondaryActions={showSecondaryActions} />
+        </>
+      ) : libraryPanels.length < 1 ? (
+        <EmptyState variant="not-found" message={t('library-panels.empty-state.message', 'No library panels found')} />
+      ) : (
+        libraryPanels?.map((item, i) => (
+          <LibraryPanelCard
+            key={`library-panel=${i}`}
+            libraryPanel={item}
+            onDelete={onDelete}
+            onClick={onClickCard}
+            showSecondaryActions={showSecondaryActions}
+          />
+        ))
+      )}
       {libraryPanels.length ? (
         <div className={styles.pagination}>
           <Pagination
@@ -105,36 +106,15 @@ export const LibraryPanelsView = ({
           />
         </div>
       ) : null}
-    </div>
+    </Stack>
   );
 };
 
 const getPanelViewStyles = (theme: GrafanaTheme2) => {
   return {
-    container: css`
-      display: flex;
-      flex-direction: column;
-      flex-wrap: nowrap;
-    `,
-    libraryPanelList: css`
-      max-width: 100%;
-      display: grid;
-      grid-gap: ${theme.spacing(1)};
-    `,
-    searchHeader: css`
-      display: flex;
-    `,
-    newPanelButton: css`
-      margin-top: 10px;
-      align-self: flex-start;
-    `,
-    pagination: css`
-      align-self: center;
-      margin-top: ${theme.spacing(1)};
-    `,
-    noPanelsFound: css`
-      label: noPanelsFound;
-      min-height: 200px;
-    `,
+    pagination: css({
+      alignSelf: 'center',
+      marginTop: theme.spacing(1),
+    }),
   };
 };
diff --git a/public/app/features/library-panels/state/api.ts b/public/app/features/library-panels/state/api.ts
index 27fca15ef047a..d5611d9830726 100644
--- a/public/app/features/library-panels/state/api.ts
+++ b/public/app/features/library-panels/state/api.ts
@@ -2,6 +2,9 @@ import { lastValueFrom } from 'rxjs';
 
 import { defaultDashboard } from '@grafana/schema';
 import { DashboardModel } from 'app/features/dashboard/state';
+import { DashboardGridItem } from 'app/features/dashboard-scene/scene/DashboardGridItem';
+import { LibraryVizPanel } from 'app/features/dashboard-scene/scene/LibraryVizPanel';
+import { vizPanelToPanel } from 'app/features/dashboard-scene/serialization/transformSceneToSaveModel';
 
 import { getBackendSrv } from '../../../core/services/backend_srv';
 import { DashboardSearchItem } from '../../search/types';
@@ -65,6 +68,12 @@ export async function getLibraryPanel(uid: string, isHandled = false): Promise<L
     panels: [result.model],
   });
   const { scopedVars, ...model } = dash.panels[0].getSaveModel(); // migrated panel
+
+  //These properties should not exist on LibraryPanel.model which is of type Omit<Panel, 'gridPos' | 'id' | 'libraryPanel'>
+  delete model.gridPos;
+  delete model.id;
+  delete model.libraryPanel;
+
   dash.destroy(); // kill event listeners
   return {
     ...result,
@@ -127,3 +136,47 @@ export async function getConnectedDashboards(uid: string): Promise<DashboardSear
 
   return searchHits;
 }
+
+export function libraryVizPanelToSaveModel(libraryPanel: LibraryVizPanel) {
+  const { panel, uid, name, _loadedPanel } = libraryPanel.state;
+
+  const gridItem = libraryPanel.parent;
+
+  if (!gridItem || !(gridItem instanceof DashboardGridItem)) {
+    throw new Error('LibraryVizPanel must be a child of DashboardGridItem');
+  }
+
+  const saveModel = {
+    uid,
+    folderUID: _loadedPanel?.folderUid,
+    name,
+    version: _loadedPanel?.version || 0,
+    model: vizPanelToPanel(
+      panel!,
+      {
+        x: gridItem.state.x ?? 0,
+        y: gridItem.state.y ?? 0,
+        w: gridItem.state.width ?? 0,
+        h: gridItem.state.height ?? 0,
+      },
+      false,
+      gridItem
+    ),
+    kind: LibraryElementKind.Panel,
+  };
+  return saveModel;
+}
+
+export async function updateLibraryVizPanel(libraryPanel: LibraryVizPanel): Promise<LibraryElementDTO> {
+  const { uid, folderUID, name, model, version, kind } = libraryVizPanelToSaveModel(libraryPanel);
+
+  console.log('updateLibraryVizPanel', model);
+  const { result } = await getBackendSrv().patch(`/api/library-elements/${uid}`, {
+    folderUID,
+    name,
+    model,
+    version,
+    kind,
+  });
+  return result;
+}
diff --git a/public/app/features/live/centrifuge/LiveDataStream.test.ts b/public/app/features/live/centrifuge/LiveDataStream.test.ts
index 9a3bd331f5ef6..1870d59ee7934 100644
--- a/public/app/features/live/centrifuge/LiveDataStream.test.ts
+++ b/public/app/features/live/centrifuge/LiveDataStream.test.ts
@@ -25,9 +25,9 @@ type SubjectsInsteadOfObservables<T> = {
   [key in keyof T]: T[key] extends Observable<infer U> ? Subject<U> : T[key];
 };
 
-type DepsWithSubjectsInsteadOfObservables<T = any> = SubjectsInsteadOfObservables<DataStreamHandlerDeps<T>>;
+type DepsWithSubjectsInsteadOfObservables<T = unknown> = SubjectsInsteadOfObservables<DataStreamHandlerDeps<T>>;
 
-const createDeps = <T = any>(
+const createDeps = <T = unknown>(
   overrides?: Partial<DepsWithSubjectsInsteadOfObservables<T>>
 ): DepsWithSubjectsInsteadOfObservables<T> => {
   return {
@@ -43,7 +43,7 @@ const createDeps = <T = any>(
 
 class ValuesCollection<T> implements Unsubscribable {
   values: T[] = [];
-  errors: any[] = [];
+  errors: unknown[] = [];
   receivedComplete = false;
   subscription: Subscription | undefined;
 
@@ -898,8 +898,8 @@ describe('LiveDataStream', () => {
             return isStreamingResponseData(data, StreamingResponseDataType.FullFrame)
               ? fieldsOf(data)
               : isStreamingResponseData(data, StreamingResponseDataType.NewValuesSameSchema)
-              ? data.values
-              : response;
+                ? data.values
+                : response;
           })
         )
       ).toEqual({
diff --git a/public/app/features/live/centrifuge/transferHandlers.ts b/public/app/features/live/centrifuge/transferHandlers.ts
index 7220003fc8309..dafda35a4f6ac 100644
--- a/public/app/features/live/centrifuge/transferHandlers.ts
+++ b/public/app/features/live/centrifuge/transferHandlers.ts
@@ -3,8 +3,8 @@ import { Subscriber } from 'rxjs';
 
 // Observers, ie. functions passed to `observable.subscribe(...)`, are converted to a subclass of `Subscriber` before they are sent to the source Observable.
 // The conversion happens internally in the RxJS library - this transfer handler is catches them and wraps them with a proxy
-const subscriberTransferHandler: any = {
-  canHandle(value: unknown): boolean {
+const subscriberTransferHandler = {
+  canHandle(value: unknown): value is Subscriber<unknown> {
     return Boolean(value && value instanceof Subscriber);
   },
 
diff --git a/public/app/features/live/dashboard/DashboardChangedModal.tsx b/public/app/features/live/dashboard/DashboardChangedModal.tsx
index 3c30055e16200..5309bf381fcfe 100644
--- a/public/app/features/live/dashboard/DashboardChangedModal.tsx
+++ b/public/app/features/live/dashboard/DashboardChangedModal.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { locationService } from '@grafana/runtime';
-import { Button, Modal, stylesFactory, useStyles2 } from '@grafana/ui';
+import { Button, Modal, useStyles2 } from '@grafana/ui';
 
 import { dashboardWatcher } from './dashboardWatcher';
 import { DashboardEvent, DashboardEventAction } from './types';
@@ -50,12 +50,10 @@ export function DashboardChangedModal({ onDismiss, event }: Props) {
   );
 }
 
-const getStyles = stylesFactory((theme: GrafanaTheme2) => {
-  return {
-    modal: css({ width: '600px' }),
-    description: css({
-      color: theme.colors.text.secondary,
-      paddingBottom: theme.spacing(1),
-    }),
-  };
+const getStyles = (theme: GrafanaTheme2) => ({
+  modal: css({ width: '600px' }),
+  description: css({
+    color: theme.colors.text.secondary,
+    paddingBottom: theme.spacing(1),
+  }),
 });
diff --git a/public/app/features/live/index.ts b/public/app/features/live/index.ts
index 9b1c10e357335..f434a7149fda9 100644
--- a/public/app/features/live/index.ts
+++ b/public/app/features/live/index.ts
@@ -1,4 +1,4 @@
-import { config, getBackendSrv, getGrafanaLiveSrv, setGrafanaLiveSrv } from '@grafana/runtime';
+import { GrafanaLiveSrv, config, getBackendSrv, getGrafanaLiveSrv, setGrafanaLiveSrv } from '@grafana/runtime';
 import { liveTimer } from 'app/features/dashboard/dashgrid/liveTimer';
 
 import { contextSrv } from '../../core/services/context_srv';
@@ -30,6 +30,6 @@ export function initGrafanaLive() {
   );
 }
 
-export function getGrafanaLiveCentrifugeSrv() {
-  return getGrafanaLiveSrv() as GrafanaLiveService;
+export function getGrafanaLiveCentrifugeSrv(): GrafanaLiveSrv {
+  return getGrafanaLiveSrv();
 }
diff --git a/public/app/features/live/info.ts b/public/app/features/live/info.ts
new file mode 100644
index 0000000000000..19bab8db1688d
--- /dev/null
+++ b/public/app/features/live/info.ts
@@ -0,0 +1,44 @@
+import { SelectableValue, dataFrameFromJSON } from '@grafana/data';
+import { getBackendSrv } from '@grafana/runtime';
+
+interface ChannelInfo {
+  channel: string;
+  minute_rate: number; //
+  data: unknown; // the last payload
+}
+
+interface ManagedChannels {
+  channels: ChannelInfo[];
+}
+
+interface ChannelSelectionInfo {
+  channels: Array<SelectableValue<string>>;
+  channelFields: Record<string, Array<SelectableValue<string>>>;
+}
+
+export async function getManagedChannelInfo(): Promise<ChannelSelectionInfo> {
+  return getBackendSrv()
+    .get<ManagedChannels>('api/live/list')
+    .then((v) => {
+      const channelInfo = v.channels ?? [];
+      const channelFields: Record<string, Array<SelectableValue<string>>> = {};
+      const channels: Array<SelectableValue<string>> = channelInfo.map((c) => {
+        if (c.data) {
+          const distinctFields = new Set<string>();
+          const frame = dataFrameFromJSON(c.data);
+          for (const f of frame.fields) {
+            distinctFields.add(f.name);
+          }
+          channelFields[c.channel] = Array.from(distinctFields).map((n) => ({
+            value: n,
+            label: n,
+          }));
+        }
+        return {
+          value: c.channel,
+          label: c.channel + ' [' + c.minute_rate + ' msg/min]',
+        };
+      });
+      return { channelFields, channels };
+    });
+}
diff --git a/public/app/features/logs/components/InfiniteScroll.test.tsx b/public/app/features/logs/components/InfiniteScroll.test.tsx
new file mode 100644
index 0000000000000..47429764b3b58
--- /dev/null
+++ b/public/app/features/logs/components/InfiniteScroll.test.tsx
@@ -0,0 +1,298 @@
+import { act, render, screen } from '@testing-library/react';
+import React, { useEffect, useRef, useState } from 'react';
+
+import { LogRowModel, dateTimeForTimeZone } from '@grafana/data';
+import { convertRawToRange } from '@grafana/data/src/datetime/rangeutil';
+import { config } from '@grafana/runtime';
+import { LogsSortOrder } from '@grafana/schema';
+
+import { InfiniteScroll, Props, SCROLLING_THRESHOLD } from './InfiniteScroll';
+import { createLogRow } from './__mocks__/logRow';
+
+const defaultTz = 'browser';
+
+const absoluteRange = {
+  from: 1702578600000,
+  to: 1702578900000,
+};
+const defaultRange = convertRawToRange({
+  from: dateTimeForTimeZone(defaultTz, absoluteRange.from),
+  to: dateTimeForTimeZone(defaultTz, absoluteRange.to),
+});
+
+const defaultProps: Omit<Props, 'children'> = {
+  loading: false,
+  loadMoreLogs: jest.fn(),
+  range: defaultRange,
+  rows: [],
+  sortOrder: LogsSortOrder.Descending,
+  timeZone: 'browser',
+};
+
+function ScrollWithWrapper({ children, ...props }: Props) {
+  const [initialized, setInitialized] = useState(false);
+  const scrollRef = useRef<HTMLDivElement | null>(null);
+
+  useEffect(() => {
+    // Required to get the ref
+    if (scrollRef.current && !initialized) {
+      setInitialized(true);
+    }
+  }, [initialized]);
+
+  return (
+    <div style={{ height: 40, overflowY: 'scroll' }} ref={scrollRef} data-testid="scroll-element">
+      {initialized && (
+        <InfiniteScroll {...props} scrollElement={scrollRef.current!} topScrollEnabled>
+          {children}
+        </InfiniteScroll>
+      )}
+    </div>
+  );
+}
+
+function setup(loadMoreMock: () => void, startPosition: number, rows: LogRowModel[], order: LogsSortOrder) {
+  const { element, events } = getMockElement(startPosition);
+
+  function scrollTo(position: number) {
+    element.scrollTop = position;
+
+    act(() => {
+      events['scroll'](new Event('scroll'));
+    });
+
+    // When scrolling top, we wait for the user to reach the top, and then for a new scrolling event
+    // in the same direction before triggering a new query.
+    if (position === 0) {
+      wheel(-1);
+    }
+  }
+  function wheel(deltaY: number) {
+    element.scrollTop += deltaY;
+
+    act(() => {
+      const event = new WheelEvent('wheel', { deltaY });
+      events['wheel'](event);
+    });
+  }
+
+  render(
+    <InfiniteScroll
+      {...defaultProps}
+      sortOrder={order}
+      rows={rows}
+      scrollElement={element as unknown as HTMLDivElement}
+      loadMoreLogs={loadMoreMock}
+      topScrollEnabled
+    >
+      <div data-testid="contents" style={{ height: 100 }} />
+    </InfiniteScroll>
+  );
+
+  return { element, events, scrollTo, wheel };
+}
+
+beforeAll(() => {
+  config.featureToggles.logsInfiniteScrolling = true;
+});
+afterAll(() => {
+  config.featureToggles.logsInfiniteScrolling = false;
+});
+
+describe('InfiniteScroll', () => {
+  test('Wraps components without adding DOM elements', async () => {
+    const { container } = render(
+      <ScrollWithWrapper {...defaultProps}>
+        <div data-testid="contents" />
+      </ScrollWithWrapper>
+    );
+
+    expect(await screen.findByTestId('contents')).toBeInTheDocument();
+    expect(container).toMatchInlineSnapshot(`
+      <div>
+        <div
+          data-testid="scroll-element"
+          style="height: 40px; overflow-y: scroll;"
+        >
+          <div
+            data-testid="contents"
+          />
+        </div>
+      </div>
+`);
+  });
+
+  describe.each([LogsSortOrder.Descending, LogsSortOrder.Ascending])(
+    'When the sort order is %s',
+    (order: LogsSortOrder) => {
+      let rows: LogRowModel[];
+      beforeEach(() => {
+        rows = createLogRows(absoluteRange.from + 2 * SCROLLING_THRESHOLD, absoluteRange.to - 2 * SCROLLING_THRESHOLD);
+      });
+
+      test.each([
+        ['top', 10, 0],
+        ['bottom', 50, 60],
+      ])(
+        'Requests more logs when scrolling %s',
+        async (direction: string, startPosition: number, endPosition: number) => {
+          const loadMoreMock = jest.fn();
+          const { scrollTo, element } = setup(loadMoreMock, startPosition, rows, order);
+
+          expect(await screen.findByTestId('contents')).toBeInTheDocument();
+
+          scrollTo(endPosition);
+
+          expect(loadMoreMock).toHaveBeenCalled();
+          expect(await screen.findByTestId('Spinner')).toBeInTheDocument();
+          if (direction === 'bottom') {
+            // Bottom loader visibility trick
+            expect(element.scrollTo).toHaveBeenCalled();
+          } else {
+            expect(element.scrollTo).not.toHaveBeenCalled();
+          }
+        }
+      );
+
+      test.each([
+        ['up', -5, 0],
+        ['down', 5, 100],
+      ])(
+        'Requests more logs when moving the mousewheel %s',
+        async (_: string, deltaY: number, startPosition: number) => {
+          const loadMoreMock = jest.fn();
+          const { wheel } = setup(loadMoreMock, startPosition, rows, order);
+
+          expect(await screen.findByTestId('contents')).toBeInTheDocument();
+
+          wheel(deltaY);
+
+          expect(loadMoreMock).toHaveBeenCalled();
+          expect(await screen.findByTestId('Spinner')).toBeInTheDocument();
+        }
+      );
+
+      test('Does not request more logs when there is no scroll', async () => {
+        const loadMoreMock = jest.fn();
+        const { scrollTo, element } = setup(loadMoreMock, 0, rows, order);
+
+        expect(await screen.findByTestId('contents')).toBeInTheDocument();
+        element.clientHeight = 40;
+        element.scrollHeight = element.clientHeight;
+
+        scrollTo(40);
+
+        expect(loadMoreMock).not.toHaveBeenCalled();
+        expect(screen.queryByTestId('Spinner')).not.toBeInTheDocument();
+      });
+
+      test('Requests newer logs from the most recent timestamp', async () => {
+        const startPosition = order === LogsSortOrder.Descending ? 10 : 50; // Scroll top
+        const endPosition = order === LogsSortOrder.Descending ? 0 : 60; // Scroll bottom
+
+        const loadMoreMock = jest.fn();
+        const { scrollTo } = setup(loadMoreMock, startPosition, rows, order);
+
+        expect(await screen.findByTestId('contents')).toBeInTheDocument();
+
+        scrollTo(endPosition);
+
+        expect(loadMoreMock).toHaveBeenCalledWith({
+          from: rows[rows.length - 1].timeEpochMs,
+          to: absoluteRange.to,
+        });
+      });
+
+      test('Requests older logs from the oldest timestamp', async () => {
+        const startPosition = order === LogsSortOrder.Ascending ? 10 : 50; // Scroll top
+        const endPosition = order === LogsSortOrder.Ascending ? 0 : 60; // Scroll bottom
+
+        const loadMoreMock = jest.fn();
+        const { scrollTo } = setup(loadMoreMock, startPosition, rows, order);
+
+        expect(await screen.findByTestId('contents')).toBeInTheDocument();
+
+        scrollTo(endPosition);
+
+        expect(loadMoreMock).toHaveBeenCalledWith({
+          from: absoluteRange.from,
+          to: rows[0].timeEpochMs,
+        });
+      });
+
+      describe('With absolute range matching visible range', () => {
+        test.each([
+          ['top', 10, 0],
+          ['bottom', 50, 60],
+        ])(
+          'It does not request more when scrolling %s',
+          async (_: string, startPosition: number, endPosition: number) => {
+            // Visible range matches the current range
+            const rows = createLogRows(absoluteRange.from, absoluteRange.to);
+            const loadMoreMock = jest.fn();
+            const { scrollTo } = setup(loadMoreMock, startPosition, rows, order);
+
+            expect(await screen.findByTestId('contents')).toBeInTheDocument();
+
+            scrollTo(endPosition);
+
+            expect(loadMoreMock).not.toHaveBeenCalled();
+            expect(screen.queryByTestId('Spinner')).not.toBeInTheDocument();
+            expect(await screen.findByTestId('end-of-range')).toBeInTheDocument();
+          }
+        );
+      });
+
+      describe('With relative range matching visible range', () => {
+        test.each([
+          ['top', 10, 0],
+          ['bottom', 50, 60],
+        ])(
+          'It does not request more when scrolling %s',
+          async (_: string, startPosition: number, endPosition: number) => {
+            // Visible range matches the current range
+            const rows = createLogRows(absoluteRange.from, absoluteRange.to);
+            const loadMoreMock = jest.fn();
+            const { scrollTo } = setup(loadMoreMock, startPosition, rows, order);
+
+            expect(await screen.findByTestId('contents')).toBeInTheDocument();
+
+            scrollTo(endPosition);
+
+            expect(loadMoreMock).not.toHaveBeenCalled();
+            expect(screen.queryByTestId('Spinner')).not.toBeInTheDocument();
+            expect(await screen.findByTestId('end-of-range')).toBeInTheDocument();
+          }
+        );
+      });
+    }
+  );
+});
+
+function createLogRows(from: number, to: number) {
+  const rows = [createLogRow({ entry: 'line1' }), createLogRow({ entry: 'line2' })];
+  // Time field
+  rows[0].dataFrame.fields[0].values = [from, to];
+  rows[0].timeEpochMs = from;
+  rows[1].dataFrame.fields[0].values = [from, to];
+  rows[1].timeEpochMs = to;
+  return rows;
+}
+
+// JSDOM doesn't support layout, so we will mock the expected attribute values for the test cases.
+function getMockElement(scrollTop: number) {
+  const events: Record<string, (e: Event | WheelEvent) => void> = {};
+  const element = {
+    addEventListener: (event: string, callback: (e: Event | WheelEvent) => void) => {
+      events[event] = callback;
+    },
+    removeEventListener: jest.fn(),
+    stopImmediatePropagation: jest.fn(),
+    scrollHeight: 100,
+    clientHeight: 40,
+    scrollTop,
+    scrollTo: jest.fn(),
+  };
+
+  return { element, events };
+}
diff --git a/public/app/features/logs/components/InfiniteScroll.tsx b/public/app/features/logs/components/InfiniteScroll.tsx
new file mode 100644
index 0000000000000..744584735db07
--- /dev/null
+++ b/public/app/features/logs/components/InfiniteScroll.tsx
@@ -0,0 +1,246 @@
+import { css } from '@emotion/css';
+import React, { ReactNode, useEffect, useRef, useState } from 'react';
+
+import { AbsoluteTimeRange, LogRowModel, TimeRange } from '@grafana/data';
+import { convertRawToRange, isRelativeTime, isRelativeTimeRange } from '@grafana/data/src/datetime/rangeutil';
+import { config, reportInteraction } from '@grafana/runtime';
+import { LogsSortOrder, TimeZone } from '@grafana/schema';
+
+import { LoadingIndicator } from './LoadingIndicator';
+
+export type Props = {
+  children: ReactNode;
+  loading: boolean;
+  loadMoreLogs?: (range: AbsoluteTimeRange) => void;
+  range: TimeRange;
+  rows: LogRowModel[];
+  scrollElement?: HTMLDivElement;
+  sortOrder: LogsSortOrder;
+  timeZone: TimeZone;
+  topScrollEnabled?: boolean;
+};
+
+export const InfiniteScroll = ({
+  children,
+  loading,
+  loadMoreLogs,
+  range,
+  rows,
+  scrollElement,
+  sortOrder,
+  timeZone,
+  topScrollEnabled = false,
+}: Props) => {
+  const [upperOutOfRange, setUpperOutOfRange] = useState(false);
+  const [lowerOutOfRange, setLowerOutOfRange] = useState(false);
+  const [upperLoading, setUpperLoading] = useState(false);
+  const [lowerLoading, setLowerLoading] = useState(false);
+  const rowsRef = useRef<LogRowModel[]>(rows);
+  const lastScroll = useRef<number>(scrollElement?.scrollTop || 0);
+
+  // Reset messages when range/order/rows change
+  useEffect(() => {
+    setUpperOutOfRange(false);
+    setLowerOutOfRange(false);
+  }, [range, rows, sortOrder]);
+
+  // Reset loading messages when loading stops
+  useEffect(() => {
+    if (!loading) {
+      setUpperLoading(false);
+      setLowerLoading(false);
+    }
+  }, [loading]);
+
+  // Ensure bottom loader visibility
+  useEffect(() => {
+    if (lowerLoading && scrollElement) {
+      scrollElement.scrollTo(0, scrollElement.scrollHeight - scrollElement.clientHeight);
+    }
+  }, [lowerLoading, scrollElement]);
+
+  // Request came back with no new past rows
+  useEffect(() => {
+    if (rows !== rowsRef.current && rows.length === rowsRef.current.length && (upperLoading || lowerLoading)) {
+      if (sortOrder === LogsSortOrder.Descending && lowerLoading) {
+        setLowerOutOfRange(true);
+      } else if (sortOrder === LogsSortOrder.Ascending && upperLoading) {
+        setUpperOutOfRange(true);
+      }
+    }
+    rowsRef.current = rows;
+  }, [lowerLoading, rows, sortOrder, upperLoading]);
+
+  useEffect(() => {
+    if (!scrollElement || !loadMoreLogs) {
+      return;
+    }
+
+    function handleScroll(event: Event | WheelEvent) {
+      if (!scrollElement || !loadMoreLogs || !rows.length || loading || !config.featureToggles.logsInfiniteScrolling) {
+        return;
+      }
+      event.stopImmediatePropagation();
+      const scrollDirection = shouldLoadMore(event, scrollElement, lastScroll.current);
+      lastScroll.current = scrollElement.scrollTop;
+      if (scrollDirection === ScrollDirection.NoScroll) {
+        return;
+      } else if (scrollDirection === ScrollDirection.Top && topScrollEnabled) {
+        scrollTop();
+      } else if (scrollDirection === ScrollDirection.Bottom) {
+        scrollBottom();
+      }
+    }
+
+    function scrollTop() {
+      const newRange = canScrollTop(getVisibleRange(rows), range, timeZone, sortOrder);
+      if (!newRange) {
+        setUpperOutOfRange(true);
+        return;
+      }
+      setUpperOutOfRange(false);
+      loadMoreLogs?.(newRange);
+      setUpperLoading(true);
+      reportInteraction('grafana_logs_infinite_scrolling', {
+        direction: 'top',
+        sort_order: sortOrder,
+      });
+    }
+
+    function scrollBottom() {
+      const newRange = canScrollBottom(getVisibleRange(rows), range, timeZone, sortOrder);
+      if (!newRange) {
+        setLowerOutOfRange(true);
+        return;
+      }
+      setLowerOutOfRange(false);
+      loadMoreLogs?.(newRange);
+      setLowerLoading(true);
+      reportInteraction('grafana_logs_infinite_scrolling', {
+        direction: 'bottom',
+        sort_order: sortOrder,
+      });
+    }
+
+    scrollElement.addEventListener('scroll', handleScroll);
+    scrollElement.addEventListener('wheel', handleScroll);
+
+    return () => {
+      scrollElement.removeEventListener('scroll', handleScroll);
+      scrollElement.removeEventListener('wheel', handleScroll);
+    };
+  }, [loadMoreLogs, loading, range, rows, scrollElement, sortOrder, timeZone, topScrollEnabled]);
+
+  // We allow "now" to move when using relative time, so we hide the message so it doesn't flash.
+  const hideTopMessage = sortOrder === LogsSortOrder.Descending && isRelativeTime(range.raw.to);
+  const hideBottomMessage = sortOrder === LogsSortOrder.Ascending && isRelativeTime(range.raw.to);
+
+  return (
+    <>
+      {upperLoading && <LoadingIndicator adjective={sortOrder === LogsSortOrder.Descending ? 'newer' : 'older'} />}
+      {!hideTopMessage && upperOutOfRange && outOfRangeMessage}
+      {children}
+      {!hideBottomMessage && lowerOutOfRange && outOfRangeMessage}
+      {lowerLoading && <LoadingIndicator adjective={sortOrder === LogsSortOrder.Descending ? 'older' : 'newer'} />}
+    </>
+  );
+};
+
+const styles = {
+  messageContainer: css({
+    textAlign: 'center',
+    padding: 0.25,
+  }),
+};
+
+const outOfRangeMessage = (
+  <div className={styles.messageContainer} data-testid="end-of-range">
+    End of the selected time range.
+  </div>
+);
+
+enum ScrollDirection {
+  Top = -1,
+  Bottom = 1,
+  NoScroll = 0,
+}
+function shouldLoadMore(event: Event | WheelEvent, element: HTMLDivElement, lastScroll: number): ScrollDirection {
+  // Disable behavior if there is no scroll
+  if (element.scrollHeight <= element.clientHeight) {
+    return ScrollDirection.NoScroll;
+  }
+  const delta = event instanceof WheelEvent ? event.deltaY : element.scrollTop - lastScroll;
+  if (delta === 0) {
+    return ScrollDirection.NoScroll;
+  }
+  const scrollDirection = delta < 0 ? ScrollDirection.Top : ScrollDirection.Bottom;
+  const diff =
+    scrollDirection === ScrollDirection.Top
+      ? element.scrollTop
+      : element.scrollHeight - element.scrollTop - element.clientHeight;
+
+  return diff <= 1 ? scrollDirection : ScrollDirection.NoScroll;
+}
+
+function getVisibleRange(rows: LogRowModel[]) {
+  const firstTimeStamp = rows[0].timeEpochMs;
+  const lastTimeStamp = rows[rows.length - 1].timeEpochMs;
+
+  const visibleRange =
+    lastTimeStamp < firstTimeStamp
+      ? { from: lastTimeStamp, to: firstTimeStamp }
+      : { from: firstTimeStamp, to: lastTimeStamp };
+
+  return visibleRange;
+}
+
+function getPrevRange(visibleRange: AbsoluteTimeRange, currentRange: TimeRange) {
+  return { from: currentRange.from.valueOf(), to: visibleRange.from };
+}
+
+function getNextRange(visibleRange: AbsoluteTimeRange, currentRange: TimeRange, timeZone: TimeZone) {
+  // When requesting new logs, update the current range if using relative time ranges.
+  currentRange = updateCurrentRange(currentRange, timeZone);
+  return { from: visibleRange.to, to: currentRange.to.valueOf() };
+}
+
+export const SCROLLING_THRESHOLD = 1e3;
+
+// To get more logs, the difference between the visible range and the current range should be 1 second or more.
+function canScrollTop(
+  visibleRange: AbsoluteTimeRange,
+  currentRange: TimeRange,
+  timeZone: TimeZone,
+  sortOrder: LogsSortOrder
+): AbsoluteTimeRange | undefined {
+  if (sortOrder === LogsSortOrder.Descending) {
+    // When requesting new logs, update the current range if using relative time ranges.
+    currentRange = updateCurrentRange(currentRange, timeZone);
+    const canScroll = currentRange.to.valueOf() - visibleRange.to > SCROLLING_THRESHOLD;
+    return canScroll ? getNextRange(visibleRange, currentRange, timeZone) : undefined;
+  }
+
+  const canScroll = Math.abs(currentRange.from.valueOf() - visibleRange.from) > SCROLLING_THRESHOLD;
+  return canScroll ? getPrevRange(visibleRange, currentRange) : undefined;
+}
+
+function canScrollBottom(
+  visibleRange: AbsoluteTimeRange,
+  currentRange: TimeRange,
+  timeZone: TimeZone,
+  sortOrder: LogsSortOrder
+): AbsoluteTimeRange | undefined {
+  if (sortOrder === LogsSortOrder.Descending) {
+    const canScroll = Math.abs(currentRange.from.valueOf() - visibleRange.from) > SCROLLING_THRESHOLD;
+    return canScroll ? getPrevRange(visibleRange, currentRange) : undefined;
+  }
+  // When requesting new logs, update the current range if using relative time ranges.
+  currentRange = updateCurrentRange(currentRange, timeZone);
+  const canScroll = currentRange.to.valueOf() - visibleRange.to > SCROLLING_THRESHOLD;
+  return canScroll ? getNextRange(visibleRange, currentRange, timeZone) : undefined;
+}
+
+// Given a TimeRange, returns a new instance if using relative time, or else the same.
+function updateCurrentRange(timeRange: TimeRange, timeZone: TimeZone) {
+  return isRelativeTimeRange(timeRange.raw) ? convertRawToRange(timeRange.raw, timeZone) : timeRange;
+}
diff --git a/public/app/features/logs/components/LoadingIndicator.tsx b/public/app/features/logs/components/LoadingIndicator.tsx
new file mode 100644
index 0000000000000..c483b18c92fcd
--- /dev/null
+++ b/public/app/features/logs/components/LoadingIndicator.tsx
@@ -0,0 +1,26 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { Spinner } from '@grafana/ui';
+
+// ideally we'd use `@grafana/ui/LoadingPlaceholder`, but that
+// one has a large margin-bottom.
+type Props = {
+  adjective?: string;
+};
+
+export const LoadingIndicator = ({ adjective = 'newer' }: Props) => {
+  const text = `Loading ${adjective} logs...`;
+  return (
+    <div className={loadingIndicatorStyles}>
+      <div>
+        {text} <Spinner inline />
+      </div>
+    </div>
+  );
+};
+
+const loadingIndicatorStyles = css`
+  display: flex;
+  justify-content: center;
+`;
diff --git a/public/app/features/logs/components/LogDetails.test.tsx b/public/app/features/logs/components/LogDetails.test.tsx
index 4d963491499d3..0512aec6f2613 100644
--- a/public/app/features/logs/components/LogDetails.test.tsx
+++ b/public/app/features/logs/components/LogDetails.test.tsx
@@ -2,8 +2,16 @@ import { render, screen, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { Field, LogLevel, LogRowModel, MutableDataFrame, createTheme, FieldType } from '@grafana/data';
-import { config } from '@grafana/runtime';
+import {
+  Field,
+  LogLevel,
+  LogRowModel,
+  MutableDataFrame,
+  createTheme,
+  FieldType,
+  createDataFrame,
+  DataFrameType,
+} from '@grafana/data';
 
 import { LogDetails, Props } from './LogDetails';
 import { createLogRow } from './__mocks__/logRow';
@@ -57,16 +65,10 @@ describe('LogDetails', () => {
         },
         { labels: { key1: 'label1' } }
       );
-      expect(screen.getByLabelText('Filter for value')).toBeInTheDocument();
-      expect(screen.getByLabelText('Filter out value')).toBeInTheDocument();
+      expect(screen.getByLabelText('Filter for value in query A')).toBeInTheDocument();
+      expect(screen.getByLabelText('Filter out value in query A')).toBeInTheDocument();
     });
-    describe('With toggleLabelsInLogsUI=true', () => {
-      beforeAll(() => {
-        config.featureToggles.toggleLabelsInLogsUI = true;
-      });
-      afterAll(() => {
-        config.featureToggles.toggleLabelsInLogsUI = false;
-      });
+    describe('Toggleable filters', () => {
       it('should provide the log row to Explore filter functions', async () => {
         const onClickFilterLabelMock = jest.fn();
         const onClickFilterOutLabelMock = jest.fn();
@@ -88,11 +90,33 @@ describe('LogDetails', () => {
 
         await userEvent.click(screen.getByLabelText('Filter for value in query A'));
         expect(onClickFilterLabelMock).toHaveBeenCalledTimes(1);
-        expect(onClickFilterLabelMock).toHaveBeenCalledWith('key1', 'label1', mockRow.dataFrame.refId);
+        expect(onClickFilterLabelMock).toHaveBeenCalledWith(
+          'key1',
+          'label1',
+          expect.objectContaining({
+            fields: [
+              expect.objectContaining({ values: [0] }),
+              expect.objectContaining({ values: ['line1'] }),
+              expect.objectContaining({ values: [{ app: 'app01' }] }),
+            ],
+            length: 1,
+          })
+        );
 
         await userEvent.click(screen.getByLabelText('Filter out value in query A'));
         expect(onClickFilterOutLabelMock).toHaveBeenCalledTimes(1);
-        expect(onClickFilterOutLabelMock).toHaveBeenCalledWith('key1', 'label1', mockRow.dataFrame.refId);
+        expect(onClickFilterOutLabelMock).toHaveBeenCalledWith(
+          'key1',
+          'label1',
+          expect.objectContaining({
+            fields: [
+              expect.objectContaining({ values: [0] }),
+              expect.objectContaining({ values: ['line1'] }),
+              expect.objectContaining({ values: [{ app: 'app01' }] }),
+            ],
+            length: 1,
+          })
+        );
       });
     });
     it('should not render filter controls when the callbacks are not provided', () => {
@@ -180,4 +204,66 @@ describe('LogDetails', () => {
     expect(link).toBeInTheDocument();
     expect(link).toHaveAttribute('href', 'localhost:3210/1234');
   });
+
+  it('should show correct log details fields, links and labels for DataFrameType.LogLines frames', () => {
+    const entry = 'test';
+    const dataFrame = createDataFrame({
+      fields: [
+        { name: 'timestamp', config: {}, type: FieldType.time, values: [1] },
+        { name: 'body', type: FieldType.string, values: [entry] },
+        {
+          name: 'labels',
+          type: FieldType.other,
+          values: [
+            {
+              label1: 'value1',
+            },
+          ],
+        },
+        {
+          name: 'shouldNotShowFieldName',
+          type: FieldType.string,
+          values: ['shouldNotShowFieldValue'],
+        },
+        {
+          name: 'shouldShowLinkName',
+          type: FieldType.string,
+          values: ['shouldShowLinkValue'],
+          config: { links: [{ title: 'link', url: 'localhost:3210/${__value.text}' }] },
+        },
+      ],
+      meta: {
+        type: DataFrameType.LogLines,
+      },
+    });
+
+    setup(
+      {
+        getFieldLinks: (field: Field, rowIndex: number) => {
+          if (field.config && field.config.links) {
+            return field.config.links.map((link) => {
+              return {
+                href: link.url.replace('${__value.text}', field.values[rowIndex]),
+                title: link.title,
+                target: '_blank',
+                origin: field,
+              };
+            });
+          }
+          return [];
+        },
+      },
+      { entry, dataFrame, entryFieldIndex: 0, rowIndex: 0, labels: { label1: 'value1' } }
+    );
+
+    // Don't show additional fields for DataFrameType.LogLines
+    expect(screen.queryByText('shouldNotShowFieldName')).not.toBeInTheDocument();
+    expect(screen.queryByText('shouldNotShowFieldValue')).not.toBeInTheDocument();
+
+    // Show labels and links
+    expect(screen.getByText('label1')).toBeInTheDocument();
+    expect(screen.getByText('value1')).toBeInTheDocument();
+    expect(screen.getByText('shouldShowLinkName')).toBeInTheDocument();
+    expect(screen.getByText('shouldShowLinkValue')).toBeInTheDocument();
+  });
 });
diff --git a/public/app/features/logs/components/LogDetails.tsx b/public/app/features/logs/components/LogDetails.tsx
index ecd529407a3e4..6d489d91b51e9 100644
--- a/public/app/features/logs/components/LogDetails.tsx
+++ b/public/app/features/logs/components/LogDetails.tsx
@@ -1,7 +1,7 @@
 import { cx } from '@emotion/css';
 import React, { PureComponent } from 'react';
 
-import { CoreApp, DataFrame, Field, LinkModel, LogRowModel } from '@grafana/data';
+import { CoreApp, DataFrame, DataFrameType, Field, LinkModel, LogRowModel } from '@grafana/data';
 import { Themeable2, withTheme2 } from '@grafana/ui';
 
 import { calculateLogsLabelStats, calculateStats } from '../utils';
@@ -20,8 +20,8 @@ export interface Props extends Themeable2 {
   app?: CoreApp;
   styles: LogRowStyles;
 
-  onClickFilterLabel?: (key: string, value: string, refId?: string) => void;
-  onClickFilterOutLabel?: (key: string, value: string, refId?: string) => void;
+  onClickFilterLabel?: (key: string, value: string, frame?: DataFrame) => void;
+  onClickFilterOutLabel?: (key: string, value: string, frame?: DataFrame) => void;
   getFieldLinks?: (field: Field, rowIndex: number, dataFrame: DataFrame) => Array<LinkModel<Field>>;
   displayedFields?: string[];
   onClickShowField?: (key: string) => void;
@@ -56,14 +56,18 @@ class UnThemedLogDetails extends PureComponent<Props> {
     const displayedFieldsWithLinks = fieldsWithLinks.filter((f) => f.fieldIndex !== row.entryFieldIndex).sort();
     const hiddenFieldsWithLinks = fieldsWithLinks.filter((f) => f.fieldIndex === row.entryFieldIndex).sort();
     const fieldsWithLinksFromVariableMap = createLogLineLinks(hiddenFieldsWithLinks);
-
-    // do not show the log message unless there is a link attached
-    const fields = fieldsAndLinks.filter((f) => f.links?.length === 0 && f.fieldIndex !== row.entryFieldIndex).sort();
-    const fieldsAvailable = fields && fields.length > 0;
     const fieldsWithLinksAvailable =
       (displayedFieldsWithLinks && displayedFieldsWithLinks.length > 0) ||
       (fieldsWithLinksFromVariableMap && fieldsWithLinksFromVariableMap.length > 0);
 
+    const fields =
+      row.dataFrame.meta?.type === DataFrameType.LogLines
+        ? // for LogLines frames (dataplane) we don't want to show any additional fields besides already extracted labels and links
+          []
+        : // for other frames, do not show the log message unless there is a link attached
+          fieldsAndLinks.filter((f) => f.links?.length === 0 && f.fieldIndex !== row.entryFieldIndex).sort();
+    const fieldsAvailable = fields && fields.length > 0;
+
     // If logs with error, we are not showing the level color
     const levelClassName = hasError
       ? ''
diff --git a/public/app/features/logs/components/LogDetailsRow.test.tsx b/public/app/features/logs/components/LogDetailsRow.test.tsx
index 55e01e995690c..bcaab5cd40e9a 100644
--- a/public/app/features/logs/components/LogDetailsRow.test.tsx
+++ b/public/app/features/logs/components/LogDetailsRow.test.tsx
@@ -1,17 +1,15 @@
 import { fireEvent, render, screen } from '@testing-library/react';
 import React, { ComponentProps } from 'react';
 
-import { LogRowModel } from '@grafana/data';
-import config from 'app/core/config';
-
 import { LogDetailsRow } from './LogDetailsRow';
+import { createLogRow } from './__mocks__/logRow';
 
 type Props = ComponentProps<typeof LogDetailsRow>;
 
 const setup = (propOverrides?: Partial<Props>) => {
   const props: Props = {
-    parsedValues: [''],
-    parsedKeys: [''],
+    parsedValues: ['value'],
+    parsedKeys: ['key'],
     isLabel: true,
     wrapLogMessage: false,
     getStats: () => null,
@@ -20,7 +18,7 @@ const setup = (propOverrides?: Partial<Props>) => {
     onClickShowField: () => {},
     onClickHideField: () => {},
     displayedFields: [],
-    row: {} as LogRowModel,
+    row: createLogRow(),
     disableActions: false,
   };
 
@@ -55,32 +53,52 @@ describe('LogDetailsRow', () => {
     expect(screen.getAllByRole('button', { name: 'Ad-hoc statistics' })).toHaveLength(1);
   });
 
-  describe('if props is a label', () => {
-    it('should render filter label button', () => {
-      setup();
-      expect(screen.getAllByRole('button', { name: 'Filter for value' })).toHaveLength(1);
-      expect(screen.queryByRole('button', { name: 'Remove filter' })).not.toBeInTheDocument();
-    });
-    it('should render filter out label button', () => {
+  describe('toggleable filters', () => {
+    it('should render filter buttons', () => {
       setup();
-      expect(screen.getAllByRole('button', { name: 'Filter out value' })).toHaveLength(1);
+      expect(screen.getAllByRole('button', { name: 'Filter for value in query A' })).toHaveLength(1);
+      expect(screen.getAllByRole('button', { name: 'Filter out value in query A' })).toHaveLength(1);
+      expect(screen.queryByRole('button', { name: 'Remove filter in query A' })).not.toBeInTheDocument();
     });
-    it('should render filter buttons when toggleLabelsInLogsUI false', async () => {
+    it('should render remove filter button when the filter is active', async () => {
       setup({
         isFilterLabelActive: jest.fn().mockResolvedValue(true),
       });
-      expect(screen.getByRole('button', { name: 'Filter for value' })).toBeInTheDocument();
-      expect(screen.getByRole('button', { name: 'Filter out value' })).toBeInTheDocument();
+      expect(await screen.findByRole('button', { name: 'Remove filter in query A' })).toBeInTheDocument();
     });
-
-    it('should render remove filter button when toggleLabelsInLogsUI true', async () => {
-      const defaultValue = config.featureToggles.toggleLabelsInLogsUI;
-      config.featureToggles.toggleLabelsInLogsUI = true;
-      setup({
-        isFilterLabelActive: jest.fn().mockResolvedValue(true),
-      });
-      expect(await screen.findByRole('button', { name: 'Remove filter' })).toBeInTheDocument();
-      config.featureToggles.toggleLabelsInLogsUI = defaultValue;
+    it('should trigger a call to `onClickFilterOutLabel` when the filter out button is clicked', () => {
+      const onClickFilterOutLabel = jest.fn();
+      setup({ onClickFilterOutLabel });
+      fireEvent.click(screen.getByRole('button', { name: 'Filter out value in query A' }));
+      expect(onClickFilterOutLabel).toHaveBeenCalledWith(
+        'key',
+        'value',
+        expect.objectContaining({
+          fields: [
+            expect.objectContaining({ values: [0] }),
+            expect.objectContaining({ values: ['line1'] }),
+            expect.objectContaining({ values: [{ app: 'app01' }] }),
+          ],
+          length: 1,
+        })
+      );
+    });
+    it('should trigger a call to `onClickFilterLabel` when the filter  button is clicked', () => {
+      const onClickFilterLabel = jest.fn();
+      setup({ onClickFilterLabel });
+      fireEvent.click(screen.getByRole('button', { name: 'Filter for value in query A' }));
+      expect(onClickFilterLabel).toHaveBeenCalledWith(
+        'key',
+        'value',
+        expect.objectContaining({
+          fields: [
+            expect.objectContaining({ values: [0] }),
+            expect.objectContaining({ values: ['line1'] }),
+            expect.objectContaining({ values: [{ app: 'app01' }] }),
+          ],
+          length: 1,
+        })
+      );
     });
   });
 
diff --git a/public/app/features/logs/components/LogDetailsRow.tsx b/public/app/features/logs/components/LogDetailsRow.tsx
index 210b1fc71d387..37fab48ce9b8a 100644
--- a/public/app/features/logs/components/LogDetailsRow.tsx
+++ b/public/app/features/logs/components/LogDetailsRow.tsx
@@ -1,12 +1,23 @@
 import { css, cx } from '@emotion/css';
 import { isEqual } from 'lodash';
 import memoizeOne from 'memoize-one';
-import React, { PureComponent, useState } from 'react';
-
-import { CoreApp, Field, GrafanaTheme2, IconName, LinkModel, LogLabelStatsModel, LogRowModel } from '@grafana/data';
-import { config, reportInteraction } from '@grafana/runtime';
+import React, { PureComponent, useEffect, useState } from 'react';
+
+import {
+  CoreApp,
+  DataFrame,
+  Field,
+  GrafanaTheme2,
+  IconName,
+  LinkModel,
+  LogLabelStatsModel,
+  LogRowModel,
+} from '@grafana/data';
+import { reportInteraction } from '@grafana/runtime';
 import { ClipboardButton, DataLinkButton, IconButton, Themeable2, withTheme2 } from '@grafana/ui';
 
+import { logRowToSingleRowDataFrame } from '../logsModel';
+
 import { LogLabelStats } from './LogLabelStats';
 import { getLogRowStyles } from './getLogRowStyles';
 
@@ -16,8 +27,8 @@ export interface Props extends Themeable2 {
   disableActions: boolean;
   wrapLogMessage?: boolean;
   isLabel?: boolean;
-  onClickFilterLabel?: (key: string, value: string, refId?: string) => void;
-  onClickFilterOutLabel?: (key: string, value: string, refId?: string) => void;
+  onClickFilterLabel?: (key: string, value: string, frame?: DataFrame) => void;
+  onClickFilterOutLabel?: (key: string, value: string, frame?: DataFrame) => void;
   links?: Array<LinkModel<Field>>;
   getStats: () => LogLabelStatsModel[] | null;
   displayedFields?: string[];
@@ -143,7 +154,7 @@ class UnThemedLogDetailsRow extends PureComponent<Props, State> {
   filterLabel = () => {
     const { onClickFilterLabel, parsedKeys, parsedValues, row } = this.props;
     if (onClickFilterLabel) {
-      onClickFilterLabel(parsedKeys[0], parsedValues[0], row.dataFrame?.refId);
+      onClickFilterLabel(parsedKeys[0], parsedValues[0], logRowToSingleRowDataFrame(row) || undefined);
     }
 
     reportInteraction('grafana_explore_logs_log_details_filter_clicked', {
@@ -156,7 +167,7 @@ class UnThemedLogDetailsRow extends PureComponent<Props, State> {
   filterOutLabel = () => {
     const { onClickFilterOutLabel, parsedKeys, parsedValues, row } = this.props;
     if (onClickFilterOutLabel) {
-      onClickFilterOutLabel(parsedKeys[0], parsedValues[0], row.dataFrame?.refId);
+      onClickFilterOutLabel(parsedKeys[0], parsedValues[0], logRowToSingleRowDataFrame(row) || undefined);
     }
 
     reportInteraction('grafana_explore_logs_log_details_filter_clicked', {
@@ -257,8 +268,7 @@ class UnThemedLogDetailsRow extends PureComponent<Props, State> {
     const singleKey = parsedKeys == null ? false : parsedKeys.length === 1;
     const singleVal = parsedValues == null ? false : parsedValues.length === 1;
     const hasFilteringFunctionality = !disableActions && onClickFilterLabel && onClickFilterOutLabel;
-    const refIdTooltip =
-      config.featureToggles.toggleLabelsInLogsUI && row.dataFrame?.refId ? ` in query ${row.dataFrame?.refId}` : '';
+    const refIdTooltip = row.dataFrame?.refId ? ` in query ${row.dataFrame?.refId}` : '';
 
     const isMultiParsedValueWithNoContent =
       !singleVal && parsedValues != null && !parsedValues.every((val) => val === '');
@@ -277,17 +287,13 @@ class UnThemedLogDetailsRow extends PureComponent<Props, State> {
             <div className={styles.buttonRow}>
               {hasFilteringFunctionality && (
                 <>
-                  {config.featureToggles.toggleLabelsInLogsUI ? (
-                    // If we are using the new label toggling, we want to use the async icon button
-                    <AsyncIconButton
-                      name="search-plus"
-                      onClick={this.filterLabel}
-                      isActive={this.isFilterLabelActive}
-                      tooltipSuffix={refIdTooltip}
-                    />
-                  ) : (
-                    <IconButton name="search-plus" onClick={this.filterLabel} tooltip="Filter for value" />
-                  )}
+                  <AsyncIconButton
+                    name="search-plus"
+                    onClick={this.filterLabel}
+                    // We purposely want to pass a new function on every render to allow the active state to be updated when log details remains open between updates.
+                    isActive={() => this.isFilterLabelActive()}
+                    tooltipSuffix={refIdTooltip}
+                  />
                   <IconButton
                     name="search-minus"
                     tooltip={`Filter out value${refIdTooltip}`}
@@ -363,11 +369,9 @@ const AsyncIconButton = ({ isActive, tooltipSuffix, ...rest }: AsyncIconButtonPr
   const [active, setActive] = useState(false);
   const tooltip = active ? 'Remove filter' : 'Filter for value';
 
-  /**
-   * We purposely want to run this on every render to allow the active state to be updated
-   * when log details remains open between updates.
-   */
-  isActive().then(setActive);
+  useEffect(() => {
+    isActive().then(setActive);
+  }, [isActive]);
 
   return <IconButton {...rest} variant={active ? 'primary' : undefined} tooltip={tooltip + tooltipSuffix} />;
 };
diff --git a/public/app/features/logs/components/LogRow.test.tsx b/public/app/features/logs/components/LogRow.test.tsx
index c8fc50d4d9be0..13e0290d08687 100644
--- a/public/app/features/logs/components/LogRow.test.tsx
+++ b/public/app/features/logs/components/LogRow.test.tsx
@@ -30,6 +30,7 @@ const setup = (propOverrides?: Partial<ComponentProps<typeof LogRow>>, rowOverri
     enableLogDetails: false,
     getRows: () => [],
     onOpenContext: () => {},
+    handleTextSelection: jest.fn(),
     prettifyLogMessage: false,
     app: CoreApp.Explore,
     showDuplicates: false,
diff --git a/public/app/features/logs/components/LogRow.tsx b/public/app/features/logs/components/LogRow.tsx
index 3ab307a919c3d..ecc44185d2f97 100644
--- a/public/app/features/logs/components/LogRow.tsx
+++ b/public/app/features/logs/components/LogRow.tsx
@@ -1,10 +1,20 @@
 import { cx } from '@emotion/css';
 import { debounce } from 'lodash';
-import React, { PureComponent } from 'react';
+import memoizeOne from 'memoize-one';
+import React, { PureComponent, MouseEvent } from 'react';
 
-import { Field, LinkModel, LogRowModel, LogsSortOrder, dateTimeFormat, CoreApp, DataFrame } from '@grafana/data';
+import {
+  Field,
+  LinkModel,
+  LogRowModel,
+  LogsSortOrder,
+  dateTimeFormat,
+  CoreApp,
+  DataFrame,
+  LogRowContextOptions,
+} from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
-import { TimeZone } from '@grafana/schema';
+import { DataQuery, TimeZone } from '@grafana/schema';
 import { withTheme2, Themeable2, Icon, Tooltip } from '@grafana/ui';
 
 import { checkLogsError, escapeUnescapedString } from '../utils';
@@ -29,15 +39,20 @@ interface Props extends Themeable2 {
   app?: CoreApp;
   displayedFields?: string[];
   getRows: () => LogRowModel[];
-  onClickFilterLabel?: (key: string, value: string, refId?: string) => void;
-  onClickFilterOutLabel?: (key: string, value: string, refId?: string) => void;
+  onClickFilterLabel?: (key: string, value: string, frame?: DataFrame) => void;
+  onClickFilterOutLabel?: (key: string, value: string, frame?: DataFrame) => void;
   onContextClick?: () => void;
   getFieldLinks?: (field: Field, rowIndex: number, dataFrame: DataFrame) => Array<LinkModel<Field>>;
-  showContextToggle?: (row?: LogRowModel) => boolean;
+  showContextToggle?: (row: LogRowModel) => boolean;
   onClickShowField?: (key: string) => void;
   onClickHideField?: (key: string) => void;
   onLogRowHover?: (row?: LogRowModel) => void;
   onOpenContext: (row: LogRowModel, onClose: () => void) => void;
+  getRowContextQuery?: (
+    row: LogRowModel,
+    options?: LogRowContextOptions,
+    cacheFilters?: boolean
+  ) => Promise<DataQuery | null>;
   onPermalinkClick?: (row: LogRowModel) => Promise<void>;
   styles: LogRowStyles;
   permalinkedRowId?: string;
@@ -47,6 +62,7 @@ interface Props extends Themeable2 {
   onUnpinLine?: (row: LogRowModel) => void;
   pinned?: boolean;
   containerRendered?: boolean;
+  handleTextSelection?: (e: MouseEvent<HTMLTableRowElement>, row: LogRowModel) => boolean;
 }
 
 interface State {
@@ -87,7 +103,12 @@ class UnThemedLogRow extends PureComponent<Props, State> {
     this.props.onOpenContext(row, this.debouncedContextClose);
   };
 
-  toggleDetails = () => {
+  onRowClick = (e: MouseEvent<HTMLTableRowElement>) => {
+    if (this.props.handleTextSelection?.(e, this.props.row)) {
+      // Event handled by the parent.
+      return;
+    }
+
     if (!this.props.enableLogDetails) {
       return;
     }
@@ -120,6 +141,17 @@ class UnThemedLogRow extends PureComponent<Props, State> {
     }
   };
 
+  onMouseMove = (e: MouseEvent) => {
+    // No need to worry about text selection.
+    if (!this.props.handleTextSelection) {
+      return;
+    }
+    // The user is selecting text, so hide the log row menu so it doesn't interfere.
+    if (document.getSelection()?.toString() && e.buttons > 0) {
+      this.setState({ mouseIsOver: false });
+    }
+  };
+
   onMouseLeave = () => {
     this.setState({ mouseIsOver: false });
     if (this.props.onLogRowHover) {
@@ -157,6 +189,12 @@ class UnThemedLogRow extends PureComponent<Props, State> {
     }
   };
 
+  escapeRow = memoizeOne((row: LogRowModel, forceEscape: boolean | undefined) => {
+    return row.hasUnescapedContent && forceEscape
+      ? { ...row, entry: escapeUnescapedString(row.entry), raw: escapeUnescapedString(row.raw) }
+      : row;
+  });
+
   render() {
     const {
       getRows,
@@ -178,6 +216,7 @@ class UnThemedLogRow extends PureComponent<Props, State> {
       forceEscape,
       app,
       styles,
+      getRowContextQuery,
     } = this.props;
     const { showDetails, showingContext, permalinked } = this.state;
     const levelStyles = getLogLevelStyles(theme, row.logLevel);
@@ -191,19 +230,17 @@ class UnThemedLogRow extends PureComponent<Props, State> {
       [styles.highlightBackground]: permalinked && !this.state.showDetails,
     });
 
-    const processedRow =
-      row.hasUnescapedContent && forceEscape
-        ? { ...row, entry: escapeUnescapedString(row.entry), raw: escapeUnescapedString(row.raw) }
-        : row;
+    const processedRow = this.escapeRow(row, forceEscape);
 
     return (
       <>
         <tr
           ref={this.logLineRef}
           className={logRowBackground}
-          onClick={this.toggleDetails}
+          onClick={this.onRowClick}
           onMouseEnter={this.onMouseEnter}
           onMouseLeave={this.onMouseLeave}
+          onMouseMove={this.onMouseMove}
           /**
            * For better accessibility support, we listen to the onFocus event here (to display the LogRowMenuCell), and
            * to onBlur event in the LogRowMenuCell (to hide it). This way, the LogRowMenuCell is displayed when the user navigates
@@ -254,6 +291,7 @@ class UnThemedLogRow extends PureComponent<Props, State> {
             <LogRowMessage
               row={processedRow}
               showContextToggle={showContextToggle}
+              getRowContextQuery={getRowContextQuery}
               wrapLogMessage={wrapLogMessage}
               prettifyLogMessage={prettifyLogMessage}
               onOpenContext={this.onOpenContext}
diff --git a/public/app/features/logs/components/LogRowMenuCell.tsx b/public/app/features/logs/components/LogRowMenuCell.tsx
index e57e70be683d2..9313a8e825628 100644
--- a/public/app/features/logs/components/LogRowMenuCell.tsx
+++ b/public/app/features/logs/components/LogRowMenuCell.tsx
@@ -1,15 +1,22 @@
 import React, { FocusEvent, SyntheticEvent, useCallback } from 'react';
 
-import { LogRowModel } from '@grafana/data';
+import { LogRowContextOptions, LogRowModel, getDefaultTimeRange, locationUtil, urlUtil } from '@grafana/data';
+import { DataQuery } from '@grafana/schema';
 import { ClipboardButton, IconButton } from '@grafana/ui';
+import { getConfig } from 'app/core/config';
 
 import { LogRowStyles } from './getLogRowStyles';
 
 interface Props {
   logText: string;
   row: LogRowModel;
-  showContextToggle?: (row?: LogRowModel) => boolean;
+  showContextToggle?: (row: LogRowModel) => boolean;
   onOpenContext: (row: LogRowModel) => void;
+  getRowContextQuery?: (
+    row: LogRowModel,
+    options?: LogRowContextOptions,
+    cacheFilters?: boolean
+  ) => Promise<DataQuery | null>;
   onPermalinkClick?: (row: LogRowModel) => Promise<void>;
   onPinLine?: (row: LogRowModel) => void;
   onUnpinLine?: (row: LogRowModel) => void;
@@ -32,17 +39,40 @@ export const LogRowMenuCell = React.memo(
     styles,
     mouseIsOver,
     onBlur,
+    getRowContextQuery,
   }: Props) => {
     const shouldShowContextToggle = showContextToggle ? showContextToggle(row) : false;
     const onLogRowClick = useCallback((e: SyntheticEvent) => {
       e.stopPropagation();
     }, []);
     const onShowContextClick = useCallback(
-      (e: SyntheticEvent<HTMLElement, Event>) => {
-        e.stopPropagation();
+      async (event: SyntheticEvent<HTMLButtonElement, MouseEvent>) => {
+        event.stopPropagation();
+        // if ctrl or meta key is pressed, open query in new Explore tab
+        if (
+          getRowContextQuery &&
+          (event.nativeEvent.ctrlKey || event.nativeEvent.metaKey || event.nativeEvent.shiftKey)
+        ) {
+          const win = window.open('about:blank');
+          // for this request we don't want to use the cached filters from a context provider, but always want to refetch and clear
+          const query = await getRowContextQuery(row, undefined, false);
+          if (query && win) {
+            const url = urlUtil.renderUrl(locationUtil.assureBaseUrl(`${getConfig().appSubUrl}explore`), {
+              left: JSON.stringify({
+                datasource: query.datasource,
+                queries: [query],
+                range: getDefaultTimeRange(),
+              }),
+            });
+            win.location = url;
+
+            return;
+          }
+          win?.close();
+        }
         onOpenContext(row);
       },
-      [onOpenContext, row]
+      [onOpenContext, getRowContextQuery, row]
     );
     /**
      * For better accessibility support, we listen to the onBlur event here (to hide this component), and
diff --git a/public/app/features/logs/components/LogRowMessage.tsx b/public/app/features/logs/components/LogRowMessage.tsx
index 7acca5b782a9a..73e456887c9f8 100644
--- a/public/app/features/logs/components/LogRowMessage.tsx
+++ b/public/app/features/logs/components/LogRowMessage.tsx
@@ -1,7 +1,8 @@
 import React, { useMemo } from 'react';
 import Highlighter from 'react-highlight-words';
 
-import { CoreApp, findHighlightChunksInText, LogRowModel } from '@grafana/data';
+import { CoreApp, findHighlightChunksInText, LogRowContextOptions, LogRowModel } from '@grafana/data';
+import { DataQuery } from '@grafana/schema';
 
 import { LogMessageAnsi } from './LogMessageAnsi';
 import { LogRowMenuCell } from './LogRowMenuCell';
@@ -14,8 +15,13 @@ interface Props {
   wrapLogMessage: boolean;
   prettifyLogMessage: boolean;
   app?: CoreApp;
-  showContextToggle?: (row?: LogRowModel) => boolean;
+  showContextToggle?: (row: LogRowModel) => boolean;
   onOpenContext: (row: LogRowModel) => void;
+  getRowContextQuery?: (
+    row: LogRowModel,
+    options?: LogRowContextOptions,
+    cacheFilters?: boolean
+  ) => Promise<DataQuery | null>;
   onPermalinkClick?: (row: LogRowModel) => Promise<void>;
   onPinLine?: (row: LogRowModel) => void;
   onUnpinLine?: (row: LogRowModel) => void;
@@ -77,6 +83,7 @@ export const LogRowMessage = React.memo((props: Props) => {
     pinned,
     mouseIsOver,
     onBlur,
+    getRowContextQuery,
   } = props;
   const { hasAnsi, raw } = row;
   const restructuredEntry = useMemo(() => restructureLog(raw, prettifyLogMessage), [raw, prettifyLogMessage]);
@@ -100,6 +107,7 @@ export const LogRowMessage = React.memo((props: Props) => {
             logText={restructuredEntry}
             row={row}
             showContextToggle={showContextToggle}
+            getRowContextQuery={getRowContextQuery}
             onOpenContext={onOpenContext}
             onPermalinkClick={onPermalinkClick}
             onPinLine={onPinLine}
diff --git a/public/app/features/logs/components/LogRowMessageDisplayedFields.tsx b/public/app/features/logs/components/LogRowMessageDisplayedFields.tsx
index 2bed3bfd60d26..18837d9292936 100644
--- a/public/app/features/logs/components/LogRowMessageDisplayedFields.tsx
+++ b/public/app/features/logs/components/LogRowMessageDisplayedFields.tsx
@@ -13,7 +13,7 @@ export interface Props {
   wrapLogMessage: boolean;
   getFieldLinks?: (field: Field, rowIndex: number, dataFrame: DataFrame) => Array<LinkModel<Field>>;
   styles: LogRowStyles;
-  showContextToggle?: (row?: LogRowModel) => boolean;
+  showContextToggle?: (row: LogRowModel) => boolean;
   onOpenContext: (row: LogRowModel) => void;
   onPermalinkClick?: (row: LogRowModel) => Promise<void>;
   onPinLine?: (row: LogRowModel) => void;
@@ -25,32 +25,28 @@ export interface Props {
 
 export const LogRowMessageDisplayedFields = React.memo((props: Props) => {
   const { row, detectedFields, getFieldLinks, wrapLogMessage, styles, mouseIsOver, pinned, ...rest } = props;
-  const fields = getAllFields(row, getFieldLinks);
   const wrapClassName = wrapLogMessage ? '' : displayedFieldsStyles.noWrap;
+  const fields = useMemo(() => getAllFields(row, getFieldLinks), [getFieldLinks, row]);
   // only single key/value rows are filterable, so we only need the first field key for filtering
-  const line = useMemo(
-    () =>
-      detectedFields
-        .map((parsedKey) => {
-          const field = fields.find((field) => {
-            const { keys } = field;
-            return keys[0] === parsedKey;
-          });
+  const line = useMemo(() => {
+    let line = '';
+    for (let i = 0; i < detectedFields.length; i++) {
+      const parsedKey = detectedFields[i];
+      const field = fields.find((field) => {
+        const { keys } = field;
+        return keys[0] === parsedKey;
+      });
 
-          if (field !== undefined && field !== null) {
-            return `${parsedKey}=${field.values}`;
-          }
+      if (field) {
+        line += ` ${parsedKey}=${field.values}`;
+      }
 
-          if (row.labels[parsedKey] !== undefined && row.labels[parsedKey] !== null) {
-            return `${parsedKey}=${row.labels[parsedKey]}`;
-          }
-
-          return null;
-        })
-        .filter((s) => s !== null)
-        .join(' '),
-    [detectedFields, fields, row.labels]
-  );
+      if (row.labels[parsedKey] !== undefined && row.labels[parsedKey] !== null) {
+        line += ` ${parsedKey}=${row.labels[parsedKey]}`;
+      }
+    }
+    return line.trimStart();
+  }, [detectedFields, fields, row.labels]);
 
   const shouldShowMenu = useMemo(() => mouseIsOver || pinned, [mouseIsOver, pinned]);
 
diff --git a/public/app/features/logs/components/LogRows.test.tsx b/public/app/features/logs/components/LogRows.test.tsx
index ccb66f6b87fdc..f412cb22cf7e1 100644
--- a/public/app/features/logs/components/LogRows.test.tsx
+++ b/public/app/features/logs/components/LogRows.test.tsx
@@ -1,12 +1,22 @@
 import { act, render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import { range } from 'lodash';
 import React from 'react';
 
-import { LogRowModel, LogsDedupStrategy, LogsSortOrder } from '@grafana/data';
+import { CoreApp, LogRowModel, LogsDedupStrategy, LogsSortOrder } from '@grafana/data';
 
 import { LogRows, PREVIEW_LIMIT } from './LogRows';
 import { createLogRow } from './__mocks__/logRow';
 
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  config: {
+    featureToggles: {
+      logRowsPopoverMenu: true,
+    },
+  },
+}));
+
 describe('LogRows', () => {
   it('renders rows', () => {
     const rows: LogRowModel[] = [createLogRow({ uid: '1' }), createLogRow({ uid: '2' }), createLogRow({ uid: '3' })];
@@ -195,3 +205,52 @@ describe('LogRows', () => {
     expect(screen.queryAllByRole('row').at(2)).toHaveTextContent('log message 1');
   });
 });
+
+describe('Popover menu', () => {
+  function setup(app = CoreApp.Explore) {
+    const rows: LogRowModel[] = [createLogRow({ uid: '1' })];
+    return render(
+      <LogRows
+        logRows={rows}
+        dedupStrategy={LogsDedupStrategy.none}
+        showLabels={false}
+        showTime={false}
+        wrapLogMessage={true}
+        prettifyLogMessage={true}
+        timeZone={'utc'}
+        logsSortOrder={LogsSortOrder.Descending}
+        enableLogDetails={true}
+        displayedFields={[]}
+        onClickFilterOutValue={() => {}}
+        onClickFilterValue={() => {}}
+        app={app}
+      />
+    );
+  }
+  let orgGetSelection: () => Selection | null;
+  beforeAll(() => {
+    orgGetSelection = document.getSelection;
+    jest.spyOn(document, 'getSelection').mockReturnValue({
+      toString: () => 'selected log line',
+    } as Selection);
+  });
+  afterAll(() => {
+    document.getSelection = orgGetSelection;
+  });
+  it('Does not appear in the document', () => {
+    setup();
+    expect(screen.queryByText('Copy selection')).not.toBeInTheDocument();
+  });
+  it('Appears after selecting test', async () => {
+    setup();
+    await userEvent.click(screen.getByText('log message 1'));
+    expect(screen.getByText('Copy selection')).toBeInTheDocument();
+    expect(screen.getByText('Add as line contains filter')).toBeInTheDocument();
+    expect(screen.getByText('Add as line does not contain filter')).toBeInTheDocument();
+  });
+  it('Does not appear outside Explore', async () => {
+    setup(CoreApp.Unknown);
+    await userEvent.click(screen.getByText('log message 1'));
+    expect(screen.queryByText('Copy selection')).not.toBeInTheDocument();
+  });
+});
diff --git a/public/app/features/logs/components/LogRows.tsx b/public/app/features/logs/components/LogRows.tsx
index 7476e73f2902d..3049d5ba9d7e9 100644
--- a/public/app/features/logs/components/LogRows.tsx
+++ b/public/app/features/logs/components/LogRows.tsx
@@ -1,6 +1,6 @@
 import { cx } from '@emotion/css';
 import memoizeOne from 'memoize-one';
-import React, { PureComponent } from 'react';
+import React, { PureComponent, MouseEvent, createRef } from 'react';
 
 import {
   TimeZone,
@@ -11,11 +11,15 @@ import {
   LogsSortOrder,
   CoreApp,
   DataFrame,
+  LogRowContextOptions,
 } from '@grafana/data';
+import { config } from '@grafana/runtime';
+import { DataQuery } from '@grafana/schema';
 import { withTheme2, Themeable2 } from '@grafana/ui';
 
+import { PopoverMenu } from '../../explore/Logs/PopoverMenu';
 import { UniqueKeyMaker } from '../UniqueKeyMaker';
-import { sortLogRows } from '../utils';
+import { sortLogRows, targetIsElement } from '../utils';
 
 //Components
 import { LogRow } from './LogRow';
@@ -38,9 +42,9 @@ export interface Props extends Themeable2 {
   forceEscape?: boolean;
   displayedFields?: string[];
   app?: CoreApp;
-  showContextToggle?: (row?: LogRowModel) => boolean;
-  onClickFilterLabel?: (key: string, value: string, refId?: string) => void;
-  onClickFilterOutLabel?: (key: string, value: string, refId?: string) => void;
+  showContextToggle?: (row: LogRowModel) => boolean;
+  onClickFilterLabel?: (key: string, value: string, frame?: DataFrame) => void;
+  onClickFilterOutLabel?: (key: string, value: string, frame?: DataFrame) => void;
   getFieldLinks?: (field: Field, rowIndex: number, dataFrame: DataFrame) => Array<LinkModel<Field>>;
   onClickShowField?: (key: string) => void;
   onClickHideField?: (key: string) => void;
@@ -48,6 +52,11 @@ export interface Props extends Themeable2 {
   onUnpinLine?: (row: LogRowModel) => void;
   onLogRowHover?: (row?: LogRowModel) => void;
   onOpenContext?: (row: LogRowModel, onClose: () => void) => void;
+  getRowContextQuery?: (
+    row: LogRowModel,
+    options?: LogRowContextOptions,
+    cacheFilters?: boolean
+  ) => Promise<DataQuery | null>;
   onPermalinkClick?: (row: LogRowModel) => Promise<void>;
   permalinkedRowId?: string;
   scrollIntoView?: (element: HTMLElement) => void;
@@ -59,14 +68,20 @@ export interface Props extends Themeable2 {
    * Any overflowing content will be clipped at the table boundary.
    */
   overflowingContent?: boolean;
+  onClickFilterValue?: (value: string, refId?: string) => void;
+  onClickFilterOutValue?: (value: string, refId?: string) => void;
 }
 
 interface State {
   renderAll: boolean;
+  selection: string;
+  selectedRow: LogRowModel | null;
+  popoverMenuCoordinates: { x: number; y: number };
 }
 
 class UnThemedLogRows extends PureComponent<Props, State> {
   renderAllTimer: number | null = null;
+  logRowsRef = createRef<HTMLDivElement>();
 
   static defaultProps = {
     previewLimit: PREVIEW_LIMIT,
@@ -74,6 +89,9 @@ class UnThemedLogRows extends PureComponent<Props, State> {
 
   state: State = {
     renderAll: false,
+    selection: '',
+    selectedRow: null,
+    popoverMenuCoordinates: { x: 0, y: 0 },
   };
 
   /**
@@ -85,6 +103,61 @@ class UnThemedLogRows extends PureComponent<Props, State> {
     }
   };
 
+  popoverMenuSupported() {
+    if (!config.featureToggles.logRowsPopoverMenu || this.props.app !== CoreApp.Explore) {
+      return false;
+    }
+    return Boolean(this.props.onClickFilterOutValue || this.props.onClickFilterValue);
+  }
+
+  handleSelection = (e: MouseEvent<HTMLTableRowElement>, row: LogRowModel): boolean => {
+    if (this.popoverMenuSupported() === false) {
+      return false;
+    }
+    const selection = document.getSelection()?.toString();
+    if (!selection) {
+      return false;
+    }
+    if (!this.logRowsRef.current) {
+      return false;
+    }
+
+    const MENU_WIDTH = 270;
+    const MENU_HEIGHT = 105;
+    const x = e.clientX + MENU_WIDTH > window.innerWidth ? window.innerWidth - MENU_WIDTH : e.clientX;
+    const y = e.clientY + MENU_HEIGHT > window.innerHeight ? window.innerHeight - MENU_HEIGHT : e.clientY;
+
+    this.setState({
+      selection,
+      popoverMenuCoordinates: { x, y },
+      selectedRow: row,
+    });
+    document.addEventListener('click', this.handleDeselection);
+    document.addEventListener('contextmenu', this.handleDeselection);
+    return true;
+  };
+
+  handleDeselection = (e: Event) => {
+    if (targetIsElement(e.target) && !this.logRowsRef.current?.contains(e.target)) {
+      // The mouseup event comes from outside the log rows, close the menu.
+      this.closePopoverMenu();
+      return;
+    }
+    if (document.getSelection()?.toString()) {
+      return;
+    }
+  };
+
+  closePopoverMenu = () => {
+    document.removeEventListener('click', this.handleDeselection);
+    document.removeEventListener('contextmenu', this.handleDeselection);
+    this.setState({
+      selection: '',
+      popoverMenuCoordinates: { x: 0, y: 0 },
+      selectedRow: null,
+    });
+  };
+
   componentDidMount() {
     // Staged rendering
     const { logRows, previewLimit } = this.props;
@@ -99,6 +172,9 @@ class UnThemedLogRows extends PureComponent<Props, State> {
   }
 
   componentWillUnmount() {
+    document.removeEventListener('click', this.handleDeselection);
+    document.removeEventListener('contextmenu', this.handleDeselection);
+    document.removeEventListener('selectionchange', this.handleDeselection);
     if (this.renderAllTimer) {
       clearTimeout(this.renderAllTimer);
     }
@@ -134,56 +210,70 @@ class UnThemedLogRows extends PureComponent<Props, State> {
     const keyMaker = new UniqueKeyMaker();
 
     return (
-      <table className={cx(styles.logsRowsTable, this.props.overflowingContent ? '' : styles.logsRowsTableContain)}>
-        <tbody>
-          {hasData &&
-            firstRows.map((row) => (
-              <LogRow
-                key={keyMaker.getKey(row.uid)}
-                getRows={getRows}
-                row={row}
-                showDuplicates={showDuplicates}
-                logsSortOrder={logsSortOrder}
-                onOpenContext={this.openContext}
-                styles={styles}
-                onPermalinkClick={this.props.onPermalinkClick}
-                scrollIntoView={this.props.scrollIntoView}
-                permalinkedRowId={this.props.permalinkedRowId}
-                onPinLine={this.props.onPinLine}
-                onUnpinLine={this.props.onUnpinLine}
-                pinned={this.props.pinnedRowId === row.uid}
-                isFilterLabelActive={this.props.isFilterLabelActive}
-                {...rest}
-              />
-            ))}
-          {hasData &&
-            renderAll &&
-            lastRows.map((row) => (
-              <LogRow
-                key={keyMaker.getKey(row.uid)}
-                getRows={getRows}
-                row={row}
-                showDuplicates={showDuplicates}
-                logsSortOrder={logsSortOrder}
-                onOpenContext={this.openContext}
-                styles={styles}
-                onPermalinkClick={this.props.onPermalinkClick}
-                scrollIntoView={this.props.scrollIntoView}
-                permalinkedRowId={this.props.permalinkedRowId}
-                onPinLine={this.props.onPinLine}
-                onUnpinLine={this.props.onUnpinLine}
-                pinned={this.props.pinnedRowId === row.uid}
-                isFilterLabelActive={this.props.isFilterLabelActive}
-                {...rest}
-              />
-            ))}
-          {hasData && !renderAll && (
-            <tr>
-              <td colSpan={5}>Rendering {orderedRows.length - previewLimit!} rows...</td>
-            </tr>
-          )}
-        </tbody>
-      </table>
+      <div className={styles.logRows} ref={this.logRowsRef}>
+        {this.state.selection && this.state.selectedRow && (
+          <PopoverMenu
+            close={this.closePopoverMenu}
+            row={this.state.selectedRow}
+            selection={this.state.selection}
+            {...this.state.popoverMenuCoordinates}
+            onClickFilterValue={rest.onClickFilterValue}
+            onClickFilterOutValue={rest.onClickFilterOutValue}
+          />
+        )}
+        <table className={cx(styles.logsRowsTable, this.props.overflowingContent ? '' : styles.logsRowsTableContain)}>
+          <tbody>
+            {hasData &&
+              firstRows.map((row) => (
+                <LogRow
+                  key={keyMaker.getKey(row.uid)}
+                  getRows={getRows}
+                  row={row}
+                  showDuplicates={showDuplicates}
+                  logsSortOrder={logsSortOrder}
+                  onOpenContext={this.openContext}
+                  styles={styles}
+                  onPermalinkClick={this.props.onPermalinkClick}
+                  scrollIntoView={this.props.scrollIntoView}
+                  permalinkedRowId={this.props.permalinkedRowId}
+                  onPinLine={this.props.onPinLine}
+                  onUnpinLine={this.props.onUnpinLine}
+                  pinned={this.props.pinnedRowId === row.uid}
+                  isFilterLabelActive={this.props.isFilterLabelActive}
+                  handleTextSelection={this.popoverMenuSupported() ? this.handleSelection : undefined}
+                  {...rest}
+                />
+              ))}
+            {hasData &&
+              renderAll &&
+              lastRows.map((row) => (
+                <LogRow
+                  key={keyMaker.getKey(row.uid)}
+                  getRows={getRows}
+                  row={row}
+                  showDuplicates={showDuplicates}
+                  logsSortOrder={logsSortOrder}
+                  onOpenContext={this.openContext}
+                  styles={styles}
+                  onPermalinkClick={this.props.onPermalinkClick}
+                  scrollIntoView={this.props.scrollIntoView}
+                  permalinkedRowId={this.props.permalinkedRowId}
+                  onPinLine={this.props.onPinLine}
+                  onUnpinLine={this.props.onUnpinLine}
+                  pinned={this.props.pinnedRowId === row.uid}
+                  isFilterLabelActive={this.props.isFilterLabelActive}
+                  handleTextSelection={this.popoverMenuSupported() ? this.handleSelection : undefined}
+                  {...rest}
+                />
+              ))}
+            {hasData && !renderAll && (
+              <tr>
+                <td colSpan={5}>Rendering {orderedRows.length - previewLimit!} rows...</td>
+              </tr>
+            )}
+          </tbody>
+        </table>
+      </div>
     );
   }
 }
diff --git a/public/app/features/logs/components/__mocks__/logRow.ts b/public/app/features/logs/components/__mocks__/logRow.ts
index fde85c69dc85a..0968f242a848e 100644
--- a/public/app/features/logs/components/__mocks__/logRow.ts
+++ b/public/app/features/logs/components/__mocks__/logRow.ts
@@ -1,4 +1,4 @@
-import { LogLevel, LogRowModel, MutableDataFrame } from '@grafana/data';
+import { FieldType, LogLevel, LogRowModel, toDataFrame } from '@grafana/data';
 
 export const createLogRow = (overrides?: Partial<LogRowModel>): LogRowModel => {
   const uid = overrides?.uid || '1';
@@ -8,7 +8,18 @@ export const createLogRow = (overrides?: Partial<LogRowModel>): LogRowModel => {
   return {
     entryFieldIndex: 0,
     rowIndex: 0,
-    dataFrame: new MutableDataFrame({ refId: 'A', fields: [] }),
+    dataFrame: toDataFrame({
+      refId: 'A',
+      fields: [
+        { name: 'Time', type: FieldType.time, values: [0, 1] },
+        {
+          name: 'Line',
+          type: FieldType.string,
+          values: ['line1', 'line2'],
+        },
+        { name: 'labels', type: FieldType.other, values: [{ app: 'app01' }, { app: 'app02' }] },
+      ],
+    }),
     uid,
     logLevel: LogLevel.info,
     entry,
diff --git a/public/app/features/logs/components/getLogRowStyles.ts b/public/app/features/logs/components/getLogRowStyles.ts
index d059f41835017..447c9b98b3751 100644
--- a/public/app/features/logs/components/getLogRowStyles.ts
+++ b/public/app/features/logs/components/getLogRowStyles.ts
@@ -3,7 +3,6 @@ import memoizeOne from 'memoize-one';
 import tinycolor from 'tinycolor2';
 
 import { colorManipulator, GrafanaTheme2, LogLevel } from '@grafana/data';
-import { config } from '@grafana/runtime';
 import { styleMixins } from '@grafana/ui';
 
 export const getLogLevelStyles = (theme: GrafanaTheme2, logLevel?: LogLevel) => {
@@ -44,7 +43,6 @@ export const getLogLevelStyles = (theme: GrafanaTheme2, logLevel?: LogLevel) =>
 export const getLogRowStyles = memoizeOne((theme: GrafanaTheme2) => {
   const hoverBgColor = styleMixins.hoverColor(theme.colors.background.secondary, theme);
   const contextOutlineColor = tinycolor(theme.components.dashboard.background).setAlpha(0.7).toRgbString();
-  const scrollableLogsContainer = config.featureToggles.exploreScrollableLogsContainer;
   return {
     logsRowLevel: css`
       label: logs-row__level;
@@ -67,12 +65,15 @@ export const getLogRowStyles = memoizeOne((theme: GrafanaTheme2) => {
       color: ${theme.components.textHighlight.text}
       background-color: ${theme.components.textHighlight};
     `,
+    logRows: css({
+      position: 'relative',
+    }),
     logsRowsTable: css`
       label: logs-rows;
       font-family: ${theme.typography.fontFamilyMonospace};
       font-size: ${theme.typography.bodySmall.fontSize};
       width: 100%;
-      ${!scrollableLogsContainer && `margin-bottom: ${theme.spacing(2.25)};`}
+      position: relative;
     `,
     logsRowsTableContain: css`
       contain: strict;
diff --git a/public/app/features/logs/components/log-context/LoadingIndicator.tsx b/public/app/features/logs/components/log-context/LoadingIndicator.tsx
deleted file mode 100644
index 06a72775e9c14..0000000000000
--- a/public/app/features/logs/components/log-context/LoadingIndicator.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { css } from '@emotion/css';
-import React from 'react';
-
-import { Spinner } from '@grafana/ui';
-
-import { Place } from './types';
-
-// ideally we'd use `@grafana/ui/LoadingPlaceholder`, but that
-// one has a large margin-bottom.
-
-type Props = {
-  place: Place;
-};
-
-export const LoadingIndicator = ({ place }: Props) => {
-  const text = place === 'above' ? 'Loading newer logs...' : 'Loading older logs...';
-  return (
-    <div className={loadingIndicatorStyles}>
-      <div>
-        {text} <Spinner inline />
-      </div>
-    </div>
-  );
-};
-
-const loadingIndicatorStyles = css`
-  display: flex;
-  justify-content: center;
-`;
diff --git a/public/app/features/logs/components/log-context/LogRowContextModal.test.tsx b/public/app/features/logs/components/log-context/LogRowContextModal.test.tsx
index f36f51b8ad367..a799584812969 100644
--- a/public/app/features/logs/components/log-context/LogRowContextModal.test.tsx
+++ b/public/app/features/logs/components/log-context/LogRowContextModal.test.tsx
@@ -292,6 +292,117 @@ describe('LogRowContextModal', () => {
     });
   });
 
+  it('should highlight the same `foo123` searchwords', async () => {
+    const dfBeforeNs = createDataFrame({
+      fields: [
+        {
+          name: 'time',
+          type: FieldType.time,
+          values: [1, 1],
+        },
+        {
+          name: 'message',
+          type: FieldType.string,
+          values: ['this contains foo123', 'this contains foo123'],
+        },
+        {
+          name: 'tsNs',
+          type: FieldType.string,
+          values: ['1', '2'],
+        },
+      ],
+    });
+    const dfNowNs = createDataFrame({
+      fields: [
+        {
+          name: 'time',
+          type: FieldType.time,
+          values: [1],
+        },
+        {
+          name: 'message',
+          type: FieldType.string,
+          values: ['this contains foo123'],
+        },
+        {
+          name: 'tsNs',
+          type: FieldType.string,
+          values: ['2'],
+        },
+      ],
+    });
+    const dfAfterNs = createDataFrame({
+      fields: [
+        {
+          name: 'time',
+          type: FieldType.time,
+          values: [1, 1],
+        },
+        {
+          name: 'message',
+          type: FieldType.string,
+          values: ['this contains foo123', 'this contains foo123'],
+        },
+        {
+          name: 'tsNs',
+          type: FieldType.string,
+          values: ['2', '3'],
+        },
+      ],
+    });
+
+    let uniqueRefIdCounter = 1;
+    const logs = dataFrameToLogsModel([dfNowNs]);
+    const row = logs.rows[0];
+    row.searchWords = ['foo123'];
+    const getRowContext = jest.fn().mockImplementation(async (_, options) => {
+      uniqueRefIdCounter += 1;
+      const refId = `refid_${uniqueRefIdCounter}`;
+      if (uniqueRefIdCounter === 2) {
+        return {
+          data: [
+            {
+              refId,
+              ...dfBeforeNs,
+            },
+          ],
+        };
+      } else if (uniqueRefIdCounter === 3) {
+        return {
+          data: [
+            {
+              refId,
+              ...dfAfterNs,
+            },
+          ],
+        };
+      }
+      return { data: [] };
+    });
+
+    render(
+      <LogRowContextModal
+        row={row}
+        open={true}
+        onClose={() => {}}
+        getRowContext={getRowContext}
+        timeZone={timeZone}
+        logsSortOrder={LogsSortOrder.Descending}
+      />
+    );
+
+    // there need to be 3 lines with that message, all `foo123` should be highlighted
+    await waitFor(() => {
+      expect(screen.getAllByText('foo123').length).toBe(3);
+      for (const el of screen.getAllByText('foo123')) {
+        // highlights are done in `<mark>` tags
+        expect(el.tagName).toBe('MARK');
+      }
+      // test that the rest is not in a MARK
+      expect(screen.getAllByText('this contains')[0].tagName).not.toBe('MARK');
+    });
+  });
+
   it('should show a split view button', async () => {
     const getRowContextQuery = jest.fn().mockResolvedValue({ datasource: { uid: 'test-uid' } });
 
diff --git a/public/app/features/logs/components/log-context/LogRowContextModal.tsx b/public/app/features/logs/components/log-context/LogRowContextModal.tsx
index 3fc878a69155c..684b83700ee15 100644
--- a/public/app/features/logs/components/log-context/LogRowContextModal.tsx
+++ b/public/app/features/logs/components/log-context/LogRowContextModal.tsx
@@ -26,11 +26,10 @@ import { useDispatch } from 'app/types';
 
 import { dataFrameToLogsModel } from '../../logsModel';
 import { sortLogRows } from '../../utils';
+import { LoadingIndicator } from '../LoadingIndicator';
 import { LogRows } from '../LogRows';
 
-import { LoadingIndicator } from './LoadingIndicator';
 import { LogContextButtons } from './LogContextButtons';
-import { Place } from './types';
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
@@ -129,7 +128,11 @@ interface LogRowContextModalProps {
   onClose: () => void;
   getRowContext: (row: LogRowModel, options: LogRowContextOptions) => Promise<DataQueryResponse>;
 
-  getRowContextQuery?: (row: LogRowModel, options?: LogRowContextOptions) => Promise<DataQuery | null>;
+  getRowContextQuery?: (
+    row: LogRowModel,
+    options?: LogRowContextOptions,
+    cacheFilters?: boolean
+  ) => Promise<DataQuery | null>;
   logsSortOrder: LogsSortOrder;
   runContextQuery?: () => void;
   getLogRowContextUi?: DataSourceWithLogsContextSupport['getLogRowContextUi'];
@@ -139,6 +142,7 @@ type Section = {
   loadingState: LoadingState;
   rows: LogRowModel[];
 };
+type Place = 'above' | 'below';
 type Context = Record<Place, Section>;
 
 const makeEmptyContext = (): Context => ({
@@ -359,7 +363,10 @@ export const LogRowContextModal: React.FunctionComponent<LogRowContextModalProps
       // this way this array of rows will never be empty
       const allRows = [...above.rows, row, ...below.rows];
 
-      const newRows = await loadMore(place, allRows);
+      const newRows = (await loadMore(place, allRows)).map((r) =>
+        // apply the original row's searchWords to all the rows for highlighting
+        !r.searchWords || !r.searchWords?.length ? { ...r, searchWords: row.searchWords } : r
+      );
       const [older, newer] = partition(newRows, (newRow) => newRow.timeEpochNs > row.timeEpochNs);
       const newAbove = logsSortOrder === LogsSortOrder.Ascending ? newer : older;
       const newBelow = logsSortOrder === LogsSortOrder.Ascending ? older : newer;
@@ -511,7 +518,7 @@ export const LogRowContextModal: React.FunctionComponent<LogRowContextModalProps
               <td className={styles.loadingCell}>
                 {loadingStateAbove !== LoadingState.Done && loadingStateAbove !== LoadingState.Error && (
                   <div ref={aboveLoadingElement}>
-                    <LoadingIndicator place="above" />
+                    <LoadingIndicator adjective="newer" />
                   </div>
                 )}
                 {loadingStateAbove === LoadingState.Error && <div>Error loading log more logs.</div>}
@@ -580,7 +587,7 @@ export const LogRowContextModal: React.FunctionComponent<LogRowContextModalProps
               <td className={styles.loadingCell}>
                 {loadingStateBelow !== LoadingState.Done && loadingStateBelow !== LoadingState.Error && (
                   <div ref={belowLoadingElement}>
-                    <LoadingIndicator place="below" />
+                    <LoadingIndicator adjective="older" />
                   </div>
                 )}
                 {loadingStateBelow === LoadingState.Error && <div>Error loading log more logs.</div>}
diff --git a/public/app/features/logs/components/log-context/types.ts b/public/app/features/logs/components/log-context/types.ts
deleted file mode 100644
index 9f625102e423f..0000000000000
--- a/public/app/features/logs/components/log-context/types.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type Place = 'above' | 'below';
diff --git a/public/app/features/logs/components/logParser.test.ts b/public/app/features/logs/components/logParser.test.ts
index 27fcbe390f98c..68487d12690ef 100644
--- a/public/app/features/logs/components/logParser.test.ts
+++ b/public/app/features/logs/components/logParser.test.ts
@@ -46,15 +46,10 @@ describe('logParser', () => {
       expect(getAllFields(createScenario(-0))).toHaveLength(1);
     });
 
-    it('should filter out field with labels name old-loki-style frame', () => {
+    it('should filter out field with labels in frame', () => {
       const logRow = createLogRow({
         entryFieldIndex: 1,
         dataFrame: new MutableDataFrame({
-          meta: {
-            custom: {
-              frameType: 'LabeledTimeValues',
-            },
-          },
           refId: 'A',
           fields: [
             testTimeField,
@@ -267,7 +262,7 @@ describe('logParser', () => {
             },
             {
               config: {},
-              name: 'attributes',
+              name: 'labels',
               type: FieldType.other,
               values: [{ a: 1, b: 2 }],
             },
@@ -315,7 +310,7 @@ describe('logParser', () => {
             },
             {
               config: { links },
-              name: 'attributes',
+              name: 'labels',
               type: FieldType.other,
               values: [{ a: 1, b: 2 }],
             },
@@ -335,7 +330,7 @@ describe('logParser', () => {
         expectHasField(output, 'timestamp');
         expectHasField(output, 'body');
         expectHasField(output, 'id');
-        expectHasField(output, 'attributes');
+        expectHasField(output, 'labels');
         expectHasField(output, 'severity');
       });
 
diff --git a/public/app/features/logs/components/logParser.ts b/public/app/features/logs/components/logParser.ts
index 7e541ca3e535a..6f412f070f133 100644
--- a/public/app/features/logs/components/logParser.ts
+++ b/public/app/features/logs/components/logParser.ts
@@ -1,5 +1,4 @@
 import { partition } from 'lodash';
-import memoizeOne from 'memoize-one';
 
 import { DataFrame, Field, FieldWithIndex, LinkModel, LogRowModel } from '@grafana/data';
 import { safeStringifyValue } from 'app/core/utils/explore';
@@ -18,26 +17,22 @@ export type FieldDef = {
  * Returns all fields for log row which consists of fields we parse from the message itself and additional fields
  * found in the dataframe (they may contain links).
  */
-export const getAllFields = memoizeOne(
-  (
-    row: LogRowModel,
-    getFieldLinks?: (
-      field: Field,
-      rowIndex: number,
-      dataFrame: DataFrame
-    ) => Array<LinkModel<Field>> | ExploreFieldLinkModel[]
-  ) => {
-    const dataframeFields = getDataframeFields(row, getFieldLinks);
-
-    return Object.values(dataframeFields);
-  }
-);
+export const getAllFields = (
+  row: LogRowModel,
+  getFieldLinks?: (
+    field: Field,
+    rowIndex: number,
+    dataFrame: DataFrame
+  ) => Array<LinkModel<Field>> | ExploreFieldLinkModel[]
+) => {
+  return getDataframeFields(row, getFieldLinks);
+};
 
 /**
  * A log line may contain many links that would all need to go on their own logs detail row
  * This iterates through and creates a FieldDef (row) per link.
  */
-export const createLogLineLinks = memoizeOne((hiddenFieldsWithLinks: FieldDef[]): FieldDef[] => {
+export const createLogLineLinks = (hiddenFieldsWithLinks: FieldDef[]): FieldDef[] => {
   let fieldsWithLinksFromVariableMap: FieldDef[] = [];
   hiddenFieldsWithLinks.forEach((linkField) => {
     linkField.links?.forEach((link: ExploreFieldLinkModel) => {
@@ -58,34 +53,29 @@ export const createLogLineLinks = memoizeOne((hiddenFieldsWithLinks: FieldDef[])
     });
   });
   return fieldsWithLinksFromVariableMap;
-});
+};
 
 /**
  * creates fields from the dataframe-fields, adding data-links, when field.config.links exists
  */
-export const getDataframeFields = memoizeOne(
-  (
-    row: LogRowModel,
-    getFieldLinks?: (field: Field, rowIndex: number, dataFrame: DataFrame) => Array<LinkModel<Field>>
-  ): FieldDef[] => {
-    const visibleFields = separateVisibleFields(row.dataFrame).visible;
-    const nonEmptyVisibleFields = visibleFields.filter((f) => f.values[row.rowIndex] != null);
-    return nonEmptyVisibleFields.map((field) => {
-      const links = getFieldLinks ? getFieldLinks(field, row.rowIndex, row.dataFrame) : [];
-      const fieldVal = field.values[row.rowIndex];
-      const outputVal =
-        typeof fieldVal === 'string' || typeof fieldVal === 'number'
-          ? fieldVal.toString()
-          : safeStringifyValue(fieldVal);
-      return {
-        keys: [field.name],
-        values: [outputVal],
-        links: links,
-        fieldIndex: field.index,
-      };
-    });
-  }
-);
+export const getDataframeFields = (
+  row: LogRowModel,
+  getFieldLinks?: (field: Field, rowIndex: number, dataFrame: DataFrame) => Array<LinkModel<Field>>
+): FieldDef[] => {
+  const nonEmptyVisibleFields = getNonEmptyVisibleFields(row);
+  return nonEmptyVisibleFields.map((field) => {
+    const links = getFieldLinks ? getFieldLinks(field, row.rowIndex, row.dataFrame) : [];
+    const fieldVal = field.values[row.rowIndex];
+    const outputVal =
+      typeof fieldVal === 'string' || typeof fieldVal === 'number' ? fieldVal.toString() : safeStringifyValue(fieldVal);
+    return {
+      keys: [field.name],
+      values: [outputVal],
+      links: links,
+      fieldIndex: field.index,
+    };
+  });
+};
 
 type VisOptions = {
   keepTimestamp?: boolean;
@@ -148,3 +138,27 @@ export function separateVisibleFields(
 
   return { visible, hidden };
 }
+
+// Optimized version of separateVisibleFields() to only return visible fields for getAllFields()
+function getNonEmptyVisibleFields(row: LogRowModel, opts?: VisOptions): FieldWithIndex[] {
+  const frame = row.dataFrame;
+  const visibleFieldIndices = getVisibleFieldIndices(frame, opts ?? {});
+  const visibleFields: FieldWithIndex[] = [];
+  for (let index = 0; index < frame.fields.length; index++) {
+    const field = frame.fields[index];
+    // ignore empty fields
+    if (field.values[row.rowIndex] == null) {
+      continue;
+    }
+    // hidden fields are always hidden
+    if (field.config.custom?.hidden) {
+      continue;
+    }
+
+    // fields with data-links are visible
+    if ((field.config.links && field.config.links.length > 0) || visibleFieldIndices.has(index)) {
+      visibleFields.push({ ...field, index });
+    }
+  }
+  return visibleFields;
+}
diff --git a/public/app/features/logs/legacyLogsFrame.ts b/public/app/features/logs/legacyLogsFrame.ts
index 0c016cf6df37d..9b9ac9bc01195 100644
--- a/public/app/features/logs/legacyLogsFrame.ts
+++ b/public/app/features/logs/legacyLogsFrame.ts
@@ -1,6 +1,6 @@
 import { DataFrame, FieldCache, FieldType, Field, Labels, FieldWithIndex } from '@grafana/data';
 
-import type { LogsFrame } from './logsFrame';
+import { logFrameLabelsToLabels, LogsFrame } from './logsFrame';
 
 // take the labels from the line-field, and "stretch" it into an array
 // with the length of the frame (so there are the same labels for every row)
@@ -15,7 +15,7 @@ function makeLabelsArray(lineField: Field, length: number): Labels[] | null {
   }
 }
 
-// we decide if the frame is old-loki-style frame, and adjust the behavior.
+// if the frame has "labels" field with type "other", adjust the behavior.
 // we also have to return the labels-field (if we used it),
 // to be able to remove it from the unused-fields, later.
 function makeLabelsGetter(
@@ -23,11 +23,13 @@ function makeLabelsGetter(
   lineField: Field,
   frame: DataFrame
 ): [FieldWithIndex | null, () => Labels[] | null] {
-  if (frame.meta?.custom?.frameType === 'LabeledTimeValues') {
-    const labelsField = cache.getFieldByName('labels');
-    return labelsField === undefined ? [null, () => null] : [labelsField, () => labelsField.values];
+  // If we have labels field with type "other", use that
+  const labelsField = cache.getFieldByName('labels');
+  if (labelsField !== undefined && labelsField.type === FieldType.other) {
+    const values = labelsField.values.map(logFrameLabelsToLabels);
+    return [labelsField, () => values];
   } else {
-    // we use the labels on the line-field, and make an array with it
+    // Otherwise we use the labels on the line-field, and make an array with it
     return [null, () => makeLabelsArray(lineField, frame.length)];
   }
 }
@@ -68,8 +70,9 @@ export function parseLegacyLogsFrame(frame: DataFrame): LogsFrame | null {
     timeNanosecondField,
     severityField,
     idField,
-    getAttributes: getL,
-    getAttributesAsLabels: getL,
+    getLogFrameLabels: getL,
+    getLogFrameLabelsAsLabels: getL,
+    getLabelFieldName: () => labelsField?.name ?? null,
     extraFields,
   };
 }
diff --git a/public/app/features/logs/logsFrame.test.ts b/public/app/features/logs/logsFrame.test.ts
index b6f491ad6c2cc..dda099a2886ca 100644
--- a/public/app/features/logs/logsFrame.test.ts
+++ b/public/app/features/logs/logsFrame.test.ts
@@ -1,6 +1,6 @@
 import { FieldType, DataFrameType, Field, Labels } from '@grafana/data';
 
-import { parseLogsFrame, attributesToLabels } from './logsFrame';
+import { parseLogsFrame, logFrameLabelsToLabels } from './logsFrame';
 
 function makeString(name: string, values: string[], labels?: Labels): Field {
   return {
@@ -36,7 +36,7 @@ describe('parseLogsFrame should parse different logs-dataframe formats', () => {
     const body = makeString('body', ['line1', 'line2']);
     const severity = makeString('severity', ['info', 'debug']);
     const id = makeString('id', ['id1', 'id2']);
-    const attributes = makeObject('attributes', [
+    const labels = makeObject('labels', [
       { counter: '38141', label: 'val2', level: 'warning', nested: { a: '1', b: ['2', '3'] } },
       { counter: '38143', label: 'val2', level: 'info', nested: { a: '11', b: ['12', '13'] } },
     ]);
@@ -45,7 +45,7 @@ describe('parseLogsFrame should parse different logs-dataframe formats', () => {
       meta: {
         type: DataFrameType.LogLines,
       },
-      fields: [id, body, attributes, severity, time],
+      fields: [id, body, labels, severity, time],
       length: 2,
     });
 
@@ -56,11 +56,11 @@ describe('parseLogsFrame should parse different logs-dataframe formats', () => {
     expect(result!.idField?.values[0]).toBe(id.values[0]);
     expect(result!.timeNanosecondField).toBeNull();
     expect(result!.severityField?.values[0]).toBe(severity.values[0]);
-    expect(result!.getAttributes()).toStrictEqual([
+    expect(result!.getLogFrameLabels()).toStrictEqual([
       { counter: '38141', label: 'val2', level: 'warning', nested: { a: '1', b: ['2', '3'] } },
       { counter: '38143', label: 'val2', level: 'info', nested: { a: '11', b: ['12', '13'] } },
     ]);
-    expect(result!.getAttributesAsLabels()).toStrictEqual([
+    expect(result!.getLogFrameLabelsAsLabels()).toStrictEqual([
       { counter: '38141', label: 'val2', level: 'warning', nested: `{"a":"1","b":["2","3"]}` },
       { counter: '38143', label: 'val2', level: 'info', nested: `{"a":"11","b":["12","13"]}` },
     ]);
@@ -85,17 +85,50 @@ describe('parseLogsFrame should parse different logs-dataframe formats', () => {
     expect(result!.idField?.values[0]).toBe(id.values[0]);
     expect(result!.timeNanosecondField?.values[0]).toBe(ns.values[0]);
     expect(result!.severityField).toBeNull();
-    expect(result!.getAttributes()).toStrictEqual([
+    expect(result!.getLogFrameLabels()).toStrictEqual([
       { counter: '34543', lable: 'val3', level: 'info' },
       { counter: '34543', lable: 'val3', level: 'info' },
     ]);
-    expect(result!.getAttributesAsLabels()).toStrictEqual([
+    expect(result!.getLogFrameLabelsAsLabels()).toStrictEqual([
       { counter: '34543', lable: 'val3', level: 'info' },
       { counter: '34543', lable: 'val3', level: 'info' },
     ]);
     expect(result?.extraFields).toStrictEqual([]);
   });
 
+  it('should parse frames with labels field of type other', () => {
+    const time = makeTime('Time', [1687185711795, 1687185711995]);
+    const line = makeString('Line', ['line1', 'line2']);
+    const id = makeString('id', ['id1', 'id2']);
+    const ns = makeString('tsNs', ['1687185711795123456', '1687185711995987654']);
+    const labels = makeObject('labels', [
+      { counter: '38141', label: 'val2', level: 'warning' },
+      { counter: '38143', label: 'val2', level: 'info' },
+    ]);
+
+    const result = parseLogsFrame({
+      fields: [labels, time, line, ns, id],
+      length: 2,
+    });
+
+    expect(result).not.toBeNull();
+
+    expect(result!.timeField.values[0]).toBe(time.values[0]);
+    expect(result!.bodyField.values[0]).toBe(line.values[0]);
+    expect(result!.idField?.values[0]).toBe(id.values[0]);
+    expect(result!.timeNanosecondField?.values[0]).toBe(ns.values[0]);
+    expect(result!.severityField).toBeNull();
+    expect(result!.getLogFrameLabels()).toStrictEqual([
+      { counter: '38141', label: 'val2', level: 'warning' },
+      { counter: '38143', label: 'val2', level: 'info' },
+    ]);
+    expect(result!.getLogFrameLabelsAsLabels()).toStrictEqual([
+      { counter: '38141', label: 'val2', level: 'warning' },
+      { counter: '38143', label: 'val2', level: 'info' },
+    ]);
+    expect(result?.extraFields).toStrictEqual([]);
+  });
+
   it('should parse a Loki-style frame (single-frame, labels-in-json)', () => {
     const time = makeTime('Time', [1687185711795, 1687185711995]);
     const line = makeString('Line', ['line1', 'line2']);
@@ -123,11 +156,11 @@ describe('parseLogsFrame should parse different logs-dataframe formats', () => {
     expect(result!.idField?.values[0]).toBe(id.values[0]);
     expect(result!.timeNanosecondField?.values[0]).toBe(ns.values[0]);
     expect(result!.severityField).toBeNull();
-    expect(result!.getAttributes()).toStrictEqual([
+    expect(result!.getLogFrameLabels()).toStrictEqual([
       { counter: '38141', label: 'val2', level: 'warning' },
       { counter: '38143', label: 'val2', level: 'info' },
     ]);
-    expect(result!.getAttributesAsLabels()).toStrictEqual([
+    expect(result!.getLogFrameLabelsAsLabels()).toStrictEqual([
       { counter: '38141', label: 'val2', level: 'warning' },
       { counter: '38143', label: 'val2', level: 'info' },
     ]);
@@ -145,11 +178,6 @@ describe('parseLogsFrame should parse different logs-dataframe formats', () => {
     const level = makeString('level', ['info', 'error']);
 
     const result = parseLogsFrame({
-      meta: {
-        custom: {
-          frameType: 'LabeledTimeValues',
-        },
-      },
       fields: [time, line, source, level, host],
       length: 2,
     });
@@ -161,8 +189,8 @@ describe('parseLogsFrame should parse different logs-dataframe formats', () => {
     expect(result!.severityField?.values[0]).toBe(level.values[0]);
     expect(result!.idField).toBeNull();
     expect(result!.timeNanosecondField).toBeNull();
-    expect(result!.getAttributesAsLabels()).toBeNull();
-    expect(result!.getAttributes()).toBeNull();
+    expect(result!.getLogFrameLabelsAsLabels()).toBeNull();
+    expect(result!.getLogFrameLabels()).toBeNull();
     expect(result?.extraFields.map((f) => f.name)).toStrictEqual(['_source', 'hostname']);
   });
 
@@ -182,8 +210,8 @@ describe('parseLogsFrame should parse different logs-dataframe formats', () => {
     expect(result!.severityField).toBeNull();
     expect(result!.idField).toBeNull();
     expect(result!.timeNanosecondField).toBeNull();
-    expect(result!.getAttributesAsLabels()).toBeNull();
-    expect(result!.getAttributes()).toBeNull();
+    expect(result!.getLogFrameLabelsAsLabels()).toBeNull();
+    expect(result!.getLogFrameLabels()).toBeNull();
     expect(result?.extraFields).toStrictEqual([]);
   });
 
@@ -208,15 +236,15 @@ describe('parseLogsFrame should parse different logs-dataframe formats', () => {
     expect(result!.severityField).toBeNull();
     expect(result!.idField).toBeNull();
     expect(result!.timeNanosecondField).toBeNull();
-    expect(result!.getAttributesAsLabels()).toBeNull();
-    expect(result!.getAttributes()).toBeNull();
+    expect(result!.getLogFrameLabelsAsLabels()).toBeNull();
+    expect(result!.getLogFrameLabels()).toBeNull();
   });
 });
 
-describe('attributesToLabels', () => {
+describe('logFrameLabelsToLabels', () => {
   it('should convert nested structures correctly', () => {
     expect(
-      attributesToLabels({
+      logFrameLabelsToLabels({
         key1: 'val1',
         key2: ['k2v1', 'k2v2', 'k2v3'],
         key3: {
@@ -240,7 +268,7 @@ describe('attributesToLabels', () => {
 
   it('should convert not-nested structures correctly', () => {
     expect(
-      attributesToLabels({
+      logFrameLabelsToLabels({
         key1: 'val1',
         key2: 'val2',
       })
diff --git a/public/app/features/logs/logsFrame.ts b/public/app/features/logs/logsFrame.ts
index a003eff59272c..513f56a3e1e57 100644
--- a/public/app/features/logs/logsFrame.ts
+++ b/public/app/features/logs/logsFrame.ts
@@ -4,18 +4,19 @@ import { parseLegacyLogsFrame } from './legacyLogsFrame';
 
 // these are like Labels, but their values can be
 // arbitrary structures, not just strings
-export type Attributes = Record<string, unknown>;
+export type LogFrameLabels = Record<string, unknown>;
 
 // the attributes-access is a little awkward, but it's necessary
-// because there are multiple,very different dataframe-represenations.
+// because there are multiple,very different dataFrame-representations.
 export type LogsFrame = {
   timeField: FieldWithIndex;
   bodyField: FieldWithIndex;
   timeNanosecondField: FieldWithIndex | null;
   severityField: FieldWithIndex | null;
   idField: FieldWithIndex | null;
-  getAttributes: () => Attributes[] | null; // may be slow, so we only do it when asked for it explicitly
-  getAttributesAsLabels: () => Labels[] | null; // temporarily exists to make the labels=>attributes migration simpler
+  getLogFrameLabels: () => LogFrameLabels[] | null; // may be slow, so we only do it when asked for it explicitly
+  getLogFrameLabelsAsLabels: () => Labels[] | null; // temporarily exists to make the labels=>attributes migration simpler
+  getLabelFieldName: () => string | null;
   extraFields: FieldWithIndex[];
 };
 
@@ -32,12 +33,12 @@ const DATAPLANE_TIMESTAMP_NAME = 'timestamp';
 const DATAPLANE_BODY_NAME = 'body';
 const DATAPLANE_SEVERITY_NAME = 'severity';
 const DATAPLANE_ID_NAME = 'id';
-const DATAPLANE_ATTRIBUTES_NAME = 'attributes';
+const DATAPLANE_LABELS_NAME = 'labels';
 
-export function attributesToLabels(attributes: Attributes): Labels {
+export function logFrameLabelsToLabels(logFrameLabels: LogFrameLabels): Labels {
   const result: Labels = {};
 
-  Object.entries(attributes).forEach(([k, v]) => {
+  Object.entries(logFrameLabels).forEach(([k, v]) => {
     result[k] = typeof v === 'string' ? v : JSON.stringify(v);
   });
 
@@ -57,9 +58,9 @@ function parseDataplaneLogsFrame(frame: DataFrame): LogsFrame | null {
 
   const severityField = getField(cache, DATAPLANE_SEVERITY_NAME, FieldType.string) ?? null;
   const idField = getField(cache, DATAPLANE_ID_NAME, FieldType.string) ?? null;
-  const attributesField = getField(cache, DATAPLANE_ATTRIBUTES_NAME, FieldType.other) ?? null;
+  const labelsField = getField(cache, DATAPLANE_LABELS_NAME, FieldType.other) ?? null;
 
-  const attributes = attributesField === null ? null : attributesField.values;
+  const labels = labelsField === null ? null : labelsField.values;
 
   const extraFields = cache.fields.filter(
     (_, i) =>
@@ -67,7 +68,7 @@ function parseDataplaneLogsFrame(frame: DataFrame): LogsFrame | null {
       i !== bodyField.index &&
       i !== severityField?.index &&
       i !== idField?.index &&
-      i !== attributesField?.index
+      i !== labelsField?.index
   );
 
   return {
@@ -75,9 +76,10 @@ function parseDataplaneLogsFrame(frame: DataFrame): LogsFrame | null {
     bodyField,
     severityField,
     idField,
-    getAttributes: () => attributes,
+    getLogFrameLabels: () => labels,
     timeNanosecondField: null,
-    getAttributesAsLabels: () => (attributes !== null ? attributes.map(attributesToLabels) : null),
+    getLogFrameLabelsAsLabels: () => (labels !== null ? labels.map(logFrameLabelsToLabels) : null),
+    getLabelFieldName: () => (labelsField !== null ? labelsField.name : null),
     extraFields,
   };
 }
diff --git a/public/app/features/logs/logsModel.test.ts b/public/app/features/logs/logsModel.test.ts
index 2c2443bb479b0..05883b148493a 100644
--- a/public/app/features/logs/logsModel.test.ts
+++ b/public/app/features/logs/logsModel.test.ts
@@ -1,10 +1,13 @@
 import { Observable } from 'rxjs';
 
 import {
+  arrayToDataFrame,
+  createDataFrame,
   DataFrame,
   DataQuery,
   DataQueryRequest,
   DataQueryResponse,
+  DataTopic,
   dateTimeParse,
   FieldType,
   LoadingState,
@@ -14,10 +17,11 @@ import {
   LogsMetaKind,
   LogsVolumeCustomMetaData,
   LogsVolumeType,
-  MutableDataFrame,
   sortDataFrame,
   toDataFrame,
 } from '@grafana/data';
+import { config } from '@grafana/runtime';
+import { getMockFrames } from 'app/plugins/datasource/loki/__mocks__/frames';
 
 import { MockObservableDataSourceApi } from '../../../test/mocks/datasource_srv';
 
@@ -27,7 +31,9 @@ import {
   dedupLogRows,
   filterLogLevels,
   getSeriesProperties,
+  infiniteScrollRefId,
   LIMIT_LABEL,
+  logRowToSingleRowDataFrame,
   logSeriesToLogsModel,
   queryLogsSample,
   queryLogsVolume,
@@ -227,7 +233,7 @@ const emptyLogsModel = {
 
 describe('dataFrameToLogsModel', () => {
   it('given empty series should return empty logs model', () => {
-    expect(dataFrameToLogsModel([] as DataFrame[], 0)).toMatchObject(emptyLogsModel);
+    expect(dataFrameToLogsModel([], 0)).toMatchObject(emptyLogsModel);
   });
 
   it('given series without correct series name should return empty logs model', () => {
@@ -241,7 +247,7 @@ describe('dataFrameToLogsModel', () => {
 
   it('given series without a time field should return empty logs model', () => {
     const series: DataFrame[] = [
-      new MutableDataFrame({
+      createDataFrame({
         fields: [
           {
             name: 'message',
@@ -256,7 +262,7 @@ describe('dataFrameToLogsModel', () => {
 
   it('given series without a string field should return empty logs model', () => {
     const series: DataFrame[] = [
-      new MutableDataFrame({
+      createDataFrame({
         fields: [
           {
             name: 'time',
@@ -271,7 +277,7 @@ describe('dataFrameToLogsModel', () => {
 
   it('given one series should return expected logs model', () => {
     const series: DataFrame[] = [
-      new MutableDataFrame({
+      createDataFrame({
         fields: [
           {
             name: 'time',
@@ -355,9 +361,48 @@ describe('dataFrameToLogsModel', () => {
     });
   });
 
+  it('with infinite scrolling enabled it should return expected logs model', () => {
+    config.featureToggles.logsInfiniteScrolling = true;
+
+    const series: DataFrame[] = [
+      createDataFrame({
+        fields: [
+          {
+            name: 'time',
+            type: FieldType.time,
+            values: ['2019-04-26T09:28:11.352440161Z'],
+          },
+          {
+            name: 'message',
+            type: FieldType.string,
+            values: ['t=2019-04-26T11:05:28+0200 lvl=info msg="Initializing DatasourceCacheService" logger=server'],
+            labels: {},
+          },
+          {
+            name: 'id',
+            type: FieldType.string,
+            values: ['foo'],
+          },
+        ],
+        meta: {
+          limit: 1000,
+        },
+        refId: 'A',
+      }),
+    ];
+    const logsModel = dataFrameToLogsModel(series, 1);
+    expect(logsModel.meta![0]).toMatchObject({
+      label: LIMIT_LABEL,
+      value: `1000 (1 displayed)`,
+      kind: LogsMetaKind.String,
+    });
+
+    config.featureToggles.logsInfiniteScrolling = false;
+  });
+
   it('given one series with limit as custom meta property should return correct limit', () => {
     const series: DataFrame[] = [
-      new MutableDataFrame({
+      createDataFrame({
         fields: [
           {
             name: 'time',
@@ -399,7 +444,7 @@ describe('dataFrameToLogsModel', () => {
 
   it('given one series with labels-field should return expected logs model', () => {
     const series: DataFrame[] = [
-      new MutableDataFrame({
+      createDataFrame({
         fields: [
           {
             name: 'labels',
@@ -436,9 +481,6 @@ describe('dataFrameToLogsModel', () => {
         ],
         meta: {
           limit: 1000,
-          custom: {
-            frameType: 'LabeledTimeValues',
-          },
         },
         refId: 'A',
       }),
@@ -516,25 +558,15 @@ describe('dataFrameToLogsModel', () => {
       type: FieldType.string,
       values: ['line1'],
     };
-
-    const meta = {
-      custom: {
-        frameType: 'LabeledTimeValues',
-      },
-    };
-
-    const frame1 = new MutableDataFrame({
-      meta,
+    const frame1 = createDataFrame({
       fields: [labels, time, line],
     });
 
-    const frame2 = new MutableDataFrame({
-      meta,
+    const frame2 = createDataFrame({
       fields: [time, labels, line],
     });
 
-    const frame3 = new MutableDataFrame({
-      meta,
+    const frame3 = createDataFrame({
       fields: [time, line, labels],
     });
 
@@ -553,7 +585,7 @@ describe('dataFrameToLogsModel', () => {
 
   it('given one series with error should return expected logs model', () => {
     const series: DataFrame[] = [
-      new MutableDataFrame({
+      createDataFrame({
         fields: [
           {
             name: 'time',
@@ -629,7 +661,7 @@ describe('dataFrameToLogsModel', () => {
 
   it('given one series without labels should return expected logs model', () => {
     const series: DataFrame[] = [
-      new MutableDataFrame({
+      createDataFrame({
         fields: [
           {
             name: 'time',
@@ -920,7 +952,7 @@ describe('dataFrameToLogsModel', () => {
 
   it('should return expected line limit meta info when returned number of series equal the log limit', () => {
     const series: DataFrame[] = [
-      new MutableDataFrame({
+      createDataFrame({
         fields: [
           {
             name: 'time',
@@ -986,6 +1018,51 @@ describe('dataFrameToLogsModel', () => {
     const logsModel = dataFrameToLogsModel(series, 1);
     expect(logsModel.rows[0].uid).toBe('A_0');
   });
+
+  describe('infinite scrolling', () => {
+    let frameA: DataFrame, frameB: DataFrame;
+    beforeEach(() => {
+      const { logFrameA, logFrameB } = getMockFrames();
+      logFrameA.refId = `${infiniteScrollRefId}-A`;
+      logFrameA.fields[0].values = [1, 1];
+      logFrameA.fields[1].values = ['line', 'line'];
+      logFrameA.fields[3].values = ['3000000', '3000000'];
+      logFrameA.fields[4].values = ['id', 'id'];
+      logFrameB.refId = `${infiniteScrollRefId}-B`;
+      logFrameB.fields[0].values = [2, 2];
+      logFrameB.fields[1].values = ['line 2', 'line 2'];
+      logFrameB.fields[3].values = ['4000000', '4000000'];
+      logFrameB.fields[4].values = ['id2', 'id2'];
+      frameA = logFrameA;
+      frameB = logFrameB;
+    });
+
+    it('deduplicates repeated log frames when invoked from infinite scrolling results', () => {
+      const logsModel = dataFrameToLogsModel([frameA, frameB], 1, { from: 1556270591353, to: 1556289770991 }, [
+        { refId: `${infiniteScrollRefId}-A` },
+        { refId: `${infiniteScrollRefId}-B` },
+      ]);
+
+      expect(logsModel.rows).toHaveLength(2);
+      expect(logsModel.rows[0].entry).toBe(frameA.fields[1].values[0]);
+      expect(logsModel.rows[1].entry).toBe(frameB.fields[1].values[0]);
+    });
+
+    it('does not remove repeated log frames when invoked from other contexts', () => {
+      frameA.refId = 'A';
+      frameB.refId = 'B';
+      const logsModel = dataFrameToLogsModel([frameA, frameB], 1, { from: 1556270591353, to: 1556289770991 }, [
+        { refId: 'A' },
+        { refId: 'B' },
+      ]);
+
+      expect(logsModel.rows).toHaveLength(4);
+      expect(logsModel.rows[0].entry).toBe(frameA.fields[1].values[0]);
+      expect(logsModel.rows[1].entry).toBe(frameA.fields[1].values[1]);
+      expect(logsModel.rows[2].entry).toBe(frameB.fields[1].values[0]);
+      expect(logsModel.rows[3].entry).toBe(frameB.fields[1].values[1]);
+    });
+  });
 });
 
 describe('logSeriesToLogsModel', () => {
@@ -1240,16 +1317,22 @@ describe('logs volume', () => {
         { refId: 'B', target: 'volume query 2' },
       ],
       scopedVars: {},
-    } as unknown as DataQueryRequest<TestDataQuery>;
-    volumeProvider = queryLogsVolume(datasource, request, {
-      extractLevel: (dataFrame: DataFrame) => {
-        return dataFrame.fields[1]!.labels!.level === 'error' ? LogLevel.error : LogLevel.unknown;
-      },
+      requestId: '',
+      interval: '',
+      intervalMs: 0,
       range: {
         from: FROM,
         to: TO,
-        raw: { from: '0', to: '1' },
+        raw: {
+          from: FROM,
+          to: TO,
+        },
       },
+      timezone: '',
+      app: '',
+      startTime: 0,
+    };
+    volumeProvider = queryLogsVolume(datasource, request, {
       targets: request.targets,
     });
   }
@@ -1294,6 +1377,33 @@ describe('logs volume', () => {
     ]);
   }
 
+  function setupLogsVolumeWithAnnotations() {
+    const resultAFrame1 = createFrame({ app: 'app01' }, [100, 200, 300], [5, 5, 5], 'A');
+    const loadingFrame = arrayToDataFrame([
+      {
+        time: 100,
+        timeEnd: 200,
+        isRegion: true,
+        color: 'rgba(120, 120, 120, 0.1)',
+      },
+    ]);
+    loadingFrame.name = 'annotation';
+    loadingFrame.meta = {
+      dataTopic: DataTopic.Annotations,
+    };
+
+    datasource = new MockObservableDataSourceApi('loki', [
+      {
+        state: LoadingState.Streaming,
+        data: [resultAFrame1, loadingFrame],
+      },
+      {
+        state: LoadingState.Done,
+        data: [resultAFrame1],
+      },
+    ]);
+  }
+
   function setupErrorResponse() {
     datasource = new MockObservableDataSourceApi('loki', [], undefined, 'Error message');
   }
@@ -1375,6 +1485,55 @@ describe('logs volume', () => {
       ]);
     });
   });
+
+  it('handles annotations in responses', async () => {
+    setup(setupLogsVolumeWithAnnotations);
+
+    const logVolumeCustomMeta: LogsVolumeCustomMetaData = {
+      sourceQuery: { refId: 'A', target: 'volume query 1' } as DataQuery,
+      datasourceName: 'loki',
+      logsVolumeType: LogsVolumeType.FullRange,
+      absoluteRange: {
+        from: FROM.valueOf(),
+        to: TO.valueOf(),
+      },
+    };
+
+    await expect(volumeProvider).toEmitValuesWith((received) => {
+      expect(received).toContainEqual({ state: LoadingState.Loading, error: undefined, data: [] });
+      expect(received).toContainEqual({
+        state: LoadingState.Streaming,
+        error: undefined,
+        data: [
+          expect.objectContaining({
+            fields: expect.anything(),
+            meta: {
+              custom: logVolumeCustomMeta,
+            },
+          }),
+          expect.objectContaining({
+            fields: expect.anything(),
+            meta: {
+              dataTopic: DataTopic.Annotations,
+            },
+            name: 'annotation',
+          }),
+        ],
+      });
+      expect(received).toContainEqual({
+        state: LoadingState.Done,
+        error: undefined,
+        data: [
+          expect.objectContaining({
+            fields: expect.anything(),
+            meta: {
+              custom: logVolumeCustomMeta,
+            },
+          }),
+        ],
+      });
+    });
+  });
 });
 
 describe('logs sample', () => {
@@ -1471,3 +1630,60 @@ describe('logs sample', () => {
     });
   });
 });
+
+const mockLogRow = {
+  dataFrame: toDataFrame({
+    fields: [
+      { name: 'Time', type: FieldType.time, values: [0, 1] },
+      {
+        name: 'Line',
+        type: FieldType.string,
+        values: ['line1', 'line2'],
+      },
+      { name: 'labels', type: FieldType.other, values: [{ app: 'app01' }, { app: 'app02' }] },
+    ],
+    refId: 'Z',
+  }),
+  rowIndex: 0,
+} as unknown as LogRowModel;
+
+describe('logRowToDataFrame', () => {
+  it('should return a DataFrame with the values from the specified row', () => {
+    const result = logRowToSingleRowDataFrame(mockLogRow);
+
+    expect(result?.length).toBe(1);
+
+    expect(result?.fields[0].values[0]).toEqual(0);
+    expect(result?.fields[1].values[0]).toEqual('line1');
+    expect(result?.fields[2].values[0]).toEqual({ app: 'app01' });
+  });
+
+  it('should return a DataFrame with the values from the specified different row', () => {
+    const result = logRowToSingleRowDataFrame({ ...mockLogRow, rowIndex: 1 });
+
+    expect(result?.length).toBe(1);
+
+    expect(result?.fields[0].values[0]).toEqual(1);
+    expect(result?.fields[1].values[0]).toEqual('line2');
+    expect(result?.fields[2].values[0]).toEqual({ app: 'app02' });
+  });
+
+  it('should handle an empty DataFrame', () => {
+    const emptyLogRow = { dataFrame: { fields: [] }, rowIndex: 0 } as unknown as LogRowModel;
+    const result = logRowToSingleRowDataFrame(emptyLogRow);
+
+    expect(result?.length).toBe(0);
+  });
+
+  it('should handle rowIndex exceeding array bounds', () => {
+    const invalidRowIndex = 10;
+    const result = logRowToSingleRowDataFrame({ ...mockLogRow, rowIndex: invalidRowIndex });
+
+    expect(result).toBe(null);
+  });
+
+  it('should use refId from original DataFrame', () => {
+    const result = logRowToSingleRowDataFrame(mockLogRow);
+    expect(result?.refId).toBe(mockLogRow.dataFrame.refId);
+  });
+});
diff --git a/public/app/features/logs/logsModel.ts b/public/app/features/logs/logsModel.ts
index a2b18caba86c8..396553207dc28 100644
--- a/public/app/features/logs/logsModel.ts
+++ b/public/app/features/logs/logsModel.ts
@@ -3,12 +3,14 @@ import { from, isObservable, Observable } from 'rxjs';
 
 import {
   AbsoluteTimeRange,
+  createDataFrame,
   DataFrame,
   DataQuery,
   DataQueryRequest,
   DataQueryResponse,
   DataSourceApi,
   DataSourceJsonData,
+  DataTopic,
   dateTimeFormat,
   dateTimeFormatTimeAgo,
   DateTimeInput,
@@ -33,17 +35,17 @@ import {
   ScopedVars,
   sortDataFrame,
   textUtil,
-  TimeRange,
   toDataFrame,
   toUtc,
 } from '@grafana/data';
 import { SIPrefix } from '@grafana/data/src/valueFormats/symbolFormatters';
+import { config } from '@grafana/runtime';
 import { BarAlignment, GraphDrawStyle, StackingMode } from '@grafana/schema';
 import { ansicolor, colors } from '@grafana/ui';
 import { getThemeColor } from 'app/core/utils/colors';
 
 import { LogsFrame, parseLogsFrame } from './logsFrame';
-import { getLogLevel, getLogLevelFromKey, sortInAscendingOrder } from './utils';
+import { createLogRowsMap, getLogLevel, getLogLevelFromKey, sortInAscendingOrder } from './utils';
 
 export const LIMIT_LABEL = 'Line limit';
 export const COMMON_LABELS = 'Common labels';
@@ -199,6 +201,8 @@ function isLogsData(series: DataFrame) {
   return series.fields.some((f) => f.type === FieldType.time) && series.fields.some((f) => f.type === FieldType.string);
 }
 
+export const infiniteScrollRefId = 'infinite-scroll-';
+
 /**
  * Convert dataFrame into LogsModel which consists of creating separate array of log rows and metrics series. Metrics
  * series can be either already included in the dataFrame or will be computed from the log rows.
@@ -213,8 +217,27 @@ export function dataFrameToLogsModel(
   absoluteRange?: AbsoluteTimeRange,
   queries?: DataQuery[]
 ): LogsModel {
+  // Until nanosecond precision for requests is supported, we need to account for possible duplicate rows.
+  let infiniteScrollingResults = false;
+  queries = queries?.map((query) => {
+    if (query.refId.includes(infiniteScrollRefId)) {
+      infiniteScrollingResults = true;
+      return {
+        ...query,
+        refId: query.refId.replace(infiniteScrollRefId, ''),
+      };
+    }
+    return query;
+  });
+  if (infiniteScrollingResults) {
+    dataFrame = dataFrame.map((frame) => ({
+      ...frame,
+      refId: frame.refId?.replace(infiniteScrollRefId, ''),
+    }));
+  }
+
   const { logSeries } = separateLogsAndMetrics(dataFrame);
-  const logsModel = logSeriesToLogsModel(logSeries, queries);
+  const logsModel = logSeriesToLogsModel(logSeries, queries, infiniteScrollingResults);
 
   if (logsModel) {
     // Create histogram metrics from logs using the interval as bucket size for the line count
@@ -348,7 +371,11 @@ function parseTime(
  * Converts dataFrames into LogsModel. This involves merging them into one list, sorting them and computing metadata
  * like common labels.
  */
-export function logSeriesToLogsModel(logSeries: DataFrame[], queries: DataQuery[] = []): LogsModel | undefined {
+export function logSeriesToLogsModel(
+  logSeries: DataFrame[],
+  queries: DataQuery[] = [],
+  filterDuplicateRows = false
+): LogsModel | undefined {
   if (logSeries.length === 0) {
     return undefined;
   }
@@ -366,7 +393,7 @@ export function logSeriesToLogsModel(logSeries: DataFrame[], queries: DataQuery[
       const logsFrame = parseLogsFrame(series);
       if (logsFrame != null) {
         // for now we ignore the nested-ness of attributes, and just stringify-them
-        const frameLabels = logsFrame.getAttributesAsLabels() ?? undefined;
+        const frameLabels = logsFrame.getLogFrameLabelsAsLabels() ?? undefined;
         const info = {
           rawFrame: series,
           logsFrame: logsFrame,
@@ -384,9 +411,10 @@ export function logSeriesToLogsModel(logSeries: DataFrame[], queries: DataQuery[
   const flatAllLabels = allLabels.flat();
   const commonLabels = flatAllLabels.length > 0 ? findCommonLabels(flatAllLabels) : {};
 
-  const rows: LogRowModel[] = [];
+  let rows: LogRowModel[] = [];
   let hasUniqueLabels = false;
 
+  const findMatchingRow = createLogRowsMap();
   for (const info of allSeries) {
     const { logsFrame, rawFrame: series, frameLabels } = info;
     const { timeField, timeNanosecondField, bodyField: stringField, severityField: logLevelField, idField } = logsFrame;
@@ -450,6 +478,10 @@ export function logSeriesToLogsModel(logSeries: DataFrame[], queries: DataQuery[
         row.rowId = idField.values[j];
       }
 
+      if (filterDuplicateRows && findMatchingRow(row)) {
+        continue;
+      }
+
       rows.push(row);
     }
   }
@@ -530,12 +562,15 @@ export function logSeriesToLogsModel(logSeries: DataFrame[], queries: DataQuery[
 
 // Used to add additional information to Line limit meta info
 function adjustMetaInfo(logsModel: LogsModel, visibleRangeMs?: number, requestedRangeMs?: number): LogsMetaItem[] {
-  let logsModelMeta = [...logsModel.meta!];
+  if (!logsModel.meta) {
+    return [];
+  }
+  let logsModelMeta = [...logsModel.meta];
 
   const limitIndex = logsModelMeta.findIndex((meta) => meta.label === LIMIT_LABEL);
   const limit = limitIndex >= 0 && logsModelMeta[limitIndex]?.value;
 
-  if (limit && limit > 0) {
+  if (limit && typeof limit === 'number' && limit > 0) {
     let metaLimitValue;
 
     if (limit === logsModel.rows.length && visibleRangeMs && requestedRangeMs) {
@@ -545,7 +580,8 @@ function adjustMetaInfo(logsModel: LogsModel, visibleRangeMs?: number, requested
         visibleRangeMs
       )}) of your selected time range (${rangeUtil.msRangeToTimeString(requestedRangeMs)})`;
     } else {
-      metaLimitValue = `${limit} (${logsModel.rows.length} returned)`;
+      const description = config.featureToggles.logsInfiniteScrolling ? 'displayed' : 'returned';
+      metaLimitValue = `${limit} (${logsModel.rows.length} ${description})`;
     }
 
     logsModelMeta[limitIndex] = {
@@ -604,11 +640,22 @@ const updateLogsVolumeConfig = (
 };
 
 type LogsVolumeQueryOptions<T extends DataQuery> = {
-  extractLevel: (dataFrame: DataFrame) => LogLevel;
   targets: T[];
-  range: TimeRange;
 };
 
+function defaultExtractLevel(dataFrame: DataFrame): LogLevel {
+  let valueField;
+  try {
+    valueField = new FieldCache(dataFrame).getFirstFieldOfType(FieldType.number);
+  } catch {}
+  return valueField?.labels ? getLogLevelFromLabels(valueField.labels) : LogLevel.unknown;
+}
+
+function getLogLevelFromLabels(labels: Labels): LogLevel {
+  const level = labels['level'] ?? labels['lvl'] ?? labels['loglevel'] ?? '';
+  return level ? getLogLevelFromKey(level) : LogLevel.unknown;
+}
+
 /**
  * Creates an observable, which makes requests to get logs volume and aggregates results.
  */
@@ -617,7 +664,10 @@ export function queryLogsVolume<TQuery extends DataQuery, TOptions extends DataS
   logsVolumeRequest: DataQueryRequest<TQuery>,
   options: LogsVolumeQueryOptions<TQuery>
 ): Observable<DataQueryResponse> {
-  const timespan = options.range.to.valueOf() - options.range.from.valueOf();
+  const range = logsVolumeRequest.range;
+  const targets = options.targets;
+  const extractLevel = defaultExtractLevel;
+  const timespan = range.to.valueOf() - range.from.valueOf();
   const intervalInfo = getIntervalInfo(logsVolumeRequest.scopedVars, timespan);
 
   logsVolumeRequest.interval = intervalInfo.interval;
@@ -657,6 +707,10 @@ export function queryLogsVolume<TQuery extends DataQuery, TOptions extends DataS
         } else {
           const framesByRefId = groupBy(dataQueryResponse.data, 'refId');
           logsVolumeData = dataQueryResponse.data.map((dataFrame) => {
+            // Separate possible annotations from data frames
+            if (dataFrame.meta?.dataTopic === DataTopic.Annotations) {
+              return dataFrame;
+            }
             let sourceRefId = dataFrame.refId || '';
             if (sourceRefId.startsWith('log-volume-')) {
               sourceRefId = sourceRefId.substr('log-volume-'.length);
@@ -664,9 +718,9 @@ export function queryLogsVolume<TQuery extends DataQuery, TOptions extends DataS
 
             const logsVolumeCustomMetaData: LogsVolumeCustomMetaData = {
               logsVolumeType: LogsVolumeType.FullRange,
-              absoluteRange: { from: options.range.from.valueOf(), to: options.range.to.valueOf() },
+              absoluteRange: { from: range.from.valueOf(), to: range.to.valueOf() },
               datasourceName: datasource.name,
-              sourceQuery: options.targets.find((dataQuery) => dataQuery.refId === sourceRefId)!,
+              sourceQuery: targets.find((dataQuery) => dataQuery.refId === sourceRefId)!,
             };
 
             dataFrame.meta = {
@@ -676,7 +730,7 @@ export function queryLogsVolume<TQuery extends DataQuery, TOptions extends DataS
                 ...logsVolumeCustomMetaData,
               },
             };
-            return updateLogsVolumeConfig(dataFrame, options.extractLevel, framesByRefId[dataFrame.refId].length === 1);
+            return updateLogsVolumeConfig(dataFrame, extractLevel, framesByRefId[dataFrame.refId].length === 1);
           });
 
           observer.next({
@@ -789,3 +843,22 @@ function getIntervalInfo(scopedVars: ScopedVars, timespanMs: number): { interval
     return { interval: '$__interval' };
   }
 }
+
+/**
+ * Creates a new data frame containing only the single row from `logRow`.
+ */
+export function logRowToSingleRowDataFrame(logRow: LogRowModel): DataFrame | null {
+  const originFrame = logRow.dataFrame;
+
+  if (originFrame.length === 0 || originFrame.length <= logRow.rowIndex) {
+    return null;
+  }
+
+  // create a new data frame containing only the single row from `logRow`
+  const frame = createDataFrame({
+    fields: originFrame.fields.map((field) => ({ ...field, values: [field.values[logRow.rowIndex]] })),
+    refId: originFrame.refId,
+  });
+
+  return frame;
+}
diff --git a/public/app/features/logs/logsModel_parse.test.ts b/public/app/features/logs/logsModel_parse.test.ts
index 15628cbaf5ef8..e87b304c83c55 100644
--- a/public/app/features/logs/logsModel_parse.test.ts
+++ b/public/app/features/logs/logsModel_parse.test.ts
@@ -11,7 +11,7 @@ jest.mock('@grafana/data', () => ({
 }));
 
 describe('logSeriesToLogsModel should parse different logs-dataframe formats', () => {
-  it('should parse a dataplane-formatted logs-frame)', () => {
+  it('should parse a dataplane-formatted logs-frame', () => {
     const frames: DataFrame[] = [
       {
         refId: 'A',
@@ -23,7 +23,7 @@ describe('logSeriesToLogsModel should parse different logs-dataframe formats', (
             values: ['info', 'debug', 'error'],
           },
           {
-            name: 'attributes',
+            name: 'labels',
             type: FieldType.other,
             config: {},
             values: [
@@ -373,7 +373,7 @@ describe('logSeriesToLogsModel should parse different logs-dataframe formats', (
     expect(logSeriesToLogsModel(frames)).toStrictEqual(expected);
   });
 
-  it('should parse a Loki-style frame (single-frame, labels-in-json)', () => {
+  it('should parse a frame with a labels field (single-frame, labels-in-json)', () => {
     const frames: DataFrame[] = [
       {
         refId: 'A',
@@ -427,11 +427,6 @@ describe('logSeriesToLogsModel should parse different logs-dataframe formats', (
           },
         ],
         length: 3,
-        meta: {
-          custom: {
-            frameType: 'LabeledTimeValues',
-          },
-        },
       },
     ];
 
diff --git a/public/app/features/logs/utils.test.ts b/public/app/features/logs/utils.test.ts
index 6e745ef63e7dc..184a594acb92f 100644
--- a/public/app/features/logs/utils.test.ts
+++ b/public/app/features/logs/utils.test.ts
@@ -9,11 +9,15 @@ import {
   MutableDataFrame,
   DataFrame,
 } from '@grafana/data';
+import { getMockFrames } from 'app/plugins/datasource/loki/__mocks__/frames';
 
+import { logSeriesToLogsModel } from './logsModel';
 import {
   calculateLogsLabelStats,
   calculateStats,
   checkLogsError,
+  escapeUnescapedString,
+  createLogRowsMap,
   getLogLevel,
   getLogLevelFromKey,
   getLogsVolumeMaximumRange,
@@ -407,6 +411,33 @@ describe('mergeLogsVolumeDataFrames', () => {
     ]);
     expect(maximum).toBe(6);
   });
+
+  it('produces merged results order by time', () => {
+    const frame1 = mockLogVolume('info', [1600000000001, 1600000000009], [1, 1]);
+    const frame2 = mockLogVolume('info', [1600000000000, 1600000000005], [1, 1]);
+
+    const { dataFrames: merged } = mergeLogsVolumeDataFrames([frame1, frame2]);
+
+    expect(merged).toMatchObject([
+      {
+        fields: [
+          {
+            name: 'Time',
+            type: FieldType.time,
+            values: [1600000000000, 1600000000001, 1600000000005, 1600000000009],
+          },
+          {
+            name: 'Value',
+            type: FieldType.number,
+            values: [1, 1, 1, 1],
+            config: {
+              displayNameFromDS: 'info',
+            },
+          },
+        ],
+      },
+    ]);
+  });
 });
 
 describe('getLogsVolumeDimensions', () => {
@@ -442,3 +473,58 @@ describe('getLogsVolumeDimensions', () => {
     expect(maximumRange).toEqual({ from: 5, to: 25 });
   });
 });
+
+describe('escapeUnescapedString', () => {
+  it('does not modify strings without unescaped characters', () => {
+    expect(escapeUnescapedString('a simple string')).toBe('a simple string');
+  });
+  it('escapes unescaped strings', () => {
+    expect(escapeUnescapedString(`\\r\\n|\\n|\\t|\\r`)).toBe(`\n|\n|\t|\n`);
+  });
+});
+
+describe('findMatchingRow', () => {
+  function setup(frames: DataFrame[]) {
+    const logsModel = logSeriesToLogsModel(frames);
+    const rows = logsModel?.rows || [];
+    const findMatchingRow = createLogRowsMap();
+    for (const row of rows) {
+      expect(findMatchingRow(row)).toBeFalsy();
+    }
+    return { rows, findMatchingRow };
+  }
+
+  it('ignores rows from different queries', () => {
+    const { logFrameA, logFrameB } = getMockFrames();
+    logFrameA.refId = 'A';
+    logFrameB.refId = 'B';
+    const { rows, findMatchingRow } = setup([logFrameA, logFrameB]);
+
+    for (const row of rows) {
+      const targetRow = { ...row, dataFrame: { ...logFrameA, refId: 'Z' } };
+      expect(findMatchingRow(targetRow)).toBeFalsy();
+    }
+  });
+
+  it('matches rows by rowId', () => {
+    const { logFrameA, logFrameB } = getMockFrames();
+    const { rows, findMatchingRow } = setup([logFrameA, logFrameB]);
+
+    for (const row of rows) {
+      const targetRow = { ...row, entry: `${Math.random()}`, timeEpochNs: `${Math.ceil(Math.random() * 1000000)}` };
+      expect(findMatchingRow(targetRow)).toBeTruthy();
+    }
+  });
+
+  it('matches rows by entry and nanosecond time', () => {
+    const { logFrameA, logFrameB } = getMockFrames();
+    logFrameA.fields[4].values = [];
+    logFrameB.fields[4].values = [];
+    const { rows, findMatchingRow } = setup([logFrameA, logFrameB]);
+
+    for (const row of rows) {
+      const targetRow = { ...row, rowId: undefined };
+      expect(findMatchingRow(targetRow)).toBeTruthy();
+    }
+  });
+});
diff --git a/public/app/features/logs/utils.ts b/public/app/features/logs/utils.ts
index d0430dd209e70..56b138920fa2b 100644
--- a/public/app/features/logs/utils.ts
+++ b/public/app/features/logs/utils.ts
@@ -243,13 +243,14 @@ export const mergeLogsVolumeDataFrames = (dataFrames: DataFrame[]): { dataFrames
     levelDataFrame.addField({ name: 'Time', type: FieldType.time, config: timeFieldConfig });
     levelDataFrame.addField({ name: 'Value', type: FieldType.number, config: valueFieldConfig });
 
-    for (const time in aggregated[level]) {
-      const value = aggregated[level][time];
-      levelDataFrame.add({
-        Time: Number(time),
-        Value: value,
+    Object.entries(aggregated[level])
+      .sort((a, b) => Number(a[0]) - Number(b[0]))
+      .forEach(([time, value]) => {
+        levelDataFrame.add({
+          Time: Number(time),
+          Value: value,
+        });
       });
-    }
 
     results.push(levelDataFrame);
   });
@@ -272,3 +273,39 @@ export const getLogsVolumeDataSourceInfo = (dataFrames: DataFrame[]): { name: st
 export const isLogsVolumeLimited = (dataFrames: DataFrame[]) => {
   return dataFrames[0]?.meta?.custom?.logsVolumeType === LogsVolumeType.Limited;
 };
+
+export const copyText = async (text: string, buttonRef: React.MutableRefObject<Element | null>) => {
+  if (navigator.clipboard && window.isSecureContext) {
+    return navigator.clipboard.writeText(text);
+  } else {
+    // Use a fallback method for browsers/contexts that don't support the Clipboard API.
+    // See https://web.dev/async-clipboard/#feature-detection.
+    // Use textarea so the user can copy multi-line content.
+    const textarea = document.createElement('textarea');
+    // Normally we'd append this to the body. However if we're inside a focus manager
+    // from react-aria, we can't focus anything outside of the managed area.
+    // Instead, let's append it to the button. Then we're guaranteed to be able to focus + copy.
+    buttonRef.current?.appendChild(textarea);
+    textarea.value = text;
+    textarea.focus();
+    textarea.select();
+    document.execCommand('copy');
+    textarea.remove();
+  }
+};
+
+export function targetIsElement(target: EventTarget | null): target is Element {
+  return target instanceof Element;
+}
+
+export function createLogRowsMap() {
+  const logRowsSet = new Set();
+  return function (target: LogRowModel): boolean {
+    let id = `${target.dataFrame.refId}_${target.rowId ? target.rowId : `${target.timeEpochNs}_${target.entry}`}`;
+    if (logRowsSet.has(id)) {
+      return true;
+    }
+    logRowsSet.add(id);
+    return false;
+  };
+}
diff --git a/public/app/features/manage-dashboards/DashboardImportPage.tsx b/public/app/features/manage-dashboards/DashboardImportPage.tsx
index 16266303ca33a..2a60019e4adfd 100644
--- a/public/app/features/manage-dashboards/DashboardImportPage.tsx
+++ b/public/app/features/manage-dashboards/DashboardImportPage.tsx
@@ -8,14 +8,11 @@ import { config, reportInteraction } from '@grafana/runtime';
 import {
   Button,
   Field,
-  Form,
-  HorizontalGroup,
   Input,
   Spinner,
   stylesFactory,
   TextArea,
   Themeable2,
-  VerticalGroup,
   FileDropzone,
   withTheme2,
   DropzoneFile,
@@ -23,8 +20,10 @@ import {
   LinkButton,
   TextLink,
   Label,
+  Stack,
 } from '@grafana/ui';
 import appEvents from 'app/core/app_events';
+import { Form } from 'app/core/components/Form/Form';
 import { Page } from 'app/core/components/Page/Page';
 import { t, Trans } from 'app/core/internationalization';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
@@ -208,14 +207,14 @@ class UnthemedDashboardImport extends PureComponent<Props> {
                     placeholder={JSON_PLACEHOLDER}
                   />
                 </Field>
-                <HorizontalGroup>
+                <Stack>
                   <Button type="submit" data-testid={selectors.components.DashboardImportPage.submit}>
                     <Trans i18nKey="dashboard-import.form-actions.load">Load</Trans>
                   </Button>
                   <LinkButton variant="secondary" href={`${config.appSubUrl}/dashboards`}>
                     <Trans i18nKey="dashboard-import.form-actions.cancel">Cancel</Trans>
                   </LinkButton>
-                </HorizontalGroup>
+                </Stack>
               </>
             )}
           </Form>
@@ -236,11 +235,11 @@ class UnthemedDashboardImport extends PureComponent<Props> {
       <Page navId="dashboards/browse" pageNav={this.pageNav}>
         <Page.Contents>
           {loadingState === LoadingState.Loading && (
-            <VerticalGroup justify="center">
-              <HorizontalGroup justify="center">
+            <Stack direction={'column'} justifyContent="center">
+              <Stack justifyContent="center">
                 <Spinner size="xxl" />
-              </HorizontalGroup>
-            </VerticalGroup>
+              </Stack>
+            </Stack>
           )}
           {[LoadingState.Error, LoadingState.NotStarted].includes(loadingState) && this.renderImportForm()}
           {loadingState === LoadingState.Done && <ImportDashboardOverview />}
diff --git a/public/app/features/manage-dashboards/components/ImportDashboardForm.tsx b/public/app/features/manage-dashboards/components/ImportDashboardForm.tsx
index b49f9c1ca4e76..8cb50e12a576b 100644
--- a/public/app/features/manage-dashboards/components/ImportDashboardForm.tsx
+++ b/public/app/features/manage-dashboards/components/ImportDashboardForm.tsx
@@ -1,18 +1,9 @@
 import React, { useEffect, useState } from 'react';
+import { Controller, FieldErrors, UseFormReturn } from 'react-hook-form';
 
 import { selectors } from '@grafana/e2e-selectors';
 import { ExpressionDatasourceRef } from '@grafana/runtime/src/utils/DataSourceWithBackend';
-import {
-  Button,
-  Field,
-  FormAPI,
-  FormFieldErrors,
-  FormsOnSubmit,
-  HorizontalGroup,
-  Input,
-  InputControl,
-  Legend,
-} from '@grafana/ui';
+import { Button, Field, FormFieldErrors, FormsOnSubmit, Stack, Input, Legend } from '@grafana/ui';
 import { OldFolderPicker } from 'app/core/components/Select/OldFolderPicker';
 import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker';
 
@@ -27,11 +18,11 @@ import { validateTitle, validateUid } from '../utils/validation';
 
 import { ImportDashboardLibraryPanelsList } from './ImportDashboardLibraryPanelsList';
 
-interface Props extends Pick<FormAPI<ImportDashboardDTO>, 'register' | 'errors' | 'control' | 'getValues' | 'watch'> {
+interface Props extends Pick<UseFormReturn<ImportDashboardDTO>, 'register' | 'control' | 'getValues' | 'watch'> {
   uidReset: boolean;
   inputs: DashboardInputs;
   initialFolderUid: string;
-
+  errors: FieldErrors<ImportDashboardDTO>;
   onCancel: () => void;
   onUidReset: () => void;
   onSubmit: FormsOnSubmit<ImportDashboardDTO>;
@@ -80,7 +71,7 @@ export const ImportDashboardForm = ({
         />
       </Field>
       <Field label="Folder">
-        <InputControl
+        <Controller
           render={({ field: { ref, ...field } }) => (
             <OldFolderPicker {...field} enableCreateNew initialFolderUid={initialFolderUid} />
           )}
@@ -123,7 +114,7 @@ export const ImportDashboardForm = ({
               invalid={errors.dataSources && !!errors.dataSources[index]}
               error={errors.dataSources && errors.dataSources[index] && 'A data source is required'}
             >
-              <InputControl
+              <Controller
                 name={dataSourceOption}
                 render={({ field: { ref, ...field } }) => (
                   <DataSourcePicker
@@ -166,7 +157,7 @@ export const ImportDashboardForm = ({
         description="List of existing library panels. These panels are not affected by the import."
         folderName={watchFolder.title}
       />
-      <HorizontalGroup>
+      <Stack>
         <Button
           type="submit"
           data-testid={selectors.components.ImportDashboardForm.submit}
@@ -180,7 +171,7 @@ export const ImportDashboardForm = ({
         <Button type="reset" variant="secondary" onClick={onCancel}>
           Cancel
         </Button>
-      </HorizontalGroup>
+      </Stack>
     </>
   );
 };
diff --git a/public/app/features/manage-dashboards/components/ImportDashboardOverview.tsx b/public/app/features/manage-dashboards/components/ImportDashboardOverview.tsx
index 5b9273cbe4ed4..7ead582344700 100644
--- a/public/app/features/manage-dashboards/components/ImportDashboardOverview.tsx
+++ b/public/app/features/manage-dashboards/components/ImportDashboardOverview.tsx
@@ -3,7 +3,8 @@ import { connect, ConnectedProps } from 'react-redux';
 
 import { dateTimeFormat } from '@grafana/data';
 import { locationService, reportInteraction } from '@grafana/runtime';
-import { Form, Legend } from '@grafana/ui';
+import { Box, Legend } from '@grafana/ui';
+import { Form } from 'app/core/components/Form/Form';
 import { StoreState } from 'app/types';
 
 import { clearLoadedDashboard, importDashboard } from '../state/actions';
@@ -64,7 +65,7 @@ class ImportDashboardOverviewUnConnected extends PureComponent<Props, State> {
     return (
       <>
         {source === DashboardSource.Gcom && (
-          <div style={{ marginBottom: '24px' }}>
+          <Box marginBottom={3}>
             <div>
               <Legend>
                 Importing dashboard from{' '}
@@ -90,7 +91,7 @@ class ImportDashboardOverviewUnConnected extends PureComponent<Props, State> {
                 </tr>
               </tbody>
             </table>
-          </div>
+          </Box>
         )}
         <Form
           onSubmit={this.onSubmit}
diff --git a/public/app/features/manage-dashboards/components/PublicDashboardListTable/DeletePublicDashboardButton.tsx b/public/app/features/manage-dashboards/components/PublicDashboardListTable/DeletePublicDashboardButton.tsx
index 69a3e93643a98..14ece574fdb5f 100644
--- a/public/app/features/manage-dashboards/components/PublicDashboardListTable/DeletePublicDashboardButton.tsx
+++ b/public/app/features/manage-dashboards/components/PublicDashboardListTable/DeletePublicDashboardButton.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 
 import { Button, ModalsController, ButtonProps } from '@grafana/ui/src';
+import { t } from 'app/core/internationalization';
 import { useDeletePublicDashboardMutation } from 'app/features/dashboard/api/publicDashboardApi';
 import { DashboardModel } from 'app/features/dashboard/state/DashboardModel';
 
@@ -39,24 +40,30 @@ export const DeletePublicDashboardButton = ({
 
   return (
     <ModalsController>
-      {({ showModal, hideModal }) => (
-        <Button
-          aria-label="Revoke public URL"
-          title="Revoke public URL"
-          onClick={() =>
-            showModal(DeletePublicDashboardModal, {
-              dashboardTitle: publicDashboard.title,
-              onConfirm: () => onDeletePublicDashboardClick(publicDashboard, hideModal),
-              onDismiss: () => {
-                onDismiss ? onDismiss() : hideModal();
-              },
-            })
-          }
-          {...rest}
-        >
-          {isLoading && loader ? loader : children}
-        </Button>
-      )}
+      {({ showModal, hideModal }) => {
+        const translatedRevocationButtonText = t(
+          'public-dashboard-list.button.revoke-button-text',
+          'Revoke public URL'
+        );
+        return (
+          <Button
+            aria-label={translatedRevocationButtonText}
+            title={translatedRevocationButtonText}
+            onClick={() =>
+              showModal(DeletePublicDashboardModal, {
+                dashboardTitle: publicDashboard.title,
+                onConfirm: () => onDeletePublicDashboardClick(publicDashboard, hideModal),
+                onDismiss: () => {
+                  onDismiss ? onDismiss() : hideModal();
+                },
+              })
+            }
+            {...rest}
+          >
+            {isLoading && loader ? loader : children}
+          </Button>
+        );
+      }}
     </ModalsController>
   );
 };
diff --git a/public/app/features/manage-dashboards/components/PublicDashboardListTable/DeletePublicDashboardModal.tsx b/public/app/features/manage-dashboards/components/PublicDashboardListTable/DeletePublicDashboardModal.tsx
index bcdfc8ec6c8d7..cdcd2639fa7a7 100644
--- a/public/app/features/manage-dashboards/components/PublicDashboardListTable/DeletePublicDashboardModal.tsx
+++ b/public/app/features/manage-dashboards/components/PublicDashboardListTable/DeletePublicDashboardModal.tsx
@@ -3,6 +3,7 @@ import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data/src';
 import { ConfirmModal, useStyles2 } from '@grafana/ui/src';
+import { t } from 'app/core/internationalization';
 
 const Body = ({ title }: { title?: string }) => {
   const styles = useStyles2(getStyles);
@@ -10,8 +11,14 @@ const Body = ({ title }: { title?: string }) => {
   return (
     <p className={styles.description}>
       {title
-        ? 'Are you sure you want to revoke this URL? The dashboard will no longer be public.'
-        : 'Orphaned public dashboard will no longer be public.'}
+        ? t(
+            'public-dashboard.delete-modal.revoke-nonorphaned-body-text',
+            'Are you sure you want to revoke this URL? The dashboard will no longer be public.'
+          )
+        : t(
+            'public-dashboard.delete-modal.revoke-orphaned-body-text',
+            'Orphaned public dashboard will no longer be public.'
+          )}
     </p>
   );
 };
@@ -24,17 +31,20 @@ export const DeletePublicDashboardModal = ({
   dashboardTitle?: string;
   onConfirm: () => void;
   onDismiss: () => void;
-}) => (
-  <ConfirmModal
-    isOpen
-    body={<Body title={dashboardTitle} />}
-    onConfirm={onConfirm}
-    onDismiss={onDismiss}
-    title="Revoke public URL"
-    icon="trash-alt"
-    confirmText="Revoke public URL"
-  />
-);
+}) => {
+  const translatedRevocationModalText = t('public-dashboard.delete-modal.revoke-title', 'Revoke public URL');
+  return (
+    <ConfirmModal
+      isOpen
+      body={<Body title={dashboardTitle} />}
+      onConfirm={onConfirm}
+      onDismiss={onDismiss}
+      title={translatedRevocationModalText}
+      icon="trash-alt"
+      confirmText={translatedRevocationModalText}
+    />
+  );
+};
 
 const getStyles = (theme: GrafanaTheme2) => ({
   title: css`
diff --git a/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.test.tsx b/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.test.tsx
index 0b1337781cb5c..f98ecb38cdab7 100644
--- a/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.test.tsx
+++ b/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.test.tsx
@@ -1,8 +1,8 @@
+import 'whatwg-fetch';
 import { render, screen, waitForElementToBeRemoved, within } from '@testing-library/react';
-import { rest } from 'msw';
+import { http, HttpResponse } from 'msw';
 import { setupServer } from 'msw/node';
 import React from 'react';
-import 'whatwg-fetch';
 import { BrowserRouter } from 'react-router-dom';
 import { TestProvider } from 'test/helpers/TestProvider';
 import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
@@ -22,6 +22,7 @@ const publicDashboardListResponse: PublicDashboardListResponse[] = [
     title: 'New dashboardasdf',
     dashboardUid: 'iF36Qb6nz',
     isEnabled: false,
+    slug: 'new-dashboardasdf',
   },
   {
     uid: 'EuiEbd3nz',
@@ -29,6 +30,7 @@ const publicDashboardListResponse: PublicDashboardListResponse[] = [
     title: 'New dashboard',
     dashboardUid: 'kFlxbd37k',
     isEnabled: true,
+    slug: 'new-dashboard',
   },
 ];
 
@@ -39,6 +41,7 @@ const orphanedDashboardListResponse: PublicDashboardListResponse[] = [
     title: '',
     dashboardUid: '',
     isEnabled: false,
+    slug: '',
   },
   {
     uid: 'EuiEbd3nz2',
@@ -46,6 +49,7 @@ const orphanedDashboardListResponse: PublicDashboardListResponse[] = [
     title: '',
     dashboardUid: '',
     isEnabled: true,
+    slug: '',
   },
 ];
 
@@ -56,10 +60,13 @@ const paginationResponse: Omit<PublicDashboardListWithPaginationResponse, 'publi
 };
 
 const server = setupServer(
-  rest.get('/api/dashboards/public-dashboards', (_, res, ctx) =>
-    res(ctx.status(200), ctx.json({ ...paginationResponse, publicDashboards: publicDashboardListResponse }))
+  http.get('/api/dashboards/public-dashboards', () =>
+    HttpResponse.json({
+      ...paginationResponse,
+      publicDashboards: publicDashboardListResponse,
+    })
   ),
-  rest.delete('/api/dashboards/uid/:dashboardUid/public-dashboards/:uid', (_, res, ctx) => res(ctx.status(200)))
+  http.delete('/api/dashboards/uid/:dashboardUid/public-dashboards/:uid', () => HttpResponse.json({}))
 );
 
 jest.mock('@grafana/runtime', () => ({
@@ -118,8 +125,8 @@ describe('Show table', () => {
     };
 
     server.use(
-      rest.get('/api/dashboards/public-dashboards', (req, res, ctx) => {
-        return res(ctx.status(200), ctx.json(emptyListRS));
+      http.get('/api/dashboards/public-dashboards', () => {
+        return HttpResponse.json(emptyListRS);
       })
     );
 
@@ -167,8 +174,8 @@ describe('Orphaned public dashboard', () => {
       publicDashboards: [...publicDashboardListResponse, ...orphanedDashboardListResponse],
     };
     server.use(
-      rest.get('/api/dashboards/public-dashboards', (req, res, ctx) => {
-        return res(ctx.status(200), ctx.json(response));
+      http.get('/api/dashboards/public-dashboards', () => {
+        return HttpResponse.json(response);
       })
     );
     jest.spyOn(contextSrv, 'hasPermission').mockReturnValue(true);
diff --git a/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.tsx b/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.tsx
index 0129b64e244a9..5486f77cf7547 100644
--- a/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.tsx
+++ b/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.tsx
@@ -18,6 +18,7 @@ import {
   HorizontalGroup,
 } from '@grafana/ui/src';
 import { Page } from 'app/core/components/Page/Page';
+import { Trans, t } from 'app/core/internationalization';
 import { contextSrv } from 'app/core/services/context_srv';
 import {
   useListPublicDashboardsQuery,
@@ -57,6 +58,7 @@ const PublicDashboardCard = ({ pd }: { pd: PublicDashboardListResponse }) => {
   };
 
   const CardActions = useMemo(() => (isMobile ? Card.Actions : Card.SecondaryActions), [isMobile]);
+  const translatedPauseSharingText = t('public-dashboard-list.toggle.pause-sharing-toggle-text', 'Pause sharing');
 
   return (
     <Card className={styles.card} href={!isOrphaned ? `/d/${pd.dashboardUid}` : undefined}>
@@ -64,9 +66,17 @@ const PublicDashboardCard = ({ pd }: { pd: PublicDashboardListResponse }) => {
         {!isOrphaned ? (
           <span>{pd.title}</span>
         ) : (
-          <Tooltip content="The linked dashboard has already been deleted" placement="top">
+          <Tooltip
+            content={t(
+              'public-dashboard-list.dashboard-title.orphaned-tooltip',
+              'The linked dashboard has already been deleted'
+            )}
+            placement="top"
+          >
             <div className={styles.orphanedTitle}>
-              <span>Orphaned public dashboard</span>
+              <Trans i18nKey="public-dashboard-list.dashboard-title.orphaned-title">
+                <span>Orphaned public dashboard</span>
+              </Trans>
               <Icon name="info-circle" />
             </div>
           </Tooltip>
@@ -76,7 +86,7 @@ const PublicDashboardCard = ({ pd }: { pd: PublicDashboardListResponse }) => {
         <div className={styles.pauseSwitch}>
           <Switch
             value={!pd.isEnabled}
-            label="Pause sharing"
+            label={translatedPauseSharingText}
             disabled={isUpdateLoading}
             onChange={(e) => {
               reportInteraction('grafana_dashboards_public_enable_clicked', {
@@ -86,7 +96,7 @@ const PublicDashboardCard = ({ pd }: { pd: PublicDashboardListResponse }) => {
             }}
             data-testid={selectors.ListItem.pauseSwitch}
           />
-          <span>Pause sharing</span>
+          <span>{translatedPauseSharingText}</span>
         </div>
         <LinkButton
           disabled={isOrphaned}
@@ -97,7 +107,7 @@ const PublicDashboardCard = ({ pd }: { pd: PublicDashboardListResponse }) => {
           color={theme.colors.warning.text}
           href={generatePublicDashboardUrl(pd.accessToken)}
           key="public-dashboard-url"
-          tooltip="View public dashboard"
+          tooltip={t('public-dashboard-list.button.view-button-tooltip', 'View public dashboard')}
           data-testid={selectors.ListItem.linkButton}
         />
         <LinkButton
@@ -106,9 +116,9 @@ const PublicDashboardCard = ({ pd }: { pd: PublicDashboardListResponse }) => {
           icon="cog"
           variant="secondary"
           color={theme.colors.warning.text}
-          href={generatePublicDashboardConfigUrl(pd.dashboardUid)}
+          href={generatePublicDashboardConfigUrl(pd.dashboardUid, pd.slug)}
           key="public-dashboard-config-url"
-          tooltip="Configure public dashboard"
+          tooltip={t('public-dashboard-list.button.config-button-tooltip', 'Configure public dashboard')}
           data-testid={selectors.ListItem.configButton}
         />
         {hasWritePermissions && (
@@ -117,7 +127,7 @@ const PublicDashboardCard = ({ pd }: { pd: PublicDashboardListResponse }) => {
             icon="trash-alt"
             variant="secondary"
             publicDashboard={pd}
-            tooltip="Revoke public dashboard url"
+            tooltip={t('public-dashboard-list.button.revoke-button-tooltip', 'Revoke public dashboard URL')}
             loader={<Spinner />}
             data-testid={selectors.ListItem.trashcanButton}
           />
diff --git a/public/app/features/manage-dashboards/components/SnapshotListTable.tsx b/public/app/features/manage-dashboards/components/SnapshotListTable.tsx
index 843a37b17e606..37e1d7d03c3bb 100644
--- a/public/app/features/manage-dashboards/components/SnapshotListTable.tsx
+++ b/public/app/features/manage-dashboards/components/SnapshotListTable.tsx
@@ -1,15 +1,16 @@
 import React, { useState, useCallback } from 'react';
 import useAsync from 'react-use/lib/useAsync';
 
-import { getBackendSrv, config } from '@grafana/runtime';
-import { ConfirmModal, Button, LinkButton } from '@grafana/ui';
+import { config } from '@grafana/runtime';
+import { ConfirmModal } from '@grafana/ui';
 import { Trans } from 'app/core/internationalization';
+import { getDashboardSnapshotSrv, Snapshot } from 'app/features/dashboard/services/SnapshotSrv';
 
-import { Snapshot } from '../types';
+import { SnapshotListTableRow } from './SnapshotListTableRow';
 
 export function getSnapshots() {
-  return getBackendSrv()
-    .get('/api/dashboard/snapshots')
+  return getDashboardSnapshotSrv()
+    .getSnapshots()
     .then((result: Snapshot[]) => {
       return result.map((snapshot) => ({
         ...snapshot,
@@ -19,9 +20,12 @@ export function getSnapshots() {
 }
 export const SnapshotListTable = () => {
   const [snapshots, setSnapshots] = useState<Snapshot[]>([]);
+  const [isFetching, setIsFetching] = useState(false);
   const [removeSnapshot, setRemoveSnapshot] = useState<Snapshot | undefined>();
   useAsync(async () => {
+    setIsFetching(true);
     const response = await getSnapshots();
+    setIsFetching(false);
     setSnapshots(response);
   }, [setSnapshots]);
 
@@ -29,8 +33,8 @@ export const SnapshotListTable = () => {
     async (snapshot: Snapshot) => {
       const filteredSnapshots = snapshots.filter((ss) => ss.key !== snapshot.key);
       setSnapshots(filteredSnapshots);
-      await getBackendSrv()
-        .delete(`/api/snapshots/${snapshot.key}`)
+      await getDashboardSnapshotSrv()
+        .deleteSnapshot(snapshot.key)
         .catch(() => {
           setSnapshots(snapshots);
         });
@@ -59,34 +63,21 @@ export const SnapshotListTable = () => {
           </tr>
         </thead>
         <tbody>
-          {snapshots.map((snapshot) => {
-            const url = snapshot.externalUrl || snapshot.url;
-            return (
-              <tr key={snapshot.key}>
-                <td>
-                  <a href={url}>{snapshot.name}</a>
-                </td>
-                <td>
-                  <a href={url}>{url}</a>
-                </td>
-                <td>
-                  {snapshot.external && (
-                    <span className="query-keyword">
-                      <Trans i18nKey="snapshot.external-badge">External</Trans>
-                    </span>
-                  )}
-                </td>
-                <td className="text-center">
-                  <LinkButton href={url} variant="secondary" size="sm" icon="eye">
-                    <Trans i18nKey="snapshot.view-button">View</Trans>
-                  </LinkButton>
-                </td>
-                <td className="text-right">
-                  <Button variant="destructive" size="sm" icon="times" onClick={() => setRemoveSnapshot(snapshot)} />
-                </td>
-              </tr>
-            );
-          })}
+          {isFetching ? (
+            <>
+              <SnapshotListTableRow.Skeleton />
+              <SnapshotListTableRow.Skeleton />
+              <SnapshotListTableRow.Skeleton />
+            </>
+          ) : (
+            snapshots.map((snapshot) => (
+              <SnapshotListTableRow
+                key={snapshot.key}
+                snapshot={snapshot}
+                onRemove={() => setRemoveSnapshot(snapshot)}
+              />
+            ))
+          )}
         </tbody>
       </table>
 
diff --git a/public/app/features/manage-dashboards/components/SnapshotListTableRow.test.tsx b/public/app/features/manage-dashboards/components/SnapshotListTableRow.test.tsx
new file mode 100644
index 0000000000000..df6b5bc95f81c
--- /dev/null
+++ b/public/app/features/manage-dashboards/components/SnapshotListTableRow.test.tsx
@@ -0,0 +1,100 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { Snapshot } from 'app/features/dashboard/services/SnapshotSrv';
+
+import { SnapshotListTableRow } from './SnapshotListTableRow';
+
+describe('SnapshotListTableRow', () => {
+  const mockOnRemove = jest.fn();
+  const mockSnapshot = {
+    key: 'test',
+    name: 'Test Snapshot',
+    url: 'http://test.com',
+    external: false,
+  };
+
+  it('renders correctly', () => {
+    render(
+      <table>
+        <tbody>
+          <SnapshotListTableRow snapshot={mockSnapshot} onRemove={mockOnRemove} />
+        </tbody>
+      </table>
+    );
+    expect(screen.getByRole('row')).toBeInTheDocument();
+    expect(screen.getByRole('cell', { name: mockSnapshot.name })).toBeInTheDocument();
+    expect(screen.getByRole('cell', { name: mockSnapshot.url })).toBeInTheDocument();
+    expect(screen.queryByRole('cell', { name: 'External' })).not.toBeInTheDocument();
+  });
+
+  it('adds the correct href to the name, url and view buttons', () => {
+    render(
+      <table>
+        <tbody>
+          <SnapshotListTableRow snapshot={mockSnapshot} onRemove={mockOnRemove} />
+        </tbody>
+      </table>
+    );
+    const nameLink = screen.getByRole('link', { name: mockSnapshot.name });
+    const urlLink = screen.getByRole('link', { name: mockSnapshot.url });
+    const viewButton = screen.getByRole('link', { name: 'View' });
+
+    expect(nameLink).toHaveAttribute('href', mockSnapshot.url);
+    expect(urlLink).toHaveAttribute('href', mockSnapshot.url);
+    expect(viewButton).toHaveAttribute('href', mockSnapshot.url);
+  });
+
+  it('calls onRemove when delete button is clicked', async () => {
+    render(
+      <table>
+        <tbody>
+          <SnapshotListTableRow snapshot={mockSnapshot} onRemove={mockOnRemove} />
+        </tbody>
+      </table>
+    );
+    await userEvent.click(screen.getByRole('button'));
+    expect(mockOnRemove).toHaveBeenCalled();
+  });
+
+  describe('for an external snapshot', () => {
+    let mockSnapshotWithExternal: Snapshot;
+
+    beforeEach(() => {
+      mockSnapshotWithExternal = {
+        ...mockSnapshot,
+        external: true,
+        externalUrl: 'http://external.com',
+      };
+    });
+
+    it('renders the external badge', () => {
+      render(
+        <table>
+          <tbody>
+            <SnapshotListTableRow snapshot={mockSnapshotWithExternal} onRemove={mockOnRemove} />
+          </tbody>
+        </table>
+      );
+      expect(screen.getByRole('cell', { name: 'External' })).toBeInTheDocument();
+    });
+
+    it('uses the external href for the name, url and view buttons', () => {
+      render(
+        <table>
+          <tbody>
+            <SnapshotListTableRow snapshot={mockSnapshotWithExternal} onRemove={mockOnRemove} />
+          </tbody>
+        </table>
+      );
+      const nameLink = screen.getByRole('link', { name: mockSnapshotWithExternal.name });
+      const urlLink = screen.getByRole('link', { name: mockSnapshotWithExternal.externalUrl });
+      const viewButton = screen.getByRole('link', { name: 'View' });
+
+      expect(nameLink).toHaveAttribute('href', mockSnapshotWithExternal.externalUrl);
+      expect(urlLink).toHaveAttribute('href', mockSnapshotWithExternal.externalUrl);
+      expect(viewButton).toHaveAttribute('href', mockSnapshotWithExternal.externalUrl);
+    });
+  });
+});
diff --git a/public/app/features/manage-dashboards/components/SnapshotListTableRow.tsx b/public/app/features/manage-dashboards/components/SnapshotListTableRow.tsx
new file mode 100644
index 0000000000000..9a9209ffc620f
--- /dev/null
+++ b/public/app/features/manage-dashboards/components/SnapshotListTableRow.tsx
@@ -0,0 +1,73 @@
+import { css } from '@emotion/css';
+import React from 'react';
+import Skeleton from 'react-loading-skeleton';
+
+import { Button, LinkButton, useStyles2 } from '@grafana/ui';
+import { SkeletonComponent, attachSkeleton } from '@grafana/ui/src/unstable';
+import { Trans } from 'app/core/internationalization';
+import { Snapshot } from 'app/features/dashboard/services/SnapshotSrv';
+
+export interface Props {
+  snapshot: Snapshot;
+  onRemove: () => void;
+}
+
+const SnapshotListTableRowComponent = ({ snapshot, onRemove }: Props) => {
+  const url = snapshot.externalUrl || snapshot.url;
+  return (
+    <tr>
+      <td>
+        <a href={url}>{snapshot.name}</a>
+      </td>
+      <td>
+        <a href={url}>{url}</a>
+      </td>
+      <td>
+        {snapshot.external && (
+          <span className="query-keyword">
+            <Trans i18nKey="snapshot.external-badge">External</Trans>
+          </span>
+        )}
+      </td>
+      <td className="text-center">
+        <LinkButton href={url} variant="secondary" size="sm" icon="eye">
+          <Trans i18nKey="snapshot.view-button">View</Trans>
+        </LinkButton>
+      </td>
+      <td className="text-right">
+        <Button variant="destructive" size="sm" icon="times" onClick={onRemove} />
+      </td>
+    </tr>
+  );
+};
+
+const SnapshotListTableRowSkeleton: SkeletonComponent = ({ rootProps }) => {
+  const styles = useStyles2(getSkeletonStyles);
+  return (
+    <tr {...rootProps}>
+      <td>
+        <Skeleton width={80} />
+      </td>
+      <td>
+        <Skeleton width={240} />
+      </td>
+      <td></td>
+      <td>
+        <Skeleton width={63} height={24} containerClassName={styles.blockSkeleton} />
+      </td>
+      <td>
+        <Skeleton width={22} height={24} containerClassName={styles.blockSkeleton} />
+      </td>
+    </tr>
+  );
+};
+
+export const SnapshotListTableRow = attachSkeleton(SnapshotListTableRowComponent, SnapshotListTableRowSkeleton);
+
+const getSkeletonStyles = () => ({
+  blockSkeleton: css({
+    // needed to align correctly in the table
+    display: 'block',
+    lineHeight: 1,
+  }),
+});
diff --git a/public/app/features/manage-dashboards/state/actions.test.ts b/public/app/features/manage-dashboards/state/actions.test.ts
index 1b9f123473ffe..209bae2ec9e05 100644
--- a/public/app/features/manage-dashboards/state/actions.test.ts
+++ b/public/app/features/manage-dashboards/state/actions.test.ts
@@ -1,8 +1,8 @@
 import { thunkTester } from 'test/core/thunk/thunkTester';
 
 import { DataSourceInstanceSettings, ThresholdsMode } from '@grafana/data';
-import { BackendSrv, setBackendSrv } from '@grafana/runtime';
 import { defaultDashboard, FieldColorModeId } from '@grafana/schema';
+import { browseDashboardsAPI } from 'app/features/browse-dashboards/api/browseDashboardsAPI';
 import { getLibraryPanel } from 'app/features/library-panels/state/api';
 
 import { PanelModel } from '../../dashboard/state';
@@ -20,6 +20,15 @@ const mocks = {
 
 describe('importDashboard', () => {
   it('Should send data source uid', async () => {
+    // note: the actual action returned is more complicated
+    // but we don't really care about the return type in this test
+    // we're only testing that the correct data is passed to initiate
+    const mockAction = jest.fn().mockImplementation(() => ({
+      type: 'foo',
+    }));
+    const importDashboardRtkQueryMock = jest
+      .spyOn(browseDashboardsAPI.endpoints.importDashboard, 'initiate')
+      .mockImplementation(mockAction);
     const form: ImportDashboardDTO = {
       title: 'Asda',
       uid: '12',
@@ -40,17 +49,6 @@ describe('importDashboard', () => {
       },
     };
 
-    let postArgs: any;
-
-    setBackendSrv({
-      post: (url, args) => {
-        postArgs = args;
-        return Promise.resolve({
-          importedUrl: '/my/dashboard',
-        });
-      },
-    } as BackendSrv);
-
     await thunkTester({
       importDashboard: {
         ...initialImportDashboardState,
@@ -70,7 +68,7 @@ describe('importDashboard', () => {
       .givenThunk(importDashboard)
       .whenThunkIsDispatched(form);
 
-    expect(postArgs).toEqual({
+    expect(importDashboardRtkQueryMock).toHaveBeenCalledWith({
       dashboard: {
         title: 'Asda',
         uid: '12',
diff --git a/public/app/features/manage-dashboards/state/actions.ts b/public/app/features/manage-dashboards/state/actions.ts
index 5474afacf21f5..8d0cae653769f 100644
--- a/public/app/features/manage-dashboards/state/actions.ts
+++ b/public/app/features/manage-dashboards/state/actions.ts
@@ -1,10 +1,11 @@
-import { DataSourceInstanceSettings, locationUtil } from '@grafana/data';
-import { getBackendSrv, getDataSourceSrv, isFetchError, locationService } from '@grafana/runtime';
+import { DataSourceInstanceSettings } from '@grafana/data';
+import { getBackendSrv, getDataSourceSrv, isFetchError } from '@grafana/runtime';
 import { notifyApp } from 'app/core/actions';
 import { createErrorNotification } from 'app/core/copy/appNotification';
+import { browseDashboardsAPI, ImportInputs } from 'app/features/browse-dashboards/api/browseDashboardsAPI';
 import { SaveDashboardCommand } from 'app/features/dashboard/components/SaveDashboard/types';
 import { dashboardWatcher } from 'app/features/live/dashboard/dashboardWatcher';
-import { DashboardDTO, FolderInfo, PermissionLevelString, SearchQueryType, ThunkResult } from 'app/types';
+import { FolderInfo, PermissionLevelString, SearchQueryType, ThunkResult } from 'app/types';
 
 import {
   Input,
@@ -200,7 +201,7 @@ export function importDashboard(importDashboardForm: ImportDashboardDTO): ThunkR
     const dashboard = getState().importDashboard.dashboard;
     const inputs = getState().importDashboard.inputs;
 
-    let inputsToPersist = [] as any[];
+    const inputsToPersist: ImportInputs[] = [];
     importDashboardForm.dataSources?.forEach((dataSource: DataSourceInstanceSettings, index: number) => {
       const input = inputs.dataSources[index];
       inputsToPersist.push({
@@ -221,18 +222,17 @@ export function importDashboard(importDashboardForm: ImportDashboardDTO): ThunkR
       });
     });
 
-    const result = await getBackendSrv().post('api/dashboards/import', {
-      // uid: if user changed it, take the new uid from importDashboardForm,
-      // else read it from original dashboard
-      // by default the uid input is disabled, onSubmit ignores values from disabled inputs
-      dashboard: { ...dashboard, title: importDashboardForm.title, uid: importDashboardForm.uid || dashboard.uid },
-      overwrite: true,
-      inputs: inputsToPersist,
-      folderUid: importDashboardForm.folder.uid,
-    });
-
-    const dashboardUrl = locationUtil.stripBaseFromUrl(result.importedUrl);
-    locationService.push(dashboardUrl);
+    dispatch(
+      browseDashboardsAPI.endpoints.importDashboard.initiate({
+        // uid: if user changed it, take the new uid from importDashboardForm,
+        // else read it from original dashboard
+        // by default the uid input is disabled, onSubmit ignores values from disabled inputs
+        dashboard: { ...dashboard, title: importDashboardForm.title, uid: importDashboardForm.uid || dashboard.uid },
+        overwrite: true,
+        inputs: inputsToPersist,
+        folderUid: importDashboardForm.folder.uid,
+      })
+    );
   };
 }
 
@@ -282,60 +282,6 @@ export async function moveFolders(folderUIDs: string[], toFolder: FolderInfo) {
   return result;
 }
 
-export function moveDashboards(dashboardUids: string[], toFolder: FolderInfo) {
-  const tasks = [];
-
-  for (const uid of dashboardUids) {
-    tasks.push(createTask(moveDashboard, true, uid, toFolder));
-  }
-
-  return executeInOrder(tasks).then((result: any) => {
-    return {
-      totalCount: result.length,
-      successCount: result.filter((res: any) => res.succeeded).length,
-      alreadyInFolderCount: result.filter((res: any) => res.alreadyInFolder).length,
-    };
-  });
-}
-
-async function moveDashboard(uid: string, toFolder: FolderInfo) {
-  const fullDash: DashboardDTO = await getBackendSrv().get(`/api/dashboards/uid/${uid}`);
-
-  if (
-    ((fullDash.meta.folderUid === undefined || fullDash.meta.folderUid === null) && toFolder.uid === '') ||
-    fullDash.meta.folderUid === toFolder.uid
-  ) {
-    return { alreadyInFolder: true };
-  }
-
-  const options = {
-    dashboard: fullDash.dashboard,
-    folderUid: toFolder.uid,
-    overwrite: false,
-  };
-
-  try {
-    await saveDashboard(options);
-    return { succeeded: true };
-  } catch (err) {
-    if (isFetchError(err)) {
-      if (err.data?.status !== 'plugin-dashboard') {
-        return { succeeded: false };
-      }
-
-      err.isHandled = true;
-    }
-    options.overwrite = true;
-
-    try {
-      await saveDashboard(options);
-      return { succeeded: true };
-    } catch (e) {
-      return { succeeded: false };
-    }
-  }
-}
-
 function createTask(fn: (...args: any[]) => Promise<any>, ignoreRejections: boolean, ...args: any[]) {
   return async (result: any) => {
     try {
diff --git a/public/app/features/manage-dashboards/types.ts b/public/app/features/manage-dashboards/types.ts
index 48bd056afb797..fc73951ec362f 100644
--- a/public/app/features/manage-dashboards/types.ts
+++ b/public/app/features/manage-dashboards/types.ts
@@ -2,20 +2,6 @@ import { Dashboard } from '@grafana/schema/src/veneer/dashboard.types';
 
 import { ExternalDashboard } from '../dashboard/components/DashExportModal/DashboardExporter';
 
-export interface Snapshot {
-  created: string;
-  expires: string;
-  external: boolean;
-  externalUrl: string;
-  id: number;
-  key: string;
-  name: string;
-  orgId: number;
-  updated: string;
-  url?: string;
-  userId: number;
-}
-
 export type DeleteDashboardResponse = {
   id: number;
   message: string;
@@ -34,6 +20,7 @@ export interface PublicDashboardListResponse {
   accessToken: string;
   dashboardUid: string;
   title: string;
+  slug: string;
   isEnabled: boolean;
 }
 
diff --git a/public/app/features/migrate-to-cloud/MigrateToCloud.tsx b/public/app/features/migrate-to-cloud/MigrateToCloud.tsx
new file mode 100644
index 0000000000000..1b0b16628c6c6
--- /dev/null
+++ b/public/app/features/migrate-to-cloud/MigrateToCloud.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+
+import { config } from '@grafana/runtime';
+import { Page } from 'app/core/components/Page/Page';
+
+import { Page as CloudPage } from './cloud/Page';
+import { Page as OnPremPage } from './onprem/Page';
+
+export default function MigrateToCloud() {
+  return <Page navId="migrate-to-cloud">{config.cloudMigrationIsTarget ? <CloudPage /> : <OnPremPage />}</Page>;
+}
diff --git a/public/app/features/migrate-to-cloud/api.ts b/public/app/features/migrate-to-cloud/api.ts
new file mode 100644
index 0000000000000..0b8261144eee0
--- /dev/null
+++ b/public/app/features/migrate-to-cloud/api.ts
@@ -0,0 +1,214 @@
+import { BaseQueryFn, createApi } from '@reduxjs/toolkit/query/react';
+import { lastValueFrom } from 'rxjs';
+
+import { BackendSrvRequest, getBackendSrv } from '@grafana/runtime';
+
+interface RequestOptions extends BackendSrvRequest {
+  manageError?: (err: unknown) => { error: unknown };
+  showErrorAlert?: boolean;
+}
+
+function createBackendSrvBaseQuery({ baseURL }: { baseURL: string }): BaseQueryFn<RequestOptions> {
+  async function backendSrvBaseQuery(requestOptions: RequestOptions) {
+    try {
+      const { data: responseData, ...meta } = await lastValueFrom(
+        getBackendSrv().fetch({
+          ...requestOptions,
+          url: baseURL + requestOptions.url,
+          showErrorAlert: requestOptions.showErrorAlert,
+        })
+      );
+      return { data: responseData, meta };
+    } catch (error) {
+      return requestOptions.manageError ? requestOptions.manageError(error) : { error };
+    }
+  }
+
+  return backendSrvBaseQuery;
+}
+
+interface MigrateToCloudStatusDTO {
+  enabled: boolean;
+  stackURL?: string;
+}
+
+interface CreateMigrationTokenResponseDTO {
+  token: string;
+}
+
+export interface ConnectStackDTO {
+  stackURL: string;
+  token: string;
+}
+
+export interface MigrationResourceDTO {
+  uid: string;
+  status: 'not-migrated' | 'migrated' | 'migrating' | 'failed';
+  statusMessage?: string;
+  type: 'datasource' | 'dashboard'; // TODO: in future this would be a discriminated union with the resource details
+  resource: {
+    uid: string;
+    name: string;
+    type: string;
+    icon?: string;
+  };
+}
+
+const mockApplications = ['auth-service', 'web server', 'backend'];
+const mockEnvs = ['DEV', 'PROD'];
+const mockRoles = ['db', 'load-balancer', 'server', 'logs'];
+const mockDataSources = ['Prometheus', 'Loki', 'AWS Athena', 'AWS Cloudwatch', 'InfluxDB', 'Elasticsearch'];
+
+const mockDataSourceMetadata: Record<string, { image: string }> = {
+  Prometheus: {
+    image: 'https://grafana.com/api/plugins/prometheus/versions/5.0.0/logos/small',
+  },
+
+  Loki: {
+    image: 'https://grafana.com/api/plugins/loki/versions/5.0.0/logos/small',
+  },
+
+  'AWS Athena': {
+    image: 'https://grafana.com/api/plugins/grafana-athena-datasource/versions/2.13.5/logos/small',
+  },
+
+  'AWS Cloudwatch': {
+    image: 'https://grafana.com/api/plugins/computest-cloudwatchalarm-datasource/versions/2.0.0/logos/small',
+  },
+
+  InfluxDB: {
+    image: 'https://grafana.com/api/plugins/influxdb/versions/5.0.0/logos/small',
+  },
+
+  Elasticsearch: {
+    image: 'https://grafana.com/api/plugins/elasticsearch/versions/5.0.0/logos/small',
+  },
+};
+
+const mockMigrationResources: MigrationResourceDTO[] = Array.from({ length: 500 }).map((_, index) => {
+  const dataSource = mockDataSources[index % mockDataSources.length];
+  const environment = mockEnvs[index % mockEnvs.length];
+  const application = mockApplications[index % mockApplications.length];
+  const role = mockRoles[index % mockRoles.length];
+
+  return {
+    status: 'not-migrated',
+    type: 'datasource',
+    uid: index.toString(16),
+    resource: {
+      uid: `${application}-${environment}-${role}-${index}`,
+      name: `${application} ${environment} ${role}`,
+      icon: mockDataSourceMetadata[dataSource]?.image,
+      type: dataSource,
+    },
+  };
+});
+
+mockMigrationResources[0].status = 'migrated';
+mockMigrationResources[1].status = 'failed';
+mockMigrationResources[1].statusMessage = `Source map error: Error: request failed with status 404
+Resource URL: http://localhost:3000/public/build/app.f4d0c6a0daa6a5b14892.js
+Source Map URL: app.f4d0c6a0daa6a5b14892.js.map`;
+mockMigrationResources[2].status = 'migrated';
+mockMigrationResources[3].status = 'migrated';
+mockMigrationResources[4].status = 'migrating';
+mockMigrationResources[5].status = 'migrating';
+
+// TODO remove these mock properties/functions
+const queryParams = new URLSearchParams(window.location.search);
+const MOCK_DELAY_MS = 1000;
+const MOCK_TOKEN = 'TODO_thisWillBeABigLongToken';
+let HAS_MIGRATION_TOKEN = false;
+let HAS_STACK_DETAILS = !!queryParams.get('mockStackURL');
+let STACK_URL: string | undefined = queryParams.get('mockStackURL') || undefined;
+
+function dataWithMockDelay<T>(data: T): Promise<{ data: T }> {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve({ data });
+    }, MOCK_DELAY_MS);
+  });
+}
+
+export const migrateToCloudAPI = createApi({
+  tagTypes: ['migrationToken', 'stackDetails', 'resource'],
+  reducerPath: 'migrateToCloudAPI',
+  baseQuery: createBackendSrvBaseQuery({ baseURL: '/api' }),
+  endpoints: (builder) => ({
+    // TODO :)
+    getStatus: builder.query<MigrateToCloudStatusDTO, void>({
+      providesTags: ['stackDetails'],
+      queryFn: () => {
+        const responseData: MigrateToCloudStatusDTO = { enabled: HAS_STACK_DETAILS };
+        if (STACK_URL) {
+          responseData.stackURL = STACK_URL;
+        }
+        return dataWithMockDelay(responseData);
+      },
+    }),
+
+    connectStack: builder.mutation<void, ConnectStackDTO>({
+      invalidatesTags: ['stackDetails'],
+      queryFn: async ({ stackURL }) => {
+        HAS_STACK_DETAILS = true;
+        STACK_URL = stackURL;
+        return dataWithMockDelay(undefined);
+      },
+    }),
+
+    disconnectStack: builder.mutation<void, void>({
+      invalidatesTags: ['stackDetails'],
+      queryFn: async () => {
+        HAS_STACK_DETAILS = false;
+        return dataWithMockDelay(undefined);
+      },
+    }),
+
+    createMigrationToken: builder.mutation<CreateMigrationTokenResponseDTO, void>({
+      invalidatesTags: ['migrationToken'],
+      queryFn: async () => {
+        HAS_MIGRATION_TOKEN = true;
+        return dataWithMockDelay({ token: MOCK_TOKEN });
+      },
+    }),
+
+    deleteMigrationToken: builder.mutation<void, void>({
+      invalidatesTags: ['migrationToken'],
+      queryFn: async () => {
+        HAS_MIGRATION_TOKEN = false;
+        return dataWithMockDelay(undefined);
+      },
+    }),
+
+    hasMigrationToken: builder.query<boolean, void>({
+      providesTags: ['migrationToken'],
+      queryFn: async () => {
+        return dataWithMockDelay(HAS_MIGRATION_TOKEN);
+      },
+    }),
+
+    startMigration: builder.mutation<void, void>({
+      queryFn: async () => {
+        return dataWithMockDelay(undefined);
+      },
+    }),
+
+    listResources: builder.query<MigrationResourceDTO[], void>({
+      providesTags: ['resource'],
+      queryFn: async () => {
+        return dataWithMockDelay(mockMigrationResources);
+      },
+    }),
+  }),
+});
+
+export const {
+  useGetStatusQuery,
+  useConnectStackMutation,
+  useDisconnectStackMutation,
+  useCreateMigrationTokenMutation,
+  useDeleteMigrationTokenMutation,
+  useHasMigrationTokenQuery,
+  useListResourcesQuery,
+  useStartMigrationMutation,
+} = migrateToCloudAPI;
diff --git a/public/app/features/migrate-to-cloud/cloud/InfoPane.tsx b/public/app/features/migrate-to-cloud/cloud/InfoPane.tsx
new file mode 100644
index 0000000000000..a15b52128646b
--- /dev/null
+++ b/public/app/features/migrate-to-cloud/cloud/InfoPane.tsx
@@ -0,0 +1,75 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Box, Stack, TextLink, useStyles2 } from '@grafana/ui';
+import { t, Trans } from 'app/core/internationalization';
+
+import { InfoItem } from '../shared/InfoItem';
+
+export const InfoPane = () => {
+  const styles = useStyles2(getStyles);
+
+  return (
+    <Box alignItems="flex-start" display="flex" padding={2} gap={2} direction="column" backgroundColor="secondary">
+      <InfoItem
+        title={t('migrate-to-cloud.migrate-to-this-stack.title', 'Migrate configuration to this stack')}
+        linkTitle={t('migrate-to-cloud.migrate-to-this-stack.link-title', 'View the full migration guide')}
+        linkHref="https://grafana.com/docs/grafana-cloud/account-management/migration-guide"
+      >
+        <Trans i18nKey="migrate-to-cloud.migrate-to-this-stack.body">
+          Some configuration from your self-managed Grafana instance can be automatically copied to this cloud stack.
+        </Trans>
+      </InfoItem>
+      <InfoItem
+        title={t('migrate-to-cloud.get-started.title', 'How to get started')}
+        linkTitle={t('migrate-to-cloud.get-started.link-title', 'Learn more about Private Data Source Connect')}
+        linkHref="https://grafana.com/docs/grafana-cloud/connect-externally-hosted/private-data-source-connect"
+      >
+        <Stack direction="column" gap={2}>
+          <Trans i18nKey="migrate-to-cloud.get-started.body">
+            The migration process must be started from your self-managed Grafana instance.
+          </Trans>
+          <ol className={styles.list}>
+            <li>
+              <Trans i18nKey="migrate-to-cloud.get-started.step-1">
+                Log in to your self-managed instance and navigate to Administration, General, Migrate to Grafana Cloud.
+              </Trans>
+            </li>
+            <li>
+              <Trans i18nKey="migrate-to-cloud.get-started.step-2">
+                Select &quot;Migrate this instance to Cloud&quot;.
+              </Trans>
+            </li>
+            <li>
+              <Trans i18nKey="migrate-to-cloud.get-started.step-3">
+                You&apos;ll be prompted for a migration token. Generate one from this screen.
+              </Trans>
+            </li>
+            <li>
+              <Trans i18nKey="migrate-to-cloud.get-started.step-4">
+                In your self-managed instance, select &quot;Upload everything&quot; to upload data sources and
+                dashboards to this cloud stack.
+              </Trans>
+            </li>
+            <li>
+              <Trans i18nKey="migrate-to-cloud.get-started.step-5">
+                If some of your data sources will not work over the public internet, you’ll need to install Private Data
+                Source Connect in your self-managed environment.
+              </Trans>
+            </li>
+          </ol>
+        </Stack>
+      </InfoItem>
+      <TextLink href="/connections/private-data-source-connections">
+        {t('migrate-to-cloud.get-started.configure-pdc-link', 'Configure PDC for this stack')}
+      </TextLink>
+    </Box>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  list: css({
+    padding: 'revert',
+  }),
+});
diff --git a/public/app/features/migrate-to-cloud/cloud/MigrationTokenPane/DeleteMigrationTokenModal.tsx b/public/app/features/migrate-to-cloud/cloud/MigrationTokenPane/DeleteMigrationTokenModal.tsx
new file mode 100644
index 0000000000000..3d98e6374efd1
--- /dev/null
+++ b/public/app/features/migrate-to-cloud/cloud/MigrationTokenPane/DeleteMigrationTokenModal.tsx
@@ -0,0 +1,45 @@
+import React, { useState } from 'react';
+
+import { Modal, Button, Text } from '@grafana/ui';
+import { Trans, t } from 'app/core/internationalization';
+
+interface Props {
+  hideModal: () => void;
+  onConfirm: () => Promise<{ data: void } | { error: unknown }>;
+}
+
+export const DeleteMigrationTokenModal = ({ hideModal, onConfirm }: Props) => {
+  const [isDeleting, setIsDeleting] = useState(false);
+
+  const onConfirmDelete = async () => {
+    setIsDeleting(true);
+    await onConfirm();
+    setIsDeleting(false);
+    hideModal();
+  };
+
+  return (
+    <Modal
+      isOpen
+      title={t('migrate-to-cloud.migration-token.delete-modal-title', 'Delete migration token')}
+      onDismiss={hideModal}
+    >
+      <Text color="secondary">
+        <Trans i18nKey="migrate-to-cloud.migration-token.delete-modal-body">
+          If you&apos;ve already used this token with a self-managed installation, that installation will no longer be
+          able to upload content.
+        </Trans>
+      </Text>
+      <Modal.ButtonRow>
+        <Button variant="secondary" onClick={hideModal}>
+          <Trans i18nKey="migrate-to-cloud.migration-token.delete-modal-cancel">Cancel</Trans>
+        </Button>
+        <Button disabled={isDeleting} variant="destructive" onClick={onConfirmDelete}>
+          {isDeleting
+            ? t('migrate-to-cloud.migration-token.delete-modal-deleting', 'Deleting...')
+            : t('migrate-to-cloud.migration-token.delete-modal-confirm', 'Delete')}
+        </Button>
+      </Modal.ButtonRow>
+    </Modal>
+  );
+};
diff --git a/public/app/features/migrate-to-cloud/cloud/MigrationTokenPane/MigrationTokenModal.tsx b/public/app/features/migrate-to-cloud/cloud/MigrationTokenPane/MigrationTokenModal.tsx
new file mode 100644
index 0000000000000..70a61593e01f4
--- /dev/null
+++ b/public/app/features/migrate-to-cloud/cloud/MigrationTokenPane/MigrationTokenModal.tsx
@@ -0,0 +1,45 @@
+import React, { useId } from 'react';
+
+import { Modal, Button, Input, Stack, ClipboardButton, Field } from '@grafana/ui';
+import { Trans, t } from 'app/core/internationalization';
+
+interface Props {
+  hideModal: () => void;
+  migrationToken: string;
+}
+
+export const MigrationTokenModal = ({ hideModal, migrationToken }: Props) => {
+  const inputId = useId();
+
+  return (
+    <Modal
+      isOpen
+      title={t('migrate-to-cloud.migration-token.modal-title', 'Migration token created')}
+      onDismiss={hideModal}
+    >
+      <Field
+        description={t(
+          'migrate-to-cloud.migration-token.modal-field-description',
+          'Copy the token now as you will not be able to see it again. Losing a token requires creating a new one.'
+        )}
+        htmlFor={inputId}
+        label={t('migrate-to-cloud.migration-token.modal-field-label', 'Token')}
+      >
+        <Stack>
+          <Input id={inputId} value={migrationToken} readOnly />
+          <ClipboardButton icon="clipboard-alt" getText={() => migrationToken}>
+            <Trans i18nKey="migrate-to-cloud.migration-token.modal-copy-button">Copy to clipboard</Trans>
+          </ClipboardButton>
+        </Stack>
+      </Field>
+      <Modal.ButtonRow>
+        <Button variant="secondary" onClick={hideModal}>
+          <Trans i18nKey="migrate-to-cloud.migration-token.modal-close">Close</Trans>
+        </Button>
+        <ClipboardButton variant="primary" getText={() => migrationToken} onClipboardCopy={hideModal}>
+          <Trans i18nKey="migrate-to-cloud.migration-token.modal-copy-and-close">Copy to clipboard and close</Trans>
+        </ClipboardButton>
+      </Modal.ButtonRow>
+    </Modal>
+  );
+};
diff --git a/public/app/features/migrate-to-cloud/cloud/MigrationTokenPane/MigrationTokenPane.tsx b/public/app/features/migrate-to-cloud/cloud/MigrationTokenPane/MigrationTokenPane.tsx
new file mode 100644
index 0000000000000..884eaf46bc9d2
--- /dev/null
+++ b/public/app/features/migrate-to-cloud/cloud/MigrationTokenPane/MigrationTokenPane.tsx
@@ -0,0 +1,72 @@
+import React from 'react';
+
+import { Box, Button, ModalsController, Text } from '@grafana/ui';
+import { t, Trans } from 'app/core/internationalization';
+
+import { useCreateMigrationTokenMutation, useDeleteMigrationTokenMutation, useHasMigrationTokenQuery } from '../../api';
+import { InfoItem } from '../../shared/InfoItem';
+
+import { DeleteMigrationTokenModal } from './DeleteMigrationTokenModal';
+import { MigrationTokenModal } from './MigrationTokenModal';
+import { TokenStatus } from './TokenStatus';
+
+export const MigrationTokenPane = () => {
+  const { data: hasToken, isFetching } = useHasMigrationTokenQuery();
+  const [createToken, createTokenResponse] = useCreateMigrationTokenMutation();
+  const [deleteToken, deleteTokenResponse] = useDeleteMigrationTokenMutation();
+
+  return (
+    <ModalsController>
+      {({ showModal, hideModal }) => (
+        <Box display="flex" alignItems="flex-start" padding={2} gap={2} direction="column" backgroundColor="secondary">
+          <InfoItem title={t('migrate-to-cloud.migration-token.title', 'Migration token')}>
+            <Trans i18nKey="migrate-to-cloud.migration-token.body">
+              Your self-managed Grafana instance will require a special authentication token to securely connect to this
+              cloud stack.
+            </Trans>
+          </InfoItem>
+          <Text color="secondary">
+            <Trans i18nKey="migrate-to-cloud.migration-token.status">
+              Current status:{' '}
+              <TokenStatus
+                hasToken={Boolean(hasToken)}
+                isFetching={isFetching || createTokenResponse.isLoading || deleteTokenResponse.isLoading}
+              />
+            </Trans>
+          </Text>
+          {hasToken ? (
+            <Button
+              variant="destructive"
+              onClick={() =>
+                showModal(DeleteMigrationTokenModal, {
+                  hideModal,
+                  onConfirm: deleteToken,
+                })
+              }
+              disabled={isFetching || deleteTokenResponse.isLoading}
+            >
+              <Trans i18nKey="migrate-to-cloud.migration-token.delete-button">Delete this migration token</Trans>
+            </Button>
+          ) : (
+            <Button
+              disabled={createTokenResponse.isLoading || isFetching}
+              onClick={async () => {
+                const response = await createToken();
+                if ('data' in response) {
+                  showModal(MigrationTokenModal, {
+                    hideModal,
+                    migrationToken: response.data.token,
+                  });
+                }
+              }}
+            >
+              {createTokenResponse.isLoading
+                ? t('migrate-to-cloud.migration-token.generate-button-loading', 'Generating a migration token...')
+                : t('migrate-to-cloud.migration-token.generate-button', 'Generate a migration token')}
+            </Button>
+          )}
+        </Box>
+      )}
+    </ModalsController>
+  );
+};
diff --git a/public/app/features/migrate-to-cloud/cloud/MigrationTokenPane/TokenStatus.tsx b/public/app/features/migrate-to-cloud/cloud/MigrationTokenPane/TokenStatus.tsx
new file mode 100644
index 0000000000000..a907d06dfe290
--- /dev/null
+++ b/public/app/features/migrate-to-cloud/cloud/MigrationTokenPane/TokenStatus.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import Skeleton from 'react-loading-skeleton';
+
+import { Text } from '@grafana/ui';
+import { Trans } from 'app/core/internationalization';
+
+interface Props {
+  hasToken: boolean;
+  isFetching: boolean;
+}
+
+export const TokenStatus = ({ hasToken, isFetching }: Props) => {
+  if (isFetching) {
+    return <Skeleton width={100} />;
+  }
+
+  return hasToken ? (
+    <Text color="success">
+      <Trans i18nKey="migrate-to-cloud.token-status.active">Token created and active</Trans>
+    </Text>
+  ) : (
+    <Trans i18nKey="migrate-to-cloud.token-status.no-active">No active token</Trans>
+  );
+};
diff --git a/public/app/features/migrate-to-cloud/cloud/Page.tsx b/public/app/features/migrate-to-cloud/cloud/Page.tsx
new file mode 100644
index 0000000000000..4ae3676ae67e2
--- /dev/null
+++ b/public/app/features/migrate-to-cloud/cloud/Page.tsx
@@ -0,0 +1,34 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Grid, useStyles2 } from '@grafana/ui';
+
+import { InfoPane } from './InfoPane';
+import { MigrationTokenPane } from './MigrationTokenPane/MigrationTokenPane';
+
+export const Page = () => {
+  const styles = useStyles2(getStyles);
+
+  return (
+    <div className={styles.container}>
+      <Grid
+        alignItems="flex-start"
+        gap={1}
+        columns={{
+          xs: 1,
+          lg: 2,
+        }}
+      >
+        <InfoPane />
+        <MigrationTokenPane />
+      </Grid>
+    </div>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  container: css({
+    maxWidth: theme.breakpoints.values.xl,
+  }),
+});
diff --git a/public/app/features/migrate-to-cloud/fixtures/mswAPI.ts b/public/app/features/migrate-to-cloud/fixtures/mswAPI.ts
new file mode 100644
index 0000000000000..d8b9748e52557
--- /dev/null
+++ b/public/app/features/migrate-to-cloud/fixtures/mswAPI.ts
@@ -0,0 +1,15 @@
+import { HttpResponse, http } from 'msw';
+import { SetupServer, setupServer } from 'msw/node';
+
+export function registerAPIHandlers(): SetupServer {
+  const server = setupServer(
+    // TODO
+    http.get('/api/cloudmigration/status', () => {
+      return HttpResponse.json({
+        enabled: false,
+      });
+    })
+  );
+
+  return server;
+}
diff --git a/public/app/features/migrate-to-cloud/onprem/DisconnectModal.tsx b/public/app/features/migrate-to-cloud/onprem/DisconnectModal.tsx
new file mode 100644
index 0000000000000..30cd42b507f0d
--- /dev/null
+++ b/public/app/features/migrate-to-cloud/onprem/DisconnectModal.tsx
@@ -0,0 +1,56 @@
+import React, { useCallback } from 'react';
+
+import { Alert, ConfirmModal, Stack } from '@grafana/ui';
+import { Trans, t } from 'app/core/internationalization';
+
+import { useDisconnectStackMutation } from '../api';
+
+interface Props {
+  isOpen: boolean;
+  onDismiss: () => void;
+}
+
+export const DisconnectModal = ({ isOpen, onDismiss }: Props) => {
+  const [disconnectStack, { isLoading, isError }] = useDisconnectStackMutation();
+
+  const handleConfirm = useCallback(async () => {
+    const resp = await disconnectStack();
+    if (!('error' in resp)) {
+      onDismiss();
+    }
+  }, [disconnectStack, onDismiss]);
+
+  const confirmBody = (
+    <Stack direction="column">
+      {isError && (
+        <Alert
+          severity="error"
+          title={t('migrate-to-cloud.disconnect-modal.error', 'There was an error disconnecting')}
+        />
+      )}
+      <div>
+        <Trans i18nKey="migrate-to-cloud.disconnect-modal.body">
+          This will remove the migration token from this installation. If you wish to upload more resources in the
+          future, you will need to enter a new migration token.
+        </Trans>
+      </div>
+    </Stack>
+  );
+
+  return (
+    <ConfirmModal
+      isOpen={isOpen}
+      title={t('migrate-to-cloud.disconnect-modal.title', 'Disconnect from cloud stack')}
+      body={<></>} // body is mandatory prop, but i don't wanna
+      description={confirmBody}
+      confirmText={
+        isLoading
+          ? t('migrate-to-cloud.disconnect-modal.disconnecting', 'Disconnecting...')
+          : t('migrate-to-cloud.disconnect-modal.disconnect', 'Disconnect')
+      }
+      dismissText={t('migrate-to-cloud.disconnect-modal.cancel', 'Cancel')}
+      onConfirm={handleConfirm}
+      onDismiss={onDismiss}
+    />
+  );
+};
diff --git a/public/app/features/migrate-to-cloud/onprem/EmptyState/CallToAction/CallToAction.tsx b/public/app/features/migrate-to-cloud/onprem/EmptyState/CallToAction/CallToAction.tsx
new file mode 100644
index 0000000000000..0d3e7e55a270a
--- /dev/null
+++ b/public/app/features/migrate-to-cloud/onprem/EmptyState/CallToAction/CallToAction.tsx
@@ -0,0 +1,36 @@
+import React from 'react';
+
+import { Box, Button, ModalsController, Text } from '@grafana/ui';
+import { Trans } from 'app/core/internationalization';
+
+import { useConnectStackMutation, useGetStatusQuery } from '../../../api';
+
+import { ConnectModal } from './ConnectModal';
+
+export const CallToAction = () => {
+  const [connectStack, connectResponse] = useConnectStackMutation();
+  const { isFetching } = useGetStatusQuery();
+
+  return (
+    <ModalsController>
+      {({ showModal, hideModal }) => (
+        <Box display="flex" padding={5} gap={2} direction="column" alignItems="center" backgroundColor="secondary">
+          <Text variant="h3" textAlignment="center">
+            <Trans i18nKey="migrate-to-cloud.cta.header">Let us manage your Grafana stack</Trans>
+          </Text>
+          <Button
+            disabled={isFetching || connectResponse.isLoading}
+            onClick={() =>
+              showModal(ConnectModal, {
+                hideModal,
+                onConfirm: connectStack,
+              })
+            }
+          >
+            <Trans i18nKey="migrate-to-cloud.cta.button">Migrate this instance to Cloud</Trans>
+          </Button>
+        </Box>
+      )}
+    </ModalsController>
+  );
+};
diff --git a/public/app/features/migrate-to-cloud/onprem/EmptyState/CallToAction/ConnectModal.tsx b/public/app/features/migrate-to-cloud/onprem/EmptyState/CallToAction/ConnectModal.tsx
new file mode 100644
index 0000000000000..24276f8cc7d45
--- /dev/null
+++ b/public/app/features/migrate-to-cloud/onprem/EmptyState/CallToAction/ConnectModal.tsx
@@ -0,0 +1,128 @@
+import { css } from '@emotion/css';
+import React, { useId, useState } from 'react';
+import { SubmitHandler, useForm } from 'react-hook-form';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Modal, Button, Stack, TextLink, Field, Input, Text, useStyles2 } from '@grafana/ui';
+import { Trans, t } from 'app/core/internationalization';
+
+import { ConnectStackDTO } from '../../../api';
+
+interface Props {
+  hideModal: () => void;
+  onConfirm: (connectStackData: ConnectStackDTO) => Promise<{ data: void } | { error: unknown }>;
+}
+
+export const ConnectModal = ({ hideModal, onConfirm }: Props) => {
+  const [isConnecting, setIsConnecting] = useState(false);
+  const cloudStackId = useId();
+  const tokenId = useId();
+  const styles = useStyles2(getStyles);
+
+  const {
+    handleSubmit,
+    register,
+    formState: { errors },
+    watch,
+  } = useForm<ConnectStackDTO>({
+    defaultValues: {
+      stackURL: '',
+      token: '',
+    },
+  });
+
+  const stackURL = watch('stackURL');
+  const token = watch('token');
+
+  const onConfirmConnect: SubmitHandler<ConnectStackDTO> = async (formData) => {
+    setIsConnecting(true);
+    await onConfirm(formData);
+    setIsConnecting(false);
+    hideModal();
+  };
+
+  return (
+    <Modal isOpen title={t('migrate-to-cloud.connect-modal.title', 'Connect to a cloud stack')} onDismiss={hideModal}>
+      <form onSubmit={handleSubmit(onConfirmConnect)}>
+        <Text color="secondary">
+          <Stack direction="column" gap={2} alignItems="flex-start">
+            <Trans i18nKey="migrate-to-cloud.connect-modal.body-get-started">
+              To get started, you&apos;ll need a Grafana.com account.
+            </Trans>
+            <TextLink href="https://grafana.com/auth/sign-up/create-user?pg=prod-cloud" external>
+              {t('migrate-to-cloud.connect-modal.body-sign-up', 'Sign up for a Grafana.com account')}
+            </TextLink>
+            <Trans i18nKey="migrate-to-cloud.connect-modal.body-cloud-stack">
+              You&apos;ll also need a cloud stack. If you just signed up, we&apos;ll automatically create your first
+              stack. If you have an account, you&apos;ll need to select or create a stack.
+            </Trans>
+            <TextLink href="https://grafana.com/auth/sign-in/" external>
+              {t('migrate-to-cloud.connect-modal.body-view-stacks', 'View my cloud stacks')}
+            </TextLink>
+            <Trans i18nKey="migrate-to-cloud.connect-modal.body-paste-stack">
+              Once you&apos;ve decided on a stack, paste the URL below.
+            </Trans>
+            <Field
+              className={styles.field}
+              invalid={!!errors.stackURL}
+              error={errors.stackURL?.message}
+              label={t('migrate-to-cloud.connect-modal.body-url-field', 'Cloud stack URL')}
+              required
+            >
+              <Input
+                {...register('stackURL', {
+                  required: t('migrate-to-cloud.connect-modal.stack-required-error', 'Stack URL is required'),
+                })}
+                id={cloudStackId}
+                placeholder="https://example.grafana.net/"
+              />
+            </Field>
+            <span>
+              <Trans i18nKey="migrate-to-cloud.connect-modal.body-token">
+                Your self-managed Grafana installation needs special access to securely migrate content. You&apos;ll
+                need to create a migration token on your chosen cloud stack.
+              </Trans>
+            </span>
+            <span>
+              <Trans i18nKey="migrate-to-cloud.connect-modal.body-token-instructions">
+                Log into your cloud stack and navigate to Administration, General, Migrate to Grafana Cloud. Create a
+                migration token on that screen and paste the token here.
+              </Trans>
+            </span>
+            <Field
+              className={styles.field}
+              invalid={!!errors.token}
+              error={errors.token?.message}
+              label={t('migrate-to-cloud.connect-modal.body-token-field', 'Migration token')}
+              required
+            >
+              <Input
+                {...register('token', {
+                  required: t('migrate-to-cloud.connect-modal.token-required-error', 'Migration token is required'),
+                })}
+                id={tokenId}
+                placeholder={t('migrate-to-cloud.connect-modal.body-token-field-placeholder', 'Paste token here')}
+              />
+            </Field>
+          </Stack>
+        </Text>
+        <Modal.ButtonRow>
+          <Button variant="secondary" onClick={hideModal}>
+            <Trans i18nKey="migrate-to-cloud.connect-modal.cancel">Cancel</Trans>
+          </Button>
+          <Button type="submit" disabled={isConnecting || !(stackURL && token)}>
+            {isConnecting
+              ? t('migrate-to-cloud.connect-modal.connecting', 'Connecting to this stack...')
+              : t('migrate-to-cloud.connect-modal.connect', 'Connect to this stack')}
+          </Button>
+        </Modal.ButtonRow>
+      </form>
+    </Modal>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  field: css({
+    alignSelf: 'stretch',
+  }),
+});
diff --git a/public/app/features/migrate-to-cloud/onprem/EmptyState/EmptyState.tsx b/public/app/features/migrate-to-cloud/onprem/EmptyState/EmptyState.tsx
new file mode 100644
index 0000000000000..30d714ffd5f15
--- /dev/null
+++ b/public/app/features/migrate-to-cloud/onprem/EmptyState/EmptyState.tsx
@@ -0,0 +1,38 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Grid, Stack, useStyles2 } from '@grafana/ui';
+
+import { CallToAction } from './CallToAction/CallToAction';
+import { InfoPaneLeft } from './InfoPaneLeft';
+import { InfoPaneRight } from './InfoPaneRight';
+
+export const EmptyState = () => {
+  const styles = useStyles2(getStyles);
+
+  return (
+    <div className={styles.container}>
+      <Stack direction="column">
+        <CallToAction />
+        <Grid
+          alignItems="flex-start"
+          gap={1}
+          columns={{
+            xs: 1,
+            lg: 2,
+          }}
+        >
+          <InfoPaneLeft />
+          <InfoPaneRight />
+        </Grid>
+      </Stack>
+    </div>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  container: css({
+    maxWidth: theme.breakpoints.values.xl,
+  }),
+});
diff --git a/public/app/features/migrate-to-cloud/onprem/EmptyState/InfoPaneLeft.tsx b/public/app/features/migrate-to-cloud/onprem/EmptyState/InfoPaneLeft.tsx
new file mode 100644
index 0000000000000..eb2873f1e3d01
--- /dev/null
+++ b/public/app/features/migrate-to-cloud/onprem/EmptyState/InfoPaneLeft.tsx
@@ -0,0 +1,45 @@
+import React from 'react';
+
+import { Box } from '@grafana/ui';
+import { t, Trans } from 'app/core/internationalization';
+
+import { InfoItem } from '../../shared/InfoItem';
+
+export const InfoPaneLeft = () => {
+  return (
+    <Box alignItems="flex-start" display="flex" padding={2} gap={2} direction="column" backgroundColor="secondary">
+      <InfoItem
+        title={t('migrate-to-cloud.what-is-cloud.title', 'What is Grafana Cloud?')}
+        linkTitle={t('migrate-to-cloud.what-is-cloud.link-title', 'Learn about cloud features')}
+        linkHref="https://grafana.com/products/cloud"
+      >
+        <Trans i18nKey="migrate-to-cloud.what-is-cloud.body">
+          Grafana cloud is a fully managed cloud-hosted observability platform ideal for cloud native environments.
+          It&apos;s everything you love about Grafana without the overhead of maintaining, upgrading, and supporting an
+          installation.
+        </Trans>
+      </InfoItem>
+      <InfoItem
+        title={t('migrate-to-cloud.why-host.title', 'Why host with Grafana?')}
+        linkTitle={t('migrate-to-cloud.why-host.link-title', 'More questions? Talk to an expert')}
+        linkHref="https://grafana.com/contact"
+      >
+        <Trans i18nKey="migrate-to-cloud.why-host.body">
+          In addition to the convenience of managed hosting, Grafana Cloud includes many cloud-exclusive features like
+          SLOs, incident management, machine learning, and powerful observability integrations.
+        </Trans>
+      </InfoItem>
+      <InfoItem
+        title={t('migrate-to-cloud.is-it-secure.title', 'Is it secure?')}
+        linkTitle={t('migrate-to-cloud.is-it-secure.link-title', 'Grafana Labs Trust Center')}
+        linkHref="https://trust.grafana.com"
+      >
+        <Trans i18nKey="migrate-to-cloud.is-it-secure.body">
+          Grafana Labs is committed to maintaining the highest standards of data privacy and security. By implementing
+          industry-standard security technologies and procedures, we help protect our customers&apos; data from
+          unauthorized access, use, or disclosure.
+        </Trans>
+      </InfoItem>
+    </Box>
+  );
+};
diff --git a/public/app/features/migrate-to-cloud/onprem/EmptyState/InfoPaneRight.tsx b/public/app/features/migrate-to-cloud/onprem/EmptyState/InfoPaneRight.tsx
new file mode 100644
index 0000000000000..051640b60c70a
--- /dev/null
+++ b/public/app/features/migrate-to-cloud/onprem/EmptyState/InfoPaneRight.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+
+import { Box } from '@grafana/ui';
+import { t, Trans } from 'app/core/internationalization';
+
+import { InfoItem } from '../../shared/InfoItem';
+
+export const InfoPaneRight = () => {
+  return (
+    <Box alignItems="flex-start" display="flex" direction="column" gap={2} padding={2} backgroundColor="secondary">
+      <InfoItem
+        title={t('migrate-to-cloud.pdc.title', 'Not all my data sources are on the public internet')}
+        linkTitle={t('migrate-to-cloud.pdc.link-title', 'Learn about PDC')}
+        linkHref="https://grafana.com/docs/grafana-cloud/connect-externally-hosted/private-data-source-connect"
+      >
+        <Trans i18nKey="migrate-to-cloud.pdc.body">
+          Exposing your data sources to the internet can raise security concerns. Private data source connect (PDC)
+          allows Grafana Cloud to access your existing data sources over a secure network tunnel.
+        </Trans>
+      </InfoItem>
+      <InfoItem
+        title={t('migrate-to-cloud.pricing.title', 'How much does it cost?')}
+        linkTitle={t('migrate-to-cloud.pricing.link-title', 'Grafana Cloud pricing')}
+        linkHref="https://grafana.com/pricing"
+      >
+        <Trans i18nKey="migrate-to-cloud.pricing.body">
+          Grafana Cloud has a generous free plan and a 14 day unlimited usage trial. After your trial expires,
+          you&apos;ll be billed based on usage over the free plan limits.
+        </Trans>
+      </InfoItem>
+      <InfoItem
+        title={t('migrate-to-cloud.can-i-move.title', 'Can I move this installation to Grafana Cloud?')}
+        linkTitle={t('migrate-to-cloud.can-i-move.link-title', 'Learn about migrating other settings')}
+        linkHref="https://grafana.com/docs/grafana-cloud/account-management/migration-guide"
+      >
+        <Trans i18nKey="migrate-to-cloud.can-i-move.body">
+          Once you connect this installation to a cloud stack, you&apos;ll be able to upload data sources and
+          dashboards.
+        </Trans>
+      </InfoItem>
+    </Box>
+  );
+};
diff --git a/public/app/features/migrate-to-cloud/onprem/MigrationInfo.tsx b/public/app/features/migrate-to-cloud/onprem/MigrationInfo.tsx
new file mode 100644
index 0000000000000..3e693303739d4
--- /dev/null
+++ b/public/app/features/migrate-to-cloud/onprem/MigrationInfo.tsx
@@ -0,0 +1,19 @@
+import React, { ReactNode } from 'react';
+
+import { Stack, Text } from '@grafana/ui';
+
+interface MigrationInfoProps {
+  title: NonNullable<ReactNode>;
+  value: NonNullable<ReactNode>;
+}
+
+export function MigrationInfo({ title, value }: MigrationInfoProps) {
+  return (
+    <Stack direction="column">
+      <Text variant="bodySmall" color="secondary">
+        {title}
+      </Text>
+      <Text variant="h4">{value}</Text>
+    </Stack>
+  );
+}
diff --git a/public/app/features/migrate-to-cloud/onprem/Page.tsx b/public/app/features/migrate-to-cloud/onprem/Page.tsx
new file mode 100644
index 0000000000000..fecab6a6b02b2
--- /dev/null
+++ b/public/app/features/migrate-to-cloud/onprem/Page.tsx
@@ -0,0 +1,78 @@
+import { skipToken } from '@reduxjs/toolkit/query/react';
+import React, { useState } from 'react';
+
+import { Alert, Box, Button, Stack } from '@grafana/ui';
+import { Trans, t } from 'app/core/internationalization';
+
+import { useGetStatusQuery, useListResourcesQuery, useStartMigrationMutation } from '../api';
+
+import { DisconnectModal } from './DisconnectModal';
+import { EmptyState } from './EmptyState/EmptyState';
+import { MigrationInfo } from './MigrationInfo';
+import { ResourcesTable } from './ResourcesTable';
+
+export const Page = () => {
+  const { data: status, isFetching } = useGetStatusQuery();
+  const { data: resources } = useListResourcesQuery(status?.enabled ? undefined : skipToken);
+  const [startMigration, { isLoading: startMigrationIsLoading, isError: startMigrationIsError }] =
+    useStartMigrationMutation();
+  const [isDisconnecting, setIsDisconnecting] = useState(false);
+
+  if (!status?.enabled) {
+    return <EmptyState />;
+  }
+
+  const isBusy = isFetching || isDisconnecting || startMigrationIsLoading;
+
+  return (
+    <>
+      <Stack direction="column" gap={4}>
+        {startMigrationIsError && (
+          <Alert
+            severity="error"
+            title={t(
+              'migrate-to-cloud.summary.error-starting-migration',
+              'There was an error starting cloud migration'
+            )}
+          />
+        )}
+
+        {status.stackURL && (
+          <Box
+            borderColor="weak"
+            borderStyle="solid"
+            padding={2}
+            display="flex"
+            gap={4}
+            alignItems="center"
+            justifyContent="space-between"
+          >
+            <MigrationInfo
+              title={t('migrate-to-cloud.summary.target-stack-title', 'Uploading to')}
+              value={
+                <>
+                  {status.stackURL}{' '}
+                  <Button onClick={() => setIsDisconnecting(true)} disabled={isBusy} variant="secondary" size="sm">
+                    <Trans i18nKey="migrate-to-cloud.summary.disconnect">Disconnect</Trans>
+                  </Button>
+                </>
+              }
+            />
+
+            <Button
+              disabled={isBusy}
+              onClick={() => startMigration()}
+              icon={startMigrationIsLoading ? 'spinner' : undefined}
+            >
+              <Trans i18nKey="migrate-to-cloud.summary.start-migration">Upload everything</Trans>
+            </Button>
+          </Box>
+        )}
+
+        {resources && <ResourcesTable resources={resources} />}
+      </Stack>
+
+      <DisconnectModal isOpen={isDisconnecting} onDismiss={() => setIsDisconnecting(false)} />
+    </>
+  );
+};
diff --git a/public/app/features/migrate-to-cloud/onprem/ResourcesTable.tsx b/public/app/features/migrate-to-cloud/onprem/ResourcesTable.tsx
new file mode 100644
index 0000000000000..8806dce5ef58f
--- /dev/null
+++ b/public/app/features/migrate-to-cloud/onprem/ResourcesTable.tsx
@@ -0,0 +1,103 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { InteractiveTable, CellProps, Stack, Text, Icon, useStyles2, Button } from '@grafana/ui';
+import { getSvgSize } from '@grafana/ui/src/components/Icon/utils';
+import { t } from 'app/core/internationalization';
+
+import { MigrationResourceDTO } from '../api';
+
+interface ResourcesTableProps {
+  resources: MigrationResourceDTO[];
+}
+
+const columns = [
+  { id: 'name', header: 'Name', cell: NameCell },
+  { id: 'type', header: 'Type', cell: TypeCell },
+  { id: 'status', header: 'Status', cell: StatusCell },
+];
+
+export function ResourcesTable({ resources }: ResourcesTableProps) {
+  return <InteractiveTable columns={columns} data={resources} getRowId={(r) => r.uid} pageSize={15} />;
+}
+
+function NameCell(props: CellProps<MigrationResourceDTO>) {
+  const data = props.row.original;
+  return (
+    <Stack direction="row" gap={2} alignItems="center">
+      <ResourceIcon resource={data} />
+
+      <Stack direction="column" gap={0}>
+        <span>{data.resource.name}</span>
+        <Text color="secondary">{data.resource.type}</Text>
+      </Stack>
+    </Stack>
+  );
+}
+
+function TypeCell(props: CellProps<MigrationResourceDTO>) {
+  const { type } = props.row.original;
+
+  if (type === 'datasource') {
+    return t('migrate-to-cloud.resource-type.datasource', 'Data source');
+  }
+
+  if (type === 'dashboard') {
+    return t('migrate-to-cloud.resource-type.dashboard', 'Dashboard');
+  }
+
+  return t('migrate-to-cloud.resource-type.unknown', 'Unknown');
+}
+
+function StatusCell(props: CellProps<MigrationResourceDTO>) {
+  const { status, statusMessage } = props.row.original;
+
+  if (status === 'not-migrated') {
+    return <Text color="secondary">{t('migrate-to-cloud.resource-status.not-migrated', 'Not yet uploaded')}</Text>;
+  } else if (status === 'migrating') {
+    return <Text color="info">{t('migrate-to-cloud.resource-status.migrating', 'Uploading...')}</Text>;
+  } else if (status === 'migrated') {
+    return <Text color="success">{t('migrate-to-cloud.resource-status.migrated', 'Uploaded to cloud')}</Text>;
+  } else if (status === 'failed') {
+    return (
+      <Stack alignItems="center">
+        <Text color="error">{t('migrate-to-cloud.resource-status.failed', 'Error')}</Text>
+
+        {statusMessage && (
+          // TODO: trigger a proper modal, probably from the parent, on click
+          <Button size="sm" variant="secondary" onClick={() => window.alert(statusMessage)}>
+            {t('migrate-to-cloud.resource-status.error-details-button', 'Details')}
+          </Button>
+        )}
+      </Stack>
+    );
+  }
+
+  return <Text color="secondary">{t('migrate-to-cloud.resource-status.unknown', 'Unknown')}</Text>;
+}
+
+function ResourceIcon({ resource }: { resource: MigrationResourceDTO }) {
+  const styles = useStyles2(getIconStyles);
+
+  if (resource.type === 'dashboard') {
+    return <Icon size="xl" name="dashboard" />;
+  }
+
+  if (resource.type === 'datasource' && resource.resource.icon) {
+    return <img className={styles.icon} src={resource.resource.icon} alt="" />;
+  } else if (resource.type === 'datasource') {
+    return <Icon size="xl" name="database" />;
+  }
+
+  return undefined;
+}
+
+function getIconStyles() {
+  return {
+    icon: css({
+      display: 'block',
+      width: getSvgSize('xl'),
+      height: getSvgSize('xl'),
+    }),
+  };
+}
diff --git a/public/app/features/migrate-to-cloud/shared/InfoItem.tsx b/public/app/features/migrate-to-cloud/shared/InfoItem.tsx
new file mode 100644
index 0000000000000..3d66495452908
--- /dev/null
+++ b/public/app/features/migrate-to-cloud/shared/InfoItem.tsx
@@ -0,0 +1,24 @@
+import React, { ReactNode } from 'react';
+
+import { Stack, Text, TextLink } from '@grafana/ui';
+
+interface Props {
+  children: NonNullable<ReactNode>;
+  title: string;
+  linkTitle?: string;
+  linkHref?: string;
+}
+
+export const InfoItem = ({ children, title, linkHref, linkTitle }: Props) => {
+  return (
+    <Stack gap={2} direction="column">
+      <Text element="h4">{title}</Text>
+      <Text color="secondary">{children}</Text>
+      {linkHref && (
+        <TextLink href={linkHref} external>
+          {linkTitle ?? linkHref}
+        </TextLink>
+      )}
+    </Stack>
+  );
+};
diff --git a/public/app/features/org/NewOrgPage.tsx b/public/app/features/org/NewOrgPage.tsx
index 2b1864aba594b..db5b672515759 100644
--- a/public/app/features/org/NewOrgPage.tsx
+++ b/public/app/features/org/NewOrgPage.tsx
@@ -2,7 +2,8 @@ import React from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
 import { NavModelItem } from '@grafana/data';
-import { Button, Input, Field, Form, FieldSet } from '@grafana/ui';
+import { Button, Input, Field, FieldSet } from '@grafana/ui';
+import { Form } from 'app/core/components/Form/Form';
 import { Page } from 'app/core/components/Page/Page';
 import { getConfig } from 'app/core/config';
 
diff --git a/public/app/features/org/OrgDetailsPage.test.tsx b/public/app/features/org/OrgDetailsPage.test.tsx
index d36844ac80891..ae10470062043 100644
--- a/public/app/features/org/OrgDetailsPage.test.tsx
+++ b/public/app/features/org/OrgDetailsPage.test.tsx
@@ -5,7 +5,6 @@ import { mockToolkitActionCreator } from 'test/core/redux/mocks';
 import { TestProvider } from 'test/helpers/TestProvider';
 
 import { NavModel } from '@grafana/data';
-import { ModalManager } from 'app/core/services/ModalManager';
 
 import { backendSrv } from '../../core/services/backend_srv';
 import { Organization } from '../../types';
@@ -81,7 +80,6 @@ describe('Render', () => {
   });
 
   it('should show a modal when submitting', async () => {
-    new ModalManager().init();
     setup({
       organization: {
         name: 'Cool org',
diff --git a/public/app/features/org/OrgDetailsPage.tsx b/public/app/features/org/OrgDetailsPage.tsx
index b3340e841ec48..98d181e368f51 100644
--- a/public/app/features/org/OrgDetailsPage.tsx
+++ b/public/app/features/org/OrgDetailsPage.tsx
@@ -1,26 +1,19 @@
 import React, { PureComponent } from 'react';
-import { connect } from 'react-redux';
+import { ConnectedProps, connect } from 'react-redux';
 
-import { NavModel } from '@grafana/data';
 import { VerticalGroup } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import SharedPreferences from 'app/core/components/SharedPreferences/SharedPreferences';
 import { appEvents, contextSrv } from 'app/core/core';
 import { getNavModel } from 'app/core/selectors/navModel';
-import { AccessControlAction, Organization, StoreState } from 'app/types';
+import { AccessControlAction, StoreState } from 'app/types';
 import { ShowConfirmModalEvent } from 'app/types/events';
 
 import OrgProfile from './OrgProfile';
 import { loadOrganization, updateOrganization } from './state/actions';
 import { setOrganizationName } from './state/reducers';
 
-export interface Props {
-  navModel: NavModel;
-  organization: Organization;
-  loadOrganization: typeof loadOrganization;
-  setOrganizationName: typeof setOrganizationName;
-  updateOrganization: typeof updateOrganization;
-}
+interface OwnProps {}
 
 export class OrgDetailsPage extends PureComponent<Props> {
   async componentDidMount() {
@@ -89,4 +82,7 @@ const mapDispatchToProps = {
   updateOrganization,
 };
 
-export default connect(mapStateToProps, mapDispatchToProps)(OrgDetailsPage);
+const connector = connect(mapStateToProps, mapDispatchToProps);
+export type Props = OwnProps & ConnectedProps<typeof connector>;
+
+export default connector(OrgDetailsPage);
diff --git a/public/app/features/org/OrgProfile.tsx b/public/app/features/org/OrgProfile.tsx
index 8988d9cbd1c67..cf65e9c35326f 100644
--- a/public/app/features/org/OrgProfile.tsx
+++ b/public/app/features/org/OrgProfile.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 
-import { Input, Field, FieldSet, Button, Form } from '@grafana/ui';
+import { Input, Field, FieldSet, Button } from '@grafana/ui';
+import { Form } from 'app/core/components/Form/Form';
 import { contextSrv } from 'app/core/core';
 import { AccessControlAction } from 'app/types';
 
diff --git a/public/app/features/org/UserInviteForm.tsx b/public/app/features/org/UserInviteForm.tsx
index 6332c41e180e0..30762cb8816be 100644
--- a/public/app/features/org/UserInviteForm.tsx
+++ b/public/app/features/org/UserInviteForm.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
+import { Controller } from 'react-hook-form';
 
 import { locationUtil, SelectableValue } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
 import { locationService } from '@grafana/runtime';
 import {
   Button,
@@ -9,18 +9,18 @@ import {
   Input,
   Switch,
   RadioButtonGroup,
-  Form,
   Field,
-  InputControl,
   FieldSet,
   Icon,
   TextLink,
   Tooltip,
   Label,
+  Stack,
 } from '@grafana/ui';
 import { getConfig } from 'app/core/config';
 import { OrgRole, useDispatch } from 'app/types';
 
+import { Form } from '../../core/components/Form/Form';
 import { addInvitee } from '../invites/state/actions';
 
 const tooltipMessage = (
@@ -97,7 +97,7 @@ export const UserInviteForm = () => {
                   </Label>
                 }
               >
-                <InputControl
+                <Controller
                   render={({ field: { ref, ...field } }) => <RadioButtonGroup {...field} options={roles} />}
                   control={control}
                   name="role"
diff --git a/public/app/features/org/state/actions.ts b/public/app/features/org/state/actions.ts
index 7b382a71751f7..ee39073640a7c 100644
--- a/public/app/features/org/state/actions.ts
+++ b/public/app/features/org/state/actions.ts
@@ -8,7 +8,7 @@ type OrganizationDependencies = { getBackendSrv: typeof getBackendSrv };
 
 export function loadOrganization(
   dependencies: OrganizationDependencies = { getBackendSrv: getBackendSrv }
-): ThunkResult<any> {
+): ThunkResult<void> {
   return async (dispatch) => {
     const organizationResponse = await dependencies.getBackendSrv().get('/api/org');
     dispatch(organizationLoaded(organizationResponse));
@@ -19,7 +19,7 @@ export function loadOrganization(
 
 export function updateOrganization(
   dependencies: OrganizationDependencies = { getBackendSrv: getBackendSrv }
-): ThunkResult<any> {
+): ThunkResult<void> {
   return async (dispatch, getStore) => {
     const organization = getStore().organization.organization;
 
@@ -33,7 +33,7 @@ export function updateOrganization(
 export function setUserOrganization(
   orgId: number,
   dependencies: OrganizationDependencies = { getBackendSrv: getBackendSrv }
-): ThunkResult<any> {
+): ThunkResult<void> {
   return async (dispatch) => {
     const organizationResponse = await dependencies.getBackendSrv().post('/api/user/using/' + orgId);
 
@@ -44,7 +44,7 @@ export function setUserOrganization(
 export function createOrganization(
   newOrg: { name: string },
   dependencies: OrganizationDependencies = { getBackendSrv: getBackendSrv }
-): ThunkResult<any> {
+): ThunkResult<void> {
   return async (dispatch) => {
     const result = await dependencies.getBackendSrv().post('/api/orgs/', newOrg);
 
diff --git a/public/app/features/panel/components/PanelDataErrorView.tsx b/public/app/features/panel/components/PanelDataErrorView.tsx
index 93c7344d18459..b9cc3ef21b934 100644
--- a/public/app/features/panel/components/PanelDataErrorView.tsx
+++ b/public/app/features/panel/components/PanelDataErrorView.tsx
@@ -8,6 +8,7 @@ import {
   VisualizationSuggestionsBuilder,
   VisualizationSuggestion,
 } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import { PanelDataErrorViewProps, locationService } from '@grafana/runtime';
 import { usePanelContext, useStyles2 } from '@grafana/ui';
 import { CardButton } from 'app/core/components/CardButton';
@@ -66,7 +67,9 @@ export function PanelDataErrorView(props: PanelDataErrorViewProps) {
 
   return (
     <div className={styles.wrapper}>
-      <div className={styles.message}>{message}</div>
+      <div className={styles.message} data-testid={selectors.components.Panels.Panel.PanelDataErrorMessage}>
+        {message}
+      </div>
       {context.app === CoreApp.PanelEditor && dataSummary.hasData && panel && (
         <div className={styles.actions}>
           {props.suggestions && (
diff --git a/public/app/features/panel/components/PanelRenderer.tsx b/public/app/features/panel/components/PanelRenderer.tsx
index b8cb634c1dcea..872e73fb8e4f6 100644
--- a/public/app/features/panel/components/PanelRenderer.tsx
+++ b/public/app/features/panel/components/PanelRenderer.tsx
@@ -107,7 +107,7 @@ export function PanelRenderer<P extends object = {}, F extends object = {}>(prop
   );
 }
 
-function useOptionDefaults<P extends object = {}, F extends object = {}>(
+function useOptionDefaults<P extends Record<string, unknown> = {}, F extends object = {}>(
   plugin: PanelPlugin | undefined,
   options: P,
   fieldConfig: FieldConfigSource<F>
diff --git a/public/app/features/panel/components/VizTypePicker/PanelTypeCard.tsx b/public/app/features/panel/components/VizTypePicker/PanelTypeCard.tsx
index 0065c69721057..ba6bad69f3511 100644
--- a/public/app/features/panel/components/VizTypePicker/PanelTypeCard.tsx
+++ b/public/app/features/panel/components/VizTypePicker/PanelTypeCard.tsx
@@ -1,9 +1,11 @@
 import { css, cx } from '@emotion/css';
 import React, { MouseEventHandler } from 'react';
+import Skeleton from 'react-loading-skeleton';
 
 import { GrafanaTheme2, isUnsignedPluginSignature, PanelPluginMeta, PluginState } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { IconButton, PluginSignatureBadge, useStyles2 } from '@grafana/ui';
+import { SkeletonComponent, attachSkeleton } from '@grafana/ui/src/unstable';
 import { PluginStateInfo } from 'app/features/plugins/components/PluginStateInfo';
 
 interface Props {
@@ -17,7 +19,9 @@ interface Props {
   description?: string;
 }
 
-export const PanelTypeCard = ({
+const IMAGE_SIZE = 38;
+
+const PanelTypeCardComponent = ({
   isCurrent,
   title,
   plugin,
@@ -73,87 +77,128 @@ export const PanelTypeCard = ({
     </div>
   );
 };
+PanelTypeCardComponent.displayName = 'PanelTypeCard';
+
+interface SkeletonProps {
+  hasDescription?: boolean;
+  hasDelete?: boolean;
+}
 
-PanelTypeCard.displayName = 'PanelTypeCard';
+const PanelTypeCardSkeleton: SkeletonComponent<React.PropsWithChildren<SkeletonProps>> = ({
+  children,
+  hasDescription,
+  hasDelete,
+  rootProps,
+}) => {
+  const styles = useStyles2(getStyles);
+  const skeletonStyles = useStyles2(getSkeletonStyles);
+  return (
+    <div className={styles.item} {...rootProps}>
+      <Skeleton className={cx(styles.img, skeletonStyles.image)} width={IMAGE_SIZE} height={IMAGE_SIZE} />
+
+      <div className={styles.itemContent}>
+        <div className={styles.name}>
+          <Skeleton width={160} />
+        </div>
+        {hasDescription ? <Skeleton containerClassName={styles.description} width={80} /> : null}
+        {children}
+      </div>
+      {hasDelete && (
+        <Skeleton containerClassName={cx(styles.deleteButton, skeletonStyles.deleteButton)} width={16} height={16} />
+      )}
+    </div>
+  );
+};
+
+export const PanelTypeCard = attachSkeleton(PanelTypeCardComponent, PanelTypeCardSkeleton);
+
+const getSkeletonStyles = () => {
+  return {
+    deleteButton: css({
+      lineHeight: 1,
+    }),
+    image: css({
+      lineHeight: 1,
+    }),
+  };
+};
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
-    item: css`
-      position: relative;
-      display: flex;
-      flex-shrink: 0;
-      cursor: pointer;
-      background: ${theme.colors.background.secondary};
-      border-radius: ${theme.shape.radius.default};
-      box-shadow: ${theme.shadows.z1};
-      border: 1px solid ${theme.colors.background.secondary};
-      align-items: center;
-      padding: 8px;
-      width: 100%;
-      position: relative;
-      overflow: hidden;
-      transition: ${theme.transitions.create(['background'], {
+    item: css({
+      position: 'relative',
+      display: 'flex',
+      flexShrink: 0,
+      cursor: 'pointer',
+      background: theme.colors.background.secondary,
+      borderRadius: theme.shape.radius.default,
+      boxShadow: theme.shadows.z1,
+      border: `1px solid ${theme.colors.background.secondary}`,
+      alignItems: 'center',
+      padding: theme.spacing(1),
+      width: '100%',
+      overflow: 'hidden',
+      transition: theme.transitions.create(['background'], {
         duration: theme.transitions.duration.short,
-      })};
-
-      &:hover {
-        background: ${theme.colors.emphasize(theme.colors.background.secondary, 0.03)};
-      }
-    `,
-    itemContent: css`
-      overflow: hidden;
-      position: relative;
-      padding: ${theme.spacing(0, 1)};
-    `,
-    itemDisabled: css`
-      cursor: default;
-
-      &,
-      &:hover {
-        background: ${theme.colors.action.disabledBackground};
-      }
-    `,
-    current: css`
-      label: currentVisualizationItem;
-      border: 1px solid ${theme.colors.primary.border};
-      background: ${theme.colors.action.selected};
-    `,
-    disabled: css`
-      opacity: 0.6;
-      filter: grayscale(1);
-      cursor: default;
-      pointer-events: none;
-    `,
-    name: css`
-      text-overflow: ellipsis;
-      overflow: hidden;
-      font-size: ${theme.typography.size.sm};
-      font-weight: ${theme.typography.fontWeightMedium};
-      width: 100%;
-    `,
-    description: css`
-      display: block;
-      text-overflow: ellipsis;
-      overflow: hidden;
-      color: ${theme.colors.text.secondary};
-      font-size: ${theme.typography.bodySmall.fontSize};
-      font-weight: ${theme.typography.fontWeightLight};
-      width: 100%;
-      max-height: 4.5em;
-    `,
-    img: css`
-      max-height: 38px;
-      width: 38px;
-      display: flex;
-      align-items: center;
-    `,
-    badge: css`
-      background: ${theme.colors.background.primary};
-    `,
-    deleteButton: css`
-      cursor: pointer;
-      margin-left: auto;
-    `,
+      }),
+
+      '&:hover': {
+        background: theme.colors.emphasize(theme.colors.background.secondary, 0.03),
+      },
+    }),
+    itemContent: css({
+      overflow: 'hidden',
+      position: 'relative',
+      padding: theme.spacing(0, 1),
+    }),
+    itemDisabled: css({
+      cursor: 'default',
+
+      '&, &:hover': {
+        background: theme.colors.action.disabledBackground,
+      },
+    }),
+    current: css({
+      label: 'currentVisualizationItem',
+      border: `1px solid ${theme.colors.primary.border}`,
+      background: theme.colors.action.selected,
+    }),
+    disabled: css({
+      opacity: 0.6,
+      filter: 'grayscale(1)',
+      cursor: 'default',
+      pointerEvents: 'none',
+    }),
+    name: css({
+      textOverflow: 'ellipsis',
+      overflow: 'hidden',
+      fontSize: theme.typography.size.sm,
+      fontWeight: theme.typography.fontWeightMedium,
+      width: '100%',
+    }),
+    description: css({
+      display: 'block',
+      textOverflow: 'ellipsis',
+      overflow: 'hidden',
+      color: theme.colors.text.secondary,
+      fontSize: theme.typography.bodySmall.fontSize,
+      fontWeight: theme.typography.fontWeightLight,
+      width: '100%',
+      maxHeight: '4.5em',
+    }),
+    img: css({
+      maxHeight: IMAGE_SIZE,
+      width: IMAGE_SIZE,
+      display: 'flex',
+      alignItems: 'center',
+    }),
+    badge: css({
+      background: theme.colors.background.primary,
+    }),
+    deleteButton: css({
+      cursor: 'pointer',
+      marginLeft: 'auto',
+    }),
   };
 };
 
diff --git a/public/app/features/panel/components/VizTypePicker/VisualizationSuggestions.tsx b/public/app/features/panel/components/VizTypePicker/VisualizationSuggestions.tsx
index 1d652287b5f88..94e8a9aaa9fa0 100644
--- a/public/app/features/panel/components/VizTypePicker/VisualizationSuggestions.tsx
+++ b/public/app/features/panel/components/VizTypePicker/VisualizationSuggestions.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { useAsync } from 'react-use';
 import AutoSizer from 'react-virtualized-auto-sizer';
 
-import { GrafanaTheme2, PanelData, PanelPluginMeta, PanelModel, VisualizationSuggestion } from '@grafana/data';
+import { GrafanaTheme2, PanelData, PanelModel, VisualizationSuggestion } from '@grafana/data';
 import { useStyles2 } from '@grafana/ui';
 
 import { getAllSuggestions } from '../../state/getAllSuggestions';
@@ -12,53 +12,55 @@ import { VisualizationSuggestionCard } from './VisualizationSuggestionCard';
 import { VizTypeChangeDetails } from './types';
 
 export interface Props {
-  current: PanelPluginMeta;
+  searchQuery: string;
+  onChange: (options: VizTypeChangeDetails) => void;
   data?: PanelData;
   panel?: PanelModel;
-  onChange: (options: VizTypeChangeDetails) => void;
-  searchQuery: string;
-  onClose: () => void;
 }
 
-export function VisualizationSuggestions({ onChange, data, panel, searchQuery }: Props) {
+export function VisualizationSuggestions({ searchQuery, onChange, data, panel }: Props) {
   const styles = useStyles2(getStyles);
   const { value: suggestions } = useAsync(() => getAllSuggestions(data, panel), [data, panel]);
   const filteredSuggestions = filterSuggestionsBySearch(searchQuery, suggestions);
 
   return (
-    <AutoSizer disableHeight style={{ width: '100%', height: '100%' }}>
-      {({ width }) => {
-        if (!width) {
-          return null;
-        }
+    // This div is needed in some places to make AutoSizer work
+    <div>
+      <AutoSizer disableHeight style={{ width: '100%', height: '100%' }}>
+        {({ width }) => {
+          if (!width) {
+            return null;
+          }
 
-        const columnCount = Math.floor(width / 170);
-        const spaceBetween = 8 * (columnCount! - 1);
-        const previewWidth = (width - spaceBetween) / columnCount!;
+          width = width - 1;
+          const columnCount = Math.floor(width / 200);
+          const spaceBetween = 8 * (columnCount! - 1);
+          const previewWidth = Math.floor((width - spaceBetween) / columnCount!);
 
-        return (
-          <div>
-            <div className={styles.filterRow}>
-              <div className={styles.infoText}>Based on current data</div>
-            </div>
-            <div className={styles.grid} style={{ gridTemplateColumns: `repeat(auto-fill, ${previewWidth - 1}px)` }}>
-              {filteredSuggestions.map((suggestion, index) => (
-                <VisualizationSuggestionCard
-                  key={index}
-                  data={data!}
-                  suggestion={suggestion}
-                  onChange={onChange}
-                  width={previewWidth}
-                />
-              ))}
-              {searchQuery && filteredSuggestions.length === 0 && (
-                <div className={styles.infoText}>No results matched your query</div>
-              )}
+          return (
+            <div>
+              <div className={styles.filterRow}>
+                <div className={styles.infoText}>Based on current data</div>
+              </div>
+              <div className={styles.grid} style={{ gridTemplateColumns: `repeat(auto-fill, ${previewWidth}px)` }}>
+                {filteredSuggestions.map((suggestion, index) => (
+                  <VisualizationSuggestionCard
+                    key={index}
+                    data={data!}
+                    suggestion={suggestion}
+                    onChange={onChange}
+                    width={previewWidth - 1}
+                  />
+                ))}
+                {searchQuery && filteredSuggestions.length === 0 && (
+                  <div className={styles.infoText}>No results matched your query</div>
+                )}
+              </div>
             </div>
-          </div>
-        );
-      }}
-    </AutoSizer>
+          );
+        }}
+      </AutoSizer>
+    </div>
   );
 }
 
diff --git a/public/app/features/panel/components/VizTypePicker/VizTypePicker.tsx b/public/app/features/panel/components/VizTypePicker/VizTypePicker.tsx
index 61e575ce82b16..cf7226261aeb0 100644
--- a/public/app/features/panel/components/VizTypePicker/VizTypePicker.tsx
+++ b/public/app/features/panel/components/VizTypePicker/VizTypePicker.tsx
@@ -1,7 +1,7 @@
 import { css } from '@emotion/css';
 import React, { useMemo } from 'react';
 
-import { GrafanaTheme2, PanelData, PanelPluginMeta } from '@grafana/data';
+import { GrafanaTheme2 } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { EmptySearchResult, useStyles2 } from '@grafana/ui';
 
@@ -11,29 +11,25 @@ import { VizTypePickerPlugin } from './VizTypePickerPlugin';
 import { VizTypeChangeDetails } from './types';
 
 export interface Props {
-  current: PanelPluginMeta;
-  data?: PanelData;
-  onChange: (options: VizTypeChangeDetails) => void;
+  pluginId: string;
   searchQuery: string;
-  onClose: () => void;
+  onChange: (options: VizTypeChangeDetails) => void;
   isWidget?: boolean;
 }
 
-export function VizTypePicker({ searchQuery, onChange, current, data, isWidget = false }: Props) {
+export function VizTypePicker({ pluginId, searchQuery, onChange, isWidget = false }: Props) {
   const styles = useStyles2(getStyles);
-  const pluginsList: PanelPluginMeta[] = useMemo(() => {
+  const pluginsList = useMemo(() => {
     if (config.featureToggles.vizAndWidgetSplit) {
-      if (isWidget) {
-        return getWidgetPluginMeta();
-      }
-      return getVizPluginMeta();
+      return isWidget ? getWidgetPluginMeta() : getVizPluginMeta();
     }
     return getAllPanelPluginMeta();
   }, [isWidget]);
 
-  const filteredPluginTypes = useMemo((): PanelPluginMeta[] => {
-    return filterPluginList(pluginsList, searchQuery, current);
-  }, [current, pluginsList, searchQuery]);
+  const filteredPluginTypes = useMemo(
+    () => filterPluginList(pluginsList, searchQuery, pluginId),
+    [pluginsList, searchQuery, pluginId]
+  );
 
   if (filteredPluginTypes.length === 0) {
     return <EmptySearchResult>Could not find anything matching your query</EmptySearchResult>;
@@ -41,16 +37,16 @@ export function VizTypePicker({ searchQuery, onChange, current, data, isWidget =
 
   return (
     <div className={styles.grid}>
-      {filteredPluginTypes.map((plugin, index) => (
+      {filteredPluginTypes.map((plugin) => (
         <VizTypePickerPlugin
           disabled={false}
           key={plugin.id}
-          isCurrent={plugin.id === current.id}
+          isCurrent={plugin.id === pluginId}
           plugin={plugin}
           onClick={(e) =>
             onChange({
               pluginId: plugin.id,
-              withModKey: Boolean(e.metaKey || e.ctrlKey || e.altKey),
+              withModKey: e.metaKey || e.ctrlKey || e.altKey,
             })
           }
         />
@@ -59,16 +55,14 @@ export function VizTypePicker({ searchQuery, onChange, current, data, isWidget =
   );
 }
 
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    grid: css`
-      max-width: 100%;
-      display: grid;
-      grid-gap: ${theme.spacing(0.5)};
-    `,
-    heading: css({
-      ...theme.typography.h5,
-      margin: theme.spacing(0, 0.5, 1),
-    }),
-  };
-};
+const getStyles = (theme: GrafanaTheme2) => ({
+  grid: css({
+    maxWidth: '100%',
+    display: 'grid',
+    gridGap: theme.spacing(0.5),
+  }),
+  heading: css({
+    ...theme.typography.h5,
+    margin: theme.spacing(0, 0.5, 1),
+  }),
+});
diff --git a/public/app/features/panel/components/VizTypePicker/types.ts b/public/app/features/panel/components/VizTypePicker/types.ts
index d656b2e19f837..4dbab692faf01 100644
--- a/public/app/features/panel/components/VizTypePicker/types.ts
+++ b/public/app/features/panel/components/VizTypePicker/types.ts
@@ -2,7 +2,7 @@ import { FieldConfigSource } from '@grafana/data';
 
 export interface VizTypeChangeDetails {
   pluginId: string;
-  options?: any;
+  options?: Record<string, unknown>;
   fieldConfig?: FieldConfigSource;
   withModKey?: boolean;
 }
diff --git a/public/app/features/panel/panellinks/linkSuppliers.ts b/public/app/features/panel/panellinks/linkSuppliers.ts
index ddadc88d044b8..c2810f7dabe6b 100644
--- a/public/app/features/panel/panellinks/linkSuppliers.ts
+++ b/public/app/features/panel/panellinks/linkSuppliers.ts
@@ -11,7 +11,9 @@ import {
   ScopedVar,
   ScopedVars,
 } from '@grafana/data';
+import { VizPanel } from '@grafana/scenes';
 import { PanelModel } from 'app/features/dashboard/state/PanelModel';
+import { dashboardSceneGraph } from 'app/features/dashboard-scene/utils/dashboardSceneGraph';
 
 import { getLinkSrv } from './link_srv';
 
@@ -139,7 +141,10 @@ export const getFieldLinksSupplier = (value: FieldDisplay): LinkModelSupplier<Fi
   };
 };
 
-export const getPanelLinksSupplier = (panel: PanelModel): LinkModelSupplier<PanelModel> | undefined => {
+export const getPanelLinksSupplier = (
+  panel: PanelModel,
+  replaceVariables?: InterpolateFunction
+): LinkModelSupplier<PanelModel> | undefined => {
   const links = panel.links;
 
   if (!links || links.length === 0) {
@@ -149,7 +154,26 @@ export const getPanelLinksSupplier = (panel: PanelModel): LinkModelSupplier<Pane
   return {
     getLinks: () => {
       return links.map((link) => {
-        return getLinkSrv().getDataLinkUIModel(link, panel.replaceVariables, panel);
+        return getLinkSrv().getDataLinkUIModel(link, replaceVariables || panel.replaceVariables, panel);
+      });
+    },
+  };
+};
+
+export const getScenePanelLinksSupplier = (
+  panel: VizPanel,
+  replaceVariables: InterpolateFunction
+): LinkModelSupplier<VizPanel> | undefined => {
+  const links = dashboardSceneGraph.getPanelLinks(panel)?.state.rawLinks;
+
+  if (!links || links.length === 0) {
+    return undefined;
+  }
+
+  return {
+    getLinks: () => {
+      return links.map((link) => {
+        return getLinkSrv().getDataLinkUIModel(link, replaceVariables, panel);
       });
     },
   };
diff --git a/public/app/features/panel/panellinks/link_srv.ts b/public/app/features/panel/panellinks/link_srv.ts
index e8d47aaa88494..83f8cf82acbcf 100644
--- a/public/app/features/panel/panellinks/link_srv.ts
+++ b/public/app/features/panel/panellinks/link_srv.ts
@@ -20,11 +20,8 @@ import {
   VariableSuggestionsScope,
 } from '@grafana/data';
 import { getTemplateSrv } from '@grafana/runtime';
-import { VariableFormatID } from '@grafana/schema';
+import { DashboardLink, VariableFormatID } from '@grafana/schema';
 import { getConfig } from 'app/core/config';
-import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
-
-import { getVariablesUrlParams } from '../../variables/getAllVariableValuesForUrl';
 
 const timeRangeVars = [
   {
@@ -254,24 +251,20 @@ export interface LinkService {
 }
 
 export class LinkSrv implements LinkService {
-  getLinkUrl(link: any) {
-    let url = locationUtil.assureBaseUrl(getTemplateSrv().replace(link.url || ''));
+  getLinkUrl(link: DashboardLink) {
     let params: { [key: string]: any } = {};
 
     if (link.keepTime) {
-      const range = getTimeSrv().timeRangeForUrl();
-      params['from'] = range.from;
-      params['to'] = range.to;
+      params[`\$${DataLinkBuiltInVars.keepTime}`] = true;
     }
 
     if (link.includeVars) {
-      params = {
-        ...params,
-        ...getVariablesUrlParams(),
-      };
+      params[`\$${DataLinkBuiltInVars.includeVars}`] = true;
     }
 
-    url = urlUtil.appendQueryToUrl(url, urlUtil.toUrlParams(params));
+    let url = locationUtil.assureBaseUrl(urlUtil.appendQueryToUrl(link.url || '', urlUtil.toUrlParams(params)));
+    url = getTemplateSrv().replace(url);
+
     return getConfig().disableSanitizeHtml ? url : textUtil.sanitizeUrl(url);
   }
 
diff --git a/public/app/features/panel/panellinks/specs/link_srv.test.ts b/public/app/features/panel/panellinks/specs/link_srv.test.ts
index 580f79b659cf3..cd5dd3b11ef19 100644
--- a/public/app/features/panel/panellinks/specs/link_srv.test.ts
+++ b/public/app/features/panel/panellinks/specs/link_srv.test.ts
@@ -1,5 +1,6 @@
 import { FieldType, GrafanaConfig, locationUtil, toDataFrame, VariableOrigin } from '@grafana/data';
 import { setTemplateSrv } from '@grafana/runtime';
+import { DashboardLink } from '@grafana/schema';
 import { ContextSrv } from 'app/core/services/context_srv';
 import { getTimeSrv, setTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { TimeModel } from 'app/features/dashboard/state/TimeModel';
@@ -32,7 +33,7 @@ describe('linkSrv', () => {
     const timeSrv = new TimeSrv({} as ContextSrv);
     timeSrv.init(_dashboard);
     timeSrv.setTime({ from: 'now-1h', to: 'now' });
-    _dashboard.refresh = false;
+    _dashboard.refresh = undefined;
     setTimeSrv(timeSrv);
 
     templateSrv = initTemplateSrv('key', [
@@ -176,9 +177,27 @@ describe('linkSrv', () => {
     it('converts link urls', () => {
       const linkUrl = linkSrv.getLinkUrl({
         url: '/graph',
+        asDropdown: false,
+        icon: 'external link',
+        targetBlank: false,
+        includeVars: false,
+        keepTime: false,
+        tags: [],
+        title: 'Visit home',
+        tooltip: 'Visit home',
+        type: 'link',
       });
       const linkUrlWithVar = linkSrv.getLinkUrl({
         url: '/graph?home=$home',
+        asDropdown: false,
+        icon: 'external link',
+        targetBlank: false,
+        includeVars: false,
+        keepTime: false,
+        tags: [],
+        title: 'Visit home',
+        tooltip: 'Visit home',
+        type: 'link',
       });
 
       expect(linkUrl).toBe('/graph');
@@ -187,8 +206,16 @@ describe('linkSrv', () => {
 
     it('appends current dashboard time range if keepTime is true', () => {
       const anchorInfoKeepTime = linkSrv.getLinkUrl({
-        keepTime: true,
         url: '/graph',
+        asDropdown: false,
+        icon: 'external link',
+        targetBlank: false,
+        includeVars: false,
+        keepTime: true,
+        tags: [],
+        title: 'Visit home',
+        tooltip: 'Visit home',
+        type: 'link',
       });
 
       expect(anchorInfoKeepTime).toBe('/graph?from=now-1h&to=now');
@@ -196,16 +223,33 @@ describe('linkSrv', () => {
 
     it('adds all variables to the url if includeVars is true', () => {
       const anchorInfoIncludeVars = linkSrv.getLinkUrl({
-        includeVars: true,
         url: '/graph',
+        asDropdown: false,
+        icon: 'external link',
+        targetBlank: false,
+        includeVars: true,
+        keepTime: false,
+        tags: [],
+        title: 'Visit home',
+        tooltip: 'Visit home',
+        type: 'link',
       });
 
       expect(anchorInfoIncludeVars).toBe('/graph?var-home=127.0.0.1&var-server1=192.168.0.100');
     });
 
     it('respects config disableSanitizeHtml', () => {
-      const anchorInfo = {
+      const anchorInfo: DashboardLink = {
         url: 'javascript:alert(document.domain)',
+        asDropdown: false,
+        icon: 'external link',
+        targetBlank: false,
+        includeVars: false,
+        keepTime: false,
+        tags: [],
+        title: 'Visit home',
+        tooltip: 'Visit home',
+        type: 'link',
       };
 
       expect(linkSrv.getLinkUrl(anchorInfo)).toBe('about:blank');
diff --git a/public/app/features/panel/state/actions.ts b/public/app/features/panel/state/actions.ts
index 1bf3e1d549c84..6bde8fc04802d 100644
--- a/public/app/features/panel/state/actions.ts
+++ b/public/app/features/panel/state/actions.ts
@@ -17,6 +17,13 @@ export function initPanelState(panel: PanelModel): ThunkResult<Promise<void>> {
       return;
     }
 
+    // Some old panels, somehow have maxDataPoints value as string.
+    // This is causing problems on the backend-side.
+    // Here we make sure maxDataPoints is always as number.
+    if (panel.maxDataPoints) {
+      panel.maxDataPoints = Number(panel.maxDataPoints);
+    }
+
     let pluginToLoad = panel.type;
     let plugin = getStore().plugins.panels[pluginToLoad];
 
@@ -46,7 +53,7 @@ export function cleanUpPanelState(panelKey: string): ThunkResult<void> {
 export interface ChangePanelPluginAndOptionsArgs {
   panel: PanelModel;
   pluginId: string;
-  options?: any;
+  options?: Record<string, unknown>;
   fieldConfig?: FieldConfigSource;
   transformations?: DataTransformerConfig[];
 }
@@ -147,15 +154,16 @@ export function loadLibraryPanelAndUpdate(panel: PanelModel): ThunkResult<void>
     try {
       const libPanel = await getLibraryPanel(uid, true);
       panel.initLibraryPanel(libPanel);
-      await dispatch(initPanelState(panel));
-      const dashboard = getStore().dashboard.getModel();
 
+      const dashboard = getStore().dashboard.getModel();
       if (panel.repeat && dashboard) {
         const panelIndex = dashboard.panels.findIndex((p) => p.id === panel.id);
         dashboard.repeatPanel(panel, panelIndex);
         dashboard.sortPanelsByGridPos();
         dashboard.events.publish(new DashboardPanelsChangedEvent());
       }
+
+      await dispatch(initPanelState(panel));
     } catch (ex) {
       console.log('ERROR: ', ex);
       dispatch(
diff --git a/public/app/features/panel/state/getAllSuggestions.ts b/public/app/features/panel/state/getAllSuggestions.ts
index a9d8efdb85fcf..873e2166da825 100644
--- a/public/app/features/panel/state/getAllSuggestions.ts
+++ b/public/app/features/panel/state/getAllSuggestions.ts
@@ -21,6 +21,8 @@ export const panelsToCheckFirst = [
   'logs',
   'candlestick',
   'flamegraph',
+  'traces',
+  'nodeGraph',
 ];
 
 export async function getAllSuggestions(data?: PanelData, panel?: PanelModel): Promise<VisualizationSuggestion[]> {
diff --git a/public/app/features/panel/state/reducers.ts b/public/app/features/panel/state/reducers.ts
index 262b7430af3c8..b63619d6cb58a 100644
--- a/public/app/features/panel/state/reducers.ts
+++ b/public/app/features/panel/state/reducers.ts
@@ -8,7 +8,7 @@ export type RootPanelsState = Record<string, PanelState>;
 export interface PanelState {
   plugin?: PanelPlugin;
   angularComponent?: AngularComponent;
-  instanceState?: any | null;
+  instanceState?: unknown | null;
 }
 
 export const initialState: RootPanelsState = {};
@@ -54,7 +54,7 @@ export interface SetPanelAngularComponentPayload {
 
 export interface SetPanelInstanceStatePayload {
   key: string;
-  value: any;
+  value: unknown;
 }
 
 export const {
diff --git a/public/app/features/panel/state/util.ts b/public/app/features/panel/state/util.ts
index d4892847ed75d..87f674479a858 100644
--- a/public/app/features/panel/state/util.ts
+++ b/public/app/features/panel/state/util.ts
@@ -21,12 +21,12 @@ export function getVizPluginMeta(): PanelPluginMeta[] {
 export function filterPluginList(
   pluginsList: PanelPluginMeta[],
   searchQuery: string, // Note: this will be an escaped regex string as it comes from `FilterInput`
-  current?: PanelPluginMeta
+  pluginId?: string
 ): PanelPluginMeta[] {
   if (!searchQuery.length) {
     return pluginsList.filter((p) => {
       if (p.state === PluginState.deprecated) {
-        return current?.id === p.id;
+        return pluginId === p.id;
       }
       return true;
     });
@@ -38,7 +38,7 @@ export function filterPluginList(
   const isGraphQuery = 'graph'.startsWith(query);
 
   for (const item of pluginsList) {
-    if (item.state === PluginState.deprecated && current?.id !== item.id) {
+    if (item.state === PluginState.deprecated && pluginId !== item.id) {
       continue;
     }
 
diff --git a/public/app/features/panel/state/utils.test.ts b/public/app/features/panel/state/utils.test.ts
index d08da0b219440..b6e49d15031bb 100644
--- a/public/app/features/panel/state/utils.test.ts
+++ b/public/app/features/panel/state/utils.test.ts
@@ -9,7 +9,7 @@ describe('panel state utils', () => {
       { id: 'timeseries', name: 'Graph (old)' },
       { id: 'timeline', name: 'Timeline' },
     ] as PanelPluginMeta[];
-    const found = filterPluginList(pluginsList, escapeStringForRegex('gra'), { id: 'xyz' } as PanelPluginMeta);
+    const found = filterPluginList(pluginsList, escapeStringForRegex('gra'), 'xyz');
     expect(found.map((v) => v.id)).toEqual(['graph', 'timeseries']);
   });
 
@@ -20,7 +20,7 @@ describe('panel state utils', () => {
       { id: 'timeline', name: 'Timeline' },
       { id: 'panelwithdashes', name: 'Panel-With-Dashes' },
     ] as PanelPluginMeta[];
-    const found = filterPluginList(pluginsList, escapeStringForRegex('panel-'), { id: 'xyz' } as PanelPluginMeta);
+    const found = filterPluginList(pluginsList, escapeStringForRegex('panel-'), 'xyz');
     expect(found.map((v) => v.id)).toEqual(['panelwithdashes']);
   });
 });
diff --git a/public/app/features/playlist/EmptyQueryListBanner.tsx b/public/app/features/playlist/EmptyQueryListBanner.tsx
deleted file mode 100644
index 2a2e7967cb1f5..0000000000000
--- a/public/app/features/playlist/EmptyQueryListBanner.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { css } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { useStyles2 } from '@grafana/ui';
-
-export const EmptyQueryListBanner = () => {
-  const styles = useStyles2(getStyles);
-  return <div className={styles.noResult}>No playlist found!</div>;
-};
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    noResult: css`
-      padding: ${theme.spacing(2)};
-      background: ${theme.colors.secondary.main};
-      font-style: italic;
-      margin-top: ${theme.spacing(2)};
-    `,
-  };
-};
diff --git a/public/app/features/playlist/PlaylistCard.tsx b/public/app/features/playlist/PlaylistCard.tsx
new file mode 100644
index 0000000000000..1706bcb93b710
--- /dev/null
+++ b/public/app/features/playlist/PlaylistCard.tsx
@@ -0,0 +1,96 @@
+import { css } from '@emotion/css';
+import React from 'react';
+import Skeleton from 'react-loading-skeleton';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Button, Card, LinkButton, ModalsController, Stack, useStyles2 } from '@grafana/ui';
+import { attachSkeleton, SkeletonComponent } from '@grafana/ui/src/unstable';
+import { t, Trans } from 'app/core/internationalization';
+import { contextSrv } from 'app/core/services/context_srv';
+import { DashNavButton } from 'app/features/dashboard/components/DashNav/DashNavButton';
+
+import { ShareModal } from './ShareModal';
+import { Playlist } from './types';
+
+interface Props {
+  setStartPlaylist: (playlistItem: Playlist) => void;
+  setPlaylistToDelete: (playlistItem: Playlist) => void;
+  playlist: Playlist;
+}
+
+const PlaylistCardComponent = ({ playlist, setStartPlaylist, setPlaylistToDelete }: Props) => {
+  return (
+    <Card>
+      <Card.Heading>
+        {playlist.name}
+        <ModalsController key="button-share">
+          {({ showModal, hideModal }) => (
+            <DashNavButton
+              tooltip={t('playlist-page.card.tooltip', 'Share playlist')}
+              icon="share-alt"
+              iconSize="lg"
+              onClick={() => {
+                showModal(ShareModal, {
+                  playlistUid: playlist.uid,
+                  onDismiss: hideModal,
+                });
+              }}
+            />
+          )}
+        </ModalsController>
+      </Card.Heading>
+      <Card.Actions>
+        <Button variant="secondary" icon="play" onClick={() => setStartPlaylist(playlist)}>
+          <Trans i18nKey="playlist-page.card.start">Start playlist</Trans>
+        </Button>
+        {contextSrv.isEditor && (
+          <>
+            <LinkButton key="edit" variant="secondary" href={`/playlists/edit/${playlist.uid}`} icon="cog">
+              <Trans i18nKey="playlist-page.card.edit">Edit playlist</Trans>
+            </LinkButton>
+            <Button
+              disabled={false}
+              onClick={() => setPlaylistToDelete(playlist)}
+              icon="trash-alt"
+              variant="destructive"
+            >
+              <Trans i18nKey="playlist-page.card.delete">Delete playlist</Trans>
+            </Button>
+          </>
+        )}
+      </Card.Actions>
+    </Card>
+  );
+};
+
+const PlaylistCardSkeleton: SkeletonComponent = ({ rootProps }) => {
+  const skeletonStyles = useStyles2(getSkeletonStyles);
+  return (
+    <Card {...rootProps}>
+      <Card.Heading>
+        <Skeleton width={140} />
+      </Card.Heading>
+      <Card.Actions>
+        <Stack direction="row" wrap="wrap">
+          <Skeleton containerClassName={skeletonStyles.button} width={142} height={32} />
+          {contextSrv.isEditor && (
+            <>
+              <Skeleton containerClassName={skeletonStyles.button} width={135} height={32} />
+              <Skeleton containerClassName={skeletonStyles.button} width={153} height={32} />
+            </>
+          )}
+        </Stack>
+      </Card.Actions>
+    </Card>
+  );
+};
+
+export const PlaylistCard = attachSkeleton(PlaylistCardComponent, PlaylistCardSkeleton);
+
+function getSkeletonStyles(theme: GrafanaTheme2) {
+  return {
+    button: css({
+      lineHeight: 1,
+    }),
+  };
+}
diff --git a/public/app/features/playlist/PlaylistForm.tsx b/public/app/features/playlist/PlaylistForm.tsx
index 0d8d1951110d1..cb6d6d7551946 100644
--- a/public/app/features/playlist/PlaylistForm.tsx
+++ b/public/app/features/playlist/PlaylistForm.tsx
@@ -2,7 +2,8 @@ import React, { useMemo, useState } from 'react';
 
 import { selectors } from '@grafana/e2e-selectors';
 import { config } from '@grafana/runtime';
-import { Button, Field, Form, HorizontalGroup, Input, LinkButton } from '@grafana/ui';
+import { Button, Field, FieldSet, Input, LinkButton, Stack } from '@grafana/ui';
+import { Form } from 'app/core/components/Form/Form';
 import { DashboardPicker } from 'app/core/components/Select/DashboardPicker';
 import { TagFilter } from 'app/core/components/TagFilter/TagFilter';
 import { Trans, t } from 'app/core/internationalization';
@@ -33,76 +34,70 @@ export const PlaylistForm = ({ onSubmit, playlist }: Props) => {
   };
 
   return (
-    <div>
-      <Form onSubmit={doSubmit} validateOn={'onBlur'}>
-        {({ register, errors }) => {
-          const isDisabled = items.length === 0 || Object.keys(errors).length > 0;
-          return (
-            <>
-              <Field
-                label={t('playlist-edit.form.name-label', 'Name')}
-                invalid={!!errors.name}
-                error={errors?.name?.message}
-              >
-                <Input
-                  type="text"
-                  {...register('name', { required: t('playlist-edit.form.name-required', 'Name is required') })}
-                  placeholder={t('playlist-edit.form.name-placeholder', 'Name')}
-                  defaultValue={name}
-                  aria-label={selectors.pages.PlaylistForm.name}
-                />
-              </Field>
-              <Field
-                label={t('playlist-edit.form.interval-label', 'Interval')}
-                invalid={!!errors.interval}
-                error={errors?.interval?.message}
-              >
-                <Input
-                  type="text"
-                  {...register('interval', {
-                    required: t('playlist-edit.form.interval-required', 'Interval is required'),
-                  })}
-                  placeholder={t('playlist-edit.form.interval-placeholder', '5m')}
-                  defaultValue={interval ?? '5m'}
-                  aria-label={selectors.pages.PlaylistForm.interval}
-                />
-              </Field>
+    <Form onSubmit={doSubmit} validateOn={'onBlur'}>
+      {({ register, errors }) => {
+        const isDisabled = items.length === 0 || Object.keys(errors).length > 0;
+        return (
+          <>
+            <Field
+              label={t('playlist-edit.form.name-label', 'Name')}
+              invalid={!!errors.name}
+              error={errors?.name?.message}
+            >
+              <Input
+                type="text"
+                {...register('name', { required: t('playlist-edit.form.name-required', 'Name is required') })}
+                placeholder={t('playlist-edit.form.name-placeholder', 'Name')}
+                defaultValue={name}
+                aria-label={selectors.pages.PlaylistForm.name}
+              />
+            </Field>
+            <Field
+              label={t('playlist-edit.form.interval-label', 'Interval')}
+              invalid={!!errors.interval}
+              error={errors?.interval?.message}
+            >
+              <Input
+                type="text"
+                {...register('interval', {
+                  required: t('playlist-edit.form.interval-required', 'Interval is required'),
+                })}
+                placeholder={t('playlist-edit.form.interval-placeholder', '5m')}
+                defaultValue={interval ?? '5m'}
+                aria-label={selectors.pages.PlaylistForm.interval}
+              />
+            </Field>
 
-              <PlaylistTable items={items} deleteItem={deleteItem} moveItem={moveItem} />
+            <PlaylistTable items={items} deleteItem={deleteItem} moveItem={moveItem} />
 
-              <div className="gf-form-group">
-                <h3 className="page-headering">
-                  <Trans i18nKey="playlist-edit.form.heading">Add dashboards</Trans>
-                </h3>
-
-                <Field label={t('playlist-edit.form.add-title-label', 'Add by title')}>
-                  <DashboardPicker id="dashboard-picker" onChange={addByUID} key={items.length} />
-                </Field>
+            <FieldSet label={t('playlist-edit.form.heading', 'Add dashboards')}>
+              <Field label={t('playlist-edit.form.add-title-label', 'Add by title')}>
+                <DashboardPicker id="dashboard-picker" onChange={addByUID} key={items.length} />
+              </Field>
 
-                <Field label={t('playlist-edit.form.add-tag-label', 'Add by tag')}>
-                  <TagFilter
-                    isClearable
-                    tags={[]}
-                    hideValues
-                    tagOptions={tagOptions}
-                    onChange={addByTag}
-                    placeholder={t('playlist-edit.form.add-tag-placeholder', 'Select a tag')}
-                  />
-                </Field>
-              </div>
+              <Field label={t('playlist-edit.form.add-tag-label', 'Add by tag')}>
+                <TagFilter
+                  isClearable
+                  tags={[]}
+                  hideValues
+                  tagOptions={tagOptions}
+                  onChange={addByTag}
+                  placeholder={t('playlist-edit.form.add-tag-placeholder', 'Select a tag')}
+                />
+              </Field>
+            </FieldSet>
 
-              <HorizontalGroup>
-                <Button type="submit" variant="primary" disabled={isDisabled} icon={saving ? 'spinner' : undefined}>
-                  <Trans i18nKey="playlist-edit.form.save">Save</Trans>
-                </Button>
-                <LinkButton variant="secondary" href={`${config.appSubUrl}/playlists`}>
-                  <Trans i18nKey="playlist-edit.form.cancel">Cancel</Trans>
-                </LinkButton>
-              </HorizontalGroup>
-            </>
-          );
-        }}
-      </Form>
-    </div>
+            <Stack>
+              <Button type="submit" variant="primary" disabled={isDisabled} icon={saving ? 'spinner' : undefined}>
+                <Trans i18nKey="playlist-edit.form.save">Save</Trans>
+              </Button>
+              <LinkButton variant="secondary" href={`${config.appSubUrl}/playlists`}>
+                <Trans i18nKey="playlist-edit.form.cancel">Cancel</Trans>
+              </LinkButton>
+            </Stack>
+          </>
+        );
+      }}
+    </Form>
   );
 };
diff --git a/public/app/features/playlist/PlaylistPage.test.tsx b/public/app/features/playlist/PlaylistPage.test.tsx
index 347af817756c6..21312227f6c6a 100644
--- a/public/app/features/playlist/PlaylistPage.test.tsx
+++ b/public/app/features/playlist/PlaylistPage.test.tsx
@@ -1,4 +1,4 @@
-import { render, waitFor } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import React from 'react';
 import { TestProvider } from 'test/helpers/TestProvider';
 
@@ -21,7 +21,7 @@ jest.mock('app/core/services/context_srv', () => ({
   },
 }));
 
-function getTestContext() {
+function setup() {
   return render(
     <TestProvider>
       <PlaylistPage />
@@ -37,30 +37,34 @@ describe('PlaylistPage', () => {
   describe('when mounted without a playlist', () => {
     it('page should load', () => {
       fnMock.mockResolvedValue([]);
-      const { getByText } = getTestContext();
-      expect(getByText(/loading/i)).toBeInTheDocument();
+      setup();
+      expect(screen.getByTestId('playlist-page-list-skeleton')).toBeInTheDocument();
     });
+
     it('then show empty list', async () => {
-      const { getByText } = getTestContext();
-      await waitFor(() => getByText('There are no playlists created yet'));
+      setup();
+      expect(await screen.findByText('There are no playlists created yet')).toBeInTheDocument();
     });
+
     describe('and signed in user is not a viewer', () => {
       it('then create playlist button should not be disabled', async () => {
         contextSrv.isEditor = true;
-        const { getByRole } = getTestContext();
-        const createPlaylistButton = await waitFor(() => getByRole('link', { name: /create playlist/i }));
+        setup();
+        const createPlaylistButton = await screen.findByRole('link', { name: /create playlist/i });
         expect(createPlaylistButton).not.toHaveStyle('pointer-events: none');
       });
     });
+
     describe('and signed in user is a viewer', () => {
       it('then create playlist button should be disabled', async () => {
         contextSrv.isEditor = false;
-        const { getByRole } = getTestContext();
-        const createPlaylistButton = await waitFor(() => getByRole('link', { name: /create playlist/i }));
+        setup();
+        const createPlaylistButton = await screen.findByRole('link', { name: /create playlist/i });
         expect(createPlaylistButton).toHaveStyle('pointer-events: none');
       });
     });
   });
+
   describe('when mounted with a playlist', () => {
     it('page should load', () => {
       fnMock.mockResolvedValue([
@@ -76,29 +80,31 @@ describe('PlaylistPage', () => {
           uid: 'playlist-0',
         },
       ]);
-      const { getByText } = getTestContext();
-      expect(getByText(/loading/i)).toBeInTheDocument();
+      setup();
+      expect(screen.getByTestId('playlist-page-list-skeleton')).toBeInTheDocument();
     });
+
     describe('and signed in user is not a viewer', () => {
       it('then playlist title and all playlist buttons should appear on the page', async () => {
         contextSrv.isEditor = true;
-        const { getByRole, getByText } = getTestContext();
-        await waitFor(() => getByText('A test playlist'));
-        expect(getByRole('link', { name: /New playlist/i })).toBeInTheDocument();
-        expect(getByRole('button', { name: /Start playlist/i })).toBeInTheDocument();
-        expect(getByRole('link', { name: /Edit playlist/i })).toBeInTheDocument();
-        expect(getByRole('button', { name: /Delete playlist/i })).toBeInTheDocument();
+        setup();
+        expect(await screen.findByText('A test playlist'));
+        expect(await screen.findByRole('link', { name: /New playlist/i })).toBeInTheDocument();
+        expect(await screen.findByRole('button', { name: /Start playlist/i })).toBeInTheDocument();
+        expect(await screen.findByRole('link', { name: /Edit playlist/i })).toBeInTheDocument();
+        expect(await screen.findByRole('button', { name: /Delete playlist/i })).toBeInTheDocument();
       });
     });
+
     describe('and signed in user is a viewer', () => {
       it('then playlist title and only start playlist button should appear on the page', async () => {
         contextSrv.isEditor = false;
-        const { getByRole, getByText, queryByRole } = getTestContext();
-        await waitFor(() => getByText('A test playlist'));
-        expect(queryByRole('link', { name: /New playlist/i })).not.toBeInTheDocument();
-        expect(getByRole('button', { name: /Start playlist/i })).toBeInTheDocument();
-        expect(queryByRole('link', { name: /Edit playlist/i })).not.toBeInTheDocument();
-        expect(queryByRole('button', { name: /Delete playlist/i })).not.toBeInTheDocument();
+        setup();
+        expect(await screen.findByText('A test playlist')).toBeInTheDocument();
+        expect(screen.queryByRole('link', { name: /New playlist/i })).not.toBeInTheDocument();
+        expect(await screen.findByRole('button', { name: /Start playlist/i })).toBeInTheDocument();
+        expect(screen.queryByRole('link', { name: /Edit playlist/i })).not.toBeInTheDocument();
+        expect(screen.queryByRole('button', { name: /Delete playlist/i })).not.toBeInTheDocument();
       });
     });
   });
diff --git a/public/app/features/playlist/PlaylistPage.tsx b/public/app/features/playlist/PlaylistPage.tsx
index 6c01ac2dcc87c..bebb5f3c9065d 100644
--- a/public/app/features/playlist/PlaylistPage.tsx
+++ b/public/app/features/playlist/PlaylistPage.tsx
@@ -1,14 +1,13 @@
 import React, { useMemo, useState } from 'react';
 import { useAsync } from 'react-use';
 
-import { ConfirmModal } from '@grafana/ui';
+import { ConfirmModal, EmptyState, LinkButton } from '@grafana/ui';
 import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
 import { Page } from 'app/core/components/Page/Page';
 import PageActionBar from 'app/core/components/PageActionBar/PageActionBar';
-import { t } from 'app/core/internationalization';
+import { Trans, t } from 'app/core/internationalization';
 import { contextSrv } from 'app/core/services/context_srv';
 
-import { EmptyQueryListBanner } from './EmptyQueryListBanner';
 import { PlaylistPageList } from './PlaylistPageList';
 import { StartModal } from './StartModal';
 import { getPlaylistAPI, searchPlaylists } from './api';
@@ -50,46 +49,51 @@ export const PlaylistPage = () => {
     />
   );
 
-  const showSearch = playlists.length > 0 || searchQuery.length > 0;
+  const showSearch = allPlaylists.loading || playlists.length > 0 || searchQuery.length > 0;
 
   return (
-    <Page navId="dashboards/playlists">
-      <Page.Contents isLoading={allPlaylists.loading}>
-        {showSearch && (
-          <PageActionBar
-            searchQuery={searchQuery}
-            linkButton={
-              contextSrv.isEditor
-                ? { title: t('playlist-page.create-button.title', 'New playlist'), href: '/playlists/new' }
-                : undefined
-            }
-            setSearchQuery={setSearchQuery}
-          />
-        )}
+    <Page
+      actions={
+        contextSrv.isEditor ? (
+          <LinkButton href="/playlists/new">
+            <Trans i18nKey="playlist-page.create-button.title">New playlist</Trans>
+          </LinkButton>
+        ) : undefined
+      }
+      navId="dashboards/playlists"
+    >
+      <Page.Contents>
+        {showSearch && <PageActionBar searchQuery={searchQuery} setSearchQuery={setSearchQuery} />}
 
-        {!hasPlaylists && searchQuery ? (
-          <EmptyQueryListBanner />
+        {allPlaylists.loading ? (
+          <PlaylistPageList.Skeleton />
         ) : (
-          <PlaylistPageList
-            playlists={playlists}
-            setStartPlaylist={setStartPlaylist}
-            setPlaylistToDelete={setPlaylistToDelete}
-          />
-        )}
-        {!showSearch && emptyListBanner}
-        {playlistToDelete && (
-          <ConfirmModal
-            title={playlistToDelete.name}
-            confirmText={t('playlist-page.delete-modal.confirm-text', 'Delete')}
-            body={t('playlist-page.delete-modal.body', 'Are you sure you want to delete {{name}} playlist?', {
-              name: playlistToDelete.name,
-            })}
-            onConfirm={onDeletePlaylist}
-            isOpen={Boolean(playlistToDelete)}
-            onDismiss={onDismissDelete}
-          />
+          <>
+            {!hasPlaylists && searchQuery ? (
+              <EmptyState variant="not-found" message={t('playlists.empty-state.message', 'No playlists found')} />
+            ) : (
+              <PlaylistPageList
+                playlists={playlists}
+                setStartPlaylist={setStartPlaylist}
+                setPlaylistToDelete={setPlaylistToDelete}
+              />
+            )}
+            {!showSearch && emptyListBanner}
+            {playlistToDelete && (
+              <ConfirmModal
+                title={playlistToDelete.name}
+                confirmText={t('playlist-page.delete-modal.confirm-text', 'Delete')}
+                body={t('playlist-page.delete-modal.body', 'Are you sure you want to delete {{name}} playlist?', {
+                  name: playlistToDelete.name,
+                })}
+                onConfirm={onDeletePlaylist}
+                isOpen={Boolean(playlistToDelete)}
+                onDismiss={onDismissDelete}
+              />
+            )}
+            {startPlaylist && <StartModal playlist={startPlaylist} onDismiss={() => setStartPlaylist(undefined)} />}
+          </>
         )}
-        {startPlaylist && <StartModal playlist={startPlaylist} onDismiss={() => setStartPlaylist(undefined)} />}
       </Page.Contents>
     </Page>
   );
diff --git a/public/app/features/playlist/PlaylistPageList.tsx b/public/app/features/playlist/PlaylistPageList.tsx
index 514a152626a5b..0f3fecfe55e21 100644
--- a/public/app/features/playlist/PlaylistPageList.tsx
+++ b/public/app/features/playlist/PlaylistPageList.tsx
@@ -2,72 +2,48 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Button, Card, LinkButton, ModalsController, useStyles2 } from '@grafana/ui';
-import { t, Trans } from 'app/core/internationalization';
-import { contextSrv } from 'app/core/services/context_srv';
-import { DashNavButton } from 'app/features/dashboard/components/DashNav/DashNavButton';
+import { useStyles2 } from '@grafana/ui';
+import { SkeletonComponent, attachSkeleton } from '@grafana/ui/src/unstable';
 
-import { ShareModal } from './ShareModal';
+import { PlaylistCard } from './PlaylistCard';
 import { Playlist } from './types';
 
 interface Props {
   setStartPlaylist: (playlistItem: Playlist) => void;
   setPlaylistToDelete: (playlistItem: Playlist) => void;
-  playlists: Playlist[] | undefined;
+  playlists: Playlist[];
 }
 
-export const PlaylistPageList = ({ playlists, setStartPlaylist, setPlaylistToDelete }: Props) => {
+const PlaylistPageListComponent = ({ playlists, setStartPlaylist, setPlaylistToDelete }: Props) => {
   const styles = useStyles2(getStyles);
   return (
     <ul className={styles.list}>
-      {playlists!.map((playlist: Playlist) => (
+      {playlists.map((playlist: Playlist) => (
         <li className={styles.listItem} key={playlist.uid}>
-          <Card>
-            <Card.Heading>
-              {playlist.name}
-              <ModalsController key="button-share">
-                {({ showModal, hideModal }) => (
-                  <DashNavButton
-                    tooltip={t('playlist-page.card.tooltip', 'Share playlist')}
-                    icon="share-alt"
-                    iconSize="lg"
-                    onClick={() => {
-                      showModal(ShareModal, {
-                        playlistUid: playlist.uid,
-                        onDismiss: hideModal,
-                      });
-                    }}
-                  />
-                )}
-              </ModalsController>
-            </Card.Heading>
-            <Card.Actions>
-              <Button variant="secondary" icon="play" onClick={() => setStartPlaylist(playlist)}>
-                <Trans i18nKey="playlist-page.card.start">Start playlist</Trans>
-              </Button>
-              {contextSrv.isEditor && (
-                <>
-                  <LinkButton key="edit" variant="secondary" href={`/playlists/edit/${playlist.uid}`} icon="cog">
-                    <Trans i18nKey="playlist-page.card.edit">Edit playlist</Trans>
-                  </LinkButton>
-                  <Button
-                    disabled={false}
-                    onClick={() => setPlaylistToDelete(playlist)}
-                    icon="trash-alt"
-                    variant="destructive"
-                  >
-                    <Trans i18nKey="playlist-page.card.delete">Delete playlist</Trans>
-                  </Button>
-                </>
-              )}
-            </Card.Actions>
-          </Card>
+          <PlaylistCard
+            playlist={playlist}
+            setStartPlaylist={setStartPlaylist}
+            setPlaylistToDelete={setPlaylistToDelete}
+          />
         </li>
       ))}
     </ul>
   );
 };
 
+const PlaylistPageListSkeleton: SkeletonComponent = ({ rootProps }) => {
+  const styles = useStyles2(getStyles);
+  return (
+    <div data-testid="playlist-page-list-skeleton" className={styles.list} {...rootProps}>
+      <PlaylistCard.Skeleton />
+      <PlaylistCard.Skeleton />
+      <PlaylistCard.Skeleton />
+    </div>
+  );
+};
+
+export const PlaylistPageList = attachSkeleton(PlaylistPageListComponent, PlaylistPageListSkeleton);
+
 function getStyles(theme: GrafanaTheme2) {
   return {
     list: css({
diff --git a/public/app/features/playlist/PlaylistSrv.test.ts b/public/app/features/playlist/PlaylistSrv.test.ts
index b5ccdc6d411b4..68d279d9d1714 100644
--- a/public/app/features/playlist/PlaylistSrv.test.ts
+++ b/public/app/features/playlist/PlaylistSrv.test.ts
@@ -124,7 +124,7 @@ describe('PlaylistSrv', () => {
 
     locationService.push('/datasources');
 
-    expect(srv.isPlaying).toBe(false);
+    expect(srv.state.isPlaying).toBe(false);
   });
 
   it('storeUpdated should not stop playlist when navigating to next dashboard', async () => {
@@ -137,6 +137,6 @@ describe('PlaylistSrv', () => {
 
     // eslint-disable-next-line
     expect((srv as any).validPlaylistUrl).toBe('/url/to/bbb');
-    expect(srv.isPlaying).toBe(true);
+    expect(srv.state.isPlaying).toBe(true);
   });
 });
diff --git a/public/app/features/playlist/PlaylistSrv.ts b/public/app/features/playlist/PlaylistSrv.ts
index b74b620ab3d0f..8fd715dd8f4a4 100644
--- a/public/app/features/playlist/PlaylistSrv.ts
+++ b/public/app/features/playlist/PlaylistSrv.ts
@@ -3,6 +3,7 @@ import { pickBy } from 'lodash';
 
 import { locationUtil, urlUtil, rangeUtil } from '@grafana/data';
 import { locationService } from '@grafana/runtime';
+import { StateManagerBase } from 'app/core/services/StateManagerBase';
 
 import { getPlaylistAPI, loadDashboards } from './api';
 import { PlaylistAPI } from './types';
@@ -13,7 +14,11 @@ export const queryParamsToPreserve: { [key: string]: boolean } = {
   orgId: true,
 };
 
-export class PlaylistSrv {
+export interface PlaylistSrvState {
+  isPlaying: boolean;
+}
+
+export class PlaylistSrv extends StateManagerBase<PlaylistSrvState> {
   private nextTimeoutId: ReturnType<typeof setTimeout> | undefined;
   private urls: string[] = []; // the URLs we need to load
   private index = 0;
@@ -24,9 +29,9 @@ export class PlaylistSrv {
   private locationListenerUnsub?: () => void;
   private api: PlaylistAPI;
 
-  isPlaying = false;
+  public constructor() {
+    super({ isPlaying: false });
 
-  constructor() {
     this.locationUpdated = this.locationUpdated.bind(this);
     this.api = getPlaylistAPI();
   }
@@ -76,17 +81,19 @@ export class PlaylistSrv {
 
     this.startUrl = window.location.href;
     this.index = 0;
-    this.isPlaying = true;
+
+    this.setState({ isPlaying: true });
 
     // setup location tracking
     this.locationListenerUnsub = locationService.getHistory().listen(this.locationUpdated);
-
     const urls: string[] = [];
+
     let playlist = await this.api.getPlaylist(playlistUid);
     if (!playlist.items?.length) {
       // alert
       return;
     }
+
     this.interval = rangeUtil.intervalToMs(playlist.interval);
 
     const items = await loadDashboards(playlist.items);
@@ -102,19 +109,21 @@ export class PlaylistSrv {
       // alert... not found, etc
       return;
     }
+
     this.urls = urls;
-    this.isPlaying = true;
+    this.setState({ isPlaying: true });
     this.next();
     return;
   }
 
   stop() {
-    if (!this.isPlaying) {
+    if (!this.state.isPlaying) {
       return;
     }
 
     this.index = 0;
-    this.isPlaying = false;
+
+    this.setState({ isPlaying: false });
 
     if (this.locationListenerUnsub) {
       this.locationListenerUnsub();
diff --git a/public/app/features/playlist/PlaylistTable.tsx b/public/app/features/playlist/PlaylistTable.tsx
index 7b1080e192ee1..93a7167b1ce71 100644
--- a/public/app/features/playlist/PlaylistTable.tsx
+++ b/public/app/features/playlist/PlaylistTable.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 import { DragDropContext, Droppable, DropResult } from 'react-beautiful-dnd';
 
-import { Trans } from 'app/core/internationalization';
+import { FieldSet } from '@grafana/ui';
+import { t } from 'app/core/internationalization';
 
 import { PlaylistTableRows } from './PlaylistTableRows';
 import { PlaylistItem } from './types';
@@ -20,11 +21,7 @@ export const PlaylistTable = ({ items, deleteItem, moveItem }: Props) => {
   };
 
   return (
-    <div className="gf-form-group">
-      <h3 className="page-headering">
-        <Trans i18nKey="playlist-edit.form.table-heading">Dashboards</Trans>
-      </h3>
-
+    <FieldSet label={t('playlist-edit.form.table-heading', 'Dashboards')}>
       <DragDropContext onDragEnd={onDragEnd}>
         <Droppable droppableId="playlist-list" direction="vertical">
           {(provided) => {
@@ -37,6 +34,6 @@ export const PlaylistTable = ({ items, deleteItem, moveItem }: Props) => {
           }}
         </Droppable>
       </DragDropContext>
-    </div>
+    </FieldSet>
   );
 };
diff --git a/public/app/features/playlist/api.ts b/public/app/features/playlist/api.ts
index 27ea44fdf967a..48b83403b3ac5 100644
--- a/public/app/features/playlist/api.ts
+++ b/public/app/features/playlist/api.ts
@@ -4,11 +4,12 @@ import { DataQueryRequest, DataFrameView } from '@grafana/data';
 import { getBackendSrv, config } from '@grafana/runtime';
 import { notifyApp } from 'app/core/actions';
 import { createErrorNotification, createSuccessNotification } from 'app/core/copy/appNotification';
-import { contextSrv } from 'app/core/services/context_srv';
 import { getGrafanaDatasource } from 'app/plugins/datasource/grafana/datasource';
 import { GrafanaQuery, GrafanaQueryType } from 'app/plugins/datasource/grafana/types';
 import { dispatch } from 'app/store/store';
 
+import { ScopedResourceServer } from '../apiserver/server';
+import { Resource, ResourceForCreate, ResourceServer } from '../apiserver/types';
 import { DashboardQueryResult, getGrafanaSearcher, SearchQuery } from '../search/service';
 
 import { Playlist, PlaylistItem, PlaylistAPI } from './types';
@@ -37,76 +38,53 @@ class LegacyAPI implements PlaylistAPI {
   }
 }
 
-interface K8sPlaylistList {
-  items: K8sPlaylist[];
+interface PlaylistSpec {
+  title: string;
+  interval: string;
+  items: PlaylistItem[];
 }
 
-interface K8sPlaylist {
-  apiVersion: string;
-  kind: 'Playlist';
-  metadata: {
-    name: string;
-  };
-  spec: {
-    title: string;
-    interval: string;
-    items: PlaylistItem[];
-  };
-}
+type K8sPlaylist = Resource<PlaylistSpec>;
 
 class K8sAPI implements PlaylistAPI {
-  readonly apiVersion = 'playlist.grafana.app/v0alpha1';
-  readonly url: string;
-  readonly legacy: PlaylistAPI | undefined;
+  readonly server: ResourceServer<PlaylistSpec>;
 
   constructor() {
-    const ns = contextSrv.user.orgId === 1 ? 'default' : `org-${contextSrv.user.orgId}`;
-    this.url = `/apis/${this.apiVersion}/namespaces/${ns}/playlists`;
-
-    // When undefined, this will use k8s for all CRUD features
-    // if (!config.featureToggles.grafanaAPIServerWithExperimentalAPIs) {
-    this.legacy = new LegacyAPI();
+    this.server = new ScopedResourceServer<PlaylistSpec>({
+      group: 'playlist.grafana.app',
+      version: 'v0alpha1',
+      resource: 'playlists',
+    });
   }
 
   async getAllPlaylist(): Promise<Playlist[]> {
-    const result = await getBackendSrv().get<K8sPlaylistList>(this.url);
+    const result = await this.server.list();
     return result.items.map(k8sResourceAsPlaylist);
   }
 
   async getPlaylist(uid: string): Promise<Playlist> {
-    const r = await getBackendSrv().get<K8sPlaylist>(this.url + '/' + uid);
+    const r = await this.server.get(uid);
     const p = k8sResourceAsPlaylist(r);
     await migrateInternalIDs(p);
     return p;
   }
 
   async createPlaylist(playlist: Playlist): Promise<void> {
-    if (this.legacy) {
-      return this.legacy.createPlaylist(playlist);
-    }
     const body = this.playlistAsK8sResource(playlist);
-    await withErrorHandling(() => getBackendSrv().post(this.url, body));
+    await withErrorHandling(() => this.server.create(body));
   }
 
   async updatePlaylist(playlist: Playlist): Promise<void> {
-    if (this.legacy) {
-      return this.legacy.updatePlaylist(playlist);
-    }
     const body = this.playlistAsK8sResource(playlist);
-    await withErrorHandling(() => getBackendSrv().put(`${this.url}/${playlist.uid}`, body));
+    await withErrorHandling(() => this.server.update(body).then(() => {}));
   }
 
   async deletePlaylist(uid: string): Promise<void> {
-    if (this.legacy) {
-      return this.legacy.deletePlaylist(uid);
-    }
-    await withErrorHandling(() => getBackendSrv().delete(`${this.url}/${uid}`), 'Playlist deleted');
+    await withErrorHandling(() => this.server.delete(uid).then(() => {}), 'Playlist deleted');
   }
 
-  playlistAsK8sResource = (playlist: Playlist): K8sPlaylist => {
+  playlistAsK8sResource = (playlist: Playlist): ResourceForCreate<PlaylistSpec> => {
     return {
-      apiVersion: this.apiVersion,
-      kind: 'Playlist',
       metadata: {
         name: playlist.uid, // uid as k8s name
       },
@@ -120,7 +98,7 @@ class K8sAPI implements PlaylistAPI {
 }
 
 // This converts a saved k8s resource into a playlist object
-// the main difference is that k8s uses metdata.name as the uid
+// the main difference is that k8s uses metadata.name as the uid
 // to avoid future confusion, the display name is now called "title"
 function k8sResourceAsPlaylist(r: K8sPlaylist): Playlist {
   const { spec, metadata } = r;
diff --git a/public/app/features/plugins/admin/__mocks__/catalogPlugin.mock.ts b/public/app/features/plugins/admin/__mocks__/catalogPlugin.mock.ts
index e4c8ffb510fdd..e4c0bf11c3d85 100644
--- a/public/app/features/plugins/admin/__mocks__/catalogPlugin.mock.ts
+++ b/public/app/features/plugins/admin/__mocks__/catalogPlugin.mock.ts
@@ -11,6 +11,7 @@ export default {
       small: 'https://grafana.com/api/plugins/alexanderzobnin-zabbix-app/versions/4.2.2/logos/small',
       large: 'https://grafana.com/api/plugins/alexanderzobnin-zabbix-app/versions/4.2.2/logos/large',
     },
+    keywords: ['zabbix', 'monitoring', 'dashboard'],
   },
   isCore: false,
   isDev: false,
diff --git a/public/app/features/plugins/admin/__mocks__/localPlugin.mock.ts b/public/app/features/plugins/admin/__mocks__/localPlugin.mock.ts
index b0744b0a2d8c8..341be1f83b532 100644
--- a/public/app/features/plugins/admin/__mocks__/localPlugin.mock.ts
+++ b/public/app/features/plugins/admin/__mocks__/localPlugin.mock.ts
@@ -68,4 +68,5 @@ export default {
   signature: 'valid',
   signatureType: 'community',
   signatureOrg: 'Alexander Zobnin',
+  angularDetected: false,
 } as LocalPlugin;
diff --git a/public/app/features/plugins/admin/__mocks__/remotePlugin.mock.ts b/public/app/features/plugins/admin/__mocks__/remotePlugin.mock.ts
index 1ea0ed50654e2..52b9d0a825ca7 100644
--- a/public/app/features/plugins/admin/__mocks__/remotePlugin.mock.ts
+++ b/public/app/features/plugins/admin/__mocks__/remotePlugin.mock.ts
@@ -9,6 +9,7 @@ export default {
   downloads: 33645089,
   featured: 180,
   id: 74,
+  keywords: ['zabbix', 'monitoring', 'dashboard'],
   typeId: 1,
   typeName: 'Application',
   internal: false,
@@ -46,4 +47,5 @@ export default {
       links: [],
     },
   },
+  angularDetected: false,
 } as RemotePlugin;
diff --git a/public/app/features/plugins/admin/api.ts b/public/app/features/plugins/admin/api.ts
index da44c8538fe4c..a86e32d6a1a28 100644
--- a/public/app/features/plugins/admin/api.ts
+++ b/public/app/features/plugins/admin/api.ts
@@ -2,9 +2,17 @@ import { PluginError, PluginMeta, renderMarkdown } from '@grafana/data';
 import { getBackendSrv, isFetchError } from '@grafana/runtime';
 import { accessControlQueryParam } from 'app/core/utils/accessControl';
 
-import { API_ROOT, GCOM_API_ROOT } from './constants';
+import { API_ROOT, GCOM_API_ROOT, INSTANCE_API_ROOT } from './constants';
 import { isLocalPluginVisibleByConfig, isRemotePluginVisibleByConfig } from './helpers';
-import { LocalPlugin, RemotePlugin, CatalogPluginDetails, Version, PluginVersion } from './types';
+import {
+  LocalPlugin,
+  RemotePlugin,
+  CatalogPluginDetails,
+  Version,
+  PluginVersion,
+  InstancePlugin,
+  ProvisionedPlugin,
+} from './types';
 
 export async function getPluginDetails(id: string): Promise<CatalogPluginDetails> {
   const remote = await getRemotePlugin(id);
@@ -26,17 +34,29 @@ export async function getPluginDetails(id: string): Promise<CatalogPluginDetails
     readme: localReadme || remote?.readme,
     versions,
     statusContext: remote?.statusContext ?? '',
+    iam: remote?.json?.iam,
   };
 }
 
 export async function getRemotePlugins(): Promise<RemotePlugin[]> {
-  // We are also fetching deprecated plugins, because we would like to be able to label plugins in the list that are both installed and deprecated.
-  // (We won't show not installed deprecated plugins in the list)
-  const { items: remotePlugins }: { items: RemotePlugin[] } = await getBackendSrv().get(`${GCOM_API_ROOT}/plugins`, {
-    includeDeprecated: true,
-  });
+  try {
+    const { items: remotePlugins }: { items: RemotePlugin[] } = await getBackendSrv().get(`${GCOM_API_ROOT}/plugins`, {
+      // We are also fetching deprecated plugins, because we would like to be able to label plugins in the list that are both installed and deprecated.
+      // (We won't show not installed deprecated plugins in the list)
+      includeDeprecated: true,
+    });
+
+    return remotePlugins.filter(isRemotePluginVisibleByConfig);
+  } catch (error) {
+    if (isFetchError(error)) {
+      // It can happen that GCOM is not available, in that case we show a limited set of information to the user.
+      error.isHandled = true;
+      console.error('Failed to fetch plugins from catalog (default https://grafana.com/api/plugins)');
+      return [];
+    }
 
-  return remotePlugins.filter(isRemotePluginVisibleByConfig);
+    throw error;
+  }
 }
 
 export async function getPluginErrors(): Promise<PluginError[]> {
@@ -105,6 +125,22 @@ export async function getLocalPlugins(): Promise<LocalPlugin[]> {
   return localPlugins.filter(isLocalPluginVisibleByConfig);
 }
 
+export async function getInstancePlugins(): Promise<InstancePlugin[]> {
+  const { items: instancePlugins }: { items: InstancePlugin[] } = await getBackendSrv().get(
+    `${INSTANCE_API_ROOT}/plugins`
+  );
+
+  return instancePlugins;
+}
+
+export async function getProvisionedPlugins(): Promise<ProvisionedPlugin[]> {
+  const { items: provisionedPlugins }: { items: Array<{ type: string }> } = await getBackendSrv().get(
+    `${INSTANCE_API_ROOT}/provisioned-plugins`
+  );
+
+  return provisionedPlugins.map((plugin) => ({ slug: plugin.type }));
+}
+
 export async function installPlugin(id: string) {
   // This will install the latest compatible version based on the logic
   // on the backend.
diff --git a/public/app/features/plugins/admin/components/GetStartedWithPlugin/GetStartedWithApp.tsx b/public/app/features/plugins/admin/components/GetStartedWithPlugin/GetStartedWithApp.tsx
index ea95689b71f1b..92a8356b697f8 100644
--- a/public/app/features/plugins/admin/components/GetStartedWithPlugin/GetStartedWithApp.tsx
+++ b/public/app/features/plugins/admin/components/GetStartedWithPlugin/GetStartedWithApp.tsx
@@ -19,9 +19,8 @@ export function GetStartedWithApp({ plugin }: Props): React.ReactElement | null
   if (!pluginConfig) {
     return null;
   }
-
   // Enforce RBAC
-  if (!contextSrv.hasPermissionInMetadata(AccessControlAction.PluginsWrite, plugin)) {
+  if (!contextSrv.hasPermission(AccessControlAction.PluginsWrite)) {
     return null;
   }
 
diff --git a/public/app/features/plugins/admin/components/GetStartedWithPlugin/GetStartedWithDataSource.test.tsx b/public/app/features/plugins/admin/components/GetStartedWithPlugin/GetStartedWithDataSource.test.tsx
new file mode 100644
index 0000000000000..512ff968ea05c
--- /dev/null
+++ b/public/app/features/plugins/admin/components/GetStartedWithPlugin/GetStartedWithDataSource.test.tsx
@@ -0,0 +1,80 @@
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+import { TestProvider } from 'test/helpers/TestProvider';
+
+import { PluginSignatureStatus } from '@grafana/data';
+import { config } from '@grafana/runtime';
+import { ContextSrv, setContextSrv } from 'app/core/services/context_srv';
+import { AccessControlAction } from 'app/types';
+
+import { CatalogPlugin } from '../../types';
+
+import { GetStartedWithDataSource } from './GetStartedWithDataSource';
+
+const plugin: CatalogPlugin = {
+  description: 'The test plugin',
+  downloads: 5,
+  id: 'test-plugin',
+  info: {
+    logos: { small: '', large: '' },
+    keywords: ['test', 'plugin'],
+  },
+  name: 'Testing Plugin',
+  orgName: 'Test',
+  popularity: 0,
+  signature: PluginSignatureStatus.valid,
+  publishedAt: '2020-09-01',
+  updatedAt: '2021-06-28',
+  hasUpdate: false,
+  isInstalled: false,
+  isCore: false,
+  isDev: false,
+  isEnterprise: false,
+  isDisabled: false,
+  isDeprecated: false,
+  isPublished: true,
+};
+
+describe('GetStartedWithDataSource', () => {
+  const oldFeatureTogglesManagedPluginsInstall = config.featureToggles.managedPluginsInstall;
+  const oldPluginAdminExternalManageEnabled = config.pluginAdminExternalManageEnabled;
+
+  config.featureToggles.managedPluginsInstall = true;
+  config.pluginAdminExternalManageEnabled = true;
+
+  const contextSrv = new ContextSrv();
+  contextSrv.user.permissions = {
+    [AccessControlAction.DataSourcesCreate]: true,
+    [AccessControlAction.DataSourcesWrite]: true,
+  };
+  setContextSrv(contextSrv);
+
+  afterAll(() => {
+    config.featureToggles.managedPluginsInstall = oldFeatureTogglesManagedPluginsInstall;
+    config.pluginAdminExternalManageEnabled = oldPluginAdminExternalManageEnabled;
+  });
+
+  it('should disable button when managedPluginsInstall and pluginAdminExternalManaged are enabled, but plugin.isFullyInstalled is false', () => {
+    render(
+      <TestProvider>
+        <GetStartedWithDataSource plugin={{ ...plugin, isFullyInstalled: false }} />
+      </TestProvider>
+    );
+
+    const el = screen.getByRole('button', { hidden: true });
+    expect(el).toHaveTextContent(/Add new data source/i);
+    expect(el).toBeDisabled();
+  });
+
+  it('should disable button when managedPluginsInstall and pluginAdminExternalManaged are enabled, but plugin.isFullyInstalled is true', () => {
+    render(
+      <TestProvider>
+        <GetStartedWithDataSource plugin={{ ...plugin, isFullyInstalled: true }} />
+      </TestProvider>
+    );
+
+    const el = screen.getByRole('button', { hidden: true });
+    expect(el).toHaveTextContent(/Add new data source/i);
+    expect(el).toBeEnabled();
+  });
+});
diff --git a/public/app/features/plugins/admin/components/GetStartedWithPlugin/GetStartedWithDataSource.tsx b/public/app/features/plugins/admin/components/GetStartedWithPlugin/GetStartedWithDataSource.tsx
index 56cf7602f2e0f..aad3e99d2188c 100644
--- a/public/app/features/plugins/admin/components/GetStartedWithPlugin/GetStartedWithDataSource.tsx
+++ b/public/app/features/plugins/admin/components/GetStartedWithPlugin/GetStartedWithDataSource.tsx
@@ -1,6 +1,7 @@
 import React, { useCallback } from 'react';
 
 import { DataSourcePluginMeta } from '@grafana/data';
+import { config } from '@grafana/runtime';
 import { Button } from '@grafana/ui';
 import { useDataSourcesRoutes, addDataSource } from 'app/features/datasources/state';
 import { useDispatch } from 'app/types';
@@ -28,8 +29,18 @@ export function GetStartedWithDataSource({ plugin }: Props): React.ReactElement
     return null;
   }
 
+  const disabledButton =
+    config.featureToggles.managedPluginsInstall && config.pluginAdminExternalManageEnabled && !plugin.isFullyInstalled;
+
   return (
-    <Button variant="primary" onClick={onAddDataSource}>
+    <Button
+      variant="primary"
+      onClick={onAddDataSource}
+      disabled={disabledButton}
+      title={
+        disabledButton ? "The plugin isn't usable yet, it may take some time to complete the installation." : undefined
+      }
+    >
       Add new data source
     </Button>
   );
diff --git a/public/app/features/plugins/admin/components/InstallControls/InstallControlsButton.test.tsx b/public/app/features/plugins/admin/components/InstallControls/InstallControlsButton.test.tsx
index d06268248d717..1da1da10d29e8 100644
--- a/public/app/features/plugins/admin/components/InstallControls/InstallControlsButton.test.tsx
+++ b/public/app/features/plugins/admin/components/InstallControls/InstallControlsButton.test.tsx
@@ -4,7 +4,9 @@ import { TestProvider } from 'test/helpers/TestProvider';
 
 import { PluginSignatureStatus } from '@grafana/data';
 import { config } from '@grafana/runtime';
+import { configureStore } from 'app/store/configureStore';
 
+import { getPluginsStateMock } from '../../__mocks__';
 import { CatalogPlugin, PluginStatus } from '../../types';
 
 import { InstallControlsButton } from './InstallControlsButton';
@@ -15,6 +17,7 @@ const plugin: CatalogPlugin = {
   id: 'test-plugin',
   info: {
     logos: { small: '', large: '' },
+    keywords: ['test', 'plugin'],
   },
   name: 'Testing Plugin',
   orgName: 'Test',
@@ -90,4 +93,154 @@ describe('InstallControlsButton', () => {
     );
     expect(screen.queryByRole('button')).not.toBeInTheDocument();
   });
+
+  describe('update button on prem', () => {
+    const store = configureStore({
+      plugins: getPluginsStateMock([]),
+    });
+
+    it('should be disabled when is Installing', () => {
+      store.dispatch({ type: 'plugins/install/pending' });
+      render(
+        <TestProvider store={store}>
+          <InstallControlsButton plugin={{ ...plugin }} pluginStatus={PluginStatus.UPDATE} />
+        </TestProvider>
+      );
+      const button = screen.getByText('Updating').closest('button');
+      expect(button).toBeDisabled();
+    });
+
+    it('should be enabled when it is not Installing', () => {
+      store.dispatch({ type: 'plugins/install/fulfilled', payload: { id: '', changes: {} } });
+      render(
+        <TestProvider store={store}>
+          <InstallControlsButton plugin={{ ...plugin }} pluginStatus={PluginStatus.UPDATE} />
+        </TestProvider>
+      );
+      const button = screen.getByText('Update').closest('button');
+      expect(button).toBeEnabled();
+    });
+  });
+
+  describe('update button on managed instance', () => {
+    const oldFeatureTogglesManagedPluginsInstall = config.featureToggles.managedPluginsInstall;
+    const oldPluginAdminExternalManageEnabled = config.pluginAdminExternalManageEnabled;
+
+    beforeAll(() => {
+      config.featureToggles.managedPluginsInstall = true;
+      config.pluginAdminExternalManageEnabled = true;
+    });
+
+    afterAll(() => {
+      config.featureToggles.managedPluginsInstall = oldFeatureTogglesManagedPluginsInstall;
+      config.pluginAdminExternalManageEnabled = oldPluginAdminExternalManageEnabled;
+    });
+
+    const store = configureStore({
+      plugins: getPluginsStateMock([]),
+    });
+
+    it('should be disabled when isInstalling=false but isUpdatingFromInstance=true', () => {
+      store.dispatch({ type: 'plugins/install/fulfilled', payload: { id: '', changes: {} } });
+      render(
+        <TestProvider store={store}>
+          <InstallControlsButton
+            plugin={{ ...plugin, isUpdatingFromInstance: true }}
+            pluginStatus={PluginStatus.UPDATE}
+          />
+        </TestProvider>
+      );
+      const button = screen.getByText('Update').closest('button');
+      expect(button).toBeDisabled();
+    });
+
+    it('should be enabled when isInstalling=false and isUpdatingFromInstance=false', () => {
+      store.dispatch({ type: 'plugins/install/fulfilled', payload: { id: '', changes: {} } });
+      render(
+        <TestProvider store={store}>
+          <InstallControlsButton
+            plugin={{ ...plugin, isUpdatingFromInstance: false }}
+            pluginStatus={PluginStatus.UPDATE}
+          />
+        </TestProvider>
+      );
+      const button = screen.getByText('Update').closest('button');
+      expect(button).toBeEnabled();
+    });
+  });
+
+  describe('uninstall button on prem', () => {
+    const store = configureStore({
+      plugins: getPluginsStateMock([]),
+    });
+
+    it('should be disabled when is Installing', () => {
+      store.dispatch({ type: 'plugins/uninstall/pending' });
+      render(
+        <TestProvider store={store}>
+          <InstallControlsButton plugin={{ ...plugin }} pluginStatus={PluginStatus.UNINSTALL} />
+        </TestProvider>
+      );
+      const button = screen.getByText('Uninstalling').closest('button');
+      expect(button).toBeDisabled();
+    });
+
+    it('should be enabled when it is not Installing', () => {
+      store.dispatch({ type: 'plugins/uninstall/fulfilled', payload: { id: '', changes: {} } });
+      render(
+        <TestProvider store={store}>
+          <InstallControlsButton plugin={{ ...plugin }} pluginStatus={PluginStatus.UNINSTALL} />
+        </TestProvider>
+      );
+      const button = screen.getByText('Uninstall').closest('button');
+      expect(button).toBeEnabled();
+    });
+  });
+
+  describe('uninstall button on managed instance', () => {
+    const oldFeatureTogglesManagedPluginsInstall = config.featureToggles.managedPluginsInstall;
+    const oldPluginAdminExternalManageEnabled = config.pluginAdminExternalManageEnabled;
+
+    beforeAll(() => {
+      config.featureToggles.managedPluginsInstall = true;
+      config.pluginAdminExternalManageEnabled = true;
+    });
+
+    afterAll(() => {
+      config.featureToggles.managedPluginsInstall = oldFeatureTogglesManagedPluginsInstall;
+      config.pluginAdminExternalManageEnabled = oldPluginAdminExternalManageEnabled;
+    });
+
+    const store = configureStore({
+      plugins: getPluginsStateMock([]),
+    });
+
+    it('should be disabled when isInstalling=false but isUninstallingFromInstance=true', () => {
+      store.dispatch({ type: 'plugins/uninstall/fulfilled', payload: { id: '', changes: {} } });
+      render(
+        <TestProvider store={store}>
+          <InstallControlsButton
+            plugin={{ ...plugin, isUninstallingFromInstance: true }}
+            pluginStatus={PluginStatus.UNINSTALL}
+          />
+        </TestProvider>
+      );
+      const button = screen.getByText('Uninstall').closest('button');
+      expect(button).toBeDisabled();
+    });
+
+    it('should be enabled when isInstalling=false and isUninstallingFromInstance=false', () => {
+      store.dispatch({ type: 'plugins/uninstall/fulfilled', payload: { id: '', changes: {} } });
+      render(
+        <TestProvider store={store}>
+          <InstallControlsButton
+            plugin={{ ...plugin, isUninstallingFromInstance: false }}
+            pluginStatus={PluginStatus.UNINSTALL}
+          />
+        </TestProvider>
+      );
+      const button = screen.getByText('Uninstall').closest('button');
+      expect(button).toBeEnabled();
+    });
+  });
 });
diff --git a/public/app/features/plugins/admin/components/InstallControls/InstallControlsButton.tsx b/public/app/features/plugins/admin/components/InstallControls/InstallControlsButton.tsx
index 34595d3039300..5ea2afbc7db28 100644
--- a/public/app/features/plugins/admin/components/InstallControls/InstallControlsButton.tsx
+++ b/public/app/features/plugins/admin/components/InstallControls/InstallControlsButton.tsx
@@ -5,6 +5,7 @@ import { AppEvents } from '@grafana/data';
 import { config, locationService } from '@grafana/runtime';
 import { Button, HorizontalGroup, ConfirmModal } from '@grafana/ui';
 import appEvents from 'app/core/app_events';
+import configCore from 'app/core/config';
 import { useQueryParams } from 'app/core/hooks/useQueryParams';
 import { removePluginFromNavTree } from 'app/core/reducers/navBarTree';
 import { useDispatch } from 'app/types';
@@ -65,13 +66,18 @@ export function InstallControlsButton({
   const onInstall = async () => {
     trackPluginInstalled(trackingProps);
     const result = await install(plugin.id, latestCompatibleVersion?.version);
-    // refresh the store to have the new installed plugin
-    await fetchDetails(plugin.id);
     if (!errorInstalling && !('error' in result)) {
-      appEvents.emit(AppEvents.alertSuccess, [`Installed ${plugin.name}`]);
+      let successMessage = `Installed ${plugin.name}`;
+      if (config.pluginAdminExternalManageEnabled && configCore.featureToggles.managedPluginsInstall) {
+        successMessage = 'Install requested, this may take a few minutes.';
+      }
+
+      appEvents.emit(AppEvents.alertSuccess, [successMessage]);
       if (plugin.type === 'app') {
         setNeedReload?.(true);
       }
+
+      await fetchDetails(plugin.id);
     }
   };
 
@@ -86,7 +92,13 @@ export function InstallControlsButton({
       if (isViewingAppConfigPage) {
         locationService.replace(`${location.pathname}?page=${PluginTabIds.OVERVIEW}`);
       }
-      appEvents.emit(AppEvents.alertSuccess, [`Uninstalled ${plugin.name}`]);
+
+      let successMessage = `Uninstalled ${plugin.name}`;
+      if (config.pluginAdminExternalManageEnabled && configCore.featureToggles.managedPluginsInstall) {
+        successMessage = 'Uninstall requested, this may take a few minutes.';
+      }
+
+      appEvents.emit(AppEvents.alertSuccess, [successMessage]);
       if (plugin.type === 'app') {
         dispatch(removePluginFromNavTree({ pluginID: plugin.id }));
         setNeedReload?.(false);
@@ -102,6 +114,11 @@ export function InstallControlsButton({
   };
 
   if (pluginStatus === PluginStatus.UNINSTALL) {
+    const disableUninstall =
+      config.pluginAdminExternalManageEnabled && configCore.featureToggles.managedPluginsInstall
+        ? plugin.isUninstallingFromInstance
+        : isUninstalling;
+
     return (
       <>
         <ConfirmModal
@@ -114,7 +131,7 @@ export function InstallControlsButton({
           onDismiss={hideConfirmModal}
         />
         <HorizontalGroup align="flex-start" width="auto" height="auto">
-          <Button variant="destructive" disabled={isUninstalling} onClick={showConfirmModal}>
+          <Button variant="destructive" disabled={disableUninstall} onClick={showConfirmModal}>
             {uninstallBtnText}
           </Button>
         </HorizontalGroup>
@@ -128,9 +145,14 @@ export function InstallControlsButton({
   }
 
   if (pluginStatus === PluginStatus.UPDATE) {
+    const disableUpdate =
+      config.pluginAdminExternalManageEnabled && configCore.featureToggles.managedPluginsInstall
+        ? plugin.isUpdatingFromInstance
+        : isInstalling;
+
     return (
       <HorizontalGroup align="flex-start" width="auto" height="auto">
-        <Button disabled={isInstalling} onClick={onUpdate}>
+        <Button disabled={disableUpdate} onClick={onUpdate}>
           {isInstalling ? 'Updating' : 'Update'}
         </Button>
         <Button variant="destructive" disabled={isUninstalling} onClick={onUninstall}>
diff --git a/public/app/features/plugins/admin/components/PluginActions.tsx b/public/app/features/plugins/admin/components/PluginActions.tsx
index 4ee30e3f0b637..e5df960c1f600 100644
--- a/public/app/features/plugins/admin/components/PluginActions.tsx
+++ b/public/app/features/plugins/admin/components/PluginActions.tsx
@@ -4,6 +4,7 @@ import React, { useState } from 'react';
 import { GrafanaTheme2 } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { HorizontalGroup, Icon, useStyles2, VerticalGroup } from '@grafana/ui';
+import configCore from 'app/core/config';
 
 import { GetStartedWithPlugin } from '../components/GetStartedWithPlugin';
 import { InstallControlsButton } from '../components/InstallControls';
@@ -40,7 +41,7 @@ export const PluginActions = ({ plugin }: Props) => {
       <HorizontalGroup>
         {!isInstallControlsDisabled && (
           <>
-            {isExternallyManaged && !hasInstallWarning ? (
+            {isExternallyManaged && !hasInstallWarning && !configCore.featureToggles.managedPluginsInstall ? (
               <ExternallyManagedButton
                 pluginId={plugin.id}
                 pluginStatus={pluginStatus}
diff --git a/public/app/features/plugins/admin/components/PluginDashboards.tsx b/public/app/features/plugins/admin/components/PluginDashboards.tsx
index 10e39ef7bd347..1cd035cebd137 100644
--- a/public/app/features/plugins/admin/components/PluginDashboards.tsx
+++ b/public/app/features/plugins/admin/components/PluginDashboards.tsx
@@ -102,10 +102,6 @@ export class PluginDashboards extends PureComponent<Props, State> {
       return <div>No dashboards are included with this plugin</div>;
     }
 
-    return (
-      <div className="gf-form-group">
-        <DashboardsTable dashboards={dashboards} onImport={this.import} onRemove={this.remove} />
-      </div>
-    );
+    return <DashboardsTable dashboards={dashboards} onImport={this.import} onRemove={this.remove} />;
   }
 }
diff --git a/public/app/features/plugins/admin/components/PluginDetailsBody.tsx b/public/app/features/plugins/admin/components/PluginDetailsBody.tsx
index 58d503472af89..54420db174e6f 100644
--- a/public/app/features/plugins/admin/components/PluginDetailsBody.tsx
+++ b/public/app/features/plugins/admin/components/PluginDetailsBody.tsx
@@ -1,12 +1,13 @@
 import { css, cx } from '@emotion/css';
-import React from 'react';
+import React, { useMemo } from 'react';
 
 import { AppPlugin, GrafanaTheme2, PluginContextProvider, UrlQueryMap } from '@grafana/data';
-import { useStyles2 } from '@grafana/ui';
+import { config } from '@grafana/runtime';
+import { CellProps, Column, InteractiveTable, Stack, useStyles2 } from '@grafana/ui';
 
 import { VersionList } from '../components/VersionList';
 import { usePluginConfig } from '../hooks/usePluginConfig';
-import { CatalogPlugin, PluginTabIds } from '../types';
+import { CatalogPlugin, Permission, PluginTabIds } from '../types';
 
 import { AppConfigCtrlWrapper } from './AppConfigWrapper';
 import { PluginDashboards } from './PluginDashboards';
@@ -18,10 +19,28 @@ type Props = {
   pageId: string;
 };
 
+type Cell<T extends keyof Permission = keyof Permission> = CellProps<Permission, Permission[T]>;
+
 export function PluginDetailsBody({ plugin, queryParams, pageId }: Props): JSX.Element {
   const styles = useStyles2(getStyles);
   const { value: pluginConfig } = usePluginConfig(plugin);
 
+  const columns: Array<Column<Permission>> = useMemo(
+    () => [
+      {
+        id: 'action',
+        header: 'Action',
+        cell: ({ cell: { value } }: Cell<'action'>) => value,
+      },
+      {
+        id: 'scope',
+        header: 'Scope',
+        cell: ({ cell: { value } }: Cell<'scope'>) => value,
+      },
+    ],
+    []
+  );
+
   if (pageId === PluginTabIds.OVERVIEW) {
     return (
       <div
@@ -49,6 +68,31 @@ export function PluginDetailsBody({ plugin, queryParams, pageId }: Props): JSX.E
     );
   }
 
+  // Permissions will be returned in the iam field for installed plugins and in the details.iam field when fetching details from gcom
+  const permissions = plugin.iam?.permissions || plugin.details?.iam?.permissions;
+
+  const displayPermissions =
+    config.featureToggles.externalServiceAccounts &&
+    pageId === PluginTabIds.IAM &&
+    permissions &&
+    permissions.length > 0;
+
+  if (displayPermissions) {
+    return (
+      <>
+        <Stack direction="row">
+          The {plugin.name} plugin needs a service account to be able to query Grafana. The following list contains the
+          permissions available to the service account:
+        </Stack>
+        <InteractiveTable
+          columns={columns}
+          data={permissions}
+          getRowId={(permission: Permission) => String(permission.action)}
+        />
+      </>
+    );
+  }
+
   if (pluginConfig?.configPages) {
     for (const configPage of pluginConfig.configPages) {
       if (pageId === configPage.id) {
@@ -87,55 +131,44 @@ export function PluginDetailsBody({ plugin, queryParams, pageId }: Props): JSX.E
 }
 
 export const getStyles = (theme: GrafanaTheme2) => ({
-  container: css``,
-  readme: css`
-    & img {
-      max-width: 100%;
-    }
-
-    h1,
-    h2,
-    h3 {
-      margin-top: ${theme.spacing(3)};
-      margin-bottom: ${theme.spacing(2)};
-    }
-
-    *:first-child {
-      margin-top: 0;
-    }
-
-    li {
-      margin-left: ${theme.spacing(2)};
-      & > p {
-        margin: ${theme.spacing()} 0;
-      }
-    }
-
-    a {
-      color: ${theme.colors.text.link};
-
-      &:hover {
-        color: ${theme.colors.text.link};
-        text-decoration: underline;
-      }
-    }
-
-    table {
-      table-layout: fixed;
-      width: 100%;
-
-      td,
-      th {
-        overflow-x: auto;
-        padding: ${theme.spacing(0.5)} ${theme.spacing(1)};
-      }
-
-      table,
-      th,
-      td {
-        border: 1px solid ${theme.colors.border.medium};
-        border-collapse: collapse;
-      }
-    }
-  `,
+  container: css({
+    height: '100%',
+  }),
+  readme: css({
+    '& img': {
+      maxWidth: '100%',
+    },
+    'h1, h2, h3': {
+      marginTop: theme.spacing(3),
+      marginBottom: theme.spacing(2),
+    },
+    '*:first-child': {
+      marginTop: 0,
+    },
+    li: {
+      marginLeft: theme.spacing(2),
+      '& > p': {
+        margin: theme.spacing(1, 0),
+      },
+    },
+    a: {
+      color: theme.colors.text.link,
+      '&:hover': {
+        color: theme.colors.text.link,
+        textDecoration: 'underline',
+      },
+    },
+    table: {
+      tableLayout: 'fixed',
+      width: '100%',
+      'td, th': {
+        overflowX: 'auto',
+        padding: theme.spacing(0.5, 1),
+      },
+      'table, th, td': {
+        border: `1px solid ${theme.colors.border.medium}`,
+        borderCollapse: 'collapse',
+      },
+    },
+  }),
 });
diff --git a/public/app/features/plugins/admin/components/PluginDetailsDeprecatedWarning.tsx b/public/app/features/plugins/admin/components/PluginDetailsDeprecatedWarning.tsx
index 1a6a02eb7ccb9..c4977b81afcef 100644
--- a/public/app/features/plugins/admin/components/PluginDetailsDeprecatedWarning.tsx
+++ b/public/app/features/plugins/admin/components/PluginDetailsDeprecatedWarning.tsx
@@ -1,5 +1,6 @@
 import React, { useState } from 'react';
 
+import { renderMarkdown } from '@grafana/data';
 import { Alert } from '@grafana/ui';
 
 import { CatalogPlugin } from '../types';
@@ -13,16 +14,31 @@ export function PluginDetailsDeprecatedWarning(props: Props): React.ReactElement
   const { className, plugin } = props;
   const [dismissed, setDismissed] = useState(false);
   const isWarningVisible = plugin.isDeprecated && !dismissed;
-  let deprecationMessage = `This ${plugin.type} plugin is deprecated and has been removed from the catalog. No further updates will be made to the
-  plugin.`;
-
-  if (plugin.details?.statusContext) {
-    deprecationMessage += ` More information: ${plugin.details.statusContext}`;
-  }
 
   return isWarningVisible ? (
     <Alert severity="warning" title="Deprecated" className={className} onRemove={() => setDismissed(true)}>
-      <p>{deprecationMessage}</p>
+      <p>
+        This {plugin.type} plugin is{' '}
+        <a
+          className="external-link"
+          href="https://grafana.com/legal/plugin-deprecation/"
+          rel="noreferrer"
+          target="_blank"
+        >
+          deprecated
+        </a>{' '}
+        and has been removed from the catalog.
+      </p>
+
+      {/* Additional contextual deprecation message supporting markdown */}
+      {plugin.details?.statusContext && (
+        <div
+          className="markdown-html"
+          dangerouslySetInnerHTML={{
+            __html: renderMarkdown(plugin.details.statusContext),
+          }}
+        />
+      )}
     </Alert>
   ) : null;
 }
diff --git a/public/app/features/plugins/admin/components/PluginDetailsDisabledError.tsx b/public/app/features/plugins/admin/components/PluginDetailsDisabledError.tsx
index 1d2c73711cb0d..344e287f2837e 100644
--- a/public/app/features/plugins/admin/components/PluginDetailsDisabledError.tsx
+++ b/public/app/features/plugins/admin/components/PluginDetailsDisabledError.tsx
@@ -21,7 +21,7 @@ export function PluginDetailsDisabledError({ className, plugin }: Props): ReactE
       severity="error"
       title="Plugin disabled"
       className={className}
-      aria-label={selectors.pages.PluginPage.disabledInfo}
+      data-testid={selectors.pages.PluginPage.disabledInfo}
     >
       {renderDescriptionFromError(plugin.error)}
       <p>Please contact your server administrator to get this resolved.</p>
diff --git a/public/app/features/plugins/admin/components/PluginDetailsHeaderDependencies.tsx b/public/app/features/plugins/admin/components/PluginDetailsHeaderDependencies.tsx
index 570fe47a5534b..034b2374a888c 100644
--- a/public/app/features/plugins/admin/components/PluginDetailsHeaderDependencies.tsx
+++ b/public/app/features/plugins/admin/components/PluginDetailsHeaderDependencies.tsx
@@ -2,27 +2,19 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { useStyles2, Icon } from '@grafana/ui';
+import { useStyles2, Icon, Stack } from '@grafana/ui';
 
-import { Version, CatalogPlugin, PluginIconName } from '../types';
+import { CatalogPlugin, PluginIconName } from '../types';
 
 type Props = {
   plugin: CatalogPlugin;
-  latestCompatibleVersion?: Version;
+  grafanaDependency?: string;
   className?: string;
 };
 
-export function PluginDetailsHeaderDependencies({
-  plugin,
-  latestCompatibleVersion,
-  className,
-}: Props): React.ReactElement | null {
+export function PluginDetailsHeaderDependencies({ plugin, grafanaDependency }: Props): React.ReactElement | null {
   const styles = useStyles2(getStyles);
   const pluginDependencies = plugin.details?.pluginDependencies;
-  const grafanaDependency = plugin.isInstalled
-    ? plugin.details?.grafanaDependency
-    : latestCompatibleVersion?.grafanaDependency || plugin.details?.grafanaDependency;
   const hasNoDependencyInfo = !grafanaDependency && (!pluginDependencies || !pluginDependencies.length);
 
   if (hasNoDependencyInfo) {
diff --git a/public/app/features/plugins/admin/components/PluginDetailsPage.tsx b/public/app/features/plugins/admin/components/PluginDetailsPage.tsx
index 39f9b50659e49..8eaeb076516d1 100644
--- a/public/app/features/plugins/admin/components/PluginDetailsPage.tsx
+++ b/public/app/features/plugins/admin/components/PluginDetailsPage.tsx
@@ -111,6 +111,7 @@ export const getStyles = (theme: GrafanaTheme2) => {
     tabContent: css`
       overflow: auto;
       height: 100%;
+      padding-left: 5px;
     `,
   };
 };
diff --git a/public/app/features/plugins/admin/components/PluginDetailsSignature.tsx b/public/app/features/plugins/admin/components/PluginDetailsSignature.tsx
index bdb0a250e62fd..f88e544cdac10 100644
--- a/public/app/features/plugins/admin/components/PluginDetailsSignature.tsx
+++ b/public/app/features/plugins/admin/components/PluginDetailsSignature.tsx
@@ -26,7 +26,7 @@ export function PluginDetailsSignature({ className, plugin }: Props): React.Reac
     <Alert
       severity="warning"
       title="Invalid plugin signature"
-      aria-label={selectors.pages.PluginPage.signatureInfo}
+      data-testid={selectors.pages.PluginPage.signatureInfo}
       className={className}
     >
       <p>
diff --git a/public/app/features/plugins/admin/components/PluginList.test.tsx b/public/app/features/plugins/admin/components/PluginList.test.tsx
index 45f153a71a442..72218c02660b2 100644
--- a/public/app/features/plugins/admin/components/PluginList.test.tsx
+++ b/public/app/features/plugins/admin/components/PluginList.test.tsx
@@ -32,6 +32,7 @@ const getMockPlugin = (id: string): CatalogPlugin => {
         small: 'https://grafana.com/api/plugins/test-plugin/versions/0.0.10/logos/small',
         large: 'https://grafana.com/api/plugins/test-plugin/versions/0.0.10/logos/large',
       },
+      keywords: ['test', 'plugin'],
     },
     name: 'Testing Plugin',
     orgName: 'Test',
diff --git a/public/app/features/plugins/admin/components/PluginList.tsx b/public/app/features/plugins/admin/components/PluginList.tsx
index b793a39f5b52e..76ad72cc2b46b 100644
--- a/public/app/features/plugins/admin/components/PluginList.tsx
+++ b/public/app/features/plugins/admin/components/PluginList.tsx
@@ -2,7 +2,8 @@ import React from 'react';
 import { useLocation } from 'react-router-dom';
 
 import { config } from '@grafana/runtime';
-import { Grid } from '@grafana/ui/src/unstable';
+import { EmptyState, Grid } from '@grafana/ui';
+import { t } from 'app/core/internationalization';
 
 import { CatalogPlugin, PluginListDisplayMode } from '../types';
 
@@ -11,18 +12,25 @@ import { PluginListItem } from './PluginListItem';
 interface Props {
   plugins: CatalogPlugin[];
   displayMode: PluginListDisplayMode;
+  isLoading?: boolean;
 }
 
-export const PluginList = ({ plugins, displayMode }: Props) => {
+export const PluginList = ({ plugins, displayMode, isLoading }: Props) => {
   const isList = displayMode === PluginListDisplayMode.List;
   const { pathname } = useLocation();
   const pathName = config.appSubUrl + (pathname.endsWith('/') ? pathname.slice(0, -1) : pathname);
 
+  if (!isLoading && plugins.length === 0) {
+    return <EmptyState variant="not-found" message={t('plugins.empty-state.message', 'No plugins found')} />;
+  }
+
   return (
-    <Grid gap={3} columns={isList ? 1 : undefined} minColumnWidth={isList ? undefined : 34} data-testid="plugin-list">
-      {plugins.map((plugin) => (
-        <PluginListItem key={plugin.id} plugin={plugin} pathName={pathName} displayMode={displayMode} />
-      ))}
+    <Grid gap={3} {...(isList ? { columns: 1 } : { minColumnWidth: 34 })} data-testid="plugin-list">
+      {isLoading
+        ? new Array(50).fill(null).map((_, index) => <PluginListItem.Skeleton key={index} displayMode={displayMode} />)
+        : plugins.map((plugin) => (
+            <PluginListItem key={plugin.id} plugin={plugin} pathName={pathName} displayMode={displayMode} />
+          ))}
     </Grid>
   );
 };
diff --git a/public/app/features/plugins/admin/components/PluginListItem.test.tsx b/public/app/features/plugins/admin/components/PluginListItem.test.tsx
index dbb5bbb50a808..c4d42d615abe4 100644
--- a/public/app/features/plugins/admin/components/PluginListItem.test.tsx
+++ b/public/app/features/plugins/admin/components/PluginListItem.test.tsx
@@ -42,6 +42,7 @@ describe('PluginListItem', () => {
         small: 'https://grafana.com/api/plugins/test-plugin/versions/0.0.10/logos/small',
         large: 'https://grafana.com/api/plugins/test-plugin/versions/0.0.10/logos/large',
       },
+      keywords: ['test', 'plugin'],
     },
     name: 'Testing Plugin',
     orgName: 'Test',
diff --git a/public/app/features/plugins/admin/components/PluginListItem.tsx b/public/app/features/plugins/admin/components/PluginListItem.tsx
index 31de4c21133ce..a512b23be16b9 100644
--- a/public/app/features/plugins/admin/components/PluginListItem.tsx
+++ b/public/app/features/plugins/admin/components/PluginListItem.tsx
@@ -1,8 +1,11 @@
 import { css, cx } from '@emotion/css';
 import React from 'react';
+import Skeleton from 'react-loading-skeleton';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Icon, useStyles2 } from '@grafana/ui';
+import { locationService, reportInteraction } from '@grafana/runtime';
+import { Badge, Icon, Stack, useStyles2 } from '@grafana/ui';
+import { SkeletonComponent, attachSkeleton } from '@grafana/ui/src/unstable';
 
 import { CatalogPlugin, PluginIconName, PluginListDisplayMode } from '../types';
 
@@ -17,12 +20,21 @@ type Props = {
   displayMode?: PluginListDisplayMode;
 };
 
-export function PluginListItem({ plugin, pathName, displayMode = PluginListDisplayMode.Grid }: Props) {
+function PluginListItemComponent({ plugin, pathName, displayMode = PluginListDisplayMode.Grid }: Props) {
   const styles = useStyles2(getStyles);
   const isList = displayMode === PluginListDisplayMode.List;
 
+  const reportUserClickInteraction = () => {
+    if (locationService.getSearchObject()?.q) {
+      reportInteraction('plugins_search_user_click', {});
+    }
+  };
   return (
-    <a href={`${pathName}/${plugin.id}`} className={cx(styles.container, { [styles.list]: isList })}>
+    <a
+      href={`${pathName}/${plugin.id}`}
+      className={cx(styles.container, { [styles.list]: isList })}
+      onClick={reportUserClickInteraction}
+    >
       <PluginLogo src={plugin.info.logos.small} className={styles.pluginLogo} height={LOGO_SIZE} alt="" />
       <h2 className={cx(styles.name, 'plugin-name')}>{plugin.name}</h2>
       <div className={cx(styles.content, 'plugin-content')}>
@@ -36,67 +48,107 @@ export function PluginListItem({ plugin, pathName, displayMode = PluginListDispl
   );
 }
 
+const PluginListItemSkeleton: SkeletonComponent<Pick<Props, 'displayMode'>> = ({
+  displayMode = PluginListDisplayMode.Grid,
+  rootProps,
+}) => {
+  const styles = useStyles2(getStyles);
+  const isList = displayMode === PluginListDisplayMode.List;
+
+  return (
+    <div className={cx(styles.container, { [styles.list]: isList })} {...rootProps}>
+      <Skeleton
+        containerClassName={cx(
+          styles.pluginLogo,
+          css({
+            lineHeight: 1,
+          })
+        )}
+        width={LOGO_SIZE}
+        height={LOGO_SIZE}
+      />
+      <h2 className={styles.name}>
+        <Skeleton width={100} />
+      </h2>
+      <div className={styles.content}>
+        <p>
+          <Skeleton width={120} />
+        </p>
+        <Stack direction="row">
+          <Badge.Skeleton />
+          <Badge.Skeleton />
+        </Stack>
+      </div>
+      <div className={styles.pluginType}>
+        <Skeleton width={16} height={16} />
+      </div>
+    </div>
+  );
+};
+
+export const PluginListItem = attachSkeleton(PluginListItemComponent, PluginListItemSkeleton);
+
 // Styles shared between the different type of list items
 export const getStyles = (theme: GrafanaTheme2) => {
   return {
-    container: css`
-      display: grid;
-      grid-template-columns: ${LOGO_SIZE} 1fr ${theme.spacing(3)};
-      grid-template-rows: auto;
-      gap: ${theme.spacing(2)};
-      grid-auto-flow: row;
-      background: ${theme.colors.background.secondary};
-      border-radius: ${theme.shape.radius.default};
-      padding: ${theme.spacing(3)};
-      transition: ${theme.transitions.create(['background-color', 'box-shadow', 'border-color', 'color'], {
+    container: css({
+      display: 'grid',
+      gridTemplateColumns: `${LOGO_SIZE} 1fr ${theme.spacing(3)}`,
+      gridTemplateRows: 'auto',
+      gap: theme.spacing(2),
+      gridAutoFlow: 'row',
+      background: theme.colors.background.secondary,
+      borderRadius: theme.shape.radius.default,
+      padding: theme.spacing(3),
+      transition: theme.transitions.create(['background-color', 'box-shadow', 'border-color', 'color'], {
         duration: theme.transitions.duration.short,
-      })};
-
-      &:hover {
-        background: ${theme.colors.emphasize(theme.colors.background.secondary, 0.03)};
-      }
-    `,
-    list: css`
-      row-gap: 0px;
-
-      > img {
-        align-self: start;
-      }
-
-      > .plugin-content {
-        min-height: 0px;
-        grid-area: 2 / 2 / 4 / 3;
-
-        > p {
-          margin: ${theme.spacing(0, 0, 0.5, 0)};
-        }
-      }
-
-      > .plugin-name {
-        align-self: center;
-        grid-area: 1 / 2 / 2 / 3;
-      }
-    `,
-    pluginType: css`
-      grid-area: 1 / 3 / 2 / 4;
-      color: ${theme.colors.text.secondary};
-    `,
-    pluginLogo: css`
-      grid-area: 1 / 1 / 3 / 2;
-      max-width: 100%;
-      align-self: center;
-      object-fit: contain;
-    `,
-    content: css`
-      grid-area: 3 / 1 / 4 / 3;
-      color: ${theme.colors.text.secondary};
-    `,
-    name: css`
-      grid-area: 1 / 2 / 3 / 3;
-      align-self: center;
-      font-size: ${theme.typography.h4.fontSize};
-      color: ${theme.colors.text.primary};
-      margin: 0;
-    `,
+      }),
+
+      '&:hover': {
+        background: theme.colors.emphasize(theme.colors.background.secondary, 0.03),
+      },
+    }),
+    list: css({
+      rowGap: 0,
+
+      '> img': {
+        alignSelf: 'start',
+      },
+
+      '> .plugin-content': {
+        minHeight: 0,
+        gridArea: '2 / 2 / 4 / 3',
+
+        '> p': {
+          margin: theme.spacing(0, 0, 0.5, 0),
+        },
+      },
+
+      '> .plugin-name': {
+        alignSelf: 'center',
+        gridArea: '1 / 2 / 2 / 3',
+      },
+    }),
+    pluginType: css({
+      gridArea: '1 / 3 / 2 / 4',
+      color: theme.colors.text.secondary,
+    }),
+    pluginLogo: css({
+      gridArea: '1 / 1 / 3 / 2',
+      maxWidth: '100%',
+      alignSelf: 'center',
+      objectFit: 'contain',
+    }),
+    content: css({
+      gridArea: '3 / 1 / 4 / 3',
+      color: theme.colors.text.secondary,
+    }),
+    name: css({
+      gridArea: '1 / 2 / 3 / 3',
+      alignSelf: 'center',
+      fontSize: theme.typography.h4.fontSize,
+      color: theme.colors.text.primary,
+      margin: 0,
+    }),
   };
 };
diff --git a/public/app/features/plugins/admin/components/PluginListItemBadges.test.tsx b/public/app/features/plugins/admin/components/PluginListItemBadges.test.tsx
index e6906d728741b..f1a86adc69142 100644
--- a/public/app/features/plugins/admin/components/PluginListItemBadges.test.tsx
+++ b/public/app/features/plugins/admin/components/PluginListItemBadges.test.tsx
@@ -18,6 +18,7 @@ describe('PluginListItemBadges', () => {
         small: 'https://grafana.com/api/plugins/test-plugin/versions/0.0.10/logos/small',
         large: 'https://grafana.com/api/plugins/test-plugin/versions/0.0.10/logos/large',
       },
+      keywords: ['test', 'plugin'],
     },
     name: 'Testing Plugin',
     orgName: 'Test',
diff --git a/public/app/features/plugins/admin/components/PluginLogo.tsx b/public/app/features/plugins/admin/components/PluginLogo.tsx
index 7c864020f34e8..2c063bd97d173 100644
--- a/public/app/features/plugins/admin/components/PluginLogo.tsx
+++ b/public/app/features/plugins/admin/components/PluginLogo.tsx
@@ -8,6 +8,5 @@ type PluginLogoProps = {
 };
 
 export function PluginLogo({ alt, className, src, height }: PluginLogoProps): React.ReactElement {
-  // @ts-ignore - react doesn't know about loading attr.
   return <img src={src} className={className} alt={alt} loading="lazy" height={height} />;
 }
diff --git a/public/app/features/plugins/admin/components/PluginUsage.tsx b/public/app/features/plugins/admin/components/PluginUsage.tsx
index 1b82008378213..692d1fe3b2330 100644
--- a/public/app/features/plugins/admin/components/PluginUsage.tsx
+++ b/public/app/features/plugins/admin/components/PluginUsage.tsx
@@ -4,7 +4,7 @@ import { useAsync } from 'react-use';
 import AutoSizer from 'react-virtualized-auto-sizer';
 import { of } from 'rxjs';
 
-import { GrafanaTheme2, PluginMeta } from '@grafana/data';
+import { GrafanaTheme2, PluginMeta, PluginType } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { Alert, Spinner, useStyles2 } from '@grafana/ui';
 import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
@@ -19,6 +19,13 @@ export function PluginUsage({ plugin }: Props) {
   const styles = useStyles2(getStyles);
 
   const searchQuery = useMemo<SearchQuery>(() => {
+    if (plugin.type === PluginType.datasource) {
+      return {
+        query: '*',
+        ds_type: plugin.id,
+        kind: ['dashboard'],
+      };
+    }
     return {
       query: '*',
       panel_type: plugin.id,
diff --git a/public/app/features/plugins/admin/components/SearchField.tsx b/public/app/features/plugins/admin/components/SearchField.tsx
index c251f34b1cccf..6c43e063e1dff 100644
--- a/public/app/features/plugins/admin/components/SearchField.tsx
+++ b/public/app/features/plugins/admin/components/SearchField.tsx
@@ -10,7 +10,7 @@ interface Props {
 
 // useDebounce has a bug which causes it to fire on first render. This wrapper prevents that.
 // https://github.com/streamich/react-use/issues/759
-const useDebounceWithoutFirstRender = (callBack: () => any, delay = 0, deps: React.DependencyList = []) => {
+const useDebounceWithoutFirstRender = (callBack: () => void, delay = 0, deps: React.DependencyList = []) => {
   const isFirstRender = useRef(true);
   const debounceDeps = [...deps, isFirstRender];
 
diff --git a/public/app/features/plugins/admin/constants.ts b/public/app/features/plugins/admin/constants.ts
index 66af41087264e..4171ab032c522 100644
--- a/public/app/features/plugins/admin/constants.ts
+++ b/public/app/features/plugins/admin/constants.ts
@@ -1,4 +1,5 @@
 export const API_ROOT = '/api/plugins';
+export const INSTANCE_API_ROOT = '/api/instance';
 export const GCOM_API_ROOT = '/api/gnet';
 
 // Used for prefixing the Redux actions
diff --git a/public/app/features/plugins/admin/helpers.test.ts b/public/app/features/plugins/admin/helpers.test.ts
index c2f36fd2754c7..d09682882ab2b 100644
--- a/public/app/features/plugins/admin/helpers.test.ts
+++ b/public/app/features/plugins/admin/helpers.test.ts
@@ -37,7 +37,7 @@ describe('Plugins/Helpers', () => {
     ];
 
     test('adds all available plugins only once', () => {
-      const merged = mergeLocalsAndRemotes(localPlugins, remotePlugins);
+      const merged = mergeLocalsAndRemotes({ local: localPlugins, remote: remotePlugins });
       const mergedIds = merged.map(({ id }) => id);
 
       expect(merged.length).toBe(4);
@@ -48,7 +48,7 @@ describe('Plugins/Helpers', () => {
     });
 
     test('merges all plugins with their counterpart (if available)', () => {
-      const merged = mergeLocalsAndRemotes(localPlugins, remotePlugins);
+      const merged = mergeLocalsAndRemotes({ local: localPlugins, remote: remotePlugins });
       const findMerged = (mergedId: string) => merged.find(({ id }) => id === mergedId);
 
       // Both local & remote counterparts
@@ -67,10 +67,10 @@ describe('Plugins/Helpers', () => {
     });
 
     test('skips deprecated plugins unless they have a local - installed - counterpart', () => {
-      const merged = mergeLocalsAndRemotes(localPlugins, [
-        ...remotePlugins,
-        getRemotePluginMock({ slug: 'plugin-5', status: RemotePluginStatus.Deprecated }),
-      ]);
+      const merged = mergeLocalsAndRemotes({
+        local: localPlugins,
+        remote: [...remotePlugins, getRemotePluginMock({ slug: 'plugin-5', status: RemotePluginStatus.Deprecated })],
+      });
       const findMerged = (mergedId: string) => merged.find(({ id }) => id === mergedId);
 
       expect(merged).toHaveLength(4);
@@ -78,16 +78,64 @@ describe('Plugins/Helpers', () => {
     });
 
     test('keeps deprecated plugins in case they have a local counterpart', () => {
-      const merged = mergeLocalsAndRemotes(
-        [...localPlugins, getLocalPluginMock({ id: 'plugin-5' })],
-        [...remotePlugins, getRemotePluginMock({ slug: 'plugin-5', status: RemotePluginStatus.Deprecated })]
-      );
+      const merged = mergeLocalsAndRemotes({
+        local: [...localPlugins, getLocalPluginMock({ id: 'plugin-5' })],
+        remote: [...remotePlugins, getRemotePluginMock({ slug: 'plugin-5', status: RemotePluginStatus.Deprecated })],
+      });
       const findMerged = (mergedId: string) => merged.find(({ id }) => id === mergedId);
 
       expect(merged).toHaveLength(5);
       expect(findMerged('plugin-5')).not.toBeUndefined();
       expect(findMerged('plugin-5')?.isDeprecated).toBe(true);
     });
+
+    test('core plugins should be fullyInstalled in cloud', () => {
+      const corePluginId = 'plugin-core';
+
+      const oldFeatureTogglesManagedPluginsInstall = config.featureToggles.managedPluginsInstall;
+      const oldPluginAdminExternalManageEnabled = config.pluginAdminExternalManageEnabled;
+
+      config.featureToggles.managedPluginsInstall = true;
+      config.pluginAdminExternalManageEnabled = true;
+
+      const merged = mergeLocalsAndRemotes({
+        local: [...localPlugins, getLocalPluginMock({ id: corePluginId, signature: PluginSignatureStatus.internal })],
+        remote: [...remotePlugins, getRemotePluginMock({ slug: corePluginId })],
+      });
+      const findMerged = (mergedId: string) => merged.find(({ id }) => id === mergedId);
+
+      expect(merged).toHaveLength(5);
+      expect(findMerged(corePluginId)).not.toBeUndefined();
+      expect(findMerged(corePluginId)?.isCore).toBe(true);
+      expect(findMerged(corePluginId)?.isFullyInstalled).toBe(true);
+
+      config.featureToggles.managedPluginsInstall = oldFeatureTogglesManagedPluginsInstall;
+      config.pluginAdminExternalManageEnabled = oldPluginAdminExternalManageEnabled;
+    });
+
+    test('plugins should be fully installed if they are installed and it is provisioned', () => {
+      const pluginId = 'plugin-1';
+
+      const oldFeatureTogglesManagedPluginsInstall = config.featureToggles.managedPluginsInstall;
+      const oldPluginAdminExternalManageEnabled = config.pluginAdminExternalManageEnabled;
+
+      config.featureToggles.managedPluginsInstall = true;
+      config.pluginAdminExternalManageEnabled = true;
+
+      const merged = mergeLocalsAndRemotes({
+        local: [...localPlugins, getLocalPluginMock({ id: pluginId })],
+        remote: [...remotePlugins, getRemotePluginMock({ slug: pluginId })],
+        provisioned: [{ slug: pluginId }],
+      });
+      const findMerged = (mergedId: string) => merged.find(({ id }) => id === mergedId);
+
+      expect(merged).toHaveLength(5);
+      expect(findMerged(pluginId)).not.toBeUndefined();
+      expect(findMerged(pluginId)?.isFullyInstalled).toBe(true);
+
+      config.featureToggles.managedPluginsInstall = oldFeatureTogglesManagedPluginsInstall;
+      config.pluginAdminExternalManageEnabled = oldPluginAdminExternalManageEnabled;
+    });
   });
 
   describe('mergeLocalAndRemote()', () => {
@@ -116,6 +164,7 @@ describe('Plugins/Helpers', () => {
             large: 'https://grafana.com/api/plugins/alexanderzobnin-zabbix-app/versions/4.1.5/logos/large',
             small: 'https://grafana.com/api/plugins/alexanderzobnin-zabbix-app/versions/4.1.5/logos/small',
           },
+          keywords: ['zabbix', 'monitoring', 'dashboard'],
         },
         error: undefined,
         isCore: false,
@@ -132,6 +181,8 @@ describe('Plugins/Helpers', () => {
         signature: 'valid',
         type: 'app',
         updatedAt: '2021-05-18T14:53:01.000Z',
+        isFullyInstalled: false,
+        angularDetected: false,
       });
     });
 
@@ -210,6 +261,8 @@ describe('Plugins/Helpers', () => {
         type: 'app',
         updatedAt: '2021-08-25',
         installedVersion: '4.2.2',
+        isFullyInstalled: true,
+        angularDetected: false,
       });
     });
 
@@ -240,6 +293,7 @@ describe('Plugins/Helpers', () => {
             small: 'https://grafana.com/api/plugins/alexanderzobnin-zabbix-app/versions/4.1.5/logos/small',
             large: 'https://grafana.com/api/plugins/alexanderzobnin-zabbix-app/versions/4.1.5/logos/large',
           },
+          keywords: ['zabbix', 'monitoring', 'dashboard'],
         },
         error: undefined,
         isCore: false,
@@ -259,6 +313,8 @@ describe('Plugins/Helpers', () => {
         type: 'app',
         updatedAt: '2021-05-18T14:53:01.000Z',
         installedVersion: '4.2.2',
+        isFullyInstalled: true,
+        angularDetected: false,
       });
     });
 
@@ -641,6 +697,35 @@ describe('Plugins/Helpers', () => {
       // No local or remote
       expect(mapToCatalogPlugin()).toMatchObject({ updatedAt: '' });
     });
+
+    test('`.angularDetected` - prefers the local', () => {
+      // Both false shoul return false
+      expect(
+        mapToCatalogPlugin({ ...localPlugin, angularDetected: false }, { ...remotePlugin, angularDetected: false })
+      ).toMatchObject({ angularDetected: false });
+
+      // Remote version is using angular, local isn't, should prefer local
+      expect(
+        mapToCatalogPlugin({ ...localPlugin, angularDetected: false }, { ...remotePlugin, angularDetected: true })
+      ).toMatchObject({ angularDetected: false });
+
+      // Remote only
+      expect(mapToCatalogPlugin(undefined, remotePlugin)).toMatchObject({ angularDetected: false });
+      expect(mapToCatalogPlugin(undefined, { ...remotePlugin, angularDetected: true })).toMatchObject({
+        angularDetected: true,
+      });
+
+      // Local only
+      expect(mapToCatalogPlugin({ ...localPlugin, angularDetected: false }, undefined)).toMatchObject({
+        angularDetected: false,
+      });
+      expect(mapToCatalogPlugin({ ...localPlugin, angularDetected: true }, undefined)).toMatchObject({
+        angularDetected: true,
+      });
+
+      // No local or remote
+      expect(mapToCatalogPlugin()).toMatchObject({ angularDetected: undefined });
+    });
   });
 
   describe('sortPlugins()', () => {
diff --git a/public/app/features/plugins/admin/helpers.ts b/public/app/features/plugins/admin/helpers.ts
index 8b695b3f9bb74..a6e7b5dff09bd 100644
--- a/public/app/features/plugins/admin/helpers.ts
+++ b/public/app/features/plugins/admin/helpers.ts
@@ -1,20 +1,48 @@
+import uFuzzy from '@leeoniya/ufuzzy';
+
 import { PluginSignatureStatus, dateTimeParse, PluginError, PluginType, PluginErrorCode } from '@grafana/data';
 import { config, featureEnabled } from '@grafana/runtime';
-import { Settings } from 'app/core/config';
+import configCore, { Settings } from 'app/core/config';
 import { contextSrv } from 'app/core/core';
 import { getBackendSrv } from 'app/core/services/backend_srv';
 import { AccessControlAction } from 'app/types';
 
-import { CatalogPlugin, LocalPlugin, RemotePlugin, RemotePluginStatus, Version } from './types';
-
-export function mergeLocalsAndRemotes(
-  local: LocalPlugin[] = [],
-  remote: RemotePlugin[] = [],
-  errors?: PluginError[]
-): CatalogPlugin[] {
+import {
+  CatalogPlugin,
+  InstancePlugin,
+  LocalPlugin,
+  ProvisionedPlugin,
+  RemotePlugin,
+  RemotePluginStatus,
+  Version,
+} from './types';
+
+export function mergeLocalsAndRemotes({
+  local = [],
+  remote = [],
+  instance = [],
+  provisioned = [],
+  pluginErrors: errors,
+}: {
+  local: LocalPlugin[];
+  remote?: RemotePlugin[];
+  instance?: InstancePlugin[];
+  provisioned?: ProvisionedPlugin[];
+  pluginErrors?: PluginError[];
+}): CatalogPlugin[] {
   const catalogPlugins: CatalogPlugin[] = [];
   const errorByPluginId = groupErrorsByPluginId(errors);
 
+  const instancesMap = instance.reduce((map, instancePlugin) => {
+    map.set(instancePlugin.pluginSlug, instancePlugin);
+    return map;
+  }, new Map<string, InstancePlugin>());
+
+  const provisionedSet = provisioned.reduce((map, provisionedPlugin) => {
+    map.add(provisionedPlugin.slug);
+    return map;
+  }, new Set<string>());
+
   // add locals
   local.forEach((localPlugin) => {
     const remoteCounterpart = remote.find((r) => r.slug === localPlugin.id);
@@ -32,7 +60,26 @@ export function mergeLocalsAndRemotes(
     const shouldSkip = remotePlugin.status === RemotePluginStatus.Deprecated && !localCounterpart; // We are only listing deprecated plugins in case they are installed.
 
     if (!shouldSkip) {
-      catalogPlugins.push(mergeLocalAndRemote(localCounterpart, remotePlugin, error));
+      const catalogPlugin = mergeLocalAndRemote(localCounterpart, remotePlugin, error);
+
+      // for managed instances, check if plugin is installed, but not yet present in the current instance
+      if (configCore.featureToggles.managedPluginsInstall && config.pluginAdminExternalManageEnabled) {
+        catalogPlugin.isFullyInstalled = catalogPlugin.isCore
+          ? true
+          : (instancesMap.has(remotePlugin.slug) || provisionedSet.has(remotePlugin.slug)) && catalogPlugin.isInstalled;
+
+        catalogPlugin.isInstalled = instancesMap.has(remotePlugin.slug) || catalogPlugin.isInstalled;
+
+        const instancePlugin = instancesMap.get(remotePlugin.slug);
+        catalogPlugin.isUpdatingFromInstance =
+          instancesMap.has(remotePlugin.slug) &&
+          catalogPlugin.hasUpdate &&
+          catalogPlugin.installedVersion !== instancePlugin?.version;
+
+        catalogPlugin.isUninstallingFromInstance = Boolean(localCounterpart) && !instancesMap.has(remotePlugin.slug);
+      }
+
+      catalogPlugins.push(catalogPlugin);
     }
   });
 
@@ -65,6 +112,7 @@ export function mapRemoteToCatalog(plugin: RemotePlugin, error?: PluginError): C
     createdAt: publishedAt,
     status,
     angularDetected,
+    keywords,
   } = plugin;
 
   const isDisabled = !!error || isDisabledSecretsPlugin(typeCode);
@@ -77,6 +125,7 @@ export function mapRemoteToCatalog(plugin: RemotePlugin, error?: PluginError): C
         small: `https://grafana.com/api/plugins/${id}/versions/${version}/logos/small`,
         large: `https://grafana.com/api/plugins/${id}/versions/${version}/logos/large`,
       },
+      keywords,
     },
     name,
     orgName,
@@ -95,13 +144,14 @@ export function mapRemoteToCatalog(plugin: RemotePlugin, error?: PluginError): C
     type: typeCode,
     error: error?.errorCode,
     angularDetected,
+    isFullyInstalled: isDisabled,
   };
 }
 
 export function mapLocalToCatalog(plugin: LocalPlugin, error?: PluginError): CatalogPlugin {
   const {
     name,
-    info: { description, version, logos, updated, author },
+    info: { description, version, logos, updated, author, keywords },
     id,
     dev,
     type,
@@ -118,7 +168,7 @@ export function mapLocalToCatalog(plugin: LocalPlugin, error?: PluginError): Cat
     description,
     downloads: 0,
     id,
-    info: { logos },
+    info: { logos, keywords },
     name,
     orgName: author.name,
     popularity: 0,
@@ -140,6 +190,8 @@ export function mapLocalToCatalog(plugin: LocalPlugin, error?: PluginError): Cat
     error: error?.errorCode,
     accessControl: accessControl,
     angularDetected,
+    isFullyInstalled: true,
+    iam: plugin.iam,
   };
 }
 
@@ -149,6 +201,7 @@ export function mapToCatalogPlugin(local?: LocalPlugin, remote?: RemotePlugin, e
   const id = remote?.slug || local?.id || '';
   const type = local?.type || remote?.typeCode;
   const isDisabled = !!error || isDisabledSecretsPlugin(type);
+  const keywords = remote?.keywords || local?.info.keywords || [];
 
   let logos = {
     small: `/public/img/icn-${type}.svg`,
@@ -171,6 +224,7 @@ export function mapToCatalogPlugin(local?: LocalPlugin, remote?: RemotePlugin, e
     id,
     info: {
       logos,
+      keywords,
     },
     isCore: Boolean(remote?.internal || local?.signature === PluginSignatureStatus.internal),
     isDev: Boolean(local?.dev),
@@ -195,7 +249,9 @@ export function mapToCatalogPlugin(local?: LocalPlugin, remote?: RemotePlugin, e
     error: error?.errorCode,
     // Only local plugins have access control metadata
     accessControl: local?.accessControl,
-    angularDetected: local?.angularDetected || remote?.angularDetected,
+    angularDetected: local?.angularDetected ?? remote?.angularDetected,
+    isFullyInstalled: Boolean(local) || isDisabled,
+    iam: local?.iam,
   };
 }
 
@@ -319,3 +375,26 @@ function isDisabledSecretsPlugin(type?: PluginType): boolean {
 export function isLocalCorePlugin(local?: LocalPlugin): boolean {
   return Boolean(local?.signature === 'internal');
 }
+
+function getId(inputString: string): string {
+  const parts = inputString.split(' - ');
+  return parts[0];
+}
+
+function getPluginDetailsForFuzzySearch(plugins: CatalogPlugin[]): string[] {
+  return plugins.reduce((result: string[], { id, name, type, orgName, info }: CatalogPlugin) => {
+    const keywordsForSearch = info.keywords?.join(' ').toLowerCase();
+    const pluginString = `${id} - ${name} - ${type} - ${orgName} - ${keywordsForSearch}`;
+    result.push(pluginString);
+    return result;
+  }, []);
+}
+export function filterByKeyword(plugins: CatalogPlugin[], query: string) {
+  const dataArray = getPluginDetailsForFuzzySearch(plugins);
+  let uf = new uFuzzy({ intraMode: 1, intraSub: 0 });
+  let idxs = uf.filter(dataArray, query);
+  if (idxs === null) {
+    return null;
+  }
+  return idxs.map((id) => getId(dataArray[id]));
+}
diff --git a/public/app/features/plugins/admin/hooks/usePluginConfig.tsx b/public/app/features/plugins/admin/hooks/usePluginConfig.tsx
index d515ba815949b..bf28f69ecf9a6 100644
--- a/public/app/features/plugins/admin/hooks/usePluginConfig.tsx
+++ b/public/app/features/plugins/admin/hooks/usePluginConfig.tsx
@@ -1,5 +1,7 @@
 import { useAsync } from 'react-use';
 
+import { config } from '@grafana/runtime';
+
 import { loadPlugin } from '../../utils';
 import { CatalogPlugin } from '../types';
 
@@ -9,7 +11,12 @@ export const usePluginConfig = (plugin?: CatalogPlugin) => {
       return null;
     }
 
-    if (plugin.isInstalled && !plugin.isDisabled) {
+    const isPluginInstalled =
+      config.pluginAdminExternalManageEnabled && config.featureToggles.managedPluginsInstall
+        ? plugin.isFullyInstalled
+        : plugin.isInstalled;
+
+    if (isPluginInstalled && !plugin.isDisabled) {
       return loadPlugin(plugin.id);
     }
     return null;
diff --git a/public/app/features/plugins/admin/hooks/usePluginDetailsTabs.tsx b/public/app/features/plugins/admin/hooks/usePluginDetailsTabs.tsx
index 283d52abdfef7..5ff258b59169d 100644
--- a/public/app/features/plugins/admin/hooks/usePluginDetailsTabs.tsx
+++ b/public/app/features/plugins/admin/hooks/usePluginDetailsTabs.tsx
@@ -41,7 +41,20 @@ export const usePluginDetailsTabs = (plugin?: CatalogPlugin, pageId?: PluginTabI
       return navModelChildren;
     }
 
-    if (config.featureToggles.panelTitleSearch && pluginConfig.meta.type === PluginType.panel) {
+    if (config.featureToggles.externalServiceAccounts && (plugin?.iam || plugin?.details?.iam)) {
+      navModelChildren.push({
+        text: PluginTabLabels.IAM,
+        icon: 'shield',
+        id: PluginTabIds.IAM,
+        url: `${pathname}?page=${PluginTabIds.IAM}`,
+        active: PluginTabIds.IAM === currentPageId,
+      });
+    }
+
+    if (
+      config.featureToggles.panelTitleSearch &&
+      (pluginConfig.meta.type === PluginType.panel || pluginConfig.meta.type === PluginType.datasource)
+    ) {
       navModelChildren.push({
         text: PluginTabLabels.USAGE,
         icon: 'list-ul',
diff --git a/public/app/features/plugins/admin/hooks/usePluginInfo.tsx b/public/app/features/plugins/admin/hooks/usePluginInfo.tsx
index 8874d62d0b3a2..ecd946d414eef 100644
--- a/public/app/features/plugins/admin/hooks/usePluginInfo.tsx
+++ b/public/app/features/plugins/admin/hooks/usePluginInfo.tsx
@@ -19,7 +19,11 @@ export const usePluginInfo = (plugin?: CatalogPlugin): PageInfoItem[] => {
 
   // Populate info
   const latestCompatibleVersion = getLatestCompatibleVersion(plugin.details?.versions);
-  const version = plugin.installedVersion || latestCompatibleVersion?.version;
+  const useLatestCompatibleInfo = !plugin.isInstalled;
+  let version = plugin.installedVersion;
+  if (!version && useLatestCompatibleInfo && latestCompatibleVersion?.version) {
+    version = latestCompatibleVersion?.version;
+  }
 
   if (Boolean(version)) {
     info.push({
@@ -47,15 +51,16 @@ export const usePluginInfo = (plugin?: CatalogPlugin): PageInfoItem[] => {
   }
 
   const pluginDependencies = plugin.details?.pluginDependencies;
-  const grafanaDependency = plugin.isInstalled
-    ? plugin.details?.grafanaDependency
-    : latestCompatibleVersion?.grafanaDependency || plugin.details?.grafanaDependency;
+  let grafanaDependency = plugin.details?.grafanaDependency;
+  if (useLatestCompatibleInfo && latestCompatibleVersion?.grafanaDependency) {
+    grafanaDependency = latestCompatibleVersion?.grafanaDependency;
+  }
   const hasNoDependencyInfo = !grafanaDependency && (!pluginDependencies || !pluginDependencies.length);
 
   if (!hasNoDependencyInfo) {
     info.push({
       label: 'Dependencies',
-      value: <PluginDetailsHeaderDependencies plugin={plugin} latestCompatibleVersion={latestCompatibleVersion} />,
+      value: <PluginDetailsHeaderDependencies plugin={plugin} grafanaDependency={grafanaDependency} />,
     });
   }
 
diff --git a/public/app/features/plugins/admin/pages/Browse.test.tsx b/public/app/features/plugins/admin/pages/Browse.test.tsx
index 554556330d836..a22f98e6c2c14 100644
--- a/public/app/features/plugins/admin/pages/Browse.test.tsx
+++ b/public/app/features/plugins/admin/pages/Browse.test.tsx
@@ -61,7 +61,7 @@ describe('Browse list of plugins', () => {
       expect(queryByText('Plugin 4')).toBeNull();
     });
 
-    it('should list all plugins (except core plugins) when filtering by all', async () => {
+    it('should list all plugins (including core plugins) when filtering by all', async () => {
       const { queryByText } = renderBrowse('/plugins?filterBy=all&filterByType=all', [
         getCatalogPluginMock({ id: 'plugin-1', name: 'Plugin 1', isInstalled: true }),
         getCatalogPluginMock({ id: 'plugin-2', name: 'Plugin 2', isInstalled: false }),
@@ -73,8 +73,8 @@ describe('Browse list of plugins', () => {
       expect(queryByText('Plugin 2')).toBeInTheDocument();
       expect(queryByText('Plugin 3')).toBeInTheDocument();
 
-      // Core plugins should not be listed
-      expect(queryByText('Plugin 4')).not.toBeInTheDocument();
+      // Core plugins should still be listed
+      expect(queryByText('Plugin 4')).toBeInTheDocument();
     });
 
     it('should list installed plugins (including core plugins) when filtering by installed', async () => {
@@ -183,13 +183,19 @@ describe('Browse list of plugins', () => {
 
   describe('when searching', () => {
     it('should only list plugins matching search', async () => {
-      const { queryByText } = renderBrowse('/plugins?filterBy=all&q=zabbix', [
-        getCatalogPluginMock({ id: 'zabbix', name: 'Zabbix' }),
-        getCatalogPluginMock({ id: 'plugin-2', name: 'Plugin 2' }),
-        getCatalogPluginMock({ id: 'plugin-3', name: 'Plugin 3' }),
+      const { queryByText } = renderBrowse('/plugins?filterBy=all&q=matches', [
+        getCatalogPluginMock({ id: 'matches-the-search', name: 'Matches the search' }),
+        getCatalogPluginMock({
+          id: 'plugin-2',
+          name: 'Plugin 2',
+        }),
+        getCatalogPluginMock({
+          id: 'plugin-3',
+          name: 'Plugin 3',
+        }),
       ]);
 
-      await waitFor(() => expect(queryByText('Zabbix')).toBeInTheDocument());
+      await waitFor(() => expect(queryByText('Matches the search')).toBeInTheDocument());
 
       // Other plugin types shouldn't be shown
       expect(queryByText('Plugin 2')).not.toBeInTheDocument();
diff --git a/public/app/features/plugins/admin/pages/Browse.tsx b/public/app/features/plugins/admin/pages/Browse.tsx
index 3db73e3665089..195ec0e7b5855 100644
--- a/public/app/features/plugins/admin/pages/Browse.tsx
+++ b/public/app/features/plugins/admin/pages/Browse.tsx
@@ -4,7 +4,7 @@ import { useLocation } from 'react-router-dom';
 
 import { SelectableValue, GrafanaTheme2, PluginType } from '@grafana/data';
 import { locationSearchToObject } from '@grafana/runtime';
-import { LoadingPlaceholder, Select, RadioButtonGroup, useStyles2, Tooltip, Field } from '@grafana/ui';
+import { Select, RadioButtonGroup, useStyles2, Tooltip, Field } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 import { getNavModel } from 'app/core/selectors/navModel';
@@ -36,10 +36,10 @@ export default function Browse({ route }: GrafanaRouteComponentProps): ReactElem
       keyword,
       type: filterByType !== 'all' ? filterByType : undefined,
       isInstalled: filterBy === 'installed' ? true : undefined,
-      isCore: filterBy === 'installed' ? undefined : false, // We only would like to show core plugins when the user filters to installed plugins
     },
     sortBy
   );
+
   const filterByOptions = [
     { value: 'all', label: 'All' },
     { value: 'installed', label: 'Installed' },
@@ -160,16 +160,7 @@ export default function Browse({ route }: GrafanaRouteComponentProps): ReactElem
           </HorizontalGroup>
         </HorizontalGroup>
         <div className={styles.listWrap}>
-          {isLoading ? (
-            <LoadingPlaceholder
-              className={css`
-                margin-bottom: 0;
-              `}
-              text="Loading results"
-            />
-          ) : (
-            <PluginList plugins={plugins} displayMode={displayMode} />
-          )}
+          <PluginList plugins={plugins} displayMode={displayMode} isLoading={isLoading} />
         </div>
       </Page.Contents>
     </Page>
@@ -177,17 +168,17 @@ export default function Browse({ route }: GrafanaRouteComponentProps): ReactElem
 }
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  actionBar: css`
-    ${theme.breakpoints.up('xl')} {
-      margin-left: auto;
-    }
-  `,
-  listWrap: css`
-    margin-top: ${theme.spacing(2)};
-  `,
-  displayAs: css`
-    svg {
-      margin-right: 0;
-    }
-  `,
+  actionBar: css({
+    [theme.breakpoints.up('xl')]: {
+      marginLeft: 'auto',
+    },
+  }),
+  listWrap: css({
+    marginTop: theme.spacing(2),
+  }),
+  displayAs: css({
+    svg: {
+      marginRight: 0,
+    },
+  }),
 });
diff --git a/public/app/features/plugins/admin/pages/PluginDetails.test.tsx b/public/app/features/plugins/admin/pages/PluginDetails.test.tsx
index 92c7410c208a2..9ae2cac8c1110 100644
--- a/public/app/features/plugins/admin/pages/PluginDetails.test.tsx
+++ b/public/app/features/plugins/admin/pages/PluginDetails.test.tsx
@@ -382,14 +382,14 @@ describe('Plugin details page', () => {
     });
 
     it('should display alert with information about why the plugin is disabled', async () => {
-      const { queryByLabelText } = renderPluginDetails({
+      const { queryByTestId } = renderPluginDetails({
         id,
         isInstalled: true,
         isDisabled: true,
         error: PluginErrorCode.modifiedSignature,
       });
 
-      expect(await queryByLabelText(selectors.pages.PluginPage.disabledInfo)).toBeInTheDocument();
+      expect(queryByTestId(selectors.pages.PluginPage.disabledInfo)).toBeInTheDocument();
     });
 
     it('should display grafana dependencies for a plugin if they are available', async () => {
@@ -744,32 +744,28 @@ describe('Plugin details page', () => {
     });
 
     it('should display a deprecation warning if the plugin is deprecated', async () => {
-      const { queryByText } = renderPluginDetails({
+      const { findByRole } = renderPluginDetails({
         id,
         isInstalled: true,
         isDeprecated: true,
       });
 
-      await waitFor(() =>
-        expect(queryByText(/plugin is deprecated and has been removed from the catalog/i)).toBeInTheDocument()
-      );
+      expect(await findByRole('link', { name: 'deprecated' })).toBeInTheDocument();
     });
 
     it('should not display a deprecation warning in the plugin is not deprecated', async () => {
-      const { queryByText } = renderPluginDetails({
+      const { queryByRole } = renderPluginDetails({
         id,
         isInstalled: true,
         isDeprecated: false,
       });
 
-      await waitFor(() =>
-        expect(queryByText(/plugin is deprecated and has been removed from the catalog/i)).not.toBeInTheDocument()
-      );
+      await waitFor(() => expect(queryByRole('link', { name: 'deprecated' })).not.toBeInTheDocument());
     });
 
     it('should display a custom deprecation message if the plugin has it set', async () => {
       const statusContext = 'A detailed explanation of why this plugin is deprecated.';
-      const { queryByText } = renderPluginDetails({
+      const { findByText, findByRole } = renderPluginDetails({
         id,
         isInstalled: true,
         isDeprecated: true,
@@ -779,9 +775,28 @@ describe('Plugin details page', () => {
         },
       });
 
-      const re = new RegExp(`No further updates will be made to the plugin. More information: ${statusContext}`, 'i');
+      expect(await findByRole('link', { name: 'deprecated' })).toBeInTheDocument();
+      expect(await findByText(statusContext)).toBeInTheDocument();
+    });
+
+    it('should be possible to render markdown inside a custom deprecation message', async () => {
+      const statusContext =
+        '**This is a custom deprecation message.** [Link 1](https://grafana.com) <a href="https://grafana.com" target="_blank">Link 2</a>';
+      const { findByText, findByRole } = renderPluginDetails({
+        id,
+        isInstalled: true,
+        isDeprecated: true,
+        details: {
+          statusContext,
+          links: [],
+        },
+      });
 
-      await waitFor(() => expect(queryByText(re)).toBeInTheDocument());
+      expect(await findByRole('link', { name: 'deprecated' })).toBeInTheDocument();
+      expect(await findByText('This is a custom deprecation message.')).toBeInTheDocument();
+      expect(await findByRole('link', { name: 'Link 1' })).toBeInTheDocument();
+      expect(await findByRole('link', { name: 'Link 2' })).toBeInTheDocument();
+      expect(await findByRole('link', { name: 'Link 2' })).toHaveAttribute('href', 'https://grafana.com');
     });
   });
 
diff --git a/public/app/features/plugins/admin/state/actions.ts b/public/app/features/plugins/admin/state/actions.ts
index ad9b4e83118e3..bff4b094b51b6 100644
--- a/public/app/features/plugins/admin/state/actions.ts
+++ b/public/app/features/plugins/admin/state/actions.ts
@@ -1,8 +1,9 @@
 import { createAction, createAsyncThunk, Update } from '@reduxjs/toolkit';
-import { from, forkJoin, timeout, lastValueFrom, catchError, throwError } from 'rxjs';
+import { from, forkJoin, timeout, lastValueFrom, catchError, of } from 'rxjs';
 
 import { PanelPlugin, PluginError } from '@grafana/data';
-import { getBackendSrv, isFetchError } from '@grafana/runtime';
+import { config, getBackendSrv, isFetchError } from '@grafana/runtime';
+import configCore from 'app/core/config';
 import { importPanelPlugin } from 'app/features/plugins/importPanelPlugin';
 import { StoreState, ThunkResult } from 'app/types';
 
@@ -14,10 +15,12 @@ import {
   getPluginDetails,
   installPlugin,
   uninstallPlugin,
+  getInstancePlugins,
+  getProvisionedPlugins,
 } from '../api';
 import { STATE_PREFIX } from '../constants';
 import { mapLocalToCatalog, mergeLocalsAndRemotes, updatePanels } from '../helpers';
-import { CatalogPlugin, RemotePlugin, LocalPlugin } from '../types';
+import { CatalogPlugin, RemotePlugin, LocalPlugin, InstancePlugin, ProvisionedPlugin } from '../types';
 
 // Fetches
 export const fetchAll = createAsyncThunk(`${STATE_PREFIX}/fetchAll`, async (_, thunkApi) => {
@@ -25,43 +28,65 @@ export const fetchAll = createAsyncThunk(`${STATE_PREFIX}/fetchAll`, async (_, t
     thunkApi.dispatch({ type: `${STATE_PREFIX}/fetchLocal/pending` });
     thunkApi.dispatch({ type: `${STATE_PREFIX}/fetchRemote/pending` });
 
-    const local$ = from(getLocalPlugins());
-    const remote$ = from(getRemotePlugins());
+    const instance$ =
+      config.pluginAdminExternalManageEnabled && configCore.featureToggles.managedPluginsInstall
+        ? from(getInstancePlugins())
+        : of(undefined);
+    const provisioned$ =
+      config.pluginAdminExternalManageEnabled && configCore.featureToggles.managedPluginsInstall
+        ? from(getProvisionedPlugins())
+        : of(undefined);
+    const TIMEOUT = 500;
     const pluginErrors$ = from(getPluginErrors());
+    const local$ = from(getLocalPlugins());
+    // Unknown error while fetching remote plugins from GCOM.
+    // (In this case we still operate, but only with locally available plugins.)
+    const remote$ = from(getRemotePlugins()).pipe(
+      catchError((err) => {
+        thunkApi.dispatch({ type: `${STATE_PREFIX}/fetchRemote/rejected` });
+        console.error(err);
+        return of([]);
+      })
+    );
 
     forkJoin({
       local: local$,
       remote: remote$,
+      instance: instance$,
+      provisioned: provisioned$,
       pluginErrors: pluginErrors$,
     })
       .pipe(
-        // Fetching the list of plugins from GCOM is slow / errors out
+        // Fetching the list of plugins from GCOM is slow / times out
+        // (We are waiting for TIMEOUT, and if there is still no response from GCOM we continue with locally
+        // installed plugins only by returning a new observable. We also still wait for the remote request to finish or
+        // time out, but we don't block the main execution flow.)
         timeout({
-          each: 500,
+          each: TIMEOUT,
           with: () => {
             remote$
-              // The request to fetch remote plugins from GCOM failed
-              .pipe(
-                catchError((err) => {
-                  thunkApi.dispatch({ type: `${STATE_PREFIX}/fetchRemote/rejected` });
-                  return throwError(
-                    () => new Error('Failed to fetch plugins from catalog (default https://grafana.com/api/plugins)')
-                  );
-                })
-              )
               // Remote plugins loaded after a timeout, updating the store
               .subscribe(async (remote: RemotePlugin[]) => {
                 thunkApi.dispatch({ type: `${STATE_PREFIX}/fetchRemote/fulfilled` });
 
                 if (remote.length > 0) {
                   const local = await lastValueFrom(local$);
+                  const instance = await lastValueFrom(instance$);
+                  const provisioned = await lastValueFrom(provisioned$);
                   const pluginErrors = await lastValueFrom(pluginErrors$);
 
-                  thunkApi.dispatch(addPlugins(mergeLocalsAndRemotes(local, remote, pluginErrors)));
+                  thunkApi.dispatch(
+                    addPlugins(mergeLocalsAndRemotes({ local, remote, instance, provisioned, pluginErrors }))
+                  );
                 }
               });
 
-            return forkJoin({ local: local$, pluginErrors: pluginErrors$ });
+            return forkJoin({
+              local: local$,
+              instance: instance$,
+              provisioned: provisioned$,
+              pluginErrors: pluginErrors$,
+            });
           },
         })
       )
@@ -69,22 +94,35 @@ export const fetchAll = createAsyncThunk(`${STATE_PREFIX}/fetchAll`, async (_, t
         ({
           local,
           remote,
+          instance,
+          provisioned,
           pluginErrors,
         }: {
           local: LocalPlugin[];
           remote?: RemotePlugin[];
+          instance?: InstancePlugin[];
+          provisioned?: ProvisionedPlugin[];
           pluginErrors: PluginError[];
         }) => {
-          thunkApi.dispatch({ type: `${STATE_PREFIX}/fetchLocal/fulfilled` });
-
           // Both local and remote plugins are loaded
           if (local && remote) {
-            thunkApi.dispatch(addPlugins(mergeLocalsAndRemotes(local, remote, pluginErrors)));
+            thunkApi.dispatch({ type: `${STATE_PREFIX}/fetchLocal/fulfilled` });
+            thunkApi.dispatch({ type: `${STATE_PREFIX}/fetchRemote/fulfilled` });
+            thunkApi.dispatch(
+              addPlugins(mergeLocalsAndRemotes({ local, remote, instance, provisioned, pluginErrors }))
+            );
 
             // Only remote plugins are loaded (remote timed out)
           } else if (local) {
-            thunkApi.dispatch(addPlugins(mergeLocalsAndRemotes(local, [], pluginErrors)));
+            thunkApi.dispatch({ type: `${STATE_PREFIX}/fetchLocal/fulfilled` });
+            thunkApi.dispatch(addPlugins(mergeLocalsAndRemotes({ local, pluginErrors })));
           }
+        },
+        (error) => {
+          console.log(error);
+          thunkApi.dispatch({ type: `${STATE_PREFIX}/fetchLocal/rejected` });
+          thunkApi.dispatch({ type: `${STATE_PREFIX}/fetchRemote/rejected` });
+          return thunkApi.rejectWithValue('Unknown error.');
         }
       );
 
diff --git a/public/app/features/plugins/admin/state/hooks.ts b/public/app/features/plugins/admin/state/hooks.ts
index f6592a9e1283a..c50d95483487c 100644
--- a/public/app/features/plugins/admin/state/hooks.ts
+++ b/public/app/features/plugins/admin/state/hooks.ts
@@ -84,7 +84,10 @@ export const useLocalFetchStatus = () => {
 };
 
 export const useFetchStatus = () => {
-  const isLoading = useSelector(selectIsRequestPending(fetchAll.typePrefix));
+  const isAllLoading = useSelector(selectIsRequestPending(fetchAll.typePrefix));
+  const isLocalLoading = useSelector(selectIsRequestPending('plugins/fetchLocal'));
+  const isRemoteLoading = useSelector(selectIsRequestPending('plugins/fetchRemote'));
+  const isLoading = isAllLoading || isLocalLoading || isRemoteLoading;
   const error = useSelector(selectRequestError(fetchAll.typePrefix));
 
   return { isLoading, error };
diff --git a/public/app/features/plugins/admin/state/selectors.test.ts b/public/app/features/plugins/admin/state/selectors.test.ts
index 84441ca42af4e..d10f061141291 100644
--- a/public/app/features/plugins/admin/state/selectors.test.ts
+++ b/public/app/features/plugins/admin/state/selectors.test.ts
@@ -67,20 +67,6 @@ describe('Plugins Selectors', () => {
       expect(results.map(({ name }) => name)).toEqual(['Plugin 3', 'Plugin 4']);
     });
 
-    it('should be possible to search for core plugins', () => {
-      const results = selectPlugins({ isCore: true })(store.getState());
-
-      expect(results).toHaveLength(2);
-      expect(results.map(({ name }) => name)).toEqual(['Plugin 1', 'Plugin 2']);
-    });
-
-    it('should be possible to exclude core plugins from the search', () => {
-      const results = selectPlugins({ isCore: false })(store.getState());
-
-      expect(results).toHaveLength(3);
-      expect(results.map(({ name }) => name)).toEqual(['Plugin 3', 'Plugin 4', 'Plugin 5']);
-    });
-
     it('should be possible to only search for installed plugins', () => {
       const results = selectPlugins({ isInstalled: true })(store.getState());
 
diff --git a/public/app/features/plugins/admin/state/selectors.ts b/public/app/features/plugins/admin/state/selectors.ts
index e3b2cefbfb47b..e56f6057ce29e 100644
--- a/public/app/features/plugins/admin/state/selectors.ts
+++ b/public/app/features/plugins/admin/state/selectors.ts
@@ -1,7 +1,9 @@
 import { createSelector } from '@reduxjs/toolkit';
 
 import { PluginError, PluginType, unEscapeStringFromRegex } from '@grafana/data';
+import { reportInteraction } from '@grafana/runtime';
 
+import { filterByKeyword } from '../helpers';
 import { RequestStatus, PluginCatalogStoreState } from '../types';
 
 import { pluginsAdapter } from './reducer';
@@ -22,9 +24,6 @@ export type PluginFilters = {
   // (Optional, only applied if set)
   type?: PluginType;
 
-  // (Optional, only applied if set)
-  isCore?: boolean;
-
   // (Optional, only applied if set)
   isInstalled?: boolean;
 
@@ -35,23 +34,25 @@ export type PluginFilters = {
 export const selectPlugins = (filters: PluginFilters) =>
   createSelector(selectAll, (plugins) => {
     const keyword = filters.keyword ? unEscapeStringFromRegex(filters.keyword.toLowerCase()) : '';
+    const filteredPluginIds = keyword !== '' ? filterByKeyword(plugins, keyword) : null;
 
+    if (keyword) {
+      reportInteraction('plugins_search', { resultsCount: filteredPluginIds?.length });
+    }
     return plugins.filter((plugin) => {
-      const fieldsToSearchIn = [plugin.name, plugin.orgName].filter(Boolean).map((f) => f.toLowerCase());
-
-      if (keyword && !fieldsToSearchIn.some((f) => f.includes(keyword))) {
+      if (keyword && filteredPluginIds == null) {
         return false;
       }
 
-      if (filters.type && plugin.type !== filters.type) {
+      if (keyword && !filteredPluginIds?.includes(plugin.id)) {
         return false;
       }
 
-      if (filters.isInstalled !== undefined && plugin.isInstalled !== filters.isInstalled) {
+      if (filters.type && plugin.type !== filters.type) {
         return false;
       }
 
-      if (filters.isCore !== undefined && plugin.isCore !== filters.isCore) {
+      if (filters.isInstalled !== undefined && plugin.isInstalled !== filters.isInstalled) {
         return false;
       }
 
diff --git a/public/app/features/plugins/admin/types.ts b/public/app/features/plugins/admin/types.ts
index 576fefd75d337..5cc0089fb9669 100644
--- a/public/app/features/plugins/admin/types.ts
+++ b/public/app/features/plugins/admin/types.ts
@@ -59,6 +59,12 @@ export interface CatalogPlugin extends WithAccessControlMetadata {
   details?: CatalogPluginDetails;
   error?: PluginErrorCode;
   angularDetected?: boolean;
+  // instance plugins may not be fully installed, which means a new instance
+  // running the plugin didn't started yet
+  isFullyInstalled?: boolean;
+  isUninstallingFromInstance?: boolean;
+  isUpdatingFromInstance?: boolean;
+  iam?: IdentityAccessManagement;
 }
 
 export interface CatalogPluginDetails {
@@ -71,6 +77,7 @@ export interface CatalogPluginDetails {
   grafanaDependency?: string;
   pluginDependencies?: PluginDependencies['plugins'];
   statusContext?: string;
+  iam?: IdentityAccessManagement;
 }
 
 export interface CatalogPluginInfo {
@@ -78,6 +85,7 @@ export interface CatalogPluginInfo {
     large: string;
     small: string;
   };
+  keywords: string[];
 }
 
 export type RemotePlugin = {
@@ -88,8 +96,10 @@ export type RemotePlugin = {
   featured: number;
   id: number;
   internal: boolean;
+  keywords: string[];
   json?: {
     dependencies: PluginDependencies;
+    iam?: IdentityAccessManagement;
     info: {
       links: Array<{
         name: string;
@@ -155,6 +165,7 @@ export type LocalPlugin = WithAccessControlMetadata & {
       small: string;
       large: string;
     };
+    keywords: string[];
     build: Build;
     screenshots?: Array<{
       path: string;
@@ -172,8 +183,18 @@ export type LocalPlugin = WithAccessControlMetadata & {
   type: PluginType;
   dependencies: PluginDependencies;
   angularDetected: boolean;
+  iam?: IdentityAccessManagement;
 };
 
+interface IdentityAccessManagement {
+  permissions: Permission[];
+}
+
+export interface Permission {
+  action: string;
+  scope: string;
+}
+
 interface Rel {
   name: string;
   url: string;
@@ -228,6 +249,7 @@ export enum PluginTabLabels {
   CONFIG = 'Config',
   DASHBOARDS = 'Dashboards',
   USAGE = 'Usage',
+  IAM = 'IAM',
 }
 
 export enum PluginTabIds {
@@ -236,6 +258,7 @@ export enum PluginTabIds {
   CONFIG = 'config',
   DASHBOARDS = 'dashboards',
   USAGE = 'usage',
+  IAM = 'iam',
 }
 
 export enum RequestStatus {
@@ -294,3 +317,12 @@ export type PluginVersion = {
   isCompatible: boolean;
   grafanaDependency: string | null;
 };
+
+export type InstancePlugin = {
+  pluginSlug: string;
+  version: string;
+};
+
+export type ProvisionedPlugin = {
+  slug: string;
+};
diff --git a/public/app/features/plugins/angularDeprecation/AngularDeprecationNotice.test.tsx b/public/app/features/plugins/angularDeprecation/AngularDeprecationNotice.test.tsx
index 9c1efcedbf804..40e5668145710 100644
--- a/public/app/features/plugins/angularDeprecation/AngularDeprecationNotice.test.tsx
+++ b/public/app/features/plugins/angularDeprecation/AngularDeprecationNotice.test.tsx
@@ -12,7 +12,7 @@ jest.mock('@grafana/runtime', () => ({
 }));
 
 function localStorageKey(dsUid: string) {
-  return `grafana.angularDeprecation.dashboardNotice.isDismissed.${dsUid}`;
+  return `grafana.angularDeprecation.dashboardNoticeAndMigration.isDismissed.${dsUid}`;
 }
 
 describe('AngularDeprecationNotice', () => {
@@ -63,4 +63,24 @@ describe('AngularDeprecationNotice', () => {
     await userEvent.click(closeButton);
     expect(reportInteraction).toHaveBeenCalledWith('angular_deprecation_notice_dismissed');
   });
+
+  describe('auto migrate button', () => {
+    const autoMigrateText = 'Try migration';
+
+    it('should display auto migrate button if showAutoMigrateLink is true', () => {
+      render(<AngularDeprecationNotice dashboardUid={dsUid} showAutoMigrateLink={true} />);
+      const autoMigrateButton = screen.getByRole('button', { name: /Try migration/i });
+      expect(autoMigrateButton).toBeInTheDocument();
+    });
+
+    it('should not display auto migrate button if showAutoMigrateLink is false', () => {
+      render(<AngularDeprecationNotice dashboardUid={dsUid} showAutoMigrateLink={false} />);
+      expect(screen.queryByText(autoMigrateText)).not.toBeInTheDocument();
+    });
+
+    it('should not display auto migrate link if showAutoMigrateLink is not provided', () => {
+      render(<AngularDeprecationNotice dashboardUid={dsUid} />);
+      expect(screen.queryByText(autoMigrateText)).not.toBeInTheDocument();
+    });
+  });
 });
diff --git a/public/app/features/plugins/angularDeprecation/AngularDeprecationNotice.tsx b/public/app/features/plugins/angularDeprecation/AngularDeprecationNotice.tsx
index f697e183f9c81..affd3056bb135 100644
--- a/public/app/features/plugins/angularDeprecation/AngularDeprecationNotice.tsx
+++ b/public/app/features/plugins/angularDeprecation/AngularDeprecationNotice.tsx
@@ -1,10 +1,10 @@
 import React from 'react';
 
 import { reportInteraction } from '@grafana/runtime';
-import { Alert } from '@grafana/ui';
+import { Alert, Button } from '@grafana/ui';
 import { LocalStorageValueProvider } from 'app/core/components/LocalStorageValueProvider';
 
-const LOCAL_STORAGE_KEY_PREFIX = 'grafana.angularDeprecation.dashboardNotice.isDismissed';
+const LOCAL_STORAGE_KEY_PREFIX = 'grafana.angularDeprecation.dashboardNoticeAndMigration.isDismissed';
 
 function localStorageKey(dashboardUid: string): string {
   return LOCAL_STORAGE_KEY_PREFIX + '.' + dashboardUid;
@@ -12,9 +12,19 @@ function localStorageKey(dashboardUid: string): string {
 
 export interface Props {
   dashboardUid: string;
+  showAutoMigrateLink?: boolean;
 }
 
-export function AngularDeprecationNotice({ dashboardUid }: Props) {
+function tryMigration() {
+  const autoMigrateParam = '__feature.autoMigrateOldPanels';
+  const url = new URL(window.location.toString());
+  if (!url.searchParams.has(autoMigrateParam)) {
+    url.searchParams.append(autoMigrateParam, 'true');
+  }
+  window.open(url.toString(), '_self');
+}
+
+export function AngularDeprecationNotice({ dashboardUid, showAutoMigrateLink }: Props) {
   return (
     <LocalStorageValueProvider<boolean> storageKey={localStorageKey(dashboardUid)} defaultValue={false}>
       {(isDismissed, onDismiss) => {
@@ -32,18 +42,21 @@ export function AngularDeprecationNotice({ dashboardUid }: Props) {
               }}
             >
               <div className="markdown-html">
-                <ul>
-                  <li>
-                    <a
-                      href="https://grafana.com/docs/grafana/latest/developers/angular_deprecation/"
-                      className="external-link"
-                      target="_blank"
-                      rel="noreferrer"
-                    >
-                      Read our deprecation notice and migration advice.
-                    </a>
-                  </li>
-                </ul>
+                <a
+                  href="https://grafana.com/docs/grafana/latest/developers/angular_deprecation/"
+                  className="external-link"
+                  target="_blank"
+                  rel="noreferrer"
+                >
+                  Read our deprecation notice and migration advice.
+                </a>
+                <br />
+
+                {showAutoMigrateLink && (
+                  <Button fill="outline" size="sm" onClick={tryMigration} style={{ marginTop: 10 }}>
+                    Try migration
+                  </Button>
+                )}
               </div>
             </Alert>
           </div>
diff --git a/public/app/features/plugins/angularDeprecation/AngularMigrationNotice.test.tsx b/public/app/features/plugins/angularDeprecation/AngularMigrationNotice.test.tsx
new file mode 100644
index 0000000000000..07d59e6b83268
--- /dev/null
+++ b/public/app/features/plugins/angularDeprecation/AngularMigrationNotice.test.tsx
@@ -0,0 +1,50 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { AngularMigrationNotice } from './AngularMigrationNotice';
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+}));
+
+describe('AngularMigrationNotice', () => {
+  const noticeText =
+    /This dashboard was migrated from Angular. Please make sure everything is behaving as expected and save and refresh this dashboard to persist the migration./i;
+  const dsUid = 'abc';
+
+  afterAll(() => {
+    jest.resetAllMocks();
+  });
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should render', () => {
+    render(<AngularMigrationNotice dashboardUid={dsUid} />);
+    expect(screen.getByText(noticeText)).toBeInTheDocument();
+  });
+
+  it('should be dismissable', async () => {
+    render(<AngularMigrationNotice dashboardUid={dsUid} />);
+    const closeButton = screen.getByRole('button', { name: /Close alert/i });
+    expect(closeButton).toBeInTheDocument();
+    await userEvent.click(closeButton);
+    expect(screen.queryByText(noticeText)).not.toBeInTheDocument();
+  });
+
+  describe('Migration alert buttons', () => {
+    it('should display the "Revert migration" button', () => {
+      render(<AngularMigrationNotice dashboardUid={dsUid} />);
+      const revertMigrationButton = screen.getByRole('button', { name: /Revert migration/i });
+      expect(revertMigrationButton).toBeInTheDocument();
+    });
+
+    it('should display the "Report issue" button', () => {
+      render(<AngularMigrationNotice dashboardUid={dsUid} />);
+      const reportIssueButton = screen.getByRole('button', { name: /Report issue/i });
+      expect(reportIssueButton).toBeInTheDocument();
+    });
+  });
+});
diff --git a/public/app/features/plugins/angularDeprecation/AngularMigrationNotice.tsx b/public/app/features/plugins/angularDeprecation/AngularMigrationNotice.tsx
new file mode 100644
index 0000000000000..b131e29554117
--- /dev/null
+++ b/public/app/features/plugins/angularDeprecation/AngularMigrationNotice.tsx
@@ -0,0 +1,66 @@
+import { css } from '@emotion/css';
+import React, { useState } from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Alert, Button, useStyles2 } from '@grafana/ui';
+
+import { migrationFeatureFlags } from './utils';
+
+interface Props {
+  dashboardUid: string;
+}
+
+const revertAutoMigrateUrlFlag = () => {
+  const url = new URL(window.location.toString());
+  const urlParams = new URLSearchParams(url.search);
+
+  urlParams.forEach((value, key) => {
+    if (key.startsWith('__feature.')) {
+      const featureName = key.substring(10);
+      if (migrationFeatureFlags.has(featureName)) {
+        urlParams.delete(key);
+      }
+    }
+  });
+
+  window.location.href = new URL(url.origin + url.pathname + '?' + urlParams.toString()).toString();
+};
+
+const reportIssue = () => {
+  window.open(
+    'https://github.com/grafana/grafana/issues/new?assignees=&labels=&projects=&template=0-bug-report.yaml&title=Product+Area%3A+Short+description+of+bug'
+  );
+};
+
+export function AngularMigrationNotice({ dashboardUid }: Props) {
+  const styles = useStyles2(getStyles);
+
+  const [showAlert, setShowAlert] = useState(true);
+
+  if (showAlert) {
+    return (
+      <Alert
+        severity="info"
+        title="This dashboard was migrated from Angular. Please make sure everything is behaving as expected and save and refresh this dashboard to persist the migration."
+        onRemove={() => setShowAlert(false)}
+      >
+        <div className="markdown-html">
+          <Button fill="outline" size="sm" className={styles.linkButton} onClick={reportIssue}>
+            Report issue
+          </Button>
+          <Button fill="outline" size="sm" className={styles.linkButton} onClick={revertAutoMigrateUrlFlag}>
+            Revert migration
+          </Button>
+        </div>
+      </Alert>
+    );
+  }
+
+  return null;
+}
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  linkButton: css({
+    marginRight: 10,
+  }),
+});
diff --git a/public/app/features/plugins/angularDeprecation/utils.ts b/public/app/features/plugins/angularDeprecation/utils.ts
index e7ff92a47ffee..0f42e93a3a801 100644
--- a/public/app/features/plugins/angularDeprecation/utils.ts
+++ b/public/app/features/plugins/angularDeprecation/utils.ts
@@ -1,7 +1,26 @@
+import { DataSourceInstanceSettings } from '@grafana/data';
 import { config } from '@grafana/runtime';
+import { DataSourceJsonData } from '@grafana/schema';
+
+function getDsInstanceSettingsByUid(dsUid: string): DataSourceInstanceSettings<DataSourceJsonData> | null {
+  return Object.values(config.datasources).find((ds) => ds.uid === dsUid) ?? null;
+}
 
 export function isAngularDatasourcePlugin(dsUid: string): boolean {
-  return Object.entries(config.datasources).some(([_, ds]) => {
-    return ds.uid === dsUid && ds.angularDetected;
-  });
+  return getDsInstanceSettingsByUid(dsUid)?.meta.angular?.detected ?? false;
 }
+
+export function isAngularDatasourcePluginAndNotHidden(dsUid: string): boolean {
+  const settings = getDsInstanceSettingsByUid(dsUid);
+  return (settings?.meta.angular?.detected && !settings?.meta.angular.hideDeprecation) ?? false;
+}
+
+export const migrationFeatureFlags = new Set([
+  'autoMigrateOldPanels',
+  'autoMigrateGraphPanel',
+  'autoMigrateTablePanel',
+  'autoMigratePiechartPanel',
+  'autoMigrateWorldmapPanel',
+  'autoMigrateStatPanel',
+  'disableAngular',
+]);
diff --git a/public/app/features/plugins/built_in_plugins.ts b/public/app/features/plugins/built_in_plugins.ts
index fe48f0b03ae45..03dd4d2a603a8 100644
--- a/public/app/features/plugins/built_in_plugins.ts
+++ b/public/app/features/plugins/built_in_plugins.ts
@@ -13,36 +13,20 @@ const grafanaPlugin = async () =>
 const influxdbPlugin = async () =>
   await import(/* webpackChunkName: "influxdbPlugin" */ 'app/plugins/datasource/influxdb/module');
 const lokiPlugin = async () => await import(/* webpackChunkName: "lokiPlugin" */ 'app/plugins/datasource/loki/module');
-const jaegerPlugin = async () =>
-  await import(/* webpackChunkName: "jaegerPlugin" */ 'app/plugins/datasource/jaeger/module');
-const zipkinPlugin = async () =>
-  await import(/* webpackChunkName: "zipkinPlugin" */ 'app/plugins/datasource/zipkin/module');
 const mixedPlugin = async () =>
   await import(/* webpackChunkName: "mixedPlugin" */ 'app/plugins/datasource/mixed/module');
 const mysqlPlugin = async () =>
   await import(/* webpackChunkName: "mysqlPlugin" */ 'app/plugins/datasource/mysql/module');
 const postgresPlugin = async () =>
-  await import(/* webpackChunkName: "postgresPlugin" */ 'app/plugins/datasource/postgres/module');
+  await import(/* webpackChunkName: "postgresPlugin" */ 'app/plugins/datasource/grafana-postgresql-datasource/module');
 const prometheusPlugin = async () =>
   await import(/* webpackChunkName: "prometheusPlugin" */ 'app/plugins/datasource/prometheus/module');
 const mssqlPlugin = async () =>
   await import(/* webpackChunkName: "mssqlPlugin" */ 'app/plugins/datasource/mssql/module');
-const testDataDSPlugin = async () =>
-  await import(/* webpackChunkName: "testDataDSPlugin" */ '@grafana-plugins/grafana-testdata-datasource/module');
-const cloudMonitoringPlugin = async () =>
-  await import(/* webpackChunkName: "cloudMonitoringPlugin" */ 'app/plugins/datasource/cloud-monitoring/module');
-const azureMonitorPlugin = async () =>
-  await import(/* webpackChunkName: "azureMonitorPlugin" */ 'app/plugins/datasource/azuremonitor/module');
-const tempoPlugin = async () =>
-  await import(/* webpackChunkName: "tempoPlugin" */ 'app/plugins/datasource/tempo/module');
 const alertmanagerPlugin = async () =>
   await import(/* webpackChunkName: "alertmanagerPlugin" */ 'app/plugins/datasource/alertmanager/module');
-const pyroscopePlugin = async () =>
-  await import(/* webpackChunkName: "pyroscopePlugin" */ 'app/plugins/datasource/grafana-pyroscope-datasource/module');
-const parcaPlugin = async () =>
-  await import(/* webpackChunkName: "parcaPlugin" */ 'app/plugins/datasource/parca/module');
 
-import * as alertGroupsPanel from 'app/plugins/panel/alertGroups/module';
+import { config } from '@grafana/runtime';
 import * as alertListPanel from 'app/plugins/panel/alertlist/module';
 import * as annoListPanel from 'app/plugins/panel/annolist/module';
 import * as barChartPanel from 'app/plugins/panel/barchart/module';
@@ -58,7 +42,6 @@ import * as histogramPanel from 'app/plugins/panel/histogram/module';
 import * as livePanel from 'app/plugins/panel/live/module';
 import * as logsPanel from 'app/plugins/panel/logs/module';
 import * as newsPanel from 'app/plugins/panel/news/module';
-import * as nodeGraph from 'app/plugins/panel/nodeGraph/module';
 import * as pieChartPanel from 'app/plugins/panel/piechart/module';
 import * as statPanel from 'app/plugins/panel/stat/module';
 import * as stateTimelinePanel from 'app/plugins/panel/state-timeline/module';
@@ -69,17 +52,26 @@ import * as timeseriesPanel from 'app/plugins/panel/timeseries/module';
 import * as tracesPanel from 'app/plugins/panel/traces/module';
 import * as trendPanel from 'app/plugins/panel/trend/module';
 import * as welcomeBanner from 'app/plugins/panel/welcome/module';
-import * as xyChartPanel from 'app/plugins/panel/xychart/module';
 
 // Async loaded panels
 const geomapPanel = async () => await import(/* webpackChunkName: "geomapPanel" */ 'app/plugins/panel/geomap/module');
 const canvasPanel = async () => await import(/* webpackChunkName: "canvasPanel" */ 'app/plugins/panel/canvas/module');
 const graphPanel = async () => await import(/* webpackChunkName: "graphPlugin" */ 'app/plugins/panel/graph/module');
+const xychartPanel = async () => {
+  if (config.featureToggles.autoMigrateXYChartPanel) {
+    return await import(/* webpackChunkName: "xychart2" */ 'app/plugins/panel/xychart/v2/module');
+  } else {
+    return await import(/* webpackChunkName: "xychart" */ 'app/plugins/panel/xychart/module');
+  }
+};
 const heatmapPanel = async () =>
   await import(/* webpackChunkName: "heatmapPanel" */ 'app/plugins/panel/heatmap/module');
 const tableOldPanel = async () =>
   await import(/* webpackChunkName: "tableOldPlugin" */ 'app/plugins/panel/table-old/module');
 
+const nodeGraph = async () =>
+  await import(/* webpackChunkName: "nodeGraphPanel" */ 'app/plugins/panel/nodeGraph/module');
+
 const builtInPlugins: Record<string, System.Module | (() => Promise<System.Module>)> = {
   // datasources
   'core:plugin/graphite': graphitePlugin,
@@ -90,20 +82,12 @@ const builtInPlugins: Record<string, System.Module | (() => Promise<System.Modul
   'core:plugin/grafana': grafanaPlugin,
   'core:plugin/influxdb': influxdbPlugin,
   'core:plugin/loki': lokiPlugin,
-  'core:plugin/jaeger': jaegerPlugin,
-  'core:plugin/zipkin': zipkinPlugin,
   'core:plugin/mixed': mixedPlugin,
   'core:plugin/mysql': mysqlPlugin,
-  'core:plugin/postgres': postgresPlugin,
+  'core:plugin/grafana-postgresql-datasource': postgresPlugin,
   'core:plugin/mssql': mssqlPlugin,
   'core:plugin/prometheus': prometheusPlugin,
-  'core:plugin/grafana-testdata-datasource': testDataDSPlugin,
-  'core:plugin/cloud-monitoring': cloudMonitoringPlugin,
-  'core:plugin/azuremonitor': azureMonitorPlugin,
-  'core:plugin/tempo': tempoPlugin,
   'core:plugin/alertmanager': alertmanagerPlugin,
-  'core:plugin/grafana-pyroscope-datasource': pyroscopePlugin,
-  'core:plugin/parca': parcaPlugin,
   // panels
   'core:plugin/text': textPanel,
   'core:plugin/timeseries': timeseriesPanel,
@@ -112,7 +96,7 @@ const builtInPlugins: Record<string, System.Module | (() => Promise<System.Modul
   'core:plugin/status-history': statusHistoryPanel,
   'core:plugin/candlestick': candlestickPanel,
   'core:plugin/graph': graphPanel,
-  'core:plugin/xychart': xyChartPanel,
+  'core:plugin/xychart': xychartPanel,
   'core:plugin/geomap': geomapPanel,
   'core:plugin/canvas': canvasPanel,
   'core:plugin/dashlist': dashListPanel,
@@ -137,7 +121,6 @@ const builtInPlugins: Record<string, System.Module | (() => Promise<System.Modul
   'core:plugin/welcome': welcomeBanner,
   'core:plugin/nodeGraph': nodeGraph,
   'core:plugin/histogram': histogramPanel,
-  'core:plugin/alertGroups': alertGroupsPanel,
 };
 
 export default builtInPlugins;
diff --git a/public/app/features/plugins/components/AppRootPage.test.tsx b/public/app/features/plugins/components/AppRootPage.test.tsx
index c590b46f93252..e9009ff59d0d3 100644
--- a/public/app/features/plugins/components/AppRootPage.test.tsx
+++ b/public/app/features/plugins/components/AppRootPage.test.tsx
@@ -26,6 +26,25 @@ jest.mock('../plugin_loader', () => ({
   importAppPlugin: jest.fn(),
 }));
 
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  config: {
+    featureToggles: {
+      accessControlOnCall: true,
+    },
+    theme2: {
+      breakpoints: {
+        values: {
+          sm: 576,
+          md: 768,
+          lg: 992,
+          xl: 1200,
+        },
+      },
+    },
+  },
+}));
+
 const importAppPluginMock = importAppPlugin as jest.Mock<
   ReturnType<typeof importAppPlugin>,
   Parameters<typeof importAppPlugin>
@@ -102,6 +121,16 @@ describe('AppRootPage', () => {
     enabled: true,
   });
 
+  it("should show a not found page if the plugin settings can't load", async () => {
+    jest.spyOn(console, 'error').mockImplementation();
+    getPluginSettingsMock.mockRejectedValue(new Error('Unknown Plugin'));
+    // Renders once for the first time
+    await act(async () => {
+      await renderUnderRouter();
+    });
+    expect(await screen.findByText('App not found')).toBeVisible();
+  });
+
   it('should not render the component if we are not under a plugin path', async () => {
     getPluginSettingsMock.mockResolvedValue(pluginMeta);
 
@@ -165,6 +194,19 @@ describe('AppRootPage', () => {
             name: 'Awesome page 2',
             path: '/a/my-awesome-plugin/page-without-role',
           },
+          {
+            type: PluginIncludeType.page,
+            name: 'Awesome page 3',
+            path: '/a/my-awesome-plugin/page-with-action-no-role',
+            action: 'grafana-awesomeapp.user-settings:read',
+          },
+          {
+            type: PluginIncludeType.page,
+            name: 'Awesome page 4',
+            path: '/a/my-awesome-plugin/page-with-action-and-role',
+            role: 'Viewer',
+            action: 'grafana-awesomeapp.user-settings:read',
+          },
         ],
       });
 
@@ -184,13 +226,58 @@ describe('AppRootPage', () => {
       expect(await screen.findByText('Access denied')).toBeVisible();
     });
 
+    it('a None role user should only have access to pages with actions defined or undefined', async () => {
+      contextSrv.user.orgRole = OrgRole.None;
+
+      // has access to a plugin entry page by default
+      await renderUnderRouter('');
+      expect(await screen.findByText('my great component')).toBeVisible();
+
+      // does not have access to a page with an action but no role
+      await renderUnderRouter('page-with-action-no-role');
+      expect(await screen.findByText('Access denied')).toBeVisible();
+
+      // does not have access to a page with an action and role
+      await renderUnderRouter('page-with-action-and-role');
+      expect(await screen.findByText('Access denied')).toBeVisible();
+
+      // has access to a page without roles
+      await renderUnderRouter('page-without-role');
+      expect(await screen.findByText('my great component')).toBeVisible();
+
+      // has access to Viewer page
+      await renderUnderRouter('viewer-page');
+      expect(await screen.findByText('Access denied')).toBeVisible();
+
+      contextSrv.user.permissions = {
+        'grafana-awesomeapp.user-settings:read': true,
+      };
+
+      // has access to a page with an action but no role
+      await renderUnderRouter('page-with-action-no-role');
+      expect(await screen.findByText('my great component')).toBeVisible();
+
+      // has access to a page with an action and role
+      await renderUnderRouter('page-with-action-and-role');
+      expect(await screen.findByText('my great component')).toBeVisible();
+    });
+
     it('a Viewer should only have access to pages with "Viewer" roles', async () => {
       contextSrv.user.orgRole = OrgRole.Viewer;
+      contextSrv.user.permissions = {};
 
       // Viewer has access to a plugin entry page by default
       await renderUnderRouter('');
       expect(await screen.findByText('my great component')).toBeVisible();
 
+      // Viewer does not have access to a page with an action but no role
+      await renderUnderRouter('page-with-action-no-role');
+      expect(await screen.findByText('Access denied')).toBeVisible();
+
+      // Viewer does not have access to a page with an action and role
+      await renderUnderRouter('page-with-action-and-role');
+      expect(await screen.findByText('Access denied')).toBeVisible();
+
       // Viewer has access to a page without roles
       await renderUnderRouter('page-without-role');
       expect(await screen.findByText('my great component')).toBeVisible();
@@ -211,35 +298,97 @@ describe('AppRootPage', () => {
     it('an Editor should have access to pages with both "Viewer" and "Editor" roles', async () => {
       contextSrv.user.orgRole = OrgRole.Editor;
       contextSrv.isEditor = true;
+      contextSrv.user.permissions = {};
 
-      // Viewer has access to a plugin entry page by default
+      // does not have access to a page with an action but no role
+      await renderUnderRouter('page-with-action-no-role');
+      expect(await screen.findByText('Access denied')).toBeVisible();
+
+      // does not have access to a page with an action and role
+      await renderUnderRouter('page-with-action-and-role');
+      expect(await screen.findByText('Access denied')).toBeVisible();
+
+      // has access to a plugin entry page by default
       await renderUnderRouter('');
       expect(await screen.findByText('my great component')).toBeVisible();
 
-      // Editor has access to a page without roles
+      // has access to a page without roles
       await renderUnderRouter('page-without-role');
       expect(await screen.findByText('my great component')).toBeVisible();
 
-      // Editor has access to Viewer page
+      // has access to Viewer page
       await renderUnderRouter('viewer-page');
       expect(await screen.findByText('my great component')).toBeVisible();
 
-      // Editor has access to Editor page
+      // has access to Editor page
       await renderUnderRouter('editor-page');
       expect(await screen.findByText('my great component')).toBeVisible();
 
-      // Editor does not have access to a Admin page
+      // does not have access to a Admin page
       await renderUnderRouter('admin-page');
       expect(await screen.findByText('Access denied')).toBeVisible();
+
+      contextSrv.user.permissions = {
+        'grafana-awesomeapp.user-settings:read': true,
+      };
+
+      // has access to a page with an action but no role
+      await renderUnderRouter('page-with-action-no-role');
+      expect(await screen.findByText('my great component')).toBeVisible();
+
+      // has access to a page with an action and role
+      await renderUnderRouter('page-with-action-and-role');
+      expect(await screen.findByText('my great component')).toBeVisible();
     });
 
-    it('a Grafana Admin should be able to see any page', async () => {
+    it('an Admin should have access to pages with both "Viewer" and "Editor" roles', async () => {
+      contextSrv.user.orgRole = OrgRole.Admin;
+      contextSrv.user.permissions = {};
+
+      // does not have access to a page with an action but no role
+      await renderUnderRouter('page-with-action-no-role');
+      expect(await screen.findByText('Access denied')).toBeVisible();
+
+      // does not have access to a page with an action and role
+      await renderUnderRouter('page-with-action-and-role');
+      expect(await screen.findByText('Access denied')).toBeVisible();
+
+      // has access to a plugin entry page by default
+      await renderUnderRouter('');
+      expect(await screen.findByText('my great component')).toBeVisible();
+
+      // has access to a page without roles
+      await renderUnderRouter('page-without-role');
+      expect(await screen.findByText('my great component')).toBeVisible();
+
+      // has access to Viewer page
+      await renderUnderRouter('viewer-page');
+      expect(await screen.findByText('my great component')).toBeVisible();
+
+      // has access to Editor page
+      await renderUnderRouter('editor-page');
+      expect(await screen.findByText('my great component')).toBeVisible();
+
+      // has access to a Admin page
+      await renderUnderRouter('admin-page');
+      expect(await screen.findByText('my great component')).toBeVisible();
+    });
+
+    it('a Grafana Admin should be able to see any page without action specifier', async () => {
       contextSrv.isGrafanaAdmin = true;
 
       // Viewer has access to a plugin entry page
       await renderUnderRouter('');
       expect(await screen.findByText('my great component')).toBeVisible();
 
+      // Viewer does not have access to a page with an action but no role
+      await renderUnderRouter('page-with-action-no-role');
+      expect(await screen.findByText('Access denied')).toBeVisible();
+
+      // Viewer does not have access to a page with an action and role
+      await renderUnderRouter('page-with-action-and-role');
+      expect(await screen.findByText('Access denied')).toBeVisible();
+
       // Admin has access to a page without roles
       await renderUnderRouter('page-without-role');
       expect(await screen.findByText('my great component')).toBeVisible();
diff --git a/public/app/features/plugins/components/AppRootPage.tsx b/public/app/features/plugins/components/AppRootPage.tsx
index 182c177ca1e29..33b6f905f55bb 100644
--- a/public/app/features/plugins/components/AppRootPage.tsx
+++ b/public/app/features/plugins/components/AppRootPage.tsx
@@ -3,18 +3,29 @@ import { AnyAction, createSlice, PayloadAction } from '@reduxjs/toolkit';
 import React, { useCallback, useEffect, useMemo, useReducer } from 'react';
 import { useLocation, useRouteMatch } from 'react-router-dom';
 
-import { AppEvents, AppPlugin, AppPluginMeta, NavModel, NavModelItem, OrgRole, PluginType } from '@grafana/data';
+import {
+  AppEvents,
+  AppPlugin,
+  AppPluginMeta,
+  NavModel,
+  NavModelItem,
+  OrgRole,
+  PluginType,
+  PluginContextProvider,
+} from '@grafana/data';
 import { config, locationSearchToObject } from '@grafana/runtime';
 import { Alert } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import PageLoader from 'app/core/components/PageLoader/PageLoader';
+import { EntityNotFound } from 'app/core/components/PageNotFound/EntityNotFound';
 import { useGrafana } from 'app/core/context/GrafanaContext';
 import { appEvents, contextSrv } from 'app/core/core';
 import { getNotFoundNav, getWarningNav, getExceptionNav } from 'app/core/navigation/errorModels';
+import { getMessageFromError } from 'app/core/utils/errors';
 
 import { getPluginSettings } from '../pluginSettings';
 import { importAppPlugin } from '../plugin_loader';
-import { buildPluginSectionNav } from '../utils';
+import { buildPluginSectionNav, pluginsLogger } from '../utils';
 
 import { buildPluginPageContext, PluginPageContext } from './PluginPageContext';
 
@@ -27,19 +38,20 @@ interface Props {
 
 interface State {
   loading: boolean;
+  loadingError: boolean;
   plugin?: AppPlugin | null;
   // Used to display a tab navigation (used before the new Top Nav)
   pluginNav: NavModel | null;
 }
 
-const initialState: State = { loading: true, pluginNav: null, plugin: null };
+const initialState: State = { loading: true, loadingError: false, pluginNav: null, plugin: null };
 
 export function AppRootPage({ pluginId, pluginNavSection }: Props) {
   const match = useRouteMatch();
   const location = useLocation();
   const [state, dispatch] = useReducer(stateSlice.reducer, initialState);
   const currentUrl = config.appSubUrl + location.pathname + location.search;
-  const { plugin, loading, pluginNav } = state;
+  const { plugin, loading, loadingError, pluginNav } = state;
   const navModel = buildPluginSectionNav(pluginNavSection, pluginNav, currentUrl);
   const queryParams = useMemo(() => locationSearchToObject(location.search), [location.search]);
   const context = useMemo(() => buildPluginPageContext(navModel), [navModel]);
@@ -60,6 +72,7 @@ export function AppRootPage({ pluginId, pluginNavSection }: Props) {
     return (
       <Page navModel={navModel} pageNav={{ text: '' }} layout={currentLayout}>
         {loading && <PageLoader />}
+        {!loading && loadingError && <EntityNotFound entity="App" />}
       </Page>
     );
   }
@@ -73,28 +86,40 @@ export function AppRootPage({ pluginId, pluginNavSection }: Props) {
   }
 
   const pluginRoot = plugin.root && (
-    <plugin.root
-      meta={plugin.meta}
-      basename={match.url}
-      onNavChanged={onNavChanged}
-      query={queryParams}
-      path={location.pathname}
-    />
+    <PluginContextProvider meta={plugin.meta}>
+      <plugin.root
+        meta={plugin.meta}
+        basename={match.url}
+        onNavChanged={onNavChanged}
+        query={queryParams}
+        path={location.pathname}
+      />
+    </PluginContextProvider>
   );
 
   // Because of the fallback at plugin routes, we need to check
   // if the user has permissions to see the plugin page.
   const userHasPermissionsToPluginPage = () => {
     // Check if plugin does not have any configurations or the user is Grafana Admin
-    if (!plugin.meta?.includes || contextSrv.isGrafanaAdmin || contextSrv.user.orgRole === OrgRole.Admin) {
+    if (!plugin.meta?.includes) {
       return true;
     }
 
-    const pluginInclude = plugin.meta?.includes.find((include) => include.path === pluginRoot.props.path);
+    const pluginInclude = plugin.meta?.includes.find((include) => include.path === location.pathname);
     // Check if include configuration contains current path
     if (!pluginInclude) {
       return true;
     }
+
+    // Check if action exists and give access if user has the required permission.
+    if (pluginInclude?.action && config.featureToggles.accessControlOnCall) {
+      return contextSrv.hasPermission(pluginInclude.action);
+    }
+
+    if (contextSrv.isGrafanaAdmin || contextSrv.user.orgRole === OrgRole.Admin) {
+      return true;
+    }
+
     const pathRole: string = pluginInclude?.role || '';
     // Check if role exists  and give access to Editor to be able to see Viewer pages
     if (!pathRole || (contextSrv.isEditor && pathRole === OrgRole.Viewer)) {
@@ -167,15 +192,19 @@ async function loadAppPlugin(pluginId: string, dispatch: React.Dispatch<AnyActio
       }
       return importAppPlugin(info);
     });
-    dispatch(stateSlice.actions.setState({ plugin: app, loading: false, pluginNav: null }));
+    dispatch(stateSlice.actions.setState({ plugin: app, loading: false, loadingError: false, pluginNav: null }));
   } catch (err) {
     dispatch(
       stateSlice.actions.setState({
         plugin: null,
         loading: false,
+        loadingError: true,
         pluginNav: process.env.NODE_ENV === 'development' ? getExceptionNav(err) : getNotFoundNav(),
       })
     );
+    const error = err instanceof Error ? err : new Error(getMessageFromError(err));
+    pluginsLogger.logError(error);
+    console.error(error);
   }
 }
 
diff --git a/public/app/features/plugins/components/PluginsErrorsInfo.tsx b/public/app/features/plugins/components/PluginsErrorsInfo.tsx
index 655057b470d43..d87a4f12db857 100644
--- a/public/app/features/plugins/components/PluginsErrorsInfo.tsx
+++ b/public/app/features/plugins/components/PluginsErrorsInfo.tsx
@@ -23,7 +23,7 @@ export function PluginsErrorsInfo({ filterByPluginType }: PluginsErrorInfoProps)
   return (
     <Alert
       title="Unsigned plugins were found during plugin initialization. Grafana Labs cannot guarantee the integrity of these plugins. We recommend only using signed plugins."
-      aria-label={selectors.pages.PluginsList.signatureErrorNotice}
+      data-testid={selectors.pages.PluginsList.signatureErrorNotice}
       severity="warning"
     >
       <p>The following plugins are disabled and not shown in the list below:</p>
diff --git a/public/app/features/plugins/datasource_srv.ts b/public/app/features/plugins/datasource_srv.ts
index e9b3b858662be..7e9b6affd1d42 100644
--- a/public/app/features/plugins/datasource_srv.ts
+++ b/public/app/features/plugins/datasource_srv.ts
@@ -1,5 +1,3 @@
-import { some } from 'lodash';
-
 import {
   AppEvents,
   DataSourceApi,
@@ -7,6 +5,7 @@ import {
   DataSourceRef,
   DataSourceSelectItem,
   ScopedVars,
+  matchPluginId,
 } from '@grafana/data';
 import {
   DataSourceSrv as DataSourceService,
@@ -224,10 +223,7 @@ export class DatasourceSrv implements DataSourceService {
       if (filters.alerting && !x.meta.alerting) {
         return false;
       }
-      if (
-        filters.pluginId &&
-        !(x.meta.id === filters.pluginId || some(x.meta.aliasIDs, (id) => id === filters.pluginId))
-      ) {
+      if (filters.pluginId && !matchPluginId(filters.pluginId, x.meta)) {
         return false;
       }
       if (filters.filter && !filters.filter(x)) {
@@ -255,8 +251,10 @@ export class DatasourceSrv implements DataSourceService {
           continue;
         }
         let dsValue = variable.current.value === 'default' ? this.defaultName : variable.current.value;
-        if (Array.isArray(dsValue) && dsValue.length === 1) {
-          // Support for multi-value variables with only one selected datasource
+        // Support for multi-value DataSource (ds) variables
+        if (Array.isArray(dsValue)) {
+          // If the ds variable have multiple selected datasources
+          // We will use the first one
           dsValue = dsValue[0];
         }
         const dsSettings =
@@ -360,7 +358,7 @@ export function getNameOrUid(ref?: string | DataSourceRef | null): string | unde
   return isString ? ref : ref?.uid;
 }
 
-export function variableInterpolation(value: any[]) {
+export function variableInterpolation<T>(value: T | T[]) {
   if (Array.isArray(value)) {
     return value[0];
   }
diff --git a/public/app/features/plugins/extensions/getPluginExtensions.test.ts b/public/app/features/plugins/extensions/getPluginExtensions.test.ts
deleted file mode 100644
index 52408ecf6deac..0000000000000
--- a/public/app/features/plugins/extensions/getPluginExtensions.test.ts
+++ /dev/null
@@ -1,412 +0,0 @@
-import { PluginExtensionLinkConfig, PluginExtensionTypes } from '@grafana/data';
-import { reportInteraction } from '@grafana/runtime';
-
-import { createPluginExtensionRegistry } from './createPluginExtensionRegistry';
-import { getPluginExtensions } from './getPluginExtensions';
-import { isReadOnlyProxy } from './utils';
-import { assertPluginExtensionLink } from './validators';
-
-jest.mock('@grafana/runtime', () => {
-  return {
-    ...jest.requireActual('@grafana/runtime'),
-    reportInteraction: jest.fn(),
-  };
-});
-
-describe('getPluginExtensions()', () => {
-  const extensionPoint1 = 'grafana/dashboard/panel/menu';
-  const extensionPoint2 = 'plugins/myorg-basic-app/start';
-  const pluginId = 'grafana-basic-app';
-  let link1: PluginExtensionLinkConfig, link2: PluginExtensionLinkConfig;
-
-  beforeEach(() => {
-    link1 = {
-      type: PluginExtensionTypes.link,
-      title: 'Link 1',
-      description: 'Link 1 description',
-      path: `/a/${pluginId}/declare-incident`,
-      extensionPointId: extensionPoint1,
-      configure: jest.fn().mockReturnValue({}),
-    };
-    link2 = {
-      type: PluginExtensionTypes.link,
-      title: 'Link 2',
-      description: 'Link 2 description',
-      path: `/a/${pluginId}/declare-incident`,
-      extensionPointId: extensionPoint2,
-      configure: jest.fn().mockImplementation((context) => ({ title: context?.title })),
-    };
-
-    global.console.warn = jest.fn();
-    jest.mocked(reportInteraction).mockReset();
-  });
-
-  test('should return the extensions for the given placement', () => {
-    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link1, link2] }]);
-    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint1 });
-
-    expect(extensions).toHaveLength(1);
-    expect(extensions[0]).toEqual(
-      expect.objectContaining({
-        pluginId,
-        type: PluginExtensionTypes.link,
-        title: link1.title,
-        description: link1.description,
-        path: expect.stringContaining(link1.path!),
-      })
-    );
-  });
-
-  test('should not limit the number of extensions per plugin by default', () => {
-    // Registering 3 extensions for the same plugin for the same placement
-    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link1, link1, link1, link2] }]);
-    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint1 });
-
-    expect(extensions).toHaveLength(3);
-    expect(extensions[0]).toEqual(
-      expect.objectContaining({
-        pluginId,
-        type: PluginExtensionTypes.link,
-        title: link1.title,
-        description: link1.description,
-        path: expect.stringContaining(link1.path!),
-      })
-    );
-  });
-
-  test('should be possible to limit the number of extensions per plugin for a given placement', () => {
-    const registry = createPluginExtensionRegistry([
-      { pluginId, extensionConfigs: [link1, link1, link1, link2] },
-      {
-        pluginId: 'my-plugin',
-        extensionConfigs: [
-          { ...link1, path: '/a/my-plugin/declare-incident' },
-          { ...link1, path: '/a/my-plugin/declare-incident' },
-          { ...link1, path: '/a/my-plugin/declare-incident' },
-          { ...link2, path: '/a/my-plugin/declare-incident' },
-        ],
-      },
-    ]);
-
-    // Limit to 1 extension per plugin
-    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint1, limitPerPlugin: 1 });
-
-    expect(extensions).toHaveLength(2);
-    expect(extensions[0]).toEqual(
-      expect.objectContaining({
-        pluginId,
-        type: PluginExtensionTypes.link,
-        title: link1.title,
-        description: link1.description,
-        path: expect.stringContaining(link1.path!),
-      })
-    );
-  });
-
-  test('should return with an empty list if there are no extensions registered for a placement yet', () => {
-    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link1, link2] }]);
-    const { extensions } = getPluginExtensions({ registry, extensionPointId: 'placement-with-no-extensions' });
-
-    expect(extensions).toEqual([]);
-  });
-
-  test('should pass the context to the configure() function', () => {
-    const context = { title: 'New title from the context!' };
-    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
-
-    getPluginExtensions({ registry, context, extensionPointId: extensionPoint2 });
-
-    expect(link2.configure).toHaveBeenCalledTimes(1);
-    expect(link2.configure).toHaveBeenCalledWith(context);
-  });
-
-  test('should be possible to update the basic properties with the configure() function', () => {
-    link2.configure = jest.fn().mockImplementation(() => ({
-      title: 'Updated title',
-      description: 'Updated description',
-      path: `/a/${pluginId}/updated-path`,
-      icon: 'search',
-      category: 'Machine Learning',
-    }));
-
-    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
-    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 });
-    const [extension] = extensions;
-
-    assertPluginExtensionLink(extension);
-
-    expect(link2.configure).toHaveBeenCalledTimes(1);
-    expect(extension.title).toBe('Updated title');
-    expect(extension.description).toBe('Updated description');
-    expect(extension.path?.startsWith(`/a/${pluginId}/updated-path`)).toBeTruthy();
-    expect(extension.icon).toBe('search');
-    expect(extension.category).toBe('Machine Learning');
-  });
-
-  test('should append link tracking to path when running configure() function', () => {
-    link2.configure = jest.fn().mockImplementation(() => ({
-      title: 'Updated title',
-      description: 'Updated description',
-      path: `/a/${pluginId}/updated-path`,
-      icon: 'search',
-      category: 'Machine Learning',
-    }));
-
-    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
-    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 });
-    const [extension] = extensions;
-
-    assertPluginExtensionLink(extension);
-
-    expect(link2.configure).toHaveBeenCalledTimes(1);
-    expect(extension.path).toBe(
-      `/a/${pluginId}/updated-path?uel_pid=grafana-basic-app&uel_epid=plugins%2Fmyorg-basic-app%2Fstart`
-    );
-  });
-
-  test('should ignore restricted properties passed via the configure() function', () => {
-    link2.configure = jest.fn().mockImplementation(() => ({
-      // The following props are not allowed to override
-      type: 'unknown-type',
-      pluginId: 'another-plugin',
-
-      // Unknown properties
-      testing: false,
-
-      // The following props are allowed to override
-      title: 'test',
-    }));
-
-    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
-    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 });
-    const [extension] = extensions;
-
-    expect(link2.configure).toHaveBeenCalledTimes(1);
-    expect(extensions).toHaveLength(1);
-    expect(extension.title).toBe('test');
-    expect(extension.type).toBe('link');
-    expect(extension.pluginId).toBe('grafana-basic-app');
-    //@ts-ignore
-    expect(extension.testing).toBeUndefined();
-  });
-  test('should pass a read only context to the configure() function', () => {
-    const context = { title: 'New title from the context!' };
-    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
-    const { extensions } = getPluginExtensions({ registry, context, extensionPointId: extensionPoint2 });
-    const [extension] = extensions;
-    const readOnlyContext = (link2.configure as jest.Mock).mock.calls[0][0];
-
-    assertPluginExtensionLink(extension);
-
-    expect(link2.configure).toHaveBeenCalledTimes(1);
-    expect(isReadOnlyProxy(readOnlyContext)).toBe(true);
-    expect(() => {
-      readOnlyContext.title = 'New title';
-    }).toThrow();
-    expect(context.title).toBe('New title from the context!');
-  });
-
-  test('should catch errors in the configure() function and log them as warnings', () => {
-    link2.configure = jest.fn().mockImplementation(() => {
-      throw new Error('Something went wrong!');
-    });
-
-    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
-
-    expect(() => {
-      getPluginExtensions({ registry, extensionPointId: extensionPoint2 });
-    }).not.toThrow();
-
-    expect(link2.configure).toHaveBeenCalledTimes(1);
-    expect(global.console.warn).toHaveBeenCalledTimes(1);
-    expect(global.console.warn).toHaveBeenCalledWith('[Plugin Extensions] Something went wrong!');
-  });
-
-  test('should skip the link extension if the configure() function returns with an invalid path', () => {
-    link1.configure = jest.fn().mockImplementation(() => ({
-      path: '/a/another-plugin/page-a',
-    }));
-    link2.configure = jest.fn().mockImplementation(() => ({
-      path: 'invalid-path',
-    }));
-
-    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link1, link2] }]);
-    const { extensions: extensionsAtPlacement1 } = getPluginExtensions({ registry, extensionPointId: extensionPoint1 });
-    const { extensions: extensionsAtPlacement2 } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 });
-
-    expect(extensionsAtPlacement1).toHaveLength(0);
-    expect(extensionsAtPlacement2).toHaveLength(0);
-
-    expect(link1.configure).toHaveBeenCalledTimes(1);
-    expect(link2.configure).toHaveBeenCalledTimes(1);
-    expect(global.console.warn).toHaveBeenCalledTimes(2);
-  });
-
-  test('should skip the extension if any of the updated props returned by the configure() function are invalid', () => {
-    const overrides = {
-      title: '', // Invalid empty string for title - should be ignored
-      description: 'A valid description.', // This should be updated
-    };
-
-    link2.configure = jest.fn().mockImplementation(() => overrides);
-
-    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
-    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 });
-
-    expect(extensions).toHaveLength(0);
-    expect(link2.configure).toHaveBeenCalledTimes(1);
-    expect(global.console.warn).toHaveBeenCalledTimes(1);
-  });
-
-  test('should skip the extension if the configure() function returns a promise', () => {
-    link2.configure = jest.fn().mockImplementation(() => Promise.resolve({}));
-
-    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
-    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 });
-
-    expect(extensions).toHaveLength(0);
-    expect(link2.configure).toHaveBeenCalledTimes(1);
-    expect(global.console.warn).toHaveBeenCalledTimes(1);
-  });
-
-  test('should skip (hide) the extension if the configure() function returns undefined', () => {
-    link2.configure = jest.fn().mockImplementation(() => undefined);
-
-    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
-    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 });
-
-    expect(extensions).toHaveLength(0);
-    expect(global.console.warn).toHaveBeenCalledTimes(0); // As this is intentional, no warning should be logged
-  });
-
-  test('should pass event, context and helper to extension onClick()', () => {
-    link2.path = undefined;
-    link2.onClick = jest.fn().mockImplementation(() => {
-      throw new Error('Something went wrong!');
-    });
-
-    const context = {};
-    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
-    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 });
-    const [extension] = extensions;
-
-    assertPluginExtensionLink(extension);
-
-    const event = {} as React.MouseEvent;
-    extension.onClick?.(event);
-
-    expect(link2.onClick).toHaveBeenCalledTimes(1);
-    expect(link2.onClick).toHaveBeenCalledWith(
-      event,
-      expect.objectContaining({
-        context,
-        openModal: expect.any(Function),
-      })
-    );
-  });
-
-  test('should catch errors in async/promise-based onClick function and log them as warnings', async () => {
-    link2.path = undefined;
-    link2.onClick = jest.fn().mockRejectedValue(new Error('testing'));
-
-    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
-    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 });
-    const [extension] = extensions;
-
-    assertPluginExtensionLink(extension);
-
-    await extension.onClick?.({} as React.MouseEvent);
-
-    expect(extensions).toHaveLength(1);
-    expect(link2.onClick).toHaveBeenCalledTimes(1);
-    expect(global.console.warn).toHaveBeenCalledTimes(1);
-  });
-
-  test('should catch errors in the onClick() function and log them as warnings', () => {
-    link2.path = undefined;
-    link2.onClick = jest.fn().mockImplementation(() => {
-      throw new Error('Something went wrong!');
-    });
-
-    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
-    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 });
-    const [extension] = extensions;
-
-    assertPluginExtensionLink(extension);
-    extension.onClick?.({} as React.MouseEvent);
-
-    expect(link2.onClick).toHaveBeenCalledTimes(1);
-    expect(global.console.warn).toHaveBeenCalledTimes(1);
-    expect(global.console.warn).toHaveBeenCalledWith('[Plugin Extensions] Something went wrong!');
-  });
-
-  test('should pass a read only context to the onClick() function', () => {
-    const context = { title: 'New title from the context!' };
-
-    link2.path = undefined;
-    link2.onClick = jest.fn();
-
-    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
-    const { extensions } = getPluginExtensions({ registry, context, extensionPointId: extensionPoint2 });
-    const [extension] = extensions;
-
-    assertPluginExtensionLink(extension);
-    extension.onClick?.({} as React.MouseEvent);
-
-    const helpers = (link2.onClick as jest.Mock).mock.calls[0][1];
-
-    expect(link2.configure).toHaveBeenCalledTimes(1);
-    expect(isReadOnlyProxy(helpers.context)).toBe(true);
-    expect(() => {
-      helpers.context.title = 'New title';
-    }).toThrow();
-  });
-
-  test('should not make original context read only', () => {
-    const context = {
-      title: 'New title from the context!',
-      nested: { title: 'title' },
-      array: ['a'],
-    };
-
-    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
-    getPluginExtensions({ registry, context, extensionPointId: extensionPoint2 });
-
-    expect(() => {
-      context.title = 'Updating the title';
-      context.nested.title = 'new title';
-      context.array.push('b');
-    }).not.toThrow();
-  });
-
-  test('should report interaction when onClick is triggered', () => {
-    const reportInteractionMock = jest.mocked(reportInteraction);
-
-    const registry = createPluginExtensionRegistry([
-      {
-        pluginId,
-        extensionConfigs: [
-          {
-            ...link1,
-            path: undefined,
-            onClick: jest.fn(),
-          },
-        ],
-      },
-    ]);
-    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint1 });
-    const [extension] = extensions;
-
-    assertPluginExtensionLink(extension);
-
-    extension.onClick?.();
-
-    expect(reportInteractionMock).toBeCalledTimes(1);
-    expect(reportInteractionMock).toBeCalledWith('ui_extension_link_clicked', {
-      pluginId: extension.pluginId,
-      extensionPointId: extensionPoint1,
-      title: extension.title,
-      category: extension.category,
-    });
-  });
-});
diff --git a/public/app/features/plugins/extensions/getPluginExtensions.test.tsx b/public/app/features/plugins/extensions/getPluginExtensions.test.tsx
new file mode 100644
index 0000000000000..85c6304154e56
--- /dev/null
+++ b/public/app/features/plugins/extensions/getPluginExtensions.test.tsx
@@ -0,0 +1,441 @@
+import React from 'react';
+
+import { PluginExtensionComponentConfig, PluginExtensionLinkConfig, PluginExtensionTypes } from '@grafana/data';
+import { reportInteraction } from '@grafana/runtime';
+
+import { createPluginExtensionRegistry } from './createPluginExtensionRegistry';
+import { getPluginExtensions } from './getPluginExtensions';
+import { isReadOnlyProxy } from './utils';
+import { assertPluginExtensionLink } from './validators';
+
+jest.mock('@grafana/runtime', () => {
+  return {
+    ...jest.requireActual('@grafana/runtime'),
+    reportInteraction: jest.fn(),
+  };
+});
+
+describe('getPluginExtensions()', () => {
+  const extensionPoint1 = 'grafana/dashboard/panel/menu';
+  const extensionPoint2 = 'plugins/myorg-basic-app/start';
+  const extensionPoint3 = 'grafana/datasources/config';
+  const pluginId = 'grafana-basic-app';
+  // Sample extension configs that are used in the tests below
+  let link1: PluginExtensionLinkConfig, link2: PluginExtensionLinkConfig, component1: PluginExtensionComponentConfig;
+
+  beforeEach(() => {
+    link1 = {
+      type: PluginExtensionTypes.link,
+      title: 'Link 1',
+      description: 'Link 1 description',
+      path: `/a/${pluginId}/declare-incident`,
+      extensionPointId: extensionPoint1,
+      configure: jest.fn().mockReturnValue({}),
+    };
+    link2 = {
+      type: PluginExtensionTypes.link,
+      title: 'Link 2',
+      description: 'Link 2 description',
+      path: `/a/${pluginId}/declare-incident`,
+      extensionPointId: extensionPoint2,
+      configure: jest.fn().mockImplementation((context) => ({ title: context?.title })),
+    };
+    component1 = {
+      type: PluginExtensionTypes.component,
+      title: 'Component 1',
+      description: 'Component 1 description',
+      extensionPointId: extensionPoint3,
+      component: (context) => {
+        return <div>Hello world!</div>;
+      },
+    };
+
+    global.console.warn = jest.fn();
+    jest.mocked(reportInteraction).mockReset();
+  });
+
+  test('should return the extensions for the given placement', () => {
+    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link1, link2] }]);
+    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint1 });
+
+    expect(extensions).toHaveLength(1);
+    expect(extensions[0]).toEqual(
+      expect.objectContaining({
+        pluginId,
+        type: PluginExtensionTypes.link,
+        title: link1.title,
+        description: link1.description,
+        path: expect.stringContaining(link1.path!),
+      })
+    );
+  });
+
+  test('should not limit the number of extensions per plugin by default', () => {
+    // Registering 3 extensions for the same plugin for the same placement
+    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link1, link1, link1, link2] }]);
+    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint1 });
+
+    expect(extensions).toHaveLength(3);
+    expect(extensions[0]).toEqual(
+      expect.objectContaining({
+        pluginId,
+        type: PluginExtensionTypes.link,
+        title: link1.title,
+        description: link1.description,
+        path: expect.stringContaining(link1.path!),
+      })
+    );
+  });
+
+  test('should be possible to limit the number of extensions per plugin for a given placement', () => {
+    const registry = createPluginExtensionRegistry([
+      { pluginId, extensionConfigs: [link1, link1, link1, link2] },
+      {
+        pluginId: 'my-plugin',
+        extensionConfigs: [
+          { ...link1, path: '/a/my-plugin/declare-incident' },
+          { ...link1, path: '/a/my-plugin/declare-incident' },
+          { ...link1, path: '/a/my-plugin/declare-incident' },
+          { ...link2, path: '/a/my-plugin/declare-incident' },
+        ],
+      },
+    ]);
+
+    // Limit to 1 extension per plugin
+    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint1, limitPerPlugin: 1 });
+
+    expect(extensions).toHaveLength(2);
+    expect(extensions[0]).toEqual(
+      expect.objectContaining({
+        pluginId,
+        type: PluginExtensionTypes.link,
+        title: link1.title,
+        description: link1.description,
+        path: expect.stringContaining(link1.path!),
+      })
+    );
+  });
+
+  test('should return with an empty list if there are no extensions registered for a placement yet', () => {
+    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link1, link2] }]);
+    const { extensions } = getPluginExtensions({ registry, extensionPointId: 'placement-with-no-extensions' });
+
+    expect(extensions).toEqual([]);
+  });
+
+  test('should pass the context to the configure() function', () => {
+    const context = { title: 'New title from the context!' };
+    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
+
+    getPluginExtensions({ registry, context, extensionPointId: extensionPoint2 });
+
+    expect(link2.configure).toHaveBeenCalledTimes(1);
+    expect(link2.configure).toHaveBeenCalledWith(context);
+  });
+
+  test('should be possible to update the basic properties with the configure() function', () => {
+    link2.configure = jest.fn().mockImplementation(() => ({
+      title: 'Updated title',
+      description: 'Updated description',
+      path: `/a/${pluginId}/updated-path`,
+      icon: 'search',
+      category: 'Machine Learning',
+    }));
+
+    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
+    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 });
+    const [extension] = extensions;
+
+    assertPluginExtensionLink(extension);
+
+    expect(link2.configure).toHaveBeenCalledTimes(1);
+    expect(extension.title).toBe('Updated title');
+    expect(extension.description).toBe('Updated description');
+    expect(extension.path?.startsWith(`/a/${pluginId}/updated-path`)).toBeTruthy();
+    expect(extension.icon).toBe('search');
+    expect(extension.category).toBe('Machine Learning');
+  });
+
+  test('should append link tracking to path when running configure() function', () => {
+    link2.configure = jest.fn().mockImplementation(() => ({
+      title: 'Updated title',
+      description: 'Updated description',
+      path: `/a/${pluginId}/updated-path`,
+      icon: 'search',
+      category: 'Machine Learning',
+    }));
+
+    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
+    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 });
+    const [extension] = extensions;
+
+    assertPluginExtensionLink(extension);
+
+    expect(link2.configure).toHaveBeenCalledTimes(1);
+    expect(extension.path).toBe(
+      `/a/${pluginId}/updated-path?uel_pid=grafana-basic-app&uel_epid=plugins%2Fmyorg-basic-app%2Fstart`
+    );
+  });
+
+  test('should ignore restricted properties passed via the configure() function', () => {
+    link2.configure = jest.fn().mockImplementation(() => ({
+      // The following props are not allowed to override
+      type: 'unknown-type',
+      pluginId: 'another-plugin',
+
+      // Unknown properties
+      testing: false,
+
+      // The following props are allowed to override
+      title: 'test',
+    }));
+
+    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
+    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 });
+    const [extension] = extensions;
+
+    expect(link2.configure).toHaveBeenCalledTimes(1);
+    expect(extensions).toHaveLength(1);
+    expect(extension.title).toBe('test');
+    expect(extension.type).toBe('link');
+    expect(extension.pluginId).toBe('grafana-basic-app');
+    //@ts-ignore
+    expect(extension.testing).toBeUndefined();
+  });
+  test('should pass a read only context to the configure() function', () => {
+    const context = { title: 'New title from the context!' };
+    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
+    const { extensions } = getPluginExtensions({ registry, context, extensionPointId: extensionPoint2 });
+    const [extension] = extensions;
+    const readOnlyContext = (link2.configure as jest.Mock).mock.calls[0][0];
+
+    assertPluginExtensionLink(extension);
+
+    expect(link2.configure).toHaveBeenCalledTimes(1);
+    expect(isReadOnlyProxy(readOnlyContext)).toBe(true);
+    expect(() => {
+      readOnlyContext.title = 'New title';
+    }).toThrow();
+    expect(context.title).toBe('New title from the context!');
+  });
+
+  test('should catch errors in the configure() function and log them as warnings', () => {
+    link2.configure = jest.fn().mockImplementation(() => {
+      throw new Error('Something went wrong!');
+    });
+
+    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
+
+    expect(() => {
+      getPluginExtensions({ registry, extensionPointId: extensionPoint2 });
+    }).not.toThrow();
+
+    expect(link2.configure).toHaveBeenCalledTimes(1);
+    expect(global.console.warn).toHaveBeenCalledTimes(1);
+    expect(global.console.warn).toHaveBeenCalledWith('[Plugin Extensions] Something went wrong!');
+  });
+
+  test('should skip the link extension if the configure() function returns with an invalid path', () => {
+    link1.configure = jest.fn().mockImplementation(() => ({
+      path: '/a/another-plugin/page-a',
+    }));
+    link2.configure = jest.fn().mockImplementation(() => ({
+      path: 'invalid-path',
+    }));
+
+    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link1, link2] }]);
+    const { extensions: extensionsAtPlacement1 } = getPluginExtensions({ registry, extensionPointId: extensionPoint1 });
+    const { extensions: extensionsAtPlacement2 } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 });
+
+    expect(extensionsAtPlacement1).toHaveLength(0);
+    expect(extensionsAtPlacement2).toHaveLength(0);
+
+    expect(link1.configure).toHaveBeenCalledTimes(1);
+    expect(link2.configure).toHaveBeenCalledTimes(1);
+    expect(global.console.warn).toHaveBeenCalledTimes(2);
+  });
+
+  test('should skip the extension if any of the updated props returned by the configure() function are invalid', () => {
+    const overrides = {
+      title: '', // Invalid empty string for title - should be ignored
+      description: 'A valid description.', // This should be updated
+    };
+
+    link2.configure = jest.fn().mockImplementation(() => overrides);
+
+    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
+    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 });
+
+    expect(extensions).toHaveLength(0);
+    expect(link2.configure).toHaveBeenCalledTimes(1);
+    expect(global.console.warn).toHaveBeenCalledTimes(1);
+  });
+
+  test('should skip the extension if the configure() function returns a promise', () => {
+    link2.configure = jest.fn().mockImplementation(() => Promise.resolve({}));
+
+    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
+    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 });
+
+    expect(extensions).toHaveLength(0);
+    expect(link2.configure).toHaveBeenCalledTimes(1);
+    expect(global.console.warn).toHaveBeenCalledTimes(1);
+  });
+
+  test('should skip (hide) the extension if the configure() function returns undefined', () => {
+    link2.configure = jest.fn().mockImplementation(() => undefined);
+
+    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
+    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 });
+
+    expect(extensions).toHaveLength(0);
+    expect(global.console.warn).toHaveBeenCalledTimes(0); // As this is intentional, no warning should be logged
+  });
+
+  test('should pass event, context and helper to extension onClick()', () => {
+    link2.path = undefined;
+    link2.onClick = jest.fn().mockImplementation(() => {
+      throw new Error('Something went wrong!');
+    });
+
+    const context = {};
+    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
+    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 });
+    const [extension] = extensions;
+
+    assertPluginExtensionLink(extension);
+
+    const event = {} as React.MouseEvent;
+    extension.onClick?.(event);
+
+    expect(link2.onClick).toHaveBeenCalledTimes(1);
+    expect(link2.onClick).toHaveBeenCalledWith(
+      event,
+      expect.objectContaining({
+        context,
+        openModal: expect.any(Function),
+      })
+    );
+  });
+
+  test('should catch errors in async/promise-based onClick function and log them as warnings', async () => {
+    link2.path = undefined;
+    link2.onClick = jest.fn().mockRejectedValue(new Error('testing'));
+
+    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
+    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 });
+    const [extension] = extensions;
+
+    assertPluginExtensionLink(extension);
+
+    await extension.onClick?.({} as React.MouseEvent);
+
+    expect(extensions).toHaveLength(1);
+    expect(link2.onClick).toHaveBeenCalledTimes(1);
+    expect(global.console.warn).toHaveBeenCalledTimes(1);
+  });
+
+  test('should catch errors in the onClick() function and log them as warnings', () => {
+    link2.path = undefined;
+    link2.onClick = jest.fn().mockImplementation(() => {
+      throw new Error('Something went wrong!');
+    });
+
+    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
+    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 });
+    const [extension] = extensions;
+
+    assertPluginExtensionLink(extension);
+    extension.onClick?.({} as React.MouseEvent);
+
+    expect(link2.onClick).toHaveBeenCalledTimes(1);
+    expect(global.console.warn).toHaveBeenCalledTimes(1);
+    expect(global.console.warn).toHaveBeenCalledWith('[Plugin Extensions] Something went wrong!');
+  });
+
+  test('should pass a read only context to the onClick() function', () => {
+    const context = { title: 'New title from the context!' };
+
+    link2.path = undefined;
+    link2.onClick = jest.fn();
+
+    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
+    const { extensions } = getPluginExtensions({ registry, context, extensionPointId: extensionPoint2 });
+    const [extension] = extensions;
+
+    assertPluginExtensionLink(extension);
+    extension.onClick?.({} as React.MouseEvent);
+
+    const helpers = (link2.onClick as jest.Mock).mock.calls[0][1];
+
+    expect(link2.configure).toHaveBeenCalledTimes(1);
+    expect(isReadOnlyProxy(helpers.context)).toBe(true);
+    expect(() => {
+      helpers.context.title = 'New title';
+    }).toThrow();
+  });
+
+  test('should not make original context read only', () => {
+    const context = {
+      title: 'New title from the context!',
+      nested: { title: 'title' },
+      array: ['a'],
+    };
+
+    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
+    getPluginExtensions({ registry, context, extensionPointId: extensionPoint2 });
+
+    expect(() => {
+      context.title = 'Updating the title';
+      context.nested.title = 'new title';
+      context.array.push('b');
+    }).not.toThrow();
+  });
+
+  test('should report interaction when onClick is triggered', () => {
+    const reportInteractionMock = jest.mocked(reportInteraction);
+
+    const registry = createPluginExtensionRegistry([
+      {
+        pluginId,
+        extensionConfigs: [
+          {
+            ...link1,
+            path: undefined,
+            onClick: jest.fn(),
+          },
+        ],
+      },
+    ]);
+    const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint1 });
+    const [extension] = extensions;
+
+    assertPluginExtensionLink(extension);
+
+    extension.onClick?.();
+
+    expect(reportInteractionMock).toBeCalledTimes(1);
+    expect(reportInteractionMock).toBeCalledWith('ui_extension_link_clicked', {
+      pluginId: extension.pluginId,
+      extensionPointId: extensionPoint1,
+      title: extension.title,
+      category: extension.category,
+    });
+  });
+
+  test('should be possible to register and get component type extensions', () => {
+    const extension = component1;
+    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [extension] }]);
+    const { extensions } = getPluginExtensions({ registry, extensionPointId: extension.extensionPointId });
+
+    expect(extensions).toHaveLength(1);
+    expect(extensions[0]).toEqual(
+      expect.objectContaining({
+        pluginId,
+        type: PluginExtensionTypes.component,
+        title: extension.title,
+        description: extension.description,
+      })
+    );
+  });
+});
diff --git a/public/app/features/plugins/extensions/getPluginExtensions.ts b/public/app/features/plugins/extensions/getPluginExtensions.ts
index 069635dea3dc1..2db726b5e2ac6 100644
--- a/public/app/features/plugins/extensions/getPluginExtensions.ts
+++ b/public/app/features/plugins/extensions/getPluginExtensions.ts
@@ -18,6 +18,7 @@ import {
   generateExtensionId,
   getEventHelpers,
   isPluginExtensionComponentConfig,
+  wrapWithPluginContext,
 } from './utils';
 import {
   assertIsReactComponent,
@@ -101,7 +102,7 @@ export const getPluginExtensions: GetExtensions = ({ context, extensionPointId,
 
           title: extensionConfig.title,
           description: extensionConfig.description,
-          component: extensionConfig.component,
+          component: wrapWithPluginContext(pluginId, extensionConfig.component),
         };
 
         extensions.push(extension);
@@ -189,7 +190,7 @@ function getLinkExtensionOnClick(
         category: config.category,
       });
 
-      const result = onClick(event, getEventHelpers(context));
+      const result = onClick(event, getEventHelpers(pluginId, context));
 
       if (isPromise(result)) {
         result.catch((e) => {
diff --git a/public/app/features/plugins/extensions/utils.test.tsx b/public/app/features/plugins/extensions/utils.test.tsx
index 967286a9710bf..93958e05c9027 100644
--- a/public/app/features/plugins/extensions/utils.test.tsx
+++ b/public/app/features/plugins/extensions/utils.test.tsx
@@ -2,11 +2,23 @@ import { render, screen } from '@testing-library/react';
 import React from 'react';
 import { type Unsubscribable } from 'rxjs';
 
-import { type PluginExtensionLinkConfig, PluginExtensionTypes } from '@grafana/data';
+import { type PluginExtensionLinkConfig, PluginExtensionTypes, dateTime, usePluginContext } from '@grafana/data';
 import appEvents from 'app/core/app_events';
 import { ShowModalReactEvent } from 'app/types/events';
 
-import { deepFreeze, isPluginExtensionLinkConfig, handleErrorsInFn, getReadOnlyProxy, getEventHelpers } from './utils';
+import {
+  deepFreeze,
+  isPluginExtensionLinkConfig,
+  handleErrorsInFn,
+  getReadOnlyProxy,
+  getEventHelpers,
+  wrapWithPluginContext,
+} from './utils';
+
+jest.mock('app/features/plugins/pluginSettings', () => ({
+  ...jest.requireActual('app/features/plugins/pluginSettings'),
+  getPluginSettings: () => Promise.resolve({ info: { version: '1.0.0' } }),
+}));
 
 describe('Plugin Extensions / Utils', () => {
   describe('deepFreeze()', () => {
@@ -312,6 +324,16 @@ describe('Plugin Extensions / Utils', () => {
 
       expect(proxy.a()).toBe('testing');
     });
+
+    it('should return a clone of moment/datetime in context', () => {
+      const source = dateTime('2023-10-26T18:25:01Z');
+      const proxy = getReadOnlyProxy({
+        a: source,
+      });
+
+      expect(source.isSame(proxy.a)).toBe(true);
+      expect(source).not.toBe(proxy.a);
+    });
   });
 
   describe('getEventHelpers', () => {
@@ -331,27 +353,29 @@ describe('Plugin Extensions / Utils', () => {
       });
 
       it('should open modal with provided title and body', async () => {
-        const { openModal } = getEventHelpers();
+        const pluginId = 'grafana-worldmap-panel';
+        const { openModal } = getEventHelpers(pluginId);
 
         openModal({
           title: 'Title in modal',
           body: () => <div>Text in body</div>,
         });
 
-        expect(screen.getByRole('dialog')).toBeVisible();
+        expect(await screen.findByRole('dialog')).toBeVisible();
         expect(screen.getByRole('heading')).toHaveTextContent('Title in modal');
         expect(screen.getByText('Text in body')).toBeVisible();
       });
 
       it('should open modal with default width if not specified', async () => {
-        const { openModal } = getEventHelpers();
+        const pluginId = 'grafana-worldmap-panel';
+        const { openModal } = getEventHelpers(pluginId);
 
         openModal({
           title: 'Title in modal',
           body: () => <div>Text in body</div>,
         });
 
-        const modal = screen.getByRole('dialog');
+        const modal = await screen.findByRole('dialog');
         const style = window.getComputedStyle(modal);
 
         expect(style.width).toBe('750px');
@@ -359,7 +383,8 @@ describe('Plugin Extensions / Utils', () => {
       });
 
       it('should open modal with specified width', async () => {
-        const { openModal } = getEventHelpers();
+        const pluginId = 'grafana-worldmap-panel';
+        const { openModal } = getEventHelpers(pluginId);
 
         openModal({
           title: 'Title in modal',
@@ -367,14 +392,15 @@ describe('Plugin Extensions / Utils', () => {
           width: '70%',
         });
 
-        const modal = screen.getByRole('dialog');
+        const modal = await screen.findByRole('dialog');
         const style = window.getComputedStyle(modal);
 
         expect(style.width).toBe('70%');
       });
 
       it('should open modal with specified height', async () => {
-        const { openModal } = getEventHelpers();
+        const pluginId = 'grafana-worldmap-panel';
+        const { openModal } = getEventHelpers(pluginId);
 
         openModal({
           title: 'Title in modal',
@@ -382,19 +408,77 @@ describe('Plugin Extensions / Utils', () => {
           height: 600,
         });
 
-        const modal = screen.getByRole('dialog');
+        const modal = await screen.findByRole('dialog');
         const style = window.getComputedStyle(modal);
 
         expect(style.height).toBe('600px');
       });
+
+      it('should open modal with the plugin context being available', async () => {
+        const pluginId = 'grafana-worldmap-panel';
+        const { openModal } = getEventHelpers(pluginId);
+
+        const ModalContent = () => {
+          const context = usePluginContext();
+
+          return <div>Version: {context.meta.info.version}</div>;
+        };
+
+        openModal({
+          title: 'Title in modal',
+          body: ModalContent,
+        });
+
+        const modal = await screen.findByRole('dialog');
+        expect(modal).toHaveTextContent('Version: 1.0.0');
+      });
     });
 
     describe('context', () => {
       it('should return same object as passed to getEventHelpers', () => {
+        const pluginId = 'grafana-worldmap-panel';
         const source = {};
-        const { context } = getEventHelpers(source);
+        const { context } = getEventHelpers(pluginId, source);
         expect(context).toBe(source);
       });
     });
   });
+
+  describe('wrapExtensionComponentWithContext()', () => {
+    type ExampleComponentProps = {
+      audience?: string;
+    };
+
+    const ExampleComponent = (props: ExampleComponentProps) => {
+      const { meta } = usePluginContext();
+
+      const audience = props.audience || 'Grafana';
+
+      return (
+        <div>
+          <h1>Hello {audience}!</h1> Version: {meta.info.version}
+        </div>
+      );
+    };
+
+    it('should make the plugin context available for the wrapped component', async () => {
+      const pluginId = 'grafana-worldmap-panel';
+      const Component = wrapWithPluginContext(pluginId, ExampleComponent);
+
+      render(<Component />);
+
+      expect(await screen.findByText('Hello Grafana!')).toBeVisible();
+      expect(screen.getByText('Version: 1.0.0')).toBeVisible();
+    });
+
+    it('should pass the properties into the wrapped component', async () => {
+      const pluginId = 'grafana-worldmap-panel';
+      const Component = wrapWithPluginContext(pluginId, ExampleComponent);
+
+      render(<Component audience="folks" />);
+
+      expect(await screen.findByText('Hello folks!')).toBeVisible();
+      expect(screen.getByText('Version: 1.0.0')).toBeVisible();
+    });
+  });
 });
diff --git a/public/app/features/plugins/extensions/utils.tsx b/public/app/features/plugins/extensions/utils.tsx
index d1449484bd0a6..277dbddcaa66a 100644
--- a/public/app/features/plugins/extensions/utils.tsx
+++ b/public/app/features/plugins/extensions/utils.tsx
@@ -1,6 +1,7 @@
 import { css } from '@emotion/css';
 import { isArray, isObject } from 'lodash';
 import React from 'react';
+import { useAsync } from 'react-use';
 
 import {
   type PluginExtensionLinkConfig,
@@ -9,9 +10,15 @@ import {
   type PluginExtensionEventHelpers,
   PluginExtensionTypes,
   type PluginExtensionOpenModalOptions,
+  isDateTime,
+  dateTime,
+  PluginContextProvider,
+  PluginExtensionLink,
+  PanelMenuItem,
 } from '@grafana/data';
 import { Modal } from '@grafana/ui';
 import appEvents from 'app/core/app_events';
+import { getPluginSettings } from 'app/features/plugins/pluginSettings';
 import { ShowModalReactEvent } from 'app/types/events';
 
 export function logWarning(message: string) {
@@ -43,13 +50,13 @@ export function handleErrorsInFn(fn: Function, errorMessagePrefix = '') {
 }
 
 // Event helpers are designed to make it easier to trigger "core actions" from an extension event handler, e.g. opening a modal or showing a notification.
-export function getEventHelpers(context?: Readonly<object>): PluginExtensionEventHelpers {
-  const openModal: PluginExtensionEventHelpers['openModal'] = (options) => {
+export function getEventHelpers(pluginId: string, context?: Readonly<object>): PluginExtensionEventHelpers {
+  const openModal: PluginExtensionEventHelpers['openModal'] = async (options) => {
     const { title, body, width, height } = options;
 
     appEvents.publish(
       new ShowModalReactEvent({
-        component: getModalWrapper({ title, body, width, height }),
+        component: wrapWithPluginContext<ModalWrapperProps>(pluginId, getModalWrapper({ title, body, width, height })),
       })
     );
   };
@@ -61,6 +68,38 @@ type ModalWrapperProps = {
   onDismiss: () => void;
 };
 
+export const wrapWithPluginContext = <T,>(pluginId: string, Component: React.ComponentType<T>) => {
+  const WrappedExtensionComponent = (props: T & React.JSX.IntrinsicAttributes) => {
+    const {
+      error,
+      loading,
+      value: pluginMeta,
+    } = useAsync(() => getPluginSettings(pluginId, { showErrorAlert: false }));
+
+    if (loading) {
+      return null;
+    }
+
+    if (error) {
+      logWarning(`Could not fetch plugin meta information for "${pluginId}", aborting. (${error.message})`);
+      return null;
+    }
+
+    if (!pluginMeta) {
+      logWarning(`Fetched plugin meta information is empty for "${pluginId}", aborting.`);
+      return null;
+    }
+
+    return (
+      <PluginContextProvider meta={pluginMeta}>
+        <Component {...props} />
+      </PluginContextProvider>
+    );
+  };
+
+  return WrappedExtensionComponent;
+};
+
 // Wraps a component with a modal.
 // This way we can make sure that the modal is closable, and we also make the usage simpler.
 const getModalWrapper = ({
@@ -159,6 +198,13 @@ export function getReadOnlyProxy<T extends object>(obj: T): T {
 
       const value = Reflect.get(target, prop, receiver);
 
+      // This will create a clone of the date time object
+      // instead of creating a proxy because the underlying
+      // momentjs object needs to be able to mutate itself.
+      if (isDateTime(value)) {
+        return dateTime(value);
+      }
+
       if (isObject(value) || isArray(value)) {
         if (!cache.has(value)) {
           cache.set(value, getReadOnlyProxy(value));
@@ -205,3 +251,53 @@ export function truncateTitle(title: string, length: number): string {
   const part = title.slice(0, length - 3);
   return `${part.trimEnd()}...`;
 }
+
+export function createExtensionSubMenu(extensions: PluginExtensionLink[]): PanelMenuItem[] {
+  const categorized: Record<string, PanelMenuItem[]> = {};
+  const uncategorized: PanelMenuItem[] = [];
+
+  for (const extension of extensions) {
+    const category = extension.category;
+
+    if (!category) {
+      uncategorized.push({
+        text: truncateTitle(extension.title, 25),
+        href: extension.path,
+        onClick: extension.onClick,
+      });
+      continue;
+    }
+
+    if (!Array.isArray(categorized[category])) {
+      categorized[category] = [];
+    }
+
+    categorized[category].push({
+      text: truncateTitle(extension.title, 25),
+      href: extension.path,
+      onClick: extension.onClick,
+    });
+  }
+
+  const subMenu = Object.keys(categorized).reduce((subMenu: PanelMenuItem[], category) => {
+    subMenu.push({
+      text: truncateTitle(category, 25),
+      type: 'group',
+      subMenu: categorized[category],
+    });
+    return subMenu;
+  }, []);
+
+  if (uncategorized.length > 0) {
+    if (subMenu.length > 0) {
+      subMenu.push({
+        text: 'divider',
+        type: 'divider',
+      });
+    }
+
+    Array.prototype.push.apply(subMenu, uncategorized);
+  }
+
+  return subMenu;
+}
diff --git a/public/app/features/plugins/importPanelPlugin.ts b/public/app/features/plugins/importPanelPlugin.ts
index 053090a1fc2de..62dbcb8c4bed0 100644
--- a/public/app/features/plugins/importPanelPlugin.ts
+++ b/public/app/features/plugins/importPanelPlugin.ts
@@ -59,7 +59,7 @@ function getPanelPlugin(meta: PanelPluginMeta): Promise<PanelPlugin> {
   return importPluginModule({
     path: meta.module,
     version: meta.info?.version,
-    isAngular: meta.angularDetected,
+    isAngular: meta.angular?.detected,
     pluginId: meta.id,
   })
     .then((pluginExports) => {
diff --git a/public/app/features/plugins/loader/cache.ts b/public/app/features/plugins/loader/cache.ts
index 739c4c5807204..3db74fd2a7089 100644
--- a/public/app/features/plugins/loader/cache.ts
+++ b/public/app/features/plugins/loader/cache.ts
@@ -35,7 +35,7 @@ export function resolveWithCache(url: string, defaultBust = initializedAt): stri
 }
 
 function extractPath(address: string): string | undefined {
-  const match = /\/.+\/(plugins\/.+\/module)\.js/i.exec(address);
+  const match = /\/?.+\/(plugins\/.+\/module)\.js/i.exec(address);
   if (!match) {
     return;
   }
diff --git a/public/app/features/plugins/loader/constants.ts b/public/app/features/plugins/loader/constants.ts
index daf840dff2c79..0bcc4f9737e19 100644
--- a/public/app/features/plugins/loader/constants.ts
+++ b/public/app/features/plugins/loader/constants.ts
@@ -1,5 +1,3 @@
 export const SHARED_DEPENDENCY_PREFIX = 'package';
 export const LOAD_PLUGIN_CSS_REGEX = /^plugins.+\.css$/i;
 export const JS_CONTENT_TYPE_REGEX = /^(text|application)\/(x-)?javascript(;|$)/;
-export const AMD_MODULE_REGEX =
-  /(?:^\uFEFF?|[^$_a-zA-Z\xA0-\uFFFF.])define\s*\(\s*("[^"]+"\s*,\s*|'[^']+'\s*,\s*)?\s*(\[(\s*(("[^"]+"|'[^']+')\s*,|\/\/.*\r?\n))*(\s*("[^"]+"|'[^']+')\s*,?)?(\s*(\/\/.*\r?\n|\/\*\/))*\s*\]|function\s*|{|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*\))/;
diff --git a/public/app/features/plugins/loader/packageMetrics.test.ts b/public/app/features/plugins/loader/packageMetrics.test.ts
index dd69e6ba6e698..eb06454acaf58 100644
--- a/public/app/features/plugins/loader/packageMetrics.test.ts
+++ b/public/app/features/plugins/loader/packageMetrics.test.ts
@@ -34,21 +34,53 @@ describe('trackPackageUsage', () => {
       });
     });
 
-    it('should log API usage and return a proxy object', () => {
+    it('should not log API usage and for non-grafana packages', () => {
       const obj = {
         foo: 'bar',
       };
-      const packageName = 'your-package';
+      const packageName = 'lodash';
+
+      const result = trackPackageUsage(obj, packageName);
+
+      mockUsage(result.foo);
+
+      expect(logInfoMock).toHaveBeenCalledTimes(0);
+    });
+
+    it('should log API usage and return a proxy object for @grafana/data packages', () => {
+      const obj = {
+        foo: 'bar',
+      };
+      const packageName = '@grafana/data';
+
+      const result = trackPackageUsage(obj, packageName);
+
+      mockUsage(result.foo);
+
+      expect(logInfoMock).toHaveBeenCalledTimes(1);
+      expect(logInfoMock).toHaveBeenLastCalledWith(`Plugin using @grafana/data.foo`, {
+        key: 'foo',
+        parent: '@grafana/data',
+        packageName: '@grafana/data',
+      });
+      expect(result).toEqual(obj);
+    });
+
+    it('should log API usage and return a proxy object for app/* packages', () => {
+      const obj = {
+        foo: 'bar',
+      };
+      const packageName = 'app/core/test';
 
       const result = trackPackageUsage(obj, packageName);
 
       mockUsage(result.foo);
 
       expect(logInfoMock).toHaveBeenCalledTimes(1);
-      expect(logInfoMock).toHaveBeenLastCalledWith(`Plugin using your-package.foo`, {
+      expect(logInfoMock).toHaveBeenLastCalledWith(`Plugin using app/core/test.foo`, {
         key: 'foo',
-        parent: 'your-package',
-        packageName: 'your-package',
+        parent: 'app/core/test',
+        packageName: 'app/core/test',
       });
       expect(result).toEqual(obj);
     });
@@ -59,7 +91,7 @@ describe('trackPackageUsage', () => {
           bar: 'baz',
         },
       };
-      const packageName = 'your-package';
+      const packageName = '@grafana/data';
 
       const result = trackPackageUsage(obj, packageName);
       mockUsage(result.foo2.bar);
@@ -67,15 +99,15 @@ describe('trackPackageUsage', () => {
       // 2 calls, one for each attribute
       expect(logInfoMock).toHaveBeenCalledTimes(2);
 
-      expect(logInfoMock).toHaveBeenCalledWith(`Plugin using your-package.foo2`, {
+      expect(logInfoMock).toHaveBeenCalledWith(`Plugin using @grafana/data.foo2`, {
         key: 'foo2',
-        parent: 'your-package',
-        packageName: 'your-package',
+        parent: '@grafana/data',
+        packageName: '@grafana/data',
       });
-      expect(logInfoMock).toHaveBeenCalledWith(`Plugin using your-package.foo2.bar`, {
+      expect(logInfoMock).toHaveBeenCalledWith(`Plugin using @grafana/data.foo2.bar`, {
         key: 'bar',
-        parent: 'your-package.foo2',
-        packageName: 'your-package',
+        parent: '@grafana/data.foo2',
+        packageName: '@grafana/data',
       });
 
       expect(result.foo2).toEqual(obj.foo2);
@@ -86,7 +118,7 @@ describe('trackPackageUsage', () => {
         [Symbol('key')]: 'value',
         __useDefault: 'default',
       };
-      const packageName = 'your-package';
+      const packageName = '@grafana/data';
 
       const result = trackPackageUsage(obj, packageName);
 
@@ -100,7 +132,7 @@ describe('trackPackageUsage', () => {
           bar: 'baz',
         },
       };
-      const packageName = 'your-package';
+      const packageName = '@grafana/data';
 
       const result1 = trackPackageUsage(obj, packageName);
       const result2 = trackPackageUsage(obj, packageName);
@@ -108,16 +140,16 @@ describe('trackPackageUsage', () => {
       mockUsage(result1.foo3);
 
       expect(logInfoMock).toHaveBeenCalledTimes(1);
-      expect(logInfoMock).toHaveBeenCalledWith(`Plugin using your-package.foo3`, {
+      expect(logInfoMock).toHaveBeenCalledWith(`Plugin using @grafana/data.foo3`, {
         key: 'foo3',
-        parent: 'your-package',
-        packageName: 'your-package',
+        parent: '@grafana/data',
+        packageName: '@grafana/data',
       });
       mockUsage(result2.foo3.bar);
-      expect(logInfoMock).toHaveBeenCalledWith(`Plugin using your-package.foo3.bar`, {
+      expect(logInfoMock).toHaveBeenCalledWith(`Plugin using @grafana/data.foo3.bar`, {
         key: 'bar',
-        parent: 'your-package.foo3',
-        packageName: 'your-package',
+        parent: '@grafana/data.foo3',
+        packageName: '@grafana/data',
       });
 
       expect(result1.foo3).toEqual(obj.foo3);
@@ -133,7 +165,7 @@ describe('trackPackageUsage', () => {
         },
       };
 
-      const result = trackPackageUsage(obj, 'your-package');
+      const result = trackPackageUsage(obj, '@grafana/data');
 
       mockUsage(result.cacheMe);
       expect(logInfoMock).toHaveBeenCalledTimes(1);
@@ -170,7 +202,7 @@ describe('trackPackageUsage', () => {
       lor: 'me',
     };
 
-    const result = trackPackageUsage(obj, 'your-package');
+    const result = trackPackageUsage(obj, '@grafana/data');
 
     mockUsage(result.lor);
     expect(logInfoMock).not.toHaveBeenCalled();
diff --git a/public/app/features/plugins/loader/packageMetrics.ts b/public/app/features/plugins/loader/packageMetrics.ts
index 690edd938b724..a8ef34e1416b7 100644
--- a/public/app/features/plugins/loader/packageMetrics.ts
+++ b/public/app/features/plugins/loader/packageMetrics.ts
@@ -32,7 +32,7 @@ function createMetricsProxy<T extends object>(obj: T, parentName: string, packag
         }
       }
 
-      const value = Reflect.get(target, key);
+      let value = Reflect.get(target, key);
 
       if (value !== null && typeof value === 'object' && !(value instanceof RegExp)) {
         if (!cachedMetricProxies.has(value)) {
@@ -40,6 +40,11 @@ function createMetricsProxy<T extends object>(obj: T, parentName: string, packag
         }
         return cachedMetricProxies.get(value);
       }
+
+      // proxies don't play nice with functions scopes
+      if (typeof value === 'function') {
+        value = value.bind(target);
+      }
       return value;
     },
   };
@@ -51,6 +56,11 @@ function createMetricsProxy<T extends object>(obj: T, parentName: string, packag
   return obj;
 }
 
+const trackPackagesRe = /^(@grafana|app\/)/;
+
 export function trackPackageUsage<T extends object>(obj: T, packageName: string): T {
-  return createMetricsProxy(obj, packageName, packageName);
+  if (trackPackagesRe.test(packageName)) {
+    return createMetricsProxy(obj, packageName, packageName);
+  }
+  return obj;
 }
diff --git a/public/app/features/plugins/loader/pluginLoader.mock.ts b/public/app/features/plugins/loader/pluginLoader.mock.ts
index 530b245a5927c..b7433716563a5 100644
--- a/public/app/features/plugins/loader/pluginLoader.mock.ts
+++ b/public/app/features/plugins/loader/pluginLoader.mock.ts
@@ -1,4 +1,5 @@
-import { rest } from 'msw';
+import 'whatwg-fetch';
+import { http, HttpResponse } from 'msw';
 import { setupServer } from 'msw/node';
 
 export const mockSystemModule = `System.register(['./dependencyA'], function (_export, _context) {
@@ -22,101 +23,33 @@ export const mockAmdModule = `define([], function() {
   }
 });`;
 
-export const mockAmdModuleNamedNoDeps = `define("named", function() {
-  return function() {
-    console.log('AMD module loaded');
-    var pluginPath = "/public/plugins/";
-  }
-});`;
-
-export const mockAmdModuleNamedWithDeps = `define("named", ["dep"], function(dep) {
-  return function() {
-    console.log('AMD module loaded');
-    var pluginPath = "/public/plugins/";
-  }
-});`;
-
-export const mockAmdModuleNamedWithDeps2 = `define("named", ["dep", "dep2"], function(dep, dep2) {
-  return function() {
-    console.log('AMD module loaded');
-    var pluginPath = "/public/plugins/";
-  }
-});`;
-
-export const mockAmdModuleNamedWithDeps3 = `define("named", ["dep",
-"dep2"
-], function(dep, dep2) {
-  return function() {
-    console.log('AMD module loaded');
-    var pluginPath = "/public/plugins/";
-  }
-});`;
-
-export const mockAmdModuleOnlyFunction = `define(function() {
-  return function() {
-    console.log('AMD module loaded');
-    var pluginPath = "/public/plugins/";
-  }
-});`;
-
-export const mockAmdModuleWithComments = `/*! For license information please see module.js.LICENSE.txt */
-define(function(react) {
-  return function() {
-    console.log('AMD module loaded');
-    var pluginPath = "/public/plugins/";
-  }
-});`;
-
-export const mockAmdModuleWithComments2 = `/*! This is a commment */
-define(["dep"],
-  /*! This is a commment */
-  function(dep) {
-  return function() {
-    console.log('AMD module loaded');
-    var pluginPath = "/public/plugins/";
-  }
-});`;
-
-export const mockModuleWithDefineMethod = `ace.define(function() {
-  return function() {
-    console.log('AMD module loaded');
-    var pluginPath = "/public/plugins/";
-  }
-});`;
-
 const server = setupServer(
-  rest.get('/public/plugins/mockAmdModule/module.js', async (_req, res, ctx) =>
-    res(ctx.status(200), ctx.set('Content-Type', 'text/javascript'), ctx.body(mockAmdModule))
-  ),
-  rest.get('/public/plugins/mockSystemModule/module.js', async (_req, res, ctx) =>
-    res(ctx.status(200), ctx.set('Content-Type', 'text/javascript'), ctx.body(mockSystemModule))
-  ),
-  rest.get('http://my-cdn.com/plugins/my-plugin/v1.0.0/public/plugins/my-plugin/module.js', async (_req, res, ctx) =>
-    res(ctx.status(200), ctx.set('Content-Type', 'text/javascript'), ctx.body(mockAmdModule))
-  ),
-  rest.get('/public/plugins/mockAmdModuleNamedNoDeps/module.js', async (_req, res, ctx) =>
-    res(ctx.status(200), ctx.set('Content-Type', 'text/javascript'), ctx.body(mockAmdModuleNamedNoDeps))
-  ),
-  rest.get('/public/plugins/mockAmdModuleNamedWithDeps/module.js', async (_req, res, ctx) =>
-    res(ctx.status(200), ctx.set('Content-Type', 'text/javascript'), ctx.body(mockAmdModuleNamedWithDeps))
-  ),
-  rest.get('/public/plugins/mockAmdModuleNamedWithDeps2/module.js', async (_req, res, ctx) =>
-    res(ctx.status(200), ctx.set('Content-Type', 'text/javascript'), ctx.body(mockAmdModuleNamedWithDeps2))
-  ),
-  rest.get('/public/plugins/mockAmdModuleNamedWithDeps3/module.js', async (_req, res, ctx) =>
-    res(ctx.status(200), ctx.set('Content-Type', 'text/javascript'), ctx.body(mockAmdModuleNamedWithDeps3))
-  ),
-  rest.get('/public/plugins/mockAmdModuleOnlyFunction/module.js', async (_req, res, ctx) =>
-    res(ctx.status(200), ctx.set('Content-Type', 'text/javascript'), ctx.body(mockAmdModuleOnlyFunction))
-  ),
-  rest.get('/public/plugins/mockAmdModuleWithComments/module.js', async (_req, res, ctx) =>
-    res(ctx.status(200), ctx.set('Content-Type', 'text/javascript'), ctx.body(mockAmdModuleWithComments))
-  ),
-  rest.get('/public/plugins/mockAmdModuleWithComments2/module.js', async (_req, res, ctx) =>
-    res(ctx.status(200), ctx.set('Content-Type', 'text/javascript'), ctx.body(mockAmdModuleWithComments2))
-  ),
-  rest.get('/public/plugins/mockModuleWithDefineMethod/module.js', async (_req, res, ctx) =>
-    res(ctx.status(200), ctx.set('Content-Type', 'text/javascript'), ctx.body(mockModuleWithDefineMethod))
+  http.get(
+    '/public/plugins/mockAmdModule/module.js',
+    () =>
+      new HttpResponse(mockAmdModule, {
+        headers: {
+          'Content-Type': 'text/javascript',
+        },
+      })
+  ),
+  http.get(
+    '/public/plugins/mockSystemModule/module.js',
+    () =>
+      new HttpResponse(mockSystemModule, {
+        headers: {
+          'Content-Type': 'text/javascript',
+        },
+      })
+  ),
+  http.get(
+    'http://my-cdn.com/plugins/my-plugin/v1.0.0/public/plugins/my-plugin/module.js',
+    () =>
+      new HttpResponse(mockAmdModule, {
+        headers: {
+          'Content-Type': 'text/javascript',
+        },
+      })
   )
 );
 
diff --git a/public/app/features/plugins/loader/sharedDependencies.ts b/public/app/features/plugins/loader/sharedDependencies.ts
index d1c29ba9b3fc6..3f9c3d10349da 100644
--- a/public/app/features/plugins/loader/sharedDependencies.ts
+++ b/public/app/features/plugins/loader/sharedDependencies.ts
@@ -1,5 +1,6 @@
 import * as emotion from '@emotion/css';
 import * as emotionReact from '@emotion/react';
+import * as kusto from '@kusto/monaco-kusto';
 import * as d3 from 'd3';
 import * as i18next from 'i18next';
 import jquery from 'jquery';
@@ -71,6 +72,7 @@ export const sharedDependenciesMap: Record<string, System.Module> = {
   '@grafana/runtime': grafanaRuntime,
   '@grafana/slate-react': slateReact, // for backwards compatibility with older plugins
   '@grafana/ui': grafanaUI,
+  '@kusto/monaco-kusto': kusto,
   'app/core/app_events': {
     default: appEvents,
     __useDefault: true,
diff --git a/public/app/features/plugins/loader/systemjs.ts b/public/app/features/plugins/loader/systemjs.ts
new file mode 100644
index 0000000000000..8b9c40fe74926
--- /dev/null
+++ b/public/app/features/plugins/loader/systemjs.ts
@@ -0,0 +1,7 @@
+import 'systemjs/dist/system';
+// Add ability to load plugins bundled as AMD format
+import 'systemjs/dist/extras/amd';
+// Add ability to load plugins bundled as CJS format
+import 'systemjs-cjs-extra';
+
+export const SystemJS = window.System;
diff --git a/public/app/features/plugins/loader/systemjsHooks.test.ts b/public/app/features/plugins/loader/systemjsHooks.test.ts
index 08d33e2c644a9..da9653661e4a7 100644
--- a/public/app/features/plugins/loader/systemjsHooks.test.ts
+++ b/public/app/features/plugins/loader/systemjsHooks.test.ts
@@ -1,25 +1,14 @@
 // mock fetch for SystemJS
 import 'whatwg-fetch';
 
-import { SystemJS, config } from '@grafana/runtime';
+import { config } from '@grafana/runtime';
 
 jest.mock('./cache', () => ({
   resolveWithCache: (url: string) => `${url}?_cache=1234`,
 }));
 
-import {
-  server,
-  mockAmdModule,
-  mockSystemModule,
-  mockAmdModuleNamedNoDeps,
-  mockAmdModuleNamedWithDeps,
-  mockAmdModuleNamedWithDeps2,
-  mockAmdModuleNamedWithDeps3,
-  mockAmdModuleOnlyFunction,
-  mockAmdModuleWithComments,
-  mockModuleWithDefineMethod,
-  mockAmdModuleWithComments2,
-} from './pluginLoader.mock';
+import { server } from './pluginLoader.mock';
+import { SystemJS } from './systemjs';
 import { decorateSystemJSFetch, decorateSystemJSResolve } from './systemjsHooks';
 import { SystemJSWithLoaderHooks } from './types';
 
@@ -28,11 +17,13 @@ describe('SystemJS Loader Hooks', () => {
   const originalFetch = systemJSPrototype.fetch;
   const originalResolve = systemJSPrototype.resolve;
 
-  systemJSPrototype.resolve = (moduleId: string) => moduleId;
-  systemJSPrototype.shouldFetch = () => true;
-
   beforeAll(() => {
     server.listen();
+    systemJSPrototype.resolve = (moduleId: string) => moduleId;
+    systemJSPrototype.shouldFetch = () => true;
+    // because server.listen() patches fetch, we need to reassign this to the systemJSPrototype
+    // this is identical to what happens in the original code: https://github.com/systemjs/systemjs/blob/main/src/features/fetch-load.js#L12
+    systemJSPrototype.fetch = window.fetch;
   });
   afterEach(() => server.resetHandlers());
   afterAll(() => {
@@ -42,122 +33,16 @@ describe('SystemJS Loader Hooks', () => {
   });
 
   describe('decorateSystemJSFetch', () => {
-    it('wraps AMD modules in an AMD iife', async () => {
-      const basicResult = await decorateSystemJSFetch(originalFetch, '/public/plugins/mockAmdModule/module.js', {});
-      const basicSource = await basicResult.text();
-      const basicExpected = `(function(define) {
-  ${mockAmdModule}
-})(window.__grafana_amd_define);`;
-      expect(basicSource).toBe(basicExpected);
-
-      const mockAmdModuleNamedNoDepsResult = await decorateSystemJSFetch(
-        originalFetch,
-        '/public/plugins/mockAmdModuleNamedNoDeps/module.js',
-        {}
-      );
-      const mockAmdModuleNamedNoDepsSource = await mockAmdModuleNamedNoDepsResult.text();
-      const mockAmdModuleNamedNoDepsExpected = `(function(define) {
-  ${mockAmdModuleNamedNoDeps}
-})(window.__grafana_amd_define);`;
-
-      expect(mockAmdModuleNamedNoDepsSource).toBe(mockAmdModuleNamedNoDepsExpected);
-
-      const mockAmdModuleNamedWithDepsResult = await decorateSystemJSFetch(
-        originalFetch,
-        '/public/plugins/mockAmdModuleNamedWithDeps/module.js',
-        {}
-      );
-      const mockAmdModuleNamedWithDepsSource = await mockAmdModuleNamedWithDepsResult.text();
-      const mockAmdModuleNamedWithDepsExpected = `(function(define) {
-  ${mockAmdModuleNamedWithDeps}
-})(window.__grafana_amd_define);`;
-
-      expect(mockAmdModuleNamedWithDepsSource).toBe(mockAmdModuleNamedWithDepsExpected);
-
-      const mockAmdModuleNamedWithDeps2Result = await decorateSystemJSFetch(
-        originalFetch,
-        '/public/plugins/mockAmdModuleNamedWithDeps2/module.js',
-        {}
-      );
-      const mockAmdModuleNamedWithDeps2Source = await mockAmdModuleNamedWithDeps2Result.text();
-      const mockAmdModuleNamedWithDeps2Expected = `(function(define) {
-  ${mockAmdModuleNamedWithDeps2}
-})(window.__grafana_amd_define);`;
-
-      expect(mockAmdModuleNamedWithDeps2Source).toBe(mockAmdModuleNamedWithDeps2Expected);
-
-      const mockAmdModuleNamedWithDeps3Result = await decorateSystemJSFetch(
-        originalFetch,
-        '/public/plugins/mockAmdModuleNamedWithDeps3/module.js',
-        {}
-      );
-      const mockAmdModuleNamedWithDeps3Source = await mockAmdModuleNamedWithDeps3Result.text();
-      const mockAmdModuleNamedWithDeps3Expected = `(function(define) {
-  ${mockAmdModuleNamedWithDeps3}
-})(window.__grafana_amd_define);`;
-
-      expect(mockAmdModuleNamedWithDeps3Source).toBe(mockAmdModuleNamedWithDeps3Expected);
-
-      const mockAmdModuleOnlyFunctionResult = await decorateSystemJSFetch(
-        originalFetch,
-        '/public/plugins/mockAmdModuleOnlyFunction/module.js',
-        {}
-      );
-      const mockAmdModuleOnlyFunctionSource = await mockAmdModuleOnlyFunctionResult.text();
-      const mockAmdModuleOnlyFunctionExpected = `(function(define) {
-  ${mockAmdModuleOnlyFunction}
-})(window.__grafana_amd_define);`;
-
-      expect(mockAmdModuleOnlyFunctionSource).toBe(mockAmdModuleOnlyFunctionExpected);
-
-      const mockAmdModuleWithCommentsResult = await decorateSystemJSFetch(
-        originalFetch,
-        '/public/plugins/mockAmdModuleWithComments/module.js',
-        {}
-      );
-      const mockAmdModuleWithCommentsSource = await mockAmdModuleWithCommentsResult.text();
-      const mockAmdModuleWithCommentsExpected = `(function(define) {
-  ${mockAmdModuleWithComments}
-})(window.__grafana_amd_define);`;
-
-      expect(mockAmdModuleWithCommentsSource).toBe(mockAmdModuleWithCommentsExpected);
-
-      const mockAmdModuleWithComments2Result = await decorateSystemJSFetch(
-        originalFetch,
-        '/public/plugins/mockAmdModuleWithComments2/module.js',
-        {}
-      );
-      const mockAmdModuleWithComments2Source = await mockAmdModuleWithComments2Result.text();
-      const mockAmdModuleWithComments2Expected = `(function(define) {
-  ${mockAmdModuleWithComments2}
-})(window.__grafana_amd_define);`;
-
-      expect(mockAmdModuleWithComments2Source).toBe(mockAmdModuleWithComments2Expected);
-    });
-    it("doesn't wrap system modules in an AMD iife", async () => {
-      const url = '/public/plugins/mockSystemModule/module.js';
-      const result = await decorateSystemJSFetch(originalFetch, url, {});
-      const source = await result.text();
-
-      expect(source).toBe(mockSystemModule);
-    });
-    it("doesn't wrap modules with a define method in an AMD iife", async () => {
-      const url = '/public/plugins/mockModuleWithDefineMethod/module.js';
-      const result = await decorateSystemJSFetch(originalFetch, url, {});
-      const source = await result.text();
-
-      expect(source).toBe(mockModuleWithDefineMethod);
-    });
     it('only transforms plugin source code hosted on cdn with cdn paths', async () => {
       config.pluginsCDNBaseURL = 'http://my-cdn.com/plugins';
       const cdnUrl = 'http://my-cdn.com/plugins/my-plugin/v1.0.0/public/plugins/my-plugin/module.js';
-      const cdnResult = await decorateSystemJSFetch(originalFetch, cdnUrl, {});
+      const cdnResult = await decorateSystemJSFetch(systemJSPrototype.fetch, cdnUrl, {});
       const cdnSource = await cdnResult.text();
 
       expect(cdnSource).toContain('var pluginPath = "http://my-cdn.com/plugins/my-plugin/v1.0.0/public/plugins/";');
 
       const url = '/public/plugins/mockAmdModule/module.js';
-      const result = await decorateSystemJSFetch(originalFetch, url, {});
+      const result = await decorateSystemJSFetch(systemJSPrototype.fetch, url, {});
       const source = await result.text();
       expect(source).toContain('var pluginPath = "/public/plugins/";');
     });
diff --git a/public/app/features/plugins/loader/systemjsHooks.ts b/public/app/features/plugins/loader/systemjsHooks.ts
index 8bdbd723b118d..9a994c19ce652 100644
--- a/public/app/features/plugins/loader/systemjsHooks.ts
+++ b/public/app/features/plugins/loader/systemjsHooks.ts
@@ -1,9 +1,10 @@
-import { config, SystemJS } from '@grafana/runtime';
+import { config } from '@grafana/runtime';
 
 import { transformPluginSourceForCDN } from '../cdn/utils';
 
 import { resolveWithCache } from './cache';
-import { LOAD_PLUGIN_CSS_REGEX, JS_CONTENT_TYPE_REGEX, AMD_MODULE_REGEX, SHARED_DEPENDENCY_PREFIX } from './constants';
+import { LOAD_PLUGIN_CSS_REGEX, JS_CONTENT_TYPE_REGEX, SHARED_DEPENDENCY_PREFIX } from './constants';
+import { SystemJS } from './systemjs';
 import { SystemJSWithLoaderHooks } from './types';
 import { isHostedOnCDN } from './utils';
 
@@ -19,10 +20,6 @@ export async function decorateSystemJSFetch(
     const source = await res.text();
     let transformedSrc = source;
 
-    if (AMD_MODULE_REGEX.test(transformedSrc)) {
-      transformedSrc = preventAMDLoaderCollision(source);
-    }
-
     // JS files on the CDN need their asset paths transformed in the source
     if (isHostedOnCDN(res.url)) {
       const cdnTransformedSrc = transformPluginSourceForCDN({ url: res.url, source: transformedSrc });
@@ -84,11 +81,3 @@ function getBackWardsCompatibleUrl(url: string) {
 
   return hasValidFileExtension ? url : url + '.js';
 }
-
-// This transform prevents a conflict between systemjs and requirejs which Monaco Editor
-// depends on. See packages/grafana-runtime/src/utils/plugin.ts for more.
-function preventAMDLoaderCollision(source: string) {
-  return `(function(define) {
-  ${source}
-})(window.__grafana_amd_define);`;
-}
diff --git a/public/app/features/plugins/loader/utils.test.ts b/public/app/features/plugins/loader/utils.test.ts
new file mode 100644
index 0000000000000..719e67d6d588c
--- /dev/null
+++ b/public/app/features/plugins/loader/utils.test.ts
@@ -0,0 +1,31 @@
+import { config } from '@grafana/runtime';
+
+import { resolveModulePath } from './utils';
+
+describe('resolveModulePath', () => {
+  it.each`
+    value                                                             | expected
+    ${'http://localhost:3000/public/plugins/my-app-plugin/module.js'} | ${'http://localhost:3000/public/plugins/my-app-plugin/module.js'}
+    ${'/public/plugins/my-app-plugin/module.js'}                      | ${'/public/plugins/my-app-plugin/module.js'}
+    ${'public/plugins/my-app-plugin/module.js'}                       | ${'/public/plugins/my-app-plugin/module.js'}
+  `(
+    "Url correct formatting, when calling the rule with correct formatted value: '$value' then result should be '$expected'",
+    ({ value, expected }) => {
+      expect(resolveModulePath(value)).toBe(expected);
+    }
+  );
+
+  it.each`
+    value                                                             | expected
+    ${'http://localhost:3000/public/plugins/my-app-plugin/module.js'} | ${'http://localhost:3000/public/plugins/my-app-plugin/module.js'}
+    ${'/public/plugins/my-app-plugin/module.js'}                      | ${'/public/plugins/my-app-plugin/module.js'}
+    ${'public/plugins/my-app-plugin/module.js'}                       | ${'/grafana/public/plugins/my-app-plugin/module.js'}
+  `(
+    "Url correct formatting, when calling the rule with correct formatted value: '$value' then result should be '$expected'",
+    ({ value, expected }) => {
+      config.appSubUrl = '/grafana';
+
+      expect(resolveModulePath(value)).toBe(expected);
+    }
+  );
+});
diff --git a/public/app/features/plugins/loader/utils.ts b/public/app/features/plugins/loader/utils.ts
index 470bc48733159..ddff73cab09eb 100644
--- a/public/app/features/plugins/loader/utils.ts
+++ b/public/app/features/plugins/loader/utils.ts
@@ -1,9 +1,10 @@
-import { SystemJS, config } from '@grafana/runtime';
+import { config } from '@grafana/runtime';
 
 import { sandboxPluginDependencies } from '../sandbox/plugin_dependencies';
 
 import { SHARED_DEPENDENCY_PREFIX } from './constants';
 import { trackPackageUsage } from './packageMetrics';
+import { SystemJS } from './systemjs';
 
 export function buildImportMap(importMap: Record<string, System.Module>) {
   return Object.keys(importMap).reduce<Record<string, string>>((acc, key) => {
@@ -28,3 +29,15 @@ export function buildImportMap(importMap: Record<string, System.Module>) {
 export function isHostedOnCDN(path: string) {
   return Boolean(config.pluginsCDNBaseURL) && path.startsWith(config.pluginsCDNBaseURL);
 }
+
+// This function is used to dynamically prepend the appSubUrl in the frontend.
+// This is required because if serve_from_sub_path is false the Image Renderer sets the subpath
+// to an empty string and sets appurl to localhost which causes plugins to fail to load.
+// https://github.com/grafana/grafana/issues/76180
+export function resolveModulePath(path: string) {
+  if (path.startsWith('http') || path.startsWith('/')) {
+    return path;
+  }
+
+  return `${config.appSubUrl ?? ''}/${path}`;
+}
diff --git a/public/app/features/plugins/pluginPreloader.ts b/public/app/features/plugins/pluginPreloader.ts
index 205a359eaab7c..6306a443183a2 100644
--- a/public/app/features/plugins/pluginPreloader.ts
+++ b/public/app/features/plugins/pluginPreloader.ts
@@ -1,6 +1,7 @@
 import type { PluginExtensionConfig } from '@grafana/data';
 import type { AppPluginConfig } from '@grafana/runtime';
 import { startMeasure, stopMeasure } from 'app/core/utils/metrics';
+import { getPluginSettings } from 'app/features/plugins/pluginSettings';
 
 import * as pluginLoader from './plugin_loader';
 
@@ -25,10 +26,15 @@ async function preload(config: AppPluginConfig): Promise<PluginPreloadResult> {
     const { plugin } = await pluginLoader.importPluginModule({
       path,
       version,
-      isAngular: config.angularDetected,
+      isAngular: config.angular.detected,
       pluginId,
     });
     const { extensionConfigs = [] } = plugin;
+
+    // Fetching meta-information for the preloaded app plugin and caching it for later.
+    // (The function below returns a promise, but it's not awaited for a reason: we don't want to block the preload process, we would only like to cache the result for later.)
+    getPluginSettings(pluginId);
+
     return { pluginId, extensionConfigs };
   } catch (error) {
     console.error(`[Plugins] Failed to preload plugin: ${path} (version: ${version})`, error);
diff --git a/public/app/features/plugins/pluginSettings.ts b/public/app/features/plugins/pluginSettings.ts
index 5febcc6873900..135cdbb9e970c 100644
--- a/public/app/features/plugins/pluginSettings.ts
+++ b/public/app/features/plugins/pluginSettings.ts
@@ -14,11 +14,17 @@ export function getPluginSettings(pluginId: string, options?: Partial<BackendSrv
   }
   return getBackendSrv()
     .get(`/api/plugins/${pluginId}/settings`, undefined, undefined, options)
-    .then((settings: any) => {
+    .then((settings) => {
       pluginInfoCache[pluginId] = settings;
       return settings;
     })
-    .catch((err: any) => {
+    .catch((e) => {
+      // User does not have access to plugin
+      if (typeof e === 'object' && e !== null && 'status' in e && e.status === 403) {
+        e.isHandled = true;
+        return Promise.reject(e);
+      }
+
       return Promise.reject(new Error('Unknown Plugin'));
     });
 }
diff --git a/public/app/features/plugins/plugin_loader.ts b/public/app/features/plugins/plugin_loader.ts
index 8b6d628eef972..0593d1e3eeabe 100644
--- a/public/app/features/plugins/plugin_loader.ts
+++ b/public/app/features/plugins/plugin_loader.ts
@@ -6,21 +6,24 @@ import {
   DataSourcePluginMeta,
   PluginMeta,
 } from '@grafana/data';
-import { SystemJS } from '@grafana/runtime';
 import { DataQuery } from '@grafana/schema';
 
 import { GenericDataSourcePlugin } from '../datasources/types';
 
 import builtInPlugins from './built_in_plugins';
 import { registerPluginInCache } from './loader/cache';
+// SystemJS has to be imported before the sharedDependenciesMap
+import { SystemJS } from './loader/systemjs';
+// eslint-disable-next-line import/order
 import { sharedDependenciesMap } from './loader/sharedDependencies';
 import { decorateSystemJSFetch, decorateSystemJSResolve, decorateSystemJsOnload } from './loader/systemjsHooks';
 import { SystemJSWithLoaderHooks } from './loader/types';
-import { buildImportMap } from './loader/utils';
+import { buildImportMap, resolveModulePath } from './loader/utils';
 import { importPluginModuleInSandbox } from './sandbox/sandbox_plugin_loader';
 import { isFrontendSandboxSupported } from './sandbox/utils';
 
 const imports = buildImportMap(sharedDependenciesMap);
+
 SystemJS.addImportMap({ imports });
 
 const systemJSPrototype: SystemJSWithLoaderHooks = SystemJS.constructor.prototype;
@@ -29,6 +32,17 @@ const systemJSPrototype: SystemJSWithLoaderHooks = SystemJS.constructor.prototyp
 // the content of the plugin code at runtime which can only be done with fetch/eval.
 systemJSPrototype.shouldFetch = () => true;
 
+const originalImport = systemJSPrototype.import;
+// Hook Systemjs import to support plugins that only have a default export.
+systemJSPrototype.import = function (...args: Parameters<typeof originalImport>) {
+  return originalImport.apply(this, args).then((module) => {
+    if (module && module.__useDefault) {
+      return module.default;
+    }
+    return module;
+  });
+};
+
 const systemJSFetch = systemJSPrototype.fetch;
 systemJSPrototype.fetch = function (url: string, options?: Record<string, unknown>) {
   return decorateSystemJSFetch(systemJSFetch, url, options);
@@ -67,19 +81,21 @@ export async function importPluginModule({
     }
   }
 
+  let modulePath = resolveModulePath(path);
+
   // the sandboxing environment code cannot work in nodejs and requires a real browser
-  if (isFrontendSandboxSupported({ isAngular, pluginId })) {
+  if (await isFrontendSandboxSupported({ isAngular, pluginId })) {
     return importPluginModuleInSandbox({ pluginId });
   }
 
-  return SystemJS.import(path);
+  return SystemJS.import(modulePath);
 }
 
 export function importDataSourcePlugin(meta: DataSourcePluginMeta): Promise<GenericDataSourcePlugin> {
   return importPluginModule({
     path: meta.module,
     version: meta.info?.version,
-    isAngular: meta.angularDetected,
+    isAngular: meta.angular?.detected,
     pluginId: meta.id,
   }).then((pluginExports) => {
     if (pluginExports.plugin) {
@@ -107,7 +123,7 @@ export function importAppPlugin(meta: PluginMeta): Promise<AppPlugin> {
   return importPluginModule({
     path: meta.module,
     version: meta.info?.version,
-    isAngular: meta.angularDetected,
+    isAngular: meta.angular?.detected,
     pluginId: meta.id,
   }).then((pluginExports) => {
     const plugin: AppPlugin = pluginExports.plugin ? pluginExports.plugin : new AppPlugin();
diff --git a/public/app/features/plugins/sandbox/README.md b/public/app/features/plugins/sandbox/README.md
index d2fb03e068479..cff6aa0236b13 100644
--- a/public/app/features/plugins/sandbox/README.md
+++ b/public/app/features/plugins/sandbox/README.md
@@ -22,7 +22,7 @@ When a plugin is marked for loading, grafana decides if it should load it in the
 - If a plugin is marked to load in a sandbox, first the source code is downloaded with `fetch`, then pre-processed to adjust sourceMaps and CDNs and finally evaluated inside a new near-membrane virtual environment.
 
 In either case, Grafana receives a pluginExport object that later uses to initialize plugins. For Grafana's core, this
-pluginExport is idential in functionality and properties regardless of the loading method.
+pluginExport is identical in functionality and properties regardless of the loading method.
 
 # Plugin execution
 
@@ -64,7 +64,7 @@ those plugins that use web workers. Performance is still under tests when this w
 Distortions is the mechanism to intercept calls from the child realm code to JS APIS and DOM APIs. e.g: `Array.map` or
 `document.getElement`.
 
-Distortions allow to replace the function that will execute inside the child realm wnen the function is invoked.
+Distortions allow to replace the function that will execute inside the child realm when the function is invoked.
 
 Distortions also allow to intercept the exchange of objects between the child realm and the incubator realm, we can, for
 example, inspect all DOM elements access and generally speaking all objects that go to the child realm.
diff --git a/public/app/features/plugins/sandbox/code_loader.ts b/public/app/features/plugins/sandbox/code_loader.ts
index 7f22aafbeb283..3f2d614bf4196 100644
--- a/public/app/features/plugins/sandbox/code_loader.ts
+++ b/public/app/features/plugins/sandbox/code_loader.ts
@@ -2,7 +2,7 @@ import { PluginMeta, patchArrayVectorProrotypeMethods } from '@grafana/data';
 
 import { transformPluginSourceForCDN } from '../cdn/utils';
 import { resolveWithCache } from '../loader/cache';
-import { isHostedOnCDN } from '../loader/utils';
+import { isHostedOnCDN, resolveModulePath } from '../loader/utils';
 
 import { SandboxEnvironment } from './types';
 
@@ -60,9 +60,10 @@ export async function getPluginCode(meta: PluginMeta): Promise<string> {
     });
     return pluginCode;
   } else {
-    // local plugin. resolveWithCache will append a query parameter with its version
-    // to ensure correct cached version is served
-    const pluginCodeUrl = resolveWithCache(meta.module);
+    let modulePath = resolveModulePath(meta.module);
+    // resolveWithCache will append a query parameter with its version
+    // to ensure correct cached version is served for local plugins
+    const pluginCodeUrl = resolveWithCache(modulePath);
     const response = await fetch(pluginCodeUrl);
     let pluginCode = await response.text();
     pluginCode = transformPluginSourceForCDN({
diff --git a/public/app/features/plugins/sandbox/distortion_map.ts b/public/app/features/plugins/sandbox/distortion_map.ts
index eeb6fd756ffc8..a883b9a763f38 100644
--- a/public/app/features/plugins/sandbox/distortion_map.ts
+++ b/public/app/features/plugins/sandbox/distortion_map.ts
@@ -7,6 +7,7 @@ import { Monaco } from '@grafana/ui';
 
 import { loadScriptIntoSandbox } from './code_loader';
 import { forbiddenElements } from './constants';
+import { recursivePatchObjectAsLiveTarget } from './document_sandbox';
 import { SandboxEnvironment } from './types';
 import { logWarning, unboxRegexesFromMembraneProxy } from './utils';
 
@@ -85,6 +86,7 @@ export function getGeneralSandboxDistortionMap() {
     distortDocument(generalDistortionMap);
     distortMonacoEditor(generalDistortionMap);
     distortPostMessage(generalDistortionMap);
+    distortLodash(generalDistortionMap);
   }
   return generalDistortionMap;
 }
@@ -526,26 +528,32 @@ async function distortPostMessage(distortions: DistortionMap) {
  * or because the libraries we want to patch are lazy-loaded and we don't have access to their definitions.
  * We put here only distortions that can't be static because they are dynamicly loaded
  */
-export function distortLiveApis(originalValue: ProxyTarget): ProxyTarget | undefined {
+export function distortLiveApis(_originalValue: ProxyTarget): ProxyTarget | undefined {
   distortMonacoEditor(generalDistortionMap);
+  return;
+}
 
-  // This distorts the `history.replace` function in react-router-dom.
-  // constructed for each browser history and is only accessible within the react context.
-  // Note that this distortion does not affect `String.prototype.replace` calls.
-  // because they don't go through distortions
-  if (
-    originalValue instanceof Function &&
-    originalValue.name === 'replace' &&
-    originalValue.prototype.constructor.length === 2
-  ) {
-    return function replace(this: unknown, ...args: unknown[]) {
-      // validate history.replace signature further
-      if (args && args[0] && typeof args[0] === 'string' && args[1] && !(args[1] instanceof Function)) {
-        const newArgs = cloneDeep(args);
-        return Reflect.apply(originalValue, this, newArgs);
-      }
-      return Reflect.apply(originalValue, this, args);
+export function distortLodash(distortions: DistortionMap) {
+  /**
+   * This is a distortion for lodash clone Deep function
+   * because lodash deep clones execute in the blue realm
+   * it returns objects that plugins can't modify because they are not
+   * lived tracked.
+   *
+   * We need to patch it so that plugins can modify the cloned object
+   * in places such as query editors.
+   *
+   */
+  function cloneDeepDistortion(originalValue: unknown) {
+    // here to please typescript, this if is never true
+    if (!isFunction(originalValue)) {
+      return originalValue;
+    }
+    return function (this: unknown, ...args: unknown[]) {
+      const cloned = originalValue.apply(this, args);
+      recursivePatchObjectAsLiveTarget(cloned);
+      return cloned;
     };
   }
-  return;
+  distortions.set(cloneDeep, cloneDeepDistortion);
 }
diff --git a/public/app/features/plugins/sandbox/document_sandbox.ts b/public/app/features/plugins/sandbox/document_sandbox.ts
index 75199726c5cbd..9dcb1a3a1aa47 100644
--- a/public/app/features/plugins/sandbox/document_sandbox.ts
+++ b/public/app/features/plugins/sandbox/document_sandbox.ts
@@ -1,7 +1,8 @@
 import { isNearMembraneProxy, ProxyTarget } from '@locker/near-membrane-shared';
+import { cloneDeep } from 'lodash';
 import Prism from 'prismjs';
 
-import { DataSourceApi } from '@grafana/data';
+import { CustomVariableSupport, DataSourceApi } from '@grafana/data';
 import { config } from '@grafana/runtime';
 
 import { forbiddenElements } from './constants';
@@ -86,6 +87,32 @@ export function markDomElementStyleAsALiveTarget(el: Element) {
   }
 }
 
+export function recursivePatchObjectAsLiveTarget(obj: unknown) {
+  if (!obj) {
+    return;
+  }
+  if (Array.isArray(obj)) {
+    obj.forEach(recursivePatchObjectAsLiveTarget);
+    unconditionallyPatchObjectAsLiveTarget(obj);
+  } else if (typeof obj === 'object') {
+    Object.values(obj).forEach(recursivePatchObjectAsLiveTarget);
+    unconditionallyPatchObjectAsLiveTarget(obj);
+  }
+}
+
+function unconditionallyPatchObjectAsLiveTarget(obj: unknown) {
+  if (!obj) {
+    return;
+  }
+  // do not patch it twice
+  if (Object.hasOwn(obj, SANDBOX_LIVE_VALUE)) {
+    return obj;
+  }
+
+  Reflect.defineProperty(obj, SANDBOX_LIVE_VALUE, {});
+  return obj;
+}
+
 /**
  * Some specific near membrane proxies interfere with plugins
  * an example of this is React class components state and their fast life cycles
@@ -111,7 +138,7 @@ export function patchObjectAsLiveTarget(obj: unknown) {
     !(obj instanceof Function) &&
     // conditions for allowed objects
     // react class components
-    (isReactClassComponent(obj) || obj instanceof DataSourceApi)
+    (isReactClassComponent(obj) || obj instanceof DataSourceApi || obj instanceof CustomVariableSupport)
   ) {
     Reflect.defineProperty(obj, SANDBOX_LIVE_VALUE, {});
   } else {
@@ -160,3 +187,50 @@ export function getSandboxMockBody(): Element {
   }
   return sandboxBody;
 }
+
+let nativeAPIsPatched = false;
+
+export function patchWebAPIs() {
+  if (!nativeAPIsPatched) {
+    nativeAPIsPatched = true;
+    patchHistoryReplaceState();
+  }
+}
+
+/*
+ * window.history.replaceState is a native API that won't work with proxies
+ * so we need to patch it to unwrap any possible proxies you pass to it.
+ *
+ * Why can't we directly distord window.history.replaceState calls inside plugins?
+ *
+ * We can. Except that plugins don't call window.history.replaceState directly they
+ * instead use the history object from react-router.
+ *
+ * react-router is a runtime dependency and it is executed in the blue realm
+ * and calls window.history.replaceState directly where the sandbox is not involved at all
+ *
+ * It is most likely this "original" function is not really the native function because
+ * `useLocation` from `react-use` patches this function before the sandbox kicks in.
+ *
+ * Regarding the performance impact of this cloneDeep. The structures passed to history.replaceState
+ * are minimalistic and its impact will be neglegible.
+ */
+function patchHistoryReplaceState() {
+  const original = window.history.replaceState;
+  Object.defineProperty(window.history, 'replaceState', {
+    value: function (...args: Parameters<typeof window.history.replaceState>) {
+      let newArgs = args;
+      try {
+        newArgs = cloneDeep(args);
+      } catch (e) {
+        logWarning('Error cloning args in window.history.replaceState', {
+          error: String(e),
+        });
+      }
+      return Reflect.apply(original, this, newArgs);
+    },
+    writable: true,
+    configurable: true,
+    enumerable: false,
+  });
+}
diff --git a/public/app/features/plugins/sandbox/sandbox_components.tsx b/public/app/features/plugins/sandbox/sandbox_components.tsx
index c7264bd7c944d..9ff02f2da2fba 100644
--- a/public/app/features/plugins/sandbox/sandbox_components.tsx
+++ b/public/app/features/plugins/sandbox/sandbox_components.tsx
@@ -1,7 +1,7 @@
 import { isFunction } from 'lodash';
 import React, { ComponentType, FC } from 'react';
 
-import { PluginConfigPage, PluginExtensionConfig, PluginMeta, PluginType } from '@grafana/data';
+import { GrafanaPlugin, PluginExtensionConfig, PluginMeta, PluginType } from '@grafana/data';
 
 import { SandboxedPluginObject } from './types';
 import { isSandboxedPluginObject } from './utils';
@@ -70,7 +70,8 @@ export async function sandboxPluginComponents(
 
   // config pages
   if (Reflect.has(pluginObject, 'configPages')) {
-    const configPages: Record<string, PluginConfigPage<any>> = Reflect.get(pluginObject, 'configPages');
+    const configPages: NonNullable<GrafanaPlugin['configPages']> = Reflect.get(pluginObject, 'configPages') ?? [];
+
     for (const [key, value] of Object.entries(configPages)) {
       if (!value.body || !isFunction(value.body)) {
         continue;
diff --git a/public/app/features/plugins/sandbox/sandbox_plugin_loader.ts b/public/app/features/plugins/sandbox/sandbox_plugin_loader.ts
index c6884d816b6a0..78619d3b93ae3 100644
--- a/public/app/features/plugins/sandbox/sandbox_plugin_loader.ts
+++ b/public/app/features/plugins/sandbox/sandbox_plugin_loader.ts
@@ -2,7 +2,7 @@ import createVirtualEnvironment from '@locker/near-membrane-dom';
 import { ProxyTarget } from '@locker/near-membrane-shared';
 
 import { BootData, PluginMeta } from '@grafana/data';
-import { config, logInfo } from '@grafana/runtime';
+import { config } from '@grafana/runtime';
 import { defaultTrustedTypesPolicy } from 'app/core/trustedTypePolicies';
 
 import { getPluginSettings } from '../pluginSettings';
@@ -15,11 +15,12 @@ import {
   isLiveTarget,
   markDomElementStyleAsALiveTarget,
   patchObjectAsLiveTarget,
+  patchWebAPIs,
 } from './document_sandbox';
 import { sandboxPluginDependencies } from './plugin_dependencies';
 import { sandboxPluginComponents } from './sandbox_components';
 import { CompartmentDependencyModule, PluginFactoryFunction, SandboxEnvironment } from './types';
-import { logError } from './utils';
+import { logError, logInfo } from './utils';
 
 // Loads near membrane custom formatter for near membrane proxy objects.
 if (process.env.NODE_ENV !== 'production') {
@@ -30,6 +31,7 @@ const pluginImportCache = new Map<string, Promise<System.Module>>();
 const pluginLogCache: Record<string, boolean> = {};
 
 export async function importPluginModuleInSandbox({ pluginId }: { pluginId: string }): Promise<System.Module> {
+  patchWebAPIs();
   try {
     const pluginMeta = await getPluginSettings(pluginId);
     if (!pluginImportCache.has(pluginId)) {
@@ -47,6 +49,9 @@ export async function importPluginModuleInSandbox({ pluginId }: { pluginId: stri
 }
 
 async function doImportPluginModuleInSandbox(meta: PluginMeta): Promise<System.Module> {
+  logInfo('Loading with sandbox', {
+    pluginId: meta.id,
+  });
   return new Promise(async (resolve, reject) => {
     const generalDistortionMap = getGeneralSandboxDistortionMap();
     let sandboxEnvironment: SandboxEnvironment;
@@ -92,6 +97,9 @@ async function doImportPluginModuleInSandbox(meta: PluginMeta): Promise<System.M
         // window.locationSandbox. In the future `window.location` could be a proxy if we
         // want to intercept calls to it.
         locationSandbox: window.location,
+        setImmediate: function (fn: Function, ...args: unknown[]) {
+          return setTimeout(fn, 0, ...args);
+        },
         get monaco() {
           // `window.monaco` may be undefined when invoked. However, plugins have long
           // accessed it directly, aware of this possibility.
@@ -156,7 +164,7 @@ async function doImportPluginModuleInSandbox(meta: PluginMeta): Promise<System.M
           }
 
           try {
-            const resolvedDeps = resolvePluginDependencies(dependencies);
+            const resolvedDeps = resolvePluginDependencies(dependencies, meta.id);
             // execute the plugin's code
             const pluginExportsRaw = factory.apply(null, resolvedDeps);
             // only after the plugin has been executed
@@ -183,7 +191,12 @@ async function doImportPluginModuleInSandbox(meta: PluginMeta): Promise<System.M
     try {
       pluginCode = await getPluginCode(meta);
     } catch (e) {
-      reject(new Error(`Could not load plugin code ${meta.id}: ` + e));
+      const error = new Error(`Could not load plugin code ${meta.id}: ` + e);
+      logError(error, {
+        pluginId: meta.id,
+        error: String(e),
+      });
+      reject(error);
     }
 
     try {
@@ -202,7 +215,7 @@ async function doImportPluginModuleInSandbox(meta: PluginMeta): Promise<System.M
   });
 }
 
-function resolvePluginDependencies(deps: string[]) {
+function resolvePluginDependencies(deps: string[], pluginId: string) {
   // resolve dependencies
   const resolvedDeps: CompartmentDependencyModule[] = [];
   for (const dep of deps) {
@@ -212,7 +225,13 @@ function resolvePluginDependencies(deps: string[]) {
     }
 
     if (!resolvedDep) {
-      throw new Error(`[sandbox] Could not resolve dependency ${dep}`);
+      const error = new Error(`[sandbox] Could not resolve dependency ${dep}`);
+      logError(error, {
+        pluginId,
+        dependency: dep,
+        error: String(error),
+      });
+      throw error;
     }
     resolvedDeps.push(resolvedDep);
   }
diff --git a/public/app/features/plugins/sandbox/utils.ts b/public/app/features/plugins/sandbox/utils.ts
index 74305e594e410..30aab3418812d 100644
--- a/public/app/features/plugins/sandbox/utils.ts
+++ b/public/app/features/plugins/sandbox/utils.ts
@@ -1,8 +1,11 @@
 import { isNearMembraneProxy } from '@locker/near-membrane-shared';
 import React from 'react';
 
+import { PluginSignatureType, PluginType } from '@grafana/data';
 import { LogContext } from '@grafana/faro-web-sdk';
-import { logWarning as logWarningRuntime, logError as logErrorRuntime, config } from '@grafana/runtime';
+import { config, createMonitoringLogger } from '@grafana/runtime';
+
+import { getPluginSettings } from '../pluginSettings';
 
 import { SandboxedPluginObject } from './types';
 
@@ -16,45 +19,65 @@ export function assertNever(x: never): never {
   throw new Error(`Unexpected object: ${x}. This should never happen.`);
 }
 
+const sandboxLogger = createMonitoringLogger('sandbox', { monitorOnly: String(monitorOnly) });
+
 export function isReactClassComponent(obj: unknown): obj is React.Component {
   return obj instanceof React.Component;
 }
 
 export function logWarning(message: string, context?: LogContext) {
-  context = {
-    ...context,
-    source: 'sandbox',
-    monitorOnly: String(monitorOnly),
-  };
-  logWarningRuntime(message, context);
+  sandboxLogger.logWarning(message, context);
 }
 
 export function logError(error: Error, context?: LogContext) {
-  context = {
-    ...context,
-    source: 'sandbox',
-    monitorOnly: String(monitorOnly),
-  };
-  logErrorRuntime(error, context);
+  sandboxLogger.logError(error, context);
+}
+
+export function logInfo(message: string, context?: LogContext) {
+  sandboxLogger.logInfo(message, context);
 }
 
-export function isFrontendSandboxSupported({
+export async function isFrontendSandboxSupported({
   isAngular,
   pluginId,
 }: {
   isAngular?: boolean;
   pluginId: string;
-}): boolean {
+}): Promise<boolean> {
+  // Only if the feature is not enabled no support for sandbox
+  if (!Boolean(config.featureToggles.pluginsFrontendSandbox)) {
+    return false;
+  }
+
+  // no support for angular plugins
+  if (isAngular) {
+    return false;
+  }
+
   // To fast test and debug the sandbox in the browser.
-  const sandboxQueryParam = location.search.includes('nosandbox') && config.buildInfo.env === 'development';
+  const sandboxDisableQueryParam = location.search.includes('nosandbox') && config.buildInfo.env === 'development';
+  if (sandboxDisableQueryParam) {
+    return false;
+  }
+
+  // if disabled by configuration
   const isPluginExcepted = config.disableFrontendSandboxForPlugins.includes(pluginId);
-  return (
-    !isAngular &&
-    Boolean(config.featureToggles.pluginsFrontendSandbox) &&
-    process.env.NODE_ENV !== 'test' &&
-    !isPluginExcepted &&
-    !sandboxQueryParam
-  );
+  if (isPluginExcepted) {
+    return false;
+  }
+
+  // no sandbox in test mode. it often breaks e2e tests
+  if (process.env.NODE_ENV === 'test') {
+    return false;
+  }
+
+  // we don't run grafana-own apps in the sandbox
+  const pluginMeta = await getPluginSettings(pluginId);
+  if (pluginMeta.type === PluginType.app && pluginMeta.signatureType === PluginSignatureType.grafana) {
+    return false;
+  }
+
+  return true;
 }
 
 function isRegex(value: unknown): value is RegExp {
diff --git a/public/app/features/plugins/sql/.eslintrc b/public/app/features/plugins/sql/.eslintrc
deleted file mode 100644
index f0bce9b7b6336..0000000000000
--- a/public/app/features/plugins/sql/.eslintrc
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "rules": {
-    "no-restricted-imports": [
-      "error",
-      {
-        "patterns": ["app/*"]
-      }
-    ]
-  }
-}
diff --git a/public/app/features/plugins/sql/components/QueryEditor.tsx b/public/app/features/plugins/sql/components/QueryEditor.tsx
deleted file mode 100644
index 00427b3527615..0000000000000
--- a/public/app/features/plugins/sql/components/QueryEditor.tsx
+++ /dev/null
@@ -1,133 +0,0 @@
-import React, { useCallback, useEffect, useState } from 'react';
-import { useAsync } from 'react-use';
-
-import { QueryEditorProps } from '@grafana/data';
-import { EditorMode, Space } from '@grafana/experimental';
-
-import { SqlDatasource } from '../datasource/SqlDatasource';
-import { applyQueryDefaults } from '../defaults';
-import { SQLQuery, QueryRowFilter, SQLOptions } from '../types';
-import { haveColumns } from '../utils/sql.utils';
-
-import { QueryHeader, QueryHeaderProps } from './QueryHeader';
-import { RawEditor } from './query-editor-raw/RawEditor';
-import { VisualEditor } from './visual-query-builder/VisualEditor';
-
-interface SqlQueryEditorProps extends QueryEditorProps<SqlDatasource, SQLQuery, SQLOptions> {
-  queryHeaderProps?: Pick<QueryHeaderProps, 'isPostgresInstance'>;
-}
-
-export function SqlQueryEditor({
-  datasource,
-  query,
-  onChange,
-  onRunQuery,
-  range,
-  queryHeaderProps,
-}: SqlQueryEditorProps) {
-  const [isQueryRunnable, setIsQueryRunnable] = useState(true);
-  const db = datasource.getDB();
-
-  const { preconfiguredDatabase } = datasource;
-  const isPostgresInstance = !!queryHeaderProps?.isPostgresInstance;
-  const { loading, error } = useAsync(async () => {
-    return () => {
-      if (datasource.getDB(datasource.id).init !== undefined) {
-        datasource.getDB(datasource.id).init!();
-      }
-    };
-  }, [datasource]);
-
-  const queryWithDefaults = applyQueryDefaults(query);
-  const [queryRowFilter, setQueryRowFilter] = useState<QueryRowFilter>({
-    filter: !!queryWithDefaults.sql?.whereString,
-    group: !!queryWithDefaults.sql?.groupBy?.[0]?.property.name,
-    order: !!queryWithDefaults.sql?.orderBy?.property.name,
-    preview: true,
-  });
-  const [queryToValidate, setQueryToValidate] = useState(queryWithDefaults);
-
-  useEffect(() => {
-    return () => {
-      if (datasource.getDB(datasource.id).dispose !== undefined) {
-        datasource.getDB(datasource.id).dispose!();
-      }
-    };
-  }, [datasource]);
-
-  const processQuery = useCallback(
-    (q: SQLQuery) => {
-      if (isQueryValid(q) && onRunQuery) {
-        onRunQuery();
-      }
-    },
-    [onRunQuery]
-  );
-
-  const onQueryChange = (q: SQLQuery, process = true) => {
-    setQueryToValidate(q);
-    onChange(q);
-
-    if (haveColumns(q.sql?.columns) && q.sql?.columns.some((c) => c.name) && !queryRowFilter.group) {
-      setQueryRowFilter({ ...queryRowFilter, group: true });
-    }
-
-    if (process) {
-      processQuery(q);
-    }
-  };
-
-  const onQueryHeaderChange = (q: SQLQuery) => {
-    setQueryToValidate(q);
-    onChange(q);
-  };
-
-  if (loading || error) {
-    return null;
-  }
-
-  return (
-    <>
-      <QueryHeader
-        db={db}
-        preconfiguredDataset={preconfiguredDatabase}
-        onChange={onQueryHeaderChange}
-        onRunQuery={onRunQuery}
-        onQueryRowChange={setQueryRowFilter}
-        queryRowFilter={queryRowFilter}
-        query={queryWithDefaults}
-        isQueryRunnable={isQueryRunnable}
-        isPostgresInstance={isPostgresInstance}
-      />
-
-      <Space v={0.5} />
-
-      {queryWithDefaults.editorMode !== EditorMode.Code && (
-        <VisualEditor
-          db={db}
-          query={queryWithDefaults}
-          onChange={(q: SQLQuery) => onQueryChange(q, false)}
-          queryRowFilter={queryRowFilter}
-          onValidate={setIsQueryRunnable}
-          range={range}
-        />
-      )}
-
-      {queryWithDefaults.editorMode === EditorMode.Code && (
-        <RawEditor
-          db={db}
-          query={queryWithDefaults}
-          queryToValidate={queryToValidate}
-          onChange={onQueryChange}
-          onRunQuery={onRunQuery}
-          onValidate={setIsQueryRunnable}
-          range={range}
-        />
-      )}
-    </>
-  );
-}
-
-const isQueryValid = (q: SQLQuery) => {
-  return Boolean(q.rawSql);
-};
diff --git a/public/app/features/plugins/sql/components/QueryHeader.tsx b/public/app/features/plugins/sql/components/QueryHeader.tsx
deleted file mode 100644
index 5b7adb502fef8..0000000000000
--- a/public/app/features/plugins/sql/components/QueryHeader.tsx
+++ /dev/null
@@ -1,312 +0,0 @@
-import React, { useCallback, useState } from 'react';
-import { useCopyToClipboard } from 'react-use';
-import { v4 as uuidv4 } from 'uuid';
-
-import { SelectableValue } from '@grafana/data';
-import { EditorField, EditorHeader, EditorMode, EditorRow, FlexItem, InlineSelect, Space } from '@grafana/experimental';
-import { reportInteraction } from '@grafana/runtime';
-import { Button, InlineSwitch, RadioButtonGroup, Tooltip } from '@grafana/ui';
-
-import { QueryWithDefaults } from '../defaults';
-import { SQLQuery, QueryFormat, QueryRowFilter, QUERY_FORMAT_OPTIONS, DB } from '../types';
-
-import { ConfirmModal } from './ConfirmModal';
-import { DatasetSelector } from './DatasetSelector';
-import { isSqlDatasourceDatabaseSelectionFeatureFlagEnabled } from './QueryEditorFeatureFlag.utils';
-import { TableSelector } from './TableSelector';
-
-export interface QueryHeaderProps {
-  db: DB;
-  isPostgresInstance?: boolean;
-  isQueryRunnable: boolean;
-  onChange: (query: SQLQuery) => void;
-  onQueryRowChange: (queryRowFilter: QueryRowFilter) => void;
-  onRunQuery: () => void;
-  preconfiguredDataset: string;
-  query: QueryWithDefaults;
-  queryRowFilter: QueryRowFilter;
-}
-
-const editorModes = [
-  { label: 'Builder', value: EditorMode.Builder },
-  { label: 'Code', value: EditorMode.Code },
-];
-
-export function QueryHeader({
-  db,
-  isPostgresInstance,
-  isQueryRunnable,
-  onChange,
-  onQueryRowChange,
-  onRunQuery,
-  preconfiguredDataset,
-  query,
-  queryRowFilter,
-}: QueryHeaderProps) {
-  const { editorMode } = query;
-  const [_, copyToClipboard] = useCopyToClipboard();
-  const [showConfirm, setShowConfirm] = useState(false);
-  const toRawSql = db.toRawSql;
-
-  const onEditorModeChange = useCallback(
-    (newEditorMode: EditorMode) => {
-      if (newEditorMode === EditorMode.Code) {
-        reportInteraction('grafana_sql_editor_mode_changed', {
-          datasource: query.datasource?.type,
-          selectedEditorMode: EditorMode.Code,
-        });
-      }
-
-      if (editorMode === EditorMode.Code) {
-        setShowConfirm(true);
-        return;
-      }
-      onChange({ ...query, editorMode: newEditorMode });
-    },
-    [editorMode, onChange, query]
-  );
-
-  const onFormatChange = (e: SelectableValue) => {
-    const next = { ...query, format: e.value !== undefined ? e.value : QueryFormat.Table };
-
-    reportInteraction('grafana_sql_format_changed', {
-      datasource: query.datasource?.type,
-      selectedFormat: next.format,
-    });
-    onChange(next);
-  };
-
-  const onDatasetChange = (e: SelectableValue) => {
-    if (e.value === query.dataset) {
-      return;
-    }
-
-    const next = {
-      ...query,
-      dataset: e.value,
-      table: undefined,
-      sql: undefined,
-      rawSql: '',
-    };
-
-    onChange(next);
-  };
-
-  const onTableChange = (e: SelectableValue) => {
-    if (e.value === query.table) {
-      return;
-    }
-
-    const next: SQLQuery = {
-      ...query,
-      table: e.value,
-      sql: undefined,
-      rawSql: '',
-    };
-
-    onChange(next);
-  };
-
-  const datasetDropdownIsAvailable = () => {
-    // If the feature flag is DISABLED, && the datasource is Postgres (`isPostgresInstance`),
-    // we want to hide the dropdown - as per previous behavior.
-    if (!isSqlDatasourceDatabaseSelectionFeatureFlagEnabled() && isPostgresInstance) {
-      return false;
-    }
-
-    return true;
-  };
-
-  return (
-    <>
-      <EditorHeader>
-        <InlineSelect
-          label="Format"
-          value={query.format}
-          placeholder="Select format"
-          menuShouldPortal
-          onChange={onFormatChange}
-          options={QUERY_FORMAT_OPTIONS}
-        />
-
-        {editorMode === EditorMode.Builder && (
-          <>
-            <InlineSwitch
-              id={`sql-filter-${uuidv4()}}`}
-              label="Filter"
-              transparent={true}
-              showLabel={true}
-              value={queryRowFilter.filter}
-              onChange={(ev) => {
-                if (!(ev.target instanceof HTMLInputElement)) {
-                  return;
-                }
-
-                reportInteraction('grafana_sql_filter_toggled', {
-                  datasource: query.datasource?.type,
-                  displayed: ev.target.checked,
-                });
-
-                onQueryRowChange({ ...queryRowFilter, filter: ev.target.checked });
-              }}
-            />
-
-            <InlineSwitch
-              id={`sql-group-${uuidv4()}}`}
-              label="Group"
-              transparent={true}
-              showLabel={true}
-              value={queryRowFilter.group}
-              onChange={(ev) => {
-                if (!(ev.target instanceof HTMLInputElement)) {
-                  return;
-                }
-
-                reportInteraction('grafana_sql_group_toggled', {
-                  datasource: query.datasource?.type,
-                  displayed: ev.target.checked,
-                });
-
-                onQueryRowChange({ ...queryRowFilter, group: ev.target.checked });
-              }}
-            />
-
-            <InlineSwitch
-              id={`sql-order-${uuidv4()}}`}
-              label="Order"
-              transparent={true}
-              showLabel={true}
-              value={queryRowFilter.order}
-              onChange={(ev) => {
-                if (!(ev.target instanceof HTMLInputElement)) {
-                  return;
-                }
-
-                reportInteraction('grafana_sql_order_toggled', {
-                  datasource: query.datasource?.type,
-                  displayed: ev.target.checked,
-                });
-
-                onQueryRowChange({ ...queryRowFilter, order: ev.target.checked });
-              }}
-            />
-
-            <InlineSwitch
-              id={`sql-preview-${uuidv4()}}`}
-              label="Preview"
-              transparent={true}
-              showLabel={true}
-              value={queryRowFilter.preview}
-              onChange={(ev) => {
-                if (!(ev.target instanceof HTMLInputElement)) {
-                  return;
-                }
-
-                reportInteraction('grafana_sql_preview_toggled', {
-                  datasource: query.datasource?.type,
-                  displayed: ev.target.checked,
-                });
-
-                onQueryRowChange({ ...queryRowFilter, preview: ev.target.checked });
-              }}
-            />
-          </>
-        )}
-
-        <FlexItem grow={1} />
-
-        {isQueryRunnable ? (
-          <Button icon="play" variant="primary" size="sm" onClick={() => onRunQuery()}>
-            Run query
-          </Button>
-        ) : (
-          <Tooltip
-            theme="error"
-            content={
-              <>
-                Your query is invalid. Check below for details. <br />
-                However, you can still run this query.
-              </>
-            }
-            placement="top"
-          >
-            <Button icon="exclamation-triangle" variant="secondary" size="sm" onClick={() => onRunQuery()}>
-              Run query
-            </Button>
-          </Tooltip>
-        )}
-
-        <RadioButtonGroup options={editorModes} size="sm" value={editorMode} onChange={onEditorModeChange} />
-
-        <ConfirmModal
-          isOpen={showConfirm}
-          onCopy={() => {
-            reportInteraction('grafana_sql_editor_mode_changed', {
-              datasource: query.datasource?.type,
-              selectedEditorMode: EditorMode.Builder,
-              type: 'copy',
-            });
-
-            setShowConfirm(false);
-            copyToClipboard(query.rawSql!);
-            onChange({
-              ...query,
-              rawSql: toRawSql(query),
-              editorMode: EditorMode.Builder,
-            });
-          }}
-          onDiscard={() => {
-            reportInteraction('grafana_sql_editor_mode_changed', {
-              datasource: query.datasource?.type,
-              selectedEditorMode: EditorMode.Builder,
-              type: 'discard',
-            });
-
-            setShowConfirm(false);
-            onChange({
-              ...query,
-              rawSql: toRawSql(query),
-              editorMode: EditorMode.Builder,
-            });
-          }}
-          onCancel={() => {
-            reportInteraction('grafana_sql_editor_mode_changed', {
-              datasource: query.datasource?.type,
-              selectedEditorMode: EditorMode.Builder,
-              type: 'cancel',
-            });
-
-            setShowConfirm(false);
-          }}
-        />
-      </EditorHeader>
-
-      {editorMode === EditorMode.Builder && (
-        <>
-          <Space v={0.5} />
-          <EditorRow>
-            {datasetDropdownIsAvailable() && (
-              <EditorField label="Dataset" width={25}>
-                <DatasetSelector
-                  db={db}
-                  dataset={query.dataset}
-                  isPostgresInstance={isPostgresInstance}
-                  preconfiguredDataset={preconfiguredDataset}
-                  onChange={onDatasetChange}
-                />
-              </EditorField>
-            )}
-            <EditorField label="Table" width={25}>
-              <TableSelector
-                db={db}
-                dataset={query.dataset || preconfiguredDataset}
-                table={query.table}
-                onChange={onTableChange}
-              />
-            </EditorField>
-          </EditorRow>
-        </>
-      )}
-    </>
-  );
-}
diff --git a/public/app/features/plugins/sql/components/visual-query-builder/AwesomeQueryBuilder.tsx b/public/app/features/plugins/sql/components/visual-query-builder/AwesomeQueryBuilder.tsx
deleted file mode 100644
index 423d327d9e740..0000000000000
--- a/public/app/features/plugins/sql/components/visual-query-builder/AwesomeQueryBuilder.tsx
+++ /dev/null
@@ -1,299 +0,0 @@
-import {
-  AnyObject,
-  BasicConfig,
-  Config,
-  JsonItem,
-  JsonTree,
-  Operator,
-  Settings,
-  SimpleField,
-  SqlFormatOperator,
-  Utils,
-  ValueSource,
-  Widgets,
-} from '@react-awesome-query-builder/ui';
-import { List } from 'immutable';
-import { isString } from 'lodash';
-import React from 'react';
-
-import { dateTime, toOption } from '@grafana/data';
-import { Button, DateTimePicker, Input, Select } from '@grafana/ui';
-
-const buttonLabels = {
-  add: 'Add',
-  remove: 'Remove',
-};
-
-export const emptyInitValue: JsonItem = {
-  id: Utils.uuid(),
-  type: 'group' as const,
-  children1: {
-    [Utils.uuid()]: {
-      type: 'rule',
-      properties: {
-        field: null,
-        operator: null,
-        value: [],
-        valueSrc: [],
-      },
-    },
-  },
-};
-
-export const emptyInitTree: JsonTree = {
-  id: Utils.uuid(),
-  type: 'group' as const,
-  children1: {
-    [Utils.uuid()]: {
-      type: 'rule',
-      properties: {
-        field: null,
-        operator: null,
-        value: [],
-        valueSrc: [],
-      },
-    },
-  },
-};
-
-export const widgets: Widgets = {
-  ...BasicConfig.widgets,
-  text: {
-    ...BasicConfig.widgets.text,
-    factory: function TextInput(props) {
-      return (
-        <Input
-          value={props?.value || ''}
-          placeholder={props?.placeholder}
-          onChange={(e) => props?.setValue(e.currentTarget.value)}
-        />
-      );
-    },
-  },
-  number: {
-    ...BasicConfig.widgets.number,
-    factory: function NumberInput(props) {
-      return (
-        <Input
-          value={props?.value}
-          placeholder={props?.placeholder}
-          type="number"
-          onChange={(e) => props?.setValue(Number.parseInt(e.currentTarget.value, 10))}
-        />
-      );
-    },
-  },
-  datetime: {
-    ...BasicConfig.widgets.datetime,
-    factory: function DateTimeInput(props) {
-      return (
-        <DateTimePicker
-          onChange={(e) => {
-            props?.setValue(e.format(BasicConfig.widgets.datetime.valueFormat));
-          }}
-          date={dateTime(props?.value).utc()}
-        />
-      );
-    },
-  },
-};
-
-export const settings: Settings = {
-  ...BasicConfig.settings,
-  canRegroup: false,
-  maxNesting: 1,
-  canReorder: false,
-  showNot: false,
-  addRuleLabel: buttonLabels.add,
-  deleteLabel: buttonLabels.remove,
-  renderConjs: function Conjunctions(conjProps) {
-    return (
-      <Select
-        id={conjProps?.id}
-        aria-label="Conjunction"
-        menuShouldPortal
-        options={conjProps?.conjunctionOptions ? Object.keys(conjProps?.conjunctionOptions).map(toOption) : undefined}
-        value={conjProps?.selectedConjunction}
-        onChange={(val) => conjProps?.setConjunction(val.value!)}
-      />
-    );
-  },
-  renderField: function Field(fieldProps) {
-    const fields = fieldProps?.config?.fields || {};
-    return (
-      <Select
-        id={fieldProps?.id}
-        width={25}
-        aria-label="Field"
-        menuShouldPortal
-        options={fieldProps?.items.map((f) => {
-          // @ts-ignore
-          const icon = fields[f.key].mainWidgetProps?.customProps?.icon;
-          return {
-            label: f.label,
-            value: f.key,
-            icon,
-          };
-        })}
-        value={fieldProps?.selectedKey}
-        onChange={(val) => {
-          fieldProps?.setField(val.label!);
-        }}
-      />
-    );
-  },
-  renderButton: function RAQBButton(buttonProps) {
-    return (
-      <Button
-        type="button"
-        title={`${buttonProps?.label} filter`}
-        onClick={buttonProps?.onClick}
-        variant="secondary"
-        size="md"
-        icon={buttonProps?.label === buttonLabels.add ? 'plus' : 'times'}
-      />
-    );
-  },
-  renderOperator: function Operator(operatorProps) {
-    return (
-      <Select
-        options={operatorProps?.items.map((op) => ({ label: op.label, value: op.key }))}
-        aria-label="Operator"
-        menuShouldPortal
-        value={operatorProps?.selectedKey}
-        onChange={(val) => {
-          operatorProps?.setField(val.value || '');
-        }}
-      />
-    );
-  },
-};
-
-// add IN / NOT IN operators to text to support multi-value variables
-const enum Op {
-  IN = 'select_any_in',
-  NOT_IN = 'select_not_any_in',
-}
-// eslint-ignore
-const customOperators = getCustomOperators(BasicConfig) as typeof BasicConfig.operators;
-const textWidget = BasicConfig.types.text.widgets.text;
-const opers = [...(textWidget.operators || []), Op.IN, Op.NOT_IN];
-const customTextWidget = {
-  ...textWidget,
-  operators: opers,
-};
-
-const customTypes = {
-  ...BasicConfig.types,
-  text: {
-    ...BasicConfig.types.text,
-    widgets: {
-      ...BasicConfig.types.text.widgets,
-      text: customTextWidget,
-    },
-  },
-};
-
-export const raqbConfig: Config = {
-  ...BasicConfig,
-  widgets,
-  settings,
-  operators: customOperators as typeof BasicConfig.operators,
-  types: customTypes,
-};
-
-export type { Config };
-
-const noop = () => '';
-
-const isSqlFormatOp = (func: unknown): func is SqlFormatOperator => {
-  return typeof func === 'function';
-};
-
-function getCustomOperators(config: BasicConfig) {
-  const { ...supportedOperators } = config.operators;
-
-  // IN operator expects array, override IN formatter for multi-value variables
-  const sqlFormatInOpOrNoop = () => {
-    const sqlFormatOp = supportedOperators[Op.IN].sqlFormatOp;
-    if (isSqlFormatOp(sqlFormatOp)) {
-      return sqlFormatOp;
-    }
-    return noop;
-  };
-
-  const customSqlInFormatter = (
-    field: string,
-    op: string,
-    value: string | List<string>,
-    valueSrc: ValueSource,
-    valueType: string,
-    opDef: Operator,
-    operatorOptions: AnyObject,
-    fieldDef: SimpleField
-  ) => {
-    return sqlFormatInOpOrNoop()(
-      field,
-      op,
-      splitIfString(value),
-      valueSrc,
-      valueType,
-      opDef,
-      operatorOptions,
-      fieldDef
-    );
-  };
-  // NOT IN operator expects array, override NOT IN formatter for multi-value variables
-  const sqlFormatNotInOpOrNoop = () => {
-    const sqlFormatOp = supportedOperators[Op.NOT_IN].sqlFormatOp;
-    if (isSqlFormatOp(sqlFormatOp)) {
-      return sqlFormatOp;
-    }
-    return noop;
-  };
-
-  const customSqlNotInFormatter = (
-    field: string,
-    op: string,
-    value: string | List<string>,
-    valueSrc: ValueSource,
-    valueType: string,
-    opDef: Operator,
-    operatorOptions: AnyObject,
-    fieldDef: SimpleField
-  ) => {
-    return sqlFormatNotInOpOrNoop()(
-      field,
-      op,
-      splitIfString(value),
-      valueSrc,
-      valueType,
-      opDef,
-      operatorOptions,
-      fieldDef
-    );
-  };
-
-  const customOperators = {
-    ...supportedOperators,
-    [Op.IN]: {
-      ...supportedOperators[Op.IN],
-      sqlFormatOp: customSqlInFormatter,
-    },
-    [Op.NOT_IN]: {
-      ...supportedOperators[Op.NOT_IN],
-      sqlFormatOp: customSqlNotInFormatter,
-    },
-  };
-
-  return customOperators;
-}
-
-// value: string | List<string> but AQB uses a different version of Immutable
-// eslint-ignore
-function splitIfString(value: any) {
-  if (isString(value)) {
-    return value.split(',');
-  }
-  return value;
-}
diff --git a/public/app/features/plugins/sql/index.ts b/public/app/features/plugins/sql/index.ts
deleted file mode 100644
index 195d95f598d5a..0000000000000
--- a/public/app/features/plugins/sql/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './components';
-export * from './types';
diff --git a/public/app/features/plugins/sql/types.ts b/public/app/features/plugins/sql/types.ts
deleted file mode 100644
index 25bc96b3cf7b2..0000000000000
--- a/public/app/features/plugins/sql/types.ts
+++ /dev/null
@@ -1,170 +0,0 @@
-import { JsonTree } from '@react-awesome-query-builder/ui';
-
-import {
-  DataFrame,
-  DataQuery,
-  DataSourceJsonData,
-  MetricFindValue,
-  SelectableValue,
-  TimeRange,
-  toOption as toOptionFromData,
-} from '@grafana/data';
-import { CompletionItemKind, EditorMode, LanguageDefinition } from '@grafana/experimental';
-
-import { QueryWithDefaults } from './defaults';
-import {
-  QueryEditorFunctionExpression,
-  QueryEditorGroupByExpression,
-  QueryEditorPropertyExpression,
-} from './expressions';
-
-export interface SqlQueryForInterpolation {
-  dataset?: string;
-  alias?: string;
-  format?: QueryFormat;
-  rawSql?: string;
-  refId: string;
-  hide?: boolean;
-}
-
-export interface SQLConnectionLimits {
-  maxOpenConns: number;
-  maxIdleConns: number;
-  maxIdleConnsAuto: boolean;
-  connMaxLifetime: number;
-}
-
-export interface SQLOptions extends SQLConnectionLimits, DataSourceJsonData {
-  tlsAuth: boolean;
-  tlsAuthWithCACert: boolean;
-  timezone: string;
-  tlsSkipVerify: boolean;
-  user: string;
-  database: string;
-  url: string;
-  timeInterval: string;
-}
-
-export enum QueryFormat {
-  Timeseries = 'time_series',
-  Table = 'table',
-}
-
-export interface SQLQuery extends DataQuery {
-  alias?: string;
-  format?: QueryFormat;
-  rawSql?: string;
-  dataset?: string;
-  table?: string;
-  sql?: SQLExpression;
-  editorMode?: EditorMode;
-  rawQuery?: boolean;
-}
-
-export interface NameValue {
-  name: string;
-  value: string;
-}
-
-export type SQLFilters = NameValue[];
-
-export interface SQLExpression {
-  columns?: QueryEditorFunctionExpression[];
-  whereJsonTree?: JsonTree;
-  whereString?: string;
-  filters?: SQLFilters;
-  groupBy?: QueryEditorGroupByExpression[];
-  orderBy?: QueryEditorPropertyExpression;
-  orderByDirection?: 'ASC' | 'DESC';
-  limit?: number;
-  offset?: number;
-}
-
-export interface TableSchema {
-  name?: string;
-  schema?: TableFieldSchema[];
-}
-
-export interface TableFieldSchema {
-  name: string;
-  description?: string;
-  type: string;
-  repeated: boolean;
-  schema: TableFieldSchema[];
-}
-
-export interface QueryRowFilter {
-  filter: boolean;
-  group: boolean;
-  order: boolean;
-  preview: boolean;
-}
-
-export const QUERY_FORMAT_OPTIONS = [
-  { label: 'Time series', value: QueryFormat.Timeseries },
-  { label: 'Table', value: QueryFormat.Table },
-];
-
-const backWardToOption = (value: string) => ({ label: value, value });
-
-export const toOption = toOptionFromData ?? backWardToOption;
-
-export interface ResourceSelectorProps {
-  disabled?: boolean;
-  className?: string;
-  applyDefault?: boolean;
-}
-// React Awesome Query builder field types.
-// These are responsible for rendering the correct UI for the field.
-export type RAQBFieldTypes = 'text' | 'number' | 'boolean' | 'datetime' | 'date' | 'time';
-
-export interface SQLSelectableValue extends SelectableValue {
-  type?: string;
-  raqbFieldType?: RAQBFieldTypes;
-}
-
-export interface DB {
-  init?: (datasourceId?: string) => Promise<boolean>;
-  datasets: () => Promise<string[]>;
-  tables: (dataset?: string) => Promise<string[]>;
-  fields: (query: SQLQuery, order?: boolean) => Promise<SQLSelectableValue[]>;
-  validateQuery: (query: SQLQuery, range?: TimeRange) => Promise<ValidationResults>;
-  dsID: () => number;
-  dispose?: (dsID?: string) => void;
-  lookup?: (path?: string) => Promise<Array<{ name: string; completion: string }>>;
-  getEditorLanguageDefinition: () => LanguageDefinition;
-  toRawSql: (query: SQLQuery) => string;
-  functions?: () => string[];
-}
-
-export interface QueryEditorProps {
-  db: DB;
-  query: QueryWithDefaults;
-  onChange: (query: SQLQuery) => void;
-  range?: TimeRange;
-}
-
-export interface ValidationResults {
-  query: SQLQuery;
-  rawSql?: string;
-  error: string;
-  isError: boolean;
-  isValid: boolean;
-  statistics?: {
-    TotalBytesProcessed: number;
-  } | null;
-}
-
-export interface SqlQueryModel {
-  quoteLiteral: (v: string) => string;
-}
-
-export interface ResponseParser {
-  transformMetricFindResponse: (frame: DataFrame) => MetricFindValue[];
-}
-
-export interface MetaDefinition {
-  name: string;
-  completion?: string;
-  kind: CompletionItemKind;
-}
diff --git a/public/app/features/plugins/tests/datasource_srv.test.ts b/public/app/features/plugins/tests/datasource_srv.test.ts
index 0acd249100bf9..f9ec6eba97e0d 100644
--- a/public/app/features/plugins/tests/datasource_srv.test.ts
+++ b/public/app/features/plugins/tests/datasource_srv.test.ts
@@ -5,11 +5,12 @@ import {
   DataSourcePluginMeta,
   ScopedVars,
 } from '@grafana/data';
+import { TemplateSrv } from '@grafana/runtime';
 import { ExpressionDatasourceRef } from '@grafana/runtime/src/utils/DataSourceWithBackend';
 import { DatasourceSrv, getNameOrUid } from 'app/features/plugins/datasource_srv';
 
 // Datasource variable $datasource with current value 'BBB'
-const templateSrv: any = {
+const templateSrv = {
   getVariables: () => [
     {
       type: 'datasource',
@@ -43,7 +44,7 @@ const templateSrv: any = {
     result = result.replace('${datasourceDefault}', 'default');
     return result;
   },
-};
+} as TemplateSrv;
 
 class TestDataSource {
   constructor(public instanceSettings: DataSourceInstanceSettings) {}
@@ -75,7 +76,7 @@ describe('datasource_srv', () => {
       type: 'test-db',
       name: 'mmm',
       uid: 'uid-code-mmm',
-      meta: { metrics: true, annotations: true } as any,
+      meta: { metrics: true, annotations: true },
     },
     '-- Grafana --': {
       type: 'grafana',
@@ -169,7 +170,7 @@ describe('datasource_srv', () => {
       });
 
       it('Can get by variable', async () => {
-        const ds = (await dataSourceSrv.get('${datasource}')) as any;
+        const ds = await dataSourceSrv.get('${datasource}');
         expect(ds.meta).toBe(dataSourceInit.BBB.meta);
 
         const ds2 = await dataSourceSrv.get('${datasource}', { datasource: { text: 'Prom', value: 'uid-code-aaa' } });
diff --git a/public/app/features/plugins/tests/plugin_loader.test.ts b/public/app/features/plugins/tests/plugin_loader.test.ts
index a5800883dcabc..e81e833966a14 100644
--- a/public/app/features/plugins/tests/plugin_loader.test.ts
+++ b/public/app/features/plugins/tests/plugin_loader.test.ts
@@ -10,9 +10,9 @@ jest.mock('app/core/core', () => {
 });
 
 import { AppPluginMeta, PluginMetaInfo, PluginType, AppPlugin } from '@grafana/data';
-import { SystemJS } from '@grafana/runtime';
 
 // Loaded after the `unmock` above
+import { SystemJS } from '../loader/systemjs';
 import { importAppPlugin } from '../plugin_loader';
 
 class MyCustomApp extends AppPlugin {
diff --git a/public/app/features/plugins/utils.ts b/public/app/features/plugins/utils.ts
index c6e1ba8bf5ccf..075fc3c254236 100644
--- a/public/app/features/plugins/utils.ts
+++ b/public/app/features/plugins/utils.ts
@@ -1,4 +1,5 @@
 import { GrafanaPlugin, NavModel, NavModelItem, PanelPluginMeta, PluginType } from '@grafana/data';
+import { createMonitoringLogger } from '@grafana/runtime';
 
 import { importPanelPluginFromMeta } from './importPanelPlugin';
 import { getPluginSettings } from './pluginSettings';
@@ -83,3 +84,5 @@ export function buildPluginSectionNav(
 
   return { main: copiedPluginNavSection, node: activePage ?? copiedPluginNavSection };
 }
+
+export const pluginsLogger = createMonitoringLogger('features.plugins');
diff --git a/public/app/features/profile/ChangePasswordForm.tsx b/public/app/features/profile/ChangePasswordForm.tsx
index 7f63b646ddb1d..a4aa7cd308a8b 100644
--- a/public/app/features/profile/ChangePasswordForm.tsx
+++ b/public/app/features/profile/ChangePasswordForm.tsx
@@ -1,7 +1,12 @@
-import { css } from '@emotion/css';
-import React from 'react';
+import React, { useState } from 'react';
 
-import { Button, Field, Form, HorizontalGroup, LinkButton } from '@grafana/ui';
+import { Button, Field, HorizontalGroup, LinkButton } from '@grafana/ui';
+import { Form } from 'app/core/components/Form/Form';
+import {
+  ValidationLabels,
+  strongPasswordValidations,
+  strongPasswordValidationRegister,
+} from 'app/core/components/ValidationLabels/ValidationLabels';
 import config from 'app/core/config';
 import { t, Trans } from 'app/core/internationalization';
 import { UserDTO } from 'app/types';
@@ -17,6 +22,9 @@ export interface Props {
 }
 
 export const ChangePasswordForm = ({ user, onChangePassword, isSaving }: Props) => {
+  const [displayValidationLabels, setDisplayValidationLabels] = useState(false);
+  const [pristine, setPristine] = useState(true);
+
   const { disableLoginForm } = config;
   const authSource = user.authLabels?.length && user.authLabels[0];
 
@@ -38,85 +46,89 @@ export const ChangePasswordForm = ({ user, onChangePassword, isSaving }: Props)
   }
 
   return (
-    <div
-      className={css`
-        max-width: 400px;
-      `}
-    >
-      <Form onSubmit={onChangePassword}>
-        {({ register, errors, getValues }) => {
-          return (
-            <>
-              <Field
-                label={t('profile.change-password.old-password-label', 'Old password')}
-                invalid={!!errors.oldPassword}
-                error={errors?.oldPassword?.message}
-              >
-                <PasswordField
-                  id="current-password"
-                  autoComplete="current-password"
-                  {...register('oldPassword', {
-                    required: t('profile.change-password.old-password-required', 'Old password is required'),
-                  })}
-                />
-              </Field>
-
-              <Field
-                label={t('profile.change-password.new-password-label', 'New password')}
-                invalid={!!errors.newPassword}
-                error={errors?.newPassword?.message}
-              >
-                <PasswordField
-                  id="new-password"
-                  autoComplete="new-password"
-                  {...register('newPassword', {
-                    required: t('profile.change-password.new-password-required', 'New password is required'),
-                    validate: {
-                      confirm: (v) =>
-                        v === getValues().confirmNew ||
-                        t('profile.change-password.passwords-must-match', 'Passwords must match'),
-                      old: (v) =>
-                        v !== getValues().oldPassword ||
-                        t(
-                          'profile.change-password.new-password-same-as-old',
-                          "New password can't be the same as the old one."
-                        ),
-                    },
-                  })}
-                />
-              </Field>
+    <Form onSubmit={onChangePassword} maxWidth={400}>
+      {({ register, errors, getValues, watch }) => {
+        const newPassword = watch('newPassword');
+        return (
+          <>
+            <Field
+              label={t('profile.change-password.old-password-label', 'Old password')}
+              invalid={!!errors.oldPassword}
+              error={errors?.oldPassword?.message}
+            >
+              <PasswordField
+                id="current-password"
+                autoComplete="current-password"
+                {...register('oldPassword', {
+                  required: t('profile.change-password.old-password-required', 'Old password is required'),
+                })}
+              />
+            </Field>
 
-              <Field
-                label={t('profile.change-password.confirm-password-label', 'Confirm password')}
-                invalid={!!errors.confirmNew}
-                error={errors?.confirmNew?.message}
-              >
-                <PasswordField
-                  id="confirm-new-password"
-                  autoComplete="new-password"
-                  {...register('confirmNew', {
-                    required: t(
-                      'profile.change-password.confirm-password-required',
-                      'New password confirmation is required'
-                    ),
-                    validate: (v) =>
-                      v === getValues().newPassword ||
+            <Field
+              label={t('profile.change-password.new-password-label', 'New password')}
+              invalid={!!errors.newPassword}
+              error={errors?.newPassword?.message}
+            >
+              <PasswordField
+                id="new-password"
+                autoComplete="new-password"
+                onFocus={() => setDisplayValidationLabels(true)}
+                {...register('newPassword', {
+                  onBlur: () => setPristine(false),
+                  required: t('profile.change-password.new-password-required', 'New password is required'),
+                  validate: {
+                    strongPasswordValidationRegister,
+                    confirm: (v) =>
+                      v === getValues().confirmNew ||
                       t('profile.change-password.passwords-must-match', 'Passwords must match'),
-                  })}
-                />
-              </Field>
-              <HorizontalGroup>
-                <Button variant="primary" disabled={isSaving} type="submit">
-                  <Trans i18nKey="profile.change-password.change-password-button">Change Password</Trans>
-                </Button>
-                <LinkButton variant="secondary" href={`${config.appSubUrl}/profile`} fill="outline">
-                  <Trans i18nKey="profile.change-password.cancel-button">Cancel</Trans>
-                </LinkButton>
-              </HorizontalGroup>
-            </>
-          );
-        }}
-      </Form>
-    </div>
+                    old: (v) =>
+                      v !== getValues().oldPassword ||
+                      t(
+                        'profile.change-password.new-password-same-as-old',
+                        "New password can't be the same as the old one."
+                      ),
+                  },
+                })}
+              />
+            </Field>
+            {displayValidationLabels && (
+              <ValidationLabels
+                pristine={pristine}
+                password={newPassword}
+                strongPasswordValidations={strongPasswordValidations}
+              />
+            )}
+            <Field
+              label={t('profile.change-password.confirm-password-label', 'Confirm password')}
+              invalid={!!errors.confirmNew}
+              error={errors?.confirmNew?.message}
+            >
+              <PasswordField
+                id="confirm-new-password"
+                autoComplete="new-password"
+                {...register('confirmNew', {
+                  required: t(
+                    'profile.change-password.confirm-password-required',
+                    'New password confirmation is required'
+                  ),
+                  validate: (v) =>
+                    v === getValues().newPassword ||
+                    t('profile.change-password.passwords-must-match', 'Passwords must match'),
+                })}
+              />
+            </Field>
+            <HorizontalGroup>
+              <Button variant="primary" disabled={isSaving} type="submit">
+                <Trans i18nKey="profile.change-password.change-password-button">Change Password</Trans>
+              </Button>
+              <LinkButton variant="secondary" href={`${config.appSubUrl}/profile`} fill="outline">
+                <Trans i18nKey="profile.change-password.cancel-button">Cancel</Trans>
+              </LinkButton>
+            </HorizontalGroup>
+          </>
+        );
+      }}
+    </Form>
   );
 };
diff --git a/public/app/features/profile/UserOrganizations.tsx b/public/app/features/profile/UserOrganizations.tsx
index 88fae4864a262..6d39fc567e83f 100644
--- a/public/app/features/profile/UserOrganizations.tsx
+++ b/public/app/features/profile/UserOrganizations.tsx
@@ -30,48 +30,46 @@ export class UserOrganizations extends PureComponent<Props> {
           <Trans i18nKey="user-orgs.title">Organizations</Trans>
         </h3>
 
-        <div className="gf-form-group">
-          <table className="filter-table form-inline" data-testid={selectors.components.UserProfile.orgsTable}>
-            <thead>
-              <tr>
-                <th>
-                  <Trans i18nKey="user-orgs.name-column">Name</Trans>
-                </th>
-                <th>
-                  <Trans i18nKey="user-orgs.role-column">Role</Trans>
-                </th>
-                <th />
-              </tr>
-            </thead>
-            <tbody>
-              {orgs.map((org: UserOrg, index) => {
-                return (
-                  <tr key={index}>
-                    <td>{org.name}</td>
-                    <td>{org.role}</td>
-                    <td className="text-right">
-                      {org.orgId === user?.orgId ? (
-                        <Button variant="secondary" size="sm" disabled>
-                          <Trans i18nKey="user-orgs.current-org-button">Current</Trans>
-                        </Button>
-                      ) : (
-                        <Button
-                          variant="secondary"
-                          size="sm"
-                          onClick={() => {
-                            this.props.setUserOrg(org);
-                          }}
-                        >
-                          <Trans i18nKey="user-orgs.select-org-button">Select organisation</Trans>
-                        </Button>
-                      )}
-                    </td>
-                  </tr>
-                );
-              })}
-            </tbody>
-          </table>
-        </div>
+        <table className="filter-table form-inline" data-testid={selectors.components.UserProfile.orgsTable}>
+          <thead>
+            <tr>
+              <th>
+                <Trans i18nKey="user-orgs.name-column">Name</Trans>
+              </th>
+              <th>
+                <Trans i18nKey="user-orgs.role-column">Role</Trans>
+              </th>
+              <th />
+            </tr>
+          </thead>
+          <tbody>
+            {orgs.map((org: UserOrg, index) => {
+              return (
+                <tr key={index}>
+                  <td>{org.name}</td>
+                  <td>{org.role}</td>
+                  <td className="text-right">
+                    {org.orgId === user?.orgId ? (
+                      <Button variant="secondary" size="sm" disabled>
+                        <Trans i18nKey="user-orgs.current-org-button">Current</Trans>
+                      </Button>
+                    ) : (
+                      <Button
+                        variant="secondary"
+                        size="sm"
+                        onClick={() => {
+                          this.props.setUserOrg(org);
+                        }}
+                      >
+                        <Trans i18nKey="user-orgs.select-org-button">Select organisation</Trans>
+                      </Button>
+                    )}
+                  </td>
+                </tr>
+              );
+            })}
+          </tbody>
+        </table>
       </div>
     );
   }
diff --git a/public/app/features/profile/UserProfileEditForm.tsx b/public/app/features/profile/UserProfileEditForm.tsx
index 371a0a0f57854..dcde61b119906 100644
--- a/public/app/features/profile/UserProfileEditForm.tsx
+++ b/public/app/features/profile/UserProfileEditForm.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 
 import { selectors } from '@grafana/e2e-selectors';
-import { Button, Field, FieldSet, Form, Icon, Input, Tooltip } from '@grafana/ui';
+import { Button, Field, FieldSet, Icon, Input, Tooltip } from '@grafana/ui';
+import { Form } from 'app/core/components/Form/Form';
 import config from 'app/core/config';
 import { t, Trans } from 'app/core/internationalization';
 import { UserDTO } from 'app/types';
diff --git a/public/app/features/profile/UserProfileEditPage.test.tsx b/public/app/features/profile/UserProfileEditPage.test.tsx
index 18a744eb2c0ac..1f69b45c495df 100644
--- a/public/app/features/profile/UserProfileEditPage.test.tsx
+++ b/public/app/features/profile/UserProfileEditPage.test.tsx
@@ -2,8 +2,10 @@ import { render, screen, waitFor, within } from '@testing-library/react';
 import userEvent, { PointerEventsCheckLevel } from '@testing-library/user-event';
 import React from 'react';
 
-import { OrgRole } from '@grafana/data';
+import { OrgRole, PluginExtensionComponent, PluginExtensionTypes } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
+import { setPluginExtensionGetter, GetPluginExtensions } from '@grafana/runtime';
+import * as useQueryParams from 'app/core/hooks/useQueryParams';
 
 import { TestProvider } from '../../../test/helpers/TestProvider';
 import { backendSrv } from '../../core/services/backend_srv';
@@ -13,6 +15,13 @@ import { getMockTeam } from '../teams/__mocks__/teamMocks';
 import { Props, UserProfileEditPage } from './UserProfileEditPage';
 import { initialUserState } from './state/reducers';
 
+const mockUseQueryParams = useQueryParams as { useQueryParams: typeof useQueryParams.useQueryParams };
+
+jest.mock('app/core/hooks/useQueryParams', () => ({
+  __esModule: true,
+  useQueryParams: () => [{}],
+}));
+
 const defaultProps: Props = {
   ...initialUserState,
   user: {
@@ -91,10 +100,69 @@ function getSelectors() {
       within(sessionsTable()).getByRole('row', {
         name: /now January 1, 2021 localhost chrome on mac os x 11/i,
       }),
+    /**
+     * using queryByTestId instead of getByTestId because the tabs are not always rendered
+     * and getByTestId throws an TestingLibraryElementError error if the element is not found
+     * whereas queryByTestId returns null if the element is not found. There are some test cases
+     * where we'd explicitly like to assert that the tabs are not rendered.
+     */
+    extensionPointTabs: () => screen.queryByTestId(selectors.components.UserProfile.extensionPointTabs),
+    /**
+     * here lets use getByTestId because a specific tab should always be rendered within the tabs container
+     */
+    extensionPointTab: (tabId: string) =>
+      within(screen.getByTestId(selectors.components.UserProfile.extensionPointTabs)).getByTestId(
+        selectors.components.UserProfile.extensionPointTab(tabId)
+      ),
   };
 }
 
-async function getTestContext(overrides: Partial<Props> = {}) {
+enum ExtensionPointComponentId {
+  One = '1',
+  Two = '2',
+  Three = '3',
+}
+
+enum ExtensionPointComponentTabs {
+  One = '1',
+  Two = '2',
+}
+
+const _createTabName = (tab: ExtensionPointComponentTabs) => `Tab ${tab}`;
+const _createTabContent = (tabId: ExtensionPointComponentId) => `this is settings for component ${tabId}`;
+
+const generalTabName = 'General';
+const tabOneName = _createTabName(ExtensionPointComponentTabs.One);
+const tabTwoName = _createTabName(ExtensionPointComponentTabs.Two);
+
+const _createPluginExtensionPointComponent = (
+  id: ExtensionPointComponentId,
+  tab: ExtensionPointComponentTabs
+): PluginExtensionComponent => ({
+  id,
+  type: PluginExtensionTypes.component,
+  title: _createTabName(tab),
+  description: '', // description isn't used here..
+  component: () => <p>{_createTabContent(id)}</p>,
+  pluginId: 'grafana-plugin',
+});
+
+const PluginExtensionPointComponent1 = _createPluginExtensionPointComponent(
+  ExtensionPointComponentId.One,
+  ExtensionPointComponentTabs.One
+);
+const PluginExtensionPointComponent2 = _createPluginExtensionPointComponent(
+  ExtensionPointComponentId.Two,
+  ExtensionPointComponentTabs.One
+);
+const PluginExtensionPointComponent3 = _createPluginExtensionPointComponent(
+  ExtensionPointComponentId.Three,
+  ExtensionPointComponentTabs.Two
+);
+
+async function getTestContext(overrides: Partial<Props & { extensions: PluginExtensionComponent[] }> = {}) {
+  const extensions = overrides.extensions || [];
+
   jest.clearAllMocks();
   const putSpy = jest.spyOn(backendSrv, 'put');
   const getSpy = jest
@@ -102,6 +170,10 @@ async function getTestContext(overrides: Partial<Props> = {}) {
     .mockResolvedValue({ timezone: 'UTC', homeDashboardUID: 'home-dashboard', theme: 'dark' });
   const searchSpy = jest.spyOn(backendSrv, 'search').mockResolvedValue([]);
 
+  const getter: GetPluginExtensions<PluginExtensionComponent> = jest.fn().mockReturnValue({ extensions });
+
+  setPluginExtensionGetter(getter);
+
   const props = { ...defaultProps, ...overrides };
   const { rerender } = render(
     <TestProvider>
@@ -254,5 +326,73 @@ describe('UserProfileEditPage', () => {
         expect(props.revokeUserSession).toHaveBeenCalledWith(0);
       });
     });
+
+    describe('and a plugin registers a component against the user profile settings extension point', () => {
+      const extensions = [
+        PluginExtensionPointComponent1,
+        PluginExtensionPointComponent2,
+        PluginExtensionPointComponent3,
+      ];
+
+      it('should not show tabs when no components are registered', async () => {
+        await getTestContext();
+        const { extensionPointTabs } = getSelectors();
+        expect(extensionPointTabs()).not.toBeInTheDocument();
+      });
+
+      it('should group registered components into tabs', async () => {
+        await getTestContext({ extensions });
+        const { extensionPointTabs, extensionPointTab } = getSelectors();
+
+        const _assertTab = (tabId: string, isDefault = false) => {
+          const tab = extensionPointTab(tabId);
+          expect(tab).toBeInTheDocument();
+          expect(tab).toHaveAttribute('aria-selected', isDefault.toString());
+        };
+
+        expect(extensionPointTabs()).toBeInTheDocument();
+        _assertTab(generalTabName.toLowerCase(), true);
+        _assertTab(tabOneName.toLowerCase());
+        _assertTab(tabTwoName.toLowerCase());
+      });
+
+      it('should change the active tab when a tab is clicked and update the "tab" query param', async () => {
+        const mockUpdateQueryParams = jest.fn();
+        mockUseQueryParams.useQueryParams = () => [{}, mockUpdateQueryParams];
+
+        await getTestContext({ extensions });
+        const { extensionPointTab } = getSelectors();
+
+        /**
+         * Tab one has two extension components registered against it, they'll both be registered in the same tab
+         * Tab two only has one extension component registered against it.
+         */
+        const tabOneContent1 = _createTabContent(ExtensionPointComponentId.One);
+        const tabOneContent2 = _createTabContent(ExtensionPointComponentId.Two);
+        const tabTwoContent = _createTabContent(ExtensionPointComponentId.Three);
+
+        // "General" should be the default content
+        expect(screen.queryByText(tabOneContent1)).toBeNull();
+        expect(screen.queryByText(tabOneContent2)).toBeNull();
+        expect(screen.queryByText(tabTwoContent)).toBeNull();
+
+        await userEvent.click(extensionPointTab(tabOneName.toLowerCase()));
+
+        expect(mockUpdateQueryParams).toHaveBeenCalledTimes(1);
+        expect(mockUpdateQueryParams).toHaveBeenCalledWith({ tab: tabOneName.toLowerCase() });
+        expect(screen.queryByText(tabOneContent1)).not.toBeNull();
+        expect(screen.queryByText(tabOneContent2)).not.toBeNull();
+        expect(screen.queryByText(tabTwoContent)).toBeNull();
+
+        mockUpdateQueryParams.mockClear();
+        await userEvent.click(extensionPointTab(tabTwoName.toLowerCase()));
+
+        expect(mockUpdateQueryParams).toHaveBeenCalledTimes(1);
+        expect(mockUpdateQueryParams).toHaveBeenCalledWith({ tab: tabTwoName.toLowerCase() });
+        expect(screen.queryByText(tabOneContent1)).toBeNull();
+        expect(screen.queryByText(tabOneContent2)).toBeNull();
+        expect(screen.queryByText(tabTwoContent)).not.toBeNull();
+      });
+    });
   });
 });
diff --git a/public/app/features/profile/UserProfileEditPage.tsx b/public/app/features/profile/UserProfileEditPage.tsx
index 82ceabbab4368..ffb9c64b00c8f 100644
--- a/public/app/features/profile/UserProfileEditPage.tsx
+++ b/public/app/features/profile/UserProfileEditPage.tsx
@@ -1,10 +1,15 @@
-import React from 'react';
+import React, { useMemo, useState } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 import { useMount } from 'react-use';
 
-import { VerticalGroup } from '@grafana/ui';
+import { PluginExtensionComponent, PluginExtensionPoints } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { getPluginComponentExtensions } from '@grafana/runtime';
+import { Tab, TabsBar, TabContent, VerticalGroup, Stack } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import SharedPreferences from 'app/core/components/SharedPreferences/SharedPreferences';
+import { useQueryParams } from 'app/core/hooks/useQueryParams';
+import { t } from 'app/core/internationalization';
 import { StoreState } from 'app/types';
 
 import UserOrganizations from './UserOrganizations';
@@ -13,6 +18,14 @@ import UserSessions from './UserSessions';
 import { UserTeams } from './UserTeams';
 import { changeUserOrg, initUserProfilePage, revokeUserSession, updateUserProfile } from './state/actions';
 
+const TAB_QUERY_PARAM = 'tab';
+const GENERAL_SETTINGS_TAB = 'general';
+
+type TabInfo = {
+  id: string;
+  title: string;
+};
+
 export interface OwnProps {}
 
 function mapStateToProps(state: StoreState) {
@@ -55,19 +68,104 @@ export function UserProfileEditPage({
   changeUserOrg,
   updateUserProfile,
 }: Props) {
+  const [queryParams, updateQueryParams] = useQueryParams();
+  const tabQueryParam = queryParams[TAB_QUERY_PARAM];
+  const [activeTab, setActiveTab] = useState<string>(
+    typeof tabQueryParam === 'string' ? tabQueryParam : GENERAL_SETTINGS_TAB
+  );
+
   useMount(() => initUserProfilePage());
 
+  const extensionComponents = useMemo(() => {
+    const { extensions } = getPluginComponentExtensions({
+      extensionPointId: PluginExtensionPoints.UserProfileTab,
+    });
+
+    return extensions;
+  }, []);
+
+  const groupedExtensionComponents = extensionComponents.reduce<Record<string, PluginExtensionComponent[]>>(
+    (acc, extension) => {
+      const { title } = extension;
+      if (acc[title]) {
+        acc[title].push(extension);
+      } else {
+        acc[title] = [extension];
+      }
+      return acc;
+    },
+    {}
+  );
+
+  const convertExtensionComponentTitleToTabId = (title: string) => title.toLowerCase();
+
+  const showTabs = extensionComponents.length > 0;
+  const tabs: TabInfo[] = [
+    {
+      id: GENERAL_SETTINGS_TAB,
+      title: t('user-profile.tabs.general', 'General'),
+    },
+    ...Object.keys(groupedExtensionComponents).map((title) => ({
+      id: convertExtensionComponentTitleToTabId(title),
+      title,
+    })),
+  ];
+
+  const UserProfile = () => (
+    <VerticalGroup spacing="md">
+      <UserProfileEditForm updateProfile={updateUserProfile} isSavingUser={isUpdating} user={user} />
+      <SharedPreferences resourceUri="user" preferenceType="user" />
+      <Stack direction="column" gap={6}>
+        <UserTeams isLoading={teamsAreLoading} teams={teams} />
+        <UserOrganizations isLoading={orgsAreLoading} setUserOrg={changeUserOrg} orgs={orgs} user={user} />
+        <UserSessions isLoading={sessionsAreLoading} revokeUserSession={revokeUserSession} sessions={sessions} />
+      </Stack>
+    </VerticalGroup>
+  );
+
+  const UserProfileWithTabs = () => (
+    <div data-testid={selectors.components.UserProfile.extensionPointTabs}>
+      <Stack direction="column" gap={2}>
+        <TabsBar>
+          {tabs.map(({ id, title }) => {
+            return (
+              <Tab
+                key={id}
+                label={title}
+                active={activeTab === id}
+                onChangeTab={() => {
+                  setActiveTab(id);
+                  updateQueryParams({ [TAB_QUERY_PARAM]: id });
+                }}
+                data-testid={selectors.components.UserProfile.extensionPointTab(id)}
+              />
+            );
+          })}
+        </TabsBar>
+        <TabContent>
+          {activeTab === GENERAL_SETTINGS_TAB && <UserProfile />}
+          {Object.entries(groupedExtensionComponents).map(([title, pluginExtensionComponents]) => {
+            const tabId = convertExtensionComponentTitleToTabId(title);
+
+            if (activeTab === tabId) {
+              return (
+                <React.Fragment key={tabId}>
+                  {pluginExtensionComponents.map(({ component: Component }, index) => (
+                    <Component key={`${tabId}-${index}`} />
+                  ))}
+                </React.Fragment>
+              );
+            }
+            return null;
+          })}
+        </TabContent>
+      </Stack>
+    </div>
+  );
+
   return (
     <Page navId="profile/settings">
-      <Page.Contents isLoading={!user}>
-        <VerticalGroup spacing="md">
-          <UserProfileEditForm updateProfile={updateUserProfile} isSavingUser={isUpdating} user={user} />
-          <SharedPreferences resourceUri="user" preferenceType="user" />
-          <UserTeams isLoading={teamsAreLoading} teams={teams} />
-          <UserOrganizations isLoading={orgsAreLoading} setUserOrg={changeUserOrg} orgs={orgs} user={user} />
-          <UserSessions isLoading={sessionsAreLoading} revokeUserSession={revokeUserSession} sessions={sessions} />
-        </VerticalGroup>
-      </Page.Contents>
+      <Page.Contents isLoading={!user}>{showTabs ? <UserProfileWithTabs /> : <UserProfile />}</Page.Contents>
     </Page>
   );
 }
diff --git a/public/app/features/profile/UserSessions.tsx b/public/app/features/profile/UserSessions.tsx
index 107d3c636ed4d..ec9dbb034e7e8 100644
--- a/public/app/features/profile/UserSessions.tsx
+++ b/public/app/features/profile/UserSessions.tsx
@@ -1,4 +1,4 @@
-import { css, cx } from '@emotion/css';
+import { css } from '@emotion/css';
 import { t } from 'i18next';
 import React, { PureComponent } from 'react';
 
@@ -27,50 +27,48 @@ class UserSessions extends PureComponent<Props> {
         {sessions.length > 0 && (
           <>
             <h3 className="page-sub-heading">Sessions</h3>
-            <div className={cx('gf-form-group', styles.table)}>
-              <table className="filter-table form-inline" data-testid={selectors.components.UserProfile.sessionsTable}>
-                <thead>
-                  <tr>
-                    <th>
-                      <Trans i18nKey="user-session.seen-at-column">Last seen</Trans>
-                    </th>
-                    <th>
-                      <Trans i18nKey="user-session.created-at-column">Logged on</Trans>
-                    </th>
-                    <th>
-                      <Trans i18nKey="user-session.ip-column">IP address</Trans>
-                    </th>
-                    <th>
-                      <Trans i18nKey="user-session.browser-column">Browser & OS</Trans>
-                    </th>
-                    <th></th>
-                  </tr>
-                </thead>
+            <table className="filter-table form-inline" data-testid={selectors.components.UserProfile.sessionsTable}>
+              <thead>
+                <tr>
+                  <th>
+                    <Trans i18nKey="user-session.seen-at-column">Last seen</Trans>
+                  </th>
+                  <th>
+                    <Trans i18nKey="user-session.created-at-column">Logged on</Trans>
+                  </th>
+                  <th>
+                    <Trans i18nKey="user-session.ip-column">IP address</Trans>
+                  </th>
+                  <th>
+                    <Trans i18nKey="user-session.browser-column">Browser & OS</Trans>
+                  </th>
+                  <th></th>
+                </tr>
+              </thead>
 
-                <tbody>
-                  {sessions.map((session: UserSession, index) => (
-                    <tr key={index}>
-                      {session.isActive ? <td>Now</td> : <td>{session.seenAt}</td>}
-                      <td>{i18nDate(session.createdAt, { dateStyle: 'long' })}</td>
-                      <td>{session.clientIp}</td>
-                      <td>
-                        {session.browser} on {session.os} {session.osVersion}
-                      </td>
-                      <td>
-                        <Button
-                          size="sm"
-                          variant="destructive"
-                          onClick={() => revokeUserSession(session.id)}
-                          aria-label={t('user-session.revoke', 'Revoke user session')}
-                        >
-                          <Icon name="power" />
-                        </Button>
-                      </td>
-                    </tr>
-                  ))}
-                </tbody>
-              </table>
-            </div>
+              <tbody>
+                {sessions.map((session: UserSession, index) => (
+                  <tr key={index}>
+                    {session.isActive ? <td>Now</td> : <td>{session.seenAt}</td>}
+                    <td>{i18nDate(session.createdAt, { dateStyle: 'long' })}</td>
+                    <td>{session.clientIp}</td>
+                    <td>
+                      {session.browser} on {session.os} {session.osVersion}
+                    </td>
+                    <td>
+                      <Button
+                        size="sm"
+                        variant="destructive"
+                        onClick={() => revokeUserSession(session.id)}
+                        aria-label={t('user-session.revoke', 'Revoke user session')}
+                      >
+                        <Icon name="power" />
+                      </Button>
+                    </td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
           </>
         )}
       </div>
@@ -82,9 +80,6 @@ const getStyles = () => ({
   wrapper: css({
     maxWidth: '100%',
   }),
-  table: css({
-    overflow: 'auto',
-  }),
 });
 
 export default UserSessions;
diff --git a/public/app/features/profile/UserTeams.tsx b/public/app/features/profile/UserTeams.tsx
index a8af0342f8daf..75239994c1cbd 100644
--- a/public/app/features/profile/UserTeams.tsx
+++ b/public/app/features/profile/UserTeams.tsx
@@ -23,32 +23,30 @@ export class UserTeams extends PureComponent<Props> {
     return (
       <div>
         <h3 className="page-sub-heading">Teams</h3>
-        <div className="gf-form-group">
-          <table className="filter-table form-inline" aria-label="User teams table">
-            <thead>
-              <tr>
-                <th />
-                <th>Name</th>
-                <th>Email</th>
-                <th>Members</th>
-              </tr>
-            </thead>
-            <tbody>
-              {teams.map((team: Team, index) => {
-                return (
-                  <tr key={index}>
-                    <td className="width-4 text-center">
-                      <img className="filter-table__avatar" src={team.avatarUrl} alt="" />
-                    </td>
-                    <td>{team.name}</td>
-                    <td>{team.email}</td>
-                    <td>{team.memberCount}</td>
-                  </tr>
-                );
-              })}
-            </tbody>
-          </table>
-        </div>
+        <table className="filter-table form-inline" aria-label="User teams table">
+          <thead>
+            <tr>
+              <th />
+              <th>Name</th>
+              <th>Email</th>
+              <th>Members</th>
+            </tr>
+          </thead>
+          <tbody>
+            {teams.map((team: Team, index) => {
+              return (
+                <tr key={index}>
+                  <td className="width-4 text-center">
+                    <img className="filter-table__avatar" src={team.avatarUrl} alt="" />
+                  </td>
+                  <td>{team.name}</td>
+                  <td>{team.email}</td>
+                  <td>{team.memberCount}</td>
+                </tr>
+              );
+            })}
+          </tbody>
+        </table>
       </div>
     );
   }
diff --git a/public/app/features/query/components/QueryEditorRow.test.ts b/public/app/features/query/components/QueryEditorRow.test.ts
deleted file mode 100644
index 1c7eb61f3932a..0000000000000
--- a/public/app/features/query/components/QueryEditorRow.test.ts
+++ /dev/null
@@ -1,221 +0,0 @@
-import { render, screen } from '@testing-library/react';
-
-import { DataQueryRequest, dateTime, LoadingState, PanelData, toDataFrame } from '@grafana/data';
-
-import { filterPanelDataToQuery, QueryEditorRow } from './QueryEditorRow';
-
-function makePretendRequest(requestId: string, subRequests?: DataQueryRequest[]): DataQueryRequest {
-  return {
-    requestId,
-    // subRequests,
-  } as DataQueryRequest;
-}
-
-describe('filterPanelDataToQuery', () => {
-  const data: PanelData = {
-    state: LoadingState.Done,
-    series: [
-      toDataFrame({ refId: 'A', fields: [{ name: 'AAA' }], meta: {} }),
-      toDataFrame({ refId: 'B', fields: [{ name: 'B111' }], meta: {} }),
-      toDataFrame({ refId: 'B', fields: [{ name: 'B222' }], meta: {} }),
-      toDataFrame({ refId: 'B', fields: [{ name: 'B333' }], meta: {} }),
-      toDataFrame({ refId: 'C', fields: [{ name: 'CCCC' }], meta: { requestId: 'sub3' } }),
-    ],
-    errors: [
-      {
-        refId: 'B',
-        message: 'Error!!',
-      },
-    ],
-    request: makePretendRequest('111', [
-      makePretendRequest('sub1'),
-      makePretendRequest('sub2'),
-      makePretendRequest('sub3'),
-    ]),
-    timeRange: { from: dateTime(), to: dateTime(), raw: { from: 'now-1d', to: 'now' } },
-  };
-
-  it('should not have an error unless the refId matches', () => {
-    const panelData = filterPanelDataToQuery(data, 'A');
-    expect(panelData?.series.length).toBe(1);
-    expect(panelData?.series[0].refId).toBe('A');
-    expect(panelData?.error).toBeUndefined();
-    expect(panelData?.errors).toBeUndefined();
-  });
-
-  it('should match the error to the query', () => {
-    const panelData = filterPanelDataToQuery(data, 'B');
-    expect(panelData?.series.length).toBe(3);
-    expect(panelData?.series[0].refId).toBe('B');
-    expect(panelData?.error!.refId).toBe('B');
-    expect(panelData?.errors![0].refId).toBe('B');
-  });
-
-  it('should include errors when missing data', () => {
-    const withError = {
-      series: [],
-      error: {
-        message: 'Error!!',
-      },
-      errors: [{ message: 'Error!!' }],
-    } as unknown as PanelData;
-
-    const panelData = filterPanelDataToQuery(withError, 'B');
-    expect(panelData).toBeDefined();
-    expect(panelData?.state).toBe(LoadingState.Error);
-    expect(panelData?.error).toBe(withError.error);
-    expect(panelData?.errors).toEqual(withError.errors);
-  });
-
-  it('should set the state to done if the frame has no errors', () => {
-    const withError = {
-      ...data,
-    };
-    withError.state = LoadingState.Error;
-
-    const panelDataB = filterPanelDataToQuery(withError, 'B');
-    expect(panelDataB?.series.length).toBe(3);
-    expect(panelDataB?.series[0].refId).toBe('B');
-    expect(panelDataB?.state).toBe(LoadingState.Error);
-
-    const panelDataA = filterPanelDataToQuery(withError, 'A');
-    expect(panelDataA?.series.length).toBe(1);
-    expect(panelDataA?.series[0].refId).toBe('A');
-    expect(panelDataA?.state).toBe(LoadingState.Done);
-  });
-
-  it('should return error for query that returns no data, but another query does return data', () => {
-    const withError = {
-      ...data,
-      state: LoadingState.Error,
-      error: {
-        message: 'Sad',
-        refId: 'Q',
-      },
-    };
-
-    const panelDataB = filterPanelDataToQuery(withError, 'Q');
-    expect(panelDataB?.series.length).toBe(0);
-    expect(panelDataB?.error?.refId).toBe('Q');
-    expect(panelDataB?.errors![0].refId).toBe('Q');
-  });
-
-  it('should not set the state to done if the frame is loading and has no errors', () => {
-    const loadingData: PanelData = {
-      state: LoadingState.Loading,
-      series: [
-        toDataFrame({ refId: 'A', fields: [{ name: 'AAA' }], meta: {} }),
-        toDataFrame({ refId: 'B', fields: [{ name: 'B111' }], meta: {} }),
-      ],
-      timeRange: { from: dateTime(), to: dateTime(), raw: { from: 'now-1d', to: 'now' } },
-    };
-
-    const panelDataB = filterPanelDataToQuery(loadingData, 'B');
-    expect(panelDataB?.state).toBe(LoadingState.Loading);
-
-    const panelDataA = filterPanelDataToQuery(loadingData, 'A');
-    expect(panelDataA?.state).toBe(LoadingState.Loading);
-  });
-  it('should keep the state in loading until all queries are finished, even if the current query has errored', () => {
-    const loadingData: PanelData = {
-      state: LoadingState.Loading,
-      series: [],
-      error: {
-        refId: 'A',
-        message: 'Error',
-      },
-      timeRange: { from: dateTime(), to: dateTime(), raw: { from: 'now-1d', to: 'now' } },
-    };
-
-    const panelDataA = filterPanelDataToQuery(loadingData, 'A');
-    expect(panelDataA?.state).toBe(LoadingState.Loading);
-  });
-  it('should keep the state in loading until all queries are finished, if another query has errored', () => {
-    const loadingData: PanelData = {
-      state: LoadingState.Loading,
-      series: [],
-      error: {
-        refId: 'B',
-        message: 'Error',
-      },
-      timeRange: { from: dateTime(), to: dateTime(), raw: { from: 'now-1d', to: 'now' } },
-    };
-
-    const panelDataA = filterPanelDataToQuery(loadingData, 'A');
-    expect(panelDataA?.state).toBe(LoadingState.Loading);
-  });
-});
-
-describe('frame results with warnings', () => {
-  const meta = {
-    notices: [
-      {
-        severity: 'warning',
-        text: 'Reduce operation is not needed. Input query or expression A is already reduced data.',
-      },
-    ],
-  };
-
-  const dataWithWarnings: PanelData = {
-    state: LoadingState.Done,
-    series: [
-      toDataFrame({
-        refId: 'B',
-        fields: [{ name: 'B1' }],
-        meta,
-      }),
-      toDataFrame({
-        refId: 'B',
-        fields: [{ name: 'B2' }],
-        meta,
-      }),
-    ],
-    timeRange: { from: dateTime(), to: dateTime(), raw: { from: 'now-1d', to: 'now' } },
-  };
-
-  const dataWithoutWarnings: PanelData = {
-    state: LoadingState.Done,
-    series: [
-      toDataFrame({
-        refId: 'B',
-        fields: [{ name: 'B1' }],
-        meta: {},
-      }),
-      toDataFrame({
-        refId: 'B',
-        fields: [{ name: 'B2' }],
-        meta: {},
-      }),
-    ],
-    timeRange: { from: dateTime(), to: dateTime(), raw: { from: 'now-1d', to: 'now' } },
-  };
-
-  it('should show a warning badge and de-duplicate warning messages', () => {
-    // @ts-ignore: there are _way_ too many props to inject here :(
-    const editorRow = new QueryEditorRow({
-      data: dataWithWarnings,
-      query: {
-        refId: 'B',
-      },
-    });
-
-    const warningsComponent = editorRow.renderWarnings();
-    expect(warningsComponent).not.toBe(null);
-
-    render(warningsComponent!);
-    expect(screen.getByText('1 warning')).toBeInTheDocument();
-  });
-
-  it('should not show a warning badge when there are no warnings', () => {
-    // @ts-ignore: there are _way_ too many props to inject here :(
-    const editorRow = new QueryEditorRow({
-      data: dataWithoutWarnings,
-      query: {
-        refId: 'B',
-      },
-    });
-
-    const warningsComponent = editorRow.renderWarnings();
-    expect(warningsComponent).toBe(null);
-  });
-});
diff --git a/public/app/features/query/components/QueryEditorRow.test.tsx b/public/app/features/query/components/QueryEditorRow.test.tsx
new file mode 100644
index 0000000000000..42e98252b9a30
--- /dev/null
+++ b/public/app/features/query/components/QueryEditorRow.test.tsx
@@ -0,0 +1,291 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import React, { PropsWithChildren } from 'react';
+
+import { DataQueryRequest, dateTime, LoadingState, PanelData, toDataFrame } from '@grafana/data';
+import { DataQuery } from '@grafana/schema';
+import { mockDataSource } from 'app/features/alerting/unified/mocks';
+
+import { DataSourceType } from '../../alerting/unified/utils/datasource';
+
+import { filterPanelDataToQuery, Props, QueryEditorRow } from './QueryEditorRow';
+
+const mockDS = mockDataSource({
+  name: 'test',
+  type: DataSourceType.Alertmanager,
+});
+jest.mock('@grafana/runtime/src/services/dataSourceSrv', () => {
+  return {
+    getDataSourceSrv: () => ({
+      get: () => Promise.resolve(mockDS),
+      getList: () => {},
+      getInstanceSettings: () => mockDS,
+    }),
+  };
+});
+// Draggable fails to render in tests, so we mock it out
+jest.mock('app/core/components/QueryOperationRow/QueryOperationRow', () => ({
+  QueryOperationRow: (props: PropsWithChildren) => <div>{props.children}</div>,
+}));
+
+function makePretendRequest(requestId: string, subRequests?: DataQueryRequest[]): DataQueryRequest {
+  return {
+    requestId,
+    // subRequests,
+  } as DataQueryRequest;
+}
+
+describe('filterPanelDataToQuery', () => {
+  const data: PanelData = {
+    state: LoadingState.Done,
+    series: [
+      toDataFrame({ refId: 'A', fields: [{ name: 'AAA' }], meta: {} }),
+      toDataFrame({ refId: 'B', fields: [{ name: 'B111' }], meta: {} }),
+      toDataFrame({ refId: 'B', fields: [{ name: 'B222' }], meta: {} }),
+      toDataFrame({ refId: 'B', fields: [{ name: 'B333' }], meta: {} }),
+      toDataFrame({ refId: 'C', fields: [{ name: 'CCCC' }], meta: { requestId: 'sub3' } }),
+    ],
+    errors: [
+      {
+        refId: 'B',
+        message: 'Error!!',
+      },
+    ],
+    request: makePretendRequest('111', [
+      makePretendRequest('sub1'),
+      makePretendRequest('sub2'),
+      makePretendRequest('sub3'),
+    ]),
+    timeRange: { from: dateTime(), to: dateTime(), raw: { from: 'now-1d', to: 'now' } },
+  };
+
+  it('should not have an error unless the refId matches', () => {
+    const panelData = filterPanelDataToQuery(data, 'A');
+    expect(panelData?.series.length).toBe(1);
+    expect(panelData?.series[0].refId).toBe('A');
+    expect(panelData?.error).toBeUndefined();
+    expect(panelData?.errors).toBeUndefined();
+  });
+
+  it('should match the error to the query', () => {
+    const panelData = filterPanelDataToQuery(data, 'B');
+    expect(panelData?.series.length).toBe(3);
+    expect(panelData?.series[0].refId).toBe('B');
+    expect(panelData?.error!.refId).toBe('B');
+    expect(panelData?.errors![0].refId).toBe('B');
+  });
+
+  it('should include errors when missing data', () => {
+    const withError = {
+      series: [],
+      error: {
+        message: 'Error!!',
+      },
+      errors: [{ message: 'Error!!' }],
+    } as unknown as PanelData;
+
+    const panelData = filterPanelDataToQuery(withError, 'B');
+    expect(panelData).toBeDefined();
+    expect(panelData?.state).toBe(LoadingState.Error);
+    expect(panelData?.error).toBe(withError.error);
+    expect(panelData?.errors).toEqual(withError.errors);
+  });
+
+  it('should set the state to done if the frame has no errors', () => {
+    const withError = {
+      ...data,
+    };
+    withError.state = LoadingState.Error;
+
+    const panelDataB = filterPanelDataToQuery(withError, 'B');
+    expect(panelDataB?.series.length).toBe(3);
+    expect(panelDataB?.series[0].refId).toBe('B');
+    expect(panelDataB?.state).toBe(LoadingState.Error);
+
+    const panelDataA = filterPanelDataToQuery(withError, 'A');
+    expect(panelDataA?.series.length).toBe(1);
+    expect(panelDataA?.series[0].refId).toBe('A');
+    expect(panelDataA?.state).toBe(LoadingState.Done);
+  });
+
+  it('should return error for query that returns no data, but another query does return data', () => {
+    const withError = {
+      ...data,
+      state: LoadingState.Error,
+      error: {
+        message: 'Sad',
+        refId: 'Q',
+      },
+    };
+
+    const panelDataB = filterPanelDataToQuery(withError, 'Q');
+    expect(panelDataB?.series.length).toBe(0);
+    expect(panelDataB?.error?.refId).toBe('Q');
+    expect(panelDataB?.errors![0].refId).toBe('Q');
+  });
+
+  it('should not set the state to done if the frame is loading and has no errors', () => {
+    const loadingData: PanelData = {
+      state: LoadingState.Loading,
+      series: [
+        toDataFrame({ refId: 'A', fields: [{ name: 'AAA' }], meta: {} }),
+        toDataFrame({ refId: 'B', fields: [{ name: 'B111' }], meta: {} }),
+      ],
+      timeRange: { from: dateTime(), to: dateTime(), raw: { from: 'now-1d', to: 'now' } },
+    };
+
+    const panelDataB = filterPanelDataToQuery(loadingData, 'B');
+    expect(panelDataB?.state).toBe(LoadingState.Loading);
+
+    const panelDataA = filterPanelDataToQuery(loadingData, 'A');
+    expect(panelDataA?.state).toBe(LoadingState.Loading);
+  });
+  it('should keep the state in loading until all queries are finished, even if the current query has errored', () => {
+    const loadingData: PanelData = {
+      state: LoadingState.Loading,
+      series: [],
+      error: {
+        refId: 'A',
+        message: 'Error',
+      },
+      timeRange: { from: dateTime(), to: dateTime(), raw: { from: 'now-1d', to: 'now' } },
+    };
+
+    const panelDataA = filterPanelDataToQuery(loadingData, 'A');
+    expect(panelDataA?.state).toBe(LoadingState.Loading);
+  });
+  it('should keep the state in loading until all queries are finished, if another query has errored', () => {
+    const loadingData: PanelData = {
+      state: LoadingState.Loading,
+      series: [],
+      error: {
+        refId: 'B',
+        message: 'Error',
+      },
+      timeRange: { from: dateTime(), to: dateTime(), raw: { from: 'now-1d', to: 'now' } },
+    };
+
+    const panelDataA = filterPanelDataToQuery(loadingData, 'A');
+    expect(panelDataA?.state).toBe(LoadingState.Loading);
+  });
+});
+
+describe('frame results with warnings', () => {
+  const meta = {
+    notices: [
+      {
+        severity: 'warning',
+        text: 'Reduce operation is not needed. Input query or expression A is already reduced data.',
+      },
+    ],
+  };
+
+  const dataWithWarnings: PanelData = {
+    state: LoadingState.Done,
+    series: [
+      toDataFrame({
+        refId: 'B',
+        fields: [{ name: 'B1' }],
+        meta,
+      }),
+      toDataFrame({
+        refId: 'B',
+        fields: [{ name: 'B2' }],
+        meta,
+      }),
+    ],
+    timeRange: { from: dateTime(), to: dateTime(), raw: { from: 'now-1d', to: 'now' } },
+  };
+
+  const dataWithoutWarnings: PanelData = {
+    state: LoadingState.Done,
+    series: [
+      toDataFrame({
+        refId: 'B',
+        fields: [{ name: 'B1' }],
+        meta: {},
+      }),
+      toDataFrame({
+        refId: 'B',
+        fields: [{ name: 'B2' }],
+        meta: {},
+      }),
+    ],
+    timeRange: { from: dateTime(), to: dateTime(), raw: { from: 'now-1d', to: 'now' } },
+  };
+
+  it('should show a warning badge and de-duplicate warning messages', () => {
+    // @ts-ignore: there are _way_ too many props to inject here :(
+    const editorRow = new QueryEditorRow({
+      data: dataWithWarnings,
+      query: {
+        refId: 'B',
+      },
+    });
+
+    const warningsComponent = editorRow.renderWarnings();
+    expect(warningsComponent).not.toBe(null);
+
+    render(warningsComponent!);
+    expect(screen.getByText('1 warning')).toBeInTheDocument();
+  });
+
+  it('should not show a warning badge when there are no warnings', () => {
+    // @ts-ignore: there are _way_ too many props to inject here :(
+    const editorRow = new QueryEditorRow({
+      data: dataWithoutWarnings,
+      query: {
+        refId: 'B',
+      },
+    });
+
+    const warningsComponent = editorRow.renderWarnings();
+    expect(warningsComponent).toBe(null);
+  });
+});
+describe('QueryEditorRow', () => {
+  const props = (data: PanelData): Props<DataQuery> => ({
+    dataSource: mockDS,
+    query: { refId: 'B' },
+    data,
+    queries: [{ refId: 'B' }],
+    id: 'test',
+    onAddQuery: jest.fn(),
+    onRunQuery: jest.fn(),
+    onChange: jest.fn(),
+    onRemoveQuery: jest.fn(),
+    index: 0,
+  });
+  it('should display error message in corresponding panel', async () => {
+    const data = {
+      state: LoadingState.Error,
+      series: [],
+      errors: [{ message: 'Error!!', refId: 'B' }],
+      timeRange: { from: dateTime(), to: dateTime(), raw: { from: 'now-1d', to: 'now' } },
+    };
+    render(<QueryEditorRow {...props(data)} />);
+    expect(await screen.findByText('Error!!')).toBeInTheDocument();
+  });
+  it('should display error message in corresponding panel if only error field is provided', async () => {
+    const data = {
+      state: LoadingState.Error,
+      series: [],
+      error: { message: 'Error!!', refId: 'B' },
+      errors: [],
+      timeRange: { from: dateTime(), to: dateTime(), raw: { from: 'now-1d', to: 'now' } },
+    };
+    render(<QueryEditorRow {...props(data)} />);
+    expect(await screen.findByText('Error!!')).toBeInTheDocument();
+  });
+  it('should not display error message if error.refId doesnt match', async () => {
+    const data = {
+      state: LoadingState.Error,
+      series: [],
+      errors: [{ message: 'Error!!', refId: 'A' }],
+      timeRange: { from: dateTime(), to: dateTime(), raw: { from: 'now-1d', to: 'now' } },
+    };
+    render(<QueryEditorRow {...props(data)} />);
+    await waitFor(() => {
+      expect(screen.queryByText('Error!!')).not.toBeInTheDocument();
+    });
+  });
+});
diff --git a/public/app/features/query/components/QueryEditorRow.tsx b/public/app/features/query/components/QueryEditorRow.tsx
index 28456e6b4f898..2317fe726dab2 100644
--- a/public/app/features/query/components/QueryEditorRow.tsx
+++ b/public/app/features/query/components/QueryEditorRow.tsx
@@ -22,7 +22,7 @@ import {
   toLegacyResponseData,
 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { AngularComponent, getAngularLoader, getDataSourceSrv } from '@grafana/runtime';
+import { AngularComponent, getAngularLoader, getDataSourceSrv, reportInteraction } from '@grafana/runtime';
 import { Badge, ErrorBoundaryAlert } from '@grafana/ui';
 import { OperationRowHelp } from 'app/core/components/QueryOperationRow/OperationRowHelp';
 import {
@@ -33,6 +33,7 @@ import {
   QueryOperationRow,
   QueryOperationRowRenderProps,
 } from 'app/core/components/QueryOperationRow/QueryOperationRow';
+import { t, Trans } from 'app/core/internationalization';
 import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { DashboardModel } from 'app/features/dashboard/state/DashboardModel';
 import { PanelModel } from 'app/features/dashboard/state/PanelModel';
@@ -41,7 +42,7 @@ import { RowActionComponents } from './QueryActionComponent';
 import { QueryEditorRowHeader } from './QueryEditorRowHeader';
 import { QueryErrorAlert } from './QueryErrorAlert';
 
-interface Props<TQuery extends DataQuery> {
+export interface Props<TQuery extends DataQuery> {
   data: PanelData;
   query: TQuery;
   queries: TQuery[];
@@ -56,7 +57,7 @@ interface Props<TQuery extends DataQuery> {
   onChange: (query: TQuery) => void;
   onRunQuery: () => void;
   visualization?: ReactNode;
-  hideDisableQuery?: boolean;
+  hideHideQueryButton?: boolean;
   app?: CoreApp;
   history?: Array<HistoryItem<TQuery>>;
   eventBus?: EventBusExtended;
@@ -301,7 +302,13 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
       }
     }
 
-    return <div>Data source plugin does not export any Query Editor component</div>;
+    return (
+      <div>
+        <Trans i18nKey="query-operation.query-editor-not-exported">
+          Data source plugin does not export any Query Editor component
+        </Trans>
+      </div>
+    );
   };
 
   onToggleEditMode = (e: React.MouseEvent, props: QueryOperationRowRenderProps) => {
@@ -334,7 +341,7 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
     }
   };
 
-  onDisableQuery = () => {
+  onHideQuery = () => {
     const { query, onChange, onRunQuery, onQueryToggled } = this.props;
     onChange({ ...query, hide: !query.hide });
     onRunQuery();
@@ -342,6 +349,10 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
     if (onQueryToggled) {
       onQueryToggled(query.hide);
     }
+
+    reportInteraction('query_editor_row_hide_query_clicked', {
+      hide: !query.hide,
+    });
   };
 
   onToggleHelp = () => {
@@ -398,6 +409,7 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
 
     return (
       <Badge
+        key="query-warning"
         color="orange"
         icon="exclamation-triangle"
         text={
@@ -432,9 +444,9 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
   };
 
   renderActions = (props: QueryOperationRowRenderProps) => {
-    const { query, hideDisableQuery = false } = this.props;
+    const { query, hideHideQueryButton: hideHideQueryButton = false } = this.props;
     const { hasTextEditMode, datasource, showingHelp } = this.state;
-    const isDisabled = !!query.hide;
+    const isHidden = !!query.hide;
 
     const hasEditorHelp = datasource?.components?.QueryEditorHelp;
 
@@ -442,7 +454,7 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
       <>
         {hasEditorHelp && (
           <QueryOperationToggleAction
-            title="Show data source help"
+            title={t('query-operation.header.datasource-help', 'Show data source help')}
             icon="question-circle"
             onClick={this.onToggleHelp}
             active={showingHelp}
@@ -450,7 +462,7 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
         )}
         {hasTextEditMode && (
           <QueryOperationAction
-            title="Toggle text edit mode"
+            title={t('query-operation.header.toggle-edit-mode', 'Toggle text edit mode')}
             icon="pen"
             onClick={(e) => {
               this.onToggleEditMode(e, props);
@@ -458,16 +470,29 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
           />
         )}
         {this.renderExtraActions()}
-        <QueryOperationAction title="Duplicate query" icon="copy" onClick={this.onCopyQuery} />
-        {!hideDisableQuery ? (
+        <QueryOperationAction
+          title={t('query-operation.header.duplicate-query', 'Duplicate query')}
+          icon="copy"
+          onClick={this.onCopyQuery}
+        />
+        {!hideHideQueryButton ? (
           <QueryOperationToggleAction
-            title="Disable query"
-            icon={isDisabled ? 'eye-slash' : 'eye'}
-            active={isDisabled}
-            onClick={this.onDisableQuery}
+            dataTestId={selectors.components.QueryEditorRow.actionButton('Hide response')}
+            title={
+              query.hide
+                ? t('query-operation.header.show-response', 'Show response')
+                : t('query-operation.header.hide-response', 'Hide response')
+            }
+            icon={isHidden ? 'eye-slash' : 'eye'}
+            active={isHidden}
+            onClick={this.onHideQuery}
           />
         ) : null}
-        <QueryOperationAction title="Remove query" icon="trash-alt" onClick={this.onRemoveQuery} />
+        <QueryOperationAction
+          title={t('query-operation.header.remove-query', 'Remove query')}
+          icon="trash-alt"
+          onClick={this.onRemoveQuery}
+        />
       </>
     );
   };
@@ -481,7 +506,7 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
         queries={queries}
         onChangeDataSource={onChangeDataSource}
         dataSource={dataSource}
-        disabled={query.hide}
+        hidden={query.hide}
         onClick={(e) => this.onToggleEditMode(e, props)}
         onChange={onChange}
         collapsedText={!props.isOpen ? this.renderCollapsedText() : null}
@@ -494,11 +519,12 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
   render() {
     const { query, index, visualization, collapsable } = this.props;
     const { datasource, showingHelp, data } = this.state;
-    const isDisabled = query.hide;
-
+    const isHidden = query.hide;
+    const error =
+      data?.error && data.error.refId === query.refId ? data.error : data?.errors?.find((e) => e.refId === query.refId);
     const rowClasses = classNames('query-editor-row', {
-      'query-editor-row--disabled': isDisabled,
-      'gf-form-disabled': isDisabled,
+      'query-editor-row--disabled': isHidden,
+      'gf-form-disabled': isHidden,
     });
 
     if (!datasource) {
@@ -532,7 +558,7 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
               )}
               {editor}
             </ErrorBoundaryAlert>
-            {data?.error && data.error.refId === query.refId && <QueryErrorAlert error={data.error} />}
+            {error && <QueryErrorAlert error={error} />}
             {visualization}
           </div>
         </QueryOperationRow>
diff --git a/public/app/features/query/components/QueryEditorRowHeader.test.tsx b/public/app/features/query/components/QueryEditorRowHeader.test.tsx
index a3fdae682bfa5..aa4026ec6f440 100644
--- a/public/app/features/query/components/QueryEditorRowHeader.test.tsx
+++ b/public/app/features/query/components/QueryEditorRowHeader.test.tsx
@@ -1,7 +1,6 @@
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
-import { openMenu } from 'react-select-event';
 
 import { DataSourceInstanceSettings } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
@@ -84,7 +83,7 @@ describe('QueryEditorRowHeader', () => {
     renderScenario({ onChangeDataSource: () => {} });
 
     const dsSelect = screen.getByTestId(selectors.components.DataSourcePicker.container).querySelector('input')!;
-    openMenu(dsSelect);
+    await userEvent.click(dsSelect);
     expect(await screen.findByText('${dsVariable}')).toBeInTheDocument();
   });
 });
@@ -103,7 +102,7 @@ function renderScenario(overrides: Partial<Props>) {
       },
     ],
     dataSource: {} as DataSourceInstanceSettings,
-    disabled: false,
+    hidden: false,
     onChange: jest.fn(),
     onClick: jest.fn(),
     collapsedText: '',
diff --git a/public/app/features/query/components/QueryEditorRowHeader.tsx b/public/app/features/query/components/QueryEditorRowHeader.tsx
index 5aeb739749320..b30cfebfd2a30 100644
--- a/public/app/features/query/components/QueryEditorRowHeader.tsx
+++ b/public/app/features/query/components/QueryEditorRowHeader.tsx
@@ -9,7 +9,7 @@ import { DataSourcePicker } from 'app/features/datasources/components/picker/Dat
 export interface Props<TQuery extends DataQuery = DataQuery> {
   query: TQuery;
   queries: TQuery[];
-  disabled?: boolean;
+  hidden?: boolean;
   dataSource: DataSourceInstanceSettings;
   renderExtras?: () => ReactNode;
   onChangeDataSource?: (settings: DataSourceInstanceSettings) => void;
@@ -20,7 +20,7 @@ export interface Props<TQuery extends DataQuery = DataQuery> {
 }
 
 export const QueryEditorRowHeader = <TQuery extends DataQuery>(props: Props<TQuery>) => {
-  const { query, queries, onChange, collapsedText, renderExtras, disabled } = props;
+  const { query, queries, onChange, collapsedText, renderExtras, hidden } = props;
 
   const styles = useStyles2(getStyles);
   const [isEditing, setIsEditing] = useState<boolean>(false);
@@ -117,7 +117,7 @@ export const QueryEditorRowHeader = <TQuery extends DataQuery>(props: Props<TQue
         )}
         {renderDataSource(props, styles)}
         {renderExtras && <div className={styles.itemWrapper}>{renderExtras()}</div>}
-        {disabled && <em className={styles.contextInfo}>Disabled</em>}
+        {hidden && <em className={styles.contextInfo}>Hidden</em>}
       </div>
 
       {collapsedText && <div className={styles.collapsedText}>{collapsedText}</div>}
diff --git a/public/app/features/query/components/QueryEditorRows.tsx b/public/app/features/query/components/QueryEditorRows.tsx
index 17297eef12ab9..9399178d42a63 100644
--- a/public/app/features/query/components/QueryEditorRows.tsx
+++ b/public/app/features/query/components/QueryEditorRows.tsx
@@ -1,4 +1,4 @@
-import React, { PureComponent } from 'react';
+import React, { PureComponent, ReactNode } from 'react';
 import { DragDropContext, DragStart, Droppable, DropResult } from 'react-beautiful-dnd';
 
 import {
@@ -34,6 +34,7 @@ export interface Props {
   onQueryCopied?: () => void;
   onQueryRemoved?: () => void;
   onQueryToggled?: (queryStatus?: boolean | undefined) => void;
+  queryRowWrapper?: (children: ReactNode, refId: string) => ReactNode;
 }
 
 export class QueryEditorRows extends PureComponent<Props> {
@@ -144,6 +145,7 @@ export class QueryEditorRows extends PureComponent<Props> {
       onQueryCopied,
       onQueryRemoved,
       onQueryToggled,
+      queryRowWrapper,
     } = this.props;
 
     return (
@@ -158,7 +160,7 @@ export class QueryEditorRows extends PureComponent<Props> {
                     ? (settings: DataSourceInstanceSettings) => this.onDataSourceChange(settings, index)
                     : undefined;
 
-                  return (
+                  const queryEditorRow = (
                     <QueryEditorRow
                       id={query.refId}
                       index={index}
@@ -180,6 +182,8 @@ export class QueryEditorRows extends PureComponent<Props> {
                       eventBus={eventBus}
                     />
                   );
+
+                  return queryRowWrapper ? queryRowWrapper(queryEditorRow, query.refId) : queryEditorRow;
                 })}
                 {provided.placeholder}
               </div>
diff --git a/public/app/features/query/components/QueryGroup.test.tsx b/public/app/features/query/components/QueryGroup.test.tsx
index 2d4b671e06120..9a1a885ad119a 100644
--- a/public/app/features/query/components/QueryGroup.test.tsx
+++ b/public/app/features/query/components/QueryGroup.test.tsx
@@ -127,16 +127,16 @@ describe('QueryGroup', () => {
   describe('Angular deprecation', () => {
     const deprecationText = /legacy platform based on AngularJS/i;
 
-    const oldAngularDetected = mockDS.angularDetected;
+    const oldAngularDetected = mockDS.meta.angular?.detected ?? false;
     const oldDatasources = config.datasources;
 
     afterEach(() => {
-      mockDS.angularDetected = oldAngularDetected;
+      mockDS.meta.angular = { detected: oldAngularDetected, hideDeprecation: false };
       config.datasources = oldDatasources;
     });
 
     it('Should render angular deprecation notice for angular plugins', async () => {
-      mockDS.angularDetected = true;
+      mockDS.meta.angular = { detected: true, hideDeprecation: false };
       config.datasources[mockDS.name] = mockDS;
       renderScenario({});
       await waitFor(async () => {
@@ -145,7 +145,7 @@ describe('QueryGroup', () => {
     });
 
     it('Should not render angular deprecation notice for non-angular plugins', async () => {
-      mockDS.angularDetected = false;
+      mockDS.meta.angular = { detected: false, hideDeprecation: false };
       config.datasources[mockDS.name] = mockDS;
       renderScenario({});
       await waitFor(async () => {
diff --git a/public/app/features/query/components/QueryGroup.tsx b/public/app/features/query/components/QueryGroup.tsx
index 09d133ea850e4..a522cb56a4ea8 100644
--- a/public/app/features/query/components/QueryGroup.tsx
+++ b/public/app/features/query/components/QueryGroup.tsx
@@ -1,5 +1,5 @@
 import { css } from '@emotion/css';
-import React, { PureComponent } from 'react';
+import React, { PureComponent, useEffect, useState } from 'react';
 import { Unsubscribable } from 'rxjs';
 
 import {
@@ -23,11 +23,11 @@ import { DataSourceModal } from 'app/features/datasources/components/picker/Data
 import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker';
 import { dataSource as expressionDatasource } from 'app/features/expressions/ExpressionDatasource';
 import { AngularDeprecationPluginNotice } from 'app/features/plugins/angularDeprecation/AngularDeprecationPluginNotice';
-import { DashboardQueryEditor, isSharedDashboardQuery } from 'app/plugins/datasource/dashboard';
+import { isSharedDashboardQuery } from 'app/plugins/datasource/dashboard';
 import { GrafanaQuery } from 'app/plugins/datasource/grafana/types';
 import { QueryGroupOptions } from 'app/types';
 
-import { isAngularDatasourcePlugin } from '../../plugins/angularDeprecation/utils';
+import { isAngularDatasourcePluginAndNotHidden } from '../../plugins/angularDeprecation/utils';
 import { PanelQueryRunner } from '../state/PanelQueryRunner';
 import { updateQueries } from '../state/updateQueries';
 
@@ -84,11 +84,6 @@ export class QueryGroup extends PureComponent<Props, State> {
     });
 
     this.setNewQueriesAndDatasource(options);
-
-    // Clean up the first panel flag since the modal is now open
-    if (!!locationService.getSearchObject().firstPanel) {
-      locationService.partial({ firstPanel: null }, true);
-    }
   }
 
   componentWillUnmount() {
@@ -127,7 +122,7 @@ export class QueryGroup extends PureComponent<Props, State> {
         defaultDataSource,
       });
     } catch (error) {
-      console.log('failed to load data source', error);
+      console.error('failed to load data source', error);
     }
   }
 
@@ -213,58 +208,21 @@ export class QueryGroup extends PureComponent<Props, State> {
 
   renderTopSection(styles: QueriesTabStyles) {
     const { onOpenQueryInspector, options } = this.props;
-    const { dataSource, data } = this.state;
+    const { dataSource, data, dsSettings } = this.state;
 
+    if (!dsSettings || !dataSource) {
+      return null;
+    }
     return (
-      <div>
-        <div className={styles.dataSourceRow}>
-          <InlineFormLabel htmlFor="data-source-picker" width={'auto'}>
-            Data source
-          </InlineFormLabel>
-          <div className={styles.dataSourceRowItem}>{this.renderDataSourcePickerWithPrompt()}</div>
-          {dataSource && (
-            <>
-              <div className={styles.dataSourceRowItem}>
-                <Button
-                  variant="secondary"
-                  icon="question-circle"
-                  title="Open data source help"
-                  onClick={this.onOpenHelp}
-                  data-testid="query-tab-help-button"
-                />
-              </div>
-              <div className={styles.dataSourceRowItemOptions}>
-                <QueryGroupOptionsEditor
-                  options={options}
-                  dataSource={dataSource}
-                  data={data}
-                  onChange={this.onUpdateAndRun}
-                />
-              </div>
-              {onOpenQueryInspector && (
-                <div className={styles.dataSourceRowItem}>
-                  <Button
-                    variant="secondary"
-                    onClick={onOpenQueryInspector}
-                    aria-label={selectors.components.QueryTab.queryInspectorButton}
-                  >
-                    Query inspector
-                  </Button>
-                </div>
-              )}
-            </>
-          )}
-        </div>
-        {dataSource && isAngularDatasourcePlugin(dataSource.uid) && (
-          <AngularDeprecationPluginNotice
-            pluginId={dataSource.type}
-            pluginType={PluginType.datasource}
-            angularSupportEnabled={config?.angularSupportEnabled}
-            showPluginDetailsLink={true}
-            interactionElementId="datasource-query"
-          />
-        )}
-      </div>
+      <QueryGroupTopSection
+        data={data}
+        dataSource={dataSource}
+        options={options}
+        dsSettings={dsSettings}
+        onOptionsChange={this.onUpdateAndRun}
+        onDataSourceChange={this.onChangeDataSource}
+        onOpenQueryInspector={onOpenQueryInspector}
+      />
     );
   }
 
@@ -280,32 +238,6 @@ export class QueryGroup extends PureComponent<Props, State> {
     this.setState({ isDataSourceModalOpen: false });
   };
 
-  renderDataSourcePickerWithPrompt = () => {
-    const { isDataSourceModalOpen } = this.state;
-
-    const commonProps = {
-      metrics: true,
-      mixed: true,
-      dashboard: true,
-      variables: true,
-      current: this.props.options.dataSource,
-      uploadFile: true,
-      onChange: async (ds: DataSourceInstanceSettings, defaultQueries?: DataQuery[] | GrafanaQuery[]) => {
-        await this.onChangeDataSource(ds, defaultQueries);
-        this.onCloseDataSourceModal();
-      },
-    };
-
-    return (
-      <>
-        {isDataSourceModalOpen && config.featureToggles.advancedDataSourcePicker && (
-          <DataSourceModal {...commonProps} onDismiss={this.onCloseDataSourceModal}></DataSourceModal>
-        )}
-        <DataSourcePicker {...commonProps} />
-      </>
-    );
-  };
-
   onAddQuery = (query: Partial<DataQuery>) => {
     const { dsSettings, queries } = this.state;
     this.onQueriesChange(addQuery(queries, query, { type: dsSettings?.type, uid: dsSettings?.uid }));
@@ -320,16 +252,6 @@ export class QueryGroup extends PureComponent<Props, State> {
   renderQueries(dsSettings: DataSourceInstanceSettings) {
     const { onRunQueries } = this.props;
     const { data, queries } = this.state;
-    if (isSharedDashboardQuery(dsSettings.name)) {
-      return (
-        <DashboardQueryEditor
-          queries={queries}
-          panelData={data}
-          onChange={this.onQueriesChange}
-          onRunQueries={onRunQueries}
-        />
-      );
-    }
 
     return (
       <div aria-label={selectors.components.QueryTab.content}>
@@ -452,3 +374,134 @@ const getStyles = stylesFactory(() => {
 });
 
 type QueriesTabStyles = ReturnType<typeof getStyles>;
+
+interface QueryGroupTopSectionProps {
+  data: PanelData;
+  dataSource: DataSourceApi;
+  dsSettings: DataSourceInstanceSettings;
+  options: QueryGroupOptions;
+  onOpenQueryInspector?: () => void;
+  onOptionsChange?: (options: QueryGroupOptions) => void;
+  onDataSourceChange?: (ds: DataSourceInstanceSettings, defaultQueries?: DataQuery[] | GrafanaQuery[]) => Promise<void>;
+}
+
+export function QueryGroupTopSection({
+  dataSource,
+  options,
+  data,
+  dsSettings,
+  onDataSourceChange,
+  onOptionsChange,
+  onOpenQueryInspector,
+}: QueryGroupTopSectionProps) {
+  const styles = getStyles();
+  const [isHelpOpen, setIsHelpOpen] = useState(false);
+  return (
+    <>
+      <div data-testid={selectors.components.QueryTab.queryGroupTopSection}>
+        <div className={styles.dataSourceRow}>
+          <InlineFormLabel htmlFor="data-source-picker" width={'auto'}>
+            Data source
+          </InlineFormLabel>
+          <div className={styles.dataSourceRowItem}>
+            <DataSourcePickerWithPrompt
+              options={options}
+              onChange={async (ds, defaultQueries) => {
+                return await onDataSourceChange?.(ds, defaultQueries);
+              }}
+              isDataSourceModalOpen={Boolean(locationService.getSearchObject().firstPanel)}
+            />
+          </div>
+          {dataSource && (
+            <>
+              <div className={styles.dataSourceRowItem}>
+                <Button
+                  variant="secondary"
+                  icon="question-circle"
+                  title="Open data source help"
+                  onClick={() => setIsHelpOpen(true)}
+                  data-testid="query-tab-help-button"
+                />
+              </div>
+              <div className={styles.dataSourceRowItemOptions}>
+                <QueryGroupOptionsEditor
+                  options={options}
+                  dataSource={dataSource}
+                  data={data}
+                  onChange={(opts) => {
+                    onOptionsChange?.(opts);
+                  }}
+                />
+              </div>
+              {onOpenQueryInspector && (
+                <div className={styles.dataSourceRowItem}>
+                  <Button
+                    variant="secondary"
+                    onClick={onOpenQueryInspector}
+                    aria-label={selectors.components.QueryTab.queryInspectorButton}
+                  >
+                    Query inspector
+                  </Button>
+                </div>
+              )}
+            </>
+          )}
+        </div>
+        {dataSource && isAngularDatasourcePluginAndNotHidden(dataSource.uid) && (
+          <AngularDeprecationPluginNotice
+            pluginId={dataSource.type}
+            pluginType={PluginType.datasource}
+            angularSupportEnabled={config?.angularSupportEnabled}
+            showPluginDetailsLink={true}
+            interactionElementId="datasource-query"
+          />
+        )}
+      </div>
+      {isHelpOpen && (
+        <Modal title="Data source help" isOpen={true} onDismiss={() => setIsHelpOpen(false)}>
+          <PluginHelp pluginId={dsSettings.meta.id} />
+        </Modal>
+      )}
+    </>
+  );
+}
+
+interface DataSourcePickerWithPromptProps {
+  isDataSourceModalOpen?: boolean;
+  options: QueryGroupOptions;
+  onChange: (ds: DataSourceInstanceSettings, defaultQueries?: DataQuery[] | GrafanaQuery[]) => Promise<void>;
+}
+
+function DataSourcePickerWithPrompt({ options, onChange, ...otherProps }: DataSourcePickerWithPromptProps) {
+  const [isDataSourceModalOpen, setIsDataSourceModalOpen] = useState(Boolean(otherProps.isDataSourceModalOpen));
+
+  useEffect(() => {
+    // Clean up the first panel flag since the modal is now open
+    if (!!locationService.getSearchObject().firstPanel) {
+      locationService.partial({ firstPanel: null }, true);
+    }
+  }, []);
+
+  const commonProps = {
+    metrics: true,
+    mixed: true,
+    dashboard: true,
+    variables: true,
+    current: options.dataSource,
+    uploadFile: true,
+    onChange: async (ds: DataSourceInstanceSettings, defaultQueries?: DataQuery[] | GrafanaQuery[]) => {
+      await onChange(ds, defaultQueries);
+      setIsDataSourceModalOpen(false);
+    },
+  };
+
+  return (
+    <>
+      {isDataSourceModalOpen && (
+        <DataSourceModal {...commonProps} onDismiss={() => setIsDataSourceModalOpen(false)}></DataSourceModal>
+      )}
+
+      <DataSourcePicker {...commonProps} />
+    </>
+  );
+}
diff --git a/public/app/features/query/state/DashboardQueryRunner/AlertStatesWorker.test.ts b/public/app/features/query/state/DashboardQueryRunner/AlertStatesWorker.test.ts
deleted file mode 100644
index 1caa4b12a4f9e..0000000000000
--- a/public/app/features/query/state/DashboardQueryRunner/AlertStatesWorker.test.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-import { AlertState, AlertStateInfo, getDefaultTimeRange, TimeRange } from '@grafana/data';
-import { backendSrv } from 'app/core/services/backend_srv';
-
-import { silenceConsoleOutput } from '../../../../../test/core/utils/silenceConsoleOutput';
-import * as store from '../../../../store/store';
-
-import { AlertStatesWorker } from './AlertStatesWorker';
-import { DashboardQueryRunnerOptions } from './types';
-
-jest.mock('@grafana/runtime', () => ({
-  ...jest.requireActual('@grafana/runtime'),
-  getBackendSrv: () => backendSrv,
-}));
-
-function getDefaultOptions(): DashboardQueryRunnerOptions {
-  const dashboard: any = { id: 'an id', panels: [{ alert: {} }] };
-  const range = getDefaultTimeRange();
-
-  return { dashboard, range };
-}
-
-function getTestContext() {
-  jest.clearAllMocks();
-  const dispatchMock = jest.spyOn(store, 'dispatch');
-  const options = getDefaultOptions();
-  const getMock = jest.spyOn(backendSrv, 'get');
-
-  return { getMock, options, dispatchMock };
-}
-
-describe('AlertStatesWorker', () => {
-  const worker = new AlertStatesWorker();
-
-  describe('when canWork is called with correct props', () => {
-    it('then it should return true', () => {
-      const options = getDefaultOptions();
-
-      expect(worker.canWork(options)).toBe(true);
-    });
-  });
-
-  describe('when canWork is called with no dashboard id', () => {
-    it('then it should return false', () => {
-      const dashboard: any = {};
-      const options = { ...getDefaultOptions(), dashboard };
-
-      expect(worker.canWork(options)).toBe(false);
-    });
-  });
-
-  describe('when canWork is called with wrong range', () => {
-    it('then it should return false', () => {
-      const defaultRange = getDefaultTimeRange();
-      const range: TimeRange = { ...defaultRange, raw: { ...defaultRange.raw, to: 'now-6h' } };
-      const options = { ...getDefaultOptions(), range };
-
-      expect(worker.canWork(options)).toBe(false);
-    });
-  });
-
-  describe('when canWork is called for dashboard with no alert panels', () => {
-    it('then it should return false', () => {
-      const options = getDefaultOptions();
-      options.dashboard.panels.forEach((panel) => delete panel.alert);
-      expect(worker.canWork(options)).toBe(false);
-    });
-  });
-
-  describe('when run is called with incorrect props', () => {
-    it('then it should return the correct results', async () => {
-      const { getMock, options } = getTestContext();
-      const dashboard: any = {};
-
-      await expect(worker.work({ ...options, dashboard })).toEmitValuesWith((received) => {
-        expect(received).toHaveLength(1);
-        const results = received[0];
-        expect(results).toEqual({ alertStates: [], annotations: [] });
-        expect(getMock).not.toHaveBeenCalled();
-      });
-    });
-  });
-
-  describe('when run is called with correct props and request is successful', () => {
-    it('then it should return the correct results', async () => {
-      const getResults: AlertStateInfo[] = [
-        { id: 1, state: AlertState.Alerting, dashboardId: 1, panelId: 1 },
-        { id: 2, state: AlertState.Alerting, dashboardId: 1, panelId: 2 },
-      ];
-      const { getMock, options } = getTestContext();
-      getMock.mockResolvedValue(getResults);
-
-      await expect(worker.work(options)).toEmitValuesWith((received) => {
-        expect(received).toHaveLength(1);
-        const results = received[0];
-        expect(results).toEqual({ alertStates: getResults, annotations: [] });
-        expect(getMock).toHaveBeenCalledTimes(1);
-      });
-    });
-  });
-
-  describe('when run is called with correct props and request fails', () => {
-    silenceConsoleOutput();
-    it('then it should return the correct results', async () => {
-      const { getMock, options, dispatchMock } = getTestContext();
-      getMock.mockRejectedValue({ message: 'An error' });
-
-      await expect(worker.work(options)).toEmitValuesWith((received) => {
-        expect(received).toHaveLength(1);
-        const results = received[0];
-        expect(results).toEqual({ alertStates: [], annotations: [] });
-        expect(getMock).toHaveBeenCalledTimes(1);
-        expect(dispatchMock).toHaveBeenCalledTimes(1);
-      });
-    });
-  });
-
-  describe('when run is called with correct props and request is cancelled', () => {
-    silenceConsoleOutput();
-    it('then it should return the correct results', async () => {
-      const { getMock, options, dispatchMock } = getTestContext();
-      getMock.mockRejectedValue({ cancelled: true });
-
-      await expect(worker.work(options)).toEmitValuesWith((received) => {
-        expect(received).toHaveLength(1);
-        const results = received[0];
-        expect(results).toEqual({ alertStates: [], annotations: [] });
-        expect(getMock).toHaveBeenCalledTimes(1);
-        expect(dispatchMock).not.toHaveBeenCalled();
-      });
-    });
-  });
-});
diff --git a/public/app/features/query/state/DashboardQueryRunner/AlertStatesWorker.ts b/public/app/features/query/state/DashboardQueryRunner/AlertStatesWorker.ts
deleted file mode 100644
index edefd0710e01f..0000000000000
--- a/public/app/features/query/state/DashboardQueryRunner/AlertStatesWorker.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { from, Observable } from 'rxjs';
-import { catchError, map } from 'rxjs/operators';
-
-import { getBackendSrv } from '@grafana/runtime';
-
-import { DashboardQueryRunnerOptions, DashboardQueryRunnerWorker, DashboardQueryRunnerWorkerResult } from './types';
-import { emptyResult, handleDashboardQueryRunnerWorkerError } from './utils';
-
-export class AlertStatesWorker implements DashboardQueryRunnerWorker {
-  canWork({ dashboard, range }: DashboardQueryRunnerOptions): boolean {
-    if (!dashboard.id) {
-      return false;
-    }
-
-    if (range.raw.to !== 'now') {
-      return false;
-    }
-
-    // if dashboard has no alerts, no point to query alert states
-    if (!dashboard.panels.find((panel) => !!panel.alert)) {
-      return false;
-    }
-
-    return true;
-  }
-
-  work(options: DashboardQueryRunnerOptions): Observable<DashboardQueryRunnerWorkerResult> {
-    if (!this.canWork(options)) {
-      return emptyResult();
-    }
-
-    const { dashboard } = options;
-    return from(
-      getBackendSrv().get(
-        '/api/alerts/states-for-dashboard',
-        {
-          dashboardId: dashboard.id,
-        },
-        `dashboard-query-runner-alert-states-${dashboard.id}`
-      )
-    ).pipe(
-      map((alertStates) => {
-        return { alertStates, annotations: [] };
-      }),
-      catchError(handleDashboardQueryRunnerWorkerError)
-    );
-  }
-}
diff --git a/public/app/features/query/state/DashboardQueryRunner/AnnotationsQueryRunner.test.ts b/public/app/features/query/state/DashboardQueryRunner/AnnotationsQueryRunner.test.ts
index 264f431e4d887..b18734610917e 100644
--- a/public/app/features/query/state/DashboardQueryRunner/AnnotationsQueryRunner.test.ts
+++ b/public/app/features/query/state/DashboardQueryRunner/AnnotationsQueryRunner.test.ts
@@ -1,6 +1,7 @@
 import { Observable, of, throwError } from 'rxjs';
 
 import { AnnotationQuery, DataSourceApi, getDefaultTimeRange } from '@grafana/data';
+import { AnnotationQueryResponse } from 'app/features/annotations/types';
 import { createDashboardModelFixture } from 'app/features/dashboard/state/__fixtures__/dashboardFixtures';
 
 import { silenceConsoleOutput } from '../../../../../test/core/utils/silenceConsoleOutput';
@@ -23,7 +24,7 @@ function getDefaultOptions(): AnnotationQueryRunnerOptions {
   return { annotation, datasource, dashboard, range };
 }
 
-function getTestContext(result: Observable<any> = toAsyncOfResult({ events: [{ id: '1' }] })) {
+function getTestContext(result: Observable<AnnotationQueryResponse> = toAsyncOfResult({ events: [{ id: '1' }] })) {
   jest.clearAllMocks();
   const dispatchMock = jest.spyOn(store, 'dispatch');
   const options = getDefaultOptions();
@@ -94,7 +95,7 @@ describe('AnnotationsQueryRunner', () => {
 
     describe('but result is missing events prop', () => {
       it('then it should return the correct results', async () => {
-        const { options, executeAnnotationQueryMock } = getTestContext(of({ id: '1' }));
+        const { options, executeAnnotationQueryMock } = getTestContext(of({ id: '1' } as AnnotationQueryResponse));
 
         await expect(runner.run(options)).toEmitValuesWith((received) => {
           expect(received).toHaveLength(1);
diff --git a/public/app/features/query/state/DashboardQueryRunner/AnnotationsWorker.ts b/public/app/features/query/state/DashboardQueryRunner/AnnotationsWorker.ts
index 55ce5a23a04fc..cc1854f7208c2 100644
--- a/public/app/features/query/state/DashboardQueryRunner/AnnotationsWorker.ts
+++ b/public/app/features/query/state/DashboardQueryRunner/AnnotationsWorker.ts
@@ -59,7 +59,7 @@ export class AnnotationsWorker implements DashboardQueryRunnerWorker {
       }
 
       return datasourceObservable.pipe(
-        mergeMap((datasource?: DataSourceApi) => {
+        mergeMap((datasource: DataSourceApi | undefined) => {
           const runner = this.runners.find((r) => r.canRun(datasource));
           if (!runner) {
             return of([]);
diff --git a/public/app/features/query/state/DashboardQueryRunner/DashboardQueryRunner.test.ts b/public/app/features/query/state/DashboardQueryRunner/DashboardQueryRunner.test.ts
index 3604fb574d050..e88b7a5a9b3c9 100644
--- a/public/app/features/query/state/DashboardQueryRunner/DashboardQueryRunner.test.ts
+++ b/public/app/features/query/state/DashboardQueryRunner/DashboardQueryRunner.test.ts
@@ -1,9 +1,13 @@
 import { throwError } from 'rxjs';
 import { delay, first } from 'rxjs/operators';
 
-import { AlertState, AlertStateInfo } from '@grafana/data';
+import { AlertState } from '@grafana/data';
 import { DataSourceSrv, setDataSourceSrv } from '@grafana/runtime';
+import { grantUserPermissions } from 'app/features/alerting/unified/mocks';
+import { Annotation } from 'app/features/alerting/unified/utils/constants';
 import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
+import { AccessControlAction } from 'app/types';
+import { PromAlertingRuleState, PromRulesResponse, PromRuleType } from 'app/types/unified-alerting-dto';
 
 import { silenceConsoleOutput } from '../../../../../test/core/utils/silenceConsoleOutput';
 import { backendSrv } from '../../../../core/services/backend_srv';
@@ -18,6 +22,10 @@ jest.mock('@grafana/runtime', () => ({
   getBackendSrv: () => backendSrv,
 }));
 
+beforeEach(() => {
+  grantUserPermissions([AccessControlAction.AlertingRuleRead, AccessControlAction.AlertingRuleExternalRead]);
+});
+
 function getTestContext() {
   jest.clearAllMocks();
   const timeSrvMock = { timeRange: jest.fn() } as unknown as TimeSrv;
@@ -25,10 +33,55 @@ function getTestContext() {
   // These tests are setup so all the workers and runners are invoked once, this wouldn't be the case in real life
   const runner = createDashboardQueryRunner({ dashboard: options.dashboard, timeSrv: timeSrvMock });
 
-  const getResults: AlertStateInfo[] = [
-    { id: 1, state: AlertState.Alerting, dashboardId: 1, panelId: 1 },
-    { id: 2, state: AlertState.Alerting, dashboardId: 1, panelId: 2 },
-  ];
+  const getResults: PromRulesResponse = {
+    status: 'success',
+    data: {
+      groups: [
+        {
+          name: 'my-group',
+          rules: [
+            {
+              name: 'my alert',
+              state: PromAlertingRuleState.Firing,
+              query: 'foo > 1',
+              type: PromRuleType.Alerting,
+              annotations: {
+                [Annotation.dashboardUID]: '1',
+                [Annotation.panelID]: '1',
+              },
+              health: 'ok',
+              labels: {},
+            },
+          ],
+          interval: 300,
+          file: 'my-namespace',
+        },
+        {
+          name: 'another-group',
+          rules: [
+            {
+              name: 'another alert',
+              query: 'foo > 1',
+              state: PromAlertingRuleState.Firing,
+              type: PromRuleType.Alerting,
+              annotations: {
+                [Annotation.dashboardUID]: '1',
+                [Annotation.panelID]: '2',
+              },
+              health: 'ok',
+              labels: {},
+            },
+          ],
+          interval: 300,
+          file: 'my-namespace',
+        },
+      ],
+      totals: {
+        alerting: 2,
+      },
+    },
+  };
+
   const getMock = jest.spyOn(backendSrv, 'get').mockResolvedValue(getResults);
   const executeAnnotationQueryMock = jest
     .spyOn(annotationsSrv, 'executeAnnotationQuery')
@@ -294,7 +347,7 @@ function getExpectedForAllResult(): DashboardQueryRunnerResult {
   return {
     alertState: {
       dashboardId: 1,
-      id: 1,
+      id: 0,
       panelId: 1,
       state: AlertState.Alerting,
     },
diff --git a/public/app/features/query/state/DashboardQueryRunner/DashboardQueryRunner.ts b/public/app/features/query/state/DashboardQueryRunner/DashboardQueryRunner.ts
index 42538db0392e8..ddd605865e770 100644
--- a/public/app/features/query/state/DashboardQueryRunner/DashboardQueryRunner.ts
+++ b/public/app/features/query/state/DashboardQueryRunner/DashboardQueryRunner.ts
@@ -3,13 +3,11 @@ import { finalize, map, mapTo, mergeAll, reduce, share, takeUntil } from 'rxjs/o
 
 import { AnnotationQuery } from '@grafana/data';
 import { RefreshEvent } from '@grafana/runtime';
-import { config } from 'app/core/config';
 import { dedupAnnotations } from 'app/features/annotations/events_processing';
 
 import { getTimeSrv, TimeSrv } from '../../../dashboard/services/TimeSrv';
 import { DashboardModel } from '../../../dashboard/state';
 
-import { AlertStatesWorker } from './AlertStatesWorker';
 import { AnnotationsWorker } from './AnnotationsWorker';
 import { SnapshotWorker } from './SnapshotWorker';
 import { UnifiedAlertStatesWorker } from './UnifiedAlertStatesWorker';
@@ -33,7 +31,7 @@ class DashboardQueryRunnerImpl implements DashboardQueryRunner {
     private readonly dashboard: DashboardModel,
     private readonly timeSrv: TimeSrv = getTimeSrv(),
     private readonly workers: DashboardQueryRunnerWorker[] = [
-      config.unifiedAlertingEnabled ? new UnifiedAlertStatesWorker() : new AlertStatesWorker(),
+      new UnifiedAlertStatesWorker(),
       new SnapshotWorker(),
       new AnnotationsWorker(),
     ]
diff --git a/public/app/features/query/state/DashboardQueryRunner/UnifiedAlertStatesWorker.ts b/public/app/features/query/state/DashboardQueryRunner/UnifiedAlertStatesWorker.ts
index 0591d0b8ae0b2..d0c13024e2da0 100644
--- a/public/app/features/query/state/DashboardQueryRunner/UnifiedAlertStatesWorker.ts
+++ b/public/app/features/query/state/DashboardQueryRunner/UnifiedAlertStatesWorker.ts
@@ -6,8 +6,9 @@ import { config, getBackendSrv } from '@grafana/runtime';
 import { contextSrv } from 'app/core/services/context_srv';
 import { Annotation } from 'app/features/alerting/unified/utils/constants';
 import { isAlertingRule } from 'app/features/alerting/unified/utils/rules';
+import { promAlertStateToAlertState } from 'app/features/dashboard-scene/scene/AlertStatesDataLayer';
 import { AccessControlAction } from 'app/types';
-import { PromAlertingRuleState, PromRulesResponse } from 'app/types/unified-alerting-dto';
+import { PromRulesResponse } from 'app/types/unified-alerting-dto';
 
 import { DashboardQueryRunnerOptions, DashboardQueryRunnerWorker, DashboardQueryRunnerWorkerResult } from './types';
 import { emptyResult, handleDashboardQueryRunnerWorkerError } from './utils';
@@ -105,12 +106,3 @@ export class UnifiedAlertStatesWorker implements DashboardQueryRunnerWorker {
     );
   }
 }
-
-function promAlertStateToAlertState(state: PromAlertingRuleState): AlertState {
-  if (state === PromAlertingRuleState.Firing) {
-    return AlertState.Alerting;
-  } else if (state === PromAlertingRuleState.Pending) {
-    return AlertState.Pending;
-  }
-  return AlertState.OK;
-}
diff --git a/public/app/features/query/state/DashboardQueryRunner/testHelpers.ts b/public/app/features/query/state/DashboardQueryRunner/testHelpers.ts
index 027f02514dd41..87345417ef9f0 100644
--- a/public/app/features/query/state/DashboardQueryRunner/testHelpers.ts
+++ b/public/app/features/query/state/DashboardQueryRunner/testHelpers.ts
@@ -41,6 +41,7 @@ export function getDefaultOptions(): DashboardQueryRunnerOptions {
   const nextGen = getAnnotation({ datasource: NEXT_GEN_DS_NAME });
   const dashboard: any = {
     id: 1,
+    uid: '1',
     annotations: {
       list: [
         legacy,
diff --git a/public/app/features/query/state/PanelQueryRunner.test.ts b/public/app/features/query/state/PanelQueryRunner.test.ts
index 1d5e61cba4bac..e57cc8ea7a193 100644
--- a/public/app/features/query/state/PanelQueryRunner.test.ts
+++ b/public/app/features/query/state/PanelQueryRunner.test.ts
@@ -3,8 +3,9 @@ const applyFieldOverridesMock = jest.fn(); // needs to be first in this file
 import { Subject } from 'rxjs';
 
 // Importing this way to be able to spy on grafana/data
+
 import * as grafanaData from '@grafana/data';
-import { DataSourceApi } from '@grafana/data';
+import { DataSourceApi, TypedVariableModel } from '@grafana/data';
 import { DataSourceSrv, setDataSourceSrv, setEchoSrv } from '@grafana/runtime';
 import { TemplateSrvMock } from 'app/features/templating/template_srv.mock';
 
@@ -46,7 +47,27 @@ jest.mock('app/features/dashboard/services/DashboardSrv', () => ({
 }));
 
 jest.mock('app/features/templating/template_srv', () => ({
-  getTemplateSrv: () => new TemplateSrvMock({}),
+  ...jest.requireActual('app/features/templating/template_srv'),
+  getTemplateSrv: () =>
+    new TemplateSrvMock([
+      {
+        name: 'server',
+        type: 'datasource',
+        current: { text: 'Server1', value: 'server' },
+        options: [{ text: 'Server1', value: 'server1' }],
+      },
+      //multi value variable
+      {
+        name: 'multi',
+        type: 'datasource',
+        multi: true,
+        current: { text: 'Server1,Server2', value: ['server-1', 'server-2'] },
+        options: [
+          { text: 'Server1', value: 'server1' },
+          { text: 'Server2', value: 'server2' },
+        ],
+      },
+    ] as TypedVariableModel[]),
 }));
 
 interface ScenarioContext {
@@ -405,4 +426,53 @@ describe('PanelQueryRunner', () => {
       snapshotData,
     }
   );
+
+  describeQueryRunnerScenario(
+    'shouldAddErrorwhenDatasourceVariableIsMultiple',
+    (ctx) => {
+      it('should add error when datasource variable is multiple and not repeated', async () => {
+        // scopedVars is an object that represent the variables repeated in a panel
+        const scopedVars = {
+          server: { text: 'Server1', value: 'server-1' },
+        };
+
+        // We are spying on the replace method of the TemplateSrvMock to check if the custom format function is being called
+        const spyReplace = jest.spyOn(TemplateSrvMock.prototype, 'replace');
+
+        const response = {
+          data: [
+            {
+              target: 'hello',
+              datapoints: [
+                [1, 1000],
+                [2, 2000],
+              ],
+            },
+          ],
+        };
+
+        const datasource = {
+          name: '${multi}',
+          uid: '${multi}',
+          interval: ctx.dsInterval,
+          query: (options: grafanaData.DataQueryRequest) => {
+            ctx.queryCalledWith = options;
+            return Promise.resolve(response);
+          },
+          getRef: () => ({ type: 'test', uid: 'TestDB-uid' }),
+          testDatasource: jest.fn(),
+        } as unknown as DataSourceApi;
+
+        ctx.runner.shouldAddErrorWhenDatasourceVariableIsMultiple(datasource, scopedVars);
+
+        // the test is checking implementation details :(, but it is the only way to check if the error will be added
+        // if the getTemplateSrv.replace is called with the custom format function,it means we will check
+        // if the error should be added
+        expect(spyReplace.mock.calls[0][2]).toBeInstanceOf(Function);
+      });
+    },
+    {
+      ...defaultPanelConfig,
+    }
+  );
 });
diff --git a/public/app/features/query/state/PanelQueryRunner.ts b/public/app/features/query/state/PanelQueryRunner.ts
index 8ba3e9c91f60c..87bb9bf93f511 100644
--- a/public/app/features/query/state/PanelQueryRunner.ts
+++ b/public/app/features/query/state/PanelQueryRunner.ts
@@ -1,4 +1,4 @@
-import { cloneDeep } from 'lodash';
+import { cloneDeep, merge } from 'lodash';
 import { Observable, of, ReplaySubject, Unsubscribable } from 'rxjs';
 import { map, mergeMap, catchError } from 'rxjs/operators';
 
@@ -28,6 +28,7 @@ import {
   preProcessPanelData,
   ApplyFieldOverrideOptions,
   StreamingDataFrame,
+  DataTopic,
 } from '@grafana/data';
 import { toDataQueryError } from '@grafana/runtime';
 import { ExpressionDatasourceRef } from '@grafana/runtime/src/utils/DataSourceWithBackend';
@@ -49,6 +50,7 @@ export interface QueryRunnerOptions<
   datasource: DataSourceRef | DataSourceApi<TQuery, TOptions> | null;
   queries: TQuery[];
   panelId?: number;
+  panelPluginId?: string;
   dashboardUID?: string;
   timezone: TimeZone;
   timeRange: TimeRange;
@@ -138,9 +140,14 @@ export class PanelQueryRunner {
 
             if (withFieldConfig && data.series?.length) {
               if (lastConfigRev === this.dataConfigSource.configRev) {
-                const streamingDataFrame = data.series.find((data) => isStreamingDataFrame(data)) as
-                  | StreamingDataFrame
-                  | undefined;
+                let streamingDataFrame: StreamingDataFrame | undefined;
+
+                for (const frame of data.series) {
+                  if (isStreamingDataFrame(frame)) {
+                    streamingDataFrame = frame;
+                    break;
+                  }
+                }
 
                 if (
                   streamingDataFrame &&
@@ -213,7 +220,8 @@ export class PanelQueryRunner {
   private applyTransformations(data: PanelData): Observable<PanelData> {
     const transformations = this.dataConfigSource.getTransformations();
 
-    if (!transformations || transformations.length === 0) {
+    const allTransformationsDisabled = transformations && transformations.every((t) => t.disabled);
+    if (allTransformationsDisabled || !transformations || transformations.length === 0) {
       return of(data);
     }
 
@@ -221,8 +229,18 @@ export class PanelQueryRunner {
       interpolate: (v: string) => this.templateSrv.replace(v, data?.request?.scopedVars),
     };
 
-    return transformDataFrame(transformations, data.series, ctx).pipe(
-      map((series) => ({ ...data, series })),
+    let seriesTransformations = transformations.filter((t) => t.topic == null || t.topic === DataTopic.Series);
+    let annotationsTransformations = transformations.filter((t) => t.topic === DataTopic.Annotations);
+
+    let seriesStream = transformDataFrame(seriesTransformations, data.series, ctx);
+    let annotationsStream = transformDataFrame(annotationsTransformations, data.annotations ?? [], ctx);
+
+    return merge(seriesStream, annotationsStream).pipe(
+      map((frames) => {
+        let isAnnotations = frames.some((f) => f.meta?.dataTopic === DataTopic.Annotations);
+        let transformed = isAnnotations ? { annotations: frames } : { series: frames };
+        return { ...data, ...transformed };
+      }),
       catchError((err) => {
         console.warn('Error running transformation:', err);
         return of({
@@ -240,6 +258,7 @@ export class PanelQueryRunner {
       timezone,
       datasource,
       panelId,
+      panelPluginId,
       dashboardUID,
       timeRange,
       timeInfo,
@@ -256,11 +275,15 @@ export class PanelQueryRunner {
       return;
     }
 
+    //check if datasource is a variable datasource and if that variable has multiple values
+    const addErroDSVariable = this.shouldAddErrorWhenDatasourceVariableIsMultiple(datasource, scopedVars);
+
     const request: DataQueryRequest = {
       app: app ?? CoreApp.Dashboard,
       requestId: getNextRequestId(),
       timezone,
       panelId,
+      panelPluginId,
       dashboardUID,
       range: timeRange,
       timeInfo,
@@ -303,11 +326,11 @@ export class PanelQueryRunner {
 
       request.interval = norm.interval;
       request.intervalMs = norm.intervalMs;
-      request.filters = this.templateSrv.getAdhocFilters(ds.name);
+      request.filters = this.templateSrv.getAdhocFilters(ds.name, true);
 
       this.lastRequest = request;
 
-      this.pipeToSubject(runRequest(ds, request), panelId);
+      this.pipeToSubject(runRequest(ds, request), panelId, false, addErroDSVariable);
     } catch (err) {
       this.pipeToSubject(
         of({
@@ -321,7 +344,12 @@ export class PanelQueryRunner {
     }
   }
 
-  private pipeToSubject(observable: Observable<PanelData>, panelId?: number, skipPreProcess = false) {
+  private pipeToSubject(
+    observable: Observable<PanelData>,
+    panelId?: number,
+    skipPreProcess = false,
+    addErroDSVariable = false
+  ) {
     if (this.subscription) {
       this.subscription.unsubscribe();
     }
@@ -336,9 +364,42 @@ export class PanelQueryRunner {
 
     this.subscription = panelData.subscribe({
       next: (data) => {
-        this.lastResult = skipPreProcess ? data : preProcessPanelData(data, this.lastResult);
+        const last = this.lastResult;
+        const next = skipPreProcess ? data : preProcessPanelData(data, last);
+
+        if (last != null && next.state !== LoadingState.Streaming) {
+          let sameSeries = compareArrayValues(last.series ?? [], next.series ?? [], (a, b) => a === b);
+          let sameAnnotations = compareArrayValues(last.annotations ?? [], next.annotations ?? [], (a, b) => a === b);
+          let sameState = last.state === next.state;
+
+          if (sameSeries) {
+            next.series = last.series;
+          }
+
+          if (sameAnnotations) {
+            next.annotations = last.annotations;
+          }
+
+          if (sameSeries && sameAnnotations && sameState) {
+            return;
+          }
+        }
+
+        this.lastResult = next;
+
+        //add error message if datasource is a variable and has multiple values
+        if (addErroDSVariable) {
+          next.errors = [
+            {
+              message:
+                'Panel is using a variable datasource with multiple values without repeat option. Please configure the panel to be repeated by the same datasource variable.',
+            },
+          ];
+          next.state = LoadingState.Error;
+        }
+
         // Store preprocessed query results for applying overrides later on in the pipeline
-        this.subject.next(this.lastResult);
+        this.subject.next(next);
       },
     });
   }
@@ -409,6 +470,28 @@ export class PanelQueryRunner {
   getLastRequest(): DataQueryRequest | undefined {
     return this.lastRequest;
   }
+
+  shouldAddErrorWhenDatasourceVariableIsMultiple(
+    datasource: DataSourceRef | DataSourceApi | null,
+    scopedVars: ScopedVars | undefined
+  ): boolean {
+    let addWarningMessageMultipleDatasourceVariable = false;
+
+    //If datasource is a variable
+    if (datasource?.uid?.startsWith('${')) {
+      // we can access the raw datasource variable values inside the replace function if we pass a custom format function
+      this.templateSrv.replace(datasource.uid, scopedVars, (value: string | string[]) => {
+        // if the variable has multiple values it means it's not being repeated
+        if (Array.isArray(value) && value.length > 1) {
+          addWarningMessageMultipleDatasourceVariable = true;
+        }
+        // return empty string to avoid replacing the variable
+        return '';
+      });
+    }
+
+    return addWarningMessageMultipleDatasourceVariable;
+  }
 }
 
 async function getDataSource(
diff --git a/public/app/features/query/state/__mocks__/mockDataSource.ts b/public/app/features/query/state/__mocks__/mockDataSource.ts
new file mode 100644
index 0000000000000..98f83e645d871
--- /dev/null
+++ b/public/app/features/query/state/__mocks__/mockDataSource.ts
@@ -0,0 +1,77 @@
+import { Observable } from 'rxjs';
+
+import {
+  DataQuery,
+  DataSourceJsonData,
+  PluginMetaInfo,
+  DataSourcePluginMeta,
+  PluginType,
+  DataSourceInstanceSettings,
+  DataSourceApi,
+  DataQueryRequest,
+  DataQueryResponse,
+  TestDataSourceResponse,
+} from '@grafana/data';
+
+export interface TestQuery extends DataQuery {
+  q?: string;
+}
+
+export interface TestJsonData extends DataSourceJsonData {
+  url?: string;
+}
+
+const info: PluginMetaInfo = {
+  author: {
+    name: '',
+  },
+  description: '',
+  links: [],
+  logos: {
+    large: '',
+    small: '',
+  },
+  screenshots: [],
+  updated: '',
+  version: '',
+};
+
+export const meta: DataSourcePluginMeta<DataSourceJsonData> = {
+  id: '',
+  name: '',
+  type: PluginType.datasource,
+  info,
+  module: '',
+  baseUrl: '',
+};
+
+export const TestDataSettings: DataSourceInstanceSettings<TestJsonData> = {
+  jsonData: { url: 'http://localhost:3000' },
+  id: 0,
+  uid: '',
+  type: '',
+  name: 'Test Datasource',
+  meta,
+  readOnly: false,
+  access: 'direct',
+};
+
+export class TestDataSource extends DataSourceApi<TestQuery, DataSourceJsonData, {}> {
+  constructor(instanceSettings: DataSourceInstanceSettings<TestJsonData> = TestDataSettings) {
+    super(instanceSettings);
+  }
+
+  query(request: DataQueryRequest<TestQuery>): Promise<DataQueryResponse> | Observable<DataQueryResponse> {
+    return Promise.resolve({
+      data: [],
+    });
+  }
+
+  testDatasource(): Promise<TestDataSourceResponse> {
+    throw new Error('Method not implemented.');
+  }
+}
+
+export const getMockDataSource = () => {
+  return new TestDataSource();
+};
diff --git a/public/app/features/query/state/mergePanelAndDashData.test.ts b/public/app/features/query/state/mergePanelAndDashData.test.ts
index 06c3fff4ea166..173de51a8faa1 100644
--- a/public/app/features/query/state/mergePanelAndDashData.test.ts
+++ b/public/app/features/query/state/mergePanelAndDashData.test.ts
@@ -1,9 +1,15 @@
 import { TestScheduler } from 'rxjs/testing';
 
-import { AlertState, getDefaultTimeRange, LoadingState, PanelData, toDataFrame } from '@grafana/data';
+import { AlertState, DataTopic, getDefaultTimeRange, LoadingState, PanelData, toDataFrame } from '@grafana/data';
 
 import { mergePanelAndDashData } from './mergePanelAndDashData';
 
+function toAnnotationFrame(data: Array<Record<string, string>>) {
+  let frame = toDataFrame(data);
+  frame.meta = { dataTopic: DataTopic.Annotations };
+  return frame;
+}
+
 function getTestContext() {
   const timeRange = getDefaultTimeRange();
   const panelData: PanelData = {
@@ -34,7 +40,7 @@ describe('mergePanelAndDashboardData', () => {
           a: {
             state: LoadingState.Done,
             series: [],
-            annotations: [toDataFrame([{ id: 'panelData' }]), toDataFrame([{ id: 'dashData' }])],
+            annotations: [toAnnotationFrame([{ id: 'panelData' }]), toAnnotationFrame([{ id: 'dashData' }])],
             timeRange,
           },
         });
@@ -63,7 +69,7 @@ describe('mergePanelAndDashboardData', () => {
           a: {
             state: LoadingState.Done,
             series: [],
-            annotations: [toDataFrame([{ id: 'panelData' }]), toDataFrame([])],
+            annotations: [toAnnotationFrame([{ id: 'panelData' }]), toAnnotationFrame([])],
             alertState: { id: 1, state: AlertState.OK, dashboardId: 1, panelId: 1, newStateDate: '' },
             timeRange,
           },
@@ -92,7 +98,7 @@ describe('mergePanelAndDashboardData', () => {
           a: {
             state: LoadingState.Done,
             series: [],
-            annotations: [toDataFrame([{ id: 'panelData' }])],
+            annotations: [toAnnotationFrame([{ id: 'panelData' }])],
             timeRange,
           },
         });
diff --git a/public/app/features/query/state/mergePanelAndDashData.ts b/public/app/features/query/state/mergePanelAndDashData.ts
index f661b7dd64936..ed81f48c2d009 100644
--- a/public/app/features/query/state/mergePanelAndDashData.ts
+++ b/public/app/features/query/state/mergePanelAndDashData.ts
@@ -1,10 +1,19 @@
 import { combineLatest, Observable, of } from 'rxjs';
 import { mergeMap } from 'rxjs/operators';
 
-import { ArrayDataFrame, PanelData } from '@grafana/data';
+import { arrayToDataFrame, DataFrame, DataTopic, PanelData } from '@grafana/data';
 
 import { DashboardQueryRunnerResult } from './DashboardQueryRunner/types';
 
+function addAnnoDataTopic(annotations: DataFrame[] = []) {
+  annotations.forEach((f) => {
+    f.meta = {
+      ...f.meta,
+      dataTopic: DataTopic.Annotations,
+    };
+  });
+}
+
 export function mergePanelAndDashData(
   panelObservable: Observable<PanelData>,
   dashObservable: Observable<DashboardQueryRunnerResult>
@@ -18,11 +27,16 @@ export function mergePanelAndDashData(
           panelData.annotations = [];
         }
 
-        const annotations = panelData.annotations.concat(new ArrayDataFrame(dashData.annotations));
+        const annotations = panelData.annotations.concat(arrayToDataFrame(dashData.annotations));
+
+        addAnnoDataTopic(annotations);
+
         const alertState = dashData.alertState;
         return of({ ...panelData, annotations, alertState });
       }
 
+      addAnnoDataTopic(panelData.annotations);
+
       return of(panelData);
     })
   );
diff --git a/public/app/features/query/state/queryAnalytics.test.ts b/public/app/features/query/state/queryAnalytics.test.ts
index b4a7de819f2af..2d0dadf99d8b9 100644
--- a/public/app/features/query/state/queryAnalytics.test.ts
+++ b/public/app/features/query/state/queryAnalytics.test.ts
@@ -2,11 +2,12 @@ import {
   CoreApp,
   DataFrame,
   DataQueryError,
-  DataQueryRequest,
+  getDefaultTimeRange,
   DataSourceApi,
   dateTime,
   LoadingState,
   PanelData,
+  DataQueryRequest,
 } from '@grafana/data';
 import { MetaAnalyticsEventName, reportMetaAnalytics } from '@grafana/runtime';
 
@@ -84,155 +85,202 @@ const multipleDataframesWithSameRefId = [
   },
 ];
 
-function getTestData(requestApp: string, series: DataFrame[] = []): PanelData {
+function getTestData(
+  overrides: Partial<DataQueryRequest> = {},
+  series?: DataFrame[],
+  errors?: DataQueryError[]
+): PanelData {
   const now = dateTime();
   return {
     request: {
-      app: requestApp,
-      panelId: 2,
+      app: CoreApp.Dashboard,
       startTime: now.unix(),
       endTime: now.add(1, 's').unix(),
-    } as DataQueryRequest,
-    series,
-    state: LoadingState.Done,
-    timeRange: {
-      from: dateTime(),
-      to: dateTime(),
-      raw: { from: '1h', to: 'now' },
+      interval: '1s',
+      intervalMs: 1000,
+      range: getDefaultTimeRange(),
+      requestId: '1',
+      scopedVars: {},
+      targets: [],
+      timezone: 'utc',
+      panelPluginId: 'timeseries',
+      ...overrides,
     },
-  };
-}
-
-function getTestDataForExplore(requestApp: string, series: DataFrame[] = []): PanelData {
-  const now = dateTime();
-  const error: DataQueryError = { message: 'test error' };
-
-  return {
-    request: {
-      app: requestApp,
-      startTime: now.unix(),
-      endTime: now.add(1, 's').unix(),
-    } as DataQueryRequest,
-    series,
+    series: series || [],
     state: LoadingState.Done,
-    timeRange: {
-      from: dateTime(),
-      to: dateTime(),
-      raw: { from: '1h', to: 'now' },
-    },
-    error: error,
+    timeRange: getDefaultTimeRange(),
+    errors,
   };
 }
 
-describe('emitDataRequestEvent - from a dashboard panel', () => {
-  it('Should report meta analytics', () => {
-    const data = getTestData(CoreApp.Dashboard);
-    emitDataRequestEvent(datasource)(data);
-
-    expect(reportMetaAnalytics).toBeCalledTimes(1);
-    expect(reportMetaAnalytics).toBeCalledWith(
-      expect.objectContaining({
-        eventName: MetaAnalyticsEventName.DataRequest,
-        datasourceName: datasource.name,
-        datasourceUid: datasource.uid,
-        datasourceType: datasource.type,
-        source: 'dashboard',
+describe('emitDataRequestEvent', () => {
+  describe('From a dashboard panel', () => {
+    it('Should report meta analytics', () => {
+      const data = getTestData({
         panelId: 2,
-        dashboardUid: 'test', // from dashboard srv
-        dataSize: 0,
-        duration: 1,
-        totalQueries: 0,
-        cachedQueries: 0,
-      })
-    );
-  });
+      });
+      emitDataRequestEvent(datasource)(data);
 
-  it('Should report meta analytics with counts for cached and total queries', () => {
-    const data = getTestData(CoreApp.Dashboard, partiallyCachedSeries);
-    emitDataRequestEvent(datasource)(data);
-
-    expect(reportMetaAnalytics).toBeCalledTimes(1);
-    expect(reportMetaAnalytics).toBeCalledWith(
-      expect.objectContaining({
-        eventName: MetaAnalyticsEventName.DataRequest,
-        datasourceName: datasource.name,
-        datasourceUid: datasource.uid,
-        datasourceType: datasource.type,
-        source: 'dashboard',
-        panelId: 2,
-        dashboardUid: 'test',
-        dataSize: 2,
-        duration: 1,
-        totalQueries: 2,
-        cachedQueries: 1,
-      })
-    );
+      expect(reportMetaAnalytics).toBeCalledTimes(1);
+      expect(reportMetaAnalytics).toBeCalledWith(
+        expect.objectContaining({
+          eventName: MetaAnalyticsEventName.DataRequest,
+          datasourceName: datasource.name,
+          datasourceUid: datasource.uid,
+          datasourceType: datasource.type,
+          source: CoreApp.Dashboard,
+          panelId: 2,
+          dashboardUid: 'test', // from dashboard srv
+          dataSize: 0,
+          duration: 1,
+          totalQueries: 0,
+          cachedQueries: 0,
+          panelPluginId: 'timeseries',
+        })
+      );
+    });
+
+    it('Should report meta analytics with counts for cached and total queries', () => {
+      const data = getTestData(
+        {
+          panelId: 2,
+        },
+        partiallyCachedSeries
+      );
+      emitDataRequestEvent(datasource)(data);
+
+      expect(reportMetaAnalytics).toBeCalledTimes(1);
+      expect(reportMetaAnalytics).toBeCalledWith(
+        expect.objectContaining({
+          eventName: MetaAnalyticsEventName.DataRequest,
+          datasourceName: datasource.name,
+          datasourceUid: datasource.uid,
+          datasourceType: datasource.type,
+          source: CoreApp.Dashboard,
+          panelId: 2,
+          dashboardUid: 'test',
+          dataSize: 2,
+          duration: 1,
+          totalQueries: 2,
+          cachedQueries: 1,
+          panelPluginId: 'timeseries',
+        })
+      );
+    });
+
+    it('Should report meta analytics with counts for cached and total queries when same refId spread across multiple DataFrames', () => {
+      const data = getTestData(
+        {
+          panelId: 2,
+        },
+        multipleDataframesWithSameRefId
+      );
+      emitDataRequestEvent(datasource)(data);
+
+      expect(reportMetaAnalytics).toBeCalledTimes(1);
+      expect(reportMetaAnalytics).toBeCalledWith(
+        expect.objectContaining({
+          eventName: MetaAnalyticsEventName.DataRequest,
+          datasourceName: datasource.name,
+          datasourceUid: datasource.uid,
+          datasourceType: datasource.type,
+          source: CoreApp.Dashboard,
+          panelId: 2,
+          dashboardUid: 'test', // from dashboard srv
+          dataSize: 2,
+          duration: 1,
+          totalQueries: 1,
+          cachedQueries: 1,
+          panelPluginId: 'timeseries',
+        })
+      );
+    });
+
+    it('Should not report meta analytics twice if the request receives multiple responses', () => {
+      const data = getTestData();
+      const fn = emitDataRequestEvent(datasource);
+      fn(data);
+      fn(data);
+      expect(reportMetaAnalytics).toBeCalledTimes(1);
+    });
+
+    it('Should not report meta analytics in edit mode', () => {
+      mockGetUrlSearchParams.mockImplementationOnce(() => {
+        return { editPanel: 2 };
+      });
+      const data = getTestData();
+      emitDataRequestEvent(datasource)(data);
+      expect(reportMetaAnalytics).not.toBeCalled();
+    });
   });
 
-  it('Should report meta analytics with counts for cached and total queries when same refId spread across multiple DataFrames', () => {
-    const data = getTestData(CoreApp.Dashboard, multipleDataframesWithSameRefId);
-    emitDataRequestEvent(datasource)(data);
-
-    expect(reportMetaAnalytics).toBeCalledTimes(1);
-    expect(reportMetaAnalytics).toBeCalledWith(
-      expect.objectContaining({
-        eventName: MetaAnalyticsEventName.DataRequest,
-        datasourceName: datasource.name,
-        datasourceUid: datasource.uid,
-        datasourceType: datasource.type,
-        source: 'dashboard',
-        panelId: 2,
-        dashboardUid: 'test', // from dashboard srv
-        dataSize: 2,
-        duration: 1,
-        totalQueries: 1,
-        cachedQueries: 1,
-      })
+  // Previously we filtered out Explore and Correlations events due to too many errors being generated while a user is building a query
+  // This tests that we send an event for both queries but do not record errors
+  describe('From Explore', () => {
+    const data = getTestData(
+      {
+        app: CoreApp.Explore,
+      },
+      undefined,
+      [{ message: 'test error' }]
     );
-  });
 
-  it('Should not report meta analytics twice if the request receives multiple responses', () => {
-    const data = getTestData(CoreApp.Dashboard);
-    const fn = emitDataRequestEvent(datasource);
-    fn(data);
-    fn(data);
-    expect(reportMetaAnalytics).toBeCalledTimes(1);
-  });
+    it('Should report meta analytics', () => {
+      emitDataRequestEvent(datasource)(data);
 
-  it('Should not report meta analytics in edit mode', () => {
-    mockGetUrlSearchParams.mockImplementationOnce(() => {
-      return { editPanel: 2 };
+      expect(reportMetaAnalytics).toBeCalledTimes(1);
+      expect(reportMetaAnalytics).toBeCalledWith(
+        expect.objectContaining({
+          eventName: MetaAnalyticsEventName.DataRequest,
+          source: CoreApp.Explore,
+          datasourceName: 'test',
+          datasourceUid: 'test',
+          dataSize: 0,
+          duration: 1,
+          totalQueries: 0,
+          panelPluginId: 'timeseries',
+        })
+      );
+    });
+
+    it('Should not report errors', () => {
+      emitDataRequestEvent(datasource)(data);
+
+      expect(reportMetaAnalytics).toBeCalledTimes(1);
+      expect(reportMetaAnalytics).toBeCalledWith(expect.not.objectContaining({ error: 'test error' }));
     });
-    const data = getTestData(CoreApp.Dashboard);
-    emitDataRequestEvent(datasource)(data);
-    expect(reportMetaAnalytics).not.toBeCalled();
   });
-});
 
-// Previously we filtered out Explore events due to too many errors being generated while a user is building a query
-// This tests that we send an event for Explore queries but do not record errors
-describe('emitDataRequestEvent - from Explore', () => {
-  it('Should report meta analytics', () => {
-    const data = getTestDataForExplore(CoreApp.Explore);
-    emitDataRequestEvent(datasource)(data);
-
-    expect(reportMetaAnalytics).toBeCalledTimes(1);
-    expect(reportMetaAnalytics).toBeCalledWith(
-      expect.objectContaining({
-        eventName: MetaAnalyticsEventName.DataRequest,
-        source: 'explore',
-        datasourceName: 'test',
-        datasourceUid: 'test',
-        dataSize: 0,
-        duration: 1,
-        totalQueries: 0,
-      })
+  // Previously we filtered out Explore and Correlations events due to too many errors being generated while a user is building a query
+  // This tests that we send an event for both queries but do not record errors
+  describe('From Correlations', () => {
+    const data = getTestData(
+      {
+        app: CoreApp.Correlations,
+      },
+      undefined,
+      [{ message: 'some error' }]
     );
-  });
 
-  describe('emitDataRequestEvent - from Explore', () => {
+    it('Should report meta analytics', () => {
+      emitDataRequestEvent(datasource)(data);
+
+      expect(reportMetaAnalytics).toBeCalledTimes(1);
+      expect(reportMetaAnalytics).toBeCalledWith(
+        expect.objectContaining({
+          eventName: MetaAnalyticsEventName.DataRequest,
+          source: CoreApp.Correlations,
+          datasourceName: 'test',
+          datasourceUid: 'test',
+          dataSize: 0,
+          duration: 1,
+          totalQueries: 0,
+          panelPluginId: 'timeseries',
+        })
+      );
+    });
+
     it('Should not report errors', () => {
-      const data = getTestDataForExplore(CoreApp.Explore);
       emitDataRequestEvent(datasource)(data);
 
       expect(reportMetaAnalytics).toBeCalledTimes(1);
diff --git a/public/app/features/query/state/queryAnalytics.ts b/public/app/features/query/state/queryAnalytics.ts
index 71c261d18bd1c..337fe6d4b00aa 100644
--- a/public/app/features/query/state/queryAnalytics.ts
+++ b/public/app/features/query/state/queryAnalytics.ts
@@ -1,4 +1,4 @@
-import { PanelData, LoadingState, DataSourceApi, CoreApp, urlUtil } from '@grafana/data';
+import { PanelData, LoadingState, DataSourceApi, urlUtil, CoreApp } from '@grafana/data';
 import { reportMetaAnalytics, MetaAnalyticsEventName, DataRequestEventPayload } from '@grafana/runtime';
 
 import { getDashboardSrv } from '../../dashboard/services/DashboardSrv';
@@ -28,13 +28,15 @@ export function emitDataRequestEvent(datasource: DataSourceApi) {
       datasourceUid: datasource.uid,
       datasourceType: datasource.type,
       dataSize: 0,
+      panelId: 0,
+      panelPluginId: data.request?.panelPluginId,
       duration: data.request.endTime! - data.request.startTime,
     };
 
-    if (data.request.app === CoreApp.Explore || data.request.app === CoreApp.Correlations) {
-      enrichWithInfo(eventData, data);
-    } else {
-      enrichWithDashboardInfo(eventData, data);
+    enrichWithInfo(eventData, data);
+
+    if (data.request.app !== CoreApp.Explore && data.request.app !== CoreApp.Correlations) {
+      enrichWithErrorData(eventData, data);
     }
 
     if (data.series && data.series.length > 0) {
@@ -50,11 +52,6 @@ export function emitDataRequestEvent(datasource: DataSourceApi) {
   };
 
   function enrichWithInfo(eventData: DataRequestEventPayload, data: PanelData) {
-    const totalQueries = Object.keys(data.series).length;
-    eventData.totalQueries = totalQueries;
-  }
-
-  function enrichWithDashboardInfo(eventData: DataRequestEventPayload, data: PanelData) {
     const queryCacheStatus: { [key: string]: boolean } = {};
     for (let i = 0; i < data.series.length; i++) {
       const refId = data.series[i].refId;
@@ -62,12 +59,12 @@ export function emitDataRequestEvent(datasource: DataSourceApi) {
         queryCacheStatus[refId] = data.series[i].meta?.isCachedResponse ?? false;
       }
     }
-    const totalQueries = Object.keys(queryCacheStatus).length;
-    const cachedQueries = Object.values(queryCacheStatus).filter((val) => val === true).length;
 
-    eventData.panelId = data.request!.panelId;
-    eventData.totalQueries = totalQueries;
-    eventData.cachedQueries = cachedQueries;
+    eventData.totalQueries = Object.keys(queryCacheStatus).length;
+    eventData.cachedQueries = Object.values(queryCacheStatus).filter((val) => val === true).length;
+    if (data.request && Number.isInteger(data.request.panelId)) {
+      eventData.panelId = data.request.panelId;
+    }
 
     const dashboard = getDashboardSrv().getCurrent();
     if (dashboard) {
@@ -76,9 +73,13 @@ export function emitDataRequestEvent(datasource: DataSourceApi) {
       eventData.dashboardUid = dashboard.uid;
       eventData.folderName = dashboard.meta.folderTitle;
     }
+  }
+}
 
-    if (data.error) {
-      eventData.error = data.error.message;
-    }
+function enrichWithErrorData(eventData: DataRequestEventPayload, data: PanelData) {
+  if (data.errors?.length) {
+    eventData.error = data.errors.join(', ');
+  } else if (data.error) {
+    eventData.error = data.error.message;
   }
 }
diff --git a/public/app/features/query/state/runRequest.test.ts b/public/app/features/query/state/runRequest.test.ts
index 03334ea7dbfc6..bf789c25f6213 100644
--- a/public/app/features/query/state/runRequest.test.ts
+++ b/public/app/features/query/state/runRequest.test.ts
@@ -1,6 +1,7 @@
 import { Observable, Subscriber, Subscription } from 'rxjs';
 
 import {
+  CoreApp,
   DataFrame,
   DataQueryRequest,
   DataQueryResponse,
@@ -11,12 +12,15 @@ import {
   PanelData,
 } from '@grafana/data';
 import { setEchoSrv } from '@grafana/runtime';
+import { ExpressionDatasourceRef } from '@grafana/runtime/src/utils/DataSourceWithBackend';
+import { DataQuery } from '@grafana/schema';
 
 import { deepFreeze } from '../../../../test/core/redux/reducerTester';
 import { Echo } from '../../../core/services/echo/Echo';
 import { createDashboardModelFixture } from '../../dashboard/state/__fixtures__/dashboardFixtures';
 
-import { runRequest } from './runRequest';
+import { getMockDataSource, TestQuery } from './__mocks__/mockDataSource';
+import { callQueryMethod, runRequest } from './runRequest';
 
 jest.mock('app/core/services/backend_srv');
 
@@ -32,6 +36,12 @@ jest.mock('app/features/dashboard/services/DashboardSrv', () => ({
   },
 }));
 
+jest.mock('app/features/expressions/ExpressionDatasource', () => ({
+  dataSource: {
+    query: jest.fn(),
+  },
+}));
+
 class ScenarioCtx {
   ds!: DataSourceApi;
   request!: DataQueryRequest;
@@ -371,6 +381,215 @@ describe('runRequest', () => {
       expect(ctx.results[1].series.length).toBe(1);
     });
   });
+
+  runRequestScenario('When some queries are hidden', (ctx) => {
+    ctx.setup(() => {
+      ctx.request.targets = [{ refId: 'A', hide: true }, { refId: 'B' }];
+      ctx.start();
+      ctx.emitPacket({
+        data: [
+          { name: 'DataA-1', refId: 'A' },
+          { name: 'DataA-2', refId: 'A' },
+          { name: 'DataB-1', refId: 'B' },
+          { name: 'DataB-2', refId: 'B' },
+        ],
+        key: 'A',
+      });
+    });
+
+    it('should filter out responses that are associated with the hidden queries', () => {
+      expect(ctx.results[0].series.length).toBe(2);
+      expect(ctx.results[0].series[0].name).toBe('DataB-1');
+      expect(ctx.results[0].series[1].name).toBe('DataB-2');
+    });
+  });
+});
+
+describe('callQueryMethod', () => {
+  let request: DataQueryRequest<TestQuery>;
+  let filterQuerySpy: jest.SpyInstance;
+  let querySpy: jest.SpyInstance;
+  let defaultQuerySpy: jest.SpyInstance;
+  let ds: DataSourceApi;
+
+  const setup = ({
+    targets,
+    filterQuery,
+    getDefaultQuery,
+    queryFunction,
+  }: {
+    targets: TestQuery[];
+    getDefaultQuery?: (app: CoreApp) => Partial<TestQuery>;
+    filterQuery?: typeof ds.filterQuery;
+    queryFunction?: typeof ds.query;
+  }) => {
+    request = {
+      range: {
+        from: dateTime(),
+        to: dateTime(),
+        raw: { from: '1h', to: 'now' },
+      },
+      targets,
+      requestId: '',
+      interval: '',
+      intervalMs: 0,
+      scopedVars: {},
+      timezone: '',
+      app: '',
+      startTime: 0,
+    };
+
+    const ds = getMockDataSource();
+    if (filterQuery) {
+      ds.filterQuery = filterQuery;
+      filterQuerySpy = jest.spyOn(ds, 'filterQuery');
+    }
+    if (getDefaultQuery) {
+      ds.getDefaultQuery = getDefaultQuery;
+      defaultQuerySpy = jest.spyOn(ds, 'getDefaultQuery');
+    }
+    querySpy = jest.spyOn(ds, 'query');
+    callQueryMethod(ds, request, queryFunction);
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('Should call filterQuery and exclude them from the request', async () => {
+    setup({
+      targets: [
+        {
+          refId: 'A',
+          q: 'SUM(foo)',
+        },
+        {
+          refId: 'B',
+          q: 'SUM(foo2)',
+        },
+        {
+          refId: 'C',
+          q: 'SUM(foo3)',
+        },
+      ],
+      filterQuery: (query: DataQuery) => query.refId !== 'A',
+    });
+    expect(filterQuerySpy).toHaveBeenCalledTimes(3);
+    expect(querySpy).toHaveBeenCalledWith(
+      expect.objectContaining({
+        targets: [
+          { q: 'SUM(foo2)', refId: 'B' },
+          { q: 'SUM(foo3)', refId: 'C' },
+        ],
+      })
+    );
+  });
+
+  it('Should not call query function in case targets are empty', async () => {
+    setup({
+      targets: [
+        {
+          refId: 'A',
+          q: 'SUM(foo)',
+        },
+        {
+          refId: 'B',
+          q: 'SUM(foo2)',
+        },
+        {
+          refId: 'C',
+          q: 'SUM(foo3)',
+        },
+      ],
+      filterQuery: (_: DataQuery) => false,
+    });
+    expect(filterQuerySpy).toHaveBeenCalledTimes(3);
+    expect(querySpy).not.toHaveBeenCalled();
+  });
+
+  it('Should not call filterQuery in case a custom query method is provided', async () => {
+    const queryFunctionMock = jest.fn().mockResolvedValue({ data: [] });
+    setup({
+      targets: [
+        {
+          refId: 'A',
+          q: 'SUM(foo)',
+        },
+        {
+          refId: 'B',
+          q: 'SUM(foo2)',
+        },
+        {
+          refId: 'C',
+          q: 'SUM(foo3)',
+        },
+      ],
+      queryFunction: queryFunctionMock,
+      filterQuery: (query: DataQuery) => query.refId !== 'A',
+    });
+    expect(filterQuerySpy).not.toHaveBeenCalled();
+    expect(queryFunctionMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        targets: [
+          { q: 'SUM(foo)', refId: 'A' },
+          { q: 'SUM(foo2)', refId: 'B' },
+          { q: 'SUM(foo3)', refId: 'C' },
+        ],
+      })
+    );
+  });
+
+  it('Should not call filterQuery when targets include expression query', async () => {
+    setup({
+      targets: [
+        {
+          refId: 'A',
+          q: 'SUM(foo)',
+        },
+        {
+          refId: 'B',
+          q: 'SUM(foo2)',
+        },
+        {
+          datasource: ExpressionDatasourceRef,
+          refId: 'C',
+          q: 'SUM(foo3)',
+        },
+      ],
+      filterQuery: (query: DataQuery) => query.refId !== 'A',
+    });
+    expect(filterQuerySpy).not.toHaveBeenCalled();
+  });
+
+  it('Should get ds default query when query is empty', async () => {
+    setup({
+      targets: [
+        {
+          refId: 'A',
+        },
+        {
+          refId: 'B',
+        },
+        {
+          refId: 'C',
+          q: 'SUM(foo3)',
+        },
+      ],
+      getDefaultQuery: (_: CoreApp) => ({
+        q: 'SUM(foo2)',
+      }),
+    });
+    expect(defaultQuerySpy).toHaveBeenCalledTimes(2);
+    expect(querySpy).toHaveBeenCalledWith(
+      expect.objectContaining({
+        targets: [
+          { q: 'SUM(foo2)', refId: 'A' },
+          { q: 'SUM(foo2)', refId: 'B' },
+          { q: 'SUM(foo3)', refId: 'C' },
+        ],
+      })
+    );
+  });
 });
 
 const expectThatRangeHasNotMutated = (ctx: ScenarioCtx) => {
diff --git a/public/app/features/query/state/runRequest.ts b/public/app/features/query/state/runRequest.ts
index c9195b45475db..7a4e6e2fdf752 100644
--- a/public/app/features/query/state/runRequest.ts
+++ b/public/app/features/query/state/runRequest.ts
@@ -18,13 +18,15 @@ import {
   PanelData,
   TimeRange,
 } from '@grafana/data';
-import { config, toDataQueryError, logError } from '@grafana/runtime';
+import { config, toDataQueryError } from '@grafana/runtime';
 import { isExpressionReference } from '@grafana/runtime/src/utils/DataSourceWithBackend';
 import { backendSrv } from 'app/core/services/backend_srv';
 import { queryIsEmpty } from 'app/core/utils/query';
 import { dataSource as expressionDatasource } from 'app/features/expressions/ExpressionDatasource';
 import { ExpressionQuery } from 'app/features/expressions/types';
 
+import { queryLogger } from '../utils';
+
 import { cancelNetworkRequestsOnUnsubscribe } from './processing/canceler';
 import { emitDataRequestEvent } from './queryAnalytics';
 
@@ -148,6 +150,12 @@ export function runRequest(
         throw new Error(`Expected response data to be array, got ${typeof packet.data}.`);
       }
 
+      // filter out responses for hidden queries
+      const hiddenQueries = request.targets.filter((q) => q.hide);
+      for (const query of hiddenQueries) {
+        packet.data = packet.data.filter((d) => d.refId !== query.refId);
+      }
+
       request.endTime = Date.now();
 
       state = processResponsePacket(packet, state);
@@ -157,7 +165,7 @@ export function runRequest(
     // handle errors
     catchError((err) => {
       console.error('runRequest.catchError', err);
-      logError(err);
+      queryLogger.logError(err);
       return of({
         ...state.panelData,
         state: LoadingState.Error,
@@ -204,6 +212,15 @@ export function callQueryMethod(
     }
   }
 
+  // do not filter queries in case a custom query function is provided (for example in variable queries)
+  if (!queryFunction) {
+    request.targets = request.targets.filter((t) => datasource.filterQuery?.(t) ?? true);
+  }
+
+  if (request.targets.length === 0) {
+    return of<DataQueryResponse>({ data: [] });
+  }
+
   // Otherwise it is a standard datasource request
   const returnVal = queryFunction ? queryFunction(request) : datasource.query(request);
   return from(returnVal);
diff --git a/public/app/features/query/state/updateQueries.test.ts b/public/app/features/query/state/updateQueries.test.ts
index 231a29822f7b2..de991e2b1f43b 100644
--- a/public/app/features/query/state/updateQueries.test.ts
+++ b/public/app/features/query/state/updateQueries.test.ts
@@ -577,7 +577,7 @@ describe('updateQueries with import', () => {
         importQueries: (queries, origin) => {
           return Promise.resolve([] as DataQuery[]);
         },
-      } as DataSourceApi<any>;
+      } as DataSourceApi;
 
       const oldUidDS = {
         uid: 'old-uid',
diff --git a/public/app/features/query/utils.ts b/public/app/features/query/utils.ts
new file mode 100644
index 0000000000000..32cd897d8ecf3
--- /dev/null
+++ b/public/app/features/query/utils.ts
@@ -0,0 +1,3 @@
+import { createMonitoringLogger } from '@grafana/runtime';
+
+export const queryLogger = createMonitoringLogger('features.query');
diff --git a/public/app/features/sandbox/TestStuffPage.tsx b/public/app/features/sandbox/TestStuffPage.tsx
index 4cdb3a5b7ecdc..c1e20ed8c87df 100644
--- a/public/app/features/sandbox/TestStuffPage.tsx
+++ b/public/app/features/sandbox/TestStuffPage.tsx
@@ -2,9 +2,15 @@ import React, { useMemo, useState } from 'react';
 import { useObservable } from 'react-use';
 import AutoSizer from 'react-virtualized-auto-sizer';
 
-import { ApplyFieldOverrideOptions, dateMath, FieldColorModeId, NavModelItem, PanelData } from '@grafana/data';
+import {
+  ApplyFieldOverrideOptions,
+  DataConfigSource,
+  dateMath,
+  FieldColorModeId,
+  NavModelItem,
+  PanelData,
+} from '@grafana/data';
 import { getPluginExtensions, isPluginExtensionLink } from '@grafana/runtime';
-import { DataTransformerConfig } from '@grafana/schema';
 import { Button, HorizontalGroup, LinkButton, Table } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import { config } from 'app/core/config';
@@ -129,8 +135,8 @@ export function getDefaultState(): State {
     theme: config.theme2,
   };
 
-  const dataConfig = {
-    getTransformations: () => [] as DataTransformerConfig[],
+  const dataConfig: DataConfigSource = {
+    getTransformations: () => [],
     getFieldOverrideOptions: () => options,
     getDataSupport: () => ({ annotations: false, alertStates: false }),
   };
diff --git a/public/app/features/scenes/SceneListPage.tsx b/public/app/features/scenes/SceneListPage.tsx
deleted file mode 100644
index 9310fd2802b69..0000000000000
--- a/public/app/features/scenes/SceneListPage.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-// Libraries
-import React from 'react';
-import { useAsync } from 'react-use';
-
-import { Stack } from '@grafana/experimental';
-import { Card } from '@grafana/ui';
-import { Page } from 'app/core/components/Page/Page';
-
-// Types
-import { getGrafanaSearcher } from '../search/service';
-
-import { getScenes } from './scenes';
-
-export interface Props {}
-
-export const SceneListPage = ({}: Props) => {
-  const scenes = getScenes();
-  const results = useAsync(() => {
-    return getGrafanaSearcher().starred({ starred: true });
-  }, []);
-
-  return (
-    <Page navId="scenes" subTitle="Experimental new runtime and state model for dashboards">
-      <Page.Contents>
-        <Stack direction="column" gap={1}>
-          <h5>Apps</h5>
-          <Stack direction="column" gap={0}>
-            <Card href={`/scenes/grafana-monitoring`}>
-              <Card.Heading>Grafana monitoring</Card.Heading>
-            </Card>
-          </Stack>
-          <h5>Test scenes</h5>
-          <Stack direction="column" gap={0}>
-            {scenes.map((scene) => (
-              <Card key={scene.title} href={`/scenes/${scene.title}`}>
-                <Card.Heading>{scene.title}</Card.Heading>
-              </Card>
-            ))}
-          </Stack>
-          {results.value && (
-            <>
-              <h5>Starred dashboards</h5>
-              <Stack direction="column" gap={0}>
-                {results.value!.view.map((dash) => (
-                  <Card href={`/scenes/dashboard/${dash.uid}`} key={dash.uid}>
-                    <Card.Heading>{dash.name}</Card.Heading>
-                  </Card>
-                ))}
-              </Stack>
-            </>
-          )}
-        </Stack>
-      </Page.Contents>
-    </Page>
-  );
-};
-
-export default SceneListPage;
diff --git a/public/app/features/scenes/ScenePage.tsx b/public/app/features/scenes/ScenePage.tsx
deleted file mode 100644
index eacdd2ae720a8..0000000000000
--- a/public/app/features/scenes/ScenePage.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-// Libraries
-import React, { useEffect, useState } from 'react';
-
-import { getUrlSyncManager } from '@grafana/scenes';
-import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
-
-import { getSceneByTitle } from './scenes';
-
-export interface Props extends GrafanaRouteComponentProps<{ name: string }> {}
-
-export const ScenePage = (props: Props) => {
-  const scene = getSceneByTitle(props.match.params.name);
-  const [isInitialized, setInitialized] = useState(false);
-
-  useEffect(() => {
-    if (scene && !isInitialized) {
-      getUrlSyncManager().initSync(scene);
-      setInitialized(true);
-    }
-  }, [isInitialized, scene]);
-
-  if (!scene) {
-    return <h2>Scene not found</h2>;
-  }
-
-  if (!isInitialized) {
-    return null;
-  }
-
-  return <scene.Component model={scene} />;
-};
-
-export default ScenePage;
diff --git a/public/app/features/scenes/apps/GrafanaMonitoringApp.tsx b/public/app/features/scenes/apps/GrafanaMonitoringApp.tsx
deleted file mode 100644
index a19e41bbdc75f..0000000000000
--- a/public/app/features/scenes/apps/GrafanaMonitoringApp.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-// Libraries
-import React, { useMemo, useState } from 'react';
-
-import { SceneApp, SceneAppPage, SceneRouteMatch, SceneAppPageLike } from '@grafana/scenes';
-import { usePageNav } from 'app/core/components/Page/usePageNav';
-import { PluginPageContext, PluginPageContextType } from 'app/features/plugins/components/PluginPageContext';
-
-import {
-  getOverviewScene,
-  getHttpHandlerListScene,
-  getOverviewLogsScene,
-  getHandlerDetailsScene,
-  getHandlerLogsScene,
-} from './scenes';
-import { getTrafficScene } from './traffic';
-
-export function GrafanaMonitoringApp() {
-  const appScene = useMemo(
-    () =>
-      new SceneApp({
-        pages: [getMainPageScene()],
-      }),
-    []
-  );
-
-  const sectionNav = usePageNav('scenes')!;
-  const [pluginContext] = useState<PluginPageContextType>({ sectionNav });
-
-  return (
-    <PluginPageContext.Provider value={pluginContext}>
-      <appScene.Component model={appScene} />
-    </PluginPageContext.Provider>
-  );
-}
-
-export function getMainPageScene() {
-  return new SceneAppPage({
-    title: 'Grafana Monitoring',
-    subTitle: 'A custom app with embedded scenes to monitor your Grafana server',
-    url: '/scenes/grafana-monitoring',
-    hideFromBreadcrumbs: false,
-    getScene: getOverviewScene,
-    tabs: [
-      new SceneAppPage({
-        title: 'Overview',
-        url: '/scenes/grafana-monitoring',
-        getScene: getOverviewScene,
-        preserveUrlKeys: ['from', 'to', 'var-instance'],
-      }),
-      new SceneAppPage({
-        title: 'HTTP handlers',
-        url: '/scenes/grafana-monitoring/handlers',
-        getScene: getHttpHandlerListScene,
-        preserveUrlKeys: ['from', 'to', 'var-instance'],
-        drilldowns: [
-          {
-            routePath: '/scenes/grafana-monitoring/handlers/:handler',
-            getPage: getHandlerDrilldownPage,
-          },
-        ],
-      }),
-      new SceneAppPage({
-        title: 'Traffic',
-        url: '/scenes/grafana-monitoring/traffic',
-        getScene: getTrafficScene,
-        preserveUrlKeys: ['from', 'to', 'var-instance'],
-      }),
-      new SceneAppPage({
-        title: 'Logs',
-        url: '/scenes/grafana-monitoring/logs',
-        getScene: getOverviewLogsScene,
-        preserveUrlKeys: ['from', 'to', 'var-instance'],
-      }),
-    ],
-  });
-}
-
-export function getHandlerDrilldownPage(
-  match: SceneRouteMatch<{ handler: string; tab?: string }>,
-  parent: SceneAppPageLike
-) {
-  const handler = decodeURIComponent(match.params.handler);
-  const baseUrl = `/scenes/grafana-monitoring/handlers/${encodeURIComponent(handler)}`;
-
-  return new SceneAppPage({
-    title: handler,
-    subTitle: 'A grafana http handler is responsible for service a specific API request',
-    url: baseUrl,
-    getParentPage: () => parent,
-    getScene: () => getHandlerDetailsScene(handler),
-    tabs: [
-      new SceneAppPage({
-        title: 'Metrics',
-        url: baseUrl,
-        routePath: '/scenes/grafana-monitoring/handlers/:handler',
-        getScene: () => getHandlerDetailsScene(handler),
-        preserveUrlKeys: ['from', 'to', 'var-instance'],
-      }),
-      new SceneAppPage({
-        title: 'Logs',
-        url: baseUrl + '/logs',
-        routePath: '/scenes/grafana-monitoring/handlers/:handler/logs',
-        getScene: () => getHandlerLogsScene(handler),
-        preserveUrlKeys: ['from', 'to', 'var-instance'],
-      }),
-    ],
-  });
-}
-
-export default GrafanaMonitoringApp;
diff --git a/public/app/features/scenes/apps/SceneRadioToggle.tsx b/public/app/features/scenes/apps/SceneRadioToggle.tsx
deleted file mode 100644
index 7834ac0b2b9c9..0000000000000
--- a/public/app/features/scenes/apps/SceneRadioToggle.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import React from 'react';
-
-import { SelectableValue } from '@grafana/data';
-import { SceneComponentProps, SceneObjectBase, SceneObjectState } from '@grafana/scenes';
-import { RadioButtonGroup } from '@grafana/ui';
-
-export interface SceneRadioToggleState extends SceneObjectState {
-  options: Array<SelectableValue<string>>;
-  value: string;
-  onChange: (value: string) => void;
-}
-
-export class SceneRadioToggle extends SceneObjectBase<SceneRadioToggleState> {
-  onChange = (value: string) => {
-    this.setState({ value });
-    this.state.onChange(value);
-  };
-
-  static Component = ({ model }: SceneComponentProps<SceneRadioToggle>) => {
-    const { options, value } = model.useState();
-
-    return <RadioButtonGroup options={options} value={value} onChange={model.onChange} />;
-  };
-}
diff --git a/public/app/features/scenes/apps/SceneSearchBox.tsx b/public/app/features/scenes/apps/SceneSearchBox.tsx
deleted file mode 100644
index 760799ec637ad..0000000000000
--- a/public/app/features/scenes/apps/SceneSearchBox.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react';
-
-import { SceneComponentProps, SceneObjectState, SceneObjectBase } from '@grafana/scenes';
-import { Input } from '@grafana/ui';
-
-export interface SceneSearchBoxState extends SceneObjectState {
-  value: string;
-}
-
-export class SceneSearchBox extends SceneObjectBase<SceneSearchBoxState> {
-  onChange = (evt: React.FormEvent<HTMLInputElement>) => {
-    this.setState({ value: evt.currentTarget.value });
-  };
-
-  static Component = ({ model }: SceneComponentProps<SceneSearchBox>) => {
-    const { value } = model.useState();
-
-    return <Input width={25} placeholder="Search..." value={value} onChange={model.onChange} />;
-  };
-}
diff --git a/public/app/features/scenes/apps/scenes.tsx b/public/app/features/scenes/apps/scenes.tsx
deleted file mode 100644
index a3fe07142680c..0000000000000
--- a/public/app/features/scenes/apps/scenes.tsx
+++ /dev/null
@@ -1,428 +0,0 @@
-import React from 'react';
-
-import { FieldColorModeId, getFrameDisplayName } from '@grafana/data';
-import { locationService } from '@grafana/runtime';
-import {
-  SceneFlexLayout,
-  SceneByFrameRepeater,
-  SceneTimePicker,
-  EmbeddedScene,
-  SceneDataNode,
-  SceneTimeRange,
-  VariableValueSelectors,
-  SceneQueryRunner,
-  SceneControlsSpacer,
-  SceneDataTransformer,
-  SceneRefreshPicker,
-  SceneFlexItem,
-  PanelBuilders,
-} from '@grafana/scenes';
-import { BigValueGraphMode, BigValueTextMode, LogsDedupStrategy, LogsSortOrder } from '@grafana/schema';
-import { LinkButton } from '@grafana/ui';
-
-import { SceneRadioToggle } from './SceneRadioToggle';
-import { SceneSearchBox } from './SceneSearchBox';
-import { getTableFilterTransform, getTimeSeriesFilterTransform } from './transforms';
-import { getInstantQuery, getLinkUrlWithAppUrlState, getTimeSeriesQuery, getVariablesDefinitions } from './utils';
-
-export function getHttpHandlerListScene(): EmbeddedScene {
-  const searchBox = new SceneSearchBox({ value: '' });
-
-  const httpHandlerQueries = getInstantQuery({
-    expr: 'sort_desc(avg without(job, instance) (rate(grafana_http_request_duration_seconds_sum[$__rate_interval]) * 1e3)) ',
-  });
-
-  const httpHandlerQueriesFiltered = new SceneDataTransformer({
-    $data: httpHandlerQueries,
-    transformations: [getTableFilterTransform('')],
-  });
-
-  httpHandlerQueriesFiltered.addActivationHandler(() => {
-    const sub = searchBox.subscribeToState((state) => {
-      // Update transform and re-process them
-      httpHandlerQueriesFiltered.setState({ transformations: [getTableFilterTransform(state.value)] });
-      httpHandlerQueriesFiltered.reprocessTransformations();
-    });
-
-    return () => sub.unsubscribe();
-  });
-
-  const httpHandlersTable = PanelBuilders.table()
-    .setTitle('Handlers')
-    .setData(httpHandlerQueriesFiltered)
-    .setOption('footer', {
-      enablePagination: true,
-    })
-    .setOverrides((b) =>
-      b
-        .matchFieldsWithNameByRegex('.*')
-        .overrideFilterable(false)
-        .matchFieldsWithName('Time')
-        .overrideCustomFieldConfig('hidden', true)
-        .matchFieldsWithName('Value')
-        .overrideDisplayName('Duration (Avg)')
-        .matchFieldsWithName('handler')
-        .overrideLinks([
-          {
-            title: 'Go to handler drilldown view',
-            url: '',
-            onBuildUrl: () => {
-              const params = locationService.getSearchObject();
-              return getLinkUrlWithAppUrlState(
-                '/scenes/grafana-monitoring/handlers/${__value.text:percentencode}',
-                params
-              );
-            },
-          },
-        ])
-    )
-    .build();
-
-  const reqDurationTimeSeries = new SceneQueryRunner({
-    datasource: { uid: 'gdev-prometheus' },
-    queries: [
-      {
-        refId: 'A',
-        //expr: ``,
-        expr: 'topk(20, avg without(job, instance) (rate(grafana_http_request_duration_seconds_sum[$__rate_interval])) * 1e3)',
-        range: true,
-        format: 'time_series',
-        legendFormat: '{{method}} {{handler}} (status = {{status_code}})',
-        maxDataPoints: 500,
-      },
-    ],
-  });
-
-  const reqDurationTimeSeriesFiltered = new SceneDataTransformer({
-    $data: reqDurationTimeSeries,
-    transformations: [getTimeSeriesFilterTransform('')],
-  });
-
-  reqDurationTimeSeriesFiltered.addActivationHandler(() => {
-    const sub = searchBox.subscribeToState((state) => {
-      // Update transform and re-process them
-      reqDurationTimeSeriesFiltered.setState({ transformations: [getTimeSeriesFilterTransform(state.value)] });
-      reqDurationTimeSeriesFiltered.reprocessTransformations();
-    });
-
-    return () => sub.unsubscribe();
-  });
-
-  const graphsScene = new SceneByFrameRepeater({
-    $data: reqDurationTimeSeriesFiltered,
-    body: new SceneFlexLayout({
-      direction: 'column',
-      children: [],
-    }),
-    getLayoutChild: (data, frame, frameIndex) => {
-      return new SceneFlexItem({
-        key: `panel-${frameIndex}`,
-        minHeight: 200,
-        $data: new SceneDataNode({
-          data: {
-            ...data,
-            series: [frame],
-          },
-        }),
-        body: new SceneFlexLayout({
-          direction: 'row',
-          key: `row-${frameIndex}`,
-          children: [
-            new SceneFlexItem({
-              key: `flex1-${frameIndex}`,
-              body: PanelBuilders.timeseries()
-                .setTitle(getFrameDisplayName(frame))
-                .setOption('legend', { showLegend: false })
-                .setHeaderActions(
-                  <LinkButton
-                    fill="text"
-                    size="sm"
-                    icon="arrow-right"
-                    href={getHandlerDrilldownUrl(frame.fields[1]!.labels!.handler)}
-                  >
-                    Details
-                  </LinkButton>
-                )
-                .build(),
-            }),
-
-            new SceneFlexItem({
-              key: `flex2-${frameIndex}`,
-              width: 200,
-              body: PanelBuilders.stat()
-                .setTitle('Last')
-                .setOption('graphMode', BigValueGraphMode.None)
-                .setOption('textMode', BigValueTextMode.Value)
-                .setDisplayName('Last')
-                .build(),
-            }),
-          ],
-        }),
-      });
-    },
-  });
-
-  const layout = new SceneFlexLayout({
-    children: [new SceneFlexItem({ body: httpHandlersTable })],
-  });
-
-  const sceneToggle = new SceneRadioToggle({
-    options: [
-      { value: 'table', label: 'Table' },
-      { value: 'graphs', label: 'Graphs' },
-    ],
-    value: 'table',
-    onChange: (value) => {
-      if (value === 'table') {
-        layout.setState({ children: [new SceneFlexItem({ body: httpHandlersTable })] });
-      } else {
-        layout.setState({ children: [graphsScene] });
-      }
-    },
-  });
-
-  const scene = new EmbeddedScene({
-    $variables: getVariablesDefinitions(),
-    $data: httpHandlerQueries,
-    $timeRange: new SceneTimeRange({ from: 'now-1h', to: 'now' }),
-    controls: [
-      new VariableValueSelectors({}),
-      searchBox,
-      new SceneControlsSpacer(),
-      sceneToggle,
-      new SceneTimePicker({ isOnCanvas: true }),
-      new SceneRefreshPicker({ isOnCanvas: true }),
-    ],
-    body: layout,
-  });
-
-  return scene;
-}
-
-function getHandlerDrilldownUrl(handler: string) {
-  const params = locationService.getSearchObject();
-  return getLinkUrlWithAppUrlState(`/scenes/grafana-monitoring/handlers/${encodeURIComponent(handler)}`, params);
-}
-
-export function getHandlerDetailsScene(handler: string): EmbeddedScene {
-  const reqDurationTimeSeries = getTimeSeriesQuery({
-    expr: `avg without(job, instance) (rate(grafana_http_request_duration_seconds_sum{handler="${handler}"}[$__rate_interval])) * 1e3`,
-    legendFormat: '{{method}} {{handler}} (status = {{status_code}})',
-  });
-
-  const reqCountTimeSeries = getTimeSeriesQuery({
-    expr: `sum without(job, instance) (rate(grafana_http_request_duration_seconds_count{handler="${handler}"}[$__rate_interval])) `,
-    legendFormat: '{{method}} {{handler}} (status = {{status_code}})',
-  });
-
-  const scene = new EmbeddedScene({
-    $variables: getVariablesDefinitions(),
-    $timeRange: new SceneTimeRange({ from: 'now-1h', to: 'now' }),
-    controls: [
-      new VariableValueSelectors({}),
-      new SceneControlsSpacer(),
-      new SceneTimePicker({ isOnCanvas: true }),
-      new SceneRefreshPicker({ isOnCanvas: true }),
-    ],
-    body: new SceneFlexLayout({
-      direction: 'column',
-      children: [
-        new SceneFlexItem({
-          body: PanelBuilders.timeseries().setData(reqDurationTimeSeries).setTitle('Request duration avg (ms)').build(),
-        }),
-        new SceneFlexItem({
-          body: PanelBuilders.timeseries().setData(reqCountTimeSeries).setTitle('Request count/s').build(),
-        }),
-      ],
-    }),
-  });
-
-  return scene;
-}
-
-export function getOverviewScene(): EmbeddedScene {
-  const scene = new EmbeddedScene({
-    $variables: getVariablesDefinitions(),
-    $timeRange: new SceneTimeRange({ from: 'now-1h', to: 'now' }),
-    controls: [
-      new VariableValueSelectors({}),
-      new SceneControlsSpacer(),
-      new SceneTimePicker({ isOnCanvas: true }),
-      new SceneRefreshPicker({ isOnCanvas: true }),
-    ],
-    body: new SceneFlexLayout({
-      direction: 'column',
-      children: [
-        new SceneFlexItem({
-          height: 150,
-          body: new SceneFlexLayout({
-            children: [
-              new SceneFlexItem({
-                body: getInstantStatPanel('grafana_stat_totals_dashboard', 'Dashboards'),
-              }),
-              new SceneFlexItem({
-                body: getInstantStatPanel('grafana_stat_total_users', 'Users'),
-              }),
-              new SceneFlexItem({
-                body: getInstantStatPanel('sum(grafana_stat_totals_datasource)', 'Data sources'),
-              }),
-              new SceneFlexItem({
-                body: getInstantStatPanel('grafana_stat_total_service_account_tokens', 'Service account tokens'),
-              }),
-            ],
-          }),
-        }),
-
-        new SceneFlexItem({
-          body: PanelBuilders.timeseries()
-            .setData(
-              new SceneQueryRunner({
-                datasource: { uid: 'gdev-prometheus' },
-                queries: [
-                  {
-                    refId: 'A',
-                    expr: `sum(process_resident_memory_bytes{job="grafana", instance=~"$instance"})`,
-                    range: true,
-                    format: 'time_series',
-                    maxDataPoints: 500,
-                  },
-                ],
-              })
-            )
-            .setTitle('Memory usage')
-            .setOption('legend', { showLegend: false })
-            .setUnit('bytes')
-            .setMin(0)
-            .setCustomFieldConfig('lineWidth', 2)
-            .setCustomFieldConfig('fillOpacity', 6)
-            .build(),
-        }),
-        new SceneFlexItem({
-          body: PanelBuilders.timeseries()
-            .setData(
-              new SceneQueryRunner({
-                datasource: { uid: 'gdev-prometheus' },
-                queries: [
-                  {
-                    refId: 'A',
-                    expr: `sum(go_goroutines{job="grafana", instance=~"$instance"})`,
-                    range: true,
-                    format: 'time_series',
-                    maxDataPoints: 500,
-                  },
-                ],
-              })
-            )
-            .setOption('legend', { showLegend: false })
-            .setMin(0)
-            .setCustomFieldConfig('lineWidth', 2)
-            .setCustomFieldConfig('fillOpacity', 6)
-            .setTitle('Go routines')
-            .build(),
-        }),
-      ],
-    }),
-  });
-
-  return scene;
-}
-
-function getInstantStatPanel(query: string, title: string) {
-  return PanelBuilders.stat()
-    .setData(getInstantQuery({ expr: query }))
-    .setTitle(title)
-    .setColor({ fixedColor: 'text', mode: FieldColorModeId.Fixed })
-    .build();
-}
-
-export function getHandlerLogsScene(handler: string): EmbeddedScene {
-  const logsQuery = new SceneQueryRunner({
-    datasource: { uid: 'gdev-loki' },
-    queries: [
-      {
-        refId: 'A',
-        expr: `{job="grafana"} | logfmt | handler=\`${handler}\` | __error__=\`\``,
-        queryType: 'range',
-        maxDataPoints: 5000,
-      },
-    ],
-  });
-
-  const scene = new EmbeddedScene({
-    $variables: getVariablesDefinitions(),
-    $timeRange: new SceneTimeRange({ from: 'now-1h', to: 'now' }),
-    controls: [
-      new VariableValueSelectors({}),
-      new SceneControlsSpacer(),
-      new SceneTimePicker({ isOnCanvas: true }),
-      new SceneRefreshPicker({ isOnCanvas: true }),
-    ],
-    body: new SceneFlexLayout({
-      direction: 'column',
-      children: [
-        new SceneFlexItem({
-          body: PanelBuilders.logs()
-            .setData(logsQuery)
-            .setTitle('')
-            .setOption('showTime', true)
-            .setOption('showLabels', false)
-            .setOption('showCommonLabels', false)
-            .setOption('wrapLogMessage', true)
-            .setOption('prettifyLogMessage', false)
-            .setOption('enableLogDetails', true)
-            .setOption('dedupStrategy', LogsDedupStrategy.none)
-            .setOption('sortOrder', LogsSortOrder.Descending)
-            .build(),
-        }),
-      ],
-    }),
-  });
-
-  return scene;
-}
-
-export function getOverviewLogsScene(): EmbeddedScene {
-  const logsQuery = new SceneQueryRunner({
-    datasource: { uid: 'gdev-loki' },
-    queries: [
-      {
-        refId: 'A',
-        expr: `{job="grafana"} | logfmt | __error__=\`\``,
-        queryType: 'range',
-        maxDataPoints: 5000,
-      },
-    ],
-  });
-
-  const scene = new EmbeddedScene({
-    $variables: getVariablesDefinitions(),
-    $timeRange: new SceneTimeRange({ from: 'now-1h', to: 'now' }),
-    controls: [
-      new VariableValueSelectors({}),
-      new SceneControlsSpacer(),
-      new SceneTimePicker({ isOnCanvas: true }),
-      new SceneRefreshPicker({ isOnCanvas: true }),
-    ],
-    body: new SceneFlexLayout({
-      direction: 'column',
-      children: [
-        new SceneFlexItem({
-          body: PanelBuilders.logs()
-            .setTitle('')
-            .setData(logsQuery)
-            .setOption('showTime', true)
-            .setOption('showLabels', false)
-            .setOption('showCommonLabels', false)
-            .setOption('wrapLogMessage', true)
-            .setOption('prettifyLogMessage', false)
-            .setOption('enableLogDetails', true)
-            .setOption('dedupStrategy', LogsDedupStrategy.none)
-            .setOption('sortOrder', LogsSortOrder.Descending)
-            .build(),
-        }),
-      ],
-    }),
-  });
-
-  return scene;
-}
diff --git a/public/app/features/scenes/apps/traffic.tsx b/public/app/features/scenes/apps/traffic.tsx
deleted file mode 100644
index 8e561e40addb5..0000000000000
--- a/public/app/features/scenes/apps/traffic.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-import React from 'react';
-
-import {
-  SceneFlexLayout,
-  SceneTimePicker,
-  EmbeddedScene,
-  SceneTimeRange,
-  VariableValueSelectors,
-  SceneControlsSpacer,
-  SceneRefreshPicker,
-  SceneFlexItem,
-  SceneObjectState,
-  SceneObjectBase,
-  SceneObjectUrlSyncConfig,
-  SceneObjectUrlValues,
-  PanelBuilders,
-} from '@grafana/scenes';
-import { Button } from '@grafana/ui';
-
-import { getInstantQuery, getTimeSeriesQuery, getVariablesDefinitions } from './utils';
-
-export function getTrafficScene(): EmbeddedScene {
-  const httpHandlersTable = PanelBuilders.table()
-    .setData(
-      getInstantQuery({
-        expr: 'sort_desc(avg without(job, instance) (rate(grafana_http_request_duration_seconds_sum[$__rate_interval]) * 1e3)) ',
-      })
-    )
-    .setTitle('Handlers')
-    .setOption('footer', { enablePagination: true })
-    .setOverrides((b) =>
-      b
-        .matchFieldsWithNameByRegex('.*')
-        .overrideFilterable(false)
-        .matchFieldsWithName('Time')
-        .overrideCustomFieldConfig('hidden', true)
-        .matchFieldsWithName('Value')
-        .overrideDisplayName('Duration (Avg)')
-        .matchFieldsWithName('handler')
-        .overrideLinks([
-          {
-            title: 'Go to handler drilldown view',
-            url: '/scenes/grafana-monitoring/traffic?handler=${__value.text:percentencode}',
-          },
-        ])
-    )
-    .build();
-
-  const scene = new EmbeddedScene({
-    $variables: getVariablesDefinitions(),
-    $timeRange: new SceneTimeRange({ from: 'now-1h', to: 'now' }),
-    controls: [
-      new VariableValueSelectors({}),
-      new SceneControlsSpacer(),
-      new SceneTimePicker({ isOnCanvas: true }),
-      new SceneRefreshPicker({ isOnCanvas: true }),
-    ],
-    body: new SceneFlexLayout({
-      $behaviors: [new HandlerDrilldownViewBehavior()],
-      children: [new SceneFlexItem({ body: httpHandlersTable })],
-    }),
-  });
-
-  return scene;
-}
-
-export interface HandlerDrilldownViewBehaviorState extends SceneObjectState {
-  handler?: string;
-}
-
-export class HandlerDrilldownViewBehavior extends SceneObjectBase<HandlerDrilldownViewBehaviorState> {
-  protected _urlSync = new SceneObjectUrlSyncConfig(this, { keys: ['handler'] });
-
-  constructor() {
-    super({});
-
-    this.addActivationHandler(() => {
-      this._subs.add(this.subscribeToState((state) => this.onHandlerChanged(state.handler)));
-      this.onHandlerChanged(this.state.handler);
-    });
-  }
-
-  private onHandlerChanged(handler: string | undefined) {
-    const layout = this.getLayout();
-
-    if (handler == null) {
-      layout.setState({ children: layout.state.children.slice(0, 1) });
-    } else {
-      layout.setState({ children: [layout.state.children[0], this.getDrilldownView(handler)] });
-    }
-  }
-
-  private getDrilldownView(handler: string): SceneFlexItem {
-    return new SceneFlexItem({
-      key: 'drilldown-flex',
-      body: PanelBuilders.timeseries()
-        .setData(
-          getTimeSeriesQuery({
-            expr: `rate(grafana_http_request_duration_seconds_sum{handler="${handler}"}[$__rate_interval]) * 1e3`,
-          })
-        )
-        .setTitle(`Handler: ${handler} details`)
-        .setHeaderActions(
-          <Button size="sm" variant="secondary" icon="times" onClick={() => this.setState({ handler: undefined })} />
-        )
-        .build(),
-    });
-  }
-
-  getUrlState() {
-    return { handler: this.state.handler };
-  }
-
-  updateFromUrl(values: SceneObjectUrlValues) {
-    if (typeof values.handler === 'string' || values.handler === undefined) {
-      this.setState({ handler: values.handler });
-    }
-  }
-
-  private getLayout() {
-    if (this.parent instanceof SceneFlexLayout) {
-      return this.parent;
-    }
-
-    throw new Error('Invalid parent');
-  }
-}
diff --git a/public/app/features/scenes/apps/transforms.ts b/public/app/features/scenes/apps/transforms.ts
deleted file mode 100644
index 3bbdca4a3945c..0000000000000
--- a/public/app/features/scenes/apps/transforms.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { map } from 'rxjs';
-
-import {
-  BasicValueMatcherOptions,
-  CustomTransformOperator,
-  DataTransformerID,
-  getFrameDisplayName,
-  ValueMatcherID,
-} from '@grafana/data';
-import { FilterByValueMatch, FilterByValueType } from '@grafana/data/src/transformations/transformers/filterByValue';
-import { DataTransformerConfig, MatcherConfig } from '@grafana/schema';
-
-export function getTableFilterTransform(query: string): DataTransformerConfig {
-  const regex: MatcherConfig<BasicValueMatcherOptions<string>> = {
-    id: ValueMatcherID.regex,
-    options: { value: query },
-  };
-
-  return {
-    id: DataTransformerID.filterByValue,
-    options: {
-      type: FilterByValueType.include,
-      match: FilterByValueMatch.all,
-      filters: [
-        {
-          fieldName: 'handler',
-          config: regex,
-        },
-      ],
-    },
-  };
-}
-
-export function getTimeSeriesFilterTransform(query: string): CustomTransformOperator {
-  return () => (source) => {
-    return source.pipe(
-      map((data) => {
-        return data.filter((frame) => getFrameDisplayName(frame).toLowerCase().includes(query.toLowerCase()));
-      })
-    );
-  };
-}
diff --git a/public/app/features/scenes/apps/utils.ts b/public/app/features/scenes/apps/utils.ts
deleted file mode 100644
index 48afdf1efee89..0000000000000
--- a/public/app/features/scenes/apps/utils.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { useLocation } from 'react-router-dom';
-
-import { UrlQueryMap, urlUtil } from '@grafana/data';
-import { locationSearchToObject } from '@grafana/runtime';
-import { QueryVariable, SceneQueryRunner, SceneVariableSet } from '@grafana/scenes';
-import { PromQuery } from 'app/plugins/datasource/prometheus/types';
-
-export function useAppQueryParams() {
-  const location = useLocation();
-  return locationSearchToObject(location.search || '');
-}
-
-export function getLinkUrlWithAppUrlState(path: string, params: UrlQueryMap): string {
-  return urlUtil.renderUrl(path, params);
-}
-
-export function getInstantQuery(query: Partial<PromQuery>): SceneQueryRunner {
-  return new SceneQueryRunner({
-    datasource: { uid: 'gdev-prometheus' },
-    queries: [
-      {
-        refId: 'A',
-        instant: true,
-        format: 'table',
-        maxDataPoints: 500,
-        ...query,
-      },
-    ],
-  });
-}
-
-export function getTimeSeriesQuery(query: Partial<PromQuery>): SceneQueryRunner {
-  return new SceneQueryRunner({
-    datasource: { uid: 'gdev-prometheus' },
-    queries: [
-      {
-        refId: 'A',
-        range: true,
-        format: 'time_series',
-        maxDataPoints: 500,
-        ...query,
-      },
-    ],
-  });
-}
-
-export function getVariablesDefinitions() {
-  return new SceneVariableSet({
-    variables: [
-      new QueryVariable({
-        name: 'instance',
-        datasource: { uid: 'gdev-prometheus' },
-        query: { query: 'label_values(grafana_http_request_duration_seconds_sum, instance)', refId: 'A' },
-      }),
-    ],
-  });
-}
diff --git a/public/app/features/scenes/scenes/gridMultiTimeRange.tsx b/public/app/features/scenes/scenes/gridMultiTimeRange.tsx
deleted file mode 100644
index c10d6847a225f..0000000000000
--- a/public/app/features/scenes/scenes/gridMultiTimeRange.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import {
-  SceneGridRow,
-  SceneTimePicker,
-  SceneGridLayout,
-  SceneTimeRange,
-  SceneRefreshPicker,
-  SceneGridItem,
-  PanelBuilders,
-} from '@grafana/scenes';
-import { TestDataQueryType } from '@grafana-plugins/grafana-testdata-datasource/dataquery.gen';
-
-import { DashboardScene } from '../../dashboard-scene/scene/DashboardScene';
-
-import { getQueryRunnerWithRandomWalkQuery } from './queries';
-
-export function getGridWithMultipleTimeRanges(): DashboardScene {
-  const globalTimeRange = new SceneTimeRange();
-  const row1TimeRange = new SceneTimeRange({
-    from: 'now-1y',
-    to: 'now',
-  });
-
-  return new DashboardScene({
-    title: 'Grid with rows and different queries and time ranges',
-    body: new SceneGridLayout({
-      children: [
-        new SceneGridRow({
-          $timeRange: row1TimeRange,
-          $data: getQueryRunnerWithRandomWalkQuery({ scenarioId: TestDataQueryType.RandomWalkTable }),
-          title: 'Row A - has its own query, last year time range',
-          key: 'Row A',
-          isCollapsed: true,
-          y: 0,
-          children: [
-            new SceneGridItem({
-              x: 0,
-              y: 1,
-              width: 12,
-              height: 5,
-              isResizable: true,
-              isDraggable: true,
-              body: PanelBuilders.timeseries().setTitle('Row A Child1').build(),
-            }),
-            new SceneGridItem({
-              x: 0,
-              y: 5,
-              width: 6,
-              height: 5,
-              isResizable: true,
-              isDraggable: true,
-              body: PanelBuilders.timeseries().setTitle('Row A Child2').build(),
-            }),
-          ],
-        }),
-        new SceneGridItem({
-          x: 0,
-          y: 12,
-          width: 6,
-          height: 10,
-          isResizable: true,
-          isDraggable: true,
-          body: PanelBuilders.timeseries()
-            .setTitle('Outsider, has its own query')
-            .setData(getQueryRunnerWithRandomWalkQuery())
-            .build(),
-        }),
-      ],
-    }),
-    $timeRange: globalTimeRange,
-    $data: getQueryRunnerWithRandomWalkQuery(),
-    actions: [new SceneTimePicker({}), new SceneRefreshPicker({})],
-  });
-}
diff --git a/public/app/features/scenes/scenes/gridMultiple.tsx b/public/app/features/scenes/scenes/gridMultiple.tsx
deleted file mode 100644
index 73633d618734a..0000000000000
--- a/public/app/features/scenes/scenes/gridMultiple.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-import {
-  SceneTimePicker,
-  SceneFlexLayout,
-  SceneGridLayout,
-  SceneTimeRange,
-  SceneRefreshPicker,
-  SceneGridItem,
-  SceneFlexItem,
-  PanelBuilders,
-} from '@grafana/scenes';
-
-import { DashboardScene } from '../../dashboard-scene/scene/DashboardScene';
-
-import { getQueryRunnerWithRandomWalkQuery } from './queries';
-
-export function getMultipleGridLayoutTest(): DashboardScene {
-  return new DashboardScene({
-    title: 'Multiple grid layouts test',
-    body: new SceneFlexLayout({
-      children: [
-        new SceneFlexItem({
-          body: new SceneGridLayout({
-            children: [
-              new SceneGridItem({
-                x: 0,
-                y: 0,
-                width: 12,
-                height: 10,
-                isDraggable: true,
-                isResizable: true,
-                body: PanelBuilders.timeseries().setTitle('Dragabble and resizable').build(),
-              }),
-              new SceneGridItem({
-                x: 12,
-                y: 0,
-                width: 12,
-                height: 10,
-                isResizable: false,
-                isDraggable: true,
-                body: PanelBuilders.timeseries().setTitle('Draggable only').build(),
-              }),
-              new SceneGridItem({
-                x: 6,
-                y: 11,
-                width: 12,
-                height: 10,
-                isResizable: false,
-                isDraggable: true,
-                body: new SceneFlexLayout({
-                  direction: 'column',
-                  children: [
-                    new SceneFlexItem({
-                      ySizing: 'fill',
-                      body: PanelBuilders.timeseries().setTitle('Fill height').build(),
-                    }),
-                    new SceneFlexItem({
-                      ySizing: 'fill',
-                      body: PanelBuilders.timeseries().setTitle('Fill height').build(),
-                    }),
-                  ],
-                }),
-              }),
-            ],
-          }),
-        }),
-        new SceneFlexItem({
-          body: new SceneGridLayout({
-            children: [
-              new SceneGridItem({
-                x: 0,
-                y: 0,
-                width: 12,
-                height: 10,
-                isDraggable: true,
-                isResizable: true,
-                body: PanelBuilders.timeseries().setTitle('Dragabble and resizable').build(),
-              }),
-              new SceneGridItem({
-                x: 12,
-                y: 0,
-                width: 12,
-                height: 10,
-                isResizable: false,
-                isDraggable: true,
-                body: PanelBuilders.timeseries().setTitle('Draggable only').build(),
-              }),
-              new SceneGridItem({
-                x: 6,
-                y: 11,
-                width: 12,
-                height: 10,
-                isResizable: false,
-                isDraggable: true,
-                body: new SceneFlexLayout({
-                  direction: 'column',
-                  children: [
-                    new SceneFlexItem({
-                      ySizing: 'fill',
-                      body: PanelBuilders.timeseries().setTitle('Fill height').build(),
-                    }),
-                    new SceneFlexItem({
-                      ySizing: 'fill',
-                      body: PanelBuilders.timeseries().setTitle('Fill height').build(),
-                    }),
-                  ],
-                }),
-              }),
-            ],
-          }),
-        }),
-      ],
-    }),
-    $timeRange: new SceneTimeRange(),
-    $data: getQueryRunnerWithRandomWalkQuery(),
-    actions: [new SceneTimePicker({}), new SceneRefreshPicker({})],
-  });
-}
diff --git a/public/app/features/scenes/scenes/gridWithMultipleData.tsx b/public/app/features/scenes/scenes/gridWithMultipleData.tsx
deleted file mode 100644
index 3d382b53a058d..0000000000000
--- a/public/app/features/scenes/scenes/gridWithMultipleData.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import {
-  SceneGridRow,
-  SceneTimePicker,
-  SceneGridLayout,
-  SceneTimeRange,
-  SceneRefreshPicker,
-  SceneGridItem,
-  PanelBuilders,
-} from '@grafana/scenes';
-import { TestDataQueryType } from '@grafana-plugins/grafana-testdata-datasource/dataquery.gen';
-
-import { DashboardScene } from '../../dashboard-scene/scene/DashboardScene';
-
-import { getQueryRunnerWithRandomWalkQuery } from './queries';
-
-export function getGridWithMultipleData(): DashboardScene {
-  return new DashboardScene({
-    title: 'Grid with rows and different queries',
-    body: new SceneGridLayout({
-      children: [
-        new SceneGridRow({
-          $timeRange: new SceneTimeRange(),
-          $data: getQueryRunnerWithRandomWalkQuery({ scenarioId: TestDataQueryType.RandomWalkTable }),
-          title: 'Row A - has its own query',
-          key: 'Row A',
-          isCollapsed: true,
-          y: 0,
-          children: [
-            new SceneGridItem({
-              x: 0,
-              y: 1,
-              width: 12,
-              height: 5,
-              isResizable: true,
-              isDraggable: true,
-              body: PanelBuilders.timeseries().setTitle('Row A Child1').build(),
-            }),
-            new SceneGridItem({
-              x: 0,
-              y: 5,
-              width: 6,
-              height: 5,
-              isResizable: true,
-              isDraggable: true,
-              body: PanelBuilders.timeseries().setTitle('Row A Child2').build(),
-            }),
-          ],
-        }),
-        new SceneGridRow({
-          title: 'Row B - uses global query',
-          key: 'Row B',
-          isCollapsed: true,
-          y: 1,
-          children: [
-            new SceneGridItem({
-              x: 0,
-              y: 2,
-              width: 12,
-              height: 5,
-              isResizable: false,
-              isDraggable: true,
-              body: PanelBuilders.timeseries().setTitle('Row B Child1').build(),
-            }),
-            new SceneGridItem({
-              x: 0,
-              y: 7,
-              width: 6,
-              height: 5,
-              isResizable: false,
-              isDraggable: true,
-              body: PanelBuilders.timeseries()
-                .setTitle('Row B Child2 with data')
-                .setData(getQueryRunnerWithRandomWalkQuery({ seriesCount: 10 }))
-                .build(),
-            }),
-          ],
-        }),
-        new SceneGridItem({
-          x: 0,
-          y: 12,
-          width: 6,
-          height: 10,
-          isResizable: true,
-          isDraggable: true,
-          body: PanelBuilders.timeseries()
-            .setTitle('Outsider, has its own query')
-            .setData(getQueryRunnerWithRandomWalkQuery({ seriesCount: 10 }))
-            .build(),
-        }),
-        new SceneGridItem({
-          x: 6,
-          y: 12,
-          width: 12,
-          height: 10,
-          isResizable: true,
-          isDraggable: true,
-          body: PanelBuilders.timeseries().setTitle('Outsider, uses global query').build(),
-        }),
-      ],
-    }),
-    $timeRange: new SceneTimeRange(),
-    $data: getQueryRunnerWithRandomWalkQuery(),
-    actions: [new SceneTimePicker({}), new SceneRefreshPicker({})],
-  });
-}
diff --git a/public/app/features/scenes/scenes/index.tsx b/public/app/features/scenes/scenes/index.tsx
deleted file mode 100644
index b5bcf608dc94b..0000000000000
--- a/public/app/features/scenes/scenes/index.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import { DashboardScene } from '../../dashboard-scene/scene/DashboardScene';
-
-import { getGridWithMultipleTimeRanges } from './gridMultiTimeRange';
-import { getMultipleGridLayoutTest } from './gridMultiple';
-import { getGridWithMultipleData } from './gridWithMultipleData';
-import { getQueryVariableDemo } from './queryVariableDemo';
-import { getRepeatingPanelsDemo, getRepeatingRowsDemo } from './repeatingPanels';
-import { getSceneWithRows } from './sceneWithRows';
-import { getTransformationsDemo } from './transformations';
-import { getVariablesDemo, getVariablesDemoWithAll } from './variablesDemo';
-
-interface SceneDef {
-  title: string;
-  getScene: () => DashboardScene;
-}
-export function getScenes(): SceneDef[] {
-  return [
-    { title: 'Scene with rows', getScene: getSceneWithRows },
-    { title: 'Grid with rows and different queries', getScene: getGridWithMultipleData },
-    { title: 'Grid with rows and different queries and time ranges', getScene: getGridWithMultipleTimeRanges },
-    { title: 'Multiple grid layouts test', getScene: getMultipleGridLayoutTest },
-    { title: 'Variables', getScene: getVariablesDemo },
-    { title: 'Variables with All values', getScene: getVariablesDemoWithAll },
-    { title: 'Variables - Repeating panels', getScene: getRepeatingPanelsDemo },
-    { title: 'Variables - Repeating rows', getScene: getRepeatingRowsDemo },
-    { title: 'Query variable', getScene: getQueryVariableDemo },
-    { title: 'Transformations demo', getScene: getTransformationsDemo },
-  ];
-}
-
-const cache: Record<string, DashboardScene> = {};
-
-export function getSceneByTitle(title: string) {
-  if (cache[title]) {
-    return cache[title];
-  }
-
-  const scene = getScenes().find((x) => x.title === title);
-
-  if (scene) {
-    cache[title] = scene.getScene();
-  }
-
-  return cache[title];
-}
diff --git a/public/app/features/scenes/scenes/queries.ts b/public/app/features/scenes/scenes/queries.ts
deleted file mode 100644
index a87957a9a11ea..0000000000000
--- a/public/app/features/scenes/scenes/queries.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { QueryRunnerState, SceneQueryRunner } from '@grafana/scenes';
-import { TestData } from '@grafana-plugins/grafana-testdata-datasource/dataquery.gen';
-
-export function getQueryRunnerWithRandomWalkQuery(
-  overrides?: Partial<TestData>,
-  queryRunnerOverrides?: Partial<QueryRunnerState>
-) {
-  return new SceneQueryRunner({
-    queries: [
-      {
-        refId: 'A',
-        datasource: {
-          uid: 'gdev-testdata',
-          type: 'testdata',
-        },
-        scenarioId: 'random_walk',
-        ...overrides,
-      },
-    ],
-    ...queryRunnerOverrides,
-  });
-}
diff --git a/public/app/features/scenes/scenes/queryVariableDemo.tsx b/public/app/features/scenes/scenes/queryVariableDemo.tsx
deleted file mode 100644
index d1f1e025426e7..0000000000000
--- a/public/app/features/scenes/scenes/queryVariableDemo.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import { VariableRefresh } from '@grafana/data';
-import {
-  SceneCanvasText,
-  SceneTimePicker,
-  SceneFlexLayout,
-  SceneTimeRange,
-  VariableValueSelectors,
-  SceneVariableSet,
-  CustomVariable,
-  DataSourceVariable,
-  QueryVariable,
-  SceneRefreshPicker,
-  SceneFlexItem,
-} from '@grafana/scenes';
-
-import { DashboardScene } from '../../dashboard-scene/scene/DashboardScene';
-
-export function getQueryVariableDemo(): DashboardScene {
-  return new DashboardScene({
-    title: 'Query variable',
-    $variables: new SceneVariableSet({
-      variables: [
-        new CustomVariable({
-          name: 'metric',
-          query: 'job : job, instance : instance',
-        }),
-        new DataSourceVariable({
-          name: 'datasource',
-          pluginId: 'prometheus',
-        }),
-        new QueryVariable({
-          name: 'instance (using datasource variable)',
-          refresh: VariableRefresh.onTimeRangeChanged,
-          query: { query: 'label_values(go_gc_duration_seconds, ${metric})', refId: 'A' },
-          datasource: { uid: '${datasource}' },
-        }),
-        new QueryVariable({
-          name: 'label values (on time range refresh)',
-          refresh: VariableRefresh.onTimeRangeChanged,
-          query: { query: 'label_values(go_gc_duration_seconds, ${metric})', refId: 'B' },
-          datasource: { uid: 'gdev-prometheus', type: 'prometheus' },
-        }),
-        new QueryVariable({
-          name: 'legacy (graphite)',
-          refresh: VariableRefresh.onTimeRangeChanged,
-          query: { queryType: 'Default', target: 'stats.response.*', refId: 'C' },
-          datasource: { uid: 'gdev-graphite', type: 'graphite' },
-        }),
-      ],
-    }),
-    body: new SceneFlexLayout({
-      direction: 'row',
-      children: [
-        new SceneFlexItem({
-          width: '40%',
-          body: new SceneCanvasText({
-            text: 'metric: ${metric}',
-            fontSize: 20,
-            align: 'center',
-          }),
-        }),
-      ],
-    }),
-    $timeRange: new SceneTimeRange(),
-    actions: [new SceneTimePicker({}), new SceneRefreshPicker({})],
-    controls: [new VariableValueSelectors({})],
-  });
-}
diff --git a/public/app/features/scenes/scenes/repeatingPanels.tsx b/public/app/features/scenes/scenes/repeatingPanels.tsx
deleted file mode 100644
index 8286f8cfc71ea..0000000000000
--- a/public/app/features/scenes/scenes/repeatingPanels.tsx
+++ /dev/null
@@ -1,189 +0,0 @@
-import {
-  SceneTimePicker,
-  SceneTimeRange,
-  VariableValueSelectors,
-  SceneVariableSet,
-  TestVariable,
-  SceneRefreshPicker,
-  PanelBuilders,
-  SceneGridLayout,
-  SceneControlsSpacer,
-  SceneGridRow,
-} from '@grafana/scenes';
-import { VariableRefresh } from '@grafana/schema';
-import { PanelRepeaterGridItem } from 'app/features/dashboard-scene/scene/PanelRepeaterGridItem';
-import { RowRepeaterBehavior } from 'app/features/dashboard-scene/scene/RowRepeaterBehavior';
-
-import { DashboardScene } from '../../dashboard-scene/scene/DashboardScene';
-
-import { getQueryRunnerWithRandomWalkQuery } from './queries';
-
-/**
- * Repeat panels by variable that changes with time refresh. This tries to setup a very specific scenario
- * where a variable that is slow (2s) and constantly changing it's result is used to repeat panels. This
- * can be used to verify that when the time range change the repeated panels with locally scoped variable value
- * still wait for the top level variable to finish loading and the repeat process to complete.
- */
-export function getRepeatingPanelsDemo(): DashboardScene {
-  return new DashboardScene({
-    title: 'Variables - Repeating panels',
-    $variables: new SceneVariableSet({
-      variables: [
-        new TestVariable({
-          name: 'server',
-          query: 'AB',
-          value: 'server',
-          text: '',
-          delayMs: 2000,
-          isMulti: true,
-          includeAll: true,
-          refresh: VariableRefresh.onTimeRangeChanged,
-          optionsToReturn: [
-            { label: 'A', value: 'A' },
-            { label: 'B', value: 'B' },
-          ],
-          options: [],
-          $behaviors: [changeVariable],
-        }),
-      ],
-    }),
-    body: new SceneGridLayout({
-      isDraggable: true,
-      isResizable: true,
-      children: [
-        new PanelRepeaterGridItem({
-          variableName: 'server',
-          x: 0,
-          y: 0,
-          width: 24,
-          height: 8,
-          itemHeight: 8,
-          source: PanelBuilders.timeseries()
-            .setTitle('server = $server')
-            .setData(getQueryRunnerWithRandomWalkQuery({ alias: 'server = $server' }))
-            .build(),
-        }),
-      ],
-    }),
-    $timeRange: new SceneTimeRange(),
-    actions: [],
-    controls: [
-      new VariableValueSelectors({}),
-      new SceneControlsSpacer(),
-      new SceneTimePicker({}),
-      new SceneRefreshPicker({}),
-    ],
-  });
-}
-
-function changeVariable(variable: TestVariable) {
-  const sub = variable.subscribeToState((state, old) => {
-    if (!state.loading && old.loading) {
-      if (variable.state.optionsToReturn?.length === 2) {
-        variable.setState({
-          query: 'ABC',
-          optionsToReturn: [
-            { label: 'A', value: 'A' },
-            { label: 'B', value: 'B' },
-            { label: 'C', value: 'C' },
-          ],
-        });
-      } else {
-        variable.setState({
-          query: 'AB',
-          optionsToReturn: [
-            { label: 'A', value: 'A' },
-            { label: 'B', value: 'B' },
-          ],
-        });
-      }
-    }
-  });
-
-  return () => {
-    sub.unsubscribe();
-  };
-}
-
-export function getRepeatingRowsDemo(): DashboardScene {
-  return new DashboardScene({
-    title: 'Variables - Repeating rows',
-    $variables: new SceneVariableSet({
-      variables: [
-        new TestVariable({
-          name: 'server',
-          query: 'AB',
-          value: ['A', 'B', 'C'],
-          text: ['A', 'B', 'C'],
-          delayMs: 2000,
-          isMulti: true,
-          includeAll: true,
-          refresh: VariableRefresh.onTimeRangeChanged,
-          optionsToReturn: [
-            { label: 'A', value: 'A' },
-            { label: 'B', value: 'B' },
-            { label: 'C', value: 'C' },
-          ],
-          options: [],
-          //$behaviors: [changeVariable],
-        }),
-        new TestVariable({
-          name: 'pod',
-          query: 'AB',
-          value: ['Mu', 'Ma', 'Mi'],
-          text: ['Mu', 'Ma', 'Mi'],
-          delayMs: 2000,
-          isMulti: true,
-          includeAll: true,
-          refresh: VariableRefresh.onTimeRangeChanged,
-          optionsToReturn: [
-            { label: 'Mu', value: 'Mu' },
-            { label: 'Ma', value: 'Ma' },
-            { label: 'Mi', value: 'Mi' },
-          ],
-          options: [],
-        }),
-      ],
-    }),
-    body: new SceneGridLayout({
-      isDraggable: true,
-      isResizable: true,
-      children: [
-        new SceneGridRow({
-          title: 'Row $server',
-          key: 'Row A',
-          isCollapsed: false,
-          y: 0,
-          x: 0,
-          $behaviors: [
-            new RowRepeaterBehavior({
-              variableName: 'server',
-              sources: [
-                new PanelRepeaterGridItem({
-                  variableName: 'pod',
-                  x: 0,
-                  y: 0,
-                  width: 24,
-                  height: 5,
-                  itemHeight: 5,
-                  source: PanelBuilders.timeseries()
-                    .setTitle('server = $server, pod = $pod')
-                    .setData(getQueryRunnerWithRandomWalkQuery({ alias: 'server = $server, pod = $pod' }))
-                    .build(),
-                }),
-              ],
-            }),
-          ],
-        }),
-      ],
-    }),
-    $timeRange: new SceneTimeRange(),
-    actions: [],
-    controls: [
-      new VariableValueSelectors({}),
-      new SceneControlsSpacer(),
-      new SceneTimePicker({}),
-      new SceneRefreshPicker({}),
-    ],
-  });
-}
diff --git a/public/app/features/scenes/scenes/sceneWithRows.tsx b/public/app/features/scenes/scenes/sceneWithRows.tsx
deleted file mode 100644
index 2657294c940fd..0000000000000
--- a/public/app/features/scenes/scenes/sceneWithRows.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import {
-  NestedScene,
-  SceneTimePicker,
-  SceneFlexLayout,
-  SceneTimeRange,
-  SceneRefreshPicker,
-  SceneFlexItem,
-  PanelBuilders,
-} from '@grafana/scenes';
-
-import { DashboardScene } from '../../dashboard-scene/scene/DashboardScene';
-
-import { getQueryRunnerWithRandomWalkQuery } from './queries';
-
-export function getSceneWithRows(): DashboardScene {
-  return new DashboardScene({
-    title: 'Scene with rows',
-    body: new SceneFlexLayout({
-      direction: 'column',
-      children: [
-        new NestedScene({
-          title: 'Overview',
-          canCollapse: true,
-          body: new SceneFlexLayout({
-            direction: 'row',
-            children: [
-              new SceneFlexItem({
-                body: PanelBuilders.timeseries().setTitle('Fill height').build(),
-              }),
-
-              new SceneFlexItem({
-                body: PanelBuilders.timeseries().setTitle('Fill height').build(),
-              }),
-            ],
-          }),
-        }),
-        new NestedScene({
-          title: 'More server details',
-          canCollapse: true,
-          body: new SceneFlexLayout({
-            direction: 'row',
-            children: [
-              new SceneFlexItem({
-                body: PanelBuilders.timeseries().setTitle('Fill height').build(),
-              }),
-              new SceneFlexItem({
-                body: PanelBuilders.timeseries().setTitle('Fill height').build(),
-              }),
-            ],
-          }),
-        }),
-      ],
-    }),
-    $timeRange: new SceneTimeRange(),
-    $data: getQueryRunnerWithRandomWalkQuery(),
-    actions: [new SceneTimePicker({}), new SceneRefreshPicker({})],
-  });
-}
diff --git a/public/app/features/scenes/scenes/transformations.tsx b/public/app/features/scenes/scenes/transformations.tsx
deleted file mode 100644
index 1532591008520..0000000000000
--- a/public/app/features/scenes/scenes/transformations.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import {
-  SceneTimePicker,
-  SceneFlexLayout,
-  SceneDataTransformer,
-  SceneTimeRange,
-  SceneRefreshPicker,
-  SceneFlexItem,
-  PanelBuilders,
-} from '@grafana/scenes';
-
-import { DashboardScene } from '../../dashboard-scene/scene/DashboardScene';
-
-import { getQueryRunnerWithRandomWalkQuery } from './queries';
-
-export function getTransformationsDemo(): DashboardScene {
-  return new DashboardScene({
-    title: 'Transformations demo',
-    body: new SceneFlexLayout({
-      direction: 'row',
-      children: [
-        new SceneFlexItem({
-          body: new SceneFlexLayout({
-            direction: 'column',
-            children: [
-              new SceneFlexItem({
-                body: new SceneFlexLayout({
-                  direction: 'row',
-                  children: [
-                    new SceneFlexItem({
-                      body: PanelBuilders.timeseries().setTitle('Source data (global query)').build(),
-                    }),
-                    new SceneFlexItem({
-                      body: PanelBuilders.stat()
-                        .setTitle('Transformed data')
-                        .setData(
-                          new SceneDataTransformer({
-                            transformations: [
-                              {
-                                id: 'reduce',
-                                options: {
-                                  reducers: ['last', 'mean'],
-                                },
-                              },
-                            ],
-                          })
-                        )
-                        .build(),
-                    }),
-                  ],
-                }),
-              }),
-              new SceneFlexItem({
-                body: PanelBuilders.stat()
-                  .setTitle('Query with predefined transformations')
-                  .setData(
-                    new SceneDataTransformer({
-                      $data: getQueryRunnerWithRandomWalkQuery(),
-                      transformations: [
-                        {
-                          id: 'reduce',
-                          options: {
-                            reducers: ['mean'],
-                          },
-                        },
-                      ],
-                    })
-                  )
-                  .build(),
-              }),
-            ],
-          }),
-        }),
-      ],
-    }),
-    $timeRange: new SceneTimeRange(),
-    $data: getQueryRunnerWithRandomWalkQuery(),
-    actions: [new SceneTimePicker({}), new SceneRefreshPicker({})],
-  });
-}
diff --git a/public/app/features/scenes/scenes/variablesDemo.tsx b/public/app/features/scenes/scenes/variablesDemo.tsx
deleted file mode 100644
index 1b63739b602dc..0000000000000
--- a/public/app/features/scenes/scenes/variablesDemo.tsx
+++ /dev/null
@@ -1,203 +0,0 @@
-import {
-  SceneCanvasText,
-  SceneTimePicker,
-  SceneFlexLayout,
-  SceneTimeRange,
-  VariableValueSelectors,
-  SceneVariableSet,
-  CustomVariable,
-  DataSourceVariable,
-  TestVariable,
-  NestedScene,
-  SceneRefreshPicker,
-  TextBoxVariable,
-  SceneFlexItem,
-  PanelBuilders,
-} from '@grafana/scenes';
-
-import { DashboardScene } from '../../dashboard-scene/scene/DashboardScene';
-
-import { getQueryRunnerWithRandomWalkQuery } from './queries';
-
-export function getVariablesDemo(): DashboardScene {
-  return new DashboardScene({
-    title: 'Variables',
-    $variables: new SceneVariableSet({
-      variables: [
-        new TestVariable({
-          name: 'server',
-          query: 'A.*',
-          value: 'server',
-          text: '',
-          delayMs: 1000,
-          options: [],
-        }),
-        new TestVariable({
-          name: 'pod',
-          query: 'A.$server.*',
-          value: 'pod',
-          delayMs: 1000,
-          isMulti: true,
-          text: '',
-          options: [],
-        }),
-        new TestVariable({
-          name: 'handler',
-          query: 'A.$server.$pod.*',
-          value: 'handler',
-          delayMs: 1000,
-          //isMulti: true,
-          text: '',
-          options: [],
-        }),
-        new CustomVariable({
-          name: 'custom',
-          query: 'A : 10,B : 20',
-        }),
-        new DataSourceVariable({
-          name: 'ds',
-          pluginId: 'testdata',
-        }),
-        new TextBoxVariable({
-          name: 'textbox',
-          value: 'default value',
-        }),
-      ],
-    }),
-    body: new SceneFlexLayout({
-      direction: 'row',
-      children: [
-        new SceneFlexItem({
-          body: new SceneFlexLayout({
-            direction: 'column',
-            children: [
-              new SceneFlexItem({
-                body: new SceneFlexLayout({
-                  children: [
-                    new SceneFlexItem({
-                      body: PanelBuilders.timeseries()
-                        .setTitle('handler: $handler')
-                        .setData(
-                          getQueryRunnerWithRandomWalkQuery({
-                            alias: 'handler: $handler',
-                          })
-                        )
-                        .build(),
-                    }),
-                    new SceneFlexItem({
-                      body: new SceneCanvasText({
-                        text: 'Text: ${textbox}',
-                        fontSize: 20,
-                        align: 'center',
-                      }),
-                    }),
-                    new SceneFlexItem({
-                      width: '40%',
-                      body: new SceneCanvasText({
-                        text: 'server: ${server} pod:${pod}',
-                        fontSize: 20,
-                        align: 'center',
-                      }),
-                    }),
-                  ],
-                }),
-              }),
-              new SceneFlexItem({
-                body: new NestedScene({
-                  title: 'Collapsable inner scene',
-                  canCollapse: true,
-                  body: new SceneFlexLayout({
-                    direction: 'row',
-                    children: [
-                      new SceneFlexItem({
-                        body: PanelBuilders.timeseries()
-                          .setTitle('handler: $handler')
-                          .setData(
-                            getQueryRunnerWithRandomWalkQuery({
-                              alias: 'handler: $handler',
-                            })
-                          )
-                          .build(),
-                      }),
-                    ],
-                  }),
-                }),
-              }),
-            ],
-          }),
-        }),
-      ],
-    }),
-    $timeRange: new SceneTimeRange(),
-    actions: [new SceneTimePicker({}), new SceneRefreshPicker({})],
-    controls: [new VariableValueSelectors({})],
-  });
-}
-
-export function getVariablesDemoWithAll(): DashboardScene {
-  return new DashboardScene({
-    title: 'Variables with All values',
-    $variables: new SceneVariableSet({
-      variables: [
-        new TestVariable({
-          name: 'server',
-          query: 'A.*',
-          value: 'AA',
-          text: 'AA',
-          includeAll: true,
-          defaultToAll: true,
-          delayMs: 1000,
-          options: [],
-        }),
-        new TestVariable({
-          name: 'pod',
-          query: 'A.$server.*',
-          value: [],
-          delayMs: 1000,
-          isMulti: true,
-          includeAll: true,
-          defaultToAll: true,
-          text: '',
-          options: [],
-        }),
-        new TestVariable({
-          name: 'handler',
-          query: 'A.$server.$pod.*',
-          value: [],
-          delayMs: 1000,
-          includeAll: true,
-          defaultToAll: false,
-          isMulti: true,
-          text: '',
-          options: [],
-        }),
-      ],
-    }),
-    body: new SceneFlexLayout({
-      direction: 'row',
-      children: [
-        new SceneFlexItem({
-          body: PanelBuilders.timeseries()
-            .setTitle('handler: $handler')
-            .setData(
-              getQueryRunnerWithRandomWalkQuery({
-                alias: 'handler: $handler',
-              })
-            )
-            .build(),
-        }),
-        new SceneFlexItem({
-          width: '40%',
-          body: new SceneCanvasText({
-            text: 'server: ${server} pod:${pod}',
-            fontSize: 20,
-            align: 'center',
-          }),
-        }),
-      ],
-    }),
-    $timeRange: new SceneTimeRange(),
-    actions: [new SceneTimePicker({}), new SceneRefreshPicker({})],
-    controls: [new VariableValueSelectors({})],
-  });
-}
diff --git a/public/app/features/scopes/server.ts b/public/app/features/scopes/server.ts
new file mode 100644
index 0000000000000..c9ee48b346e14
--- /dev/null
+++ b/public/app/features/scopes/server.ts
@@ -0,0 +1,32 @@
+import { Scope, ScopeDashboard } from '@grafana/data';
+
+import { ScopedResourceServer } from '../apiserver/server';
+import { ResourceServer } from '../apiserver/types';
+
+// config.bootData.settings.listDashboardScopesEndpoint || '/apis/scope.grafana.app/v0alpha1/scopedashboards';
+// config.bootData.settings.listScopesEndpoint || '/apis/scope.grafana.app/v0alpha1/scopes';
+
+interface ScopeServers {
+  scopes: ResourceServer<Scope>;
+  dashboards: ResourceServer<ScopeDashboard>;
+}
+
+let instance: ScopeServers | undefined = undefined;
+
+export function getScopeServers() {
+  if (!instance) {
+    instance = {
+      scopes: new ScopedResourceServer<Scope>({
+        group: 'scope.grafana.app',
+        version: 'v0alpha1',
+        resource: 'scopes',
+      }),
+      dashboards: new ScopedResourceServer<ScopeDashboard>({
+        group: 'scope.grafana.app',
+        version: 'v0alpha1',
+        resource: 'scopedashboards',
+      }),
+    };
+  }
+  return instance;
+}
diff --git a/public/app/features/search/components/DashboardActions.tsx b/public/app/features/search/components/DashboardActions.tsx
deleted file mode 100644
index 12dc125b50e50..0000000000000
--- a/public/app/features/search/components/DashboardActions.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import React, { useMemo, useState } from 'react';
-
-import { config, reportInteraction } from '@grafana/runtime';
-import { Menu, Dropdown, Button, Icon, HorizontalGroup } from '@grafana/ui';
-import { FolderDTO } from 'app/types';
-
-import { MoveToFolderModal } from '../page/components/MoveToFolderModal';
-import { getImportPhrase, getNewDashboardPhrase, getNewFolderPhrase, getNewPhrase } from '../tempI18nPhrases';
-
-export interface Props {
-  folder: FolderDTO | undefined;
-  canCreateFolders?: boolean;
-  canCreateDashboards?: boolean;
-}
-
-export const DashboardActions = ({ folder, canCreateFolders = false, canCreateDashboards = false }: Props) => {
-  const [isMoveModalOpen, setIsMoveModalOpen] = useState(false);
-  const canMove = config.featureToggles.nestedFolders && (folder?.canSave ?? false);
-
-  const moveSelection = useMemo(
-    () => new Map<string, Set<string>>([['folder', new Set(folder?.uid ? [folder.uid] : [])]]),
-    [folder]
-  );
-
-  const actionUrl = (type: string) => {
-    let url = `dashboard/${type}`;
-    const isTypeNewFolder = type === 'new_folder';
-
-    if (isTypeNewFolder) {
-      url = `dashboards/folder/new/`;
-    }
-
-    if (folder?.uid) {
-      url += `?folderUid=${folder.uid}`;
-    }
-
-    return url;
-  };
-
-  const MenuActions = () => {
-    return (
-      <Menu>
-        {canCreateDashboards && (
-          <Menu.Item
-            url={actionUrl('new')}
-            label={getNewDashboardPhrase()}
-            onClick={() =>
-              reportInteraction('grafana_menu_item_clicked', { url: actionUrl('new'), from: '/dashboards' })
-            }
-          />
-        )}
-        {canCreateFolders && (config.featureToggles.nestedFolders || !folder?.uid) && (
-          <Menu.Item
-            url={actionUrl('new_folder')}
-            label={getNewFolderPhrase()}
-            onClick={() =>
-              reportInteraction('grafana_menu_item_clicked', { url: actionUrl('new_folder'), from: '/dashboards' })
-            }
-          />
-        )}
-        {canCreateDashboards && (
-          <Menu.Item
-            url={actionUrl('import')}
-            label={getImportPhrase()}
-            onClick={() =>
-              reportInteraction('grafana_menu_item_clicked', { url: actionUrl('import'), from: '/dashboards' })
-            }
-          />
-        )}
-      </Menu>
-    );
-  };
-
-  return (
-    <>
-      <div>
-        <HorizontalGroup>
-          {canMove && (
-            <Button onClick={() => setIsMoveModalOpen(true)} icon="exchange-alt" variant="secondary">
-              Move
-            </Button>
-          )}
-          <Dropdown overlay={MenuActions} placement="bottom-start">
-            <Button variant="primary">
-              {getNewPhrase()}
-              <Icon name="angle-down" />
-            </Button>
-          </Dropdown>
-        </HorizontalGroup>
-      </div>
-
-      {canMove && isMoveModalOpen && (
-        <MoveToFolderModal onMoveItems={() => {}} results={moveSelection} onDismiss={() => setIsMoveModalOpen(false)} />
-      )}
-    </>
-  );
-};
diff --git a/public/app/features/search/components/DashboardListPage.tsx b/public/app/features/search/components/DashboardListPage.tsx
deleted file mode 100644
index 48a744064e5e5..0000000000000
--- a/public/app/features/search/components/DashboardListPage.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import { css } from '@emotion/css';
-import React, { memo } from 'react';
-import { useAsync } from 'react-use';
-
-import { locationUtil, NavModelItem } from '@grafana/data';
-import { locationService } from '@grafana/runtime';
-import { Page } from 'app/core/components/Page/Page';
-import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
-import NewBrowseDashboardsPage from 'app/features/browse-dashboards/BrowseDashboardsPage';
-import { newBrowseDashboardsEnabled } from 'app/features/browse-dashboards/featureFlag';
-import { FolderDTO } from 'app/types';
-
-import { loadFolderPage } from '../loaders';
-
-import ManageDashboardsNew from './ManageDashboardsNew';
-
-export interface DashboardListPageRouteParams {
-  uid?: string;
-  slug?: string;
-}
-
-interface Props extends GrafanaRouteComponentProps<DashboardListPageRouteParams> {}
-
-export const DashboardListPageFeatureToggle = memo((props: Props) => {
-  if (newBrowseDashboardsEnabled()) {
-    return <NewBrowseDashboardsPage {...props} />;
-  }
-
-  return <DashboardListPage {...props} />;
-});
-DashboardListPageFeatureToggle.displayName = 'DashboardListPageFeatureToggle';
-
-const DashboardListPage = memo(({ match, location }: Props) => {
-  const { loading, value } = useAsync<() => Promise<{ folder?: FolderDTO; pageNav?: NavModelItem }>>(() => {
-    const uid = match.params.uid;
-    const url = location.pathname;
-
-    if (!uid || !url.startsWith('/dashboards')) {
-      return Promise.resolve({});
-    }
-
-    return loadFolderPage(uid!).then(({ folder, folderNav }) => {
-      const path = locationUtil.stripBaseFromUrl(folder.url);
-
-      if (path !== location.pathname) {
-        locationService.replace(path);
-      }
-
-      return { folder, pageNav: folderNav };
-    });
-  }, [match.params.uid]);
-
-  return (
-    <Page navId="dashboards/browse" pageNav={value?.pageNav}>
-      <Page.Contents
-        isLoading={loading}
-        className={css`
-          display: flex;
-          flex-direction: column;
-          height: 100%;
-        `}
-      >
-        <ManageDashboardsNew folder={value?.folder} />
-      </Page.Contents>
-    </Page>
-  );
-});
-
-DashboardListPage.displayName = 'DashboardListPage';
-
-export default DashboardListPageFeatureToggle;
diff --git a/public/app/features/search/components/ManageDashboards.test.tsx b/public/app/features/search/components/ManageDashboards.test.tsx
deleted file mode 100644
index e07cd425f10c6..0000000000000
--- a/public/app/features/search/components/ManageDashboards.test.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { render, screen, waitFor } from '@testing-library/react';
-import React from 'react';
-
-import { contextSrv } from 'app/core/services/context_srv';
-import { FolderDTO } from 'app/types';
-
-import ManageDashboardsNew from './ManageDashboardsNew';
-
-jest.mock('app/core/services/context_srv', () => {
-  const originMock = jest.requireActual('app/core/services/context_srv');
-
-  return {
-    ...originMock,
-    contextSrv: {
-      ...originMock.context_srv,
-      user: {},
-      hasPermission: jest.fn(() => false),
-    },
-  };
-});
-
-const setup = async (options?: { folder?: FolderDTO }) => {
-  const { folder = {} as FolderDTO } = options || {};
-
-  const { rerender } = await waitFor(() => render(<ManageDashboardsNew folder={folder} />));
-
-  return { rerender };
-};
-
-jest.spyOn(console, 'error').mockImplementation();
-
-describe('ManageDashboards', () => {
-  beforeEach(() => {
-    (contextSrv.hasPermission as jest.Mock).mockClear();
-  });
-
-  it("should hide and show dashboard actions based on user's permissions", async () => {
-    (contextSrv.hasPermission as jest.Mock).mockReturnValue(false);
-
-    const { rerender } = await setup();
-
-    expect(screen.queryByRole('button', { name: /new/i })).not.toBeInTheDocument();
-
-    (contextSrv.hasPermission as jest.Mock).mockReturnValue(true);
-    await waitFor(() => rerender(<ManageDashboardsNew folder={{ canEdit: true } as FolderDTO} />));
-
-    expect(screen.getByRole('button', { name: /new/i })).toBeInTheDocument();
-  });
-});
diff --git a/public/app/features/search/components/ManageDashboardsNew.tsx b/public/app/features/search/components/ManageDashboardsNew.tsx
deleted file mode 100644
index 6dd4643276e2e..0000000000000
--- a/public/app/features/search/components/ManageDashboardsNew.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import { css, cx } from '@emotion/css';
-import React, { useEffect } from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { useStyles2, FilterInput } from '@grafana/ui';
-import { contextSrv } from 'app/core/services/context_srv';
-import { FolderDTO, AccessControlAction } from 'app/types';
-
-import { useKeyNavigationListener } from '../hooks/useSearchKeyboardSelection';
-import { SearchView } from '../page/components/SearchView';
-import { getSearchStateManager } from '../state/SearchStateManager';
-import { getSearchPlaceholder } from '../tempI18nPhrases';
-
-import { DashboardActions } from './DashboardActions';
-
-export interface Props {
-  folder?: FolderDTO;
-}
-
-export const ManageDashboardsNew = React.memo(({ folder }: Props) => {
-  const styles = useStyles2(getStyles);
-  // since we don't use "query" from use search... it is not actually loaded from the URL!
-  const stateManager = getSearchStateManager();
-  const state = stateManager.useState();
-  const { onKeyDown, keyboardEvents } = useKeyNavigationListener();
-
-  // TODO: we need to refactor DashboardActions to use folder.uid instead
-
-  const folderUid = folder?.uid;
-  const canSave = folder?.canSave;
-  const { isEditor } = contextSrv;
-  const hasEditPermissionInFolders = folder ? canSave : contextSrv.hasEditPermissionInFolders;
-  const canCreateFolders = contextSrv.hasPermission(AccessControlAction.FoldersCreate);
-  const canCreateDashboards = folderUid
-    ? contextSrv.hasPermissionInMetadata(AccessControlAction.DashboardsCreate, folder)
-    : contextSrv.hasPermission(AccessControlAction.DashboardsCreate);
-  const viewActions = (folder === undefined && canCreateFolders) || canCreateDashboards;
-
-  useEffect(() => stateManager.initStateFromUrl(folder?.uid), [folder?.uid, stateManager]);
-
-  return (
-    <>
-      <div className={cx(styles.actionBar, 'page-action-bar')}>
-        <div className={cx(styles.inputWrapper, 'gf-form gf-form--grow m-r-2')}>
-          <FilterInput
-            value={state.query ?? ''}
-            onChange={(e) => stateManager.onQueryChange(e)}
-            onKeyDown={onKeyDown}
-            // eslint-disable-next-line jsx-a11y/no-autofocus
-            autoFocus
-            spellCheck={false}
-            placeholder={getSearchPlaceholder(state.includePanels)}
-            escapeRegex={false}
-            className={styles.searchInput}
-          />
-        </div>
-        {viewActions && (
-          <DashboardActions
-            folder={folder}
-            canCreateFolders={canCreateFolders}
-            canCreateDashboards={canCreateDashboards}
-          />
-        )}
-      </div>
-
-      <SearchView
-        showManage={Boolean(isEditor || hasEditPermissionInFolders || canSave)}
-        folderDTO={folder}
-        hidePseudoFolders={true}
-        keyboardEvents={keyboardEvents}
-      />
-    </>
-  );
-});
-
-ManageDashboardsNew.displayName = 'ManageDashboardsNew';
-
-export default ManageDashboardsNew;
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  actionBar: css`
-    ${theme.breakpoints.down('sm')} {
-      flex-wrap: wrap;
-    }
-  `,
-  inputWrapper: css`
-    ${theme.breakpoints.down('sm')} {
-      margin-right: 0 !important;
-    }
-  `,
-  searchInput: css`
-    margin-bottom: 6px;
-    min-height: ${theme.spacing(4)};
-  `,
-  unsupported: css`
-    padding: 10px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-    font-size: 18px;
-  `,
-  noResults: css`
-    padding: ${theme.v1.spacing.md};
-    background: ${theme.v1.colors.bg2};
-    font-style: italic;
-    margin-top: ${theme.v1.spacing.md};
-  `,
-});
diff --git a/public/app/features/search/components/SearchCard.tsx b/public/app/features/search/components/SearchCard.tsx
deleted file mode 100644
index 4219f5d5a990b..0000000000000
--- a/public/app/features/search/components/SearchCard.tsx
+++ /dev/null
@@ -1,262 +0,0 @@
-import { css } from '@emotion/css';
-import { Placement, Rect } from '@popperjs/core';
-import React, { useCallback, useRef, useState } from 'react';
-import SVG from 'react-inlinesvg';
-import { usePopper } from 'react-popper';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
-import { Icon, Portal, TagList, useTheme2 } from '@grafana/ui';
-import { backendSrv } from 'app/core/services/backend_srv';
-
-import { DashboardViewItem, OnToggleChecked } from '../types';
-
-import { SearchCardExpanded } from './SearchCardExpanded';
-import { SearchCheckbox } from './SearchCheckbox';
-
-const DELAY_BEFORE_EXPANDING = 500;
-
-export interface Props {
-  editable?: boolean;
-  item: DashboardViewItem;
-  isSelected?: boolean;
-  onTagSelected?: (name: string) => any;
-  onToggleChecked?: OnToggleChecked;
-  onClick?: (event: React.MouseEvent<HTMLAnchorElement>) => void;
-}
-
-export function getThumbnailURL(uid: string, isLight?: boolean) {
-  return `/api/dashboards/uid/${uid}/img/thumb/${isLight ? 'light' : 'dark'}`;
-}
-
-export function SearchCard({ editable, item, isSelected, onTagSelected, onToggleChecked, onClick }: Props) {
-  const [hasImage, setHasImage] = useState(true);
-  const [lastUpdated, setLastUpdated] = useState<string | null>(null);
-  const [showExpandedView, setShowExpandedView] = useState(false);
-  const timeout = useRef<number | null>(null);
-
-  // Popper specific logic
-  const offsetCallback = useCallback(
-    ({ placement, reference, popper }: { placement: Placement; reference: Rect; popper: Rect }) => {
-      let result: [number, number] = [0, 0];
-      if (placement === 'bottom' || placement === 'top') {
-        result = [0, -(reference.height + popper.height) / 2];
-      } else if (placement === 'left' || placement === 'right') {
-        result = [-(reference.width + popper.width) / 2, 0];
-      }
-      return result;
-    },
-    []
-  );
-  const [markerElement, setMarkerElement] = React.useState<HTMLDivElement | null>(null);
-  const [popperElement, setPopperElement] = React.useState<HTMLDivElement | null>(null);
-  const { styles: popperStyles, attributes } = usePopper(markerElement, popperElement, {
-    modifiers: [
-      {
-        name: 'offset',
-        options: {
-          offset: offsetCallback,
-        },
-      },
-    ],
-  });
-
-  const theme = useTheme2();
-  const imageSrc = getThumbnailURL(item.uid!, theme.isLight);
-  const styles = getStyles(
-    theme,
-    markerElement?.getBoundingClientRect().width,
-    popperElement?.getBoundingClientRect().width
-  );
-
-  const onShowExpandedView = async () => {
-    setShowExpandedView(true);
-    if (item.uid && !lastUpdated) {
-      const dashboard = await backendSrv.getDashboardByUid(item.uid);
-      const { updated } = dashboard.meta;
-      if (updated) {
-        setLastUpdated(new Date(updated).toLocaleString());
-      } else {
-        setLastUpdated(null);
-      }
-    }
-  };
-
-  const onMouseEnter = () => {
-    timeout.current = window.setTimeout(onShowExpandedView, DELAY_BEFORE_EXPANDING);
-  };
-
-  const onMouseMove = () => {
-    if (timeout.current) {
-      window.clearTimeout(timeout.current);
-    }
-    timeout.current = window.setTimeout(onShowExpandedView, DELAY_BEFORE_EXPANDING);
-  };
-
-  const onMouseLeave = () => {
-    if (timeout.current) {
-      window.clearTimeout(timeout.current);
-    }
-    setShowExpandedView(false);
-  };
-
-  const onCheckboxClick = (ev: React.MouseEvent) => {
-    ev.stopPropagation();
-    ev.preventDefault();
-
-    onToggleChecked?.(item);
-  };
-
-  const onTagClick = (tag: string, ev: React.MouseEvent) => {
-    ev.stopPropagation();
-    ev.preventDefault();
-
-    onTagSelected?.(tag);
-  };
-
-  return (
-    <a
-      data-testid={selectors.components.Search.dashboardCard(item.title)}
-      className={styles.card}
-      key={item.uid}
-      href={item.url}
-      ref={(ref) => setMarkerElement(ref as unknown as HTMLDivElement)}
-      onMouseEnter={onMouseEnter}
-      onMouseLeave={onMouseLeave}
-      onMouseMove={onMouseMove}
-      onClick={onClick}
-    >
-      <div className={styles.imageContainer}>
-        <SearchCheckbox
-          className={styles.checkbox}
-          aria-label={`Select dashboard ${item.title}`}
-          editable={editable}
-          checked={isSelected}
-          onClick={onCheckboxClick}
-        />
-        {hasImage ? (
-          <img
-            loading="lazy"
-            className={styles.image}
-            src={imageSrc}
-            alt="Dashboard preview"
-            onError={() => setHasImage(false)}
-          />
-        ) : (
-          <div className={styles.imagePlaceholder}>
-            {item.icon ? (
-              <SVG src={item.icon} width={36} height={36} title={item.title} />
-            ) : (
-              <Icon name="apps" size="xl" />
-            )}
-          </div>
-        )}
-      </div>
-      <div className={styles.info}>
-        <div className={styles.title}>{item.title}</div>
-        <TagList displayMax={1} tags={item.tags ?? []} onClick={onTagClick} />
-      </div>
-      {showExpandedView && (
-        <Portal className={styles.portal}>
-          <div ref={setPopperElement} style={popperStyles.popper} {...attributes.popper}>
-            <SearchCardExpanded
-              className={styles.expandedView}
-              imageHeight={240}
-              imageWidth={320}
-              item={item}
-              lastUpdated={lastUpdated}
-              onClick={onClick}
-            />
-          </div>
-        </Portal>
-      )}
-    </a>
-  );
-}
-
-const getStyles = (theme: GrafanaTheme2, markerWidth = 0, popperWidth = 0) => {
-  const IMAGE_HORIZONTAL_MARGIN = theme.spacing(4);
-
-  return {
-    card: css`
-      background-color: ${theme.colors.background.secondary};
-      border: 1px solid ${theme.colors.border.medium};
-      border-radius: ${theme.shape.radius.default};
-      display: flex;
-      flex-direction: column;
-
-      &:hover {
-        background-color: ${theme.colors.emphasize(theme.colors.background.secondary, 0.03)};
-      }
-    `,
-    checkbox: css`
-      left: 0;
-      margin: ${theme.spacing(1)};
-      position: absolute;
-      top: 0;
-    `,
-    expandedView: css`
-      @keyframes expand {
-        0% {
-          transform: scale(${markerWidth / popperWidth});
-        }
-        100% {
-          transform: scale(1);
-        }
-      }
-
-      animation: expand ${theme.transitions.duration.shortest}ms ease-in-out 0s 1 normal;
-      background-color: ${theme.colors.emphasize(theme.colors.background.secondary, 0.03)};
-    `,
-    image: css`
-      aspect-ratio: 4 / 3;
-      box-shadow: ${theme.shadows.z1};
-      margin: ${theme.spacing(1)} ${IMAGE_HORIZONTAL_MARGIN} 0;
-      width: calc(100% - (2 * ${IMAGE_HORIZONTAL_MARGIN}));
-    `,
-    imageContainer: css`
-      flex: 1;
-      position: relative;
-
-      &:after {
-        background: linear-gradient(180deg, rgba(196, 196, 196, 0) 0%, rgba(127, 127, 127, 0.25) 100%);
-        bottom: 0;
-        content: '';
-        left: 0;
-        margin: ${theme.spacing(1)} ${IMAGE_HORIZONTAL_MARGIN} 0;
-        position: absolute;
-        right: 0;
-        top: 0;
-      }
-    `,
-    imagePlaceholder: css`
-      align-items: center;
-      aspect-ratio: 4 / 3;
-      color: ${theme.colors.text.secondary};
-      display: flex;
-      justify-content: center;
-      margin: ${theme.spacing(1)} ${IMAGE_HORIZONTAL_MARGIN} 0;
-      width: calc(100% - (2 * ${IMAGE_HORIZONTAL_MARGIN}));
-    `,
-    info: css`
-      align-items: center;
-      background-color: ${theme.colors.background.canvas};
-      border-bottom-left-radius: ${theme.shape.radius.default};
-      border-bottom-right-radius: ${theme.shape.radius.default};
-      display: flex;
-      height: ${theme.spacing(7)};
-      gap: ${theme.spacing(1)};
-      padding: 0 ${theme.spacing(2)};
-      z-index: 1;
-    `,
-    portal: css`
-      pointer-events: none;
-    `,
-    title: css`
-      display: block;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    `,
-  };
-};
diff --git a/public/app/features/search/components/SearchCardExpanded.tsx b/public/app/features/search/components/SearchCardExpanded.tsx
deleted file mode 100644
index 86028c590cf7a..0000000000000
--- a/public/app/features/search/components/SearchCardExpanded.tsx
+++ /dev/null
@@ -1,165 +0,0 @@
-import { css } from '@emotion/css';
-import classNames from 'classnames';
-import React, { useState } from 'react';
-import SVG from 'react-inlinesvg';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { Icon, Spinner, TagList, useTheme2 } from '@grafana/ui';
-
-import { DashboardViewItem } from '../types';
-
-import { getThumbnailURL } from './SearchCard';
-
-export interface Props {
-  className?: string;
-  imageHeight: number;
-  imageWidth: number;
-  item: DashboardViewItem;
-  lastUpdated?: string | null;
-  onClick?: (event: React.MouseEvent<HTMLAnchorElement>) => void;
-}
-
-export function SearchCardExpanded({ className, imageHeight, imageWidth, item, lastUpdated, onClick }: Props) {
-  const theme = useTheme2();
-  const [hasImage, setHasImage] = useState(true);
-  const imageSrc = getThumbnailURL(item.uid!, theme.isLight);
-  const styles = getStyles(theme, imageHeight, imageWidth);
-
-  const folderTitle = item.parentTitle || 'General';
-
-  return (
-    <a className={classNames(className, styles.card)} key={item.uid} href={item.url} onClick={onClick}>
-      <div className={styles.imageContainer}>
-        {hasImage ? (
-          <img
-            loading="lazy"
-            alt="Dashboard preview"
-            className={styles.image}
-            src={imageSrc}
-            onLoad={() => setHasImage(true)}
-            onError={() => setHasImage(false)}
-          />
-        ) : (
-          <div className={styles.imagePlaceholder}>
-            {item.icon ? (
-              <SVG src={item.icon} width={36} height={36} title={item.title} />
-            ) : (
-              <Icon name="apps" size="xl" />
-            )}
-          </div>
-        )}
-      </div>
-      <div className={styles.info}>
-        <div className={styles.infoHeader}>
-          <div className={styles.titleContainer}>
-            <div>{item.title}</div>
-            <div className={styles.folder}>
-              <Icon name={'folder'} />
-              {folderTitle}
-            </div>
-          </div>
-          {lastUpdated !== null && (
-            <div className={styles.updateContainer}>
-              <div>Last updated</div>
-              {lastUpdated ? <div className={styles.update}>{lastUpdated}</div> : <Spinner />}
-            </div>
-          )}
-        </div>
-        <div>
-          <TagList className={styles.tagList} tags={item.tags ?? []} />
-        </div>
-      </div>
-    </a>
-  );
-}
-
-const getStyles = (theme: GrafanaTheme2, imageHeight: Props['imageHeight'], imageWidth: Props['imageWidth']) => {
-  const IMAGE_HORIZONTAL_MARGIN = theme.spacing(4);
-
-  return {
-    card: css`
-      background-color: ${theme.colors.background.secondary};
-      border: 1px solid ${theme.colors.border.medium};
-      border-radius: 4px;
-      box-shadow: ${theme.shadows.z3};
-      display: flex;
-      flex-direction: column;
-      height: 100%;
-      max-width: calc(${imageWidth}px + (${IMAGE_HORIZONTAL_MARGIN} * 2))};
-      width: 100%;
-    `,
-    folder: css`
-      align-items: center;
-      color: ${theme.colors.text.secondary};
-      display: flex;
-      font-size: ${theme.typography.size.sm};
-      gap: ${theme.spacing(0.5)};
-    `,
-    image: css`
-      box-shadow: ${theme.shadows.z2};
-      height: ${imageHeight}px;
-      margin: ${theme.spacing(1)} calc(${IMAGE_HORIZONTAL_MARGIN} - 1px) 0;
-      width: ${imageWidth}px;
-    `,
-    imageContainer: css`
-      flex: 1;
-      position: relative;
-
-      &:after {
-        background: linear-gradient(180deg, rgba(196, 196, 196, 0) 0%, rgba(127, 127, 127, 0.25) 100%);
-        bottom: 0;
-        content: '';
-        left: 0;
-        margin: ${theme.spacing(1)} calc(${IMAGE_HORIZONTAL_MARGIN} - 1px) 0;
-        position: absolute;
-        right: 0;
-        top: 0;
-      }
-    `,
-    imagePlaceholder: css`
-      align-items: center;
-      color: ${theme.colors.text.secondary};
-      display: flex;
-      height: ${imageHeight}px;
-      justify-content: center;
-      margin: ${theme.spacing(1)} ${IMAGE_HORIZONTAL_MARGIN} 0;
-      width: ${imageWidth}px;
-    `,
-    info: css`
-      background-color: ${theme.colors.background.canvas};
-      border-bottom-left-radius: 4px;
-      border-bottom-right-radius: 4px;
-      display: flex;
-      flex-direction: column;
-      min-height: ${theme.spacing(7)};
-      gap: ${theme.spacing(1)};
-      padding: ${theme.spacing(1)} ${theme.spacing(2)};
-      z-index: 1;
-    `,
-    infoHeader: css`
-      display: flex;
-      gap: ${theme.spacing(1)};
-      justify-content: space-between;
-    `,
-    tagList: css`
-      justify-content: flex-start;
-    `,
-    titleContainer: css`
-      display: flex;
-      flex-direction: column;
-      gap: ${theme.spacing(0.5)};
-    `,
-    updateContainer: css`
-      align-items: flex-end;
-      display: flex;
-      flex-direction: column;
-      flex-shrink: 0;
-      font-size: ${theme.typography.bodySmall.fontSize};
-      gap: ${theme.spacing(0.5)};
-    `,
-    update: css`
-      color: ${theme.colors.text.secondary};
-      text-align: right;
-    `,
-  };
-};
diff --git a/public/app/features/search/components/SearchCheckbox.tsx b/public/app/features/search/components/SearchCheckbox.tsx
deleted file mode 100644
index c80ea84db756e..0000000000000
--- a/public/app/features/search/components/SearchCheckbox.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React, { memo } from 'react';
-
-import { Checkbox } from '@grafana/ui';
-
-interface Props {
-  checked?: boolean;
-  onClick?: React.MouseEventHandler<HTMLInputElement>;
-  className?: string;
-  editable?: boolean;
-  'aria-label'?: string;
-}
-
-export const SearchCheckbox = memo(
-  ({ onClick, className, checked = false, editable = false, 'aria-label': ariaLabel }: Props) => {
-    return editable ? (
-      <Checkbox onClick={onClick} className={className} value={checked} aria-label={ariaLabel} />
-    ) : null;
-  }
-);
-
-SearchCheckbox.displayName = 'SearchCheckbox';
diff --git a/public/app/features/search/components/SearchItem.test.tsx b/public/app/features/search/components/SearchItem.test.tsx
deleted file mode 100644
index 50c92b69f1ac5..0000000000000
--- a/public/app/features/search/components/SearchItem.test.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import { fireEvent, render, screen } from '@testing-library/react';
-import React from 'react';
-
-import { selectors } from '@grafana/e2e-selectors';
-
-import { DashboardViewItem } from '../types';
-
-import { Props, SearchItem } from './SearchItem';
-
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
-const data: DashboardViewItem = {
-  kind: 'dashboard' as const,
-  uid: 'lBdLINUWk',
-  title: 'Test 1',
-  url: '/d/lBdLINUWk/test1',
-  tags: ['Tag1', 'Tag2'],
-};
-
-const setup = (propOverrides?: Partial<Props>) => {
-  const props: Props = {
-    item: data,
-    onTagSelected: jest.fn(),
-    editable: false,
-  };
-
-  Object.assign(props, propOverrides);
-
-  render(<SearchItem {...props} />);
-};
-
-describe('SearchItem', () => {
-  it('should render the item', () => {
-    setup();
-    expect(screen.getAllByTestId(selectors.components.Search.dashboardItem('Test 1'))).toHaveLength(1);
-    expect(screen.getAllByText('Test 1')).toHaveLength(1);
-  });
-
-  it('should toggle items when checked', () => {
-    const mockedOnToggleChecked = jest.fn();
-    setup({ editable: true, onToggleChecked: mockedOnToggleChecked });
-    const checkbox = screen.getByRole('checkbox');
-    expect(checkbox).not.toBeChecked();
-    fireEvent.click(checkbox);
-    expect(mockedOnToggleChecked).toHaveBeenCalledTimes(1);
-    expect(mockedOnToggleChecked).toHaveBeenCalledWith(data);
-  });
-
-  it('should mark items as checked', () => {
-    setup({ editable: true, isSelected: true });
-    expect(screen.getByRole('checkbox')).toBeChecked();
-  });
-
-  it("should render item's tags", () => {
-    setup();
-    expect(screen.getAllByText(/tag/i)).toHaveLength(2);
-  });
-
-  it('should select the tag on tag click', () => {
-    const mockOnTagSelected = jest.fn();
-    setup({ onTagSelected: mockOnTagSelected });
-    fireEvent.click(screen.getByText('Tag1'));
-    expect(mockOnTagSelected).toHaveBeenCalledTimes(1);
-    expect(mockOnTagSelected).toHaveBeenCalledWith('Tag1');
-  });
-});
diff --git a/public/app/features/search/components/SearchItem.tsx b/public/app/features/search/components/SearchItem.tsx
deleted file mode 100644
index 60de8daf986e5..0000000000000
--- a/public/app/features/search/components/SearchItem.tsx
+++ /dev/null
@@ -1,141 +0,0 @@
-import { css } from '@emotion/css';
-import React, { useCallback } from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { selectors as e2eSelectors } from '@grafana/e2e-selectors';
-import { config } from '@grafana/runtime';
-import { Card, Icon, IconName, TagList, useStyles2 } from '@grafana/ui';
-import { t } from 'app/core/internationalization';
-
-import { SEARCH_ITEM_HEIGHT } from '../constants';
-import { getIconForKind } from '../service/utils';
-import { DashboardViewItem, OnToggleChecked } from '../types';
-
-import { SearchCheckbox } from './SearchCheckbox';
-
-export interface Props {
-  item: DashboardViewItem;
-  isSelected?: boolean;
-  editable?: boolean;
-  onTagSelected: (name: string) => any;
-  onToggleChecked?: OnToggleChecked;
-  onClickItem?: (event: React.MouseEvent<HTMLElement>) => void;
-}
-
-const selectors = e2eSelectors.components.Search;
-
-const getIconFromMeta = (meta = ''): IconName => {
-  const metaIconMap = new Map<string, IconName>([
-    ['errors', 'info-circle'],
-    ['views', 'eye'],
-  ]);
-
-  return metaIconMap.has(meta) ? metaIconMap.get(meta)! : 'sort-amount-down';
-};
-
-/** @deprecated */
-export const SearchItem = ({ item, isSelected, editable, onToggleChecked, onTagSelected, onClickItem }: Props) => {
-  const styles = useStyles2(getStyles);
-  const tagSelected = useCallback(
-    (tag: string, event: React.MouseEvent<HTMLElement>) => {
-      event.stopPropagation();
-      event.preventDefault();
-      onTagSelected(tag);
-    },
-    [onTagSelected]
-  );
-
-  const handleCheckboxClick = useCallback(
-    (ev: React.MouseEvent) => {
-      ev.stopPropagation();
-
-      if (onToggleChecked) {
-        onToggleChecked(item);
-      }
-    },
-    [item, onToggleChecked]
-  );
-
-  const description = config.featureToggles.nestedFolders ? (
-    <>
-      <Icon name={getIconForKind(item.kind)} aria-hidden /> {kindName(item.kind)}
-    </>
-  ) : (
-    <>
-      <Icon name={getIconForKind(item.parentKind ?? 'folder')} aria-hidden /> {item.parentTitle || 'General'}
-    </>
-  );
-
-  return (
-    <div className={styles.cardContainer}>
-      <SearchCheckbox
-        className={styles.checkbox}
-        aria-label="Select dashboard"
-        editable={editable}
-        checked={isSelected}
-        onClick={handleCheckboxClick}
-      />
-
-      <Card
-        className={styles.card}
-        data-testid={selectors.dashboardItem(item.title)}
-        href={item.url}
-        style={{ minHeight: SEARCH_ITEM_HEIGHT }}
-        onClick={onClickItem}
-      >
-        <Card.Heading>{item.title}</Card.Heading>
-
-        <Card.Meta separator={''}>
-          <span className={styles.metaContainer}>{description}</span>
-
-          {item.sortMetaName && (
-            <span className={styles.metaContainer}>
-              <Icon name={getIconFromMeta(item.sortMetaName)} />
-              {item.sortMeta} {item.sortMetaName}
-            </span>
-          )}
-        </Card.Meta>
-        <Card.Tags>
-          <TagList tags={item.tags ?? []} onClick={tagSelected} getAriaLabel={(tag) => `Filter by tag "${tag}"`} />
-        </Card.Tags>
-      </Card>
-    </div>
-  );
-};
-
-function kindName(kind: DashboardViewItem['kind']) {
-  switch (kind) {
-    case 'folder':
-      return t('search.result-kind.folder', 'Folder');
-    case 'dashboard':
-      return t('search.result-kind.dashboard', 'Dashboard');
-    case 'panel':
-      return t('search.result-kind.panel', 'Panel');
-  }
-}
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    cardContainer: css`
-      display: flex;
-      align-items: center;
-      margin-bottom: ${theme.spacing(0.75)};
-    `,
-    card: css`
-      padding: ${theme.spacing(1)} ${theme.spacing(2)};
-      margin-bottom: 0;
-    `,
-    checkbox: css({
-      marginRight: theme.spacing(1),
-    }),
-    metaContainer: css`
-      display: flex;
-      align-items: center;
-      margin-right: ${theme.spacing(1)};
-
-      svg {
-        margin-right: ${theme.spacing(0.5)};
-      }
-    `,
-  };
-};
diff --git a/public/app/features/search/hooks/useSearchKeyboardSelection.ts b/public/app/features/search/hooks/useSearchKeyboardSelection.ts
index ee9a35f11c130..1eb05bc914554 100644
--- a/public/app/features/search/hooks/useSearchKeyboardSelection.ts
+++ b/public/app/features/search/hooks/useSearchKeyboardSelection.ts
@@ -85,8 +85,8 @@ export function useSearchKeyboardNavigation(
               setHighlightIndex({ ...highlightIndexRef.current });
               break;
             }
-            const url = urlsRef.current.values?.[idx] as string;
-            if (url) {
+            const url: unknown = urlsRef.current.values?.[idx];
+            if (typeof url === 'string') {
               locationService.push(locationUtil.stripBaseFromUrl(url));
             }
         }
diff --git a/public/app/features/search/index.ts b/public/app/features/search/index.ts
deleted file mode 100644
index f8282672f918d..0000000000000
--- a/public/app/features/search/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { SearchItem } from './components/SearchItem';
diff --git a/public/app/features/search/page/components/ActionRow.tsx b/public/app/features/search/page/components/ActionRow.tsx
index 378908270bc1d..3d9434280ee3c 100644
--- a/public/app/features/search/page/components/ActionRow.tsx
+++ b/public/app/features/search/page/components/ActionRow.tsx
@@ -70,7 +70,10 @@ export const ActionRow = ({
   const layout = getValidQueryLayout(state);
 
   // Disabled folder layout option when query is present
-  const disabledOptions = state.query || state.datasource || state.panel_type ? [SearchLayout.Folders] : [];
+  const disabledOptions =
+    state.tag.length || state.starred || state.query || state.datasource || state.panel_type
+      ? [SearchLayout.Folders]
+      : [];
 
   return (
     <div className={styles.actionRow}>
diff --git a/public/app/features/search/page/components/ConfirmDeleteModal.test.tsx b/public/app/features/search/page/components/ConfirmDeleteModal.test.tsx
deleted file mode 100644
index a782e526a7aea..0000000000000
--- a/public/app/features/search/page/components/ConfirmDeleteModal.test.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import React from 'react';
-
-import { config } from 'app/core/config';
-
-import { ConfirmDeleteModal } from './ConfirmDeleteModal';
-
-describe('ConfirmModal', () => {
-  it('should render correct title, body, dismiss-, cancel- and delete-text', () => {
-    const selectedItems = new Map([['dashboard', new Set(['uid1', 'uid2'])]]);
-
-    render(<ConfirmDeleteModal onDeleteItems={() => {}} results={selectedItems} onDismiss={() => {}} />);
-
-    expect(screen.getByRole('heading', { name: 'Delete' })).toBeInTheDocument();
-    expect(screen.getByText('Do you want to delete the 2 selected dashboards?')).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: 'Delete' })).toBeInTheDocument();
-
-    expect(screen.queryByPlaceholderText('Type "delete" to confirm')).not.toBeInTheDocument();
-  });
-
-  describe('with nestedFolders feature flag', () => {
-    let originalNestedFoldersValue = config.featureToggles.nestedFolders;
-
-    beforeAll(() => {
-      originalNestedFoldersValue = config.featureToggles.nestedFolders;
-      config.featureToggles.nestedFolders = true;
-    });
-
-    afterAll(() => {
-      config.featureToggles.nestedFolders = originalNestedFoldersValue;
-    });
-
-    it("should ask to type 'delete' to confirm when a folder is selected", async () => {
-      const selectedItems = new Map([
-        ['dashboard', new Set(['uid1', 'uid2'])],
-        ['folder', new Set(['uid3'])],
-      ]);
-
-      render(<ConfirmDeleteModal onDeleteItems={() => {}} results={selectedItems} onDismiss={() => {}} />);
-
-      expect(screen.getByPlaceholderText('Type "delete" to confirm')).toBeInTheDocument();
-    });
-  });
-});
diff --git a/public/app/features/search/page/components/ConfirmDeleteModal.tsx b/public/app/features/search/page/components/ConfirmDeleteModal.tsx
deleted file mode 100644
index ec7b7808b8e40..0000000000000
--- a/public/app/features/search/page/components/ConfirmDeleteModal.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import { css } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { ConfirmModal, useStyles2 } from '@grafana/ui';
-import { config } from 'app/core/config';
-import { deleteFoldersAndDashboards } from 'app/features/manage-dashboards/state/actions';
-
-import { OnMoveOrDeleleSelectedItems } from '../../types';
-
-interface Props {
-  onDeleteItems: OnMoveOrDeleleSelectedItems;
-  results: Map<string, Set<string>>;
-  onDismiss: () => void;
-}
-
-export const ConfirmDeleteModal = ({ results, onDeleteItems, onDismiss }: Props) => {
-  const styles = useStyles2(getStyles);
-
-  const dashboards = Array.from(results.get('dashboard') ?? []);
-  const folders = Array.from(results.get('folder') ?? []);
-
-  const folderCount = folders.length;
-  const dashCount = dashboards.length;
-
-  let text = 'Do you want to delete the ';
-  let subtitle;
-  const dashEnding = dashCount === 1 ? '' : 's';
-  const folderEnding = folderCount === 1 ? '' : 's';
-
-  if (folderCount > 0 && dashCount > 0) {
-    text += `selected folder${folderEnding} and dashboard${dashEnding}?\n`;
-    subtitle = `All dashboards and alerts of the selected folder${folderEnding} will also be deleted`;
-  } else if (folderCount > 0) {
-    text += `selected folder${folderEnding} and all ${folderCount === 1 ? 'its' : 'their'} dashboards and alerts?`;
-  } else {
-    text += `${dashCount} selected dashboard${dashEnding}?`;
-  }
-
-  const deleteItems = () => {
-    deleteFoldersAndDashboards(folders, dashboards).then(() => {
-      onDeleteItems();
-      onDismiss();
-    });
-  };
-
-  const requireDoubleConfirm = config.featureToggles.nestedFolders && folderCount > 0;
-
-  return (
-    <ConfirmModal
-      isOpen
-      title="Delete"
-      body={
-        <>
-          {text} {subtitle && <div className={styles.subtitle}>{subtitle}</div>}
-        </>
-      }
-      confirmText="Delete"
-      confirmationText={requireDoubleConfirm ? 'delete' : undefined}
-      onConfirm={deleteItems}
-      onDismiss={onDismiss}
-    />
-  );
-};
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  subtitle: css`
-    font-size: ${theme.typography.fontSize}px;
-    padding-top: ${theme.spacing(2)};
-  `,
-});
diff --git a/public/app/features/search/page/components/FolderSection.test.tsx b/public/app/features/search/page/components/FolderSection.test.tsx
deleted file mode 100644
index cd2d34837155f..0000000000000
--- a/public/app/features/search/page/components/FolderSection.test.tsx
+++ /dev/null
@@ -1,238 +0,0 @@
-import { render, screen, act } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import React from 'react';
-
-import { DataFrame, DataFrameView, FieldType } from '@grafana/data';
-
-import { DashboardQueryResult, getGrafanaSearcher, QueryResponse } from '../../service';
-import { DashboardSearchItemType, DashboardViewItem } from '../../types';
-
-import { FolderSection } from './FolderSection';
-
-describe('FolderSection', () => {
-  let grafanaSearcherSpy: jest.SpyInstance;
-  const mockOnTagSelected = jest.fn();
-  const mockSelectionToggle = jest.fn();
-  const mockSelection = jest.fn();
-  const mockSection: DashboardViewItem = {
-    kind: 'folder',
-    uid: 'my-folder',
-    title: 'My folder',
-  };
-
-  // need to make sure we clear localStorage
-  // otherwise tests can interfere with each other and the starting expanded state of the component
-  afterEach(() => {
-    window.localStorage.clear();
-  });
-
-  describe('when there are no results', () => {
-    const emptySearchData: DataFrame = {
-      fields: [
-        { name: 'kind', type: FieldType.string, config: {}, values: [] },
-        { name: 'name', type: FieldType.string, config: {}, values: [] },
-        { name: 'uid', type: FieldType.string, config: {}, values: [] },
-        { name: 'url', type: FieldType.string, config: {}, values: [] },
-        { name: 'tags', type: FieldType.other, config: {}, values: [] },
-        { name: 'location', type: FieldType.string, config: {}, values: [] },
-      ],
-      length: 0,
-    };
-
-    const mockSearchResult: QueryResponse = {
-      isItemLoaded: jest.fn(),
-      loadMoreItems: jest.fn(),
-      totalRows: emptySearchData.length,
-      view: new DataFrameView<DashboardQueryResult>(emptySearchData),
-    };
-
-    beforeAll(() => {
-      grafanaSearcherSpy = jest.spyOn(getGrafanaSearcher(), 'search').mockResolvedValue(mockSearchResult);
-    });
-
-    it('shows the folder title as the header', async () => {
-      render(<FolderSection section={mockSection} onTagSelected={mockOnTagSelected} />);
-      expect(await screen.findByRole('button', { name: mockSection.title })).toBeInTheDocument();
-    });
-
-    describe('when renderStandaloneBody is set', () => {
-      it('shows a "No results found" message and does not show the folder title header', async () => {
-        render(<FolderSection renderStandaloneBody section={mockSection} onTagSelected={mockOnTagSelected} />);
-        expect(await screen.findByText('No results found')).toBeInTheDocument();
-        expect(screen.queryByRole('button', { name: mockSection.title })).not.toBeInTheDocument();
-      });
-
-      it('renders a loading spinner whilst waiting for the results', async () => {
-        // mock the query promise so we can resolve manually
-        let promiseResolver: (arg0: QueryResponse) => void;
-        const promise = new Promise((resolve) => {
-          promiseResolver = resolve;
-        });
-        grafanaSearcherSpy.mockImplementationOnce(() => promise);
-
-        render(<FolderSection renderStandaloneBody section={mockSection} onTagSelected={mockOnTagSelected} />);
-        expect(await screen.findByTestId('Spinner')).toBeInTheDocument();
-
-        // resolve the promise
-        await act(async () => {
-          promiseResolver(mockSearchResult);
-        });
-
-        expect(screen.queryByTestId('Spinner')).not.toBeInTheDocument();
-        expect(await screen.findByText('No results found')).toBeInTheDocument();
-      });
-    });
-
-    it('shows a "No results found" message when expanding the folder', async () => {
-      render(<FolderSection section={mockSection} onTagSelected={mockOnTagSelected} />);
-
-      await userEvent.click(await screen.findByRole('button', { name: mockSection.title }));
-      expect(getGrafanaSearcher().search).toHaveBeenCalled();
-      expect(await screen.findByText('No results found')).toBeInTheDocument();
-    });
-  });
-
-  describe('when there are results', () => {
-    const searchData: DataFrame = {
-      fields: [
-        { name: 'kind', type: FieldType.string, config: {}, values: [DashboardSearchItemType.DashDB] },
-        { name: 'name', type: FieldType.string, config: {}, values: ['My dashboard 1'] },
-        { name: 'uid', type: FieldType.string, config: {}, values: ['my-dashboard-1'] },
-        { name: 'url', type: FieldType.string, config: {}, values: ['/my-dashboard-1'] },
-        { name: 'tags', type: FieldType.other, config: {}, values: [['foo', 'bar']] },
-        { name: 'location', type: FieldType.string, config: {}, values: ['my-folder-1'] },
-      ],
-      meta: {
-        custom: {
-          locationInfo: {
-            'my-folder-1': {
-              name: 'My folder 1',
-              kind: 'folder',
-              url: '/my-folder-1',
-            },
-          },
-        },
-      },
-      length: 1,
-    };
-
-    const mockSearchResult: QueryResponse = {
-      isItemLoaded: jest.fn(),
-      loadMoreItems: jest.fn(),
-      totalRows: searchData.length,
-      view: new DataFrameView<DashboardQueryResult>(searchData),
-    };
-
-    beforeAll(() => {
-      grafanaSearcherSpy = jest.spyOn(getGrafanaSearcher(), 'search').mockResolvedValue(mockSearchResult);
-    });
-
-    it('shows the folder title as the header', async () => {
-      render(<FolderSection section={mockSection} onTagSelected={mockOnTagSelected} />);
-      expect(await screen.findByRole('button', { name: mockSection.title })).toBeInTheDocument();
-    });
-
-    describe('when renderStandaloneBody is set', () => {
-      it('shows the folder children and does not render the folder title', async () => {
-        render(<FolderSection renderStandaloneBody section={mockSection} onTagSelected={mockOnTagSelected} />);
-        expect(await screen.findByText('My dashboard 1')).toBeInTheDocument();
-        expect(screen.queryByRole('button', { name: mockSection.title })).not.toBeInTheDocument();
-      });
-
-      it('renders a loading spinner whilst waiting for the results', async () => {
-        // mock the query promise so we can resolve manually
-        let promiseResolver: (arg0: QueryResponse) => void;
-        const promise = new Promise((resolve) => {
-          promiseResolver = resolve;
-        });
-        grafanaSearcherSpy.mockImplementationOnce(() => promise);
-
-        render(<FolderSection renderStandaloneBody section={mockSection} onTagSelected={mockOnTagSelected} />);
-        expect(await screen.findByTestId('Spinner')).toBeInTheDocument();
-
-        // resolve the promise
-        await act(async () => {
-          promiseResolver(mockSearchResult);
-        });
-
-        expect(screen.queryByTestId('Spinner')).not.toBeInTheDocument();
-        expect(await screen.findByText('My dashboard 1')).toBeInTheDocument();
-      });
-    });
-
-    it('shows the folder contents when expanding the folder', async () => {
-      render(<FolderSection section={mockSection} onTagSelected={mockOnTagSelected} />);
-
-      await userEvent.click(await screen.findByRole('button', { name: mockSection.title }));
-      expect(getGrafanaSearcher().search).toHaveBeenCalled();
-      expect(await screen.findByText('My dashboard 1')).toBeInTheDocument();
-    });
-
-    describe('when clicking the checkbox', () => {
-      it('does not expand the section', async () => {
-        render(
-          <FolderSection
-            section={mockSection}
-            selection={mockSelection}
-            selectionToggle={mockSelectionToggle}
-            onTagSelected={mockOnTagSelected}
-          />
-        );
-
-        await userEvent.click(await screen.findByRole('checkbox', { name: 'Select folder' }));
-        expect(screen.queryByText('My dashboard 1')).not.toBeInTheDocument();
-      });
-
-      it('selects only the folder if the folder is not expanded', async () => {
-        render(
-          <FolderSection
-            section={mockSection}
-            selection={mockSelection}
-            selectionToggle={mockSelectionToggle}
-            onTagSelected={mockOnTagSelected}
-          />
-        );
-
-        await userEvent.click(await screen.findByRole('checkbox', { name: 'Select folder' }));
-        expect(mockSelectionToggle).toHaveBeenCalledWith('folder', 'my-folder');
-        expect(mockSelectionToggle).not.toHaveBeenCalledWith('dashboard', 'my-dashboard-1');
-      });
-
-      it('selects the folder and all children when the folder is expanded', async () => {
-        render(
-          <FolderSection
-            section={mockSection}
-            selection={mockSelection}
-            selectionToggle={mockSelectionToggle}
-            onTagSelected={mockOnTagSelected}
-          />
-        );
-
-        await userEvent.click(await screen.findByRole('button', { name: mockSection.title }));
-        expect(getGrafanaSearcher().search).toHaveBeenCalled();
-
-        await userEvent.click(await screen.findByRole('checkbox', { name: 'Select folder' }));
-        expect(mockSelectionToggle).toHaveBeenCalledWith('folder', 'my-folder');
-        expect(mockSelectionToggle).toHaveBeenCalledWith('dashboard', 'my-dashboard-1');
-      });
-    });
-
-    describe('when in a pseudo-folder (i.e. Starred/Recent)', () => {
-      const mockRecentSection: DashboardViewItem = {
-        kind: 'folder',
-        uid: '__recent',
-        title: 'Recent',
-        itemsUIDs: ['my-dashboard-1'],
-      };
-
-      it('shows the correct folder name next to the dashboard', async () => {
-        render(<FolderSection section={mockRecentSection} onTagSelected={mockOnTagSelected} />);
-
-        await userEvent.click(await screen.findByRole('button', { name: mockRecentSection.title }));
-        expect(getGrafanaSearcher().search).toHaveBeenCalled();
-        expect(await screen.findByText('My dashboard 1')).toBeInTheDocument();
-        expect(await screen.findByText('My folder 1')).toBeInTheDocument();
-      });
-    });
-  });
-});
diff --git a/public/app/features/search/page/components/FolderSection.tsx b/public/app/features/search/page/components/FolderSection.tsx
deleted file mode 100644
index 7183143594e27..0000000000000
--- a/public/app/features/search/page/components/FolderSection.tsx
+++ /dev/null
@@ -1,258 +0,0 @@
-import { css } from '@emotion/css';
-import React, { useId, useState } from 'react';
-import { useAsync } from 'react-use';
-
-import { GrafanaTheme2, toIconName } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
-import { Card, Checkbox, CollapsableSection, Icon, Spinner, useStyles2 } from '@grafana/ui';
-import { config } from 'app/core/config';
-import { t } from 'app/core/internationalization';
-
-import { SearchItem } from '../..';
-import { GENERAL_FOLDER_UID, SEARCH_EXPANDED_FOLDER_STORAGE_KEY } from '../../constants';
-import { getGrafanaSearcher } from '../../service';
-import { getFolderChildren } from '../../service/folders';
-import { queryResultToViewItem } from '../../service/utils';
-import { DashboardViewItem } from '../../types';
-import { SelectionChecker, SelectionToggle } from '../selection';
-
-interface SectionHeaderProps {
-  selection?: SelectionChecker;
-  selectionToggle?: SelectionToggle;
-  onClickItem?: (e: React.MouseEvent<HTMLElement>) => void;
-  onTagSelected: (tag: string) => void;
-  section: DashboardViewItem;
-  renderStandaloneBody?: boolean; // render the body on its own
-  tags?: string[];
-}
-
-async function getChildren(section: DashboardViewItem, tags: string[] | undefined): Promise<DashboardViewItem[]> {
-  if (config.featureToggles.nestedFolders) {
-    return getFolderChildren(section.uid, section.title);
-  }
-
-  const query = section.itemsUIDs
-    ? {
-        uid: section.itemsUIDs,
-      }
-    : {
-        query: '*',
-        kind: ['dashboard'],
-        location: section.uid,
-        sort: 'name_sort',
-        limit: 1000, // this component does not have infinite scroll, so we need to load everything upfront
-      };
-
-  const raw = await getGrafanaSearcher().search({ ...query, tags });
-  return raw.view.map((v) => queryResultToViewItem(v, raw.view));
-}
-
-export const FolderSection = ({
-  section,
-  selectionToggle,
-  onClickItem,
-  onTagSelected,
-  selection,
-  renderStandaloneBody,
-  tags,
-}: SectionHeaderProps) => {
-  const uid = section.uid;
-  const editable = selectionToggle != null;
-
-  const styles = useStyles2(getSectionHeaderStyles, editable);
-  const [sectionExpanded, setSectionExpanded] = useState(() => {
-    const lastExpandedFolder = window.localStorage.getItem(SEARCH_EXPANDED_FOLDER_STORAGE_KEY);
-    return lastExpandedFolder === uid;
-  });
-
-  const results = useAsync(async () => {
-    if (!sectionExpanded && !renderStandaloneBody) {
-      return Promise.resolve([]);
-    }
-
-    const childItems = getChildren(section, tags);
-
-    return childItems;
-  }, [sectionExpanded, tags]);
-
-  const onSectionExpand = () => {
-    const newExpandedValue = !sectionExpanded;
-
-    if (newExpandedValue) {
-      // If we've just expanded the section, remember it to local storage
-      window.localStorage.setItem(SEARCH_EXPANDED_FOLDER_STORAGE_KEY, uid);
-    } else {
-      // Else, when closing a section, remove it from local storage only if this folder was the most recently opened
-      const lastExpandedFolder = window.localStorage.getItem(SEARCH_EXPANDED_FOLDER_STORAGE_KEY);
-      if (lastExpandedFolder === uid) {
-        window.localStorage.removeItem(SEARCH_EXPANDED_FOLDER_STORAGE_KEY);
-      }
-    }
-
-    setSectionExpanded(newExpandedValue);
-  };
-
-  const onToggleFolder = (evt: React.FormEvent) => {
-    evt.preventDefault();
-    evt.stopPropagation();
-    if (selectionToggle && selection) {
-      const checked = !selection(section.kind, section.uid);
-      selectionToggle(section.kind, section.uid);
-      const sub = results.value ?? [];
-      for (const item of sub) {
-        if (selection(item.kind, item.uid!) !== checked) {
-          selectionToggle(item.kind, item.uid!);
-        }
-      }
-    }
-  };
-
-  const id = useId();
-  const labelId = `section-header-label-${id}`;
-
-  let icon = toIconName(section.icon ?? '');
-  if (!icon) {
-    icon = sectionExpanded ? 'folder-open' : 'folder';
-  }
-
-  const renderResults = () => {
-    if (!results.value) {
-      return null;
-    } else if (results.value.length === 0 && !results.loading) {
-      return (
-        <Card>
-          <Card.Heading>No results found</Card.Heading>
-        </Card>
-      );
-    }
-
-    return results.value.map((item) => {
-      return (
-        <SearchItem
-          key={item.uid}
-          item={item}
-          onTagSelected={onTagSelected}
-          onToggleChecked={(item) => selectionToggle?.(item.kind, item.uid)}
-          editable={Boolean(selection != null)}
-          onClickItem={onClickItem}
-          isSelected={selection?.(item.kind, item.uid)}
-        />
-      );
-    });
-  };
-
-  // Skip the folder wrapper
-  if (renderStandaloneBody) {
-    return (
-      <div className={styles.folderViewResults}>
-        {!results.value?.length && results.loading ? <Spinner className={styles.spinner} /> : renderResults()}
-      </div>
-    );
-  }
-
-  return (
-    <CollapsableSection
-      headerDataTestId={selectors.components.Search.folderHeader(section.title)}
-      contentDataTestId={selectors.components.Search.folderContent(section.title)}
-      isOpen={sectionExpanded ?? false}
-      onToggle={onSectionExpand}
-      className={styles.wrapper}
-      contentClassName={styles.content}
-      loading={results.loading}
-      labelId={labelId}
-      label={
-        <>
-          {selectionToggle && selection && (
-            // TODO: fix keyboard a11y
-            // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
-            <div onClick={onToggleFolder}>
-              <Checkbox
-                className={styles.checkbox}
-                value={selection(section.kind, section.uid)}
-                aria-label={t('search.folder-view.select-folder', 'Select folder')}
-              />
-            </div>
-          )}
-
-          <div className={styles.icon}>
-            <Icon name={icon} />
-          </div>
-
-          <div className={styles.text}>
-            <span id={labelId}>{section.title}</span>
-            {section.url && section.uid !== GENERAL_FOLDER_UID && (
-              <a href={section.url} className={styles.link}>
-                <span className={styles.separator}>|</span> <Icon name="folder-upload" />{' '}
-                {t('search.folder-view.go-to-folder', 'Go to folder')}
-              </a>
-            )}
-          </div>
-        </>
-      }
-    >
-      {results.value && <ul className={styles.sectionItems}>{renderResults()}</ul>}
-    </CollapsableSection>
-  );
-};
-
-const getSectionHeaderStyles = (theme: GrafanaTheme2, editable: boolean) => {
-  const sm = theme.spacing(1);
-
-  return {
-    wrapper: css`
-      align-items: center;
-      font-size: ${theme.typography.size.base};
-      padding: 12px;
-      border-bottom: none;
-      color: ${theme.colors.text.secondary};
-      z-index: 1;
-
-      &:hover,
-      &.selected {
-        color: ${theme.colors.text};
-      }
-
-      &:hover,
-      &:focus-visible,
-      &:focus-within {
-        a {
-          opacity: 1;
-        }
-      }
-    `,
-    sectionItems: css`
-      margin: 0 24px 0 32px;
-    `,
-    icon: css`
-      padding: 0 ${sm} 0 ${editable ? 0 : sm};
-    `,
-    folderViewResults: css`
-      overflow: auto;
-    `,
-    text: css`
-      flex-grow: 1;
-      line-height: 24px;
-    `,
-    link: css`
-      padding: 2px 10px 0;
-      color: ${theme.colors.text.secondary};
-      opacity: 0;
-      transition: opacity 150ms ease-in-out;
-    `,
-    separator: css`
-      margin-right: 6px;
-    `,
-    content: css`
-      padding-top: 0px;
-      padding-bottom: 0px;
-    `,
-    spinner: css`
-      display: grid;
-      place-content: center;
-      padding-bottom: 1rem;
-    `,
-    checkbox: css({
-      marginRight: theme.spacing(1),
-    }),
-  };
-};
diff --git a/public/app/features/search/page/components/ManageActions.test.tsx b/public/app/features/search/page/components/ManageActions.test.tsx
deleted file mode 100644
index cd78a0c0899ff..0000000000000
--- a/public/app/features/search/page/components/ManageActions.test.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import React from 'react';
-import { Provider } from 'react-redux';
-import configureMockStore from 'redux-mock-store';
-
-import { contextSrv } from 'app/core/services/context_srv';
-
-import { ManageActions } from './ManageActions';
-
-jest.mock('app/core/services/context_srv', () => ({
-  contextSrv: {
-    hasEditPermissionInFolders: false,
-  },
-}));
-
-jest.mock('app/core/components/Select/OldFolderPicker', () => {
-  return {
-    OldFolderPicker: () => null,
-  };
-});
-
-describe('ManageActions', () => {
-  describe('when user has edit permission in folders', () => {
-    // Permissions
-    contextSrv.hasEditPermissionInFolders = true;
-
-    // Mock selected dashboards
-    const mockItemsSelected = new Map();
-    const mockDashboardsUIDsSelected = new Set();
-    mockDashboardsUIDsSelected.add('uid1');
-    mockDashboardsUIDsSelected.add('uid2');
-    mockItemsSelected.set('dashboard', mockDashboardsUIDsSelected);
-
-    //Mock store redux for old MoveDashboards state action
-    const mockStore = configureMockStore();
-    const store = mockStore({ dashboard: { panels: [] } });
-
-    const onChange = jest.fn();
-    const clearSelection = jest.fn();
-
-    it('should show move when user click the move button', async () => {
-      render(
-        <Provider store={store}>
-          <ManageActions items={mockItemsSelected} onChange={onChange} clearSelection={clearSelection} />
-        </Provider>
-      );
-      expect(screen.getByTestId('manage-actions')).toBeInTheDocument();
-      expect(await screen.findByRole('button', { name: 'Move', hidden: true })).not.toBeDisabled();
-      expect(await screen.findByRole('button', { name: 'Delete', hidden: true })).not.toBeDisabled();
-
-      // open Move modal
-      await userEvent.click(screen.getByRole('button', { name: 'Move', hidden: true }));
-      expect(screen.getByText(/Move 2 dashboards to:/i)).toBeInTheDocument();
-    });
-
-    it('should show delete modal when user click the delete button', async () => {
-      render(
-        <Provider store={store}>
-          <ManageActions items={mockItemsSelected} onChange={onChange} clearSelection={clearSelection} />
-        </Provider>
-      );
-      expect(screen.getByTestId('manage-actions')).toBeInTheDocument();
-      // open Delete modal
-      await userEvent.click(screen.getByRole('button', { name: 'Delete', hidden: true }));
-      expect(screen.getByText(/Do you want to delete the 2 selected dashboards\?/i)).toBeInTheDocument();
-    });
-  });
-
-  describe('when user has not edit permission in folders', () => {
-    it('should have disabled the Move button', async () => {
-      contextSrv.hasEditPermissionInFolders = false;
-      const mockItemsSelected = new Map();
-      const mockDashboardsUIDsSelected = new Set();
-      mockDashboardsUIDsSelected.add('uid1');
-      mockDashboardsUIDsSelected.add('uid2');
-      mockItemsSelected.set('dashboard', mockDashboardsUIDsSelected);
-
-      //Mock store
-      const mockStore = configureMockStore();
-      const store = mockStore({ dashboard: { panels: [] } });
-
-      const onChange = jest.fn();
-      const clearSelection = jest.fn();
-
-      render(
-        <Provider store={store}>
-          <ManageActions items={mockItemsSelected} onChange={onChange} clearSelection={clearSelection} />
-        </Provider>
-      );
-      expect(screen.getByTestId('manage-actions')).toBeInTheDocument();
-      expect(await screen.findByRole('button', { name: 'Move', hidden: true })).toBeDisabled();
-      await userEvent.click(screen.getByRole('button', { name: 'Move', hidden: true }));
-      expect(screen.queryByText(/Choose Dashboard Folder/i)).toBeNull();
-    });
-  });
-  describe('When user has selected General folder', () => {
-    contextSrv.hasEditPermissionInFolders = true;
-    const mockItemsSelected = new Map();
-    const mockFolderUIDSelected = new Set();
-    mockFolderUIDSelected.add('general');
-    mockItemsSelected.set('folder', mockFolderUIDSelected);
-
-    //Mock store
-    const mockStore = configureMockStore();
-    const store = mockStore({ dashboard: { panels: [] } });
-
-    const onChange = jest.fn();
-    const clearSelection = jest.fn();
-
-    it('should disable the Delete button', async () => {
-      render(
-        <Provider store={store}>
-          <ManageActions items={mockItemsSelected} onChange={onChange} clearSelection={clearSelection} />
-        </Provider>
-      );
-      expect(screen.getByTestId('manage-actions')).toBeInTheDocument();
-      expect(await screen.findByRole('button', { name: 'Delete', hidden: true })).toBeDisabled();
-    });
-  });
-});
diff --git a/public/app/features/search/page/components/ManageActions.tsx b/public/app/features/search/page/components/ManageActions.tsx
deleted file mode 100644
index 2e68ac9b6cb1e..0000000000000
--- a/public/app/features/search/page/components/ManageActions.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import React, { useState } from 'react';
-
-import { Button, HorizontalGroup, IconButton, useStyles2 } from '@grafana/ui';
-import { contextSrv } from 'app/core/services/context_srv';
-import { FolderDTO } from 'app/types';
-
-import { GENERAL_FOLDER_UID } from '../../constants';
-import { OnMoveOrDeleleSelectedItems } from '../../types';
-
-import { getStyles } from './ActionRow';
-import { ConfirmDeleteModal } from './ConfirmDeleteModal';
-import { MoveToFolderModal } from './MoveToFolderModal';
-
-type Props = {
-  items: Map<string, Set<string>>;
-  folder?: FolderDTO; // when we are loading in folder page
-  onChange: OnMoveOrDeleleSelectedItems;
-  clearSelection: () => void;
-};
-
-export function ManageActions({ items, folder, onChange, clearSelection }: Props) {
-  const styles = useStyles2(getStyles);
-
-  const canSave = folder?.canSave;
-  const hasEditPermissionInFolders = folder ? canSave : contextSrv.hasEditPermissionInFolders;
-
-  const canMove = hasEditPermissionInFolders;
-
-  const selectedFolders = Array.from(items.get('folder') ?? []);
-  const includesGeneralFolder = selectedFolders.find((result) => result === GENERAL_FOLDER_UID);
-
-  const canDelete = hasEditPermissionInFolders && !includesGeneralFolder;
-  const [isMoveModalOpen, setIsMoveModalOpen] = useState(false);
-  const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
-
-  const onMove = () => {
-    setIsMoveModalOpen(true);
-  };
-
-  const onDelete = () => {
-    setIsDeleteModalOpen(true);
-  };
-
-  return (
-    <div className={styles.actionRow} data-testid="manage-actions">
-      <HorizontalGroup spacing="md" width="auto">
-        <IconButton name="check-square" onClick={clearSelection} tooltip="Uncheck everything" />
-        <Button disabled={!canMove} onClick={onMove} icon="exchange-alt" variant="secondary">
-          Move
-        </Button>
-        <Button disabled={!canDelete} onClick={onDelete} icon="trash-alt" variant="destructive">
-          Delete
-        </Button>
-      </HorizontalGroup>
-
-      {isDeleteModalOpen && (
-        <ConfirmDeleteModal onDeleteItems={onChange} results={items} onDismiss={() => setIsDeleteModalOpen(false)} />
-      )}
-
-      {isMoveModalOpen && (
-        <MoveToFolderModal onMoveItems={onChange} results={items} onDismiss={() => setIsMoveModalOpen(false)} />
-      )}
-    </div>
-  );
-}
diff --git a/public/app/features/search/page/components/MoveToFolderModal.test.tsx b/public/app/features/search/page/components/MoveToFolderModal.test.tsx
deleted file mode 100644
index 3da2968e8d2e2..0000000000000
--- a/public/app/features/search/page/components/MoveToFolderModal.test.tsx
+++ /dev/null
@@ -1,159 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import React from 'react';
-import { Provider } from 'react-redux';
-import configureMockStore from 'redux-mock-store';
-import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
-
-import { selectors } from '@grafana/e2e-selectors';
-import config from 'app/core/config';
-import * as api from 'app/features/manage-dashboards/state/actions';
-
-import { DashboardSearchHit, DashboardSearchItemType } from '../../types';
-
-import { MoveToFolderModal } from './MoveToFolderModal';
-
-function makeSelections(dashboardUIDs: string[] = [], folderUIDs: string[] = []) {
-  const dashboards = new Set(dashboardUIDs);
-  const folders = new Set(folderUIDs);
-
-  return new Map([
-    ['dashboard', dashboards],
-    ['folder', folders],
-  ]);
-}
-
-function makeDashboardSearchHit(title: string, uid: string, type = DashboardSearchItemType.DashDB): DashboardSearchHit {
-  return { title, uid, tags: [], type, url: `/d/${uid}` };
-}
-
-describe('MoveToFolderModal', () => {
-  jest
-    .spyOn(api, 'searchFolders')
-    .mockResolvedValue([
-      makeDashboardSearchHit('General', '', DashboardSearchItemType.DashFolder),
-      makeDashboardSearchHit('Folder 1', 'folder-uid-1', DashboardSearchItemType.DashFolder),
-      makeDashboardSearchHit('Folder 2', 'folder-uid-1', DashboardSearchItemType.DashFolder),
-      makeDashboardSearchHit('Folder 3', 'folder-uid-3', DashboardSearchItemType.DashFolder),
-    ]);
-
-  it('should render correct title, body, dismiss-, cancel- and move-text', async () => {
-    const items = makeSelections(['dash-uid-1', 'dash-uid-2']);
-
-    const mockStore = configureMockStore();
-    const store = mockStore({ dashboard: { panels: [] } });
-    const onMoveItems = jest.fn();
-
-    render(
-      <Provider store={store}>
-        <MoveToFolderModal onMoveItems={onMoveItems} results={items} onDismiss={() => {}} />
-      </Provider>
-    );
-
-    // Wait for folder picker to finish rendering
-    await screen.findByText('Choose');
-
-    expect(screen.getByRole('heading', { name: 'Choose Dashboard Folder' })).toBeInTheDocument();
-    expect(screen.getByText('Move 2 dashboards to:')).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: 'Move' })).toBeInTheDocument();
-  });
-
-  it('should move dashboards, but not folders', async () => {
-    const moveDashboardsMock = jest.spyOn(api, 'moveDashboards').mockResolvedValue({
-      successCount: 2,
-      totalCount: 2,
-      alreadyInFolderCount: 0,
-    });
-
-    const moveFoldersMock = jest.spyOn(api, 'moveFolders').mockResolvedValue({
-      successCount: 1,
-      totalCount: 1,
-    });
-
-    const items = makeSelections(['dash-uid-1', 'dash-uid-2'], ['folder-uid-1']);
-
-    const mockStore = configureMockStore();
-    const store = mockStore({ dashboard: { panels: [] } });
-    const onMoveItems = jest.fn();
-
-    render(
-      <Provider store={store}>
-        <MoveToFolderModal onMoveItems={onMoveItems} results={items} onDismiss={() => {}} />
-      </Provider>
-    );
-
-    // Wait for folder picker to finish rendering
-    await screen.findByText('Choose');
-
-    const folderPicker = screen.getByLabelText(selectors.components.FolderPicker.input);
-    await selectOptionInTest(folderPicker, 'Folder 3');
-
-    const moveButton = screen.getByText('Move');
-    await userEvent.click(moveButton);
-
-    expect(moveDashboardsMock).toHaveBeenCalledWith(['dash-uid-1', 'dash-uid-2'], {
-      title: 'Folder 3',
-      uid: 'folder-uid-3',
-    });
-
-    expect(moveFoldersMock).not.toHaveBeenCalled();
-  });
-
-  describe('with nestedFolders feature flag', () => {
-    let originalNestedFoldersValue = config.featureToggles.nestedFolders;
-
-    beforeAll(() => {
-      originalNestedFoldersValue = config.featureToggles.nestedFolders;
-      config.featureToggles.nestedFolders = true;
-    });
-
-    afterAll(() => {
-      config.featureToggles.nestedFolders = originalNestedFoldersValue;
-    });
-
-    it('should move folders and dashboards', async () => {
-      const moveDashboardsMock = jest.spyOn(api, 'moveDashboards').mockResolvedValue({
-        successCount: 2,
-        totalCount: 2,
-        alreadyInFolderCount: 0,
-      });
-
-      const moveFoldersMock = jest.spyOn(api, 'moveFolders').mockResolvedValue({
-        successCount: 1,
-        totalCount: 1,
-      });
-
-      const items = makeSelections(['dash-uid-1', 'dash-uid-2'], ['folder-uid-1']);
-
-      const mockStore = configureMockStore();
-      const store = mockStore({ dashboard: { panels: [] } });
-      const onMoveItems = jest.fn();
-
-      render(
-        <Provider store={store}>
-          <MoveToFolderModal onMoveItems={onMoveItems} results={items} onDismiss={() => {}} />
-        </Provider>
-      );
-
-      // Wait for folder picker to finish rendering
-      await screen.findByText('Choose');
-
-      const folderPicker = screen.getByLabelText(selectors.components.FolderPicker.input);
-      await selectOptionInTest(folderPicker, 'Folder 3');
-
-      const moveButton = screen.getByRole('button', { name: 'Move' });
-      await userEvent.click(moveButton);
-
-      expect(moveDashboardsMock).toHaveBeenCalledWith(['dash-uid-1', 'dash-uid-2'], {
-        title: 'Folder 3',
-        uid: 'folder-uid-3',
-      });
-
-      expect(moveFoldersMock).toHaveBeenCalledWith(['folder-uid-1'], {
-        title: 'Folder 3',
-        uid: 'folder-uid-3',
-      });
-    });
-  });
-});
diff --git a/public/app/features/search/page/components/MoveToFolderModal.tsx b/public/app/features/search/page/components/MoveToFolderModal.tsx
deleted file mode 100644
index e0451bf6e6ce7..0000000000000
--- a/public/app/features/search/page/components/MoveToFolderModal.tsx
+++ /dev/null
@@ -1,193 +0,0 @@
-import { css } from '@emotion/css';
-import React, { useCallback, useState } from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { Alert, Button, HorizontalGroup, Modal, useStyles2 } from '@grafana/ui';
-import { OldFolderPicker } from 'app/core/components/Select/OldFolderPicker';
-import config from 'app/core/config';
-import { useAppNotification } from 'app/core/copy/appNotification';
-import { moveDashboards, moveFolders } from 'app/features/manage-dashboards/state/actions';
-import { FolderInfo } from 'app/types';
-
-import { GENERAL_FOLDER_UID } from '../../constants';
-import { OnMoveOrDeleleSelectedItems } from '../../types';
-
-interface Props {
-  onMoveItems: OnMoveOrDeleleSelectedItems;
-  results: Map<string, Set<string>>;
-  onDismiss: () => void;
-}
-
-export const MoveToFolderModal = ({ results, onMoveItems, onDismiss }: Props) => {
-  const [folder, setFolder] = useState<FolderInfo | null>(null);
-  const styles = useStyles2(getStyles);
-  const notifyApp = useAppNotification();
-  const [moving, setMoving] = useState(false);
-
-  const nestedFoldersEnabled = config.featureToggles.nestedFolders;
-
-  const selectedDashboards = Array.from(results.get('dashboard') ?? []);
-  const selectedFolders = nestedFoldersEnabled
-    ? Array.from(results.get('folder') ?? []).filter((v) => v !== GENERAL_FOLDER_UID)
-    : [];
-
-  const handleFolderChange = useCallback(
-    (newFolder: FolderInfo) => {
-      setFolder(newFolder);
-    },
-    [setFolder]
-  );
-
-  const moveTo = async () => {
-    if (!folder) {
-      return;
-    }
-
-    if (nestedFoldersEnabled) {
-      setMoving(true);
-      let totalCount = 0;
-      let successCount = 0;
-
-      if (selectedDashboards.length) {
-        const moveDashboardsResult = await moveDashboards(selectedDashboards, folder);
-
-        totalCount += moveDashboardsResult.totalCount;
-        successCount += moveDashboardsResult.successCount;
-      }
-
-      if (selectedFolders.length) {
-        const moveFoldersResult = await moveFolders(selectedFolders, folder);
-
-        totalCount += moveFoldersResult.totalCount;
-        successCount += moveFoldersResult.successCount;
-      }
-
-      const destTitle = folder.title ?? 'General';
-      notifyNestedMoveResult(notifyApp, destTitle, {
-        selectedDashboardsCount: selectedDashboards.length,
-        selectedFoldersCount: selectedFolders.length,
-        totalCount,
-        successCount,
-      });
-
-      onMoveItems();
-      setMoving(false);
-      onDismiss();
-
-      return;
-    }
-
-    if (selectedDashboards.length) {
-      const folderTitle = folder.title ?? 'General';
-      setMoving(true);
-      moveDashboards(selectedDashboards, folder).then((result) => {
-        if (result.successCount > 0) {
-          const ending = result.successCount === 1 ? '' : 's';
-          const header = `Dashboard${ending} Moved`;
-          const msg = `${result.successCount} dashboard${ending} moved to ${folderTitle}`;
-          notifyApp.success(header, msg);
-        }
-
-        if (result.totalCount === result.alreadyInFolderCount) {
-          notifyApp.error('Error', `Dashboard already belongs to folder ${folderTitle}`);
-        } else {
-          //update the list
-          onMoveItems();
-        }
-
-        setMoving(false);
-        onDismiss();
-      });
-    }
-  };
-
-  const thingsMoving = [
-    ['folder', 'folders', selectedFolders.length] as const,
-    ['dashboard', 'dashboards', selectedDashboards.length] as const,
-  ]
-    .filter(([single, plural, count]) => count > 0)
-    .map(([single, plural, count]) => `${count.toLocaleString()} ${count === 1 ? single : plural}`)
-    .join(' and ');
-
-  return (
-    <Modal
-      isOpen
-      className={styles.modal}
-      title={nestedFoldersEnabled ? 'Move' : 'Choose Dashboard Folder'}
-      icon="folder-plus"
-      onDismiss={onDismiss}
-    >
-      <>
-        <div className={styles.content}>
-          {nestedFoldersEnabled && selectedFolders.length > 0 && (
-            <Alert severity="warning" title=" Moving this item may change its permissions" />
-          )}
-
-          <p>Move {thingsMoving} to:</p>
-
-          <OldFolderPicker allowEmpty={true} enableCreateNew={false} onChange={handleFolderChange} />
-        </div>
-
-        <HorizontalGroup justify="flex-end">
-          <Button variant="secondary" onClick={onDismiss} fill="outline">
-            Cancel
-          </Button>
-          <Button icon={moving ? 'spinner' : undefined} variant="primary" onClick={moveTo}>
-            Move
-          </Button>
-        </HorizontalGroup>
-      </>
-    </Modal>
-  );
-};
-
-interface NotifyCounts {
-  selectedDashboardsCount: number;
-  selectedFoldersCount: number;
-  totalCount: number;
-  successCount: number;
-}
-
-function notifyNestedMoveResult(
-  notifyApp: ReturnType<typeof useAppNotification>,
-  destinationName: string,
-  { selectedDashboardsCount, selectedFoldersCount, totalCount, successCount }: NotifyCounts
-) {
-  let objectMoving: string | undefined;
-  const plural = successCount === 1 ? '' : 's';
-  const failedCount = totalCount - successCount;
-
-  if (selectedDashboardsCount && selectedFoldersCount) {
-    objectMoving = `Item${plural}`;
-  } else if (selectedDashboardsCount) {
-    objectMoving = `Dashboard${plural}`;
-  } else if (selectedFoldersCount) {
-    objectMoving = `Folder${plural}`;
-  }
-
-  if (objectMoving) {
-    const objectLower = objectMoving?.toLocaleLowerCase();
-
-    if (totalCount === successCount) {
-      notifyApp.success(`${objectMoving} moved`, `Moved ${successCount} ${objectLower} to ${destinationName}`);
-    } else if (successCount === 0) {
-      notifyApp.error(`Failed to move ${objectLower}`, `Could not move ${totalCount} ${objectLower} due to an error`);
-    } else {
-      notifyApp.warning(
-        `Partially moved ${objectLower}`,
-        `Failed to move ${failedCount} ${objectLower} to ${destinationName}`
-      );
-    }
-  }
-}
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    modal: css`
-      width: 500px;
-    `,
-    content: css`
-      margin-bottom: ${theme.spacing(3)};
-    `,
-  };
-};
diff --git a/public/app/features/search/page/components/RootFolderView.test.tsx b/public/app/features/search/page/components/RootFolderView.test.tsx
deleted file mode 100644
index d49324a7bc18c..0000000000000
--- a/public/app/features/search/page/components/RootFolderView.test.tsx
+++ /dev/null
@@ -1,204 +0,0 @@
-import { render, screen, act } from '@testing-library/react';
-import React from 'react';
-
-import { DataFrame, DataFrameView, FieldType } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
-
-import { ContextSrv, setContextSrv } from '../../../../core/services/context_srv';
-import impressionSrv from '../../../../core/services/impression_srv';
-import { DashboardQueryResult, getGrafanaSearcher, QueryResponse } from '../../service';
-import { DashboardSearchItemType } from '../../types';
-
-import { RootFolderView } from './RootFolderView';
-
-jest.mock('@grafana/runtime', () => ({
-  ...jest.requireActual('@grafana/runtime'),
-  getBackendSrv: () => ({
-    get: jest.fn().mockResolvedValue(['foo']),
-  }),
-}));
-
-describe('RootFolderView', () => {
-  let grafanaSearcherSpy: jest.SpyInstance;
-  const mockOnTagSelected = jest.fn();
-  const mockSelectionToggle = jest.fn();
-  const mockSelection = jest.fn();
-
-  const folderData: DataFrame = {
-    fields: [
-      {
-        name: 'kind',
-        type: FieldType.string,
-        config: {},
-        values: [DashboardSearchItemType.DashFolder],
-      },
-      { name: 'name', type: FieldType.string, config: {}, values: ['My folder 1'] },
-      { name: 'uid', type: FieldType.string, config: {}, values: ['my-folder-1'] },
-      { name: 'url', type: FieldType.string, config: {}, values: ['/my-folder-1'] },
-    ],
-    length: 1,
-  };
-
-  const mockSearchResult: QueryResponse = {
-    isItemLoaded: jest.fn(),
-    loadMoreItems: jest.fn(),
-    totalRows: folderData.length,
-    view: new DataFrameView<DashboardQueryResult>(folderData),
-  };
-
-  let contextSrv: ContextSrv;
-
-  beforeAll(() => {
-    contextSrv = new ContextSrv();
-    setContextSrv(contextSrv);
-    grafanaSearcherSpy = jest.spyOn(getGrafanaSearcher(), 'search').mockResolvedValue(mockSearchResult);
-  });
-
-  // need to make sure we clear localStorage
-  // otherwise tests can interfere with each other and the starting expanded state of the component
-  afterEach(() => {
-    window.localStorage.clear();
-  });
-
-  it('shows a spinner whilst the results are loading', async () => {
-    // mock the query promise so we can resolve manually
-    let promiseResolver: (arg0: QueryResponse) => void;
-    const promise = new Promise((resolve) => {
-      promiseResolver = resolve;
-    });
-    grafanaSearcherSpy.mockImplementationOnce(() => promise);
-
-    render(
-      <RootFolderView
-        onTagSelected={mockOnTagSelected}
-        selection={mockSelection}
-        selectionToggle={mockSelectionToggle}
-      />
-    );
-    expect(await screen.findByTestId('Spinner')).toBeInTheDocument();
-
-    // resolve the promise
-    await act(async () => {
-      promiseResolver(mockSearchResult);
-    });
-
-    expect(screen.queryByTestId('Spinner')).not.toBeInTheDocument();
-  });
-
-  it('does not show the starred items if not signed in', async () => {
-    contextSrv.isSignedIn = false;
-    render(
-      <RootFolderView
-        onTagSelected={mockOnTagSelected}
-        selection={mockSelection}
-        selectionToggle={mockSelectionToggle}
-      />
-    );
-    expect((await screen.findAllByTestId(selectors.components.Search.sectionV2))[0]).toBeInTheDocument();
-    expect(screen.queryByRole('button', { name: 'Starred' })).not.toBeInTheDocument();
-  });
-
-  it('shows the starred items if signed in', async () => {
-    contextSrv.isSignedIn = true;
-    render(
-      <RootFolderView
-        onTagSelected={mockOnTagSelected}
-        selection={mockSelection}
-        selectionToggle={mockSelectionToggle}
-      />
-    );
-    expect(await screen.findByRole('button', { name: 'Starred' })).toBeInTheDocument();
-  });
-
-  it('does not show the recent items if no dashboards have been opened recently', async () => {
-    jest.spyOn(impressionSrv, 'getDashboardOpened').mockResolvedValue([]);
-    render(
-      <RootFolderView
-        onTagSelected={mockOnTagSelected}
-        selection={mockSelection}
-        selectionToggle={mockSelectionToggle}
-      />
-    );
-    expect((await screen.findAllByTestId(selectors.components.Search.sectionV2))[0]).toBeInTheDocument();
-    expect(screen.queryByRole('button', { name: 'Recent' })).not.toBeInTheDocument();
-  });
-
-  it('shows the recent items if any dashboards have recently been opened', async () => {
-    jest.spyOn(impressionSrv, 'getDashboardOpened').mockResolvedValue(['7MeksYbmk']);
-    render(
-      <RootFolderView
-        onTagSelected={mockOnTagSelected}
-        selection={mockSelection}
-        selectionToggle={mockSelectionToggle}
-      />
-    );
-    expect(await screen.findByRole('button', { name: 'Recent' })).toBeInTheDocument();
-  });
-
-  it('shows the general folder by default', async () => {
-    render(
-      <RootFolderView
-        onTagSelected={mockOnTagSelected}
-        selection={mockSelection}
-        selectionToggle={mockSelectionToggle}
-      />
-    );
-    expect(await screen.findByRole('button', { name: 'General' })).toBeInTheDocument();
-  });
-
-  describe('when hidePseudoFolders is set', () => {
-    it('does not show the starred items even if signed in', async () => {
-      contextSrv.isSignedIn = true;
-      render(
-        <RootFolderView
-          hidePseudoFolders
-          onTagSelected={mockOnTagSelected}
-          selection={mockSelection}
-          selectionToggle={mockSelectionToggle}
-        />
-      );
-      expect(await screen.findByRole('button', { name: 'General' })).toBeInTheDocument();
-      expect(screen.queryByRole('button', { name: 'Starred' })).not.toBeInTheDocument();
-    });
-
-    it('does not show the recent items even if recent dashboards have been opened', async () => {
-      jest.spyOn(impressionSrv, 'getDashboardOpened').mockResolvedValue(['7MeksYbmk']);
-      render(
-        <RootFolderView
-          hidePseudoFolders
-          onTagSelected={mockOnTagSelected}
-          selection={mockSelection}
-          selectionToggle={mockSelectionToggle}
-        />
-      );
-      expect(await screen.findByRole('button', { name: 'General' })).toBeInTheDocument();
-      expect(screen.queryByRole('button', { name: 'Recent' })).not.toBeInTheDocument();
-    });
-  });
-
-  it('shows an error state if any of the calls reject for a specific reason', async () => {
-    // reject with a specific Error object
-    grafanaSearcherSpy.mockRejectedValueOnce(new Error('Uh oh spagghettios!'));
-    render(
-      <RootFolderView
-        onTagSelected={mockOnTagSelected}
-        selection={mockSelection}
-        selectionToggle={mockSelectionToggle}
-      />
-    );
-    expect(await screen.findByRole('alert', { name: 'Uh oh spagghettios!' })).toBeInTheDocument();
-  });
-
-  it('shows a general error state if any of the calls reject', async () => {
-    // reject with nothing
-    grafanaSearcherSpy.mockRejectedValueOnce(null);
-    render(
-      <RootFolderView
-        onTagSelected={mockOnTagSelected}
-        selection={mockSelection}
-        selectionToggle={mockSelectionToggle}
-      />
-    );
-    expect(await screen.findByRole('alert', { name: 'Something went wrong' })).toBeInTheDocument();
-  });
-});
diff --git a/public/app/features/search/page/components/RootFolderView.tsx b/public/app/features/search/page/components/RootFolderView.tsx
deleted file mode 100644
index 1a311e0ac6812..0000000000000
--- a/public/app/features/search/page/components/RootFolderView.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-import { css } from '@emotion/css';
-import React from 'react';
-import { useAsync } from 'react-use';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
-import { getBackendSrv } from '@grafana/runtime';
-import { Alert, Spinner, useStyles2 } from '@grafana/ui';
-import config from 'app/core/config';
-
-import { contextSrv } from '../../../../core/services/context_srv';
-import impressionSrv from '../../../../core/services/impression_srv';
-import { GENERAL_FOLDER_UID } from '../../constants';
-import { getGrafanaSearcher } from '../../service';
-import { getFolderChildren } from '../../service/folders';
-import { queryResultToViewItem } from '../../service/utils';
-
-import { FolderSection } from './FolderSection';
-import { SearchResultsProps } from './SearchResultsTable';
-
-async function getChildren() {
-  if (config.featureToggles.nestedFolders) {
-    return getFolderChildren();
-  }
-
-  const searcher = getGrafanaSearcher();
-  const results = await searcher.search({
-    query: '*',
-    kind: ['folder'],
-    sort: searcher.getFolderViewSort(),
-    limit: 1000,
-  });
-
-  return results.view.map((v) => queryResultToViewItem(v, results.view));
-}
-
-type Props = Pick<SearchResultsProps, 'selection' | 'selectionToggle' | 'onTagSelected' | 'onClickItem'> & {
-  tags?: string[];
-  hidePseudoFolders?: boolean;
-};
-export const RootFolderView = ({
-  selection,
-  selectionToggle,
-  onTagSelected,
-  tags,
-  hidePseudoFolders,
-  onClickItem,
-}: Props) => {
-  const styles = useStyles2(getStyles);
-
-  const results = useAsync(async () => {
-    const folders = await getChildren();
-
-    folders.unshift({ title: 'General', url: '/dashboards', kind: 'folder', uid: GENERAL_FOLDER_UID });
-
-    if (!hidePseudoFolders) {
-      const itemsUIDs = await impressionSrv.getDashboardOpened();
-      if (itemsUIDs.length) {
-        folders.unshift({ title: 'Recent', icon: 'clock-nine', kind: 'folder', uid: '__recent', itemsUIDs });
-      }
-
-      if (contextSrv.isSignedIn) {
-        const stars = await getBackendSrv().get('api/user/stars');
-        if (stars.length > 0) {
-          folders.unshift({ title: 'Starred', icon: 'star', kind: 'folder', uid: '__starred', itemsUIDs: stars });
-        }
-      }
-    }
-
-    return folders;
-  }, []);
-
-  const renderResults = () => {
-    if (results.loading) {
-      return <Spinner className={styles.spinner} />;
-    } else if (!results.value) {
-      return <Alert className={styles.error} title={results.error ? results.error.message : 'Something went wrong'} />;
-    } else {
-      return results.value.map((section) => (
-        <div data-testid={selectors.components.Search.sectionV2} className={styles.section} key={section.title}>
-          {section.title && (
-            <FolderSection
-              selection={selection}
-              selectionToggle={selectionToggle}
-              onTagSelected={onTagSelected}
-              section={section}
-              tags={tags}
-              onClickItem={onClickItem}
-            />
-          )}
-        </div>
-      ));
-    }
-  };
-
-  return <div className={styles.wrapper}>{renderResults()}</div>;
-};
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    wrapper: css`
-      display: flex;
-      flex-direction: column;
-      overflow: auto;
-
-      > ul {
-        list-style: none;
-      }
-
-      border: solid 1px ${theme.v1.colors.border2};
-    `,
-    section: css`
-      display: flex;
-      flex-direction: column;
-      background: ${theme.v1.colors.panelBg};
-
-      &:not(:last-child) {
-        border-bottom: solid 1px ${theme.v1.colors.border2};
-      }
-    `,
-    spinner: css`
-      align-items: center;
-      display: flex;
-      justify-content: center;
-      min-height: 100px;
-    `,
-    error: css`
-      margin: ${theme.spacing(4)} auto;
-    `,
-  };
-};
diff --git a/public/app/features/search/page/components/SearchResultsCards.test.tsx b/public/app/features/search/page/components/SearchResultsCards.test.tsx
deleted file mode 100644
index 941a80354641f..0000000000000
--- a/public/app/features/search/page/components/SearchResultsCards.test.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import React from 'react';
-import { Subject } from 'rxjs';
-
-import { DataFrame, DataFrameView, FieldType } from '@grafana/data';
-
-import { DashboardQueryResult, getGrafanaSearcher, QueryResponse } from '../../service';
-import { DashboardSearchItemType } from '../../types';
-
-import { SearchResultsCards } from './SearchResultsCards';
-
-describe('SearchResultsCards', () => {
-  const mockOnTagSelected = jest.fn();
-  const mockClearSelection = jest.fn();
-  const mockSelectionToggle = jest.fn();
-  const mockSelection = jest.fn();
-  const mockKeyboardEvents = new Subject<React.KeyboardEvent>();
-
-  describe('when there is data', () => {
-    const searchData: DataFrame = {
-      fields: [
-        { name: 'kind', type: FieldType.string, config: {}, values: [DashboardSearchItemType.DashDB] },
-        { name: 'uid', type: FieldType.string, config: {}, values: ['my-dashboard-1'] },
-        { name: 'name', type: FieldType.string, config: {}, values: ['My dashboard 1'] },
-        { name: 'panel_type', type: FieldType.string, config: {}, values: [''] },
-        { name: 'url', type: FieldType.string, config: {}, values: ['/my-dashboard-1'] },
-        { name: 'tags', type: FieldType.other, config: {}, values: [['foo', 'bar']] },
-        { name: 'ds_uid', type: FieldType.other, config: {}, values: [''] },
-        { name: 'location', type: FieldType.string, config: {}, values: ['folder0/my-dashboard-1'] },
-      ],
-      meta: {
-        custom: {
-          locationInfo: {
-            folder0: { name: 'Folder 0', uid: 'f0' },
-          },
-        },
-      },
-      length: 1,
-    };
-
-    const mockSearchResult: QueryResponse = {
-      isItemLoaded: () => true,
-      loadMoreItems: () => Promise.resolve(),
-      totalRows: searchData.length,
-      view: new DataFrameView<DashboardQueryResult>(searchData),
-    };
-
-    beforeAll(() => {
-      jest.spyOn(getGrafanaSearcher(), 'search').mockResolvedValue(mockSearchResult);
-    });
-
-    it('shows the list with the correct accessible label', () => {
-      render(
-        <SearchResultsCards
-          keyboardEvents={mockKeyboardEvents}
-          response={mockSearchResult}
-          onTagSelected={mockOnTagSelected}
-          selection={mockSelection}
-          selectionToggle={mockSelectionToggle}
-          clearSelection={mockClearSelection}
-          height={1000}
-          width={1000}
-        />
-      );
-      expect(screen.getByRole('list', { name: 'Search results list' })).toBeInTheDocument();
-    });
-
-    it('displays the data correctly in the table', () => {
-      render(
-        <SearchResultsCards
-          keyboardEvents={mockKeyboardEvents}
-          response={mockSearchResult}
-          onTagSelected={mockOnTagSelected}
-          selection={mockSelection}
-          selectionToggle={mockSelectionToggle}
-          clearSelection={mockClearSelection}
-          height={1000}
-          width={1000}
-        />
-      );
-
-      const rows = screen.getAllByRole('row');
-      expect(rows).toHaveLength(searchData.length);
-      expect(screen.getByText('My dashboard 1')).toBeInTheDocument();
-      expect(screen.getByText('foo')).toBeInTheDocument();
-      expect(screen.getByText('bar')).toBeInTheDocument();
-    });
-  });
-
-  describe('when there is no data', () => {
-    const emptySearchData: DataFrame = {
-      fields: [
-        { name: 'kind', type: FieldType.string, config: {}, values: [] },
-        { name: 'name', type: FieldType.string, config: {}, values: [] },
-        { name: 'uid', type: FieldType.string, config: {}, values: [] },
-        { name: 'url', type: FieldType.string, config: {}, values: [] },
-        { name: 'tags', type: FieldType.other, config: {}, values: [] },
-        { name: 'location', type: FieldType.string, config: {}, values: [] },
-      ],
-      length: 0,
-    };
-
-    const mockEmptySearchResult: QueryResponse = {
-      isItemLoaded: jest.fn(),
-      loadMoreItems: jest.fn(),
-      totalRows: emptySearchData.length,
-      view: new DataFrameView<DashboardQueryResult>(emptySearchData),
-    };
-
-    beforeAll(() => {
-      jest.spyOn(getGrafanaSearcher(), 'search').mockResolvedValue(mockEmptySearchResult);
-    });
-
-    it('shows a "No data" message', () => {
-      render(
-        <SearchResultsCards
-          keyboardEvents={mockKeyboardEvents}
-          response={mockEmptySearchResult}
-          onTagSelected={mockOnTagSelected}
-          selection={mockSelection}
-          selectionToggle={mockSelectionToggle}
-          clearSelection={mockClearSelection}
-          height={1000}
-          width={1000}
-        />
-      );
-      expect(screen.queryByRole('list', { name: 'Search results list' })).not.toBeInTheDocument();
-      expect(screen.getByText('No data')).toBeInTheDocument();
-    });
-  });
-});
diff --git a/public/app/features/search/page/components/SearchResultsCards.tsx b/public/app/features/search/page/components/SearchResultsCards.tsx
deleted file mode 100644
index 0bd0c5090018a..0000000000000
--- a/public/app/features/search/page/components/SearchResultsCards.tsx
+++ /dev/null
@@ -1,125 +0,0 @@
-/* eslint-disable react/jsx-no-undef */
-import { css } from '@emotion/css';
-import React, { useEffect, useRef, useCallback, useState, CSSProperties } from 'react';
-import { FixedSizeList } from 'react-window';
-import InfiniteLoader from 'react-window-infinite-loader';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { useStyles2 } from '@grafana/ui';
-
-import { SearchItem } from '../../components/SearchItem';
-import { useSearchKeyboardNavigation } from '../../hooks/useSearchKeyboardSelection';
-import { queryResultToViewItem } from '../../service/utils';
-
-import { SearchResultsProps } from './SearchResultsTable';
-
-export const SearchResultsCards = React.memo(
-  ({
-    response,
-    width,
-    height,
-    selection,
-    selectionToggle,
-    onTagSelected,
-    keyboardEvents,
-    onClickItem,
-  }: SearchResultsProps) => {
-    const styles = useStyles2(getStyles);
-    const infiniteLoaderRef = useRef<InfiniteLoader>(null);
-    const [listEl, setListEl] = useState<FixedSizeList | null>(null);
-    const highlightIndex = useSearchKeyboardNavigation(keyboardEvents, 0, response);
-
-    // Scroll to the top and clear loader cache when the query results change
-    useEffect(() => {
-      if (infiniteLoaderRef.current) {
-        infiniteLoaderRef.current.resetloadMoreItemsCache();
-      }
-      if (listEl) {
-        listEl.scrollTo(0);
-      }
-    }, [response, listEl]);
-
-    const RenderRow = useCallback(
-      ({ index: rowIndex, style }: { index: number; style: CSSProperties }) => {
-        let className = '';
-        if (rowIndex === highlightIndex.y) {
-          className += ' ' + styles.selectedRow;
-        }
-
-        const item = response.view.get(rowIndex);
-        const searchItem = queryResultToViewItem(item, response.view);
-        const isSelected = selectionToggle && selection?.(searchItem.kind, searchItem.uid);
-
-        return (
-          <div style={style} key={item.uid} className={className} role="row">
-            <SearchItem
-              item={searchItem}
-              onTagSelected={onTagSelected}
-              onToggleChecked={(item) => {
-                if (selectionToggle) {
-                  selectionToggle('dashboard', item.uid!);
-                }
-              }}
-              editable={Boolean(selection != null)}
-              onClickItem={onClickItem}
-              isSelected={isSelected}
-            />
-          </div>
-        );
-      },
-      [response.view, highlightIndex, styles, onTagSelected, selection, selectionToggle, onClickItem]
-    );
-
-    if (!response.totalRows) {
-      return (
-        <div className={styles.noData} style={{ width }}>
-          No data
-        </div>
-      );
-    }
-
-    return (
-      <div aria-label="Search results list" style={{ width }} role="list">
-        <InfiniteLoader
-          ref={infiniteLoaderRef}
-          isItemLoaded={response.isItemLoaded}
-          itemCount={response.totalRows}
-          loadMoreItems={response.loadMoreItems}
-        >
-          {({ onItemsRendered, ref }) => (
-            <FixedSizeList
-              ref={(innerRef) => {
-                ref(innerRef);
-                setListEl(innerRef);
-              }}
-              onItemsRendered={onItemsRendered}
-              height={height}
-              itemCount={response.totalRows}
-              itemSize={72}
-              width="100%"
-              style={{ overflow: 'hidden auto' }}
-            >
-              {RenderRow}
-            </FixedSizeList>
-          )}
-        </InfiniteLoader>
-      </div>
-    );
-  }
-);
-SearchResultsCards.displayName = 'SearchResultsCards';
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    noData: css`
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: center;
-      height: 100%;
-    `,
-    selectedRow: css`
-      border-left: 3px solid ${theme.colors.primary.border};
-    `,
-  };
-};
diff --git a/public/app/features/search/page/components/SearchView.test.tsx b/public/app/features/search/page/components/SearchView.test.tsx
deleted file mode 100644
index e2808e1a62d16..0000000000000
--- a/public/app/features/search/page/components/SearchView.test.tsx
+++ /dev/null
@@ -1,170 +0,0 @@
-import { render, screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import React from 'react';
-import { Provider } from 'react-redux';
-import configureMockStore from 'redux-mock-store';
-import { Observable } from 'rxjs';
-
-import { DataFrame, DataFrameView, FieldType } from '@grafana/data';
-import { config } from '@grafana/runtime';
-
-import { DashboardQueryResult, getGrafanaSearcher, QueryResponse } from '../../service';
-import { getSearchStateManager, initialState } from '../../state/SearchStateManager';
-import { DashboardSearchItemType, SearchLayout, SearchState } from '../../types';
-
-import { SearchView, SearchViewProps } from './SearchView';
-
-jest.mock('@grafana/runtime', () => {
-  const originalModule = jest.requireActual('@grafana/runtime');
-  return {
-    ...originalModule,
-    reportInteraction: jest.fn(),
-  };
-});
-
-const stateManager = getSearchStateManager();
-
-const setup = (propOverrides?: Partial<SearchViewProps>, stateOverrides?: Partial<SearchState>) => {
-  const props: SearchViewProps = {
-    showManage: false,
-    keyboardEvents: {} as Observable<React.KeyboardEvent>,
-    ...propOverrides,
-  };
-
-  stateManager.setState({ ...initialState, ...stateOverrides });
-
-  const mockStore = configureMockStore();
-  const store = mockStore({ searchQuery: { ...initialState } });
-
-  render(
-    <Provider store={store}>
-      <SearchView {...props} />
-    </Provider>
-  );
-};
-
-describe('SearchView', () => {
-  const folderData: DataFrame = {
-    fields: [
-      {
-        name: 'kind',
-        type: FieldType.string,
-        config: {},
-        values: [DashboardSearchItemType.DashFolder],
-      },
-      { name: 'name', type: FieldType.string, config: {}, values: ['My folder 1'] },
-      { name: 'uid', type: FieldType.string, config: {}, values: ['my-folder-1'] },
-      { name: 'url', type: FieldType.string, config: {}, values: ['/my-folder-1'] },
-    ],
-    length: 1,
-  };
-
-  const mockSearchResult: QueryResponse = {
-    isItemLoaded: jest.fn(),
-    loadMoreItems: jest.fn(),
-    totalRows: folderData.length,
-    view: new DataFrameView<DashboardQueryResult>(folderData),
-  };
-
-  beforeAll(() => {
-    jest.spyOn(getGrafanaSearcher(), 'search').mockResolvedValue(mockSearchResult);
-  });
-
-  beforeEach(() => {
-    config.featureToggles.panelTitleSearch = false;
-  });
-
-  it('does not show checkboxes or manage actions if showManage is false', async () => {
-    setup();
-    await waitFor(() => expect(screen.queryAllByRole('checkbox')).toHaveLength(0));
-    expect(screen.queryByTestId('manage-actions')).not.toBeInTheDocument();
-  });
-
-  it('shows checkboxes if showManage is true', async () => {
-    setup({ showManage: true });
-    await waitFor(() => expect(screen.queryAllByRole('checkbox')).toHaveLength(2));
-  });
-
-  it('shows the manage actions if show manage is true and the user clicked a checkbox', async () => {
-    setup({ showManage: true });
-    await waitFor(() => userEvent.click(screen.getAllByRole('checkbox')[0]));
-
-    expect(screen.queryByTestId('manage-actions')).toBeInTheDocument();
-  });
-
-  it('shows an empty state if no data returned', async () => {
-    jest.spyOn(getGrafanaSearcher(), 'search').mockResolvedValue({
-      ...mockSearchResult,
-      totalRows: 0,
-      view: new DataFrameView<DashboardQueryResult>({ fields: [], length: 0 }),
-    });
-
-    setup(undefined, { query: 'asdfasdfasdf' });
-
-    await waitFor(() => expect(screen.queryByText('No results found for your query.')).toBeInTheDocument());
-    expect(screen.getByRole('button', { name: 'Clear search and filters' })).toBeInTheDocument();
-  });
-
-  it('shows an empty state if no starred dashboard returned', async () => {
-    jest.spyOn(getGrafanaSearcher(), 'search').mockResolvedValue({
-      ...mockSearchResult,
-      totalRows: 0,
-      view: new DataFrameView<DashboardQueryResult>({ fields: [], length: 0 }),
-    });
-
-    setup(undefined, { starred: true });
-
-    await waitFor(() => expect(screen.queryByText('No results found for your query.')).toBeInTheDocument());
-    expect(screen.getByRole('button', { name: 'Clear search and filters' })).toBeInTheDocument();
-  });
-
-  it('shows empty folder cta for empty folder', async () => {
-    jest.spyOn(getGrafanaSearcher(), 'search').mockResolvedValue({
-      ...mockSearchResult,
-      totalRows: 0,
-      view: new DataFrameView<DashboardQueryResult>({ fields: [], length: 0 }),
-    });
-
-    setup(
-      {
-        folderDTO: {
-          id: 1,
-          uid: 'abc',
-          title: 'morning coffee',
-          url: '/morningcoffee',
-          version: 1,
-          canSave: true,
-          canEdit: true,
-          canAdmin: true,
-          canDelete: true,
-          created: '',
-          createdBy: '',
-          hasAcl: false,
-          updated: '',
-          updatedBy: '',
-        },
-      },
-      undefined
-    );
-
-    await waitFor(() => expect(screen.queryByText("This folder doesn't have any dashboards yet")).toBeInTheDocument());
-  });
-
-  describe('include panels', () => {
-    it('should be enabled when layout is list', async () => {
-      config.featureToggles.panelTitleSearch = true;
-      setup({}, { layout: SearchLayout.List });
-
-      await waitFor(() => expect(screen.getByLabelText(/include panels/i)).toBeInTheDocument());
-      expect(screen.getByTestId('include-panels')).toBeEnabled();
-    });
-
-    it('should be disabled when layout is folder', async () => {
-      config.featureToggles.panelTitleSearch = true;
-      setup({}, { layout: SearchLayout.Folders });
-
-      await waitFor(() => expect(screen.getByLabelText(/include panels/i)).toBeInTheDocument());
-      expect(screen.getByTestId('include-panels')).toBeDisabled();
-    });
-  });
-});
diff --git a/public/app/features/search/page/components/SearchView.tsx b/public/app/features/search/page/components/SearchView.tsx
deleted file mode 100644
index bc89febeb22c3..0000000000000
--- a/public/app/features/search/page/components/SearchView.tsx
+++ /dev/null
@@ -1,221 +0,0 @@
-import { css } from '@emotion/css';
-import React, { useCallback, useState } from 'react';
-import { useDebounce } from 'react-use';
-import AutoSizer from 'react-virtualized-auto-sizer';
-import { Observable } from 'rxjs';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { useStyles2, Spinner, Button } from '@grafana/ui';
-import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
-import { Trans } from 'app/core/internationalization';
-import { newBrowseDashboardsEnabled } from 'app/features/browse-dashboards/featureFlag';
-import { FolderDTO } from 'app/types';
-
-import { getGrafanaSearcher } from '../../service';
-import { getSearchStateManager } from '../../state/SearchStateManager';
-import { SearchLayout, DashboardViewItem } from '../../types';
-import { newSearchSelection, updateSearchSelection } from '../selection';
-
-import { ActionRow, getValidQueryLayout } from './ActionRow';
-import { FolderSection } from './FolderSection';
-import { ManageActions } from './ManageActions';
-import { RootFolderView } from './RootFolderView';
-import { SearchResultsCards } from './SearchResultsCards';
-import { SearchResultsTable, SearchResultsProps } from './SearchResultsTable';
-
-export type SearchViewProps = {
-  showManage: boolean;
-  folderDTO?: FolderDTO;
-  hidePseudoFolders?: boolean; // Recent + starred
-  keyboardEvents: Observable<React.KeyboardEvent>;
-};
-
-export const SearchView = ({ showManage, folderDTO, hidePseudoFolders, keyboardEvents }: SearchViewProps) => {
-  const styles = useStyles2(getStyles);
-  const stateManager = getSearchStateManager(); // State is initialized from URL by parent component
-  const state = stateManager.useState();
-
-  const [searchSelection, setSearchSelection] = useState(newSearchSelection());
-  const layout = getValidQueryLayout(state);
-  const isFolders = layout === SearchLayout.Folders;
-
-  const [listKey, setListKey] = useState(Date.now());
-
-  // Search usage reporting
-  useDebounce(stateManager.onReportSearchUsage, 1000, []);
-
-  const clearSelection = useCallback(() => {
-    searchSelection.items.clear();
-    setSearchSelection({ ...searchSelection });
-  }, [searchSelection]);
-
-  const toggleSelection = useCallback(
-    (kind: string, uid: string) => {
-      const current = searchSelection.isSelected(kind, uid);
-      setSearchSelection(updateSearchSelection(searchSelection, !current, kind, [uid]));
-    },
-    [searchSelection]
-  );
-
-  // function to update items when dashboards or folders are moved or deleted
-  const onChangeItemsList = async () => {
-    // clean up search selection
-    clearSelection();
-    setListKey(Date.now());
-    // trigger again the search to the backend
-    stateManager.onQueryChange(state.query);
-  };
-
-  const renderResults = () => {
-    const value = state.result;
-
-    if ((!value || !value.totalRows) && !isFolders) {
-      if (state.loading && !value) {
-        return <Spinner />;
-      }
-
-      return (
-        <div className={styles.noResults}>
-          <div>
-            <Trans i18nKey="search-view.no-results.text">No results found for your query.</Trans>
-          </div>
-          <br />
-          <Button variant="secondary" onClick={stateManager.onClearSearchAndFilters}>
-            <Trans i18nKey="search-view.no-results.clear">Clear search and filters</Trans>
-          </Button>
-        </div>
-      );
-    }
-
-    const selection = showManage ? searchSelection.isSelected : undefined;
-
-    if (layout === SearchLayout.Folders) {
-      if (folderDTO) {
-        return (
-          <FolderSection
-            section={sectionForFolderView(folderDTO)}
-            selection={selection}
-            selectionToggle={toggleSelection}
-            onTagSelected={stateManager.onAddTag}
-            renderStandaloneBody={true}
-            tags={state.tag}
-            key={listKey}
-            onClickItem={stateManager.onSearchItemClicked}
-          />
-        );
-      }
-      return (
-        <RootFolderView
-          key={listKey}
-          selection={selection}
-          selectionToggle={toggleSelection}
-          tags={state.tag}
-          onTagSelected={stateManager.onAddTag}
-          hidePseudoFolders={hidePseudoFolders}
-          onClickItem={stateManager.onSearchItemClicked}
-        />
-      );
-    }
-
-    return (
-      <div style={{ height: '100%', width: '100%' }}>
-        <AutoSizer>
-          {({ width, height }) => {
-            const props: SearchResultsProps = {
-              response: value!,
-              selection,
-              selectionToggle: toggleSelection,
-              clearSelection,
-              width: width,
-              height: height,
-              onTagSelected: stateManager.onAddTag,
-              keyboardEvents,
-              onDatasourceChange: state.datasource ? stateManager.onDatasourceChange : undefined,
-              onClickItem: stateManager.onSearchItemClicked,
-            };
-
-            if (width < 800) {
-              return <SearchResultsCards {...props} />;
-            }
-
-            return <SearchResultsTable {...props} />;
-          }}
-        </AutoSizer>
-      </div>
-    );
-  };
-
-  if (
-    folderDTO &&
-    // With nested folders, SearchView doesn't know if it's fetched all children
-    // of a folder so don't show empty state here.
-    !newBrowseDashboardsEnabled() &&
-    !state.loading &&
-    !state.result?.totalRows &&
-    !stateManager.hasSearchFilters()
-  ) {
-    return (
-      <EmptyListCTA
-        title="This folder doesn't have any dashboards yet"
-        buttonIcon="plus"
-        buttonTitle="Create Dashboard"
-        buttonLink={`dashboard/new?folderUid=${folderDTO.uid}`}
-        proTip="Add/move dashboards to your folder at ->"
-        proTipLink="dashboards"
-        proTipLinkTitle="Manage dashboards"
-        proTipTarget=""
-      />
-    );
-  }
-
-  return (
-    <>
-      {Boolean(searchSelection.items.size > 0) ? (
-        <ManageActions items={searchSelection.items} onChange={onChangeItemsList} clearSelection={clearSelection} />
-      ) : (
-        <ActionRow
-          onLayoutChange={stateManager.onLayoutChange}
-          showStarredFilter={hidePseudoFolders}
-          onStarredFilterChange={!hidePseudoFolders ? undefined : stateManager.onStarredFilterChange}
-          onSortChange={stateManager.onSortChange}
-          onTagFilterChange={stateManager.onTagFilterChange}
-          getTagOptions={stateManager.getTagOptions}
-          getSortOptions={getGrafanaSearcher().getSortOptions}
-          sortPlaceholder={getGrafanaSearcher().sortPlaceholder}
-          onDatasourceChange={stateManager.onDatasourceChange}
-          onPanelTypeChange={stateManager.onPanelTypeChange}
-          state={state}
-          includePanels={state.includePanels!}
-          onSetIncludePanels={stateManager.onSetIncludePanels}
-        />
-      )}
-
-      {renderResults()}
-    </>
-  );
-};
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  searchInput: css`
-    margin-bottom: 6px;
-    min-height: ${theme.spacing(4)};
-  `,
-  unsupported: css`
-    padding: 10px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-    font-size: 18px;
-  `,
-  noResults: css`
-    padding: ${theme.v1.spacing.md};
-    background: ${theme.v1.colors.bg2};
-    font-style: italic;
-    margin-top: ${theme.v1.spacing.md};
-  `,
-});
-
-function sectionForFolderView(folderDTO: FolderDTO): DashboardViewItem {
-  return { uid: folderDTO.uid, kind: 'folder', title: folderDTO.title };
-}
diff --git a/public/app/features/search/page/components/columns.tsx b/public/app/features/search/page/components/columns.tsx
index 34625204aa12a..912b02fe029d6 100644
--- a/public/app/features/search/page/components/columns.tsx
+++ b/public/app/features/search/page/components/columns.tsx
@@ -178,6 +178,7 @@ export const generateColumns = (
                   return info ? (
                     <a key={p} href={info.url} className={styles.locationItem}>
                       <Icon name={getIconForKind(info.kind)} />
+
                       <Text variant="body" truncate>
                         {info.name}
                       </Text>
diff --git a/public/app/features/search/service/frontend.ts b/public/app/features/search/service/frontend.ts
index 35b79c795e3f4..4a78f750f5c43 100644
--- a/public/app/features/search/service/frontend.ts
+++ b/public/app/features/search/service/frontend.ts
@@ -116,7 +116,7 @@ class FullResultCache {
     // eslint-disable-next-line
     const values = allFields.map((v) => [] as any[]); // empty value for each field
 
-    let [idxs, info, order] = this.ufuzzy.search(haystack, query, true);
+    let [idxs, info, order] = this.ufuzzy.search(haystack, query, 5);
 
     for (let c = 0; c < allFields.length; c++) {
       let src = allFields[c].values;
diff --git a/public/app/features/search/service/sql.ts b/public/app/features/search/service/sql.ts
index 372883537ccee..2481d6c816579 100644
--- a/public/app/features/search/service/sql.ts
+++ b/public/app/features/search/service/sql.ts
@@ -2,6 +2,7 @@ import { DataFrame, DataFrameView, FieldType, getDisplayProcessor, SelectableVal
 import { config } from '@grafana/runtime';
 import { TermCount } from 'app/core/components/TagFilter/TagFilter';
 import { backendSrv } from 'app/core/services/backend_srv';
+import { PermissionLevelString } from 'app/types';
 
 import { DEFAULT_MAX_VALUES, TYPE_KIND_MAP } from '../constants';
 import { DashboardSearchHit, DashboardSearchItemType } from '../types';
@@ -17,17 +18,16 @@ interface APIQuery {
   limit?: number;
   page?: number;
   type?: DashboardSearchItemType;
-  // DashboardIds []int64
   dashboardUID?: string[];
-  folderIds?: number[];
   folderUIDs?: string[];
   sort?: string;
   starred?: boolean;
+  permission?: PermissionLevelString;
 }
 
 // Internal object to hold folderId
 interface LocationInfoEXT extends LocationInfo {
-  folderId?: number;
+  folderUid?: string;
 }
 
 export class SQLSearcher implements GrafanaSearcher {
@@ -36,7 +36,6 @@ export class SQLSearcher implements GrafanaSearcher {
       kind: 'folder',
       name: 'General',
       url: '/dashboards',
-      folderId: 0,
     },
   }; // share location info with everyone
 
@@ -88,6 +87,7 @@ export class SQLSearcher implements GrafanaSearcher {
         limit: limit,
         tag: query.tags,
         sort: query.sort,
+        permission: query.permission,
         page,
       },
       query
@@ -182,14 +182,14 @@ export class SQLSearcher implements GrafanaSearcher {
           kind: 'folder',
           name: hit.folderTitle,
           url: hit.folderUrl!,
-          folderId: hit.folderId,
+          folderUid: hit.folderUid,
         };
       } else if (k === 'folder') {
         this.locationInfo[hit.uid] = {
           kind: k,
           name: hit.title!,
           url: hit.url,
-          folderId: hit.id,
+          folderUid: hit.folderUid,
         };
       }
     }
diff --git a/public/app/features/search/service/types.ts b/public/app/features/search/service/types.ts
index 0f2b2fc8387c8..88a9e232176ca 100644
--- a/public/app/features/search/service/types.ts
+++ b/public/app/features/search/service/types.ts
@@ -1,5 +1,6 @@
 import { DataFrameView, SelectableValue } from '@grafana/data';
 import { TermCount } from 'app/core/components/TagFilter/TagFilter';
+import { PermissionLevelString } from 'app/types';
 
 export interface FacetField {
   field: string;
@@ -25,6 +26,7 @@ export interface SearchQuery {
   limit?: number;
   from?: number;
   starred?: boolean;
+  permission?: PermissionLevelString;
 }
 
 export interface DashboardQueryResult {
diff --git a/public/app/features/search/service/utils.ts b/public/app/features/search/service/utils.ts
index b4cb61756b882..6aeeaefba928f 100644
--- a/public/app/features/search/service/utils.ts
+++ b/public/app/features/search/service/utils.ts
@@ -1,4 +1,6 @@
 import { DataFrameView, IconName } from '@grafana/data';
+import { isSharedWithMe } from 'app/features/browse-dashboards/components/utils';
+import { DashboardViewItemWithUIItems } from 'app/features/browse-dashboards/types';
 import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
 
 import { DashboardViewItem, DashboardViewItemKind } from '../types';
@@ -50,6 +52,33 @@ export function getIconForKind(kind: string, isOpen?: boolean): IconName {
   return 'question-circle';
 }
 
+export function getIconForItem(item: DashboardViewItemWithUIItems, isOpen?: boolean): IconName {
+  if (item && isSharedWithMe(item.uid)) {
+    return 'users-alt';
+  } else {
+    return getIconForKind(item.kind, isOpen);
+  }
+}
+
+// export function getIconForItem(itemOrKind: string | DashboardViewItemWithUIItems, isOpen?: boolean): IconName {
+//   const kind = typeof itemOrKind === 'string' ? itemOrKind : itemOrKind.kind;
+//   const item = typeof itemOrKind === 'string' ? undefined : itemOrKind;
+
+//   if (kind === 'dashboard') {
+//     return 'apps';
+//   }
+
+//   if (item && isSharedWithMe(item.uid)) {
+//     return 'users-alt';
+//   }
+
+//   if (kind === 'folder') {
+//     return isOpen ? 'folder-open' : 'folder';
+//   }
+
+//   return 'question-circle';
+// }
+
 function parseKindString(kind: string): DashboardViewItemKind {
   switch (kind) {
     case 'dashboard':
diff --git a/public/app/features/search/state/SearchStateManager.test.ts b/public/app/features/search/state/SearchStateManager.test.ts
index 702c1fba586b6..547ceaf9f4202 100644
--- a/public/app/features/search/state/SearchStateManager.test.ts
+++ b/public/app/features/search/state/SearchStateManager.test.ts
@@ -64,6 +64,8 @@ describe('SearchStateManager', () => {
         sort: 'alpha-asc',
       }));
       const stm = getSearchStateManager();
+      // Set list layout since folders layout implies sort to be undefined
+      stm.onLayoutChange(SearchLayout.List);
       stm.initStateFromUrl();
 
       // Verify that they have been set
diff --git a/public/app/features/search/state/SearchStateManager.ts b/public/app/features/search/state/SearchStateManager.ts
index 33f9f7524cbb9..6f0478537e9c8 100644
--- a/public/app/features/search/state/SearchStateManager.ts
+++ b/public/app/features/search/state/SearchStateManager.ts
@@ -35,6 +35,14 @@ export const defaultQueryParams: SearchQueryParams = {
   layout: null,
 };
 
+const getLocalStorageLayout = () => {
+  const selectedLayout = localStorage.getItem(SEARCH_SELECTED_LAYOUT);
+  if (selectedLayout === SearchLayout.List) {
+    return SearchLayout.List;
+  } else {
+    return SearchLayout.Folders;
+  }
+};
 export class SearchStateManager extends StateManagerBase<SearchState> {
   updateLocation = debounce((query) => locationService.partial(query, true), 300);
   doSearchWithDebounce = debounce(() => this.doSearch(), 300);
@@ -50,9 +58,16 @@ export class SearchStateManager extends StateManagerBase<SearchState> {
       stateFromUrl.layout = SearchLayout.List;
     }
 
+    const layout = getLocalStorageLayout();
+    const prevSort = localStorage.getItem(SEARCH_SELECTED_SORT) ?? undefined;
+    const sort = layout === SearchLayout.List ? stateFromUrl.sort || prevSort : null;
+
     stateManager.setState({
       ...initialState,
       ...stateFromUrl,
+      layout,
+      sort: sort ?? initialState.sort,
+      prevSort,
       folderUid: folderUid,
       eventTrackingNamespace: folderUid ? 'manage_dashboards' : 'dashboard_search',
     });
@@ -174,7 +189,14 @@ export class SearchStateManager extends StateManagerBase<SearchState> {
   };
 
   hasSearchFilters() {
-    return this.state.query || this.state.tag.length || this.state.starred || this.state.panel_type || this.state.sort;
+    return (
+      this.state.query ||
+      this.state.tag.length ||
+      this.state.starred ||
+      this.state.panel_type ||
+      this.state.sort ||
+      this.state.layout === SearchLayout.List
+    );
   }
 
   getSearchQuery() {
diff --git a/public/app/features/search/types.ts b/public/app/features/search/types.ts
index 21cf30fd4565b..46cd8734b4d0d 100644
--- a/public/app/features/search/types.ts
+++ b/public/app/features/search/types.ts
@@ -17,6 +17,7 @@ export enum DashboardSearchItemType {
  * extraneous properties
  */
 export interface DashboardSearchHit extends WithAccessControlMetadata {
+  /** @deprecated use folderUid */
   folderId?: number;
   folderTitle?: string;
   folderUid?: string;
diff --git a/public/app/features/serviceaccounts/ServiceAccountCreatePage.test.tsx b/public/app/features/serviceaccounts/ServiceAccountCreatePage.test.tsx
index 7d53a87ffa2d3..780b45295148a 100644
--- a/public/app/features/serviceaccounts/ServiceAccountCreatePage.test.tsx
+++ b/public/app/features/serviceaccounts/ServiceAccountCreatePage.test.tsx
@@ -17,6 +17,7 @@ jest.mock('@grafana/runtime', () => ({
     put: putMock,
   }),
   config: {
+    ...jest.requireActual('@grafana/runtime').config,
     loginError: false,
     buildInfo: {
       version: 'v1.0',
@@ -39,6 +40,7 @@ jest.mock('app/core/core', () => ({
     hasPermission: () => true,
     hasPermissionInMetadata: () => true,
     user: { orgId: 1 },
+    fetchUserPermissions: () => Promise.resolve(),
   },
 }));
 
diff --git a/public/app/features/serviceaccounts/ServiceAccountCreatePage.tsx b/public/app/features/serviceaccounts/ServiceAccountCreatePage.tsx
index 725969145f096..3d3f0ef3a74b7 100644
--- a/public/app/features/serviceaccounts/ServiceAccountCreatePage.tsx
+++ b/public/app/features/serviceaccounts/ServiceAccountCreatePage.tsx
@@ -1,7 +1,8 @@
 import React, { useCallback, useEffect, useState } from 'react';
 
 import { getBackendSrv, locationService } from '@grafana/runtime';
-import { Form, Button, Input, Field, FieldSet } from '@grafana/ui';
+import { Button, Input, Field, FieldSet } from '@grafana/ui';
+import { Form } from 'app/core/components/Form/Form';
 import { Page } from 'app/core/components/Page/Page';
 import { UserRolePicker } from 'app/core/components/RolePicker/UserRolePicker';
 import { fetchRoleOptions, updateUserRoles } from 'app/core/components/RolePicker/api';
diff --git a/public/app/features/serviceaccounts/ServiceAccountPage.tsx b/public/app/features/serviceaccounts/ServiceAccountPage.tsx
index 7456b16a932a0..86be0ebee9328 100644
--- a/public/app/features/serviceaccounts/ServiceAccountPage.tsx
+++ b/public/app/features/serviceaccounts/ServiceAccountPage.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
 import { getTimeZone, NavModelItem } from '@grafana/data';
-import { Button, ConfirmModal, HorizontalGroup } from '@grafana/ui';
+import { Button, ConfirmModal, HorizontalGroup, IconButton } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import { contextSrv } from 'app/core/core';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
@@ -70,7 +70,9 @@ export const ServiceAccountPageUnconnected = ({
 
   const serviceAccountId = parseInt(match.params.id, 10);
   const tokenActionsDisabled =
-    !contextSrv.hasPermission(AccessControlAction.ServiceAccountsWrite) || serviceAccount.isDisabled;
+    serviceAccount.isDisabled ||
+    serviceAccount.isExternal ||
+    !contextSrv.hasPermission(AccessControlAction.ServiceAccountsWrite);
 
   const ableToWrite = contextSrv.hasPermission(AccessControlAction.ServiceAccountsWrite);
   const canReadPermissions = contextSrv.hasPermissionInMetadata(
@@ -134,7 +136,7 @@ export const ServiceAccountPageUnconnected = ({
     <Page navId="serviceaccounts" pageNav={pageNav}>
       <Page.Contents isLoading={isLoading}>
         <div>
-          {serviceAccount && (
+          {serviceAccount && !serviceAccount.isExternal && (
             <HorizontalGroup spacing="md" height="auto" justify="flex-end">
               <Button
                 type={'button'}
@@ -165,14 +167,26 @@ export const ServiceAccountPageUnconnected = ({
               )}
             </HorizontalGroup>
           )}
+          {serviceAccount && serviceAccount.isExternal && (
+            <HorizontalGroup spacing="md" height="auto" justify="flex-end">
+              <IconButton
+                disabled={true}
+                name="lock"
+                size="md"
+                tooltip={`This is a managed service account and cannot be modified.`}
+              />
+            </HorizontalGroup>
+          )}
           {serviceAccount && (
             <ServiceAccountProfile serviceAccount={serviceAccount} timeZone={timezone} onChange={onProfileChange} />
           )}
           <HorizontalGroup justify="space-between" height="auto">
             <h3>Tokens</h3>
-            <Button onClick={() => setIsTokenModalOpen(true)} disabled={tokenActionsDisabled}>
-              Add service account token
-            </Button>
+            {!serviceAccount.isExternal && (
+              <Button onClick={() => setIsTokenModalOpen(true)} disabled={tokenActionsDisabled}>
+                Add service account token
+              </Button>
+            )}
           </HorizontalGroup>
           {tokens && (
             <ServiceAccountTokensTable
@@ -182,7 +196,9 @@ export const ServiceAccountPageUnconnected = ({
               tokenActionsDisabled={tokenActionsDisabled}
             />
           )}
-          {canReadPermissions && <ServiceAccountPermissions serviceAccount={serviceAccount} />}
+          {!serviceAccount.isExternal && canReadPermissions && (
+            <ServiceAccountPermissions serviceAccount={serviceAccount} />
+          )}
         </div>
 
         <ConfirmModal
diff --git a/public/app/features/serviceaccounts/ServiceAccountsListPage.tsx b/public/app/features/serviceaccounts/ServiceAccountsListPage.tsx
index 39241d9fb3091..46abdecf55120 100644
--- a/public/app/features/serviceaccounts/ServiceAccountsListPage.tsx
+++ b/public/app/features/serviceaccounts/ServiceAccountsListPage.tsx
@@ -12,12 +12,14 @@ import {
   useStyles2,
   InlineField,
   Pagination,
+  Stack,
+  EmptyState,
 } from '@grafana/ui';
-import { Flex } from '@grafana/ui/src/unstable';
 import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
 import { Page } from 'app/core/components/Page/Page';
-import PageLoader from 'app/core/components/PageLoader/PageLoader';
+import config from 'app/core/config';
 import { contextSrv } from 'app/core/core';
+import { t } from 'app/core/internationalization';
 import { StoreState, ServiceAccountDTO, AccessControlAction, ServiceAccountStateFilter } from 'app/types';
 
 import { CreateTokenModal, ServiceAccountToken } from './components/CreateTokenModal';
@@ -56,6 +58,16 @@ const mapDispatchToProps = {
 
 const connector = connect(mapStateToProps, mapDispatchToProps);
 
+const availableFilters = [
+  { label: 'All', value: ServiceAccountStateFilter.All },
+  { label: 'With expired tokens', value: ServiceAccountStateFilter.WithExpiredTokens },
+  { label: 'Disabled', value: ServiceAccountStateFilter.Disabled },
+];
+
+if (config.featureToggles.externalServiceAccounts) {
+  availableFilters.push({ label: 'Managed', value: ServiceAccountStateFilter.External });
+}
+
 export const ServiceAccountsListPageUnconnected = ({
   page,
   changePage,
@@ -179,7 +191,19 @@ export const ServiceAccountsListPageUnconnected = ({
   );
 
   return (
-    <Page navId="serviceaccounts" subTitle={subTitle}>
+    <Page
+      navId="serviceaccounts"
+      subTitle={subTitle}
+      actions={
+        <>
+          {!noServiceAccountsCreated && contextSrv.hasPermission(AccessControlAction.ServiceAccountsCreate) && (
+            <LinkButton href="org/serviceaccounts/create" variant="primary">
+              Add service account
+            </LinkButton>
+          )}
+        </>
+      }
+    >
       <Page.Contents>
         <div className="page-action-bar">
           <InlineField grow>
@@ -191,22 +215,18 @@ export const ServiceAccountsListPageUnconnected = ({
             />
           </InlineField>
           <RadioButtonGroup
-            options={[
-              { label: 'All', value: ServiceAccountStateFilter.All },
-              { label: 'With expired tokens', value: ServiceAccountStateFilter.WithExpiredTokens },
-              { label: 'Disabled', value: ServiceAccountStateFilter.Disabled },
-            ]}
+            options={availableFilters}
             onChange={onStateFilterChange}
             value={serviceAccountStateFilter}
             className={styles.filter}
           />
-          {!noServiceAccountsCreated && contextSrv.hasPermission(AccessControlAction.ServiceAccountsCreate) && (
-            <LinkButton href="org/serviceaccounts/create" variant="primary">
-              Add service account
-            </LinkButton>
-          )}
         </div>
-        {isLoading && <PageLoader />}
+        {!isLoading && !noServiceAccountsCreated && serviceAccounts.length === 0 && (
+          <EmptyState
+            variant="not-found"
+            message={t('service-accounts.empty-state.message', 'No services accounts found')}
+          />
+        )}
         {!isLoading && noServiceAccountsCreated && (
           <>
             <EmptyListCTA
@@ -223,7 +243,7 @@ export const ServiceAccountsListPageUnconnected = ({
           </>
         )}
 
-        {!isLoading && serviceAccounts.length !== 0 && (
+        {(isLoading || serviceAccounts.length !== 0) && (
           <>
             <div className={cx(styles.table, 'admin-list-table')}>
               <table className="filter-table filter-table--hover">
@@ -238,24 +258,32 @@ export const ServiceAccountsListPageUnconnected = ({
                   </tr>
                 </thead>
                 <tbody>
-                  {serviceAccounts.map((serviceAccount: ServiceAccountDTO) => (
-                    <ServiceAccountListItem
-                      serviceAccount={serviceAccount}
-                      key={serviceAccount.id}
-                      roleOptions={roleOptions}
-                      onRoleChange={onRoleChange}
-                      onRemoveButtonClick={onRemoveButtonClick}
-                      onDisable={onDisableButtonClick}
-                      onEnable={onEnable}
-                      onAddTokenClick={onTokenAdd}
-                    />
-                  ))}
+                  {isLoading ? (
+                    <>
+                      <ServiceAccountListItem.Skeleton />
+                      <ServiceAccountListItem.Skeleton />
+                      <ServiceAccountListItem.Skeleton />
+                    </>
+                  ) : (
+                    serviceAccounts.map((serviceAccount) => (
+                      <ServiceAccountListItem
+                        serviceAccount={serviceAccount}
+                        key={serviceAccount.id}
+                        roleOptions={roleOptions}
+                        onRoleChange={onRoleChange}
+                        onRemoveButtonClick={onRemoveButtonClick}
+                        onDisable={onDisableButtonClick}
+                        onEnable={onEnable}
+                        onAddTokenClick={onTokenAdd}
+                      />
+                    ))
+                  )}
                 </tbody>
               </table>
 
-              <Flex justifyContent="flex-end">
+              <Stack justifyContent="flex-end">
                 <Pagination hideWhenSinglePage currentPage={page} numberOfPages={totalPages} onNavigate={changePage} />
-              </Flex>
+              </Stack>
             </div>
           </>
         )}
@@ -300,55 +328,55 @@ export const ServiceAccountsListPageUnconnected = ({
 
 export const getStyles = (theme: GrafanaTheme2) => {
   return {
-    table: css`
-      margin-top: ${theme.spacing(3)};
-    `,
-    filter: css`
-      margin: 0 ${theme.spacing(1)};
-    `,
-    row: css`
-      display: flex;
-      align-items: center;
-      height: 100% !important;
-
-      a {
-        padding: ${theme.spacing(0.5)} 0 !important;
-      }
-    `,
-    unitTooltip: css`
-      display: flex;
-      flex-direction: column;
-    `,
-    unitItem: css`
-      cursor: pointer;
-      padding: ${theme.spacing(0.5)} 0;
-      margin-right: ${theme.spacing(1)};
-    `,
-    disabled: css`
-      color: ${theme.colors.text.disabled};
-    `,
-    link: css`
-      color: inherit;
-      cursor: pointer;
-      text-decoration: underline;
-    `,
-    pageHeader: css`
-      display: flex;
-      margin-bottom: ${theme.spacing(2)};
-    `,
-    apiKeyInfoLabel: css`
-      margin-left: ${theme.spacing(1)};
-      line-height: 2.2;
-      flex-grow: 1;
-      color: ${theme.colors.text.secondary};
-
-      span {
-        padding: ${theme.spacing(0.5)};
-      }
-    `,
-    filterDelimiter: css`
-      flex-grow: 1;
-    `,
+    table: css({
+      marginTop: theme.spacing(3),
+    }),
+    filter: css({
+      margin: `0 ${theme.spacing(1)}`,
+    }),
+    row: css({
+      display: 'flex',
+      alignItems: 'center',
+      height: '100% !important',
+
+      a: {
+        padding: `${theme.spacing(0.5)} 0 !important`,
+      },
+    }),
+    unitTooltip: css({
+      display: 'flex',
+      flexDirection: 'column',
+    }),
+    unitItem: css({
+      cursor: 'pointer',
+      padding: theme.spacing(0.5, 0),
+      marginRight: theme.spacing(1),
+    }),
+    disabled: css({
+      color: theme.colors.text.disabled,
+    }),
+    link: css({
+      color: 'inherit',
+      cursor: 'pointer',
+      textDecoration: 'underline',
+    }),
+    pageHeader: css({
+      display: 'flex',
+      marginBottom: theme.spacing(2),
+    }),
+    apiKeyInfoLabel: css({
+      marginLeft: theme.spacing(1),
+      lineHeight: 2.2,
+      flexGrow: 1,
+      color: theme.colors.text.secondary,
+
+      span: {
+        padding: theme.spacing(0.5),
+      },
+    }),
+    filterDelimiter: css({
+      flexGrow: 1,
+    }),
   };
 };
 
diff --git a/public/app/features/serviceaccounts/components/CreateTokenModal.tsx b/public/app/features/serviceaccounts/components/CreateTokenModal.tsx
index a86e578c27734..92484a0cdbdca 100644
--- a/public/app/features/serviceaccounts/components/CreateTokenModal.tsx
+++ b/public/app/features/serviceaccounts/components/CreateTokenModal.tsx
@@ -84,13 +84,7 @@ export const CreateTokenModal = ({ isOpen, token, serviceAccountLogin, onCreateT
   const modalTitle = !token ? 'Add service account token' : 'Service account token created';
 
   return (
-    <Modal
-      isOpen={isOpen}
-      title={modalTitle}
-      onDismiss={onCloseInternal}
-      className={styles.modal}
-      contentClassName={styles.modalContent}
-    >
+    <Modal isOpen={isOpen} title={modalTitle} onDismiss={onCloseInternal} className={styles.modal}>
       {!token ? (
         <div>
           <Field
@@ -176,17 +170,14 @@ const getSecondsToLive = (date: Date | string) => {
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
-    modal: css`
-      width: 550px;
-    `,
-    modalContent: css`
-      overflow: visible;
-    `,
-    modalTokenRow: css`
-      display: flex;
-    `,
-    modalCopyToClipboardButton: css`
-      margin-left: ${theme.spacing(0.5)};
-    `,
+    modal: css({
+      width: '550px',
+    }),
+    modalTokenRow: css({
+      display: 'flex',
+    }),
+    modalCopyToClipboardButton: css({
+      marginLeft: theme.spacing(0.5),
+    }),
   };
 };
diff --git a/public/app/features/serviceaccounts/components/ServiceAccountProfile.tsx b/public/app/features/serviceaccounts/components/ServiceAccountProfile.tsx
index 324f101b0bac0..e21f0728f1547 100644
--- a/public/app/features/serviceaccounts/components/ServiceAccountProfile.tsx
+++ b/public/app/features/serviceaccounts/components/ServiceAccountProfile.tsx
@@ -2,7 +2,7 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { dateTimeFormat, GrafanaTheme2, OrgRole, TimeZone } from '@grafana/data';
-import { useStyles2 } from '@grafana/ui';
+import { Label, TextLink, useStyles2 } from '@grafana/ui';
 import { fetchRoleOptions } from 'app/core/components/RolePicker/api';
 import { contextSrv } from 'app/core/core';
 import { AccessControlAction, Role, ServiceAccountDTO } from 'app/types';
@@ -53,7 +53,7 @@ export function ServiceAccountProfile({ serviceAccount, timeZone, onChange }: Pr
           <ServiceAccountProfileRow
             label="Name"
             value={serviceAccount.name}
-            onChange={onNameChange}
+            onChange={!serviceAccount.isExternal ? onNameChange : undefined}
             disabled={!ableToWrite || serviceAccount.isDisabled}
           />
           <ServiceAccountProfileRow label="ID" value={serviceAccount.login} disabled={serviceAccount.isDisabled} />
@@ -68,6 +68,16 @@ export function ServiceAccountProfile({ serviceAccount, timeZone, onChange }: Pr
             value={dateTimeFormat(serviceAccount.createdAt, { timeZone })}
             disabled={serviceAccount.isDisabled}
           />
+          {serviceAccount.isExternal && serviceAccount.requiredBy && (
+            <tr>
+              <td>
+                <Label>Used by</Label>
+              </td>
+              <td>
+                <TextLink href={`/plugins/${serviceAccount.requiredBy}`}>{serviceAccount.requiredBy}</TextLink>
+              </td>
+            </tr>
+          )}
         </tbody>
       </table>
     </div>
diff --git a/public/app/features/serviceaccounts/components/ServiceAccountRoleRow.tsx b/public/app/features/serviceaccounts/components/ServiceAccountRoleRow.tsx
index 6d62e7216cbf9..aab6b4bf0ae61 100644
--- a/public/app/features/serviceaccounts/components/ServiceAccountRoleRow.tsx
+++ b/public/app/features/serviceaccounts/components/ServiceAccountRoleRow.tsx
@@ -31,7 +31,7 @@ export const ServiceAccountRoleRow = ({ label, serviceAccount, roleOptions, onRo
             onBasicRoleChange={onRoleChange}
             roleOptions={roleOptions}
             basicRoleDisabled={!canUpdateRole}
-            disabled={serviceAccount.isDisabled}
+            disabled={serviceAccount.isExternal || serviceAccount.isDisabled}
           />
         </td>
       ) : (
@@ -42,7 +42,7 @@ export const ServiceAccountRoleRow = ({ label, serviceAccount, roleOptions, onRo
               inputId={inputId}
               aria-label="Role"
               value={serviceAccount.role}
-              disabled={serviceAccount.isDisabled}
+              disabled={serviceAccount.isExternal || serviceAccount.isDisabled}
               onChange={onRoleChange}
             />
           </td>
diff --git a/public/app/features/serviceaccounts/components/ServiceAccountsListItem.tsx b/public/app/features/serviceaccounts/components/ServiceAccountsListItem.tsx
index 2d10943a4d5ec..0aa2938cded3c 100644
--- a/public/app/features/serviceaccounts/components/ServiceAccountsListItem.tsx
+++ b/public/app/features/serviceaccounts/components/ServiceAccountsListItem.tsx
@@ -1,8 +1,10 @@
 import { css, cx } from '@emotion/css';
 import React, { memo } from 'react';
+import Skeleton from 'react-loading-skeleton';
 
 import { GrafanaTheme2, OrgRole } from '@grafana/data';
-import { Button, HorizontalGroup, Icon, IconButton, useStyles2 } from '@grafana/ui';
+import { Button, Icon, IconButton, Stack, useStyles2 } from '@grafana/ui';
+import { SkeletonComponent, attachSkeleton } from '@grafana/ui/src/unstable';
 import { UserRolePicker } from 'app/core/components/RolePicker/UserRolePicker';
 import { contextSrv } from 'app/core/core';
 import { OrgRolePicker } from 'app/features/admin/OrgRolePicker';
@@ -22,7 +24,7 @@ const getServiceAccountsAriaLabel = (name: string) => {
   return `Edit service account's ${name} details`;
 };
 
-const ServiceAccountListItem = memo(
+const ServiceAccountListItemComponent = memo(
   ({
     serviceAccount,
     onRoleChange,
@@ -77,10 +79,11 @@ const ServiceAccountListItem = memo(
                 userId={serviceAccount.id}
                 orgId={serviceAccount.orgId}
                 basicRole={serviceAccount.role}
+                roles={serviceAccount.roles || []}
                 onBasicRoleChange={(newRole) => onRoleChange(newRole, serviceAccount)}
                 roleOptions={roleOptions}
                 basicRoleDisabled={!canUpdateRole}
-                disabled={serviceAccount.isDisabled}
+                disabled={serviceAccount.isExternal || serviceAccount.isDisabled}
                 width={40}
               />
             )}
@@ -90,7 +93,7 @@ const ServiceAccountListItem = memo(
             <OrgRolePicker
               aria-label="Role"
               value={serviceAccount.role}
-              disabled={!canUpdateRole || serviceAccount.isDisabled}
+              disabled={serviceAccount.isExternal || !canUpdateRole || serviceAccount.isDisabled}
               onChange={(newRole) => onRoleChange(newRole, serviceAccount)}
             />
           </td>
@@ -111,68 +114,130 @@ const ServiceAccountListItem = memo(
           </a>
         </td>
         <td>
-          <HorizontalGroup justify="flex-end">
-            {contextSrv.hasPermission(AccessControlAction.ServiceAccountsWrite) && !serviceAccount.tokens && (
-              <Button onClick={() => onAddTokenClick(serviceAccount)} disabled={serviceAccount.isDisabled}>
-                Add token
-              </Button>
-            )}
-            {contextSrv.hasPermissionInMetadata(AccessControlAction.ServiceAccountsWrite, serviceAccount) &&
-              (serviceAccount.isDisabled ? (
-                <Button variant="primary" onClick={() => onEnable(serviceAccount)}>
-                  Enable
-                </Button>
-              ) : (
-                <Button variant="secondary" onClick={() => onDisable(serviceAccount)}>
-                  Disable
+          {!serviceAccount.isExternal && (
+            <Stack alignItems="center" justifyContent="flex-end">
+              {contextSrv.hasPermission(AccessControlAction.ServiceAccountsWrite) && !serviceAccount.tokens && (
+                <Button
+                  onClick={() => onAddTokenClick(serviceAccount)}
+                  disabled={serviceAccount.isDisabled}
+                  className={styles.actionButton}
+                >
+                  Add token
                 </Button>
-              ))}
-            {contextSrv.hasPermissionInMetadata(AccessControlAction.ServiceAccountsDelete, serviceAccount) && (
+              )}
+              {contextSrv.hasPermissionInMetadata(AccessControlAction.ServiceAccountsWrite, serviceAccount) &&
+                (serviceAccount.isDisabled ? (
+                  <Button variant="primary" onClick={() => onEnable(serviceAccount)} className={styles.actionButton}>
+                    Enable
+                  </Button>
+                ) : (
+                  <Button variant="secondary" onClick={() => onDisable(serviceAccount)} className={styles.actionButton}>
+                    Disable
+                  </Button>
+                ))}
+              {contextSrv.hasPermissionInMetadata(AccessControlAction.ServiceAccountsDelete, serviceAccount) && (
+                <IconButton
+                  className={styles.deleteButton}
+                  name="trash-alt"
+                  size="md"
+                  onClick={() => onRemoveButtonClick(serviceAccount)}
+                  tooltip={`Delete service account ${serviceAccount.name}`}
+                />
+              )}
+            </Stack>
+          )}
+          {serviceAccount.isExternal && (
+            <Stack alignItems="center" justifyContent="flex-end">
               <IconButton
-                className={styles.deleteButton}
-                name="trash-alt"
+                disabled={true}
+                name="lock"
                 size="md"
-                onClick={() => onRemoveButtonClick(serviceAccount)}
-                tooltip={`Delete service account ${serviceAccount.name}`}
+                tooltip={`This is a managed service account and cannot be modified.`}
               />
-            )}
-          </HorizontalGroup>
+            </Stack>
+          )}
         </td>
       </tr>
     );
   }
 );
-ServiceAccountListItem.displayName = 'ServiceAccountListItem';
+ServiceAccountListItemComponent.displayName = 'ServiceAccountListItem';
+
+const ServiceAccountsListItemSkeleton: SkeletonComponent = ({ rootProps }) => {
+  const styles = useStyles2(getSkeletonStyles);
+
+  return (
+    <tr {...rootProps}>
+      <td className="width-4 text-center">
+        <Skeleton containerClassName={styles.blockSkeleton} circle width={25} height={25} />
+      </td>
+      <td className="max-width-10">
+        <Skeleton width={100} />
+      </td>
+      <td className="max-width-10">
+        <Skeleton width={100} />
+      </td>
+      <td>
+        <Skeleton containerClassName={styles.blockSkeleton} width="100%" height={32} />
+      </td>
+      <td className="max-width-10">
+        <Skeleton width={40} />
+      </td>
+      <td>
+        <Stack alignItems="center" justifyContent="flex-end">
+          <Skeleton containerClassName={styles.blockSkeleton} width={102} height={32} />
+          <Skeleton containerClassName={styles.blockSkeleton} width={85} height={32} />
+          <Skeleton containerClassName={cx(styles.blockSkeleton, styles.deleteButton)} width={16} height={16} />
+        </Stack>
+      </td>
+    </tr>
+  );
+};
+
+const ServiceAccountListItem = attachSkeleton(ServiceAccountListItemComponent, ServiceAccountsListItemSkeleton);
+
+const getSkeletonStyles = (theme: GrafanaTheme2) => ({
+  blockSkeleton: css({
+    display: 'block',
+    lineHeight: 1,
+  }),
+  deleteButton: css({
+    marginRight: theme.spacing(0.5),
+  }),
+});
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
-    iconRow: css`
-      svg {
-        margin-left: ${theme.spacing(0.5)};
-      }
-    `,
+    iconRow: css({
+      svg: {
+        marginLeft: theme.spacing(0.5),
+      },
+    }),
     accountId: cx(
       'ellipsis',
-      css`
-        color: ${theme.colors.text.secondary};
-      `
+      css({
+        color: theme.colors.text.secondary,
+      })
     ),
-    deleteButton: css`
-      color: ${theme.colors.text.secondary};
-    `,
-    tokensInfo: css`
-      span {
-        margin-right: ${theme.spacing(1)};
-      }
-    `,
-    tokensInfoSecondary: css`
-      color: ${theme.colors.text.secondary};
-    `,
-    disabled: css`
-      td a {
-        color: ${theme.colors.text.secondary};
-      }
-    `,
+    deleteButton: css({
+      color: theme.colors.text.secondary,
+    }),
+    tokensInfo: css({
+      span: {
+        marginRight: theme.spacing(1),
+      },
+    }),
+    tokensInfoSecondary: css({
+      color: theme.colors.text.secondary,
+    }),
+    disabled: css({
+      'td a': {
+        color: theme.colors.text.secondary,
+      },
+    }),
+    actionButton: css({
+      minWidth: 85,
+    }),
   };
 };
 
diff --git a/public/app/features/serviceaccounts/state/actions.ts b/public/app/features/serviceaccounts/state/actions.ts
index 7409beccba5f4..1668c2733596b 100644
--- a/public/app/features/serviceaccounts/state/actions.ts
+++ b/public/app/features/serviceaccounts/state/actions.ts
@@ -11,6 +11,8 @@ import {
   acOptionsLoaded,
   pageChanged,
   queryChanged,
+  rolesFetchBegin,
+  rolesFetchEnd,
   serviceAccountsFetchBegin,
   serviceAccountsFetched,
   serviceAccountsFetchEnd,
@@ -51,6 +53,21 @@ export function fetchServiceAccounts(
             serviceAccountStateFilter
           )}&accesscontrol=true`
         );
+
+        if (
+          contextSrv.licensedAccessControlEnabled() &&
+          contextSrv.hasPermission(AccessControlAction.ActionUserRolesList)
+        ) {
+          dispatch(rolesFetchBegin());
+          const orgId = contextSrv.user.orgId;
+          const userIds = result?.serviceAccounts.map((u: ServiceAccountDTO) => u.id);
+          const roles = await getBackendSrv().post(`/api/access-control/users/roles/search`, { userIds, orgId });
+          result.serviceAccounts.forEach((u: ServiceAccountDTO) => {
+            u.roles = roles ? roles[u.id] || [] : [];
+          });
+          dispatch(rolesFetchEnd());
+        }
+
         dispatch(serviceAccountsFetched(result));
       }
     } catch (error) {
@@ -100,6 +117,8 @@ const getStateFilter = (value: ServiceAccountStateFilter) => {
       return '&expiredTokens=true';
     case ServiceAccountStateFilter.Disabled:
       return '&disabled=true';
+    case ServiceAccountStateFilter.External:
+      return '&external=true';
     default:
       return '';
   }
diff --git a/public/app/features/serviceaccounts/state/reducers.ts b/public/app/features/serviceaccounts/state/reducers.ts
index 0286d295cc922..5794233d43460 100644
--- a/public/app/features/serviceaccounts/state/reducers.ts
+++ b/public/app/features/serviceaccounts/state/reducers.ts
@@ -32,12 +32,24 @@ export const serviceAccountProfileSlice = createSlice({
     serviceAccountTokensLoaded: (state, action: PayloadAction<ApiKey[]>): ServiceAccountProfileState => {
       return { ...state, tokens: action.payload, isLoading: false };
     },
+    rolesFetchBegin: (state) => {
+      return { ...state, rolesLoading: true };
+    },
+    rolesFetchEnd: (state) => {
+      return { ...state, rolesLoading: false };
+    },
   },
 });
 
 export const serviceAccountProfileReducer = serviceAccountProfileSlice.reducer;
-export const { serviceAccountLoaded, serviceAccountTokensLoaded, serviceAccountFetchBegin, serviceAccountFetchEnd } =
-  serviceAccountProfileSlice.actions;
+export const {
+  serviceAccountLoaded,
+  serviceAccountTokensLoaded,
+  serviceAccountFetchBegin,
+  serviceAccountFetchEnd,
+  rolesFetchBegin,
+  rolesFetchEnd,
+} = serviceAccountProfileSlice.actions;
 
 // serviceAccountsListPage
 export const initialStateList: ServiceAccountsState = {
diff --git a/public/app/features/storage/CreateNewFolderModal.tsx b/public/app/features/storage/CreateNewFolderModal.tsx
index 152e7cf55ca5e..2ff4a887823fd 100644
--- a/public/app/features/storage/CreateNewFolderModal.tsx
+++ b/public/app/features/storage/CreateNewFolderModal.tsx
@@ -1,14 +1,15 @@
 import React from 'react';
 import { SubmitHandler, Validate } from 'react-hook-form';
 
-import { Button, Field, Form, Input, Modal } from '@grafana/ui';
+import { Button, Field, Input, Modal } from '@grafana/ui';
+import { Form } from 'app/core/components/Form/Form';
 
 type FormModel = { folderName: string };
 
 interface Props {
   onSubmit: SubmitHandler<FormModel>;
   onDismiss: () => void;
-  validate: Validate<string>;
+  validate: Validate<string, FormModel>;
 }
 
 const initialFormModel = { folderName: '' };
diff --git a/public/app/features/storage/storage.ts b/public/app/features/storage/storage.ts
index 41b0527d71fea..38c05e9ec382e 100644
--- a/public/app/features/storage/storage.ts
+++ b/public/app/features/storage/storage.ts
@@ -102,9 +102,9 @@ class SimpleStorage implements GrafanaStorage {
       body: formData,
     });
 
-    let body: UploadResponse = await res.json();
+    let body = await res.json();
     if (!body) {
-      body = {} as any;
+      body = {};
     }
     body.status = res.status;
     body.statusText = res.statusText;
diff --git a/public/app/features/support-bundles/SupportBundlesCreate.tsx b/public/app/features/support-bundles/SupportBundlesCreate.tsx
index 74c87f68053a2..1174698171489 100644
--- a/public/app/features/support-bundles/SupportBundlesCreate.tsx
+++ b/public/app/features/support-bundles/SupportBundlesCreate.tsx
@@ -1,7 +1,8 @@
 import React, { useEffect } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
-import { Form, Button, Field, Checkbox, LinkButton, HorizontalGroup, Alert } from '@grafana/ui';
+import { Button, Field, Checkbox, LinkButton, Stack, Alert } from '@grafana/ui';
+import { Form } from 'app/core/components/Form/Form';
 import { Page } from 'app/core/components/Page/Page';
 import { StoreState } from 'app/types';
 
@@ -60,7 +61,7 @@ export const SupportBundlesCreateUnconnected = ({
         {createBundleError && <Alert title={createBundleError} severity="error" />}
         {!!collectors.length && (
           <Form defaultValues={values} onSubmit={onSubmit} validateOn="onSubmit">
-            {({ register, errors }) => {
+            {({ register }) => {
               return (
                 <>
                   {[...collectors]
@@ -79,12 +80,12 @@ export const SupportBundlesCreateUnconnected = ({
                         </Field>
                       );
                     })}
-                  <HorizontalGroup>
+                  <Stack>
                     <Button type="submit">Create</Button>
                     <LinkButton href="/support-bundles" variant="secondary">
                       Cancel
                     </LinkButton>
-                  </HorizontalGroup>
+                  </Stack>
                 </>
               );
             }}
diff --git a/public/app/features/teams/CreateTeam.tsx b/public/app/features/teams/CreateTeam.tsx
index 5136e92abf03d..6e1a604f5ee16 100644
--- a/public/app/features/teams/CreateTeam.tsx
+++ b/public/app/features/teams/CreateTeam.tsx
@@ -1,8 +1,9 @@
-import React, { useState } from 'react';
+import React, { JSX, useState } from 'react';
+import { useForm } from 'react-hook-form';
 
 import { NavModelItem } from '@grafana/data';
 import { getBackendSrv, locationService } from '@grafana/runtime';
-import { Button, Form, Field, Input, FieldSet } from '@grafana/ui';
+import { Button, Field, Input, FieldSet } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import { TeamRolePicker } from 'app/core/components/RolePicker/TeamRolePicker';
 import { updateTeamRoles } from 'app/core/components/RolePicker/api';
@@ -21,7 +22,11 @@ export const CreateTeam = (): JSX.Element => {
   const currentOrgId = contextSrv.user.orgId;
   const [pendingRoles, setPendingRoles] = useState<Role[]>([]);
   const [{ roleOptions }] = useRoleOptions(currentOrgId);
-
+  const {
+    handleSubmit,
+    register,
+    formState: { errors },
+  } = useForm<TeamDTO>();
   const canUpdateRoles =
     contextSrv.hasPermission(AccessControlAction.ActionUserRolesAdd) &&
     contextSrv.hasPermission(AccessControlAction.ActionUserRolesRemove);
@@ -44,40 +49,36 @@ export const CreateTeam = (): JSX.Element => {
   return (
     <Page navId="teams" pageNav={pageNav}>
       <Page.Contents>
-        <Form onSubmit={createTeam}>
-          {({ register, errors }) => (
-            <>
-              <FieldSet>
-                <Field label="Name" required invalid={!!errors.name} error="Team name is required">
-                  <Input {...register('name', { required: true })} id="team-name" />
-                </Field>
-                {contextSrv.licensedAccessControlEnabled() && (
-                  <Field label="Role">
-                    <TeamRolePicker
-                      teamId={0}
-                      roleOptions={roleOptions}
-                      disabled={false}
-                      apply={true}
-                      onApplyRoles={setPendingRoles}
-                      pendingRoles={pendingRoles}
-                      maxWidth="100%"
-                    />
-                  </Field>
-                )}
-                <Field
-                  label={'Email'}
-                  description={'This is optional and is primarily used for allowing custom team avatars.'}
-                >
-                  <Input {...register('email')} type="email" id="team-email" placeholder="email@test.com" />
-                </Field>
-              </FieldSet>
+        <form onSubmit={handleSubmit(createTeam)} style={{ maxWidth: '600px' }}>
+          <FieldSet>
+            <Field label="Name" required invalid={!!errors.name} error="Team name is required">
+              <Input {...register('name', { required: true })} id="team-name" />
+            </Field>
+            {contextSrv.licensedAccessControlEnabled() && (
+              <Field label="Role">
+                <TeamRolePicker
+                  teamId={0}
+                  roleOptions={roleOptions}
+                  disabled={false}
+                  apply={true}
+                  onApplyRoles={setPendingRoles}
+                  pendingRoles={pendingRoles}
+                  maxWidth="100%"
+                />
+              </Field>
+            )}
+            <Field
+              label={'Email'}
+              description={'This is optional and is primarily used for allowing custom team avatars.'}
+            >
+              <Input {...register('email')} type="email" id="team-email" placeholder="email@test.com" />
+            </Field>
+          </FieldSet>
 
-              <Button type="submit" variant="primary">
-                Create
-              </Button>
-            </>
-          )}
-        </Form>
+          <Button type="submit" variant="primary">
+            Create
+          </Button>
+        </form>
       </Page.Contents>
     </Page>
   );
diff --git a/public/app/features/teams/TeamList.test.tsx b/public/app/features/teams/TeamList.test.tsx
index 76dd014644ae7..c9f4dc4b686e2 100644
--- a/public/app/features/teams/TeamList.test.tsx
+++ b/public/app/features/teams/TeamList.test.tsx
@@ -31,6 +31,7 @@ const setup = (propOverrides?: object) => {
     page: 0,
     hasFetched: false,
     perPage: 10,
+    rolesLoading: false,
   };
 
   Object.assign(props, propOverrides);
diff --git a/public/app/features/teams/TeamList.tsx b/public/app/features/teams/TeamList.tsx
index fca388998f8fa..a053dd22b27cc 100644
--- a/public/app/features/teams/TeamList.tsx
+++ b/public/app/features/teams/TeamList.tsx
@@ -1,28 +1,33 @@
+import { css } from '@emotion/css';
 import React, { useEffect, useMemo, useState } from 'react';
+import Skeleton from 'react-loading-skeleton';
 import { connect, ConnectedProps } from 'react-redux';
 
+import { GrafanaTheme2 } from '@grafana/data';
 import {
-  LinkButton,
-  FilterInput,
-  InlineField,
+  Avatar,
   CellProps,
+  Column,
   DeleteButton,
+  EmptyState,
+  FilterInput,
+  InlineField,
   InteractiveTable,
-  Icon,
-  Tooltip,
-  Column,
+  LinkButton,
   Pagination,
-  Avatar,
+  Stack,
+  TextLink,
+  Tooltip,
+  useStyles2,
 } from '@grafana/ui';
-import { Stack, Flex } from '@grafana/ui/src/unstable';
 import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
 import { Page } from 'app/core/components/Page/Page';
 import { fetchRoleOptions } from 'app/core/components/RolePicker/api';
+import { t } from 'app/core/internationalization';
 import { contextSrv } from 'app/core/services/context_srv';
 import { AccessControlAction, Role, StoreState, Team } from 'app/types';
 
 import { TeamRolePicker } from '../../core/components/RolePicker/TeamRolePicker';
-import { TableWrapper } from '../admin/Users/TableWrapper';
 
 import { deleteTeam, loadTeams, changePage, changeQuery, changeSort } from './state/actions';
 
@@ -33,6 +38,15 @@ export interface State {
   roleOptions: Role[];
 }
 
+// this is dummy data to pass to the table while the real data is loading
+const skeletonData: Team[] = new Array(3).fill(null).map((_, index) => ({
+  id: index,
+  memberCount: 0,
+  name: '',
+  orgId: 0,
+  permission: 0,
+}));
+
 export const TeamList = ({
   teams,
   query,
@@ -43,10 +57,12 @@ export const TeamList = ({
   changeQuery,
   totalPages,
   page,
+  rolesLoading,
   changePage,
   changeSort,
 }: Props) => {
   const [roleOptions, setRoleOptions] = useState<Role[]>([]);
+  const styles = useStyles2(getStyles);
 
   useEffect(() => {
     loadTeams(true);
@@ -66,24 +82,57 @@ export const TeamList = ({
       {
         id: 'avatarUrl',
         header: '',
-        cell: ({ cell: { value } }: Cell<'avatarUrl'>) => value && <Avatar src={value} alt="User avatar" />,
+        disableGrow: true,
+        cell: ({ cell: { value } }: Cell<'avatarUrl'>) => {
+          if (!hasFetched) {
+            return <Skeleton containerClassName={styles.blockSkeleton} width={24} height={24} circle />;
+          }
+
+          return value && <Avatar src={value} alt="User avatar" />;
+        },
       },
       {
         id: 'name',
         header: 'Name',
-        cell: ({ cell: { value } }: Cell<'name'>) => value,
+        cell: ({ cell: { value }, row: { original } }: Cell<'name'>) => {
+          if (!hasFetched) {
+            return <Skeleton width={100} />;
+          }
+
+          const canReadTeam = contextSrv.hasPermissionInMetadata(AccessControlAction.ActionTeamsRead, original);
+          if (!canReadTeam) {
+            return value;
+          }
+
+          return (
+            <TextLink color="primary" inline={false} href={`/org/teams/edit/${original.id}`} title="Edit team">
+              {value}
+            </TextLink>
+          );
+        },
         sortType: 'string',
       },
       {
         id: 'email',
         header: 'Email',
-        cell: ({ cell: { value } }: Cell<'email'>) => value,
+        cell: ({ cell: { value } }: Cell<'email'>) => {
+          if (!hasFetched) {
+            return <Skeleton width={60} />;
+          }
+          return value;
+        },
         sortType: 'string',
       },
       {
         id: 'memberCount',
         header: 'Members',
-        cell: ({ cell: { value } }: Cell<'memberCount'>) => value,
+        disableGrow: true,
+        cell: ({ cell: { value } }: Cell<'memberCount'>) => {
+          if (!hasFetched) {
+            return <Skeleton width={40} />;
+          }
+          return value;
+        },
         sortType: 'number',
       },
       ...(displayRolePicker
@@ -92,52 +141,81 @@ export const TeamList = ({
               id: 'role',
               header: 'Role',
               cell: ({ cell: { value }, row: { original } }: Cell<'memberCount'>) => {
+                if (!hasFetched) {
+                  return <Skeleton width={320} height={32} containerClassName={styles.blockSkeleton} />;
+                }
                 const canSeeTeamRoles = contextSrv.hasPermissionInMetadata(
                   AccessControlAction.ActionTeamsRolesList,
                   original
                 );
-                return canSeeTeamRoles && <TeamRolePicker teamId={original.id} roleOptions={roleOptions} width={40} />;
+                return (
+                  canSeeTeamRoles && (
+                    <TeamRolePicker
+                      teamId={original.id}
+                      roles={original.roles || []}
+                      isLoading={rolesLoading}
+                      roleOptions={roleOptions}
+                      width={40}
+                    />
+                  )
+                );
               },
             },
           ]
         : []),
       {
-        id: 'edit',
+        id: 'actions',
         header: '',
+        disableGrow: true,
         cell: ({ row: { original } }: Cell) => {
+          if (!hasFetched) {
+            return (
+              <Stack direction="row" justifyContent="flex-end" alignItems="center">
+                <Skeleton containerClassName={styles.blockSkeleton} width={16} height={16} />
+                <Skeleton containerClassName={styles.blockSkeleton} width={22} height={24} />
+              </Stack>
+            );
+          }
+
           const canReadTeam = contextSrv.hasPermissionInMetadata(AccessControlAction.ActionTeamsRead, original);
-          return canReadTeam ? (
-            <a href={`org/teams/edit/${original.id}`} aria-label={`Edit team ${original.name}`}>
-              <Tooltip content={'Edit team'}>
-                <Icon name={'pen'} />
-              </Tooltip>
-            </a>
-          ) : null;
-        },
-      },
-      {
-        id: 'delete',
-        header: '',
-        cell: ({ row: { original } }: Cell) => {
           const canDelete = contextSrv.hasPermissionInMetadata(AccessControlAction.ActionTeamsDelete, original);
-
           return (
-            <DeleteButton
-              aria-label={`Delete team ${original.name}`}
-              size="sm"
-              disabled={!canDelete}
-              onConfirm={() => deleteTeam(original.id)}
-            />
+            <Stack direction="row" justifyContent="flex-end" gap={2}>
+              {canReadTeam && (
+                <Tooltip content={'Edit team'}>
+                  <LinkButton
+                    href={`org/teams/edit/${original.id}`}
+                    aria-label={`Edit team ${original.name}`}
+                    icon="pen"
+                    size="sm"
+                    variant="secondary"
+                  />
+                </Tooltip>
+              )}
+              <DeleteButton
+                aria-label={`Delete team ${original.name}`}
+                size="sm"
+                disabled={!canDelete}
+                onConfirm={() => deleteTeam(original.id)}
+              />
+            </Stack>
           );
         },
       },
     ],
-    [displayRolePicker, roleOptions, deleteTeam]
+    [displayRolePicker, hasFetched, rolesLoading, roleOptions, deleteTeam, styles]
   );
 
   return (
-    <Page navId="teams">
-      <Page.Contents isLoading={!hasFetched}>
+    <Page
+      navId="teams"
+      actions={
+        <LinkButton href={canCreate ? 'org/teams/new' : '#'} disabled={!canCreate}>
+          New Team
+        </LinkButton>
+      }
+    >
+      <Page.Contents>
         {noTeams ? (
           <EmptyListCTA
             title="You haven't created any teams yet."
@@ -156,29 +234,27 @@ export const TeamList = ({
               <InlineField grow>
                 <FilterInput placeholder="Search teams" value={query} onChange={changeQuery} />
               </InlineField>
-
-              <LinkButton href={canCreate ? 'org/teams/new' : '#'} disabled={!canCreate}>
-                New Team
-              </LinkButton>
             </div>
-            <Stack gap={2}>
-              <TableWrapper>
+            {hasFetched && teams.length === 0 ? (
+              <EmptyState variant="not-found" message={t('teams.empty-state.message', 'No teams found')} />
+            ) : (
+              <Stack direction={'column'} gap={2}>
                 <InteractiveTable
                   columns={columns}
-                  data={teams}
+                  data={hasFetched ? teams : skeletonData}
                   getRowId={(team) => String(team.id)}
                   fetchData={changeSort}
                 />
-                <Flex justifyContent="flex-end">
+                <Stack justifyContent="flex-end">
                   <Pagination
                     hideWhenSinglePage
                     currentPage={page}
                     numberOfPages={totalPages}
                     onNavigate={changePage}
                   />
-                </Flex>
-              </TableWrapper>
-            </Stack>
+                </Stack>
+              </Stack>
+            )}
           </>
         )}
       </Page.Contents>
@@ -203,6 +279,7 @@ function mapStateToProps(state: StoreState) {
     noTeams: state.teams.noTeams,
     totalPages: state.teams.totalPages,
     hasFetched: state.teams.hasFetched,
+    rolesLoading: state.teams.rolesLoading,
   };
 }
 
@@ -217,3 +294,11 @@ const mapDispatchToProps = {
 const connector = connect(mapStateToProps, mapDispatchToProps);
 export type Props = OwnProps & ConnectedProps<typeof connector>;
 export default connector(TeamList);
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  blockSkeleton: css({
+    lineHeight: 1,
+    // needed for things to align properly in the table
+    display: 'flex',
+  }),
+});
diff --git a/public/app/features/teams/TeamPages.test.tsx b/public/app/features/teams/TeamPages.test.tsx
index afafe17ee74dc..9aa5ca4af2886 100644
--- a/public/app/features/teams/TeamPages.test.tsx
+++ b/public/app/features/teams/TeamPages.test.tsx
@@ -29,6 +29,7 @@ jest.mock('@grafana/runtime', () => ({
     get: jest.fn().mockResolvedValue([{ userId: 1, login: 'Test' }]),
   }),
   config: {
+    ...jest.requireActual('@grafana/runtime').config,
     licenseInfo: {
       enabledFeatures: { teamsync: true },
       stateInfo: '',
diff --git a/public/app/features/teams/TeamSettings.tsx b/public/app/features/teams/TeamSettings.tsx
index 3b09298d72bd5..0916535727930 100644
--- a/public/app/features/teams/TeamSettings.tsx
+++ b/public/app/features/teams/TeamSettings.tsx
@@ -1,7 +1,8 @@
 import React, { useState } from 'react';
+import { useForm } from 'react-hook-form';
 import { connect, ConnectedProps } from 'react-redux';
 
-import { Input, Field, Form, Button, FieldSet, VerticalGroup } from '@grafana/ui';
+import { Input, Field, Button, FieldSet, Stack } from '@grafana/ui';
 import { TeamRolePicker } from 'app/core/components/RolePicker/TeamRolePicker';
 import { updateTeamRoles } from 'app/core/components/RolePicker/api';
 import { useRoleOptions } from 'app/core/components/RolePicker/hooks';
@@ -28,6 +29,11 @@ export const TeamSettings = ({ team, updateTeam }: Props) => {
 
   const [{ roleOptions }] = useRoleOptions(currentOrgId);
   const [pendingRoles, setPendingRoles] = useState<Role[]>([]);
+  const {
+    handleSubmit,
+    register,
+    formState: { errors },
+  } = useForm<Team>({ defaultValues: team });
 
   const canUpdateRoles =
     contextSrv.hasPermission(AccessControlAction.ActionTeamsRolesAdd) &&
@@ -37,59 +43,55 @@ export const TeamSettings = ({ team, updateTeam }: Props) => {
     contextSrv.hasPermissionInMetadata(AccessControlAction.ActionTeamsRolesList, team) &&
     contextSrv.hasPermission(AccessControlAction.ActionRolesList);
 
-  return (
-    <VerticalGroup spacing="lg">
-      <Form
-        defaultValues={{ ...team }}
-        onSubmit={async (formTeam: Team) => {
-          if (contextSrv.licensedAccessControlEnabled() && canUpdateRoles) {
-            await updateTeamRoles(pendingRoles, team.id);
-          }
-          updateTeam(formTeam.name, formTeam.email || '');
-        }}
-        disabled={!canWriteTeamSettings}
-      >
-        {({ register, errors }) => (
-          <FieldSet label="Team details">
-            <Field
-              label="Name"
-              disabled={!canWriteTeamSettings}
-              required
-              invalid={!!errors.name}
-              error="Name is required"
-            >
-              <Input {...register('name', { required: true })} id="name-input" />
-            </Field>
+  const onSubmit = async (formTeam: Team) => {
+    if (contextSrv.licensedAccessControlEnabled() && canUpdateRoles) {
+      await updateTeamRoles(pendingRoles, team.id);
+    }
+    updateTeam(formTeam.name, formTeam.email || '');
+  };
 
-            {contextSrv.licensedAccessControlEnabled() && canListRoles && (
-              <Field label="Role">
-                <TeamRolePicker
-                  teamId={team.id}
-                  roleOptions={roleOptions}
-                  disabled={!canUpdateRoles}
-                  apply={true}
-                  onApplyRoles={setPendingRoles}
-                  pendingRoles={pendingRoles}
-                  maxWidth="100%"
-                />
-              </Field>
-            )}
+  return (
+    <Stack direction={'column'} gap={3}>
+      <form onSubmit={handleSubmit(onSubmit)} style={{ maxWidth: '600px' }}>
+        <FieldSet label="Team details">
+          <Field
+            label="Name"
+            disabled={!canWriteTeamSettings}
+            required
+            invalid={!!errors.name}
+            error="Name is required"
+          >
+            <Input {...register('name', { required: true })} id="name-input" />
+          </Field>
 
-            <Field
-              label="Email"
-              description="This is optional and is primarily used to set the team profile avatar (via gravatar service)."
-              disabled={!canWriteTeamSettings}
-            >
-              <Input {...register('email')} placeholder="team@email.com" type="email" id="email-input" />
+          {contextSrv.licensedAccessControlEnabled() && canListRoles && (
+            <Field label="Role">
+              <TeamRolePicker
+                teamId={team.id}
+                roleOptions={roleOptions}
+                disabled={!canUpdateRoles}
+                apply={true}
+                onApplyRoles={setPendingRoles}
+                pendingRoles={pendingRoles}
+                maxWidth="100%"
+              />
             </Field>
-            <Button type="submit" disabled={!canWriteTeamSettings}>
-              Update
-            </Button>
-          </FieldSet>
-        )}
-      </Form>
+          )}
+
+          <Field
+            label="Email"
+            description="This is optional and is primarily used to set the team profile avatar (via gravatar service)."
+            disabled={!canWriteTeamSettings}
+          >
+            <Input {...register('email')} placeholder="team@email.com" type="email" id="email-input" />
+          </Field>
+          <Button type="submit" disabled={!canWriteTeamSettings}>
+            Update
+          </Button>
+        </FieldSet>
+      </form>
       <SharedPreferences resourceUri={`teams/${team.id}`} disabled={!canWriteTeamSettings} preferenceType="team" />
-    </VerticalGroup>
+    </Stack>
   );
 };
 
diff --git a/public/app/features/teams/state/actions.ts b/public/app/features/teams/state/actions.ts
index 3d28044b3eb66..caffdba46d37a 100644
--- a/public/app/features/teams/state/actions.ts
+++ b/public/app/features/teams/state/actions.ts
@@ -16,6 +16,8 @@ import {
   teamMembersLoaded,
   teamsLoaded,
   sortChanged,
+  rolesFetchBegin,
+  rolesFetchEnd,
 } from './reducers';
 
 export function loadTeams(initial = false): ThunkResult<void> {
@@ -39,6 +41,19 @@ export function loadTeams(initial = false): ThunkResult<void> {
       noTeams = response.teams.length === 0;
     }
 
+    if (
+      contextSrv.licensedAccessControlEnabled() &&
+      contextSrv.hasPermission(AccessControlAction.ActionTeamsRolesList)
+    ) {
+      dispatch(rolesFetchBegin());
+      const teamIds = response?.teams.map((t: Team) => t.id);
+      const roles = await getBackendSrv().post(`/api/access-control/teams/roles/search`, { teamIds });
+      response.teams.forEach((t: Team) => {
+        t.roles = roles ? roles[t.id] || [] : [];
+      });
+      dispatch(rolesFetchEnd());
+    }
+
     dispatch(teamsLoaded({ noTeams, ...response }));
   };
 }
diff --git a/public/app/features/teams/state/reducers.ts b/public/app/features/teams/state/reducers.ts
index a854ddc1bd854..4602f33540c76 100644
--- a/public/app/features/teams/state/reducers.ts
+++ b/public/app/features/teams/state/reducers.ts
@@ -38,10 +38,17 @@ const teamsSlice = createSlice({
     sortChanged: (state, action: PayloadAction<TeamsState['sort']>): TeamsState => {
       return { ...state, sort: action.payload, page: 1 };
     },
+    rolesFetchBegin: (state) => {
+      return { ...state, rolesLoading: true };
+    },
+    rolesFetchEnd: (state) => {
+      return { ...state, rolesLoading: false };
+    },
   },
 });
 
-export const { teamsLoaded, queryChanged, pageChanged, sortChanged } = teamsSlice.actions;
+export const { teamsLoaded, queryChanged, pageChanged, sortChanged, rolesFetchBegin, rolesFetchEnd } =
+  teamsSlice.actions;
 
 export const teamsReducer = teamsSlice.reducer;
 
diff --git a/public/app/features/templating/macroRegistry.test.ts b/public/app/features/templating/macroRegistry.test.ts
index 5b5a25e7687db..64ac17c33866b 100644
--- a/public/app/features/templating/macroRegistry.test.ts
+++ b/public/app/features/templating/macroRegistry.test.ts
@@ -45,7 +45,7 @@ describe('__url_time_range', () => {
         from: 1607687293000,
         to: 1607687293100,
       }),
-    } as any);
+    } as unknown as TimeSrv);
   });
 
   it('should interpolate to url params', () => {
diff --git a/public/app/features/templating/template_srv.mock.ts b/public/app/features/templating/template_srv.mock.ts
index 53dad5ead9361..2ff7c0abdaf42 100644
--- a/public/app/features/templating/template_srv.mock.ts
+++ b/public/app/features/templating/template_srv.mock.ts
@@ -1,4 +1,4 @@
-import { ScopedVars, TimeRange, TypedVariableModel } from '@grafana/data';
+import { ScopedVars, TimeRange, TypedVariableModel, VariableOption } from '@grafana/data';
 import { TemplateSrv } from '@grafana/runtime';
 
 import { variableRegex } from '../variables/utils';
@@ -13,18 +13,37 @@ import { variableRegex } from '../variables/utils';
  */
 export class TemplateSrvMock implements TemplateSrv {
   private regex = variableRegex;
-  constructor(private variables: Record<string, string>) {}
+  constructor(private variables: TypedVariableModel[]) {}
 
   getVariables(): TypedVariableModel[] {
-    return Object.keys(this.variables).map((key) => {
-      return {
-        type: 'custom',
-        name: key,
-        label: key,
+    if (!this.variables) {
+      return [];
+    }
+
+    return this.variables.reduce((acc: TypedVariableModel[], variable) => {
+      const commonProps = {
+        type: variable.type ?? 'custom',
+        name: variable.name ?? 'test',
+        label: variable.label ?? 'test',
       };
-      // TODO: we remove this type assertion in a later PR
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    }) as TypedVariableModel[];
+      if (variable.type === 'datasource') {
+        acc.push({
+          ...commonProps,
+          current: {
+            text: variable.current?.text,
+            value: variable.current?.value,
+          } as VariableOption,
+          options: variable.options ?? [],
+          multi: variable.multi ?? false,
+          includeAll: variable.includeAll ?? false,
+        } as TypedVariableModel);
+      } else {
+        acc.push({
+          ...commonProps,
+        } as TypedVariableModel);
+      }
+      return acc as TypedVariableModel[];
+    }, []);
   }
 
   replace(target?: string, scopedVars?: ScopedVars, format?: string | Function): string {
@@ -35,8 +54,7 @@ export class TemplateSrvMock implements TemplateSrv {
     this.regex.lastIndex = 0;
 
     return target.replace(this.regex, (match, var1, var2, fmt2, var3, fieldPath, fmt3) => {
-      const variableName = var1 || var2 || var3;
-      return this.variables[variableName];
+      return var1 || var2 || var3;
     });
   }
 
diff --git a/public/app/features/templating/template_srv.test.ts b/public/app/features/templating/template_srv.test.ts
index b822402f96e12..d6a1353553207 100644
--- a/public/app/features/templating/template_srv.test.ts
+++ b/public/app/features/templating/template_srv.test.ts
@@ -1,6 +1,16 @@
-import { dateTime, TimeRange } from '@grafana/data';
+import { dateTime, QueryVariableModel, TimeRange, TypedVariableModel } from '@grafana/data';
 import { setDataSourceSrv, VariableInterpolation } from '@grafana/runtime';
-import { ConstantVariable, EmbeddedScene, SceneCanvasText, SceneVariableSet, TestVariable } from '@grafana/scenes';
+import {
+  ConstantVariable,
+  CustomVariable,
+  DataSourceVariable,
+  EmbeddedScene,
+  IntervalVariable,
+  QueryVariable,
+  SceneCanvasText,
+  SceneVariableSet,
+  TestVariable,
+} from '@grafana/scenes';
 import { VariableFormatID } from '@grafana/schema';
 
 import { silenceConsoleOutput } from '../../../test/core/utils/silenceConsoleOutput';
@@ -9,15 +19,14 @@ import { mockDataSource, MockDataSourceSrv } from '../alerting/unified/mocks';
 import { VariableAdapter, variableAdapters } from '../variables/adapters';
 import { createAdHocVariableAdapter } from '../variables/adhoc/adapter';
 import { createQueryVariableAdapter } from '../variables/query/adapter';
-import { VariableModel } from '../variables/types';
 
 import { TemplateSrv } from './template_srv';
 
 const key = 'key';
 
 variableAdapters.setInit(() => [
-  createQueryVariableAdapter() as unknown as VariableAdapter<VariableModel>,
-  createAdHocVariableAdapter() as unknown as VariableAdapter<VariableModel>,
+  createQueryVariableAdapter() as unknown as VariableAdapter<TypedVariableModel>,
+  createAdHocVariableAdapter() as unknown as VariableAdapter<TypedVariableModel>,
 ]);
 
 const interpolateMock = jest.fn();
@@ -25,6 +34,7 @@ const interpolateMock = jest.fn();
 jest.mock('@grafana/scenes', () => ({
   ...jest.requireActual('@grafana/scenes'),
   sceneGraph: {
+    ...jest.requireActual('@grafana/scenes').sceneGraph,
     interpolate: (...args: unknown[]) => interpolateMock(...args),
   },
 }));
@@ -845,5 +855,39 @@ describe('templateSrv', () => {
       expect(interpolateMock.mock.calls[0][0]).toEqual(window.__grafanaSceneContext);
       expect(interpolateMock.mock.calls[0][1]).toEqual('test ${sceneVar}');
     });
+
+    it('Can use getVariables to access scene variables', () => {
+      window.__grafanaSceneContext = new EmbeddedScene({
+        $variables: new SceneVariableSet({
+          variables: [
+            new QueryVariable({ name: 'server', value: 'serverA', text: 'Server A' }),
+            new QueryVariable({ name: 'pods', value: ['pA', 'pB'], text: ['podA', 'podB'] }),
+            new DataSourceVariable({ name: 'ds', value: 'dsA', text: 'dsA', pluginId: 'prometheus' }),
+            new CustomVariable({ name: 'custom', value: 'A', text: 'A', query: 'A, B, C' }),
+            new IntervalVariable({ name: 'interval', value: '1m', intervals: ['1m', '2m'] }),
+          ],
+        }),
+        body: new SceneCanvasText({ text: 'hello' }),
+      });
+
+      window.__grafanaSceneContext.activate();
+
+      const vars = _templateSrv.getVariables();
+      expect(vars.length).toBe(5);
+
+      const serverVar = vars[0] as QueryVariableModel;
+
+      expect(serverVar.name).toBe('server');
+      expect(serverVar.type).toBe('query');
+      expect(serverVar.current.value).toBe('serverA');
+      expect(serverVar.current.text).toBe('Server A');
+
+      const podVar = vars[1] as QueryVariableModel;
+
+      expect(podVar.name).toBe('pods');
+      expect(podVar.type).toBe('query');
+      expect(podVar.current.value).toEqual(['pA', 'pB']);
+      expect(podVar.current.text).toEqual(['podA', 'podB']);
+    });
   });
 });
diff --git a/public/app/features/templating/template_srv.ts b/public/app/features/templating/template_srv.ts
index ab4760f1c6a79..9aa3133080c5f 100644
--- a/public/app/features/templating/template_srv.ts
+++ b/public/app/features/templating/template_srv.ts
@@ -18,6 +18,7 @@ import {
 import { sceneGraph, VariableCustomFormatterFn } from '@grafana/scenes';
 import { VariableFormatID } from '@grafana/schema';
 
+import { getVariablesCompatibility } from '../dashboard-scene/utils/getVariablesCompatibility';
 import { variableAdapters } from '../variables/adapters';
 import { ALL_VARIABLE_TEXT, ALL_VARIABLE_VALUE } from '../variables/constants';
 import { isAdHoc } from '../variables/guard';
@@ -68,17 +69,22 @@ export class TemplateSrv implements BaseTemplateSrv {
    *
    * Use getVariables function instead
    */
-  get variables(): any[] {
+  get variables(): TypedVariableModel[] {
     deprecationWarning('template_srv.ts', 'variables', 'getVariables');
     return this.getVariables();
   }
 
   getVariables(): TypedVariableModel[] {
+    // For scenes we have this backward compatiblity translation
+    if (window.__grafanaSceneContext) {
+      return getVariablesCompatibility(window.__grafanaSceneContext);
+    }
+
     return this.dependencies.getVariables();
   }
 
   updateIndex() {
-    const existsOrEmpty = (value: any) => value || value === '';
+    const existsOrEmpty = (value: unknown) => value || value === '';
 
     this.index = this._variables.reduce((acc, currentValue) => {
       if (currentValue.current && (currentValue.current.isNone || existsOrEmpty(currentValue.current.value))) {
@@ -117,7 +123,7 @@ export class TemplateSrv implements BaseTemplateSrv {
    * Use filters property on the request (DataQueryRequest) or if this is called from
    * interpolateVariablesInQueries or applyTemplateVariables it is passed as a new argument
    **/
-  getAdhocFilters(datasourceName: string): AdHocVariableFilter[] {
+  getAdhocFilters(datasourceName: string, skipDeprecationWarning?: boolean): AdHocVariableFilter[] {
     let filters: any = [];
     let ds = getDataSourceSrv().getInstanceSettings(datasourceName);
 
@@ -125,7 +131,7 @@ export class TemplateSrv implements BaseTemplateSrv {
       return [];
     }
 
-    if (!this._adhocFiltersDeprecationWarningLogged.get(ds.type)) {
+    if (!skipDeprecationWarning && !this._adhocFiltersDeprecationWarningLogged.get(ds.type)) {
       if (process.env.NODE_ENV !== 'test') {
         deprecationWarning(
           `DataSource ${ds.type}`,
@@ -354,7 +360,7 @@ export class TemplateSrv implements BaseTemplateSrv {
     });
   }
 
-  isAllValue(value: any) {
+  isAllValue(value: unknown) {
     return value === ALL_VARIABLE_VALUE || (Array.isArray(value) && value[0] === ALL_VARIABLE_VALUE);
   }
 
diff --git a/public/app/features/trails/ActionTabs/AddToFiltersGraphAction.tsx b/public/app/features/trails/ActionTabs/AddToFiltersGraphAction.tsx
new file mode 100644
index 0000000000000..4fbea1d2584f0
--- /dev/null
+++ b/public/app/features/trails/ActionTabs/AddToFiltersGraphAction.tsx
@@ -0,0 +1,59 @@
+import React from 'react';
+
+import { DataFrame } from '@grafana/data';
+import {
+  SceneObjectState,
+  SceneObjectBase,
+  SceneComponentProps,
+  sceneGraph,
+  AdHocFiltersVariable,
+} from '@grafana/scenes';
+import { Button } from '@grafana/ui';
+
+import { reportExploreMetrics } from '../interactions';
+import { getTrailFor } from '../utils';
+
+export interface AddToFiltersGraphActionState extends SceneObjectState {
+  frame: DataFrame;
+}
+
+export class AddToFiltersGraphAction extends SceneObjectBase<AddToFiltersGraphActionState> {
+  public onClick = () => {
+    const variable = sceneGraph.lookupVariable('filters', this);
+    if (!(variable instanceof AdHocFiltersVariable)) {
+      return;
+    }
+
+    const labels = this.state.frame.fields[1]?.labels ?? {};
+    if (Object.keys(labels).length !== 1) {
+      return;
+    }
+
+    const labelName = Object.keys(labels)[0];
+    reportExploreMetrics('label_filter_changed', { label: labelName, action: 'added', cause: 'breakdown' });
+    const trail = getTrailFor(this);
+    const filter = {
+      key: labelName,
+      operator: '=',
+      value: labels[labelName],
+    };
+    trail.addFilterWithoutReportingInteraction(filter);
+  };
+
+  public static Component = ({ model }: SceneComponentProps<AddToFiltersGraphAction>) => {
+    const state = model.useState();
+    const labels = state.frame.fields[1]?.labels || {};
+
+    const canAddToFilters = Object.keys(labels).length !== 0;
+
+    if (!canAddToFilters) {
+      return null;
+    }
+
+    return (
+      <Button variant="secondary" size="sm" fill="solid" onClick={model.onClick}>
+        Add to filters
+      </Button>
+    );
+  };
+}
diff --git a/public/app/features/trails/ActionTabs/BreakdownScene.tsx b/public/app/features/trails/ActionTabs/BreakdownScene.tsx
new file mode 100644
index 0000000000000..fddae99bb7986
--- /dev/null
+++ b/public/app/features/trails/ActionTabs/BreakdownScene.tsx
@@ -0,0 +1,458 @@
+import { css } from '@emotion/css';
+import { min, max, isNumber, throttle } from 'lodash';
+import React from 'react';
+
+import { DataFrame, FieldType, GrafanaTheme2, PanelData, SelectableValue } from '@grafana/data';
+import {
+  PanelBuilders,
+  QueryVariable,
+  SceneComponentProps,
+  SceneCSSGridItem,
+  SceneCSSGridLayout,
+  SceneDataNode,
+  SceneFlexItem,
+  SceneFlexItemLike,
+  SceneFlexLayout,
+  sceneGraph,
+  SceneObject,
+  SceneObjectBase,
+  SceneObjectState,
+  SceneQueryRunner,
+  VariableDependencyConfig,
+  VizPanel,
+} from '@grafana/scenes';
+import { Button, Field, useStyles2 } from '@grafana/ui';
+import { ALL_VARIABLE_VALUE } from 'app/features/variables/constants';
+
+import { getAutoQueriesForMetric } from '../AutomaticMetricQueries/AutoQueryEngine';
+import { AutoQueryDef } from '../AutomaticMetricQueries/types';
+import { BreakdownLabelSelector } from '../BreakdownLabelSelector';
+import { MetricScene } from '../MetricScene';
+import { StatusWrapper } from '../StatusWrapper';
+import { reportExploreMetrics } from '../interactions';
+import { trailDS, VAR_FILTERS, VAR_GROUP_BY, VAR_GROUP_BY_EXP } from '../shared';
+import { getColorByIndex, getTrailFor } from '../utils';
+
+import { AddToFiltersGraphAction } from './AddToFiltersGraphAction';
+import { ByFrameRepeater } from './ByFrameRepeater';
+import { LayoutSwitcher } from './LayoutSwitcher';
+import { breakdownPanelOptions } from './panelConfigs';
+import { getLabelOptions } from './utils';
+import { BreakdownAxisChangeEvent, yAxisSyncBehavior } from './yAxisSyncBehavior';
+
+const MAX_PANELS_IN_ALL_LABELS_BREAKDOWN = 60;
+
+export interface BreakdownSceneState extends SceneObjectState {
+  body?: SceneObject;
+  labels: Array<SelectableValue<string>>;
+  value?: string;
+  loading?: boolean;
+  error?: string;
+  blockingMessage?: string;
+}
+
+export class BreakdownScene extends SceneObjectBase<BreakdownSceneState> {
+  protected _variableDependency = new VariableDependencyConfig(this, {
+    variableNames: [VAR_FILTERS],
+    onReferencedVariableValueChanged: this.onReferencedVariableValueChanged.bind(this),
+  });
+
+  constructor(state: Partial<BreakdownSceneState>) {
+    super({
+      labels: state.labels ?? [],
+      ...state,
+    });
+
+    this.addActivationHandler(this._onActivate.bind(this));
+  }
+
+  private _query?: AutoQueryDef;
+
+  private _onActivate() {
+    const variable = this.getVariable();
+
+    variable.subscribeToState((newState, oldState) => {
+      if (
+        newState.options !== oldState.options ||
+        newState.value !== oldState.value ||
+        newState.loading !== oldState.loading
+      ) {
+        this.updateBody(variable);
+      }
+    });
+
+    const metricScene = sceneGraph.getAncestor(this, MetricScene);
+    const metric = metricScene.state.metric;
+    this._query = getAutoQueriesForMetric(metric).breakdown;
+
+    // The following state changes (and conditions) will each result in a call to `clearBreakdownPanelAxisValues`.
+    // By clearing the axis, subsequent calls to `reportBreakdownPanelData` will adjust to an updated axis range.
+    // These state changes coincide with the panels having their data updated, making a call to `reportBreakdownPanelData`.
+    // If the axis was not cleared by `clearBreakdownPanelAxisValues` any calls to `reportBreakdownPanelData` which result
+    // in the same axis will result in no updates to the panels.
+
+    const trail = getTrailFor(this);
+    trail.state.$timeRange?.subscribeToState(() => {
+      // The change in time range will cause a refresh of panel values.
+      this.clearBreakdownPanelAxisValues();
+    });
+
+    metricScene.subscribeToState(({ layout }, old) => {
+      if (layout !== old.layout) {
+        // Change in layout will set up a different set of panel objects that haven't received the current yaxis range
+        this.clearBreakdownPanelAxisValues();
+      }
+    });
+
+    this.updateBody(variable);
+  }
+
+  private breakdownPanelMaxValue: number | undefined;
+  private breakdownPanelMinValue: number | undefined;
+  public reportBreakdownPanelData(data: PanelData | undefined) {
+    if (!data) {
+      return;
+    }
+
+    let newMin = this.breakdownPanelMinValue;
+    let newMax = this.breakdownPanelMaxValue;
+
+    data.series.forEach((dataFrame) => {
+      dataFrame.fields.forEach((breakdownData) => {
+        if (breakdownData.type !== FieldType.number) {
+          return;
+        }
+        const values = breakdownData.values.filter(isNumber);
+
+        const maxValue = max(values);
+        const minValue = min(values);
+
+        newMax = max([newMax, maxValue].filter(isNumber));
+        newMin = min([newMin, minValue].filter(isNumber));
+      });
+    });
+
+    if (newMax === undefined || newMin === undefined || !Number.isFinite(newMax + newMin)) {
+      return;
+    }
+
+    if (this.breakdownPanelMaxValue === newMax && this.breakdownPanelMinValue === newMin) {
+      return;
+    }
+
+    this.breakdownPanelMaxValue = newMax;
+    this.breakdownPanelMinValue = newMin;
+
+    this._triggerAxisChangedEvent();
+  }
+
+  private _triggerAxisChangedEvent = throttle(() => {
+    const { breakdownPanelMinValue, breakdownPanelMaxValue } = this;
+    if (breakdownPanelMinValue !== undefined && breakdownPanelMaxValue !== undefined) {
+      this.publishEvent(new BreakdownAxisChangeEvent({ min: breakdownPanelMinValue, max: breakdownPanelMaxValue }));
+    }
+  }, 1000);
+
+  private clearBreakdownPanelAxisValues() {
+    this.breakdownPanelMaxValue = undefined;
+    this.breakdownPanelMinValue = undefined;
+  }
+
+  private getVariable(): QueryVariable {
+    const variable = sceneGraph.lookupVariable(VAR_GROUP_BY, this)!;
+    if (!(variable instanceof QueryVariable)) {
+      throw new Error('Group by variable not found');
+    }
+
+    return variable;
+  }
+
+  private onReferencedVariableValueChanged() {
+    const variable = this.getVariable();
+    variable.changeValueTo(ALL_VARIABLE_VALUE);
+    this.updateBody(variable);
+  }
+
+  private updateBody(variable: QueryVariable) {
+    const options = getLabelOptions(this, variable);
+
+    const stateUpdate: Partial<BreakdownSceneState> = {
+      loading: variable.state.loading,
+      value: String(variable.state.value),
+      labels: options,
+      error: variable.state.error,
+      blockingMessage: undefined,
+    };
+
+    if (!variable.state.loading && variable.state.options.length) {
+      stateUpdate.body = variable.hasAllValue()
+        ? buildAllLayout(options, this._query!)
+        : buildNormalLayout(this._query!);
+    } else if (!variable.state.loading) {
+      stateUpdate.body = undefined;
+      stateUpdate.blockingMessage = 'Unable to retrieve label options for currently selected metric.';
+    }
+
+    this.clearBreakdownPanelAxisValues();
+    // Setting the new panels will gradually end up calling reportBreakdownPanelData to update the new min & max
+    this.setState(stateUpdate);
+  }
+
+  public onChange = (value?: string) => {
+    if (!value) {
+      return;
+    }
+
+    reportExploreMetrics('label_selected', { label: value, cause: 'selector' });
+    const variable = this.getVariable();
+
+    variable.changeValueTo(value);
+  };
+
+  public static Component = ({ model }: SceneComponentProps<BreakdownScene>) => {
+    const { labels, body, loading, value, blockingMessage } = model.useState();
+    const styles = useStyles2(getStyles);
+
+    return (
+      <div className={styles.container}>
+        <StatusWrapper {...{ isLoading: loading, blockingMessage }}>
+          <div className={styles.controls}>
+            {!loading && labels.length && (
+              <div className={styles.controlsLeft}>
+                <Field label="By label">
+                  <BreakdownLabelSelector options={labels} value={value} onChange={model.onChange} />
+                </Field>
+              </div>
+            )}
+            {body instanceof LayoutSwitcher && (
+              <div className={styles.controlsRight}>
+                <body.Selector model={body} />
+              </div>
+            )}
+          </div>
+          <div className={styles.content}>{body && <body.Component model={body} />}</div>
+        </StatusWrapper>
+      </div>
+    );
+  };
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    container: css({
+      flexGrow: 1,
+      display: 'flex',
+      minHeight: '100%',
+      flexDirection: 'column',
+    }),
+    content: css({
+      flexGrow: 1,
+      display: 'flex',
+      paddingTop: theme.spacing(0),
+    }),
+    controls: css({
+      flexGrow: 0,
+      display: 'flex',
+      alignItems: 'top',
+      gap: theme.spacing(2),
+    }),
+    controlsRight: css({
+      flexGrow: 0,
+      display: 'flex',
+      justifyContent: 'flex-end',
+    }),
+    controlsLeft: css({
+      display: 'flex',
+      justifyContent: 'flex-left',
+      justifyItems: 'left',
+      width: '100%',
+      flexDirection: 'column',
+    }),
+  };
+}
+
+export function buildAllLayout(options: Array<SelectableValue<string>>, queryDef: AutoQueryDef) {
+  const children: SceneFlexItemLike[] = [];
+
+  for (const option of options) {
+    if (option.value === ALL_VARIABLE_VALUE) {
+      continue;
+    }
+
+    if (children.length === MAX_PANELS_IN_ALL_LABELS_BREAKDOWN) {
+      break;
+    }
+
+    const expr = queryDef.queries[0].expr.replaceAll(VAR_GROUP_BY_EXP, String(option.value));
+    const unit = queryDef.unit;
+
+    const vizPanel = PanelBuilders.timeseries()
+      .setTitle(option.label!)
+      .setData(
+        new SceneQueryRunner({
+          maxDataPoints: 250,
+          datasource: trailDS,
+          queries: [
+            {
+              refId: 'A',
+              expr: expr,
+              legendFormat: `{{${option.label}}}`,
+            },
+          ],
+        })
+      )
+      .setHeaderActions(new SelectLabelAction({ labelName: String(option.value) }))
+      .setUnit(unit)
+      .build();
+
+    vizPanel.addActivationHandler(() => {
+      vizPanel.onOptionsChange(breakdownPanelOptions);
+    });
+
+    children.push(
+      new SceneCSSGridItem({
+        $behaviors: [yAxisSyncBehavior],
+        body: vizPanel,
+      })
+    );
+  }
+  return new LayoutSwitcher({
+    options: [
+      { value: 'grid', label: 'Grid' },
+      { value: 'rows', label: 'Rows' },
+    ],
+    layouts: [
+      new SceneCSSGridLayout({
+        templateColumns: GRID_TEMPLATE_COLUMNS,
+        autoRows: '200px',
+        children: children,
+        isLazy: true,
+      }),
+      new SceneCSSGridLayout({
+        templateColumns: '1fr',
+        autoRows: '200px',
+        // Clone children since a scene object can only have one parent at a time
+        children: children.map((c) => c.clone()),
+        isLazy: true,
+      }),
+    ],
+  });
+}
+
+const GRID_TEMPLATE_COLUMNS = 'repeat(auto-fit, minmax(400px, 1fr))';
+
+function buildNormalLayout(queryDef: AutoQueryDef) {
+  const unit = queryDef.unit;
+
+  function getLayoutChild(data: PanelData, frame: DataFrame, frameIndex: number): SceneFlexItem {
+    const vizPanel: VizPanel = queryDef
+      .vizBuilder()
+      .setTitle(getLabelValue(frame))
+      .setData(new SceneDataNode({ data: { ...data, series: [frame] } }))
+      .setColor({ mode: 'fixed', fixedColor: getColorByIndex(frameIndex) })
+      .setHeaderActions(new AddToFiltersGraphAction({ frame }))
+      .setUnit(unit)
+      .build();
+
+    // Find a frame that has at more than one point.
+    const isHidden = frame.length <= 1;
+
+    const item: SceneCSSGridItem = new SceneCSSGridItem({
+      $behaviors: [yAxisSyncBehavior],
+      body: vizPanel,
+      isHidden,
+    });
+
+    vizPanel.addActivationHandler(() => {
+      vizPanel.onOptionsChange(breakdownPanelOptions);
+    });
+
+    return item;
+  }
+
+  return new LayoutSwitcher({
+    $data: new SceneQueryRunner({
+      datasource: trailDS,
+      maxDataPoints: 300,
+      queries: queryDef.queries,
+    }),
+    options: [
+      { value: 'single', label: 'Single' },
+      { value: 'grid', label: 'Grid' },
+      { value: 'rows', label: 'Rows' },
+    ],
+    layouts: [
+      new SceneFlexLayout({
+        direction: 'column',
+        children: [
+          new SceneFlexItem({
+            minHeight: 300,
+            body: PanelBuilders.timeseries().setTitle('$metric').build(),
+          }),
+        ],
+      }),
+      new ByFrameRepeater({
+        body: new SceneCSSGridLayout({
+          templateColumns: GRID_TEMPLATE_COLUMNS,
+          autoRows: '200px',
+          children: [],
+        }),
+        getLayoutChild,
+      }),
+      new ByFrameRepeater({
+        body: new SceneCSSGridLayout({
+          templateColumns: '1fr',
+          autoRows: '200px',
+          children: [],
+        }),
+        getLayoutChild,
+      }),
+    ],
+  });
+}
+
+function getLabelValue(frame: DataFrame) {
+  const labels = frame.fields[1]?.labels || {};
+
+  const keys = Object.keys(labels);
+  if (keys.length === 0) {
+    return '<unspecified>';
+  }
+
+  return labels[keys[0]];
+}
+
+export function buildBreakdownActionScene() {
+  return new BreakdownScene({});
+}
+
+interface SelectLabelActionState extends SceneObjectState {
+  labelName: string;
+}
+export class SelectLabelAction extends SceneObjectBase<SelectLabelActionState> {
+  public onClick = () => {
+    const label = this.state.labelName;
+    reportExploreMetrics('label_selected', { label, cause: 'breakdown_panel' });
+    getBreakdownSceneFor(this).onChange(label);
+  };
+
+  public static Component = ({ model }: SceneComponentProps<AddToFiltersGraphAction>) => {
+    return (
+      <Button variant="secondary" size="sm" fill="solid" onClick={model.onClick}>
+        Select
+      </Button>
+    );
+  };
+}
+
+function getBreakdownSceneFor(model: SceneObject): BreakdownScene {
+  if (model instanceof BreakdownScene) {
+    return model;
+  }
+
+  if (model.parent) {
+    return getBreakdownSceneFor(model.parent);
+  }
+
+  throw new Error('Unable to find breakdown scene');
+}
diff --git a/public/app/features/trails/ActionTabs/ByFrameRepeater.tsx b/public/app/features/trails/ActionTabs/ByFrameRepeater.tsx
new file mode 100644
index 0000000000000..34b1f13b02c25
--- /dev/null
+++ b/public/app/features/trails/ActionTabs/ByFrameRepeater.tsx
@@ -0,0 +1,94 @@
+import React from 'react';
+
+import { LoadingState, PanelData, DataFrame } from '@grafana/data';
+import {
+  SceneObjectState,
+  SceneFlexItem,
+  SceneObjectBase,
+  sceneGraph,
+  SceneComponentProps,
+  SceneLayout,
+  SceneDataNode,
+} from '@grafana/scenes';
+
+import { StatusWrapper } from '../StatusWrapper';
+
+import { findSceneObjectsByType } from './utils';
+
+interface ByFrameRepeaterState extends SceneObjectState {
+  body: SceneLayout;
+  getLayoutChild(data: PanelData, frame: DataFrame, frameIndex: number): SceneFlexItem;
+}
+
+export class ByFrameRepeater extends SceneObjectBase<ByFrameRepeaterState> {
+  public constructor(state: ByFrameRepeaterState) {
+    super(state);
+
+    this.addActivationHandler(() => {
+      const data = sceneGraph.getData(this);
+
+      this._subs.add(
+        data.subscribeToState((newState, oldState) => {
+          if (newState.data === undefined) {
+            return;
+          }
+
+          const newData = newState.data;
+
+          if (newState.data !== undefined && newState.data?.state !== oldState.data?.state) {
+            findSceneObjectsByType(this, SceneDataNode).forEach((dataNode) => {
+              dataNode.setState({ data: { ...dataNode.state.data, state: newData.state } });
+            });
+          }
+          if (newData.state === LoadingState.Done) {
+            this.performRepeat(newData);
+          }
+        })
+      );
+
+      if (data.state.data) {
+        this.performRepeat(data.state.data);
+      }
+    });
+  }
+
+  private performRepeat(data: PanelData) {
+    const newChildren: SceneFlexItem[] = [];
+
+    for (let seriesIndex = 0; seriesIndex < data.series.length; seriesIndex++) {
+      const frame = data.series[seriesIndex];
+      if (frame.length <= 1) {
+        // If the data doesn't have at least two points, we skip it.
+        continue;
+      }
+      const layoutChild = this.state.getLayoutChild(data, frame, seriesIndex);
+      newChildren.push(layoutChild);
+    }
+
+    this.state.body.setState({ children: newChildren });
+    this.setState({ body: this.state.body });
+  }
+
+  public static Component = ({ model }: SceneComponentProps<ByFrameRepeater>) => {
+    const { body } = model.useState();
+    const { children } = body.useState();
+
+    const data = sceneGraph.getData(model);
+    const sceneDataState = data.useState();
+
+    const panelData = sceneDataState?.data;
+
+    const isLoading = panelData?.state === 'Loading' && children.length === 0;
+    const error = panelData?.state === LoadingState.Error ? 'Failed to load data.' : undefined;
+    const blockingMessage =
+      !isLoading && children.length === 0 && !error
+        ? 'There is no data available. Try adjusting your filters, time range, or selecting a different label.'
+        : undefined;
+
+    return (
+      <StatusWrapper {...{ blockingMessage, error, isLoading }}>
+        <body.Component model={body} />
+      </StatusWrapper>
+    );
+  };
+}
diff --git a/public/app/features/trails/ActionTabs/LayoutSwitcher.tsx b/public/app/features/trails/ActionTabs/LayoutSwitcher.tsx
new file mode 100644
index 0000000000000..3bf7bafa9f1f5
--- /dev/null
+++ b/public/app/features/trails/ActionTabs/LayoutSwitcher.tsx
@@ -0,0 +1,59 @@
+import React from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { SceneComponentProps, sceneGraph, SceneObject, SceneObjectBase, SceneObjectState } from '@grafana/scenes';
+import { Field, RadioButtonGroup } from '@grafana/ui';
+
+import { MetricScene } from '../MetricScene';
+import { reportExploreMetrics } from '../interactions';
+
+import { LayoutType } from './types';
+
+export interface LayoutSwitcherState extends SceneObjectState {
+  layouts: SceneObject[];
+  options: Array<SelectableValue<LayoutType>>;
+}
+
+export class LayoutSwitcher extends SceneObjectBase<LayoutSwitcherState> {
+  private getMetricScene() {
+    return sceneGraph.getAncestor(this, MetricScene);
+  }
+
+  public Selector({ model }: { model: LayoutSwitcher }) {
+    const { options } = model.useState();
+    const activeLayout = model.useActiveLayout();
+
+    return (
+      <Field label="View">
+        <RadioButtonGroup options={options} value={activeLayout} onChange={model.onLayoutChange} />
+      </Field>
+    );
+  }
+
+  private useActiveLayout() {
+    const { options } = this.useState();
+    const { layout } = this.getMetricScene().useState();
+
+    const activeLayout = options.map((option) => option.value).includes(layout) ? layout : options[0].value;
+    return activeLayout;
+  }
+
+  public onLayoutChange = (layout: LayoutType) => {
+    reportExploreMetrics('breakdown_layout_changed', { layout });
+    this.getMetricScene().setState({ layout });
+  };
+
+  public static Component = ({ model }: SceneComponentProps<LayoutSwitcher>) => {
+    const { layouts, options } = model.useState();
+    const activeLayout = model.useActiveLayout();
+
+    const index = options.findIndex((o) => o.value === activeLayout);
+    if (index === -1) {
+      return null;
+    }
+
+    const layout = layouts[index];
+
+    return <layout.Component model={layout} />;
+  };
+}
diff --git a/public/app/features/trails/ActionTabs/LogsScene.tsx b/public/app/features/trails/ActionTabs/LogsScene.tsx
new file mode 100644
index 0000000000000..d223cca222298
--- /dev/null
+++ b/public/app/features/trails/ActionTabs/LogsScene.tsx
@@ -0,0 +1,95 @@
+import React from 'react';
+
+import {
+  DataSourceVariable,
+  PanelBuilders,
+  SceneComponentProps,
+  SceneFlexItem,
+  SceneFlexLayout,
+  SceneObject,
+  SceneObjectBase,
+  SceneObjectState,
+  SceneQueryRunner,
+  SceneVariableSet,
+  VariableValueSelectors,
+} from '@grafana/scenes';
+import { Stack } from '@grafana/ui';
+
+import { SelectMetricAction } from '../SelectMetricAction';
+import { LOGS_METRIC, VAR_LOGS_DATASOURCE, VAR_LOGS_DATASOURCE_EXPR } from '../shared';
+
+interface LogsSceneState extends SceneObjectState {
+  initialDS?: string;
+  controls: SceneObject[];
+  body: SceneFlexLayout;
+}
+
+export class LogsScene extends SceneObjectBase<LogsSceneState> {
+  public constructor(state: Partial<LogsSceneState>) {
+    const logsQuery = new SceneQueryRunner({
+      datasource: { uid: VAR_LOGS_DATASOURCE_EXPR },
+      queries: [
+        {
+          refId: 'A',
+          expr: '{${filters}} | logfmt',
+        },
+      ],
+    });
+
+    super({
+      $variables: state.$variables ?? getVariableSet(state.initialDS),
+      controls: state.controls ?? [new VariableValueSelectors({ layout: 'vertical' })],
+      body:
+        state.body ??
+        new SceneFlexLayout({
+          direction: 'column',
+          children: [
+            new SceneFlexItem({
+              body: PanelBuilders.logs()
+                .setTitle('Logs')
+                .setData(logsQuery)
+                .setHeaderActions(new SelectMetricAction({ metric: LOGS_METRIC, title: 'Open' }))
+                .build(),
+            }),
+          ],
+        }),
+      ...state,
+    });
+  }
+
+  static Component = ({ model }: SceneComponentProps<LogsScene>) => {
+    const { controls, body } = model.useState();
+
+    return (
+      <Stack gap={1} direction={'column'} grow={1}>
+        {controls && (
+          <Stack gap={1}>
+            {controls.map((control) => (
+              <control.Component key={control.state.key} model={control} />
+            ))}
+          </Stack>
+        )}
+        <body.Component model={body} />
+      </Stack>
+    );
+  };
+}
+
+function getVariableSet(initialDS?: string) {
+  return new SceneVariableSet({
+    variables: [
+      new DataSourceVariable({
+        name: VAR_LOGS_DATASOURCE,
+        label: 'Logs data source',
+        value: initialDS,
+        pluginId: 'loki',
+      }),
+    ],
+  });
+}
+
+export function buildLogsScene() {
+  return new SceneFlexItem({
+    body: new LogsScene({}),
+  });
+}
diff --git a/public/app/features/trails/ActionTabs/MetricOverviewScene.tsx b/public/app/features/trails/ActionTabs/MetricOverviewScene.tsx
new file mode 100644
index 0000000000000..976d92c1f0646
--- /dev/null
+++ b/public/app/features/trails/ActionTabs/MetricOverviewScene.tsx
@@ -0,0 +1,126 @@
+import React from 'react';
+
+import {
+  QueryVariable,
+  SceneComponentProps,
+  sceneGraph,
+  SceneObjectBase,
+  SceneObjectState,
+  VariableDependencyConfig,
+} from '@grafana/scenes';
+import { Stack, Text, TextLink } from '@grafana/ui';
+
+import { PromMetricsMetadataItem } from '../../../plugins/datasource/prometheus/types';
+import { ALL_VARIABLE_VALUE } from '../../variables/constants';
+import { MetricScene } from '../MetricScene';
+import { StatusWrapper } from '../StatusWrapper';
+import { reportExploreMetrics } from '../interactions';
+import { VAR_DATASOURCE_EXPR, VAR_GROUP_BY } from '../shared';
+import { getMetricSceneFor, getTrailFor } from '../utils';
+
+import { getLabelOptions } from './utils';
+
+export interface MetricOverviewSceneState extends SceneObjectState {
+  metadata?: PromMetricsMetadataItem;
+  metadataLoading?: boolean;
+}
+
+export class MetricOverviewScene extends SceneObjectBase<MetricOverviewSceneState> {
+  protected _variableDependency = new VariableDependencyConfig(this, {
+    variableNames: [VAR_DATASOURCE_EXPR],
+    onReferencedVariableValueChanged: this.onReferencedVariableValueChanged.bind(this),
+  });
+
+  constructor(state: Partial<MetricOverviewSceneState>) {
+    super({
+      ...state,
+    });
+
+    this.addActivationHandler(this._onActivate.bind(this));
+  }
+
+  private getVariable(): QueryVariable {
+    const variable = sceneGraph.lookupVariable(VAR_GROUP_BY, this)!;
+    if (!(variable instanceof QueryVariable)) {
+      throw new Error('Group by variable not found');
+    }
+
+    return variable;
+  }
+
+  private _onActivate() {
+    this.updateMetadata();
+  }
+
+  private onReferencedVariableValueChanged() {
+    this.updateMetadata();
+  }
+
+  private async updateMetadata() {
+    this.setState({ metadataLoading: true, metadata: undefined });
+    const metricScene = getMetricSceneFor(this);
+    const metric = metricScene.state.metric;
+
+    const trail = getTrailFor(this);
+    const metadata = await trail.getMetricMetadata(metric);
+    this.setState({ metadata, metadataLoading: false });
+  }
+
+  public static Component = ({ model }: SceneComponentProps<MetricOverviewScene>) => {
+    const { metadata, metadataLoading } = model.useState();
+    const variable = model.getVariable();
+    const { loading: labelsLoading } = variable.useState();
+    const labelOptions = getLabelOptions(model, variable).filter((l) => l.value !== ALL_VARIABLE_VALUE);
+
+    return (
+      <StatusWrapper isLoading={labelsLoading || metadataLoading}>
+        <Stack gap={6}>
+          <>
+            <Stack direction="column" gap={0.5}>
+              <Text weight={'medium'}>Description</Text>
+              <div style={{ maxWidth: 360 }}>
+                {metadata?.help ? <div>{metadata?.help}</div> : <i>No description available</i>}
+              </div>
+            </Stack>
+            <Stack direction="column" gap={0.5}>
+              <Text weight={'medium'}>Type</Text>
+              {metadata?.type ? <div>{metadata?.type}</div> : <i>Unknown</i>}
+            </Stack>
+            <Stack direction="column" gap={0.5}>
+              <Text weight={'medium'}>Unit</Text>
+              {metadata?.unit ? <div>{metadata?.unit}</div> : <i>Unknown</i>}
+            </Stack>
+            <Stack direction="column" gap={0.5}>
+              <Text weight={'medium'}>Labels</Text>
+              {labelOptions.length === 0 && 'Unable to fetch labels.'}
+              {labelOptions.map((l) => (
+                <TextLink
+                  key={l.label}
+                  href={`#View breakdown for ${l.label}`}
+                  title={`View breakdown for ${l.label}`}
+                  onClick={(event) => {
+                    event.preventDefault();
+                    event.stopPropagation();
+                    sceneGraph.getAncestor(model, MetricScene).setActionView('breakdown');
+                    const groupByVar = sceneGraph.lookupVariable(VAR_GROUP_BY, model);
+                    if (groupByVar instanceof QueryVariable && l.label != null) {
+                      reportExploreMetrics('label_selected', { label: l.label, cause: 'overview_link' });
+                      groupByVar.setState({ value: l.value });
+                    }
+                    return false;
+                  }}
+                >
+                  {l.label!}
+                </TextLink>
+              ))}
+            </Stack>
+          </>
+        </Stack>
+      </StatusWrapper>
+    );
+  };
+}
+
+export function buildMetricOverviewScene() {
+  return new MetricOverviewScene({});
+}
diff --git a/public/app/features/trails/ActionTabs/RelatedMetricsScene.tsx b/public/app/features/trails/ActionTabs/RelatedMetricsScene.tsx
new file mode 100644
index 0000000000000..42c00db75f9b6
--- /dev/null
+++ b/public/app/features/trails/ActionTabs/RelatedMetricsScene.tsx
@@ -0,0 +1,5 @@
+import { MetricSelectScene } from '../MetricSelectScene';
+
+export function buildRelatedMetricsScene() {
+  return new MetricSelectScene({});
+}
diff --git a/public/app/features/trails/ActionTabs/panelConfigs.ts b/public/app/features/trails/ActionTabs/panelConfigs.ts
new file mode 100644
index 0000000000000..23d796fdf8e46
--- /dev/null
+++ b/public/app/features/trails/ActionTabs/panelConfigs.ts
@@ -0,0 +1,8 @@
+import { PanelOptionsBuilders } from '@grafana/scenes';
+import { SortOrder } from '@grafana/schema/dist/esm/index';
+import { TooltipDisplayMode } from '@grafana/ui';
+
+export const breakdownPanelOptions = PanelOptionsBuilders.timeseries()
+  .setOption('tooltip', { mode: TooltipDisplayMode.Multi, sort: SortOrder.Descending })
+  .setOption('legend', { showLegend: false })
+  .build();
diff --git a/public/app/features/trails/ActionTabs/types.ts b/public/app/features/trails/ActionTabs/types.ts
new file mode 100644
index 0000000000000..37a6333e91a75
--- /dev/null
+++ b/public/app/features/trails/ActionTabs/types.ts
@@ -0,0 +1 @@
+export type LayoutType = 'single' | 'grid' | 'rows';
diff --git a/public/app/features/trails/ActionTabs/utils.ts b/public/app/features/trails/ActionTabs/utils.ts
new file mode 100644
index 0000000000000..9926c88e425c2
--- /dev/null
+++ b/public/app/features/trails/ActionTabs/utils.ts
@@ -0,0 +1,52 @@
+import { SelectableValue } from '@grafana/data';
+import { AdHocFiltersVariable, QueryVariable, sceneGraph, SceneObject } from '@grafana/scenes';
+
+import { VAR_FILTERS } from '../shared';
+
+export function getLabelOptions(scenObject: SceneObject, variable: QueryVariable) {
+  const labelFilters = sceneGraph.lookupVariable(VAR_FILTERS, scenObject);
+  const labelOptions: Array<SelectableValue<string>> = [];
+
+  if (!(labelFilters instanceof AdHocFiltersVariable)) {
+    return [];
+  }
+
+  const filters = labelFilters.state.filters;
+
+  for (const option of variable.getOptionsForSelect()) {
+    const filterExists = filters.find((f) => f.key === option.value);
+
+    if (option.label === 'le') {
+      // Do not show the "le" label
+      continue;
+    }
+    if (filterExists) {
+      continue;
+    }
+    labelOptions.push({ label: option.label, value: String(option.value) });
+  }
+
+  return labelOptions;
+}
+
+interface Type<T> extends Function {
+  new (...args: any[]): T;
+}
+export function findSceneObjectByType<T extends SceneObject>(scene: SceneObject, sceneType: Type<T>) {
+  const targetScene = sceneGraph.findObject(scene, (obj) => obj instanceof sceneType);
+
+  if (targetScene instanceof sceneType) {
+    return targetScene;
+  }
+
+  return null;
+}
+
+export function findSceneObjectsByType<T extends SceneObject>(scene: SceneObject, sceneType: Type<T>) {
+  function isSceneType(scene: SceneObject): scene is T {
+    return scene instanceof sceneType;
+  }
+
+  const targetScenes = sceneGraph.findAllObjects(scene, isSceneType);
+  return targetScenes.filter(isSceneType);
+}
diff --git a/public/app/features/trails/ActionTabs/yAxisSyncBehavior.ts b/public/app/features/trails/ActionTabs/yAxisSyncBehavior.ts
new file mode 100644
index 0000000000000..f42baf2e68d6a
--- /dev/null
+++ b/public/app/features/trails/ActionTabs/yAxisSyncBehavior.ts
@@ -0,0 +1,83 @@
+import { BusEventWithPayload } from '@grafana/data';
+import {
+  FieldConfigBuilders,
+  SceneCSSGridItem,
+  SceneDataProvider,
+  SceneStatelessBehavior,
+  VizPanel,
+  sceneGraph,
+} from '@grafana/scenes';
+
+import { BreakdownScene } from './BreakdownScene';
+import { findSceneObjectsByType } from './utils';
+
+export class BreakdownAxisChangeEvent extends BusEventWithPayload<{ min: number; max: number }> {
+  public static type = 'selected-metric-query-results-event';
+}
+
+export const yAxisSyncBehavior: SceneStatelessBehavior = (sceneObject: SceneCSSGridItem) => {
+  const breakdownScene = sceneGraph.getAncestor(sceneObject, BreakdownScene);
+
+  // Handle query runners from vizPanels that haven't been activated yet
+  findSceneObjectsByType(sceneObject, VizPanel).forEach((vizPanel) => {
+    if (vizPanel.isActive) {
+      registerDataProvider(vizPanel.state.$data);
+    } else {
+      vizPanel.addActivationHandler(() => {
+        registerDataProvider(vizPanel.state.$data);
+      });
+    }
+  });
+
+  // Register the data providers of all present vizpanels
+  findSceneObjectsByType(sceneObject, VizPanel).forEach((vizPanel) => registerDataProvider(vizPanel.state.$data));
+
+  function registerDataProvider(dataProvider?: SceneDataProvider) {
+    if (!dataProvider) {
+      return;
+    }
+
+    if (!dataProvider.isActive) {
+      dataProvider.addActivationHandler(() => {
+        // Call this function again when the dataprovider is activated
+        registerDataProvider(dataProvider);
+      });
+    }
+
+    // Report the panel data if it is already populated
+    if (dataProvider.state.data) {
+      breakdownScene.reportBreakdownPanelData(dataProvider.state.data);
+    }
+
+    // Report the panel data whenever it is updated
+    dataProvider.subscribeToState(({ data }, _) => {
+      breakdownScene.reportBreakdownPanelData(data);
+    });
+  }
+
+  const axisChangeSubscription = breakdownScene.subscribeToEvent(BreakdownAxisChangeEvent, (event) => {
+    if (!sceneObject.isActive) {
+      axisChangeSubscription.unsubscribe();
+      return;
+    }
+
+    const fieldConfig = FieldConfigBuilders.timeseries()
+      .setCustomFieldConfig('axisSoftMin', event.payload.min)
+      .setCustomFieldConfig('axisSoftMax', event.payload.max)
+      .build();
+
+    findSceneObjectsByType(sceneObject, VizPanel).forEach((vizPanel) => {
+      function update() {
+        vizPanel.onFieldConfigChange(fieldConfig);
+      }
+
+      if (vizPanel.isActive) {
+        // Update axis for panels that are already active
+        update();
+      } else {
+        // Update inactive panels once they become active.
+        vizPanel.addActivationHandler(update);
+      }
+    });
+  });
+};
diff --git a/public/app/features/trails/AutomaticMetricQueries/AutoQueryEngine.test.ts b/public/app/features/trails/AutomaticMetricQueries/AutoQueryEngine.test.ts
new file mode 100644
index 0000000000000..b8176b51c37a0
--- /dev/null
+++ b/public/app/features/trails/AutomaticMetricQueries/AutoQueryEngine.test.ts
@@ -0,0 +1,355 @@
+import { getAutoQueriesForMetric } from './AutoQueryEngine';
+
+function expandExpr(shortenedExpr: string) {
+  return shortenedExpr.replace('...', '${metric}{${filters}}');
+}
+
+describe('getAutoQueriesForMetric', () => {
+  describe('for the summary/histogram types', () => {
+    const etc = '{${filters}}[$__rate_interval]';
+    const byGroup = 'by(${groupby})';
+
+    describe('metrics with _sum suffix', () => {
+      const result = getAutoQueriesForMetric('SUM_OR_HIST_sum');
+
+      test('main query is the mean', () => {
+        const [{ expr }] = result.main.queries;
+        const mean = `sum(rate(SUM_OR_HIST_sum${etc}))/sum(rate(SUM_OR_HIST_count${etc}))`;
+        expect(expr).toBe(mean);
+      });
+
+      test('preview query is the mean', () => {
+        const [{ expr }] = result.preview.queries;
+        const mean = `sum(rate(SUM_OR_HIST_sum${etc}))/sum(rate(SUM_OR_HIST_count${etc}))`;
+        expect(expr).toBe(mean);
+      });
+
+      test('breakdown query is the mean by group', () => {
+        const [{ expr }] = result.breakdown.queries;
+        const meanBreakdown = `sum(rate(SUM_OR_HIST_sum${etc}))${byGroup}/sum(rate(SUM_OR_HIST_count${etc}))${byGroup}`;
+        expect(expr).toBe(meanBreakdown);
+      });
+
+      test('there are no variants', () => {
+        expect(result.variants.length).toBe(0);
+      });
+    });
+
+    describe('metrics with _count suffix', () => {
+      const result = getAutoQueriesForMetric('SUM_OR_HIST_count');
+
+      test('main query is an overall rate', () => {
+        const [{ expr }] = result.main.queries;
+        const overallRate = `sum(rate(\${metric}${etc}))`;
+        expect(expr).toBe(overallRate);
+      });
+
+      test('preview query is an overall rate', () => {
+        const [{ expr }] = result.preview.queries;
+        const overallRate = `sum(rate(\${metric}${etc}))`;
+        expect(expr).toBe(overallRate);
+      });
+
+      test('breakdown query is an overall rate by group', () => {
+        const [{ expr }] = result.breakdown.queries;
+        const overallRateBreakdown = `sum(rate(\${metric}${etc}))${byGroup}`;
+        expect(expr).toBe(overallRateBreakdown);
+      });
+
+      test('there are no variants', () => {
+        expect(result.variants.length).toBe(0);
+      });
+    });
+
+    describe('metrics with _bucket suffix', () => {
+      const result = getAutoQueriesForMetric('HIST_bucket');
+
+      const percentileQueries = new Map<number, string>();
+      percentileQueries.set(99, expandExpr('histogram_quantile(0.99, sum by(le) (rate(...[$__rate_interval])))'));
+      percentileQueries.set(90, expandExpr('histogram_quantile(0.9, sum by(le) (rate(...[$__rate_interval])))'));
+      percentileQueries.set(50, expandExpr('histogram_quantile(0.5, sum by(le) (rate(...[$__rate_interval])))'));
+
+      test('there are 2 variants', () => {
+        expect(result.variants.length).toBe(2);
+      });
+
+      const percentilesVariant = result.variants.find((variant) => variant.variant === 'percentiles');
+      test('there is a percentiles variant', () => {
+        expect(percentilesVariant).not.toBeNull();
+      });
+
+      const heatmap = result.variants.find((variant) => variant.variant === 'heatmap');
+      test('there is a heatmap variant', () => {
+        expect(heatmap).not.toBeNull();
+      });
+
+      [99, 90, 50].forEach((percentile) => {
+        const percentileQuery = percentileQueries.get(percentile);
+        test(`main panel has ${percentile}th percentile query`, () => {
+          const found = result.main.queries.find((query) => query.expr === percentileQuery);
+          expect(found).not.toBeNull();
+        });
+      });
+
+      [99, 90, 50].forEach((percentile) => {
+        const percentileQuery = percentileQueries.get(percentile);
+        test(`percentiles variant panel has ${percentile}th percentile query`, () => {
+          const found = percentilesVariant?.queries.find((query) => query.expr === percentileQuery);
+          expect(found).not.toBeNull();
+        });
+      });
+
+      test('preview panel has 50th percentile query', () => {
+        const [{ expr }] = result.preview.queries;
+        expect(expr).toBe(percentileQueries.get(50));
+      });
+
+      const percentileGroupedQueries = new Map<number, string>();
+      percentileGroupedQueries.set(
+        99,
+        expandExpr('histogram_quantile(0.99, sum by(le, ${groupby}) (rate(...[$__rate_interval])))')
+      );
+      percentileGroupedQueries.set(
+        90,
+        expandExpr('histogram_quantile(0.9, sum by(le, ${groupby}) (rate(...[$__rate_interval])))')
+      );
+      percentileGroupedQueries.set(
+        50,
+        expandExpr('histogram_quantile(0.5, sum by(le, ${groupby}) (rate(...[$__rate_interval])))')
+      );
+
+      [99, 90, 50].forEach((percentile) => {
+        const percentileGroupedQuery = percentileGroupedQueries.get(percentile);
+        test(`breakdown panel has ${percentile}th query with \${groupby} appended`, () => {
+          const found = result.breakdown.queries.find((query) => query.expr === percentileGroupedQuery);
+          expect(found).not.toBeNull();
+        });
+      });
+    });
+  });
+  describe('Consider result.main query (only first)', () => {
+    it.each([
+      // no rate
+      ['PREFIX_general', 'avg(...)', 'short', 1],
+      ['PREFIX_bytes', 'avg(...)', 'bytes', 1],
+      ['PREFIX_seconds', 'avg(...)', 's', 1],
+      // rate with counts per second
+      ['PREFIX_count', 'sum(rate(...[$__rate_interval]))', 'cps', 1], // cps = counts per second
+      ['PREFIX_total', 'sum(rate(...[$__rate_interval]))', 'cps', 1],
+      ['PREFIX_seconds_count', 'sum(rate(...[$__rate_interval]))', 'cps', 1],
+      // rate with seconds per second
+      ['PREFIX_seconds_total', 'sum(rate(...[$__rate_interval]))', 'short', 1], // s/s
+      // rate with bytes per second
+      ['PREFIX_bytes_total', 'sum(rate(...[$__rate_interval]))', 'Bps', 1], // bytes/s
+      // mean with non-rated units
+      [
+        'PREFIX_seconds_sum',
+        'sum(rate(PREFIX_seconds_sum{${filters}}[$__rate_interval]))/sum(rate(PREFIX_seconds_count{${filters}}[$__rate_interval]))',
+        's',
+        1,
+      ],
+      [
+        'PREFIX_bytes_sum',
+        'sum(rate(PREFIX_bytes_sum{${filters}}[$__rate_interval]))/sum(rate(PREFIX_bytes_count{${filters}}[$__rate_interval]))',
+        'bytes',
+        1,
+      ],
+      // Bucket
+      ['PREFIX_bucket', 'histogram_quantile(0.99, sum by(le) (rate(...[$__rate_interval])))', 'short', 3],
+      ['PREFIX_seconds_bucket', 'histogram_quantile(0.99, sum by(le) (rate(...[$__rate_interval])))', 's', 3],
+      ['PREFIX_bytes_bucket', 'histogram_quantile(0.99, sum by(le) (rate(...[$__rate_interval])))', 'bytes', 3],
+    ])('Given metric %p expect %p with unit %p', (metric, expr, unit, queryCount) => {
+      const result = getAutoQueriesForMetric(metric);
+
+      const queryDef = result.main;
+
+      const expected = { expr: expandExpr(expr), unit, queryCount };
+      const actual = { expr: queryDef.queries[0].expr, unit: queryDef.unit, queryCount: queryDef.queries.length };
+
+      expect(actual).toStrictEqual(expected);
+    });
+  });
+
+  describe('Consider result.preview query (only first)', () => {
+    it.each([
+      // no rate
+      ['PREFIX_general', 'avg(...)', 'short'],
+      ['PREFIX_bytes', 'avg(...)', 'bytes'],
+      ['PREFIX_seconds', 'avg(...)', 's'],
+      // rate with counts per second
+      ['PREFIX_count', 'sum(rate(...[$__rate_interval]))', 'cps'], // cps = counts per second
+      ['PREFIX_total', 'sum(rate(...[$__rate_interval]))', 'cps'],
+      ['PREFIX_seconds_count', 'sum(rate(...[$__rate_interval]))', 'cps'],
+      // rate with seconds per second
+      ['PREFIX_seconds_total', 'sum(rate(...[$__rate_interval]))', 'short'], // s/s
+      // rate with bytes per second
+      ['PREFIX_bytes_total', 'sum(rate(...[$__rate_interval]))', 'Bps'], // bytes/s
+      // mean with non-rated units
+      [
+        'PREFIX_seconds_sum',
+        'sum(rate(PREFIX_seconds_sum{${filters}}[$__rate_interval]))/sum(rate(PREFIX_seconds_count{${filters}}[$__rate_interval]))',
+        's',
+      ],
+      [
+        'PREFIX_bytes_sum',
+        'sum(rate(PREFIX_bytes_sum{${filters}}[$__rate_interval]))/sum(rate(PREFIX_bytes_count{${filters}}[$__rate_interval]))',
+        'bytes',
+      ],
+      // Bucket
+      ['PREFIX_bucket', 'histogram_quantile(0.5, sum by(le) (rate(...[$__rate_interval])))', 'short'],
+      ['PREFIX_seconds_bucket', 'histogram_quantile(0.5, sum by(le) (rate(...[$__rate_interval])))', 's'],
+      ['PREFIX_bytes_bucket', 'histogram_quantile(0.5, sum by(le) (rate(...[$__rate_interval])))', 'bytes'],
+    ])('Given metric %p expect %p with unit %p', (metric, expr, unit) => {
+      const result = getAutoQueriesForMetric(metric);
+
+      const queryDef = result.preview;
+
+      const queryCount = 1;
+
+      const expected = { expr: expandExpr(expr), unit, queryCount };
+      const actual = { expr: queryDef.queries[0].expr, unit: queryDef.unit, queryCount: queryDef.queries.length };
+
+      expect(actual).toStrictEqual(expected);
+    });
+  });
+
+  describe('Consider result.breakdown query (only first)', () => {
+    it.each([
+      // no rate
+      ['PREFIX_general', 'avg(...)by(${groupby})', 'short'],
+      ['PREFIX_bytes', 'avg(...)by(${groupby})', 'bytes'],
+      ['PREFIX_seconds', 'avg(...)by(${groupby})', 's'],
+      // rate with counts per second
+      ['PREFIX_count', 'sum(rate(...[$__rate_interval]))by(${groupby})', 'cps'], // cps = counts per second
+      ['PREFIX_total', 'sum(rate(...[$__rate_interval]))by(${groupby})', 'cps'],
+      ['PREFIX_seconds_count', 'sum(rate(...[$__rate_interval]))by(${groupby})', 'cps'],
+      // rate with seconds per second
+      ['PREFIX_seconds_total', 'sum(rate(...[$__rate_interval]))by(${groupby})', 'short'], // s/s
+      // rate with bytes per second
+      ['PREFIX_bytes_total', 'sum(rate(...[$__rate_interval]))by(${groupby})', 'Bps'], // bytes/s
+      // mean with non-rated units
+      [
+        'PREFIX_seconds_sum',
+        'sum(rate(PREFIX_seconds_sum{${filters}}[$__rate_interval]))by(${groupby})/sum(rate(PREFIX_seconds_count{${filters}}[$__rate_interval]))by(${groupby})',
+        's',
+      ],
+      [
+        'PREFIX_bytes_sum',
+        'sum(rate(PREFIX_bytes_sum{${filters}}[$__rate_interval]))by(${groupby})/sum(rate(PREFIX_bytes_count{${filters}}[$__rate_interval]))by(${groupby})',
+        'bytes',
+      ],
+      // Bucket
+      ['PREFIX_bucket', 'histogram_quantile(0.5, sum by(le, ${groupby}) (rate(...[$__rate_interval])))', 'short'],
+      ['PREFIX_seconds_bucket', 'histogram_quantile(0.5, sum by(le, ${groupby}) (rate(...[$__rate_interval])))', 's'],
+      ['PREFIX_bytes_bucket', 'histogram_quantile(0.5, sum by(le, ${groupby}) (rate(...[$__rate_interval])))', 'bytes'],
+    ])('Given metric %p expect %p with unit %p', (metric, expr, unit) => {
+      const result = getAutoQueriesForMetric(metric);
+
+      const queryDef = result.breakdown;
+
+      const queryCount = 1;
+
+      const expected = { expr: expandExpr(expr), unit, queryCount };
+      const actual = { expr: queryDef.queries[0].expr, unit: queryDef.unit, queryCount: queryDef.queries.length };
+
+      expect(actual).toStrictEqual(expected);
+    });
+  });
+
+  describe('Consider result.variant', () => {
+    it.each([
+      // No variants
+      ['PREFIX_count', []],
+      ['PREFIX_seconds_count', []],
+      ['PREFIX_bytes', []],
+      ['PREFIX_seconds', []],
+      ['PREFIX_general', []],
+      ['PREFIX_seconds_total', []],
+      ['PREFIX_seconds_sum', []],
+      // Bucket variants
+      [
+        'PREFIX_bucket',
+        [
+          {
+            variant: 'percentiles',
+            unit: 'short',
+            exprs: [
+              'histogram_quantile(0.99, sum by(le) (rate(${metric}{${filters}}[$__rate_interval])))',
+              'histogram_quantile(0.9, sum by(le) (rate(${metric}{${filters}}[$__rate_interval])))',
+              'histogram_quantile(0.5, sum by(le) (rate(${metric}{${filters}}[$__rate_interval])))',
+            ],
+          },
+          {
+            variant: 'heatmap',
+            unit: 'short',
+            exprs: ['sum by(le) (rate(${metric}{${filters}}[$__rate_interval]))'],
+          },
+        ],
+      ],
+      [
+        'PREFIX_seconds_bucket',
+        [
+          {
+            variant: 'percentiles',
+            unit: 's',
+            exprs: [
+              'histogram_quantile(0.99, sum by(le) (rate(${metric}{${filters}}[$__rate_interval])))',
+              'histogram_quantile(0.9, sum by(le) (rate(${metric}{${filters}}[$__rate_interval])))',
+              'histogram_quantile(0.5, sum by(le) (rate(${metric}{${filters}}[$__rate_interval])))',
+            ],
+          },
+          {
+            variant: 'heatmap',
+            unit: 's',
+            exprs: ['sum by(le) (rate(${metric}{${filters}}[$__rate_interval]))'],
+          },
+        ],
+      ],
+      [
+        'PREFIX_bytes_bucket',
+        [
+          {
+            variant: 'percentiles',
+            unit: 'bytes',
+            exprs: [
+              'histogram_quantile(0.99, sum by(le) (rate(${metric}{${filters}}[$__rate_interval])))',
+              'histogram_quantile(0.9, sum by(le) (rate(${metric}{${filters}}[$__rate_interval])))',
+              'histogram_quantile(0.5, sum by(le) (rate(${metric}{${filters}}[$__rate_interval])))',
+            ],
+          },
+          {
+            variant: 'heatmap',
+            unit: 'bytes',
+            exprs: ['sum by(le) (rate(${metric}{${filters}}[$__rate_interval]))'],
+          },
+        ],
+      ],
+    ])('Given metric %p should generate expected variants', (metric, expectedVariants) => {
+      const defs = getAutoQueriesForMetric(metric);
+
+      const received = defs.variants.map((variant) => ({
+        variant: variant.variant,
+        unit: variant.unit,
+        exprs: variant.queries.map((query) => query.expr),
+      }));
+
+      expect(received).toStrictEqual(expectedVariants);
+    });
+  });
+
+  describe('Able to handle unconventional metric names', () => {
+    it.each([['PRODUCT_High_Priority_items_', 'avg(...)', 'short', 1]])(
+      'Given metric %p expect %p with unit %p',
+      (metric, expr, unit, queryCount) => {
+        const result = getAutoQueriesForMetric(metric);
+
+        const queryDef = result.main;
+
+        const expected = { expr: expandExpr(expr), unit, queryCount };
+        const actual = { expr: queryDef.queries[0].expr, unit: queryDef.unit, queryCount: queryDef.queries.length };
+
+        expect(actual).toStrictEqual(expected);
+      }
+    );
+  });
+});
diff --git a/public/app/features/trails/AutomaticMetricQueries/AutoQueryEngine.ts b/public/app/features/trails/AutomaticMetricQueries/AutoQueryEngine.ts
new file mode 100644
index 0000000000000..822c388c92553
--- /dev/null
+++ b/public/app/features/trails/AutomaticMetricQueries/AutoQueryEngine.ts
@@ -0,0 +1,16 @@
+import { getQueryGeneratorFor } from './query-generators';
+import { AutoQueryInfo } from './types';
+
+export function getAutoQueriesForMetric(metric: string): AutoQueryInfo {
+  const metricParts = metric.split('_');
+
+  const suffix = metricParts.at(-1);
+
+  const generator = getQueryGeneratorFor(suffix);
+
+  if (!generator) {
+    throw new Error(`Unable to generate queries for metric "${metric}" due to issues with derived suffix "${suffix}"`);
+  }
+
+  return generator(metricParts);
+}
diff --git a/public/app/features/trails/AutomaticMetricQueries/AutoVizPanel.tsx b/public/app/features/trails/AutomaticMetricQueries/AutoVizPanel.tsx
new file mode 100644
index 0000000000000..4572bf47f6abe
--- /dev/null
+++ b/public/app/features/trails/AutomaticMetricQueries/AutoVizPanel.tsx
@@ -0,0 +1,73 @@
+import React from 'react';
+
+import { SceneObjectState, SceneObjectBase, SceneComponentProps, VizPanel, SceneQueryRunner } from '@grafana/scenes';
+import { RadioButtonGroup } from '@grafana/ui';
+
+import { trailDS } from '../shared';
+import { getMetricSceneFor } from '../utils';
+
+import { AutoQueryDef } from './types';
+
+export interface AutoVizPanelState extends SceneObjectState {
+  panel?: VizPanel;
+}
+
+export class AutoVizPanel extends SceneObjectBase<AutoVizPanelState> {
+  constructor(state: AutoVizPanelState) {
+    super(state);
+
+    this.addActivationHandler(this.onActivate.bind(this));
+  }
+
+  public onActivate() {
+    if (!this.state.panel) {
+      const { autoQuery } = getMetricSceneFor(this).state;
+
+      this.setState({ panel: this.getVizPanelFor(autoQuery.main) });
+    }
+  }
+
+  private getQuerySelector(def: AutoQueryDef) {
+    const { autoQuery } = getMetricSceneFor(this).state;
+
+    if (autoQuery.variants.length === 0) {
+      return;
+    }
+
+    const options = autoQuery.variants.map((q) => ({ label: q.variant, value: q.variant }));
+
+    return <RadioButtonGroup size="sm" options={options} value={def.variant} onChange={this.onChangeQuery} />;
+  }
+
+  public onChangeQuery = (variant: string) => {
+    const metricScene = getMetricSceneFor(this);
+
+    const def = metricScene.state.autoQuery.variants.find((q) => q.variant === variant)!;
+
+    this.setState({ panel: this.getVizPanelFor(def) });
+    metricScene.setState({ queryDef: def });
+  };
+
+  private getVizPanelFor(def: AutoQueryDef) {
+    return def
+      .vizBuilder()
+      .setData(
+        new SceneQueryRunner({
+          datasource: trailDS,
+          maxDataPoints: 500,
+          queries: def.queries,
+        })
+      )
+      .setHeaderActions(this.getQuerySelector(def))
+      .build();
+  }
+
+  public static Component = ({ model }: SceneComponentProps<AutoVizPanel>) => {
+    const { panel } = model.useState();
+
+    if (!panel) {
+      return;
+    }
+    return <panel.Component model={panel} />;
+  };
+}
diff --git a/public/app/features/trails/AutomaticMetricQueries/graph-builders/heatmap.ts b/public/app/features/trails/AutomaticMetricQueries/graph-builders/heatmap.ts
new file mode 100644
index 0000000000000..252dba7470154
--- /dev/null
+++ b/public/app/features/trails/AutomaticMetricQueries/graph-builders/heatmap.ts
@@ -0,0 +1,18 @@
+import { PanelBuilders } from '@grafana/scenes';
+import { HeatmapColorMode } from 'app/plugins/panel/heatmap/types';
+
+import { CommonVizParams } from './types';
+
+export function heatmapGraphBuilder({ title, unit }: CommonVizParams) {
+  return PanelBuilders.heatmap() //
+    .setTitle(title)
+    .setUnit(unit)
+    .setOption('calculate', false)
+    .setOption('color', {
+      mode: HeatmapColorMode.Scheme,
+      exponent: 0.5,
+      scheme: 'Spectral',
+      steps: 32,
+      reverse: false,
+    });
+}
diff --git a/public/app/features/trails/AutomaticMetricQueries/graph-builders/percentiles.ts b/public/app/features/trails/AutomaticMetricQueries/graph-builders/percentiles.ts
new file mode 100644
index 0000000000000..9f40180d68d32
--- /dev/null
+++ b/public/app/features/trails/AutomaticMetricQueries/graph-builders/percentiles.ts
@@ -0,0 +1,10 @@
+import { PanelBuilders } from '@grafana/scenes';
+
+import { CommonVizParams } from './types';
+
+export function percentilesGraphBuilder({ title, unit }: CommonVizParams) {
+  return PanelBuilders.timeseries() //
+    .setTitle(title)
+    .setUnit(unit)
+    .setCustomFieldConfig('fillOpacity', 9);
+}
diff --git a/public/app/features/trails/AutomaticMetricQueries/graph-builders/simple.ts b/public/app/features/trails/AutomaticMetricQueries/graph-builders/simple.ts
new file mode 100644
index 0000000000000..5eab7d70bfdd8
--- /dev/null
+++ b/public/app/features/trails/AutomaticMetricQueries/graph-builders/simple.ts
@@ -0,0 +1,11 @@
+import { PanelBuilders } from '@grafana/scenes';
+
+import { CommonVizParams } from './types';
+
+export function simpleGraphBuilder({ title, unit }: CommonVizParams) {
+  return PanelBuilders.timeseries() //
+    .setTitle(title)
+    .setUnit(unit)
+    .setOption('legend', { showLegend: false })
+    .setCustomFieldConfig('fillOpacity', 9);
+}
diff --git a/public/app/features/trails/AutomaticMetricQueries/graph-builders/types.ts b/public/app/features/trails/AutomaticMetricQueries/graph-builders/types.ts
new file mode 100644
index 0000000000000..5167b71f0034a
--- /dev/null
+++ b/public/app/features/trails/AutomaticMetricQueries/graph-builders/types.ts
@@ -0,0 +1,4 @@
+export type CommonVizParams = {
+  title: string;
+  unit: string;
+};
diff --git a/public/app/features/trails/AutomaticMetricQueries/previewPanel.test.ts b/public/app/features/trails/AutomaticMetricQueries/previewPanel.test.ts
new file mode 100644
index 0000000000000..a0c3c9d620e3b
--- /dev/null
+++ b/public/app/features/trails/AutomaticMetricQueries/previewPanel.test.ts
@@ -0,0 +1,31 @@
+import { SceneQueryRunner } from '@grafana/scenes';
+
+import { getPreviewPanelFor } from './previewPanel';
+
+describe('getPreviewPanelFor', () => {
+  describe('includes __ignore_usage__ indicator', () => {
+    function callAndGetExpr(filterCount: number) {
+      const result = getPreviewPanelFor('METRIC', 0, filterCount);
+      const runner = result.state.$data as SceneQueryRunner;
+      expect(runner).toBeInstanceOf(SceneQueryRunner);
+      const query = runner.state.queries[0];
+      const expr = query.expr as string;
+      return expr;
+    }
+
+    test('When there are no filters, replace the ${filters} variable', () => {
+      const expected = 'avg(${metric}{__ignore_usage__=""})';
+      const expr = callAndGetExpr(0);
+      expect(expr).toStrictEqual(expected);
+    });
+
+    test('When there are 1 or more filters, append to the ${filters} variable', () => {
+      const expected = 'avg(${metric}{${filters},__ignore_usage__=""})';
+
+      for (let i = 1; i < 10; ++i) {
+        const expr = callAndGetExpr(1);
+        expect(expr).toStrictEqual(expected);
+      }
+    });
+  });
+});
diff --git a/public/app/features/trails/AutomaticMetricQueries/previewPanel.ts b/public/app/features/trails/AutomaticMetricQueries/previewPanel.ts
new file mode 100644
index 0000000000000..7b77811f2c59e
--- /dev/null
+++ b/public/app/features/trails/AutomaticMetricQueries/previewPanel.ts
@@ -0,0 +1,49 @@
+import { SceneCSSGridItem, SceneQueryRunner, SceneVariableSet } from '@grafana/scenes';
+import { PromQuery } from 'app/plugins/datasource/prometheus/types';
+
+import { SelectMetricAction } from '../SelectMetricAction';
+import { hideEmptyPreviews } from '../hideEmptyPreviews';
+import { getVariablesWithMetricConstant, trailDS } from '../shared';
+import { getColorByIndex } from '../utils';
+
+import { getAutoQueriesForMetric } from './AutoQueryEngine';
+
+export function getPreviewPanelFor(metric: string, index: number, currentFilterCount: number, description?: string) {
+  const autoQuery = getAutoQueriesForMetric(metric);
+
+  const vizPanel = autoQuery.preview
+    .vizBuilder()
+    .setColor({ mode: 'fixed', fixedColor: getColorByIndex(index) })
+    .setDescription(description)
+    .setHeaderActions(new SelectMetricAction({ metric, title: 'Select' }))
+    .build();
+
+  const queries = autoQuery.preview.queries.map((query) =>
+    convertPreviewQueriesToIgnoreUsage(query, currentFilterCount)
+  );
+
+  return new SceneCSSGridItem({
+    $variables: new SceneVariableSet({
+      variables: getVariablesWithMetricConstant(metric),
+    }),
+    $behaviors: [hideEmptyPreviews(metric)],
+    $data: new SceneQueryRunner({
+      datasource: trailDS,
+      maxDataPoints: 200,
+      queries,
+    }),
+    body: vizPanel,
+  });
+}
+
+function convertPreviewQueriesToIgnoreUsage(query: PromQuery, currentFilterCount: number) {
+  // If there are filters, we append to the list. Otherwise, we replace the empty list.
+  const replacement = currentFilterCount > 0 ? '${filters},__ignore_usage__=""' : '__ignore_usage__=""';
+
+  const expr = query.expr?.replace('${filters}', replacement);
+
+  return {
+    ...query,
+    expr,
+  };
+}
diff --git a/public/app/features/trails/AutomaticMetricQueries/query-generators/common/generator.ts b/public/app/features/trails/AutomaticMetricQueries/query-generators/common/generator.ts
new file mode 100644
index 0000000000000..fbc7ff5d3cb3d
--- /dev/null
+++ b/public/app/features/trails/AutomaticMetricQueries/query-generators/common/generator.ts
@@ -0,0 +1,58 @@
+import { VAR_GROUP_BY_EXP, VAR_METRIC_EXPR } from '../../../shared';
+import { simpleGraphBuilder } from '../../graph-builders/simple';
+
+export type CommonQueryInfoParams = {
+  description: string;
+  mainQueryExpr: string;
+  breakdownQueryExpr: string;
+  unit: string;
+};
+
+export function generateCommonAutoQueryInfo({
+  description,
+  mainQueryExpr,
+  breakdownQueryExpr,
+  unit,
+}: CommonQueryInfoParams) {
+  const common = {
+    title: `${VAR_METRIC_EXPR}`,
+    unit,
+  };
+
+  const mainQuery = {
+    refId: 'A',
+    expr: mainQueryExpr,
+    legendFormat: description,
+  };
+
+  const main = {
+    ...common,
+    title: description,
+    queries: [mainQuery],
+    variant: 'main',
+    vizBuilder: () => simpleGraphBuilder({ ...main }),
+  };
+
+  const preview = {
+    ...main,
+    title: `${VAR_METRIC_EXPR}`,
+    queries: [{ ...mainQuery, legendFormat: description }],
+    vizBuilder: () => simpleGraphBuilder(preview),
+    variant: 'preview',
+  };
+
+  const breakdown = {
+    ...common,
+    queries: [
+      {
+        refId: 'A',
+        expr: breakdownQueryExpr,
+        legendFormat: `{{${VAR_GROUP_BY_EXP}}}`,
+      },
+    ],
+    vizBuilder: () => simpleGraphBuilder(breakdown),
+    variant: 'breakdown',
+  };
+
+  return { preview, main, breakdown, variants: [] };
+}
diff --git a/public/app/features/trails/AutomaticMetricQueries/query-generators/common/index.ts b/public/app/features/trails/AutomaticMetricQueries/query-generators/common/index.ts
new file mode 100644
index 0000000000000..4257e212ec743
--- /dev/null
+++ b/public/app/features/trails/AutomaticMetricQueries/query-generators/common/index.ts
@@ -0,0 +1,9 @@
+import { generateQueries } from './queries';
+import { getGeneratorParameters } from './rules';
+
+function generator(metricParts: string[]) {
+  const params = getGeneratorParameters(metricParts);
+  return generateQueries(params);
+}
+
+export default { generator };
diff --git a/public/app/features/trails/AutomaticMetricQueries/query-generators/common/queries.test.ts b/public/app/features/trails/AutomaticMetricQueries/query-generators/common/queries.test.ts
new file mode 100644
index 0000000000000..bb8650338edf8
--- /dev/null
+++ b/public/app/features/trails/AutomaticMetricQueries/query-generators/common/queries.test.ts
@@ -0,0 +1,80 @@
+import { VAR_GROUP_BY_EXP } from '../../../shared';
+import { AutoQueryDef, AutoQueryInfo } from '../../types';
+
+import { generateQueries, getGeneralBaseQuery } from './queries';
+
+describe('generateQueries', () => {
+  const agg = 'sum';
+  const unit = 'mockunit';
+
+  type QueryInfoKey = keyof AutoQueryInfo;
+
+  function testRateIndependentAssertions(queryDef: AutoQueryDef, key: QueryInfoKey) {
+    describe('regardless of rate', () => {
+      test(`specified unit must be propagated`, () => expect(queryDef.unit).toBe(unit));
+      test(`only one query is expected`, () => expect(queryDef.queries.length).toBe(1));
+      const query = queryDef.queries[0];
+      test(`specified agg function must be propagated in the query expr`, () => {
+        const queryAggFunction = query.expr.split('(', 2)[0];
+        expect(queryAggFunction).toBe(agg);
+      });
+      if (key === 'breakdown') {
+        const expectedSuffix = `by(${VAR_GROUP_BY_EXP})`;
+        test(`breakdown query must end with "${expectedSuffix}"`, () => {
+          const suffix = query.expr.substring(query.expr.length - expectedSuffix.length);
+          expect(suffix).toBe(expectedSuffix);
+        });
+      }
+    });
+  }
+
+  function testRateSpecificAssertions(queryDef: AutoQueryDef, rate: boolean, key: QueryInfoKey) {
+    const query = queryDef.queries[0];
+    const firstParen = query.expr.indexOf('(');
+    const expectedBaseQuery = getGeneralBaseQuery(rate);
+    const detectedBaseQuery = query.expr.substring(firstParen + 1, firstParen + 1 + expectedBaseQuery.length);
+
+    const inParentheses = rate ? 'overall per-second rate' : 'overall';
+    const description = `\${metric} (${inParentheses})`;
+
+    describe(`since rate is ${rate}`, () => {
+      test(`base query must be "${expectedBaseQuery}"`, () => expect(detectedBaseQuery).toBe(expectedBaseQuery));
+      if (key === 'main') {
+        test(`main panel title contains expected description "${description}"`, () =>
+          expect(queryDef.title).toContain(description));
+      } else {
+        test(`${key} panel title is just "\${metric}"`, () => expect(queryDef.title).toBe('${metric}'));
+        test(`${key} panel title does not contain description "${description}"`, () =>
+          expect(queryDef.title).not.toContain(description));
+      }
+
+      if (key === 'breakdown') {
+        test(`breakdown query uses "{{\${groupby}}}" as legend`, () =>
+          expect(query.legendFormat).toBe('{{${groupby}}}'));
+      } else {
+        test(`preview query uses "${description}" as legend`, () => expect(query.legendFormat).toBe(description));
+      }
+    });
+  }
+
+  for (const rate of [true, false]) {
+    describe(`when rate is ${rate}`, () => {
+      const queryInfo = generateQueries({ agg, unit, rate });
+
+      let key: QueryInfoKey;
+      for (key in queryInfo) {
+        if (key !== 'variants') {
+          const queryDef = queryInfo[key];
+          describe(`queryInfo.${key}`, () => testRateIndependentAssertions(queryDef, key));
+          describe(`queryInfo.${key}`, () => testRateSpecificAssertions(queryDef, rate, key));
+          continue;
+        }
+
+        queryInfo[key].forEach((queryDef, index) => {
+          describe(`queryInfo.${key}[${index}]`, () => testRateIndependentAssertions(queryDef, key));
+          describe(`queryInfo.${key}[${index}]`, () => testRateSpecificAssertions(queryDef, rate, key));
+        });
+      }
+    });
+  }
+});
diff --git a/public/app/features/trails/AutomaticMetricQueries/query-generators/common/queries.ts b/public/app/features/trails/AutomaticMetricQueries/query-generators/common/queries.ts
new file mode 100644
index 0000000000000..eb43d8537cee7
--- /dev/null
+++ b/public/app/features/trails/AutomaticMetricQueries/query-generators/common/queries.ts
@@ -0,0 +1,39 @@
+import { VAR_FILTERS_EXPR, VAR_GROUP_BY_EXP, VAR_METRIC_EXPR } from '../../../shared';
+import { AutoQueryInfo } from '../../types';
+import { generateCommonAutoQueryInfo } from '../common/generator';
+
+import { AutoQueryParameters } from './types';
+
+const GENERAL_BASE_QUERY = `${VAR_METRIC_EXPR}${VAR_FILTERS_EXPR}`;
+const GENERAL_RATE_BASE_QUERY = `rate(${GENERAL_BASE_QUERY}[$__rate_interval])`;
+
+export function getGeneralBaseQuery(rate: boolean) {
+  return rate ? GENERAL_RATE_BASE_QUERY : GENERAL_BASE_QUERY;
+}
+
+const aggLabels: Record<string, string> = {
+  avg: 'average',
+  sum: 'overall',
+};
+
+function getAggLabel(agg: string) {
+  return aggLabels[agg] || agg;
+}
+
+export function generateQueries({ agg, rate, unit }: AutoQueryParameters): AutoQueryInfo {
+  const baseQuery = getGeneralBaseQuery(rate);
+
+  const aggregationDescription = rate ? `${getAggLabel(agg)} per-second rate` : `${getAggLabel(agg)}`;
+
+  const description = `${VAR_METRIC_EXPR} (${aggregationDescription})`;
+
+  const mainQueryExpr = `${agg}(${baseQuery})`;
+  const breakdownQueryExpr = `${agg}(${baseQuery})by(${VAR_GROUP_BY_EXP})`;
+
+  return generateCommonAutoQueryInfo({
+    description,
+    mainQueryExpr,
+    breakdownQueryExpr,
+    unit,
+  });
+}
diff --git a/public/app/features/trails/AutomaticMetricQueries/query-generators/common/rules.ts b/public/app/features/trails/AutomaticMetricQueries/query-generators/common/rules.ts
new file mode 100644
index 0000000000000..96e0302089dce
--- /dev/null
+++ b/public/app/features/trails/AutomaticMetricQueries/query-generators/common/rules.ts
@@ -0,0 +1,39 @@
+import { getUnit, getPerSecondRateUnit } from '../../units';
+
+import { AutoQueryParameters } from './types';
+
+/** These suffixes will set rate to true */
+const RATE_SUFFIXES = new Set(['count', 'total']);
+
+const UNSUPPORTED_SUFFIXES = new Set(['sum', 'bucket']);
+
+/** Non-default aggregattion keyed by suffix */
+const SPECIFIC_AGGREGATIONS_FOR_SUFFIX: Record<string, string> = {
+  count: 'sum',
+  total: 'sum',
+};
+
+function checkPreviousForUnit(suffix: string) {
+  return suffix === 'total';
+}
+
+export function getGeneratorParameters(metricParts: string[]): AutoQueryParameters {
+  const suffix = metricParts.at(-1);
+
+  if (suffix == null || UNSUPPORTED_SUFFIXES.has(suffix)) {
+    throw new Error(`This function does not support a metric suffix of "${suffix}"`);
+  }
+
+  const rate = RATE_SUFFIXES.has(suffix);
+  const agg = SPECIFIC_AGGREGATIONS_FOR_SUFFIX[suffix] || 'avg';
+
+  const unitSuffix = checkPreviousForUnit(suffix) ? metricParts.at(-2) : suffix;
+
+  const unit = rate ? getPerSecondRateUnit(unitSuffix) : getUnit(unitSuffix);
+
+  return {
+    agg,
+    unit,
+    rate,
+  };
+}
diff --git a/public/app/features/trails/AutomaticMetricQueries/query-generators/common/types.ts b/public/app/features/trails/AutomaticMetricQueries/query-generators/common/types.ts
new file mode 100644
index 0000000000000..cf49ce8e526e7
--- /dev/null
+++ b/public/app/features/trails/AutomaticMetricQueries/query-generators/common/types.ts
@@ -0,0 +1,5 @@
+export type AutoQueryParameters = {
+  agg: string;
+  unit: string;
+  rate: boolean;
+};
diff --git a/public/app/features/trails/AutomaticMetricQueries/query-generators/histogram.ts b/public/app/features/trails/AutomaticMetricQueries/query-generators/histogram.ts
new file mode 100644
index 0000000000000..6f51f6270e2e5
--- /dev/null
+++ b/public/app/features/trails/AutomaticMetricQueries/query-generators/histogram.ts
@@ -0,0 +1,76 @@
+import { PromQuery } from 'app/plugins/datasource/prometheus/types';
+
+import { VAR_FILTERS_EXPR, VAR_GROUP_BY_EXP, VAR_METRIC_EXPR } from '../../shared';
+import { heatmapGraphBuilder } from '../graph-builders/heatmap';
+import { percentilesGraphBuilder } from '../graph-builders/percentiles';
+import { simpleGraphBuilder } from '../graph-builders/simple';
+import { AutoQueryDef } from '../types';
+import { getUnit } from '../units';
+
+export function createHistogramQueryDefs(metricParts: string[]) {
+  const title = `${VAR_METRIC_EXPR}`;
+
+  const unitSuffix = metricParts.at(-2);
+
+  const unit = getUnit(unitSuffix);
+
+  const common = {
+    title,
+    unit,
+  };
+
+  const p50: AutoQueryDef = {
+    ...common,
+    variant: 'p50',
+    queries: [percentileQuery(50)],
+    vizBuilder: () => simpleGraphBuilder(p50),
+  };
+
+  const breakdown: AutoQueryDef = {
+    ...common,
+    variant: 'p50',
+    queries: [percentileQuery(50, [VAR_GROUP_BY_EXP])],
+    vizBuilder: () => simpleGraphBuilder(breakdown),
+  };
+
+  const percentiles: AutoQueryDef = {
+    ...common,
+    variant: 'percentiles',
+    queries: [99, 90, 50].map((p) => percentileQuery(p)),
+    vizBuilder: () => percentilesGraphBuilder(percentiles),
+  };
+
+  const heatmap: AutoQueryDef = {
+    ...common,
+    variant: 'heatmap',
+    queries: [heatMapQuery()],
+    vizBuilder: () => heatmapGraphBuilder(heatmap),
+  };
+
+  return { preview: p50, main: percentiles, variants: [percentiles, heatmap], breakdown: breakdown };
+}
+
+const BASE_QUERY = `rate(${VAR_METRIC_EXPR}${VAR_FILTERS_EXPR}[$__rate_interval])`;
+
+function baseQuery(groupings: string[] = []) {
+  const sumByList = ['le', ...groupings];
+  return `sum by(${sumByList.join(', ')}) (${BASE_QUERY})`;
+}
+
+function heatMapQuery(groupings: string[] = []): PromQuery {
+  return {
+    refId: 'Heatmap',
+    expr: baseQuery(groupings),
+    format: 'heatmap',
+  };
+}
+
+function percentileQuery(percentile: number, groupings: string[] = []) {
+  const percent = percentile / 100;
+
+  return {
+    refId: `Percentile${percentile}`,
+    expr: `histogram_quantile(${percent}, ${baseQuery(groupings)})`,
+    legendFormat: `${percentile}th Percentile`,
+  };
+}
diff --git a/public/app/features/trails/AutomaticMetricQueries/query-generators/index.ts b/public/app/features/trails/AutomaticMetricQueries/query-generators/index.ts
new file mode 100644
index 0000000000000..569f4e8e0bf39
--- /dev/null
+++ b/public/app/features/trails/AutomaticMetricQueries/query-generators/index.ts
@@ -0,0 +1,13 @@
+import general from './common';
+import { createHistogramQueryDefs } from './histogram';
+import { createSummaryQueryDefs } from './summary';
+import { MetricQueriesGenerator } from './types';
+
+const SUFFIX_TO_ALTERNATIVE_GENERATOR: Record<string, MetricQueriesGenerator> = {
+  sum: createSummaryQueryDefs,
+  bucket: createHistogramQueryDefs,
+};
+
+export function getQueryGeneratorFor(suffix?: string) {
+  return (suffix && SUFFIX_TO_ALTERNATIVE_GENERATOR[suffix]) || general.generator;
+}
diff --git a/public/app/features/trails/AutomaticMetricQueries/query-generators/summary.ts b/public/app/features/trails/AutomaticMetricQueries/query-generators/summary.ts
new file mode 100644
index 0000000000000..b6a625b08983f
--- /dev/null
+++ b/public/app/features/trails/AutomaticMetricQueries/query-generators/summary.ts
@@ -0,0 +1,39 @@
+import { VAR_GROUP_BY_EXP, VAR_METRIC_EXPR } from '../../shared';
+import { AutoQueryInfo } from '../types';
+import { getUnit } from '../units';
+
+import { generateCommonAutoQueryInfo } from './common/generator';
+import { getGeneralBaseQuery } from './common/queries';
+
+export function createSummaryQueryDefs(metricParts: string[]): AutoQueryInfo {
+  const suffix = metricParts.at(-1);
+  if (suffix !== 'sum') {
+    throw new Error('createSummaryQueryDefs is only to be used for metrics that end in "_sum"');
+  }
+
+  const unitSuffix = metricParts.at(-2);
+  const unit = getUnit(unitSuffix);
+
+  const rate = true;
+  const baseQuery = getGeneralBaseQuery(rate);
+
+  const subMetric = metricParts.slice(0, -1).join('_');
+  const mainQueryExpr = createMeanExpr(`sum(${baseQuery})`);
+  const breakdownQueryExpr = createMeanExpr(`sum(${baseQuery})by(${VAR_GROUP_BY_EXP})`);
+
+  const operationDescription = `average`;
+  const description = `${subMetric} (${operationDescription})`;
+
+  function createMeanExpr(expr: string) {
+    const numerator = expr.replace(VAR_METRIC_EXPR, `${subMetric}_sum`);
+    const denominator = expr.replace(VAR_METRIC_EXPR, `${subMetric}_count`);
+    return `${numerator}/${denominator}`;
+  }
+
+  return generateCommonAutoQueryInfo({
+    description,
+    mainQueryExpr,
+    breakdownQueryExpr,
+    unit,
+  });
+}
diff --git a/public/app/features/trails/AutomaticMetricQueries/query-generators/types.ts b/public/app/features/trails/AutomaticMetricQueries/query-generators/types.ts
new file mode 100644
index 0000000000000..ddf30ccc27c86
--- /dev/null
+++ b/public/app/features/trails/AutomaticMetricQueries/query-generators/types.ts
@@ -0,0 +1,3 @@
+import { AutoQueryInfo } from '../types';
+
+export type MetricQueriesGenerator = (metricParts: string[]) => AutoQueryInfo;
diff --git a/public/app/features/trails/AutomaticMetricQueries/types.ts b/public/app/features/trails/AutomaticMetricQueries/types.ts
new file mode 100644
index 0000000000000..0737f3bcbe0aa
--- /dev/null
+++ b/public/app/features/trails/AutomaticMetricQueries/types.ts
@@ -0,0 +1,19 @@
+import { VizPanelBuilder } from '@grafana/scenes';
+import { PromQuery } from 'app/plugins/datasource/prometheus/types';
+
+export interface AutoQueryDef {
+  variant: string;
+  title: string;
+  unit: string;
+  queries: PromQuery[];
+  vizBuilder: VizBuilder;
+}
+
+export interface AutoQueryInfo {
+  preview: AutoQueryDef;
+  main: AutoQueryDef;
+  variants: AutoQueryDef[];
+  breakdown: AutoQueryDef;
+}
+
+export type VizBuilder = () => VizPanelBuilder<{}, {}>;
diff --git a/public/app/features/trails/AutomaticMetricQueries/units.ts b/public/app/features/trails/AutomaticMetricQueries/units.ts
new file mode 100644
index 0000000000000..5a150809b1e81
--- /dev/null
+++ b/public/app/features/trails/AutomaticMetricQueries/units.ts
@@ -0,0 +1,21 @@
+const DEFAULT_UNIT = 'short';
+
+export function getUnit(metricPart: string | undefined) {
+  return (metricPart && UNIT_MAP[metricPart]) || DEFAULT_UNIT;
+}
+
+const UNIT_MAP: Record<string, string> = {
+  bytes: 'bytes',
+  seconds: 's',
+};
+
+const RATE_UNIT_MAP: Record<string, string> = {
+  bytes: 'Bps', // bytes per second
+  seconds: 'short', // seconds per second is unitless -- this may indicate a count of some resource that is active
+};
+
+const DEFAULT_RATE_UNIT = 'cps'; // Count per second
+
+export function getPerSecondRateUnit(metricPart: string | undefined) {
+  return (metricPart && RATE_UNIT_MAP[metricPart]) || DEFAULT_RATE_UNIT;
+}
diff --git a/public/app/features/trails/BreakdownLabelSelector.tsx b/public/app/features/trails/BreakdownLabelSelector.tsx
new file mode 100644
index 0000000000000..25191aaa53a54
--- /dev/null
+++ b/public/app/features/trails/BreakdownLabelSelector.tsx
@@ -0,0 +1,60 @@
+import { css } from '@emotion/css';
+import { useResizeObserver } from '@react-aria/utils';
+import React, { useEffect, useRef, useState } from 'react';
+
+import { GrafanaTheme2, SelectableValue } from '@grafana/data';
+import { Select, RadioButtonGroup, useStyles2, useTheme2, measureText } from '@grafana/ui';
+
+type Props = {
+  options: Array<SelectableValue<string>>;
+  value?: string;
+  onChange: (label: string | undefined) => void;
+};
+
+export function BreakdownLabelSelector({ options, value, onChange }: Props) {
+  const styles = useStyles2(getStyles);
+  const theme = useTheme2();
+
+  const [labelSelectorRequiredWidth, setLabelSelectorRequiredWidth] = useState<number>(0);
+  const [availableWidth, setAvailableWidth] = useState<number>(0);
+
+  const useHorizontalLabelSelector = availableWidth > labelSelectorRequiredWidth;
+
+  const controlsContainer = useRef<HTMLDivElement>(null);
+
+  useResizeObserver({
+    ref: controlsContainer,
+    onResize: () => {
+      const element = controlsContainer.current;
+      if (element) {
+        setAvailableWidth(element.clientWidth);
+      }
+    },
+  });
+
+  useEffect(() => {
+    const { fontSize } = theme.typography;
+    const text = options.map((option) => option.label || option.value || '').join(' ');
+    const textWidth = measureText(text, fontSize).width;
+    const additionalWidthPerItem = 32;
+    setLabelSelectorRequiredWidth(textWidth + additionalWidthPerItem * options.length);
+  }, [options, theme]);
+
+  return (
+    <div ref={controlsContainer}>
+      {useHorizontalLabelSelector ? (
+        <RadioButtonGroup {...{ options, value, onChange }} />
+      ) : (
+        <Select {...{ options, value }} onChange={(selected) => onChange(selected.value)} className={styles.select} />
+      )}
+    </div>
+  );
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    select: css({
+      maxWidth: theme.spacing(16),
+    }),
+  };
+}
diff --git a/public/app/features/trails/DataTrail.test.tsx b/public/app/features/trails/DataTrail.test.tsx
new file mode 100644
index 0000000000000..e86177519091a
--- /dev/null
+++ b/public/app/features/trails/DataTrail.test.tsx
@@ -0,0 +1,480 @@
+import { locationService, setDataSourceSrv } from '@grafana/runtime';
+import { AdHocFiltersVariable, sceneGraph } from '@grafana/scenes';
+import { DataSourceType } from 'app/features/alerting/unified/utils/datasource';
+
+import { MockDataSourceSrv, mockDataSource } from '../alerting/unified/mocks';
+import { activateFullSceneTree } from '../dashboard-scene/utils/test-utils';
+
+import { DataTrail } from './DataTrail';
+import { MetricScene } from './MetricScene';
+import { MetricSelectScene } from './MetricSelectScene';
+import { MetricSelectedEvent, VAR_FILTERS } from './shared';
+
+describe('DataTrail', () => {
+  beforeAll(() => {
+    setDataSourceSrv(
+      new MockDataSourceSrv({
+        prom: mockDataSource({
+          name: 'Prometheus',
+          type: DataSourceType.Prometheus,
+        }),
+      })
+    );
+  });
+
+  describe('Given starting non-embedded trail with url sync and no url state', () => {
+    let trail: DataTrail;
+    const preTrailUrl = '/';
+
+    function getFilterVar() {
+      const variable = sceneGraph.lookupVariable(VAR_FILTERS, trail);
+      if (variable instanceof AdHocFiltersVariable) {
+        return variable;
+      }
+      throw new Error('getFilterVar failed');
+    }
+
+    function getStepFilterVar(step: number) {
+      const variable = trail.state.history.state.steps[step].trailState.$variables?.getByName(VAR_FILTERS);
+      if (variable instanceof AdHocFiltersVariable) {
+        return variable;
+      }
+      throw new Error(`getStepFilterVar failed for step ${step}`);
+    }
+
+    beforeEach(() => {
+      trail = new DataTrail({});
+      locationService.push(preTrailUrl);
+      activateFullSceneTree(trail);
+    });
+
+    it('Should default to metric select scene', () => {
+      expect(trail.state.topScene).toBeInstanceOf(MetricSelectScene);
+    });
+
+    it('Should set history current step to 0', () => {
+      expect(trail.state.history.state.currentStep).toBe(0);
+    });
+
+    it('Should set history step 0 parentIndex to -1', () => {
+      expect(trail.state.history.state.steps[0].parentIndex).toBe(-1);
+    });
+
+    describe('And metric is selected', () => {
+      beforeEach(() => {
+        trail.publishEvent(new MetricSelectedEvent('metric_bucket'));
+      });
+
+      it('should switch scene to MetricScene', () => {
+        expect(trail.state.metric).toBe('metric_bucket');
+        expect(trail.state.topScene).toBeInstanceOf(MetricScene);
+      });
+
+      it('should sync state with url', () => {
+        expect(locationService.getSearchObject().metric).toBe('metric_bucket');
+      });
+
+      it('should add history step', () => {
+        expect(trail.state.history.state.steps[1].type).toBe('metric');
+      });
+
+      it('Should set history currentStep to 1', () => {
+        expect(trail.state.history.state.currentStep).toBe(1);
+      });
+
+      it('Should set history step 1 parentIndex to 0', () => {
+        expect(trail.state.history.state.steps[1].parentIndex).toBe(0);
+      });
+
+      it('Should have time range `from` be default "now-6h"', () => {
+        expect(trail.state.$timeRange?.state.from).toBe('now-6h');
+      });
+
+      describe('And browser back button is pressed', () => {
+        locationService.getHistory().goBack();
+
+        it('Should return to original URL', () => {
+          const { pathname } = locationService.getLocation();
+          expect(pathname).toEqual(preTrailUrl);
+        });
+      });
+
+      describe('And when changing the time range `from` to "now-1h"', () => {
+        beforeEach(() => {
+          trail.state.$timeRange?.setState({ from: 'now-1h' });
+        });
+
+        it('should sync state with url', () => {
+          expect(locationService.getSearchObject().from).toBe('now-1h');
+        });
+
+        it('should add history step', () => {
+          expect(trail.state.history.state.steps[2].type).toBe('time');
+        });
+
+        it('Should set history currentStep to 2', () => {
+          expect(trail.state.history.state.currentStep).toBe(2);
+        });
+
+        it('Should set history step 2 parentIndex to 1', () => {
+          expect(trail.state.history.state.steps[2].parentIndex).toBe(1);
+        });
+
+        it('Should have time range `from` be updated "now-1h"', () => {
+          expect(trail.state.$timeRange?.state.from).toBe('now-1h');
+        });
+
+        it('Previous history step should have previous default `from` of "now-6h"', () => {
+          expect(trail.state.history.state.steps[1].trailState.$timeRange?.state.from).toBe('now-6h');
+        });
+
+        it('Current history step should have new `from` of "now-1h"', () => {
+          expect(trail.state.history.state.steps[2].trailState.$timeRange?.state.from).toBe('now-1h');
+        });
+
+        describe('And when traversing back to step 1', () => {
+          beforeEach(() => {
+            trail.state.history.goBackToStep(1);
+          });
+
+          it('Should set history currentStep to 1', () => {
+            expect(trail.state.history.state.currentStep).toBe(1);
+          });
+
+          it('should sync state with url', () => {
+            expect(locationService.getSearchObject().from).toBe('now-6h');
+          });
+
+          it('Should have time range `from` be set back to "now-6h"', () => {
+            expect(trail.state.$timeRange?.state.from).toBe('now-6h');
+          });
+
+          describe('And then when changing the time range `from` to "now-15m"', () => {
+            beforeEach(() => {
+              trail.state.$timeRange?.setState({ from: 'now-15m' });
+            });
+
+            it('should sync state with url', () => {
+              expect(locationService.getSearchObject().from).toBe('now-15m');
+            });
+
+            it('should add history step', () => {
+              expect(trail.state.history.state.steps[3].type).toBe('time');
+            });
+
+            it('Should set history currentStep to 3', () => {
+              expect(trail.state.history.state.currentStep).toBe(3);
+            });
+
+            it('Should set history step 3 parentIndex to 1', () => {
+              expect(trail.state.history.state.steps[3].parentIndex).toBe(1);
+            });
+
+            it('Should have time range `from` be updated "now-15m"', () => {
+              expect(trail.state.$timeRange?.state.from).toBe('now-15m');
+            });
+
+            it('History step 1 (parent) should have previous default `from` of "now-6h"', () => {
+              expect(trail.state.history.state.steps[1].trailState.$timeRange?.state.from).toBe('now-6h');
+            });
+
+            it('History step 2 should still have `from` of "now-1h"', () => {
+              expect(trail.state.history.state.steps[2].trailState.$timeRange?.state.from).toBe('now-1h');
+            });
+
+            describe('And then when returning again to step 1', () => {
+              beforeEach(() => {
+                trail.state.history.goBackToStep(1);
+              });
+
+              it('Should set history currentStep to 1', () => {
+                expect(trail.state.history.state.currentStep).toBe(1);
+              });
+
+              it('should sync state with url', () => {
+                expect(locationService.getSearchObject().from).toBe('now-6h');
+              });
+
+              it('History step 1 (parent) should have previous default `from` of "now-6h"', () => {
+                expect(trail.state.history.state.steps[1].trailState.$timeRange?.state.from).toBe('now-6h');
+              });
+
+              it('History step 2 should still have `from` of "now-1h"', () => {
+                expect(trail.state.history.state.steps[2].trailState.$timeRange?.state.from).toBe('now-1h');
+              });
+
+              it('History step 3 should still have `from` of "now-15m"', () => {
+                expect(trail.state.history.state.steps[3].trailState.$timeRange?.state.from).toBe('now-15m');
+              });
+
+              it('Should have time range `from` be set back to "now-6h"', () => {
+                expect(trail.state.$timeRange?.state.from).toBe('now-6h');
+              });
+            });
+          });
+        });
+      });
+
+      it('Should have default empty filter', () => {
+        expect(getFilterVar().state.filters.length).toBe(0);
+      });
+
+      describe('And when changing the filter to zone=a', () => {
+        beforeEach(() => {
+          getFilterVar().setState({ filters: [{ key: 'zone', operator: '=', value: 'a' }] });
+        });
+
+        it('should sync state with url', () => {
+          expect(decodeURIComponent(locationService.getSearchObject()['var-filters']?.toString()!)).toBe('zone|=|a');
+        });
+
+        it('should add history step', () => {
+          expect(trail.state.history.state.steps[2].type).toBe('filters');
+        });
+
+        it('Should set history currentStep to 2', () => {
+          expect(trail.state.history.state.currentStep).toBe(2);
+        });
+
+        it('Should set history step 2 parentIndex to 1', () => {
+          expect(trail.state.history.state.steps[2].parentIndex).toBe(1);
+        });
+
+        it('Should have filter be updated to "zone=a"', () => {
+          expect(getFilterVar().state.filters[0].key).toBe('zone');
+          expect(getFilterVar().state.filters[0].value).toBe('a');
+        });
+
+        it('Previous history step should have empty filter', () => {
+          expect(getStepFilterVar(1).state.filters.length).toBe(0);
+        });
+
+        it('Current history step should have new filter zone=a', () => {
+          expect(getStepFilterVar(2).state.filters[0].key).toBe('zone');
+          expect(getStepFilterVar(2).state.filters[0].value).toBe('a');
+        });
+
+        describe('And when traversing back to step 1', () => {
+          beforeEach(() => {
+            trail.state.history.goBackToStep(1);
+          });
+
+          it('Should set history currentStep to 1', () => {
+            expect(trail.state.history.state.currentStep).toBe(1);
+          });
+
+          it('should sync state with url', () => {
+            expect(locationService.getSearchObject()['var-filters']).toBe('');
+          });
+
+          it('Should have filters set back to empty', () => {
+            expect(getFilterVar().state.filters.length).toBe(0);
+          });
+
+          describe('And when changing the filter to zone=b', () => {
+            beforeEach(() => {
+              getFilterVar().setState({ filters: [{ key: 'zone', operator: '=', value: 'b' }] });
+            });
+
+            it('should sync state with url', () => {
+              expect(decodeURIComponent(locationService.getSearchObject()['var-filters']?.toString()!)).toBe(
+                'zone|=|b'
+              );
+            });
+
+            it('should add history step', () => {
+              expect(trail.state.history.state.steps[3].type).toBe('filters');
+            });
+
+            it('Should set history currentStep to 3', () => {
+              expect(trail.state.history.state.currentStep).toBe(3);
+            });
+
+            it('Should set history step 3 parentIndex to 1', () => {
+              expect(trail.state.history.state.steps[3].parentIndex).toBe(1);
+            });
+
+            it('Should have filter be updated to "zone=b"', () => {
+              expect(getFilterVar().state.filters[0].key).toBe('zone');
+              expect(getFilterVar().state.filters[0].value).toBe('b');
+            });
+
+            it('Parent history step 1 should still have empty filter', () => {
+              expect(getStepFilterVar(1).state.filters.length).toBe(0);
+            });
+
+            it('History step 2 should still have old filter zone=a', () => {
+              expect(getStepFilterVar(2).state.filters[0].key).toBe('zone');
+              expect(getStepFilterVar(2).state.filters[0].value).toBe('a');
+            });
+
+            it('Current history step 3 should have new filter zone=b', () => {
+              expect(getStepFilterVar(3).state.filters[0].key).toBe('zone');
+              expect(getStepFilterVar(3).state.filters[0].value).toBe('b');
+            });
+
+            describe('And then when returning again to step 1', () => {
+              beforeEach(() => {
+                trail.state.history.goBackToStep(1);
+              });
+
+              it('Should set history currentStep to 1', () => {
+                expect(trail.state.history.state.currentStep).toBe(1);
+              });
+
+              it('should sync state with url', () => {
+                expect(locationService.getSearchObject()['var-filters']).toBe('');
+              });
+
+              it('Should have filters set back to empty', () => {
+                expect(getFilterVar().state.filters.length).toBe(0);
+              });
+
+              it('History step 1 should still have empty filter', () => {
+                expect(getStepFilterVar(1).state.filters.length).toBe(0);
+              });
+
+              it('History step 2 should still have old filter zone=a', () => {
+                expect(getStepFilterVar(2).state.filters[0].key).toBe('zone');
+                expect(getStepFilterVar(2).state.filters[0].value).toBe('a');
+              });
+
+              it('History step 3 should have new filter zone=b', () => {
+                expect(getStepFilterVar(3).state.filters[0].key).toBe('zone');
+                expect(getStepFilterVar(3).state.filters[0].value).toBe('b');
+              });
+            });
+          });
+        });
+      });
+    });
+
+    describe('When going back to history step 1', () => {
+      beforeEach(() => {
+        trail.publishEvent(new MetricSelectedEvent('first_metric'));
+        trail.publishEvent(new MetricSelectedEvent('second_metric'));
+        trail.state.history.goBackToStep(1);
+      });
+
+      it('Should restore state and url', () => {
+        expect(trail.state.metric).toBe('first_metric');
+        expect(locationService.getSearchObject().metric).toBe('first_metric');
+      });
+
+      it('Should set history currentStep to 1', () => {
+        expect(trail.state.history.state.currentStep).toBe(1);
+      });
+
+      it('Should not create another history step', () => {
+        expect(trail.state.history.state.steps.length).toBe(3);
+      });
+
+      describe('But then selecting a new metric', () => {
+        beforeEach(() => {
+          trail.publishEvent(new MetricSelectedEvent('third_metric'));
+        });
+
+        it('Should create another history step', () => {
+          expect(trail.state.history.state.steps.length).toBe(4);
+        });
+
+        it('Should set history current step to 3', () => {
+          expect(trail.state.history.state.currentStep).toBe(3);
+        });
+
+        it('Should set history step 3 parent index to 1', () => {
+          expect(trail.state.history.state.steps[3].parentIndex).toBe(1);
+        });
+
+        describe('And browser back button is pressed', () => {
+          locationService.getHistory().goBack();
+
+          it('Should return to original URL', () => {
+            const { pathname } = locationService.getLocation();
+            expect(pathname).toEqual(preTrailUrl);
+          });
+        });
+      });
+    });
+    describe('When going back to history step 0', () => {
+      beforeEach(() => {
+        trail.publishEvent(new MetricSelectedEvent('first_metric'));
+        trail.publishEvent(new MetricSelectedEvent('second_metric'));
+        trail.state.history.goBackToStep(0);
+      });
+
+      it('Should remove metric from state and url', () => {
+        expect(trail.state.metric).toBe(undefined);
+
+        expect(locationService.getSearchObject().metric).toBe(undefined);
+        expect(locationService.getSearch().has('metric')).toBe(false);
+      });
+    });
+
+    it('Filter should be empty', () => {
+      expect(getStepFilterVar(0).state.filters.length).toBe(0);
+    });
+
+    describe('And filter is added zone=a', () => {
+      beforeEach(() => {
+        getFilterVar().setState({ filters: [{ key: 'zone', operator: '=', value: 'a' }] });
+      });
+
+      it('Filter of trail should be zone=a', () => {
+        expect(getFilterVar().state.filters[0].key).toBe('zone');
+        expect(getFilterVar().state.filters[0].value).toBe('a');
+      });
+
+      it('Filter of step 1 should be zone=a', () => {
+        expect(getStepFilterVar(1).state.filters[0].key).toBe('zone');
+        expect(getStepFilterVar(1).state.filters[0].value).toBe('a');
+      });
+
+      it('Filter of step 0 should empty', () => {
+        expect(getStepFilterVar(0).state.filters.length).toBe(0);
+      });
+
+      describe('When returning to step 0', () => {
+        beforeEach(() => {
+          trail.state.history.goBackToStep(0);
+        });
+
+        it('Filter of trail should be empty', () => {
+          expect(getFilterVar().state.filters.length).toBe(0);
+        });
+      });
+    });
+
+    it('Time range `from` should be now-6h', () => {
+      expect(trail.state.$timeRange?.state.from).toBe('now-6h');
+    });
+
+    describe('And time range is changed to now-15m to now', () => {
+      beforeEach(() => {
+        trail.state.$timeRange?.setState({ from: 'now-15m' });
+      });
+
+      it('Time range `from` should be now-15m', () => {
+        expect(trail.state.$timeRange?.state.from).toBe('now-15m');
+      });
+
+      it('Time range `from` of step 1 should be now-15m', () => {
+        expect(trail.state.history.state.steps[1].trailState.$timeRange?.state.from).toBe('now-15m');
+      });
+
+      it('Time range `from` of step 0 should be now-6h', () => {
+        expect(trail.state.history.state.steps[0].trailState.$timeRange?.state.from).toBe('now-6h');
+      });
+
+      describe('When returning to step 0', () => {
+        beforeEach(() => {
+          trail.state.history.goBackToStep(0);
+        });
+
+        it('Time range `from` should be now-6h', () => {
+          expect(trail.state.$timeRange?.state.from).toBe('now-6h');
+        });
+      });
+    });
+  });
+});
diff --git a/public/app/features/trails/DataTrail.tsx b/public/app/features/trails/DataTrail.tsx
new file mode 100644
index 0000000000000..8375c23e3ba28
--- /dev/null
+++ b/public/app/features/trails/DataTrail.tsx
@@ -0,0 +1,316 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { AdHocVariableFilter, GrafanaTheme2, VariableHide, urlUtil } from '@grafana/data';
+import { locationService } from '@grafana/runtime';
+import {
+  AdHocFiltersVariable,
+  DataSourceVariable,
+  getUrlSyncManager,
+  SceneComponentProps,
+  SceneControlsSpacer,
+  sceneGraph,
+  SceneObject,
+  SceneObjectBase,
+  SceneObjectState,
+  SceneObjectUrlSyncConfig,
+  SceneObjectUrlValues,
+  SceneRefreshPicker,
+  SceneTimePicker,
+  SceneTimeRange,
+  sceneUtils,
+  SceneVariable,
+  SceneVariableSet,
+  VariableDependencyConfig,
+  VariableValueSelectors,
+} from '@grafana/scenes';
+import { useStyles2 } from '@grafana/ui';
+
+import { DataTrailSettings } from './DataTrailSettings';
+import { DataTrailHistory } from './DataTrailsHistory';
+import { MetricScene } from './MetricScene';
+import { MetricSelectScene } from './MetricSelectScene';
+import { MetricsHeader } from './MetricsHeader';
+import { getTrailStore } from './TrailStore/TrailStore';
+import { MetricDatasourceHelper } from './helpers/MetricDatasourceHelper';
+import { reportChangeInLabelFilters } from './interactions';
+import { MetricSelectedEvent, trailDS, VAR_DATASOURCE, VAR_FILTERS } from './shared';
+
+export interface DataTrailState extends SceneObjectState {
+  topScene?: SceneObject;
+  embedded?: boolean;
+  controls: SceneObject[];
+  history: DataTrailHistory;
+  settings: DataTrailSettings;
+  createdAt: number;
+
+  // just for for the starting data source
+  initialDS?: string;
+  initialFilters?: AdHocVariableFilter[];
+
+  // Synced with url
+  metric?: string;
+}
+
+export class DataTrail extends SceneObjectBase<DataTrailState> {
+  protected _urlSync = new SceneObjectUrlSyncConfig(this, { keys: ['metric'] });
+
+  public constructor(state: Partial<DataTrailState>) {
+    super({
+      $timeRange: state.$timeRange ?? new SceneTimeRange({}),
+      $variables: state.$variables ?? getVariableSet(state.initialDS, state.metric, state.initialFilters),
+      controls: state.controls ?? [
+        new VariableValueSelectors({ layout: 'vertical' }),
+        new SceneControlsSpacer(),
+        new SceneTimePicker({}),
+        new SceneRefreshPicker({}),
+      ],
+      history: state.history ?? new DataTrailHistory({}),
+      settings: state.settings ?? new DataTrailSettings({}),
+      createdAt: state.createdAt ?? new Date().getTime(),
+      ...state,
+    });
+
+    this.addActivationHandler(this._onActivate.bind(this));
+  }
+
+  public _onActivate() {
+    if (!this.state.topScene) {
+      this.setState({ topScene: getTopSceneFor(this.state.metric) });
+    }
+
+    // Some scene elements publish this
+    this.subscribeToEvent(MetricSelectedEvent, this._handleMetricSelectedEvent.bind(this));
+
+    const filtersVariable = sceneGraph.lookupVariable(VAR_FILTERS, this);
+    if (filtersVariable instanceof AdHocFiltersVariable) {
+      this._subs.add(
+        filtersVariable?.subscribeToState((newState, prevState) => {
+          if (!this._addingFilterWithoutReportingInteraction) {
+            reportChangeInLabelFilters(newState.filters, prevState.filters);
+          }
+        })
+      );
+    }
+
+    // Disconnects the current step history state from the current state, to prevent changes affecting history state
+    const currentState = this.state.history.state.steps[this.state.history.state.currentStep]?.trailState;
+    if (currentState) {
+      this.restoreFromHistoryStep(currentState);
+    }
+
+    this.enableUrlSync();
+
+    // Save the current trail as a recent if the browser closes or reloads
+    const saveRecentTrail = () => getTrailStore().setRecentTrail(this);
+    window.addEventListener('unload', saveRecentTrail);
+
+    return () => {
+      this.disableUrlSync();
+
+      if (!this.state.embedded) {
+        saveRecentTrail();
+      }
+      window.removeEventListener('unload', saveRecentTrail);
+    };
+  }
+
+  private enableUrlSync() {
+    if (!this.state.embedded) {
+      getUrlSyncManager().initSync(this);
+    }
+  }
+
+  private disableUrlSync() {
+    if (!this.state.embedded) {
+      getUrlSyncManager().cleanUp(this);
+    }
+  }
+
+  protected _variableDependency = new VariableDependencyConfig(this, {
+    variableNames: [VAR_DATASOURCE],
+    onReferencedVariableValueChanged: (variable: SceneVariable) => {
+      const { name } = variable.state;
+      if (name === VAR_DATASOURCE) {
+        this.datasourceHelper.reset();
+      }
+    },
+  });
+
+  /**
+   * Assuming that the change in filter was already reported with a cause other than `'adhoc_filter'`,
+   * this will modify the adhoc filter variable and prevent the automatic reporting which would
+   * normally occur through the call to `reportChangeInLabelFilters`.
+   */
+  public addFilterWithoutReportingInteraction(filter: AdHocVariableFilter) {
+    const variable = sceneGraph.lookupVariable('filters', this);
+    if (!(variable instanceof AdHocFiltersVariable)) {
+      return;
+    }
+
+    this._addingFilterWithoutReportingInteraction = true;
+
+    variable.setState({ filters: [...variable.state.filters, filter] });
+
+    this._addingFilterWithoutReportingInteraction = false;
+  }
+
+  private _addingFilterWithoutReportingInteraction = false;
+  private datasourceHelper = new MetricDatasourceHelper(this);
+
+  public getMetricMetadata(metric?: string) {
+    return this.datasourceHelper.getMetricMetadata(metric);
+  }
+
+  public getCurrentMetricMetadata() {
+    return this.getMetricMetadata(this.state.metric);
+  }
+
+  public restoreFromHistoryStep(state: DataTrailState) {
+    this.disableUrlSync();
+
+    if (!state.topScene && !state.metric) {
+      // If the top scene for an  is missing, correct it.
+      state.topScene = new MetricSelectScene({});
+    }
+
+    this.setState(
+      sceneUtils.cloneSceneObjectState(state, {
+        history: this.state.history,
+        metric: !state.metric ? undefined : state.metric,
+      })
+    );
+
+    const urlState = getUrlSyncManager().getUrlState(this);
+    const fullUrl = urlUtil.renderUrl(locationService.getLocation().pathname, urlState);
+    locationService.replace(fullUrl);
+
+    this.enableUrlSync();
+  }
+
+  private _handleMetricSelectedEvent(evt: MetricSelectedEvent) {
+    this.setState(this.getSceneUpdatesForNewMetricValue(evt.payload));
+
+    // Add metric to adhoc filters baseFilter
+    const filterVar = sceneGraph.lookupVariable(VAR_FILTERS, this);
+    if (filterVar instanceof AdHocFiltersVariable) {
+      filterVar.setState({
+        baseFilters: getBaseFiltersForMetric(evt.payload),
+      });
+    }
+  }
+
+  private getSceneUpdatesForNewMetricValue(metric: string | undefined) {
+    const stateUpdate: Partial<DataTrailState> = {};
+    stateUpdate.metric = metric;
+    stateUpdate.topScene = getTopSceneFor(metric);
+    return stateUpdate;
+  }
+
+  getUrlState() {
+    return { metric: this.state.metric };
+  }
+
+  updateFromUrl(values: SceneObjectUrlValues) {
+    const stateUpdate: Partial<DataTrailState> = {};
+
+    if (typeof values.metric === 'string') {
+      if (this.state.metric !== values.metric) {
+        Object.assign(stateUpdate, this.getSceneUpdatesForNewMetricValue(values.metric));
+      }
+    } else if (values.metric == null) {
+      stateUpdate.metric = undefined;
+      stateUpdate.topScene = new MetricSelectScene({});
+    }
+
+    this.setState(stateUpdate);
+  }
+
+  static Component = ({ model }: SceneComponentProps<DataTrail>) => {
+    const { controls, topScene, history, settings } = model.useState();
+    const styles = useStyles2(getStyles);
+    const showHeaderForFirstTimeUsers = getTrailStore().recent.length < 2;
+
+    return (
+      <div className={styles.container}>
+        {showHeaderForFirstTimeUsers && <MetricsHeader />}
+        <history.Component model={history} />
+        {controls && (
+          <div className={styles.controls}>
+            {controls.map((control) => (
+              <control.Component key={control.state.key} model={control} />
+            ))}
+            <settings.Component model={settings} />
+          </div>
+        )}
+        <div className={styles.body}>{topScene && <topScene.Component model={topScene} />}</div>
+      </div>
+    );
+  };
+}
+
+export function getTopSceneFor(metric?: string) {
+  if (metric) {
+    return new MetricScene({ metric: metric });
+  } else {
+    return new MetricSelectScene({});
+  }
+}
+
+function getVariableSet(initialDS?: string, metric?: string, initialFilters?: AdHocVariableFilter[]) {
+  return new SceneVariableSet({
+    variables: [
+      new DataSourceVariable({
+        name: VAR_DATASOURCE,
+        label: 'Data source',
+        description: 'Only prometheus data sources are supported',
+        value: initialDS,
+        pluginId: 'prometheus',
+      }),
+      new AdHocFiltersVariable({
+        name: VAR_FILTERS,
+        addFilterButtonText: 'Add label',
+        datasource: trailDS,
+        hide: VariableHide.hideLabel,
+        layout: 'vertical',
+        filters: initialFilters ?? [],
+        baseFilters: getBaseFiltersForMetric(metric),
+      }),
+    ],
+  });
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    container: css({
+      flexGrow: 1,
+      display: 'flex',
+      gap: theme.spacing(1),
+      minHeight: '100%',
+      flexDirection: 'column',
+    }),
+    body: css({
+      flexGrow: 1,
+      display: 'flex',
+      flexDirection: 'column',
+    }),
+    controls: css({
+      display: 'flex',
+      gap: theme.spacing(1),
+      padding: theme.spacing(1, 0),
+      alignItems: 'flex-end',
+      flexWrap: 'wrap',
+      position: 'sticky',
+      background: theme.isDark ? theme.colors.background.canvas : theme.colors.background.primary,
+      zIndex: theme.zIndex.navbarFixed,
+      top: 0,
+    }),
+  };
+}
+
+function getBaseFiltersForMetric(metric?: string): AdHocVariableFilter[] {
+  if (metric) {
+    return [{ key: '__name__', operator: '=', value: metric }];
+  }
+  return [];
+}
diff --git a/public/app/features/trails/DataTrailCard.tsx b/public/app/features/trails/DataTrailCard.tsx
new file mode 100644
index 0000000000000..a9ed32ee9b657
--- /dev/null
+++ b/public/app/features/trails/DataTrailCard.tsx
@@ -0,0 +1,93 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { dateTimeFormat, GrafanaTheme2 } from '@grafana/data';
+import { AdHocFiltersVariable, sceneGraph } from '@grafana/scenes';
+import { Card, IconButton, Stack, Tag, useStyles2 } from '@grafana/ui';
+
+import { DataTrail } from './DataTrail';
+import { VAR_FILTERS } from './shared';
+import { getDataSource, getDataSourceName, getMetricName } from './utils';
+
+export interface Props {
+  trail: DataTrail;
+  onSelect: (trail: DataTrail) => void;
+  onDelete?: () => void;
+}
+
+export function DataTrailCard({ trail, onSelect, onDelete }: Props) {
+  const styles = useStyles2(getStyles);
+
+  const filtersVariable = sceneGraph.lookupVariable(VAR_FILTERS, trail)!;
+  if (!(filtersVariable instanceof AdHocFiltersVariable)) {
+    return null;
+  }
+
+  const filters = filtersVariable.state.filters;
+  const dsValue = getDataSource(trail);
+
+  const onClick = () => onSelect(trail);
+
+  return (
+    <Card onClick={onClick} className={styles.card}>
+      <Card.Heading>{getMetricName(trail.state.metric)}</Card.Heading>
+      <div className={styles.description}>
+        <Stack gap={1.5} wrap="wrap">
+          {filters.map((f) => (
+            <Tag key={f.key} name={`${f.key}: ${f.value}`} colorIndex={12} />
+          ))}
+        </Stack>
+      </div>
+      <Card.Actions className={styles.actions}>
+        <Stack gap={1} justifyContent={'space-between'} grow={1}>
+          <div className={styles.secondary}>
+            <b>Datasource:</b> {getDataSourceName(dsValue)}
+          </div>
+          {trail.state.createdAt && (
+            <i className={styles.secondary}>
+              <b>Created:</b> {dateTimeFormat(trail.state.createdAt, { format: 'LL' })}
+            </i>
+          )}
+        </Stack>
+      </Card.Actions>
+      {onDelete && (
+        <Card.SecondaryActions>
+          <IconButton
+            key="delete"
+            name="trash-alt"
+            className={styles.secondary}
+            tooltip="Remove bookmark"
+            onClick={onDelete}
+          />
+        </Card.SecondaryActions>
+      )}
+    </Card>
+  );
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    tag: css({
+      maxWidth: '260px',
+      overflow: 'hidden',
+      textOverflow: 'ellipsis',
+    }),
+    card: css({
+      padding: theme.spacing(1),
+    }),
+    secondary: css({
+      color: theme.colors.text.secondary,
+      fontSize: '12px',
+    }),
+    description: css({
+      width: '100%',
+      gridArea: 'Description',
+      margin: theme.spacing(1, 0, 0),
+      color: theme.colors.text.secondary,
+      lineHeight: theme.typography.body.lineHeight,
+    }),
+    actions: css({
+      marginRight: theme.spacing(1),
+    }),
+  };
+}
diff --git a/public/app/features/trails/DataTrailSettings.tsx b/public/app/features/trails/DataTrailSettings.tsx
new file mode 100644
index 0000000000000..513efcc9f1ffe
--- /dev/null
+++ b/public/app/features/trails/DataTrailSettings.tsx
@@ -0,0 +1,82 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { SceneComponentProps, SceneObjectBase, SceneObjectState } from '@grafana/scenes';
+import { Dropdown, Switch, ToolbarButton, useStyles2 } from '@grafana/ui';
+
+import { reportExploreMetrics } from './interactions';
+
+export interface DataTrailSettingsState extends SceneObjectState {
+  stickyMainGraph?: boolean;
+  isOpen?: boolean;
+}
+
+export class DataTrailSettings extends SceneObjectBase<DataTrailSettingsState> {
+  constructor(state: Partial<DataTrailSettingsState>) {
+    super({
+      stickyMainGraph: state.stickyMainGraph ?? true,
+      isOpen: state.isOpen ?? false,
+    });
+  }
+
+  public onToggleStickyMainGraph = () => {
+    const stickyMainGraph = !this.state.stickyMainGraph;
+    reportExploreMetrics('settings_changed', { stickyMainGraph });
+    this.setState({ stickyMainGraph });
+  };
+
+  public onToggleOpen = (isOpen: boolean) => {
+    this.setState({ isOpen });
+  };
+
+  static Component = ({ model }: SceneComponentProps<DataTrailSettings>) => {
+    const { stickyMainGraph, isOpen } = model.useState();
+    const styles = useStyles2(getStyles);
+
+    const renderPopover = () => {
+      return (
+        /* eslint-disable-next-line jsx-a11y/no-static-element-interactions, jsx-a11y/click-events-have-key-events */
+        <div className={styles.popover} onClick={(evt) => evt.stopPropagation()}>
+          <div className={styles.heading}>Settings</div>
+          <div className={styles.options}>
+            <div>Always keep selected metric graph in-view</div>
+            <Switch value={stickyMainGraph} onChange={model.onToggleStickyMainGraph} />
+          </div>
+        </div>
+      );
+    };
+
+    return (
+      <Dropdown overlay={renderPopover} placement="bottom" onVisibleChange={model.onToggleOpen}>
+        <ToolbarButton icon="cog" variant="canvas" isOpen={isOpen} />
+      </Dropdown>
+    );
+  };
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    popover: css({
+      display: 'flex',
+      padding: theme.spacing(2),
+      flexDirection: 'column',
+      background: theme.colors.background.primary,
+      boxShadow: theme.shadows.z3,
+      borderRadius: theme.shape.borderRadius(),
+      border: `1px solid ${theme.colors.border.weak}`,
+      zIndex: 1,
+      marginRight: theme.spacing(2),
+    }),
+    heading: css({
+      fontWeight: theme.typography.fontWeightMedium,
+      paddingBottom: theme.spacing(2),
+    }),
+    options: css({
+      display: 'grid',
+      gridTemplateColumns: '1fr 50px',
+      rowGap: theme.spacing(1),
+      columnGap: theme.spacing(2),
+    }),
+  };
+}
diff --git a/public/app/features/trails/DataTrailsApp.tsx b/public/app/features/trails/DataTrailsApp.tsx
new file mode 100644
index 0000000000000..9f2511306be48
--- /dev/null
+++ b/public/app/features/trails/DataTrailsApp.tsx
@@ -0,0 +1,141 @@
+import { css } from '@emotion/css';
+import React, { useEffect } from 'react';
+import { Route, Switch } from 'react-router-dom';
+
+import { GrafanaTheme2, PageLayoutType } from '@grafana/data';
+import { locationService } from '@grafana/runtime';
+import { SceneComponentProps, SceneObjectBase, SceneObjectState, getUrlSyncManager } from '@grafana/scenes';
+import { useStyles2 } from '@grafana/ui';
+import { Page } from 'app/core/components/Page/Page';
+
+import { DataTrail } from './DataTrail';
+import { DataTrailsHome } from './DataTrailsHome';
+import { MetricsHeader } from './MetricsHeader';
+import { getTrailStore } from './TrailStore/TrailStore';
+import { HOME_ROUTE, TRAILS_ROUTE } from './shared';
+import { getMetricName, getUrlForTrail, newMetricsTrail } from './utils';
+
+export interface DataTrailsAppState extends SceneObjectState {
+  trail: DataTrail;
+  home: DataTrailsHome;
+}
+
+export class DataTrailsApp extends SceneObjectBase<DataTrailsAppState> {
+  public constructor(state: DataTrailsAppState) {
+    super(state);
+  }
+
+  goToUrlForTrail(trail: DataTrail) {
+    this.setState({ trail });
+    locationService.push(getUrlForTrail(trail));
+  }
+
+  static Component = ({ model }: SceneComponentProps<DataTrailsApp>) => {
+    const { trail, home } = model.useState();
+    const styles = useStyles2(getStyles);
+
+    return (
+      <Switch>
+        <Route
+          exact={true}
+          path={HOME_ROUTE}
+          render={() => (
+            <Page
+              navId="explore/metrics"
+              layout={PageLayoutType.Standard}
+              renderTitle={() => <MetricsHeader />}
+              subTitle=""
+            >
+              <home.Component model={home} />
+            </Page>
+          )}
+        />
+        <Route
+          exact={true}
+          path={TRAILS_ROUTE}
+          render={() => (
+            <Page
+              navId="explore/metrics"
+              pageNav={{ text: getMetricName(trail.state.metric) }}
+              layout={PageLayoutType.Custom}
+            >
+              <div className={styles.customPage}>
+                <DataTrailView trail={trail} />
+              </div>
+            </Page>
+          )}
+        />
+      </Switch>
+    );
+  };
+}
+
+function DataTrailView({ trail }: { trail: DataTrail }) {
+  const [isInitialized, setIsInitialized] = React.useState(false);
+
+  useEffect(() => {
+    if (!isInitialized) {
+      getTrailStore().setRecentTrail(trail);
+      setIsInitialized(true);
+    }
+  }, [trail, isInitialized]);
+
+  if (!isInitialized) {
+    return null;
+  }
+
+  return <trail.Component model={trail} />;
+}
+
+let dataTrailsApp: DataTrailsApp;
+
+export function getDataTrailsApp() {
+  if (!dataTrailsApp) {
+    dataTrailsApp = new DataTrailsApp({
+      trail: getInitialTrail(),
+      home: new DataTrailsHome({}),
+    });
+  }
+
+  return dataTrailsApp;
+}
+
+/**
+ * Get the initial trail for the app to work with based on the current URL
+ *
+ * It will either be a new trail that will be started based on the state represented
+ * in the URL parameters, or it will be the most recently used trail (according to the trail store)
+ * which has its current history step matching the URL parameters.
+ *
+ * The reason for trying to reinitialize from the recent trail is to resolve an issue
+ * where refreshing the browser would wipe the step history. This allows you to preserve
+ * it between browser refreshes, or when reaccessing the same URL.
+ */
+function getInitialTrail() {
+  const newTrail = newMetricsTrail();
+
+  // Set the initial state of the newTrail based on the URL,
+  // In case we are initializing from an externally created URL or a page reload
+  getUrlSyncManager().initSync(newTrail);
+  // Remove the URL sync for now. It will be restored on the trail if it is activated.
+  getUrlSyncManager().cleanUp(newTrail);
+
+  // If one of the recent trails is a match to the newTrail derived from the current URL,
+  // let's restore that trail so that a page refresh doesn't create a new trail.
+  const recentMatchingTrail = getTrailStore().findMatchingRecentTrail(newTrail)?.resolve();
+
+  // If there is a matching trail, initialize with that. Otherwise, use the new trail.
+  return recentMatchingTrail || newTrail;
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    customPage: css({
+      padding: theme.spacing(2, 3, 2, 3),
+      background: theme.isLight ? theme.colors.background.primary : theme.colors.background.canvas,
+      flexGrow: 1,
+      display: 'flex',
+      flexDirection: 'column',
+    }),
+  };
+}
diff --git a/public/app/features/trails/DataTrailsHistory.tsx b/public/app/features/trails/DataTrailsHistory.tsx
new file mode 100644
index 0000000000000..539174d277fb3
--- /dev/null
+++ b/public/app/features/trails/DataTrailsHistory.tsx
@@ -0,0 +1,332 @@
+import { css, cx } from '@emotion/css';
+import React, { useMemo } from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import {
+  SceneObjectState,
+  SceneObjectBase,
+  SceneComponentProps,
+  SceneVariableValueChangedEvent,
+  SceneObjectStateChangedEvent,
+  SceneTimeRange,
+  sceneUtils,
+} from '@grafana/scenes';
+import { useStyles2, Tooltip, Stack } from '@grafana/ui';
+
+import { DataTrail, DataTrailState, getTopSceneFor } from './DataTrail';
+import { reportExploreMetrics } from './interactions';
+import { VAR_FILTERS } from './shared';
+import { getTrailFor, isSceneTimeRangeState } from './utils';
+
+export interface DataTrailsHistoryState extends SceneObjectState {
+  currentStep: number;
+  steps: DataTrailHistoryStep[];
+}
+
+export function isDataTrailsHistoryState(state: SceneObjectState): state is DataTrailsHistoryState {
+  return 'currentStep' in state && 'steps' in state;
+}
+
+export interface DataTrailHistoryStep {
+  description: string;
+  type: TrailStepType;
+  trailState: DataTrailState;
+  parentIndex: number;
+}
+
+export type TrailStepType = 'filters' | 'time' | 'metric' | 'start';
+export class DataTrailHistory extends SceneObjectBase<DataTrailsHistoryState> {
+  public constructor(state: Partial<DataTrailsHistoryState>) {
+    super({ steps: state.steps ?? [], currentStep: state.currentStep ?? 0 });
+
+    this.addActivationHandler(this._onActivate.bind(this));
+  }
+
+  private stepTransitionInProgress = false;
+
+  public _onActivate() {
+    const trail = getTrailFor(this);
+
+    if (this.state.steps.length === 0) {
+      // We always want to ensure in initial 'start' step
+      this.addTrailStep(trail, 'start');
+
+      if (trail.state.metric) {
+        // But if our current trail has a metric, we want to remove it and the topScene,
+        // so that the "start" step always displays a metric select screen.
+
+        // So we remove the metric and update the topscene for the "start" step
+        const { metric, ...startState } = trail.state;
+        startState.topScene = getTopSceneFor(undefined);
+        this.state.steps[0].trailState = startState;
+
+        // But must add a secondary step to represent the selection of the metric
+        // for this restored trail state
+        this.addTrailStep(trail, 'metric');
+      }
+    }
+
+    trail.subscribeToState((newState, oldState) => {
+      if (newState.metric !== oldState.metric) {
+        if (this.state.steps.length === 1) {
+          // For the first step we want to update the starting state so that it contains data
+          this.state.steps[0].trailState = sceneUtils.cloneSceneObjectState(oldState, { history: this });
+        }
+
+        if (newState.metric || oldState.metric) {
+          this.addTrailStep(trail, 'metric');
+        }
+      }
+    });
+
+    trail.subscribeToEvent(SceneVariableValueChangedEvent, (evt) => {
+      if (evt.payload.state.name === VAR_FILTERS) {
+        this.addTrailStep(trail, 'filters');
+      }
+    });
+
+    trail.subscribeToEvent(SceneObjectStateChangedEvent, (evt) => {
+      if (evt.payload.changedObject instanceof SceneTimeRange) {
+        const { prevState, newState } = evt.payload;
+
+        if (isSceneTimeRangeState(prevState) && isSceneTimeRangeState(newState)) {
+          if (prevState.from === newState.from && prevState.to === newState.to) {
+            return;
+          }
+        }
+
+        this.addTrailStep(trail, 'time');
+      }
+    });
+  }
+
+  public addTrailStep(trail: DataTrail, type: TrailStepType) {
+    if (this.stepTransitionInProgress) {
+      // Do not add trail steps when step transition is in progress
+      return;
+    }
+
+    const stepIndex = this.state.steps.length;
+    const parentIndex = type === 'start' ? -1 : this.state.currentStep;
+
+    this.setState({
+      currentStep: stepIndex,
+      steps: [
+        ...this.state.steps,
+        {
+          description: 'Test',
+          type,
+          trailState: sceneUtils.cloneSceneObjectState(trail.state, { history: this }),
+          parentIndex,
+        },
+      ],
+    });
+  }
+
+  public goBackToStep(stepIndex: number) {
+    if (stepIndex === this.state.currentStep) {
+      return;
+    }
+
+    const step = this.state.steps[stepIndex];
+    const type = step.type === 'metric' && step.trailState.metric === undefined ? 'metric-clear' : step.type;
+
+    reportExploreMetrics('history_step_clicked', { type });
+
+    this.stepTransitionInProgress = true;
+    this.setState({ currentStep: stepIndex });
+
+    getTrailFor(this).restoreFromHistoryStep(step.trailState);
+
+    // The URL will update
+    this.stepTransitionInProgress = false;
+  }
+
+  renderStepTooltip(step: DataTrailHistoryStep) {
+    return (
+      <Stack direction="column">
+        <div>{step.type}</div>
+        {step.type === 'metric' && <div>{step.trailState.metric || 'Select new metric'}</div>}
+      </Stack>
+    );
+  }
+
+  public static Component = ({ model }: SceneComponentProps<DataTrailHistory>) => {
+    const { steps, currentStep } = model.useState();
+    const styles = useStyles2(getStyles);
+
+    const { ancestry, alternatePredecessorStyle } = useMemo(() => {
+      const ancestry = new Set<number>();
+
+      let cursor = currentStep;
+      while (cursor >= 0) {
+        const step = steps[cursor];
+        if (!step) {
+          break;
+        }
+        ancestry.add(cursor);
+        cursor = step.parentIndex;
+      }
+
+      const alternatePredecessorStyle = new Map<number, string>();
+
+      ancestry.forEach((index) => {
+        const parent = steps[index].parentIndex;
+        if (parent + 1 !== index) {
+          alternatePredecessorStyle.set(index, createAlternatePredecessorStyle(index, parent));
+        }
+      });
+
+      return { ancestry, alternatePredecessorStyle };
+    }, [currentStep, steps]);
+
+    return (
+      <div className={styles.container}>
+        <div className={styles.heading}>History</div>
+        {steps.map((step, index) => {
+          let stepType = step.type;
+
+          if (stepType === 'metric' && step.trailState.metric === undefined) {
+            // If we're resetting the metric, we want it to look like a start node
+            stepType = 'start';
+          }
+
+          return (
+            <Tooltip content={() => model.renderStepTooltip(step)} key={index}>
+              <button
+                className={cx(
+                  // Base for all steps
+                  styles.step,
+                  // Specifics per step type
+                  styles.stepTypes[stepType],
+                  // To highlight selected step
+                  model.state.currentStep === index ? styles.stepSelected : '',
+                  // To alter the look of steps with distant non-directly preceding parent
+                  alternatePredecessorStyle.get(index) ?? '',
+                  // To remove direct link for steps that don't have a direct parent
+                  index !== step.parentIndex + 1 ? styles.stepOmitsDirectLeftLink : '',
+                  // To remove the direct parent link on the start node as well
+                  index === 0 ? styles.stepOmitsDirectLeftLink : '',
+                  // To darken steps that aren't the current step's ancesters
+                  !ancestry.has(index) ? styles.stepIsNotAncestorOfCurrent : ''
+                )}
+                onClick={() => model.goBackToStep(index)}
+              ></button>
+            </Tooltip>
+          );
+        })}
+      </div>
+    );
+  };
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  const visTheme = theme.visualization;
+
+  return {
+    container: css({
+      display: 'flex',
+      gap: 10,
+      alignItems: 'center',
+    }),
+    heading: css({}),
+    step: css({
+      flexGrow: 0,
+      cursor: 'pointer',
+      border: 'none',
+      boxShadow: 'none',
+      padding: 0,
+      margin: 0,
+      width: 8,
+      height: 8,
+      opacity: 0.7,
+      borderRadius: theme.shape.radius.circle,
+      background: theme.colors.primary.main,
+      position: 'relative',
+      '&:hover': {
+        opacity: 1,
+      },
+      '&:hover:before': {
+        // We only want the node to hover, not its connection to its parent
+        opacity: 0.7,
+      },
+      '&:before': {
+        content: '""',
+        position: 'absolute',
+        width: 10,
+        height: 2,
+        left: -10,
+        top: 3,
+        background: theme.colors.primary.border,
+        pointerEvents: 'none',
+      },
+    }),
+    stepSelected: css({
+      '&:after': {
+        content: '""',
+        borderStyle: `solid`,
+        borderWidth: 2,
+        borderRadius: '50%',
+        position: 'absolute',
+        width: 16,
+        height: 16,
+        left: -4,
+        top: -4,
+        boxShadow: `0px 0px 0px 2px inset ${theme.colors.background.canvas}`,
+      },
+    }),
+    stepOmitsDirectLeftLink: css({
+      '&:before': {
+        background: 'none',
+      },
+    }),
+    stepIsNotAncestorOfCurrent: css({
+      opacity: 0.2,
+      '&:hover:before': {
+        opacity: 0.2,
+      },
+    }),
+    stepTypes: {
+      start: generateStepTypeStyle(visTheme.getColorByName('green')),
+      filters: generateStepTypeStyle(visTheme.getColorByName('purple')),
+      metric: generateStepTypeStyle(visTheme.getColorByName('orange')),
+      time: generateStepTypeStyle(theme.colors.primary.main),
+    },
+  };
+}
+
+function generateStepTypeStyle(color: string) {
+  return css({
+    background: color,
+    '&:before': {
+      background: color,
+      borderColor: color,
+    },
+    '&:after': {
+      borderColor: color,
+    },
+  });
+}
+
+function createAlternatePredecessorStyle(index: number, parent: number) {
+  const difference = index - parent;
+
+  const NODE_DISTANCE = 18;
+  const distanceToParent = difference * NODE_DISTANCE;
+
+  return css({
+    '&:before': {
+      content: '""',
+      width: distanceToParent + 2,
+      height: 10,
+      borderStyle: 'solid',
+      borderWidth: 2,
+      borderBottom: 'none',
+      borderTopLeftRadius: 8,
+      borderTopRightRadius: 8,
+      top: -10,
+      left: 3 - distanceToParent,
+      background: 'none',
+    },
+  });
+}
diff --git a/public/app/features/trails/DataTrailsHome.tsx b/public/app/features/trails/DataTrailsHome.tsx
new file mode 100644
index 0000000000000..8fe68541118fe
--- /dev/null
+++ b/public/app/features/trails/DataTrailsHome.tsx
@@ -0,0 +1,138 @@
+import { css } from '@emotion/css';
+import React, { useState } from 'react';
+import { Redirect } from 'react-router-dom';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { SceneComponentProps, sceneGraph, SceneObject, SceneObjectBase, SceneObjectState } from '@grafana/scenes';
+import { Button, Stack, useStyles2 } from '@grafana/ui';
+import { Text } from '@grafana/ui/src/components/Text/Text';
+
+import { DataTrail } from './DataTrail';
+import { DataTrailCard } from './DataTrailCard';
+import { DataTrailsApp } from './DataTrailsApp';
+import { getTrailStore } from './TrailStore/TrailStore';
+import { reportExploreMetrics } from './interactions';
+import { getDatasourceForNewTrail, getUrlForTrail, newMetricsTrail } from './utils';
+
+export interface DataTrailsHomeState extends SceneObjectState {}
+
+export class DataTrailsHome extends SceneObjectBase<DataTrailsHomeState> {
+  public constructor(state: DataTrailsHomeState) {
+    super(state);
+  }
+
+  public onNewMetricsTrail = () => {
+    const app = getAppFor(this);
+    const trail = newMetricsTrail(getDatasourceForNewTrail());
+    reportExploreMetrics('exploration_started', { cause: 'new_clicked' });
+    getTrailStore().setRecentTrail(trail);
+    app.goToUrlForTrail(trail);
+  };
+
+  public onSelectTrail = (trail: DataTrail, isBookmark: boolean) => {
+    const app = getAppFor(this);
+    reportExploreMetrics('exploration_started', { cause: isBookmark ? 'bookmark_clicked' : 'recent_clicked' });
+    getTrailStore().setRecentTrail(trail);
+    app.goToUrlForTrail(trail);
+  };
+
+  static Component = ({ model }: SceneComponentProps<DataTrailsHome>) => {
+    const [_, setLastDelete] = useState(Date.now());
+    const styles = useStyles2(getStyles);
+
+    const onDelete = (index: number) => {
+      getTrailStore().removeBookmark(index);
+      reportExploreMetrics('bookmark_changed', { action: 'deleted' });
+      setLastDelete(Date.now()); // trigger re-render
+    };
+
+    // If there are no recent trails, don't show home page and create a new trail
+    if (!getTrailStore().recent.length) {
+      const trail = newMetricsTrail(getDatasourceForNewTrail());
+      return <Redirect to={getUrlForTrail(trail)} />;
+    }
+
+    const onSelectRecent = (trail: DataTrail) => model.onSelectTrail(trail, false);
+    const onSelectBookmark = (trail: DataTrail) => model.onSelectTrail(trail, true);
+
+    return (
+      <div className={styles.container}>
+        <Stack direction={'column'} gap={1} alignItems={'start'}>
+          <Button icon="plus" size="md" variant="primary" onClick={model.onNewMetricsTrail}>
+            New metric exploration
+          </Button>
+        </Stack>
+
+        <Stack gap={5}>
+          <div className={styles.column}>
+            <Text variant="h4">Recent metrics</Text>
+            <div className={styles.trailList}>
+              {getTrailStore().recent.map((trail, index) => {
+                const resolvedTrail = trail.resolve();
+                return (
+                  <DataTrailCard
+                    key={(resolvedTrail.state.key || '') + index}
+                    trail={resolvedTrail}
+                    onSelect={onSelectRecent}
+                  />
+                );
+              })}
+            </div>
+          </div>
+          <div className={styles.verticalLine} />
+          <div className={styles.column}>
+            <Text variant="h4">Bookmarks</Text>
+            <div className={styles.trailList}>
+              {getTrailStore().bookmarks.map((trail, index) => {
+                const resolvedTrail = trail.resolve();
+                return (
+                  <DataTrailCard
+                    key={(resolvedTrail.state.key || '') + index}
+                    trail={resolvedTrail}
+                    onSelect={onSelectBookmark}
+                    onDelete={() => onDelete(index)}
+                  />
+                );
+              })}
+            </div>
+          </div>
+        </Stack>
+      </div>
+    );
+  };
+}
+
+function getAppFor(model: SceneObject) {
+  return sceneGraph.getAncestor(model, DataTrailsApp);
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    container: css({
+      flexGrow: 1,
+      display: 'flex',
+      flexDirection: 'column',
+      gap: theme.spacing(3),
+    }),
+    column: css({
+      display: 'flex',
+      flexGrow: 1,
+      flexDirection: 'column',
+      gap: theme.spacing(2),
+    }),
+    newTrail: css({
+      height: 'auto',
+      justifyContent: 'center',
+      fontSize: theme.typography.h5.fontSize,
+    }),
+    trailCard: css({}),
+    trailList: css({
+      display: 'flex',
+      flexDirection: 'column',
+      gap: theme.spacing(2),
+    }),
+    verticalLine: css({
+      borderLeft: `1px solid ${theme.colors.border.weak}`,
+    }),
+  };
+}
diff --git a/public/app/features/trails/DataTrailsPage.tsx b/public/app/features/trails/DataTrailsPage.tsx
new file mode 100644
index 0000000000000..f473b90c91cf5
--- /dev/null
+++ b/public/app/features/trails/DataTrailsPage.tsx
@@ -0,0 +1,11 @@
+// Libraries
+import React from 'react';
+
+import { getDataTrailsApp } from './DataTrailsApp';
+
+export function DataTrailsPage() {
+  const app = getDataTrailsApp();
+  return <app.Component model={app} />;
+}
+
+export default DataTrailsPage;
diff --git a/public/app/features/trails/Integrations/DataTrailEmbedded.tsx b/public/app/features/trails/Integrations/DataTrailEmbedded.tsx
new file mode 100644
index 0000000000000..67b4ae6312cbb
--- /dev/null
+++ b/public/app/features/trails/Integrations/DataTrailEmbedded.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+
+import { AdHocVariableFilter } from '@grafana/data';
+import { SceneComponentProps, SceneObjectBase, SceneObjectState, SceneTimeRangeLike } from '@grafana/scenes';
+
+import { DataTrail } from '../DataTrail';
+
+export interface DataTrailEmbeddedState extends SceneObjectState {
+  timeRange: SceneTimeRangeLike;
+  metric?: string;
+  filters?: AdHocVariableFilter[];
+  dataSourceUid?: string;
+}
+export class DataTrailEmbedded extends SceneObjectBase<DataTrailEmbeddedState> {
+  static Component = DataTrailEmbeddedRenderer;
+
+  public trail: DataTrail;
+
+  constructor(state: DataTrailEmbeddedState) {
+    super(state);
+    this.trail = buildDataTrailFromState(state);
+  }
+}
+
+function DataTrailEmbeddedRenderer({ model }: SceneComponentProps<DataTrailEmbedded>) {
+  return <model.trail.Component model={model.trail} />;
+}
+
+export function buildDataTrailFromState({ metric, filters, dataSourceUid, timeRange }: DataTrailEmbeddedState) {
+  return new DataTrail({
+    $timeRange: timeRange,
+    metric,
+    initialDS: dataSourceUid,
+    initialFilters: filters,
+    embedded: true,
+  });
+}
diff --git a/public/app/features/trails/Integrations/SceneDrawer.tsx b/public/app/features/trails/Integrations/SceneDrawer.tsx
new file mode 100644
index 0000000000000..0cb7a29bf356a
--- /dev/null
+++ b/public/app/features/trails/Integrations/SceneDrawer.tsx
@@ -0,0 +1,64 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { SceneComponentProps, SceneObjectBase, SceneObject, SceneObjectState } from '@grafana/scenes';
+import { Drawer, useStyles2 } from '@grafana/ui';
+import appEvents from 'app/core/app_events';
+import { ShowModalReactEvent } from 'app/types/events';
+
+export type SceneDrawerProps = {
+  scene: SceneObject;
+  title: string;
+  onDismiss: () => void;
+};
+
+export function SceneDrawer(props: SceneDrawerProps) {
+  const { scene, title, onDismiss } = props;
+  const styles = useStyles2(getStyles);
+
+  return (
+    <Drawer title={title} onClose={onDismiss} size="lg">
+      <div className={styles.drawerInnerWrapper}>
+        <scene.Component model={scene} />
+      </div>
+    </Drawer>
+  );
+}
+
+interface SceneDrawerAsSceneState extends SceneObjectState, SceneDrawerProps {}
+
+export class SceneDrawerAsScene extends SceneObjectBase<SceneDrawerAsSceneState> {
+  constructor(state: SceneDrawerProps) {
+    super(state);
+  }
+
+  static Component({ model }: SceneComponentProps<SceneDrawerAsScene>) {
+    const state = model.useState();
+
+    return <SceneDrawer {...state} />;
+  }
+}
+
+export function launchSceneDrawerInGlobalModal(props: Omit<SceneDrawerProps, 'onDismiss'>) {
+  const payload = {
+    component: SceneDrawer,
+    props,
+  };
+
+  appEvents.publish(new ShowModalReactEvent(payload));
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    drawerInnerWrapper: css({
+      display: 'flex',
+      padding: theme.spacing(2),
+      background: theme.isDark ? theme.colors.background.canvas : theme.colors.background.primary,
+      position: 'absolute',
+      left: 0,
+      right: 0,
+      top: 0,
+    }),
+  };
+}
diff --git a/public/app/features/trails/Integrations/dashboardIntegration.ts b/public/app/features/trails/Integrations/dashboardIntegration.ts
new file mode 100644
index 0000000000000..12fa49cc771ae
--- /dev/null
+++ b/public/app/features/trails/Integrations/dashboardIntegration.ts
@@ -0,0 +1,124 @@
+import { PanelMenuItem } from '@grafana/data';
+import { PromQuery } from '@grafana/prometheus';
+import { getDataSourceSrv } from '@grafana/runtime';
+import { SceneTimeRangeLike, VizPanel } from '@grafana/scenes';
+import { DataQuery, DataSourceRef } from '@grafana/schema';
+import { getQueryRunnerFor } from 'app/features/dashboard-scene/utils/utils';
+
+import { DashboardScene } from '../../dashboard-scene/scene/DashboardScene';
+import { MetricScene } from '../MetricScene';
+import { reportExploreMetrics } from '../interactions';
+
+import { DataTrailEmbedded, DataTrailEmbeddedState } from './DataTrailEmbedded';
+import { SceneDrawerAsScene } from './SceneDrawer';
+import { QueryMetric, getQueryMetrics } from './getQueryMetrics';
+import { createAdHocFilters, getQueryMetricLabel, getTimeRangeFromDashboard } from './utils';
+
+export async function addDataTrailPanelAction(dashboard: DashboardScene, panel: VizPanel, items: PanelMenuItem[]) {
+  if (panel.state.pluginId !== 'timeseries') {
+    return;
+  }
+
+  const queryRunner = getQueryRunnerFor(panel);
+  if (queryRunner == null) {
+    return;
+  }
+
+  const { queries, datasource, data } = queryRunner.state;
+
+  if (datasource == null) {
+    return;
+  }
+
+  if (datasource.type !== 'prometheus') {
+    return;
+  }
+
+  const dataSourceApi = await getDataSourceSrv().get(datasource);
+
+  if (dataSourceApi.interpolateVariablesInQueries == null) {
+    return;
+  }
+
+  const interpolated = dataSourceApi
+    .interpolateVariablesInQueries(queries, { __sceneObject: { value: panel } }, data?.request?.filters)
+    .filter(isPromQuery);
+
+  const queryMetrics = getQueryMetrics(interpolated.map((q) => q.expr));
+
+  const subMenu: PanelMenuItem[] = queryMetrics.map((item) => {
+    return {
+      text: getQueryMetricLabel(item),
+      onClick: createClickHandler(item, dashboard, dataSourceApi),
+    };
+  });
+
+  if (subMenu.length > 0) {
+    items.push({
+      text: 'Explore metrics',
+      iconClassName: 'code-branch',
+      subMenu: getUnique(subMenu),
+    });
+  }
+}
+
+function getUnique<T extends { text: string }>(items: T[]) {
+  const uniqueMenuTexts = new Set<string>();
+  function isUnique({ text }: { text: string }) {
+    const before = uniqueMenuTexts.size;
+    uniqueMenuTexts.add(text);
+    const after = uniqueMenuTexts.size;
+    return after > before;
+  }
+  return items.filter(isUnique);
+}
+
+function getEmbeddedTrailsState(
+  { metric, labelFilters, query }: QueryMetric,
+  timeRange: SceneTimeRangeLike,
+  dataSourceUid: string | undefined
+) {
+  const state: DataTrailEmbeddedState = {
+    metric,
+    filters: createAdHocFilters(labelFilters),
+    dataSourceUid,
+    timeRange,
+  };
+
+  return state;
+}
+
+function createCommonEmbeddedTrailStateProps(item: QueryMetric, dashboard: DashboardScene, ds: DataSourceRef) {
+  const timeRange = getTimeRangeFromDashboard(dashboard);
+  const trailState = getEmbeddedTrailsState(item, timeRange, ds.uid);
+  const embeddedTrail: DataTrailEmbedded = new DataTrailEmbedded(trailState);
+
+  embeddedTrail.trail.addActivationHandler(() => {
+    if (embeddedTrail.trail.state.topScene instanceof MetricScene) {
+      embeddedTrail.trail.state.topScene.setActionView('breakdown');
+    }
+  });
+
+  const commonProps = {
+    scene: embeddedTrail,
+    title: 'Explore metrics',
+  };
+
+  return commonProps;
+}
+
+function createClickHandler(item: QueryMetric, dashboard: DashboardScene, ds: DataSourceRef) {
+  return () => {
+    const commonProps = createCommonEmbeddedTrailStateProps(item, dashboard, ds);
+    const drawerScene = new SceneDrawerAsScene({
+      ...commonProps,
+      onDismiss: () => dashboard.closeModal(),
+    });
+    reportExploreMetrics('exploration_started', { cause: 'dashboard_panel' });
+    dashboard.showModal(drawerScene);
+  };
+}
+
+export function isPromQuery(model: DataQuery): model is PromQuery {
+  return 'expr' in model;
+}
diff --git a/public/app/features/trails/Integrations/getQueryMetrics.ts b/public/app/features/trails/Integrations/getQueryMetrics.ts
new file mode 100644
index 0000000000000..5273756dc226e
--- /dev/null
+++ b/public/app/features/trails/Integrations/getQueryMetrics.ts
@@ -0,0 +1,31 @@
+import { buildVisualQueryFromString } from '@grafana/prometheus/src/querybuilder/parsing';
+import { QueryBuilderLabelFilter } from '@grafana/prometheus/src/querybuilder/shared/types';
+
+import { isEquals } from './utils';
+
+/** An identified metric and its label for a query */
+export type QueryMetric = {
+  metric: string;
+  labelFilters: QueryBuilderLabelFilter[];
+  query: string;
+};
+
+export function getQueryMetrics(queries: string[]) {
+  const queryMetrics: QueryMetric[] = [];
+
+  queries.forEach((query) => {
+    const struct = buildVisualQueryFromString(query);
+    if (struct.errors.length > 0) {
+      return;
+    }
+
+    const { metric, labels } = struct.query;
+
+    queryMetrics.push({ metric, labelFilters: labels.filter(isEquals), query });
+    struct.query.binaryQueries?.forEach(({ query: { metric, labels } }) => {
+      queryMetrics.push({ metric, labelFilters: labels.filter(isEquals), query });
+    });
+  });
+
+  return queryMetrics;
+}
diff --git a/public/app/features/trails/Integrations/utils.ts b/public/app/features/trails/Integrations/utils.ts
new file mode 100644
index 0000000000000..372d81ae999a4
--- /dev/null
+++ b/public/app/features/trails/Integrations/utils.ts
@@ -0,0 +1,27 @@
+import { QueryBuilderLabelFilter } from '@grafana/prometheus/src/querybuilder/shared/types';
+import { DashboardScene } from 'app/features/dashboard-scene/scene/DashboardScene';
+
+import { QueryMetric } from './getQueryMetrics';
+
+// We only support label filters with the '=' operator
+export function isEquals(labelFilter: QueryBuilderLabelFilter) {
+  return labelFilter.op === '=';
+}
+
+export function getTimeRangeFromDashboard(dashboard: DashboardScene) {
+  return dashboard.state.$timeRange!.clone();
+}
+
+export function getQueryMetricLabel({ metric, labelFilters }: QueryMetric) {
+  // Don't show the filter unless there is more than one entry
+  if (labelFilters.length === 0) {
+    return metric;
+  }
+
+  const filter = `{${labelFilters.map(({ label, op, value }) => `${label}${op}"${value}"`)}}`;
+  return `${metric}${filter}`;
+}
+
+export function createAdHocFilters(labels: QueryBuilderLabelFilter[]) {
+  return labels?.map((label) => ({ key: label.label, value: label.value, operator: label.op }));
+}
diff --git a/public/app/features/trails/MetricCategory/MetricCategoryCascader.tsx b/public/app/features/trails/MetricCategory/MetricCategoryCascader.tsx
new file mode 100644
index 0000000000000..7dd6fa4c440e0
--- /dev/null
+++ b/public/app/features/trails/MetricCategory/MetricCategoryCascader.tsx
@@ -0,0 +1,62 @@
+import React, { useMemo } from 'react';
+
+import { Cascader, CascaderOption } from '@grafana/ui';
+
+import { useMetricCategories } from './useMetricCategories';
+
+type Props = {
+  metricNames: string[];
+  onSelect: (prefix: string | undefined) => void;
+  disabled?: boolean;
+  initialValue?: string;
+};
+
+export function MetricCategoryCascader({ metricNames, onSelect, disabled, initialValue }: Props) {
+  const categoryTree = useMetricCategories(metricNames);
+  const options = useMemo(() => createCasaderOptions(categoryTree), [categoryTree]);
+
+  return (
+    <Cascader
+      displayAllSelectedLevels={true}
+      width={40}
+      separator="_"
+      hideActiveLevelLabel={false}
+      placeholder={'No filter'}
+      isClearable
+      onSelect={(prefix) => {
+        onSelect(prefix);
+      }}
+      {...{ options, disabled, initialValue }}
+    />
+  );
+}
+
+function createCasaderOptions(tree: ReturnType<typeof useMetricCategories>, currentPrefix = '') {
+  const categories = Object.entries(tree.children);
+
+  const options = categories.map(([metricPart, node]) => {
+    let subcategoryEntries = Object.entries(node.children);
+
+    while (subcategoryEntries.length === 1 && !node.isMetric) {
+      // There is only one subcategory, so we will join it with the current metricPart to reduce depth
+      const [subMetricPart, subNode] = subcategoryEntries[0];
+      metricPart = `${metricPart}_${subMetricPart}`;
+      // Extend the metric part name, because there is only one subcategory
+      node = subNode;
+      subcategoryEntries = Object.entries(node.children);
+    }
+
+    const value = currentPrefix + metricPart;
+    const subOptions = createCasaderOptions(node, value + '_');
+
+    const option: CascaderOption = {
+      value: value,
+      label: metricPart,
+      items: subOptions,
+    };
+
+    return option;
+  });
+
+  return options;
+}
diff --git a/public/app/features/trails/MetricCategory/useMetricCategories.ts b/public/app/features/trails/MetricCategory/useMetricCategories.ts
new file mode 100644
index 0000000000000..8e000a858c97a
--- /dev/null
+++ b/public/app/features/trails/MetricCategory/useMetricCategories.ts
@@ -0,0 +1,43 @@
+import { useMemo } from 'react';
+
+export function useMetricCategories(metrics: string[]) {
+  return useMemo(() => processMetrics(metrics), [metrics]);
+}
+
+interface MetricPartNode {
+  isMetric?: boolean;
+  children: Record<string, MetricPartNode>;
+}
+
+function processMetrics(metrics: string[]) {
+  const categoryTree: MetricPartNode = { children: {} };
+
+  function insertMetric(metric: string) {
+    if (metric.indexOf(':') !== -1) {
+      // Ignore recording rules.
+      return;
+    }
+
+    const metricParts = metric.split('_');
+
+    let cursor = categoryTree;
+    for (const metricPart of metricParts) {
+      let node = cursor.children[metricPart];
+      if (!node) {
+        // Create new node
+        node = {
+          children: {},
+        };
+        // Insert it
+        cursor.children[metricPart] = node;
+      }
+      cursor = node;
+    }
+    // We know this node is a metric because it was for the last metricPart
+    cursor.isMetric = true;
+  }
+
+  metrics.forEach((metric) => insertMetric(metric));
+
+  return categoryTree;
+}
diff --git a/public/app/features/trails/MetricGraphScene.tsx b/public/app/features/trails/MetricGraphScene.tsx
new file mode 100644
index 0000000000000..78ec601f13566
--- /dev/null
+++ b/public/app/features/trails/MetricGraphScene.tsx
@@ -0,0 +1,90 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { DashboardCursorSync, GrafanaTheme2 } from '@grafana/data';
+import {
+  behaviors,
+  SceneComponentProps,
+  SceneFlexItem,
+  SceneFlexLayout,
+  SceneObject,
+  SceneObjectBase,
+  SceneObjectState,
+} from '@grafana/scenes';
+import { useStyles2 } from '@grafana/ui';
+
+import { AutoVizPanel } from './AutomaticMetricQueries/AutoVizPanel';
+import { MetricActionBar } from './MetricScene';
+import { getTrailSettings } from './utils';
+
+export const MAIN_PANEL_MIN_HEIGHT = 280;
+export const MAIN_PANEL_MAX_HEIGHT = '40%';
+
+export interface MetricGraphSceneState extends SceneObjectState {
+  topView: SceneFlexLayout;
+  selectedTab?: SceneObject;
+}
+
+export class MetricGraphScene extends SceneObjectBase<MetricGraphSceneState> {
+  public constructor(state: Partial<MetricGraphSceneState>) {
+    super({
+      topView: state.topView ?? buildGraphTopView(),
+      ...state,
+    });
+  }
+
+  public static Component = ({ model }: SceneComponentProps<MetricGraphScene>) => {
+    const { topView, selectedTab } = model.useState();
+    const { stickyMainGraph } = getTrailSettings(model).useState();
+    const styles = useStyles2(getStyles);
+
+    return (
+      <div className={styles.container}>
+        <div className={stickyMainGraph ? styles.sticky : styles.nonSticky}>
+          <topView.Component model={topView} />
+        </div>
+        {selectedTab && <selectedTab.Component model={selectedTab} />}
+      </div>
+    );
+  };
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    container: css({
+      display: 'flex',
+      flexDirection: 'column',
+      position: 'relative',
+    }),
+    sticky: css({
+      display: 'flex',
+      flexDirection: 'row',
+      background: theme.isLight ? theme.colors.background.primary : theme.colors.background.canvas,
+      position: 'sticky',
+      top: '70px',
+      zIndex: 10,
+    }),
+    nonSticky: css({
+      display: 'flex',
+      flexDirection: 'row',
+    }),
+  };
+}
+
+function buildGraphTopView() {
+  return new SceneFlexLayout({
+    direction: 'column',
+    $behaviors: [new behaviors.CursorSync({ key: 'metricCrosshairSync', sync: DashboardCursorSync.Crosshair })],
+    children: [
+      new SceneFlexItem({
+        minHeight: MAIN_PANEL_MIN_HEIGHT,
+        maxHeight: MAIN_PANEL_MAX_HEIGHT,
+        body: new AutoVizPanel({}),
+      }),
+      new SceneFlexItem({
+        ySizing: 'content',
+        body: new MetricActionBar({}),
+      }),
+    ],
+  });
+}
diff --git a/public/app/features/trails/MetricScene.tsx b/public/app/features/trails/MetricScene.tsx
new file mode 100644
index 0000000000000..fb6cb6a1d79db
--- /dev/null
+++ b/public/app/features/trails/MetricScene.tsx
@@ -0,0 +1,273 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { config } from '@grafana/runtime';
+import {
+  SceneObjectState,
+  SceneObjectBase,
+  SceneComponentProps,
+  SceneObjectUrlSyncConfig,
+  SceneObjectUrlValues,
+  sceneGraph,
+  SceneVariableSet,
+  QueryVariable,
+} from '@grafana/scenes';
+import { ToolbarButton, Box, Stack, Icon, TabsBar, Tab, useStyles2, LinkButton, Tooltip } from '@grafana/ui';
+
+import { getExploreUrl } from '../../core/utils/explore';
+
+import { buildBreakdownActionScene } from './ActionTabs/BreakdownScene';
+import { buildMetricOverviewScene } from './ActionTabs/MetricOverviewScene';
+import { buildRelatedMetricsScene } from './ActionTabs/RelatedMetricsScene';
+import { LayoutType } from './ActionTabs/types';
+import { getAutoQueriesForMetric } from './AutomaticMetricQueries/AutoQueryEngine';
+import { AutoQueryDef, AutoQueryInfo } from './AutomaticMetricQueries/types';
+import { MAIN_PANEL_MAX_HEIGHT, MAIN_PANEL_MIN_HEIGHT, MetricGraphScene } from './MetricGraphScene';
+import { ShareTrailButton } from './ShareTrailButton';
+import { useBookmarkState } from './TrailStore/useBookmarkState';
+import { reportExploreMetrics } from './interactions';
+import {
+  ActionViewDefinition,
+  ActionViewType,
+  getVariablesWithMetricConstant,
+  MakeOptional,
+  MetricSelectedEvent,
+  trailDS,
+  VAR_GROUP_BY,
+  VAR_METRIC_EXPR,
+} from './shared';
+import { getDataSource, getTrailFor, getUrlForTrail } from './utils';
+
+export interface MetricSceneState extends SceneObjectState {
+  body: MetricGraphScene;
+  metric: string;
+  actionView?: string;
+  layout: LayoutType;
+
+  autoQuery: AutoQueryInfo;
+  queryDef?: AutoQueryDef;
+}
+
+export class MetricScene extends SceneObjectBase<MetricSceneState> {
+  protected _urlSync = new SceneObjectUrlSyncConfig(this, { keys: ['actionView', 'layout'] });
+
+  public constructor(state: MakeOptional<MetricSceneState, 'body' | 'autoQuery' | 'layout'>) {
+    const autoQuery = state.autoQuery ?? getAutoQueriesForMetric(state.metric);
+    super({
+      $variables: state.$variables ?? getVariableSet(state.metric),
+      body: state.body ?? new MetricGraphScene({}),
+      autoQuery,
+      queryDef: state.queryDef ?? autoQuery.main,
+      layout: state.layout ?? 'grid',
+      ...state,
+    });
+
+    this.addActivationHandler(this._onActivate.bind(this));
+  }
+
+  private _onActivate() {
+    if (this.state.actionView === undefined) {
+      this.setActionView('overview');
+    }
+  }
+
+  getUrlState() {
+    return { actionView: this.state.actionView, layout: this.state.layout };
+  }
+
+  updateFromUrl(values: SceneObjectUrlValues) {
+    if (typeof values.actionView === 'string') {
+      if (this.state.actionView !== values.actionView) {
+        const actionViewDef = actionViewsDefinitions.find((v) => v.value === values.actionView);
+        if (actionViewDef) {
+          this.setActionView(actionViewDef.value);
+        }
+      }
+    } else if (values.actionView === null) {
+      this.setActionView(undefined);
+    }
+
+    if (typeof values.layout === 'string') {
+      const newLayout = values.layout as LayoutType;
+      if (this.state.layout !== newLayout) {
+        this.setState({ layout: newLayout });
+      }
+    }
+  }
+
+  public setActionView(actionView?: ActionViewType) {
+    const { body } = this.state;
+    const actionViewDef = actionViewsDefinitions.find((v) => v.value === actionView);
+
+    if (actionViewDef && actionViewDef.value !== this.state.actionView) {
+      // reduce max height for main panel to reduce height flicker
+      body.state.topView.state.children[0].setState({ maxHeight: MAIN_PANEL_MIN_HEIGHT });
+      body.setState({ selectedTab: actionViewDef.getScene() });
+      this.setState({ actionView: actionViewDef.value });
+    } else {
+      // restore max height
+      body.state.topView.state.children[0].setState({ maxHeight: MAIN_PANEL_MAX_HEIGHT });
+      body.setState({ selectedTab: undefined });
+      this.setState({ actionView: undefined });
+    }
+  }
+
+  static Component = ({ model }: SceneComponentProps<MetricScene>) => {
+    const { body } = model.useState();
+    return <body.Component model={body} />;
+  };
+}
+
+const actionViewsDefinitions: ActionViewDefinition[] = [
+  { displayName: 'Overview', value: 'overview', getScene: buildMetricOverviewScene },
+  { displayName: 'Breakdown', value: 'breakdown', getScene: buildBreakdownActionScene },
+  {
+    displayName: 'Related metrics',
+    value: 'related',
+    getScene: buildRelatedMetricsScene,
+    description: 'Relevant metrics based on current label filters',
+  },
+];
+
+export interface MetricActionBarState extends SceneObjectState {}
+
+export class MetricActionBar extends SceneObjectBase<MetricActionBarState> {
+  public getLinkToExplore = async () => {
+    const metricScene = sceneGraph.getAncestor(this, MetricScene);
+    const trail = getTrailFor(this);
+    const dsValue = getDataSource(trail);
+
+    const queries = metricScene.state.queryDef?.queries || [];
+    const timeRange = sceneGraph.getTimeRange(this);
+
+    return getExploreUrl({
+      queries,
+      dsRef: { uid: dsValue },
+      timeRange: timeRange.state.value,
+      scopedVars: { __sceneObject: { value: metricScene } },
+    });
+  };
+
+  public openExploreLink = async () => {
+    reportExploreMetrics('selected_metric_action_clicked', { action: 'open_in_explore' });
+    this.getLinkToExplore().then((link) => {
+      // We need to ensure we prefix with the appSubUrl for environments that don't host grafana at the root.
+      const url = `${config.appSubUrl}${link}`;
+      // We use window.open instead of a Link or <a> because we want to compute the explore link when clicking,
+      // if we precompute it we have to keep track of a lot of dependencies
+      window.open(url, '_blank');
+    });
+  };
+
+  public static Component = ({ model }: SceneComponentProps<MetricActionBar>) => {
+    const metricScene = sceneGraph.getAncestor(model, MetricScene);
+    const styles = useStyles2(getStyles);
+    const trail = getTrailFor(model);
+    const [isBookmarked, toggleBookmark] = useBookmarkState(trail);
+    const { actionView } = metricScene.useState();
+
+    return (
+      <Box paddingY={1}>
+        <div className={styles.actions}>
+          <Stack gap={1}>
+            <ToolbarButton
+              variant={'canvas'}
+              tooltip="Remove existing metric and choose a new metric"
+              onClick={() => {
+                reportExploreMetrics('selected_metric_action_clicked', { action: 'unselect' });
+                trail.publishEvent(new MetricSelectedEvent(undefined));
+              }}
+            >
+              Select new metric
+            </ToolbarButton>
+            <ToolbarButton
+              variant={'canvas'}
+              icon="compass"
+              tooltip="Open in explore"
+              onClick={model.openExploreLink}
+            ></ToolbarButton>
+            <ShareTrailButton trail={trail} />
+            <ToolbarButton
+              variant={'canvas'}
+              icon={
+                isBookmarked ? (
+                  <Icon name={'favorite'} type={'mono'} size={'lg'} />
+                ) : (
+                  <Icon name={'star'} type={'default'} size={'lg'} />
+                )
+              }
+              tooltip={'Bookmark'}
+              onClick={toggleBookmark}
+            />
+            {trail.state.embedded && (
+              <LinkButton
+                href={getUrlForTrail(trail)}
+                variant={'secondary'}
+                onClick={() => reportExploreMetrics('selected_metric_action_clicked', { action: 'open_from_embedded' })}
+              >
+                Open
+              </LinkButton>
+            )}
+          </Stack>
+        </div>
+
+        <TabsBar>
+          {actionViewsDefinitions.map((tab, index) => {
+            const tabRender = (
+              <Tab
+                key={index}
+                label={tab.displayName}
+                active={actionView === tab.value}
+                onChangeTab={() => {
+                  reportExploreMetrics('metric_action_view_changed', { view: tab.value });
+                  metricScene.setActionView(tab.value);
+                }}
+              />
+            );
+
+            if (tab.description) {
+              return (
+                <Tooltip key={index} content={tab.description} placement="bottom-start" theme="info">
+                  {tabRender}
+                </Tooltip>
+              );
+            }
+            return tabRender;
+          })}
+        </TabsBar>
+      </Box>
+    );
+  };
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    actions: css({
+      [theme.breakpoints.up(theme.breakpoints.values.md)]: {
+        position: 'absolute',
+        right: 0,
+        top: 16,
+        zIndex: 2,
+      },
+    }),
+  };
+}
+
+function getVariableSet(metric: string) {
+  return new SceneVariableSet({
+    variables: [
+      ...getVariablesWithMetricConstant(metric),
+      new QueryVariable({
+        name: VAR_GROUP_BY,
+        label: 'Group by',
+        datasource: trailDS,
+        includeAll: true,
+        defaultToAll: true,
+        query: { query: `label_names(${VAR_METRIC_EXPR})`, refId: 'A' },
+        value: '',
+        text: '',
+      }),
+    ],
+  });
+}
diff --git a/public/app/features/trails/MetricSelectScene.tsx b/public/app/features/trails/MetricSelectScene.tsx
new file mode 100644
index 0000000000000..8fafd0fb10773
--- /dev/null
+++ b/public/app/features/trails/MetricSelectScene.tsx
@@ -0,0 +1,464 @@
+import { css } from '@emotion/css';
+import { debounce } from 'lodash';
+import React, { useCallback } from 'react';
+
+import { GrafanaTheme2, VariableRefresh } from '@grafana/data';
+import {
+  PanelBuilders,
+  QueryVariable,
+  SceneComponentProps,
+  SceneCSSGridItem,
+  SceneCSSGridLayout,
+  SceneFlexItem,
+  sceneGraph,
+  SceneObject,
+  SceneObjectBase,
+  SceneObjectRef,
+  SceneObjectState,
+  SceneVariable,
+  SceneVariableSet,
+  VariableDependencyConfig,
+} from '@grafana/scenes';
+import { VariableHide } from '@grafana/schema';
+import { Input, InlineSwitch, Field, Alert, Icon, useStyles2 } from '@grafana/ui';
+
+import { getPreviewPanelFor } from './AutomaticMetricQueries/previewPanel';
+import { MetricScene } from './MetricScene';
+import { SelectMetricAction } from './SelectMetricAction';
+import { StatusWrapper } from './StatusWrapper';
+import { getMetricDescription } from './helpers/MetricDatasourceHelper';
+import { reportExploreMetrics } from './interactions';
+import { sortRelatedMetrics } from './relatedMetrics';
+import {
+  getVariablesWithMetricConstant,
+  MetricSelectedEvent,
+  trailDS,
+  VAR_DATASOURCE,
+  VAR_FILTERS_EXPR,
+  VAR_METRIC_NAMES,
+} from './shared';
+import { getFilters, getTrailFor } from './utils';
+
+interface MetricPanel {
+  name: string;
+  index: number;
+  itemRef?: SceneObjectRef<SceneCSSGridItem>;
+  isEmpty?: boolean;
+  isPanel?: boolean;
+  loaded?: boolean;
+}
+
+export interface MetricSelectSceneState extends SceneObjectState {
+  body: SceneCSSGridLayout;
+  searchQuery?: string;
+  showPreviews?: boolean;
+  metricsAfterSearch?: string[];
+}
+
+const ROW_PREVIEW_HEIGHT = '175px';
+const ROW_CARD_HEIGHT = '64px';
+
+export class MetricSelectScene extends SceneObjectBase<MetricSelectSceneState> {
+  private previewCache: Record<string, MetricPanel> = {};
+  private ignoreNextUpdate = false;
+
+  constructor(state: Partial<MetricSelectSceneState>) {
+    super({
+      $variables: state.$variables ?? getMetricNamesVariableSet(),
+      body:
+        state.body ??
+        new SceneCSSGridLayout({
+          children: [],
+          templateColumns: 'repeat(auto-fill, minmax(450px, 1fr))',
+          autoRows: ROW_PREVIEW_HEIGHT,
+          isLazy: true,
+        }),
+      showPreviews: true,
+      ...state,
+    });
+
+    this.addActivationHandler(this._onActivate.bind(this));
+  }
+
+  protected _variableDependency = new VariableDependencyConfig(this, {
+    variableNames: [VAR_METRIC_NAMES, VAR_DATASOURCE],
+    onReferencedVariableValueChanged: (variable: SceneVariable) => {
+      const { name } = variable.state;
+
+      if (name === VAR_DATASOURCE) {
+        // Clear all panels for the previous data source
+        this.state.body.setState({ children: [] });
+      } else if (name === VAR_METRIC_NAMES) {
+        this.onMetricNamesChange();
+        // Entire pipeline must be performed
+        this.updateMetrics();
+        this.buildLayout();
+      }
+    },
+  });
+
+  private _onActivate() {
+    if (this.state.body.state.children.length === 0) {
+      this.buildLayout();
+    } else {
+      // Temp hack when going back to select metric scene and variable updates
+      this.ignoreNextUpdate = true;
+    }
+
+    const trail = getTrailFor(this);
+
+    const metricChangeSubscription = trail.subscribeToEvent(MetricSelectedEvent, (event) => {
+      const { steps, currentStep } = trail.state.history.state;
+      const prevStep = steps[currentStep].parentIndex;
+      const previousMetric = steps[prevStep].trailState.metric;
+      const isRelatedMetricSelector = previousMetric !== undefined;
+
+      const terms = this.state.searchQuery?.split(splitSeparator).filter((part) => part.length > 0);
+      if (event.payload !== undefined) {
+        reportExploreMetrics('metric_selected', {
+          from: isRelatedMetricSelector ? 'related_metrics' : 'metric_list',
+          searchTermCount: terms?.length || 0,
+        });
+      }
+    });
+
+    return () => {
+      metricChangeSubscription.unsubscribe();
+    };
+  }
+
+  private sortedPreviewMetrics() {
+    return Object.values(this.previewCache).sort((a, b) => {
+      if (a.isEmpty && b.isEmpty) {
+        return a.index - b.index;
+      }
+      if (a.isEmpty) {
+        return 1;
+      }
+      if (b.isEmpty) {
+        return -1;
+      }
+      return a.index - b.index;
+    });
+  }
+
+  private currentMetricNames = new Set<string>();
+
+  private onMetricNamesChange() {
+    // Get the datasource metrics list from the VAR_METRIC_NAMES variable
+    const variable = sceneGraph.lookupVariable(VAR_METRIC_NAMES, this);
+
+    if (!(variable instanceof QueryVariable)) {
+      return;
+    }
+
+    if (variable.state.loading) {
+      return;
+    }
+
+    const nameList = variable.state.options.map((option) => option.value.toString());
+    const nameSet = new Set(nameList);
+
+    Object.values(this.previewCache).forEach((panel) => {
+      if (!nameSet.has(panel.name)) {
+        panel.isEmpty = true;
+      }
+    });
+
+    this.currentMetricNames = nameSet;
+    this.buildLayout();
+  }
+
+  private applyMetricSearch() {
+    // This should only occur when the `searchQuery` changes, of if the `metricNames` change
+    const metricNames = Array.from(this.currentMetricNames);
+    if (metricNames == null) {
+      return;
+    }
+    const searchRegex = createSearchRegExp(this.state.searchQuery);
+
+    if (!searchRegex) {
+      this.setState({ metricsAfterSearch: metricNames });
+    } else {
+      const metricsAfterSearch = metricNames.filter((metric) => !searchRegex || searchRegex.test(metric));
+      this.setState({ metricsAfterSearch });
+    }
+  }
+
+  private updateMetrics(applySearchAndFilter = true) {
+    if (applySearchAndFilter) {
+      // Set to false if these are not required (because they can be assumed to have been suitably called).
+      this.applyMetricSearch();
+    }
+
+    const { metricsAfterSearch } = this.state;
+
+    const metricNames = metricsAfterSearch || [];
+    const trail = getTrailFor(this);
+    const sortedMetricNames =
+      trail.state.metric !== undefined ? sortRelatedMetrics(metricNames, trail.state.metric) : metricNames;
+    const metricsMap: Record<string, MetricPanel> = {};
+    const metricsLimit = 120;
+
+    // Clear absent metrics from cache
+    Object.keys(this.previewCache).forEach((metric) => {
+      if (!this.currentMetricNames.has(metric)) {
+        delete this.previewCache[metric];
+      }
+    });
+
+    for (let index = 0; index < sortedMetricNames.length; index++) {
+      const metricName = sortedMetricNames[index];
+
+      if (Object.keys(metricsMap).length > metricsLimit) {
+        break;
+      }
+
+      const oldPanel = this.previewCache[metricName];
+
+      const panel = oldPanel || { name: metricName, index, loaded: false };
+
+      metricsMap[metricName] = panel;
+    }
+
+    try {
+      // If there is a current metric, do not present it
+      const currentMetric = sceneGraph.getAncestor(this, MetricScene).state.metric;
+      delete metricsMap[currentMetric];
+    } catch (err) {
+      // There is no current metric
+    }
+
+    this.previewCache = metricsMap;
+  }
+
+  private async buildLayout() {
+    // Temp hack when going back to select metric scene and variable updates
+    if (this.ignoreNextUpdate) {
+      this.ignoreNextUpdate = false;
+      return;
+    }
+
+    const variable = sceneGraph.lookupVariable(VAR_METRIC_NAMES, this);
+
+    if (!(variable instanceof QueryVariable)) {
+      return;
+    }
+
+    if (variable.state.loading) {
+      return;
+    }
+
+    if (!Object.keys(this.previewCache).length) {
+      this.updateMetrics();
+    }
+
+    const children: SceneFlexItem[] = [];
+
+    const trail = getTrailFor(this);
+
+    const metricsList = this.sortedPreviewMetrics();
+
+    // Get the current filters to determine the count of them
+    // Which is required for `getPreviewPanelFor`
+    const filters = getFilters(this);
+    const currentFilterCount = filters?.length || 0;
+
+    for (let index = 0; index < metricsList.length; index++) {
+      const metric = metricsList[index];
+      const metadata = await trail.getMetricMetadata(metric.name);
+      const description = getMetricDescription(metadata);
+
+      if (this.state.showPreviews) {
+        if (metric.itemRef && metric.isPanel) {
+          children.push(metric.itemRef.resolve());
+          continue;
+        }
+        const panel = getPreviewPanelFor(metric.name, index, currentFilterCount, description);
+
+        metric.itemRef = panel.getRef();
+        metric.isPanel = true;
+        children.push(panel);
+      } else {
+        const panel = new SceneCSSGridItem({
+          $variables: new SceneVariableSet({
+            variables: getVariablesWithMetricConstant(metric.name),
+          }),
+          body: getCardPanelFor(metric.name, description),
+        });
+        metric.itemRef = panel.getRef();
+        metric.isPanel = false;
+        children.push(panel);
+      }
+    }
+
+    const rowTemplate = this.state.showPreviews ? ROW_PREVIEW_HEIGHT : ROW_CARD_HEIGHT;
+
+    this.state.body.setState({ children, autoRows: rowTemplate });
+  }
+
+  public updateMetricPanel = (metric: string, isLoaded?: boolean, isEmpty?: boolean) => {
+    const metricPanel = this.previewCache[metric];
+    if (metricPanel) {
+      metricPanel.isEmpty = isEmpty;
+      metricPanel.loaded = isLoaded;
+      this.previewCache[metric] = metricPanel;
+      this.buildLayout();
+    }
+  };
+
+  public onSearchQueryChange = (evt: React.SyntheticEvent<HTMLInputElement>) => {
+    this.setState({ searchQuery: evt.currentTarget.value });
+    this.searchQueryChangedDebounced();
+  };
+
+  private searchQueryChangedDebounced = debounce(() => {
+    this.updateMetrics(); // Need to repeat entire pipeline
+    this.buildLayout();
+  }, 500);
+
+  public onTogglePreviews = () => {
+    this.setState({ showPreviews: !this.state.showPreviews });
+    this.buildLayout();
+  };
+
+  public static Component = ({ model }: SceneComponentProps<MetricSelectScene>) => {
+    const { searchQuery, showPreviews, body } = model.useState();
+    const { children } = body.useState();
+    const styles = useStyles2(getStyles);
+
+    const metricNamesStatus = useVariableStatus(VAR_METRIC_NAMES, model);
+    const tooStrict = children.length === 0 && searchQuery;
+    const noMetrics = !metricNamesStatus.isLoading && model.currentMetricNames.size === 0;
+
+    const isLoading = metricNamesStatus.isLoading && children.length === 0;
+
+    const blockingMessage = isLoading
+      ? undefined
+      : (noMetrics && 'There are no results found. Try a different time range or a different data source.') ||
+        (tooStrict && 'There are no results found. Try adjusting your search or filters.') ||
+        undefined;
+
+    const disableSearch = metricNamesStatus.error || metricNamesStatus.isLoading;
+
+    return (
+      <div className={styles.container}>
+        <div className={styles.header}>
+          <Field label={'Search metrics'} className={styles.searchField}>
+            <Input
+              placeholder="Search metrics"
+              prefix={<Icon name={'search'} />}
+              value={searchQuery}
+              onChange={model.onSearchQueryChange}
+              disabled={disableSearch}
+            />
+          </Field>
+          <InlineSwitch
+            showLabel={true}
+            label="Show previews"
+            value={showPreviews}
+            onChange={model.onTogglePreviews}
+            disabled={disableSearch}
+          />
+        </div>
+        {metricNamesStatus.error && (
+          <Alert title="Unable to retrieve metric names" severity="error">
+            <div>We are unable to connect to your data source. Double check your data source URL and credentials.</div>
+            <div>({metricNamesStatus.error})</div>
+          </Alert>
+        )}
+        <StatusWrapper {...{ isLoading, blockingMessage }}>
+          <model.state.body.Component model={model.state.body} />
+        </StatusWrapper>
+      </div>
+    );
+  };
+}
+
+function getMetricNamesVariableSet() {
+  return new SceneVariableSet({
+    variables: [
+      new QueryVariable({
+        name: VAR_METRIC_NAMES,
+        datasource: trailDS,
+        hide: VariableHide.hideVariable,
+        includeAll: true,
+        defaultToAll: true,
+        skipUrlSync: true,
+        refresh: VariableRefresh.onTimeRangeChanged,
+        query: { query: `label_values(${VAR_FILTERS_EXPR},__name__)`, refId: 'A' },
+      }),
+    ],
+  });
+}
+
+function getCardPanelFor(metric: string, description?: string) {
+  return PanelBuilders.text()
+    .setTitle(metric)
+    .setDescription(description)
+    .setHeaderActions(new SelectMetricAction({ metric, title: 'Select' }))
+    .setOption('content', '')
+    .build();
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    container: css({
+      display: 'flex',
+      flexDirection: 'column',
+      flexGrow: 1,
+    }),
+    headingWrapper: css({
+      marginBottom: theme.spacing(0.5),
+    }),
+    header: css({
+      flexGrow: 0,
+      display: 'flex',
+      gap: theme.spacing(2),
+      marginBottom: theme.spacing(2),
+      alignItems: 'flex-end',
+    }),
+    searchField: css({
+      flexGrow: 1,
+      marginBottom: 0,
+    }),
+  };
+}
+
+// Consider any sequence of characters not permitted for metric names as a sepratator
+const splitSeparator = /[^a-z0-9_:]+/;
+
+function createSearchRegExp(spaceSeparatedMetricNames?: string) {
+  if (!spaceSeparatedMetricNames) {
+    return null;
+  }
+  const searchParts = spaceSeparatedMetricNames
+    ?.toLowerCase()
+    .split(splitSeparator)
+    .filter((part) => part.length > 0)
+    .map((part) => `(?=(.*${part}.*))`);
+
+  if (searchParts.length === 0) {
+    return null;
+  }
+
+  const regex = searchParts.join('');
+  //  (?=(.*expr1.*))(?=().*expr2.*))...
+  // The ?=(...) lookahead allows us to match these in any order.
+  return new RegExp(regex, 'igy');
+}
+
+function useVariableStatus(name: string, sceneObject: SceneObject) {
+  const variable = sceneGraph.lookupVariable(name, sceneObject);
+
+  const useVariableState = useCallback(() => {
+    if (variable) {
+      return variable.useState();
+    }
+    return undefined;
+  }, [variable]);
+
+  const { error, loading } = useVariableState() || {};
+
+  return { isLoading: !!loading, error };
+}
diff --git a/public/app/features/trails/MetricsHeader.tsx b/public/app/features/trails/MetricsHeader.tsx
new file mode 100644
index 0000000000000..f40edb4be8987
--- /dev/null
+++ b/public/app/features/trails/MetricsHeader.tsx
@@ -0,0 +1,10 @@
+import React from 'react';
+
+import { Stack, Text } from '@grafana/ui';
+
+export const MetricsHeader = () => (
+  <Stack direction="column" gap={1}>
+    <Text variant="h1">Metrics</Text>
+    <Text color="secondary">Explore your Prometheus-compatible metrics without writing a query</Text>
+  </Stack>
+);
diff --git a/public/app/features/trails/SelectMetricAction.tsx b/public/app/features/trails/SelectMetricAction.tsx
new file mode 100644
index 0000000000000..134c651482aba
--- /dev/null
+++ b/public/app/features/trails/SelectMetricAction.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+
+import { SceneObjectState, SceneObjectBase, SceneComponentProps } from '@grafana/scenes';
+import { Button } from '@grafana/ui';
+
+import { MetricSelectedEvent } from './shared';
+
+export interface SelectMetricActionState extends SceneObjectState {
+  title: string;
+  metric: string;
+}
+
+export class SelectMetricAction extends SceneObjectBase<SelectMetricActionState> {
+  public onClick = () => {
+    this.publishEvent(new MetricSelectedEvent(this.state.metric), true);
+  };
+
+  public static Component = ({ model }: SceneComponentProps<SelectMetricAction>) => {
+    return (
+      <Button variant="secondary" size="sm" fill="solid" onClick={model.onClick}>
+        {model.state.title}
+      </Button>
+    );
+  };
+}
diff --git a/public/app/features/trails/ShareTrailButton.tsx b/public/app/features/trails/ShareTrailButton.tsx
new file mode 100644
index 0000000000000..4f6ed25a429e9
--- /dev/null
+++ b/public/app/features/trails/ShareTrailButton.tsx
@@ -0,0 +1,31 @@
+import React, { useState } from 'react';
+
+import { config } from '@grafana/runtime';
+import { ToolbarButton } from '@grafana/ui';
+
+import { DataTrail } from './DataTrail';
+import { reportExploreMetrics } from './interactions';
+import { getUrlForTrail } from './utils';
+
+interface ShareTrailButtonState {
+  trail: DataTrail;
+}
+
+export const ShareTrailButton = ({ trail }: ShareTrailButtonState) => {
+  const [tooltip, setTooltip] = useState('Copy url');
+
+  const onShare = () => {
+    if (navigator.clipboard) {
+      reportExploreMetrics('selected_metric_action_clicked', { action: 'share_url' });
+      const appUrl = config.appUrl.endsWith('/') ? config.appUrl.slice(0, -1) : config.appUrl;
+      const url = appUrl + getUrlForTrail(trail);
+      navigator.clipboard.writeText(url);
+      setTooltip('Copied!');
+      setTimeout(() => {
+        setTooltip('Copy url');
+      }, 2000);
+    }
+  };
+
+  return <ToolbarButton variant={'canvas'} icon={'share-alt'} tooltip={tooltip} onClick={onShare} />;
+};
diff --git a/public/app/features/trails/StatusWrapper.tsx b/public/app/features/trails/StatusWrapper.tsx
new file mode 100644
index 0000000000000..d9d3edc08048b
--- /dev/null
+++ b/public/app/features/trails/StatusWrapper.tsx
@@ -0,0 +1,40 @@
+import { css } from '@emotion/css';
+import React, { ReactNode } from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { LoadingPlaceholder, useStyles2 } from '@grafana/ui';
+
+type Props = {
+  blockingMessage?: string;
+  isLoading?: boolean;
+  children?: ReactNode;
+};
+
+export function StatusWrapper({ blockingMessage, isLoading, children }: Props) {
+  const styles = useStyles2(getStyles);
+
+  if (isLoading && !blockingMessage) {
+    blockingMessage = 'Loading...';
+  }
+
+  if (isLoading) {
+    return <LoadingPlaceholder className={styles.statusMessage} text={blockingMessage} />;
+  }
+
+  if (!blockingMessage) {
+    return children;
+  }
+
+  return <div className={styles.statusMessage}>{blockingMessage}</div>;
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    statusMessage: css({
+      fontStyle: 'italic',
+      marginTop: theme.spacing(7),
+      textAlign: 'center',
+      width: '100%',
+    }),
+  };
+}
diff --git a/public/app/features/trails/TrailStore/TrailStore.test.ts b/public/app/features/trails/TrailStore/TrailStore.test.ts
new file mode 100644
index 0000000000000..1a3bccd567c7a
--- /dev/null
+++ b/public/app/features/trails/TrailStore/TrailStore.test.ts
@@ -0,0 +1,688 @@
+import { locationService, setDataSourceSrv } from '@grafana/runtime';
+import { AdHocFiltersVariable, getUrlSyncManager, sceneGraph } from '@grafana/scenes';
+import { DataSourceType } from 'app/features/alerting/unified/utils/datasource';
+
+import { MockDataSourceSrv, mockDataSource } from '../../alerting/unified/mocks';
+import { DataTrail } from '../DataTrail';
+import { BOOKMARKED_TRAILS_KEY, RECENT_TRAILS_KEY, VAR_FILTERS } from '../shared';
+
+import { SerializedTrail, getTrailStore } from './TrailStore';
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getTemplateSrv: () => ({
+    getAdhocFilters: jest.fn().mockReturnValue([{ key: 'origKey', operator: '=', value: '' }]),
+  }),
+}));
+
+describe('TrailStore', () => {
+  beforeAll(() => {
+    let localStore: Record<string, string> = {};
+
+    const localStorageMock = {
+      getItem: jest.fn((key) => (key in localStore ? localStore[key] : null)),
+      setItem: jest.fn(jest.fn((key, value) => (localStore[key] = value + ''))),
+      clear: jest.fn(() => (localStore = {})),
+    };
+    global.localStorage = localStorageMock as unknown as Storage;
+
+    jest.useFakeTimers();
+
+    // Having the mock service set up is required for activating the loaded trails
+    setDataSourceSrv(
+      new MockDataSourceSrv({
+        prom: mockDataSource({
+          name: 'Prometheus',
+          type: DataSourceType.Prometheus,
+          uid: 'ds',
+        }),
+      })
+    );
+  });
+
+  describe('Empty store', () => {
+    const store = getTrailStore();
+
+    it('should have no recent trails', () => {
+      expect(store.recent.length).toBe(0);
+    });
+
+    it('should have no bookmarked trails', () => {
+      expect(store.bookmarks.length).toBe(0);
+    });
+  });
+
+  describe('Initialize store with one recent trail with final current step', () => {
+    const history: SerializedTrail['history'] = [
+      {
+        urlValues: {
+          from: 'now-1h',
+          to: 'now',
+          'var-ds': 'cb3a3391-700f-4cc6-81be-a122488e93e6',
+          'var-filters': [],
+          refresh: '',
+        },
+        type: 'start',
+        description: 'Test',
+        parentIndex: -1,
+      },
+      {
+        urlValues: {
+          metric: 'access_permissions_duration_count',
+          from: 'now-1h',
+          to: 'now',
+          'var-ds': 'cb3a3391-700f-4cc6-81be-a122488e93e6',
+          'var-filters': [],
+          refresh: '',
+        },
+        type: 'metric',
+        description: 'Test',
+        parentIndex: 0,
+      },
+    ];
+
+    beforeEach(() => {
+      localStorage.clear();
+      localStorage.setItem(RECENT_TRAILS_KEY, JSON.stringify([{ history }]));
+      getTrailStore().load();
+    });
+
+    it('should accurately load recent trails', () => {
+      const store = getTrailStore();
+      expect(store.recent.length).toBe(1);
+      const trail = store.recent[0].resolve();
+      expect(trail.state.history.state.steps.length).toBe(2);
+      expect(trail.state.history.state.steps[0].type).toBe('start');
+      expect(trail.state.history.state.steps[1].type).toBe('metric');
+    });
+
+    it('should have no bookmarked trails', () => {
+      const store = getTrailStore();
+      expect(store.bookmarks.length).toBe(0);
+    });
+
+    describe('Add a new recent trail with equivalent current step state', () => {
+      const store = getTrailStore();
+
+      const duplicateTrailSerialized: SerializedTrail = {
+        history: [
+          history[0],
+          history[1],
+          {
+            ...history[1],
+            urlValues: {
+              ...history[1].urlValues,
+              metric: 'different_metric_in_the_middle',
+            },
+          },
+          {
+            ...history[1],
+          },
+        ],
+        currentStep: 3,
+      };
+
+      beforeEach(() => {
+        // We expect the initialized trail to be there
+        expect(store.recent.length).toBe(1);
+        expect(store.recent[0].resolve().state.history.state.steps.length).toBe(2);
+
+        // @ts-ignore #2341 -- deliberately access private method to construct trail object for testing purposes
+        const duplicateTrail = store._deserializeTrail(duplicateTrailSerialized);
+        store.setRecentTrail(duplicateTrail);
+      });
+
+      it('should still be only one recent trail', () => {
+        expect(store.recent.length).toBe(1);
+      });
+
+      it('it should only contain the new trail', () => {
+        const newRecentTrail = store.recent[0].resolve();
+        expect(newRecentTrail.state.history.state.steps.length).toBe(duplicateTrailSerialized.history.length);
+
+        // @ts-ignore #2341 -- deliberately access private method to construct trail object for testing purposes
+        const newRecent = store._serializeTrail(newRecentTrail);
+        expect(newRecent.currentStep).toBe(duplicateTrailSerialized.currentStep);
+        expect(newRecent.history.length).toBe(duplicateTrailSerialized.history.length);
+      });
+    });
+
+    it.each([
+      ['metric', 'different_metric'],
+      ['from', 'now-1y'],
+      ['to', 'now-30m'],
+      ['var-ds', 'ds'],
+      ['var-groupby', 'job'],
+      ['var-filters', 'cluster|=|dev-eu-west-2'],
+    ])(`new recent trails with a different '%p' value should insert new entry`, (key, differentValue) => {
+      const store = getTrailStore();
+      // We expect the initialized trail to be there
+      expect(store.recent.length).toBe(1);
+
+      const differentTrailSerialized: SerializedTrail = {
+        history: [
+          history[0],
+          history[1],
+          {
+            ...history[1],
+            urlValues: {
+              ...history[1].urlValues,
+              [key]: differentValue,
+            },
+            parentIndex: 1,
+          },
+        ],
+        currentStep: 2,
+      };
+
+      // @ts-ignore #2341 -- deliberately access private method to construct trail object for testing purposes
+      const differentTrail = store._deserializeTrail(differentTrailSerialized);
+      store.setRecentTrail(differentTrail);
+
+      // There should now be two trails
+      expect(store.recent.length).toBe(2);
+    });
+
+    test('deserializeTrail must show state of current step when not last step', () => {
+      const trailSerialized: SerializedTrail = {
+        history: [
+          history[0],
+          history[1],
+          {
+            ...history[1],
+            urlValues: {
+              ...history[1].urlValues,
+              metric: 'something_else',
+            },
+            parentIndex: 1,
+          },
+        ],
+        currentStep: 1,
+      };
+
+      // @ts-ignore #2341 -- deliberately access private method to construct trail object for testing purposes
+      const trail = getTrailStore()._deserializeTrail(trailSerialized);
+
+      //
+      expect(trail.state.metric).not.toEqual('something_else');
+      expect(trail.state.metric).toEqual(history[1].urlValues.metric);
+    });
+  });
+
+  describe('Initialize store with one recent trail with non final current step', () => {
+    const history: SerializedTrail['history'] = [
+      {
+        urlValues: {
+          from: 'now-1h',
+          to: 'now',
+          'var-ds': 'ds',
+          'var-filters': [],
+          refresh: '',
+        },
+        type: 'start',
+        description: 'Test',
+        parentIndex: -1,
+      },
+      {
+        urlValues: {
+          metric: 'current_metric',
+          from: 'now-1h',
+          to: 'now',
+          'var-ds': 'ds',
+          'var-filters': [],
+          refresh: '',
+        },
+        type: 'metric',
+        description: 'Test',
+        parentIndex: 0,
+      },
+      {
+        urlValues: {
+          metric: 'final_metric',
+          from: 'now-1h',
+          to: 'now',
+          'var-ds': 'ds',
+          'var-filters': [],
+          refresh: '',
+        },
+        type: 'metric',
+        description: 'Test',
+        parentIndex: 1,
+      },
+    ];
+
+    beforeEach(() => {
+      localStorage.clear();
+      localStorage.setItem(RECENT_TRAILS_KEY, JSON.stringify([{ history, currentStep: 1 }]));
+      getTrailStore().load();
+    });
+
+    it('should accurately load recent trails', () => {
+      const store = getTrailStore();
+      expect(store.recent.length).toBe(1);
+      const trail = store.recent[0].resolve();
+      expect(trail.state.history.state.steps.length).toBe(3);
+      expect(trail.state.history.state.steps[0].type).toBe('start');
+      expect(trail.state.history.state.steps[1].type).toBe('metric');
+      expect(trail.state.history.state.steps[1].trailState.metric).toBe('current_metric');
+      expect(trail.state.history.state.steps[2].type).toBe('metric');
+      expect(trail.state.history.state.steps[2].trailState.metric).toBe('final_metric');
+      expect(trail.state.history.state.currentStep).toBe(1);
+    });
+
+    function getFilterVar(trail: DataTrail) {
+      const variable = sceneGraph.lookupVariable(VAR_FILTERS, trail);
+      if (variable instanceof AdHocFiltersVariable) {
+        return variable;
+      }
+      throw new Error('getFilterVar failed');
+    }
+
+    function getStepFilterVar(trail: DataTrail, step: number) {
+      const variable = trail.state.history.state.steps[step].trailState.$variables?.getByName(VAR_FILTERS);
+      if (variable instanceof AdHocFiltersVariable) {
+        return variable;
+      }
+      throw new Error(`getStepFilterVar failed for step ${step}`);
+    }
+
+    it('Recent trail filter should be empty at current step 1', () => {
+      const store = getTrailStore();
+      const trail = store.recent[0].resolve();
+
+      expect(getStepFilterVar(trail, 1).state.filters.length).toBe(0);
+      expect(trail.state.history.state.currentStep).toBe(1);
+      expect(trail.state.history.state.steps.length).toBe(3);
+    });
+
+    describe('And filter is added zone=a', () => {
+      let trail: DataTrail;
+      beforeEach(() => {
+        localStorage.clear();
+        localStorage.setItem(RECENT_TRAILS_KEY, JSON.stringify([{ history, currentStep: 1 }]));
+        getTrailStore().load();
+        const store = getTrailStore();
+        trail = store.recent[0].resolve();
+        const urlState = getUrlSyncManager().getUrlState(trail);
+        locationService.partial(urlState);
+        trail.activate();
+        trail.state.history.activate();
+        getFilterVar(trail).setState({ filters: [{ key: 'zone', operator: '=', value: 'a' }] });
+      });
+
+      it('This should create step 3', () => {
+        expect(trail.state.history.state.steps.length).toBe(4);
+        expect(trail.state.history.state.currentStep).toBe(3);
+      });
+
+      it('Filter of trail should be zone=a', () => {
+        expect(getFilterVar(trail).state.filters[0].key).toBe('zone');
+        expect(getFilterVar(trail).state.filters[0].value).toBe('a');
+      });
+
+      it('Filter of step 3 should be zone=a', () => {
+        expect(getStepFilterVar(trail, 3).state.filters[0].key).toBe('zone');
+        expect(getStepFilterVar(trail, 3).state.filters[0].value).toBe('a');
+      });
+
+      it('Filter of step 1 should be empty', () => {
+        expect(getStepFilterVar(trail, 1).state.filters.length).toBe(0);
+      });
+
+      describe('When returning to step 1', () => {
+        beforeEach(() => {
+          trail.state.history.goBackToStep(1);
+        });
+
+        it('Filter of trail should be empty', () => {
+          expect(getFilterVar(trail).state.filters.length).toBe(0);
+        });
+      });
+    });
+
+    it('Time range `from` should be now-1h', () => {
+      const store = getTrailStore();
+      const trail = store.recent[0].resolve();
+
+      expect(trail.state.$timeRange?.state.from).toBe('now-1h');
+    });
+
+    describe('And time range is changed to now-15m to now', () => {
+      let trail: DataTrail;
+      beforeEach(() => {
+        localStorage.clear();
+        localStorage.setItem(RECENT_TRAILS_KEY, JSON.stringify([{ history, currentStep: 1 }]));
+        getTrailStore().load();
+        const store = getTrailStore();
+        trail = store.recent[0].resolve();
+        const urlState = getUrlSyncManager().getUrlState(trail);
+        locationService.partial(urlState);
+        trail.activate();
+        trail.state.history.activate();
+        trail.state.$timeRange?.setState({ from: 'now-15m' });
+      });
+
+      it('This should create step 3', () => {
+        expect(trail.state.history.state.steps.length).toBe(4);
+        expect(trail.state.history.state.currentStep).toBe(3);
+      });
+
+      it('Time range `from` should be now-15m', () => {
+        expect(trail.state.$timeRange?.state.from).toBe('now-15m');
+      });
+
+      it('Time range `from` of step 2 should be now-15m', () => {
+        expect(trail.state.history.state.steps[3].trailState.$timeRange?.state.from).toBe('now-15m');
+      });
+
+      it('Time range `from` of step 1 should be now-1h', () => {
+        expect(trail.state.history.state.steps[1].trailState.$timeRange?.state.from).toBe('now-1h');
+      });
+
+      describe('When returning to step 1', () => {
+        beforeEach(() => {
+          trail.state.history.goBackToStep(1);
+        });
+
+        it('Time range `from` should be now-1h', () => {
+          expect(trail.state.$timeRange?.state.from).toBe('now-1h');
+        });
+      });
+    });
+
+    it('should have no bookmarked trails', () => {
+      const store = getTrailStore();
+      expect(store.bookmarks.length).toBe(0);
+    });
+
+    describe('Add a new recent trail with equivalent current step state', () => {
+      const store = getTrailStore();
+
+      const duplicateTrailSerialized: SerializedTrail = {
+        history: [
+          history[0],
+          history[1],
+          history[2],
+          {
+            ...history[2],
+            urlValues: {
+              ...history[1].urlValues,
+              metric: 'different_metric_in_the_middle',
+            },
+          },
+          {
+            ...history[1],
+          },
+        ],
+        currentStep: 4,
+      };
+
+      beforeEach(() => {
+        // We expect the initialized trail to be there
+        expect(store.recent.length).toBe(1);
+        expect(store.recent[0].resolve().state.history.state.steps.length).toBe(3);
+
+        // @ts-ignore #2341 -- deliberately access private method to construct trail object for testing purposes
+        const duplicateTrail = store._deserializeTrail(duplicateTrailSerialized);
+        store.setRecentTrail(duplicateTrail);
+      });
+
+      it('should still be only one recent trail', () => {
+        expect(store.recent.length).toBe(1);
+      });
+
+      it('it should only contain the new trail', () => {
+        const newRecentTrail = store.recent[0].resolve();
+        expect(newRecentTrail.state.history.state.steps.length).toBe(duplicateTrailSerialized.history.length);
+
+        // @ts-ignore #2341 -- deliberately access private method to construct trail object for testing purposes
+        const newRecent = store._serializeTrail(newRecentTrail);
+        expect(newRecent.currentStep).toBe(duplicateTrailSerialized.currentStep);
+        expect(newRecent.history.length).toBe(duplicateTrailSerialized.history.length);
+      });
+    });
+
+    it.each([
+      ['metric', 'different_metric'],
+      ['from', 'now-1y'],
+      ['to', 'now-30m'],
+      ['var-ds', 'different'],
+      ['var-groupby', 'job'],
+      ['var-filters', 'cluster|=|dev-eu-west-2'],
+    ])(`new recent trails with a different '%p' value should insert new entry`, (key, differentValue) => {
+      const store = getTrailStore();
+      // We expect the initialized trail to be there
+      expect(store.recent.length).toBe(1);
+
+      const differentTrailSerialized: SerializedTrail = {
+        history: [
+          history[0],
+          history[1],
+          history[2],
+          {
+            ...history[2],
+            urlValues: {
+              ...history[1].urlValues,
+              [key]: differentValue,
+            },
+            parentIndex: 1,
+          },
+        ],
+        currentStep: 3,
+      };
+
+      // @ts-ignore #2341 -- deliberately access private method to construct trail object for testing purposes
+      const differentTrail = store._deserializeTrail(differentTrailSerialized);
+      store.setRecentTrail(differentTrail);
+
+      // There should now be two trails
+      expect(store.recent.length).toBe(2);
+    });
+  });
+
+  describe('Initialize store with one bookmark trail', () => {
+    beforeEach(() => {
+      localStorage.clear();
+      localStorage.setItem(
+        BOOKMARKED_TRAILS_KEY,
+        JSON.stringify([
+          {
+            history: [
+              {
+                urlValues: {
+                  from: 'now-1h',
+                  to: 'now',
+                  'var-ds': 'cb3a3391-700f-4cc6-81be-a122488e93e6',
+                  'var-filters': [],
+                  refresh: '',
+                },
+                type: 'start',
+                description: 'Test',
+              },
+              {
+                urlValues: {
+                  metric: 'access_permissions_duration_count',
+                  from: 'now-1h',
+                  to: 'now',
+                  'var-ds': 'cb3a3391-700f-4cc6-81be-a122488e93e6',
+                  'var-filters': [],
+                  refresh: '',
+                },
+                type: 'time',
+                description: 'Test',
+              },
+            ],
+          },
+        ])
+      );
+      getTrailStore().load();
+    });
+
+    const store = getTrailStore();
+
+    it('should have no recent trails', () => {
+      expect(store.recent.length).toBe(0);
+    });
+
+    it('should accurately load bookmarked trails', () => {
+      expect(store.bookmarks.length).toBe(1);
+      const trail = store.bookmarks[0].resolve();
+      expect(trail.state.history.state.steps.length).toBe(2);
+      expect(trail.state.history.state.steps[0].type).toBe('start');
+      expect(trail.state.history.state.steps[1].type).toBe('time');
+    });
+
+    it('should save a new recent trail based on the bookmark', () => {
+      expect(store.recent.length).toBe(0);
+      const trail = store.bookmarks[0].resolve();
+      store.setRecentTrail(trail);
+      expect(store.recent.length).toBe(1);
+    });
+
+    it('should be able to obtain index of bookmark', () => {
+      const trail = store.bookmarks[0].resolve();
+      const index = store.getBookmarkIndex(trail);
+      expect(index).toBe(0);
+    });
+
+    it('index should be undefined for removed bookmarks', () => {
+      const trail = store.bookmarks[0].resolve();
+      store.removeBookmark(0);
+      const index = store.getBookmarkIndex(trail);
+      expect(index).toBe(undefined);
+    });
+
+    it('index should be undefined for a trail that has changed since it was bookmarked', () => {
+      const trail = store.bookmarks[0].resolve();
+      trail.setState({ metric: 'something_completely_different' });
+      const index = store.getBookmarkIndex(trail);
+      expect(index).toBe(undefined);
+    });
+
+    it('should be able to obtain index of a bookmark for a trail that changed back to bookmarked state', () => {
+      const trail = store.bookmarks[0].resolve();
+      const bookmarkedMetric = trail.state.metric;
+      trail.setState({ metric: 'something_completely_different' });
+      trail.setState({ metric: bookmarkedMetric });
+      const index = store.getBookmarkIndex(trail);
+      expect(index).toBe(0);
+    });
+
+    it('should remove a bookmark', () => {
+      expect(store.bookmarks.length).toBe(1);
+      store.removeBookmark(0);
+      expect(store.bookmarks.length).toBe(0);
+
+      jest.advanceTimersByTime(2000);
+
+      expect(localStorage.getItem(BOOKMARKED_TRAILS_KEY)).toBe('[]');
+    });
+  });
+
+  describe('Initialize store with one bookmark trail not on final step', () => {
+    beforeEach(() => {
+      localStorage.clear();
+      localStorage.setItem(
+        BOOKMARKED_TRAILS_KEY,
+        JSON.stringify([
+          {
+            history: [
+              {
+                urlValues: {
+                  from: 'now-1h',
+                  to: 'now',
+                  'var-ds': 'prom-mock',
+                  'var-filters': [],
+                  refresh: '',
+                },
+                type: 'start',
+              },
+              {
+                urlValues: {
+                  metric: 'bookmarked_metric',
+                  from: 'now-1h',
+                  to: 'now',
+                  'var-ds': 'prom-mock',
+                  'var-filters': [],
+                  refresh: '',
+                },
+                type: 'time',
+              },
+              {
+                urlValues: {
+                  metric: 'some_other_metric',
+                  from: 'now-1h',
+                  to: 'now',
+                  'var-ds': 'prom-mock',
+                  'var-filters': [],
+                  refresh: '',
+                },
+                type: 'metric',
+              },
+            ],
+            currentStep: 1,
+          },
+        ])
+      );
+      getTrailStore().load();
+    });
+
+    const store = getTrailStore();
+
+    it('should have no recent trails', () => {
+      expect(store.recent.length).toBe(0);
+    });
+
+    it('should accurately load bookmarked trails', () => {
+      expect(store.bookmarks.length).toBe(1);
+      const trail = store.bookmarks[0].resolve();
+      expect(trail.state.history.state.steps.length).toBe(3);
+      expect(trail.state.history.state.steps[0].type).toBe('start');
+      expect(trail.state.history.state.steps[1].type).toBe('time');
+      expect(trail.state.history.state.steps[2].type).toBe('metric');
+    });
+
+    it('should save a new recent trail based on the bookmark', () => {
+      expect(store.recent.length).toBe(0);
+      const trail = store.bookmarks[0].resolve();
+      store.setRecentTrail(trail);
+      expect(store.recent.length).toBe(1);
+    });
+
+    it('should be able to obtain index of bookmark', () => {
+      const trail = store.bookmarks[0].resolve();
+      const index = store.getBookmarkIndex(trail);
+      expect(index).toBe(0);
+    });
+
+    it('index should be undefined for removed bookmarks', () => {
+      const trail = store.bookmarks[0].resolve();
+      store.removeBookmark(0);
+      const index = store.getBookmarkIndex(trail);
+      expect(index).toBe(undefined);
+    });
+
+    it('index should be undefined for a trail that has changed since it was bookmarked', () => {
+      const trail = store.bookmarks[0].resolve();
+      trail.setState({ metric: 'something_completely_different' });
+      const index = store.getBookmarkIndex(trail);
+      expect(index).toBe(undefined);
+    });
+
+    it('should be able to obtain index of a bookmark for a trail that changed back to bookmarked state', () => {
+      const trail = store.bookmarks[0].resolve();
+      trail.setState({ metric: 'something_completely_different' });
+      expect(store.getBookmarkIndex(trail)).toBe(undefined);
+      trail.setState({ metric: 'bookmarked_metric' });
+      expect(store.getBookmarkIndex(trail)).toBe(0);
+    });
+
+    it('should remove a bookmark', () => {
+      expect(store.bookmarks.length).toBe(1);
+      store.removeBookmark(0);
+      expect(store.bookmarks.length).toBe(0);
+      jest.advanceTimersByTime(2000);
+      expect(localStorage.getItem(BOOKMARKED_TRAILS_KEY)).toBe('[]');
+    });
+  });
+});
diff --git a/public/app/features/trails/TrailStore/TrailStore.ts b/public/app/features/trails/TrailStore/TrailStore.ts
new file mode 100644
index 0000000000000..4bada2a36c2d3
--- /dev/null
+++ b/public/app/features/trails/TrailStore/TrailStore.ts
@@ -0,0 +1,220 @@
+import { debounce, isEqual } from 'lodash';
+
+import { getUrlSyncManager, SceneObject, SceneObjectRef, SceneObjectUrlValues, sceneUtils } from '@grafana/scenes';
+import { dispatch } from 'app/store/store';
+
+import { notifyApp } from '../../../core/reducers/appNotification';
+import { DataTrail } from '../DataTrail';
+import { TrailStepType } from '../DataTrailsHistory';
+import { BOOKMARKED_TRAILS_KEY, RECENT_TRAILS_KEY } from '../shared';
+
+import { createBookmarkSavedNotification } from './utils';
+
+const MAX_RECENT_TRAILS = 20;
+
+export interface SerializedTrail {
+  history: Array<{
+    urlValues: SceneObjectUrlValues;
+    type: TrailStepType;
+    description: string;
+    parentIndex: number;
+  }>;
+  currentStep: number;
+  createdAt?: number;
+}
+
+export class TrailStore {
+  private _recent: Array<SceneObjectRef<DataTrail>> = [];
+  private _bookmarks: Array<SceneObjectRef<DataTrail>> = [];
+  private _save: () => void;
+
+  constructor() {
+    this.load();
+
+    const doSave = () => {
+      const serializedRecent = this._recent
+        .slice(0, MAX_RECENT_TRAILS)
+        .map((trail) => this._serializeTrail(trail.resolve()));
+      localStorage.setItem(RECENT_TRAILS_KEY, JSON.stringify(serializedRecent));
+
+      const serializedBookmarks = this._bookmarks.map((trail) => this._serializeTrail(trail.resolve()));
+      localStorage.setItem(BOOKMARKED_TRAILS_KEY, JSON.stringify(serializedBookmarks));
+    };
+
+    this._save = debounce(doSave, 1000);
+
+    window.addEventListener('beforeunload', (ev) => {
+      // Before closing or reloading the page, we want to remove the debounce from `_save` so that
+      // any calls to is on event `unload` are actualized. Debouncing would cause a delay until after the page has been unloaded.
+      this._save = doSave;
+    });
+  }
+
+  private _loadFromStorage(key: string) {
+    const list: Array<SceneObjectRef<DataTrail>> = [];
+    const storageItem = localStorage.getItem(key);
+
+    if (storageItem) {
+      const serializedTrails: SerializedTrail[] = JSON.parse(storageItem);
+      for (const t of serializedTrails) {
+        const trail = this._deserializeTrail(t);
+        list.push(trail.getRef());
+      }
+    }
+    return list;
+  }
+
+  private _deserializeTrail(t: SerializedTrail): DataTrail {
+    // reconstruct the trail based on the the serialized history
+    const trail = new DataTrail({ createdAt: t.createdAt });
+
+    t.history.map((step) => {
+      this._loadFromUrl(trail, step.urlValues);
+      const parentIndex = step.parentIndex ?? trail.state.history.state.steps.length - 1;
+      // Set the parent of the next trail step by setting the current step in history.
+      trail.state.history.setState({ currentStep: parentIndex });
+      trail.state.history.addTrailStep(trail, step.type);
+    });
+
+    const currentStep = t.currentStep ?? trail.state.history.state.steps.length - 1;
+    trail.state.history.setState({ currentStep });
+    // The state change listeners aren't activated yet, so maually change to the current step state
+    trail.setState(trail.state.history.state.steps[currentStep].trailState);
+
+    return trail;
+  }
+
+  private _serializeTrail(trail: DataTrail): SerializedTrail {
+    const history = trail.state.history.state.steps.map((step) => {
+      const stepTrail = new DataTrail(sceneUtils.cloneSceneObjectState(step.trailState));
+      return {
+        urlValues: getUrlSyncManager().getUrlState(stepTrail),
+        type: step.type,
+        description: step.description,
+        parentIndex: step.parentIndex,
+      };
+    });
+    return {
+      history,
+      currentStep: trail.state.history.state.currentStep,
+      createdAt: trail.state.createdAt,
+    };
+  }
+
+  private _loadFromUrl(node: SceneObject, urlValues: SceneObjectUrlValues) {
+    node.urlSync?.updateFromUrl(urlValues);
+    node.forEachChild((child) => this._loadFromUrl(child, urlValues));
+  }
+
+  // Recent Trails
+  get recent() {
+    return this._recent;
+  }
+
+  load() {
+    this._recent = this._loadFromStorage(RECENT_TRAILS_KEY);
+    this._bookmarks = this._loadFromStorage(BOOKMARKED_TRAILS_KEY);
+    this._refreshBookmarkIndexMap();
+  }
+
+  setRecentTrail(recentTrail: DataTrail) {
+    const { steps } = recentTrail.state.history.state;
+    if (steps.length === 0 || (steps.length === 1 && steps[0].type === 'start')) {
+      // We do not set an uninitialized trail, or a single node "start" trail as recent
+      return;
+    }
+
+    // Remove the `recentTrail` from the list if it already exists there
+    this._recent = this._recent.filter((t) => t !== recentTrail.getRef());
+
+    // Check if any existing "recent" entries have equivalent urlState to the new recentTrail
+    const recentUrlState = getUrlStateForComparison(recentTrail); //
+    this._recent = this._recent.filter((t) => {
+      // Use the current step urlValues to filter out equivalent states
+      const urlState = getUrlStateForComparison(t.resolve());
+      // Only keep trails with sufficiently unique urlValues on their current step
+      return !isEqual(recentUrlState, urlState);
+    });
+
+    this._recent.unshift(recentTrail.getRef());
+    this._save();
+  }
+
+  findMatchingRecentTrail(trail: DataTrail) {
+    const matchUrlState = getUrlStateForComparison(trail);
+    return this._recent.find((t) => {
+      const urlState = getUrlStateForComparison(t.resolve());
+      return isEqual(matchUrlState, urlState);
+    });
+  }
+
+  // Bookmarked Trails
+  get bookmarks() {
+    return this._bookmarks;
+  }
+
+  addBookmark(trail: DataTrail) {
+    const bookmark = new DataTrail(sceneUtils.cloneSceneObjectState(trail.state));
+    this._bookmarks.unshift(bookmark.getRef());
+    this._refreshBookmarkIndexMap();
+    this._save();
+    dispatch(notifyApp(createBookmarkSavedNotification()));
+  }
+
+  removeBookmark(index: number) {
+    if (index < this._bookmarks.length) {
+      this._bookmarks.splice(index, 1);
+      this._refreshBookmarkIndexMap();
+      this._save();
+    }
+  }
+
+  getBookmarkIndex(trail: DataTrail) {
+    const bookmarkKey = getBookmarkKey(trail);
+    const bookmarkIndex = this._bookmarkIndexMap.get(bookmarkKey);
+    return bookmarkIndex;
+  }
+
+  private _bookmarkIndexMap = new Map<string, number>();
+
+  private _refreshBookmarkIndexMap() {
+    this._bookmarkIndexMap.clear();
+    this._bookmarks.forEach((bookmarked, index) => {
+      const trail = bookmarked.resolve();
+
+      const key = getBookmarkKey(trail);
+      // If there are duplicate bookmarks, the latest index will be kept
+      this._bookmarkIndexMap.set(key, index);
+    });
+  }
+}
+
+function getUrlStateForComparison(trail: DataTrail) {
+  const urlState = getUrlSyncManager().getUrlState(trail);
+  // Make a few corrections
+
+  // Omit some URL parameters that are not useful for state comparison
+  delete urlState.actionView;
+  delete urlState.layout;
+
+  // Populate defaults
+  if (urlState['var-groupby'] === '') {
+    urlState['var-groupby'] = '$__all';
+  }
+
+  return urlState;
+}
+
+function getBookmarkKey(trail: DataTrail) {
+  const key = JSON.stringify(getUrlStateForComparison(trail));
+  return key;
+}
+
+let store: TrailStore | undefined;
+export function getTrailStore(): TrailStore {
+  if (!store) {
+    store = new TrailStore();
+  }
+
+  return store;
+}
diff --git a/public/app/features/trails/TrailStore/useBookmarkState.ts b/public/app/features/trails/TrailStore/useBookmarkState.ts
new file mode 100644
index 0000000000000..516c73018e34c
--- /dev/null
+++ b/public/app/features/trails/TrailStore/useBookmarkState.ts
@@ -0,0 +1,56 @@
+import { useEffect, useState } from 'react';
+
+import { SceneObjectStateChangedEvent } from '@grafana/scenes';
+
+import { DataTrail } from '../DataTrail';
+import { isDataTrailsHistoryState } from '../DataTrailsHistory';
+import { reportExploreMetrics } from '../interactions';
+
+import { getTrailStore } from './TrailStore';
+
+export function useBookmarkState(trail: DataTrail) {
+  // Note that trail object may stay the same, but the state used by `getBookmarkIndex` result may
+  // differ for each re-render of this hook
+  const getBookmarkIndex = () => getTrailStore().getBookmarkIndex(trail);
+
+  const indexOnRender = getBookmarkIndex();
+
+  const [bookmarkIndex, setBookmarkIndex] = useState(indexOnRender);
+
+  useEffect(() => {
+    const sub = trail.subscribeToEvent(SceneObjectStateChangedEvent, ({ payload: { prevState, newState } }) => {
+      if (isDataTrailsHistoryState(prevState) && isDataTrailsHistoryState(newState)) {
+        if (newState.steps.length > prevState.steps.length) {
+          // When we add new steps, we need to re-evaluate whether or not it is still a bookmark
+          setBookmarkIndex(getTrailStore().getBookmarkIndex(trail));
+        }
+      }
+    });
+    return () => sub.unsubscribe();
+  }, [trail]);
+
+  // Check if index changed and force a re-render
+  if (indexOnRender !== bookmarkIndex) {
+    setBookmarkIndex(indexOnRender);
+  }
+
+  const isBookmarked = bookmarkIndex != null;
+
+  const toggleBookmark = () => {
+    reportExploreMetrics('bookmark_changed', { action: isBookmarked ? 'toggled_off' : 'toggled_on' });
+    if (isBookmarked) {
+      let indexToRemove = getBookmarkIndex();
+      while (indexToRemove != null) {
+        // This loop will remove all indices that have an equivalent bookmark key
+        getTrailStore().removeBookmark(indexToRemove);
+        indexToRemove = getBookmarkIndex();
+      }
+    } else {
+      getTrailStore().addBookmark(trail);
+    }
+    setBookmarkIndex(getBookmarkIndex());
+  };
+
+  const result: [typeof isBookmarked, typeof toggleBookmark] = [isBookmarked, toggleBookmark];
+  return result;
+}
diff --git a/public/app/features/trails/TrailStore/utils.tsx b/public/app/features/trails/TrailStore/utils.tsx
new file mode 100644
index 0000000000000..f56d6a4799367
--- /dev/null
+++ b/public/app/features/trails/TrailStore/utils.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+
+import { LinkButton, Stack } from '@grafana/ui';
+
+import { createSuccessNotification } from '../../../core/copy/appNotification';
+import { HOME_ROUTE } from '../shared';
+
+export function createBookmarkSavedNotification() {
+  const notification = createSuccessNotification('Bookmark created');
+
+  notification.component = (
+    <Stack gap={2} direction={'row'}>
+      <div>
+        You can view bookmarks under <i>Explore &gt; Metrics</i>
+      </div>
+      <LinkButton fill={'solid'} variant={'secondary'} href={HOME_ROUTE}>
+        View bookmarks
+      </LinkButton>
+    </Stack>
+  );
+  return notification;
+}
diff --git a/public/app/features/trails/helpers/MetricDatasourceHelper.ts b/public/app/features/trails/helpers/MetricDatasourceHelper.ts
new file mode 100644
index 0000000000000..910e55bb07c10
--- /dev/null
+++ b/public/app/features/trails/helpers/MetricDatasourceHelper.ts
@@ -0,0 +1,74 @@
+import { DataSourceApi } from '@grafana/data';
+import { PromMetricsMetadata, PromMetricsMetadataItem } from '@grafana/prometheus';
+import { getDataSourceSrv } from '@grafana/runtime';
+
+import PrometheusLanguageProvider from '../../../plugins/datasource/prometheus/language_provider';
+import { DataTrail } from '../DataTrail';
+import { VAR_DATASOURCE_EXPR } from '../shared';
+
+export class MetricDatasourceHelper {
+  constructor(trail: DataTrail) {
+    this._trail = trail;
+  }
+
+  public reset() {
+    this._datasource = undefined;
+    this._metricsMetadata = undefined;
+  }
+
+  private _trail: DataTrail;
+
+  private _datasource?: Promise<DataSourceApi>;
+
+  private async getDatasource() {
+    if (!this._datasource) {
+      this._datasource = getDataSourceSrv().get(VAR_DATASOURCE_EXPR, { __sceneObject: { value: this._trail } });
+    }
+
+    const ds = await this._datasource;
+    return ds;
+  }
+
+  private _metricsMetadata?: Promise<PromMetricsMetadata | undefined>;
+
+  private async _getMetricsMetadata() {
+    const ds = await this.getDatasource();
+
+    if (ds.languageProvider instanceof PrometheusLanguageProvider) {
+      if (!ds.languageProvider.metricsMetadata) {
+        await ds.languageProvider.loadMetricsMetadata();
+      }
+
+      return ds.languageProvider.metricsMetadata!;
+    }
+    return undefined;
+  }
+
+  public async getMetricMetadata(metric?: string) {
+    if (!metric) {
+      return undefined;
+    }
+    if (!this._metricsMetadata) {
+      this._metricsMetadata = this._getMetricsMetadata();
+    }
+
+    const metadata = await this._metricsMetadata;
+    return metadata?.[metric];
+  }
+}
+
+export function getMetricDescription(metadata?: PromMetricsMetadataItem) {
+  if (!metadata) {
+    return undefined;
+  }
+
+  const { type, help, unit } = metadata;
+
+  const lines = [
+    help, //
+    type && `**Type:** *${type}*`,
+    unit && `**Unit:** ${unit}`,
+  ];
+
+  return lines.join('\n\n');
+}
diff --git a/public/app/features/trails/hideEmptyPreviews.ts b/public/app/features/trails/hideEmptyPreviews.ts
new file mode 100644
index 0000000000000..44c467f48a6af
--- /dev/null
+++ b/public/app/features/trails/hideEmptyPreviews.ts
@@ -0,0 +1,43 @@
+import { FieldType, LoadingState } from '@grafana/data';
+import { SceneCSSGridItem, sceneGraph } from '@grafana/scenes';
+
+import { MetricSelectScene } from './MetricSelectScene';
+
+export function hideEmptyPreviews(metric: string) {
+  return (gridItem: SceneCSSGridItem) => {
+    const data = sceneGraph.getData(gridItem);
+    if (!data) {
+      return;
+    }
+
+    data.subscribeToState((state) => {
+      if (state.data?.state === LoadingState.Loading || state.data?.state === LoadingState.Error) {
+        return;
+      }
+      const scene = sceneGraph.getAncestor(gridItem, MetricSelectScene);
+
+      if (!state.data?.series.length) {
+        scene.updateMetricPanel(metric, true, true);
+        return;
+      }
+
+      let hasValue = false;
+      for (const frame of state.data.series) {
+        for (const field of frame.fields) {
+          if (field.type !== FieldType.number) {
+            continue;
+          }
+
+          hasValue = field.values.some((v) => v != null && !isNaN(v) && v !== 0);
+          if (hasValue) {
+            break;
+          }
+        }
+        if (hasValue) {
+          break;
+        }
+      }
+      scene.updateMetricPanel(metric, true, !hasValue);
+    });
+  };
+}
diff --git a/public/app/features/trails/interactions.ts b/public/app/features/trails/interactions.ts
new file mode 100644
index 0000000000000..9e42b731380f4
--- /dev/null
+++ b/public/app/features/trails/interactions.ts
@@ -0,0 +1,149 @@
+import { AdHocVariableFilter } from '@grafana/data';
+import { reportInteraction } from '@grafana/runtime';
+
+import { LayoutType } from './ActionTabs/types';
+import { TrailStepType } from './DataTrailsHistory';
+import { ActionViewType } from './shared';
+
+// prettier-ignore
+type Interactions = {
+  // User selected a label to view its breakdown.
+  label_selected: {
+    label: string;
+    cause: (
+      // By clicking the "select" button on that label's breakdown panel
+      | 'breakdown_panel'
+      // By clicking the label link on the overview
+      | 'overview_link'
+      // By clicking on the label selector at the top of the breakdown
+      | 'selector'
+    );
+  };
+  // User changed a label filter.
+  label_filter_changed: {
+    label: string;
+    action: 'added' | 'removed' | 'changed';
+    cause: 'breakdown' | 'adhoc_filter';
+  };
+  // User changed the breakdown layout
+  breakdown_layout_changed: { layout: LayoutType };
+  // A metric exploration has started due to one of the following causes
+  exploration_started: {
+    cause: (
+      // a bookmark was clicked from the home page
+      | 'bookmark_clicked'
+      // a recent exploration was clicked from the home page
+      | 'recent_clicked'
+      // "new exploration" was clicked from the home page
+      | 'new_clicked'
+      // the page was loaded (or reloaded) from a URL which matches one of the recent explorations
+      | 'loaded_local_recent_url'
+      // the page was loaded from a URL which did not match one of the recent explorations, and is assumed shared
+      | 'loaded_shared_url'
+      // the exploration was opened from the dashboard panel menu and is embedded in a drawer
+      | 'dashboard_panel'
+    );
+  };
+  // A user has changed a bookmark
+  bookmark_changed: {
+    action: (
+      // Toggled on or off from the bookmark icon
+      | 'toggled_on'
+      | 'toggled_off'
+      // Deleted from the homepage bookmarks list
+      | 'deleted'
+    );
+  };
+  // User changes metric explore settings
+  settings_changed: { stickyMainGraph?: boolean };
+  // User clicks on history nodes to navigate exploration history
+  history_step_clicked: {
+    type: (
+      // One of the the standard step types
+      | TrailStepType
+      // The special metric step type that is created when the user de-selects the current metric
+      | 'metric-clear'
+    );
+  };
+  // User clicks on tab to change the action view
+  metric_action_view_changed: { view: ActionViewType };
+  // User clicks on one of the action buttons associated with a selected metric
+  selected_metric_action_clicked: {
+    action: (
+      // Opens the metric queries in Explore
+      | 'open_in_explore'
+      // Clicks on the share URL button
+      | 'share_url'
+      // Deselects the current selected metrics by clicking the "Select new metric" button
+      | 'unselect'
+      // When in embedded mode, clicked to open the exploration from the embedded view
+      | 'open_from_embedded'
+    );
+  };
+  // User selects a metric
+  metric_selected: {
+    from: (
+      // By clicking "Select" on a metric panel when on the no-metric-selected metrics list view
+      | 'metric_list'
+      // By clicking "Select" on a metric panel when on the related metrics tab
+      | 'related_metrics'
+    );
+    // The number of search terms activated when the selection was made
+    searchTermCount: number | null;
+  };
+};
+
+const PREFIX = 'grafana_explore_metrics_';
+
+export function reportExploreMetrics<E extends keyof Interactions, P extends Interactions[E]>(event: E, payload: P) {
+  reportInteraction(`${PREFIX}${event}`, payload);
+}
+
+/** Detect the single change in filters and report the event, assuming it came from manipulating the adhoc filter */
+export function reportChangeInLabelFilters(newFilters: AdHocVariableFilter[], oldFilters: AdHocVariableFilter[]) {
+  if (newFilters.length === oldFilters.length) {
+    for (const oldFilter of oldFilters) {
+      for (const newFilter of newFilters) {
+        if (oldFilter.key === newFilter.key) {
+          if (oldFilter.value !== newFilter.value) {
+            reportExploreMetrics('label_filter_changed', {
+              label: oldFilter.key,
+              action: 'changed',
+              cause: 'adhoc_filter',
+            });
+          }
+        }
+      }
+    }
+  } else if (newFilters.length < oldFilters.length) {
+    for (const oldFilter of oldFilters) {
+      let foundOldLabel = false;
+      for (const newFilter of newFilters) {
+        if (oldFilter.key === newFilter.key) {
+          foundOldLabel = true;
+          break;
+        }
+      }
+      if (!foundOldLabel) {
+        reportExploreMetrics('label_filter_changed', {
+          label: oldFilter.key,
+          action: 'removed',
+          cause: 'adhoc_filter',
+        });
+      }
+    }
+  } else {
+    for (const newFilter of newFilters) {
+      let foundNewLabel = false;
+      for (const oldFilter of oldFilters) {
+        if (oldFilter.key === newFilter.key) {
+          foundNewLabel = true;
+          break;
+        }
+      }
+      if (!foundNewLabel) {
+        reportExploreMetrics('label_filter_changed', { label: newFilter.key, action: 'added', cause: 'adhoc_filter' });
+      }
+    }
+  }
+}
diff --git a/public/app/features/trails/relatedMetrics.ts b/public/app/features/trails/relatedMetrics.ts
new file mode 100644
index 0000000000000..9aaf24745e1db
--- /dev/null
+++ b/public/app/features/trails/relatedMetrics.ts
@@ -0,0 +1,42 @@
+import leven from 'leven';
+
+export function sortRelatedMetrics(metricList: string[], metric: string) {
+  return metricList.sort((aValue, bValue) => {
+    const a = getLevenDistances(aValue, metric);
+    const b = getLevenDistances(bValue, metric);
+
+    return a.halfLeven + a.wholeLeven - (b.halfLeven + b.wholeLeven);
+  });
+}
+
+type LevenDistances = { halfLeven: number; wholeLeven: number };
+type TargetToLevenDistances = Map<string, LevenDistances>;
+
+const metricToTargetLevenDistances = new Map<string, TargetToLevenDistances>();
+
+// Provides the Levenshtein distance between a metric to be sorted
+// and a targetMetric compared to which all other metrics are being sorted
+// There are two distances: once for the first half and once for the whole string.
+// This operation is not expected to be symmetric; order of parameters matters
+// since only `metric` is split.
+function getLevenDistances(metric: string, targetMetric: string) {
+  let targetToDistances: TargetToLevenDistances | undefined = metricToTargetLevenDistances.get(metric);
+  if (!targetToDistances) {
+    targetToDistances = new Map<string, LevenDistances>();
+    metricToTargetLevenDistances.set(metric, targetToDistances);
+  }
+
+  let distances: LevenDistances | undefined = targetToDistances.get(targetMetric);
+  if (!distances) {
+    const metricSplit = metric.split('_');
+    const metricHalf = metricSplit.slice(0, metricSplit.length / 2).join('_');
+
+    const halfLeven = leven(metricHalf, targetMetric!) || 0;
+    const wholeLeven = leven(metric, targetMetric!) || 0;
+
+    distances = { halfLeven, wholeLeven };
+    targetToDistances.set(targetMetric, distances);
+  }
+
+  return distances;
+}
diff --git a/public/app/features/trails/shared.ts b/public/app/features/trails/shared.ts
new file mode 100644
index 0000000000000..691360a53c470
--- /dev/null
+++ b/public/app/features/trails/shared.ts
@@ -0,0 +1,51 @@
+import { BusEventWithPayload } from '@grafana/data';
+import { ConstantVariable, SceneObject } from '@grafana/scenes';
+import { VariableHide } from '@grafana/schema';
+
+export type ActionViewType = 'overview' | 'breakdown' | 'logs' | 'related';
+export interface ActionViewDefinition {
+  displayName: string;
+  value: ActionViewType;
+  description?: string;
+  getScene: () => SceneObject;
+}
+
+export const TRAILS_ROUTE = '/explore/metrics/trail';
+export const HOME_ROUTE = '/explore/metrics';
+
+export const VAR_METRIC_NAMES = 'metricNames';
+export const VAR_FILTERS = 'filters';
+export const VAR_FILTERS_EXPR = '{${filters}}';
+export const VAR_METRIC = 'metric';
+export const VAR_METRIC_EXPR = '${metric}';
+export const VAR_GROUP_BY = 'groupby';
+export const VAR_GROUP_BY_EXP = '${groupby}';
+export const VAR_DATASOURCE = 'ds';
+export const VAR_DATASOURCE_EXPR = '${ds}';
+export const VAR_LOGS_DATASOURCE = 'logsDs';
+export const VAR_LOGS_DATASOURCE_EXPR = '${logsDs}';
+
+export const LOGS_METRIC = '$__logs__';
+export const KEY_SQR_METRIC_VIZ_QUERY = 'sqr-metric-viz-query';
+
+export const trailDS = { uid: VAR_DATASOURCE_EXPR };
+
+// Local storage keys
+export const RECENT_TRAILS_KEY = 'grafana.trails.recent';
+export const BOOKMARKED_TRAILS_KEY = 'grafana.trails.bookmarks';
+
+export type MakeOptional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;
+
+export function getVariablesWithMetricConstant(metric: string) {
+  return [
+    new ConstantVariable({
+      name: VAR_METRIC,
+      value: metric,
+      hide: VariableHide.hideVariable,
+    }),
+  ];
+}
+
+export class MetricSelectedEvent extends BusEventWithPayload<string | undefined> {
+  public static type = 'metric-selected-event';
+}
diff --git a/public/app/features/trails/utils.ts b/public/app/features/trails/utils.ts
new file mode 100644
index 0000000000000..2b18245a6dc77
--- /dev/null
+++ b/public/app/features/trails/utils.ts
@@ -0,0 +1,116 @@
+import { urlUtil } from '@grafana/data';
+import { config, getDataSourceSrv } from '@grafana/runtime';
+import {
+  AdHocFiltersVariable,
+  getUrlSyncManager,
+  sceneGraph,
+  SceneObject,
+  SceneObjectState,
+  SceneObjectUrlValues,
+  SceneTimeRange,
+} from '@grafana/scenes';
+
+import { getDatasourceSrv } from '../plugins/datasource_srv';
+
+import { DataTrail } from './DataTrail';
+import { DataTrailSettings } from './DataTrailSettings';
+import { MetricScene } from './MetricScene';
+import { getTrailStore } from './TrailStore/TrailStore';
+import { LOGS_METRIC, TRAILS_ROUTE, VAR_DATASOURCE_EXPR } from './shared';
+
+export function getTrailFor(model: SceneObject): DataTrail {
+  return sceneGraph.getAncestor(model, DataTrail);
+}
+
+export function getTrailSettings(model: SceneObject): DataTrailSettings {
+  return sceneGraph.getAncestor(model, DataTrail).state.settings;
+}
+
+export function newMetricsTrail(initialDS?: string): DataTrail {
+  return new DataTrail({
+    initialDS,
+    $timeRange: new SceneTimeRange({ from: 'now-1h', to: 'now' }),
+    //initialFilters: [{ key: 'job', operator: '=', value: 'grafana' }],
+    embedded: false,
+  });
+}
+
+export function getUrlForTrail(trail: DataTrail) {
+  const params = getUrlSyncManager().getUrlState(trail);
+  return getUrlForValues(params);
+}
+
+export function getUrlForValues(values: SceneObjectUrlValues) {
+  return urlUtil.renderUrl(TRAILS_ROUTE, values);
+}
+
+export function getMetricSceneFor(model: SceneObject): MetricScene {
+  if (model instanceof MetricScene) {
+    return model;
+  }
+
+  if (model.parent) {
+    return getMetricSceneFor(model.parent);
+  }
+
+  console.error('Unable to find graph view for', model);
+
+  throw new Error('Unable to find trail');
+}
+
+export function getDataSource(trail: DataTrail) {
+  return sceneGraph.interpolate(trail, VAR_DATASOURCE_EXPR);
+}
+
+export function getDataSourceName(dataSourceUid: string) {
+  return getDataSourceSrv().getInstanceSettings(dataSourceUid)?.name || dataSourceUid;
+}
+
+export function getMetricName(metric?: string) {
+  if (!metric) {
+    return 'Select metric';
+  }
+
+  if (metric === LOGS_METRIC) {
+    return 'Logs';
+  }
+
+  return metric;
+}
+
+export function getDatasourceForNewTrail(): string | undefined {
+  const prevTrail = getTrailStore().recent[0];
+  if (prevTrail) {
+    const prevDataSource = sceneGraph.interpolate(prevTrail.resolve(), VAR_DATASOURCE_EXPR);
+    if (typeof prevDataSource === 'string' && prevDataSource.length > 0) {
+      return prevDataSource;
+    }
+  }
+  const promDatasources = getDatasourceSrv().getList({ type: 'prometheus' });
+  if (promDatasources.length > 0) {
+    return promDatasources.find((mds) => mds.uid === config.defaultDatasource)?.uid ?? promDatasources[0].uid;
+  }
+  return undefined;
+}
+
+export function getColorByIndex(index: number) {
+  const visTheme = config.theme2.visualization;
+  return visTheme.getColorByName(visTheme.palette[index % 8]);
+}
+
+export type SceneTimeRangeState = SceneObjectState & {
+  from: string;
+  to: string;
+};
+export function isSceneTimeRangeState(state: SceneObjectState): state is SceneTimeRangeState {
+  const keys = Object.keys(state);
+  return keys.includes('from') && keys.includes('to');
+}
+
+export function getFilters(scene: SceneObject) {
+  const filters = sceneGraph.lookupVariable('filters', scene);
+  if (filters instanceof AdHocFiltersVariable) {
+    return filters.state.filters;
+  }
+  return null;
+}
diff --git a/public/app/features/transformers/FilterByValueTransformer/FilterByValueTransformerEditor.tsx b/public/app/features/transformers/FilterByValueTransformer/FilterByValueTransformerEditor.tsx
index 4fccd5651bd64..bb5ecf34abfd5 100644
--- a/public/app/features/transformers/FilterByValueTransformer/FilterByValueTransformerEditor.tsx
+++ b/public/app/features/transformers/FilterByValueTransformer/FilterByValueTransformerEditor.tsx
@@ -22,6 +22,8 @@ import {
 } from '@grafana/data/src/transformations/transformers/filterByValue';
 import { Button, RadioButtonGroup, InlineField, Box } from '@grafana/ui';
 
+import { getTransformationContent } from '../docs/getTransformationContent';
+
 import { DataFrameFieldsInfo, FilterByValueFilterEditor } from './FilterByValueFilterEditor';
 
 const filterTypes: Array<SelectableValue<FilterByValueType>> = [
@@ -135,6 +137,7 @@ export const filterByValueTransformRegistryItem: TransformerRegistryItem<FilterB
   description:
     'Removes rows of the query results using user-defined filters. This is useful if you can not filter your data in the data source.',
   categories: new Set([TransformerCategory.Filter]),
+  help: getTransformationContent(DataTransformerID.filterByValue).helperDocs,
 };
 
 const useFieldsInfo = (data: DataFrame[]): DataFrameFieldsInfo => {
diff --git a/public/app/features/transformers/FilterByValueTransformer/ValueMatchers/BasicMatcherEditor.tsx b/public/app/features/transformers/FilterByValueTransformer/ValueMatchers/BasicMatcherEditor.tsx
index e80b2cbe2be1d..eadbc0b50e992 100644
--- a/public/app/features/transformers/FilterByValueTransformer/ValueMatchers/BasicMatcherEditor.tsx
+++ b/public/app/features/transformers/FilterByValueTransformer/ValueMatchers/BasicMatcherEditor.tsx
@@ -127,5 +127,19 @@ export const getBasicValueMatchersUI = (): Array<ValueMatcherUIRegistryItem<Basi
         validator: () => true,
       }),
     },
+    {
+      name: 'Is Substring',
+      id: ValueMatcherID.substring,
+      component: basicMatcherEditor<string | number | boolean>({
+        validator: () => true,
+      }),
+    },
+    {
+      name: 'Is not substring',
+      id: ValueMatcherID.notSubstring,
+      component: basicMatcherEditor<string | number | boolean>({
+        validator: () => true,
+      }),
+    },
   ];
 };
diff --git a/public/app/features/transformers/calculateHeatmap/HeatmapTransformerEditor.tsx b/public/app/features/transformers/calculateHeatmap/HeatmapTransformerEditor.tsx
index 1870cbd2d5bdc..2fb94c1dc8002 100644
--- a/public/app/features/transformers/calculateHeatmap/HeatmapTransformerEditor.tsx
+++ b/public/app/features/transformers/calculateHeatmap/HeatmapTransformerEditor.tsx
@@ -9,6 +9,7 @@ import {
   TransformerCategory,
 } from '@grafana/data';
 
+import { getTransformationContent } from '../docs/getTransformationContent';
 import { getDefaultOptions, getTransformerOptionPane } from '../spatial/optionsHelper';
 
 import { addHeatmapCalculationOptions } from './editor/helper';
@@ -49,4 +50,5 @@ export const heatmapTransformRegistryItem: TransformerRegistryItem<HeatmapTransf
   description: heatmapTransformer.description,
   state: PluginState.alpha,
   categories: new Set([TransformerCategory.CreateNewVisualization]),
+  help: getTransformationContent(heatmapTransformer.id).helperDocs,
 };
diff --git a/public/app/features/transformers/calculateHeatmap/heatmap.ts b/public/app/features/transformers/calculateHeatmap/heatmap.ts
index a5c770fe9e8f0..1de1d63836119 100644
--- a/public/app/features/transformers/calculateHeatmap/heatmap.ts
+++ b/public/app/features/transformers/calculateHeatmap/heatmap.ts
@@ -323,11 +323,12 @@ export function calculateHeatmapFromData(frames: DataFrame[], options: HeatmapCa
       xBucketsCfg.mode === HeatmapCalculationMode.Size
         ? durationToMilliseconds(parseDuration(xBucketsCfg.value ?? ''))
         : xBucketsCfg.value
-        ? +xBucketsCfg.value
-        : undefined,
+          ? +xBucketsCfg.value
+          : undefined,
     yMode: yBucketsCfg.mode,
     ySize: yBucketsCfg.value ? +yBucketsCfg.value : undefined,
-    yLog: scaleDistribution?.type === ScaleDistribution.Log ? (scaleDistribution?.log as any) : undefined,
+    yLog:
+      scaleDistribution?.type === ScaleDistribution.Log ? (scaleDistribution?.log as 2 | 10 | undefined) : undefined,
   });
 
   const frame = {
diff --git a/public/app/features/transformers/configFromQuery/ConfigFromQueryTransformerEditor.tsx b/public/app/features/transformers/configFromQuery/ConfigFromQueryTransformerEditor.tsx
index 9dc54d344b5db..efe7749d3c5af 100644
--- a/public/app/features/transformers/configFromQuery/ConfigFromQueryTransformerEditor.tsx
+++ b/public/app/features/transformers/configFromQuery/ConfigFromQueryTransformerEditor.tsx
@@ -12,6 +12,7 @@ import {
 } from '@grafana/data';
 import { fieldMatchersUI, InlineField, InlineFieldRow, Select, useStyles2 } from '@grafana/ui';
 
+import { getTransformationContent } from '../docs/getTransformationContent';
 import { FieldToConfigMappingEditor } from '../fieldToConfigMapping/FieldToConfigMappingEditor';
 
 import { configFromDataTransformer, ConfigFromQueryTransformOptions } from './configFromQuery';
@@ -95,73 +96,7 @@ export const configFromQueryTransformRegistryItem: TransformerRegistryItem<Confi
   description: configFromDataTransformer.description,
   state: PluginState.beta,
   categories: new Set([TransformerCategory.CalculateNewFields]),
-  help: `
-### Use cases
-
-This transformation allows you select one query and from it extract standard options such as
-**Min**, **Max**, **Unit**, and **Thresholds** and apply them to other query results.
-This enables dynamic query driven visualization configuration.
-
-### Options
-
-- **Config query**: Selet the query that returns the data you want to use as configuration.
-- **Apply to**: Select what fields or series to apply the configuration to.
-- **Apply to options**: Usually a field type or field name regex depending on what option you selected in **Apply to**.
-
-### Field mapping table
-
-Below the configuration listed above you will find the field table. Here all fields found in the data returned by the config query will be listed along with a **Use as** and **Select** option. This table gives you control over what field should be mapped to which config property and if there are multiple rows which value to select.
-
-## Example
-
-Input[0] (From query: A, name: ServerA)
-
-| Time          | Value |
-| ------------- | ----- |
-| 1626178119127 | 10    |
-| 1626178119129 | 30    |
-
-Input[1] (From query: B)
-
-| Time          | Value |
-| ------------- | ----- |
-| 1626178119127 | 100   |
-| 1626178119129 | 100   |
-
-Output (Same as Input[0] but now with config on the Value field)
-
-| Time          | Value (config: Max=100) |
-| ------------- | ----------------------- |
-| 1626178119127 | 10                      |
-| 1626178119129 | 30                      |
-
-Each row in the source data becomes a separate field. Each field now also has a maximum
-configuration option set. Options such as **min**, **max**, **unit**, and **thresholds** are all part of field configuration, and if they are set like this, they will be used by the visualization instead of any options that are manually configured.
-in the panel editor options pane.
-
-## Value mappings
-
-You can also transform a query result into value mappings. This is is a bit different because every
-row in the configuration query result is used to define a single value mapping row. See the following example.
-
-Config query result:
-
-| Value | Text   | Color |
-| ----- | ------ | ----- |
-| L     | Low    | blue  |
-| M     | Medium | green |
-| H     | High   | red   |
-
-In the field mapping specify:
-
-| Field | Use as                  | Select     |
-| ----- | ----------------------- | ---------- |
-| Value | Value mappings / Value  | All values |
-| Text  | Value mappings / Text   | All values |
-| Color | Value mappings / Ciolor | All values |
-
-Grafana will build the value mappings from you query result and apply it the the real data query results. You should see values being mapped and colored according to the config query results.
-`,
+  help: getTransformationContent(configFromDataTransformer.id).helperDocs,
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
diff --git a/public/app/features/transformers/configFromQuery/configFromQuery.test.ts b/public/app/features/transformers/configFromQuery/configFromQuery.test.ts
index 08f0f7efb877b..dbf6e024eb261 100644
--- a/public/app/features/transformers/configFromQuery/configFromQuery.test.ts
+++ b/public/app/features/transformers/configFromQuery/configFromQuery.test.ts
@@ -85,6 +85,20 @@ describe('config from data', () => {
     expect(results[0].fields[1].config.max).toBe(1);
   });
 
+  it('With threshold', () => {
+    const options: ConfigFromQueryTransformOptions = {
+      configRefId: 'A',
+      mappings: [{ fieldName: 'Max', handlerKey: 'threshold1', handlerArguments: { threshold: { color: 'orange' } } }],
+    };
+
+    const results = extractConfigFromQuery(options, [config, seriesA]);
+    expect(results.length).toBe(1);
+    const thresholdConfig = results[0].fields[1].config.thresholds?.steps[1];
+    expect(thresholdConfig).toBeDefined();
+    expect(thresholdConfig?.color).toBe('orange');
+    expect(thresholdConfig?.value).toBe(50);
+  });
+
   it('With custom matcher and displayName mapping', () => {
     const options: ConfigFromQueryTransformOptions = {
       configRefId: 'A',
@@ -102,6 +116,7 @@ describe('value mapping from data', () => {
   const config = toDataFrame({
     fields: [
       { name: 'value', type: FieldType.number, values: [1, 2, 3] },
+      { name: 'threshold', type: FieldType.number, values: [4] },
       { name: 'text', type: FieldType.string, values: ['one', 'two', 'three'] },
       { name: 'color', type: FieldType.string, values: ['red', 'blue', 'green'] },
     ],
diff --git a/public/app/features/transformers/configFromQuery/configFromQuery.ts b/public/app/features/transformers/configFromQuery/configFromQuery.ts
index 511e5257ac81d..44cd15c2117fe 100644
--- a/public/app/features/transformers/configFromQuery/configFromQuery.ts
+++ b/public/app/features/transformers/configFromQuery/configFromQuery.ts
@@ -12,7 +12,7 @@ import {
 } from '@grafana/data';
 
 import {
-  evaluteFieldMappings,
+  evaluateFieldMappings,
   FieldToConfigMapping,
   getFieldConfigFromFrame,
 } from '../fieldToConfigMapping/fieldToConfigMapping';
@@ -42,7 +42,7 @@ export function extractConfigFromQuery(options: ConfigFromQueryTransformOptions,
     length: 1,
   };
 
-  const mappingResult = evaluteFieldMappings(configFrame, options.mappings ?? [], false);
+  const mappingResult = evaluateFieldMappings(configFrame, options.mappings ?? [], false);
 
   // reduce config frame
   for (const field of configFrame.fields) {
diff --git a/public/app/features/transformers/docs/content.ts b/public/app/features/transformers/docs/content.ts
index 19ffdb3b1ae70..c7331f55bc643 100644
--- a/public/app/features/transformers/docs/content.ts
+++ b/public/app/features/transformers/docs/content.ts
@@ -39,32 +39,44 @@ export const transformationDocsContent: TransformationDocsContentType = {
     */
     getHelperDocs: function (imageRenderType: ImageRenderType = ImageRenderType.ShortcodeFigure) {
       return `
-  Use this transformation to add a new field calculated from two other fields. Each transformation allows you to add one new field.
-
-  - **Mode -** Select a mode:
-    - **Reduce row -** Apply selected calculation on each row of selected fields independently.
-    - **Binary operation -** Apply basic binary operations (for example, sum or multiply) on values in a single row from two selected fields.
-    - **Unary operation -** Apply basic unary operations on values in a single row from a selected field. The available operations are:
-      - **Absolute value (abs)** - Returns the absolute value of a given expression. It represents its distance from zero as a positive number.
-      - **Natural exponential (exp)** - Returns _e_ raised to the power of a given expression.
-      - **Natural logarithm (ln)** - Returns the natural logarithm of a given expression.
-      - **Floor (floor)** - Returns the largest integer less than or equal to a given expression.
-      - **Ceiling (ceil)** - Returns the smallest integer greater than or equal to a given expression.
-    - **Row index -** Insert a field with the row index.
-  - **Field name -** Select the names of fields you want to use in the calculation for the new field.
-  - **Calculation -** If you select **Reduce row** mode, then the **Calculation** field appears. Click in the field to see a list of calculation choices you can use to create the new field. For information about available calculations, refer to [Calculation types][].
-  - **Operation -** If you select **Binary operation** or **Unary operation** mode, then the **Operation** fields appear. These fields allow you to apply basic math operations on values in a single row from selected fields. You can also use numerical values for binary operations.
-  - **As percentile -** If you select **Row index** mode, then the **As percentile** switch appears. This switch allows you to transform the row index as a percentage of the total number of rows.
-  - **Alias -** (Optional) Enter the name of your new field. If you leave this blank, then the field will be named to match the calculation.
-  - **Replace all fields -** (Optional) Select this option if you want to hide all other fields and display only your calculated field in the visualization.
-  
-  In the example below, we added two fields together and named them Sum.
-
-  ${buildImageContent(
-    '/static/img/docs/transformations/add-field-from-calc-stat-example-7-0.png',
-    imageRenderType,
-    this.name
-  )}
+Use this transformation to add a new field calculated from two other fields. Each transformation allows you to add one new field.
+
+- **Mode** - Select a mode:
+  - **Reduce row** - Apply selected calculation on each row of selected fields independently.
+  - **Binary operation** - Apply basic binary operations (for example, sum or multiply) on values in a single row from two selected fields.
+  - **Unary operation** - Apply basic unary operations on values in a single row from a selected field. The available operations are:
+    - **Absolute value (abs)** - Returns the absolute value of a given expression. It represents its distance from zero as a positive number.
+    - **Natural exponential (exp)** - Returns _e_ raised to the power of a given expression.
+    - **Natural logarithm (ln)** - Returns the natural logarithm of a given expression.
+    - **Floor (floor)** - Returns the largest integer less than or equal to a given expression.
+    - **Ceiling (ceil)** - Returns the smallest integer greater than or equal to a given expression.
+  - **Cumulative functions** - Apply functions on the current row and all preceding rows.
+    - **Total** - Calculates the cumulative total up to and including the current row.
+    - **Mean** - Calculates the mean up to and including the current row.
+  - **Window functions** - Apply window functions. The window can either be **trailing** or **centered**.
+    With a trailing window the current row will be the last row in the window.
+    With a centered window the window will be centered on the current row.
+    For even window sizes, the window will be centered between the current row, and the previous row.
+    - **Mean** - Calculates the moving mean or running average.
+    - **Stddev** - Calculates the moving standard deviation.
+    - **Variance** - Calculates the moving variance.
+  - **Row index** - Insert a field with the row index.
+- **Field name** - Select the names of fields you want to use in the calculation for the new field.
+- **Calculation** - If you select **Reduce row** mode, then the **Calculation** field appears. Click in the field to see a list of calculation choices you can use to create the new field. For information about available calculations, refer to [Calculation types][].
+- **Operation** - If you select **Binary operation** or **Unary operation** mode, then the **Operation** fields appear. These fields allow you to apply basic math operations on values in a single row from selected fields. You can also use numerical values for binary operations.
+- **As percentile** - If you select **Row index** mode, then the **As percentile** switch appears. This switch allows you to transform the row index as a percentage of the total number of rows.
+- **Alias** - (Optional) Enter the name of your new field. If you leave this blank, then the field will be named to match the calculation.
+- **Replace all fields** - (Optional) Select this option if you want to hide all other fields and display only your calculated field in the visualization.
+
+> **Note:** **Cumulative functions** and **Window functions** modes are currently in public preview. Grafana Labs offers limited support, and breaking changes might occur prior to the feature being made generally available. Enable the \`addFieldFromCalculationStatFunctions\` feature toggle in Grafana to use this feature. Contact Grafana Support to enable this feature in Grafana Cloud.
+
+In the example below, we added two fields together and named them Sum.
+
+${buildImageContent(
+  '/static/img/docs/transformations/add-field-from-calc-stat-example-7-0.png',
+  imageRenderType,
+  'A stat visualization including one field called Sum'
+)}
   `;
     },
     links: [
@@ -78,25 +90,31 @@ export const transformationDocsContent: TransformationDocsContentType = {
     name: 'Concatenate fields',
     getHelperDocs: function () {
       return `
-  Use this transformation to combine all fields from all frames into one result. Consider the following:
+Use this transformation to combine all fields from all frames into one result.
+
+For example, if you have separate queries retrieving temperature and uptime data (Query A) and air quality index and error information (Query B), applying the concatenate transformation yields a consolidated data frame with all relevant information in one view.
 
-  **Query A:**
+Consider the following:
 
-  | Temp  | Uptime    |
-  | ----- | --------- |
-  | 15.4  | 1230233   |
+**Query A:**
 
-  **Query B:**
+| Temp  | Uptime  |
+| ----- | ------- |
+| 15.4  | 1230233 |
 
-  | AQI   | Errors |
-  | ----- | ------ |
-  | 3.2   | 5      |
+**Query B:**
 
-  After you concatenate the fields, the data frame would be:
+| AQI   | Errors |
+| ----- | ------ |
+| 3.2   | 5      |
 
-  | Temp  | Uptime   | AQI   | Errors |
-  | ----- | -------- | ----- | ------ |
-  | 15.4  | 1230233  | 3.2   | 5      |
+After you concatenate the fields, the data frame would be:
+
+| Temp | Uptime  | AQI | Errors |
+| ---- | ------- | --- | ------ |
+| 15.4 | 1230233 | 3.2 | 5      |
+
+This transformation simplifies the process of merging data from different sources, providing a comprehensive view for analysis and visualization.
   `;
     },
   },
@@ -104,69 +122,64 @@ export const transformationDocsContent: TransformationDocsContentType = {
     name: 'Config from query results',
     getHelperDocs: function () {
       return `
-  Use this transformation to select one query and from it extract standard options such as
-  **Min**, **Max**, **Unit**, and **Thresholds** and apply them to other query results.
-  This enables dynamic query driven visualization configuration.
+Use this transformation to select a query and extract standard options, such as **Min**, **Max**, **Unit**, and **Thresholds**, and apply them to other query results. This feature enables dynamic visualization configuration based on the data returned by a specific query.
 
-  #### Options
+#### Options
 
-  - **Config query**: Select the query that returns the data you want to use as configuration.
-  - **Apply to**: Select what fields or series to apply the configuration to.
-  - **Apply to options**: Usually a field type or field name regex depending on what option you selected in **Apply to**.
+- **Config query** - Select the query that returns the data you want to use as configuration.
+- **Apply to** - Select the fields or series to which the configuration should be applied.
+- **Apply to options** - Specify a field type or use a field name regex, depending on your selection in **Apply to**.
 
-  #### Field mapping table
+#### Field mapping table
 
-  Below the configuration listed above you will find the field table. Here all fields found in the data returned by the config query will be listed along with a **Use as** and **Select** option. This table gives you control over what field should be mapped to which config property and if there are multiple rows which value to select.
+Below the configuration options, you'll find the field mapping table. This table lists all fields found in the data returned by the config query, along with **Use as** and **Select** options. It provides control over mapping fields to config properties, and for multiple rows, it allows you to choose which value to select.
 
-  #### Example
+#### Example
 
-  Input[0] (From query: A, name: ServerA)
+Input[0] (From query: A, name: ServerA)
 
-  | Time          | Value |
-  | ------------- | ----- |
-  | 1626178119127 | 10    |
-  | 1626178119129 | 30    |
+| Time          | Value |
+| ------------- | ----- |
+| 1626178119127 | 10    |
+| 1626178119129 | 30    |
 
-  Input[1] (From query: B)
+Input[1] (From query: B)
 
-  | Time          | Value |
-  | ------------- | ----- |
-  | 1626178119127 | 100   |
-  | 1626178119129 | 100   |
+| Time          | Value |
+| ------------- | ----- |
+| 1626178119127 | 100   |
+| 1626178119129 | 100   |
 
-  Output (Same as Input[0] but now with config on the Value field)
+Output (Same as Input[0] but now with config on the Value field)
 
-  | Time          | Value (config: Max=100) |
-  | ------------- | ----------------------- |
-  | 1626178119127 | 10                      |
-  | 1626178119129 | 30                      |
+| Time          | Value (config: Max=100) |
+| ------------- | ----------------------- |
+| 1626178119127 | 10                      |
+| 1626178119129 | 30                      |
 
-  Each row in the source data becomes a separate field. Each field now also has a maximum
-  configuration option set. Options such as **min**, **max**, **unit**, and **thresholds** are all part of field configuration, and if they are set like this, they will be used by the visualization instead of any options that are manually configured.
-  in the panel editor options pane.
+Each row in the source data becomes a separate field. Each field now has a maximum configuration option set. Options such as **Min**, **Max**, **Unit**, and **Thresholds** are part of the field configuration. If set, they are used by the visualization instead of any options manually configured in the panel editor options pane.
 
-  #### Value mappings
+#### Value mappings
 
-  You can also transform a query result into value mappings. This is is a bit different because every
-  row in the configuration query result is used to define a single value mapping row. See the following example.
+You can also transform a query result into value mappings. With this option, every row in the configuration query result defines a single value mapping row. See the following example.
 
-  Config query result:
+Config query result:
 
-  | Value | Text   | Color |
-  | ----- | ------ | ----- |
-  | L     | Low    | blue  |
-  | M     | Medium | green |
-  | H     | High   | red   |
+| Value | Text   | Color |
+| ----- | ------ | ----- |
+| L     | Low    | blue  |
+| M     | Medium | green |
+| H     | High   | red   |
 
-  In the field mapping specify:
+In the field mapping specify:
 
-  | Field | Use as                  | Select     |
-  | ----- | ----------------------- | ---------- |
-  | Value | Value mappings / Value  | All values |
-  | Text  | Value mappings / Text   | All values |
-  | Color | Value mappings / Ciolor | All values |
+| Field | Use as                  | Select     |
+| ----- | ----------------------- | ---------- |
+| Value | Value mappings / Value  | All values |
+| Text  | Value mappings / Text   | All values |
+| Color | Value mappings / Color | All values |
 
-  Grafana will build the value mappings from you query result and apply it the the real data query results. You should see values being mapped and colored according to the config query results.
+Grafana builds value mappings from your query result and applies them to the real data query results. You should see values being mapped and colored according to the config query results.
   `;
     },
   },
@@ -174,37 +187,44 @@ export const transformationDocsContent: TransformationDocsContentType = {
     name: 'Convert field type',
     getHelperDocs: function () {
       return `
-  Use this transformation to change the field type of the specified field.
+Use this transformation to modify the field type of a specified field.
+
+This transformation has the following options:
 
-  - **Field -** Select from available fields
-  - **as -** Select the FieldType to convert to
-    - **Numeric -** attempts to make the values numbers
-    - **String -** will make the values strings
-    - **Time -** attempts to parse the values as time
-      - Will show an option to specify a DateFormat as input by a string like yyyy-mm-dd or DD MM YYYY hh:mm:ss
-    - **Boolean -** will make the values booleans
+- **Field** - Select from available fields
+- **as** - Select the FieldType to convert to
+  - **Numeric** - attempts to make the values numbers
+  - **String** - will make the values strings
+  - **Time** - attempts to parse the values as time
+    - Will show an option to specify a DateFormat as input by a string like yyyy-mm-dd or DD MM YYYY hh:mm:ss
+  - **Boolean** - will make the values booleans
+  - **Enum** - will make the values enums
+    - Will show a table to manage the enums
+  - **Other** - attempts to parse the values as JSON
 
-  For example, the following query could be modified by selecting the time field, as Time, and Date Format as YYYY.
+For example, consider the following query that could be modified by selecting the time field as Time and specifying Date Format as YYYY.
 
-  #### Sample Query
+#### Sample Query
 
-  | Time       | Mark      | Value |
-  |------------|-----------|-------|
-  | 2017-07-01 | above     | 25    |
-  | 2018-08-02 | below     | 22    |
-  | 2019-09-02 | below     | 29    |
-  | 2020-10-04 | above     | 22    |
+| Time       | Mark  | Value |
+|------------|-------|-------|
+| 2017-07-01 | above | 25    |
+| 2018-08-02 | below | 22    |
+| 2019-09-02 | below | 29    |
+| 2020-10-04 | above | 22    |
 
-  The result:
+The result:
 
-  #### Transformed Query
+#### Transformed Query
 
-  | Time                | Mark      | Value |
-  |---------------------|-----------|-------|
-  | 2017-01-01 00:00:00 | above     | 25    |
-  | 2018-01-01 00:00:00 | below     | 22    |
-  | 2019-01-01 00:00:00 | below     | 29    |
-  | 2020-01-01 00:00:00 | above     | 22    |
+| Time                | Mark  | Value |
+|---------------------|-------|-------|
+| 2017-01-01 00:00:00 | above | 25    |
+| 2018-01-01 00:00:00 | below | 22    |
+| 2019-01-01 00:00:00 | below | 29    |
+| 2020-01-01 00:00:00 | above | 22    |
+
+This transformation allows you to flexibly adapt your data types, ensuring compatibility and consistency in your visualizations.
   `;
     },
   },
@@ -212,44 +232,46 @@ export const transformationDocsContent: TransformationDocsContentType = {
     name: 'Extract fields',
     getHelperDocs: function () {
       return `
-  Use this transformation to select one source of data and extract content from it in different formats. Set the following fields:
+Use this transformation to select a source of data and extract content from it in different formats. This transformation has the following fields:
+
+- **Source** - Select the field for the source of data.
+- **Format** - Choose one of the following:
+  - **JSON** - Parse JSON content from the source.
+  - **Key+value pairs** - Parse content in the format 'a=b' or 'c:d' from the source.
+  - **Auto** - Discover fields automatically.
+- **Replace All Fields** - (Optional) Select this option to hide all other fields and display only your calculated field in the visualization.
+- **Keep Time** - (Optional) Available only if **Replace All Fields** is true. Keeps the time field in the output.
 
-  - **Source** - Select the field for the source of data.
-  - **Format** - Select one of the following:
-    - **JSON** - To parse JSON content from the source.
-    - **Key+value parse** - To parse content in the format 'a=b' or 'c:d' from the source.
-    - **Auto** - To discover fields automatically.
-  - **Replace all fields** - Optional: Select this option if you want to hide all other fields and display only your calculated field in the visualization.
-  - **Keep time** - Optional: Only available if **Replace all fields** is true. Keep the time field in the output.
+Consider the following dataset:
 
-  Consider the following data set:
+#### Dataset Example
 
-  #### Data Set Example
+| Timestamp           | json_data     |
+|---------------------|---------------|
+| 1636678740000000000 | {"value": 1}  |
+| 1636678680000000000 | {"value": 5}  |
+| 1636678620000000000 | {"value": 12} |
 
-  | Timestamp         | json_data |
-  |-------------------|-----------|
-  | 1636678740000000000 | {"value": 1} |
-  | 1636678680000000000 | {"value": 5} |
-  | 1636678620000000000 | {"value": 12} |
+You could prepare the data to be used by a [Time series panel][] with this configuration:
 
-  You could prepare the data to be used by a [Time series panel][] with this configuration:
+- Source: json_data
+- Format: JSON
+  - Field: value
+  - Alias: my_value
+- Replace all fields: true
+- Keep time: true
 
-  - Source: json_data
-  - Format: JSON
-    - Field: value
-    - Alias: my_value
-  - Replace all fields: true
-  - Keep time: true
+This will generate the following output:
 
-  This will generate the following output:
+#### Transformed Data
 
-  #### Transformed Data
+| Timestamp           | my_value |
+|---------------------|----------|
+| 1636678740000000000 | 1        |
+| 1636678680000000000 | 5        |
+| 1636678620000000000 | 12       |
 
-  | Timestamp         | my_value |
-  |-------------------|----------|
-  | 1636678740000000000 | 1        |
-  | 1636678680000000000 | 5        |
-  | 1636678620000000000 | 12       |
+This transformation allows you to extract and format data in various ways. You can customize the extraction format based on your specific data needs.
   `;
     },
     links: [
@@ -263,41 +285,45 @@ export const transformationDocsContent: TransformationDocsContentType = {
     name: 'Lookup fields from resource',
     getHelperDocs: function () {
       return `
-  Use this transformation on a field value to look up additional fields from an external source.
+Use this transformation to enrich a field value by looking up additional fields from an external source. 
+  
+This transformation has the following fields:
+
+- **Field** - Select a text field from your dataset.
+- **Lookup** - Choose from **Countries**, **USA States**, and **Airports**.
 
-  - **Field** - Select a text field.
-  - **Lookup** - Select from **Countries**, **USA States**, and **Airports**.
+This transformation currently supports spatial data.
 
-  This transformation currently supports spatial data.
+For example, if you have this data:
 
-  For example, if you have this data:
+#### Dataset Example
 
-  #### Data Set Example
+| Location  | Values |
+|-----------|--------|
+| AL        | 0      |
+| AK        | 10     |
+| Arizona   | 5      |
+| Arkansas  | 1      |
+| Somewhere | 5      |
 
-  | Location  | Values |
-  |-----------|--------|
-  | AL        | 0      |
-  | AK        | 10     |
-  | Arizona   | 5      |
-  | Arkansas  | 1      |
-  | Somewhere | 5      |
+With this configuration:
 
-  With this configuration:
+- Field: location
+- Lookup: USA States
 
-  - Field: location
-  - Lookup: USA States
+You'll get the following output:
 
-  You'll get the following output:
+#### Transformed Data
 
-  #### Transformed Data
+| Location  | ID | Name     | Lng         | Lat       | Values |
+|-----------|----|----------|-------------|-----------|--------|
+| AL        | AL | Alabama  | -80.891064  | 12.448457 | 0      |
+| AK        | AK | Arkansas | -100.891064 | 24.448457 | 10     |
+| Arizona   |    |          |             |           | 5      |
+| Arkansas  |    |          |             |           | 1      |
+| Somewhere |    |          |             |           | 5      |
 
-  | Location  | ID | Name      | Lng        | Lat        | Values |
-  |-----------|----|-----------|------------|------------|--------|
-  | AL        | AL | Alabama   | -80.891064 | 12.448457  | 0      |
-  | AK        | AK | Arkansas  | -100.891064| 24.448457  | 10     |
-  | Arizona   |    |           |            |            | 5      |
-  | Arkansas  |    |           |            |            | 1      |
-  | Somewhere |    |           |            |            | 5      |
+This transformation lets you augment your data by fetching additional information from external sources, providing a more comprehensive dataset for analysis and visualization.
   `;
     },
   },
@@ -305,19 +331,19 @@ export const transformationDocsContent: TransformationDocsContentType = {
     name: 'Filter data by query refId',
     getHelperDocs: function (imageRenderType: ImageRenderType = ImageRenderType.ShortcodeFigure) {
       return `
-  Use this transformation in panels that have multiple queries, if you want to hide one or more of the queries.
+Use this transformation to hide one or more queries in panels that have multiple queries.
 
-  Grafana displays the query identification letters in dark gray text. Click a query identifier to toggle filtering. If the query letter is white, then the results are displayed. If the query letter is dark, then the results are hidden.
+Grafana displays the query identification letters in dark gray text. Click a query identifier to toggle filtering. If the query letter is white, then the results are displayed. If the query letter is dark, then the results are hidden.
 
-  > **Note:** This transformation is not available for Graphite because this data source does not support correlating returned data with queries.
+> **Note:** This transformation is not available for Graphite because this data source does not support correlating returned data with queries.
 
-  In the example below, the panel has three queries (A, B, C). We removed the B query from the visualization.
+In the example below, the panel has three queries (A, B, C). We removed the B query from the visualization.
 
-  ${buildImageContent(
-    '/static/img/docs/transformations/filter-by-query-stat-example-7-0.png',
-    imageRenderType,
-    this.name
-  )}
+${buildImageContent(
+  '/static/img/docs/transformations/filter-by-query-stat-example-7-0.png',
+  imageRenderType,
+  'A stat visualization with results from two queries, A and C'
+)}
   `;
     },
   },
@@ -325,68 +351,75 @@ export const transformationDocsContent: TransformationDocsContentType = {
     name: 'Filter data by values',
     getHelperDocs: function () {
       return `
-  Use this transformation to filter your data directly in Grafana and remove some data points from your query result. You have the option to include or exclude data that match one or more conditions you define. The conditions are applied on a selected field.
+Use this transformation to selectively filter data points directly within your visualization. This transformation provides options to include or exclude data based on one or more conditions applied to a selected field.
 
-  This transformation is very useful if your data source does not natively filter by values. You might also use this to narrow values to display if you are using a shared query.
+This transformation is very useful if your data source does not natively filter by values. You might also use this to narrow values to display if you are using a shared query.
 
-  The available conditions for all fields are:
+The available conditions for all fields are:
 
-  - **Regex:** Match a regex expression
-  - **Is Null:** Match if the value is null
-  - **Is Not Null:** Match if the value is not null
-  - **Equal:** Match if the value is equal to the specified value
-  - **Different:** Match if the value is different than the specified value
+- **Regex** - Match a regex expression.
+- **Is Null** - Match if the value is null.
+- **Is Not Null** - Match if the value is not null.
+- **Equal** - Match if the value is equal to the specified value.
+- **Different** - Match if the value is different than the specified value.
 
-  The available conditions for number fields are:
+The available conditions for string fields are:
 
-  - **Greater:** Match if the value is greater than the specified value
-  - **Lower:** Match if the value is lower than the specified value
-  - **Greater or equal:** Match if the value is greater or equal
-  - **Lower or equal:** Match if the value is lower or equal
-  - **Range:** Match a range between a specified minimum and maximum, min and max included
+- **Contains substring** - Match if the value contains the specified substring (case insensitive).
+- **Does not contain substring** - Match if the value doesn't contain the specified substring (case insensitive).
 
-  Consider the following data set:
+The available conditions for number fields are:
 
-  #### Data Set Example
+- **Greater** - Match if the value is greater than the specified value.
+- **Lower** - Match if the value is lower than the specified value.
+- **Greater or equal** - Match if the value is greater or equal.
+- **Lower or equal** - Match if the value is lower or equal.
+- **Range** - Match a range between a specified minimum and maximum, min and max included.
 
-  | Time                | Temperature | Altitude |
-  |---------------------|-------------|----------|
-  | 2020-07-07 11:34:23 | 32          | 101      |
-  | 2020-07-07 11:34:22 | 28          | 125      |
-  | 2020-07-07 11:34:21 | 26          | 110      |
-  | 2020-07-07 11:34:20 | 23          | 98       |
-  | 2020-07-07 10:32:24 | 31          | 95       |
-  | 2020-07-07 10:31:22 | 20          | 85       |
-  | 2020-07-07 09:30:57 | 19          | 101      |
+Consider the following dataset:
 
-  If you **Include** the data points that have a temperature below 30°C, the configuration will look as follows:
+#### Dataset Example
 
-  - Filter Type: 'Include'
-  - Condition: Rows where 'Temperature' matches 'Lower Than' '30'
+| Time                | Temperature | Altitude |
+|---------------------|-------------|----------|
+| 2020-07-07 11:34:23 | 32          | 101      |
+| 2020-07-07 11:34:22 | 28          | 125      |
+| 2020-07-07 11:34:21 | 26          | 110      |
+| 2020-07-07 11:34:20 | 23          | 98       |
+| 2020-07-07 10:32:24 | 31          | 95       |
+| 2020-07-07 10:31:22 | 20          | 85       |
+| 2020-07-07 09:30:57 | 19          | 101      |
 
-  And you will get the following result, where only the temperatures below 30°C are included:
+If you **Include** the data points that have a temperature below 30°C, the configuration will look as follows:
 
-  #### Transformed Data
+- Filter Type: 'Include'
+- Condition: Rows where 'Temperature' matches 'Lower Than' '30'
 
-  | Time                | Temperature | Altitude |
-  |---------------------|-------------|----------|
-  | 2020-07-07 11:34:22 | 28          | 125      |
-  | 2020-07-07 11:34:21 | 26          | 110      |
-  | 2020-07-07 11:34:20 | 23          | 98       |
-  | 2020-07-07 10:31:22 | 20          | 85       |
-  | 2020-07-07 09:30:57 | 19          | 101      |
+And you will get the following result, where only the temperatures below 30°C are included:
 
-  You can add more than one condition to the filter. For example, you might want to include the data only if the altitude is greater than 100. To do so, add that condition to the following configuration:
+#### Transformed Data
 
-  - Filter type: 'Include' rows that 'Match All' conditions
-  - Condition 1: Rows where 'Temperature' matches 'Lower' than '30'
-  - Condition 2: Rows where 'Altitude' matches 'Greater' than '100'
+| Time                | Temperature | Altitude |
+|---------------------|-------------|----------|
+| 2020-07-07 11:34:22 | 28          | 125      |
+| 2020-07-07 11:34:21 | 26          | 110      |
+| 2020-07-07 11:34:20 | 23          | 98       |
+| 2020-07-07 10:31:22 | 20          | 85       |
+| 2020-07-07 09:30:57 | 19          | 101      |
 
-  When you have more than one condition, you can choose if you want the action (include / exclude) to be applied on rows that **Match all** conditions or **Match any** of the conditions you added.
+You can add more than one condition to the filter. For example, you might want to include the data only if the altitude is greater than 100. To do so, add that condition to the following configuration:
 
-  In the example above, we chose **Match all** because we wanted to include the rows that have a temperature lower than 30°C *AND* an altitude higher than 100. If we wanted to include the rows that have a temperature lower than 30°C *OR* an altitude higher than 100 instead, then we would select **Match any**. This would include the first row in the original data, which has a temperature of 32°C (does not match the first condition) but an altitude of 101 (which matches the second condition), so it is included.
+- Filter type: 'Include' rows that 'Match All' conditions
+- Condition 1: Rows where 'Temperature' matches 'Lower' than '30'
+- Condition 2: Rows where 'Altitude' matches 'Greater' than '100'
 
-  Conditions that are invalid or incompletely configured are ignored.
+When you have more than one condition, you can choose if you want the action (include/exclude) to be applied on rows that **Match all** conditions or **Match any** of the conditions you added.
+
+In the example above, we chose **Match all** because we wanted to include the rows that have a temperature lower than 30°C *AND* an altitude higher than 100. If we wanted to include the rows that have a temperature lower than 30°C *OR* an altitude higher than 100 instead, then we would select **Match any**. This would include the first row in the original data, which has a temperature of 32°C (does not match the first condition) but an altitude of 101 (which matches the second condition), so it is included.
+
+Conditions that are invalid or incompletely configured are ignored.
+
+This versatile data filtering transformation lets you to selectively include or exclude data points based on specific conditions. Customize the criteria to tailor your data presentation to meet your unique analytical needs.
   `;
     },
   },
@@ -394,63 +427,63 @@ export const transformationDocsContent: TransformationDocsContentType = {
     name: 'Filter fields by name',
     getHelperDocs: function (imageRenderType: ImageRenderType = ImageRenderType.ShortcodeFigure) {
       return `
-  Use this transformation to remove parts of the query results.
+Use this transformation to selectively remove parts of your query results. There are three ways to filter field names:
 
-  You can filter field names in three different ways:
-  
-  - [Using a regular expression](#use-a-regular-expression)
-  - [Manually selecting included fields](#manually-select-included-fields)
-  - [Using a dashboard variable](#use-a-dashboard-variable)
-  
-  #### Use a regular expression
-  
-  When you filter using a regular expression, field names that match the regular expression are included.
-  
-  From the input data:
-  
-  | Time                | dev-eu-west | dev-eu-north | prod-eu-west | prod-eu-north |
-  | ------------------- | ----------- | ------------ | ------------ | ------------- |
-  | 2023-03-04 23:56:23 | 23.5        | 24.5         | 22.2         | 20.2          |
-  | 2023-03-04 23:56:23 | 23.6        | 24.4         | 22.1         | 20.1          |
-  
-  The result from using the regular expression 'prod.*' would be:
-  
-  | Time                | prod-eu-west | prod-eu-north |
-  | ------------------- | ------------ | ------------- |
-  | 2023-03-04 23:56:23 | 22.2         | 20.2          |
-  | 2023-03-04 23:56:23 | 22.1         | 20.1          |
-  
-  The regular expression can include an interpolated dashboard variable by using the \${$${'variableName'}} syntax.
-  
-  #### Manually select included fields
-  
-  Click and uncheck the field names to remove them from the result. Fields that are matched by the regular expression are still included, even if they're unchecked.
-  
-  #### Use a dashboard variable
-  
-  Enable 'From variable' to let you select a dashboard variable that's used to include fields. By setting up a [dashboard variable][] with multiple choices, the same fields can be displayed across multiple visualizations.
+- [Using a regular expression](#use-a-regular-expression)
+- [Manually selecting included fields](#manually-select-included-fields)
+- [Using a dashboard variable](#use-a-dashboard-variable)
 
-  ${buildImageContent(
-    '/static/img/docs/transformations/filter-name-table-before-7-0.png',
-    imageRenderType,
-    this.name + 1
-  )}
+#### Use a regular expression
 
-  Here's the table after we applied the transformation to remove the Min field.
+When you filter using a regular expression, field names that match the regular expression are included. 
 
-  ${buildImageContent(
-    '/static/img/docs/transformations/filter-name-table-after-7-0.png',
-    imageRenderType,
-    this.name + 2
-  )}
+For example, from the input data:
 
-  Here is the same query using a Stat visualization.
+| Time                | dev-eu-west | dev-eu-north | prod-eu-west | prod-eu-north |
+| ------------------- | ----------- | ------------ | ------------ | ------------- |
+| 2023-03-04 23:56:23 | 23.5        | 24.5         | 22.2         | 20.2          |
+| 2023-03-04 23:56:23 | 23.6        | 24.4         | 22.1         | 20.1          |
 
-  ${buildImageContent(
-    '/static/img/docs/transformations/filter-name-stat-after-7-0.png',
-    imageRenderType,
-    this.name + 3
-  )}
+The result from using the regular expression 'prod.*' would be:
+
+| Time                | prod-eu-west | prod-eu-north |
+| ------------------- | ------------ | ------------- |
+| 2023-03-04 23:56:23 | 22.2         | 20.2          |
+| 2023-03-04 23:56:23 | 22.1         | 20.1          |
+
+The regular expression can include an interpolated dashboard variable by using the \${${'variableName'}} syntax.
+
+#### Manually select included fields
+
+Click and uncheck the field names to remove them from the result. Fields that are matched by the regular expression are still included, even if they're unchecked.
+
+#### Use a dashboard variable
+
+Enable 'From variable' to let you select a dashboard variable that's used to include fields. By setting up a [dashboard variable][] with multiple choices, the same fields can be displayed across multiple visualizations.
+
+${buildImageContent(
+  '/static/img/docs/transformations/filter-name-table-before-7-0.png',
+  imageRenderType,
+  'A table visualization with time, value, Min, and Max columns'
+)}
+
+Here's the table after we applied the transformation to remove the Min field.
+
+${buildImageContent(
+  '/static/img/docs/transformations/filter-name-table-after-7-0.png',
+  imageRenderType,
+  'A table visualization with time, value, and Max columns'
+)}
+
+Here is the same query using a Stat visualization.
+
+${buildImageContent(
+  '/static/img/docs/transformations/filter-name-stat-after-7-0.png',
+  imageRenderType,
+  'A stat visualization with value and Max fields'
+)}
+
+This transformation provides flexibility in tailoring your query results to focus on the specific fields you need for effective analysis and visualization.
   `;
     },
   },
@@ -458,30 +491,49 @@ export const transformationDocsContent: TransformationDocsContentType = {
     name: 'Format string',
     getHelperDocs: function () {
       return `
-  > **Note:** This transformation is an experimental feature. Engineering and on-call support is not available. Documentation is either limited or not provided outside of code comments. No SLA is provided. Enable the 'formatString' in Grafana to use this feature. Contact Grafana Support to enable this feature in Grafana Cloud.
-
-  Use this transformation to format the output of a string field. You can format output in the following ways:
-  
-  - Upper case - Formats the entire string in upper case characters.
-  - Lower case - Formats the entire string in lower case characters.
-  - Sentence case - Formats the the first character of the string in upper case.
-  - Title case - Formats the first character of each word in the string in upper case.
-  - Pascal case - Formats the first character of each word in the string in upper case and doesn't include spaces between words.
-  - Camel case - Formats the first character of each word in the string in upper case, except the first word, and doesn't include spaces between words.
-  - Snake case - Formats all characters in the string in lower case and uses underscores instead of spaces between words.
-  - Kebab case - Formats all characters in the string in lower case and uses dashes instead of spaces between words.
-  - Trim - Removes all leading and trailing spaces from the string.
-  - Substring - Returns a substring of the string, using the specified start and end positions.
-  `;
+Use this transformation to customize the output of a string field. This transformation has the following fields:
+
+- **Upper case** - Formats the entire string in uppercase characters.
+- **Lower case** - Formats the entire string in lowercase characters.
+- **Sentence case** - Formats the first character of the string in uppercase.
+- **Title case** - Formats the first character of each word in the string in uppercase.
+- **Pascal case** - Formats the first character of each word in the string in uppercase and doesn't include spaces between words.
+- **Camel case** - Formats the first character of each word in the string in uppercase, except the first word, and doesn't include spaces between words.
+- **Snake case** - Formats all characters in the string in lowercase and uses underscores instead of spaces between words.
+- **Kebab case** - Formats all characters in the string in lowercase and uses dashes instead of spaces between words.
+- **Trim** - Removes all leading and trailing spaces from the string.
+- **Substring** - Returns a substring of the string, using the specified start and end positions.
+
+This transformation provides a convenient way to standardize and tailor the presentation of string data for better visualization and analysis.
+
+> **Note:** This transformation is currently in public preview. Grafana Labs offers limited support, and breaking changes might occur prior to the feature being made generally available. Enable the \`formatString\` feature toggle in Grafana to use this feature. Contact Grafana Support to enable this feature in Grafana Cloud.`;
     },
   },
   formatTime: {
     name: 'Format time',
     getHelperDocs: function () {
       return `
-  Use this transformation to format the output of a time field. Output can be formatted using [Moment.js format strings](https://momentjs.com/docs/#/displaying/). For instance, if you would like to display only the year of a time field the format string 'YYYY' can be used to show the calendar year (e.g. 1999, 2012, etc.).
+Use this transformation to customize the output of a time field. Output can be formatted using [Moment.js format strings](https://momentjs.com/docs/#/displaying/). For example, if you want to display only the year of a time field, the format string 'YYYY' can be used to show the calendar year (for example, 1999 or 2012).
+
+**Before Transformation:**
+
+| Timestamp           | Event        |
+| ------------------- | ------------ |
+| 1636678740000000000 | System Start |
+| 1636678680000000000 | User Login   |
+| 1636678620000000000 | Data Updated |
+
+**After applying 'YYYY-MM-DD HH:mm:ss':**
 
-  > **Note:** This transformation is available in Grafana 10.1+ as an alpha feature.
+| Timestamp           | Event        |
+| ------------------- | ------------ |
+| 2021-11-12 14:25:40 | System Start |
+| 2021-11-12 14:24:40 | User Login   |
+| 2021-11-12 14:23:40 | Data Updated |
+
+This transformation lets you tailor the time representation in your visualizations, providing flexibility and precision in displaying temporal data.
+
+> **Note:** This transformation is available in Grafana 10.1+ as an alpha feature.
   `;
     },
   },
@@ -489,9 +541,123 @@ export const transformationDocsContent: TransformationDocsContentType = {
     name: 'Group by',
     getHelperDocs: function () {
       return `
-  Use this transformation to group the data by a specified field (column) value and process calculations on each group. Click to see a list of calculation choices. For information about available calculations, refer to [Calculation types][].
+Use this transformation to group the data by a specified field (column) value and process calculations on each group. Click to see a list of calculation choices. For information about available calculations, refer to [Calculation types][].
+
+Here's an example of original data.
+
+| Time                | Server ID | CPU Temperature | Server Status |
+| ------------------- | --------- | --------------- | ------------- |
+| 2020-07-07 11:34:20 | server 1  | 80              | Shutdown      |
+| 2020-07-07 11:34:20 | server 3  | 62              | OK            |
+| 2020-07-07 10:32:20 | server 2  | 90              | Overload      |
+| 2020-07-07 10:31:22 | server 3  | 55              | OK            |
+| 2020-07-07 09:30:57 | server 3  | 62              | Rebooting     |
+| 2020-07-07 09:30:05 | server 2  | 88              | OK            |
+| 2020-07-07 09:28:06 | server 1  | 80              | OK            |
+| 2020-07-07 09:25:05 | server 2  | 88              | OK            |
+| 2020-07-07 09:23:07 | server 1  | 86              | OK            |
+
+This transformation goes in two steps. First you specify one or multiple fields to group the data by. This will group all the same values of those fields together, as if you sorted them. For instance if we group by the Server ID field, then it would group the data this way:
+
+| Time                | Server ID      | CPU Temperature | Server Status |
+| ------------------- | -------------- | --------------- | ------------- |
+| 2020-07-07 11:34:20 | **server 1**   | 80              | Shutdown      |
+| 2020-07-07 09:28:06 | **server 1**   | 80              | OK            |
+| 2020-07-07 09:23:07 | **server 1**   | 86              | OK            |
+| 2020-07-07 10:32:20 | server 2       | 90              | Overload      |
+| 2020-07-07 09:30:05 | server 2       | 88              | OK            |
+| 2020-07-07 09:25:05 | server 2       | 88              | OK            |
+| 2020-07-07 11:34:20 | **_server 3_** | 62              | OK            |
+| 2020-07-07 10:31:22 | **_server 3_** | 55              | OK            |
+| 2020-07-07 09:30:57 | **_server 3_** | 62              | Rebooting     |
+
+All rows with the same value of Server ID are grouped together.
+
+After choosing which field you want to group your data by, you can add various calculations on the other fields, and apply the calculation to each group of rows. For instance, we could want to calculate the average CPU temperature for each of those servers. So we can add the _mean_ calculation applied on the CPU Temperature field to get the following:
+
+| Server ID | CPU Temperature (mean) |
+| --------- | ---------------------- |
+| server 1  | 82                     |
+| server 2  | 88.6                   |
+| server 3  | 59.6                   |
+
+And we can add more than one calculation. For instance:
+
+- For field Time, we can calculate the _Last_ value, to know when the last data point was received for each server
+- For field Server Status, we can calculate the _Last_ value to know what is the last state value for each server
+- For field Temperature, we can also calculate the _Last_ value to know what is the latest monitored temperature for each server
+
+We would then get:
+
+| Server ID | CPU Temperature (mean) | CPU Temperature (last) | Time (last)         | Server Status (last) |
+| --------- | ---------------------- | ---------------------- | ------------------- | -------------------- |
+| server 1  | 82                     | 80                     | 2020-07-07 11:34:20 | Shutdown             |
+| server 2  | 88.6                   | 90                     | 2020-07-07 10:32:20 | Overload             |
+| server 3  | 59.6                   | 62                     | 2020-07-07 11:34:20 | OK                   |
+
+This transformation allows you to extract essential information from your time series and present it conveniently.
+  `;
+    },
+    links: [
+      {
+        title: 'Calculation types',
+        url: 'https://grafana.com/docs/grafana/latest/panels-visualizations/calculation-types/',
+      },
+    ],
+  },
+  groupingToMatrix: {
+    name: 'Grouping to matrix',
+    getHelperDocs: function () {
+      return `
+Use this transformation to combine three fields—which are used as input for the **Column**, **Row**, and **Cell value** fields from the query output—and generate a matrix. The matrix is calculated as follows:
 
-  Here's an example of original data.
+**Original data**
+
+| Server ID | CPU Temperature | Server Status |
+| --------- | --------------- | ------------- |
+| server 1  | 82              | OK            |
+| server 2  | 88.6            | OK            |
+| server 3  | 59.6            | Shutdown      |
+
+We can generate a matrix using the values of 'Server Status' as column names, the 'Server ID' values as row names, and the 'CPU Temperature' as content of each cell. The content of each cell will appear for the existing column ('Server Status') and row combination ('Server ID'). For the rest of the cells, you can select which value to display between: **Null**, **True**, **False**, or **Empty**.
+
+**Output**
+
+| Server ID\Server Status | OK   | Shutdown |
+| ----------------------- | ---- | -------- |
+| server 1                | 82   |          |
+| server 2                | 88.6 |          |
+| server 3                |      | 59.6     |
+
+Use this transformation to construct a matrix by specifying fields from your query results. The matrix output reflects the relationships between the unique values in these fields. This helps you present complex relationships in a clear and structured matrix format.
+  `;
+    },
+  },
+  groupToNestedTable: {
+    name: 'Group to nested table',
+    getHelperDocs: function (imageRenderType: ImageRenderType = ImageRenderType.ShortcodeFigure) {
+      return `
+  Use this transformation to group the data by a specified field (column) value and process calculations on each group. Records are generated that share the same grouped field value, to be displayed in a nested table.
+    
+  To calculate a statistic for a field, click the selection box next to it and select the **Calculate** option:
+
+  ${buildImageContent(
+    '/static/img/docs/transformations/nested-table-select-calculation.png',
+    imageRenderType,
+    'A select box showing the Group and Calculate options for the transformation.'
+  )}
+
+  Once **Calculate** has been selected, another selection box will appear next to the respective field which will allow statistics to be selected:
+
+  ${buildImageContent(
+    '/static/img/docs/transformations/nested-table-select-stat.png',
+    imageRenderType,
+    'A select box showing available statistic calculations once the calculate option for the field has been selected.'
+  )}
+
+  For information about available calculations, refer to [Calculation types][].
+
+  Here's an example of original data:
 
   | Time                | Server ID | CPU Temperature | Server Status |
   | ------------------- | --------- | --------------- | ------------- |
@@ -505,46 +671,22 @@ export const transformationDocsContent: TransformationDocsContentType = {
   | 2020-07-07 09:25:05 | server 2  | 88              | OK            |
   | 2020-07-07 09:23:07 | server 1  | 86              | OK            |
 
-  This transformation goes in two steps. First you specify one or multiple fields to group the data by. This will group all the same values of those fields together, as if you sorted them. For instance if we group by the Server ID field, then it would group the data this way:
+  This transformation has two steps. First, specify one or more fields by which to group the data. This groups all the same values of those fields together, as if you sorted them. For instance, if you group by the Server ID field, Grafana groups the data this way:
 
-  | Time                | Server ID      | CPU Temperature | Server Status |
-  | ------------------- | -------------- | --------------- | ------------- |
-  | 2020-07-07 11:34:20 | **server 1**   | 80              | Shutdown      |
-  | 2020-07-07 09:28:06 | **server 1**   | 80              | OK            |
-  | 2020-07-07 09:23:07 | **server 1**   | 86              | OK            |
-  | 2020-07-07 10:32:20 | server 2       | 90              | Overload      |
-  | 2020-07-07 09:30:05 | server 2       | 88              | OK            |
-  | 2020-07-07 09:25:05 | server 2       | 88              | OK            |
-  | 2020-07-07 11:34:20 | **_server 3_** | 62              | OK            |
-  | 2020-07-07 10:31:22 | **_server 3_** | 55              | OK            |
-  | 2020-07-07 09:30:57 | **_server 3_** | 62              | Rebooting     |
+  | Server ID      |  |
+  | -------------- | ------------- |
+  | server 1 | <table><th><tr><td>Time</td><td>CPU Temperature</td><td>Server Status</td></tr></th><tbody><tr><td>2020-07-07 11:34:20</td><td>80</td><td>Shutdown</td></tr><tr><td>2020-07-07 09:28:06</td><td>80</td><td>OK</td></tr><tr><td>2020-07-07 09:23:07</td><td>86</td><td>OK</td></tr></tbody></table> |
+  | server 2 | <table><th><tr><td>Time</td><td>CPU Temperature</td><td>Server Status</td></tr></th><tbody><tr><td>2020-07-07 10:32:20</td><td>90</td><td>Overload</td></tr><tr><td>2020-07-07 09:30:05</td><td>88</td><td>OK</td></tr><tr><td>2020-07-07 09:25:05</td><td>88</td><td>OK</td></tr></tbody></table> |
+  | server 3 | <table><th><tr><td>Time</td><td>CPU Temperature</td><td>Server Status</td></tr></th><tbody><tr><td>2020-07-07 11:34:20</td><td>62</td><td>OK</td></tr><tr><td>2020-07-07 10:31:22</td><td>55</td><td>OK</td></tr><tr><td>2020-07-07 09:30:57</td><td>62</td><td>Rebooting</td></tr></tbody></table> |
 
-  All rows with the same value of Server ID are grouped together.
+  After choosing the field by which you want to group your data, you can add various calculations on the other fields and apply the calculation to each group of rows. For instance, you might want to calculate the average CPU temperature for each of those servers. To do so, add the **mean calculation** applied on the CPU Temperature field to get the following result:
 
-  After choosing which field you want to group your data by, you can add various calculations on the other fields, and apply the calculation to each group of rows. For instance, we could want to calculate the average CPU temperature for each of those servers. So we can add the _mean_ calculation applied on the CPU Temperature field to get the following:
-
-  | Server ID | CPU Temperature (mean) |
-  | --------- | ---------------------- |
-  | server 1  | 82                     |
-  | server 2  | 88.6                   |
-  | server 3  | 59.6                   |
-
-  And we can add more than one calculation. For instance:
-
-  - For field Time, we can calculate the _Last_ value, to know when the last data point was received for each server
-  - For field Server Status, we can calculate the _Last_ value to know what is the last state value for each server
-  - For field Temperature, we can also calculate the _Last_ value to know what is the latest monitored temperature for each server
-
-  We would then get :
-
-  | Server ID | CPU Temperature (mean) | CPU Temperature (last) | Time (last)         | Server Status (last) |
-  | --------- | ---------------------- | ---------------------- | ------------------- | -------------------- |
-  | server 1  | 82                     | 80                     | 2020-07-07 11:34:20 | Shutdown             |
-  | server 2  | 88.6                   | 90                     | 2020-07-07 10:32:20 | Overload             |
-  | server 3  | 59.6                   | 62                     | 2020-07-07 11:34:20 | OK                   |
-
-  This transformation enables you to extract key information from your time series and display it in a convenient way.
-  `;
+  | Server ID      | CPU Temperatute (mean) | |
+  | -------------- | ------------- | ------------- |
+  | server 1 | 82 | <table><th><tr><td>Time</td><td>Server Status</td></tr></th><tbody><tr><td>2020-07-07 11:34:20</td><td>Shutdown</td></tr><tr><td>2020-07-07 09:28:06</td><td>OK</td></tr><tr><td>2020-07-07 09:23:07</td><td>OK</td></tr></tbody></table> |
+  | server 2 | 88.6 | <table><th><tr><td>Time</td><td>Server Status</td></tr></th><tbody><tr><td>2020-07-07 10:32:20</td><td>Overload</td></tr><tr><td>2020-07-07 09:30:05</td><td>OK</td></tr><tr><td>2020-07-07 09:25:05</td><td>OK</td></tr></tbody></table> |
+  | server 3 | 59.6 | <table><th><tr><td>Time</td><td>Server Status</td></tr></th><tbody><tr><td>2020-07-07 11:34:20</td><td>OK</td></tr><tr><td>2020-07-07 10:31:22</td><td>OK</td></tr><tr><td>2020-07-07 09:30:57</td><td>Rebooting</td></tr></tbody></table> |
+      `;
     },
     links: [
       {
@@ -553,52 +695,38 @@ export const transformationDocsContent: TransformationDocsContentType = {
       },
     ],
   },
-  groupingToMatrix: {
-    name: 'Grouping to matrix',
+  heatmap: {
+    name: 'Create heatmap',
     getHelperDocs: function () {
       return `
-  Use this transformation to combine three fields-that will be used as input for the **Column**, **Row**, and **Cell value** fields-from the query output, and generate a matrix. This matrix will be calculated as follows:
-
-  **Original data**
-
-  | Server ID | CPU Temperature | Server Status |
-  | --------- | --------------- | ------------- |
-  | server 1  | 82              | OK            |
-  | server 2  | 88.6            | OK            |
-  | server 3  | 59.6            | Shutdown      |
+Use this transformation to prepare histogram data for visualizing trends over time. Similar to the heatmap visualization, this transformation converts histogram metrics into temporal buckets.
 
-  We can generate a matrix using the values of 'Server Status' as column names, the 'Server ID' values as row names, and the 'CPU Temperature' as content of each cell. The content of each cell will appear for the existing column ('Server Status') and row combination ('Server ID'). For the rest of the cells, you can select which value to display between: **Null**, **True**, **False**, or **Empty**.
+#### X Bucket
 
-  **Output**
+This setting determines how the x-axis is split into buckets.
 
-  | Server ID\Server Status | OK   | Shutdown |
-  | ----------------------- | ---- | -------- |
-  | server 1                | 82   |          |
-  | server 2                | 88.6 |          |
-  | server 3                |      | 59.6     |
-  `;
-    },
-  },
-  heatmap: {
-    name: 'Create heatmap',
-    getHelperDocs: function () {
-      return `
-  Use this transformation to prepare histogram data to be visualized over time. Similar to the Heatmap panel, this transformation allows you to convert histogram metrics to buckets over time.
+- **Size** - Specify a time interval in the input field. For example, a time range of '1h' creates cells one hour wide on the x-axis.
+- **Count** - For non-time-related series, use this option to define the number of elements in a bucket.
 
-  #### X Bucket
+#### Y Bucket
 
-  This setting determines how the x-axis is split into buckets.
+This setting determines how the y-axis is split into buckets.
 
-  - **Size** - Specify a time interval in the input field. For example, a time range of '1h' makes the cells one hour wide on the x-axis.
-  - **Count** - For non-time related series, use this option to define the number of elements in a bucket.
+- **Linear**
+- **Logarithmic** - Choose between log base 2 or log base 10.
+- **Symlog** - Uses a symmetrical logarithmic scale. Choose between log base 2 or log base 10, allowing for negative values.
 
-  #### Y Bucket
+Assume you have the following dataset:
 
-  This setting determines how the y-axis is split into buckets.
+| Timestamp           | Value |
+|-------------------- |-------|
+| 2023-01-01 12:00:00 | 5     |
+| 2023-01-01 12:15:00 | 10    |
+| 2023-01-01 12:30:00 | 15    |
+| 2023-01-01 12:45:00 | 8     |
 
-  - **Linear**
-  - **Logarithmic** - Use a base 2 or base 10.
-  - **Symlog** - A symmetrical logarithmic scale. Use a base 2 or base 10; allows negative values.
+- With X Bucket set to 'Size: 15m' and Y Bucket as 'Linear', the histogram organizes values into time intervals of 15 minutes on the x-axis and linearly on the y-axis.
+- For X Bucket as 'Count: 2' and Y Bucket as 'Logarithmic (base 10)', the histogram groups values into buckets of two on the x-axis and use a logarithmic scale on the y-axis.
   `;
     },
   },
@@ -606,47 +734,49 @@ export const transformationDocsContent: TransformationDocsContentType = {
     name: 'Histogram',
     getHelperDocs: function () {
       return `
-  Use this transformation to generate a histogram based on the input data.
-
-  - **Bucket size** - The distance between the lowest item in the bucket (xMin) and the highest item in the bucket (xMax).
-  - **Bucket offset** - The offset for non-zero based buckets.
-  - **Combine series** - Create a histogram using all the available series.
-
-  **Original data**
-
-  Series 1:
-
-  | A   | B   | C   |
-  | --- | --- | --- |
-  | 1   | 3   | 5   |
-  | 2   | 4   | 6   |
-  | 3   | 5   | 7   |
-  | 4   | 6   | 8   |
-  | 5   | 7   | 9   |
-
-  Series 2:
-
-  | C   |
-  | --- |
-  | 5   |
-  | 6   |
-  | 7   |
-  | 8   |
-  | 9   |
-
-  **Output**
-
-  | xMin | xMax | A   | B   | C   | C   |
-  | ---- | ---- | --- | --- | --- | --- |
-  | 1    | 2    | 1   | 0   | 0   | 0   |
-  | 2    | 3    | 1   | 0   | 0   | 0   |
-  | 3    | 4    | 1   | 1   | 0   | 0   |
-  | 4    | 5    | 1   | 1   | 0   | 0   |
-  | 5    | 6    | 1   | 1   | 1   | 1   |
-  | 6    | 7    | 0   | 1   | 1   | 1   |
-  | 7    | 8    | 0   | 1   | 1   | 1   |
-  | 8    | 9    | 0   | 0   | 1   | 1   |
-  | 9    | 10   | 0   | 0   | 1   | 1   |
+Use this transformation to generate a histogram based on input data, allowing you to visualize the distribution of values.
+
+- **Bucket size** - The range between the lowest and highest items in a bucket (xMin to xMax).
+- **Bucket offset** - The offset for non-zero-based buckets.
+- **Combine series** - Create a unified histogram using all available series.
+
+**Original data**
+
+Series 1:
+
+| A | B | C |
+| - | - | - |
+| 1 | 3 | 5 |
+| 2 | 4 | 6 |
+| 3 | 5 | 7 |
+| 4 | 6 | 8 |
+| 5 | 7 | 9 |
+
+Series 2:
+
+| C |
+| - |
+| 5 |
+| 6 |
+| 7 |
+| 8 |
+| 9 |
+
+**Output**
+
+| xMin | xMax | A | B | C | C |
+| ---- | ---- | --| --| --| --|
+| 1    | 2    | 1 | 0 | 0 | 0 |
+| 2    | 3    | 1 | 0 | 0 | 0 |
+| 3    | 4    | 1 | 1 | 0 | 0 |
+| 4    | 5    | 1 | 1 | 0 | 0 |
+| 5    | 6    | 1 | 1 | 1 | 1 |
+| 6    | 7    | 0 | 1 | 1 | 1 |
+| 7    | 8    | 0 | 1 | 1 | 1 |
+| 8    | 9    | 0 | 0 | 1 | 1 |
+| 9    | 10   | 0 | 0 | 1 | 1 |
+
+Visualize the distribution of values using the generated histogram, providing insights into the data's spread and density.
   `;
     },
   },
@@ -654,79 +784,89 @@ export const transformationDocsContent: TransformationDocsContentType = {
     name: 'Join by field',
     getHelperDocs: function (imageRenderType: ImageRenderType = ImageRenderType.ShortcodeFigure) {
       return `
-  Use this transformation to join multiple results into a single table. This is especially useful for converting multiple
-  time series results into a single wide table with a shared time field.
+Use this transformation to merge multiple results into a single table, enabling the consolidation of data from different queries.
 
-  #### Inner join
+This is especially useful for converting multiple time series results into a single wide table with a shared time field.
 
-  An inner join merges data from multiple tables where all tables share the same value from the selected field. This type of join excludes
-  data where values do not match in every result.
+#### Inner join
 
-  Use this transformation to combine the results from multiple queries (combining on a passed join field or the first time column) into one result, and drop rows where a successful join cannot occur.
+An inner join merges data from multiple tables where all tables share the same value from the selected field. This type of join excludes data where values do not match in every result.
 
-  In the following example, two queries return table data. It is visualized as two separate tables before applying the inner join transformation.
+Use this transformation to combine the results from multiple queries (combining on a passed join field or the first time column) into one result, and drop rows where a successful join cannot occur.
 
-  Query A:
+In the following example, two queries return table data. It is visualized as two separate tables before applying the inner join transformation.
 
-  | Time                | Job     | Uptime    |
-  | ------------------- | ------- | --------- |
-  | 2020-07-07 11:34:20 | node    | 25260122  |
-  | 2020-07-07 11:24:20 | postgre | 123001233 |
-  | 2020-07-07 11:14:20 | postgre | 345001233 |
+**Query A:**
 
-  Query B:
+| Time                | Job     | Uptime    |
+| ------------------- | ------- | --------- |
+| 2020-07-07 11:34:20 | node    | 25260122  |
+| 2020-07-07 11:24:20 | postgre | 123001233 |
+| 2020-07-07 11:14:20 | postgre | 345001233 |
 
-  | Time                | Server   | Errors |
-  | ------------------- | -------- | ------ |
-  | 2020-07-07 11:34:20 | server 1 | 15     |
-  | 2020-07-07 11:24:20 | server 2 | 5      |
-  | 2020-07-07 11:04:20 | server 3 | 10     |
+**Query B:**
 
-  The result after applying the inner join transformation looks like the following:
+| Time                | Server   | Errors |
+| ------------------- | -------- | ------ |
+| 2020-07-07 11:34:20 | server 1 | 15     |
+| 2020-07-07 11:24:20 | server 2 | 5      |
+| 2020-07-07 11:04:20 | server 3 | 10     |
 
-  | Time                | Job     | Uptime    | Server   | Errors |
-  | ------------------- | ------- | --------- | -------- | ------ |
-  | 2020-07-07 11:34:20 | node    | 25260122  | server 1 | 15     |
-  | 2020-07-07 11:24:20 | postgre | 123001233 | server 2 | 5      |
+The result after applying the inner join transformation looks like the following:
 
-  #### Outer join
+| Time                | Job     | Uptime    | Server   | Errors |
+| ------------------- | ------- | --------- | -------- | ------ |
+| 2020-07-07 11:34:20 | node    | 25260122  | server 1 | 15     |
+| 2020-07-07 11:24:20 | postgre | 123001233 | server 2 | 5      |
 
-  An outer join includes all data from an inner join and rows where values do not match in every input. While the inner join joins Query A and Query B on the time field, the outer join includes all rows that don't match on the time field.
+#### Outer join
 
-  In the following example, two queries return table data. It is visualized as two tables before applying the outer join transformation.
+An outer join includes all data from an inner join and rows where values do not match in every input. While the inner join joins Query A and Query B on the time field, the outer join includes all rows that don't match on the time field.
 
-  Query A:
+In the following example, two queries return table data. It is visualized as two tables before applying the outer join transformation.
 
-  | Time                | Job     | Uptime    |
-  | ------------------- | ------- | --------- |
-  | 2020-07-07 11:34:20 | node    | 25260122  |
-  | 2020-07-07 11:24:20 | postgre | 123001233 |
-  | 2020-07-07 11:14:20 | postgre | 345001233 |
+**Query A:**
 
-  Query B:
+| Time                | Job     | Uptime    |
+| ------------------- | ------- | --------- |
+| 2020-07-07 11:34:20 | node    | 25260122  |
+| 2020-07-07 11:24:20 | postgre | 123001233 |
+| 2020-07-07 11:14:20 | postgre | 345001233 |
 
-  | Time                | Server   | Errors |
-  | ------------------- | -------- | ------ |
-  | 2020-07-07 11:34:20 | server 1 | 15     |
-  | 2020-07-07 11:24:20 | server 2 | 5      |
-  | 2020-07-07 11:04:20 | server 3 | 10     |
+**Query B:**
 
-  The result after applying the outer join transformation looks like the following:
+| Time                | Server   | Errors |
+| ------------------- | -------- | ------ |
+| 2020-07-07 11:34:20 | server 1 | 15     |
+| 2020-07-07 11:24:20 | server 2 | 5      |
+| 2020-07-07 11:04:20 | server 3 | 10     |
 
-  | Time                | Job     | Uptime    | Server   | Errors |
-  | ------------------- | ------- | --------- | -------- | ------ |
-  | 2020-07-07 11:04:20 |         |           | server 3 | 10     |
-  | 2020-07-07 11:14:20 | postgre | 345001233 |          |        |
-  | 2020-07-07 11:34:20 | node    | 25260122  | server 1 | 15     |
-  | 2020-07-07 11:24:20 | postgre | 123001233 | server 2 | 5      |
+The result after applying the outer join transformation looks like the following:
 
-  In the following example, a template query displays time series data from multiple servers in a table visualization. The results of only one query can be viewed at a time.
+| Time                | Job     | Uptime    | Server   | Errors |
+| ------------------- | ------- | --------- | -------- | ------ |
+| 2020-07-07 11:04:20 |         |           | server 3 | 10     |
+| 2020-07-07 11:14:20 | postgre | 345001233 |          |        |
+| 2020-07-07 11:34:20 | node    | 25260122  | server 1 | 15     |
+| 2020-07-07 11:24:20 | postgre | 123001233 | server 2 | 5      |
 
-  ${buildImageContent('/static/img/docs/transformations/join-fields-before-7-0.png', imageRenderType, this.name + 1)}
+In the following example, a template query displays time series data from multiple servers in a table visualization. The results of only one query can be viewed at a time.
 
-  I applied a transformation to join the query results using the time field. Now I can run calculations, combine, and organize the results in this new table.
+${buildImageContent(
+  '/static/img/docs/transformations/join-fields-before-7-0.png',
+  imageRenderType,
+  'A table visualization showing results for one server'
+)}
 
-  ${buildImageContent('/static/img/docs/transformations/join-fields-after-7-0.png', imageRenderType, this.name + 2)}
+I applied a transformation to join the query results using the time field. Now I can run calculations, combine, and organize the results in this new table.
+
+${buildImageContent(
+  '/static/img/docs/transformations/join-fields-after-7-0.png',
+  imageRenderType,
+  'A table visualization showing results for multiple servers'
+)}
+
+Combine and analyze data from various queries with table joining for a comprehensive view of your information.
   `;
     },
   },
@@ -734,49 +874,52 @@ export const transformationDocsContent: TransformationDocsContentType = {
     name: 'Join by labels',
     getHelperDocs: function () {
       return `
-  Use this transformation to join multiple results into a single table. This is especially useful for converting multiple
-  time series results into a single wide table with a shared **Label** field.
+Use this transformation to join multiple results into a single table.
+
+This is especially useful for converting multiple time series results into a single wide table with a shared **Label** field.
 
-  - **Join** - Select the label to join by between the labels available or common across all time series.
-  - **Value** - The name for the output result.
+- **Join** - Select the label to join by between the labels available or common across all time series.
+- **Value** - The name for the output result.
 
-  #### Example
+#### Example
 
-  ##### Input
+##### Input
 
-  series1{what="Temp", cluster="A", job="J1"}
+series1{what="Temp", cluster="A", job="J1"}
 
-  | Time | Value |
-  | ---- | ----- |
-  | 1    | 10    |
-  | 2    | 200   |
+| Time | Value |
+| ---- | ----- |
+| 1    | 10    |
+| 2    | 200   |
 
-  series2{what="Temp", cluster="B", job="J1"}
+series2{what="Temp", cluster="B", job="J1"}
 
-  | Time | Value |
-  | ---- | ----- |
-  | 1    | 10    |
-  | 2    | 200   |
+| Time | Value |
+| ---- | ----- |
+| 1    | 10    |
+| 2    | 200   |
 
-  series3{what="Speed", cluster="B", job="J1"}
+series3{what="Speed", cluster="B", job="J1"}
 
-  | Time | Value |
-  | ---- | ----- |
-  | 22   | 22    |
-  | 28   | 77    |
+| Time | Value |
+| ---- | ----- |
+| 22   | 22    |
+| 28   | 77    |
 
-  ##### Config
+##### Config
 
-  value: "what"
+value: "what"
 
-  ##### Output
+##### Output
 
-  | cluster | job | Temp | Speed |
-  | ------- | --- | ---- | ----- |
-  | A       | J1  | 10   |       |
-  | A       | J1  | 200  |       |
-  | B       | J1  | 10   | 22    |
-  | B       | J1  | 200  | 77    |
+| cluster | job | Temp | Speed |
+| ------- | --- | ---- | ----- |
+| A       | J1  | 10   |       |
+| A       | J1  | 200  |       |
+| B       | J1  | 10   | 22    |
+| B       | J1  | 200  | 77    |
+
+Combine and organize time series data effectively with this transformation for comprehensive insights.
   `;
     },
   },
@@ -784,65 +927,67 @@ export const transformationDocsContent: TransformationDocsContentType = {
     name: 'Labels to fields',
     getHelperDocs: function () {
       return `
-  Use this transformation to change time series results that include labels or tags into a table where each label's keys and values are included in the table result. The labels can be displayed as either columns or row values.
+Use this transformation to convert time series results with labels or tags into a table, including each label's keys and values in the result. Display labels as either columns or row values for enhanced data visualization.
+
+Given a query result of two time series:
 
-  Given a query result of two time series:
+- Series 1: labels Server=Server A, Datacenter=EU
+- Series 2: labels Server=Server B, Datacenter=EU
 
-  - Series 1: labels Server=Server A, Datacenter=EU
-  - Series 2: labels Server=Server B, Datacenter=EU
+In "Columns" mode, the result looks like this:
 
-  In "Columns" mode, the result looks like this:
+| Time                | Server   | Datacenter | Value |
+| ------------------- | -------- | ---------- | ----- |
+| 2020-07-07 11:34:20 | Server A | EU         | 1     |
+| 2020-07-07 11:34:20 | Server B | EU         | 2     |
 
-  | Time                | Server   | Datacenter | Value |
-  | ------------------- | -------- | ---------- | ----- |
-  | 2020-07-07 11:34:20 | Server A | EU         | 1     |
-  | 2020-07-07 11:34:20 | Server B | EU         | 2     |
+In "Rows" mode, the result has a table for each series and show each label value like this:
 
-  In "Rows" mode, the result has a table for each series and show each label value like this:
+| label      | value    |
+| ---------- | -------- |
+| Server     | Server A |
+| Datacenter | EU       |
 
-  | label      | value    |
-  | ---------- | -------- |
-  | Server     | Server A |
-  | Datacenter | EU       |
+| label      | value    |
+| ---------- | -------- |
+| Server     | Server B |
+| Datacenter | EU       |
 
-  | label      | value    |
-  | ---------- | -------- |
-  | Server     | Server B |
-  | Datacenter | EU       |
+#### Value field name
 
-  #### Value field name
+If you selected Server as the **Value field name**, then you would get one field for every value of the Server label.
 
-  If you selected Server as the **Value field name**, then you would get one field for every value of the Server label.
+| Time                | Datacenter | Server A | Server B |
+| ------------------- | ---------- | -------- | -------- |
+| 2020-07-07 11:34:20 | EU         | 1        | 2        |
 
-  | Time                | Datacenter | Server A | Server B |
-  | ------------------- | ---------- | -------- | -------- |
-  | 2020-07-07 11:34:20 | EU         | 1        | 2        |
+#### Merging behavior
 
-  #### Merging behavior
+The labels to fields transformer is internally two separate transformations. The first acts on single series and extracts labels to fields. The second is the [merge](#merge) transformation that joins all the results into a single table. The merge transformation tries to join on all matching fields. This merge step is required and cannot be turned off.
 
-  The labels to fields transformer is internally two separate transformations. The first acts on single series and extracts labels to fields. The second is the [merge](#merge) transformation that joins all the results into a single table. The merge transformation tries to join on all matching fields. This merge step is required and cannot be turned off.
+To illustrate this, here is an example where you have two queries that return time series with no overlapping labels.
 
-  To illustrate this, here is an example where you have two queries that return time series with no overlapping labels.
+- Series 1: labels Server=ServerA
+- Series 2: labels Datacenter=EU
 
-  - Series 1: labels Server=ServerA
-  - Series 2: labels Datacenter=EU
+This will first result in these two tables:
 
-  This will first result in these two tables:
+| Time                | Server  | Value |
+| ------------------- | ------- | ----- |
+| 2020-07-07 11:34:20 | ServerA | 10    |
 
-  | Time                | Server  | Value |
-  | ------------------- | ------- | ----- |
-  | 2020-07-07 11:34:20 | ServerA | 10    |
+| Time                | Datacenter | Value |
+| ------------------- | ---------- | ----- |
+| 2020-07-07 11:34:20 | EU         | 20    |
 
-  | Time                | Datacenter | Value |
-  | ------------------- | ---------- | ----- |
-  | 2020-07-07 11:34:20 | EU         | 20    |
+After merge:
 
-  After merge:
+| Time                | Server  | Value | Datacenter |
+| ------------------- | ------- | ----- | ---------- |
+| 2020-07-07 11:34:20 | ServerA | 10    |            |
+| 2020-07-07 11:34:20 |         | 20    | EU         |
 
-  | Time                | Server  | Value | Datacenter |
-  | ------------------- | ------- | ----- | ---------- |
-  | 2020-07-07 11:34:20 | ServerA | 10    |            |
-  | 2020-07-07 11:34:20 |         | 20    | EU         |
+Convert your time series data into a structured table format for a clearer and more organized representation.
   `;
     },
   },
@@ -850,57 +995,61 @@ export const transformationDocsContent: TransformationDocsContentType = {
     name: 'Limit',
     getHelperDocs: function () {
       return `
-  Use this transformation to limit the number of rows displayed.
-
-  In the example below, we have the following response from the data source:
-
-  | Time                | Metric      | Value |
-  | ------------------- | ----------- | ----- |
-  | 2020-07-07 11:34:20 | Temperature | 25    |
-  | 2020-07-07 11:34:20 | Humidity    | 22    |
-  | 2020-07-07 10:32:20 | Humidity    | 29    |
-  | 2020-07-07 10:31:22 | Temperature | 22    |
-  | 2020-07-07 09:30:57 | Humidity    | 33    |
-  | 2020-07-07 09:30:05 | Temperature | 19    |
-
-  Here is the result after adding a Limit transformation with a value of '3':
-
-  | Time                | Metric      | Value |
-  | ------------------- | ----------- | ----- |
-  | 2020-07-07 11:34:20 | Temperature | 25    |
-  | 2020-07-07 11:34:20 | Humidity    | 22    |
-  | 2020-07-07 10:32:20 | Humidity    | 29    |
+Use this transformation to restrict the number of rows displayed, providing a more focused view of your data. This is particularly useful when dealing with large datasets.
+
+Below is an example illustrating the impact of the **Limit** transformation on a response from a data source:
+
+| Time                | Metric      | Value |
+| ------------------- | ----------- | ----- |
+| 2020-07-07 11:34:20 | Temperature | 25    |
+| 2020-07-07 11:34:20 | Humidity    | 22    |
+| 2020-07-07 10:32:20 | Humidity    | 29    |
+| 2020-07-07 10:31:22 | Temperature | 22    |
+| 2020-07-07 09:30:57 | Humidity    | 33    |
+| 2020-07-07 09:30:05 | Temperature | 19    |
+
+Here is the result after adding a Limit transformation with a value of '3':
+
+| Time                | Metric      | Value |
+| ------------------- | ----------- | ----- |
+| 2020-07-07 11:34:20 | Temperature | 25    |
+| 2020-07-07 11:34:20 | Humidity    | 22    |
+| 2020-07-07 10:32:20 | Humidity    | 29    |
+
+This transformation helps you tailor the visual presentation of your data to focus on the most relevant information.
   `;
     },
   },
   merge: {
-    name: 'Merge',
+    name: 'Merge series/tables',
     getHelperDocs: function () {
       return `
-  Use this transformation to combine the result from multiple queries into one single result. This is helpful when using the table panel visualization. Values that can be merged are combined into the same row. Values are mergeable if the shared fields contain the same data. For information, refer to [Table panel][].
+Use this transformation to combine the results from multiple queries into a single result, which is particularly useful when using the table panel visualization. This transformation merges values into the same row if the shared fields contain the same data.
 
-  In the example below, we have two queries returning table data. It is visualized as two separate tables before applying the transformation.
+Here's an example illustrating the impact of the **Merge series/tables** transformation on two queries returning table data:
 
-  Query A:
+**Query A:**
 
-  | Time                | Job     | Uptime    |
-  | ------------------- | ------- | --------- |
-  | 2020-07-07 11:34:20 | node    | 25260122  |
-  | 2020-07-07 11:24:20 | postgre | 123001233 |
+| Time                | Job     | Uptime    |
+| ------------------- | ------- | --------- |
+| 2020-07-07 11:34:20 | node    | 25260122  |
+| 2020-07-07 11:24:20 | postgre | 123001233 |
 
-  Query B:
+**Query B:**
 
-  | Time                | Job     | Errors |
-  | ------------------- | ------- | ------ |
-  | 2020-07-07 11:34:20 | node    | 15     |
-  | 2020-07-07 11:24:20 | postgre | 5      |
+| Time                | Job     | Errors |
+| ------------------- | ------- | ------ |
+| 2020-07-07 11:34:20 | node    | 15     |
+| 2020-07-07 11:24:20 | postgre | 5      |
 
-  Here is the result after applying the Merge transformation.
+Here is the result after applying the Merge transformation.
 
-  | Time                | Job     | Errors | Uptime    |
-  | ------------------- | ------- | ------ | --------- |
-  | 2020-07-07 11:34:20 | node    | 15     | 25260122  |
-  | 2020-07-07 11:24:20 | postgre | 5      | 123001233 |
+| Time                | Job     | Errors | Uptime    |
+| ------------------- | ------- | ------ | --------- |
+| 2020-07-07 11:34:20 | node    | 15     | 25260122  |
+| 2020-07-07 11:24:20 | postgre | 5      | 123001233 |
+
+This transformation combines values from Query A and Query B into a unified table, enhancing the presentation of data for better insights.
   `;
     },
     links: [
@@ -911,18 +1060,38 @@ export const transformationDocsContent: TransformationDocsContentType = {
     ],
   },
   organize: {
-    name: 'Oraganize fields',
+    name: 'Organize fields by name',
     getHelperDocs: function () {
       return `
-  Use this transformation to rename, reorder, or hide fields returned by the query.
+Use this transformation to provide the flexibility to rename, reorder, or hide fields returned by a single query in your panel. This transformation is applicable only to panels with a single query. If your panel has multiple queries, consider using an "Outer join" transformation or removing extra queries.
+
+#### Transforming fields
+
+Grafana displays a list of fields returned by the query, allowing you to perform the following actions:
+
+- **Change field order** - Hover over a field, and when your cursor turns into a hand, drag the field to its new position.
+- **Hide or show a field** - Use the eye icon next to the field name to toggle the visibility of a specific field.
+- **Rename fields** - Type a new name in the "Rename <field>" box to customize field names.
+
+#### Example:
+
+##### Original Query Result
 
-  > **Note:** This transformation only works in panels with a single query. If your panel has multiple queries, then you must either apply an Outer join transformation or remove the extra queries.
+| Time                | Metric      | Value |
+| ------------------- | ----------- | ----- |
+| 2020-07-07 11:34:20 | Temperature | 25    |
+| 2020-07-07 11:34:20 | Humidity    | 22    |
+| 2020-07-07 10:32:20 | Humidity    | 29    |
 
-  Grafana displays a list of fields returned by the query. You can:
+##### After Applying Field Overrides
 
-  - Change field order by hovering your cursor over a field. The cursor turns into a hand and then you can drag the field to its new place.
-  - Hide or show a field by clicking the eye icon next to the field name.
-  - Rename fields by typing a new name in the **Rename <field>** box.
+| Time                | Sensor      | Reading |
+| ------------------- | ----------- | ------- |
+| 2020-07-07 11:34:20 | Temperature | 25      |
+| 2020-07-07 11:34:20 | Humidity    | 22      |
+| 2020-07-07 10:32:20 | Humidity    | 29      |
+
+This transformation lets you to tailor the display of query results, ensuring a clear and insightful representation of your data in Grafana.
   `;
     },
   },
@@ -930,35 +1099,32 @@ export const transformationDocsContent: TransformationDocsContentType = {
     name: 'Partition by values',
     getHelperDocs: function () {
       return `
-  Use this transformation to eliminate the need for multiple queries to the same data source with different 'WHERE' clauses when graphing multiple series. Consider a metrics SQL table with the following data:
-
-  | Time                | Region | Value |
-  | ------------------- | ------ | ----- |
-  | 2022-10-20 12:00:00 | US     | 1520  |
-  | 2022-10-20 12:00:00 | EU     | 2936  |
-  | 2022-10-20 01:00:00 | US     | 1327  |
-  | 2022-10-20 01:00:00 | EU     | 912   |
+Use this transformation to streamline the process of graphing multiple series without the need for multiple queries with different 'WHERE' clauses.
 
-  Prior to v9.3, if you wanted to plot a red trendline for US and a blue one for EU in the same TimeSeries panel, you would likely have to split this into two queries:
+This is particularly useful when dealing with a metrics SQL table, as illustrated below:
 
-  'SELECT Time, Value FROM metrics WHERE Time > "2022-10-20" AND Region="US"'<br>
-  'SELECT Time, Value FROM metrics WHERE Time > "2022-10-20" AND Region="EU"'
+| Time                | Region | Value |
+| ------------------- | ------ | ----- |
+| 2022-10-20 12:00:00 | US     | 1520  |
+| 2022-10-20 12:00:00 | EU     | 2936  |
+| 2022-10-20 01:00:00 | US     | 1327  |
+| 2022-10-20 01:00:00 | EU     | 912   |
 
-  This also requires you to know ahead of time which regions actually exist in the metrics table.
+With the **Partition by values** transformation, you can issue a single query and split the results by unique values in one or more columns (fields) of your choosing. The following example uses 'Region':
 
-  With the _Partition by values_ transformer, you can now issue a single query and split the results by unique values in one or more columns ('fields') of your choosing. The following example uses 'Region'.
+'SELECT Time, Region, Value FROM metrics WHERE Time > "2022-10-20"'
 
-  'SELECT Time, Region, Value FROM metrics WHERE Time > "2022-10-20"'
+| Time                | Region | Value |
+| ------------------- | ------ | ----- |
+| 2022-10-20 12:00:00 | US     | 1520  |
+| 2022-10-20 01:00:00 | US     | 1327  |
 
-  | Time                | Region | Value |
-  | ------------------- | ------ | ----- |
-  | 2022-10-20 12:00:00 | US     | 1520  |
-  | 2022-10-20 01:00:00 | US     | 1327  |
+| Time                | Region | Value |
+| ------------------- | ------ | ----- |
+| 2022-10-20 12:00:00 | EU     | 2936  |
+| 2022-10-20 01:00:00 | EU     | 912   |
 
-  | Time                | Region | Value |
-  | ------------------- | ------ | ----- |
-  | 2022-10-20 12:00:00 | EU     | 2936  |
-  | 2022-10-20 01:00:00 | EU     | 912   |
+This transformation simplifies the process and enhances the flexibility of visualizing multiple series within the same time series visualization.
   `;
     },
   },
@@ -966,15 +1132,52 @@ export const transformationDocsContent: TransformationDocsContentType = {
     name: 'Prepare time series',
     getHelperDocs: function () {
       return `
-  Use this transformation when a data source returns time series data in a format that isn't supported by the panel you want to use. For more information about data frame formats, refer to [Data frames][].
+Use this transformation to address issues when a data source returns time series data in a format that isn't compatible with the desired visualization. This transformation allows you to convert time series data between wide and long formats, providing flexibility in data frame structures.
+
+#### Available options
+
+##### Multi-frame time series
+
+Use this option to transform the time series data frame from the wide format to the long format. This is particularly helpful when your data source delivers time series information in a format that needs to be reshaped for optimal compatibility with your visualization.
 
-  This transformation helps you resolve this issue by converting the time series data from either the wide format to the long format or the other way around.
+**Example: Converting from wide to long format**
 
-  Select the 'Multi-frame time series' option to transform the time series data frame from the wide to the long format.
+| Timestamp           | Value1 | Value2 |
+|---------------------|--------|--------|
+| 2023-01-01 00:00:00 | 10     | 20     |
+| 2023-01-01 01:00:00 | 15     | 25     |
 
-  Select the 'Wide time series' option to transform the time series data frame from the long to the wide format.
+**Transformed to:**
 
-  > **Note:** This transformation is available in Grafana 7.5.10+ and Grafana 8.0.6+.
+| Timestamp           | Variable | Value |
+|---------------------|----------|-------|
+| 2023-01-01 00:00:00 | Value1   | 10    |
+| 2023-01-01 00:00:00 | Value2   | 20    |
+| 2023-01-01 01:00:00 | Value1   | 15    |
+| 2023-01-01 01:00:00 | Value2   | 25    |
+
+
+##### Wide time series
+
+Select this option to transform the time series data frame from the long format to the wide format. If your data source returns time series data in a long format and your visualization requires a wide format, this transformation simplifies the process.
+
+**Example: Converting from long to wide format**
+
+| Timestamp           | Variable | Value |
+|---------------------|----------|-------|
+| 2023-01-01 00:00:00 | Value1   | 10    |
+| 2023-01-01 00:00:00 | Value2   | 20    |
+| 2023-01-01 01:00:00 | Value1   | 15    |
+| 2023-01-01 01:00:00 | Value2   | 25    |
+
+**Transformed to:**
+
+| Timestamp           | Value1 | Value2 |
+|---------------------|--------|--------|
+| 2023-01-01 00:00:00 | 10     | 20     |
+| 2023-01-01 01:00:00 | 15     | 25     |
+
+> **Note:** This transformation is available in Grafana 7.5.10+ and Grafana 8.0.6+.
   `;
     },
     links: [
@@ -988,53 +1191,55 @@ export const transformationDocsContent: TransformationDocsContentType = {
     name: 'Reduce',
     getHelperDocs: function () {
       return `
-  Use this transformation to apply a calculation to each field in the frame and return a single value. Time fields are removed when applying this transformation.
+Use this transformation to apply a calculation to each field in the data frame and return a single value. This transformation is particularly useful for consolidating multiple time series data into a more compact, summarized format. Time fields are removed when applying this transformation.
 
-  Consider the input:
+Consider the input:
 
-  Query A:
+**Query A:**
 
-  | Time                | Temp | Uptime  |
-  | ------------------- | ---- | ------- |
-  | 2020-07-07 11:34:20 | 12.3 | 256122  |
-  | 2020-07-07 11:24:20 | 15.4 | 1230233 |
+| Time                | Temp | Uptime  |
+| ------------------- | ---- | ------- |
+| 2020-07-07 11:34:20 | 12.3 | 256122  |
+| 2020-07-07 11:24:20 | 15.4 | 1230233 |
 
-  Query B:
+**Query B:**
 
-  | Time                | AQI | Errors |
-  | ------------------- | --- | ------ |
-  | 2020-07-07 11:34:20 | 6.5 | 15     |
-  | 2020-07-07 11:24:20 | 3.2 | 5      |
+| Time                | AQI | Errors |
+| ------------------- | --- | ------ |
+| 2020-07-07 11:34:20 | 6.5 | 15     |
+| 2020-07-07 11:24:20 | 3.2 | 5      |
 
-  The reduce transformer has two modes:
+The reduce transformer has two modes:
 
-  - **Series to rows -** Creates a row for each field and a column for each calculation.
-  - **Reduce fields -** Keeps the existing frame structure, but collapses each field into a single value.
+- **Series to rows** - Creates a row for each field and a column for each calculation.
+- **Reduce fields** - Keeps the existing frame structure, but collapses each field into a single value.
 
-  For example, if you used the **First** and **Last** calculation with a **Series to rows** transformation, then
-  the result would be:
+For example, if you used the **First** and **Last** calculation with a **Series to rows** transformation, then
+the result would be:
 
-  | Field  | First  | Last    |
-  | ------ | ------ | ------- |
-  | Temp   | 12.3   | 15.4    |
-  | Uptime | 256122 | 1230233 |
-  | AQI    | 6.5    | 3.2     |
-  | Errors | 15     | 5       |
+| Field  | First  | Last    |
+| ------ | ------ | ------- |
+| Temp   | 12.3   | 15.4    |
+| Uptime | 256122 | 1230233 |
+| AQI    | 6.5    | 3.2     |
+| Errors | 15     | 5       |
 
-  The **Reduce fields** with the **Last** calculation,
-  results in two frames, each with one row:
+The **Reduce fields** with the **Last** calculation,
+results in two frames, each with one row:
 
-  Query A:
+**Query A:**
 
-  | Temp | Uptime  |
-  | ---- | ------- |
-  | 15.4 | 1230233 |
+| Temp | Uptime  |
+| ---- | ------- |
+| 15.4 | 1230233 |
 
-  Query B:
+**Query B:**
 
-  | AQI | Errors |
-  | --- | ------ |
-  | 3.2 | 5      |
+| AQI | Errors |
+| --- | ------ |
+| 3.2 | 5      |
+
+This flexible transformation simplifies the process of consolidating and summarizing data from multiple time series into a more manageable and organized format.
   `;
     },
   },
@@ -1042,21 +1247,29 @@ export const transformationDocsContent: TransformationDocsContentType = {
     name: 'Rename by regex',
     getHelperDocs: function (imageRenderType: ImageRenderType = ImageRenderType.ShortcodeFigure) {
       return `
-  Use this transformation to rename parts of the query results using a regular expression and replacement pattern.
+Use this transformation to rename parts of the query results using a regular expression and replacement pattern.
 
-  You can specify a regular expression, which is only applied to matches, along with a replacement pattern that support back references. For example, let's imagine you're visualizing CPU usage per host and you want to remove the domain name. You could set the regex to '([^\.]+)\..+' and the replacement pattern to '$1', 'web-01.example.com' would become 'web-01'.
-  
-  In the following example, we are stripping the prefix from event types. In the before image, you can see everything is prefixed with 'system.'
+You can specify a regular expression, which is only applied to matches, along with a replacement pattern that support back references. For example, let's imagine you're visualizing CPU usage per host and you want to remove the domain name. You could set the regex to '/^([^.]+).*/' and the replacement pattern to '$1', 'web-01.example.com' would become 'web-01'.
 
-  ${buildImageContent(
-    '/static/img/docs/transformations/rename-by-regex-before-7-3.png',
-    imageRenderType,
-    this.name + 1
-  )}
+> **Note:** The Rename by regex transformation was improved in Grafana v9.0.0 to allow global patterns of the form '/<stringToReplace>/g'. Depending on the regex match used, this may cause some transformations to behave slightly differently. You can guarantee the same behavior as before by wrapping the match string in forward slashes '(/)', e.g. '(.*)' would become '/(.*)/'.
+
+In the following example, we are stripping the 'A-' prefix from field names. In the before image, you can see everything is prefixed with 'A-':
+
+${buildImageContent(
+  '/media/docs/grafana/panels-visualizations/screenshot-rename-by-regex-before-v11.0.png',
+  imageRenderType,
+  'A time series with full series names'
+)}
 
-  With the transformation applied, you can see we are left with just the remainder of the string.
+With the transformation applied, you can see we are left with just the remainder of the string.
 
-  ${buildImageContent('/static/img/docs/transformations/rename-by-regex-after-7-3.png', imageRenderType, this.name + 1)}
+${buildImageContent(
+  '/media/docs/grafana/panels-visualizations/screenshot-rename-by-regex-after-v11.0.png',
+  imageRenderType,
+  'A time series with shortened series names'
+)}
+
+This transformation lets you to tailor your data to meet your visualization needs, making your dashboards more informative and user-friendly.
   `;
     },
   },
@@ -1064,64 +1277,66 @@ export const transformationDocsContent: TransformationDocsContentType = {
     name: 'Rows to fields',
     getHelperDocs: function () {
       return `
-  Use this transformation to convert rows into separate fields. This can be useful because fields can be styled and configured individually. It can also use additional fields as sources for dynamic field configuration or map them to field labels. The additional labels can then be used to define better display names for the resulting fields.
+Use this transformation to convert rows into separate fields. This can be useful because fields can be styled and configured individually. It can also use additional fields as sources for dynamic field configuration or map them to field labels. The additional labels can then be used to define better display names for the resulting fields.
+
+This transformation includes a field table which lists all fields in the data returned by the configuration query. This table gives you control over what field should be mapped to each configuration property (the **Use as** option). You can also choose which value to select if there are multiple rows in the returned data.
 
-  This transformation includes a field table which lists all fields in the data returned by the config query. This table gives you control over what field should be mapped to each config property (the \*Use as\*\* option). You can also choose which value to select if there are multiple rows in the returned data.
+This transformation requires:
 
-  This transformation requires:
+- One field to use as the source of field names.
 
-  - One field to use as the source of field names.
+  By default, the transform uses the first string field as the source. You can override this default setting by selecting **Field name** in the **Use as** column for the field you want to use instead.
 
-    By default, the transform uses the first string field as the source. You can override this default setting by selecting **Field name** in the **Use as** column for the field you want to use instead.
+- One field to use as the source of values.
 
-  - One field to use as the source of values.
+  By default, the transform uses the first number field as the source. But you can override this default setting by selecting **Field value** in the **Use as** column for the field you want to use instead.
 
-    By default, the transform uses the first number field as the source. But you can override this default setting by selecting **Field value** in the **Use as** column for the field you want to use instead.
+Useful when visualizing data in:
 
-  Useful when visualizing data in:
+- Gauge
+- Stat
+- Pie chart
 
-  - Gauge
-  - Stat
-  - Pie chart
+#### Map extra fields to labels
 
-  #### Map extra fields to labels
+If a field does not map to config property Grafana will automatically use it as source for a label on the output field-
 
-  If a field does not map to config property Grafana will automatically use it as source for a label on the output field-
+**Example:**
 
-  Example:
+| Name    | DataCenter | Value |
+| ------- | ---------- | ----- |
+| ServerA | US         | 100   |
+| ServerB | EU         | 200   |
 
-  | Name    | DataCenter | Value |
-  | ------- | ---------- | ----- |
-  | ServerA | US         | 100   |
-  | ServerB | EU         | 200   |
+**Output:**
 
-  Output:
+| ServerA (labels: DataCenter: US) | ServerB (labels: DataCenter: EU) |
+| -------------------------------- | -------------------------------- |
+| 10                               | 20                               |
 
-  | ServerA (labels: DataCenter: US) | ServerB (labels: DataCenter: EU) |
-  | -------------------------------- | -------------------------------- |
-  | 10                               | 20                               |
+The extra labels can now be used in the field display name provide more complete field names.
 
-  The extra labels can now be used in the field display name provide more complete field names.
+If you want to extract config from one query and apply it to another you should use the config from query results transformation.
 
-  If you want to extract config from one query and apply it to another you should use the config from query results transformation.
+#### Example
 
-  #### Example
+**Input:**
 
-  Input:
+| Name    | Value | Max |
+| ------- | ----- | --- |
+| ServerA | 10    | 100 |
+| ServerB | 20    | 200 |
+| ServerC | 30    | 300 |
 
-  | Name    | Value | Max |
-  | ------- | ----- | --- |
-  | ServerA | 10    | 100 |
-  | ServerB | 20    | 200 |
-  | ServerC | 30    | 300 |
+**Output:**
 
-  Output:
+| ServerA (config: max=100) | ServerB (config: max=200) | ServerC (config: max=300) |
+| ------------------------- | ------------------------- | ------------------------- |
+| 10                        | 20                        | 30                        |
 
-  | ServerA (config: max=100) | ServerB (config: max=200) | ServerC (config: max=300) |
-  | ------------------------- | ------------------------- | ------------------------- |
-  | 10                        | 20                        | 30                        |
+As you can see each row in the source data becomes a separate field. Each field now also has a max config option set. Options like **Min**, **Max**, **Unit** and **Thresholds** are all part of field configuration and if set like this will be used by the visualization instead of any options manually configured in the panel editor options pane.
 
-  As you can see each row in the source data becomes a separate field. Each field now also has a max config option set. Options like **Min**, **Max**, **Unit** and **Thresholds** are all part of field configuration and if set like this will be used by the visualization instead of any options manually configured in the panel editor options pane.
+This transformation enables the conversion of rows into individual fields, facilitates dynamic field configuration, and maps additional fields to labels.
   `;
     },
   },
@@ -1129,40 +1344,42 @@ export const transformationDocsContent: TransformationDocsContentType = {
     name: 'Series to rows',
     getHelperDocs: function () {
       return `
-  Use this transformation to combine the result from multiple time series data queries into one single result. This is helpful when using the table panel visualization.
+Use this transformation to combine the result from multiple time series data queries into one single result. This is helpful when using the table panel visualization.
+
+The result from this transformation will contain three columns: Time, Metric, and Value. The Metric column is added so you easily can see from which query the metric originates from. Customize this value by defining Label on the source query.
 
-  The result from this transformation will contain three columns: Time, Metric, and Value. The Metric column is added so you easily can see from which query the metric originates from. Customize this value by defining Label on the source query.
+In the example below, we have two queries returning time series data. It is visualized as two separate tables before applying the transformation.
 
-  In the example below, we have two queries returning time series data. It is visualized as two separate tables before applying the transformation.
+**Query A:**
 
-  Query A:
+| Time                | Temperature |
+| ------------------- | ----------- |
+| 2020-07-07 11:34:20 | 25          |
+| 2020-07-07 10:31:22 | 22          |
+| 2020-07-07 09:30:05 | 19          |
 
-  | Time                | Temperature |
-  | ------------------- | ----------- |
-  | 2020-07-07 11:34:20 | 25          |
-  | 2020-07-07 10:31:22 | 22          |
-  | 2020-07-07 09:30:05 | 19          |
+**Query B:**
 
-  Query B:
+| Time                | Humidity |
+| ------------------- | -------- |
+| 2020-07-07 11:34:20 | 24       |
+| 2020-07-07 10:32:20 | 29       |
+| 2020-07-07 09:30:57 | 33       |
 
-  | Time                | Humidity |
-  | ------------------- | -------- |
-  | 2020-07-07 11:34:20 | 24       |
-  | 2020-07-07 10:32:20 | 29       |
-  | 2020-07-07 09:30:57 | 33       |
+Here is the result after applying the Series to rows transformation.
 
-  Here is the result after applying the Series to rows transformation.
+| Time                | Metric      | Value |
+| ------------------- | ----------- | ----- |
+| 2020-07-07 11:34:20 | Temperature | 25    |
+| 2020-07-07 11:34:20 | Humidity    | 22    |
+| 2020-07-07 10:32:20 | Humidity    | 29    |
+| 2020-07-07 10:31:22 | Temperature | 22    |
+| 2020-07-07 09:30:57 | Humidity    | 33    |
+| 2020-07-07 09:30:05 | Temperature | 19    |
 
-  | Time                | Metric      | Value |
-  | ------------------- | ----------- | ----- |
-  | 2020-07-07 11:34:20 | Temperature | 25    |
-  | 2020-07-07 11:34:20 | Humidity    | 22    |
-  | 2020-07-07 10:32:20 | Humidity    | 29    |
-  | 2020-07-07 10:31:22 | Temperature | 22    |
-  | 2020-07-07 09:30:57 | Humidity    | 33    |
-  | 2020-07-07 09:30:05 | Temperature | 19    |
+This transformation facilitates the consolidation of results from multiple time series queries, providing a streamlined and unified dataset for efficient analysis and visualization in a tabular format.
 
-  > **Note:** This transformation is available in Grafana 7.1+.
+> **Note:** This transformation is available in Grafana 7.1+.
   `;
     },
   },
@@ -1170,28 +1387,63 @@ export const transformationDocsContent: TransformationDocsContentType = {
     name: 'Sort by',
     getHelperDocs: function () {
       return `
-  Use this transformation to sort each frame by the configured field. When the **Reverse** switch is on, the values will return in the opposite order.
+Use this transformation to sort each frame within a query result based on a specified field, making your data easier to understand and analyze. By configuring the desired field for sorting, you can control the order in which the data is presented in the table or visualization.
+
+Use the **Reverse** switch to inversely order the values within the specified field. This functionality is particularly useful when you want to quickly toggle between ascending and descending order to suit your analytical needs.
+
+For example, in a scenario where time-series data is retrieved from a data source, the **Sort by** transformation can be applied to arrange the data frames based on the timestamp, either in ascending or descending order, depending on the analytical requirements. This capability ensures that you can easily navigate and interpret time-series data, gaining valuable insights from the organized and visually coherent presentation.
   `;
     },
   },
   spatial: {
     name: 'Spatial',
     getHelperDocs: function () {
-      // This template string space-formatting is intentional.
       return `
-  Use this transformation to apply spatial operations to query results
+Use this transformation to apply spatial operations to query results.
+
+- **Action** - Select an action:
+  - **Prepare spatial field** - Set a geometry field based on the results of other fields.
+    - **Location mode** - Select a location mode (these options are shared by the **Calculate value** and **Transform** modes):
+      - **Auto** - Automatically identify location data based on default field names.
+      - **Coords** - Specify latitude and longitude fields.
+      - **Geohash** - Specify a geohash field.
+      - **Lookup** - Specify Gazetteer location fields.
+  - **Calculate value** - Use the geometry to define a new field (heading/distance/area).
+    - **Function** - Choose a mathematical operation to apply to the geometry:
+      - **Heading** - Calculate the heading (direction) between two points.
+      - **Area** - Calculate the area enclosed by a polygon defined by the geometry.
+      - **Distance** - Calculate the distance between two points.
+  - **Transform** - Apply spatial operations to the geometry.
+    - **Operation** - Choose an operation to apply to the geometry:
+      - **As line** - Create a single line feature with a vertex at each row.
+      - **Line builder** - Create a line between two points.
+
+This transformation allows you to manipulate and analyze geospatial data, enabling operations such as creating lines between points, calculating spatial properties, and more.
   `;
     },
   },
   timeSeriesTable: {
     name: 'Time series to table transform',
-    getHelperDocs: function () {
+    getHelperDocs: function (imageRenderType: ImageRenderType = ImageRenderType.ShortcodeFigure) {
       return `
-  Use this transformation to convert time series result into a table, converting time series data frame into a "Trend" field. "Trend" field can then be rendered using [sparkline cell type][], producing an inline sparkline for each table row. If there are multiple time series queries, each will result in a separate table data frame. These can be joined using join or merge transforms to produce a single table with multiple sparklines per row.
+Use this transformation to convert time series results into a table, transforming a time series data frame into a **Trend** field which can then be used with the [sparkline cell type][]. If there are multiple time series queries, each will result in a separate table data frame. These can be joined using join or merge transforms to produce a single table with multiple sparklines per row.
+
+${buildImageContent(
+  '/static/img/docs/transformations/table-sparklines.png',
+  imageRenderType,
+  'A table panel showing multiple values and their corresponding sparklines.'
+)}
+
+For each generated **Trend** field value, a calculation function can be selected. This value is displayed next to the sparkline and will be used for sorting table rows.
+
+${buildImageContent(
+  '/static/img/docs/transformations/timeseries-table-select-stat.png',
+  imageRenderType,
+  'A select box showing available statistics that can be calculated.'
+)}
 
-  For each generated "Trend" field value calculation function can be selected. Default is "last non null value". This value will be displayed next to the sparkline and used for sorting table rows.
 
-  > **Note:** This transformation is available in Grafana 9.5+ as an opt-in beta feature. Modify Grafana [configuration file][] to use it.
+> **Note:** This transformation is available in Grafana 9.5+ as an opt-in beta feature. Modify the Grafana [configuration file][] to use it.
   `;
     },
     links: [
@@ -1205,6 +1457,31 @@ export const transformationDocsContent: TransformationDocsContentType = {
       },
     ],
   },
+  regression: {
+    name: 'Regression analysis',
+    getHelperDocs: function (imageRenderType: ImageRenderType = ImageRenderType.ShortcodeFigure) {
+      return `
+Use this transformation to create a new data frame containing values predicted by a statistical model. This is useful for finding a trend in chaotic data. It works by fitting a mathematical function to the data, using either linear or polynomial regression. The data frame can then be used in a visualization to display a trendline.
+
+There are two different models:
+
+- **Linear regression** - Fits a linear function to the data.
+${buildImageContent(
+  '/static/img/docs/transformations/linear-regression.png',
+  imageRenderType,
+  'A time series visualization with a straight line representing the linear function'
+)}
+- **Polynomial regression** - Fits a polynomial function to the data.
+${buildImageContent(
+  '/static/img/docs/transformations/polynomial-regression.png',
+  imageRenderType,
+  'A time series visualization with a curved line representing the polynomial function'
+)}
+
+> **Note:** This transformation is currently in public preview. Grafana Labs offers limited support, and breaking changes might occur prior to the feature being made generally available. Enable the \`regressionTransformation\` feature toggle in Grafana to use this feature. Contact Grafana Support to enable this feature in Grafana Cloud.
+  `;
+    },
+  },
 };
 
 export function getLinkToDocs(): string {
@@ -1215,10 +1492,10 @@ export function getLinkToDocs(): string {
   `;
 }
 
-function buildImageContent(source: string, imageRenderType: ImageRenderType, imageName?: string) {
+function buildImageContent(source: string, imageRenderType: ImageRenderType, imageAltText: string) {
   return imageRenderType === 'shortcodeFigure'
     ? // This will build a Hugo Shortcode "figure" image template, which shares the same default class and max-width.
-      `{{< figure src="${source}" class="docs-image--no-shadow" max-width= "1100px" >}}`
+      `{{< figure src="${source}" class="docs-image--no-shadow" max-width= "1100px" alt="${imageAltText}" >}}`
     : // This will build generic Markdown image syntax for UI rendering.
-      `![${imageName} helper image](${source})`;
+      `![${imageAltText}](https://grafana.com${source})`;
 }
diff --git a/public/app/features/transformers/docs/getTransformationContent.ts b/public/app/features/transformers/docs/getTransformationContent.ts
new file mode 100644
index 0000000000000..800c37af4d892
--- /dev/null
+++ b/public/app/features/transformers/docs/getTransformationContent.ts
@@ -0,0 +1,57 @@
+import { transformationDocsContent, getLinkToDocs, ImageRenderType } from './content';
+
+export function getTransformationContent(id: string): { name: string; helperDocs: string } {
+  if (id in transformationDocsContent) {
+    const { name, getHelperDocs, links } = transformationDocsContent[id];
+
+    const helperDocs = getHelperDocs(ImageRenderType.UIImage);
+
+    const cleansedMarkdown = cleanMarkdownOfUnwantedSyntax(helperDocs);
+
+    // NOTE: string interpolation whitespace/indentation formatting is intentional.
+    if (links?.length) {
+      const renderedLinks = links
+        .map((link) => {
+          return `
+  Or visit <a href="${link.url}" target="_blank">${link.title}</a>\n
+  `;
+        })
+        .join('');
+
+      // If external links exist, build and add them to the returned documentation.
+      return {
+        name,
+        helperDocs: `
+        ${cleansedMarkdown}
+        ${getLinkToDocs()}
+  ${renderedLinks}
+        `,
+      };
+    }
+
+    // If NO external links exist, simply return the basic documentation.
+    return {
+      name,
+      helperDocs: `
+      ${cleansedMarkdown}
+      ${getLinkToDocs()}
+      `,
+    };
+  }
+
+  // If the transformation has no documentation, return an external link to the online documentation.
+  return {
+    name: 'No documentation found',
+    helperDocs: getLinkToDocs(),
+  };
+}
+
+const cleanMarkdownOfUnwantedSyntax = (markdown: string) => {
+  // Remove anchor links: [text](#link)
+  const markdownWithoutAnchorLinks = markdown.replace(/\[(.*?)\]\(#.*?\)/g, '$1');
+
+  // Remove shortcode syntax: [text][]
+  const markdownWithoutShortcodeSyntax = markdownWithoutAnchorLinks.replace(/\[[^\]]*\]\[\]/g, '');
+
+  return markdownWithoutShortcodeSyntax;
+};
diff --git a/public/app/features/transformers/editors/CalculateFieldTransformerEditor.tsx b/public/app/features/transformers/editors/CalculateFieldTransformerEditor.tsx
deleted file mode 100644
index 92efe73a8d29b..0000000000000
--- a/public/app/features/transformers/editors/CalculateFieldTransformerEditor.tsx
+++ /dev/null
@@ -1,495 +0,0 @@
-import { defaults } from 'lodash';
-import React, { ChangeEvent } from 'react';
-import { identity, of, OperatorFunction } from 'rxjs';
-import { map } from 'rxjs/operators';
-
-import {
-  BinaryOperationID,
-  binaryOperators,
-  unaryOperators,
-  DataFrame,
-  DataTransformerID,
-  FieldType,
-  getFieldDisplayName,
-  KeyValue,
-  ReducerID,
-  SelectableValue,
-  standardTransformers,
-  TransformerRegistryItem,
-  TransformerUIProps,
-  TransformerCategory,
-  UnaryOperationID,
-} from '@grafana/data';
-import {
-  BinaryOptions,
-  UnaryOptions,
-  CalculateFieldMode,
-  CalculateFieldTransformerOptions,
-  getNameFromOptions,
-  IndexOptions,
-  ReduceOptions,
-} from '@grafana/data/src/transformations/transformers/calculateField';
-import { getTemplateSrv, config as cfg } from '@grafana/runtime';
-import {
-  FilterPill,
-  HorizontalGroup,
-  InlineField,
-  InlineFieldRow,
-  InlineLabel,
-  InlineSwitch,
-  Input,
-  Select,
-  StatsPicker,
-} from '@grafana/ui';
-
-interface CalculateFieldTransformerEditorProps extends TransformerUIProps<CalculateFieldTransformerOptions> {}
-
-interface CalculateFieldTransformerEditorState {
-  include: string[];
-  names: string[];
-  selected: string[];
-}
-
-const calculationModes = [
-  { value: CalculateFieldMode.BinaryOperation, label: 'Binary operation' },
-  { value: CalculateFieldMode.UnaryOperation, label: 'Unary operation' },
-  { value: CalculateFieldMode.ReduceRow, label: 'Reduce row' },
-  { value: CalculateFieldMode.Index, label: 'Row index' },
-];
-
-const okTypes = new Set<FieldType>([FieldType.time, FieldType.number, FieldType.string]);
-
-const labelWidth = 16;
-
-export class CalculateFieldTransformerEditor extends React.PureComponent<
-  CalculateFieldTransformerEditorProps,
-  CalculateFieldTransformerEditorState
-> {
-  constructor(props: CalculateFieldTransformerEditorProps) {
-    super(props);
-
-    this.state = {
-      include: props.options?.reduce?.include || [],
-      names: [],
-      selected: [],
-    };
-  }
-
-  componentDidMount() {
-    this.initOptions();
-  }
-
-  componentDidUpdate(oldProps: CalculateFieldTransformerEditorProps) {
-    if (this.props.input !== oldProps.input) {
-      this.initOptions();
-    }
-  }
-
-  private initOptions() {
-    const { options } = this.props;
-    const configuredOptions = options?.reduce?.include || [];
-    const ctx = { interpolate: (v: string) => v };
-    const subscription = of(this.props.input)
-      .pipe(
-        standardTransformers.ensureColumnsTransformer.operator(null, ctx),
-        this.extractAllNames(),
-        this.getVariableNames(),
-        this.extractNamesAndSelected(configuredOptions)
-      )
-      .subscribe(({ selected, names }) => {
-        this.setState({ names, selected }, () => subscription.unsubscribe());
-      });
-  }
-
-  private getVariableNames(): OperatorFunction<string[], string[]> {
-    if (!cfg.featureToggles.transformationsVariableSupport) {
-      return identity;
-    }
-    const templateSrv = getTemplateSrv();
-    return (source) =>
-      source.pipe(
-        map((input) => {
-          input.push(...templateSrv.getVariables().map((v) => '$' + v.name));
-          return input;
-        })
-      );
-  }
-
-  private extractAllNames(): OperatorFunction<DataFrame[], string[]> {
-    return (source) =>
-      source.pipe(
-        map((input) => {
-          const allNames: string[] = [];
-          const byName: KeyValue<boolean> = {};
-
-          for (const frame of input) {
-            for (const field of frame.fields) {
-              if (!okTypes.has(field.type)) {
-                continue;
-              }
-
-              const displayName = getFieldDisplayName(field, frame, input);
-
-              if (!byName[displayName]) {
-                byName[displayName] = true;
-                allNames.push(displayName);
-              }
-            }
-          }
-
-          return allNames;
-        })
-      );
-  }
-
-  private extractNamesAndSelected(
-    configuredOptions: string[]
-  ): OperatorFunction<string[], { names: string[]; selected: string[] }> {
-    return (source) =>
-      source.pipe(
-        map((allNames) => {
-          if (!configuredOptions.length) {
-            return { names: allNames, selected: [] };
-          }
-
-          const names: string[] = [];
-          const selected: string[] = [];
-
-          for (const v of allNames) {
-            if (configuredOptions.includes(v)) {
-              selected.push(v);
-            }
-            names.push(v);
-          }
-
-          return { names, selected };
-        })
-      );
-  }
-
-  onToggleReplaceFields = (e: React.FormEvent<HTMLInputElement>) => {
-    const { options } = this.props;
-    this.props.onChange({
-      ...options,
-      replaceFields: e.currentTarget.checked,
-    });
-  };
-
-  onToggleRowIndexAsPercentile = (e: React.FormEvent<HTMLInputElement>) => {
-    const { options } = this.props;
-    this.props.onChange({
-      ...options,
-      index: {
-        asPercentile: e.currentTarget.checked,
-      },
-    });
-  };
-
-  onModeChanged = (value: SelectableValue<CalculateFieldMode>) => {
-    const { options, onChange } = this.props;
-    const mode = value.value ?? CalculateFieldMode.BinaryOperation;
-    onChange({
-      ...options,
-      mode,
-    });
-  };
-
-  onAliasChanged = (evt: ChangeEvent<HTMLInputElement>) => {
-    const { options } = this.props;
-    this.props.onChange({
-      ...options,
-      alias: evt.target.value,
-    });
-  };
-
-  //---------------------------------------------------------
-  // Reduce by Row
-  //---------------------------------------------------------
-
-  updateReduceOptions = (v: ReduceOptions) => {
-    const { options, onChange } = this.props;
-    onChange({
-      ...options,
-      mode: CalculateFieldMode.ReduceRow,
-      reduce: v,
-    });
-  };
-
-  onFieldToggle = (fieldName: string) => {
-    const { selected } = this.state;
-    if (selected.indexOf(fieldName) > -1) {
-      this.onChange(selected.filter((s) => s !== fieldName));
-    } else {
-      this.onChange([...selected, fieldName]);
-    }
-  };
-
-  onChange = (selected: string[]) => {
-    this.setState({ selected });
-    const { reduce } = this.props.options;
-    this.updateReduceOptions({
-      ...reduce!,
-      include: selected,
-    });
-  };
-
-  onStatsChange = (stats: string[]) => {
-    const reducer = stats.length ? (stats[0] as ReducerID) : ReducerID.sum;
-
-    const { reduce } = this.props.options;
-    this.updateReduceOptions({ ...reduce, reducer });
-  };
-
-  renderRowIndex(options?: IndexOptions) {
-    return (
-      <>
-        <InlineField labelWidth={labelWidth} label="As percentile" tooltip="Transform the row index as a percentile.">
-          <InlineSwitch value={!!options?.asPercentile} onChange={this.onToggleRowIndexAsPercentile} />
-        </InlineField>
-      </>
-    );
-  }
-
-  renderReduceRow(options?: ReduceOptions) {
-    const { names, selected } = this.state;
-    options = defaults(options, { reducer: ReducerID.sum });
-
-    return (
-      <>
-        <InlineField label="Operation" labelWidth={labelWidth} grow={true}>
-          <HorizontalGroup spacing="xs" align="flex-start" wrap>
-            {names.map((o, i) => {
-              return (
-                <FilterPill
-                  key={`${o}/${i}`}
-                  onClick={() => {
-                    this.onFieldToggle(o);
-                  }}
-                  label={o}
-                  selected={selected.indexOf(o) > -1}
-                />
-              );
-            })}
-          </HorizontalGroup>
-        </InlineField>
-        <InlineField label="Calculation" labelWidth={labelWidth}>
-          <StatsPicker
-            allowMultiple={false}
-            className="width-18"
-            stats={[options.reducer]}
-            onChange={this.onStatsChange}
-            defaultStat={ReducerID.sum}
-          />
-        </InlineField>
-      </>
-    );
-  }
-
-  //---------------------------------------------------------
-  // Binary Operator
-  //---------------------------------------------------------
-
-  updateBinaryOptions = (v: BinaryOptions) => {
-    const { options, onChange } = this.props;
-    onChange({
-      ...options,
-      mode: CalculateFieldMode.BinaryOperation,
-      binary: v,
-    });
-  };
-
-  onBinaryLeftChanged = (v: SelectableValue<string>) => {
-    const { binary } = this.props.options;
-    this.updateBinaryOptions({
-      ...binary!,
-      left: v.value!,
-    });
-  };
-
-  onBinaryRightChanged = (v: SelectableValue<string>) => {
-    const { binary } = this.props.options;
-    this.updateBinaryOptions({
-      ...binary!,
-      right: v.value!,
-    });
-  };
-
-  onBinaryOperationChanged = (v: SelectableValue<BinaryOperationID>) => {
-    const { binary } = this.props.options;
-    this.updateBinaryOptions({
-      ...binary!,
-      operator: v.value!,
-    });
-  };
-
-  renderBinaryOperation(options?: BinaryOptions) {
-    options = defaults(options, { operator: BinaryOperationID.Add });
-
-    let foundLeft = !options?.left;
-    let foundRight = !options?.right;
-    const names = this.state.names.map((v) => {
-      if (v === options?.left) {
-        foundLeft = true;
-      }
-      if (v === options?.right) {
-        foundRight = true;
-      }
-      return { label: v, value: v };
-    });
-    const leftNames = foundLeft ? names : [...names, { label: options?.left, value: options?.left }];
-    const rightNames = foundRight ? names : [...names, { label: options?.right, value: options?.right }];
-
-    const ops = binaryOperators.list().map((v) => {
-      return { label: v.binaryOperationID, value: v.binaryOperationID };
-    });
-
-    return (
-      <>
-        <InlineFieldRow>
-          <InlineField label="Operation" labelWidth={labelWidth}>
-            <Select
-              allowCustomValue={true}
-              placeholder="Field or number"
-              options={leftNames}
-              className="min-width-18"
-              value={options?.left}
-              onChange={this.onBinaryLeftChanged}
-            />
-          </InlineField>
-          <InlineField>
-            <Select
-              className="width-4"
-              options={ops}
-              value={options.operator ?? ops[0].value}
-              onChange={this.onBinaryOperationChanged}
-            />
-          </InlineField>
-          <InlineField>
-            <Select
-              allowCustomValue={true}
-              placeholder="Field or number"
-              className="min-width-10"
-              options={rightNames}
-              value={options?.right}
-              onChange={this.onBinaryRightChanged}
-            />
-          </InlineField>
-        </InlineFieldRow>
-      </>
-    );
-  }
-
-  //---------------------------------------------------------
-  // Unary Operator
-  //---------------------------------------------------------
-
-  updateUnaryOptions = (v: UnaryOptions) => {
-    const { options, onChange } = this.props;
-    onChange({
-      ...options,
-      mode: CalculateFieldMode.UnaryOperation,
-      unary: v,
-    });
-  };
-
-  onUnaryOperationChanged = (v: SelectableValue<UnaryOperationID>) => {
-    const { unary } = this.props.options;
-    this.updateUnaryOptions({
-      ...unary!,
-      operator: v.value!,
-    });
-  };
-
-  onUnaryValueChanged = (v: SelectableValue<string>) => {
-    const { unary } = this.props.options;
-    this.updateUnaryOptions({
-      ...unary!,
-      fieldName: v.value!,
-    });
-  };
-
-  renderUnaryOperation(options?: UnaryOptions) {
-    options = defaults(options, { operator: UnaryOperationID.Abs });
-
-    let found = !options?.fieldName;
-    const names = this.state.names.map((v) => {
-      if (v === options?.fieldName) {
-        found = true;
-      }
-      return { label: v, value: v };
-    });
-
-    const ops = unaryOperators.list().map((v) => {
-      return { label: v.unaryOperationID, value: v.unaryOperationID };
-    });
-
-    const fieldName = found ? names : [...names, { label: options?.fieldName, value: options?.fieldName }];
-
-    return (
-      <>
-        <InlineFieldRow>
-          <InlineField label="Operation" labelWidth={labelWidth}>
-            <Select options={ops} value={options.operator ?? ops[0].value} onChange={this.onUnaryOperationChanged} />
-          </InlineField>
-          <InlineField label="(" labelWidth={2}>
-            <Select
-              placeholder="Field"
-              className="min-width-11"
-              options={fieldName}
-              value={options?.fieldName}
-              onChange={this.onUnaryValueChanged}
-            />
-          </InlineField>
-          <InlineLabel width={2}>)</InlineLabel>
-        </InlineFieldRow>
-      </>
-    );
-  }
-
-  //---------------------------------------------------------
-  // Render
-  //---------------------------------------------------------
-
-  render() {
-    const { options } = this.props;
-
-    const mode = options.mode ?? CalculateFieldMode.BinaryOperation;
-
-    return (
-      <>
-        <InlineField labelWidth={labelWidth} label="Mode">
-          <Select
-            className="width-18"
-            options={calculationModes}
-            value={calculationModes.find((v) => v.value === mode)}
-            onChange={this.onModeChanged}
-          />
-        </InlineField>
-        {mode === CalculateFieldMode.BinaryOperation && this.renderBinaryOperation(options.binary)}
-        {mode === CalculateFieldMode.UnaryOperation && this.renderUnaryOperation(options.unary)}
-        {mode === CalculateFieldMode.ReduceRow && this.renderReduceRow(options.reduce)}
-        {mode === CalculateFieldMode.Index && this.renderRowIndex(options.index)}
-        <InlineField labelWidth={labelWidth} label="Alias">
-          <Input
-            className="width-18"
-            value={options.alias ?? ''}
-            placeholder={getNameFromOptions(options)}
-            onChange={this.onAliasChanged}
-          />
-        </InlineField>
-        <InlineField labelWidth={labelWidth} label="Replace all fields">
-          <InlineSwitch value={!!options.replaceFields} onChange={this.onToggleReplaceFields} />
-        </InlineField>
-      </>
-    );
-  }
-}
-
-export const calculateFieldTransformRegistryItem: TransformerRegistryItem<CalculateFieldTransformerOptions> = {
-  id: DataTransformerID.calculateField,
-  editor: CalculateFieldTransformerEditor,
-  transformation: standardTransformers.calculateFieldTransformer,
-  name: 'Add field from calculation',
-  description: 'Use the row values to calculate a new field.',
-  categories: new Set([TransformerCategory.CalculateNewFields]),
-};
diff --git a/public/app/features/transformers/editors/CalculateFieldTransformerEditor/BinaryOperationOptionsEditor.tsx b/public/app/features/transformers/editors/CalculateFieldTransformerEditor/BinaryOperationOptionsEditor.tsx
new file mode 100644
index 0000000000000..842cf0a670a64
--- /dev/null
+++ b/public/app/features/transformers/editors/CalculateFieldTransformerEditor/BinaryOperationOptionsEditor.tsx
@@ -0,0 +1,102 @@
+import React from 'react';
+
+import { BinaryOperationID, binaryOperators, SelectableValue } from '@grafana/data';
+import {
+  BinaryOptions,
+  CalculateFieldMode,
+  CalculateFieldTransformerOptions,
+} from '@grafana/data/src/transformations/transformers/calculateField';
+import { InlineField, InlineFieldRow, Select } from '@grafana/ui';
+
+import { LABEL_WIDTH } from './constants';
+
+export const BinaryOperationOptionsEditor = (props: {
+  options: CalculateFieldTransformerOptions;
+  onChange: (options: CalculateFieldTransformerOptions) => void;
+  names: string[];
+}) => {
+  const { options, onChange } = props;
+  const { binary } = options;
+
+  let foundLeft = !binary?.left;
+  let foundRight = !binary?.right;
+  const names = props.names.map((v) => {
+    if (v === binary?.left) {
+      foundLeft = true;
+    }
+    if (v === binary?.right) {
+      foundRight = true;
+    }
+    return { label: v, value: v };
+  });
+  const leftNames = foundLeft ? names : [...names, { label: binary?.left, value: binary?.left }];
+  const rightNames = foundRight ? names : [...names, { label: binary?.right, value: binary?.right }];
+
+  const ops = binaryOperators.list().map((v) => {
+    return { label: v.binaryOperationID, value: v.binaryOperationID };
+  });
+
+  const updateBinaryOptions = (v: BinaryOptions) => {
+    onChange({
+      ...options,
+      mode: CalculateFieldMode.BinaryOperation,
+      binary: v,
+    });
+  };
+
+  const onBinaryLeftChanged = (v: SelectableValue<string>) => {
+    updateBinaryOptions({
+      ...binary!,
+      left: v.value!,
+    });
+  };
+
+  const onBinaryRightChanged = (v: SelectableValue<string>) => {
+    updateBinaryOptions({
+      ...binary!,
+      right: v.value!,
+    });
+  };
+
+  const onBinaryOperationChanged = (v: SelectableValue<BinaryOperationID>) => {
+    updateBinaryOptions({
+      ...binary!,
+      operator: v.value!,
+    });
+  };
+
+  return (
+    <>
+      <InlineFieldRow>
+        <InlineField label="Operation" labelWidth={LABEL_WIDTH}>
+          <Select
+            allowCustomValue={true}
+            placeholder="Field or number"
+            options={leftNames}
+            className="min-width-18"
+            value={binary?.left}
+            onChange={onBinaryLeftChanged}
+          />
+        </InlineField>
+        <InlineField>
+          <Select
+            className="width-4"
+            options={ops}
+            value={binary?.operator ?? ops[0].value}
+            onChange={onBinaryOperationChanged}
+          />
+        </InlineField>
+        <InlineField>
+          <Select
+            allowCustomValue={true}
+            placeholder="Field or number"
+            className="min-width-10"
+            options={rightNames}
+            value={binary?.right}
+            onChange={onBinaryRightChanged}
+          />
+        </InlineField>
+      </InlineFieldRow>
+    </>
+  );
+};
diff --git a/public/app/features/transformers/editors/CalculateFieldTransformerEditor/CalculateFieldTransformerEditor.tsx b/public/app/features/transformers/editors/CalculateFieldTransformerEditor/CalculateFieldTransformerEditor.tsx
new file mode 100644
index 0000000000000..919e95890fd72
--- /dev/null
+++ b/public/app/features/transformers/editors/CalculateFieldTransformerEditor/CalculateFieldTransformerEditor.tsx
@@ -0,0 +1,238 @@
+import React, { ChangeEvent, useEffect, useState } from 'react';
+import { identity, of, OperatorFunction } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import {
+  DataFrame,
+  DataTransformerID,
+  FieldType,
+  getFieldDisplayName,
+  KeyValue,
+  SelectableValue,
+  standardTransformers,
+  TransformerRegistryItem,
+  TransformerUIProps,
+  TransformerCategory,
+} from '@grafana/data';
+import {
+  CalculateFieldMode,
+  CalculateFieldTransformerOptions,
+  getNameFromOptions,
+  defaultWindowOptions,
+} from '@grafana/data/src/transformations/transformers/calculateField';
+import { getTemplateSrv, config as cfg } from '@grafana/runtime';
+import { InlineField, InlineSwitch, Input, Select } from '@grafana/ui';
+
+import { getTransformationContent } from '../../docs/getTransformationContent';
+
+import { BinaryOperationOptionsEditor } from './BinaryOperationOptionsEditor';
+import { CumulativeOptionsEditor } from './CumulativeOptionsEditor';
+import { IndexOptionsEditor } from './IndexOptionsEditor';
+import { ReduceRowOptionsEditor } from './ReduceRowOptionsEditor';
+import { UnaryOperationEditor } from './UnaryOperationEditor';
+import { WindowOptionsEditor } from './WindowOptionsEditor';
+import { LABEL_WIDTH } from './constants';
+interface CalculateFieldTransformerEditorProps extends TransformerUIProps<CalculateFieldTransformerOptions> {}
+
+interface CalculateFieldTransformerEditorState {
+  names: string[];
+  selected: string[];
+}
+
+const calculationModes = [
+  { value: CalculateFieldMode.BinaryOperation, label: 'Binary operation' },
+  { value: CalculateFieldMode.UnaryOperation, label: 'Unary operation' },
+  { value: CalculateFieldMode.ReduceRow, label: 'Reduce row' },
+  { value: CalculateFieldMode.Index, label: 'Row index' },
+];
+
+if (cfg.featureToggles.addFieldFromCalculationStatFunctions) {
+  calculationModes.push(
+    { value: CalculateFieldMode.CumulativeFunctions, label: 'Cumulative functions' },
+    { value: CalculateFieldMode.WindowFunctions, label: 'Window functions' }
+  );
+}
+
+const okTypes = new Set<FieldType>([FieldType.time, FieldType.number, FieldType.string]);
+
+export const CalculateFieldTransformerEditor = (props: CalculateFieldTransformerEditorProps) => {
+  const { options, onChange, input } = props;
+  const configuredOptions = options?.reduce?.include;
+
+  const [state, setState] = useState<CalculateFieldTransformerEditorState>({ names: [], selected: [] });
+
+  useEffect(() => {
+    const ctx = { interpolate: (v: string) => v };
+    const subscription = of(input)
+      .pipe(
+        standardTransformers.ensureColumnsTransformer.operator(null, ctx),
+        extractAllNames(),
+        getVariableNames(),
+        extractNamesAndSelected(configuredOptions || [])
+      )
+      .subscribe(({ selected, names }) => {
+        setState({ names, selected });
+      });
+    return () => {
+      subscription.unsubscribe();
+    };
+  }, [input, configuredOptions]);
+
+  const getVariableNames = (): OperatorFunction<string[], string[]> => {
+    if (!cfg.featureToggles.transformationsVariableSupport) {
+      return identity;
+    }
+    const templateSrv = getTemplateSrv();
+    return (source) =>
+      source.pipe(
+        map((input) => {
+          input.push(...templateSrv.getVariables().map((v) => '$' + v.name));
+          return input;
+        })
+      );
+  };
+
+  const extractAllNames = (): OperatorFunction<DataFrame[], string[]> => {
+    return (source) =>
+      source.pipe(
+        map((input) => {
+          const allNames: string[] = [];
+          const byName: KeyValue<boolean> = {};
+
+          for (const frame of input) {
+            for (const field of frame.fields) {
+              if (!okTypes.has(field.type)) {
+                continue;
+              }
+
+              const displayName = getFieldDisplayName(field, frame, input);
+
+              if (!byName[displayName]) {
+                byName[displayName] = true;
+                allNames.push(displayName);
+              }
+            }
+          }
+
+          return allNames;
+        })
+      );
+  };
+
+  const extractNamesAndSelected = (
+    configuredOptions: string[]
+  ): OperatorFunction<string[], { names: string[]; selected: string[] }> => {
+    return (source) =>
+      source.pipe(
+        map((allNames) => {
+          if (!configuredOptions.length) {
+            return { names: allNames, selected: [] };
+          }
+
+          const names: string[] = [];
+          const selected: string[] = [];
+
+          for (const v of allNames) {
+            if (configuredOptions.includes(v)) {
+              selected.push(v);
+            }
+            names.push(v);
+          }
+
+          return { names, selected };
+        })
+      );
+  };
+
+  const onToggleReplaceFields = (e: React.FormEvent<HTMLInputElement>) => {
+    onChange({
+      ...options,
+      replaceFields: e.currentTarget.checked,
+    });
+  };
+
+  const onModeChanged = (value: SelectableValue<CalculateFieldMode>) => {
+    const mode = value.value ?? CalculateFieldMode.BinaryOperation;
+    if (mode === CalculateFieldMode.WindowFunctions) {
+      options.window = options.window ?? defaultWindowOptions;
+    }
+    onChange({
+      ...options,
+      mode,
+    });
+  };
+
+  const onAliasChanged = (evt: ChangeEvent<HTMLInputElement>) => {
+    onChange({
+      ...options,
+      alias: evt.target.value,
+    });
+  };
+
+  const mode = options.mode ?? CalculateFieldMode.BinaryOperation;
+
+  return (
+    <>
+      <InlineField labelWidth={LABEL_WIDTH} label="Mode">
+        <Select
+          className="width-18"
+          options={calculationModes}
+          value={calculationModes.find((v) => v.value === mode)}
+          onChange={onModeChanged}
+        />
+      </InlineField>
+      {mode === CalculateFieldMode.BinaryOperation && (
+        <BinaryOperationOptionsEditor
+          options={options}
+          names={state.names}
+          onChange={props.onChange}
+        ></BinaryOperationOptionsEditor>
+      )}
+      {mode === CalculateFieldMode.UnaryOperation && (
+        <UnaryOperationEditor names={state.names} options={options} onChange={props.onChange}></UnaryOperationEditor>
+      )}
+      {mode === CalculateFieldMode.ReduceRow && (
+        <ReduceRowOptionsEditor
+          names={state.names}
+          selected={state.selected}
+          options={options}
+          onChange={props.onChange}
+        ></ReduceRowOptionsEditor>
+      )}
+      {mode === CalculateFieldMode.CumulativeFunctions && (
+        <CumulativeOptionsEditor
+          names={state.names}
+          options={options}
+          onChange={props.onChange}
+        ></CumulativeOptionsEditor>
+      )}
+      {mode === CalculateFieldMode.WindowFunctions && (
+        <WindowOptionsEditor names={state.names} options={options} onChange={props.onChange}></WindowOptionsEditor>
+      )}
+      {mode === CalculateFieldMode.Index && (
+        <IndexOptionsEditor options={options} onChange={props.onChange}></IndexOptionsEditor>
+      )}
+      <InlineField labelWidth={LABEL_WIDTH} label="Alias">
+        <Input
+          className="width-18"
+          value={options.alias ?? ''}
+          placeholder={getNameFromOptions(options)}
+          onChange={onAliasChanged}
+        />
+      </InlineField>
+      <InlineField labelWidth={LABEL_WIDTH} label="Replace all fields">
+        <InlineSwitch value={!!options.replaceFields} onChange={onToggleReplaceFields} />
+      </InlineField>
+    </>
+  );
+};
+
+export const calculateFieldTransformRegistryItem: TransformerRegistryItem<CalculateFieldTransformerOptions> = {
+  id: DataTransformerID.calculateField,
+  editor: CalculateFieldTransformerEditor,
+  transformation: standardTransformers.calculateFieldTransformer,
+  name: standardTransformers.calculateFieldTransformer.name,
+  description: 'Use the row values to calculate a new field.',
+  categories: new Set([TransformerCategory.CalculateNewFields]),
+  help: getTransformationContent(DataTransformerID.calculateField).helperDocs,
+};
diff --git a/public/app/features/transformers/editors/CalculateFieldTransformerEditor/CumulativeOptionsEditor.tsx b/public/app/features/transformers/editors/CalculateFieldTransformerEditor/CumulativeOptionsEditor.tsx
new file mode 100644
index 0000000000000..406a8745872f6
--- /dev/null
+++ b/public/app/features/transformers/editors/CalculateFieldTransformerEditor/CumulativeOptionsEditor.tsx
@@ -0,0 +1,66 @@
+import React from 'react';
+
+import { ReducerID, SelectableValue } from '@grafana/data';
+import {
+  CalculateFieldMode,
+  CalculateFieldTransformerOptions,
+  CumulativeOptions,
+} from '@grafana/data/src/transformations/transformers/calculateField';
+import { InlineField, Select, StatsPicker } from '@grafana/ui';
+
+import { LABEL_WIDTH } from './constants';
+
+export const CumulativeOptionsEditor = (props: {
+  options: CalculateFieldTransformerOptions;
+  names: string[];
+  onChange: (options: CalculateFieldTransformerOptions) => void;
+}) => {
+  const { names, onChange, options } = props;
+  const { cumulative } = options;
+  const selectOptions = names.map((v) => ({ label: v, value: v }));
+
+  const onCumulativeStatsChange = (stats: string[]) => {
+    const reducer = stats.length ? (stats[0] as ReducerID) : ReducerID.sum;
+
+    updateCumulativeOptions({ ...cumulative, reducer });
+  };
+
+  const updateCumulativeOptions = (v: CumulativeOptions) => {
+    onChange({
+      ...options,
+      mode: CalculateFieldMode.CumulativeFunctions,
+      cumulative: v,
+    });
+  };
+
+  const onCumulativeFieldChange = (v: SelectableValue<string>) => {
+    updateCumulativeOptions({
+      ...cumulative!,
+      field: v.value!,
+    });
+  };
+
+  return (
+    <>
+      <InlineField label="Field" labelWidth={LABEL_WIDTH}>
+        <Select
+          placeholder="Field"
+          options={selectOptions}
+          className="min-width-18"
+          value={cumulative?.field}
+          onChange={onCumulativeFieldChange}
+        />
+      </InlineField>
+      <InlineField label="Calculation" labelWidth={LABEL_WIDTH}>
+        <StatsPicker
+          allowMultiple={false}
+          className="width-18"
+          stats={[cumulative?.reducer || ReducerID.sum]}
+          onChange={onCumulativeStatsChange}
+          defaultStat={ReducerID.sum}
+          filterOptions={(ext) => ext.id === ReducerID.sum || ext.id === ReducerID.mean}
+        />
+      </InlineField>
+    </>
+  );
+};
diff --git a/public/app/features/transformers/editors/CalculateFieldTransformerEditor/IndexOptionsEditor.tsx b/public/app/features/transformers/editors/CalculateFieldTransformerEditor/IndexOptionsEditor.tsx
new file mode 100644
index 0000000000000..11da52db64750
--- /dev/null
+++ b/public/app/features/transformers/editors/CalculateFieldTransformerEditor/IndexOptionsEditor.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+
+import { CalculateFieldTransformerOptions } from '@grafana/data/src/transformations/transformers/calculateField';
+import { InlineField, InlineSwitch } from '@grafana/ui';
+
+import { LABEL_WIDTH } from './constants';
+
+export const IndexOptionsEditor = (props: {
+  options: CalculateFieldTransformerOptions;
+  onChange: (options: CalculateFieldTransformerOptions) => void;
+}) => {
+  const { options, onChange } = props;
+  const { index } = options;
+
+  const onToggleRowIndexAsPercentile = (e: React.FormEvent<HTMLInputElement>) => {
+    onChange({
+      ...options,
+      index: {
+        asPercentile: e.currentTarget.checked,
+      },
+    });
+  };
+  return (
+    <>
+      <InlineField labelWidth={LABEL_WIDTH} label="As percentile" tooltip="Transform the row index as a percentile.">
+        <InlineSwitch value={!!index?.asPercentile} onChange={onToggleRowIndexAsPercentile} />
+      </InlineField>
+    </>
+  );
+};
diff --git a/public/app/features/transformers/editors/CalculateFieldTransformerEditor/ReduceRowOptionsEditor.tsx b/public/app/features/transformers/editors/CalculateFieldTransformerEditor/ReduceRowOptionsEditor.tsx
new file mode 100644
index 0000000000000..f0875f7fd7a30
--- /dev/null
+++ b/public/app/features/transformers/editors/CalculateFieldTransformerEditor/ReduceRowOptionsEditor.tsx
@@ -0,0 +1,79 @@
+import React from 'react';
+
+import { ReducerID } from '@grafana/data';
+import {
+  CalculateFieldTransformerOptions,
+  ReduceOptions,
+} from '@grafana/data/src/transformations/transformers/calculateField';
+import { FilterPill, HorizontalGroup, InlineField, StatsPicker } from '@grafana/ui';
+
+import { LABEL_WIDTH } from './constants';
+
+export const ReduceRowOptionsEditor = (props: {
+  options: CalculateFieldTransformerOptions;
+  names: string[];
+  selected: string[];
+  onChange: (options: CalculateFieldTransformerOptions) => void;
+}) => {
+  const { names, selected, onChange, options } = props;
+  const { reduce } = options;
+
+  const updateReduceOptions = (v: ReduceOptions) => {
+    onChange({
+      ...options,
+      reduce: v,
+    });
+  };
+
+  const onFieldToggle = (fieldName: string) => {
+    if (selected.indexOf(fieldName) > -1) {
+      onReduceFieldsChanged(selected.filter((s) => s !== fieldName));
+    } else {
+      onReduceFieldsChanged([...selected, fieldName]);
+    }
+  };
+
+  const onReduceFieldsChanged = (selected: string[]) => {
+    updateReduceOptions({
+      ...reduce!,
+      include: selected,
+    });
+  };
+
+  const onStatsChange = (stats: string[]) => {
+    const reducer = stats.length ? (stats[0] as ReducerID) : ReducerID.sum;
+
+    const { reduce } = options;
+    updateReduceOptions({ ...reduce, reducer });
+  };
+
+  return (
+    <>
+      <InlineField label="Operation" labelWidth={LABEL_WIDTH} grow={true}>
+        <HorizontalGroup spacing="xs" align="flex-start" wrap>
+          {names.map((o, i) => {
+            return (
+              <FilterPill
+                key={`${o}/${i}`}
+                onClick={() => {
+                  onFieldToggle(o);
+                }}
+                label={o}
+                selected={selected.indexOf(o) > -1}
+              />
+            );
+          })}
+        </HorizontalGroup>
+      </InlineField>
+      <InlineField label="Calculation" labelWidth={LABEL_WIDTH}>
+        <StatsPicker
+          allowMultiple={false}
+          className="width-18"
+          stats={[reduce?.reducer || ReducerID.sum]}
+          onChange={onStatsChange}
+          defaultStat={ReducerID.sum}
+        />
+      </InlineField>
+    </>
+  );
+};
diff --git a/public/app/features/transformers/editors/CalculateFieldTransformerEditor/UnaryOperationEditor.tsx b/public/app/features/transformers/editors/CalculateFieldTransformerEditor/UnaryOperationEditor.tsx
new file mode 100644
index 0000000000000..849be7eb4b0df
--- /dev/null
+++ b/public/app/features/transformers/editors/CalculateFieldTransformerEditor/UnaryOperationEditor.tsx
@@ -0,0 +1,76 @@
+import React from 'react';
+
+import { unaryOperators, SelectableValue, UnaryOperationID } from '@grafana/data';
+import {
+  UnaryOptions,
+  CalculateFieldMode,
+  CalculateFieldTransformerOptions,
+} from '@grafana/data/src/transformations/transformers/calculateField';
+import { InlineField, InlineFieldRow, InlineLabel, Select } from '@grafana/ui';
+
+import { LABEL_WIDTH } from './constants';
+
+export const UnaryOperationEditor = (props: {
+  options: CalculateFieldTransformerOptions;
+  names: string[];
+  onChange: (options: CalculateFieldTransformerOptions) => void;
+}) => {
+  const { options, onChange } = props;
+  const { unary } = options;
+
+  const updateUnaryOptions = (v: UnaryOptions) => {
+    onChange({
+      ...options,
+      mode: CalculateFieldMode.UnaryOperation,
+      unary: v,
+    });
+  };
+
+  const onUnaryOperationChanged = (v: SelectableValue<UnaryOperationID>) => {
+    updateUnaryOptions({
+      ...unary!,
+      operator: v.value!,
+    });
+  };
+
+  const onUnaryValueChanged = (v: SelectableValue<string>) => {
+    updateUnaryOptions({
+      ...unary!,
+      fieldName: v.value!,
+    });
+  };
+
+  let found = !unary?.fieldName;
+  const names = props.names.map((v) => {
+    if (v === unary?.fieldName) {
+      found = true;
+    }
+    return { label: v, value: v };
+  });
+
+  const ops = unaryOperators.list().map((v) => {
+    return { label: v.unaryOperationID, value: v.unaryOperationID };
+  });
+
+  const fieldName = found ? names : [...names, { label: unary?.fieldName, value: unary?.fieldName }];
+
+  return (
+    <>
+      <InlineFieldRow>
+        <InlineField label="Operation" labelWidth={LABEL_WIDTH}>
+          <Select options={ops} value={unary?.operator ?? ops[0].value} onChange={onUnaryOperationChanged} />
+        </InlineField>
+        <InlineField label="(" labelWidth={2}>
+          <Select
+            placeholder="Field"
+            className="min-width-11"
+            options={fieldName}
+            value={unary?.fieldName}
+            onChange={onUnaryValueChanged}
+          />
+        </InlineField>
+        <InlineLabel width={2}>)</InlineLabel>
+      </InlineFieldRow>
+    </>
+  );
+};
diff --git a/public/app/features/transformers/editors/CalculateFieldTransformerEditor/WindowOptionsEditor.tsx b/public/app/features/transformers/editors/CalculateFieldTransformerEditor/WindowOptionsEditor.tsx
new file mode 100644
index 0000000000000..05b10b6e36c30
--- /dev/null
+++ b/public/app/features/transformers/editors/CalculateFieldTransformerEditor/WindowOptionsEditor.tsx
@@ -0,0 +1,139 @@
+import React from 'react';
+
+import { ReducerID, SelectableValue } from '@grafana/data';
+import {
+  CalculateFieldMode,
+  WindowAlignment,
+  CalculateFieldTransformerOptions,
+  WindowOptions,
+  WindowSizeMode,
+} from '@grafana/data/src/transformations/transformers/calculateField';
+import { InlineField, RadioButtonGroup, Select, StatsPicker } from '@grafana/ui';
+import { NumberInput } from 'app/core/components/OptionsUI/NumberInput';
+
+import { LABEL_WIDTH } from './constants';
+
+export const WindowOptionsEditor = (props: {
+  options: CalculateFieldTransformerOptions;
+  names: string[];
+  onChange: (options: CalculateFieldTransformerOptions) => void;
+}) => {
+  const { options, names, onChange } = props;
+  const { window } = options;
+  const selectOptions = names.map((v) => ({ label: v, value: v }));
+  const typeOptions = [
+    { label: 'Trailing', value: WindowAlignment.Trailing },
+    { label: 'Centered', value: WindowAlignment.Centered },
+  ];
+  const windowSizeModeOptions = [
+    { label: 'Percentage', value: WindowSizeMode.Percentage },
+    { label: 'Fixed', value: WindowSizeMode.Fixed },
+  ];
+
+  const updateWindowOptions = (v: WindowOptions) => {
+    onChange({
+      ...options,
+      mode: CalculateFieldMode.WindowFunctions,
+      window: v,
+    });
+  };
+
+  const onWindowFieldChange = (v: SelectableValue<string>) => {
+    updateWindowOptions({
+      ...window!,
+      field: v.value!,
+    });
+  };
+
+  const onWindowSizeChange = (v?: number) => {
+    updateWindowOptions({
+      ...window!,
+      windowSize: v && window?.windowSizeMode === WindowSizeMode.Percentage ? v / 100 : v,
+    });
+  };
+
+  const onWindowSizeModeChange = (val: WindowSizeMode) => {
+    updateWindowOptions({
+      ...window!,
+      windowSize: window?.windowSize
+        ? val === WindowSizeMode.Percentage
+          ? window!.windowSize! / 100
+          : window!.windowSize! * 100
+        : undefined,
+      windowSizeMode: val,
+    });
+  };
+
+  const onWindowStatsChange = (stats: string[]) => {
+    const reducer = stats.length ? (stats[0] as ReducerID) : ReducerID.sum;
+
+    updateWindowOptions({ ...window, reducer });
+  };
+
+  const onTypeChange = (val: WindowAlignment) => {
+    updateWindowOptions({
+      ...window!,
+      windowAlignment: val,
+    });
+  };
+
+  return (
+    <>
+      <InlineField label="Field" labelWidth={LABEL_WIDTH}>
+        <Select
+          placeholder="Field"
+          options={selectOptions}
+          className="min-width-18"
+          value={window?.field}
+          onChange={onWindowFieldChange}
+        />
+      </InlineField>
+      <InlineField label="Calculation" labelWidth={LABEL_WIDTH}>
+        <StatsPicker
+          allowMultiple={false}
+          className="width-18"
+          stats={[window?.reducer || ReducerID.mean]}
+          onChange={onWindowStatsChange}
+          defaultStat={ReducerID.mean}
+          filterOptions={(ext) =>
+            ext.id === ReducerID.mean || ext.id === ReducerID.variance || ext.id === ReducerID.stdDev
+          }
+        />
+      </InlineField>
+      <InlineField label="Type" labelWidth={LABEL_WIDTH}>
+        <RadioButtonGroup
+          value={window?.windowAlignment ?? WindowAlignment.Trailing}
+          options={typeOptions}
+          onChange={onTypeChange}
+        />
+      </InlineField>
+      <InlineField label="Window size mode">
+        <RadioButtonGroup
+          value={window?.windowSizeMode ?? WindowSizeMode.Percentage}
+          options={windowSizeModeOptions}
+          onChange={onWindowSizeModeChange}
+        ></RadioButtonGroup>
+      </InlineField>
+      <InlineField
+        label={window?.windowSizeMode === WindowSizeMode.Percentage ? 'Window size %' : 'Window size'}
+        labelWidth={LABEL_WIDTH}
+        tooltip={
+          window?.windowSizeMode === WindowSizeMode.Percentage
+            ? 'Set the window size as a percentage of the total data'
+            : 'Window size'
+        }
+      >
+        <NumberInput
+          placeholder="Auto"
+          min={0.1}
+          value={
+            window?.windowSize && window.windowSizeMode === WindowSizeMode.Percentage
+              ? window.windowSize * 100
+              : window?.windowSize
+          }
+          onChange={onWindowSizeChange}
+        ></NumberInput>
+      </InlineField>
+    </>
+  );
+};
diff --git a/public/app/features/transformers/editors/CalculateFieldTransformerEditor/constants.ts b/public/app/features/transformers/editors/CalculateFieldTransformerEditor/constants.ts
new file mode 100644
index 0000000000000..49e3214f01092
--- /dev/null
+++ b/public/app/features/transformers/editors/CalculateFieldTransformerEditor/constants.ts
@@ -0,0 +1 @@
+export const LABEL_WIDTH = 16;
diff --git a/public/app/features/transformers/editors/CalculateFieldTransformerEditor/index.ts b/public/app/features/transformers/editors/CalculateFieldTransformerEditor/index.ts
new file mode 100644
index 0000000000000..0772bb9cd0014
--- /dev/null
+++ b/public/app/features/transformers/editors/CalculateFieldTransformerEditor/index.ts
@@ -0,0 +1,6 @@
+import {
+  CalculateFieldTransformerEditor,
+  calculateFieldTransformRegistryItem,
+} from './CalculateFieldTransformerEditor';
+
+export { CalculateFieldTransformerEditor, calculateFieldTransformRegistryItem };
diff --git a/public/app/features/transformers/editors/ConcatenateTransformerEditor.tsx b/public/app/features/transformers/editors/ConcatenateTransformerEditor.tsx
index e56567c1f8b9f..e61ddfd8a3c9a 100644
--- a/public/app/features/transformers/editors/ConcatenateTransformerEditor.tsx
+++ b/public/app/features/transformers/editors/ConcatenateTransformerEditor.tsx
@@ -12,7 +12,9 @@ import {
   ConcatenateFrameNameMode,
   ConcatenateTransformerOptions,
 } from '@grafana/data/src/transformations/transformers/concat';
-import { Input, Select } from '@grafana/ui';
+import { InlineField, Input, Select } from '@grafana/ui';
+
+import { getTransformationContent } from '../docs/getTransformationContent';
 
 interface ConcatenateTransformerEditorProps extends TransformerUIProps<ConcatenateTransformerOptions> {}
 
@@ -55,29 +57,18 @@ export class ConcatenateTransformerEditor extends React.PureComponent<Concatenat
 
     return (
       <div>
-        <div className="gf-form-inline">
-          <div className="gf-form">
-            <div className="gf-form-label width-8">Name</div>
-            <Select
-              className="width-18"
-              options={nameModes}
-              value={nameModes.find((v) => v.value === frameNameMode)}
-              onChange={this.onModeChanged}
-            />
-          </div>
-        </div>
+        <InlineField label="Name" labelWidth={16} grow>
+          <Select
+            width={36}
+            options={nameModes}
+            value={nameModes.find((v) => v.value === frameNameMode)}
+            onChange={this.onModeChanged}
+          />
+        </InlineField>
         {frameNameMode === ConcatenateFrameNameMode.Label && (
-          <div className="gf-form-inline">
-            <div className="gf-form">
-              <div className="gf-form-label width-8">Label</div>
-              <Input
-                className="width-18"
-                value={options.frameNameLabel ?? ''}
-                placeholder="frame"
-                onChange={this.onLabelChanged}
-              />
-            </div>
-          </div>
+          <InlineField label="Label" labelWidth={16} grow>
+            <Input width={36} value={options.frameNameLabel ?? ''} placeholder="frame" onChange={this.onLabelChanged} />
+          </InlineField>
         )}
       </div>
     );
@@ -88,8 +79,9 @@ export const concatenateTransformRegistryItem: TransformerRegistryItem<Concatena
   id: DataTransformerID.concatenate,
   editor: ConcatenateTransformerEditor,
   transformation: standardTransformers.concatenateTransformer,
-  name: 'Concatenate fields',
+  name: standardTransformers.concatenateTransformer.name,
   description:
     'Combine all fields into a single frame.  Values will be appended with undefined values if not the same length.',
   categories: new Set([TransformerCategory.Combine]),
+  help: getTransformationContent(DataTransformerID.concatenate).helperDocs,
 };
diff --git a/public/app/features/transformers/editors/ConvertFieldTypeTransformerEditor.tsx b/public/app/features/transformers/editors/ConvertFieldTypeTransformerEditor.tsx
index 8c02c19d3ba38..ba6793ecd7655 100644
--- a/public/app/features/transformers/editors/ConvertFieldTypeTransformerEditor.tsx
+++ b/public/app/features/transformers/editors/ConvertFieldTypeTransformerEditor.tsx
@@ -19,11 +19,13 @@ import {
 import { Button, InlineField, InlineFieldRow, Input, Select } from '@grafana/ui';
 import { FieldNamePicker } from '@grafana/ui/src/components/MatchersUI/FieldNamePicker';
 import { allFieldTypeIconOptions } from '@grafana/ui/src/components/MatchersUI/FieldTypeMatcherEditor';
-import { hasAlphaPanels } from 'app/core/config';
 import { findField } from 'app/features/dimensions';
 
+import { getTransformationContent } from '../docs/getTransformationContent';
 import { getTimezoneOptions } from '../utils';
 
+import { EnumMappingEditor } from './EnumMappingEditor';
+
 const fieldNamePickerSettings = {
   settings: { width: 24, isClearable: false },
 } as StandardEditorsRegistryItem<string, FieldNamePickerConfigSettings>;
@@ -80,6 +82,18 @@ export const ConvertFieldTypeTransformerEditor = ({
     [onChange, options]
   );
 
+  const onJoinWithChange = useCallback(
+    (idx: number) => (e: ChangeEvent<HTMLInputElement>) => {
+      const conversions = options.conversions;
+      conversions[idx] = { ...conversions[idx], joinWith: e.currentTarget.value };
+      onChange({
+        ...options,
+        conversions: conversions,
+      });
+    },
+    [onChange, options]
+  );
+
   const onAddConvertFieldType = useCallback(() => {
     onChange({
       ...options,
@@ -117,6 +131,7 @@ export const ConvertFieldTypeTransformerEditor = ({
   return (
     <>
       {options.conversions.map((c: ConvertFieldTypeOptions, idx: number) => {
+        const targetField = findField(input?.[0], c.targetField);
         return (
           <div key={`${c.targetField}-${idx}`}>
             <InlineFieldRow>
@@ -150,22 +165,31 @@ export const ConvertFieldTypeTransformerEditor = ({
                   />
                 </InlineField>
               )}
-              {c.destinationType === FieldType.string &&
-                (c.dateFormat || findField(input?.[0], c.targetField)?.type === FieldType.time) && (
-                  <>
-                    <InlineField label="Date format" tooltip="Specify the output format.">
-                      <Input
-                        value={c.dateFormat}
-                        placeholder={'e.g. YYYY-MM-DD'}
-                        onChange={onInputFormat(idx)}
-                        width={24}
-                      />
+              {c.destinationType === FieldType.string && (
+                <>
+                  {(c.joinWith?.length || targetField?.type === FieldType.other) && (
+                    <InlineField label="Join with" tooltip="Use an explicit separator when joining array values">
+                      <Input value={c.joinWith} placeholder={'JSON'} onChange={onJoinWithChange(idx)} width={9} />
                     </InlineField>
-                    <InlineField label="Set timezone" tooltip="Set the timezone of the date manually">
-                      <Select options={timeZoneOptions} value={c.timezone} onChange={onTzChange(idx)} isClearable />
-                    </InlineField>
-                  </>
-                )}
+                  )}
+                  {c.dateFormat ||
+                    (targetField?.type === FieldType.time && (
+                      <>
+                        <InlineField label="Date format" tooltip="Specify the output format.">
+                          <Input
+                            value={c.dateFormat}
+                            placeholder={'e.g. YYYY-MM-DD'}
+                            onChange={onInputFormat(idx)}
+                            width={24}
+                          />
+                        </InlineField>
+                        <InlineField label="Set timezone" tooltip="Set the timezone of the date manually">
+                          <Select options={timeZoneOptions} value={c.timezone} onChange={onTzChange(idx)} isClearable />
+                        </InlineField>
+                      </>
+                    ))}
+                </>
+              )}
               <Button
                 size="md"
                 icon="trash-alt"
@@ -174,12 +198,8 @@ export const ConvertFieldTypeTransformerEditor = ({
                 aria-label={'Remove convert field type transformer'}
               />
             </InlineFieldRow>
-            {c.destinationType === FieldType.enum && hasAlphaPanels && (
-              <InlineFieldRow>
-                <InlineField label={''} labelWidth={6}>
-                  <div>TODO... show options here (alpha panels enabled)</div>
-                </InlineField>
-              </InlineFieldRow>
+            {c.destinationType === FieldType.enum && (
+              <EnumMappingEditor input={input} options={options} transformIndex={idx} onChange={onChange} />
             )}
           </div>
         );
@@ -204,4 +224,5 @@ export const convertFieldTypeTransformRegistryItem: TransformerRegistryItem<Conv
   name: standardTransformers.convertFieldTypeTransformer.name,
   description: standardTransformers.convertFieldTypeTransformer.description,
   categories: new Set([TransformerCategory.Reformat]),
+  help: getTransformationContent(DataTransformerID.convertFieldType).helperDocs,
 };
diff --git a/public/app/features/transformers/editors/EnumMappingEditor.tsx b/public/app/features/transformers/editors/EnumMappingEditor.tsx
new file mode 100644
index 0000000000000..b8ef06e2d3083
--- /dev/null
+++ b/public/app/features/transformers/editors/EnumMappingEditor.tsx
@@ -0,0 +1,175 @@
+import { css } from '@emotion/css';
+import { isEqual } from 'lodash';
+import React, { useEffect, useState } from 'react';
+import { DragDropContext, Droppable, DropResult } from 'react-beautiful-dnd';
+
+import { DataFrame, EnumFieldConfig, GrafanaTheme2 } from '@grafana/data';
+import { ConvertFieldTypeTransformerOptions } from '@grafana/data/src/transformations/transformers/convertFieldType';
+import { Button, HorizontalGroup, InlineFieldRow, useStyles2, VerticalGroup } from '@grafana/ui';
+
+import EnumMappingRow from './EnumMappingRow';
+
+type EnumMappingEditorProps = {
+  input: DataFrame[];
+  options: ConvertFieldTypeTransformerOptions;
+  transformIndex: number;
+  onChange: (options: ConvertFieldTypeTransformerOptions) => void;
+};
+
+export const EnumMappingEditor = ({ input, options, transformIndex, onChange }: EnumMappingEditorProps) => {
+  const styles = useStyles2(getStyles);
+
+  const [enumRows, updateEnumRows] = useState<string[]>(options.conversions[transformIndex].enumConfig?.text ?? []);
+
+  // Generate enum values from scratch when none exist in save model
+  useEffect(() => {
+    // TODO: consider case when changing target field
+    if (!options.conversions[transformIndex].enumConfig?.text?.length && input.length) {
+      generateEnumValues();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [input]);
+
+  // Apply enum config to save model when enumRows change
+  useEffect(() => {
+    const applyEnumConfig = () => {
+      const textValues = enumRows.map((value) => value);
+      const conversions = options.conversions;
+      const enumConfig: EnumFieldConfig = { text: textValues };
+      conversions[transformIndex] = { ...conversions[transformIndex], enumConfig };
+
+      onChange({
+        ...options,
+        conversions: conversions,
+      });
+    };
+
+    applyEnumConfig();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [transformIndex, enumRows]);
+
+  const generateEnumValues = () => {
+    // Loop through all fields in provided data frames to find the target field
+    const targetField = input
+      .flatMap((inputItem) => inputItem?.fields ?? [])
+      .find((field) => field.name === options.conversions[transformIndex].targetField);
+
+    if (!targetField) {
+      return;
+    }
+
+    const enumValues = new Set(targetField?.values);
+
+    if (enumRows.length > 0 && !isEqual(enumRows, Array.from(enumValues))) {
+      const confirmed = window.confirm(
+        'This action will overwrite the existing configuration. Are you sure you want to continue?'
+      );
+      if (!confirmed) {
+        return;
+      }
+    }
+
+    updateEnumRows([...enumValues]);
+  };
+
+  const onChangeEnumMapping = (index: number, enumRow: string) => {
+    const newList = [...enumRows];
+    newList.splice(index, 1, enumRow);
+    updateEnumRows(newList);
+  };
+
+  const onRemoveEnumRow = (index: number) => {
+    const newList = [...enumRows];
+    newList.splice(index, 1);
+    updateEnumRows(newList);
+  };
+
+  const onAddEnumRow = () => {
+    updateEnumRows(['', ...enumRows]);
+  };
+
+  const onChangeEnumValue = (index: number, value: string) => {
+    if (enumRows.includes(value)) {
+      // Do not allow duplicate enum values
+      return;
+    }
+
+    onChangeEnumMapping(index, value);
+  };
+
+  const checkIsEnumUniqueValue = (value: string) => {
+    return enumRows.includes(value);
+  };
+
+  const onDragEnd = (result: DropResult) => {
+    if (!result.destination) {
+      return;
+    }
+
+    // Conversion necessary to match the order of enum values to the order shown in the visualization
+    const mappedSourceIndex = enumRows.length - result.source.index - 1;
+    const mappedDestinationIndex = enumRows.length - result.destination.index - 1;
+
+    const copy = [...enumRows];
+    const element = copy[mappedSourceIndex];
+    copy.splice(mappedSourceIndex, 1);
+    copy.splice(mappedDestinationIndex, 0, element);
+    updateEnumRows(copy);
+  };
+
+  return (
+    <InlineFieldRow>
+      <HorizontalGroup>
+        <Button size="sm" icon="plus" onClick={() => generateEnumValues()} className={styles.button}>
+          Generate enum values from data
+        </Button>
+        <Button size="sm" icon="plus" onClick={() => onAddEnumRow()} className={styles.button}>
+          Add enum value
+        </Button>
+      </HorizontalGroup>
+
+      <VerticalGroup>
+        <table className={styles.compactTable}>
+          <DragDropContext onDragEnd={onDragEnd}>
+            <Droppable droppableId="sortable-enum-config-mappings" direction="vertical">
+              {(provided) => (
+                <tbody ref={provided.innerRef} {...provided.droppableProps}>
+                  {[...enumRows].reverse().map((value: string, index: number) => {
+                    // Reverse the order of the enum values to match the order of the enum values in the table to the order in the visualization
+                    const mappedIndex = enumRows.length - index - 1;
+                    return (
+                      <EnumMappingRow
+                        key={`${transformIndex}/${value}`}
+                        transformIndex={transformIndex}
+                        value={value}
+                        index={index}
+                        mappedIndex={mappedIndex}
+                        onChangeEnumValue={onChangeEnumValue}
+                        onRemoveEnumRow={onRemoveEnumRow}
+                        checkIsEnumUniqueValue={checkIsEnumUniqueValue}
+                      />
+                    );
+                  })}
+                  {provided.placeholder}
+                </tbody>
+              )}
+            </Droppable>
+          </DragDropContext>
+        </table>
+      </VerticalGroup>
+    </InlineFieldRow>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  compactTable: css({
+    'tbody td': {
+      padding: theme.spacing(0.5),
+    },
+    marginTop: theme.spacing(1),
+    marginBottom: theme.spacing(2),
+  }),
+  button: css({
+    marginTop: theme.spacing(1),
+  }),
+});
diff --git a/public/app/features/transformers/editors/EnumMappingRow.tsx b/public/app/features/transformers/editors/EnumMappingRow.tsx
new file mode 100644
index 0000000000000..52861b7d6ceab
--- /dev/null
+++ b/public/app/features/transformers/editors/EnumMappingRow.tsx
@@ -0,0 +1,144 @@
+import { css } from '@emotion/css';
+import React, { FormEvent, useState, KeyboardEvent, useRef, useEffect } from 'react';
+import { Draggable } from 'react-beautiful-dnd';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Icon, Input, IconButton, HorizontalGroup, FieldValidationMessage, useStyles2 } from '@grafana/ui';
+
+type EnumMappingRowProps = {
+  transformIndex: number;
+  value: string;
+  index: number;
+  mappedIndex: number;
+  onChangeEnumValue: (index: number, value: string) => void;
+  onRemoveEnumRow: (index: number) => void;
+  checkIsEnumUniqueValue: (value: string) => boolean;
+};
+
+const EnumMappingRow = ({
+  transformIndex,
+  value,
+  index,
+  mappedIndex,
+  onChangeEnumValue,
+  onRemoveEnumRow,
+  checkIsEnumUniqueValue,
+}: EnumMappingRowProps) => {
+  const styles = useStyles2(getStyles);
+
+  const [enumValue, setEnumValue] = useState<string>(value);
+  // If the enum value is empty, we assume it is a new row and should be editable
+  const [isEditing, setIsEditing] = useState<boolean>(enumValue === '');
+  const [validationError, setValidationError] = useState<string | null>(null);
+
+  const inputRef = useRef<HTMLInputElement>(null);
+
+  // Focus the input field if it is rendered
+  useEffect(() => {
+    if (inputRef.current) {
+      inputRef.current.focus();
+    }
+  }, [inputRef]);
+
+  const onEnumInputChange = (event: FormEvent<HTMLInputElement>) => {
+    if (
+      event.currentTarget.value !== '' &&
+      checkIsEnumUniqueValue(event.currentTarget.value) &&
+      event.currentTarget.value !== value
+    ) {
+      setValidationError('Enum value already exists');
+    } else {
+      setValidationError(null);
+    }
+
+    setEnumValue(event.currentTarget.value);
+  };
+
+  const onEnumInputBlur = () => {
+    setIsEditing(false);
+    setValidationError(null);
+
+    // Do not add empty or duplicate enum values
+    if (enumValue === '' || validationError !== null) {
+      onRemoveEnumRow(mappedIndex);
+      return;
+    }
+
+    onChangeEnumValue(mappedIndex, enumValue);
+  };
+
+  const onEnumInputKeyDown = (event: KeyboardEvent<HTMLInputElement>) => {
+    if (event.key === 'Enter') {
+      event.preventDefault();
+      onEnumInputBlur();
+    }
+  };
+
+  const onEnumValueClick = () => {
+    setIsEditing(true);
+  };
+
+  const onRemoveButtonClick = () => {
+    onRemoveEnumRow(mappedIndex);
+  };
+
+  return (
+    <Draggable key={`${transformIndex}/${value}`} draggableId={`${transformIndex}/${value}`} index={index}>
+      {(provided) => (
+        <tr key={index} ref={provided.innerRef} {...provided.draggableProps}>
+          <td>
+            <div className={styles.dragHandle} {...provided.dragHandleProps}>
+              <Icon name="draggabledots" size="lg" />
+            </div>
+          </td>
+          {isEditing ? (
+            <td>
+              <Input
+                ref={inputRef}
+                type="text"
+                value={enumValue}
+                onChange={onEnumInputChange}
+                onBlur={onEnumInputBlur}
+                onKeyDown={onEnumInputKeyDown}
+              />
+              {validationError && <FieldValidationMessage>{validationError}</FieldValidationMessage>}
+            </td>
+          ) : (
+            <td onClick={onEnumValueClick} className={styles.clickableTableCell}>
+              {value && value !== '' ? value : 'Click to edit'}
+            </td>
+          )}
+          <td className={styles.textAlignCenter}>
+            <HorizontalGroup spacing="sm">
+              <IconButton
+                name="trash-alt"
+                onClick={onRemoveButtonClick}
+                data-testid="remove-enum-row"
+                aria-label="Delete enum row"
+                tooltip="Delete"
+              />
+            </HorizontalGroup>
+          </td>
+        </tr>
+      )}
+    </Draggable>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  dragHandle: css({
+    cursor: 'grab',
+  }),
+  textAlignCenter: css({
+    textAlign: 'center',
+  }),
+  clickableTableCell: css({
+    cursor: 'pointer',
+    width: '100px',
+    '&:hover': {
+      color: theme.colors.text.maxContrast,
+    },
+  }),
+});
+
+export default EnumMappingRow;
diff --git a/public/app/features/transformers/editors/FilterByNameTransformerEditor.tsx b/public/app/features/transformers/editors/FilterByNameTransformerEditor.tsx
index 9c9d675ea5878..cb86ff82bdf01 100644
--- a/public/app/features/transformers/editors/FilterByNameTransformerEditor.tsx
+++ b/public/app/features/transformers/editors/FilterByNameTransformerEditor.tsx
@@ -15,6 +15,8 @@ import { FilterFieldsByNameTransformerOptions } from '@grafana/data/src/transfor
 import { getTemplateSrv } from '@grafana/runtime/src/services';
 import { Input, FilterPill, InlineFieldRow, InlineField, InlineSwitch, Select } from '@grafana/ui';
 
+import { getTransformationContent } from '../docs/getTransformationContent';
+
 interface FilterByNameTransformerEditorProps extends TransformerUIProps<FilterFieldsByNameTransformerOptions> {}
 
 interface FilterByNameTransformerEditorState {
@@ -251,7 +253,8 @@ export const filterFieldsByNameTransformRegistryItem: TransformerRegistryItem<Fi
   id: DataTransformerID.filterFieldsByName,
   editor: FilterByNameTransformerEditor,
   transformation: standardTransformers.filterFieldsByNameTransformer,
-  name: 'Filter by name',
+  name: standardTransformers.filterFieldsByNameTransformer.name,
   description: 'Removes part of the query results using a regex pattern. The pattern can be inclusive or exclusive.',
   categories: new Set([TransformerCategory.Filter]),
+  help: getTransformationContent(DataTransformerID.filterFieldsByName).helperDocs,
 };
diff --git a/public/app/features/transformers/editors/FilterByRefIdTransformerEditor.tsx b/public/app/features/transformers/editors/FilterByRefIdTransformerEditor.tsx
index ba279b00e2a13..c1c13ca97f139 100644
--- a/public/app/features/transformers/editors/FilterByRefIdTransformerEditor.tsx
+++ b/public/app/features/transformers/editors/FilterByRefIdTransformerEditor.tsx
@@ -9,7 +9,9 @@ import {
   TransformerCategory,
 } from '@grafana/data';
 import { FilterFramesByRefIdTransformerOptions } from '@grafana/data/src/transformations/transformers/filterByRefId';
-import { HorizontalGroup, FilterPill, FieldValidationMessage } from '@grafana/ui';
+import { HorizontalGroup, FilterPill, FieldValidationMessage, InlineField } from '@grafana/ui';
+
+import { getTransformationContent } from '../docs/getTransformationContent';
 
 interface FilterByRefIdTransformerEditorProps extends TransformerUIProps<FilterFramesByRefIdTransformerOptions> {}
 
@@ -112,27 +114,24 @@ export class FilterByRefIdTransformerEditor extends React.PureComponent<
             <FieldValidationMessage>Filter data by query expects multiple queries in the input.</FieldValidationMessage>
           </div>
         )}
-        <div className="gf-form-inline">
-          <div className="gf-form gf-form--grow">
-            <div className="gf-form-label width-8">Series refId</div>
-            <HorizontalGroup spacing="xs" align="flex-start" wrap>
-              {options.map((o, i) => {
-                const label = `${o.refId}${o.count > 1 ? ' (' + o.count + ')' : ''}`;
-                const isSelected = selected.indexOf(o.refId) > -1;
-                return (
-                  <FilterPill
-                    key={`${o.refId}/${i}`}
-                    onClick={() => {
-                      this.onFieldToggle(o.refId);
-                    }}
-                    label={label}
-                    selected={isSelected}
-                  />
-                );
-              })}
-            </HorizontalGroup>
-          </div>
-        </div>
+        <InlineField label="Series refId" labelWidth={16} shrink>
+          <HorizontalGroup spacing="xs" align="flex-start" wrap>
+            {options.map((o, i) => {
+              const label = `${o.refId}${o.count > 1 ? ' (' + o.count + ')' : ''}`;
+              const isSelected = selected.indexOf(o.refId) > -1;
+              return (
+                <FilterPill
+                  key={`${o.refId}/${i}`}
+                  onClick={() => {
+                    this.onFieldToggle(o.refId);
+                  }}
+                  label={label}
+                  selected={isSelected}
+                />
+              );
+            })}
+          </HorizontalGroup>
+        </InlineField>
       </>
     );
   }
@@ -143,8 +142,9 @@ export const filterFramesByRefIdTransformRegistryItem: TransformerRegistryItem<F
     id: DataTransformerID.filterByRefId,
     editor: FilterByRefIdTransformerEditor,
     transformation: standardTransformers.filterFramesByRefIdTransformer,
-    name: 'Filter data by query',
+    name: standardTransformers.filterFramesByRefIdTransformer.name,
     description:
       'Filter data by query. This is useful if you are sharing the results from a different panel that has many queries and you want to only visualize a subset of that in this panel.',
     categories: new Set([TransformerCategory.Filter]),
+    help: getTransformationContent(DataTransformerID.filterByRefId).helperDocs,
   };
diff --git a/public/app/features/transformers/editors/FormatTimeTransformerEditor.tsx b/public/app/features/transformers/editors/FormatTimeTransformerEditor.tsx
index 402bdd1aa7c46..9df14736b201a 100644
--- a/public/app/features/transformers/editors/FormatTimeTransformerEditor.tsx
+++ b/public/app/features/transformers/editors/FormatTimeTransformerEditor.tsx
@@ -12,6 +12,7 @@ import {
 import { FormatTimeTransformerOptions } from '@grafana/data/src/transformations/transformers/formatTime';
 import { Select, InlineFieldRow, InlineField, Input } from '@grafana/ui';
 
+import { getTransformationContent } from '../docs/getTransformationContent';
 import { getTimezoneOptions } from '../utils';
 
 export function FormatTimeTransfomerEditor({
@@ -109,4 +110,5 @@ export const formatTimeTransformerRegistryItem: TransformerRegistryItem<FormatTi
   name: standardTransformers.formatTimeTransformer.name,
   state: PluginState.alpha,
   description: standardTransformers.formatTimeTransformer.description,
+  help: getTransformationContent(DataTransformerID.formatTime).helperDocs,
 };
diff --git a/public/app/features/transformers/editors/GroupByTransformerEditor.tsx b/public/app/features/transformers/editors/GroupByTransformerEditor.tsx
index 41dac28ea971c..50177ea8912c2 100644
--- a/public/app/features/transformers/editors/GroupByTransformerEditor.tsx
+++ b/public/app/features/transformers/editors/GroupByTransformerEditor.tsx
@@ -16,9 +16,9 @@ import {
   GroupByOperationID,
   GroupByTransformerOptions,
 } from '@grafana/data/src/transformations/transformers/groupBy';
-import { Stack } from '@grafana/experimental';
-import { useTheme2, Select, StatsPicker, InlineField } from '@grafana/ui';
+import { useTheme2, Select, StatsPicker, InlineField, Stack, Alert } from '@grafana/ui';
 
+import { getTransformationContent } from '../docs/getTransformationContent';
 import { useAllFieldNamesFromDataFrames } from '../utils';
 
 interface FieldProps {
@@ -49,8 +49,28 @@ export const GroupByTransformerEditor = ({
     [onChange]
   );
 
+  // See if there's both an aggregation and grouping field configured
+  // for calculations. If not we display a warning because there
+  // needs to be a grouping for the calculation to have effect
+  let hasGrouping,
+    hasAggregation = false;
+
+  for (const field of Object.values(options.fields)) {
+    if (field.aggregations.length > 0 && field.operation !== null) {
+      hasAggregation = true;
+    }
+    if (field.operation === GroupByOperationID.groupBy) {
+      hasGrouping = true;
+    }
+  }
+
+  const showCalcAlert = hasAggregation && !hasGrouping;
+
   return (
-    <div>
+    <Stack direction="column">
+      {showCalcAlert && (
+        <Alert title="Calculations will not have an effect if no fields are being grouped on." severity="warning" />
+      )}
       {fieldNames.map((key) => (
         <GroupByFieldConfiguration
           onConfigChange={onConfigChange(key)}
@@ -59,7 +79,7 @@ export const GroupByTransformerEditor = ({
           key={key}
         />
       ))}
-    </div>
+    </Stack>
   );
 };
 
@@ -84,7 +104,7 @@ export const GroupByFieldConfiguration = ({ fieldName, config, onConfigChange }:
 
   return (
     <InlineField className={styles.label} label={fieldName} grow shrink>
-      <Stack gap={0.5} direction="row" wrap={false}>
+      <Stack gap={0.5} direction="row">
         <div className={styles.operation}>
           <Select options={options} value={config?.operation} placeholder="Ignored" onChange={onChange} isClearable />
         </div>
@@ -134,4 +154,5 @@ export const groupByTransformRegistryItem: TransformerRegistryItem<GroupByTransf
     TransformerCategory.CalculateNewFields,
     TransformerCategory.Reformat,
   ]),
+  help: getTransformationContent(DataTransformerID.groupBy).helperDocs,
 };
diff --git a/public/app/features/transformers/editors/GroupToNestedTableTransformerEditor.tsx b/public/app/features/transformers/editors/GroupToNestedTableTransformerEditor.tsx
new file mode 100644
index 0000000000000..2811235c4609d
--- /dev/null
+++ b/public/app/features/transformers/editors/GroupToNestedTableTransformerEditor.tsx
@@ -0,0 +1,185 @@
+import { css } from '@emotion/css';
+import React, { useCallback } from 'react';
+
+import {
+  DataTransformerID,
+  ReducerID,
+  SelectableValue,
+  standardTransformers,
+  TransformerRegistryItem,
+  TransformerUIProps,
+  TransformerCategory,
+  GrafanaTheme2,
+} from '@grafana/data';
+import {
+  GroupByFieldOptions,
+  GroupByOperationID,
+  GroupByTransformerOptions,
+} from '@grafana/data/src/transformations/transformers/groupBy';
+import {
+  GroupToNestedTableTransformerOptions,
+  SHOW_NESTED_HEADERS_DEFAULT,
+} from '@grafana/data/src/transformations/transformers/groupToNestedTable';
+import { Stack } from '@grafana/experimental';
+import { useTheme2, Select, StatsPicker, InlineField, Field, Switch, Alert } from '@grafana/ui';
+
+import { useAllFieldNamesFromDataFrames } from '../utils';
+
+interface FieldProps {
+  fieldName: string;
+  config?: GroupByFieldOptions;
+  onConfigChange: (config: GroupByFieldOptions) => void;
+}
+
+export const GroupToNestedTableTransformerEditor = ({
+  input,
+  options,
+  onChange,
+}: TransformerUIProps<GroupToNestedTableTransformerOptions>) => {
+  const fieldNames = useAllFieldNamesFromDataFrames(input);
+  const showHeaders =
+    options.showSubframeHeaders === undefined ? SHOW_NESTED_HEADERS_DEFAULT : options.showSubframeHeaders;
+
+  const onConfigChange = useCallback(
+    (fieldName: string) => (config: GroupByFieldOptions) => {
+      onChange({
+        ...options,
+        fields: {
+          ...options.fields,
+          [fieldName]: config,
+        },
+      });
+    },
+    // Adding options to the dependency array causes infinite loop here.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [onChange]
+  );
+
+  const onShowFieldNamesChange = useCallback(
+    () => {
+      const showSubframeHeaders =
+        options.showSubframeHeaders === undefined ? !SHOW_NESTED_HEADERS_DEFAULT : !options.showSubframeHeaders;
+
+      onChange({
+        showSubframeHeaders,
+        fields: {
+          ...options.fields,
+        },
+      });
+    },
+    // Adding options to the dependency array causes infinite loop here.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [onChange]
+  );
+
+  // See if there's both an aggregation and grouping field configured
+  // for calculations. If not we display a warning because there
+  // needs to be a grouping for the calculation to have effect
+  let hasGrouping,
+    hasAggregation = false;
+  for (const field of Object.values(options.fields)) {
+    if (field.aggregations.length > 0 && field.operation !== null) {
+      hasAggregation = true;
+    }
+    if (field.operation === GroupByOperationID.groupBy) {
+      hasGrouping = true;
+    }
+  }
+  const showCalcAlert = hasAggregation && !hasGrouping;
+
+  return (
+    <Stack direction="column">
+      {showCalcAlert && (
+        <Alert title="Calculations will not have an effect if no fields are being grouped on." severity="warning" />
+      )}
+      <div>
+        {fieldNames.map((key) => (
+          <GroupByFieldConfiguration
+            onConfigChange={onConfigChange(key)}
+            fieldName={key}
+            config={options.fields[key]}
+            key={key}
+          />
+        ))}
+      </div>
+      <Field
+        label="Show field names in nested tables"
+        description="If enabled nested tables will show field names as a table header"
+      >
+        <Switch value={showHeaders} onChange={onShowFieldNamesChange} />
+      </Field>
+    </Stack>
+  );
+};
+
+const options = [
+  { label: 'Group by', value: GroupByOperationID.groupBy },
+  { label: 'Calculate', value: GroupByOperationID.aggregate },
+];
+
+export const GroupByFieldConfiguration = ({ fieldName, config, onConfigChange }: FieldProps) => {
+  const theme = useTheme2();
+  const styles = getStyles(theme);
+
+  const onChange = useCallback(
+    (value: SelectableValue<GroupByOperationID | null>) => {
+      onConfigChange({
+        aggregations: config?.aggregations ?? [],
+        operation: value?.value ?? null,
+      });
+    },
+    [config, onConfigChange]
+  );
+
+  return (
+    <InlineField className={styles.label} label={fieldName} grow shrink>
+      <Stack gap={0.5} direction="row" wrap={false}>
+        <div className={styles.operation}>
+          <Select options={options} value={config?.operation} placeholder="Ignored" onChange={onChange} isClearable />
+        </div>
+
+        {config?.operation === GroupByOperationID.aggregate && (
+          <StatsPicker
+            className={styles.aggregations}
+            placeholder="Select Stats"
+            allowMultiple
+            stats={config.aggregations}
+            onChange={(stats) => {
+              // eslint-disable-next-line
+              onConfigChange({ ...config, aggregations: stats as ReducerID[] });
+            }}
+          />
+        )}
+      </Stack>
+    </InlineField>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    label: css({
+      minWidth: theme.spacing(32),
+    }),
+    operation: css({
+      flexShrink: 0,
+      height: '100%',
+      width: theme.spacing(24),
+    }),
+    aggregations: css({
+      flexGrow: 1,
+    }),
+  };
+};
+
+export const groupToNestedTableTransformRegistryItem: TransformerRegistryItem<GroupByTransformerOptions> = {
+  id: DataTransformerID.groupToNestedTable,
+  editor: GroupToNestedTableTransformerEditor,
+  transformation: standardTransformers.groupToNestedTable,
+  name: standardTransformers.groupToNestedTable.name,
+  description: standardTransformers.groupToNestedTable.description,
+  categories: new Set([
+    TransformerCategory.Combine,
+    TransformerCategory.CalculateNewFields,
+    TransformerCategory.Reformat,
+  ]),
+};
diff --git a/public/app/features/transformers/editors/GroupingToMatrixTransformerEditor.tsx b/public/app/features/transformers/editors/GroupingToMatrixTransformerEditor.tsx
index bbbdb73197b52..9cea0cfdc21e3 100644
--- a/public/app/features/transformers/editors/GroupingToMatrixTransformerEditor.tsx
+++ b/public/app/features/transformers/editors/GroupingToMatrixTransformerEditor.tsx
@@ -12,6 +12,7 @@ import {
 } from '@grafana/data';
 import { InlineField, InlineFieldRow, Select } from '@grafana/ui';
 
+import { getTransformationContent } from '../docs/getTransformationContent';
 import { useAllFieldNamesFromDataFrames } from '../utils';
 
 export const GroupingToMatrixTransformerEditor = ({
@@ -92,7 +93,8 @@ export const groupingToMatrixTransformRegistryItem: TransformerRegistryItem<Grou
   id: DataTransformerID.groupingToMatrix,
   editor: GroupingToMatrixTransformerEditor,
   transformation: standardTransformers.groupingToMatrixTransformer,
-  name: 'Grouping to matrix',
+  name: standardTransformers.groupingToMatrixTransformer.name,
   description: 'Takes a three fields combination and produces a Matrix.',
   categories: new Set([TransformerCategory.Combine, TransformerCategory.Reformat]),
+  help: getTransformationContent(DataTransformerID.groupingToMatrix).helperDocs,
 };
diff --git a/public/app/features/transformers/editors/HistogramTransformerEditor.tsx b/public/app/features/transformers/editors/HistogramTransformerEditor.tsx
index 4c79d933b1a54..93afbfd9bc088 100644
--- a/public/app/features/transformers/editors/HistogramTransformerEditor.tsx
+++ b/public/app/features/transformers/editors/HistogramTransformerEditor.tsx
@@ -16,6 +16,7 @@ import { getTemplateSrv, config as cfg } from '@grafana/runtime';
 import { InlineField, InlineFieldRow, InlineSwitch } from '@grafana/ui';
 import { NumberInput } from 'app/core/components/OptionsUI/NumberInput';
 
+import { getTransformationContent } from '../docs/getTransformationContent';
 import { SuggestionsInput } from '../suggestionsInput/SuggestionsInput';
 import { numberOrVariableValidator } from '../utils';
 
@@ -27,10 +28,21 @@ export const HistogramTransformerEditor = ({
   const labelWidth = 18;
 
   const [isInvalid, setInvalid] = useState({
+    bucketCount: !numberOrVariableValidator(options.bucketCount || ''),
     bucketSize: !numberOrVariableValidator(options.bucketSize || ''),
     bucketOffset: !numberOrVariableValidator(options.bucketOffset || ''),
   });
 
+  const onBucketCountChanged = useCallback(
+    (val?: number) => {
+      onChange({
+        ...options,
+        bucketCount: val,
+      });
+    },
+    [onChange, options]
+  );
+
   const onBucketSizeChanged = useCallback(
     (val?: number) => {
       onChange({
@@ -51,6 +63,18 @@ export const HistogramTransformerEditor = ({
     [onChange, options]
   );
 
+  const onVariableBucketCountChanged = useCallback(
+    (value: string) => {
+      setInvalid({ ...isInvalid, bucketCount: !numberOrVariableValidator(value) });
+
+      onChange({
+        ...options,
+        bucketCount: Number(value) === 0 ? undefined : Number(value),
+      });
+    },
+    [onChange, options, isInvalid]
+  );
+
   const onVariableBucketSizeChanged = useCallback(
     (value: string) => {
       setInvalid({ ...isInvalid, bucketSize: !numberOrVariableValidator(value) });
@@ -104,6 +128,20 @@ export const HistogramTransformerEditor = ({
 
     return (
       <div>
+        <InlineFieldRow>
+          <InlineField
+            labelWidth={labelWidth}
+            label={histogramFieldInfo.bucketCount.name}
+            tooltip={histogramFieldInfo.bucketCount.description}
+          >
+            <NumberInput
+              value={options.bucketCount}
+              placeholder="Default: 30"
+              onChange={onBucketCountChanged}
+              min={0}
+            />
+          </InlineField>
+        </InlineFieldRow>
         <InlineFieldRow>
           <InlineField
             labelWidth={labelWidth}
@@ -137,6 +175,22 @@ export const HistogramTransformerEditor = ({
 
   return (
     <div>
+      <InlineFieldRow>
+        <InlineField
+          invalid={isInvalid.bucketCount}
+          error={'Value needs to be an integer or a variable'}
+          labelWidth={labelWidth}
+          label={histogramFieldInfo.bucketCount.name}
+          tooltip={histogramFieldInfo.bucketCount.description}
+        >
+          <SuggestionsInput
+            suggestions={variables}
+            value={options.bucketCount}
+            placeholder="Default: 30"
+            onChange={onVariableBucketCountChanged}
+          />
+        </InlineField>
+      </InlineFieldRow>
       <InlineFieldRow>
         <InlineField
           invalid={isInvalid.bucketSize}
@@ -189,4 +243,5 @@ export const histogramTransformRegistryItem: TransformerRegistryItem<HistogramTr
   name: standardTransformers.histogramTransformer.name,
   description: standardTransformers.histogramTransformer.description,
   categories: new Set([TransformerCategory.CreateNewVisualization]),
+  help: getTransformationContent(DataTransformerID.histogram).helperDocs,
 };
diff --git a/public/app/features/transformers/editors/JoinByFieldTransformerEditor.tsx b/public/app/features/transformers/editors/JoinByFieldTransformerEditor.tsx
index 3ce88b9204016..5fa4d148a601d 100644
--- a/public/app/features/transformers/editors/JoinByFieldTransformerEditor.tsx
+++ b/public/app/features/transformers/editors/JoinByFieldTransformerEditor.tsx
@@ -11,8 +11,9 @@ import {
 import { JoinByFieldOptions, JoinMode } from '@grafana/data/src/transformations/transformers/joinByField';
 import { getTemplateSrv } from '@grafana/runtime';
 import { Select, InlineFieldRow, InlineField } from '@grafana/ui';
+import { useFieldDisplayNames, useSelectOptions } from '@grafana/ui/src/components/MatchersUI/utils';
 
-import { useAllFieldNamesFromDataFrames } from '../utils';
+import { getTransformationContent } from '../docs/getTransformationContent';
 
 const modes = [
   {
@@ -31,7 +32,9 @@ const modes = [
 ];
 
 export function SeriesToFieldsTransformerEditor({ input, options, onChange }: TransformerUIProps<JoinByFieldOptions>) {
-  const fieldNames = useAllFieldNamesFromDataFrames(input).map((item: string) => ({ label: item, value: item }));
+  const names = useFieldDisplayNames(input);
+  const fieldNames = useSelectOptions(names);
+
   const variables = getTemplateSrv()
     .getVariables()
     .map((v) => {
@@ -88,4 +91,5 @@ export const joinByFieldTransformerRegistryItem: TransformerRegistryItem<JoinByF
   name: standardTransformers.joinByFieldTransformer.name,
   description: standardTransformers.joinByFieldTransformer.description,
   categories: new Set([TransformerCategory.Combine]),
+  help: getTransformationContent(DataTransformerID.joinByField).helperDocs,
 };
diff --git a/public/app/features/transformers/editors/LabelsToFieldsTransformerEditor.tsx b/public/app/features/transformers/editors/LabelsToFieldsTransformerEditor.tsx
index 92c99fcce9caf..2e0bff17d2d4c 100644
--- a/public/app/features/transformers/editors/LabelsToFieldsTransformerEditor.tsx
+++ b/public/app/features/transformers/editors/LabelsToFieldsTransformerEditor.tsx
@@ -12,8 +12,9 @@ import {
   LabelsToFieldsMode,
   LabelsToFieldsOptions,
 } from '@grafana/data/src/transformations/transformers/labelsToFields';
-import { Stack } from '@grafana/experimental';
-import { InlineField, InlineFieldRow, RadioButtonGroup, Select, FilterPill } from '@grafana/ui';
+import { InlineField, InlineFieldRow, RadioButtonGroup, Select, FilterPill, Stack } from '@grafana/ui';
+
+import { getTransformationContent } from '../docs/getTransformationContent';
 
 const modes: Array<SelectableValue<LabelsToFieldsMode>> = [
   { value: LabelsToFieldsMode.Columns, label: 'Columns' },
@@ -81,7 +82,7 @@ export const LabelsAsFieldsTransformerEditor = ({
       </InlineFieldRow>
       <InlineFieldRow>
         <InlineField label={'Labels'} labelWidth={labelWidth}>
-          <Stack gap={1} wrap>
+          <Stack gap={1} wrap={'wrap'}>
             {labelNames.map((o, i) => {
               const label = o.label!;
               return (
@@ -125,8 +126,9 @@ export const labelsToFieldsTransformerRegistryItem: TransformerRegistryItem<Labe
   id: DataTransformerID.labelsToFields,
   editor: LabelsAsFieldsTransformerEditor,
   transformation: standardTransformers.labelsToFieldsTransformer,
-  name: 'Labels to fields',
+  name: standardTransformers.labelsToFieldsTransformer.name,
   description: `Groups series by time and return labels or tags as fields.
                 Useful for showing time series with labels in a table where each label key becomes a separate column.`,
   categories: new Set([TransformerCategory.Reformat]),
+  help: getTransformationContent(DataTransformerID.labelsToFields).helperDocs,
 };
diff --git a/public/app/features/transformers/editors/LimitTransformerEditor.tsx b/public/app/features/transformers/editors/LimitTransformerEditor.tsx
index 0c6b771ee4cd7..087cbe633e2fd 100644
--- a/public/app/features/transformers/editors/LimitTransformerEditor.tsx
+++ b/public/app/features/transformers/editors/LimitTransformerEditor.tsx
@@ -12,6 +12,7 @@ import { LimitTransformerOptions } from '@grafana/data/src/transformations/trans
 import { getTemplateSrv, config as cfg } from '@grafana/runtime';
 import { InlineField, InlineFieldRow, Input } from '@grafana/ui';
 
+import { getTransformationContent } from '../docs/getTransformationContent';
 import { SuggestionsInput } from '../suggestionsInput/SuggestionsInput';
 import { numberOrVariableValidator } from '../utils';
 
@@ -81,7 +82,8 @@ export const limitTransformRegistryItem: TransformerRegistryItem<LimitTransforme
   id: DataTransformerID.limit,
   editor: LimitTransformerEditor,
   transformation: standardTransformers.limitTransformer,
-  name: 'Limit',
+  name: standardTransformers.limitTransformer.name,
   description: `Limit the number of items displayed.`,
   categories: new Set([TransformerCategory.Filter]),
+  help: getTransformationContent(DataTransformerID.limit).helperDocs,
 };
diff --git a/public/app/features/transformers/editors/MergeTransformerEditor.tsx b/public/app/features/transformers/editors/MergeTransformerEditor.tsx
index b39c971441881..f067043ea4fbe 100644
--- a/public/app/features/transformers/editors/MergeTransformerEditor.tsx
+++ b/public/app/features/transformers/editors/MergeTransformerEditor.tsx
@@ -10,6 +10,8 @@ import {
 import { MergeTransformerOptions } from '@grafana/data/src/transformations/transformers/merge';
 import { FieldValidationMessage } from '@grafana/ui';
 
+import { getTransformationContent } from '../docs/getTransformationContent';
+
 export const MergeTransformerEditor = ({ input, options, onChange }: TransformerUIProps<MergeTransformerOptions>) => {
   if (input.length <= 1) {
     // Show warning that merge is useless only apply on a single frame
@@ -22,8 +24,9 @@ export const mergeTransformerRegistryItem: TransformerRegistryItem<MergeTransfor
   id: DataTransformerID.merge,
   editor: MergeTransformerEditor,
   transformation: standardTransformers.mergeTransformer,
-  name: 'Merge',
+  name: standardTransformers.mergeTransformer.name,
   description: `Merge many series/tables and return a single table where mergeable values will be combined into the same row.
                 Useful for showing multiple series, tables or a combination of both visualized in a table.`,
   categories: new Set([TransformerCategory.Combine]),
+  help: getTransformationContent(DataTransformerID.merge).helperDocs,
 };
diff --git a/public/app/features/transformers/editors/OrganizeFieldsTransformerEditor.tsx b/public/app/features/transformers/editors/OrganizeFieldsTransformerEditor.tsx
index b0f61a88dba12..1cf27f090b632 100644
--- a/public/app/features/transformers/editors/OrganizeFieldsTransformerEditor.tsx
+++ b/public/app/features/transformers/editors/OrganizeFieldsTransformerEditor.tsx
@@ -14,15 +14,17 @@ import { createOrderFieldsComparer } from '@grafana/data/src/transformations/tra
 import { OrganizeFieldsTransformerOptions } from '@grafana/data/src/transformations/transformers/organize';
 import { Input, IconButton, Icon, FieldValidationMessage, useStyles2 } from '@grafana/ui';
 
+import { getTransformationContent } from '../docs/getTransformationContent';
 import { useAllFieldNamesFromDataFrames } from '../utils';
 
 interface OrganizeFieldsTransformerEditorProps extends TransformerUIProps<OrganizeFieldsTransformerOptions> {}
 
 const OrganizeFieldsTransformerEditor = ({ options, input, onChange }: OrganizeFieldsTransformerEditorProps) => {
-  const { indexByName, excludeByName, renameByName } = options;
+  const { indexByName, excludeByName, renameByName, includeByName } = options;
 
   const fieldNames = useAllFieldNamesFromDataFrames(input);
   const orderedFieldNames = useMemo(() => orderFieldNamesByIndex(fieldNames, indexByName), [fieldNames, indexByName]);
+  const filterType = includeByName && Object.keys(includeByName).length > 0 ? 'include' : 'exclude';
 
   const onToggleVisibility = useCallback(
     (field: string, shouldExclude: boolean) => {
@@ -37,6 +39,20 @@ const OrganizeFieldsTransformerEditor = ({ options, input, onChange }: OrganizeF
     [onChange, options, excludeByName]
   );
 
+  const onToggleVisibilityInclude = useCallback(
+    (field: string, shouldInclude: boolean) => {
+      const pendingState = {
+        ...options,
+        includeByName: {
+          ...includeByName,
+          [field]: !shouldInclude,
+        },
+      };
+      onChange(pendingState);
+    },
+    [onChange, options, includeByName]
+  );
+
   const onDragEnd = useCallback(
     (result: DropResult) => {
       if (!result || !result.destination) {
@@ -87,14 +103,18 @@ const OrganizeFieldsTransformerEditor = ({ options, input, onChange }: OrganizeF
         {(provided) => (
           <div ref={provided.innerRef} {...provided.droppableProps}>
             {orderedFieldNames.map((fieldName, index) => {
+              const isIncludeFilter = includeByName && fieldName in includeByName ? includeByName[fieldName] : false;
+              const isVisible = filterType === 'include' ? isIncludeFilter : !excludeByName[fieldName];
+              const onToggleFunction = filterType === 'include' ? onToggleVisibilityInclude : onToggleVisibility;
+
               return (
                 <DraggableFieldName
                   fieldName={fieldName}
                   renamedFieldName={renameByName[fieldName]}
                   index={index}
-                  onToggleVisibility={onToggleVisibility}
+                  onToggleVisibility={onToggleFunction}
                   onRenameField={onRenameField}
-                  visible={!excludeByName[fieldName]}
+                  visible={isVisible}
                   key={fieldName}
                 />
               );
@@ -206,8 +226,9 @@ export const organizeFieldsTransformRegistryItem: TransformerRegistryItem<Organi
   id: DataTransformerID.organize,
   editor: OrganizeFieldsTransformerEditor,
   transformation: standardTransformers.organizeFieldsTransformer,
-  name: 'Organize fields',
+  name: standardTransformers.organizeFieldsTransformer.name,
   description:
     "Allows the user to re-order, hide, or rename fields / columns. Useful when data source doesn't allow overrides for visualizing data.",
   categories: new Set([TransformerCategory.ReorderAndRename]),
+  help: getTransformationContent(DataTransformerID.organize).helperDocs,
 };
diff --git a/public/app/features/transformers/editors/ReduceTransformerEditor.tsx b/public/app/features/transformers/editors/ReduceTransformerEditor.tsx
index f7623ac5a7535..5e5640dbf74d1 100644
--- a/public/app/features/transformers/editors/ReduceTransformerEditor.tsx
+++ b/public/app/features/transformers/editors/ReduceTransformerEditor.tsx
@@ -13,6 +13,8 @@ import { ReduceTransformerMode, ReduceTransformerOptions } from '@grafana/data/s
 import { selectors } from '@grafana/e2e-selectors';
 import { InlineField, Select, StatsPicker, InlineSwitch } from '@grafana/ui';
 
+import { getTransformationContent } from '../docs/getTransformationContent';
+
 // TODO:  Minimal implementation, needs some <3
 export const ReduceTransformerEditor = ({ options, onChange }: TransformerUIProps<ReduceTransformerOptions>) => {
   const modes: Array<SelectableValue<ReduceTransformerMode>> = [
@@ -56,7 +58,7 @@ export const ReduceTransformerEditor = ({ options, onChange }: TransformerUIProp
 
   return (
     <>
-      <InlineField label="Mode" aria-label={selectors.components.Transforms.Reduce.modeLabel} grow labelWidth={16}>
+      <InlineField label="Mode" data-testid={selectors.components.Transforms.Reduce.modeLabel} grow labelWidth={16}>
         <Select
           options={modes}
           value={modes.find((v) => v.value === options.mode) || modes[0]}
@@ -65,7 +67,7 @@ export const ReduceTransformerEditor = ({ options, onChange }: TransformerUIProp
       </InlineField>
       <InlineField
         label="Calculations"
-        aria-label={selectors.components.Transforms.Reduce.calculationsLabel}
+        data-testid={selectors.components.Transforms.Reduce.calculationsLabel}
         grow
         labelWidth={16}
       >
@@ -102,4 +104,5 @@ export const reduceTransformRegistryItem: TransformerRegistryItem<ReduceTransfor
   name: standardTransformers.reduceTransformer.name,
   description: standardTransformers.reduceTransformer.description,
   categories: new Set([TransformerCategory.CalculateNewFields]),
+  help: getTransformationContent(DataTransformerID.reduce).helperDocs,
 };
diff --git a/public/app/features/transformers/editors/RenameByRegexTransformer.tsx b/public/app/features/transformers/editors/RenameByRegexTransformer.tsx
index 2b90d2d643631..5e63e597af8bf 100644
--- a/public/app/features/transformers/editors/RenameByRegexTransformer.tsx
+++ b/public/app/features/transformers/editors/RenameByRegexTransformer.tsx
@@ -1,4 +1,3 @@
-import { css } from '@emotion/css';
 import React from 'react';
 
 import {
@@ -10,7 +9,9 @@ import {
   TransformerCategory,
 } from '@grafana/data';
 import { RenameByRegexTransformerOptions } from '@grafana/data/src/transformations/transformers/renameByRegex';
-import { Field, Input } from '@grafana/ui';
+import { InlineField, Input } from '@grafana/ui';
+
+import { getTransformationContent } from '../docs/getTransformationContent';
 
 interface RenameByRegexTransformerEditorProps extends TransformerUIProps<RenameByRegexTransformerOptions> {}
 
@@ -81,44 +82,29 @@ export class RenameByRegexTransformerEditor extends React.PureComponent<
     const { regex, renamePattern, isRegexValid } = this.state;
     return (
       <>
-        <div className="gf-form-inline">
-          <div className="gf-form gf-form--grow">
-            <div className="gf-form-label width-8">Match</div>
-            <Field
-              invalid={!isRegexValid}
-              error={!isRegexValid ? 'Invalid pattern' : undefined}
-              className={css`
-                margin-bottom: 0;
-              `}
-            >
-              <Input
-                placeholder="Regular expression pattern"
-                value={regex || ''}
-                onChange={this.handleRegexChange}
-                onBlur={this.handleRegexBlur}
-                width={25}
-              />
-            </Field>
-          </div>
-        </div>
-        <div className="gf-form-inline">
-          <div className="gf-form gf-form--grow">
-            <div className="gf-form-label width-8">Replace</div>
-            <Field
-              className={css`
-                margin-bottom: 0;
-              `}
-            >
-              <Input
-                placeholder="Replacement pattern"
-                value={renamePattern || ''}
-                onChange={this.handleRenameChange}
-                onBlur={this.handleRenameBlur}
-                width={25}
-              />
-            </Field>
-          </div>
-        </div>
+        <InlineField
+          label="Match"
+          labelWidth={16}
+          invalid={!isRegexValid}
+          error={!isRegexValid ? 'Invalid pattern' : undefined}
+        >
+          <Input
+            placeholder="Regular expression pattern"
+            value={regex || ''}
+            onChange={this.handleRegexChange}
+            onBlur={this.handleRegexBlur}
+            width={25}
+          />
+        </InlineField>
+        <InlineField label="Replace" labelWidth={16}>
+          <Input
+            placeholder="Replacement pattern"
+            value={renamePattern || ''}
+            onChange={this.handleRenameChange}
+            onBlur={this.handleRenameBlur}
+            width={25}
+          />
+        </InlineField>
       </>
     );
   }
@@ -128,7 +114,8 @@ export const renameByRegexTransformRegistryItem: TransformerRegistryItem<RenameB
   id: DataTransformerID.renameByRegex,
   editor: RenameByRegexTransformerEditor,
   transformation: standardTransformers.renameByRegexTransformer,
-  name: 'Rename by regex',
+  name: standardTransformers.renameByRegexTransformer.name,
   description: 'Renames part of the query result by using regular expression with placeholders.',
   categories: new Set([TransformerCategory.ReorderAndRename]),
+  help: getTransformationContent(DataTransformerID.renameByRegex).helperDocs,
 };
diff --git a/public/app/features/transformers/editors/SeriesToRowsTransformerEditor.tsx b/public/app/features/transformers/editors/SeriesToRowsTransformerEditor.tsx
index 4383e3681f9b6..606d0cdb41781 100644
--- a/public/app/features/transformers/editors/SeriesToRowsTransformerEditor.tsx
+++ b/public/app/features/transformers/editors/SeriesToRowsTransformerEditor.tsx
@@ -7,6 +7,8 @@ import {
 } from '@grafana/data';
 import { SeriesToRowsTransformerOptions } from '@grafana/data/src/transformations/transformers/seriesToRows';
 
+import { getTransformationContent } from '../docs/getTransformationContent';
+
 export const SeriesToRowsTransformerEditor = ({
   input,
   options,
@@ -19,8 +21,9 @@ export const seriesToRowsTransformerRegistryItem: TransformerRegistryItem<Series
   id: DataTransformerID.seriesToRows,
   editor: SeriesToRowsTransformerEditor,
   transformation: standardTransformers.seriesToRowsTransformer,
-  name: 'Series to rows',
+  name: standardTransformers.seriesToRowsTransformer.name,
   description: `Merge many series and return a single series with time, metric and value as columns.
                 Useful for showing multiple time series visualized in a table.`,
   categories: new Set([TransformerCategory.Combine, TransformerCategory.Reformat]),
+  help: getTransformationContent(DataTransformerID.seriesToRows).helperDocs,
 };
diff --git a/public/app/features/transformers/editors/SortByTransformerEditor.tsx b/public/app/features/transformers/editors/SortByTransformerEditor.tsx
index 6c227f948ea7b..49721a19edf76 100644
--- a/public/app/features/transformers/editors/SortByTransformerEditor.tsx
+++ b/public/app/features/transformers/editors/SortByTransformerEditor.tsx
@@ -11,6 +11,7 @@ import { SortByField, SortByTransformerOptions } from '@grafana/data/src/transfo
 import { getTemplateSrv, config as cfg } from '@grafana/runtime';
 import { InlineField, InlineSwitch, InlineFieldRow, Select } from '@grafana/ui';
 
+import { getTransformationContent } from '../docs/getTransformationContent';
 import { useAllFieldNamesFromDataFrames } from '../utils';
 
 export const SortByTransformerEditor = ({ input, options, onChange }: TransformerUIProps<SortByTransformerOptions>) => {
@@ -65,4 +66,5 @@ export const sortByTransformRegistryItem: TransformerRegistryItem<SortByTransfor
   name: standardTransformers.sortByTransformer.name,
   description: standardTransformers.sortByTransformer.description,
   categories: new Set([TransformerCategory.ReorderAndRename]),
+  help: getTransformationContent(DataTransformerID.sortBy).helperDocs,
 };
diff --git a/public/app/features/transformers/extractFields/ExtractFieldsTransformerEditor.tsx b/public/app/features/transformers/extractFields/ExtractFieldsTransformerEditor.tsx
index 594f0a49213f7..c9a4647fe39c0 100644
--- a/public/app/features/transformers/extractFields/ExtractFieldsTransformerEditor.tsx
+++ b/public/app/features/transformers/extractFields/ExtractFieldsTransformerEditor.tsx
@@ -12,6 +12,8 @@ import {
 import { InlineField, InlineFieldRow, Select, InlineSwitch } from '@grafana/ui';
 import { FieldNamePicker } from '@grafana/ui/src/components/MatchersUI/FieldNamePicker';
 
+import { getTransformationContent } from '../docs/getTransformationContent';
+
 import { JSONPathEditor } from './components/JSONPathEditor';
 import { extractFieldsTransformer } from './extractFields';
 import { fieldExtractors } from './fieldExtractors';
@@ -117,7 +119,8 @@ export const extractFieldsTransformRegistryItem: TransformerRegistryItem<Extract
   id: DataTransformerID.extractFields,
   editor: extractFieldsTransformerEditor,
   transformation: extractFieldsTransformer,
-  name: 'Extract fields',
+  name: extractFieldsTransformer.name,
   description: `Parse fields from content (JSON, labels, etc).`,
   categories: new Set([TransformerCategory.Reformat]),
+  help: getTransformationContent(DataTransformerID.extractFields).helperDocs,
 };
diff --git a/public/app/features/transformers/extractFields/extractFields.test.ts b/public/app/features/transformers/extractFields/extractFields.test.ts
index 1895e57bead7f..a6617aecea93f 100644
--- a/public/app/features/transformers/extractFields/extractFields.test.ts
+++ b/public/app/features/transformers/extractFields/extractFields.test.ts
@@ -1,5 +1,14 @@
-import { DataFrame, Field, FieldType } from '@grafana/data';
+import {
+  DataFrame,
+  DataTransformerConfig,
+  DataTransformerID,
+  Field,
+  FieldType,
+  transformDataFrame,
+} from '@grafana/data';
 import { toDataFrame } from '@grafana/data/src/dataframe/processDataFrame';
+import { SortByTransformerOptions, sortByTransformer } from '@grafana/data/src/transformations/transformers/sortBy';
+import { mockTransformationsRegistry } from '@grafana/data/src/utils/tests/mockTransformationsRegistry';
 
 import { extractFieldsTransformer } from './extractFields';
 import { ExtractFieldsOptions, FieldExtractorID } from './types';
@@ -233,6 +242,118 @@ describe('Fields from JSON', () => {
       length: 2,
     });
   });
+
+  it('works with different value sizes', async () => {
+    const extractConfig: ExtractFieldsOptions = {
+      source: 'line',
+      replace: false,
+    };
+    const sortConfig: DataTransformerConfig<SortByTransformerOptions> = {
+      id: DataTransformerID.sortBy,
+      options: {
+        sort: [
+          {
+            field: 'time',
+          },
+        ],
+      },
+    };
+    mockTransformationsRegistry([sortByTransformer]);
+    const ctx = { interpolate: (v: string) => v };
+
+    const testDataFrame: DataFrame = {
+      fields: [
+        { config: {}, name: 'Time', type: FieldType.time, values: [1, 2] },
+        { config: {}, name: 'line', type: FieldType.other, values: ['{"foo":"bar"}', '{"baz":"bar"}'] },
+      ],
+      length: 2,
+    };
+
+    const expected = {
+      fields: [
+        {
+          config: {},
+          name: 'Time',
+          type: 'time',
+          values: [1, 2],
+          state: {
+            displayName: 'Time',
+            multipleFrames: false,
+          },
+        },
+        {
+          config: {},
+          name: 'line',
+          state: {
+            displayName: 'line',
+            multipleFrames: false,
+          },
+          type: 'other',
+          values: ['{"foo":"bar"}', '{"baz":"bar"}'],
+        },
+        {
+          name: 'foo',
+          state: {
+            displayName: 'foo',
+            multipleFrames: false,
+          },
+          values: ['bar', undefined],
+          type: 'string',
+          config: {},
+        },
+        {
+          name: 'baz',
+          state: {
+            displayName: 'baz',
+            multipleFrames: false,
+          },
+          values: [undefined, 'bar'],
+          type: 'string',
+          config: {},
+        },
+      ],
+      length: 2,
+    };
+
+    const frames = extractFieldsTransformer.transformer(extractConfig, ctx)([testDataFrame]);
+
+    await expect(transformDataFrame([sortConfig], frames)).toEmitValuesWith((received) => {
+      expect(received[0][0].fields[2]).toMatchInlineSnapshot(`
+        {
+          "config": {},
+          "name": "foo",
+          "state": {
+            "displayName": "foo",
+            "multipleFrames": false,
+          },
+          "type": "string",
+          "values": [
+            "bar",
+            undefined,
+          ],
+        }
+      `);
+
+      expect(received[0][0].fields[3]).toMatchInlineSnapshot(`
+        {
+          "config": {},
+          "name": "baz",
+          "state": {
+            "displayName": "baz",
+            "multipleFrames": false,
+          },
+          "type": "string",
+          "values": [
+            undefined,
+            "bar",
+          ],
+        }
+      `);
+    });
+
+    expect(frames.length).toEqual(1);
+    expect(frames[0]).toEqual(expected);
+  });
 });
 
 const testFieldTime: Field = {
diff --git a/public/app/features/transformers/extractFields/extractFields.ts b/public/app/features/transformers/extractFields/extractFields.ts
index ac9d163a9cb01..2175adf4ac86d 100644
--- a/public/app/features/transformers/extractFields/extractFields.ts
+++ b/public/app/features/transformers/extractFields/extractFields.ts
@@ -7,8 +7,10 @@ import {
   Field,
   FieldType,
   getFieldTypeFromValue,
+  getUniqueFieldName,
   SynchronousDataTransformerInfo,
 } from '@grafana/data';
+import { config } from '@grafana/runtime';
 import { findField } from 'app/features/dimensions';
 
 import { fieldExtractors } from './fieldExtractors';
@@ -30,7 +32,7 @@ export const extractFieldsTransformer: SynchronousDataTransformerInfo<ExtractFie
   },
 };
 
-function addExtractedFields(frame: DataFrame, options: ExtractFieldsOptions): DataFrame {
+export function addExtractedFields(frame: DataFrame, options: ExtractFieldsOptions): DataFrame {
   if (!options.source) {
     return frame;
   }
@@ -84,7 +86,7 @@ function addExtractedFields(frame: DataFrame, options: ExtractFieldsOptions): Da
     for (const [key, val] of Object.entries(obj)) {
       let buffer = values.get(key);
       if (buffer == null) {
-        buffer = new Array(count);
+        buffer = new Array(count).fill(undefined);
         values.set(key, buffer);
         names.push(key);
       }
@@ -94,12 +96,16 @@ function addExtractedFields(frame: DataFrame, options: ExtractFieldsOptions): Da
 
   const fields = names.map((name) => {
     const buffer = values.get(name);
-    return {
+    const field = {
       name,
       values: buffer,
       type: buffer ? getFieldTypeFromValue(buffer.find((v) => v != null)) : FieldType.other,
       config: {},
     } as Field;
+    if (config.featureToggles.extractFieldsNameDeduplication) {
+      field.name = getUniqueFieldName(field, frame);
+    }
+    return field;
   });
 
   if (options.keepTime) {
diff --git a/public/app/features/transformers/extractFields/fieldExtractor.test.ts b/public/app/features/transformers/extractFields/fieldExtractor.test.ts
index 8cb5838387762..6757acc3d9007 100644
--- a/public/app/features/transformers/extractFields/fieldExtractor.test.ts
+++ b/public/app/features/transformers/extractFields/fieldExtractor.test.ts
@@ -1,3 +1,7 @@
+import { FieldType, toDataFrame } from '@grafana/data';
+import { config } from '@grafana/runtime';
+
+import { addExtractedFields } from './extractFields';
 import { fieldExtractors } from './fieldExtractors';
 import { FieldExtractorID } from './types';
 
@@ -111,4 +115,26 @@ describe('Extract fields from text', () => {
       }
     `);
   });
+
+  it('deduplicates names', async () => {
+    const frame = toDataFrame({
+      fields: [{ name: 'foo', type: FieldType.string, values: ['{"foo":"extracedValue1"}'] }],
+    });
+    config.featureToggles.extractFieldsNameDeduplication = true;
+    const newFrame = addExtractedFields(frame, { format: FieldExtractorID.JSON, source: 'foo' });
+    config.featureToggles.extractFieldsNameDeduplication = false;
+    expect(newFrame.fields.length).toBe(2);
+    expect(newFrame.fields[1].name).toBe('foo 1');
+  });
+
+  it('keeps correct names when deduplication is active', async () => {
+    const frame = toDataFrame({
+      fields: [{ name: 'foo', type: FieldType.string, values: ['{"bar":"extracedValue1"}'] }],
+    });
+    config.featureToggles.extractFieldsNameDeduplication = true;
+    const newFrame = addExtractedFields(frame, { format: FieldExtractorID.JSON, source: 'foo' });
+    config.featureToggles.extractFieldsNameDeduplication = false;
+    expect(newFrame.fields.length).toBe(2);
+    expect(newFrame.fields[1].name).toBe('bar');
+  });
 });
diff --git a/public/app/features/transformers/fieldToConfigMapping/FieldConfigMappingHandlerArgumentsEditor.test.tsx b/public/app/features/transformers/fieldToConfigMapping/FieldConfigMappingHandlerArgumentsEditor.test.tsx
new file mode 100644
index 0000000000000..76a81dde407fc
--- /dev/null
+++ b/public/app/features/transformers/fieldToConfigMapping/FieldConfigMappingHandlerArgumentsEditor.test.tsx
@@ -0,0 +1,37 @@
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+
+import { FieldConfigMappingHandlerArgumentsEditor, Props } from './FieldConfigMappingHandlerArgumentsEditor';
+
+beforeEach(() => {
+  jest.clearAllMocks();
+});
+
+const mockOnChange = jest.fn();
+
+const props: Props = {
+  handlerKey: null,
+  handlerArguments: {},
+  onChange: mockOnChange,
+};
+
+const setup = (testProps?: Partial<Props>) => {
+  const editorProps = { ...props, ...testProps };
+  return render(<FieldConfigMappingHandlerArgumentsEditor {...editorProps} />);
+};
+
+describe('FieldConfigMappingHandlerArgumentsEditor', () => {
+  it('Should show a color picker when thresholds are selected', async () => {
+    setup({ handlerKey: 'threshold1' });
+
+    expect(await screen.findByDisplayValue('Threshold color')).toBeInTheDocument();
+    expect(await screen.findByLabelText('red color')).toBeInTheDocument();
+  });
+
+  it('Should show the correct selected color', async () => {
+    setup({ handlerKey: 'threshold1', handlerArguments: { threshold: { color: 'orange' } } });
+
+    expect(await screen.findByDisplayValue('Threshold color')).toBeInTheDocument();
+    expect(await screen.findByLabelText('orange color')).toBeInTheDocument();
+  });
+});
diff --git a/public/app/features/transformers/fieldToConfigMapping/FieldConfigMappingHandlerArgumentsEditor.tsx b/public/app/features/transformers/fieldToConfigMapping/FieldConfigMappingHandlerArgumentsEditor.tsx
new file mode 100644
index 0000000000000..474eeb1a0b3c7
--- /dev/null
+++ b/public/app/features/transformers/fieldToConfigMapping/FieldConfigMappingHandlerArgumentsEditor.tsx
@@ -0,0 +1,57 @@
+import React from 'react';
+
+import { ColorPicker, Input } from '@grafana/ui';
+
+import { HandlerArguments } from './fieldToConfigMapping';
+
+export interface Props {
+  handlerKey: string | null;
+  handlerArguments: HandlerArguments;
+  onChange: (args: HandlerArguments) => void;
+}
+
+export function createsArgumentsEditor(handlerKey: string | null) {
+  switch (handlerKey) {
+    case 'threshold1':
+      return true;
+    default:
+      return false;
+  }
+}
+
+export function FieldConfigMappingHandlerArgumentsEditor({ handlerArguments, handlerKey, onChange }: Props) {
+  const onChangeThreshold = (color: string | null) => {
+    if (color) {
+      onChange({
+        ...handlerArguments,
+        threshold: {
+          ...handlerArguments.threshold,
+          color: color,
+        },
+      });
+    } else {
+      onChange({ ...handlerArguments, threshold: undefined });
+    }
+  };
+
+  return (
+    <>
+      {handlerKey === 'threshold1' && (
+        <Input
+          type="text"
+          value={'Threshold color'}
+          aria-label={'Threshold color'}
+          disabled
+          width={20}
+          prefix={
+            <ColorPicker
+              color={handlerArguments.threshold?.color ?? 'red'}
+              onChange={onChangeThreshold}
+              enableNamedColors={true}
+            />
+          }
+        />
+      )}
+    </>
+  );
+}
diff --git a/public/app/features/transformers/fieldToConfigMapping/FieldToConfigMappingEditor.test.tsx b/public/app/features/transformers/fieldToConfigMapping/FieldToConfigMappingEditor.test.tsx
index e1b0422576149..17cb3cfbfe1ce 100644
--- a/public/app/features/transformers/fieldToConfigMapping/FieldToConfigMappingEditor.test.tsx
+++ b/public/app/features/transformers/fieldToConfigMapping/FieldToConfigMappingEditor.test.tsx
@@ -89,4 +89,18 @@ describe('FieldToConfigMappingEditor', () => {
       expect.arrayContaining([{ fieldName: 'max', handlerKey: 'max', reducerId: 'last' }])
     );
   });
+
+  it('Shows additional settings', async () => {
+    setup({ mappings: [{ fieldName: 'max', handlerKey: 'threshold1' }] });
+
+    const select = await screen.findByText('Additional settings');
+    expect(select).toBeInTheDocument();
+  });
+
+  it('Does not show additional settings', async () => {
+    setup();
+
+    const select = screen.queryByText('Additional settings');
+    expect(select).not.toBeInTheDocument();
+  });
 });
diff --git a/public/app/features/transformers/fieldToConfigMapping/FieldToConfigMappingEditor.tsx b/public/app/features/transformers/fieldToConfigMapping/FieldToConfigMappingEditor.tsx
index 8ca57453baa33..1bcd9ab741861 100644
--- a/public/app/features/transformers/fieldToConfigMapping/FieldToConfigMappingEditor.tsx
+++ b/public/app/features/transformers/fieldToConfigMapping/FieldToConfigMappingEditor.tsx
@@ -7,12 +7,18 @@ import { Select, StatsPicker, useStyles2 } from '@grafana/ui';
 
 import {
   configMapHandlers,
-  evaluteFieldMappings,
+  evaluateFieldMappings,
   FieldToConfigMapHandler,
   FieldToConfigMapping,
+  HandlerArguments,
   lookUpConfigHandler as findConfigHandlerFor,
 } from '../fieldToConfigMapping/fieldToConfigMapping';
 
+import {
+  createsArgumentsEditor,
+  FieldConfigMappingHandlerArgumentsEditor,
+} from './FieldConfigMappingHandlerArgumentsEditor';
+
 export interface Props {
   frame: DataFrame;
   mappings: FieldToConfigMapping[];
@@ -27,6 +33,10 @@ export function FieldToConfigMappingEditor({ frame, mappings, onChange, withRedu
   const configProps = configMapHandlers.map((def) => configHandlerToSelectOption(def, false)) as Array<
     SelectableValue<string>
   >;
+  const hasAdditionalSettings = mappings.reduce(
+    (prev, mapping) => prev || createsArgumentsEditor(mapping.handlerKey),
+    false
+  );
 
   const onChangeConfigProperty = (row: FieldToConfigRowViewModel, value: SelectableValue<string | null>) => {
     const existingIdx = mappings.findIndex((x) => x.fieldName === row.fieldName);
@@ -60,6 +70,18 @@ export function FieldToConfigMappingEditor({ frame, mappings, onChange, withRedu
     }
   };
 
+  const onChangeHandlerArguments = (row: FieldToConfigRowViewModel, handlerArguments: HandlerArguments) => {
+    const existingIdx = mappings.findIndex((x) => x.fieldName === row.fieldName);
+
+    if (existingIdx !== -1) {
+      const update = [...mappings];
+      update.splice(existingIdx, 1, { ...mappings[existingIdx], handlerArguments });
+      onChange(update);
+    } else {
+      onChange([...mappings, { fieldName: row.fieldName, handlerKey: row.handlerKey, handlerArguments }]);
+    }
+  };
+
   return (
     <table className={styles.table}>
       <thead>
@@ -67,6 +89,7 @@ export function FieldToConfigMappingEditor({ frame, mappings, onChange, withRedu
           <th>Field</th>
           <th>Use as</th>
           {withReducers && <th>Select</th>}
+          {hasAdditionalSettings && <th>Additional settings</th>}
         </tr>
       </thead>
       <tbody>
@@ -91,6 +114,15 @@ export function FieldToConfigMappingEditor({ frame, mappings, onChange, withRedu
                 />
               </td>
             )}
+            {hasAdditionalSettings && (
+              <td data-testid={`${row.fieldName}-handler-arg`} className={styles.selectCell}>
+                <FieldConfigMappingHandlerArgumentsEditor
+                  handlerKey={row.handlerKey}
+                  handlerArguments={row.handlerArguments}
+                  onChange={(args) => onChangeHandlerArguments(row, args)}
+                />
+              </td>
+            )}
           </tr>
         ))}
       </tbody>
@@ -105,6 +137,7 @@ interface FieldToConfigRowViewModel {
   placeholder?: string;
   missingInFrame?: boolean;
   reducerId: string;
+  handlerArguments: HandlerArguments;
 }
 
 function getViewModelRows(
@@ -113,7 +146,7 @@ function getViewModelRows(
   withNameAndValue?: boolean
 ): FieldToConfigRowViewModel[] {
   const rows: FieldToConfigRowViewModel[] = [];
-  const mappingResult = evaluteFieldMappings(frame, mappings ?? [], withNameAndValue);
+  const mappingResult = evaluateFieldMappings(frame, mappings ?? [], withNameAndValue);
 
   for (const field of frame.fields) {
     const fieldName = getFieldDisplayName(field, frame);
@@ -126,6 +159,7 @@ function getViewModelRows(
       placeholder: mapping.automatic ? option?.label : 'Choose',
       handlerKey: mapping.handler?.key ?? null,
       reducerId: mapping.reducerId,
+      handlerArguments: mapping.handlerArguments,
     });
   }
 
@@ -140,6 +174,7 @@ function getViewModelRows(
         configOption: configHandlerToSelectOption(handler, false),
         missingInFrame: true,
         reducerId: mapping.reducerId ?? ReducerID.lastNotNull,
+        handlerArguments: {},
       });
     }
   }
diff --git a/public/app/features/transformers/fieldToConfigMapping/fieldToConfigMapping.ts b/public/app/features/transformers/fieldToConfigMapping/fieldToConfigMapping.ts
index 8eca18f14d140..b059f29cc2078 100644
--- a/public/app/features/transformers/fieldToConfigMapping/fieldToConfigMapping.ts
+++ b/public/app/features/transformers/fieldToConfigMapping/fieldToConfigMapping.ts
@@ -15,10 +15,19 @@ import {
   FieldType,
 } from '@grafana/data';
 
+export interface ThresholdArguments {
+  color: string;
+}
+
+export interface HandlerArguments {
+  threshold?: ThresholdArguments;
+}
+
 export interface FieldToConfigMapping {
   fieldName: string;
   reducerId?: ReducerID;
   handlerKey: string | null;
+  handlerArguments?: HandlerArguments;
 }
 
 /**
@@ -59,7 +68,7 @@ export function getFieldConfigFromFrame(
       continue;
     }
 
-    const newValue = handler.processor(configValue, config, context);
+    const newValue = handler.processor(configValue, config, context, mapping.handlerArguments);
     if (newValue != null) {
       (config as any)[handler.targetProperty ?? handler.key] = newValue;
     }
@@ -78,7 +87,12 @@ interface FieldToConfigContext {
   mappingTexts?: string[];
 }
 
-type FieldToConfigMapHandlerProcessor = (value: any, config: FieldConfig, context: FieldToConfigContext) => any;
+type FieldToConfigMapHandlerProcessor = (
+  value: any,
+  config: FieldConfig,
+  context: FieldToConfigContext,
+  handlerArguments: HandlerArguments
+) => any;
 
 export interface FieldToConfigMapHandler {
   key: string;
@@ -143,8 +157,9 @@ export const configMapHandlers: FieldToConfigMapHandler[] = [
   },
   {
     key: 'threshold1',
+    name: 'Threshold',
     targetProperty: 'thresholds',
-    processor: (value, config) => {
+    processor: (value, config, _, handlerArguments) => {
       const numeric = anyToNumber(value);
 
       if (isNaN(numeric)) {
@@ -160,7 +175,7 @@ export const configMapHandlers: FieldToConfigMapHandler[] = [
 
       config.thresholds.steps.push({
         value: numeric,
-        color: 'red',
+        color: handlerArguments.threshold?.color ?? 'red',
       });
 
       return config.thresholds;
@@ -278,6 +293,7 @@ export function lookUpConfigHandler(key: string | null): FieldToConfigMapHandler
 export interface EvaluatedMapping {
   automatic: boolean;
   handler: FieldToConfigMapHandler | null;
+  handlerArguments: HandlerArguments;
   reducerId: ReducerID;
 }
 export interface EvaluatedMappingResult {
@@ -286,7 +302,7 @@ export interface EvaluatedMappingResult {
   valueField?: Field;
 }
 
-export function evaluteFieldMappings(
+export function evaluateFieldMappings(
   frame: DataFrame,
   mappings: FieldToConfigMapping[],
   withNameAndValue?: boolean
@@ -337,6 +353,7 @@ export function evaluteFieldMappings(
     result.index[fieldName] = {
       automatic: !mapping,
       handler: handler,
+      handlerArguments: mapping?.handlerArguments ?? {},
       reducerId: mapping?.reducerId ?? handler?.defaultReducer ?? ReducerID.lastNotNull,
     };
   }
diff --git a/public/app/features/transformers/joinByLabels/JoinByLabelsTransformerEditor.tsx b/public/app/features/transformers/joinByLabels/JoinByLabelsTransformerEditor.tsx
index 56e3aa07bf822..ba5b48ed3dc22 100644
--- a/public/app/features/transformers/joinByLabels/JoinByLabelsTransformerEditor.tsx
+++ b/public/app/features/transformers/joinByLabels/JoinByLabelsTransformerEditor.tsx
@@ -9,6 +9,7 @@ import {
 } from '@grafana/data';
 import { Alert, HorizontalGroup, InlineField, InlineFieldRow, Select, ValuePicker } from '@grafana/ui';
 
+import { getTransformationContent } from '../docs/getTransformationContent';
 import { getDistinctLabels } from '../utils';
 
 import { joinByLabelsTransformer, JoinByLabelsTransformOptions } from './joinByLabels';
@@ -163,9 +164,5 @@ export const joinByLabelsTransformRegistryItem: TransformerRegistryItem<JoinByLa
   description: joinByLabelsTransformer.description,
   state: PluginState.beta,
   categories: new Set([TransformerCategory.Combine]),
-  //   help: `
-  // ### Use cases
-
-  // This transforms labeled results into a table
-  // `,
+  help: getTransformationContent(joinByLabelsTransformer.id).helperDocs,
 };
diff --git a/public/app/features/transformers/lookupGazetteer/FieldLookupTransformerEditor.tsx b/public/app/features/transformers/lookupGazetteer/FieldLookupTransformerEditor.tsx
index 810a0d2fb50bc..056b9f70433e7 100644
--- a/public/app/features/transformers/lookupGazetteer/FieldLookupTransformerEditor.tsx
+++ b/public/app/features/transformers/lookupGazetteer/FieldLookupTransformerEditor.tsx
@@ -14,6 +14,8 @@ import { InlineField, InlineFieldRow } from '@grafana/ui';
 import { FieldNamePicker } from '@grafana/ui/src/components/MatchersUI/FieldNamePicker';
 import { GazetteerPathEditor, GazetteerPathEditorConfigSettings } from 'app/features/geo/editor/GazetteerPathEditor';
 
+import { getTransformationContent } from '../docs/getTransformationContent';
+
 import { FieldLookupOptions, fieldLookupTransformer } from './fieldLookup';
 
 const fieldNamePickerSettings: StandardEditorsRegistryItem<string, FieldNamePickerConfigSettings> = {
@@ -82,8 +84,9 @@ export const fieldLookupTransformRegistryItem: TransformerRegistryItem<FieldLook
   id: DataTransformerID.fieldLookup,
   editor: FieldLookupTransformerEditor,
   transformation: fieldLookupTransformer,
-  name: 'Field lookup',
+  name: fieldLookupTransformer.name,
   description: `Use a field value to lookup additional fields from an external source. This currently supports spatial data, but will eventually support more formats.`,
   state: PluginState.alpha,
   categories: new Set([TransformerCategory.PerformSpatialOperations]),
+  help: getTransformationContent(DataTransformerID.fieldLookup).helperDocs,
 };
diff --git a/public/app/features/transformers/partitionByValues/PartitionByValuesEditor.tsx b/public/app/features/transformers/partitionByValues/PartitionByValuesEditor.tsx
index 3438c5dfde9e4..167ba484b6e48 100644
--- a/public/app/features/transformers/partitionByValues/PartitionByValuesEditor.tsx
+++ b/public/app/features/transformers/partitionByValues/PartitionByValuesEditor.tsx
@@ -19,6 +19,8 @@ import {
 } from '@grafana/ui';
 import { useFieldDisplayNames, useSelectOptions } from '@grafana/ui/src/components/MatchersUI/utils';
 
+import { getTransformationContent } from '../docs/getTransformationContent';
+
 import { partitionByValuesTransformer, PartitionByValuesTransformerOptions } from './partitionByValues';
 
 export function PartitionByValuesEditor({
@@ -65,6 +67,11 @@ export function PartitionByValuesEditor({
     { label: 'As frame name', value: namingModes.frameName },
   ];
 
+  const KeepFieldsOptions = [
+    { label: 'Yes', value: true },
+    { label: 'No', value: false },
+  ];
+
   const removeField = useCallback(
     (v: string) => {
       if (!v) {
@@ -133,6 +140,15 @@ export function PartitionByValuesEditor({
           />
         </InlineField>
       </InlineFieldRow>
+      <InlineFieldRow>
+        <InlineField tooltip={'Keeps the partition fields in the frames.'} label={'Keep fields'} labelWidth={16}>
+          <RadioButtonGroup
+            options={KeepFieldsOptions}
+            value={options.keepFields}
+            onChange={(v) => onChange({ ...options, keepFields: v })}
+          />
+        </InlineField>
+      </InlineFieldRow>
     </div>
   );
 }
@@ -145,4 +161,5 @@ export const partitionByValuesTransformRegistryItem: TransformerRegistryItem<Par
   description: partitionByValuesTransformer.description,
   state: PluginState.alpha,
   categories: new Set([TransformerCategory.Reformat]),
+  help: getTransformationContent(DataTransformerID.partitionByValues).helperDocs,
 };
diff --git a/public/app/features/transformers/partitionByValues/partitionByValues.ts b/public/app/features/transformers/partitionByValues/partitionByValues.ts
index d33d00f04c7a6..8368d24806db4 100644
--- a/public/app/features/transformers/partitionByValues/partitionByValues.ts
+++ b/public/app/features/transformers/partitionByValues/partitionByValues.ts
@@ -67,7 +67,9 @@ export const partitionByValuesTransformer: SynchronousDataTransformerInfo<Partit
   id: DataTransformerID.partitionByValues,
   name: 'Partition by values',
   description: `Splits a one-frame dataset into multiple series discriminated by unique/enum values in one or more fields.`,
-  defaultOptions: {},
+  defaultOptions: {
+    keepFields: false,
+  },
 
   operator: (options, ctx) => (source) =>
     source.pipe(map((data) => partitionByValuesTransformer.transformer(options, ctx)(data))),
diff --git a/public/app/features/transformers/prepareTimeSeries/PrepareTimeSeriesEditor.tsx b/public/app/features/transformers/prepareTimeSeries/PrepareTimeSeriesEditor.tsx
index ce70274f65217..a75fa3b77e2e5 100644
--- a/public/app/features/transformers/prepareTimeSeries/PrepareTimeSeriesEditor.tsx
+++ b/public/app/features/transformers/prepareTimeSeries/PrepareTimeSeriesEditor.tsx
@@ -10,6 +10,8 @@ import {
 } from '@grafana/data';
 import { InlineField, InlineFieldRow, Select, useStyles2 } from '@grafana/ui';
 
+import { getTransformationContent } from '../docs/getTransformationContent';
+
 import { prepareTimeSeriesTransformer, PrepareTimeSeriesOptions, timeSeriesFormat } from './prepareTimeSeries';
 
 const wideInfo = {
@@ -118,12 +120,6 @@ export const prepareTimeseriesTransformerRegistryItem: TransformerRegistryItem<P
   transformation: prepareTimeSeriesTransformer,
   name: prepareTimeSeriesTransformer.name,
   description: prepareTimeSeriesTransformer.description,
-  help: `
-  ### Use cases
-
-  This takes query results and transforms them into a predictable timeseries format.
-  This transformer may be especially useful when using old panels that only expect the
-  many-frame timeseries format.
-  `,
   categories: new Set([TransformerCategory.Reformat]),
+  help: getTransformationContent(prepareTimeSeriesTransformer.id).helperDocs,
 };
diff --git a/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.test.ts b/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.test.ts
index c27ea9c866155..a9def1abca6b0 100644
--- a/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.test.ts
+++ b/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.test.ts
@@ -39,7 +39,7 @@ describe('Prepare time series transformer', () => {
         fields: [
           { name: 'time', type: FieldType.time, values: [1, 2, 3, 4, 5, 6] },
           { name: 'count', type: FieldType.number, values: [10, 20, 30, 40, 50, 60] },
-        ],
+        ] as DataFrame['fields'],
         meta: {
           type: DataFrameType.TimeSeriesMulti,
         },
@@ -51,7 +51,7 @@ describe('Prepare time series transformer', () => {
         fields: [
           { name: 'time', type: FieldType.time, values: [1, 2, 3, 4, 5, 6] },
           { name: 'more', type: FieldType.number, values: [2, 3, 4, 5, 6, 7] },
-        ],
+        ] as DataFrame['fields'],
         meta: {
           type: DataFrameType.TimeSeriesMulti,
         },
@@ -181,7 +181,7 @@ describe('Prepare time series transformer', () => {
         fields: [
           { name: 'time', type: FieldType.time, values: [0, 1, 2, 3, 4, 5] },
           { name: 'another', type: FieldType.number, values: [2, 3, 4, 5, 6, 7] },
-        ],
+        ] as DataFrame['fields'],
         length: 6,
         meta: {
           type: DataFrameType.TimeSeriesMulti,
@@ -193,7 +193,7 @@ describe('Prepare time series transformer', () => {
         fields: [
           { name: 'time', type: FieldType.time, values: [0, 1, 2, 3, 4, 5] },
           { name: 'count', type: FieldType.number, values: [10, 20, 30, 40, 50, 60] },
-        ],
+        ] as DataFrame['fields'],
         length: 6,
         meta: {
           type: DataFrameType.TimeSeriesMulti,
@@ -205,7 +205,7 @@ describe('Prepare time series transformer', () => {
         fields: [
           { name: 'time', type: FieldType.time, values: [4, 5, 6, 7, 8, 9] },
           { name: 'value', type: FieldType.number, values: [2, 3, 4, 5, 6, 7] },
-        ],
+        ] as DataFrame['fields'],
         length: 6,
         meta: {
           type: DataFrameType.TimeSeriesMulti,
@@ -304,7 +304,7 @@ describe('Prepare time series transformer', () => {
         fields: [
           { name: 'time', type: FieldType.time, values: [1, 2, 3] },
           { name: 'value', labels: { region: 'a' }, type: FieldType.number, values: [10, 30, 50] },
-        ],
+        ] as DataFrame['fields'],
         length: 3,
         meta: {
           type: DataFrameType.TimeSeriesMulti,
@@ -316,7 +316,7 @@ describe('Prepare time series transformer', () => {
         fields: [
           { name: 'time', type: FieldType.time, values: [1, 2, 3] },
           { name: 'value', labels: { region: 'b' }, type: FieldType.number, values: [20, 40, 60] },
-        ],
+        ] as DataFrame['fields'],
         length: 3,
         meta: {
           type: DataFrameType.TimeSeriesMulti,
@@ -351,7 +351,7 @@ describe('Prepare time series transformer', () => {
         fields: [
           { name: 'time', type: FieldType.time, values: [1, 2, 3] },
           { name: 'value', labels: { region: 'a' }, type: FieldType.number, values: [10, 30, 50] },
-        ],
+        ] as DataFrame['fields'],
         length: 3,
         meta: {
           type: DataFrameType.TimeSeriesMulti,
@@ -363,7 +363,7 @@ describe('Prepare time series transformer', () => {
         fields: [
           { name: 'time', type: FieldType.time, values: [1, 2, 3] },
           { name: 'value', labels: { region: 'b' }, type: FieldType.number, values: [20, 40, 60] },
-        ],
+        ] as DataFrame['fields'],
         length: 3,
         meta: {
           type: DataFrameType.TimeSeriesMulti,
@@ -415,7 +415,7 @@ describe('Prepare time series transformer', () => {
   });
 });
 
-function toEquableDataFrame(source: any): DataFrame {
+function toEquableDataFrame(source: DataFrame): DataFrame {
   return toDataFrame({
     meta: undefined,
     ...source,
diff --git a/public/app/features/transformers/regression/regression.test.ts b/public/app/features/transformers/regression/regression.test.ts
new file mode 100644
index 0000000000000..00dd836f06453
--- /dev/null
+++ b/public/app/features/transformers/regression/regression.test.ts
@@ -0,0 +1,199 @@
+import {
+  DataFrame,
+  DataFrameDTO,
+  DataTransformContext,
+  Field,
+  FieldType,
+  toDataFrame,
+  toDataFrameDTO,
+} from '@grafana/data';
+
+import { ModelType, RegressionTransformer, RegressionTransformerOptions } from './regression';
+
+describe('Regression transformation', () => {
+  it('it should predict a linear regression to exactly fit the data when the data is f(x) = x', () => {
+    const source = [
+      toDataFrame({
+        name: 'data',
+        refId: 'A',
+        fields: [
+          { name: 'time', type: FieldType.time, values: [0, 1, 2, 3, 4, 5] },
+          { name: 'value', type: FieldType.number, values: [0, 1, 2, 3, 4, 5] },
+        ],
+      }),
+    ];
+
+    const config: RegressionTransformerOptions = {
+      modelType: ModelType.linear,
+      predictionCount: 6,
+      xFieldName: 'time',
+      yFieldName: 'value',
+    };
+
+    expect(toEquableDataFrames(RegressionTransformer.transformer(config, {} as DataTransformContext)(source))).toEqual(
+      toEquableDataFrames([
+        toEquableDataFrame({
+          name: 'data',
+          refId: 'A',
+          fields: [
+            { name: 'time', type: FieldType.time, values: [0, 1, 2, 3, 4, 5], config: {} },
+            { name: 'value', type: FieldType.number, values: [0, 1, 2, 3, 4, 5], config: {} },
+          ],
+          length: 6,
+        }),
+        toEquableDataFrame({
+          name: 'linear regression',
+          fields: [
+            { name: 'time', type: FieldType.time, values: [0, 1, 2, 3, 4, 5], config: {} },
+            { name: 'value predicted', type: FieldType.number, values: [0, 1, 2, 3, 4, 5], config: {} },
+          ],
+          length: 6,
+        }),
+      ])
+    );
+  });
+  it('it should predict a linear regression where f(x) = 1', () => {
+    const source = [
+      toDataFrame({
+        name: 'data',
+        refId: 'A',
+        fields: [
+          { name: 'time', type: FieldType.time, values: [0, 1, 2, 3, 4, 5] },
+          { name: 'value', type: FieldType.number, values: [0, 1, 2, 2, 1, 0] },
+        ],
+      }),
+    ];
+
+    const config: RegressionTransformerOptions = {
+      modelType: ModelType.linear,
+      predictionCount: 6,
+      xFieldName: 'time',
+      yFieldName: 'value',
+    };
+
+    expect(toEquableDataFrames(RegressionTransformer.transformer(config, {} as DataTransformContext)(source))).toEqual(
+      toEquableDataFrames([
+        toEquableDataFrame({
+          name: 'data',
+          refId: 'A',
+          fields: [
+            { name: 'time', type: FieldType.time, values: [0, 1, 2, 3, 4, 5], config: {} },
+            { name: 'value', type: FieldType.number, values: [0, 1, 2, 2, 1, 0], config: {} },
+          ],
+          length: 6,
+        }),
+        toEquableDataFrame({
+          name: 'linear regression',
+          fields: [
+            { name: 'time', type: FieldType.time, values: [0, 1, 2, 3, 4, 5], config: {} },
+            { name: 'value predicted', type: FieldType.number, values: [1, 1, 1, 1, 1, 1], config: {} },
+          ],
+          length: 6,
+        }),
+      ])
+    );
+  });
+
+  it('it should predict a quadratic function', () => {
+    const source = [
+      toDataFrame({
+        name: 'data',
+        refId: 'A',
+        fields: [
+          { name: 'time', type: FieldType.time, values: [0, 1, 2, 3, 4, 5] },
+          { name: 'value', type: FieldType.number, values: [0, 1, 2, 2, 1, 0] },
+        ],
+      }),
+    ];
+
+    const config: RegressionTransformerOptions = {
+      modelType: ModelType.polynomial,
+      degree: 2,
+      predictionCount: 6,
+      xFieldName: 'time',
+      yFieldName: 'value',
+    };
+
+    const result = RegressionTransformer.transformer(config, {} as DataTransformContext)(source);
+
+    expect(result[1].fields[1].values[0]).toBeCloseTo(-0.1, 1);
+    expect(result[1].fields[1].values[1]).toBeCloseTo(1.2, 1);
+    expect(result[1].fields[1].values[2]).toBeCloseTo(1.86, 1);
+    expect(result[1].fields[1].values[3]).toBeCloseTo(1.86, 1);
+    expect(result[1].fields[1].values[4]).toBeCloseTo(1.2, 1);
+    expect(result[1].fields[1].values[5]).toBeCloseTo(-0.1, 1);
+  });
+
+  it('should have the last x point be equal to the last x point of the data', () => {
+    const source = [
+      toDataFrame({
+        name: 'data',
+        refId: 'A',
+        fields: [
+          { name: 'time', type: FieldType.time, values: [0, 1, 2, 3, 4] },
+          { name: 'value', type: FieldType.number, values: [1, 1, 1, 1, 1] },
+        ],
+      }),
+    ];
+
+    const config: RegressionTransformerOptions = {
+      modelType: ModelType.polynomial,
+      degree: 2,
+      predictionCount: 10,
+      xFieldName: 'time',
+      yFieldName: 'value',
+    };
+
+    const result = RegressionTransformer.transformer(config, {} as DataTransformContext)(source);
+
+    expect(result[1].fields[0].values[0]).toBe(0);
+    expect(result[1].fields[0].values[1]).toBeCloseTo(0.44, 1);
+    expect(result[1].fields[0].values[4]).toBeCloseTo(1.76, 1);
+    expect(result[1].fields[0].values[8]).toBeCloseTo(3.55, 1);
+    expect(result[1].fields[0].values[9]).toBe(4);
+  });
+
+  it('should filter NaNs', () => {
+    const source = [
+      toDataFrame({
+        name: 'data',
+        refId: 'A',
+        fields: [
+          { name: 'y', type: FieldType.number, values: [0, 1, 2, 3, NaN] },
+          { name: 'x', type: FieldType.number, values: [0, 1, 2, 3, 4] },
+        ],
+      }),
+    ];
+
+    const config: RegressionTransformerOptions = {
+      modelType: ModelType.linear,
+      predictionCount: 5,
+      xFieldName: 'x',
+      yFieldName: 'y',
+    };
+
+    const result = RegressionTransformer.transformer(config, {} as DataTransformContext)(source);
+
+    expect(result[1].fields[1].values[0]).toBe(0);
+    expect(result[1].fields[1].values[1]).toBe(1);
+    expect(result[1].fields[1].values[2]).toBe(2);
+    expect(result[1].fields[1].values[3]).toBe(3);
+    expect(result[1].fields[1].values[4]).toBe(4);
+  });
+});
+
+function toEquableDataFrame(source: DataFrame): DataFrame {
+  return toDataFrame({
+    ...source,
+    fields: source.fields.map((field: Field) => {
+      return {
+        ...field,
+        config: {},
+      };
+    }),
+  });
+}
+
+function toEquableDataFrames(data: DataFrame[]): DataFrameDTO[] {
+  return data.map((frame) => toDataFrameDTO(frame));
+}
diff --git a/public/app/features/transformers/regression/regression.ts b/public/app/features/transformers/regression/regression.ts
new file mode 100644
index 0000000000000..80e7036728481
--- /dev/null
+++ b/public/app/features/transformers/regression/regression.ts
@@ -0,0 +1,125 @@
+import { PolynomialRegression } from 'ml-regression-polynomial';
+import { SimpleLinearRegression } from 'ml-regression-simple-linear';
+import { map } from 'rxjs';
+
+import {
+  DataFrame,
+  DataTransformerID,
+  FieldMatcherID,
+  FieldType,
+  SynchronousDataTransformerInfo,
+  fieldMatchers,
+  getFieldDisplayName,
+} from '@grafana/data';
+
+export enum ModelType {
+  linear = 'linear',
+  polynomial = 'polynomial',
+}
+
+export interface RegressionTransformerOptions {
+  modelType?: ModelType;
+  degree?: number;
+  xFieldName?: string;
+  yFieldName?: string;
+  predictionCount?: number;
+}
+
+export const DEFAULTS = { predictionCount: 100, modelType: ModelType.linear, degree: 2 };
+
+export const RegressionTransformer: SynchronousDataTransformerInfo<RegressionTransformerOptions> = {
+  id: DataTransformerID.regression,
+  name: 'Regression analysis',
+  operator: (options, ctx) => (source) =>
+    source.pipe(map((data) => RegressionTransformer.transformer(options, ctx)(data))),
+  transformer: (options, ctx) => {
+    return (frames: DataFrame[]) => {
+      const { predictionCount, modelType, degree } = { ...DEFAULTS, ...options };
+      if (frames.length === 0) {
+        return frames;
+      }
+      const matchesY = fieldMatchers.get(FieldMatcherID.byName).get(options.yFieldName);
+      const matchesX = fieldMatchers.get(FieldMatcherID.byName).get(options.xFieldName);
+
+      let xField;
+      let yField;
+      let predictFromFrame;
+      for (const frame of frames) {
+        const fy = frame.fields.find((f) => matchesY(f, frame, frames));
+        if (fy) {
+          yField = fy;
+          const fx = frame.fields.find((f) => matchesX(f, frame, frames));
+          if (fx) {
+            xField = fx;
+            predictFromFrame = frame;
+            break;
+          } else {
+            throw 'X and Y fields must be part of the same frame';
+          }
+        }
+      }
+
+      if (!xField || !yField) {
+        return frames;
+      }
+
+      let xMin = xField.values[0];
+      let xMax = xField.values[0];
+
+      for (let i = 1; i < xField.values.length; i++) {
+        if (xField.values[i] < xMin) {
+          xMin = xField.values[i];
+        }
+        if (xField.values[i] > xMax) {
+          xMax = xField.values[i];
+        }
+      }
+
+      const resolution = (xMax - xMin) / (predictionCount - 1);
+
+      // These are the X values for which we should predict Y
+      const predictionPoints = [...[...Array(predictionCount - 1).keys()].map((_, i) => i * resolution + xMin), xMax];
+
+      // If X is a time field we normalize the time to the start of the timeseries data
+      const normalizationSubtrahend = xField.type === FieldType.time ? xMin : 0;
+
+      const yValues = [];
+      const xValues = [];
+
+      for (let i = 0; i < xField.values.length; i++) {
+        if (yField.values[i] !== null && !isNaN(yField.values[i])) {
+          xValues.push(xField.values[i] - normalizationSubtrahend);
+          yValues.push(yField.values[i]);
+        }
+      }
+
+      let result: PolynomialRegression | SimpleLinearRegression;
+      switch (modelType) {
+        case ModelType.linear:
+          result = new SimpleLinearRegression(xValues, yValues);
+          break;
+        case ModelType.polynomial:
+          result = new PolynomialRegression(xValues, yValues, degree);
+          break;
+        default:
+          return frames;
+      }
+
+      const newFrame: DataFrame = {
+        name: `${modelType} regression`,
+        length: predictionPoints.length,
+        fields: [
+          { name: xField.name, type: xField.type, values: predictionPoints, config: {} },
+          {
+            name: `${getFieldDisplayName(yField, predictFromFrame, frames)} predicted`,
+            type: yField.type,
+            values: predictionPoints.map((x) => result.predict(x - normalizationSubtrahend)),
+            config: {},
+          },
+        ],
+      };
+
+      return [...frames, newFrame];
+    };
+  },
+};
diff --git a/public/app/features/transformers/regression/regressionEditor.test.tsx b/public/app/features/transformers/regression/regressionEditor.test.tsx
new file mode 100644
index 0000000000000..58c91a79298ca
--- /dev/null
+++ b/public/app/features/transformers/regression/regressionEditor.test.tsx
@@ -0,0 +1,87 @@
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+
+import { FieldType, toDataFrame } from '@grafana/data';
+
+import { ModelType } from './regression';
+import { RegressionTransformerEditor } from './regressionEditor';
+
+describe('FieldToConfigMappingEditor', () => {
+  it('Should try to set the first time field as X and first number field as Y', async () => {
+    const onChangeMock = jest.fn();
+
+    const df = toDataFrame({
+      name: 'data',
+      refId: 'A',
+      fields: [
+        { name: 'time', type: FieldType.time, values: [0, 1, 2, 3, 4, 5] },
+        { name: 'not this', type: FieldType.time, values: [0, 1, 2, 3, 4, 5] },
+        { name: 'value', type: FieldType.number, values: [0, 1, 2, 3, 4, 5] },
+        { name: 'not this either', type: FieldType.number, values: [0, 1, 2, 3, 4, 5] },
+      ],
+    });
+
+    render(<RegressionTransformerEditor input={[df]} onChange={onChangeMock} options={{}} />);
+
+    expect(onChangeMock).toBeCalledTimes(1);
+    expect(onChangeMock).toBeCalledWith({ xFieldName: 'time', yFieldName: 'value' });
+  });
+
+  it('Should set the first field as X and the second as Y if there are no time fields', async () => {
+    const onChangeMock = jest.fn();
+
+    const df = toDataFrame({
+      name: 'data',
+      refId: 'A',
+      fields: [
+        { name: 'not this', type: FieldType.string, values: [0, 1, 2, 3, 4, 5] },
+        { name: 'foo', type: FieldType.number, values: [0, 1, 2, 3, 4, 5] },
+        { name: 'bar', type: FieldType.number, values: [0, 1, 2, 3, 4, 5] },
+        { name: 'not this either', type: FieldType.number, values: [0, 1, 2, 3, 4, 5] },
+      ],
+    });
+
+    render(<RegressionTransformerEditor input={[df]} onChange={onChangeMock} options={{}} />);
+
+    expect(onChangeMock).toBeCalledTimes(1);
+    expect(onChangeMock).toBeCalledWith({ xFieldName: 'foo', yFieldName: 'bar' });
+  });
+
+  it('should display degree if the model is polynomial', async () => {
+    const onChangeMock = jest.fn();
+
+    const df = toDataFrame({
+      name: 'data',
+      refId: 'A',
+      fields: [
+        { name: 'foo', type: FieldType.number, values: [0, 1, 2, 3, 4, 5] },
+        { name: 'bar', type: FieldType.number, values: [0, 1, 2, 3, 4, 5] },
+      ],
+    });
+
+    render(
+      <RegressionTransformerEditor input={[df]} onChange={onChangeMock} options={{ modelType: ModelType.polynomial }} />
+    );
+
+    expect(await screen.findByText('Degree')).toBeInTheDocument();
+  });
+
+  it('should not display degree if the model is linear', async () => {
+    const onChangeMock = jest.fn();
+
+    const df = toDataFrame({
+      name: 'data',
+      refId: 'A',
+      fields: [
+        { name: 'foo', type: FieldType.number, values: [0, 1, 2, 3, 4, 5] },
+        { name: 'bar', type: FieldType.number, values: [0, 1, 2, 3, 4, 5] },
+      ],
+    });
+
+    render(
+      <RegressionTransformerEditor input={[df]} onChange={onChangeMock} options={{ modelType: ModelType.linear }} />
+    );
+
+    expect(await screen.queryByText('Degree')).not.toBeInTheDocument();
+  });
+});
diff --git a/public/app/features/transformers/regression/regressionEditor.tsx b/public/app/features/transformers/regression/regressionEditor.tsx
new file mode 100644
index 0000000000000..21f112eca8ce2
--- /dev/null
+++ b/public/app/features/transformers/regression/regressionEditor.tsx
@@ -0,0 +1,142 @@
+import React, { useEffect } from 'react';
+
+import {
+  DataTransformerID,
+  TransformerRegistryItem,
+  TransformerUIProps,
+  TransformerCategory,
+  fieldMatchers,
+  FieldMatcherID,
+  Field,
+} from '@grafana/data';
+import { InlineField, Select } from '@grafana/ui';
+import { FieldNamePicker } from '@grafana/ui/src/components/MatchersUI/FieldNamePicker';
+import { NumberInput } from 'app/core/components/OptionsUI/NumberInput';
+
+import { getTransformationContent } from '../docs/getTransformationContent';
+
+import { DEFAULTS, ModelType, RegressionTransformer, RegressionTransformerOptions } from './regression';
+
+const fieldNamePickerSettings = {
+  editor: FieldNamePicker,
+  id: '',
+  name: '',
+  settings: { width: 24, isClearable: false },
+};
+
+const LABEL_WIDTH = 20;
+
+export const RegressionTransformerEditor = ({
+  input,
+  options,
+  onChange,
+}: TransformerUIProps<RegressionTransformerOptions>) => {
+  const modelTypeOptions = [
+    { label: 'Linear', value: ModelType.linear },
+    { label: 'Polynomial', value: ModelType.polynomial },
+  ];
+
+  useEffect(() => {
+    let x: Field | undefined;
+    let y: Field | undefined;
+    if (!options.xFieldName) {
+      const timeMatcher = fieldMatchers.get(FieldMatcherID.firstTimeField).get({});
+      for (const frame of input) {
+        x = frame.fields.find((field) => timeMatcher(field, frame, input));
+        if (x) {
+          break;
+        }
+      }
+      if (!x) {
+        const firstMatcher = fieldMatchers.get(FieldMatcherID.numeric).get({});
+        for (const frame of input) {
+          x = frame.fields.find((field) => firstMatcher(field, frame, input));
+          if (x) {
+            break;
+          }
+        }
+      }
+    }
+    if (!options.yFieldName) {
+      const numberMatcher = fieldMatchers.get(FieldMatcherID.numeric).get({});
+      for (const frame of input) {
+        y = frame.fields.find((field) => numberMatcher(field, frame, input) && field !== x);
+        if (y) {
+          break;
+        }
+      }
+    }
+
+    if (x && y) {
+      onChange({ ...options, xFieldName: x.name, yFieldName: y.name });
+    }
+  });
+
+  return (
+    <>
+      <InlineField labelWidth={LABEL_WIDTH} label="X field">
+        <FieldNamePicker
+          context={{ data: input }}
+          value={options.xFieldName ?? ''}
+          item={fieldNamePickerSettings}
+          onChange={(v) => {
+            onChange({ ...options, xFieldName: v });
+          }}
+        ></FieldNamePicker>
+      </InlineField>
+      <InlineField labelWidth={LABEL_WIDTH} label="Y field">
+        <FieldNamePicker
+          context={{ data: input }}
+          value={options.yFieldName ?? ''}
+          item={fieldNamePickerSettings}
+          onChange={(v) => {
+            onChange({ ...options, yFieldName: v });
+          }}
+        ></FieldNamePicker>
+      </InlineField>
+      <InlineField labelWidth={LABEL_WIDTH} label="Model type">
+        <Select
+          value={options.modelType ?? DEFAULTS.modelType}
+          onChange={(v) => {
+            onChange({ ...options, modelType: v.value ?? DEFAULTS.modelType });
+          }}
+          options={modelTypeOptions}
+        ></Select>
+      </InlineField>
+      <InlineField labelWidth={LABEL_WIDTH} label="Predicted points" tooltip={'Number of X,Y points to predict'}>
+        <NumberInput
+          value={options.predictionCount ?? DEFAULTS.predictionCount}
+          onChange={(v) => {
+            onChange({ ...options, predictionCount: v });
+          }}
+        ></NumberInput>
+      </InlineField>
+      {options.modelType === ModelType.polynomial && (
+        <InlineField labelWidth={LABEL_WIDTH} label="Degree">
+          <Select<number>
+            value={options.degree ?? DEFAULTS.degree}
+            options={[
+              { label: 'Quadratic', value: 2 },
+              { label: 'Cubic', value: 3 },
+              { label: 'Quartic', value: 4 },
+              { label: 'Quintic', value: 5 },
+            ]}
+            onChange={(v) => {
+              onChange({ ...options, degree: v.value });
+            }}
+          ></Select>
+        </InlineField>
+      )}
+    </>
+  );
+};
+
+export const regressionTransformerRegistryItem: TransformerRegistryItem<RegressionTransformerOptions> = {
+  id: DataTransformerID.regression,
+  editor: RegressionTransformerEditor,
+  transformation: RegressionTransformer,
+  name: RegressionTransformer.name,
+  description: RegressionTransformer.description,
+  categories: new Set([TransformerCategory.CalculateNewFields]),
+  help: getTransformationContent(DataTransformerID.regression).helperDocs,
+};
diff --git a/public/app/features/transformers/rowsToFields/RowsToFieldsTransformerEditor.tsx b/public/app/features/transformers/rowsToFields/RowsToFieldsTransformerEditor.tsx
index e0991af12589f..5f25ebb92e858 100644
--- a/public/app/features/transformers/rowsToFields/RowsToFieldsTransformerEditor.tsx
+++ b/public/app/features/transformers/rowsToFields/RowsToFieldsTransformerEditor.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 
 import { PluginState, TransformerRegistryItem, TransformerUIProps, TransformerCategory } from '@grafana/data';
 
+import { getTransformationContent } from '../docs/getTransformationContent';
 import { FieldToConfigMappingEditor } from '../fieldToConfigMapping/FieldToConfigMappingEditor';
 
 import { rowsToFieldsTransformer, RowToFieldsTransformOptions } from './rowsToFields';
@@ -33,39 +34,5 @@ export const rowsToFieldsTransformRegistryItem: TransformerRegistryItem<RowToFie
   description: rowsToFieldsTransformer.description,
   state: PluginState.beta,
   categories: new Set([TransformerCategory.Reformat]),
-  help: `
-### Use cases 
-
-This transforms rows into separate fields. This can be useful as fields can be styled and configured 
-individually, something rows cannot. It can also use additional fields as sources for dynamic field 
-configuration or map them to field labels. The additional labels can then be used to define better 
-display names for the resulting fields.
-
-Useful when visualization data in:
-- Gauge
-- Stat
-- Pie chart
-
-## Example
-
-Input:
-
-| Name    | Value | Max |
-| ------- | ----- | --- |
-| ServerA | 10    | 100 |
-| ServerB | 20    | 200 |
-| ServerC | 30    | 300 |
-
-Output:
-
-| ServerA (config: max=100) | ServerB (config: max=200) | ServerC (config: max=300) |
-| ------------------------- | ------------------------- | ------------------------- |
-| 10                        | 20                        | 30                        |
-
-As you can see each row in the source data becomes a separate field. Each field now also has a max 
-config option set. Options like **Min**, **Max**, **Unit** and **Thresholds** are all part of field 
-configuration and if set like this will be used by the visualization instead of any options manually 
-configured in the panel editor options pane.
-
-`,
+  help: getTransformationContent(rowsToFieldsTransformer.id).helperDocs,
 };
diff --git a/public/app/features/transformers/rowsToFields/rowsToFields.ts b/public/app/features/transformers/rowsToFields/rowsToFields.ts
index 51f0b9fc91153..6232f3f55462d 100644
--- a/public/app/features/transformers/rowsToFields/rowsToFields.ts
+++ b/public/app/features/transformers/rowsToFields/rowsToFields.ts
@@ -4,7 +4,7 @@ import { DataFrame, DataTransformerID, DataTransformerInfo, Field, getFieldDispl
 
 import {
   EvaluatedMappingResult,
-  evaluteFieldMappings,
+  evaluateFieldMappings,
   FieldConfigHandlerKey,
   FieldToConfigMapping,
   getFieldConfigFromFrame,
@@ -35,7 +35,7 @@ export const rowsToFieldsTransformer: DataTransformerInfo<RowToFieldsTransformOp
 };
 
 export function rowsToFields(options: RowToFieldsTransformOptions, data: DataFrame): DataFrame {
-  const mappingResult = evaluteFieldMappings(data, options.mappings ?? [], true);
+  const mappingResult = evaluateFieldMappings(data, options.mappings ?? [], true);
   const { nameField, valueField } = mappingResult;
 
   if (!nameField || !valueField) {
diff --git a/public/app/features/transformers/spatial/SpatialTransformerEditor.tsx b/public/app/features/transformers/spatial/SpatialTransformerEditor.tsx
index 7834e820a617a..26110039d51ec 100644
--- a/public/app/features/transformers/spatial/SpatialTransformerEditor.tsx
+++ b/public/app/features/transformers/spatial/SpatialTransformerEditor.tsx
@@ -15,6 +15,8 @@ import { FrameGeometrySourceMode } from '@grafana/schema';
 import { useTheme2 } from '@grafana/ui';
 import { addLocationFields } from 'app/features/geo/editor/locationEditor';
 
+import { getTransformationContent } from '../docs/getTransformationContent';
+
 import { SpatialCalculation, SpatialOperation, SpatialAction, SpatialTransformOptions } from './models.gen';
 import { getDefaultOptions, getTransformerOptionPane } from './optionsHelper';
 import { isLineBuilderOption, spatialTransformer } from './spatialTransformer';
@@ -165,4 +167,5 @@ export const spatialTransformRegistryItem: TransformerRegistryItem<SpatialTransf
   description: spatialTransformer.description,
   state: PluginState.alpha,
   categories: new Set([TransformerCategory.PerformSpatialOperations]),
+  help: getTransformationContent(DataTransformerID.spatial).helperDocs,
 };
diff --git a/public/app/features/transformers/standardTransformers.ts b/public/app/features/transformers/standardTransformers.ts
index c8af140e88936..04f45d20e2195 100644
--- a/public/app/features/transformers/standardTransformers.ts
+++ b/public/app/features/transformers/standardTransformers.ts
@@ -12,6 +12,7 @@ import { filterFramesByRefIdTransformRegistryItem } from './editors/FilterByRefI
 import { formatStringTransformerRegistryItem } from './editors/FormatStringTransformerEditor';
 import { formatTimeTransformerRegistryItem } from './editors/FormatTimeTransformerEditor';
 import { groupByTransformRegistryItem } from './editors/GroupByTransformerEditor';
+import { groupToNestedTableTransformRegistryItem } from './editors/GroupToNestedTableTransformerEditor';
 import { groupingToMatrixTransformRegistryItem } from './editors/GroupingToMatrixTransformerEditor';
 import { histogramTransformRegistryItem } from './editors/HistogramTransformerEditor';
 import { joinByFieldTransformerRegistryItem } from './editors/JoinByFieldTransformerEditor';
@@ -28,6 +29,7 @@ import { joinByLabelsTransformRegistryItem } from './joinByLabels/JoinByLabelsTr
 import { fieldLookupTransformRegistryItem } from './lookupGazetteer/FieldLookupTransformerEditor';
 import { partitionByValuesTransformRegistryItem } from './partitionByValues/PartitionByValuesEditor';
 import { prepareTimeseriesTransformerRegistryItem } from './prepareTimeSeries/PrepareTimeSeriesEditor';
+import { regressionTransformerRegistryItem } from './regression/regressionEditor';
 import { rowsToFieldsTransformRegistryItem } from './rowsToFields/RowsToFieldsTransformerEditor';
 import { spatialTransformRegistryItem } from './spatial/SpatialTransformerEditor';
 import { timeSeriesTableTransformRegistryItem } from './timeSeriesTable/TimeSeriesTableTransformEditor';
@@ -62,6 +64,8 @@ export const getStandardTransformers = (): Array<TransformerRegistryItem<any>> =
     joinByLabelsTransformRegistryItem,
     partitionByValuesTransformRegistryItem,
     ...(config.featureToggles.formatString ? [formatStringTransformerRegistryItem] : []),
+    ...(config.featureToggles.regressionTransformation ? [regressionTransformerRegistryItem] : []),
+    ...(config.featureToggles.groupToNestedTableTransformation ? [groupToNestedTableTransformRegistryItem] : []),
     formatTimeTransformerRegistryItem,
     timeSeriesTableTransformRegistryItem,
   ];
diff --git a/public/app/features/transformers/suggestionsInput/SuggestionsInput.tsx b/public/app/features/transformers/suggestionsInput/SuggestionsInput.tsx
index fb0ef1f759272..81fa439d02d59 100644
--- a/public/app/features/transformers/suggestionsInput/SuggestionsInput.tsx
+++ b/public/app/features/transformers/suggestionsInput/SuggestionsInput.tsx
@@ -1,6 +1,6 @@
 import { css } from '@emotion/css';
-import React, { FormEvent, useEffect, useRef, useState } from 'react';
-import { Popper as ReactPopper } from 'react-popper';
+import { autoUpdate, flip, shift, useFloating } from '@floating-ui/react';
+import React, { FormEvent, useCallback, useEffect, useRef, useState } from 'react';
 
 import { GrafanaTheme2, VariableSuggestion } from '@grafana/data';
 import { CustomScrollbar, FieldValidationMessage, Input, Portal, useTheme2 } from '@grafana/ui';
@@ -55,7 +55,36 @@ export const SuggestionsInput = ({
   const theme = useTheme2();
   const styles = getStyles(theme, inputHeight);
 
-  const inputRef = useRef<HTMLInputElement>(null);
+  const inputRef = useRef<HTMLInputElement>();
+
+  // the order of middleware is important!
+  const middleware = [
+    flip({
+      fallbackAxisSideDirection: 'start',
+      // see https://floating-ui.com/docs/flip#combining-with-shift
+      crossAxis: false,
+      boundary: document.body,
+    }),
+    shift(),
+  ];
+
+  const { refs, floatingStyles } = useFloating({
+    open: showingSuggestions,
+    placement: 'bottom-start',
+    onOpenChange: setShowingSuggestions,
+    middleware,
+    whileElementsMounted: autoUpdate,
+    strategy: 'fixed',
+  });
+
+  const handleRef = useCallback(
+    (ref: HTMLInputElement) => {
+      refs.setReference(ref);
+
+      inputRef.current = ref;
+    },
+    [refs]
+  );
 
   // Used to get the height of the suggestion elements in order to scroll to them.
   const activeRef = useRef<HTMLDivElement>(null);
@@ -137,53 +166,25 @@ export const SuggestionsInput = ({
     <div className={styles.inputWrapper}>
       {showingSuggestions && (
         <Portal>
-          <ReactPopper
-            referenceElement={inputRef.current!}
-            placement="bottom-start"
-            modifiers={[
-              {
-                name: 'preventOverflow',
-                enabled: true,
-                options: {
-                  rootBoundary: 'viewport',
-                },
-              },
-              {
-                name: 'arrow',
-                enabled: false,
-              },
-              {
-                name: 'offset',
-                options: {
-                  offset: [0, 0],
-                },
-              },
-            ]}
-          >
-            {({ ref, style, placement }) => {
-              return (
-                <div ref={ref} style={style} data-placement={placement} className={styles.suggestionsWrapper}>
-                  <CustomScrollbar
-                    scrollTop={scrollTop}
-                    autoHeightMax="300px"
-                    setScrollTop={({ scrollTop }) => setScrollTop(scrollTop)}
-                  >
-                    {/* This suggestion component has a specialized name,
-                          but is rather generalistic in implementation,
-                          so we're using it in transformations also. 
-                          We should probably rename this to something more general. */}
-                    <DataLinkSuggestions
-                      activeRef={activeRef}
-                      suggestions={suggestions}
-                      onSuggestionSelect={onVariableSelect}
-                      onClose={() => setShowingSuggestions(false)}
-                      activeIndex={suggestionsIndex}
-                    />
-                  </CustomScrollbar>
-                </div>
-              );
-            }}
-          </ReactPopper>
+          <div ref={refs.setFloating} style={floatingStyles} className={styles.suggestionsWrapper}>
+            <CustomScrollbar
+              scrollTop={scrollTop}
+              autoHeightMax="300px"
+              setScrollTop={({ scrollTop }) => setScrollTop(scrollTop)}
+            >
+              {/* This suggestion component has a specialized name,
+                    but is rather generalistic in implementation,
+                    so we're using it in transformations also.
+                    We should probably rename this to something more general. */}
+              <DataLinkSuggestions
+                activeRef={activeRef}
+                suggestions={suggestions}
+                onSuggestionSelect={onVariableSelect}
+                onClose={() => setShowingSuggestions(false)}
+                activeIndex={suggestionsIndex}
+              />
+            </CustomScrollbar>
+          </div>
         </Portal>
       )}
       {invalid && error && (
@@ -194,7 +195,7 @@ export const SuggestionsInput = ({
       <Input
         placeholder={placeholder}
         invalid={invalid}
-        ref={inputRef}
+        ref={handleRef}
         value={variableValue}
         onChange={onValueChanged}
         onBlur={onBlur}
diff --git a/public/app/features/transformers/timeSeriesTable/TimeSeriesTableTransformEditor.tsx b/public/app/features/transformers/timeSeriesTable/TimeSeriesTableTransformEditor.tsx
index 1d4d6ad5df224..872316bb0deb9 100644
--- a/public/app/features/transformers/timeSeriesTable/TimeSeriesTableTransformEditor.tsx
+++ b/public/app/features/transformers/timeSeriesTable/TimeSeriesTableTransformEditor.tsx
@@ -1,30 +1,56 @@
 import React, { useCallback } from 'react';
 
-import { PluginState, TransformerRegistryItem, TransformerUIProps, ReducerID, isReducerID } from '@grafana/data';
-import { InlineFieldRow, InlineField, StatsPicker } from '@grafana/ui';
+import {
+  PluginState,
+  TransformerRegistryItem,
+  TransformerUIProps,
+  ReducerID,
+  isReducerID,
+  SelectableValue,
+  Field,
+  FieldType,
+  isTimeSeriesField,
+} from '@grafana/data';
+import { InlineFieldRow, InlineField, StatsPicker, Select, InlineLabel } from '@grafana/ui';
 
-import { timeSeriesTableTransformer, TimeSeriesTableTransformerOptions } from './timeSeriesTableTransformer';
+import { getTransformationContent } from '../docs/getTransformationContent';
+
+import {
+  timeSeriesTableTransformer,
+  TimeSeriesTableTransformerOptions,
+  getRefData,
+} from './timeSeriesTableTransformer';
 
 export function TimeSeriesTableTransformEditor({
   input,
   options,
   onChange,
 }: TransformerUIProps<TimeSeriesTableTransformerOptions>) {
-  const refIds: string[] = input.reduce<string[]>((acc, frame) => {
-    if (frame.refId && !acc.includes(frame.refId)) {
-      return [...acc, frame.refId];
-    }
-    return acc;
-  }, []);
+  const refIdMap = getRefData(input);
+
+  const onSelectTimefield = useCallback(
+    (refId: string, value: SelectableValue<string>) => {
+      const val = value?.value !== undefined ? value.value : '';
+      onChange({
+        ...options,
+        [refId]: {
+          ...options[refId],
+          timeField: val,
+        },
+      });
+    },
+    [onChange, options]
+  );
 
   const onSelectStat = useCallback(
     (refId: string, stats: string[]) => {
       const reducerID = stats[0];
       if (reducerID && isReducerID(reducerID)) {
         onChange({
-          refIdToStat: {
-            ...options.refIdToStat,
-            [refId]: reducerID,
+          ...options,
+          [refId]: {
+            ...options[refId],
+            stat: reducerID,
           },
         });
       }
@@ -32,25 +58,59 @@ export function TimeSeriesTableTransformEditor({
     [onChange, options]
   );
 
-  return (
-    <>
-      {refIds.map((refId) => {
-        return (
-          <div key={refId}>
-            <InlineFieldRow>
-              <InlineField label={`Trend ${refIds.length > 1 ? ` #${refId}` : ''} value`}>
-                <StatsPicker
-                  stats={[options.refIdToStat?.[refId] ?? ReducerID.lastNotNull]}
-                  onChange={onSelectStat.bind(null, refId)}
-                  filterOptions={(ext) => ext.id !== ReducerID.allValues && ext.id !== ReducerID.uniqueValues}
-                />
-              </InlineField>
-            </InlineFieldRow>
-          </div>
-        );
-      })}
-    </>
-  );
+  let configRows = [];
+  for (const refId of Object.keys(refIdMap)) {
+    // Get time fields for the current refId
+    const timeFields: Record<string, Field<FieldType.time>> = {};
+    const timeValues: Array<SelectableValue<string>> = [];
+
+    // Get a map of time fields, we map
+    // by field name and assume that time fields
+    // in the same query with the same name
+    // are the same
+    for (const frame of input) {
+      if (frame.refId === refId) {
+        for (const field of frame.fields) {
+          if (isTimeSeriesField(field)) {
+            timeFields[field.name] = field;
+          }
+        }
+      }
+    }
+
+    for (const timeField of Object.values(timeFields)) {
+      const { name } = timeField;
+      timeValues.push({ label: name, value: name });
+    }
+
+    configRows.push(
+      <InlineFieldRow key={refId}>
+        <InlineField>
+          <InlineLabel>{`Trend #${refId}`}</InlineLabel>
+        </InlineField>
+        <InlineField
+          label="Time field"
+          tooltip="The time field that will be used for the time series. If not selected the first found will be used."
+        >
+          <Select
+            onChange={onSelectTimefield.bind(null, refId)}
+            options={timeValues}
+            value={options[refId]?.timeField}
+            isClearable={true}
+          />
+        </InlineField>
+        <InlineField label="Stat" tooltip="The statistic that should be calculated for this time series.">
+          <StatsPicker
+            stats={[options[refId]?.stat ?? ReducerID.lastNotNull]}
+            onChange={onSelectStat.bind(null, refId)}
+            filterOptions={(ext) => ext.id !== ReducerID.allValues && ext.id !== ReducerID.uniqueValues}
+          />
+        </InlineField>
+      </InlineFieldRow>
+    );
+  }
+
+  return <>{configRows}</>;
 }
 
 export const timeSeriesTableTransformRegistryItem: TransformerRegistryItem<TimeSeriesTableTransformerOptions> = {
@@ -60,5 +120,5 @@ export const timeSeriesTableTransformRegistryItem: TransformerRegistryItem<TimeS
   name: timeSeriesTableTransformer.name,
   description: timeSeriesTableTransformer.description,
   state: PluginState.beta,
-  help: ``,
+  help: getTransformationContent(timeSeriesTableTransformer.id).helperDocs,
 };
diff --git a/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.test.ts b/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.test.ts
index a281c4d5d2bc2..c8270a61134d4 100644
--- a/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.test.ts
+++ b/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.test.ts
@@ -31,11 +31,11 @@ describe('timeSeriesTableTransformer', () => {
     const results = timeSeriesToTableTransform({}, series);
     expect(results).toHaveLength(3);
     expect(results[0]).toEqual(series[0]);
-    expect(results[1].refId).toBe('A');
-    expect(results[1].fields).toHaveLength(3);
-    expect(results[1].fields[0].values).toEqual(['A', 'A']);
-    expect(results[1].fields[1].values).toEqual(['B', 'C']);
-    expect(results[2]).toEqual(series[3]);
+    expect(results[2].refId).toBe('A');
+    expect(results[2].fields).toHaveLength(3);
+    expect(results[2].fields[0].values).toEqual(['A', 'A']);
+    expect(results[2].fields[1].values).toEqual(['B', 'C']);
+    expect(results[1]).toEqual(series[3]);
   });
 
   it('Will group by refId', () => {
@@ -48,6 +48,7 @@ describe('timeSeriesTableTransformer', () => {
     ];
 
     const results = timeSeriesToTableTransform({}, series);
+
     expect(results).toHaveLength(2);
     expect(results[0].refId).toBe('A');
     expect(results[0].fields).toHaveLength(3);
@@ -77,18 +78,159 @@ describe('timeSeriesTableTransformer', () => {
     const series = [
       getTimeSeries('A', { instance: 'A', pod: 'B' }, [4, 2, 3]),
       getTimeSeries('B', { instance: 'A', pod: 'C' }, [3, 4, 5]),
+      getTimeSeries('C', { instance: 'B', pod: 'X' }, [4, 2, 0]),
+      getTimeSeries('D', { instance: 'B', pod: 'Y' }, [0, 0, 0]),
     ];
 
     const results = timeSeriesToTableTransform(
       {
-        refIdToStat: {
-          B: ReducerID.mean,
+        B: {
+          stat: ReducerID.mean,
+        },
+        D: {
+          stat: ReducerID.mean,
         },
       },
       series
     );
+
     expect(results[0].fields[2].values[0].value).toEqual(3);
     expect(results[1].fields[2].values[0].value).toEqual(4);
+    expect(results[2].fields[2].values[0].value).toEqual(0);
+    expect(results[3].fields[2].values[0].value).toEqual(0);
+  });
+
+  it('calculate the value for an empty series to null', () => {
+    const series = [getTimeSeries('D', { instance: 'B', pod: 'Y' }, [])];
+
+    const results = timeSeriesToTableTransform(
+      {
+        B: {
+          stat: ReducerID.mean,
+        },
+        D: {
+          stat: ReducerID.mean,
+        },
+      },
+      series
+    );
+
+    expect(results[0].fields[2].values[0].value).toEqual(null);
+  });
+
+  it('Will transform multiple data series with the same label', () => {
+    const series = [
+      getTimeSeries('A', { instance: 'A', pod: 'B' }, [4, 2, 3]),
+      getTimeSeries('B', { instance: 'A', pod: 'B' }, [3, 4, 5]),
+      getTimeSeries('C', { instance: 'A', pod: 'B' }, [3, 4, 5]),
+    ];
+
+    const results = timeSeriesToTableTransform({}, series);
+
+    // Check series A
+    expect(results[0].fields).toHaveLength(3);
+    expect(results[0].fields[0].values[0]).toBe('A');
+    expect(results[0].fields[1].values[0]).toBe('B');
+
+    // Check series B
+    expect(results[1].fields).toHaveLength(3);
+    expect(results[1].fields[0].values[0]).toBe('A');
+    expect(results[1].fields[1].values[0]).toBe('B');
+
+    // Check series C
+    expect(results[2].fields).toHaveLength(3);
+    expect(results[2].fields[0].values[0]).toBe('A');
+    expect(results[2].fields[1].values[0]).toBe('B');
+  });
+
+  it('will not transform frames with time fields that are non-timeseries', () => {
+    const series = [
+      getTimeSeries('A', { instance: 'A', pod: 'B' }, [4, 2, 3]),
+      getNonTimeSeries('B', { instance: 'A', pod: 'B' }, [3, 4, 5]),
+    ];
+
+    const results = timeSeriesToTableTransform({}, series);
+
+    // Expect the timeseries to be transformed
+    // Having a trend field will show this
+    expect(results[1].fields[2].name).toBe('Trend #A');
+
+    // We should expect the field length to remain at
+    // 2 with a time field and a value field
+    expect(results[0].fields.length).toBe(2);
+  });
+
+  it('will not transform series that have the same value for all times', () => {
+    const series = [getNonTimeSeries('A', { instance: 'A' }, [4, 2, 5], [1699476339, 1699476339, 1699476339])];
+
+    const results = timeSeriesToTableTransform({}, series);
+
+    expect(results[0].fields[0].values[0]).toBe(1699476339);
+    expect(results[0].fields[1].values[0]).toBe(4);
+  });
+
+  it('will transform a series with two time fields', () => {
+    const frame = toDataFrame({
+      refId: 'A',
+      fields: [
+        { name: 'Time', type: FieldType.time, values: [0, 50, 90] },
+        { name: 'UpdateTime', type: FieldType.time, values: [10, 100, 100] },
+        {
+          name: 'Value',
+          type: FieldType.number,
+          values: [2, 3, 4],
+        },
+      ],
+    });
+
+    const results = timeSeriesToTableTransform({}, [frame]);
+
+    // We should have a created trend field
+    // with the first time field used as a time
+    // and the values coming along with that
+    expect(results[0].fields[0].name).toBe('Trend #A');
+    expect(results[0].fields[0].values[0].fields[0].values[0]).toBe(0);
+    expect(results[0].fields[0].values[0].fields[1].values[0]).toBe(2);
+  });
+
+  it('will transform a series with two time fields and a time field configured', () => {
+    const frame = toDataFrame({
+      refId: 'A',
+      fields: [
+        { name: 'Time', type: FieldType.time, values: [0, 50, 90] },
+        { name: 'UpdateTime', type: FieldType.time, values: [10, 100, 100] },
+        {
+          name: 'Value',
+          type: FieldType.number,
+          values: [2, 3, 4],
+        },
+      ],
+    });
+
+    const results = timeSeriesToTableTransform({ A: { timeField: 'UpdateTime' } }, [frame]);
+
+    // We should have a created trend field
+    // with the "UpdateTime" time field used as a time
+    // and the values coming along with that
+    expect(results[0].fields[0].name).toBe('Trend #A');
+    expect(results[0].fields[0].values[0].fields[0].values[0]).toBe(10);
+    expect(results[0].fields[0].values[0].fields[1].values[0]).toBe(2);
+  });
+
+  it('Will correctly fill in gaps in labels', () => {
+    const series = [
+      getTimeSeries('A', { instance: 'A', pod: 'AA' }),
+      getTimeSeries('A', { instance: 'B' }),
+      getTimeSeries('A', { instance: 'C', pod: 'CC' }),
+    ];
+
+    const results = timeSeriesToTableTransform({}, series);
+    expect(results).toHaveLength(1);
+    const result = results[0];
+    expect(result.refId).toBe('A');
+    expect(result.fields).toHaveLength(3);
+    expect(result.fields[0].values).toEqual(['A', 'B', 'C']);
+    expect(result.fields[1].values).toEqual(['AA', '', 'CC']);
   });
 });
 
@@ -124,6 +266,27 @@ function getTimeSeries(refId: string, labels: Labels, values: number[] = [10]) {
   });
 }
 
+function getNonTimeSeries(refId: string, labels: Labels, values: number[], times?: number[]) {
+  if (times === undefined) {
+    times = [1699476339, 1699475339, 1699476300];
+  }
+
+  return toDataFrame({
+    refId,
+    fields: [
+      // These times are in non-ascending order
+      // and thus this isn't a timeseries
+      { name: 'Time', type: FieldType.time, values: times },
+      {
+        name: 'Value',
+        type: FieldType.number,
+        values,
+        labels,
+      },
+    ],
+  });
+}
+
 function getTable(refId: string, fields: string[]) {
   return toDataFrame({
     refId,
diff --git a/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.ts b/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.ts
index 5137b15f05027..dfc82b6c8192c 100644
--- a/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.ts
+++ b/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.ts
@@ -2,27 +2,101 @@ import { map } from 'rxjs/operators';
 
 import {
   DataFrame,
-  DataFrameWithValue,
   DataTransformerID,
   DataTransformerInfo,
+  DataFrameWithValue,
   Field,
   FieldType,
   MutableDataFrame,
   isTimeSeriesFrame,
   ReducerID,
   reduceField,
+  TransformationApplicabilityLevels,
+  isTimeSeriesField,
 } from '@grafana/data';
 
+/**
+ * Maps a refId to a Field which can contain
+ * different types of data. In our case we
+ * care about DataFrame, number, and string.
+ */
+interface RefFieldMap<T> {
+  [index: string]: Field<T>;
+}
+
+/**
+ * A map of RefIds to labels where each
+ * label maps to a field of the given
+ * type. It's technically possible
+ * to use the above type to achieve
+ * this in combination with another mapping
+ * but the RefIds are on the outer map
+ * in this case, so we use a different type
+ * to avoid future issues.
+ *
+ *  RefId: {
+ *     label1: Field<T>
+ *     label2: Field<T>
+ *  }
+ */
+interface RefLabelFieldMap<T> {
+  [index: string]: {
+    [index: string]: Field<T>;
+  };
+}
+
+/**
+ * For options we have a set of options
+ * for each refId. So we map the refId
+ * for each setting.
+ */
 export interface TimeSeriesTableTransformerOptions {
-  refIdToStat?: Record<string, ReducerID>;
+  [index: string]: RefIdTransformerOptions;
+}
+
+/**
+ * Counts the number of refId frames in
+ * a given frame array. i.e.
+ *  {
+ *    A: 10
+ *    B: 20
+ *    C: 12
+ *  }
+ */
+interface RefCount {
+  [index: string]: number;
+}
+
+/**
+ * For each refId we allow the following to
+ * be configured:
+ *
+ *  - stat: A stat to calculate for the refId
+ *  - mergeSeries: Whether separate series should be merged into one
+ *  - timeField: The time field that should be used for the time series
+ */
+export interface RefIdTransformerOptions {
+  stat?: ReducerID;
+  timeField?: string;
+  inlineStat?: boolean;
 }
 
 export const timeSeriesTableTransformer: DataTransformerInfo<TimeSeriesTableTransformerOptions> = {
   id: DataTransformerID.timeSeriesTable,
-  name: 'Time series to table transform',
-  description: 'Time series to table rows.',
+  name: 'Time series to table',
+  description: 'Convert time series data to table rows so that they can be viewed in tabular or sparkline format.',
   defaultOptions: {},
+  isApplicable: (data) => {
+    for (const frame of data) {
+      if (isTimeSeriesFrame(frame)) {
+        return TransformationApplicabilityLevels.Applicable;
+      }
+    }
 
+    return TransformationApplicabilityLevels.NotApplicable;
+  },
+  isApplicableDescription:
+    'The Time series to table transformation requires at least one time series frame to function. You currently have none.',
   operator: (options) => (source) =>
     source.pipe(
       map((data) => {
@@ -37,101 +111,196 @@ export const timeSeriesTableTransformer: DataTransformerInfo<TimeSeriesTableTran
  * @remarks
  * For each refId (queryName) convert all time series frames into a single table frame, adding each series
  * as values of a "Trend" frame field. This allows "Trend" to be rendered as area chart type.
- * Any non time series frames are returned as is.
+ *
+ * Any non time series frames are returned unmodified.
  *
  * @param options - Transform options, currently not used
  * @param data - Array of data frames to transform
  * @returns Array of transformed data frames
  *
- * @alpha
+ * @beta
  */
 export function timeSeriesToTableTransform(options: TimeSeriesTableTransformerOptions, data: DataFrame[]): DataFrame[] {
-  // initialize fields from labels for each refId
-  const refId2LabelFields = getLabelFields(data);
-
-  const refId2frameField: Record<string, Field<DataFrameWithValue>> = {};
+  // Initialize maps for labels, sparklines, and reduced values
+  const refId2trends: RefLabelFieldMap<DataFrameWithValue> = {};
+  const refId2labelz: RefLabelFieldMap<string> = {};
 
+  // Accumulator for our final value
+  // which we'll return
   const result: DataFrame[] = [];
 
-  for (const frame of data) {
-    if (!isTimeSeriesFrame(frame)) {
-      result.push(frame);
-      continue;
-    }
+  // Retreive the refIds of all the data
+  let refIdMap = getRefData(data);
+
+  // If we're merging data then rather
+  // than creating a series per source
+  // series we initialize fields here
+  // so we end up with one
+  for (const refId of Object.keys(refIdMap)) {
+    // Get the frames with the current refId
+    const framesForRef = data.filter((frame) => frame.refId === refId);
+
+    // Intialize object for this refId
+    refId2trends[refId] = {};
+
+    // Initialize labels object for this refId
+    refId2labelz[refId] = {};
+
+    // Collect all existing label names across frames
+    // so we can fill in nulls for frames that don't
+    // have a particular label
+    const labelNames: string[] = [];
+
+    framesForRef.forEach((frame) => {
+      frame.fields.forEach((field) => {
+        if (field.type !== FieldType.number) {
+          return;
+        }
+        if (field.labels) {
+          Object.keys(field.labels).forEach((labelName) => {
+            if (!labelNames.includes(labelName)) {
+              refId2labelz[refId][labelName] = newField(labelName, FieldType.string);
+              labelNames.push(labelName);
+            }
+          });
+        }
+      });
+    });
+
+    for (let i = 0; i < framesForRef.length; i++) {
+      const frame = framesForRef[i];
 
-    const refId = frame.refId ?? '';
-
-    const labelFields = refId2LabelFields[refId] ?? {};
-    // initialize a new frame for this refId with fields per label and a Trend frame field, if it doesn't exist yet
-    let frameField = refId2frameField[refId];
-    if (!frameField) {
-      frameField = {
-        name: 'Trend' + (refId && Object.keys(refId2LabelFields).length > 1 ? ` #${refId}` : ''),
-        type: FieldType.frame,
-        config: {},
-        values: [],
-      };
-      refId2frameField[refId] = frameField;
-
-      const table = new MutableDataFrame();
-      for (const label of Object.values(labelFields)) {
-        table.addField(label);
+      // Retrieve the time field that's been configured
+      // If one isn't configured then use the first found
+      let timeField = null;
+      let timeFieldName = options[refId]?.timeField;
+      if (timeFieldName && timeFieldName.length > 0) {
+        timeField = frame.fields.find((field) => field.name === timeFieldName);
+      } else {
+        timeField = frame.fields.find((field) => isTimeSeriesField(field));
       }
-      table.addField(frameField);
-      table.refId = refId;
-      result.push(table);
-    }
 
-    // add values to each label based field of this frame
-    const labels = frame.fields[1].labels;
-    for (const labelKey of Object.keys(labelFields)) {
-      const labelValue = labels?.[labelKey] ?? null;
-      labelFields[labelKey].values.push(labelValue!);
+      // If it's not a time series frame we add
+      // it unmodified to the result
+      if (!isTimeSeriesFrame(frame)) {
+        result.push(frame);
+        continue;
+      }
+
+      for (const field of frame.fields) {
+        // Skip non-number based fields
+        // i.e. we skip time, strings, etc.
+        if (field.type !== FieldType.number) {
+          continue;
+        }
+
+        // Calculate the reduction of the current field
+        // and push the frame with reduction
+        // into the the appropriate field
+        const reducerId = options[refId]?.stat ?? ReducerID.lastNotNull;
+        const value = reduceField({ field, reducers: [reducerId] })[reducerId] ?? null;
+
+        // Push the appropriate time and value frame
+        // to the trend frame for the sparkline
+        const sparklineFrame = new MutableDataFrame();
+        if (timeField !== undefined) {
+          sparklineFrame.addField(timeField);
+          sparklineFrame.addField(field);
+
+          if (refId2trends[refId][`Trend #${refId}`] === undefined) {
+            refId2trends[refId][`Trend #${refId}`] = newField(`Trend #${refId}`, FieldType.frame);
+          }
+
+          refId2trends[refId][`Trend #${refId}`].values.push({
+            ...sparklineFrame,
+            value,
+            length: field.values.length,
+          });
+        }
+
+        // If there are labels add them to the appropriate fields
+        // Because we iterate each frame
+        labelNames.forEach((labelName) => {
+          refId2labelz[refId][labelName].values.push(field.labels?.[labelName] ?? '');
+        });
+      }
     }
-    const reducerId = options.refIdToStat?.[refId] ?? ReducerID.lastNotNull;
-    const valueField = frame.fields.find((f) => f.type === FieldType.number);
-    const value = (valueField && reduceField({ field: valueField, reducers: [reducerId] })[reducerId]) || null;
-    frameField.values.push({
-      ...frame,
-      value,
-    });
   }
-  return result;
-}
 
-// For each refId, initialize a field for each label name
-function getLabelFields(frames: DataFrame[]): Record<string, Record<string, Field<string>>> {
-  // refId -> label name -> field
-  const labelFields: Record<string, Record<string, Field<string>>> = {};
+  for (const refId of Object.keys(refIdMap)) {
+    const label2fields: RefFieldMap<string> = {};
+
+    // Allocate a new frame
+    const table = new MutableDataFrame();
+    table.refId = refId;
 
-  for (const frame of frames) {
-    if (!isTimeSeriesFrame(frame)) {
-      continue;
+    // Rather than having a label fields for each refId
+    // we combine them into a single set of labels
+    // taking the first value available
+    const labels = refId2labelz[refId];
+    if (labels !== undefined) {
+      for (const [labelName, labelField] of Object.entries(labels)) {
+        if (label2fields[labelName] === undefined) {
+          label2fields[labelName] = labelField;
+        }
+      }
     }
 
-    const refId = frame.refId ?? '';
+    // Add label fields to the the resulting frame
+    for (const label of Object.values(label2fields)) {
+      table.addField(label);
+    }
 
-    if (!labelFields[refId]) {
-      labelFields[refId] = {};
+    // Add trend fields to frame
+    const refTrends = refId2trends[refId];
+    for (const trend of Object.values(refTrends)) {
+      table.addField(trend);
     }
 
-    for (const field of frame.fields) {
-      if (!field.labels) {
-        continue;
-      }
+    // Finaly push to the result
+    if (table.fields.length > 0) {
+      result.push(table);
+    }
+  }
 
-      for (const labelName of Object.keys(field.labels)) {
-        if (!labelFields[refId][labelName]) {
-          labelFields[refId][labelName] = {
-            name: labelName,
-            type: FieldType.string,
-            config: {},
-            values: [],
-          };
-        }
+  return result;
+}
+
+/**
+ * Create a new field with the given label and type.
+ *
+ * @param label
+ *  The string label for the field.
+ * @param type
+ *  The type fo the field (e.g. number, boolean, etc.)
+ * @returns
+ *  A new Field"
+ */
+function newField(label: string, type: FieldType) {
+  return {
+    name: label,
+    type: type,
+    config: {},
+    values: [],
+  };
+}
+
+/**
+ * Get the refIds contained in an array of Data frames.
+ * @param data
+ * @returns A RefCount object
+ */
+export function getRefData(data: DataFrame[]) {
+  let refMap: RefCount = {};
+  for (const frame of data) {
+    if (frame.refId !== undefined) {
+      if (refMap[frame.refId] === undefined) {
+        refMap[frame.refId] = 1;
+      } else {
+        refMap[frame.refId]++;
       }
     }
   }
 
-  return labelFields;
+  return refMap;
 }
diff --git a/public/app/features/users/TokenRevokedModal.tsx b/public/app/features/users/TokenRevokedModal.tsx
index 912a1819ff2ae..6f8ae9534aff5 100644
--- a/public/app/features/users/TokenRevokedModal.tsx
+++ b/public/app/features/users/TokenRevokedModal.tsx
@@ -2,7 +2,7 @@ import { css, cx } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Button, InfoBox, Portal, stylesFactory, useTheme2 } from '@grafana/ui';
+import { Button, InfoBox, Portal, useStyles2, useTheme2 } from '@grafana/ui';
 import { getModalStyles } from '@grafana/ui/src/components/Modal/getModalStyles';
 
 interface Props {
@@ -10,9 +10,8 @@ interface Props {
 }
 
 export const TokenRevokedModal = (props: Props) => {
+  const styles = useStyles2(getStyles);
   const theme = useTheme2();
-
-  const styles = getStyles(theme);
   const modalStyles = getModalStyles(theme);
 
   const showMaxConcurrentSessions = Boolean(props.maxConcurrentSessions);
@@ -51,17 +50,15 @@ export const TokenRevokedModal = (props: Props) => {
   );
 };
 
-const getStyles = stylesFactory((theme: GrafanaTheme2) => {
-  return {
-    infobox: css`
-      margin-bottom: 0;
-    `,
-    text: css`
-      margin: ${theme.spacing(1, 0, 2)};
-    `,
-    backdrop: css`
-      background-color: ${theme.colors.background.canvas};
-      opacity: 0.8;
-    `,
-  };
+const getStyles = (theme: GrafanaTheme2) => ({
+  infobox: css`
+    margin-bottom: 0;
+  `,
+  text: css`
+    margin: ${theme.spacing(1, 0, 2)};
+  `,
+  backdrop: css`
+    background-color: ${theme.colors.background.canvas};
+    opacity: 0.8;
+  `,
 });
diff --git a/public/app/features/users/UsersListPage.test.tsx b/public/app/features/users/UsersListPage.test.tsx
index 6b1e231166b7c..64b286a417a69 100644
--- a/public/app/features/users/UsersListPage.test.tsx
+++ b/public/app/features/users/UsersListPage.test.tsx
@@ -38,6 +38,7 @@ const setup = (propOverrides?: object) => {
     changePage: mockToolkitActionCreator(pageChanged),
     changeSort: mockToolkitActionCreator(sortChanged),
     isLoading: false,
+    rolesLoading: false,
   };
 
   Object.assign(props, propOverrides);
diff --git a/public/app/features/users/UsersListPage.tsx b/public/app/features/users/UsersListPage.tsx
index 9fbf57a50b880..2664d689ba1d3 100644
--- a/public/app/features/users/UsersListPage.tsx
+++ b/public/app/features/users/UsersListPage.tsx
@@ -26,6 +26,7 @@ function mapStateToProps(state: StoreState) {
     invitees: selectInvitesMatchingQuery(state.invites, searchQuery),
     externalUserMngInfo: state.users.externalUserMngInfo,
     isLoading: state.users.isLoading,
+    rolesLoading: state.users.rolesLoading,
   };
 }
 
@@ -53,6 +54,7 @@ export const UsersListPageUnconnected = ({
   invitees,
   externalUserMngInfo,
   isLoading,
+  rolesLoading,
   loadUsers,
   fetchInvitees,
   changePage,
@@ -86,6 +88,7 @@ export const UsersListPageUnconnected = ({
         <OrgUsersTable
           users={users}
           orgId={contextSrv.user.orgId}
+          rolesLoading={rolesLoading}
           onRoleChange={onRoleChange}
           onRemoveUser={onRemoveUser}
           fetchData={changeSort}
diff --git a/public/app/features/users/state/actions.ts b/public/app/features/users/state/actions.ts
index 3e7aacd93ff57..a0f52473e1bfc 100644
--- a/public/app/features/users/state/actions.ts
+++ b/public/app/features/users/state/actions.ts
@@ -2,21 +2,46 @@ import { debounce } from 'lodash';
 
 import { getBackendSrv } from '@grafana/runtime';
 import { FetchDataArgs } from '@grafana/ui';
+import { contextSrv } from 'app/core/core';
 import { accessControlQueryParam } from 'app/core/utils/accessControl';
 import { OrgUser } from 'app/types';
 
-import { ThunkResult } from '../../../types';
+import { AccessControlAction, ThunkResult } from '../../../types';
 
-import { usersLoaded, pageChanged, usersFetchBegin, usersFetchEnd, searchQueryChanged, sortChanged } from './reducers';
+import {
+  usersLoaded,
+  pageChanged,
+  usersFetchBegin,
+  usersFetchEnd,
+  searchQueryChanged,
+  sortChanged,
+  rolesFetchBegin,
+  rolesFetchEnd,
+} from './reducers';
 
 export function loadUsers(): ThunkResult<void> {
   return async (dispatch, getState) => {
     try {
+      dispatch(usersFetchBegin());
       const { perPage, page, searchQuery, sort } = getState().users;
       const users = await getBackendSrv().get(
         `/api/org/users/search`,
         accessControlQueryParam({ perpage: perPage, page, query: searchQuery, sort })
       );
+
+      if (
+        contextSrv.licensedAccessControlEnabled() &&
+        contextSrv.hasPermission(AccessControlAction.ActionUserRolesList)
+      ) {
+        dispatch(rolesFetchBegin());
+        const orgId = contextSrv.user.orgId;
+        const userIds = users?.orgUsers.map((u: OrgUser) => u.userId);
+        const roles = await getBackendSrv().post(`/api/access-control/users/roles/search`, { userIds, orgId });
+        users.orgUsers.forEach((u: OrgUser) => {
+          u.roles = roles ? roles[u.userId] || [] : [];
+        });
+        dispatch(rolesFetchEnd());
+      }
       dispatch(usersLoaded(users));
     } catch (error) {
       usersFetchEnd();
@@ -42,7 +67,6 @@ export function removeUser(userId: number): ThunkResult<void> {
 
 export function changePage(page: number): ThunkResult<void> {
   return async (dispatch) => {
-    dispatch(usersFetchBegin());
     dispatch(pageChanged(page));
     dispatch(loadUsers());
   };
@@ -51,7 +75,6 @@ export function changePage(page: number): ThunkResult<void> {
 export function changeSort({ sortBy }: FetchDataArgs<OrgUser>): ThunkResult<void> {
   const sort = sortBy.length ? `${sortBy[0].id}-${sortBy[0].desc ? 'desc' : 'asc'}` : undefined;
   return async (dispatch) => {
-    dispatch(usersFetchBegin());
     dispatch(sortChanged(sort));
     dispatch(loadUsers());
   };
@@ -59,7 +82,6 @@ export function changeSort({ sortBy }: FetchDataArgs<OrgUser>): ThunkResult<void
 
 export function changeSearchQuery(query: string): ThunkResult<void> {
   return async (dispatch) => {
-    dispatch(usersFetchBegin());
     dispatch(searchQueryChanged(query));
     fetchUsersWithDebounce(dispatch);
   };
diff --git a/public/app/features/users/state/reducers.ts b/public/app/features/users/state/reducers.ts
index 8b1a987a96e13..f74fea6ad1d28 100644
--- a/public/app/features/users/state/reducers.ts
+++ b/public/app/features/users/state/reducers.ts
@@ -4,7 +4,7 @@ import config from 'app/core/config';
 import { OrgUser, UsersState } from 'app/types';
 
 export const initialState: UsersState = {
-  users: [] as OrgUser[],
+  users: [],
   searchQuery: '',
   page: 0,
   perPage: 30,
@@ -13,6 +13,7 @@ export const initialState: UsersState = {
   externalUserMngLinkName: config.externalUserMngLinkName,
   externalUserMngLinkUrl: config.externalUserMngLinkUrl,
   isLoading: false,
+  rolesLoading: false,
 };
 
 export interface UsersFetchResult {
@@ -22,6 +23,13 @@ export interface UsersFetchResult {
   totalCount: number;
 }
 
+export interface UsersRolesFetchResult {
+  orgUsers: OrgUser[];
+  perPage: number;
+  page: number;
+  totalCount: number;
+}
+
 const usersSlice = createSlice({
   name: 'users',
   initialState,
@@ -60,6 +68,12 @@ const usersSlice = createSlice({
     usersFetchEnd: (state) => {
       return { ...state, isLoading: false };
     },
+    rolesFetchBegin: (state) => {
+      return { ...state, rolesLoading: true };
+    },
+    rolesFetchEnd: (state) => {
+      return { ...state, rolesLoading: false };
+    },
   },
 });
 
@@ -71,6 +85,8 @@ export const {
   usersFetchEnd,
   pageChanged,
   sortChanged,
+  rolesFetchBegin,
+  rolesFetchEnd,
 } = usersSlice.actions;
 
 export const usersReducer = usersSlice.reducer;
diff --git a/public/app/features/variables/adapters.ts b/public/app/features/variables/adapters.ts
index 0f52ab42f4a9b..b3db44a70a39b 100644
--- a/public/app/features/variables/adapters.ts
+++ b/public/app/features/variables/adapters.ts
@@ -1,14 +1,13 @@
 import { ComponentType } from 'react';
 import { Reducer } from 'redux';
 
-import { Registry, UrlQueryValue, VariableType } from '@grafana/data';
+import { Registry, TypedVariableModel, UrlQueryValue, VariableOption, VariableType } from '@grafana/data';
 
 import { VariableEditorProps } from './editor/types';
 import { VariablePickerProps } from './pickers/types';
 import { VariablesState } from './state/types';
-import { VariableModel, VariableOption } from './types';
 
-export interface VariableAdapter<Model extends VariableModel> {
+export interface VariableAdapter<Model extends TypedVariableModel> {
   id: VariableType;
   description: string;
   name: string;
diff --git a/public/app/features/variables/adhoc/AdHocVariableEditor.test.tsx b/public/app/features/variables/adhoc/AdHocVariableEditor.test.tsx
deleted file mode 100644
index cc4ae6e0bfbb9..0000000000000
--- a/public/app/features/variables/adhoc/AdHocVariableEditor.test.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import React from 'react';
-import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
-
-import { selectors } from '@grafana/e2e-selectors';
-import { mockDataSource } from 'app/features/alerting/unified/mocks';
-import { DataSourceType } from 'app/features/alerting/unified/utils/datasource';
-
-import { adHocBuilder } from '../shared/testing/builders';
-
-import { AdHocVariableEditorUnConnected as AdHocVariableEditor } from './AdHocVariableEditor';
-
-const promDsMock = mockDataSource({
-  name: 'Prometheus',
-  type: DataSourceType.Prometheus,
-});
-
-const lokiDsMock = mockDataSource({
-  name: 'Loki',
-  type: DataSourceType.Loki,
-});
-
-jest.mock('@grafana/runtime/src/services/dataSourceSrv', () => {
-  return {
-    getDataSourceSrv: () => ({
-      get: () => {
-        return Promise.resolve(promDsMock);
-      },
-      getList: () => [promDsMock, lokiDsMock],
-      getInstanceSettings: (v: string) => {
-        if (v === 'Prometheus') {
-          return promDsMock;
-        }
-        return lokiDsMock;
-      },
-    }),
-  };
-});
-
-const props = {
-  extended: {
-    dataSources: [
-      { text: 'Prometheus', value: null }, // default datasource
-      { text: 'Loki', value: { type: 'loki-ds', uid: 'abc' } },
-    ],
-  },
-  variable: adHocBuilder().withId('adhoc').withRootStateKey('key').withName('adhoc').build(),
-  onPropChange: jest.fn(),
-
-  // connected actions
-  initAdHocVariableEditor: jest.fn(),
-  changeVariableDatasource: jest.fn(),
-};
-
-describe('AdHocVariableEditor', () => {
-  beforeEach(() => {
-    props.changeVariableDatasource.mockReset();
-  });
-
-  it('has a datasource select menu', async () => {
-    render(<AdHocVariableEditor {...props} />);
-
-    expect(await screen.getByTestId(selectors.components.DataSourcePicker.container)).toBeInTheDocument();
-  });
-
-  it('calls the callback when changing the datasource', async () => {
-    render(<AdHocVariableEditor {...props} />);
-    const selectEl = screen
-      .getByTestId(selectors.components.DataSourcePicker.container)
-      .getElementsByTagName('input')[0];
-    await selectOptionInTest(selectEl, 'Loki');
-
-    expect(props.changeVariableDatasource).toBeCalledWith(
-      { type: 'adhoc', id: 'adhoc', rootStateKey: 'key' },
-      { type: 'loki', uid: 'mock-ds-3' }
-    );
-  });
-
-  it('renders informational text', () => {
-    const extended = {
-      ...props.extended,
-      infoText: "Here's a message that should help you",
-    };
-    render(<AdHocVariableEditor {...props} extended={extended} />);
-
-    const alert = screen.getByText("Here's a message that should help you");
-    expect(alert).toBeInTheDocument();
-  });
-});
diff --git a/public/app/features/variables/adhoc/AdHocVariableEditor.tsx b/public/app/features/variables/adhoc/AdHocVariableEditor.tsx
index 1b466c935918e..8bd63d443096d 100644
--- a/public/app/features/variables/adhoc/AdHocVariableEditor.tsx
+++ b/public/app/features/variables/adhoc/AdHocVariableEditor.tsx
@@ -2,11 +2,9 @@ import React, { PureComponent } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
 import { DataSourceInstanceSettings, getDataSourceRef } from '@grafana/data';
-import { Alert, Field } from '@grafana/ui';
-import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker';
+import { AdHocVariableForm } from 'app/features/dashboard-scene/settings/variables/components/AdHocVariableForm';
 import { StoreState } from 'app/types';
 
-import { VariableLegend } from '../editor/VariableLegend';
 import { initialVariableEditorState } from '../editor/reducer';
 import { getAdhocVariableEditorState } from '../editor/selectors';
 import { VariableEditorProps } from '../editor/types';
@@ -58,23 +56,13 @@ export class AdHocVariableEditorUnConnected extends PureComponent<Props> {
 
   render() {
     const { variable, extended } = this.props;
-    const infoText = extended?.infoText ?? null;
 
     return (
-      <>
-        <VariableLegend>Ad-hoc options</VariableLegend>
-        <Field label="Data source" htmlFor="data-source-picker">
-          <DataSourcePicker
-            current={variable.datasource}
-            onChange={this.onDatasourceChanged}
-            width={30}
-            variables={true}
-            noDefault
-          />
-        </Field>
-
-        {infoText ? <Alert title={infoText} severity="info" /> : null}
-      </>
+      <AdHocVariableForm
+        datasource={variable.datasource ?? undefined}
+        onDataSourceChange={this.onDatasourceChanged}
+        infoText={extended?.infoText}
+      />
     );
   }
 }
diff --git a/public/app/features/variables/adhoc/actions.ts b/public/app/features/variables/adhoc/actions.ts
index d0dfd6b631d6e..91d1ed8ef9c04 100644
--- a/public/app/features/variables/adhoc/actions.ts
+++ b/public/app/features/variables/adhoc/actions.ts
@@ -149,7 +149,12 @@ const createAdHocVariable = (options: AdHocTableOptions): ThunkResult<void> => {
 const getVariableByOptions = (options: AdHocTableOptions, state: StoreState): AdHocVariableModel | undefined => {
   const key = getLastKey(state);
   const templatingState = getVariablesState(key, state);
-  return Object.values(templatingState.variables).find(
-    (v) => isAdHoc(v) && v.datasource?.uid === options.datasource.uid
-  ) as AdHocVariableModel;
+  let result: AdHocVariableModel | undefined;
+  for (const v of Object.values(templatingState.variables)) {
+    if (isAdHoc(v) && v.datasource?.uid === options.datasource.uid) {
+      result = v;
+      break;
+    }
+  }
+  return result;
 };
diff --git a/public/app/features/variables/adhoc/picker/AdHocFilterValue.tsx b/public/app/features/variables/adhoc/picker/AdHocFilterValue.tsx
index ac0b38a6e55e3..e733043c8b9d1 100644
--- a/public/app/features/variables/adhoc/picker/AdHocFilterValue.tsx
+++ b/public/app/features/variables/adhoc/picker/AdHocFilterValue.tsx
@@ -1,7 +1,8 @@
+import { css } from '@emotion/css';
 import React from 'react';
 
 import { AdHocVariableFilter, DataSourceRef, MetricFindValue, SelectableValue } from '@grafana/data';
-import { SegmentAsync } from '@grafana/ui';
+import { SegmentAsync, useStyles2 } from '@grafana/ui';
 import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
 
 import { getDatasourceSrv } from '../../../plugins/datasource_srv';
@@ -25,12 +26,13 @@ export const AdHocFilterValue = ({
   placeHolder,
   allFilters,
 }: Props) => {
+  const styles = useStyles2(getStyles);
   const loadValues = () => fetchFilterValues(datasource, filterKey, allFilters);
 
   return (
     <div className="gf-form" data-testid="AdHocFilterValue-value-wrapper">
       <SegmentAsync
-        className="query-segment-value"
+        className={styles.segment}
         disabled={disabled}
         placeholder={placeHolder}
         value={filterValue}
@@ -58,3 +60,15 @@ const fetchFilterValues = async (
   const metrics = await ds.getTagValues({ key, filters: otherFilters, timeRange });
   return metrics.map((m: MetricFindValue) => ({ label: m.text, value: m.text }));
 };
+
+function getStyles() {
+  return {
+    segment: css({
+      display: 'block',
+      overflow: 'hidden',
+      textOverflow: 'ellipsis',
+      whiteSpace: 'nowrap',
+      maxWidth: '500px',
+    }),
+  };
+}
diff --git a/public/app/features/variables/constant/ConstantVariableEditor.tsx b/public/app/features/variables/constant/ConstantVariableEditor.tsx
index abb49bbd8b80f..bcabde359ad57 100644
--- a/public/app/features/variables/constant/ConstantVariableEditor.tsx
+++ b/public/app/features/variables/constant/ConstantVariableEditor.tsx
@@ -1,9 +1,7 @@
 import React, { FormEvent, PureComponent } from 'react';
 
-import { selectors } from '@grafana/e2e-selectors';
+import { ConstantVariableForm } from 'app/features/dashboard-scene/settings/variables/components/ConstantVariableForm';
 
-import { VariableLegend } from '../editor/VariableLegend';
-import { VariableTextField } from '../editor/VariableTextField';
 import { VariableEditorProps } from '../editor/types';
 import { ConstantVariableModel } from '../types';
 
@@ -11,13 +9,6 @@ export interface Props extends VariableEditorProps<ConstantVariableModel> {}
 
 export class ConstantVariableEditor extends PureComponent<Props> {
   onChange = (event: FormEvent<HTMLInputElement>) => {
-    this.props.onPropChange({
-      propName: 'query',
-      propValue: event.currentTarget.value,
-    });
-  };
-
-  onBlur = (event: FormEvent<HTMLInputElement>) => {
     this.props.onPropChange({
       propName: 'query',
       propValue: event.currentTarget.value,
@@ -26,19 +17,6 @@ export class ConstantVariableEditor extends PureComponent<Props> {
   };
 
   render() {
-    return (
-      <>
-        <VariableLegend>Constant options</VariableLegend>
-        <VariableTextField
-          value={this.props.variable.query}
-          name="Value"
-          placeholder="your metric prefix"
-          onChange={this.onChange}
-          onBlur={this.onBlur}
-          testId={selectors.pages.Dashboard.Settings.Variables.Edit.ConstantVariable.constantOptionsQueryInputV2}
-          width={30}
-        />
-      </>
-    );
+    return <ConstantVariableForm constantValue={this.props.variable.query} onChange={this.onChange} />;
   }
 }
diff --git a/public/app/features/variables/custom/CustomVariableEditor.tsx b/public/app/features/variables/custom/CustomVariableEditor.tsx
index c64c5a29fe1f5..6cdd6d5eb2d03 100644
--- a/public/app/features/variables/custom/CustomVariableEditor.tsx
+++ b/public/app/features/variables/custom/CustomVariableEditor.tsx
@@ -1,13 +1,10 @@
 import React, { FormEvent, PureComponent } from 'react';
 import { MapDispatchToProps, MapStateToProps } from 'react-redux';
 
-import { selectors } from '@grafana/e2e-selectors';
 import { connectWithStore } from 'app/core/utils/connectWithReduxStore';
+import { CustomVariableForm } from 'app/features/dashboard-scene/settings/variables/components/CustomVariableForm';
 import { StoreState } from 'app/types';
 
-import { SelectionOptionsEditor } from '../editor/SelectionOptionsEditor';
-import { VariableLegend } from '../editor/VariableLegend';
-import { VariableTextAreaField } from '../editor/VariableTextAreaField';
 import { OnPropChangeArguments, VariableEditorProps } from '../editor/types';
 import { changeVariableMultiValue } from '../state/actions';
 import { CustomVariableModel, VariableWithMultiSupport } from '../types';
@@ -23,18 +20,11 @@ interface DispatchProps {
 export type Props = OwnProps & ConnectedProps & DispatchProps;
 
 class CustomVariableEditorUnconnected extends PureComponent<Props> {
-  onChange = (event: FormEvent<HTMLTextAreaElement>) => {
-    this.props.onPropChange({
-      propName: 'query',
-      propValue: event.currentTarget.value,
-    });
-  };
-
   onSelectionOptionsChange = async ({ propName, propValue }: OnPropChangeArguments<VariableWithMultiSupport>) => {
     this.props.onPropChange({ propName, propValue, updateOptions: true });
   };
 
-  onBlur = (event: FormEvent<HTMLTextAreaElement>) => {
+  onQueryChange = (event: FormEvent<HTMLTextAreaElement>) => {
     this.props.onPropChange({
       propName: 'query',
       propValue: event.currentTarget.value,
@@ -44,26 +34,22 @@ class CustomVariableEditorUnconnected extends PureComponent<Props> {
 
   render() {
     return (
-      <>
-        <VariableLegend>Custom options</VariableLegend>
-
-        <VariableTextAreaField
-          name="Values separated by comma"
-          value={this.props.variable.query}
-          placeholder="1, 10, mykey : myvalue, myvalue, escaped\,value"
-          onChange={this.onChange}
-          onBlur={this.onBlur}
-          required
-          width={52}
-          testId={selectors.pages.Dashboard.Settings.Variables.Edit.CustomVariable.customValueInput}
-        />
-        <VariableLegend>Selection options</VariableLegend>
-        <SelectionOptionsEditor
-          variable={this.props.variable}
-          onPropChange={this.onSelectionOptionsChange}
-          onMultiChanged={this.props.changeVariableMultiValue}
-        />
-      </>
+      <CustomVariableForm
+        query={this.props.variable.query}
+        multi={this.props.variable.multi}
+        allValue={this.props.variable.allValue}
+        includeAll={this.props.variable.includeAll}
+        onQueryChange={this.onQueryChange}
+        onMultiChange={(event) =>
+          this.onSelectionOptionsChange({ propName: 'multi', propValue: event.currentTarget.checked })
+        }
+        onIncludeAllChange={(event) =>
+          this.onSelectionOptionsChange({ propName: 'includeAll', propValue: event.currentTarget.checked })
+        }
+        onAllValueChange={(event) =>
+          this.onSelectionOptionsChange({ propName: 'allValue', propValue: event.currentTarget.value })
+        }
+      />
     );
   }
 }
diff --git a/public/app/features/variables/custom/actions.test.ts b/public/app/features/variables/custom/actions.test.ts
index d537fb1b41415..1e568d0d3f4d5 100644
--- a/public/app/features/variables/custom/actions.test.ts
+++ b/public/app/features/variables/custom/actions.test.ts
@@ -58,7 +58,7 @@ describe('custom actions', () => {
         .whenAsyncActionIsDispatched(updateCustomVariableOptions(toKeyedVariableIdentifier(variable)), true);
 
       tester.thenDispatchedActionsShouldEqual(
-        toKeyedAction('key', createCustomOptionsFromQuery(toVariablePayload(variable))),
+        toKeyedAction('key', createCustomOptionsFromQuery(toVariablePayload(variable, variable.query))),
         toKeyedAction('key', setCurrentVariableValue(toVariablePayload(variable, { option })))
       );
     });
diff --git a/public/app/features/variables/custom/actions.ts b/public/app/features/variables/custom/actions.ts
index 898412fe49b97..d8751dd56ed41 100644
--- a/public/app/features/variables/custom/actions.ts
+++ b/public/app/features/variables/custom/actions.ts
@@ -1,16 +1,23 @@
+import { getTemplateSrv } from '@grafana/runtime';
 import { ThunkResult } from 'app/types';
 
 import { validateVariableSelectionState } from '../state/actions';
 import { toKeyedAction } from '../state/keyedVariablesReducer';
+import { getVariable } from '../state/selectors';
 import { KeyedVariableIdentifier } from '../state/types';
 import { toVariablePayload } from '../utils';
 
 import { createCustomOptionsFromQuery } from './reducer';
 
 export const updateCustomVariableOptions = (identifier: KeyedVariableIdentifier): ThunkResult<void> => {
-  return async (dispatch) => {
+  return async (dispatch, getState) => {
     const { rootStateKey } = identifier;
-    await dispatch(toKeyedAction(rootStateKey, createCustomOptionsFromQuery(toVariablePayload(identifier))));
+    const variable = getVariable(identifier, getState());
+    if (variable.type !== 'custom') {
+      return;
+    }
+    const query = getTemplateSrv().replace(variable.query);
+    await dispatch(toKeyedAction(rootStateKey, createCustomOptionsFromQuery(toVariablePayload(identifier, query))));
     await dispatch(validateVariableSelectionState(identifier));
   };
 };
diff --git a/public/app/features/variables/custom/adapter.ts b/public/app/features/variables/custom/adapter.ts
index c98374f195d88..c4eb01b527620 100644
--- a/public/app/features/variables/custom/adapter.ts
+++ b/public/app/features/variables/custom/adapter.ts
@@ -6,7 +6,7 @@ import { ALL_VARIABLE_TEXT } from '../constants';
 import { optionPickerFactory } from '../pickers';
 import { setOptionAsCurrent, setOptionFromUrl } from '../state/actions';
 import { CustomVariableModel } from '../types';
-import { isAllVariable, toKeyedVariableIdentifier } from '../utils';
+import { containsVariable, isAllVariable, toKeyedVariableIdentifier } from '../utils';
 
 import { CustomVariableEditor } from './CustomVariableEditor';
 import { updateCustomVariableOptions } from './actions';
@@ -21,8 +21,8 @@ export const createCustomVariableAdapter = (): VariableAdapter<CustomVariableMod
     reducer: customVariableReducer,
     picker: optionPickerFactory<CustomVariableModel>(),
     editor: CustomVariableEditor,
-    dependsOn: () => {
-      return false;
+    dependsOn: (variable, variableToTest) => {
+      return containsVariable(variable.query, variableToTest.name);
     },
     setValue: async (variable, option, emitChanges = false) => {
       await dispatch(setOptionAsCurrent(toKeyedVariableIdentifier(variable), option, emitChanges));
diff --git a/public/app/features/variables/custom/reducer.test.ts b/public/app/features/variables/custom/reducer.test.ts
index 23ad676a2981a..f80f1e7ebf8d0 100644
--- a/public/app/features/variables/custom/reducer.test.ts
+++ b/public/app/features/variables/custom/reducer.test.ts
@@ -18,7 +18,7 @@ describe('customVariableReducer', () => {
       const query = 'a,b,c,d : e';
       const id = '0';
       const { initialState } = getVariableTestContext(adapter, { id, query });
-      const payload = toVariablePayload({ id: '0', type: 'custom' });
+      const payload = toVariablePayload({ id: '0', type: 'custom' }, query);
 
       reducerTester<VariablesState>()
         .givenReducer(customVariableReducer, cloneDeep(initialState))
@@ -58,7 +58,7 @@ describe('customVariableReducer', () => {
       const query = 'a,b,c,d:e';
       const id = '0';
       const { initialState } = getVariableTestContext(adapter, { id, query });
-      const payload = toVariablePayload({ id: '0', type: 'custom' });
+      const payload = toVariablePayload({ id: '0', type: 'custom' }, query);
 
       reducerTester<VariablesState>()
         .givenReducer(customVariableReducer, cloneDeep(initialState))
@@ -98,7 +98,7 @@ describe('customVariableReducer', () => {
       const query = 'a,  b,   c, d : e  ';
       const id = '0';
       const { initialState } = getVariableTestContext(adapter, { id, query });
-      const payload = toVariablePayload({ id: '0', type: 'constant' });
+      const payload = toVariablePayload({ id: '0', type: 'constant' }, query);
 
       reducerTester<VariablesState>()
         .givenReducer(customVariableReducer, cloneDeep(initialState))
@@ -138,7 +138,7 @@ describe('customVariableReducer', () => {
       const query = 'a,  b,   c, d :    e';
       const id = '0';
       const { initialState } = getVariableTestContext(adapter, { id, query });
-      const payload = toVariablePayload({ id: '0', type: 'constant' });
+      const payload = toVariablePayload({ id: '0', type: 'constant' }, query);
 
       reducerTester<VariablesState>()
         .givenReducer(customVariableReducer, cloneDeep(initialState))
@@ -178,7 +178,7 @@ describe('customVariableReducer', () => {
       const query = 'a,  b,http://www.google.com/, http://www.amazon.com/';
       const id = '0';
       const { initialState } = getVariableTestContext(adapter, { id, query });
-      const payload = toVariablePayload({ id: '0', type: 'constant' });
+      const payload = toVariablePayload({ id: '0', type: 'constant' }, query);
 
       reducerTester<VariablesState>()
         .givenReducer(customVariableReducer, cloneDeep(initialState))
@@ -218,7 +218,7 @@ describe('customVariableReducer', () => {
       const query = 'a,  b, google : http://www.google.com/, amazon : http://www.amazon.com/';
       const id = '0';
       const { initialState } = getVariableTestContext(adapter, { id, query });
-      const payload = toVariablePayload({ id: '0', type: 'constant' });
+      const payload = toVariablePayload({ id: '0', type: 'constant' }, query);
 
       reducerTester<VariablesState>()
         .givenReducer(customVariableReducer, cloneDeep(initialState))
@@ -258,7 +258,7 @@ describe('customVariableReducer', () => {
       const query = 'a,b,c,d : e';
       const id = '0';
       const { initialState } = getVariableTestContext(adapter, { id, query, includeAll: true });
-      const payload = toVariablePayload({ id: '0', type: 'constant' });
+      const payload = toVariablePayload({ id: '0', type: 'constant' }, query);
 
       reducerTester<VariablesState>()
         .givenReducer(customVariableReducer, cloneDeep(initialState))
diff --git a/public/app/features/variables/custom/reducer.ts b/public/app/features/variables/custom/reducer.ts
index c021decc8dd13..15d7d9592ddb5 100644
--- a/public/app/features/variables/custom/reducer.ts
+++ b/public/app/features/variables/custom/reducer.ts
@@ -20,15 +20,15 @@ export const customVariableSlice = createSlice({
   name: 'templating/custom',
   initialState: initialVariablesState,
   reducers: {
-    createCustomOptionsFromQuery: (state: VariablesState, action: PayloadAction<VariablePayload>) => {
+    createCustomOptionsFromQuery: (state: VariablesState, action: PayloadAction<VariablePayload<string>>) => {
       const instanceState = getInstanceState(state, action.payload.id);
       if (instanceState.type !== 'custom') {
         return;
       }
 
-      const { includeAll, query } = instanceState;
-
-      const match = query.match(/(?:\\,|[^,])+/g) ?? [];
+      const { includeAll } = instanceState;
+      const queryInterpolated = action.payload.data;
+      const match = queryInterpolated.match(/(?:\\,|[^,])+/g) ?? [];
       const options = match.map((text) => {
         text = text.replace(/\\,/g, ',');
         const textMatch = /^(.+)\s:\s(.+)$/g.exec(text) ?? [];
diff --git a/public/app/features/variables/datasource/DataSourceVariableEditor.test.tsx b/public/app/features/variables/datasource/DataSourceVariableEditor.test.tsx
index 661a86716695c..ec4c34245ea7d 100644
--- a/public/app/features/variables/datasource/DataSourceVariableEditor.test.tsx
+++ b/public/app/features/variables/datasource/DataSourceVariableEditor.test.tsx
@@ -1,4 +1,5 @@
-import { render, screen, fireEvent } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { selectOptionInTest, getSelectParent } from 'test/helpers/selectOptionInTest';
 
@@ -45,10 +46,21 @@ describe('DataSourceVariableEditor', () => {
     expect(field).toBeInTheDocument();
   });
 
-  it('calls the handler when the regex filter is changed', () => {
-    render(<DataSourceVariableEditor {...props} />);
+  it('calls the handler when the regex filter is changed in onBlur', async () => {
+    const { user } = setup(<DataSourceVariableEditor {...props} />);
     const field = screen.getByLabelText(/Instance name filter/);
-    fireEvent.change(field, { target: { value: '/prod/' } });
-    expect(props.onPropChange).toBeCalledWith({ propName: 'regex', propValue: '/prod/' });
+    await user.click(field);
+    await user.type(field, '/prod/');
+    expect(field).toHaveValue('/prod/');
+    await user.tab();
+    expect(props.onPropChange).toHaveBeenCalledWith({ propName: 'regex', propValue: '/prod/', updateOptions: true });
   });
 });
+
+// based on styleguide recomendation
+function setup(jsx: JSX.Element) {
+  return {
+    user: userEvent.setup(),
+    ...render(jsx),
+  };
+}
diff --git a/public/app/features/variables/datasource/DataSourceVariableEditor.tsx b/public/app/features/variables/datasource/DataSourceVariableEditor.tsx
index 6185d257e9fef..3fb6996aed398 100644
--- a/public/app/features/variables/datasource/DataSourceVariableEditor.tsx
+++ b/public/app/features/variables/datasource/DataSourceVariableEditor.tsx
@@ -2,19 +2,16 @@ import React, { FormEvent, PureComponent } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
 import { SelectableValue } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
+import { DataSourceVariableForm } from 'app/features/dashboard-scene/settings/variables/components/DataSourceVariableForm';
 
 import { StoreState } from '../../../types';
-import { SelectionOptionsEditor } from '../editor/SelectionOptionsEditor';
-import { VariableLegend } from '../editor/VariableLegend';
-import { VariableSelectField } from '../editor/VariableSelectField';
-import { VariableTextField } from '../editor/VariableTextField';
 import { initialVariableEditorState } from '../editor/reducer';
 import { getDatasourceVariableEditorState } from '../editor/selectors';
 import { OnPropChangeArguments, VariableEditorProps } from '../editor/types';
 import { changeVariableMultiValue } from '../state/actions';
 import { getVariablesState } from '../state/selectors';
 import { DataSourceVariableModel, VariableWithMultiSupport } from '../types';
+import { toKeyedVariableIdentifier } from '../utils';
 
 import { initDataSourceVariableEditor } from './actions';
 
@@ -57,13 +54,6 @@ export class DataSourceVariableEditorUnConnected extends PureComponent<Props> {
     this.props.initDataSourceVariableEditor(rootStateKey);
   }
 
-  onRegExChange = (event: FormEvent<HTMLInputElement>) => {
-    this.props.onPropChange({
-      propName: 'regex',
-      propValue: event.currentTarget.value,
-    });
-  };
-
   onRegExBlur = (event: FormEvent<HTMLInputElement>) => {
     this.props.onPropChange({
       propName: 'regex',
@@ -76,6 +66,18 @@ export class DataSourceVariableEditorUnConnected extends PureComponent<Props> {
     this.props.onPropChange({ propName, propValue, updateOptions: true });
   };
 
+  onMultiChanged = (event: FormEvent<HTMLInputElement>) => {
+    this.props.changeVariableMultiValue(toKeyedVariableIdentifier(this.props.variable), event.currentTarget.checked);
+  };
+
+  onIncludeAllChanged = (event: FormEvent<HTMLInputElement>) => {
+    this.onSelectionOptionsChange({ propName: 'includeAll', propValue: event.currentTarget.checked });
+  };
+
+  onAllValueChanged = (event: FormEvent<HTMLInputElement>) => {
+    this.onSelectionOptionsChange({ propName: 'allValue', propValue: event.currentTarget.value });
+  };
+
   getSelectedDataSourceTypeValue = (): string => {
     const { extended } = this.props;
 
@@ -93,49 +95,25 @@ export class DataSourceVariableEditorUnConnected extends PureComponent<Props> {
   };
 
   render() {
-    const { variable, extended, changeVariableMultiValue } = this.props;
+    const { variable, extended } = this.props;
 
     const typeOptions = extended?.dataSourceTypes?.length
       ? extended.dataSourceTypes?.map((ds) => ({ value: ds.value ?? '', label: ds.text }))
       : [];
 
-    const typeValue = typeOptions.find((o) => o.value === variable.query) ?? typeOptions[0];
-
     return (
-      <>
-        <VariableLegend>Data source options</VariableLegend>
-        <VariableSelectField
-          name="Type"
-          value={typeValue}
-          options={typeOptions}
-          onChange={this.onDataSourceTypeChanged}
-          testId={selectors.pages.Dashboard.Settings.Variables.Edit.DatasourceVariable.datasourceSelect}
-        />
-
-        <VariableTextField
-          value={this.props.variable.regex}
-          name="Instance name filter"
-          placeholder="/.*-(.*)-.*/"
-          onChange={this.onRegExChange}
-          onBlur={this.onRegExBlur}
-          description={
-            <div>
-              Regex filter for which data source instances to choose from in the variable value list. Leave empty for
-              all.
-              <br />
-              <br />
-              Example: <code>/^prod/</code>
-            </div>
-          }
-        />
-
-        <VariableLegend>Selection options</VariableLegend>
-        <SelectionOptionsEditor
-          variable={variable}
-          onPropChange={this.onSelectionOptionsChange}
-          onMultiChanged={changeVariableMultiValue}
-        />
-      </>
+      <DataSourceVariableForm
+        query={variable.query}
+        regex={variable.regex}
+        multi={variable.multi}
+        includeAll={variable.includeAll}
+        optionTypes={typeOptions}
+        onChange={this.onDataSourceTypeChanged}
+        onRegExBlur={this.onRegExBlur}
+        onMultiChange={this.onMultiChanged}
+        onIncludeAllChange={this.onIncludeAllChanged}
+        onAllValueChange={this.onAllValueChanged}
+      />
     );
   }
 }
diff --git a/public/app/features/variables/datasource/actions.test.ts b/public/app/features/variables/datasource/actions.test.ts
index 42864b95de473..4d3a5ca8e94c7 100644
--- a/public/app/features/variables/datasource/actions.test.ts
+++ b/public/app/features/variables/datasource/actions.test.ts
@@ -29,7 +29,12 @@ function getTestContext({ sources = [], query, regex }: Args = {}) {
   const getListMock = jest.fn().mockReturnValue(sources);
   const getDatasourceSrvMock = jest.fn().mockReturnValue({ getList: getListMock });
   const dependencies: DataSourceVariableActionDependencies = { getDatasourceSrv: getDatasourceSrvMock };
-  const datasource = datasourceBuilder().withId('0').withRootStateKey('key').withQuery(query).withRegEx(regex).build();
+  const datasource = datasourceBuilder()
+    .withId('0')
+    .withRootStateKey('key')
+    .withQuery(query!)
+    .withRegEx(regex!)
+    .build();
 
   return { getListMock, getDatasourceSrvMock, dependencies, datasource };
 }
diff --git a/public/app/features/variables/datasource/reducer.ts b/public/app/features/variables/datasource/reducer.ts
index d28abaf014f8b..b094975227372 100644
--- a/public/app/features/variables/datasource/reducer.ts
+++ b/public/app/features/variables/datasource/reducer.ts
@@ -1,6 +1,6 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 
-import { DataSourceInstanceSettings } from '@grafana/data';
+import { DataSourceInstanceSettings, matchPluginId } from '@grafana/data';
 
 import { ALL_VARIABLE_TEXT, ALL_VARIABLE_VALUE } from '../constants';
 import { getInstanceState } from '../state/selectors';
@@ -10,7 +10,7 @@ import { DataSourceVariableModel, initialVariableModelState, VariableOption, Var
 export const initialDataSourceVariableModelState: DataSourceVariableModel = {
   ...initialVariableModelState,
   type: 'datasource',
-  current: {} as VariableOption,
+  current: {},
   regex: '',
   options: [],
   query: '',
@@ -36,8 +36,8 @@ export const dataSourceVariableSlice = createSlice({
 
       for (let i = 0; i < sources.length; i++) {
         const source = sources[i];
-        // must match on type
-        if (source.meta.id !== instanceState.query) {
+
+        if (!matchPluginId(instanceState.query, source.meta)) {
           continue;
         }
 
diff --git a/public/app/features/variables/editor/LegacyVariableQueryEditor.tsx b/public/app/features/variables/editor/LegacyVariableQueryEditor.tsx
index 53e6b2226e96c..2b5f3e24317a3 100644
--- a/public/app/features/variables/editor/LegacyVariableQueryEditor.tsx
+++ b/public/app/features/variables/editor/LegacyVariableQueryEditor.tsx
@@ -4,10 +4,9 @@ import React, { useCallback, useState } from 'react';
 import { selectors } from '@grafana/e2e-selectors';
 import { TextArea, useStyles2 } from '@grafana/ui';
 
+import { getStyles } from '../../dashboard-scene/settings/variables/components/VariableTextAreaField';
 import { VariableQueryEditorProps } from '../types';
 
-import { getStyles } from './VariableTextAreaField';
-
 export const LEGACY_VARIABLE_QUERY_EDITOR_NAME = 'Grafana-LegacyVariableQueryEditor';
 
 export const LegacyVariableQueryEditor = ({ onChange, query }: VariableQueryEditorProps) => {
@@ -35,7 +34,7 @@ export const LegacyVariableQueryEditor = ({ onChange, query }: VariableQueryEdit
       onBlur={onBlur}
       placeholder="Metric name or tags query"
       required
-      aria-label={selectors.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsQueryInput}
+      data-testid={selectors.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsQueryInput}
       cols={52}
       className={styles.textarea}
     />
diff --git a/public/app/features/variables/editor/SelectionOptionsEditor.tsx b/public/app/features/variables/editor/SelectionOptionsEditor.tsx
index 06cf1525b71fe..75b38b68e6789 100644
--- a/public/app/features/variables/editor/SelectionOptionsEditor.tsx
+++ b/public/app/features/variables/editor/SelectionOptionsEditor.tsx
@@ -1,14 +1,11 @@
 import React, { ChangeEvent, FormEvent, useCallback } from 'react';
 
-import { selectors } from '@grafana/e2e-selectors';
-import { VerticalGroup } from '@grafana/ui';
+import { SelectionOptionsForm } from 'app/features/dashboard-scene/settings/variables/components/SelectionOptionsForm';
 
 import { KeyedVariableIdentifier } from '../state/types';
 import { VariableWithMultiSupport } from '../types';
 import { toKeyedVariableIdentifier } from '../utils';
 
-import { VariableCheckboxField } from './VariableCheckboxField';
-import { VariableTextField } from './VariableTextField';
 import { VariableEditorProps } from './types';
 
 export interface SelectionOptionsEditorProps<Model extends VariableWithMultiSupport = VariableWithMultiSupport>
@@ -43,29 +40,14 @@ export const SelectionOptionsEditor = ({
   );
 
   return (
-    <VerticalGroup spacing="md" height="inherit">
-      <VariableCheckboxField
-        value={variable.multi}
-        name="Multi-value"
-        description="Enables multiple values to be selected at the same time"
-        onChange={onMultiChanged}
-      />
-      <VariableCheckboxField
-        value={variable.includeAll}
-        name="Include All option"
-        description="Enables an option to include all variables"
-        onChange={onIncludeAllChanged}
-      />
-      {variable.includeAll && (
-        <VariableTextField
-          value={variable.allValue ?? ''}
-          onChange={onAllValueChanged}
-          name="Custom all value"
-          placeholder="blank = auto"
-          testId={selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsCustomAllInputV2}
-        />
-      )}
-    </VerticalGroup>
+    <SelectionOptionsForm
+      multi={variable.multi}
+      includeAll={variable.includeAll}
+      allValue={variable.allValue}
+      onMultiChange={onMultiChanged}
+      onIncludeAllChange={onIncludeAllChanged}
+      onAllValueChange={onAllValueChanged}
+    />
   );
 };
 SelectionOptionsEditor.displayName = 'SelectionOptionsEditor';
diff --git a/public/app/features/variables/editor/VariableEditorContainer.tsx b/public/app/features/variables/editor/VariableEditorContainer.tsx
index 166e4082767fd..41ccf9daf765f 100644
--- a/public/app/features/variables/editor/VariableEditorContainer.tsx
+++ b/public/app/features/variables/editor/VariableEditorContainer.tsx
@@ -2,7 +2,7 @@ import React, { PureComponent } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 import { bindActionCreators } from 'redux';
 
-import { config, locationService } from '@grafana/runtime';
+import { locationService } from '@grafana/runtime';
 import { Page } from 'app/core/components/Page/Page';
 import { SettingsPageProps } from 'app/features/dashboard/components/DashboardSettings/types';
 
@@ -108,13 +108,12 @@ class VariableEditorContainerUnconnected extends PureComponent<Props, State> {
     const { editIndex, variables, sectionNav } = this.props;
     const variableToEdit = editIndex != null ? variables[editIndex] : undefined;
     const node = sectionNav.node;
-    const parentItem =
-      config.featureToggles.dockedMegaMenu && node.parentItem
-        ? {
-            ...node.parentItem,
-            url: node.url,
-          }
-        : undefined;
+    const parentItem = node.parentItem
+      ? {
+          ...node.parentItem,
+          url: node.url,
+        }
+      : undefined;
     const subPageNav = variableToEdit ? { text: variableToEdit.name, parentItem } : parentItem;
 
     return (
diff --git a/public/app/features/variables/editor/VariableEditorEditor.tsx b/public/app/features/variables/editor/VariableEditorEditor.tsx
index 5ebb4ce7ebdc3..d36433531ef51 100644
--- a/public/app/features/variables/editor/VariableEditorEditor.tsx
+++ b/public/app/features/variables/editor/VariableEditorEditor.tsx
@@ -8,6 +8,11 @@ import { locationService } from '@grafana/runtime';
 import { Button, HorizontalGroup, Icon } from '@grafana/ui';
 
 import { StoreState, ThunkDispatch } from '../../../types';
+import { VariableHideSelect } from '../../dashboard-scene/settings/variables/components/VariableHideSelect';
+import { VariableLegend } from '../../dashboard-scene/settings/variables/components/VariableLegend';
+import { VariableTextAreaField } from '../../dashboard-scene/settings/variables/components/VariableTextAreaField';
+import { VariableTextField } from '../../dashboard-scene/settings/variables/components/VariableTextField';
+import { VariableValuesPreview } from '../../dashboard-scene/settings/variables/components/VariableValuesPreview';
 import { variableAdapters } from '../adapters';
 import { hasOptions } from '../guard';
 import { updateOptions } from '../state/actions';
@@ -19,12 +24,7 @@ import { VariableHide } from '../types';
 import { toKeyedVariableIdentifier, toVariablePayload } from '../utils';
 
 import { ConfirmDeleteModal } from './ConfirmDeleteModal';
-import { VariableHideSelect } from './VariableHideSelect';
-import { VariableLegend } from './VariableLegend';
-import { VariableTextAreaField } from './VariableTextAreaField';
-import { VariableTextField } from './VariableTextField';
 import { VariableTypeSelect } from './VariableTypeSelect';
-import { VariableValuesPreview } from './VariableValuesPreview';
 import { changeVariableName, variableEditorMount, variableEditorUnMount } from './actions';
 import { OnPropChangeArguments, VariableNameConstraints } from './types';
 
@@ -138,6 +138,14 @@ export class VariableEditorEditorUnConnected extends PureComponent<Props, State>
     locationService.partial({ editIndex: null });
   };
 
+  getVariableOptions = () => {
+    const { variable } = this.props;
+    if (!hasOptions(variable)) {
+      return [];
+    }
+    return variable.options.map((option) => ({ label: String(option.text), value: String(option.value) }));
+  };
+
   render() {
     const { variable } = this.props;
     const EditorToRender = variableAdapters.get(this.props.variable.type).editor;
@@ -188,7 +196,7 @@ export class VariableEditorEditorUnConnected extends PureComponent<Props, State>
 
           {EditorToRender && <EditorToRender variable={this.props.variable} onPropChange={this.onPropChanged} />}
 
-          {hasOptions(this.props.variable) ? <VariableValuesPreview variable={this.props.variable} /> : null}
+          {hasOptions(this.props.variable) ? <VariableValuesPreview options={this.getVariableOptions()} /> : null}
 
           <div style={{ marginTop: '16px' }}>
             <HorizontalGroup spacing="md" height="inherit">
@@ -197,7 +205,7 @@ export class VariableEditorEditorUnConnected extends PureComponent<Props, State>
               </Button>
               <Button
                 type="submit"
-                aria-label={selectors.pages.Dashboard.Settings.Variables.Edit.General.submitButton}
+                data-testid={selectors.pages.Dashboard.Settings.Variables.Edit.General.submitButton}
                 disabled={loading}
                 variant="secondary"
               >
diff --git a/public/app/features/variables/editor/VariableEditorList.tsx b/public/app/features/variables/editor/VariableEditorList.tsx
index b69cdf293aa1c..32720af0ab6d9 100644
--- a/public/app/features/variables/editor/VariableEditorList.tsx
+++ b/public/app/features/variables/editor/VariableEditorList.tsx
@@ -2,21 +2,20 @@ import { css } from '@emotion/css';
 import React, { ReactElement } from 'react';
 import { DragDropContext, Droppable, DropResult } from 'react-beautiful-dnd';
 
+import { TypedVariableModel } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { Stack } from '@grafana/experimental';
 import { reportInteraction } from '@grafana/runtime';
-import { Button, useStyles2 } from '@grafana/ui';
+import { Button, useStyles2, Stack } from '@grafana/ui';
 import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
 
 import { VariablesDependenciesButton } from '../inspect/VariablesDependenciesButton';
 import { UsagesToNetwork, VariableUsageTree } from '../inspect/utils';
 import { KeyedVariableIdentifier } from '../state/types';
-import { VariableModel } from '../types';
 
 import { VariableEditorListRow } from './VariableEditorListRow';
 
 export interface Props {
-  variables: VariableModel[];
+  variables: TypedVariableModel[];
   usages: VariableUsageTree[];
   usagesNetwork: UsagesToNetwork[];
   onAdd: () => void;
diff --git a/public/app/features/variables/editor/VariableEditorListRow.tsx b/public/app/features/variables/editor/VariableEditorListRow.tsx
index 6c094b2a36465..befc897d5a541 100644
--- a/public/app/features/variables/editor/VariableEditorListRow.tsx
+++ b/public/app/features/variables/editor/VariableEditorListRow.tsx
@@ -2,21 +2,20 @@ import { css } from '@emotion/css';
 import React, { ReactElement } from 'react';
 import { Draggable } from 'react-beautiful-dnd';
 
-import { GrafanaTheme2 } from '@grafana/data';
+import { GrafanaTheme2, TypedVariableModel } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { reportInteraction } from '@grafana/runtime';
 import { Button, Icon, IconButton, useStyles2, useTheme2 } from '@grafana/ui';
 
-import { hasOptions, isAdHoc, isQuery } from '../guard';
+import { hasOptions } from '../guard';
 import { VariableUsagesButton } from '../inspect/VariableUsagesButton';
 import { getVariableUsages, UsagesToNetwork, VariableUsageTree } from '../inspect/utils';
 import { KeyedVariableIdentifier } from '../state/types';
-import { VariableModel } from '../types';
 import { toKeyedVariableIdentifier } from '../utils';
 
 export interface VariableEditorListRowProps {
   index: number;
-  variable: VariableModel;
+  variable: TypedVariableModel;
   usageTree: VariableUsageTree[];
   usagesNetwork: UsagesToNetwork[];
   onEdit: (identifier: KeyedVariableIdentifier) => void;
@@ -37,7 +36,7 @@ export function VariableEditorListRow({
   const styles = useStyles2(getStyles);
   const definition = getDefinition(variable);
   const usages = getVariableUsages(variable.id, usageTree);
-  const passed = usages > 0 || isAdHoc(variable);
+  const passed = usages > 0 || variable.type === 'adhoc';
   const identifier = toKeyedVariableIdentifier(variable);
 
   return (
@@ -81,7 +80,7 @@ export function VariableEditorListRow({
           <td role="gridcell" className={styles.column}>
             <div className={styles.icons}>
               <VariableCheckIndicator passed={passed} />
-              <VariableUsagesButton id={variable.id} isAdhoc={isAdHoc(variable)} usages={usagesNetwork} />
+              <VariableUsagesButton id={variable.id} isAdhoc={variable.type === 'adhoc'} usages={usagesNetwork} />
               <IconButton
                 onClick={(event) => {
                   event.preventDefault();
@@ -113,9 +112,9 @@ export function VariableEditorListRow({
   );
 }
 
-function getDefinition(model: VariableModel): string {
+function getDefinition(model: TypedVariableModel): string {
   let definition = '';
-  if (isQuery(model)) {
+  if (model.type === 'query') {
     if (model.definition) {
       definition = model.definition;
     } else if (typeof model.query === 'string') {
diff --git a/public/app/features/variables/editor/VariableSelectField.tsx b/public/app/features/variables/editor/VariableSelectField.tsx
deleted file mode 100644
index d1cc5bf017bd9..0000000000000
--- a/public/app/features/variables/editor/VariableSelectField.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { css } from '@emotion/css';
-import React, { PropsWithChildren, ReactElement, useId } from 'react';
-
-import { GrafanaTheme2, SelectableValue } from '@grafana/data';
-import { Field, Select, useStyles2 } from '@grafana/ui';
-
-interface VariableSelectFieldProps<T> {
-  name: string;
-  value: SelectableValue<T>;
-  options: Array<SelectableValue<T>>;
-  onChange: (option: SelectableValue<T>) => void;
-  testId?: string;
-  width?: number;
-  description?: React.ReactNode;
-}
-
-export function VariableSelectField({
-  name,
-  description,
-  value,
-  options,
-  onChange,
-  testId,
-  width,
-}: PropsWithChildren<VariableSelectFieldProps<any>>): ReactElement {
-  const styles = useStyles2(getStyles);
-  const uniqueId = useId();
-  const inputId = `variable-select-input-${name}-${uniqueId}`;
-
-  return (
-    <Field label={name} description={description} htmlFor={inputId}>
-      <div data-testid={testId}>
-        <Select
-          inputId={inputId}
-          onChange={onChange}
-          value={value}
-          width={width ?? 30}
-          options={options}
-          className={styles.selectContainer}
-        />
-      </div>
-    </Field>
-  );
-}
-
-function getStyles(theme: GrafanaTheme2) {
-  return {
-    selectContainer: css`
-      margin-right: ${theme.spacing(0.5)};
-    `,
-  };
-}
diff --git a/public/app/features/variables/editor/VariableTextAreaField.tsx b/public/app/features/variables/editor/VariableTextAreaField.tsx
deleted file mode 100644
index 73027027c555d..0000000000000
--- a/public/app/features/variables/editor/VariableTextAreaField.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import { css } from '@emotion/css';
-import { useId } from '@react-aria/utils';
-import React, { FormEvent, PropsWithChildren, ReactElement } from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { Field, TextArea, useStyles2 } from '@grafana/ui';
-
-interface VariableTextAreaFieldProps {
-  name: string;
-  value: string;
-  placeholder: string;
-  onChange: (event: FormEvent<HTMLTextAreaElement>) => void;
-  width: number;
-  ariaLabel?: string;
-  required?: boolean;
-  testId?: string;
-  onBlur?: (event: FormEvent<HTMLTextAreaElement>) => void;
-  description?: React.ReactNode;
-}
-
-export function VariableTextAreaField({
-  value,
-  name,
-  description,
-  placeholder,
-  onChange,
-  onBlur,
-  ariaLabel,
-  required,
-  width,
-  testId,
-}: PropsWithChildren<VariableTextAreaFieldProps>): ReactElement {
-  const styles = useStyles2(getStyles);
-  const id = useId();
-
-  return (
-    <Field label={name} description={description} htmlFor={id}>
-      <TextArea
-        id={id}
-        rows={2}
-        value={value}
-        onChange={onChange}
-        onBlur={onBlur}
-        placeholder={placeholder}
-        required={required}
-        aria-label={ariaLabel}
-        cols={width}
-        className={styles.textarea}
-        data-testid={testId}
-      />
-    </Field>
-  );
-}
-
-export function getStyles(theme: GrafanaTheme2) {
-  return {
-    textarea: css`
-      white-space: pre-wrap;
-      min-height: ${theme.spacing(4)};
-      height: auto;
-      overflow: auto;
-      padding: ${theme.spacing(0.75, 1)};
-      width: inherit;
-
-      ${theme.breakpoints.down('sm')} {
-        width: 100%;
-      }
-    `,
-  };
-}
diff --git a/public/app/features/variables/editor/VariableTypeSelect.tsx b/public/app/features/variables/editor/VariableTypeSelect.tsx
index 1963e23dc5e2b..65d80f7d83e8d 100644
--- a/public/app/features/variables/editor/VariableTypeSelect.tsx
+++ b/public/app/features/variables/editor/VariableTypeSelect.tsx
@@ -3,7 +3,7 @@ import React, { PropsWithChildren, useMemo } from 'react';
 import { SelectableValue, VariableType } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 
-import { VariableSelectField } from '../editor/VariableSelectField';
+import { VariableSelectField } from '../../dashboard-scene/settings/variables/components/VariableSelectField';
 import { getVariableTypes } from '../utils';
 
 interface Props {
diff --git a/public/app/features/variables/editor/actions.ts b/public/app/features/variables/editor/actions.ts
index 9af677aa6e5a9..9f99d411b8af3 100644
--- a/public/app/features/variables/editor/actions.ts
+++ b/public/app/features/variables/editor/actions.ts
@@ -1,6 +1,6 @@
 import { cloneDeep } from 'lodash';
 
-import { VariableType } from '@grafana/data';
+import { TypedVariableModel, VariableType } from '@grafana/data';
 import { locationService } from '@grafana/runtime';
 
 import { ThunkResult } from '../../../types';
@@ -11,7 +11,6 @@ import { toKeyedAction } from '../state/keyedVariablesReducer';
 import { getEditorVariables, getNewVariableIndex, getVariable, getVariablesByKey } from '../state/selectors';
 import { addVariable, removeVariable } from '../state/sharedReducer';
 import { AddVariable, KeyedVariableIdentifier, VariableIdentifier } from '../state/types';
-import { VariableModel } from '../types';
 import { toKeyedVariableIdentifier, toStateKey, toVariablePayload } from '../utils';
 
 import {
@@ -95,7 +94,7 @@ export const createNewVariable =
     const identifier: VariableIdentifier = { type, id };
     const global = false;
     const index = getNewVariableIndex(rootStateKey, getState());
-    const model: VariableModel = cloneDeep(variableAdapters.get(type).initialState);
+    const model: TypedVariableModel = cloneDeep(variableAdapters.get(type).initialState);
     model.id = id;
     model.name = id;
     model.rootStateKey = rootStateKey;
@@ -119,7 +118,7 @@ export const initListMode =
     dispatch(toKeyedAction(rootStateKey, initInspect({ usages, usagesNetwork })));
   };
 
-export function getNextAvailableId(type: VariableType, variables: VariableModel[]): string {
+export function getNextAvailableId(type: VariableType, variables: TypedVariableModel[]): string {
   let counter = 0;
   let nextId = `${type}${counter}`;
 
diff --git a/public/app/features/variables/guard.test.ts b/public/app/features/variables/guard.test.ts
index 1afcf66bbef3a..cd65f21e621ca 100644
--- a/public/app/features/variables/guard.test.ts
+++ b/public/app/features/variables/guard.test.ts
@@ -19,6 +19,7 @@ import {
   createCustomVariable,
   createDashboardVariable,
   createDatasourceVariable,
+  createGroupByVariable,
   createIntervalVariable,
   createOrgVariable,
   createQueryVariable,
@@ -164,6 +165,7 @@ describe('type guards', () => {
   const variableFactsObj: Record<VariableType | ExtraVariableTypes, VariableFacts> = {
     query:      { variable: createQueryVariable(),      isMulti: true,  hasOptions: true,  hasCurrent: true },
     adhoc:      { variable: createAdhocVariable(),      isMulti: false, hasOptions: false, hasCurrent: false },
+    groupby:    { variable: createGroupByVariable(),    isMulti: true,  hasOptions: true, hasCurrent: true },
     constant:   { variable: createConstantVariable(),   isMulti: false, hasOptions: true,  hasCurrent: true },
     datasource: { variable: createDatasourceVariable(), isMulti: true,  hasOptions: true,  hasCurrent: true },
     interval:   { variable: createIntervalVariable(),   isMulti: false, hasOptions: true,  hasCurrent: true },
diff --git a/public/app/features/variables/inspect/utils.test.ts b/public/app/features/variables/inspect/utils.test.ts
index f9cc309b58f5c..bd14a96537379 100644
--- a/public/app/features/variables/inspect/utils.test.ts
+++ b/public/app/features/variables/inspect/utils.test.ts
@@ -6,7 +6,13 @@ import { createDataSourceVariableAdapter } from '../datasource/adapter';
 import { createQueryVariableAdapter } from '../query/adapter';
 import { createGraph } from '../state/actions';
 
-import { flattenPanels, getAllAffectedPanelIdsForVariableChange, getPanelVars, getPropsWithVariable } from './utils';
+import {
+  flattenPanels,
+  getAllAffectedPanelIdsForVariableChange,
+  getPanelVars,
+  getPropsWithVariable,
+  getVariableName,
+} from './utils';
 
 describe('getPropsWithVariable', () => {
   it('when called it should return the correct graph', () => {
@@ -303,6 +309,20 @@ describe('flattenPanels', () => {
   });
 });
 
+describe('getVariableName', () => {
+  it('should return undefined if no match is found', () => {
+    expect(getVariableName('no variable here')).toBeUndefined();
+  });
+
+  it('should return undefined if variable matches inherited object prop names', () => {
+    expect(getVariableName('${toString}')).toBeUndefined();
+  });
+
+  it('should return the variable name if it exists and does not match inherited object prop names', () => {
+    expect(getVariableName('${myVariable}')).toBe('myVariable');
+  });
+});
+
 const dashWithRepeatsAndRows = {
   annotations: {
     list: [
diff --git a/public/app/features/variables/inspect/utils.ts b/public/app/features/variables/inspect/utils.ts
index 281d8df449b20..3c7ad237f163f 100644
--- a/public/app/features/variables/inspect/utils.ts
+++ b/public/app/features/variables/inspect/utils.ts
@@ -60,6 +60,12 @@ export function getVariableName(expression: string) {
     return undefined;
   }
   const variableName = match.slice(1).find((match) => match !== undefined);
+
+  // ignore variables that match inherited object prop names
+  if (variableName! in {}) {
+    return undefined;
+  }
+
   return variableName;
 }
 
diff --git a/public/app/features/variables/interval/IntervalVariableEditor.tsx b/public/app/features/variables/interval/IntervalVariableEditor.tsx
index 0aae4badf2f48..88504924769d4 100644
--- a/public/app/features/variables/interval/IntervalVariableEditor.tsx
+++ b/public/app/features/variables/interval/IntervalVariableEditor.tsx
@@ -1,21 +1,10 @@
-import { css } from '@emotion/css';
 import React, { ChangeEvent, FormEvent } from 'react';
 
-import { GrafanaTheme2, IntervalVariableModel, SelectableValue } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
-import { useStyles2 } from '@grafana/ui';
+import { IntervalVariableModel, SelectableValue } from '@grafana/data';
+import { IntervalVariableForm } from 'app/features/dashboard-scene/settings/variables/components/IntervalVariableForm';
 
-import { VariableCheckboxField } from '../editor/VariableCheckboxField';
-import { VariableLegend } from '../editor/VariableLegend';
-import { VariableSelectField } from '../editor/VariableSelectField';
-import { VariableTextField } from '../editor/VariableTextField';
 import { VariableEditorProps } from '../editor/types';
 
-const STEP_OPTIONS = [1, 2, 3, 4, 5, 10, 20, 30, 40, 50, 100, 200, 300, 400, 500].map((count) => ({
-  label: `${count}`,
-  value: count,
-}));
-
 export interface Props extends VariableEditorProps<IntervalVariableModel> {}
 
 export const IntervalVariableEditor = React.memo(({ onPropChange, variable }: Props) => {
@@ -27,13 +16,6 @@ export const IntervalVariableEditor = React.memo(({ onPropChange, variable }: Pr
     });
   };
 
-  const onQueryChanged = (event: FormEvent<HTMLInputElement>) => {
-    onPropChange({
-      propName: 'query',
-      propValue: event.currentTarget.value,
-    });
-  };
-
   const onQueryBlur = (event: FormEvent<HTMLInputElement>) => {
     onPropChange({
       propName: 'query',
@@ -58,62 +40,18 @@ export const IntervalVariableEditor = React.memo(({ onPropChange, variable }: Pr
     });
   };
 
-  const stepValue = STEP_OPTIONS.find((o) => o.value === variable.auto_count) ?? STEP_OPTIONS[0];
-
-  const styles = useStyles2(getStyles);
-
   return (
-    <>
-      <VariableLegend>Interval options</VariableLegend>
-      <VariableTextField
-        value={variable.query}
-        name="Values"
-        placeholder="1m,10m,1h,6h,1d,7d"
-        onChange={onQueryChanged}
-        onBlur={onQueryBlur}
-        testId={selectors.pages.Dashboard.Settings.Variables.Edit.IntervalVariable.intervalsValueInput}
-        width={32}
-        required
-      />
-
-      <VariableCheckboxField
-        value={variable.auto}
-        name="Auto option"
-        description="Dynamically calculates interval by dividing time range by the count specified"
-        onChange={onAutoChange}
-      />
-      {variable.auto && (
-        <div className={styles.autoFields}>
-          <VariableSelectField
-            name="Step count"
-            description="How many times the current time range should be divided to calculate the value"
-            value={stepValue}
-            options={STEP_OPTIONS}
-            onChange={onAutoCountChanged}
-            width={9}
-          />
-          <VariableTextField
-            value={variable.auto_min}
-            name="Min interval"
-            description="The calculated value will not go below this threshold"
-            placeholder="10s"
-            onChange={onAutoMinChanged}
-            width={11}
-          />
-        </div>
-      )}
-    </>
+    <IntervalVariableForm
+      intervals={variable.query}
+      autoStepCount={variable.auto_count}
+      autoEnabled={variable.auto}
+      onAutoCountChanged={onAutoCountChanged}
+      onIntervalsChange={onQueryBlur}
+      onAutoEnabledChange={onAutoChange}
+      onAutoMinIntervalChanged={onAutoMinChanged}
+      autoMinInterval={variable.auto_min}
+    />
   );
 });
 
 IntervalVariableEditor.displayName = 'IntervalVariableEditor';
-
-function getStyles(theme: GrafanaTheme2) {
-  return {
-    autoFields: css({
-      marginTop: theme.spacing(2),
-      display: 'flex',
-      flexDirection: 'column',
-    }),
-  };
-}
diff --git a/public/app/features/variables/interval/reducer.ts b/public/app/features/variables/interval/reducer.ts
index a0d7d2de27bc1..a51919d28c0ab 100644
--- a/public/app/features/variables/interval/reducer.ts
+++ b/public/app/features/variables/interval/reducer.ts
@@ -14,7 +14,7 @@ export const initialIntervalVariableModelState: IntervalVariableModel = {
   auto: false,
   query: '1m,10m,30m,1h,6h,12h,1d,7d,14d,30d',
   refresh: VariableRefresh.onTimeRangeChanged,
-  current: {} as VariableOption,
+  current: {},
 };
 
 export const intervalVariableSlice = createSlice({
diff --git a/public/app/features/variables/pickers/OptionsPicker/OptionPicker.test.tsx b/public/app/features/variables/pickers/OptionsPicker/OptionPicker.test.tsx
index bb3a51b9edefe..316daba5c47e3 100644
--- a/public/app/features/variables/pickers/OptionsPicker/OptionPicker.test.tsx
+++ b/public/app/features/variables/pickers/OptionsPicker/OptionPicker.test.tsx
@@ -111,7 +111,7 @@ describe('OptionPicker', () => {
         variable: { ...defaultVariable, state: LoadingState.Loading },
       });
       expect(getSubMenu('A + C')).toBeInTheDocument();
-      expect(screen.getByLabelText(selectors.components.LoadingIndicator.icon)).toBeInTheDocument();
+      expect(screen.getByTestId(selectors.components.LoadingIndicator.icon)).toBeInTheDocument();
     });
 
     it('link text should not be clickable', async () => {
diff --git a/public/app/features/variables/pickers/OptionsPicker/reducer.test.ts b/public/app/features/variables/pickers/OptionsPicker/reducer.test.ts
index 2fba9f320e6b0..9a2dfe161afe5 100644
--- a/public/app/features/variables/pickers/OptionsPicker/reducer.test.ts
+++ b/public/app/features/variables/pickers/OptionsPicker/reducer.test.ts
@@ -48,24 +48,24 @@ describe('optionsPickerReducer', () => {
     ];
 
     const expectToggleOptionState = (args: {
-      options: any;
-      multi: any;
-      forceSelect: any;
-      clearOthers: any;
-      option: any;
-      expectSelected: any;
+      options: typeof opsAll;
+      multi: boolean;
+      forceSelect: boolean;
+      clearOthers: boolean;
+      option: string;
+      expectSelected: string[];
     }) => {
       const { initialState } = getVariableTestContext({
         options: args.options,
         multi: args.multi,
-        selectedValues: args.options.filter((o: any) => o.selected),
+        selectedValues: args.options.filter((o) => o.selected),
       });
       const payload = {
         forceSelect: args.forceSelect,
         clearOthers: args.clearOthers,
         option: { text: args.option, value: args.option, selected: true },
       };
-      const expectedAsRecord = args.expectSelected.reduce((all: any, current: any) => {
+      const expectedAsRecord = args.expectSelected.reduce<Record<string, string>>((all, current) => {
         all[current] = current;
         return all;
       }, {});
@@ -75,8 +75,8 @@ describe('optionsPickerReducer', () => {
         .whenActionIsDispatched(toggleOption(payload))
         .thenStateShouldEqual({
           ...initialState,
-          selectedValues: args.expectSelected.map((value: any) => ({ value, text: value, selected: true })),
-          options: args.options.map((option: any) => {
+          selectedValues: args.expectSelected.map((value) => ({ value, text: value, selected: true })),
+          options: args.options.map((option) => {
             return { ...option, selected: !!expectedAsRecord[option.value] };
           }),
         });
@@ -124,7 +124,17 @@ describe('optionsPickerReducer', () => {
           ${'$__all'} | ${false}    | ${true}     | ${['$__all']}
         `(
           'and we toggle $option with options: { forceSelect: $forceSelect, clearOthers: $clearOthers } we expect $expectSelected to be selected',
-          ({ option, forceSelect, clearOthers, expectSelected }) =>
+          ({
+            option,
+            forceSelect,
+            clearOthers,
+            expectSelected,
+          }: {
+            option: string;
+            forceSelect: boolean;
+            clearOthers: boolean;
+            expectSelected: string[];
+          }) =>
             expectToggleOptionState({
               options,
               multi,
@@ -309,7 +319,7 @@ describe('optionsPickerReducer', () => {
   describe('when showOptions is dispatched and queryValue and variable has no searchFilter', () => {
     it('then state should be correct', () => {
       const query = '*.';
-      const queryValue: any = null;
+      const queryValue = null;
       const current = { text: ALL_VARIABLE_TEXT, selected: true, value: [ALL_VARIABLE_VALUE] };
       const options = [
         { text: 'All', value: '$__all', selected: true },
@@ -317,7 +327,7 @@ describe('optionsPickerReducer', () => {
         { text: 'B', value: 'B', selected: false },
       ];
       const { initialState } = getVariableTestContext({});
-      const payload = { type: 'query', id: '0', current, query, options, queryValue } as QueryVariableModel;
+      const payload = { type: 'query', id: '0', current, query, options, queryValue } as unknown as QueryVariableModel;
 
       reducerTester<OptionsPickerState>()
         .givenReducer(optionsPickerReducer, cloneDeep(initialState))
@@ -546,11 +556,11 @@ describe('optionsPickerReducer', () => {
       it('then state should be correct', () => {
         const queryValue = 'A';
 
-        const options: any = [
+        const options = [
           { text: 'All', value: '$__all', selected: true },
           { text: null, value: null, selected: false },
           { text: [null], value: [null], selected: false },
-        ];
+        ] as VariableOption[];
 
         const { initialState } = getVariableTestContext({ queryValue });
 
@@ -559,8 +569,11 @@ describe('optionsPickerReducer', () => {
           .whenActionIsDispatched(updateOptionsAndFilter(options))
           .thenStateShouldEqual({
             ...initialState,
-            options: [{ text: 'All', value: '$__all', selected: true }],
-            selectedValues: [{ text: 'All', value: '$__all', selected: true }],
+            options: [
+              { text: '> A', value: 'A', selected: false },
+              { text: 'All', value: '$__all', selected: false },
+            ],
+            selectedValues: [],
             queryValue: 'A',
             highlightIndex: 0,
           });
@@ -774,6 +787,78 @@ describe('optionsPickerReducer', () => {
     });
   });
 
+  describe('when similar data for updateOptionsAndFilter', () => {
+    it('should properly rank by match quality', () => {
+      const searchQuery = 'C';
+
+      const options: VariableOption[] = 'A AA AB AC BC C CD'.split(' ').map((v) => ({
+        selected: false,
+        text: v,
+        value: v,
+      }));
+
+      const expect: VariableOption[] = 'C CD AC BC'.split(' ').map((v) => ({
+        selected: false,
+        text: v,
+        value: v,
+      }));
+
+      const { initialState } = getVariableTestContext({
+        queryValue: searchQuery,
+      });
+
+      reducerTester<OptionsPickerState>()
+        .givenReducer(optionsPickerReducer, cloneDeep(initialState))
+        .whenActionIsDispatched(updateOptionsAndFilter(options))
+        .thenStateShouldEqual({
+          ...cloneDeep(initialState),
+          options: expect,
+          selectedValues: [],
+          queryValue: 'C',
+          highlightIndex: 0,
+        });
+    });
+
+    it('should offer as-typed option even when matches exist', () => {
+      const searchQuery = 'a.*';
+
+      const options: VariableOption[] = 'A AA AB C'.split(' ').map((v) => ({
+        selected: false,
+        text: v,
+        value: v,
+      }));
+
+      const expect: VariableOption[] = [
+        {
+          selected: false,
+          text: '> ' + searchQuery,
+          value: searchQuery,
+        },
+      ].concat(
+        'A AA AB'.split(' ').map((v) => ({
+          selected: false,
+          text: v,
+          value: v,
+        }))
+      );
+
+      const { initialState } = getVariableTestContext({
+        queryValue: searchQuery,
+      });
+
+      reducerTester<OptionsPickerState>()
+        .givenReducer(optionsPickerReducer, cloneDeep(initialState))
+        .whenActionIsDispatched(updateOptionsAndFilter(options))
+        .thenStateShouldEqual({
+          ...cloneDeep(initialState),
+          options: expect,
+          selectedValues: [],
+          queryValue: searchQuery,
+          highlightIndex: 1,
+        });
+    });
+  });
+
   describe('when large data for updateOptionsFromSearch is dispatched and variable has searchFilter', () => {
     it('then state should be correct', () => {
       const searchQuery = '__searchFilter';
diff --git a/public/app/features/variables/pickers/OptionsPicker/reducer.ts b/public/app/features/variables/pickers/OptionsPicker/reducer.ts
index 059ad9d579cb3..57342c9010eee 100644
--- a/public/app/features/variables/pickers/OptionsPicker/reducer.ts
+++ b/public/app/features/variables/pickers/OptionsPicker/reducer.ts
@@ -1,5 +1,6 @@
+import uFuzzy from '@leeoniya/ufuzzy';
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
-import { cloneDeep, isString, trimStart } from 'lodash';
+import { cloneDeep, isString } from 'lodash';
 
 import { containsSearchFilter } from '@grafana/data';
 
@@ -34,6 +35,14 @@ export const initialOptionPickerState: OptionsPickerState = {
 
 export const OPTIONS_LIMIT = 1000;
 
+const ufuzzy = new uFuzzy({
+  intraMode: 1,
+  intraIns: 1,
+  intraSub: 1,
+  intraTrn: 1,
+  intraDel: 1,
+});
+
 const optionsToRecord = (options: VariableOption[]): Record<string, VariableOption> => {
   if (!Array.isArray(options)) {
     return {};
@@ -237,16 +246,52 @@ const optionsPickerSlice = createSlice({
       return state;
     },
     updateOptionsAndFilter: (state, action: PayloadAction<VariableOption[]>): OptionsPickerState => {
-      const searchQuery = trimStart((state.queryValue ?? '').toLowerCase());
+      const needle = state.queryValue.trim();
+
+      let opts: VariableOption[] = [];
+
+      if (needle === '') {
+        opts = action.payload;
+      } else {
+        // with current API, not seeing a way to cache this on state using action.payload's uniqueness
+        // since it's recreated and includes selected state on each item :(
+        const haystack = action.payload.map(({ text }) => (Array.isArray(text) ? text.toString() : text));
 
-      state.options = action.payload.filter((option) => {
-        const optionsText = option.text ?? '';
-        const text = Array.isArray(optionsText) ? optionsText.toString() : optionsText;
-        return text.toLowerCase().indexOf(searchQuery) !== -1;
-      });
+        const [idxs, info, order] = ufuzzy.search(haystack, needle, 5);
+
+        if (idxs?.length) {
+          if (info && order) {
+            opts = order.map((idx) => action.payload[info.idx[idx]]);
+          } else {
+            opts = idxs!.map((idx) => action.payload[idx]);
+          }
+
+          // always sort $__all to the top, even if exact match exists?
+          opts.sort((a, b) => (a.value === ALL_VARIABLE_VALUE ? -1 : 0) - (b.value === ALL_VARIABLE_VALUE ? -1 : 0));
+        }
+      }
 
       state.highlightIndex = 0;
 
+      if (needle !== '') {
+        // top ranked match index
+        let firstMatchIdx = opts.findIndex((o) => o.value !== ALL_VARIABLE_VALUE);
+
+        // if there's no match or no exact match, prepend as-typed option
+        if (firstMatchIdx === -1 || opts[firstMatchIdx].value !== needle) {
+          opts.unshift({
+            selected: false,
+            text: '> ' + needle,
+            value: needle,
+          });
+
+          // if no match at all, select as-typed, else select best match
+          state.highlightIndex = firstMatchIdx === -1 ? 0 : firstMatchIdx + 1;
+        }
+      }
+
+      state.options = opts;
+
       return applyStateChanges(state, updateDefaultSelection, updateOptions);
     },
     updateOptionsFromSearch: (state, action: PayloadAction<VariableOption[]>): OptionsPickerState => {
diff --git a/public/app/features/variables/pickers/PickerRenderer.tsx b/public/app/features/variables/pickers/PickerRenderer.tsx
index 843e73d8077ea..f4a135ba8c534 100644
--- a/public/app/features/variables/pickers/PickerRenderer.tsx
+++ b/public/app/features/variables/pickers/PickerRenderer.tsx
@@ -1,14 +1,14 @@
 import React, { PropsWithChildren, ReactElement, useMemo } from 'react';
 
+import { TypedVariableModel, VariableHide } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { Tooltip } from '@grafana/ui';
 
 import { variableAdapters } from '../adapters';
 import { VARIABLE_PREFIX } from '../constants';
-import { VariableHide, VariableModel } from '../types';
 
 interface Props {
-  variable: VariableModel;
+  variable: TypedVariableModel;
   readOnly?: boolean;
 }
 
diff --git a/public/app/features/variables/pickers/shared/VariableInput.tsx b/public/app/features/variables/pickers/shared/VariableInput.tsx
index 78a4898ce17ba..423254ec0ca86 100644
--- a/public/app/features/variables/pickers/shared/VariableInput.tsx
+++ b/public/app/features/variables/pickers/shared/VariableInput.tsx
@@ -34,6 +34,7 @@ export class VariableInput extends PureComponent<Props> {
             instance.setAttribute('style', `width:${Math.max(instance.width, 150)}px`);
           }
         }}
+        id={id}
         type="text"
         className="gf-form-input"
         value={value ?? ''}
diff --git a/public/app/features/variables/pickers/shared/VariableLink.tsx b/public/app/features/variables/pickers/shared/VariableLink.tsx
index 246a7a9cd1f78..206056e750c1b 100644
--- a/public/app/features/variables/pickers/shared/VariableLink.tsx
+++ b/public/app/features/variables/pickers/shared/VariableLink.tsx
@@ -3,7 +3,8 @@ import React, { MouseEvent, useCallback } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { Icon, Tooltip, useStyles2 } from '@grafana/ui';
+import { Icon, useStyles2 } from '@grafana/ui';
+import { LoadingIndicator } from '@grafana/ui/src/components/PanelChrome/LoadingIndicator';
 import { t } from 'app/core/internationalization';
 
 import { ALL_VARIABLE_TEXT } from '../../constants';
@@ -40,7 +41,7 @@ export const VariableLink = ({ loading, disabled, onClick: propsOnClick, text, o
         id={id}
       >
         <VariableLinkText text={text} />
-        <LoadingIndicator onCancel={onCancel} />
+        <LoadingIndicator loading onCancel={onCancel} />
       </div>
     );
   }
@@ -75,28 +76,6 @@ const VariableLinkText = ({ text }: VariableLinkTextProps) => {
   );
 };
 
-const LoadingIndicator = ({ onCancel }: Pick<Props, 'onCancel'>) => {
-  const onClick = useCallback(
-    (event: MouseEvent) => {
-      event.preventDefault();
-      onCancel();
-    },
-    [onCancel]
-  );
-
-  return (
-    <Tooltip content="Cancel query">
-      <Icon
-        className="spin-clockwise"
-        name="sync"
-        size="sm"
-        onClick={onClick}
-        aria-label={selectors.components.LoadingIndicator.icon}
-      />
-    </Tooltip>
-  );
-};
-
 const getStyles = (theme: GrafanaTheme2) => ({
   container: css`
     max-width: 500px;
diff --git a/public/app/features/variables/query/QueryVariableEditor.test.tsx b/public/app/features/variables/query/QueryVariableEditor.test.tsx
index 03a1884428e18..8709c8763e45d 100644
--- a/public/app/features/variables/query/QueryVariableEditor.test.tsx
+++ b/public/app/features/variables/query/QueryVariableEditor.test.tsx
@@ -1,8 +1,10 @@
-import { render, screen } from '@testing-library/react';
+import { render, screen, act } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
+import { MockDataSourceApi } from 'test/mocks/datasource_srv';
 
-import { DataSourceApi, VariableSupportType } from '@grafana/data';
+import { VariableSupportType } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import { mockDataSource } from 'app/features/alerting/unified/mocks';
 import { DataSourceType } from 'app/features/alerting/unified/utils/datasource';
 
@@ -14,11 +16,25 @@ import { QueryVariableModel } from '../types';
 import { Props, QueryVariableEditorUnConnected } from './QueryVariableEditor';
 import { initialQueryVariableModelState } from './reducer';
 
-const setupTestContext = (options: Partial<Props>) => {
+const mockDS = mockDataSource({
+  name: 'CloudManager',
+  type: DataSourceType.Alertmanager,
+});
+const ds = new MockDataSourceApi(mockDS);
+const editor = jest.fn().mockImplementation(LegacyVariableQueryEditor);
+
+ds.variables = {
+  getType: () => VariableSupportType.Custom,
+  query: jest.fn(),
+  editor: editor,
+  getDefaultQuery: jest.fn(),
+};
+
+const setupTestContext = async (options: Partial<Props>) => {
   const variableDefaults: Partial<QueryVariableModel> = { rootStateKey: 'key' };
   const extended = {
     VariableQueryEditor: LegacyVariableQueryEditor,
-    dataSource: {} as unknown as DataSourceApi,
+    dataSource: ds,
   };
 
   const defaults: Props = {
@@ -31,21 +47,16 @@ const setupTestContext = (options: Partial<Props>) => {
     onPropChange: jest.fn(),
   };
 
-  const props: Props & Record<string, any> = { ...defaults, ...options };
-  const { rerender } = render(<QueryVariableEditorUnConnected {...props} />);
+  const props: Props & Record<string, unknown> = { ...defaults, ...options };
+  const { rerender } = await act(() => render(<QueryVariableEditorUnConnected {...props} />));
 
   return { rerender, props };
 };
 
-const mockDS = mockDataSource({
-  name: 'CloudManager',
-  type: DataSourceType.Alertmanager,
-});
-
 jest.mock('@grafana/runtime/src/services/dataSourceSrv', () => {
   return {
     getDataSourceSrv: () => ({
-      get: () => Promise.resolve(mockDS),
+      get: async () => ds,
       getList: () => [mockDS],
       getInstanceSettings: () => mockDS,
     }),
@@ -56,8 +67,8 @@ const defaultIdentifier: KeyedVariableIdentifier = { type: 'query', rootStateKey
 
 describe('QueryVariableEditor', () => {
   describe('when the component is mounted', () => {
-    it('then it should call initQueryVariableEditor', () => {
-      const { props } = setupTestContext({});
+    it('then it should call initQueryVariableEditor', async () => {
+      const { props } = await setupTestContext({});
 
       expect(props.initQueryVariableEditor).toHaveBeenCalledTimes(1);
       expect(props.initQueryVariableEditor).toHaveBeenCalledWith(defaultIdentifier);
@@ -65,50 +76,29 @@ describe('QueryVariableEditor', () => {
   });
 
   describe('when the editor is rendered', () => {
-    const extendedCustom = {
-      extended: {
-        VariableQueryEditor: jest.fn().mockImplementation(LegacyVariableQueryEditor),
-        dataSource: {
-          variables: {
-            getType: () => VariableSupportType.Custom,
-            query: jest.fn(),
-            editor: jest.fn(),
-          },
-        } as unknown as DataSourceApi,
-      },
-    };
-    it('should pass down the query with default values if the datasource config defines it', () => {
-      const extended = { ...extendedCustom };
-      extended.extended.dataSource.variables!.getDefaultQuery = jest
-        .fn()
-        .mockImplementation(() => 'some default query');
-      const { props } = setupTestContext(extended);
-      expect(props.extended?.dataSource?.variables?.getDefaultQuery).toBeDefined();
-      expect(props.extended?.dataSource?.variables?.getDefaultQuery).toHaveBeenCalledTimes(1);
-      expect(props.extended?.VariableQueryEditor).toHaveBeenCalledWith(
-        expect.objectContaining({ query: 'some default query' }),
-        expect.anything()
-      );
+    beforeEach(() => {
+      jest.clearAllMocks();
     });
-    it('should not pass down a default query if the datasource config doesnt define it', () => {
-      extendedCustom.extended.dataSource.variables!.getDefaultQuery = undefined;
-      const { props } = setupTestContext(extendedCustom);
-      expect(props.extended?.dataSource?.variables?.getDefaultQuery).not.toBeDefined();
-      expect(props.extended?.VariableQueryEditor).toHaveBeenCalledWith(
-        expect.objectContaining({ query: '' }),
-        expect.anything()
-      );
+
+    it('should pass down the query with default values if the datasource config defines it', async () => {
+      ds.variables!.getDefaultQuery = jest.fn().mockImplementationOnce(() => 'some default query');
+
+      await setupTestContext({});
+      expect(ds.variables?.getDefaultQuery).toBeDefined();
+      expect(ds.variables?.getDefaultQuery).toHaveBeenCalledTimes(1);
+      expect(editor.mock.calls[0][0].query).toBe('some default query');
     });
   });
+
   describe('when the user changes', () => {
     it.each`
       fieldName  | propName                      | expectedArgs
-      ${'query'} | ${'changeQueryVariableQuery'} | ${[defaultIdentifier, 't', 't']}
+      ${'query'} | ${'changeQueryVariableQuery'} | ${[defaultIdentifier, 't', '']}
       ${'regex'} | ${'onPropChange'}             | ${[{ propName: 'regex', propValue: 't', updateOptions: true }]}
     `(
       '$fieldName field and tabs away then $propName should be called with correct args',
       async ({ fieldName, propName, expectedArgs }) => {
-        const { props } = setupTestContext({});
+        const { props } = await setupTestContext({});
         const propUnderTest = props[propName];
         const fieldAccessor = fieldAccessors[fieldName];
 
@@ -129,7 +119,7 @@ describe('QueryVariableEditor', () => {
     `(
       '$fieldName field but reverts the change and tabs away then $propName should not be called',
       async ({ fieldName, propName }) => {
-        const { props } = setupTestContext({});
+        const { props } = await setupTestContext({});
         const propUnderTest = props[propName];
         const fieldAccessor = fieldAccessors[fieldName];
 
@@ -144,7 +134,7 @@ describe('QueryVariableEditor', () => {
 });
 
 const getQueryField = () =>
-  screen.getByRole('textbox', { name: /variable editor form default variable query editor textarea/i });
+  screen.getByTestId(selectors.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsQueryInput);
 
 const getRegExField = () => screen.getByLabelText(/Regex/);
 
diff --git a/public/app/features/variables/query/QueryVariableEditor.tsx b/public/app/features/variables/query/QueryVariableEditor.tsx
index d3a3d6fe3501d..24ad37c2a6419 100644
--- a/public/app/features/variables/query/QueryVariableEditor.tsx
+++ b/public/app/features/variables/query/QueryVariableEditor.tsx
@@ -1,28 +1,19 @@
 import React, { FormEvent, PureComponent } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
-import { DataSourceInstanceSettings, getDataSourceRef, LoadingState, SelectableValue } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
-import { getTemplateSrv } from '@grafana/runtime';
-import { Field, Text, Box } from '@grafana/ui';
-import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker';
+import { DataSourceInstanceSettings, getDataSourceRef, SelectableValue } from '@grafana/data';
+import { QueryVariableEditorForm } from 'app/features/dashboard-scene/settings/variables/components/QueryVariableForm';
 
 import { StoreState } from '../../../types';
 import { getTimeSrv } from '../../dashboard/services/TimeSrv';
-import { SelectionOptionsEditor } from '../editor/SelectionOptionsEditor';
-import { VariableLegend } from '../editor/VariableLegend';
-import { VariableTextAreaField } from '../editor/VariableTextAreaField';
 import { initialVariableEditorState } from '../editor/reducer';
 import { getQueryVariableEditorState } from '../editor/selectors';
-import { OnPropChangeArguments, VariableEditorProps } from '../editor/types';
-import { isLegacyQueryEditor, isQueryEditor } from '../guard';
+import { VariableEditorProps } from '../editor/types';
 import { changeVariableMultiValue } from '../state/actions';
 import { getVariablesState } from '../state/selectors';
-import { QueryVariableModel, VariableRefresh, VariableSort, VariableWithMultiSupport } from '../types';
+import { QueryVariableModel, VariableRefresh, VariableSort } from '../types';
 import { toKeyedVariableIdentifier } from '../utils';
 
-import { QueryVariableRefreshSelect } from './QueryVariableRefreshSelect';
-import { QueryVariableSortSelect } from './QueryVariableSortSelect';
 import { changeQueryVariableDataSource, changeQueryVariableQuery, initQueryVariableEditor } from './actions';
 
 const mapStateToProps = (state: StoreState, ownProps: OwnProps) => {
@@ -105,10 +96,6 @@ export class QueryVariableEditorUnConnected extends PureComponent<Props, State>
     }
   };
 
-  onRegExChange = (event: FormEvent<HTMLTextAreaElement>) => {
-    this.setState({ regex: event.currentTarget.value });
-  };
-
   onRegExBlur = async (event: FormEvent<HTMLTextAreaElement>) => {
     const regex = event.currentTarget.value;
     if (this.props.variable.regex !== regex) {
@@ -124,125 +111,47 @@ export class QueryVariableEditorUnConnected extends PureComponent<Props, State>
     this.props.onPropChange({ propName: 'sort', propValue: option.value, updateOptions: true });
   };
 
-  onSelectionOptionsChange = async ({ propValue, propName }: OnPropChangeArguments<VariableWithMultiSupport>) => {
-    this.props.onPropChange({ propName, propValue, updateOptions: true });
+  onMultiChange = (event: FormEvent<HTMLInputElement>) => {
+    this.props.onPropChange({ propName: 'multi', propValue: event.currentTarget.checked });
   };
 
-  renderQueryEditor = () => {
-    const { extended, variable } = this.props;
+  onIncludeAllChange = (event: FormEvent<HTMLInputElement>) => {
+    this.props.onPropChange({ propName: 'includeAll', propValue: event.currentTarget.checked });
+  };
+
+  onAllValueChange = (event: FormEvent<HTMLInputElement>) => {
+    this.props.onPropChange({ propName: 'allValue', propValue: event.currentTarget.value });
+  };
 
+  render() {
+    const { extended, variable } = this.props;
     if (!extended || !extended.dataSource || !extended.VariableQueryEditor) {
       return null;
     }
 
-    const datasource = extended.dataSource;
-    const VariableQueryEditor = extended.VariableQueryEditor;
-
-    let query = variable.query;
-
-    if (typeof query === 'string') {
-      query = query || (datasource.variables?.getDefaultQuery?.() ?? '');
-    } else {
-      query = {
-        ...datasource.variables?.getDefaultQuery?.(),
-        ...variable.query,
-      };
-    }
-
-    if (isLegacyQueryEditor(VariableQueryEditor, datasource)) {
-      return (
-        <Box marginBottom={2}>
-          <Text element={'h4'}>Query</Text>
-          <Box marginTop={1}>
-            <VariableQueryEditor
-              key={datasource.uid}
-              datasource={datasource}
-              query={query}
-              templateSrv={getTemplateSrv()}
-              onChange={this.onLegacyQueryChange}
-            />
-          </Box>
-        </Box>
-      );
-    }
-
-    const range = getTimeSrv().timeRange();
-
-    if (isQueryEditor(VariableQueryEditor, datasource)) {
-      return (
-        <Box marginBottom={2}>
-          <Text element={'h4'}>Query</Text>
-          <Box marginTop={1}>
-            <VariableQueryEditor
-              key={datasource.uid}
-              datasource={datasource}
-              query={query}
-              onChange={this.onQueryChange}
-              onRunQuery={() => {}}
-              data={{ series: [], state: LoadingState.Done, timeRange: range }}
-              range={range}
-              onBlur={() => {}}
-              history={[]}
-            />
-          </Box>
-        </Box>
-      );
-    }
+    const timeRange = getTimeSrv().timeRange();
 
-    return null;
-  };
-
-  render() {
     return (
-      <>
-        <VariableLegend>Query options</VariableLegend>
-        <Field label="Data source" htmlFor="data-source-picker">
-          <DataSourcePicker
-            current={this.props.variable.datasource}
-            onChange={this.onDataSourceChange}
-            variables={true}
-            width={30}
-          />
-        </Field>
-
-        {this.renderQueryEditor()}
-
-        <VariableTextAreaField
-          value={this.state.regex ?? this.props.variable.regex}
-          name="Regex"
-          description={
-            <div>
-              Optional, if you want to extract part of a series name or metric node segment.
-              <br />
-              Named capture groups can be used to separate the display text and value (
-              <a
-                className="external-link"
-                href="https://grafana.com/docs/grafana/latest/variables/filter-variables-with-regex#filter-and-modify-using-named-text-and-value-capture-groups"
-                target="__blank"
-              >
-                see examples
-              </a>
-              ).
-            </div>
-          }
-          placeholder="/.*-(?<text>.*)-(?<value>.*)-.*/"
-          onChange={this.onRegExChange}
-          onBlur={this.onRegExBlur}
-          testId={selectors.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsRegExInputV2}
-          width={52}
-        />
-
-        <QueryVariableSortSelect onChange={this.onSortChange} sort={this.props.variable.sort} />
-
-        <QueryVariableRefreshSelect onChange={this.onRefreshChange} refresh={this.props.variable.refresh} />
-
-        <VariableLegend>Selection options</VariableLegend>
-        <SelectionOptionsEditor
-          variable={this.props.variable}
-          onPropChange={this.onSelectionOptionsChange}
-          onMultiChanged={this.props.changeVariableMultiValue}
-        />
-      </>
+      <QueryVariableEditorForm
+        datasource={variable.datasource ?? undefined}
+        onDataSourceChange={this.onDataSourceChange}
+        query={variable.query}
+        onQueryChange={this.onQueryChange}
+        onLegacyQueryChange={this.onLegacyQueryChange}
+        timeRange={timeRange}
+        regex={variable.regex}
+        onRegExChange={this.onRegExBlur}
+        sort={variable.sort}
+        onSortChange={this.onSortChange}
+        refresh={variable.refresh}
+        onRefreshChange={this.onRefreshChange}
+        isMulti={variable.multi}
+        includeAll={variable.includeAll}
+        allValue={variable.allValue ?? ''}
+        onMultiChange={this.onMultiChange}
+        onIncludeAllChange={this.onIncludeAllChange}
+        onAllValueChange={this.onAllValueChange}
+      />
     );
   }
 }
diff --git a/public/app/features/variables/query/QueryVariableRefreshSelect.tsx b/public/app/features/variables/query/QueryVariableRefreshSelect.tsx
index 36c5500959df8..88475bcc75e84 100644
--- a/public/app/features/variables/query/QueryVariableRefreshSelect.tsx
+++ b/public/app/features/variables/query/QueryVariableRefreshSelect.tsx
@@ -7,6 +7,7 @@ import { useMediaQueryChange } from 'app/core/hooks/useMediaQueryChange';
 interface Props {
   onChange: (option: VariableRefresh) => void;
   refresh: VariableRefresh;
+  testId?: string;
 }
 
 const REFRESH_OPTIONS = [
@@ -14,7 +15,7 @@ const REFRESH_OPTIONS = [
   { label: 'On time range change', value: VariableRefresh.onTimeRangeChanged },
 ];
 
-export function QueryVariableRefreshSelect({ onChange, refresh }: PropsWithChildren<Props>) {
+export function QueryVariableRefreshSelect({ onChange, refresh, testId }: PropsWithChildren<Props>) {
   const theme = useTheme2();
 
   const [isSmallScreen, setIsSmallScreen] = useState(false);
@@ -31,7 +32,7 @@ export function QueryVariableRefreshSelect({ onChange, refresh }: PropsWithChild
   );
 
   return (
-    <Field label="Refresh" description="When to update the values of this variable">
+    <Field label="Refresh" description="When to update the values of this variable" data-testid={testId}>
       <RadioButtonGroup
         options={REFRESH_OPTIONS}
         onChange={onChange}
diff --git a/public/app/features/variables/query/QueryVariableSortSelect.tsx b/public/app/features/variables/query/QueryVariableSortSelect.tsx
index 33e8f116770f3..e28cbb320b87c 100644
--- a/public/app/features/variables/query/QueryVariableSortSelect.tsx
+++ b/public/app/features/variables/query/QueryVariableSortSelect.tsx
@@ -1,14 +1,14 @@
 import React, { PropsWithChildren, useMemo } from 'react';
 
 import { SelectableValue } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
 
-import { VariableSelectField } from '../editor/VariableSelectField';
+import { VariableSelectField } from '../../dashboard-scene/settings/variables/components/VariableSelectField';
 import { VariableSort } from '../types';
 
 interface Props {
   onChange: (option: SelectableValue<VariableSort>) => void;
   sort: VariableSort;
+  testId?: string;
 }
 
 const SORT_OPTIONS = [
@@ -19,9 +19,11 @@ const SORT_OPTIONS = [
   { label: 'Numerical (desc)', value: VariableSort.numericalDesc },
   { label: 'Alphabetical (case-insensitive, asc)', value: VariableSort.alphabeticalCaseInsensitiveAsc },
   { label: 'Alphabetical (case-insensitive, desc)', value: VariableSort.alphabeticalCaseInsensitiveDesc },
+  { label: 'Natural (asc)', value: VariableSort.naturalAsc },
+  { label: 'Natural (desc)', value: VariableSort.naturalDesc },
 ];
 
-export function QueryVariableSortSelect({ onChange, sort }: PropsWithChildren<Props>) {
+export function QueryVariableSortSelect({ onChange, sort, testId }: PropsWithChildren<Props>) {
   const value = useMemo(() => SORT_OPTIONS.find((o) => o.value === sort) ?? SORT_OPTIONS[0], [sort]);
 
   return (
@@ -31,7 +33,7 @@ export function QueryVariableSortSelect({ onChange, sort }: PropsWithChildren<Pr
       value={value}
       options={SORT_OPTIONS}
       onChange={onChange}
-      testId={selectors.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsSortSelectV2}
+      testId={testId}
       width={25}
     />
   );
diff --git a/public/app/features/variables/query/VariableQueryRunner.ts b/public/app/features/variables/query/VariableQueryRunner.ts
index 0c44da90e83d8..2e19f68c0b590 100644
--- a/public/app/features/variables/query/VariableQueryRunner.ts
+++ b/public/app/features/variables/query/VariableQueryRunner.ts
@@ -7,7 +7,6 @@ import {
   DataQuery,
   DataQueryRequest,
   DataSourceApi,
-  getDefaultTimeRange,
   LoadingState,
   PanelData,
   ScopedVars,
@@ -19,7 +18,7 @@ import { getTimeSrv } from '../../dashboard/services/TimeSrv';
 import { runRequest } from '../../query/state/runRequest';
 import { getLastKey, getVariable } from '../state/selectors';
 import { KeyedVariableIdentifier } from '../state/types';
-import { QueryVariableModel, VariableRefresh } from '../types';
+import { QueryVariableModel } from '../types';
 import { getTemplatedRegex } from '../utils';
 
 import { toMetricFindValuesOperator, updateOptionsState, validateVariableSelection } from './operators';
@@ -175,10 +174,7 @@ export class VariableQueryRunner {
     const searchFilterScope = { searchFilter: { text: searchFilter, value: searchFilter } };
     const searchFilterAsVars = searchFilter ? searchFilterScope : {};
     const scopedVars = { ...searchFilterAsVars, ...variableAsVars } as ScopedVars;
-    const range =
-      variable.refresh === VariableRefresh.onTimeRangeChanged
-        ? this.dependencies.getTimeSrv().timeRange()
-        : getDefaultTimeRange();
+    const range = this.dependencies.getTimeSrv().timeRange();
 
     const request: DataQueryRequest = {
       app: CoreApp.Dashboard,
diff --git a/public/app/features/variables/query/actions.test.tsx b/public/app/features/variables/query/actions.test.tsx
index fffed16f9071e..fa70a480a696c 100644
--- a/public/app/features/variables/query/actions.test.tsx
+++ b/public/app/features/variables/query/actions.test.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
-import { DataSourceRef, getDefaultTimeRange, LoadingState } from '@grafana/data';
-import { setDataSourceSrv } from '@grafana/runtime';
+import { DataSourceApi, DataSourceRef, getDefaultTimeRange, LoadingState } from '@grafana/data';
+import { DataSourceSrv, setDataSourceSrv } from '@grafana/runtime';
 
 import { reduxTester } from '../../../../test/core/redux/reduxTester';
 import { silenceConsoleOutput } from '../../../../test/core/utils/silenceConsoleOutput';
@@ -60,7 +60,7 @@ const mocks: Record<string, any> = {
   },
 };
 
-setDataSourceSrv(mocks.dataSourceSrv as any);
+setDataSourceSrv(mocks.dataSourceSrv as DataSourceSrv);
 
 jest.mock('../../plugins/plugin_loader', () => ({
   importDataSourcePlugin: () => mocks.pluginLoader.importDataSourcePlugin(),
@@ -353,7 +353,7 @@ describe('query actions', () => {
       it('then correct actions are dispatched', async () => {
         const variable = createVariable({ datasource: { uid: 'other' } });
         const editor = mocks.VariableQueryEditor;
-        const previousDataSource: any = { type: 'previous' };
+        const previousDataSource = { type: 'previous' } as DataSourceApi;
         const templatingState = {
           editor: {
             ...initialVariableEditorState,
@@ -843,8 +843,8 @@ describe('query actions', () => {
   });
 });
 
-function mockDatasourceMetrics(variable: QueryVariableModel, optionsMetrics: any[]) {
-  const metrics: Record<string, any[]> = {
+function mockDatasourceMetrics(variable: QueryVariableModel, optionsMetrics: unknown[]) {
+  const metrics: Record<string, unknown[]> = {
     [variable.query]: optionsMetrics,
   };
 
diff --git a/public/app/features/variables/query/queryRunners.test.ts b/public/app/features/variables/query/queryRunners.test.ts
index ffbaa9cc019ef..7a921f01f67be 100644
--- a/public/app/features/variables/query/queryRunners.test.ts
+++ b/public/app/features/variables/query/queryRunners.test.ts
@@ -1,24 +1,38 @@
 import { of } from 'rxjs';
 
-import { getDefaultTimeRange, VariableSupportType } from '@grafana/data';
+import {
+  DataQueryRequest,
+  DataSourceApi,
+  getDefaultTimeRange,
+  QueryVariableModel,
+  VariableSupportType,
+} from '@grafana/data';
 
 import { VariableRefresh } from '../types';
 
-import { QueryRunners, variableDummyRefId } from './queryRunners';
+import { QueryRunners, RunnerArgs, variableDummyRefId } from './queryRunners';
 
 describe('QueryRunners', () => {
   describe('when using a legacy data source', () => {
-    const getLegacyTestContext = (variable?: any) => {
+    const getLegacyTestContext = (variable?: QueryVariableModel) => {
       const defaultTimeRange = getDefaultTimeRange();
-      variable = variable ?? { query: 'A query' };
+      variable = variable ?? ({ query: 'A query' } as QueryVariableModel);
       const timeSrv = {
         timeRange: jest.fn().mockReturnValue(defaultTimeRange),
       };
-      const datasource: any = { metricFindQuery: jest.fn().mockResolvedValue([{ text: 'A', value: 'A' }]) };
+      const datasource = {
+        metricFindQuery: jest.fn().mockResolvedValue([{ text: 'A', value: 'A' }]),
+      } as unknown as DataSourceApi;
       const runner = new QueryRunners().getRunnerForDatasource(datasource);
       const runRequest = jest.fn().mockReturnValue(of({}));
-      const runnerArgs: any = { datasource, variable, searchFilter: 'A searchFilter', timeSrv, runRequest };
-      const request: any = {};
+      const runnerArgs = {
+        datasource,
+        variable,
+        searchFilter: 'A searchFilter',
+        timeSrv,
+        runRequest,
+      } as unknown as RunnerArgs;
+      const request = {} as DataQueryRequest;
 
       return { timeSrv, datasource, runner, variable, runnerArgs, request, defaultTimeRange };
     };
@@ -42,7 +56,7 @@ describe('QueryRunners', () => {
       const { datasource, runner, runnerArgs, request, timeSrv, defaultTimeRange } = getLegacyTestContext({
         query: 'A query',
         refresh: VariableRefresh.onTimeRangeChanged,
-      });
+      } as QueryVariableModel);
       const observable = runner.runRequest(runnerArgs, request);
 
       it('then it should return correct observable', async () => {
@@ -77,7 +91,7 @@ describe('QueryRunners', () => {
       const { datasource, runner, runnerArgs, request, timeSrv, defaultTimeRange } = getLegacyTestContext({
         query: 'A query',
         refresh: VariableRefresh.onDashboardLoad,
-      });
+      } as QueryVariableModel);
       const observable = runner.runRequest(runnerArgs, request);
 
       it('then it should return correct observable', async () => {
@@ -112,7 +126,7 @@ describe('QueryRunners', () => {
       const { datasource, runner, runnerArgs, request, timeSrv } = getLegacyTestContext({
         query: 'A query',
         refresh: VariableRefresh.never,
-      });
+      } as QueryVariableModel);
       const observable = runner.runRequest(runnerArgs, request);
 
       it('then it should return correct observable', async () => {
@@ -145,19 +159,27 @@ describe('QueryRunners', () => {
   });
 
   describe('when using a data source with standard variable support', () => {
-    const getStandardTestContext = (datasource?: any) => {
-      const variable: any = { query: { refId: 'A', query: 'A query' } };
+    const getStandardTestContext = (datasource?: DataSourceApi) => {
+      const variable = { query: { refId: 'A', query: 'A query' } } as QueryVariableModel;
       const timeSrv = {};
-      datasource = datasource ?? {
-        variables: {
-          getType: () => VariableSupportType.Standard,
-          toDataQuery: (query: any) => ({ ...query, extra: 'extra' }),
-        },
-      };
+      datasource =
+        datasource ??
+        ({
+          variables: {
+            getType: () => VariableSupportType.Standard,
+            toDataQuery: (query: any) => ({ ...query, extra: 'extra' }),
+          },
+        } as DataSourceApi);
       const runner = new QueryRunners().getRunnerForDatasource(datasource);
       const runRequest = jest.fn().mockReturnValue(of({}));
-      const runnerArgs: any = { datasource, variable, searchFilter: 'A searchFilter', timeSrv, runRequest };
-      const request: any = {};
+      const runnerArgs = {
+        datasource,
+        variable,
+        searchFilter: 'A searchFilter',
+        timeSrv,
+        runRequest,
+      } as unknown as RunnerArgs;
+      const request = {} as DataQueryRequest;
 
       return { timeSrv, datasource, runner, variable, runnerArgs, request, runRequest };
     };
@@ -184,7 +206,7 @@ describe('QueryRunners', () => {
           toDataQuery: () => undefined,
           query: () => undefined,
         },
-      });
+      } as unknown as DataSourceApi);
       const observable = runner.runRequest(runnerArgs, request);
 
       it('then it should return correct observable', async () => {
@@ -203,7 +225,7 @@ describe('QueryRunners', () => {
     describe('and calling runRequest with a datasource that has no custom query', () => {
       const { runner, request, runnerArgs, runRequest, datasource } = getStandardTestContext({
         variables: { getType: () => VariableSupportType.Standard, toDataQuery: () => undefined },
-      });
+      } as unknown as DataSourceApi);
       const observable = runner.runRequest(runnerArgs, request);
 
       it('then it should return correct observable', async () => {
@@ -222,15 +244,21 @@ describe('QueryRunners', () => {
 
   describe('when using a data source with custom variable support', () => {
     const getCustomTestContext = () => {
-      const variable: any = { query: { refId: 'A', query: 'A query' } };
+      const variable = { query: { refId: 'A', query: 'A query' } } as QueryVariableModel;
       const timeSrv = {};
-      const datasource: any = {
+      const datasource = {
         variables: { getType: () => VariableSupportType.Custom, query: () => undefined, editor: {} },
-      };
+      } as unknown as DataSourceApi;
       const runner = new QueryRunners().getRunnerForDatasource(datasource);
       const runRequest = jest.fn().mockReturnValue(of({}));
-      const runnerArgs: any = { datasource, variable, searchFilter: 'A searchFilter', timeSrv, runRequest };
-      const request: any = {};
+      const runnerArgs = {
+        datasource,
+        variable,
+        searchFilter: 'A searchFilter',
+        timeSrv,
+        runRequest,
+      } as unknown as RunnerArgs;
+      const request = {} as DataQueryRequest;
 
       return { timeSrv, datasource, runner, variable, runnerArgs, request, runRequest };
     };
@@ -270,15 +298,21 @@ describe('QueryRunners', () => {
 
   describe('when using a data source with datasource variable support', () => {
     const getDatasourceTestContext = () => {
-      const variable: any = { query: { refId: 'A', query: 'A query' } };
+      const variable = { query: { refId: 'A', query: 'A query' } } as QueryVariableModel;
       const timeSrv = {};
-      const datasource: any = {
+      const datasource = {
         variables: { getType: () => VariableSupportType.Datasource },
-      };
+      } as unknown as DataSourceApi;
       const runner = new QueryRunners().getRunnerForDatasource(datasource);
       const runRequest = jest.fn().mockReturnValue(of({}));
-      const runnerArgs: any = { datasource, variable, searchFilter: 'A searchFilter', timeSrv, runRequest };
-      const request: any = {};
+      const runnerArgs = {
+        datasource,
+        variable,
+        searchFilter: 'A searchFilter',
+        timeSrv,
+        runRequest,
+      } as unknown as RunnerArgs;
+      const request = {} as DataQueryRequest;
 
       return { timeSrv, datasource, runner, variable, runnerArgs, request, runRequest };
     };
@@ -328,9 +362,9 @@ describe('QueryRunners', () => {
   describe('when using a data source with unknown variable support', () => {
     describe('and calling getRunnerForDatasource', () => {
       it('then it should throw', () => {
-        const datasource: any = {
+        const datasource = {
           variables: {},
-        };
+        } as unknown as DataSourceApi;
 
         expect(() => new QueryRunners().getRunnerForDatasource(datasource)).toThrow();
       });
diff --git a/public/app/features/variables/query/reducer.test.ts b/public/app/features/variables/query/reducer.test.ts
index 89643ff82da19..e0f273484bdc7 100644
--- a/public/app/features/variables/query/reducer.test.ts
+++ b/public/app/features/variables/query/reducer.test.ts
@@ -277,6 +277,8 @@ describe('sortVariableValues', () => {
       ${[{ text: '1' }, { text: null }, { text: '2' }]} | ${VariableSort.numericalDesc}                   | ${[{ text: '2' }, { text: '1' }, { text: null }]}
       ${[{ text: 'a' }, { text: null }, { text: 'b' }]} | ${VariableSort.alphabeticalCaseInsensitiveAsc}  | ${[{ text: null }, { text: 'a' }, { text: 'b' }]}
       ${[{ text: 'a' }, { text: null }, { text: 'b' }]} | ${VariableSort.alphabeticalCaseInsensitiveDesc} | ${[{ text: 'b' }, { text: 'a' }, { text: null }]}
+      ${[{ text: '1' }, { text: null }, { text: '2' }]} | ${VariableSort.naturalAsc}                      | ${[{ text: null }, { text: '1' }, { text: '2' }]}
+      ${[{ text: '1' }, { text: null }, { text: '2' }]} | ${VariableSort.naturalDesc}                     | ${[{ text: '2' }, { text: '1' }, { text: null }]}
     `(
       'then it should sort the options correctly without throwing (sortOrder:$sortOrder)',
       ({ options, sortOrder, expected }) => {
@@ -286,6 +288,19 @@ describe('sortVariableValues', () => {
       }
     );
   });
+
+  describe('when using natural sort', () => {
+    it.each`
+      options                                                                         | sortOrder                  | expected
+      ${[{ text: '12-lax01' }, { text: '4-sjc01' }, { text: '21-lhr01' }]}            | ${VariableSort.naturalAsc} | ${[{ text: '4-sjc01' }, { text: '12-lax01' }, { text: '21-lhr01' }]}
+      ${[{ text: 'lax01' }, { text: 'sjc01' }, { text: 'sjc02' }, { text: 'lhr01' }]} | ${VariableSort.naturalAsc} | ${[{ text: 'lax01' }, { text: 'lhr01' }, { text: 'sjc01' }, { text: 'sjc02' }]}
+      ${[{ text: '4m10' }, { text: '4m2' }, { text: '4m1' }, { text: '4m4' }]}        | ${VariableSort.naturalAsc} | ${[{ text: '4m1' }, { text: '4m2' }, { text: '4m4' }, { text: '4m10' }]}
+    `('then it should sort like humans would naturally sort', ({ options, sortOrder, expected }) => {
+      const result = sortVariableValues(options, sortOrder);
+
+      expect(result).toEqual(expected);
+    });
+  });
 });
 
 describe('metricNamesToVariableValues', () => {
diff --git a/public/app/features/variables/query/reducer.ts b/public/app/features/variables/query/reducer.ts
index fb4c4fe03743d..a5c623c669996 100644
--- a/public/app/features/variables/query/reducer.ts
+++ b/public/app/features/variables/query/reducer.ts
@@ -25,7 +25,7 @@ export const initialQueryVariableModelState: QueryVariableModel = {
   includeAll: false,
   allValue: null,
   options: [],
-  current: {} as VariableOption,
+  current: {},
   definition: '',
 };
 
@@ -56,6 +56,18 @@ export const sortVariableValues = (options: any[], sortOrder: VariableSort) => {
     options = sortBy(options, (opt) => {
       return toLower(opt.text);
     });
+  } else if (sortType === 4) {
+    options.sort((a, b) => {
+      if (!a.text) {
+        return -1;
+      }
+
+      if (!b.text) {
+        return 1;
+      }
+
+      return a.text.localeCompare(b.text, undefined, { numeric: true });
+    });
   }
 
   if (reverseSort) {
diff --git a/public/app/features/variables/shared/formatVariable.ts b/public/app/features/variables/shared/formatVariable.ts
index 34d798c68fae2..680be374a1ec0 100644
--- a/public/app/features/variables/shared/formatVariable.ts
+++ b/public/app/features/variables/shared/formatVariable.ts
@@ -1,8 +1,6 @@
-import { VariableModel } from '@grafana/data';
+import { TypedVariableModel, VariableWithOptions } from '@grafana/data';
 
-import { VariableWithOptions } from '../types';
-
-export const formatVariableLabel = (variable: VariableModel) => {
+export const formatVariableLabel = (variable: VariableWithOptions | TypedVariableModel) => {
   if (!isVariableWithOptions(variable)) {
     return variable.name;
   }
@@ -16,7 +14,7 @@ export const formatVariableLabel = (variable: VariableModel) => {
   return current.text;
 };
 
-const isVariableWithOptions = (variable: VariableModel): variable is VariableWithOptions => {
+const isVariableWithOptions = (variable: unknown): variable is VariableWithOptions => {
   return (
     Array.isArray((variable as VariableWithOptions)?.options) ||
     typeof (variable as VariableWithOptions)?.current === 'object'
diff --git a/public/app/features/variables/shared/testing/datasourceVariableBuilder.ts b/public/app/features/variables/shared/testing/datasourceVariableBuilder.ts
index 8f52026e81e81..ad370b7eed56d 100644
--- a/public/app/features/variables/shared/testing/datasourceVariableBuilder.ts
+++ b/public/app/features/variables/shared/testing/datasourceVariableBuilder.ts
@@ -10,7 +10,7 @@ export class DatasourceVariableBuilder<
     return this;
   }
 
-  withRegEx(regex: any) {
+  withRegEx(regex: string) {
     this.variable.regex = regex;
     return this;
   }
diff --git a/public/app/features/variables/shared/testing/optionsVariableBuilder.ts b/public/app/features/variables/shared/testing/optionsVariableBuilder.ts
index 97bed58572a00..fcb33006b8855 100644
--- a/public/app/features/variables/shared/testing/optionsVariableBuilder.ts
+++ b/public/app/features/variables/shared/testing/optionsVariableBuilder.ts
@@ -35,7 +35,7 @@ export class OptionsVariableBuilder<T extends VariableWithOptions> extends Varia
     return this;
   }
 
-  withQuery(query: any) {
+  withQuery(query: string) {
     this.variable.query = query;
     return this;
   }
diff --git a/public/app/features/variables/state/__tests__/fixtures.ts b/public/app/features/variables/state/__tests__/fixtures.ts
index 8f7ae7cc9f2e4..d30052bc8864e 100644
--- a/public/app/features/variables/state/__tests__/fixtures.ts
+++ b/public/app/features/variables/state/__tests__/fixtures.ts
@@ -5,6 +5,7 @@ import {
   CustomVariableModel,
   DashboardVariableModel,
   DataSourceVariableModel,
+  GroupByVariableModel,
   IntervalVariableModel,
   LoadingState,
   OrgVariableModel,
@@ -78,6 +79,21 @@ export function createAdhocVariable(input?: Partial<AdHocVariableModel>): AdHocV
   };
 }
 
+export function createGroupByVariable(input?: Partial<GroupByVariableModel>): GroupByVariableModel {
+  return {
+    ...createBaseVariableModel('groupby'),
+    query: '',
+    datasource: {
+      uid: 'abc-123',
+      type: 'prometheus',
+    },
+    multi: true,
+    current: createVariableOption('job'),
+    options: [createVariableOption('job'), createVariableOption('instance')],
+    ...input,
+  };
+}
+
 export function createConstantVariable(input: Partial<ConstantVariableModel> = {}): ConstantVariableModel {
   return {
     ...createBaseVariableModel('constant'),
diff --git a/public/app/features/variables/state/actions.test.ts b/public/app/features/variables/state/actions.test.ts
index d2c8c3445cd50..14f86972547a6 100644
--- a/public/app/features/variables/state/actions.test.ts
+++ b/public/app/features/variables/state/actions.test.ts
@@ -231,7 +231,7 @@ describe('shared actions', () => {
           toKeyedAction(
             key,
             createCustomOptionsFromQuery(
-              toVariablePayload({ ...custom, id: dispatchedActions[4].payload.action.payload.id })
+              toVariablePayload({ ...custom, id: dispatchedActions[4].payload.action.payload.id }, '')
             )
           )
         );
@@ -305,7 +305,7 @@ describe('shared actions', () => {
           key,
           setCurrentVariableValue(
             toVariablePayload(stats, {
-              option: { text: ALL_VARIABLE_TEXT, value: ALL_VARIABLE_VALUE, selected: false },
+              option: { text: [ALL_VARIABLE_TEXT], value: [ALL_VARIABLE_VALUE], selected: true },
             })
           )
         ),
@@ -473,8 +473,8 @@ describe('shared actions', () => {
         ${['A', 'B', 'C']} | ${['B']}      | ${'C'}       | ${['B']}      | ${true}
         ${['A', 'B', 'C']} | ${['B', 'C']} | ${undefined} | ${['B', 'C']} | ${true}
         ${['A', 'B', 'C']} | ${['B', 'C']} | ${'C'}       | ${['B', 'C']} | ${true}
-        ${['A', 'B', 'C']} | ${['X']}      | ${undefined} | ${'A'}        | ${false}
-        ${['A', 'B', 'C']} | ${['X']}      | ${'C'}       | ${'A'}        | ${false}
+        ${['A', 'B', 'C']} | ${['X']}      | ${undefined} | ${['A']}      | ${true}
+        ${['A', 'B', 'C']} | ${['X']}      | ${'C'}       | ${['A']}      | ${true}
       `(
         'then correct actions are dispatched',
         async ({ withOptions, withCurrent, defaultValue, expectedText, expectedSelected }) => {
diff --git a/public/app/features/variables/state/actions.ts b/public/app/features/variables/state/actions.ts
index 9e4f3d4b812e4..e7ea07df89e53 100644
--- a/public/app/features/variables/state/actions.ts
+++ b/public/app/features/variables/state/actions.ts
@@ -5,11 +5,20 @@ import {
   getDataSourceRef,
   isDataSourceRef,
   isEmptyObject,
+  isObject,
   LoadingState,
   TimeRange,
   TypedVariableModel,
   UrlQueryMap,
   UrlQueryValue,
+  OrgVariableModel,
+  QueryVariableModel,
+  DashboardVariableModel,
+  UserVariableModel,
+  VariableHide,
+  VariableOption,
+  VariableRefresh,
+  VariableWithOptions,
 } from '@grafana/data';
 import { config, locationService } from '@grafana/runtime';
 import { notifyApp } from 'app/core/actions';
@@ -28,35 +37,17 @@ import { getTemplateSrv, TemplateSrv } from '../../templating/template_srv';
 import { variableAdapters } from '../adapters';
 import { ALL_VARIABLE_TEXT, ALL_VARIABLE_VALUE, VARIABLE_PREFIX } from '../constants';
 import { cleanEditorState } from '../editor/reducer';
-import {
-  hasCurrent,
-  hasLegacyVariableSupport,
-  hasOptions,
-  hasStandardVariableSupport,
-  isAdHoc,
-  isConstant,
-  isMulti,
-  isQuery,
-} from '../guard';
+import { hasCurrent, hasLegacyVariableSupport, hasOptions, hasStandardVariableSupport, isMulti } from '../guard';
 import { getAllAffectedPanelIdsForVariableChange, getPanelVars } from '../inspect/utils';
 import { cleanPickerState } from '../pickers/OptionsPicker/reducer';
 import { alignCurrentWithMulti } from '../shared/multiOptions';
 import {
-  DashboardVariableModel,
   initialVariableModelState,
-  OrgVariableModel,
-  QueryVariableModel,
   TransactionStatus,
-  UserVariableModel,
-  VariableHide,
-  VariableModel,
-  VariableOption,
-  VariableRefresh,
   VariablesChanged,
   VariablesChangedEvent,
   VariablesChangedInUrl,
   VariablesTimeRangeProcessDone,
-  VariableWithOptions,
 } from '../types';
 import {
   ensureStringValues,
@@ -145,7 +136,7 @@ export const initDashboardTemplating = (key: string, dashboard: DashboardModel):
   };
 };
 
-export function fixSelectedInconsistency(model: VariableModel): VariableModel | VariableWithOptions {
+export function fixSelectedInconsistency(model: TypedVariableModel): TypedVariableModel | VariableWithOptions {
   if (!hasOptions(model)) {
     return model;
   }
@@ -275,7 +266,7 @@ export const changeVariableMultiValue = (identifier: KeyedVariableIdentifier, mu
   };
 };
 
-export const processVariableDependencies = async (variable: VariableModel, state: StoreState) => {
+export const processVariableDependencies = async (variable: TypedVariableModel, state: StoreState) => {
   if (!variable.rootStateKey) {
     throw new Error(`rootStateKey not found for variable with id:${variable.id}`);
   }
@@ -305,7 +296,7 @@ export const processVariableDependencies = async (variable: VariableModel, state
 };
 
 const isDependencyGraphCircular = (
-  variable: VariableModel,
+  variable: TypedVariableModel,
   state: StoreState,
   encounteredDependencyIds: Set<string> = new Set()
 ): boolean => {
@@ -320,12 +311,12 @@ const isDependencyGraphCircular = (
   });
 };
 
-const getDirectDependencies = (variable: VariableModel, state: StoreState) => {
+const getDirectDependencies = (variable: TypedVariableModel, state: StoreState) => {
   if (!variable.rootStateKey) {
     return [];
   }
 
-  const directDependencies: VariableModel[] = [];
+  const directDependencies: TypedVariableModel[] = [];
 
   for (const otherVariable of getVariablesByKey(variable.rootStateKey, state)) {
     if (variable === otherVariable) {
@@ -342,7 +333,7 @@ const getDirectDependencies = (variable: VariableModel, state: StoreState) => {
   return directDependencies;
 };
 
-const isWaitingForDependencies = (key: string, dependencies: VariableModel[], state: StoreState): boolean => {
+const isWaitingForDependencies = (key: string, dependencies: TypedVariableModel[], state: StoreState): boolean => {
   if (dependencies.length === 0) {
     return false;
   }
@@ -395,8 +386,7 @@ export const processVariables = (key: string): ThunkResult<Promise<void>> => {
   return async (dispatch, getState) => {
     const queryParams = locationService.getSearchObject();
     const promises = getVariablesByKey(key, getState()).map(
-      async (variable: VariableModel) =>
-        await dispatch(processVariable(toKeyedVariableIdentifier(variable), queryParams))
+      async (variable) => await dispatch(processVariable(toKeyedVariableIdentifier(variable), queryParams))
     );
 
     await Promise.all(promises);
@@ -516,7 +506,11 @@ export const validateVariableSelectionState = (
       // if none pick first
       if (selected.length === 0) {
         const option = variableInState.options[0];
-        return setValue(variableInState, option);
+        return setValue(variableInState, {
+          value: typeof option.value === 'string' ? [option.value] : option.value,
+          text: typeof option.text === 'string' ? [option.text] : option.text,
+          selected: true,
+        });
       }
 
       const option: VariableOption = {
@@ -571,7 +565,7 @@ export const setOptionAsCurrent = (
   };
 };
 
-export const createGraph = (variables: VariableModel[]) => {
+export const createGraph = (variables: TypedVariableModel[]) => {
   const g = new Graph();
 
   variables.forEach((v) => {
@@ -618,15 +612,17 @@ export const variableUpdated = (
     const panels = state.dashboard?.getModel()?.panels ?? [];
     const panelVars = getPanelVars(panels);
 
-    const event: VariablesChangedEvent = isAdHoc(variableInState)
-      ? { refreshAll: true, panelIds: [] } // for adhoc variables we don't know which panels that will be impacted
-      : {
-          refreshAll: false,
-          panelIds: Array.from(getAllAffectedPanelIdsForVariableChange([variableInState.id], g, panelVars)),
-        };
+    const event: VariablesChangedEvent =
+      variableInState.type === 'adhoc'
+        ? { refreshAll: true, panelIds: [] } // for adhoc variables we don't know which panels that will be impacted
+        : {
+            refreshAll: false,
+            panelIds: Array.from(getAllAffectedPanelIdsForVariableChange([variableInState.id], g, panelVars)),
+            variable: getVariable(identifier, state),
+          };
 
     const node = g.getNode(variableInState.name);
-    let promises: Array<Promise<any>> = [];
+    let promises: Array<Promise<void>> = [];
     if (node) {
       promises = node.getOptimizedInputEdges().map((e) => {
         const variable = variables.find((v) => v.name === e.inputNode?.name);
@@ -652,7 +648,12 @@ export interface OnTimeRangeUpdatedDependencies {
   events: typeof appEvents;
 }
 
-const dfs = (node: Node, visited: string[], variables: VariableModel[], variablesRefreshTimeRange: VariableModel[]) => {
+const dfs = (
+  node: Node,
+  visited: string[],
+  variables: TypedVariableModel[],
+  variablesRefreshTimeRange: TypedVariableModel[]
+) => {
   if (!visited.includes(node.name)) {
     visited.push(node.name);
   }
@@ -762,8 +763,8 @@ const getVariablesThatNeedRefreshOld = (key: string, state: StoreState): Variabl
   const allVariables = getVariablesByKey(key, state);
 
   const variablesThatNeedRefresh = allVariables.filter((variable) => {
-    if (variable.hasOwnProperty('refresh') && variable.hasOwnProperty('options')) {
-      const variableWithRefresh = variable as unknown as QueryVariableModel;
+    if ('refresh' in variable && 'options' in variable) {
+      const variableWithRefresh = variable;
       return variableWithRefresh.refresh === VariableRefresh.onTimeRangeChanged;
     }
     return false;
@@ -832,7 +833,7 @@ export const timeRangeUpdated =
 export const templateVarsChangedInUrl =
   (key: string, vars: ExtendedUrlQueryMap, events: typeof appEvents = appEvents): ThunkResult<void> =>
   async (dispatch, getState) => {
-    const update: Array<Promise<any>> = [];
+    const update: Array<Promise<void>> = [];
     const dashboard = getState().dashboard.getModel();
     const variables = getVariablesByKey(key, getState());
 
@@ -857,7 +858,7 @@ export const templateVarsChangedInUrl =
           value = variableInModel.current.value; // revert value to the value stored in dashboard json
         }
 
-        if (variableInModel && isConstant(variableInModel)) {
+        if (variableInModel && variableInModel.type === 'constant') {
           value = variableInModel.query; // revert value to the value stored in dashboard json, constants don't store current values in dashboard json
         }
       }
@@ -868,7 +869,9 @@ export const templateVarsChangedInUrl =
 
     const filteredVars = variables.filter((v) => {
       const key = VARIABLE_PREFIX + v.name;
-      return vars.hasOwnProperty(key) && isVariableUrlValueDifferentFromCurrent(v, vars[key].value) && !isAdHoc(v);
+      return (
+        vars.hasOwnProperty(key) && isVariableUrlValueDifferentFromCurrent(v, vars[key].value) && v.type !== 'adhoc'
+      );
     });
     const varGraph = createGraph(variables);
     const panelVars = getPanelVars(dashboard?.panels ?? []);
@@ -890,7 +893,7 @@ export const templateVarsChangedInUrl =
     }
   };
 
-export function isVariableUrlValueDifferentFromCurrent(variable: VariableModel, urlValue: any): boolean {
+export function isVariableUrlValueDifferentFromCurrent(variable: TypedVariableModel, urlValue: unknown): boolean {
   const variableValue = variableAdapters.get(variable.type).getValueForUrl(variable);
   let stringUrlValue = ensureStringValues(urlValue);
   if (Array.isArray(variableValue) && !Array.isArray(stringUrlValue)) {
@@ -962,7 +965,7 @@ export function migrateVariablesDatasourceNameToRef(
   return (dispatch, getState) => {
     const variables = getVariablesByKey(key, getState());
     for (const variable of variables) {
-      if (!isAdHoc(variable) && !isQuery(variable)) {
+      if (variable.type !== 'adhoc' && variable.type !== 'query') {
         continue;
       }
 
@@ -1034,12 +1037,12 @@ export const updateOptions =
 
 export const createVariableErrorNotification = (
   message: string,
-  error: any,
+  error: unknown,
   identifier?: KeyedVariableIdentifier
 ): AppNotification =>
   createErrorNotification(
     `${identifier ? `Templating [${identifier.id}]` : 'Templating'}`,
-    `${message} ${error.message}`
+    error instanceof Error ? `${message} ${error.message}` : `${message}`
   );
 
 export const completeVariableLoading =
@@ -1107,10 +1110,6 @@ export function upgradeLegacyQueries(
   };
 }
 
-function isDataQueryType(query: any): query is DataQuery {
-  if (!query) {
-    return false;
-  }
-
-  return query.hasOwnProperty('refId') && typeof query.refId === 'string';
+function isDataQueryType(query: unknown): query is DataQuery {
+  return isObject(query) && 'refId' in query && typeof query.refId === 'string';
 }
diff --git a/public/app/features/variables/state/helpers.ts b/public/app/features/variables/state/helpers.ts
index 90f3057e093da..9752d6ecf5abd 100644
--- a/public/app/features/variables/state/helpers.ts
+++ b/public/app/features/variables/state/helpers.ts
@@ -1,20 +1,19 @@
 import { combineReducers } from '@reduxjs/toolkit';
 
-import { TypedVariableModel } from '@grafana/data';
+import {
+  TypedVariableModel,
+  DashboardVariableModel,
+  OrgVariableModel,
+  UserVariableModel,
+  VariableHide,
+} from '@grafana/data';
 import { VariableRefresh } from '@grafana/schema';
 import { dashboardReducer } from 'app/features/dashboard/state/reducers';
 
 import { DashboardState, StoreState } from '../../../types';
 import { VariableAdapter } from '../adapters';
 import { NEW_VARIABLE_ID } from '../constants';
-import {
-  DashboardVariableModel,
-  initialVariableModelState,
-  OrgVariableModel,
-  UserVariableModel,
-  VariableHide,
-  VariableModel,
-} from '../types';
+import { initialVariableModelState } from '../types';
 
 import { createQueryVariable } from './__tests__/fixtures';
 import { keyedVariablesReducer, KeyedVariablesState } from './keyedVariablesReducer';
@@ -112,7 +111,7 @@ export const getVariableTestContext = <Model extends TypedVariableModel>(
   adapter: VariableAdapter<Model>,
   variableOverrides: Partial<Model> = {}
 ) => {
-  const defaults: Partial<VariableModel> = {
+  const defaults: Partial<TypedVariableModel> = {
     id: '0',
     rootStateKey: 'key',
     index: 0,
diff --git a/public/app/features/variables/state/processVariable.test.ts b/public/app/features/variables/state/processVariable.test.ts
index 5cea2d1de9b0b..6448f202eb441 100644
--- a/public/app/features/variables/state/processVariable.test.ts
+++ b/public/app/features/variables/state/processVariable.test.ts
@@ -131,7 +131,7 @@ describe('processVariable', () => {
 
           expect(dispatchedActions[0]).toEqual(toKeyedAction(key, variableStateFetching(toVariablePayload(custom))));
           expect(dispatchedActions[1]).toEqual(
-            toKeyedAction(key, createCustomOptionsFromQuery(toVariablePayload(custom)))
+            toKeyedAction(key, createCustomOptionsFromQuery(toVariablePayload(custom, 'A,B,C')))
           );
           expect(dispatchedActions[2].type).toEqual('templating/keyed/shared/setCurrentVariableValue');
           expect(dispatchedActions[3]).toEqual(toKeyedAction(key, variableStateCompleted(toVariablePayload(custom))));
@@ -152,16 +152,30 @@ describe('processVariable', () => {
           .whenAsyncActionIsDispatched(processVariable(toKeyedVariableIdentifier(custom), queryParams), true);
 
         await tester.thenDispatchedActionsShouldEqual(
+          toKeyedAction(key, variableStateFetching(toVariablePayload({ type: 'custom', id: 'custom' }))),
+          toKeyedAction(
+            key,
+            createCustomOptionsFromQuery(toVariablePayload({ type: 'custom', id: 'custom' }, 'A,B,C'))
+          ),
           toKeyedAction(
             key,
             setCurrentVariableValue(
               toVariablePayload(
                 { type: 'custom', id: 'custom' },
-                { option: { text: 'B', value: 'B', selected: false } }
+                { option: { text: 'A', value: 'A', selected: false } }
               )
             )
           ),
-          toKeyedAction(key, variableStateCompleted(toVariablePayload(custom)))
+          toKeyedAction(key, variableStateCompleted(toVariablePayload(custom))),
+          toKeyedAction(
+            key,
+            setCurrentVariableValue(
+              toVariablePayload(
+                { type: 'custom', id: 'custom' },
+                { option: { text: 'B', value: 'B', selected: false } }
+              )
+            )
+          )
         );
       });
     });
diff --git a/public/app/features/variables/state/reducers.test.ts b/public/app/features/variables/state/reducers.test.ts
index 2ab57e974e363..08c13a3a48c75 100644
--- a/public/app/features/variables/state/reducers.test.ts
+++ b/public/app/features/variables/state/reducers.test.ts
@@ -1,9 +1,12 @@
 import { createAction } from '@reduxjs/toolkit';
+import { ComponentType } from 'react';
 
 import { VariableType } from '@grafana/data';
 
 import { reducerTester } from '../../../../test/core/redux/reducerTester';
 import { VariableAdapter, variableAdapters } from '../adapters';
+import { VariableEditorProps } from '../editor/types';
+import { VariablePickerProps } from '../pickers/types';
 import { QueryVariableModel } from '../types';
 import { toVariablePayload } from '../utils';
 
@@ -21,8 +24,8 @@ const variableAdapter: VariableAdapter<QueryVariableModel> = {
   reducer: jest.fn().mockReturnValue({}),
   getValueForUrl: jest.fn(),
   getSaveModel: jest.fn(),
-  picker: null as any,
-  editor: null as any,
+  picker: null as unknown as ComponentType<VariablePickerProps<QueryVariableModel>>,
+  editor: null as unknown as ComponentType<VariableEditorProps<QueryVariableModel>>,
   setValue: jest.fn(),
   setValueFromUrl: jest.fn(),
 };
diff --git a/public/app/features/variables/state/sharedReducer.ts b/public/app/features/variables/state/sharedReducer.ts
index ba4d6567a39be..ec8b5ae093e20 100644
--- a/public/app/features/variables/state/sharedReducer.ts
+++ b/public/app/features/variables/state/sharedReducer.ts
@@ -1,12 +1,11 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { cloneDeep, defaults as lodashDefaults } from 'lodash';
 
-import { LoadingState, VariableType } from '@grafana/data';
+import { LoadingState, VariableType, TypedVariableModel, VariableOption } from '@grafana/data';
 
 import { variableAdapters } from '../adapters';
 import { changeVariableNameSucceeded } from '../editor/reducer';
 import { hasOptions } from '../guard';
-import { VariableModel, VariableOption } from '../types';
 import { ensureStringValues } from '../utils';
 
 import { getInstanceState, getNextVariableIndex } from './selectors';
@@ -77,7 +76,7 @@ const sharedReducerSlice = createSlice({
         return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
       }
 
-      const original = cloneDeep<VariableModel>(state[action.payload.id]);
+      const original = cloneDeep<TypedVariableModel>(state[action.payload.id]);
       const copyRegex = new RegExp(`^copy_of_${escapeRegExp(original.name)}(_(\\d+))?$`);
 
       const copies = Object.values(state)
diff --git a/public/app/features/variables/state/transactionReducer.test.ts b/public/app/features/variables/state/transactionReducer.test.ts
index c769c10636ab7..8eaa8474c5efc 100644
--- a/public/app/features/variables/state/transactionReducer.test.ts
+++ b/public/app/features/variables/state/transactionReducer.test.ts
@@ -10,6 +10,7 @@ import {
   variablesCompleteTransaction,
   variablesInitTransaction,
 } from './transactionReducer';
+import { VariablePayload } from './types';
 
 describe('transactionReducer', () => {
   describe('when variablesInitTransaction is dispatched', () => {
@@ -71,7 +72,7 @@ describe('transactionReducer', () => {
               ...initialTransactionState,
               status: TransactionStatus.Fetching,
             })
-            .whenActionIsDispatched(removeVariable({} as any))
+            .whenActionIsDispatched(removeVariable({} as VariablePayload<{ reIndex: boolean }>))
             .thenStateShouldEqual({ uid: null, status: TransactionStatus.Fetching, isDirty: false });
         });
       });
@@ -83,7 +84,7 @@ describe('transactionReducer', () => {
               ...initialTransactionState,
               status: TransactionStatus.NotStarted,
             })
-            .whenActionIsDispatched(removeVariable({} as any))
+            .whenActionIsDispatched(removeVariable({} as VariablePayload<{ reIndex: boolean }>))
             .thenStateShouldEqual({ uid: null, status: TransactionStatus.NotStarted, isDirty: false });
         });
       });
@@ -95,7 +96,7 @@ describe('transactionReducer', () => {
               ...initialTransactionState,
               status: TransactionStatus.Completed,
             })
-            .whenActionIsDispatched(removeVariable({} as any))
+            .whenActionIsDispatched(removeVariable({} as VariablePayload<{ reIndex: boolean }>))
             .thenStateShouldEqual({ uid: null, status: TransactionStatus.Completed, isDirty: true });
         });
       });
@@ -107,7 +108,7 @@ describe('transactionReducer', () => {
               ...initialTransactionState,
               status: TransactionStatus.Completed,
             })
-            .whenActionIsDispatched(variableStateNotStarted({} as any))
+            .whenActionIsDispatched(variableStateNotStarted({} as VariablePayload))
             .thenStateShouldEqual({ uid: null, status: TransactionStatus.Completed, isDirty: false });
         });
       });
diff --git a/public/app/features/variables/system/adapter.ts b/public/app/features/variables/system/adapter.ts
index 82b8c277da578..71c4f3419092f 100644
--- a/public/app/features/variables/system/adapter.ts
+++ b/public/app/features/variables/system/adapter.ts
@@ -20,7 +20,7 @@ export const createSystemVariableAdapter = (): VariableAdapter<SystemVariable<an
       current: { value: { toString: () => '' } },
       state: LoadingState.Done,
     },
-    reducer: (state: any, action: any) => state,
+    reducer: (state: any) => state,
     picker: null as unknown as ComponentType<VariablePickerProps<SystemVariable<any>>>,
     editor: null as unknown as ComponentType<VariableEditorProps<SystemVariable<any>>>,
     dependsOn: () => {
diff --git a/public/app/features/variables/textbox/TextBoxVariableEditor.tsx b/public/app/features/variables/textbox/TextBoxVariableEditor.tsx
index 7c5b262fe4f35..4ec385d370ca0 100644
--- a/public/app/features/variables/textbox/TextBoxVariableEditor.tsx
+++ b/public/app/features/variables/textbox/TextBoxVariableEditor.tsx
@@ -2,8 +2,8 @@ import React, { FormEvent, ReactElement, useCallback } from 'react';
 
 import { selectors } from '@grafana/e2e-selectors';
 
-import { VariableLegend } from '../editor/VariableLegend';
-import { VariableTextField } from '../editor/VariableTextField';
+import { VariableLegend } from '../../dashboard-scene/settings/variables/components/VariableLegend';
+import { VariableTextField } from '../../dashboard-scene/settings/variables/components/VariableTextField';
 import { VariableEditorProps } from '../editor/types';
 import { TextBoxVariableModel } from '../types';
 
diff --git a/public/app/features/variables/types.ts b/public/app/features/variables/types.ts
index 11c66dcfafd4e..f943bf1efd477 100644
--- a/public/app/features/variables/types.ts
+++ b/public/app/features/variables/types.ts
@@ -8,6 +8,7 @@ import {
   QueryEditorProps,
   BaseVariableModel,
   VariableHide,
+  TypedVariableModel,
 } from '@grafana/data';
 export {
   /** @deprecated Import from @grafana/data instead */
@@ -95,6 +96,7 @@ export type VariableQueryEditorType<
 export interface VariablesChangedEvent {
   refreshAll: boolean;
   panelIds: number[];
+  variable?: TypedVariableModel;
 }
 
 export class VariablesChanged extends BusEventWithPayload<VariablesChangedEvent> {
diff --git a/public/app/features/variables/utils.test.ts b/public/app/features/variables/utils.test.ts
index 5f3e21039fd22..ada7fd4e3dbe2 100644
--- a/public/app/features/variables/utils.test.ts
+++ b/public/app/features/variables/utils.test.ts
@@ -1,4 +1,5 @@
 import { UrlQueryMap } from '@grafana/data';
+import { locationService } from '@grafana/runtime';
 
 import { VariableRefresh } from './types';
 import {
@@ -7,9 +8,17 @@ import {
   findTemplateVarChanges,
   getCurrentText,
   getVariableRefresh,
+  getVariablesFromUrl,
   isAllVariable,
 } from './utils';
 
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getTemplateSrv: () => ({
+    getVariables: () => [{ name: 'query0' }, { name: 'query1' }],
+  }),
+}));
+
 describe('isAllVariable', () => {
   it.each`
     variable                                         | expected
@@ -202,3 +211,22 @@ describe('containsVariable', () => {
     expect(containsVariable(value, 'var')).toEqual(expected);
   });
 });
+
+describe('getVariablesFromUrl', () => {
+  it('when called with simple var values for a var, then it returns just the value', () => {
+    locationService.push('/test?orgId=1&var-query0=1&var-query1=value1');
+    const expected = {
+      query0: '1',
+      query1: 'value1',
+    };
+    expect(getVariablesFromUrl()).toEqual(expected);
+  });
+  it('when called with multiple var values for the same var, then it returns the correct array', () => {
+    locationService.push('/test?orgId=1&var-query0=1&var-query1=value1&var-query1=value2&var-query1=value3');
+    const expected = {
+      query0: '1',
+      query1: ['value1', 'value2', 'value3'],
+    };
+    expect(getVariablesFromUrl()).toEqual(expected);
+  });
+});
diff --git a/public/app/features/variables/utils.ts b/public/app/features/variables/utils.ts
index bc137c3c7df84..b3bd198f5703e 100644
--- a/public/app/features/variables/utils.ts
+++ b/public/app/features/variables/utils.ts
@@ -1,7 +1,16 @@
 import { isArray, isEqual } from 'lodash';
 
-import { LegacyMetricFindQueryOptions, ScopedVars, UrlQueryMap, UrlQueryValue, VariableType } from '@grafana/data';
-import { getTemplateSrv } from '@grafana/runtime';
+import {
+  LegacyMetricFindQueryOptions,
+  ScopedVars,
+  UrlQueryMap,
+  UrlQueryValue,
+  VariableType,
+  VariableRefresh,
+  VariableWithOptions,
+  QueryVariableModel,
+} from '@grafana/data';
+import { getTemplateSrv, locationService } from '@grafana/runtime';
 import { safeStringifyValue } from 'app/core/utils/explore';
 
 import { getState } from '../../store/store';
@@ -12,7 +21,7 @@ import { variableAdapters } from './adapters';
 import { ALL_VARIABLE_TEXT, ALL_VARIABLE_VALUE, VARIABLE_PREFIX } from './constants';
 import { getVariablesState } from './state/selectors';
 import { KeyedVariableIdentifier, VariableIdentifier, VariablePayload } from './state/types';
-import { QueryVariableModel, TransactionStatus, VariableModel, VariableRefresh, VariableWithOptions } from './types';
+import { TransactionStatus, VariableModel } from './types';
 
 /*
  * This regex matches 3 types of variable reference with an optional format specifier
@@ -147,21 +156,19 @@ export function getLegacyQueryOptions(
 }
 
 export function getVariableRefresh(variable: VariableModel): VariableRefresh {
-  if (!variable || !variable.hasOwnProperty('refresh')) {
-    return VariableRefresh.never;
+  if (variable?.type === 'custom') {
+    return VariableRefresh.onDashboardLoad;
   }
 
-  const queryVariable = variable as QueryVariableModel;
-
   if (
-    queryVariable.refresh !== VariableRefresh.onTimeRangeChanged &&
-    queryVariable.refresh !== VariableRefresh.onDashboardLoad &&
-    queryVariable.refresh !== VariableRefresh.never
+    !variable ||
+    !('refresh' in variable) ||
+    (variable.refresh !== VariableRefresh.onTimeRangeChanged && variable.refresh !== VariableRefresh.onDashboardLoad)
   ) {
     return VariableRefresh.never;
   }
 
-  return queryVariable.refresh;
+  return variable.refresh;
 }
 
 export function getVariableTypes(): Array<{ label: string; value: VariableType }> {
@@ -175,7 +182,7 @@ export function getVariableTypes(): Array<{ label: string; value: VariableType }
     }));
 }
 
-function getUrlValueForComparison(value: any): any {
+function getUrlValueForComparison(value: unknown) {
   if (isArray(value)) {
     if (value.length === 0) {
       value = undefined;
@@ -283,3 +290,19 @@ export function toVariablePayload<T extends any = undefined>(
 ): VariablePayload<T> {
   return { type: obj.type, id: obj.id, data: data as T };
 }
+
+export function getVariablesFromUrl() {
+  const variables = getTemplateSrv().getVariables();
+  const queryParams = locationService.getSearchObject();
+
+  return Object.keys(queryParams)
+    .filter(
+      (key) => key.indexOf(VARIABLE_PREFIX) !== -1 && variables.some((v) => v.name === key.replace(VARIABLE_PREFIX, ''))
+    )
+    .reduce<UrlQueryMap>((obj, key) => {
+      const variableName = key.replace(VARIABLE_PREFIX, '');
+      obj[variableName] = queryParams[key];
+
+      return obj;
+    }, {});
+}
diff --git a/public/app/features/visualization/data-hover/DataHoverView.tsx b/public/app/features/visualization/data-hover/DataHoverView.tsx
index 5c651d3ff10c5..b395aedc9762f 100644
--- a/public/app/features/visualization/data-hover/DataHoverView.tsx
+++ b/public/app/features/visualization/data-hover/DataHoverView.tsx
@@ -10,10 +10,13 @@ import {
   GrafanaTheme2,
   LinkModel,
 } from '@grafana/data';
+import { config } from '@grafana/runtime';
 import { SortOrder, TooltipDisplayMode } from '@grafana/schema';
 import { TextLink, useStyles2 } from '@grafana/ui';
 import { renderValue } from 'app/plugins/panel/geomap/utils/uiUtils';
 
+import { ExemplarHoverView } from './ExemplarHoverView';
+
 export interface Props {
   data?: DataFrame; // source data
   rowIndex?: number | null; // the hover row
@@ -21,24 +24,26 @@ export interface Props {
   sortOrder?: SortOrder;
   mode?: TooltipDisplayMode | null;
   header?: string;
+  padding?: number;
 }
 
-interface DisplayValue {
+export interface DisplayValue {
   name: string;
   value: unknown;
   valueString: string;
   highlight: boolean;
 }
 
-export const DataHoverView = ({ data, rowIndex, columnIndex, sortOrder, mode, header = undefined }: Props) => {
-  const styles = useStyles2(getStyles);
+export function getDisplayValuesAndLinks(
+  data: DataFrame,
+  rowIndex: number,
+  columnIndex?: number | null,
+  sortOrder?: SortOrder,
+  mode?: TooltipDisplayMode | null
+) {
+  const fields = data.fields;
+  const hoveredField = columnIndex != null ? fields[columnIndex] : null;
 
-  if (!data || rowIndex == null) {
-    return null;
-  }
-  const fields = data.fields.map((f, idx) => {
-    return { ...f, hovered: idx === columnIndex };
-  });
   const visibleFields = fields.filter((f) => !Boolean(f.config.custom?.hideFrom?.tooltip));
   const traceIDField = visibleFields.find((field) => field.name === 'traceID') || fields[0];
   const orderedVisibleFields = [];
@@ -57,7 +62,7 @@ export const DataHoverView = ({ data, rowIndex, columnIndex, sortOrder, mode, he
   const linkLookup = new Set<string>();
 
   for (const field of orderedVisibleFields) {
-    if (mode === TooltipDisplayMode.Single && columnIndex != null && !field.hovered) {
+    if (mode === TooltipDisplayMode.Single && field !== hoveredField) {
       continue;
     }
 
@@ -74,14 +79,11 @@ export const DataHoverView = ({ data, rowIndex, columnIndex, sortOrder, mode, he
       });
     }
 
-    // Sanitize field by removing hovered property to fix unique display name issue
-    const { hovered, ...sanitizedField } = field;
-
     displayValues.push({
-      name: getFieldDisplayName(sanitizedField, data),
+      name: getFieldDisplayName(field, data),
       value,
       valueString: formattedValueToString(fieldDisplay),
-      highlight: field.hovered,
+      highlight: field === hoveredField,
     });
   }
 
@@ -89,6 +91,28 @@ export const DataHoverView = ({ data, rowIndex, columnIndex, sortOrder, mode, he
     displayValues.sort((a, b) => arrayUtils.sortValues(sortOrder)(a.value, b.value));
   }
 
+  return { displayValues, links };
+}
+
+export const DataHoverView = ({ data, rowIndex, columnIndex, sortOrder, mode, header, padding = 0 }: Props) => {
+  const styles = useStyles2(getStyles, padding);
+
+  if (!data || rowIndex == null) {
+    return null;
+  }
+
+  const dispValuesAndLinks = getDisplayValuesAndLinks(data, rowIndex, columnIndex, sortOrder, mode);
+
+  if (dispValuesAndLinks == null) {
+    return null;
+  }
+
+  const { displayValues, links } = dispValuesAndLinks;
+
+  if (config.featureToggles.newVizTooltips && header === 'Exemplar') {
+    return <ExemplarHoverView displayValues={displayValues} links={links} header={header} />;
+  }
+
   return (
     <div className={styles.wrapper}>
       {header && (
@@ -119,46 +143,46 @@ export const DataHoverView = ({ data, rowIndex, columnIndex, sortOrder, mode, he
     </div>
   );
 };
-const getStyles = (theme: GrafanaTheme2) => {
+const getStyles = (theme: GrafanaTheme2, padding = 0) => {
   return {
-    wrapper: css`
-      background: ${theme.components.tooltip.background};
-      border-radius: ${theme.shape.borderRadius(2)};
-    `,
-    header: css`
-      background: ${theme.colors.background.secondary};
-      align-items: center;
-      align-content: center;
-      display: flex;
-      padding-bottom: ${theme.spacing(1)};
-    `,
-    title: css`
-      font-weight: ${theme.typography.fontWeightMedium};
-      overflow: hidden;
-      display: inline-block;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-      flex-grow: 1;
-    `,
-    infoWrap: css`
-      padding: ${theme.spacing(1)};
-      background: transparent;
-      border: none;
-      th {
-        font-weight: ${theme.typography.fontWeightMedium};
-        padding: ${theme.spacing(0.25, 2, 0.25, 0)};
-      }
-
-      tr {
-        border-bottom: 1px solid ${theme.colors.border.weak};
-        &:last-child {
-          border-bottom: none;
-        }
-      }
-    `,
-    highlight: css``,
-    link: css`
-      color: ${theme.colors.text.link};
-    `,
+    wrapper: css({
+      padding: `${padding}px`,
+      background: theme.components.tooltip.background,
+      borderRadius: theme.shape.borderRadius(2),
+    }),
+    header: css({
+      background: theme.colors.background.secondary,
+      alignItems: 'center',
+      alignContent: 'center',
+      display: 'flex',
+      paddingBottom: theme.spacing(1),
+    }),
+    title: css({
+      fontWeight: theme.typography.fontWeightMedium,
+      overflow: 'hidden',
+      display: 'inline-block',
+      whiteSpace: 'nowrap',
+      textOverflow: 'ellipsis',
+      flexGrow: 1,
+    }),
+    infoWrap: css({
+      padding: theme.spacing(1),
+      background: 'transparent',
+      border: 'none',
+      th: {
+        fontWeight: theme.typography.fontWeightMedium,
+        padding: theme.spacing(0.25, 2, 0.25, 0),
+      },
+
+      tr: {
+        borderBottom: `1px solid ${theme.colors.border.weak}`,
+        '&:last-child': {
+          borderBottom: 'none',
+        },
+      },
+    }),
+    link: css({
+      color: theme.colors.text.link,
+    }),
   };
 };
diff --git a/public/app/features/visualization/data-hover/ExemplarHoverView.tsx b/public/app/features/visualization/data-hover/ExemplarHoverView.tsx
new file mode 100644
index 0000000000000..e3c1c285076f5
--- /dev/null
+++ b/public/app/features/visualization/data-hover/ExemplarHoverView.tsx
@@ -0,0 +1,120 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2, LinkModel } from '@grafana/data';
+import { DataLinkButton, useStyles2 } from '@grafana/ui';
+import { VizTooltipRow } from '@grafana/ui/src/components/VizTooltip/VizTooltipRow';
+import { renderValue } from 'app/plugins/panel/geomap/utils/uiUtils';
+
+import { DisplayValue } from './DataHoverView';
+
+export interface Props {
+  displayValues: DisplayValue[];
+  links?: LinkModel[];
+  header?: string;
+}
+
+export const ExemplarHoverView = ({ displayValues, links, header = 'Exemplar' }: Props) => {
+  const styles = useStyles2(getStyles);
+
+  const time = displayValues.find((val) => val.name === 'Time');
+  displayValues = displayValues.filter((val) => val.name !== 'Time'); // time?
+
+  return (
+    <div className={styles.exemplarWrapper}>
+      <div className={styles.exemplarHeader}>
+        <span className={styles.title}>{header}</span>
+        {time && <span className={styles.time}>{renderValue(time.valueString)}</span>}
+      </div>
+      <div className={styles.exemplarContent}>
+        {displayValues.map((displayValue, i) => {
+          return (
+            <VizTooltipRow
+              key={i}
+              label={displayValue.name}
+              value={renderValue(displayValue.valueString)}
+              justify={'space-between'}
+              isPinned={false}
+            />
+          );
+        })}
+      </div>
+      {links && links.length > 0 && (
+        <div className={styles.exemplarFooter}>
+          {links.map((link, i) => (
+            <DataLinkButton link={link} key={i} buttonProps={{ size: 'md' }} />
+          ))}
+        </div>
+      )}
+    </div>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2, padding = 0) => {
+  return {
+    exemplarWrapper: css({
+      display: 'flex',
+      flexDirection: 'column',
+      flex: 1,
+      gap: 4,
+      whiteSpace: 'pre',
+      borderRadius: theme.shape.radius.default,
+      background: theme.colors.background.primary,
+      border: `1px solid ${theme.colors.border.weak}`,
+      boxShadow: `0 4px 8px ${theme.colors.background.primary}`,
+    }),
+    exemplarHeader: css({
+      display: 'flex',
+      flexDirection: 'column',
+      alignItems: 'flex-start',
+      gap: theme.spacing(0.5),
+      color: theme.colors.text.secondary,
+      padding: theme.spacing(1),
+    }),
+    time: css({
+      color: theme.colors.text.primary,
+    }),
+    exemplarContent: css({
+      display: 'flex',
+      flexDirection: 'column',
+      flex: 1,
+      gap: 4,
+      borderTop: `1px solid ${theme.colors.border.medium}`,
+      padding: theme.spacing(1),
+    }),
+    exemplarFooter: css({
+      display: 'flex',
+      flexDirection: 'column',
+      flex: 1,
+      borderTop: `1px solid ${theme.colors.border.medium}`,
+      padding: theme.spacing(1),
+
+      overflowX: 'auto',
+      overflowY: 'hidden',
+      whiteSpace: 'nowrap',
+    }),
+    linkButton: css({
+      width: 'fit-content',
+    }),
+    label: css({
+      color: theme.colors.text.secondary,
+      fontWeight: 400,
+      textOverflow: 'ellipsis',
+      overflow: 'hidden',
+      marginRight: theme.spacing(0.5),
+    }),
+    value: css({
+      fontWeight: 500,
+      textOverflow: 'ellipsis',
+      overflow: 'hidden',
+    }),
+    title: css({
+      fontWeight: theme.typography.fontWeightMedium,
+      overflow: 'hidden',
+      display: 'inline-block',
+      whiteSpace: 'nowrap',
+      textOverflow: 'ellipsis',
+      flexGrow: 1,
+    }),
+  };
+};
diff --git a/public/app/plugins/datasource/alertmanager/plugin.json b/public/app/plugins/datasource/alertmanager/plugin.json
index 33a087f53659f..9e51ce18e5c5a 100644
--- a/public/app/plugins/datasource/alertmanager/plugin.json
+++ b/public/app/plugins/datasource/alertmanager/plugin.json
@@ -43,7 +43,8 @@
     }
   ],
   "info": {
-    "description": "",
+    "description": "Add external Alertmanagers (supports Prometheus and Mimir implementations) so you can use the Grafana Alerting UI to manage silences, contact points, and notification policies.",
+    "keywords": ["alerts", "alerting", "prometheus", "alertmanager", "mimir", "cortex"],
     "author": {
       "name": "Prometheus alertmanager",
       "url": "https://grafana.com"
diff --git a/public/app/plugins/datasource/alertmanager/types.ts b/public/app/plugins/datasource/alertmanager/types.ts
index 293b4850d3d58..01708a1578336 100644
--- a/public/app/plugins/datasource/alertmanager/types.ts
+++ b/public/app/plugins/datasource/alertmanager/types.ts
@@ -12,30 +12,30 @@ export type AlertManagerCortexConfig = {
 };
 
 export type TLSConfig = {
-  ca_file: string;
-  cert_file: string;
-  key_file: string;
+  ca_file?: string;
+  cert_file?: string;
+  key_file?: string;
   server_name?: string;
   insecure_skip_verify?: boolean;
 };
 
 export type HTTPConfigCommon = {
-  proxy_url?: string;
+  proxy_url?: string | null;
   tls_config?: TLSConfig;
 };
 
 export type HTTPConfigBasicAuth = {
-  basic_auth: {
+  basic_auth?: {
     username: string;
-  } & ({ password: string } | { password_file: string });
+  } & ({ password?: string } | { password_file?: string });
 };
 
 export type HTTPConfigBearerToken = {
-  bearer_token: string;
+  bearer_token?: string;
 };
 
 export type HTTPConfigBearerTokenFile = {
-  bearer_token_file: string;
+  bearer_token_file?: string;
 };
 
 export type HTTPConfig = HTTPConfigCommon & (HTTPConfigBasicAuth | HTTPConfigBearerToken | HTTPConfigBearerTokenFile);
@@ -71,7 +71,7 @@ export type GrafanaManagedReceiverConfig = {
   disableResolveMessage: boolean;
   secureFields?: Record<string, boolean>;
   secureSettings?: Record<string, any>;
-  settings: Record<string, any>;
+  settings?: Record<string, any>; // sometimes settings are optional for security reasons (RBAC)
   type: string;
   name: string;
   updated?: string;
@@ -99,7 +99,7 @@ export type Receiver = GrafanaManagedContactPoint | AlertmanagerReceiver;
 export type ObjectMatcher = [name: string, operator: MatcherOperator, value: string];
 
 export type Route = {
-  receiver?: string;
+  receiver?: string | null;
   group_by?: string[];
   continue?: boolean;
   object_matchers?: ObjectMatcher[];
@@ -123,10 +123,10 @@ export interface RouteWithID extends Route {
 }
 
 export type InhibitRule = {
-  target_match: Record<string, string>;
-  target_match_re: Record<string, string>;
-  source_match: Record<string, string>;
-  source_match_re: Record<string, string>;
+  target_match?: Record<string, string>;
+  target_match_re?: Record<string, string>;
+  source_match?: Record<string, string>;
+  source_match_re?: Record<string, string>;
   equal?: string[];
 };
 
@@ -157,6 +157,7 @@ export type AlertmanagerConfig = {
   inhibit_rules?: InhibitRule[];
   receivers?: Receiver[];
   mute_time_intervals?: MuteTimeInterval[];
+  time_intervals?: MuteTimeInterval[];
   /** { [name]: provenance } */
   muteTimeProvenances?: Record<string, string>;
   last_applied?: boolean;
@@ -217,11 +218,7 @@ export type AlertmanagerAlert = {
   generatorURL?: string;
   labels: { [key: string]: string };
   annotations: { [key: string]: string };
-  receivers: [
-    {
-      name: string;
-    },
-  ];
+  receivers: Array<{ name: string }>;
   fingerprint: string;
   status: {
     state: AlertState;
diff --git a/public/app/plugins/datasource/azuremonitor/CHANGELOG.md b/public/app/plugins/datasource/azuremonitor/CHANGELOG.md
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/public/app/plugins/datasource/azuremonitor/__mocks__/datasource.ts b/public/app/plugins/datasource/azuremonitor/__mocks__/datasource.ts
index 170ee9e561882..a51004bf81295 100644
--- a/public/app/plugins/datasource/azuremonitor/__mocks__/datasource.ts
+++ b/public/app/plugins/datasource/azuremonitor/__mocks__/datasource.ts
@@ -75,6 +75,7 @@ export default function createMockDatasource(overrides?: DeepPartial<Datasource>
       getResourceURIDisplayProperties: jest.fn().mockResolvedValue({}),
     },
     getVariablesRaw: jest.fn().mockReturnValue([]),
+    currentUserAuth: false,
     ...overrides,
   };
 
diff --git a/public/app/plugins/datasource/azuremonitor/__mocks__/variables.ts b/public/app/plugins/datasource/azuremonitor/__mocks__/variables.ts
index 54c0c46ef84c7..a7a90aefdcb51 100644
--- a/public/app/plugins/datasource/azuremonitor/__mocks__/variables.ts
+++ b/public/app/plugins/datasource/azuremonitor/__mocks__/variables.ts
@@ -1,4 +1,4 @@
-import { BaseVariableModel, CustomVariableModel, LoadingState, VariableHide } from '@grafana/data';
+import { BaseVariableModel, CustomVariableModel, LoadingState, VariableHide, VariableOption } from '@grafana/data';
 
 const initialVariableModelState: BaseVariableModel = {
   id: '00000000-0000-0000-0000-000000000000',
@@ -63,3 +63,14 @@ export const multiVariable: CustomVariableModel = {
   hide: VariableHide.dontHide,
   type: 'custom',
 };
+
+export const initialCustomVariableModelState: CustomVariableModel = {
+  ...initialVariableModelState,
+  type: 'custom',
+  multi: false,
+  includeAll: false,
+  allValue: null,
+  query: '',
+  options: [],
+  current: {} as VariableOption,
+};
diff --git a/public/app/plugins/datasource/azuremonitor/azureMetadata/resourceTypes.ts b/public/app/plugins/datasource/azuremonitor/azureMetadata/resourceTypes.ts
index 462d50a87fbbb..8f93f887b8af0 100644
--- a/public/app/plugins/datasource/azuremonitor/azureMetadata/resourceTypes.ts
+++ b/public/app/plugins/datasource/azuremonitor/azureMetadata/resourceTypes.ts
@@ -413,6 +413,7 @@ export const multiResourceCompatibleTypes: { [ns: string]: boolean } = {
   'microsoft.databoxedge/databoxedgedevices': true, // 'Azure Stack Edge / Data Box Gateway'
   'microsoft.dataprotection/backupvaults': true, // 'Backup vaults'
   'microsoft.netapp/netappaccounts/capacitypools': true, // 'Capacity pools'
+  'microsoft.netapp/netappaccounts/capacitypools/volumes': true, // 'Capacity pool volumes'
   'microsoft.network/networkwatchers/connectionmonitors': true, // 'Connection Monitors'
   'microsoft.keyvault/vaults': true, // 'Key vaults'
   'microsoft.recoveryservices/vaults': true, // 'Recovery Services vaults'
@@ -424,135 +425,236 @@ export const multiResourceCompatibleTypes: { [ns: string]: boolean } = {
 };
 
 export const resourceTypes = [
+  'microsoft.aad/domainservices',
+  'microsoft.aadiam/azureadmetrics',
   'microsoft.analysisservices/servers',
   'microsoft.apimanagement/service',
-  'microsoft.network/applicationgateways',
-  'microsoft.insights/components',
-  'microsoft.web/hostingenvironments',
-  'microsoft.web/serverfarms',
-  'microsoft.web/sites',
-  'microsoft.automation/automationaccounts',
-  'microsoft.aad/domainservices',
-  'microsoft.botservice/botservices',
+  'microsoft.app/containerapps',
+  'microsoft.app/managedenvironments',
+  'microsoft.appconfiguration/configurationstores',
   'microsoft.appplatform/spring',
-  'microsoft.dataprotection/backupvaults',
-  'microsoft.network/bastionhosts',
+  'microsoft.automation/automationaccounts',
+  'microsoft.avs/privateclouds',
+  'microsoft.azuresphere/catalogs',
+  'microsoft.azurestackhci/clusters',
+  'microsoft.azurestackresourcemonitor/storageaccountmonitor',
   'microsoft.batch/batchaccounts',
   'microsoft.batchai/workspaces',
-  'microsoft.cdn/profiles',
+  'microsoft.bing/accounts',
+  'microsoft.botservice/botservices',
+  'microsoft.botservice/botservices/channels',
+  'microsoft.botservice/botservices/connections',
+  'microsoft.botservice/checknameavailability',
+  'microsoft.botservice/hostsettings',
+  'microsoft.botservice/listauthserviceproviders',
+  'microsoft.botservice/listqnamakerendpointkeys',
+  'microsoft.cache/redis',
+  'microsoft.cache/redisenterprise',
   'microsoft.cdn/cdnwebapplicationfirewallpolicies',
+  'microsoft.cdn/profiles',
   'microsoft.classiccompute/domainnames',
+  'microsoft.classiccompute/domainnames/slots/roles',
   'microsoft.classiccompute/virtualmachines',
-  'microsoft.compute/cloudservices',
-  'microsoft.vmwarecloudsimple/virtualmachines',
+  'microsoft.classicstorage/storageaccounts',
+  'microsoft.classicstorage/storageaccounts/blobservices',
+  'microsoft.classicstorage/storageaccounts/fileservices',
+  'microsoft.classicstorage/storageaccounts/queueservices',
+  'microsoft.classicstorage/storageaccounts/tableservices',
+  'microsoft.cloudtest/hostedpools',
+  'microsoft.cloudtest/pools',
+  'microsoft.clusterstor/nodes',
   'microsoft.codesigning/codesigningaccounts',
   'microsoft.cognitiveservices/accounts',
-  'microsoft.voiceservices/communicationsgateways',
-  'microsoft.appconfiguration/configurationstores',
-  'microsoft.network/connections',
+  'microsoft.communication/communicationservices',
+  'microsoft.compute/cloudservices',
+  'microsoft.compute/cloudservices/roles',
+  'microsoft.compute/disks',
+  'microsoft.compute/virtualmachines',
+  'microsoft.compute/virtualmachinescalesets',
+  'microsoft.compute/virtualmachinescalesets/virtualmachines',
+  'microsoft.connectedcache/cachenodes',
+  'microsoft.connectedcache/enterprisemcccustomers',
+  'microsoft.connectedcache/ispcustomers',
   'microsoft.connectedvehicle/platformaccounts',
   'microsoft.containerinstance/containergroups',
+  'microsoft.containerinstance/containerscalesets',
   'microsoft.containerregistry/registries',
   'microsoft.containerservice/managedclusters',
-  'microsoft.documentdb/databaseaccounts',
+  'microsoft.customerinsights/hubs',
+  'microsoft.customproviders/resourceproviders',
+  'microsoft.dashboard/grafana',
   'microsoft.databoxedge/databoxedgedevices',
+  'microsoft.datacollaboration/workspaces',
   'microsoft.datafactory/datafactories',
   'microsoft.datafactory/factories',
   'microsoft.datalakeanalytics/accounts',
   'microsoft.datalakestore/accounts',
+  'microsoft.dataprotection/backupvaults',
   'microsoft.datashare/accounts',
+  'microsoft.dbformariadb/servers',
+  'microsoft.dbformysql/flexibleservers',
   'microsoft.dbformysql/servers',
+  'microsoft.dbforpostgresql/flexibleservers',
+  'microsoft.dbforpostgresql/servergroupsv2',
+  'microsoft.dbforpostgresql/servers',
+  'microsoft.dbforpostgresql/serversv2',
+  'microsoft.devices/iothubs',
   'microsoft.devices/provisioningservices',
-  'microsoft.compute/disks',
-  'microsoft.network/dnszones',
-  'microsoft.network/dnsresolvers',
-  'microsoft.network/dnsforwardingrulesets',
+  'microsoft.digitaltwins/digitaltwinsinstances',
+  'microsoft.documentdb/cassandraclusters',
+  'microsoft.documentdb/databaseaccounts',
+  'microsoft.documentdb/mongoclusters',
+  'microsoft.edgezones/edgezones',
   'microsoft.enterpriseknowledgegraph/services',
   'microsoft.eventgrid/domains',
-  'microsoft.eventgrid/topics',
+  'microsoft.eventgrid/eventsubscriptions',
+  'microsoft.eventgrid/extensiontopics',
+  'microsoft.eventgrid/namespaces',
+  'microsoft.eventgrid/partnernamespaces',
+  'microsoft.eventgrid/partnertopics',
   'microsoft.eventgrid/systemtopics',
-  'microsoft.eventhub/namespaces',
+  'microsoft.eventgrid/topics',
   'microsoft.eventhub/clusters',
-  'microsoft.network/expressroutecircuits',
-  'microsoft.network/expressrouteports',
-  'microsoft.network/azurefirewalls',
-  'microsoft.network/frontdoors',
+  'microsoft.eventhub/namespaces',
+  'microsoft.fabric.admin/fabriclocations',
   'microsoft.hdinsight/clusters',
+  'microsoft.healthcareapis/services',
+  'microsoft.healthcareapis/workspaces/dicomservices',
+  'microsoft.healthcareapis/workspaces/fhirservices',
+  'microsoft.healthcareapis/workspaces/iotconnectors',
+  'microsoft.healthmodel/healthmodels',
+  'microsoft.hybridcontainerservice/provisionedclusters',
+  'microsoft.hybridnetwork/networkfunctions',
+  'microsoft.hybridnetwork/virtualnetworkfunctions',
+  'microsoft.insights/autoscalesettings',
+  'microsoft.insights/components',
   'microsoft.iotcentral/iotapps',
-  'microsoft.devices/iothubs',
   'microsoft.iotspaces/graph',
+  'microsoft.keyvault/managedhsms',
   'microsoft.keyvault/vaults',
   'microsoft.kubernetes/connectedclusters',
+  'microsoft.kubernetesconfiguration/extensions',
   'microsoft.kusto/clusters',
-  'microsoft.network/loadbalancers',
-  'microsoft.operationalinsights/workspaces',
-  'microsoft.logic/workflows',
   'microsoft.logic/integrationserviceenvironments',
+  'microsoft.logic/workflows',
   'microsoft.machinelearningservices/workspaces',
+  'microsoft.machinelearningservices/workspaces/onlineendpoints',
+  'microsoft.machinelearningservices/workspaces/onlineendpoints/deployments',
+  'microsoft.managednetworkfabric/internetgateways',
+  'microsoft.managednetworkfabric/l3isolationdomains',
   'microsoft.managednetworkfabric/networkdevices',
-  'microsoft.dbformariadb/servers',
+  'microsoft.maps/accounts',
   'microsoft.media/mediaservices',
+  'microsoft.media/mediaservices/liveevents',
+  'microsoft.media/mediaservices/streamingendpoints',
+  'microsoft.media/videoanalyzers',
+  'microsoft.mixedreality/remoterenderingaccounts',
+  'microsoft.mixedreality/spatialanchorsaccounts',
+  'microsoft.mobilenetwork/packetcorecontrolplanes',
+  'microsoft.mobilenetwork/packetcorecontrolplanes/packetcoredataplanes',
   'microsoft.monitor/accounts',
-  'microsoft.dbformysql/flexibleservers',
-  'microsoft.network/natgateways',
   'microsoft.netapp/netappaccounts/capacitypools',
+  'microsoft.netapp/netappaccounts/capacitypools/volumes',
+  'microsoft.network/applicationgateways',
+  'microsoft.network/azurefirewalls',
+  'microsoft.network/bastionhosts',
+  'microsoft.network/connections',
+  'microsoft.network/dnsforwardingrulesets',
+  'microsoft.network/dnsresolvers',
+  'microsoft.network/dnszones',
+  'microsoft.network/expressroutecircuits',
+  'microsoft.network/expressroutecircuits/peerings',
+  'microsoft.network/expressroutegateways',
+  'microsoft.network/expressrouteports',
+  'microsoft.network/frontdoors',
+  'microsoft.network/loadbalancers',
+  'microsoft.network/natgateways',
   'microsoft.network/networkinterfaces',
-  'nginx.nginxplus/nginxdeployments',
+  'microsoft.network/networkmanagers/ipampools',
+  'microsoft.network/networkvirtualappliances',
+  'microsoft.network/networkwatchers',
+  'microsoft.network/networkwatchers/connectionmonitors',
+  'microsoft.network/p2svpngateways',
+  'microsoft.network/privatednszones',
+  'microsoft.network/privateendpoints',
+  'microsoft.network/privatelinkservices',
+  'microsoft.network/publicipaddresses',
+  'microsoft.network/publicipprefixes',
+  'microsoft.network/trafficmanagerprofiles',
+  'microsoft.network/virtualhubs',
+  'microsoft.network/virtualnetworkgateways',
+  'microsoft.network/virtualnetworks',
+  'microsoft.network/virtualrouters',
+  'microsoft.network/vpngateways',
+  'microsoft.networkanalytics/dataconnectors',
+  'microsoft.networkcloud/baremetalmachines',
+  'microsoft.networkcloud/clusters',
+  'microsoft.networkcloud/storageappliances',
+  'microsoft.networkfunction/azuretrafficcollectors',
   'microsoft.notificationhubs/namespaces/notificationhubs',
+  'microsoft.operationalinsights/workspaces',
+  'microsoft.operationsmanagement/solutions',
+  'microsoft.orbital/contactprofiles',
   'microsoft.orbital/l2connections',
+  'microsoft.orbital/spacecrafts',
+  'microsoft.orbital/terminals',
+  'microsoft.peering/peerings',
   'microsoft.peering/peeringservices',
   'microsoft.playfab/titles',
-  'microsoft.dbforpostgresql/servers',
-  'microsoft.dbforpostgresql/serversv2',
   'microsoft.powerbidedicated/capacities',
-  'microsoft.network/privateendpoints',
-  'microsoft.network/privatelinkservices',
-  'microsoft.hybridcontainerservice/provisionedclusters',
-  'microsoft.network/publicipaddresses',
+  'microsoft.purview/accounts',
   'microsoft.recoveryservices/vaults',
-  'microsoft.cache/redis',
-  'microsoft.cache/redisenterprise',
   'microsoft.relay/namespaces',
+  'microsoft.resources/subscriptions',
   'microsoft.search/searchservices',
-  'microsoft.dbforpostgresql/servergroupsv2',
+  'microsoft.securitydetonation/chambers',
+  'microsoft.securitydetonation/securitydetonationchambers',
   'microsoft.servicebus/namespaces',
   'microsoft.servicefabricmesh/applications',
+  'microsoft.servicenetworking/trafficcontrollers',
   'microsoft.signalrservice/signalr',
+  'microsoft.signalrservice/signalr/replicas',
   'microsoft.signalrservice/webpubsub',
-  'microsoft.operationsmanagement/solutions',
+  'microsoft.signalrservice/webpubsub/replicas',
+  'microsoft.singularity/accounts',
   'microsoft.sql/managedinstances',
   'microsoft.sql/servers/databases',
   'microsoft.sql/servers/elasticpools',
+  'microsoft.sql/servers/jobagents',
   'microsoft.storage/storageaccounts',
+  'microsoft.storage/storageaccounts/blobservices',
+  'microsoft.storage/storageaccounts/fileservices',
+  'microsoft.storage/storageaccounts/objectreplicationpolicies',
+  'microsoft.storage/storageaccounts/queueservices',
+  'microsoft.storage/storageaccounts/storagetasks',
+  'microsoft.storage/storageaccounts/tableservices',
+  'microsoft.storage/storagetasks',
+  'microsoft.storagecache/amlfilesystems',
   'microsoft.storagecache/caches',
-  'microsoft.classicstorage/storageaccounts',
   'microsoft.storagemover/storagemovers',
   'microsoft.storagesync/storagesyncservices',
+  'microsoft.storagetasks/storagetasks',
   'microsoft.streamanalytics/streamingjobs',
   'microsoft.synapse/workspaces',
+  'microsoft.synapse/workspaces/bigdatapools',
+  'microsoft.synapse/workspaces/kustopools',
+  'microsoft.synapse/workspaces/scopepools',
+  'microsoft.synapse/workspaces/sqlpools',
   'microsoft.timeseriesinsights/environments',
-  'microsoft.network/trafficmanagerprofiles',
-  'microsoft.compute/virtualmachines',
-  'microsoft.compute/virtualmachinescalesets',
-  'microsoft.network/virtualnetworkgateways',
-  'microsoft.web/sites/slots',
-  'microsoft.insights/autoscalesettings',
-  'microsoft.aadiam/azureadmetrics',
-  'microsoft.azurestackresourcemonitor/storageaccountmonitor',
-  'microsoft.network/networkwatchers/connectionmonitors',
-  'microsoft.app/containerapps',
-  'microsoft.customerinsights/hubs',
-  'microsoft.network/expressroutegateways',
-  'microsoft.fabric.admin/fabriclocations',
-  'microsoft.network/networkvirtualappliances',
-  'microsoft.network/networkwatchers',
-  'microsoft.network/p2svpngateways',
-  'microsoft.dbforpostgresql/flexibleservers',
-  'microsoft.network/vpngateways',
-  'microsoft.network/virtualhubs',
+  'microsoft.timeseriesinsights/environments/eventsources',
+  'microsoft.vmwarecloudsimple/virtualmachines',
+  'microsoft.voiceservices/communicationsgateways',
+  'microsoft.web/containerapps',
+  'microsoft.web/hostingenvironments',
+  'microsoft.web/hostingenvironments/multirolepools',
   'microsoft.web/hostingenvironments/workerpools',
-  'microsoft.storagecache/amlfilesystems',
-  'microsoft.dashboard/grafana',
-  'microsoft.orbital/contactprofiles',
-  'microsoft.orbital/spacecrafts',
+  'microsoft.web/serverfarms',
+  'microsoft.web/sites',
+  'microsoft.web/sites/slots',
+  'microsoft.web/staticsites',
+  'nginx.nginxplus/nginxdeployments',
+  'wandisco.fusion/migrators',
+  'wandisco.fusion/migrators/datatransferagents',
+  'wandisco.fusion/migrators/livedatamigrations',
+  'wandisco.fusion/migrators/metadatamigrations',
 ];
diff --git a/public/app/plugins/datasource/azuremonitor/azure_log_analytics/__mocks__/schema.ts b/public/app/plugins/datasource/azuremonitor/azure_log_analytics/__mocks__/schema.ts
index eb7a33695c183..40257cee20b4c 100644
--- a/public/app/plugins/datasource/azuremonitor/azure_log_analytics/__mocks__/schema.ts
+++ b/public/app/plugins/datasource/azuremonitor/azure_log_analytics/__mocks__/schema.ts
@@ -370,6 +370,7 @@ export default class FakeSchemaData {
         },
       ],
       functions: [],
+      entityGroups: [],
       majorVersion: 0,
       minorVersion: 0,
     };
diff --git a/public/app/plugins/datasource/azuremonitor/azure_log_analytics/utils.ts b/public/app/plugins/datasource/azuremonitor/azure_log_analytics/utils.ts
index 1e61ef898cae7..7f577f53d4f39 100644
--- a/public/app/plugins/datasource/azuremonitor/azure_log_analytics/utils.ts
+++ b/public/app/plugins/datasource/azuremonitor/azure_log_analytics/utils.ts
@@ -1,4 +1,4 @@
-import { VariableModel } from '@grafana/data';
+import { TypedVariableModel } from '@grafana/data';
 
 import { EngineSchema } from '../types';
 import { AzureLogAnalyticsMetadata } from '../types/logAnalyticsMetadata';
@@ -48,7 +48,7 @@ function transformMetadataFunction(sourceSchema: AzureLogAnalyticsMetadata) {
 export function transformMetadataToKustoSchema(
   sourceSchema: AzureLogAnalyticsMetadata,
   nameOrIdOrSomething: string,
-  templateVariables: VariableModel[]
+  templateVariables: TypedVariableModel[]
 ): EngineSchema {
   const database = {
     name: nameOrIdOrSomething,
@@ -56,6 +56,7 @@ export function transformMetadataToKustoSchema(
     functions: transformMetadataFunction(sourceSchema),
     majorVersion: 0,
     minorVersion: 0,
+    entityGroups: [],
   };
 
   // Adding macros as known functions
diff --git a/public/app/plugins/datasource/azuremonitor/azure_monitor/url_builder.test.ts b/public/app/plugins/datasource/azuremonitor/azure_monitor/url_builder.test.ts
index bcb86a35b5cac..fddceba791867 100644
--- a/public/app/plugins/datasource/azuremonitor/azure_monitor/url_builder.test.ts
+++ b/public/app/plugins/datasource/azuremonitor/azure_monitor/url_builder.test.ts
@@ -174,6 +174,22 @@ describe('AzureMonitorUrlBuilder', () => {
         '/subscriptions/sub/resource-uri/resource/providers/microsoft.insights/metricdefinitions?api-version=2017-05-01-preview&metricnamespace=custom%2Fnamespace'
       );
     });
+
+    it('adds a region with multiple resources', () => {
+      const url = UrlBuilder.buildAzureMonitorGetMetricNamesUrl(
+        'baseUrl',
+        'apiVersion',
+        {
+          resourceUri: '/subscriptions/sub/resource-uri/resource',
+        },
+        templateSrv,
+        true,
+        'region'
+      );
+      expect(url).toBe(
+        'baseUrl/subscriptions/sub/resource-uri/resource/providers/microsoft.insights/metricdefinitions?api-version=apiVersion&region=region'
+      );
+    });
   });
 
   describe('Legacy query object', () => {
diff --git a/public/app/plugins/datasource/azuremonitor/azure_monitor/url_builder.ts b/public/app/plugins/datasource/azuremonitor/azure_monitor/url_builder.ts
index 1b5aae857123c..15230fb526ec8 100644
--- a/public/app/plugins/datasource/azuremonitor/azure_monitor/url_builder.ts
+++ b/public/app/plugins/datasource/azuremonitor/azure_monitor/url_builder.ts
@@ -104,10 +104,10 @@ export default class UrlBuilder {
 
     if (multipleResources && !customNamespace && metricNamespace) {
       url += `&metricnamespace=${encodeURIComponent(metricNamespace)}`;
+    }
 
-      if (region) {
-        url += `&region=${region}`;
-      }
+    if (region && multipleResources) {
+      url += `&region=${region}`;
     }
 
     return url;
diff --git a/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/ArgQueryEditor.test.tsx b/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/ArgQueryEditor.test.tsx
index 3f5f31a19667b..92564c4c7dcc1 100644
--- a/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/ArgQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/ArgQueryEditor.test.tsx
@@ -182,4 +182,55 @@ describe('ArgQueryEditor', () => {
     );
     expect(await waitFor(() => screen.getByText('At least one subscription must be chosen.'))).toBeInTheDocument();
   });
+
+  it('should select all subscriptions if select all is chosen from the dropdown', async () => {
+    const onChange = jest.fn();
+    const datasource = createMockDatasource({
+      getSubscriptions: jest.fn().mockResolvedValue([
+        { text: 'foo', value: 'test-subscription-value1' },
+        { text: 'bar', value: 'test-subscription-value2' },
+        { text: 'Select all subscriptions', value: 'Select all' },
+      ]),
+    });
+    const query = createMockQuery({
+      subscription: undefined,
+      subscriptions: ['test-subscription-value1', 'test-subscription-value2', 'Select all'],
+    });
+    const { rerender } = render(
+      <ArgQueryEditor
+        {...defaultProps}
+        query={query}
+        datasource={datasource}
+        onChange={onChange}
+        variableOptionGroup={{ label: 'Template Variables', options: [] }}
+      />
+    );
+
+    expect(datasource.getSubscriptions).toHaveBeenCalled();
+    expect(await waitFor(() => onChange)).toHaveBeenCalledWith(
+      expect.objectContaining({ subscriptions: ['test-subscription-value1', 'test-subscription-value2', 'Select all'] })
+    );
+    expect(await waitFor(() => screen.findByText('foo'))).toBeInTheDocument();
+    expect(await waitFor(() => screen.findByText('bar'))).toBeInTheDocument();
+    expect(await waitFor(() => screen.findByText('Select all subscriptions'))).toBeInTheDocument();
+
+    const selectAll = screen.getByText('Select all subscriptions');
+    await userEvent.click(selectAll);
+
+    expect(onChange).toHaveBeenCalledWith(
+      expect.objectContaining({ subscriptions: ['test-subscription-value1', 'test-subscription-value2', 'Select all'] })
+    );
+
+    rerender(
+      <ArgQueryEditor
+        {...defaultProps}
+        datasource={datasource}
+        onChange={onChange}
+        query={{ ...query, subscriptions: ['test-subscription-value1', 'test-subscription-value2', 'Select all'] }}
+        variableOptionGroup={{ label: 'Template Variables', options: [] }}
+      />
+    );
+    expect(await waitFor(() => screen.getByText('foo'))).toBeInTheDocument();
+    expect(await waitFor(() => screen.getByText('bar'))).toBeInTheDocument();
+  });
 });
diff --git a/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/ArgQueryEditor.tsx b/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/ArgQueryEditor.tsx
index 78b685d491bf6..cc0d1ce82d9e8 100644
--- a/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/ArgQueryEditor.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/ArgQueryEditor.tsx
@@ -57,8 +57,11 @@ const ArgQueryEditor = ({
     datasource
       .getSubscriptions()
       .then((results) => {
+        const selectAllSubscriptionOption = [
+          { label: 'Select all subscriptions', value: 'Select all subscriptions', description: 'Select all' },
+        ];
         const fetchedSubscriptions = results.map((v) => ({ label: v.text, value: v.value, description: v.value }));
-        setSubscriptions(fetchedSubscriptions);
+        setSubscriptions(selectAllSubscriptionOption.concat(fetchedSubscriptions));
         setError(ERROR_SOURCE, undefined);
 
         onChange({
diff --git a/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/SubscriptionField.tsx b/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/SubscriptionField.tsx
index 27b3a95003454..019edbf19154f 100644
--- a/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/SubscriptionField.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/SubscriptionField.tsx
@@ -6,7 +6,7 @@ import { FieldValidationMessage, MultiSelect } from '@grafana/ui';
 import { selectors } from '../../e2e/selectors';
 import { AzureMonitorQuery, AzureQueryEditorFieldProps, AzureMonitorOption } from '../../types';
 import { findOptions } from '../../utils/common';
-import { Field } from '../Field';
+import { Field } from '../shared/Field';
 
 interface SubscriptionFieldProps extends AzureQueryEditorFieldProps {
   onQueryChange: (newQuery: AzureMonitorQuery) => void;
@@ -28,6 +28,7 @@ const SubscriptionField = ({ query, subscriptions, variableOptionGroup, onQueryC
   }, [query.subscriptions, subscriptions, variableOptionGroup.options]);
 
   const onChange = (change: Array<SelectableValue<string>>) => {
+    const containsSelectAll = change.filter((c) => c.value === 'Select all subscriptions');
     if (!change || change.length === 0) {
       setValues([]);
       onQueryChange({
@@ -35,6 +36,12 @@ const SubscriptionField = ({ query, subscriptions, variableOptionGroup, onQueryC
         subscriptions: [],
       });
       setError(true);
+    } else if (containsSelectAll.length > 0) {
+      const allSubs = subscriptions.map((c) => c.value ?? '').filter((c) => c !== 'Select all subscriptions');
+      onQueryChange({
+        ...query,
+        subscriptions: allSubs,
+      });
     } else {
       const newSubs = change.map((c) => c.value ?? '');
       onQueryChange({
diff --git a/public/app/plugins/datasource/azuremonitor/components/AzureCredentialsForm.tsx b/public/app/plugins/datasource/azuremonitor/components/AzureCredentialsForm.tsx
deleted file mode 100644
index 4b3c32b3e299b..0000000000000
--- a/public/app/plugins/datasource/azuremonitor/components/AzureCredentialsForm.tsx
+++ /dev/null
@@ -1,231 +0,0 @@
-import React, { ChangeEvent, useMemo } from 'react';
-
-import { SelectableValue } from '@grafana/data';
-import { ConfigSection } from '@grafana/experimental';
-import { Button, Select, Field, Input } from '@grafana/ui';
-
-import { selectors } from '../e2e/selectors';
-import { AzureAuthType, AzureCredentials } from '../types';
-
-export interface Props {
-  managedIdentityEnabled: boolean;
-  workloadIdentityEnabled: boolean;
-  credentials: AzureCredentials;
-  azureCloudOptions?: SelectableValue[];
-  onCredentialsChange: (updatedCredentials: AzureCredentials) => void;
-  disabled?: boolean;
-  children?: JSX.Element;
-}
-
-export const AzureCredentialsForm = (props: Props) => {
-  const {
-    credentials,
-    azureCloudOptions,
-    onCredentialsChange,
-    disabled,
-    managedIdentityEnabled,
-    workloadIdentityEnabled,
-  } = props;
-
-  const authTypeOptions = useMemo(() => {
-    let opts: Array<SelectableValue<AzureAuthType>> = [
-      {
-        value: 'clientsecret',
-        label: 'App Registration',
-      },
-    ];
-
-    if (managedIdentityEnabled) {
-      opts.push({
-        value: 'msi',
-        label: 'Managed Identity',
-      });
-    }
-
-    if (workloadIdentityEnabled) {
-      opts.push({
-        value: 'workloadidentity',
-        label: 'Workload Identity',
-      });
-    }
-
-    return opts;
-  }, [managedIdentityEnabled, workloadIdentityEnabled]);
-
-  const onAuthTypeChange = (selected: SelectableValue<AzureAuthType>) => {
-    const defaultAuthType = managedIdentityEnabled
-      ? 'msi'
-      : workloadIdentityEnabled
-      ? 'workloadidentity'
-      : 'clientsecret';
-    const updated: AzureCredentials = {
-      ...credentials,
-      authType: selected.value || defaultAuthType,
-    };
-    onCredentialsChange(updated);
-  };
-
-  const onAzureCloudChange = (selected: SelectableValue<string>) => {
-    if (credentials.authType === 'clientsecret') {
-      const updated: AzureCredentials = {
-        ...credentials,
-        azureCloud: selected.value,
-      };
-      onCredentialsChange(updated);
-    }
-  };
-
-  const onTenantIdChange = (event: ChangeEvent<HTMLInputElement>) => {
-    if (credentials.authType === 'clientsecret') {
-      const updated: AzureCredentials = {
-        ...credentials,
-        tenantId: event.target.value,
-      };
-      onCredentialsChange(updated);
-    }
-  };
-
-  const onClientIdChange = (event: ChangeEvent<HTMLInputElement>) => {
-    if (credentials.authType === 'clientsecret') {
-      const updated: AzureCredentials = {
-        ...credentials,
-        clientId: event.target.value,
-      };
-      onCredentialsChange(updated);
-    }
-  };
-
-  const onClientSecretChange = (event: ChangeEvent<HTMLInputElement>) => {
-    if (credentials.authType === 'clientsecret') {
-      const updated: AzureCredentials = {
-        ...credentials,
-        clientSecret: event.target.value,
-      };
-      onCredentialsChange(updated);
-    }
-  };
-
-  const onClientSecretReset = () => {
-    if (credentials.authType === 'clientsecret') {
-      const updated: AzureCredentials = {
-        ...credentials,
-        clientSecret: '',
-      };
-      onCredentialsChange(updated);
-    }
-  };
-
-  return (
-    <ConfigSection title="Authentication">
-      {authTypeOptions.length > 1 && (
-        <Field
-          label="Authentication"
-          description="Choose the type of authentication to Azure services"
-          data-testid={selectors.components.configEditor.authType.select}
-          htmlFor="authentication-type"
-        >
-          <Select
-            className="width-15"
-            value={authTypeOptions.find((opt) => opt.value === credentials.authType)}
-            options={authTypeOptions}
-            onChange={onAuthTypeChange}
-            disabled={disabled}
-          />
-        </Field>
-      )}
-      {credentials.authType === 'clientsecret' && (
-        <>
-          {azureCloudOptions && (
-            <Field
-              label="Azure Cloud"
-              data-testid={selectors.components.configEditor.azureCloud.input}
-              htmlFor="azure-cloud-type"
-              disabled={disabled}
-            >
-              <Select
-                inputId="azure-cloud-type"
-                aria-label="Azure Cloud"
-                className="width-15"
-                value={azureCloudOptions.find((opt) => opt.value === credentials.azureCloud)}
-                options={azureCloudOptions}
-                onChange={onAzureCloudChange}
-              />
-            </Field>
-          )}
-          <Field
-            label="Directory (tenant) ID"
-            required
-            data-testid={selectors.components.configEditor.tenantID.input}
-            htmlFor="tenant-id"
-            invalid={!credentials.tenantId}
-            error={'Tenant ID is required'}
-          >
-            <Input
-              aria-label="Tenant ID"
-              className="width-30"
-              placeholder="XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"
-              value={credentials.tenantId || ''}
-              onChange={onTenantIdChange}
-              disabled={disabled}
-            />
-          </Field>
-          <Field
-            label="Application (client) ID"
-            required
-            data-testid={selectors.components.configEditor.clientID.input}
-            htmlFor="client-id"
-            invalid={!credentials.clientId}
-            error={'Client ID is required'}
-          >
-            <Input
-              className="width-30"
-              aria-label="Client ID"
-              placeholder="XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"
-              value={credentials.clientId || ''}
-              onChange={onClientIdChange}
-              disabled={disabled}
-            />
-          </Field>
-          {!disabled &&
-            (typeof credentials.clientSecret === 'symbol' ? (
-              <Field label="Client Secret" htmlFor="client-secret" required>
-                <div className="width-30" style={{ display: 'flex', gap: '4px' }}>
-                  <Input
-                    aria-label="Client Secret"
-                    placeholder="configured"
-                    disabled={true}
-                    data-testid={'client-secret'}
-                  />
-                  <Button variant="secondary" type="button" onClick={onClientSecretReset} disabled={disabled}>
-                    Reset
-                  </Button>
-                </div>
-              </Field>
-            ) : (
-              <Field
-                label="Client Secret"
-                data-testid={selectors.components.configEditor.clientSecret.input}
-                required
-                htmlFor="client-secret"
-                invalid={!credentials.clientSecret}
-                error={'Client secret is required'}
-              >
-                <Input
-                  className="width-30"
-                  aria-label="Client Secret"
-                  placeholder="XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"
-                  value={credentials.clientSecret || ''}
-                  onChange={onClientSecretChange}
-                  id="client-secret"
-                  disabled={disabled}
-                />
-              </Field>
-            ))}
-        </>
-      )}
-      {props.children}
-    </ConfigSection>
-  );
-};
-
-export default AzureCredentialsForm;
diff --git a/public/app/plugins/datasource/azuremonitor/components/ConfigEditor.tsx b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor.tsx
deleted file mode 100644
index ee9bec6cb03e4..0000000000000
--- a/public/app/plugins/datasource/azuremonitor/components/ConfigEditor.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-import React, { PureComponent } from 'react';
-
-import { DataSourcePluginOptionsEditorProps, SelectableValue, updateDatasourcePluginOption } from '@grafana/data';
-import { ConfigSection, DataSourceDescription } from '@grafana/experimental';
-import { getBackendSrv, getTemplateSrv, isFetchError, TemplateSrv } from '@grafana/runtime';
-import { Alert, Divider, SecureSocksProxySettings } from '@grafana/ui';
-import { config } from 'app/core/config';
-
-import ResponseParser from '../azure_monitor/response_parser';
-import {
-  AzureAPIResponse,
-  AzureDataSourceJsonData,
-  AzureDataSourceSecureJsonData,
-  AzureDataSourceSettings,
-  Subscription,
-} from '../types';
-import { routeNames } from '../utils/common';
-
-import { MonitorConfig } from './MonitorConfig';
-
-export type Props = DataSourcePluginOptionsEditorProps<AzureDataSourceJsonData, AzureDataSourceSecureJsonData>;
-
-interface ErrorMessage {
-  title: string;
-  description: string;
-  details?: string;
-}
-
-export interface State {
-  unsaved: boolean;
-  error?: ErrorMessage;
-}
-
-export class ConfigEditor extends PureComponent<Props, State> {
-  templateSrv: TemplateSrv = getTemplateSrv();
-  baseURL: string;
-
-  constructor(props: Props) {
-    super(props);
-
-    this.state = {
-      unsaved: false,
-    };
-    this.baseURL = `/api/datasources/${this.props.options.id}/resources/${routeNames.azureMonitor}/subscriptions`;
-  }
-
-  private updateOptions = (optionsFunc: (options: AzureDataSourceSettings) => AzureDataSourceSettings): void => {
-    const updated = optionsFunc(this.props.options);
-    this.props.onOptionsChange(updated);
-
-    this.setState({ unsaved: true });
-  };
-
-  private saveOptions = async (): Promise<void> => {
-    if (this.state.unsaved) {
-      await getBackendSrv()
-        .put(`/api/datasources/${this.props.options.id}`, this.props.options)
-        .then((result: { datasource: AzureDataSourceSettings }) => {
-          updateDatasourcePluginOption(this.props, 'version', result.datasource.version);
-        });
-
-      this.setState({ unsaved: false });
-    }
-  };
-
-  private getSubscriptions = async (): Promise<Array<SelectableValue<string>>> => {
-    await this.saveOptions();
-
-    const query = `?api-version=2019-03-01`;
-    try {
-      const result = await getBackendSrv()
-        .fetch<AzureAPIResponse<Subscription>>({
-          url: this.baseURL + query,
-          method: 'GET',
-        })
-        .toPromise();
-
-      this.setState({ error: undefined });
-      return ResponseParser.parseSubscriptionsForSelect(result);
-    } catch (err) {
-      if (isFetchError(err)) {
-        this.setState({
-          error: {
-            title: 'Error requesting subscriptions',
-            description: 'Could not request subscriptions from Azure. Check your credentials and try again.',
-            details: err?.data?.message,
-          },
-        });
-      }
-      return Promise.resolve([]);
-    }
-  };
-
-  render() {
-    const { options, onOptionsChange } = this.props;
-    const { error } = this.state;
-
-    return (
-      <>
-        <DataSourceDescription
-          dataSourceName="Azure Monitor"
-          docsLink="https://grafana.com/docs/grafana/latest/datasources/azure-monitor/"
-          hasRequiredFields
-        />
-        <Divider />
-        <MonitorConfig options={options} updateOptions={this.updateOptions} getSubscriptions={this.getSubscriptions} />
-        {error && (
-          <Alert severity="error" title={error.title}>
-            <p>{error.description}</p>
-            {error.details && <details style={{ whiteSpace: 'pre-wrap' }}>{error.details}</details>}
-          </Alert>
-        )}
-        {config.secureSocksDSProxyEnabled && (
-          <>
-            <Divider />
-            <ConfigSection
-              title="Additional settings"
-              description="Additional settings are optional settings that can be configured for more control over your data source. This includes Secure Socks Proxy."
-              isCollapsible={true}
-              isInitiallyOpen={options.jsonData.enableSecureSocksProxy !== undefined}
-            >
-              <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
-            </ConfigSection>
-          </>
-        )}
-      </>
-    );
-  }
-}
-
-export default ConfigEditor;
diff --git a/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/AppRegistrationCredentials.tsx b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/AppRegistrationCredentials.tsx
new file mode 100644
index 0000000000000..88ef5186df209
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/AppRegistrationCredentials.tsx
@@ -0,0 +1,149 @@
+import React, { ChangeEvent } from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { Field, Select, Input, Button } from '@grafana/ui';
+
+import { selectors } from '../../e2e/selectors';
+import { AzureClientSecretCredentials, AzureCredentials } from '../../types';
+
+export interface AppRegistrationCredentialsProps {
+  credentials: AzureClientSecretCredentials;
+  azureCloudOptions?: SelectableValue[];
+  onCredentialsChange: (updatedCredentials: AzureCredentials) => void;
+  disabled?: boolean;
+}
+
+export const AppRegistrationCredentials = (props: AppRegistrationCredentialsProps) => {
+  const { azureCloudOptions, disabled, credentials, onCredentialsChange } = props;
+
+  const onAzureCloudChange = (selected: SelectableValue<string>) => {
+    const updated: AzureCredentials = {
+      ...credentials,
+      azureCloud: selected.value,
+    };
+    onCredentialsChange(updated);
+  };
+
+  const onTenantIdChange = (event: ChangeEvent<HTMLInputElement>) => {
+    const updated: AzureCredentials = {
+      ...credentials,
+      tenantId: event.target.value,
+    };
+    onCredentialsChange(updated);
+  };
+
+  const onClientIdChange = (event: ChangeEvent<HTMLInputElement>) => {
+    const updated: AzureCredentials = {
+      ...credentials,
+      clientId: event.target.value,
+    };
+    onCredentialsChange(updated);
+  };
+
+  const onClientSecretChange = (event: ChangeEvent<HTMLInputElement>) => {
+    const updated: AzureCredentials = {
+      ...credentials,
+      clientSecret: event.target.value,
+    };
+    onCredentialsChange(updated);
+  };
+
+  const onClientSecretReset = () => {
+    const updated: AzureCredentials = {
+      ...credentials,
+      clientSecret: '',
+    };
+    onCredentialsChange(updated);
+  };
+
+  return (
+    <>
+      {azureCloudOptions && (
+        <Field
+          label="Azure Cloud"
+          data-testid={selectors.components.configEditor.azureCloud.input}
+          htmlFor="azure-cloud-type"
+          disabled={disabled}
+        >
+          <Select
+            inputId="azure-cloud-type"
+            aria-label="Azure Cloud"
+            className="width-15"
+            value={azureCloudOptions.find((opt) => opt.value === credentials.azureCloud)}
+            options={azureCloudOptions}
+            onChange={onAzureCloudChange}
+          />
+        </Field>
+      )}
+      <Field
+        label="Directory (tenant) ID"
+        required={credentials.authType === 'clientsecret'}
+        data-testid={selectors.components.configEditor.tenantID.input}
+        htmlFor="tenant-id"
+        invalid={credentials.authType === 'clientsecret' && !credentials.tenantId}
+        error={'Tenant ID is required'}
+      >
+        <Input
+          aria-label="Tenant ID"
+          className="width-30"
+          placeholder="XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"
+          value={credentials.tenantId || ''}
+          onChange={onTenantIdChange}
+          disabled={disabled}
+        />
+      </Field>
+      <Field
+        label="Application (client) ID"
+        required={credentials.authType === 'clientsecret'}
+        data-testid={selectors.components.configEditor.clientID.input}
+        htmlFor="client-id"
+        invalid={credentials.authType === 'clientsecret' && !credentials.clientId}
+        error={'Client ID is required'}
+      >
+        <Input
+          className="width-30"
+          aria-label="Client ID"
+          placeholder="XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"
+          value={credentials.clientId || ''}
+          onChange={onClientIdChange}
+          disabled={disabled}
+        />
+      </Field>
+      {!disabled &&
+        (typeof credentials.clientSecret === 'symbol' ? (
+          <Field label="Client Secret" htmlFor="client-secret" required>
+            <div className="width-30" style={{ display: 'flex', gap: '4px' }}>
+              <Input
+                aria-label="Client Secret"
+                placeholder="configured"
+                disabled={true}
+                data-testid={'client-secret'}
+              />
+              <Button variant="secondary" type="button" onClick={onClientSecretReset} disabled={disabled}>
+                Reset
+              </Button>
+            </div>
+          </Field>
+        ) : (
+          <Field
+            label="Client Secret"
+            data-testid={selectors.components.configEditor.clientSecret.input}
+            required
+            htmlFor="client-secret"
+            invalid={!credentials.clientSecret}
+            error={'Client secret is required'}
+          >
+            <Input
+              className="width-30"
+              aria-label="Client Secret"
+              placeholder="XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"
+              value={credentials.clientSecret || ''}
+              onChange={onClientSecretChange}
+              id="client-secret"
+              disabled={disabled}
+            />
+          </Field>
+        ))}
+    </>
+  );
+};
diff --git a/public/app/plugins/datasource/azuremonitor/components/AzureCredentialsForm.test.tsx b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/AzureCredentialsForm.test.tsx
similarity index 96%
rename from public/app/plugins/datasource/azuremonitor/components/AzureCredentialsForm.test.tsx
rename to public/app/plugins/datasource/azuremonitor/components/ConfigEditor/AzureCredentialsForm.test.tsx
index 4fed620eb4bef..c94d96101b832 100644
--- a/public/app/plugins/datasource/azuremonitor/components/AzureCredentialsForm.test.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/AzureCredentialsForm.test.tsx
@@ -7,6 +7,7 @@ const setup = (propsFunc?: (props: Props) => Props) => {
   let props: Props = {
     managedIdentityEnabled: false,
     workloadIdentityEnabled: false,
+    userIdentityEnabled: false,
     credentials: {
       authType: 'clientsecret',
       azureCloud: 'azuremonitor',
@@ -14,7 +15,7 @@ const setup = (propsFunc?: (props: Props) => Props) => {
       clientId: '34509fad-c0r9-45df-9e25-f1ee34af6900',
       clientSecret: undefined,
     },
-    azureCloudOptions: [
+    legacyAzureCloudOptions: [
       { value: 'azuremonitor', label: 'Azure' },
       { value: 'govazuremonitor', label: 'Azure US Government' },
       { value: 'chinaazuremonitor', label: 'Azure China' },
diff --git a/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/AzureCredentialsForm.tsx b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/AzureCredentialsForm.tsx
new file mode 100644
index 0000000000000..232965f3d7475
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/AzureCredentialsForm.tsx
@@ -0,0 +1,126 @@
+import React, { useMemo } from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { ConfigSection } from '@grafana/experimental';
+import { Select, Field } from '@grafana/ui';
+
+import { selectors } from '../../e2e/selectors';
+import { AzureAuthType, AzureCredentials } from '../../types';
+
+import { AppRegistrationCredentials } from './AppRegistrationCredentials';
+import CurrentUserFallbackCredentials from './CurrentUserFallbackCredentials';
+
+export interface Props {
+  managedIdentityEnabled: boolean;
+  workloadIdentityEnabled: boolean;
+  userIdentityEnabled: boolean;
+  credentials: AzureCredentials;
+  azureCloudOptions?: SelectableValue[];
+  legacyAzureCloudOptions?: SelectableValue[];
+  onCredentialsChange: (updatedCredentials: AzureCredentials) => void;
+  disabled?: boolean;
+  children?: JSX.Element;
+}
+
+export const AzureCredentialsForm = (props: Props) => {
+  const {
+    credentials,
+    azureCloudOptions,
+    legacyAzureCloudOptions,
+    onCredentialsChange,
+    disabled,
+    managedIdentityEnabled,
+    workloadIdentityEnabled,
+    userIdentityEnabled,
+  } = props;
+
+  const authTypeOptions = useMemo(() => {
+    let opts: Array<SelectableValue<AzureAuthType>> = [
+      {
+        value: 'clientsecret',
+        label: 'App Registration',
+      },
+    ];
+
+    if (managedIdentityEnabled) {
+      opts.push({
+        value: 'msi',
+        label: 'Managed Identity',
+      });
+    }
+
+    if (workloadIdentityEnabled) {
+      opts.push({
+        value: 'workloadidentity',
+        label: 'Workload Identity',
+      });
+    }
+
+    if (userIdentityEnabled) {
+      opts.unshift({
+        value: 'currentuser',
+        label: 'Current User',
+      });
+    }
+
+    return opts;
+  }, [managedIdentityEnabled, workloadIdentityEnabled, userIdentityEnabled]);
+
+  const onAuthTypeChange = (selected: SelectableValue<AzureAuthType>) => {
+    const defaultAuthType = managedIdentityEnabled
+      ? 'msi'
+      : workloadIdentityEnabled
+        ? 'workloadidentity'
+        : userIdentityEnabled
+          ? 'currentuser'
+          : 'clientsecret';
+    const updated: AzureCredentials = {
+      ...credentials,
+      authType: selected.value || defaultAuthType,
+    };
+    onCredentialsChange(updated);
+  };
+
+  return (
+    <ConfigSection title="Authentication">
+      {authTypeOptions.length > 1 && (
+        <Field
+          label="Authentication"
+          description="Choose the type of authentication to Azure services"
+          data-testid={selectors.components.configEditor.authType.select}
+          htmlFor="authentication-type"
+        >
+          <Select
+            className="width-15"
+            value={authTypeOptions.find((opt) => opt.value === credentials.authType)}
+            options={authTypeOptions}
+            onChange={onAuthTypeChange}
+            disabled={disabled}
+          />
+        </Field>
+      )}
+      {credentials.authType === 'clientsecret' && (
+        <AppRegistrationCredentials
+          credentials={credentials}
+          azureCloudOptions={legacyAzureCloudOptions}
+          onCredentialsChange={onCredentialsChange}
+          disabled={disabled}
+        />
+      )}
+      {props.children}
+      {credentials.authType === 'currentuser' && (
+        <CurrentUserFallbackCredentials
+          credentials={credentials}
+          azureCloudOptions={azureCloudOptions}
+          onCredentialsChange={onCredentialsChange}
+          disabled={disabled}
+          managedIdentityEnabled={managedIdentityEnabled}
+          workloadIdentityEnabled={workloadIdentityEnabled}
+          userIdentityEnabled={userIdentityEnabled}
+        />
+      )}
+    </ConfigSection>
+  );
+};
+
+export default AzureCredentialsForm;
diff --git a/public/app/plugins/datasource/azuremonitor/components/ConfigEditor.test.tsx b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/ConfigEditor.test.tsx
similarity index 100%
rename from public/app/plugins/datasource/azuremonitor/components/ConfigEditor.test.tsx
rename to public/app/plugins/datasource/azuremonitor/components/ConfigEditor/ConfigEditor.test.tsx
diff --git a/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/ConfigEditor.tsx b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/ConfigEditor.tsx
new file mode 100644
index 0000000000000..5d2c138e4c962
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/ConfigEditor.tsx
@@ -0,0 +1,130 @@
+import React, { PureComponent } from 'react';
+
+import { DataSourcePluginOptionsEditorProps, SelectableValue, updateDatasourcePluginOption } from '@grafana/data';
+import { ConfigSection, DataSourceDescription } from '@grafana/experimental';
+import { getBackendSrv, getTemplateSrv, isFetchError, TemplateSrv, config } from '@grafana/runtime';
+import { Alert, Divider, SecureSocksProxySettings } from '@grafana/ui';
+
+import ResponseParser from '../../azure_monitor/response_parser';
+import {
+  AzureAPIResponse,
+  AzureDataSourceJsonData,
+  AzureDataSourceSecureJsonData,
+  AzureDataSourceSettings,
+  Subscription,
+} from '../../types';
+import { routeNames } from '../../utils/common';
+
+import { MonitorConfig } from './MonitorConfig';
+
+export type Props = DataSourcePluginOptionsEditorProps<AzureDataSourceJsonData, AzureDataSourceSecureJsonData>;
+
+interface ErrorMessage {
+  title: string;
+  description: string;
+  details?: string;
+}
+
+export interface State {
+  unsaved: boolean;
+  error?: ErrorMessage;
+}
+
+export class ConfigEditor extends PureComponent<Props, State> {
+  templateSrv: TemplateSrv = getTemplateSrv();
+  baseURL: string;
+
+  constructor(props: Props) {
+    super(props);
+
+    this.state = {
+      unsaved: false,
+    };
+    this.baseURL = `/api/datasources/${this.props.options.id}/resources/${routeNames.azureMonitor}/subscriptions`;
+  }
+
+  private updateOptions = (optionsFunc: (options: AzureDataSourceSettings) => AzureDataSourceSettings): void => {
+    const updated = optionsFunc(this.props.options);
+    this.props.onOptionsChange(updated);
+
+    this.setState({ unsaved: true });
+  };
+
+  private saveOptions = async (): Promise<void> => {
+    if (this.state.unsaved) {
+      await getBackendSrv()
+        .put(`/api/datasources/${this.props.options.id}`, this.props.options)
+        .then((result: { datasource: AzureDataSourceSettings }) => {
+          updateDatasourcePluginOption(this.props, 'version', result.datasource.version);
+        });
+
+      this.setState({ unsaved: false });
+    }
+  };
+
+  private getSubscriptions = async (): Promise<Array<SelectableValue<string>>> => {
+    await this.saveOptions();
+
+    const query = `?api-version=2019-03-01`;
+    try {
+      const result = await getBackendSrv()
+        .fetch<AzureAPIResponse<Subscription>>({
+          url: this.baseURL + query,
+          method: 'GET',
+        })
+        .toPromise();
+
+      this.setState({ error: undefined });
+      return ResponseParser.parseSubscriptionsForSelect(result);
+    } catch (err) {
+      if (isFetchError(err)) {
+        this.setState({
+          error: {
+            title: 'Error requesting subscriptions',
+            description: 'Could not request subscriptions from Azure. Check your credentials and try again.',
+            details: err?.data?.message,
+          },
+        });
+      }
+      return Promise.resolve([]);
+    }
+  };
+
+  render() {
+    const { options, onOptionsChange } = this.props;
+    const { error } = this.state;
+
+    return (
+      <>
+        <DataSourceDescription
+          dataSourceName="Azure Monitor"
+          docsLink="https://grafana.com/docs/grafana/latest/datasources/azure-monitor/"
+          hasRequiredFields
+        />
+        <Divider />
+        <MonitorConfig options={options} updateOptions={this.updateOptions} getSubscriptions={this.getSubscriptions} />
+        {error && (
+          <Alert severity="error" title={error.title}>
+            <p>{error.description}</p>
+            {error.details && <details style={{ whiteSpace: 'pre-wrap' }}>{error.details}</details>}
+          </Alert>
+        )}
+        {config.secureSocksDSProxyEnabled && (
+          <>
+            <Divider />
+            <ConfigSection
+              title="Additional settings"
+              description="Additional settings are optional settings that can be configured for more control over your data source. This includes Secure Socks Proxy."
+              isCollapsible={true}
+              isInitiallyOpen={options.jsonData.enableSecureSocksProxy !== undefined}
+            >
+              <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
+            </ConfigSection>
+          </>
+        )}
+      </>
+    );
+  }
+}
+
+export default ConfigEditor;
diff --git a/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/CurrentUserFallbackCredentials.test.tsx b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/CurrentUserFallbackCredentials.test.tsx
new file mode 100644
index 0000000000000..6d83fa80a3534
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/CurrentUserFallbackCredentials.test.tsx
@@ -0,0 +1,74 @@
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import React from 'react';
+
+import { config } from '@grafana/runtime';
+
+import { selectors } from '../../e2e/selectors';
+
+import CurrentUserFallbackCredentials, { Props } from './CurrentUserFallbackCredentials';
+
+const setup = (propsFunc?: (props: Props) => Props) => {
+  let props: Props = {
+    managedIdentityEnabled: true,
+    workloadIdentityEnabled: true,
+    userIdentityEnabled: true,
+    credentials: { authType: 'currentuser' },
+    azureCloudOptions: [
+      { value: 'AzureCloud', label: 'Azure' },
+      { value: 'AzureUSGovernment', label: 'Azure US Government' },
+      { value: 'AzureChinaCloud', label: 'Azure China' },
+    ],
+    onCredentialsChange: jest.fn(),
+  };
+
+  if (propsFunc) {
+    props = propsFunc(props);
+  }
+
+  return { ...render(<CurrentUserFallbackCredentials {...props} />), props };
+};
+
+jest.mock('@grafana/runtime', () => ({
+  ___esModule: true,
+  ...jest.requireActual('@grafana/runtime'),
+}));
+
+describe('CurrentUserFallbackCredentials', () => {
+  it('should render alert if fallback credentials disabled', async () => {
+    setup();
+
+    expect(screen.getByText('Fallback Credentials Disabled')).toBeInTheDocument();
+  });
+
+  it('should render component', async () => {
+    jest.mocked(config).azure.userIdentityFallbackCredentialsEnabled = true;
+    setup();
+
+    await waitFor(() =>
+      expect(
+        screen.queryByTestId(selectors.components.configEditor.serviceCredentialsEnabled.button)
+      ).toBeInTheDocument()
+    );
+  });
+
+  it('should enable service credentials', async () => {
+    jest.mocked(config).azure.userIdentityFallbackCredentialsEnabled = true;
+    const onCredentialsChange = jest.fn();
+    const { rerender, props } = setup((props) => ({
+      ...props,
+      onCredentialsChange,
+    }));
+
+    await waitFor(() => fireEvent.click(screen.getByLabelText('Enabled')));
+    expect(onCredentialsChange).toHaveBeenCalled();
+    expect(onCredentialsChange).toHaveBeenCalledWith({ authType: 'currentuser', serviceCredentialsEnabled: true });
+
+    rerender(
+      <CurrentUserFallbackCredentials
+        {...props}
+        credentials={{ ...props.credentials, serviceCredentialsEnabled: true }}
+      />
+    );
+    expect(screen.getByText('Authentication')).toBeInTheDocument();
+  });
+});
diff --git a/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/CurrentUserFallbackCredentials.tsx b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/CurrentUserFallbackCredentials.tsx
new file mode 100644
index 0000000000000..2341854b810fe
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/CurrentUserFallbackCredentials.tsx
@@ -0,0 +1,178 @@
+import React, { useMemo } from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { ConfigSection } from '@grafana/experimental';
+import { config } from '@grafana/runtime';
+import { Select, Field, RadioButtonGroup, Alert, Stack } from '@grafana/ui';
+
+import { instanceOfAzureCredential } from '../../credentials';
+import { selectors } from '../../e2e/selectors';
+import { AadCurrentUserCredentials, AzureAuthType, AzureCredentials } from '../../types';
+
+import { AppRegistrationCredentials } from './AppRegistrationCredentials';
+
+export interface Props {
+  managedIdentityEnabled: boolean;
+  workloadIdentityEnabled: boolean;
+  userIdentityEnabled: boolean;
+  credentials: AadCurrentUserCredentials;
+  azureCloudOptions?: SelectableValue[];
+  onCredentialsChange: (updatedCredentials: AzureCredentials) => void;
+  disabled?: boolean;
+  children?: JSX.Element;
+}
+
+export const CurrentUserFallbackCredentials = (props: Props) => {
+  const {
+    credentials,
+    azureCloudOptions,
+    onCredentialsChange,
+    disabled,
+    managedIdentityEnabled,
+    workloadIdentityEnabled,
+  } = props;
+
+  const authTypeOptions = useMemo(() => {
+    let opts: Array<SelectableValue<Exclude<AzureAuthType, 'currentuser'>>> = [
+      {
+        value: 'clientsecret',
+        label: 'App Registration',
+      },
+    ];
+
+    if (managedIdentityEnabled) {
+      opts.push({
+        value: 'msi',
+        label: 'Managed Identity',
+      });
+    }
+
+    if (workloadIdentityEnabled) {
+      opts.push({
+        value: 'workloadidentity',
+        label: 'Workload Identity',
+      });
+    }
+
+    return opts;
+  }, [managedIdentityEnabled, workloadIdentityEnabled]);
+
+  const onAuthTypeChange = (selected: SelectableValue<Exclude<AzureAuthType, 'currentuser'>>) => {
+    const defaultAuthType = managedIdentityEnabled
+      ? 'msi'
+      : workloadIdentityEnabled
+        ? 'workloadidentity'
+        : 'clientsecret';
+    const updated: AadCurrentUserCredentials = {
+      ...credentials,
+      serviceCredentials: {
+        authType: selected.value || defaultAuthType,
+      },
+    };
+    onCredentialsChange(updated);
+  };
+
+  const onServiceCredentialsEnabledChange = (value: boolean) => {
+    let updated: AzureCredentials = {
+      ...credentials,
+      serviceCredentialsEnabled: value,
+    };
+    if (!value) {
+      updated = { ...updated, serviceCredentials: undefined };
+    }
+    onCredentialsChange(updated);
+  };
+
+  const onServiceCredentialsChange = (serviceCredentials: AzureCredentials) => {
+    if (!instanceOfAzureCredential('currentuser', serviceCredentials)) {
+      onCredentialsChange({ ...credentials, serviceCredentials: serviceCredentials });
+    }
+  };
+
+  if (!config.azure.userIdentityFallbackCredentialsEnabled) {
+    return (
+      <Alert severity="info" title="Fallback Credentials Disabled">
+        <>
+          Fallback credentials have been disabled. As user-based authentication only inherently supports requests with a
+          user in scope, features such as alerting, recorded queries, or reporting will not function as expected. Please
+          review the{' '}
+          <a
+            href="https://grafana.com/docs/grafana/latest/datasources/azuremonitor/deprecated-application-insights/"
+            target="_blank"
+            rel="noreferrer"
+          >
+            documentation
+          </a>{' '}
+          for more details.
+        </>
+      </Alert>
+    );
+  }
+
+  return (
+    <ConfigSection title="Fallback Service Credentials" isCollapsible={true}>
+      <Alert severity="info" title="Service Credentials">
+        <Stack direction={'column'}>
+          <div>
+            User-based authentication does not inherently support Grafana features that make requests to the data source
+            without a users details available to the request. An example of this is alerting. If you wish to ensure that
+            features that do not have a user in the context of the request still function, please provide fallback
+            credentials below.
+          </div>
+          <div>
+            <b>
+              Note: Features like alerting will be restricted to the access level of the fallback credentials rather
+              than the user. This may present confusion for users and should be clarified.
+            </b>
+          </div>
+        </Stack>
+      </Alert>
+      <Field
+        label="Service Credentials"
+        description="Choose if fallback service credentials are enabled or disabled for this data source"
+        data-testid={selectors.components.configEditor.serviceCredentialsEnabled.button}
+      >
+        <RadioButtonGroup
+          options={[
+            { label: 'Enabled', value: true },
+            { label: 'Disabled', value: false },
+          ]}
+          value={credentials.serviceCredentialsEnabled ?? false}
+          size={'md'}
+          onChange={(val) => onServiceCredentialsEnabledChange(val)}
+        />
+      </Field>
+      {credentials.serviceCredentialsEnabled ? (
+        <>
+          {authTypeOptions.length > 0 && (
+            <Field
+              label="Authentication"
+              description="Choose the type of authentication to Azure services"
+              data-testid={selectors.components.configEditor.authType.select}
+              htmlFor="authentication-type"
+            >
+              <Select
+                className="width-15"
+                value={authTypeOptions.find((opt) => opt.value === credentials.serviceCredentials?.authType)}
+                options={authTypeOptions}
+                onChange={onAuthTypeChange}
+                disabled={disabled}
+              />
+            </Field>
+          )}
+          {credentials.serviceCredentials?.authType === 'clientsecret' && (
+            <AppRegistrationCredentials
+              credentials={credentials.serviceCredentials}
+              azureCloudOptions={azureCloudOptions}
+              onCredentialsChange={onServiceCredentialsChange}
+              disabled={disabled}
+            />
+          )}
+        </>
+      ) : null}
+      {props.children}
+    </ConfigSection>
+  );
+};
+
+export default CurrentUserFallbackCredentials;
diff --git a/public/app/plugins/datasource/azuremonitor/components/DefaultSubscription.test.tsx b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/DefaultSubscription.test.tsx
similarity index 94%
rename from public/app/plugins/datasource/azuremonitor/components/DefaultSubscription.test.tsx
rename to public/app/plugins/datasource/azuremonitor/components/ConfigEditor/DefaultSubscription.test.tsx
index 7fff646bb5d07..9b5904684cd5d 100644
--- a/public/app/plugins/datasource/azuremonitor/components/DefaultSubscription.test.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/DefaultSubscription.test.tsx
@@ -2,8 +2,8 @@ import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { createMockInstanceSetttings } from '../__mocks__/instanceSettings';
-import { selectors } from '../e2e/selectors';
+import { createMockInstanceSetttings } from '../../__mocks__/instanceSettings';
+import { selectors } from '../../e2e/selectors';
 
 import { DefaultSubscription, Props } from './DefaultSubscription';
 
diff --git a/public/app/plugins/datasource/azuremonitor/components/DefaultSubscription.tsx b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/DefaultSubscription.tsx
similarity index 94%
rename from public/app/plugins/datasource/azuremonitor/components/DefaultSubscription.tsx
rename to public/app/plugins/datasource/azuremonitor/components/ConfigEditor/DefaultSubscription.tsx
index 939852ca87684..c7bc2b33bf8be 100644
--- a/public/app/plugins/datasource/azuremonitor/components/DefaultSubscription.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/DefaultSubscription.tsx
@@ -3,9 +3,9 @@ import React, { useEffect, useReducer } from 'react';
 import { SelectableValue } from '@grafana/data';
 import { Select, Button, Field } from '@grafana/ui';
 
-import { isCredentialsComplete } from '../credentials';
-import { selectors } from '../e2e/selectors';
-import { AzureCredentials, AzureDataSourceJsonData } from '../types';
+import { isCredentialsComplete } from '../../credentials';
+import { selectors } from '../../e2e/selectors';
+import { AzureCredentials, AzureDataSourceJsonData } from '../../types';
 
 export interface Props {
   options: AzureDataSourceJsonData;
diff --git a/public/app/plugins/datasource/azuremonitor/components/MonitorConfig.tsx b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/MonitorConfig.tsx
similarity index 76%
rename from public/app/plugins/datasource/azuremonitor/components/MonitorConfig.tsx
rename to public/app/plugins/datasource/azuremonitor/components/ConfigEditor/MonitorConfig.tsx
index 31d87064227b2..8a2dd69128453 100644
--- a/public/app/plugins/datasource/azuremonitor/components/MonitorConfig.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/MonitorConfig.tsx
@@ -1,20 +1,28 @@
 import React, { useMemo, useState } from 'react';
+import { useEffectOnce } from 'react-use';
 
 import { SelectableValue } from '@grafana/data';
 import { config } from '@grafana/runtime';
 
-import { getCredentials, updateCredentials } from '../credentials';
-import { AzureDataSourceSettings, AzureCredentials } from '../types';
+import { getCredentials, updateCredentials } from '../../credentials';
+import { AzureDataSourceSettings, AzureCredentials } from '../../types';
 
 import { AzureCredentialsForm } from './AzureCredentialsForm';
 import { DefaultSubscription } from './DefaultSubscription';
 
-const azureClouds: SelectableValue[] = [
+const legacyAzureClouds: SelectableValue[] = [
   { value: 'azuremonitor', label: 'Azure' },
   { value: 'govazuremonitor', label: 'Azure US Government' },
   { value: 'chinaazuremonitor', label: 'Azure China' },
 ];
 
+// This will be pulled from the azure-sdk in future
+const azureClouds: SelectableValue[] = [
+  { value: 'AzureCloud', label: 'Azure' },
+  { value: 'AzureUSGovernment', label: 'Azure US Government' },
+  { value: 'AzureChinaCloud', label: 'Azure China' },
+];
+
 export interface Props {
   options: AzureDataSourceSettings;
   updateOptions: (optionsFunc: (options: AzureDataSourceSettings) => AzureDataSourceSettings) => void;
@@ -41,13 +49,22 @@ export const MonitorConfig = (props: Props) => {
   const onSubscriptionChange = (subscriptionId?: string) =>
     updateOptions((options) => ({ ...options, jsonData: { ...options.jsonData, subscriptionId } }));
 
+  // The auth type needs to be set on the first load of the data source
+  useEffectOnce(() => {
+    if (!options.jsonData.authType) {
+      onCredentialsChange(credentials);
+    }
+  });
+
   return (
     <>
       <AzureCredentialsForm
         managedIdentityEnabled={config.azure.managedIdentityEnabled}
         workloadIdentityEnabled={config.azure.workloadIdentityEnabled}
+        userIdentityEnabled={config.azure.userIdentityEnabled}
         credentials={credentials}
         azureCloudOptions={azureClouds}
+        legacyAzureCloudOptions={legacyAzureClouds}
         onCredentialsChange={onCredentialsChange}
         disabled={props.options.readOnly}
       >
diff --git a/public/app/plugins/datasource/azuremonitor/components/AzureCheatSheet.tsx b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/AzureCheatSheet.tsx
similarity index 98%
rename from public/app/plugins/datasource/azuremonitor/components/AzureCheatSheet.tsx
rename to public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/AzureCheatSheet.tsx
index 7611ad31c924f..5bbe2b899370e 100644
--- a/public/app/plugins/datasource/azuremonitor/components/AzureCheatSheet.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/AzureCheatSheet.tsx
@@ -15,7 +15,7 @@ import {
   useStyles2,
 } from '@grafana/ui';
 
-import AzureLogAnalyticsDatasource from '../azure_log_analytics/azure_log_analytics_datasource';
+import AzureLogAnalyticsDatasource from '../../azure_log_analytics/azure_log_analytics_datasource';
 import {
   AzureMonitorQuery,
   AzureQueryType,
@@ -23,7 +23,7 @@ import {
   CheatsheetQueries,
   CheatsheetQuery,
   DropdownCategories,
-} from '../types';
+} from '../../types';
 
 import { RawQuery } from './RawQuery';
 import tokenizer from './syntax';
@@ -60,8 +60,8 @@ const AzureCheatSheet = (props: AzureCheatSheetProps) => {
         return a.displayName.toLowerCase() === b.displayName.toLowerCase()
           ? 0
           : a.displayName.toLowerCase() < b.displayName.toLowerCase()
-          ? -1
-          : 1;
+            ? -1
+            : 1;
       });
       const alphabetizedQueries = result.categories.reduce(
         (queriesByCategory: CheatsheetQueries, category: Category) => {
diff --git a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/AzureCheatSheetModal.tsx b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/AzureCheatSheetModal.tsx
index a629823368a34..3df12d38a8c0c 100644
--- a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/AzureCheatSheetModal.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/AzureCheatSheetModal.tsx
@@ -5,7 +5,8 @@ import { Modal } from '@grafana/ui';
 
 import AzureLogAnalyticsDatasource from '../../azure_log_analytics/azure_log_analytics_datasource';
 import { AzureMonitorQuery } from '../../dataquery.gen';
-import AzureCheatSheet from '../AzureCheatSheet';
+
+import AzureCheatSheet from './AzureCheatSheet';
 
 type Props = {
   isOpen: boolean;
diff --git a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsQueryEditor.tsx b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsQueryEditor.tsx
index 5bea85d8ea473..96a321c9e63ee 100644
--- a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsQueryEditor.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsQueryEditor.tsx
@@ -7,10 +7,10 @@ import { Alert, LinkButton } from '@grafana/ui';
 import Datasource from '../../datasource';
 import { selectors } from '../../e2e/selectors';
 import { AzureMonitorErrorish, AzureMonitorOption, AzureMonitorQuery, ResultFormat, EngineSchema } from '../../types';
-import FormatAsField from '../FormatAsField';
 import ResourceField from '../ResourceField';
 import { ResourceRow, ResourceRowGroup, ResourceRowType } from '../ResourcePicker/types';
 import { parseResourceDetails } from '../ResourcePicker/utils';
+import FormatAsField from '../shared/FormatAsField';
 
 import AdvancedResourcePicker from './AdvancedResourcePicker';
 import QueryField from './QueryField';
diff --git a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/QueryField.tsx b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/QueryField.tsx
index 2311c73342260..2c978f0a8f5ac 100644
--- a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/QueryField.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/QueryField.tsx
@@ -1,5 +1,4 @@
-import { EngineSchema, Schema } from '@kusto/monaco-kusto';
-import { Uri } from 'monaco-editor';
+import { EngineSchema, getKustoWorker } from '@kusto/monaco-kusto';
 import React, { useCallback, useEffect, useState } from 'react';
 
 import { CodeEditor, Monaco, MonacoEditor } from '@grafana/ui';
@@ -13,16 +12,6 @@ interface MonacoEditorValues {
   monaco: Monaco;
 }
 
-interface MonacoLanguages {
-  kusto: {
-    getKustoWorker: () => Promise<
-      (url: Uri) => Promise<{
-        setSchema: (schema: Schema) => void;
-      }>
-    >;
-  };
-}
-
 const QueryField = ({ query, onQueryChange, schema }: AzureQueryEditorFieldProps) => {
   const [monaco, setMonaco] = useState<MonacoEditorValues | undefined>();
 
@@ -33,10 +22,9 @@ const QueryField = ({ query, onQueryChange, schema }: AzureQueryEditorFieldProps
 
     const setupEditor = async ({ monaco, editor }: MonacoEditorValues, schema: EngineSchema) => {
       try {
-        const languages = monaco.languages as unknown as MonacoLanguages;
         const model = editor.getModel();
         if (model) {
-          const kustoWorker = await languages.kusto.getKustoWorker();
+          const kustoWorker = await getKustoWorker();
           const kustoMode = await kustoWorker(model?.uri);
           await kustoMode.setSchema(schema);
         }
diff --git a/public/app/plugins/datasource/azuremonitor/components/RawQuery.tsx b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/RawQuery.tsx
similarity index 100%
rename from public/app/plugins/datasource/azuremonitor/components/RawQuery.tsx
rename to public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/RawQuery.tsx
diff --git a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/TimeManagement.tsx b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/TimeManagement.tsx
index f4432719ace8e..a97bea313bd60 100644
--- a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/TimeManagement.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/TimeManagement.tsx
@@ -123,10 +123,10 @@ export function TimeManagement({ query, onQueryChange: onChange, schema }: Azure
               query.azureLogAnalytics?.timeColumn
                 ? query.azureLogAnalytics?.timeColumn
                 : defaultTimeColumns
-                ? defaultTimeColumns[0]
-                : timeColumns
-                ? timeColumns[0]
-                : { value: 'TimeGenerated', label: 'TimeGenerated' }
+                  ? defaultTimeColumns[0]
+                  : timeColumns
+                    ? timeColumns[0]
+                    : { value: 'TimeGenerated', label: 'TimeGenerated' }
             }
             allowCustomValue
           />
diff --git a/public/app/plugins/datasource/azuremonitor/components/syntax.ts b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/syntax.ts
similarity index 100%
rename from public/app/plugins/datasource/azuremonitor/components/syntax.ts
rename to public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/syntax.ts
diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/AggregationField.tsx b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/AggregationField.tsx
index 71981074a584b..f464a8ae92b9e 100644
--- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/AggregationField.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/AggregationField.tsx
@@ -5,7 +5,7 @@ import { Select } from '@grafana/ui';
 
 import { AzureQueryEditorFieldProps, AzureMonitorOption } from '../../types';
 import { addValueToOptions } from '../../utils/common';
-import { Field } from '../Field';
+import { Field } from '../shared/Field';
 
 import { setAggregation } from './setQueryValue';
 
diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/DimensionFields.test.tsx b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/DimensionFields.test.tsx
index 913a37be6f686..f0ea59df1eefc 100644
--- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/DimensionFields.test.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/DimensionFields.test.tsx
@@ -2,11 +2,11 @@ import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { openMenu } from 'react-select-event';
-import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
 
 import createMockDatasource from '../../__mocks__/datasource';
 import createMockPanelData from '../../__mocks__/panelData';
 import createMockQuery from '../../__mocks__/query';
+import { selectOptionInTest } from '../../utils/testUtils';
 
 import DimensionFields from './DimensionFields';
 import { appendDimensionFilter, setDimensionFilterValue } from './setQueryValue';
diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/DimensionFields.tsx b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/DimensionFields.tsx
index 8e2d227ba0532..68fde041f7077 100644
--- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/DimensionFields.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/DimensionFields.tsx
@@ -5,7 +5,7 @@ import { EditorList, AccessoryButton } from '@grafana/experimental';
 import { Select, HorizontalGroup, MultiSelect } from '@grafana/ui';
 
 import { AzureMetricDimension, AzureMonitorOption, AzureMonitorQuery, AzureQueryEditorFieldProps } from '../../types';
-import { Field } from '../Field';
+import { Field } from '../shared/Field';
 
 import { setDimensionFilters } from './setQueryValue';
 
diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/LegendFormatField.tsx b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/LegendFormatField.tsx
index 1dbbb9b8c8a0a..142fea281670b 100644
--- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/LegendFormatField.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/LegendFormatField.tsx
@@ -3,7 +3,7 @@ import React, { useCallback, useState } from 'react';
 import { Input } from '@grafana/ui';
 
 import { AzureQueryEditorFieldProps } from '../../types';
-import { Field } from '../Field';
+import { Field } from '../shared/Field';
 
 import { setLegendAlias } from './setQueryValue';
 
diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricNameField.tsx b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricNameField.tsx
index a3f19d87bb0f0..e4d0fcd4ef392 100644
--- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricNameField.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricNameField.tsx
@@ -6,7 +6,7 @@ import { Select } from '@grafana/ui';
 import { selectors } from '../../e2e/selectors';
 import { AzureQueryEditorFieldProps, AzureMonitorOption } from '../../types';
 import { addValueToOptions } from '../../utils/common';
-import { Field } from '../Field';
+import { Field } from '../shared/Field';
 
 import { setMetricName } from './setQueryValue';
 
diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricNamespaceField.tsx b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricNamespaceField.tsx
index c82bdfda94c48..36abff0a15d62 100644
--- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricNamespaceField.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricNamespaceField.tsx
@@ -5,7 +5,7 @@ import { Select } from '@grafana/ui';
 
 import { AzureQueryEditorFieldProps, AzureMonitorOption } from '../../types';
 import { addValueToOptions } from '../../utils/common';
-import { Field } from '../Field';
+import { Field } from '../shared/Field';
 
 import { setCustomNamespace } from './setQueryValue';
 
diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx
index 03c0d4dddf2d9..b5bfa0f27b1f8 100644
--- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx
@@ -1,7 +1,6 @@
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
-import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
 
 import createMockDatasource from '../../__mocks__/datasource';
 import { createMockInstanceSetttings } from '../../__mocks__/instanceSettings';
@@ -14,6 +13,7 @@ import {
 } from '../../__mocks__/resourcePickerRows';
 import { selectors } from '../../e2e/selectors';
 import ResourcePickerData from '../../resourcePicker/resourcePickerData';
+import { selectOptionInTest } from '../../utils/testUtils';
 
 import MetricsQueryEditor from './MetricsQueryEditor';
 
diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/TimeGrainField.tsx b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/TimeGrainField.tsx
index 5e7cd0c807296..9739f1bd4cf7a 100644
--- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/TimeGrainField.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/TimeGrainField.tsx
@@ -6,7 +6,7 @@ import { Select } from '@grafana/ui';
 import TimegrainConverter from '../../time_grain_converter';
 import { AzureQueryEditorFieldProps, AzureMonitorOption } from '../../types';
 import { addValueToOptions } from '../../utils/common';
-import { Field } from '../Field';
+import { Field } from '../shared/Field';
 
 import { setTimeGrain } from './setQueryValue';
 
diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/TopField.tsx b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/TopField.tsx
index e3f0254635bc4..3996b02fce3c1 100644
--- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/TopField.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/TopField.tsx
@@ -3,7 +3,7 @@ import React, { useCallback, useState } from 'react';
 import { Input } from '@grafana/ui';
 
 import { AzureQueryEditorFieldProps } from '../../types';
-import { Field } from '../Field';
+import { Field } from '../shared/Field';
 
 import { setTop } from './setQueryValue';
 
diff --git a/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.test.tsx b/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.test.tsx
index 18621f8bbf4b7..fe200de067870 100644
--- a/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.test.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.test.tsx
@@ -1,7 +1,8 @@
 import { render, screen, waitFor } from '@testing-library/react';
 import React from 'react';
-import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
 
+import { CoreApp } from '@grafana/data';
+import { config } from '@grafana/runtime';
 import * as ui from '@grafana/ui';
 
 import createMockDatasource from '../../__mocks__/datasource';
@@ -9,6 +10,7 @@ import { invalidNamespaceError } from '../../__mocks__/errors';
 import createMockQuery from '../../__mocks__/query';
 import { selectors } from '../../e2e/selectors';
 import { AzureQueryType } from '../../types';
+import { selectOptionInTest } from '../../utils/testUtils';
 
 import QueryEditor from './QueryEditor';
 
@@ -20,6 +22,11 @@ jest.mock('@grafana/ui', () => ({
   },
 }));
 
+jest.mock('@grafana/runtime', () => ({
+  ___esModule: true,
+  ...jest.requireActual('@grafana/runtime'),
+}));
+
 describe('Azure Monitor QueryEditor', () => {
   it('renders the Metrics query editor when the query type is Metrics', async () => {
     const mockDatasource = createMockDatasource();
@@ -121,4 +128,76 @@ describe('Azure Monitor QueryEditor', () => {
       expect(screen.getByTestId('data-testid azure-monitor-experimental-header')).toBeInTheDocument()
     );
   });
+
+  it('renders the Metrics query editor when the data source is configured for user auth and the user is authenticated with Azure', async () => {
+    jest.mocked(config).bootData.user.authenticatedBy = 'oauth_azuread';
+    const mockDatasource = createMockDatasource({ currentUserAuth: true });
+    const mockQuery = {
+      ...createMockQuery(),
+      queryType: AzureQueryType.AzureMonitor,
+    };
+
+    render(<QueryEditor query={mockQuery} datasource={mockDatasource} onChange={() => {}} onRunQuery={() => {}} />);
+    await waitFor(() =>
+      expect(
+        screen.getByTestId(selectors.components.queryEditor.metricsQueryEditor.container.input)
+      ).toBeInTheDocument()
+    );
+  });
+
+  it('renders the user auth alert when the data source is configured for user auth and the user is not authenticated with Azure', async () => {
+    jest.mocked(config).bootData.user.authenticatedBy = 'not_azuread';
+    const mockDatasource = createMockDatasource({ currentUserAuth: true });
+    const mockQuery = {
+      ...createMockQuery(),
+      queryType: AzureQueryType.AzureMonitor,
+    };
+
+    render(<QueryEditor query={mockQuery} datasource={mockDatasource} onChange={() => {}} onRunQuery={() => {}} />);
+    await waitFor(() => expect(screen.getByTestId(selectors.components.queryEditor.userAuthAlert)).toBeInTheDocument());
+  });
+
+  it('renders the user auth fallback alert when the data source is configured for user auth and fallback credentials are disabled', async () => {
+    jest.mocked(config).azure.userIdentityFallbackCredentialsEnabled = false;
+    const mockDatasource = createMockDatasource({ currentUserAuth: true });
+    const mockQuery = {
+      ...createMockQuery(),
+      queryType: AzureQueryType.AzureMonitor,
+    };
+
+    render(
+      <QueryEditor
+        app={CoreApp.UnifiedAlerting}
+        query={mockQuery}
+        datasource={mockDatasource}
+        onChange={() => {}}
+        onRunQuery={() => {}}
+      />
+    );
+    await waitFor(() =>
+      expect(screen.getByTestId(selectors.components.queryEditor.userAuthFallbackAlert)).toBeInTheDocument()
+    );
+  });
+
+  it('renders the user auth fallback alert when the data source is configured for user auth and fallback credentials are enabled but the data source has none', async () => {
+    jest.mocked(config).azure.userIdentityFallbackCredentialsEnabled = true;
+    const mockDatasource = createMockDatasource({ currentUserAuth: true });
+    const mockQuery = {
+      ...createMockQuery(),
+      queryType: AzureQueryType.AzureMonitor,
+    };
+
+    render(
+      <QueryEditor
+        app={CoreApp.UnifiedAlerting}
+        query={mockQuery}
+        datasource={mockDatasource}
+        onChange={() => {}}
+        onRunQuery={() => {}}
+      />
+    );
+    await waitFor(() =>
+      expect(screen.getByTestId(selectors.components.queryEditor.userAuthFallbackAlert)).toBeInTheDocument()
+    );
+  });
 });
diff --git a/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.tsx b/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.tsx
index 3e9b85d3fd46f..962390989826e 100644
--- a/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.tsx
@@ -2,11 +2,12 @@ import { css } from '@emotion/css';
 import { debounce } from 'lodash';
 import React, { useCallback, useMemo, useState } from 'react';
 
-import { QueryEditorProps } from '@grafana/data';
-import { reportInteraction } from '@grafana/runtime';
-import { Alert, Button, CodeEditor } from '@grafana/ui';
+import { CoreApp, QueryEditorProps } from '@grafana/data';
+import { config, reportInteraction } from '@grafana/runtime';
+import { Alert, Button, CodeEditor, Space } from '@grafana/ui';
 
 import AzureMonitorDatasource from '../../datasource';
+import { selectors } from '../../e2e/selectors';
 import {
   AzureDataSourceJsonData,
   AzureMonitorErrorish,
@@ -19,10 +20,9 @@ import ArgQueryEditor from '../ArgQueryEditor';
 import LogsQueryEditor from '../LogsQueryEditor';
 import { AzureCheatSheetModal } from '../LogsQueryEditor/AzureCheatSheetModal';
 import NewMetricsQueryEditor from '../MetricsQueryEditor/MetricsQueryEditor';
-import { QueryHeader } from '../QueryHeader';
-import { Space } from '../Space';
 import TracesQueryEditor from '../TracesQueryEditor';
 
+import { QueryHeader } from './QueryHeader';
 import usePreparedQuery from './usePreparedQuery';
 
 export type AzureMonitorQueryEditorProps = QueryEditorProps<
@@ -32,6 +32,7 @@ export type AzureMonitorQueryEditorProps = QueryEditorProps<
 >;
 
 const QueryEditor = ({
+  app,
   query: baseQuery,
   datasource,
   onChange,
@@ -59,6 +60,20 @@ const QueryEditor = ({
     options: datasource.getVariables().map((v) => ({ label: v, value: v })),
   };
 
+  const isAzureAuthenticated = config.bootData.user.authenticatedBy === 'oauth_azuread';
+
+  if (datasource.currentUserAuth) {
+    if (
+      app === CoreApp.UnifiedAlerting &&
+      (!config.azure.userIdentityFallbackCredentialsEnabled || !datasource.currentUserAuthFallbackAvailable)
+    ) {
+      return <UserAuthFallbackAlert />;
+    }
+    if (!isAzureAuthenticated) {
+      return <UserAuthAlert />;
+    }
+  }
+
   return (
     <div data-testid="azure-monitor-query-editor">
       <AzureCheatSheetModal
@@ -186,7 +201,7 @@ const EditorForQueryType = ({
             <>
               {type} was deprecated in Grafana 9. See the{' '}
               <a
-                href="https://grafana.com/docs/grafana/latest/datasources/azuremonitor/deprecated-application-insights/"
+                href="https://grafana.com/docs/grafana/latest/datasources/azure-monitor/#application-insights-and-insights-analytics-removed"
                 target="_blank"
                 rel="noreferrer"
               >
@@ -201,4 +216,45 @@ const EditorForQueryType = ({
   }
 };
 
+const UserAuthAlert = () => {
+  return (
+    <Alert title="Unsupported authentication provider" data-testid={selectors.components.queryEditor.userAuthAlert}>
+      <>
+        Usage of this data source requires you to be authenticated via Azure Entra (formerly Azure Active Directory).
+        Please review the{' '}
+        <a
+          href="https://grafana.com/docs/grafana/latest/datasources/azure-monitor/#configure-current-user-authentication"
+          target="_blank"
+          rel="noreferrer"
+        >
+          documentation
+        </a>{' '}
+        for more information.
+      </>
+    </Alert>
+  );
+};
+
+const UserAuthFallbackAlert = () => {
+  return (
+    <Alert
+      title="No fallback credentials available"
+      data-testid={selectors.components.queryEditor.userAuthFallbackAlert}
+    >
+      <>
+        Data source backend features (such as alerting) require service credentials to function. This data source is
+        configured without service credential fallback, or the fallback functionality is disabled. Please review the{' '}
+        <a
+          href="https://grafana.com/docs/grafana/latest/datasources/azure-monitor/#configure-current-user-authentication"
+          target="_blank"
+          rel="noreferrer"
+        >
+          documentation
+        </a>{' '}
+        for more information.
+      </>
+    </Alert>
+  );
+};
+
 export default QueryEditor;
diff --git a/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryHeader.tsx b/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryHeader.tsx
new file mode 100644
index 0000000000000..017d0c676706a
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryHeader.tsx
@@ -0,0 +1,49 @@
+import React, { useCallback } from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { EditorHeader, InlineSelect } from '@grafana/experimental';
+
+import { selectors } from '../../e2e/selectors';
+import { AzureMonitorQuery, AzureQueryType } from '../../types';
+
+interface QueryTypeFieldProps {
+  query: AzureMonitorQuery;
+  onQueryChange: (newQuery: AzureMonitorQuery) => void;
+}
+
+export const QueryHeader = ({ query, onQueryChange }: QueryTypeFieldProps) => {
+  const queryTypes: Array<{ value: AzureQueryType; label: string }> = [
+    { value: AzureQueryType.AzureMonitor, label: 'Metrics' },
+    { value: AzureQueryType.LogAnalytics, label: 'Logs' },
+    { value: AzureQueryType.AzureTraces, label: 'Traces' },
+    { value: AzureQueryType.AzureResourceGraph, label: 'Azure Resource Graph' },
+  ];
+
+  const handleChange = useCallback(
+    (change: SelectableValue<AzureQueryType>) => {
+      if (change.value && change.value !== query.queryType) {
+        onQueryChange({
+          refId: query.refId,
+          datasource: query.datasource,
+          queryType: change.value,
+        });
+      }
+    },
+    [onQueryChange, query]
+  );
+
+  return (
+    <span data-testid={selectors.components.queryEditor.header.select}>
+      <EditorHeader>
+        <InlineSelect
+          label="Service"
+          value={query.queryType}
+          placeholder="Service..."
+          allowCustomValue
+          options={queryTypes}
+          onChange={handleChange}
+        />
+      </EditorHeader>
+    </span>
+  );
+};
diff --git a/public/app/plugins/datasource/azuremonitor/components/QueryHeader.tsx b/public/app/plugins/datasource/azuremonitor/components/QueryHeader.tsx
deleted file mode 100644
index fd2f60578bfb7..0000000000000
--- a/public/app/plugins/datasource/azuremonitor/components/QueryHeader.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import React, { useCallback } from 'react';
-
-import { SelectableValue } from '@grafana/data';
-import { EditorHeader, InlineSelect } from '@grafana/experimental';
-
-import { selectors } from '../e2e/selectors';
-import { AzureMonitorQuery, AzureQueryType } from '../types';
-
-interface QueryTypeFieldProps {
-  query: AzureMonitorQuery;
-  onQueryChange: (newQuery: AzureMonitorQuery) => void;
-}
-
-export const QueryHeader = ({ query, onQueryChange }: QueryTypeFieldProps) => {
-  const queryTypes: Array<{ value: AzureQueryType; label: string }> = [
-    { value: AzureQueryType.AzureMonitor, label: 'Metrics' },
-    { value: AzureQueryType.LogAnalytics, label: 'Logs' },
-    { value: AzureQueryType.AzureTraces, label: 'Traces' },
-    { value: AzureQueryType.AzureResourceGraph, label: 'Azure Resource Graph' },
-  ];
-
-  const handleChange = useCallback(
-    (change: SelectableValue<AzureQueryType>) => {
-      if (change.value && change.value !== query.queryType) {
-        onQueryChange({
-          refId: query.refId,
-          datasource: query.datasource,
-          queryType: change.value,
-        });
-      }
-    },
-    [onQueryChange, query]
-  );
-
-  return (
-    <span data-testid={selectors.components.queryEditor.header.select}>
-      <EditorHeader>
-        <InlineSelect
-          label="Service"
-          value={query.queryType}
-          placeholder="Service..."
-          allowCustomValue
-          options={queryTypes}
-          onChange={handleChange}
-        />
-      </EditorHeader>
-    </span>
-  );
-};
diff --git a/public/app/plugins/datasource/azuremonitor/components/ResourceField/ResourceField.tsx b/public/app/plugins/datasource/azuremonitor/components/ResourceField/ResourceField.tsx
index 7c23c2f15b0d1..af946a07dc545 100644
--- a/public/app/plugins/datasource/azuremonitor/components/ResourceField/ResourceField.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/ResourceField/ResourceField.tsx
@@ -7,11 +7,11 @@ import Datasource from '../../datasource';
 import { selectors } from '../../e2e/selectors';
 import { ResourcePickerQueryType } from '../../resourcePicker/resourcePickerData';
 import { AzureQueryEditorFieldProps, AzureMonitorResource } from '../../types';
-import { Field } from '../Field';
 import ResourcePicker from '../ResourcePicker';
 import getStyles from '../ResourcePicker/styles';
 import { ResourceRow, ResourceRowGroup, ResourceRowType } from '../ResourcePicker/types';
 import { parseMultipleResourceDetails, setResources } from '../ResourcePicker/utils';
+import { Field } from '../shared/Field';
 
 interface ResourceFieldProps<T> extends AzureQueryEditorFieldProps {
   selectableEntryTypes: ResourceRowType[];
diff --git a/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/AdvancedMulti.tsx b/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/AdvancedMulti.tsx
index baa5389d05e13..fa4d7f68deffc 100644
--- a/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/AdvancedMulti.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/AdvancedMulti.tsx
@@ -1,10 +1,9 @@
 import React, { useState } from 'react';
 
-import { Collapse } from '@grafana/ui';
+import { Collapse, Space } from '@grafana/ui';
 
 import { selectors } from '../../e2e/selectors';
 import { AzureMonitorResource } from '../../types';
-import { Space } from '../Space';
 
 export interface ResourcePickerProps<T> {
   resources: T[];
diff --git a/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/NestedEntry.tsx b/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/NestedEntry.tsx
index 6d843e2f18b54..5b0bea5e2e1cf 100644
--- a/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/NestedEntry.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/NestedEntry.tsx
@@ -1,9 +1,7 @@
 import { cx } from '@emotion/css';
 import React, { useCallback, useEffect } from 'react';
 
-import { Checkbox, IconButton, useStyles2, useTheme2 } from '@grafana/ui';
-
-import { Space } from '../Space';
+import { Checkbox, IconButton, useStyles2, useTheme2, Space } from '@grafana/ui';
 
 import { EntryIcon } from './EntryIcon';
 import getStyles from './styles';
diff --git a/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/ResourcePicker.tsx b/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/ResourcePicker.tsx
index e4771a40216ab..0afb25e760f2c 100644
--- a/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/ResourcePicker.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/ResourcePicker.tsx
@@ -2,13 +2,12 @@ import { cx } from '@emotion/css';
 import React, { useCallback, useEffect, useState } from 'react';
 import { useEffectOnce } from 'react-use';
 
-import { Alert, Button, LoadingPlaceholder, Modal, useStyles2 } from '@grafana/ui';
+import { Alert, Button, LoadingPlaceholder, Modal, useStyles2, Space } from '@grafana/ui';
 
 import { selectors } from '../../e2e/selectors';
 import ResourcePickerData, { ResourcePickerQueryType } from '../../resourcePicker/resourcePickerData';
 import { AzureMonitorResource } from '../../types';
 import messageFromError from '../../utils/messageFromError';
-import { Space } from '../Space';
 
 import AdvancedMulti from './AdvancedMulti';
 import NestedRow from './NestedRow';
diff --git a/public/app/plugins/datasource/azuremonitor/components/Space.tsx b/public/app/plugins/datasource/azuremonitor/components/Space.tsx
deleted file mode 100644
index b1fd5e3392295..0000000000000
--- a/public/app/plugins/datasource/azuremonitor/components/Space.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { css, cx } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { stylesFactory, useTheme2 } from '@grafana/ui';
-
-export interface SpaceProps {
-  v?: number;
-  h?: number;
-  layout?: 'block' | 'inline';
-}
-
-export const Space = (props: SpaceProps) => {
-  const theme = useTheme2();
-  const styles = getStyles(theme, props);
-
-  return <span className={cx(styles.wrapper)} />;
-};
-
-Space.defaultProps = {
-  v: 0,
-  h: 0,
-  layout: 'block',
-};
-
-const getStyles = stylesFactory((theme: GrafanaTheme2, props: SpaceProps) => ({
-  wrapper: css([
-    {
-      paddingRight: theme.spacing(props.h ?? 0),
-      paddingBottom: theme.spacing(props.v ?? 0),
-    },
-    props.layout === 'inline' && {
-      display: 'inline-block',
-    },
-    props.layout === 'block' && {
-      display: 'block',
-    },
-  ]),
-}));
diff --git a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filter.tsx b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filter.tsx
index 3707f29a8ec6d..eaa0c47e5acbf 100644
--- a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filter.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filter.tsx
@@ -248,7 +248,6 @@ const Filter = (
         width={25}
       />
       <ButtonSelect<string>
-        placeholder="Operator"
         value={item.operation ? { label: item.operation === 'eq' ? '=' : '!=', value: item.operation } : undefined}
         options={[
           { label: '=', value: 'eq' },
diff --git a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filters.test.tsx b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filters.test.tsx
index 7b15cfc923c46..f8900303b67ce 100644
--- a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filters.test.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filters.test.tsx
@@ -3,15 +3,15 @@ import userEvent from '@testing-library/user-event';
 import { UserEvent } from '@testing-library/user-event/dist/types/setup/setup';
 import React from 'react';
 import { of } from 'rxjs';
-import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
 
-import { ArrayVector, CoreApp } from '@grafana/data';
+import { CoreApp } from '@grafana/data';
 
 import createMockDatasource from '../../__mocks__/datasource';
 import createMockQuery from '../../__mocks__/query';
 import { AzureQueryType } from '../../dataquery.gen';
 import Datasource from '../../datasource';
 import { AzureMonitorQuery } from '../../types';
+import { selectOptionInTest } from '../../utils/testUtils';
 
 import Filters from './Filters';
 import { setFilters } from './setQueryValue';
@@ -51,9 +51,6 @@ const addFilter = async (
   rerender: (ui: React.ReactElement) => void
 ) => {
   const { property, operation, index } = filter;
-  const resultVector = new ArrayVector([
-    `{"${property}":[${filter.filters.map(({ count, value }) => `{"${property}":"${value}", "count":${count}}`)}]}`,
-  ]);
   mockDatasource.azureLogAnalyticsDatasource.query = jest.fn().mockReturnValue(
     of({
       data: [
@@ -82,7 +79,11 @@ const addFilter = async (
                   },
                 ],
               },
-              values: resultVector,
+              values: [
+                `{"${property}":[${filter.filters.map(
+                  ({ count, value }) => `{"${property}":"${value}", "count":${count}}`
+                )}]}`,
+              ],
               entities: {},
             },
           ],
@@ -95,12 +96,10 @@ const addFilter = async (
 
   const operationLabel = operation === 'eq' ? '=' : '!=';
   const addFilter = await screen.findByLabelText('Add');
-  await act(() => {
-    userEvent.click(addFilter);
-    if (mockQuery.azureTraces?.filters && mockQuery.azureTraces.filters.length < 1) {
-      expect(onQueryChange).not.toHaveBeenCalled();
-    }
-  });
+  await userEvent.click(addFilter);
+  if (mockQuery.azureTraces?.filters && mockQuery.azureTraces.filters.length < 1) {
+    expect(onQueryChange).not.toHaveBeenCalled();
+  }
 
   await waitFor(() => expect(screen.getByText('Property')).toBeInTheDocument());
   const propertySelect = await screen.findByText('Property');
@@ -108,8 +107,9 @@ const addFilter = async (
   await waitFor(() => expect(screen.getByText(property)).toBeInTheDocument());
 
   await waitFor(() => expect(screen.getByText('Property')).toBeInTheDocument());
-  const operationSelect = await screen.getAllByText('=');
-  selectOptionInTest(operationSelect[index], operationLabel);
+  const operationSelect = await screen.findAllByText('=');
+  await userEvent.click(operationSelect[index]);
+  await userEvent.click(screen.getByRole('menuitemradio', { name: operationLabel }));
   await waitFor(() => expect(screen.getByText(operationLabel)).toBeInTheDocument());
 
   const valueSelect = await screen.findByText('Value');
@@ -160,8 +160,8 @@ const addFilter = async (
     ...(mockQuery.azureTraces?.filters ?? []),
     { property, operation, filters: values },
   ]);
+  await userEvent.type(valueSelect, '{Escape}');
   await waitFor(() => {
-    userEvent.type(valueSelect, '{Escape}');
     expect(onQueryChange).toHaveBeenCalledWith(newQuery);
   });
 
diff --git a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TraceTypeField.test.tsx b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TraceTypeField.test.tsx
index e5a7e076e5604..f590f6dc41302 100644
--- a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TraceTypeField.test.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TraceTypeField.test.tsx
@@ -24,11 +24,10 @@ describe('TraceTypeField', () => {
       ...props.query,
       azureTraces: {
         ...props.query.azureTraces,
-        traceTypes: [],
       },
     };
+
     render(<TraceTypeField {...props} query={query} />);
-    expect(screen.getByText('Choose event types')).toBeInTheDocument();
 
     const menu = screen.getByLabelText(selectors.components.queryEditor.tracesQueryEditor.traceTypes.select);
     openMenu(menu);
diff --git a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TraceTypeField.tsx b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TraceTypeField.tsx
index 9d5ca517013ec..ffb602a7436a2 100644
--- a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TraceTypeField.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TraceTypeField.tsx
@@ -6,7 +6,7 @@ import { MultiSelect } from '@grafana/ui';
 import { selectors } from '../../e2e/selectors';
 import { AzureQueryEditorFieldProps, AzureMonitorOption } from '../../types';
 import { findOptions } from '../../utils/common';
-import { Field } from '../Field';
+import { Field } from '../shared/Field';
 
 import { Tables } from './consts';
 import { setTraceTypes } from './setQueryValue';
@@ -30,12 +30,23 @@ const TraceTypeField = ({ query, variableOptionGroup, onQueryChange }: AzureQuer
 
   const options = useMemo(() => [...tables, variableOptionGroup], [tables, variableOptionGroup]);
 
+  // Select all trace event ypes by default
+  const getDefaultOptions = () => {
+    const allEventTypes = tables.map((t) => t.value);
+    const defaultQuery = setTraceTypes(query, allEventTypes);
+    onQueryChange(defaultQuery);
+    return allEventTypes;
+  };
+
   return (
     <Field label="Event Type">
       <MultiSelect
         placeholder="Choose event types"
         inputId="azure-monitor-traces-type-field"
-        value={findOptions([...tables, ...variableOptionGroup.options], query.azureTraces?.traceTypes ?? [])}
+        value={findOptions(
+          [...tables, ...variableOptionGroup.options],
+          query.azureTraces?.traceTypes ?? getDefaultOptions()
+        )}
         onChange={handleChange}
         options={options}
         allowCustomValue
diff --git a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TracesQueryEditor.tsx b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TracesQueryEditor.tsx
index 2c295ece8e603..d4303efe81965 100644
--- a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TracesQueryEditor.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TracesQueryEditor.tsx
@@ -8,12 +8,12 @@ import { Input } from '@grafana/ui';
 import Datasource from '../../datasource';
 import { selectors } from '../../e2e/selectors';
 import { AzureMonitorErrorish, AzureMonitorOption, AzureMonitorQuery, ResultFormat } from '../../types';
-import { Field } from '../Field';
-import FormatAsField from '../FormatAsField';
 import AdvancedResourcePicker from '../LogsQueryEditor/AdvancedResourcePicker';
 import ResourceField from '../ResourceField';
 import { ResourceRow, ResourceRowGroup, ResourceRowType } from '../ResourcePicker/types';
 import { parseResourceDetails } from '../ResourcePicker/utils';
+import { Field } from '../shared/Field';
+import FormatAsField from '../shared/FormatAsField';
 
 import Filters from './Filters';
 import TraceTypeField from './TraceTypeField';
diff --git a/public/app/plugins/datasource/azuremonitor/components/VariableEditor/VariableEditor.tsx b/public/app/plugins/datasource/azuremonitor/components/VariableEditor/VariableEditor.tsx
index 34b8141bcfde7..94a2e1b281a68 100644
--- a/public/app/plugins/datasource/azuremonitor/components/VariableEditor/VariableEditor.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/VariableEditor/VariableEditor.tsx
@@ -3,7 +3,7 @@ import React, { useEffect, useState } from 'react';
 import { useEffectOnce } from 'react-use';
 
 import { SelectableValue } from '@grafana/data';
-import { Alert, Field, Select } from '@grafana/ui';
+import { Alert, Field, Select, Space } from '@grafana/ui';
 
 import DataSource from '../../datasource';
 import { selectors } from '../../e2e/selectors';
@@ -12,7 +12,6 @@ import { AzureMonitorOption, AzureMonitorQuery, AzureQueryType } from '../../typ
 import useLastError from '../../utils/useLastError';
 import ArgQueryEditor from '../ArgQueryEditor';
 import LogsQueryEditor from '../LogsQueryEditor';
-import { Space } from '../Space';
 
 import GrafanaTemplateVariableFnInput from './GrafanaTemplateVariableFn';
 
diff --git a/public/app/plugins/datasource/azuremonitor/components/Field.tsx b/public/app/plugins/datasource/azuremonitor/components/shared/Field.tsx
similarity index 100%
rename from public/app/plugins/datasource/azuremonitor/components/Field.tsx
rename to public/app/plugins/datasource/azuremonitor/components/shared/Field.tsx
diff --git a/public/app/plugins/datasource/azuremonitor/components/FormatAsField.test.tsx b/public/app/plugins/datasource/azuremonitor/components/shared/FormatAsField.test.tsx
similarity index 89%
rename from public/app/plugins/datasource/azuremonitor/components/FormatAsField.test.tsx
rename to public/app/plugins/datasource/azuremonitor/components/shared/FormatAsField.test.tsx
index 944643e46a577..9ed897b3634f2 100644
--- a/public/app/plugins/datasource/azuremonitor/components/FormatAsField.test.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/shared/FormatAsField.test.tsx
@@ -1,12 +1,12 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 
-import createMockDatasource from '../__mocks__/datasource';
-import createMockQuery from '../__mocks__/query';
-import { ResultFormat } from '../types';
+import createMockDatasource from '../../__mocks__/datasource';
+import createMockQuery from '../../__mocks__/query';
+import { ResultFormat } from '../../types';
+import { setFormatAs } from '../TracesQueryEditor/setQueryValue';
 
 import FormatAsField from './FormatAsField';
-import { setFormatAs } from './TracesQueryEditor/setQueryValue';
 
 const options = [
   { label: 'Table', value: ResultFormat.Table },
diff --git a/public/app/plugins/datasource/azuremonitor/components/FormatAsField.tsx b/public/app/plugins/datasource/azuremonitor/components/shared/FormatAsField.tsx
similarity index 92%
rename from public/app/plugins/datasource/azuremonitor/components/FormatAsField.tsx
rename to public/app/plugins/datasource/azuremonitor/components/shared/FormatAsField.tsx
index 884edb0ec0bf8..ededa624ce823 100644
--- a/public/app/plugins/datasource/azuremonitor/components/FormatAsField.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/shared/FormatAsField.tsx
@@ -4,8 +4,8 @@ import { useEffectOnce } from 'react-use';
 import { SelectableValue } from '@grafana/data';
 import { Select } from '@grafana/ui';
 
-import { selectors } from '../e2e/selectors';
-import { FormatAsFieldProps, ResultFormat } from '../types';
+import { selectors } from '../../e2e/selectors';
+import { FormatAsFieldProps, ResultFormat } from '../../types';
 
 import { Field } from './Field';
 
diff --git a/public/app/plugins/datasource/azuremonitor/credentials.ts b/public/app/plugins/datasource/azuremonitor/credentials.ts
index 25ec5a4aa98a0..4879730330133 100644
--- a/public/app/plugins/datasource/azuremonitor/credentials.ts
+++ b/public/app/plugins/datasource/azuremonitor/credentials.ts
@@ -1,7 +1,9 @@
 import { config } from '@grafana/runtime';
 
 import {
+  AadCurrentUserCredentials,
   AzureAuthType,
+  AzureClientSecretCredentials,
   AzureCloud,
   AzureCredentials,
   AzureDataSourceInstanceSettings,
@@ -63,6 +65,7 @@ export function getAzureCloud(options: AzureDataSourceSettings | AzureDataSource
       // In case of managed identity and workload identity, the cloud is always same as where Grafana is hosted
       return getDefaultAzureCloud();
     case 'clientsecret':
+    case 'currentuser':
       return options.jsonData.cloudName || getDefaultAzureCloud();
   }
 }
@@ -77,18 +80,36 @@ function getSecret(options: AzureDataSourceSettings): undefined | string | Conce
   }
 }
 
-export function isCredentialsComplete(credentials: AzureCredentials): boolean {
+export function isCredentialsComplete(credentials: AzureCredentials, ignoreSecret = false): boolean {
   switch (credentials.authType) {
     case 'msi':
     case 'workloadidentity':
+    case 'currentuser':
       return true;
     case 'clientsecret':
-      return !!(credentials.azureCloud && credentials.tenantId && credentials.clientId && credentials.clientSecret);
+      return !!(
+        credentials.azureCloud &&
+        credentials.tenantId &&
+        credentials.clientId &&
+        // When ignoreSecret is set we consider the credentials complete without checking the secret
+        !!(ignoreSecret || credentials.clientSecret)
+      );
   }
 }
 
+export function instanceOfAzureCredential<T extends AzureCredentials>(
+  authType: AzureAuthType,
+  object?: AzureCredentials
+): object is T {
+  if (!object) {
+    return false;
+  }
+  return object.authType === authType;
+}
+
 export function getCredentials(options: AzureDataSourceSettings): AzureCredentials {
   const authType = getAuthType(options);
+  const credentials = options.jsonData.azureCredentials;
   switch (authType) {
     case 'msi':
     case 'workloadidentity':
@@ -109,13 +130,32 @@ export function getCredentials(options: AzureDataSourceSettings): AzureCredentia
       }
     case 'clientsecret':
       return {
-        authType: 'clientsecret',
+        authType,
         azureCloud: options.jsonData.cloudName || getDefaultAzureCloud(),
         tenantId: options.jsonData.tenantId,
         clientId: options.jsonData.clientId,
         clientSecret: getSecret(options),
       };
   }
+  if (instanceOfAzureCredential<AadCurrentUserCredentials>(authType, credentials)) {
+    if (instanceOfAzureCredential<AzureClientSecretCredentials>('clientsecret', credentials.serviceCredentials)) {
+      const serviceCredentials = { ...credentials.serviceCredentials, clientSecret: getSecret(options) };
+      return {
+        authType,
+        serviceCredentialsEnabled: credentials.serviceCredentialsEnabled,
+        serviceCredentials,
+      };
+    }
+    return {
+      authType,
+      serviceCredentialsEnabled: credentials.serviceCredentialsEnabled,
+      serviceCredentials: credentials.serviceCredentials,
+    };
+  }
+  return {
+    authType: 'clientsecret',
+    azureCloud: getDefaultAzureCloud(),
+  };
 }
 
 export function updateCredentials(
@@ -137,6 +177,7 @@ export function updateCredentials(
         jsonData: {
           ...options.jsonData,
           azureAuthType: credentials.authType,
+          azureCredentials: undefined,
         },
       };
 
@@ -147,10 +188,11 @@ export function updateCredentials(
         ...options,
         jsonData: {
           ...options.jsonData,
-          azureAuthType: 'clientsecret',
+          azureAuthType: credentials.authType,
           cloudName: credentials.azureCloud || getDefaultAzureCloud(),
           tenantId: credentials.tenantId,
           clientId: credentials.clientId,
+          azureCredentials: undefined,
         },
         secureJsonData: {
           ...options.secureJsonData,
@@ -161,7 +203,37 @@ export function updateCredentials(
           clientSecret: typeof credentials.clientSecret === 'symbol',
         },
       };
-
-      return options;
   }
+  if (instanceOfAzureCredential<AadCurrentUserCredentials>('currentuser', credentials)) {
+    const serviceCredentials = credentials.serviceCredentials;
+    let clientSecret: string | symbol | undefined;
+    if (instanceOfAzureCredential<AzureClientSecretCredentials>('clientsecret', serviceCredentials)) {
+      clientSecret = serviceCredentials.clientSecret;
+      // Do this to not expose the secret in unencrypted JSON data
+      delete serviceCredentials.clientSecret;
+    }
+    options = {
+      ...options,
+      jsonData: {
+        ...options.jsonData,
+        azureAuthType: credentials.authType,
+        azureCredentials: {
+          authType: 'currentuser',
+          serviceCredentialsEnabled: credentials.serviceCredentialsEnabled,
+          serviceCredentials,
+        },
+        oauthPassThru: true,
+        disableGrafanaCache: true,
+      },
+      secureJsonData: {
+        ...options.secureJsonData,
+        clientSecret: typeof clientSecret === 'string' ? clientSecret : undefined,
+      },
+      secureJsonFields: {
+        ...options.secureJsonFields,
+        clientSecret: typeof clientSecret === 'symbol',
+      },
+    };
+  }
+  return options;
 }
diff --git a/public/app/plugins/datasource/azuremonitor/dashboards/containerInsightsSyslog.json b/public/app/plugins/datasource/azuremonitor/dashboards/containerInsightsSyslog.json
new file mode 100644
index 0000000000000..6274a4a99f0f7
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/dashboards/containerInsightsSyslog.json
@@ -0,0 +1,1226 @@
+{
+  "__inputs": [],
+  "__elements": {},
+  "__requires": [
+    {
+      "type": "panel",
+      "id": "barchart",
+      "name": "Bar chart",
+      "version": ""
+    },
+    {
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "9.5.12"
+    },
+    {
+      "type": "datasource",
+      "id": "grafana-azure-monitor-datasource",
+      "name": "Azure Monitor",
+      "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "stat",
+      "name": "Stat",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "table",
+      "name": "Table",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "timeseries",
+      "name": "Time series",
+      "version": ""
+    }
+  ],
+  "description": "Dashboard visualizing Syslog records collected by Azure Monitor",
+  "editable": true,
+  "id": null,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "description": "",
+      "gridPos": {
+        "h": 7,
+        "w": 24,
+        "x": 0,
+        "y": 3
+      },
+      "id": 18,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "This dashboard visualizes Syslog data collected by Azure Monitor - Container Insights. Read more in the Syslog documentation here:   [aka.ms/CISyslog](https://aka.ms/CISyslog). \n\nIn case of issues, please ensure that \n1. An [Azure Monitor data source is configured](https://grafana.com/docs/grafana/latest/datasources/azure-monitor/#configure-the-data-source).\n2. [Syslog is enabled](https://aka.ms/cisyslog#how-to-enable-syslog) in Container Insights  \n3. You have chosen an *LAWorkspace* and *ClusterName* above which have Syslog data flowing. *Subscription* is selected automatically. \n4. The time range is correct \n\nRead more here: [aka.ms/CISyslogGrafana](https://aka.ms/CISyslogGrafana)",
+        "mode": "markdown"
+      },
+      "title": "Syslog ",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${DataSource}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "red",
+            "mode": "fixed"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 3,
+        "x": 0,
+        "y": 10
+      },
+      "id": 7,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["lastNotNull"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "Syslog \r\n| where SeverityLevel == \"emergency\"\r\n| where _ResourceId == tolower(\"$Cluster\")\r\n| summarize TotalErrors = count()\r\n",
+            "resources": ["$LAWorkspace"],
+            "resultFormat": "time_series"
+          },
+          "azureMonitor": {
+            "allowedTimeGrainsMs": [],
+            "timeGrain": "auto"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${DataSource}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A"
+        }
+      ],
+      "title": "Syslog Emergency",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${DataSource}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "red",
+            "mode": "fixed"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 3,
+        "x": 3,
+        "y": 10
+      },
+      "id": 8,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["lastNotNull"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "Syslog \r\n| where SeverityLevel == \"alert\"\r\n| where _ResourceId == tolower(\"$Cluster\")\r\n| summarize TotalErrors = count()\r\n",
+            "resources": ["$LAWorkspace"],
+            "resultFormat": "time_series"
+          },
+          "azureMonitor": {
+            "allowedTimeGrainsMs": [],
+            "timeGrain": "auto"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${DataSource}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A"
+        }
+      ],
+      "title": "Syslog Alert",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${DataSource}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "red",
+            "mode": "fixed"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 3,
+        "x": 6,
+        "y": 10
+      },
+      "id": 6,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["lastNotNull"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "Syslog \r\n| where SeverityLevel == \"error\"\r\n| where _ResourceId == tolower(\"$Cluster\")\r\n| summarize TotalErrors = count()\r\n",
+            "resources": ["$LAWorkspace"],
+            "resultFormat": "time_series"
+          },
+          "azureMonitor": {
+            "allowedTimeGrainsMs": [],
+            "timeGrain": "auto"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${DataSource}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A"
+        }
+      ],
+      "title": "Syslog Errors",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${DataSource}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "red",
+            "mode": "fixed"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 3,
+        "x": 9,
+        "y": 10
+      },
+      "id": 10,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["lastNotNull"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "Syslog \r\n| where SeverityLevel == \"warning\"\r\n| where _ResourceId == tolower(\"$Cluster\")\r\n| summarize TotalErrors = count()\r\n",
+            "resources": ["$LAWorkspace"],
+            "resultFormat": "time_series"
+          },
+          "azureMonitor": {
+            "allowedTimeGrainsMs": [],
+            "timeGrain": "auto"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${DataSource}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A"
+        }
+      ],
+      "title": "Syslog Warnings",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${DataSource}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "red",
+            "mode": "fixed"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 12,
+        "y": 10
+      },
+      "id": 9,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["lastNotNull"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "Syslog \r\n| where SeverityLevel == \"critical\"\r\n| where _ResourceId == tolower(\"$Cluster\")\r\n| summarize TotalErrors = count()\r\n",
+            "resources": ["$LAWorkspace"],
+            "resultFormat": "time_series"
+          },
+          "azureMonitor": {
+            "allowedTimeGrainsMs": [],
+            "timeGrain": "auto"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${DataSource}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A"
+        }
+      ],
+      "title": "Syslog Critical",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${DataSource}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "fixed"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 3,
+        "x": 16,
+        "y": 10
+      },
+      "id": 11,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["lastNotNull"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "Syslog \r\n| where SeverityLevel == \"notice\"\r\n| where _ResourceId == tolower(\"$Cluster\")\r\n| summarize TotalErrors = count()\r\n",
+            "resources": ["$LAWorkspace"],
+            "resultFormat": "time_series"
+          },
+          "azureMonitor": {
+            "allowedTimeGrainsMs": [],
+            "timeGrain": "auto"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${DataSource}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A"
+        }
+      ],
+      "title": "Syslog Notice",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${DataSource}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "fixed"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 5,
+        "x": 19,
+        "y": 10
+      },
+      "id": 12,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["lastNotNull"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "Syslog \r\n| where SeverityLevel == \"info\"\r\n| where _ResourceId == tolower(\"$Cluster\")\r\n| summarize TotalErrors = count()\r\n",
+            "resources": ["$LAWorkspace"],
+            "resultFormat": "time_series"
+          },
+          "azureMonitor": {
+            "allowedTimeGrainsMs": [],
+            "timeGrain": "auto"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${DataSource}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A"
+        }
+      ],
+      "title": "Syslog Informational",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${DataSource}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 15,
+        "w": 12,
+        "x": 0,
+        "y": 14
+      },
+      "id": 17,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "Syslog \r\n| where _ResourceId == tolower(\"$Cluster\")\r\n| summarize SyslogMessages = count() by bin(TimeGenerated, 30m), SeverityLevel\r\n| order by TimeGenerated asc, SeverityLevel\r\n| render barchart with (kind=stacked)",
+            "resources": ["$LAWorkspace"],
+            "resultFormat": "time_series"
+          },
+          "azureMonitor": {
+            "allowedTimeGrainsMs": [],
+            "timeGrain": "auto"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${DataSource}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A"
+        }
+      ],
+      "title": "Syslog Records by Time ",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${DataSource}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "yellow",
+            "mode": "fixed"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "fillOpacity": 80,
+            "gradientMode": "hue",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 1,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 15,
+        "w": 12,
+        "x": 12,
+        "y": 14
+      },
+      "id": 4,
+      "options": {
+        "barRadius": 0,
+        "barWidth": 0.97,
+        "fullHighlight": false,
+        "groupWidth": 0.7,
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": false
+        },
+        "orientation": "horizontal",
+        "showValue": "auto",
+        "stacking": "none",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        },
+        "xTickLabelRotation": 0,
+        "xTickLabelSpacing": 0
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "Syslog \r\n| where _ResourceId == tolower(\"$Cluster\")\r\n| summarize Count = count() by ProcessName\r\n| order by Count desc ",
+            "resources": ["$LAWorkspace"],
+            "resultFormat": "time_series"
+          },
+          "azureMonitor": {
+            "allowedTimeGrainsMs": [],
+            "timeGrain": "auto"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${DataSource}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A"
+        }
+      ],
+      "title": "Syslog Records by ProcessName",
+      "type": "barchart"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${DataSource}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "yellow",
+            "mode": "fixed"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "fillOpacity": 80,
+            "gradientMode": "hue",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 1,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 14,
+        "w": 12,
+        "x": 0,
+        "y": 29
+      },
+      "id": 13,
+      "options": {
+        "barRadius": 0,
+        "barWidth": 0.97,
+        "fullHighlight": false,
+        "groupWidth": 0.7,
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": false
+        },
+        "orientation": "auto",
+        "showValue": "auto",
+        "stacking": "none",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        },
+        "xTickLabelRotation": 0,
+        "xTickLabelSpacing": 0
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "Syslog \r\n| where _ResourceId == tolower(\"$Cluster\")\r\n| summarize Count = count() by Facility\r\n",
+            "resources": ["$LAWorkspace"],
+            "resultFormat": "time_series"
+          },
+          "azureMonitor": {
+            "allowedTimeGrainsMs": [],
+            "timeGrain": "auto"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${DataSource}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A"
+        }
+      ],
+      "title": "Syslog Records by FacilityName",
+      "type": "barchart"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${DataSource}"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "yellow",
+            "mode": "fixed"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "left",
+            "fillOpacity": 80,
+            "gradientMode": "hue",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 1,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 14,
+        "w": 12,
+        "x": 12,
+        "y": 29
+      },
+      "id": 14,
+      "options": {
+        "barRadius": 0,
+        "barWidth": 1,
+        "fullHighlight": false,
+        "groupWidth": 0.7,
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": false
+        },
+        "orientation": "horizontal",
+        "showValue": "always",
+        "stacking": "none",
+        "tooltip": {
+          "mode": "multi",
+          "sort": "none"
+        },
+        "xField": "HostName",
+        "xTickLabelRotation": 0,
+        "xTickLabelSpacing": 100
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "Syslog \r\n| where _ResourceId == tolower(\"$Cluster\")\r\n| summarize Count = count() by HostName",
+            "resources": ["$LAWorkspace"],
+            "resultFormat": "time_series"
+          },
+          "azureMonitor": {
+            "allowedTimeGrainsMs": [],
+            "timeGrain": "auto"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${DataSource}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A"
+        }
+      ],
+      "title": "Syslog Records by HostName",
+      "type": "barchart"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${DataSource}"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "continuous-YlRd"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "filterable": true,
+            "inspect": false
+          },
+          "mappings": [
+            {
+              "options": {
+                "error": {
+                  "color": "red",
+                  "index": 0
+                },
+                "info": {
+                  "color": "green",
+                  "index": 1
+                }
+              },
+              "type": "value"
+            }
+          ],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Facility"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 85
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "SeverityLevel"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 134
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "ProcessName"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 135
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "TimeGenerated"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 181
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Computer"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 301
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 18,
+        "w": 24,
+        "x": 0,
+        "y": 43
+      },
+      "id": 16,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "enablePagination": false,
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true,
+        "sortBy": []
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "Syslog \r\n| where _ResourceId == tolower(\"$Cluster\")\r\n| top 50 by TimeGenerated desc\r\n| project TimeGenerated, Facility, SeverityLevel, ProcessName, SyslogMessage\r\n",
+            "resources": ["$LAWorkspace"],
+            "resultFormat": "table"
+          },
+          "azureMonitor": {
+            "allowedTimeGrainsMs": [],
+            "timeGrain": "auto"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${DataSource}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A"
+        }
+      ],
+      "title": "Last 50 Syslog Records - Click any row to access full list",
+      "type": "table"
+    }
+  ],
+  "refresh": false,
+  "schemaVersion": 38,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": [
+      {
+        "current": {
+          "selected": false,
+          "text": "Azure Monitor",
+          "value": "Azure Monitor"
+        },
+        "hide": 0,
+        "includeAll": false,
+        "label": "DataSource",
+        "multi": false,
+        "name": "DataSource",
+        "options": [],
+        "query": "grafana-azure-monitor-datasource",
+        "queryValue": "",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "type": "datasource"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${DataSource}"
+        },
+        "definition": "",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Subscription",
+        "multi": false,
+        "name": "Subscription",
+        "options": [],
+        "query": {
+          "azureLogAnalytics": {
+            "query": "",
+            "resources": []
+          },
+          "queryType": "Azure Subscriptions",
+          "refId": "A"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${DataSource}"
+        },
+        "definition": "",
+        "hide": 2,
+        "includeAll": false,
+        "label": "Log Analytics Workspace",
+        "multi": false,
+        "name": "LAWorkspace",
+        "options": [],
+        "query": {
+          "azureLogAnalytics": {
+            "query": "",
+            "resources": []
+          },
+          "azureResourceGraph": {
+            "query": "Resources \r\n| where type =~ 'microsoft.containerservice/managedclusters'\r\n| where id == \"$Cluster\"\r\n| extend props = parse_json(properties)\r\n| extend lawResourceId = tostring(props.addonProfiles.omsAgent.config.logAnalyticsWorkspaceResourceID)\r\n| extend LAWS = iff(isnotempty(lawResourceId), lawResourceId, tostring(props.addonProfiles.omsagent.config.logAnalyticsWorkspaceResourceID))\r\n| project LAWS\r\n\r\n"
+          },
+          "queryType": "Azure Resource Graph",
+          "refId": "A",
+          "subscriptions": ["$Subscription"]
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${DataSource}"
+        },
+        "definition": "",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Cluster",
+        "multi": false,
+        "name": "Cluster",
+        "options": [],
+        "query": {
+          "azureLogAnalytics": {
+            "query": "",
+            "resources": []
+          },
+          "azureResourceGraph": {
+            "query": "Resources\r\n| where type =~ 'microsoft.containerservice/managedclusters'"
+          },
+          "queryType": "Azure Resource Graph",
+          "refId": "A",
+          "subscriptions": ["e98d0648-f21a-417d-8470-db17aab036a7", "$Subscription"]
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      }
+    ]
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Azure Monitor / Container Insights / Syslog",
+  "uid": "db3b95d2-501d-4624-a262-1214577651a7",
+  "version": 2
+}
diff --git a/public/app/plugins/datasource/azuremonitor/dashboards/infrastructureMonitoring.json b/public/app/plugins/datasource/azuremonitor/dashboards/infrastructureMonitoring.json
new file mode 100644
index 0000000000000..25c538cf9ad6a
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/dashboards/infrastructureMonitoring.json
@@ -0,0 +1,6384 @@
+{
+  "__inputs": [],
+  "__elements": {},
+  "__requires": [
+    {
+      "type": "panel",
+      "id": "bargauge",
+      "name": "Bar gauge",
+      "version": ""
+    },
+    {
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "9.5.13"
+    },
+    {
+      "type": "datasource",
+      "id": "grafana-azure-monitor-datasource",
+      "name": "Azure Monitor",
+      "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "stat",
+      "name": "Stat",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
+    }
+  ],
+  "description": "This dashboard displays traffic-light indicators to show the health of your Azure infrastructure resources based on key performance indicators and thresholds defined for each infrastructure resource type.",
+  "editable": true,
+  "id": null,
+  "links": [],
+  "liveNow": true,
+  "panels": [
+    {
+      "gridPos": {
+        "h": 3,
+        "w": 11,
+        "x": 0,
+        "y": 0
+      },
+      "id": 1,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "<p style=\"font-size:30px;color:rgb(87, 148, 242);\">Azure Infrastructure - Monitoring Dashboard</p>",
+        "mode": "markdown"
+      },
+      "transparent": true,
+      "type": "text"
+    },
+    {
+      "gridPos": {
+        "h": 3,
+        "w": 13,
+        "x": 11,
+        "y": 0
+      },
+      "id": 90,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "#### Welcome to the Azure Infrastructure Monitoring Dashboard!    Select a data source and subscription to see the current status of your infrastructure resources.  Examine the key performance indicators for your resources by expanding the row for a resource type.",
+        "mode": "markdown"
+      },
+      "transparent": true,
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "links": [],
+          "mappings": [
+            {
+              "options": {
+                "0": {
+                  "index": 0,
+                  "text": "Healthy"
+                },
+                "1": {
+                  "index": 1,
+                  "text": "Warning"
+                }
+              },
+              "type": "value"
+            },
+            {
+              "options": {
+                "from": 2,
+                "result": {
+                  "index": 2,
+                  "text": "Unhealthy"
+                },
+                "to": 4
+              },
+              "type": "range"
+            }
+          ],
+          "max": 4,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "#808080",
+                "value": null
+              },
+              {
+                "color": "dark-green",
+                "value": 0
+              },
+              {
+                "color": "dark-yellow",
+                "value": 1
+              },
+              {
+                "color": "dark-red",
+                "value": 2
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 3,
+        "x": 0,
+        "y": 3
+      },
+      "id": 2,
+      "links": [],
+      "options": {
+        "colorMode": "background_solid",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["max"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "let insight_table = InsightsMetrics\r\n| where _ResourceId has '/microsoft.compute/virtualmachines/'\r\n| where Origin == \"vm.azm.ms\"\r\n| where Namespace == \"Processor\" and Name == \"UtilizationPercentage\"\r\n| extend Resource = toupper(tostring(split(_ResourceId,'/')[8]));\r\nAzureMetrics\r\n| where _ResourceId has '/microsoft.compute/virtualmachines/'\r\n| where MetricName in('Percentage CPU', 'Available Memory Bytes', 'VmAvailabilityMetric')\r\n| union kind=outer insight_table\r\n| summarize\r\n  kpi1 = avgif(Average, MetricName == 'Percentage CPU'),\r\n  kpi2 = percentile(Val, 95),\r\n  kpi3 = avgif(Average/1000000000, MetricName == 'Available Memory Bytes'),\r\n  kpi4 = avgif(Average*100, MetricName == 'VmAvailabilityMetric') by _ResourceId, Resource\r\n|extend kpi1 = iff(isnan(kpi1), 0.0, kpi1)\r\n|extend kpi2 = iff(isnan(kpi2), 0.0, kpi2) \r\n|extend kpi3 = iff(isnan(kpi3), 0.0, kpi3) \r\n|extend kpi4 = iff(isnan(kpi4), 0.0, kpi4) \r\n|extend health1 = iff(kpi1>80, 1, 0)\r\n|extend health2 = iff(kpi2>85, 1, 0)\r\n|extend health3 = iff(kpi3<1, 1, 0)\r\n|extend health4 = iff(kpi4<90, 1, 0)\r\n|extend health = health1 + health2 + health3 + health4",
+            "resources": ["/subscriptions/$sub"]
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscriptions": ["ebb79bc0-aa86-44a7-8111-cabbe0c43993"]
+        }
+      ],
+      "title": "Virtual Machines",
+      "transformations": [
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "A": false,
+              "Resource": true,
+              "_ResourceId": true,
+              "health1": true,
+              "health2": true,
+              "health3": true,
+              "health4": true,
+              "kpi1": true,
+              "kpi2": true,
+              "kpi3": true,
+              "kpi4": true
+            },
+            "indexByName": {},
+            "renameByName": {
+              "A": " ",
+              "health": " "
+            }
+          }
+        }
+      ],
+      "transparent": true,
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "links": [],
+          "mappings": [
+            {
+              "options": {
+                "0": {
+                  "index": 0,
+                  "text": "Healthy"
+                },
+                "1": {
+                  "index": 1,
+                  "text": "Warning"
+                }
+              },
+              "type": "value"
+            },
+            {
+              "options": {
+                "from": 2,
+                "result": {
+                  "index": 2,
+                  "text": "Unhealthy"
+                },
+                "to": 4
+              },
+              "type": "range"
+            }
+          ],
+          "max": 4,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "#808080",
+                "value": null
+              },
+              {
+                "color": "dark-green",
+                "value": 0
+              },
+              {
+                "color": "dark-yellow",
+                "value": 1
+              },
+              {
+                "color": "dark-red",
+                "value": 2
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 3,
+        "x": 3,
+        "y": 3
+      },
+      "id": 27,
+      "links": [],
+      "options": {
+        "colorMode": "background_solid",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["max"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "let stroage_table = StorageBlobLogs \r\n    | where StatusText != 'Success'\r\n    | extend ErrorCounter = 1\r\n    | extend ResourceName = AccountName\r\n    | extend _ResourceId = trim('/blobservices/default', _ResourceId)\r\n    | extend _ResourceId = trim('/queueservices/default', _ResourceId)\r\n    | extend _ResourceId = trim('/tableservices/default', _ResourceId)\r\n    | extend _ResourceId = trim('/fileservices/default', _ResourceId)\r\n    | project TimeGenerated, ResourceName, StatusText, ErrorCounter, _ResourceId;\r\nAzureMetrics\r\n| where _ResourceId has '/microsoft.storage/'\r\n| where MetricName in('SuccessE2ELatency', 'UsedCapacity', 'Availability')\r\n| extend ResourceName = tostring(split(_ResourceId,'/')[8])\r\n| extend _ResourceId = trim('/blobservices/default', _ResourceId)\r\n| extend _ResourceId = trim('/queueservices/default', _ResourceId)\r\n| extend _ResourceId = trim('/tableservices/default', _ResourceId)\r\n| extend _ResourceId = trim('/fileservices/default', _ResourceId)\r\n| project ResourceName, _ResourceId, MetricName, Average, Total\r\n| union kind=outer stroage_table\r\n| summarize\r\n  kpi1 = avgif(Average, MetricName == 'SuccessE2ELatency'),\r\n  kpi2 = sumif(ErrorCounter, isnotnull(ErrorCounter)),\r\n  kpi3 = avgif(Average, MetricName == 'UsedCapacity'),\r\n  kpi4 = avgif(Average, MetricName == 'Availability') by _ResourceId, ResourceName\r\n|extend kpi1 = iff(isnan(kpi1), 0.0, kpi1)\r\n|extend kpi2 = iff(isnan(toreal(kpi2)), 0.0, toreal(kpi2)) \r\n|extend kpi3 = iff(isnan(kpi3), 0.0, kpi3) \r\n|extend kpi4 = iff(isnan(kpi4), 0.0, kpi4) \r\n|extend health1 = iff(kpi1>5000, 1, 0)\r\n|extend health2 = iff(kpi2>500, 1, 0)\r\n|extend health3 = iff(kpi3>4000000000000000, 1, 0)\r\n|extend health4 = iff(kpi4<90, 1, 0)\r\n|extend health = health1 + health2 + health3 + health4",
+            "resources": ["/subscriptions/$sub"]
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscriptions": ["ebb79bc0-aa86-44a7-8111-cabbe0c43993"]
+        }
+      ],
+      "title": "Storage",
+      "transformations": [
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "A": false,
+              "Resource": true,
+              "ResourceName": true,
+              "_ResourceId": true,
+              "health1": true,
+              "health2": true,
+              "health3": true,
+              "health4": true,
+              "kpi1": true,
+              "kpi2": true,
+              "kpi3": true,
+              "kpi4": true
+            },
+            "indexByName": {},
+            "renameByName": {
+              "A": " ",
+              "health": " "
+            }
+          }
+        }
+      ],
+      "transparent": true,
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "links": [],
+          "mappings": [
+            {
+              "options": {
+                "0": {
+                  "index": 0,
+                  "text": "Healthy"
+                },
+                "1": {
+                  "index": 1,
+                  "text": "Warning"
+                }
+              },
+              "type": "value"
+            },
+            {
+              "options": {
+                "from": 2,
+                "result": {
+                  "index": 2,
+                  "text": "Unhealthy"
+                },
+                "to": 3
+              },
+              "type": "range"
+            }
+          ],
+          "max": 3,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "#808080",
+                "value": null
+              },
+              {
+                "color": "dark-green",
+                "value": 0
+              },
+              {
+                "color": "dark-yellow",
+                "value": 1
+              },
+              {
+                "color": "dark-red",
+                "value": 2
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 3,
+        "x": 6,
+        "y": 3
+      },
+      "id": 36,
+      "links": [],
+      "options": {
+        "colorMode": "background_solid",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["max"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "AzureMetrics\r\n| where _ResourceId has '/microsoft.network/loadbalancers/'\r\n| where MetricName in('UsedSnatPorts', 'DipAvailability', 'VipAvailability')\r\n| summarize\r\n  kpi1 = avgif(Average, MetricName == 'UsedSnatPorts'),\r\n  kpi2 = avgif(Average, MetricName == 'DipAvailability'),\r\n  kpi3 = avgif(Average, MetricName == 'VipAvailability') by _ResourceId, Resource\r\n|extend kpi1 = iff(isnan(kpi1), 0.0, kpi1)\r\n|extend kpi2 = iff(isnan(kpi2), 0.0, kpi2) \r\n|extend kpi3 = iff(isnan(kpi3), 0.0, kpi3)  \r\n|extend health1 = iff(kpi1>900, 1, 0)\r\n|extend health2 = iff(kpi2<=50, 1, 0)\r\n|extend health3 = iff(kpi3<50, 1, 0)\r\n|extend health = health1 + health2 + health3",
+            "resources": ["/subscriptions/$sub"]
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscriptions": ["ebb79bc0-aa86-44a7-8111-cabbe0c43993"]
+        }
+      ],
+      "title": "Load Balancers",
+      "transformations": [
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "A": false,
+              "Resource": true,
+              "_ResourceId": true,
+              "health1": true,
+              "health2": true,
+              "health3": true,
+              "kpi1": true,
+              "kpi2": true,
+              "kpi3": true
+            },
+            "indexByName": {},
+            "renameByName": {
+              "A": " ",
+              "health": " "
+            }
+          }
+        }
+      ],
+      "transparent": true,
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "links": [],
+          "mappings": [
+            {
+              "options": {
+                "0": {
+                  "index": 0,
+                  "text": "Healthy"
+                },
+                "1": {
+                  "index": 1,
+                  "text": "Warning"
+                }
+              },
+              "type": "value"
+            },
+            {
+              "options": {
+                "from": 2,
+                "result": {
+                  "index": 2,
+                  "text": "Unhealthy"
+                },
+                "to": 3
+              },
+              "type": "range"
+            }
+          ],
+          "max": 3,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "#808080",
+                "value": null
+              },
+              {
+                "color": "dark-green",
+                "value": 0
+              },
+              {
+                "color": "dark-yellow",
+                "value": 1
+              },
+              {
+                "color": "dark-red",
+                "value": 2
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 3,
+        "x": 9,
+        "y": 3
+      },
+      "id": 41,
+      "links": [],
+      "options": {
+        "colorMode": "background_solid",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["max"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "AzureMetrics\r\n| where _ResourceId has '/microsoft.network/applicationgateways/'\r\n| where MetricName in('UnhealthyHostCount', 'FailedRequests', 'HealthyHostCount')\r\n| summarize\r\n  kpi1 = avgif(Average, MetricName == 'UnhealthyHostCount'),\r\n  kpi2 = sumif(Total, MetricName == 'FailedRequests'),\r\n  kpi3 = avgif(Average, MetricName == 'HealthyHostCount') by _ResourceId, Resource\r\n|extend kpi1 = iff(isnan(kpi1), 0.0, kpi1)\r\n|extend kpi2 = iff(isnan(kpi2), 0.0, kpi2) \r\n|extend kpi3 = iff(isnan(kpi3), 0.0, kpi3)  \r\n|extend health1 = iff(kpi1>=1, 1, 0)\r\n|extend health2 = iff(kpi2>10, 1, 0)\r\n|extend health3 = iff(kpi3<=0, 1, 0)\r\n|extend health = health1 + health2 + health3",
+            "resources": ["/subscriptions/$sub"]
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscriptions": ["ebb79bc0-aa86-44a7-8111-cabbe0c43993"]
+        }
+      ],
+      "title": "Application Gateways",
+      "transformations": [
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "A": false,
+              "Resource": true,
+              "_ResourceId": true,
+              "health1": true,
+              "health2": true,
+              "health3": true,
+              "kpi1": true,
+              "kpi2": true,
+              "kpi3": true
+            },
+            "indexByName": {},
+            "renameByName": {
+              "A": " ",
+              "health": " "
+            }
+          }
+        }
+      ],
+      "transparent": true,
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "links": [],
+          "mappings": [
+            {
+              "options": {
+                "0": {
+                  "index": 0,
+                  "text": "Healthy"
+                },
+                "1": {
+                  "index": 1,
+                  "text": "Warning"
+                }
+              },
+              "type": "value"
+            },
+            {
+              "options": {
+                "from": 2,
+                "result": {
+                  "index": 2,
+                  "text": "Unhealthy"
+                },
+                "to": 3
+              },
+              "type": "range"
+            }
+          ],
+          "max": 3,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "#808080",
+                "value": null
+              },
+              {
+                "color": "dark-green",
+                "value": 0
+              },
+              {
+                "color": "dark-yellow",
+                "value": 1
+              },
+              {
+                "color": "dark-red",
+                "value": 2
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 3,
+        "x": 12,
+        "y": 3
+      },
+      "id": 50,
+      "links": [],
+      "options": {
+        "colorMode": "background_solid",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["max"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "AzureMetrics\r\n| where _ResourceId has '/microsoft.network/publicipaddresses/'\r\n| where MetricName in('VipAvailability', 'IfUnderDDoSAttack', 'PacketsInDDoS')\r\n| summarize\r\n  kpi1 = avgif(Average, MetricName == 'VipAvailability'),\r\n  kpi2 = avgif(Maximum, MetricName == 'IfUnderDDoSAttack'),\r\n  kpi3 = avgif(Total, MetricName == 'PacketsInDDoS') by _ResourceId, Resource\r\n|extend kpi1 = iff(isnan(kpi1), 0.0, kpi1)\r\n|extend kpi2 = iff(isnan(kpi2), 0.0, kpi2)\r\n|extend kpi3 = iff(isnan(kpi3), 0.0, kpi3)\r\n|extend health1 = iff(kpi1<100, 1, 0)\r\n|extend health2 = iff(kpi2>0, 1, 0)\r\n|extend health3 = iff(kpi3>=1000, 1, 0)\r\n|extend health = health1 + health2 + health3",
+            "resources": ["/subscriptions/$sub"]
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscriptions": ["ebb79bc0-aa86-44a7-8111-cabbe0c43993"]
+        }
+      ],
+      "title": "Public IPs",
+      "transformations": [
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "A": false,
+              "Resource": true,
+              "_ResourceId": true,
+              "health1": true,
+              "health2": true,
+              "health3": true,
+              "kpi1": true,
+              "kpi2": true,
+              "kpi3": true
+            },
+            "indexByName": {},
+            "renameByName": {
+              "A": " ",
+              "health": " "
+            }
+          }
+        }
+      ],
+      "transparent": true,
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "links": [],
+          "mappings": [
+            {
+              "options": {
+                "0": {
+                  "index": 0,
+                  "text": "Healthy"
+                },
+                "1": {
+                  "index": 1,
+                  "text": "Warning"
+                }
+              },
+              "type": "value"
+            },
+            {
+              "options": {
+                "from": 2,
+                "result": {
+                  "index": 2,
+                  "text": "Unhealthy"
+                },
+                "to": 3
+              },
+              "type": "range"
+            }
+          ],
+          "max": 3,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "#808080",
+                "value": null
+              },
+              {
+                "color": "dark-green",
+                "value": 0
+              },
+              {
+                "color": "dark-yellow",
+                "value": 1
+              },
+              {
+                "color": "dark-red",
+                "value": 2
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 3,
+        "x": 15,
+        "y": 3
+      },
+      "id": 54,
+      "links": [],
+      "options": {
+        "colorMode": "background_solid",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["max"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "AzureMetrics\r\n| where _ResourceId has '/microsoft.network/virtualnetworks/'\r\n| where MetricName in('IfUnderDDoSAttack', 'PacketsInDDoS', 'PacketsForwardedDDoS')\r\n| summarize\r\n  kpi1 = avgif(Maximum, MetricName == 'IfUnderDDoSAttack'),\r\n  kpi2 = avgif(Maximum, MetricName == 'PacketsInDDoS'),\r\n  kpi3 = avgif(Maximum, MetricName == 'PacketsForwardedDDoS') by _ResourceId, Resource\r\n|extend kpi1 = iff(isnan(kpi1), 0.0, kpi1)\r\n|extend kpi2 = iff(isnan(kpi2), 0.0, kpi2) \r\n|extend kpi3 = iff(isnan(kpi3), 0.0, kpi3)\r\n|extend health1 = iff(kpi1>0, 1, 0)\r\n|extend health2 = iff(kpi2>=1000, 1, 0)\r\n|extend health3 = iff(kpi3>1, 1, 0)\r\n|extend health = health1 + health2 + health3",
+            "resources": ["/subscriptions/$sub"]
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscriptions": ["ebb79bc0-aa86-44a7-8111-cabbe0c43993"]
+        }
+      ],
+      "title": "Virtual Networks",
+      "transformations": [
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "A": false,
+              "Resource": true,
+              "_ResourceId": true,
+              "health1": true,
+              "health2": true,
+              "health3": true,
+              "kpi1": true,
+              "kpi2": true,
+              "kpi3": true
+            },
+            "indexByName": {},
+            "renameByName": {
+              "A": " ",
+              "health": " "
+            }
+          }
+        }
+      ],
+      "transparent": true,
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "links": [],
+          "mappings": [
+            {
+              "options": {
+                "0": {
+                  "index": 0,
+                  "text": "Healthy"
+                },
+                "1": {
+                  "index": 1,
+                  "text": "Warning"
+                }
+              },
+              "type": "value"
+            },
+            {
+              "options": {
+                "from": 2,
+                "result": {
+                  "index": 2,
+                  "text": "Unhealthy"
+                },
+                "to": 3
+              },
+              "type": "range"
+            }
+          ],
+          "max": 3,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "#808080",
+                "value": null
+              },
+              {
+                "color": "dark-green",
+                "value": 0
+              },
+              {
+                "color": "dark-yellow",
+                "value": 1
+              },
+              {
+                "color": "dark-red",
+                "value": 2
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 3,
+        "x": 18,
+        "y": 3
+      },
+      "id": 68,
+      "links": [],
+      "options": {
+        "colorMode": "background_solid",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["max"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "AzureMetrics\r\n| where _ResourceId has '/microsoft.network/expressroutecircuits/'\r\n| where MetricName in('BgpAvailability', 'ArpAvailability', 'QosDropBitsInPerSecond', 'QosDropBitsOutPerSecond' )\r\n| summarize\r\n  kpi1 = avgif(Average, MetricName == 'BgpAvailability'),\r\n  kpi2 = avgif(Average, MetricName == 'ArpAvailability'),\r\n  kpi3 = avgif(Average, MetricName == 'QosDropBitsInPerSecond'),\r\n  kpi4 = avgif(Total, MetricName == 'QosDropBitsOutPerSecond') by _ResourceId, Resource\r\n|extend kpi1 = iff(isnan(kpi1), 0.0, kpi1)\r\n|extend kpi2 = iff(isnan(kpi2), 0.0, kpi2) \r\n|extend kpi3 = iff(isnan(kpi3), 0.0, kpi3) \r\n|extend kpi4 = iff(isnan(kpi4), 0.0, kpi4)\r\n|extend health1 = iff(kpi1<90, 1, 0)\r\n|extend health2 = iff(kpi1<90, 1, 0)\r\n|extend health3 = iff(kpi2>100, 1, 0)\r\n|extend health4 = iff(kpi3>100, 1, 0)\r\n|extend health = health1 + health2 + health3 + health4\r\n",
+            "resources": ["/subscriptions/$sub"]
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscriptions": ["ebb79bc0-aa86-44a7-8111-cabbe0c43993"]
+        }
+      ],
+      "title": "ExpressRoute Circuits",
+      "transformations": [
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "A": false,
+              "Resource": true,
+              "_ResourceId": true,
+              "health1": true,
+              "health2": true,
+              "health3": true,
+              "kpi1": true,
+              "kpi2": true,
+              "kpi3": true,
+              "kpi4": true
+            },
+            "indexByName": {},
+            "renameByName": {
+              "A": " ",
+              "health": " "
+            }
+          }
+        }
+      ],
+      "transparent": true,
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "links": [],
+          "mappings": [
+            {
+              "options": {
+                "0": {
+                  "index": 0,
+                  "text": "Healthy"
+                },
+                "1": {
+                  "index": 1,
+                  "text": "Warning"
+                }
+              },
+              "type": "value"
+            },
+            {
+              "options": {
+                "from": 2,
+                "result": {
+                  "index": 2,
+                  "text": "Unhealthy"
+                },
+                "to": 4
+              },
+              "type": "range"
+            }
+          ],
+          "max": 4,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "#808080",
+                "value": null
+              },
+              {
+                "color": "dark-green",
+                "value": 0
+              },
+              {
+                "color": "dark-yellow",
+                "value": 1
+              },
+              {
+                "color": "dark-red",
+                "value": 2
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 3,
+        "x": 0,
+        "y": 6
+      },
+      "id": 26,
+      "links": [],
+      "options": {
+        "colorMode": "background_solid",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["max"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "AzureMetrics\r\n| where _ResourceId has '/microsoft.compute/virtualmachinescalesets/'\r\n| where MetricName in('Percentage CPU', 'OS Disk IOPS Consumed Percentage','Available Memory Bytes', 'VmAvailabilityMetric')\r\n| summarize\r\n  kpi1 = avgif(Average, MetricName == 'Percentage CPU'),\r\n  kpi2 = avgif(Average, MetricName == 'OS Disk IOPS Consumed Percentage'),\r\n  kpi3 = avgif(Average/1000000000, MetricName == 'Available Memory Bytes'),\r\n  kpi4 = avgif(Average*100, MetricName == 'VmAvailabilityMetric') by _ResourceId, Resource\r\n|extend kpi1 = iff(isnan(kpi1), 0.0, kpi1)\r\n|extend kpi2 = iff(isnan(kpi2), 0.0, kpi2) \r\n|extend kpi3 = iff(isnan(kpi3), 0.0, kpi3) \r\n|extend kpi4 = iff(isnan(kpi4), 0.0, kpi4)\r\n|extend health1 = iff(kpi1>80, 1, 0)\r\n|extend health2 = iff(kpi2>95, 1, 0)\r\n|extend health3 = iff(kpi3<1, 1, 0)\r\n|extend health4 = iff(kpi4<90, 1, 0)\r\n|extend health = health1 + health2 + health3 + health4",
+            "resources": ["/subscriptions/$sub"]
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscriptions": ["ebb79bc0-aa86-44a7-8111-cabbe0c43993"]
+        }
+      ],
+      "title": "Virtual Machine Scale Sets",
+      "transformations": [
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "A": false,
+              "Resource": true,
+              "_ResourceId": true,
+              "health1": true,
+              "health2": true,
+              "health3": true,
+              "health4": true,
+              "kpi1": true,
+              "kpi2": true,
+              "kpi3": true,
+              "kpi4": true
+            },
+            "indexByName": {},
+            "renameByName": {
+              "A": " ",
+              "health": " "
+            }
+          }
+        }
+      ],
+      "transparent": true,
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "links": [],
+          "mappings": [
+            {
+              "options": {
+                "0": {
+                  "index": 0,
+                  "text": "Healthy"
+                },
+                "1": {
+                  "index": 1,
+                  "text": "Warning"
+                }
+              },
+              "type": "value"
+            },
+            {
+              "options": {
+                "from": 2,
+                "result": {
+                  "index": 2,
+                  "text": "Unhealthy"
+                },
+                "to": 3
+              },
+              "type": "range"
+            }
+          ],
+          "max": 3,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "#808080",
+                "value": null
+              },
+              {
+                "color": "dark-green",
+                "value": 0
+              },
+              {
+                "color": "dark-yellow",
+                "value": 1
+              },
+              {
+                "color": "dark-red",
+                "value": 2
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 3,
+        "x": 3,
+        "y": 6
+      },
+      "id": 28,
+      "links": [],
+      "options": {
+        "colorMode": "background_solid",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["max"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "let diagnostic_table = AzureDiagnostics \r\n    | where _ResourceId has '/microsoft.keyvault/vaults/'\r\n    | where ResultSignature !='OK'\r\n    | extend ErrorCounter = 1\r\n    | project TimeGenerated, Resource, ErrorCounter, _ResourceId;\r\nAzureMetrics\r\n| where _ResourceId has '/microsoft.keyvault/vaults/'\r\n| where MetricName in('ServiceApiLatency', 'Availability')\r\n| project Resource, _ResourceId, MetricName, Average, Total\r\n| union kind=outer diagnostic_table\r\n| summarize\r\n  kpi1 = avgif(Average, MetricName == 'ServiceApiLatency'),\r\n  kpi2 = sumif(ErrorCounter, isnotnull(ErrorCounter)),\r\n  kpi3 = avgif(Average*100, MetricName == 'Availability') by _ResourceId, Resource\r\n|extend kpi1 = iff(isnan(kpi1), 0.0, kpi1)\r\n|extend kpi2 = iff(isnan(toreal(kpi2)), 0.0, toreal(kpi2)) \r\n|extend kpi3 = iff(isnan(kpi3), 0.0, kpi3) \r\n|extend health1 = iff(kpi1>1000, 1, 0)\r\n|extend health2 = iff(kpi2>500, 1, 0)\r\n|extend health3 = iff(kpi3<90, 1, 0)\r\n|extend health = health1 + health2 + health3",
+            "resources": ["/subscriptions/$sub"]
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscriptions": ["ebb79bc0-aa86-44a7-8111-cabbe0c43993"]
+        }
+      ],
+      "title": "Key Vaults",
+      "transformations": [
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "A": false,
+              "Resource": true,
+              "_ResourceId": true,
+              "health1": true,
+              "health2": true,
+              "health3": true,
+              "kpi1": true,
+              "kpi2": true,
+              "kpi3": true,
+              "kpi4": true
+            },
+            "indexByName": {},
+            "renameByName": {
+              "A": " ",
+              "health": " "
+            }
+          }
+        }
+      ],
+      "transparent": true,
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "links": [],
+          "mappings": [
+            {
+              "options": {
+                "0": {
+                  "index": 0,
+                  "text": "Healthy"
+                },
+                "1": {
+                  "index": 1,
+                  "text": "Warning"
+                }
+              },
+              "type": "value"
+            },
+            {
+              "options": {
+                "from": 2,
+                "result": {
+                  "index": 2,
+                  "text": "Unhealthy"
+                },
+                "to": 3
+              },
+              "type": "range"
+            }
+          ],
+          "max": 3,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "#808080",
+                "value": null
+              },
+              {
+                "color": "dark-green",
+                "value": 0
+              },
+              {
+                "color": "dark-yellow",
+                "value": 1
+              },
+              {
+                "color": "dark-red",
+                "value": 2
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 3,
+        "x": 6,
+        "y": 6
+      },
+      "id": 46,
+      "links": [],
+      "options": {
+        "colorMode": "background_solid",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["max"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "AzureMetrics\r\n| where _ResourceId has '/microsoft.network/trafficmanagerprofiles/'\r\n| where MetricName in('ProbeAgentCurrentEndpointStateByProfileResourceId', 'QpsByEndpoint')\r\n| summarize\r\n  kpi1 = avgif(Maximum, MetricName == 'ProbeAgentCurrentEndpointStateByProfileResourceId'),\r\n  kpi2 = avgif(Total, MetricName == 'QpsByEndpoint') by _ResourceId, Resource\r\n|extend kpi1 = iff(isnan(kpi1), 0.0, kpi1)\r\n|extend kpi2 = iff(isnan(kpi2), 0.0, kpi2) \r\n|extend health1 = iff(kpi1<=0, 1, 0)\r\n|extend health2 = iff(kpi2<=0, 1, 0)\r\n|extend health = health1 + health2",
+            "resources": ["/subscriptions/$sub"]
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscriptions": ["ebb79bc0-aa86-44a7-8111-cabbe0c43993"]
+        }
+      ],
+      "title": "Traffic Managers",
+      "transformations": [
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "A": false,
+              "Resource": true,
+              "_ResourceId": true,
+              "health1": true,
+              "health2": true,
+              "health3": true,
+              "kpi1": true,
+              "kpi2": true,
+              "kpi3": true
+            },
+            "indexByName": {},
+            "renameByName": {
+              "A": " ",
+              "health": " "
+            }
+          }
+        }
+      ],
+      "transparent": true,
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "links": [],
+          "mappings": [
+            {
+              "options": {
+                "0": {
+                  "index": 0,
+                  "text": "Healthy"
+                },
+                "1": {
+                  "index": 1,
+                  "text": "Warning"
+                }
+              },
+              "type": "value"
+            },
+            {
+              "options": {
+                "from": 2,
+                "result": {
+                  "index": 2,
+                  "text": "Unhealthy"
+                },
+                "to": 3
+              },
+              "type": "range"
+            }
+          ],
+          "max": 3,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "#808080",
+                "value": null
+              },
+              {
+                "color": "dark-green",
+                "value": 0
+              },
+              {
+                "color": "dark-yellow",
+                "value": 1
+              },
+              {
+                "color": "dark-red",
+                "value": 2
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 3,
+        "x": 9,
+        "y": 6
+      },
+      "id": 53,
+      "links": [],
+      "options": {
+        "colorMode": "background_solid",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["max"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "AzureMetrics\r\n| where _ResourceId has '/microsoft.cdn/profiles/'\r\n| where MetricName in('TotalLatency', 'ByteHitRatio', 'OriginHealthPercentage')\r\n| summarize\r\n  kpi1 = avgif(Average, MetricName == 'TotalLatency'),\r\n  kpi2 = avgif(Average, MetricName == 'ByteHitRatio'),\r\n  kpi3 = avgif(Average, MetricName == 'OriginHealthPercentage') by _ResourceId, Resource\r\n|extend kpi1 = iff(isnan(kpi1), 0.0, kpi1)\r\n|extend kpi2 = iff(isnan(kpi2), 0.0, kpi2) \r\n|extend kpi3 = iff(isnan(kpi3), 0.0, kpi3)\r\n|extend health1 = iff(kpi1>100, 1, 0)\r\n|extend health2 = iff(kpi2<50, 1, 0)\r\n|extend health3 = iff(kpi3<95, 1, 0)\r\n|extend health = health1 + health2 + health3",
+            "resources": ["/subscriptions/$sub"]
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscriptions": ["ebb79bc0-aa86-44a7-8111-cabbe0c43993"]
+        }
+      ],
+      "title": "Front Doors",
+      "transformations": [
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "A": false,
+              "Resource": true,
+              "_ResourceId": true,
+              "health1": true,
+              "health2": true,
+              "health3": true,
+              "kpi1": true,
+              "kpi2": true,
+              "kpi3": true
+            },
+            "indexByName": {},
+            "renameByName": {
+              "A": " ",
+              "health": " "
+            }
+          }
+        }
+      ],
+      "transparent": true,
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "links": [],
+          "mappings": [
+            {
+              "options": {
+                "0": {
+                  "index": 0,
+                  "text": "Healthy"
+                },
+                "1": {
+                  "index": 1,
+                  "text": "Warning"
+                }
+              },
+              "type": "value"
+            },
+            {
+              "options": {
+                "from": 2,
+                "result": {
+                  "index": 2,
+                  "text": "Unhealthy"
+                },
+                "to": 3
+              },
+              "type": "range"
+            }
+          ],
+          "max": 3,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "#808080",
+                "value": null
+              },
+              {
+                "color": "dark-green",
+                "value": 0
+              },
+              {
+                "color": "dark-yellow",
+                "value": 1
+              },
+              {
+                "color": "dark-red",
+                "value": 2
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 3,
+        "x": 12,
+        "y": 6
+      },
+      "id": 59,
+      "links": [],
+      "options": {
+        "colorMode": "background_solid",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["max"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "AzureMetrics\r\n| where _ResourceId has '/microsoft.network/azurefirewalls/'\r\n| where MetricName in('FirewallHealth', 'SNATPortUtilization') \r\n| summarize\r\n  kpi1 = avgif(Average, MetricName == 'FirewallHealth'),\r\n  kpi2 = avgif(Average, MetricName == 'SNATPortUtilization') by _ResourceId, Resource\r\n|extend kpi1 = iff(isnan(kpi1), 0.0, kpi1)\r\n|extend kpi2 = iff(isnan(kpi2), 0.0, kpi2)\r\n|extend health1 = iff(kpi1<90, 1, 0)\r\n|extend health2 = iff(kpi2>80, 1, 0)\r\n|extend health = health1 + health2",
+            "resources": ["/subscriptions/$sub"]
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscriptions": ["ebb79bc0-aa86-44a7-8111-cabbe0c43993"]
+        }
+      ],
+      "title": "Firewalls",
+      "transformations": [
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "A": false,
+              "Resource": true,
+              "_ResourceId": true,
+              "health1": true,
+              "health2": true,
+              "health3": true,
+              "kpi1": true,
+              "kpi2": true,
+              "kpi3": true
+            },
+            "indexByName": {},
+            "renameByName": {
+              "A": " ",
+              "health": " "
+            }
+          }
+        }
+      ],
+      "transparent": true,
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "links": [],
+          "mappings": [
+            {
+              "options": {
+                "0": {
+                  "index": 0,
+                  "text": "Healthy"
+                },
+                "1": {
+                  "index": 1,
+                  "text": "Warning"
+                }
+              },
+              "type": "value"
+            },
+            {
+              "options": {
+                "from": 2,
+                "result": {
+                  "index": 2,
+                  "text": "Unhealthy"
+                },
+                "to": 3
+              },
+              "type": "range"
+            }
+          ],
+          "max": 3,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "#808080",
+                "value": null
+              },
+              {
+                "color": "dark-green",
+                "value": 0
+              },
+              {
+                "color": "dark-yellow",
+                "value": 1
+              },
+              {
+                "color": "dark-red",
+                "value": 2
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 3,
+        "x": 15,
+        "y": 6
+      },
+      "id": 57,
+      "links": [],
+      "options": {
+        "colorMode": "background_solid",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["max"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "AzureMetrics\r\n| where _ResourceId has '/microsoft.network/virtualnetworkgateways/'\r\n| where MetricName in('TunnelAverageBandwidth', 'AverageBandwidth', 'TunnelIngressBytes' )\r\n| summarize\r\n  kpi1 = avgif(Average, MetricName == 'TunnelAverageBandwidth'),\r\n  kpi2 = avgif(Average, MetricName == 'TunnelEgressBytes'),\r\n  kpi3 = avgif(Total, MetricName == 'TunnelIngressBytes') by _ResourceId, Resource\r\n|extend kpi1 = iff(isnan(kpi1), 0.0, kpi1)\r\n|extend kpi2 = iff(isnan(kpi2), 0.0, kpi2) \r\n|extend kpi3 = iff(isnan(kpi3), 0.0, kpi3)\r\n|extend health1 = iff(kpi1<1, 1, 0)\r\n|extend health2 = iff(kpi2<=1, 1, 0)\r\n|extend health3 = iff(kpi3<=1, 1, 0)\r\n|extend health = health1 + health2 + health3",
+            "resources": ["/subscriptions/$sub"]
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscriptions": ["ebb79bc0-aa86-44a7-8111-cabbe0c43993"]
+        }
+      ],
+      "title": "VPN Gateways",
+      "transformations": [
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "A": false,
+              "Resource": true,
+              "_ResourceId": true,
+              "health1": true,
+              "health2": true,
+              "health3": true,
+              "kpi1": true,
+              "kpi2": true,
+              "kpi3": true
+            },
+            "indexByName": {},
+            "renameByName": {
+              "A": " ",
+              "health": " "
+            }
+          }
+        }
+      ],
+      "transparent": true,
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "links": [],
+          "mappings": [
+            {
+              "options": {
+                "0": {
+                  "index": 0,
+                  "text": "Healthy"
+                },
+                "1": {
+                  "index": 1,
+                  "text": "Warning"
+                }
+              },
+              "type": "value"
+            },
+            {
+              "options": {
+                "from": 2,
+                "result": {
+                  "index": 2,
+                  "text": "Unhealthy"
+                },
+                "to": 3
+              },
+              "type": "range"
+            }
+          ],
+          "max": 3,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "#808080",
+                "value": null
+              },
+              {
+                "color": "dark-green",
+                "value": 0
+              },
+              {
+                "color": "dark-yellow",
+                "value": 1
+              },
+              {
+                "color": "dark-red",
+                "value": 2
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 3,
+        "x": 18,
+        "y": 6
+      },
+      "id": 66,
+      "links": [],
+      "options": {
+        "colorMode": "background_solid",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["max"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "AzureMetrics\r\n| where _ResourceId has '/microsoft.network/virtualnetworkgateways/'\r\n| where MetricName in('ExpressRouteGatewayCpuUtilization', 'ExpressRouteGatewayBitsPerSecond', 'ExpressRouteGatewayPacketsPerSecond' )\r\n| summarize\r\n  kpi1 = avgif(Average, MetricName == 'ExpressRouteGatewayCpuUtilization'),\r\n  kpi2 = avgif(Average, MetricName == 'ExpressRouteGatewayBitsPerSecond'),\r\n  kpi3 = avgif(Total, MetricName == 'ExpressRouteGatewayPacketsPerSecond') by _ResourceId, Resource\r\n|extend kpi1 = iff(isnan(kpi1), 0.0, kpi1)\r\n|extend kpi2 = iff(isnan(kpi2), 0.0, kpi2) \r\n|extend kpi3 = iff(isnan(kpi3), 0.0, kpi3)\r\n|extend health1 = iff(kpi1>80, 1, 0)\r\n|extend health2 = iff(kpi2<=1, 1, 0)\r\n|extend health3 = iff(kpi3<=1, 1, 0)\r\n|extend health = health1 + health2 + health3",
+            "resources": ["/subscriptions/$sub"]
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscriptions": ["ebb79bc0-aa86-44a7-8111-cabbe0c43993"]
+        }
+      ],
+      "title": "ExpressRoute Gateways",
+      "transformations": [
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "A": false,
+              "Resource": true,
+              "_ResourceId": true,
+              "health1": true,
+              "health2": true,
+              "health3": true,
+              "kpi1": true,
+              "kpi2": true,
+              "kpi3": true
+            },
+            "indexByName": {},
+            "renameByName": {
+              "A": " ",
+              "health": " "
+            }
+          }
+        }
+      ],
+      "transparent": true,
+      "type": "stat"
+    },
+    {
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 9
+      },
+      "id": 25,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "",
+        "mode": "markdown"
+      },
+      "transparent": true,
+      "type": "text"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 10
+      },
+      "id": 22,
+      "panels": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 100,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080",
+                    "value": null
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 80
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 0,
+            "y": 11
+          },
+          "id": 6,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 2,
+              "refId": "A"
+            }
+          ],
+          "title": "Virtual Machine CPU Percentage",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "health4": true,
+                  "kpi2": true,
+                  "kpi3": true,
+                  "kpi4": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": true,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 100,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080",
+                    "value": null
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 85
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 6,
+            "y": 11
+          },
+          "id": 92,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 2,
+              "refId": "A"
+            }
+          ],
+          "title": "Virtual Machine CPU Utilization 95th Percentile",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "TimeGenerated": true,
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "health4": true,
+                  "kpi1": true,
+                  "kpi2": false,
+                  "kpi3": true,
+                  "kpi4": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": true,
+                    "field": "kpi2"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 15,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080",
+                    "value": null
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 1
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 12,
+            "y": 11
+          },
+          "id": 7,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 2,
+              "refId": "A"
+            }
+          ],
+          "title": "Virtual Machine Available Memory GB",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "health4": true,
+                  "kpi1": true,
+                  "kpi2": true,
+                  "kpi3": false,
+                  "kpi4": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "field": "kpi3"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 100,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080",
+                    "value": null
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 90
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 18,
+            "y": 11
+          },
+          "id": 8,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 2,
+              "refId": "A"
+            }
+          ],
+          "title": "Virtual Machine Availability",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "health4": true,
+                  "kpi1": true,
+                  "kpi2": true,
+                  "kpi3": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "field": "kpi4"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        }
+      ],
+      "title": "Virtual Machines",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 11
+      },
+      "id": 21,
+      "panels": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 100,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 80
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 0,
+            "y": 24
+          },
+          "id": 16,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 26,
+              "refId": "A"
+            }
+          ],
+          "title": "Virtual Machine Scale Set CPU Percentage",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "health4": true,
+                  "kpi1": false,
+                  "kpi2": true,
+                  "kpi3": true,
+                  "kpi4": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": true,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 100,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 95
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 6,
+            "y": 24
+          },
+          "id": 93,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 26,
+              "refId": "A"
+            }
+          ],
+          "title": "Virtual Machine Scale Set OS Disk IOPS Consumed Percentage",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "health4": true,
+                  "kpi1": true,
+                  "kpi2": false,
+                  "kpi3": true,
+                  "kpi4": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": true,
+                    "field": "kpi2"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 15,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 1
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 12,
+            "y": 24
+          },
+          "id": 17,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 26,
+              "refId": "A"
+            }
+          ],
+          "title": "Virtual Machine Scale Set Available Memory GB",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "health4": true,
+                  "kpi1": true,
+                  "kpi2": true,
+                  "kpi4": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "field": "kpi3"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 100,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 90
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 18,
+            "y": 24
+          },
+          "id": 18,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 26,
+              "refId": "A"
+            }
+          ],
+          "title": "Virtual Machine Scale Set Availability",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "health4": true,
+                  "kpi1": true,
+                  "kpi2": true,
+                  "kpi3": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            }
+          ],
+          "type": "bargauge"
+        }
+      ],
+      "title": "Virtual Machine Scale Sets",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 12
+      },
+      "id": 23,
+      "panels": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 5000,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 5000
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 0,
+            "y": 13
+          },
+          "id": 29,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 27,
+              "refId": "A"
+            }
+          ],
+          "title": "Storage Success End to End Latency",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "health4": true,
+                  "kpi2": true,
+                  "kpi3": true,
+                  "kpi4": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": true,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 5000,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 500
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 6,
+            "y": 13
+          },
+          "id": 30,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 27,
+              "refId": "A"
+            }
+          ],
+          "title": "Storage Failing Transactions",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "health4": true,
+                  "kpi1": true,
+                  "kpi2": false,
+                  "kpi3": true,
+                  "kpi4": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": true,
+                    "field": "kpi2"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 4000000000000000,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 4000000000000000
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 12,
+            "y": 13
+          },
+          "id": 94,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 27,
+              "refId": "A"
+            }
+          ],
+          "title": "Storage Used Capacity",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "health4": true,
+                  "kpi1": true,
+                  "kpi2": true,
+                  "kpi3": false,
+                  "kpi4": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "filterByValue",
+              "options": {
+                "filters": [
+                  {
+                    "config": {
+                      "id": "regex",
+                      "options": {
+                        "value": ".*NaN"
+                      }
+                    },
+                    "fieldName": "kpi3"
+                  }
+                ],
+                "match": "any",
+                "type": "exclude"
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": true,
+                    "field": "kpi3"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 100,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 90
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 18,
+            "y": 13
+          },
+          "id": 31,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 27,
+              "refId": "A"
+            }
+          ],
+          "title": "Storage Availability",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "health4": true,
+                  "kpi1": true,
+                  "kpi2": true,
+                  "kpi3": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": false,
+                    "field": "kpi4"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        }
+      ],
+      "title": "Storage",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 13
+      },
+      "id": 24,
+      "panels": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 2000,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 1000
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 0,
+            "y": 50
+          },
+          "id": 32,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 28,
+              "refId": "A"
+            }
+          ],
+          "title": "Key Vault Service API Latency",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi2": true,
+                  "kpi3": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": true,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 1000,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 500
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 6,
+            "y": 50
+          },
+          "id": 33,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 28,
+              "refId": "A"
+            }
+          ],
+          "title": "Key Vault Failing Transactions",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi1": true,
+                  "kpi2": false,
+                  "kpi3": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": true,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 100,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 90
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 12,
+            "y": 50
+          },
+          "id": 51,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 28,
+              "refId": "A"
+            }
+          ],
+          "title": "Key Vault Availability",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi1": true,
+                  "kpi2": true,
+                  "kpi3": false
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": false,
+                    "field": "kpi3"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        }
+      ],
+      "title": "Key Vaults",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 14
+      },
+      "id": 35,
+      "panels": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 5000,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 900
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 0,
+            "y": 63
+          },
+          "id": 37,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 36,
+              "refId": "A"
+            }
+          ],
+          "title": "Load Balancer Used SNAT Ports",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi2": true,
+                  "kpi3": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": true,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 100,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 51
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 6,
+            "y": 63
+          },
+          "id": 38,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 36,
+              "refId": "A"
+            }
+          ],
+          "title": "Load Balancer Health Probe Status",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi1": true,
+                  "kpi2": false,
+                  "kpi3": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": false,
+                    "field": "kpi2"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 100,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 50
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 12,
+            "y": 63
+          },
+          "id": 39,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 36,
+              "refId": "A"
+            }
+          ],
+          "title": "Load Balancer Data Path Availability",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi1": true,
+                  "kpi2": true,
+                  "kpi3": false
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": false,
+                    "field": "kpi3"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        }
+      ],
+      "title": "Load Balancers",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 15
+      },
+      "id": 45,
+      "panels": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 25,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 1
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 0,
+            "y": 16
+          },
+          "id": 47,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 46,
+              "refId": "A"
+            }
+          ],
+          "title": "Traffic Manager Endpoint Status by Endpoint",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi2": true,
+                  "kpi3": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": false,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 25,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 1
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 6,
+            "y": 16
+          },
+          "id": 48,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 46,
+              "refId": "A"
+            }
+          ],
+          "title": "Traffic Manager Queries by Endpoint Returned",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi1": true,
+                  "kpi2": false,
+                  "kpi3": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": false,
+                    "field": "kpi2"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        }
+      ],
+      "title": "Traffic Managers",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 16
+      },
+      "id": 40,
+      "panels": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 25,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 1
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 0,
+            "y": 89
+          },
+          "id": 42,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 41,
+              "refId": "A"
+            }
+          ],
+          "title": "Application Gateway Unhealthy Host Count",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi2": true,
+                  "kpi3": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": true,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 500,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 10
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 6,
+            "y": 89
+          },
+          "id": 43,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 41,
+              "refId": "A"
+            }
+          ],
+          "title": "Application Gateway Failed Requests",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi1": true,
+                  "kpi2": false,
+                  "kpi3": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": true,
+                    "field": "kpi2"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 25,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 1
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 12,
+            "y": 89
+          },
+          "id": 44,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 41,
+              "refId": "A"
+            }
+          ],
+          "title": "Application Gateway Healthy Host Count",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi1": true,
+                  "kpi2": true,
+                  "kpi3": false
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": false,
+                    "field": "kpi3"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        }
+      ],
+      "title": "Application Gateways",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 17
+      },
+      "id": 52,
+      "panels": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 500,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 100
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 0,
+            "y": 102
+          },
+          "id": 69,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 53,
+              "refId": "A"
+            }
+          ],
+          "title": "Front Door Total Latency",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi2": true,
+                  "kpi3": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": true,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 500,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 50
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 6,
+            "y": 102
+          },
+          "id": 70,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 53,
+              "refId": "A"
+            }
+          ],
+          "title": "Front Door Byte Hit Ratio",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi2": true,
+                  "kpi3": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": true,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 100,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 95
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 12,
+            "y": 102
+          },
+          "id": 71,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 53,
+              "refId": "A"
+            }
+          ],
+          "title": "Front Door Origin Health Percentage",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi2": true,
+                  "kpi3": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": false,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        }
+      ],
+      "title": "Front Doors",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 18
+      },
+      "id": 49,
+      "panels": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 100,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 99
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 0,
+            "y": 115
+          },
+          "id": 72,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 50,
+              "refId": "A"
+            }
+          ],
+          "title": "Public IP Availability",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi1": false,
+                  "kpi2": true,
+                  "kpi3": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": false,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 1,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 0.001
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 6,
+            "y": 115
+          },
+          "id": 95,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 50,
+              "refId": "A"
+            }
+          ],
+          "title": "Virtual Network Under DDoS Attack",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi1": true,
+                  "kpi2": false,
+                  "kpi3": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": true,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 50000,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 1000
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 12,
+            "y": 115
+          },
+          "id": 96,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 50,
+              "refId": "A"
+            }
+          ],
+          "title": "Virtual Network Inbound Packets DDoS",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi1": true,
+                  "kpi2": true,
+                  "kpi3": false
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": true,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        }
+      ],
+      "title": "Public IPs",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 19
+      },
+      "id": 58,
+      "panels": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 100,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 90
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 0,
+            "y": 128
+          },
+          "id": 78,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 59,
+              "refId": "A"
+            }
+          ],
+          "title": "Firewall Health",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi1": false,
+                  "kpi2": true,
+                  "kpi3": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": false,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 1000,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 80
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 6,
+            "y": 128
+          },
+          "id": 79,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 59,
+              "refId": "A"
+            }
+          ],
+          "title": "Firewall SNAT Port Utilization",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi1": true,
+                  "kpi2": false,
+                  "kpi3": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": true,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        }
+      ],
+      "title": "Firewalls",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 20
+      },
+      "id": 55,
+      "panels": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 1,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 0.001
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 0,
+            "y": 141
+          },
+          "id": 34,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 54,
+              "refId": "A"
+            }
+          ],
+          "title": "Virtual Network Under DDoS Attack",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi1": false,
+                  "kpi2": true,
+                  "kpi3": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": true,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 50000,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 1000
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 6,
+            "y": 141
+          },
+          "id": 73,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 54,
+              "refId": "A"
+            }
+          ],
+          "title": "Virtual Network Inbound Packets DDoS",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi1": true,
+                  "kpi2": false,
+                  "kpi3": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": true,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 5000,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 1
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 12,
+            "y": 141
+          },
+          "id": 74,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 54,
+              "refId": "A"
+            }
+          ],
+          "title": "Virtual Network Packets Forwarded DDoS",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi1": true,
+                  "kpi2": true,
+                  "kpi3": false
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": true,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        }
+      ],
+      "title": "Virtual Networks",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 21
+      },
+      "id": 56,
+      "panels": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 100000,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 1
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 0,
+            "y": 154
+          },
+          "id": 75,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 57,
+              "refId": "A"
+            }
+          ],
+          "title": "VPN Gateway Tunnel Bandwidth",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi1": false,
+                  "kpi2": true,
+                  "kpi3": false
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": false,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 8000000000,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 2
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 6,
+            "y": 154
+          },
+          "id": 76,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 57,
+              "refId": "A"
+            }
+          ],
+          "title": "VPN Gateway Tunnel Egress Bytes",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi1": false,
+                  "kpi2": true,
+                  "kpi3": false
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": false,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 8000000000,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 2
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 12,
+            "y": 154
+          },
+          "id": 77,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 57,
+              "refId": "A"
+            }
+          ],
+          "title": "VPN Gateway Tunnel Ingress Bytes",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi1": false,
+                  "kpi2": true,
+                  "kpi3": false
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": false,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        }
+      ],
+      "title": "VPN Gateways",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 22
+      },
+      "id": 67,
+      "panels": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 100,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 90
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 0,
+            "y": 167
+          },
+          "id": 87,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 68,
+              "refId": "A"
+            }
+          ],
+          "title": "Express Route Circuit BGP Availability",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "Health": true,
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi1": false,
+                  "kpi2": true,
+                  "kpi3": true,
+                  "kpi4": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": true,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 100,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 90
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 6,
+            "y": 167
+          },
+          "id": 97,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 68,
+              "refId": "A"
+            }
+          ],
+          "title": "Express Route Circuit ARP Availability",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "Health": true,
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi1": true,
+                  "kpi2": false,
+                  "kpi3": true,
+                  "kpi4": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": true,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 10000,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 100
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 12,
+            "y": 167
+          },
+          "id": 88,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 68,
+              "refId": "A"
+            }
+          ],
+          "title": "Express Route QoS Drop Bits In Per Second",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "Health": true,
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi1": true,
+                  "kpi2": true,
+                  "kpi3": false,
+                  "kpi4": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": true,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 10000,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 100
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 18,
+            "y": 167
+          },
+          "id": 89,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 68,
+              "refId": "A"
+            }
+          ],
+          "title": "Express Route QoS Drop Bits Out Per Second",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "Health": true,
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi1": true,
+                  "kpi2": true,
+                  "kpi3": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": true,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        }
+      ],
+      "title": "ExpressRoute Circuits",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 23
+      },
+      "id": 65,
+      "panels": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 100,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 80
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 0,
+            "y": 180
+          },
+          "id": 84,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 66,
+              "refId": "A"
+            }
+          ],
+          "title": "Express Route Gateway CPU Utilization",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi1": false,
+                  "kpi2": true,
+                  "kpi3": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": true,
+                    "field": "kpi1"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 100000,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 2
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 6,
+            "y": 180
+          },
+          "id": 85,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 66,
+              "refId": "A"
+            }
+          ],
+          "title": "Express Route Gateway Bits Per Second",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi1": true,
+                  "kpi2": false,
+                  "kpi3": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": false,
+                    "field": "kpi2"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        },
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "max": 100000,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "#808080"
+                  },
+                  {
+                    "color": "dark-red",
+                    "value": 0
+                  },
+                  {
+                    "color": "dark-green",
+                    "value": 2
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 12,
+            "w": 6,
+            "x": 12,
+            "y": 180
+          },
+          "id": 86,
+          "options": {
+            "displayMode": "basic",
+            "minVizHeight": 10,
+            "minVizWidth": 0,
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": ["lastNotNull"],
+              "fields": "",
+              "values": true
+            },
+            "showUnfilled": true,
+            "valueMode": "color"
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "datasource",
+                "uid": "-- Dashboard --"
+              },
+              "panelId": 66,
+              "refId": "A"
+            }
+          ],
+          "title": "Express Route Gateway Packets Per Second",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "_ResourceId": true,
+                  "health": true,
+                  "health1": true,
+                  "health2": true,
+                  "health3": true,
+                  "kpi1": true,
+                  "kpi2": true,
+                  "kpi3": false
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            },
+            {
+              "id": "sortBy",
+              "options": {
+                "fields": {},
+                "sort": [
+                  {
+                    "desc": false,
+                    "field": "kpi3"
+                  }
+                ]
+              }
+            }
+          ],
+          "type": "bargauge"
+        }
+      ],
+      "title": "ExpressRoute Gateway",
+      "type": "row"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 38,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": [
+      {
+        "current": {},
+        "hide": 0,
+        "includeAll": false,
+        "label": "Datasource",
+        "multi": false,
+        "name": "ds",
+        "options": [],
+        "query": "grafana-azure-monitor-datasource",
+        "queryValue": "",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "type": "datasource"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Subscription",
+        "multi": false,
+        "name": "sub",
+        "options": [],
+        "query": {
+          "azureLogAnalytics": {
+            "query": "",
+            "resources": []
+          },
+          "queryType": "Azure Subscriptions",
+          "refId": "A"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 5,
+        "type": "query"
+      }
+    ]
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Azure / Infrastructure / Infrastructure Monitoring",
+  "uid": "azure-infrastructure-monitoring",
+  "version": 215
+}
diff --git a/public/app/plugins/datasource/azuremonitor/dataquery.gen.ts b/public/app/plugins/datasource/azuremonitor/dataquery.gen.ts
index b9f234a9a3c0d..8616ca3ac596c 100644
--- a/public/app/plugins/datasource/azuremonitor/dataquery.gen.ts
+++ b/public/app/plugins/datasource/azuremonitor/dataquery.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
@@ -372,4 +372,4 @@ export interface WorkspacesQuery extends BaseGrafanaTemplateVariableQuery {
 
 export type GrafanaTemplateVariableQuery = (AppInsightsMetricNameQuery | AppInsightsGroupByQuery | SubscriptionsQuery | ResourceGroupsQuery | ResourceNamesQuery | MetricNamespaceQuery | MetricDefinitionsQuery | MetricNamesQuery | WorkspacesQuery | UnknownQuery);
 
-export interface AzureMonitor {}
+export interface AzureMonitorDataQuery {}
diff --git a/public/app/plugins/datasource/azuremonitor/datasource.ts b/public/app/plugins/datasource/azuremonitor/datasource.ts
index 964b958ded97f..224f4680f7bd4 100644
--- a/public/app/plugins/datasource/azuremonitor/datasource.ts
+++ b/public/app/plugins/datasource/azuremonitor/datasource.ts
@@ -16,8 +16,9 @@ import { DataSourceWithBackend, getTemplateSrv, TemplateSrv } from '@grafana/run
 import AzureLogAnalyticsDatasource from './azure_log_analytics/azure_log_analytics_datasource';
 import AzureMonitorDatasource from './azure_monitor/azure_monitor_datasource';
 import AzureResourceGraphDatasource from './azure_resource_graph/azure_resource_graph_datasource';
+import { instanceOfAzureCredential, isCredentialsComplete } from './credentials';
 import ResourcePickerData from './resourcePicker/resourcePickerData';
-import { AzureDataSourceJsonData, AzureMonitorQuery, AzureQueryType } from './types';
+import { AadCurrentUserCredentials, AzureDataSourceJsonData, AzureMonitorQuery, AzureQueryType } from './types';
 import migrateAnnotation from './utils/migrateAnnotation';
 import migrateQuery from './utils/migrateQuery';
 import { VariableSupport } from './variables';
@@ -31,6 +32,8 @@ export default class Datasource extends DataSourceWithBackend<AzureMonitorQuery,
   azureLogAnalyticsDatasource: AzureLogAnalyticsDatasource;
   resourcePickerData: ResourcePickerData;
   azureResourceGraphDatasource: AzureResourceGraphDatasource;
+  currentUserAuth: boolean;
+  currentUserAuthFallbackAvailable: boolean;
 
   pseudoDatasource: {
     [key in AzureQueryType]?: AzureMonitorDatasource | AzureLogAnalyticsDatasource | AzureResourceGraphDatasource;
@@ -55,14 +58,28 @@ export default class Datasource extends DataSourceWithBackend<AzureMonitorQuery,
     };
 
     this.variables = new VariableSupport(this);
+
+    this.currentUserAuth = instanceSettings.jsonData.azureAuthType === 'currentuser';
+    const credentials = instanceSettings.jsonData.azureCredentials;
+    if (credentials && instanceOfAzureCredential<AadCurrentUserCredentials>('currentuser', credentials)) {
+      if (!credentials.serviceCredentials) {
+        this.currentUserAuthFallbackAvailable = false;
+      } else {
+        this.currentUserAuthFallbackAvailable = isCredentialsComplete(credentials.serviceCredentials, true);
+      }
+    } else {
+      this.currentUserAuthFallbackAvailable = false;
+    }
   }
 
   filterQuery(item: AzureMonitorQuery): boolean {
     if (!item.queryType) {
       return false;
     }
+
+    const query = migrateQuery(item);
     const ds = this.pseudoDatasource[item.queryType];
-    return ds?.filterQuery?.(item) ?? true;
+    return ds?.filterQuery?.(query) ?? true;
   }
 
   query(options: DataQueryRequest<AzureMonitorQuery>): Observable<DataQueryResponse> {
diff --git a/public/app/plugins/datasource/azuremonitor/e2e/selectors.ts b/public/app/plugins/datasource/azuremonitor/e2e/selectors.ts
index 9d77b7f927c69..e2c8c09bb7387 100644
--- a/public/app/plugins/datasource/azuremonitor/e2e/selectors.ts
+++ b/public/app/plugins/datasource/azuremonitor/e2e/selectors.ts
@@ -23,11 +23,16 @@ export const components = {
     defaultSubscription: {
       input: 'data-testid default-subscription',
     },
+    serviceCredentialsEnabled: {
+      button: 'data-testid service-credentials-enabled',
+    },
   },
   queryEditor: {
     header: {
       select: 'data-testid azure-monitor-experimental-header',
     },
+    userAuthAlert: 'data-testid azure-monitor-user-auth-invalid-auth-provider-alert',
+    userAuthFallbackAlert: 'data-testid azure-monitor-user-auth-fallback-alert',
     resourcePicker: {
       select: {
         button: 'data-testid resource-picker-select',
diff --git a/public/app/plugins/datasource/azuremonitor/module.ts b/public/app/plugins/datasource/azuremonitor/module.ts
index 6322011442d31..042649618042b 100644
--- a/public/app/plugins/datasource/azuremonitor/module.ts
+++ b/public/app/plugins/datasource/azuremonitor/module.ts
@@ -1,7 +1,7 @@
 import { DataSourcePlugin, DashboardLoadedEvent } from '@grafana/data';
 import { getAppEvents } from '@grafana/runtime';
 
-import { ConfigEditor } from './components/ConfigEditor';
+import { ConfigEditor } from './components/ConfigEditor/ConfigEditor';
 import AzureMonitorQueryEditor from './components/QueryEditor';
 import Datasource from './datasource';
 import pluginJson from './plugin.json';
diff --git a/public/app/plugins/datasource/azuremonitor/package.json b/public/app/plugins/datasource/azuremonitor/package.json
new file mode 100644
index 0000000000000..4c0ffcc69cd89
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/package.json
@@ -0,0 +1,50 @@
+{
+  "name": "@grafana-plugins/grafana-azure-monitor-datasource",
+  "description": "Grafana data source for Azure Monitor",
+  "private": true,
+  "version": "11.0.0",
+  "dependencies": {
+    "@emotion/css": "11.11.2",
+    "@grafana/data": "11.0.0",
+    "@grafana/experimental": "1.7.10",
+    "@grafana/runtime": "11.0.0",
+    "@grafana/schema": "11.0.0",
+    "@grafana/ui": "11.0.0",
+    "@kusto/monaco-kusto": "^10.0.0",
+    "fast-deep-equal": "^3.1.3",
+    "i18next": "^23.0.0",
+    "immer": "10.0.4",
+    "lodash": "4.17.21",
+    "monaco-editor": "0.34.0",
+    "prismjs": "1.29.0",
+    "react": "18.2.0",
+    "react-use": "17.5.0",
+    "rxjs": "7.8.1",
+    "tslib": "2.6.2"
+  },
+  "devDependencies": {
+    "@grafana/e2e-selectors": "11.0.0",
+    "@grafana/plugin-configs": "11.0.0",
+    "@testing-library/react": "14.2.2",
+    "@testing-library/user-event": "14.5.2",
+    "@types/jest": "29.5.12",
+    "@types/lodash": "4.17.0",
+    "@types/node": "20.11.30",
+    "@types/prismjs": "1.26.3",
+    "@types/react": "18.2.73",
+    "@types/testing-library__jest-dom": "5.14.9",
+    "react-select-event": "5.5.1",
+    "ts-node": "10.9.2",
+    "typescript": "5.3.3",
+    "webpack": "5.91.0"
+  },
+  "peerDependencies": {
+    "@grafana/runtime": "*"
+  },
+  "scripts": {
+    "build": "webpack -c ./webpack.config.ts --env production",
+    "build:commit": "webpack -c ./webpack.config.ts --env production --env commit=$(git rev-parse --short HEAD)",
+    "dev": "webpack -w -c ./webpack.config.ts --env development"
+  },
+  "packageManager": "yarn@4.1.0"
+}
diff --git a/public/app/plugins/datasource/azuremonitor/plugin.json b/public/app/plugins/datasource/azuremonitor/plugin.json
index 085509e03d290..9e1d8c49be308 100644
--- a/public/app/plugins/datasource/azuremonitor/plugin.json
+++ b/public/app/plugins/datasource/azuremonitor/plugin.json
@@ -5,11 +5,21 @@
   "category": "cloud",
   "includes": [
     { "type": "dashboard", "name": "Azure / Alert Consumption", "path": "dashboards/v1Alerts.json" },
+    {
+      "type": "dashboard",
+      "name": "Azure / Infrastructure / Infrastructure Monitoring",
+      "path": "dashboards/infrastructureMonitoring.json"
+    },
     {
       "type": "dashboard",
       "name": "Azure / Azure PostgreSQL / Flexible Server Monitoring",
       "path": "dashboards/postgresFlexibleServer.json"
     },
+    {
+      "type": "dashboard",
+      "name": "Azure Monitor / Container Insights / Syslog",
+      "path": "dashboards/containerInsightsSyslog.json"
+    },
     {
       "type": "dashboard",
       "name": "Azure / Insights / Applications",
@@ -67,7 +77,7 @@
     },
     { "type": "dashboard", "name": "Azure / Resources Overview", "path": "dashboards/arg.json" }
   ],
-
+  "executable": "gpx_azuremonitor",
   "info": {
     "description": "Data source for Microsoft Azure Monitor & Application Insights",
     "author": {
@@ -88,11 +98,11 @@
       { "name": "Azure Monitor Network", "path": "img/azure_monitor_network.png" },
       { "name": "Azure Monitor CPU", "path": "img/azure_monitor_cpu.png" }
     ],
-    "version": "1.0.0"
+    "version": "%VERSION%"
   },
 
   "dependencies": {
-    "grafanaVersion": "5.2.x",
+    "grafanaDependency": ">=10.3.0",
     "plugins": []
   },
 
diff --git a/public/app/plugins/datasource/azuremonitor/tsconfig.json b/public/app/plugins/datasource/azuremonitor/tsconfig.json
new file mode 100644
index 0000000000000..7daf2ee8abab6
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "@grafana/plugin-configs/tsconfig.json",
+  "include": ["."]
+}
diff --git a/public/app/plugins/datasource/azuremonitor/types/query.ts b/public/app/plugins/datasource/azuremonitor/types/query.ts
index 0c4287928cdb1..c9098ef91c700 100644
--- a/public/app/plugins/datasource/azuremonitor/types/query.ts
+++ b/public/app/plugins/datasource/azuremonitor/types/query.ts
@@ -1,7 +1,7 @@
 import { AzureMonitorQuery as AzureMonitorQueryBase, AzureQueryType } from '../dataquery.gen';
 
 export { AzureQueryType };
-export {
+export type {
   AzureMetricQuery,
   AzureLogsQuery,
   AzureResourceGraphQuery,
@@ -9,8 +9,8 @@ export {
   AzureMonitorResource,
   AzureMetricDimension,
   AzureTracesFilter,
-  ResultFormat,
 } from '../dataquery.gen';
+export { ResultFormat } from '../dataquery.gen';
 
 /**
  * Represents the query as it moves through the frontend query editor and datasource files.
diff --git a/public/app/plugins/datasource/azuremonitor/types/types.ts b/public/app/plugins/datasource/azuremonitor/types/types.ts
index b0372b757240c..dde36a69ee6ae 100644
--- a/public/app/plugins/datasource/azuremonitor/types/types.ts
+++ b/public/app/plugins/datasource/azuremonitor/types/types.ts
@@ -1,4 +1,4 @@
-import { ScalarParameter, TabularParameter, Function } from '@kusto/monaco-kusto';
+import { ScalarParameter, TabularParameter, Function, EntityGroup } from '@kusto/monaco-kusto';
 
 import {
   DataSourceInstanceSettings,
@@ -33,7 +33,7 @@ export enum AzureCloud {
   None = '',
 }
 
-export type AzureAuthType = 'msi' | 'clientsecret' | 'workloadidentity';
+export type AzureAuthType = 'msi' | 'clientsecret' | 'workloadidentity' | 'currentuser';
 
 export type ConcealedSecret = symbol;
 
@@ -56,8 +56,17 @@ export interface AzureClientSecretCredentials extends AzureCredentialsBase {
   clientId?: string;
   clientSecret?: string | ConcealedSecret;
 }
+export interface AadCurrentUserCredentials extends AzureCredentialsBase {
+  authType: 'currentuser';
+  serviceCredentials?:
+    | AzureClientSecretCredentials
+    | AzureManagedIdentityCredentials
+    | AzureWorkloadIdentityCredentials;
+  serviceCredentialsEnabled?: boolean;
+}
 
 export type AzureCredentials =
+  | AadCurrentUserCredentials
   | AzureManagedIdentityCredentials
   | AzureClientSecretCredentials
   | AzureWorkloadIdentityCredentials;
@@ -70,6 +79,8 @@ export interface AzureDataSourceJsonData extends DataSourceJsonData {
   tenantId?: string;
   clientId?: string;
   subscriptionId?: string;
+  oauthPassThru?: boolean;
+  azureCredentials?: AzureCredentials;
 
   // logs
   /** @deprecated Azure Logs credentials */
@@ -167,6 +178,7 @@ export interface Database {
   functions: Function[];
   majorVersion: number;
   minorVersion: number;
+  entityGroups: EntityGroup[];
 }
 
 export interface FormatAsFieldProps extends AzureQueryEditorFieldProps {
diff --git a/public/app/plugins/datasource/azuremonitor/utils/common.test.ts b/public/app/plugins/datasource/azuremonitor/utils/common.test.ts
index 066d63a81231f..0c55057fbfbd0 100644
--- a/public/app/plugins/datasource/azuremonitor/utils/common.test.ts
+++ b/public/app/plugins/datasource/azuremonitor/utils/common.test.ts
@@ -1,4 +1,4 @@
-import { initialCustomVariableModelState } from 'app/features/variables/custom/reducer';
+import { initialCustomVariableModelState } from '../__mocks__/variables';
 
 import { hasOption, interpolateVariable } from './common';
 
diff --git a/public/app/plugins/datasource/azuremonitor/utils/testUtils.ts b/public/app/plugins/datasource/azuremonitor/utils/testUtils.ts
new file mode 100644
index 0000000000000..62bd8c169491c
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/utils/testUtils.ts
@@ -0,0 +1,8 @@
+import { waitFor } from '@testing-library/react';
+import { select } from 'react-select-event';
+
+// Used to select an option or options from a Select in unit tests
+export const selectOptionInTest = async (
+  input: HTMLElement,
+  optionOrOptions: string | RegExp | Array<string | RegExp>
+) => await waitFor(() => select(input, optionOrOptions, { container: document.body }));
diff --git a/public/app/plugins/datasource/azuremonitor/webpack.config.ts b/public/app/plugins/datasource/azuremonitor/webpack.config.ts
new file mode 100644
index 0000000000000..6457f58a1d234
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/webpack.config.ts
@@ -0,0 +1,14 @@
+import type { Configuration } from 'webpack';
+import { merge } from 'webpack-merge';
+
+import grafanaConfig from '@grafana/plugin-configs/webpack.config';
+
+const config = async (env: Record<string, unknown>): Promise<Configuration> => {
+  const baseConfig = await grafanaConfig(env);
+
+  return merge(baseConfig, {
+    externals: ['@kusto/monaco-kusto'],
+  });
+};
+
+export default config;
diff --git a/public/app/plugins/datasource/cloud-monitoring/.eslintignore b/public/app/plugins/datasource/cloud-monitoring/.eslintignore
new file mode 100644
index 0000000000000..59ac0834c7a79
--- /dev/null
+++ b/public/app/plugins/datasource/cloud-monitoring/.eslintignore
@@ -0,0 +1,2 @@
+# TS generate from cue by cuetsy
+**/*.gen.ts
diff --git a/public/app/plugins/datasource/cloud-monitoring/CHANGELOG.md b/public/app/plugins/datasource/cloud-monitoring/CHANGELOG.md
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/public/app/plugins/datasource/cloud-monitoring/CloudMonitoringMetricFindQuery.ts b/public/app/plugins/datasource/cloud-monitoring/CloudMonitoringMetricFindQuery.ts
index 1ae2c1096e44a..6131457fb2566 100644
--- a/public/app/plugins/datasource/cloud-monitoring/CloudMonitoringMetricFindQuery.ts
+++ b/public/app/plugins/datasource/cloud-monitoring/CloudMonitoringMetricFindQuery.ts
@@ -1,7 +1,5 @@
 import { isString } from 'lodash';
 
-import { SelectableValue } from '@grafana/data';
-
 import { ALIGNMENT_PERIODS, SELECTORS } from './constants';
 import CloudMonitoringDatasource from './datasource';
 import {
@@ -59,7 +57,7 @@ export default class CloudMonitoringMetricFindQuery {
 
   async handleProjectsQuery() {
     const projects = await this.datasource.getProjects();
-    return (projects as SelectableValue<string>).map((s: { label: string; value: string }) => ({
+    return projects.map((s) => ({
       text: s.label,
       value: s.value,
       expandable: true,
diff --git a/public/app/plugins/datasource/cloud-monitoring/__mocks__/cloudMonitoringDatasource.ts b/public/app/plugins/datasource/cloud-monitoring/__mocks__/cloudMonitoringDatasource.ts
index aff194f3a5534..1f2cee920cdbf 100644
--- a/public/app/plugins/datasource/cloud-monitoring/__mocks__/cloudMonitoringDatasource.ts
+++ b/public/app/plugins/datasource/cloud-monitoring/__mocks__/cloudMonitoringDatasource.ts
@@ -1,11 +1,9 @@
-import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
-import { TemplateSrv } from 'app/features/templating/template_srv';
-import { TemplateSrvMock } from 'app/features/templating/template_srv.mock';
+import { TemplateSrv, getTemplateSrv } from '@grafana/runtime';
 
 import Datasource from '../datasource';
 
 export const createMockDatasource = (overrides?: Partial<Datasource>) => {
-  const templateSrv = new TemplateSrvMock({ ALIGN_DELTA: 'delta' }) as unknown as TemplateSrv;
+  const templateSrv = getTemplateSrv() as unknown as TemplateSrv;
 
   const datasource: Partial<Datasource> = {
     intervalMs: 0,
@@ -17,7 +15,6 @@ export const createMockDatasource = (overrides?: Partial<Datasource>) => {
     filterMetricsByType: jest.fn().mockResolvedValue([]),
     getSLOServices: jest.fn().mockResolvedValue([]),
     migrateQuery: jest.fn().mockImplementation((query) => query),
-    timeSrv: getTimeSrv(),
     ...overrides,
   };
 
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/Aggregation.test.tsx b/public/app/plugins/datasource/cloud-monitoring/components/Aggregation.test.tsx
index 917ecb70d12ce..59dc781fb24e1 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/Aggregation.test.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/Aggregation.test.tsx
@@ -1,7 +1,6 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 import { openMenu } from 'react-select-event';
-import { TemplateSrvStub } from 'test/specs/helpers';
 
 import { MetricKind, ValueTypes } from '../types/query';
 import { MetricDescriptor } from '../types/types';
@@ -10,8 +9,6 @@ import { Aggregation, Props } from './Aggregation';
 
 const props: Props = {
   onChange: () => {},
-  // @ts-ignore
-  templateSrv: new TemplateSrvStub(),
   metricDescriptor: {
     valueType: '',
     metricKind: '',
@@ -19,6 +16,7 @@ const props: Props = {
   crossSeriesReducer: '',
   groupBys: [],
   templateVariableOptions: [],
+  refId: 'A',
 };
 
 describe('Aggregation', () => {
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/AliasBy.tsx b/public/app/plugins/datasource/cloud-monitoring/components/AliasBy.tsx
index f369f8bdfb38f..eef85c5e9b598 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/AliasBy.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/AliasBy.tsx
@@ -6,7 +6,7 @@ import { Input } from '@grafana/ui';
 
 export interface Props {
   refId: string;
-  onChange: (alias: any) => void;
+  onChange: (alias: string) => void;
   value?: string;
 }
 
@@ -15,14 +15,14 @@ export const AliasBy = ({ refId, value = '', onChange }: Props) => {
 
   const propagateOnChange = debounce(onChange, 1000);
 
-  onChange = (e: any) => {
-    setAlias(e.target.value);
-    propagateOnChange(e.target.value);
+  const onInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    setAlias(e.currentTarget.value);
+    propagateOnChange(e.currentTarget.value);
   };
 
   return (
     <EditorField label="Alias by">
-      <Input id={`${refId}-alias-by`} value={alias} onChange={onChange} />
+      <Input id={`${refId}-alias-by`} value={alias} onChange={onInputChange} />
     </EditorField>
   );
 };
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/Alignment.test.tsx b/public/app/plugins/datasource/cloud-monitoring/components/Alignment.test.tsx
index 4b0580d96ab89..0b33fe8005df2 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/Alignment.test.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/Alignment.test.tsx
@@ -3,7 +3,7 @@ import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { openMenu } from 'react-select-event';
 
-import { TemplateSrvMock } from 'app/features/templating/template_srv.mock';
+import { CustomVariableModel } from '@grafana/data';
 
 import { createMockDatasource } from '../__mocks__/cloudMonitoringDatasource';
 import { createMockMetricDescriptor } from '../__mocks__/cloudMonitoringMetricDescriptor';
@@ -12,10 +12,21 @@ import { MetricKind, ValueTypes } from '../types/query';
 
 import { Alignment } from './Alignment';
 
-jest.mock('@grafana/runtime', () => ({
-  ...jest.requireActual('@grafana/runtime'),
-  getTemplateSrv: () => new TemplateSrvMock({}),
-}));
+let getTempVars = () => [] as CustomVariableModel[];
+let replace = () => '';
+
+jest.mock('@grafana/runtime', () => {
+  return {
+    __esModule: true,
+    ...jest.requireActual('@grafana/runtime'),
+    getTemplateSrv: () => ({
+      replace: replace,
+      getVariables: getTempVars,
+      updateTimeRange: jest.fn(),
+      containsTemplate: jest.fn(),
+    }),
+  };
+});
 
 describe('Alignment', () => {
   it('renders alignment fields', () => {
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/AnnotationQueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/AnnotationQueryEditor.tsx
index e37ee1b252fcf..984f299df68fd 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/AnnotationQueryEditor.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/AnnotationQueryEditor.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { useDebounce } from 'react-use';
 
-import { QueryEditorProps, toOption } from '@grafana/data';
+import { QueryEditorProps, getDefaultTimeRange, toOption } from '@grafana/data';
 import { EditorField, EditorRows } from '@grafana/experimental';
 import { Input } from '@grafana/ui';
 
@@ -22,7 +22,7 @@ export const defaultQuery: (datasource: CloudMonitoringDatasource) => TimeSeries
 });
 
 export const AnnotationQueryEditor = (props: Props) => {
-  const { datasource, query, onRunQuery, data, onChange } = props;
+  const { datasource, query, onRunQuery, data, onChange, range } = props;
   const meta = data?.series.length ? data?.series[0].meta : {};
   const customMetaData = meta?.custom ?? {};
   const timeSeriesList = { ...defaultQuery(datasource), ...query.timeSeriesList };
@@ -73,6 +73,7 @@ export const AnnotationQueryEditor = (props: Props) => {
           onRunQuery={onRunQuery}
           datasource={datasource}
           query={query}
+          range={range || getDefaultTimeRange()}
         />
         <EditorField label="Title" htmlFor="annotation-query-title">
           <Input id="annotation-query-title" value={title} onChange={handleTitleChange} />
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/AnnotationsHelp.tsx b/public/app/plugins/datasource/cloud-monitoring/components/AnnotationsHelp.tsx
index a9ba642e39763..8970adbe0a2f0 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/AnnotationsHelp.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/AnnotationsHelp.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 export const AnnotationsHelp = () => {
   return (
-    <div className="gf-form grafana-info-box alert-info">
+    <div className="grafana-info-box alert-info">
       <div>
         <h5>Annotation Query Format</h5>
         <p>
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/ConfigEditor/ConfigEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/ConfigEditor/ConfigEditor.tsx
index 7b17200f75e06..19baaac47dd0a 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/ConfigEditor/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/ConfigEditor/ConfigEditor.tsx
@@ -3,9 +3,8 @@ import React, { PureComponent } from 'react';
 import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
 import { ConfigSection, DataSourceDescription } from '@grafana/experimental';
 import { ConnectionConfig } from '@grafana/google-sdk';
-import { reportInteraction } from '@grafana/runtime';
+import { reportInteraction, config } from '@grafana/runtime';
 import { Divider, SecureSocksProxySettings } from '@grafana/ui';
-import { config } from 'app/core/config';
 
 import { CloudMonitoringOptions, CloudMonitoringSecureJsonData } from '../../types/types';
 
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/MQLQueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/MQLQueryEditor.tsx
index 48cbd630f49d1..324b55b5e020c 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/MQLQueryEditor.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/MQLQueryEditor.tsx
@@ -9,7 +9,7 @@ export interface Props {
 }
 
 export function MQLQueryEditor({ query, onChange, onRunQuery }: React.PropsWithChildren<Props>) {
-  const onKeyDown = (event: any) => {
+  const onKeyDown = (event: React.KeyboardEvent<HTMLTextAreaElement>) => {
     if (event.key === 'Enter' && (event.shiftKey || event.ctrlKey)) {
       event.preventDefault();
       onRunQuery();
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.test.tsx b/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.test.tsx
index af07908321342..b3975ad9438e5 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.test.tsx
@@ -1,5 +1,9 @@
 import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
+import { openMenu } from 'react-select-event';
+
+import { getDefaultTimeRange } from '@grafana/data';
 
 import { createMockDatasource } from '../__mocks__/cloudMonitoringDatasource';
 import { createMockQuery } from '../__mocks__/cloudMonitoringQuery';
@@ -22,6 +26,7 @@ const defaultProps = {
   onRunQuery: jest.fn(),
   query: createMockQuery(),
   datasource: createMockDatasource(),
+  range: getDefaultTimeRange(),
 };
 
 describe('MetricQueryEditor', () => {
@@ -77,4 +82,33 @@ describe('MetricQueryEditor', () => {
     render(<MetricQueryEditor {...defaultProps} query={query} />);
     await waitFor(() => expect(screen.getByLabelText('Alias by').closest('input')!.value).toEqual('AliasTest'));
   });
+
+  it('runs a timeSeriesList query if there are no filters', async () => {
+    const onRunQuery = jest.fn();
+    const onChange = jest.fn();
+    const query = createMockQuery();
+
+    render(<MetricQueryEditor {...defaultProps} onRunQuery={onRunQuery} onChange={onChange} query={query} />);
+
+    const groupBy = screen.getByLabelText('Group by');
+    openMenu(groupBy);
+    const option = 'metadata.system_labels.cloud_account';
+    await userEvent.click(screen.getByText(option));
+
+    expect(onRunQuery).toHaveBeenCalledTimes(1);
+    expect(onChange).toHaveBeenCalledTimes(1);
+  });
+
+  it('does not run a timeSeriesList query when filter is added', async () => {
+    const onRunQuery = jest.fn();
+    const onChange = jest.fn();
+    const query = createMockQuery();
+
+    render(<MetricQueryEditor {...defaultProps} onRunQuery={onRunQuery} onChange={onChange} query={query} />);
+
+    const addFilter = screen.getByLabelText('Add');
+    await userEvent.click(addFilter);
+    expect(onRunQuery).toHaveBeenCalledTimes(0);
+    expect(onChange).toHaveBeenCalledTimes(1);
+  });
 });
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx
index ea3e20a3a79e5..846ee57fb0850 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect } from 'react';
 
-import { SelectableValue } from '@grafana/data';
+import { SelectableValue, TimeRange } from '@grafana/data';
 import { EditorRows, Stack } from '@grafana/experimental';
 
 import CloudMonitoringDatasource from '../datasource';
@@ -21,6 +21,7 @@ export interface Props {
   onRunQuery: () => void;
   query: CloudMonitoringQuery;
   datasource: CloudMonitoringDatasource;
+  range: TimeRange;
 }
 
 export const defaultTimeSeriesList: (dataSource: CloudMonitoringDatasource) => TimeSeriesList = (dataSource) => ({
@@ -45,11 +46,23 @@ function Editor({
   onRunQuery,
   customMetaData,
   variableOptionGroup,
+  range,
 }: React.PropsWithChildren<Props>) {
   const onChangeTimeSeriesList = useCallback(
     (timeSeriesList: TimeSeriesList) => {
+      let filtersComplete = true;
+      if (timeSeriesList?.filters && timeSeriesList.filters.length > 0) {
+        for (const filter of timeSeriesList.filters) {
+          if (filter === '') {
+            filtersComplete = false;
+            break;
+          }
+        }
+      }
       onQueryChange({ ...query, timeSeriesList });
-      onRunQuery();
+      if (filtersComplete) {
+        onRunQuery();
+      }
     },
     [onQueryChange, onRunQuery, query]
   );
@@ -96,6 +109,7 @@ function Editor({
             query={query.timeSeriesList}
             aliasBy={query.aliasBy}
             onChangeAliasBy={(aliasBy: string) => onQueryChange({ ...query, aliasBy })}
+            range={range}
           />
         )}
 
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/Preprocessor.test.tsx b/public/app/plugins/datasource/cloud-monitoring/components/Preprocessor.test.tsx
index f14905238431d..037a375b3237d 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/Preprocessor.test.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/Preprocessor.test.tsx
@@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { TemplateSrvMock } from 'app/features/templating/template_srv.mock';
+import { CustomVariableModel } from '@grafana/data';
 
 import { createMockMetricDescriptor } from '../__mocks__/cloudMonitoringMetricDescriptor';
 import { createMockTimeSeriesList } from '../__mocks__/cloudMonitoringQuery';
@@ -10,10 +10,21 @@ import { MetricKind, ValueTypes } from '../types/query';
 
 import { Preprocessor } from './Preprocessor';
 
-jest.mock('@grafana/runtime', () => ({
-  ...jest.requireActual('@grafana/runtime'),
-  getTemplateSrv: () => new TemplateSrvMock({}),
-}));
+let getTempVars = () => [] as CustomVariableModel[];
+let replace = () => '';
+
+jest.mock('@grafana/runtime', () => {
+  return {
+    __esModule: true,
+    ...jest.requireActual('@grafana/runtime'),
+    getTemplateSrv: () => ({
+      replace: replace,
+      getVariables: getTempVars,
+      updateTimeRange: jest.fn(),
+      containsTemplate: jest.fn(),
+    }),
+  };
+});
 
 describe('Preprocessor', () => {
   it('only provides "None" as an option if no metric descriptor is provided', () => {
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/QueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/QueryEditor.tsx
index 5005b98d03ce2..0d1eec582c8f2 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/QueryEditor.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/QueryEditor.tsx
@@ -1,12 +1,15 @@
+import { isEqual } from 'lodash';
 import React, { useEffect, useMemo, useState } from 'react';
 
-import { QueryEditorProps, toOption } from '@grafana/data';
+import { QueryEditorProps, getDefaultTimeRange, toOption } from '@grafana/data';
 import { EditorRows } from '@grafana/experimental';
+import { ConfirmModal } from '@grafana/ui';
 
 import CloudMonitoringDatasource from '../datasource';
 import { CloudMonitoringQuery, PromQLQuery, QueryType, SLOQuery } from '../types/query';
 import { CloudMonitoringOptions } from '../types/types';
 
+import { defaultTimeSeriesList, defaultTimeSeriesQuery } from './MetricQueryEditor';
 import { PromQLQueryEditor } from './PromQLEditor';
 import { QueryHeader } from './QueryHeader';
 import { defaultQuery as defaultSLOQuery } from './SLOQueryEditor';
@@ -16,19 +19,26 @@ import { MetricQueryEditor, SLOQueryEditor } from './';
 export type Props = QueryEditorProps<CloudMonitoringDatasource, CloudMonitoringQuery, CloudMonitoringOptions>;
 
 export const QueryEditor = (props: Props) => {
-  const { datasource, query: oldQ, onRunQuery, onChange } = props;
-  // Migrate query if needed
-  const [migrated, setMigrated] = useState(false);
+  const { datasource, query: oldQ, onRunQuery, onChange, range } = props;
+  const [modalIsOpen, setModalIsOpen] = useState<boolean>(false);
+  const [migratedQuery, setMigratedQuery] = useState<CloudMonitoringQuery | undefined>();
   const query = useMemo(() => {
-    if (!migrated) {
-      setMigrated(true);
+    if (!migratedQuery) {
       const migratedQuery = datasource.migrateQuery(oldQ);
+      setMigratedQuery(migratedQuery);
       // Update the query once the migrations have been completed.
       onChange({ ...migratedQuery });
       return migratedQuery;
     }
+
+    if (migratedQuery) {
+      return migratedQuery;
+    }
+
     return oldQ;
-  }, [oldQ, datasource, onChange, migrated]);
+  }, [oldQ, datasource, onChange, migratedQuery]);
+  const [currentQuery, setCurrentQuery] = useState<CloudMonitoringQuery>(query);
+  const [queryHasBeenEdited, setQueryHasBeenEdited] = useState<boolean>(false);
 
   const sloQuery = { ...defaultSLOQuery(datasource), ...query.sloQuery };
   const onSLOQueryChange = (q: SLOQuery) => {
@@ -44,6 +54,16 @@ export const QueryEditor = (props: Props) => {
     onChange({ ...query, promQLQuery: q });
   };
 
+  const onMetricQueryChange = (q: CloudMonitoringQuery) => {
+    if (
+      (q.queryType === QueryType.TIME_SERIES_LIST && !isEqual(q.timeSeriesList, defaultTimeSeriesList(datasource))) ||
+      (q.queryType === QueryType.TIME_SERIES_QUERY && !isEqual(q.timeSeriesQuery, defaultTimeSeriesQuery(datasource)))
+    ) {
+      setQueryHasBeenEdited(true);
+    }
+    onChange(q);
+  };
+
   const meta = props.data?.series.length ? props.data?.series[0].meta : {};
   const customMetaData = meta?.custom ?? {};
   const variableOptionGroup = {
@@ -60,9 +80,39 @@ export const QueryEditor = (props: Props) => {
   });
   const queryType = query.queryType;
 
+  const checkForModalDisplay = (q: CloudMonitoringQuery) => {
+    if (
+      queryHasBeenEdited &&
+      (currentQuery.queryType === QueryType.TIME_SERIES_LIST || currentQuery.queryType === QueryType.TIME_SERIES_QUERY)
+    ) {
+      if (currentQuery.queryType !== q.queryType) {
+        setModalIsOpen(true);
+      }
+    } else {
+      onChange(q);
+    }
+    setCurrentQuery(q);
+  };
+
   return (
     <EditorRows>
-      <QueryHeader query={query} onChange={onChange} onRunQuery={onRunQuery} />
+      <ConfirmModal
+        data-testid="switch-query-type-modal"
+        title="Warning"
+        body="By switching your query type, your current query will be lost."
+        isOpen={modalIsOpen}
+        onConfirm={() => {
+          setModalIsOpen(false);
+          onChange(currentQuery);
+          setQueryHasBeenEdited(false);
+        }}
+        confirmText="Confirm"
+        onDismiss={() => {
+          setModalIsOpen(false);
+          setCurrentQuery(query);
+        }}
+      />
+      <QueryHeader query={query} onChange={checkForModalDisplay} onRunQuery={onRunQuery} />
 
       {queryType === QueryType.PROMQL && (
         <PromQLQueryEditor
@@ -80,10 +130,11 @@ export const QueryEditor = (props: Props) => {
           refId={query.refId}
           variableOptionGroup={variableOptionGroup}
           customMetaData={customMetaData}
-          onChange={onChange}
+          onChange={onMetricQueryChange}
           onRunQuery={onRunQuery}
           datasource={datasource}
           query={query}
+          range={range || getDefaultTimeRange()}
         />
       )}
 
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/VariableQueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/VariableQueryEditor.tsx
index 8a8bb39d0327a..ac3a804caafd5 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/VariableQueryEditor.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/VariableQueryEditor.tsx
@@ -66,7 +66,7 @@ export class CloudMonitoringVariableQueryEditor extends PureComponent<Props, Var
     const metricDescriptors = await this.props.datasource.getMetricTypes(
       this.props.query.projectName || this.props.datasource.getDefaultProject()
     );
-    const services = extractServicesFromMetricDescriptors(metricDescriptors).map((m: any) => ({
+    const services = extractServicesFromMetricDescriptors(metricDescriptors).map((m) => ({
       value: m.service,
       label: m.serviceShortName,
     }));
@@ -87,7 +87,7 @@ export class CloudMonitoringVariableQueryEditor extends PureComponent<Props, Var
 
     const sloServices = await this.props.datasource.getSLOServices(projectName);
 
-    const state: any = {
+    const state = {
       services,
       selectedService,
       metricTypes,
@@ -108,7 +108,7 @@ export class CloudMonitoringVariableQueryEditor extends PureComponent<Props, Var
   };
 
   async onQueryTypeChange(queryType: string) {
-    const state: any = {
+    const state = {
       selectedQueryType: queryType,
       ...(await this.getLabels(this.state.selectedMetricType, this.state.projectName, queryType)),
     };
@@ -148,7 +148,7 @@ export class CloudMonitoringVariableQueryEditor extends PureComponent<Props, Var
       getTemplateSrv().replace(this.state.selectedMetricType),
       getTemplateSrv().replace(service)
     );
-    const state: any = {
+    const state = {
       selectedService: service,
       metricTypes,
       selectedMetricType,
@@ -158,7 +158,7 @@ export class CloudMonitoringVariableQueryEditor extends PureComponent<Props, Var
   }
 
   async onMetricTypeChange(metricType: string) {
-    const state: any = {
+    const state = {
       selectedMetricType: metricType,
       ...(await this.getLabels(metricType, this.state.projectName)),
     };
@@ -195,7 +195,7 @@ export class CloudMonitoringVariableQueryEditor extends PureComponent<Props, Var
       expanded: false,
       options: getTemplateSrv()
         .getVariables()
-        .map((v: any) => ({
+        .map((v) => ({
           value: `$${v.name}`,
           label: `$${v.name}`,
         })),
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.test.tsx b/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.test.tsx
index a1f785be11093..75097175d78f0 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.test.tsx
@@ -3,8 +3,8 @@ import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { openMenu, select } from 'react-select-event';
 
-import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
-import { TemplateSrv } from 'app/features/templating/template_srv';
+import { CustomVariableModel, getDefaultTimeRange } from '@grafana/data';
+import { getTemplateSrv } from '@grafana/runtime';
 
 import { createMockDatasource } from '../__mocks__/cloudMonitoringDatasource';
 import { createMockMetricDescriptor } from '../__mocks__/cloudMonitoringMetricDescriptor';
@@ -22,19 +22,49 @@ const defaultProps = {
   onChangeAliasBy: jest.fn(),
 };
 
+let getTempVars = () => [] as CustomVariableModel[];
+let replace = () => '';
+
+jest.mock('@grafana/runtime', () => {
+  return {
+    __esModule: true,
+    ...jest.requireActual('@grafana/runtime'),
+    getTemplateSrv: () => ({
+      replace: replace,
+      getVariables: getTempVars,
+      updateTimeRange: jest.fn(),
+      containsTemplate: jest.fn(),
+    }),
+  };
+});
+
 describe('VisualMetricQueryEditor', () => {
+  beforeEach(() => {
+    getTempVars = () => [] as CustomVariableModel[];
+    replace = () => '';
+  });
   it('renders metrics fields', async () => {
     const onChange = jest.fn();
     const query = createMockTimeSeriesList();
     const datasource = createMockDatasource();
+    const range = getDefaultTimeRange();
 
-    render(<VisualMetricQueryEditor {...defaultProps} onChange={onChange} datasource={datasource} query={query} />);
+    render(
+      <VisualMetricQueryEditor
+        {...defaultProps}
+        onChange={onChange}
+        datasource={datasource}
+        query={query}
+        range={range}
+      />
+    );
 
     expect(await screen.findByLabelText('Service')).toBeInTheDocument();
     expect(await screen.findByLabelText('Metric name')).toBeInTheDocument();
   });
 
   it('can select a service', async () => {
+    replace = (target?: string) => target || '';
     const onChange = jest.fn();
     const query = createMockTimeSeriesList();
     const mockMetricDescriptor = createMockMetricDescriptor();
@@ -42,8 +72,17 @@ describe('VisualMetricQueryEditor', () => {
       getMetricTypes: jest.fn().mockResolvedValue([mockMetricDescriptor]),
       getLabels: jest.fn().mockResolvedValue([]),
     });
+    const range = getDefaultTimeRange();
 
-    render(<VisualMetricQueryEditor {...defaultProps} onChange={onChange} datasource={datasource} query={query} />);
+    render(
+      <VisualMetricQueryEditor
+        {...defaultProps}
+        onChange={onChange}
+        datasource={datasource}
+        query={query}
+        range={range}
+      />
+    );
 
     const service = await screen.findByLabelText('Service');
     openMenu(service);
@@ -56,6 +95,7 @@ describe('VisualMetricQueryEditor', () => {
   });
 
   it('can select a metric name', async () => {
+    replace = (target?: string) => target || '';
     const onChange = jest.fn();
     const query = createMockTimeSeriesList();
     const mockMetricDescriptor = createMockMetricDescriptor({ displayName: 'metricName_test', type: 'test_type' });
@@ -64,8 +104,17 @@ describe('VisualMetricQueryEditor', () => {
       filterMetricsByType: jest.fn().mockResolvedValue([createMockMetricDescriptor(), mockMetricDescriptor]),
       getLabels: jest.fn().mockResolvedValue([]),
     });
+    const range = getDefaultTimeRange();
 
-    render(<VisualMetricQueryEditor {...defaultProps} onChange={onChange} datasource={datasource} query={query} />);
+    render(
+      <VisualMetricQueryEditor
+        {...defaultProps}
+        onChange={onChange}
+        datasource={datasource}
+        query={query}
+        range={range}
+      />
+    );
 
     const service = await screen.findByLabelText('Service');
     openMenu(service);
@@ -112,14 +161,24 @@ describe('VisualMetricQueryEditor', () => {
       ]),
     });
     const query = createMockTimeSeriesList();
+    const range = getDefaultTimeRange();
 
-    render(<VisualMetricQueryEditor {...defaultProps} onChange={onChange} datasource={datasource} query={query} />);
+    render(
+      <VisualMetricQueryEditor
+        {...defaultProps}
+        onChange={onChange}
+        datasource={datasource}
+        query={query}
+        range={range}
+      />
+    );
     const service = await screen.findByLabelText('Service');
     openMenu(service);
     expect(screen.getAllByLabelText('Select option').length).toEqual(2);
   });
 
   it('resets query to default when service changes', async () => {
+    replace = (target?: string) => target || '';
     const query = createMockTimeSeriesList({ filters: ['metric.test_label', '=', 'test', 'AND'] });
     const onChange = jest.fn();
     const datasource = createMockDatasource({
@@ -132,8 +191,17 @@ describe('VisualMetricQueryEditor', () => {
       getLabels: jest.fn().mockResolvedValue([]),
     });
     const defaultQuery = { ...query, ...defaultTimeSeriesList(datasource), filters: ['metric.type', '=', 'type2'] };
+    const range = getDefaultTimeRange();
 
-    render(<VisualMetricQueryEditor {...defaultProps} onChange={onChange} datasource={datasource} query={query} />);
+    render(
+      <VisualMetricQueryEditor
+        {...defaultProps}
+        onChange={onChange}
+        datasource={datasource}
+        query={query}
+        range={range}
+      />
+    );
 
     expect(screen.getByText('metric.test_label')).toBeInTheDocument();
     const service = await screen.findByLabelText('Service');
@@ -147,6 +215,7 @@ describe('VisualMetricQueryEditor', () => {
   });
 
   it('resets query to defaults (except filters) when metric changes', async () => {
+    replace = (target?: string) => target || '';
     const groupBys = ['metric.test_groupby'];
     const query = createMockTimeSeriesList({
       filters: ['metric.test_label', '=', 'test', 'AND', 'metric.type', '=', 'type'],
@@ -168,11 +237,20 @@ describe('VisualMetricQueryEditor', () => {
           createMockMetricDescriptor({ type: 'type2', displayName: 'metricName2', metricKind: MetricKind.GAUGE }),
         ]),
       getLabels: jest.fn().mockResolvedValue({ 'metric.test_groupby': '' }),
-      templateSrv: new TemplateSrv(),
+      templateSrv: getTemplateSrv(),
     });
     const defaultQuery = { ...query, ...defaultTimeSeriesList(datasource), filters: query.filters };
+    const range = getDefaultTimeRange();
 
-    render(<VisualMetricQueryEditor {...defaultProps} onChange={onChange} datasource={datasource} query={query} />);
+    render(
+      <VisualMetricQueryEditor
+        {...defaultProps}
+        onChange={onChange}
+        datasource={datasource}
+        query={query}
+        range={range}
+      />
+    );
     expect(document.body).toHaveTextContent('metric.test_label');
     expect(await screen.findByText('Delta')).toBeInTheDocument();
     expect(await screen.findByText('metric.test_groupby')).toBeInTheDocument();
@@ -193,22 +271,28 @@ describe('VisualMetricQueryEditor', () => {
   });
 
   it('updates labels on time range change', async () => {
-    const timeSrv = getTimeSrv();
+    replace = (target?: string) => target || '';
+    const range = getDefaultTimeRange();
     const query = createMockTimeSeriesList();
     const onChange = jest.fn();
     const datasource = createMockDatasource({
       getMetricTypes: jest.fn().mockResolvedValue([createMockMetricDescriptor()]),
       getLabels: jest
         .fn()
-        .mockResolvedValue(
-          timeSrv.time.from === 'now-6h' ? { 'metric.test_groupby': '' } : { 'metric.test_groupby_1': '' }
+        .mockImplementation(async (_metricType, _refId, _projectName, _, timeRange) =>
+          timeRange.raw.from === 'now-6h' ? { 'metric.test_groupby': '' } : { 'metric.test_groupby_1': '' }
         ),
-      templateSrv: new TemplateSrv(),
-      timeSrv,
+      templateSrv: getTemplateSrv(),
     });
 
     const { rerender } = render(
-      <VisualMetricQueryEditor {...defaultProps} onChange={onChange} datasource={datasource} query={query} />
+      <VisualMetricQueryEditor
+        {...defaultProps}
+        onChange={onChange}
+        datasource={datasource}
+        query={query}
+        range={range}
+      />
     );
 
     const service = await screen.findByLabelText('Service');
@@ -225,13 +309,17 @@ describe('VisualMetricQueryEditor', () => {
     const groupBy = await screen.findByLabelText('Group by');
     openMenu(groupBy);
     await waitFor(() => expect(document.body).toHaveTextContent('metric.test_groupby'));
-    timeSrv.setTime({ from: 'now-12h', to: 'now' });
-    const datasourceUpdated = createMockDatasource({
-      timeSrv,
-      getLabels: jest.fn().mockResolvedValue({ 'metric.test_groupby_1': '' }),
-    });
+    range.from.subtract('6', 'h');
+    range.raw.from = 'now-12h';
+
     rerender(
-      <VisualMetricQueryEditor {...defaultProps} onChange={onChange} datasource={datasourceUpdated} query={query} />
+      <VisualMetricQueryEditor
+        {...defaultProps}
+        onChange={onChange}
+        datasource={datasource}
+        query={query}
+        range={{ ...range }}
+      />
     );
     openMenu(groupBy);
     await waitFor(() => expect(document.body).toHaveTextContent('metric.test_groupby_1'));
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.tsx
index 566cbd2b8c53e..4815ffa294994 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.tsx
@@ -30,6 +30,7 @@ export interface Props {
   variableOptionGroup: SelectableValue<string>;
   aliasBy?: string;
   onChangeAliasBy: (aliasBy: string) => void;
+  range: TimeRange;
 }
 
 export function Editor({
@@ -41,14 +42,15 @@ export function Editor({
   customMetaData,
   aliasBy,
   onChangeAliasBy,
+  range,
 }: React.PropsWithChildren<Props>) {
-  const [labels, setLabels] = useState<{ [k: string]: any }>({});
+  const [labels, setLabels] = useState<{ [k: string]: string[] }>({});
   const [metricDescriptors, setMetricDescriptors] = useState<MetricDescriptor[]>([]);
   const [metricDescriptor, setMetricDescriptor] = useState<MetricDescriptor>();
   const [metrics, setMetrics] = useState<Array<SelectableValue<string>>>([]);
   const [services, setServices] = useState<Array<SelectableValue<string>>>([]);
   const [service, setService] = useState<string>('');
-  const [timeRange, setTimeRange] = useState<TimeRange>({ ...datasource.timeSrv.timeRange() });
+  const [timeRange, setTimeRange] = useState<TimeRange>({ ...range });
 
   const useTime = (time: TimeRange) => {
     if (
@@ -60,7 +62,7 @@ export function Editor({
     }
   };
 
-  useTime(datasource.timeSrv.timeRange());
+  useTime(range);
 
   const theme = useTheme2();
   const selectStyles = getSelectStyles(theme);
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/__snapshots__/VariableQueryEditor.test.tsx.snap b/public/app/plugins/datasource/cloud-monitoring/components/__snapshots__/VariableQueryEditor.test.tsx.snap
index dd402db330206..b52a8a3d64bbd 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/__snapshots__/VariableQueryEditor.test.tsx.snap
+++ b/public/app/plugins/datasource/cloud-monitoring/components/__snapshots__/VariableQueryEditor.test.tsx.snap
@@ -30,6 +30,7 @@ exports[`VariableQueryEditor renders correctly 1`] = `
           aria-live="polite"
           aria-relevant="additions text"
           className="css-1f43avz-a11yText-A11yText"
+          role="log"
         />
         <div
           className="css-1i88p6p"
@@ -49,6 +50,7 @@ exports[`VariableQueryEditor renders correctly 1`] = `
               data-value=""
             >
               <input
+                aria-activedescendant=""
                 aria-autocomplete="list"
                 aria-expanded={false}
                 aria-haspopup={true}
diff --git a/public/app/plugins/datasource/cloud-monitoring/dataquery.gen.ts b/public/app/plugins/datasource/cloud-monitoring/dataquery.gen.ts
index 8fe1f6b79d997..a4d0755cb72e3 100644
--- a/public/app/plugins/datasource/cloud-monitoring/dataquery.gen.ts
+++ b/public/app/plugins/datasource/cloud-monitoring/dataquery.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
@@ -375,4 +375,4 @@ export enum MetricFindQueryTypes {
   Services = 'services',
 }
 
-export interface GoogleCloudMonitoring {}
+export interface GoogleCloudMonitoringDataQuery {}
diff --git a/public/app/plugins/datasource/cloud-monitoring/datasource.test.ts b/public/app/plugins/datasource/cloud-monitoring/datasource.test.ts
index 8e47b76871952..f2f86e1d09766 100644
--- a/public/app/plugins/datasource/cloud-monitoring/datasource.test.ts
+++ b/public/app/plugins/datasource/cloud-monitoring/datasource.test.ts
@@ -1,16 +1,38 @@
 import { get } from 'lodash';
 import { lastValueFrom, of } from 'rxjs';
 
-import { TemplateSrv } from 'app/features/templating/template_srv';
+import { CustomVariableModel } from '@grafana/data';
+import { getTemplateSrv } from '@grafana/runtime';
 
 import { createMockInstanceSetttings } from './__mocks__/cloudMonitoringInstanceSettings';
 import { createMockQuery } from './__mocks__/cloudMonitoringQuery';
 import Datasource from './datasource';
 import { CloudMonitoringQuery, PreprocessorType, QueryType, MetricKind } from './types/query';
 
+let getTempVars = () => [] as CustomVariableModel[];
+let replace = () => '';
+
+jest.mock('@grafana/runtime', () => {
+  return {
+    __esModule: true,
+    ...jest.requireActual('@grafana/runtime'),
+    getTemplateSrv: () => ({
+      replace: replace,
+      getVariables: getTempVars,
+      updateTimeRange: jest.fn(),
+      containsTemplate: jest.fn(),
+    }),
+  };
+});
+
 describe('Cloud Monitoring Datasource', () => {
   describe('interpolateVariablesInQueries', () => {
+    beforeEach(() => {
+      getTempVars = () => [] as CustomVariableModel[];
+      replace = () => '';
+    });
     it('should leave a query unchanged if there are no template variables', () => {
+      replace = (target?: string) => target || '';
       const mockInstanceSettings = createMockInstanceSetttings();
       const ds = new Datasource(mockInstanceSettings);
       const query = createMockQuery();
@@ -19,7 +41,7 @@ describe('Cloud Monitoring Datasource', () => {
     });
 
     it('should correctly apply template variables for metricQuery (deprecated)', () => {
-      const templateSrv = new TemplateSrv();
+      const templateSrv = getTemplateSrv();
       templateSrv.replace = jest.fn().mockReturnValue('project-variable');
       const mockInstanceSettings = createMockInstanceSetttings();
       const ds = new Datasource(mockInstanceSettings, templateSrv);
@@ -30,7 +52,7 @@ describe('Cloud Monitoring Datasource', () => {
     });
 
     it('should correctly apply template variables for timeSeriesList', () => {
-      const templateSrv = new TemplateSrv();
+      const templateSrv = getTemplateSrv();
       templateSrv.replace = jest.fn().mockReturnValue('project-variable');
       const mockInstanceSettings = createMockInstanceSetttings();
       const ds = new Datasource(mockInstanceSettings, templateSrv);
@@ -41,7 +63,7 @@ describe('Cloud Monitoring Datasource', () => {
     });
 
     it('should correctly apply template variables for timeSeriesQuery', () => {
-      const templateSrv = new TemplateSrv();
+      const templateSrv = getTemplateSrv();
       templateSrv.replace = jest.fn().mockReturnValue('project-variable');
       const mockInstanceSettings = createMockInstanceSetttings();
       const ds = new Datasource(mockInstanceSettings, templateSrv);
@@ -54,6 +76,10 @@ describe('Cloud Monitoring Datasource', () => {
 
   describe('migrateQuery', () => {
     describe('should migrate the query to the new format', () => {
+      beforeEach(() => {
+        getTempVars = () => [] as CustomVariableModel[];
+        replace = () => '';
+      });
       [
         {
           description: 'a list query with a metric type and no filters',
@@ -196,6 +222,68 @@ describe('Cloud Monitoring Datasource', () => {
             sloQuery: {},
           },
         },
+        {
+          description: 'legacy metrics query with metricType defined',
+          input: {
+            refId: 'A',
+            queryType: 'metrics',
+            intervalMs: 1000,
+            metricType: 'test-metric-type',
+          },
+          expected: {
+            queryType: QueryType.TIME_SERIES_LIST,
+            timeSeriesList: {
+              filters: ['metric.type', '=', 'test-metric-type'],
+            },
+          },
+        },
+        {
+          description: 'legacy metrics query with metricType and additional filters defined',
+          input: {
+            refId: 'A',
+            queryType: 'metrics',
+            intervalMs: 1000,
+            metricType: 'test-metric-type',
+            filters: ['test.filter', '=', 'test-filter-value'],
+          },
+          expected: {
+            queryType: QueryType.TIME_SERIES_LIST,
+            timeSeriesList: {
+              filters: ['test.filter', '=', 'test-filter-value', 'AND', 'metric.type', '=', 'test-metric-type'],
+            },
+          },
+        },
+        {
+          description: 'legacy metrics query without projectName defined',
+          input: {
+            refId: 'A',
+            queryType: 'metrics',
+            intervalMs: 1000,
+            metricType: 'test-metric-type',
+          },
+          expected: {
+            queryType: QueryType.TIME_SERIES_LIST,
+            timeSeriesList: {
+              projectName: 'test-project',
+            },
+          },
+        },
+        {
+          description: 'legacy metrics query with projectName defined',
+          input: {
+            refId: 'A',
+            queryType: 'metrics',
+            intervalMs: 1000,
+            metricType: 'test-metric-type',
+            projectName: 'test-project-defined',
+          },
+          expected: {
+            queryType: QueryType.TIME_SERIES_LIST,
+            timeSeriesList: {
+              projectName: 'test-project-defined',
+            },
+          },
+        },
       ].forEach((t) =>
         it(t.description, () => {
           const mockInstanceSettings = createMockInstanceSetttings();
@@ -210,6 +298,10 @@ describe('Cloud Monitoring Datasource', () => {
   });
 
   describe('filterQuery', () => {
+    beforeEach(() => {
+      getTempVars = () => [] as CustomVariableModel[];
+      replace = () => '';
+    });
     [
       {
         description: 'should filter out queries with no metric type',
@@ -275,7 +367,12 @@ describe('Cloud Monitoring Datasource', () => {
   });
 
   describe('getLabels', () => {
+    beforeEach(() => {
+      getTempVars = () => [] as CustomVariableModel[];
+      replace = () => '';
+    });
     it('should get labels', async () => {
+      replace = (target?: string) => target || '';
       const mockInstanceSettings = createMockInstanceSetttings();
       const ds = new Datasource(mockInstanceSettings);
       ds.backendSrv = {
diff --git a/public/app/plugins/datasource/cloud-monitoring/datasource.ts b/public/app/plugins/datasource/cloud-monitoring/datasource.ts
index f3973a0462645..0b0f84232c6d6 100644
--- a/public/app/plugins/datasource/cloud-monitoring/datasource.ts
+++ b/public/app/plugins/datasource/cloud-monitoring/datasource.ts
@@ -9,10 +9,16 @@ import {
   ScopedVars,
   SelectableValue,
   TimeRange,
+  getDefaultTimeRange,
 } from '@grafana/data';
-import { DataSourceWithBackend, getBackendSrv, toDataQueryResponse, BackendSrv } from '@grafana/runtime';
-import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv';
-import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_srv';
+import {
+  DataSourceWithBackend,
+  getBackendSrv,
+  toDataQueryResponse,
+  BackendSrv,
+  getTemplateSrv,
+  TemplateSrv,
+} from '@grafana/runtime';
 
 import { CloudMonitoringAnnotationSupport } from './annotationSupport';
 import { SLO_BURN_RATE_SELECTOR_NAME } from './constants';
@@ -31,8 +37,7 @@ export default class CloudMonitoringDatasource extends DataSourceWithBackend<
 
   constructor(
     private instanceSettings: DataSourceInstanceSettings<CloudMonitoringOptions>,
-    public templateSrv: TemplateSrv = getTemplateSrv(),
-    readonly timeSrv: TimeSrv = getTimeSrv()
+    public templateSrv: TemplateSrv = getTemplateSrv()
   ) {
     super(instanceSettings);
     this.authenticationType = instanceSettings.jsonData.authenticationType || 'jwt';
@@ -54,7 +59,7 @@ export default class CloudMonitoringDatasource extends DataSourceWithBackend<
     return super.query(request);
   }
 
-  applyTemplateVariables(target: CloudMonitoringQuery, scopedVars: ScopedVars): Record<string, any> {
+  applyTemplateVariables(target: CloudMonitoringQuery, scopedVars: ScopedVars) {
     const { timeSeriesList, timeSeriesQuery, sloQuery, promQLQuery } = target;
 
     return {
@@ -89,7 +94,7 @@ export default class CloudMonitoringDatasource extends DataSourceWithBackend<
     projectName: string,
     aggregation?: Aggregation,
     timeRange?: TimeRange
-  ) {
+  ): Promise<{ [k: string]: string[] }> {
     const options = {
       targets: [
         {
@@ -107,7 +112,7 @@ export default class CloudMonitoringDatasource extends DataSourceWithBackend<
           ),
         },
       ],
-      range: timeRange ?? this.timeSrv.timeRange(),
+      range: timeRange || getDefaultTimeRange(),
     };
 
     const queries = options.targets;
@@ -130,11 +135,13 @@ export default class CloudMonitoringDatasource extends DataSourceWithBackend<
             },
           });
         }),
+
         map(({ data }) => {
           const dataQueryResponse = toDataQueryResponse({
             data: data,
           });
-          const labels = dataQueryResponse?.data
+
+          const labels: Record<string, Set<string>> = dataQueryResponse?.data
             .map((f) => f.meta?.custom?.labels)
             .filter((p) => !!p)
             .reduce((acc, labels) => {
@@ -148,10 +155,11 @@ export default class CloudMonitoringDatasource extends DataSourceWithBackend<
               }
               return acc;
             }, {});
+
           return Object.fromEntries(
-            Object.entries(labels).map((l: any) => {
-              l[1] = Array.from(l[1]);
-              return l;
+            Object.entries(labels).map(([key, value]) => {
+              const fromArr = Array.from(value);
+              return [key, fromArr];
             })
           );
         })
@@ -232,6 +240,11 @@ export default class CloudMonitoringDatasource extends DataSourceWithBackend<
       !query.hasOwnProperty('timeSeriesQuery') &&
       !query.hasOwnProperty('timeSeriesList')
     ) {
+      let filters = rest.filters || [];
+      if (rest.metricType) {
+        filters = this.migrateMetricTypeFilter(rest.metricType, filters);
+      }
+
       return {
         datasource,
         key,
@@ -241,6 +254,8 @@ export default class CloudMonitoringDatasource extends DataSourceWithBackend<
         queryType: type === 'annotationQuery' ? QueryType.ANNOTATION : QueryType.TIME_SERIES_LIST,
         timeSeriesList: {
           ...rest,
+          projectName: get(query, 'projectName') || this.getDefaultProject(),
+          filters,
           view: rest.view || 'FULL',
         },
       };
@@ -257,7 +272,7 @@ export default class CloudMonitoringDatasource extends DataSourceWithBackend<
         query.queryType = QueryType.TIME_SERIES_QUERY;
       } else {
         query.timeSeriesList = {
-          projectName: metricQuery.projectName,
+          projectName: metricQuery.projectName || this.getDefaultProject(),
           crossSeriesReducer: metricQuery.crossSeriesReducer,
           alignmentPeriod: metricQuery.alignmentPeriod,
           perSeriesAligner: metricQuery.perSeriesAligner,
@@ -295,11 +310,13 @@ export default class CloudMonitoringDatasource extends DataSourceWithBackend<
     }, {} as T);
   }
 
-  filterQuery(query: CloudMonitoringQuery): boolean {
-    if (query.hide) {
+  filterQuery(item: CloudMonitoringQuery): boolean {
+    if (item.hide) {
       return false;
     }
 
+    const query = this.migrateQuery(item);
+
     if (query.queryType === QueryType.SLO) {
       if (!query.sloQuery) {
         return false;
@@ -332,9 +349,7 @@ export default class CloudMonitoringDatasource extends DataSourceWithBackend<
   }
 
   interpolateVariablesInQueries(queries: CloudMonitoringQuery[], scopedVars: ScopedVars): CloudMonitoringQuery[] {
-    return queries.map(
-      (query) => this.applyTemplateVariables(this.migrateQuery(query), scopedVars) as CloudMonitoringQuery
-    );
+    return queries.map((query) => this.applyTemplateVariables(this.migrateQuery(query), scopedVars));
   }
 
   interpolateFilters(filters: string[], scopedVars: ScopedVars) {
diff --git a/public/app/plugins/datasource/cloud-monitoring/functions.ts b/public/app/plugins/datasource/cloud-monitoring/functions.ts
index 70de5c65d2996..13e0aceb1fedc 100644
--- a/public/app/plugins/datasource/cloud-monitoring/functions.ts
+++ b/public/app/plugins/datasource/cloud-monitoring/functions.ts
@@ -90,7 +90,15 @@ export const getAlignmentPickerData = (
 };
 
 export const labelsToGroupedOptions = (groupBys: string[]) => {
-  const groups = groupBys.reduce((acc: any, curr: string) => {
+  const groups = groupBys.reduce<
+    Record<
+      string,
+      Array<{
+        value: string;
+        label: string;
+      }>
+    >
+  >((acc, curr) => {
     const arr = curr.split('.').map(startCase);
     const group = (arr.length === 2 ? arr : initial(arr)).join(' ');
     const option = {
diff --git a/public/app/plugins/datasource/cloud-monitoring/package.json b/public/app/plugins/datasource/cloud-monitoring/package.json
new file mode 100644
index 0000000000000..5ae1fd14fa23c
--- /dev/null
+++ b/public/app/plugins/datasource/cloud-monitoring/package.json
@@ -0,0 +1,54 @@
+{
+  "name": "@grafana-plugins/stackdriver",
+  "description": "Grafana data source for Google Cloud Monitoring",
+  "private": true,
+  "version": "11.0.0",
+  "dependencies": {
+    "@emotion/css": "11.11.2",
+    "@grafana/data": "11.0.0",
+    "@grafana/experimental": "1.7.10",
+    "@grafana/google-sdk": "0.1.2",
+    "@grafana/runtime": "11.0.0",
+    "@grafana/schema": "11.0.0",
+    "@grafana/ui": "11.0.0",
+    "debounce-promise": "3.1.2",
+    "fast-deep-equal": "^3.1.3",
+    "i18next": "^23.0.0",
+    "immer": "10.0.4",
+    "lodash": "4.17.21",
+    "monaco-editor": "0.34.0",
+    "prismjs": "1.29.0",
+    "react": "18.2.0",
+    "react-use": "17.5.0",
+    "rxjs": "7.8.1",
+    "tslib": "2.6.2"
+  },
+  "devDependencies": {
+    "@grafana/e2e-selectors": "11.0.0",
+    "@grafana/plugin-configs": "11.0.0",
+    "@testing-library/react": "14.2.2",
+    "@testing-library/user-event": "14.5.2",
+    "@types/debounce-promise": "3.1.9",
+    "@types/jest": "29.5.12",
+    "@types/lodash": "4.17.0",
+    "@types/node": "20.11.30",
+    "@types/prismjs": "1.26.3",
+    "@types/react": "18.2.73",
+    "@types/react-test-renderer": "18.0.7",
+    "@types/testing-library__jest-dom": "5.14.9",
+    "react-select-event": "5.5.1",
+    "react-test-renderer": "18.2.0",
+    "ts-node": "10.9.2",
+    "typescript": "5.3.3",
+    "webpack": "5.91.0"
+  },
+  "peerDependencies": {
+    "@grafana/runtime": "*"
+  },
+  "scripts": {
+    "build": "webpack -c ./webpack.config.ts --env production",
+    "build:commit": "webpack -c ./webpack.config.ts --env production --env commit=$(git rev-parse --short HEAD)",
+    "dev": "webpack -w -c ./webpack.config.ts --env development"
+  },
+  "packageManager": "yarn@4.1.0"
+}
diff --git a/public/app/plugins/datasource/cloud-monitoring/plugin.json b/public/app/plugins/datasource/cloud-monitoring/plugin.json
index fb7e2bd8f189a..e2b47c008e06c 100644
--- a/public/app/plugins/datasource/cloud-monitoring/plugin.json
+++ b/public/app/plugins/datasource/cloud-monitoring/plugin.json
@@ -1,12 +1,13 @@
 {
-  "name": "Google Cloud Monitoring",
   "type": "datasource",
+  "name": "Google Cloud Monitoring",
   "id": "stackdriver",
   "category": "cloud",
 
   "metrics": true,
   "alerting": true,
   "annotations": true,
+  "logs": true,
   "backend": true,
   "includes": [
     {
@@ -79,10 +80,10 @@
     "maxDataPoints": true,
     "cacheTimeout": true
   },
-
+  "executable": "gpx_cloudmonitoring",
   "info": {
     "description": "Data source for Google's monitoring service (formerly named Stackdriver)",
-    "version": "1.0.0",
+    "version": "%VERSION%",
     "logos": {
       "small": "img/cloud_monitoring_logo.svg",
       "large": "img/cloud_monitoring_logo.svg"
diff --git a/public/app/plugins/datasource/cloud-monitoring/specs/datasource.test.ts b/public/app/plugins/datasource/cloud-monitoring/specs/datasource.test.ts
index 1a14e6c6269cb..2871a3e5e5ca4 100644
--- a/public/app/plugins/datasource/cloud-monitoring/specs/datasource.test.ts
+++ b/public/app/plugins/datasource/cloud-monitoring/specs/datasource.test.ts
@@ -1,27 +1,26 @@
-import { of, throwError } from 'rxjs';
-import { createFetchResponse } from 'test/helpers/createFetchResponse';
+import { DataSourceInstanceSettings } from '@grafana/data';
+import { getTemplateSrv, TemplateSrv } from '@grafana/runtime'; // will use the version in __mocks__
 
-import { DataQueryRequest, DataSourceInstanceSettings, toUtc } from '@grafana/data';
-import { backendSrv } from 'app/core/services/backend_srv'; // will use the version in __mocks__
-import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
-import { TemplateSrv } from 'app/features/templating/template_srv';
-
-import { initialCustomVariableModelState } from '../../../../features/variables/custom/reducer';
-import { CustomVariableModel } from '../../../../features/variables/types';
 import CloudMonitoringDataSource from '../datasource';
-import { CloudMonitoringQuery } from '../types/query';
-import { CloudMonitoringOptions } from '../types/types';
+import { CloudMonitoringOptions, CustomVariableModel } from '../types/types';
+
+let getTempVars = () => [] as CustomVariableModel[];
+let replace = () => '';
 
 jest.mock('@grafana/runtime', () => ({
+  __esModule: true,
   ...jest.requireActual('@grafana/runtime'),
-  getBackendSrv: () => backendSrv,
+  getTemplateSrv: () => ({
+    replace: replace,
+    getVariables: getTempVars,
+    updateTimeRange: jest.fn(),
+    containsTemplate: jest.fn(),
+  }),
 }));
 
 type Args = { response?: unknown; throws?: boolean; templateSrv?: TemplateSrv };
 
-const fetchMock = jest.spyOn(backendSrv, 'fetch');
-
-function getTestcontext({ response = {}, throws = false, templateSrv = new TemplateSrv() }: Args = {}) {
+function getTestcontext({ response = {}, throws = false, templateSrv = getTemplateSrv() }: Args = {}) {
   jest.clearAllMocks();
 
   const instanceSettings = {
@@ -30,105 +29,21 @@ function getTestcontext({ response = {}, throws = false, templateSrv = new Templ
     },
   } as unknown as DataSourceInstanceSettings<CloudMonitoringOptions>;
 
-  const timeSrv = {
-    timeRange: () => ({
-      from: toUtc('2017-08-22T20:00:00Z'),
-      to: toUtc('2017-08-22T23:59:00Z'),
-    }),
-  } as TimeSrv;
-
-  throws
-    ? fetchMock.mockImplementation(() => throwError(response))
-    : fetchMock.mockImplementation(() => of(createFetchResponse(response)));
-
-  const ds = new CloudMonitoringDataSource(instanceSettings, templateSrv, timeSrv);
+  const ds = new CloudMonitoringDataSource(instanceSettings, templateSrv);
 
   return { ds };
 }
 
 describe('CloudMonitoringDataSource', () => {
-  describe('When performing query', () => {
-    describe('and no time series data is returned', () => {
-      it('should return a list of datapoints', async () => {
-        const options = {
-          range: {
-            from: toUtc('2017-08-22T20:00:00Z'),
-            to: toUtc('2017-08-22T23:59:00Z'),
-          },
-          rangeRaw: {
-            from: 'now-4h',
-            to: 'now',
-          },
-          targets: [
-            {
-              refId: 'A',
-            },
-          ],
-        } as DataQueryRequest<CloudMonitoringQuery>;
-
-        const response = {
-          results: {
-            A: {
-              refId: 'A',
-              meta: {
-                rawQuery: 'arawquerystring',
-              },
-              series: null,
-              tables: null,
-            },
-          },
-        };
-
-        const { ds } = getTestcontext({ response });
-
-        await expect(ds.query(options)).toEmitValuesWith((received) => {
-          const results = received[0];
-          expect(results.data.length).toBe(0);
-        });
-      });
-    });
-  });
-
-  describe('When loading labels', () => {
-    describe('and no aggregation was specified', () => {
-      it('should use default values', async () => {
-        const { ds } = getTestcontext();
-        await ds.getLabels('cpu', 'a', 'default-proj');
-
-        await expect(fetchMock.mock.calls[0][0].data.queries[0].timeSeriesList).toMatchObject({
-          crossSeriesReducer: 'REDUCE_NONE',
-          groupBys: [],
-          filters: ['metric.type', '=', 'cpu'],
-          projectName: 'default-proj',
-          view: 'HEADERS',
-        });
-      });
-    });
-
-    describe('and an aggregation was specified', () => {
-      it('should use the provided aggregation', async () => {
-        const { ds } = getTestcontext();
-        await ds.getLabels('sql', 'b', 'default-proj', {
-          crossSeriesReducer: 'REDUCE_MEAN',
-          groupBys: ['metadata.system_label.name'],
-        });
-
-        await expect(fetchMock.mock.calls[0][0].data.queries[0].timeSeriesList).toMatchObject({
-          crossSeriesReducer: 'REDUCE_MEAN',
-          groupBys: ['metadata.system_label.name'],
-          filters: ['metric.type', '=', 'sql'],
-          projectName: 'default-proj',
-          view: 'HEADERS',
-        });
-      });
-    });
-  });
-
   describe('when interpolating a template variable for the filter', () => {
+    beforeEach(() => {
+      getTempVars = () => [] as CustomVariableModel[];
+      replace = (target?: string) => target || '';
+    });
     describe('and is single value variable', () => {
       it('should replace the variable with the value', () => {
-        const templateSrv = initTemplateSrv('filtervalue1');
-        const { ds } = getTestcontext({ templateSrv });
+        replace = () => 'filtervalue1';
+        const { ds } = getTestcontext();
         const interpolated = ds.interpolateFilters(['resource.label.zone', '=~', '${test}'], {});
 
         expect(interpolated.length).toBe(3);
@@ -138,8 +53,8 @@ describe('CloudMonitoringDataSource', () => {
 
     describe('and is single value variable for the label part', () => {
       it('should replace the variable with the value and not with regex formatting', () => {
-        const templateSrv = initTemplateSrv('resource.label.zone');
-        const { ds } = getTestcontext({ templateSrv });
+        replace = () => 'resource.label.zone';
+        const { ds } = getTestcontext();
         const interpolated = ds.interpolateFilters(['${test}', '=~', 'europe-north-1a'], {});
 
         expect(interpolated.length).toBe(3);
@@ -148,26 +63,30 @@ describe('CloudMonitoringDataSource', () => {
     });
 
     describe('and is multi value variable', () => {
+      beforeEach(() => {
+        getTempVars = () => [] as CustomVariableModel[];
+        replace = (target?: string) => target || '';
+      });
       it('should replace the variable with a regex expression', () => {
-        const templateSrv = initTemplateSrv(['filtervalue1', 'filtervalue2'], true);
-        const { ds } = getTestcontext({ templateSrv });
-        const interpolated = ds.interpolateFilters(['resource.label.zone', '=~', '[[test]]'], {});
+        replace = () => '(filtervalue1|filtervalue2)';
+        const { ds } = getTestcontext();
+        const interpolated = ds.interpolateFilters(['resource.label.zone', '=~', '${test}'], {});
 
         expect(interpolated[2]).toBe('(filtervalue1|filtervalue2)');
       });
 
       it('should not escape a regex', () => {
-        const templateSrv = initTemplateSrv('/[a-Z]*.html', true);
-        const { ds } = getTestcontext({ templateSrv });
-        const interpolated = ds.interpolateFilters(['resource.label.zone', '=~', '[[test]]'], {});
+        replace = () => '/[a-Z]*.html';
+        const { ds } = getTestcontext();
+        const interpolated = ds.interpolateFilters(['resource.label.zone', '=~', '${test}'], {});
 
         expect(interpolated[2]).toBe('/[a-Z]*.html');
       });
 
       it('should not escape an array of regexes but join them as a regex', () => {
-        const templateSrv = initTemplateSrv(['/[a-Z]*.html', '/foo.html'], true);
-        const { ds } = getTestcontext({ templateSrv });
-        const interpolated = ds.interpolateFilters(['resource.label.zone', '=~', '[[test]]'], {});
+        replace = () => '(/[a-Z]*.html|/foo.html)';
+        const { ds } = getTestcontext();
+        const interpolated = ds.interpolateFilters(['resource.label.zone', '=~', '${test}'], {});
 
         expect(interpolated[2]).toBe('(/[a-Z]*.html|/foo.html)');
       });
@@ -177,9 +96,9 @@ describe('CloudMonitoringDataSource', () => {
   describe('when interpolating a template variable for group bys', () => {
     describe('and is single value variable', () => {
       it('should replace the variable with the value', () => {
-        const templateSrv = initTemplateSrv('groupby1');
-        const { ds } = getTestcontext({ templateSrv });
-        const interpolated = ds.interpolateGroupBys(['[[test]]'], {});
+        replace = () => 'groupby1';
+        const { ds } = getTestcontext();
+        const interpolated = ds.interpolateGroupBys(['${test}'], {});
 
         expect(interpolated.length).toBe(1);
         expect(interpolated[0]).toBe('groupby1');
@@ -188,9 +107,9 @@ describe('CloudMonitoringDataSource', () => {
 
     describe('and is multi value variable', () => {
       it('should replace the variable with an array of group bys', () => {
-        const templateSrv = initTemplateSrv(['groupby1', 'groupby2'], true);
-        const { ds } = getTestcontext({ templateSrv });
-        const interpolated = ds.interpolateGroupBys(['[[test]]'], {});
+        replace = () => 'groupby1,groupby2';
+        const { ds } = getTestcontext();
+        const interpolated = ds.interpolateGroupBys(['${test}'], {});
 
         expect(interpolated.length).toBe(2);
         expect(interpolated[0]).toBe('groupby1');
@@ -199,17 +118,3 @@ describe('CloudMonitoringDataSource', () => {
     });
   });
 });
-
-function initTemplateSrv(values: string | string[], multi = false) {
-  const templateSrv = new TemplateSrv();
-  const test: CustomVariableModel = {
-    ...initialCustomVariableModelState,
-    id: 'test',
-    name: 'test',
-    current: { value: values, text: Array.isArray(values) ? values.toString() : values, selected: true },
-    options: [{ value: values, text: Array.isArray(values) ? values.toString() : values, selected: false }],
-    multi,
-  };
-  templateSrv.init([test]);
-  return templateSrv;
-}
diff --git a/public/app/plugins/datasource/cloud-monitoring/tsconfig.json b/public/app/plugins/datasource/cloud-monitoring/tsconfig.json
new file mode 100644
index 0000000000000..7daf2ee8abab6
--- /dev/null
+++ b/public/app/plugins/datasource/cloud-monitoring/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "@grafana/plugin-configs/tsconfig.json",
+  "include": ["."]
+}
diff --git a/public/app/plugins/datasource/cloud-monitoring/types/query.ts b/public/app/plugins/datasource/cloud-monitoring/types/query.ts
index a1e5a2abe299a..a202c85bd3e35 100644
--- a/public/app/plugins/datasource/cloud-monitoring/types/query.ts
+++ b/public/app/plugins/datasource/cloud-monitoring/types/query.ts
@@ -1,19 +1,15 @@
 import { CloudMonitoringQuery as CloudMonitoringQueryBase, QueryType } from '../dataquery.gen';
 
 export { QueryType };
-export {
-  TimeSeriesList,
-  PreprocessorType,
+export { PreprocessorType, MetricKind, AlignmentTypes, ValueTypes, MetricFindQueryTypes } from '../dataquery.gen';
+export type {
   TimeSeriesQuery,
   SLOQuery,
+  TimeSeriesList,
   MetricQuery,
-  MetricKind,
+  PromQLQuery,
   LegacyCloudMonitoringAnnotationQuery,
   Filter,
-  AlignmentTypes,
-  ValueTypes,
-  MetricFindQueryTypes,
-  PromQLQuery,
 } from '../dataquery.gen';
 
 /**
diff --git a/public/app/plugins/datasource/cloud-monitoring/types/types.ts b/public/app/plugins/datasource/cloud-monitoring/types/types.ts
index a97a1f913520e..c7eb809c739d9 100644
--- a/public/app/plugins/datasource/cloud-monitoring/types/types.ts
+++ b/public/app/plugins/datasource/cloud-monitoring/types/types.ts
@@ -1,4 +1,4 @@
-import { DataQuery, SelectableValue } from '@grafana/data';
+import { DataQuery, SelectableValue, VariableWithMultiSupport } from '@grafana/data';
 import { DataSourceOptions, DataSourceSecureJsonData } from '@grafana/google-sdk';
 
 import { MetricKind } from './query';
@@ -61,3 +61,7 @@ export interface CustomMetaData {
 export interface PostResponse {
   results: Record<string, any>;
 }
+
+export interface CustomVariableModel extends VariableWithMultiSupport {
+  type: 'custom';
+}
diff --git a/public/app/plugins/datasource/cloud-monitoring/webpack.config.ts b/public/app/plugins/datasource/cloud-monitoring/webpack.config.ts
new file mode 100644
index 0000000000000..4da5a990cfa57
--- /dev/null
+++ b/public/app/plugins/datasource/cloud-monitoring/webpack.config.ts
@@ -0,0 +1,3 @@
+import config from '@grafana/plugin-configs/webpack.config';
+
+export default config;
diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/AnnotationQueryRunner.ts b/public/app/plugins/datasource/cloudwatch/__mocks__/AnnotationQueryRunner.ts
index 68db686c97510..919059465d4b7 100644
--- a/public/app/plugins/datasource/cloudwatch/__mocks__/AnnotationQueryRunner.ts
+++ b/public/app/plugins/datasource/cloudwatch/__mocks__/AnnotationQueryRunner.ts
@@ -1,8 +1,6 @@
 import { of } from 'rxjs';
 
 import { CustomVariableModel, DataQueryRequest } from '@grafana/data';
-import { getBackendSrv, setBackendSrv } from '@grafana/runtime';
-import { TemplateSrv } from 'app/features/templating/template_srv';
 
 import { CloudWatchAnnotationQueryRunner } from '../query-runner/CloudWatchAnnotationQueryRunner';
 import { CloudWatchQuery } from '../types';
@@ -11,18 +9,10 @@ import { CloudWatchSettings, setupMockedTemplateService } from './CloudWatchData
 import { TimeRangeMock } from './timeRange';
 
 export function setupMockedAnnotationQueryRunner({ variables }: { variables?: CustomVariableModel[] }) {
-  let templateService = new TemplateSrv();
-  if (variables) {
-    templateService = setupMockedTemplateService(variables);
-  }
+  const templateService = setupMockedTemplateService(variables);
 
+  const queryMock = jest.fn().mockReturnValue(of({}));
   const runner = new CloudWatchAnnotationQueryRunner(CloudWatchSettings, templateService);
-  const fetchMock = jest.fn().mockReturnValue(of({}));
-
-  setBackendSrv({
-    ...getBackendSrv(),
-    fetch: fetchMock,
-  });
 
   const request: DataQueryRequest<CloudWatchQuery> = {
     range: TimeRangeMock,
@@ -37,5 +27,5 @@ export function setupMockedAnnotationQueryRunner({ variables }: { variables?: Cu
     startTime: 0,
   };
 
-  return { runner, fetchMock, templateService, request, timeRange: TimeRangeMock };
+  return { runner, queryMock, templateService, request, timeRange: TimeRangeMock };
 }
diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/CloudWatchDataSource.ts b/public/app/plugins/datasource/cloudwatch/__mocks__/CloudWatchDataSource.ts
index f58543dbdce6a..e698004926aeb 100644
--- a/public/app/plugins/datasource/cloudwatch/__mocks__/CloudWatchDataSource.ts
+++ b/public/app/plugins/datasource/cloudwatch/__mocks__/CloudWatchDataSource.ts
@@ -6,20 +6,70 @@ import {
   DataSourcePluginMeta,
   PluginMetaInfo,
   PluginType,
+  ScopedVars,
   VariableHide,
 } from '@grafana/data';
-import { getBackendSrv, setBackendSrv } from '@grafana/runtime';
-import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
-import { TemplateSrv } from 'app/features/templating/template_srv';
-import { initialCustomVariableModelState } from 'app/features/variables/custom/reducer';
+import { getBackendSrv, setBackendSrv, DataSourceWithBackend, TemplateSrv } from '@grafana/runtime';
 
+import { initialCustomVariableModelState } from '../__mocks__/CloudWatchVariables';
 import { CloudWatchDatasource } from '../datasource';
 import { CloudWatchJsonData } from '../types';
+import { getVariableName } from '../utils/templateVariableUtils';
 
-export function setupMockedTemplateService(variables: CustomVariableModel[]) {
-  const templateService = new TemplateSrv();
-  templateService.init(variables);
-  templateService.getVariables = jest.fn().mockReturnValue(variables);
+const queryMock = jest.fn().mockReturnValue(of({ data: [] }));
+jest.spyOn(DataSourceWithBackend.prototype, 'query').mockImplementation((args) => queryMock(args));
+const separatorMap = new Map<string, string>([
+  ['pipe', '|'],
+  ['raw', ','],
+  ['text', ' + '],
+]);
+
+export function setupMockedTemplateService(variables?: CustomVariableModel[]): TemplateSrv {
+  const templateService = {
+    replace: jest.fn().mockImplementation((input: string, scopedVars?: ScopedVars, format?: string) => {
+      if (!input) {
+        return '';
+      }
+      let output = input;
+      ['datasource', 'dimension'].forEach((name) => {
+        const variable = scopedVars ? scopedVars[name] : undefined;
+        if (variable) {
+          output = output.replace('$' + name, variable.value);
+        }
+      });
+
+      if (variables) {
+        variables.forEach((variable) => {
+          let repVal = '';
+          let value = format === 'text' ? variable.current.text : variable.current.value;
+          let separator = separatorMap.get(format ?? 'raw');
+          if (Array.isArray(value)) {
+            repVal = value.join(separator);
+          } else {
+            repVal = value;
+          }
+          output = output.replace('$' + variable.name, repVal);
+          output = output.replace('[[' + variable.name + ']]', repVal);
+        });
+      }
+      return output;
+    }),
+    getVariables: jest.fn().mockReturnValue(variables ?? []),
+    containsTemplate: jest.fn().mockImplementation((name) => {
+      const varName = getVariableName(name);
+      if (!varName || !variables) {
+        return false;
+      }
+      let found = false;
+      variables.forEach((variable) => {
+        if (varName === variable.name) {
+          found = true;
+        }
+      });
+      return found;
+    }),
+    updateTimeRange: jest.fn(),
+  };
   return templateService;
 }
 
@@ -60,25 +110,16 @@ export const CloudWatchSettings: DataSourceInstanceSettings<CloudWatchJsonData>
 
 export function setupMockedDataSource({
   variables,
-  mockGetVariableName = true,
   getMock = jest.fn(),
   customInstanceSettings = CloudWatchSettings,
 }: {
   getMock?: jest.Func;
   variables?: CustomVariableModel[];
-  mockGetVariableName?: boolean;
   customInstanceSettings?: DataSourceInstanceSettings<CloudWatchJsonData>;
 } = {}) {
-  let templateService = new TemplateSrv();
-  if (variables) {
-    templateService = setupMockedTemplateService(variables);
-    if (mockGetVariableName) {
-      templateService.getVariableName = (name: string) => name.replace('$', '');
-    }
-  }
+  const templateService = setupMockedTemplateService(variables);
 
-  const timeSrv = getTimeSrv();
-  const datasource = new CloudWatchDatasource(customInstanceSettings, templateService, timeSrv);
+  const datasource = new CloudWatchDatasource(customInstanceSettings, templateService);
   datasource.getVariables = () => ['test'];
   datasource.resources.getNamespaces = jest.fn().mockResolvedValue([]);
   datasource.resources.getRegions = jest.fn().mockResolvedValue([]);
@@ -93,7 +134,7 @@ export function setupMockedDataSource({
     get: getMock,
   });
 
-  return { datasource, fetchMock, templateService, timeSrv };
+  return { datasource, fetchMock, queryMock, templateService };
 }
 
 export const metricVariable: CustomVariableModel = {
diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/CloudWatchVariables.ts b/public/app/plugins/datasource/cloudwatch/__mocks__/CloudWatchVariables.ts
new file mode 100644
index 0000000000000..9f5fb30bba235
--- /dev/null
+++ b/public/app/plugins/datasource/cloudwatch/__mocks__/CloudWatchVariables.ts
@@ -0,0 +1,26 @@
+import { BaseVariableModel, CustomVariableModel, LoadingState, VariableHide, VariableOption } from '@grafana/data';
+
+export const initialVariableModelState: BaseVariableModel = {
+  id: '00000000-0000-0000-0000-000000000000',
+  rootStateKey: null,
+  name: '',
+  type: 'query',
+  global: false,
+  index: -1,
+  hide: VariableHide.dontHide,
+  skipUrlSync: false,
+  state: LoadingState.NotStarted,
+  error: null,
+  description: null,
+};
+
+export const initialCustomVariableModelState: CustomVariableModel = {
+  ...initialVariableModelState,
+  type: 'custom',
+  multi: false,
+  includeAll: false,
+  allValue: null,
+  query: '',
+  options: [],
+  current: {} as VariableOption,
+};
diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/LogsQueryRunner.ts b/public/app/plugins/datasource/cloudwatch/__mocks__/LogsQueryRunner.ts
index 8761a78236c17..9c689d1a9007f 100644
--- a/public/app/plugins/datasource/cloudwatch/__mocks__/LogsQueryRunner.ts
+++ b/public/app/plugins/datasource/cloudwatch/__mocks__/LogsQueryRunner.ts
@@ -1,9 +1,7 @@
 import { of } from 'rxjs';
 
 import { CustomVariableModel, DataFrame, DataSourceInstanceSettings } from '@grafana/data';
-import { BackendDataSourceResponse, getBackendSrv, setBackendSrv } from '@grafana/runtime';
-import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv';
-import { TemplateSrv } from 'app/features/templating/template_srv';
+import { BackendDataSourceResponse, toDataQueryResponse } from '@grafana/runtime';
 
 import { CloudWatchLogsQueryRunner } from '../query-runner/CloudWatchLogsQueryRunner';
 import { CloudWatchJsonData, CloudWatchLogsQueryStatus, CloudWatchLogsRequest } from '../types';
@@ -17,30 +15,18 @@ export function setupMockedLogsQueryRunner({
   variables,
   mockGetVariableName = true,
   settings = CloudWatchSettings,
-  timeSrv = getTimeSrv(),
 }: {
   data?: BackendDataSourceResponse;
   variables?: CustomVariableModel[];
   mockGetVariableName?: boolean;
   settings?: DataSourceInstanceSettings<CloudWatchJsonData>;
-  timeSrv?: TimeSrv;
 } = {}) {
-  let templateService = new TemplateSrv();
-  if (variables) {
-    templateService = setupMockedTemplateService(variables);
-    if (mockGetVariableName) {
-      templateService.getVariableName = (name: string) => name;
-    }
-  }
+  let templateService = setupMockedTemplateService(variables);
 
-  const runner = new CloudWatchLogsQueryRunner(settings, templateService, timeSrv);
-  const fetchMock = jest.fn().mockReturnValue(of({ data }));
-  setBackendSrv({
-    ...getBackendSrv(),
-    fetch: fetchMock,
-  });
+  const queryMock = jest.fn().mockReturnValue(of(toDataQueryResponse({ data })));
+  const runner = new CloudWatchLogsQueryRunner(settings, templateService);
 
-  return { runner, fetchMock, templateService };
+  return { runner, queryMock, templateService };
 }
 
 export function genMockFrames(numResponses: number): DataFrame[] {
diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/MetricsQueryRunner.ts b/public/app/plugins/datasource/cloudwatch/__mocks__/MetricsQueryRunner.ts
index 483150c289436..ace86da0ec5c6 100644
--- a/public/app/plugins/datasource/cloudwatch/__mocks__/MetricsQueryRunner.ts
+++ b/public/app/plugins/datasource/cloudwatch/__mocks__/MetricsQueryRunner.ts
@@ -1,8 +1,6 @@
-import { of, throwError } from 'rxjs';
+import { of } from 'rxjs';
 
-import { CustomVariableModel, DataQueryError, DataQueryRequest, DataSourceInstanceSettings } from '@grafana/data';
-import { BackendDataSourceResponse, getBackendSrv, setBackendSrv } from '@grafana/runtime';
-import { TemplateSrv } from 'app/features/templating/template_srv';
+import { CustomVariableModel, DataQueryRequest, DataQueryResponse, DataSourceInstanceSettings } from '@grafana/data';
 
 import { CloudWatchMetricsQueryRunner } from '../query-runner/CloudWatchMetricsQueryRunner';
 import { CloudWatchJsonData, CloudWatchQuery } from '../types';
@@ -11,37 +9,18 @@ import { CloudWatchSettings, setupMockedTemplateService } from './CloudWatchData
 import { TimeRangeMock } from './timeRange';
 
 export function setupMockedMetricsQueryRunner({
-  data = {
-    results: {},
-  },
+  response = { data: [] },
   variables,
-  mockGetVariableName = true,
-  throws = false,
   instanceSettings = CloudWatchSettings,
 }: {
-  data?: BackendDataSourceResponse | DataQueryError;
+  response?: DataQueryResponse;
   variables?: CustomVariableModel[];
-  mockGetVariableName?: boolean;
-  throws?: boolean;
   instanceSettings?: DataSourceInstanceSettings<CloudWatchJsonData>;
 } = {}) {
-  let templateService = new TemplateSrv();
-  if (variables) {
-    templateService = setupMockedTemplateService(variables);
-    if (mockGetVariableName) {
-      templateService.getVariableName = (name: string) => name.replace('$', '');
-    }
-  }
+  const templateService = setupMockedTemplateService(variables);
 
+  const queryMock = jest.fn().mockImplementation(() => of(response));
   const runner = new CloudWatchMetricsQueryRunner(instanceSettings, templateService);
-  const fetchMock = throws
-    ? jest.fn().mockImplementation(() => throwError(data))
-    : jest.fn().mockReturnValue(of({ data }));
-
-  setBackendSrv({
-    ...getBackendSrv(),
-    fetch: fetchMock,
-  });
 
   const request: DataQueryRequest<CloudWatchQuery> = {
     range: TimeRangeMock,
@@ -56,5 +35,5 @@ export function setupMockedMetricsQueryRunner({
     startTime: 0,
   };
 
-  return { runner, fetchMock, templateService, instanceSettings, request, timeRange: TimeRangeMock };
+  return { runner, queryMock, templateService, instanceSettings, request, timeRange: TimeRangeMock };
 }
diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/ResourcesAPI.ts b/public/app/plugins/datasource/cloudwatch/__mocks__/ResourcesAPI.ts
index 7f9650562cd6e..6da47f3c6766f 100644
--- a/public/app/plugins/datasource/cloudwatch/__mocks__/ResourcesAPI.ts
+++ b/public/app/plugins/datasource/cloudwatch/__mocks__/ResourcesAPI.ts
@@ -1,7 +1,5 @@
+import { CustomVariableModel } from '@grafana/data';
 import { getBackendSrv, setBackendSrv } from '@grafana/runtime';
-import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
-import { TemplateSrv } from 'app/features/templating/template_srv';
-import { CustomVariableModel } from 'app/features/variables/types';
 
 import { ResourcesAPI } from '../resources/ResourcesAPI';
 
@@ -17,9 +15,8 @@ export function setupMockedResourcesAPI({
   variables?: CustomVariableModel[];
   mockGetVariableName?: boolean;
 } = {}) {
-  let templateService = variables ? setupMockedTemplateService(variables) : new TemplateSrv();
+  let templateService = setupMockedTemplateService(variables);
 
-  const timeSrv = getTimeSrv();
   const api = new ResourcesAPI(CloudWatchSettings, templateService);
   let resourceRequestMock = getMock ? getMock : jest.fn().mockReturnValue(response);
   setBackendSrv({
@@ -27,5 +24,5 @@ export function setupMockedResourcesAPI({
     get: resourceRequestMock,
   });
 
-  return { api, resourceRequestMock, templateService, timeSrv };
+  return { api, resourceRequestMock, templateService };
 }
diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/logsTestContext.ts b/public/app/plugins/datasource/cloudwatch/__mocks__/logsTestContext.ts
index d550f8427badd..f4e1702cf6b16 100644
--- a/public/app/plugins/datasource/cloudwatch/__mocks__/logsTestContext.ts
+++ b/public/app/plugins/datasource/cloudwatch/__mocks__/logsTestContext.ts
@@ -2,8 +2,8 @@ import { Observable, of } from 'rxjs';
 
 import {
   DataFrame,
+  createDataFrame,
   dataFrameToJSON,
-  MutableDataFrame,
   DataSourceInstanceSettings,
   DataSourceJsonData,
   DataSourceRef,
@@ -14,7 +14,7 @@ import {
   DataQueryResponse,
   TestDataSourceResponse,
 } from '@grafana/data';
-import { GetDataSourceListFilters, setDataSourceSrv } from '@grafana/runtime';
+import { GetDataSourceListFilters, setDataSourceSrv, toDataQueryResponse } from '@grafana/runtime';
 
 import { CloudWatchLogsQueryStatus } from '../types';
 
@@ -22,15 +22,15 @@ import { meta, setupMockedDataSource } from './CloudWatchDataSource';
 
 export function setupForLogs() {
   function envelope(frame: DataFrame) {
-    return { data: { results: { a: { refId: 'a', frames: [dataFrameToJSON(frame)] } } } };
+    return toDataQueryResponse({ data: { results: { a: { refId: 'a', frames: [dataFrameToJSON(frame)] } } } });
   }
 
-  const { datasource, fetchMock, timeSrv } = setupMockedDataSource();
+  const { datasource, queryMock } = setupMockedDataSource();
 
-  const startQueryFrame = new MutableDataFrame({ fields: [{ name: 'queryId', values: ['queryid'] }] });
-  fetchMock.mockReturnValueOnce(of(envelope(startQueryFrame)));
+  const startQueryFrame: DataFrame = createDataFrame({ fields: [{ name: 'queryId', values: ['queryid'] }] });
+  queryMock.mockReturnValueOnce(of(envelope(startQueryFrame)));
 
-  const logsFrame = new MutableDataFrame({
+  const logsFrame: DataFrame = createDataFrame({
     fields: [
       {
         name: '@message',
@@ -48,7 +48,7 @@ export function setupForLogs() {
     meta: { custom: { Status: CloudWatchLogsQueryStatus.Complete } },
   });
 
-  fetchMock.mockReturnValueOnce(of(envelope(logsFrame)));
+  queryMock.mockReturnValueOnce(of(envelope(logsFrame)));
 
   setDataSourceSrv({
     async get() {
@@ -89,5 +89,5 @@ export function setupForLogs() {
     },
   });
 
-  return { datasource, fetchMock, timeSrv };
+  return { datasource, queryMock };
 }
diff --git a/public/app/plugins/datasource/cloudwatch/components/AnnotationQueryEditor/AnnotationQueryEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/AnnotationQueryEditor/AnnotationQueryEditor.tsx
index a88bdf61eb4c8..cd8c3517e527f 100644
--- a/public/app/plugins/datasource/cloudwatch/components/AnnotationQueryEditor/AnnotationQueryEditor.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/AnnotationQueryEditor/AnnotationQueryEditor.tsx
@@ -1,8 +1,8 @@
 import React, { ChangeEvent } from 'react';
 
 import { QueryEditorProps } from '@grafana/data';
-import { EditorField, EditorHeader, EditorRow, EditorSwitch, InlineSelect, Space } from '@grafana/experimental';
-import { Alert, Input } from '@grafana/ui';
+import { EditorField, EditorHeader, EditorRow, EditorSwitch, InlineSelect } from '@grafana/experimental';
+import { Alert, Input, Space } from '@grafana/ui';
 
 import { CloudWatchDatasource } from '../../datasource';
 import { isCloudWatchAnnotationQuery } from '../../guards';
diff --git a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.test.tsx b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.test.tsx
index ebcab303759c4..a83e5d70d5d65 100644
--- a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.test.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.test.tsx
@@ -1,24 +1,27 @@
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
-import { Provider } from 'react-redux';
 
 import { AwsAuthType } from '@grafana/aws-sdk';
 import { PluginContextProvider, PluginMeta, PluginMetaInfo, PluginType } from '@grafana/data';
-import { configureStore } from 'app/store/configureStore';
+import { config } from '@grafana/runtime';
 
-import { CloudWatchSettings, setupMockedDataSource } from '../../__mocks__/CloudWatchDataSource';
+import {
+  CloudWatchSettings,
+  setupMockedDataSource,
+  setupMockedTemplateService,
+} from '../../__mocks__/CloudWatchDataSource';
 import { CloudWatchDatasource } from '../../datasource';
 
-import { ConfigEditor, Props } from './ConfigEditor';
+import {
+  ConfigEditor,
+  Props,
+  ARN_DEPRECATION_WARNING_MESSAGE,
+  CREDENTIALS_AUTHENTICATION_WARNING_MESSAGE,
+} from './ConfigEditor';
 
-const datasource = new CloudWatchDatasource(CloudWatchSettings);
+const datasource = new CloudWatchDatasource(CloudWatchSettings, setupMockedTemplateService());
 const loadDataSourceMock = jest.fn();
-jest.mock('app/features/plugins/datasource_srv', () => ({
-  getDatasourceSrv: () => ({
-    loadDatasource: loadDataSourceMock,
-  }),
-}));
 
 jest.mock('./XrayLinkConfig', () => ({
   XrayLinkConfig: () => <></>,
@@ -35,6 +38,9 @@ jest.mock('@grafana/runtime', () => ({
     put: putMock,
     get: getMock,
   }),
+  getDataSourceSrv: () => ({
+    get: loadDataSourceMock,
+  }),
   getAppEvents: () => mockAppEvents,
   config: {
     ...jest.requireActual('@grafana/runtime').config,
@@ -86,7 +92,6 @@ const props: Props = {
 };
 
 const setup = (optionOverrides?: Partial<Props['options']>) => {
-  const store = configureStore();
   const newProps = {
     ...props,
     options: {
@@ -105,9 +110,7 @@ const setup = (optionOverrides?: Partial<Props['options']>) => {
 
   return render(
     <PluginContextProvider meta={meta}>
-      <Provider store={store}>
-        <ConfigEditor {...newProps} />
-      </Provider>
+      <ConfigEditor {...newProps} />
     </PluginContextProvider>
   );
 };
@@ -128,178 +131,258 @@ describe('Render', () => {
     datasource.getVariables = jest.fn().mockReturnValue([]);
   });
 
-  it('it should disable access key id field when the datasource has been previously configured', async () => {
-    setup({
-      secureJsonFields: {
-        secretKey: true,
-      },
+  const originalFormFeatureToggleValue = config.featureToggles.awsDatasourcesNewFormStyling;
+
+  const cleanupFeatureToggle = () => {
+    config.featureToggles.awsDatasourcesNewFormStyling = originalFormFeatureToggleValue;
+  };
+
+  function run() {
+    it('it should disable access key id field when the datasource has been previously configured', async () => {
+      setup({
+        secureJsonFields: {
+          secretKey: true,
+        },
+      });
+      await waitFor(async () => expect(screen.getByPlaceholderText('Configured')).toBeDisabled());
     });
-    await waitFor(async () => expect(screen.getByPlaceholderText('Configured')).toBeDisabled());
-  });
 
-  it('should show credentials profile name field', async () => {
-    setup({
-      jsonData: {
-        authType: AwsAuthType.Credentials,
-      },
+    it('should show credentials profile name field', async () => {
+      setup({
+        jsonData: {
+          authType: AwsAuthType.Credentials,
+        },
+      });
+      await waitFor(async () => expect(screen.getByText('Credentials Profile Name')).toBeInTheDocument());
     });
-    await waitFor(async () => expect(screen.getByLabelText('Credentials Profile Name')).toBeInTheDocument());
-  });
 
-  it('should show access key and secret access key fields when the datasource has not been configured before', async () => {
-    setup({
-      jsonData: {
-        authType: AwsAuthType.Keys,
-      },
+    it('should show a warning if `credentials` auth type is used without a profile or database configured', async () => {
+      setup({
+        jsonData: {
+          authType: AwsAuthType.Credentials,
+          profile: undefined,
+          database: undefined,
+        },
+      });
+      await waitFor(async () =>
+        expect(screen.getByText(CREDENTIALS_AUTHENTICATION_WARNING_MESSAGE)).toBeInTheDocument()
+      );
     });
-    await waitFor(async () => {
-      expect(screen.getByLabelText('Access Key ID')).toBeInTheDocument();
-      expect(screen.getByLabelText('Secret Access Key')).toBeInTheDocument();
+
+    it('should not show a warning if `credentials` auth type is used and a profile is configured', async () => {
+      setup({
+        jsonData: {
+          authType: AwsAuthType.Credentials,
+          profile: 'profile',
+          database: undefined,
+        },
+      });
+      await waitFor(async () =>
+        expect(screen.queryByText(CREDENTIALS_AUTHENTICATION_WARNING_MESSAGE)).not.toBeInTheDocument()
+      );
     });
-  });
 
-  it('should show arn role field', async () => {
-    setup({
-      jsonData: {
-        authType: AwsAuthType.ARN,
-      },
+    it('should not show a warning if `credentials` auth type is used and a database is configured', async () => {
+      setup({
+        jsonData: {
+          authType: AwsAuthType.Credentials,
+          profile: undefined,
+          database: 'database',
+        },
+      });
+      await waitFor(async () =>
+        expect(screen.queryByText(CREDENTIALS_AUTHENTICATION_WARNING_MESSAGE)).not.toBeInTheDocument()
+      );
     });
-    await waitFor(async () => expect(screen.getByLabelText('Assume Role ARN')).toBeInTheDocument());
-  });
 
-  it('should display log group selector field', async () => {
-    setup();
-    await waitFor(async () => expect(screen.getByText('Select log groups')).toBeInTheDocument());
-  });
+    it('should show access key and secret access key fields when the datasource has not been configured before', async () => {
+      setup({
+        jsonData: {
+          authType: AwsAuthType.Keys,
+        },
+      });
+      await waitFor(async () => {
+        expect(screen.getByLabelText('Access Key ID')).toBeInTheDocument();
+        expect(screen.getByLabelText('Secret Access Key')).toBeInTheDocument();
+      });
+    });
 
-  it('should only display the first two default log groups and show all of them when clicking "Show all" button', async () => {
-    setup({
-      version: 2,
-      jsonData: {
-        logGroups: [
-          { arn: 'arn:aws:logs:us-east-2:123456789012:log-group:logGroup-foo:*', name: 'logGroup-foo' },
-          { arn: 'arn:aws:logs:us-east-2:123456789012:log-group:logGroup-bar:*', name: 'logGroup-bar' },
-          { arn: 'arn:aws:logs:us-east-2:123456789012:log-group:logGroup-baz:*', name: 'logGroup-baz' },
-        ],
-      },
+    it('should show arn role field', async () => {
+      setup({
+        jsonData: {
+          authType: AwsAuthType.ARN,
+        },
+      });
+      await waitFor(async () => expect(screen.getByText('Assume Role ARN')).toBeInTheDocument());
     });
-    await waitFor(async () => {
-      expect(await screen.getByText('logGroup-foo')).toBeInTheDocument();
-      expect(await screen.getByText('logGroup-bar')).toBeInTheDocument();
-      expect(await screen.queryByText('logGroup-baz')).not.toBeInTheDocument();
 
-      await userEvent.click(screen.getByText('Show all'));
+    it('should display namespace field', async () => {
+      setup();
+      await waitFor(async () => expect(screen.getByText('Namespaces of Custom Metrics')).toBeInTheDocument());
+    });
 
-      expect(await screen.getByText('logGroup-baz')).toBeInTheDocument();
+    it('should show a deprecation warning if `arn` auth type is used', async () => {
+      setup({
+        jsonData: {
+          authType: AwsAuthType.ARN,
+        },
+      });
+      await waitFor(async () => expect(screen.getByText(ARN_DEPRECATION_WARNING_MESSAGE)).toBeInTheDocument());
     });
-  });
 
-  it('should load the data source if it was saved before', async () => {
-    const SAVED_VERSION = 2;
-    setup({ version: SAVED_VERSION });
-    await waitFor(async () => expect(loadDataSourceMock).toHaveBeenCalled());
-  });
+    it('should display log group selector field', async () => {
+      setup();
+      await waitFor(async () => expect(screen.getByText('Select log groups')).toBeInTheDocument());
+    });
 
-  it('should not load the data source if it wasnt saved before', async () => {
-    const SAVED_VERSION = undefined;
-    setup({ version: SAVED_VERSION });
-    await waitFor(async () => expect(loadDataSourceMock).not.toHaveBeenCalled());
-  });
+    it('should only display the first two default log groups and show all of them when clicking "Show all" button', async () => {
+      setup({
+        version: 2,
+        jsonData: {
+          logGroups: [
+            { arn: 'arn:aws:logs:us-east-2:123456789012:log-group:logGroup-foo:*', name: 'logGroup-foo' },
+            { arn: 'arn:aws:logs:us-east-2:123456789012:log-group:logGroup-bar:*', name: 'logGroup-bar' },
+            { arn: 'arn:aws:logs:us-east-2:123456789012:log-group:logGroup-baz:*', name: 'logGroup-baz' },
+          ],
+        },
+      });
+      await waitFor(async () => {
+        expect(await screen.getByText('logGroup-foo')).toBeInTheDocument();
+        expect(await screen.getByText('logGroup-bar')).toBeInTheDocument();
+        expect(await screen.queryByText('logGroup-baz')).not.toBeInTheDocument();
 
-  it('should show error message if Select log group button is clicked when data source is never saved', async () => {
-    setup({ version: 1 });
-    await waitFor(() => expect(screen.getByText('Select log groups')).toBeInTheDocument());
-    await userEvent.click(screen.getByText('Select log groups'));
-    await waitFor(() =>
-      expect(screen.getByText('You need to save the data source before adding log groups.')).toBeInTheDocument()
-    );
-  });
+        await userEvent.click(screen.getByText('Show all'));
 
-  it('should show error message if Select log group button is clicked when data source is saved before but have unsaved changes', async () => {
-    const SAVED_VERSION = 3;
-    const newProps = {
-      ...props,
-      options: {
-        ...props.options,
-        version: SAVED_VERSION,
-      },
-    };
-    const meta: PluginMeta = {
-      ...newProps.options,
-      id: 'cloudwatch',
-      type: PluginType.datasource,
-      info: {} as PluginMetaInfo,
-      module: '',
-      baseUrl: '',
-    };
-
-    const { rerender } = render(
-      <PluginContextProvider meta={meta}>
-        <ConfigEditor {...newProps} />
-      </PluginContextProvider>
-    );
-    await waitFor(() => expect(screen.getByText('Select log groups')).toBeInTheDocument());
-    const rerenderProps = {
-      ...newProps,
-      options: {
+        expect(await screen.getByText('logGroup-baz')).toBeInTheDocument();
+      });
+    });
+
+    it('should load the data source if it was saved before', async () => {
+      const SAVED_VERSION = 2;
+      setup({ version: SAVED_VERSION });
+      await waitFor(async () => expect(loadDataSourceMock).toHaveBeenCalled());
+    });
+
+    it('should not load the data source if it wasnt saved before', async () => {
+      const SAVED_VERSION = undefined;
+      setup({ version: SAVED_VERSION });
+      await waitFor(async () => expect(loadDataSourceMock).not.toHaveBeenCalled());
+    });
+
+    it('should show error message if Select log group button is clicked when data source is never saved', async () => {
+      setup({ version: 1 });
+      await waitFor(() => expect(screen.getByText('Select log groups')).toBeInTheDocument());
+      await userEvent.click(screen.getByText('Select log groups'));
+      await waitFor(() =>
+        expect(screen.getByText('You need to save the data source before adding log groups.')).toBeInTheDocument()
+      );
+    });
+
+    it('should show error message if Select log group button is clicked when data source is saved before but have unsaved changes', async () => {
+      const SAVED_VERSION = 3;
+      const newProps = {
+        ...props,
+        options: {
+          ...props.options,
+          version: SAVED_VERSION,
+        },
+      };
+      const meta: PluginMeta = {
         ...newProps.options,
-        jsonData: {
-          ...newProps.options.jsonData,
-          authType: AwsAuthType.Default,
+        id: 'cloudwatch',
+        type: PluginType.datasource,
+        info: {} as PluginMetaInfo,
+        module: '',
+        baseUrl: '',
+      };
+
+      const { rerender } = render(
+        <PluginContextProvider meta={meta}>
+          <ConfigEditor {...newProps} />
+        </PluginContextProvider>
+      );
+      await waitFor(() => expect(screen.getByText('Select log groups')).toBeInTheDocument());
+      const rerenderProps = {
+        ...newProps,
+        options: {
+          ...newProps.options,
+          jsonData: {
+            ...newProps.options.jsonData,
+            authType: AwsAuthType.Default,
+          },
         },
-      },
-    };
-    rerender(
-      <PluginContextProvider meta={meta}>
-        <ConfigEditor {...rerenderProps} />
-      </PluginContextProvider>
-    );
-    await waitFor(() => expect(screen.getByText('AWS SDK Default')).toBeInTheDocument());
-    await userEvent.click(screen.getByText('Select log groups'));
-    await waitFor(() =>
-      expect(
-        screen.getByText(
-          'You have unsaved connection detail changes. You need to save the data source before adding log groups.'
-        )
-      ).toBeInTheDocument()
-    );
-  });
+      };
+      rerender(
+        <PluginContextProvider meta={meta}>
+          <ConfigEditor {...rerenderProps} />
+        </PluginContextProvider>
+      );
+      await waitFor(() => expect(screen.getByText('AWS SDK Default')).toBeInTheDocument());
+      await userEvent.click(screen.getByText('Select log groups'));
+      await waitFor(() =>
+        expect(
+          screen.getByText(
+            'You have unsaved connection detail changes. You need to save the data source before adding log groups.'
+          )
+        ).toBeInTheDocument()
+      );
+    });
 
-  it('should open log group selector if Select log group button is clicked when data source has saved changes', async () => {
-    const newProps = {
-      ...props,
-      options: {
-        ...props.options,
-        version: 1,
-      },
-    };
-    const meta: PluginMeta = {
-      ...newProps.options,
-      id: 'cloudwatch',
-      type: PluginType.datasource,
-      info: {} as PluginMetaInfo,
-      module: '',
-      baseUrl: '',
-    };
-    const { rerender } = render(
-      <PluginContextProvider meta={meta}>
-        <ConfigEditor {...newProps} />
-      </PluginContextProvider>
-    );
-    await waitFor(() => expect(screen.getByText('Select log groups')).toBeInTheDocument());
-    const rerenderProps = {
-      ...newProps,
-      options: {
+    it('should open log group selector if Select log group button is clicked when data source has saved changes', async () => {
+      const newProps = {
+        ...props,
+        options: {
+          ...props.options,
+          version: 1,
+        },
+      };
+      const meta: PluginMeta = {
         ...newProps.options,
-        version: 2,
-      },
-    };
-    rerender(
-      <PluginContextProvider meta={meta}>
-        <ConfigEditor {...rerenderProps} />
-      </PluginContextProvider>
-    );
-    await userEvent.click(screen.getByText('Select log groups'));
-    await waitFor(() => expect(screen.getByText('Log group name prefix')).toBeInTheDocument());
+        id: 'cloudwatch',
+        type: PluginType.datasource,
+        info: {} as PluginMetaInfo,
+        module: '',
+        baseUrl: '',
+      };
+      const { rerender } = render(
+        <PluginContextProvider meta={meta}>
+          <ConfigEditor {...newProps} />
+        </PluginContextProvider>
+      );
+      await waitFor(() => expect(screen.getByText('Select log groups')).toBeInTheDocument());
+      const rerenderProps = {
+        ...newProps,
+        options: {
+          ...newProps.options,
+          version: 2,
+        },
+      };
+      rerender(
+        <PluginContextProvider meta={meta}>
+          <ConfigEditor {...rerenderProps} />
+        </PluginContextProvider>
+      );
+      await userEvent.click(screen.getByText('Select log groups'));
+      await waitFor(() => expect(screen.getByText('Log group name prefix')).toBeInTheDocument());
+    });
+  }
+
+  describe('QueryEditor with awsDatasourcesNewFormStyling feature toggle enabled', () => {
+    beforeAll(() => {
+      config.featureToggles.awsDatasourcesNewFormStyling = false;
+    });
+    afterAll(() => {
+      cleanupFeatureToggle();
+    });
+    run();
+    describe('QueryEditor with awsDatasourcesNewFormStyling feature toggle enabled', () => {
+      beforeAll(() => {
+        config.featureToggles.awsDatasourcesNewFormStyling = true;
+      });
+      afterAll(() => {
+        cleanupFeatureToggle();
+      });
+      run();
+    });
   });
 });
diff --git a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.tsx
index 9c5e38ced2383..f6b551955da27 100644
--- a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.tsx
@@ -10,35 +10,39 @@ import {
   DataSourceTestSucceeded,
   DataSourceTestFailed,
 } from '@grafana/data';
-import { getAppEvents, usePluginInteractionReporter } from '@grafana/runtime';
-import { Input, InlineField, FieldProps, SecureSocksProxySettings } from '@grafana/ui';
-import { notifyApp } from 'app/core/actions';
-import { config } from 'app/core/config';
-import { createWarningNotification } from 'app/core/copy/appNotification';
-import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
-import { store } from 'app/store/store';
+import { ConfigSection } from '@grafana/experimental';
+import { getAppEvents, usePluginInteractionReporter, getDataSourceSrv, config } from '@grafana/runtime';
+import { Alert, Input, InlineField, FieldProps, SecureSocksProxySettings, Field, Divider } from '@grafana/ui';
 
 import { CloudWatchDatasource } from '../../datasource';
 import { SelectableResourceValue } from '../../resources/types';
 import { CloudWatchJsonData, CloudWatchSecureJsonData } from '../../types';
 import { LogGroupsFieldWrapper } from '../shared/LogGroups/LogGroupsField';
 
+import { SecureSocksProxySettingsNewStyling } from './SecureSocksProxySettingsNewStyling';
 import { XrayLinkConfig } from './XrayLinkConfig';
 
 export type Props = DataSourcePluginOptionsEditorProps<CloudWatchJsonData, CloudWatchSecureJsonData>;
 
 type LogGroupFieldState = Pick<FieldProps, 'invalid'> & { error?: string | null };
 
+export const ARN_DEPRECATION_WARNING_MESSAGE =
+  'Since grafana 7.3 authentication type "arn" is deprecated, falling back to default SDK provider';
+export const CREDENTIALS_AUTHENTICATION_WARNING_MESSAGE =
+  'As of grafana 7.3 authentication type "credentials" should be used only for shared file credentials. \
+If you don\'t have a credentials file, switch to the default SDK provider for extracting credentials \
+from environment variables or IAM roles';
+
 export const ConfigEditor = (props: Props) => {
   const { options, onOptionsChange } = props;
   const { defaultLogGroups, logsTimeout, defaultRegion, logGroups } = options.jsonData;
   const datasource = useDatasource(props);
-  useAuthenticationWarning(options.jsonData);
   const logsTimeoutError = useTimoutValidation(logsTimeout);
   const saved = useDataSourceSavedState(props);
   const [logGroupFieldState, setLogGroupFieldState] = useState<LogGroupFieldState>({
     invalid: false,
   });
+  const newFormStylingEnabled = config.featureToggles.awsDatasourcesNewFormStyling;
   useEffect(() => setLogGroupFieldState({ invalid: false }), [props.options]);
   const report = usePluginInteractionReporter();
   useEffect(() => {
@@ -67,8 +71,134 @@ export const ConfigEditor = (props: Props) => {
     }
   }, [datasource, externalId]);
 
-  return (
+  const [warning, setWarning] = useState<string | null>(null);
+  const dismissWarning = () => {
+    setWarning(null);
+  };
+  useEffect(() => {
+    if (options.jsonData.authType === 'arn') {
+      setWarning(ARN_DEPRECATION_WARNING_MESSAGE);
+    } else if (options.jsonData.authType === 'credentials' && !options.jsonData.profile && !options.jsonData.database) {
+      setWarning(CREDENTIALS_AUTHENTICATION_WARNING_MESSAGE);
+    }
+  }, [options.jsonData.authType, options.jsonData.database, options.jsonData.profile]);
+
+  return newFormStylingEnabled ? (
+    <div className="width-30">
+      {warning && (
+        <Alert title="CloudWatch Authentication" severity="warning" onRemove={dismissWarning}>
+          {warning}
+        </Alert>
+      )}
+      <ConnectionConfig
+        {...props}
+        newFormStylingEnabled={true}
+        loadRegions={
+          datasource &&
+          (async () => {
+            return datasource.resources
+              .getRegions()
+              .then((regions) =>
+                regions.reduce(
+                  (acc: string[], curr: SelectableResourceValue) => (curr.value ? [...acc, curr.value] : acc),
+                  []
+                )
+              );
+          })
+        }
+        externalId={externalId}
+      >
+        <Field label="Namespaces of Custom Metrics">
+          <Input
+            placeholder="Namespace1,Namespace2"
+            value={options.jsonData.customMetricsNamespaces || ''}
+            onChange={onUpdateDatasourceJsonDataOption(props, 'customMetricsNamespaces')}
+          />
+        </Field>
+      </ConnectionConfig>
+      {config.secureSocksDSProxyEnabled && (
+        <SecureSocksProxySettingsNewStyling options={options} onOptionsChange={onOptionsChange} />
+      )}
+      <Divider />
+      <ConfigSection title="Cloudwatch Logs">
+        <Field
+          htmlFor="logsTimeout"
+          label="Query Result Timeout"
+          description='Grafana will poll for Cloudwatch Logs results every second until Done status is returned from AWS or timeout is exceeded, in which case Grafana will return an error. Note: For Alerting, the timeout from Grafana config file will take precedence. Must be a valid duration string, such as "30m" (default) "30s" "2000ms" etc.'
+          invalid={Boolean(logsTimeoutError)}
+        >
+          <Input
+            id="logsTimeout"
+            width={60}
+            placeholder="30m"
+            value={options.jsonData.logsTimeout || ''}
+            onChange={onUpdateDatasourceJsonDataOption(props, 'logsTimeout')}
+            title={'The timeout must be a valid duration string, such as "15m" "30s" "2000ms" etc.'}
+          />
+        </Field>
+        <Field
+          label="Default Log Groups"
+          description="Optionally, specify default log groups for CloudWatch Logs queries."
+          {...logGroupFieldState}
+        >
+          {datasource ? (
+            <LogGroupsFieldWrapper
+              newFormStylingEnabled={true}
+              region={defaultRegion ?? ''}
+              datasource={datasource}
+              onBeforeOpen={() => {
+                if (saved) {
+                  return;
+                }
+
+                let error = 'You need to save the data source before adding log groups.';
+                if (props.options.version && props.options.version > 1) {
+                  error =
+                    'You have unsaved connection detail changes. You need to save the data source before adding log groups.';
+                }
+                setLogGroupFieldState({
+                  invalid: true,
+                  error,
+                });
+                throw new Error(error);
+              }}
+              legacyLogGroupNames={defaultLogGroups}
+              logGroups={logGroups}
+              onChange={(updatedLogGroups) => {
+                onOptionsChange({
+                  ...props.options,
+                  jsonData: {
+                    ...props.options.jsonData,
+                    logGroups: updatedLogGroups,
+                    defaultLogGroups: undefined,
+                  },
+                });
+              }}
+              maxNoOfVisibleLogGroups={2}
+              //legacy props
+              legacyOnChange={(logGroups) => {
+                updateDatasourcePluginJsonDataOption(props, 'defaultLogGroups', logGroups);
+              }}
+            />
+          ) : (
+            <></>
+          )}
+        </Field>
+      </ConfigSection>
+      <Divider />
+      <XrayLinkConfig
+        newFormStyling={true}
+        onChange={(uid) => updateDatasourcePluginJsonDataOption(props, 'tracingDatasourceUid', uid)}
+        datasourceUid={options.jsonData.tracingDatasourceUid}
+      />
+    </div>
+  ) : (
     <>
+      {warning && (
+        <Alert title="CloudWatch Authentication" severity="warning" onRemove={dismissWarning}>
+          {warning}
+        </Alert>
+      )}
       <ConnectionConfig
         {...props}
         labelWidth={29}
@@ -175,31 +305,13 @@ export const ConfigEditor = (props: Props) => {
   );
 };
 
-function useAuthenticationWarning(jsonData: CloudWatchJsonData) {
-  const addWarning = (message: string) => {
-    store.dispatch(notifyApp(createWarningNotification('CloudWatch Authentication', message)));
-  };
-
-  useEffect(() => {
-    if (jsonData.authType === 'arn') {
-      addWarning('Since grafana 7.3 authentication type "arn" is deprecated, falling back to default SDK provider');
-    } else if (jsonData.authType === 'credentials' && !jsonData.profile && !jsonData.database) {
-      addWarning(
-        'As of grafana 7.3 authentication type "credentials" should be used only for shared file credentials. \
-             If you don\'t have a credentials file, switch to the default SDK provider for extracting credentials \
-             from environment variables or IAM roles'
-      );
-    }
-  }, [jsonData.authType, jsonData.database, jsonData.profile]);
-}
-
 function useDatasource(props: Props) {
   const [datasource, setDatasource] = useState<CloudWatchDatasource>();
 
   useEffect(() => {
     if (props.options.version) {
-      getDatasourceSrv()
-        .loadDatasource(props.options.name)
+      getDataSourceSrv()
+        .get(props.options.name)
         .then((datasource) => {
           if (datasource instanceof CloudWatchDatasource) {
             setDatasource(datasource);
diff --git a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/SecureSocksProxySettingsNewStyling.tsx b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/SecureSocksProxySettingsNewStyling.tsx
new file mode 100644
index 0000000000000..0b034afc2bbcc
--- /dev/null
+++ b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/SecureSocksProxySettingsNewStyling.tsx
@@ -0,0 +1,33 @@
+import React from 'react';
+
+import { DataSourceJsonData, DataSourcePluginOptionsEditorProps } from '@grafana/data';
+import { ConfigSection } from '@grafana/experimental';
+import { Field, Switch } from '@grafana/ui';
+
+export interface Props<T extends DataSourceJsonData>
+  extends Pick<DataSourcePluginOptionsEditorProps<T>, 'options' | 'onOptionsChange'> {}
+
+export interface SecureSocksProxyConfig extends DataSourceJsonData {
+  enableSecureSocksProxy?: boolean;
+}
+
+export function SecureSocksProxySettingsNewStyling<T extends SecureSocksProxyConfig>({
+  options,
+  onOptionsChange,
+}: Props<T>): JSX.Element {
+  return (
+    <ConfigSection title="Secure Socks Proxy">
+      <Field label="Enabled" description="Connect to this datasource via the secure socks proxy.">
+        <Switch
+          value={options.jsonData.enableSecureSocksProxy ?? false}
+          onChange={(event) =>
+            onOptionsChange({
+              ...options,
+              jsonData: { ...options.jsonData, enableSecureSocksProxy: event.currentTarget.checked },
+            })
+          }
+        />
+      </Field>
+    </ConfigSection>
+  );
+}
diff --git a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/XrayLinkConfig.tsx b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/XrayLinkConfig.tsx
index 107a11e42d303..f963a0547e322 100644
--- a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/XrayLinkConfig.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/XrayLinkConfig.tsx
@@ -2,9 +2,9 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2, DataSourceInstanceSettings } from '@grafana/data';
-import { Alert, InlineField, useStyles2 } from '@grafana/ui';
-import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker';
-import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
+import { ConfigSection } from '@grafana/experimental';
+import { DataSourcePicker, getDataSourceSrv } from '@grafana/runtime';
+import { Alert, Field, InlineField, useStyles2 } from '@grafana/ui';
 
 const getStyles = (theme: GrafanaTheme2) => ({
   infoText: css`
@@ -16,16 +16,39 @@ const getStyles = (theme: GrafanaTheme2) => ({
 interface Props {
   datasourceUid?: string;
   onChange: (uid: string) => void;
+  newFormStyling?: boolean;
 }
 
 const xRayDsId = 'grafana-x-ray-datasource';
 
-export function XrayLinkConfig({ datasourceUid, onChange }: Props) {
-  const hasXrayDatasource = Boolean(getDatasourceSrv().getList({ pluginId: xRayDsId }).length);
+export function XrayLinkConfig({ newFormStyling, datasourceUid, onChange }: Props) {
+  const hasXrayDatasource = Boolean(getDataSourceSrv().getList({ pluginId: xRayDsId }).length);
 
   const styles = useStyles2(getStyles);
 
-  return (
+  return newFormStyling ? (
+    <ConfigSection
+      title="X-ray trace link"
+      description="Grafana will automatically create a link to a trace in X-ray data source if logs contain @xrayTraceId field"
+    >
+      {!hasXrayDatasource && (
+        <Alert
+          title={
+            'There is no X-ray datasource to link to. First add an X-ray data source and then link it to Cloud Watch. '
+          }
+          severity="info"
+        />
+      )}
+      <Field htmlFor="data-source-picker" label="Data source" description="X-ray data source containing traces">
+        <DataSourcePicker
+          pluginId={xRayDsId}
+          onChange={(ds: DataSourceInstanceSettings) => onChange(ds.uid)}
+          current={datasourceUid}
+          noDefault={true}
+        />
+      </Field>
+    </ConfigSection>
+  ) : (
     <>
       <h3 className="page-heading">X-ray trace link</h3>
 
diff --git a/public/app/plugins/datasource/cloudwatch/components/Errors/ThrottlingErrorMessage.tsx b/public/app/plugins/datasource/cloudwatch/components/Errors/ThrottlingErrorMessage.tsx
index 2dcdba5176523..1e03ad21c9084 100644
--- a/public/app/plugins/datasource/cloudwatch/components/Errors/ThrottlingErrorMessage.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/Errors/ThrottlingErrorMessage.tsx
@@ -20,7 +20,7 @@ export const ThrottlingErrorMessage = ({ region }: Props) => (
       target="_blank"
       rel="noreferrer"
       className="text-link"
-      href="https://grafana.com/docs/grafana/latest/datasources/cloudwatch/#service-quotas"
+      href="https://grafana.com/docs/grafana/latest/datasources/cloudwatch/#manage-service-quotas"
     >
       documentation
     </a>
diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryEditor.tsx
index 4daf3a5aa6693..fd57a6f45877e 100644
--- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryEditor.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryEditor.tsx
@@ -1,16 +1,14 @@
 import { css } from '@emotion/css';
 import React, { memo } from 'react';
 
-import { AbsoluteTimeRange, QueryEditorProps } from '@grafana/data';
-import { config } from '@grafana/runtime';
+import { QueryEditorProps } from '@grafana/data';
 import { InlineFormLabel } from '@grafana/ui';
 
 import { CloudWatchDatasource } from '../../../datasource';
 import { CloudWatchJsonData, CloudWatchLogsQuery, CloudWatchQuery } from '../../../types';
 
 import { CloudWatchLink } from './CloudWatchLink';
-import CloudWatchLogsQueryFieldMonaco from './LogsQueryField';
-import CloudWatchLogsQueryField from './LogsQueryFieldOld';
+import CloudWatchLogsQueryField from './LogsQueryField';
 
 type Props = QueryEditorProps<CloudWatchDatasource, CloudWatchQuery, CloudWatchJsonData> & {
   query: CloudWatchLogsQuery;
@@ -22,37 +20,11 @@ const labelClass = css`
 `;
 
 export const CloudWatchLogsQueryEditor = memo(function CloudWatchLogsQueryEditor(props: Props) {
-  const { query, data, datasource, exploreId } = props;
+  const { query, data, datasource } = props;
 
-  let absolute: AbsoluteTimeRange;
-  if (data?.request?.range?.from) {
-    const { range } = data.request;
-    absolute = {
-      from: range.from.valueOf(),
-      to: range.to.valueOf(),
-    };
-  } else {
-    absolute = {
-      from: Date.now() - 10000,
-      to: Date.now(),
-    };
-  }
-
-  return config.featureToggles.cloudWatchLogsMonacoEditor ? (
-    <CloudWatchLogsQueryFieldMonaco
-      {...props}
-      ExtraFieldElement={
-        <InlineFormLabel className={`gf-form-label--btn ${labelClass}`} width="auto" tooltip="Link to Graph in AWS">
-          <CloudWatchLink query={query} panelData={data} datasource={datasource} />
-        </InlineFormLabel>
-      }
-    />
-  ) : (
+  return (
     <CloudWatchLogsQueryField
       {...props}
-      exploreId={exploreId}
-      history={[]}
-      absoluteRange={absolute}
       ExtraFieldElement={
         <InlineFormLabel className={`gf-form-label--btn ${labelClass}`} width="auto" tooltip="Link to Graph in AWS">
           <CloudWatchLink query={query} panelData={data} datasource={datasource} />
diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryField.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryField.tsx
index e3c2d301bba10..cf30ff6665eec 100644
--- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryField.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryField.tsx
@@ -1,5 +1,5 @@
 import type * as monacoType from 'monaco-editor/esm/vs/editor/editor.api';
-import React, { ReactNode, useCallback } from 'react';
+import React, { ReactNode, useCallback, useRef } from 'react';
 
 import { QueryEditorProps } from '@grafana/data';
 import { CodeEditor, Monaco, Themeable2, withTheme2 } from '@grafana/ui';
@@ -7,7 +7,7 @@ import { CodeEditor, Monaco, Themeable2, withTheme2 } from '@grafana/ui';
 import { CloudWatchDatasource } from '../../../datasource';
 import language from '../../../language/logs/definition';
 import { TRIGGER_SUGGEST } from '../../../language/monarch/commands';
-import { registerLanguage } from '../../../language/monarch/register';
+import { registerLanguage, reRegisterCompletionProvider } from '../../../language/monarch/register';
 import { CloudWatchJsonData, CloudWatchLogsQuery, CloudWatchQuery } from '../../../types';
 import { getStatsGroups } from '../../../utils/query/getStatsGroups';
 import { LogGroupsFieldWrapper } from '../../shared/LogGroups/LogGroupsField';
@@ -18,10 +18,31 @@ export interface CloudWatchLogsQueryFieldProps
   ExtraFieldElement?: ReactNode;
   query: CloudWatchLogsQuery;
 }
-export const CloudWatchLogsQueryFieldMonaco = (props: CloudWatchLogsQueryFieldProps) => {
+export const CloudWatchLogsQueryField = (props: CloudWatchLogsQueryFieldProps) => {
   const { query, datasource, onChange, ExtraFieldElement, data } = props;
 
   const showError = data?.error?.refId === query.refId;
+  const monacoRef = useRef<Monaco>();
+  const disposalRef = useRef<monacoType.IDisposable>();
+
+  const onChangeLogs = useCallback(
+    async (query: CloudWatchLogsQuery) => {
+      onChange(query);
+    },
+    [onChange]
+  );
+
+  const onFocus = useCallback(async () => {
+    disposalRef.current = await reRegisterCompletionProvider(
+      monacoRef.current!,
+      language,
+      datasource.logsCompletionItemProviderFunc({
+        region: query.region,
+        logGroups: query.logGroups,
+      }),
+      disposalRef.current
+    );
+  }, [datasource, query.logGroups, query.region]);
 
   const onChangeQuery = useCallback(
     (value: string) => {
@@ -44,6 +65,17 @@ export const CloudWatchLogsQueryFieldMonaco = (props: CloudWatchLogsQueryFieldPr
     },
     [onChangeQuery]
   );
+  const onBeforeEditorMount = async (monaco: Monaco) => {
+    monacoRef.current = monaco;
+    disposalRef.current = await registerLanguage(
+      monaco,
+      language,
+      datasource.logsCompletionItemProviderFunc({
+        region: query.region,
+        logGroups: query.logGroups,
+      })
+    );
+  };
 
   return (
     <>
@@ -53,11 +85,11 @@ export const CloudWatchLogsQueryFieldMonaco = (props: CloudWatchLogsQueryFieldPr
         legacyLogGroupNames={query.logGroupNames}
         logGroups={query.logGroups}
         onChange={(logGroups) => {
-          onChange({ ...query, logGroups, logGroupNames: undefined });
+          onChangeLogs({ ...query, logGroups, logGroupNames: undefined });
         }}
         //legacy props
         legacyOnChange={(logGroupNames) => {
-          onChange({ ...query, logGroupNames });
+          onChangeLogs({ ...query, logGroupNames });
         }}
       />
       <div className="gf-form-inline gf-form-inline--nowrap flex-grow-1">
@@ -90,11 +122,12 @@ export const CloudWatchLogsQueryFieldMonaco = (props: CloudWatchLogsQueryFieldPr
               if (value !== query.expression) {
                 onChangeQuery(value);
               }
+              disposalRef.current?.dispose();
             }}
-            onBeforeEditorMount={(monaco: Monaco) =>
-              registerLanguage(monaco, language, datasource.logsCompletionItemProvider)
-            }
+            onFocus={onFocus}
+            onBeforeEditorMount={onBeforeEditorMount}
             onEditorDidMount={onEditorMount}
+            onEditorWillUnmount={() => disposalRef.current?.dispose()}
           />
         </div>
         {ExtraFieldElement}
@@ -108,4 +141,4 @@ export const CloudWatchLogsQueryFieldMonaco = (props: CloudWatchLogsQueryFieldPr
   );
 };
 
-export default withTheme2(CloudWatchLogsQueryFieldMonaco);
+export default withTheme2(CloudWatchLogsQueryField);
diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryFieldOld.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryFieldOld.tsx
deleted file mode 100644
index b4f9fca3e2b10..0000000000000
--- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryFieldOld.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-import { LanguageMap, languages as prismLanguages } from 'prismjs';
-import React, { ReactNode } from 'react';
-import { Node, Plugin } from 'slate';
-import { Editor } from 'slate-react';
-
-import { AbsoluteTimeRange, QueryEditorProps } from '@grafana/data';
-import {
-  BracesPlugin,
-  QueryField,
-  SlatePrism,
-  Themeable2,
-  TypeaheadInput,
-  TypeaheadOutput,
-  withTheme2,
-} from '@grafana/ui';
-
-// Utils & Services
-// dom also includes Element polyfills
-import { CloudWatchDatasource } from '../../../datasource';
-import syntax from '../../../language/cloudwatch-logs/syntax';
-import { CloudWatchJsonData, CloudWatchLogsQuery, CloudWatchQuery, LogGroup } from '../../../types';
-import { getStatsGroups } from '../../../utils/query/getStatsGroups';
-import { LogGroupsFieldWrapper } from '../../shared/LogGroups/LogGroupsField';
-
-export interface CloudWatchLogsQueryFieldProps
-  extends QueryEditorProps<CloudWatchDatasource, CloudWatchQuery, CloudWatchJsonData>,
-    Themeable2 {
-  absoluteRange: AbsoluteTimeRange;
-  onLabelsRefresh?: () => void;
-  ExtraFieldElement?: ReactNode;
-  exploreId: string;
-  query: CloudWatchLogsQuery;
-}
-const plugins: Array<Plugin<Editor>> = [
-  BracesPlugin(),
-  SlatePrism(
-    {
-      onlyIn: (node: Node) => node.object === 'block' && node.type === 'code_block',
-      getSyntax: (node: Node) => 'cloudwatch',
-    },
-    { ...(prismLanguages as LanguageMap), cloudwatch: syntax }
-  ),
-];
-export const CloudWatchLogsQueryField = (props: CloudWatchLogsQueryFieldProps) => {
-  const { query, datasource, onChange, ExtraFieldElement, data } = props;
-
-  const showError = data?.error?.refId === query.refId;
-  const cleanText = datasource.languageProvider.cleanText;
-
-  const onChangeQuery = (value: string) => {
-    // Send text change to parent
-    const nextQuery = {
-      ...query,
-      expression: value,
-      statsGroups: getStatsGroups(value),
-    };
-    onChange(nextQuery);
-  };
-
-  const onTypeahead = async (typeahead: TypeaheadInput): Promise<TypeaheadOutput> => {
-    const { datasource, query } = props;
-    const { logGroups } = query;
-
-    if (!datasource.languageProvider) {
-      return { suggestions: [] };
-    }
-
-    const { history, absoluteRange } = props;
-    const { prefix, text, value, wrapperClasses, labelKey, editor } = typeahead;
-
-    return await datasource.languageProvider.provideCompletionItems(
-      { text, value, prefix, wrapperClasses, labelKey, editor },
-      {
-        history,
-        absoluteRange,
-        logGroups: logGroups,
-        region: query.region,
-      }
-    );
-  };
-
-  return (
-    <>
-      <LogGroupsFieldWrapper
-        region={query.region}
-        datasource={datasource}
-        legacyLogGroupNames={query.logGroupNames}
-        logGroups={query.logGroups}
-        onChange={(logGroups: LogGroup[]) => {
-          onChange({ ...query, logGroups, logGroupNames: undefined });
-        }}
-        //legacy props can be removed once we remove support for Legacy Log Group Selector
-        legacyOnChange={(logGroups: string[]) => {
-          onChange({ ...query, logGroupNames: logGroups });
-        }}
-      />
-      <div className="gf-form-inline gf-form-inline--nowrap flex-grow-1">
-        <div className="gf-form gf-form--grow flex-shrink-1">
-          <QueryField
-            additionalPlugins={plugins}
-            query={query.expression ?? ''}
-            onChange={onChangeQuery}
-            onTypeahead={onTypeahead}
-            cleanText={cleanText}
-            placeholder="Enter a CloudWatch Logs Insights query (run with Shift+Enter)"
-            portalOrigin="cloudwatch"
-          />
-        </div>
-        {ExtraFieldElement}
-      </div>
-      {showError ? (
-        <div className="query-row-break">
-          <div className="prom-query-field-info text-error">{data?.error?.message}</div>
-        </div>
-      ) : null}
-    </>
-  );
-};
-
-export default withTheme2(CloudWatchLogsQueryField);
diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MathExpressionQueryField.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MathExpressionQueryField.tsx
index 110d8171c1023..5ac7ca8e22679 100644
--- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MathExpressionQueryField.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MathExpressionQueryField.tsx
@@ -29,8 +29,9 @@ export function MathExpressionQueryField({ expression: query, onChange, datasour
       // We may wish to consider abstracting it into the grafana/ui repo in the future
       const updateElementHeight = () => {
         const containerDiv = containerRef.current;
-        if (containerDiv !== null && editor.getContentHeight() < 200) {
-          const pixelHeight = Math.max(32, editor.getContentHeight());
+        if (containerDiv !== null) {
+          const maxPixelHeight = Math.min(200, editor.getContentHeight());
+          const pixelHeight = Math.max(32, maxPixelHeight);
           containerDiv.style.height = `${pixelHeight}px`;
           containerDiv.style.width = '100%';
           const pixelWidth = containerDiv.clientWidth;
diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MetricsQueryEditor.test.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MetricsQueryEditor.test.tsx
index 5ea445672a084..0be9d041cf203 100644
--- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MetricsQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MetricsQueryEditor.test.tsx
@@ -2,12 +2,11 @@ import { render, screen } from '@testing-library/react';
 import React from 'react';
 import selectEvent from 'react-select-event';
 
-import { DataSourceInstanceSettings } from '@grafana/data';
+import { CustomVariableModel, DataSourceInstanceSettings } from '@grafana/data';
 import * as ui from '@grafana/ui';
-import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
-import { TemplateSrv } from 'app/features/templating/template_srv';
 
-import { CustomVariableModel, initialVariableModelState } from '../../../../../../features/variables/types';
+import { setupMockedTemplateService } from '../../../__mocks__/CloudWatchDataSource';
+import { initialVariableModelState } from '../../../__mocks__/CloudWatchVariables';
 import { CloudWatchDatasource } from '../../../datasource';
 import { CloudWatchJsonData, MetricEditorMode, MetricQueryType } from '../../../types';
 
@@ -25,7 +24,6 @@ const setup = () => {
     jsonData: { defaultRegion: 'us-east-1' },
   } as DataSourceInstanceSettings<CloudWatchJsonData>;
 
-  const templateSrv = new TemplateSrv();
   const variable: CustomVariableModel = {
     ...initialVariableModelState,
     id: 'var3',
@@ -42,9 +40,9 @@ const setup = () => {
     query: '',
     type: 'custom',
   };
-  templateSrv.init([variable]);
+  const templateSrv = setupMockedTemplateService([variable]);
 
-  const datasource = new CloudWatchDatasource(instanceSettings, templateSrv, {} as TimeSrv);
+  const datasource = new CloudWatchDatasource(instanceSettings, templateSrv);
   datasource.metricFindQuery = async () => [{ value: 'test', label: 'test', text: 'test' }];
   datasource.resources.getNamespaces = jest.fn().mockResolvedValue([]);
   datasource.resources.getMetrics = jest.fn().mockResolvedValue([]);
diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MetricsQueryEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MetricsQueryEditor.tsx
index 83c0a2f6ef762..884f9d373fd0f 100644
--- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MetricsQueryEditor.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MetricsQueryEditor.tsx
@@ -1,8 +1,8 @@
 import React, { ChangeEvent, useCallback, useEffect, useState } from 'react';
 
 import { QueryEditorProps, SelectableValue } from '@grafana/data';
-import { EditorField, EditorRow, InlineSelect, Space } from '@grafana/experimental';
-import { ConfirmModal, Input, RadioButtonGroup } from '@grafana/ui';
+import { EditorField, EditorRow, InlineSelect } from '@grafana/experimental';
+import { ConfirmModal, Input, RadioButtonGroup, Space } from '@grafana/ui';
 
 import { CloudWatchDatasource } from '../../../datasource';
 import useMigratedMetricsQuery from '../../../migrations/useMigratedMetricsQuery';
diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderEditor.test.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderEditor.test.tsx
index 13bf64016d46d..bfd11f2bc85e1 100644
--- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderEditor.test.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderEditor.test.tsx
@@ -95,12 +95,15 @@ describe('Cloudwatch SQLBuilderEditor', () => {
 
     render(<SQLBuilderEditor {...baseProps} query={query} />);
     await waitFor(() =>
-      expect(datasource.resources.getDimensionKeys).toHaveBeenCalledWith({
-        namespace: 'AWS/EC2',
-        region: query.region,
-        dimensionFilters: { InstanceId: null },
-        metricName: undefined,
-      })
+      expect(datasource.resources.getDimensionKeys).toHaveBeenCalledWith(
+        {
+          namespace: 'AWS/EC2',
+          region: query.region,
+          dimensionFilters: { InstanceId: null },
+          metricName: undefined,
+        },
+        false
+      )
     );
     expect(screen.getByText('AWS/EC2')).toBeInTheDocument();
     expect(screen.getByLabelText('With schema')).toBeChecked();
diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLFilter.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLFilter.tsx
index 079c67d0efe1a..6c4cfc48706de 100644
--- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLFilter.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLFilter.tsx
@@ -1,9 +1,10 @@
+import { css } from '@emotion/css';
 import React, { useMemo, useState } from 'react';
 import { useAsyncFn } from 'react-use';
 
 import { SelectableValue, toOption } from '@grafana/data';
 import { AccessoryButton, EditorList, InputGroup } from '@grafana/experimental';
-import { Select } from '@grafana/ui';
+import { Alert, Select, useStyles2 } from '@grafana/ui';
 
 import { CloudWatchDatasource } from '../../../../datasource';
 import {
@@ -11,7 +12,7 @@ import {
   QueryEditorOperatorExpression,
   QueryEditorPropertyType,
 } from '../../../../expressions';
-import { useDimensionKeys } from '../../../../hooks';
+import { useDimensionKeys, useEnsureVariableHasSingleSelection } from '../../../../hooks';
 import { COMPARISON_OPERATORS, EQUALS } from '../../../../language/cloudwatch-sql/language';
 import { CloudWatchMetricsQuery } from '../../../../types';
 import { appendTemplateVariables } from '../../../../utils/utils';
@@ -101,6 +102,7 @@ interface FilterItemProps {
 
 const FilterItem = (props: FilterItemProps) => {
   const { datasource, query, filter, onChange, onDelete } = props;
+  const styles = useStyles2(getStyles);
   const sql = query.sql ?? {};
 
   const namespace = getNamespaceFromExpression(sql.from);
@@ -127,36 +129,58 @@ const FilterItem = (props: FilterItemProps) => {
     filter.property?.name,
   ]);
 
+  const propertyNameError = useEnsureVariableHasSingleSelection(datasource, filter.property?.name);
+  const operatorValueError = useEnsureVariableHasSingleSelection(
+    datasource,
+    typeof filter.operator?.value === 'string' ? filter.operator?.value : undefined
+  );
+
   return (
-    <InputGroup>
-      <Select
-        width="auto"
-        value={filter.property?.name ? toOption(filter.property?.name) : null}
-        options={dimensionKeys}
-        allowCustomValue
-        onChange={({ value }) => value && onChange(setOperatorExpressionProperty(filter, value))}
-      />
-
-      <Select
-        width="auto"
-        value={filter.operator?.name && toOption(filter.operator.name)}
-        options={OPERATORS}
-        onChange={({ value }) => value && onChange(setOperatorExpressionName(filter, value))}
-      />
-
-      <Select
-        width="auto"
-        isLoading={state.loading}
-        value={
-          filter.operator?.value && typeof filter.operator?.value === 'string' ? toOption(filter.operator?.value) : null
-        }
-        options={state.value}
-        allowCustomValue
-        onOpenMenu={loadOptions}
-        onChange={({ value }) => value && onChange(setOperatorExpressionValue(filter, value))}
-      />
-
-      <AccessoryButton aria-label="remove" icon="times" variant="secondary" onClick={onDelete} />
-    </InputGroup>
+    <div className={styles.container}>
+      <InputGroup>
+        <Select
+          width="auto"
+          value={filter.property?.name ? toOption(filter.property?.name) : null}
+          options={dimensionKeys}
+          allowCustomValue
+          onChange={({ value }) => value && onChange(setOperatorExpressionProperty(filter, value))}
+        />
+
+        <Select
+          width="auto"
+          value={filter.operator?.name && toOption(filter.operator.name)}
+          options={OPERATORS}
+          onChange={({ value }) => value && onChange(setOperatorExpressionName(filter, value))}
+        />
+
+        <Select
+          width="auto"
+          isLoading={state.loading}
+          value={
+            filter.operator?.value && typeof filter.operator?.value === 'string'
+              ? toOption(filter.operator?.value)
+              : null
+          }
+          options={state.value}
+          allowCustomValue
+          onOpenMenu={loadOptions}
+          onChange={({ value }) => value && onChange(setOperatorExpressionValue(filter, value))}
+        />
+
+        <AccessoryButton aria-label="remove" icon="times" variant="secondary" onClick={onDelete} />
+      </InputGroup>
+
+      {propertyNameError && (
+        <Alert className={styles.alert} title={propertyNameError} severity="error" topSpacing={1} />
+      )}
+      {operatorValueError && (
+        <Alert className={styles.alert} title={operatorValueError} severity="error" topSpacing={1} />
+      )}
+    </div>
   );
 };
+
+const getStyles = () => ({
+  container: css({ display: 'inline-block' }),
+  alert: css({ minWidth: '100%', width: 'min-content' }),
+});
diff --git a/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/MultiFilter.test.tsx b/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/MultiFilter.test.tsx
index b1050541aec69..9f93308e59516 100644
--- a/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/MultiFilter.test.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/MultiFilter.test.tsx
@@ -2,8 +2,14 @@ import { fireEvent, render, screen, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
+import { setupMockedDataSource } from '../../__mocks__/CloudWatchDataSource';
+
 import { MultiFilter } from './MultiFilter';
 
+const ds = setupMockedDataSource({
+  variables: [],
+});
+
 describe('MultiFilters', () => {
   describe('when rendered with two existing multifilters', () => {
     it('should render two filter items', async () => {
@@ -12,7 +18,7 @@ describe('MultiFilters', () => {
         InstanceGroup: ['Group1'],
       };
       const onChange = jest.fn();
-      render(<MultiFilter filters={filters} onChange={onChange} />);
+      render(<MultiFilter filters={filters} onChange={onChange} datasource={ds.datasource} />);
       const filterItems = screen.getAllByTestId('cloudwatch-multifilter-item');
       expect(filterItems.length).toBe(2);
 
@@ -28,7 +34,7 @@ describe('MultiFilters', () => {
     it('it should add the new item but not call onChange', async () => {
       const filters = {};
       const onChange = jest.fn();
-      render(<MultiFilter filters={filters} onChange={onChange} />);
+      render(<MultiFilter filters={filters} onChange={onChange} datasource={ds.datasource} />);
 
       await userEvent.click(screen.getByLabelText('Add'));
       expect(screen.getByTestId('cloudwatch-multifilter-item')).toBeInTheDocument();
@@ -40,7 +46,7 @@ describe('MultiFilters', () => {
     it('it should add the new item but not call onChange', async () => {
       const filters = {};
       const onChange = jest.fn();
-      render(<MultiFilter filters={filters} onChange={onChange} />);
+      render(<MultiFilter filters={filters} onChange={onChange} datasource={ds.datasource} />);
 
       await userEvent.click(screen.getByLabelText('Add'));
       const filterItemElement = screen.getByTestId('cloudwatch-multifilter-item');
@@ -60,7 +66,7 @@ describe('MultiFilters', () => {
     it('it should add the new item and trigger onChange', async () => {
       const filters = {};
       const onChange = jest.fn();
-      render(<MultiFilter filters={filters} onChange={onChange} />);
+      render(<MultiFilter filters={filters} onChange={onChange} datasource={ds.datasource} />);
 
       const label = await screen.findByLabelText('Add');
       await userEvent.click(label);
@@ -88,7 +94,7 @@ describe('MultiFilters', () => {
     it('it should change the key and call onChange', async () => {
       const filters = { 'my-key': ['my-value'] };
       const onChange = jest.fn();
-      render(<MultiFilter filters={filters} onChange={onChange} />);
+      render(<MultiFilter filters={filters} onChange={onChange} datasource={ds.datasource} />);
 
       const filterItemElement = screen.getByTestId('cloudwatch-multifilter-item');
       expect(filterItemElement).toBeInTheDocument();
diff --git a/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/MultiFilter.tsx b/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/MultiFilter.tsx
index 863c6e56ea054..94668e1f9cf4c 100644
--- a/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/MultiFilter.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/MultiFilter.tsx
@@ -3,6 +3,7 @@ import React, { useEffect, useState } from 'react';
 
 import { EditorList } from '@grafana/experimental';
 
+import { type CloudWatchDatasource } from '../../datasource';
 import { MultiFilters } from '../../types';
 
 import { MultiFilterItem } from './MultiFilterItem';
@@ -11,6 +12,7 @@ export interface Props {
   filters?: MultiFilters;
   onChange: (filters: MultiFilters) => void;
   keyPlaceholder?: string;
+  datasource: CloudWatchDatasource;
 }
 
 export interface MultiFilterCondition {
@@ -32,7 +34,7 @@ const filterConditionsToMultiFilters = (filters: MultiFilterCondition[]) => {
   return res;
 };
 
-export const MultiFilter = ({ filters, onChange, keyPlaceholder }: Props) => {
+export const MultiFilter = ({ filters, onChange, keyPlaceholder, datasource }: Props) => {
   const [items, setItems] = useState<MultiFilterCondition[]>([]);
   useEffect(() => setItems(filters ? multiFiltersToFilterConditions(filters) : []), [filters]);
   const onFiltersChange = (newItems: Array<Partial<MultiFilterCondition>>) => {
@@ -46,10 +48,12 @@ export const MultiFilter = ({ filters, onChange, keyPlaceholder }: Props) => {
     }
   };
 
-  return <EditorList items={items} onChange={onFiltersChange} renderItem={makeRenderFilter(keyPlaceholder)} />;
+  return (
+    <EditorList items={items} onChange={onFiltersChange} renderItem={makeRenderFilter(datasource, keyPlaceholder)} />
+  );
 };
 
-function makeRenderFilter(keyPlaceholder?: string) {
+function makeRenderFilter(datasource: CloudWatchDatasource, keyPlaceholder?: string) {
   function renderFilter(
     item: MultiFilterCondition,
     onChange: (item: MultiFilterCondition) => void,
@@ -61,6 +65,7 @@ function makeRenderFilter(keyPlaceholder?: string) {
         onChange={(item) => onChange(item)}
         onDelete={onDelete}
         keyPlaceholder={keyPlaceholder}
+        datasource={datasource}
       />
     );
   }
diff --git a/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/MultiFilterItem.tsx b/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/MultiFilterItem.tsx
index 7559cee42899f..f9480b4802cba 100644
--- a/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/MultiFilterItem.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/MultiFilterItem.tsx
@@ -3,7 +3,10 @@ import React, { useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { AccessoryButton, InputGroup } from '@grafana/experimental';
-import { Input, stylesFactory, useTheme2 } from '@grafana/ui';
+import { Alert, Input, useStyles2 } from '@grafana/ui';
+
+import { type CloudWatchDatasource } from '../../datasource';
+import { useEnsureVariableHasSingleSelection } from '../../hooks';
 
 import { MultiFilterCondition } from './MultiFilter';
 
@@ -12,13 +15,14 @@ export interface Props {
   onChange: (value: MultiFilterCondition) => void;
   onDelete: () => void;
   keyPlaceholder?: string;
+  datasource: CloudWatchDatasource;
 }
 
-export const MultiFilterItem = ({ filter, onChange, onDelete, keyPlaceholder }: Props) => {
+export const MultiFilterItem = ({ filter, onChange, onDelete, keyPlaceholder, datasource }: Props) => {
   const [localKey, setLocalKey] = useState(filter.key || '');
   const [localValue, setLocalValue] = useState(filter.value?.join(', ') || '');
-  const theme = useTheme2();
-  const styles = getOperatorStyles(theme);
+  const error = useEnsureVariableHasSingleSelection(datasource, filter.key);
+  const styles = useStyles2(getOperatorStyles);
 
   return (
     <div data-testid="cloudwatch-multifilter-item">
@@ -55,13 +59,14 @@ export const MultiFilterItem = ({ filter, onChange, onDelete, keyPlaceholder }:
 
         <AccessoryButton aria-label="remove" icon="times" variant="secondary" onClick={onDelete} type="button" />
       </InputGroup>
+      {error && <Alert title={error} severity="error" topSpacing={1} />}
     </div>
   );
 };
 
-const getOperatorStyles = stylesFactory((theme: GrafanaTheme2) => ({
+const getOperatorStyles = (theme: GrafanaTheme2) => ({
   root: css({
     padding: theme.spacing(0, 1),
     alignSelf: 'center',
   }),
-}));
+});
diff --git a/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryEditor.test.tsx b/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryEditor.test.tsx
index b2a065e8050aa..d91dca40a29a3 100644
--- a/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryEditor.test.tsx
@@ -3,6 +3,8 @@ import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { select } from 'react-select-event';
 
+import { config } from '@grafana/runtime';
+
 import { setupMockedDataSource } from '../../__mocks__/CloudWatchDataSource';
 import { GetDimensionKeysRequest } from '../../resources/types';
 import { VariableQueryType } from '../../types';
@@ -23,6 +25,12 @@ const defaultQuery = {
 
 const ds = setupMockedDataSource();
 
+const originalFormFeatureToggleValue = config.featureToggles.awsDatasourcesNewFormStyling;
+
+const cleanupFeatureToggle = () => {
+  config.featureToggles.awsDatasourcesNewFormStyling = originalFormFeatureToggleValue;
+};
+
 ds.datasource.resources.getRegions = jest.fn().mockResolvedValue([
   { label: 'a1', value: 'a1' },
   { label: 'b1', value: 'b1' },
@@ -75,195 +83,221 @@ describe('VariableEditor', () => {
   beforeEach(() => {
     onChange.mockClear();
   });
-  describe('and a new variable is created', () => {
-    it('should trigger a query using the first query type in the array', async () => {
-      const props = defaultProps;
-      props.query = defaultQuery;
-      render(<VariableQueryEditor {...props} />);
+  function run() {
+    describe('and a new variable is created', () => {
+      it('should trigger a query using the first query type in the array', async () => {
+        const props = defaultProps;
+        props.query = defaultQuery;
+        render(<VariableQueryEditor {...props} />);
 
-      await waitFor(() => {
-        const querySelect = screen.queryByRole('combobox', { name: 'Query type' });
-        expect(querySelect).toBeInTheDocument();
-        expect(screen.queryByText('Regions')).toBeInTheDocument();
-        // Should not render any fields besides Query Type
-        const regionSelect = screen.queryByRole('combobox', { name: 'Region' });
-        expect(regionSelect).not.toBeInTheDocument();
+        await waitFor(() => {
+          const querySelect = screen.queryByRole('combobox', { name: 'Query type' });
+          expect(querySelect).toBeInTheDocument();
+          expect(screen.queryByText('Regions')).toBeInTheDocument();
+          // Should not render any fields besides Query Type
+          const regionSelect = screen.queryByRole('combobox', { name: 'Region' });
+          expect(regionSelect).not.toBeInTheDocument();
+        });
       });
     });
-  });
 
-  describe('and an existing variable is edited', () => {
-    it('should trigger new query using the saved query type', async () => {
-      const props = defaultProps;
-      props.query = {
-        ...defaultQuery,
-        queryType: VariableQueryType.Metrics,
-        namespace: 'z2',
-        region: 'a1',
-      };
-      render(<VariableQueryEditor {...props} />);
-
-      await waitFor(() => {
-        const querySelect = screen.queryByRole('combobox', { name: 'Query type' });
-        expect(querySelect).toBeInTheDocument();
-        expect(screen.queryByText('Metrics')).toBeInTheDocument();
-        const regionSelect = screen.queryByRole('combobox', { name: 'Region' });
-        expect(regionSelect).toBeInTheDocument();
-        expect(screen.queryByText('a1')).toBeInTheDocument();
-        const namespaceSelect = screen.queryByRole('combobox', { name: 'Namespace' });
-        expect(namespaceSelect).toBeInTheDocument();
-        expect(screen.queryByText('z2')).toBeInTheDocument();
-        // Should only render Query Type, Region, and Namespace selectors
-        const metricSelect = screen.queryByRole('combobox', { name: 'Metric' });
-        expect(metricSelect).not.toBeInTheDocument();
-      });
-    });
-    it('should parse dimensionFilters correctly', async () => {
-      const props = defaultProps;
-      props.query = {
-        ...defaultQuery,
-        queryType: VariableQueryType.DimensionValues,
-        namespace: 'z2',
-        region: 'a1',
-        metricName: 'i3',
-        dimensionKey: 's4',
-        dimensionFilters: { s4: 'foo' },
-      };
-      await act(async () => {
+    describe('and an existing variable is edited', () => {
+      it('should trigger new query using the saved query type', async () => {
+        const props = defaultProps;
+        props.query = {
+          ...defaultQuery,
+          queryType: VariableQueryType.Metrics,
+          namespace: 'z2',
+          region: 'a1',
+        };
         render(<VariableQueryEditor {...props} />);
-      });
-      const filterItem = screen.getByTestId('cloudwatch-dimensions-filter-item');
-      expect(filterItem).toBeInTheDocument();
-      expect(within(filterItem).getByText('s4')).toBeInTheDocument();
-      expect(within(filterItem).getByText('foo')).toBeInTheDocument();
 
-      // change filter key
-      const keySelect = screen.getByRole('combobox', { name: 'Dimensions filter key' });
-      // confirms getDimensionKeys was called with filter and that the element uses keysForDimensionFilter
-      await select(keySelect, 'v4', {
-        container: document.body,
-      });
-      expect(ds.datasource.resources.getDimensionKeys).toHaveBeenCalledWith({
-        namespace: 'z2',
-        region: 'a1',
-        metricName: 'i3',
-        dimensionFilters: undefined,
-      });
-      expect(onChange).toHaveBeenCalledWith({
-        ...defaultQuery,
-        queryType: VariableQueryType.DimensionValues,
-        namespace: 'z2',
-        region: 'a1',
-        metricName: 'i3',
-        dimensionKey: 's4',
-        dimensionFilters: { v4: undefined },
+        await waitFor(() => {
+          const querySelect = screen.queryByRole('combobox', { name: 'Query type' });
+          expect(querySelect).toBeInTheDocument();
+          expect(screen.queryByText('Metrics')).toBeInTheDocument();
+          const regionSelect = screen.queryByRole('combobox', { name: 'Region' });
+          expect(regionSelect).toBeInTheDocument();
+          expect(screen.queryByText('a1')).toBeInTheDocument();
+          const namespaceSelect = screen.queryByRole('combobox', { name: 'Namespace' });
+          expect(namespaceSelect).toBeInTheDocument();
+          expect(screen.queryByText('z2')).toBeInTheDocument();
+          // Should only render Query Type, Region, and Namespace selectors
+          const metricSelect = screen.queryByRole('combobox', { name: 'Metric' });
+          expect(metricSelect).not.toBeInTheDocument();
+        });
       });
+      it('should parse dimensionFilters correctly', async () => {
+        const props = defaultProps;
+        props.query = {
+          ...defaultQuery,
+          queryType: VariableQueryType.DimensionValues,
+          namespace: 'z2',
+          region: 'a1',
+          metricName: 'i3',
+          dimensionKey: 's4',
+          dimensionFilters: { s4: 'foo' },
+        };
+        await act(async () => {
+          render(<VariableQueryEditor {...props} />);
+        });
+        const filterItem = screen.getByTestId('cloudwatch-dimensions-filter-item');
+        expect(filterItem).toBeInTheDocument();
+        expect(within(filterItem).getByText('s4')).toBeInTheDocument();
+        expect(within(filterItem).getByText('foo')).toBeInTheDocument();
 
-      // set filter value
-      const valueSelect = screen.getByRole('combobox', { name: 'Dimensions filter value' });
-      await select(valueSelect, 'bar', {
-        container: document.body,
-      });
-      expect(onChange).toHaveBeenCalledWith({
-        ...defaultQuery,
-        queryType: VariableQueryType.DimensionValues,
-        namespace: 'z2',
-        region: 'a1',
-        metricName: 'i3',
-        dimensionKey: 's4',
-        dimensionFilters: { v4: 'bar' },
-      });
-    });
-    it('should parse multiFilters correctly', async () => {
-      const props = defaultProps;
-      props.query = {
-        ...defaultQuery,
-        queryType: VariableQueryType.EC2InstanceAttributes,
-        region: 'a1',
-        attributeName: 'Tags.blah',
-        ec2Filters: { s4: ['foo', 'bar'] },
-      };
-      render(<VariableQueryEditor {...props} />);
+        // change filter key
+        const keySelect = screen.getByRole('combobox', { name: 'Dimensions filter key' });
+        // confirms getDimensionKeys was called with filter and that the element uses keysForDimensionFilter
+        select(keySelect, 'v4', {
+          container: document.body,
+        });
+        expect(ds.datasource.resources.getDimensionKeys).toHaveBeenCalledWith(
+          {
+            namespace: 'z2',
+            region: 'a1',
+            metricName: 'i3',
+            dimensionFilters: undefined,
+          },
+          false
+        );
+        await waitFor(() => {
+          expect(onChange).toHaveBeenCalledWith({
+            ...defaultQuery,
+            queryType: VariableQueryType.DimensionValues,
+            namespace: 'z2',
+            region: 'a1',
+            metricName: 'i3',
+            dimensionKey: 's4',
+            dimensionFilters: { v4: undefined },
+          });
+        });
 
-      await waitFor(() => {
-        expect(screen.getByDisplayValue('Tags.blah')).toBeInTheDocument();
+        // set filter value
+        const valueSelect = screen.getByRole('combobox', { name: 'Dimensions filter value' });
+        await select(valueSelect, 'bar', {
+          container: document.body,
+        });
+        expect(onChange).toHaveBeenCalledWith({
+          ...defaultQuery,
+          queryType: VariableQueryType.DimensionValues,
+          namespace: 'z2',
+          region: 'a1',
+          metricName: 'i3',
+          dimensionKey: 's4',
+          dimensionFilters: { v4: 'bar' },
+        });
       });
+      it('should parse multiFilters correctly', async () => {
+        const props = defaultProps;
+        props.query = {
+          ...defaultQuery,
+          queryType: VariableQueryType.EC2InstanceAttributes,
+          region: 'a1',
+          attributeName: 'Tags.blah',
+          ec2Filters: { s4: ['foo', 'bar'] },
+        };
+        render(<VariableQueryEditor {...props} />);
+
+        await waitFor(() => {
+          expect(screen.getByDisplayValue('Tags.blah')).toBeInTheDocument();
+        });
 
-      const filterItem = screen.getByTestId('cloudwatch-multifilter-item');
-      expect(filterItem).toBeInTheDocument();
-      expect(within(filterItem).getByDisplayValue('foo, bar')).toBeInTheDocument();
+        const filterItem = screen.getByTestId('cloudwatch-multifilter-item');
+        expect(filterItem).toBeInTheDocument();
+        expect(within(filterItem).getByDisplayValue('foo, bar')).toBeInTheDocument();
 
-      // set filter value
-      const valueElement = screen.getByTestId('cloudwatch-multifilter-item-value');
-      expect(valueElement).toBeInTheDocument();
-      await userEvent.type(valueElement!, ',baz');
-      fireEvent.blur(valueElement!);
+        // set filter value
+        const valueElement = screen.getByTestId('cloudwatch-multifilter-item-value');
+        expect(valueElement).toBeInTheDocument();
+        await userEvent.type(valueElement!, ',baz');
+        fireEvent.blur(valueElement!);
 
-      expect(screen.getByDisplayValue('foo, bar, baz')).toBeInTheDocument();
-      expect(onChange).toHaveBeenCalledWith({
-        ...defaultQuery,
-        queryType: VariableQueryType.EC2InstanceAttributes,
-        region: 'a1',
-        attributeName: 'Tags.blah',
-        ec2Filters: { s4: ['foo', 'bar', 'baz'] },
+        expect(screen.getByDisplayValue('foo, bar, baz')).toBeInTheDocument();
+        expect(onChange).toHaveBeenCalledWith({
+          ...defaultQuery,
+          queryType: VariableQueryType.EC2InstanceAttributes,
+          region: 'a1',
+          attributeName: 'Tags.blah',
+          ec2Filters: { s4: ['foo', 'bar', 'baz'] },
+        });
       });
     });
-  });
-  describe('and a different region is selected', () => {
-    it('should clear invalid fields', async () => {
-      const props = defaultProps;
-      props.query = {
-        ...defaultQuery,
-        queryType: VariableQueryType.DimensionValues,
-        namespace: 'z2',
-        region: 'a1',
-        metricName: 'i3',
-        dimensionKey: 's4',
-        dimensionFilters: { s4: 'foo' },
-      };
-      render(<VariableQueryEditor {...props} />);
+    describe('and a different region is selected', () => {
+      it('should clear invalid fields', async () => {
+        const props = defaultProps;
+        props.query = {
+          ...defaultQuery,
+          queryType: VariableQueryType.DimensionValues,
+          namespace: 'z2',
+          region: 'a1',
+          metricName: 'i3',
+          dimensionKey: 's4',
+          dimensionFilters: { s4: 'foo' },
+        };
+        render(<VariableQueryEditor {...props} />);
 
-      const querySelect = screen.queryByLabelText('Query type');
-      expect(querySelect).toBeInTheDocument();
-      expect(screen.queryByText('Dimension Values')).toBeInTheDocument();
-      const regionSelect = screen.getByRole('combobox', { name: 'Region' });
-      await waitFor(() =>
-        select(regionSelect, 'b1', {
-          container: document.body,
-        })
-      );
+        const querySelect = screen.queryByLabelText('Query type');
+        expect(querySelect).toBeInTheDocument();
+        expect(screen.queryByText('Dimension Values')).toBeInTheDocument();
+        const regionSelect = screen.getByRole('combobox', { name: 'Region' });
+        await waitFor(() =>
+          select(regionSelect, 'b1', {
+            container: document.body,
+          })
+        );
 
-      expect(ds.datasource.resources.getMetrics).toHaveBeenCalledWith({ namespace: 'z2', region: 'b1' });
-      expect(ds.datasource.resources.getDimensionKeys).toHaveBeenCalledWith({ namespace: 'z2', region: 'b1' });
-      expect(props.onChange).toHaveBeenCalledWith({
-        ...defaultQuery,
-        refId: 'CloudWatchVariableQueryEditor-VariableQuery',
-        queryType: VariableQueryType.DimensionValues,
-        namespace: 'z2',
-        region: 'b1',
-        // metricName i3 exists in the new region and should not be removed
-        metricName: 'i3',
-        // dimensionKey s4 and valueDimension do not exist in the new region and should be removed
-        dimensionKey: '',
-        dimensionFilters: {},
+        expect(ds.datasource.resources.getMetrics).toHaveBeenCalledWith({ namespace: 'z2', region: 'b1' });
+        expect(ds.datasource.resources.getDimensionKeys).toHaveBeenCalledWith({ namespace: 'z2', region: 'b1' });
+        expect(props.onChange).toHaveBeenCalledWith({
+          ...defaultQuery,
+          refId: 'CloudWatchVariableQueryEditor-VariableQuery',
+          queryType: VariableQueryType.DimensionValues,
+          namespace: 'z2',
+          region: 'b1',
+          // metricName i3 exists in the new region and should not be removed
+          metricName: 'i3',
+          // dimensionKey s4 and valueDimension do not exist in the new region and should be removed
+          dimensionKey: '',
+          dimensionFilters: {},
+        });
       });
     });
-  });
-  describe('LogGroups queryType is selected', () => {
-    it('should only render region and prefix', async () => {
-      const props = defaultProps;
-      props.query = {
-        ...defaultQuery,
-        queryType: VariableQueryType.LogGroups,
-      };
-      render(<VariableQueryEditor {...props} />);
+    describe('LogGroups queryType is selected', () => {
+      it('should only render region and prefix', async () => {
+        const props = defaultProps;
+        props.query = {
+          ...defaultQuery,
+          queryType: VariableQueryType.LogGroups,
+        };
+        render(<VariableQueryEditor {...props} />);
 
-      await waitFor(() => {
-        screen.getByLabelText('Log group prefix');
-        screen.getByLabelText('Region');
+        await waitFor(() => {
+          screen.getByLabelText('Log group prefix');
+          screen.getByLabelText('Region');
+        });
+
+        expect(screen.queryByLabelText('Namespace')).not.toBeInTheDocument();
       });
+    });
+  }
 
-      expect(screen.queryByLabelText('Namespace')).not.toBeInTheDocument();
+  describe('variable editor with awsDatasourcesNewFormStyling feature toggle enabled', () => {
+    beforeAll(() => {
+      config.featureToggles.awsDatasourcesNewFormStyling = false;
+    });
+    afterAll(() => {
+      cleanupFeatureToggle();
+    });
+    run();
+    describe('variable editor with awsDatasourcesNewFormStyling feature toggle enabled', () => {
+      beforeAll(() => {
+        config.featureToggles.awsDatasourcesNewFormStyling = true;
+      });
+      afterAll(() => {
+        cleanupFeatureToggle();
+      });
+      run();
     });
   });
 });
diff --git a/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryEditor.tsx
index b337ef7ca1b43..7d4eb75a70aad 100644
--- a/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryEditor.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryEditor.tsx
@@ -1,11 +1,19 @@
 import React from 'react';
 
 import { QueryEditorProps, SelectableValue } from '@grafana/data';
+import { EditorField } from '@grafana/experimental';
 import { config } from '@grafana/runtime';
 import { InlineField } from '@grafana/ui';
 
 import { CloudWatchDatasource } from '../../datasource';
-import { useAccountOptions, useDimensionKeys, useMetrics, useNamespaces, useRegions } from '../../hooks';
+import {
+  useAccountOptions,
+  useDimensionKeys,
+  useMetrics,
+  useNamespaces,
+  useRegions,
+  useEnsureVariableHasSingleSelection,
+} from '../../hooks';
 import { migrateVariableQuery } from '../../migrations/variableQueryMigrations';
 import { CloudWatchJsonData, CloudWatchQuery, VariableQuery, VariableQueryType } from '../../types';
 import { ALL_ACCOUNTS_OPTION } from '../shared/Account';
@@ -36,14 +44,15 @@ const queryTypes: Array<{ value: string; label: string }> = [
 export const VariableQueryEditor = ({ query, datasource, onChange }: Props) => {
   const parsedQuery = migrateVariableQuery(query);
 
-  const { region, namespace, metricName, dimensionKey, dimensionFilters } = parsedQuery;
+  const { region, namespace, metricName, dimensionKey } = parsedQuery;
   const [regions, regionIsLoading] = useRegions(datasource);
   const namespaces = useNamespaces(datasource);
   const metrics = useMetrics(datasource, { region, namespace });
   const dimensionKeys = useDimensionKeys(datasource, { region, namespace, metricName });
-  const keysForDimensionFilter = useDimensionKeys(datasource, { region, namespace, metricName, dimensionFilters });
   const accountState = useAccountOptions(datasource.resources, query.region);
+  const dimensionKeyError = useEnsureVariableHasSingleSelection(datasource, dimensionKey);
 
+  const newFormStylingEnabled = config.featureToggles.awsDatasourcesNewFormStyling;
   const onRegionChange = async (region: string) => {
     const validatedQuery = await sanitizeQuery({
       ...parsedQuery,
@@ -113,7 +122,7 @@ export const VariableQueryEditor = ({ query, datasource, onChange }: Props) => {
     VariableQueryType.DimensionValues,
   ].includes(parsedQuery.queryType);
   return (
-    <>
+    <div className={newFormStylingEnabled ? 'width-15' : ''}>
       <VariableQueryField
         value={parsedQuery.queryType}
         options={queryTypes}
@@ -122,6 +131,7 @@ export const VariableQueryEditor = ({ query, datasource, onChange }: Props) => {
         }
         label="Query type"
         inputId={`variable-query-type-${query.refId}`}
+        newFormStylingEnabled={newFormStylingEnabled}
       />
       {hasRegionField && (
         <VariableQueryField
@@ -131,6 +141,7 @@ export const VariableQueryEditor = ({ query, datasource, onChange }: Props) => {
           label="Region"
           isLoading={regionIsLoading}
           inputId={`variable-query-region-${query.refId}`}
+          newFormStylingEnabled={newFormStylingEnabled}
         />
       )}
       {hasAccountIDField &&
@@ -143,6 +154,7 @@ export const VariableQueryEditor = ({ query, datasource, onChange }: Props) => {
             onChange={(accountId?: string) => onQueryChange({ ...parsedQuery, accountId })}
             options={[ALL_ACCOUNTS_OPTION, ...accountState?.value]}
             allowCustomValue={false}
+            newFormStylingEnabled={newFormStylingEnabled}
           />
         )}
       {hasNamespaceField && (
@@ -153,6 +165,7 @@ export const VariableQueryEditor = ({ query, datasource, onChange }: Props) => {
           label="Namespace"
           inputId={`variable-query-namespace-${query.refId}`}
           allowCustomValue
+          newFormStylingEnabled={newFormStylingEnabled}
         />
       )}
       {parsedQuery.queryType === VariableQueryType.DimensionValues && (
@@ -164,6 +177,7 @@ export const VariableQueryEditor = ({ query, datasource, onChange }: Props) => {
             label="Metric"
             inputId={`variable-query-metric-${query.refId}`}
             allowCustomValue
+            newFormStylingEnabled={newFormStylingEnabled}
           />
           <VariableQueryField
             value={dimensionKey || null}
@@ -172,18 +186,37 @@ export const VariableQueryEditor = ({ query, datasource, onChange }: Props) => {
             label="Dimension key"
             inputId={`variable-query-dimension-key-${query.refId}`}
             allowCustomValue
+            newFormStylingEnabled={newFormStylingEnabled}
+            error={dimensionKeyError}
           />
-          <InlineField label="Dimensions" labelWidth={20} shrink tooltip="Dimensions to filter the returned values on">
-            <Dimensions
-              metricStat={{ ...parsedQuery, dimensions: parsedQuery.dimensionFilters }}
-              onChange={(dimensions) => {
-                onChange({ ...parsedQuery, dimensionFilters: dimensions });
-              }}
-              dimensionKeys={keysForDimensionFilter}
-              disableExpressions={true}
-              datasource={datasource}
-            />
-          </InlineField>
+          {newFormStylingEnabled ? (
+            <EditorField label="Dimensions" className="width-30" tooltip="Dimensions to filter the returned values on">
+              <Dimensions
+                metricStat={{ ...parsedQuery, dimensions: parsedQuery.dimensionFilters }}
+                onChange={(dimensions) => {
+                  onChange({ ...parsedQuery, dimensionFilters: dimensions });
+                }}
+                disableExpressions={true}
+                datasource={datasource}
+              />
+            </EditorField>
+          ) : (
+            <InlineField
+              label="Dimensions"
+              labelWidth={20}
+              shrink
+              tooltip="Dimensions to filter the returned values on"
+            >
+              <Dimensions
+                metricStat={{ ...parsedQuery, dimensions: parsedQuery.dimensionFilters }}
+                onChange={(dimensions) => {
+                  onChange({ ...parsedQuery, dimensionFilters: dimensions });
+                }}
+                disableExpressions={true}
+                datasource={datasource}
+              />
+            </InlineField>
+          )}
         </>
       )}
       {parsedQuery.queryType === VariableQueryType.EBSVolumeIDs && (
@@ -192,6 +225,7 @@ export const VariableQueryEditor = ({ query, datasource, onChange }: Props) => {
           placeholder="i-XXXXXXXXXXXXXXXXX"
           onBlur={(value: string) => onQueryChange({ ...parsedQuery, instanceID: value })}
           label="Instance ID"
+          newFormStylingEnabled={newFormStylingEnabled}
         />
       )}
       {parsedQuery.queryType === VariableQueryType.EC2InstanceAttributes && (
@@ -201,6 +235,7 @@ export const VariableQueryEditor = ({ query, datasource, onChange }: Props) => {
             onBlur={(value: string) => onQueryChange({ ...parsedQuery, attributeName: value })}
             label="Attribute name"
             interactive={true}
+            newFormStylingEnabled={newFormStylingEnabled}
             tooltip={
               <>
                 {'Attribute or tag to query on. Tags should be formatted "Tags.<name>". '}
@@ -214,31 +249,60 @@ export const VariableQueryEditor = ({ query, datasource, onChange }: Props) => {
               </>
             }
           />
-          <InlineField
-            label="Filters"
-            labelWidth={20}
-            shrink
-            tooltip={
-              <>
-                <a
-                  href="https://grafana.com/docs/grafana/latest/datasources/aws-cloudwatch/template-queries-cloudwatch/#selecting-attributes"
-                  target="_blank"
-                  rel="noreferrer"
-                >
-                  Pre-defined ec2:DescribeInstances filters/tags
-                </a>
-                {' and the values to filter on. Tags should be formatted tag:<name>.'}
-              </>
-            }
-          >
-            <MultiFilter
-              filters={parsedQuery.ec2Filters}
-              onChange={(filters) => {
-                onChange({ ...parsedQuery, ec2Filters: filters });
-              }}
-              keyPlaceholder="filter/tag"
-            />
-          </InlineField>
+          {newFormStylingEnabled ? (
+            <EditorField
+              label="Filters"
+              tooltipInteractive
+              tooltip={
+                <>
+                  <a
+                    href="https://grafana.com/docs/grafana/latest/datasources/aws-cloudwatch/template-queries-cloudwatch/#selecting-attributes"
+                    target="_blank"
+                    rel="noreferrer"
+                  >
+                    Pre-defined ec2:DescribeInstances filters/tags
+                  </a>
+                  {' and the values to filter on. Tags should be formatted tag:<name>.'}
+                </>
+              }
+            >
+              <MultiFilter
+                filters={parsedQuery.ec2Filters ?? {}}
+                onChange={(filters) => {
+                  onChange({ ...parsedQuery, ec2Filters: filters });
+                }}
+                keyPlaceholder="filter/tag"
+                datasource={datasource}
+              />
+            </EditorField>
+          ) : (
+            <InlineField
+              label="Filters"
+              labelWidth={20}
+              shrink
+              tooltip={
+                <>
+                  <a
+                    href="https://grafana.com/docs/grafana/latest/datasources/aws-cloudwatch/template-queries-cloudwatch/#selecting-attributes"
+                    target="_blank"
+                    rel="noreferrer"
+                  >
+                    Pre-defined ec2:DescribeInstances filters/tags
+                  </a>
+                  {' and the values to filter on. Tags should be formatted tag:<name>.'}
+                </>
+              }
+            >
+              <MultiFilter
+                filters={parsedQuery.ec2Filters ?? {}}
+                onChange={(filters) => {
+                  onChange({ ...parsedQuery, ec2Filters: filters });
+                }}
+                keyPlaceholder="filter/tag"
+                datasource={datasource}
+              />
+            </InlineField>
+          )}
         </>
       )}
       {parsedQuery.queryType === VariableQueryType.ResourceArns && (
@@ -247,16 +311,31 @@ export const VariableQueryEditor = ({ query, datasource, onChange }: Props) => {
             value={parsedQuery.resourceType}
             onBlur={(value: string) => onQueryChange({ ...parsedQuery, resourceType: value })}
             label="Resource type"
+            newFormStylingEnabled={newFormStylingEnabled}
           />
-          <InlineField label="Tags" shrink labelWidth={20} tooltip="Tags to filter the returned values on.">
-            <MultiFilter
-              filters={parsedQuery.tags}
-              onChange={(filters) => {
-                onChange({ ...parsedQuery, tags: filters });
-              }}
-              keyPlaceholder="tag"
-            />
-          </InlineField>
+          {newFormStylingEnabled ? (
+            <EditorField label="Tags" tooltip="Tags to filter the returned values on.">
+              <MultiFilter
+                filters={parsedQuery.tags}
+                onChange={(filters) => {
+                  onChange({ ...parsedQuery, tags: filters });
+                }}
+                keyPlaceholder="tag"
+                datasource={datasource}
+              />
+            </EditorField>
+          ) : (
+            <InlineField label="Tags" shrink labelWidth={20} tooltip="Tags to filter the returned values on.">
+              <MultiFilter
+                filters={parsedQuery.tags}
+                onChange={(filters) => {
+                  onChange({ ...parsedQuery, tags: filters });
+                }}
+                keyPlaceholder="tag"
+                datasource={datasource}
+              />
+            </InlineField>
+          )}
         </>
       )}
       {parsedQuery.queryType === VariableQueryType.LogGroups && (
@@ -264,8 +343,9 @@ export const VariableQueryEditor = ({ query, datasource, onChange }: Props) => {
           value={query.logGroupPrefix ?? ''}
           onBlur={(value: string) => onQueryChange({ ...parsedQuery, logGroupPrefix: value })}
           label="Log group prefix"
+          newFormStylingEnabled={newFormStylingEnabled}
         />
       )}
-    </>
+    </div>
   );
 };
diff --git a/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryField.tsx b/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryField.tsx
index 4c7598e5a30e2..6ab887cefbacd 100644
--- a/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryField.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryField.tsx
@@ -1,9 +1,12 @@
+import { css } from '@emotion/css';
 import React from 'react';
 
-import { SelectableValue } from '@grafana/data';
-import { InlineField, Select } from '@grafana/ui';
+import { GrafanaTheme2, SelectableValue } from '@grafana/data';
+import { EditorField } from '@grafana/experimental';
+import { Alert, InlineField, Select, useStyles2 } from '@grafana/ui';
 
 import { VariableQueryType } from '../../types';
+import { removeMarginBottom } from '../styles';
 
 const LABEL_WIDTH = 20;
 
@@ -15,6 +18,8 @@ interface VariableQueryFieldProps<T> {
   inputId?: string;
   allowCustomValue?: boolean;
   isLoading?: boolean;
+  newFormStylingEnabled?: boolean;
+  error?: string;
 }
 
 export const VariableQueryField = <T extends string | VariableQueryType>({
@@ -25,19 +30,45 @@ export const VariableQueryField = <T extends string | VariableQueryType>({
   allowCustomValue = false,
   isLoading = false,
   inputId = label,
+  newFormStylingEnabled,
+  error,
 }: VariableQueryFieldProps<T>) => {
-  return (
-    <InlineField label={label} labelWidth={LABEL_WIDTH} htmlFor={inputId}>
-      <Select
-        aria-label={label}
-        width={25}
-        allowCustomValue={allowCustomValue}
-        value={value}
-        onChange={({ value }) => onChange(value!)}
-        options={options}
-        isLoading={isLoading}
-        inputId={inputId}
-      />
-    </InlineField>
+  const styles = useStyles2(getStyles);
+  return newFormStylingEnabled ? (
+    <>
+      <EditorField label={label} htmlFor={inputId} className={removeMarginBottom}>
+        <Select
+          aria-label={label}
+          allowCustomValue={allowCustomValue}
+          value={value}
+          onChange={({ value }) => onChange(value!)}
+          options={options}
+          isLoading={isLoading}
+          inputId={inputId}
+        />
+      </EditorField>
+      {error && <Alert title={error} severity="error" topSpacing={1} />}
+    </>
+  ) : (
+    <>
+      <InlineField label={label} labelWidth={LABEL_WIDTH} htmlFor={inputId}>
+        <Select
+          aria-label={label}
+          width={25}
+          allowCustomValue={allowCustomValue}
+          value={value}
+          onChange={({ value }) => onChange(value!)}
+          options={options}
+          isLoading={isLoading}
+          inputId={inputId}
+        />
+      </InlineField>
+      {error && <Alert className={styles.inlineFieldAlert} title={error} severity="error" topSpacing={1} />}
+    </>
   );
 };
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  // width set to InlineField labelWidth + Select width + 0.5 for margin on the label
+  inlineFieldAlert: css({ maxWidth: theme.spacing(LABEL_WIDTH + 25 + 0.5) }),
+});
diff --git a/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableTextField.tsx b/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableTextField.tsx
index 7e23666f82dc0..d01ebb82a6b76 100644
--- a/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableTextField.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableTextField.tsx
@@ -1,7 +1,10 @@
 import React, { useState } from 'react';
 
+import { EditorField } from '@grafana/experimental';
 import { InlineField, Input, PopoverContent } from '@grafana/ui';
 
+import { removeMarginBottom } from '../styles';
+
 const LABEL_WIDTH = 20;
 
 interface Props {
@@ -11,11 +14,30 @@ interface Props {
   placeholder?: string;
   tooltip?: PopoverContent;
   interactive?: boolean;
+  newFormStylingEnabled?: boolean;
 }
 
-export const VariableTextField = ({ interactive, label, onBlur, placeholder, value, tooltip }: Props) => {
+export const VariableTextField = ({
+  interactive,
+  label,
+  onBlur,
+  placeholder,
+  value,
+  tooltip,
+  newFormStylingEnabled,
+}: Props) => {
   const [localValue, setLocalValue] = useState(value);
-  return (
+  return newFormStylingEnabled ? (
+    <EditorField label={label} tooltip={tooltip} tooltipInteractive={interactive} className={removeMarginBottom}>
+      <Input
+        aria-label={label}
+        placeholder={placeholder}
+        value={localValue}
+        onChange={(e) => setLocalValue(e.currentTarget.value)}
+        onBlur={() => onBlur(localValue)}
+      />
+    </EditorField>
+  ) : (
     <InlineField interactive={interactive} label={label} labelWidth={LABEL_WIDTH} tooltip={tooltip} grow>
       <Input
         aria-label={label}
diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/Dimensions.test.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/Dimensions.test.tsx
index d0b545a63c220..846d7209a5802 100644
--- a/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/Dimensions.test.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/Dimensions.test.tsx
@@ -43,8 +43,8 @@ describe('Dimensions', () => {
         InstanceId: '*',
         InstanceGroup: 'Group1',
       };
-      render(<Dimensions {...props} metricStat={props.query} dimensionKeys={[]} />);
-      const filterItems = screen.getAllByTestId('cloudwatch-dimensions-filter-item');
+      render(<Dimensions {...props} metricStat={props.query} />);
+      const filterItems = await screen.findAllByTestId('cloudwatch-dimensions-filter-item');
       expect(filterItems.length).toBe(2);
 
       expect(within(filterItems[0]).getByText('InstanceId')).toBeInTheDocument();
@@ -61,8 +61,8 @@ describe('Dimensions', () => {
         InstanceId: ['*'],
         InstanceGroup: ['Group1'],
       };
-      render(<Dimensions {...props} metricStat={props.query} dimensionKeys={[]} />);
-      const filterItems = screen.getAllByTestId('cloudwatch-dimensions-filter-item');
+      render(<Dimensions {...props} metricStat={props.query} />);
+      const filterItems = await screen.findAllByTestId('cloudwatch-dimensions-filter-item');
       expect(filterItems.length).toBe(2);
 
       expect(within(filterItems[0]).getByText('InstanceId')).toBeInTheDocument();
@@ -77,7 +77,7 @@ describe('Dimensions', () => {
     it('it should add the new item but not call onChange', async () => {
       props.query.dimensions = {};
       const onChange = jest.fn();
-      render(<Dimensions {...props} metricStat={props.query} onChange={onChange} dimensionKeys={[]} />);
+      render(<Dimensions {...props} metricStat={props.query} onChange={onChange} />);
 
       await userEvent.click(screen.getByLabelText('Add'));
       expect(screen.getByTestId('cloudwatch-dimensions-filter-item')).toBeInTheDocument();
@@ -89,9 +89,7 @@ describe('Dimensions', () => {
     it('it should add the new item but not call onChange', async () => {
       props.query.dimensions = {};
       const onChange = jest.fn();
-      const { container } = render(
-        <Dimensions {...props} metricStat={props.query} onChange={onChange} dimensionKeys={[]} />
-      );
+      const { container } = render(<Dimensions {...props} metricStat={props.query} onChange={onChange} />);
 
       await userEvent.click(screen.getByLabelText('Add'));
       const filterItemElement = screen.getByTestId('cloudwatch-dimensions-filter-item');
@@ -109,9 +107,7 @@ describe('Dimensions', () => {
     it('it should add the new item and trigger onChange', async () => {
       props.query.dimensions = {};
       const onChange = jest.fn();
-      const { container } = render(
-        <Dimensions {...props} metricStat={props.query} onChange={onChange} dimensionKeys={[]} />
-      );
+      const { container } = render(<Dimensions {...props} metricStat={props.query} onChange={onChange} />);
 
       const label = await screen.findByLabelText('Add');
       await userEvent.click(label);
@@ -128,11 +124,8 @@ describe('Dimensions', () => {
       expect(valueElement).toBeInTheDocument();
       await userEvent.type(valueElement!, 'my-value');
       fireEvent.keyDown(valueElement!, { keyCode: 13 });
-      expect(onChange).not.toHaveBeenCalledWith({
-        ...props.query,
-        dimensions: {
-          'my-key': 'my-value',
-        },
+      expect(onChange).toHaveBeenCalledWith({
+        'my-key': 'my-value',
       });
     });
   });
diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/Dimensions.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/Dimensions.tsx
index 9ca9b1cbc2728..3909df54d8444 100644
--- a/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/Dimensions.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/Dimensions.tsx
@@ -1,7 +1,6 @@
 import { isEqual } from 'lodash';
 import React, { useMemo, useState } from 'react';
 
-import { SelectableValue } from '@grafana/data';
 import { EditorList } from '@grafana/experimental';
 
 import { CloudWatchDatasource } from '../../../datasource';
@@ -13,7 +12,6 @@ export interface Props {
   metricStat: MetricStat;
   onChange: (dimensions: DimensionsType) => void;
   datasource: CloudWatchDatasource;
-  dimensionKeys: Array<SelectableValue<string>>;
   disableExpressions: boolean;
 }
 
@@ -62,7 +60,7 @@ const filterConditionsToDimensions = (filters: DimensionFilterCondition[]) => {
   }, {});
 };
 
-export const Dimensions = ({ metricStat, datasource, dimensionKeys, disableExpressions, onChange }: Props) => {
+export const Dimensions = ({ metricStat, datasource, disableExpressions, onChange }: Props) => {
   const dimensionFilters = useMemo(() => dimensionsToFilterConditions(metricStat.dimensions), [metricStat.dimensions]);
   const [items, setItems] = useState<DimensionFilterCondition[]>(dimensionFilters);
   const onDimensionsChange = (newItems: Array<Partial<DimensionFilterCondition>>) => {
@@ -80,17 +78,12 @@ export const Dimensions = ({ metricStat, datasource, dimensionKeys, disableExpre
     <EditorList
       items={items}
       onChange={onDimensionsChange}
-      renderItem={makeRenderFilter(datasource, metricStat, dimensionKeys, disableExpressions)}
+      renderItem={makeRenderFilter(datasource, metricStat, disableExpressions)}
     />
   );
 };
 
-function makeRenderFilter(
-  datasource: CloudWatchDatasource,
-  metricStat: MetricStat,
-  dimensionKeys: Array<SelectableValue<string>>,
-  disableExpressions: boolean
-) {
+function makeRenderFilter(datasource: CloudWatchDatasource, metricStat: MetricStat, disableExpressions: boolean) {
   function renderFilter(
     item: DimensionFilterCondition,
     onChange: (item: DimensionFilterCondition) => void,
@@ -103,7 +96,6 @@ function makeRenderFilter(
         datasource={datasource}
         metricStat={metricStat}
         disableExpressions={disableExpressions}
-        dimensionKeys={dimensionKeys}
         onDelete={onDelete}
       />
     );
diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/FilterItem.test.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/FilterItem.test.tsx
new file mode 100644
index 0000000000000..1ab3a16677413
--- /dev/null
+++ b/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/FilterItem.test.tsx
@@ -0,0 +1,56 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { setupMockedDataSource } from '../../../__mocks__/CloudWatchDataSource';
+import { CloudWatchMetricsQuery } from '../../../types';
+
+import { FilterItem } from './FilterItem';
+
+const ds = setupMockedDataSource({
+  variables: [],
+});
+
+const q: CloudWatchMetricsQuery = {
+  id: '',
+  region: 'us-east-2',
+  namespace: '',
+  period: '',
+  alias: '',
+  metricName: '',
+  dimensions: { foo: 'bar', abc: 'xyz' },
+  matchExact: true,
+  statistic: '',
+  expression: '',
+  refId: '',
+};
+
+describe('Dimensions', () => {
+  it('should call getDimensionKeys without the current key', async () => {
+    const getDimensionKeys = jest.fn().mockResolvedValue([]);
+    ds.datasource.resources.getDimensionKeys = getDimensionKeys;
+    const currFilter = { key: 'foo', value: 'bar' };
+
+    render(
+      <FilterItem
+        metricStat={q}
+        datasource={ds.datasource}
+        filter={currFilter}
+        disableExpressions={true}
+        onChange={jest.fn()}
+        onDelete={jest.fn()}
+      />
+    );
+    await userEvent.click(screen.getByLabelText('Dimensions filter key'));
+    expect(getDimensionKeys).toHaveBeenCalledWith(
+      {
+        namespace: q.namespace,
+        region: q.region,
+        metricName: q.metricName,
+        accountId: q.accountId,
+        dimensionFilters: { abc: ['xyz'] },
+      },
+      false
+    );
+  });
+});
diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/FilterItem.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/FilterItem.tsx
index e05e89ca115d2..0610240aef858 100644
--- a/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/FilterItem.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/FilterItem.tsx
@@ -4,9 +4,10 @@ import { useAsyncFn } from 'react-use';
 
 import { GrafanaTheme2, SelectableValue, toOption } from '@grafana/data';
 import { AccessoryButton, InputGroup } from '@grafana/experimental';
-import { Select, stylesFactory, useTheme2 } from '@grafana/ui';
+import { Alert, Select, useStyles2 } from '@grafana/ui';
 
 import { CloudWatchDatasource } from '../../../datasource';
+import { useDimensionKeys, useEnsureVariableHasSingleSelection } from '../../../hooks';
 import { Dimensions, MetricStat } from '../../../types';
 import { appendTemplateVariables } from '../../../utils/utils';
 
@@ -16,7 +17,6 @@ export interface Props {
   metricStat: MetricStat;
   datasource: CloudWatchDatasource;
   filter: DimensionFilterCondition;
-  dimensionKeys: Array<SelectableValue<string>>;
   disableExpressions: boolean;
   onChange: (value: DimensionFilterCondition) => void;
   onDelete: () => void;
@@ -32,19 +32,17 @@ const excludeCurrentKey = (dimensions: Dimensions, currentKey: string | undefine
     return acc;
   }, {});
 
-export const FilterItem = ({
-  filter,
-  metricStat: { region, namespace, metricName, dimensions, accountId },
-  datasource,
-  dimensionKeys,
-  disableExpressions,
-  onChange,
-  onDelete,
-}: Props) => {
+export const FilterItem = ({ filter, metricStat, datasource, disableExpressions, onChange, onDelete }: Props) => {
+  const { region, namespace, metricName, dimensions, accountId } = metricStat;
+  const error = useEnsureVariableHasSingleSelection(datasource, filter.key);
   const dimensionsExcludingCurrentKey = useMemo(
     () => excludeCurrentKey(dimensions ?? {}, filter.key),
     [dimensions, filter]
   );
+  const dimensionKeys = useDimensionKeys(datasource, {
+    ...metricStat,
+    dimensionFilters: dimensionsExcludingCurrentKey,
+  });
 
   const loadDimensionValues = async () => {
     if (!filter.key) {
@@ -76,11 +74,10 @@ export const FilterItem = ({
     metricName,
     accountId,
   ]);
-  const theme = useTheme2();
-  const styles = getOperatorStyles(theme);
+  const styles = useStyles2(getOperatorStyles);
 
   return (
-    <div data-testid="cloudwatch-dimensions-filter-item">
+    <div className={styles.container} data-testid="cloudwatch-dimensions-filter-item">
       <InputGroup>
         <Select
           aria-label="Dimensions filter key"
@@ -115,13 +112,16 @@ export const FilterItem = ({
         />
         <AccessoryButton aria-label="remove" icon="times" variant="secondary" onClick={onDelete} type="button" />
       </InputGroup>
+      {error && <Alert className={styles.alert} title={error} severity="error" topSpacing={1} />}
     </div>
   );
 };
 
-const getOperatorStyles = stylesFactory((theme: GrafanaTheme2) => ({
+const getOperatorStyles = (theme: GrafanaTheme2) => ({
   root: css({
     padding: theme.spacing(0, 1),
     alignSelf: 'center',
   }),
-}));
+  container: css({ display: 'inline-block' }),
+  alert: css({ minWidth: '100%', width: 'min-content' }),
+});
diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LegacyLogGroupSelector.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LegacyLogGroupSelector.tsx
index 3b3048c0125bd..8204ef25ca182 100644
--- a/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LegacyLogGroupSelector.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LegacyLogGroupSelector.tsx
@@ -1,12 +1,10 @@
 import { debounce, unionBy } from 'lodash';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
-import { SelectableValue, toOption } from '@grafana/data';
+import { AppEvents, SelectableValue, toOption } from '@grafana/data';
+import { getAppEvents } from '@grafana/runtime';
 import { MultiSelect } from '@grafana/ui';
 import { InputActionMeta } from '@grafana/ui/src/components/Select/types';
-import { notifyApp } from 'app/core/actions';
-import { createErrorNotification } from 'app/core/copy/appNotification';
-import { dispatch } from 'app/store/store';
 
 import { CloudWatchDatasource } from '../../../datasource';
 import { appendTemplateVariables } from '../../../utils/utils';
@@ -51,7 +49,10 @@ export const LogGroupSelector: React.FC<LogGroupSelectorProps> = ({
         const logGroups = await datasource.resources.legacyDescribeLogGroups(region, logGroupNamePrefix);
         return logGroups;
       } catch (err) {
-        dispatch(notifyApp(createErrorNotification(typeof err === 'string' ? err : JSON.stringify(err))));
+        getAppEvents().publish({
+          type: AppEvents.alertError.name,
+          payload: [typeof err === 'string' ? err : JSON.stringify(err)],
+        });
         return [];
       }
     },
@@ -69,7 +70,10 @@ export const LogGroupSelector: React.FC<LogGroupSelectorProps> = ({
     const logGroupNamePattern = /^[\.\-_/#A-Za-z0-9]+$/;
     if (!logGroupNamePattern.test(searchTerm)) {
       if (searchTerm !== '') {
-        dispatch(notifyApp(createErrorNotification('Invalid Log Group name: ' + searchTerm)));
+        getAppEvents().publish({
+          type: AppEvents.alertError.name,
+          payload: ['Invalid Log Group name: ' + searchTerm],
+        });
       }
       return;
     }
diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsField.test.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsField.test.tsx
index 9425f9b0d92b4..b3cf4e2a489fa 100644
--- a/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsField.test.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsField.test.tsx
@@ -5,7 +5,11 @@ import React from 'react';
 
 import { config } from '@grafana/runtime';
 
-import { logGroupNamesVariable, setupMockedDataSource } from '../../../__mocks__/CloudWatchDataSource';
+import {
+  logGroupNamesVariable,
+  setupMockedDataSource,
+  setupMockedTemplateService,
+} from '../../../__mocks__/CloudWatchDataSource';
 
 import { LogGroupsField } from './LogGroupsField';
 
@@ -17,6 +21,7 @@ const defaultProps = {
   region: '',
   onChange: jest.fn(),
 };
+
 describe('LogGroupSelection', () => {
   beforeEach(() => {
     jest.resetAllMocks();
@@ -35,6 +40,7 @@ describe('LogGroupSelection', () => {
     defaultProps.datasource.resources.getLogGroups = jest
       .fn()
       .mockResolvedValue([{ value: { arn: 'arn', name: 'loggroupname' } }]);
+    defaultProps.datasource.resources.templateSrv = setupMockedTemplateService();
     render(<LogGroupsField {...defaultProps} legacyLogGroupNames={['loggroupname']} />);
 
     await waitFor(async () => expect(screen.getByText('Select log groups')).toBeInTheDocument());
@@ -51,7 +57,8 @@ describe('LogGroupSelection', () => {
     defaultProps.datasource.resources.getLogGroups = jest
       .fn()
       .mockResolvedValue([{ value: { arn: 'arn', name: 'loggroupname' } }]);
-    render(<LogGroupsField {...defaultProps} legacyLogGroupNames={['loggroupname', logGroupNamesVariable.name]} />);
+    const varName = '$' + logGroupNamesVariable.name;
+    render(<LogGroupsField {...defaultProps} legacyLogGroupNames={['loggroupname', varName]} />);
 
     await waitFor(async () => expect(screen.getByText('Select log groups')).toBeInTheDocument());
     expect(defaultProps.datasource.resources.getLogGroups).toHaveBeenCalledTimes(1);
@@ -61,7 +68,7 @@ describe('LogGroupSelection', () => {
     });
     expect(defaultProps.onChange).toHaveBeenCalledWith([
       { arn: 'arn', name: 'loggroupname' },
-      { arn: logGroupNamesVariable.name, name: logGroupNamesVariable.name },
+      { arn: varName, name: varName },
     ]);
   });
 
@@ -70,6 +77,7 @@ describe('LogGroupSelection', () => {
     defaultProps.datasource.resources.getLogGroups = jest
       .fn()
       .mockResolvedValue([{ value: { arn: 'arn', name: 'loggroupname' } }]);
+    defaultProps.datasource.resources.templateSrv = setupMockedTemplateService();
     render(<LogGroupsField {...defaultProps} logGroups={[{ arn: 'arn', name: 'loggroupname' }]} />);
     await waitFor(() => expect(screen.getByText('Select log groups')).toBeInTheDocument());
     expect(defaultProps.datasource.resources.getLogGroups).not.toHaveBeenCalled();
diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsField.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsField.tsx
index 40263d388241f..6d97836822bc9 100644
--- a/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsField.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsField.tsx
@@ -20,13 +20,22 @@ type Props = {
   logGroups?: LogGroup[];
   region: string;
   maxNoOfVisibleLogGroups?: number;
+  newFormStylingEnabled?: boolean;
   onBeforeOpen?: () => void;
 };
 
-const rowGap = css`
-  gap: 3px;
-`;
+const rowGap = css({
+  gap: 3,
+});
 
+const logGroupNewStyles = css({
+  display: 'flex',
+  flexDirection: 'column',
+  marginTop: 8,
+  '& div:first-child': {
+    marginBottom: 8,
+  },
+});
 // used in Config Editor and in Log Query Editor
 export const LogGroupsField = ({
   datasource,
@@ -35,6 +44,7 @@ export const LogGroupsField = ({
   logGroups,
   region,
   maxNoOfVisibleLogGroups,
+  newFormStylingEnabled,
   onBeforeOpen,
 }: Props) => {
   const accountState = useAccountOptions(datasource?.resources, region);
@@ -74,7 +84,7 @@ export const LogGroupsField = ({
   }, [datasource, legacyLogGroupNames, logGroups, onChange, region, loadingLogGroupsStarted]);
 
   return (
-    <div className={`gf-form gf-form--grow flex-grow-1 ${rowGap}`}>
+    <div className={newFormStylingEnabled ? logGroupNewStyles : `gf-form gf-form--grow flex-grow-1 ${rowGap}`}>
       <LogGroupsSelector
         fetchLogGroups={async (params: Partial<DescribeLogGroupsRequest>) =>
           datasource?.resources.getLogGroups({ region: region, ...params }) ?? []
@@ -104,6 +114,7 @@ type WrapperProps = {
   region: string;
   maxNoOfVisibleLogGroups?: number;
   onBeforeOpen?: () => void;
+  newFormStylingEnabled?: boolean;
 
   // Legacy Props, can remove once we remove support for Legacy Log Group Selector
   legacyOnChange: (logGroups: string[]) => void;
diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsSelector.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsSelector.tsx
index 225f56e84329c..d1720065dddb9 100644
--- a/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsSelector.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsSelector.tsx
@@ -1,8 +1,8 @@
 import React, { useEffect, useMemo, useState } from 'react';
 
 import { SelectableValue } from '@grafana/data';
-import { EditorField, Space } from '@grafana/experimental';
-import { Button, Checkbox, Icon, Label, LoadingPlaceholder, Modal, Select, useStyles2 } from '@grafana/ui';
+import { EditorField } from '@grafana/experimental';
+import { Button, Checkbox, Icon, Label, LoadingPlaceholder, Modal, Select, Space, useStyles2 } from '@grafana/ui';
 
 import { DescribeLogGroupsRequest, ResourceResponse, LogGroupResponse } from '../../../resources/types';
 import { LogGroup } from '../../../types';
diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/SelectedLogGroups.test.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/SelectedLogGroups.test.tsx
index 9666d1d6186ea..540a6545c9f74 100644
--- a/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/SelectedLogGroups.test.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/SelectedLogGroups.test.tsx
@@ -64,11 +64,11 @@ describe('SelectedLogsGroups', () => {
         name: `logGroup${i}`,
       }));
       render(<SelectedLogGroups {...defaultProps} selectedLogGroups={selectedLogGroups} />);
-      await waitFor(() => userEvent.click(screen.getByText('Clear selection')));
+      await userEvent.click(screen.getByText('Clear selection'));
       await waitFor(() =>
         expect(screen.getByText('Are you sure you want to clear all log groups?')).toBeInTheDocument()
       );
-      await waitFor(() => userEvent.click(screen.getByRole('button', { name: 'Yes' })));
+      await userEvent.click(screen.getByRole('button', { name: 'Yes' }));
       expect(defaultProps.onChange).toHaveBeenCalledWith([]);
     });
   });
diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/MetricStatEditor/MetricStatEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/MetricStatEditor/MetricStatEditor.tsx
index bb57b58a87255..1bd3035726ab5 100644
--- a/public/app/plugins/datasource/cloudwatch/components/shared/MetricStatEditor/MetricStatEditor.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/shared/MetricStatEditor/MetricStatEditor.tsx
@@ -6,7 +6,7 @@ import { config } from '@grafana/runtime';
 import { Select } from '@grafana/ui';
 
 import { CloudWatchDatasource } from '../../../datasource';
-import { useAccountOptions, useDimensionKeys, useMetrics, useNamespaces } from '../../../hooks';
+import { useAccountOptions, useMetrics, useNamespaces } from '../../../hooks';
 import { standardStatistics } from '../../../standardStatistics';
 import { MetricStat } from '../../../types';
 import { appendTemplateVariables, toOption } from '../../../utils/utils';
@@ -35,7 +35,6 @@ export const MetricStatEditor = ({
 }: React.PropsWithChildren<Props>) => {
   const namespaces = useNamespaces(datasource);
   const metrics = useMetrics(datasource, metricStat);
-  const dimensionKeys = useDimensionKeys(datasource, { ...metricStat, dimensionFilters: metricStat.dimensions });
   const accountState = useAccountOptions(datasource.resources, metricStat.region);
 
   useEffect(() => {
@@ -139,7 +138,6 @@ export const MetricStatEditor = ({
           <Dimensions
             metricStat={metricStat}
             onChange={(dimensions) => onChange({ ...metricStat, dimensions })}
-            dimensionKeys={dimensionKeys}
             disableExpressions={disableExpressions}
             datasource={datasource}
           />
diff --git a/public/app/plugins/datasource/cloudwatch/components/styles.ts b/public/app/plugins/datasource/cloudwatch/components/styles.ts
index 7c0025d2d39d4..783d872331380 100644
--- a/public/app/plugins/datasource/cloudwatch/components/styles.ts
+++ b/public/app/plugins/datasource/cloudwatch/components/styles.ts
@@ -96,5 +96,6 @@ const getStyles = (theme: GrafanaTheme2) => ({
     marginLeft: theme.spacing(0.5),
   }),
 });
+export const removeMarginBottom = css({ marginBottom: 8 });
 
 export default getStyles;
diff --git a/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts b/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts
index ba62f4b1297c8..9cf62e4b58803 100644
--- a/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts
+++ b/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
@@ -304,4 +304,4 @@ export interface CloudWatchAnnotationQuery extends common.DataQuery, MetricStat
   queryMode: CloudWatchQueryMode;
 }
 
-export interface CloudWatch {}
+export interface CloudWatchDataQuery {}
diff --git a/public/app/plugins/datasource/cloudwatch/datasource.test.ts b/public/app/plugins/datasource/cloudwatch/datasource.test.ts
index 0d47ea9507052..096c3ff5c5b20 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.test.ts
+++ b/public/app/plugins/datasource/cloudwatch/datasource.test.ts
@@ -1,7 +1,7 @@
 import { lastValueFrom } from 'rxjs';
 import { toArray } from 'rxjs/operators';
 
-import { CoreApp, dateTime, Field } from '@grafana/data';
+import { CoreApp, Field } from '@grafana/data';
 
 import {
   CloudWatchSettings,
@@ -21,6 +21,7 @@ import {
   MetricEditorMode,
   MetricQueryType,
 } from './types';
+import * as templateUtils from './utils/templateVariableUtils';
 
 describe('datasource', () => {
   beforeEach(() => {
@@ -28,7 +29,7 @@ describe('datasource', () => {
   });
   describe('query', () => {
     it('should not run a query if log groups is not specified', async () => {
-      const { datasource, fetchMock } = setupMockedDataSource();
+      const { datasource, queryMock } = setupMockedDataSource();
       await lastValueFrom(
         datasource.query({
           targets: [
@@ -59,8 +60,8 @@ describe('datasource', () => {
         })
       );
 
-      expect(fetchMock.mock.calls[0][0].data.queries).toHaveLength(1);
-      expect(fetchMock.mock.calls[0][0].data.queries[0]).toMatchObject({
+      expect(queryMock.mock.calls[0][0].targets).toHaveLength(1);
+      expect(queryMock.mock.calls[0][0].targets[0]).toMatchObject({
         queryString: 'some query string',
         logGroupNames: ['/some/group'],
         region: 'us-west-1',
@@ -68,7 +69,7 @@ describe('datasource', () => {
     });
 
     it('should not run a query if query expression is not specified', async () => {
-      const { datasource, fetchMock } = setupMockedDataSource();
+      const { datasource, queryMock } = setupMockedDataSource();
       await lastValueFrom(
         datasource.query({
           targets: [
@@ -99,8 +100,8 @@ describe('datasource', () => {
         })
       );
 
-      expect(fetchMock.mock.calls[0][0].data.queries).toHaveLength(1);
-      expect(fetchMock.mock.calls[0][0].data.queries[0]).toMatchObject({
+      expect(queryMock.mock.calls[0][0].targets).toHaveLength(1);
+      expect(queryMock.mock.calls[0][0].targets[0]).toMatchObject({
         queryString: 'some query string',
         logGroupNames: ['/some/group'],
         region: 'us-west-1',
@@ -141,7 +142,7 @@ describe('datasource', () => {
     });
 
     it('should interpolate variables in the query', async () => {
-      const { datasource, fetchMock } = setupMockedDataSource({
+      const { datasource, queryMock } = setupMockedDataSource({
         variables: [fieldsVariable, regionVariable],
       });
       await lastValueFrom(
@@ -168,7 +169,7 @@ describe('datasource', () => {
           })
           .pipe(toArray())
       );
-      expect(fetchMock.mock.calls[0][0].data.queries[0]).toMatchObject({
+      expect(queryMock.mock.calls[0][0].targets[0]).toMatchObject({
         queryString: 'fields templatedField',
         logGroupNames: ['/some/group'],
         region: 'templatedRegion',
@@ -176,9 +177,8 @@ describe('datasource', () => {
     });
 
     it('should interpolate multi-value template variable for log group names in the query', async () => {
-      const { datasource, fetchMock } = setupMockedDataSource({
+      const { datasource, queryMock } = setupMockedDataSource({
         variables: [fieldsVariable, logGroupNamesVariable, regionVariable],
-        mockGetVariableName: false,
       });
       await lastValueFrom(
         datasource
@@ -204,7 +204,7 @@ describe('datasource', () => {
           })
           .pipe(toArray())
       );
-      expect(fetchMock.mock.calls[0][0].data.queries[0]).toMatchObject({
+      expect(queryMock.mock.calls[0][0].targets[0]).toMatchObject({
         queryString: 'fields templatedField',
         logGroupNames: ['templatedGroup-1', 'templatedGroup-2'],
         region: 'templatedRegion',
@@ -212,19 +212,7 @@ describe('datasource', () => {
     });
 
     it('should add links to log queries', async () => {
-      const { datasource, timeSrv } = setupForLogs();
-      timeSrv.timeRange = () => {
-        const time = dateTime('2021-01-01T01:00:00Z');
-        const range = {
-          from: time.subtract(6, 'hour'),
-          to: time,
-        };
-
-        return {
-          ...range,
-          raw: range,
-        };
-      };
+      const { datasource } = setupForLogs();
 
       const observable = datasource.query({
         targets: [
@@ -264,7 +252,7 @@ describe('datasource', () => {
       expect(emits[0].data[0].fields.find((f: Field) => f.name === '@message').config.links).toMatchObject([
         {
           title: 'View in CloudWatch console',
-          url: "https://us-west-1.console.aws.amazon.com/cloudwatch/home?region=us-west-1#logs-insights:queryDetail=~(end~'2020-12-31T19*3a00*3a00.000Z~start~'2020-12-31T19*3a00*3a00.000Z~timeType~'ABSOLUTE~tz~'UTC~editorString~'some*20query~isLiveTail~false~source~(~'test))",
+          url: "https://us-west-1.console.aws.amazon.com/cloudwatch/home?region=us-west-1#logs-insights:queryDetail=~(end~'2016-12-31T16*3a00*3a00.000Z~start~'2016-12-31T15*3a00*3a00.000Z~timeType~'ABSOLUTE~tz~'UTC~editorString~'some*20query~isLiveTail~false~source~(~'test))",
         },
       ]);
     });
@@ -316,7 +304,9 @@ describe('datasource', () => {
     it('should replace correct variables in CloudWatchMetricsQuery', () => {
       const { datasource, templateService } = setupMockedDataSource();
       templateService.replace = jest.fn();
-      templateService.getVariableName = jest.fn();
+      const mockGetVariableName = jest
+        .spyOn(templateUtils, 'getVariableName')
+        .mockImplementation((name: string) => name.replace('$', ''));
       const variableName = 'someVar';
       const metricsQuery: CloudWatchMetricsQuery = {
         queryMode: 'Metrics',
@@ -342,8 +332,8 @@ describe('datasource', () => {
       expect(templateService.replace).toHaveBeenCalledWith(`$${variableName}`, {});
       expect(templateService.replace).toHaveBeenCalledTimes(8);
 
-      expect(templateService.getVariableName).toHaveBeenCalledWith(`$${variableName}`);
-      expect(templateService.getVariableName).toHaveBeenCalledTimes(1);
+      expect(mockGetVariableName).toHaveBeenCalledWith(`$${variableName}`);
+      expect(mockGetVariableName).toHaveBeenCalledTimes(1);
     });
   });
 
diff --git a/public/app/plugins/datasource/cloudwatch/datasource.ts b/public/app/plugins/datasource/cloudwatch/datasource.ts
index 787b24d596d04..9864f161123d1 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.ts
+++ b/public/app/plugins/datasource/cloudwatch/datasource.ts
@@ -13,16 +13,18 @@ import {
   LogRowModel,
   ScopedVars,
 } from '@grafana/data';
-import { DataSourceWithBackend } from '@grafana/runtime';
-import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv';
-import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_srv';
+import { DataSourceWithBackend, TemplateSrv, getTemplateSrv } from '@grafana/runtime';
 
 import { CloudWatchAnnotationSupport } from './annotationSupport';
 import { DEFAULT_METRICS_QUERY, getDefaultLogsQuery } from './defaultQueries';
 import { isCloudWatchAnnotationQuery, isCloudWatchLogsQuery, isCloudWatchMetricsQuery } from './guards';
 import { CloudWatchLogsLanguageProvider } from './language/cloudwatch-logs/CloudWatchLogsLanguageProvider';
 import { SQLCompletionItemProvider } from './language/cloudwatch-sql/completion/CompletionItemProvider';
-import { LogsCompletionItemProvider } from './language/logs/completion/CompletionItemProvider';
+import {
+  LogsCompletionItemProvider,
+  LogsCompletionItemProviderFunc,
+  queryContext,
+} from './language/logs/completion/CompletionItemProvider';
 import { MetricMathCompletionItemProvider } from './language/metric-math/completion/CompletionItemProvider';
 import { CloudWatchAnnotationQueryRunner } from './query-runner/CloudWatchAnnotationQueryRunner';
 import { CloudWatchLogsQueryRunner } from './query-runner/CloudWatchLogsQueryRunner';
@@ -45,7 +47,7 @@ export class CloudWatchDatasource
   languageProvider: CloudWatchLogsLanguageProvider;
   sqlCompletionItemProvider: SQLCompletionItemProvider;
   metricMathCompletionItemProvider: MetricMathCompletionItemProvider;
-  logsCompletionItemProvider: LogsCompletionItemProvider;
+  logsCompletionItemProviderFunc: (queryContext: queryContext) => LogsCompletionItemProvider;
   defaultLogGroups?: string[];
 
   type = 'cloudwatch';
@@ -57,8 +59,7 @@ export class CloudWatchDatasource
 
   constructor(
     private instanceSettings: DataSourceInstanceSettings<CloudWatchJsonData>,
-    readonly templateSrv: TemplateSrv = getTemplateSrv(),
-    timeSrv: TimeSrv = getTimeSrv()
+    readonly templateSrv: TemplateSrv = getTemplateSrv()
   ) {
     super(instanceSettings);
     this.defaultRegion = instanceSettings.jsonData.defaultRegion;
@@ -67,8 +68,8 @@ export class CloudWatchDatasource
     this.sqlCompletionItemProvider = new SQLCompletionItemProvider(this.resources, this.templateSrv);
     this.metricMathCompletionItemProvider = new MetricMathCompletionItemProvider(this.resources, this.templateSrv);
     this.metricsQueryRunner = new CloudWatchMetricsQueryRunner(instanceSettings, templateSrv);
-    this.logsCompletionItemProvider = new LogsCompletionItemProvider(this.resources, this.templateSrv);
-    this.logsQueryRunner = new CloudWatchLogsQueryRunner(instanceSettings, templateSrv, timeSrv);
+    this.logsCompletionItemProviderFunc = LogsCompletionItemProviderFunc(this.resources, this.templateSrv);
+    this.logsQueryRunner = new CloudWatchLogsQueryRunner(instanceSettings, templateSrv);
     this.annotationQueryRunner = new CloudWatchAnnotationQueryRunner(instanceSettings, templateSrv);
     this.variables = new CloudWatchVariableSupport(this.resources);
     this.annotations = CloudWatchAnnotationSupport;
@@ -100,15 +101,19 @@ export class CloudWatchDatasource
 
     const dataQueryResponses: Array<Observable<DataQueryResponse>> = [];
     if (logQueries.length) {
-      dataQueryResponses.push(this.logsQueryRunner.handleLogQueries(logQueries, options));
+      dataQueryResponses.push(this.logsQueryRunner.handleLogQueries(logQueries, options, super.query.bind(this)));
     }
 
     if (metricsQueries.length) {
-      dataQueryResponses.push(this.metricsQueryRunner.handleMetricQueries(metricsQueries, options));
+      dataQueryResponses.push(
+        this.metricsQueryRunner.handleMetricQueries(metricsQueries, options, super.query.bind(this))
+      );
     }
 
     if (annotationQueries.length) {
-      dataQueryResponses.push(this.annotationQueryRunner.handleAnnotationQuery(annotationQueries, options));
+      dataQueryResponses.push(
+        this.annotationQueryRunner.handleAnnotationQuery(annotationQueries, options, super.query.bind(this))
+      );
     }
     // No valid targets, return the empty result to save a round trip.
     if (isEmpty(dataQueryResponses)) {
@@ -137,13 +142,13 @@ export class CloudWatchDatasource
     }));
   }
 
-  getLogRowContext = async (
+  getLogRowContext(
     row: LogRowModel,
     context?: LogRowContextOptions,
     query?: CloudWatchLogsQuery
-  ): Promise<{ data: DataFrame[] }> => {
-    return this.logsQueryRunner.getLogRowContext(row, context, query);
-  };
+  ): Promise<{ data: DataFrame[] }> {
+    return this.logsQueryRunner.getLogRowContext(row, context, super.query.bind(this), query);
+  }
 
   targetContainsTemplate(target: any) {
     return (
@@ -156,10 +161,6 @@ export class CloudWatchDatasource
     );
   }
 
-  showContextToggle() {
-    return true;
-  }
-
   getQueryDisplayText(query: CloudWatchQuery) {
     if (isCloudWatchLogsQuery(query)) {
       return query.expression ?? '';
diff --git a/public/app/plugins/datasource/cloudwatch/hooks.test.ts b/public/app/plugins/datasource/cloudwatch/hooks.test.ts
index 79a8a49cf051e..326a56b4b6dea 100644
--- a/public/app/plugins/datasource/cloudwatch/hooks.test.ts
+++ b/public/app/plugins/datasource/cloudwatch/hooks.test.ts
@@ -11,7 +11,13 @@ import {
   setupMockedDataSource,
 } from './__mocks__/CloudWatchDataSource';
 import { setupMockedResourcesAPI } from './__mocks__/ResourcesAPI';
-import { useAccountOptions, useDimensionKeys, useIsMonitoringAccount, useMetrics } from './hooks';
+import {
+  useAccountOptions,
+  useDimensionKeys,
+  useIsMonitoringAccount,
+  useMetrics,
+  useEnsureVariableHasSingleSelection,
+} from './hooks';
 
 const originalFeatureToggleValue = config.featureToggles.cloudWatchCrossAccountQuerying;
 
@@ -64,7 +70,6 @@ describe('hooks', () => {
   describe('useDimensionKeys', () => {
     it('should interpolate variables before calling api', async () => {
       const { datasource } = setupMockedDataSource({
-        mockGetVariableName: true,
         variables: [regionVariable, namespaceVariable, accountIdVariable, metricVariable, dimensionVariable],
       });
       const getDimensionKeysMock = jest.fn().mockResolvedValue([]);
@@ -83,15 +88,18 @@ describe('hooks', () => {
       );
       await waitFor(() => {
         expect(getDimensionKeysMock).toHaveBeenCalledTimes(1);
-        expect(getDimensionKeysMock).toHaveBeenCalledWith({
-          region: regionVariable.current.value,
-          namespace: namespaceVariable.current.value,
-          metricName: metricVariable.current.value,
-          accountId: accountIdVariable.current.value,
-          dimensionFilters: {
-            environment: [dimensionVariable.current.value],
+        expect(getDimensionKeysMock).toHaveBeenCalledWith(
+          {
+            region: regionVariable.current.value,
+            namespace: namespaceVariable.current.value,
+            metricName: metricVariable.current.value,
+            accountId: accountIdVariable.current.value,
+            dimensionFilters: {
+              environment: [dimensionVariable.current.value],
+            },
           },
-        });
+          false
+        );
       });
     });
   });
@@ -140,4 +148,35 @@ describe('hooks', () => {
       });
     });
   });
+
+  describe('useEnsureVariableHasSingleSelection', () => {
+    it('should return an error if a variable has multiple options selected', () => {
+      const { datasource } = setupMockedDataSource();
+      datasource.resources.isVariableWithMultipleOptionsSelected = jest.fn().mockReturnValue(true);
+
+      const variable = '$variable';
+      const { result } = renderHook(() => useEnsureVariableHasSingleSelection(datasource, variable));
+      expect(result.current).toEqual(
+        `Template variables with multiple selected options are not supported for ${variable}`
+      );
+    });
+
+    it('should not return an error if a variable is a multi-variable but does not have multiple options selected', () => {
+      const { datasource } = setupMockedDataSource();
+      datasource.resources.isVariableWithMultipleOptionsSelected = jest.fn().mockReturnValue(false);
+
+      const variable = '$variable';
+      const { result } = renderHook(() => useEnsureVariableHasSingleSelection(datasource, variable));
+      expect(result.current).toEqual('');
+    });
+
+    it('should not return an error if a variable is not a multi-variable', () => {
+      const { datasource } = setupMockedDataSource();
+      datasource.resources.isMultiVariable = jest.fn().mockReturnValue(false);
+
+      const variable = '$variable';
+      const { result } = renderHook(() => useEnsureVariableHasSingleSelection(datasource, variable));
+      expect(result.current).toEqual('');
+    });
+  });
 });
diff --git a/public/app/plugins/datasource/cloudwatch/hooks.ts b/public/app/plugins/datasource/cloudwatch/hooks.ts
index a4a6738580a1c..8fe4c3540e5dd 100644
--- a/public/app/plugins/datasource/cloudwatch/hooks.ts
+++ b/public/app/plugins/datasource/cloudwatch/hooks.ts
@@ -87,13 +87,13 @@ export const useDimensionKeys = (
   }
 
   if (dimensionFilters) {
-    dimensionFilters = datasource.resources.convertDimensionFormat(dimensionFilters, {});
+    dimensionFilters = datasource.resources.convertDimensionFormat(dimensionFilters, {}, false);
   }
 
   // doing deep comparison to avoid making new api calls to list metrics unless dimension filter object props changes
   useDeepCompareEffect(() => {
     datasource.resources
-      .getDimensionKeys({ namespace, region, metricName, accountId, dimensionFilters })
+      .getDimensionKeys({ namespace, region, metricName, accountId, dimensionFilters }, false)
       .then((result: Array<SelectableValue<string>>) => {
         setDimensionKeys(appendTemplateVariables(datasource, result));
       });
@@ -102,6 +102,28 @@ export const useDimensionKeys = (
   return dimensionKeys;
 };
 
+export const useEnsureVariableHasSingleSelection = (datasource: CloudWatchDatasource, target?: string) => {
+  const [error, setError] = useState('');
+  // interpolate the target to ensure the check in useEffect runs when the variable selection is changed
+  const interpolatedTarget = datasource.templateSrv.replace(target);
+
+  useEffect(() => {
+    if (datasource.resources.isVariableWithMultipleOptionsSelected(target)) {
+      const newErrorMessage = `Template variables with multiple selected options are not supported for ${target}`;
+      if (error !== newErrorMessage) {
+        setError(newErrorMessage);
+      }
+      return;
+    }
+
+    if (error) {
+      setError('');
+    }
+  }, [datasource.resources, target, interpolatedTarget, error]);
+
+  return error;
+};
+
 export const useIsMonitoringAccount = (resources: ResourcesAPI, region: string) => {
   const [isMonitoringAccount, setIsMonitoringAccount] = useState(false);
   // we call this before the use effect to ensure dependency array below
diff --git a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs/CloudWatchLogsLanguageProvider.test.ts b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs/CloudWatchLogsLanguageProvider.test.ts
index 620ac3575e4d3..77a59d1fa2147 100644
--- a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs/CloudWatchLogsLanguageProvider.test.ts
+++ b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs/CloudWatchLogsLanguageProvider.test.ts
@@ -3,6 +3,7 @@ import { Value } from 'slate';
 
 import { TypeaheadOutput } from '@grafana/ui';
 
+import { setupMockedTemplateService } from '../../__mocks__/CloudWatchDataSource';
 import { CloudWatchDatasource } from '../../datasource';
 import { ResourceResponse } from '../../resources/types';
 import { LogGroupField } from '../../types';
@@ -124,7 +125,7 @@ function makeDatasource(): CloudWatchDatasource {
  * Get suggestion items based on query. Use `^` to mark position of the cursor.
  */
 function getProvideCompletionItems(query: string): Promise<TypeaheadOutput> {
-  const provider = new CloudWatchLogsLanguageProvider(makeDatasource());
+  const provider = new CloudWatchLogsLanguageProvider(makeDatasource(), setupMockedTemplateService());
   const cursorOffset = query.indexOf('^');
   const queryWithoutCursor = query.replace('^', '');
   let tokens: Token[] = Prism.tokenize(queryWithoutCursor, provider.getSyntax()) as any;
diff --git a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs/CloudWatchLogsLanguageProvider.ts b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs/CloudWatchLogsLanguageProvider.ts
index f2dfa350b8e26..f2e889f9c229f 100644
--- a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs/CloudWatchLogsLanguageProvider.ts
+++ b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs/CloudWatchLogsLanguageProvider.ts
@@ -2,9 +2,8 @@ import Prism, { Grammar } from 'prismjs';
 import { lastValueFrom } from 'rxjs';
 
 import { AbsoluteTimeRange, HistoryItem, LanguageProvider } from '@grafana/data';
-import { BackendDataSourceResponse, FetchResponse } from '@grafana/runtime';
+import { BackendDataSourceResponse, FetchResponse, TemplateSrv, getTemplateSrv } from '@grafana/runtime';
 import { CompletionItemGroup, SearchFunctionType, Token, TypeaheadInput, TypeaheadOutput } from '@grafana/ui';
-import { getTemplateSrv } from 'app/features/templating/template_srv';
 
 import { CloudWatchDatasource } from '../../datasource';
 import { CloudWatchQuery, LogGroup } from '../../types';
@@ -34,11 +33,13 @@ export class CloudWatchLogsLanguageProvider extends LanguageProvider {
   started = false;
   declare initialRange: AbsoluteTimeRange;
   datasource: CloudWatchDatasource;
+  templateSrv: TemplateSrv;
 
-  constructor(datasource: CloudWatchDatasource, initialValues?: any) {
+  constructor(datasource: CloudWatchDatasource, templateSrv?: TemplateSrv, initialValues?: any) {
     super();
 
     this.datasource = datasource;
+    this.templateSrv = templateSrv ?? getTemplateSrv();
 
     Object.assign(this, initialValues);
   }
@@ -132,7 +133,7 @@ export class CloudWatchLogsLanguageProvider extends LanguageProvider {
 
   private fetchFields = async (logGroups: LogGroup[], region: string): Promise<string[]> => {
     const interpolatedLogGroups = interpolateStringArrayUsingSingleOrMultiValuedVariable(
-      getTemplateSrv(),
+      this.templateSrv,
       logGroups.map((lg) => lg.name),
       {},
       'text'
diff --git a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/SQLGenerator.test.ts b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/SQLGenerator.test.ts
index b256ea1399a94..9a63cee6bd819 100644
--- a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/SQLGenerator.test.ts
+++ b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/SQLGenerator.test.ts
@@ -1,10 +1,9 @@
-import { TemplateSrv } from 'app/features/templating/template_srv';
-
 import {
   aggregationvariable,
   labelsVariable,
   metricVariable,
   namespaceVariable,
+  setupMockedTemplateService,
 } from '../../__mocks__/CloudWatchDataSource';
 import {
   createFunctionWithParameter,
@@ -25,11 +24,12 @@ describe('SQLGenerator', () => {
     from: createFunctionWithParameter('SCHEMA', ['AWS/EC2']),
     orderByDirection: 'DESC',
   };
+  let mockTemplateSrv = setupMockedTemplateService();
 
   describe('mandatory fields check', () => {
     it('should return undefined if metric and aggregation is missing', () => {
       expect(
-        new SQLGenerator().expressionToSqlQuery({
+        new SQLGenerator(mockTemplateSrv).expressionToSqlQuery({
           from: createFunctionWithParameter('SCHEMA', ['AWS/EC2']),
         })
       ).toBeUndefined();
@@ -37,7 +37,7 @@ describe('SQLGenerator', () => {
 
     it('should return undefined if aggregation is missing', () => {
       expect(
-        new SQLGenerator().expressionToSqlQuery({
+        new SQLGenerator(mockTemplateSrv).expressionToSqlQuery({
           from: createFunctionWithParameter('SCHEMA', []),
         })
       ).toBeUndefined();
@@ -45,37 +45,44 @@ describe('SQLGenerator', () => {
   });
 
   it('should return query if mandatory fields are provided', () => {
-    expect(new SQLGenerator().expressionToSqlQuery(baseQuery)).not.toBeUndefined();
+    expect(new SQLGenerator(mockTemplateSrv).expressionToSqlQuery(baseQuery)).not.toBeUndefined();
   });
 
   describe('select', () => {
     it('should use statistic and metric name', () => {
       const select = createFunctionWithParameter('COUNT', ['BytesPerSecond']);
-      expect(new SQLGenerator().expressionToSqlQuery({ ...baseQuery, select })).toEqual(
+      expect(new SQLGenerator(mockTemplateSrv).expressionToSqlQuery({ ...baseQuery, select })).toEqual(
         `SELECT COUNT(BytesPerSecond) FROM SCHEMA("AWS/EC2")`
       );
     });
 
     it('should wrap in double quotes if metric name contains illegal characters ', () => {
       const select = createFunctionWithParameter('COUNT', ['Bytes-Per-Second']);
-      expect(new SQLGenerator().expressionToSqlQuery({ ...baseQuery, select })).toEqual(
+      expect(new SQLGenerator(mockTemplateSrv).expressionToSqlQuery({ ...baseQuery, select })).toEqual(
         `SELECT COUNT("Bytes-Per-Second") FROM SCHEMA("AWS/EC2")`
       );
     });
+
+    it('should wrap in double quotes if metric name starts with a number ', () => {
+      const select = createFunctionWithParameter('COUNT', ['4xxErrorRate']);
+      expect(new SQLGenerator(mockTemplateSrv).expressionToSqlQuery({ ...baseQuery, select })).toEqual(
+        `SELECT COUNT("4xxErrorRate") FROM SCHEMA("AWS/EC2")`
+      );
+    });
   });
 
   describe('from', () => {
     describe('with schema contraint', () => {
       it('should handle schema without dimensions', () => {
         const from = createFunctionWithParameter('SCHEMA', ['AWS/MQ']);
-        expect(new SQLGenerator().expressionToSqlQuery({ ...baseQuery, from })).toEqual(
+        expect(new SQLGenerator(mockTemplateSrv).expressionToSqlQuery({ ...baseQuery, from })).toEqual(
           `SELECT SUM(CPUUtilization) FROM SCHEMA("AWS/MQ")`
         );
       });
 
       it('should handle schema with dimensions', () => {
         const from = createFunctionWithParameter('SCHEMA', ['AWS/MQ', 'InstanceId', 'InstanceType']);
-        expect(new SQLGenerator().expressionToSqlQuery({ ...baseQuery, from })).toEqual(
+        expect(new SQLGenerator(mockTemplateSrv).expressionToSqlQuery({ ...baseQuery, from })).toEqual(
           `SELECT SUM(CPUUtilization) FROM SCHEMA("AWS/MQ", InstanceId, InstanceType)`
         );
       });
@@ -87,7 +94,7 @@ describe('SQLGenerator', () => {
           'Instance.Type',
           'Instance-Group',
         ]);
-        expect(new SQLGenerator().expressionToSqlQuery({ ...baseQuery, from })).toEqual(
+        expect(new SQLGenerator(mockTemplateSrv).expressionToSqlQuery({ ...baseQuery, from })).toEqual(
           `SELECT SUM(CPUUtilization) FROM SCHEMA("AWS/MQ", "Instance Id", "Instance.Type", "Instance-Group")`
         );
       });
@@ -96,7 +103,7 @@ describe('SQLGenerator', () => {
     describe('without schema', () => {
       it('should use the specified namespace', () => {
         const from = createProperty('AWS/MQ');
-        expect(new SQLGenerator().expressionToSqlQuery({ ...baseQuery, from })).toEqual(
+        expect(new SQLGenerator(mockTemplateSrv).expressionToSqlQuery({ ...baseQuery, from })).toEqual(
           `SELECT SUM(CPUUtilization) FROM "AWS/MQ"`
         );
       });
@@ -104,25 +111,25 @@ describe('SQLGenerator', () => {
   });
 
   function assertQueryEndsWith(rest: Partial<SQLExpression>, expectedFilter: string) {
-    expect(new SQLGenerator().expressionToSqlQuery({ ...baseQuery, ...rest })).toEqual(
+    expect(new SQLGenerator(mockTemplateSrv).expressionToSqlQuery({ ...baseQuery, ...rest })).toEqual(
       `SELECT SUM(CPUUtilization) FROM SCHEMA("AWS/EC2") ${expectedFilter}`
     );
   }
 
   describe('filter', () => {
     it('should not add WHERE clause in case its empty', () => {
-      expect(new SQLGenerator().expressionToSqlQuery({ ...baseQuery })).not.toContain('WHERE');
+      expect(new SQLGenerator(mockTemplateSrv).expressionToSqlQuery({ ...baseQuery })).not.toContain('WHERE');
     });
 
     it('should not add WHERE clause when there is no filter conditions', () => {
       const where = createArray([]);
-      expect(new SQLGenerator().expressionToSqlQuery({ ...baseQuery, where })).not.toContain('WHERE');
+      expect(new SQLGenerator(mockTemplateSrv).expressionToSqlQuery({ ...baseQuery, where })).not.toContain('WHERE');
     });
 
     // TODO: We should handle this scenario
     it.skip('should not add WHERE clause when the operator is incomplete', () => {
       const where = createArray([createOperator('Instance-Id', '=')]);
-      expect(new SQLGenerator().expressionToSqlQuery({ ...baseQuery, where })).not.toContain('WHERE');
+      expect(new SQLGenerator(mockTemplateSrv).expressionToSqlQuery({ ...baseQuery, where })).not.toContain('WHERE');
     });
 
     it('should handle one top level filter with AND', () => {
@@ -273,7 +280,7 @@ describe('SQLGenerator', () => {
 
   describe('group by', () => {
     it('should not add GROUP BY clause in case its empty', () => {
-      expect(new SQLGenerator().expressionToSqlQuery({ ...baseQuery })).not.toContain('GROUP BY');
+      expect(new SQLGenerator(mockTemplateSrv).expressionToSqlQuery({ ...baseQuery })).not.toContain('GROUP BY');
     });
     it('should handle single label', () => {
       const groupBy = createArray([createGroupBy('InstanceId')], QueryEditorExpressionType.And);
@@ -290,7 +297,7 @@ describe('SQLGenerator', () => {
 
   describe('order by', () => {
     it('should not add ORDER BY clause in case its empty', () => {
-      expect(new SQLGenerator().expressionToSqlQuery({ ...baseQuery })).not.toContain('ORDER BY');
+      expect(new SQLGenerator(mockTemplateSrv).expressionToSqlQuery({ ...baseQuery })).not.toContain('ORDER BY');
     });
     it('should handle SUM ASC', () => {
       const orderBy = createFunction('SUM');
@@ -308,7 +315,7 @@ describe('SQLGenerator', () => {
   });
   describe('limit', () => {
     it('should not add LIMIT clause in case its empty', () => {
-      expect(new SQLGenerator().expressionToSqlQuery({ ...baseQuery })).not.toContain('LIMIT');
+      expect(new SQLGenerator(mockTemplateSrv).expressionToSqlQuery({ ...baseQuery })).not.toContain('LIMIT');
     });
 
     it('should be added in case its specified', () => {
@@ -339,15 +346,19 @@ describe('SQLGenerator', () => {
         orderByDirection: 'DESC',
         limit: 100,
       };
-      expect(new SQLGenerator().expressionToSqlQuery(query)).toEqual(
+      expect(new SQLGenerator(mockTemplateSrv).expressionToSqlQuery(query)).toEqual(
         `SELECT COUNT(DroppedBytes) FROM SCHEMA("AWS/MQ", InstanceId, "Instance-Group") WHERE (InstanceId = 'I-123' OR Type != 'some-type') AND (InstanceId != 'I-456' OR Type != 'some-type') GROUP BY InstanceId, InstanceType ORDER BY COUNT() DESC LIMIT 100`
       );
     });
   });
 
   describe('using variables', () => {
-    const templateService = new TemplateSrv();
-    templateService.init([metricVariable, namespaceVariable, labelsVariable, aggregationvariable]);
+    const templateService = setupMockedTemplateService([
+      metricVariable,
+      namespaceVariable,
+      labelsVariable,
+      aggregationvariable,
+    ]);
 
     it('should interpolate variables correctly', () => {
       let query: SQLExpression = {
diff --git a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/SQLGenerator.ts b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/SQLGenerator.ts
index 3858b13132ee9..105dd5a3da61f 100644
--- a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/SQLGenerator.ts
+++ b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/SQLGenerator.ts
@@ -1,4 +1,4 @@
-import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_srv';
+import { getTemplateSrv, TemplateSrv } from '@grafana/runtime';
 
 import {
   QueryEditorArrayExpression,
@@ -146,10 +146,11 @@ export default class SQLGenerator {
   }
 
   private formatValue(label: string): string {
-    const specialCharacters = /[/\s\.-]/; // slash, space, dot or dash
+    const specialCharacters = /[/\s\.%-]/; // slash, space, dot, percent, or dash
+    const startsWithNumber = /^\d/;
 
     const interpolated = this.templateSrv.replace(label, {}, 'raw');
-    if (specialCharacters.test(interpolated)) {
+    if (specialCharacters.test(interpolated) || startsWithNumber.test(interpolated)) {
       return `"${label}"`;
     }
 
diff --git a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/completion/CompletionItemProvider.ts b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/completion/CompletionItemProvider.ts
index 80539dc4f5783..1b2f030eba7ea 100644
--- a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/completion/CompletionItemProvider.ts
+++ b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/completion/CompletionItemProvider.ts
@@ -179,12 +179,15 @@ export class SQLCompletionItemProvider extends CompletionItemProvider {
               dimensionFilters = (labelKeyTokens || []).reduce((acc, curr) => {
                 return { ...acc, [curr.value]: null };
               }, {});
-              const keys = await this.resources.getDimensionKeys({
-                namespace: this.templateSrv.replace(namespaceToken.value.replace(/\"/g, '')),
-                region: this.templateSrv.replace(this.region),
-                metricName: metricNameToken?.value,
-                dimensionFilters,
-              });
+              const keys = await this.resources.getDimensionKeys(
+                {
+                  namespace: this.templateSrv.replace(namespaceToken.value.replace(/\"/g, '')),
+                  region: this.templateSrv.replace(this.region),
+                  metricName: metricNameToken?.value,
+                  dimensionFilters,
+                },
+                false
+              );
               keys.map((m) => {
                 const key = /[\s\.-]/.test(m.value ?? '') ? `"${m.value}"` : m.value;
                 key && addSuggestion(key);
diff --git a/public/app/plugins/datasource/cloudwatch/language/logs/completion/CompletionItemProvider.test.ts b/public/app/plugins/datasource/cloudwatch/language/logs/completion/CompletionItemProvider.test.ts
index cbdfaf73d186e..63ddcc5e1cb3e 100644
--- a/public/app/plugins/datasource/cloudwatch/language/logs/completion/CompletionItemProvider.test.ts
+++ b/public/app/plugins/datasource/cloudwatch/language/logs/completion/CompletionItemProvider.test.ts
@@ -6,6 +6,8 @@ import { emptyQuery, filterQuery, newCommandQuery, sortQuery } from '../../../__
 import MonacoMock from '../../../__mocks__/monarch/Monaco';
 import TextModel from '../../../__mocks__/monarch/TextModel';
 import { ResourcesAPI } from '../../../resources/ResourcesAPI';
+import { ResourceResponse } from '../../../resources/types';
+import { LogGroup, LogGroupField } from '../../../types';
 import cloudWatchLogsLanguageDefinition from '../definition';
 import { LOGS_COMMANDS, LOGS_FUNCTION_OPERATORS, SORT_DIRECTION_KEYWORDS } from '../language';
 
@@ -18,14 +20,19 @@ jest.mock('monaco-editor/esm/vs/editor/editor.api', () => ({
 const getSuggestions = async (
   value: string,
   position: monacoTypes.IPosition,
-  variables: CustomVariableModel[] = []
+  variables: CustomVariableModel[] = [],
+  logGroups: LogGroup[] = [],
+  fields: Array<ResourceResponse<LogGroupField>> = []
 ) => {
   const setup = new LogsCompletionItemProvider(
     {
       getActualRegion: () => 'us-east-2',
     } as ResourcesAPI,
-    setupMockedTemplateService(variables)
+    setupMockedTemplateService(variables),
+    { region: 'default', logGroups }
   );
+
+  setup.resources.getLogGroupFields = jest.fn().mockResolvedValue(fields);
   const monaco = MonacoMock as Monaco;
   const provider = setup.getCompletionProvider(monaco, cloudWatchLogsLanguageDefinition);
   const { suggestions } = await provider.provideCompletionItems(
@@ -76,5 +83,17 @@ describe('LogsCompletionItemProvider', () => {
       const expectedLabels = [...LOGS_COMMANDS, expectedTemplateVariableLabel];
       expect(suggestionLabels).toEqual(expect.arrayContaining(expectedLabels));
     });
+
+    it('fetches fields when logGroups are set', async () => {
+      const suggestions = await getSuggestions(
+        sortQuery.query,
+        sortQuery.position,
+        [],
+        [{ arn: 'foo', name: 'bar' }],
+        [{ value: { name: '@field' } }]
+      );
+      const suggestionLabels = suggestions.map((s) => s.label);
+      expect(suggestionLabels).toEqual(expect.arrayContaining(['@field']));
+    });
   });
 });
diff --git a/public/app/plugins/datasource/cloudwatch/language/logs/completion/CompletionItemProvider.ts b/public/app/plugins/datasource/cloudwatch/language/logs/completion/CompletionItemProvider.ts
index 4f804a08ea85d..d5e9dc3c318d3 100644
--- a/public/app/plugins/datasource/cloudwatch/language/logs/completion/CompletionItemProvider.ts
+++ b/public/app/plugins/datasource/cloudwatch/language/logs/completion/CompletionItemProvider.ts
@@ -1,7 +1,8 @@
-import { getTemplateSrv, type TemplateSrv } from '@grafana/runtime';
+import { getTemplateSrv, TemplateSrv } from '@grafana/runtime';
 import { Monaco, monacoTypes } from '@grafana/ui';
 
 import { type ResourcesAPI } from '../../../resources/ResourcesAPI';
+import { LogGroup } from '../../../types';
 import { CompletionItemProvider } from '../../monarch/CompletionItemProvider';
 import { LinkedToken } from '../../monarch/LinkedToken';
 import { TRIGGER_SUGGEST } from '../../monarch/commands';
@@ -12,12 +13,26 @@ import { getStatementPosition } from './statementPosition';
 import { getSuggestionKinds } from './suggestionKinds';
 import { LogsTokenTypes } from './types';
 
+export type queryContext = {
+  logGroups?: LogGroup[];
+  region: string;
+};
+
+export function LogsCompletionItemProviderFunc(resources: ResourcesAPI, templateSrv: TemplateSrv = getTemplateSrv()) {
+  return (queryContext: queryContext) => {
+    return new LogsCompletionItemProvider(resources, templateSrv, queryContext);
+  };
+}
+
 export class LogsCompletionItemProvider extends CompletionItemProvider {
-  constructor(resources: ResourcesAPI, templateSrv: TemplateSrv = getTemplateSrv()) {
+  queryContext: queryContext;
+
+  constructor(resources: ResourcesAPI, templateSrv: TemplateSrv = getTemplateSrv(), queryContext: queryContext) {
     super(resources, templateSrv);
     this.getStatementPosition = getStatementPosition;
     this.getSuggestionKinds = getSuggestionKinds;
     this.tokenTypes = LogsTokenTypes;
+    this.queryContext = queryContext;
   }
 
   async getSuggestions(
@@ -56,6 +71,7 @@ export class LogsCompletionItemProvider extends CompletionItemProvider {
               insertText: `${command} $0`,
               insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
               command: TRIGGER_SUGGEST,
+              kind: monaco.languages.CompletionItemKind.Method,
             });
           });
           break;
@@ -65,12 +81,32 @@ export class LogsCompletionItemProvider extends CompletionItemProvider {
               insertText: `${f}($0)`,
               insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
               command: TRIGGER_SUGGEST,
+              kind: monaco.languages.CompletionItemKind.Function,
             });
           });
+
+          if (this.queryContext.logGroups && this.queryContext.logGroups.length > 0) {
+            let fields = await this.fetchFields(this.queryContext.logGroups, this.queryContext.region);
+            fields.push('@log');
+            fields.forEach((field) => {
+              if (field !== '') {
+                addSuggestion(field, {
+                  range,
+                  label: field,
+                  insertText: field,
+                  kind: monaco.languages.CompletionItemKind.Field,
+                  sortText: CompletionItemPriority.High,
+                });
+              }
+            });
+          }
           break;
         case SuggestionKind.SortOrderDirectionKeyword:
           SORT_DIRECTION_KEYWORDS.forEach((direction) => {
-            addSuggestion(direction, { sortText: CompletionItemPriority.High });
+            addSuggestion(direction, {
+              sortText: CompletionItemPriority.High,
+              kind: monaco.languages.CompletionItemKind.Operator,
+            });
           });
           break;
         case SuggestionKind.InKeyword:
@@ -82,19 +118,31 @@ export class LogsCompletionItemProvider extends CompletionItemProvider {
           });
           break;
       }
+    }
 
-      this.templateSrv.getVariables().map((v) => {
-        const variable = `$${v.name}`;
-        addSuggestion(variable, {
-          range,
-          label: variable,
-          insertText: variable,
-          kind: monaco.languages.CompletionItemKind.Variable,
-          sortText: CompletionItemPriority.Low,
-        });
+    this.templateSrv.getVariables().map((v) => {
+      const variable = `$${v.name}`;
+      addSuggestion(variable, {
+        range,
+        label: variable,
+        insertText: variable,
+        kind: monaco.languages.CompletionItemKind.Variable,
+        sortText: CompletionItemPriority.Low,
       });
-    }
+    });
 
     return suggestions;
   }
+
+  private fetchFields = async (logGroups: LogGroup[], region: string): Promise<string[]> => {
+    const results = await Promise.all(
+      logGroups.map((logGroup) =>
+        this.resources
+          .getLogGroupFields({ logGroupName: logGroup.name, arn: logGroup.arn, region })
+          .then((fields) => fields.filter((f) => f).map((f) => f.value.name ?? ''))
+      )
+    );
+    // Deduplicate fields
+    return [...new Set(results.flat())];
+  };
 }
diff --git a/public/app/plugins/datasource/cloudwatch/language/metric-math/language.ts b/public/app/plugins/datasource/cloudwatch/language/metric-math/language.ts
index 0c2de35a8792e..a26d879a9e47e 100644
--- a/public/app/plugins/datasource/cloudwatch/language/metric-math/language.ts
+++ b/public/app/plugins/datasource/cloudwatch/language/metric-math/language.ts
@@ -7,6 +7,7 @@ export const METRIC_MATH_FNS = [
   'AVG',
   'CEIL',
   'DATAPOINT_COUNT',
+  'DB_PERF_INSIGHTS',
   'DIFF',
   'DIFF_TIME',
   'FILL',
diff --git a/public/app/plugins/datasource/cloudwatch/language/monarch/register.ts b/public/app/plugins/datasource/cloudwatch/language/monarch/register.ts
index 4b552a4763abc..ace6756e213e4 100644
--- a/public/app/plugins/datasource/cloudwatch/language/monarch/register.ts
+++ b/public/app/plugins/datasource/cloudwatch/language/monarch/register.ts
@@ -15,7 +15,23 @@ export type LanguageDefinition = {
   }>;
 };
 
-export const registerLanguage = (
+export const reRegisterCompletionProvider = async (
+  monaco: Monaco,
+  language: LanguageDefinition,
+  completionItemProvider: Completeable,
+  disposal?: monacoType.IDisposable
+) => {
+  const { id, loader } = language;
+  disposal?.dispose();
+  return loader().then((monarch) => {
+    return monaco.languages.registerCompletionItemProvider(
+      id,
+      completionItemProvider.getCompletionProvider(monaco, language)
+    );
+  });
+};
+
+export const registerLanguage = async (
   monaco: Monaco,
   language: LanguageDefinition,
   completionItemProvider: Completeable
@@ -28,9 +44,12 @@ export const registerLanguage = (
   }
 
   monaco.languages.register({ id });
-  loader().then((monarch) => {
+  return loader().then((monarch) => {
     monaco.languages.setMonarchTokensProvider(id, monarch.language);
     monaco.languages.setLanguageConfiguration(id, monarch.conf);
-    monaco.languages.registerCompletionItemProvider(id, completionItemProvider.getCompletionProvider(monaco, language));
+    return monaco.languages.registerCompletionItemProvider(
+      id,
+      completionItemProvider.getCompletionProvider(monaco, language)
+    );
   });
 };
diff --git a/public/app/plugins/datasource/cloudwatch/migrations/dashboardMigrations.ts b/public/app/plugins/datasource/cloudwatch/migrations/dashboardMigrations.ts
index 01c532ab9390e..03da65ed5260e 100644
--- a/public/app/plugins/datasource/cloudwatch/migrations/dashboardMigrations.ts
+++ b/public/app/plugins/datasource/cloudwatch/migrations/dashboardMigrations.ts
@@ -2,8 +2,8 @@
 // Migrations applied by the DashboardMigrator are performed before the plugin is loaded.
 // DashboardMigrator migrations are tied to a certain minimum version of a dashboard which means they will only be ran once.
 
-import { DataQuery, AnnotationQuery } from '@grafana/data';
-import { getNextRefIdChar } from 'app/core/utils/query';
+import { AnnotationQuery, getNextRefId } from '@grafana/data';
+import { DataQuery } from '@grafana/schema';
 
 import { CloudWatchMetricsQuery, LegacyAnnotationQuery, MetricQueryType, MetricEditorMode } from '../types';
 
@@ -20,7 +20,7 @@ export function migrateMultipleStatsMetricsQuery(
     }
   }
   for (const newTarget of newQueries) {
-    newTarget.refId = getNextRefIdChar(panelQueries);
+    newTarget.refId = getNextRefId(panelQueries);
     delete newTarget.statistics;
     panelQueries.push(newTarget);
   }
diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchAnnotationQueryRunner.test.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchAnnotationQueryRunner.test.ts
index 59295937487f2..75df7ff069e11 100644
--- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchAnnotationQueryRunner.test.ts
+++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchAnnotationQueryRunner.test.ts
@@ -22,11 +22,11 @@ describe('CloudWatchAnnotationQueryRunner', () => {
   ];
 
   it('should issue the correct query', async () => {
-    const { runner, fetchMock, request } = setupMockedAnnotationQueryRunner({
+    const { runner, queryMock, request } = setupMockedAnnotationQueryRunner({
       variables: [namespaceVariable, regionVariable],
     });
-    await expect(runner.handleAnnotationQuery(queries, request)).toEmitValuesWith(() => {
-      expect(fetchMock.mock.calls[0][0].data.queries[0]).toMatchObject(
+    await expect(runner.handleAnnotationQuery(queries, request, queryMock)).toEmitValuesWith(() => {
+      expect(queryMock.mock.calls[0][0].targets[0]).toMatchObject(
         expect.objectContaining({
           region: regionVariable.current.value,
           namespace: namespaceVariable.current.value,
diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchAnnotationQueryRunner.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchAnnotationQueryRunner.ts
index a055a3a1740f2..013d14bbd6fc6 100644
--- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchAnnotationQueryRunner.ts
+++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchAnnotationQueryRunner.ts
@@ -1,8 +1,7 @@
-import { map, Observable } from 'rxjs';
+import { Observable } from 'rxjs';
 
 import { DataQueryRequest, DataQueryResponse, DataSourceInstanceSettings } from '@grafana/data';
-import { toDataQueryResponse } from '@grafana/runtime';
-import { TemplateSrv } from 'app/features/templating/template_srv';
+import { TemplateSrv } from '@grafana/runtime';
 
 import { CloudWatchAnnotationQuery, CloudWatchJsonData, CloudWatchQuery } from '../types';
 
@@ -16,12 +15,12 @@ export class CloudWatchAnnotationQueryRunner extends CloudWatchRequest {
 
   handleAnnotationQuery(
     queries: CloudWatchAnnotationQuery[],
-    options: DataQueryRequest<CloudWatchQuery>
+    options: DataQueryRequest<CloudWatchQuery>,
+    queryFn: (request: DataQueryRequest<CloudWatchQuery>) => Observable<DataQueryResponse>
   ): Observable<DataQueryResponse> {
-    return this.awsRequest(this.dsQueryEndpoint, {
-      from: options.range.from.valueOf().toString(),
-      to: options.range.to.valueOf().toString(),
-      queries: queries.map((query) => ({
+    return queryFn({
+      ...options,
+      targets: queries.map((query) => ({
         ...query,
         statistic: this.templateSrv.replace(query.statistic),
         region: this.templateSrv.replace(this.getActualRegion(query.region)),
@@ -34,11 +33,6 @@ export class CloudWatchAnnotationQueryRunner extends CloudWatchRequest {
         type: 'annotationQuery',
         datasource: this.ref,
       })),
-    }).pipe(
-      map((r) => {
-        const frames = toDataQueryResponse(r).data;
-        return { data: frames };
-      })
-    );
+    });
   }
 }
diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.test.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.test.ts
index 85e6c23d0225d..47f683a214aba 100644
--- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.test.ts
+++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.test.ts
@@ -10,7 +10,6 @@ import {
   DataQueryRequest,
   LogRowContextQueryDirection,
 } from '@grafana/data';
-import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
 
 import {
   CloudWatchSettings,
@@ -26,6 +25,15 @@ import * as rxjsUtils from '../utils/rxjs/increasingInterval';
 
 import { LOG_IDENTIFIER_INTERNAL, LOGSTREAM_IDENTIFIER_INTERNAL } from './CloudWatchLogsQueryRunner';
 
+jest.mock('@grafana/data', () => ({
+  ...jest.requireActual('@grafana/data'),
+  getDefaultTimeRange: jest.fn().mockImplementation(() => {
+    const from = dateTime(1111);
+    const to = dateTime(2222);
+    return { from, to, raw: { from, to } };
+  }),
+}));
+
 describe('CloudWatchLogsQueryRunner', () => {
   beforeEach(() => {
     jest.clearAllMocks();
@@ -33,7 +41,7 @@ describe('CloudWatchLogsQueryRunner', () => {
 
   describe('getLogRowContext', () => {
     it('replaces parameters correctly in the query', async () => {
-      const { runner, fetchMock } = setupMockedLogsQueryRunner();
+      const { runner, queryMock } = setupMockedLogsQueryRunner();
       const row: LogRowModel = {
         entryFieldIndex: 0,
         rowIndex: 0,
@@ -58,17 +66,16 @@ describe('CloudWatchLogsQueryRunner', () => {
         timeUtc: '',
         uid: '1',
       };
-      await runner.getLogRowContext(row);
-      expect(fetchMock.mock.calls[0][0].data.queries[0].endTime).toBe(4);
-      expect(fetchMock.mock.calls[0][0].data.queries[0].region).toBe(undefined);
+      await runner.getLogRowContext(row, undefined, queryMock);
+      expect(queryMock.mock.calls[0][0].targets[0].endTime).toBe(4);
+      expect(queryMock.mock.calls[0][0].targets[0].region).toBe('');
 
-      await runner.getLogRowContext(
-        row,
-        { direction: LogRowContextQueryDirection.Forward },
-        { ...validLogsQuery, region: 'eu-east' }
-      );
-      expect(fetchMock.mock.calls[1][0].data.queries[0].startTime).toBe(4);
-      expect(fetchMock.mock.calls[1][0].data.queries[0].region).toBe('eu-east');
+      await runner.getLogRowContext(row, { direction: LogRowContextQueryDirection.Forward }, queryMock, {
+        ...validLogsQuery,
+        region: 'eu-east',
+      });
+      expect(queryMock.mock.calls[1][0].targets[0].startTime).toBe(4);
+      expect(queryMock.mock.calls[1][0].targets[0].region).toBe('eu-east');
     });
   });
 
@@ -78,10 +85,11 @@ describe('CloudWatchLogsQueryRunner', () => {
     });
 
     it('should stop querying when timed out', async () => {
-      const { runner } = setupMockedLogsQueryRunner();
+      const { runner, queryMock } = setupMockedLogsQueryRunner();
       const fakeFrames = genMockFrames(20);
-      const initialRecordsMatched = fakeFrames[0].meta!.stats!.find((stat) => stat.displayName === 'Records scanned')!
-        .value!;
+      const initialRecordsMatched = fakeFrames[0].meta!.stats!.find(
+        (stat) => stat.displayName === 'Records scanned'
+      )!.value!;
       for (let i = 1; i < 4; i++) {
         fakeFrames[i].meta!.stats = [
           {
@@ -91,8 +99,9 @@ describe('CloudWatchLogsQueryRunner', () => {
         ];
       }
 
-      const finalRecordsMatched = fakeFrames[9].meta!.stats!.find((stat) => stat.displayName === 'Records scanned')!
-        .value!;
+      const finalRecordsMatched = fakeFrames[9].meta!.stats!.find(
+        (stat) => stat.displayName === 'Records scanned'
+      )!.value!;
       for (let i = 10; i < fakeFrames.length; i++) {
         fakeFrames[i].meta!.stats = [
           {
@@ -119,7 +128,7 @@ describe('CloudWatchLogsQueryRunner', () => {
         return i >= iterations;
       };
       const myResponse = await lastValueFrom(
-        runner.logsQuery([{ queryId: 'fake-query-id', region: 'default', refId: 'A' }], timeoutFunc)
+        runner.logsQuery([{ queryId: 'fake-query-id', region: 'default', refId: 'A' }], timeoutFunc, queryMock)
       );
 
       const expectedData = [
@@ -147,7 +156,7 @@ describe('CloudWatchLogsQueryRunner', () => {
     });
 
     it('should continue querying as long as new data is being received', async () => {
-      const { runner } = setupMockedLogsQueryRunner();
+      const { runner, queryMock } = setupMockedLogsQueryRunner();
       const fakeFrames = genMockFrames(15);
 
       let i = 0;
@@ -166,7 +175,7 @@ describe('CloudWatchLogsQueryRunner', () => {
         return Date.now() >= startTime.valueOf() + 6000;
       };
       const myResponse = await lastValueFrom(
-        runner.logsQuery([{ queryId: 'fake-query-id', region: 'default', refId: 'A' }], timeoutFunc)
+        runner.logsQuery([{ queryId: 'fake-query-id', region: 'default', refId: 'A' }], timeoutFunc, queryMock)
       );
       expect(myResponse).toEqual({
         data: [fakeFrames[fakeFrames.length - 1]],
@@ -177,7 +186,7 @@ describe('CloudWatchLogsQueryRunner', () => {
     });
 
     it('should stop querying when results come back with status "Complete"', async () => {
-      const { runner } = setupMockedLogsQueryRunner();
+      const { runner, queryMock } = setupMockedLogsQueryRunner();
       const fakeFrames = genMockFrames(3);
       let i = 0;
       jest.spyOn(runner, 'makeLogActionRequest').mockImplementation((subtype: LogAction) => {
@@ -195,7 +204,7 @@ describe('CloudWatchLogsQueryRunner', () => {
         return Date.now() >= startTime.valueOf() + 6000;
       };
       const myResponse = await lastValueFrom(
-        runner.logsQuery([{ queryId: 'fake-query-id', region: 'default', refId: 'A' }], timeoutFunc)
+        runner.logsQuery([{ queryId: 'fake-query-id', region: 'default', refId: 'A' }], timeoutFunc, queryMock)
       );
 
       expect(myResponse).toEqual({
@@ -237,12 +246,12 @@ describe('CloudWatchLogsQueryRunner', () => {
     id: '',
     region: '$' + regionVariable.name,
     refId: 'A',
-    expression: `stats count(*) by queryType, bin($__interval)`,
+    expression: `stats count(*) by queryType, bin(20s)`,
   };
 
   describe('handleLogQueries', () => {
     it('should map log queries to start query requests correctly', async () => {
-      const { runner } = setupMockedLogsQueryRunner({
+      const { runner, queryMock } = setupMockedLogsQueryRunner({
         variables: [logGroupNamesVariable, regionVariable, limitVariable],
         settings: {
           ...CloudWatchSettings,
@@ -255,7 +264,11 @@ describe('CloudWatchLogsQueryRunner', () => {
       });
       const spy = jest.spyOn(runner, 'makeLogActionRequest');
       await lastValueFrom(
-        runner.handleLogQueries([legacyLogGroupNamesQuery, logGroupNamesQuery, logsScopedVarQuery], LogsRequestMock)
+        runner.handleLogQueries(
+          [legacyLogGroupNamesQuery, logGroupNamesQuery, logsScopedVarQuery],
+          LogsRequestMock,
+          queryMock
+        )
       );
       const startQueryRequests: StartQueryRequest[] = [
         {
@@ -286,39 +299,34 @@ describe('CloudWatchLogsQueryRunner', () => {
           region: regionVariable.current.value as string,
         },
       ];
-      expect(spy).toHaveBeenNthCalledWith(1, 'StartQuery', startQueryRequests, LogsRequestMock);
+      expect(spy).toHaveBeenNthCalledWith(1, 'StartQuery', startQueryRequests, queryMock, LogsRequestMock);
     });
   });
 
   describe('makeLogActionRequest', () => {
     it('should use the time range from the options if it is available', async () => {
-      const { runner } = setupMockedLogsQueryRunner();
-      const spy = jest.spyOn(runner, 'awsRequest');
+      const { runner, queryMock } = setupMockedLogsQueryRunner();
       const from = dateTime(0);
       const to = dateTime(1000);
       const options: DataQueryRequest<CloudWatchLogsQuery> = {
         ...LogsRequestMock,
         range: { from, to, raw: { from, to } },
       };
-      await lastValueFrom(runner.makeLogActionRequest('StartQuery', [genMockCloudWatchLogsRequest()], options));
-      expect(spy).toHaveBeenNthCalledWith(1, '/api/ds/query', expect.objectContaining({ from: '0', to: '1000' }), {
-        'X-Cache-Skip': 'true',
-      });
+      await lastValueFrom(
+        runner.makeLogActionRequest('StartQuery', [genMockCloudWatchLogsRequest()], queryMock, options)
+      );
+      expect(queryMock.mock.calls[0][0].skipQueryCache).toBe(true);
+      expect(queryMock.mock.calls[0][0]).toEqual(expect.objectContaining({ range: { from, to, raw: { from, to } } }));
     });
 
-    it('should use the time range from the timeSrv if the time range in the options is not available', async () => {
-      const timeSrv = getTimeSrv();
-      timeSrv.timeRange = jest.fn().mockReturnValue({
-        from: dateTime(1111),
-        to: dateTime(2222),
-        raw: { from: dateTime(1111), to: dateTime(2222) },
-      });
-      const { runner } = setupMockedLogsQueryRunner({ timeSrv });
-      const spy = jest.spyOn(runner, 'awsRequest');
-      await lastValueFrom(runner.makeLogActionRequest('StartQuery', [genMockCloudWatchLogsRequest()]));
-      expect(spy).toHaveBeenNthCalledWith(1, '/api/ds/query', expect.objectContaining({ from: '1111', to: '2222' }), {
-        'X-Cache-Skip': 'true',
-      });
+    it('should use the default time range if the time range in the options is not available', async () => {
+      const from = dateTime(1111);
+      const to = dateTime(2222);
+      const { runner, queryMock } = setupMockedLogsQueryRunner();
+      await lastValueFrom(runner.makeLogActionRequest('StartQuery', [genMockCloudWatchLogsRequest()], queryMock));
+
+      expect(queryMock.mock.calls[0][0].skipQueryCache).toBe(true);
+      expect(queryMock.mock.calls[0][0]).toEqual(expect.objectContaining({ range: { from, to, raw: { from, to } } }));
     });
   });
 });
diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.ts
index 6731c499e3b0b..2107bc02269d2 100644
--- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.ts
+++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.ts
@@ -8,6 +8,7 @@ import {
   map,
   mergeMap,
   Observable,
+  of,
   repeat,
   scan,
   share,
@@ -27,11 +28,10 @@ import {
   LogRowContextOptions,
   LogRowContextQueryDirection,
   LogRowModel,
+  getDefaultTimeRange,
   rangeUtil,
 } from '@grafana/data';
-import { BackendDataSourceResponse, config, FetchError, FetchResponse, toDataQueryResponse } from '@grafana/runtime';
-import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
-import { TemplateSrv } from 'app/features/templating/template_srv';
+import { config, FetchError, TemplateSrv } from '@grafana/runtime';
 
 import {
   CloudWatchJsonData,
@@ -60,17 +60,67 @@ export class CloudWatchLogsQueryRunner extends CloudWatchRequest {
   logQueries: Record<string, { id: string; region: string; statsQuery: boolean }> = {};
   tracingDataSourceUid?: string;
 
-  constructor(
-    instanceSettings: DataSourceInstanceSettings<CloudWatchJsonData>,
-    templateSrv: TemplateSrv,
-    private readonly timeSrv: TimeSrv
-  ) {
+  constructor(instanceSettings: DataSourceInstanceSettings<CloudWatchJsonData>, templateSrv: TemplateSrv) {
     super(instanceSettings, templateSrv);
 
     this.tracingDataSourceUid = instanceSettings.jsonData.tracingDatasourceUid;
     this.logsTimeout = instanceSettings.jsonData.logsTimeout || '30m';
   }
 
+  /**
+   * Check if the query is complete and returns results if it is. Otherwise it will poll for results.
+   */
+  getQueryResults = ({
+    frames,
+    error,
+    logQueries,
+    timeoutFunc,
+    queryFn,
+  }: {
+    frames: DataFrame[];
+    logQueries: CloudWatchLogsQuery[];
+    timeoutFunc: () => boolean;
+    queryFn: (request: DataQueryRequest<CloudWatchQuery>) => Observable<DataQueryResponse>;
+    error?: DataQueryError;
+  }) => {
+    // If every frame is already finished, we can return the result as the
+    // query was run synchronously. Otherwise, we return `this.logsQuery`
+    // which will poll for the results.
+    if (
+      frames.every((frame) =>
+        [
+          CloudWatchLogsQueryStatus.Complete,
+          CloudWatchLogsQueryStatus.Cancelled,
+          CloudWatchLogsQueryStatus.Failed,
+        ].includes(frame.meta?.custom?.['Status'])
+      )
+    ) {
+      return of({
+        data: frames,
+        key: 'test-key',
+        state: LoadingState.Done,
+      });
+    }
+
+    return this.logsQuery(
+      frames.map((dataFrame) => ({
+        queryId: dataFrame.fields[0].values[0],
+        region: dataFrame.meta?.custom?.['Region'] ?? 'default',
+        refId: dataFrame.refId!,
+        statsGroups: logQueries.find((target) => target.refId === dataFrame.refId)?.statsGroups,
+      })),
+      timeoutFunc,
+      queryFn
+    ).pipe(
+      map((response: DataQueryResponse) => {
+        if (!response.error && error) {
+          response.error = error;
+        }
+        return response;
+      })
+    );
+  };
+
   /**
    * Handle log query. The log query works by starting the query on the CloudWatch and then periodically polling for
    * results.
@@ -79,7 +129,8 @@ export class CloudWatchLogsQueryRunner extends CloudWatchRequest {
    */
   handleLogQueries = (
     logQueries: CloudWatchLogsQuery[],
-    options: DataQueryRequest<CloudWatchQuery>
+    options: DataQueryRequest<CloudWatchQuery>,
+    queryFn: (request: DataQueryRequest<CloudWatchQuery>) => Observable<DataQueryResponse>
   ): Observable<DataQueryResponse> => {
     const validLogQueries = logQueries.filter(this.filterQuery);
 
@@ -118,30 +169,14 @@ export class CloudWatchLogsQueryRunner extends CloudWatchRequest {
     };
 
     return runWithRetry(
-      (targets: StartQueryRequest[]) => {
-        return this.makeLogActionRequest('StartQuery', targets, options);
+      (targets) => {
+        return this.makeLogActionRequest('StartQuery', targets, queryFn, options);
       },
       startQueryRequests,
       timeoutFunc
     ).pipe(
       mergeMap(({ frames, error }: { frames: DataFrame[]; error?: DataQueryError }) =>
-        // This queries for the results
-        this.logsQuery(
-          frames.map((dataFrame) => ({
-            queryId: dataFrame.fields[0].values[0],
-            region: dataFrame.meta?.custom?.['Region'] ?? 'default',
-            refId: dataFrame.refId!,
-            statsGroups: logQueries.find((target) => target.refId === dataFrame.refId)?.statsGroups,
-          })),
-          timeoutFunc
-        ).pipe(
-          map((response: DataQueryResponse) => {
-            if (!response.error && error) {
-              response.error = error;
-            }
-            return response;
-          })
-        )
+        this.getQueryResults({ frames, logQueries, timeoutFunc, error, queryFn })
       ),
       mergeMap((dataQueryResponse) => {
         return from(
@@ -149,7 +184,6 @@ export class CloudWatchLogsQueryRunner extends CloudWatchRequest {
             await addDataLinksToLogsResponse(
               dataQueryResponse,
               options,
-              this.timeSrv.timeRange(),
               this.replaceVariableAndDisplayWarningIfMulti.bind(this),
               this.expandVariableToArray.bind(this),
               this.getActualRegion.bind(this),
@@ -167,7 +201,11 @@ export class CloudWatchLogsQueryRunner extends CloudWatchRequest {
    * Checks progress and polls data of a started logs query with some retry logic.
    * @param queryParams
    */
-  logsQuery(queryParams: QueryParam[], timeoutFunc: () => boolean): Observable<DataQueryResponse> {
+  logsQuery(
+    queryParams: QueryParam[],
+    timeoutFunc: () => boolean,
+    queryFn: (request: DataQueryRequest<CloudWatchQuery>) => Observable<DataQueryResponse>
+  ): Observable<DataQueryResponse> {
     this.logQueries = {};
     queryParams.forEach((param) => {
       this.logQueries[param.refId] = {
@@ -178,7 +216,7 @@ export class CloudWatchLogsQueryRunner extends CloudWatchRequest {
     });
 
     const dataFrames = increasingInterval({ startPeriod: 100, endPeriod: 1000, step: 300 }).pipe(
-      concatMap((_) => this.makeLogActionRequest('GetQueryResults', queryParams)),
+      concatMap((_) => this.makeLogActionRequest('GetQueryResults', queryParams, queryFn)),
       repeat(),
       share()
     );
@@ -249,10 +287,10 @@ export class CloudWatchLogsQueryRunner extends CloudWatchRequest {
       takeWhile(({ state }) => state !== LoadingState.Error && state !== LoadingState.Done, true)
     );
 
-    return withTeardown(queryResponse, () => this.stopQueries());
+    return withTeardown(queryResponse, () => this.stopQueries(queryFn));
   }
 
-  stopQueries() {
+  stopQueries(queryFn: (request: DataQueryRequest<CloudWatchQuery>) => Observable<DataQueryResponse>) {
     if (Object.keys(this.logQueries).length > 0) {
       this.makeLogActionRequest(
         'StopQuery',
@@ -261,7 +299,8 @@ export class CloudWatchLogsQueryRunner extends CloudWatchRequest {
           region: logQuery.region,
           queryString: '',
           refId: '',
-        }))
+        })),
+        queryFn
       ).pipe(
         finalize(() => {
           this.logQueries = {};
@@ -273,36 +312,37 @@ export class CloudWatchLogsQueryRunner extends CloudWatchRequest {
   makeLogActionRequest(
     subtype: LogAction,
     queryParams: CloudWatchLogsRequest[],
+    queryFn: (request: DataQueryRequest<CloudWatchQuery>) => Observable<DataQueryResponse>,
     options?: DataQueryRequest<CloudWatchQuery>
   ): Observable<DataFrame[]> {
-    const range = options?.range || this.timeSrv.timeRange();
-
-    const requestParams = {
-      from: range.from.valueOf().toString(),
-      to: range.to.valueOf().toString(),
-      queries: queryParams.map((param: CloudWatchLogsRequest) => ({
-        // eslint-ignore-next-line
-        refId: (param as StartQueryRequest).refId || 'A',
+    const range = options?.range || getDefaultTimeRange();
+
+    const requestParams: DataQueryRequest<CloudWatchLogsQuery> = {
+      ...options,
+      range,
+      skipQueryCache: true,
+      requestId: options?.requestId || '', // dummy
+      interval: options?.interval || '', // dummy
+      intervalMs: options?.intervalMs || 1, // dummy
+      scopedVars: options?.scopedVars || {}, // dummy
+      timezone: options?.timezone || '', // dummy
+      app: options?.app || '', // dummy
+      startTime: options?.startTime || 0, // dummy
+      targets: queryParams.map((param) => ({
+        ...param,
+        id: '',
+        queryMode: 'Logs',
+        refId: param.refId || 'A',
         intervalMs: 1, // dummy
         maxDataPoints: 1, // dummy
         datasource: this.ref,
         type: 'logAction',
         subtype: subtype,
-        ...param,
       })),
     };
 
-    const resultsToDataFrames = (
-      val:
-        | { data: BackendDataSourceResponse | undefined }
-        | FetchResponse<BackendDataSourceResponse | undefined>
-        | DataQueryError
-    ): DataFrame[] => toDataQueryResponse(val).data || [];
-
-    return this.awsRequest(this.dsQueryEndpoint, requestParams, {
-      'X-Cache-Skip': 'true',
-    }).pipe(
-      map((response) => resultsToDataFrames(response)),
+    return queryFn(requestParams).pipe(
+      map((response) => response.data),
       catchError((err: FetchError) => {
         if (config.featureToggles.datasourceQueryMultiStatus && err.status === 207) {
           throw err;
@@ -327,6 +367,7 @@ export class CloudWatchLogsQueryRunner extends CloudWatchRequest {
   getLogRowContext = async (
     row: LogRowModel,
     { limit = 10, direction = LogRowContextQueryDirection.Backward }: LogRowContextOptions = {},
+    queryFn: (request: DataQueryRequest<CloudWatchQuery>) => Observable<DataQueryResponse>,
     query?: CloudWatchLogsQuery
   ): Promise<{ data: DataFrame[] }> => {
     let logStreamField = null;
@@ -347,9 +388,10 @@ export class CloudWatchLogsQueryRunner extends CloudWatchRequest {
     }
 
     const requestParams: GetLogEventsRequest = {
+      refId: query?.refId || 'A', // dummy
       limit,
       startFromHead: direction !== LogRowContextQueryDirection.Backward,
-      region: query?.region,
+      region: query?.region || '',
       logGroupName: parseLogGroupName(logField!.values[row.rowIndex]),
       logStreamName: logStreamField!.values[row.rowIndex],
     };
@@ -360,7 +402,7 @@ export class CloudWatchLogsQueryRunner extends CloudWatchRequest {
       requestParams.startTime = row.timeEpochMs;
     }
 
-    const dataFrames = await lastValueFrom(this.makeLogActionRequest('GetLogEvents', [requestParams]));
+    const dataFrames = await lastValueFrom(this.makeLogActionRequest('GetLogEvents', [requestParams], queryFn));
 
     return {
       data: dataFrames,
diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.test.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.test.ts
index eee83e90deee1..0ac0bedbc3ec5 100644
--- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.test.ts
+++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.test.ts
@@ -2,9 +2,7 @@ import { of } from 'rxjs';
 
 import { CustomVariableModel, getFrameDisplayName, VariableHide } from '@grafana/data';
 import { dateTime } from '@grafana/data/src/datetime/moment_wrapper';
-import { BackendDataSourceResponse } from '@grafana/runtime';
-import { initialVariableModelState } from 'app/features/variables/types';
-import * as redux from 'app/store/store';
+import { toDataQueryResponse } from '@grafana/runtime';
 
 import {
   namespaceVariable,
@@ -15,32 +13,47 @@ import {
   periodIntervalVariable,
   accountIdVariable,
 } from '../__mocks__/CloudWatchDataSource';
+import { initialVariableModelState } from '../__mocks__/CloudWatchVariables';
 import { setupMockedMetricsQueryRunner } from '../__mocks__/MetricsQueryRunner';
-import { validMetricSearchBuilderQuery } from '../__mocks__/queries';
-import { MetricQueryType, MetricEditorMode, CloudWatchMetricsQuery, DataQueryError } from '../types';
+import { validMetricSearchBuilderQuery, validMetricSearchCodeQuery } from '../__mocks__/queries';
+import { MetricQueryType, MetricEditorMode, CloudWatchMetricsQuery } from '../types';
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getAppEvents: () => ({
+    publish: jest.fn(),
+  }),
+}));
 
 describe('CloudWatchMetricsQueryRunner', () => {
   describe('performTimeSeriesQuery', () => {
     it('should return the same length of data as result', async () => {
-      const { runner, timeRange } = setupMockedMetricsQueryRunner({
+      const resultsFromBEQuery = {
         data: {
           results: {
-            a: { refId: 'a', series: [{ target: 'cpu', datapoints: [[1, 1]] }] },
-            b: { refId: 'b', series: [{ target: 'memory', datapoints: [[2, 2]] }] },
+            a: {
+              refId: 'a',
+              series: [{ target: 'cpu', datapoints: [[1, 2]], meta: { custom: { period: 60 } } }],
+            },
+            b: {
+              refId: 'b',
+              series: [{ target: 'cpu', datapoints: [[1, 2]], meta: { custom: { period: 120 } } }],
+            },
           },
         },
+      };
+      const { runner, timeRange, request, queryMock } = setupMockedMetricsQueryRunner({
+        // DataSourceWithBackend runs toDataQueryResponse({response from CW backend})
+        response: toDataQueryResponse(resultsFromBEQuery),
       });
 
       const observable = runner.performTimeSeriesQuery(
         {
-          queries: [
-            { datasourceId: 1, refId: 'a' },
-            { datasourceId: 1, refId: 'b' },
-          ],
-          from: '',
-          to: '',
+          ...request,
+          targets: [validMetricSearchCodeQuery, validMetricSearchCodeQuery],
+          range: timeRange,
         },
-        timeRange
+        queryMock
       );
 
       await expect(observable).toEmitValuesWith((received) => {
@@ -50,7 +63,7 @@ describe('CloudWatchMetricsQueryRunner', () => {
     });
 
     it('sets fields.config.interval based on period', async () => {
-      const { runner, timeRange } = setupMockedMetricsQueryRunner({
+      const resultsFromBEQuery = {
         data: {
           results: {
             a: {
@@ -63,15 +76,19 @@ describe('CloudWatchMetricsQueryRunner', () => {
             },
           },
         },
+      };
+      const { runner, timeRange, request, queryMock } = setupMockedMetricsQueryRunner({
+        // DataSourceWithBackend runs toDataQueryResponse({response from CW backend})
+        response: toDataQueryResponse(resultsFromBEQuery),
       });
 
       const observable = runner.performTimeSeriesQuery(
         {
-          queries: [{ datasourceId: 1, refId: 'a' }],
-          from: '',
-          to: '',
+          ...request,
+          targets: [validMetricSearchCodeQuery, validMetricSearchCodeQuery],
+          range: timeRange,
         },
-        timeRange
+        queryMock
       );
 
       await expect(observable).toEmitValuesWith((received) => {
@@ -81,6 +98,68 @@ describe('CloudWatchMetricsQueryRunner', () => {
       });
     });
 
+    it('should enrich the error message for throttling errors', async () => {
+      const partialQuery: CloudWatchMetricsQuery = {
+        metricQueryType: MetricQueryType.Search,
+        metricEditorMode: MetricEditorMode.Builder,
+        queryMode: 'Metrics',
+        namespace: 'AWS/EC2',
+        metricName: 'CPUUtilization',
+        dimensions: {
+          InstanceId: 'i-12345678',
+        },
+        statistic: 'Average',
+        period: '300',
+        expression: '',
+        id: '',
+        region: '',
+        refId: '',
+      };
+
+      const queries: CloudWatchMetricsQuery[] = [
+        { ...partialQuery, refId: 'A', region: 'us-east-1' },
+        { ...partialQuery, refId: 'B', region: 'us-east-2' },
+      ];
+
+      const dataWithThrottlingError = {
+        data: {
+          message: 'Throttling: exception',
+          results: {
+            A: {
+              frames: [],
+              series: [],
+              tables: [],
+              error: 'Throttling: exception',
+              refId: 'A',
+              meta: {},
+            },
+            B: {
+              frames: [],
+              series: [],
+              tables: [],
+              error: 'Throttling: exception',
+              refId: 'B',
+              meta: {},
+            },
+          },
+        },
+      };
+      const expectedUsEast1Message =
+        'Please visit the AWS Service Quotas console at https://us-east-1.console.aws.amazon.com/servicequotas/home?region=us-east-1#!/services/monitoring/quotas/L-5E141212 to request a quota increase or see our documentation at https://grafana.com/docs/grafana/latest/datasources/cloudwatch/#manage-service-quotas to learn more. Throttling: exception';
+      const expectedUsEast2Message =
+        'Please visit the AWS Service Quotas console at https://us-east-2.console.aws.amazon.com/servicequotas/home?region=us-east-2#!/services/monitoring/quotas/L-5E141212 to request a quota increase or see our documentation at https://grafana.com/docs/grafana/latest/datasources/cloudwatch/#manage-service-quotas to learn more. Throttling: exception';
+
+      const { runner, request, queryMock } = setupMockedMetricsQueryRunner({
+        response: toDataQueryResponse(dataWithThrottlingError),
+      });
+
+      await expect(runner.handleMetricQueries(queries, request, queryMock)).toEmitValuesWith((received) => {
+        expect(received[0].errors).toHaveLength(2);
+        expect(received[0]?.errors?.[0].message).toEqual(expectedUsEast1Message);
+        expect(received[0]?.errors?.[1].message).toEqual(expectedUsEast2Message);
+      });
+    });
+
     describe('When performing CloudWatch metrics query', () => {
       const queries: CloudWatchMetricsQuery[] = [
         {
@@ -101,34 +180,39 @@ describe('CloudWatchMetricsQueryRunner', () => {
         },
       ];
 
-      const data: BackendDataSourceResponse = {
-        results: {
-          A: {
-            tables: [],
-            error: '',
-            refId: 'A',
-            series: [
-              {
-                target: 'CPUUtilization_Average',
-                datapoints: [
-                  [1, 1483228800000],
-                  [2, 1483229100000],
-                  [5, 1483229700000],
-                ],
-                tags: {
-                  InstanceId: 'i-12345678',
+      const resultsFromBEQuery = {
+        data: {
+          results: {
+            A: {
+              tables: [],
+              error: '',
+              refId: 'A',
+              series: [
+                {
+                  target: 'CPUUtilization_Average',
+                  datapoints: [
+                    [1, 1483228800000],
+                    [2, 1483229100000],
+                    [5, 1483229700000],
+                  ],
+                  tags: {
+                    InstanceId: 'i-12345678',
+                  },
                 },
-              },
-            ],
+              ],
+            },
           },
         },
       };
 
       it('should generate the correct query', async () => {
-        const { runner, fetchMock, request } = setupMockedMetricsQueryRunner({ data });
+        const { runner, queryMock, request } = setupMockedMetricsQueryRunner({
+          // DataSourceWithBackend runs toDataQueryResponse({response from CW backend})
+          response: toDataQueryResponse(resultsFromBEQuery),
+        });
 
-        await expect(runner.handleMetricQueries(queries, request)).toEmitValuesWith(() => {
-          expect(fetchMock.mock.calls[0][0].data.queries).toMatchObject(
+        await expect(runner.handleMetricQueries(queries, request, queryMock)).toEmitValuesWith(() => {
+          expect(queryMock.mock.calls[0][0].targets).toMatchObject(
             expect.arrayContaining([
               expect.objectContaining({
                 namespace: queries[0].namespace,
@@ -161,121 +245,116 @@ describe('CloudWatchMetricsQueryRunner', () => {
           },
         ];
 
-        const { runner, fetchMock, request } = setupMockedMetricsQueryRunner({
-          data,
+        const { runner, queryMock, request } = setupMockedMetricsQueryRunner({
+          // DataSourceWithBackend runs toDataQueryResponse({response from CW backend})
+          response: toDataQueryResponse(resultsFromBEQuery),
           variables: [periodIntervalVariable],
         });
 
-        await expect(runner.handleMetricQueries(queries, request)).toEmitValuesWith(() => {
-          expect(fetchMock.mock.calls[0][0].data.queries[0].period).toEqual('600');
+        await expect(runner.handleMetricQueries(queries, request, queryMock)).toEmitValuesWith(() => {
+          expect(queryMock.mock.calls[0][0].targets[0].period).toEqual('600');
         });
       });
 
       it('should return series list', async () => {
-        const { runner, request } = setupMockedMetricsQueryRunner({ data });
+        const { runner, request, queryMock } = setupMockedMetricsQueryRunner({
+          // DataSourceWithBackend runs toDataQueryResponse({response from CW backend})
+          response: toDataQueryResponse(resultsFromBEQuery),
+        });
 
-        await expect(runner.handleMetricQueries(queries, request)).toEmitValuesWith((received) => {
+        await expect(runner.handleMetricQueries(queries, request, queryMock)).toEmitValuesWith((received) => {
           const result = received[0];
-          expect(getFrameDisplayName(result.data[0])).toBe(
-            data.results.A.series?.length && data.results.A.series[0].target
-          );
-          expect(result.data[0].fields[1].values[0]).toBe(
-            data.results.A.series?.length && data.results.A.series[0].datapoints[0][0]
-          );
+          expect(getFrameDisplayName(result.data[0])).toBe('CPUUtilization_Average');
+          expect(result.data[0].fields[1].values[0]).toBe(1);
         });
       });
+    });
+    describe('and throttling exception is thrown', () => {
+      const partialQuery: CloudWatchMetricsQuery = {
+        metricQueryType: MetricQueryType.Search,
+        metricEditorMode: MetricEditorMode.Builder,
+        queryMode: 'Metrics',
+        namespace: 'AWS/EC2',
+        metricName: 'CPUUtilization',
+        dimensions: {
+          InstanceId: 'i-12345678',
+        },
+        statistic: 'Average',
+        period: '300',
+        expression: '',
+        id: '',
+        region: '',
+        refId: '',
+      };
 
-      describe('and throttling exception is thrown', () => {
-        const partialQuery: CloudWatchMetricsQuery = {
-          metricQueryType: MetricQueryType.Search,
-          metricEditorMode: MetricEditorMode.Builder,
-          queryMode: 'Metrics',
-          namespace: 'AWS/EC2',
-          metricName: 'CPUUtilization',
-          dimensions: {
-            InstanceId: 'i-12345678',
-          },
-          statistic: 'Average',
-          period: '300',
-          expression: '',
-          id: '',
-          region: '',
-          refId: '',
-        };
-
-        const queries: CloudWatchMetricsQuery[] = [
-          { ...partialQuery, refId: 'A', region: 'us-east-1' },
-          { ...partialQuery, refId: 'B', region: 'us-east-2' },
-          { ...partialQuery, refId: 'C', region: 'us-east-1' },
-          { ...partialQuery, refId: 'D', region: 'us-east-2' },
-          { ...partialQuery, refId: 'E', region: 'eu-north-1' },
-        ];
+      const queries: CloudWatchMetricsQuery[] = [
+        { ...partialQuery, refId: 'A', region: 'us-east-1' },
+        { ...partialQuery, refId: 'B', region: 'us-east-2' },
+        { ...partialQuery, refId: 'C', region: 'us-east-1' },
+        { ...partialQuery, refId: 'D', region: 'us-east-2' },
+        { ...partialQuery, refId: 'E', region: 'eu-north-1' },
+      ];
 
-        const backendErrorResponse: DataQueryError<CloudWatchMetricsQuery> = {
-          data: {
-            message: 'Throttling: exception',
-            results: {
-              A: {
-                frames: [],
-                series: [],
-                tables: [],
-                error: 'Throttling: exception',
-                refId: 'A',
-                meta: {},
-              },
-              B: {
-                frames: [],
-                series: [],
-                tables: [],
-                error: 'Throttling: exception',
-                refId: 'B',
-                meta: {},
-              },
-              C: {
-                frames: [],
-                series: [],
-                tables: [],
-                error: 'Throttling: exception',
-                refId: 'C',
-                meta: {},
-              },
-              D: {
-                frames: [],
-                series: [],
-                tables: [],
-                error: 'Throttling: exception',
-                refId: 'D',
-                meta: {},
-              },
-              E: {
-                frames: [],
-                series: [],
-                tables: [],
-                error: 'Throttling: exception',
-                refId: 'E',
-                meta: {},
-              },
+      const dataWithThrottlingError = {
+        data: {
+          message: 'Throttling: exception',
+          results: {
+            A: {
+              frames: [],
+              series: [],
+              tables: [],
+              error: 'Throttling: exception',
+              refId: 'A',
+              meta: {},
+            },
+            B: {
+              frames: [],
+              series: [],
+              tables: [],
+              error: 'Throttling: exception',
+              refId: 'B',
+              meta: {},
+            },
+            C: {
+              frames: [],
+              series: [],
+              tables: [],
+              error: 'Throttling: exception',
+              refId: 'C',
+              meta: {},
+            },
+            D: {
+              frames: [],
+              series: [],
+              tables: [],
+              error: 'Throttling: exception',
+              refId: 'D',
+              meta: {},
+            },
+            E: {
+              frames: [],
+              series: [],
+              tables: [],
+              error: 'Throttling: exception',
+              refId: 'E',
+              meta: {},
             },
           },
-        };
+        },
+      };
 
-        beforeEach(() => {
-          redux.setStore({
-            ...redux.store,
-            dispatch: jest.fn(),
-          });
+      it('should display one alert error message per region+datasource combination', async () => {
+        const { runner, request, queryMock } = setupMockedMetricsQueryRunner({
+          response: toDataQueryResponse(dataWithThrottlingError),
         });
-
-        it('should display one alert error message per region+datasource combination', async () => {
-          const { runner, request } = setupMockedMetricsQueryRunner({ data: backendErrorResponse, throws: true });
-          const memoizedDebounceSpy = jest.spyOn(runner, 'debouncedAlert');
-
-          await expect(runner.handleMetricQueries(queries, request)).toEmitValuesWith(() => {
-            expect(memoizedDebounceSpy).toHaveBeenCalledWith('CloudWatch Test Datasource', 'us-east-1');
-            expect(memoizedDebounceSpy).toHaveBeenCalledWith('CloudWatch Test Datasource', 'us-east-2');
-            expect(memoizedDebounceSpy).toHaveBeenCalledWith('CloudWatch Test Datasource', 'eu-north-1');
-            expect(memoizedDebounceSpy).toBeCalledTimes(3);
-          });
+        const memoizedDebounceSpy = jest.spyOn(runner, 'debouncedThrottlingAlert');
+
+        await expect(runner.handleMetricQueries(queries, request, queryMock)).toEmitValuesWith((received) => {
+          expect(received[0].errors).toHaveLength(5);
+          expect(memoizedDebounceSpy).toHaveBeenCalledWith('CloudWatch Test Datasource', 'us-east-1');
+          expect(memoizedDebounceSpy).toHaveBeenCalledWith('CloudWatch Test Datasource', 'us-east-2');
+          expect(memoizedDebounceSpy).toHaveBeenCalledWith('CloudWatch Test Datasource', 'eu-north-1');
+          expect(memoizedDebounceSpy).toBeCalledTimes(3);
         });
       });
     });
@@ -301,43 +380,80 @@ describe('CloudWatchMetricsQueryRunner', () => {
       },
     ];
 
-    const data: BackendDataSourceResponse = {
-      results: {
-        A: {
-          tables: [],
-          error: '',
-          refId: 'A',
-          series: [
-            {
-              target: 'TargetResponseTime_p90.00',
-              datapoints: [
-                [1, 1483228800000],
-                [2, 1483229100000],
-                [5, 1483229700000],
-              ],
-              tags: {
-                LoadBalancer: 'lb',
-                TargetGroup: 'tg',
+    const responseFromBEQuery = {
+      data: {
+        results: {
+          A: {
+            tables: [],
+            error: '',
+            refId: 'A',
+            series: [
+              {
+                target: 'TargetResponseTime_p90.00',
+                datapoints: [
+                  [1, 1483228800000],
+                  [2, 1483229100000],
+                  [5, 1483229700000],
+                ],
+                tags: {
+                  LoadBalancer: 'lb',
+                  TargetGroup: 'tg',
+                },
               },
-            },
-          ],
+            ],
+          },
         },
       },
     };
 
     it('should return series list', async () => {
-      const { runner, request } = setupMockedMetricsQueryRunner({ data });
+      const { runner, request, queryMock } = setupMockedMetricsQueryRunner({
+        // DataSourceWithBackend runs toDataQueryResponse({response from CW backend})
+        response: toDataQueryResponse(responseFromBEQuery),
+      });
 
-      await expect(runner.handleMetricQueries(queries, request)).toEmitValuesWith((received) => {
+      await expect(runner.handleMetricQueries(queries, request, queryMock)).toEmitValuesWith((received) => {
         const result = received[0];
         expect(getFrameDisplayName(result.data[0])).toBe(
-          data.results.A.series?.length && data.results.A.series[0].target
+          responseFromBEQuery.data.results.A.series?.length && responseFromBEQuery.data.results.A.series[0].target
         );
         expect(result.data[0].fields[1].values[0]).toBe(
-          data.results.A.series?.length && data.results.A.series[0].datapoints[0][0]
+          responseFromBEQuery.data.results.A.series?.length &&
+            responseFromBEQuery.data.results.A.series[0].datapoints[0][0]
         );
       });
     });
+    it('should pass the error list from DatasourceWithBackend srv', async () => {
+      const dataWithError = {
+        data: {
+          results: {
+            A: {
+              error:
+                "metric request error: \"ValidationError: Error in expression 'query': Invalid syntax\\n\\tstatus code: 400",
+              status: 500,
+            },
+          },
+        },
+        status: 500,
+        statusText: 'Internal Server Error',
+      };
+      const { runner, request, queryMock } = setupMockedMetricsQueryRunner({
+        // DataSourceWithBackend runs toDataQueryResponse({response from CW backend})
+        response: toDataQueryResponse(dataWithError),
+      });
+      await expect(runner.handleMetricQueries(queries, request, queryMock)).toEmitValuesWith((received) => {
+        const result = received[0];
+        expect(result.data).toEqual([]);
+        expect(result.errors).toEqual([
+          {
+            message:
+              "metric request error: \"ValidationError: Error in expression 'query': Invalid syntax\\n\\tstatus code: 400",
+            status: 500,
+            refId: 'A',
+          },
+        ]);
+      });
+    });
   });
 
   describe('template variable interpolation', () => {
@@ -360,8 +476,8 @@ describe('CloudWatchMetricsQueryRunner', () => {
     });
 
     it('interpolates variables correctly', async () => {
-      const { runner, fetchMock, request } = setupMockedMetricsQueryRunner({
-        variables: [namespaceVariable, metricVariable, labelsVariable, limitVariable],
+      const { runner, queryMock, request } = setupMockedMetricsQueryRunner({
+        variables: [namespaceVariable, metricVariable, limitVariable],
       });
       runner.handleMetricQueries(
         [
@@ -379,20 +495,19 @@ describe('CloudWatchMetricsQueryRunner', () => {
             expression: '',
             metricQueryType: MetricQueryType.Query,
             metricEditorMode: MetricEditorMode.Code,
-            sqlExpression: 'SELECT SUM($metric) FROM "$namespace" GROUP BY ${labels:raw} LIMIT $limit',
+            sqlExpression: 'SELECT SUM($metric) FROM "$namespace" GROUP BY InstanceId,InstanceType LIMIT $limit',
           },
         ],
-        request
+        request,
+        queryMock
       );
-      expect(fetchMock).toHaveBeenCalledWith(
+      expect(queryMock).toHaveBeenCalledWith(
         expect.objectContaining({
-          data: expect.objectContaining({
-            queries: expect.arrayContaining([
-              expect.objectContaining({
-                sqlExpression: `SELECT SUM(CPUUtilization) FROM "AWS/EC2" GROUP BY InstanceId,InstanceType LIMIT 100`,
-              }),
-            ]),
-          }),
+          targets: expect.arrayContaining([
+            expect.objectContaining({
+              sqlExpression: `SELECT SUM(CPUUtilization) FROM "AWS/EC2" GROUP BY InstanceId,InstanceType LIMIT 100`,
+            }),
+          ]),
         })
       );
     });
@@ -464,7 +579,7 @@ describe('CloudWatchMetricsQueryRunner', () => {
       };
 
       it('should generate the correct query for single template variable', async () => {
-        const { runner, fetchMock, request } = setupMockedMetricsQueryRunner({ variables: [var1, var2, var3, var4] });
+        const { runner, queryMock, request } = setupMockedMetricsQueryRunner({ variables: [var1, var2, var3, var4] });
         const queries: CloudWatchMetricsQuery[] = [
           {
             id: '',
@@ -482,13 +597,13 @@ describe('CloudWatchMetricsQueryRunner', () => {
             period: '300s',
           },
         ];
-        await expect(runner.handleMetricQueries(queries, request)).toEmitValuesWith(() => {
-          expect(fetchMock.mock.calls[0][0].data.queries[0].dimensions['dim2']).toStrictEqual(['var2-foo']);
+        await expect(runner.handleMetricQueries(queries, request, queryMock)).toEmitValuesWith(() => {
+          expect(queryMock.mock.calls[0][0].targets[0].dimensions['dim2']).toStrictEqual(['var2-foo']);
         });
       });
 
       it('should generate the correct query in the case of one multiple template variables', async () => {
-        const { runner, fetchMock, request } = setupMockedMetricsQueryRunner({ variables: [var1, var2, var3, var4] });
+        const { runner, queryMock, request } = setupMockedMetricsQueryRunner({ variables: [var1, var2, var3, var4] });
         const queries: CloudWatchMetricsQuery[] = [
           {
             id: '',
@@ -510,22 +625,26 @@ describe('CloudWatchMetricsQueryRunner', () => {
         ];
 
         await expect(
-          runner.handleMetricQueries(queries, {
-            ...request,
-            scopedVars: {
-              var1: { value: 'var1-foo', text: '' },
-              var2: { value: 'var2-foo', text: '' },
+          runner.handleMetricQueries(
+            queries,
+            {
+              ...request,
+              scopedVars: {
+                var1: { value: 'var1-foo', text: '' },
+                var2: { value: 'var2-foo', text: '' },
+              },
             },
-          })
+            queryMock
+          )
         ).toEmitValuesWith(() => {
-          expect(fetchMock.mock.calls[0][0].data.queries[0].dimensions['dim1']).toStrictEqual(['var1-foo']);
-          expect(fetchMock.mock.calls[0][0].data.queries[0].dimensions['dim2']).toStrictEqual(['var2-foo']);
-          expect(fetchMock.mock.calls[0][0].data.queries[0].dimensions['dim3']).toStrictEqual(['var3-foo', 'var3-baz']);
+          expect(queryMock.mock.calls[0][0].targets[0].dimensions['dim1']).toStrictEqual(['var1-foo']);
+          expect(queryMock.mock.calls[0][0].targets[0].dimensions['dim2']).toStrictEqual(['var2-foo']);
+          expect(queryMock.mock.calls[0][0].targets[0].dimensions['dim3']).toStrictEqual(['var3-foo', 'var3-baz']);
         });
       });
 
       it('should generate the correct query in the case of multiple multi template variables', async () => {
-        const { runner, fetchMock, request } = setupMockedMetricsQueryRunner({ variables: [var1, var2, var3, var4] });
+        const { runner, queryMock, request } = setupMockedMetricsQueryRunner({ variables: [var1, var2, var3, var4] });
         const queries: CloudWatchMetricsQuery[] = [
           {
             id: '',
@@ -546,15 +665,15 @@ describe('CloudWatchMetricsQueryRunner', () => {
           },
         ];
 
-        await expect(runner.handleMetricQueries(queries, request)).toEmitValuesWith(() => {
-          expect(fetchMock.mock.calls[0][0].data.queries[0].dimensions['dim1']).toStrictEqual(['var1-foo']);
-          expect(fetchMock.mock.calls[0][0].data.queries[0].dimensions['dim3']).toStrictEqual(['var3-foo', 'var3-baz']);
-          expect(fetchMock.mock.calls[0][0].data.queries[0].dimensions['dim4']).toStrictEqual(['var4-foo', 'var4-baz']);
+        await expect(runner.handleMetricQueries(queries, request, queryMock)).toEmitValuesWith(() => {
+          expect(queryMock.mock.calls[0][0].targets[0].dimensions['dim1']).toStrictEqual(['var1-foo']);
+          expect(queryMock.mock.calls[0][0].targets[0].dimensions['dim3']).toStrictEqual(['var3-foo', 'var3-baz']);
+          expect(queryMock.mock.calls[0][0].targets[0].dimensions['dim4']).toStrictEqual(['var4-foo', 'var4-baz']);
         });
       });
 
       it('should generate the correct query for multiple template variables, lack scopedVars', async () => {
-        const { runner, fetchMock, request } = setupMockedMetricsQueryRunner({ variables: [var1, var2, var3, var4] });
+        const { runner, queryMock, request } = setupMockedMetricsQueryRunner({ variables: [var1, var2, var3, var4] });
         const queries: CloudWatchMetricsQuery[] = [
           {
             id: '',
@@ -576,16 +695,20 @@ describe('CloudWatchMetricsQueryRunner', () => {
         ];
 
         await expect(
-          runner.handleMetricQueries(queries, {
-            ...request,
-            scopedVars: {
-              var1: { value: 'var1-foo', text: '' },
+          runner.handleMetricQueries(
+            queries,
+            {
+              ...request,
+              scopedVars: {
+                var1: { value: 'var1-foo', text: '' },
+              },
             },
-          })
+            queryMock
+          )
         ).toEmitValuesWith(() => {
-          expect(fetchMock.mock.calls[0][0].data.queries[0].dimensions['dim1']).toStrictEqual(['var1-foo']);
-          expect(fetchMock.mock.calls[0][0].data.queries[0].dimensions['dim2']).toStrictEqual(['var2-foo']);
-          expect(fetchMock.mock.calls[0][0].data.queries[0].dimensions['dim3']).toStrictEqual(['var3-foo', 'var3-baz']);
+          expect(queryMock.mock.calls[0][0].targets[0].dimensions['dim1']).toStrictEqual(['var1-foo']);
+          expect(queryMock.mock.calls[0][0].targets[0].dimensions['dim2']).toStrictEqual(['var2-foo']);
+          expect(queryMock.mock.calls[0][0].targets[0].dimensions['dim3']).toStrictEqual(['var3-foo', 'var3-baz']);
         });
       });
     });
@@ -622,22 +745,24 @@ describe('CloudWatchMetricsQueryRunner', () => {
       ['UTC', '+0000'],
     ];
     test.each(testTable)('should use the right time zone offset', (ianaTimezone, expectedOffset) => {
-      const { runner, fetchMock, request } = setupMockedMetricsQueryRunner();
-      runner.handleMetricQueries([testQuery], {
-        ...request,
-        range: { ...request.range, from: dateTime(), to: dateTime() },
-        timezone: ianaTimezone,
-      });
+      const { runner, queryMock, request } = setupMockedMetricsQueryRunner();
+      runner.handleMetricQueries(
+        [testQuery],
+        {
+          ...request,
+          range: { ...request.range, from: dateTime(), to: dateTime() },
+          timezone: ianaTimezone,
+        },
+        queryMock
+      );
 
-      expect(fetchMock).toHaveBeenCalledWith(
+      expect(queryMock).toHaveBeenCalledWith(
         expect.objectContaining({
-          data: expect.objectContaining({
-            queries: expect.arrayContaining([
-              expect.objectContaining({
-                timezoneUTCOffset: expectedOffset,
-              }),
-            ]),
-          }),
+          targets: expect.arrayContaining([
+            expect.objectContaining({
+              timezoneUTCOffset: expectedOffset,
+            }),
+          ]),
         })
       );
     });
@@ -646,10 +771,30 @@ describe('CloudWatchMetricsQueryRunner', () => {
   describe('debouncedCustomAlert', () => {
     const debouncedAlert = jest.fn();
     beforeEach(() => {
-      const { runner, request } = setupMockedMetricsQueryRunner({
+      const { runner, request, queryMock } = setupMockedMetricsQueryRunner({
         variables: [
-          { ...namespaceVariable, multi: true },
-          { ...metricVariable, multi: true },
+          {
+            ...namespaceVariable,
+            current: {
+              value: ['AWS/Redshift', 'AWS/EC2'],
+              text: ['AWS/Redshift', 'AWS/EC2'].toString(),
+              selected: true,
+            },
+            multi: true,
+          },
+          {
+            ...metricVariable,
+            current: {
+              value: ['CPUUtilization', 'DroppedBytes'],
+              text: ['CPUUtilization', 'DroppedBytes'].toString(),
+              selected: true,
+            },
+            multi: true,
+          },
+          {
+            ...dimensionVariable,
+            multi: true,
+          },
         ],
       });
       runner.debouncedCustomAlert = debouncedAlert;
@@ -660,11 +805,11 @@ describe('CloudWatchMetricsQueryRunner', () => {
             queryMode: 'Metrics',
             id: '',
             region: 'us-east-2',
-            namespace: namespaceVariable.id,
-            metricName: metricVariable.id,
+            namespace: '$' + namespaceVariable.name,
+            metricName: '$' + metricVariable.name,
             period: '',
             alias: '',
-            dimensions: {},
+            dimensions: { [`$${dimensionVariable.name}`]: '' },
             matchExact: true,
             statistic: '',
             refId: '',
@@ -673,10 +818,11 @@ describe('CloudWatchMetricsQueryRunner', () => {
             metricEditorMode: MetricEditorMode.Code,
           },
         ],
-        request
+        request,
+        queryMock
       );
     });
-    it('should show debounced alert for namespace and metric name', async () => {
+    it('should show debounced alert for namespace and metric name when multiple options are selected', async () => {
       expect(debouncedAlert).toHaveBeenCalledWith(
         'CloudWatch templating error',
         'Multi template variables are not supported for namespace'
@@ -687,6 +833,13 @@ describe('CloudWatchMetricsQueryRunner', () => {
       );
     });
 
+    it('should not show debounced alert for a multi-variable if it only has one option selected', async () => {
+      expect(debouncedAlert).not.toHaveBeenCalledWith(
+        'CloudWatch templating error',
+        `Multi template variables are not supported for dimension keys`
+      );
+    });
+
     it('should not show debounced alert for region', async () => {
       expect(debouncedAlert).not.toHaveBeenCalledWith(
         'CloudWatch templating error',
@@ -705,7 +858,7 @@ describe('CloudWatchMetricsQueryRunner', () => {
         sqlExpression: 'select SUM(CPUUtilization) from $datasource',
         dimensions: { InstanceId: '$dimension' },
       };
-      const { runner } = setupMockedMetricsQueryRunner({ variables: [dimensionVariable], mockGetVariableName: false });
+      const { runner } = setupMockedMetricsQueryRunner({ variables: [dimensionVariable] });
       const result = runner.interpolateMetricsQueryVariables(testQuery, {
         datasource: { text: 'foo', value: 'foo' },
         dimension: { text: 'foo', value: 'foo' },
@@ -725,7 +878,6 @@ describe('CloudWatchMetricsQueryRunner', () => {
   describe('convertMultiFiltersFormat', () => {
     const { runner } = setupMockedMetricsQueryRunner({
       variables: [labelsVariable, dimensionVariable],
-      mockGetVariableName: false,
     });
     it('converts keys and values correctly', () => {
       const filters = { $dimension: ['b'], a: ['$labels', 'bar'] };
@@ -855,7 +1007,7 @@ describe('CloudWatchMetricsQueryRunner', () => {
     });
 
     it('should query for the datasource region if empty or "default"', async () => {
-      const { runner, instanceSettings, request } = setupMockedMetricsQueryRunner();
+      const { runner, instanceSettings, request, queryMock } = setupMockedMetricsQueryRunner();
       const performTimeSeriesQueryMock = jest
         .spyOn(runner, 'performTimeSeriesQuery')
         .mockReturnValue(of({ data: [], error: undefined }));
@@ -878,8 +1030,8 @@ describe('CloudWatchMetricsQueryRunner', () => {
         },
       ];
 
-      await expect(runner.handleMetricQueries(queries, request)).toEmitValuesWith(() => {
-        expect(performTimeSeriesQueryMock.mock.calls[0][0].queries[0].region).toBe(
+      await expect(runner.handleMetricQueries(queries, request, queryMock)).toEmitValuesWith(() => {
+        expect(performTimeSeriesQueryMock.mock.calls[0][0].targets[0].region).toBe(
           instanceSettings.jsonData.defaultRegion
         );
       });
diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.ts
index 761b2525ff1fa..44088ce2868c4 100644
--- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.ts
+++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.ts
@@ -1,9 +1,11 @@
-import { findLast, isEmpty } from 'lodash';
+import { isEmpty } from 'lodash';
 import React from 'react';
-import { catchError, map, Observable, of, throwError } from 'rxjs';
+import { catchError, map, Observable, of } from 'rxjs';
 
 import {
+  AppEvents,
   DataFrame,
+  DataQueryError,
   DataQueryRequest,
   DataQueryResponse,
   DataSourceInstanceSettings,
@@ -11,47 +13,34 @@ import {
   FieldType,
   rangeUtil,
   ScopedVars,
-  TimeRange,
 } from '@grafana/data';
-import { toDataQueryResponse } from '@grafana/runtime';
-import { notifyApp } from 'app/core/actions';
-import { createErrorNotification } from 'app/core/copy/appNotification';
-import { TemplateSrv } from 'app/features/templating/template_srv';
-import { store } from 'app/store/store';
-import { AppNotificationTimeout } from 'app/types';
+import { TemplateSrv, getAppEvents } from '@grafana/runtime';
 
 import { ThrottlingErrorMessage } from '../components/Errors/ThrottlingErrorMessage';
 import memoizedDebounce from '../memoizedDebounce';
 import { migrateMetricQuery } from '../migrations/metricQueryMigrations';
-import {
-  CloudWatchJsonData,
-  CloudWatchMetricsQuery,
-  CloudWatchQuery,
-  DataQueryError,
-  MetricQuery,
-  MetricRequest,
-} from '../types';
+import { CloudWatchJsonData, CloudWatchMetricsQuery, CloudWatchQuery } from '../types';
 import { filterMetricsQuery } from '../utils/utils';
 
 import { CloudWatchRequest } from './CloudWatchRequest';
 
+const getThrottlingErrorMessage = (region: string, message: string) =>
+  `Please visit the AWS Service Quotas console at https://${region}.console.aws.amazon.com/servicequotas/home?region=${region}#!/services/monitoring/quotas/L-5E141212 to request a quota increase or see our documentation at https://grafana.com/docs/grafana/latest/datasources/cloudwatch/#manage-service-quotas to learn more. ${message}`;
+
 const displayAlert = (datasourceName: string, region: string) =>
-  store.dispatch(
-    notifyApp(
-      createErrorNotification(
-        `CloudWatch request limit reached in ${region} for data source ${datasourceName}`,
-        '',
-        undefined,
-        React.createElement(ThrottlingErrorMessage, { region }, null)
-      )
-    )
-  );
+  getAppEvents().publish({
+    type: AppEvents.alertError.name,
+    payload: [
+      `CloudWatch request limit reached in ${region} for data source ${datasourceName}`,
+      '',
+      undefined,
+      React.createElement(ThrottlingErrorMessage, { region }, null),
+    ],
+  });
+
 // This class handles execution of CloudWatch metrics query data queries
 export class CloudWatchMetricsQueryRunner extends CloudWatchRequest {
-  debouncedAlert: (datasourceName: string, region: string) => void = memoizedDebounce(
-    displayAlert,
-    AppNotificationTimeout.Error
-  );
+  debouncedThrottlingAlert: (datasourceName: string, region: string) => void = memoizedDebounce(displayAlert);
 
   constructor(instanceSettings: DataSourceInstanceSettings<CloudWatchJsonData>, templateSrv: TemplateSrv) {
     super(instanceSettings, templateSrv);
@@ -59,41 +48,39 @@ export class CloudWatchMetricsQueryRunner extends CloudWatchRequest {
 
   handleMetricQueries = (
     metricQueries: CloudWatchMetricsQuery[],
-    options: DataQueryRequest<CloudWatchQuery>
+    options: DataQueryRequest<CloudWatchQuery>,
+    queryFn: (request: DataQueryRequest<CloudWatchQuery>) => Observable<DataQueryResponse>
   ): Observable<DataQueryResponse> => {
     const timezoneUTCOffset = dateTimeFormat(Date.now(), {
       timeZone: options.timezone,
       format: 'Z',
     }).replace(':', '');
 
-    const validMetricsQueries = metricQueries
-      .filter(this.filterMetricQuery)
-      .map((q: CloudWatchMetricsQuery): MetricQuery => {
-        const migratedQuery = migrateMetricQuery(q);
-        const migratedAndIterpolatedQuery = this.replaceMetricQueryVars(migratedQuery, options.scopedVars);
+    const validMetricsQueries = metricQueries.filter(this.filterMetricQuery).map((q) => {
+      const migratedQuery = migrateMetricQuery(q);
+      const migratedAndIterpolatedQuery = this.replaceMetricQueryVars(migratedQuery, options.scopedVars);
 
-        return {
-          timezoneUTCOffset,
-          intervalMs: options.intervalMs,
-          maxDataPoints: options.maxDataPoints,
-          ...migratedAndIterpolatedQuery,
-          type: 'timeSeriesQuery',
-          datasource: this.ref,
-        };
-      });
+      return {
+        timezoneUTCOffset,
+        intervalMs: options.intervalMs,
+        maxDataPoints: options.maxDataPoints,
+        ...migratedAndIterpolatedQuery,
+        type: 'timeSeriesQuery',
+        datasource: this.ref,
+      };
+    });
 
     // No valid targets, return the empty result to save a round trip.
     if (isEmpty(validMetricsQueries)) {
       return of({ data: [] });
     }
 
-    const request = {
-      from: options?.range?.from.valueOf().toString(),
-      to: options?.range?.to.valueOf().toString(),
-      queries: validMetricsQueries,
+    const request: DataQueryRequest<CloudWatchQuery> = {
+      ...options,
+      targets: validMetricsQueries,
     };
 
-    return this.performTimeSeriesQuery(request, options.range);
+    return this.performTimeSeriesQuery(request, queryFn);
   };
 
   interpolateMetricsQueryVariables(
@@ -114,15 +101,13 @@ export class CloudWatchMetricsQueryRunner extends CloudWatchRequest {
     };
   }
 
-  performTimeSeriesQuery(request: MetricRequest, { from, to }: TimeRange): Observable<DataQueryResponse> {
-    return this.awsRequest(this.dsQueryEndpoint, request).pipe(
+  performTimeSeriesQuery(
+    request: DataQueryRequest<CloudWatchQuery>,
+    queryFn: (request: DataQueryRequest<CloudWatchQuery>) => Observable<DataQueryResponse>
+  ): Observable<DataQueryResponse> {
+    return queryFn(request).pipe(
       map((res) => {
-        const dataframes: DataFrame[] = toDataQueryResponse(res).data;
-        if (!dataframes || dataframes.length <= 0) {
-          return { data: [] };
-        }
-
-        const lastError = findLast(res.data.results, (v) => !!v.error);
+        const dataframes: DataFrame[] = res.data || [];
 
         dataframes.forEach((frame) => {
           frame.fields.forEach((field) => {
@@ -133,45 +118,62 @@ export class CloudWatchMetricsQueryRunner extends CloudWatchRequest {
           });
         });
 
+        if (res.errors?.length) {
+          this.alertOnThrottlingErrors(res.errors, request);
+        }
+
         return {
           data: dataframes,
-          error: lastError ? { message: lastError.error } : undefined,
+          // DataSourceWithBackend will not throw an error, instead it will return "errors" field along with the response
+          errors: this.enrichThrottlingErrorMessages(request, res.errors),
         };
       }),
-      catchError((err: DataQueryError<CloudWatchMetricsQuery>) => {
-        const isFrameError = err.data?.results;
-
-        // Error is not frame specific
-        if (!isFrameError && err.data && err.data.message === 'Metric request error' && err.data.error) {
-          err.message = err.data.error;
-          return throwError(() => err);
-        }
-
-        // The error is either for a specific frame or for all the frames
-        const results: Array<{ error?: string }> = Object.values(err.data?.results ?? {});
-        const firstErrorResult = results.find((r) => r.error);
-        if (firstErrorResult) {
-          err.message = firstErrorResult.error;
+      catchError((err: unknown) => {
+        if (Array.isArray(err)) {
+          return of({ data: [], errors: err });
+        } else {
+          return of({ data: [], errors: [{ message: err }] });
         }
+      })
+    );
+  }
 
-        if (results.some((r) => r.error && /^Throttling:.*/.test(r.error))) {
-          const failedRedIds = Object.keys(err.data?.results ?? {});
-          const regionsAffected = Object.values(request.queries).reduce(
-            (res: string[], { refId, region }) =>
-              (refId && !failedRedIds.includes(refId)) || res.includes(region) ? res : [...res, region],
-            []
-          );
-          regionsAffected.forEach((region) => {
-            const actualRegion = this.getActualRegion(region);
-            if (actualRegion) {
-              this.debouncedAlert(this.instanceSettings.name, actualRegion);
-            }
-          });
-        }
+  enrichThrottlingErrorMessages(request: DataQueryRequest<CloudWatchQuery>, errors?: DataQueryError[]) {
+    if (!errors || errors.length === 0) {
+      return errors;
+    }
+    const result: DataQueryError[] = [];
+    errors.forEach((error) => {
+      if (error.message && (/^Throttling:.*/.test(error.message) || /^Rate exceeded.*/.test(error.message))) {
+        const region = this.getActualRegion(request.targets.find((target) => target.refId === error.refId)?.region);
+        result.push({ ...error, message: getThrottlingErrorMessage(region, error.message) });
+      } else {
+        result.push(error);
+      }
+    });
+    return result;
+  }
 
-        return throwError(() => err);
-      })
+  alertOnThrottlingErrors(errors: DataQueryError[], request: DataQueryRequest<CloudWatchQuery>) {
+    const hasThrottlingError = errors.some(
+      (err) => err.message && (/^Throttling:.*/.test(err.message) || /^Rate exceeded.*/.test(err.message))
     );
+    if (hasThrottlingError) {
+      const failedRefIds = errors.map((error) => error.refId).filter((refId) => refId);
+      if (failedRefIds.length > 0) {
+        const regionsAffected = Object.values(request.targets).reduce(
+          (res: string[], { refId, region }) =>
+            (refId && !failedRefIds.includes(refId)) || res.includes(region) ? res : [...res, region],
+          []
+        );
+        regionsAffected.forEach((region) => {
+          const actualRegion = this.getActualRegion(region);
+          if (actualRegion) {
+            this.debouncedThrottlingAlert(this.instanceSettings.name, actualRegion);
+          }
+        });
+      }
+    }
   }
 
   filterMetricQuery(query: CloudWatchMetricsQuery): boolean {
diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchRequest.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchRequest.ts
index 8570f18393d62..460a2e7ee49c2 100644
--- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchRequest.ts
+++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchRequest.ts
@@ -1,24 +1,17 @@
 import { Observable } from 'rxjs';
 
-import { DataSourceInstanceSettings, DataSourceRef, getDataSourceRef, ScopedVars } from '@grafana/data';
-import { BackendDataSourceResponse, FetchResponse, getBackendSrv } from '@grafana/runtime';
-import { notifyApp } from 'app/core/actions';
-import { createErrorNotification } from 'app/core/copy/appNotification';
-import { TemplateSrv } from 'app/features/templating/template_srv';
-import { store } from 'app/store/store';
-import { AppNotificationTimeout } from 'app/types';
+import { DataSourceInstanceSettings, DataSourceRef, getDataSourceRef, ScopedVars, AppEvents } from '@grafana/data';
+import { BackendDataSourceResponse, FetchResponse, getBackendSrv, TemplateSrv, getAppEvents } from '@grafana/runtime';
 
 import memoizedDebounce from '../memoizedDebounce';
 import { CloudWatchJsonData, Dimensions, MetricRequest, MultiFilters } from '../types';
+import { getVariableName } from '../utils/templateVariableUtils';
 
 export abstract class CloudWatchRequest {
   templateSrv: TemplateSrv;
   ref: DataSourceRef;
   dsQueryEndpoint = '/api/ds/query';
-  debouncedCustomAlert: (title: string, message: string) => void = memoizedDebounce(
-    displayCustomError,
-    AppNotificationTimeout.Error
-  );
+  debouncedCustomAlert: (title: string, message: string) => void = memoizedDebounce(displayCustomError);
 
   constructor(
     public instanceSettings: DataSourceInstanceSettings<CloudWatchJsonData>,
@@ -43,9 +36,18 @@ export abstract class CloudWatchRequest {
     return getBackendSrv().fetch<BackendDataSourceResponse>(options);
   }
 
-  convertDimensionFormat(dimensions: Dimensions, scopedVars: ScopedVars): Dimensions {
+  convertDimensionFormat(
+    dimensions: Dimensions,
+    scopedVars: ScopedVars,
+    displayErrorIfIsMultiTemplateVariable = true
+  ): Dimensions {
     return Object.entries(dimensions).reduce((result, [key, value]) => {
-      key = this.replaceVariableAndDisplayWarningIfMulti(key, scopedVars, true, 'dimension keys');
+      key = this.replaceVariableAndDisplayWarningIfMulti(
+        key,
+        scopedVars,
+        displayErrorIfIsMultiTemplateVariable,
+        'dimension keys'
+      );
 
       if (Array.isArray(value)) {
         return { ...result, [key]: value };
@@ -62,7 +64,7 @@ export abstract class CloudWatchRequest {
 
   // get the value for a given template variable
   expandVariableToArray(value: string, scopedVars: ScopedVars): string[] {
-    const variableName = this.templateSrv.getVariableName(value);
+    const variableName = getVariableName(value);
     const valueVar = this.templateSrv.getVariables().find(({ name }) => {
       return name === variableName;
     });
@@ -93,23 +95,35 @@ export abstract class CloudWatchRequest {
     }, {});
   }
 
+  isMultiVariable(target?: string) {
+    if (target) {
+      const variables = this.templateSrv.getVariables();
+      const variable = variables.find(({ name }) => name === getVariableName(target));
+      const type = variable?.type;
+      return (type === 'custom' || type === 'query' || type === 'datasource') && variable?.multi;
+    }
+
+    return false;
+  }
+
+  isVariableWithMultipleOptionsSelected(target?: string, scopedVars?: ScopedVars) {
+    if (!target || !this.isMultiVariable(target)) {
+      return false;
+    }
+    return this.expandVariableToArray(target, scopedVars || {}).length > 1;
+  }
+
   replaceVariableAndDisplayWarningIfMulti(
     target?: string,
     scopedVars?: ScopedVars,
     displayErrorIfIsMultiTemplateVariable?: boolean,
     fieldName?: string
   ) {
-    if (displayErrorIfIsMultiTemplateVariable && !!target) {
-      const variables = this.templateSrv.getVariables();
-      const variable = variables.find(({ name }) => name === this.templateSrv.getVariableName(target));
-      const isMultiVariable =
-        variable?.type === 'custom' || variable?.type === 'query' || variable?.type === 'datasource';
-      if (isMultiVariable && variable.multi) {
-        this.debouncedCustomAlert(
-          'CloudWatch templating error',
-          `Multi template variables are not supported for ${fieldName || target}`
-        );
-      }
+    if (displayErrorIfIsMultiTemplateVariable && this.isVariableWithMultipleOptionsSelected(target)) {
+      this.debouncedCustomAlert(
+        'CloudWatch templating error',
+        `Multi template variables are not supported for ${fieldName || target}`
+      );
     }
 
     return this.templateSrv.replace(target, scopedVars);
@@ -128,4 +142,7 @@ export abstract class CloudWatchRequest {
 }
 
 const displayCustomError = (title: string, message: string) =>
-  store.dispatch(notifyApp(createErrorNotification(title, message)));
+  getAppEvents().publish({
+    type: AppEvents.alertError.name,
+    payload: [title, message],
+  });
diff --git a/public/app/plugins/datasource/cloudwatch/resources/ResourceAPI.test.ts b/public/app/plugins/datasource/cloudwatch/resources/ResourceAPI.test.ts
index ec7d1167289fc..eeefcf2074597 100644
--- a/public/app/plugins/datasource/cloudwatch/resources/ResourceAPI.test.ts
+++ b/public/app/plugins/datasource/cloudwatch/resources/ResourceAPI.test.ts
@@ -1,5 +1,3 @@
-import { config } from '@grafana/runtime';
-
 import { setupMockedResourcesAPI } from '../__mocks__/ResourcesAPI';
 
 describe('ResourcesAPI', () => {
@@ -121,63 +119,8 @@ describe('ResourcesAPI', () => {
     });
   });
 
-  const originalFeatureToggleValue = config.featureToggles.cloudwatchNewRegionsHandler;
-
   describe('getRegions', () => {
-    afterEach(() => {
-      config.featureToggles.cloudwatchNewRegionsHandler = originalFeatureToggleValue;
-    });
-    it('should return regions as an array of options when using legacy regions route', async () => {
-      config.featureToggles.cloudwatchNewRegionsHandler = false;
-      const response = Promise.resolve([
-        {
-          text: 'US East (Ohio)',
-          value: 'us-east-2',
-          label: 'US East (Ohio)',
-        },
-        {
-          text: 'US East (N. Virginia)',
-          value: 'us-east-1',
-          label: 'US East (N. Virginia)',
-        },
-        {
-          text: 'US West (N. California)',
-          value: 'us-west-1',
-          label: 'US West (N. California)',
-        },
-      ]);
-
-      const { api } = setupMockedResourcesAPI({ response });
-      const expectedRegions = [
-        {
-          text: 'default',
-          value: 'default',
-          label: 'default',
-        },
-        {
-          text: 'US East (Ohio)',
-          value: 'us-east-2',
-          label: 'US East (Ohio)',
-        },
-        {
-          text: 'US East (N. Virginia)',
-          value: 'us-east-1',
-          label: 'US East (N. Virginia)',
-        },
-        {
-          text: 'US West (N. California)',
-          value: 'us-west-1',
-          label: 'US West (N. California)',
-        },
-      ];
-
-      const regions = await api.getRegions();
-
-      expect(regions).toEqual(expectedRegions);
-    });
-
-    it('should return regions as an array of options when using new regions route', async () => {
-      config.featureToggles.cloudwatchNewRegionsHandler = true;
+    it('should always return regions as an array of options', async () => {
       const response = Promise.resolve([
         {
           value: {
diff --git a/public/app/plugins/datasource/cloudwatch/resources/ResourcesAPI.ts b/public/app/plugins/datasource/cloudwatch/resources/ResourcesAPI.ts
index d3b6fa0979a9e..b518ce9d29f27 100644
--- a/public/app/plugins/datasource/cloudwatch/resources/ResourcesAPI.ts
+++ b/public/app/plugins/datasource/cloudwatch/resources/ResourcesAPI.ts
@@ -1,8 +1,7 @@
 import { memoize } from 'lodash';
 
 import { DataSourceInstanceSettings, SelectableValue } from '@grafana/data';
-import { getBackendSrv, config } from '@grafana/runtime';
-import { TemplateSrv } from 'app/features/templating/template_srv';
+import { getBackendSrv, TemplateSrv } from '@grafana/runtime';
 
 import { CloudWatchRequest } from '../query-runner/CloudWatchRequest';
 import { CloudWatchJsonData, LogGroupField, MultiFilters } from '../types';
@@ -53,12 +52,6 @@ export class ResourcesAPI extends CloudWatchRequest {
   }
 
   getRegions(): Promise<SelectableResourceValue[]> {
-    if (!config.featureToggles.cloudwatchNewRegionsHandler) {
-      return this.memoizedGetRequest<SelectableResourceValue[]>('regions').then((regions) => [
-        { label: 'default', value: 'default', text: 'default' },
-        ...regions.filter((r) => r.value),
-      ]);
-    }
     return this.memoizedGetRequest<Array<ResourceResponse<RegionResponse>>>('regions').then((regions) => {
       return [
         { label: 'default', value: 'default', text: 'default' },
@@ -117,19 +110,18 @@ export class ResourcesAPI extends CloudWatchRequest {
     }).then((metrics) => metrics.map((m) => ({ metricName: m.value.name, namespace: m.value.namespace })));
   }
 
-  getDimensionKeys({
-    region,
-    namespace = '',
-    dimensionFilters = {},
-    metricName = '',
-    accountId,
-  }: GetDimensionKeysRequest): Promise<Array<SelectableValue<string>>> {
+  getDimensionKeys(
+    { region, namespace = '', dimensionFilters = {}, metricName = '', accountId }: GetDimensionKeysRequest,
+    displayErrorIfIsMultiTemplateVariable?: boolean
+  ): Promise<Array<SelectableValue<string>>> {
     return this.memoizedGetRequest<Array<ResourceResponse<string>>>('dimension-keys', {
       region: this.templateSrv.replace(this.getActualRegion(region)),
       namespace: this.templateSrv.replace(namespace),
       accountId: this.templateSrv.replace(accountId),
       metricName: this.templateSrv.replace(metricName),
-      dimensionFilters: JSON.stringify(this.convertDimensionFormat(dimensionFilters, {})),
+      dimensionFilters: JSON.stringify(
+        this.convertDimensionFormat(dimensionFilters, {}, displayErrorIfIsMultiTemplateVariable)
+      ),
     }).then((r) => r.map((r) => ({ label: r.value, value: r.value })));
   }
 
@@ -149,7 +141,7 @@ export class ResourcesAPI extends CloudWatchRequest {
       region: this.templateSrv.replace(this.getActualRegion(region)),
       namespace: this.templateSrv.replace(namespace),
       metricName: this.templateSrv.replace(metricName.trim()),
-      dimensionKey: this.templateSrv.replace(dimensionKey),
+      dimensionKey: this.replaceVariableAndDisplayWarningIfMulti(dimensionKey, {}, true),
       dimensionFilters: JSON.stringify(this.convertDimensionFormat(dimensionFilters, {})),
       accountId: this.templateSrv.replace(accountId),
     }).then((r) => r.map((r) => ({ label: r.value, value: r.value })));
diff --git a/public/app/plugins/datasource/cloudwatch/types.ts b/public/app/plugins/datasource/cloudwatch/types.ts
index efc9a18163c77..97db6242aaf45 100644
--- a/public/app/plugins/datasource/cloudwatch/types.ts
+++ b/public/app/plugins/datasource/cloudwatch/types.ts
@@ -56,7 +56,7 @@ export interface CloudWatchSecureJsonData extends AwsAuthDataSourceSecureJsonDat
 
 export type CloudWatchLogsRequest = GetLogEventsRequest | StartQueryRequest | QueryParam;
 
-export interface GetLogEventsRequest {
+export interface GetLogEventsRequest extends DataQuery {
   /**
    * The name of the log group.
    */
@@ -85,7 +85,7 @@ export interface GetLogEventsRequest {
    * If the value is true, the earliest log events are returned first. If the value is false, the latest log events are returned first. The default value is false. If you are using nextToken in this operation, you must specify true for startFromHead.
    */
   startFromHead?: boolean;
-  region?: string;
+  region: string;
 }
 
 export interface TSDBResponse<T = any> {
@@ -135,7 +135,7 @@ export interface LogGroupField {
   percent?: number;
 }
 
-export interface StartQueryRequest {
+export interface StartQueryRequest extends DataQuery {
   /**
    * The log group on which to perform the query. A StartQuery operation must include a logGroupNames or a logGroupName parameter, but not both.
    */
@@ -157,7 +157,7 @@ export interface StartQueryRequest {
   region: string;
 }
 
-export interface QueryParam {
+export interface QueryParam extends DataQuery {
   queryId: string;
   refId: string;
   limit?: number;
diff --git a/public/app/plugins/datasource/cloudwatch/utils/datalinks.test.ts b/public/app/plugins/datasource/cloudwatch/utils/datalinks.test.ts
index 6dcd7dceaf51e..f2edcee007e4d 100644
--- a/public/app/plugins/datasource/cloudwatch/utils/datalinks.test.ts
+++ b/public/app/plugins/datasource/cloudwatch/utils/datalinks.test.ts
@@ -40,6 +40,7 @@ describe('addDataLinksToLogsResponse', () => {
           region: 'us-east-1',
         },
       ],
+      range: { ...time, raw: time },
     } as DataQueryRequest<CloudWatchQuery>;
 
     setDataSourceSrv({
@@ -53,7 +54,6 @@ describe('addDataLinksToLogsResponse', () => {
     await addDataLinksToLogsResponse(
       mockResponse,
       mockOptions,
-      { ...time, raw: time },
       (s) => s ?? '',
       (v) => [v] ?? [],
       (r) => r,
@@ -125,12 +125,12 @@ describe('addDataLinksToLogsResponse', () => {
           region: 'us-east-1',
         } as CloudWatchQuery,
       ],
+      range: { ...time, raw: time },
     } as DataQueryRequest<CloudWatchQuery>;
 
     await addDataLinksToLogsResponse(
       mockResponse,
       mockOptions,
-      { ...time, raw: time },
       (s) => s ?? '',
       (v) => [v] ?? [],
       (r) => r
@@ -182,12 +182,12 @@ describe('addDataLinksToLogsResponse', () => {
           region: 'us-east-1',
         } as CloudWatchQuery,
       ],
+      range: { ...time, raw: time },
     } as DataQueryRequest<CloudWatchQuery>;
 
     await addDataLinksToLogsResponse(
       mockResponse,
       mockOptions,
-      { ...time, raw: time },
       (s) => s ?? '',
       (v) => [v] ?? [],
       (r) => r
diff --git a/public/app/plugins/datasource/cloudwatch/utils/datalinks.ts b/public/app/plugins/datasource/cloudwatch/utils/datalinks.ts
index aa35d4b9c34f5..8f7c5c3882785 100644
--- a/public/app/plugins/datasource/cloudwatch/utils/datalinks.ts
+++ b/public/app/plugins/datasource/cloudwatch/utils/datalinks.ts
@@ -14,7 +14,6 @@ type ReplaceFn = (
 export async function addDataLinksToLogsResponse(
   response: DataQueryResponse,
   request: DataQueryRequest<CloudWatchQuery>,
-  range: TimeRange,
   replaceFn: ReplaceFn,
   getVariableValueFn: (value: string, scopedVars: ScopedVars) => string[],
   getRegion: (region: string) => string,
@@ -37,13 +36,15 @@ export async function addDataLinksToLogsResponse(
       } else {
         // Right now we add generic link to open the query in xray console to every field so it shows in the logs row
         // details. Unfortunately this also creates link for all values inside table which look weird.
-        field.config.links = [createAwsConsoleLink(curTarget, range, interpolatedRegion, replace, getVariableValue)];
+        field.config.links = [
+          createAwsConsoleLink(curTarget, request.range, interpolatedRegion, replace, getVariableValue),
+        ];
       }
     }
   }
 }
 
-async function createInternalXrayLink(datasourceUid: string, region: string) {
+async function createInternalXrayLink(datasourceUid: string, region: string): Promise<DataLink | undefined> {
   let ds;
   try {
     ds = await getDataSourceSrv().get(datasourceUid);
@@ -60,7 +61,7 @@ async function createInternalXrayLink(datasourceUid: string, region: string) {
       datasourceUid: datasourceUid,
       datasourceName: ds.name,
     },
-  } as DataLink;
+  };
 }
 
 function createAwsConsoleLink(
diff --git a/public/app/plugins/datasource/cloudwatch/utils/logsRetry.ts b/public/app/plugins/datasource/cloudwatch/utils/logsRetry.ts
index eea4b7c207719..ad13b154a59b3 100644
--- a/public/app/plugins/datasource/cloudwatch/utils/logsRetry.ts
+++ b/public/app/plugins/datasource/cloudwatch/utils/logsRetry.ts
@@ -27,7 +27,7 @@ export function runWithRetry(
 ): Observable<{ frames: DataFrame[]; error?: DataQueryError }> {
   const startTime = new Date();
   let retries = 0;
-  let timerID: any;
+  let timerID: ReturnType<typeof setTimeout>;
   let subscription: Subscription;
   let collected = {};
 
diff --git a/public/app/plugins/datasource/cloudwatch/utils/templateVariableUtils.ts b/public/app/plugins/datasource/cloudwatch/utils/templateVariableUtils.ts
index be1e204375479..1cad2dfdb7a17 100644
--- a/public/app/plugins/datasource/cloudwatch/utils/templateVariableUtils.ts
+++ b/public/app/plugins/datasource/cloudwatch/utils/templateVariableUtils.ts
@@ -1,5 +1,29 @@
 import { VariableOption, UserProps, OrgProps, DashboardProps, ScopedVars } from '@grafana/data';
-import { TemplateSrv } from 'app/features/templating/template_srv';
+import { TemplateSrv } from '@grafana/runtime';
+
+/*
+ * This regex matches 3 types of variable reference with an optional format specifier
+ * There are 6 capture groups that replace will return
+ * \$(\w+)                                    $var1
+ * \[\[(\w+?)(?::(\w+))?\]\]                  [[var2]] or [[var2:fmt2]]
+ * \${(\w+)(?:\.([^:^\}]+))?(?::([^\}]+))?}   ${var3} or ${var3.fieldPath} or ${var3:fmt3} (or ${var3.fieldPath:fmt3} but that is not a separate capture group)
+ */
+const variableRegex = /\$(\w+)|\[\[(\w+?)(?::(\w+))?\]\]|\${(\w+)(?:\.([^:^\}]+))?(?::([^\}]+))?}/g;
+
+// Helper function since lastIndex is not reset
+const variableRegexExec = (variableString: string) => {
+  variableRegex.lastIndex = 0;
+  return variableRegex.exec(variableString);
+};
+
+export const getVariableName = (expression: string) => {
+  const match = variableRegexExec(expression);
+  if (!match) {
+    return null;
+  }
+  const variableName = match.slice(1).find((match) => match !== undefined);
+  return variableName;
+};
 
 /**
  * @remarks
@@ -22,7 +46,7 @@ export const interpolateStringArrayUsingSingleOrMultiValuedVariable = (
   const format = key === 'value' ? 'pipe' : 'text';
   let result: string[] = [];
   for (const string of strings) {
-    const variableName = templateSrv.getVariableName(string);
+    const variableName = getVariableName(string);
     const valueVar = templateSrv.getVariables().find(({ name }) => name === variableName);
 
     if (valueVar && 'current' in valueVar && isVariableOption(valueVar.current)) {
@@ -43,7 +67,7 @@ export const interpolateStringArrayUsingSingleOrMultiValuedVariable = (
 };
 
 export const isTemplateVariable = (templateSrv: TemplateSrv, string: string) => {
-  const variableName = templateSrv.getVariableName(string);
+  const variableName = getVariableName(string);
   return templateSrv.getVariables().some(({ name }) => name === variableName);
 };
 
diff --git a/public/app/plugins/datasource/dashboard/DashboardQueryEditor.test.tsx b/public/app/plugins/datasource/dashboard/DashboardQueryEditor.test.tsx
index c165132ac6332..ca9d18c71c19d 100644
--- a/public/app/plugins/datasource/dashboard/DashboardQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/dashboard/DashboardQueryEditor.test.tsx
@@ -14,6 +14,7 @@ import {
 } from '../../../features/dashboard/state/__fixtures__/dashboardFixtures';
 
 import { DashboardQueryEditor } from './DashboardQueryEditor';
+import { DashboardDatasource } from './datasource';
 import { SHARED_DASHBOARD_QUERY } from './types';
 
 jest.mock('app/core/config', () => ({
@@ -78,10 +79,11 @@ describe('DashboardQueryEditor', () => {
   it('does not show a panel with the SHARED_DASHBOARD_QUERY datasource as an option in the dropdown', async () => {
     render(
       <DashboardQueryEditor
-        queries={mockQueries}
-        panelData={mockPanelData}
+        datasource={{} as DashboardDatasource}
+        query={mockQueries[0]}
+        data={mockPanelData}
         onChange={mockOnChange}
-        onRunQueries={mockOnRunQueries}
+        onRunQuery={mockOnRunQueries}
       />
     );
     const select = screen.getByText('Choose panel');
@@ -101,10 +103,11 @@ describe('DashboardQueryEditor', () => {
     mockDashboard.initEditPanel(mockDashboard.panels[0]);
     render(
       <DashboardQueryEditor
-        queries={mockQueries}
-        panelData={mockPanelData}
+        datasource={{} as DashboardDatasource}
+        query={mockQueries[0]}
+        data={mockPanelData}
         onChange={mockOnChange}
-        onRunQueries={mockOnRunQueries}
+        onRunQuery={mockOnRunQueries}
       />
     );
     const select = screen.getByText('Choose panel');
diff --git a/public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx b/public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx
index e2c8360519b08..d875c8d0b85c4 100644
--- a/public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx
+++ b/public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx
@@ -4,45 +4,41 @@ import pluralize from 'pluralize';
 import React, { useCallback, useMemo } from 'react';
 import { useAsync } from 'react-use';
 
-import { DataQuery, GrafanaTheme2, PanelData, SelectableValue, DataTopic } from '@grafana/data';
-import {
-  Card,
-  Field,
-  Select,
-  useStyles2,
-  VerticalGroup,
-  HorizontalGroup,
-  Spinner,
-  Switch,
-  RadioButtonGroup,
-} from '@grafana/ui';
+import { DataQuery, GrafanaTheme2, SelectableValue, DataTopic, QueryEditorProps } from '@grafana/data';
+import { Field, Select, useStyles2, Spinner, RadioButtonGroup, Stack, InlineSwitch } from '@grafana/ui';
 import config from 'app/core/config';
 import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
 import { PanelModel } from 'app/features/dashboard/state';
+import { DashboardScene } from 'app/features/dashboard-scene/scene/DashboardScene';
 import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
 import { filterPanelDataToQuery } from 'app/features/query/components/QueryEditorRow';
 
+import { OperationsEditorRow } from '../prometheus/querybuilder/shared/OperationsEditorRow';
+
+import { DashboardDatasource } from './datasource';
 import { DashboardQuery, ResultInfo, SHARED_DASHBOARD_QUERY } from './types';
 
 function getQueryDisplayText(query: DataQuery): string {
   return JSON.stringify(query);
 }
 
-interface Props {
-  queries: DataQuery[];
-  panelData: PanelData;
-  onChange: (queries: DataQuery[]) => void;
-  onRunQueries: () => void;
+function isPanelInEdit(panelId: number, panelInEditId?: number) {
+  let idToCompareWith = panelInEditId;
+  if (window.__grafanaSceneContext && window.__grafanaSceneContext instanceof DashboardScene) {
+    idToCompareWith = window.__grafanaSceneContext.state.editPanel?.state.panelId;
+  }
+  return panelId === idToCompareWith;
 }
 
+interface Props extends QueryEditorProps<DashboardDatasource, DashboardQuery> {}
+
 const topics = [
   { label: 'All data', value: false },
   { label: 'Annotations', value: true, description: 'Include annotations as regular data' },
 ];
 
-export function DashboardQueryEditor({ panelData, queries, onChange, onRunQueries }: Props) {
+export function DashboardQueryEditor({ data, query, onChange, onRunQuery }: Props) {
   const { value: defaultDatasource } = useAsync(() => getDatasourceSrv().get());
-  const query = queries[0] as DashboardQuery;
 
   const panel = useMemo(() => {
     const dashboard = getDashboardSrv().getCurrent();
@@ -50,7 +46,7 @@ export function DashboardQueryEditor({ panelData, queries, onChange, onRunQuerie
   }, [query.panelId]);
 
   const { value: results, loading: loadingResults } = useAsync(async (): Promise<ResultInfo[]> => {
-    if (!panel) {
+    if (!panel || !data) {
       return [];
     }
     const mainDS = await getDatasourceSrv().get(panel.datasource);
@@ -58,7 +54,7 @@ export function DashboardQueryEditor({ panelData, queries, onChange, onRunQuerie
       panel.targets.map(async (query) => {
         const ds = query.datasource ? await getDatasourceSrv().get(query.datasource) : mainDS;
         const fmt = ds.getQueryDisplayText || getQueryDisplayText;
-        const queryData = filterPanelDataToQuery(panelData, query.refId) ?? panelData;
+        const queryData = filterPanelDataToQuery(data, query.refId) ?? data;
         return {
           refId: query.refId,
           query: fmt(query),
@@ -69,14 +65,14 @@ export function DashboardQueryEditor({ panelData, queries, onChange, onRunQuerie
         };
       })
     );
-  }, [panelData, panel]);
+  }, [data, panel]);
 
   const onUpdateQuery = useCallback(
     (query: DashboardQuery) => {
-      onChange([query]);
-      onRunQueries();
+      onChange(query);
+      onRunQuery();
     },
-    [onChange, onRunQueries]
+    [onChange, onRunQuery]
   );
 
   const onPanelChanged = useCallback(
@@ -125,7 +121,7 @@ export function DashboardQueryEditor({ panelData, queries, onChange, onRunQuerie
           (panel) =>
             config.panels[panel.type] &&
             panel.targets &&
-            panel.id !== dashboard.panelInEdit?.id &&
+            !isPanelInEdit(panel.id, dashboard.panelInEdit?.id) &&
             panel.datasource?.uid !== SHARED_DASHBOARD_QUERY
         )
         .map((panel) => ({
@@ -155,64 +151,61 @@ export function DashboardQueryEditor({ panelData, queries, onChange, onRunQuerie
   const selected = panels.find((panel) => panel.value === query.panelId);
 
   return (
-    <>
-      <Field label="Source" description="Use the same results as panel">
-        <Select
-          inputId={selectId}
-          placeholder="Choose panel"
-          isSearchable={true}
-          options={panels}
-          value={selected}
-          onChange={(item) => onPanelChanged(item.value!)}
-        />
-      </Field>
-
-      <HorizontalGroup height="auto" wrap={true} align="flex-start">
-        <Field
-          label="Data Source"
-          description="Use data or annotations from the panel"
-          className={styles.horizontalField}
-        >
-          <RadioButtonGroup options={topics} value={query.topic === DataTopic.Annotations} onChange={onTopicChanged} />
-        </Field>
-
-        {showTransforms && (
-          <Field label="Transform" description="Apply panel transformations from the source panel">
-            <Switch value={Boolean(query.withTransforms)} onChange={onTransformToggle} />
+    <OperationsEditorRow>
+      <Stack direction="column">
+        <Stack gap={3}>
+          <Field label="Source panel" description="Use query results from another panel">
+            <Select
+              inputId={selectId}
+              placeholder="Choose panel"
+              isSearchable={true}
+              options={panels}
+              value={selected}
+              onChange={(item) => onPanelChanged(item.value!)}
+            />
           </Field>
-        )}
-      </HorizontalGroup>
-
-      {loadingResults ? (
-        <Spinner />
-      ) : (
-        <>
-          {results && Boolean(results.length) && (
-            <Field label="Queries from panel">
-              <VerticalGroup spacing="sm">
-                {results.map((target, i) => (
-                  <Card key={`DashboardQueryRow-${i}`}>
-                    <Card.Heading>{target.refId}</Card.Heading>
-                    <Card.Figure>
-                      <img src={target.img} alt={target.name} title={target.name} width={40} />
-                    </Card.Figure>
-                    <Card.Meta>{target.query}</Card.Meta>
-                  </Card>
-                ))}
-              </VerticalGroup>
+
+          <Field label="Data" description="Use data or annotations from the panel">
+            <RadioButtonGroup
+              options={topics}
+              value={query.topic === DataTopic.Annotations}
+              onChange={onTopicChanged}
+            />
+          </Field>
+
+          {showTransforms && (
+            <Field label="Transform" description="Apply transformations from the source panel">
+              <InlineSwitch value={Boolean(query.withTransforms)} onChange={onTransformToggle} />
             </Field>
           )}
-        </>
-      )}
-    </>
+        </Stack>
+
+        {loadingResults ? (
+          <Spinner />
+        ) : (
+          <>
+            {results && Boolean(results.length) && (
+              <Field label="Queries from panel">
+                <Stack direction="column">
+                  {results.map((target, i) => (
+                    <Stack key={i} alignItems="center" gap={1}>
+                      <div>{target.refId}</div>
+                      <img src={target.img} alt={target.name} title={target.name} width={16} />
+                      <div>{target.query}</div>
+                    </Stack>
+                  ))}
+                </Stack>
+              </Field>
+            )}
+          </>
+        )}
+      </Stack>
+    </OperationsEditorRow>
   );
 }
 
 function getStyles(theme: GrafanaTheme2) {
   return {
-    horizontalField: css({
-      marginRight: theme.spacing(2),
-    }),
     noQueriesText: css({
       padding: theme.spacing(1.25),
     }),
diff --git a/public/app/plugins/datasource/dashboard/datasource.test.ts b/public/app/plugins/datasource/dashboard/datasource.test.ts
new file mode 100644
index 0000000000000..b5e6b99cb7797
--- /dev/null
+++ b/public/app/plugins/datasource/dashboard/datasource.test.ts
@@ -0,0 +1,103 @@
+import {
+  arrayToDataFrame,
+  DataQueryResponse,
+  DataSourceInstanceSettings,
+  getDefaultTimeRange,
+  LoadingState,
+  standardTransformersRegistry,
+} from '@grafana/data';
+import { SceneDataNode, SceneDataTransformer, SceneFlexItem, SceneFlexLayout, VizPanel } from '@grafana/scenes';
+import { getVizPanelKeyForPanelId } from 'app/features/dashboard-scene/utils/utils';
+import { getStandardTransformers } from 'app/features/transformers/standardTransformers';
+
+import { DashboardDatasource } from './datasource';
+import { DashboardQuery } from './types';
+
+standardTransformersRegistry.setInit(getStandardTransformers);
+
+describe('DashboardDatasource', () => {
+  it("should look up the other panel and subscribe to it's data", async () => {
+    const { observable } = setup({ refId: 'A', panelId: 1 });
+
+    let rsp: DataQueryResponse | undefined;
+
+    observable.subscribe({ next: (data) => (rsp = data) });
+
+    expect(rsp?.data[0].fields[0].values).toEqual([1, 2, 3]);
+  });
+
+  it('should always set response key', async () => {
+    const { observable } = setup({ refId: 'A', panelId: 1 });
+
+    let rsp: DataQueryResponse | undefined;
+
+    observable.subscribe({ next: (data) => (rsp = data) });
+
+    expect(rsp?.key).toEqual('source-ds-provider');
+  });
+
+  it('Can subscribe to panel data + transforms', async () => {
+    const { observable } = setup({ refId: 'A', panelId: 1, withTransforms: true });
+
+    let rsp: DataQueryResponse | undefined;
+
+    observable.subscribe({ next: (data) => (rsp = data) });
+
+    expect(rsp?.data[0].fields[1].values).toEqual([3]);
+  });
+
+  it('Should activate source provder on observable subscribe and and deactivate when completed (if only activator)', async () => {
+    const { observable, sourceData } = setup({ refId: 'A', panelId: 1, withTransforms: true });
+
+    const test = observable.subscribe({ next: () => {} });
+
+    expect(sourceData.isActive).toBe(true);
+
+    test.unsubscribe();
+
+    expect(sourceData.isActive).toBe(false);
+  });
+});
+
+function setup(query: DashboardQuery) {
+  const sourceData = new SceneDataTransformer({
+    $data: new SceneDataNode({
+      data: {
+        series: [arrayToDataFrame([1, 2, 3])],
+        state: LoadingState.Done,
+        timeRange: getDefaultTimeRange(),
+        structureRev: 11,
+      },
+    }),
+    transformations: [{ id: 'reduce', options: {} }],
+  });
+
+  const scene = new SceneFlexLayout({
+    children: [
+      new SceneFlexItem({
+        body: new VizPanel({
+          key: getVizPanelKeyForPanelId(1),
+          $data: sourceData,
+        }),
+      }),
+    ],
+  });
+
+  const ds = new DashboardDatasource({} as DataSourceInstanceSettings);
+
+  const observable = ds.query({
+    timezone: 'utc',
+    targets: [query],
+    requestId: '',
+    interval: '',
+    intervalMs: 0,
+    range: getDefaultTimeRange(),
+    scopedVars: {
+      __sceneObject: { value: scene },
+    },
+    app: '',
+    startTime: 0,
+  });
+
+  return { observable, sourceData };
+}
diff --git a/public/app/plugins/datasource/dashboard/datasource.ts b/public/app/plugins/datasource/dashboard/datasource.ts
index 96fcc13c6f650..487475cc8ff3a 100644
--- a/public/app/plugins/datasource/dashboard/datasource.ts
+++ b/public/app/plugins/datasource/dashboard/datasource.ts
@@ -1,3 +1,5 @@
+import { Observable, defer, finalize, map, of } from 'rxjs';
+
 import {
   DataSourceApi,
   DataQueryRequest,
@@ -5,6 +7,8 @@ import {
   DataSourceInstanceSettings,
   TestDataSourceResponse,
 } from '@grafana/data';
+import { SceneDataProvider, SceneDataTransformer, SceneObject } from '@grafana/scenes';
+import { findVizPanelByKey, getVizPanelKeyForPanelId } from 'app/features/dashboard-scene/utils/utils';
 
 import { DashboardQuery } from './types';
 
@@ -20,8 +24,68 @@ export class DashboardDatasource extends DataSourceApi<DashboardQuery> {
     return `Dashboard Reference: ${query.panelId}`;
   }
 
-  query(options: DataQueryRequest<DashboardQuery>): Promise<DataQueryResponse> {
-    return Promise.reject('This should not be called directly');
+  query(options: DataQueryRequest<DashboardQuery>): Observable<DataQueryResponse> {
+    const scene: SceneObject | undefined = options.scopedVars?.__sceneObject?.value;
+
+    if (options.requestId.indexOf('mixed') > -1) {
+      throw new Error('Dashboard data source cannot be used with Mixed data source.');
+    }
+
+    if (!scene) {
+      throw new Error('Can only be called from a scene');
+    }
+
+    const query = options.targets[0];
+    if (!query) {
+      return of({ data: [] });
+    }
+
+    const panelId = query.panelId;
+
+    if (!panelId) {
+      return of({ data: [] });
+    }
+
+    let sourcePanel = this.findSourcePanel(scene, panelId);
+
+    if (!sourcePanel) {
+      return of({ data: [], error: { message: 'Could not find source panel' } });
+    }
+
+    let sourceDataProvider: SceneDataProvider | undefined = sourcePanel.state.$data;
+
+    if (!query.withTransforms && sourceDataProvider instanceof SceneDataTransformer) {
+      sourceDataProvider = sourceDataProvider.state.$data;
+    }
+
+    if (!sourceDataProvider || !sourceDataProvider.getResultsStream) {
+      return of({ data: [] });
+    }
+
+    return defer(() => {
+      if (!sourceDataProvider!.isActive && sourceDataProvider?.setContainerWidth) {
+        sourceDataProvider?.setContainerWidth(500);
+      }
+
+      const cleanUp = sourceDataProvider!.activate();
+
+      return sourceDataProvider!.getResultsStream!().pipe(
+        map((result) => {
+          return {
+            data: result.data.series,
+            state: result.data.state,
+            errors: result.data.errors,
+            error: result.data.error,
+            key: 'source-ds-provider',
+          };
+        }),
+        finalize(cleanUp)
+      );
+    });
+  }
+
+  private findSourcePanel(scene: SceneObject, panelId: number) {
+    return findVizPanelByKey(scene, getVizPanelKeyForPanelId(panelId));
   }
 
   testDatasource(): Promise<TestDataSourceResponse> {
diff --git a/public/app/plugins/datasource/dashboard/module.ts b/public/app/plugins/datasource/dashboard/module.ts
index 1fa8553046e00..c9f0cc591ecb0 100644
--- a/public/app/plugins/datasource/dashboard/module.ts
+++ b/public/app/plugins/datasource/dashboard/module.ts
@@ -1,5 +1,6 @@
 import { DataSourcePlugin } from '@grafana/data';
 
+import { DashboardQueryEditor } from './DashboardQueryEditor';
 import { DashboardDatasource } from './datasource';
 
-export const plugin = new DataSourcePlugin(DashboardDatasource);
+export const plugin = new DataSourcePlugin(DashboardDatasource).setQueryEditor(DashboardQueryEditor);
diff --git a/public/app/plugins/datasource/dashboard/runSharedRequest.ts b/public/app/plugins/datasource/dashboard/runSharedRequest.ts
index dd74a6661ba38..d4b73dd4cc3a1 100644
--- a/public/app/plugins/datasource/dashboard/runSharedRequest.ts
+++ b/public/app/plugins/datasource/dashboard/runSharedRequest.ts
@@ -11,6 +11,7 @@ import {
   DataTopic,
 } from '@grafana/data';
 import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
+import { PanelModel } from 'app/features/dashboard/state';
 import { QueryRunnerOptions } from 'app/features/query/state/PanelQueryRunner';
 
 import { DashboardQuery, SHARED_DASHBOARD_QUERY } from './types';
@@ -42,7 +43,12 @@ export function runSharedRequest(options: QueryRunnerOptions, query: DashboardQu
       return undefined;
     }
 
-    const listenToPanel = dashboard?.getPanelById(listenToPanelId);
+    // Source panel might be contained in a collapsed row, in which
+    // case we need to create a PanelModel
+    let listenToPanel = dashboard?.getPanelById(listenToPanelId, true);
+    if (!(listenToPanel instanceof PanelModel)) {
+      listenToPanel = new PanelModel(listenToPanel);
+    }
 
     if (!listenToPanel) {
       subscriber.next(getQueryError('Unknown Panel: ' + listenToPanelId));
@@ -71,7 +77,10 @@ export function runSharedRequest(options: QueryRunnerOptions, query: DashboardQu
 
     // If we are in fullscreen the other panel will not execute any queries
     // So we have to trigger it from here
-    if (!listenToPanel.isInView) {
+    if (
+      (!listenToPanel.isInView && listenToPanel.refreshWhenInView) ||
+      dashboard?.otherPanelInFullscreen(listenToPanel)
+    ) {
       const { datasource, targets } = listenToPanel;
       const modified = {
         ...options,
@@ -79,6 +88,8 @@ export function runSharedRequest(options: QueryRunnerOptions, query: DashboardQu
         panelId: listenToPanelId,
         queries: targets,
       };
+
+      listenToPanel.refreshWhenInView = false;
       listenToRunner.run(modified);
     }
 
diff --git a/public/app/plugins/datasource/elasticsearch/ElasticResponse.test.ts b/public/app/plugins/datasource/elasticsearch/ElasticResponse.test.ts
index e72e6b87a8cad..0f8a9aa059d04 100644
--- a/public/app/plugins/datasource/elasticsearch/ElasticResponse.test.ts
+++ b/public/app/plugins/datasource/elasticsearch/ElasticResponse.test.ts
@@ -1,9 +1,9 @@
 import { DataFrame, DataFrameView, Field, FieldCache, FieldType, KeyValue, MutableDataFrame } from '@grafana/data';
-import flatten from 'app/core/utils/flatten';
 
 import { ElasticResponse } from './ElasticResponse';
 import { highlightTags } from './queryDef';
 import { ElasticsearchQuery } from './types';
+import { flattenObject } from './utils';
 
 function getTimeField(frame: DataFrame): Field {
   const field = frame.fields[0];
@@ -1445,7 +1445,7 @@ describe('ElasticResponse', () => {
         expect(r._id).toEqual(response.responses[0].hits.hits[i]._id);
         expect(r._type).toEqual(response.responses[0].hits.hits[i]._type);
         expect(r._index).toEqual(response.responses[0].hits.hits[i]._index);
-        expect(r._source).toEqual(flatten(response.responses[0].hits.hits[i]._source));
+        expect(r._source).toEqual(flattenObject(response.responses[0].hits.hits[i]._source));
       }
 
       // Make a map from the histogram results
diff --git a/public/app/plugins/datasource/elasticsearch/ElasticResponse.ts b/public/app/plugins/datasource/elasticsearch/ElasticResponse.ts
index 797ec344ec8fa..07ef4a2645a15 100644
--- a/public/app/plugins/datasource/elasticsearch/ElasticResponse.ts
+++ b/public/app/plugins/datasource/elasticsearch/ElasticResponse.ts
@@ -10,13 +10,12 @@ import {
 } from '@grafana/data';
 import { convertFieldType } from '@grafana/data/src/transformations/transformers/convertFieldType';
 import TableModel from 'app/core/TableModel';
-import flatten from 'app/core/utils/flatten';
 
 import { isMetricAggregationWithField } from './components/QueryEditor/MetricAggregationsEditor/aggregations';
 import { metricAggregationConfig } from './components/QueryEditor/MetricAggregationsEditor/utils';
 import * as queryDef from './queryDef';
 import { ElasticsearchAggregation, ElasticsearchQuery, TopMetrics, ExtendedStatMetaType } from './types';
-import { describeMetric, getScriptValue } from './utils';
+import { describeMetric, flattenObject, getScriptValue } from './utils';
 
 const HIGHLIGHT_TAGS_EXP = `${queryDef.highlightTags.pre}([^@]+)${queryDef.highlightTags.post}`;
 type TopMetricMetric = Record<string, number>;
@@ -84,7 +83,7 @@ export class ElasticResponse {
         }
         case 'extended_stats': {
           for (const statName in metric.meta) {
-            if (!metric.meta[statName as ExtendedStatMetaType]) {
+            if (!metric.meta[statName]) {
               continue;
             }
 
@@ -210,7 +209,7 @@ export class ElasticResponse {
           }
           case 'extended_stats': {
             for (const statName in metric.meta) {
-              if (!metric.meta[statName as ExtendedStatMetaType]) {
+              if (!metric.meta[statName]) {
                 continue;
               }
 
@@ -340,7 +339,7 @@ export class ElasticResponse {
     if (target.alias) {
       const regex = /\{\{([\s\S]+?)\}\}/g;
 
-      return target.alias.replace(regex, (match: any, g1: any, g2: any) => {
+      return target.alias.replace(regex, (match, g1, g2) => {
         const group = g1 || g2;
 
         if (group.indexOf('term ') === 0) {
@@ -367,7 +366,7 @@ export class ElasticResponse {
           metricName = getScriptValue(agg);
 
           for (const pv of agg.pipelineVariables) {
-            const appliedAgg: any = find(target.metrics, { id: pv.pipelineAgg });
+            const appliedAgg = find(target.metrics, { id: pv.pipelineAgg });
             if (appliedAgg) {
               metricName = metricName.replace('params.' + pv.name, describeMetric(appliedAgg));
             }
@@ -376,7 +375,7 @@ export class ElasticResponse {
           metricName = 'Unset';
         }
       } else {
-        const appliedAgg: any = find(target.metrics, { id: series.field });
+        const appliedAgg = find(target.metrics, { id: series.field });
         if (appliedAgg) {
           metricName += ' ' + describeMetric(appliedAgg);
         } else {
@@ -678,7 +677,7 @@ const flattenHits = (hits: Doc[]): { docs: Array<Record<string, any>>; propNames
   let propNames: string[] = [];
 
   for (const hit of hits) {
-    const flattened = hit._source ? flatten(hit._source) : {};
+    const flattened = hit._source ? flattenObject(hit._source) : {};
     const doc = {
       _id: hit._id,
       _type: hit._type,
@@ -734,7 +733,7 @@ const createEmptyDataFrame = (
       name: logMessageField,
       type: FieldType.string,
     });
-    series.setParser(f, (v: any) => {
+    series.setParser(f, (v) => {
       return v || '';
     });
   }
@@ -744,7 +743,7 @@ const createEmptyDataFrame = (
       name: 'level',
       type: FieldType.string,
     });
-    series.setParser(f, (v: any) => {
+    series.setParser(f, (v) => {
       return v || '';
     });
   }
@@ -768,7 +767,7 @@ const createEmptyDataFrame = (
       name,
       type,
     });
-    series.setParser(f, (v: any) => {
+    series.setParser(f, (v) => {
       return v || '';
     });
   }
@@ -776,7 +775,7 @@ const createEmptyDataFrame = (
   return series;
 };
 
-const addPreferredVisualisationType = (series: any, type: PreferredVisualisationType) => {
+const addPreferredVisualisationType = (series: DataFrame, type: PreferredVisualisationType) => {
   let s = series;
   s.meta
     ? (s.meta.preferredVisualisationType = type)
@@ -786,7 +785,7 @@ const addPreferredVisualisationType = (series: any, type: PreferredVisualisation
 };
 
 const toNameTypePair =
-  (docs: Array<Record<string, any>>) =>
+  (docs: Array<Record<string, unknown>>) =>
   (propName: string): [string, FieldType] => [
     propName,
     guessType(docs.find((doc) => doc[propName] !== undefined)?.[propName]),
diff --git a/public/app/plugins/datasource/elasticsearch/IndexPattern.test.ts b/public/app/plugins/datasource/elasticsearch/IndexPattern.test.ts
index 38ecf5c07fa65..30ee68f7be352 100644
--- a/public/app/plugins/datasource/elasticsearch/IndexPattern.test.ts
+++ b/public/app/plugins/datasource/elasticsearch/IndexPattern.test.ts
@@ -1,5 +1,3 @@
-///<amd-dependency path="test/specs/helpers" name="helpers" />
-
 import { toUtc, getLocale, setLocale, dateTime } from '@grafana/data';
 
 import { IndexPattern } from './IndexPattern';
diff --git a/public/app/plugins/datasource/elasticsearch/LegacyQueryRunner.ts b/public/app/plugins/datasource/elasticsearch/LegacyQueryRunner.ts
index c70a6ee60b2ac..efb9d12591719 100644
--- a/public/app/plugins/datasource/elasticsearch/LegacyQueryRunner.ts
+++ b/public/app/plugins/datasource/elasticsearch/LegacyQueryRunner.ts
@@ -151,7 +151,11 @@ export class LegacyQueryRunner {
 
   query(request: DataQueryRequest<ElasticsearchQuery>): Observable<DataQueryResponse> {
     let payload = '';
-    const targets = this.datasource.interpolateVariablesInQueries(cloneDeep(request.targets), request.scopedVars);
+    const targets = this.datasource.interpolateVariablesInQueries(
+      cloneDeep(request.targets),
+      request.scopedVars,
+      request.filters
+    );
     const sentTargets: ElasticsearchQuery[] = [];
     let targetsContainsLogsQuery = targets.some((target) => hasMetricOfType(target, 'logs'));
 
diff --git a/public/app/plugins/datasource/elasticsearch/QueryBuilder.test.ts b/public/app/plugins/datasource/elasticsearch/QueryBuilder.test.ts
index c5cb83e50d2b8..aefa020ed310d 100644
--- a/public/app/plugins/datasource/elasticsearch/QueryBuilder.test.ts
+++ b/public/app/plugins/datasource/elasticsearch/QueryBuilder.test.ts
@@ -19,11 +19,11 @@ describe('ElasticQueryBuilder', () => {
   it('should clean settings from null values', () => {
     const query = builder.build({
       refId: 'A',
-      // The following `missing: null as any` is because previous versions of the DS where
+      // The following `missing: null as unknown as string` is because previous versions of the DS where
       // storing null in the query model when inputting an empty string,
       // which were then removed in the query builder.
       // The new version doesn't store empty strings at all. This tests ensures backward compatibility.
-      metrics: [{ type: 'avg', id: '0', settings: { missing: null as any, script: '1' } }],
+      metrics: [{ type: 'avg', id: '0', settings: { missing: null as unknown as string, script: '1' } }],
       timeField: '@timestamp',
       bucketAggs: [{ type: 'date_histogram', field: '@timestamp', id: '1' }],
     });
diff --git a/public/app/plugins/datasource/elasticsearch/QueryBuilder.ts b/public/app/plugins/datasource/elasticsearch/QueryBuilder.ts
index 59a7158c0cf5f..a5d7f767f2b6d 100644
--- a/public/app/plugins/datasource/elasticsearch/QueryBuilder.ts
+++ b/public/app/plugins/datasource/elasticsearch/QueryBuilder.ts
@@ -26,6 +26,9 @@ import {
 } from './types';
 import { convertOrderByToMetricId, getScriptValue } from './utils';
 
+// Omitting 1m, 1h, 1d for now, as these cover the main use cases for calendar_interval
+export const calendarIntervals: string[] = ['1w', '1M', '1q', '1y'];
+
 export class ElasticQueryBuilder {
   timeField: string;
 
@@ -34,17 +37,18 @@ export class ElasticQueryBuilder {
   }
 
   getRangeFilter() {
-    const filter: any = {};
-    filter[this.timeField] = {
-      gte: '$timeFrom',
-      lte: '$timeTo',
-      format: 'epoch_millis',
+    const filter = {
+      [this.timeField]: {
+        gte: '$timeFrom',
+        lte: '$timeTo',
+        format: 'epoch_millis',
+      },
     };
 
     return filter;
   }
 
-  buildTermsAgg(aggDef: Terms, queryNode: { terms?: any; aggs?: any }, target: ElasticsearchQuery) {
+  buildTermsAgg(aggDef: Terms, queryNode: { terms?: any; aggs?: Record<string, unknown> }, target: ElasticsearchQuery) {
     queryNode.terms = { field: aggDef.field };
 
     if (!aggDef.settings) {
@@ -98,9 +102,8 @@ export class ElasticQueryBuilder {
   }
 
   getDateHistogramAgg(aggDef: DateHistogram) {
-    const esAgg: any = {};
+    const esAgg: Record<string, unknown> = {};
     const settings = aggDef.settings || {};
-    const calendarIntervals: string[] = ['1w', '1M', '1q', '1y'];
 
     esAgg.field = aggDef.field || this.timeField;
     esAgg.min_doc_count = settings.min_doc_count || 0;
@@ -126,11 +129,11 @@ export class ElasticQueryBuilder {
   }
 
   getHistogramAgg(aggDef: Histogram) {
-    const esAgg: any = {};
-    const settings = aggDef.settings || {};
-    esAgg.interval = settings.interval;
-    esAgg.field = aggDef.field;
-    esAgg.min_doc_count = settings.min_doc_count || 0;
+    const esAgg = {
+      interval: aggDef.settings?.interval,
+      field: aggDef.field,
+      min_doc_count: aggDef.settings?.min_doc_count || 0,
+    };
 
     return esAgg;
   }
diff --git a/public/app/plugins/datasource/elasticsearch/components/AddRemove.tsx b/public/app/plugins/datasource/elasticsearch/components/AddRemove.tsx
index f2765277cd2c9..288ef03c1f1db 100644
--- a/public/app/plugins/datasource/elasticsearch/components/AddRemove.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/AddRemove.tsx
@@ -5,7 +5,7 @@ import { Button } from '@grafana/ui';
 
 interface Props {
   index: number;
-  elements: any[];
+  elements: unknown[];
   onAdd: () => void;
   onRemove: () => void;
 }
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/AnnotationQueryEditor.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/AnnotationQueryEditor.tsx
index 413decf565e96..3411b61164708 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/AnnotationQueryEditor.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/AnnotationQueryEditor.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { AnnotationQuery } from '@grafana/data';
 import { EditorField, EditorRow } from '@grafana/experimental';
-import { Input } from '@grafana/ui';
+import { Input, Stack } from '@grafana/ui';
 
 import { ElasticsearchQuery } from '../../types';
 
@@ -18,8 +18,8 @@ export function ElasticsearchAnnotationsQueryEditor(props: Props) {
   const onAnnotationChange = props.onAnnotationChange!;
 
   return (
-    <>
-      <div className="gf-form-group">
+    <Stack direction="column" gap={5}>
+      <div>
         <ElasticSearchQueryField
           value={annotation.target?.query}
           onChange={(query) => {
@@ -37,7 +37,7 @@ export function ElasticsearchAnnotationsQueryEditor(props: Props) {
         />
       </div>
 
-      <div className="gf-form-group">
+      <div>
         <h6>Field mappings</h6>
         <EditorRow>
           <EditorField label="Time">
@@ -92,6 +92,9 @@ export function ElasticsearchAnnotationsQueryEditor(props: Props) {
           </EditorField>
         </EditorRow>
       </div>
-    </>
+
+      {/*Empty div to preserve the bottom margin */}
+      <div />
+    </Stack>
   );
 }
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/DateHistogramSettingsEditor.test.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/DateHistogramSettingsEditor.test.tsx
new file mode 100644
index 0000000000000..52b45832fbf12
--- /dev/null
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/DateHistogramSettingsEditor.test.tsx
@@ -0,0 +1,86 @@
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+import { select } from 'react-select-event';
+
+import { useDispatch } from '../../../../hooks/useStatelessReducer';
+import { DateHistogram } from '../../../../types';
+
+import { DateHistogramSettingsEditor } from './DateHistogramSettingsEditor';
+
+jest.mock('../../../../hooks/useStatelessReducer');
+
+describe('DateHistogramSettingsEditor', () => {
+  test('Renders the date histogram selector', async () => {
+    const bucketAgg: DateHistogram = {
+      field: '@timestamp',
+      id: '2',
+      settings: { interval: 'auto' },
+      type: 'date_histogram',
+    };
+    render(<DateHistogramSettingsEditor bucketAgg={bucketAgg} />);
+    expect(await screen.findByText('Fixed interval')).toBeInTheDocument();
+    expect(await screen.findByText('auto')).toBeInTheDocument();
+  });
+  test('Renders the date histogram selector with a fixed interval', async () => {
+    const bucketAgg: DateHistogram = {
+      field: '@timestamp',
+      id: '2',
+      settings: { interval: '10s' },
+      type: 'date_histogram',
+    };
+    render(<DateHistogramSettingsEditor bucketAgg={bucketAgg} />);
+    expect(await screen.findByText('Fixed interval')).toBeInTheDocument();
+    expect(await screen.findByText('10s')).toBeInTheDocument();
+  });
+  test('Renders the date histogram selector with a calendar interval', async () => {
+    const bucketAgg: DateHistogram = {
+      field: '@timestamp',
+      id: '2',
+      settings: { interval: '1w' },
+      type: 'date_histogram',
+    };
+    render(<DateHistogramSettingsEditor bucketAgg={bucketAgg} />);
+    expect(await screen.findByText('Calendar interval')).toBeInTheDocument();
+    expect(await screen.findByText('1w')).toBeInTheDocument();
+  });
+
+  describe('Handling change', () => {
+    let dispatch = jest.fn();
+    beforeEach(() => {
+      dispatch.mockClear();
+      jest.mocked(useDispatch).mockReturnValue(dispatch);
+    });
+    test('Handles changing from calendar to fixed interval type', async () => {
+      const bucketAgg: DateHistogram = {
+        field: '@timestamp',
+        id: '2',
+        settings: { interval: '1w' },
+        type: 'date_histogram',
+      };
+      render(<DateHistogramSettingsEditor bucketAgg={bucketAgg} />);
+
+      expect(await screen.findByText('Calendar interval')).toBeInTheDocument();
+      expect(await screen.findByText('1w')).toBeInTheDocument();
+
+      await select(screen.getByLabelText('Calendar interval'), '10s', { container: document.body });
+
+      expect(dispatch).toHaveBeenCalledTimes(1);
+    });
+    test('Renders the date histogram selector with a calendar interval', async () => {
+      const bucketAgg: DateHistogram = {
+        field: '@timestamp',
+        id: '2',
+        settings: { interval: '1m' },
+        type: 'date_histogram',
+      };
+      render(<DateHistogramSettingsEditor bucketAgg={bucketAgg} />);
+
+      expect(await screen.findByText('Fixed interval')).toBeInTheDocument();
+      expect(await screen.findByText('1m')).toBeInTheDocument();
+
+      await select(screen.getByLabelText('Fixed interval'), '1q', { container: document.body });
+
+      expect(dispatch).toHaveBeenCalledTimes(1);
+    });
+  });
+});
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/DateHistogramSettingsEditor.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/DateHistogramSettingsEditor.tsx
index 5b5f1c5f03d25..52a3081ac1901 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/DateHistogramSettingsEditor.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/DateHistogramSettingsEditor.tsx
@@ -1,10 +1,11 @@
 import { uniqueId } from 'lodash';
-import React, { useRef } from 'react';
+import React, { useCallback, useRef } from 'react';
 import { GroupBase, OptionsOrGroups } from 'react-select';
 
 import { InternalTimeZones, SelectableValue } from '@grafana/data';
 import { InlineField, Input, Select, TimeZonePicker } from '@grafana/ui';
 
+import { calendarIntervals } from '../../../../QueryBuilder';
 import { useDispatch } from '../../../../hooks/useStatelessReducer';
 import { DateHistogram } from '../../../../types';
 import { useCreatableSelectPersistedBehaviour } from '../../../hooks/useCreatableSelectPersistedBehaviour';
@@ -22,6 +23,10 @@ const defaultIntervalOptions: Array<SelectableValue<string>> = [
   { label: '20m', value: '20m' },
   { label: '1h', value: '1h' },
   { label: '1d', value: '1d' },
+  { label: '1w', value: '1w' },
+  { label: '1M', value: '1M' },
+  { label: '1q', value: '1q' },
+  { label: '1y', value: '1y' },
 ];
 
 const hasValue =
@@ -48,16 +53,35 @@ interface Props {
   bucketAgg: DateHistogram;
 }
 
+const getIntervalType = (interval: string | undefined): 'calendar' | 'fixed' => {
+  return interval && calendarIntervals.includes(interval) ? 'calendar' : 'fixed';
+};
+
 export const DateHistogramSettingsEditor = ({ bucketAgg }: Props) => {
   const dispatch = useDispatch();
   const { current: baseId } = useRef(uniqueId('es-date_histogram-'));
 
-  const handleIntervalChange = ({ value }: SelectableValue<string>) =>
-    dispatch(changeBucketAggregationSetting({ bucketAgg, settingName: 'interval', newValue: value }));
+  const handleIntervalChange = useCallback(
+    ({ value }: SelectableValue<string>) =>
+      dispatch(changeBucketAggregationSetting({ bucketAgg, settingName: 'interval', newValue: value })),
+    [bucketAgg, dispatch]
+  );
+
+  const intervalType = getIntervalType(
+    bucketAgg.settings?.interval || bucketAggregationConfig.date_histogram.defaultSettings?.interval
+  );
 
   return (
     <>
-      <InlineField label="Interval" {...inlineFieldProps}>
+      <InlineField
+        label={intervalType === 'calendar' ? 'Calendar interval' : 'Fixed interval'}
+        tooltip={
+          intervalType === 'calendar'
+            ? 'Calendar-aware intervals adapt to varying day lengths, month durations, and leap seconds, considering the calendar context.'
+            : 'Fixed intervals remain constant, always being multiples of SI units, independent of calendar changes.'
+        }
+        {...inlineFieldProps}
+      >
         <Select
           inputId={uniqueId('es-date_histogram-interval')}
           isValidNewOption={isValidNewOption}
@@ -69,7 +93,6 @@ export const DateHistogramSettingsEditor = ({ bucketAgg }: Props) => {
           })}
         />
       </InlineField>
-
       <InlineField label="Min Doc Count" {...inlineFieldProps}>
         <Input
           id={`${baseId}-min_doc_count`}
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/TermsSettingsEditor.test.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/TermsSettingsEditor.test.tsx
index 87dedea1f6dcc..97442a66f354c 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/TermsSettingsEditor.test.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/TermsSettingsEditor.test.tsx
@@ -2,10 +2,9 @@ import { screen } from '@testing-library/react';
 import React from 'react';
 import selectEvent from 'react-select-event';
 
-import { describeMetric } from 'app/plugins/datasource/elasticsearch/utils';
-
 import { renderWithESProvider } from '../../../../test-helpers/render';
 import { ElasticsearchQuery, Terms, Average, Derivative, TopMetrics } from '../../../../types';
+import { describeMetric } from '../../../../utils';
 
 import { TermsSettingsEditor } from './TermsSettingsEditor';
 
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/TermsSettingsEditor.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/TermsSettingsEditor.tsx
index 5829a54108d97..7b005941ab814 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/TermsSettingsEditor.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/TermsSettingsEditor.tsx
@@ -102,7 +102,7 @@ function createOrderByOptionsForExtendedStats(metric: ExtendedStats): Selectable
   return metaKeys
     .filter((key) => metric.meta?.[key])
     .map((key) => {
-      let method = key as string;
+      let method: string = key;
       // The bucket path for std_deviation_bounds.lower and std_deviation_bounds.upper
       // is accessed via std_lower and std_upper, respectively.
       if (key === 'std_deviation_bounds_lower') {
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/index.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/index.tsx
index 5edfeb78605c0..eb3e650d73fc6 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/index.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/index.tsx
@@ -15,7 +15,7 @@ import { TermsSettingsEditor } from './TermsSettingsEditor';
 import { useDescription } from './useDescription';
 
 export const inlineFieldProps: Partial<ComponentProps<typeof InlineField>> = {
-  labelWidth: 16,
+  labelWidth: 18,
 };
 
 interface Props {
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/useDescription.ts b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/useDescription.ts
index 5def15faa5595..282df98b144cd 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/useDescription.ts
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/useDescription.ts
@@ -1,5 +1,4 @@
-import { defaultGeoHashPrecisionString } from 'app/plugins/datasource/elasticsearch/queryDef';
-
+import { defaultGeoHashPrecisionString } from '../../../../queryDef';
 import { BucketAggregation } from '../../../../types';
 import { describeMetric, convertOrderByToMetricId } from '../../../../utils';
 import { useQuery } from '../../ElasticsearchQueryContext';
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/state/actions.ts b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/state/actions.ts
index 2b200658d94ad..f128d5aa58212 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/state/actions.ts
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/state/actions.ts
@@ -15,5 +15,5 @@ export const changeBucketAggregationField = createAction<{
 export const changeBucketAggregationSetting = createAction<{
   bucketAgg: BucketAggregation;
   settingName: string;
-  newValue: any;
+  newValue: unknown;
 }>('@bucketAggs/change_setting');
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/state/reducer.test.ts b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/state/reducer.test.ts
index b39166c109302..bdb9616b91dcc 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/state/reducer.test.ts
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/state/reducer.test.ts
@@ -1,9 +1,6 @@
-import { reducerTester } from 'test/core/redux/reducerTester';
-
-import { defaultBucketAgg } from 'app/plugins/datasource/elasticsearch/queryDef';
-import { ElasticsearchQuery } from 'app/plugins/datasource/elasticsearch/types';
-
-import { BucketAggregation, DateHistogram } from '../../../../types';
+import { defaultBucketAgg } from '../../../../queryDef';
+import { BucketAggregation, DateHistogram, ElasticsearchQuery } from '../../../../types';
+import { reducerTester } from '../../../reducerTester';
 import { changeMetricType } from '../../MetricAggregationsEditor/state/actions';
 import { initQuery } from '../../state';
 import { bucketAggregationConfig } from '../utils';
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/ElasticsearchQueryContext.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/ElasticsearchQueryContext.tsx
index f91fe3d209d16..dda0b664f53f1 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/ElasticsearchQueryContext.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/ElasticsearchQueryContext.tsx
@@ -91,7 +91,7 @@ const getHook: GetHook = (c) => () => {
     throw new Error('use ElasticsearchProvider first.');
   }
 
-  return contextValue as NonNullable<typeof contextValue>;
+  return contextValue;
 };
 
 export const useQuery = getHook(QueryContext);
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/MetricEditor.test.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/MetricEditor.test.tsx
index 3b844138b922a..81a21af465272 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/MetricEditor.test.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/MetricEditor.test.tsx
@@ -116,9 +116,7 @@ describe('Metric Editor', () => {
 
     render(<MetricEditor value={count} />, { wrapper });
 
-    act(() => {
-      userEvent.click(screen.getByText('Count'));
-    });
+    await userEvent.click(screen.getByText('Count'));
 
     // we check if the list-of-options is visible by
     // checking for an item to exist
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/BucketScriptSettingsEditor/state/reducer.test.ts b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/BucketScriptSettingsEditor/state/reducer.test.ts
index f21388ffc7f8f..b9ecf0749e7d5 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/BucketScriptSettingsEditor/state/reducer.test.ts
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/BucketScriptSettingsEditor/state/reducer.test.ts
@@ -1,6 +1,5 @@
-import { reducerTester } from 'test/core/redux/reducerTester';
-
 import { PipelineVariable } from '../../../../../../types';
+import { reducerTester } from '../../../../../reducerTester';
 
 import {
   addPipelineVariable,
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/SettingField.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/SettingField.tsx
index 8d58b2960d1e4..5a0d48924c1f4 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/SettingField.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/SettingField.tsx
@@ -2,10 +2,10 @@ import { uniqueId } from 'lodash';
 import React, { ComponentProps, useState } from 'react';
 
 import { InlineField, Input } from '@grafana/ui';
-import { getScriptValue } from 'app/plugins/datasource/elasticsearch/utils';
 
 import { useDispatch } from '../../../../hooks/useStatelessReducer';
 import { MetricAggregationWithInlineScript, MetricAggregationWithSettings } from '../../../../types';
+import { getScriptValue } from '../../../../utils';
 import { SettingKeyOf } from '../../../types';
 import { changeMetricSetting } from '../state/actions';
 
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/state/actions.ts b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/state/actions.ts
index 9c3fe19f47caa..e7dc68aa1bd0f 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/state/actions.ts
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/state/actions.ts
@@ -9,16 +9,16 @@ export const changeMetricField = createAction<{ id: MetricAggregation['id']; fie
 export const changeMetricType = createAction<{ id: MetricAggregation['id']; type: MetricAggregation['type'] }>(
   '@metrics/change_type'
 );
-export const changeMetricAttribute = createAction<{ metric: MetricAggregation; attribute: string; newValue: any }>(
+export const changeMetricAttribute = createAction<{ metric: MetricAggregation; attribute: string; newValue: unknown }>(
   '@metrics/change_attr'
 );
 export const changeMetricSetting = createAction<{
   metric: MetricAggregationWithSettings;
   settingName: string;
-  newValue: any;
+  newValue: unknown;
 }>('@metrics/change_setting');
 export const changeMetricMeta = createAction<{
   metric: MetricAggregationWithMeta;
   meta: string;
-  newValue: any;
+  newValue: unknown;
 }>('@metrics/change_meta');
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/state/reducer.test.ts b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/state/reducer.test.ts
index 246642b7b5eec..0719b2024c8f9 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/state/reducer.test.ts
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/state/reducer.test.ts
@@ -1,9 +1,6 @@
-import { reducerTester } from 'test/core/redux/reducerTester';
-
-import { ElasticsearchQuery } from 'app/plugins/datasource/elasticsearch/types';
-
 import { defaultMetricAgg } from '../../../../queryDef';
-import { Derivative, ExtendedStats, MetricAggregation } from '../../../../types';
+import { Derivative, ElasticsearchQuery, ExtendedStats, MetricAggregation } from '../../../../types';
+import { reducerTester } from '../../../reducerTester';
 import { initQuery } from '../../state';
 import { metricAggregationConfig } from '../utils';
 
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/state.test.ts b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/state.test.ts
index bb7ea5a161fa5..987551baf51c5 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/state.test.ts
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/state.test.ts
@@ -1,6 +1,5 @@
-import { reducerTester } from 'test/core/redux/reducerTester';
-
 import { ElasticsearchQuery } from '../../types';
+import { reducerTester } from '../reducerTester';
 
 import { aliasPatternReducer, changeAliasPattern, changeQuery, initQuery, queryReducer } from './state';
 
diff --git a/public/app/plugins/datasource/elasticsearch/components/reducerTester.ts b/public/app/plugins/datasource/elasticsearch/components/reducerTester.ts
new file mode 100644
index 0000000000000..38c466afa2b6b
--- /dev/null
+++ b/public/app/plugins/datasource/elasticsearch/components/reducerTester.ts
@@ -0,0 +1,109 @@
+import { AnyAction } from '@reduxjs/toolkit';
+import { cloneDeep } from 'lodash';
+import { Action } from 'redux';
+
+import { StoreState } from 'app/types';
+
+type GrafanaReducer<S = StoreState, A extends Action = AnyAction> = (state: S, action: A) => S;
+
+export interface Given<State> {
+  givenReducer: (
+    reducer: GrafanaReducer<State, AnyAction>,
+    state: State,
+    showDebugOutput?: boolean,
+    disableDeepFreeze?: boolean
+  ) => When<State>;
+}
+
+export interface When<State> {
+  whenActionIsDispatched: (action: AnyAction) => Then<State>;
+}
+
+export interface Then<State> {
+  thenStateShouldEqual: (state: State) => When<State>;
+  thenStatePredicateShouldEqual: (predicate: (resultingState: State) => boolean) => When<State>;
+  whenActionIsDispatched: (action: AnyAction) => Then<State>;
+}
+
+const isNotException = (object: unknown, propertyName: string) =>
+  typeof object === 'function'
+    ? propertyName !== 'caller' && propertyName !== 'callee' && propertyName !== 'arguments'
+    : true;
+
+export const deepFreeze = <T>(obj: T): T => {
+  if (typeof obj === 'object') {
+    for (const key in obj) {
+      const prop = obj[key];
+
+      if (
+        prop &&
+        Object.hasOwn(obj, key) &&
+        isNotException(obj, key) &&
+        (typeof prop === 'object' || typeof prop === 'function') &&
+        !Object.isFrozen(prop)
+      ) {
+        deepFreeze(prop);
+      }
+    }
+  }
+
+  return Object.freeze(obj);
+};
+
+interface ReducerTester<State> extends Given<State>, When<State>, Then<State> {}
+
+export const reducerTester = <State>(): Given<State> => {
+  let reducerUnderTest: GrafanaReducer<State, AnyAction>;
+  let resultingState: State;
+  let initialState: State;
+  let showDebugOutput = false;
+
+  const givenReducer = (
+    reducer: GrafanaReducer<State, AnyAction>,
+    state: State,
+    debug = false,
+    disableDeepFreeze = false
+  ): When<State> => {
+    reducerUnderTest = reducer;
+    initialState = cloneDeep(state);
+    if (!disableDeepFreeze && (typeof state === 'object' || typeof state === 'function')) {
+      deepFreeze(initialState);
+    }
+    showDebugOutput = debug;
+
+    return instance;
+  };
+
+  const whenActionIsDispatched = (action: AnyAction): Then<State> => {
+    resultingState = reducerUnderTest(resultingState || initialState, action);
+
+    return instance;
+  };
+
+  const thenStateShouldEqual = (state: State): When<State> => {
+    if (showDebugOutput) {
+      console.log(JSON.stringify(resultingState, null, 2));
+    }
+    expect(resultingState).toEqual(state);
+
+    return instance;
+  };
+
+  const thenStatePredicateShouldEqual = (predicate: (resultingState: State) => boolean): When<State> => {
+    if (showDebugOutput) {
+      console.log(JSON.stringify(resultingState, null, 2));
+    }
+    expect(predicate(resultingState)).toBe(true);
+
+    return instance;
+  };
+
+  const instance: ReducerTester<State> = {
+    thenStateShouldEqual,
+    thenStatePredicateShouldEqual,
+    givenReducer,
+    whenActionIsDispatched,
+  };
+
+  return instance;
+};
diff --git a/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.test.tsx b/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.test.tsx
index 850cdb470dfec..8438017aa4097 100644
--- a/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.test.tsx
+++ b/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.test.tsx
@@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react';
 import React from 'react';
 
 import { ConfigEditor } from './ConfigEditor';
-import { createDefaultConfigOptions } from './mocks';
+import { createDefaultConfigOptions } from './__mocks__/configOptions';
 
 describe('ConfigEditor', () => {
   it('should render without error', () => {
diff --git a/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.tsx
index a3ca98774df84..1dc4aa84780b3 100644
--- a/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.tsx
@@ -11,9 +11,8 @@ import {
   convertLegacyAuthProps,
   DataSourceDescription,
 } from '@grafana/experimental';
-import { Alert, SecureSocksProxySettings } from '@grafana/ui';
-import { Divider } from 'app/core/components/Divider';
-import { config } from 'app/core/config';
+import { config } from '@grafana/runtime';
+import { Alert, SecureSocksProxySettings, Divider, Stack } from '@grafana/ui';
 
 import { ElasticsearchOptions } from '../types';
 
@@ -61,9 +60,9 @@ export const ConfigEditor = (props: Props) => {
         docsLink="https://grafana.com/docs/grafana/latest/datasources/elasticsearch"
         hasRequiredFields={false}
       />
-      <Divider />
+      <Divider spacing={4} />
       <ConnectionSettings config={options} onChange={onOptionsChange} urlPlaceholder="http://localhost:9200" />
-      <Divider />
+      <Divider spacing={4} />
       <Auth
         {...authProps}
         onAuthMethodSelect={(method) => {
@@ -79,42 +78,41 @@ export const ConfigEditor = (props: Props) => {
           });
         }}
       />
-      <Divider />
+      <Divider spacing={4} />
       <ConfigSection
         title="Additional settings"
         description="Additional settings are optional settings that can be configured for more control over your data source."
         isCollapsible={true}
         isInitiallyOpen
       >
-        <AdvancedHttpSettings config={options} onChange={onOptionsChange} />
-        <Divider hideLine />
-        {config.secureSocksDSProxyEnabled && (
-          <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
-        )}
-        <ElasticDetails value={options} onChange={onOptionsChange} />
-        <Divider hideLine />
-        <LogsConfig
-          value={options.jsonData}
-          onChange={(newValue) =>
-            onOptionsChange({
-              ...options,
-              jsonData: newValue,
-            })
-          }
-        />
-        <Divider hideLine />
-        <DataLinks
-          value={options.jsonData.dataLinks}
-          onChange={(newValue) => {
-            onOptionsChange({
-              ...options,
-              jsonData: {
-                ...options.jsonData,
-                dataLinks: newValue,
-              },
-            });
-          }}
-        />
+        <Stack gap={5} direction="column">
+          <AdvancedHttpSettings config={options} onChange={onOptionsChange} />
+          {config.secureSocksDSProxyEnabled && (
+            <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
+          )}
+          <ElasticDetails value={options} onChange={onOptionsChange} />
+          <LogsConfig
+            value={options.jsonData}
+            onChange={(newValue) =>
+              onOptionsChange({
+                ...options,
+                jsonData: newValue,
+              })
+            }
+          />
+          <DataLinks
+            value={options.jsonData.dataLinks}
+            onChange={(newValue) => {
+              onOptionsChange({
+                ...options,
+                jsonData: {
+                  ...options.jsonData,
+                  dataLinks: newValue,
+                },
+              });
+            }}
+          />
+        </Stack>
       </ConfigSection>
     </>
   );
diff --git a/public/app/plugins/datasource/elasticsearch/configuration/DataLink.tsx b/public/app/plugins/datasource/elasticsearch/configuration/DataLink.tsx
index 37a0fab60b1b5..da2c231ad135c 100644
--- a/public/app/plugins/datasource/elasticsearch/configuration/DataLink.tsx
+++ b/public/app/plugins/datasource/elasticsearch/configuration/DataLink.tsx
@@ -3,53 +3,31 @@ import React, { Dispatch, SetStateAction, useEffect, useState } from 'react';
 import { usePrevious } from 'react-use';
 
 import { DataSourceInstanceSettings, VariableSuggestion } from '@grafana/data';
+import { DataSourcePicker } from '@grafana/runtime';
 import {
   Button,
   DataLinkInput,
-  stylesFactory,
   InlineField,
   InlineSwitch,
   InlineFieldRow,
   InlineLabel,
   Input,
+  useStyles2,
 } from '@grafana/ui';
-import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker';
 
 import { DataLinkConfig } from '../types';
 
-const getStyles = stylesFactory(() => ({
-  firstRow: css`
-    display: flex;
-  `,
-  nameField: css`
-    flex: 2;
-  `,
-  regexField: css`
-    flex: 3;
-  `,
-  row: css`
-    display: flex;
-    align-items: baseline;
-  `,
-  urlField: css`
-    display: flex;
-    flex: 1;
-  `,
-  urlDisplayLabelField: css`
-    flex: 1;
-  `,
-}));
-
-type Props = {
+interface Props {
   value: DataLinkConfig;
   onChange: (value: DataLinkConfig) => void;
   onDelete: () => void;
   suggestions: VariableSuggestion[];
   className?: string;
-};
+}
+
 export const DataLink = (props: Props) => {
   const { value, onChange, onDelete, suggestions, className } = props;
-  const styles = getStyles();
+  const styles = useStyles2(getStyles);
   const [showInternalLink, setShowInternalLink] = useInternalLink(value.datasourceUid);
 
   const handleChange = (field: keyof typeof value) => (event: React.ChangeEvent<HTMLInputElement>) => {
@@ -173,3 +151,26 @@ function useInternalLink(datasourceUid?: string): [boolean, Dispatch<SetStateAct
 
   return [showInternalLink, setShowInternalLink];
 }
+
+const getStyles = () => ({
+  firstRow: css`
+    display: flex;
+  `,
+  nameField: css`
+    flex: 2;
+  `,
+  regexField: css`
+    flex: 3;
+  `,
+  row: css`
+    display: flex;
+    align-items: baseline;
+  `,
+  urlField: css`
+    display: flex;
+    flex: 1;
+  `,
+  urlDisplayLabelField: css`
+    flex: 1;
+  `,
+});
diff --git a/public/app/plugins/datasource/elasticsearch/configuration/DataLinks.tsx b/public/app/plugins/datasource/elasticsearch/configuration/DataLinks.tsx
index f6ee3b1a6d312..ed340f5c0443f 100644
--- a/public/app/plugins/datasource/elasticsearch/configuration/DataLinks.tsx
+++ b/public/app/plugins/datasource/elasticsearch/configuration/DataLinks.tsx
@@ -2,9 +2,8 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2, VariableOrigin, DataLinkBuiltInVars } from '@grafana/data';
-import { ConfigSubSection } from '@grafana/experimental';
+import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/experimental';
 import { Button, useStyles2 } from '@grafana/ui';
-import { ConfigDescriptionLink } from 'app/core/components/ConfigDescriptionLink';
 
 import { DataLinkConfig } from '../types';
 
diff --git a/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.test.tsx b/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.test.tsx
index 42c69cd9cd9a1..0b7af77201d8a 100644
--- a/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.test.tsx
+++ b/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.test.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import selectEvent from 'react-select-event';
 
 import { ElasticDetails } from './ElasticDetails';
-import { createDefaultConfigOptions } from './mocks';
+import { createDefaultConfigOptions } from './__mocks__/configOptions';
 
 describe('ElasticDetails', () => {
   describe('Max concurrent Shard Requests', () => {
diff --git a/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx b/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx
index f0d51d209e340..4b8707e465ef6 100644
--- a/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx
+++ b/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx
@@ -1,9 +1,8 @@
 import React from 'react';
 
 import { DataSourceSettings, SelectableValue } from '@grafana/data';
-import { ConfigSubSection } from '@grafana/experimental';
+import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/experimental';
 import { InlineField, Input, Select, InlineSwitch } from '@grafana/ui';
-import { ConfigDescriptionLink } from 'app/core/components/ConfigDescriptionLink';
 
 import { ElasticsearchOptions, Interval } from '../types';
 
@@ -116,29 +115,18 @@ export const ElasticDetails = ({ value, onChange }: Props) => {
           placeholder="10s"
         />
       </InlineField>
-
-      <InlineField label="X-Pack enabled" labelWidth={29} tooltip="Enable or disable X-Pack specific features">
+      <InlineField
+        label="Include Frozen Indices"
+        htmlFor="es_config_frozenIndices"
+        labelWidth={29}
+        tooltip="Include frozen indices in searches."
+      >
         <InlineSwitch
-          id="es_config_xpackEnabled"
-          value={value.jsonData.xpack || false}
-          onChange={jsonDataSwitchChangeHandler('xpack', value, onChange)}
+          id="es_config_frozenIndices"
+          value={value.jsonData.includeFrozen ?? false}
+          onChange={jsonDataSwitchChangeHandler('includeFrozen', value, onChange)}
         />
       </InlineField>
-
-      {value.jsonData.xpack && (
-        <InlineField
-          label="Include Frozen Indices"
-          htmlFor="es_config_frozenIndices"
-          labelWidth={29}
-          tooltip="Include frozen indices in searches."
-        >
-          <InlineSwitch
-            id="es_config_frozenIndices"
-            value={value.jsonData.includeFrozen ?? false}
-            onChange={jsonDataSwitchChangeHandler('includeFrozen', value, onChange)}
-          />
-        </InlineField>
-      )}
     </ConfigSubSection>
   );
 };
diff --git a/public/app/plugins/datasource/elasticsearch/configuration/LogsConfig.test.tsx b/public/app/plugins/datasource/elasticsearch/configuration/LogsConfig.test.tsx
index 861ed7cdfc17b..97d3d130398da 100644
--- a/public/app/plugins/datasource/elasticsearch/configuration/LogsConfig.test.tsx
+++ b/public/app/plugins/datasource/elasticsearch/configuration/LogsConfig.test.tsx
@@ -2,7 +2,7 @@ import { render, screen, fireEvent } from '@testing-library/react';
 import React from 'react';
 
 import { LogsConfig } from './LogsConfig';
-import { createDefaultConfigOptions } from './mocks';
+import { createDefaultConfigOptions } from './__mocks__/configOptions';
 
 describe('ElasticDetails', () => {
   it('should pass correct data to onChange', () => {
diff --git a/public/app/plugins/datasource/elasticsearch/configuration/LogsConfig.tsx b/public/app/plugins/datasource/elasticsearch/configuration/LogsConfig.tsx
index efaa9300e86dc..3289d2fd90ac1 100644
--- a/public/app/plugins/datasource/elasticsearch/configuration/LogsConfig.tsx
+++ b/public/app/plugins/datasource/elasticsearch/configuration/LogsConfig.tsx
@@ -1,8 +1,7 @@
 import React from 'react';
 
-import { ConfigSubSection } from '@grafana/experimental';
+import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/experimental';
 import { Input, InlineField } from '@grafana/ui';
-import { ConfigDescriptionLink } from 'app/core/components/ConfigDescriptionLink';
 
 import { ElasticsearchOptions } from '../types';
 
diff --git a/public/app/plugins/datasource/elasticsearch/configuration/__mocks__/configOptions.ts b/public/app/plugins/datasource/elasticsearch/configuration/__mocks__/configOptions.ts
new file mode 100644
index 0000000000000..8f7e7963cebe3
--- /dev/null
+++ b/public/app/plugins/datasource/elasticsearch/configuration/__mocks__/configOptions.ts
@@ -0,0 +1,17 @@
+import { DataSourceSettings } from '@grafana/data';
+
+import { ElasticsearchOptions } from '../../types';
+
+export function createDefaultConfigOptions(): DataSourceSettings<ElasticsearchOptions> {
+  return {
+    jsonData: {
+      timeField: '@time',
+      interval: 'Hourly',
+      timeInterval: '10s',
+      maxConcurrentShardRequests: 300,
+      logMessageField: 'test.message',
+      logLevelField: 'test.level',
+    },
+    secureJsonFields: {},
+  } as DataSourceSettings<ElasticsearchOptions>;
+}
diff --git a/public/app/plugins/datasource/elasticsearch/configuration/mocks.ts b/public/app/plugins/datasource/elasticsearch/configuration/mocks.ts
deleted file mode 100644
index c716a4d03ab63..0000000000000
--- a/public/app/plugins/datasource/elasticsearch/configuration/mocks.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { DataSourceSettings } from '@grafana/data';
-import { getMockDataSource } from 'app/features/datasources/__mocks__';
-
-import { ElasticsearchOptions } from '../types';
-
-export function createDefaultConfigOptions(
-  options?: Partial<ElasticsearchOptions>
-): DataSourceSettings<ElasticsearchOptions> {
-  return getMockDataSource<ElasticsearchOptions>({
-    jsonData: {
-      timeField: '@time',
-      interval: 'Hourly',
-      timeInterval: '10s',
-      maxConcurrentShardRequests: 300,
-      logMessageField: 'test.message',
-      logLevelField: 'test.level',
-      ...options,
-    },
-  });
-}
diff --git a/public/app/plugins/datasource/elasticsearch/dataquery.gen.ts b/public/app/plugins/datasource/elasticsearch/dataquery.gen.ts
index f9f394294f6cc..f18c10029c05a 100644
--- a/public/app/plugins/datasource/elasticsearch/dataquery.gen.ts
+++ b/public/app/plugins/datasource/elasticsearch/dataquery.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
@@ -376,7 +376,7 @@ export type PipelineMetricAggregation = (MovingAverage | Derivative | Cumulative
 
 export type MetricAggregationWithSettings = (BucketScript | CumulativeSum | Derivative | SerialDiff | RawData | RawDocument | UniqueCount | Percentiles | ExtendedStats | Min | Max | Sum | Average | MovingAverage | MovingFunction | Logs | Rate | TopMetrics);
 
-export interface Elasticsearch extends common.DataQuery {
+export interface ElasticsearchDataQuery extends common.DataQuery {
   /**
    * Alias pattern
    */
@@ -399,7 +399,7 @@ export interface Elasticsearch extends common.DataQuery {
   timeField?: string;
 }
 
-export const defaultElasticsearch: Partial<Elasticsearch> = {
+export const defaultElasticsearchDataQuery: Partial<ElasticsearchDataQuery> = {
   bucketAggs: [],
   metrics: [],
 };
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.test.ts b/public/app/plugins/datasource/elasticsearch/datasource.test.ts
index ad7b29dd6ecf3..b0ed2a0de6b1b 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.test.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.test.ts
@@ -1,6 +1,5 @@
 import { map } from 'lodash';
 import { Observable, of, throwError } from 'rxjs';
-import { getQueryOptions } from 'test/helpers/getQueryOptions';
 
 import {
   CoreApp,
@@ -18,9 +17,6 @@ import {
   toUtc,
 } from '@grafana/data';
 import { BackendSrvRequest, FetchResponse, reportInteraction, config } from '@grafana/runtime';
-import { backendSrv } from 'app/core/services/backend_srv'; // will use the version in __mocks__
-
-import { createFetchResponse } from '../../../../test/helpers/createFetchResponse';
 
 import { enhanceDataFrame } from './LegacyQueryRunner';
 import { ElasticDatasource } from './datasource';
@@ -30,7 +26,9 @@ import { Filters, ElasticsearchOptions, ElasticsearchQuery } from './types';
 const ELASTICSEARCH_MOCK_URL = 'http://elasticsearch.local';
 
 const originalConsoleError = console.error;
-
+const backendSrv = {
+  fetch: jest.fn(),
+};
 jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
   getBackendSrv: () => backendSrv,
@@ -44,6 +42,15 @@ jest.mock('@grafana/runtime', () => ({
   },
 }));
 
+const createTimeRange = (from: DateTime, to: DateTime): TimeRange => ({
+  from,
+  to,
+  raw: {
+    from,
+    to,
+  },
+});
+
 const TIME_START = [2022, 8, 21, 6, 10, 10];
 const TIME_END = [2022, 8, 24, 6, 10, 21];
 const DATAQUERY_BASE = {
@@ -56,16 +63,22 @@ const DATAQUERY_BASE = {
   timezone: '',
   app: 'test',
   startTime: 0,
+  range: createTimeRange(toUtc(TIME_START), toUtc(TIME_END)),
 };
 
-const createTimeRange = (from: DateTime, to: DateTime): TimeRange => ({
-  from,
-  to,
-  raw: {
-    from,
-    to,
-  },
-});
+function createFetchResponse<T>(data: T): FetchResponse<T> {
+  return {
+    data,
+    status: 200,
+    url: 'http://localhost:3000/api/ds/query',
+    config: { url: 'http://localhost:3000/api/ds/query' },
+    type: 'basic',
+    statusText: 'Ok',
+    redirected: false,
+    headers: {} as unknown as Headers,
+    ok: true,
+  };
+}
 
 interface TestContext {
   data?: Data;
@@ -151,6 +164,15 @@ describe('ElasticDatasource', () => {
       const lastCall = fetchMock.mock.calls[fetchMock.mock.calls.length - 1];
       expect(lastCall[0].url).toBe(`${ELASTICSEARCH_MOCK_URL}/test-${today}/_mapping`);
     });
+
+    it('should call `/_mapping` with an empty index', async () => {
+      const { ds, fetchMock } = getTestContext({ jsonData: { index: '' } });
+
+      await ds.testDatasource();
+
+      const lastCall = fetchMock.mock.calls[fetchMock.mock.calls.length - 1];
+      expect(lastCall[0].url).toBe(`${ELASTICSEARCH_MOCK_URL}/_mapping`);
+    });
   });
 
   describe('When issuing metric query with interval pattern', () => {
@@ -968,29 +990,31 @@ describe('ElasticDatasource', () => {
     });
 
     it('does not create a logs sample provider for non time series query', () => {
-      const options = getQueryOptions<ElasticsearchQuery>({
+      const options: DataQueryRequest<ElasticsearchQuery> = {
+        ...DATAQUERY_BASE,
         targets: [
           {
             refId: 'A',
             metrics: [{ type: 'logs', id: '1', settings: { limit: '100' } }],
           },
         ],
-      });
+      };
 
-      expect(ds.getDataProvider(SupplementaryQueryType.LogsSample, options)).not.toBeDefined();
+      expect(ds.getSupplementaryRequest(SupplementaryQueryType.LogsSample, options)).not.toBeDefined();
     });
 
     it('does create a logs sample provider for time series query', () => {
-      const options = getQueryOptions<ElasticsearchQuery>({
+      const options: DataQueryRequest<ElasticsearchQuery> = {
+        ...DATAQUERY_BASE,
         targets: [
           {
             refId: 'A',
             bucketAggs: [{ type: 'date_histogram', id: '1' }],
           },
         ],
-      });
+      };
 
-      expect(ds.getDataProvider(SupplementaryQueryType.LogsSample, options)).toBeDefined();
+      expect(ds.getSupplementaryRequest(SupplementaryQueryType.LogsSample, options)).toBeDefined();
     });
   });
 
@@ -1001,48 +1025,44 @@ describe('ElasticDatasource', () => {
     });
 
     it("doesn't return a logs sample provider given a non time series query", () => {
-      const request = getQueryOptions<ElasticsearchQuery>({
+      const request: DataQueryRequest<ElasticsearchQuery> = {
+        ...DATAQUERY_BASE,
         targets: [
           {
             refId: 'A',
             metrics: [{ type: 'logs', id: '1', settings: { limit: '100' } }],
           },
         ],
-      });
+      };
 
-      expect(ds.getLogsSampleDataProvider(request)).not.toBeDefined();
+      expect(ds.getSupplementaryRequest(SupplementaryQueryType.LogsSample, request)).not.toBeDefined();
     });
 
     it('returns a logs sample provider given a time series query', () => {
-      const request = getQueryOptions<ElasticsearchQuery>({
+      const request: DataQueryRequest<ElasticsearchQuery> = {
+        ...DATAQUERY_BASE,
         targets: [
           {
             refId: 'A',
             bucketAggs: [{ type: 'date_histogram', id: '1' }],
           },
         ],
-      });
+      };
 
-      expect(ds.getLogsSampleDataProvider(request)).toBeDefined();
+      expect(ds.getSupplementaryRequest(SupplementaryQueryType.LogsSample, request)).toBeDefined();
     });
   });
 });
 
 describe('getMultiSearchUrl', () => {
   it('Should add correct params to URL if "includeFrozen" is enabled', () => {
-    const { ds } = getTestContext({ jsonData: { includeFrozen: true, xpack: true } });
+    const { ds } = getTestContext({ jsonData: { includeFrozen: true } });
 
     expect(ds.getMultiSearchUrl()).toMatch(/ignore_throttled=false/);
   });
 
   it('Should NOT add ignore_throttled if "includeFrozen" is disabled', () => {
-    const { ds } = getTestContext({ jsonData: { includeFrozen: false, xpack: true } });
-
-    expect(ds.getMultiSearchUrl()).not.toMatch(/ignore_throttled=false/);
-  });
-
-  it('Should NOT add ignore_throttled if "xpack" is disabled', () => {
-    const { ds } = getTestContext({ jsonData: { includeFrozen: true, xpack: false } });
+    const { ds } = getTestContext({ jsonData: { includeFrozen: false } });
 
     expect(ds.getMultiSearchUrl()).not.toMatch(/ignore_throttled=false/);
   });
@@ -1134,30 +1154,75 @@ describe('enhanceDataFrame', () => {
 
 describe('modifyQuery', () => {
   let ds: ElasticDatasource;
+  let query: ElasticsearchQuery;
   beforeEach(() => {
     ds = getTestContext().ds;
   });
   describe('with empty query', () => {
-    let query: ElasticsearchQuery;
+    describe('ADD_FILTER and ADD_FITER_OUT', () => {
+      beforeEach(() => {
+        query = { query: '', refId: 'A' };
+      });
+
+      it('should add the filter', () => {
+        expect(ds.modifyQuery(query, { type: 'ADD_FILTER', options: { key: 'foo', value: 'bar' } }).query).toBe(
+          'foo:"bar"'
+        );
+      });
+
+      it('should add the negative filter', () => {
+        expect(ds.modifyQuery(query, { type: 'ADD_FILTER_OUT', options: { key: 'foo', value: 'bar' } }).query).toBe(
+          '-foo:"bar"'
+        );
+      });
+
+      it('should do nothing on unknown type', () => {
+        expect(ds.modifyQuery(query, { type: 'unknown', options: { key: 'foo', value: 'bar' } }).query).toBe(
+          query.query
+        );
+      });
+    });
+
+    describe('with non-empty query', () => {
+      let query: ElasticsearchQuery;
+      beforeEach(() => {
+        query = { query: 'test:"value"', refId: 'A' };
+      });
+
+      it('should add the filter', () => {
+        expect(ds.modifyQuery(query, { type: 'ADD_FILTER', options: { key: 'foo', value: 'bar' } }).query).toBe(
+          'test:"value" AND foo:"bar"'
+        );
+      });
+
+      it('should add the negative filter', () => {
+        expect(ds.modifyQuery(query, { type: 'ADD_FILTER_OUT', options: { key: 'foo', value: 'bar' } }).query).toBe(
+          'test:"value" AND -foo:"bar"'
+        );
+      });
+
+      it('should do nothing on unknown type', () => {
+        expect(ds.modifyQuery(query, { type: 'unknown', options: { key: 'foo', value: 'bar' } }).query).toBe(
+          query.query
+        );
+      });
+    });
+  });
+
+  describe('ADD_STRING_FILTER and ADD_STRING_FILTER_OUT', () => {
     beforeEach(() => {
       query = { query: '', refId: 'A' };
     });
 
     it('should add the filter', () => {
-      expect(ds.modifyQuery(query, { type: 'ADD_FILTER', options: { key: 'foo', value: 'bar' } }).query).toBe(
-        'foo:"bar"'
-      );
+      expect(ds.modifyQuery(query, { type: 'ADD_STRING_FILTER', options: { value: 'bar' } }).query).toBe('"bar"');
     });
 
     it('should add the negative filter', () => {
-      expect(ds.modifyQuery(query, { type: 'ADD_FILTER_OUT', options: { key: 'foo', value: 'bar' } }).query).toBe(
-        '-foo:"bar"'
+      expect(ds.modifyQuery(query, { type: 'ADD_STRING_FILTER_OUT', options: { value: 'bar' } }).query).toBe(
+        'NOT "bar"'
       );
     });
-
-    it('should do nothing on unknown type', () => {
-      expect(ds.modifyQuery(query, { type: 'unknown', options: { key: 'foo', value: 'bar' } }).query).toBe(query.query);
-    });
   });
 
   describe('with non-empty query', () => {
@@ -1167,20 +1232,16 @@ describe('modifyQuery', () => {
     });
 
     it('should add the filter', () => {
-      expect(ds.modifyQuery(query, { type: 'ADD_FILTER', options: { key: 'foo', value: 'bar' } }).query).toBe(
-        'test:"value" AND foo:"bar"'
+      expect(ds.modifyQuery(query, { type: 'ADD_STRING_FILTER', options: { value: 'bar' } }).query).toBe(
+        'test:"value" AND "bar"'
       );
     });
 
     it('should add the negative filter', () => {
-      expect(ds.modifyQuery(query, { type: 'ADD_FILTER_OUT', options: { key: 'foo', value: 'bar' } }).query).toBe(
-        'test:"value" AND -foo:"bar"'
+      expect(ds.modifyQuery(query, { type: 'ADD_STRING_FILTER_OUT', options: { value: 'bar' } }).query).toBe(
+        'test:"value" NOT "bar"'
       );
     });
-
-    it('should do nothing on unknown type', () => {
-      expect(ds.modifyQuery(query, { type: 'unknown', options: { key: 'foo', value: 'bar' } }).query).toBe(query.query);
-    });
   });
 });
 
@@ -1538,6 +1599,9 @@ describe('ElasticDatasource using backend', () => {
 
         const annotations = await ds.annotationQuery({
           annotation: {},
+          dashboard: {
+            getVariables: () => [],
+          },
           range: timeRange,
         });
 
@@ -1569,6 +1633,9 @@ describe('ElasticDatasource using backend', () => {
             tagsField: '@test_tags',
             textField: 'text',
           },
+          dashboard: {
+            getVariables: () => [],
+          },
           range: timeRange,
         });
         expect(annotations).toHaveLength(2);
@@ -1607,6 +1674,9 @@ describe('ElasticDatasource using backend', () => {
             tagsField: '@test_tags',
             textField: 'text',
           },
+          dashboard: {
+            getVariables: () => [],
+          },
           range: {
             from: dateTime(1683291160012),
             to: dateTime(1683291460012),
@@ -1635,6 +1705,9 @@ describe('ElasticDatasource using backend', () => {
 
         await ds.annotationQuery({
           annotation: {},
+          dashboard: {
+            getVariables: () => [],
+          },
           range: {
             from: dateTime(1683291160012),
             to: dateTime(1683291460012),
@@ -1645,6 +1718,63 @@ describe('ElasticDatasource using backend', () => {
           '{"search_type":"query_then_fetch","ignore_unavailable":true,"index":"[test-]YYYY.MM.DD"}\n{"query":{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"from":1683291160012,"to":1683291460012,"format":"epoch_millis"}}}],"minimum_should_match":1}}]}},"size":10000}\n'
         );
       });
+
+      it('should process annotation request using dashboard adhoc variables', async () => {
+        const { ds } = getTestContext();
+        const postResourceRequestMock = jest.spyOn(ds, 'postResourceRequest').mockResolvedValue({
+          responses: [
+            {
+              hits: {
+                hits: [
+                  { _source: { '@test_time': 1, '@test_tags': 'foo', text: 'abc' } },
+                  { _source: { '@test_time': 3, '@test_tags': 'bar', text: 'def' } },
+                ],
+              },
+            },
+          ],
+        });
+
+        await ds.annotationQuery({
+          annotation: {
+            timeField: '@test_time',
+            timeEndField: '@time_end_field',
+            name: 'foo',
+            query: 'abc',
+            tagsField: '@test_tags',
+            textField: 'text',
+            datasource: {
+              type: 'elasticsearch',
+              uid: 'gdev-elasticsearch',
+            },
+          },
+          dashboard: {
+            getVariables: () => [
+              {
+                type: 'adhoc',
+                datasource: {
+                  type: 'elasticsearch',
+                  uid: 'gdev-elasticsearch',
+                },
+                filters: [
+                  {
+                    key: 'abc_key',
+                    operator: '=',
+                    value: 'abc_value',
+                  },
+                ],
+              },
+            ],
+          },
+          range: {
+            from: dateTime(1683291160012),
+            to: dateTime(1683291460012),
+          },
+        });
+        expect(postResourceRequestMock).toHaveBeenCalledWith(
+          '_msearch',
+          '{"search_type":"query_then_fetch","ignore_unavailable":true,"index":"[test-]YYYY.MM.DD"}\n{"query":{"bool":{"filter":[{"bool":{"should":[{"range":{"@test_time":{"from":1683291160012,"to":1683291460012,"format":"epoch_millis"}}},{"range":{"@time_end_field":{"from":1683291160012,"to":1683291460012,"format":"epoch_millis"}}}],"minimum_should_match":1}},{"query_string":{"query":"abc AND abc_key:\\"abc_value\\""}}]}},"size":10000}\n'
+        );
+      });
     });
   });
 
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.ts b/public/app/plugins/datasource/elasticsearch/datasource.ts
index deb2319f8fe65..5547eadcf404a 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.ts
@@ -31,12 +31,14 @@ import {
   SupplementaryQueryOptions,
   toUtc,
   AnnotationEvent,
-  FieldType,
   DataSourceWithToggleableQueryFiltersSupport,
   QueryFilterOptions,
   ToggleFilterAction,
   DataSourceGetTagValuesOptions,
   AdHocVariableFilter,
+  DataSourceWithQueryModificationSupport,
+  AdHocVariableModel,
+  TypedVariableModel,
 } from '@grafana/data';
 import {
   DataSourceWithBackend,
@@ -47,9 +49,6 @@ import {
   getTemplateSrv,
 } from '@grafana/runtime';
 
-import { queryLogsSample, queryLogsVolume } from '../../../features/logs/logsModel';
-import { getLogLevelFromKey } from '../../../features/logs/utils';
-
 import { IndexPattern, intervalMap } from './IndexPattern';
 import LanguageProvider from './LanguageProvider';
 import { LegacyQueryRunner } from './LegacyQueryRunner';
@@ -63,7 +62,13 @@ import {
 } from './components/QueryEditor/MetricAggregationsEditor/aggregations';
 import { metricAggregationConfig } from './components/QueryEditor/MetricAggregationsEditor/utils';
 import { isMetricAggregationWithMeta } from './guards';
-import { addAddHocFilter, addFilterToQuery, queryHasFilter, removeFilterFromQuery } from './modifyQuery';
+import {
+  addAddHocFilter,
+  addFilterToQuery,
+  addStringFilterToQuery,
+  queryHasFilter,
+  removeFilterFromQuery,
+} from './modifyQuery';
 import { trackAnnotationQuery, trackQuery } from './tracking';
 import {
   Logs,
@@ -101,7 +106,8 @@ export class ElasticDatasource
     DataSourceWithLogsContextSupport,
     DataSourceWithQueryImportSupport<ElasticsearchQuery>,
     DataSourceWithSupplementaryQueriesSupport<ElasticsearchQuery>,
-    DataSourceWithToggleableQueryFiltersSupport<ElasticsearchQuery>
+    DataSourceWithToggleableQueryFiltersSupport<ElasticsearchQuery>,
+    DataSourceWithQueryModificationSupport<ElasticsearchQuery>
 {
   basicAuth?: string;
   withCredentials?: boolean;
@@ -109,7 +115,6 @@ export class ElasticDatasource
   name: string;
   index: string;
   timeField: string;
-  xpack: boolean;
   interval: string;
   maxConcurrentShardRequests?: number;
   queryBuilder: ElasticQueryBuilder;
@@ -134,11 +139,10 @@ export class ElasticDatasource
     this.url = instanceSettings.url!;
     this.name = instanceSettings.name;
     this.isProxyAccess = instanceSettings.access === 'proxy';
-    const settingsData = instanceSettings.jsonData || ({} as ElasticsearchOptions);
+    const settingsData = instanceSettings.jsonData || {};
 
     this.index = settingsData.index ?? instanceSettings.database ?? '';
     this.timeField = settingsData.timeField;
-    this.xpack = Boolean(settingsData.xpack);
     this.indexPattern = new IndexPattern(this.index, settingsData.interval);
     this.intervalPattern = settingsData.interval;
     this.interval = settingsData.timeInterval;
@@ -187,17 +191,24 @@ export class ElasticDatasource
    *
    * When multiple indices span the provided time range, the request is sent starting from the newest index,
    * and then going backwards until an index is found.
-   *
-   * @param url the url to query the index on, for example `/_mapping`.
    */
-
-  private requestAllIndices(url: string, range = getDefaultTimeRange()): Observable<any> {
+  private requestAllIndices(range = getDefaultTimeRange()) {
     let indexList = this.indexPattern.getIndexList(range.from, range.to);
     if (!Array.isArray(indexList)) {
       indexList = [this.indexPattern.getIndexForToday()];
     }
 
-    const indexUrlList = indexList.map((index) => index + url);
+    const url = '_mapping';
+
+    const indexUrlList = indexList.map((index) => {
+      // make sure `index` does not end with a slash
+      index = index.replace(/\/$/, '');
+      if (index === '') {
+        return url;
+      }
+
+      return `${index}/${url}`;
+    });
 
     const maxTraversals = 7; // do not go beyond one week (for a daily pattern)
     const listLen = indexUrlList.length;
@@ -249,10 +260,21 @@ export class ElasticDatasource
     );
   }
 
-  private prepareAnnotationRequest(options: { annotation: ElasticsearchAnnotationQuery; range: TimeRange }) {
+  private prepareAnnotationRequest(options: {
+    annotation: ElasticsearchAnnotationQuery;
+    // Should be DashboardModel but cannot import that here from the main app. This is a temporary solution as we need to move from deprecated annotations.
+    dashboard: { getVariables: () => TypedVariableModel[] };
+    range: TimeRange;
+  }) {
     const annotation = options.annotation;
     const timeField = annotation.timeField || '@timestamp';
     const timeEndField = annotation.timeEndField || null;
+    const dashboard = options.dashboard;
+
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    const adhocVariables = dashboard.getVariables().filter((v) => v.type === 'adhoc') as AdHocVariableModel[];
+    const annotationRelatedVariables = adhocVariables.filter((v) => v.datasource?.uid === annotation.datasource.uid);
+    const filters = annotationRelatedVariables.map((v) => v.filters).flat();
 
     // the `target.query` is the "new" location for the query.
     // normally we would write this code as
@@ -285,6 +307,8 @@ export class ElasticDatasource
     }
 
     const queryInterpolated = this.interpolateLuceneQuery(queryString);
+    const finalQuery = this.addAdHocFilters(queryInterpolated, filters);
+
     const query: {
       bool: { filter: Array<Record<string, Record<string, string | number | Array<{ range: RangeMap }>>>> };
     } = {
@@ -300,10 +324,10 @@ export class ElasticDatasource
       },
     };
 
-    if (queryInterpolated) {
+    if (finalQuery) {
       query.bool.filter.push({
         query_string: {
-          query: queryInterpolated,
+          query: finalQuery,
         },
       });
     }
@@ -501,10 +525,6 @@ export class ElasticDatasource
     return text;
   }
 
-  showContextToggle(): boolean {
-    return true;
-  }
-
   getLogRowContext = async (row: LogRowModel, options?: LogRowContextOptions): Promise<{ data: DataFrame[] }> => {
     const { enableElasticsearchBackendQuerying } = config.featureToggles;
     if (enableElasticsearchBackendQuerying) {
@@ -527,13 +547,15 @@ export class ElasticDatasource
     }
   };
 
-  getDataProvider(
+  /**
+   * Implemented for DataSourceWithSupplementaryQueriesSupport.
+   * It generates a DataQueryRequest for a specific supplementary query type.
+   * @returns A DataQueryRequest for the supplementary queries or undefined if not supported.
+   */
+  getSupplementaryRequest(
     type: SupplementaryQueryType,
     request: DataQueryRequest<ElasticsearchQuery>
-  ): Observable<DataQueryResponse> | undefined {
-    if (!this.getSupportedSupplementaryQueryTypes().includes(type)) {
-      return undefined;
-    }
+  ): DataQueryRequest<ElasticsearchQuery> | undefined {
     switch (type) {
       case SupplementaryQueryType.LogsVolume:
         return this.getLogsVolumeDataProvider(request);
@@ -549,10 +571,6 @@ export class ElasticDatasource
   }
 
   getSupplementaryQuery(options: SupplementaryQueryOptions, query: ElasticsearchQuery): ElasticsearchQuery | undefined {
-    if (!this.getSupportedSupplementaryQueryTypes().includes(options.type)) {
-      return undefined;
-    }
-
     let isQuerySuitable = false;
 
     switch (options.type) {
@@ -624,7 +642,9 @@ export class ElasticDatasource
     }
   }
 
-  getLogsVolumeDataProvider(request: DataQueryRequest<ElasticsearchQuery>): Observable<DataQueryResponse> | undefined {
+  private getLogsVolumeDataProvider(
+    request: DataQueryRequest<ElasticsearchQuery>
+  ): DataQueryRequest<ElasticsearchQuery> | undefined {
     const logsVolumeRequest = cloneDeep(request);
     const targets = logsVolumeRequest.targets
       .map((target) => this.getSupplementaryQuery({ type: SupplementaryQueryType.LogsVolume }, target))
@@ -634,18 +654,12 @@ export class ElasticDatasource
       return undefined;
     }
 
-    return queryLogsVolume(
-      this,
-      { ...logsVolumeRequest, targets },
-      {
-        range: request.range,
-        targets: request.targets,
-        extractLevel,
-      }
-    );
+    return { ...logsVolumeRequest, targets };
   }
 
-  getLogsSampleDataProvider(request: DataQueryRequest<ElasticsearchQuery>): Observable<DataQueryResponse> | undefined {
+  private getLogsSampleDataProvider(
+    request: DataQueryRequest<ElasticsearchQuery>
+  ): DataQueryRequest<ElasticsearchQuery> | undefined {
     const logsSampleRequest = cloneDeep(request);
     const targets = logsSampleRequest.targets;
     const queries = targets.map((query) => {
@@ -656,7 +670,7 @@ export class ElasticDatasource
     if (!elasticQueries.length) {
       return undefined;
     }
-    return queryLogsSample(this, { ...logsSampleRequest, targets: elasticQueries });
+    return { ...logsSampleRequest, targets: elasticQueries };
   }
 
   query(request: DataQueryRequest<ElasticsearchQuery>): Observable<DataQueryResponse> {
@@ -704,7 +718,7 @@ export class ElasticDatasource
       nested: 'nested',
       histogram: 'number',
     };
-    return this.requestAllIndices('/_mapping', range).pipe(
+    return this.requestAllIndices(range).pipe(
       map((result) => {
         const shouldAddField = (obj: any, key: string) => {
           if (this.isMetadataField(key)) {
@@ -811,7 +825,7 @@ export class ElasticDatasource
       searchParams.append('max_concurrent_shard_requests', `${this.maxConcurrentShardRequests}`);
     }
 
-    if (this.xpack && this.includeFrozen) {
+    if (this.includeFrozen) {
       searchParams.append('ignore_throttled', 'false');
     }
 
@@ -947,11 +961,23 @@ export class ElasticDatasource
         expression = addFilterToQuery(expression, action.options.key, action.options.value, '-');
         break;
       }
+      case 'ADD_STRING_FILTER': {
+        expression = addStringFilterToQuery(expression, action.options.value);
+        break;
+      }
+      case 'ADD_STRING_FILTER_OUT': {
+        expression = addStringFilterToQuery(expression, action.options.value, false);
+        break;
+      }
     }
 
     return { ...query, query: expression };
   }
 
+  getSupportedQueryModifications() {
+    return ['ADD_FILTER', 'ADD_FILTER_OUT', 'ADD_STRING_FILTER', 'ADD_STRING_FILTER_OUT'];
+  }
+
   addAdHocFilters(query: string, adhocFilters?: AdHocVariableFilter[]) {
     if (!adhocFilters) {
       return query;
@@ -1155,9 +1181,3 @@ function createContextTimeRange(rowTimeEpochMs: number, direction: string, inter
     }
   }
 }
-
-function extractLevel(dataFrame: DataFrame): LogLevel {
-  const valueField = dataFrame.fields.find((f) => f.type === FieldType.number);
-  const name = valueField?.labels?.['level'] ?? '';
-  return getLogLevelFromKey(name);
-}
diff --git a/public/app/plugins/datasource/elasticsearch/mocks.ts b/public/app/plugins/datasource/elasticsearch/mocks.ts
index a33e258c449ca..09470fff165f8 100644
--- a/public/app/plugins/datasource/elasticsearch/mocks.ts
+++ b/public/app/plugins/datasource/elasticsearch/mocks.ts
@@ -39,9 +39,9 @@ export function createElasticDatasource(settings: Partial<DataSourceInstanceSett
     jsonData: {
       timeField: '',
       timeInterval: '',
+      index: '[test-]YYYY.MM.DD',
       ...jsonData,
     },
-    database: '[test-]YYYY.MM.DD',
     ...rest,
   };
 
diff --git a/public/app/plugins/datasource/elasticsearch/modifyQuery.test.ts b/public/app/plugins/datasource/elasticsearch/modifyQuery.test.ts
index 7e211da673d11..6138f620cbf7e 100644
--- a/public/app/plugins/datasource/elasticsearch/modifyQuery.test.ts
+++ b/public/app/plugins/datasource/elasticsearch/modifyQuery.test.ts
@@ -1,4 +1,4 @@
-import { queryHasFilter, removeFilterFromQuery, addFilterToQuery } from './modifyQuery';
+import { queryHasFilter, removeFilterFromQuery, addFilterToQuery, addStringFilterToQuery } from './modifyQuery';
 
 describe('queryHasFilter', () => {
   it('should return true if the query contains the positive filter', () => {
@@ -108,3 +108,31 @@ describe('removeFilterFromQuery', () => {
     expect(removeFilterFromQuery('label\\:name:"the \\"value\\""', 'label:name', 'the "value"')).toBe('');
   });
 });
+
+describe('addStringFilterToQuery', () => {
+  it('should add a positive filter to a query', () => {
+    expect(addStringFilterToQuery('label:"value"', 'filter')).toBe('label:"value" AND "filter"');
+    expect(addStringFilterToQuery('', 'filter')).toBe('"filter"');
+    expect(addStringFilterToQuery(' ', 'filter')).toBe('"filter"');
+  });
+
+  it('should add a negative filter to a query', () => {
+    expect(addStringFilterToQuery('label:"value"', 'filter', false)).toBe('label:"value" NOT "filter"');
+    expect(addStringFilterToQuery('', 'filter', false)).toBe('NOT "filter"');
+    expect(addStringFilterToQuery(' ', 'filter', false)).toBe('NOT "filter"');
+  });
+
+  it('should escape filter values', () => {
+    expect(addStringFilterToQuery('label:"value"', '"filter"')).toBe('label:"value" AND "\\"filter\\""');
+    expect(addStringFilterToQuery('label:"value"', '"filter"', false)).toBe('label:"value" NOT "\\"filter\\""');
+  });
+
+  it('should escape filter values with backslashes', () => {
+    expect(addStringFilterToQuery('label:"value"', '"filter with \\"')).toBe(
+      'label:"value" AND "\\"filter with \\\\\\""'
+    );
+    expect(addStringFilterToQuery('label:"value"', '"filter with \\"', false)).toBe(
+      'label:"value" NOT "\\"filter with \\\\\\""'
+    );
+  });
+});
diff --git a/public/app/plugins/datasource/elasticsearch/modifyQuery.ts b/public/app/plugins/datasource/elasticsearch/modifyQuery.ts
index f4206041f98d7..c9d98fcfb7a0e 100644
--- a/public/app/plugins/datasource/elasticsearch/modifyQuery.ts
+++ b/public/app/plugins/datasource/elasticsearch/modifyQuery.ts
@@ -63,8 +63,8 @@ export function addFilterToQuery(query: string, key: string, value: string, modi
     return query;
   }
 
-  key = lucene.term.escape(key);
-  value = lucene.phrase.escape(value);
+  key = escapeFilter(key);
+  value = escapeFilterValue(value);
   const filter = `${modifier}${key}:"${value}"`;
 
   return concatenate(query, filter);
@@ -187,6 +187,7 @@ export function escapeFilter(value: string) {
  * Use this function to escape filter values.
  */
 export function escapeFilterValue(value: string) {
+  value = value.replace(/\\/g, '\\\\');
   return lucene.phrase.escape(value);
 }
 
@@ -198,19 +199,22 @@ function normalizeQuery(query: string) {
 }
 
 function isLeftOnlyAST(ast: unknown): ast is LeftOnlyAST {
-  if (!ast) {
+  if (!ast || typeof ast !== 'object') {
     return false;
   }
+
   if ('left' in ast && !('right' in ast)) {
     return true;
   }
+
   return false;
 }
 
 function isBinaryAST(ast: unknown): ast is BinaryAST {
-  if (!ast) {
+  if (!ast || typeof ast !== 'object') {
     return false;
   }
+
   if ('left' in ast && 'right' in ast) {
     return true;
   }
@@ -222,12 +226,10 @@ function isAST(ast: unknown): ast is AST {
 }
 
 function isNodeTerm(ast: unknown): ast is NodeTerm {
-  if (!ast) {
-    return false;
-  }
-  if ('term' in ast) {
+  if (ast && typeof ast === 'object' && 'term' in ast) {
     return true;
   }
+
   return false;
 }
 
@@ -238,3 +240,8 @@ function parseQuery(query: string) {
     return null;
   }
 }
+
+export function addStringFilterToQuery(query: string, filter: string, contains = true) {
+  const expression = `"${escapeFilterValue(filter)}"`;
+  return query.trim() ? `${query} ${contains ? 'AND' : 'NOT'} ${expression}` : `${contains ? '' : 'NOT '}${expression}`;
+}
diff --git a/public/app/plugins/datasource/elasticsearch/tracking.test.ts b/public/app/plugins/datasource/elasticsearch/tracking.test.ts
new file mode 100644
index 0000000000000..81a86a388af5c
--- /dev/null
+++ b/public/app/plugins/datasource/elasticsearch/tracking.test.ts
@@ -0,0 +1,63 @@
+import { DashboardLoadedEvent } from '@grafana/data';
+import { reportInteraction } from '@grafana/runtime';
+
+import pluginJson from './plugin.json';
+import { onDashboardLoadedHandler } from './tracking';
+import { ElasticsearchQuery } from './types';
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  reportInteraction: jest.fn(),
+}));
+
+const targets: ElasticsearchQuery[] = [
+  {
+    refId: 'test',
+    alias: '$varAlias',
+    bucketAggs: [],
+    metrics: [],
+    query: 'test',
+  },
+];
+
+afterAll(() => {
+  jest.clearAllMocks();
+});
+
+describe('onDashboardLoadedHandler', () => {
+  beforeEach(() => {
+    jest.mocked(reportInteraction).mockClear();
+    jest.spyOn(console, 'error');
+  });
+  test('Reports dashboard loaded interactions', () => {
+    const event = new DashboardLoadedEvent({
+      dashboardId: 'test',
+      orgId: 1,
+      userId: 2,
+      grafanaVersion: '11',
+      queries: {
+        [pluginJson.id]: targets,
+      },
+    });
+    onDashboardLoadedHandler(event);
+
+    expect(reportInteraction).toHaveBeenCalled();
+    expect(console.error).not.toHaveBeenCalled();
+  });
+
+  test('Does not report or fails when the dashboard id has no queries', () => {
+    const event = new DashboardLoadedEvent({
+      dashboardId: 'test',
+      orgId: 1,
+      userId: 2,
+      grafanaVersion: '11',
+      queries: {
+        'not elasticsearch': targets,
+      },
+    });
+    onDashboardLoadedHandler(event);
+
+    expect(reportInteraction).not.toHaveBeenCalled();
+    expect(console.error).not.toHaveBeenCalled();
+  });
+});
diff --git a/public/app/plugins/datasource/elasticsearch/tracking.ts b/public/app/plugins/datasource/elasticsearch/tracking.ts
index bc0456756e68a..01e3c106dfc9d 100644
--- a/public/app/plugins/datasource/elasticsearch/tracking.ts
+++ b/public/app/plugins/datasource/elasticsearch/tracking.ts
@@ -1,10 +1,10 @@
 import { CoreApp, DashboardLoadedEvent, DataQueryRequest, DataQueryResponse } from '@grafana/data';
 import { config, reportInteraction } from '@grafana/runtime';
-import { variableRegex } from 'app/features/variables/utils';
 
 import { REF_ID_STARTER_LOG_VOLUME } from './datasource';
 import pluginJson from './plugin.json';
 import { ElasticsearchAnnotationQuery, ElasticsearchQuery } from './types';
+import { variableRegex } from './utils';
 
 type ElasticSearchOnDashboardLoadedTrackingEvent = {
   grafana_version?: string;
@@ -41,7 +41,7 @@ export const onDashboardLoadedHandler = ({
 }: DashboardLoadedEvent<ElasticsearchQuery>) => {
   try {
     // We only want to track visible ElasticSearch queries
-    const elasticsearchQueries = queries[pluginJson.id].filter((query) => !query.hide);
+    const elasticsearchQueries = queries[pluginJson.id]?.filter((query) => !query.hide);
     if (!elasticsearchQueries?.length) {
       return;
     }
diff --git a/public/app/plugins/datasource/elasticsearch/types.ts b/public/app/plugins/datasource/elasticsearch/types.ts
index 10feccc73a3f8..9e88e4d3b3a1e 100644
--- a/public/app/plugins/datasource/elasticsearch/types.ts
+++ b/public/app/plugins/datasource/elasticsearch/types.ts
@@ -1,4 +1,5 @@
 import { DataSourceJsonData } from '@grafana/data';
+import { DataSourceRef } from '@grafana/schema';
 
 import {
   BucketAggregationType,
@@ -14,11 +15,11 @@ import {
   MovingAverage as SchemaMovingAverage,
   BucketAggregation,
   Logs as SchemaLogs,
-  Elasticsearch,
+  ElasticsearchDataQuery,
 } from './dataquery.gen';
 
 export * from './dataquery.gen';
-export { Elasticsearch as ElasticsearchQuery } from './dataquery.gen';
+export { ElasticsearchDataQuery as ElasticsearchQuery } from './dataquery.gen';
 
 // We want to extend the settings of the Logs query with additional properties that
 // are not part of the schema. This is a workaround, because exporting LogsSettings
@@ -55,7 +56,6 @@ export interface ElasticsearchOptions extends DataSourceJsonData {
   timeField: string;
   // we used to have a field named `esVersion` in the past,
   // please do not use that name in the future.
-  xpack?: boolean;
   interval?: Interval;
   timeInterval: string;
   maxConcurrentShardRequests?: number;
@@ -126,11 +126,12 @@ export type DataLinkConfig = {
 };
 
 export interface ElasticsearchAnnotationQuery {
-  target: Elasticsearch;
+  target: ElasticsearchDataQuery;
   timeField?: string;
   titleField?: string;
   timeEndField?: string;
   query?: string;
+  datasource: DataSourceRef;
   tagsField?: string;
   textField?: string;
   // @deprecated index is deprecated and will be removed in the future
diff --git a/public/app/plugins/datasource/elasticsearch/utils.test.ts b/public/app/plugins/datasource/elasticsearch/utils.test.ts
index dcf10900c64c1..731efa9aefe95 100644
--- a/public/app/plugins/datasource/elasticsearch/utils.test.ts
+++ b/public/app/plugins/datasource/elasticsearch/utils.test.ts
@@ -1,5 +1,5 @@
 import { ElasticsearchQuery } from './types';
-import { isTimeSeriesQuery, removeEmpty } from './utils';
+import { flattenObject, isTimeSeriesQuery, removeEmpty } from './utils';
 
 describe('removeEmpty', () => {
   it('Should remove all empty', () => {
@@ -79,3 +79,39 @@ describe('isTimeSeriesQuery', () => {
     expect(isTimeSeriesQuery(query)).toBe(true);
   });
 });
+
+describe('flattenObject', () => {
+  it('flattens objects of arbitrary depth', () => {
+    const nestedObject = {
+      a: {
+        b: {
+          c: 1,
+          d: {
+            e: 2,
+            f: 3,
+          },
+        },
+        g: 4,
+      },
+      h: 5,
+    };
+
+    expect(flattenObject(nestedObject)).toEqual({
+      'a.b.c': 1,
+      'a.b.d.e': 2,
+      'a.b.d.f': 3,
+      'a.g': 4,
+      h: 5,
+    });
+  });
+
+  it('does not alter other objects', () => {
+    const nestedObject = {
+      a: 'uno',
+      b: 'dos',
+      c: 3,
+    };
+
+    expect(flattenObject(nestedObject)).toEqual(nestedObject);
+  });
+});
diff --git a/public/app/plugins/datasource/elasticsearch/utils.ts b/public/app/plugins/datasource/elasticsearch/utils.ts
index 63e3ac25feb88..1ca679734cf88 100644
--- a/public/app/plugins/datasource/elasticsearch/utils.ts
+++ b/public/app/plugins/datasource/elasticsearch/utils.ts
@@ -106,3 +106,53 @@ export const unsupportedVersionMessage =
 export const isTimeSeriesQuery = (query: ElasticsearchQuery): boolean => {
   return query?.bucketAggs?.slice(-1)[0]?.type === 'date_histogram';
 };
+
+/*
+ * This regex matches 3 types of variable reference with an optional format specifier
+ * There are 6 capture groups that replace will return
+ * \$(\w+)                                    $var1
+ * \[\[(\w+?)(?::(\w+))?\]\]                  [[var2]] or [[var2:fmt2]]
+ * \${(\w+)(?:\.([^:^\}]+))?(?::([^\}]+))?}   ${var3} or ${var3.fieldPath} or ${var3:fmt3} (or ${var3.fieldPath:fmt3} but that is not a separate capture group)
+ */
+export const variableRegex = /\$(\w+)|\[\[(\w+?)(?::(\w+))?\]\]|\${(\w+)(?:\.([^:^\}]+))?(?::([^\}]+))?}/g;
+
+// Copyright (c) 2014, Hugh Kennedy
+// Based on code from https://github.com/hughsk/flat/blob/master/index.js
+//
+export function flattenObject(
+  target: Record<string, unknown>,
+  opts?: { delimiter?: string; maxDepth?: number; safe?: boolean }
+): Record<string, unknown> {
+  opts = opts || {};
+
+  const delimiter = opts.delimiter || '.';
+  let maxDepth = opts.maxDepth || 3;
+  let currentDepth = 1;
+  const output: Record<string, unknown> = {};
+
+  function step(object: Record<string, unknown>, prev: string | null) {
+    Object.keys(object).forEach((key) => {
+      const value = object[key];
+      const isarray = opts?.safe && Array.isArray(value);
+      const type = Object.prototype.toString.call(value);
+      const isobject = type === '[object Object]';
+
+      const newKey = prev ? prev + delimiter + key : key;
+
+      if (!opts?.maxDepth) {
+        maxDepth = currentDepth + 1;
+      }
+
+      if (!isarray && isobject && value && Object.keys(value).length && currentDepth < maxDepth) {
+        ++currentDepth;
+        return step({ ...value }, newKey);
+      }
+
+      output[newKey] = value;
+    });
+  }
+
+  step(target, null);
+
+  return output;
+}
diff --git a/public/app/plugins/datasource/postgres/CheatSheet.tsx b/public/app/plugins/datasource/grafana-postgresql-datasource/CheatSheet.tsx
similarity index 100%
rename from public/app/plugins/datasource/postgres/CheatSheet.tsx
rename to public/app/plugins/datasource/grafana-postgresql-datasource/CheatSheet.tsx
diff --git a/public/app/plugins/datasource/grafana-postgresql-datasource/PostgresQueryEditor.tsx b/public/app/plugins/datasource/grafana-postgresql-datasource/PostgresQueryEditor.tsx
new file mode 100644
index 0000000000000..f1fa982ae93e0
--- /dev/null
+++ b/public/app/plugins/datasource/grafana-postgresql-datasource/PostgresQueryEditor.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+
+import { QueryEditorProps } from '@grafana/data';
+import { SqlQueryEditor, SQLOptions, SQLQuery, QueryHeaderProps } from '@grafana/sql';
+
+import { PostgresDatasource } from './datasource';
+
+const queryHeaderProps: Pick<QueryHeaderProps, 'dialect'> = { dialect: 'postgres' };
+
+export function PostgresQueryEditor(props: QueryEditorProps<PostgresDatasource, SQLQuery, SQLOptions>) {
+  return <SqlQueryEditor {...props} queryHeaderProps={queryHeaderProps} />;
+}
diff --git a/public/app/plugins/datasource/postgres/PostgresQueryModel.ts b/public/app/plugins/datasource/grafana-postgresql-datasource/PostgresQueryModel.ts
similarity index 83%
rename from public/app/plugins/datasource/postgres/PostgresQueryModel.ts
rename to public/app/plugins/datasource/grafana-postgresql-datasource/PostgresQueryModel.ts
index aa3c47f0a78ef..a572733f1eeeb 100644
--- a/public/app/plugins/datasource/postgres/PostgresQueryModel.ts
+++ b/public/app/plugins/datasource/grafana-postgresql-datasource/PostgresQueryModel.ts
@@ -1,8 +1,7 @@
 import { ScopedVars } from '@grafana/data';
 import { TemplateSrv } from '@grafana/runtime';
 import { VariableFormatID } from '@grafana/schema';
-import { applyQueryDefaults } from 'app/features/plugins/sql/defaults';
-import { SQLQuery, SqlQueryModel } from 'app/features/plugins/sql/types';
+import { SQLQuery, SqlQueryModel, applyQueryDefaults } from '@grafana/sql';
 
 export class PostgresQueryModel implements SqlQueryModel {
   target: SQLQuery;
diff --git a/public/app/plugins/datasource/postgres/README.md b/public/app/plugins/datasource/grafana-postgresql-datasource/README.md
similarity index 100%
rename from public/app/plugins/datasource/postgres/README.md
rename to public/app/plugins/datasource/grafana-postgresql-datasource/README.md
diff --git a/public/app/plugins/datasource/postgres/configuration/ConfigurationEditor.tsx b/public/app/plugins/datasource/grafana-postgresql-datasource/configuration/ConfigurationEditor.tsx
similarity index 96%
rename from public/app/plugins/datasource/postgres/configuration/ConfigurationEditor.tsx
rename to public/app/plugins/datasource/grafana-postgresql-datasource/configuration/ConfigurationEditor.tsx
index 3c1ea733a2f8e..8acacf21633bf 100644
--- a/public/app/plugins/datasource/postgres/configuration/ConfigurationEditor.tsx
+++ b/public/app/plugins/datasource/grafana-postgresql-datasource/configuration/ConfigurationEditor.tsx
@@ -10,6 +10,7 @@ import {
 } from '@grafana/data';
 import { ConfigSection, ConfigSubSection, DataSourceDescription, Stack } from '@grafana/experimental';
 import { config } from '@grafana/runtime';
+import { ConnectionLimits, Divider, TLSSecretsConfig, useMigrateDatabaseFields } from '@grafana/sql';
 import {
   Input,
   Select,
@@ -22,10 +23,6 @@ import {
   SecureSocksProxySettings,
   Collapse,
 } from '@grafana/ui';
-import { ConnectionLimits } from 'app/features/plugins/sql/components/configuration/ConnectionLimits';
-import { Divider } from 'app/features/plugins/sql/components/configuration/Divider';
-import { TLSSecretsConfig } from 'app/features/plugins/sql/components/configuration/TLSSecretsConfig';
-import { useMigrateDatabaseFields } from 'app/features/plugins/sql/components/configuration/useMigrateDatabaseFields';
 
 import { PostgresOptions, PostgresTLSMethods, PostgresTLSModes, SecureJsonData } from '../types';
 
@@ -178,7 +175,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps<P
         >
           <Select
             options={tlsModes}
-            value={jsonData.sslmode || PostgresTLSModes.verifyFull}
+            value={jsonData.sslmode || PostgresTLSModes.require}
             onChange={onJSONDataOptionSelected('sslmode')}
             width={WIDTH_LONG}
           />
@@ -403,7 +400,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps<P
         <ConnectionLimits options={options} onOptionsChange={onOptionsChange} />
 
         {config.secureSocksDSProxyEnabled && (
-          <SecureSocksProxySettings options={options} onOptionsChange={() => onOptionsChange(options)} />
+          <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
         )}
       </ConfigSection>
     </>
diff --git a/public/app/plugins/datasource/postgres/configuration/useAutoDetectFeatures.ts b/public/app/plugins/datasource/grafana-postgresql-datasource/configuration/useAutoDetectFeatures.ts
similarity index 100%
rename from public/app/plugins/datasource/postgres/configuration/useAutoDetectFeatures.ts
rename to public/app/plugins/datasource/grafana-postgresql-datasource/configuration/useAutoDetectFeatures.ts
diff --git a/public/app/plugins/datasource/grafana-postgresql-datasource/datasource.test.ts b/public/app/plugins/datasource/grafana-postgresql-datasource/datasource.test.ts
new file mode 100644
index 0000000000000..08cbf2d49767c
--- /dev/null
+++ b/public/app/plugins/datasource/grafana-postgresql-datasource/datasource.test.ts
@@ -0,0 +1,817 @@
+import { Observable, of } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import {
+  getDefaultTimeRange,
+  dataFrameToJSON,
+  DataQueryRequest,
+  DataQueryResponse,
+  DataSourceInstanceSettings,
+  dateTime,
+  FieldType,
+  LoadingState,
+  createDataFrame,
+} from '@grafana/data';
+import {
+  BackendSrv,
+  DataSourceSrv,
+  FetchResponse,
+  getBackendSrv,
+  setBackendSrv,
+  getDataSourceSrv,
+  setDataSourceSrv,
+} from '@grafana/runtime';
+import { QueryFormat, SQLQuery, makeVariable } from '@grafana/sql';
+
+import { PostgresDatasource } from './datasource';
+import { PostgresOptions } from './types';
+
+const backendSrv: BackendSrv = {
+  // this will get mocked below, it only needs to exist
+  fetch: () => undefined,
+} as unknown as BackendSrv; // we cast it so that we do not have to implement all the methods
+
+// we type this as `any` to not have to define the whole type
+const fakeDataSourceSrv: DataSourceSrv = {
+  getInstanceSettings: () => ({ id: 8674 }),
+} as unknown as DataSourceSrv;
+
+let origBackendSrv: BackendSrv;
+let origDataSourceSrv: DataSourceSrv;
+beforeAll(() => {
+  origBackendSrv = getBackendSrv();
+  origDataSourceSrv = getDataSourceSrv();
+  setBackendSrv(backendSrv);
+  setDataSourceSrv(fakeDataSourceSrv);
+});
+
+afterAll(() => {
+  setBackendSrv(origBackendSrv);
+  setDataSourceSrv(origDataSourceSrv);
+});
+
+describe('PostgreSQLDatasource', () => {
+  const defaultRange = getDefaultTimeRange(); // it does not matter what value this has
+  const fetchMock = jest.spyOn(backendSrv, 'fetch');
+  const setupTestContext = (data: unknown, mock?: Observable<FetchResponse<unknown>>, templateSrv?: unknown) => {
+    jest.clearAllMocks();
+    const defaultMock = () => mock ?? of(createFetchResponse(data));
+    fetchMock.mockImplementation(defaultMock);
+    const instanceSettings = {
+      jsonData: {
+        defaultProject: 'testproject',
+      },
+    } as unknown as DataSourceInstanceSettings<PostgresOptions>;
+    const variable = makeVariable('id1', 'name1');
+    const ds = new PostgresDatasource(instanceSettings);
+    if (templateSrv !== undefined) {
+      Reflect.set(ds, 'templateSrv', templateSrv);
+    }
+    return { ds, variable };
+  };
+
+  // https://rxjs-dev.firebaseapp.com/guide/testing/marble-testing
+  const runMarbleTest = (args: {
+    options: DataQueryRequest<SQLQuery>;
+    values: { [marble: string]: FetchResponse };
+    marble: string;
+    expectedValues: { [marble: string]: DataQueryResponse };
+    expectedMarble: string;
+  }) => {
+    const { expectedValues, expectedMarble, options, values, marble } = args;
+    const scheduler: TestScheduler = new TestScheduler((actual, expected) => {
+      expect(actual).toEqual(expected);
+    });
+
+    const { ds } = setupTestContext({});
+
+    scheduler.run(({ cold, expectObservable }) => {
+      const source = cold(marble, values);
+      jest.clearAllMocks();
+      fetchMock.mockImplementation(() => source);
+
+      const result = ds.query(options);
+      expectObservable(result).toBe(expectedMarble, expectedValues);
+    });
+  };
+
+  const simpleTemplateSrv = {
+    replace: (text: string) => text,
+  };
+
+  describe('When performing a time series query', () => {
+    it('should transform response correctly', () => {
+      const options: DataQueryRequest<SQLQuery> = {
+        range: {
+          from: dateTime(1432288354),
+          to: dateTime(1432288401),
+          raw: {
+            from: 'now-24h',
+            to: 'now',
+          },
+        },
+        targets: [
+          {
+            format: QueryFormat.Timeseries,
+            rawQuery: true,
+            rawSql: 'select time, metric from grafana_metric',
+            refId: 'A',
+            datasource: { type: 'gdev-ds', uid: 'gdev-ds' },
+          },
+        ],
+        requestId: 'test',
+        interval: '1m',
+        intervalMs: 60000,
+        scopedVars: {},
+        timezone: 'Etc/UTC',
+        app: 'Grafana',
+        startTime: 1432288354,
+      };
+      const response = {
+        results: {
+          A: {
+            refId: 'A',
+            frames: [
+              dataFrameToJSON(
+                createDataFrame({
+                  fields: [
+                    { name: 'time', values: [1599643351085] },
+                    { name: 'metric', values: [30.226249741223704], labels: { metric: 'America' } },
+                  ],
+                  meta: {
+                    executedQueryString: 'select time, metric from grafana_metric',
+                  },
+                })
+              ),
+            ],
+          },
+        },
+      };
+
+      const values = { a: createFetchResponse(response) };
+      const marble = '-a|';
+      const expectedMarble = '-a|';
+      const expectedValues: { a: DataQueryResponse } = {
+        a: {
+          data: [
+            {
+              fields: [
+                {
+                  config: {},
+                  entities: {},
+                  name: 'time',
+                  type: 'time',
+                  values: [1599643351085],
+                },
+                {
+                  config: {},
+                  entities: {},
+                  labels: {
+                    metric: 'America',
+                  },
+                  name: 'metric',
+                  type: 'number',
+                  values: [30.226249741223704],
+                },
+              ],
+              length: 1,
+              meta: {
+                executedQueryString: 'select time, metric from grafana_metric',
+              },
+              name: undefined,
+              refId: 'A',
+            },
+          ],
+          state: LoadingState.Done,
+        },
+      };
+
+      runMarbleTest({ options, marble, values, expectedMarble, expectedValues });
+    });
+  });
+
+  describe('When performing a table query', () => {
+    it('should transform response correctly', () => {
+      const options: DataQueryRequest<SQLQuery> = {
+        range: {
+          from: dateTime(1432288354),
+          to: dateTime(1432288401),
+          raw: {
+            from: 'now-24h',
+            to: 'now',
+          },
+        },
+        targets: [
+          {
+            format: QueryFormat.Table,
+            rawQuery: true,
+            rawSql: 'select time, metric, value from grafana_metric',
+            refId: 'A',
+            datasource: { type: 'gdev-ds', uid: 'gdev-ds' },
+          },
+        ],
+        requestId: 'test',
+        interval: '1m',
+        intervalMs: 60000,
+        scopedVars: {},
+        timezone: 'Etc/UTC',
+        app: 'Grafana',
+        startTime: 1432288354,
+      };
+      const response = {
+        results: {
+          A: {
+            refId: 'A',
+            frames: [
+              dataFrameToJSON(
+                createDataFrame({
+                  fields: [
+                    { name: 'time', values: [1599643351085] },
+                    { name: 'metric', values: ['America'] },
+                    { name: 'value', values: [30.226249741223704] },
+                  ],
+                  meta: {
+                    executedQueryString: 'select time, metric, value from grafana_metric',
+                  },
+                })
+              ),
+            ],
+          },
+        },
+      };
+
+      const values = { a: createFetchResponse(response) };
+      const marble = '-a|';
+      const expectedMarble = '-a|';
+      const expectedValues: { a: DataQueryResponse } = {
+        a: {
+          data: [
+            {
+              fields: [
+                {
+                  config: {},
+                  entities: {},
+                  name: 'time',
+                  type: 'time',
+                  values: [1599643351085],
+                },
+                {
+                  config: {},
+                  entities: {},
+                  name: 'metric',
+                  type: 'string',
+                  values: ['America'],
+                },
+                {
+                  config: {},
+                  entities: {},
+                  name: 'value',
+                  type: 'number',
+                  values: [30.226249741223704],
+                },
+              ],
+              length: 1,
+              meta: {
+                executedQueryString: 'select time, metric, value from grafana_metric',
+              },
+              name: undefined,
+              refId: 'A',
+            },
+          ],
+          state: LoadingState.Done,
+        },
+      };
+
+      runMarbleTest({ options, marble, values, expectedMarble, expectedValues });
+    });
+  });
+
+  describe('When runSql returns an empty dataframe', () => {
+    const response = {
+      results: {
+        tempvar: {
+          refId: 'tempvar',
+          frames: [],
+        },
+      },
+    };
+
+    it('should return an empty array when metricFindQuery is called', async () => {
+      const ds = setupTestContext(response, undefined, simpleTemplateSrv).ds;
+      const query = 'select * from atable';
+      const results = await ds.metricFindQuery(query, { range: defaultRange });
+      expect(results.length).toBe(0);
+    });
+
+    it('should return an empty array when fetchTables is called', async () => {
+      const ds = setupTestContext(response).ds;
+      const results = await ds.fetchTables();
+      expect(results.length).toBe(0);
+    });
+
+    it('should return empty string when getVersion is called', async () => {
+      const ds = setupTestContext(response).ds;
+      const results = await ds.getVersion();
+      expect(results).toBe('');
+    });
+
+    it('should return undefined when getTimescaleDBVersion is called', async () => {
+      const ds = setupTestContext(response).ds;
+      const results = await ds.getTimescaleDBVersion();
+      expect(results).toBe(undefined);
+    });
+
+    it('should return an empty array when fetchFields is called', async () => {
+      const ds = setupTestContext(response).ds;
+      const query: SQLQuery = {
+        refId: 'refId',
+        table: 'schema.table',
+        dataset: 'dataset',
+      };
+      const results = await ds.fetchFields(query);
+      expect(results.length).toBe(0);
+    });
+  });
+
+  describe('When runSql returns a populated dataframe', () => {
+    it('should return a list of tables when fetchTables is called', async () => {
+      const fetchTableResponse = {
+        results: {
+          tables: {
+            refId: 'tables',
+            frames: [
+              dataFrameToJSON(
+                createDataFrame({
+                  fields: [{ name: 'table', type: FieldType.string, values: ['test1', 'test2', 'test3'] }],
+                })
+              ),
+            ],
+          },
+        },
+      };
+
+      const { ds } = setupTestContext(fetchTableResponse);
+
+      const results = await ds.fetchTables();
+      expect(results.length).toBe(3);
+      expect(results).toEqual(['test1', 'test2', 'test3']);
+    });
+
+    it('should return a version string when getVersion is called', async () => {
+      const fetchVersionResponse = {
+        results: {
+          meta: {
+            refId: 'meta',
+            frames: [
+              dataFrameToJSON(
+                createDataFrame({
+                  fields: [{ name: 'version', type: FieldType.string, values: ['test1'] }],
+                })
+              ),
+            ],
+          },
+        },
+      };
+
+      const { ds } = setupTestContext(fetchVersionResponse);
+
+      const version = await ds.getVersion();
+      expect(version).toBe('test1');
+    });
+
+    it('should return a version string when getTimescaleDBVersion is called', async () => {
+      const fetchVersionResponse = {
+        results: {
+          meta: {
+            refId: 'meta',
+            frames: [
+              dataFrameToJSON(
+                createDataFrame({
+                  fields: [{ name: 'extversion', type: FieldType.string, values: ['test1'] }],
+                })
+              ),
+            ],
+          },
+        },
+      };
+
+      const { ds } = setupTestContext(fetchVersionResponse);
+
+      const version = await ds.getTimescaleDBVersion();
+      expect(version).toBe('test1');
+    });
+
+    it('should return a list of fields when fetchFields is called', async () => {
+      const fetchFieldsResponse = {
+        results: {
+          columns: {
+            refId: 'columns',
+            frames: [
+              dataFrameToJSON(
+                createDataFrame({
+                  fields: [
+                    { name: 'column', type: FieldType.string, values: ['test1', 'test2', 'test3'] },
+                    { name: 'type', type: FieldType.string, values: ['int', 'char', 'bool'] },
+                  ],
+                })
+              ),
+            ],
+          },
+        },
+      };
+
+      const { ds } = setupTestContext(fetchFieldsResponse);
+
+      const sqlQuery: SQLQuery = {
+        refId: 'fields',
+        table: 'table',
+        dataset: 'dataset',
+      };
+      const results = await ds.fetchFields(sqlQuery);
+      expect(results.length).toBe(3);
+      expect(results[0].label).toBe('test1');
+      expect(results[0].value).toBe('test1');
+      expect(results[0].type).toBe('int');
+      expect(results[1].label).toBe('test2');
+      expect(results[1].value).toBe('test2');
+      expect(results[1].type).toBe('char');
+      expect(results[2].label).toBe('test3');
+      expect(results[2].value).toBe('test3');
+      expect(results[2].type).toBe('bool');
+    });
+  });
+
+  describe('When performing metricFindQuery that returns multiple string fields', () => {
+    it('should return list of all string field values', async () => {
+      const query = 'select * from atable';
+      const response = {
+        results: {
+          tempvar: {
+            refId: 'tempvar',
+            frames: [
+              dataFrameToJSON(
+                createDataFrame({
+                  fields: [
+                    { name: 'title', values: ['aTitle', 'aTitle2', 'aTitle3'] },
+                    { name: 'text', values: ['some text', 'some text2', 'some text3'] },
+                  ],
+                  meta: {
+                    executedQueryString: 'select * from atable',
+                  },
+                })
+              ),
+            ],
+          },
+        },
+      };
+
+      const { ds } = setupTestContext(response, undefined, simpleTemplateSrv);
+      const results = await ds.metricFindQuery(query, { range: defaultRange });
+
+      expect(results.length).toBe(6);
+      expect(results[0].text).toBe('aTitle');
+      expect(results[5].text).toBe('some text3');
+    });
+  });
+
+  describe('When performing metricFindQuery with $__searchFilter and a searchFilter is given', () => {
+    it('should return list of all column values', async () => {
+      const query = "select title from atable where title LIKE '$__searchFilter'";
+      const response = {
+        results: {
+          tempvar: {
+            refId: 'tempvar',
+            frames: [
+              dataFrameToJSON(
+                createDataFrame({
+                  fields: [
+                    { name: 'title', values: ['aTitle', 'aTitle2', 'aTitle3'] },
+                    { name: 'text', values: ['some text', 'some text2', 'some text3'] },
+                  ],
+                  meta: {
+                    executedQueryString: 'select * from atable',
+                  },
+                })
+              ),
+            ],
+          },
+        },
+      };
+
+      const templateSrv = {
+        replace: (text: string, scopedVars: unknown) => {
+          expect(text).toBe("select title from atable where title LIKE '$__searchFilter'");
+          expect(scopedVars).toStrictEqual({
+            __searchFilter: {
+              value: 'aTit%',
+              text: '',
+            },
+          });
+          return "select title from atable where title LIKE 'aTit%'";
+        },
+      };
+
+      const { ds } = setupTestContext(response, undefined, templateSrv);
+      const results = await ds.metricFindQuery(query, { range: defaultRange, searchFilter: 'aTit' });
+
+      expect(fetchMock).toBeCalledTimes(1);
+      expect(fetchMock.mock.calls[0][0].data.queries[0].rawSql).toBe(
+        "select title from atable where title LIKE 'aTit%'"
+      );
+      expect(results).toEqual([
+        { text: 'aTitle' },
+        { text: 'aTitle2' },
+        { text: 'aTitle3' },
+        { text: 'some text' },
+        { text: 'some text2' },
+        { text: 'some text3' },
+      ]);
+    });
+  });
+
+  describe('When performing metricFindQuery with $__searchFilter but no searchFilter is given', () => {
+    it('should return list of all column values', async () => {
+      const query = "select title from atable where title LIKE '$__searchFilter'";
+      const response = {
+        results: {
+          tempvar: {
+            refId: 'tempvar',
+            frames: [
+              dataFrameToJSON(
+                createDataFrame({
+                  fields: [
+                    { name: 'title', values: ['aTitle', 'aTitle2', 'aTitle3'] },
+                    { name: 'text', values: ['some text', 'some text2', 'some text3'] },
+                  ],
+                  meta: {
+                    executedQueryString: 'select * from atable',
+                  },
+                })
+              ),
+            ],
+          },
+        },
+      };
+
+      const templateSrv = {
+        replace: (text: string, scopedVars: unknown) => {
+          expect(text).toBe("select title from atable where title LIKE '$__searchFilter'");
+          expect(scopedVars).toStrictEqual({
+            __searchFilter: {
+              value: '%',
+              text: '',
+            },
+          });
+          return "select title from atable where title LIKE '%'";
+        },
+      };
+
+      const { ds } = setupTestContext(response, undefined, templateSrv);
+      const results = await ds.metricFindQuery(query, { range: defaultRange });
+
+      expect(fetchMock).toBeCalledTimes(1);
+      expect(fetchMock.mock.calls[0][0].data.queries[0].rawSql).toBe("select title from atable where title LIKE '%'");
+      expect(results).toEqual([
+        { text: 'aTitle' },
+        { text: 'aTitle2' },
+        { text: 'aTitle3' },
+        { text: 'some text' },
+        { text: 'some text2' },
+        { text: 'some text3' },
+      ]);
+    });
+  });
+
+  describe('When performing metricFindQuery with key, value columns', () => {
+    it('should return list of as text, value', async () => {
+      const query = 'select * from atable';
+      const response = {
+        results: {
+          tempvar: {
+            refId: 'tempvar',
+            frames: [
+              dataFrameToJSON(
+                createDataFrame({
+                  fields: [
+                    { name: '__value', values: ['value1', 'value2', 'value3'] },
+                    { name: '__text', values: ['aTitle', 'aTitle2', 'aTitle3'] },
+                  ],
+                  meta: {
+                    executedQueryString: 'select * from atable',
+                  },
+                })
+              ),
+            ],
+          },
+        },
+      };
+      const { ds } = setupTestContext(response, undefined, simpleTemplateSrv);
+      const results = await ds.metricFindQuery(query, { range: defaultRange });
+
+      expect(results).toEqual([
+        { text: 'aTitle', value: 'value1' },
+        { text: 'aTitle2', value: 'value2' },
+        { text: 'aTitle3', value: 'value3' },
+      ]);
+    });
+  });
+
+  describe('When performing metricFindQuery without key, value columns', () => {
+    it('should return list of all field values as text', async () => {
+      const query = 'select id, values from atable';
+      const response = {
+        results: {
+          tempvar: {
+            refId: 'tempvar',
+            frames: [
+              dataFrameToJSON(
+                createDataFrame({
+                  fields: [
+                    { name: 'id', values: [1, 2, 3] },
+                    { name: 'values', values: ['test1', 'test2', 'test3'] },
+                  ],
+                  meta: {
+                    executedQueryString: 'select id, values from atable',
+                  },
+                })
+              ),
+            ],
+          },
+        },
+      };
+      const { ds } = setupTestContext(response, undefined, simpleTemplateSrv);
+      const results = await ds.metricFindQuery(query, { range: defaultRange });
+
+      expect(results).toEqual([
+        { text: 1 },
+        { text: 2 },
+        { text: 3 },
+        { text: 'test1' },
+        { text: 'test2' },
+        { text: 'test3' },
+      ]);
+    });
+  });
+
+  describe('When performing metricFindQuery with key, value columns and with duplicate keys', () => {
+    it('should return list of unique keys', async () => {
+      const query = 'select * from atable';
+      const response = {
+        results: {
+          tempvar: {
+            refId: 'tempvar',
+            frames: [
+              dataFrameToJSON(
+                createDataFrame({
+                  fields: [
+                    { name: '__text', values: ['aTitle', 'aTitle', 'aTitle'] },
+                    { name: '__value', values: ['same', 'same', 'diff'] },
+                  ],
+                  meta: {
+                    executedQueryString: 'select * from atable',
+                  },
+                })
+              ),
+            ],
+          },
+        },
+      };
+      const { ds } = setupTestContext(response, undefined, simpleTemplateSrv);
+      const results = await ds.metricFindQuery(query, { range: defaultRange });
+
+      expect(results).toEqual([{ text: 'aTitle', value: 'same' }]);
+    });
+  });
+
+  describe('When interpolating variables', () => {
+    describe('and value is a string', () => {
+      it('should return an unquoted value', () => {
+        const { ds, variable } = setupTestContext({});
+        expect(ds.interpolateVariable('abc', variable)).toEqual('abc');
+      });
+    });
+
+    describe('and value is a number', () => {
+      it('should return an unquoted value', () => {
+        const { ds, variable } = setupTestContext({});
+        expect(ds.interpolateVariable(1000 as unknown as string, variable)).toEqual(1000);
+      });
+    });
+
+    describe('and value is an array of strings', () => {
+      it('should return comma separated quoted values', () => {
+        const { ds, variable } = setupTestContext({});
+        expect(ds.interpolateVariable(['a', 'b', 'c'], variable)).toEqual("'a','b','c'");
+      });
+    });
+
+    describe('and variable allows multi-value and is a string', () => {
+      it('should return a quoted value', () => {
+        const { ds, variable } = setupTestContext({});
+        variable.multi = true;
+        expect(ds.interpolateVariable('abc', variable)).toEqual("'abc'");
+      });
+    });
+
+    describe('and variable contains single quote', () => {
+      it('should return a quoted value', () => {
+        const { ds, variable } = setupTestContext({});
+        variable.multi = true;
+        expect(ds.interpolateVariable("a'bc", variable)).toEqual("'a''bc'");
+        expect(ds.interpolateVariable("a'b'c", variable)).toEqual("'a''b''c'");
+      });
+    });
+
+    describe('and variable allows all and is a string', () => {
+      it('should return a quoted value', () => {
+        const { ds, variable } = setupTestContext({});
+        variable.includeAll = true;
+        expect(ds.interpolateVariable('abc', variable)).toEqual("'abc'");
+      });
+    });
+  });
+
+  describe('targetContainsTemplate', () => {
+    it('given query that contains template variable it should return true', () => {
+      const rawSql = `SELECT
+      $__timeGroup("createdAt",'$summarize'),
+      avg(value) as "value",
+      hostname as "metric"
+    FROM
+      grafana_metric
+    WHERE
+      $__timeFilter("createdAt") AND
+      measurement = 'logins.count' AND
+      hostname IN($host)
+    GROUP BY time, metric
+    ORDER BY time`;
+      const query: SQLQuery = {
+        rawSql,
+        refId: 'A',
+        rawQuery: true,
+      };
+
+      // a fake template server:
+      // it assumes there are two template variables defined:
+      // - summarize
+      // - host
+      const templateSrv = {
+        containsTemplate: (text: string) => {
+          // when the text arrives here, it has been already pre-processed
+          // by the sql datasource, sql-specific variables have been removed
+          expect(text).toBe(rawSql.replace(/\$__time(Filter)?/g, ''));
+          return true;
+        },
+      };
+      const { ds } = setupTestContext({}, undefined, templateSrv);
+
+      expect(ds.targetContainsTemplate(query)).toBeTruthy();
+    });
+
+    it('given query that only contains global template variable it should return false', () => {
+      const rawSql = `SELECT
+      $__timeGroup("createdAt",'$__interval'),
+      avg(value) as "value",
+      hostname as "metric"
+    FROM
+      grafana_metric
+    WHERE
+      $__timeFilter("createdAt") AND
+      measurement = 'logins.count'
+    GROUP BY time, metric
+    ORDER BY time`;
+      const query: SQLQuery = {
+        rawSql,
+        refId: 'A',
+        rawQuery: true,
+      };
+      // a fake template server:
+      // it assumes there are two template variables defined:
+      // - summarize
+      // - host
+      const templateSrv = {
+        containsTemplate: (text: string) => {
+          // when the text arrives here, it has been already pre-processed
+          // by the sql datasource, sql-specific variables has been removed
+          expect(text).toBe(rawSql.replace(/\$__time(Filter)?/g, ''));
+          return false;
+        },
+      };
+      const { ds } = setupTestContext({}, undefined, templateSrv);
+
+      expect(ds.targetContainsTemplate(query)).toBeFalsy();
+    });
+  });
+});
+
+const createFetchResponse = <T>(data: T): FetchResponse<T> => ({
+  data,
+  status: 200,
+  url: 'http://localhost:3000/api/query',
+  config: { url: 'http://localhost:3000/api/query' },
+  type: 'basic',
+  statusText: 'Ok',
+  redirected: false,
+  headers: {} as unknown as Headers,
+  ok: true,
+});
diff --git a/public/app/plugins/datasource/grafana-postgresql-datasource/datasource.ts b/public/app/plugins/datasource/grafana-postgresql-datasource/datasource.ts
new file mode 100644
index 0000000000000..cbaa49a8c468b
--- /dev/null
+++ b/public/app/plugins/datasource/grafana-postgresql-datasource/datasource.ts
@@ -0,0 +1,109 @@
+import { DataSourceInstanceSettings, ScopedVars } from '@grafana/data';
+import { LanguageDefinition } from '@grafana/experimental';
+import { TemplateSrv } from '@grafana/runtime';
+import { SqlDatasource, DB, SQLQuery, SQLSelectableValue, formatSQL } from '@grafana/sql';
+
+import { PostgresQueryModel } from './PostgresQueryModel';
+import { getSchema, getTimescaleDBVersion, getVersion, showTables } from './postgresMetaQuery';
+import { fetchColumns, fetchTables, getSqlCompletionProvider } from './sqlCompletionProvider';
+import { getFieldConfig, toRawSql } from './sqlUtil';
+import { PostgresOptions } from './types';
+
+export class PostgresDatasource extends SqlDatasource {
+  sqlLanguageDefinition: LanguageDefinition | undefined = undefined;
+
+  constructor(instanceSettings: DataSourceInstanceSettings<PostgresOptions>) {
+    super(instanceSettings);
+  }
+
+  getQueryModel(target?: SQLQuery, templateSrv?: TemplateSrv, scopedVars?: ScopedVars): PostgresQueryModel {
+    return new PostgresQueryModel(target, templateSrv, scopedVars);
+  }
+
+  async getVersion(): Promise<string> {
+    const value = await this.runSql<{ version: number }>(getVersion());
+    const results = value.fields.version?.values;
+
+    if (!results) {
+      return '';
+    }
+
+    return results[0].toString();
+  }
+
+  async getTimescaleDBVersion(): Promise<string | undefined> {
+    const value = await this.runSql<{ extversion: string }>(getTimescaleDBVersion());
+    const results = value.fields.extversion?.values;
+
+    if (!results) {
+      return undefined;
+    }
+
+    return results[0];
+  }
+
+  async fetchTables(): Promise<string[]> {
+    const tables = await this.runSql<{ table: string[] }>(showTables(), { refId: 'tables' });
+    return tables.fields.table?.values.flat() ?? [];
+  }
+
+  getSqlLanguageDefinition(db: DB): LanguageDefinition {
+    if (this.sqlLanguageDefinition !== undefined) {
+      return this.sqlLanguageDefinition;
+    }
+
+    const args = {
+      getColumns: { current: (query: SQLQuery) => fetchColumns(db, query) },
+      getTables: { current: () => fetchTables(db) },
+    };
+    this.sqlLanguageDefinition = {
+      id: 'pgsql',
+      completionProvider: getSqlCompletionProvider(args),
+      formatter: formatSQL,
+    };
+    return this.sqlLanguageDefinition;
+  }
+
+  async fetchFields(query: SQLQuery): Promise<SQLSelectableValue[]> {
+    const { table } = query;
+    if (table === undefined) {
+      // if no table-name, we are not able to query for fields
+      return [];
+    }
+    const schema = await this.runSql<{ column: string; type: string }>(getSchema(table), { refId: 'columns' });
+    const result: SQLSelectableValue[] = [];
+    for (let i = 0; i < schema.length; i++) {
+      const column = schema.fields.column.values[i];
+      const type = schema.fields.type.values[i];
+      result.push({ label: column, value: column, type, ...getFieldConfig(type) });
+    }
+    return result;
+  }
+
+  getDB(): DB {
+    if (this.db !== undefined) {
+      return this.db;
+    }
+
+    return {
+      init: () => Promise.resolve(true),
+      datasets: () => Promise.resolve([]),
+      tables: () => this.fetchTables(),
+      getEditorLanguageDefinition: () => this.getSqlLanguageDefinition(this.db),
+      fields: async (query: SQLQuery) => {
+        if (!query?.table) {
+          return [];
+        }
+        return this.fetchFields(query);
+      },
+      validateQuery: (query) =>
+        Promise.resolve({ isError: false, isValid: true, query, error: '', rawSql: query.rawSql }),
+      dsID: () => this.id,
+      toRawSql,
+      lookup: async () => {
+        const tables = await this.fetchTables();
+        return tables.map((t) => ({ name: t, completion: t }));
+      },
+    };
+  }
+}
diff --git a/public/app/plugins/datasource/postgres/img/postgresql_logo.svg b/public/app/plugins/datasource/grafana-postgresql-datasource/img/postgresql_logo.svg
similarity index 100%
rename from public/app/plugins/datasource/postgres/img/postgresql_logo.svg
rename to public/app/plugins/datasource/grafana-postgresql-datasource/img/postgresql_logo.svg
diff --git a/public/app/plugins/datasource/grafana-postgresql-datasource/module.ts b/public/app/plugins/datasource/grafana-postgresql-datasource/module.ts
new file mode 100644
index 0000000000000..e03aa2e4d0d3d
--- /dev/null
+++ b/public/app/plugins/datasource/grafana-postgresql-datasource/module.ts
@@ -0,0 +1,15 @@
+import { DataSourcePlugin } from '@grafana/data';
+import { SQLQuery } from '@grafana/sql';
+
+import { CheatSheet } from './CheatSheet';
+import { PostgresQueryEditor } from './PostgresQueryEditor';
+import { PostgresConfigEditor } from './configuration/ConfigurationEditor';
+import { PostgresDatasource } from './datasource';
+import { PostgresOptions, SecureJsonData } from './types';
+
+export const plugin = new DataSourcePlugin<PostgresDatasource, SQLQuery, PostgresOptions, SecureJsonData>(
+  PostgresDatasource
+)
+  .setQueryEditor(PostgresQueryEditor)
+  .setQueryEditorHelp(CheatSheet)
+  .setConfigEditor(PostgresConfigEditor);
diff --git a/public/app/plugins/datasource/grafana-postgresql-datasource/plugin.json b/public/app/plugins/datasource/grafana-postgresql-datasource/plugin.json
new file mode 100644
index 0000000000000..fc5ed6d136c19
--- /dev/null
+++ b/public/app/plugins/datasource/grafana-postgresql-datasource/plugin.json
@@ -0,0 +1,29 @@
+{
+  "type": "datasource",
+  "name": "PostgreSQL",
+  "id": "grafana-postgresql-datasource",
+  "aliasIDs": ["postgres"],
+  "category": "sql",
+
+  "info": {
+    "description": "Data source for PostgreSQL and compatible databases",
+    "author": {
+      "name": "Grafana Labs",
+      "url": "https://grafana.com"
+    },
+    "logos": {
+      "small": "img/postgresql_logo.svg",
+      "large": "img/postgresql_logo.svg"
+    }
+  },
+
+  "alerting": true,
+  "annotations": true,
+  "metrics": true,
+  "logs": true,
+  "backend": true,
+
+  "queryOptions": {
+    "minInterval": true
+  }
+}
diff --git a/public/app/plugins/datasource/grafana-postgresql-datasource/postgresMetaQuery.test.ts b/public/app/plugins/datasource/grafana-postgresql-datasource/postgresMetaQuery.test.ts
new file mode 100644
index 0000000000000..1ba58784c7190
--- /dev/null
+++ b/public/app/plugins/datasource/grafana-postgresql-datasource/postgresMetaQuery.test.ts
@@ -0,0 +1,14 @@
+import { getSchema } from './postgresMetaQuery';
+
+describe('postgredsMetaQuery.getSchema', () => {
+  it('should handle table-names with single quote', () => {
+    // testing multi-line with single-quote, double-quote, backtick
+    const tableName = `'a''bcd'efg'h'  "a""b" ` + '`x``y`z' + `\n a'b''c`;
+    const escapedName = `''a''''bcd''efg''h''  "a""b" ` + '`x``y`z' + `\n a''b''''c`;
+
+    const schemaQuery = getSchema(tableName);
+
+    expect(schemaQuery.includes(escapedName)).toBeTruthy();
+    expect(schemaQuery.includes(tableName)).toBeFalsy();
+  });
+});
diff --git a/public/app/plugins/datasource/postgres/postgresMetaQuery.ts b/public/app/plugins/datasource/grafana-postgresql-datasource/postgresMetaQuery.ts
similarity index 84%
rename from public/app/plugins/datasource/postgres/postgresMetaQuery.ts
rename to public/app/plugins/datasource/grafana-postgresql-datasource/postgresMetaQuery.ts
index 80b0466f91cd6..664a8e9c4dcf1 100644
--- a/public/app/plugins/datasource/postgres/postgresMetaQuery.ts
+++ b/public/app/plugins/datasource/grafana-postgresql-datasource/postgresMetaQuery.ts
@@ -19,10 +19,15 @@ export function showTables() {
       and ${buildSchemaConstraint()}`;
 }
 
-export function getSchema(table?: string) {
+export function getSchema(table: string) {
+  // we will put table-name between single-quotes, so we need to escape single-quotes
+  // in the table-name
+  const tableNamePart = "'" + table.replace(/'/g, "''") + "'";
+
   return `select quote_ident(column_name) as "column", data_type as "type"
     from information_schema.columns
-    where quote_ident(table_name) = '${table}'`;
+    where quote_ident(table_name) = ${tableNamePart};
+    `;
 }
 
 function buildSchemaConstraint() {
diff --git a/public/app/plugins/datasource/postgres/sqlCompletionProvider.ts b/public/app/plugins/datasource/grafana-postgresql-datasource/sqlCompletionProvider.ts
similarity index 95%
rename from public/app/plugins/datasource/postgres/sqlCompletionProvider.ts
rename to public/app/plugins/datasource/grafana-postgresql-datasource/sqlCompletionProvider.ts
index 485e972582d6b..9c1c4f9220519 100644
--- a/public/app/plugins/datasource/postgres/sqlCompletionProvider.ts
+++ b/public/app/plugins/datasource/grafana-postgresql-datasource/sqlCompletionProvider.ts
@@ -5,7 +5,7 @@ import {
   TableDefinition,
   TableIdentifier,
 } from '@grafana/experimental';
-import { DB, SQLQuery } from 'app/features/plugins/sql/types';
+import { DB, SQLQuery } from '@grafana/sql';
 
 interface CompletionProviderGetterArgs {
   getColumns: React.MutableRefObject<(t: SQLQuery) => Promise<ColumnDefinition[]>>;
diff --git a/public/app/plugins/datasource/postgres/sqlUtil.ts b/public/app/plugins/datasource/grafana-postgresql-datasource/sqlUtil.ts
similarity index 92%
rename from public/app/plugins/datasource/postgres/sqlUtil.ts
rename to public/app/plugins/datasource/grafana-postgresql-datasource/sqlUtil.ts
index 3c652fb27198f..75e77f54882e1 100644
--- a/public/app/plugins/datasource/postgres/sqlUtil.ts
+++ b/public/app/plugins/datasource/grafana-postgresql-datasource/sqlUtil.ts
@@ -1,7 +1,6 @@
 import { isEmpty } from 'lodash';
 
-import { RAQBFieldTypes, SQLQuery } from 'app/features/plugins/sql/types';
-import { createSelectClause, haveColumns } from 'app/features/plugins/sql/utils/sql.utils';
+import { createSelectClause, haveColumns, RAQBFieldTypes, SQLQuery } from '@grafana/sql';
 
 export function getFieldConfig(type: string): { raqbFieldType: RAQBFieldTypes; icon: string } {
   switch (type) {
diff --git a/public/app/plugins/datasource/grafana-postgresql-datasource/types.ts b/public/app/plugins/datasource/grafana-postgresql-datasource/types.ts
new file mode 100644
index 0000000000000..a10a4354ad096
--- /dev/null
+++ b/public/app/plugins/datasource/grafana-postgresql-datasource/types.ts
@@ -0,0 +1,27 @@
+import { SQLOptions } from '@grafana/sql';
+
+export enum PostgresTLSModes {
+  disable = 'disable',
+  require = 'require',
+  verifyCA = 'verify-ca',
+  verifyFull = 'verify-full',
+}
+
+export enum PostgresTLSMethods {
+  filePath = 'file-path',
+  fileContent = 'file-content',
+}
+export interface PostgresOptions extends SQLOptions {
+  tlsConfigurationMethod?: PostgresTLSMethods;
+  sslmode?: PostgresTLSModes;
+  sslRootCertFile?: string;
+  sslCertFile?: string;
+  sslKeyFile?: string;
+  postgresVersion?: number;
+  timescaledb?: boolean;
+  enableSecureSocksProxy?: boolean;
+}
+
+export interface SecureJsonData {
+  password?: string;
+}
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/.eslintignore b/public/app/plugins/datasource/grafana-pyroscope-datasource/.eslintignore
new file mode 100644
index 0000000000000..59ac0834c7a79
--- /dev/null
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/.eslintignore
@@ -0,0 +1,2 @@
+# TS generate from cue by cuetsy
+**/*.gen.ts
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/CHANGELOG.md b/public/app/plugins/datasource/grafana-pyroscope-datasource/CHANGELOG.md
new file mode 100644
index 0000000000000..825c32f0d03d9
--- /dev/null
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/CHANGELOG.md
@@ -0,0 +1 @@
+# Changelog
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/ConfigEditor.tsx b/public/app/plugins/datasource/grafana-pyroscope-datasource/ConfigEditor.tsx
index 2e95f1786315f..919563fec888c 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/ConfigEditor.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 
 import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
+import { config } from '@grafana/runtime';
 import { DataSourceHttpSettings, EventsWithValidation, LegacyForms, regexValidation } from '@grafana/ui';
-import { config } from 'app/core/config';
 
 import { PyroscopeDataSourceOptions } from './types';
 
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/EditorField.tsx b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/EditorField.tsx
index 330c5f84b0713..56007cac05bbd 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/EditorField.tsx
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/EditorField.tsx
@@ -2,7 +2,7 @@ import { css } from '@emotion/css';
 import React, { ComponentProps } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Field, Icon, PopoverContent, ReactUtils, stylesFactory, Tooltip, useTheme2 } from '@grafana/ui';
+import { Field, Icon, PopoverContent, ReactUtils, Tooltip, useStyles2 } from '@grafana/ui';
 
 interface EditorFieldProps extends ComponentProps<typeof Field> {
   label: string;
@@ -15,8 +15,7 @@ interface EditorFieldProps extends ComponentProps<typeof Field> {
 export const EditorField = (props: EditorFieldProps) => {
   const { label, optional, tooltip, children, width, ...fieldProps } = props;
 
-  const theme = useTheme2();
-  const styles = getStyles(theme, width);
+  const styles = useStyles2(getStyles, width);
 
   // Null check for backward compatibility
   const childInputId = fieldProps?.htmlFor || ReactUtils?.getChildId(children);
@@ -45,32 +44,30 @@ export const EditorField = (props: EditorFieldProps) => {
   );
 };
 
-const getStyles = stylesFactory((theme: GrafanaTheme2, width?: number | string) => {
-  return {
-    space: css({
-      paddingRight: theme.spacing(0),
-      paddingBottom: theme.spacing(0.5),
-    }),
-    root: css({
-      minWidth: theme.spacing(width ?? 0),
-    }),
-    label: css({
-      fontSize: 12,
-      fontWeight: theme.typography.fontWeightMedium,
-    }),
-    optional: css({
-      fontStyle: 'italic',
-      color: theme.colors.text.secondary,
-    }),
-    field: css({
-      marginBottom: 0, // GrafanaUI/Field has a bottom margin which we must remove
-    }),
-    icon: css({
-      color: theme.colors.text.secondary,
-      marginLeft: theme.spacing(1),
-      ':hover': {
-        color: theme.colors.text.primary,
-      },
-    }),
-  };
+const getStyles = (theme: GrafanaTheme2, width?: number | string) => ({
+  space: css({
+    paddingRight: theme.spacing(0),
+    paddingBottom: theme.spacing(0.5),
+  }),
+  root: css({
+    minWidth: theme.spacing(width ?? 0),
+  }),
+  label: css({
+    fontSize: 12,
+    fontWeight: theme.typography.fontWeightMedium,
+  }),
+  optional: css({
+    fontStyle: 'italic',
+    color: theme.colors.text.secondary,
+  }),
+  field: css({
+    marginBottom: 0, // GrafanaUI/Field has a bottom margin which we must remove
+  }),
+  icon: css({
+    color: theme.colors.text.secondary,
+    marginLeft: theme.spacing(1),
+    ':hover': {
+      color: theme.colors.text.primary,
+    },
+  }),
 });
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/LabelsEditor.tsx b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/LabelsEditor.tsx
index 7cac836efbec9..6c7cee860816c 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/LabelsEditor.tsx
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/LabelsEditor.tsx
@@ -32,7 +32,7 @@ export function LabelsEditor(props: Props) {
       <CodeEditor
         value={props.value}
         language={langId}
-        onBlur={props.onChange}
+        onChange={props.onChange}
         containerStyles={styles.queryField}
         monacoOptions={{
           folding: false,
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/ProfileTypesCascader.tsx b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/ProfileTypesCascader.tsx
index 17b6608fbb6e1..fd21bb7158504 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/ProfileTypesCascader.tsx
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/ProfileTypesCascader.tsx
@@ -1,5 +1,6 @@
 import React, { useEffect, useMemo, useState } from 'react';
 
+import { TimeRange } from '@grafana/data';
 import { Cascader, CascaderOption } from '@grafana/ui';
 
 import { PyroscopeDataSource } from '../datasource';
@@ -10,6 +11,7 @@ type Props = {
   profileTypes?: ProfileTypeMessage[];
   onChange: (value: string) => void;
   placeholder?: string;
+  width?: number;
 };
 
 export function ProfileTypesCascader(props: Props) {
@@ -25,6 +27,7 @@ export function ProfileTypesCascader(props: Props) {
       onSelect={props.onChange}
       options={cascaderOptions}
       changeOnSelect={false}
+      width={props.width ?? 26}
     />
   );
 }
@@ -68,16 +71,22 @@ function useCascaderOptions(profileTypes?: ProfileTypeMessage[]): CascaderOption
  * This is exported and not used directly in the ProfileTypesCascader component because in some case we need to know
  * the profileTypes before rendering the cascader.
  * @param datasource
+ * @param range Time range for the profile types query.
  */
-export function useProfileTypes(datasource: PyroscopeDataSource) {
+export function useProfileTypes(datasource: PyroscopeDataSource, range?: TimeRange) {
   const [profileTypes, setProfileTypes] = useState<ProfileTypeMessage[]>();
 
+  const impreciseRange = {
+    to: Math.ceil((range?.to.valueOf() || 0) / 60000) * 60000,
+    from: Math.floor((range?.from.valueOf() || 0) / 60000) * 60000,
+  };
+
   useEffect(() => {
     (async () => {
-      const profileTypes = await datasource.getProfileTypes();
+      const profileTypes = await datasource.getProfileTypes(impreciseRange.from.valueOf(), impreciseRange.to.valueOf());
       setProfileTypes(profileTypes);
     })();
-  }, [datasource]);
+  }, [datasource, impreciseRange.from, impreciseRange.to]);
 
   return profileTypes;
 }
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryEditor.test.tsx b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryEditor.test.tsx
index 07e4c3de2b4d6..14b89c583b73d 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryEditor.test.tsx
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryEditor.test.tsx
@@ -3,13 +3,20 @@ import userEvent from '@testing-library/user-event';
 import React from 'react';
 
 import { CoreApp, PluginType } from '@grafana/data';
+import { setPluginExtensionGetter } from '@grafana/runtime';
 
 import { PyroscopeDataSource } from '../datasource';
+import { mockFetchPyroscopeDatasourceSettings } from '../datasource.test';
 import { ProfileTypeMessage } from '../types';
 
 import { Props, QueryEditor } from './QueryEditor';
 
 describe('QueryEditor', () => {
+  beforeEach(() => {
+    setPluginExtensionGetter(() => ({ extensions: [] })); // No extensions
+    mockFetchPyroscopeDatasourceSettings();
+  });
+
   it('should render without error', async () => {
     setup();
 
@@ -104,6 +111,8 @@ function setupDs() {
     },
   ] as ProfileTypeMessage[]);
 
+  ds.getLabelNames = jest.fn().mockResolvedValue(['label_one']);
+
   return ds;
 }
 
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryEditor.tsx b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryEditor.tsx
index be3ca6eef6e61..bcc03a1a9138d 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryEditor.tsx
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryEditor.tsx
@@ -1,21 +1,24 @@
 import deepEqual from 'fast-deep-equal';
-import React, { useCallback, useEffect } from 'react';
-import { useAsync } from 'react-use';
+import { debounce } from 'lodash';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 
 import { CoreApp, QueryEditorProps, TimeRange } from '@grafana/data';
 import { LoadingPlaceholder } from '@grafana/ui';
 
 import { normalizeQuery, PyroscopeDataSource } from '../datasource';
-import { PyroscopeDataSourceOptions, ProfileTypeMessage, Query } from '../types';
+import { ProfileTypeMessage, PyroscopeDataSourceOptions, Query } from '../types';
 
 import { EditorRow } from './EditorRow';
 import { EditorRows } from './EditorRows';
 import { LabelsEditor } from './LabelsEditor';
 import { ProfileTypesCascader, useProfileTypes } from './ProfileTypesCascader';
+import { PyroscopeQueryLinkExtensions } from './QueryLinkExtension';
 import { QueryOptions } from './QueryOptions';
 
 export type Props = QueryEditorProps<PyroscopeDataSource, Query, PyroscopeDataSourceOptions>;
 
+const labelSelectorRegex = /(\w+)\s*=\s*("[^,"]+")/g;
+
 export function QueryEditor(props: Props) {
   const { onChange, onRunQuery, datasource, query, range, app } = props;
 
@@ -24,8 +27,10 @@ export function QueryEditor(props: Props) {
     onRunQuery();
   }
 
-  const profileTypes = useProfileTypes(datasource);
-  const { labels, getLabelValues, onLabelSelectorChange } = useLabels(range, datasource, query, onChange);
+  const onLabelSelectorChange = useLabelSelector(query, onChange);
+
+  const profileTypes = useProfileTypes(datasource, range);
+  const { labels, getLabelValues } = useLabels(range, datasource, query);
   useNormalizeQuery(query, profileTypes, onChange, app);
 
   let cascader = <LoadingPlaceholder text={'Loading'} />;
@@ -57,6 +62,7 @@ export function QueryEditor(props: Props) {
           labels={labels}
           getLabelValues={getLabelValues}
         />
+        <PyroscopeQueryLinkExtensions {...props} />
       </EditorRow>
       <EditorRow>
         <QueryOptions query={query} onQueryChange={props.onChange} app={props.app} labels={labels} />
@@ -104,42 +110,76 @@ function defaultProfileType(profileTypes: ProfileTypeMessage[]): string {
   return profileTypes[0]?.id || '';
 }
 
-function useLabels(
-  range: TimeRange | undefined,
-  datasource: PyroscopeDataSource,
-  query: Query,
-  onChange: (value: Query) => void
-) {
+function useLabels(range: TimeRange | undefined, datasource: PyroscopeDataSource, query: Query) {
   // Round to nearest 5 seconds. If the range is something like last 1h then every render the range values change slightly
   // and what ever has range as dependency is rerun. So this effectively debounces the queries.
   const unpreciseRange = {
-    to: Math.ceil((range?.to.valueOf() || 0) / 5000) * 5000,
-    from: Math.floor((range?.from.valueOf() || 0) / 5000) * 5000,
+    to: Math.ceil((range?.to.valueOf() || 0) / 10000) * 10000,
+    from: Math.floor((range?.from.valueOf() || 0) / 10000) * 10000,
+  };
+
+  // Transforms user input into a valid label selector including the profile type.
+  // It can optionally remove a label, used to support editing existing label values.
+  const createSelector = (rawInput: string, profileTypeId: string, labelToRemove: string): string => {
+    let labels: string[] = [`__profile_type__=\"${profileTypeId}\"`];
+    let match;
+    while ((match = labelSelectorRegex.exec(rawInput)) !== null) {
+      if (match[1] && match[2]) {
+        if (match[1] === labelToRemove) {
+          continue;
+        }
+        labels.push(`${match[1]}=${match[2]}`);
+      }
+    }
+    return `{${labels.join(',')}}`;
   };
 
-  const labelsResult = useAsync(() => {
-    return datasource.getLabelNames(query.profileTypeId + query.labelSelector, unpreciseRange.from, unpreciseRange.to);
-  }, [datasource, query.profileTypeId, query.labelSelector, unpreciseRange.to, unpreciseRange.from]);
+  const [labels, setLabels] = useState(() => ['']);
 
-  // Create a function with range and query already baked in so we don't have to send those everywhere
-  const getLabelValues = useCallback(
-    (label: string) => {
-      return datasource.getLabelValues(
-        query.profileTypeId + query.labelSelector,
-        label,
+  useEffect(() => {
+    const fetchData = async () => {
+      const labels = await datasource.getLabelNames(
+        createSelector(query.labelSelector, query.profileTypeId, ''),
         unpreciseRange.from,
         unpreciseRange.to
       );
+
+      setLabels(labels);
+    };
+    fetchData();
+  }, [query, unpreciseRange.from, unpreciseRange.to, datasource, setLabels]);
+
+  // Create a function with range and query already baked in, so we don't have to send those everywhere
+  const getLabelValues = useCallback(
+    (label: string) => {
+      const labelSelector = createSelector(query.labelSelector, query.profileTypeId, label);
+      return datasource.getLabelValues(labelSelector, label, unpreciseRange.from, unpreciseRange.to);
     },
-    [query, datasource, unpreciseRange.to, unpreciseRange.from]
+    [datasource, query.labelSelector, query.profileTypeId, unpreciseRange.to, unpreciseRange.from]
   );
 
+  return { labels, getLabelValues };
+}
+
+function useLabelSelector(query: Query, onChange: (value: Query) => void) {
+  // Need to reference the query as otherwise when the label selector is changed, only the initial value
+  // of the query is passed into the LabelsEditor (onChange) which renders the CodeEditor for monaco.
+  // The above needs to have a ref to the query so it can get the latest value.
+  const queryRef = useRef(query);
+  queryRef.current = query;
+
+  const onChangeDebounced = debounce((value: string) => {
+    if (onChange) {
+      onChange({ ...queryRef.current, labelSelector: value });
+    }
+  }, 200);
+
   const onLabelSelectorChange = useCallback(
     (value: string) => {
-      onChange({ ...query, labelSelector: value });
+      onChangeDebounced(value);
     },
-    [onChange, query]
+    [onChangeDebounced]
   );
 
-  return { labels: labelsResult.value, getLabelValues, onLabelSelectorChange };
+  return onLabelSelectorChange;
 }
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryLinkExtension.test.tsx b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryLinkExtension.test.tsx
new file mode 100644
index 0000000000000..893a23f5b5305
--- /dev/null
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryLinkExtension.test.tsx
@@ -0,0 +1,132 @@
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+import { act } from 'react-dom/test-utils';
+
+import { PluginType, rangeUtil, PluginExtensionLink, PluginExtensionTypes } from '@grafana/data';
+import { getPluginLinkExtensions } from '@grafana/runtime';
+
+import { PyroscopeDataSource } from '../datasource';
+import { mockFetchPyroscopeDatasourceSettings } from '../datasource.test';
+
+import { Props, PyroscopeQueryLinkExtensions, resetPyroscopeQueryLinkExtensionsFetches } from './QueryLinkExtension';
+
+// Constants copied from `QueryLinkExtension.tsx`
+const EXTENSION_POINT_ID = 'plugins/grafana-pyroscope-datasource/query-links';
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  setPluginExtensionGetter: jest.fn(),
+  getPluginLinkExtensions: jest.fn(),
+  getTemplateSrv: () => {
+    return {
+      replace: (query: string): string => {
+        return query.replace(/\$var/g, 'interpolated');
+      },
+    };
+  },
+}));
+
+const getPluginLinkExtensionsMock = jest.mocked(getPluginLinkExtensions);
+
+const defaultPyroscopeDataSourceSettings = {
+  uid: 'default-pyroscope',
+  url: 'http://pyroscope',
+  basicAuthUser: 'pyroscope_user',
+};
+
+describe('PyroscopeQueryLinkExtensions', () => {
+  const EXPECTED_BUTTON_LABEL = 'Profiles App';
+  const DEFAULT_EXTENSION_PATH = 'a/mock-path-app/fake-path';
+
+  function createExtension(overrides?: Partial<PluginExtensionLink>) {
+    return {
+      ...{
+        description: 'unremarkable-description',
+        extensionPointId: EXTENSION_POINT_ID,
+        title: EXPECTED_BUTTON_LABEL,
+        path: DEFAULT_EXTENSION_PATH,
+        type: PluginExtensionTypes.link,
+        category: 'unremarkable-category',
+        icon: 'heart',
+        onClick() {},
+        pluginId: 'mock-path-app',
+        id: `${Date.now()}}`,
+      },
+      ...overrides,
+    } as PluginExtensionLink;
+  }
+
+  beforeEach(() => {
+    resetPyroscopeQueryLinkExtensionsFetches();
+    mockFetchPyroscopeDatasourceSettings(defaultPyroscopeDataSourceSettings);
+
+    getPluginLinkExtensionsMock.mockRestore();
+    getPluginLinkExtensionsMock.mockReturnValue({ extensions: [] }); // Unless stated otherwise, no extensions
+  });
+
+  it('should render if extension present', async () => {
+    getPluginLinkExtensionsMock.mockReturnValue({ extensions: [createExtension()] }); // Default extension
+
+    await act(setup);
+    expect(await screen.findAllByText(EXPECTED_BUTTON_LABEL)).toBeDefined();
+  });
+
+  it('Should not render if no extension present', async () => {
+    await act(setup);
+    expect(screen.queryByText(EXPECTED_BUTTON_LABEL)).toBeNull();
+  });
+});
+
+function setupDs() {
+  const ds = new PyroscopeDataSource({
+    ...defaultPyroscopeDataSourceSettings,
+    name: 'test',
+    type: PluginType.datasource,
+    access: 'proxy',
+    id: 1,
+    jsonData: {},
+    meta: {
+      name: '',
+      id: '',
+      type: PluginType.datasource,
+      baseUrl: '',
+      info: {
+        author: {
+          name: '',
+        },
+        description: '',
+        links: [],
+        logos: {
+          large: '',
+          small: '',
+        },
+        screenshots: [],
+        updated: '',
+        version: '',
+      },
+      module: '',
+    },
+    readOnly: false,
+  });
+
+  return ds;
+}
+
+async function setup(options: { props: Partial<Props> } = { props: {} }) {
+  const utils = render(
+    <PyroscopeQueryLinkExtensions
+      query={{
+        queryType: 'both',
+        labelSelector: '',
+        profileTypeId: 'process_cpu:cpu',
+        refId: 'A',
+        maxNodes: 1000,
+        groupBy: [],
+      }}
+      datasource={setupDs()}
+      range={rangeUtil.convertRawToRange({ from: 'now-1h', to: 'now' })}
+      {...options.props}
+    />
+  );
+  return { ...utils };
+}
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryLinkExtension.tsx b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryLinkExtension.tsx
new file mode 100644
index 0000000000000..21a8a727ad530
--- /dev/null
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryLinkExtension.tsx
@@ -0,0 +1,104 @@
+import { css } from '@emotion/css';
+import React from 'react';
+import { useAsync } from 'react-use';
+
+import { GrafanaTheme2, QueryEditorProps, TimeRange } from '@grafana/data';
+import { getBackendSrv, getPluginLinkExtensions } from '@grafana/runtime';
+import { LinkButton, useStyles2 } from '@grafana/ui';
+
+import { PyroscopeDataSource } from '../datasource';
+import { PyroscopeDataSourceOptions, Query } from '../types';
+
+const EXTENSION_POINT_ID = 'plugins/grafana-pyroscope-datasource/query-links';
+
+/** A subset of the datasource settings that are relevant for this integration */
+type PyroscopeDatasourceSettings = {
+  uid: string;
+  url: string;
+  type: string;
+  basicAuthUser: string;
+};
+
+/** The context object that will be shared with the link extension's configure function */
+type ExtensionQueryLinksContext = {
+  datasourceUid: string;
+  query: Query;
+  range?: TimeRange | undefined;
+  datasourceSettings?: PyroscopeDatasourceSettings;
+};
+
+/* Global promises to fetch pyroscope datasource settings by uid as encountered */
+const pyroscopeDatasourceSettingsByUid: Record<string, PyroscopeDatasourceSettings> = {};
+
+/* Reset promises for testing purposes */
+export function resetPyroscopeQueryLinkExtensionsFetches() {
+  Object.keys(pyroscopeDatasourceSettingsByUid).forEach((key) => delete pyroscopeDatasourceSettingsByUid[key]);
+}
+
+/** A subset of the `PyroscopeDataSource` `QueryEditorProps` */
+export type Props = Pick<
+  QueryEditorProps<PyroscopeDataSource, Query, PyroscopeDataSourceOptions>,
+  'datasource' | 'query' | 'range'
+>;
+
+export function PyroscopeQueryLinkExtensions(props: Props) {
+  const {
+    datasource: { uid: datasourceUid },
+    query,
+    range,
+  } = props;
+
+  const { value: datasourceSettings } = useAsync(async () => {
+    if (pyroscopeDatasourceSettingsByUid[datasourceUid]) {
+      return pyroscopeDatasourceSettingsByUid[datasourceUid];
+    }
+    const settings = await getBackendSrv().get<PyroscopeDatasourceSettings>(`/api/datasources/uid/${datasourceUid}`);
+    pyroscopeDatasourceSettingsByUid[datasourceUid] = settings;
+    return settings;
+  }, [datasourceUid]);
+
+  const context: ExtensionQueryLinksContext = {
+    datasourceUid,
+    query,
+    range,
+    datasourceSettings,
+  };
+
+  const { extensions } = getPluginLinkExtensions({
+    extensionPointId: EXTENSION_POINT_ID,
+    context,
+  });
+
+  const styles = useStyles2(getStyles);
+
+  if (extensions.length === 0) {
+    return null;
+  }
+
+  return (
+    <>
+      {extensions.map((extension) => (
+        <LinkButton
+          className={styles.linkButton}
+          key={`${extension.id}`}
+          variant="secondary"
+          icon={extension.icon || 'external-link-alt'}
+          tooltip={extension.description}
+          target="_blank"
+          href={extension.path}
+          onClick={extension.onClick}
+        >
+          {extension.title}
+        </LinkButton>
+      ))}
+    </>
+  );
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    linkButton: css({
+      marginLeft: theme.spacing(1),
+    }),
+  };
+}
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryOptionGroup.tsx b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryOptionGroup.tsx
new file mode 100644
index 0000000000000..dfd42c81bf543
--- /dev/null
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryOptionGroup.tsx
@@ -0,0 +1,82 @@
+import { css } from '@emotion/css';
+import React from 'react';
+import { useToggle } from 'react-use';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Collapse, useStyles2, Stack } from '@grafana/ui';
+
+export interface Props {
+  title: string;
+  collapsedInfo: string[];
+  children: React.ReactNode;
+}
+
+export function QueryOptionGroup({ title, children, collapsedInfo }: Props) {
+  const [isOpen, toggleOpen] = useToggle(false);
+  const styles = useStyles2(getStyles);
+
+  return (
+    <div className={styles.wrapper}>
+      <Collapse
+        className={styles.collapse}
+        collapsible
+        isOpen={isOpen}
+        onToggle={toggleOpen}
+        label={
+          <Stack gap={0}>
+            <h6 className={styles.title}>{title}</h6>
+            {!isOpen && (
+              <div className={styles.description}>
+                {collapsedInfo.map((x, i) => (
+                  <span key={i}>{x}</span>
+                ))}
+              </div>
+            )}
+          </Stack>
+        }
+      >
+        <div className={styles.body}>{children}</div>
+      </Collapse>
+    </div>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    collapse: css({
+      backgroundColor: 'unset',
+      border: 'unset',
+      marginBottom: 0,
+
+      ['> button']: {
+        padding: theme.spacing(0, 1),
+      },
+    }),
+    wrapper: css({
+      width: '100%',
+      display: 'flex',
+      justifyContent: 'space-between',
+      alignItems: 'baseline',
+    }),
+    title: css({
+      flexGrow: 1,
+      overflow: 'hidden',
+      fontSize: theme.typography.bodySmall.fontSize,
+      fontWeight: theme.typography.fontWeightMedium,
+      margin: 0,
+    }),
+    description: css({
+      color: theme.colors.text.secondary,
+      fontSize: theme.typography.bodySmall.fontSize,
+      fontWeight: theme.typography.bodySmall.fontWeight,
+      paddingLeft: theme.spacing(2),
+      gap: theme.spacing(2),
+      display: 'flex',
+    }),
+    body: css({
+      display: 'flex',
+      gap: theme.spacing(2),
+      flexWrap: 'wrap',
+    }),
+  };
+};
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryOptions.tsx b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryOptions.tsx
index 02bd73c38cfb6..7db169674b87e 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryOptions.tsx
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryOptions.tsx
@@ -1,13 +1,13 @@
-import { css, cx } from '@emotion/css';
+import { css } from '@emotion/css';
 import React from 'react';
-import { useToggle } from 'react-use';
 
 import { CoreApp, GrafanaTheme2, SelectableValue } from '@grafana/data';
-import { Icon, useStyles2, RadioButtonGroup, MultiSelect, Input, clearButtonStyles, Button } from '@grafana/ui';
+import { useStyles2, RadioButtonGroup, MultiSelect, Input } from '@grafana/ui';
 
 import { Query } from '../types';
 
 import { EditorField } from './EditorField';
+import { QueryOptionGroup } from './QueryOptionGroup';
 import { Stack } from './Stack';
 
 export interface Props {
@@ -34,7 +34,6 @@ function getTypeOptions(app?: CoreApp) {
  * Base on QueryOptionGroup component from grafana/ui but that is not available yet.
  */
 export function QueryOptions({ query, onQueryChange, app, labels }: Props) {
-  const [isOpen, toggleOpen] = useToggle(false);
   const styles = useStyles2(getStyles);
   const typeOptions = getTypeOptions(app);
   const groupByOptions = labels
@@ -43,26 +42,21 @@ export function QueryOptions({ query, onQueryChange, app, labels }: Props) {
         value: l,
       }))
     : [];
-  const buttonStyles = useStyles2(clearButtonStyles);
+
+  let collapsedInfo = [`Type: ${query.queryType}`];
+  if (query.groupBy?.length) {
+    collapsedInfo.push(`Group by: ${query.groupBy.join(', ')}`);
+  }
+  if (query.spanSelector?.length) {
+    collapsedInfo.push(`Span ID: ${query.spanSelector.join(', ')}`);
+  }
+  if (query.maxNodes) {
+    collapsedInfo.push(`Max nodes: ${query.maxNodes}`);
+  }
 
   return (
     <Stack gap={0} direction="column">
-      <Button className={cx(styles.header, buttonStyles)} onClick={toggleOpen} title="Click to edit options">
-        <div className={styles.toggle}>
-          <Icon name={isOpen ? 'angle-down' : 'angle-right'} />
-        </div>
-        <h6 className={styles.title}>Options</h6>
-        {!isOpen && (
-          <div className={styles.description}>
-            {[`Type: ${query.queryType}`, query.groupBy?.length ? `Group by: ${query.groupBy.join(', ')}` : undefined]
-              .filter((v) => v)
-              .map((v, i) => (
-                <span key={i}>{v}</span>
-              ))}
-          </div>
-        )}
-      </Button>
-      {isOpen && (
+      <QueryOptionGroup title="Options" collapsedInfo={collapsedInfo}>
         <div className={styles.body}>
           <EditorField label={'Query Type'}>
             <RadioButtonGroup
@@ -92,6 +86,19 @@ export function QueryOptions({ query, onQueryChange, app, labels }: Props) {
               }}
             />
           </EditorField>
+          <EditorField label={'Span ID'} tooltip={<>Sets the span ID from which to search for profiles.</>}>
+            <Input
+              value={query.spanSelector || ['']}
+              type="string"
+              placeholder="64f170a95f537095"
+              onChange={(event: React.SyntheticEvent<HTMLInputElement>) => {
+                onQueryChange({
+                  ...query,
+                  spanSelector: event.currentTarget.value !== '' ? [event.currentTarget.value] : [],
+                });
+              }}
+            />
+          </EditorField>
           <EditorField label={'Max Nodes'} tooltip={<>Sets the maximum number of nodes to return in the flamegraph.</>}>
             <Input
               value={query.maxNodes || ''}
@@ -105,7 +112,7 @@ export function QueryOptions({ query, onQueryChange, app, labels }: Props) {
             />
           </EditorField>
         </div>
-      )}
+      </QueryOptionGroup>
     </Stack>
   );
 }
@@ -120,38 +127,11 @@ const getStyles = (theme: GrafanaTheme2) => {
         color: theme.colors.text.primary,
       },
     }),
-    header: css({
-      display: 'flex',
-      cursor: 'pointer',
-      alignItems: 'baseline',
-      color: theme.colors.text.primary,
-      '&:hover': {
-        background: theme.colors.emphasize(theme.colors.background.primary, 0.03),
-      },
-    }),
-    title: css({
-      flexGrow: 1,
-      overflow: 'hidden',
-      fontSize: theme.typography.bodySmall.fontSize,
-      fontWeight: theme.typography.fontWeightMedium,
-      margin: 0,
-    }),
-    description: css({
-      color: theme.colors.text.secondary,
-      fontSize: theme.typography.bodySmall.fontSize,
-      paddingLeft: theme.spacing(2),
-      gap: theme.spacing(2),
-      display: 'flex',
-    }),
     body: css({
       display: 'flex',
       paddingTop: theme.spacing(2),
       gap: theme.spacing(2),
       flexWrap: 'wrap',
     }),
-    toggle: css({
-      color: theme.colors.text.secondary,
-      marginRight: `${theme.spacing(1)}`,
-    }),
   };
 };
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/autocomplete.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/autocomplete.ts
index 16583d4894a63..71c5a04ce3021 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/autocomplete.ts
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/autocomplete.ts
@@ -86,13 +86,15 @@ export class CompletionProvider implements monacoTypes.languages.CompletionItemP
         });
       case 'IN_LABEL_VALUE':
         let values = await this.getLabelValues(situation.labelName);
-        return values.map((key) => {
-          return {
-            label: key,
-            insertText: situation.betweenQuotes ? key : `"${key}"`,
-            type: 'LABEL_VALUE',
-          };
-        });
+        return values
+          ? values.map((key) => {
+              return {
+                label: key,
+                insertText: situation.betweenQuotes ? key : `"${key}"`,
+                type: 'LABEL_VALUE',
+              };
+            })
+          : [];
       default:
         throw new Error(`Unexpected situation ${situation}`);
     }
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/VariableQueryEditor.test.tsx b/public/app/plugins/datasource/grafana-pyroscope-datasource/VariableQueryEditor.test.tsx
index 1afb1ebe52d3e..4442512e00c01 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/VariableQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/VariableQueryEditor.test.tsx
@@ -2,12 +2,24 @@ import { render, screen } from '@testing-library/react';
 import React from 'react';
 
 import { DataSourceInstanceSettings } from '@grafana/data';
-import { TemplateSrv } from 'app/features/templating/template_srv';
+import { getTemplateSrv } from '@grafana/runtime';
 
 import { VariableQueryEditor } from './VariableQueryEditor';
 import { PyroscopeDataSource } from './datasource';
 import { PyroscopeDataSourceOptions } from './types';
 
+jest.mock('@grafana/runtime', () => {
+  const actual = jest.requireActual('@grafana/runtime');
+  return {
+    ...actual,
+    getTemplateSrv: () => {
+      return {
+        replace: jest.fn(),
+      };
+    },
+  };
+});
+
 describe('VariableQueryEditor', () => {
   it('renders correctly with type profileType', () => {
     render(
@@ -69,7 +81,7 @@ describe('VariableQueryEditor', () => {
 });
 
 function getMockDatasource() {
-  const ds = new PyroscopeDataSource({} as DataSourceInstanceSettings<PyroscopeDataSourceOptions>, new TemplateSrv());
+  const ds = new PyroscopeDataSource({} as DataSourceInstanceSettings<PyroscopeDataSourceOptions>, getTemplateSrv());
   ds.getResource = jest.fn();
   (ds.getResource as jest.Mock).mockImplementation(async (type: string) => {
     if (type === 'profileTypes') {
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/VariableQueryEditor.tsx b/public/app/plugins/datasource/grafana-pyroscope-datasource/VariableQueryEditor.tsx
index 8b14820d840c9..27f4b2d085cec 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/VariableQueryEditor.tsx
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/VariableQueryEditor.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 
-import { QueryEditorProps, SelectableValue } from '@grafana/data';
+import { QueryEditorProps, SelectableValue, TimeRange } from '@grafana/data';
 import { InlineField, InlineFieldRow, LoadingPlaceholder, Select } from '@grafana/ui';
 
 import { ProfileTypesCascader, useProfileTypes } from './QueryEditor/ProfileTypesCascader';
@@ -15,7 +15,7 @@ export function VariableQueryEditor(props: QueryEditorProps<PyroscopeDataSource,
           label="Query type"
           labelWidth={20}
           tooltip={
-            <div>The Prometheus data source plugin provides the following query types for template variables</div>
+            <div>The Pyroscope data source plugin provides the following query types for template variables</div>
           }
         >
           <Select
@@ -30,23 +30,16 @@ export function VariableQueryEditor(props: QueryEditorProps<PyroscopeDataSource,
             onChange={(value) => {
               if (value.value! === 'profileType') {
                 props.onChange({
-                  ...props.query,
                   type: value.value!,
+                  refId: props.query.refId,
                 });
               }
-              if (value.value! === 'label') {
+              if (value.value! === 'label' || value.value! === 'labelValue') {
                 props.onChange({
-                  ...props.query,
                   type: value.value!,
-                  profileTypeId: '',
-                });
-              }
-              if (value.value! === 'labelValue') {
-                props.onChange({
-                  ...props.query,
-                  type: value.value!,
-                  profileTypeId: '',
-                  labelName: '',
+                  refId: props.query.refId,
+                  // Make sure we keep already selected values if they make sense for the variable type
+                  profileTypeId: props.query.type !== 'profileType' ? props.query.profileTypeId : '',
                 });
               }
             }}
@@ -65,6 +58,7 @@ export function VariableQueryEditor(props: QueryEditorProps<PyroscopeDataSource,
               props.onChange({ ...props.query, profileTypeId: val });
             }
           }}
+          range={props.range}
         />
       )}
 
@@ -97,7 +91,13 @@ function LabelRow(props: {
   const [labels, setLabels] = useState<string[]>();
   useEffect(() => {
     (async () => {
-      setLabels(await props.datasource.getLabelNames((props.profileTypeId || '') + '{}', props.from, props.to));
+      setLabels(
+        await props.datasource.getLabelNames(
+          props.profileTypeId ? getProfileTypeLabel(props.profileTypeId) : '{}',
+          props.from,
+          props.to
+        )
+      );
     })();
   }, [props.datasource, props.profileTypeId, props.to, props.from]);
 
@@ -131,8 +131,9 @@ function ProfileTypeRow(props: {
   datasource: PyroscopeDataSource;
   onChange: (val: string) => void;
   initialValue?: string;
+  range?: TimeRange;
 }) {
-  const profileTypes = useProfileTypes(props.datasource);
+  const profileTypes = useProfileTypes(props.datasource, props.range);
   return (
     <InlineFieldRow>
       <InlineField
@@ -154,3 +155,7 @@ function ProfileTypeRow(props: {
     </InlineFieldRow>
   );
 }
+
+export function getProfileTypeLabel(type: string) {
+  return `{__profile_type__="${type}"}`;
+}
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/VariableSupport.test.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/VariableSupport.test.ts
index 5dcc47ab9e90d..957ca03589cde 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/VariableSupport.test.ts
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/VariableSupport.test.ts
@@ -24,7 +24,11 @@ describe('VariableSupport', () => {
       vs.query(getDefaultRequest({ type: 'label', profileTypeId: 'profile:type:3', refId: 'A' }))
     );
     expect(resp.data).toEqual([{ text: 'foo' }, { text: 'bar' }, { text: 'baz' }]);
-    expect(mock.getLabelNames).toBeCalledWith('profile:type:3{}', expect.any(Number), expect.any(Number));
+    expect(mock.getLabelNames).toBeCalledWith(
+      '{__profile_type__="profile:type:3"}',
+      expect.any(Number),
+      expect.any(Number)
+    );
   });
 
   it('should query label values', async function () {
@@ -34,7 +38,12 @@ describe('VariableSupport', () => {
       vs.query(getDefaultRequest({ type: 'labelValue', labelName: 'foo', profileTypeId: 'profile:type:3', refId: 'A' }))
     );
     expect(resp.data).toEqual([{ text: 'val1' }, { text: 'val2' }, { text: 'val3' }]);
-    expect(mock.getLabelValues).toBeCalledWith('profile:type:3{}', 'foo', expect.any(Number), expect.any(Number));
+    expect(mock.getLabelValues).toBeCalledWith(
+      '{__profile_type__="profile:type:3"}',
+      'foo',
+      expect.any(Number),
+      expect.any(Number)
+    );
   });
 });
 
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/VariableSupport.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/VariableSupport.ts
index 5194211518a9d..80059880c585c 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/VariableSupport.ts
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/VariableSupport.ts
@@ -2,23 +2,18 @@ import { from, map, Observable, of } from 'rxjs';
 
 import { CustomVariableSupport, DataQueryRequest, DataQueryResponse, MetricFindValue } from '@grafana/data';
 
-import { getTimeSrv, TimeSrv } from '../../../features/dashboard/services/TimeSrv';
-
-import { VariableQueryEditor } from './VariableQueryEditor';
+import { getProfileTypeLabel, VariableQueryEditor } from './VariableQueryEditor';
 import { PyroscopeDataSource } from './datasource';
 import { ProfileTypeMessage, VariableQuery } from './types';
 
 export interface DataAPI {
-  getProfileTypes(): Promise<ProfileTypeMessage[]>;
+  getProfileTypes(start: number, end: number): Promise<ProfileTypeMessage[]>;
   getLabelNames(query: string, start: number, end: number): Promise<string[]>;
   getLabelValues(query: string, label: string, start: number, end: number): Promise<string[]>;
 }
 
 export class VariableSupport extends CustomVariableSupport<PyroscopeDataSource> {
-  constructor(
-    private readonly dataAPI: DataAPI,
-    private readonly timeSrv: TimeSrv = getTimeSrv()
-  ) {
+  constructor(private readonly dataAPI: DataAPI) {
     super();
   }
 
@@ -26,7 +21,7 @@ export class VariableSupport extends CustomVariableSupport<PyroscopeDataSource>
 
   query(request: DataQueryRequest<VariableQuery>): Observable<DataQueryResponse> {
     if (request.targets[0].type === 'profileType') {
-      return from(this.dataAPI.getProfileTypes()).pipe(
+      return from(this.dataAPI.getProfileTypes(request.range.from.valueOf(), request.range.to.valueOf())).pipe(
         map((values) => {
           return { data: values.map<MetricFindValue>((v) => ({ text: v.label, value: v.id })) };
         })
@@ -39,9 +34,9 @@ export class VariableSupport extends CustomVariableSupport<PyroscopeDataSource>
       }
       return from(
         this.dataAPI.getLabelNames(
-          request.targets[0].profileTypeId + '{}',
-          this.timeSrv.timeRange().from.valueOf(),
-          this.timeSrv.timeRange().to.valueOf()
+          getProfileTypeLabel(request.targets[0].profileTypeId),
+          request.range.from.valueOf(),
+          request.range.to.valueOf()
         )
       ).pipe(
         map((values) => {
@@ -56,10 +51,10 @@ export class VariableSupport extends CustomVariableSupport<PyroscopeDataSource>
       }
       return from(
         this.dataAPI.getLabelValues(
-          request.targets[0].profileTypeId + '{}',
+          getProfileTypeLabel(request.targets[0].profileTypeId),
           request.targets[0].labelName,
-          this.timeSrv.timeRange().from.valueOf(),
-          this.timeSrv.timeRange().to.valueOf()
+          request.range.from.valueOf(),
+          request.range.to.valueOf()
         )
       ).pipe(
         map((values) => {
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/dataquery.cue b/public/app/plugins/datasource/grafana-pyroscope-datasource/dataquery.cue
index 6fca4f95739cc..aa0db9c14d78a 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/dataquery.cue
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/dataquery.cue
@@ -31,6 +31,8 @@ composableKinds: DataQuery: {
 
 				// Specifies the query label selectors.
 				labelSelector: string | *"{}"
+				// Specifies the query span selectors.
+				spanSelector?: [...string]
 				// Specifies the type of profile to query.
 				profileTypeId: string
 				// Allows to group the results.
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/dataquery.gen.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/dataquery.gen.ts
index 313e7980a3812..4a3595c3a352f 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/dataquery.gen.ts
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/dataquery.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
@@ -14,7 +14,7 @@ export type PyroscopeQueryType = ('metrics' | 'profile' | 'both');
 
 export const defaultPyroscopeQueryType: PyroscopeQueryType = 'both';
 
-export interface GrafanaPyroscope extends common.DataQuery {
+export interface GrafanaPyroscopeDataQuery extends common.DataQuery {
   /**
    * Allows to group the results.
    */
@@ -31,9 +31,14 @@ export interface GrafanaPyroscope extends common.DataQuery {
    * Specifies the type of profile to query.
    */
   profileTypeId: string;
+  /**
+   * Specifies the query span selectors.
+   */
+  spanSelector?: Array<string>;
 }
 
-export const defaultGrafanaPyroscope: Partial<GrafanaPyroscope> = {
+export const defaultGrafanaPyroscopeDataQuery: Partial<GrafanaPyroscopeDataQuery> = {
   groupBy: [],
   labelSelector: '{}',
+  spanSelector: [],
 };
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/datasource.test.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/datasource.test.ts
index c9f09aaa38c8a..b2bc6791e0972 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/datasource.test.ts
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/datasource.test.ts
@@ -1,13 +1,56 @@
-import { AbstractLabelOperator, CoreApp, DataSourceInstanceSettings, PluginMetaInfo, PluginType } from '@grafana/data';
-import { TemplateSrv } from 'app/features/templating/template_srv';
+import {
+  AbstractLabelOperator,
+  CoreApp,
+  DataSourceInstanceSettings,
+  PluginMetaInfo,
+  PluginType,
+  DataSourceJsonData,
+} from '@grafana/data';
+import { setPluginExtensionGetter, getBackendSrv, setBackendSrv, getTemplateSrv } from '@grafana/runtime';
 
 import { defaultPyroscopeQueryType } from './dataquery.gen';
 import { normalizeQuery, PyroscopeDataSource } from './datasource';
 import { Query } from './types';
 
+jest.mock('@grafana/runtime', () => {
+  const actual = jest.requireActual('@grafana/runtime');
+  return {
+    ...actual,
+    getTemplateSrv: () => {
+      return {
+        replace: (query: string): string => {
+          return query.replace(/\$var/g, 'interpolated');
+        },
+      };
+    },
+  };
+});
+
+/** The datasource QueryEditor fetches datasource settings to send to the extension's `configure` method */
+export function mockFetchPyroscopeDatasourceSettings(
+  datasourceSettings?: Partial<DataSourceInstanceSettings<DataSourceJsonData>>
+) {
+  const settings = { ...defaultSettings, ...datasourceSettings };
+  const returnValues: Record<string, unknown> = {
+    [`/api/datasources/uid/${settings.uid}`]: settings,
+  };
+  setBackendSrv({
+    ...getBackendSrv(),
+    get: function <T>(path: string) {
+      const value = returnValues[path];
+      if (value) {
+        return Promise.resolve(value as T);
+      }
+      return Promise.reject({ message: 'reject' });
+    },
+  });
+}
+
 describe('Pyroscope data source', () => {
   let ds: PyroscopeDataSource;
   beforeEach(() => {
+    mockFetchPyroscopeDatasourceSettings();
+    setPluginExtensionGetter(() => ({ extensions: [] })); // No extensions
     ds = new PyroscopeDataSource(defaultSettings);
   });
 
@@ -50,10 +93,7 @@ describe('Pyroscope data source', () => {
   });
 
   describe('applyTemplateVariables', () => {
-    const templateSrv = new TemplateSrv();
-    templateSrv.replace = jest.fn((query: string): string => {
-      return query.replace(/\$var/g, 'interpolated');
-    });
+    const templateSrv = getTemplateSrv();
 
     it('should not update labelSelector if there are no template variables', () => {
       ds = new PyroscopeDataSource(defaultSettings, templateSrv);
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/datasource.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/datasource.ts
index 34c24e8d3a296..52d50b6995a84 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/datasource.ts
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/datasource.ts
@@ -11,11 +11,10 @@ import {
 } from '@grafana/data';
 import { DataSourceWithBackend, getTemplateSrv, TemplateSrv } from '@grafana/runtime';
 
-import { extractLabelMatchers, toPromLikeExpr } from '../prometheus/language_utils';
-
 import { VariableSupport } from './VariableSupport';
-import { defaultGrafanaPyroscope, defaultPyroscopeQueryType } from './dataquery.gen';
+import { defaultGrafanaPyroscopeDataQuery, defaultPyroscopeQueryType } from './dataquery.gen';
 import { PyroscopeDataSourceOptions, Query, ProfileTypeMessage } from './types';
+import { extractLabelMatchers, toPromLikeExpr } from './utils';
 
 export class PyroscopeDataSource extends DataSourceWithBackend<Query, PyroscopeDataSourceOptions> {
   constructor(
@@ -48,7 +47,14 @@ export class PyroscopeDataSource extends DataSourceWithBackend<Query, PyroscopeD
     });
   }
 
-  async getProfileTypes(): Promise<ProfileTypeMessage[]> {
+  async getProfileTypes(start: number, end: number): Promise<ProfileTypeMessage[]> {
+    return await this.getResource('profileTypes', {
+      start,
+      end,
+    });
+  }
+
+  async getAllProfileTypes(): Promise<ProfileTypeMessage[]> {
     return await this.getResource('profileTypes');
   }
 
@@ -109,7 +115,7 @@ export class PyroscopeDataSource extends DataSourceWithBackend<Query, PyroscopeD
 }
 
 export const defaultQuery: Partial<Query> = {
-  ...defaultGrafanaPyroscope,
+  ...defaultGrafanaPyroscopeDataQuery,
   queryType: defaultPyroscopeQueryType,
 };
 
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json b/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json
new file mode 100644
index 0000000000000..cfbfbbfaffc11
--- /dev/null
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json
@@ -0,0 +1,49 @@
+{
+  "name": "@grafana-plugins/grafana-pyroscope-datasource",
+  "description": "Continuous profiling for analysis of CPU and memory usage, down to the line number and throughout time. Saving infrastructure cost, improving performance, and increasing reliability.",
+  "private": true,
+  "version": "11.0.0",
+  "dependencies": {
+    "@emotion/css": "11.11.2",
+    "@grafana/data": "11.0.0",
+    "@grafana/runtime": "11.0.0",
+    "@grafana/schema": "11.0.0",
+    "@grafana/ui": "11.0.0",
+    "fast-deep-equal": "^3.1.3",
+    "lodash": "4.17.21",
+    "monaco-editor": "0.34.0",
+    "prismjs": "1.29.0",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
+    "react-use": "17.5.0",
+    "rxjs": "7.8.1",
+    "tslib": "2.6.2"
+  },
+  "devDependencies": {
+    "@grafana/plugin-configs": "11.0.0",
+    "@testing-library/jest-dom": "6.4.2",
+    "@testing-library/react": "14.2.2",
+    "@testing-library/user-event": "14.5.2",
+    "@types/jest": "29.5.12",
+    "@types/lodash": "4.17.0",
+    "@types/prismjs": "1.26.3",
+    "@types/react": "18.2.73",
+    "@types/react-dom": "18.2.22",
+    "@types/testing-library__jest-dom": "5.14.9",
+    "css-loader": "6.10.0",
+    "jest": "29.7.0",
+    "style-loader": "3.3.4",
+    "ts-node": "10.9.2",
+    "typescript": "5.3.3",
+    "webpack": "5.91.0"
+  },
+  "peerDependencies": {
+    "@grafana/runtime": "*"
+  },
+  "scripts": {
+    "build": "webpack -c ./webpack.config.ts --env production",
+    "build:commit": "webpack -c ./webpack.config.ts --env production --env commit=$(git rev-parse --short HEAD)",
+    "dev": "webpack -w -c ./webpack.config.ts --env development"
+  },
+  "packageManager": "yarn@4.1.0"
+}
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/plugin.json b/public/app/plugins/datasource/grafana-pyroscope-datasource/plugin.json
index ba90841a3e80f..9aef1503eda73 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/plugin.json
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/plugin.json
@@ -2,6 +2,7 @@
   "type": "datasource",
   "name": "Grafana Pyroscope",
   "id": "grafana-pyroscope-datasource",
+  "executable": "gpx_grafana-pyroscope-datasource",
   "aliasIDs": ["phlare"],
   "category": "profiling",
 
@@ -29,6 +30,10 @@
         "name": "GitHub Project",
         "url": "https://github.com/grafana/pyroscope"
       }
-    ]
+    ],
+    "version": "%VERSION%"
+  },
+  "dependencies": {
+    "grafanaDependency": ">=10.3.0-0"
   }
 }
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/pyroscopeql/pyroscopeql.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/pyroscopeql/pyroscopeql.ts
index 66c8bca7fdc72..6f39f5aec5c90 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/pyroscopeql/pyroscopeql.ts
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/pyroscopeql/pyroscopeql.ts
@@ -2,7 +2,7 @@ import type { languages } from 'monaco-editor';
 
 export const languageConfiguration: languages.LanguageConfiguration = {
   // the default separators except `@$`
-  wordPattern: /(-?\d*\.\d\w*)|([^`~!#%^&*()\-=+\[{\]}\\|;:'",.<>\/?\s]+)/g,
+  wordPattern: /(-?\d*\.\d\w*)|([^`~!#%^&*()=+\[{\]}\\|;:'",<>\/?\s]+)/g,
   brackets: [['{', '}']],
   autoClosingPairs: [
     { open: '{', close: '}' },
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/tsconfig.json b/public/app/plugins/datasource/grafana-pyroscope-datasource/tsconfig.json
new file mode 100644
index 0000000000000..7daf2ee8abab6
--- /dev/null
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "@grafana/plugin-configs/tsconfig.json",
+  "include": ["."]
+}
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/types.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/types.ts
index 04aa2f9a9bd78..1570edd34b842 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/types.ts
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/types.ts
@@ -1,8 +1,8 @@
 import { DataSourceJsonData } from '@grafana/data';
 
-import { GrafanaPyroscope, PyroscopeQueryType } from './dataquery.gen';
+import { GrafanaPyroscopeDataQuery, PyroscopeQueryType } from './dataquery.gen';
 
-export interface Query extends GrafanaPyroscope {
+export interface Query extends GrafanaPyroscopeDataQuery {
   queryType: PyroscopeQueryType;
 }
 
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/utils.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/utils.ts
new file mode 100644
index 0000000000000..f811fbe4ebcfe
--- /dev/null
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/utils.ts
@@ -0,0 +1,84 @@
+import { invert } from 'lodash';
+import { Token } from 'prismjs';
+
+import { AbstractLabelMatcher, AbstractLabelOperator, AbstractQuery } from '@grafana/data';
+
+export function extractLabelMatchers(tokens: Array<string | Token>): AbstractLabelMatcher[] {
+  const labelMatchers: AbstractLabelMatcher[] = [];
+
+  for (const token of tokens) {
+    if (!(token instanceof Token)) {
+      continue;
+    }
+
+    if (token.type === 'context-labels') {
+      let labelKey = '';
+      let labelValue = '';
+      let labelOperator = '';
+
+      const contentTokens = Array.isArray(token.content) ? token.content : [token.content];
+
+      for (let currentToken of contentTokens) {
+        if (typeof currentToken === 'string') {
+          let currentStr: string;
+          currentStr = currentToken;
+          if (currentStr === '=' || currentStr === '!=' || currentStr === '=~' || currentStr === '!~') {
+            labelOperator = currentStr;
+          }
+        } else if (currentToken instanceof Token) {
+          switch (currentToken.type) {
+            case 'label-key':
+              labelKey = getMaybeTokenStringContent(currentToken);
+              break;
+            case 'label-value':
+              labelValue = getMaybeTokenStringContent(currentToken);
+              labelValue = labelValue.substring(1, labelValue.length - 1);
+              const labelComparator = FromPromLikeMap[labelOperator];
+              if (labelComparator) {
+                labelMatchers.push({ name: labelKey, operator: labelComparator, value: labelValue });
+              }
+              break;
+          }
+        }
+      }
+    }
+  }
+
+  return labelMatchers;
+}
+
+export function toPromLikeExpr(labelBasedQuery: AbstractQuery): string {
+  const expr = labelBasedQuery.labelMatchers
+    .map((selector: AbstractLabelMatcher) => {
+      const operator = ToPromLikeMap[selector.operator];
+      if (operator) {
+        return `${selector.name}${operator}"${selector.value}"`;
+      } else {
+        return '';
+      }
+    })
+    .filter((e: string) => e !== '')
+    .join(', ');
+
+  return expr ? `{${expr}}` : '';
+}
+
+function getMaybeTokenStringContent(token: Token): string {
+  if (typeof token.content === 'string') {
+    return token.content;
+  }
+
+  return '';
+}
+
+const FromPromLikeMap: Record<string, AbstractLabelOperator> = {
+  '=': AbstractLabelOperator.Equal,
+  '!=': AbstractLabelOperator.NotEqual,
+  '=~': AbstractLabelOperator.EqualRegEx,
+  '!~': AbstractLabelOperator.NotEqualRegEx,
+};
+
+const ToPromLikeMap: Record<AbstractLabelOperator, string> = invert(FromPromLikeMap) as Record<
+  AbstractLabelOperator,
+  string
+>;
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/webpack.config.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/webpack.config.ts
new file mode 100644
index 0000000000000..8e03497ddb283
--- /dev/null
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/webpack.config.ts
@@ -0,0 +1,15 @@
+import config from '@grafana/plugin-configs/webpack.config';
+
+const configWithFallback = async (env: Record<string, unknown>) => {
+  const response = await config(env);
+  if (response !== undefined && response.resolve !== undefined) {
+    response.resolve.fallback = {
+      ...response.resolve.fallback,
+      stream: false,
+      string_decoder: false,
+    };
+  }
+  return response;
+};
+
+export default configWithFallback;
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/ConfigEditor.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/ConfigEditor.tsx
index 9cc333215bb88..9c78b849d9be7 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/ConfigEditor.tsx
@@ -3,7 +3,7 @@ import React, { PureComponent } from 'react';
 
 import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
 
-type Props = DataSourcePluginOptionsEditorProps<any>;
+type Props = DataSourcePluginOptionsEditorProps;
 
 /**
  * Empty Config Editor -- settings to save
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/MetaDataInspector.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/MetaDataInspector.tsx
index 94b7599435f29..3ebf7248ef610 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/MetaDataInspector.tsx
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/MetaDataInspector.tsx
@@ -1,12 +1,12 @@
 import React from 'react';
 
 import { MetadataInspectorProps } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
+import { Stack } from '@grafana/ui';
 
-import { TestData } from './dataquery.gen';
+import { TestDataDataQuery } from './dataquery';
 import { TestDataDataSource } from './datasource';
 
-export type Props = MetadataInspectorProps<TestDataDataSource, TestData>;
+export type Props = MetadataInspectorProps<TestDataDataSource, TestDataDataQuery>;
 
 export function MetaDataInspector({ data }: Props) {
   return (
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/QueryEditor.test.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/QueryEditor.test.tsx
index 1d031955b309c..926b133f3c243 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/QueryEditor.test.tsx
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/QueryEditor.test.tsx
@@ -5,7 +5,7 @@ import React from 'react';
 import { QueryEditor, Props } from './QueryEditor';
 import { scenarios } from './__mocks__/scenarios';
 import { defaultQuery } from './constants';
-import { TestDataQueryType } from './dataquery.gen';
+import { TestDataQueryType } from './dataquery';
 import { TestDataDataSource } from './datasource';
 import { defaultStreamQuery } from './runStreams';
 
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/QueryEditor.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/QueryEditor.tsx
index 71636cfdcf63c..eb684d5abac4d 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/QueryEditor.tsx
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/QueryEditor.tsx
@@ -17,7 +17,7 @@ import { RawFrameEditor } from './components/RawFrameEditor';
 import { SimulationQueryEditor } from './components/SimulationQueryEditor';
 import { USAQueryEditor, usaQueryModes } from './components/USAQueryEditor';
 import { defaultCSVWaveQuery, defaultPulseQuery, defaultQuery } from './constants';
-import { CSVWave, NodesQuery, TestData, TestDataQueryType, USAQuery } from './dataquery.gen';
+import { CSVWave, NodesQuery, TestDataDataQuery, TestDataQueryType, USAQuery } from './dataquery';
 import { TestDataDataSource } from './datasource';
 import { defaultStreamQuery } from './runStreams';
 
@@ -31,11 +31,11 @@ const selectors = editorSelectors.components.DataSource.TestData.QueryTab;
 
 export interface EditorProps {
   onChange: (value: any) => void;
-  query: TestData;
+  query: TestDataDataQuery;
   ds: TestDataDataSource;
 }
 
-export type Props = QueryEditorProps<TestDataDataSource, TestData>;
+export type Props = QueryEditorProps<TestDataDataSource, TestDataDataQuery>;
 
 export const QueryEditor = ({ query, datasource, onChange, onRunQuery }: Props) => {
   query = { ...defaultQuery, ...query };
@@ -63,7 +63,7 @@ export const QueryEditor = ({ query, datasource, onChange, onRunQuery }: Props)
     }));
   }, []);
 
-  const onUpdate = (query: TestData) => {
+  const onUpdate = (query: TestDataDataQuery) => {
     onChange(query);
     onRunQuery();
   };
@@ -83,7 +83,7 @@ export const QueryEditor = ({ query, datasource, onChange, onRunQuery }: Props)
     }
 
     // Clear model from existing props that belong to other scenarios
-    const update: TestData = {
+    const update: TestDataDataQuery = {
       scenarioId: item.value! as TestDataQueryType,
       refId: query.refId,
       alias: query.alias,
@@ -127,7 +127,7 @@ export const QueryEditor = ({ query, datasource, onChange, onRunQuery }: Props)
 
   const onInputChange = (e: FormEvent<HTMLInputElement | HTMLTextAreaElement>) => {
     const { name, value, type } = e.currentTarget;
-    let newValue: any = value;
+    let newValue: string | number | boolean = value;
 
     if (type === 'number') {
       newValue = Number(value);
@@ -142,7 +142,7 @@ export const QueryEditor = ({ query, datasource, onChange, onRunQuery }: Props)
 
   const onFieldChange = (field: string) => (e: { target: { name: string; value: string; type: string } }) => {
     const { name, value, type } = e.target;
-    let newValue: any = value;
+    let newValue: string | number = value;
 
     if (type === 'number') {
       newValue = Number(value);
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/README.md b/public/app/plugins/datasource/grafana-testdata-datasource/README.md
index fa12e4ebd5481..61a66d6d20129 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/README.md
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/README.md
@@ -1,3 +1,9 @@
 # Grafana TestData data source
 
 This data source is used for testing and development of Grafana. Generates test data in different forms.
+
+Grafana ships with _built-in_ support for TestData. You just have to add it as a data source and you will be ready to build dashboards.
+
+Read more about it here:
+
+[https://grafana.com/docs/grafana/latest/datasources/testdata/](https://grafana.com/docs/grafana/latest/datasources/testdata/)
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/__mocks__/scenarios.ts b/public/app/plugins/datasource/grafana-testdata-datasource/__mocks__/scenarios.ts
index 4f92c6826d5ab..20d4178b1a44e 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/__mocks__/scenarios.ts
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/__mocks__/scenarios.ts
@@ -1,4 +1,4 @@
-import { TestDataQueryType } from '../dataquery.gen';
+import { TestDataQueryType } from '../dataquery';
 
 export const scenarios = [
   {
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/components/CSVFileEditor.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/components/CSVFileEditor.tsx
index a3dbc39d7cc3e..0ae69bd7b0cca 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/components/CSVFileEditor.tsx
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/components/CSVFileEditor.tsx
@@ -18,6 +18,7 @@ export const CSVFileEditor = ({ onChange, query }: EditorProps) => {
     'ohlc_dogecoin.csv',
     'weight_height.csv',
     'browser_marketshare.csv',
+    'automobiles.csv',
   ].map((name) => ({ label: name, value: name }));
 
   return (
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/components/CSVWaveEditor.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/components/CSVWaveEditor.tsx
index a041b98045904..5635dd77007f7 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/components/CSVWaveEditor.tsx
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/components/CSVWaveEditor.tsx
@@ -3,7 +3,7 @@ import React, { PureComponent, useState } from 'react';
 import { Button, InlineField, InlineFieldRow, Input } from '@grafana/ui';
 
 import { defaultCSVWaveQuery } from '../constants';
-import type { CSVWave } from '../dataquery.gen';
+import type { CSVWave } from '../dataquery';
 
 interface WavesProps {
   waves?: CSVWave[];
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/components/NodeGraphEditor.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/components/NodeGraphEditor.tsx
index 1c804b569a113..6c09214a47f3f 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/components/NodeGraphEditor.tsx
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/components/NodeGraphEditor.tsx
@@ -2,11 +2,11 @@ import React from 'react';
 
 import { Input, InlineFieldRow, InlineField, Select } from '@grafana/ui';
 
-import { NodesQuery, TestData } from '../dataquery.gen';
+import { NodesQuery, TestDataDataQuery } from '../dataquery';
 
 export interface Props {
   onChange: (value: NodesQuery) => void;
-  query: TestData;
+  query: TestDataDataQuery;
 }
 export function NodeGraphEditor({ query, onChange }: Props) {
   const type = query.nodes?.type || 'random';
@@ -24,21 +24,40 @@ export function NodeGraphEditor({ query, onChange }: Props) {
         />
       </InlineField>
       {(type === 'random' || type === 'random edges') && (
-        <InlineField label="Count" labelWidth={14}>
-          <Input
-            type="number"
-            name="count"
-            value={query.nodes?.count}
-            width={32}
-            onChange={(e) =>
-              onChange({ ...query.nodes, count: e.currentTarget.value ? parseInt(e.currentTarget.value, 10) : 0 })
-            }
-            placeholder="10"
-          />
-        </InlineField>
+        <>
+          <InlineField label="Count" labelWidth={14}>
+            <Input
+              type="number"
+              name="count"
+              value={query.nodes?.count}
+              width={32}
+              onChange={(e) =>
+                onChange({ ...query.nodes, count: e.currentTarget.value ? parseInt(e.currentTarget.value, 10) : 0 })
+              }
+              placeholder="10"
+            />
+          </InlineField>
+          <InlineField label="Seed" labelWidth={14}>
+            <Input
+              type="number"
+              name="seed"
+              value={query.nodes?.seed}
+              width={16}
+              onChange={(e) =>
+                onChange({ ...query.nodes, seed: e.currentTarget.value ? parseInt(e.currentTarget.value, 10) : 0 })
+              }
+            />
+          </InlineField>
+        </>
       )}
     </InlineFieldRow>
   );
 }
 
-const options: Array<NodesQuery['type']> = ['random', 'response', 'random edges'];
+const options: Array<NodesQuery['type']> = [
+  'random',
+  'response_small',
+  'response_medium',
+  'random edges',
+  'feature_showcase',
+];
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/components/PredictablePulseEditor.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/components/PredictablePulseEditor.tsx
index cdb2cb4455d31..1cfab8b3a6804 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/components/PredictablePulseEditor.tsx
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/components/PredictablePulseEditor.tsx
@@ -3,7 +3,7 @@ import React, { ChangeEvent } from 'react';
 import { InlineField, InlineFieldRow, Input } from '@grafana/ui';
 
 import { EditorProps } from '../QueryEditor';
-import { PulseWaveQuery } from '../dataquery.gen';
+import { PulseWaveQuery } from '../dataquery';
 
 const fields: Array<{
   label: string;
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/components/RandomWalkEditor.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/components/RandomWalkEditor.tsx
index 74334a6b89787..364b326b38a65 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/components/RandomWalkEditor.tsx
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/components/RandomWalkEditor.tsx
@@ -4,9 +4,17 @@ import { selectors } from '@grafana/e2e-selectors';
 import { InlineField, InlineFieldRow, Input } from '@grafana/ui';
 
 import { EditorProps } from '../QueryEditor';
-import { TestData } from '../dataquery.gen';
+import { TestDataDataQuery } from '../dataquery';
 
-const randomWalkFields = [
+const randomWalkFields: Array<{
+  label: string;
+  id: Selector;
+  placeholder: string;
+  min?: number;
+  step?: number;
+  max?: number;
+  tooltip?: string;
+}> = [
   { label: 'Series count', id: 'seriesCount', placeholder: '1', min: 1, step: 1 },
   { label: 'Start value', id: 'startValue', placeholder: 'auto', step: 1 },
   { label: 'Min', id: 'min', placeholder: 'none', step: 0.1 },
@@ -31,7 +39,7 @@ export const RandomWalkEditor = ({ onChange, query }: EditorProps) => {
   return (
     <InlineFieldRow>
       {randomWalkFields.map(({ label, id, min, step, placeholder, tooltip }) => {
-        const selector = testSelectors?.[id as Selector];
+        const selector = testSelectors[id];
         return (
           <InlineField label={label} labelWidth={14} key={id} aria-label={selector} tooltip={tooltip}>
             <Input
@@ -41,7 +49,7 @@ export const RandomWalkEditor = ({ onChange, query }: EditorProps) => {
               id={`randomWalk-${id}-${query.refId}`}
               min={min}
               step={step}
-              value={(query as any)[id as keyof TestData] || placeholder}
+              value={(query as any)[id as keyof TestDataDataQuery] || placeholder}
               placeholder={placeholder}
               onChange={onChange}
             />
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/components/RawFrameEditor.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/components/RawFrameEditor.tsx
index db6b1ca5fad83..7eea237857c47 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/components/RawFrameEditor.tsx
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/components/RawFrameEditor.tsx
@@ -25,7 +25,7 @@ export const RawFrameEditor = ({ onChange, query }: EditorProps) => {
 
       // Copy paste from panel json
       if (isArray(json.series) && json.state) {
-        data = json.series.map((v: any) => toDataFrameDTO(toDataFrame(v)));
+        data = json.series.map((v: unknown) => toDataFrameDTO(toDataFrame(v)));
       } else {
         // Chek if it is a copy of the raw resuls
         const v = toDataQueryResponse({ data: json });
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/components/SimulationQueryEditor.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/components/SimulationQueryEditor.tsx
index ac131ceb02bf9..e7e889af97d66 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/components/SimulationQueryEditor.tsx
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/components/SimulationQueryEditor.tsx
@@ -5,7 +5,7 @@ import { DataFrameJSON, SelectableValue } from '@grafana/data';
 import { InlineField, InlineFieldRow, InlineSwitch, Input, Label, Select } from '@grafana/ui';
 
 import { EditorProps } from '../QueryEditor';
-import { SimulationQuery } from '../dataquery.gen';
+import { SimulationQuery } from '../dataquery';
 
 import { SimulationSchemaForm } from './SimulationSchemaForm';
 
@@ -25,7 +25,7 @@ interface SimInfo {
 
 export const SimulationQueryEditor = ({ onChange, query, ds }: EditorProps) => {
   const simQuery = query.sim ?? ({} as SimulationQuery);
-  const simKey = simQuery.key ?? ({} as typeof simQuery.key);
+  const simKey = simQuery.key ?? {};
   // keep track of updated config state to pass down to form
   const [cfgValue, setCfgValue] = useState<Record<string, any>>({});
 
@@ -90,7 +90,7 @@ export const SimulationQueryEditor = ({ onChange, query, ds }: EditorProps) => {
     if (simKey.uid) {
       path += '/' + simKey.uid;
     }
-    ds.postResource('sim/' + path, config).then((res) => {
+    ds.postResource<SimInfo>('sim/' + path, config).then((res) => {
       setCfgValue(res.config);
     });
   };
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/components/StreamingClientEditor.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/components/StreamingClientEditor.tsx
index 8297727f4f668..67474d9515b22 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/components/StreamingClientEditor.tsx
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/components/StreamingClientEditor.tsx
@@ -16,6 +16,7 @@ const types = [
   { value: 'signal', label: 'Signal' },
   { value: 'logs', label: 'Logs' },
   { value: 'fetch', label: 'Fetch' },
+  { value: 'traces', label: 'Traces' },
 ];
 
 export const StreamingClientEditor = ({ onChange, query }: EditorProps) => {
@@ -29,29 +30,42 @@ export const StreamingClientEditor = ({ onChange, query }: EditorProps) => {
     onChange({ target: { name, value: Number(value) } });
   };
 
+  const streamType = query?.stream?.type || 'signal';
+  const fields =
+    streamType === 'signal'
+      ? streamingClientFields
+      : ['logs', 'traces'].includes(streamType)
+        ? [streamingClientFields[0]] // speed
+        : [];
+
   return (
     <InlineFieldRow>
       <InlineField label="Type" labelWidth={14}>
-        <Select width={32} onChange={onSelectChange} defaultValue={types[0]} options={types} />
+        <Select
+          width={32}
+          onChange={onSelectChange}
+          defaultValue={types[0]}
+          options={types}
+          value={query?.stream?.type}
+        />
       </InlineField>
-      {query?.stream?.type === 'signal' &&
-        streamingClientFields.map(({ label, id, min, step, placeholder }) => {
-          return (
-            <InlineField label={label} labelWidth={14} key={id}>
-              <Input
-                width={32}
-                type="number"
-                id={`stream.${id}-${query.refId}`}
-                name={id}
-                min={min}
-                step={step}
-                value={query.stream?.[id]}
-                placeholder={placeholder}
-                onChange={onInputChange}
-              />
-            </InlineField>
-          );
-        })}
+      {fields.map(({ label, id, min, step, placeholder }) => {
+        return (
+          <InlineField label={label} labelWidth={14} key={id}>
+            <Input
+              width={32}
+              type="number"
+              id={`stream.${id}-${query.refId}`}
+              name={id}
+              min={min}
+              step={step}
+              value={query.stream?.[id]}
+              placeholder={placeholder}
+              onChange={onInputChange}
+            />
+          </InlineField>
+        );
+      })}
 
       {query?.stream?.type === 'fetch' && (
         <InlineField label="URL" labelWidth={14} grow>
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/components/USAQueryEditor.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/components/USAQueryEditor.tsx
index 3b66ddbf270b9..8f4866bf8ce87 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/components/USAQueryEditor.tsx
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/components/USAQueryEditor.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { SelectableValue } from '@grafana/data';
 import { InlineFieldRow, InlineField, Select, MultiSelect, Input } from '@grafana/ui';
 
-import { USAQuery } from '../dataquery.gen';
+import { USAQuery } from '../dataquery';
 
 export interface Props {
   onChange: (value: USAQuery) => void;
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/constants.ts b/public/app/plugins/datasource/grafana-testdata-datasource/constants.ts
index 3acb06f3c5318..eb4ff62c63c0f 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/constants.ts
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/constants.ts
@@ -1,4 +1,4 @@
-import { CSVWave, PulseWaveQuery, TestData, TestDataQueryType } from './dataquery.gen';
+import { CSVWave, PulseWaveQuery, TestDataDataQuery, TestDataQueryType } from './dataquery';
 
 export const defaultPulseQuery: PulseWaveQuery = {
   timeStep: 60,
@@ -15,7 +15,7 @@ export const defaultCSVWaveQuery: CSVWave[] = [
   },
 ];
 
-export const defaultQuery: TestData = {
+export const defaultQuery: TestDataDataQuery = {
   scenarioId: TestDataQueryType.RandomWalk,
   refId: '',
 };
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/dataquery.cue b/public/app/plugins/datasource/grafana-testdata-datasource/dataquery.cue
deleted file mode 100644
index bc1cfe4296ab9..0000000000000
--- a/public/app/plugins/datasource/grafana-testdata-datasource/dataquery.cue
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright 2023 Grafana Labs
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package grafanaplugin
-
-import (
-	"github.com/grafana/grafana/packages/grafana-schema/src/common"
-)
-
-composableKinds: DataQuery: {
-	maturity: "experimental"
-
-	lineage: {
-		schemas: [{
-			version: [0, 0]
-			schema: {
-				common.DataQuery
-				alias?:       string
-				scenarioId?:  #TestDataQueryType & (*"random_walk" | _)
-				stringInput?: string
-				stream?:      #StreamingQuery
-				pulseWave?:   #PulseWaveQuery
-				sim?:         #SimulationQuery
-				csvWave?: [...#CSVWave] //TODO can we prevent partial from being generated
-				labels?:                string
-				lines?:                 int64
-				levelColumn?:           bool
-				channel?:               string
-				nodes?:                 #NodesQuery
-				csvFileName?:           string
-				csvContent?:            string
-				rawFrameContent?:       string
-				seriesCount?:           int32
-				usa?:                   #USAQuery
-				errorType?:             "server_panic" | "frontend_exception" | "frontend_observable"
-				spanCount?:             int32
-				points?: [...[...string | int64]]
-
-				// Drop percentage (the chance we will lose a point 0-100)
-				dropPercent?: float64
-
-				flamegraphDiff?: bool
-
-				#TestDataQueryType: "random_walk" | "slow_query" | "random_walk_with_error" | "random_walk_table" | "exponential_heatmap_bucket_data" | "linear_heatmap_bucket_data" | "no_data_points" | "datapoints_outside_range" | "csv_metric_values" | "predictable_pulse" | "predictable_csv_wave" | "streaming_client" | "simulation" | "usa" | "live" | "grafana_api" | "arrow" | "annotations" | "table_static" | "server_error_500" | "logs" | "node_graph" | "flame_graph" | "raw_frame" | "csv_file" | "csv_content" | "trace" | "manual_entry" | "variables-query" @cuetsy(kind="enum", memberNames="RandomWalk|SlowQuery|RandomWalkWithError|RandomWalkTable|ExponentialHeatmapBucketData|LinearHeatmapBucketData|NoDataPoints|DataPointsOutsideRange|CSVMetricValues|PredictablePulse|PredictableCSVWave|StreamingClient|Simulation|USA|Live|GrafanaAPI|Arrow|Annotations|TableStatic|ServerError500|Logs|NodeGraph|FlameGraph|RawFrame|CSVFile|CSVContent|Trace|ManualEntry|VariablesQuery")
-
-				#StreamingQuery: {
-					type:   "signal" | "logs" | "fetch"
-					speed:  int32
-					spread: int32
-					noise:  int32
-					bands?: int32
-					url?:   string
-				} @cuetsy(kind="interface")
-
-				#PulseWaveQuery: {
-					timeStep?: int64
-					onCount?:  int64
-					offCount?: int64
-					onValue?:  float64
-					offValue?: float64
-				} @cuetsy(kind="interface")
-
-				#SimulationQuery: {
-					key: {
-						type: string
-						tick: float64
-						uid?: string
-					}
-					config?: {...}
-					stream?: bool
-					last?:   bool
-				} @cuetsy(kind="interface")
-
-				#NodesQuery: {
-					type?:  "random" | "response" | "random edges"
-					count?: int64
-				} @cuetsy(kind="interface")
-
-				#USAQuery: {
-					mode?:   string
-					period?: string
-					fields?: [...string]
-					states?: [...string]
-				} @cuetsy(kind="interface")
-
-				#CSVWave: {
-					timeStep?:  int64
-					name?:      string
-					valuesCSV?: string
-					labels?:    string
-				} @cuetsy(kind="interface")
-
-				// TODO: Should this live here given it's not used in the dataquery?
-				#Scenario: {
-					id:              string
-					name:            string
-					stringInput:     string
-					description?:    string
-					hideAliasField?: bool
-				} @cuetsy(kind="interface")
-			}
-		}]
-		lenses: []
-	}
-}
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/dataquery.gen.ts b/public/app/plugins/datasource/grafana-testdata-datasource/dataquery.gen.ts
deleted file mode 100644
index b36214b606878..0000000000000
--- a/public/app/plugins/datasource/grafana-testdata-datasource/dataquery.gen.ts
+++ /dev/null
@@ -1,140 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     public/app/plugins/gen.go
-// Using jennies:
-//     TSTypesJenny
-//     PluginTSTypesJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-import * as common from '@grafana/schema';
-
-export enum TestDataQueryType {
-  Annotations = 'annotations',
-  Arrow = 'arrow',
-  CSVContent = 'csv_content',
-  CSVFile = 'csv_file',
-  CSVMetricValues = 'csv_metric_values',
-  DataPointsOutsideRange = 'datapoints_outside_range',
-  ExponentialHeatmapBucketData = 'exponential_heatmap_bucket_data',
-  FlameGraph = 'flame_graph',
-  GrafanaAPI = 'grafana_api',
-  LinearHeatmapBucketData = 'linear_heatmap_bucket_data',
-  Live = 'live',
-  Logs = 'logs',
-  ManualEntry = 'manual_entry',
-  NoDataPoints = 'no_data_points',
-  NodeGraph = 'node_graph',
-  PredictableCSVWave = 'predictable_csv_wave',
-  PredictablePulse = 'predictable_pulse',
-  RandomWalk = 'random_walk',
-  RandomWalkTable = 'random_walk_table',
-  RandomWalkWithError = 'random_walk_with_error',
-  RawFrame = 'raw_frame',
-  ServerError500 = 'server_error_500',
-  Simulation = 'simulation',
-  SlowQuery = 'slow_query',
-  StreamingClient = 'streaming_client',
-  TableStatic = 'table_static',
-  Trace = 'trace',
-  USA = 'usa',
-  VariablesQuery = 'variables-query',
-}
-
-export interface StreamingQuery {
-  bands?: number;
-  noise: number;
-  speed: number;
-  spread: number;
-  type: ('signal' | 'logs' | 'fetch');
-  url?: string;
-}
-
-export interface PulseWaveQuery {
-  offCount?: number;
-  offValue?: number;
-  onCount?: number;
-  onValue?: number;
-  timeStep?: number;
-}
-
-export interface SimulationQuery {
-  config?: Record<string, unknown>;
-  key: {
-    type: string;
-    tick: number;
-    uid?: string;
-  };
-  last?: boolean;
-  stream?: boolean;
-}
-
-export interface NodesQuery {
-  count?: number;
-  type?: ('random' | 'response' | 'random edges');
-}
-
-export interface USAQuery {
-  fields?: Array<string>;
-  mode?: string;
-  period?: string;
-  states?: Array<string>;
-}
-
-export const defaultUSAQuery: Partial<USAQuery> = {
-  fields: [],
-  states: [],
-};
-
-export interface CSVWave {
-  labels?: string;
-  name?: string;
-  timeStep?: number;
-  valuesCSV?: string;
-}
-
-/**
- * TODO: Should this live here given it's not used in the dataquery?
- */
-export interface Scenario {
-  description?: string;
-  hideAliasField?: boolean;
-  id: string;
-  name: string;
-  stringInput: string;
-}
-
-export interface TestData extends common.DataQuery {
-  alias?: string;
-  channel?: string;
-  csvContent?: string;
-  csvFileName?: string;
-  csvWave?: Array<CSVWave>; // TODO can we prevent partial from being generated
-  /**
-   * Drop percentage (the chance we will lose a point 0-100)
-   */
-  dropPercent?: number;
-  errorType?: ('server_panic' | 'frontend_exception' | 'frontend_observable');
-  flamegraphDiff?: boolean;
-  labels?: string;
-  levelColumn?: boolean;
-  lines?: number;
-  nodes?: NodesQuery;
-  points?: Array<Array<(string | number)>>;
-  pulseWave?: PulseWaveQuery;
-  rawFrameContent?: string;
-  scenarioId?: TestDataQueryType;
-  seriesCount?: number;
-  sim?: SimulationQuery;
-  spanCount?: number;
-  stream?: StreamingQuery;
-  stringInput?: string;
-  usa?: USAQuery;
-}
-
-export const defaultTestData: Partial<TestData> = {
-  csvWave: [],
-  points: [],
-  scenarioId: TestDataQueryType.RandomWalk,
-};
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/dataquery.ts b/public/app/plugins/datasource/grafana-testdata-datasource/dataquery.ts
new file mode 100644
index 0000000000000..2c339f0e9211f
--- /dev/null
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/dataquery.ts
@@ -0,0 +1,134 @@
+// Code was originally generated from cue
+// It must now be updated manually
+
+import * as common from '@grafana/schema';
+
+export enum TestDataQueryType {
+  Annotations = 'annotations',
+  Arrow = 'arrow',
+  CSVContent = 'csv_content',
+  CSVFile = 'csv_file',
+  CSVMetricValues = 'csv_metric_values',
+  DataPointsOutsideRange = 'datapoints_outside_range',
+  ExponentialHeatmapBucketData = 'exponential_heatmap_bucket_data',
+  FlameGraph = 'flame_graph',
+  GrafanaAPI = 'grafana_api',
+  LinearHeatmapBucketData = 'linear_heatmap_bucket_data',
+  Live = 'live',
+  Logs = 'logs',
+  ManualEntry = 'manual_entry',
+  NoDataPoints = 'no_data_points',
+  NodeGraph = 'node_graph',
+  PredictableCSVWave = 'predictable_csv_wave',
+  PredictablePulse = 'predictable_pulse',
+  RandomWalk = 'random_walk',
+  RandomWalkTable = 'random_walk_table',
+  RandomWalkWithError = 'random_walk_with_error',
+  RawFrame = 'raw_frame',
+  ServerError500 = 'server_error_500',
+  Simulation = 'simulation',
+  SlowQuery = 'slow_query',
+  StreamingClient = 'streaming_client',
+  TableStatic = 'table_static',
+  Trace = 'trace',
+  USA = 'usa',
+  VariablesQuery = 'variables-query',
+}
+
+export interface StreamingQuery {
+  bands?: number;
+  noise: number;
+  speed: number;
+  spread: number;
+  type: 'signal' | 'logs' | 'fetch' | 'traces';
+  url?: string;
+}
+
+export interface PulseWaveQuery {
+  offCount?: number;
+  offValue?: number;
+  onCount?: number;
+  onValue?: number;
+  timeStep?: number;
+}
+
+export interface SimulationQuery {
+  config?: Record<string, unknown>;
+  key: {
+    type: string;
+    tick: number;
+    uid?: string;
+  };
+  last?: boolean;
+  stream?: boolean;
+}
+
+export interface NodesQuery {
+  count?: number;
+  seed?: number;
+  type?: 'random' | 'response_small' | 'response_medium' | 'random edges' | 'feature_showcase';
+}
+
+export interface USAQuery {
+  fields?: string[];
+  mode?: string;
+  period?: string;
+  states?: string[];
+}
+
+export const defaultUSAQuery: Partial<USAQuery> = {
+  fields: [],
+  states: [],
+};
+
+export interface CSVWave {
+  labels?: string;
+  name?: string;
+  timeStep?: number;
+  valuesCSV?: string;
+}
+
+/**
+ * TODO: Should this live here given it's not used in the dataquery?
+ */
+export interface Scenario {
+  description?: string;
+  hideAliasField?: boolean;
+  id: string;
+  name: string;
+  stringInput: string;
+}
+
+export interface TestDataDataQuery extends common.DataQuery {
+  alias?: string;
+  channel?: string;
+  csvContent?: string;
+  csvFileName?: string;
+  csvWave?: CSVWave[]; // TODO can we prevent partial from being generated
+  /**
+   * Drop percentage (the chance we will lose a point 0-100)
+   */
+  dropPercent?: number;
+  errorType?: 'server_panic' | 'frontend_exception' | 'frontend_observable';
+  flamegraphDiff?: boolean;
+  labels?: string;
+  levelColumn?: boolean;
+  lines?: number;
+  nodes?: NodesQuery;
+  points?: Array<Array<string | number>>;
+  pulseWave?: PulseWaveQuery;
+  rawFrameContent?: string;
+  scenarioId?: TestDataQueryType;
+  seriesCount?: number;
+  sim?: SimulationQuery;
+  spanCount?: number;
+  stream?: StreamingQuery;
+  stringInput?: string;
+  usa?: USAQuery;
+}
+
+export const defaultTestDataDataQuery: Partial<TestDataDataQuery> = {
+  csvWave: [],
+  points: [],
+  scenarioId: TestDataQueryType.RandomWalk,
+};
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/datasource.ts b/public/app/plugins/datasource/grafana-testdata-datasource/datasource.ts
index ca72c78653384..3259b2531d862 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/datasource.ts
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/datasource.ts
@@ -20,14 +20,14 @@ import {
 } from '@grafana/data';
 import { DataSourceWithBackend, getBackendSrv, getGrafanaLiveSrv, getTemplateSrv, TemplateSrv } from '@grafana/runtime';
 
-import { Scenario, TestData, TestDataQueryType } from './dataquery.gen';
+import { Scenario, TestDataDataQuery, TestDataQueryType } from './dataquery';
 import { queryMetricTree } from './metricTree';
-import { generateRandomEdges, generateRandomNodes, savedNodesResponse } from './nodeGraphUtils';
+import { generateRandomEdges, generateRandomNodes, generateShowcaseData, savedNodesResponse } from './nodeGraphUtils';
 import { runStream } from './runStreams';
 import { flameGraphData, flameGraphDataDiff } from './testData/flameGraphResponse';
 import { TestDataVariableSupport } from './variables';
 
-export class TestDataDataSource extends DataSourceWithBackend<TestData> {
+export class TestDataDataSource extends DataSourceWithBackend<TestDataDataQuery> {
   scenariosCache?: Promise<Scenario[]>;
 
   constructor(
@@ -40,7 +40,7 @@ export class TestDataDataSource extends DataSourceWithBackend<TestData> {
       getDefaultQuery: () => ({ scenarioId: TestDataQueryType.Annotations, lines: 10 }),
 
       // Make sure annotations have scenarioId set
-      prepareAnnotation: (old: AnnotationQuery<TestData>) => {
+      prepareAnnotation: (old: AnnotationQuery<TestDataDataQuery>) => {
         if (old.target?.scenarioId?.length) {
           return old;
         }
@@ -56,15 +56,15 @@ export class TestDataDataSource extends DataSourceWithBackend<TestData> {
     };
   }
 
-  getDefaultQuery(): Partial<TestData> {
+  getDefaultQuery(): Partial<TestDataDataQuery> {
     return {
       scenarioId: TestDataQueryType.RandomWalk,
       seriesCount: 1,
     };
   }
 
-  query(options: DataQueryRequest<TestData>): Observable<DataQueryResponse> {
-    const backendQueries: TestData[] = [];
+  query(options: DataQueryRequest<TestDataDataQuery>): Observable<DataQueryResponse> {
+    const backendQueries: TestDataDataQuery[] = [];
     const streams: Array<Observable<DataQueryResponse>> = [];
 
     // Start streams and prepare queries
@@ -98,7 +98,7 @@ export class TestDataDataSource extends DataSourceWithBackend<TestData> {
           streams.push(this.flameGraphQuery(target));
           break;
         case 'trace':
-          streams.push(this.trace(target, options));
+          streams.push(this.trace(options));
           break;
         case 'raw_frame':
           streams.push(this.rawFrameQuery(target, options));
@@ -141,7 +141,7 @@ export class TestDataDataSource extends DataSourceWithBackend<TestData> {
     return merge(...streams);
   }
 
-  resolveTemplateVariables(query: TestData, scopedVars: ScopedVars) {
+  resolveTemplateVariables(query: TestDataDataQuery, scopedVars: ScopedVars) {
     if (query.labels) {
       query.labels = this.templateSrv.replace(query.labels, scopedVars);
     }
@@ -162,12 +162,15 @@ export class TestDataDataSource extends DataSourceWithBackend<TestData> {
     }
   }
 
-  applyTemplateVariables(query: TestData, scopedVars: ScopedVars): TestData {
+  applyTemplateVariables(query: TestDataDataQuery, scopedVars: ScopedVars): TestDataDataQuery {
     this.resolveTemplateVariables(query, scopedVars);
     return query;
   }
 
-  annotationDataTopicTest(target: TestData, req: DataQueryRequest<TestData>): Observable<DataQueryResponse> {
+  annotationDataTopicTest(
+    target: TestDataDataQuery,
+    req: DataQueryRequest<TestDataDataQuery>
+  ): Observable<DataQueryResponse> {
     const events = this.buildFakeAnnotationEvents(req.range, target.lines ?? 10);
     const dataFrame = new ArrayDataFrame(events);
     dataFrame.meta = { dataTopic: DataTopic.Annotations };
@@ -192,7 +195,7 @@ export class TestDataDataSource extends DataSourceWithBackend<TestData> {
     return events;
   }
 
-  getQueryDisplayText(query: TestData) {
+  getQueryDisplayText(query: TestDataDataQuery) {
     const scenario = query.scenarioId ?? 'Default scenario';
 
     if (query.alias) {
@@ -217,7 +220,10 @@ export class TestDataDataSource extends DataSourceWithBackend<TestData> {
     return this.scenariosCache;
   }
 
-  variablesQuery(target: TestData, options: DataQueryRequest<TestData>): Observable<DataQueryResponse> {
+  variablesQuery(
+    target: TestDataDataQuery,
+    options: DataQueryRequest<TestDataDataQuery>
+  ): Observable<DataQueryResponse> {
     const query = target.stringInput ?? '';
     const interpolatedQuery = this.templateSrv.replace(query, getSearchFilterScopedVar({ query, wildcardChar: '*' }));
     const children = queryMetricTree(interpolatedQuery);
@@ -227,18 +233,24 @@ export class TestDataDataSource extends DataSourceWithBackend<TestData> {
     return of({ data: [dataFrame] }).pipe(delay(100));
   }
 
-  nodesQuery(target: TestData, options: DataQueryRequest<TestData>): Observable<DataQueryResponse> {
+  nodesQuery(target: TestDataDataQuery, options: DataQueryRequest<TestDataDataQuery>): Observable<DataQueryResponse> {
     const type = target.nodes?.type || 'random';
     let frames: DataFrame[];
     switch (type) {
+      case 'feature_showcase':
+        frames = generateShowcaseData();
+        break;
       case 'random':
-        frames = generateRandomNodes(target.nodes?.count);
+        frames = generateRandomNodes(target.nodes?.count, target.nodes?.seed);
+        break;
+      case 'response_small':
+        frames = savedNodesResponse('small');
         break;
-      case 'response':
-        frames = savedNodesResponse();
+      case 'response_medium':
+        frames = savedNodesResponse('medium');
         break;
       case 'random edges':
-        frames = [generateRandomEdges(target.nodes?.count)];
+        frames = [generateRandomEdges(target.nodes?.count, target.nodes?.seed)];
         break;
       default:
         throw new Error(`Unknown node_graph sub type ${type}`);
@@ -247,12 +259,12 @@ export class TestDataDataSource extends DataSourceWithBackend<TestData> {
     return of({ data: frames }).pipe(delay(100));
   }
 
-  flameGraphQuery(target: TestData): Observable<DataQueryResponse> {
+  flameGraphQuery(target: TestDataDataQuery): Observable<DataQueryResponse> {
     const data = target.flamegraphDiff ? flameGraphDataDiff : flameGraphData;
     return of({ data: [{ ...data, refId: target.refId }] }).pipe(delay(100));
   }
 
-  trace(target: TestData, options: DataQueryRequest<TestData>): Observable<DataQueryResponse> {
+  trace(options: DataQueryRequest<TestDataDataQuery>): Observable<DataQueryResponse> {
     const frame = new MutableDataFrame({
       meta: {
         preferredVisualisationType: 'trace',
@@ -269,11 +281,15 @@ export class TestDataDataSource extends DataSourceWithBackend<TestData> {
         { name: 'logs' },
         { name: 'references' },
         { name: 'tags' },
+        { name: 'kind' },
+        { name: 'statusCode' },
       ],
     });
     const numberOfSpans = options.targets[0].spanCount || 10;
     const spanIdPrefix = '75c665dfb68';
     const start = Date.now() - 1000 * 60 * 30;
+    const kinds = ['client', 'server', ''];
+    const statusCodes = [0, 1, 2];
 
     for (let i = 0; i < numberOfSpans; i++) {
       frame.add({
@@ -284,13 +300,36 @@ export class TestDataDataSource extends DataSourceWithBackend<TestData> {
         serviceName: `Service ${i}`,
         startTime: start + i * 100,
         duration: 300,
+        tags: [
+          { key: 'http.method', value: 'POST' },
+          { key: 'http.status_code', value: 200 },
+          { key: 'http.url', value: `Service${i}:80` },
+        ],
+        serviceTags: [
+          { key: 'client-uuid', value: '6238bacefsecba865' },
+          { key: 'service.name', value: `Service${i}` },
+          { key: 'ip', value: '0.0.0.1' },
+          { key: 'latest_version', value: false },
+        ],
+        logs:
+          i % 4 === 0
+            ? [
+                { timestamp: start + i * 100, fields: [{ key: 'msg', value: 'Service updated' }] },
+                { timestamp: start + i * 100 + 200, fields: [{ key: 'host', value: 'app' }] },
+              ]
+            : [],
+        kind: i === 0 ? 'client' : kinds[Math.floor(Math.random() * kinds.length)],
+        statusCode: statusCodes[Math.floor(Math.random() * statusCodes.length)],
       });
     }
 
     return of({ data: [frame] }).pipe(delay(100));
   }
 
-  rawFrameQuery(target: TestData, options: DataQueryRequest<TestData>): Observable<DataQueryResponse> {
+  rawFrameQuery(
+    target: TestDataDataQuery,
+    options: DataQueryRequest<TestDataDataQuery>
+  ): Observable<DataQueryResponse> {
     try {
       const data = JSON.parse(target.rawFrameContent ?? '[]').map((v: any) => {
         const f = toDataFrame(v);
@@ -306,7 +345,10 @@ export class TestDataDataSource extends DataSourceWithBackend<TestData> {
     }
   }
 
-  serverErrorQuery(target: TestData, options: DataQueryRequest<TestData>): Observable<DataQueryResponse> | null {
+  serverErrorQuery(
+    target: TestDataDataQuery,
+    options: DataQueryRequest<TestDataDataQuery>
+  ): Observable<DataQueryResponse> | null {
     const { errorType } = target;
 
     if (errorType === 'server_panic') {
@@ -326,7 +368,10 @@ export class TestDataDataSource extends DataSourceWithBackend<TestData> {
   }
 }
 
-function runGrafanaAPI(target: TestData, req: DataQueryRequest<TestData>): Observable<DataQueryResponse> {
+function runGrafanaAPI(
+  target: TestDataDataQuery,
+  req: DataQueryRequest<TestDataDataQuery>
+): Observable<DataQueryResponse> {
   const url = `/api/${target.stringInput}`;
   return from(
     getBackendSrv()
@@ -343,7 +388,10 @@ function runGrafanaAPI(target: TestData, req: DataQueryRequest<TestData>): Obser
 
 let liveQueryCounter = 1000;
 
-function runGrafanaLiveQuery(target: TestData, req: DataQueryRequest<TestData>): Observable<DataQueryResponse> {
+function runGrafanaLiveQuery(
+  target: TestDataDataQuery,
+  req: DataQueryRequest<TestDataDataQuery>
+): Observable<DataQueryResponse> {
   if (!target.channel) {
     throw new Error(`Missing channel config`);
   }
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/nodeGraphUtils.ts b/public/app/plugins/datasource/grafana-testdata-datasource/nodeGraphUtils.ts
index 3bf1af6280b23..3811b61890561 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/nodeGraphUtils.ts
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/nodeGraphUtils.ts
@@ -1,3 +1,5 @@
+import { randomLcg } from 'd3-random';
+
 import {
   FieldColorModeId,
   FieldDTO,
@@ -5,12 +7,16 @@ import {
   MutableDataFrame,
   NodeGraphDataFrameFieldNames,
   DataFrame,
+  addRow,
 } from '@grafana/data';
 
-import { nodes, edges } from './testData/serviceMapResponse';
+import * as serviceMapResponseSmall from './testData/serviceMapResponse';
+import * as serviceMapResponsMedium from './testData/serviceMapResponseMedium';
 
-export function generateRandomNodes(count = 10) {
+export function generateRandomNodes(count = 10, seed?: number) {
   const nodes = [];
+  const edges: string[] = [];
+  const rand = randomLcg(seed);
 
   const root = {
     id: 'root',
@@ -20,7 +26,7 @@ export function generateRandomNodes(count = 10) {
     error: 0,
     stat1: Math.random(),
     stat2: Math.random(),
-    edges: [] as any[],
+    edges,
   };
   nodes.push(root);
   const nodesWithoutMaxEdges = [root];
@@ -30,7 +36,7 @@ export function generateRandomNodes(count = 10) {
   for (let i = 1; i < count; i++) {
     const node = makeRandomNode(i);
     nodes.push(node);
-    const sourceIndex = Math.floor(Math.random() * Math.floor(nodesWithoutMaxEdges.length - 1));
+    const sourceIndex = Math.floor(rand() * Math.floor(nodesWithoutMaxEdges.length - 1));
     const source = nodesWithoutMaxEdges[sourceIndex];
     source.edges.push(node.id);
     if (source.edges.length >= maxEdges) {
@@ -42,8 +48,8 @@ export function generateRandomNodes(count = 10) {
   // Add some random edges to create possible cycle
   const additionalEdges = Math.floor(count / 2);
   for (let i = 0; i <= additionalEdges; i++) {
-    const sourceIndex = Math.floor(Math.random() * Math.floor(nodes.length - 1));
-    const targetIndex = Math.floor(Math.random() * Math.floor(nodes.length - 1));
+    const sourceIndex = Math.floor(rand() * Math.floor(nodes.length - 1));
+    const targetIndex = Math.floor(rand() * Math.floor(nodes.length - 1));
     if (sourceIndex === targetIndex || nodes[sourceIndex].id === '0' || nodes[targetIndex].id === '0') {
       continue;
     }
@@ -51,7 +57,74 @@ export function generateRandomNodes(count = 10) {
     nodes[sourceIndex].edges.push(nodes[targetIndex].id);
   }
 
-  const nodeFields: Record<string, Omit<FieldDTO, 'name'> & { values: any[] }> = {
+  const { nodesFields, nodesFrame, edgesFrame } = makeDataFrames();
+
+  const edgesSet = new Set();
+  for (const node of nodes) {
+    nodesFields.id.values.push(node.id);
+    nodesFields.title.values.push(node.title);
+    nodesFields[NodeGraphDataFrameFieldNames.subTitle].values.push(node.subTitle);
+    nodesFields[NodeGraphDataFrameFieldNames.mainStat].values.push(node.stat1);
+    nodesFields[NodeGraphDataFrameFieldNames.secondaryStat].values.push(node.stat2);
+    nodesFields.arc__success.values.push(node.success);
+    nodesFields.arc__errors.values.push(node.error);
+    const rnd = Math.random();
+    nodesFields[NodeGraphDataFrameFieldNames.icon].values.push(rnd > 0.9 ? 'database' : rnd < 0.1 ? 'cloud' : '');
+    nodesFields[NodeGraphDataFrameFieldNames.nodeRadius].values.push(Math.max(rnd * 100, 30)); // ensure a minimum radius of 30 or icons will not fit well in the node
+    nodesFields[NodeGraphDataFrameFieldNames.highlighted].values.push(Math.random() > 0.5);
+
+    for (const edge of node.edges) {
+      const id = `${node.id}--${edge}`;
+      // We can have duplicate edges when we added some more by random
+      if (edgesSet.has(id)) {
+        continue;
+      }
+      edgesSet.add(id);
+      edgesFrame.fields[0].values.push(`${node.id}--${edge}`);
+      edgesFrame.fields[1].values.push(node.id);
+      edgesFrame.fields[2].values.push(edge);
+      edgesFrame.fields[3].values.push(Math.random() * 100);
+      edgesFrame.fields[4].values.push(Math.random() > 0.5);
+      edgesFrame.fields[5].values.push(Math.ceil(Math.random() * 15));
+    }
+  }
+  edgesFrame.length = edgesFrame.fields[0].values.length;
+
+  return [nodesFrame, edgesFrame];
+}
+
+function makeRandomNode(index: number) {
+  const success = Math.random();
+  const error = 1 - success;
+  return {
+    id: `service:${index}`,
+    title: `service:${index}`,
+    subTitle: 'service',
+    success,
+    error,
+    stat1: Math.random(),
+    stat2: Math.random(),
+    edges: [],
+    highlighted: Math.random() > 0.5,
+  };
+}
+
+export function savedNodesResponse(size: 'small' | 'medium'): [DataFrame, DataFrame] {
+  const response = size === 'small' ? serviceMapResponseSmall : serviceMapResponsMedium;
+  return [new MutableDataFrame(response.nodes), new MutableDataFrame(response.edges)];
+}
+
+// Generates node graph data but only returns the edges
+export function generateRandomEdges(count = 10, seed = 1) {
+  return generateRandomNodes(count, seed)[1];
+}
+
+function makeDataFrames(): {
+  nodesFrame: DataFrame;
+  edgesFrame: DataFrame;
+  nodesFields: Record<string, Omit<FieldDTO, 'name'> & { values: unknown[] }>;
+} {
+  const nodesFields: Record<string, Omit<FieldDTO, 'name'> & { values: unknown[] }> = {
     [NodeGraphDataFrameFieldNames.id]: {
       values: [],
       type: FieldType.string,
@@ -109,12 +182,20 @@ export function generateRandomNodes(count = 10) {
       values: [],
       type: FieldType.boolean,
     },
+
+    [NodeGraphDataFrameFieldNames.detail + 'test_value']: {
+      values: [],
+      config: {
+        displayName: 'Test value',
+      },
+      type: FieldType.number,
+    },
   };
 
-  const nodeFrame = new MutableDataFrame({
+  const nodesFrame = new MutableDataFrame({
     name: 'nodes',
-    fields: Object.keys(nodeFields).map((key) => ({
-      ...nodeFields[key],
+    fields: Object.keys(nodesFields).map((key) => ({
+      ...nodesFields[key],
       name: key,
     })),
     meta: { preferredVisualisationType: 'nodeGraph' },
@@ -129,66 +210,106 @@ export function generateRandomNodes(count = 10) {
       { name: NodeGraphDataFrameFieldNames.mainStat, values: [], type: FieldType.number, config: {} },
       { name: NodeGraphDataFrameFieldNames.highlighted, values: [], type: FieldType.boolean, config: {} },
       { name: NodeGraphDataFrameFieldNames.thickness, values: [], type: FieldType.number, config: {} },
+      { name: NodeGraphDataFrameFieldNames.color, values: [], type: FieldType.string, config: {} },
+      { name: NodeGraphDataFrameFieldNames.strokeDasharray, values: [], type: FieldType.string, config: {} },
     ],
     meta: { preferredVisualisationType: 'nodeGraph' },
     length: 0,
   };
 
-  const edgesSet = new Set();
-  for (const node of nodes) {
-    nodeFields.id.values.push(node.id);
-    nodeFields.title.values.push(node.title);
-    nodeFields[NodeGraphDataFrameFieldNames.subTitle].values.push(node.subTitle);
-    nodeFields[NodeGraphDataFrameFieldNames.mainStat].values.push(node.stat1);
-    nodeFields[NodeGraphDataFrameFieldNames.secondaryStat].values.push(node.stat2);
-    nodeFields.arc__success.values.push(node.success);
-    nodeFields.arc__errors.values.push(node.error);
-    const rnd = Math.random();
-    nodeFields[NodeGraphDataFrameFieldNames.icon].values.push(rnd > 0.9 ? 'database' : rnd < 0.1 ? 'cloud' : '');
-    nodeFields[NodeGraphDataFrameFieldNames.nodeRadius].values.push(Math.max(rnd * 100, 30)); // ensure a minimum radius of 30 or icons will not fit well in the node
-    nodeFields[NodeGraphDataFrameFieldNames.highlighted].values.push(Math.random() > 0.5);
+  return { nodesFrame, edgesFrame, nodesFields };
+}
 
-    for (const edge of node.edges) {
-      const id = `${node.id}--${edge}`;
-      // We can have duplicate edges when we added some more by random
-      if (edgesSet.has(id)) {
-        continue;
-      }
-      edgesSet.add(id);
-      edgesFrame.fields[0].values.push(`${node.id}--${edge}`);
-      edgesFrame.fields[1].values.push(node.id);
-      edgesFrame.fields[2].values.push(edge);
-      edgesFrame.fields[3].values.push(Math.random() * 100);
-      edgesFrame.fields[4].values.push(Math.random() > 0.5);
-      edgesFrame.fields[5].values.push(Math.ceil(Math.random() * 15));
-    }
-  }
-  edgesFrame.length = edgesFrame.fields[0].values.length;
+export function generateShowcaseData() {
+  const { nodesFrame, edgesFrame } = makeDataFrames();
 
-  return [nodeFrame, edgesFrame];
-}
+  addRow(nodesFrame, {
+    [NodeGraphDataFrameFieldNames.id]: 'root',
+    [NodeGraphDataFrameFieldNames.title]: 'root',
+    [NodeGraphDataFrameFieldNames.subTitle]: 'client',
+    [NodeGraphDataFrameFieldNames.mainStat]: 1234,
+    [NodeGraphDataFrameFieldNames.secondaryStat]: 5678,
+    arc__success: 0.5,
+    arc__errors: 0.5,
+    [NodeGraphDataFrameFieldNames.icon]: '',
+    [NodeGraphDataFrameFieldNames.nodeRadius]: 40,
+    [NodeGraphDataFrameFieldNames.highlighted]: false,
+    [NodeGraphDataFrameFieldNames.detail + 'test_value']: 1,
+  });
 
-function makeRandomNode(index: number) {
-  const success = Math.random();
-  const error = 1 - success;
-  return {
-    id: `service:${index}`,
-    title: `service:${index}`,
-    subTitle: 'service',
-    success,
-    error,
-    stat1: Math.random(),
-    stat2: Math.random(),
-    edges: [],
-    highlighted: Math.random() > 0.5,
-  };
-}
+  addRow(nodesFrame, {
+    [NodeGraphDataFrameFieldNames.id]: 'app_service',
+    [NodeGraphDataFrameFieldNames.title]: 'app service',
+    [NodeGraphDataFrameFieldNames.subTitle]: 'with icon',
+    [NodeGraphDataFrameFieldNames.mainStat]: 1.2,
+    [NodeGraphDataFrameFieldNames.secondaryStat]: 2.3,
+    arc__success: 1,
+    arc__errors: 0,
+    [NodeGraphDataFrameFieldNames.icon]: 'apps',
+    [NodeGraphDataFrameFieldNames.nodeRadius]: 40,
+    [NodeGraphDataFrameFieldNames.highlighted]: false,
+    [NodeGraphDataFrameFieldNames.detail + 'test_value']: 42,
+  });
 
-export function savedNodesResponse() {
-  return [new MutableDataFrame(nodes), new MutableDataFrame(edges)];
-}
+  addRow(edgesFrame, {
+    [NodeGraphDataFrameFieldNames.id]: 'root-app_service',
+    [NodeGraphDataFrameFieldNames.source]: 'root',
+    [NodeGraphDataFrameFieldNames.target]: 'app_service',
+    [NodeGraphDataFrameFieldNames.mainStat]: 3.4,
+    [NodeGraphDataFrameFieldNames.secondaryStat]: 4.5,
+    [NodeGraphDataFrameFieldNames.thickness]: 4,
+    [NodeGraphDataFrameFieldNames.color]: '',
+    [NodeGraphDataFrameFieldNames.strokeDasharray]: '',
+  });
 
-// Generates node graph data but only returns the edges
-export function generateRandomEdges(count = 10) {
-  return generateRandomNodes(count)[1];
+  addRow(nodesFrame, {
+    [NodeGraphDataFrameFieldNames.id]: 'auth_service',
+    [NodeGraphDataFrameFieldNames.title]: 'auth service',
+    [NodeGraphDataFrameFieldNames.subTitle]: 'highlighted',
+    [NodeGraphDataFrameFieldNames.mainStat]: 3.4,
+    [NodeGraphDataFrameFieldNames.secondaryStat]: 4.5,
+    arc__success: 0,
+    arc__errors: 1,
+    [NodeGraphDataFrameFieldNames.icon]: '',
+    [NodeGraphDataFrameFieldNames.nodeRadius]: 40,
+    [NodeGraphDataFrameFieldNames.highlighted]: true,
+  });
+
+  addRow(edgesFrame, {
+    [NodeGraphDataFrameFieldNames.id]: 'root-auth_service',
+    [NodeGraphDataFrameFieldNames.source]: 'root',
+    [NodeGraphDataFrameFieldNames.target]: 'auth_service',
+    [NodeGraphDataFrameFieldNames.mainStat]: 113.4,
+    [NodeGraphDataFrameFieldNames.secondaryStat]: 4.511,
+    [NodeGraphDataFrameFieldNames.thickness]: 8,
+    [NodeGraphDataFrameFieldNames.color]: 'red',
+    [NodeGraphDataFrameFieldNames.strokeDasharray]: '',
+  });
+
+  addRow(nodesFrame, {
+    [NodeGraphDataFrameFieldNames.id]: 'db',
+    [NodeGraphDataFrameFieldNames.title]: 'db',
+    [NodeGraphDataFrameFieldNames.subTitle]: 'bigger size',
+    [NodeGraphDataFrameFieldNames.mainStat]: 9876.123,
+    [NodeGraphDataFrameFieldNames.secondaryStat]: 123.9876,
+    arc__success: 0.9,
+    arc__errors: 0.1,
+    [NodeGraphDataFrameFieldNames.icon]: 'database',
+    [NodeGraphDataFrameFieldNames.nodeRadius]: 60,
+    [NodeGraphDataFrameFieldNames.highlighted]: false,
+    [NodeGraphDataFrameFieldNames.detail + 'test_value']: 1357,
+  });
+
+  addRow(edgesFrame, {
+    [NodeGraphDataFrameFieldNames.id]: 'auth_service-db',
+    [NodeGraphDataFrameFieldNames.source]: 'auth_service',
+    [NodeGraphDataFrameFieldNames.target]: 'db',
+    [NodeGraphDataFrameFieldNames.mainStat]: 1139.4,
+    [NodeGraphDataFrameFieldNames.secondaryStat]: 477.511,
+    [NodeGraphDataFrameFieldNames.thickness]: 2,
+    [NodeGraphDataFrameFieldNames.color]: 'blue',
+    [NodeGraphDataFrameFieldNames.strokeDasharray]: '2 2',
+  });
+
+  return [nodesFrame, edgesFrame];
 }
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/package.json b/public/app/plugins/datasource/grafana-testdata-datasource/package.json
index 3f3e7d214588b..d933cb9c1a1e2 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/package.json
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/package.json
@@ -2,32 +2,37 @@
   "name": "@grafana-plugins/grafana-testdata-datasource",
   "description": "Generates test data in different forms",
   "private": true,
-  "version": "10.3.0-pre",
+  "version": "11.0.0",
   "dependencies": {
     "@emotion/css": "11.11.2",
-    "@grafana/data": "10.3.0-pre",
-    "@grafana/experimental": "1.7.0",
-    "@grafana/runtime": "10.3.0-pre",
-    "@grafana/schema": "10.3.0-pre",
-    "@grafana/ui": "10.3.0-pre",
+    "@grafana/data": "11.0.0",
+    "@grafana/experimental": "1.7.10",
+    "@grafana/runtime": "11.0.0",
+    "@grafana/schema": "11.0.0",
+    "@grafana/ui": "11.0.0",
+    "d3-random": "^3.0.1",
     "lodash": "4.17.21",
+    "micro-memoize": "^4.1.2",
     "react": "18.2.0",
-    "react-use": "17.4.0",
+    "react-use": "17.5.0",
     "rxjs": "7.8.1",
-    "tslib": "2.6.0"
+    "tslib": "2.6.2",
+    "uuid": "9.0.1"
   },
   "devDependencies": {
-    "@grafana/e2e-selectors": "10.3.0-pre",
-    "@grafana/plugin-configs": "10.3.0-pre",
-    "@testing-library/react": "14.0.0",
-    "@testing-library/user-event": "14.5.1",
-    "@types/jest": "29.5.4",
-    "@types/lodash": "4.14.195",
-    "@types/node": "18.18.5",
-    "@types/react": "18.2.15",
-    "@types/testing-library__jest-dom": "5.14.8",
-    "ts-node": "10.9.1",
-    "webpack": "5.89.0"
+    "@grafana/e2e-selectors": "11.0.0",
+    "@grafana/plugin-configs": "11.0.0",
+    "@testing-library/react": "14.2.2",
+    "@testing-library/user-event": "14.5.2",
+    "@types/d3-random": "^3.0.2",
+    "@types/jest": "29.5.12",
+    "@types/lodash": "4.17.0",
+    "@types/node": "20.11.30",
+    "@types/react": "18.2.73",
+    "@types/testing-library__jest-dom": "5.14.9",
+    "@types/uuid": "9.0.8",
+    "ts-node": "10.9.2",
+    "webpack": "5.91.0"
   },
   "peerDependencies": {
     "@grafana/runtime": "*"
@@ -37,5 +42,5 @@
     "build:commit": "webpack -c ./webpack.config.ts --env production --env commit=$(git rev-parse --short HEAD)",
     "dev": "webpack -w -c ./webpack.config.ts --env development"
   },
-  "packageManager": "yarn@3.6.0"
+  "packageManager": "yarn@4.1.0"
 }
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/plugin.json b/public/app/plugins/datasource/grafana-testdata-datasource/plugin.json
index fb45906c18714..903222c9fefb5 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/plugin.json
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/plugin.json
@@ -35,5 +35,9 @@
       "name": "Streaming Example",
       "path": "dashboards/streaming.json"
     }
-  ]
+  ],
+
+  "dependencies": {
+    "grafanaDependency": ">=10.3.0-0"
+  }
 }
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/runStreams.ts b/public/app/plugins/datasource/grafana-testdata-datasource/runStreams.ts
index e5f12328398b1..6e052c38df1af 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/runStreams.ts
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/runStreams.ts
@@ -1,5 +1,6 @@
 import { defaults } from 'lodash';
 import { Observable } from 'rxjs';
+import { v4 as uuidv4 } from 'uuid';
 
 import {
   DataQueryRequest,
@@ -12,10 +13,14 @@ import {
   DataFrameSchema,
   DataFrameData,
   StreamingDataFrame,
+  createDataFrame,
+  addRow,
+  getDisplayProcessor,
+  createTheme,
 } from '@grafana/data';
 
 import { getRandomLine } from './LogIpsum';
-import { TestData, StreamingQuery } from './dataquery.gen';
+import { TestDataDataQuery, StreamingQuery } from './dataquery';
 
 export const defaultStreamQuery: StreamingQuery = {
   type: 'signal',
@@ -25,27 +30,31 @@ export const defaultStreamQuery: StreamingQuery = {
   bands: 1,
 };
 
-export function runStream(target: TestData, req: DataQueryRequest<TestData>): Observable<DataQueryResponse> {
+export function runStream(
+  target: TestDataDataQuery,
+  req: DataQueryRequest<TestDataDataQuery>
+): Observable<DataQueryResponse> {
   const query = defaults(target.stream, defaultStreamQuery);
-  if ('signal' === query.type) {
-    return runSignalStream(target, query, req);
-  }
-  if ('logs' === query.type) {
-    return runLogsStream(target, query, req);
-  }
-  if ('fetch' === query.type) {
-    return runFetchStream(target, query, req);
+  switch (query.type) {
+    case 'signal':
+      return runSignalStream(target, query, req);
+    case 'logs':
+      return runLogsStream(target, query, req);
+    case 'fetch':
+      return runFetchStream(target, query, req);
+    case 'traces':
+      return runTracesStream(target, query, req);
   }
   throw new Error(`Unknown Stream Type: ${query.type}`);
 }
 
 export function runSignalStream(
-  target: TestData,
+  target: TestDataDataQuery,
   query: StreamingQuery,
-  req: DataQueryRequest<TestData>
+  req: DataQueryRequest<TestDataDataQuery>
 ): Observable<DataQueryResponse> {
   return new Observable<DataQueryResponse>((subscriber) => {
-    const streamId = `signal-${req.panelId}-${target.refId}`;
+    const streamId = `signal-${req.panelId || 'explore'}-${target.refId}`;
     const maxDataPoints = req.maxDataPoints || 1000;
 
     const schema: DataFrameSchema = {
@@ -122,12 +131,12 @@ export function runSignalStream(
 }
 
 export function runLogsStream(
-  target: TestData,
+  target: TestDataDataQuery,
   query: StreamingQuery,
-  req: DataQueryRequest<TestData>
+  req: DataQueryRequest<TestDataDataQuery>
 ): Observable<DataQueryResponse> {
   return new Observable<DataQueryResponse>((subscriber) => {
-    const streamId = `logs-${req.panelId}-${target.refId}`;
+    const streamId = `logs-${req.panelId || 'explore'}-${target.refId}`;
     const maxDataPoints = req.maxDataPoints || 1000;
 
     const data = new CircularDataFrame({
@@ -151,6 +160,7 @@ export function runLogsStream(
       subscriber.next({
         data: [data],
         key: streamId,
+        state: LoadingState.Streaming,
       });
 
       timeoutId = setTimeout(pushNextEvent, speed);
@@ -167,12 +177,12 @@ export function runLogsStream(
 }
 
 export function runFetchStream(
-  target: TestData,
+  target: TestDataDataQuery,
   query: StreamingQuery,
-  req: DataQueryRequest<TestData>
+  req: DataQueryRequest<TestDataDataQuery>
 ): Observable<DataQueryResponse> {
   return new Observable<DataQueryResponse>((subscriber) => {
-    const streamId = `fetch-${req.panelId}-${target.refId}`;
+    const streamId = `fetch-${req.panelId || 'explore'}-${target.refId}`;
     const maxDataPoints = req.maxDataPoints || 1000;
 
     let data = new CircularDataFrame({
@@ -182,7 +192,7 @@ export function runFetchStream(
     data.refId = target.refId;
     data.name = target.alias || 'Fetch ' + target.refId;
 
-    let reader: ReadableStreamReader<Uint8Array>;
+    let reader: ReadableStreamDefaultReader<Uint8Array>;
     const csv = new CSVReader({
       callback: {
         onHeader: (fields: Field[]) => {
@@ -243,3 +253,77 @@ export function runFetchStream(
     };
   });
 }
+
+export function runTracesStream(
+  target: TestDataDataQuery,
+  query: StreamingQuery,
+  req: DataQueryRequest<TestDataDataQuery>
+): Observable<DataQueryResponse> {
+  return new Observable<DataQueryResponse>((subscriber) => {
+    const streamId = `traces-${req.panelId || 'explore'}-${target.refId}`;
+    const data = createMainTraceFrame(target, req.maxDataPoints);
+    let timeoutId: ReturnType<typeof setTimeout>;
+
+    const pushNextEvent = () => {
+      const subframe = createTraceSubFrame();
+      addRow(subframe, [uuidv4(), Date.now(), 'Grafana', 1500]);
+      addRow(data, [uuidv4(), Date.now(), 'Grafana', 'HTTP GET /explore', 1500, [subframe]]);
+
+      subscriber.next({
+        data: [data],
+        key: streamId,
+        state: LoadingState.Streaming,
+      });
+
+      timeoutId = setTimeout(pushNextEvent, query.speed);
+    };
+
+    // Send first event in 5ms
+    setTimeout(pushNextEvent, 5);
+
+    return () => {
+      console.log('unsubscribing to stream ' + streamId);
+      clearTimeout(timeoutId);
+    };
+  });
+}
+
+function createMainTraceFrame(target: TestDataDataQuery, maxDataPoints = 1000) {
+  const data = new CircularDataFrame({
+    append: 'head',
+    capacity: maxDataPoints,
+  });
+  data.refId = target.refId;
+  data.name = target.alias || 'Traces ' + target.refId;
+  data.addField({ name: 'TraceID', type: FieldType.string });
+  data.addField({ name: 'Start time', type: FieldType.time });
+  data.addField({ name: 'Service', type: FieldType.string });
+  data.addField({ name: 'Name', type: FieldType.string });
+  data.addField({ name: 'Duration', type: FieldType.number, config: { unit: 'ms' } });
+  data.addField({ name: 'nested', type: FieldType.nestedFrames });
+  data.meta = {
+    preferredVisualisationType: 'table',
+    uniqueRowIdFields: [0],
+  };
+  return data;
+}
+
+function createTraceSubFrame() {
+  const frame = createDataFrame({
+    fields: [
+      { name: 'SpanID', type: FieldType.string },
+      { name: 'Start time', type: FieldType.time },
+      { name: 'service.name', type: FieldType.string },
+      { name: 'duration', type: FieldType.number },
+    ],
+  });
+
+  // TODO: this should be removed later but right now there is an issue that applyFieldOverrides does not consider
+  //  nested frames.
+  for (const f of frame.fields) {
+    f.display = getDisplayProcessor({ field: f, theme });
+  }
+  return frame;
+}
+
+const theme = createTheme();
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/testData/serviceMapResponse.ts b/public/app/plugins/datasource/grafana-testdata-datasource/testData/serviceMapResponse.ts
index dabecebcfc4e5..bd0ea583d96e7 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/testData/serviceMapResponse.ts
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/testData/serviceMapResponse.ts
@@ -57,7 +57,7 @@ export const nodes = {
           },
         ],
       },
-      values: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14],
+      values: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16],
     },
     {
       name: NodeGraphDataFrameFieldNames.title,
@@ -79,6 +79,8 @@ export const nodes = {
         'api',
         'www',
         'products',
+        'test-client',
+        'test-api',
       ],
     },
     {
@@ -101,6 +103,8 @@ export const nodes = {
         'client',
         'client',
         'Compute',
+        'ephemeral',
+        'ephemeral-api',
       ],
     },
     {
@@ -110,7 +114,7 @@ export const nodes = {
       values: [
         3.5394042646735553, 15.906441318223264, 4.913011921591567, 7.4163203042094095, 1092, 22.85961441405067,
         56.135855729084696, 4.45946191601527, 12.818300278280843, 4.25, 12.565442646791492, 77.63447512700567,
-        40.387096774193544, 77.63447512700567, 27.648950187374872,
+        40.387096774193544, 77.63447512700567, 27.648950187374872, 77.63447512700567, 27.648950187374872,
       ],
     },
     {
@@ -120,7 +124,7 @@ export const nodes = {
       values: [
         50.56317154501667, 682.4, 512.8416666666667, 125.64444444444445, 0.005585812037424941, 137.59722222222223,
         300.0527777777778, 30.582348853370394, 125.77222222222223, 0.028706417080318163, 30.582348853370394, 165.675,
-        0.100021510002151, 165.675, 162.33055555555555,
+        0.100021510002151, 165.675, 162.33055555555555, 165.675, 162.33055555555555,
       ],
     },
     {
@@ -129,7 +133,7 @@ export const nodes = {
       config: { color: { mode: FieldColorModeId.Fixed, fixedColor: 'green' }, displayName: 'Sucesss' },
       values: [
         0.9338865684765882, 1, 1, 1, 0.5, 1, 0.9901128505170387, 0.9069260134520997, 1, 0, 0.9069260134520997,
-        0.9624432037288534, 0, 0.9624432037288534, 0.9824945669843769,
+        0.9624432037288534, 0, 0.9624432037288534, 0.9824945669843769, 0.9624432037288534, 0.9824945669843769,
       ],
     },
     {
@@ -138,7 +142,7 @@ export const nodes = {
       config: { color: { mode: FieldColorModeId.Fixed, fixedColor: 'red' }, displayName: 'Faults' },
       values: [
         0, 0, 0, 0, 0.5, 0, 0.009479813736472288, 0, 0, 0, 0, 0.017168821152524185, 0, 0.017168821152524185,
-        0.01750543301562313,
+        0.01750543301562313, 0.017168821152524185, 0.01750543301562313,
       ],
     },
     {
@@ -147,14 +151,14 @@ export const nodes = {
       config: { color: { mode: FieldColorModeId.Fixed, fixedColor: 'semi-dark-yellow' }, displayName: 'Errors' },
       values: [
         0.06611343152341174, 0, 0, 0, 0, 0, 0.0004073357464890436, 0.09307398654790038, 0, 1, 0.09307398654790038,
-        0.02038797511862247, 1, 0.02038797511862247, 0,
+        0.02038797511862247, 1, 0.02038797511862247, 0, 0.02038797511862247, 0,
       ],
     },
     {
       name: NodeGraphDataFrameFieldNames.arc + 'throttled',
       type: FieldType.number,
       config: { color: { mode: FieldColorModeId.Fixed, fixedColor: 'purple' }, displayName: 'Throttled' },
-      values: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+      values: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     },
   ],
   meta: { preferredVisualisationType: 'nodeGraph' as const },
@@ -236,13 +240,14 @@ export const edges = {
         '14__1',
         '14__2',
         '14__10',
+        '15__16',
       ],
     },
     {
       name: NodeGraphDataFrameFieldNames.source,
       type: FieldType.string,
       config: {},
-      values: [0, 5, 6, 6, 6, 6, 6, 6, 8, 10, 11, 11, 12, 13, 14, 14, 14],
+      values: [0, 5, 6, 6, 6, 6, 6, 6, 8, 10, 11, 11, 12, 13, 14, 14, 14, 15],
     },
     {
       name: 'sourceName',
@@ -266,13 +271,14 @@ export const edges = {
         'products',
         'products',
         'products',
+        'test-client',
       ],
     },
     {
       name: NodeGraphDataFrameFieldNames.target,
       type: FieldType.string,
       config: {},
-      values: [2, 8, 0, 5, 9, 2, 14, 4, 3, 7, 0, 6, 6, 11, 1, 2, 10],
+      values: [2, 8, 0, 5, 9, 2, 14, 4, 3, 7, 0, 6, 6, 11, 1, 2, 10, 16],
     },
     {
       name: 'targetName',
@@ -296,6 +302,7 @@ export const edges = {
         'products',
         'customers',
         'shipping',
+        'test-api',
       ],
     },
     {
@@ -320,6 +327,7 @@ export const edges = {
         'Success 100.00%',
         'Success 100.00%',
         'Faults 9.30%',
+        'Faults 9.30%',
       ],
     },
     {
@@ -330,6 +338,7 @@ export const edges = {
         50.56317154501667, 125.77222222222223, 0.03333333333333333, 137.59722222222223, 0.022222222222222223,
         299.96666666666664, 162.33055555555555, 0.005555555555555556, 125.64444444444445, 30.582348853370394,
         50.51111111111111, 299.9166666666667, 0.100021510002151, 165.675, 682.4, 162.33055555555555, 30.558333333333334,
+        30.558333333333334,
       ],
     },
   ],
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/testData/serviceMapResponseMedium.ts b/public/app/plugins/datasource/grafana-testdata-datasource/testData/serviceMapResponseMedium.ts
new file mode 100644
index 0000000000000..ac0b2599c0835
--- /dev/null
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/testData/serviceMapResponseMedium.ts
@@ -0,0 +1,1004 @@
+import { FieldType, NodeGraphDataFrameFieldNames } from '@grafana/data';
+
+export const nodes = {
+  fields: [
+    {
+      name: NodeGraphDataFrameFieldNames.id,
+      type: FieldType.string,
+      values: [
+        '0',
+        'candycon2000',
+        'pantry-summary',
+        'compute-splines-api',
+        'send-notification',
+        'popcorn-distributor',
+        'caramel-gateway',
+        'candy-distributor',
+        'candy-query-frontend',
+        'candy-ruler',
+        'candy-querier',
+        'candy-chocolate-querier',
+        'candy-backend',
+        'candy-read',
+        'candy-write',
+        'popcorn-backend',
+        'popcorn-query-frontend',
+        'proxy-reads',
+        'proxy-gateway',
+        'proxy-writes',
+        'dentist',
+        'fudge-proxy-gateway',
+        'candy-admin-api',
+        'candy-disposer',
+        'candy-ingester',
+        'candy-gateway',
+        'candy-chocolate-write-proxy',
+        'candy-store-gateway',
+        'popcorn-querier',
+        'candy-query-scheduler',
+        'api',
+        'controller',
+        'gateway',
+        'db',
+        'marshmallow-popcorn-plugin',
+        'eggnog-query',
+        'licorice-ingester',
+        'licorice-distributor',
+        'licorice-gateway',
+        'licorice-querier',
+        'licorice-query-frontend',
+        'licorice-ruler',
+        'licorice-read',
+        'licorice-write',
+        'licorice-sugar-gateway',
+        'licorice-query-scheduler',
+        'popcorn-ingester',
+        'popcorn-ruler',
+        'peanutapi',
+        'almondapi',
+        'worker',
+        'toffee-gateway',
+        'marshmallow-gateway',
+        'toffee-proxy-gateway',
+        'mints-distributor',
+        'mints-agent',
+        'mints-ingester',
+        'marshmallow-query-frontend',
+        'marshmallow-ingester',
+        'marshmallow-querier',
+        'eating-scheduler',
+        'calorie-generator',
+        'candy-packaging-exporter',
+        'candy-manager',
+        'overeat-gateway',
+        'wrappers-api',
+        'overeat_api',
+        'licorice-admin-api',
+        'almond',
+        'almondops-gateway',
+      ],
+    },
+    {
+      name: NodeGraphDataFrameFieldNames.title,
+      config: {
+        displayName: 'Service name',
+      },
+      type: FieldType.string,
+      values: [
+        '0',
+        'candycon2000',
+        'pantry-summary',
+        'compute-splines-api',
+        'send-notification',
+        'popcorn-distributor',
+        'caramel-gateway',
+        'candy-distributor',
+        'candy-query-frontend',
+        'candy-ruler',
+        'candy-querier',
+        'candy-chocolate-querier',
+        'candy-backend',
+        'candy-read',
+        'candy-write',
+        'popcorn-backend',
+        'popcorn-query-frontend',
+        'proxy-reads',
+        'proxy-gateway',
+        'proxy-writes',
+        'dentist',
+        'fudge-proxy-gateway',
+        'candy-admin-api',
+        'candy-disposer',
+        'candy-ingester',
+        'candy-gateway',
+        'candy-chocolate-write-proxy',
+        'candy-store-gateway',
+        'popcorn-querier',
+        'candy-query-scheduler',
+        'api',
+        'controller',
+        'gateway',
+        'db',
+        'marshmallow-popcorn-plugin',
+        'eggnog-query',
+        'licorice-ingester',
+        'licorice-distributor',
+        'licorice-gateway',
+        'licorice-querier',
+        'licorice-query-frontend',
+        'licorice-ruler',
+        'licorice-read',
+        'licorice-write',
+        'licorice-sugar-gateway',
+        'licorice-query-scheduler',
+        'popcorn-ingester',
+        'popcorn-ruler',
+        'peanutapi',
+        'almondapi',
+        'worker',
+        'toffee-gateway',
+        'marshmallow-gateway',
+        'toffee-proxy-gateway',
+        'mints-distributor',
+        'mints-agent',
+        'mints-ingester',
+        'marshmallow-query-frontend',
+        'marshmallow-ingester',
+        'marshmallow-querier',
+        'eating-scheduler',
+        'calorie-generator',
+        'candy-packaging-exporter',
+        'candy-manager',
+        'overeat-gateway',
+        'wrappers-api',
+        'overeat_api',
+        'licorice-admin-api',
+        'almond',
+        'almondops-gateway',
+      ],
+    },
+    {
+      name: NodeGraphDataFrameFieldNames.mainStat,
+      config: {
+        unit: 'ms/r',
+        displayName: 'Average response time',
+      },
+      type: FieldType.number,
+      values: [
+        0.3792332384891563,
+        0.8672229016348518,
+        null,
+        16.20695699632165,
+        39.928285334583585,
+        9.655124202033475,
+        21.05268555627574,
+        5.867123115073844,
+        2.4860418856893776,
+        355.53214166441546,
+        20.55178572103791,
+        null,
+        38.89817349596472,
+        8.180751216025271,
+        0.8054812870678301,
+        40.77678203483556,
+        85.482797395998,
+        16.27026063145621,
+        null,
+        19.87661445917064,
+        0.22942839760131845,
+        null,
+        null,
+        null,
+        0.5613453804178244,
+        null,
+        null,
+        8.992145179555344,
+        304.9330783211414,
+        null,
+        10.395531440216706,
+        null,
+        null,
+        null,
+        0.015141602590812384,
+        null,
+        2516.1181289425012,
+        1.753552009081408,
+        2.18723509171844,
+        2042.6033859578174,
+        35.584947433232884,
+        12.650689593313736,
+        11469.63275426663,
+        10032.233577903402,
+        2.7579124143530875,
+        null,
+        12.313124260662056,
+        null,
+        449.2619110960284,
+        null,
+        457.68439141665425,
+        4.200223281332062,
+        3.22412985358373,
+        null,
+        16.03316977154454,
+        null,
+        5.830408312271875,
+        1460.8431543525896,
+        6.379590630002257,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+    },
+    {
+      name: NodeGraphDataFrameFieldNames.secondaryStat,
+      config: {
+        unit: 'r/sec',
+        displayName: 'Requests per second',
+      },
+      type: FieldType.number,
+      values: [
+        0,
+        0,
+        null,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0.01,
+        0,
+        0.01,
+        null,
+        0,
+        0,
+        0.02,
+        0,
+        0,
+        0,
+        null,
+        0,
+        0,
+        null,
+        null,
+        null,
+        0.1,
+        null,
+        null,
+        0,
+        0,
+        null,
+        0,
+        null,
+        null,
+        null,
+        0,
+        null,
+        0.06,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        null,
+        0,
+        null,
+        0,
+        null,
+        0,
+        0,
+        0,
+        null,
+        0,
+        null,
+        0,
+        0,
+        0,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+    },
+    {
+      name: 'arc__success',
+      config: {
+        displayName: 'Success',
+        color: {
+          fixedColor: 'green',
+          mode: 'fixed',
+        },
+      },
+      type: FieldType.number,
+      values: [
+        1, 1, 1, 1, 0, 1, 0.999931271795046, 0.9999982854540072, 0.9999993106537873, 1, 0.9999988795927239, 1,
+        0.9984939706365067, 0.9999936988458762, 0.9374731810143394, 0.9981691514900277, 1, 1, 1, 0.6918050349578433, 1,
+        1, 1, 1, 0.9649904403274051, 1, 1, 0.996693264215713, 0.9990646675327494, 1, 0.989711501101388, 1, 1, 1, 1, 1,
+        0.974376082211577, 1, 1, 0.9979501689527777, 0.9999554801847671, 0.7997517799066115, 0.998393334495106,
+        0.8077280841753209, 0.9999889402832068, 1, 0.9267936098112096, 1, 0.9678190225122817, 1, 0.9664342727367723, 1,
+        1, 1, 1, 1, 1, 0.49879813934581896, 0.8514429797914538, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+      ],
+    },
+    {
+      name: 'arc__failed',
+      config: {
+        displayName: 'Failed',
+        color: {
+          fixedColor: 'red',
+          mode: 'fixed',
+        },
+      },
+      type: FieldType.number,
+      values: [
+        0, 0, 0, 0, 1, 0, 0.00006872820495400671, 0.0000017145459928594954, 6.893462126672767e-7, 0,
+        0.000001120407275990985, 0, 0.001506029363493422, 0.000006301154123861364, 0.06252681898566055,
+        0.0018308485099723893, 0, 0, 0, 0.30819496504215677, 0, 0, 0, 0, 0.03500955967259495, 0, 0,
+        0.0033067357842869243, 0.0009353324672505954, 0, 0.01028849889861211, 0, 0, 0, 0, 0, 0.025623917788423094, 0, 0,
+        0.002049831047222383, 0.00004451981523281711, 0.20024822009338844, 0.001606665504893849, 0.19227191582467903,
+        0.000011059716793143872, 0, 0.07320639018879034, 0, 0.032180977487718344, 0, 0.03356572726322771, 0, 0, 0, 0, 0,
+        0, 0.501201860654181, 0.14855702020854625, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      ],
+    },
+  ],
+  meta: { preferredVisualisationType: 'nodeGraph' as const },
+  name: 'nodes',
+};
+
+export const edges = {
+  fields: [
+    {
+      name: NodeGraphDataFrameFieldNames.id,
+      type: FieldType.string,
+      values: [
+        'pantry-summary_candycon2000',
+        'compute-splines-api_candycon2000',
+        'compute-splines-api_send-notification',
+        'caramel-gateway_popcorn-distributor',
+        'caramel-gateway_candy-distributor',
+        'caramel-gateway_candy-query-frontend',
+        'caramel-gateway_candy-ruler',
+        'caramel-gateway_caramel-gateway',
+        'caramel-gateway_candy-querier',
+        'caramel-gateway_candy-chocolate-querier',
+        'caramel-gateway_candy-backend',
+        'caramel-gateway_candy-read',
+        'caramel-gateway_candy-write',
+        'caramel-gateway_popcorn-backend',
+        'caramel-gateway_popcorn-query-frontend',
+        'proxy-gateway_proxy-reads',
+        'proxy-gateway_proxy-writes',
+        'proxy-reads_caramel-gateway',
+        'proxy-writes_caramel-gateway',
+        'fudge-proxy-gateway_dentist',
+        'candy-admin-api_candy-distributor',
+        'candy-backend_candy-read',
+        'candy-backend_candy-write',
+        'candy-disposer_candy-distributor',
+        'candy-distributor_candy-ingester',
+        'candy-distributor_candy-distributor',
+        'candy-gateway_candy-admin-api',
+        'candy-gateway_candy-distributor',
+        'candy-gateway_candy-query-frontend',
+        'candy-chocolate-write-proxy_caramel-gateway',
+        'candy-ingester_candy-distributor',
+        'candy-querier_candy-ingester',
+        'candy-querier_candy-query-frontend',
+        'candy-querier_candy-store-gateway',
+        'candy-querier_candy-distributor',
+        'candy-query-frontend_candy-querier',
+        'candy-query-frontend_popcorn-querier',
+        'candy-query-frontend_candy-distributor',
+        'candy-query-scheduler_candy-distributor',
+        'candy-read_candy-backend',
+        'candy-read_candy-read',
+        'candy-read_candy-write',
+        'candy-read_popcorn-backend',
+        'candy-ruler_candy-ruler',
+        'candy-ruler_candy-ingester',
+        'candy-ruler_candy-query-frontend',
+        'candy-ruler_candy-distributor',
+        'candy-write_candy-write',
+        'controller_api',
+        'gateway_api',
+        'db_api',
+        'eggnog-query_marshmallow-popcorn-plugin',
+        'licorice-distributor_licorice-ingester',
+        'licorice-gateway_licorice-distributor',
+        'licorice-gateway_licorice-querier',
+        'licorice-gateway_licorice-query-frontend',
+        'licorice-gateway_licorice-ruler',
+        'licorice-gateway_licorice-read',
+        'licorice-gateway_licorice-write',
+        'licorice-querier_licorice-sugar-gateway',
+        'licorice-querier_licorice-ingester',
+        'licorice-querier_licorice-query-frontend',
+        'licorice-query-frontend_licorice-querier',
+        'licorice-query-scheduler_licorice-query-frontend',
+        'licorice-read_licorice-read',
+        'licorice-read_licorice-write',
+        'licorice-ruler_licorice-ingester',
+        'licorice-ruler_licorice-sugar-gateway',
+        'licorice-ruler_licorice-ruler',
+        'licorice-write_licorice-write',
+        'popcorn-backend_candy-read',
+        'popcorn-backend_candy-write',
+        'popcorn-distributor_candy-ingester',
+        'popcorn-distributor_popcorn-ingester',
+        'popcorn-querier_candy-ingester',
+        'popcorn-querier_candy-query-frontend',
+        'popcorn-querier_candy-store-gateway',
+        'popcorn-querier_popcorn-ingester',
+        'popcorn-querier_popcorn-query-frontend',
+        'popcorn-query-frontend_popcorn-querier',
+        'popcorn-ruler_candy-ingester',
+        'popcorn-ruler_popcorn-query-frontend',
+        'almondapi_peanutapi',
+        'peanutapi_0',
+        'peanutapi_worker',
+        'toffee-gateway_licorice-gateway',
+        'toffee-gateway_marshmallow-gateway',
+        'toffee-proxy-gateway_toffee-gateway',
+        'mints-agent_mints-distributor',
+        'mints-distributor_mints-ingester',
+        'marshmallow-gateway_marshmallow-query-frontend',
+        'marshmallow-querier_marshmallow-ingester',
+        'eating-scheduler_peanutapi',
+        'calorie-generator_compute-splines-api',
+        'worker_0',
+        'worker_worker',
+        'candy-backend_candy-backend',
+        'candy-gateway_candy-ruler',
+        'candy-packaging-exporter_candy-distributor',
+        'caramel-gateway_candy-chocolate-write-proxy',
+        'candy-manager_candy-distributor',
+        'candy-backend_popcorn-backend',
+        'candy-gateway_candy-manager',
+        'candy-gateway_candy-querier',
+        'candy-gateway_candy-store-gateway',
+        'candy-gateway_candy-disposer',
+        'candy-query-scheduler_candy-query-frontend',
+        'candy-store-gateway_candy-distributor',
+        'api_gateway',
+        'gateway_overeat-gateway',
+        'gateway_wrappers-api',
+        'overeat-gateway_overeat_api',
+        'overeat_api_gateway',
+        'wrappers-api_caramel-gateway',
+        'licorice-gateway_licorice-admin-api',
+        'popcorn-backend_popcorn-backend',
+        'popcorn-backend_candy-backend',
+        'almondops-gateway_almond',
+        'marshmallow-gateway_marshmallow-querier',
+      ],
+    },
+    {
+      name: NodeGraphDataFrameFieldNames.source,
+      type: FieldType.string,
+      config: {},
+      values: [
+        'pantry-summary',
+        'compute-splines-api',
+        'compute-splines-api',
+        'caramel-gateway',
+        'caramel-gateway',
+        'caramel-gateway',
+        'caramel-gateway',
+        'caramel-gateway',
+        'caramel-gateway',
+        'caramel-gateway',
+        'caramel-gateway',
+        'caramel-gateway',
+        'caramel-gateway',
+        'caramel-gateway',
+        'caramel-gateway',
+        'proxy-gateway',
+        'proxy-gateway',
+        'proxy-reads',
+        'proxy-writes',
+        'fudge-proxy-gateway',
+        'candy-admin-api',
+        'candy-backend',
+        'candy-backend',
+        'candy-disposer',
+        'candy-distributor',
+        'candy-distributor',
+        'candy-gateway',
+        'candy-gateway',
+        'candy-gateway',
+        'candy-chocolate-write-proxy',
+        'candy-ingester',
+        'candy-querier',
+        'candy-querier',
+        'candy-querier',
+        'candy-querier',
+        'candy-query-frontend',
+        'candy-query-frontend',
+        'candy-query-frontend',
+        'candy-query-scheduler',
+        'candy-read',
+        'candy-read',
+        'candy-read',
+        'candy-read',
+        'candy-ruler',
+        'candy-ruler',
+        'candy-ruler',
+        'candy-ruler',
+        'candy-write',
+        'controller',
+        'gateway',
+        'db',
+        'eggnog-query',
+        'licorice-distributor',
+        'licorice-gateway',
+        'licorice-gateway',
+        'licorice-gateway',
+        'licorice-gateway',
+        'licorice-gateway',
+        'licorice-gateway',
+        'licorice-querier',
+        'licorice-querier',
+        'licorice-querier',
+        'licorice-query-frontend',
+        'licorice-query-scheduler',
+        'licorice-read',
+        'licorice-read',
+        'licorice-ruler',
+        'licorice-ruler',
+        'licorice-ruler',
+        'licorice-write',
+        'popcorn-backend',
+        'popcorn-backend',
+        'popcorn-distributor',
+        'popcorn-distributor',
+        'popcorn-querier',
+        'popcorn-querier',
+        'popcorn-querier',
+        'popcorn-querier',
+        'popcorn-querier',
+        'popcorn-query-frontend',
+        'popcorn-ruler',
+        'popcorn-ruler',
+        'almondapi',
+        'peanutapi',
+        'peanutapi',
+        'toffee-gateway',
+        'toffee-gateway',
+        'toffee-proxy-gateway',
+        'mints-agent',
+        'mints-distributor',
+        'marshmallow-gateway',
+        'marshmallow-querier',
+        'eating-scheduler',
+        'calorie-generator',
+        'worker',
+        'worker',
+        'candy-backend',
+        'candy-gateway',
+        'candy-packaging-exporter',
+        'caramel-gateway',
+        'candy-manager',
+        'candy-backend',
+        'candy-gateway',
+        'candy-gateway',
+        'candy-gateway',
+        'candy-gateway',
+        'candy-query-scheduler',
+        'candy-store-gateway',
+        'api',
+        'gateway',
+        'gateway',
+        'overeat-gateway',
+        'overeat_api',
+        'wrappers-api',
+        'licorice-gateway',
+        'popcorn-backend',
+        'popcorn-backend',
+        'almondops-gateway',
+        'marshmallow-gateway',
+      ],
+    },
+    {
+      name: NodeGraphDataFrameFieldNames.target,
+      type: FieldType.string,
+      config: {},
+      values: [
+        'candycon2000',
+        'candycon2000',
+        'send-notification',
+        'popcorn-distributor',
+        'candy-distributor',
+        'candy-query-frontend',
+        'candy-ruler',
+        'caramel-gateway',
+        'candy-querier',
+        'candy-chocolate-querier',
+        'candy-backend',
+        'candy-read',
+        'candy-write',
+        'popcorn-backend',
+        'popcorn-query-frontend',
+        'proxy-reads',
+        'proxy-writes',
+        'caramel-gateway',
+        'caramel-gateway',
+        'dentist',
+        'candy-distributor',
+        'candy-read',
+        'candy-write',
+        'candy-distributor',
+        'candy-ingester',
+        'candy-distributor',
+        'candy-admin-api',
+        'candy-distributor',
+        'candy-query-frontend',
+        'caramel-gateway',
+        'candy-distributor',
+        'candy-ingester',
+        'candy-query-frontend',
+        'candy-store-gateway',
+        'candy-distributor',
+        'candy-querier',
+        'popcorn-querier',
+        'candy-distributor',
+        'candy-distributor',
+        'candy-backend',
+        'candy-read',
+        'candy-write',
+        'popcorn-backend',
+        'candy-ruler',
+        'candy-ingester',
+        'candy-query-frontend',
+        'candy-distributor',
+        'candy-write',
+        'api',
+        'api',
+        'api',
+        'marshmallow-popcorn-plugin',
+        'licorice-ingester',
+        'licorice-distributor',
+        'licorice-querier',
+        'licorice-query-frontend',
+        'licorice-ruler',
+        'licorice-read',
+        'licorice-write',
+        'licorice-sugar-gateway',
+        'licorice-ingester',
+        'licorice-query-frontend',
+        'licorice-querier',
+        'licorice-query-frontend',
+        'licorice-read',
+        'licorice-write',
+        'licorice-ingester',
+        'licorice-sugar-gateway',
+        'licorice-ruler',
+        'licorice-write',
+        'candy-read',
+        'candy-write',
+        'candy-ingester',
+        'popcorn-ingester',
+        'candy-ingester',
+        'candy-query-frontend',
+        'candy-store-gateway',
+        'popcorn-ingester',
+        'popcorn-query-frontend',
+        'popcorn-querier',
+        'candy-ingester',
+        'popcorn-query-frontend',
+        'peanutapi',
+        '0',
+        'worker',
+        'licorice-gateway',
+        'marshmallow-gateway',
+        'toffee-gateway',
+        'mints-distributor',
+        'mints-ingester',
+        'marshmallow-query-frontend',
+        'marshmallow-ingester',
+        'peanutapi',
+        'compute-splines-api',
+        '0',
+        'worker',
+        'candy-backend',
+        'candy-ruler',
+        'candy-distributor',
+        'candy-chocolate-write-proxy',
+        'candy-distributor',
+        'popcorn-backend',
+        'candy-manager',
+        'candy-querier',
+        'candy-store-gateway',
+        'candy-disposer',
+        'candy-query-frontend',
+        'candy-distributor',
+        'gateway',
+        'overeat-gateway',
+        'wrappers-api',
+        'overeat_api',
+        'gateway',
+        'caramel-gateway',
+        'licorice-admin-api',
+        'popcorn-backend',
+        'candy-backend',
+        'almond',
+        'marshmallow-querier',
+      ],
+    },
+    {
+      name: NodeGraphDataFrameFieldNames.mainStat,
+      config: {
+        unit: 'ms/r',
+        displayName: 'Average response time',
+      },
+      type: FieldType.number,
+      values: [
+        0.9961658833566494,
+        0.6756011854064742,
+        39.928285334583585,
+        9.655124202033475,
+        9.876837578844937,
+        81.6959176729049,
+        552.378420528502,
+        34.02406743798451,
+        2.7907819532876537,
+        null,
+        1210.5999270997852,
+        40.22305442474939,
+        11.008270340421854,
+        1163.33527417596,
+        199.9200764328362,
+        16.27026063145621,
+        19.87661445917064,
+        7.9747137654137195,
+        20.135808118892268,
+        0.22942839760131845,
+        11.6566561294579,
+        75.22426032984903,
+        0.7326871862490554,
+        10.591500091052806,
+        0.43709820361586454,
+        7.681333333333334,
+        null,
+        5.743161551306568,
+        22.56587650604559,
+        31.38290115791745,
+        11.375645375977152,
+        0.5974877233841939,
+        0.020271039373167783,
+        8.891949445529226,
+        10.293999999999995,
+        20.582963262267164,
+        405.7442187685195,
+        8.522692621843909,
+        6.924993219513745,
+        34.39516266769771,
+        5.952498150615941,
+        0.7842759237283988,
+        37.01067693570632,
+        6.956706372103876,
+        1.2689668998692378,
+        66.66971283621828,
+        13.622246129080805,
+        0.9078908605310487,
+        0.8179566076701271,
+        1.101057295936026,
+        19.887110234592154,
+        0.015141602590812384,
+        0.16393403903361325,
+        1.753552009081408,
+        1531278.5796188207,
+        46.231810748849455,
+        24.54774899949519,
+        345061.91461907607,
+        3.1331808761849147,
+        2.764448605690192,
+        2759.490189311903,
+        0.019420568056168524,
+        30.83859939288313,
+        0.026999999999999993,
+        2.405242467897073,
+        14607.641090479348,
+        11.449968675469439,
+        0.33363793667426944,
+        0.15786000187388566,
+        0.585213874210476,
+        41.39677023252635,
+        0.12979907013653832,
+        2.5827714948826848,
+        6.868234219946023,
+        21.107071160645475,
+        0.053417204821597085,
+        61.770970442855806,
+        42.998532007278904,
+        0.041043219084661645,
+        217.39742114991702,
+        0.21606213948511854,
+        13.174790215465455,
+        459.42768834463334,
+        0.30539630255527017,
+        447.5818111167013,
+        2.18723509171844,
+        3.22412985358373,
+        4.200223281332062,
+        16.03316977154454,
+        5.830408312271875,
+        1460.8431543525896,
+        6.379590630002257,
+        37.46723333208206,
+        16.20695699632165,
+        0.4593149548828589,
+        2693.186775574188,
+        0.034024049217002236,
+        196.843,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+    },
+    {
+      name: NodeGraphDataFrameFieldNames.secondaryStat,
+      config: {
+        unit: 'r/sec',
+        displayName: 'Requests per second',
+      },
+      type: FieldType.number,
+      values: [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        null,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0.03,
+        0,
+        null,
+        0,
+        0,
+        0,
+        0,
+        0.07,
+        0.01,
+        0,
+        0,
+        0.01,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0.02,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0.05,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+    },
+  ],
+  meta: { preferredVisualisationType: 'nodeGraph' as const },
+  name: 'edges',
+};
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/variables.ts b/public/app/plugins/datasource/grafana-testdata-datasource/variables.ts
index 0668a00e6c7a5..720d2bedeff99 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/variables.ts
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/variables.ts
@@ -1,10 +1,10 @@
 import { StandardVariableQuery, StandardVariableSupport } from '@grafana/data';
 
-import { TestData, TestDataQueryType } from './dataquery.gen';
+import { TestDataDataQuery, TestDataQueryType } from './dataquery';
 import { TestDataDataSource } from './datasource';
 
 export class TestDataVariableSupport extends StandardVariableSupport<TestDataDataSource> {
-  toDataQuery(query: StandardVariableQuery): TestData {
+  toDataQuery(query: StandardVariableQuery): TestDataDataQuery {
     return {
       refId: 'TestDataDataSource-QueryVariable',
       stringInput: query.query,
diff --git a/public/app/plugins/datasource/grafana/components/QueryEditor.tsx b/public/app/plugins/datasource/grafana/components/QueryEditor.tsx
index 4cdac71cc0f24..6ce90c7109741 100644
--- a/public/app/plugins/datasource/grafana/components/QueryEditor.tsx
+++ b/public/app/plugins/datasource/grafana/components/QueryEditor.tsx
@@ -6,7 +6,6 @@ import { DropEvent, FileRejection } from 'react-dropzone';
 import {
   QueryEditorProps,
   SelectableValue,
-  dataFrameFromJSON,
   rangeUtil,
   DataQueryRequest,
   DataFrame,
@@ -16,7 +15,7 @@ import {
   getValueFormat,
   formattedValueToString,
 } from '@grafana/data';
-import { config, getBackendSrv, getDataSourceSrv, reportInteraction } from '@grafana/runtime';
+import { config, getDataSourceSrv, reportInteraction } from '@grafana/runtime';
 import {
   InlineField,
   Select,
@@ -29,9 +28,11 @@ import {
   DropzoneFile,
   Themeable2,
   withTheme2,
+  Stack,
 } from '@grafana/ui';
 import { hasAlphaPanels } from 'app/core/config';
 import * as DFImport from 'app/features/dataframe-import';
+import { getManagedChannelInfo } from 'app/features/live/info';
 import { SearchQuery } from 'app/features/search/service';
 
 import { GrafanaDatasource } from '../datasource';
@@ -90,35 +91,9 @@ export class UnthemedQueryEditor extends PureComponent<Props, State> {
   }
 
   loadChannelInfo() {
-    getBackendSrv()
-      .fetch({ url: 'api/live/list' })
-      .subscribe({
-        next: (v: any) => {
-          const channelInfo = v.data?.channels as any[];
-          if (channelInfo?.length) {
-            const channelFields: Record<string, Array<SelectableValue<string>>> = {};
-            const channels: Array<SelectableValue<string>> = channelInfo.map((c) => {
-              if (c.data) {
-                const distinctFields = new Set<string>();
-                const frame = dataFrameFromJSON(c.data);
-                for (const f of frame.fields) {
-                  distinctFields.add(f.name);
-                }
-                channelFields[c.channel] = Array.from(distinctFields).map((n) => ({
-                  value: n,
-                  label: n,
-                }));
-              }
-              return {
-                value: c.channel,
-                label: c.channel + ' [' + c.minute_rate + ' msg/min]',
-              };
-            });
-
-            this.setState({ channelFields, channels });
-          }
-        },
-      });
+    getManagedChannelInfo().then((v) => {
+      this.setState(v);
+    });
   }
 
   loadFolderInfo() {
@@ -277,23 +252,22 @@ export class UnthemedQueryEditor extends PureComponent<Props, State> {
 
     return (
       <>
-        <div className="gf-form">
-          <InlineField label="Channel" grow={true} labelWidth={labelWidth}>
-            <Select
-              options={channels}
-              value={currentChannel || ''}
-              onChange={this.onChannelChange}
-              allowCustomValue={true}
-              backspaceRemovesValue={true}
-              placeholder="Select measurements channel"
-              isClearable={true}
-              noOptionsMessage="Enter channel name"
-              formatCreateLabel={(input: string) => `Connect to: ${input}`}
-            />
-          </InlineField>
-        </div>
+        <InlineField label="Channel" grow={true} labelWidth={labelWidth}>
+          <Select
+            options={channels}
+            value={currentChannel || ''}
+            onChange={this.onChannelChange}
+            allowCustomValue={true}
+            backspaceRemovesValue={true}
+            placeholder="Select measurements channel"
+            isClearable={true}
+            noOptionsMessage="Enter channel name"
+            formatCreateLabel={(input: string) => `Connect to: ${input}`}
+          />
+        </InlineField>
+
         {channel && (
-          <div className="gf-form">
+          <Stack direction="row" gap={0}>
             <InlineField label="Fields" grow={true} labelWidth={labelWidth}>
               <Select
                 options={fields}
@@ -319,7 +293,7 @@ export class UnthemedQueryEditor extends PureComponent<Props, State> {
                 spellCheck={false}
               />
             </InlineField>
-          </div>
+          </Stack>
         )}
 
         <Alert title="Grafana Live - Measurements" severity="info">
diff --git a/public/app/plugins/datasource/grafana/components/SearchEditor.tsx b/public/app/plugins/datasource/grafana/components/SearchEditor.tsx
index f0a52cdbe08ad..dea22b8b22e12 100644
--- a/public/app/plugins/datasource/grafana/components/SearchEditor.tsx
+++ b/public/app/plugins/datasource/grafana/components/SearchEditor.tsx
@@ -29,7 +29,7 @@ export default function SearchEditor({ value, onChange }: Props) {
     setJSON(JSON.stringify({ ...emptySearchQuery, ...value }, null, 2));
   }, [value]);
 
-  const handleSearchBlur = (e: React.FocusEvent<HTMLInputElement>) => {
+  const handleSearchBlur = () => {
     if (query !== value.query) {
       onChange({ ...value, query });
     }
@@ -39,12 +39,12 @@ export default function SearchEditor({ value, onChange }: Props) {
     if (e.key !== 'Enter') {
       return;
     }
-    handleSearchBlur(e as any);
+    handleSearchBlur();
   };
 
   const onSaveSearchJSON = (rawSearchJSON: string) => {
     try {
-      const searchQuery = JSON.parse(rawSearchJSON) as SearchQuery;
+      const searchQuery: SearchQuery = JSON.parse(rawSearchJSON);
       onChange(searchQuery);
       setQuery(searchQuery.query ?? '');
     } catch (ex) {
diff --git a/public/app/plugins/datasource/grafana/datasource.test.ts b/public/app/plugins/datasource/grafana/datasource.test.ts
index e526c0d43c984..5e9ee5a5d345b 100644
--- a/public/app/plugins/datasource/grafana/datasource.test.ts
+++ b/public/app/plugins/datasource/grafana/datasource.test.ts
@@ -22,7 +22,7 @@ describe('grafana data source', () => {
   });
 
   describe('when executing an annotations query', () => {
-    let calledBackendSrvParams: any;
+    let calledBackendSrvParams: Parameters<(typeof backendSrv)['get']>[1];
     let ds: GrafanaDatasource;
     beforeEach(() => {
       getMock.mockImplementation((url, options) => {
@@ -41,7 +41,7 @@ describe('grafana data source', () => {
       });
 
       it('should interpolate template variables in tags in query options', () => {
-        expect(calledBackendSrvParams.tags[0]).toBe('tag1:replaced');
+        expect(calledBackendSrvParams?.tags[0]).toBe('tag1:replaced');
       });
     });
 
@@ -53,8 +53,8 @@ describe('grafana data source', () => {
       });
 
       it('should interpolate template variables in tags in query options', () => {
-        expect(calledBackendSrvParams.tags[0]).toBe('replaced');
-        expect(calledBackendSrvParams.tags[1]).toBe('replaced2');
+        expect(calledBackendSrvParams?.tags[0]).toBe('replaced');
+        expect(calledBackendSrvParams?.tags[1]).toBe('replaced2');
       });
     });
 
@@ -72,7 +72,7 @@ describe('grafana data source', () => {
       });
 
       it('should remove tags from query options', () => {
-        expect(calledBackendSrvParams.tags).toBe(undefined);
+        expect(calledBackendSrvParams?.tags).toBe(undefined);
       });
     });
   });
diff --git a/public/app/plugins/datasource/grafana/datasource.ts b/public/app/plugins/datasource/grafana/datasource.ts
index 7b0d886eb11e1..698db42459d93 100644
--- a/public/app/plugins/datasource/grafana/datasource.ts
+++ b/public/app/plugins/datasource/grafana/datasource.ts
@@ -60,7 +60,7 @@ export class GrafanaDatasource extends DataSourceWithBackend<GrafanaQuery> {
             datasource = ref;
           }
         } else {
-          datasource = anno.datasource as DataSourceRef;
+          datasource = anno.datasource;
         }
 
         // Filter from streaming query conflicts with filter from annotations
@@ -170,7 +170,7 @@ export class GrafanaDatasource extends DataSourceWithBackend<GrafanaQuery> {
     return of(); // nothing
   }
 
-  listFiles(path: string): Observable<DataFrameView<FileElement>> {
+  listFiles(path: string, maxDataPoints?: number): Observable<DataFrameView<FileElement>> {
     return this.query({
       targets: [
         {
@@ -179,6 +179,7 @@ export class GrafanaDatasource extends DataSourceWithBackend<GrafanaQuery> {
           path,
         },
       ],
+      maxDataPoints,
     } as any).pipe(
       map((v) => {
         const frame = v.data[0] ?? new MutableDataFrame();
@@ -187,7 +188,7 @@ export class GrafanaDatasource extends DataSourceWithBackend<GrafanaQuery> {
     );
   }
 
-  metricFindQuery(options: any) {
+  metricFindQuery() {
     return Promise.resolve([]);
   }
 
@@ -215,7 +216,7 @@ export class GrafanaDatasource extends DataSourceWithBackend<GrafanaQuery> {
 
     if (target.type === GrafanaAnnotationType.Dashboard) {
       // if no dashboard id yet return
-      if (!options.dashboard.uid) {
+      if (!options.dashboard?.uid) {
         return Promise.resolve({ data: [] });
       }
       // filter by dashboard id
@@ -231,7 +232,7 @@ export class GrafanaDatasource extends DataSourceWithBackend<GrafanaQuery> {
       const delimiter = '__delimiter__';
       const tags = [];
       for (const t of params.tags) {
-        const renderedValues = templateSrv.replace(t, {}, (value: any) => {
+        const renderedValues = templateSrv.replace(t, {}, (value: string | string[]) => {
           if (typeof value === 'string') {
             return value;
           }
diff --git a/public/app/plugins/datasource/graphite/components/FunctionEditor.tsx b/public/app/plugins/datasource/graphite/components/FunctionEditor.tsx
index 8971466e2193b..44ced255c2dba 100644
--- a/public/app/plugins/datasource/graphite/components/FunctionEditor.tsx
+++ b/public/app/plugins/datasource/graphite/components/FunctionEditor.tsx
@@ -2,7 +2,7 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Icon, Tooltip, useStyles2 } from '@grafana/ui';
+import { Icon, Tooltip, useStyles2, type PopoverContent } from '@grafana/ui';
 
 import { FuncInstance } from '../gfunc';
 
@@ -14,12 +14,12 @@ interface FunctionEditorProps extends FunctionEditorControlsProps {
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
-    icon: css`
-      margin-right: ${theme.spacing(0.5)};
-    `,
+    icon: css({
+      marginRight: theme.spacing(0.5),
+    }),
     label: css({
       fontWeight: theme.typography.fontWeightMedium,
-      fontSize: theme.typography.bodySmall.fontSize, // to match .gf-form-label
+      fontSize: theme.typography.bodySmall.fontSize,
       cursor: 'pointer',
       display: 'inline-block',
     }),
@@ -29,17 +29,17 @@ const getStyles = (theme: GrafanaTheme2) => {
 const FunctionEditor = ({ onMoveLeft, onMoveRight, func, ...props }: FunctionEditorProps) => {
   const styles = useStyles2(getStyles);
 
-  const renderContent = ({ updatePopperPosition }: any) => (
+  const renderContent: PopoverContent = ({ updatePopperPosition }) => (
     <FunctionEditorControls
       {...props}
       func={func}
       onMoveLeft={() => {
         onMoveLeft(func);
-        updatePopperPosition();
+        updatePopperPosition?.();
       }}
       onMoveRight={() => {
         onMoveRight(func);
-        updatePopperPosition();
+        updatePopperPosition?.();
       }}
     />
   );
diff --git a/public/app/plugins/datasource/graphite/datasource.test.ts b/public/app/plugins/datasource/graphite/datasource.test.ts
index bb63f70c46415..7259c6de52c04 100644
--- a/public/app/plugins/datasource/graphite/datasource.test.ts
+++ b/public/app/plugins/datasource/graphite/datasource.test.ts
@@ -2,7 +2,14 @@ import { isArray } from 'lodash';
 import { of } from 'rxjs';
 import { createFetchResponse } from 'test/helpers/createFetchResponse';
 
-import { AbstractLabelMatcher, AbstractLabelOperator, getFrameDisplayName, dateTime } from '@grafana/data';
+import {
+  AbstractLabelMatcher,
+  AbstractLabelOperator,
+  getFrameDisplayName,
+  dateTime,
+  DataQueryRequest,
+  MetricFindValue,
+} from '@grafana/data';
 import { BackendSrvRequest } from '@grafana/runtime';
 import { backendSrv } from 'app/core/services/backend_srv'; // will use the version in __mocks__
 import { TemplateSrv } from 'app/features/templating/template_srv';
@@ -120,7 +127,7 @@ describe('graphiteDatasource', () => {
       maxDataPoints: 500,
     };
 
-    let response: any;
+    let response: unknown;
     let requestOptions: BackendSrvRequest;
 
     beforeEach(() => {
@@ -139,7 +146,7 @@ describe('graphiteDatasource', () => {
         );
       });
 
-      response = ctx.ds.query(query as any);
+      response = ctx.ds.query(query as unknown as DataQueryRequest<GraphiteQuery>);
     });
 
     it('X-Dashboard and X-Panel headers to be set!', () => {
@@ -411,7 +418,7 @@ describe('graphiteDatasource', () => {
   });
 
   describe('querying for template variables', () => {
-    let results: any;
+    let results: MetricFindValue[];
     let requestOptions: BackendSrvRequest;
 
     beforeEach(() => {
@@ -503,7 +510,7 @@ describe('graphiteDatasource', () => {
           current: { value: ['bar'] },
         },
       ]);
-      ctx.ds.metricFindQuery('[[foo]]').then((data: any) => {
+      ctx.ds.metricFindQuery('[[foo]]').then((data) => {
         results = data;
       });
       expect(requestOptions.url).toBe('/api/datasources/proxy/1/metrics/find');
diff --git a/public/app/plugins/datasource/graphite/datasource.ts b/public/app/plugins/datasource/graphite/datasource.ts
index 2577d402e2f26..90ce33533e392 100644
--- a/public/app/plugins/datasource/graphite/datasource.ts
+++ b/public/app/plugins/datasource/graphite/datasource.ts
@@ -28,7 +28,7 @@ import { getRollupNotice, getRuntimeConsolidationNotice } from 'app/plugins/data
 
 import { AnnotationEditor } from './components/AnnotationsEditor';
 import { convertToGraphiteQueryObject } from './components/helpers';
-import gfunc, { FuncDefs, FuncInstance } from './gfunc';
+import gfunc, { FuncDef, FuncDefs, FuncInstance } from './gfunc';
 import GraphiteQueryModel from './graphite_query';
 import { prepareAnnotation } from './migrations';
 // Types
@@ -78,7 +78,7 @@ export class GraphiteDatasource
   cacheTimeout: any;
   withCredentials: boolean;
   funcDefs: FuncDefs | null = null;
-  funcDefsPromise: Promise<any> | null = null;
+  funcDefsPromise: Promise<FuncDefs> | null = null;
   _seriesRefLetters: string;
   requestCounter = 100;
   private readonly metricMappings: GraphiteLokiMapping[];
@@ -246,7 +246,10 @@ export class GraphiteDatasource
     return this.doGraphiteRequest(httpOptions).pipe(map(this.convertResponseToDataFrames));
   }
 
-  addTracingHeaders(httpOptions: { headers: any }, options: { dashboardId?: number; panelId?: number }) {
+  addTracingHeaders(
+    httpOptions: { headers: any },
+    options: { dashboardId?: number; panelId?: number; panelPluginId?: string }
+  ) {
     const proxyMode = !this.url.match(/^http/);
     if (proxyMode) {
       if (options.dashboardId) {
@@ -255,6 +258,9 @@ export class GraphiteDatasource
       if (options.panelId) {
         httpOptions.headers['X-Panel-Id'] = options.panelId;
       }
+      if (options.panelPluginId) {
+        httpOptions.headers['X-Panel-Plugin-Id'] = options.panelPluginId;
+      }
     }
   }
 
@@ -371,7 +377,7 @@ export class GraphiteDatasource
 
       return lastValueFrom(
         this.query(graphiteQuery).pipe(
-          map((result: any) => {
+          map((result) => {
             const list = [];
 
             for (let i = 0; i < result.data.length; i++) {
@@ -400,7 +406,7 @@ export class GraphiteDatasource
     } else {
       // Graphite event/tag as annotation
       const tags = this.templateSrv.replace(target.tags?.join(' '));
-      return this.events({ range: range, tags: tags }).then((results: any) => {
+      return this.events({ range: range, tags: tags }).then((results) => {
         const list = [];
         if (!isArray(results.data)) {
           console.error(`Unable to get annotations from ${results.url}.`);
@@ -827,7 +833,7 @@ export class GraphiteDatasource
     );
   }
 
-  createFuncInstance(funcDef: any, options?: any): FuncInstance {
+  createFuncInstance(funcDef: string | FuncDef, options?: any): FuncInstance {
     return gfunc.createFuncInstance(funcDef, options, this.funcDefs);
   }
 
@@ -870,7 +876,7 @@ export class GraphiteDatasource
           this.funcDefs = gfunc.parseFuncDefs(fixedData);
           return this.funcDefs;
         }),
-        catchError((error: any) => {
+        catchError((error) => {
           console.error('Fetching graphite functions error', error);
           this.funcDefs = gfunc.getFuncDefs(this.graphiteVersion);
           return of(this.funcDefs);
@@ -924,7 +930,7 @@ export class GraphiteDatasource
     return getBackendSrv()
       .fetch(options)
       .pipe(
-        catchError((err: any) => {
+        catchError((err) => {
           return throwError(reduceError(err));
         })
       );
@@ -941,7 +947,7 @@ export class GraphiteDatasource
 
     options['format'] = 'json';
 
-    function fixIntervalFormat(match: any) {
+    function fixIntervalFormat(match: string) {
       return match.replace('m', 'min').replace('M', 'mon');
     }
 
@@ -1007,7 +1013,7 @@ function supportsFunctionIndex(version: string): boolean {
 
 function mapToTags(): OperatorFunction<any, Array<{ text: string }>> {
   return pipe(
-    map((results: any) => {
+    map((results) => {
       if (results.data) {
         return _map(results.data, (value) => {
           return { text: value };
diff --git a/public/app/plugins/datasource/graphite/gfunc.ts b/public/app/plugins/datasource/graphite/gfunc.ts
index ffec5cfa70306..a8bc886e3e4df 100644
--- a/public/app/plugins/datasource/graphite/gfunc.ts
+++ b/public/app/plugins/datasource/graphite/gfunc.ts
@@ -1061,7 +1061,7 @@ export class FuncInstance {
     return str + parameters.join(', ') + ')';
   }
 
-  _hasMultipleParamsInString(strValue: any, index: number) {
+  _hasMultipleParamsInString(strValue: string, index: number) {
     if (strValue.indexOf(',') === -1) {
       return false;
     }
@@ -1077,7 +1077,7 @@ export class FuncInstance {
     return false;
   }
 
-  updateParam(strValue: any, index: any) {
+  updateParam(strValue: string, index: number) {
     // handle optional parameters
     // if string contains ',' and next param is optional, split and update both
     if (this._hasMultipleParamsInString(strValue, index)) {
@@ -1109,7 +1109,7 @@ export class FuncInstance {
   }
 }
 
-function createFuncInstance(funcDef: any, options?: { withDefaultParams: any }, idx?: any): FuncInstance {
+function createFuncInstance(funcDef: FuncDef | string, options?: { withDefaultParams: any }, idx?: any): FuncInstance {
   if (isString(funcDef)) {
     funcDef = getFuncDef(funcDef, idx);
   }
diff --git a/public/app/plugins/datasource/graphite/graphite_query.ts b/public/app/plugins/datasource/graphite/graphite_query.ts
index c8e7254b78c47..94e2d7db4ef1c 100644
--- a/public/app/plugins/datasource/graphite/graphite_query.ts
+++ b/public/app/plugins/datasource/graphite/graphite_query.ts
@@ -114,6 +114,8 @@ export default class GraphiteQuery {
         // bug fix for parsing multiple functions as params
         handleMultipleSeriesByTagsParams(astNode);
 
+        handleDivideSeriesListsNestedFunctions(astNode);
+
         each(astNode.params, (param) => {
           this.parseTargetRecursive(param, innerFunc);
         });
@@ -159,11 +161,11 @@ export default class GraphiteQuery {
     this.segments.push({ value: 'select metric' });
   }
 
-  addFunction(newFunc: any) {
+  addFunction(newFunc: FuncInstance) {
     this.functions.push(newFunc);
   }
 
-  addFunctionParameter(func: any, value: string) {
+  addFunctionParameter(func: FuncInstance, value: string) {
     if (func.params.length >= func.def.params.length && !get(last(func.def.params), 'multiple', false)) {
       throw { message: 'too many parameters for function ' + func.def.name };
     }
@@ -174,13 +176,13 @@ export default class GraphiteQuery {
     this.functions = without(this.functions, func);
   }
 
-  moveFunction(func: any, offset: number) {
+  moveFunction(func: FuncInstance, offset: number) {
     const index = this.functions.indexOf(func);
     arrayMove(this.functions, index, index + offset);
   }
 
   updateModelTarget(targets: any) {
-    const wrapFunction = (target: string, func: any) => {
+    const wrapFunction = (target: string, func: FuncInstance) => {
       return func.render(target, (value: string) => {
         return this.templateSrv.replace(value, this.scopedVars);
       });
@@ -367,3 +369,67 @@ function handleMultipleSeriesByTagsParams(astNode: AstNode) {
     });
   }
 }
+
+/**
+ * Converts all nested functions as parametors (recursively) to strings
+ */
+function handleDivideSeriesListsNestedFunctions(astNode: AstNode) {
+  // if divideSeriesLists function, the second parameters should be strings
+  if (astNode.name === 'divideSeriesLists' && astNode.params && astNode.params.length >= 2) {
+    astNode.params = astNode.params.map((p: AstNode, idx: number) => {
+      if (idx === 1 && p.type === 'function') {
+        // convert nested 2nd functions as parametors to a strings
+        // all nested functions should be strings
+        // if the node is a function it will have params
+        // if these params are functions, they will have params
+        // at some point we will have to add the params as strings
+        // then wrap them in the function
+        let functionString = '';
+        let s = p.name + '(' + nestedFunctionsToString(p, functionString);
+
+        p = {
+          type: 'string',
+          value: s,
+        };
+      }
+
+      return p;
+    });
+  }
+
+  return astNode;
+}
+
+function nestedFunctionsToString(node: AstNode, functionString: string): string | undefined {
+  let count = 0;
+  if (node.params) {
+    count++;
+
+    const paramsLength = node.params?.length ?? 0;
+
+    node.params.forEach((innerNode: AstNode, idx: number) => {
+      if (idx < paramsLength - 1) {
+        functionString += switchCase(innerNode, functionString) + ',';
+      } else {
+        functionString += switchCase(innerNode, functionString);
+      }
+    });
+
+    return functionString + ')';
+  } else {
+    return (functionString += switchCase(node, functionString));
+  }
+}
+
+function switchCase(node: AstNode, functionString: string) {
+  switch (node.type) {
+    case 'function':
+      functionString += node.name + '(';
+      return nestedFunctionsToString(node, functionString);
+    case 'metric':
+      const segmentString = join(map(node.segments, 'value'), '.');
+      return segmentString;
+    default:
+      return node.value;
+  }
+}
diff --git a/public/app/plugins/datasource/graphite/parser.ts b/public/app/plugins/datasource/graphite/parser.ts
index 5ee0e44332bdb..315d4509c08dc 100644
--- a/public/app/plugins/datasource/graphite/parser.ts
+++ b/public/app/plugins/datasource/graphite/parser.ts
@@ -276,12 +276,12 @@ export class Parser {
     return this.tokens[this.index - 1];
   }
 
-  matchToken(type: any, index: number) {
+  matchToken(type: string, index: number) {
     const token = this.tokens[this.index + index];
     return (token === undefined && type === '') || (token && token.type === type);
   }
 
-  match(token1: any, token2?: any) {
+  match(token1: string, token2?: string) {
     return this.matchToken(token1, 0) && (!token2 || this.matchToken(token2, 1));
   }
 }
diff --git a/public/app/plugins/datasource/graphite/specs/graphite_query.test.ts b/public/app/plugins/datasource/graphite/specs/graphite_query.test.ts
index 014a2189bea5f..a02456b64a9ad 100644
--- a/public/app/plugins/datasource/graphite/specs/graphite_query.test.ts
+++ b/public/app/plugins/datasource/graphite/specs/graphite_query.test.ts
@@ -111,11 +111,11 @@ describe('Graphite query model', () => {
     });
   });
 
-  describe('when query has multiple seriesByTags functions as parameters it updates the model target correctly', () => {
+  describe('When the second parameter of a function is a function, the graphite parser breaks', () => {
     /* 
       all functions that take parameters as functions can have a bug where writing a query
-      in code with two seriesByTags funcs as params and then 
-      switching from code to builder parsers the second function in a way that 
+      in code where the second parameter of the function IS A FUNCTION, 
+      then switching from code to builder parsers the second function in a way that 
       changes the order of the params and wraps the first param in the second param.
       
       asPercent(seriesByTag('namespace=asd'), (seriesByTag('namespace=fgh')) 
@@ -126,33 +126,123 @@ describe('Graphite query model', () => {
       where each function is wrapped in another function
       https://github.com/grafana/grafana/blob/main/public/app/plugins/datasource/graphite/graphite_query.ts#LL187C8-L187C8
 
-      Parsing the second seriesByTag function as param as a string fixes this issue 
+      Parsing the second "function as param" as a string fixes this issue 
 
       This is one of the edge cases that could be a reason for either refactoring or rebuilding the Graphite query builder
     */
-    beforeEach(() => {
-      ctx.target = { refId: 'A', target: `asPercent(seriesByTag('namespace=asd'), seriesByTag('namespace=fgh'))` };
-      ctx.targets = [ctx.target];
-      ctx.queryModel = new GraphiteQuery(ctx.datasource, ctx.target, ctx.templateSrv);
+    describe('when query has multiple seriesByTags functions as parameters it updates the model target correctly', () => {
+      beforeEach(() => {
+        ctx.target = { refId: 'A', target: `asPercent(seriesByTag('namespace=asd'), seriesByTag('namespace=fgh'))` };
+        ctx.targets = [ctx.target];
+        ctx.queryModel = new GraphiteQuery(ctx.datasource, ctx.target, ctx.templateSrv);
+      });
+
+      it('should parse the second function param as a string and not a second function', () => {
+        const targets = [
+          {
+            refId: 'A',
+            datasource: {
+              type: 'graphite',
+              uid: 'zzz',
+            },
+            target: "asPercent(seriesByTag('namespace=jkl'), seriesByTag('namespace=fgh'))",
+            textEditor: false,
+            key: '123',
+          },
+        ];
+        expect(ctx.queryModel.segments.length).toBe(0);
+        expect(ctx.queryModel.functions.length).toBe(2);
+        ctx.queryModel.updateModelTarget(targets);
+        expect(ctx.queryModel.target.target).not.toContain('seriesByTag(seriesByTag(');
+      });
     });
 
-    it('should parse the second function param as a string and not a second function', () => {
-      const targets = [
-        {
+    describe('when query has divideSeriesLists function where second parameter is a function is parses correctly', () => {
+      it('should parse the second function param as a string and not parse it as a second function', () => {
+        const functionAsParam = 'scaleToSeconds(carbon.agents.0df7e0ba2701-a.cache.queries,1)';
+
+        ctx.target = {
           refId: 'A',
-          datasource: {
-            type: 'graphite',
-            uid: 'zzz',
+          target: `divideSeriesLists(scaleToSeconds(nonNegativeDerivative(carbon.agents.0df7e0ba2701-a.cache.queries), 1), ${functionAsParam})`,
+        };
+        ctx.targets = [ctx.target];
+        ctx.queryModel = new GraphiteQuery(ctx.datasource, ctx.target, ctx.templateSrv);
+
+        const targets = [
+          {
+            refId: 'A',
+            datasource: {
+              type: 'graphite',
+              uid: 'zzz',
+            },
+            target: `divideSeriesLists(scaleToSeconds(nonNegativeDerivative(carbon.agents.0df7e0ba2701-a.cache.queries), 1), ${functionAsParam})`,
+            textEditor: false,
+            key: '123',
           },
-          target: "asPercent(seriesByTag('namespace=jkl'), seriesByTag('namespace=fgh'))",
-          textEditor: false,
-          key: '123',
-        },
-      ];
-      expect(ctx.queryModel.segments.length).toBe(0);
-      expect(ctx.queryModel.functions.length).toBe(2);
-      ctx.queryModel.updateModelTarget(targets);
-      expect(ctx.queryModel.target.target).not.toContain('seriesByTag(seriesByTag(');
+        ];
+        expect(ctx.queryModel.segments.length).toBe(5);
+        expect(ctx.queryModel.functions.length).toBe(3);
+        ctx.queryModel.updateModelTarget(targets);
+        expect(ctx.queryModel.target.target).toContain(functionAsParam);
+      });
+
+      it('should recursively parse a second function argument that contains another function as a string', () => {
+        const nestedFunctionAsParam =
+          'scaleToSeconds(nonNegativeDerivative(carbon.agents.0df7e0ba2701-a.cache.queries,1))';
+
+        ctx.target = {
+          refId: 'A',
+          target: `divideSeriesLists(scaleToSeconds(nonNegativeDerivative(carbon.agents.0df7e0ba2701-a.cache.queries), 1), ${nestedFunctionAsParam})`,
+        };
+        ctx.targets = [ctx.target];
+        ctx.queryModel = new GraphiteQuery(ctx.datasource, ctx.target, ctx.templateSrv);
+
+        const targets = [
+          {
+            refId: 'A',
+            datasource: {
+              type: 'graphite',
+              uid: 'zzz',
+            },
+            target: `divideSeriesLists(scaleToSeconds(nonNegativeDerivative(carbon.agents.0df7e0ba2701-a.cache.queries), 1), ${nestedFunctionAsParam})`,
+            textEditor: false,
+            key: '123',
+          },
+        ];
+        expect(ctx.queryModel.segments.length).toBe(5);
+        expect(ctx.queryModel.functions.length).toBe(3);
+        ctx.queryModel.updateModelTarget(targets);
+        expect(ctx.queryModel.target.target).toContain(nestedFunctionAsParam);
+      });
+
+      it('should recursively parse a second function argument where the first argument is a series', () => {
+        const nestedFunctionAsParam =
+          'scaleToSeconds(nonNegativeDerivative(carbon.agents.0df7e0ba2701-a.cache.queries,1))';
+
+        ctx.target = {
+          refId: 'A',
+          target: `divideSeriesLists(carbon.agents.0df7e0ba2701-a.cache.queries, ${nestedFunctionAsParam})`,
+        };
+        ctx.targets = [ctx.target];
+        ctx.queryModel = new GraphiteQuery(ctx.datasource, ctx.target, ctx.templateSrv);
+
+        const targets = [
+          {
+            refId: 'A',
+            datasource: {
+              type: 'graphite',
+              uid: 'zzz',
+            },
+            target: `divideSeriesLists(scaleToSeconds(nonNegativeDerivative(carbon.agents.0df7e0ba2701-a.cache.queries), 1), ${nestedFunctionAsParam})`,
+            textEditor: false,
+            key: '123',
+          },
+        ];
+        expect(ctx.queryModel.segments.length).toBe(5);
+        expect(ctx.queryModel.functions.length).toBe(1);
+        ctx.queryModel.updateModelTarget(targets);
+        expect(ctx.queryModel.target.target).toContain(nestedFunctionAsParam);
+      });
     });
   });
 });
diff --git a/public/app/plugins/datasource/graphite/state/context.tsx b/public/app/plugins/datasource/graphite/state/context.tsx
index cac739a125193..ba48d3a759d59 100644
--- a/public/app/plugins/datasource/graphite/state/context.tsx
+++ b/public/app/plugins/datasource/graphite/state/context.tsx
@@ -76,7 +76,7 @@ export const GraphiteQueryEditorContext = ({
     () => {
       if (needsRefresh && state) {
         setNeedsRefresh(false);
-        onChange({ ...query, target: state.target.target });
+        onChange({ ...query, target: state.target.target, targetFull: state.target.targetFull });
         onRunQuery();
       }
     },
@@ -92,8 +92,8 @@ export const GraphiteQueryEditorContext = ({
         datasource: datasource,
         range: range,
         templateSrv: getTemplateSrv(),
-        // list of queries is passed only when the editor is in Dashboards. This is to allow interpolation
-        // of sub-queries which are stored in "targetFull" property used by alerting in the backend.
+        // list of queries is passed only when the editor is in Dashboards or Alerting. This is to allow interpolation
+        // of sub-queries which are stored in "targetFull" property. This is used by alerting in the backend.
         queries: queries || [],
         refresh: () => {
           // do not run onChange/onRunQuery straight away to ensure the internal state gets updated first
diff --git a/public/app/plugins/datasource/graphite/state/store.ts b/public/app/plugins/datasource/graphite/state/store.ts
index 2bd3842df780f..0081c2bd0eab6 100644
--- a/public/app/plugins/datasource/graphite/state/store.ts
+++ b/public/app/plugins/datasource/graphite/state/store.ts
@@ -8,7 +8,7 @@ import { TemplateSrv } from '../../../../features/templating/template_srv';
 import { GraphiteDatasource } from '../datasource';
 import { FuncDefs } from '../gfunc';
 import GraphiteQuery, { GraphiteTarget } from '../graphite_query';
-import { GraphiteSegment, GraphiteTagOperator } from '../types';
+import { GraphiteSegment } from '../types';
 
 import { actions } from './actions';
 import {
@@ -91,7 +91,7 @@ const reducer = async (action: Action, state: GraphiteQueryEditorState): Promise
         fake: false,
       };
     } else {
-      segment = segmentOrString as GraphiteSegment;
+      segment = segmentOrString;
     }
 
     state.error = null;
@@ -131,7 +131,7 @@ const reducer = async (action: Action, state: GraphiteQueryEditorState): Promise
   if (actions.addNewTag.match(action)) {
     const segment = action.payload.segment;
     const newTagKey = segment.value;
-    const newTag = { key: newTagKey, operator: '=' as GraphiteTagOperator, value: '' };
+    const newTag = { key: newTagKey, operator: '=' as const, value: '' };
     state.queryModel.addTag(newTag);
     handleTargetChanged(state);
   }
diff --git a/public/app/plugins/datasource/graphite/types.ts b/public/app/plugins/datasource/graphite/types.ts
index 0bdd7039ebc20..fb2bbe6363951 100644
--- a/public/app/plugins/datasource/graphite/types.ts
+++ b/public/app/plugins/datasource/graphite/types.ts
@@ -14,6 +14,7 @@ export interface GraphiteQuery extends DataQuery {
   queryType?: string;
   textEditor?: boolean;
   target?: string;
+  targetFull?: string;
   tags?: string[];
   fromAnnotations?: boolean;
 }
diff --git a/public/app/plugins/datasource/graphite/utils.ts b/public/app/plugins/datasource/graphite/utils.ts
index 88f0a5332cd7e..c8de42fac29d7 100644
--- a/public/app/plugins/datasource/graphite/utils.ts
+++ b/public/app/plugins/datasource/graphite/utils.ts
@@ -8,7 +8,7 @@ import { GraphiteParserError } from './types';
  * This function removes all HTML tags and keeps only the last line from the stack
  * trace which should be the most meaningful.
  */
-export function reduceError(error: any): any {
+export function reduceError(error: any) {
   if (error && error.status === 500 && error.data?.message?.startsWith('<body')) {
     // Remove all HTML tags and take the last line from the stack trace
     const newMessage = last<string>(
diff --git a/public/app/plugins/datasource/influxdb/components/editor/annotation/AnnotationEditor.tsx b/public/app/plugins/datasource/influxdb/components/editor/annotation/AnnotationEditor.tsx
index d8ba3b533f63d..91d289c175529 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/annotation/AnnotationEditor.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/annotation/AnnotationEditor.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 
 import { QueryEditorProps } from '@grafana/data/src';
-import { InlineFormLabel, Input } from '@grafana/ui/src';
+import { InlineFormLabel, Input, Stack } from '@grafana/ui/src';
 
 import InfluxDatasource from '../../../datasource';
 import { InfluxOptions, InfluxQuery } from '../../../types';
@@ -24,60 +24,63 @@ export const AnnotationEditor = (props: QueryEditorProps<InfluxDatasource, Influ
     });
   };
   return (
-    <div className="gf-form-group">
-      <div className="gf-form">
-        <InlineFormLabel width={12}>InfluxQL Query</InlineFormLabel>
-        <Input
-          value={eventQuery}
-          onChange={(e) => setEventQuery(e.currentTarget.value ?? '')}
-          onBlur={() => updateValue('query', eventQuery)}
-          placeholder="select text from events where $timeFilter limit 1000"
-        />
-      </div>
-      <InlineFormLabel
-        width={12}
-        tooltip={
-          <div>
-            If your influxdb query returns more than one field you need to specify the column names below. An annotation
-            event is composed of a title, tags, and an additional text field. Optionally you can map the timeEnd column
-            for region annotation usage.
-          </div>
-        }
-      >
-        Field mappings
-      </InlineFormLabel>
-      <div className="gf-form-group">
-        <div className="gf-form-inline">
-          <div className="gf-form">
+    <Stack gap={5} direction="column">
+      <Stack gap={0.5} direction="column">
+        <Stack gap={0}>
+          <InlineFormLabel width={12}>InfluxQL Query</InlineFormLabel>
+          <Input
+            value={eventQuery}
+            onChange={(e) => setEventQuery(e.currentTarget.value ?? '')}
+            onBlur={() => updateValue('query', eventQuery)}
+            placeholder="select text from events where $timeFilter limit 1000"
+          />
+        </Stack>
+        <InlineFormLabel
+          width={12}
+          tooltip={
+            <div>
+              If your influxdb query returns more than one field you need to specify the column names below. An
+              annotation event is composed of a title, tags, and an additional text field. Optionally you can map the
+              timeEnd column for region annotation usage.
+            </div>
+          }
+        >
+          Field mappings
+        </InlineFormLabel>
+        <Stack gap={0.5} alignItems={'flex-start'} wrap={'wrap'}>
+          <Stack gap={0}>
             <InlineFormLabel width={12}>Text</InlineFormLabel>
             <Input
               value={textColumn}
               onChange={(e) => setTextColumn(e.currentTarget.value ?? '')}
               onBlur={() => updateValue('textColumn', textColumn)}
             />
-          </div>
-          <div className="gf-form">
+          </Stack>
+          <Stack gap={0}>
             <InlineFormLabel width={12}>Tags</InlineFormLabel>
             <Input
               value={tagsColumn}
               onChange={(e) => setTagsColumn(e.currentTarget.value ?? '')}
               onBlur={() => updateValue('tagsColumn', tagsColumn)}
             />
-          </div>
-          <div className="gf-form">
+          </Stack>
+
+          <Stack gap={0}>
             <InlineFormLabel width={12}>TimeEnd</InlineFormLabel>
             <Input
               value={timeEndColumn}
               onChange={(e) => setTimeEndColumn(e.currentTarget.value ?? '')}
               onBlur={() => updateValue('timeEndColumn', timeEndColumn)}
             />
-          </div>
+          </Stack>
           <div className="gf-form ng-hide">
             <InlineFormLabel width={12}>Title</InlineFormLabel>
             <Input defaultValue={titleColumn} />
           </div>
-        </div>
-      </div>
-    </div>
+        </Stack>
+      </Stack>
+      {/*Empty div to preserve the bottom margin */}
+      <div />
+    </Stack>
   );
 };
diff --git a/public/app/plugins/datasource/influxdb/components/editor/config/InfluxFluxConfig.tsx b/public/app/plugins/datasource/influxdb/components/editor/config/InfluxFluxConfig.tsx
index dd28a7c73b3f9..442e6f85f8132 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/config/InfluxFluxConfig.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/config/InfluxFluxConfig.tsx
@@ -11,7 +11,7 @@ import { InlineField, InlineFieldRow, Input, SecretInput } from '@grafana/ui';
 
 import { InfluxOptions, InfluxSecureJsonData } from '../../../types';
 
-const WIDTH_SHORT = 20;
+import { WIDTH_SHORT } from './constants';
 
 export type Props = DataSourcePluginOptionsEditorProps<InfluxOptions, InfluxSecureJsonData>;
 
diff --git a/public/app/plugins/datasource/influxdb/components/editor/config/InfluxInfluxQLConfig.tsx b/public/app/plugins/datasource/influxdb/components/editor/config/InfluxInfluxQLConfig.tsx
index 4ac55ca9139ae..e811a69fc9bab 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/config/InfluxInfluxQLConfig.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/config/InfluxInfluxQLConfig.tsx
@@ -1,8 +1,10 @@
+import { css } from '@emotion/css';
 import { uniqueId } from 'lodash';
 import React from 'react';
 
 import {
   DataSourcePluginOptionsEditorProps,
+  GrafanaTheme2,
   onUpdateDatasourceJsonDataOption,
   onUpdateDatasourceJsonDataOptionSelect,
   onUpdateDatasourceOption,
@@ -10,11 +12,11 @@ import {
   SelectableValue,
   updateDatasourcePluginResetOption,
 } from '@grafana/data';
-import { Alert, InlineFormLabel, LegacyForms, Select } from '@grafana/ui';
+import { Alert, Field, InlineLabel, Input, SecretInput, Select, useStyles2 } from '@grafana/ui';
 
 import { InfluxOptions, InfluxSecureJsonData } from '../../../types';
 
-const { Input, SecretFormField } = LegacyForms;
+import { WIDTH_SHORT } from './constants';
 
 const httpModes: SelectableValue[] = [
   { label: 'GET', value: 'GET' },
@@ -26,6 +28,8 @@ export type Props = DataSourcePluginOptionsEditorProps<InfluxOptions, InfluxSecu
 export const InfluxInfluxQLConfig = (props: Props) => {
   const { options, onOptionsChange } = props;
   const { database, jsonData, secureJsonData, secureJsonFields } = options;
+  const styles = useStyles2(getStyles);
+
   const htmlPrefix = uniqueId('influxdb-influxql-config');
 
   return (
@@ -41,100 +45,108 @@ export const InfluxInfluxQLConfig = (props: Props) => {
           To support data isolation and security, make sure appropriate permissions are configured in InfluxDB.
         </p>
       </Alert>
-      <div className="gf-form-inline">
-        <div className="gf-form">
-          <InlineFormLabel htmlFor={`${htmlPrefix}-db`} className="width-10">
-            Database
-          </InlineFormLabel>
-          <div className="width-20">
-            <Input
-              id={`${htmlPrefix}-db`}
-              className="width-20"
-              value={jsonData.dbName ?? database}
-              onChange={(event) => {
-                onOptionsChange({
-                  ...options,
-                  database: '',
-                  jsonData: {
-                    ...jsonData,
-                    dbName: event.target.value,
-                  },
-                });
-              }}
-            />
-          </div>
-        </div>
-      </div>
-      <div className="gf-form-inline">
-        <div className="gf-form">
-          <InlineFormLabel htmlFor={`${htmlPrefix}-user`} className="width-10">
-            User
-          </InlineFormLabel>
-          <div className="width-10">
-            <Input
-              id={`${htmlPrefix}-user`}
-              className="width-20"
-              value={options.user || ''}
-              onChange={onUpdateDatasourceOption(props, 'user')}
-            />
-          </div>
-        </div>
-      </div>
-      <div className="gf-form-inline">
-        <div className="gf-form">
-          <SecretFormField
-            isConfigured={Boolean(secureJsonFields && secureJsonFields.password)}
-            value={secureJsonData?.password || ''}
-            label="Password"
-            aria-label="Password"
-            labelWidth={10}
-            inputWidth={20}
-            onReset={() => updateDatasourcePluginResetOption(props, 'password')}
-            onChange={onUpdateDatasourceSecureJsonDataOption(props, 'password')}
-          />
-        </div>
-      </div>
-      <div className="gf-form-inline">
-        <div className="gf-form">
-          <InlineFormLabel
-            htmlFor={`${htmlPrefix}-http-method`}
-            className="width-10"
+
+      <Field
+        horizontal
+        label={<InlineLabel width={WIDTH_SHORT}>Database</InlineLabel>}
+        className={styles.horizontalField}
+        htmlFor={`${htmlPrefix}-db`}
+      >
+        <Input
+          id={`${htmlPrefix}-db`}
+          className="width-20"
+          value={jsonData.dbName ?? database}
+          onChange={(event) => {
+            onOptionsChange({
+              ...options,
+              database: '',
+              jsonData: {
+                ...jsonData,
+                dbName: event.currentTarget.value,
+              },
+            });
+          }}
+        />
+      </Field>
+      <Field
+        horizontal
+        label={<InlineLabel width={WIDTH_SHORT}>User</InlineLabel>}
+        className={styles.horizontalField}
+        htmlFor={`${htmlPrefix}-user`}
+      >
+        <Input
+          id={`${htmlPrefix}-user`}
+          className="width-20"
+          value={options.user || ''}
+          onChange={onUpdateDatasourceOption(props, 'user')}
+        />
+      </Field>
+      <Field
+        horizontal
+        label={<InlineLabel width={WIDTH_SHORT}>Password</InlineLabel>}
+        className={styles.horizontalField}
+      >
+        <SecretInput
+          isConfigured={Boolean(secureJsonFields && secureJsonFields.password)}
+          value={secureJsonData?.password || ''}
+          label="Password"
+          aria-label="Password"
+          className="width-20"
+          onReset={() => updateDatasourcePluginResetOption(props, 'password')}
+          onChange={onUpdateDatasourceSecureJsonDataOption(props, 'password')}
+        />
+      </Field>
+      <Field
+        horizontal
+        label={
+          <InlineLabel
+            width={WIDTH_SHORT}
             tooltip="You can use either GET or POST HTTP method to query your InfluxDB database. The POST
           method allows you to perform heavy requests (with a lots of WHERE clause) while the GET method
           will restrict you and return an error if the query is too large."
           >
             HTTP Method
-          </InlineFormLabel>
-          <Select
-            inputId={`${htmlPrefix}-http-method`}
-            className="width-20"
-            value={httpModes.find((httpMode) => httpMode.value === options.jsonData.httpMode)}
-            options={httpModes}
-            defaultValue={options.jsonData.httpMode}
-            onChange={onUpdateDatasourceJsonDataOptionSelect(props, 'httpMode')}
-          />
-        </div>
-      </div>
+          </InlineLabel>
+        }
+        htmlFor={`${htmlPrefix}-http-method`}
+        className={styles.horizontalField}
+      >
+        <Select
+          inputId={`${htmlPrefix}-http-method`}
+          className="width-20"
+          value={httpModes.find((httpMode) => httpMode.value === options.jsonData.httpMode)}
+          options={httpModes}
+          defaultValue={options.jsonData.httpMode}
+          onChange={onUpdateDatasourceJsonDataOptionSelect(props, 'httpMode')}
+        />
+      </Field>
 
-      <div className="gf-form-inline">
-        <div className="gf-form">
-          <InlineFormLabel
-            className="width-10"
-            tooltip="A lower limit for the auto group by time interval. Recommended to be set to write frequency,
-				for example 1m if your data is written every minute."
+      <Field
+        horizontal
+        label={
+          <InlineLabel
+            width={WIDTH_SHORT}
+            tooltip="A lower limit for the auto group by time interval. Recommended to be set to write frequency, for example 1m if your data is written every minute."
           >
             Min time interval
-          </InlineFormLabel>
-          <div className="width-10">
-            <Input
-              className="width-20"
-              placeholder="10s"
-              value={options.jsonData.timeInterval || ''}
-              onChange={onUpdateDatasourceJsonDataOption(props, 'timeInterval')}
-            />
-          </div>
-        </div>
-      </div>
+          </InlineLabel>
+        }
+        className={styles.horizontalField}
+      >
+        <Input
+          className="width-20"
+          placeholder="10s"
+          value={options.jsonData.timeInterval || ''}
+          onChange={onUpdateDatasourceJsonDataOption(props, 'timeInterval')}
+        />
+      </Field>
     </>
   );
 };
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  horizontalField: css({
+    justifyContent: 'initial',
+    margin: `0 ${theme.spacing(0.5)} ${theme.spacing(0.5)} 0`,
+  }),
+});
diff --git a/public/app/plugins/datasource/influxdb/components/editor/config/InfluxSQLConfig.tsx b/public/app/plugins/datasource/influxdb/components/editor/config/InfluxSQLConfig.tsx
index 501cc4cd7f219..defdb0b0eabaa 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/config/InfluxSQLConfig.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/config/InfluxSQLConfig.tsx
@@ -1,138 +1,88 @@
-import React, { useEffect, useState } from 'react';
+import { css } from '@emotion/css';
+import { uniqueId } from 'lodash';
+import React from 'react';
 
 import {
   DataSourcePluginOptionsEditorProps,
+  GrafanaTheme2,
   onUpdateDatasourceSecureJsonDataOption,
   updateDatasourcePluginResetOption,
 } from '@grafana/data';
-import { InlineField, SecretInput, Input, InlineFieldRow, InlineLabel } from '@grafana/ui';
+import { Field, InlineLabel, InlineSwitch, Input, SecretInput, useStyles2 } from '@grafana/ui';
 
 import { InfluxOptions, InfluxSecureJsonData } from '../../../types';
 
-export type Props = DataSourcePluginOptionsEditorProps<InfluxOptions, InfluxSecureJsonData>;
-
-type MetadataState = Array<{ key: string; value: string }>;
-
-export const addMetaData = (setMetaData: (val: MetadataState) => void, metaDataArr: MetadataState) => {
-  setMetaData([...metaDataArr, { key: '', value: '' }]);
-};
+import { WIDTH_SHORT } from './constants';
 
-export const removeMetaData = (i: number, setMetaData: (val: MetadataState) => void, metaDataArr: MetadataState) => {
-  const newMetaValues = [...metaDataArr];
-  newMetaValues.splice(i, 1);
-  setMetaData(newMetaValues);
-};
-
-export const onKeyChange = (
-  key: string,
-  metaDataArr: MetadataState,
-  index: number,
-  setMetaData: (val: MetadataState) => void
-) => {
-  const newMetaValues = [...metaDataArr];
-  newMetaValues[index]['key'] = key;
-  setMetaData(newMetaValues);
-};
-
-export const onValueChange = (
-  value: string,
-  metaDataArr: MetadataState,
-  index: number,
-  setMetaData: (val: MetadataState) => void
-) => {
-  const newMetaValues = [...metaDataArr];
-  newMetaValues[index]['value'] = value;
-  setMetaData(newMetaValues);
-};
+export type Props = DataSourcePluginOptionsEditorProps<InfluxOptions, InfluxSecureJsonData>;
 
 export const InfluxSqlConfig = (props: Props) => {
-  const {
-    options: { jsonData, secureJsonData, secureJsonFields },
-  } = props;
-
-  const existingMetadata: MetadataState = jsonData?.metadata?.length
-    ? jsonData?.metadata?.map((md) => ({ key: Object.keys(md)[0], value: Object.values(md)[0] }))
-    : [{ key: '', value: '' }];
-  const [metaDataArr, setMetaData] = useState<MetadataState>(existingMetadata);
-
-  useEffect(() => {
-    const { onOptionsChange, options } = props;
-    const mapData = metaDataArr?.map((m) => ({ [m.key]: m.value }));
-    const jsonData = {
-      ...options.jsonData,
-      metadata: mapData,
-    };
-    onOptionsChange({
-      ...options,
-      jsonData,
-    });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [metaDataArr]);
+  const { options, onOptionsChange } = props;
+  const { jsonData, secureJsonData, secureJsonFields } = options;
+  const styles = useStyles2(getStyles);
+  const htmlPrefix = uniqueId('influxdb-sql-config');
 
   return (
     <div>
-      <div className="gf-form">
-        <h6>Token</h6>
-      </div>
-      <div>
-        <InlineField labelWidth={20} label="Token">
-          <SecretInput
-            width={40}
-            name="token"
-            type="text"
-            value={secureJsonData?.token || ''}
-            onReset={() => updateDatasourcePluginResetOption(props, 'token')}
-            onChange={onUpdateDatasourceSecureJsonDataOption(props, 'token')}
-            isConfigured={secureJsonFields?.token}
-          />
-        </InlineField>
-      </div>
-      <div>
-        <div className="gf-form">
-          <h6>MetaData</h6>
-        </div>
-        {metaDataArr?.map((_, i) => (
-          <InlineFieldRow key={i} style={{ flexFlow: 'row' }}>
-            <InlineField labelWidth={20} label="Key">
-              <Input
-                key={i}
-                width={40}
-                name="key"
-                type="text"
-                value={metaDataArr[i]?.key || ''}
-                placeholder="key"
-                onChange={(e) => onKeyChange(e.currentTarget.value.trim(), metaDataArr, i, setMetaData)}
-              ></Input>
-            </InlineField>
-            <InlineField labelWidth={20} label="Value">
-              <Input
-                key={i}
-                width={40}
-                name="value"
-                type="text"
-                value={metaDataArr[i]?.value?.toString() ?? ''}
-                placeholder="value"
-                onChange={(e) => onValueChange(e.currentTarget.value.trim(), metaDataArr, i, setMetaData)}
-              ></Input>
-            </InlineField>
-            {i + 1 >= metaDataArr.length && (
-              <InlineLabel as="button" className="" onClick={() => addMetaData(setMetaData, metaDataArr)} width="auto">
-                +
-              </InlineLabel>
-            )}
-            {i > 0 && (
-              <InlineLabel
-                as="button"
-                className=""
-                width="auto"
-                onClick={() => removeMetaData(i, setMetaData, metaDataArr)}
-              >
-                -
-              </InlineLabel>
-            )}
-          </InlineFieldRow>
-        ))}
-      </div>
+      <Field
+        horizontal
+        label={<InlineLabel width={WIDTH_SHORT}>Database</InlineLabel>}
+        className={styles.horizontalField}
+        htmlFor={`${htmlPrefix}-dbName`}
+      >
+        <Input
+          id={`${htmlPrefix}-dbName`}
+          className="width-20"
+          aria-label="Database or bucket name"
+          value={jsonData.dbName}
+          onChange={(event) => {
+            onOptionsChange({
+              ...options,
+              jsonData: {
+                ...jsonData,
+                dbName: event.currentTarget.value,
+              },
+            });
+          }}
+        />
+      </Field>
+      <Field horizontal label={<InlineLabel width={WIDTH_SHORT}>Token</InlineLabel>} className={styles.horizontalField}>
+        <SecretInput
+          label="Token"
+          aria-label="Token"
+          className="width-20"
+          value={secureJsonData?.token || ''}
+          onReset={() => updateDatasourcePluginResetOption(props, 'token')}
+          onChange={onUpdateDatasourceSecureJsonDataOption(props, 'token')}
+          isConfigured={Boolean(secureJsonFields && secureJsonFields.token)}
+        />
+      </Field>
+      <Field
+        horizontal
+        label={<InlineLabel width={WIDTH_SHORT}>Insecure Connection</InlineLabel>}
+        className={styles.horizontalField}
+      >
+        <InlineSwitch
+          id={`${htmlPrefix}-insecure-grpc`}
+          value={jsonData.insecureGrpc ?? false}
+          onChange={(event) => {
+            onOptionsChange({
+              ...options,
+              jsonData: {
+                ...jsonData,
+                insecureGrpc: event.currentTarget.checked,
+              },
+            });
+          }}
+        />
+      </Field>
     </div>
   );
 };
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  horizontalField: css({
+    justifyContent: 'initial',
+    margin: `0 ${theme.spacing(0.5)} ${theme.spacing(0.5)} 0`,
+  }),
+});
diff --git a/public/app/plugins/datasource/influxdb/components/editor/config/constants.ts b/public/app/plugins/datasource/influxdb/components/editor/config/constants.ts
new file mode 100644
index 0000000000000..638db0f2dacc8
--- /dev/null
+++ b/public/app/plugins/datasource/influxdb/components/editor/config/constants.ts
@@ -0,0 +1 @@
+export const WIDTH_SHORT = 20;
diff --git a/public/app/plugins/datasource/influxdb/components/editor/query/fsql/FSQLEditor.tsx b/public/app/plugins/datasource/influxdb/components/editor/query/fsql/FSQLEditor.tsx
index cc79bdc0e44b5..90c08ff26ab19 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/query/fsql/FSQLEditor.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/query/fsql/FSQLEditor.tsx
@@ -2,11 +2,9 @@ import { css, cx } from '@emotion/css';
 import React, { PureComponent } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data/src';
-import { Alert, InlineFormLabel, LinkButton, Themeable2, withTheme2 } from '@grafana/ui/src';
+import { SQLQuery, SqlQueryEditor, applyQueryDefaults } from '@grafana/sql';
+import { InlineFormLabel, LinkButton, Themeable2, withTheme2 } from '@grafana/ui/src';
 
-import { SQLQuery } from '../../../../../../../features/plugins/sql';
-import { SqlQueryEditor } from '../../../../../../../features/plugins/sql/components/QueryEditor';
-import { applyQueryDefaults } from '../../../../../../../features/plugins/sql/defaults';
 import InfluxDatasource from '../../../../datasource';
 import { FlightSQLDatasource } from '../../../../fsql/datasource.flightsql';
 import { InfluxQuery } from '../../../../types';
@@ -25,39 +23,43 @@ class UnthemedSQLQueryEditor extends PureComponent<Props> {
     super(props);
     const { datasource: influxDatasource } = props;
 
-    this.datasource = new FlightSQLDatasource({
-      url: influxDatasource.urls[0],
-      access: influxDatasource.access,
-      id: influxDatasource.id,
-
-      jsonData: {
-        // Not applicable to flightSQL? @itsmylife
-        allowCleartextPasswords: false,
-        tlsAuth: false,
-        tlsAuthWithCACert: false,
-        tlsSkipVerify: false,
-        maxIdleConns: 1,
-        maxOpenConns: 1,
-        maxIdleConnsAuto: true,
-        connMaxLifetime: 1,
-        timezone: '',
-        user: '',
-        database: '',
+    this.datasource = new FlightSQLDatasource(
+      {
         url: influxDatasource.urls[0],
-        timeInterval: '',
+        access: influxDatasource.access,
+        id: influxDatasource.id,
+
+        jsonData: {
+          // TODO Clean this
+          allowCleartextPasswords: false,
+          tlsAuth: false,
+          tlsAuthWithCACert: false,
+          tlsSkipVerify: false,
+          maxIdleConns: 1,
+          maxOpenConns: 1,
+          maxIdleConnsAuto: true,
+          connMaxLifetime: 1,
+          timezone: '',
+          user: '',
+          database: '',
+          url: influxDatasource.urls[0],
+          timeInterval: '',
+        },
+        meta: influxDatasource.meta,
+        name: influxDatasource.name,
+        readOnly: false,
+        type: influxDatasource.type,
+        uid: influxDatasource.uid,
       },
-      meta: influxDatasource.meta,
-      name: influxDatasource.name,
-      readOnly: false,
-      type: influxDatasource.type,
-      uid: influxDatasource.uid,
-    });
+      influxDatasource.templateSrv
+    );
   }
 
   transformQuery(query: InfluxQuery & SQLQuery): SQLQuery {
     const defaultQuery = applyQueryDefaults(query);
     return {
       ...defaultQuery,
+      dataset: 'iox',
       sql: {
         ...defaultQuery.sql,
         limit: undefined,
@@ -87,14 +89,12 @@ class UnthemedSQLQueryEditor extends PureComponent<Props> {
 
     return (
       <>
-        <Alert title="Warning" severity="warning">
-          InfluxDB SQL support is currently in alpha state. It does not have all the features.
-        </Alert>
         <SqlQueryEditor
           datasource={this.datasource}
           query={this.transformQuery(query)}
           onRunQuery={onRunSQLQuery}
           onChange={onSQLChange}
+          queryHeaderProps={{ dialect: 'influx' }}
         />
         <div className={cx('gf-form-inline', styles.editorActions)}>
           <LinkButton
diff --git a/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/PartListSection.tsx b/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/PartListSection.tsx
index ae5c5f9cbf30d..a86df9df78452 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/PartListSection.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/PartListSection.tsx
@@ -3,7 +3,7 @@ import React, { useMemo } from 'react';
 
 import { GrafanaTheme2, SelectableValue } from '@grafana/data';
 import { AccessoryButton } from '@grafana/experimental';
-import { MenuGroup, MenuItem, useTheme2, WithContextMenu } from '@grafana/ui';
+import { useTheme2 } from '@grafana/ui';
 
 import { toSelectableValue } from '../utils/toSelectableValue';
 import { unwrap } from '../utils/unwrap';
@@ -27,31 +27,11 @@ type Props = {
   onAddNewPart: (type: string) => void;
 };
 
-const renderRemovableNameMenuItems = (onClick: () => void) => {
-  return (
-    <MenuGroup label="">
-      <MenuItem label="remove" onClick={onClick} />
-    </MenuGroup>
-  );
-};
-
 const noRightMarginPaddingClass = css({
   paddingRight: '0',
   marginRight: '0',
 });
 
-const RemovableName = ({ name, onRemove }: { name: string; onRemove: () => void }) => {
-  return (
-    <WithContextMenu renderMenuItems={() => renderRemovableNameMenuItems(onRemove)}>
-      {({ openMenu }) => (
-        <button className={cx('gf-form-label', noRightMarginPaddingClass)} onClick={openMenu}>
-          {name}
-        </button>
-      )}
-    </WithContextMenu>
-  );
-};
-
 type PartProps = {
   name: string;
   params: PartParams;
@@ -79,7 +59,7 @@ const getPartClass = (theme: GrafanaTheme2) => {
   );
 };
 
-const Part = ({ name, params, onChange, onRemove }: PartProps): JSX.Element => {
+const Part = ({ name, params, onChange }: PartProps): JSX.Element => {
   const theme = useTheme2();
   const partClass = useMemo(() => getPartClass(theme), [theme]);
 
@@ -90,7 +70,7 @@ const Part = ({ name, params, onChange, onRemove }: PartProps): JSX.Element => {
   };
   return (
     <div className={partClass}>
-      <RemovableName name={name} onRemove={onRemove} />(
+      <button className={cx('gf-form-label', noRightMarginPaddingClass)}>{name}</button>(
       {params.map((p, i) => {
         const { value, options } = p;
         const isLast = i === params.length - 1;
diff --git a/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/TagsSection.tsx b/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/TagsSection.tsx
index 983c2d5fb0785..b290a231bb289 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/TagsSection.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/TagsSection.tsx
@@ -10,8 +10,8 @@ import { toSelectableValue } from '../utils/toSelectableValue';
 import { AddButton } from './AddButton';
 import { Seg } from './Seg';
 
-type KnownOperator = '=' | '!=' | '<>' | '<' | '>' | '=~' | '!~';
-const knownOperators: KnownOperator[] = ['=', '!=', '<>', '<', '>', '=~', '!~'];
+type KnownOperator = '=' | '!=' | '<>' | '<' | '>' | '>=' | '<=' | '=~' | '!~' | 'Is' | 'Is Not';
+const knownOperators: KnownOperator[] = ['=', '!=', '<>', '<', '>', '>=', '<=', '=~', '!~', 'Is', 'Is Not'];
 
 type KnownCondition = 'AND' | 'OR';
 const knownConditions: KnownCondition[] = ['AND', 'OR'];
diff --git a/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/VisualInfluxQLEditor.test.tsx b/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/VisualInfluxQLEditor.test.tsx
index 3fc70dd0a0ea5..50b2862320d82 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/VisualInfluxQLEditor.test.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/VisualInfluxQLEditor.test.tsx
@@ -58,8 +58,8 @@ describe('InfluxDB InfluxQL Visual Editor', () => {
     await assertEditor(
       query,
       'FROM[default][select measurement]WHERE[+]' +
-        'SELECT[field]([value])[mean]()[+]' +
-        'GROUP BY[time]([$__interval])[fill]([null])[+]' +
+        'SELECTfield([value])mean()[+]' +
+        'GROUP BYtime([$__interval])fill([null])[+]' +
         'TIMEZONE[(optional)]ORDER BY TIME[ASC]' +
         'LIMIT[(optional)]SLIMIT[(optional)]' +
         'FORMAT AS[time_series]ALIAS[Naming pattern]'
@@ -75,8 +75,8 @@ describe('InfluxDB InfluxQL Visual Editor', () => {
     await assertEditor(
       query,
       'FROM[default][select measurement]WHERE[+]' +
-        'SELECT[field]([value])[mean]()[+]' +
-        'GROUP BY[time]([$__interval])[fill]([null])[+]' +
+        'SELECTfield([value])mean()[+]' +
+        'GROUP BYtime([$__interval])fill([null])[+]' +
         'TIMEZONE[(optional)]ORDER BY TIME[ASC]' +
         'LIMIT[(optional)]SLIMIT[(optional)]' +
         'FORMAT AS[table]'
@@ -154,9 +154,9 @@ describe('InfluxDB InfluxQL Visual Editor', () => {
     await assertEditor(
       query,
       'FROM[default][cpu]WHERE[cpu][=][cpu1][AND][cpu][<][cpu3][+]' +
-        'SELECT[field]([usage_idle])[mean]()[+]' +
-        '[field]([usage_guest])[median]()[holt_winters_with_fit]([10],[2])[+]' +
-        'GROUP BY[time]([$__interval])[tag]([cpu])[tag]([host])[fill]([null])[+]' +
+        'SELECTfield([usage_idle])mean()[+]' +
+        'field([usage_guest])median()holt_winters_with_fit([10],[2])[+]' +
+        'GROUP BYtime([$__interval])tag([cpu])tag([host])fill([null])[+]' +
         'TIMEZONE[UTC]ORDER BY TIME[DESC]' +
         'LIMIT[4]SLIMIT[5]' +
         'FORMAT AS[logs]ALIAS[all i as]'
diff --git a/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/VisualInfluxQLEditor.tsx b/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/VisualInfluxQLEditor.tsx
index c300ce9c5dcad..374da6b752ae4 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/VisualInfluxQLEditor.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/VisualInfluxQLEditor.tsx
@@ -134,7 +134,7 @@ export const VisualInfluxQLEditor = (props: Props): JSX.Element => {
           getTagKeyOptions={getMemoizedTagKeys}
           getTagValueOptions={(key) =>
             withTemplateVariableOptions(
-              allTagKeys.then((keys) => getTagValues(datasource, filterTags(query.tags ?? [], keys), key)),
+              allTagKeys.then((keys) => getTagValues(datasource, filterTags(query.tags ?? [], keys), key, measurement)),
               wrapRegex
             )
           }
diff --git a/public/app/plugins/datasource/influxdb/components/editor/variable/VariableQueryEditor.tsx b/public/app/plugins/datasource/influxdb/components/editor/variable/VariableQueryEditor.tsx
index 1df0f2ff78b1d..e771e54a982f4 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/variable/VariableQueryEditor.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/variable/VariableQueryEditor.tsx
@@ -1,6 +1,6 @@
 import React, { PureComponent } from 'react';
 
-import { InlineFormLabel, TextArea } from '@grafana/ui/src';
+import { Field, FieldSet, InlineFormLabel, TextArea } from '@grafana/ui';
 
 import InfluxDatasource from '../../../datasource';
 import { InfluxVersion } from '../../../types';
@@ -33,11 +33,20 @@ export default class VariableQueryEditor extends PureComponent<Props> {
             onChange={(v) => onChange(v.query)}
           />
         );
-      //@todo add support for SQL
       case InfluxVersion.SQL:
-        return <div className="gf-form-inline">TODO</div>;
-
-      // Influx/default case
+        return (
+          <FieldSet>
+            <Field htmlFor="influx-sql-variable-query">
+              <TextArea
+                id="influx-sql-variable-query"
+                defaultValue={query || ''}
+                placeholder="metric name or tags query"
+                rows={1}
+                onBlur={(e) => onChange(e.currentTarget.value)}
+              />
+            </Field>
+          </FieldSet>
+        );
       case InfluxVersion.InfluxQL:
       default:
         return (
diff --git a/public/app/plugins/datasource/influxdb/datasource.test.ts b/public/app/plugins/datasource/influxdb/datasource.test.ts
index 6462fbd09b2bc..0e7f7dff45787 100644
--- a/public/app/plugins/datasource/influxdb/datasource.test.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.test.ts
@@ -5,6 +5,7 @@ import { BackendSrvRequest } from '@grafana/runtime/';
 import config from 'app/core/config';
 
 import { TemplateSrv } from '../../../features/templating/template_srv';
+import { queryBuilder } from '../../../features/variables/shared/testing/builders';
 
 import { BROWSER_MODE_DISABLED_MESSAGE } from './constants';
 import InfluxDatasource from './datasource';
@@ -258,6 +259,7 @@ describe('InfluxDataSource Frontend Mode', () => {
     const text2 = 'interpolationText2';
     const textWithoutFormatRegex = 'interpolationText,interpolationText2';
     const textWithFormatRegex = 'interpolationText,interpolationText2';
+    const justText = 'interpolationText';
     const variableMap: Record<string, string> = {
       $interpolationVar: text,
       $interpolationVar2: text2,
@@ -285,16 +287,16 @@ describe('InfluxDataSource Frontend Mode', () => {
     const ds = new InfluxDatasource(getMockDSInstanceSettings(), templateSrv);
 
     function influxChecks(query: InfluxQuery) {
-      expect(templateSrv.replace).toBeCalledTimes(10);
+      expect(templateSrv.replace).toBeCalledTimes(12);
       expect(query.alias).toBe(text);
       expect(query.measurement).toBe(textWithFormatRegex);
-      expect(query.policy).toBe(textWithFormatRegex);
-      expect(query.limit).toBe(textWithFormatRegex);
-      expect(query.slimit).toBe(textWithFormatRegex);
+      expect(query.policy).toBe(justText);
+      expect(query.limit).toBe(justText);
+      expect(query.slimit).toBe(justText);
       expect(query.tz).toBe(text);
       expect(query.tags![0].value).toBe(textWithFormatRegex);
-      expect(query.groupBy![0].params![0]).toBe(textWithFormatRegex);
-      expect(query.select![0][0].params![0]).toBe(textWithFormatRegex);
+      expect(query.groupBy![0].params![0]).toBe(justText);
+      expect(query.select![0][0].params![0]).toBe(justText);
       expect(query.adhocFilters?.[0].key).toBe(adhocFilters[0].key);
     }
 
@@ -342,7 +344,12 @@ describe('InfluxDataSource Frontend Mode', () => {
     });
 
     describe('variable interpolation with chained variables with frontend mode', () => {
-      const mockTemplateService = new TemplateSrv();
+      const variablesMock = [queryBuilder().withId('var1').withName('var1').withCurrent('var1').build()];
+      const mockTemplateService = new TemplateSrv({
+        getVariables: () => variablesMock,
+        getVariableWithName: (name: string) => variablesMock.filter((v) => v.name === name)[0],
+        getFilteredVariables: jest.fn(),
+      });
       mockTemplateService.getAdhocFilters = jest.fn((_: string) => []);
       let ds = getMockInfluxDS(getMockDSInstanceSettings(), mockTemplateService);
       const fetchMockImpl = () =>
@@ -409,5 +416,114 @@ describe('InfluxDataSource Frontend Mode', () => {
         expect(qData).toBe(qe);
       });
     });
+
+    describe('interpolateQueryExpr', () => {
+      let ds = getMockInfluxDS(getMockDSInstanceSettings(), new TemplateSrv());
+      it('should return the value as it is', () => {
+        const value = 'normalValue';
+        const variableMock = queryBuilder().withId('tempVar').withName('tempVar').withMulti(false).build();
+        const result = ds.interpolateQueryExpr(value, variableMock, 'my query $tempVar');
+        const expectation = 'normalValue';
+        expect(result).toBe(expectation);
+      });
+
+      it('should return the escaped value if the value wrapped in regex', () => {
+        const value = '/special/path';
+        const variableMock = queryBuilder().withId('tempVar').withName('tempVar').withMulti(false).build();
+        const result = ds.interpolateQueryExpr(value, variableMock, 'select that where path = /$tempVar/');
+        const expectation = `\\/special\\/path`;
+        expect(result).toBe(expectation);
+      });
+
+      it('should return the escaped value if the value wrapped in regex 2', () => {
+        const value = '/special/path';
+        const variableMock = queryBuilder().withId('tempVar').withName('tempVar').withMulti(false).build();
+        const result = ds.interpolateQueryExpr(value, variableMock, 'select that where path = /^$tempVar$/');
+        const expectation = `\\/special\\/path`;
+        expect(result).toBe(expectation);
+      });
+
+      it('should return the escaped value if the value wrapped in regex 3', () => {
+        const value = ['env', 'env2', 'env3'];
+        const variableMock = queryBuilder()
+          .withId('tempVar')
+          .withName('tempVar')
+          .withMulti(false)
+          .withIncludeAll(true)
+          .build();
+        const result = ds.interpolateQueryExpr(value, variableMock, 'select from /^($tempVar)$/');
+        const expectation = `(env|env2|env3)`;
+        expect(result).toBe(expectation);
+      });
+
+      it('should **not** return the escaped value if the value **is not** wrapped in regex', () => {
+        const value = '/special/path';
+        const variableMock = queryBuilder().withId('tempVar').withName('tempVar').withMulti(false).build();
+        const result = ds.interpolateQueryExpr(value, variableMock, `select that where path = '$tempVar'`);
+        const expectation = `/special/path`;
+        expect(result).toBe(expectation);
+      });
+
+      it('should **not** return the escaped value if the value **is not** wrapped in regex 2', () => {
+        const value = '12.2';
+        const variableMock = queryBuilder().withId('tempVar').withName('tempVar').withMulti(false).build();
+        const result = ds.interpolateQueryExpr(value, variableMock, `select that where path = '$tempVar'`);
+        const expectation = `12.2`;
+        expect(result).toBe(expectation);
+      });
+
+      it('should escape the value **always** if the variable is a multi-value variable', () => {
+        const value = [`/special/path`, `/some/other/path`];
+        const variableMock = queryBuilder().withId('tempVar').withName('tempVar').withMulti().build();
+        const result = ds.interpolateQueryExpr(value, variableMock, `select that where path = '$tempVar'`);
+        const expectation = `(\\/special\\/path|\\/some\\/other\\/path)`;
+        expect(result).toBe(expectation);
+      });
+
+      it('should escape and join with the pipe even the variable is not multi-value', () => {
+        const variableMock = queryBuilder()
+          .withId('tempVar')
+          .withName('tempVar')
+          .withCurrent('All', '$__all')
+          .withMulti(false)
+          .withAllValue('')
+          .withIncludeAll()
+          .withOptions(
+            {
+              text: 'All',
+              value: '$__all',
+            },
+            {
+              text: `/special/path`,
+              value: `/special/path`,
+            },
+            {
+              text: `/some/other/path`,
+              value: `/some/other/path`,
+            }
+          )
+          .build();
+        const value = [`/special/path`, `/some/other/path`];
+        const result = ds.interpolateQueryExpr(value, variableMock, `select that where path = /$tempVar/`);
+        const expectation = `(\\/special\\/path|\\/some\\/other\\/path)`;
+        expect(result).toBe(expectation);
+      });
+
+      it('should return floating point number as it is', () => {
+        const variableMock = queryBuilder()
+          .withId('tempVar')
+          .withName('tempVar')
+          .withMulti(false)
+          .withOptions({
+            text: `1.0`,
+            value: `1.0`,
+          })
+          .build();
+        const value = `1.0`;
+        const result = ds.interpolateQueryExpr(value, variableMock, `select value / $tempVar from /^measurement$/`);
+        const expectation = `1.0`;
+        expect(result).toBe(expectation);
+      });
+    });
   });
 });
diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
index 78467ba3a0f5d..a346c6ad522e3 100644
--- a/public/app/plugins/datasource/influxdb/datasource.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -17,6 +17,7 @@ import {
   FieldType,
   MetricFindValue,
   QueryResultMeta,
+  QueryVariableModel,
   RawTimeRange,
   ScopedVars,
   TIME_SERIES_TIME_FIELD_NAME,
@@ -31,7 +32,7 @@ import {
   frameToMetricFindValue,
   getBackendSrv,
 } from '@grafana/runtime';
-import { CustomFormatterVariable } from '@grafana/scenes';
+import { QueryFormat, SQLQuery } from '@grafana/sql';
 import config from 'app/core/config';
 import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_srv';
 
@@ -43,7 +44,7 @@ import InfluxQueryModel from './influx_query_model';
 import InfluxSeries from './influx_series';
 import { buildMetadataQuery } from './influxql_query_builder';
 import { prepareAnnotation } from './migrations';
-import { buildRawQuery } from './queryUtils';
+import { buildRawQuery, removeRegexWrapper } from './queryUtils';
 import ResponseParser from './response_parser';
 import { DEFAULT_POLICY, InfluxOptions, InfluxQuery, InfluxQueryTag, InfluxVersion } from './types';
 
@@ -138,12 +139,12 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
       return merge(...streams);
     }
 
-    if (this.isMigrationToggleOnAndIsAccessProxy()) {
-      return super.query(filteredRequest);
+    if (this.version === InfluxVersion.InfluxQL && !this.isMigrationToggleOnAndIsAccessProxy()) {
+      // Fallback to classic query support
+      return this.classicQuery(request);
     }
 
-    // Fallback to classic query support
-    return this.classicQuery(request);
+    return super.query(filteredRequest);
   }
 
   getQueryDisplayText(query: InfluxQuery) {
@@ -169,19 +170,27 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
     return true;
   }
 
-  applyTemplateVariables(query: InfluxQuery, scopedVars: ScopedVars): InfluxQuery {
-    // We want to interpolate these variables on backend
-    const { __interval, __interval_ms, ...rest } = scopedVars || {};
+  applyTemplateVariables(query: InfluxQuery, scopedVars: ScopedVars): InfluxQuery & SQLQuery {
+    const variables = scopedVars || {};
+
+    // We want to interpolate these variables on backend.
+    // The pre-calculated values are replaced withe the variable strings.
+    variables.__interval = {
+      value: '$__interval',
+    };
+    variables.__interval_ms = {
+      value: '$__interval_ms',
+    };
 
     if (this.version === InfluxVersion.Flux) {
       return {
         ...query,
-        query: this.templateSrv.replace(query.query ?? '', rest), // The raw query text
+        query: this.templateSrv.replace(query.query ?? '', variables), // The raw query text
       };
     }
 
-    if (this.isMigrationToggleOnAndIsAccessProxy()) {
-      query = this.applyVariables(query, rest);
+    if (this.version === InfluxVersion.SQL || this.isMigrationToggleOnAndIsAccessProxy()) {
+      query = this.applyVariables(query, variables);
       if (query.adhocFilters?.length) {
         const adhocFiltersToTags: InfluxQueryTag[] = (query.adhocFilters ?? []).map((af) => {
           const { condition, ...asTag } = af;
@@ -212,7 +221,12 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
         return {
           ...query,
           datasource: this.getRef(),
-          query: this.templateSrv.replace(query.query ?? '', scopedVars, this.interpolateQueryExpr), // The raw query text
+          query: this.templateSrv.replace(
+            query.query ?? '',
+            scopedVars,
+            (value: string | string[] = [], variable: QueryVariableModel) =>
+              this.interpolateQueryExpr(value, variable, query.query)
+          ), // The raw query text
         };
       }
 
@@ -224,15 +238,13 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
     });
   }
 
-  applyVariables(query: InfluxQuery, scopedVars: ScopedVars) {
+  applyVariables(query: InfluxQuery & SQLQuery, scopedVars: ScopedVars) {
     const expandedQuery = { ...query };
     if (query.groupBy) {
       expandedQuery.groupBy = query.groupBy.map((groupBy) => {
         return {
           ...groupBy,
-          params: groupBy.params?.map((param) => {
-            return this.templateSrv.replace(param.toString(), undefined, this.interpolateQueryExpr);
-          }),
+          params: groupBy.params?.map((param) => this.templateSrv.replace(param.toString(), undefined)),
         };
       });
     }
@@ -242,9 +254,7 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
         return selects.map((select) => {
           return {
             ...select,
-            params: select.params?.map((param) => {
-              return this.templateSrv.replace(param.toString(), undefined, this.interpolateQueryExpr);
-            }),
+            params: select.params?.map((param) => this.templateSrv.replace(param.toString(), scopedVars)),
           };
         });
       });
@@ -252,9 +262,20 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
 
     if (query.tags) {
       expandedQuery.tags = query.tags.map((tag) => {
+        // Remove the regex wrapper if the operator is not a regex operator
+        if (tag.operator !== '=~' && tag.operator !== '!~') {
+          tag.value = removeRegexWrapper(tag.value);
+        }
+
         return {
           ...tag,
-          value: this.templateSrv.replace(tag.value, scopedVars, this.interpolateQueryExpr),
+          key: this.templateSrv.replace(tag.key, scopedVars),
+          value: this.templateSrv.replace(
+            tag.value ?? '',
+            scopedVars,
+            (value: string | string[] = [], variable: QueryVariableModel) =>
+              this.interpolateQueryExpr(value, variable, tag.value)
+          ),
         };
       });
     }
@@ -262,33 +283,78 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
     return {
       ...expandedQuery,
       adhocFilters: this.templateSrv.getAdhocFilters(this.name) ?? [],
-      query: this.templateSrv.replace(query.query ?? '', scopedVars, this.interpolateQueryExpr), // The raw query text
+      query: this.templateSrv.replace(
+        query.query ?? '',
+        scopedVars,
+        (value: string | string[] = [], variable: QueryVariableModel) =>
+          this.interpolateQueryExpr(value, variable, query.query)
+      ), // The raw sql query text
+      rawSql: this.templateSrv.replace(
+        query.rawSql ?? '',
+        scopedVars,
+        (value: string | string[] = [], variable: QueryVariableModel) =>
+          this.interpolateQueryExpr(value, variable, query.rawSql)
+      ), // The raw sql query text
       alias: this.templateSrv.replace(query.alias ?? '', scopedVars),
-      limit: this.templateSrv.replace(query.limit?.toString() ?? '', scopedVars, this.interpolateQueryExpr),
-      measurement: this.templateSrv.replace(query.measurement ?? '', scopedVars, this.interpolateQueryExpr),
-      policy: this.templateSrv.replace(query.policy ?? '', scopedVars, this.interpolateQueryExpr),
-      slimit: this.templateSrv.replace(query.slimit?.toString() ?? '', scopedVars, this.interpolateQueryExpr),
+      limit: this.templateSrv.replace(query.limit?.toString() ?? '', scopedVars),
+      measurement: this.templateSrv.replace(
+        query.measurement ?? '',
+        scopedVars,
+        (value: string | string[] = [], variable: QueryVariableModel) =>
+          this.interpolateQueryExpr(value, variable, query.measurement)
+      ),
+      policy: this.templateSrv.replace(query.policy ?? '', scopedVars),
+      slimit: this.templateSrv.replace(query.slimit?.toString() ?? '', scopedVars),
       tz: this.templateSrv.replace(query.tz ?? '', scopedVars),
     };
   }
 
-  interpolateQueryExpr(value: string | string[] = [], variable: Partial<CustomFormatterVariable>) {
-    // if no multi or include all do not regexEscape
-    if (!variable.multi && !variable.includeAll) {
-      return influxRegularEscape(value);
+  interpolateQueryExpr(value: string | string[] = [], variable: QueryVariableModel, query?: string) {
+    // If there is no query just return the value directly
+    if (!query) {
+      return value;
     }
 
     if (typeof value === 'string') {
-      return influxSpecialRegexEscape(value);
+      // Check the value is a number. If not run to escape special characters
+      if (!isNaN(parseFloat(value))) {
+        return value;
+      }
     }
 
-    const escapedValues = value.map((val) => influxSpecialRegexEscape(val));
+    // If template variable is a multi-value variable
+    // we always want to deal with special chars.
+    if (variable.multi) {
+      if (typeof value === 'string') {
+        // Check the value is a number. If not run to escape special characters
+        if (isNaN(parseFloat(value))) {
+          return escapeRegex(value);
+        }
+        return value;
+      }
 
-    if (escapedValues.length === 1) {
-      return escapedValues[0];
+      // If the value is a string array first escape them then join them with pipe
+      // then put inside parenthesis.
+      return `(${value.map((v) => escapeRegex(v)).join('|')})`;
     }
 
-    return escapedValues.join('|');
+    // If the variable is not a multi-value variable
+    // we want to see how it's been used. If it is used in a regex expression
+    // we escape it. Otherwise, we return it directly.
+    // regex below checks if the variable inside /^...$/ (^ and $ is optional)
+    // i.e. /^$myVar$/ or /$myVar/ or /^($myVar)$/
+    const regex = new RegExp(`\\/(?:\\^)?(.*)(\\$${variable.name})(.*)(?:\\$)?\\/`, 'gm');
+    if (regex.test(query)) {
+      if (typeof value === 'string') {
+        return escapeRegex(value);
+      }
+
+      // If the value is a string array first escape them then join them with pipe
+      // then put inside parenthesis.
+      return `(${value.map((v) => escapeRegex(v)).join('|')})`;
+    }
+
+    return value;
   }
 
   async runMetadataQuery(target: InfluxQuery): Promise<MetricFindValue[]> {
@@ -300,11 +366,16 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
   }
 
   async metricFindQuery(query: string, options?: any): Promise<MetricFindValue[]> {
-    if (this.version === InfluxVersion.Flux || this.isMigrationToggleOnAndIsAccessProxy()) {
-      const target: InfluxQuery = {
+    if (
+      this.version === InfluxVersion.Flux ||
+      this.version === InfluxVersion.SQL ||
+      this.isMigrationToggleOnAndIsAccessProxy()
+    ) {
+      const target: InfluxQuery & SQLQuery = {
         refId: 'metricFindQuery',
         query,
         rawQuery: true,
+        ...(this.version === InfluxVersion.SQL ? { rawSql: query, format: QueryFormat.Table } : {}),
       };
       return lastValueFrom(
         super.query({
@@ -314,7 +385,11 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
       ).then(this.toMetricFindValue);
     }
 
-    const interpolated = this.templateSrv.replace(query, options?.scopedVars, this.interpolateQueryExpr);
+    const interpolated = this.templateSrv.replace(
+      query,
+      options?.scopedVars,
+      (value: string | string[] = [], variable: QueryVariableModel) => this.interpolateQueryExpr(value, variable, query)
+    );
 
     return lastValueFrom(this._seriesQuery(interpolated, options)).then((resp) => {
       return this.responseParser.parse(query, resp);
@@ -331,7 +406,7 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
 
   // By implementing getTagKeys and getTagValues we add ad-hoc filters functionality
   // Used in public/app/features/variables/adhoc/picker/AdHocFilterKey.tsx::fetchFilterKeys
-  getTagKeys(options?: DataSourceGetTagKeysOptions) {
+  getTagKeys(options?: DataSourceGetTagKeysOptions<InfluxQuery>) {
     const query = buildMetadataQuery({
       type: 'TAG_KEYS',
       templateService: this.templateSrv,
@@ -590,7 +665,7 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
     allQueries = this.templateSrv.replace(allQueries, scopedVars);
 
     return this._seriesQuery(allQueries, options).pipe(
-      map((data: any) => {
+      map((data) => {
         if (!data || !data.results) {
           return { data: [] };
         }
@@ -660,7 +735,12 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
       const target: InfluxQuery = {
         refId: 'metricFindQuery',
         datasource: this.getRef(),
-        query: this.templateSrv.replace(annotation.query, undefined, this.interpolateQueryExpr),
+        query: this.templateSrv.replace(
+          annotation.query,
+          undefined,
+          (value: string | string[] = [], variable: QueryVariableModel) =>
+            this.interpolateQueryExpr(value, variable, annotation.query)
+        ),
         rawQuery: true,
       };
 
@@ -688,9 +768,11 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
 
     const timeFilter = this.getTimeFilter({ rangeRaw: options.range.raw, timezone: options.timezone });
     let query = annotation.query.replace('$timeFilter', timeFilter);
-    query = this.templateSrv.replace(query, undefined, this.interpolateQueryExpr);
+    query = this.templateSrv.replace(query, undefined, (value: string | string[] = [], variable: QueryVariableModel) =>
+      this.interpolateQueryExpr(value, variable, query)
+    );
 
-    return lastValueFrom(this._seriesQuery(query, options)).then((data: any) => {
+    return lastValueFrom(this._seriesQuery(query, options)).then((data) => {
       if (!data || !data.results || !data.results[0]) {
         throw { message: 'No results in response from InfluxDB' };
       }
@@ -772,18 +854,3 @@ function timeSeriesToDataFrame(timeSeries: TimeSeries): DataFrame {
     length: values.length,
   };
 }
-
-export function influxRegularEscape(value: string | string[]) {
-  if (typeof value === 'string') {
-    // Check the value is a number. If not run to escape special characters
-    if (isNaN(parseFloat(value))) {
-      return escapeRegex(value);
-    }
-  }
-
-  return value;
-}
-
-export function influxSpecialRegexEscape(value: string | string[]) {
-  return typeof value === 'string' ? value.replace(/\\/g, '\\\\\\\\').replace(/[$^*{}\[\]\'+?.()|]/g, '\\\\$&') : value;
-}
diff --git a/public/app/plugins/datasource/influxdb/datasource_backend_mode.test.ts b/public/app/plugins/datasource/influxdb/datasource_backend_mode.test.ts
index 993cdbebe8ec6..691677ce07d1b 100644
--- a/public/app/plugins/datasource/influxdb/datasource_backend_mode.test.ts
+++ b/public/app/plugins/datasource/influxdb/datasource_backend_mode.test.ts
@@ -5,6 +5,7 @@ import { FetchResponse } from '@grafana/runtime/src';
 import config from 'app/core/config';
 
 import { TemplateSrv } from '../../../features/templating/template_srv';
+import { queryBuilder } from '../../../features/variables/shared/testing/builders';
 
 import InfluxDatasource from './datasource';
 import {
@@ -149,6 +150,7 @@ describe('InfluxDataSource Backend Mode', () => {
     const text2 = 'interpolationText2';
     const textWithoutFormatRegex = 'interpolationText,interpolationText2';
     const textWithFormatRegex = 'interpolationText,interpolationText2';
+    const justText = 'interpolationText';
     const variableMap: Record<string, string> = {
       $interpolationVar: text,
       $interpolationVar2: text2,
@@ -176,16 +178,16 @@ describe('InfluxDataSource Backend Mode', () => {
     const ds = new InfluxDatasource(getMockDSInstanceSettings(), templateSrv);
 
     function influxChecks(query: InfluxQuery) {
-      expect(templateSrv.replace).toBeCalledTimes(10);
+      expect(templateSrv.replace).toBeCalledTimes(12);
       expect(query.alias).toBe(text);
       expect(query.measurement).toBe(textWithFormatRegex);
-      expect(query.policy).toBe(textWithFormatRegex);
-      expect(query.limit).toBe(textWithFormatRegex);
-      expect(query.slimit).toBe(textWithFormatRegex);
+      expect(query.policy).toBe(justText);
+      expect(query.limit).toBe(justText);
+      expect(query.slimit).toBe(justText);
       expect(query.tz).toBe(text);
       expect(query.tags![0].value).toBe(textWithFormatRegex);
-      expect(query.groupBy![0].params![0]).toBe(textWithFormatRegex);
-      expect(query.select![0][0].params![0]).toBe(textWithFormatRegex);
+      expect(query.groupBy![0].params![0]).toBe(justText);
+      expect(query.select![0][0].params![0]).toBe(justText);
       expect(query.adhocFilters?.[0].key).toBe(adhocFilters[0].key);
     }
 
@@ -216,7 +218,35 @@ describe('InfluxDataSource Backend Mode', () => {
   });
 
   describe('variable interpolation with chained variables with backend mode', () => {
-    const mockTemplateService = new TemplateSrv();
+    const variablesMock = [
+      queryBuilder().withId('var1').withName('var1').withCurrent('var1').build(),
+      queryBuilder().withId('path').withName('path').withCurrent('/etc/hosts').build(),
+      queryBuilder()
+        .withId('field_var')
+        .withName('field_var')
+        .withMulti(true)
+        .withOptions(
+          {
+            text: `field_1`,
+            value: `field_1`,
+          },
+          {
+            text: `field_2`,
+            value: `field_2`,
+          },
+          {
+            text: `field_3`,
+            value: `field_3`,
+          }
+        )
+        .withCurrent(['field_1', 'field_3'])
+        .build(),
+    ];
+    const mockTemplateService = new TemplateSrv({
+      getVariables: () => variablesMock,
+      getVariableWithName: (name: string) => variablesMock.filter((v) => v.name === name)[0],
+      getFilteredVariables: jest.fn(),
+    });
     mockTemplateService.getAdhocFilters = jest.fn((_: string) => []);
     let ds = getMockInfluxDS(getMockDSInstanceSettings(), mockTemplateService);
     const fetchMockImpl = () =>
@@ -263,6 +293,7 @@ describe('InfluxDataSource Backend Mode', () => {
         },
       });
       const qe = `SHOW TAG VALUES WITH KEY = "agent_url" WHERE agent_url =~ /^https:\\/\\/aaaa-aa-aaa\\.bbb\\.ccc\\.ddd:8443\\/ggggg$/`;
+      expect(fetchMock).toHaveBeenCalled();
       const qData = fetchMock.mock.calls[0][0].data.queries[0].query;
       expect(qData).toBe(qe);
     });
@@ -285,6 +316,66 @@ describe('InfluxDataSource Backend Mode', () => {
       const qData = fetchMock.mock.calls[0][0].data.queries[0].query;
       expect(qData).toBe(qe);
     });
+
+    it('should interpolate variable inside a regex pattern', () => {
+      const query: InfluxQuery = {
+        refId: 'A',
+        tags: [
+          {
+            key: 'key',
+            operator: '=~',
+            value: '/^.*-$var1$/',
+          },
+        ],
+      };
+      const res = ds.applyVariables(query, {});
+      const expected = `/^.*-var1$/`;
+      expect(res.tags?.[0].value).toEqual(expected);
+    });
+
+    it('should remove regex wrappers when operator is not a regex operator', () => {
+      const query: InfluxQuery = {
+        refId: 'A',
+        tags: [
+          {
+            key: 'key',
+            operator: '=',
+            value: '/^$path$/',
+          },
+        ],
+      };
+      const res = ds.applyVariables(query, {});
+      const expected = `/etc/hosts`;
+      expect(res.tags?.[0].value).toEqual(expected);
+    });
+
+    it('should interpolate field keys with given scopedVars', () => {
+      const query: InfluxQuery = {
+        refId: 'A',
+        tags: [
+          {
+            key: 'key',
+            operator: '=',
+            value: 'value',
+          },
+        ],
+        select: [
+          [
+            {
+              type: 'field',
+              params: ['$field_var'],
+            },
+            {
+              type: 'mean',
+              params: [],
+            },
+          ],
+        ],
+      };
+      const res = ds.applyVariables(query, { field_var: { text: 'field_3', value: 'field_3' } });
+      const expected = `field_3`;
+      expect(res.select?.[0][0].params?.[0]).toEqual(expected);
+    });
   });
 
   describe('metric find query', () => {
diff --git a/public/app/plugins/datasource/influxdb/datasource_sql.test.ts b/public/app/plugins/datasource/influxdb/datasource_sql.test.ts
new file mode 100644
index 0000000000000..705b370a26423
--- /dev/null
+++ b/public/app/plugins/datasource/influxdb/datasource_sql.test.ts
@@ -0,0 +1,43 @@
+import { lastValueFrom } from 'rxjs';
+
+import { SQLQuery } from '@grafana/sql';
+import config from 'app/core/config';
+
+import InfluxDatasource from './datasource';
+import {
+  getMockDSInstanceSettings,
+  mockBackendService,
+  mockInfluxQueryRequest,
+  mockInfluxSQLFetchResponse,
+  mockTemplateSrv,
+} from './mocks';
+import { InfluxVersion } from './types';
+
+config.featureToggles.influxdbBackendMigration = true;
+mockBackendService(mockInfluxSQLFetchResponse);
+
+describe('InfluxDB SQL Support', () => {
+  const replaceMock = jest.fn();
+  const templateSrv = mockTemplateSrv(jest.fn(), replaceMock);
+
+  let sqlQuery: SQLQuery;
+
+  beforeEach(() => {
+    sqlQuery = {
+      refId: 'x',
+      rawSql:
+        'SELECT "$interpolationVar2", time FROM iox.$interpolationVar WHERE time >= $__timeFrom AND time <= $__timeTo',
+    };
+  });
+
+  describe('interpolate variables', () => {
+    const ds = new InfluxDatasource(getMockDSInstanceSettings({ version: InfluxVersion.SQL }), templateSrv);
+
+    it('should call replace template variables for rawSql', async () => {
+      await lastValueFrom(ds.query(mockInfluxQueryRequest([sqlQuery])));
+      expect(replaceMock.mock.calls[1][0]).toBe(
+        `SELECT "$interpolationVar2", time FROM iox.$interpolationVar WHERE time >= $__timeFrom AND time <= $__timeTo`
+      );
+    });
+  });
+});
diff --git a/public/app/plugins/datasource/influxdb/fsql/datasource.flightsql.test.ts b/public/app/plugins/datasource/influxdb/fsql/datasource.flightsql.test.ts
new file mode 100644
index 0000000000000..30b0855893ae6
--- /dev/null
+++ b/public/app/plugins/datasource/influxdb/fsql/datasource.flightsql.test.ts
@@ -0,0 +1,49 @@
+import { TemplateSrv } from '@grafana/runtime';
+
+import { getMockDSInstanceSettings, mockBackendService, mockInfluxSQLVariableFetchResponse } from '../mocks';
+
+import { FlightSQLDatasource } from './datasource.flightsql';
+
+mockBackendService(mockInfluxSQLVariableFetchResponse);
+describe('flightsql datasource', () => {
+  const templateSrv: TemplateSrv = {
+    containsTemplate: jest.fn(),
+    replace: jest.fn().mockImplementation((val: string) => val),
+    updateTimeRange: jest.fn(),
+    getVariables: jest.fn().mockReturnValue([
+      {
+        name: 'templateVar',
+        text: 'templateVar',
+        value: 'templateVar',
+        type: '',
+        label: 'templateVar',
+      },
+    ]),
+  };
+  const mockInstanceSettings = getMockDSInstanceSettings();
+  const instanceSettings = {
+    ...mockInstanceSettings,
+    jsonData: {
+      ...mockInstanceSettings.jsonData,
+      allowCleartextPasswords: false,
+      tlsAuth: false,
+      tlsAuthWithCACert: false,
+      tlsSkipVerify: false,
+      maxIdleConns: 1,
+      maxOpenConns: 1,
+      maxIdleConnsAuto: true,
+      connMaxLifetime: 1,
+      timezone: '',
+      user: '',
+      database: '',
+      url: '',
+      timeInterval: '',
+    },
+  };
+  const ds = new FlightSQLDatasource(instanceSettings, templateSrv);
+
+  it('should add template variables to the responses', async () => {
+    const fields = await ds.fetchFields({ dataset: 'test', table: 'table' });
+    expect(fields[0].name).toBe('$templateVar');
+  });
+});
diff --git a/public/app/plugins/datasource/influxdb/fsql/datasource.flightsql.ts b/public/app/plugins/datasource/influxdb/fsql/datasource.flightsql.ts
index ec47c71f0b71b..18c881e2dbb0c 100644
--- a/public/app/plugins/datasource/influxdb/fsql/datasource.flightsql.ts
+++ b/public/app/plugins/datasource/influxdb/fsql/datasource.flightsql.ts
@@ -1,19 +1,21 @@
-import { DataSourceInstanceSettings, TimeRange } from '@grafana/data/src';
+import { DataSourceInstanceSettings, TimeRange } from '@grafana/data';
 import { CompletionItemKind, LanguageDefinition, TableIdentifier } from '@grafana/experimental';
-import { SqlDatasource } from 'app/features/plugins/sql/datasource/SqlDatasource';
-import { DB, SQLQuery } from 'app/features/plugins/sql/types';
-import { formatSQL } from 'app/features/plugins/sql/utils/formatSQL';
+import { getTemplateSrv, TemplateSrv } from '@grafana/runtime';
+import { DB, formatSQL, SqlDatasource, SQLQuery } from '@grafana/sql';
 
 import { mapFieldsToTypes } from './fields';
-import { buildColumnQuery, buildTableQuery, showDatabases } from './flightsqlMetaQuery';
+import { buildColumnQuery, buildTableQuery } from './flightsqlMetaQuery';
 import { getSqlCompletionProvider } from './sqlCompletionProvider';
-import { quoteLiteral, quoteIdentifierIfNecessary, toRawSql } from './sqlUtil';
+import { quoteIdentifierIfNecessary, quoteLiteral, toRawSql } from './sqlUtil';
 import { FlightSQLOptions } from './types';
 
 export class FlightSQLDatasource extends SqlDatasource {
   sqlLanguageDefinition: LanguageDefinition | undefined;
 
-  constructor(private instanceSettings: DataSourceInstanceSettings<FlightSQLOptions>) {
+  constructor(
+    private instanceSettings: DataSourceInstanceSettings<FlightSQLOptions>,
+    protected readonly templateSrv: TemplateSrv = getTemplateSrv()
+  ) {
     super(instanceSettings);
   }
 
@@ -38,21 +40,23 @@ export class FlightSQLDatasource extends SqlDatasource {
   }
 
   async fetchDatasets(): Promise<string[]> {
-    const datasets = await this.runSql<string[]>(showDatabases(), { refId: 'datasets' });
-    return datasets.map((t) => quoteIdentifierIfNecessary(t[0]));
+    return Promise.resolve(['iox']);
   }
 
   async fetchTables(dataset?: string): Promise<string[]> {
     const query = buildTableQuery(dataset);
     const tables = await this.runSql<string[]>(query, { refId: 'tables' });
-    return tables.map((t) => quoteIdentifierIfNecessary(t[0]));
+    const tableNames = tables.map((t) => quoteIdentifierIfNecessary(t[0]));
+    tableNames.unshift(...this.getTemplateVariables());
+    return tableNames;
   }
 
   async fetchFields(query: Partial<SQLQuery>) {
     if (!query.dataset || !query.table) {
       return [];
     }
-    const queryString = buildColumnQuery(query.table, query.dataset);
+    const interpolatedTable = this.templateSrv.replace(query.table);
+    const queryString = buildColumnQuery(interpolatedTable, query.dataset);
     const frame = await this.runSql<string[]>(queryString, { refId: 'fields' });
     const fields = frame.map((f) => ({
       name: f[0],
@@ -61,9 +65,22 @@ export class FlightSQLDatasource extends SqlDatasource {
       type: f[1],
       label: f[0],
     }));
+    fields.unshift(
+      ...this.getTemplateVariables().map((v) => ({
+        name: v,
+        text: v,
+        value: quoteIdentifierIfNecessary(v),
+        type: '',
+        label: v,
+      }))
+    );
     return mapFieldsToTypes(fields);
   }
 
+  getTemplateVariables() {
+    return this.templateSrv.getVariables().map((v) => `$${v.name}`);
+  }
+
   async fetchMeta(identifier?: TableIdentifier) {
     const defaultDB = this.instanceSettings.jsonData.database;
     if (!identifier?.schema && defaultDB) {
diff --git a/public/app/plugins/datasource/influxdb/fsql/fields.ts b/public/app/plugins/datasource/influxdb/fsql/fields.ts
index 6177234a3db3e..1cc2609f67620 100644
--- a/public/app/plugins/datasource/influxdb/fsql/fields.ts
+++ b/public/app/plugins/datasource/influxdb/fsql/fields.ts
@@ -1,4 +1,4 @@
-import { RAQBFieldTypes, SQLSelectableValue } from 'app/features/plugins/sql/types';
+import { RAQBFieldTypes, SQLSelectableValue } from '@grafana/sql';
 
 export function mapFieldsToTypes(columns: SQLSelectableValue[]) {
   const fields: SQLSelectableValue[] = [];
diff --git a/public/app/plugins/datasource/influxdb/fsql/sqlUtil.test.ts b/public/app/plugins/datasource/influxdb/fsql/sqlUtil.test.ts
index d05aad13d4d50..4864004b8ec83 100644
--- a/public/app/plugins/datasource/influxdb/fsql/sqlUtil.test.ts
+++ b/public/app/plugins/datasource/influxdb/fsql/sqlUtil.test.ts
@@ -1,12 +1,10 @@
-import { SQLQuery } from 'app/features/plugins/sql/types';
-
-import { QueryEditorExpressionType } from '../../../../features/plugins/sql/expressions';
+import { QueryEditorExpressionType, SQLQuery } from '@grafana/sql';
 
 import { toRawSql } from './sqlUtil';
 
 describe('toRawSql', () => {
   it('should render sql properly', () => {
-    const expected = 'SELECT host FROM iox.value1 WHERE time >= $__timeFrom AND time <= $__timeTo LIMIT 50';
+    const expected = 'SELECT "host" FROM "value1" WHERE "time" >= $__timeFrom AND "time" <= $__timeTo LIMIT 50';
     const testQuery: SQLQuery = {
       refId: 'A',
       sql: {
@@ -29,4 +27,55 @@ describe('toRawSql', () => {
     const result = toRawSql(testQuery);
     expect(result).toEqual(expected);
   });
+
+  it('should wrap the identifiers with quote', () => {
+    const expected = 'SELECT "host" FROM "TestValue" WHERE "time" >= $__timeFrom AND "time" <= $__timeTo LIMIT 50';
+    const testQuery: SQLQuery = {
+      refId: 'A',
+      sql: {
+        limit: 50,
+        columns: [
+          {
+            parameters: [
+              {
+                name: 'host',
+                type: QueryEditorExpressionType.FunctionParameter,
+              },
+            ],
+            type: QueryEditorExpressionType.Function,
+          },
+        ],
+      },
+      dataset: 'iox',
+      table: 'TestValue',
+    };
+    const result = toRawSql(testQuery);
+    expect(result).toEqual(expected);
+  });
+
+  it('should wrap filters in where', () => {
+    const expected = `SELECT "host" FROM "TestValue" WHERE "time" >= $__timeFrom AND "time" <= $__timeTo AND ("sensor_id" = '12' AND "sensor_id" = '23') LIMIT 50`;
+    const testQuery: SQLQuery = {
+      refId: 'A',
+      sql: {
+        limit: 50,
+        columns: [
+          {
+            parameters: [
+              {
+                name: 'host',
+                type: QueryEditorExpressionType.FunctionParameter,
+              },
+            ],
+            type: QueryEditorExpressionType.Function,
+          },
+        ],
+        whereString: `(sensor_id = '12' AND sensor_id = '23')`,
+      },
+      dataset: 'iox',
+      table: 'TestValue',
+    };
+    const result = toRawSql(testQuery);
+    expect(result).toEqual(expected);
+  });
 });
diff --git a/public/app/plugins/datasource/influxdb/fsql/sqlUtil.ts b/public/app/plugins/datasource/influxdb/fsql/sqlUtil.ts
index f4b8eea30bba7..41317454a959d 100644
--- a/public/app/plugins/datasource/influxdb/fsql/sqlUtil.ts
+++ b/public/app/plugins/datasource/influxdb/fsql/sqlUtil.ts
@@ -1,7 +1,6 @@
 import { isEmpty } from 'lodash';
 
-import { SQLQuery } from 'app/features/plugins/sql/types';
-import { createSelectClause, haveColumns } from 'app/features/plugins/sql/utils/sql.utils';
+import { createSelectClause, haveColumns, SQLQuery } from '@grafana/sql';
 
 // remove identifier quoting from identifier to use in metadata queries
 export function unquoteIdentifier(value: string) {
@@ -18,7 +17,7 @@ export function quoteLiteral(value: string) {
   return "'" + value.replace(/'/g, "''") + "'";
 }
 
-export function toRawSql({ sql, dataset, table }: SQLQuery): string {
+export function toRawSql({ sql, table }: SQLQuery): string {
   let rawQuery = '';
 
   // Return early with empty string if there is no sql column
@@ -26,25 +25,33 @@ export function toRawSql({ sql, dataset, table }: SQLQuery): string {
     return rawQuery;
   }
 
-  rawQuery += createSelectClause(sql.columns);
+  // wrapping the column name with quotes
+  const sc = sql.columns.map((c) => ({ ...c, parameters: c.parameters?.map((p) => ({ ...p, name: `"${p.name}"` })) }));
+  rawQuery += createSelectClause(sc);
 
-  if (dataset && table) {
-    rawQuery += `FROM ${dataset}.${table} `;
+  if (table) {
+    rawQuery += `FROM "${table}" `;
   }
 
   // $__timeFrom and $__timeTo will be interpolated on the backend
-  rawQuery += `WHERE time >= $__timeFrom AND time <= $__timeTo `;
+  rawQuery += `WHERE "time" >= $__timeFrom AND "time" <= $__timeTo `;
   if (sql.whereString) {
-    rawQuery += `AND ${sql.whereString} `;
+    // whereString is generated by the react-awesome-query-builder
+    // we use SQLWhereRow as a common component
+    // in order to not mess with common component here we just modify the string
+    const wherePattern = new RegExp('(\\s?)([^\\(]\\S+)(\\s?=)', 'g');
+    const subst = `$1"$2"$3`;
+    const whereString = sql.whereString.replace(wherePattern, subst);
+    rawQuery += `AND ${whereString} `;
   }
 
   if (sql.groupBy?.[0]?.property.name) {
-    const groupBy = sql.groupBy.map((g) => g.property.name).filter((g) => !isEmpty(g));
+    const groupBy = sql.groupBy.map((g) => `"${g.property.name}"`).filter((g) => !isEmpty(g));
     rawQuery += `GROUP BY ${groupBy.join(', ')} `;
   }
 
   if (sql.orderBy?.property.name) {
-    rawQuery += `ORDER BY ${sql.orderBy.property.name} `;
+    rawQuery += `ORDER BY "${sql.orderBy.property.name}" `;
   }
 
   if (sql.orderBy?.property.name && sql.orderByDirection) {
diff --git a/public/app/plugins/datasource/influxdb/fsql/types.ts b/public/app/plugins/datasource/influxdb/fsql/types.ts
index 805fa085eb31a..787ed135bb029 100644
--- a/public/app/plugins/datasource/influxdb/fsql/types.ts
+++ b/public/app/plugins/datasource/influxdb/fsql/types.ts
@@ -1,4 +1,4 @@
-import { SQLOptions, SQLQuery } from 'app/features/plugins/sql/types';
+import { SQLOptions, SQLQuery } from '@grafana/sql';
 
 export interface FlightSQLOptions extends SQLOptions {
   allowCleartextPasswords?: boolean;
diff --git a/public/app/plugins/datasource/influxdb/influx_query_model.test.ts b/public/app/plugins/datasource/influxdb/influx_query_model.test.ts
index cd0bf8f878b0c..92a92f41aac4f 100644
--- a/public/app/plugins/datasource/influxdb/influx_query_model.test.ts
+++ b/public/app/plugins/datasource/influxdb/influx_query_model.test.ts
@@ -205,6 +205,195 @@ describe('InfluxQuery', () => {
       expect(queryText).toBe('SELECT mean("value") FROM "autogen"."cpu" WHERE ("value" > 5) AND $timeFilter');
     });
   });
+  describe('query with greater-than-or-equal-to condition', () => {
+    it('should use >=', () => {
+      const query = new InfluxQueryModel(
+        {
+          refId: 'A',
+          measurement: 'cpu',
+          policy: 'autogen',
+          groupBy: [],
+          tags: [{ key: 'value', value: '5', operator: '>=' }],
+        },
+        templateSrv,
+        {}
+      );
+
+      const queryText = query.render();
+      expect(queryText).toBe('SELECT mean("value") FROM "autogen"."cpu" WHERE ("value" >= 5) AND $timeFilter');
+    });
+  });
+
+  describe('query with less-than-or-equal-to condition', () => {
+    it('should use <=', () => {
+      const query = new InfluxQueryModel(
+        {
+          refId: 'A',
+          measurement: 'cpu',
+          policy: 'autogen',
+          groupBy: [],
+          tags: [{ key: 'value', value: '5', operator: '<=' }],
+        },
+        templateSrv,
+        {}
+      );
+
+      const queryText = query.render();
+      expect(queryText).toBe('SELECT mean("value") FROM "autogen"."cpu" WHERE ("value" <= 5) AND $timeFilter');
+    });
+  });
+
+  describe('query with Is operator', () => {
+    it('should use =', () => {
+      const query = new InfluxQueryModel(
+        {
+          refId: 'A',
+          measurement: 'cpu',
+          policy: 'autogen',
+          groupBy: [],
+          tags: [{ key: 'value', value: 'False', operator: 'Is' }],
+        },
+        templateSrv,
+        {}
+      );
+
+      const queryText = query.render();
+      expect(queryText).toBe('SELECT mean("value") FROM "autogen"."cpu" WHERE ("value" = false) AND $timeFilter');
+    });
+  });
+
+  describe('query with Is Not operator', () => {
+    it('should use !=', () => {
+      const query = new InfluxQueryModel(
+        {
+          refId: 'A',
+          measurement: 'cpu',
+          policy: 'autogen',
+          groupBy: [],
+          tags: [{ key: 'value', value: 'False', operator: 'Is Not' }],
+        },
+        templateSrv,
+        {}
+      );
+
+      const queryText = query.render();
+      expect(queryText).toBe('SELECT mean("value") FROM "autogen"."cpu" WHERE ("value" != false) AND $timeFilter');
+    });
+  });
+
+  describe('query with Is boolean condition', () => {
+    it('should convert to lowercase and not quote value', () => {
+      const query = new InfluxQueryModel(
+        {
+          refId: 'A',
+          measurement: 'cpu',
+          policy: 'autogen',
+          groupBy: [],
+          tags: [{ key: 'value', value: 'True', operator: 'Is' }],
+        },
+        templateSrv,
+        {}
+      );
+
+      const queryText = query.render();
+      expect(queryText).toBe('SELECT mean("value") FROM "autogen"."cpu" WHERE ("value" = true) AND $timeFilter');
+    });
+  });
+
+  describe('query with Is string condition', () => {
+    it('should quote value', () => {
+      const query = new InfluxQueryModel(
+        {
+          refId: 'A',
+          measurement: 'cpu',
+          policy: 'autogen',
+          groupBy: [],
+          tags: [{ key: 'value', value: 'Server2', operator: 'Is' }],
+        },
+        templateSrv,
+        {}
+      );
+
+      const queryText = query.render();
+      expect(queryText).toBe('SELECT mean("value") FROM "autogen"."cpu" WHERE ("value" = \'Server2\') AND $timeFilter');
+    });
+  });
+
+  describe('query with Is integer condition', () => {
+    it('should not quote value', () => {
+      const query = new InfluxQueryModel(
+        {
+          refId: 'A',
+          measurement: 'cpu',
+          policy: 'autogen',
+          groupBy: [],
+          tags: [{ key: 'value', value: '5', operator: 'Is' }],
+        },
+        templateSrv,
+        {}
+      );
+
+      const queryText = query.render();
+      expect(queryText).toBe('SELECT mean("value") FROM "autogen"."cpu" WHERE ("value" = 5) AND $timeFilter');
+    });
+  });
+
+  describe('query with Is float condition', () => {
+    it('should not quote value', () => {
+      const query = new InfluxQueryModel(
+        {
+          refId: 'A',
+          measurement: 'cpu',
+          policy: 'autogen',
+          groupBy: [],
+          tags: [{ key: 'value', value: '1.234', operator: 'Is' }],
+        },
+        templateSrv,
+        {}
+      );
+
+      const queryText = query.render();
+      expect(queryText).toBe('SELECT mean("value") FROM "autogen"."cpu" WHERE ("value" = 1.234) AND $timeFilter');
+    });
+  });
+
+  describe('query with Is negative float condition', () => {
+    it('should not quote value', () => {
+      const query = new InfluxQueryModel(
+        {
+          refId: 'A',
+          measurement: 'cpu',
+          policy: 'autogen',
+          groupBy: [],
+          tags: [{ key: 'value', value: '-1.234', operator: 'Is' }],
+        },
+        templateSrv,
+        {}
+      );
+
+      const queryText = query.render();
+      expect(queryText).toBe('SELECT mean("value") FROM "autogen"."cpu" WHERE ("value" = -1.234) AND $timeFilter');
+    });
+  });
+
+  describe('query with Is boolean condition', () => {
+    it('should convert to lowercase and not quote value', () => {
+      const query = new InfluxQueryModel(
+        {
+          refId: 'A',
+          measurement: 'cpu',
+          policy: 'autogen',
+          groupBy: [],
+          tags: [{ key: 'value', value: 'True', operator: 'Is' }],
+        },
+        templateSrv,
+        {}
+      );
+
+      const queryText = query.render();
+      expect(queryText).toBe('SELECT mean("value") FROM "autogen"."cpu" WHERE ("value" = true) AND $timeFilter');
+    });
+  });
 
   describe('series with groupByTag', () => {
     it('should generate correct query', () => {
@@ -415,4 +604,53 @@ describe('InfluxQuery', () => {
       });
     });
   });
+
+  describe('test query generated with templateVariable and non-regex operator', () => {
+    const testCases = [
+      ['=', 'SELECT mean("value") FROM "autogen"."cpu" WHERE ("value" = \'$tempVar\') AND $timeFilter'],
+      ['!=', 'SELECT mean("value") FROM "autogen"."cpu" WHERE ("value" != \'$tempVar\') AND $timeFilter'],
+      ['Is', 'SELECT mean("value") FROM "autogen"."cpu" WHERE ("value" = \'$tempVar\') AND $timeFilter'],
+      ['Is Not', 'SELECT mean("value") FROM "autogen"."cpu" WHERE ("value" != \'$tempVar\') AND $timeFilter'],
+      ['>', 'SELECT mean("value") FROM "autogen"."cpu" WHERE ("value" > $tempVar) AND $timeFilter'],
+      ['<', 'SELECT mean("value") FROM "autogen"."cpu" WHERE ("value" < $tempVar) AND $timeFilter'],
+    ];
+
+    it.each(testCases)('should not wrap with InfluxDB regex wrapper for "%s" operator', (operator, expectedQuery) => {
+      const query = new InfluxQueryModel(
+        {
+          refId: 'A',
+          measurement: 'cpu',
+          policy: 'autogen',
+          groupBy: [],
+          tags: [{ key: 'value', value: '/^$tempVar$/', operator }],
+        },
+        templateSrv,
+        {}
+      );
+      const queryText = query.render();
+      expect(queryText).toBe(expectedQuery);
+    });
+  });
+  describe('test query generated with templateVariable and regex operator', () => {
+    const testCases = [
+      ['=~', 'SELECT mean("value") FROM "autogen"."cpu" WHERE ("value" =~ /^$tempVar$/) AND $timeFilter'],
+      ['!~', 'SELECT mean("value") FROM "autogen"."cpu" WHERE ("value" !~ /^$tempVar$/) AND $timeFilter'],
+    ];
+
+    it.each(testCases)('should wrap with InfluxDB regex wrapper for "%s" operator', (operator, expectedQuery) => {
+      const query = new InfluxQueryModel(
+        {
+          refId: 'A',
+          measurement: 'cpu',
+          policy: 'autogen',
+          groupBy: [],
+          tags: [{ key: 'value', value: '/^$tempVar$/', operator }],
+        },
+        templateSrv,
+        {}
+      );
+      const queryText = query.render();
+      expect(queryText).toBe(expectedQuery);
+    });
+  });
 });
diff --git a/public/app/plugins/datasource/influxdb/influx_query_model.ts b/public/app/plugins/datasource/influxdb/influx_query_model.ts
index 676fa04eccd6a..54ff9303bf98f 100644
--- a/public/app/plugins/datasource/influxdb/influx_query_model.ts
+++ b/public/app/plugins/datasource/influxdb/influx_query_model.ts
@@ -3,6 +3,7 @@ import { filter, find, indexOf, map } from 'lodash';
 import { escapeRegex, ScopedVars } from '@grafana/data';
 import { TemplateSrv } from '@grafana/runtime';
 
+import { removeRegexWrapper } from './queryUtils';
 import queryPart from './query_part';
 import { DEFAULT_POLICY, InfluxQuery, InfluxQueryTag } from './types';
 
@@ -39,7 +40,7 @@ export default class InfluxQueryModel {
   }
 
   updateProjection() {
-    this.selectModels = map(this.target.select, (parts: any) => {
+    this.selectModels = map(this.target.select, (parts) => {
       return map(parts, queryPart.create);
     });
     this.groupByParts = map(this.target.groupBy, queryPart.create);
@@ -47,18 +48,18 @@ export default class InfluxQueryModel {
 
   updatePersistedParts() {
     this.target.select = map(this.selectModels, (selectParts) => {
-      return map(selectParts, (part: any) => {
+      return map(selectParts, (part) => {
         return { type: part.def.type, params: part.params };
       });
     });
   }
 
   hasGroupByTime() {
-    return find(this.target.groupBy, (g: any) => g.type === 'time');
+    return find(this.target.groupBy, (g) => g.type === 'time');
   }
 
   hasFill() {
-    return find(this.target.groupBy, (g: any) => g.type === 'fill');
+    return find(this.target.groupBy, (g) => g.type === 'fill');
   }
 
   addGroupBy(value: string) {
@@ -95,10 +96,10 @@ export default class InfluxQueryModel {
 
     if (part.def.type === 'time') {
       // remove fill
-      this.target.groupBy = filter(this.target.groupBy, (g: any) => g.type !== 'fill');
+      this.target.groupBy = filter(this.target.groupBy, (g) => g.type !== 'fill');
       // remove aggregations
-      this.target.select = map(this.target.select, (s: any) => {
-        return filter(s, (part: any) => {
+      this.target.select = map(this.target.select, (s) => {
+        return filter(s, (part) => {
           const partModel = queryPart.create(part);
           if (partModel.def.category === categories.Aggregations) {
             return false;
@@ -141,6 +142,42 @@ export default class InfluxQueryModel {
     this.updatePersistedParts();
   }
 
+  private isOperatorTypeHandler(operator: string, value: string, fieldName: string) {
+    let textValue;
+    if (operator === 'Is Not') {
+      operator = '!=';
+    } else {
+      operator = '=';
+    }
+
+    // Tags should always quote
+    if (fieldName.endsWith('::tag')) {
+      textValue = "'" + removeRegexWrapper(value.replace(/\\/g, '\\\\').replace(/\'/g, "\\'")) + "'";
+      return {
+        operator: operator,
+        value: textValue,
+      };
+    }
+
+    let lowerValue = value.toLowerCase();
+
+    // Try and discern type
+    if (!isNaN(parseFloat(value))) {
+      // Integer or float, don't quote
+      textValue = value;
+    } else if (['true', 'false'].includes(lowerValue)) {
+      // It's a boolean, don't quite
+      textValue = lowerValue;
+    } else {
+      // String or unrecognised: quote
+      textValue = "'" + removeRegexWrapper(value.replace(/\\/g, '\\\\').replace(/\'/g, "\\'")) + "'";
+    }
+    return {
+      operator: operator,
+      value: textValue,
+    };
+  }
+
   private renderTagCondition(tag: InfluxQueryTag, index: number, interpolate?: boolean) {
     // FIXME: merge this function with query_builder/renderTagCondition
     let str = '';
@@ -163,7 +200,12 @@ export default class InfluxQueryModel {
       if (interpolate) {
         value = this.templateSrv.replace(value, this.scopedVars);
       }
-      if (operator !== '>' && operator !== '<') {
+      value = removeRegexWrapper(value);
+      if (operator.startsWith('Is')) {
+        let r = this.isOperatorTypeHandler(operator, value, tag.key);
+        operator = r.operator;
+        value = r.value;
+      } else if ((!operator.startsWith('>') && !operator.startsWith('<')) || operator === '<>') {
         value = "'" + value.replace(/\\/g, '\\\\').replace(/\'/g, "\\'") + "'";
       }
     } else if (interpolate) {
diff --git a/public/app/plugins/datasource/influxdb/mocks.ts b/public/app/plugins/datasource/influxdb/mocks.ts
index af3c0184c8dd7..8aee8e79b5c6c 100644
--- a/public/app/plugins/datasource/influxdb/mocks.ts
+++ b/public/app/plugins/datasource/influxdb/mocks.ts
@@ -8,14 +8,15 @@ import {
   FieldType,
   PluginType,
   ScopedVars,
-} from '@grafana/data/src';
+} from '@grafana/data';
 import {
   BackendDataSourceResponse,
   FetchResponse,
   getBackendSrv,
   setBackendSrv,
   VariableInterpolation,
-} from '@grafana/runtime/src';
+} from '@grafana/runtime';
+import { SQLQuery } from '@grafana/sql';
 
 import { TemplateSrv } from '../../../features/templating/template_srv';
 
@@ -229,7 +230,9 @@ export const mockInfluxRetentionPolicyResponse = [
   },
 ];
 
-export const mockInfluxQueryRequest = (targets?: InfluxQuery[]): DataQueryRequest<InfluxQuery> => {
+type QueryType = InfluxQuery & SQLQuery;
+
+export const mockInfluxQueryRequest = (targets?: QueryType[]): DataQueryRequest<QueryType> => {
   return {
     app: 'explore',
     interval: '1m',
@@ -251,7 +254,7 @@ export const mockInfluxQueryRequest = (targets?: InfluxQuery[]): DataQueryReques
   };
 };
 
-export const mockTargets = (): InfluxQuery[] => {
+export const mockTargets = (): QueryType[] => {
   return [
     {
       refId: 'A',
@@ -321,3 +324,112 @@ export const mockInfluxQueryWithTemplateVars = (adhocFilters: AdHocVariableFilte
   ],
   adhocFilters,
 });
+
+export const mockInfluxSQLFetchResponse: FetchResponse<BackendDataSourceResponse> = {
+  config: {
+    url: 'mock-response-url',
+  },
+  headers: new Headers(),
+  ok: false,
+  redirected: false,
+  status: 0,
+  statusText: '',
+  type: 'basic',
+  url: '',
+  data: {
+    results: {
+      A: {
+        status: 200,
+        frames: [
+          {
+            schema: {
+              refId: 'A',
+              meta: {
+                typeVersion: [0, 0],
+                custom: {
+                  headers: {
+                    'content-type': ['application/grpc'],
+                    date: ['Tue, 07 Nov 2023 21:18:27 GMT'],
+                    'strict-transport-security': ['max-age=15724800; includeSubDomains'],
+                    'trace-id': ['05b4f1f285b4bbe2'],
+                    'trace-sampled': ['false'],
+                    'x-envoy-upstream-service-time': ['15'],
+                  },
+                },
+                executedQueryString:
+                  'SELECT "usage_idle", time FROM iox.cpu WHERE time \u003e= cast(\'2023-11-07T21:13:27Z\' as timestamp) ',
+              },
+              fields: [
+                {
+                  name: 'usage_idle',
+                  type: FieldType.number,
+                },
+                {
+                  name: 'time',
+                  type: FieldType.time,
+                },
+              ],
+            },
+            data: {
+              values: [
+                [99.09629480869259, 99.0866204958598, 99.24736578023098, 99.24736578023054, 99.11619965852707],
+                [1699391610000, 1699391620000, 1699391630000, 1699391640000, 1699391650000],
+              ],
+            },
+          },
+        ],
+      },
+    },
+  },
+};
+
+export const mockInfluxSQLVariableFetchResponse: FetchResponse<BackendDataSourceResponse> = {
+  config: {
+    url: 'mock-response-url',
+  },
+  headers: new Headers(),
+  ok: false,
+  redirected: false,
+  status: 0,
+  statusText: '',
+  type: 'basic',
+  url: '',
+  data: {
+    results: {
+      metricFindQuery: {
+        status: 200,
+        frames: [
+          {
+            schema: {
+              refId: 'metricFindQuery',
+              meta: {
+                typeVersion: [0, 0],
+                custom: {
+                  headers: {
+                    'content-type': ['application/grpc'],
+                    date: ['Tue, 07 Nov 2023 22:19:44 GMT'],
+                    'strict-transport-security': ['max-age=15724800; includeSubDomains'],
+                    'trace-id': ['481a45f6066c0a45'],
+                    'trace-sampled': ['false'],
+                    'x-envoy-upstream-service-time': ['8'],
+                  },
+                },
+                executedQueryString:
+                  "SELECT table_name FROM information_schema.tables WHERE table_schema = 'iox' ORDER BY table_name",
+              },
+              fields: [
+                {
+                  name: 'table_name',
+                  type: FieldType.string,
+                },
+              ],
+            },
+            data: {
+              values: [['airSensors', 'cpu', 'disk', 'diskio', 'kernel', 'mem', 'processes', 'swap', 'system']],
+            },
+          },
+        ],
+      },
+    },
+  },
+};
diff --git a/public/app/plugins/datasource/influxdb/queryUtils.test.ts b/public/app/plugins/datasource/influxdb/queryUtils.test.ts
index 26c61368e309f..897620729228e 100644
--- a/public/app/plugins/datasource/influxdb/queryUtils.test.ts
+++ b/public/app/plugins/datasource/influxdb/queryUtils.test.ts
@@ -147,6 +147,18 @@ describe('InfluxDB query utils', () => {
               operator: '!~',
               value: '/cpu0/',
             },
+            {
+              condition: 'AND',
+              key: 'cpu',
+              operator: 'Is',
+              value: 'false',
+            },
+            {
+              condition: 'AND',
+              key: 'cpu',
+              operator: 'Is Not',
+              value: 'false',
+            },
           ],
           groupBy: [],
         })
@@ -154,7 +166,7 @@ describe('InfluxDB query utils', () => {
         `SELECT "value" ` +
           `FROM "autogen"."measurement" ` +
           `WHERE ("cpu" = 'cpu0' AND "cpu" != 'cpu0' AND "cpu" <> 'cpu0' AND "cpu" < cpu0 AND ` +
-          `"cpu" > cpu0 AND "cpu" =~ /cpu0/ AND "cpu" !~ /cpu0/) AND $timeFilter`
+          `"cpu" > cpu0 AND "cpu" =~ /cpu0/ AND "cpu" !~ /cpu0/ AND "cpu" = false AND "cpu" != false) AND $timeFilter`
       );
     });
     it('should handle a complex query', () => {
diff --git a/public/app/plugins/datasource/influxdb/queryUtils.ts b/public/app/plugins/datasource/influxdb/queryUtils.ts
index 4e29614906c94..61739fb8a67e0 100644
--- a/public/app/plugins/datasource/influxdb/queryUtils.ts
+++ b/public/app/plugins/datasource/influxdb/queryUtils.ts
@@ -1,7 +1,7 @@
 import { cloneDeep } from 'lodash';
 
 import InfluxQueryModel from './influx_query_model';
-import { InfluxQuery } from './types';
+import { InfluxQuery } from './types'; // FIXME: these functions are a beginning of a refactoring of influx_query_model.ts
 
 // FIXME: these functions are a beginning of a refactoring of influx_query_model.ts
 // into a simpler approach with full typescript types.
@@ -90,3 +90,14 @@ export function changeGroupByPart(query: InfluxQuery, partIndex: number, newPara
   };
   return { ...query, groupBy: newGroupBy };
 }
+
+export function removeRegexWrapper(str: string) {
+  const regex = /\/\^(.*?)\$\//; // match any string that starts with "/^" and ends with "$/", capturing the characters in between
+  const match = str.match(regex);
+
+  if (match && match.length > 1) {
+    return match[1];
+  }
+
+  return str;
+}
diff --git a/public/app/plugins/datasource/influxdb/query_part.ts b/public/app/plugins/datasource/influxdb/query_part.ts
index d37adbafa7fe8..a2bb8f2cd1094 100644
--- a/public/app/plugins/datasource/influxdb/query_part.ts
+++ b/public/app/plugins/datasource/influxdb/query_part.ts
@@ -140,7 +140,7 @@ function addAliasStrategy(selectParts: any[], partModel: any) {
 
 function addFieldStrategy(selectParts: any, partModel: any, query: { selectModels: any[][] }) {
   // copy all parts
-  const parts = map(selectParts, (part: any) => {
+  const parts = map(selectParts, (part) => {
     return createPart({ type: part.def.type, params: clone(part.params) });
   });
 
diff --git a/public/app/plugins/datasource/influxdb/types.ts b/public/app/plugins/datasource/influxdb/types.ts
index b9e257e3fe995..d81cfd0cc1530 100644
--- a/public/app/plugins/datasource/influxdb/types.ts
+++ b/public/app/plugins/datasource/influxdb/types.ts
@@ -23,6 +23,7 @@ export interface InfluxOptions extends DataSourceJsonData {
 
   // With SQL
   metadata?: Array<Record<string, string>>;
+  insecureGrpc?: boolean;
 }
 
 /**
diff --git a/public/app/plugins/datasource/jaeger/CHANGELOG.md b/public/app/plugins/datasource/jaeger/CHANGELOG.md
new file mode 100644
index 0000000000000..825c32f0d03d9
--- /dev/null
+++ b/public/app/plugins/datasource/jaeger/CHANGELOG.md
@@ -0,0 +1 @@
+# Changelog
diff --git a/public/app/plugins/datasource/jaeger/README.md b/public/app/plugins/datasource/jaeger/README.md
index a865a51179f89..059ec9e61d379 100644
--- a/public/app/plugins/datasource/jaeger/README.md
+++ b/public/app/plugins/datasource/jaeger/README.md
@@ -1,7 +1,3 @@
-# Jaeger Data Source - Native Plugin
+# Grafana Jaeger Data Source - Native Plugin
 
-Grafana ships with **built in** support for Jaeger, an open source, end-to-end distributed tracing system.
-
-Read more about it here:
-
-[https://docs.grafana.org/datasources/jaeger/](https://docs.grafana.org/datasources/jaeger/)
+[https://docs.grafana.org/datasources/jaeger/](Grafana plugin for the Jaeger data source).
diff --git a/public/app/plugins/datasource/jaeger/_importedDependencies/README.md b/public/app/plugins/datasource/jaeger/_importedDependencies/README.md
new file mode 100644
index 0000000000000..6a32e35129c10
--- /dev/null
+++ b/public/app/plugins/datasource/jaeger/_importedDependencies/README.md
@@ -0,0 +1,3 @@
+This directory contains dependencies that we duplicated from Grafana core while working on the decoupling of Jaeger from such core.
+The long-term goal is to move these files away from here by replacing them with packages.
+As such, they are only temporary and meant to be used internally to this package, please avoid using them for example as dependencies (imports) in other data source plugins.
diff --git a/public/app/plugins/datasource/jaeger/_importedDependencies/model/trace-viewer.ts b/public/app/plugins/datasource/jaeger/_importedDependencies/model/trace-viewer.ts
new file mode 100644
index 0000000000000..d3978acc24777
--- /dev/null
+++ b/public/app/plugins/datasource/jaeger/_importedDependencies/model/trace-viewer.ts
@@ -0,0 +1,57 @@
+// Copyright (c) 2020 The Jaeger Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { memoize } from 'lodash';
+
+import { TraceSpan } from '../types';
+
+function _getTraceNameImpl(spans: TraceSpan[]) {
+  // Use a span with no references to another span in given array
+  // prefering the span with the fewest references
+  // using start time as a tie breaker
+  let candidateSpan: TraceSpan | undefined;
+  const allIDs: Set<string> = new Set(spans.map(({ spanID }) => spanID));
+
+  for (let i = 0; i < spans.length; i++) {
+    const hasInternalRef =
+      spans[i].references &&
+      spans[i].references.some(({ traceID, spanID }) => traceID === spans[i].traceID && allIDs.has(spanID));
+    if (hasInternalRef) {
+      continue;
+    }
+
+    if (!candidateSpan) {
+      candidateSpan = spans[i];
+      continue;
+    }
+
+    const thisRefLength = (spans[i].references && spans[i].references.length) || 0;
+    const candidateRefLength = (candidateSpan.references && candidateSpan.references.length) || 0;
+
+    if (
+      thisRefLength < candidateRefLength ||
+      (thisRefLength === candidateRefLength && spans[i].startTime < candidateSpan.startTime)
+    ) {
+      candidateSpan = spans[i];
+    }
+  }
+  return candidateSpan ? `${candidateSpan.process.serviceName}: ${candidateSpan.operationName}` : '';
+}
+
+export const getTraceName = memoize(_getTraceNameImpl, (spans: TraceSpan[]) => {
+  if (!spans.length) {
+    return 0;
+  }
+  return spans[0].traceID;
+});
diff --git a/public/app/plugins/datasource/jaeger/_importedDependencies/model/transform-trace-data.tsx b/public/app/plugins/datasource/jaeger/_importedDependencies/model/transform-trace-data.tsx
new file mode 100644
index 0000000000000..97eb98b50fa15
--- /dev/null
+++ b/public/app/plugins/datasource/jaeger/_importedDependencies/model/transform-trace-data.tsx
@@ -0,0 +1,199 @@
+// Copyright (c) 2017 Uber Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { isEqual as _isEqual } from 'lodash';
+
+import { getTraceSpanIdsAsTree } from '../selectors/trace';
+import { TraceKeyValuePair, TraceSpan, Trace, TraceResponse, TraceProcess } from '../types';
+import TreeNode from '../utils/TreeNode';
+import { getConfigValue } from '../utils/config/get-config';
+
+import { getTraceName } from './trace-viewer';
+
+function deduplicateTags(tags: TraceKeyValuePair[]) {
+  const warningsHash: Map<string, string> = new Map<string, string>();
+  const dedupedTags: TraceKeyValuePair[] = tags.reduce<TraceKeyValuePair[]>((uniqueTags, tag) => {
+    if (!uniqueTags.some((t) => t.key === tag.key && t.value === tag.value)) {
+      uniqueTags.push(tag);
+    } else {
+      warningsHash.set(`${tag.key}:${tag.value}`, `Duplicate tag "${tag.key}:${tag.value}"`);
+    }
+    return uniqueTags;
+  }, []);
+  const warnings = Array.from(warningsHash.values());
+  return { dedupedTags, warnings };
+}
+
+function orderTags(tags: TraceKeyValuePair[], topPrefixes?: string[]) {
+  const orderedTags: TraceKeyValuePair[] = tags?.slice() ?? [];
+  const tp = (topPrefixes || []).map((p: string) => p.toLowerCase());
+
+  orderedTags.sort((a, b) => {
+    const aKey = a.key.toLowerCase();
+    const bKey = b.key.toLowerCase();
+
+    for (let i = 0; i < tp.length; i++) {
+      const p = tp[i];
+      if (aKey.startsWith(p) && !bKey.startsWith(p)) {
+        return -1;
+      }
+      if (!aKey.startsWith(p) && bKey.startsWith(p)) {
+        return 1;
+      }
+    }
+
+    if (aKey > bKey) {
+      return 1;
+    }
+    if (aKey < bKey) {
+      return -1;
+    }
+    return 0;
+  });
+
+  return orderedTags;
+}
+
+/**
+ * NOTE: Mutates `data` - Transform the HTTP response data into the form the app
+ * generally requires.
+ */
+export default function transformTraceData(data: TraceResponse | undefined): Trace | null {
+  if (!data?.traceID) {
+    return null;
+  }
+  const traceID = data.traceID.toLowerCase();
+
+  let traceEndTime = 0;
+  let traceStartTime = Number.MAX_SAFE_INTEGER;
+  const spanIdCounts = new Map();
+  const spanMap = new Map<string, TraceSpan>();
+  // filter out spans with empty start times
+  // eslint-disable-next-line no-param-reassign
+  data.spans = data.spans.filter((span) => Boolean(span.startTime));
+
+  // Sort process tags
+  data.processes = Object.entries(data.processes).reduce<Record<string, TraceProcess>>((processes, [id, process]) => {
+    processes[id] = {
+      ...process,
+      tags: orderTags(process.tags),
+    };
+    return processes;
+  }, {});
+
+  const max = data.spans.length;
+  for (let i = 0; i < max; i++) {
+    const span: TraceSpan = data.spans[i] as TraceSpan;
+    const { startTime, duration, processID } = span;
+
+    let spanID = span.spanID;
+    // check for start / end time for the trace
+    if (startTime < traceStartTime) {
+      traceStartTime = startTime;
+    }
+    if (startTime + duration > traceEndTime) {
+      traceEndTime = startTime + duration;
+    }
+    // make sure span IDs are unique
+    const idCount = spanIdCounts.get(spanID);
+    if (idCount != null) {
+      // eslint-disable-next-line no-console
+      console.warn(`Dupe spanID, ${idCount + 1} x ${spanID}`, span, spanMap.get(spanID));
+      if (_isEqual(span, spanMap.get(spanID))) {
+        // eslint-disable-next-line no-console
+        console.warn('\t two spans with same ID have `isEqual(...) === true`');
+      }
+      spanIdCounts.set(spanID, idCount + 1);
+      spanID = `${spanID}_${idCount}`;
+      span.spanID = spanID;
+    } else {
+      spanIdCounts.set(spanID, 1);
+    }
+    span.process = data.processes[processID];
+    spanMap.set(spanID, span);
+  }
+  // tree is necessary to sort the spans, so children follow parents, and
+  // siblings are sorted by start time
+  const tree = getTraceSpanIdsAsTree(data, spanMap);
+  const spans: TraceSpan[] = [];
+  const svcCounts: Record<string, number> = {};
+
+  tree.walk((spanID: string, node: TreeNode<string>, depth = 0) => {
+    if (spanID === '__root__') {
+      return;
+    }
+    if (typeof spanID !== 'string') {
+      return;
+    }
+    const span = spanMap.get(spanID);
+    if (!span) {
+      return;
+    }
+    const { serviceName } = span.process;
+    svcCounts[serviceName] = (svcCounts[serviceName] || 0) + 1;
+    span.relativeStartTime = span.startTime - traceStartTime;
+    span.depth = depth - 1;
+    span.hasChildren = node.children.length > 0;
+    span.childSpanCount = node.children.length;
+    span.warnings = span.warnings || [];
+    span.tags = span.tags || [];
+    span.references = span.references || [];
+
+    span.childSpanIds = node.children
+      .slice()
+      .sort((a, b) => {
+        const spanA = spanMap.get(a.value)!;
+        const spanB = spanMap.get(b.value)!;
+        return spanB.startTime + spanB.duration - (spanA.startTime + spanA.duration);
+      })
+      .map((each) => each.value);
+
+    const tagsInfo = deduplicateTags(span.tags);
+    span.tags = orderTags(tagsInfo.dedupedTags, getConfigValue('topTagPrefixes'));
+    span.warnings = span.warnings.concat(tagsInfo.warnings);
+    span.references.forEach((ref, index) => {
+      const refSpan = spanMap.get(ref.spanID);
+      if (refSpan) {
+        // eslint-disable-next-line no-param-reassign
+        ref.span = refSpan;
+        if (index > 0) {
+          // Don't take into account the parent, just other references.
+          refSpan.subsidiarilyReferencedBy = refSpan.subsidiarilyReferencedBy || [];
+          refSpan.subsidiarilyReferencedBy.push({
+            spanID,
+            traceID,
+            span,
+            refType: ref.refType,
+          });
+        }
+      }
+    });
+    spans.push(span);
+  });
+  const traceName = getTraceName(spans);
+  const services = Object.keys(svcCounts).map((name) => ({ name, numberOfSpans: svcCounts[name] }));
+  return {
+    services,
+    spans,
+    traceID,
+    traceName,
+    // can't use spread operator for intersection types
+    // repl: https://goo.gl/4Z23MJ
+    // issue: https://github.com/facebook/flow/issues/1511
+    processes: data.processes,
+    duration: traceEndTime - traceStartTime,
+    startTime: traceStartTime,
+    endTime: traceEndTime,
+  };
+}
diff --git a/public/app/plugins/datasource/jaeger/_importedDependencies/selectors/trace.ts b/public/app/plugins/datasource/jaeger/_importedDependencies/selectors/trace.ts
new file mode 100644
index 0000000000000..9fb695b3321d1
--- /dev/null
+++ b/public/app/plugins/datasource/jaeger/_importedDependencies/selectors/trace.ts
@@ -0,0 +1,65 @@
+// Copyright (c) 2017 Uber Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { TraceResponse, TraceSpanData } from '../types/trace';
+import TreeNode from '../utils/TreeNode';
+
+const TREE_ROOT_ID = '__root__';
+
+/**
+ * Build a tree of { value: spanID, children } items derived from the
+ * `span.references` information. The tree represents the grouping of parent /
+ * child relationships. The root-most node is nominal in that
+ * `.value === TREE_ROOT_ID`. This is done because a root span (the main trace
+ * span) is not always included with the trace data. Thus, there can be
+ * multiple top-level spans, and the root node acts as their common parent.
+ *
+ * The children are sorted by `span.startTime` after the tree is built.
+ *
+ * @param  {Trace} trace The trace to build the tree of spanIDs.
+ * @return {TreeNode}    A tree of spanIDs derived from the relationships
+ *                       between spans in the trace.
+ */
+export function getTraceSpanIdsAsTree(trace: TraceResponse, spanMap: Map<string, TraceSpanData> | null = null) {
+  const nodesById = new Map(trace.spans.map((span: TraceSpanData) => [span.spanID, new TreeNode(span.spanID)]));
+  const spansById = spanMap ?? new Map(trace.spans.map((span: TraceSpanData) => [span.spanID, span]));
+  const root = new TreeNode(TREE_ROOT_ID);
+  trace.spans.forEach((span: TraceSpanData) => {
+    const node = nodesById.get(span.spanID)!;
+    if (Array.isArray(span.references) && span.references.length) {
+      const { refType, spanID: parentID } = span.references[0];
+      if (refType === 'CHILD_OF' || refType === 'FOLLOWS_FROM') {
+        const parent = nodesById.get(parentID) || root;
+        parent.children?.push(node);
+      } else {
+        throw new Error(`Unrecognized ref type: ${refType}`);
+      }
+    } else {
+      root.children.push(node);
+    }
+  });
+  const comparator = (nodeA: TreeNode<string>, nodeB: TreeNode<string>) => {
+    const a: TraceSpanData | undefined = nodeA?.value ? spansById.get(nodeA.value.toString()) : undefined;
+    const b: TraceSpanData | undefined = nodeB?.value ? spansById.get(nodeB.value.toString()) : undefined;
+    return +(a?.startTime! > b?.startTime!) || +(a?.startTime === b?.startTime) - 1;
+  };
+  trace.spans.forEach((span: TraceSpanData) => {
+    const node = nodesById.get(span.spanID);
+    if (node!.children.length > 1) {
+      node?.children.sort(comparator);
+    }
+  });
+  root.children.sort(comparator);
+  return root;
+}
diff --git a/public/app/plugins/datasource/jaeger/_importedDependencies/types/index.tsx b/public/app/plugins/datasource/jaeger/_importedDependencies/types/index.tsx
new file mode 100644
index 0000000000000..5eaae6e676e42
--- /dev/null
+++ b/public/app/plugins/datasource/jaeger/_importedDependencies/types/index.tsx
@@ -0,0 +1,23 @@
+// Copyright (c) 2017 Uber Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+export {
+  TraceSpan,
+  TraceResponse,
+  Trace,
+  TraceProcess,
+  TraceKeyValuePair,
+  TraceLink,
+  CriticalPathSection,
+} from './trace';
diff --git a/public/app/plugins/datasource/jaeger/_importedDependencies/types/trace.ts b/public/app/plugins/datasource/jaeger/_importedDependencies/types/trace.ts
new file mode 100644
index 0000000000000..0507287b98746
--- /dev/null
+++ b/public/app/plugins/datasource/jaeger/_importedDependencies/types/trace.ts
@@ -0,0 +1,112 @@
+// Copyright (c) 2017 Uber Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/**
+ * All timestamps are in microseconds
+ */
+
+// TODO: Everett Tech Debt: Fix KeyValuePair types
+export type TraceKeyValuePair = {
+  key: string;
+  type?: string;
+  value: any;
+};
+
+export type TraceLink = {
+  url: string;
+  text: string;
+};
+
+export type TraceLog = {
+  timestamp: number;
+  fields: TraceKeyValuePair[];
+};
+
+export type TraceProcess = {
+  serviceName: string;
+  tags: TraceKeyValuePair[];
+};
+
+export type TraceSpanReference = {
+  refType: 'CHILD_OF' | 'FOLLOWS_FROM';
+  // eslint-disable-next-line no-use-before-define
+  span?: TraceSpan | null | undefined;
+  spanID: string;
+  traceID: string;
+  tags?: TraceKeyValuePair[];
+};
+
+export type TraceSpanData = {
+  spanID: string;
+  traceID: string;
+  processID: string;
+  operationName: string;
+  // Times are in microseconds
+  startTime: number;
+  duration: number;
+  logs: TraceLog[];
+  tags?: TraceKeyValuePair[];
+  kind?: string;
+  statusCode?: number;
+  statusMessage?: string;
+  instrumentationLibraryName?: string;
+  instrumentationLibraryVersion?: string;
+  traceState?: string;
+  references?: TraceSpanReference[];
+  warnings?: string[] | null;
+  stackTraces?: string[];
+  flags: number;
+  errorIconColor?: string;
+  dataFrameRowIndex?: number;
+  childSpanIds?: string[];
+};
+
+export type TraceSpan = TraceSpanData & {
+  depth: number;
+  hasChildren: boolean;
+  childSpanCount: number;
+  process: TraceProcess;
+  relativeStartTime: number;
+  tags: NonNullable<TraceSpanData['tags']>;
+  references: NonNullable<TraceSpanData['references']>;
+  warnings: NonNullable<TraceSpanData['warnings']>;
+  childSpanIds: NonNullable<TraceSpanData['childSpanIds']>;
+  subsidiarilyReferencedBy: TraceSpanReference[];
+};
+
+export type TraceData = {
+  processes: Record<string, TraceProcess>;
+  traceID: string;
+  warnings?: string[] | null;
+};
+
+export type TraceResponse = TraceData & {
+  spans: TraceSpanData[];
+};
+
+export type Trace = TraceData & {
+  duration: number;
+  endTime: number;
+  spans: TraceSpan[];
+  startTime: number;
+  traceName: string;
+  services: Array<{ name: string; numberOfSpans: number }>;
+};
+
+// It is a section of span that lies on critical path
+export type CriticalPathSection = {
+  spanId: string;
+  section_start: number;
+  section_end: number;
+};
diff --git a/public/app/plugins/datasource/jaeger/_importedDependencies/utils/TreeNode.ts b/public/app/plugins/datasource/jaeger/_importedDependencies/utils/TreeNode.ts
new file mode 100644
index 0000000000000..f6b123f2d5022
--- /dev/null
+++ b/public/app/plugins/datasource/jaeger/_importedDependencies/utils/TreeNode.ts
@@ -0,0 +1,139 @@
+// Copyright (c) 2017 Uber Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License
+
+export default class TreeNode<TValue> {
+  value: TValue;
+  children: Array<TreeNode<TValue>>;
+
+  static iterFunction<TValue>(
+    fn: ((value: TValue, node: TreeNode<TValue>, depth: number) => TreeNode<TValue> | null) | Function,
+    depth = 0
+  ) {
+    return (node: TreeNode<TValue>) => fn(node.value, node, depth);
+  }
+
+  static searchFunction<TValue>(search: Function | TreeNode<TValue>) {
+    if (typeof search === 'function') {
+      return search;
+    }
+
+    return (value: TValue, node: TreeNode<TValue>) => (search instanceof TreeNode ? node === search : value === search);
+  }
+
+  constructor(value: TValue, children: Array<TreeNode<TValue>> = []) {
+    this.value = value;
+    this.children = children;
+  }
+
+  get depth(): number {
+    return this.children.reduce((depth, child) => Math.max(child.depth + 1, depth), 1);
+  }
+
+  get size() {
+    let i = 0;
+    this.walk(() => i++);
+    return i;
+  }
+
+  addChild(child: TreeNode<TValue> | TValue) {
+    this.children.push(child instanceof TreeNode ? child : new TreeNode(child));
+    return this;
+  }
+
+  find(search: Function | TreeNode<TValue>): TreeNode<TValue> | null {
+    const searchFn = TreeNode.iterFunction(TreeNode.searchFunction(search));
+    if (searchFn(this)) {
+      return this;
+    }
+    for (let i = 0; i < this.children.length; i++) {
+      const result = this.children[i].find(search);
+      if (result) {
+        return result;
+      }
+    }
+    return null;
+  }
+
+  getPath(search: Function | TreeNode<TValue>) {
+    const searchFn = TreeNode.iterFunction(TreeNode.searchFunction(search));
+
+    const findPath = (
+      currentNode: TreeNode<TValue>,
+      currentPath: Array<TreeNode<TValue>>
+    ): Array<TreeNode<TValue>> | null => {
+      // skip if we already found the result
+      const attempt = currentPath.concat([currentNode]);
+      // base case: return the array when there is a match
+      if (searchFn(currentNode)) {
+        return attempt;
+      }
+      for (let i = 0; i < currentNode.children.length; i++) {
+        const child = currentNode.children[i];
+        const match = findPath(child, attempt);
+        if (match) {
+          return match;
+        }
+      }
+      return null;
+    };
+
+    return findPath(this, []);
+  }
+
+  walk(fn: (spanID: TValue, node: TreeNode<TValue>, depth: number) => void, startDepth = 0) {
+    type StackEntry = {
+      node: TreeNode<TValue>;
+      depth: number;
+    };
+    const nodeStack: StackEntry[] = [];
+    let actualDepth = startDepth;
+    nodeStack.push({ node: this, depth: actualDepth });
+    while (nodeStack.length) {
+      const entry: StackEntry = nodeStack[nodeStack.length - 1];
+      nodeStack.pop();
+      const { node, depth } = entry;
+      fn(node.value, node, depth);
+      actualDepth = depth + 1;
+      let i = node.children.length - 1;
+      while (i >= 0) {
+        nodeStack.push({ node: node.children[i], depth: actualDepth });
+        i--;
+      }
+    }
+  }
+
+  paths(fn: (pathIds: TValue[]) => void) {
+    type StackEntry = {
+      node: TreeNode<TValue>;
+      childIndex: number;
+    };
+    const stack: StackEntry[] = [];
+    stack.push({ node: this, childIndex: 0 });
+    const paths: TValue[] = [];
+    while (stack.length) {
+      const { node, childIndex } = stack[stack.length - 1];
+      if (node.children.length >= childIndex + 1) {
+        stack[stack.length - 1].childIndex++;
+        stack.push({ node: node.children[childIndex], childIndex: 0 });
+      } else {
+        if (node.children.length === 0) {
+          const path = stack.map((item) => item.node.value);
+          fn(path);
+        }
+        stack.pop();
+      }
+    }
+    return paths;
+  }
+}
diff --git a/public/app/plugins/datasource/jaeger/_importedDependencies/utils/config/default-config.ts b/public/app/plugins/datasource/jaeger/_importedDependencies/utils/config/default-config.ts
new file mode 100644
index 0000000000000..1e8215a230dfb
--- /dev/null
+++ b/public/app/plugins/datasource/jaeger/_importedDependencies/utils/config/default-config.ts
@@ -0,0 +1,40 @@
+// Copyright (c) 2017 Uber Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+const FALLBACK_DAG_MAX_NUM_SERVICES = 100;
+
+export default Object.defineProperty(
+  {
+    archiveEnabled: false,
+    dependencies: {
+      dagMaxNumServices: FALLBACK_DAG_MAX_NUM_SERVICES,
+      menuEnabled: true,
+    },
+    linkPatterns: [],
+    search: {
+      maxLookback: {
+        label: '2 Days',
+        value: '2d',
+      },
+      maxLimit: 1500,
+    },
+    tracking: {
+      gaID: null,
+      trackErrors: true,
+    },
+  },
+  // fields that should be individually merged vs wholesale replaced
+  '__mergeFields',
+  { value: ['dependencies', 'search', 'tracking'] }
+);
diff --git a/public/app/plugins/datasource/jaeger/_importedDependencies/utils/config/get-config.tsx b/public/app/plugins/datasource/jaeger/_importedDependencies/utils/config/get-config.tsx
new file mode 100644
index 0000000000000..0a1ec89870c83
--- /dev/null
+++ b/public/app/plugins/datasource/jaeger/_importedDependencies/utils/config/get-config.tsx
@@ -0,0 +1,29 @@
+// Copyright (c) 2017 Uber Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { get as _get } from 'lodash';
+
+import defaultConfig from './default-config';
+
+/**
+ * Merge the embedded config from the query service (if present) with the
+ * default config from `../../constants/default-config`.
+ */
+export default function getConfig() {
+  return defaultConfig;
+}
+
+export function getConfigValue(path: string) {
+  return _get(getConfig(), path);
+}
diff --git a/public/app/plugins/datasource/jaeger/components/QueryEditor.tsx b/public/app/plugins/datasource/jaeger/components/QueryEditor.tsx
index 6b0a7c3a9a457..22c9835229687 100644
--- a/public/app/plugins/datasource/jaeger/components/QueryEditor.tsx
+++ b/public/app/plugins/datasource/jaeger/components/QueryEditor.tsx
@@ -36,6 +36,8 @@ export function QueryEditor({ datasource, query, onChange, onRunQuery }: Props)
     switch (query.queryType) {
       case 'search':
         return <SearchForm datasource={datasource} query={query} onChange={onChange} />;
+      case 'dependencyGraph':
+        return null;
       default:
         return (
           <InlineFieldRow>
@@ -79,6 +81,7 @@ export function QueryEditor({ datasource, query, onChange, onRunQuery }: Props)
                 options={[
                   { value: 'search', label: 'Search' },
                   { value: undefined, label: 'TraceID' },
+                  { value: 'dependencyGraph', label: 'Dependency graph' },
                 ]}
                 value={query.queryType}
                 onChange={(v) =>
@@ -108,7 +111,7 @@ export function QueryEditor({ datasource, query, onChange, onRunQuery }: Props)
 }
 
 const getStyles = () => ({
-  container: css`
-    width: 100%;
-  `,
+  container: css({
+    width: '100%',
+  }),
 });
diff --git a/public/app/plugins/datasource/jaeger/components/SearchForm.test.tsx b/public/app/plugins/datasource/jaeger/components/SearchForm.test.tsx
index 61d5000d6774c..bc1bae92086ee 100644
--- a/public/app/plugins/datasource/jaeger/components/SearchForm.test.tsx
+++ b/public/app/plugins/datasource/jaeger/components/SearchForm.test.tsx
@@ -2,17 +2,19 @@ import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { of } from 'rxjs';
-import { createFetchResponse } from 'test/helpers/createFetchResponse';
 
 import { DataQueryRequest, DataSourceInstanceSettings, dateTime, PluginMetaInfo, PluginType } from '@grafana/data';
-import { backendSrv } from 'app/core/services/backend_srv';
+import { BackendSrv } from '@grafana/runtime';
 
 import { JaegerDatasource, JaegerJsonData } from '../datasource';
+import { createFetchResponse } from '../helpers/createFetchResponse';
 import { testResponse } from '../testResponse';
 import { JaegerQuery } from '../types';
 
 import SearchForm from './SearchForm';
 
+export const backendSrv = { fetch: jest.fn() } as unknown as BackendSrv;
+
 jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
   getTemplateSrv: () => ({
diff --git a/public/app/plugins/datasource/jaeger/components/SearchForm.tsx b/public/app/plugins/datasource/jaeger/components/SearchForm.tsx
index 38556b90cdf78..229a709e4d78b 100644
--- a/public/app/plugins/datasource/jaeger/components/SearchForm.tsx
+++ b/public/app/plugins/datasource/jaeger/components/SearchForm.tsx
@@ -2,11 +2,9 @@ import { css } from '@emotion/css';
 import React, { useCallback, useEffect, useState } from 'react';
 
 import { SelectableValue, toOption } from '@grafana/data';
+import { TemporaryAlert } from '@grafana/o11y-ds-frontend';
 import { getTemplateSrv } from '@grafana/runtime';
 import { fuzzyMatch, InlineField, InlineFieldRow, Input, Select } from '@grafana/ui';
-import { notifyApp } from 'app/core/actions';
-import { createErrorNotification } from 'app/core/copy/appNotification';
-import { dispatch } from 'app/store/store';
 
 import { JaegerDatasource } from '../datasource';
 import { JaegerQuery } from '../types';
@@ -27,6 +25,7 @@ const allOperationsOption: SelectableValue<string> = {
 };
 
 export function SearchForm({ datasource, query, onChange }: Props) {
+  const [alertText, setAlertText] = useState('');
   const [serviceOptions, setServiceOptions] = useState<Array<SelectableValue<string>>>();
   const [operationOptions, setOperationOptions] = useState<Array<SelectableValue<string>>>();
   const [isLoading, setIsLoading] = useState<{
@@ -53,10 +52,11 @@ export function SearchForm({ datasource, query, onChange }: Props) {
         }));
 
         const filteredOptions = options.filter((item) => (item.value ? fuzzyMatch(item.value, query).found : false));
+        setAlertText('');
         return filteredOptions;
       } catch (error) {
         if (error instanceof Error) {
-          dispatch(notifyApp(createErrorNotification('Error', error)));
+          setAlertText(`Error: ${error.message}`);
         }
         return [];
       } finally {
@@ -94,121 +94,124 @@ export function SearchForm({ datasource, query, onChange }: Props) {
   }, [datasource, query.service, loadOptions, query.operation]);
 
   return (
-    <div className={css({ maxWidth: '500px' })}>
-      <InlineFieldRow>
-        <InlineField label="Service Name" labelWidth={14} grow>
-          <Select
-            inputId="service"
-            options={serviceOptions}
-            onOpenMenu={() => loadOptions('/api/services', 'services')}
-            isLoading={isLoading.services}
-            value={serviceOptions?.find((v) => v?.value === query.service) || undefined}
-            placeholder="Select a service"
-            onChange={(v) =>
-              onChange({
-                ...query,
-                service: v?.value!,
-                operation: query.service !== v?.value ? undefined : query.operation,
-              })
-            }
-            menuPlacement="bottom"
-            isClearable
-            aria-label={'select-service-name'}
-            allowCustomValue={true}
-          />
-        </InlineField>
-      </InlineFieldRow>
-      <InlineFieldRow>
-        <InlineField label="Operation Name" labelWidth={14} grow disabled={!query.service}>
-          <Select
-            inputId="operation"
-            options={operationOptions}
-            onOpenMenu={() =>
-              loadOptions(
-                `/api/services/${encodeURIComponent(getTemplateSrv().replace(query.service!))}/operations`,
-                'operations'
-              )
-            }
-            isLoading={isLoading.operations}
-            value={operationOptions?.find((v) => v.value === query.operation) || null}
-            placeholder="Select an operation"
-            onChange={(v) =>
-              onChange({
-                ...query,
-                operation: v?.value! || undefined,
-              })
-            }
-            menuPlacement="bottom"
-            isClearable
-            aria-label={'select-operation-name'}
-            allowCustomValue={true}
-          />
-        </InlineField>
-      </InlineFieldRow>
-      <InlineFieldRow>
-        <InlineField label="Tags" labelWidth={14} grow tooltip="Values should be in logfmt.">
-          <Input
-            id="tags"
-            value={transformToLogfmt(query.tags)}
-            placeholder="http.status_code=200 error=true"
-            onChange={(v) =>
-              onChange({
-                ...query,
-                tags: v.currentTarget.value,
-              })
-            }
-          />
-        </InlineField>
-      </InlineFieldRow>
-      <InlineFieldRow>
-        <InlineField label="Min Duration" labelWidth={14} grow>
-          <Input
-            id="minDuration"
-            name="minDuration"
-            value={query.minDuration || ''}
-            placeholder={durationPlaceholder}
-            onChange={(v) =>
-              onChange({
-                ...query,
-                minDuration: v.currentTarget.value,
-              })
-            }
-          />
-        </InlineField>
-      </InlineFieldRow>
-      <InlineFieldRow>
-        <InlineField label="Max Duration" labelWidth={14} grow>
-          <Input
-            id="maxDuration"
-            name="maxDuration"
-            value={query.maxDuration || ''}
-            placeholder={durationPlaceholder}
-            onChange={(v) =>
-              onChange({
-                ...query,
-                maxDuration: v.currentTarget.value,
-              })
-            }
-          />
-        </InlineField>
-      </InlineFieldRow>
-      <InlineFieldRow>
-        <InlineField label="Limit" labelWidth={14} grow tooltip="Maximum number of returned results">
-          <Input
-            id="limit"
-            name="limit"
-            value={query.limit || ''}
-            type="number"
-            onChange={(v) =>
-              onChange({
-                ...query,
-                limit: v.currentTarget.value ? parseInt(v.currentTarget.value, 10) : undefined,
-              })
-            }
-          />
-        </InlineField>
-      </InlineFieldRow>
-    </div>
+    <>
+      <div className={css({ maxWidth: '500px' })}>
+        <InlineFieldRow>
+          <InlineField label="Service Name" labelWidth={14} grow>
+            <Select
+              inputId="service"
+              options={serviceOptions}
+              onOpenMenu={() => loadOptions('/api/services', 'services')}
+              isLoading={isLoading.services}
+              value={serviceOptions?.find((v) => v?.value === query.service) || undefined}
+              placeholder="Select a service"
+              onChange={(v) =>
+                onChange({
+                  ...query,
+                  service: v?.value!,
+                  operation: query.service !== v?.value ? undefined : query.operation,
+                })
+              }
+              menuPlacement="bottom"
+              isClearable
+              aria-label={'select-service-name'}
+              allowCustomValue={true}
+            />
+          </InlineField>
+        </InlineFieldRow>
+        <InlineFieldRow>
+          <InlineField label="Operation Name" labelWidth={14} grow disabled={!query.service}>
+            <Select
+              inputId="operation"
+              options={operationOptions}
+              onOpenMenu={() =>
+                loadOptions(
+                  `/api/services/${encodeURIComponent(getTemplateSrv().replace(query.service!))}/operations`,
+                  'operations'
+                )
+              }
+              isLoading={isLoading.operations}
+              value={operationOptions?.find((v) => v.value === query.operation) || null}
+              placeholder="Select an operation"
+              onChange={(v) =>
+                onChange({
+                  ...query,
+                  operation: v?.value! || undefined,
+                })
+              }
+              menuPlacement="bottom"
+              isClearable
+              aria-label={'select-operation-name'}
+              allowCustomValue={true}
+            />
+          </InlineField>
+        </InlineFieldRow>
+        <InlineFieldRow>
+          <InlineField label="Tags" labelWidth={14} grow tooltip="Values should be in logfmt.">
+            <Input
+              id="tags"
+              value={transformToLogfmt(query.tags)}
+              placeholder="http.status_code=200 error=true"
+              onChange={(v) =>
+                onChange({
+                  ...query,
+                  tags: v.currentTarget.value,
+                })
+              }
+            />
+          </InlineField>
+        </InlineFieldRow>
+        <InlineFieldRow>
+          <InlineField label="Min Duration" labelWidth={14} grow>
+            <Input
+              id="minDuration"
+              name="minDuration"
+              value={query.minDuration || ''}
+              placeholder={durationPlaceholder}
+              onChange={(v) =>
+                onChange({
+                  ...query,
+                  minDuration: v.currentTarget.value,
+                })
+              }
+            />
+          </InlineField>
+        </InlineFieldRow>
+        <InlineFieldRow>
+          <InlineField label="Max Duration" labelWidth={14} grow>
+            <Input
+              id="maxDuration"
+              name="maxDuration"
+              value={query.maxDuration || ''}
+              placeholder={durationPlaceholder}
+              onChange={(v) =>
+                onChange({
+                  ...query,
+                  maxDuration: v.currentTarget.value,
+                })
+              }
+            />
+          </InlineField>
+        </InlineFieldRow>
+        <InlineFieldRow>
+          <InlineField label="Limit" labelWidth={14} grow tooltip="Maximum number of returned results">
+            <Input
+              id="limit"
+              name="limit"
+              value={query.limit || ''}
+              type="number"
+              onChange={(v) =>
+                onChange({
+                  ...query,
+                  limit: v.currentTarget.value ? parseInt(v.currentTarget.value, 10) : undefined,
+                })
+              }
+            />
+          </InlineField>
+        </InlineFieldRow>
+      </div>
+      {alertText && <TemporaryAlert text={alertText} severity="error" />}
+    </>
   );
 }
 
diff --git a/public/app/plugins/datasource/jaeger/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/jaeger/configuration/ConfigEditor.tsx
index 50f3d8d5e8df3..0eb57f2a38314 100644
--- a/public/app/plugins/datasource/jaeger/configuration/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/jaeger/configuration/ConfigEditor.tsx
@@ -3,13 +3,9 @@ import React from 'react';
 
 import { DataSourcePluginOptionsEditorProps, GrafanaTheme2 } from '@grafana/data';
 import { ConfigSection, DataSourceDescription } from '@grafana/experimental';
+import { NodeGraphSection, SpanBarSection, TraceToLogsSection, TraceToMetricsSection } from '@grafana/o11y-ds-frontend';
 import { config } from '@grafana/runtime';
-import { DataSourceHttpSettings, useStyles2 } from '@grafana/ui';
-import { Divider } from 'app/core/components/Divider';
-import { NodeGraphSection } from 'app/core/components/NodeGraphSettings';
-import { TraceToLogsSection } from 'app/core/components/TraceToLogs/TraceToLogsSettings';
-import { TraceToMetricsSection } from 'app/core/components/TraceToMetrics/TraceToMetricsSettings';
-import { SpanBarSection } from 'app/features/explore/TraceView/components/settings/SpanBarSettings';
+import { DataSourceHttpSettings, useStyles2, Divider, Stack } from '@grafana/ui';
 
 import { TraceIdTimeParams } from './TraceIdTimeParams';
 
@@ -26,7 +22,7 @@ export const ConfigEditor = ({ options, onOptionsChange }: Props) => {
         hasRequiredFields={false}
       />
 
-      <Divider />
+      <Divider spacing={4} />
 
       <DataSourceHttpSettings
         defaultUrl="http://localhost:16686"
@@ -37,15 +33,10 @@ export const ConfigEditor = ({ options, onOptionsChange }: Props) => {
       />
 
       <TraceToLogsSection options={options} onOptionsChange={onOptionsChange} />
+      <Divider spacing={4} />
 
-      <Divider />
-
-      {config.featureToggles.traceToMetrics ? (
-        <>
-          <TraceToMetricsSection options={options} onOptionsChange={onOptionsChange} />
-          <Divider />
-        </>
-      ) : null}
+      <TraceToMetricsSection options={options} onOptionsChange={onOptionsChange} />
+      <Divider spacing={4} />
 
       <ConfigSection
         title="Additional settings"
@@ -53,11 +44,11 @@ export const ConfigEditor = ({ options, onOptionsChange }: Props) => {
         isCollapsible={true}
         isInitiallyOpen={false}
       >
-        <NodeGraphSection options={options} onOptionsChange={onOptionsChange} />
-        <Divider hideLine={true} />
-        <SpanBarSection options={options} onOptionsChange={onOptionsChange} />
-        <Divider hideLine={true} />
-        <TraceIdTimeParams options={options} onOptionsChange={onOptionsChange} />
+        <Stack gap={5} direction="column">
+          <NodeGraphSection options={options} onOptionsChange={onOptionsChange} />
+          <SpanBarSection options={options} onOptionsChange={onOptionsChange} />
+          <TraceIdTimeParams options={options} onOptionsChange={onOptionsChange} />
+        </Stack>
       </ConfigSection>
     </div>
   );
diff --git a/public/app/plugins/datasource/jaeger/datasource.test.ts b/public/app/plugins/datasource/jaeger/datasource.test.ts
index 86416be5eef4a..c2e3b4ddab6b1 100644
--- a/public/app/plugins/datasource/jaeger/datasource.test.ts
+++ b/public/app/plugins/datasource/jaeger/datasource.test.ts
@@ -1,5 +1,4 @@
 import { lastValueFrom, of, throwError } from 'rxjs';
-import { createFetchResponse } from 'test/helpers/createFetchResponse';
 
 import {
   DataQueryRequest,
@@ -10,11 +9,11 @@ import {
   PluginType,
   ScopedVars,
 } from '@grafana/data';
-import { backendSrv } from 'app/core/services/backend_srv';
-import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
+import { BackendSrv } from '@grafana/runtime';
 
 import { ALL_OPERATIONS_KEY } from './components/SearchForm';
 import { JaegerDatasource, JaegerJsonData } from './datasource';
+import { createFetchResponse } from './helpers/createFetchResponse';
 import mockJson from './mockJsonResponse.json';
 import {
   testResponse,
@@ -24,6 +23,8 @@ import {
 } from './testResponse';
 import { JaegerQuery } from './types';
 
+export const backendSrv = { fetch: jest.fn() } as unknown as BackendSrv;
+
 jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
   getBackendSrv: () => backendSrv,
@@ -37,18 +38,16 @@ jest.mock('@grafana/runtime', () => ({
   }),
 }));
 
-const timeSrvStub = {
-  timeRange() {
-    return {
-      from: dateTime(1531468681),
-      to: dateTime(1531489712),
-    };
-  },
-} as TimeSrv;
-
 describe('JaegerDatasource', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+
+    const fetchMock = jest.spyOn(Date, 'now');
+    fetchMock.mockImplementation(() => 1704106800000); // milliseconds for 2024-01-01 at 11:00am UTC
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
   });
 
   it('returns trace and graph when queried', async () => {
@@ -121,7 +120,7 @@ describe('JaegerDatasource', () => {
 
   it('should return search results when the query type is search', async () => {
     const mock = setupFetchMock({ data: [testResponse] });
-    const ds = new JaegerDatasource(defaultSettings, timeSrvStub);
+    const ds = new JaegerDatasource(defaultSettings);
     const response = await lastValueFrom(
       ds.query({
         ...defaultQuery,
@@ -129,7 +128,7 @@ describe('JaegerDatasource', () => {
       })
     );
     expect(mock).toBeCalledWith({
-      url: `${defaultSettings.url}/api/traces?service=jaeger-query&operation=%2Fapi%2Fservices&start=1531468681000&end=1531489712000&lookback=custom`,
+      url: `${defaultSettings.url}/api/traces?service=jaeger-query&operation=%2Fapi%2Fservices&start=1704085200000000&end=1704106800000000&lookback=custom`,
     });
     expect(response.data[0].meta.preferredVisualisationType).toBe('table');
     // Make sure that traceID field has data link configured
@@ -138,7 +137,7 @@ describe('JaegerDatasource', () => {
   });
 
   it('should show the correct error message if no service name is selected', async () => {
-    const ds = new JaegerDatasource(defaultSettings, timeSrvStub);
+    const ds = new JaegerDatasource(defaultSettings);
     const response = await lastValueFrom(
       ds.query({
         ...defaultQuery,
@@ -150,7 +149,7 @@ describe('JaegerDatasource', () => {
 
   it('should remove operation from the query when all is selected', async () => {
     const mock = setupFetchMock({ data: [testResponse] });
-    const ds = new JaegerDatasource(defaultSettings, timeSrvStub);
+    const ds = new JaegerDatasource(defaultSettings);
     await lastValueFrom(
       ds.query({
         ...defaultQuery,
@@ -158,13 +157,13 @@ describe('JaegerDatasource', () => {
       })
     );
     expect(mock).toBeCalledWith({
-      url: `${defaultSettings.url}/api/traces?service=jaeger-query&start=1531468681000&end=1531489712000&lookback=custom`,
+      url: `${defaultSettings.url}/api/traces?service=jaeger-query&start=1704085200000000&end=1704106800000000&lookback=custom`,
     });
   });
 
   it('should convert tags from logfmt format to an object', async () => {
     const mock = setupFetchMock({ data: [testResponse] });
-    const ds = new JaegerDatasource(defaultSettings, timeSrvStub);
+    const ds = new JaegerDatasource(defaultSettings);
     await lastValueFrom(
       ds.query({
         ...defaultQuery,
@@ -172,13 +171,13 @@ describe('JaegerDatasource', () => {
       })
     );
     expect(mock).toBeCalledWith({
-      url: `${defaultSettings.url}/api/traces?service=jaeger-query&tags=%7B%22error%22%3A%22true%22%7D&start=1531468681000&end=1531489712000&lookback=custom`,
+      url: `${defaultSettings.url}/api/traces?service=jaeger-query&tags=%7B%22error%22%3A%22true%22%7D&start=1704085200000000&end=1704106800000000&lookback=custom`,
     });
   });
 
   it('should resolve templates in traceID', async () => {
     const mock = setupFetchMock({ data: [testResponse] });
-    const ds = new JaegerDatasource(defaultSettings, timeSrvStub);
+    const ds = new JaegerDatasource(defaultSettings);
 
     await lastValueFrom(
       ds.query({
@@ -204,7 +203,7 @@ describe('JaegerDatasource', () => {
 
   it('should resolve templates in tags', async () => {
     const mock = setupFetchMock({ data: [testResponse] });
-    const ds = new JaegerDatasource(defaultSettings, timeSrvStub);
+    const ds = new JaegerDatasource(defaultSettings);
     await lastValueFrom(
       ds.query({
         ...defaultQuery,
@@ -218,13 +217,13 @@ describe('JaegerDatasource', () => {
       })
     );
     expect(mock).toBeCalledWith({
-      url: `${defaultSettings.url}/api/traces?service=jaeger-query&tags=%7B%22error%22%3A%22true%22%7D&start=1531468681000&end=1531489712000&lookback=custom`,
+      url: `${defaultSettings.url}/api/traces?service=jaeger-query&tags=%7B%22error%22%3A%22true%22%7D&start=1704085200000000&end=1704106800000000&lookback=custom`,
     });
   });
 
   it('should interpolate variables correctly', async () => {
     const mock = setupFetchMock({ data: [testResponse] });
-    const ds = new JaegerDatasource(defaultSettings, timeSrvStub);
+    const ds = new JaegerDatasource(defaultSettings);
     const text = 'interpolationText';
     await lastValueFrom(
       ds.query({
@@ -248,7 +247,7 @@ describe('JaegerDatasource', () => {
       })
     );
     expect(mock).toBeCalledWith({
-      url: `${defaultSettings.url}/api/traces?service=interpolationText&operation=interpolationText&minDuration=interpolationText&maxDuration=interpolationText&start=1531468681000&end=1531489712000&lookback=custom`,
+      url: `${defaultSettings.url}/api/traces?service=interpolationText&operation=interpolationText&minDuration=interpolationText&maxDuration=interpolationText&start=1704085200000000&end=1704106800000000&lookback=custom`,
     });
   });
 });
@@ -319,6 +318,65 @@ describe('when performing testDataSource', () => {
   });
 });
 
+describe('Test behavior with unmocked time', () => {
+  // Tolerance for checking timestamps.
+  // Using a lower number seems to cause flaky tests.
+  const numDigits = -4;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  it('getTimeRange()', async () => {
+    const ds = new JaegerDatasource(defaultSettings);
+    const timeRange = ds.getTimeRange();
+    const now = Date.now();
+    expect(timeRange.end).toBeCloseTo(now * 1000, numDigits);
+    expect(timeRange.start).toBeCloseTo((now - 6 * 3600 * 1000) * 1000, numDigits);
+  });
+
+  it("call for `query()` when `queryType === 'dependencyGraph'`", async () => {
+    const mock = setupFetchMock({ data: [testResponse] });
+    const ds = new JaegerDatasource(defaultSettings);
+    const now = Date.now();
+
+    ds.query({ ...defaultQuery, targets: [{ queryType: 'dependencyGraph', refId: '1' }] });
+
+    const url = mock.mock.calls[0][0].url;
+    const endTsMatch = url.match(/endTs=(\d+)/);
+    expect(endTsMatch).not.toBeNull();
+    expect(parseInt(endTsMatch![1], 10)).toBeCloseTo(now, numDigits);
+
+    const lookbackMatch = url.match(/lookback=(\d+)/);
+    expect(lookbackMatch).not.toBeNull();
+    expect(parseInt(lookbackMatch![1], 10)).toBeCloseTo(3600000, -1); // due to rounding, the least significant digit is not reliable
+  });
+
+  it("call for `query()` when `queryType === 'dependencyGraph'`, using default range", async () => {
+    const mock = setupFetchMock({ data: [testResponse] });
+    const ds = new JaegerDatasource(defaultSettings);
+    const now = Date.now();
+    const query = JSON.parse(JSON.stringify(defaultQuery));
+    // @ts-ignore
+    query.range = undefined;
+
+    ds.query({ ...query, targets: [{ queryType: 'dependencyGraph', refId: '1' }] });
+
+    const url = mock.mock.calls[0][0].url;
+    const endTsMatch = url.match(/endTs=(\d+)/);
+    expect(endTsMatch).not.toBeNull();
+    expect(parseInt(endTsMatch![1], 10)).toBeCloseTo(now, numDigits);
+
+    const lookbackMatch = url.match(/lookback=(\d+)/);
+    expect(lookbackMatch).not.toBeNull();
+    expect(parseInt(lookbackMatch![1], 10)).toBeCloseTo(21600000, -1);
+  });
+});
+
 function setupFetchMock(response: unknown, mock?: ReturnType<typeof backendSrv.fetch>) {
   const defaultMock = () => mock ?? of(createFetchResponse(response));
 
diff --git a/public/app/plugins/datasource/jaeger/datasource.ts b/public/app/plugins/datasource/jaeger/datasource.ts
index a2d10cc0f8d6a..78e60bdaec539 100644
--- a/public/app/plugins/datasource/jaeger/datasource.ts
+++ b/public/app/plugins/datasource/jaeger/datasource.ts
@@ -11,17 +11,17 @@ import {
   dateMath,
   DateTime,
   FieldType,
+  getDefaultTimeRange,
   MutableDataFrame,
   ScopedVars,
+  urlUtil,
 } from '@grafana/data';
+import { NodeGraphOptions, SpanBarOptions } from '@grafana/o11y-ds-frontend';
 import { BackendSrvRequest, getBackendSrv, getTemplateSrv, TemplateSrv } from '@grafana/runtime';
-import { NodeGraphOptions } from 'app/core/components/NodeGraphSettings';
-import { serializeParams } from 'app/core/utils/fetch';
-import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv';
-import { SpanBarOptions } from 'app/features/explore/TraceView/components';
 
 import { ALL_OPERATIONS_KEY } from './components/SearchForm';
 import { TraceIdTimeParamsOptions } from './configuration/TraceIdTimeParams';
+import { mapJaegerDependenciesResponse } from './dependencyGraphTransform';
 import { createGraphFrames } from './graphTransform';
 import { createTableFrame, createTraceFrame } from './responseTransform';
 import { JaegerQuery } from './types';
@@ -39,7 +39,6 @@ export class JaegerDatasource extends DataSourceApi<JaegerQuery, JaegerJsonData>
   spanBar?: SpanBarOptions;
   constructor(
     private instanceSettings: DataSourceInstanceSettings<JaegerJsonData>,
-    private readonly timeSrv: TimeSrv = getTimeSrv(),
     private readonly templateSrv: TemplateSrv = getTemplateSrv()
   ) {
     super(instanceSettings);
@@ -47,7 +46,7 @@ export class JaegerDatasource extends DataSourceApi<JaegerQuery, JaegerJsonData>
     this.traceIdTimeParams = instanceSettings.jsonData.traceIdTimeParams;
   }
 
-  async metadataRequest(url: string, params?: Record<string, any>): Promise<any> {
+  async metadataRequest(url: string, params?: Record<string, unknown>) {
     const res = await lastValueFrom(this._request(url, params, { hideFromInspector: true }));
     return res.data.data;
   }
@@ -65,6 +64,14 @@ export class JaegerDatasource extends DataSourceApi<JaegerQuery, JaegerJsonData>
       return of({ data: [emptyTraceDataFrame] });
     }
 
+    // Use the internal Jaeger /dependencies API for rendering the dependency graph.
+    if (target.queryType === 'dependencyGraph') {
+      const timeRange = options.range ?? getDefaultTimeRange();
+      const endTs = getTime(timeRange.to, true) / 1000;
+      const lookback = endTs - getTime(timeRange.from, false) / 1000;
+      return this._request('/api/dependencies', { endTs, lookback }).pipe(map(mapJaegerDependenciesResponse));
+    }
+
     if (target.queryType === 'search' && !this.isSearchFormValid(target)) {
       return of({ error: { message: 'You must select a service.' }, data: [] });
     }
@@ -180,11 +187,11 @@ export class JaegerDatasource extends DataSourceApi<JaegerQuery, JaegerJsonData>
     };
   }
 
-  async testDatasource(): Promise<any> {
+  async testDatasource() {
     return lastValueFrom(
       this._request('/api/services').pipe(
         map((res) => {
-          const values: any[] = res?.data?.data || [];
+          const values = res?.data?.data || [];
           const testResult =
             values.length > 0
               ? { status: 'success', message: 'Data source connected and services found.' }
@@ -195,7 +202,7 @@ export class JaegerDatasource extends DataSourceApi<JaegerQuery, JaegerJsonData>
                 };
           return testResult;
         }),
-        catchError((err: any) => {
+        catchError((err) => {
           let message = 'Jaeger: ';
           if (err.statusText) {
             message += err.statusText;
@@ -219,7 +226,7 @@ export class JaegerDatasource extends DataSourceApi<JaegerQuery, JaegerJsonData>
   }
 
   getTimeRange(): { start: number; end: number } {
-    const range = this.timeSrv.timeRange();
+    const range = getDefaultTimeRange();
     return {
       start: getTime(range.from, false),
       end: getTime(range.to, true),
@@ -230,8 +237,12 @@ export class JaegerDatasource extends DataSourceApi<JaegerQuery, JaegerJsonData>
     return query.query || '';
   }
 
-  private _request(apiUrl: string, data?: any, options?: Partial<BackendSrvRequest>): Observable<Record<string, any>> {
-    const params = data ? serializeParams(data) : '';
+  private _request(
+    apiUrl: string,
+    data?: Record<string, unknown>,
+    options?: Partial<BackendSrvRequest>
+  ): Observable<Record<string, any>> {
+    const params = data ? urlUtil.serializeParams(data) : '';
     const url = `${this.instanceSettings.url}${apiUrl}${params.length ? `?${params}` : ''}`;
     const req = {
       ...options,
diff --git a/public/app/plugins/datasource/jaeger/dependencyGraphTransform.test.ts b/public/app/plugins/datasource/jaeger/dependencyGraphTransform.test.ts
new file mode 100644
index 0000000000000..e17621ba45c4f
--- /dev/null
+++ b/public/app/plugins/datasource/jaeger/dependencyGraphTransform.test.ts
@@ -0,0 +1,106 @@
+import { mapJaegerDependenciesResponse } from './dependencyGraphTransform';
+
+describe('dependencyGraphTransform', () => {
+  it('should transform Jaeger dependencies API response', () => {
+    const data = {
+      data: [
+        {
+          parent: 'serviceA',
+          child: 'serviceB',
+          callCount: 1,
+        },
+        {
+          parent: 'serviceA',
+          child: 'serviceC',
+          callCount: 2,
+        },
+        {
+          parent: 'serviceB',
+          child: 'serviceC',
+          callCount: 3,
+        },
+      ],
+      total: 0,
+      limit: 0,
+      offset: 0,
+    };
+
+    const res = mapJaegerDependenciesResponse({ data });
+    expect(res).toMatchObject({
+      data: [
+        {
+          fields: [
+            {
+              config: {},
+              name: 'id',
+              type: 'string',
+              values: ['serviceA', 'serviceB', 'serviceC'],
+            },
+            {
+              config: {},
+              name: 'title',
+              type: 'string',
+              values: ['serviceA', 'serviceB', 'serviceC'],
+            },
+          ],
+          meta: { preferredVisualisationType: 'nodeGraph' },
+        },
+        {
+          fields: [
+            {
+              config: {},
+              name: 'id',
+              type: 'string',
+              values: ['serviceA--serviceB', 'serviceA--serviceC', 'serviceB--serviceC'],
+            },
+            {
+              config: {},
+              name: 'target',
+              type: 'string',
+              values: ['serviceB', 'serviceC', 'serviceC'],
+            },
+            {
+              config: {},
+              name: 'source',
+              type: 'string',
+              values: ['serviceA', 'serviceA', 'serviceB'],
+            },
+            {
+              config: { displayName: 'Call count' },
+              name: 'mainstat',
+              type: 'string',
+              values: [1, 2, 3],
+            },
+          ],
+          meta: { preferredVisualisationType: 'nodeGraph' },
+        },
+      ],
+    });
+  });
+
+  it('should transform Jaeger API error', () => {
+    const data = {
+      total: 0,
+      limit: 0,
+      offset: 0,
+      errors: [
+        {
+          code: 400,
+          msg: 'unable to parse param \'endTs\': strconv.ParseInt: parsing "foo": invalid syntax',
+        },
+      ],
+    };
+
+    const res = mapJaegerDependenciesResponse({ data });
+
+    expect(res).toEqual({
+      data: [],
+      errors: [
+        {
+          message: 'unable to parse param \'endTs\': strconv.ParseInt: parsing "foo": invalid syntax',
+          status: 400,
+        },
+      ],
+    });
+  });
+});
diff --git a/public/app/plugins/datasource/jaeger/dependencyGraphTransform.ts b/public/app/plugins/datasource/jaeger/dependencyGraphTransform.ts
new file mode 100644
index 0000000000000..0e8fe6dce462a
--- /dev/null
+++ b/public/app/plugins/datasource/jaeger/dependencyGraphTransform.ts
@@ -0,0 +1,125 @@
+import {
+  DataFrame,
+  DataQueryResponse,
+  FieldType,
+  MutableDataFrame,
+  NodeGraphDataFrameFieldNames as Fields,
+} from '@grafana/data';
+
+import { JaegerServiceDependency } from './types';
+
+interface Node {
+  [Fields.id]: string;
+  [Fields.title]: string;
+}
+
+interface Edge {
+  [Fields.id]: string;
+  [Fields.target]: string;
+  [Fields.source]: string;
+  [Fields.mainStat]: number;
+}
+
+/**
+ * Error schema used by the Jaeger dependencies API.
+ */
+interface JaegerDependenciesResponseError {
+  code: number;
+  msg: string;
+}
+
+interface JaegerDependenciesResponse {
+  data?: {
+    errors?: JaegerDependenciesResponseError[];
+    data?: JaegerServiceDependency[];
+  };
+}
+
+/**
+ * Transforms a Jaeger dependencies API response to a Grafana {@link DataQueryResponse}.
+ * @param response Raw response data from the API proxy.
+ */
+export function mapJaegerDependenciesResponse(response: JaegerDependenciesResponse): DataQueryResponse {
+  const errors = response?.data?.errors;
+  if (errors) {
+    return {
+      data: [],
+      errors: errors.map((e: JaegerDependenciesResponseError) => ({ message: e.msg, status: e.code })),
+    };
+  }
+  const dependencies = response?.data?.data;
+  if (dependencies) {
+    return {
+      data: convertDependenciesToGraph(dependencies),
+    };
+  }
+
+  return { data: [] };
+}
+
+/**
+ * Converts a list of Jaeger service dependencies to a Grafana {@link DataFrame} array suitable for the node graph panel.
+ * @param dependencies List of Jaeger service dependencies as returned by the Jaeger dependencies API.
+ */
+function convertDependenciesToGraph(dependencies: JaegerServiceDependency[]): DataFrame[] {
+  const servicesByName = new Map<string, Node>();
+  const edges: Edge[] = [];
+
+  for (const dependency of dependencies) {
+    addServiceNode(dependency.parent, servicesByName);
+    addServiceNode(dependency.child, servicesByName);
+
+    edges.push({
+      [Fields.id]: dependency.parent + '--' + dependency.child,
+      [Fields.target]: dependency.child,
+      [Fields.source]: dependency.parent,
+      [Fields.mainStat]: dependency.callCount,
+    });
+  }
+
+  const nodesFrame = new MutableDataFrame({
+    fields: [
+      { name: Fields.id, type: FieldType.string },
+      { name: Fields.title, type: FieldType.string },
+    ],
+    meta: {
+      preferredVisualisationType: 'nodeGraph',
+    },
+  });
+
+  const edgesFrame = new MutableDataFrame({
+    fields: [
+      { name: Fields.id, type: FieldType.string },
+      { name: Fields.target, type: FieldType.string },
+      { name: Fields.source, type: FieldType.string },
+      { name: Fields.mainStat, type: FieldType.string, config: { displayName: 'Call count' } },
+    ],
+    meta: {
+      preferredVisualisationType: 'nodeGraph',
+    },
+  });
+
+  for (const node of servicesByName.values()) {
+    nodesFrame.add(node);
+  }
+
+  for (const edge of edges) {
+    edgesFrame.add(edge);
+  }
+
+  return [nodesFrame, edgesFrame];
+}
+
+/**
+ * Convenience function to register a service node in the dependency graph.
+ * @param service Name of the service to register.
+ * @param servicesByName Map of service nodes keyed name.
+ */
+function addServiceNode(service: string, servicesByName: Map<string, Node>) {
+  if (!servicesByName.has(service)) {
+    servicesByName.set(service, {
+      [Fields.id]: service,
+      [Fields.title]: service,
+    });
+  }
+}
diff --git a/public/app/plugins/datasource/jaeger/graphTransform.ts b/public/app/plugins/datasource/jaeger/graphTransform.ts
index 357b36774ba0d..589729a8c4f4e 100644
--- a/public/app/plugins/datasource/jaeger/graphTransform.ts
+++ b/public/app/plugins/datasource/jaeger/graphTransform.ts
@@ -1,6 +1,5 @@
 import { DataFrame, NodeGraphDataFrameFieldNames as Fields } from '@grafana/data';
-
-import { getNonOverlappingDuration, getStats, makeFrames, makeSpanMap } from '../../../core/utils/tracing';
+import { getNonOverlappingDuration, getStats, makeFrames, makeSpanMap } from '@grafana/o11y-ds-frontend';
 
 import { Span, TraceResponse } from './types';
 
diff --git a/public/app/plugins/datasource/jaeger/helpers/createFetchResponse.ts b/public/app/plugins/datasource/jaeger/helpers/createFetchResponse.ts
new file mode 100644
index 0000000000000..1f75026ed71f9
--- /dev/null
+++ b/public/app/plugins/datasource/jaeger/helpers/createFetchResponse.ts
@@ -0,0 +1,15 @@
+import { FetchResponse } from '@grafana/runtime';
+
+export function createFetchResponse<T>(data: T): FetchResponse<T> {
+  return {
+    data,
+    status: 200,
+    url: 'http://localhost:3000/api/ds/query',
+    config: { url: 'http://localhost:3000/api/ds/query' },
+    type: 'basic',
+    statusText: 'Ok',
+    redirected: false,
+    headers: {} as unknown as Headers,
+    ok: true,
+  };
+}
diff --git a/public/app/plugins/datasource/jaeger/package.json b/public/app/plugins/datasource/jaeger/package.json
new file mode 100644
index 0000000000000..387d83b485af1
--- /dev/null
+++ b/public/app/plugins/datasource/jaeger/package.json
@@ -0,0 +1,43 @@
+{
+  "name": "@grafana-plugins/jaeger",
+  "description": "Jaeger plugin for Grafana",
+  "private": true,
+  "version": "11.0.0",
+  "dependencies": {
+    "@emotion/css": "11.11.2",
+    "@grafana/data": "workspace:*",
+    "@grafana/experimental": "1.7.10",
+    "@grafana/o11y-ds-frontend": "workspace:*",
+    "@grafana/runtime": "workspace:*",
+    "@grafana/ui": "workspace:*",
+    "lodash": "4.17.21",
+    "logfmt": "^1.3.2",
+    "react-window": "1.8.10",
+    "rxjs": "7.8.1",
+    "stream-browserify": "3.0.0",
+    "tslib": "2.6.2",
+    "uuid": "9.0.1"
+  },
+  "devDependencies": {
+    "@grafana/plugin-configs": "workspace:*",
+    "@testing-library/jest-dom": "6.4.2",
+    "@testing-library/react": "14.2.2",
+    "@testing-library/user-event": "14.5.2",
+    "@types/jest": "29.5.12",
+    "@types/lodash": "4.17.0",
+    "@types/logfmt": "^1.2.3",
+    "@types/react-window": "1.8.8",
+    "@types/uuid": "9.0.8",
+    "ts-node": "10.9.2",
+    "webpack": "5.91.0"
+  },
+  "peerDependencies": {
+    "@grafana/runtime": "*"
+  },
+  "scripts": {
+    "build": "webpack -c ./webpack.config.ts --env production",
+    "build:commit": "webpack -c ./webpack.config.ts --env production --env commit=$(git rev-parse --short HEAD)",
+    "dev": "webpack -w -c ./webpack.config.ts --env development"
+  },
+  "packageManager": "yarn@3.6.0"
+}
diff --git a/public/app/plugins/datasource/jaeger/plugin.json b/public/app/plugins/datasource/jaeger/plugin.json
index 4a0714ca0a397..5bb7b96d60cef 100644
--- a/public/app/plugins/datasource/jaeger/plugin.json
+++ b/public/app/plugins/datasource/jaeger/plugin.json
@@ -30,6 +30,10 @@
         "name": "GitHub Project",
         "url": "https://github.com/jaegertracing/jaeger"
       }
-    ]
+    ],
+    "version": "%VERSION%"
+  },
+  "dependencies": {
+    "grafanaDependency": ">=10.3.0-0"
   }
 }
diff --git a/public/app/plugins/datasource/jaeger/responseTransform.ts b/public/app/plugins/datasource/jaeger/responseTransform.ts
index 507e5646cfb21..7b49168e79c45 100644
--- a/public/app/plugins/datasource/jaeger/responseTransform.ts
+++ b/public/app/plugins/datasource/jaeger/responseTransform.ts
@@ -6,8 +6,8 @@ import {
   TraceLog,
   TraceSpanRow,
 } from '@grafana/data';
-import { transformTraceData } from 'app/features/explore/TraceView/components';
 
+import transformTraceData from './_importedDependencies/model/transform-trace-data';
 import { JaegerResponse, Span, TraceProcess, TraceResponse } from './types';
 
 export function createTraceFrame(data: TraceResponse): DataFrame {
diff --git a/public/app/plugins/datasource/jaeger/tsconfig.json b/public/app/plugins/datasource/jaeger/tsconfig.json
new file mode 100644
index 0000000000000..a7a33a2fc324e
--- /dev/null
+++ b/public/app/plugins/datasource/jaeger/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "types": ["jest", "@testing-library/jest-dom"]
+  },
+  "extends": "@grafana/plugin-configs/tsconfig.json",
+  "include": ["."]
+}
diff --git a/public/app/plugins/datasource/jaeger/types.ts b/public/app/plugins/datasource/jaeger/types.ts
index 45ee89fbeb08d..fe6778957f627 100644
--- a/public/app/plugins/datasource/jaeger/types.ts
+++ b/public/app/plugins/datasource/jaeger/types.ts
@@ -63,7 +63,7 @@ export type JaegerQuery = {
   limit?: number;
 } & DataQuery;
 
-export type JaegerQueryType = 'search' | 'upload';
+export type JaegerQueryType = 'search' | 'upload' | 'dependencyGraph';
 
 export type JaegerResponse = {
   data: TraceResponse[];
@@ -72,3 +72,12 @@ export type JaegerResponse = {
   offset: number;
   errors?: string[] | null;
 };
+
+/**
+ * Type definition for service dependencies as returned by the Jaeger dependencies API.
+ */
+export type JaegerServiceDependency = {
+  parent: string;
+  child: string;
+  callCount: number;
+};
diff --git a/public/app/plugins/datasource/jaeger/util.ts b/public/app/plugins/datasource/jaeger/util.ts
index 51f01fa929a33..f025ed9df5572 100644
--- a/public/app/plugins/datasource/jaeger/util.ts
+++ b/public/app/plugins/datasource/jaeger/util.ts
@@ -4,7 +4,7 @@ export function convertTagsLogfmt(tags: string | undefined) {
   if (!tags) {
     return '';
   }
-  const data: any = logfmt.parse(tags);
+  const data = logfmt.parse(tags);
   Object.keys(data).forEach((key) => {
     const value = data[key];
     if (typeof value !== 'string') {
diff --git a/public/app/plugins/datasource/jaeger/webpack.config.ts b/public/app/plugins/datasource/jaeger/webpack.config.ts
new file mode 100644
index 0000000000000..10ef5bd69a221
--- /dev/null
+++ b/public/app/plugins/datasource/jaeger/webpack.config.ts
@@ -0,0 +1,14 @@
+import config from '@grafana/plugin-configs/webpack.config';
+
+const configWithFallback = async (env: Record<string, unknown>) => {
+  const response = await config(env);
+  if (response !== undefined && response.resolve !== undefined) {
+    response.resolve.fallback = {
+      ...response.resolve.fallback,
+      stream: require.resolve('stream-browserify'),
+    };
+  }
+  return response;
+};
+
+export default configWithFallback;
diff --git a/public/app/plugins/datasource/loki/LanguageProvider.test.ts b/public/app/plugins/datasource/loki/LanguageProvider.test.ts
index 545aea6784759..7702a424ee5ab 100644
--- a/public/app/plugins/datasource/loki/LanguageProvider.test.ts
+++ b/public/app/plugins/datasource/loki/LanguageProvider.test.ts
@@ -1,97 +1,67 @@
-import Plain from 'slate-plain-serializer';
+import { AbstractLabelOperator, DataFrame, TimeRange, dateTime, getDefaultTimeRange } from '@grafana/data';
+import { config } from '@grafana/runtime';
 
-import { AbstractLabelOperator, DataFrame } from '@grafana/data';
-import { TypeaheadInput } from '@grafana/ui';
-
-import LanguageProvider, { LokiHistoryItem } from './LanguageProvider';
-import { LokiDatasource } from './datasource';
-import { createLokiDatasource, createMetadataRequest } from './mocks';
+import LanguageProvider from './LanguageProvider';
+import { createLokiDatasource } from './__mocks__/datasource';
+import { createMetadataRequest } from './__mocks__/metadataRequest';
+import { DEFAULT_MAX_LINES_SAMPLE, LokiDatasource } from './datasource';
 import {
   extractLogParserFromDataFrame,
   extractLabelKeysFromDataFrame,
   extractUnwrapLabelKeysFromDataFrame,
 } from './responseUtils';
-import { LokiQueryType } from './types';
+import { LabelType, LokiQueryType } from './types';
 
 jest.mock('./responseUtils');
 
-jest.mock('app/store/store', () => ({
-  store: {
-    getState: jest.fn().mockReturnValue({
-      explore: {
-        left: {
-          mode: 'Logs',
-        },
-      },
-    }),
+const mockTimeRange = {
+  from: dateTime(1546372800000),
+  to: dateTime(1546380000000),
+  raw: {
+    from: dateTime(1546372800000),
+    to: dateTime(1546380000000),
   },
+};
+
+jest.mock('@grafana/data', () => ({
+  ...jest.requireActual('@grafana/data'),
+  getDefaultTimeRange: jest.fn().mockImplementation(() => ({
+    from: dateTime(0),
+    to: dateTime(1),
+    raw: {
+      from: dateTime(0),
+      to: dateTime(1),
+    },
+  })),
 }));
 
 describe('Language completion provider', () => {
-  const datasource = setup({});
-
-  describe('query suggestions', () => {
-    it('returns no suggestions on empty context', async () => {
-      const instance = new LanguageProvider(datasource);
-      const value = Plain.deserialize('');
-      const result = await instance.provideCompletionItems({ text: '', prefix: '', value, wrapperClasses: [] });
-      expect(result.context).toBeUndefined();
-
-      expect(result.suggestions.length).toEqual(0);
-    });
-
-    it('returns history on empty context when history was provided', async () => {
-      const instance = new LanguageProvider(datasource);
-      const value = Plain.deserialize('');
-      const history: LokiHistoryItem[] = [
-        {
-          query: { refId: '1', expr: '{app="foo"}' },
-          ts: 1,
-        },
-      ];
-      const result = await instance.provideCompletionItems(
-        { text: '', prefix: '', value, wrapperClasses: [] },
-        { history }
-      );
-      expect(result.context).toBeUndefined();
+  describe('start', () => {
+    const datasource = setup({ testkey: ['label1_val1', 'label1_val2'], label2: [] });
 
-      expect(result.suggestions).toMatchObject([
-        {
-          label: 'History',
-          items: [
-            {
-              label: '{app="foo"}',
-            },
-          ],
-        },
-      ]);
+    it('should fetch labels on initial start', async () => {
+      const languageProvider = new LanguageProvider(datasource);
+      const fetchSpy = jest.spyOn(languageProvider, 'fetchLabels').mockResolvedValue([]);
+      await languageProvider.start();
+      expect(fetchSpy).toHaveBeenCalled();
     });
 
-    it('returns function and history suggestions', async () => {
-      const instance = new LanguageProvider(datasource);
-      const input = createTypeaheadInput('m', 'm', undefined, 1, [], instance);
-      // Historic expressions don't have to match input, filtering is done in field
-      const history: LokiHistoryItem[] = [
-        {
-          query: { refId: '1', expr: '{app="foo"}' },
-          ts: 1,
-        },
-      ];
-      const result = await instance.provideCompletionItems(input, { history });
-      expect(result.context).toBeUndefined();
-      expect(result.suggestions.length).toEqual(2);
-      expect(result.suggestions[0].label).toEqual('History');
-      expect(result.suggestions[1].label).toEqual('Functions');
+    it('should not again fetch labels on second start', async () => {
+      const languageProvider = new LanguageProvider(datasource);
+      const fetchSpy = jest.spyOn(languageProvider, 'fetchLabels').mockResolvedValue([]);
+      await languageProvider.start();
+      expect(fetchSpy).toHaveBeenCalledTimes(1);
+      await languageProvider.start();
+      expect(fetchSpy).toHaveBeenCalledTimes(1);
     });
 
-    it('returns pipe operations on pipe context', async () => {
-      const instance = new LanguageProvider(datasource);
-      const input = createTypeaheadInput('{app="test"} | ', ' ', '', 15, ['context-pipe']);
-      const result = await instance.provideCompletionItems(input);
-      expect(result.context).toBeUndefined();
-      expect(result.suggestions.length).toEqual(2);
-      expect(result.suggestions[0].label).toEqual('Operators');
-      expect(result.suggestions[1].label).toEqual('Parsers');
+    it('should again fetch labels on second start with different timerange', async () => {
+      const languageProvider = new LanguageProvider(datasource);
+      const fetchSpy = jest.spyOn(languageProvider, 'fetchLabels').mockResolvedValue([]);
+      await languageProvider.start();
+      expect(fetchSpy).toHaveBeenCalledTimes(1);
+      await languageProvider.start(mockTimeRange);
+      expect(fetchSpy).toHaveBeenCalledTimes(2);
     });
   });
 
@@ -108,6 +78,25 @@ describe('Language completion provider', () => {
         start: 1560153109000,
       });
     });
+
+    it('should use provided time range', () => {
+      const datasource = setup({});
+      datasource.getTimeRangeParams = jest
+        .fn()
+        .mockImplementation((range: TimeRange) => ({ start: range.from.valueOf(), end: range.to.valueOf() }));
+      const languageProvider = new LanguageProvider(datasource);
+      languageProvider.request = jest.fn();
+      languageProvider.fetchSeries('{job="grafana"}', { timeRange: mockTimeRange });
+      // time range was passed to getTimeRangeParams
+      expect(datasource.getTimeRangeParams).toHaveBeenCalledWith(mockTimeRange);
+      // time range was passed to request
+      expect(languageProvider.request).toHaveBeenCalled();
+      expect(languageProvider.request).toHaveBeenCalledWith('series', {
+        end: 1546380000000,
+        'match[]': '{job="grafana"}',
+        start: 1546372800000,
+      });
+    });
   });
 
   describe('fetchSeriesLabels', () => {
@@ -129,123 +118,131 @@ describe('Language completion provider', () => {
         start: 0,
       });
     });
-  });
 
-  describe('label key suggestions', () => {
-    it('returns all label suggestions on empty selector', async () => {
-      const datasource = setup({ label1: [], label2: [] });
-      const provider = await getLanguageProvider(datasource);
-      const input = createTypeaheadInput('{}', '', '', 1);
-      const result = await provider.provideCompletionItems(input);
-      expect(result.context).toBe('context-labels');
-      expect(result.suggestions).toEqual([
-        {
-          items: [
-            { label: 'label1', filterText: '"label1"' },
-            { label: 'label2', filterText: '"label2"' },
-          ],
-          label: 'Labels',
-        },
-      ]);
+    it('should be called with time range params if provided', () => {
+      const datasource = setup({});
+      datasource.getTimeRangeParams = jest
+        .fn()
+        .mockImplementation((range: TimeRange) => ({ start: range.from.valueOf(), end: range.to.valueOf() }));
+      const languageProvider = new LanguageProvider(datasource);
+      languageProvider.request = jest.fn().mockResolvedValue([]);
+      languageProvider.fetchSeriesLabels('stream', { timeRange: mockTimeRange });
+      // time range was passed to getTimeRangeParams
+      expect(datasource.getTimeRangeParams).toHaveBeenCalled();
+      expect(datasource.getTimeRangeParams).toHaveBeenCalledWith(mockTimeRange);
+      // time range was passed to request
+      expect(languageProvider.request).toHaveBeenCalled();
+      expect(languageProvider.request).toHaveBeenCalledWith('series', {
+        end: 1546380000000,
+        'match[]': 'stream',
+        start: 1546372800000,
+      });
     });
 
-    it('returns all label suggestions on selector when starting to type', async () => {
-      const datasource = setup({ label1: [], label2: [] });
-      const provider = await getLanguageProvider(datasource);
-      const input = createTypeaheadInput('{l}', '', '', 2);
-      const result = await provider.provideCompletionItems(input);
-      expect(result.context).toBe('context-labels');
-      expect(result.suggestions).toEqual([
-        {
-          items: [
-            { label: 'label1', filterText: '"label1"' },
-            { label: 'label2', filterText: '"label2"' },
-          ],
-          label: 'Labels',
-        },
-      ]);
+    it('should work if request returns undefined', async () => {
+      const datasource = setup({});
+      datasource.getTimeRangeParams = jest
+        .fn()
+        .mockImplementation((range: TimeRange) => ({ start: range.from.valueOf(), end: range.to.valueOf() }));
+      const languageProvider = new LanguageProvider(datasource);
+      languageProvider.request = jest.fn().mockResolvedValue(undefined);
+      const series = await languageProvider.fetchSeriesLabels('stream', { timeRange: mockTimeRange });
+      expect(series).toEqual({});
     });
   });
 
-  describe('label suggestions facetted', () => {
-    it('returns facetted label suggestions based on selector', async () => {
-      const datasource = setup({ label1: [], label2: [] }, { '{foo="bar"}': [{ label1: 'label_val1' }] });
+  describe('label values', () => {
+    it('should fetch label values if not cached', async () => {
+      const datasource = setup({ testkey: ['label1_val1', 'label1_val2'], label2: [] });
       const provider = await getLanguageProvider(datasource);
-      const input = createTypeaheadInput('{foo="bar",}', '', '', 11);
-      const result = await provider.provideCompletionItems(input);
-      expect(result.context).toBe('context-labels');
-      expect(result.suggestions).toEqual([{ items: [{ label: 'label1' }], label: 'Labels' }]);
+      const requestSpy = jest.spyOn(provider, 'request');
+      const labelValues = await provider.fetchLabelValues('testkey');
+      expect(requestSpy).toHaveBeenCalledWith('label/testkey/values', {
+        end: 1560163909000,
+        start: 1560153109000,
+      });
+      expect(labelValues).toEqual(['label1_val1', 'label1_val2']);
     });
 
-    it('returns facetted label suggestions for multipule selectors', async () => {
-      const datasource = setup({ label1: [], label2: [] }, { '{baz="42",foo="bar"}': [{ label2: 'label_val2' }] });
+    it('fetch label when options.streamSelector provided and values is not cached', async () => {
+      const datasource = setup({ testkey: ['label1_val1', 'label1_val2'], label2: [] });
       const provider = await getLanguageProvider(datasource);
-      const input = createTypeaheadInput('{baz="42",foo="bar",}', '', '', 20);
-      const result = await provider.provideCompletionItems(input);
-      expect(result.context).toBe('context-labels');
-      expect(result.suggestions).toEqual([{ items: [{ label: 'label2' }], label: 'Labels' }]);
+      const requestSpy = jest.spyOn(provider, 'request');
+      const labelValues = await provider.fetchLabelValues('testkey', { streamSelector: '{foo="bar"}' });
+      expect(requestSpy).toHaveBeenCalledWith('label/testkey/values', {
+        end: 1560163909000,
+        query: '%7Bfoo%3D%22bar%22%7D',
+        start: 1560153109000,
+      });
+      expect(labelValues).toEqual(['label1_val1', 'label1_val2']);
     });
-  });
-
-  describe('label suggestions', () => {
-    it('returns label values suggestions from Loki', async () => {
-      const datasource = setup({ label1: ['label1_val1', 'label1_val2'], label2: [] });
-      const provider = await getLanguageProvider(datasource);
-      const input = createTypeaheadInput('{label1=}', '=', 'label1');
-      let result = await provider.provideCompletionItems(input);
 
-      result = await provider.provideCompletionItems(input);
-      expect(result.context).toBe('context-label-values');
-      expect(result.suggestions).toEqual([
-        {
-          items: [
-            { label: 'label1_val1', filterText: '"label1_val1"' },
-            { label: 'label1_val2', filterText: '"label1_val2"' },
-          ],
-          label: 'Label values for "label1"',
-        },
-      ]);
+    it('fetch label with options.timeRange when provided and values is not cached', async () => {
+      const datasource = setup({ testkey: ['label1_val1', 'label1_val2'], label2: [] });
+      datasource.getTimeRangeParams = jest
+        .fn()
+        .mockImplementation((range: TimeRange) => ({ start: range.from.valueOf(), end: range.to.valueOf() }));
+      const languageProvider = new LanguageProvider(datasource);
+      languageProvider.request = jest.fn().mockResolvedValue([]);
+      languageProvider.fetchLabelValues('testKey', { timeRange: mockTimeRange });
+      // time range was passed to getTimeRangeParams
+      expect(datasource.getTimeRangeParams).toHaveBeenCalled();
+      expect(datasource.getTimeRangeParams).toHaveBeenCalledWith(mockTimeRange);
+      // time range was passed to request
+      expect(languageProvider.request).toHaveBeenCalled();
+      expect(languageProvider.request).toHaveBeenCalledWith('label/testKey/values', {
+        end: 1546380000000,
+        start: 1546372800000,
+      });
     });
-    it('returns label values suggestions from Loki when re-editing', async () => {
-      const datasource = setup({ label1: ['label1_val1', 'label1_val2'], label2: [] });
-      const provider = await getLanguageProvider(datasource);
-      const input = createTypeaheadInput('{label1="label1_v"}', 'label1_v', 'label1', 17, [
-        'attr-value',
-        'context-labels',
-      ]);
-      let result = await provider.provideCompletionItems(input);
-      expect(result.context).toBe('context-label-values');
-      expect(result.suggestions).toEqual([
-        {
-          items: [
-            { label: 'label1_val1', filterText: '"label1_val1"' },
-            { label: 'label1_val2', filterText: '"label1_val2"' },
-          ],
-          label: 'Label values for "label1"',
-        },
-      ]);
+
+    it('uses default time range if fetch label does not receive options.timeRange', async () => {
+      const datasource = setup({ testkey: ['label1_val1', 'label1_val2'], label2: [] });
+      datasource.getTimeRangeParams = jest
+        .fn()
+        .mockImplementation((range: TimeRange) => ({ start: range.from.valueOf(), end: range.to.valueOf() }));
+      const languageProvider = new LanguageProvider(datasource);
+      languageProvider.request = jest.fn().mockResolvedValue([]);
+      languageProvider.fetchLabelValues('testKey');
+      expect(getDefaultTimeRange).toHaveBeenCalled();
+      expect(languageProvider.request).toHaveBeenCalled();
+      expect(languageProvider.request).toHaveBeenCalledWith('label/testKey/values', {
+        end: 1,
+        start: 0,
+      });
     });
-  });
 
-  describe('label values', () => {
-    it('should fetch label values if not cached', async () => {
+    it('should return cached values', async () => {
       const datasource = setup({ testkey: ['label1_val1', 'label1_val2'], label2: [] });
       const provider = await getLanguageProvider(datasource);
       const requestSpy = jest.spyOn(provider, 'request');
       const labelValues = await provider.fetchLabelValues('testkey');
-      expect(requestSpy).toHaveBeenCalled();
+      expect(requestSpy).toHaveBeenCalledTimes(1);
       expect(labelValues).toEqual(['label1_val1', 'label1_val2']);
+
+      const nextLabelValues = await provider.fetchLabelValues('testkey');
+      expect(requestSpy).toHaveBeenCalledTimes(1);
+      expect(requestSpy).toHaveBeenCalledWith('label/testkey/values', {
+        end: 1560163909000,
+        start: 1560153109000,
+      });
+      expect(nextLabelValues).toEqual(['label1_val1', 'label1_val2']);
     });
 
-    it('should return cached values', async () => {
+    it('should return cached values when options.streamSelector provided', async () => {
       const datasource = setup({ testkey: ['label1_val1', 'label1_val2'], label2: [] });
       const provider = await getLanguageProvider(datasource);
       const requestSpy = jest.spyOn(provider, 'request');
-      const labelValues = await provider.fetchLabelValues('testkey');
+      const labelValues = await provider.fetchLabelValues('testkey', { streamSelector: '{foo="bar"}' });
       expect(requestSpy).toHaveBeenCalledTimes(1);
+      expect(requestSpy).toHaveBeenCalledWith('label/testkey/values', {
+        end: 1560163909000,
+        query: '%7Bfoo%3D%22bar%22%7D',
+        start: 1560153109000,
+      });
       expect(labelValues).toEqual(['label1_val1', 'label1_val2']);
 
-      const nextLabelValues = await provider.fetchLabelValues('testkey');
+      const nextLabelValues = await provider.fetchLabelValues('testkey', { streamSelector: '{foo="bar"}' });
       expect(requestSpy).toHaveBeenCalledTimes(1);
       expect(nextLabelValues).toEqual(['label1_val1', 'label1_val2']);
     });
@@ -258,13 +255,26 @@ describe('Language completion provider', () => {
 
       expect(requestSpy).toHaveBeenCalledWith('label/%60%5C%22testkey/values', expect.any(Object));
     });
+
+    it('should encode special characters in options.streamSelector', async () => {
+      const datasource = setup({ '`\\"testkey': ['label1_val1', 'label1_val2'], label2: [] });
+      const provider = await getLanguageProvider(datasource);
+      const requestSpy = jest.spyOn(provider, 'request');
+      await provider.fetchLabelValues('`\\"testkey', { streamSelector: '{foo="\\bar"}' });
+
+      expect(requestSpy).toHaveBeenCalledWith(expect.any(String), {
+        query: '%7Bfoo%3D%22%5Cbar%22%7D',
+        start: expect.any(Number),
+        end: expect.any(Number),
+      });
+    });
   });
 });
 
 describe('Request URL', () => {
   it('should contain range params', async () => {
     const datasourceWithLabels = setup({ other: [] });
-    const rangeParams = datasourceWithLabels.getTimeRangeParams();
+    const rangeParams = datasourceWithLabels.getTimeRangeParams(mockTimeRange);
     const datasourceSpy = jest.spyOn(datasourceWithLabels, 'metadataRequest');
 
     const instance = new LanguageProvider(datasourceWithLabels);
@@ -306,15 +316,45 @@ describe('fetchLabels', () => {
     await instance.fetchLabels();
     expect(instance.labelKeys).toEqual([]);
   });
+
+  it('should use time range param', async () => {
+    const datasourceWithLabels = setup({});
+    datasourceWithLabels.languageProvider.request = jest.fn();
+
+    const instance = new LanguageProvider(datasourceWithLabels);
+    instance.request = jest.fn();
+    await instance.fetchLabels({ timeRange: mockTimeRange });
+    expect(instance.request).toBeCalledWith('labels', datasourceWithLabels.getTimeRangeParams(mockTimeRange));
+  });
 });
 
 describe('Query imports', () => {
   const datasource = setup({});
 
-  it('returns empty queries', async () => {
-    const instance = new LanguageProvider(datasource);
-    const result = await instance.importFromAbstractQuery({ refId: 'bar', labelMatchers: [] });
-    expect(result).toEqual({ refId: 'bar', expr: '', queryType: LokiQueryType.Range });
+  describe('importing from abstract query', () => {
+    it('returns empty queries', async () => {
+      const instance = new LanguageProvider(datasource);
+      const result = await instance.importFromAbstractQuery({ refId: 'bar', labelMatchers: [] });
+      expect(result).toEqual({ refId: 'bar', expr: '', queryType: LokiQueryType.Range });
+    });
+
+    it('returns valid query', () => {
+      const instance = new LanguageProvider(datasource);
+      const result = instance.importFromAbstractQuery({
+        refId: 'bar',
+        labelMatchers: [
+          { name: 'label1', operator: AbstractLabelOperator.Equal, value: 'value1' },
+          { name: 'label2', operator: AbstractLabelOperator.NotEqual, value: 'value2' },
+          { name: 'label3', operator: AbstractLabelOperator.EqualRegEx, value: 'value3' },
+          { name: 'label4', operator: AbstractLabelOperator.NotEqualRegEx, value: 'value4' },
+        ],
+      });
+      expect(result).toEqual({
+        refId: 'bar',
+        expr: '{label1="value1", label2!="value2", label3=~"value3", label4!~"value4"}',
+        queryType: LokiQueryType.Range,
+      });
+    });
   });
 
   describe('exporting to abstract query', () => {
@@ -336,18 +376,74 @@ describe('Query imports', () => {
         ],
       });
     });
+
+    it('exports labels in metric query', async () => {
+      const instance = new LanguageProvider(datasource);
+      const abstractQuery = instance.exportToAbstractQuery({
+        refId: 'bar',
+        expr: 'rate({label1="value1", label2!="value2"}[5m])',
+        instant: true,
+        range: false,
+      });
+      expect(abstractQuery).toMatchObject({
+        refId: 'bar',
+        labelMatchers: [
+          { name: 'label1', operator: AbstractLabelOperator.Equal, value: 'value1' },
+          { name: 'label2', operator: AbstractLabelOperator.NotEqual, value: 'value2' },
+        ],
+      });
+    });
+
+    it('exports labels in query with multiple stream selectors', async () => {
+      const instance = new LanguageProvider(datasource);
+      const abstractQuery = instance.exportToAbstractQuery({
+        refId: 'bar',
+        expr: 'rate({label1="value1", label2!="value2"}[5m]) + rate({label3=~"value3", label4!~"value4"}[5m])',
+        instant: true,
+        range: false,
+      });
+      expect(abstractQuery).toMatchObject({
+        refId: 'bar',
+        labelMatchers: [
+          { name: 'label1', operator: AbstractLabelOperator.Equal, value: 'value1' },
+          { name: 'label2', operator: AbstractLabelOperator.NotEqual, value: 'value2' },
+          { name: 'label3', operator: AbstractLabelOperator.EqualRegEx, value: 'value3' },
+          { name: 'label4', operator: AbstractLabelOperator.NotEqualRegEx, value: 'value4' },
+        ],
+      });
+    });
   });
 
   describe('getParserAndLabelKeys()', () => {
+    const queryHintsFeatureToggle = config.featureToggles.lokiQueryHints;
+    beforeAll(() => {
+      config.featureToggles.lokiQueryHints = true;
+    });
+    afterAll(() => {
+      config.featureToggles.lokiQueryHints = queryHintsFeatureToggle;
+    });
+
     let datasource: LokiDatasource, languageProvider: LanguageProvider;
     const extractLogParserFromDataFrameMock = jest.mocked(extractLogParserFromDataFrame);
     const extractedLabelKeys = ['extracted', 'label'];
+    const structuredMetadataKeys = ['structured', 'metadata'];
+    const parsedKeys = ['parsed', 'label'];
     const unwrapLabelKeys = ['unwrap', 'labels'];
 
     beforeEach(() => {
       datasource = createLokiDatasource();
       languageProvider = new LanguageProvider(datasource);
-      jest.mocked(extractLabelKeysFromDataFrame).mockReturnValue(extractedLabelKeys);
+      jest.mocked(extractLabelKeysFromDataFrame).mockImplementation((_, type) => {
+        if (type === LabelType.Indexed || !type) {
+          return extractedLabelKeys;
+        } else if (type === LabelType.StructuredMetadata) {
+          return structuredMetadataKeys;
+        } else if (type === LabelType.Parsed) {
+          return parsedKeys;
+        } else {
+          return [];
+        }
+      });
       jest.mocked(extractUnwrapLabelKeysFromDataFrame).mockReturnValue(unwrapLabelKeys);
     });
 
@@ -356,8 +452,9 @@ describe('Query imports', () => {
       extractLogParserFromDataFrameMock.mockReturnValueOnce({ hasLogfmt: false, hasJSON: true, hasPack: false });
 
       expect(await languageProvider.getParserAndLabelKeys('{place="luna"}')).toEqual({
-        extractedLabelKeys,
+        extractedLabelKeys: [...extractedLabelKeys, ...parsedKeys],
         unwrapLabelKeys,
+        structuredMetadataKeys,
         hasJSON: true,
         hasLogfmt: false,
         hasPack: false,
@@ -369,8 +466,9 @@ describe('Query imports', () => {
       extractLogParserFromDataFrameMock.mockReturnValueOnce({ hasLogfmt: true, hasJSON: false, hasPack: false });
 
       expect(await languageProvider.getParserAndLabelKeys('{place="luna"}')).toEqual({
-        extractedLabelKeys,
+        extractedLabelKeys: [...extractedLabelKeys, ...parsedKeys],
         unwrapLabelKeys,
+        structuredMetadataKeys,
         hasJSON: false,
         hasLogfmt: true,
         hasPack: false,
@@ -384,12 +482,74 @@ describe('Query imports', () => {
       expect(await languageProvider.getParserAndLabelKeys('{place="luna"}')).toEqual({
         extractedLabelKeys: [],
         unwrapLabelKeys: [],
+        structuredMetadataKeys: [],
         hasJSON: false,
         hasLogfmt: false,
         hasPack: false,
       });
       expect(extractLogParserFromDataFrameMock).not.toHaveBeenCalled();
     });
+
+    it('calls dataSample with correct default maxLines', async () => {
+      jest.spyOn(datasource, 'getDataSamples').mockResolvedValue([]);
+
+      expect(await languageProvider.getParserAndLabelKeys('{place="luna"}')).toEqual({
+        extractedLabelKeys: [],
+        unwrapLabelKeys: [],
+        structuredMetadataKeys: [],
+        hasJSON: false,
+        hasLogfmt: false,
+        hasPack: false,
+      });
+      expect(datasource.getDataSamples).toHaveBeenCalledWith(
+        {
+          expr: '{place="luna"}',
+          maxLines: DEFAULT_MAX_LINES_SAMPLE,
+          refId: 'data-samples',
+        },
+        getDefaultTimeRange()
+      );
+    });
+
+    it('calls dataSample with correctly set sampleSize', async () => {
+      jest.spyOn(datasource, 'getDataSamples').mockResolvedValue([]);
+
+      expect(await languageProvider.getParserAndLabelKeys('{place="luna"}', { maxLines: 5 })).toEqual({
+        extractedLabelKeys: [],
+        unwrapLabelKeys: [],
+        structuredMetadataKeys: [],
+        hasJSON: false,
+        hasLogfmt: false,
+        hasPack: false,
+      });
+      expect(datasource.getDataSamples).toHaveBeenCalledWith(
+        {
+          expr: '{place="luna"}',
+          maxLines: 5,
+          refId: 'data-samples',
+        },
+        getDefaultTimeRange()
+      );
+    });
+
+    it('calls dataSample with correctly set time range', async () => {
+      jest.spyOn(datasource, 'getDataSamples').mockResolvedValue([]);
+      languageProvider.getParserAndLabelKeys('{place="luna"}', { timeRange: mockTimeRange });
+      expect(datasource.getDataSamples).toHaveBeenCalledWith(
+        {
+          expr: '{place="luna"}',
+          maxLines: 10,
+          refId: 'data-samples',
+        },
+        mockTimeRange
+      );
+    });
+    it('does not call dataSample with feature toggle disabled', async () => {
+      config.featureToggles.lokiQueryHints = false;
+      jest.spyOn(datasource, 'getDataSamples');
+      languageProvider.getParserAndLabelKeys('{place="luna"}', { timeRange: mockTimeRange });
+      expect(datasource.getDataSamples).not.toHaveBeenCalled();
+    });
   });
 });
 
@@ -399,31 +559,6 @@ async function getLanguageProvider(datasource: LokiDatasource) {
   return instance;
 }
 
-/**
- * @param value Value of the full input
- * @param text Last piece of text (not sure but in case of {label=} this would be just '=')
- * @param labelKey Label by which to search for values. Cutting corners a bit here as this should be inferred from value
- */
-function createTypeaheadInput(
-  value: string,
-  text: string,
-  labelKey?: string,
-  anchorOffset?: number,
-  wrapperClasses?: string[],
-  instance?: LanguageProvider
-): TypeaheadInput {
-  const deserialized = Plain.deserialize(value);
-  const range = deserialized.selection.setAnchor(deserialized.selection.anchor.setOffset(anchorOffset || 1));
-  const valueWithSelection = deserialized.setSelection(range);
-  return {
-    text,
-    prefix: instance ? instance.cleanText(text) : '',
-    wrapperClasses: wrapperClasses || ['context-labels'],
-    value: valueWithSelection,
-    labelKey,
-  };
-}
-
 function setup(
   labelsAndValues: Record<string, string[]>,
   series?: Record<string, Array<Record<string, string>>>
diff --git a/public/app/plugins/datasource/loki/LanguageProvider.ts b/public/app/plugins/datasource/loki/LanguageProvider.ts
index 9515571bfd85c..460140b35f17f 100644
--- a/public/app/plugins/datasource/loki/LanguageProvider.ts
+++ b/public/app/plugins/datasource/loki/LanguageProvider.ts
@@ -1,77 +1,27 @@
-import { chain, difference } from 'lodash';
+import { flatten } from 'lodash';
 import { LRUCache } from 'lru-cache';
-import Prism, { Grammar } from 'prismjs';
 
-import { dateTime, AbsoluteTimeRange, LanguageProvider, HistoryItem, AbstractQuery } from '@grafana/data';
-import { CompletionItem, TypeaheadInput, TypeaheadOutput, CompletionItemGroup } from '@grafana/ui';
-import {
-  extractLabelMatchers,
-  parseSelector,
-  processLabels,
-  toPromLikeExpr,
-} from 'app/plugins/datasource/prometheus/language_utils';
+import { LanguageProvider, AbstractQuery, KeyValue, getDefaultTimeRange, TimeRange } from '@grafana/data';
+import { config } from '@grafana/runtime';
 
-import { LokiDatasource } from './datasource';
+import { DEFAULT_MAX_LINES_SAMPLE, LokiDatasource } from './datasource';
+import { abstractQueryToExpr, mapAbstractOperatorsToOp, processLabels } from './languageUtils';
+import { getStreamSelectorsFromQuery } from './queryUtils';
+import { buildVisualQueryFromString } from './querybuilder/parsing';
 import {
   extractLabelKeysFromDataFrame,
   extractLogParserFromDataFrame,
   extractUnwrapLabelKeysFromDataFrame,
 } from './responseUtils';
-import syntax, { FUNCTIONS, PIPE_PARSERS, PIPE_OPERATORS } from './syntax';
-import { ParserAndLabelKeysResult, LokiQuery, LokiQueryType } from './types';
+import { ParserAndLabelKeysResult, LokiQuery, LokiQueryType, LabelType } from './types';
 
-const DEFAULT_KEYS = ['job', 'namespace'];
-const EMPTY_SELECTOR = '{}';
-const HISTORY_ITEM_COUNT = 10;
-const HISTORY_COUNT_CUTOFF = 1000 * 60 * 60 * 24; // 24h
 const NS_IN_MS = 1000000;
 
-// When changing RATE_RANGES, check if Prometheus/PromQL ranges should be changed too
-// @see public/app/plugins/datasource/prometheus/promql.ts
-const RATE_RANGES: CompletionItem[] = [
-  { label: '$__auto', sortValue: '$__auto' },
-  { label: '1m', sortValue: '00:01:00' },
-  { label: '5m', sortValue: '00:05:00' },
-  { label: '10m', sortValue: '00:10:00' },
-  { label: '30m', sortValue: '00:30:00' },
-  { label: '1h', sortValue: '01:00:00' },
-  { label: '1d', sortValue: '24:00:00' },
-];
-
-export const LABEL_REFRESH_INTERVAL = 1000 * 30; // 30sec
-
-const wrapLabel = (label: string) => ({ label, filterText: `\"${label}\"` });
-
-export type LokiHistoryItem = HistoryItem<LokiQuery>;
-
-type TypeaheadContext = {
-  history?: LokiHistoryItem[];
-  absoluteRange?: AbsoluteTimeRange;
-};
-
-export function addHistoryMetadata(item: CompletionItem, history: LokiHistoryItem[]): CompletionItem {
-  const cutoffTs = Date.now() - HISTORY_COUNT_CUTOFF;
-  const historyForItem = history.filter((h) => h.ts > cutoffTs && h.query.expr === item.label);
-  let hint = `Queried ${historyForItem.length} times in the last 24h.`;
-  const recent = historyForItem[0];
-
-  if (recent) {
-    const lastQueried = dateTime(recent.ts).fromNow();
-    hint = `${hint} Last queried ${lastQueried}.`;
-  }
-
-  return {
-    ...item,
-    documentation: hint,
-  };
-}
-
 export default class LokiLanguageProvider extends LanguageProvider {
   labelKeys: string[];
-  labelFetchTs: number;
   started = false;
+  startedTimeRange?: TimeRange;
   datasource: LokiDatasource;
-  lookupsDisabled = false; // Dynamically set to true for big/slow instances
 
   /**
    *  Cache for labels of series. This is bit simplistic in the sense that it just counts responses each as a 1 and does
@@ -86,19 +36,11 @@ export default class LokiLanguageProvider extends LanguageProvider {
 
     this.datasource = datasource;
     this.labelKeys = [];
-    this.labelFetchTs = 0;
 
     Object.assign(this, initialValues);
   }
 
-  // Strip syntax chars
-  cleanText = (s: string) => s.replace(/[{}[\]="(),!~+\-*/^%\|]/g, '').trim();
-
-  getSyntax(): Grammar {
-    return syntax;
-  }
-
-  request = async (url: string, params?: any): Promise<any> => {
+  request = async (url: string, params?: any) => {
     try {
       return await this.datasource.metadataRequest(url, params);
     } catch (error) {
@@ -109,12 +51,18 @@ export default class LokiLanguageProvider extends LanguageProvider {
   };
 
   /**
-   * Initialise the language provider by fetching set of labels. Without this initialisation the provider would return
-   * just a set of hardcoded default labels on provideCompletionItems or a recent queries from history.
+   * Initialize the language provider by fetching set of labels.
    */
-  start = () => {
-    if (!this.startTask) {
-      this.startTask = this.fetchLabels().then(() => {
+  start = (timeRange?: TimeRange) => {
+    const range = timeRange ?? this.getDefaultTimeRange();
+    // refetch labels if either there's not already a start task or the time range has changed
+    if (
+      !this.startTask ||
+      this.startedTimeRange?.from.isSame(range.from) === false ||
+      this.startedTimeRange?.to.isSame(range.to) === false
+    ) {
+      this.startedTimeRange = range;
+      this.startTask = this.fetchLabels({ timeRange: range }).then(() => {
         this.started = true;
         return [];
       });
@@ -123,259 +71,67 @@ export default class LokiLanguageProvider extends LanguageProvider {
     return this.startTask;
   };
 
-  getLabelKeys(): string[] {
-    return this.labelKeys;
-  }
-
   /**
-   * Return suggestions based on input that can be then plugged into a typeahead dropdown.
-   * Keep this DOM-free for testing
-   * @param input
-   * @param context Is optional in types but is required in case we are doing getLabelCompletionItems
-   * @param context.absoluteRange Required in case we are doing getLabelCompletionItems
-   * @param context.history Optional used only in getEmptyCompletionItems
+   * Returns the label keys that have been fetched.
+   * If labels have not been fetched yet, it will return an empty array.
+   * For updated labels (which should not happen often), use fetchLabels.
+   * @todo It is quite complicated to know when to use fetchLabels and when to use getLabelKeys.
+   * We should consider simplifying this and use caching in the same way as with seriesCache and labelsCache
+   * and just always use fetchLabels.
+   * Caching should be thought out properly, so we are not fetching this often, as labelKeys should not be changing often.
+   *
+   * @returns {string[]} An array of label keys or an empty array if labels have not been fetched.
    */
-  async provideCompletionItems(input: TypeaheadInput, context?: TypeaheadContext): Promise<TypeaheadOutput> {
-    const { wrapperClasses, value, prefix, text } = input;
-    const emptyResult: TypeaheadOutput = { suggestions: [] };
-
-    if (!value) {
-      return emptyResult;
-    }
-
-    // Local text properties
-    const empty = value?.document.text.length === 0;
-    const selectedLines = value.document.getTextsAtRange(value.selection);
-    const currentLine = selectedLines.size === 1 ? selectedLines.first().getText() : null;
-
-    const nextCharacter = currentLine ? currentLine[value.selection.anchor.offset] : null;
-
-    // Syntax spans have 3 classes by default. More indicate a recognized token
-    const tokenRecognized = wrapperClasses.length > 3;
-
-    // Non-empty prefix, but not inside known token
-    const prefixUnrecognized = prefix && !tokenRecognized;
-
-    // Prevent suggestions in `function(|suffix)`
-    const noSuffix = !nextCharacter || nextCharacter === ')';
-
-    // Prefix is safe if it does not immediately follow a complete expression and has no text after it
-    const safePrefix = prefix && !text.match(/^['"~=\]})\s]+$/) && noSuffix;
-
-    // About to type next operand if preceded by binary operator
-    const operatorsPattern = /[+\-*/^%]/;
-    const isNextOperand = text.match(operatorsPattern);
-
-    // Determine candidates by CSS context
-    if (wrapperClasses.includes('context-range')) {
-      // Suggestions for metric[|]
-      return this.getRangeCompletionItems();
-    } else if (wrapperClasses.includes('context-labels')) {
-      // Suggestions for {|} and {foo=|}
-      return await this.getLabelCompletionItems(input);
-    } else if (wrapperClasses.includes('context-pipe')) {
-      return this.getPipeCompletionItem();
-    } else if (empty) {
-      // Suggestions for empty query field
-      return this.getEmptyCompletionItems(context);
-    } else if (prefixUnrecognized && noSuffix && !isNextOperand) {
-      // Show term suggestions in a couple of scenarios
-      return this.getBeginningCompletionItems(context);
-    } else if (prefixUnrecognized && safePrefix) {
-      // Show term suggestions in a couple of scenarios
-      return this.getTermCompletionItems();
-    }
-
-    return emptyResult;
-  }
-
-  getBeginningCompletionItems = (context?: TypeaheadContext): TypeaheadOutput => {
-    return {
-      suggestions: [...this.getEmptyCompletionItems(context).suggestions, ...this.getTermCompletionItems().suggestions],
-    };
-  };
-
-  getEmptyCompletionItems(context?: TypeaheadContext): TypeaheadOutput {
-    const history = context?.history;
-    const suggestions = [];
-
-    if (history?.length) {
-      const historyItems = chain(history)
-        .map((h) => h.query.expr)
-        .filter()
-        .uniq()
-        .take(HISTORY_ITEM_COUNT)
-        .map(wrapLabel)
-        .map((item) => addHistoryMetadata(item, history))
-        .value();
-
-      suggestions.push({
-        prefixMatch: true,
-        skipSort: true,
-        label: 'History',
-        items: historyItems,
-      });
-    }
-
-    return { suggestions };
-  }
-
-  getTermCompletionItems = (): TypeaheadOutput => {
-    const suggestions = [];
-
-    suggestions.push({
-      prefixMatch: true,
-      label: 'Functions',
-      items: FUNCTIONS.map((suggestion) => ({ ...suggestion, kind: 'function' })),
-    });
-
-    return { suggestions };
-  };
-
-  getPipeCompletionItem = (): TypeaheadOutput => {
-    const suggestions = [];
-
-    suggestions.push({
-      label: 'Operators',
-      items: PIPE_OPERATORS.map((suggestion) => ({ ...suggestion, kind: 'operators' })),
-    });
-
-    suggestions.push({
-      label: 'Parsers',
-      items: PIPE_PARSERS.map((suggestion) => ({ ...suggestion, kind: 'parsers' })),
-    });
-
-    return { suggestions };
-  };
-
-  getRangeCompletionItems(): TypeaheadOutput {
-    return {
-      context: 'context-range',
-      suggestions: [
-        {
-          label: 'Range vector',
-          items: [...RATE_RANGES],
-        },
-      ],
-    };
-  }
-
-  async getLabelCompletionItems({ text, wrapperClasses, labelKey, value }: TypeaheadInput): Promise<TypeaheadOutput> {
-    let context = 'context-labels';
-    const suggestions: CompletionItemGroup[] = [];
-    if (!value) {
-      return { context, suggestions: [] };
-    }
-    const line = value.anchorBlock.getText();
-    const cursorOffset = value.selection.anchor.offset;
-    const isValueStart = text.match(/^(=|=~|!=|!~)/);
-
-    // Get normalized selector
-    let selector;
-    let parsedSelector;
-    try {
-      parsedSelector = parseSelector(line, cursorOffset);
-      selector = parsedSelector.selector;
-    } catch {
-      selector = EMPTY_SELECTOR;
-    }
-
-    if (!labelKey && selector === EMPTY_SELECTOR) {
-      // start task gets all labels
-      await this.start();
-      const allLabels = this.getLabelKeys();
-      return { context, suggestions: [{ label: `Labels`, items: allLabels.map(wrapLabel) }] };
-    }
-
-    const existingKeys = parsedSelector ? parsedSelector.labelKeys : [];
-
-    let labelValues;
-    // Query labels for selector
-    if (selector) {
-      if (selector === EMPTY_SELECTOR && labelKey) {
-        const labelValuesForKey = await this.getLabelValues(labelKey);
-        labelValues = { [labelKey]: labelValuesForKey };
-      } else {
-        labelValues = await this.getSeriesLabels(selector);
-      }
-    }
-
-    if (!labelValues) {
-      console.warn(`Server did not return any values for selector = ${selector}`);
-      return { context, suggestions };
-    }
-
-    if ((text && isValueStart) || wrapperClasses.includes('attr-value')) {
-      // Label values
-      if (labelKey && labelValues[labelKey]) {
-        context = 'context-label-values';
-        suggestions.push({
-          label: `Label values for "${labelKey}"`,
-          // Filter to prevent previously selected values from being repeatedly suggested
-          items: labelValues[labelKey].map(wrapLabel).filter(({ filterText }) => filterText !== text),
-        });
-      }
-    } else {
-      // Label keys
-      const labelKeys = labelValues ? Object.keys(labelValues) : DEFAULT_KEYS;
-      if (labelKeys) {
-        const possibleKeys = difference(labelKeys, existingKeys);
-        if (possibleKeys.length) {
-          const newItems = possibleKeys.map((key) => ({ label: key }));
-          const newSuggestion: CompletionItemGroup = { label: `Labels`, items: newItems };
-          suggestions.push(newSuggestion);
-        }
-      }
-    }
-
-    return { context, suggestions };
+  getLabelKeys(): string[] {
+    return this.labelKeys;
   }
 
   importFromAbstractQuery(labelBasedQuery: AbstractQuery): LokiQuery {
     return {
       refId: labelBasedQuery.refId,
-      expr: toPromLikeExpr(labelBasedQuery),
+      expr: abstractQueryToExpr(labelBasedQuery),
       queryType: LokiQueryType.Range,
     };
   }
 
   exportToAbstractQuery(query: LokiQuery): AbstractQuery {
-    const lokiQuery = query.expr;
-    if (!lokiQuery || lokiQuery.length === 0) {
+    if (!query.expr || query.expr.length === 0) {
       return { refId: query.refId, labelMatchers: [] };
     }
-    const tokens = Prism.tokenize(lokiQuery, syntax);
+    const streamSelectors = getStreamSelectorsFromQuery(query.expr);
+
+    const labelMatchers = streamSelectors.map((streamSelector) => {
+      const visualQuery = buildVisualQueryFromString(streamSelector).query;
+      const matchers = visualQuery.labels.map((label) => {
+        return {
+          name: label.label,
+          value: label.value,
+          operator: mapAbstractOperatorsToOp[label.op],
+        };
+      });
+      return matchers;
+    });
+
     return {
       refId: query.refId,
-      labelMatchers: extractLabelMatchers(tokens),
+      labelMatchers: flatten(labelMatchers),
     };
   }
 
-  async getSeriesLabels(selector: string) {
-    if (this.lookupsDisabled) {
-      return undefined;
-    }
-    try {
-      return await this.fetchSeriesLabels(selector);
-    } catch (error) {
-      // TODO: better error handling
-      console.error(error);
-      return undefined;
-    }
-  }
-
   /**
    * Fetch all label keys
    * This asynchronous function returns all available label keys from the data source.
    * It returns a promise that resolves to an array of strings containing the label keys.
    *
+   * @param options - (Optional) An object containing additional options - currently only time range.
+   * @param options.timeRange - (Optional) The time range for which you want to retrieve label keys. If not provided, the default time range is used.
    * @returns A promise containing an array of label keys.
    * @throws An error if the fetch operation fails.
    */
-  async fetchLabels(): Promise<string[]> {
+  async fetchLabels(options?: { timeRange?: TimeRange }): Promise<string[]> {
     const url = 'labels';
-    const timeRange = this.datasource.getTimeRangeParams();
-    this.labelFetchTs = Date.now().valueOf();
+    const range = options?.timeRange ?? this.getDefaultTimeRange();
+    const timeRange = this.datasource.getTimeRangeParams(range);
 
     const res = await this.request(url, timeRange);
     if (Array.isArray(res)) {
@@ -397,19 +153,28 @@ export default class LokiLanguageProvider extends LanguageProvider {
    * It returns a promise that resolves to a record mapping label names to their corresponding values.
    *
    * @param streamSelector - The stream selector for which you want to retrieve labels.
+   * @param options - (Optional) An object containing additional options - currently only time range.
+   * @param options.timeRange - (Optional) The time range for which you want to retrieve label keys. If not provided, the default time range is used.
    * @returns A promise containing a record of label names and their values.
    * @throws An error if the fetch operation fails.
    */
-  fetchSeriesLabels = async (streamSelector: string): Promise<Record<string, string[]>> => {
+  fetchSeriesLabels = async (
+    streamSelector: string,
+    options?: { timeRange?: TimeRange }
+  ): Promise<Record<string, string[]>> => {
     const interpolatedMatch = this.datasource.interpolateString(streamSelector);
     const url = 'series';
-    const { start, end } = this.datasource.getTimeRangeParams();
+    const range = options?.timeRange ?? this.getDefaultTimeRange();
+    const { start, end } = this.datasource.getTimeRangeParams(range);
 
     const cacheKey = this.generateCacheKey(url, start, end, interpolatedMatch);
     let value = this.seriesCache.get(cacheKey);
     if (!value) {
       const params = { 'match[]': interpolatedMatch, start, end };
       const data = await this.request(url, params);
+      if (!Array.isArray(data)) {
+        return {};
+      }
       const { values } = processLabels(data);
       value = values;
       this.seriesCache.set(cacheKey, value);
@@ -420,10 +185,15 @@ export default class LokiLanguageProvider extends LanguageProvider {
   /**
    * Fetch series for a selector. Use this for raw results. Use fetchSeriesLabels() to get labels.
    * @param match
+   * @param streamSelector - The stream selector for which you want to retrieve labels.
+   * @param options - (Optional) An object containing additional options.
+   * @param options.timeRange - (Optional) The time range for which you want to retrieve label keys. If not provided, the default time range is used.
+   * @returns A promise containing array with records of label names and their value.
    */
-  fetchSeries = async (match: string): Promise<Array<Record<string, string>>> => {
+  fetchSeries = async (match: string, options?: { timeRange?: TimeRange }): Promise<Array<Record<string, string>>> => {
     const url = 'series';
-    const { start, end } = this.datasource.getTimeRangeParams();
+    const range = options?.timeRange ?? this.getDefaultTimeRange();
+    const { start, end } = this.datasource.getTimeRangeParams(range);
     const params = { 'match[]': match, start, end };
     return await this.request(url, params);
   };
@@ -432,17 +202,13 @@ export default class LokiLanguageProvider extends LanguageProvider {
   // The rounding may seem strange but makes relative intervals like now-1h less prone to need separate request every
   // millisecond while still actually getting all the keys for the correct interval. This still can create problems
   // when user does not the newest values for a minute if already cached.
-  generateCacheKey(url: string, start: number, end: number, param: string): string {
+  private generateCacheKey(url: string, start: number, end: number, param: string): string {
     return [url, this.roundTime(start), this.roundTime(end), param].join();
   }
 
-  // Round nanos epoch to nearest 5 minute interval
-  roundTime(nanos: number): number {
-    return nanos ? Math.floor(nanos / NS_IN_MS / 1000 / 60 / 5) : 0;
-  }
-
-  async getLabelValues(key: string): Promise<string[]> {
-    return await this.fetchLabelValues(key);
+  // Round nanoseconds epoch to nearest 5 minute interval
+  private roundTime(nanoseconds: number): number {
+    return nanoseconds ? Math.floor(nanoseconds / NS_IN_MS / 1000 / 60 / 5) : 0;
   }
 
   /**
@@ -452,18 +218,34 @@ export default class LokiLanguageProvider extends LanguageProvider {
    * It returns a promise that resolves to an array of strings containing the label values.
    *
    * @param labelName - The name of the label for which you want to retrieve values.
+   * @param options - (Optional) An object containing additional options.
+   * @param options.streamSelector - (Optional) The stream selector to filter label values. If not provided, all label values are fetched.
+   * @param options.timeRange - (Optional) The time range for which you want to retrieve label values. If not provided, the default time range is used.
    * @returns A promise containing an array of label values.
    * @throws An error if the fetch operation fails.
    */
-  async fetchLabelValues(labelName: string): Promise<string[]> {
-    const interpolatedKey = encodeURIComponent(this.datasource.interpolateString(labelName));
-
-    const url = `label/${interpolatedKey}/values`;
-    const rangeParams = this.datasource.getTimeRangeParams();
+  async fetchLabelValues(
+    labelName: string,
+    options?: { streamSelector?: string; timeRange?: TimeRange }
+  ): Promise<string[]> {
+    const label = encodeURIComponent(this.datasource.interpolateString(labelName));
+    const streamParam = options?.streamSelector
+      ? encodeURIComponent(this.datasource.interpolateString(options.streamSelector))
+      : undefined;
+
+    const url = `label/${label}/values`;
+    const range = options?.timeRange ?? this.getDefaultTimeRange();
+    const rangeParams = this.datasource.getTimeRangeParams(range);
     const { start, end } = rangeParams;
+    const params: KeyValue<string | number> = { start, end };
+    let paramCacheKey = label;
 
-    const cacheKey = this.generateCacheKey(url, start, end, interpolatedKey);
-    const params = { start, end };
+    if (streamParam) {
+      params.query = streamParam;
+      paramCacheKey += streamParam;
+    }
+
+    const cacheKey = this.generateCacheKey(url, start, end, paramCacheKey);
 
     let labelValues = this.labelsCache.get(cacheKey);
     if (!labelValues) {
@@ -492,24 +274,63 @@ export default class LokiLanguageProvider extends LanguageProvider {
    * - `unwrapLabelKeys`: An array of label keys that can be used for unwrapping log data.
    *
    * @param streamSelector - The selector for the log stream you want to analyze.
+   * @param options - (Optional) An object containing additional options.
+   * @param options.maxLines - (Optional) The number of log lines requested when determining parsers and label keys.
+   * @param options.timeRange - (Optional) The time range for which you want to retrieve label keys. If not provided, the default time range is used.
+   * Smaller maxLines is recommended for improved query performance. The default count is 10.
    * @returns A promise containing an object with parser and label key information.
    * @throws An error if the fetch operation fails.
    */
-  async getParserAndLabelKeys(streamSelector: string): Promise<ParserAndLabelKeysResult> {
-    const series = await this.datasource.getDataSamples({ expr: streamSelector, refId: 'data-samples' });
+  async getParserAndLabelKeys(
+    streamSelector: string,
+    options?: { maxLines?: number; timeRange?: TimeRange }
+  ): Promise<ParserAndLabelKeysResult> {
+    const empty = {
+      extractedLabelKeys: [],
+      structuredMetadataKeys: [],
+      unwrapLabelKeys: [],
+      hasJSON: false,
+      hasLogfmt: false,
+      hasPack: false,
+    };
+    if (!config.featureToggles.lokiQueryHints) {
+      return empty;
+    }
+
+    const series = await this.datasource.getDataSamples(
+      {
+        expr: streamSelector,
+        refId: 'data-samples',
+        maxLines: options?.maxLines || DEFAULT_MAX_LINES_SAMPLE,
+      },
+      options?.timeRange ?? this.getDefaultTimeRange()
+    );
 
     if (!series.length) {
-      return { extractedLabelKeys: [], unwrapLabelKeys: [], hasJSON: false, hasLogfmt: false, hasPack: false };
+      return empty;
     }
 
     const { hasLogfmt, hasJSON, hasPack } = extractLogParserFromDataFrame(series[0]);
 
     return {
-      extractedLabelKeys: extractLabelKeysFromDataFrame(series[0]),
+      extractedLabelKeys: [
+        ...extractLabelKeysFromDataFrame(series[0], LabelType.Indexed),
+        ...extractLabelKeysFromDataFrame(series[0], LabelType.Parsed),
+      ],
+      structuredMetadataKeys: extractLabelKeysFromDataFrame(series[0], LabelType.StructuredMetadata),
       unwrapLabelKeys: extractUnwrapLabelKeysFromDataFrame(series[0]),
       hasJSON,
       hasPack,
       hasLogfmt,
     };
   }
+
+  /**
+   * Get the default time range
+   *
+   * @returns {TimeRange} The default time range
+   */
+  private getDefaultTimeRange(): TimeRange {
+    return getDefaultTimeRange();
+  }
 }
diff --git a/public/app/plugins/datasource/loki/LogContextProvider.test.ts b/public/app/plugins/datasource/loki/LogContextProvider.test.ts
index 82ab9af47458a..92c6362387f6e 100644
--- a/public/app/plugins/datasource/loki/LogContextProvider.test.ts
+++ b/public/app/plugins/datasource/loki/LogContextProvider.test.ts
@@ -1,6 +1,13 @@
 import { of } from 'rxjs';
 
-import { DataQueryResponse, FieldType, LogRowContextQueryDirection, LogRowModel, createDataFrame } from '@grafana/data';
+import {
+  DataQueryResponse,
+  FieldType,
+  LogRowContextQueryDirection,
+  LogRowModel,
+  createDataFrame,
+  dateTime,
+} from '@grafana/data';
 
 import LokiLanguageProvider from './LanguageProvider';
 import {
@@ -8,25 +15,9 @@ import {
   LOKI_LOG_CONTEXT_PRESERVED_LABELS,
   SHOULD_INCLUDE_PIPELINE_OPERATIONS,
 } from './LogContextProvider';
-import { createLokiDatasource } from './mocks';
+import { createLokiDatasource } from './__mocks__/datasource';
 import { LokiQuery } from './types';
 
-jest.mock('app/core/store', () => {
-  return {
-    get(item: string) {
-      return window.localStorage.getItem(item);
-    },
-    getBool(key: string, defaultValue?: boolean) {
-      const item = window.localStorage.getItem(key);
-      if (item === null) {
-        return defaultValue;
-      } else {
-        return item === 'true';
-      }
-    },
-  };
-});
-
 const defaultLanguageProviderMock = {
   start: jest.fn(),
   fetchSeriesLabels: jest.fn(() => ({ bar: ['baz'], xyz: ['abc'] })),
@@ -46,10 +37,32 @@ const defaultLogRow = {
         type: FieldType.time,
         values: [0],
       },
+      {
+        name: 'labelTypes',
+        type: FieldType.other,
+        values: [{ bar: 'I', foo: 'S', xyz: 'I' }],
+      },
     ],
   }),
   labels: { bar: 'baz', foo: 'uniqueParsedLabel', xyz: 'abc' },
   uid: '1',
+  timeEpochMs: new Date().getTime(),
+} as unknown as LogRowModel;
+
+const frameWithoutTypes = {
+  rowIndex: 0,
+  dataFrame: createDataFrame({
+    fields: [
+      {
+        name: 'ts',
+        type: FieldType.time,
+        values: [0],
+      },
+    ],
+  }),
+  labels: { bar: 'baz', foo: 'uniqueParsedLabel', xyz: 'abc' },
+  uid: '1',
+  timeEpochMs: new Date().getTime(),
 } as unknown as LogRowModel;
 
 describe('LogContextProvider', () => {
@@ -63,12 +76,13 @@ describe('LogContextProvider', () => {
   });
 
   describe('getLogRowContext', () => {
-    it('should call getInitContextFilters if no appliedContextFilters', async () => {
-      logContextProvider.getInitContextFilters = jest
-        .fn()
-        .mockResolvedValue([{ value: 'baz', enabled: true, fromParser: false, label: 'bar' }]);
+    it('should call getInitContextFilters if no cachedContextFilters', async () => {
+      logContextProvider.getInitContextFilters = jest.fn().mockResolvedValue({
+        contextFilters: [{ value: 'baz', enabled: true, nonIndexed: false, label: 'bar' }],
+        preservedFiltersApplied: false,
+      });
 
-      expect(logContextProvider.appliedContextFilters).toHaveLength(0);
+      expect(logContextProvider.cachedContextFilters).toHaveLength(0);
       await logContextProvider.getLogRowContext(
         defaultLogRow,
         {
@@ -82,53 +96,69 @@ describe('LogContextProvider', () => {
       );
       expect(logContextProvider.getInitContextFilters).toBeCalled();
       expect(logContextProvider.getInitContextFilters).toHaveBeenCalledWith(
-        { bar: 'baz', foo: 'uniqueParsedLabel', xyz: 'abc' },
-        { expr: '{bar="baz"}', refId: 'A' }
+        expect.objectContaining({ labels: { bar: 'baz', foo: 'uniqueParsedLabel', xyz: 'abc' } }),
+        { expr: '{bar="baz"}', refId: 'A' },
+        {
+          from: dateTime(defaultLogRow.timeEpochMs),
+          to: dateTime(defaultLogRow.timeEpochMs),
+          raw: { from: dateTime(defaultLogRow.timeEpochMs), to: dateTime(defaultLogRow.timeEpochMs) },
+        }
       );
-      expect(logContextProvider.appliedContextFilters).toHaveLength(1);
+      expect(logContextProvider.cachedContextFilters).toHaveLength(1);
     });
 
-    it('should not call getInitContextFilters if appliedContextFilters', async () => {
+    it('should not call getInitContextFilters if cachedContextFilters', async () => {
       logContextProvider.getInitContextFilters = jest
         .fn()
-        .mockResolvedValue([{ value: 'baz', enabled: true, fromParser: false, label: 'bar' }]);
+        .mockResolvedValue([{ value: 'baz', enabled: true, nonIndexed: false, label: 'bar' }]);
 
-      logContextProvider.appliedContextFilters = [
-        { value: 'baz', enabled: true, fromParser: false, label: 'bar' },
-        { value: 'abc', enabled: true, fromParser: false, label: 'xyz' },
+      logContextProvider.cachedContextFilters = [
+        { value: 'baz', enabled: true, nonIndexed: false, label: 'bar' },
+        { value: 'abc', enabled: true, nonIndexed: false, label: 'xyz' },
       ];
       await logContextProvider.getLogRowContext(defaultLogRow, {
         limit: 10,
         direction: LogRowContextQueryDirection.Backward,
       });
       expect(logContextProvider.getInitContextFilters).not.toBeCalled();
-      expect(logContextProvider.appliedContextFilters).toHaveLength(2);
+      expect(logContextProvider.cachedContextFilters).toHaveLength(2);
     });
   });
 
   describe('getLogRowContextQuery', () => {
-    it('should call getInitContextFilters if no appliedContextFilters', async () => {
-      logContextProvider.getInitContextFilters = jest
-        .fn()
-        .mockResolvedValue([{ value: 'baz', enabled: true, fromParser: false, label: 'bar' }]);
+    it('should call getInitContextFilters if no cachedContextFilters', async () => {
+      logContextProvider.getInitContextFilters = jest.fn().mockResolvedValue({
+        contextFilters: [{ value: 'baz', enabled: true, nonIndexed: false, label: 'bar' }],
+        preservedFiltersApplied: false,
+      });
 
       const query = await logContextProvider.getLogRowContextQuery(defaultLogRow, {
         limit: 10,
         direction: LogRowContextQueryDirection.Backward,
       });
       expect(query.expr).toBe('{bar="baz"}');
+      expect(logContextProvider.getInitContextFilters).toHaveBeenCalled();
     });
 
-    it('should not call getInitContextFilters if appliedContextFilters', async () => {
-      logContextProvider.appliedContextFilters = [
-        { value: 'baz', enabled: true, fromParser: false, label: 'bar' },
-        { value: 'abc', enabled: true, fromParser: false, label: 'xyz' },
-      ];
-      const query = await logContextProvider.getLogRowContextQuery(defaultLogRow, {
-        limit: 10,
-        direction: LogRowContextQueryDirection.Backward,
+    it('should also call getInitContextFilters if cacheFilters is not set', async () => {
+      logContextProvider.getInitContextFilters = jest.fn().mockResolvedValue({
+        contextFilters: [{ value: 'baz', enabled: true, nonIndexed: false, label: 'bar' }],
+        preservedFiltersApplied: false,
       });
-      expect(query.expr).toBe('{bar="baz",xyz="abc"}');
+      logContextProvider.cachedContextFilters = [
+        { value: 'baz', enabled: true, nonIndexed: false, label: 'bar' },
+        { value: 'abc', enabled: true, nonIndexed: false, label: 'xyz' },
+      ];
+      await logContextProvider.getLogRowContextQuery(
+        defaultLogRow,
+        {
+          limit: 10,
+          direction: LogRowContextQueryDirection.Backward,
+        },
+        undefined,
+        false
+      );
+      expect(logContextProvider.getInitContextFilters).toHaveBeenCalled();
     });
   });
 
@@ -138,8 +168,8 @@ describe('LogContextProvider', () => {
         expr: '{bar="baz"}',
         refId: 'A',
       };
-      it('returns empty expression if no appliedContextFilters', async () => {
-        logContextProvider.appliedContextFilters = [];
+      it('returns empty expression if no cachedContextFilters', async () => {
+        logContextProvider.cachedContextFilters = [];
         const result = await logContextProvider.prepareLogRowContextQueryTarget(
           defaultLogRow,
           10,
@@ -149,11 +179,11 @@ describe('LogContextProvider', () => {
         expect(result.query.expr).toEqual('{}');
       });
 
-      it('should not apply parsed labels', async () => {
-        logContextProvider.appliedContextFilters = [
-          { value: 'baz', enabled: true, fromParser: false, label: 'bar' },
-          { value: 'abc', enabled: true, fromParser: false, label: 'xyz' },
-          { value: 'uniqueParsedLabel', enabled: true, fromParser: true, label: 'foo' },
+      it('should apply parsed label as structured metadata', async () => {
+        logContextProvider.cachedContextFilters = [
+          { value: 'baz', enabled: true, nonIndexed: false, label: 'bar' },
+          { value: 'abc', enabled: true, nonIndexed: false, label: 'xyz' },
+          { value: 'uniqueParsedLabel', enabled: true, nonIndexed: true, label: 'foo' },
         ];
         const contextQuery = await logContextProvider.prepareLogRowContextQueryTarget(
           defaultLogRow,
@@ -162,15 +192,15 @@ describe('LogContextProvider', () => {
           query
         );
 
-        expect(contextQuery.query.expr).toEqual('{bar="baz",xyz="abc"}');
+        expect(contextQuery.query.expr).toEqual('{bar="baz",xyz="abc"} | foo=`uniqueParsedLabel`');
       });
     });
 
     describe('query with parser', () => {
       it('should apply parser', async () => {
-        logContextProvider.appliedContextFilters = [
-          { value: 'baz', enabled: true, fromParser: false, label: 'bar' },
-          { value: 'abc', enabled: true, fromParser: false, label: 'xyz' },
+        logContextProvider.cachedContextFilters = [
+          { value: 'baz', enabled: true, nonIndexed: false, label: 'bar' },
+          { value: 'abc', enabled: true, nonIndexed: false, label: 'xyz' },
         ];
         const contextQuery = await logContextProvider.prepareLogRowContextQueryTarget(
           defaultLogRow,
@@ -186,10 +216,10 @@ describe('LogContextProvider', () => {
       });
 
       it('should apply parser and parsed labels', async () => {
-        logContextProvider.appliedContextFilters = [
-          { value: 'baz', enabled: true, fromParser: false, label: 'bar' },
-          { value: 'abc', enabled: true, fromParser: false, label: 'xyz' },
-          { value: 'uniqueParsedLabel', enabled: true, fromParser: true, label: 'foo' },
+        logContextProvider.cachedContextFilters = [
+          { value: 'baz', enabled: true, nonIndexed: false, label: 'bar' },
+          { value: 'abc', enabled: true, nonIndexed: false, label: 'xyz' },
+          { value: 'uniqueParsedLabel', enabled: true, nonIndexed: true, label: 'foo' },
         ];
         const contextQuery = await logContextProvider.prepareLogRowContextQueryTarget(
           defaultLogRow,
@@ -206,9 +236,9 @@ describe('LogContextProvider', () => {
     });
 
     it('should not apply parser and parsed labels if more parsers in original query', async () => {
-      logContextProvider.appliedContextFilters = [
-        { value: 'baz', enabled: true, fromParser: false, label: 'bar' },
-        { value: 'uniqueParsedLabel', enabled: true, fromParser: true, label: 'foo' },
+      logContextProvider.cachedContextFilters = [
+        { value: 'baz', enabled: true, nonIndexed: false, label: 'bar' },
+        { value: 'uniqueParsedLabel', enabled: true, nonIndexed: true, label: 'foo' },
       ];
       const contextQuery = await logContextProvider.prepareLogRowContextQueryTarget(
         defaultLogRow,
@@ -220,11 +250,11 @@ describe('LogContextProvider', () => {
         }
       );
 
-      expect(contextQuery.query.expr).toEqual(`{bar="baz"}`);
+      expect(contextQuery.query.expr).toEqual(`{bar="baz"} | foo=\`uniqueParsedLabel\``);
     });
 
     it('should not apply line_format if flag is not set by default', async () => {
-      logContextProvider.appliedContextFilters = [{ value: 'baz', enabled: true, fromParser: false, label: 'bar' }];
+      logContextProvider.cachedContextFilters = [{ value: 'baz', enabled: true, nonIndexed: false, label: 'bar' }];
       const contextQuery = await logContextProvider.prepareLogRowContextQueryTarget(
         defaultLogRow,
         10,
@@ -240,7 +270,7 @@ describe('LogContextProvider', () => {
 
     it('should not apply line_format if flag is not set', async () => {
       window.localStorage.setItem(SHOULD_INCLUDE_PIPELINE_OPERATIONS, 'false');
-      logContextProvider.appliedContextFilters = [{ value: 'baz', enabled: true, fromParser: false, label: 'bar' }];
+      logContextProvider.cachedContextFilters = [{ value: 'baz', enabled: true, nonIndexed: false, label: 'bar' }];
       const contextQuery = await logContextProvider.prepareLogRowContextQueryTarget(
         defaultLogRow,
         10,
@@ -256,7 +286,7 @@ describe('LogContextProvider', () => {
 
     it('should apply line_format if flag is set', async () => {
       window.localStorage.setItem(SHOULD_INCLUDE_PIPELINE_OPERATIONS, 'true');
-      logContextProvider.appliedContextFilters = [{ value: 'baz', enabled: true, fromParser: false, label: 'bar' }];
+      logContextProvider.cachedContextFilters = [{ value: 'baz', enabled: true, nonIndexed: false, label: 'bar' }];
       const contextQuery = await logContextProvider.prepareLogRowContextQueryTarget(
         defaultLogRow,
         10,
@@ -272,7 +302,7 @@ describe('LogContextProvider', () => {
 
     it('should not apply line filters if flag is set', async () => {
       window.localStorage.setItem(SHOULD_INCLUDE_PIPELINE_OPERATIONS, 'true');
-      logContextProvider.appliedContextFilters = [{ value: 'baz', enabled: true, fromParser: false, label: 'bar' }];
+      logContextProvider.cachedContextFilters = [{ value: 'baz', enabled: true, nonIndexed: false, label: 'bar' }];
       let contextQuery = await logContextProvider.prepareLogRowContextQueryTarget(
         defaultLogRow,
         10,
@@ -324,7 +354,7 @@ describe('LogContextProvider', () => {
 
     it('should not apply line filters if nested between two operations', async () => {
       window.localStorage.setItem(SHOULD_INCLUDE_PIPELINE_OPERATIONS, 'true');
-      logContextProvider.appliedContextFilters = [{ value: 'baz', enabled: true, fromParser: false, label: 'bar' }];
+      logContextProvider.cachedContextFilters = [{ value: 'baz', enabled: true, nonIndexed: false, label: 'bar' }];
       const contextQuery = await logContextProvider.prepareLogRowContextQueryTarget(
         defaultLogRow,
         10,
@@ -340,7 +370,7 @@ describe('LogContextProvider', () => {
 
     it('should not apply label filters', async () => {
       window.localStorage.setItem(SHOULD_INCLUDE_PIPELINE_OPERATIONS, 'true');
-      logContextProvider.appliedContextFilters = [{ value: 'baz', enabled: true, fromParser: false, label: 'bar' }];
+      logContextProvider.cachedContextFilters = [{ value: 'baz', enabled: true, nonIndexed: false, label: 'bar' }];
       const contextQuery = await logContextProvider.prepareLogRowContextQueryTarget(
         defaultLogRow,
         10,
@@ -356,7 +386,7 @@ describe('LogContextProvider', () => {
 
     it('should not apply additional parsers', async () => {
       window.localStorage.setItem(SHOULD_INCLUDE_PIPELINE_OPERATIONS, 'true');
-      logContextProvider.appliedContextFilters = [{ value: 'baz', enabled: true, fromParser: false, label: 'bar' }];
+      logContextProvider.cachedContextFilters = [{ value: 'baz', enabled: true, nonIndexed: false, label: 'bar' }];
       const contextQuery = await logContextProvider.prepareLogRowContextQueryTarget(
         defaultLogRow,
         10,
@@ -371,31 +401,60 @@ describe('LogContextProvider', () => {
     });
   });
 
-  describe('getInitContextFiltersFromLabels', () => {
+  describe('getInitContextFilters', () => {
     describe('query with no parser', () => {
       const queryWithoutParser: LokiQuery = {
         expr: '{bar="baz"}',
         refId: 'A',
       };
 
+      const queryWithParser: LokiQuery = {
+        expr: '{bar="baz"} | logfmt',
+        refId: 'A',
+      };
+
+      const timeRange = {
+        from: dateTime(defaultLogRow.timeEpochMs),
+        to: dateTime(defaultLogRow.timeEpochMs),
+        raw: { from: dateTime(defaultLogRow.timeEpochMs), to: dateTime(defaultLogRow.timeEpochMs) },
+      };
+
       it('should correctly create contextFilters', async () => {
-        const filters = await logContextProvider.getInitContextFilters(defaultLogRow.labels, queryWithoutParser);
-        expect(filters).toEqual([
-          { enabled: true, fromParser: false, label: 'bar', value: 'baz' },
-          { enabled: false, fromParser: true, label: 'foo', value: 'uniqueParsedLabel' },
-          { enabled: true, fromParser: false, label: 'xyz', value: 'abc' },
+        const result = await logContextProvider.getInitContextFilters(defaultLogRow, queryWithoutParser);
+        expect(result.contextFilters).toEqual([
+          { enabled: true, nonIndexed: false, label: 'bar', value: 'baz' },
+          { enabled: false, nonIndexed: true, label: 'foo', value: 'uniqueParsedLabel' },
+          { enabled: true, nonIndexed: false, label: 'xyz', value: 'abc' },
         ]);
+        expect(result.preservedFiltersApplied).toBe(false);
       });
 
       it('should return empty contextFilters if no query', async () => {
-        const filters = await logContextProvider.getInitContextFilters(defaultLogRow.labels, undefined);
+        const filters = (await logContextProvider.getInitContextFilters(defaultLogRow, undefined)).contextFilters;
         expect(filters).toEqual([]);
       });
 
       it('should return empty contextFilters if no labels', async () => {
-        const filters = await logContextProvider.getInitContextFilters({}, queryWithoutParser);
+        const filters = (
+          await logContextProvider.getInitContextFilters({ labels: [] } as unknown as LogRowModel, queryWithoutParser)
+        ).contextFilters;
         expect(filters).toEqual([]);
       });
+
+      it('should call fetchSeriesLabels if parser', async () => {
+        await logContextProvider.getInitContextFilters(defaultLogRow, queryWithParser);
+        expect(defaultLanguageProviderMock.fetchSeriesLabels).toBeCalled();
+      });
+
+      it('should call fetchSeriesLabels with given time range', async () => {
+        await logContextProvider.getInitContextFilters(defaultLogRow, queryWithParser, timeRange);
+        expect(defaultLanguageProviderMock.fetchSeriesLabels).toBeCalledWith(`{bar="baz"}`, { timeRange });
+      });
+
+      it('should call `languageProvider.start` if no parser with given time range', async () => {
+        await logContextProvider.getInitContextFilters(defaultLogRow, queryWithoutParser, timeRange);
+        expect(defaultLanguageProviderMock.start).toBeCalledWith(timeRange);
+      });
     });
 
     describe('query with parser', () => {
@@ -405,21 +464,24 @@ describe('LogContextProvider', () => {
       };
 
       it('should correctly create contextFilters', async () => {
-        const filters = await logContextProvider.getInitContextFilters(defaultLogRow.labels, queryWithParser);
-        expect(filters).toEqual([
-          { enabled: true, fromParser: false, label: 'bar', value: 'baz' },
-          { enabled: false, fromParser: true, label: 'foo', value: 'uniqueParsedLabel' },
-          { enabled: true, fromParser: false, label: 'xyz', value: 'abc' },
+        const result = await logContextProvider.getInitContextFilters(defaultLogRow, queryWithParser);
+        expect(result.contextFilters).toEqual([
+          { enabled: true, nonIndexed: false, label: 'bar', value: 'baz' },
+          { enabled: false, nonIndexed: true, label: 'foo', value: 'uniqueParsedLabel' },
+          { enabled: true, nonIndexed: false, label: 'xyz', value: 'abc' },
         ]);
+        expect(result.preservedFiltersApplied).toBe(false);
       });
 
       it('should return empty contextFilters if no query', async () => {
-        const filters = await logContextProvider.getInitContextFilters(defaultLogRow.labels, undefined);
+        const filters = (await logContextProvider.getInitContextFilters(defaultLogRow, undefined)).contextFilters;
         expect(filters).toEqual([]);
       });
 
       it('should return empty contextFilters if no labels', async () => {
-        const filters = await logContextProvider.getInitContextFilters({}, queryWithParser);
+        const filters = (
+          await logContextProvider.getInitContextFilters({ labels: [] } as unknown as LogRowModel, queryWithParser)
+        ).contextFilters;
         expect(filters).toEqual([]);
       });
     });
@@ -438,12 +500,30 @@ describe('LogContextProvider', () => {
             selectedExtractedLabels: ['foo'],
           })
         );
-        const filters = await logContextProvider.getInitContextFilters(defaultLogRow.labels, queryWithParser);
-        expect(filters).toEqual([
-          { enabled: false, fromParser: false, label: 'bar', value: 'baz' }, // disabled real label
-          { enabled: true, fromParser: true, label: 'foo', value: 'uniqueParsedLabel' }, // enabled parsed label
-          { enabled: true, fromParser: false, label: 'xyz', value: 'abc' },
+        const result = await logContextProvider.getInitContextFilters(defaultLogRow, queryWithParser);
+        expect(result.contextFilters).toEqual([
+          { enabled: false, nonIndexed: false, label: 'bar', value: 'baz' }, // disabled real label
+          { enabled: true, nonIndexed: true, label: 'foo', value: 'uniqueParsedLabel' }, // enabled parsed label
+          { enabled: true, nonIndexed: false, label: 'xyz', value: 'abc' },
+        ]);
+        expect(result.preservedFiltersApplied).toBe(true);
+      });
+
+      it('should correctly apply preserved labels with no types', async () => {
+        window.localStorage.setItem(
+          LOKI_LOG_CONTEXT_PRESERVED_LABELS,
+          JSON.stringify({
+            removedLabels: ['bar'],
+            selectedExtractedLabels: ['foo'],
+          })
+        );
+        const result = await logContextProvider.getInitContextFilters(frameWithoutTypes, queryWithParser);
+        expect(result.contextFilters).toEqual([
+          { enabled: false, nonIndexed: false, label: 'bar', value: 'baz' }, // disabled real label
+          { enabled: true, nonIndexed: false, label: 'foo', value: 'uniqueParsedLabel' }, // enabled parsed label
+          { enabled: true, nonIndexed: false, label: 'xyz', value: 'abc' },
         ]);
+        expect(result.preservedFiltersApplied).toBe(true);
       });
 
       it('should use contextFilters from row labels if all real labels are disabled', async () => {
@@ -454,12 +534,30 @@ describe('LogContextProvider', () => {
             selectedExtractedLabels: ['foo'],
           })
         );
-        const filters = await logContextProvider.getInitContextFilters(defaultLogRow.labels, queryWithParser);
-        expect(filters).toEqual([
-          { enabled: true, fromParser: false, label: 'bar', value: 'baz' }, // enabled real label
-          { enabled: false, fromParser: true, label: 'foo', value: 'uniqueParsedLabel' },
-          { enabled: true, fromParser: false, label: 'xyz', value: 'abc' }, // enabled real label
+        const result = await logContextProvider.getInitContextFilters(defaultLogRow, queryWithParser);
+        expect(result.contextFilters).toEqual([
+          { enabled: true, nonIndexed: false, label: 'bar', value: 'baz' }, // enabled real label
+          { enabled: false, nonIndexed: true, label: 'foo', value: 'uniqueParsedLabel' },
+          { enabled: true, nonIndexed: false, label: 'xyz', value: 'abc' }, // enabled real label
         ]);
+        expect(result.preservedFiltersApplied).toBe(false);
+      });
+
+      it('should use contextFilters from row labels if all real labels are disabled with no types', async () => {
+        window.localStorage.setItem(
+          LOKI_LOG_CONTEXT_PRESERVED_LABELS,
+          JSON.stringify({
+            removedLabels: ['bar', 'xyz'],
+            selectedExtractedLabels: ['foo'],
+          })
+        );
+        const result = await logContextProvider.getInitContextFilters(frameWithoutTypes, queryWithParser);
+        expect(result.contextFilters).toEqual([
+          { enabled: false, nonIndexed: false, label: 'bar', value: 'baz' }, // enabled real label
+          { enabled: true, nonIndexed: false, label: 'foo', value: 'uniqueParsedLabel' },
+          { enabled: false, nonIndexed: false, label: 'xyz', value: 'abc' }, // enabled real label
+        ]);
+        expect(result.preservedFiltersApplied).toBe(true);
       });
 
       it('should not introduce new labels as context filters', async () => {
@@ -470,12 +568,30 @@ describe('LogContextProvider', () => {
             selectedExtractedLabels: ['foo', 'new'],
           })
         );
-        const filters = await logContextProvider.getInitContextFilters(defaultLogRow.labels, queryWithParser);
-        expect(filters).toEqual([
-          { enabled: false, fromParser: false, label: 'bar', value: 'baz' },
-          { enabled: true, fromParser: true, label: 'foo', value: 'uniqueParsedLabel' },
-          { enabled: true, fromParser: false, label: 'xyz', value: 'abc' },
+        const result = await logContextProvider.getInitContextFilters(defaultLogRow, queryWithParser);
+        expect(result.contextFilters).toEqual([
+          { enabled: false, nonIndexed: false, label: 'bar', value: 'baz' },
+          { enabled: true, nonIndexed: true, label: 'foo', value: 'uniqueParsedLabel' },
+          { enabled: true, nonIndexed: false, label: 'xyz', value: 'abc' },
+        ]);
+        expect(result.preservedFiltersApplied).toBe(true);
+      });
+
+      it('should not introduce new labels as context filters with no label types', async () => {
+        window.localStorage.setItem(
+          LOKI_LOG_CONTEXT_PRESERVED_LABELS,
+          JSON.stringify({
+            removedLabels: ['bar'],
+            selectedExtractedLabels: ['foo', 'new'],
+          })
+        );
+        const result = await logContextProvider.getInitContextFilters(frameWithoutTypes, queryWithParser);
+        expect(result.contextFilters).toEqual([
+          { enabled: false, nonIndexed: false, label: 'bar', value: 'baz' },
+          { enabled: true, nonIndexed: false, label: 'foo', value: 'uniqueParsedLabel' },
+          { enabled: true, nonIndexed: false, label: 'xyz', value: 'abc' },
         ]);
+        expect(result.preservedFiltersApplied).toBe(true);
       });
     });
   });
diff --git a/public/app/plugins/datasource/loki/LogContextProvider.ts b/public/app/plugins/datasource/loki/LogContextProvider.ts
index 0b770794c245f..4fbb058388baf 100644
--- a/public/app/plugins/datasource/loki/LogContextProvider.ts
+++ b/public/app/plugins/datasource/loki/LogContextProvider.ts
@@ -13,17 +13,13 @@ import {
   toUtc,
   LogRowContextQueryDirection,
   LogRowContextOptions,
+  dateTime,
 } from '@grafana/data';
 import { LabelParser, LabelFilter, LineFilters, PipelineStage, Logfmt, Json } from '@grafana/lezer-logql';
-import { Labels } from '@grafana/schema';
-import { notifyApp } from 'app/core/actions';
-import { createSuccessNotification } from 'app/core/copy/appNotification';
-import store from 'app/core/store';
-import { dispatch } from 'app/store/store';
 
 import { LokiContextUi } from './components/LokiContextUi';
 import { LokiDatasource, makeRequest, REF_ID_STARTER_LOG_ROW_CONTEXT } from './datasource';
-import { escapeLabelValueInExactSelector } from './languageUtils';
+import { escapeLabelValueInExactSelector, getLabelTypeFromFrame } from './languageUtils';
 import { addLabelToQuery, addParserToQuery } from './modifyQuery';
 import {
   getNodePositionsFromQuery,
@@ -32,7 +28,7 @@ import {
   isQueryWithParser,
 } from './queryUtils';
 import { sortDataFrameByTime, SortDirection } from './sortDataFrame';
-import { ContextFilter, LokiQuery, LokiQueryDirection, LokiQueryType } from './types';
+import { ContextFilter, LabelType, LokiQuery, LokiQueryDirection, LokiQueryType } from './types';
 
 export const LOKI_LOG_CONTEXT_PRESERVED_LABELS = 'lokiLogContextPreservedLabels';
 export const SHOULD_INCLUDE_PIPELINE_OPERATIONS = 'lokiLogContextShouldIncludePipelineOperations';
@@ -44,22 +40,34 @@ export type PreservedLabels = {
 
 export class LogContextProvider {
   datasource: LokiDatasource;
-  appliedContextFilters: ContextFilter[];
+  cachedContextFilters: ContextFilter[];
   onContextClose: (() => void) | undefined;
 
   constructor(datasource: LokiDatasource) {
     this.datasource = datasource;
-    this.appliedContextFilters = [];
+    this.cachedContextFilters = [];
   }
 
-  private async getQueryAndRange(row: LogRowModel, options?: LogRowContextOptions, origQuery?: LokiQuery) {
+  private async getQueryAndRange(
+    row: LogRowModel,
+    options?: LogRowContextOptions,
+    origQuery?: LokiQuery,
+    cacheFilters = true
+  ) {
     const direction = (options && options.direction) || LogRowContextQueryDirection.Backward;
     const limit = (options && options.limit) || this.datasource.maxLines;
-    // This happens only on initial load, when user haven't applied any filters yet
-    // We need to get the initial filters from the row labels
-    if (this.appliedContextFilters.length === 0) {
-      const filters = (await this.getInitContextFilters(row.labels, origQuery)).filter((filter) => filter.enabled);
-      this.appliedContextFilters = filters;
+    // If the user doesn't have any filters applied already, or if we don't want
+    // to use the cached filters, we need to reinitialize them.
+    if (this.cachedContextFilters.length === 0 || !cacheFilters) {
+      const filters = (
+        await this.getInitContextFilters(row, origQuery, {
+          from: dateTime(row.timeEpochMs),
+          to: dateTime(row.timeEpochMs),
+          raw: { from: dateTime(row.timeEpochMs), to: dateTime(row.timeEpochMs) },
+        })
+      ).contextFilters.filter((filter) => filter.enabled);
+
+      this.cachedContextFilters = filters;
     }
 
     return await this.prepareLogRowContextQueryTarget(row, limit, direction, origQuery);
@@ -68,9 +76,15 @@ export class LogContextProvider {
   getLogRowContextQuery = async (
     row: LogRowModel,
     options?: LogRowContextOptions,
-    origQuery?: LokiQuery
+    origQuery?: LokiQuery,
+    cacheFilters = true
   ): Promise<LokiQuery> => {
-    const { query } = await this.getQueryAndRange(row, options, origQuery);
+    const { query } = await this.getQueryAndRange(row, options, origQuery, cacheFilters);
+
+    if (!cacheFilters) {
+      // If the caller doesn't want to cache the filters, we need to reset them.
+      this.cachedContextFilters = [];
+    }
 
     return query;
   };
@@ -117,7 +131,7 @@ export class LogContextProvider {
     direction: LogRowContextQueryDirection,
     origQuery?: LokiQuery
   ): Promise<{ query: LokiQuery; range: TimeRange }> {
-    const expr = this.prepareExpression(this.appliedContextFilters, origQuery);
+    const expr = this.prepareExpression(this.cachedContextFilters, origQuery);
 
     const contextTimeBuffer = 2 * 60 * 60 * 1000; // 2h buffer
 
@@ -173,7 +187,7 @@ export class LogContextProvider {
 
   getLogRowContextUi(row: LogRowModel, runContextQuery?: () => void, origQuery?: LokiQuery): React.ReactNode {
     const updateFilter = (contextFilters: ContextFilter[]) => {
-      this.appliedContextFilters = contextFilters;
+      this.cachedContextFilters = contextFilters;
 
       if (runContextQuery) {
         runContextQuery();
@@ -184,7 +198,7 @@ export class LogContextProvider {
     this.onContextClose =
       this.onContextClose ??
       (() => {
-        this.appliedContextFilters = [];
+        this.cachedContextFilters = [];
       });
 
     return LokiContextUi({
@@ -199,7 +213,7 @@ export class LogContextProvider {
 
   prepareExpression(contextFilters: ContextFilter[], query: LokiQuery | undefined): string {
     let preparedExpression = this.processContextFiltersToExpr(contextFilters, query);
-    if (store.getBool(SHOULD_INCLUDE_PIPELINE_OPERATIONS, false)) {
+    if (window.localStorage.getItem(SHOULD_INCLUDE_PIPELINE_OPERATIONS) === 'true') {
       preparedExpression = this.processPipelineStagesToExpr(preparedExpression, query);
     }
     return preparedExpression;
@@ -208,7 +222,7 @@ export class LogContextProvider {
   processContextFiltersToExpr = (contextFilters: ContextFilter[], query: LokiQuery | undefined): string => {
     const labelFilters = contextFilters
       .map((filter) => {
-        if (!filter.fromParser && filter.enabled) {
+        if (!filter.nonIndexed && filter.enabled) {
           // escape backslashes in label as users can't escape them by themselves
           return `${filter.label}="${escapeLabelValueInExactSelector(filter.value)}"`;
         }
@@ -222,15 +236,26 @@ export class LogContextProvider {
 
     // We need to have original query to get parser and include parsed labels
     // We only add parser and parsed labels if there is only one parser in query
-    if (query && isQueryWithParser(query.expr).parserCount === 1) {
-      const parser = getParserFromQuery(query.expr);
-      if (parser) {
-        expr = addParserToQuery(expr, parser);
-        const parsedLabels = contextFilters.filter((filter) => filter.fromParser && filter.enabled);
-        for (const parsedLabel of parsedLabels) {
-          if (parsedLabel.enabled) {
-            expr = addLabelToQuery(expr, parsedLabel.label, '=', parsedLabel.value);
-          }
+    if (query) {
+      let hasParser = false;
+      if (isQueryWithParser(query.expr).parserCount === 1) {
+        hasParser = true;
+        const parser = getParserFromQuery(query.expr);
+        if (parser) {
+          expr = addParserToQuery(expr, parser);
+        }
+      }
+
+      const nonIndexedLabels = contextFilters.filter((filter) => filter.nonIndexed && filter.enabled);
+      for (const parsedLabel of nonIndexedLabels) {
+        if (parsedLabel.enabled) {
+          expr = addLabelToQuery(
+            expr,
+            parsedLabel.label,
+            '=',
+            parsedLabel.value,
+            hasParser ? LabelType.Parsed : LabelType.StructuredMetadata
+          );
         }
       }
     }
@@ -285,10 +310,16 @@ export class LogContextProvider {
     );
   };
 
-  getInitContextFilters = async (labels: Labels, query?: LokiQuery) => {
-    if (!query || isEmpty(labels)) {
-      return [];
+  getInitContextFilters = async (
+    row: LogRowModel,
+    query?: LokiQuery,
+    timeRange?: TimeRange
+  ): Promise<{ contextFilters: ContextFilter[]; preservedFiltersApplied: boolean }> => {
+    let preservedFiltersApplied = false;
+    if (!query || isEmpty(row.labels)) {
+      return { contextFilters: [], preservedFiltersApplied };
     }
+    const rowLabels = row.labels;
 
     // 1. First we need to get all labels from the log row's label
     // and correctly set parsed and not parsed labels
@@ -296,23 +327,24 @@ export class LogContextProvider {
     if (!isQueryWithParser(query.expr).queryWithParser) {
       // If there is no parser, we use getLabelKeys because it has better caching
       // and all labels should already be fetched
-      await this.datasource.languageProvider.start();
+      await this.datasource.languageProvider.start(timeRange);
       allLabels = this.datasource.languageProvider.getLabelKeys();
     } else {
       // If we have parser, we use fetchSeriesLabels to fetch actual labels for selected stream
       const stream = getStreamSelectorsFromQuery(query.expr);
       // We are using stream[0] as log query can always have just 1 stream selector
-      const series = await this.datasource.languageProvider.fetchSeriesLabels(stream[0]);
+      const series = await this.datasource.languageProvider.fetchSeriesLabels(stream[0], { timeRange });
       allLabels = Object.keys(series);
     }
 
     const contextFilters: ContextFilter[] = [];
-    Object.entries(labels).forEach(([label, value]) => {
+    Object.entries(rowLabels).forEach(([label, value]) => {
+      const labelType = getLabelTypeFromFrame(label, row.dataFrame, row.rowIndex);
       const filter: ContextFilter = {
         label,
         value: value,
         enabled: allLabels.includes(label),
-        fromParser: !allLabels.includes(label),
+        nonIndexed: labelType !== null && labelType !== LabelType.Indexed,
       };
 
       contextFilters.push(filter);
@@ -320,14 +352,17 @@ export class LogContextProvider {
 
     // Secondly we check for preserved labels and update enabled state of filters based on that
     let preservedLabels: undefined | PreservedLabels = undefined;
-    try {
-      preservedLabels = JSON.parse(store.get(LOKI_LOG_CONTEXT_PRESERVED_LABELS));
-      // Do nothing when error occurs
-    } catch (e) {}
+    const preservedLabelsString = window.localStorage.getItem(LOKI_LOG_CONTEXT_PRESERVED_LABELS);
+    if (preservedLabelsString) {
+      try {
+        preservedLabels = JSON.parse(preservedLabelsString);
+        // Do nothing when error occurs
+      } catch (e) {}
+    }
 
     if (!preservedLabels) {
       // If we don't have preservedLabels, we return contextFilters as they are
-      return contextFilters;
+      return { contextFilters, preservedFiltersApplied };
     } else {
       // Otherwise, we need to update filters based on preserved labels
       let arePreservedLabelsUsed = false;
@@ -345,16 +380,15 @@ export class LogContextProvider {
         return { ...contextFilter };
       });
 
-      const isAtLeastOneRealLabelEnabled = newContextFilters.some(({ enabled, fromParser }) => enabled && !fromParser);
+      const isAtLeastOneRealLabelEnabled = newContextFilters.some(({ enabled, nonIndexed }) => enabled && !nonIndexed);
       if (!isAtLeastOneRealLabelEnabled) {
         // If we end up with no real labels enabled, we need to reset the init filters
-        return contextFilters;
+        return { contextFilters, preservedFiltersApplied };
       } else {
-        // Otherwise use new filters
         if (arePreservedLabelsUsed) {
-          dispatch(notifyApp(createSuccessNotification('Previously used log context filters have been applied.')));
+          preservedFiltersApplied = true;
         }
-        return newContextFilters;
+        return { contextFilters: newContextFilters, preservedFiltersApplied };
       }
     }
   };
diff --git a/public/app/plugins/datasource/loki/LokiVariableSupport.test.ts b/public/app/plugins/datasource/loki/LokiVariableSupport.test.ts
new file mode 100644
index 0000000000000..0e874d898f569
--- /dev/null
+++ b/public/app/plugins/datasource/loki/LokiVariableSupport.test.ts
@@ -0,0 +1,114 @@
+import { firstValueFrom } from 'rxjs';
+
+import { dateTime, getDefaultTimeRange } from '@grafana/data';
+
+import { LokiVariableSupport } from './LokiVariableSupport';
+import { createLokiDatasource } from './__mocks__/datasource';
+import { createMetadataRequest } from './__mocks__/metadataRequest';
+import { LokiDatasource } from './datasource';
+import { LokiVariableQueryType } from './types';
+
+describe('LokiVariableSupport', () => {
+  let lokiVariableSupport: LokiVariableSupport;
+  let datasource: LokiDatasource;
+
+  beforeEach(() => {
+    datasource = createLokiDatasource();
+    jest
+      .spyOn(datasource, 'metadataRequest')
+      .mockImplementation(
+        createMetadataRequest(
+          { label1: ['value1', 'value2'], label2: ['value3', 'value4'] },
+          { '{label1="value1", label2="value2"}': [{ label5: 'value5' }] }
+        )
+      );
+
+    lokiVariableSupport = new LokiVariableSupport(datasource);
+  });
+
+  it('should return label names for Loki', async () => {
+    // label_names()
+    const response = await lokiVariableSupport.execute(
+      { refId: 'test', type: LokiVariableQueryType.LabelNames },
+      {},
+      getDefaultTimeRange()
+    );
+
+    expect(response).toEqual([{ text: 'label1' }, { text: 'label2' }]);
+  });
+
+  it('should return label values for Loki when no matcher', async () => {
+    // label_values(label1)
+    const response = await lokiVariableSupport.execute(
+      {
+        refId: 'test',
+        type: LokiVariableQueryType.LabelValues,
+        label: 'label1',
+      },
+      {},
+      getDefaultTimeRange()
+    );
+
+    expect(response).toEqual([{ text: 'value1' }, { text: 'value2' }]);
+  });
+
+  it('should return label values for Loki with matcher', async () => {
+    // label_values({label1="value1", label2="value2"},label5)
+    const response = await lokiVariableSupport.execute(
+      {
+        refId: 'test',
+        type: LokiVariableQueryType.LabelValues,
+        stream: '{label1="value1", label2="value2"}',
+        label: 'label5',
+      },
+      {},
+      getDefaultTimeRange()
+    );
+
+    expect(response).toEqual([{ text: 'value5' }]);
+  });
+
+  it('should call `metricFindQuery` with the correct parameters', async () => {
+    // label_values({label1="value1", label2="value2"},label5)
+    const spy = jest.spyOn(datasource, 'metricFindQuery');
+    const range = getDefaultTimeRange();
+    const scopedVars = { foo: { value: 'bar' } };
+    range.from = dateTime(new Date('2020-01-01T00:00:00Z'));
+    range.to = dateTime(new Date('2020-01-01T01:00:00Z'));
+    await firstValueFrom(
+      lokiVariableSupport.query({
+        targets: [
+          {
+            refId: 'test',
+            type: LokiVariableQueryType.LabelValues,
+            stream: '{label1="value1", label2="value2"}',
+            label: 'label5',
+          },
+        ],
+        range,
+        scopedVars,
+        requestId: 'test',
+        interval: '1m',
+        intervalMs: 60000,
+        timezone: 'utc',
+        app: 'explore',
+        startTime: 0,
+      })
+    );
+
+    expect(spy).toHaveBeenCalledWith(
+      {
+        refId: 'test',
+        type: LokiVariableQueryType.LabelValues,
+        stream: '{label1="value1", label2="value2"}',
+        label: 'label5',
+      },
+      {
+        range,
+        scopedVars,
+      }
+    );
+
+    spy.mockRestore();
+  });
+});
diff --git a/public/app/plugins/datasource/loki/LokiVariableSupport.ts b/public/app/plugins/datasource/loki/LokiVariableSupport.ts
new file mode 100644
index 0000000000000..2bee3a726ff84
--- /dev/null
+++ b/public/app/plugins/datasource/loki/LokiVariableSupport.ts
@@ -0,0 +1,26 @@
+import { from, Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { CustomVariableSupport, DataQueryRequest, MetricFindValue, ScopedVars, TimeRange } from '@grafana/data';
+
+import { LokiVariableQueryEditor } from './components/VariableQueryEditor';
+import { LokiDatasource } from './datasource';
+import { LokiVariableQuery } from './types';
+
+export class LokiVariableSupport extends CustomVariableSupport<LokiDatasource, LokiVariableQuery> {
+  editor = LokiVariableQueryEditor;
+
+  constructor(private datasource: LokiDatasource) {
+    super();
+  }
+
+  async execute(query: LokiVariableQuery, scopedVars: ScopedVars, range: TimeRange) {
+    return this.datasource.metricFindQuery(query, { scopedVars, range });
+  }
+
+  query(request: DataQueryRequest<LokiVariableQuery>): Observable<{ data: MetricFindValue[] }> {
+    const result = this.execute(request.targets[0], request.scopedVars, request.range);
+
+    return from(result).pipe(map((data) => ({ data })));
+  }
+}
diff --git a/public/app/plugins/datasource/loki/__mocks__/datasource.ts b/public/app/plugins/datasource/loki/__mocks__/datasource.ts
new file mode 100644
index 0000000000000..4b5a8f2003105
--- /dev/null
+++ b/public/app/plugins/datasource/loki/__mocks__/datasource.ts
@@ -0,0 +1,59 @@
+import { DataSourceInstanceSettings, DataSourceSettings, PluginType } from '@grafana/data';
+import { TemplateSrv } from '@grafana/runtime';
+
+import { LokiDatasource } from '../datasource';
+import { LokiOptions } from '../types';
+
+export function createDefaultConfigOptions() {
+  return {
+    jsonData: { maxLines: '531' },
+    secureJsonFields: {},
+  } as DataSourceSettings<LokiOptions>;
+}
+
+const defaultTemplateSrvMock = {
+  replace: (input: string) => input,
+  getVariables: () => [],
+};
+
+export function createLokiDatasource(
+  templateSrvMock: Partial<TemplateSrv> = defaultTemplateSrvMock,
+  settings: Partial<DataSourceInstanceSettings<LokiOptions>> = {}
+): LokiDatasource {
+  const customSettings: DataSourceInstanceSettings<LokiOptions> = {
+    url: 'myloggingurl',
+    id: 0,
+    uid: '',
+    type: '',
+    name: '',
+    meta: {
+      id: 'id',
+      name: 'name',
+      type: PluginType.datasource,
+      module: '',
+      baseUrl: '',
+      info: {
+        author: {
+          name: 'Test',
+        },
+        description: '',
+        links: [],
+        logos: {
+          large: '',
+          small: '',
+        },
+        screenshots: [],
+        updated: '',
+        version: '',
+      },
+    },
+    readOnly: false,
+    jsonData: {
+      maxLines: '20',
+    },
+    access: 'direct',
+    ...settings,
+  };
+
+  return new LokiDatasource(customSettings, templateSrvMock as TemplateSrv);
+}
diff --git a/public/app/plugins/datasource/loki/__mocks__/frames.ts b/public/app/plugins/datasource/loki/__mocks__/frames.ts
new file mode 100644
index 0000000000000..7c95bce3bd1b6
--- /dev/null
+++ b/public/app/plugins/datasource/loki/__mocks__/frames.ts
@@ -0,0 +1,202 @@
+import { DataFrame, DataFrameType, FieldType } from '@grafana/data';
+
+export function getMockFrames() {
+  const logFrameA: DataFrame = {
+    refId: 'A',
+    fields: [
+      {
+        name: 'Time',
+        type: FieldType.time,
+        config: {},
+        values: [3, 4],
+      },
+      {
+        name: 'Line',
+        type: FieldType.string,
+        config: {},
+        values: ['line1', 'line2'],
+      },
+      {
+        name: 'labels',
+        type: FieldType.other,
+        config: {},
+        values: [
+          {
+            label: 'value',
+          },
+          {
+            otherLabel: 'other value',
+          },
+        ],
+      },
+      {
+        name: 'tsNs',
+        type: FieldType.string,
+        config: {},
+        values: ['3000000', '4000000'],
+      },
+      {
+        name: 'id',
+        type: FieldType.string,
+        config: {},
+        values: ['id1', 'id2'],
+      },
+    ],
+    meta: {
+      custom: {
+        frameType: 'LabeledTimeValues',
+      },
+      stats: [
+        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 11 },
+        { displayName: 'Ingester: total reached', value: 1 },
+      ],
+    },
+    length: 2,
+  };
+
+  const logFrameB: DataFrame = {
+    refId: 'A',
+    fields: [
+      {
+        name: 'Time',
+        type: FieldType.time,
+        config: {},
+        values: [1, 2],
+      },
+      {
+        name: 'Line',
+        type: FieldType.string,
+        config: {},
+        values: ['line3', 'line4'],
+      },
+      {
+        name: 'labels',
+        type: FieldType.other,
+        config: {},
+        values: [
+          {
+            otherLabel: 'other value',
+          },
+        ],
+      },
+      {
+        name: 'tsNs',
+        type: FieldType.string,
+        config: {},
+        values: ['1000000', '2000000'],
+      },
+      {
+        name: 'id',
+        type: FieldType.string,
+        config: {},
+        values: ['id3', 'id4'],
+      },
+    ],
+    meta: {
+      custom: {
+        frameType: 'LabeledTimeValues',
+      },
+      stats: [
+        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 22 },
+        { displayName: 'Ingester: total reached', value: 2 },
+      ],
+    },
+    length: 2,
+  };
+
+  const metricFrameA: DataFrame = {
+    refId: 'A',
+    fields: [
+      {
+        name: 'Time',
+        type: FieldType.time,
+        config: {},
+        values: [3000000, 4000000],
+      },
+      {
+        name: 'Value',
+        type: FieldType.number,
+        config: {},
+        values: [5, 4],
+        labels: {
+          level: 'debug',
+        },
+      },
+    ],
+    meta: {
+      type: DataFrameType.TimeSeriesMulti,
+      stats: [
+        { displayName: 'Ingester: total reached', value: 1 },
+        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 11 },
+      ],
+    },
+    length: 2,
+  };
+
+  const metricFrameB: DataFrame = {
+    refId: 'A',
+    fields: [
+      {
+        name: 'Time',
+        type: FieldType.time,
+        config: {},
+        values: [1000000, 2000000],
+      },
+      {
+        name: 'Value',
+        type: FieldType.number,
+        config: {},
+        values: [6, 7],
+        labels: {
+          level: 'debug',
+        },
+      },
+    ],
+    meta: {
+      type: DataFrameType.TimeSeriesMulti,
+      stats: [
+        { displayName: 'Ingester: total reached', value: 2 },
+        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 22 },
+      ],
+    },
+    length: 2,
+  };
+
+  const metricFrameC: DataFrame = {
+    refId: 'A',
+    name: 'some-time-series',
+    fields: [
+      {
+        name: 'Time',
+        type: FieldType.time,
+        config: {},
+        values: [3000000, 4000000],
+      },
+      {
+        name: 'Value',
+        type: FieldType.number,
+        config: {},
+        values: [6, 7],
+        labels: {
+          level: 'error',
+        },
+      },
+    ],
+    meta: {
+      type: DataFrameType.TimeSeriesMulti,
+      stats: [
+        { displayName: 'Ingester: total reached', value: 2 },
+        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 33 },
+      ],
+    },
+    length: 2,
+  };
+
+  return {
+    logFrameA,
+    logFrameB,
+    metricFrameA,
+    metricFrameB,
+    metricFrameC,
+  };
+}
diff --git a/public/app/plugins/datasource/loki/__mocks__/metadataRequest.ts b/public/app/plugins/datasource/loki/__mocks__/metadataRequest.ts
new file mode 100644
index 0000000000000..94e5fedcb07d4
--- /dev/null
+++ b/public/app/plugins/datasource/loki/__mocks__/metadataRequest.ts
@@ -0,0 +1,26 @@
+export function createMetadataRequest(
+  labelsAndValues: Record<string, string[]>,
+  series?: Record<string, Array<Record<string, string>>>
+) {
+  // added % to allow urlencoded labelKeys. Note, that this is not confirm with Loki, as loki does not allow specialcharacters in labelKeys, but needed for tests.
+  const lokiLabelsAndValuesEndpointRegex = /^label\/([%\w]*)\/values/;
+  const lokiSeriesEndpointRegex = /^series/;
+  const lokiLabelsEndpoint = 'labels';
+  const labels = Object.keys(labelsAndValues);
+
+  return async function metadataRequestMock(url: string, params?: Record<string, string | number>) {
+    if (url === lokiLabelsEndpoint) {
+      return labels;
+    } else {
+      const labelsMatch = url.match(lokiLabelsAndValuesEndpointRegex);
+      const seriesMatch = url.match(lokiSeriesEndpointRegex);
+      if (labelsMatch) {
+        return labelsAndValues[labelsMatch[1]] || [];
+      } else if (seriesMatch && series && params) {
+        return series[params['match[]']] || [];
+      } else {
+        throw new Error(`Unexpected url error, ${url}`);
+      }
+    }
+  };
+}
diff --git a/public/app/plugins/datasource/loki/backendResultTransformer.ts b/public/app/plugins/datasource/loki/backendResultTransformer.ts
index 4d7e969ba6e73..2a720cf0d7bc6 100644
--- a/public/app/plugins/datasource/loki/backendResultTransformer.ts
+++ b/public/app/plugins/datasource/loki/backendResultTransformer.ts
@@ -2,7 +2,7 @@ import { DataQueryResponse, DataFrame, isDataFrame, FieldType, QueryResultMeta,
 
 import { getDerivedFields } from './getDerivedFields';
 import { makeTableFrames } from './makeTableFrames';
-import { formatQuery, getHighlighterExpressionsFromQuery } from './queryUtils';
+import { getHighlighterExpressionsFromQuery } from './queryUtils';
 import { dataFrameHasLokiError } from './responseUtils';
 import { DerivedFieldConfig, LokiQuery, LokiQueryType } from './types';
 
@@ -39,7 +39,7 @@ function processStreamFrame(
   const meta: QueryResultMeta = {
     preferredVisualisationType: 'logs',
     limit: query?.maxLines,
-    searchWords: query !== undefined ? getHighlighterExpressionsFromQuery(formatQuery(query.expr)) : undefined,
+    searchWords: query !== undefined ? getHighlighterExpressionsFromQuery(query.expr) : undefined,
     custom,
   };
 
diff --git a/public/app/plugins/datasource/loki/components/AnnotationsQueryEditor.tsx b/public/app/plugins/datasource/loki/components/AnnotationsQueryEditor.tsx
index 3970e45497a0d..670288224aab0 100644
--- a/public/app/plugins/datasource/loki/components/AnnotationsQueryEditor.tsx
+++ b/public/app/plugins/datasource/loki/components/AnnotationsQueryEditor.tsx
@@ -3,7 +3,7 @@ import React, { memo } from 'react';
 
 import { AnnotationQuery } from '@grafana/data';
 import { EditorField, EditorRow } from '@grafana/experimental';
-import { Input } from '@grafana/ui';
+import { Input, Stack } from '@grafana/ui';
 
 // Types
 import { getNormalizedLokiQuery } from '../queryUtils';
@@ -49,8 +49,8 @@ export const LokiAnnotationsQueryEditor = memo(function LokiAnnotationQueryEdito
     queryType: annotation.queryType,
   };
   return (
-    <>
-      <div className="gf-form-group">
+    <Stack gap={5} direction="column">
+      <Stack gap={0} direction="column">
         <LokiQueryField
           datasource={props.datasource}
           query={queryWithRefId}
@@ -67,8 +67,7 @@ export const LokiAnnotationsQueryEditor = memo(function LokiAnnotationQueryEdito
             />
           }
         />
-      </div>
-
+      </Stack>
       <EditorRow>
         <EditorField
           label="Title"
@@ -120,6 +119,6 @@ export const LokiAnnotationsQueryEditor = memo(function LokiAnnotationQueryEdito
           />
         </EditorField>
       </EditorRow>
-    </>
+    </Stack>
   );
 });
diff --git a/public/app/plugins/datasource/loki/components/LokiCheatSheet.test.tsx b/public/app/plugins/datasource/loki/components/LokiCheatSheet.test.tsx
new file mode 100644
index 0000000000000..c7074790d1e71
--- /dev/null
+++ b/public/app/plugins/datasource/loki/components/LokiCheatSheet.test.tsx
@@ -0,0 +1,41 @@
+import { render, screen } from '@testing-library/react';
+import React, { ComponentProps } from 'react';
+
+import { LokiDatasource } from '../datasource';
+import { LokiQuery } from '../types';
+
+import LokiCheatSheet from './LokiCheatSheet';
+
+const setup = () => {
+  const props: ComponentProps<typeof LokiCheatSheet> = {
+    datasource: {
+      languageProvider: {
+        started: true,
+        getLabelKeys: jest.fn().mockReturnValue(['job']),
+        fetchLabelValues: jest.fn().mockResolvedValue(['"grafana/data"']),
+      },
+    } as unknown as LokiDatasource,
+    query: {} as unknown as LokiQuery,
+    onClickExample: jest.fn(),
+  };
+  return props;
+};
+
+describe('Loki Cheat Sheet', () => {
+  beforeEach(() => {
+    jest.useFakeTimers();
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
+  it('escapes label values in examples', async () => {
+    const props = setup();
+    render(<LokiCheatSheet {...props} />);
+    jest.runAllTimers();
+
+    const streamSelector = await screen.findByText('{job="\\"grafana/data\\""}');
+    expect(streamSelector).toBeInTheDocument();
+  });
+});
diff --git a/public/app/plugins/datasource/loki/components/LokiCheatSheet.tsx b/public/app/plugins/datasource/loki/components/LokiCheatSheet.tsx
index b6c75f526a47b..689cef1fbdc74 100644
--- a/public/app/plugins/datasource/loki/components/LokiCheatSheet.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiCheatSheet.tsx
@@ -5,6 +5,7 @@ import { QueryEditorHelpProps } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
 
 import LokiLanguageProvider from '../LanguageProvider';
+import { escapeLabelValueInExactSelector } from '../languageUtils';
 import { LokiQuery } from '../types';
 
 const DEFAULT_EXAMPLES = ['{job="default/prometheus"}'];
@@ -62,10 +63,10 @@ export default class LokiCheatSheet extends PureComponent<QueryEditorHelpProps<L
       const labels = provider.getLabelKeys() || [];
       const preferredLabel = PREFERRED_LABELS.find((l) => labels.includes(l));
       if (preferredLabel) {
-        const values = await provider.getLabelValues(preferredLabel);
+        const values = await provider.fetchLabelValues(preferredLabel);
         const userExamples = shuffle(values)
           .slice(0, EXAMPLES_LIMIT)
-          .map((value) => `{${preferredLabel}="${value}"}`);
+          .map((value) => `{${preferredLabel}="${escapeLabelValueInExactSelector(value)}"}`);
         this.setState({ userExamples });
       }
     } else {
@@ -85,7 +86,7 @@ export default class LokiCheatSheet extends PureComponent<QueryEditorHelpProps<L
         type="button"
         className="cheat-sheet-item__example"
         key={expr}
-        onClick={(e) => onClick({ refId: 'A', expr })}
+        onClick={() => onClick({ refId: 'A', expr })}
       >
         <code>{expr}</code>
       </button>
diff --git a/public/app/plugins/datasource/loki/components/LokiContextUi.test.tsx b/public/app/plugins/datasource/loki/components/LokiContextUi.test.tsx
index 83fd414785b37..7d9d722087792 100644
--- a/public/app/plugins/datasource/loki/components/LokiContextUi.test.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiContextUi.test.tsx
@@ -1,9 +1,9 @@
 import { act, render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
-import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
+import { select } from 'react-select-event';
 
-import { LogRowModel } from '@grafana/data';
+import { LogRowModel, dateTime } from '@grafana/data';
 
 import { LogContextProvider, SHOULD_INCLUDE_PIPELINE_OPERATIONS } from '../LogContextProvider';
 import { ContextFilter, LokiQuery } from '../types';
@@ -16,21 +16,6 @@ jest.mock('@grafana/runtime', () => ({
   reportInteraction: () => null,
 }));
 
-jest.mock('app/core/store', () => {
-  return {
-    set() {},
-    getBool(key: string, defaultValue?: boolean) {
-      const item = window.localStorage.getItem(key);
-      if (item === null) {
-        return defaultValue;
-      } else {
-        return item === 'true';
-      }
-    },
-    delete() {},
-  };
-});
-
 const setupProps = (): LokiContextUiProps => {
   const defaults: LokiContextUiProps = {
     logContextProvider: Object.assign({}, mockLogContextProvider) as unknown as LogContextProvider,
@@ -41,6 +26,7 @@ const setupProps = (): LokiContextUiProps => {
         label1: 'value1',
         label3: 'value3',
       },
+      timeEpochMs: new Date().getTime(),
     } as unknown as LogRowModel,
     onClose: jest.fn(),
     origQuery: {
@@ -55,10 +41,13 @@ const setupProps = (): LokiContextUiProps => {
 
 const mockLogContextProvider = {
   getInitContextFilters: jest.fn().mockImplementation(() =>
-    Promise.resolve([
-      { value: 'value1', enabled: true, fromParser: false, label: 'label1' },
-      { value: 'value3', enabled: false, fromParser: true, label: 'label3' },
-    ])
+    Promise.resolve({
+      contextFilters: [
+        { value: 'value1', enabled: true, nonIndexed: false, label: 'label1' },
+        { value: 'value3', enabled: false, nonIndexed: true, label: 'label3' },
+      ],
+      preservedFiltersApplied: false,
+    })
   ),
   processContextFiltersToExpr: jest.fn().mockImplementation(
     (contextFilters: ContextFilter[], query: LokiQuery | undefined) =>
@@ -128,14 +117,27 @@ describe('LokiContextUi', () => {
     });
   });
 
+  it('calls `getInitContextFilters` with the right set of parameters', async () => {
+    const props = setupProps();
+    render(<LokiContextUi {...props} />);
+
+    await waitFor(() => {
+      expect(props.logContextProvider.getInitContextFilters).toHaveBeenCalledWith(props.row, props.origQuery, {
+        from: dateTime(props.row.timeEpochMs),
+        to: dateTime(props.row.timeEpochMs),
+        raw: { from: dateTime(props.row.timeEpochMs), to: dateTime(props.row.timeEpochMs) },
+      });
+    });
+  });
+
   it('finds label1 as a real label', async () => {
     const props = setupProps();
     render(<LokiContextUi {...props} />);
     await waitFor(() => {
       expect(props.logContextProvider.getInitContextFilters).toHaveBeenCalled();
     });
-    const select = await screen.findAllByRole('combobox');
-    await selectOptionInTest(select[0], 'label1="value1"');
+    const selects = await screen.findAllByRole('combobox');
+    await select(selects[0], 'label1="value1"', { container: document.body });
   });
 
   it('finds label3 as a parsed label', async () => {
@@ -144,8 +146,8 @@ describe('LokiContextUi', () => {
     await waitFor(() => {
       expect(props.logContextProvider.getInitContextFilters).toHaveBeenCalled();
     });
-    const select = await screen.findAllByRole('combobox');
-    await selectOptionInTest(select[1], 'label3="value3"');
+    const selects = await screen.findAllByRole('combobox');
+    await select(selects[1], 'label3="value3"', { container: document.body });
   });
 
   it('calls updateFilter when selecting a label', async () => {
@@ -156,7 +158,7 @@ describe('LokiContextUi', () => {
       expect(props.logContextProvider.getInitContextFilters).toHaveBeenCalled();
       expect(screen.getAllByRole('combobox')).toHaveLength(2);
     });
-    await selectOptionInTest(screen.getAllByRole('combobox')[1], 'label3="value3"');
+    await select(screen.getAllByRole('combobox')[1], 'label3="value3"', { container: document.body });
     act(() => {
       jest.runAllTimers();
     });
@@ -328,4 +330,35 @@ describe('LokiContextUi', () => {
       expect(screen.queryByText('label3="value3"')).not.toBeInTheDocument();
     });
   });
+  it('shows if preserved filters are applied', async () => {
+    const props = setupProps();
+    const newProps = {
+      ...props,
+      logContextProvider: {
+        ...props.logContextProvider,
+        getInitContextFilters: jest.fn().mockImplementation(() =>
+          Promise.resolve({
+            contextFilters: [
+              { value: 'value1', enabled: true, nonIndexed: false, label: 'label1' },
+              { value: 'value3', enabled: false, nonIndexed: true, label: 'label3' },
+            ],
+            preservedFiltersApplied: true,
+          })
+        ),
+      },
+    } as unknown as LokiContextUiProps;
+
+    render(<LokiContextUi {...newProps} />);
+    expect(await screen.findByText('Previously used filters have been applied.')).toBeInTheDocument();
+  });
+
+  it('does not shows if preserved filters are not applied', async () => {
+    // setupProps() already has preservedFiltersApplied: false
+    const props = setupProps();
+
+    render(<LokiContextUi {...props} />);
+    await waitFor(() => {
+      expect(screen.queryByText('Previously used filters have been applied.')).not.toBeInTheDocument();
+    });
+  });
 });
diff --git a/public/app/plugins/datasource/loki/components/LokiContextUi.tsx b/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
index 2b278ae3689d6..fe181e08ea841 100644
--- a/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiContextUi.tsx
@@ -2,9 +2,11 @@ import { css } from '@emotion/css';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useAsync } from 'react-use';
 
-import { GrafanaTheme2, LogRowModel, renderMarkdown, SelectableValue } from '@grafana/data';
+import { dateTime, GrafanaTheme2, LogRowModel, renderMarkdown, SelectableValue } from '@grafana/data';
+import { RawQuery } from '@grafana/experimental';
 import { reportInteraction } from '@grafana/runtime';
 import {
+  Alert,
   Button,
   Collapse,
   Icon,
@@ -18,9 +20,7 @@ import {
   Tooltip,
   useStyles2,
 } from '@grafana/ui';
-import store from 'app/core/store';
 
-import { RawQuery } from '../../prometheus/querybuilder/shared/RawQuery';
 import {
   LogContextProvider,
   LOKI_LOG_CONTEXT_PRESERVED_LABELS,
@@ -28,7 +28,6 @@ import {
   SHOULD_INCLUDE_PIPELINE_OPERATIONS,
 } from '../LogContextProvider';
 import { escapeLabelValueInSelector } from '../languageUtils';
-import { isQueryWithParser } from '../queryUtils';
 import { lokiGrammar } from '../syntax';
 import { ContextFilter, LokiQuery } from '../types';
 
@@ -81,6 +80,12 @@ function getStyles(theme: GrafanaTheme2) {
       background-color: ${theme.colors.background.secondary};
       padding: ${theme.spacing(2)};
     `,
+    notification: css({
+      position: 'absolute',
+      zIndex: theme.zIndex.portal,
+      top: 0,
+      right: 0,
+    }),
     rawQuery: css`
       display: inline;
     `,
@@ -112,12 +117,13 @@ export function LokiContextUi(props: LokiContextUiProps) {
   const styles = useStyles2(getStyles);
 
   const [contextFilters, setContextFilters] = useState<ContextFilter[]>([]);
+  const [showPreservedFiltersAppliedNotification, setShowPreservedFiltersAppliedNotification] = useState(false);
 
   const [initialized, setInitialized] = useState(false);
   const [loading, setLoading] = useState(false);
-  const [isOpen, setIsOpen] = useState(store.getBool(IS_LOKI_LOG_CONTEXT_UI_OPEN, false));
+  const [isOpen, setIsOpen] = useState(window.localStorage.getItem(IS_LOKI_LOG_CONTEXT_UI_OPEN) === 'true');
   const [includePipelineOperations, setIncludePipelineOperations] = useState(
-    store.getBool(SHOULD_INCLUDE_PIPELINE_OPERATIONS, false)
+    window.localStorage.getItem(SHOULD_INCLUDE_PIPELINE_OPERATIONS) === 'true'
   );
 
   const timerHandle = React.useRef<number>();
@@ -126,7 +132,7 @@ export function LokiContextUi(props: LokiContextUiProps) {
 
   const isInitialState = useMemo(() => {
     // Initial query has all regular labels enabled and all parsed labels disabled
-    if (initialized && contextFilters.some((filter) => filter.fromParser === filter.enabled)) {
+    if (initialized && contextFilters.some((filter) => filter.nonIndexed === filter.enabled)) {
       return false;
     }
 
@@ -149,7 +155,7 @@ export function LokiContextUi(props: LokiContextUiProps) {
       return;
     }
 
-    if (contextFilters.filter(({ enabled, fromParser }) => enabled && !fromParser).length === 0) {
+    if (contextFilters.filter(({ enabled, nonIndexed }) => enabled && !nonIndexed).length === 0) {
       setContextFilters(previousContextFilters.current);
       return;
     }
@@ -169,18 +175,18 @@ export function LokiContextUi(props: LokiContextUiProps) {
         selectedExtractedLabels: [],
       };
 
-      contextFilters.forEach(({ enabled, fromParser, label }) => {
+      contextFilters.forEach(({ enabled, nonIndexed, label }) => {
         // We only want to store real labels that were removed from the initial query
-        if (!enabled && !fromParser) {
+        if (!enabled && !nonIndexed) {
           preservedLabels.removedLabels.push(label);
         }
         // Or extracted labels that were added to the initial query
-        if (enabled && fromParser) {
+        if (enabled && nonIndexed) {
           preservedLabels.selectedExtractedLabels.push(label);
         }
       });
 
-      store.set(LOKI_LOG_CONTEXT_PRESERVED_LABELS, JSON.stringify(preservedLabels));
+      window.localStorage.setItem(LOKI_LOG_CONTEXT_PRESERVED_LABELS, JSON.stringify(preservedLabels));
       setLoading(false);
     }, 1500);
 
@@ -199,13 +205,26 @@ export function LokiContextUi(props: LokiContextUiProps) {
 
   useAsync(async () => {
     setLoading(true);
-    const initContextFilters = await logContextProvider.getInitContextFilters(row.labels, origQuery);
-    setContextFilters(initContextFilters);
-
+    const initContextFilters = await logContextProvider.getInitContextFilters(row, origQuery, {
+      from: dateTime(row.timeEpochMs),
+      to: dateTime(row.timeEpochMs),
+      raw: { from: dateTime(row.timeEpochMs), to: dateTime(row.timeEpochMs) },
+    });
+    setContextFilters(initContextFilters.contextFilters);
+    setShowPreservedFiltersAppliedNotification(initContextFilters.preservedFiltersApplied);
     setInitialized(true);
     setLoading(false);
   });
 
+  // To hide previousContextFiltersApplied notification after 2 seconds
+  useEffect(() => {
+    if (showPreservedFiltersAppliedNotification) {
+      setTimeout(() => {
+        setShowPreservedFiltersAppliedNotification(false);
+      }, 2000);
+    }
+  }, [showPreservedFiltersAppliedNotification]);
+
   useEffect(() => {
     reportInteraction('grafana_explore_logs_loki_log_context_loaded', {
       logRowUid: row.uid,
@@ -220,10 +239,10 @@ export function LokiContextUi(props: LokiContextUiProps) {
     };
   }, [row.uid]);
 
-  const realLabels = contextFilters.filter(({ fromParser }) => !fromParser);
+  const realLabels = contextFilters.filter(({ nonIndexed }) => !nonIndexed);
   const realLabelsEnabled = realLabels.filter(({ enabled }) => enabled);
 
-  const parsedLabels = contextFilters.filter(({ fromParser }) => fromParser);
+  const parsedLabels = contextFilters.filter(({ nonIndexed }) => nonIndexed);
   const parsedLabelsEnabled = parsedLabels.filter(({ enabled }) => enabled);
 
   const contextFilterToSelectFilter = useCallback((contextFilter: ContextFilter): SelectableValue<string> => {
@@ -233,8 +252,8 @@ export function LokiContextUi(props: LokiContextUiProps) {
     };
   }, []);
 
-  // Currently we support adding of parser and showing parsed labels only if there is 1 parser
-  const showParsedLabels = origQuery && isQueryWithParser(origQuery.expr).parserCount === 1 && parsedLabels.length > 0;
+  // If there's any nonIndexed labels, that includes structured metadata and parsed labels, we show the nonIndexed labels input
+  const showNonIndexedLabels = parsedLabels.length > 0;
 
   let queryExpr = logContextProvider.prepareExpression(
     contextFilters.filter(({ enabled }) => enabled),
@@ -242,6 +261,14 @@ export function LokiContextUi(props: LokiContextUiProps) {
   );
   return (
     <div className={styles.wrapper}>
+      {showPreservedFiltersAppliedNotification && (
+        <Alert
+          className={styles.notification}
+          title="Previously used filters have been applied."
+          severity="info"
+          elevated={true}
+        ></Alert>
+      )}
       <Tooltip content={'Revert to initial log context query.'}>
         <div className={styles.iconButton}>
           <Button
@@ -257,12 +284,12 @@ export function LokiContextUi(props: LokiContextUiProps) {
                 return contextFilters.map((contextFilter) => ({
                   ...contextFilter,
                   // For revert to initial query we need to enable all labels and disable all parsed labels
-                  enabled: !contextFilter.fromParser,
+                  enabled: !contextFilter.nonIndexed,
                 }));
               });
               // We are removing the preserved labels from local storage so we can preselect the labels in the UI
-              store.delete(LOKI_LOG_CONTEXT_PRESERVED_LABELS);
-              store.delete(SHOULD_INCLUDE_PIPELINE_OPERATIONS);
+              window.localStorage.removeItem(LOKI_LOG_CONTEXT_PRESERVED_LABELS);
+              window.localStorage.removeItem(SHOULD_INCLUDE_PIPELINE_OPERATIONS);
               setIncludePipelineOperations(false);
             }}
           />
@@ -273,7 +300,7 @@ export function LokiContextUi(props: LokiContextUiProps) {
         collapsible={true}
         isOpen={isOpen}
         onToggle={() => {
-          store.set(IS_LOKI_LOG_CONTEXT_UI_OPEN, !isOpen);
+          window.localStorage.setItem(IS_LOKI_LOG_CONTEXT_UI_OPEN, (!isOpen).toString());
           setIsOpen((isOpen) => !isOpen);
           reportInteraction('grafana_explore_logs_loki_log_context_toggled', {
             logRowUid: row.uid,
@@ -284,7 +311,11 @@ export function LokiContextUi(props: LokiContextUiProps) {
           <div className={styles.rawQueryContainer}>
             {initialized ? (
               <>
-                <RawQuery lang={{ grammar: lokiGrammar, name: 'loki' }} query={queryExpr} className={styles.rawQuery} />
+                <RawQuery
+                  language={{ grammar: lokiGrammar, name: 'loki' }}
+                  query={queryExpr}
+                  className={styles.rawQuery}
+                />
                 <Tooltip content="The initial log context query is created from all labels defining the stream for the selected log line. Use the editor below to customize the log context query.">
                   <Icon name="info-circle" size="sm" className={styles.queryDescription} />
                 </Tooltip>
@@ -326,7 +357,7 @@ export function LokiContextUi(props: LokiContextUiProps) {
               }
               return setContextFilters(
                 contextFilters.map((filter) => {
-                  if (filter.fromParser) {
+                  if (filter.nonIndexed) {
                     return filter;
                   }
                   filter.enabled = keys.some((key) => key.value === filter.label);
@@ -335,7 +366,7 @@ export function LokiContextUi(props: LokiContextUiProps) {
               );
             }}
           />
-          {showParsedLabels && (
+          {showNonIndexedLabels && (
             <>
               <Label
                 className={styles.label}
@@ -368,7 +399,7 @@ export function LokiContextUi(props: LokiContextUiProps) {
                   }
                   setContextFilters(
                     contextFilters.map((filter) => {
-                      if (!filter.fromParser) {
+                      if (!filter.nonIndexed) {
                         return filter;
                       }
                       filter.enabled = keys.some((key) => key.value === filter.label);
@@ -400,7 +431,7 @@ export function LokiContextUi(props: LokiContextUiProps) {
                       logRowUid: row.uid,
                       action: e.currentTarget.checked ? 'enable' : 'disable',
                     });
-                    store.set(SHOULD_INCLUDE_PIPELINE_OPERATIONS, e.currentTarget.checked);
+                    window.localStorage.setItem(SHOULD_INCLUDE_PIPELINE_OPERATIONS, e.currentTarget.checked.toString());
                     setIncludePipelineOperations(e.currentTarget.checked);
                     if (runContextQuery) {
                       runContextQuery();
diff --git a/public/app/plugins/datasource/loki/components/LokiLabelBrowser.test.tsx b/public/app/plugins/datasource/loki/components/LokiLabelBrowser.test.tsx
index fc158203f6576..5090172f64efd 100644
--- a/public/app/plugins/datasource/loki/components/LokiLabelBrowser.test.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiLabelBrowser.test.tsx
@@ -85,7 +85,7 @@ describe('LokiLabelBrowser', () => {
   const setupProps = (): BrowserProps => {
     const mockLanguageProvider = {
       start: () => Promise.resolve(),
-      getLabelValues: (name: string) => {
+      fetchLabelValues: (name: string) => {
         switch (name) {
           case 'label1':
             return ['value1-1', 'value1-2'];
diff --git a/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx b/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx
index 936255b4a90e6..bbe205f93fa1c 100644
--- a/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx
@@ -3,7 +3,7 @@ import { sortBy } from 'lodash';
 import React, { ChangeEvent } from 'react';
 import { FixedSizeList } from 'react-window';
 
-import { CoreApp, GrafanaTheme2 } from '@grafana/data';
+import { CoreApp, GrafanaTheme2, TimeRange } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
 import {
   Button,
@@ -17,7 +17,6 @@ import {
   fuzzyMatch,
 } from '@grafana/ui';
 
-import PromQlLanguageProvider from '../../prometheus/language_provider';
 import LokiLanguageProvider from '../LanguageProvider';
 import { escapeLabelValueInExactSelector, escapeLabelValueInRegexSelector } from '../languageUtils';
 
@@ -28,12 +27,12 @@ const MAX_AUTO_SELECT = 4;
 const EMPTY_SELECTOR = '{}';
 
 export interface BrowserProps {
-  // TODO #33976: Is it possible to use a common interface here? For example: LabelsLanguageProvider
-  languageProvider: LokiLanguageProvider | PromQlLanguageProvider;
+  languageProvider: LokiLanguageProvider;
   onChange: (selector: string) => void;
   theme: GrafanaTheme2;
   app?: CoreApp;
   autoSelect?: number;
+  timeRange?: TimeRange;
   hide?: () => void;
   lastUsedLabels: string[];
   storeLastUsedLabels: (labels: string[]) => void;
@@ -188,7 +187,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
 
 export class UnthemedLokiLabelBrowser extends React.Component<BrowserProps, BrowserState> {
   state: BrowserState = {
-    labels: [] as SelectableLabel[],
+    labels: [],
     searchTerm: '',
     status: 'Ready',
     error: '',
@@ -283,10 +282,10 @@ export class UnthemedLokiLabelBrowser extends React.Component<BrowserProps, Brow
   }
 
   componentDidMount() {
-    const { languageProvider, autoSelect = MAX_AUTO_SELECT, lastUsedLabels } = this.props;
+    const { languageProvider, autoSelect = MAX_AUTO_SELECT, lastUsedLabels, timeRange } = this.props;
     if (languageProvider) {
       const selectedLabels: string[] = lastUsedLabels;
-      languageProvider.start().then(() => {
+      languageProvider.start(timeRange).then(() => {
         let rawLabels: string[] = languageProvider.getLabelKeys();
         if (rawLabels.length > MAX_LABEL_COUNT) {
           const error = `Too many labels found (showing only ${MAX_LABEL_COUNT} of ${rawLabels.length})`;
@@ -347,10 +346,10 @@ export class UnthemedLokiLabelBrowser extends React.Component<BrowserProps, Brow
   };
 
   async fetchValues(name: string, selector: string) {
-    const { languageProvider } = this.props;
+    const { languageProvider, timeRange } = this.props;
     this.updateLabelState(name, { loading: true }, `Fetching values for ${name}`);
     try {
-      let rawValues = await languageProvider.getLabelValues(name);
+      let rawValues = await languageProvider.fetchLabelValues(name, { timeRange });
       // If selector changed, clear loading state and discard result by returning early
       if (selector !== buildSelector(this.state.labels)) {
         this.updateLabelState(name, { loading: false }, '');
@@ -369,12 +368,12 @@ export class UnthemedLokiLabelBrowser extends React.Component<BrowserProps, Brow
   }
 
   async fetchSeries(selector: string, lastFacetted?: string) {
-    const { languageProvider } = this.props;
+    const { languageProvider, timeRange } = this.props;
     if (lastFacetted) {
       this.updateLabelState(lastFacetted, { loading: true }, `Loading labels for ${selector}`);
     }
     try {
-      const possibleLabels = await languageProvider.fetchSeriesLabels(selector, true);
+      const possibleLabels = await languageProvider.fetchSeriesLabels(selector, { timeRange });
       // If selector changed, clear loading state and discard result by returning early
       if (selector !== buildSelector(this.state.labels)) {
         if (lastFacetted) {
@@ -397,9 +396,9 @@ export class UnthemedLokiLabelBrowser extends React.Component<BrowserProps, Brow
   }
 
   async validateSelector(selector: string) {
-    const { languageProvider } = this.props;
+    const { languageProvider, timeRange } = this.props;
     this.setState({ validationStatus: `Validating selector ${selector}`, error: '' });
-    const streams = await languageProvider.fetchSeries(selector);
+    const streams = await languageProvider.fetchSeries(selector, { timeRange });
     this.setState({ validationStatus: `Selector is valid (${streams.length} streams found)` });
   }
 
@@ -497,7 +496,7 @@ export class UnthemedLokiLabelBrowser extends React.Component<BrowserProps, Brow
                     height={200}
                     itemCount={label.values?.length || 0}
                     itemSize={28}
-                    itemKey={(i) => (label.values as FacettableValue[])[i].name}
+                    itemKey={(i) => label.values?.[i].name ?? i}
                     width={200}
                     className={styles.valueList}
                   >
diff --git a/public/app/plugins/datasource/loki/components/LokiOptionFields.tsx b/public/app/plugins/datasource/loki/components/LokiOptionFields.tsx
index 9b025f29b53fd..8bada9ae24e16 100644
--- a/public/app/plugins/datasource/loki/components/LokiOptionFields.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiOptionFields.tsx
@@ -1,12 +1,11 @@
 // Libraries
-import { css, cx } from '@emotion/css';
 import { map } from 'lodash';
 import React, { memo } from 'react';
 
 // Types
 import { SelectableValue } from '@grafana/data';
 import { config } from '@grafana/runtime';
-import { InlineFormLabel, RadioButtonGroup, InlineField, Input, Select } from '@grafana/ui';
+import { InlineFormLabel, RadioButtonGroup, InlineField, Input, Select, Stack } from '@grafana/ui';
 
 import { getLokiQueryType } from '../queryUtils';
 import { LokiQuery, LokiQueryType } from '../types';
@@ -82,18 +81,9 @@ export function LokiOptionFields(props: LokiOptionFieldsProps) {
   }
 
   return (
-    <div aria-label="Loki extra field" className="gf-form-inline">
+    <Stack alignItems="flex-start" gap={0.5} aria-label="Loki extra field">
       {/*Query type field*/}
-      <div
-        data-testid="queryTypeField"
-        className={cx(
-          'gf-form explore-input-margin',
-          css`
-            flex-wrap: nowrap;
-          `
-        )}
-        aria-label="Query type field"
-      >
+      <Stack wrap="nowrap" gap={0} data-testid="queryTypeField" aria-label="Query type field">
         <InlineFormLabel width="auto">Query type</InlineFormLabel>
 
         <RadioButtonGroup
@@ -106,18 +96,9 @@ export function LokiOptionFields(props: LokiOptionFieldsProps) {
             }
           }}
         />
-      </div>
+      </Stack>
       {/*Line limit field*/}
-      <div
-        data-testid="lineLimitField"
-        className={cx(
-          'gf-form',
-          css`
-            flex-wrap: nowrap;
-          `
-        )}
-        aria-label="Line limit field"
-      >
+      <Stack wrap="nowrap" gap={0} data-testid="lineLimitField" aria-label="Line limit field">
         <InlineField label="Line limit" tooltip={'Upper limit for number of log lines returned by query.'}>
           <Input
             className="width-4"
@@ -148,8 +129,8 @@ export function LokiOptionFields(props: LokiOptionFieldsProps) {
             aria-label="Select resolution"
           />
         </InlineField>
-      </div>
-    </div>
+      </Stack>
+    </Stack>
   );
 }
 
diff --git a/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx b/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx
index 1c9cf55ba435d..c2720a046bf6c 100644
--- a/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx
@@ -4,9 +4,9 @@ import { cloneDeep, defaultsDeep } from 'lodash';
 import React from 'react';
 
 import { CoreApp } from '@grafana/data';
-import { QueryEditorMode } from 'app/plugins/datasource/prometheus/querybuilder/shared/types';
+import { QueryEditorMode } from '@grafana/experimental';
 
-import { createLokiDatasource } from '../mocks';
+import { createLokiDatasource } from '../__mocks__/datasource';
 import { EXPLAIN_LABEL_FILTER_CONTENT } from '../querybuilder/components/LokiQueryBuilderExplained';
 import { LokiQuery, LokiQueryType } from '../types';
 
@@ -29,18 +29,6 @@ jest.mock('./monaco-query-field/MonacoQueryFieldWrapper', () => {
   };
 });
 
-jest.mock('app/core/store', () => {
-  return {
-    get() {
-      return undefined;
-    },
-    set() {},
-    getObject(key: string, defaultValue: unknown) {
-      return defaultValue;
-    },
-  };
-});
-
 const defaultQuery = {
   refId: 'A',
   expr: '{label1="foo", label2="bar"}',
@@ -59,6 +47,10 @@ const defaultProps = {
 };
 
 describe('LokiQueryEditorSelector', () => {
+  // We need to clear local storage after each test because we are using it to store the editor mode and enabled explain
+  afterEach(() => {
+    window.localStorage.clear();
+  });
   it('shows code editor if expr and nothing else', async () => {
     // We opt for showing code editor for queries created before this feature was added
     render(<LokiQueryEditor {...defaultProps} />);
diff --git a/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx b/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
index a9293b17fa8ef..d0c9f84529a6e 100644
--- a/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
@@ -1,17 +1,20 @@
 import { isEqual } from 'lodash';
-import React, { SyntheticEvent, useCallback, useEffect, useState } from 'react';
+import React, { SyntheticEvent, useCallback, useEffect, useId, useState } from 'react';
 import { usePrevious } from 'react-use';
 
 import { CoreApp, LoadingState } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { EditorHeader, EditorRows, FlexItem, Space, Stack } from '@grafana/experimental';
+import {
+  EditorHeader,
+  EditorRows,
+  FlexItem,
+  QueryEditorModeToggle,
+  QueryHeaderSwitch,
+  QueryEditorMode,
+} from '@grafana/experimental';
 import { config, reportInteraction } from '@grafana/runtime';
-import { Button, ConfirmModal } from '@grafana/ui';
-import { QueryEditorModeToggle } from 'app/plugins/datasource/prometheus/querybuilder/shared/QueryEditorModeToggle';
-import { QueryHeaderSwitch } from 'app/plugins/datasource/prometheus/querybuilder/shared/QueryHeaderSwitch';
-import { QueryEditorMode } from 'app/plugins/datasource/prometheus/querybuilder/shared/types';
+import { Button, ConfirmModal, Space, Stack } from '@grafana/ui';
 
-import { lokiQueryEditorExplainKey, useFlag } from '../../prometheus/querybuilder/shared/hooks/useFlag';
 import { LabelBrowserModal } from '../querybuilder/components/LabelBrowserModal';
 import { LokiQueryBuilderContainer } from '../querybuilder/components/LokiQueryBuilderContainer';
 import { LokiQueryBuilderOptions } from '../querybuilder/components/LokiQueryBuilderOptions';
@@ -28,14 +31,17 @@ export const testIds = {
   editor: 'loki-editor',
 };
 
+export const lokiQueryEditorExplainKey = 'LokiQueryEditorExplainDefault';
+
 export const LokiQueryEditor = React.memo<LokiQueryEditorProps>((props) => {
+  const id = useId();
   const { onChange, onRunQuery, onAddQuery, data, app, queries, datasource, range: timeRange } = props;
   const [parseModalOpen, setParseModalOpen] = useState(false);
   const [queryPatternsModalOpen, setQueryPatternsModalOpen] = useState(false);
   const [dataIsStale, setDataIsStale] = useState(false);
   const [labelBrowserVisible, setLabelBrowserVisible] = useState(false);
   const [queryStats, setQueryStats] = useState<QueryStats | null>(null);
-  const { flag: explain, setFlag: setExplain } = useFlag(lokiQueryEditorExplainKey);
+  const [explain, setExplain] = useState(window.localStorage.getItem(lokiQueryEditorExplainKey) === 'true');
 
   const predefinedOperations = datasource.predefinedOperations;
   const previousTimeRange = usePrevious(timeRange);
@@ -51,6 +57,7 @@ export const LokiQueryEditor = React.memo<LokiQueryEditorProps>((props) => {
   const editorMode = query.editorMode!;
 
   const onExplainChange = (event: SyntheticEvent<HTMLInputElement>) => {
+    window.localStorage.setItem(lokiQueryEditorExplainKey, event.currentTarget.checked ? 'true' : 'false');
     setExplain(event.currentTarget.checked);
   };
 
@@ -96,7 +103,7 @@ export const LokiQueryEditor = React.memo<LokiQueryEditorProps>((props) => {
   };
 
   useEffect(() => {
-    const update = shouldUpdateStats(
+    const shouldUpdate = shouldUpdateStats(
       query.expr,
       previousQueryExpr,
       timeRange,
@@ -104,14 +111,15 @@ export const LokiQueryEditor = React.memo<LokiQueryEditorProps>((props) => {
       query.queryType,
       previousQueryType
     );
-    if (update) {
+    if (shouldUpdate && timeRange) {
       const makeAsyncRequest = async () => {
-        const stats = await datasource.getStats(query);
+        // overwriting the refId that is later used to cancel inflight queries with the same ID.
+        const stats = await datasource.getStats({ ...query, refId: `${id}_${query.refId}` }, timeRange);
         setQueryStats(stats);
       };
       makeAsyncRequest();
     }
-  }, [datasource, timeRange, previousTimeRange, query, previousQueryExpr, previousQueryType, setQueryStats]);
+  }, [datasource, timeRange, previousTimeRange, query, previousQueryExpr, previousQueryType, setQueryStats, id]);
 
   return (
     <>
@@ -143,11 +151,12 @@ export const LokiQueryEditor = React.memo<LokiQueryEditorProps>((props) => {
         onClose={() => setLabelBrowserVisible(false)}
         onChange={onChangeInternal}
         onRunQuery={onRunQuery}
+        timeRange={timeRange}
       />
       <EditorHeader>
         <Stack gap={1}>
           <Button
-            aria-label={selectors.components.QueryBuilder.queryPatterns}
+            data-testid={selectors.components.QueryBuilder.queryPatterns}
             variant="secondary"
             size="sm"
             onClick={() => {
@@ -196,6 +205,7 @@ export const LokiQueryEditor = React.memo<LokiQueryEditorProps>((props) => {
             onChange={onChangeInternal}
             onRunQuery={props.onRunQuery}
             showExplain={explain}
+            timeRange={timeRange}
           />
         )}
         <LokiQueryBuilderOptions
diff --git a/public/app/plugins/datasource/loki/components/LokiQueryEditorByApp.test.tsx b/public/app/plugins/datasource/loki/components/LokiQueryEditorByApp.test.tsx
index 062739a965506..171644d28025d 100644
--- a/public/app/plugins/datasource/loki/components/LokiQueryEditorByApp.test.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiQueryEditorByApp.test.tsx
@@ -4,7 +4,7 @@ import React from 'react';
 
 import { CoreApp } from '@grafana/data';
 
-import { createLokiDatasource } from '../mocks';
+import { createLokiDatasource } from '../__mocks__/datasource';
 
 import { testIds as regularTestIds } from './LokiQueryEditor';
 import { LokiQueryEditorByApp } from './LokiQueryEditorByApp';
diff --git a/public/app/plugins/datasource/loki/components/LokiQueryField.test.tsx b/public/app/plugins/datasource/loki/components/LokiQueryField.test.tsx
index df10cb75d4ebb..17b2fd47e6f77 100644
--- a/public/app/plugins/datasource/loki/components/LokiQueryField.test.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiQueryField.test.tsx
@@ -1,11 +1,21 @@
-import { render, screen } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
 import React, { ComponentProps } from 'react';
 
 import { dateTime } from '@grafana/data';
 
-import { createLokiDatasource } from '../mocks';
+import { createLokiDatasource } from '../__mocks__/datasource';
 
 import { LokiQueryField } from './LokiQueryField';
+import { Props as MonacoProps } from './monaco-query-field/MonacoQueryFieldProps';
+
+jest.mock('./monaco-query-field/MonacoQueryFieldLazy', () => {
+  const fakeQueryField = (props: MonacoProps) => {
+    return <input onBlur={(e) => props.onBlur(e.currentTarget.value)} data-testid={'dummy-code-input'} type={'text'} />;
+  };
+  return {
+    MonacoQueryFieldLazy: fakeQueryField,
+  };
+});
 
 type Props = ComponentProps<typeof LokiQueryField>;
 describe('LokiQueryField', () => {
@@ -33,7 +43,9 @@ describe('LokiQueryField', () => {
   it('refreshes metrics when time range changes over 1 minute', async () => {
     const { rerender } = render(<LokiQueryField {...props} />);
 
-    expect(await screen.findByText('Loading...')).toBeInTheDocument();
+    await waitFor(async () => {
+      expect(await screen.findByTestId('dummy-code-input')).toBeInTheDocument();
+    });
 
     expect(props.datasource.languageProvider.fetchLabels).not.toHaveBeenCalled();
 
@@ -49,12 +61,15 @@ describe('LokiQueryField', () => {
 
     rerender(<LokiQueryField {...props} range={newRange} />);
     expect(props.datasource.languageProvider.fetchLabels).toHaveBeenCalledTimes(1);
+    expect(props.datasource.languageProvider.fetchLabels).toHaveBeenCalledWith({ timeRange: newRange });
   });
 
   it('does not refreshes metrics when time range change by less than 1 minute', async () => {
     const { rerender } = render(<LokiQueryField {...props} />);
 
-    expect(await screen.findByText('Loading...')).toBeInTheDocument();
+    await waitFor(async () => {
+      expect(await screen.findByTestId('dummy-code-input')).toBeInTheDocument();
+    });
 
     expect(props.datasource.languageProvider.fetchLabels).not.toHaveBeenCalled();
 
diff --git a/public/app/plugins/datasource/loki/components/LokiQueryField.tsx b/public/app/plugins/datasource/loki/components/LokiQueryField.tsx
index 11fcfa8c9bfeb..237e2bff41814 100644
--- a/public/app/plugins/datasource/loki/components/LokiQueryField.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiQueryField.tsx
@@ -29,7 +29,7 @@ export class LokiQueryField extends React.PureComponent<LokiQueryFieldProps, Lok
 
   async componentDidMount() {
     this._isMounted = true;
-    await this.props.datasource.languageProvider.start();
+    await this.props.datasource.languageProvider.start(this.props.range);
     if (this._isMounted) {
       this.setState({ labelsLoaded: true });
     }
@@ -47,7 +47,7 @@ export class LokiQueryField extends React.PureComponent<LokiQueryFieldProps, Lok
     const refreshLabels = shouldRefreshLabels(range, prevProps.range);
     // We want to refresh labels when range changes (we round up intervals to a minute)
     if (refreshLabels) {
-      languageProvider.fetchLabels();
+      languageProvider.fetchLabels({ timeRange: range });
     }
   }
 
@@ -65,7 +65,7 @@ export class LokiQueryField extends React.PureComponent<LokiQueryFieldProps, Lok
   };
 
   render() {
-    const { ExtraFieldElement, query, datasource, history, onRunQuery } = this.props;
+    const { ExtraFieldElement, query, datasource, history, onRunQuery, range } = this.props;
     const placeholder = this.props.placeholder ?? 'Enter a Loki query (run with Shift+Enter)';
 
     return (
@@ -82,6 +82,7 @@ export class LokiQueryField extends React.PureComponent<LokiQueryFieldProps, Lok
               onRunQuery={onRunQuery}
               initialValue={query.expr ?? ''}
               placeholder={placeholder}
+              timeRange={range}
             />
           </div>
         </div>
diff --git a/public/app/plugins/datasource/loki/components/VariableQueryEditor.test.tsx b/public/app/plugins/datasource/loki/components/VariableQueryEditor.test.tsx
index c8f6298e6f871..758dfc7055c88 100644
--- a/public/app/plugins/datasource/loki/components/VariableQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/loki/components/VariableQueryEditor.test.tsx
@@ -1,11 +1,12 @@
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
-import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
+import { select } from 'react-select-event';
 
+import { TimeRange, dateTime } from '@grafana/data';
 import { TemplateSrv } from '@grafana/runtime';
 
-import { createLokiDatasource } from '../mocks';
+import { createLokiDatasource } from '../__mocks__/datasource';
 import { LokiVariableQueryType } from '../types';
 
 import { LokiVariableQueryEditor, Props } from './VariableQueryEditor';
@@ -26,14 +27,7 @@ describe('LokiVariableQueryEditor', () => {
       onChange: () => {},
     };
 
-    jest.spyOn(props.datasource, 'labelNamesQuery').mockResolvedValue([
-      {
-        text: 'moon',
-      },
-      {
-        text: 'luna',
-      },
-    ]);
+    jest.spyOn(props.datasource.languageProvider, 'fetchLabels').mockResolvedValue(['luna', 'moon']);
   });
 
   test('Allows to create a Label names variable', async () => {
@@ -41,8 +35,7 @@ describe('LokiVariableQueryEditor', () => {
     render(<LokiVariableQueryEditor {...props} onChange={onChange} />);
 
     expect(onChange).not.toHaveBeenCalled();
-
-    await selectOptionInTest(screen.getByLabelText('Query type'), 'Label names');
+    await select(screen.getByLabelText('Query type'), 'Label names', { container: document.body });
 
     expect(onChange).toHaveBeenCalledWith({
       type: LokiVariableQueryType.LabelNames,
@@ -58,8 +51,8 @@ describe('LokiVariableQueryEditor', () => {
 
     expect(onChange).not.toHaveBeenCalled();
 
-    await selectOptionInTest(screen.getByLabelText('Query type'), 'Label values');
-    await selectOptionInTest(screen.getByLabelText('Label'), 'luna');
+    await waitFor(() => select(screen.getByLabelText('Query type'), 'Label values', { container: document.body }));
+    await select(screen.getByLabelText('Label'), 'luna', { container: document.body });
     await userEvent.type(screen.getByLabelText('Stream selector'), 'stream');
 
     await waitFor(() => expect(screen.getByDisplayValue('stream')).toBeInTheDocument());
@@ -79,8 +72,8 @@ describe('LokiVariableQueryEditor', () => {
     render(<LokiVariableQueryEditor {...props} onChange={onChange} />);
 
     expect(onChange).not.toHaveBeenCalled();
+    await waitFor(() => select(screen.getByLabelText('Query type'), 'Label values', { container: document.body }));
 
-    await selectOptionInTest(screen.getByLabelText('Query type'), 'Label values');
     await userEvent.type(screen.getByLabelText('Label'), 'sol{enter}');
     await userEvent.type(screen.getByLabelText('Stream selector'), 'stream');
 
@@ -127,9 +120,8 @@ describe('LokiVariableQueryEditor', () => {
 
   test('Label options are not lost when selecting one', async () => {
     const { rerender } = render(<LokiVariableQueryEditor {...props} onChange={() => {}} />);
-
-    await selectOptionInTest(screen.getByLabelText('Query type'), 'Label values');
-    await selectOptionInTest(screen.getByLabelText('Label'), 'luna');
+    await waitFor(() => select(screen.getByLabelText('Query type'), 'Label values', { container: document.body }));
+    await select(screen.getByLabelText('Label'), 'luna', { container: document.body });
 
     const updatedQuery = {
       refId: 'test',
@@ -138,8 +130,136 @@ describe('LokiVariableQueryEditor', () => {
     };
     rerender(<LokiVariableQueryEditor {...props} query={updatedQuery} onChange={() => {}} />);
 
-    await selectOptionInTest(screen.getByLabelText('Label'), 'moon');
-    await selectOptionInTest(screen.getByLabelText('Label'), 'luna');
+    await select(screen.getByLabelText('Label'), 'moon', { container: document.body });
+    await select(screen.getByLabelText('Label'), 'luna', { container: document.body });
     await screen.findByText('luna');
   });
+
+  test('Calls language provider fetchLabels with the time range received in props', async () => {
+    const now = dateTime('2023-09-16T21:26:00Z');
+    const range: TimeRange = {
+      from: dateTime(now).subtract(2, 'days'),
+      to: now,
+      raw: {
+        from: 'now-2d',
+        to: 'now',
+      },
+    };
+    props.range = range;
+    props.query = {
+      refId: 'test',
+      type: LokiVariableQueryType.LabelValues,
+      label: 'luna',
+    };
+
+    render(<LokiVariableQueryEditor {...props} />);
+    await waitFor(() =>
+      expect(props.datasource.languageProvider.fetchLabels).toHaveBeenCalledWith({ timeRange: range })
+    );
+  });
+
+  test('does not re-run fetch labels when type does not change', async () => {
+    const now = dateTime('2023-09-16T21:26:00Z');
+    const range: TimeRange = {
+      from: dateTime(now).subtract(2, 'days'),
+      to: now,
+      raw: {
+        from: 'now-2d',
+        to: 'now',
+      },
+    };
+    props.range = range;
+    props.query = {
+      refId: 'test',
+      type: LokiVariableQueryType.LabelValues,
+    };
+
+    props.datasource.languageProvider.fetchLabels = jest.fn().mockResolvedValue([]);
+    const { rerender } = render(<LokiVariableQueryEditor {...props} />);
+    rerender(
+      <LokiVariableQueryEditor {...props} query={{ ...props.query, type: LokiVariableQueryType.LabelValues }} />
+    );
+
+    await waitFor(() => {
+      expect(props.datasource.languageProvider.fetchLabels).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  test('runs fetch labels when type changes to from LabelNames to LabelValues', async () => {
+    const now = dateTime('2023-09-16T21:26:00Z');
+    const range: TimeRange = {
+      from: dateTime(now).subtract(2, 'days'),
+      to: now,
+      raw: {
+        from: 'now-2d',
+        to: 'now',
+      },
+    };
+    props.range = range;
+    props.query = {
+      refId: 'test',
+      type: LokiVariableQueryType.LabelNames,
+    };
+
+    props.datasource.languageProvider.fetchLabels = jest.fn().mockResolvedValue([]);
+    const { rerender } = render(<LokiVariableQueryEditor {...props} />);
+    rerender(
+      <LokiVariableQueryEditor {...props} query={{ ...props.query, type: LokiVariableQueryType.LabelValues }} />
+    );
+
+    await waitFor(() => {
+      expect(props.datasource.languageProvider.fetchLabels).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  test('runs fetch labels when type changes to LabelValues', async () => {
+    const now = dateTime('2023-09-16T21:26:00Z');
+    const range: TimeRange = {
+      from: dateTime(now).subtract(2, 'days'),
+      to: now,
+      raw: {
+        from: 'now-2d',
+        to: 'now',
+      },
+    };
+    props.range = range;
+    props.query = {
+      refId: 'test',
+      type: LokiVariableQueryType.LabelNames,
+    };
+
+    props.datasource.languageProvider.fetchLabels = jest.fn().mockResolvedValue([]);
+    // Starting with LabelNames
+    const { rerender } = render(<LokiVariableQueryEditor {...props} />);
+
+    // Changing to LabelValues, should run fetchLabels
+    rerender(
+      <LokiVariableQueryEditor {...props} query={{ ...props.query, type: LokiVariableQueryType.LabelValues }} />
+    );
+    await waitFor(() => {
+      expect(props.datasource.languageProvider.fetchLabels).toHaveBeenCalledTimes(1);
+    });
+
+    // Keeping the type of LabelValues, should not run additional fetchLabels
+    rerender(
+      <LokiVariableQueryEditor {...props} query={{ ...props.query, type: LokiVariableQueryType.LabelValues }} />
+    );
+    await waitFor(() => {
+      expect(props.datasource.languageProvider.fetchLabels).toHaveBeenCalledTimes(1);
+    });
+
+    // Changing to LabelNames, should not run additional fetchLabels
+    rerender(<LokiVariableQueryEditor {...props} query={{ ...props.query, type: LokiVariableQueryType.LabelNames }} />);
+    await waitFor(() => {
+      expect(props.datasource.languageProvider.fetchLabels).toHaveBeenCalledTimes(1);
+    });
+
+    // Changing to LabelValues, should run additional fetchLabels
+    rerender(
+      <LokiVariableQueryEditor {...props} query={{ ...props.query, type: LokiVariableQueryType.LabelValues }} />
+    );
+    await waitFor(() => {
+      expect(props.datasource.languageProvider.fetchLabels).toHaveBeenCalledTimes(2);
+    });
+  });
 });
diff --git a/public/app/plugins/datasource/loki/components/VariableQueryEditor.tsx b/public/app/plugins/datasource/loki/components/VariableQueryEditor.tsx
index 4b46324d75dce..63246b7365759 100644
--- a/public/app/plugins/datasource/loki/components/VariableQueryEditor.tsx
+++ b/public/app/plugins/datasource/loki/components/VariableQueryEditor.tsx
@@ -1,4 +1,5 @@
 import React, { FormEvent, useState, useEffect } from 'react';
+import { usePrevious } from 'react-use';
 
 import { QueryEditorProps, SelectableValue } from '@grafana/data';
 import { InlineField, InlineFieldRow, Input, Select } from '@grafana/ui';
@@ -16,11 +17,12 @@ export type Props = QueryEditorProps<LokiDatasource, LokiQuery, LokiOptions, Lok
 
 const refId = 'LokiVariableQueryEditor-VariableQuery';
 
-export const LokiVariableQueryEditor = ({ onChange, query, datasource }: Props) => {
+export const LokiVariableQueryEditor = ({ onChange, query, datasource, range }: Props) => {
   const [type, setType] = useState<number | undefined>(undefined);
   const [label, setLabel] = useState('');
   const [labelOptions, setLabelOptions] = useState<Array<SelectableValue<string>>>([]);
   const [stream, setStream] = useState('');
+  const previousType = usePrevious(type);
 
   useEffect(() => {
     if (!query) {
@@ -34,14 +36,15 @@ export const LokiVariableQueryEditor = ({ onChange, query, datasource }: Props)
   }, [query]);
 
   useEffect(() => {
-    if (type !== QueryType.LabelValues) {
+    // Fetch label names when the query type is LabelValues, and the previous type was not the same
+    if (type !== QueryType.LabelValues || previousType === type) {
       return;
     }
 
-    datasource.labelNamesQuery().then((labelNames: Array<{ text: string }>) => {
-      setLabelOptions(labelNames.map(({ text }) => ({ label: text, value: text })));
+    datasource.languageProvider.fetchLabels({ timeRange: range }).then((labelNames) => {
+      setLabelOptions(labelNames.map((labelName) => ({ label: labelName, value: labelName })));
     });
-  }, [datasource, type]);
+  }, [datasource, type, range, previousType]);
 
   const onQueryTypeChange = (newType: SelectableValue<QueryType>) => {
     setType(newType.value);
diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoFieldWrapper.test.tsx b/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoFieldWrapper.test.tsx
index 088c46627b4bb..7ff5671f8cdb4 100644
--- a/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoFieldWrapper.test.tsx
+++ b/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoFieldWrapper.test.tsx
@@ -1,7 +1,7 @@
-import { render, screen } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
 import React from 'react';
 
-import { createLokiDatasource } from '../../mocks';
+import { createLokiDatasource } from '../../__mocks__/datasource';
 
 import { MonacoQueryFieldWrapper, Props } from './MonacoQueryFieldWrapper';
 
@@ -24,6 +24,8 @@ describe('MonacoFieldWrapper', () => {
   test('Renders with no errors', async () => {
     renderComponent();
 
-    expect(await screen.findByText('Loading...')).toBeInTheDocument();
+    await waitFor(async () => {
+      expect(await screen.findByText('Loading...')).toBeInTheDocument();
+    });
   });
 });
diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.test.tsx b/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.test.tsx
index b89ab68fdc402..eb938b59597cd 100644
--- a/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.test.tsx
+++ b/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.test.tsx
@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 
-import { createLokiDatasource } from '../../mocks';
+import { createLokiDatasource } from '../../__mocks__/datasource';
 
 import MonacoQueryField from './MonacoQueryField';
 import { Props } from './MonacoQueryFieldProps';
diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.tsx b/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.tsx
index 45cf68b77fc5f..adce89b6a3bdd 100644
--- a/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.tsx
+++ b/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.tsx
@@ -6,13 +6,14 @@ import { v4 as uuidv4 } from 'uuid';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
+import { parser } from '@grafana/lezer-logql';
 import { languageConfiguration, monarchlanguage } from '@grafana/monaco-logql';
 import { useTheme2, ReactMonacoEditor, Monaco, monacoTypes, MonacoEditor } from '@grafana/ui';
 
 import { Props } from './MonacoQueryFieldProps';
 import { getOverrideServices } from './getOverrideServices';
-import { getCompletionProvider, getSuggestOptions } from './monaco-completion-provider';
 import { CompletionDataProvider } from './monaco-completion-provider/CompletionDataProvider';
+import { getCompletionProvider, getSuggestOptions } from './monaco-completion-provider/completionUtils';
 import { placeHolderScopedVars, validateQuery } from './monaco-completion-provider/validation';
 
 const options: monacoTypes.editor.IStandaloneEditorConstructionOptions = {
@@ -99,7 +100,16 @@ const getStyles = (theme: GrafanaTheme2, placeholder: string) => {
   };
 };
 
-const MonacoQueryField = ({ history, onBlur, onRunQuery, initialValue, datasource, placeholder, onChange }: Props) => {
+const MonacoQueryField = ({
+  history,
+  onBlur,
+  onRunQuery,
+  initialValue,
+  datasource,
+  placeholder,
+  onChange,
+  timeRange,
+}: Props) => {
   const id = uuidv4();
   // we need only one instance of `overrideServices` during the lifetime of the react component
   const overrideServicesRef = useRef(getOverrideServices());
@@ -156,7 +166,7 @@ const MonacoQueryField = ({ history, onBlur, onRunQuery, initialValue, datasourc
 
   return (
     <div
-      aria-label={selectors.components.QueryField.container}
+      data-testid={selectors.components.QueryField.container}
       className={styles.container}
       // NOTE: we will be setting inline-style-width/height on this element
       ref={containerRef}
@@ -187,7 +197,8 @@ const MonacoQueryField = ({ history, onBlur, onRunQuery, initialValue, datasourc
               validateQuery(
                 query,
                 datasource.interpolateString(query, placeHolderScopedVars),
-                model.getLinesContent()
+                model.getLinesContent(),
+                parser
               ) || [];
 
             const markers = errors.map(({ error, ...boundary }) => ({
@@ -201,7 +212,7 @@ const MonacoQueryField = ({ history, onBlur, onRunQuery, initialValue, datasourc
             onTypeDebounced(query);
             monaco.editor.setModelMarkers(model, 'owner', markers);
           });
-          const dataProvider = new CompletionDataProvider(langProviderRef.current, historyRef);
+          const dataProvider = new CompletionDataProvider(langProviderRef.current, historyRef, timeRange);
           const completionProvider = getCompletionProvider(monaco, dataProvider);
 
           // completion-providers in monaco are not registered directly to editor-instances,
diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryFieldProps.ts b/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryFieldProps.ts
index d52c126ceeddd..ab66b3b3d8685 100644
--- a/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryFieldProps.ts
+++ b/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryFieldProps.ts
@@ -1,4 +1,4 @@
-import { HistoryItem } from '@grafana/data';
+import { HistoryItem, TimeRange } from '@grafana/data';
 
 import { LokiDatasource } from '../../datasource';
 import { LokiQuery } from '../../types';
@@ -15,4 +15,5 @@ export type Props = {
   placeholder: string;
   datasource: LokiDatasource;
   onChange: (query: string) => void;
+  timeRange?: TimeRange;
 };
diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/CompletionDataProvider.test.ts b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/CompletionDataProvider.test.ts
index 2ab3e7ce82248..5b2d1a62eb00e 100644
--- a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/CompletionDataProvider.test.ts
+++ b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/CompletionDataProvider.test.ts
@@ -1,8 +1,8 @@
-import { HistoryItem } from '@grafana/data';
+import { HistoryItem, dateTime } from '@grafana/data';
 
 import LokiLanguageProvider from '../../../LanguageProvider';
+import { createLokiDatasource } from '../../../__mocks__/datasource';
 import { LokiDatasource } from '../../../datasource';
-import { createLokiDatasource } from '../../../mocks';
 import { LokiQuery } from '../../../types';
 
 import { CompletionDataProvider } from './CompletionDataProvider';
@@ -51,11 +51,21 @@ const seriesLabels = { place: ['series', 'labels'], source: [], other: [] };
 const parserAndLabelKeys = {
   extractedLabelKeys: ['extracted', 'label', 'keys'],
   unwrapLabelKeys: ['unwrap', 'labels'],
+  structuredMetadataKeys: ['structured', 'metadata'],
   hasJSON: true,
   hasLogfmt: false,
   hasPack: false,
 };
 
+const mockTimeRange = {
+  from: dateTime(1546372800000),
+  to: dateTime(1546380000000),
+  raw: {
+    from: dateTime(1546372800000),
+    to: dateTime(1546380000000),
+  },
+};
+
 describe('CompletionDataProvider', () => {
   let completionProvider: CompletionDataProvider, languageProvider: LokiLanguageProvider, datasource: LokiDatasource;
   let historyRef: { current: Array<HistoryItem<LokiQuery>> } = { current: [] };
@@ -63,11 +73,12 @@ describe('CompletionDataProvider', () => {
     datasource = createLokiDatasource();
     languageProvider = new LokiLanguageProvider(datasource);
     historyRef.current = history;
-    completionProvider = new CompletionDataProvider(languageProvider, historyRef);
+
+    completionProvider = new CompletionDataProvider(languageProvider, historyRef, mockTimeRange);
 
     jest.spyOn(languageProvider, 'getLabelKeys').mockReturnValue(labelKeys);
-    jest.spyOn(languageProvider, 'getLabelValues').mockResolvedValue(labelValues);
-    jest.spyOn(languageProvider, 'getSeriesLabels').mockResolvedValue(seriesLabels);
+    jest.spyOn(languageProvider, 'fetchLabelValues').mockResolvedValue(labelValues);
+    jest.spyOn(languageProvider, 'fetchSeriesLabels').mockResolvedValue(seriesLabels);
     jest.spyOn(languageProvider, 'getParserAndLabelKeys').mockResolvedValue(parserAndLabelKeys);
   });
 
@@ -163,7 +174,19 @@ describe('CompletionDataProvider', () => {
     expect(languageProvider.getParserAndLabelKeys).toHaveBeenCalledTimes(4);
   });
 
+  test('Uses time range from CompletionProvider', async () => {
+    completionProvider.getParserAndLabelKeys('');
+    expect(languageProvider.getParserAndLabelKeys).toHaveBeenCalledWith('', { timeRange: mockTimeRange });
+  });
+
   test('Returns the expected series labels', async () => {
     expect(await completionProvider.getSeriesLabels([])).toEqual(seriesLabels);
   });
+
+  test('Escapes correct characters when building stream selector in getSeriesLabels', async () => {
+    completionProvider.getSeriesLabels([{ name: 'job', op: '=', value: '"a\\b\n' }]);
+    expect(languageProvider.fetchSeriesLabels).toHaveBeenCalledWith('{job="\\"a\\\\b\\n"}', {
+      timeRange: mockTimeRange,
+    });
+  });
 });
diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/CompletionDataProvider.ts b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/CompletionDataProvider.ts
index 03064d5a74a84..f982d52485516 100644
--- a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/CompletionDataProvider.ts
+++ b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/CompletionDataProvider.ts
@@ -1,9 +1,9 @@
 import { chain } from 'lodash';
 
-import { HistoryItem } from '@grafana/data';
-import { escapeLabelValueInExactSelector } from 'app/plugins/datasource/prometheus/language_utils';
+import { HistoryItem, TimeRange } from '@grafana/data';
 
 import LanguageProvider from '../../../LanguageProvider';
+import { escapeLabelValueInExactSelector } from '../../../languageUtils';
 import { ParserAndLabelKeysResult, LokiQuery } from '../../../types';
 
 import { Label } from './situation';
@@ -15,7 +15,8 @@ interface HistoryRef {
 export class CompletionDataProvider {
   constructor(
     private languageProvider: LanguageProvider,
-    private historyRef: HistoryRef = { current: [] }
+    private historyRef: HistoryRef = { current: [] },
+    private timeRange: TimeRange | undefined
   ) {
     this.queryToLabelKeysCache = new Map();
   }
@@ -51,7 +52,7 @@ export class CompletionDataProvider {
   async getLabelValues(labelName: string, otherLabels: Label[]) {
     if (otherLabels.length === 0) {
       // if there is no filtering, we have to use a special endpoint
-      return await this.languageProvider.getLabelValues(labelName);
+      return await this.languageProvider.fetchLabelValues(labelName, { timeRange: this.timeRange });
     }
 
     const data = await this.getSeriesLabels(otherLabels);
@@ -82,7 +83,7 @@ export class CompletionDataProvider {
         this.queryToLabelKeysCache.delete(firstKey);
       }
       // Fetch a fresh result from the backend
-      const labelKeys = await this.languageProvider.getParserAndLabelKeys(logQuery);
+      const labelKeys = await this.languageProvider.getParserAndLabelKeys(logQuery, { timeRange: this.timeRange });
       // Add the result to the cache
       this.queryToLabelKeysCache.set(logQuery, labelKeys);
       return labelKeys;
@@ -90,6 +91,8 @@ export class CompletionDataProvider {
   }
 
   async getSeriesLabels(labels: Label[]) {
-    return await this.languageProvider.getSeriesLabels(this.buildSelector(labels)).then((data) => data ?? {});
+    return await this.languageProvider
+      .fetchSeriesLabels(this.buildSelector(labels), { timeRange: this.timeRange })
+      .then((data) => data ?? {});
   }
 }
diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/index.ts b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completionUtils.ts
similarity index 100%
rename from public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/index.ts
rename to public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completionUtils.ts
diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completions.test.ts b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completions.test.ts
index 56f691e9f8ac5..de76f3fc915ba 100644
--- a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completions.test.ts
+++ b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completions.test.ts
@@ -1,15 +1,15 @@
-import { Monaco, monacoTypes } from '@grafana/ui/src';
+import { dateTime } from '@grafana/data';
+import { Monaco, monacoTypes } from '@grafana/ui';
 
 import LokiLanguageProvider from '../../../LanguageProvider';
+import { createLokiDatasource } from '../../../__mocks__/datasource';
 import { LokiDatasource } from '../../../datasource';
-import { createLokiDatasource } from '../../../mocks';
 
 import { CompletionDataProvider } from './CompletionDataProvider';
+import { calculateRange } from './completionUtils';
 import { getAfterSelectorCompletions, getCompletions } from './completions';
 import { getSituation, Label, Situation } from './situation';
 
-import { calculateRange } from './index';
-
 jest.mock('../../../querybuilder/operations', () => ({
   explainOperator: () => 'Operator docs',
 }));
@@ -31,10 +31,20 @@ const history = [
   },
 ];
 
+const mockTimeRange = {
+  from: dateTime(1546372800000),
+  to: dateTime(1546380000000),
+  raw: {
+    from: dateTime(1546372800000),
+    to: dateTime(1546380000000),
+  },
+};
+
 const labelNames = ['place', 'source'];
 const labelValues = ['moon', 'luna', 'server\\1'];
 // Source is duplicated to test handling duplicated labels
 const extractedLabelKeys = ['extracted', 'place', 'source'];
+const structuredMetadataKeys = ['structured', 'metadata'];
 const unwrapLabelKeys = ['unwrap', 'labels'];
 const otherLabels: Label[] = [
   {
@@ -146,7 +156,8 @@ function buildAfterSelectorCompletions(
   detectedParser: string,
   otherParser: string,
   afterPipe: boolean,
-  hasSpace: boolean
+  hasSpace: boolean,
+  structuredMetadataKeys?: string[]
 ) {
   const explanation = '(detected)';
   let expectedCompletions = afterSelectorCompletions.map((completion) => {
@@ -187,6 +198,20 @@ function buildAfterSelectorCompletions(
     }
   });
 
+  structuredMetadataKeys?.forEach((key) => {
+    let text = `${afterPipe ? ' ' : ' | '}${key}`;
+    if (hasSpace) {
+      text = text.trimStart();
+    }
+
+    expectedCompletions.push({
+      insertText: text,
+      label: `${key} ${explanation}`,
+      documentation: `"${key}" was suggested based on structured metadata attached to your loglines.`,
+      type: 'LABEL_NAME',
+    });
+  });
+
   return expectedCompletions;
 }
 
@@ -195,15 +220,20 @@ describe('getCompletions', () => {
   beforeEach(() => {
     datasource = createLokiDatasource();
     languageProvider = new LokiLanguageProvider(datasource);
-    completionProvider = new CompletionDataProvider(languageProvider, {
-      current: history,
-    });
+    completionProvider = new CompletionDataProvider(
+      languageProvider,
+      {
+        current: history,
+      },
+      mockTimeRange
+    );
 
     jest.spyOn(completionProvider, 'getLabelNames').mockResolvedValue(labelNames);
     jest.spyOn(completionProvider, 'getLabelValues').mockResolvedValue(labelValues);
     jest.spyOn(completionProvider, 'getParserAndLabelKeys').mockResolvedValue({
       extractedLabelKeys,
       unwrapLabelKeys,
+      structuredMetadataKeys,
       hasJSON: false,
       hasLogfmt: false,
       hasPack: false,
@@ -337,6 +367,7 @@ describe('getCompletions', () => {
       jest.spyOn(completionProvider, 'getParserAndLabelKeys').mockResolvedValue({
         extractedLabelKeys,
         unwrapLabelKeys,
+        structuredMetadataKeys,
         hasJSON: true,
         hasLogfmt: false,
         hasPack: false,
@@ -344,7 +375,7 @@ describe('getCompletions', () => {
       const situation: Situation = { type: 'AFTER_SELECTOR', logQuery: '{job="grafana"}', afterPipe, hasSpace };
       const completions = await getCompletions(situation, completionProvider);
 
-      const expected = buildAfterSelectorCompletions('json', 'logfmt', afterPipe, hasSpace);
+      const expected = buildAfterSelectorCompletions('json', 'logfmt', afterPipe, hasSpace, structuredMetadataKeys);
       expect(completions).toEqual(expected);
     }
   );
@@ -355,6 +386,7 @@ describe('getCompletions', () => {
       jest.spyOn(completionProvider, 'getParserAndLabelKeys').mockResolvedValue({
         extractedLabelKeys,
         unwrapLabelKeys,
+        structuredMetadataKeys,
         hasJSON: false,
         hasLogfmt: true,
         hasPack: false,
@@ -362,7 +394,7 @@ describe('getCompletions', () => {
       const situation: Situation = { type: 'AFTER_SELECTOR', logQuery: '', afterPipe, hasSpace: true };
       const completions = await getCompletions(situation, completionProvider);
 
-      const expected = buildAfterSelectorCompletions('logfmt', 'json', afterPipe, true);
+      const expected = buildAfterSelectorCompletions('logfmt', 'json', afterPipe, true, structuredMetadataKeys);
       expect(completions).toEqual(expected);
     }
   );
@@ -433,13 +465,18 @@ describe('getAfterSelectorCompletions', () => {
   beforeEach(() => {
     datasource = createLokiDatasource();
     languageProvider = new LokiLanguageProvider(datasource);
-    completionProvider = new CompletionDataProvider(languageProvider, {
-      current: history,
-    });
+    completionProvider = new CompletionDataProvider(
+      languageProvider,
+      {
+        current: history,
+      },
+      mockTimeRange
+    );
 
     jest.spyOn(completionProvider, 'getParserAndLabelKeys').mockResolvedValue({
       extractedLabelKeys: ['abc', 'def'],
       unwrapLabelKeys: [],
+      structuredMetadataKeys: [],
       hasJSON: true,
       hasLogfmt: false,
       hasPack: false,
@@ -462,6 +499,7 @@ describe('getAfterSelectorCompletions', () => {
     jest.spyOn(completionProvider, 'getParserAndLabelKeys').mockResolvedValue({
       extractedLabelKeys: ['abc', 'def'],
       unwrapLabelKeys: [],
+      structuredMetadataKeys: [],
       hasJSON: true,
       hasLogfmt: false,
       hasPack: true,
@@ -524,13 +562,18 @@ describe('IN_LOGFMT completions', () => {
   beforeEach(() => {
     datasource = createLokiDatasource();
     languageProvider = new LokiLanguageProvider(datasource);
-    completionProvider = new CompletionDataProvider(languageProvider, {
-      current: history,
-    });
+    completionProvider = new CompletionDataProvider(
+      languageProvider,
+      {
+        current: history,
+      },
+      mockTimeRange
+    );
 
     jest.spyOn(completionProvider, 'getParserAndLabelKeys').mockResolvedValue({
       extractedLabelKeys: ['label1', 'label2'],
       unwrapLabelKeys: [],
+      structuredMetadataKeys: [],
       hasJSON: true,
       hasLogfmt: false,
       hasPack: false,
diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completions.ts b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completions.ts
index a18ca9fded583..6bd88f0195c3f 100644
--- a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completions.ts
+++ b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completions.ts
@@ -309,7 +309,8 @@ export async function getAfterSelectorCompletions(
     query = trimEnd(logQuery, '| ');
   }
 
-  const { extractedLabelKeys, hasJSON, hasLogfmt, hasPack } = await dataProvider.getParserAndLabelKeys(query);
+  const { extractedLabelKeys, structuredMetadataKeys, hasJSON, hasLogfmt, hasPack } =
+    await dataProvider.getParserAndLabelKeys(query);
   const hasQueryParser = isQueryWithParser(query).queryWithParser;
 
   const prefix = `${hasSpace ? '' : ' '}${afterPipe ? '' : '| '}`;
@@ -326,6 +327,15 @@ export async function getAfterSelectorCompletions(
 
   const completions = [...parserCompletions, ...pipeOperations];
 
+  structuredMetadataKeys.forEach((key) => {
+    completions.push({
+      type: 'LABEL_NAME',
+      label: `${key} (detected)`,
+      insertText: `${prefix}${key}`,
+      documentation: `"${key}" was suggested based on structured metadata attached to your loglines.`,
+    });
+  });
+
   // Let's show label options only if query has parser
   if (hasQueryParser) {
     extractedLabelKeys.forEach((key) => {
diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/validation.test.ts b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/validation.test.ts
index 837775a5c72ca..d11938aff2a4e 100644
--- a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/validation.test.ts
+++ b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/validation.test.ts
@@ -1,18 +1,20 @@
+import { parser } from '@grafana/lezer-logql';
+
 import { validateQuery } from './validation';
 
 describe('Monaco Query Validation', () => {
   test('Identifies empty queries as valid', () => {
-    expect(validateQuery('', '', [])).toBeFalsy();
+    expect(validateQuery('', '', [], parser)).toBeFalsy();
   });
 
   test('Identifies valid queries', () => {
     const query = '{place="luna"}';
-    expect(validateQuery(query, query, [])).toBeFalsy();
+    expect(validateQuery(query, query, [], parser)).toBeFalsy();
   });
 
   test('Validates logs queries', () => {
     let query = '{place="incomplete"';
-    expect(validateQuery(query, query, [query])).toEqual([
+    expect(validateQuery(query, query, [query], parser)).toEqual([
       {
         endColumn: 20,
         endLineNumber: 1,
@@ -23,7 +25,7 @@ describe('Monaco Query Validation', () => {
     ]);
 
     query = '{place="luna"} | notaparser';
-    expect(validateQuery(query, query, [query])).toEqual([
+    expect(validateQuery(query, query, [query], parser)).toEqual([
       {
         endColumn: 28,
         endLineNumber: 1,
@@ -34,7 +36,7 @@ describe('Monaco Query Validation', () => {
     ]);
 
     query = '{place="luna"} | logfmt |';
-    expect(validateQuery(query, query, [query])).toEqual([
+    expect(validateQuery(query, query, [query], parser)).toEqual([
       {
         endColumn: 26,
         endLineNumber: 1,
@@ -47,7 +49,7 @@ describe('Monaco Query Validation', () => {
 
   test('Validates metric queries', () => {
     let query = 'sum(count_over_time({place="luna" | unwrap request_time [5m])) by (level)';
-    expect(validateQuery(query, query, [query])).toEqual([
+    expect(validateQuery(query, query, [query], parser)).toEqual([
       {
         endColumn: 35,
         endLineNumber: 1,
@@ -58,7 +60,7 @@ describe('Monaco Query Validation', () => {
     ]);
 
     query = 'sum(count_over_time({place="luna"} | unwrap [5m])) by (level)';
-    expect(validateQuery(query, query, [query])).toEqual([
+    expect(validateQuery(query, query, [query], parser)).toEqual([
       {
         endColumn: 45,
         endLineNumber: 1,
@@ -69,7 +71,7 @@ describe('Monaco Query Validation', () => {
     ]);
 
     query = 'sum()';
-    expect(validateQuery(query, query, [query])).toEqual([
+    expect(validateQuery(query, query, [query], parser)).toEqual([
       {
         endColumn: 5,
         endLineNumber: 1,
@@ -88,7 +90,7 @@ describe('Monaco Query Validation', () => {
 unpack fail
 |= "a"`;
     const queryLines = query.split('\n');
-    expect(validateQuery(query, query, queryLines)).toEqual([
+    expect(validateQuery(query, query, queryLines, parser)).toEqual([
       {
         endColumn: 12,
         endLineNumber: 5,
diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/validation.ts b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/validation.ts
index 117c012876a49..73e5e799d5549 100644
--- a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/validation.ts
+++ b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/validation.ts
@@ -1,7 +1,7 @@
 import { SyntaxNode } from '@lezer/common';
+import { LRParser } from '@lezer/lr';
 
-import { parser } from '@grafana/lezer-logql';
-import { ErrorId } from 'app/plugins/datasource/prometheus/querybuilder/shared/parsingUtils';
+import { ErrorId } from '../../../querybuilder/parsingUtils';
 
 interface ParserErrorBoundary {
   startLineNumber: number;
@@ -26,7 +26,8 @@ interface ParseError {
 export function validateQuery(
   query: string,
   interpolatedQuery: string,
-  queryLines: string[]
+  queryLines: string[],
+  parser: LRParser
 ): ParserErrorBoundary[] | false {
   if (!query) {
     return false;
@@ -39,14 +40,14 @@ export function validateQuery(
    * have different lengths. With this, we also exclude irrelevant parser errors that are produced by
    * lezer not understanding $variables and $__variables, which usually generate 2 or 3 error SyntaxNode.
    */
-  const interpolatedErrors: ParseError[] = parseQuery(interpolatedQuery);
+  const interpolatedErrors: ParseError[] = parseQuery(interpolatedQuery, parser);
   if (!interpolatedErrors.length) {
     return false;
   }
 
   let parseErrors: ParseError[] = interpolatedErrors;
   if (query !== interpolatedQuery) {
-    const queryErrors: ParseError[] = parseQuery(query);
+    const queryErrors: ParseError[] = parseQuery(query, parser);
     parseErrors = interpolatedErrors.flatMap(
       (interpolatedError) =>
         queryErrors.filter((queryError) => interpolatedError.text === queryError.text) || interpolatedError
@@ -56,7 +57,7 @@ export function validateQuery(
   return parseErrors.map((parseError) => findErrorBoundary(query, queryLines, parseError)).filter(isErrorBoundary);
 }
 
-function parseQuery(query: string) {
+function parseQuery(query: string, parser: LRParser) {
   const parseErrors: ParseError[] = [];
   const tree = parser.parse(query);
   tree.iterate({
@@ -115,6 +116,7 @@ function isErrorBoundary(boundary: ParserErrorBoundary | null): boundary is Pars
 
 export const placeHolderScopedVars = {
   __interval: { text: '1s', value: '1s' },
+  __rate_interval: { text: '1s', value: '1s' },
   __auto: { text: '1s', value: '1s' },
   __interval_ms: { text: '1000', value: 1000 },
   __range_ms: { text: '1000', value: 1000 },
diff --git a/public/app/plugins/datasource/loki/configuration/AlertingSettings.test.tsx b/public/app/plugins/datasource/loki/configuration/AlertingSettings.test.tsx
index 71a9d48ca7630..73686c4b3afe0 100644
--- a/public/app/plugins/datasource/loki/configuration/AlertingSettings.test.tsx
+++ b/public/app/plugins/datasource/loki/configuration/AlertingSettings.test.tsx
@@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { createDefaultConfigOptions } from '../mocks';
+import { createDefaultConfigOptions } from '../__mocks__/datasource';
 
 import { AlertingSettings } from './AlertingSettings';
 
diff --git a/public/app/plugins/datasource/loki/configuration/AlertingSettings.tsx b/public/app/plugins/datasource/loki/configuration/AlertingSettings.tsx
index 5bc969d00f872..d9c4c439ed2d9 100644
--- a/public/app/plugins/datasource/loki/configuration/AlertingSettings.tsx
+++ b/public/app/plugins/datasource/loki/configuration/AlertingSettings.tsx
@@ -1,9 +1,8 @@
 import React from 'react';
 
 import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
-import { ConfigSubSection } from '@grafana/experimental';
+import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/experimental';
 import { InlineField, InlineSwitch } from '@grafana/ui';
-import { ConfigDescriptionLink } from 'app/core/components/ConfigDescriptionLink';
 
 export function AlertingSettings({
   options,
diff --git a/public/app/plugins/datasource/loki/configuration/ConfigEditor.test.tsx b/public/app/plugins/datasource/loki/configuration/ConfigEditor.test.tsx
index 3a974a94c8509..8afc34bc0b1bc 100644
--- a/public/app/plugins/datasource/loki/configuration/ConfigEditor.test.tsx
+++ b/public/app/plugins/datasource/loki/configuration/ConfigEditor.test.tsx
@@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { createDefaultConfigOptions } from '../mocks';
+import { createDefaultConfigOptions } from '../__mocks__/datasource';
 
 import { ConfigEditor } from './ConfigEditor';
 
diff --git a/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx
index ff2ad03372944..fe57f47d35cb7 100644
--- a/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx
@@ -10,8 +10,7 @@ import {
   AdvancedHttpSettings,
 } from '@grafana/experimental';
 import { config, reportInteraction } from '@grafana/runtime';
-import { SecureSocksProxySettings } from '@grafana/ui';
-import { Divider } from 'app/core/components/Divider';
+import { Divider, SecureSocksProxySettings, Stack } from '@grafana/ui';
 
 import { LokiOptions } from '../types';
 
@@ -55,40 +54,39 @@ export const ConfigEditor = (props: Props) => {
         docsLink="https://grafana.com/docs/grafana/latest/datasources/loki/configure-loki-data-source/"
         hasRequiredFields={false}
       />
-      <Divider />
+      <Divider spacing={4} />
       <ConnectionSettings config={options} onChange={onOptionsChange} urlPlaceholder="http://localhost:3100" />
-      <Divider />
+      <Divider spacing={4} />
       <Auth
         {...convertLegacyAuthProps({
           config: options,
           onChange: onOptionsChange,
         })}
       />
-      <Divider />
+      <Divider spacing={4} />
       <ConfigSection
         title="Additional settings"
         description="Additional settings are optional settings that can be configured for more control over your data source."
         isCollapsible={true}
         isInitiallyOpen
       >
-        <AdvancedHttpSettings config={options} onChange={onOptionsChange} />
-        <Divider hideLine />
-        {config.secureSocksDSProxyEnabled && (
-          <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
-        )}
-        <AlertingSettings options={options} onOptionsChange={onOptionsChange} />
-        <Divider hideLine />
-        <QuerySettings
-          maxLines={options.jsonData.maxLines || ''}
-          onMaxLinedChange={(value) => onOptionsChange(setMaxLines(options, value))}
-          predefinedOperations={options.jsonData.predefinedOperations || ''}
-          onPredefinedOperationsChange={updatePredefinedOperations}
-        />
-        <Divider hideLine />
-        <DerivedFields
-          fields={options.jsonData.derivedFields}
-          onChange={(value) => onOptionsChange(setDerivedFields(options, value))}
-        />
+        <Stack gap={5} direction="column">
+          <AdvancedHttpSettings config={options} onChange={onOptionsChange} />
+          {config.secureSocksDSProxyEnabled && (
+            <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
+          )}
+          <AlertingSettings options={options} onOptionsChange={onOptionsChange} />
+          <QuerySettings
+            maxLines={options.jsonData.maxLines || ''}
+            onMaxLinedChange={(value) => onOptionsChange(setMaxLines(options, value))}
+            predefinedOperations={options.jsonData.predefinedOperations || ''}
+            onPredefinedOperationsChange={updatePredefinedOperations}
+          />
+          <DerivedFields
+            fields={options.jsonData.derivedFields}
+            onChange={(value) => onOptionsChange(setDerivedFields(options, value))}
+          />
+        </Stack>
       </ConfigSection>
     </>
   );
diff --git a/public/app/plugins/datasource/loki/configuration/DebugSection.test.tsx b/public/app/plugins/datasource/loki/configuration/DebugSection.test.tsx
index 6eb14771d1017..8600c84362c86 100644
--- a/public/app/plugins/datasource/loki/configuration/DebugSection.test.tsx
+++ b/public/app/plugins/datasource/loki/configuration/DebugSection.test.tsx
@@ -2,53 +2,18 @@ import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { dateTime, TimeRange } from '@grafana/data';
-import { setTemplateSrv } from '@grafana/runtime';
-
-import { getLinkSrv, LinkService, LinkSrv, setLinkSrv } from '../../../../features/panel/panellinks/link_srv';
-
 import { DebugSection } from './DebugSection';
 
-// We do not need more here and TimeSrv is hard to setup fully.
-jest.mock('app/features/dashboard/services/TimeSrv', () => ({
-  getTimeSrv: () => ({
-    timeRangeForUrl() {
-      const from = dateTime().subtract(1, 'h');
-      const to = dateTime();
-      return { from, to, raw: { from, to } };
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getTemplateSrv: () => ({
+    replace: (val: string) => {
+      return val;
     },
   }),
 }));
 
 describe('DebugSection', () => {
-  let originalLinkSrv: LinkService;
-
-  // This needs to be setup so we can test interpolation in the debugger
-  beforeAll(() => {
-    const linkService = new LinkSrv();
-    originalLinkSrv = getLinkSrv();
-    setLinkSrv(linkService);
-  });
-
-  beforeEach(() => {
-    setTemplateSrv({
-      replace(target, scopedVars, format) {
-        return target ?? '';
-      },
-      getVariables() {
-        return [];
-      },
-      containsTemplate() {
-        return false;
-      },
-      updateTimeRange(timeRange: TimeRange) {},
-    });
-  });
-
-  afterAll(() => {
-    setLinkSrv(originalLinkSrv);
-  });
-
   it('does not render any table rows if no debug text', () => {
     render(<DebugSection derivedFields={[]} />);
     expect(screen.queryByRole('row')).not.toBeInTheDocument();
diff --git a/public/app/plugins/datasource/loki/configuration/DebugSection.tsx b/public/app/plugins/datasource/loki/configuration/DebugSection.tsx
index c4a63a2ef2fcd..15bb53aa3cb87 100644
--- a/public/app/plugins/datasource/loki/configuration/DebugSection.tsx
+++ b/public/app/plugins/datasource/loki/configuration/DebugSection.tsx
@@ -1,9 +1,8 @@
 import React, { ReactNode, useState } from 'react';
 
-import { Field, FieldType, LinkModel } from '@grafana/data';
+import { getTemplateSrv } from '@grafana/runtime';
 import { InlineField, TextArea } from '@grafana/ui';
 
-import { getFieldLinksForExplore } from '../../../../features/explore/utils/links';
 import { DerivedFieldConfig } from '../types';
 
 type Props = {
@@ -24,7 +23,7 @@ export const DebugSection = (props: Props) => {
       <InlineField label="Debug log message" labelWidth={24} grow>
         <TextArea
           type="text"
-          aria-label="Prometheus Query"
+          aria-label="Loki query"
           placeholder="Paste an example log line here to test the regular expressions of your derived fields"
           value={debugText}
           onChange={(event) => setDebugText(event.currentTarget.value)}
@@ -82,36 +81,30 @@ function makeDebugFields(derivedFields: DerivedFieldConfig[], debugText: string)
     .map((field) => {
       try {
         const testMatch = debugText.match(field.matcherRegex);
+        let href;
         const value = testMatch && testMatch[1];
-        let link: LinkModel<Field> | null = null;
 
-        if (field.url && value) {
-          link = getFieldLinksForExplore({
-            field: {
-              name: '',
-              type: FieldType.string,
-              values: [value],
-              config: {
-                links: [{ title: '', url: field.url }],
+        if (value) {
+          href = getTemplateSrv().replace(field.url, {
+            __value: {
+              value: {
+                raw: value,
               },
+              text: 'Raw value',
             },
-            rowIndex: 0,
-            range: {} as any,
-          })[0];
+          });
         }
-
-        const result: DebugField = {
+        const debugFiled: DebugField = {
           name: field.name,
           value: value || '<no match>',
-          href: link ? link.href : undefined,
+          href,
         };
-        return result;
+        return debugFiled;
       } catch (error) {
-        const result: DebugField = {
+        return {
           name: field.name,
           error,
         };
-        return result;
       }
     });
 }
diff --git a/public/app/plugins/datasource/loki/configuration/DerivedField.tsx b/public/app/plugins/datasource/loki/configuration/DerivedField.tsx
index b6cff64c3ca55..c135c1458feab 100644
--- a/public/app/plugins/datasource/loki/configuration/DerivedField.tsx
+++ b/public/app/plugins/datasource/loki/configuration/DerivedField.tsx
@@ -3,11 +3,13 @@ import React, { ChangeEvent, useEffect, useState } from 'react';
 import { usePrevious } from 'react-use';
 
 import { GrafanaTheme2, DataSourceInstanceSettings, VariableSuggestion } from '@grafana/data';
-import { Button, DataLinkInput, Field, Icon, Input, Label, Tooltip, useStyles2, Switch } from '@grafana/ui';
-import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker';
+import { DataSourcePicker } from '@grafana/runtime';
+import { Button, DataLinkInput, Field, Icon, Input, Label, Tooltip, useStyles2, Select, Switch } from '@grafana/ui';
 
 import { DerivedFieldConfig } from '../types';
 
+type MatcherType = 'label' | 'regex';
+
 const getStyles = (theme: GrafanaTheme2) => ({
   row: css`
     display: flex;
@@ -32,6 +34,10 @@ const getStyles = (theme: GrafanaTheme2) => ({
     margin-right: ${theme.spacing(1)};
   `,
   dataSource: css``,
+  nameMatcherField: css({
+    width: theme.spacing(20),
+    marginRight: theme.spacing(0.5),
+  }),
 });
 
 type Props = {
@@ -47,6 +53,7 @@ export const DerivedField = (props: Props) => {
   const styles = useStyles2(getStyles);
   const [showInternalLink, setShowInternalLink] = useState(!!value.datasourceUid);
   const previousUid = usePrevious(value.datasourceUid);
+  const [fieldType, setFieldType] = useState<MatcherType>(value.matcherType ?? 'regex');
 
   // Force internal link visibility change if uid changed outside of this component.
   useEffect(() => {
@@ -74,13 +81,46 @@ export const DerivedField = (props: Props) => {
           <Input value={value.name} onChange={handleChange('name')} placeholder="Field name" invalid={invalidName} />
         </Field>
         <Field
-          className={styles.regexField}
+          className={styles.nameMatcherField}
           label={
             <TooltipLabel
-              label="Regex"
-              content="Use to parse and capture some part of the log message. You can use the captured groups in the template."
+              label="Type"
+              content="Derived fields can be created from labels or by applying a regular expression to the log message."
             />
           }
+        >
+          <Select
+            options={[
+              { label: 'Regex in log line', value: 'regex' },
+              { label: 'Label', value: 'label' },
+            ]}
+            value={fieldType}
+            onChange={(type) => {
+              // make sure this is a valid MatcherType
+              if (type.value === 'label' || type.value === 'regex') {
+                setFieldType(type.value);
+                onChange({
+                  ...value,
+                  matcherType: type.value,
+                });
+              }
+            }}
+          />
+        </Field>
+        <Field
+          className={styles.regexField}
+          label={
+            <>
+              {fieldType === 'regex' && (
+                <TooltipLabel
+                  label="Regex"
+                  content="Use to parse and capture some part of the log message. You can use the captured groups in the template."
+                />
+              )}
+
+              {fieldType === 'label' && <TooltipLabel label="Label" content="Use to derive the field from a label." />}
+            </>
+          }
         >
           <Input value={value.matcherRegex} onChange={handleChange('matcherRegex')} />
         </Field>
diff --git a/public/app/plugins/datasource/loki/configuration/DerivedFields.test.tsx b/public/app/plugins/datasource/loki/configuration/DerivedFields.test.tsx
index dc387e26f35fb..f8e5bc24d4fb9 100644
--- a/public/app/plugins/datasource/loki/configuration/DerivedFields.test.tsx
+++ b/public/app/plugins/datasource/loki/configuration/DerivedFields.test.tsx
@@ -35,7 +35,8 @@ describe('DerivedFields', () => {
     const onChange = jest.fn();
     render(<DerivedFields onChange={onChange} />);
 
-    userEvent.click(screen.getByText('Add'));
+    const addButton = await screen.findByText('Add');
+    await userEvent.click(addButton);
 
     await waitFor(() => expect(onChange).toHaveBeenCalledTimes(1));
   });
@@ -44,7 +45,7 @@ describe('DerivedFields', () => {
     const onChange = jest.fn();
     render(<DerivedFields fields={testFields} onChange={onChange} />);
 
-    userEvent.click((await screen.findAllByTitle('Remove field'))[0]);
+    await userEvent.click((await screen.findAllByTitle('Remove field'))[0]);
 
     await waitFor(() => expect(onChange).toHaveBeenCalledWith([testFields[1]]));
   });
@@ -62,12 +63,13 @@ describe('DerivedFields', () => {
     ];
     render(<DerivedFields onChange={jest.fn()} fields={repeatedFields} />);
 
-    userEvent.click(screen.getAllByPlaceholderText('Field name')[0]);
+    const inputs = await screen.findAllByPlaceholderText('Field name');
+    await userEvent.click(inputs[0]);
 
     expect(await screen.findAllByText('The name is already in use')).toHaveLength(2);
   });
 
-  it('does not validate empty names as repeated', () => {
+  it('does not validate empty names as repeated', async () => {
     const repeatedFields = [
       {
         matcherRegex: '',
@@ -80,7 +82,8 @@ describe('DerivedFields', () => {
     ];
     render(<DerivedFields onChange={jest.fn()} fields={repeatedFields} />);
 
-    userEvent.click(screen.getAllByPlaceholderText('Field name')[0]);
+    const inputs = await screen.findAllByPlaceholderText('Field name');
+    await userEvent.click(inputs[0]);
 
     expect(screen.queryByText('The name is already in use')).not.toBeInTheDocument();
   });
diff --git a/public/app/plugins/datasource/loki/configuration/DerivedFields.tsx b/public/app/plugins/datasource/loki/configuration/DerivedFields.tsx
index 2c7840b995138..a8c28adb78007 100644
--- a/public/app/plugins/datasource/loki/configuration/DerivedFields.tsx
+++ b/public/app/plugins/datasource/loki/configuration/DerivedFields.tsx
@@ -2,9 +2,8 @@ import { css } from '@emotion/css';
 import React, { useCallback, useState } from 'react';
 
 import { GrafanaTheme2, VariableOrigin, DataLinkBuiltInVars } from '@grafana/data';
-import { ConfigSubSection } from '@grafana/experimental';
+import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/experimental';
 import { Button, useTheme2 } from '@grafana/ui';
-import { ConfigDescriptionLink } from 'app/core/components/ConfigDescriptionLink';
 
 import { DerivedFieldConfig } from '../types';
 
@@ -91,7 +90,14 @@ export const DerivedFields = ({ fields = [], onChange }: Props) => {
             icon="plus"
             onClick={(event) => {
               event.preventDefault();
-              const newDerivedFields = [...fields, { name: '', matcherRegex: '', urlDisplayLabel: '', url: '' }];
+              const emptyConfig: DerivedFieldConfig = {
+                name: '',
+                matcherRegex: '',
+                urlDisplayLabel: '',
+                url: '',
+                matcherType: 'regex',
+              };
+              const newDerivedFields = [...fields, emptyConfig];
               onChange(newDerivedFields);
             }}
           >
diff --git a/public/app/plugins/datasource/loki/configuration/QuerySettings.tsx b/public/app/plugins/datasource/loki/configuration/QuerySettings.tsx
index 27b2265c7c1bf..7cdbc8a2777fb 100644
--- a/public/app/plugins/datasource/loki/configuration/QuerySettings.tsx
+++ b/public/app/plugins/datasource/loki/configuration/QuerySettings.tsx
@@ -1,9 +1,8 @@
 import React from 'react';
 
-import { ConfigSubSection } from '@grafana/experimental';
+import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/experimental';
 import { config } from '@grafana/runtime';
 import { Badge, InlineField, InlineFieldRow, Input } from '@grafana/ui';
-import { ConfigDescriptionLink } from 'app/core/components/ConfigDescriptionLink';
 
 type Props = {
   maxLines: string;
diff --git a/public/app/plugins/datasource/loki/dataquery.cue b/public/app/plugins/datasource/loki/dataquery.cue
index 97adc14a1450c..97bc3103ef872 100644
--- a/public/app/plugins/datasource/loki/dataquery.cue
+++ b/public/app/plugins/datasource/loki/dataquery.cue
@@ -47,7 +47,7 @@ composableKinds: DataQuery: {
 
 				#LokiQueryType: "range" | "instant" | "stream" @cuetsy(kind="enum")
 
-				#SupportingQueryType: "logsVolume" | "logsSample" | "dataSample" @cuetsy(kind="enum")
+				#SupportingQueryType: "logsVolume" | "logsSample" | "dataSample" | "infiniteScroll" @cuetsy(kind="enum")
 
 				#LokiQueryDirection: "forward" | "backward" @cuetsy(kind="enum")
 			}
diff --git a/public/app/plugins/datasource/loki/dataquery.gen.ts b/public/app/plugins/datasource/loki/dataquery.gen.ts
index 0a3ffb479e817..063deb3ee2f40 100644
--- a/public/app/plugins/datasource/loki/dataquery.gen.ts
+++ b/public/app/plugins/datasource/loki/dataquery.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
@@ -23,6 +23,7 @@ export enum LokiQueryType {
 
 export enum SupportingQueryType {
   DataSample = 'dataSample',
+  InfiniteScroll = 'infiniteScroll',
   LogsSample = 'logsSample',
   LogsVolume = 'logsVolume',
 }
@@ -32,7 +33,7 @@ export enum LokiQueryDirection {
   Forward = 'forward',
 }
 
-export interface Loki extends common.DataQuery {
+export interface LokiDataQuery extends common.DataQuery {
   editorMode?: QueryEditorMode;
   /**
    * The LogQL query.
diff --git a/public/app/plugins/datasource/loki/datasource.test.ts b/public/app/plugins/datasource/loki/datasource.test.ts
index 20048a76d29fd..8509269a28b97 100644
--- a/public/app/plugins/datasource/loki/datasource.test.ts
+++ b/public/app/plugins/datasource/loki/datasource.test.ts
@@ -1,19 +1,24 @@
 import { of } from 'rxjs';
 import { take } from 'rxjs/operators';
-import { getQueryOptions } from 'test/helpers/getQueryOptions';
 
 import {
   AbstractLabelOperator,
   AnnotationQueryRequest,
   CoreApp,
+  CustomVariableModel,
   DataFrame,
   dataFrameToJSON,
   DataQueryResponse,
   DataSourceInstanceSettings,
   dateTime,
   FieldType,
+  QueryFixAction,
   SupplementaryQueryType,
+  toDataFrame,
+  TimeRange,
   ToggleFilterAction,
+  DataQueryRequest,
+  ScopedVars,
 } from '@grafana/data';
 import {
   BackendSrv,
@@ -23,18 +28,15 @@ import {
   getBackendSrv,
   reportInteraction,
   setBackendSrv,
+  TemplateSrv,
 } from '@grafana/runtime';
-import { TemplateSrv } from 'app/features/templating/template_srv';
-
-import { initialCustomVariableModelState } from '../../../features/variables/custom/reducer';
-import { CustomVariableModel } from '../../../features/variables/types';
 
+import { LokiVariableSupport } from './LokiVariableSupport';
+import { createLokiDatasource } from './__mocks__/datasource';
+import { createMetadataRequest } from './__mocks__/metadataRequest';
 import { LokiDatasource, REF_ID_DATA_SAMPLES } from './datasource';
-import { createLokiDatasource, createMetadataRequest } from './mocks';
 import { runSplitQuery } from './querySplitting';
-import { parseToNodeNamesArray } from './queryUtils';
 import { LokiOptions, LokiQuery, LokiQueryType, LokiVariableQueryType, SupportingQueryType } from './types';
-import { LokiVariableSupport } from './variables';
 
 jest.mock('@grafana/runtime', () => {
   return {
@@ -46,7 +48,6 @@ jest.mock('@grafana/runtime', () => {
 jest.mock('./querySplitting');
 
 const templateSrvStub = {
-  getAdhocFilters: jest.fn(() => [] as unknown[]),
   replace: jest.fn((a: string, ...rest: unknown[]) => a),
 } as unknown as TemplateSrv;
 
@@ -115,6 +116,23 @@ const testLogsResponse: FetchResponse = {
   config: {} as unknown as BackendSrvRequest,
 };
 
+const mockTimeRange = {
+  from: dateTime(0),
+  to: dateTime(1),
+  raw: { from: dateTime(0), to: dateTime(1) },
+};
+
+const baseRequestOptions = {
+  requestId: '',
+  interval: '',
+  intervalMs: 1,
+  range: mockTimeRange,
+  scopedVars: {},
+  timezone: '',
+  app: '',
+  startTime: 1,
+};
+
 interface AdHocFilter {
   condition: string;
   key: string;
@@ -153,10 +171,11 @@ describe('LokiDatasource', () => {
       // and applyTemplateVariables is a convenient place to do that.
       const spy = jest.spyOn(ds, 'applyTemplateVariables');
 
-      const options = getQueryOptions<LokiQuery>({
+      const options: DataQueryRequest<LokiQuery> = {
+        ...baseRequestOptions,
         targets: [{ expr: '{a="b"}', refId: 'B', maxLines: queryMaxLines }],
         app: app ?? CoreApp.Dashboard,
-      });
+      };
 
       const fetchMock = jest.fn().mockReturnValue(of({ data: testLogsResponse }));
       setBackendSrv({ ...origBackendSrv, fetch: fetchMock });
@@ -190,7 +209,7 @@ describe('LokiDatasource', () => {
         expect.objectContaining({
           query_type: 'logs',
           line_limit: 80,
-          parsed_query: parseToNodeNamesArray('{a="b"}').join(','),
+          obfuscated_query: '{Identifier=String}',
         })
       );
     });
@@ -207,7 +226,7 @@ describe('LokiDatasource', () => {
         expect.objectContaining({
           query_type: 'logs',
           line_limit: 80,
-          parsed_query: parseToNodeNamesArray('{a="b"}').join(','),
+          obfuscated_query: '{Identifier=String}',
         })
       );
     });
@@ -216,7 +235,6 @@ describe('LokiDatasource', () => {
   describe('When using adhoc filters', () => {
     const DEFAULT_EXPR = 'rate({bar="baz", job="foo"} |= "bar" [5m])';
     const query: LokiQuery = { expr: DEFAULT_EXPR, refId: 'A' };
-    const mockedGetAdhocFilters = templateSrvStub.getAdhocFilters as jest.Mock;
     const ds = createLokiDatasource(templateSrvStub);
 
     it('should not modify expression with no filters', async () => {
@@ -224,7 +242,7 @@ describe('LokiDatasource', () => {
     });
 
     it('should add filters to expression', async () => {
-      mockedGetAdhocFilters.mockReturnValue([
+      const adhocFilters = [
         {
           key: 'k1',
           operator: '=',
@@ -235,15 +253,15 @@ describe('LokiDatasource', () => {
           operator: '!=',
           value: 'v2',
         },
-      ]);
+      ];
 
-      expect(ds.applyTemplateVariables(query, {}).expr).toBe(
+      expect(ds.applyTemplateVariables(query, {}, adhocFilters).expr).toBe(
         'rate({bar="baz", job="foo", k1="v1", k2!="v2"} |= "bar" [5m])'
       );
     });
 
     it('should add escaping if needed to regex filter expressions', async () => {
-      mockedGetAdhocFilters.mockReturnValue([
+      const adhocFilters = [
         {
           key: 'k1',
           operator: '=~',
@@ -254,8 +272,8 @@ describe('LokiDatasource', () => {
           operator: '=~',
           value: `v'.*`,
         },
-      ]);
-      expect(ds.applyTemplateVariables(query, {}).expr).toBe(
+      ];
+      expect(ds.applyTemplateVariables(query, {}, adhocFilters).expr).toBe(
         'rate({bar="baz", job="foo", k1=~"v.*", k2=~"v\\\\\'.*"} |= "bar" [5m])'
       );
     });
@@ -267,7 +285,7 @@ describe('LokiDatasource', () => {
 
     beforeEach(() => {
       ds = createLokiDatasource(templateSrvStub);
-      variable = { ...initialCustomVariableModelState };
+      variable = {} as unknown as CustomVariableModel;
     });
 
     it('should only escape single quotes', () => {
@@ -318,8 +336,8 @@ describe('LokiDatasource', () => {
           expr,
         },
       ];
-      ds.interpolateVariablesInQueries(queries, {});
-      expect(ds.addAdHocFilters).toHaveBeenCalledWith(expr);
+      ds.interpolateVariablesInQueries(queries, {}, []);
+      expect(ds.addAdHocFilters).toHaveBeenCalledWith(expr, []);
     });
   });
 
@@ -479,6 +497,21 @@ describe('LokiDatasource', () => {
       return { ds };
     };
 
+    it('should return empty array if /series returns empty', async () => {
+      const ds = createLokiDatasource(templateSrvStub);
+      const spy = jest.spyOn(ds.languageProvider, 'fetchSeriesLabels').mockResolvedValue({});
+
+      const result = await ds.metricFindQuery({
+        refId: 'test',
+        type: LokiVariableQueryType.LabelValues,
+        stream: '{label1="value1"}',
+        label: 'label2',
+      });
+
+      expect(result).toEqual([]);
+      spy.mockClear();
+    });
+
     it('should return label names for Loki', async () => {
       const { ds } = getTestContext();
 
@@ -552,6 +585,28 @@ describe('LokiDatasource', () => {
   });
 
   describe('modifyQuery', () => {
+    const frameWithTypes = toDataFrame({
+      fields: [
+        { name: 'Time', type: FieldType.time, values: [0] },
+        {
+          name: 'Line',
+          type: FieldType.string,
+          values: ['line1'],
+        },
+        { name: 'labelTypes', type: FieldType.other, values: [{ indexed: 'I', parsed: 'P', structured: 'S' }] },
+      ],
+    });
+    const frameWithoutTypes = toDataFrame({
+      fields: [
+        { name: 'Time', type: FieldType.time, values: [0] },
+        {
+          name: 'Line',
+          type: FieldType.string,
+          values: ['line1'],
+        },
+        { name: 'labels', type: FieldType.other, values: [{ job: 'test' }] },
+      ],
+    });
     describe('when called with ADD_FILTER', () => {
       let ds: LokiDatasource;
       beforeEach(() => {
@@ -587,14 +642,186 @@ describe('LokiDatasource', () => {
           expect(result.expr).toEqual('rate({bar="baz", job="grafana"}[5m])');
         });
 
-        it('then the correct label should be added for non-indexed metadata as LabelFilter', () => {
-          const query: LokiQuery = { refId: 'A', expr: '{bar="baz"}' };
-          const action = { options: { key: 'job', value: 'grafana' }, type: 'ADD_FILTER' };
-          ds.languageProvider.labelKeys = ['bar'];
-          const result = ds.modifyQuery(query, action);
+        describe('with a frame with label types', () => {
+          it('then the correct structured metadata label should be added as LabelFilter', () => {
+            const query: LokiQuery = { refId: 'A', expr: '{bar="baz"}' };
 
-          expect(result.refId).toEqual('A');
-          expect(result.expr).toEqual('{bar="baz"} | job=`grafana`');
+            const action: QueryFixAction = {
+              options: { key: 'structured', value: 'foo' },
+              type: 'ADD_FILTER',
+              frame: frameWithTypes,
+            };
+            ds.languageProvider.labelKeys = ['bar'];
+            const result = ds.modifyQuery(query, action);
+
+            expect(result.refId).toEqual('A');
+            expect(result.expr).toEqual('{bar="baz"} | structured=`foo`');
+          });
+
+          it('then the correct parsed label should be added as LabelFilter', () => {
+            const query: LokiQuery = { refId: 'A', expr: '{bar="baz"}' };
+
+            const action: QueryFixAction = {
+              options: { key: 'parsed', value: 'foo' },
+              type: 'ADD_FILTER',
+              frame: frameWithTypes,
+            };
+            ds.languageProvider.labelKeys = ['bar'];
+            const result = ds.modifyQuery(query, action);
+
+            expect(result.refId).toEqual('A');
+            expect(result.expr).toEqual('{bar="baz"} | parsed=`foo`');
+          });
+
+          it('then the correct indexed label should be added as LabelFilter', () => {
+            const query: LokiQuery = { refId: 'A', expr: '{bar="baz"}' };
+
+            const action: QueryFixAction = {
+              options: { key: 'indexed', value: 'foo' },
+              type: 'ADD_FILTER',
+              frame: frameWithTypes,
+            };
+            ds.languageProvider.labelKeys = ['bar'];
+            const result = ds.modifyQuery(query, action);
+
+            expect(result.refId).toEqual('A');
+            expect(result.expr).toEqual('{bar="baz", indexed="foo"}');
+          });
+
+          it('then the correct structured metadata label should be added as LabelFilter with parser', () => {
+            const query: LokiQuery = { refId: 'A', expr: '{bar="baz"} | json' };
+
+            const action: QueryFixAction = {
+              options: { key: 'structured', value: 'foo' },
+              type: 'ADD_FILTER',
+              frame: frameWithTypes,
+            };
+            ds.languageProvider.labelKeys = ['bar'];
+            const result = ds.modifyQuery(query, action);
+
+            expect(result.refId).toEqual('A');
+            expect(result.expr).toEqual('{bar="baz"} | json | structured=`foo`');
+          });
+
+          it('then the correct parsed label should be added as LabelFilter with parser', () => {
+            const query: LokiQuery = { refId: 'A', expr: '{bar="baz"} | json' };
+
+            const action: QueryFixAction = {
+              options: { key: 'parsed', value: 'foo' },
+              type: 'ADD_FILTER',
+              frame: frameWithTypes,
+            };
+            ds.languageProvider.labelKeys = ['bar'];
+            const result = ds.modifyQuery(query, action);
+
+            expect(result.refId).toEqual('A');
+            expect(result.expr).toEqual('{bar="baz"} | json | parsed=`foo`');
+          });
+
+          it('then the correct indexed label should be added as LabelFilter with parser', () => {
+            const query: LokiQuery = { refId: 'A', expr: '{bar="baz"} | json' };
+
+            const action: QueryFixAction = {
+              options: { key: 'indexed', value: 'foo' },
+              type: 'ADD_FILTER',
+              frame: frameWithTypes,
+            };
+            ds.languageProvider.labelKeys = ['bar'];
+            const result = ds.modifyQuery(query, action);
+
+            expect(result.refId).toEqual('A');
+            expect(result.expr).toEqual('{bar="baz", indexed="foo"} | json');
+          });
+        });
+        describe('with a frame without label types', () => {
+          it('then the correct structured metadata label should be added as LabelFilter', () => {
+            const query: LokiQuery = { refId: 'A', expr: '{bar="baz"}' };
+
+            const action: QueryFixAction = {
+              options: { key: 'structured', value: 'foo' },
+              type: 'ADD_FILTER',
+              frame: frameWithoutTypes,
+            };
+            ds.languageProvider.labelKeys = ['bar'];
+            const result = ds.modifyQuery(query, action);
+
+            expect(result.refId).toEqual('A');
+            expect(result.expr).toEqual('{bar="baz", structured="foo"}');
+          });
+
+          it('then the correct parsed label should be added to the stream selector', () => {
+            const query: LokiQuery = { refId: 'A', expr: '{bar="baz"}' };
+
+            const action: QueryFixAction = {
+              options: { key: 'parsed', value: 'foo' },
+              type: 'ADD_FILTER',
+              frame: frameWithoutTypes,
+            };
+            ds.languageProvider.labelKeys = ['bar'];
+            const result = ds.modifyQuery(query, action);
+
+            expect(result.refId).toEqual('A');
+            expect(result.expr).toEqual('{bar="baz", parsed="foo"}');
+          });
+
+          it('then the correct indexed label should be added as LabelFilter', () => {
+            const query: LokiQuery = { refId: 'A', expr: '{bar="baz"}' };
+
+            const action: QueryFixAction = {
+              options: { key: 'indexed', value: 'foo' },
+              type: 'ADD_FILTER',
+              frame: frameWithoutTypes,
+            };
+            ds.languageProvider.labelKeys = ['bar'];
+            const result = ds.modifyQuery(query, action);
+
+            expect(result.refId).toEqual('A');
+            expect(result.expr).toEqual('{bar="baz", indexed="foo"}');
+          });
+          it('then the correct structured metadata label should be added as LabelFilter with parser', () => {
+            const query: LokiQuery = { refId: 'A', expr: '{bar="baz"} | json' };
+
+            const action: QueryFixAction = {
+              options: { key: 'structured', value: 'foo' },
+              type: 'ADD_FILTER',
+              frame: frameWithoutTypes,
+            };
+            ds.languageProvider.labelKeys = ['bar'];
+            const result = ds.modifyQuery(query, action);
+
+            expect(result.refId).toEqual('A');
+            expect(result.expr).toEqual('{bar="baz"} | json | structured=`foo`');
+          });
+
+          it('then the correct parsed label should be added as LabelFilter with parser', () => {
+            const query: LokiQuery = { refId: 'A', expr: '{bar="baz"} | json' };
+
+            const action: QueryFixAction = {
+              options: { key: 'parsed', value: 'foo' },
+              type: 'ADD_FILTER',
+              frame: frameWithoutTypes,
+            };
+            ds.languageProvider.labelKeys = ['bar'];
+            const result = ds.modifyQuery(query, action);
+
+            expect(result.refId).toEqual('A');
+            expect(result.expr).toEqual('{bar="baz"} | json | parsed=`foo`');
+          });
+
+          it('then the correct indexed label should be added as LabelFilter with parser', () => {
+            const query: LokiQuery = { refId: 'A', expr: '{bar="baz"} | json' };
+
+            const action: QueryFixAction = {
+              options: { key: 'indexed', value: 'foo' },
+              type: 'ADD_FILTER',
+              frame: frameWithoutTypes,
+            };
+            ds.languageProvider.labelKeys = ['bar'];
+            const result = ds.modifyQuery(query, action);
+
+            expect(result.refId).toEqual('A');
+            expect(result.expr).toEqual('{bar="baz"} | json | indexed=`foo`');
+          });
         });
       });
       describe('and query has parser', () => {
@@ -676,6 +903,50 @@ describe('LokiDatasource', () => {
         });
       });
     });
+
+    describe('when called with ADD_LINE_FILTER', () => {
+      let ds: LokiDatasource;
+      const query: LokiQuery = { refId: 'A', expr: '{bar="baz"}' };
+      beforeEach(() => {
+        ds = createLokiDatasource(templateSrvStub);
+        ds.languageProvider.labelKeys = ['bar', 'job'];
+      });
+
+      it('adds a line filter', () => {
+        const action = { options: {}, type: 'ADD_LINE_FILTER' };
+        const result = ds.modifyQuery(query, action);
+
+        expect(result.expr).toEqual('{bar="baz"} |= ``');
+      });
+      it('adds a line filter with a value', () => {
+        const action = { options: { value: 'value' }, type: 'ADD_LINE_FILTER' };
+        const result = ds.modifyQuery(query, action);
+
+        expect(result.expr).toEqual('{bar="baz"} |= `value`');
+      });
+    });
+
+    describe('when called with ADD_LINE_FILTER_OUT', () => {
+      let ds: LokiDatasource;
+      const query: LokiQuery = { refId: 'A', expr: '{bar="baz"}' };
+      beforeEach(() => {
+        ds = createLokiDatasource(templateSrvStub);
+        ds.languageProvider.labelKeys = ['bar', 'job'];
+      });
+
+      it('adds a line filter', () => {
+        const action = { options: {}, type: 'ADD_LINE_FILTER_OUT' };
+        const result = ds.modifyQuery(query, action);
+
+        expect(result.expr).toEqual('{bar="baz"} != ``');
+      });
+      it('adds a line filter with a value', () => {
+        const action = { options: { value: 'value' }, type: 'ADD_LINE_FILTER_OUT' };
+        const result = ds.modifyQuery(query, action);
+
+        expect(result.expr).toEqual('{bar="baz"} != `value`');
+      });
+    });
   });
 
   describe('toggleQueryFilter', () => {
@@ -852,119 +1123,123 @@ describe('LokiDatasource', () => {
 
   describe('addAdHocFilters', () => {
     let ds: LokiDatasource;
-    const createTemplateSrvMock = (options: { adHocFilters: AdHocFilter[] }) => {
-      return {
-        getAdhocFilters: (): AdHocFilter[] => options.adHocFilters,
-        replace: (a: string) => a,
-      } as unknown as TemplateSrv;
-    };
     describe('when called with "=" operator', () => {
       beforeEach(() => {
-        const defaultAdHocFilters: AdHocFilter[] = [
-          {
-            condition: '',
-            key: 'job',
-            operator: '=',
-            value: 'grafana',
-          },
-        ];
-        ds = createLokiDatasource(createTemplateSrvMock({ adHocFilters: defaultAdHocFilters }));
+        ds = createLokiDatasource();
       });
+      const defaultAdHocFilters: AdHocFilter[] = [
+        {
+          condition: '',
+          key: 'job',
+          operator: '=',
+          value: 'grafana',
+        },
+      ];
       describe('and query has no parser', () => {
         it('then the correct label should be added for logs query', () => {
-          assertAdHocFilters('{bar="baz"}', '{bar="baz", job="grafana"}', ds);
+          assertAdHocFilters('{bar="baz"}', '{bar="baz", job="grafana"}', ds, defaultAdHocFilters);
         });
 
         it('then the correct label should be added for metrics query', () => {
-          assertAdHocFilters('rate({bar="baz"}[5m])', 'rate({bar="baz", job="grafana"}[5m])', ds);
+          assertAdHocFilters('rate({bar="baz"}[5m])', 'rate({bar="baz", job="grafana"}[5m])', ds, defaultAdHocFilters);
         });
 
         it('then the correct label should be added for metrics query and variable', () => {
-          assertAdHocFilters('rate({bar="baz"}[$__interval])', 'rate({bar="baz", job="grafana"}[$__interval])', ds);
+          assertAdHocFilters(
+            'rate({bar="baz"}[$__interval])',
+            'rate({bar="baz", job="grafana"}[$__interval])',
+            ds,
+            defaultAdHocFilters
+          );
         });
 
         it('then the correct label should be added for logs query with empty selector', () => {
-          assertAdHocFilters('{}', '{job="grafana"}', ds);
+          assertAdHocFilters('{}', '{job="grafana"}', ds, defaultAdHocFilters);
         });
 
         it('then the correct label should be added for metrics query with empty selector', () => {
-          assertAdHocFilters('rate({}[5m])', 'rate({job="grafana"}[5m])', ds);
+          assertAdHocFilters('rate({}[5m])', 'rate({job="grafana"}[5m])', ds, defaultAdHocFilters);
         });
 
         it('then the correct label should be added for metrics query with empty selector and variable', () => {
-          assertAdHocFilters('rate({}[$__interval])', 'rate({job="grafana"}[$__interval])', ds);
+          assertAdHocFilters('rate({}[$__interval])', 'rate({job="grafana"}[$__interval])', ds, defaultAdHocFilters);
         });
         it('should correctly escape special characters in ad hoc filter', () => {
-          const ds = createLokiDatasource(
-            createTemplateSrvMock({
-              adHocFilters: [
-                {
-                  condition: '',
-                  key: 'instance',
-                  operator: '=',
-                  value: '"test"',
-                },
-              ],
-            })
-          );
-          assertAdHocFilters('{job="grafana"}', '{job="grafana", instance="\\"test\\""}', ds);
+          assertAdHocFilters('{job="grafana"}', '{job="grafana", instance="\\"test\\""}', ds, [
+            {
+              condition: '',
+              key: 'instance',
+              operator: '=',
+              value: '"test"',
+            },
+          ]);
         });
       });
       describe('and query has parser', () => {
         it('then the correct label should be added for logs query', () => {
-          assertAdHocFilters('{bar="baz"} | logfmt', '{bar="baz"} | logfmt | job=`grafana`', ds);
+          assertAdHocFilters('{bar="baz"} | logfmt', '{bar="baz"} | logfmt | job=`grafana`', ds, defaultAdHocFilters);
         });
         it('then the correct label should be added for metrics query', () => {
-          assertAdHocFilters('rate({bar="baz"} | logfmt [5m])', 'rate({bar="baz"} | logfmt | job=`grafana` [5m])', ds);
+          assertAdHocFilters(
+            'rate({bar="baz"} | logfmt [5m])',
+            'rate({bar="baz"} | logfmt | job=`grafana` [5m])',
+            ds,
+            defaultAdHocFilters
+          );
         });
       });
     });
 
     describe('when called with "!=" operator', () => {
+      const defaultAdHocFilters: AdHocFilter[] = [
+        {
+          condition: '',
+          key: 'job',
+          operator: '!=',
+          value: 'grafana',
+        },
+      ];
       beforeEach(() => {
-        const defaultAdHocFilters: AdHocFilter[] = [
-          {
-            condition: '',
-            key: 'job',
-            operator: '!=',
-            value: 'grafana',
-          },
-        ];
-        ds = createLokiDatasource(createTemplateSrvMock({ adHocFilters: defaultAdHocFilters }));
+        ds = createLokiDatasource();
       });
       describe('and query has no parser', () => {
         it('then the correct label should be added for logs query', () => {
-          assertAdHocFilters('{bar="baz"}', '{bar="baz", job!="grafana"}', ds);
+          assertAdHocFilters('{bar="baz"}', '{bar="baz", job!="grafana"}', ds, defaultAdHocFilters);
         });
 
         it('then the correct label should be added for metrics query', () => {
-          assertAdHocFilters('rate({bar="baz"}[5m])', 'rate({bar="baz", job!="grafana"}[5m])', ds);
+          assertAdHocFilters('rate({bar="baz"}[5m])', 'rate({bar="baz", job!="grafana"}[5m])', ds, defaultAdHocFilters);
         });
       });
       describe('and query has parser', () => {
         it('then the correct label should be added for logs query', () => {
-          assertAdHocFilters('{bar="baz"} | logfmt', '{bar="baz"} | logfmt | job!=`grafana`', ds);
+          assertAdHocFilters('{bar="baz"} | logfmt', '{bar="baz"} | logfmt | job!=`grafana`', ds, defaultAdHocFilters);
         });
         it('then the correct label should be added for metrics query', () => {
-          assertAdHocFilters('rate({bar="baz"} | logfmt [5m])', 'rate({bar="baz"} | logfmt | job!=`grafana` [5m])', ds);
+          assertAdHocFilters(
+            'rate({bar="baz"} | logfmt [5m])',
+            'rate({bar="baz"} | logfmt | job!=`grafana` [5m])',
+            ds,
+            defaultAdHocFilters
+          );
         });
       });
     });
 
     describe('when called with regex operator', () => {
+      const defaultAdHocFilters: AdHocFilter[] = [
+        {
+          condition: '',
+          key: 'instance',
+          operator: '=~',
+          value: '.*',
+        },
+      ];
       beforeEach(() => {
-        const defaultAdHocFilters: AdHocFilter[] = [
-          {
-            condition: '',
-            key: 'instance',
-            operator: '=~',
-            value: '.*',
-          },
-        ];
-        ds = createLokiDatasource(createTemplateSrvMock({ adHocFilters: defaultAdHocFilters }));
+        ds = createLokiDatasource();
       });
       it('should not escape special characters in ad hoc filter', () => {
-        assertAdHocFilters('{job="grafana"}', '{job="grafana", instance=~".*"}', ds);
+        assertAdHocFilters('{job="grafana"}', '{job="grafana", instance=~".*"}', ds, defaultAdHocFilters);
       });
     });
   });
@@ -976,38 +1251,42 @@ describe('LokiDatasource', () => {
     });
 
     it('creates provider for logs query', () => {
-      const options = getQueryOptions<LokiQuery>({
-        targets: [{ expr: '{label=value}', refId: 'A', queryType: LokiQueryType.Range }],
-      });
+      const options: DataQueryRequest<LokiQuery> = {
+        ...baseRequestOptions,
+        targets: [{ expr: '{label="value"}', refId: 'A', queryType: LokiQueryType.Range }],
+      };
 
-      expect(ds.getDataProvider(SupplementaryQueryType.LogsVolume, options)).toBeDefined();
+      expect(ds.getSupplementaryRequest(SupplementaryQueryType.LogsVolume, options)).toBeDefined();
     });
 
     it('does not create provider for metrics query', () => {
-      const options = getQueryOptions<LokiQuery>({
-        targets: [{ expr: 'rate({label=value}[1m])', refId: 'A' }],
-      });
+      const options: DataQueryRequest<LokiQuery> = {
+        ...baseRequestOptions,
+        targets: [{ expr: 'rate({label="value"}[1m])', refId: 'A' }],
+      };
 
-      expect(ds.getDataProvider(SupplementaryQueryType.LogsVolume, options)).not.toBeDefined();
+      expect(ds.getSupplementaryRequest(SupplementaryQueryType.LogsVolume, options)).not.toBeDefined();
     });
 
     it('creates provider if at least one query is a logs query', () => {
-      const options = getQueryOptions<LokiQuery>({
+      const options: DataQueryRequest<LokiQuery> = {
+        ...baseRequestOptions,
         targets: [
-          { expr: 'rate({label=value}[1m])', queryType: LokiQueryType.Range, refId: 'A' },
-          { expr: '{label=value}', queryType: LokiQueryType.Range, refId: 'B' },
+          { expr: 'rate({label="value"}[1m])', queryType: LokiQueryType.Range, refId: 'A' },
+          { expr: '{label="value"}', queryType: LokiQueryType.Range, refId: 'B' },
         ],
-      });
+      };
 
-      expect(ds.getDataProvider(SupplementaryQueryType.LogsVolume, options)).toBeDefined();
+      expect(ds.getSupplementaryRequest(SupplementaryQueryType.LogsVolume, options)).toBeDefined();
     });
 
     it('does not create provider if there is only an instant logs query', () => {
-      const options = getQueryOptions<LokiQuery>({
-        targets: [{ expr: '{label=value', refId: 'A', queryType: LokiQueryType.Instant }],
-      });
+      const options: DataQueryRequest<LokiQuery> = {
+        ...baseRequestOptions,
+        targets: [{ expr: '{label="value"', refId: 'A', queryType: LokiQueryType.Instant }],
+      };
 
-      expect(ds.getDataProvider(SupplementaryQueryType.LogsVolume, options)).not.toBeDefined();
+      expect(ds.getSupplementaryRequest(SupplementaryQueryType.LogsVolume, options)).not.toBeDefined();
     });
   });
 
@@ -1018,30 +1297,33 @@ describe('LokiDatasource', () => {
     });
 
     it('creates provider for metrics query', () => {
-      const options = getQueryOptions<LokiQuery>({
-        targets: [{ expr: 'rate({label=value}[5m])', refId: 'A' }],
-      });
+      const options: DataQueryRequest<LokiQuery> = {
+        ...baseRequestOptions,
+        targets: [{ expr: 'rate({label="value"}[5m])', refId: 'A' }],
+      };
 
-      expect(ds.getDataProvider(SupplementaryQueryType.LogsSample, options)).toBeDefined();
+      expect(ds.getSupplementaryRequest(SupplementaryQueryType.LogsSample, options)).toBeDefined();
     });
 
     it('does not create provider for log query', () => {
-      const options = getQueryOptions<LokiQuery>({
-        targets: [{ expr: '{label=value}', refId: 'A' }],
-      });
+      const options: DataQueryRequest<LokiQuery> = {
+        ...baseRequestOptions,
+        targets: [{ expr: '{label="value"}', refId: 'A' }],
+      };
 
-      expect(ds.getDataProvider(SupplementaryQueryType.LogsSample, options)).not.toBeDefined();
+      expect(ds.getSupplementaryRequest(SupplementaryQueryType.LogsSample, options)).not.toBeDefined();
     });
 
     it('creates provider if at least one query is a metric query', () => {
-      const options = getQueryOptions<LokiQuery>({
+      const options: DataQueryRequest<LokiQuery> = {
+        ...baseRequestOptions,
         targets: [
-          { expr: 'rate({label=value}[1m])', refId: 'A' },
-          { expr: '{label=value}', refId: 'B' },
+          { expr: 'rate({label="value"}[1m])', refId: 'A' },
+          { expr: '{label="value"}', refId: 'B' },
         ],
-      });
+      };
 
-      expect(ds.getDataProvider(SupplementaryQueryType.LogsSample, options)).toBeDefined();
+      expect(ds.getSupplementaryRequest(SupplementaryQueryType.LogsSample, options)).toBeDefined();
     });
   });
 
@@ -1058,15 +1340,16 @@ describe('LokiDatasource', () => {
           ds.getSupplementaryQuery(
             { type: SupplementaryQueryType.LogsVolume },
             {
-              expr: '{label=value}',
+              expr: '{label="value"}',
               refId: 'A',
             }
           )
         ).toEqual({
-          expr: 'sum by (level) (count_over_time({label=value}[$__auto]))',
+          expr: 'sum by (level) (count_over_time({label="value"} | drop __error__[$__auto]))',
           queryType: LokiQueryType.Range,
           refId: 'log-volume-A',
           supportingQueryType: SupportingQueryType.LogsVolume,
+          legendFormat: '{{ level }}',
         });
       });
 
@@ -1075,16 +1358,17 @@ describe('LokiDatasource', () => {
           ds.getSupplementaryQuery(
             { type: SupplementaryQueryType.LogsVolume },
             {
-              expr: '{label=value}',
+              expr: '{label="value"}',
               queryType: LokiQueryType.Range,
               refId: 'A',
             }
           )
         ).toEqual({
-          expr: 'sum by (level) (count_over_time({label=value}[$__auto]))',
+          expr: 'sum by (level) (count_over_time({label="value"} | drop __error__[$__auto]))',
           queryType: LokiQueryType.Range,
           refId: 'log-volume-A',
           supportingQueryType: SupportingQueryType.LogsVolume,
+          legendFormat: '{{ level }}',
         });
       });
 
@@ -1093,7 +1377,7 @@ describe('LokiDatasource', () => {
           ds.getSupplementaryQuery(
             { type: SupplementaryQueryType.LogsVolume },
             {
-              expr: '{label=value}',
+              expr: '{label="value"}',
               queryType: LokiQueryType.Instant,
               refId: 'A',
             }
@@ -1106,13 +1390,37 @@ describe('LokiDatasource', () => {
           ds.getSupplementaryQuery(
             { type: SupplementaryQueryType.LogsVolume },
             {
-              expr: 'rate({label=value}[5m]',
+              expr: 'rate({label="value"}[5m]',
               queryType: LokiQueryType.Range,
               refId: 'A',
             }
           )
         ).toEqual(undefined);
       });
+
+      it('return logs volume query with defined field', () => {
+        const query = ds.getSupplementaryQuery(
+          { type: SupplementaryQueryType.LogsVolume, field: 'test' },
+          {
+            expr: '{label="value"}',
+            queryType: LokiQueryType.Range,
+            refId: 'A',
+          }
+        );
+        expect(query?.expr).toEqual('sum by (test) (count_over_time({label="value"} | drop __error__[$__auto]))');
+      });
+
+      it('return logs volume query with level as field if no field specified', () => {
+        const query = ds.getSupplementaryQuery(
+          { type: SupplementaryQueryType.LogsVolume },
+          {
+            expr: '{label="value"}',
+            queryType: LokiQueryType.Range,
+            refId: 'A',
+          }
+        );
+        expect(query?.expr).toEqual('sum by (level) (count_over_time({label="value"} | drop __error__[$__auto]))');
+      });
     });
 
     describe('logs sample', () => {
@@ -1121,13 +1429,13 @@ describe('LokiDatasource', () => {
           ds.getSupplementaryQuery(
             { type: SupplementaryQueryType.LogsSample },
             {
-              expr: 'rate({label=value}[5m]',
+              expr: 'rate({label="value"}[5m]',
               queryType: LokiQueryType.Range,
               refId: 'A',
             }
           )
         ).toEqual({
-          expr: '{label=value}',
+          expr: '{label="value"}',
           queryType: 'range',
           refId: 'log-sample-A',
           maxLines: 20,
@@ -1139,13 +1447,13 @@ describe('LokiDatasource', () => {
           ds.getSupplementaryQuery(
             { type: SupplementaryQueryType.LogsSample },
             {
-              expr: 'rate({label=value}[5m]',
+              expr: 'rate({label="value"}[5m]',
               queryType: LokiQueryType.Instant,
               refId: 'A',
             }
           )
         ).toEqual({
-          expr: '{label=value}',
+          expr: '{label="value"}',
           queryType: LokiQueryType.Range,
           refId: 'log-sample-A',
           maxLines: 20,
@@ -1157,13 +1465,13 @@ describe('LokiDatasource', () => {
           ds.getSupplementaryQuery(
             { type: SupplementaryQueryType.LogsSample, limit: 5 },
             {
-              expr: 'rate({label=value}[5m]',
+              expr: 'rate({label="value"}[5m]',
               queryType: LokiQueryType.Instant,
               refId: 'A',
             }
           )
         ).toEqual({
-          expr: '{label=value}',
+          expr: '{label="value"}',
           queryType: LokiQueryType.Range,
           refId: 'log-sample-A',
           maxLines: 5,
@@ -1175,7 +1483,7 @@ describe('LokiDatasource', () => {
           ds.getSupplementaryQuery(
             { type: SupplementaryQueryType.LogsSample },
             {
-              expr: '{label=value}',
+              expr: '{label="value"}',
               queryType: LokiQueryType.Range,
               refId: 'A',
             }
@@ -1227,26 +1535,26 @@ describe('LokiDatasource', () => {
     });
     it('ignores invalid queries', () => {
       const spy = jest.spyOn(ds, 'query');
-      ds.getDataSamples({ expr: 'not a query', refId: 'A' });
+      ds.getDataSamples({ expr: 'not a query', refId: 'A' }, mockTimeRange);
       expect(spy).not.toHaveBeenCalled();
     });
     it('ignores metric queries', () => {
       const spy = jest.spyOn(ds, 'query');
-      ds.getDataSamples({ expr: 'count_over_time({a="b"}[1m])', refId: 'A' });
+      ds.getDataSamples({ expr: 'count_over_time({a="b"}[1m])', refId: 'A' }, mockTimeRange);
       expect(spy).not.toHaveBeenCalled();
     });
     it('uses the current interval in the request', () => {
       const spy = jest.spyOn(ds, 'query').mockImplementation(() => of({} as DataQueryResponse));
-      ds.getDataSamples({ expr: '{job="bar"}', refId: 'A' });
+      ds.getDataSamples({ expr: '{job="bar"}', refId: 'A' }, mockTimeRange);
       expect(spy).toHaveBeenCalledWith(
         expect.objectContaining({
-          range: ds.getTimeRange(),
+          range: mockTimeRange,
         })
       );
     });
     it('hides the request from the inspector', () => {
       const spy = jest.spyOn(ds, 'query').mockImplementation(() => of({} as DataQueryResponse));
-      ds.getDataSamples({ expr: '{job="bar"}', refId: 'A' });
+      ds.getDataSamples({ expr: '{job="bar"}', refId: 'A' }, mockTimeRange);
       expect(spy).toHaveBeenCalledWith(
         expect.objectContaining({
           hideFromInspector: true,
@@ -1254,6 +1562,15 @@ describe('LokiDatasource', () => {
         })
       );
     });
+    it('sets the supporting query type in the request', () => {
+      const spy = jest.spyOn(ds, 'query').mockImplementation(() => of({} as DataQueryResponse));
+      ds.getDataSamples({ expr: '{job="bar"}', refId: 'A' }, mockTimeRange);
+      expect(spy).toHaveBeenCalledWith(
+        expect.objectContaining({
+          targets: [expect.objectContaining({ supportingQueryType: SupportingQueryType.DataSample })],
+        })
+      );
+    });
   });
 
   describe('Query splitting', () => {
@@ -1279,10 +1596,11 @@ describe('LokiDatasource', () => {
       ],
     ])('supports query splitting when the requirements are met', async (targets: LokiQuery[]) => {
       const ds = createLokiDatasource(templateSrvStub);
-      const query = getQueryOptions<LokiQuery>({
+      const query: DataQueryRequest<LokiQuery> = {
+        ...baseRequestOptions,
         targets,
         app: CoreApp.Dashboard,
-      });
+      };
 
       await expect(ds.query(query)).toEmitValuesWith(() => {
         expect(runSplitQuery).toHaveBeenCalled();
@@ -1296,22 +1614,22 @@ describe('LokiDatasource', () => {
     beforeEach(() => {
       ds = createLokiDatasource(templateSrvStub);
       ds.statsMetadataRequest = jest.fn().mockResolvedValue({ streams: 1, chunks: 1, bytes: 1, entries: 1 });
-      ds.interpolateString = jest.fn().mockImplementation((value: string) => value.replace('$__interval', '1m'));
+      ds.interpolateString = jest.fn().mockImplementation((value: string) => value.replace('$__auto', '1m'));
 
       query = { refId: 'A', expr: '', queryType: LokiQueryType.Range };
     });
 
     it('uses statsMetadataRequest', async () => {
       query.expr = '{foo="bar"}';
-      const result = await ds.getQueryStats(query);
+      const result = await ds.getQueryStats(query, mockTimeRange);
 
       expect(ds.statsMetadataRequest).toHaveBeenCalled();
       expect(result).toEqual({ streams: 1, chunks: 1, bytes: 1, entries: 1 });
     });
 
     it('supports queries with template variables', async () => {
-      query.expr = 'rate({instance="server\\1"}[$__interval])';
-      const result = await ds.getQueryStats(query);
+      query.expr = 'rate({instance="server\\1"}[$__auto])';
+      const result = await ds.getQueryStats(query, mockTimeRange);
 
       expect(result).toEqual({
         streams: 1,
@@ -1323,7 +1641,7 @@ describe('LokiDatasource', () => {
 
     it('does not call stats if the query is invalid', async () => {
       query.expr = 'rate({label="value"}';
-      const result = await ds.getQueryStats(query);
+      const result = await ds.getQueryStats(query, mockTimeRange);
 
       expect(ds.statsMetadataRequest).not.toHaveBeenCalled();
       expect(result).toBe(undefined);
@@ -1331,11 +1649,26 @@ describe('LokiDatasource', () => {
 
     it('combines the stats of each label matcher', async () => {
       query.expr = 'count_over_time({foo="bar"}[1m]) + count_over_time({test="test"}[1m])';
-      const result = await ds.getQueryStats(query);
+      const result = await ds.getQueryStats(query, mockTimeRange);
 
       expect(ds.statsMetadataRequest).toHaveBeenCalled();
       expect(result).toEqual({ streams: 2, chunks: 2, bytes: 2, entries: 2 });
     });
+
+    it('calls statsMetadataRequest with the right properties', async () => {
+      query.expr = 'count_over_time({foo="bar"}[1m])';
+      await ds.getQueryStats(query, mockTimeRange);
+
+      expect(ds.statsMetadataRequest).toHaveBeenCalledWith(
+        `index/stats`,
+        {
+          start: 0,
+          end: 1000000,
+          query: '{foo="bar"}',
+        },
+        { requestId: 'log-stats-A', showErrorAlert: false }
+      );
+    });
   });
 
   describe('statsMetadataRequest', () => {
@@ -1346,14 +1679,27 @@ describe('LokiDatasource', () => {
       }).rejects.toThrow('invalid metadata request url: /index');
     });
   });
+
+  describe('live tailing', () => {
+    it('interpolates variables with scopedVars and filters', () => {
+      const ds = createLokiDatasource();
+      const query: LokiQuery = { expr: '{app=$app}', refId: 'A' };
+      const scopedVars: ScopedVars = { app: { text: 'interpolated', value: 'interpolated' } };
+      const filters: AdHocFilter[] = [];
+
+      jest.spyOn(ds, 'applyTemplateVariables').mockImplementation((query) => query);
+      ds.query({ targets: [query], scopedVars, filters, liveStreaming: true } as DataQueryRequest<LokiQuery>);
+      expect(ds.applyTemplateVariables).toHaveBeenCalledWith(expect.objectContaining(query), scopedVars, filters);
+    });
+  });
 });
 
 describe('applyTemplateVariables', () => {
   it('should add the adhoc filter to the query', () => {
-    const ds = createLokiDatasource(templateSrvStub);
+    const ds = createLokiDatasource();
     const spy = jest.spyOn(ds, 'addAdHocFilters');
-    ds.applyTemplateVariables({ expr: '{test}', refId: 'A' }, {});
-    expect(spy).toHaveBeenCalledWith('{test}');
+    ds.applyTemplateVariables({ expr: '{test}', refId: 'A' }, {}, []);
+    expect(spy).toHaveBeenCalledWith('{test}', []);
   });
 
   describe('with template and built-in variables', () => {
@@ -1439,6 +1785,10 @@ describe('applyTemplateVariables', () => {
   describe('getStatsTimeRange', () => {
     let query: LokiQuery;
     let datasource: LokiDatasource;
+    const timeRange = {
+      from: 167255280000000, // 01 Jan 2023 06:00:00 GMT
+      to: 167263920000000, //   02 Jan 2023 06:00:00 GMT
+    } as unknown as TimeRange;
 
     beforeEach(() => {
       query = { refId: 'A', expr: '', queryType: LokiQueryType.Range };
@@ -1455,7 +1805,7 @@ describe('applyTemplateVariables', () => {
       // in this case (1 day)
       query.expr = '{job="grafana"}';
 
-      expect(datasource.getStatsTimeRange(query, 0)).toEqual({
+      expect(datasource.getStatsTimeRange(query, 0, timeRange)).toEqual({
         start: 1672552800000000000, // 01 Jan 2023 06:00:00 GMT
         end: 1672639200000000000, //   02 Jan 2023 06:00:00 GMT
       });
@@ -1466,18 +1816,18 @@ describe('applyTemplateVariables', () => {
       query.queryType = LokiQueryType.Instant;
       query.expr = '{job="grafana"}';
 
-      expect(datasource.getStatsTimeRange(query, 0)).toEqual({
+      expect(datasource.getStatsTimeRange(query, 0, timeRange)).toEqual({
         start: undefined,
         end: undefined,
       });
     });
 
-    it('should return the ds picker timerange', () => {
+    it('should return the ds picker time range', () => {
       // metric queries with range type should request ds picker timerange
       // in this case (1 day)
       query.expr = 'rate({job="grafana"}[5m])';
 
-      expect(datasource.getStatsTimeRange(query, 0)).toEqual({
+      expect(datasource.getStatsTimeRange(query, 0, timeRange)).toEqual({
         start: 1672552800000000000, // 01 Jan 2023 06:00:00 GMT
         end: 1672639200000000000, //   02 Jan 2023 06:00:00 GMT
       });
@@ -1489,7 +1839,7 @@ describe('applyTemplateVariables', () => {
       query.queryType = LokiQueryType.Instant;
       query.expr = 'rate({job="grafana"}[5m])';
 
-      expect(datasource.getStatsTimeRange(query, 0)).toEqual({
+      expect(datasource.getStatsTimeRange(query, 0, timeRange)).toEqual({
         start: 1672638900000000000, // 02 Jan 2023 05:55:00 GMT
         end: 1672639200000000000, //   02 Jan 2023 06:00:00 GMT
       });
@@ -1507,18 +1857,18 @@ describe('makeStatsRequest', () => {
 
   it('should return null if there is no query', () => {
     query.expr = '';
-    expect(datasource.getStats(query)).resolves.toBe(null);
+    expect(datasource.getStats(query, mockTimeRange)).resolves.toBe(null);
   });
 
   it('should return null if the query is invalid', () => {
     query.expr = '{job="grafana",';
-    expect(datasource.getStats(query)).resolves.toBe(null);
+    expect(datasource.getStats(query, mockTimeRange)).resolves.toBe(null);
   });
 
   it('should return null if the response has no data', () => {
     query.expr = '{job="grafana"}';
     datasource.getQueryStats = jest.fn().mockResolvedValue({ streams: 0, chunks: 0, bytes: 0, entries: 0 });
-    expect(datasource.getStats(query)).resolves.toBe(null);
+    expect(datasource.getStats(query, mockTimeRange)).resolves.toBe(null);
   });
 
   it('should return the stats if the response has data', () => {
@@ -1527,7 +1877,7 @@ describe('makeStatsRequest', () => {
     datasource.getQueryStats = jest
       .fn()
       .mockResolvedValue({ streams: 1, chunks: 12611, bytes: 12913664, entries: 78344 });
-    expect(datasource.getStats(query)).resolves.toEqual({
+    expect(datasource.getStats(query, mockTimeRange)).resolves.toEqual({
       streams: 1,
       chunks: 12611,
       bytes: 12913664,
@@ -1544,7 +1894,7 @@ describe('makeStatsRequest', () => {
     datasource.getQueryStats = jest
       .fn()
       .mockResolvedValue({ streams: 1, chunks: 12611, bytes: 12913664, entries: 78344 });
-    expect(datasource.getStats(query)).resolves.toEqual({
+    expect(datasource.getStats(query, mockTimeRange)).resolves.toEqual({
       streams: 1,
       chunks: 12611,
       bytes: 12913664,
@@ -1553,18 +1903,18 @@ describe('makeStatsRequest', () => {
   });
 });
 
-describe('getTimeRange*()', () => {
-  it('exposes the current time range', () => {
-    const ds = createLokiDatasource();
-    const timeRange = ds.getTimeRange();
-
-    expect(timeRange.from).toBeDefined();
-    expect(timeRange.to).toBeDefined();
-  });
-
-  it('exposes time range as params', () => {
+describe('getTimeRangeParams()', () => {
+  it('turns time range into a Loki range parameters', () => {
     const ds = createLokiDatasource();
-    const params = ds.getTimeRangeParams();
+    const range = {
+      from: dateTime(1524650400000),
+      to: dateTime(1524654000000),
+      raw: {
+        from: 'now-1h',
+        to: 'now',
+      },
+    };
+    const params = ds.getTimeRangeParams(range);
 
     // Returns a very big integer, so we stringify it for the assertion
     expect(JSON.stringify(params)).toEqual('{"start":1524650400000000000,"end":1524654000000000000}');
@@ -1579,14 +1929,6 @@ describe('Variable support', () => {
   });
 });
 
-describe('showContextToggle()', () => {
-  it('always displays logs context', () => {
-    const ds = createLokiDatasource(templateSrvStub);
-
-    expect(ds.showContextToggle()).toBe(true);
-  });
-});
-
 describe('queryHasFilter()', () => {
   let ds: LokiDatasource;
   beforeEach(() => {
@@ -1603,9 +1945,9 @@ describe('queryHasFilter()', () => {
   });
 });
 
-function assertAdHocFilters(query: string, expectedResults: string, ds: LokiDatasource) {
+function assertAdHocFilters(query: string, expectedResults: string, ds: LokiDatasource, adhocFilters?: AdHocFilter[]) {
   const lokiQuery: LokiQuery = { refId: 'A', expr: query };
-  const result = ds.addAdHocFilters(lokiQuery.expr);
+  const result = ds.addAdHocFilters(lokiQuery.expr, adhocFilters);
 
   expect(result).toEqual(expectedResults);
 }
diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts
index d6a9959d4c9be..74c1a814c94b8 100644
--- a/public/app/plugins/datasource/loki/datasource.ts
+++ b/public/app/plugins/datasource/loki/datasource.ts
@@ -17,11 +17,8 @@ import {
   SupplementaryQueryType,
   DataSourceWithQueryExportSupport,
   DataSourceWithQueryImportSupport,
-  FieldCache,
-  FieldType,
   Labels,
   LoadingState,
-  LogLevel,
   LogRowModel,
   QueryFixAction,
   QueryHint,
@@ -35,27 +32,27 @@ import {
   QueryFilterOptions,
   renderLegendFormat,
   LegacyMetricFindQueryOptions,
+  AdHocVariableFilter,
+  urlUtil,
+  MetricFindValue,
+  DataSourceGetTagValuesOptions,
+  DataSourceGetTagKeysOptions,
+  DataSourceWithQueryModificationSupport,
+  LogsVolumeOption,
+  LogsSampleOptions,
 } from '@grafana/data';
-import { intervalToMs } from '@grafana/data/src/datetime/rangeutil';
 import { Duration } from '@grafana/lezer-logql';
-import { BackendSrvRequest, config, DataSourceWithBackend } from '@grafana/runtime';
+import { BackendSrvRequest, config, DataSourceWithBackend, getTemplateSrv, TemplateSrv } from '@grafana/runtime';
 import { DataQuery } from '@grafana/schema';
-import { convertToWebSocketUrl } from 'app/core/utils/explore';
-import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv';
-import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_srv';
-
-import { serializeParams } from '../../../core/utils/fetch';
-import { queryLogsSample, queryLogsVolume } from '../../../features/logs/logsModel';
-import { getLogLevelFromKey } from '../../../features/logs/utils';
-import { replaceVariables, returnVariables } from '../prometheus/querybuilder/shared/parsingUtils';
 
 import LanguageProvider from './LanguageProvider';
 import { LiveStreams, LokiLiveTarget } from './LiveStreams';
 import { LogContextProvider } from './LogContextProvider';
+import { LokiVariableSupport } from './LokiVariableSupport';
 import { transformBackendResult } from './backendResultTransformer';
 import { LokiAnnotationsQueryEditor } from './components/AnnotationsQueryEditor';
 import { placeHolderScopedVars } from './components/monaco-query-field/monaco-completion-provider/validation';
-import { escapeLabelValueInSelector, isRegexSelector } from './languageUtils';
+import { escapeLabelValueInSelector, isRegexSelector, getLabelTypeFromFrame } from './languageUtils';
 import { labelNamesRegex, labelValuesRegex } from './migrations/variableQueryMigrations';
 import {
   addLabelFormatToQuery,
@@ -84,7 +81,8 @@ import {
   isQueryWithError,
   requestSupportsSplitting,
 } from './queryUtils';
-import { doLokiChannelStream } from './streaming';
+import { replaceVariables, returnVariables } from './querybuilder/parsingUtils';
+import { convertToWebSocketUrl, doLokiChannelStream } from './streaming';
 import { trackQuery } from './tracking';
 import {
   LokiOptions,
@@ -95,16 +93,18 @@ import {
   QueryStats,
   SupportingQueryType,
 } from './types';
-import { LokiVariableSupport } from './variables';
 
 export type RangeQueryOptions = DataQueryRequest<LokiQuery> | AnnotationQueryRequest<LokiQuery>;
 export const DEFAULT_MAX_LINES = 1000;
+export const DEFAULT_MAX_LINES_SAMPLE = 10;
 export const LOKI_ENDPOINT = '/loki/api/v1';
 export const REF_ID_DATA_SAMPLES = 'loki-data-samples';
 export const REF_ID_STARTER_ANNOTATION = 'annotation-';
 export const REF_ID_STARTER_LOG_ROW_CONTEXT = 'log-row-context-query-';
 export const REF_ID_STARTER_LOG_VOLUME = 'log-volume-';
 export const REF_ID_STARTER_LOG_SAMPLE = 'log-sample-';
+export const REF_ID_STARTER_STATS = 'log-stats-';
+
 const NS_IN_MS = 1000000;
 
 export function makeRequest(
@@ -136,7 +136,8 @@ export class LokiDatasource
     DataSourceWithSupplementaryQueriesSupport<LokiQuery>,
     DataSourceWithQueryImportSupport<LokiQuery>,
     DataSourceWithQueryExportSupport<LokiQuery>,
-    DataSourceWithToggleableQueryFiltersSupport<LokiQuery>
+    DataSourceWithToggleableQueryFiltersSupport<LokiQuery>,
+    DataSourceWithQueryModificationSupport<LokiQuery>
 {
   private streams = new LiveStreams();
   private logContextProvider: LogContextProvider;
@@ -146,8 +147,7 @@ export class LokiDatasource
 
   constructor(
     private instanceSettings: DataSourceInstanceSettings<LokiOptions>,
-    private readonly templateSrv: TemplateSrv = getTemplateSrv(),
-    private readonly timeSrv: TimeSrv = getTimeSrv()
+    private readonly templateSrv: TemplateSrv = getTemplateSrv()
   ) {
     super(instanceSettings);
 
@@ -162,34 +162,47 @@ export class LokiDatasource
     this.logContextProvider = new LogContextProvider(this);
   }
 
-  getDataProvider(
+  /**
+   * Implemented for DataSourceWithSupplementaryQueriesSupport.
+   * It generates a DataQueryRequest for a specific supplementary query type.
+   * @returns A DataQueryRequest for the supplementary queries or undefined if not supported.
+   */
+  getSupplementaryRequest(
     type: SupplementaryQueryType,
-    request: DataQueryRequest<LokiQuery>
-  ): Observable<DataQueryResponse> | undefined {
-    if (!this.getSupportedSupplementaryQueryTypes().includes(type)) {
-      return undefined;
-    }
+    request: DataQueryRequest<LokiQuery>,
+    options?: SupplementaryQueryOptions
+  ): DataQueryRequest<LokiQuery> | undefined {
     switch (type) {
       case SupplementaryQueryType.LogsVolume:
-        return this.getLogsVolumeDataProvider(request);
+        const logsVolumeOption: LogsVolumeOption =
+          options?.type === SupplementaryQueryType.LogsVolume ? options : { type };
+        return this.getLogsVolumeDataProvider(request, logsVolumeOption);
       case SupplementaryQueryType.LogsSample:
-        return this.getLogsSampleDataProvider(request);
+        const logsSampleOption: LogsSampleOptions =
+          options?.type === SupplementaryQueryType.LogsSample ? options : { type };
+        return this.getLogsSampleDataProvider(request, logsSampleOption);
       default:
         return undefined;
     }
   }
 
+  /**
+   * Implemented for DataSourceWithSupplementaryQueriesSupport.
+   * It returns the supplementary types that the data source supports.
+   * @returns An array of supported supplementary query types.
+   */
   getSupportedSupplementaryQueryTypes(): SupplementaryQueryType[] {
     return [SupplementaryQueryType.LogsVolume, SupplementaryQueryType.LogsSample];
   }
 
+  /**
+   * Implemented for DataSourceWithSupplementaryQueriesSupport.
+   * It retrieves supplementary queries based on the provided options and Loki query.
+   * @returns A supplemented Loki query or undefined if unsupported.
+   */
   getSupplementaryQuery(options: SupplementaryQueryOptions, query: LokiQuery): LokiQuery | undefined {
-    if (!this.getSupportedSupplementaryQueryTypes().includes(options.type)) {
-      return undefined;
-    }
-
     const normalizedQuery = getNormalizedLokiQuery(query);
-    const expr = removeCommentsFromQuery(normalizedQuery.expr);
+    let expr = removeCommentsFromQuery(normalizedQuery.expr);
     let isQuerySuitable = false;
 
     switch (options.type) {
@@ -200,12 +213,19 @@ export class LokiDatasource
           return undefined;
         }
 
+        const dropErrorExpression = `${expr} | drop __error__`;
+        const field = options.field || 'level';
+        if (isQueryWithError(this.interpolateString(dropErrorExpression, placeHolderScopedVars)) === false) {
+          expr = dropErrorExpression;
+        }
+
         return {
           ...normalizedQuery,
           refId: `${REF_ID_STARTER_LOG_VOLUME}${normalizedQuery.refId}`,
           queryType: LokiQueryType.Range,
           supportingQueryType: SupportingQueryType.LogsVolume,
-          expr: `sum by (level) (count_over_time(${expr}[$__auto]))`,
+          expr: `sum by (${field}) (count_over_time(${expr}[$__auto]))`,
+          legendFormat: `{{ ${field} }}`,
         };
 
       case SupplementaryQueryType.LogsSample:
@@ -227,28 +247,34 @@ export class LokiDatasource
     }
   }
 
-  private getLogsVolumeDataProvider(request: DataQueryRequest<LokiQuery>): Observable<DataQueryResponse> | undefined {
+  /**
+   * Private method used in the `getDataProvider` for DataSourceWithSupplementaryQueriesSupport, specifically for Logs volume queries.
+   * @returns An Observable of DataQueryResponse or undefined if no suitable queries are found.
+   */
+  private getLogsVolumeDataProvider(
+    request: DataQueryRequest<LokiQuery>,
+    options: LogsVolumeOption
+  ): DataQueryRequest<LokiQuery> | undefined {
     const logsVolumeRequest = cloneDeep(request);
     const targets = logsVolumeRequest.targets
-      .map((query) => this.getSupplementaryQuery({ type: SupplementaryQueryType.LogsVolume }, query))
+      .map((query) => this.getSupplementaryQuery(options, query))
       .filter((query): query is LokiQuery => !!query);
 
     if (!targets.length) {
       return undefined;
     }
 
-    return queryLogsVolume(
-      this,
-      { ...logsVolumeRequest, targets },
-      {
-        extractLevel,
-        range: request.range,
-        targets: request.targets,
-      }
-    );
+    return { ...logsVolumeRequest, targets };
   }
 
-  private getLogsSampleDataProvider(request: DataQueryRequest<LokiQuery>): Observable<DataQueryResponse> | undefined {
+  /**
+   * Private method used in the `getDataProvider` for DataSourceWithSupplementaryQueriesSupport, specifically for Logs sample queries.
+   * @returns An Observable of DataQueryResponse or undefined if no suitable queries are found.
+   */
+  private getLogsSampleDataProvider(
+    request: DataQueryRequest<LokiQuery>,
+    options?: LogsSampleOptions
+  ): DataQueryRequest<LokiQuery> | undefined {
     const logsSampleRequest = cloneDeep(request);
     const targets = logsSampleRequest.targets
       .map((query) => this.getSupplementaryQuery({ type: SupplementaryQueryType.LogsSample, limit: 100 }, query))
@@ -257,12 +283,16 @@ export class LokiDatasource
     if (!targets.length) {
       return undefined;
     }
-    return queryLogsSample(this, { ...logsSampleRequest, targets });
+    return { ...logsSampleRequest, targets };
   }
 
+  /**
+   * Required by DataSourceApi. It executes queries based on the provided DataQueryRequest.
+   * @returns An Observable of DataQueryResponse containing the query results.
+   */
   query(request: DataQueryRequest<LokiQuery>): Observable<DataQueryResponse> {
     const queries = request.targets
-      .map(getNormalizedLokiQuery) // "fix" the `.queryType` prop
+      .map(getNormalizedLokiQuery) // used to "fix" the deprecated `.queryType` prop
       .map((q) => ({ ...q, maxLines: q.maxLines ?? this.maxLines }));
 
     const fixedRequest: DataQueryRequest<LokiQuery> = {
@@ -285,7 +315,7 @@ export class LokiDatasource
       return merge(
         ...streamQueries.map((q) =>
           doLokiChannelStream(
-            this.applyTemplateVariables(q, request.scopedVars),
+            this.applyTemplateVariables(q, request.scopedVars, request.filters),
             this, // the datasource
             streamRequest
           )
@@ -309,6 +339,10 @@ export class LokiDatasource
     );
   }
 
+  /**
+   * Executes requests through the backend using the `super.query()`, as part of the `query` method in DataSourceWithBackend.
+   * @returns An Observable of transformed DataQueryResponse results from the backend.
+   */
   runQuery(fixedRequest: DataQueryRequest<LokiQuery>) {
     return super
       .query(fixedRequest)
@@ -319,11 +353,15 @@ export class LokiDatasource
       );
   }
 
+  /**
+   * Used within the `query` to execute live queries.
+   * It is intended for logs-queries, not metric queries.
+   * @returns An Observable of DataQueryResponse with live query results or an empty response if no suitable queries are found.
+   * @todo: The name says "backend" but it's actually running the query through the frontend. We should fix this.
+   */
   private runLiveQueryThroughBackend(request: DataQueryRequest<LokiQuery>): Observable<DataQueryResponse> {
-    // this only works in explore-mode, so variables don't need to be handled,
-    //  and only for logs-queries, not metric queries
+    // and only for logs-queries, not metric queries
     const logsQueries = request.targets.filter((query) => query.expr !== '' && isLogsQuery(query.expr));
-
     if (logsQueries.length === 0) {
       return of({
         data: [],
@@ -332,18 +370,23 @@ export class LokiDatasource
     }
 
     const subQueries = logsQueries.map((query) => {
-      const maxDataPoints = query.maxLines || this.maxLines;
+      const interpolatedQuery = this.applyTemplateVariables(query, request.scopedVars, request.filters);
+      const maxDataPoints = interpolatedQuery.maxLines || this.maxLines;
       // FIXME: currently we are running it through the frontend still.
-      return this.runLiveQuery(query, maxDataPoints);
+      return this.runLiveQuery(interpolatedQuery, maxDataPoints);
     });
 
     return merge(...subQueries);
   }
 
+  /**
+   * Used within the `runLiveQuery` to create a live target for a Loki query.
+   * @returns A LokiLiveTarget object containing the necessary information for a live query.
+   */
   private createLiveTarget(target: LokiQuery, maxDataPoints: number): LokiLiveTarget {
     const query = target.expr;
     const baseUrl = this.instanceSettings.url;
-    const params = serializeParams({ query });
+    const params = urlUtil.serializeParams({ query });
 
     return {
       query,
@@ -354,10 +397,11 @@ export class LokiDatasource
   }
 
   /**
-   * Runs live queries which in this case means creating a websocket and listening on it for new logs.
-   * This returns a bit different dataFrame than runQueries as it returns single dataframe even if there are multiple
-   * Loki streams, sets only common labels on dataframe.labels and has additional dataframe.fields.labels for unique
-   * labels per row.
+   * Runs live queries, which involves creating a WebSocket connection to listen for new logs.
+   * It returns a slightly different DataQueryResponse compared to runQueries. It provides a single DataFrame
+   * even if there are multiple Loki streams. Common labels are set on dataFrame.labels, and unique labels per row are
+   * available in dataFrame.fields.labels.
+   * @returns An Observable of DataQueryResponse with streaming data or an error message if live tailing encounters an issue.
    */
   private runLiveQuery = (target: LokiQuery, maxDataPoints: number): Observable<DataQueryResponse> => {
     const liveTarget = this.createLiveTarget(target, maxDataPoints);
@@ -374,32 +418,52 @@ export class LokiDatasource
     );
   };
 
-  interpolateVariablesInQueries(queries: LokiQuery[], scopedVars: ScopedVars): LokiQuery[] {
+  /**
+   * Implemented as a part of DataSourceApi. Interpolates variables and adds ad hoc filters to a list of Loki queries.
+   * @returns An array of expanded Loki queries with interpolated variables and ad hoc filters.
+   */
+  interpolateVariablesInQueries(
+    queries: LokiQuery[],
+    scopedVars: ScopedVars,
+    adhocFilters?: AdHocVariableFilter[]
+  ): LokiQuery[] {
     let expandedQueries = queries;
     if (queries && queries.length) {
       expandedQueries = queries.map((query) => ({
         ...query,
         datasource: this.getRef(),
-        expr: this.addAdHocFilters(this.templateSrv.replace(query.expr, scopedVars, this.interpolateQueryExpr)),
+        expr: this.addAdHocFilters(
+          this.templateSrv.replace(query.expr, scopedVars, this.interpolateQueryExpr),
+          adhocFilters
+        ),
       }));
     }
 
     return expandedQueries;
   }
 
+  /**
+   * Implemented as part of DataSourceApi. Converts a Loki query to a simple text string.
+   * Used, for example, in Query history.
+   * @returns A text representation of the query.
+   */
   getQueryDisplayText(query: LokiQuery) {
     return query.expr;
   }
 
-  getTimeRange() {
-    return this.timeSrv.timeRange();
-  }
-
-  getTimeRangeParams() {
-    const timeRange = this.getTimeRange();
+  /**
+   * Given a time range, returns it as Loki parameters.
+   * @returns An object containing the start and end times in nanoseconds since the Unix epoch.
+   */
+  getTimeRangeParams(timeRange: TimeRange) {
     return { start: timeRange.from.valueOf() * NS_IN_MS, end: timeRange.to.valueOf() * NS_IN_MS };
   }
 
+  /**
+   * Implemented as part of DataSourceWithQueryImportSupport.
+   * Imports queries from AbstractQuery objects when switching between different data source types.
+   * @returns A Promise that resolves to an array of Loki queries.
+   */
   async importFromAbstractQueries(abstractQueries: AbstractQuery[]): Promise<LokiQuery[]> {
     await this.languageProvider.start();
     const existingKeys = this.languageProvider.labelKeys;
@@ -416,10 +480,19 @@ export class LokiDatasource
     return abstractQueries.map((abstractQuery) => this.languageProvider.importFromAbstractQuery(abstractQuery));
   }
 
+  /**
+   * Implemented as part of DataSourceWithQueryImportSupport.
+   * Exports Loki queries to AbstractQuery objects when switching between different data source types.
+   * @returns A Promise that resolves to an array of AbstractQuery objects.
+   */
   async exportToAbstractQueries(queries: LokiQuery[]): Promise<AbstractQuery[]> {
     return queries.map((query) => this.languageProvider.exportToAbstractQuery(query));
   }
 
+  /**
+   * A method that wraps `getResource` from DataSourceWithBackend to perform metadata requests, with an additional check for valid URL values.
+   * @returns A Promise that resolves to the data retrieved from the metadata request, or an empty array if no data is available.
+   */
   async metadataRequest(url: string, params?: Record<string, string | number>, options?: Partial<BackendSrvRequest>) {
     // url must not start with a `/`, otherwise the AJAX-request
     // going from the browser will contain `//`, which can cause problems.
@@ -431,8 +504,11 @@ export class LokiDatasource
     return res.data || [];
   }
 
-  // We need a specific metadata method for stats endpoint as it does not return res.data,
-  // but it returns stats directly in res object.
+  /**
+   * Used in `getQueryStats`. It wraps `getResource` from DataSourceWithBackend to perform a stats request
+   * Specifically designed for the stats endpoint, which does not return data but includes stats directly in the response object.
+   * @returns A Promise that resolves to a QueryStats object containing the statistics retrieved from the stats request.
+   */
   async statsMetadataRequest(
     url: string,
     params?: Record<string, string | number>,
@@ -445,7 +521,11 @@ export class LokiDatasource
     return await this.getResource(url, params, options);
   }
 
-  async getQueryStats(query: LokiQuery): Promise<QueryStats | undefined> {
+  /**
+   * Used in `getStats`. Retrieves statistics for a Loki query and processes them into a QueryStats object.
+   * @returns A Promise that resolves to a QueryStats object containing the query statistics or undefined if the query is invalid.
+   */
+  async getQueryStats(query: LokiQuery, timeRange: TimeRange): Promise<QueryStats | undefined> {
     // if query is invalid, clear stats, and don't request
     if (isQueryWithError(this.interpolateString(query.expr, placeHolderScopedVars))) {
       return undefined;
@@ -455,7 +535,7 @@ export class LokiDatasource
     let statsForAll: QueryStats = { streams: 0, chunks: 0, bytes: 0, entries: 0 };
 
     for (const idx in labelMatchers) {
-      const { start, end } = this.getStatsTimeRange(query, Number(idx));
+      const { start, end } = this.getStatsTimeRange(query, Number(idx), timeRange);
 
       if (start === undefined || end === undefined) {
         return { streams: 0, chunks: 0, bytes: 0, entries: 0, message: 'Query size estimate not available.' };
@@ -469,7 +549,7 @@ export class LokiDatasource
             start: start,
             end: end,
           },
-          { showErrorAlert: false }
+          { showErrorAlert: false, requestId: `${REF_ID_STARTER_STATS}${query.refId}` }
         );
 
         statsForAll = {
@@ -486,7 +566,17 @@ export class LokiDatasource
     return statsForAll;
   }
 
-  getStatsTimeRange(query: LokiQuery, idx: number): { start: number | undefined; end: number | undefined } {
+  /**
+   * Used within the `getQueryStats`. Retrieves the time range for a Loki stats query, adjusting it to cover the requested period.
+   * In metric queries, this means extending it over the range interval.
+   * @returns An object containing the start and end time in nanoseconds (NS_IN_MS) or undefined if the time range cannot be estimated.
+   */
+
+  getStatsTimeRange(
+    query: LokiQuery,
+    idx: number,
+    timeRange: TimeRange
+  ): { start: number | undefined; end: number | undefined } {
     let start: number, end: number;
     const NS_IN_MS = 1000000;
     const durationNodes = getNodesFromQuery(query.expr, [Duration]);
@@ -498,7 +588,7 @@ export class LokiDatasource
         return { start: undefined, end: undefined };
       }
       // logs query with range type
-      return this.getTimeRangeParams();
+      return this.getTimeRangeParams(timeRange);
     }
 
     if (query.queryType === LokiQueryType.Instant) {
@@ -506,15 +596,15 @@ export class LokiDatasource
 
       if (!!durations[idx]) {
         // if query has a duration e.g. [1m]
-        end = this.getTimeRangeParams().end;
-        start = end - intervalToMs(durations[idx]) * NS_IN_MS;
+        end = this.getTimeRangeParams(timeRange).end;
+        start = end - rangeUtil.intervalToMs(durations[idx]) * NS_IN_MS;
         return { start, end };
       } else {
         // if query has no duration e.g. [$__interval]
 
         if (/(\$__auto|\$__range)/.test(query.expr)) {
           // if $__auto or $__range is used, we can estimate the time range using the selected range
-          return this.getTimeRangeParams();
+          return this.getTimeRangeParams(timeRange);
         }
 
         // otherwise we cant estimate the time range
@@ -523,15 +613,19 @@ export class LokiDatasource
     }
 
     // metric query with range type
-    return this.getTimeRangeParams();
+    return this.getTimeRangeParams(timeRange);
   }
 
-  async getStats(query: LokiQuery): Promise<QueryStats | null> {
-    if (!query) {
+  /**
+   * Retrieves statistics for a Loki query and returns the QueryStats object.
+   * @returns A Promise that resolves to a QueryStats object or null if the query is invalid or has no statistics.
+   */
+  async getStats(query: LokiQuery, timeRange: TimeRange): Promise<QueryStats | null> {
+    if (!query.expr) {
       return null;
     }
 
-    const response = await this.getQueryStats(query);
+    const response = await this.getQueryStats(query, timeRange);
 
     if (!response) {
       return null;
@@ -540,28 +634,46 @@ export class LokiDatasource
     return Object.values(response).every((v) => v === 0) ? null : response;
   }
 
-  async metricFindQuery(query: LokiVariableQuery | string, options?: LegacyMetricFindQueryOptions) {
+  /**
+   * Implemented as part of DataSourceAPI and used for template variable queries.
+   * @returns A Promise that resolves to an array of results from the metric find query.
+   */
+  async metricFindQuery(
+    query: LokiVariableQuery | string,
+    options?: LegacyMetricFindQueryOptions
+  ): Promise<MetricFindValue[]> {
     if (!query) {
       return Promise.resolve([]);
     }
 
+    let interpolatedVariableQuery: LokiVariableQuery | undefined;
+
     if (typeof query === 'string') {
-      const interpolated = this.interpolateString(query, options?.scopedVars);
-      return await this.legacyProcessMetricFindQuery(interpolated);
+      interpolatedVariableQuery = this.parseStringToVariableQuery(this.interpolateString(query, options?.scopedVars));
+    } else {
+      interpolatedVariableQuery = {
+        ...query,
+        label: this.interpolateString(query.label || '', options?.scopedVars),
+        stream: this.interpolateString(query.stream || '', options?.scopedVars),
+      };
     }
 
-    const interpolatedQuery = {
-      ...query,
-      label: this.interpolateString(query.label || '', options?.scopedVars),
-      stream: this.interpolateString(query.stream || '', options?.scopedVars),
-    };
+    if (interpolatedVariableQuery) {
+      return await this.processMetricFindQuery(interpolatedVariableQuery, options?.range);
+    }
 
-    return await this.processMetricFindQuery(interpolatedQuery);
+    return Promise.resolve([]);
   }
 
-  private async processMetricFindQuery(query: LokiVariableQuery) {
+  /**
+   * Used within the `metricFindQuery`. Retrieves the correct variable results based on the provided LokiVariableQuery.
+   * @returns A Promise that resolves to an array of variable results based on the query type and parameters.
+   */
+
+  private async processMetricFindQuery(query: LokiVariableQuery, timeRange?: TimeRange): Promise<MetricFindValue[]> {
     if (query.type === LokiVariableQueryType.LabelNames) {
-      return this.labelNamesQuery();
+      const result = await this.languageProvider.fetchLabels({ timeRange });
+      return result.map((value: string) => ({ text: value }));
     }
 
     if (!query.label) {
@@ -570,63 +682,49 @@ export class LokiDatasource
 
     // If we have stream selector, use /series endpoint
     if (query.stream) {
-      return this.labelValuesSeriesQuery(query.stream, query.label);
+      const result = await this.languageProvider.fetchSeriesLabels(query.stream, { timeRange });
+      if (!result[query.label]) {
+        return [];
+      }
+      return result[query.label].map((value: string) => ({ text: value }));
     }
 
-    return this.labelValuesQuery(query.label);
+    const result = await this.languageProvider.fetchLabelValues(query.label, { timeRange });
+    return result.map((value: string) => ({ text: value }));
   }
 
-  async legacyProcessMetricFindQuery(query: string) {
+  /**
+   * Used in `metricFindQuery` to process legacy query strings (label_name() and label_values()) to variable query objects.
+   * @returns LokiVariableQuery object based on the provided query string, or undefined if string can't be parsed.
+   */
+  private parseStringToVariableQuery(query: string): LokiVariableQuery | undefined {
+    const refId = 'LokiVariableQueryEditor-VariableQuery';
     const labelNames = query.match(labelNamesRegex);
     if (labelNames) {
-      return await this.labelNamesQuery();
+      return {
+        type: LokiVariableQueryType.LabelNames,
+        refId,
+      };
     }
 
     const labelValues = query.match(labelValuesRegex);
     if (labelValues) {
-      // If we have stream selector, use /series endpoint
-      if (labelValues[1]) {
-        return await this.labelValuesSeriesQuery(labelValues[1], labelValues[2]);
-      }
-      return await this.labelValuesQuery(labelValues[2]);
+      return {
+        type: LokiVariableQueryType.LabelValues,
+        label: labelValues[2],
+        stream: labelValues[1],
+        refId,
+      };
     }
-
-    return Promise.resolve([]);
-  }
-
-  async labelNamesQuery() {
-    const url = 'labels';
-    const params = this.getTimeRangeParams();
-    const result = await this.metadataRequest(url, params);
-    return result.map((value: string) => ({ text: value }));
+    return undefined;
   }
 
-  private async labelValuesQuery(label: string) {
-    const params = this.getTimeRangeParams();
-    const url = `label/${label}/values`;
-    const result = await this.metadataRequest(url, params);
-    return result.map((value: string) => ({ text: value }));
-  }
-
-  private async labelValuesSeriesQuery(expr: string, label: string) {
-    const timeParams = this.getTimeRangeParams();
-    const params = {
-      ...timeParams,
-      'match[]': expr,
-    };
-    const url = 'series';
-    const streams = new Set();
-    const result = await this.metadataRequest(url, params);
-    result.forEach((stream: { [key: string]: string }) => {
-      if (stream[label]) {
-        streams.add({ text: stream[label] });
-      }
-    });
-
-    return Array.from(streams);
-  }
-
-  async getDataSamples(query: LokiQuery): Promise<DataFrame[]> {
+  /**
+   * Used to fetch data samples, typically for autocompletion and query building to recommend parsers, labels, and values based on sampled data.
+   * Currently, it works for logs data only.
+   * @returns A Promise that resolves to an array of DataFrames containing data samples.
+   */
+  async getDataSamples(query: LokiQuery, timeRange: TimeRange): Promise<DataFrame[]> {
     // Currently works only for logs sample
     if (!isLogsQuery(query.expr) || isQueryWithError(this.interpolateString(query.expr, placeHolderScopedVars))) {
       return [];
@@ -636,24 +734,37 @@ export class LokiDatasource
       expr: query.expr,
       queryType: LokiQueryType.Range,
       refId: REF_ID_DATA_SAMPLES,
-      // For samples we limit the request to 10 lines, so queries are small and fast
-      maxLines: 10,
+      maxLines: query.maxLines || DEFAULT_MAX_LINES_SAMPLE,
+      supportingQueryType: SupportingQueryType.DataSample,
     };
 
-    const timeRange = this.getTimeRange();
     const request = makeRequest(lokiLogsQuery, timeRange, CoreApp.Unknown, REF_ID_DATA_SAMPLES, true);
     return await lastValueFrom(this.query(request).pipe(switchMap((res) => of(res.data))));
   }
 
-  // By implementing getTagKeys and getTagValues we add ad-hoc filters functionality
-  async getTagKeys() {
-    return await this.labelNamesQuery();
+  /**
+   * Implemented as part of the DataSourceAPI. Retrieves tag keys that can be used for ad-hoc filtering.
+   * @returns A Promise that resolves to an array of label names represented as MetricFindValue objects.
+   */
+  async getTagKeys(options?: DataSourceGetTagKeysOptions<LokiQuery>): Promise<MetricFindValue[]> {
+    const result = await this.languageProvider.fetchLabels({ timeRange: options?.timeRange });
+    return result.map((value: string) => ({ text: value }));
   }
 
-  async getTagValues(options: any = {}) {
-    return await this.labelValuesQuery(options.key);
+  /**
+   * Implemented as part of the DataSourceAPI. Retrieves tag values that can be used for ad-hoc filtering.
+   * @returns A Promise that resolves to an array of label values represented as MetricFindValue objects
+   */
+  async getTagValues(options: DataSourceGetTagValuesOptions): Promise<MetricFindValue[]> {
+    const result = await this.languageProvider.fetchLabelValues(options.key, { timeRange: options.timeRange });
+    return result.map((value: string) => ({ text: value }));
   }
 
+  /**
+   * Used for interpolation logic in `interpolateVariablesInQueries` and `applyTemplateVariables`.
+   * Handles escaping of special characters based on variable type and value.
+   * @returns The interpolated value with appropriate character escaping.
+   */
   interpolateQueryExpr(value: any, variable: any) {
     // if no multi or include all do not regexEscape
     if (!variable.multi && !variable.includeAll) {
@@ -668,8 +779,14 @@ export class LokiDatasource
     return escapedValues.join('|');
   }
 
+  /**
+   * Implemented for `DataSourceWithToggleableQueryFiltersSupport`. Toggles a filter on or off based on the provided filter action.
+   * It is used for example in Explore to toggle fields on and off trough log details.
+   * @returns A new LokiQuery with the filter toggled as specified.
+   */
   toggleQueryFilter(query: LokiQuery, filter: ToggleFilterAction): LokiQuery {
     let expression = query.expr ?? '';
+    const labelType = getLabelTypeFromFrame(filter.options.key, filter.frame, 0);
     switch (filter.type) {
       case 'FILTER_FOR': {
         if (filter.options?.key && filter.options?.value) {
@@ -678,7 +795,7 @@ export class LokiDatasource
           // This gives the user the ability to toggle a filter on and off.
           expression = queryHasFilter(expression, filter.options.key, '=', value)
             ? removeLabelFromQuery(expression, filter.options.key, '=', value)
-            : addLabelToQuery(expression, filter.options.key, '=', value);
+            : addLabelToQuery(expression, filter.options.key, '=', value, labelType);
         }
         break;
       }
@@ -695,7 +812,7 @@ export class LokiDatasource
             expression = removeLabelFromQuery(expression, filter.options.key, '=', value);
           }
 
-          expression = addLabelToQuery(expression, filter.options.key, '!=', value);
+          expression = addLabelToQuery(expression, filter.options.key, '!=', value, labelType);
         }
         break;
       }
@@ -705,41 +822,39 @@ export class LokiDatasource
     return { ...query, expr: expression };
   }
 
+  /**
+   * Implemented for `DataSourceWithToggleableQueryFiltersSupport`. Checks if a query expression contains a filter based on the provided filter options.
+   * @returns A boolean value indicating whether the filter exists in the query expression.
+   */
   queryHasFilter(query: LokiQuery, filter: QueryFilterOptions): boolean {
     let expression = query.expr ?? '';
     return queryHasFilter(expression, filter.key, '=', filter.value);
   }
 
+  /**
+   * Implemented as part of `DataSourceWithQueryModificationSupport`. Used to modify a query based on the provided action.
+   * It is used, for example, in the Query Builder to apply hints such as parsers, operations, etc.
+   * @returns A new LokiQuery with the specified modification applied.
+   */
   modifyQuery(query: LokiQuery, action: QueryFixAction): LokiQuery {
     let expression = query.expr ?? '';
     // NB: Usually the labelKeys should be fetched and cached in the datasource,
     // but there might be some edge cases where this wouldn't be the case.
     // However the changed would make this method `async`.
-    const allLabels = this.languageProvider.getLabelKeys();
     switch (action.type) {
       case 'ADD_FILTER': {
         if (action.options?.key && action.options?.value) {
+          const labelType = getLabelTypeFromFrame(action.options.key, action.frame, 0);
           const value = escapeLabelValueInSelector(action.options.value);
-          expression = addLabelToQuery(
-            expression,
-            action.options.key,
-            '=',
-            value,
-            allLabels.includes(action.options.key) === false
-          );
+          expression = addLabelToQuery(expression, action.options.key, '=', value, labelType);
         }
         break;
       }
       case 'ADD_FILTER_OUT': {
         if (action.options?.key && action.options?.value) {
+          const labelType = getLabelTypeFromFrame(action.options.key, action.frame, 0);
           const value = escapeLabelValueInSelector(action.options.value);
-          expression = addLabelToQuery(
-            expression,
-            action.options.key,
-            '!=',
-            value,
-            allLabels.includes(action.options.key) === false
-          );
+          expression = addLabelToQuery(expression, action.options.key, '!=', value, labelType);
         }
         break;
       }
@@ -776,8 +891,14 @@ export class LokiDatasource
         expression = addFilterAsLabelFilter(expression, [lastPosition], filter);
         break;
       }
+      case 'ADD_STRING_FILTER':
       case 'ADD_LINE_FILTER': {
-        expression = addLineFilter(expression);
+        expression = addLineFilter(expression, action.options?.value);
+        break;
+      }
+      case 'ADD_STRING_FILTER_OUT':
+      case 'ADD_LINE_FILTER_OUT': {
+        expression = addLineFilter(expression, action.options?.value, '!=');
         break;
       }
       default:
@@ -786,6 +907,29 @@ export class LokiDatasource
     return { ...query, expr: expression };
   }
 
+  /**
+   * Implemented as part of `DataSourceWithQueryModificationSupport`. Returns a list of operation
+   * types that are supported by `modifyQuery()`.
+   */
+  getSupportedQueryModifications() {
+    return [
+      'ADD_FILTER',
+      'ADD_FILTER_OUT',
+      'ADD_LOGFMT_PARSER',
+      'ADD_JSON_PARSER',
+      'ADD_UNPACK_PARSER',
+      'ADD_NO_PIPELINE_ERROR',
+      'ADD_LEVEL_LABEL_FORMAT',
+      'ADD_LABEL_FILTER',
+      'ADD_STRING_FILTER',
+      'ADD_STRING_FILTER_OUT',
+    ];
+  }
+
+  /**
+   * Part of `DataSourceWithLogsContextSupport`, used to retrieve log context for a log row.
+   * @returns A promise that resolves to an object containing the log context data as DataFrames.
+   */
   getLogRowContext = async (
     row: LogRowModel,
     options?: LogRowContextOptions,
@@ -793,19 +937,37 @@ export class LokiDatasource
   ): Promise<{ data: DataFrame[] }> => {
     return await this.logContextProvider.getLogRowContext(row, options, getLokiQueryFromDataQuery(origQuery));
   };
-
+  /**
+   * Part of `DataSourceWithLogsContextSupport`, used to retrieve the log context query for the provided log row and original query.
+   * @returns A promise that resolves to a DataQuery representing the log context query.
+   */
   getLogRowContextQuery = async (
     row: LogRowModel,
     options?: LogRowContextOptions,
-    origQuery?: DataQuery
+    origQuery?: DataQuery,
+    cacheFilters?: boolean
   ): Promise<DataQuery> => {
-    return await this.logContextProvider.getLogRowContextQuery(row, options, getLokiQueryFromDataQuery(origQuery));
+    return await this.logContextProvider.getLogRowContextQuery(
+      row,
+      options,
+      getLokiQueryFromDataQuery(origQuery),
+      cacheFilters
+    );
   };
 
+  /**
+   * Part of `DataSourceWithLogsContextSupport`, used to retrieve the log context UI for the provided log row and original query.
+   * @returns A React component or element representing the log context UI for the log row.
+   */
   getLogRowContextUi(row: LogRowModel, runContextQuery: () => void, origQuery: DataQuery): React.ReactNode {
     return this.logContextProvider.getLogRowContextUi(row, runContextQuery, getLokiQueryFromDataQuery(origQuery));
   }
 
+  /**
+   * Implemented as part of the DataSourceAPI. It allows the datasource to serve as a source of annotations for a dashboard.
+   * @returns A promise that resolves to an array of AnnotationEvent objects representing the annotations for the dashboard.
+   * @todo This is deprecated and it is recommended to use the `AnnotationSupport` feature for annotations.
+   */
   async annotationQuery(options: any): Promise<AnnotationEvent[]> {
     const { expr, maxLines, instant, tagKeys = '', titleFormat = '', textFormat = '' } = options.annotation;
 
@@ -868,12 +1030,16 @@ export class LokiDatasource
     return annotations;
   }
 
-  showContextToggle(row?: LogRowModel): boolean {
-    return true;
-  }
+  /**
+   * Adds ad hoc filters to a query expression, handling proper escaping of filter values.
+   * @returns The query expression with ad hoc filters and correctly escaped values.
+   * @todo this.templateSrv.getAdhocFilters() is deprecated
+   */
+  addAdHocFilters(queryExpr: string, adhocFilters?: AdHocVariableFilter[]) {
+    if (!adhocFilters) {
+      return queryExpr;
+    }
 
-  addAdHocFilters(queryExpr: string) {
-    const adhocFilters = this.templateSrv.getAdhocFilters(this.name);
     let expr = replaceVariables(queryExpr);
 
     expr = adhocFilters.reduce((acc: string, filter: { key: string; operator: string; value: string }) => {
@@ -894,7 +1060,11 @@ export class LokiDatasource
     return returnVariables(expr);
   }
 
-  // Used when running queries through backend
+  /**
+   * Filters out queries that are empty or hidden. Used when running queries through backend.
+   * It is called from DatasourceWithBackend.
+   * @returns `true` if the query is not hidden and its expression is not empty; `false` otherwise.
+   */
   filterQuery(query: LokiQuery): boolean {
     if (query.hide || query.expr === '') {
       return false;
@@ -902,33 +1072,65 @@ export class LokiDatasource
     return true;
   }
 
-  // Used when running queries through backend
-  applyTemplateVariables(target: LokiQuery, scopedVars: ScopedVars): LokiQuery {
+  /**
+   * Applies template variables and add hoc filters to a query. Used when running queries through backend.
+   * It is called from DatasourceWithBackend.
+   * @returns A modified Loki query with template variables and ad hoc filters applied.
+   */
+  applyTemplateVariables(target: LokiQuery, scopedVars: ScopedVars, adhocFilters?: AdHocVariableFilter[]): LokiQuery {
     // We want to interpolate these variables on backend because we support using them in
     // alerting/ML queries and we want to have consistent interpolation for all queries
     const { __auto, __interval, __interval_ms, __range, __range_s, __range_ms, ...rest } = scopedVars || {};
 
-    const exprWithAdHoc = this.addAdHocFilters(target.expr);
+    const exprWithAdHoc = this.addAdHocFilters(target.expr, adhocFilters);
+
+    const variables = {
+      ...rest,
 
+      // pass through for backend interpolation. Need to be in scopedVars for Scenes though
+      __interval: {
+        value: '$__interval',
+      },
+      __interval_ms: {
+        value: '$__interval_ms',
+      },
+    };
     return {
       ...target,
       legendFormat: this.templateSrv.replace(target.legendFormat, rest),
-      expr: this.templateSrv.replace(exprWithAdHoc, rest, this.interpolateQueryExpr),
+      expr: this.templateSrv.replace(exprWithAdHoc, variables, this.interpolateQueryExpr),
     };
   }
 
+  /**
+   * Interpolates template variables in a given string. Template variables are passed trough scopedVars.
+   * @returns The string with template variables replaced by their values.
+   */
   interpolateString(string: string, scopedVars?: ScopedVars) {
     return this.templateSrv.replace(string, scopedVars, this.interpolateQueryExpr);
   }
 
+  /**
+   * Retrieves and returns a list of variable names used in the template service.
+   * Used for example in the Query Builder to populate the variable dropdown with template variables.
+   * @returns An array of variable names, each prefixed with '$'.
+   */
   getVariables(): string[] {
     return this.templateSrv.getVariables().map((v) => `$${v.name}`);
   }
-
+  /**
+   * Retrieves query hints for query improvements based on a Loki query and its result data.
+   * Used in Query builder to provide hints for query improvements, such as adding a parser, etc.
+   * @returns An array of query hints for potential query improvements.
+   */
   getQueryHints(query: LokiQuery, result: DataFrame[]): QueryHint[] {
     return getQueryHints(query.expr, result);
   }
 
+  /**
+   * Get a default LokiQuery based on the specified app. Currently used in UnifiedAlerting.
+   * @returns A default LokiQuery object with appropriate settings for the given application.
+   */
   getDefaultQuery(app: CoreApp): LokiQuery {
     const defaults = { refId: 'A', expr: '' };
 
@@ -962,23 +1164,3 @@ export function lokiSpecialRegexEscape(value: any) {
   }
   return value;
 }
-
-function extractLevel(dataFrame: DataFrame): LogLevel {
-  let valueField;
-  try {
-    valueField = new FieldCache(dataFrame).getFirstFieldOfType(FieldType.number);
-  } catch {}
-  return valueField?.labels ? getLogLevelFromLabels(valueField.labels) : LogLevel.unknown;
-}
-
-function getLogLevelFromLabels(labels: Labels): LogLevel {
-  const labelNames = ['level', 'lvl', 'loglevel'];
-  let levelLabel;
-  for (let labelName of labelNames) {
-    if (labelName in labels) {
-      levelLabel = labelName;
-      break;
-    }
-  }
-  return levelLabel ? getLogLevelFromKey(labels[levelLabel]) : LogLevel.unknown;
-}
diff --git a/public/app/plugins/datasource/loki/docs/app_plugin_developer_documentation.md b/public/app/plugins/datasource/loki/docs/app_plugin_developer_documentation.md
index c84b75d57b4e1..2d50b981916d3 100644
--- a/public/app/plugins/datasource/loki/docs/app_plugin_developer_documentation.md
+++ b/public/app/plugins/datasource/loki/docs/app_plugin_developer_documentation.md
@@ -4,7 +4,7 @@ Welcome to the developer documentation for the Loki data source! The purpose of
 
 ## Introduction
 
-The Loki data source provides a variety of methods, but not all of them are suitable for external use. In this documentation, we will focus on the key methods that are highly recommended for app plugin development.
+The Loki data source provides a variety of methods and components, but not all of them are suitable for external use. In this documentation, we will focus on the key methods that are highly recommended for app plugin development.
 
 It's important to note some methods and APIs were deliberately omitted, as those may undergo changes or are not suitable for external integration. Therefore, we do not recommend relying on them for your development needs.
 
@@ -29,10 +29,12 @@ We strongly advise using these recommended methods instead of direct API calls b
  * This asynchronous function is designed to retrieve all available label keys from the data source.
  * It returns a promise that resolves to an array of strings containing the label keys.
  *
+ * @param options - (Optional) An object containing additional options - currently only time range.
+ * @param options.timeRange - (Optional) The time range for which you want to retrieve label keys. If not provided, the default time range is used.
  * @returns A promise containing an array of label keys.
  * @throws An error if the fetch operation fails.
  */
-async function fetchLabels(): Promise<string[]>;
+async function fetchLabels(options?: { timeRange?: TimeRange }): Promise<string[]>;
 
 /**
  * Example usage:
@@ -58,13 +60,19 @@ The `datasource.languageProvider.fetchLabelValues()` method is designed for fetc
  * It returns a promise that resolves to an array of strings containing the label values.
  *
  * @param labelName - The name of the label for which you want to retrieve values.
+ * @param options - (Optional) An object containing additional options.
+ * @param options.streamSelector - (Optional) The stream selector to filter label values. If not provided, all label values are fetched.
+ * @param options.timeRange - (Optional) The time range for which you want to retrieve label values. If not provided, the default time range is used.
  * @returns A promise containing an array of label values.
  * @throws An error if the fetch operation fails.
  */
-async function fetchLabelValues(labelName: string): Promise<string[]>;
+async function fetchLabelValues(
+  labelName: string,
+  options?: { streamSelector?: string; timeRange?: TimeRange }
+): Promise<string[]>;
 
 /**
- * Example usage:
+ * Example usage without stream selector:
  */
 
 const labelName = 'job';
@@ -74,6 +82,19 @@ try {
 } catch (error) {
   console.error(`Error fetching label values: ${error.message}`);
 }
+
+/**
+ * Example usage with stream selector:
+ */
+
+const labelName = 'job';
+const streamSelector = '{app="grafana"}';
+try {
+  const values = await fetchLabelValues(labelName, { streamSelector });
+  console.log(values);
+} catch (error) {
+  console.error(`Error fetching label values: ${error.message}`);
+}
 ```
 
 ### Fetching Loki labels for a specified selector
@@ -88,10 +109,15 @@ try {
  * It returns a promise that resolves to a record mapping label names to their corresponding values.
  *
  * @param streamSelector - The stream selector for which you want to retrieve labels.
+ * @param options - (Optional) An object containing additional options - currently only time range.
+ * @param options.timeRange - (Optional) The time range for which you want to retrieve label keys. If not provided, the default time range is used.
  * @returns A promise containing a record of label names and their values.
  * @throws An error if the fetch operation fails.
  */
-async function fetchSeriesLabels(streamSelector: string): Promise<Record<string, string[]>>;
+async function fetchSeriesLabels(
+  streamSelector: string,
+  options?: { timeRange?: TimeRange }
+): Promise<Record<string, string[]>>;
 
 /**
  * Example usage:
@@ -123,10 +149,17 @@ try {
  * - `unwrapLabelKeys`: An array of label keys that can be used for unwrapping log data.
  *
  * @param streamSelector - The selector for the log stream you want to analyze.
+ * @param options - (Optional) An object containing additional options.
+ * @param options.maxLines - (Optional) The number of log lines requested when determining parsers and label keys.
+ * @param options.timeRange - (Optional) The time range for which you want to retrieve label keys. If not provided, the default time range is used.
+ * Smaller maxLines is recommended for improved query performance. The default count is 10.
  * @returns A promise containing an object with parser and label key information.
  * @throws An error if the fetch operation fails.
  */
-async function getParserAndLabelKeys(streamSelector: string): Promise<{
+async function getParserAndLabelKeys(
+  streamSelector: string,
+  options?: { maxLines?: number; timeRange?: TimeRange }
+): Promise<{
   extractedLabelKeys: string[];
   hasJSON: boolean;
   hasLogfmt: boolean;
@@ -139,7 +172,7 @@ async function getParserAndLabelKeys(streamSelector: string): Promise<{
  */
 const streamSelector = '{job="grafana"}';
 try {
-  const parserAndLabelKeys = await getParserAndLabelKeys(streamSelector);
+  const parserAndLabelKeys = await getParserAndLabelKeys(streamSelector, { maxLines: 5 });
   console.log(parserAndLabelKeys);
 } catch (error) {
   console.error(`Error fetching parser and label keys: ${error.message}`);
@@ -147,3 +180,9 @@ try {
 ```
 
 If you find that there are methods missing or have ideas for new features, please don't hesitate to inform us. You can submit your suggestions and feature requests through the [Grafana repository](https://github.com/grafana/grafana/issues/new?assignees=&labels=type%2Ffeature-request&projects=&template=1-feature_requests.md). Your feedback is essential to help us improve and enhance the Loki data source and Grafana as a whole. We appreciate your contributions and look forward to hearing your ideas!
+
+## Recommended components
+
+### QueryEditor
+
+The Loki data source provides an export of the `QueryEditor` component, which can be accessed through `components?.QueryEditor`. This component is designed to enable users to create and customize Loki queries to suit their specific requirements.
diff --git a/public/app/plugins/datasource/loki/getDerivedFields.test.ts b/public/app/plugins/datasource/loki/getDerivedFields.test.ts
index 78e14d002e75f..41004b16c1fe4 100644
--- a/public/app/plugins/datasource/loki/getDerivedFields.test.ts
+++ b/public/app/plugins/datasource/loki/getDerivedFields.test.ts
@@ -3,7 +3,6 @@ import { createDataFrame } from '@grafana/data';
 import { getDerivedFields } from './getDerivedFields';
 
 jest.mock('@grafana/runtime', () => ({
-  // @ts-ignore
   ...jest.requireActual('@grafana/runtime'),
   getDataSourceSrv: () => {
     return {
@@ -26,17 +25,20 @@ describe('getDerivedFields', () => {
     const newFields = getDerivedFields(df, [
       {
         matcherRegex: 'trace1=(\\w+)',
+        matcherType: 'regex',
         name: 'trace1',
         url: 'http://localhost/${__value.raw}',
       },
       {
         matcherRegex: 'trace2=(\\w+)',
+        matcherType: 'regex',
         name: 'trace2',
         url: 'test',
         datasourceUid: 'uid',
       },
       {
         matcherRegex: 'trace2=(\\w+)',
+        matcherType: 'regex',
         name: 'trace2',
         url: 'test',
         datasourceUid: 'uid2',
@@ -44,6 +46,7 @@ describe('getDerivedFields', () => {
       },
       {
         matcherRegex: 'trace=(\\w+)',
+        matcherType: 'regex',
         name: 'tempoTraceId',
         url: 'test',
         datasourceUid: 'tempo-datasource-uid',
@@ -51,6 +54,7 @@ describe('getDerivedFields', () => {
       },
       {
         matcherRegex: 'trace=(\\w+)',
+        matcherType: 'regex',
         name: 'xrayTraceId',
         url: 'test',
         datasourceUid: 'xray-datasource-uid',
@@ -105,4 +109,85 @@ describe('getDerivedFields', () => {
       url: '',
     });
   });
+  it('adds links to fields with labels', () => {
+    const df = createDataFrame({
+      fields: [
+        { name: 'labels', values: [{ trace3: 'bar', trace4: 'blank' }, { trace3: 'tar' }, {}, null] },
+        { name: 'line', values: ['nothing', 'trace1=1234', 'trace2=aa', ''] },
+      ],
+    });
+    const newFields = getDerivedFields(df, [
+      {
+        matcherRegex: 'trace1=(\\w+)',
+        matcherType: 'regex',
+        name: 'trace1',
+        url: 'http://localhost/${__value.raw}',
+      },
+      {
+        matcherRegex: 'trace3',
+        name: 'trace3Name',
+        url: 'http://localhost:8080/${__value.raw}',
+        matcherType: 'label',
+      },
+      {
+        matcherRegex: 'trace4',
+        name: 'trace4Name',
+        matcherType: 'regex',
+      },
+    ]);
+    expect(newFields.length).toBe(3);
+    const trace1 = newFields.find((f) => f.name === 'trace1');
+    expect(trace1!.values).toEqual([null, '1234', null, null]);
+    expect(trace1!.config.links![0]).toEqual({
+      url: 'http://localhost/${__value.raw}',
+      title: '',
+    });
+
+    const trace3 = newFields.find((f) => f.name === 'trace3Name');
+    expect(trace3!.values).toEqual(['bar', 'tar', null, null]);
+    expect(trace3!.config.links![0]).toEqual({
+      url: 'http://localhost:8080/${__value.raw}',
+      title: '',
+    });
+
+    const trace4 = newFields.find((f) => f.name === 'trace4Name');
+    expect(trace4!.values).toEqual([null, null, null, null]);
+  });
+
+  it('adds links to fields with no `matcherType`', () => {
+    const df = createDataFrame({ fields: [{ name: 'line', values: ['nothing', 'trace1=1234', 'trace2=foo'] }] });
+    const newFields = getDerivedFields(df, [
+      {
+        matcherRegex: 'trace1=(\\w+)',
+        name: 'trace1',
+        url: 'http://localhost/${__value.raw}',
+      },
+    ]);
+    expect(newFields.length).toBe(1);
+    const trace1 = newFields.find((f) => f.name === 'trace1');
+    expect(trace1!.values).toEqual([null, '1234', null]);
+    expect(trace1!.config.links![0]).toEqual({
+      url: 'http://localhost/${__value.raw}',
+      title: '',
+    });
+  });
+
+  it('adds links to fields with `matcherType=regex`', () => {
+    const df = createDataFrame({ fields: [{ name: 'line', values: ['nothing', 'trace1=1234', 'trace2=foo'] }] });
+    const newFields = getDerivedFields(df, [
+      {
+        matcherRegex: 'trace1=(\\w+)',
+        matcherType: 'regex',
+        name: 'trace1',
+        url: 'http://localhost/${__value.raw}',
+      },
+    ]);
+    expect(newFields.length).toBe(1);
+    const trace1 = newFields.find((f) => f.name === 'trace1');
+    expect(trace1!.values).toEqual([null, '1234', null]);
+    expect(trace1!.config.links![0]).toEqual({
+      url: 'http://localhost/${__value.raw}',
+      title: '',
+    });
+  });
 });
diff --git a/public/app/plugins/datasource/loki/getDerivedFields.ts b/public/app/plugins/datasource/loki/getDerivedFields.ts
index e2434c23fd8c5..75b9b6f7de7ad 100644
--- a/public/app/plugins/datasource/loki/getDerivedFields.ts
+++ b/public/app/plugins/datasource/loki/getDerivedFields.ts
@@ -22,12 +22,44 @@ export function getDerivedFields(dataFrame: DataFrame, derivedFieldConfigs: Deri
     throw new Error('invalid logs-dataframe, string-field missing');
   }
 
-  lineField.values.forEach((line) => {
+  const labelFields = dataFrame.fields.find((f) => f.type === FieldType.other && f.name === 'labels');
+
+  for (let i = 0; i < lineField.values.length; i++) {
     for (const field of newFields) {
-      const logMatch = line.match(derivedFieldsGrouped[field.name][0].matcherRegex);
-      field.values.push(logMatch && logMatch[1]);
+      // `matcherRegex` can be either a RegExp that is used to extract the value from the log line, or it can be a label key to derive the field from the labels
+      if (derivedFieldsGrouped[field.name][0].matcherType === 'label' && labelFields) {
+        const label = labelFields.values[i];
+        if (label) {
+          // Find the key that matches both, the `matcherRegex` and the label key
+          const intersectingKey = Object.keys(label).find(
+            (key) => derivedFieldsGrouped[field.name][0].matcherRegex === key
+          );
+
+          if (intersectingKey) {
+            field.values.push(label[intersectingKey]);
+            continue;
+          }
+        }
+        field.values.push(null);
+      } else if (
+        derivedFieldsGrouped[field.name][0].matcherType === 'regex' ||
+        derivedFieldsGrouped[field.name][0].matcherType === undefined
+      ) {
+        // `matcherRegex` will actually be used as a RegExp here
+        const line = lineField.values[i];
+        const logMatch = line.match(derivedFieldsGrouped[field.name][0].matcherRegex);
+
+        if (logMatch && logMatch[1]) {
+          field.values.push(logMatch[1]);
+          continue;
+        }
+
+        field.values.push(null);
+      } else {
+        field.values.push(null);
+      }
     }
-  });
+  }
 
   return newFields;
 }
diff --git a/public/app/plugins/datasource/loki/languageUtils.test.ts b/public/app/plugins/datasource/loki/languageUtils.test.ts
index 80d7b2aa7e660..ad36b672f87bb 100644
--- a/public/app/plugins/datasource/loki/languageUtils.test.ts
+++ b/public/app/plugins/datasource/loki/languageUtils.test.ts
@@ -1,4 +1,14 @@
-import { escapeLabelValueInExactSelector, isBytesString, unescapeLabelValue } from './languageUtils';
+import { toDataFrame, FieldType, AbstractQuery, AbstractLabelOperator } from '@grafana/data';
+
+import {
+  abstractQueryToExpr,
+  escapeLabelValueInExactSelector,
+  getLabelTypeFromFrame,
+  isBytesString,
+  processLabels,
+  unescapeLabelValue,
+} from './languageUtils';
+import { LabelType } from './types';
 
 describe('isBytesString', () => {
   it('correctly matches bytes string with integers', () => {
@@ -42,3 +52,78 @@ describe('unescapeLabelValueInExactSelector', () => {
     expect(unescapeLabelValue(value)).toEqual(unescapedValue);
   });
 });
+
+describe('getLabelTypeFromFrame', () => {
+  const frameWithTypes = toDataFrame({
+    fields: [
+      { name: 'Time', type: FieldType.time, values: [0] },
+      {
+        name: 'Line',
+        type: FieldType.string,
+        values: ['line1'],
+      },
+      { name: 'labelTypes', type: FieldType.other, values: [{ indexed: 'I', parsed: 'P', structured: 'S' }] },
+    ],
+  });
+  const frameWithoutTypes = toDataFrame({
+    fields: [
+      { name: 'Time', type: FieldType.time, values: [0] },
+      {
+        name: 'Line',
+        type: FieldType.string,
+        values: ['line1'],
+      },
+      { name: 'labels', type: FieldType.other, values: [{ job: 'test' }] },
+    ],
+  });
+  it('returns structuredMetadata', () => {
+    expect(getLabelTypeFromFrame('structured', frameWithTypes, 0)).toBe(LabelType.StructuredMetadata);
+  });
+  it('returns indexed', () => {
+    expect(getLabelTypeFromFrame('indexed', frameWithTypes, 0)).toBe(LabelType.Indexed);
+  });
+  it('returns parsed', () => {
+    expect(getLabelTypeFromFrame('parsed', frameWithTypes, 0)).toBe(LabelType.Parsed);
+  });
+  it('returns null for unknown field', () => {
+    expect(getLabelTypeFromFrame('unknown', frameWithTypes, 0)).toBe(null);
+  });
+  it('returns null for frame without types', () => {
+    expect(getLabelTypeFromFrame('job', frameWithoutTypes, 0)).toBe(null);
+  });
+});
+
+describe('abstractQueryToExpr', () => {
+  it('export abstract query to expr', () => {
+    const abstractQuery: AbstractQuery = {
+      refId: 'bar',
+      labelMatchers: [
+        { name: 'label1', operator: AbstractLabelOperator.Equal, value: 'value1' },
+        { name: 'label2', operator: AbstractLabelOperator.NotEqual, value: 'value2' },
+        { name: 'label3', operator: AbstractLabelOperator.EqualRegEx, value: 'value3' },
+        { name: 'label4', operator: AbstractLabelOperator.NotEqualRegEx, value: 'value4' },
+      ],
+    };
+
+    expect(abstractQueryToExpr(abstractQuery)).toBe(
+      '{label1="value1", label2!="value2", label3=~"value3", label4!~"value4"}'
+    );
+  });
+});
+
+describe('processLabels', () => {
+  it('export abstract query to expr', () => {
+    const labels: Array<{ [key: string]: string }> = [
+      { label1: 'value1' },
+      { label2: 'value2' },
+      { label3: 'value3' },
+      { label1: 'value1' },
+      { label1: 'value1b' },
+    ];
+
+    expect(processLabels(labels)).toEqual({
+      keys: ['label1', 'label2', 'label3'],
+      values: { label1: ['value1', 'value1b'], label2: ['value2'], label3: ['value3'] },
+    });
+  });
+});
diff --git a/public/app/plugins/datasource/loki/languageUtils.ts b/public/app/plugins/datasource/loki/languageUtils.ts
index 581d8a991a1c5..04c842d1288b3 100644
--- a/public/app/plugins/datasource/loki/languageUtils.ts
+++ b/public/app/plugins/datasource/loki/languageUtils.ts
@@ -1,4 +1,8 @@
-import { TimeRange } from '@grafana/data';
+import { invert } from 'lodash';
+
+import { AbstractLabelMatcher, AbstractLabelOperator, AbstractQuery, DataFrame, TimeRange } from '@grafana/data';
+
+import { LabelType } from './types';
 
 function roundMsToMin(milliseconds: number): number {
   return roundSecToMin(milliseconds / 1000);
@@ -88,3 +92,77 @@ export function isBytesString(string: string) {
   const match = string.match(regex);
   return !!match;
 }
+
+export function getLabelTypeFromFrame(labelKey: string, frame?: DataFrame, index?: number): null | LabelType {
+  if (!frame || index === undefined) {
+    return null;
+  }
+
+  const typeField = frame.fields.find((field) => field.name === 'labelTypes')?.values[index];
+  if (!typeField) {
+    return null;
+  }
+  switch (typeField[labelKey]) {
+    case 'I':
+      return LabelType.Indexed;
+    case 'S':
+      return LabelType.StructuredMetadata;
+    case 'P':
+      return LabelType.Parsed;
+    default:
+      return null;
+  }
+}
+
+export const mapOpToAbstractOp: Record<AbstractLabelOperator, string> = {
+  [AbstractLabelOperator.Equal]: '=',
+  [AbstractLabelOperator.NotEqual]: '!=',
+  [AbstractLabelOperator.EqualRegEx]: '=~',
+  [AbstractLabelOperator.NotEqualRegEx]: '!~',
+};
+
+// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+export const mapAbstractOperatorsToOp = invert(mapOpToAbstractOp) as Record<string, AbstractLabelOperator>;
+
+export function abstractQueryToExpr(labelBasedQuery: AbstractQuery): string {
+  const expr = labelBasedQuery.labelMatchers
+    .map((selector: AbstractLabelMatcher) => {
+      const operator = mapOpToAbstractOp[selector.operator];
+      if (operator) {
+        return `${selector.name}${operator}"${selector.value}"`;
+      } else {
+        return '';
+      }
+    })
+    .filter((e: string) => e !== '')
+    .join(', ');
+
+  return expr ? `{${expr}}` : '';
+}
+
+export function processLabels(labels: Array<{ [key: string]: string }>) {
+  const valueSet: { [key: string]: Set<string> } = {};
+  labels.forEach((label) => {
+    Object.keys(label).forEach((key) => {
+      if (!valueSet[key]) {
+        valueSet[key] = new Set();
+      }
+      if (!valueSet[key].has(label[key])) {
+        valueSet[key].add(label[key]);
+      }
+    });
+  });
+
+  const valueArray: { [key: string]: string[] } = {};
+  limitSuggestions(Object.keys(valueSet)).forEach((key) => {
+    valueArray[key] = limitSuggestions(Array.from(valueSet[key]));
+  });
+
+  return { values: valueArray, keys: Object.keys(valueArray) };
+}
+
+// Max number of items (metrics, labels, values) that we display as suggestions. Prevents from running out of memory.
+export const SUGGESTIONS_LIMIT = 10000;
+export function limitSuggestions(items: string[]) {
+  return items.slice(0, SUGGESTIONS_LIMIT);
+}
diff --git a/public/app/plugins/datasource/loki/makeTableFrames.ts b/public/app/plugins/datasource/loki/makeTableFrames.ts
index 217f3e9058a35..57224a3b0bb08 100644
--- a/public/app/plugins/datasource/loki/makeTableFrames.ts
+++ b/public/app/plugins/datasource/loki/makeTableFrames.ts
@@ -12,8 +12,8 @@ export function makeTableFrames(instantMetricFrames: DataFrame[]): DataFrame[] {
   return Object.entries(framesByRefId).map(([refId, frames]) => makeTableFrame(frames, refId));
 }
 
-type NumberField = Field<number, number[]>;
-type StringField = Field<string, string[]>;
+type NumberField = Field<number>;
+type StringField = Field<string>;
 
 function makeTableFrame(instantMetricFrames: DataFrame[], refId: string): DataFrame {
   const tableTimeField: NumberField = { name: 'Time', config: {}, values: [], type: FieldType.time };
diff --git a/public/app/plugins/datasource/loki/metricTimeSplitting.test.ts b/public/app/plugins/datasource/loki/metricTimeSplitting.test.ts
index 52bd39e068bc0..8d836f8289464 100644
--- a/public/app/plugins/datasource/loki/metricTimeSplitting.test.ts
+++ b/public/app/plugins/datasource/loki/metricTimeSplitting.test.ts
@@ -1,15 +1,55 @@
 import { splitTimeRange } from './metricTimeSplitting';
 
 describe('metric splitTimeRange', () => {
-  it('should split time range into chunks', () => {
-    const start = Date.parse('2022-02-06T14:10:03');
-    const end = Date.parse('2022-02-06T14:11:03');
-    const step = 10 * 1000;
+  it('should split time range into chunks with 1day split and duration', () => {
+    const start = Date.parse('2022-02-06T14:10:03Z');
+    const end = Date.parse('2022-02-08T14:11:03Z');
+    const step = 24 * 60 * 60 * 1000; // 1 day
+    const rangeDuration = 24 * 60 * 60 * 1000; // 1 day
+
+    expect(splitTimeRange(start, end, step, rangeDuration)).toStrictEqual([
+      [Date.parse('2022-02-06T00:00:00Z'), Date.parse('2022-02-06T00:00:00Z')],
+      [Date.parse('2022-02-07T00:00:00Z'), Date.parse('2022-02-07T00:00:00Z')],
+      [Date.parse('2022-02-08T00:00:00Z'), Date.parse('2022-02-08T00:00:00Z')],
+    ]);
+  });
+
+  it('should split time range into chunks with 1day split and duration and a 5 minute duration', () => {
+    const start = Date.parse('2022-02-06T14:00:00Z');
+    const end = Date.parse('2022-02-06T14:05:00Z');
+    const step = 24 * 60 * 60 * 1000; // 1 day
+    const rangeDuration = 24 * 60 * 60 * 1000; // 1 day
+
+    expect(splitTimeRange(start, end, step, rangeDuration)).toStrictEqual([
+      [Date.parse('2022-02-06T00:00:00Z'), Date.parse('2022-02-06T00:00:00Z')],
+    ]);
+  });
+
+  it('should split time range into chunks with 1hour split and 1day duration', () => {
+    const start = Date.parse('2022-02-06T14:10:03Z');
+    const end = Date.parse('2022-02-08T14:11:03Z');
+    const step = 60 * 60 * 1000; // 1 hour
+    const rangeDuration = 24 * 60 * 60 * 1000; // 1 day
+
+    expect(splitTimeRange(start, end, step, rangeDuration)).toStrictEqual([
+      [Date.parse('2022-02-06T14:00:00Z'), Date.parse('2022-02-07T13:00:00Z')],
+      [Date.parse('2022-02-07T14:00:00Z'), Date.parse('2022-02-08T13:00:00Z')],
+      [Date.parse('2022-02-08T14:00:00Z'), Date.parse('2022-02-08T14:11:03Z')],
+    ]);
+  });
+
+  it('should split time range into chunks with 1hour split and 12h duration', () => {
+    const start = Date.parse('2022-02-06T14:10:03Z');
+    const end = Date.parse('2022-02-08T14:11:03Z');
+    const step = 60 * 60 * 1000; // 1 hour
+    const rangeDuration = 12 * 60 * 60 * 1000; // 12h
 
-    expect(splitTimeRange(start, end, step, 25000)).toStrictEqual([
-      [Date.parse('2022-02-06T14:10:00'), Date.parse('2022-02-06T14:10:10')],
-      [Date.parse('2022-02-06T14:10:20'), Date.parse('2022-02-06T14:10:40')],
-      [Date.parse('2022-02-06T14:10:50'), Date.parse('2022-02-06T14:11:10')],
+    expect(splitTimeRange(start, end, step, rangeDuration)).toStrictEqual([
+      [Date.parse('2022-02-06T14:00:00Z'), Date.parse('2022-02-07T01:00:00Z')],
+      [Date.parse('2022-02-07T02:00:00Z'), Date.parse('2022-02-07T13:00:00Z')],
+      [Date.parse('2022-02-07T14:00:00Z'), Date.parse('2022-02-08T01:00:00Z')],
+      [Date.parse('2022-02-08T02:00:00Z'), Date.parse('2022-02-08T13:00:00Z')],
+      [Date.parse('2022-02-08T14:00:00Z'), Date.parse('2022-02-08T14:11:03Z')],
     ]);
   });
 
diff --git a/public/app/plugins/datasource/loki/metricTimeSplitting.ts b/public/app/plugins/datasource/loki/metricTimeSplitting.ts
index facbf19951536..0af619673ee3d 100644
--- a/public/app/plugins/datasource/loki/metricTimeSplitting.ts
+++ b/public/app/plugins/datasource/loki/metricTimeSplitting.ts
@@ -5,20 +5,6 @@
 // we are trying to be compatible with
 // https://github.com/grafana/loki/blob/089ec1b05f5ec15a8851d0e8230153e0eeb4dcec/pkg/querier/queryrange/split_by_interval.go#L327-L336
 
-function expandTimeRange(startTime: number, endTime: number, step: number): [number, number] {
-  // startTime is decreased to the closes multiple-of-step, if necessary
-  const newStartTime = startTime - (startTime % step);
-
-  // endTime is increased to the closed multiple-of-step, if necessary
-  let newEndTime = endTime;
-  const endStepMod = endTime % step;
-  if (endStepMod !== 0) {
-    newEndTime += step - endStepMod;
-  }
-
-  return [newStartTime, newEndTime];
-}
-
 export function splitTimeRange(
   startTime: number,
   endTime: number,
@@ -33,20 +19,19 @@ export function splitTimeRange(
   // we make the duration a multiple of `step`, lowering it if necessary
   const alignedDuration = Math.trunc(idealRangeDuration / step) * step;
 
-  const [alignedStartTime, alignedEndTime] = expandTimeRange(startTime, endTime, step);
+  const alignedStartTime = startTime - (startTime % step);
 
   const result: Array<[number, number]> = [];
 
-  // we iterate it from the end, because we want to have the potentially smaller chunk at the end, not at the beginning
-  for (let chunkEndTime = alignedEndTime; chunkEndTime > alignedStartTime; chunkEndTime -= alignedDuration + step) {
-    // when we get close to the start of the time range, we need to be sure not
-    // to cross over the startTime
-    const chunkStartTime = Math.max(chunkEndTime - alignedDuration, alignedStartTime);
+  // in a previous version we started iterating from the end, to the start.
+  // However this is not easily possible as end timestamps are always inclusive
+  // for Loki. So a `2022-02-08T00:00:00Z` end time with a 1day step would mean
+  // to include the 08.02.2022, which we don't want. So we have to start from
+  // the start, always ending at the last step before the actual end, or the total end.
+  for (let chunkStartTime = alignedStartTime; chunkStartTime < endTime; chunkStartTime += alignedDuration) {
+    const chunkEndTime = Math.min(chunkStartTime + alignedDuration - step, endTime);
     result.push([chunkStartTime, chunkEndTime]);
   }
 
-  // because we walked backwards, we need to reverse the array
-  result.reverse();
-
   return result;
 }
diff --git a/public/app/plugins/datasource/loki/mocks.ts b/public/app/plugins/datasource/loki/mocks.ts
deleted file mode 100644
index 1507eb05f5534..0000000000000
--- a/public/app/plugins/datasource/loki/mocks.ts
+++ /dev/null
@@ -1,310 +0,0 @@
-import {
-  DataFrame,
-  DataFrameType,
-  DataSourceInstanceSettings,
-  DataSourceSettings,
-  FieldType,
-  PluginType,
-  toUtc,
-} from '@grafana/data';
-import { TemplateSrv } from '@grafana/runtime';
-
-import { getMockDataSource } from '../../../features/datasources/__mocks__';
-
-import { LokiDatasource } from './datasource';
-import { LokiOptions } from './types';
-
-export function createDefaultConfigOptions(): DataSourceSettings<LokiOptions> {
-  return getMockDataSource<LokiOptions>({
-    jsonData: { maxLines: '531' },
-  });
-}
-
-const rawRange = {
-  from: toUtc('2018-04-25 10:00'),
-  to: toUtc('2018-04-25 11:00'),
-};
-
-const defaultTimeSrvMock = {
-  timeRange: jest.fn().mockReturnValue({
-    from: rawRange.from,
-    to: rawRange.to,
-    raw: rawRange,
-  }),
-};
-
-const defaultTemplateSrvMock = {
-  replace: (input: string) => input,
-};
-
-export function createLokiDatasource(
-  templateSrvMock: Partial<TemplateSrv> = defaultTemplateSrvMock,
-  settings: Partial<DataSourceInstanceSettings<LokiOptions>> = {},
-  timeSrvStub = defaultTimeSrvMock
-): LokiDatasource {
-  const customSettings: DataSourceInstanceSettings<LokiOptions> = {
-    url: 'myloggingurl',
-    id: 0,
-    uid: '',
-    type: '',
-    name: '',
-    meta: {
-      id: 'id',
-      name: 'name',
-      type: PluginType.datasource,
-      module: '',
-      baseUrl: '',
-      info: {
-        author: {
-          name: 'Test',
-        },
-        description: '',
-        links: [],
-        logos: {
-          large: '',
-          small: '',
-        },
-        screenshots: [],
-        updated: '',
-        version: '',
-      },
-    },
-    readOnly: false,
-    jsonData: {
-      maxLines: '20',
-    },
-    access: 'direct',
-    ...settings,
-  };
-
-  // @ts-expect-error
-  return new LokiDatasource(customSettings, templateSrvMock, timeSrvStub);
-}
-
-export function createMetadataRequest(
-  labelsAndValues: Record<string, string[]>,
-  series?: Record<string, Array<Record<string, string>>>
-) {
-  // added % to allow urlencoded labelKeys. Note, that this is not confirm with Loki, as loki does not allow specialcharacters in labelKeys, but needed for tests.
-  const lokiLabelsAndValuesEndpointRegex = /^label\/([%\w]*)\/values/;
-  const lokiSeriesEndpointRegex = /^series/;
-  const lokiLabelsEndpoint = 'labels';
-  const labels = Object.keys(labelsAndValues);
-
-  return async function metadataRequestMock(url: string, params?: Record<string, string | number>) {
-    if (url === lokiLabelsEndpoint) {
-      return labels;
-    } else {
-      const labelsMatch = url.match(lokiLabelsAndValuesEndpointRegex);
-      const seriesMatch = url.match(lokiSeriesEndpointRegex);
-      if (labelsMatch) {
-        return labelsAndValues[labelsMatch[1]] || [];
-      } else if (seriesMatch && series && params) {
-        return series[params['match[]']] || [];
-      } else {
-        throw new Error(`Unexpected url error, ${url}`);
-      }
-    }
-  };
-}
-
-export function getMockFrames() {
-  const logFrameA: DataFrame = {
-    refId: 'A',
-    fields: [
-      {
-        name: 'Time',
-        type: FieldType.time,
-        config: {},
-        values: [3, 4],
-      },
-      {
-        name: 'Line',
-        type: FieldType.string,
-        config: {},
-        values: ['line1', 'line2'],
-      },
-      {
-        name: 'labels',
-        type: FieldType.other,
-        config: {},
-        values: [
-          {
-            label: 'value',
-          },
-          {
-            otherLabel: 'other value',
-          },
-        ],
-      },
-      {
-        name: 'tsNs',
-        type: FieldType.string,
-        config: {},
-        values: ['3000000', '4000000'],
-      },
-      {
-        name: 'id',
-        type: FieldType.string,
-        config: {},
-        values: ['id1', 'id2'],
-      },
-    ],
-    meta: {
-      custom: {
-        frameType: 'LabeledTimeValues',
-      },
-      stats: [
-        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 11 },
-        { displayName: 'Ingester: total reached', value: 1 },
-      ],
-    },
-    length: 2,
-  };
-
-  const logFrameB: DataFrame = {
-    refId: 'A',
-    fields: [
-      {
-        name: 'Time',
-        type: FieldType.time,
-        config: {},
-        values: [1, 2],
-      },
-      {
-        name: 'Line',
-        type: FieldType.string,
-        config: {},
-        values: ['line3', 'line4'],
-      },
-      {
-        name: 'labels',
-        type: FieldType.other,
-        config: {},
-        values: [
-          {
-            otherLabel: 'other value',
-          },
-        ],
-      },
-      {
-        name: 'tsNs',
-        type: FieldType.string,
-        config: {},
-        values: ['1000000', '2000000'],
-      },
-      {
-        name: 'id',
-        type: FieldType.string,
-        config: {},
-        values: ['id3', 'id4'],
-      },
-    ],
-    meta: {
-      custom: {
-        frameType: 'LabeledTimeValues',
-      },
-      stats: [
-        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 22 },
-        { displayName: 'Ingester: total reached', value: 2 },
-      ],
-    },
-    length: 2,
-  };
-
-  const metricFrameA: DataFrame = {
-    refId: 'A',
-    fields: [
-      {
-        name: 'Time',
-        type: FieldType.time,
-        config: {},
-        values: [3000000, 4000000],
-      },
-      {
-        name: 'Value',
-        type: FieldType.number,
-        config: {},
-        values: [5, 4],
-        labels: {
-          level: 'debug',
-        },
-      },
-    ],
-    meta: {
-      type: DataFrameType.TimeSeriesMulti,
-      stats: [
-        { displayName: 'Ingester: total reached', value: 1 },
-        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 11 },
-      ],
-    },
-    length: 2,
-  };
-
-  const metricFrameB: DataFrame = {
-    refId: 'A',
-    fields: [
-      {
-        name: 'Time',
-        type: FieldType.time,
-        config: {},
-        values: [1000000, 2000000],
-      },
-      {
-        name: 'Value',
-        type: FieldType.number,
-        config: {},
-        values: [6, 7],
-        labels: {
-          level: 'debug',
-        },
-      },
-    ],
-    meta: {
-      type: DataFrameType.TimeSeriesMulti,
-      stats: [
-        { displayName: 'Ingester: total reached', value: 2 },
-        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 22 },
-      ],
-    },
-    length: 2,
-  };
-
-  const metricFrameC: DataFrame = {
-    refId: 'A',
-    name: 'some-time-series',
-    fields: [
-      {
-        name: 'Time',
-        type: FieldType.time,
-        config: {},
-        values: [3000000, 4000000],
-      },
-      {
-        name: 'Value',
-        type: FieldType.number,
-        config: {},
-        values: [6, 7],
-        labels: {
-          level: 'error',
-        },
-      },
-    ],
-    meta: {
-      type: DataFrameType.TimeSeriesMulti,
-      stats: [
-        { displayName: 'Ingester: total reached', value: 2 },
-        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 33 },
-      ],
-    },
-    length: 2,
-  };
-
-  return {
-    logFrameA,
-    logFrameB,
-    metricFrameA,
-    metricFrameB,
-    metricFrameC,
-  };
-}
diff --git a/public/app/plugins/datasource/loki/modifyQuery.test.ts b/public/app/plugins/datasource/loki/modifyQuery.test.ts
index 9b22d51896500..90f6e8d876baa 100644
--- a/public/app/plugins/datasource/loki/modifyQuery.test.ts
+++ b/public/app/plugins/datasource/loki/modifyQuery.test.ts
@@ -3,6 +3,7 @@ import { SyntaxNode } from '@lezer/common';
 import {
   addLabelFormatToQuery,
   addLabelToQuery,
+  addLineFilter,
   addNoPipelineErrorToQuery,
   addParserToQuery,
   NodePosition,
@@ -10,6 +11,7 @@ import {
   removeCommentsFromQuery,
   removeLabelFromQuery,
 } from './modifyQuery';
+import { LabelType } from './types';
 
 describe('addLabelToQuery()', () => {
   it.each`
@@ -73,17 +75,41 @@ describe('addLabelToQuery()', () => {
     }
   );
 
-  it('should always add label as labelFilter if force flag is given', () => {
-    expect(addLabelToQuery('{foo="bar"}', 'forcedLabel', '=', 'value', true)).toEqual(
+  it('should always add label as labelFilter if label type is parsed', () => {
+    expect(addLabelToQuery('{foo="bar"}', 'forcedLabel', '=', 'value', LabelType.Parsed)).toEqual(
       '{foo="bar"} | forcedLabel=`value`'
     );
   });
 
-  it('should always add label as labelFilter if force flag is given with a parser', () => {
-    expect(addLabelToQuery('{foo="bar"} | logfmt', 'forcedLabel', '=', 'value', true)).toEqual(
+  it('should always add label as labelFilter if label type is parsed with parser', () => {
+    expect(addLabelToQuery('{foo="bar"} | logfmt', 'forcedLabel', '=', 'value', LabelType.Parsed)).toEqual(
       '{foo="bar"} | logfmt | forcedLabel=`value`'
     );
   });
+
+  it('should always add label as labelFilter if label type is structured', () => {
+    expect(addLabelToQuery('{foo="bar"}', 'forcedLabel', '=', 'value', LabelType.StructuredMetadata)).toEqual(
+      '{foo="bar"} | forcedLabel=`value`'
+    );
+  });
+
+  it('should always add label as labelFilter if label type is structured with parser', () => {
+    expect(addLabelToQuery('{foo="bar"} | logfmt', 'forcedLabel', '=', 'value', LabelType.StructuredMetadata)).toEqual(
+      '{foo="bar"} | logfmt | forcedLabel=`value`'
+    );
+  });
+
+  it('should add label as labelFilter to multiple places if label is StructuredMetadata', () => {
+    expect(
+      addLabelToQuery(
+        'rate({foo="bar"} [$__auto]) / rate({foo="bar"} [$__auto])',
+        'forcedLabel',
+        '=',
+        'value',
+        LabelType.StructuredMetadata
+      )
+    ).toEqual('rate({foo="bar"} | forcedLabel=`value` [$__auto]) / rate({foo="bar"} | forcedLabel=`value` [$__auto])');
+  });
 });
 
 describe('addParserToQuery', () => {
@@ -306,3 +332,22 @@ describe('removeLabelFromQuery', () => {
     expect(removeLabelFromQuery(query, 'job', '!=', value)).toBe(expected);
   });
 });
+
+describe.each(['|=', '!='])('addLineFilter type %s', (op: string) => {
+  it('Adds a line filter to a log query', () => {
+    expect(addLineFilter('{place="earth"}', undefined, op)).toBe(`{place="earth"} ${op} \`\``);
+  });
+  it('Adds a line filter with a value to a log query', () => {
+    expect(addLineFilter('{place="earth"}', 'content', op)).toBe(`{place="earth"} ${op} \`content\``);
+  });
+  it('Adds a line filter to a metric query', () => {
+    expect(addLineFilter('avg_over_time({place="earth"} [1m])', undefined, op)).toBe(
+      `avg_over_time({place="earth"} ${op} \`\` [1m])`
+    );
+  });
+  it('Adds a line filter with a value to a metric query', () => {
+    expect(addLineFilter('avg_over_time({place="earth"} [1m])', 'content', op)).toBe(
+      `avg_over_time({place="earth"} ${op} \`content\` [1m])`
+    );
+  });
+});
diff --git a/public/app/plugins/datasource/loki/modifyQuery.ts b/public/app/plugins/datasource/loki/modifyQuery.ts
index 7335fe2b93026..130c29c0a689d 100644
--- a/public/app/plugins/datasource/loki/modifyQuery.ts
+++ b/public/app/plugins/datasource/loki/modifyQuery.ts
@@ -1,6 +1,7 @@
 import { NodeType, SyntaxNode } from '@lezer/common';
 import { sortBy } from 'lodash';
 
+import { QueryBuilderLabelFilter } from '@grafana/experimental';
 import {
   Identifier,
   LabelFilter,
@@ -22,12 +23,11 @@ import {
   Expr,
 } from '@grafana/lezer-logql';
 
-import { QueryBuilderLabelFilter } from '../prometheus/querybuilder/shared/types';
-
 import { unescapeLabelValue } from './languageUtils';
 import { getNodePositionsFromQuery } from './queryUtils';
 import { lokiQueryModeller as modeller } from './querybuilder/LokiQueryModeller';
 import { buildVisualQueryFromString, handleQuotes } from './querybuilder/parsing';
+import { LabelType } from './types';
 
 export class NodePosition {
   from: number;
@@ -142,19 +142,13 @@ function getMatchersWithFilter(query: string, label: string, operator: string, v
  *
  * This operates on substrings of the query with labels and operates just on those. This makes this
  * more robust and can alter even invalid queries, and preserves in general the query structure and whitespace.
- *
- * @param {string} query
- * @param {string} key
- * @param {string} operator
- * @param {string} value
- * @param {boolean} [forceAsLabelFilter=false]  - if true, it will add a LabelFilter expression even if there is no parser in the query
  */
 export function addLabelToQuery(
   query: string,
   key: string,
   operator: string,
   value: string,
-  forceAsLabelFilter = false
+  labelType?: LabelType | null
 ): string {
   if (!key || !value) {
     throw new Error('Need label to add to query.');
@@ -165,6 +159,8 @@ export function addLabelToQuery(
     return query;
   }
 
+  const parserPositions = getParserPositions(query);
+  const labelFilterPositions = getLabelFilterPositions(query);
   const hasStreamSelectorMatchers = getMatcherInStreamPositions(query);
   const everyStreamSelectorHasMatcher = streamSelectorPositions.every((streamSelectorPosition) =>
     hasStreamSelectorMatchers.some(
@@ -172,41 +168,51 @@ export function addLabelToQuery(
         matcherPosition.from >= streamSelectorPosition.from && matcherPosition.to <= streamSelectorPosition.to
     )
   );
-  const parserPositions = getParserPositions(query);
-  const labelFilterPositions = getLabelFilterPositions(query);
 
   const filter = toLabelFilter(key, value, operator);
-  // If we have non-empty stream selector and parser/label filter, we want to add a new label filter after the last one.
-  // If some of the stream selectors don't have matchers, we want to add new matcher to the all stream selectors.
-  if (forceAsLabelFilter) {
-    // `forceAsLabelFilter` is mostly used for structured metadata labels. Those are not
-    // very well distinguishable from real labels, but need to be added as label
-    // filters after the last stream selector, parser or label filter. This is
-    // just a quickfix for now and still has edge-cases where it can fail.
-    // TODO: improve this once we have a better API in Loki to distinguish
-    // between the origins of labels.
-    const positionToAdd = findLastPosition([...streamSelectorPositions, ...labelFilterPositions, ...parserPositions]);
-    return addFilterAsLabelFilter(query, [positionToAdd], filter);
-  } else if (everyStreamSelectorHasMatcher && (labelFilterPositions.length || parserPositions.length)) {
-    // in case we are not adding the label to stream selectors we need to find the last position to add in each expression
-    const subExpressions = findLeaves(getNodePositionsFromQuery(query, [Expr]));
-    const parserFilterPositions = [...parserPositions, ...labelFilterPositions];
-
-    // find last position for each subexpression
-    const lastPositionsPerExpression = subExpressions.map((subExpression) => {
-      return findLastPosition(
-        parserFilterPositions.filter((p) => {
-          return subExpression.contains(p);
-        })
-      );
-    });
+  if (labelType === LabelType.Parsed || labelType === LabelType.StructuredMetadata) {
+    const lastPositionsPerExpression = getLastPositionPerExpression(query, [
+      ...streamSelectorPositions,
+      ...labelFilterPositions,
+      ...parserPositions,
+    ]);
 
     return addFilterAsLabelFilter(query, lastPositionsPerExpression, filter);
-  } else {
+  } else if (labelType === LabelType.Indexed) {
     return addFilterToStreamSelector(query, streamSelectorPositions, filter);
+  } else {
+    // labelType is not set, so we need to figure out where to add the label
+    // if we don't have a parser, or have empty stream selectors, we will just add it to the stream selector
+    if (parserPositions.length === 0 || everyStreamSelectorHasMatcher === false) {
+      return addFilterToStreamSelector(query, streamSelectorPositions, filter);
+    } else {
+      // If `labelType` is not set, it indicates a potential metric query (`labelType` is present only in log queries that came from a Loki instance supporting the `categorize-labels` API). In case we are not adding the label to stream selectors we need to find the last position to add in each expression.
+      // E.g. in `sum(rate({foo="bar"} | logfmt [$__auto])) / sum(rate({foo="baz"} | logfmt [$__auto]))` we need to add the label at two places.
+      const lastPositionsPerExpression = getLastPositionPerExpression(query, [
+        ...parserPositions,
+        ...labelFilterPositions,
+      ]);
+
+      return addFilterAsLabelFilter(query, lastPositionsPerExpression, filter);
+    }
   }
 }
 
+function getLastPositionPerExpression(query: string, positions: NodePosition[]): NodePosition[] {
+  const subExpressions = findLeaves(getNodePositionsFromQuery(query, [Expr]));
+  const subPositions = [...positions];
+
+  // find last position for each subexpression
+  const lastPositionsPerExpression = subExpressions.map((subExpression) => {
+    return findLastPosition(
+      subPositions.filter((p) => {
+        return subExpression.contains(p);
+      })
+    );
+  });
+  return lastPositionsPerExpression;
+}
+
 /**
  * Adds parser to existing query. Useful for query modification for hints.
  * It uses LogQL parser to find instances of stream selectors or line filters and adds parser after them.
@@ -297,19 +303,6 @@ export function getStreamSelectorPositions(query: string): NodePosition[] {
   return positions;
 }
 
-function getMatcherInStreamPositions(query: string): NodePosition[] {
-  const tree = parser.parse(query);
-  const positions: NodePosition[] = [];
-  tree.iterate({
-    enter: ({ node }): false | void => {
-      if (node.type.id === Selector) {
-        positions.push(...getAllPositionsInNodeByType(node, Matcher));
-      }
-    },
-  });
-  return positions;
-}
-
 /**
  * Parse the string and get all LabelParser positions in the query.
  * @param query
@@ -540,14 +533,14 @@ function addLabelFormat(
   return newQuery;
 }
 
-export function addLineFilter(query: string): string {
+export function addLineFilter(query: string, value = '', operator = '|='): string {
   const streamSelectorPositions = getStreamSelectorPositions(query);
   if (!streamSelectorPositions.length) {
     return query;
   }
   const streamSelectorEnd = streamSelectorPositions[0].to;
 
-  const newQueryExpr = query.slice(0, streamSelectorEnd) + ' |= ``' + query.slice(streamSelectorEnd);
+  const newQueryExpr = query.slice(0, streamSelectorEnd) + ` ${operator} \`${value}\`` + query.slice(streamSelectorEnd);
   return newQueryExpr;
 }
 
@@ -579,9 +572,22 @@ function labelExists(labels: QueryBuilderLabelFilter[], filter: QueryBuilderLabe
  * @param positions
  */
 export function findLastPosition(positions: NodePosition[]): NodePosition {
+  if (!positions.length) {
+    return new NodePosition(0, 0);
+  }
   return positions.reduce((prev, current) => (prev.to > current.to ? prev : current));
 }
 
+/**
+ * Gets all leaves of the nodes given. Leaves are nodes that don't contain any other nodes.
+ *
+ * @param {NodePosition[]} nodes
+ * @return
+ */
+function findLeaves(nodes: NodePosition[]): NodePosition[] {
+  return nodes.filter((node) => nodes.every((n) => node.contains(n) === false || node === n));
+}
+
 function getAllPositionsInNodeByType(node: SyntaxNode, type: number): NodePosition[] {
   if (node.type.id === type) {
     return [NodePosition.fromNode(node)];
@@ -598,12 +604,15 @@ function getAllPositionsInNodeByType(node: SyntaxNode, type: number): NodePositi
   return positions;
 }
 
-/**
- * Gets all leaves of the nodes given. Leaves are nodes that don't contain any other nodes.
- *
- * @param {NodePosition[]} nodes
- * @return
- */
-function findLeaves(nodes: NodePosition[]): NodePosition[] {
-  return nodes.filter((node) => nodes.every((n) => node.contains(n) === false || node === n));
+function getMatcherInStreamPositions(query: string): NodePosition[] {
+  const tree = parser.parse(query);
+  const positions: NodePosition[] = [];
+  tree.iterate({
+    enter: ({ node }): false | void => {
+      if (node.type.id === Selector) {
+        positions.push(...getAllPositionsInNodeByType(node, Matcher));
+      }
+    },
+  });
+  return positions;
 }
diff --git a/public/app/plugins/datasource/loki/querySplitting.test.ts b/public/app/plugins/datasource/loki/querySplitting.test.ts
index f92dd4c03accb..f6faeee5c67da 100644
--- a/public/app/plugins/datasource/loki/querySplitting.test.ts
+++ b/public/app/plugins/datasource/loki/querySplitting.test.ts
@@ -1,17 +1,20 @@
 import { of } from 'rxjs';
-import { getQueryOptions } from 'test/helpers/getQueryOptions';
 
-import { dateTime, LoadingState } from '@grafana/data';
+import { DataQueryRequest, dateTime, LoadingState } from '@grafana/data';
 
+import { createLokiDatasource } from './__mocks__/datasource';
+import { getMockFrames } from './__mocks__/frames';
 import { LokiDatasource } from './datasource';
 import * as logsTimeSplit from './logsTimeSplitting';
 import * as metricTimeSplit from './metricTimeSplitting';
-import { createLokiDatasource, getMockFrames } from './mocks';
 import { runSplitQuery } from './querySplitting';
 import { trackGroupedQueries } from './tracking';
 import { LokiQuery, LokiQueryType } from './types';
 
 jest.mock('./tracking');
+jest.mock('uuid', () => ({
+  v4: jest.fn().mockReturnValue('uuid'),
+}));
 
 describe('runSplitQuery()', () => {
   let datasource: LokiDatasource;
@@ -23,10 +26,19 @@ describe('runSplitQuery()', () => {
       to: dateTime('2023-02-10T06:00:00.000Z'),
     },
   };
-  const request = getQueryOptions<LokiQuery>({
-    targets: [{ expr: 'count_over_time({a="b"}[1m])', refId: 'A' }],
-    range,
-  });
+
+  const createRequest = (targets: LokiQuery[], overrides?: Partial<DataQueryRequest<LokiQuery>>) => {
+    const request = {
+      range,
+      targets,
+      intervalMs: 60000,
+      requestId: 'TEST',
+    } as DataQueryRequest<LokiQuery>;
+
+    Object.assign(request, overrides);
+    return request;
+  };
+  const request = createRequest([{ expr: 'count_over_time({a="b"}[1m])', refId: 'A' }]);
   beforeEach(() => {
     datasource = createLokiDatasource();
     jest.spyOn(datasource, 'runQuery').mockReturnValue(of({ data: [] }));
@@ -39,6 +51,30 @@ describe('runSplitQuery()', () => {
     });
   });
 
+  test('Metric queries with maxLines of 0 will execute', async () => {
+    const request = createRequest([{ expr: 'count_over_time({a="b"}[1m])', refId: 'A', maxLines: 0 }]);
+    await expect(runSplitQuery(datasource, request)).toEmitValuesWith(() => {
+      // 3 days, 3 chunks, 3 requests.
+      expect(datasource.runQuery).toHaveBeenCalledTimes(3);
+    });
+  });
+
+  test('Log queries with maxLines of 0 will NOT execute', async () => {
+    const request = createRequest([{ expr: '{a="b"}', refId: 'A', maxLines: 0 }]);
+    await expect(runSplitQuery(datasource, request)).toEmitValuesWith(() => {
+      // Will not request a log query with maxLines of 0
+      expect(datasource.runQuery).toHaveBeenCalledTimes(0);
+    });
+  });
+
+  test('Returns a DataQueryResponse with the expected attributes', async () => {
+    await expect(runSplitQuery(datasource, request)).toEmitValuesWith((response) => {
+      expect(response[0].data).toBeDefined();
+      expect(response[0].state).toBe(LoadingState.Done);
+      expect(response[0].key).toBeDefined();
+    });
+  });
+
   test('Correctly splits queries without step', async () => {
     await expect(runSplitQuery(datasource, request)).toEmitValuesWith(() => {
       expect(datasource.runQuery).toHaveBeenNthCalledWith(
@@ -48,8 +84,8 @@ describe('runSplitQuery()', () => {
           intervalMs: 60000,
           range: expect.objectContaining({
             from: expect.objectContaining({
-              //2023-02-09T06:00:00.000Z
-              _i: 1675922400000,
+              //2023-02-10T05:00:00.000Z
+              _i: 1676005200000,
             }),
             to: expect.objectContaining({
               // 2023-02-10T06:00:00.000Z
@@ -66,12 +102,12 @@ describe('runSplitQuery()', () => {
           intervalMs: 60000,
           range: expect.objectContaining({
             from: expect.objectContaining({
-              //2023-02-08T05:59:00.000Z
-              _i: 1675835940000,
+              // 2023-02-09T05:00:00.000Z
+              _i: 1675918800000,
             }),
             to: expect.objectContaining({
-              // 2023-02-09T05:59:00.000Z
-              _i: 1675922340000,
+              // 2023-02-10T04:59:00.000Z
+              _i: 1676005140000,
             }),
           }),
         })
@@ -84,12 +120,12 @@ describe('runSplitQuery()', () => {
           intervalMs: 60000,
           range: expect.objectContaining({
             from: expect.objectContaining({
-              //2023-02-08T05:00:00.000Z
+              // 2023-02-08T05:00:00.000Z
               _i: 1675832400000,
             }),
             to: expect.objectContaining({
-              // 2023-02-08T05:58:00.000Z
-              _i: 1675835880000,
+              // 2023-02-09T04:59:00.000Z
+              _i: 1675918740000,
             }),
           }),
         })
@@ -108,8 +144,8 @@ describe('runSplitQuery()', () => {
           intervalMs: 60000,
           range: expect.objectContaining({
             from: expect.objectContaining({
-              //2023-02-09T06:00:00.000Z
-              _i: 1675922400000,
+              //2023-02-10T05:00:00.000Z
+              _i: 1676005200000,
             }),
             to: expect.objectContaining({
               // 2023-02-10T06:00:00.000Z
@@ -126,12 +162,12 @@ describe('runSplitQuery()', () => {
           intervalMs: 60000,
           range: expect.objectContaining({
             from: expect.objectContaining({
-              //2023-02-08T05:59:50.000Z
-              _i: 1675835990000,
+              // 2023-02-09T05:00:00.000Z
+              _i: 1675918800000,
             }),
             to: expect.objectContaining({
-              // 2023-02-09T05:59:50.000Z
-              _i: 1675922390000,
+              // 2023-02-10T04:59:50.000Z
+              _i: 1676005190000,
             }),
           }),
         })
@@ -148,8 +184,8 @@ describe('runSplitQuery()', () => {
               _i: 1675832400000,
             }),
             to: expect.objectContaining({
-              // 2023-02-08T05:59:40.000Z
-              _i: 1675835980000,
+              // 2023-02-09T04:59:50.000Z
+              _i: 1675918790000,
             }),
           }),
         })
@@ -186,13 +222,10 @@ describe('runSplitQuery()', () => {
       jest.useRealTimers();
     });
     test('Ignores hidden queries', async () => {
-      const request = getQueryOptions<LokiQuery>({
-        targets: [
-          { expr: 'count_over_time({a="b"}[1m])', refId: 'A', hide: true },
-          { expr: '{a="b"}', refId: 'B' },
-        ],
-        range,
-      });
+      const request = createRequest([
+        { expr: 'count_over_time({a="b"}[1m])', refId: 'A', hide: true },
+        { expr: '{a="b"}', refId: 'B' },
+      ]);
       await expect(runSplitQuery(datasource, request)).toEmitValuesWith(() => {
         expect(logsTimeSplit.splitTimeRange).toHaveBeenCalled();
         expect(metricTimeSplit.splitTimeRange).not.toHaveBeenCalled();
@@ -201,6 +234,7 @@ describe('runSplitQuery()', () => {
           {
             data: [],
             state: LoadingState.Done,
+            key: 'uuid',
           },
           [
             {
@@ -218,13 +252,10 @@ describe('runSplitQuery()', () => {
       });
     });
     test('Ignores empty queries', async () => {
-      const request = getQueryOptions<LokiQuery>({
-        targets: [
-          { expr: 'count_over_time({a="b"}[1m])', refId: 'A' },
-          { expr: '', refId: 'B' },
-        ],
-        range,
-      });
+      const request = createRequest([
+        { expr: 'count_over_time({a="b"}[1m])', refId: 'A' },
+        { expr: '', refId: 'B' },
+      ]);
       await expect(runSplitQuery(datasource, request)).toEmitValuesWith(() => {
         expect(logsTimeSplit.splitTimeRange).not.toHaveBeenCalled();
         expect(metricTimeSplit.splitTimeRange).toHaveBeenCalled();
@@ -233,6 +264,7 @@ describe('runSplitQuery()', () => {
           {
             data: [],
             state: LoadingState.Done,
+            key: 'uuid',
           },
           [
             {
@@ -252,10 +284,7 @@ describe('runSplitQuery()', () => {
   });
 
   describe('Dynamic maxLines for logs requests', () => {
-    const request = getQueryOptions<LokiQuery>({
-      targets: [{ expr: '{a="b"}', refId: 'A', maxLines: 4 }],
-      range,
-    });
+    const request = createRequest([{ expr: '{a="b"}', refId: 'A', maxLines: 4 }]);
     const { logFrameA } = getMockFrames();
     beforeEach(() => {
       jest.spyOn(datasource, 'runQuery').mockReturnValue(of({ data: [logFrameA], refId: 'A' }));
@@ -288,52 +317,40 @@ describe('runSplitQuery()', () => {
       jest.spyOn(datasource, 'runQuery').mockReturnValue(of({ data: [], refId: 'A' }));
     });
     test('Sends logs and metric queries individually', async () => {
-      const request = getQueryOptions<LokiQuery>({
-        targets: [
-          { expr: '{a="b"}', refId: 'A' },
-          { expr: 'count_over_time({a="b"}[1m])', refId: 'B' },
-        ],
-        range,
-      });
+      const request = createRequest([
+        { expr: '{a="b"}', refId: 'A' },
+        { expr: 'count_over_time({a="b"}[1m])', refId: 'B' },
+      ]);
       await expect(runSplitQuery(datasource, request)).toEmitValuesWith(() => {
         // 3 days, 3 chunks, 1x Metric + 1x Log, 6 requests.
         expect(datasource.runQuery).toHaveBeenCalledTimes(6);
       });
     });
     test('Groups metric queries', async () => {
-      const request = getQueryOptions<LokiQuery>({
-        targets: [
-          { expr: 'count_over_time({a="b"}[1m])', refId: 'A' },
-          { expr: 'count_over_time({c="d"}[1m])', refId: 'B' },
-        ],
-        range,
-      });
+      const request = createRequest([
+        { expr: 'count_over_time({a="b"}[1m])', refId: 'A' },
+        { expr: 'count_over_time({c="d"}[1m])', refId: 'B' },
+      ]);
       await expect(runSplitQuery(datasource, request)).toEmitValuesWith(() => {
         // 3 days, 3 chunks, 1x2 Metric, 3 requests.
         expect(datasource.runQuery).toHaveBeenCalledTimes(3);
       });
     });
     test('Groups logs queries', async () => {
-      const request = getQueryOptions<LokiQuery>({
-        targets: [
-          { expr: '{a="b"}', refId: 'A' },
-          { expr: '{c="d"}', refId: 'B' },
-        ],
-        range,
-      });
+      const request = createRequest([
+        { expr: '{a="b"}', refId: 'A' },
+        { expr: '{c="d"}', refId: 'B' },
+      ]);
       await expect(runSplitQuery(datasource, request)).toEmitValuesWith(() => {
         // 3 days, 3 chunks, 1x2 Logs, 3 requests.
         expect(datasource.runQuery).toHaveBeenCalledTimes(3);
       });
     });
     test('Groups instant queries', async () => {
-      const request = getQueryOptions<LokiQuery>({
-        targets: [
-          { expr: 'count_over_time({a="b"}[1m])', refId: 'A', queryType: LokiQueryType.Instant },
-          { expr: 'count_over_time({c="d"}[1m])', refId: 'B', queryType: LokiQueryType.Instant },
-        ],
-        range,
-      });
+      const request = createRequest([
+        { expr: 'count_over_time({a="b"}[1m])', refId: 'A', queryType: LokiQueryType.Instant },
+        { expr: 'count_over_time({c="d"}[1m])', refId: 'B', queryType: LokiQueryType.Instant },
+      ]);
       await expect(runSplitQuery(datasource, request)).toEmitValuesWith(() => {
         // Instant queries are omitted from splitting
         expect(datasource.runQuery).toHaveBeenCalledTimes(1);
@@ -341,13 +358,10 @@ describe('runSplitQuery()', () => {
     });
     test('Respects maxLines of logs queries', async () => {
       const { logFrameA } = getMockFrames();
-      const request = getQueryOptions<LokiQuery>({
-        targets: [
-          { expr: '{a="b"}', refId: 'A', maxLines: logFrameA.fields[0].values.length },
-          { expr: 'count_over_time({a="b"}[1m])', refId: 'B' },
-        ],
-        range,
-      });
+      const request = createRequest([
+        { expr: '{a="b"}', refId: 'A', maxLines: logFrameA.fields[0].values.length },
+        { expr: 'count_over_time({a="b"}[1m])', refId: 'B' },
+      ]);
       jest.spyOn(datasource, 'runQuery').mockReturnValue(of({ data: [], refId: 'B' }));
       jest.spyOn(datasource, 'runQuery').mockReturnValueOnce(of({ data: [logFrameA], refId: 'A' }));
 
@@ -357,14 +371,11 @@ describe('runSplitQuery()', () => {
       });
     });
     test('Groups multiple queries into logs, queries, instant', async () => {
-      const request = getQueryOptions<LokiQuery>({
-        targets: [
-          { expr: 'count_over_time({a="b"}[1m])', refId: 'A', queryType: LokiQueryType.Instant },
-          { expr: '{c="d"}', refId: 'B' },
-          { expr: 'count_over_time({c="d"}[1m])', refId: 'C' },
-        ],
-        range,
-      });
+      const request = createRequest([
+        { expr: 'count_over_time({a="b"}[1m])', refId: 'A', queryType: LokiQueryType.Instant },
+        { expr: '{c="d"}', refId: 'B' },
+        { expr: 'count_over_time({c="d"}[1m])', refId: 'C' },
+      ]);
       await expect(runSplitQuery(datasource, request)).toEmitValuesWith(() => {
         // 3 days, 3 chunks, 3x Logs + 3x Metric + (1x Instant), 7 requests.
         expect(datasource.runQuery).toHaveBeenCalledTimes(7);
@@ -385,70 +396,70 @@ describe('runSplitQuery()', () => {
       jest.spyOn(datasource, 'runQuery').mockReturnValue(of({ data: [], refId: 'A' }));
     });
     test('with 30m splitDuration runs 2 queries', async () => {
-      const request = getQueryOptions<LokiQuery>({
+      const request = {
         targets: [{ expr: '{a="b"}', refId: 'A', splitDuration: '30m' }],
         range: range1h,
-      });
+      } as DataQueryRequest<LokiQuery>;
       await expect(runSplitQuery(datasource, request)).toEmitValuesWith(() => {
         expect(datasource.runQuery).toHaveBeenCalledTimes(2);
       });
     });
     test('with 1h splitDuration runs 1 queries', async () => {
-      const request = getQueryOptions<LokiQuery>({
+      const request = {
         targets: [{ expr: '{a="b"}', refId: 'A', splitDuration: '1h' }],
         range: range1h,
-      });
+      } as DataQueryRequest<LokiQuery>;
       await expect(runSplitQuery(datasource, request)).toEmitValuesWith(() => {
         expect(datasource.runQuery).toHaveBeenCalledTimes(1);
       });
     });
     test('with 1h splitDuration and 2 targets runs 1 queries', async () => {
-      const request = getQueryOptions<LokiQuery>({
+      const request = {
         targets: [
           { expr: '{a="b"}', refId: 'A', splitDuration: '1h' },
           { expr: '{a="b"}', refId: 'B', splitDuration: '1h' },
         ],
         range: range1h,
-      });
+      } as DataQueryRequest<LokiQuery>;
       await expect(runSplitQuery(datasource, request)).toEmitValuesWith(() => {
         expect(datasource.runQuery).toHaveBeenCalledTimes(1);
       });
     });
     test('with 1h/30m splitDuration and 2 targets runs 3 queries', async () => {
-      const request = getQueryOptions<LokiQuery>({
+      const request = {
         targets: [
           { expr: '{a="b"}', refId: 'A', splitDuration: '1h' },
           { expr: '{a="b"}', refId: 'B', splitDuration: '30m' },
         ],
         range: range1h,
-      });
+      } as DataQueryRequest<LokiQuery>;
       await expect(runSplitQuery(datasource, request)).toEmitValuesWith(() => {
         // 2 x 30m + 1 x 1h
         expect(datasource.runQuery).toHaveBeenCalledTimes(3);
       });
     });
     test('with mixed splitDuration runs the expected amount of queries', async () => {
-      const request = getQueryOptions<LokiQuery>({
-        targets: [
+      const request = createRequest(
+        [
           { expr: 'count_over_time({c="d"}[1m])', refId: 'A', splitDuration: '15m' },
           { expr: '{a="b"}', refId: 'B', splitDuration: '15m' },
           { expr: '{a="b"}', refId: 'C', splitDuration: '1h' },
         ],
-        range: range1h,
-      });
+        { range: range1h }
+      );
       await expect(runSplitQuery(datasource, request)).toEmitValuesWith(() => {
         // 4 * 15m + 4 * 15m + 1 * 1h
         expect(datasource.runQuery).toHaveBeenCalledTimes(9);
       });
     });
     test('with 1h/30m splitDuration and 1 log and 2 metric target runs 3 queries', async () => {
-      const request = getQueryOptions<LokiQuery>({
-        targets: [
+      const request = createRequest(
+        [
           { expr: '{a="b"}', refId: 'A', splitDuration: '1h' },
           { expr: 'count_over_time({c="d"}[1m])', refId: 'C', splitDuration: '30m' },
         ],
-        range: range1h,
-      });
+        { range: range1h }
+      );
       await expect(runSplitQuery(datasource, request)).toEmitValuesWith(() => {
         // 2 x 30m + 1 x 1h
         expect(datasource.runQuery).toHaveBeenCalledTimes(3);
@@ -466,26 +477,26 @@ describe('runSplitQuery()', () => {
       },
     };
     test('Groups logs queries by resolution', async () => {
-      const request = getQueryOptions<LokiQuery>({
-        targets: [
+      const request = createRequest(
+        [
           { expr: '{a="b"}', refId: 'A', resolution: 3 },
           { expr: '{a="b"}', refId: 'B', resolution: 5 },
         ],
-        range: range1d,
-      });
+        { range: range1d }
+      );
       await expect(runSplitQuery(datasource, request)).toEmitValuesWith(() => {
         // A, B
         expect(datasource.runQuery).toHaveBeenCalledTimes(2);
       });
     });
     test('Groups metric queries with no step by calculated stepMs', async () => {
-      const request = getQueryOptions<LokiQuery>({
-        targets: [
+      const request = createRequest(
+        [
           { expr: 'count_over_time({a="b"}[1m])', refId: 'A', resolution: 3 },
           { expr: 'count_over_time{a="b"}[1m])', refId: 'B', resolution: 5 },
         ],
-        range: range1d,
-      });
+        { range: range1d }
+      );
       await expect(runSplitQuery(datasource, request)).toEmitValuesWith(() => {
         // A, B
         expect(datasource.runQuery).toHaveBeenCalledTimes(2);
@@ -493,21 +504,21 @@ describe('runSplitQuery()', () => {
     });
 
     test('Groups metric queries with step by stepMs', async () => {
-      const request = getQueryOptions<LokiQuery>({
-        targets: [
+      const request = createRequest(
+        [
           { expr: 'count_over_time({a="b"}[1m])', refId: 'A', resolution: 1, step: '10' },
           { expr: 'count_over_time{a="b"}[1m])', refId: 'B', resolution: 1, step: '5ms' },
         ],
-        range: range1d,
-      });
+        { range: range1d }
+      );
       await expect(runSplitQuery(datasource, request)).toEmitValuesWith(() => {
         // A, B
         expect(datasource.runQuery).toHaveBeenCalledTimes(2);
       });
     });
     test('Groups mixed queries by stepMs', async () => {
-      const request = getQueryOptions<LokiQuery>({
-        targets: [
+      const request = createRequest(
+        [
           { expr: '{a="b"}', refId: 'A', resolution: 3 },
           { expr: '{a="b"}', refId: 'B', resolution: 5 },
           { expr: 'count_over_time({a="b"}[1m])', refId: 'C', resolution: 3 },
@@ -516,26 +527,23 @@ describe('runSplitQuery()', () => {
           { expr: 'rate({a="b"}[5m])', refId: 'F', resolution: 5, step: '10' },
           { expr: 'rate({a="b"} | logfmt[5m])', refId: 'G', resolution: 5, step: '10s' },
         ],
-        range: range1d,
-      });
+        { range: range1d }
+      );
       await expect(runSplitQuery(datasource, request)).toEmitValuesWith(() => {
         // A, B, C, D, E, F+G
         expect(datasource.runQuery).toHaveBeenCalledTimes(6);
       });
     });
     test('Chunked groups mixed queries by stepMs', async () => {
-      const request = getQueryOptions<LokiQuery>({
-        targets: [
-          { expr: '{a="b"}', refId: 'A', resolution: 3 },
-          { expr: '{a="b"}', refId: 'B', resolution: 5 },
-          { expr: 'count_over_time({a="b"}[1m])', refId: 'C', resolution: 3 },
-          { expr: 'count_over_time{a="b"}[1m])', refId: 'D', resolution: 5 },
-          { expr: '{a="b"}', refId: 'E', resolution: 5, queryType: LokiQueryType.Instant },
-          { expr: 'rate({a="b"}[5m])', refId: 'F', resolution: 5, step: '10' },
-          { expr: 'rate({a="b"} | logfmt[5m])', refId: 'G', resolution: 5, step: '10s' },
-        ],
-        range, // 3 days
-      });
+      const request = createRequest([
+        { expr: '{a="b"}', refId: 'A', resolution: 3 },
+        { expr: '{a="b"}', refId: 'B', resolution: 5 },
+        { expr: 'count_over_time({a="b"}[1m])', refId: 'C', resolution: 3 },
+        { expr: 'count_over_time{a="b"}[1m])', refId: 'D', resolution: 5 },
+        { expr: '{a="b"}', refId: 'E', resolution: 5, queryType: LokiQueryType.Instant },
+        { expr: 'rate({a="b"}[5m])', refId: 'F', resolution: 5, step: '10' },
+        { expr: 'rate({a="b"} | logfmt[5m])', refId: 'G', resolution: 5, step: '10s' },
+      ]);
       await expect(runSplitQuery(datasource, request)).toEmitValuesWith(() => {
         // 3 * A, 3 * B, 3 * C, 3 * D, 1 * E, 3 * F+G
         expect(datasource.runQuery).toHaveBeenCalledTimes(16);
diff --git a/public/app/plugins/datasource/loki/querySplitting.ts b/public/app/plugins/datasource/loki/querySplitting.ts
index c9a7a25247ef1..c219b966f73fe 100644
--- a/public/app/plugins/datasource/loki/querySplitting.ts
+++ b/public/app/plugins/datasource/loki/querySplitting.ts
@@ -14,12 +14,12 @@ import {
   TimeRange,
   LoadingState,
 } from '@grafana/data';
+import { combineResponses } from '@grafana/o11y-ds-frontend';
 
 import { LokiDatasource } from './datasource';
 import { splitTimeRange as splitLogsTimeRange } from './logsTimeSplitting';
 import { splitTimeRange as splitMetricTimeRange } from './metricTimeSplitting';
 import { isLogsQuery, isQueryWithRangeVariable } from './queryUtils';
-import { combineResponses } from './responseUtils';
 import { trackGroupedQueries } from './tracking';
 import { LokiGroupedRequest, LokiQuery, LokiQueryType } from './types';
 
@@ -76,7 +76,8 @@ function adjustTargetsFromResponseState(targets: LokiQuery[], response: DataQuer
     .filter((target) => target.maxLines === undefined || target.maxLines > 0);
 }
 export function runSplitGroupedQueries(datasource: LokiDatasource, requests: LokiGroupedRequest[]) {
-  let mergedResponse: DataQueryResponse = { data: [], state: LoadingState.Streaming };
+  const responseKey = requests.length ? requests[0].request.queryGroupId : uuidv4();
+  let mergedResponse: DataQueryResponse = { data: [], state: LoadingState.Streaming, key: responseKey };
   const totalRequests = Math.max(...requests.map(({ partition }) => partition.length));
   const longestPartition = requests.filter(({ partition }) => partition.length === totalRequests)[0].partition;
 
@@ -149,17 +150,18 @@ export function runSplitGroupedQueries(datasource: LokiDatasource, requests: Lok
   return response;
 }
 
+export const LOADING_FRAME_NAME = 'loki-splitting-progress';
+
 function updateLoadingFrame(
   response: DataQueryResponse,
   request: DataQueryRequest<LokiQuery>,
   partition: TimeRange[],
   requestN: number
 ): DataQueryResponse {
-  if (isLogsQuery(request.targets[0].expr) || isLogsVolumeRequest(request)) {
+  if (isLogsQuery(request.targets[0].expr)) {
     return response;
   }
-  const loadingFrameName = 'loki-splitting-progress';
-  response.data = response.data.filter((frame) => frame.name !== loadingFrameName);
+  response.data = response.data.filter((frame) => frame.name !== LOADING_FRAME_NAME);
 
   if (requestN <= 1) {
     return response;
@@ -173,7 +175,7 @@ function updateLoadingFrame(
       color: 'rgba(120, 120, 120, 0.1)',
     },
   ]);
-  loadingFrame.name = loadingFrameName;
+  loadingFrame.name = LOADING_FRAME_NAME;
   loadingFrame.meta = {
     dataTopic: DataTopic.Annotations,
   };
@@ -183,10 +185,6 @@ function updateLoadingFrame(
   return response;
 }
 
-function isLogsVolumeRequest(request: DataQueryRequest<LokiQuery>): boolean {
-  return request.targets.some((target) => target.refId.startsWith('log-volume'));
-}
-
 function getNextRequestPointers(requests: LokiGroupedRequest[], requestGroup: number, requestN: number) {
   // There's a pending request from the next group:
   for (let i = requestGroup + 1; i < requests.length; i++) {
@@ -245,8 +243,12 @@ export function runSplitQuery(datasource: LokiDatasource, request: DataQueryRequ
     );
 
     for (const stepMs in stepMsPartition) {
+      const targets = stepMsPartition[stepMs].map((q) => {
+        const { maxLines, ...query } = q;
+        return query;
+      });
       requests.push({
-        request: { ...request, targets: stepMsPartition[stepMs] },
+        request: { ...request, targets },
         partition: partitionTimeRange(false, request.range, Number(stepMs), Number(chunkRangeMs)),
       });
     }
diff --git a/public/app/plugins/datasource/loki/queryUtils.test.ts b/public/app/plugins/datasource/loki/queryUtils.test.ts
index d05c67133104c..8675b9e522eb3 100644
--- a/public/app/plugins/datasource/loki/queryUtils.test.ts
+++ b/public/app/plugins/datasource/loki/queryUtils.test.ts
@@ -1,6 +1,6 @@
 import { String } from '@grafana/lezer-logql';
 
-import { createLokiDatasource } from './mocks';
+import { createLokiDatasource } from './__mocks__/datasource';
 import {
   getHighlighterExpressionsFromQuery,
   getLokiQueryType,
@@ -121,6 +121,14 @@ describe('getHighlighterExpressionsFromQuery', () => {
   `('should correctly identify the type of quote used in the term', ({ input, expected }) => {
     expect(getHighlighterExpressionsFromQuery(`{foo="bar"} |= ${input}`)).toEqual([expected]);
   });
+
+  it.each(['|=', '|~'])('returns multiple expressions when using or statements', (op: string) => {
+    expect(getHighlighterExpressionsFromQuery(`{app="frontend"} ${op} "line" or "text"`)).toEqual(['line', 'text']);
+  });
+
+  it.each(['|=', '|~'])('returns multiple expressions when using or statements and ip filters', (op: string) => {
+    expect(getHighlighterExpressionsFromQuery(`{app="frontend"} ${op} "line" or ip("10.0.0.1")`)).toEqual(['line']);
+  });
 });
 
 describe('getNormalizedLokiQuery', () => {
diff --git a/public/app/plugins/datasource/loki/queryUtils.ts b/public/app/plugins/datasource/loki/queryUtils.ts
index 3f7f6b500a106..5e0ce7baab824 100644
--- a/public/app/plugins/datasource/loki/queryUtils.ts
+++ b/public/app/plugins/datasource/loki/queryUtils.ts
@@ -21,66 +21,79 @@ import {
   formatLokiQuery,
   Logfmt,
   Json,
+  OrFilter,
+  FilterOp,
 } from '@grafana/lezer-logql';
 import { reportInteraction } from '@grafana/runtime';
 import { DataQuery } from '@grafana/schema';
 
-import { ErrorId, replaceVariables, returnVariables } from '../prometheus/querybuilder/shared/parsingUtils';
-
 import { placeHolderScopedVars } from './components/monaco-query-field/monaco-completion-provider/validation';
 import { LokiDatasource } from './datasource';
 import { getStreamSelectorPositions, NodePosition } from './modifyQuery';
+import { ErrorId, replaceVariables, returnVariables } from './querybuilder/parsingUtils';
 import { LokiQuery, LokiQueryType } from './types';
 
-export function formatQuery(selector: string | undefined): string {
-  return `${selector || ''}`.trim();
-}
-
 /**
  * Returns search terms from a LogQL query.
  * E.g., `{} |= foo |=bar != baz` returns `['foo', 'bar']`.
  */
-export function getHighlighterExpressionsFromQuery(input: string): string[] {
+export function getHighlighterExpressionsFromQuery(input = ''): string[] {
   const results = [];
 
   const filters = getNodesFromQuery(input, [LineFilter]);
 
-  for (let filter of filters) {
+  for (const filter of filters) {
     const pipeExact = filter.getChild(Filter)?.getChild(PipeExact);
     const pipeMatch = filter.getChild(Filter)?.getChild(PipeMatch);
-    const string = filter.getChild(String);
+    const strings = getStringsFromLineFilter(filter);
 
-    if ((!pipeExact && !pipeMatch) || !string) {
+    if ((!pipeExact && !pipeMatch) || !strings.length) {
       continue;
     }
 
-    const filterTerm = input.substring(string.from, string.to).trim();
-    const backtickedTerm = filterTerm[0] === '`';
-    const unwrappedFilterTerm = filterTerm.substring(1, filterTerm.length - 1);
+    for (const string of strings) {
+      const filterTerm = input.substring(string.from, string.to).trim();
+      const backtickedTerm = filterTerm[0] === '`';
+      const unwrappedFilterTerm = filterTerm.substring(1, filterTerm.length - 1);
 
-    if (!unwrappedFilterTerm) {
-      continue;
-    }
+      if (!unwrappedFilterTerm) {
+        continue;
+      }
 
-    let resultTerm = '';
+      let resultTerm = '';
 
-    // Only filter expressions with |~ operator are treated as regular expressions
-    if (pipeMatch) {
-      // When using backticks, Loki doesn't require to escape special characters and we can just push regular expression to highlights array
-      // When using quotes, we have extra backslash escaping and we need to replace \\ with \
-      resultTerm = backtickedTerm ? unwrappedFilterTerm : unwrappedFilterTerm.replace(/\\\\/g, '\\');
-    } else {
-      // We need to escape this string so it is not matched as regular expression
-      resultTerm = escapeRegExp(unwrappedFilterTerm);
-    }
+      // Only filter expressions with |~ operator are treated as regular expressions
+      if (pipeMatch) {
+        // When using backticks, Loki doesn't require to escape special characters and we can just push regular expression to highlights array
+        // When using quotes, we have extra backslash escaping and we need to replace \\ with \
+        resultTerm = backtickedTerm ? unwrappedFilterTerm : unwrappedFilterTerm.replace(/\\\\/g, '\\');
+      } else {
+        // We need to escape this string so it is not matched as regular expression
+        resultTerm = escapeRegExp(unwrappedFilterTerm);
+      }
 
-    if (resultTerm) {
-      results.push(resultTerm);
+      if (resultTerm) {
+        results.push(resultTerm);
+      }
     }
   }
   return results;
 }
 
+export function getStringsFromLineFilter(filter: SyntaxNode): SyntaxNode[] {
+  const nodes: SyntaxNode[] = [];
+  let node: SyntaxNode | null = filter;
+  do {
+    const string = node.getChild(String);
+    if (string && !node.getChild(FilterOp)) {
+      nodes.push(string);
+    }
+    node = node.getChild(OrFilter);
+  } while (node != null);
+
+  return nodes;
+}
+
 export function getNormalizedLokiQuery(query: LokiQuery): LokiQuery {
   const queryType = getLokiQueryType(query);
   // instant and range are deprecated, we want to remove them
@@ -182,7 +195,7 @@ export function getNodeFromQuery(query: string, nodeType: number): SyntaxNode |
 }
 
 /**
- * Parses the query and looks for error nodes. If there is at least one, it returns false.
+ * Parses the query and looks for error nodes. If there is at least one, it returns true.
  * Grafana variables are considered errors, so if you need to validate a query
  * with variables you should interpolate it first.
  */
diff --git a/public/app/plugins/datasource/loki/querybuilder/LokiQueryModeller.test.ts b/public/app/plugins/datasource/loki/querybuilder/LokiQueryModeller.test.ts
index fa621ee8d6a03..7c7b7ac23bcc4 100644
--- a/public/app/plugins/datasource/loki/querybuilder/LokiQueryModeller.test.ts
+++ b/public/app/plugins/datasource/loki/querybuilder/LokiQueryModeller.test.ts
@@ -254,7 +254,7 @@ describe('LokiQueryModeller', () => {
         operations: [],
       };
 
-      const def = modeller.getOperationDef('sum')!;
+      const def = modeller.getOperationDefinition('sum')!;
       const result = def.addOperationHandler(def, query, modeller);
       expect(result.operations[0].id).toBe('rate');
       expect(result.operations[1].id).toBe('sum');
@@ -266,7 +266,7 @@ describe('LokiQueryModeller', () => {
         operations: [{ id: LokiOperationId.Json, params: [] }],
       };
 
-      const def = modeller.getOperationDef('sum')!;
+      const def = modeller.getOperationDefinition('sum')!;
       const result = def.addOperationHandler(def, query, modeller);
       expect(result.operations[0].id).toBe(LokiOperationId.Json);
       expect(result.operations[1].id).toBe('rate');
@@ -279,7 +279,7 @@ describe('LokiQueryModeller', () => {
         operations: [{ id: 'rate', params: [] }],
       };
 
-      const def = modeller.getOperationDef(LokiOperationId.Json)!;
+      const def = modeller.getOperationDefinition(LokiOperationId.Json)!;
       const result = def.addOperationHandler(def, query, modeller);
       expect(result.operations[0].id).toBe(LokiOperationId.Json);
       expect(result.operations[1].id).toBe('rate');
@@ -291,7 +291,7 @@ describe('LokiQueryModeller', () => {
         operations: [{ id: LokiOperationId.LineContains, params: ['error'] }],
       };
 
-      const def = modeller.getOperationDef(LokiOperationId.Json)!;
+      const def = modeller.getOperationDefinition(LokiOperationId.Json)!;
       const result = def.addOperationHandler(def, query, modeller);
       expect(result.operations[0].id).toBe(LokiOperationId.LineContains);
       expect(result.operations[1].id).toBe(LokiOperationId.Json);
@@ -303,7 +303,7 @@ describe('LokiQueryModeller', () => {
         operations: [{ id: LokiOperationId.Json, params: [] }],
       };
 
-      const def = modeller.getOperationDef(LokiOperationId.LineContains)!;
+      const def = modeller.getOperationDefinition(LokiOperationId.LineContains)!;
       const result = def.addOperationHandler(def, query, modeller);
       expect(result.operations[0].id).toBe(LokiOperationId.LineContains);
       expect(result.operations[1].id).toBe(LokiOperationId.Json);
@@ -315,7 +315,7 @@ describe('LokiQueryModeller', () => {
         operations: [{ id: LokiOperationId.Rate, params: [] }],
       };
 
-      const def = modeller.getOperationDef(LokiOperationId.Rate)!;
+      const def = modeller.getOperationDefinition(LokiOperationId.Rate)!;
       const result = def.addOperationHandler(def, query, modeller);
       expect(result.operations.length).toBe(1);
     });
@@ -329,7 +329,7 @@ describe('LokiQueryModeller', () => {
         ],
       };
 
-      const def = modeller.getOperationDef(LokiOperationId.Unwrap)!;
+      const def = modeller.getOperationDefinition(LokiOperationId.Unwrap)!;
       const result = def.addOperationHandler(def, query, modeller);
       expect(result.operations[1].id).toBe(LokiOperationId.Unwrap);
     });
diff --git a/public/app/plugins/datasource/loki/querybuilder/LokiQueryModeller.ts b/public/app/plugins/datasource/loki/querybuilder/LokiQueryModeller.ts
index 2a95304c736e4..703d4c50f4f25 100644
--- a/public/app/plugins/datasource/loki/querybuilder/LokiQueryModeller.ts
+++ b/public/app/plugins/datasource/loki/querybuilder/LokiQueryModeller.ts
@@ -1,12 +1,17 @@
-import { LokiAndPromQueryModellerBase } from '../../prometheus/querybuilder/shared/LokiAndPromQueryModellerBase';
-import { QueryBuilderLabelFilter } from '../../prometheus/querybuilder/shared/types';
+import {
+  QueryModellerBase,
+  QueryBuilderLabelFilter,
+  VisualQuery,
+  QueryBuilderOperation,
+  VisualQueryBinary,
+} from '@grafana/experimental';
 
-import { getOperationDefinitions } from './operations';
+import { operationDefinitions } from './operations';
 import { LokiOperationId, LokiQueryPattern, LokiQueryPatternType, LokiVisualQueryOperationCategory } from './types';
 
-export class LokiQueryModeller extends LokiAndPromQueryModellerBase {
+export class LokiQueryModeller extends QueryModellerBase {
   constructor() {
-    super(getOperationDefinitions);
+    super(operationDefinitions, '<expr>');
 
     this.setOperationCategories([
       LokiVisualQueryOperationCategory.Aggregations,
@@ -18,12 +23,65 @@ export class LokiQueryModeller extends LokiAndPromQueryModellerBase {
     ]);
   }
 
-  renderLabels(labels: QueryBuilderLabelFilter[]) {
+  renderOperations(queryString: string, operations: QueryBuilderOperation[]): string {
+    for (const operation of operations) {
+      const def = this.operationsRegistry.getIfExists(operation.id);
+      if (!def) {
+        console.error(`Could not find operation ${operation.id} in the registry`);
+        continue;
+      }
+      queryString = def.renderer(operation, def, queryString);
+    }
+    return queryString;
+  }
+
+  renderBinaryQueries(queryString: string, binaryQueries?: Array<VisualQueryBinary<VisualQuery>>) {
+    if (binaryQueries) {
+      for (const binQuery of binaryQueries) {
+        queryString = `${this.renderBinaryQuery(queryString, binQuery)}`;
+      }
+    }
+    return queryString;
+  }
+
+  private renderBinaryQuery(leftOperand: string, binaryQuery: VisualQueryBinary<VisualQuery>) {
+    let result = leftOperand + ` ${binaryQuery.operator} `;
+
+    if (binaryQuery.vectorMatches) {
+      result += `${binaryQuery.vectorMatchesType}(${binaryQuery.vectorMatches}) `;
+    }
+
+    return result + this.renderQuery(binaryQuery.query, true);
+  }
+
+  renderLabels(labels: QueryBuilderLabelFilter[]): string {
     if (labels.length === 0) {
       return '{}';
     }
 
-    return super.renderLabels(labels);
+    let expr = '{';
+    for (const filter of labels) {
+      if (expr !== '{') {
+        expr += ', ';
+      }
+
+      expr += `${filter.label}${filter.op}"${filter.value}"`;
+    }
+
+    return expr + `}`;
+  }
+
+  renderQuery(query: VisualQuery, nested?: boolean): string {
+    let queryString = this.renderLabels(query.labels);
+    queryString = this.renderOperations(queryString, query.operations);
+
+    if (!nested && this.hasBinaryOp(query) && Boolean(query.binaryQueries?.length)) {
+      queryString = `(${queryString})`;
+    }
+
+    queryString = this.renderBinaryQueries(queryString, query.binaryQueries);
+
+    return queryString;
   }
 
   getQueryPatterns(): LokiQueryPattern[] {
diff --git a/public/app/plugins/datasource/loki/querybuilder/binaryScalarOperations.ts b/public/app/plugins/datasource/loki/querybuilder/binaryScalarOperations.ts
index dc93930bf1d40..a80f803eeab7d 100644
--- a/public/app/plugins/datasource/loki/querybuilder/binaryScalarOperations.ts
+++ b/public/app/plugins/datasource/loki/querybuilder/binaryScalarOperations.ts
@@ -1,10 +1,10 @@
-import { defaultAddOperationHandler } from '../../prometheus/querybuilder/shared/operationUtils';
 import {
   QueryBuilderOperation,
-  QueryBuilderOperationDef,
+  QueryBuilderOperationDefinition,
   QueryBuilderOperationParamDef,
-} from '../../prometheus/querybuilder/shared/types';
+} from '@grafana/experimental';
 
+import { defaultAddOperationHandler } from './operationUtils';
 import { LokiOperationId, LokiVisualQueryOperationCategory } from './types';
 
 export const binaryScalarDefs = [
@@ -78,7 +78,7 @@ export const binaryScalarDefs = [
 
 // Not sure about this one. It could also be a more generic 'Simple math operation' where user specifies
 // both the operator and the operand in a single input
-export const binaryScalarOperations: QueryBuilderOperationDef[] = binaryScalarDefs.map((opDef) => {
+export const binaryScalarOperations: QueryBuilderOperationDefinition[] = binaryScalarDefs.map((opDef) => {
   const params: QueryBuilderOperationParamDef[] = [{ name: 'Value', type: 'number' }];
   const defaultParams: any[] = [2];
   if (opDef.comparison) {
@@ -103,7 +103,11 @@ export const binaryScalarOperations: QueryBuilderOperationDef[] = binaryScalarDe
 });
 
 function getSimpleBinaryRenderer(operator: string) {
-  return function binaryRenderer(model: QueryBuilderOperation, def: QueryBuilderOperationDef, innerExpr: string) {
+  return function binaryRenderer(
+    model: QueryBuilderOperation,
+    def: QueryBuilderOperationDefinition,
+    innerExpr: string
+  ) {
     let param = model.params[0];
     let bool = '';
     if (model.params.length === 2) {
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.test.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.test.tsx
index 17db08810460f..16ef915193afc 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.test.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.test.tsx
@@ -1,8 +1,8 @@
 import { render, screen, waitFor } from '@testing-library/react';
 import React from 'react';
 
+import { createLokiDatasource } from '../../__mocks__/datasource';
 import { LokiDatasource } from '../../datasource';
-import { createLokiDatasource } from '../../mocks';
 import { LokiQuery } from '../../types';
 
 import { LabelBrowserModal, Props } from './LabelBrowserModal';
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.tsx
index 35dc7595f2575..90983b8c25caa 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.tsx
@@ -1,10 +1,10 @@
 import { css } from '@emotion/css';
 import React, { useState, useEffect } from 'react';
 
-import { CoreApp, GrafanaTheme2 } from '@grafana/data';
+import { CoreApp, GrafanaTheme2, TimeRange } from '@grafana/data';
+import { LocalStorageValueProvider } from '@grafana/o11y-ds-frontend';
 import { reportInteraction } from '@grafana/runtime';
 import { LoadingPlaceholder, Modal, useStyles2 } from '@grafana/ui';
-import { LocalStorageValueProvider } from 'app/core/components/LocalStorageValueProvider';
 
 import { LokiLabelBrowser } from '../../components/LokiLabelBrowser';
 import { LokiDatasource } from '../../datasource';
@@ -15,13 +15,14 @@ export interface Props {
   datasource: LokiDatasource;
   query: LokiQuery;
   app?: CoreApp;
+  timeRange?: TimeRange;
   onClose: () => void;
   onChange: (query: LokiQuery) => void;
   onRunQuery: () => void;
 }
 
 export const LabelBrowserModal = (props: Props) => {
-  const { isOpen, onClose, datasource, app } = props;
+  const { isOpen, onClose, datasource, app, timeRange } = props;
   const [labelsLoaded, setLabelsLoaded] = useState(false);
   const [hasLogLabels, setHasLogLabels] = useState(false);
   const LAST_USED_LABELS_KEY = 'grafana.datasources.loki.browser.labels';
@@ -33,11 +34,11 @@ export const LabelBrowserModal = (props: Props) => {
       return;
     }
 
-    datasource.languageProvider.fetchLabels().then((labels) => {
+    datasource.languageProvider.fetchLabels({ timeRange }).then((labels) => {
       setLabelsLoaded(true);
       setHasLogLabels(labels.length > 0);
     });
-  }, [datasource, isOpen]);
+  }, [datasource, isOpen, timeRange]);
 
   const changeQuery = (value: string) => {
     const { query, onChange, onRunQuery } = props;
@@ -74,6 +75,7 @@ export const LabelBrowserModal = (props: Props) => {
                 storeLastUsedLabels={onLastUsedLabelsSave}
                 deleteLastUsedLabels={onLastUsedLabelsDelete}
                 app={app}
+                timeRange={timeRange}
               />
             );
           }}
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LabelParamEditor.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LabelParamEditor.tsx
new file mode 100644
index 0000000000000..ea9186ebdd79c
--- /dev/null
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LabelParamEditor.tsx
@@ -0,0 +1,68 @@
+import React, { useState } from 'react';
+
+import { DataSourceApi, SelectableValue } from '@grafana/data';
+import {
+  QueryBuilderLabelFilter,
+  QueryBuilderOperationParamEditorProps,
+  QueryBuilderOperationParamValue,
+  VisualQuery,
+  VisualQueryModeller,
+} from '@grafana/experimental';
+import { Select } from '@grafana/ui';
+
+import { getOperationParamId } from '../operationUtils';
+
+export const LabelParamEditor = ({
+  onChange,
+  index,
+  operationId,
+  value,
+  query,
+  datasource,
+  queryModeller,
+}: QueryBuilderOperationParamEditorProps) => {
+  const [state, setState] = useState<{
+    options?: SelectableValue[];
+    isLoading?: boolean;
+  }>({});
+
+  return (
+    <Select<QueryBuilderOperationParamValue | undefined>
+      inputId={getOperationParamId(operationId, index)}
+      autoFocus={value === ''}
+      openMenuOnFocus
+      onOpenMenu={async () => {
+        setState({ isLoading: true });
+        const options = await loadGroupByLabels(query, datasource, queryModeller);
+        setState({ options, isLoading: undefined });
+      }}
+      isLoading={state.isLoading}
+      allowCustomValue
+      noOptionsMessage="No labels found"
+      loadingMessage="Loading labels"
+      options={state.options}
+      value={toOption(value)}
+      onChange={(value) => onChange(index, value.value!)}
+    />
+  );
+};
+
+async function loadGroupByLabels(
+  query: VisualQuery,
+  datasource: DataSourceApi,
+  queryModeller: VisualQueryModeller
+): Promise<SelectableValue[]> {
+  let labels: QueryBuilderLabelFilter[] = query.labels;
+
+  const queryString = queryModeller.renderLabels(labels);
+  const result = await datasource.languageProvider.fetchSeriesLabels(queryString);
+
+  return Object.keys(result).map((x) => ({
+    label: x,
+    value: x,
+  }));
+}
+
+const toOption = (
+  value: QueryBuilderOperationParamValue | undefined
+): SelectableValue<QueryBuilderOperationParamValue | undefined> => ({ label: value?.toString(), value });
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.test.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.test.tsx
index 94a6e4bf195bc..8ba6538dcdbcc 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.test.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.test.tsx
@@ -1,44 +1,54 @@
 import { render, screen, getAllByRole, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
-import { getSelectParent } from 'test/helpers/selectOptionInTest';
 
-import { DataSourceInstanceSettings, DataSourcePluginMeta } from '@grafana/data';
+import { dateTime } from '@grafana/data';
+import { config } from '@grafana/runtime';
 
-import { MISSING_LABEL_FILTER_ERROR_MESSAGE } from '../../../prometheus/querybuilder/shared/LabelFilters';
-import { LokiDatasource } from '../../datasource';
+import { createLokiDatasource } from '../../__mocks__/datasource';
 import { LokiOperationId, LokiVisualQuery } from '../types';
 
-import { LokiQueryBuilder } from './LokiQueryBuilder';
+import { LokiQueryBuilder, TIME_SPAN_TO_TRIGGER_SAMPLES } from './LokiQueryBuilder';
 import { EXPLAIN_LABEL_FILTER_CONTENT } from './LokiQueryBuilderExplained';
 
+const MISSING_LABEL_FILTER_ERROR_MESSAGE = 'Select at least 1 label filter (label and value)';
 const defaultQuery: LokiVisualQuery = {
   labels: [{ op: '=', label: 'baz', value: 'bar' }],
   operations: [],
 };
 
+const mockTimeRange = {
+  from: dateTime(1546372800000),
+  to: dateTime(1546380000000),
+  raw: {
+    from: dateTime(1546372800000),
+    to: dateTime(1546380000000),
+  },
+};
+
 const createDefaultProps = () => {
-  const datasource = new LokiDatasource(
-    {
-      url: '',
-      jsonData: {},
-      meta: {} as DataSourcePluginMeta,
-    } as DataSourceInstanceSettings,
-    undefined,
-    undefined
-  );
+  const datasource = createLokiDatasource();
 
   const props = {
     datasource,
     onRunQuery: () => {},
     onChange: () => {},
     showExplain: false,
+    timeRange: mockTimeRange,
   };
 
   return props;
 };
 
 describe('LokiQueryBuilder', () => {
+  const originalLokiQueryHints = config.featureToggles.lokiQueryHints;
+  beforeEach(() => {
+    config.featureToggles.lokiQueryHints = true;
+  });
+
+  afterEach(() => {
+    config.featureToggles.lokiQueryHints = originalLokiQueryHints;
+  });
   it('tries to load labels when no labels are selected', async () => {
     const props = createDefaultProps();
     props.datasource.getDataSamples = jest.fn().mockResolvedValue([]);
@@ -49,9 +59,118 @@ describe('LokiQueryBuilder', () => {
     const labels = screen.getByText(/Label filters/);
     const selects = getAllByRole(getSelectParent(labels)!, 'combobox');
     await userEvent.click(selects[3]);
+    expect(props.datasource.languageProvider.fetchSeriesLabels).toBeCalledWith('{baz="bar"}', {
+      timeRange: mockTimeRange,
+    });
     await waitFor(() => expect(screen.getByText('job')).toBeInTheDocument());
   });
 
+  it('uses fetchLabelValues preselected labels have no equality matcher', async () => {
+    const props = createDefaultProps();
+    props.datasource.getDataSamples = jest.fn().mockResolvedValue([]);
+    props.datasource.languageProvider.fetchSeriesLabels = jest.fn();
+    props.datasource.languageProvider.fetchLabelValues = jest.fn().mockReturnValue(['a', 'b']);
+
+    const query: LokiVisualQuery = {
+      labels: [
+        { op: '!=', label: 'cluster', value: 'cluster1' },
+        { op: '=', label: 'job', value: 'grafana' },
+      ],
+      operations: [],
+    };
+    render(<LokiQueryBuilder {...props} query={query} />);
+    const labels = screen.getByText(/Label filters/);
+    const selects = getAllByRole(getSelectParent(labels)!, 'combobox');
+    await userEvent.click(selects[5]);
+    expect(props.datasource.languageProvider.fetchLabelValues).toBeCalledWith('job', { timeRange: mockTimeRange });
+    expect(props.datasource.languageProvider.fetchSeriesLabels).not.toBeCalled();
+  });
+
+  it('uses fetchLabelValues preselected label have regex equality matcher with match everything value (.*)', async () => {
+    const props = createDefaultProps();
+    props.datasource.getDataSamples = jest.fn().mockResolvedValue([]);
+    props.datasource.languageProvider.fetchSeriesLabels = jest.fn();
+    props.datasource.languageProvider.fetchLabelValues = jest.fn().mockReturnValue(['a', 'b']);
+
+    const query: LokiVisualQuery = {
+      labels: [
+        { op: '=~', label: 'cluster', value: '.*' },
+        { op: '=', label: 'job', value: 'grafana' },
+      ],
+      operations: [],
+    };
+    render(<LokiQueryBuilder {...props} query={query} />);
+    const labels = screen.getByText(/Label filters/);
+    const selects = getAllByRole(getSelectParent(labels)!, 'combobox');
+    await userEvent.click(selects[5]);
+    expect(props.datasource.languageProvider.fetchLabelValues).toBeCalledWith('job', { timeRange: mockTimeRange });
+    expect(props.datasource.languageProvider.fetchSeriesLabels).not.toBeCalled();
+  });
+
+  it('uses fetchLabels preselected label have regex equality matcher with match everything value (.*)', async () => {
+    const props = createDefaultProps();
+    props.datasource.getDataSamples = jest.fn().mockResolvedValue([]);
+    props.datasource.languageProvider.fetchSeriesLabels = jest.fn();
+    props.datasource.languageProvider.fetchLabels = jest.fn().mockReturnValue(['a', 'b']);
+
+    const query: LokiVisualQuery = {
+      labels: [
+        { op: '=~', label: 'cluster', value: '.*' },
+        { op: '=', label: 'job', value: 'grafana' },
+      ],
+      operations: [],
+    };
+    render(<LokiQueryBuilder {...props} query={query} />);
+    const labels = screen.getByText(/Label filters/);
+    const selects = getAllByRole(getSelectParent(labels)!, 'combobox');
+    await userEvent.click(selects[3]);
+    expect(props.datasource.languageProvider.fetchLabels).toBeCalledWith({ timeRange: mockTimeRange });
+    expect(props.datasource.languageProvider.fetchSeriesLabels).not.toBeCalled();
+  });
+
+  it('uses fetchSeriesLabels preselected label have regex equality matcher', async () => {
+    const props = createDefaultProps();
+    props.datasource.getDataSamples = jest.fn().mockResolvedValue([]);
+    props.datasource.languageProvider.fetchSeriesLabels = jest.fn().mockReturnValue({ job: ['a'], instance: ['b'] });
+    props.datasource.languageProvider.fetchLabelValues = jest.fn();
+
+    const query: LokiVisualQuery = {
+      labels: [
+        { op: '=~', label: 'cluster', value: 'cluster1|cluster2' },
+        { op: '=', label: 'job', value: 'grafana' },
+      ],
+      operations: [],
+    };
+    render(<LokiQueryBuilder {...props} query={query} />);
+    const labels = screen.getByText(/Label filters/);
+    const selects = getAllByRole(getSelectParent(labels)!, 'combobox');
+    await userEvent.click(selects[5]);
+    expect(props.datasource.languageProvider.fetchSeriesLabels).toBeCalledWith('{cluster=~"cluster1|cluster2"}', {
+      timeRange: mockTimeRange,
+    });
+    expect(props.datasource.languageProvider.fetchLabelValues).not.toBeCalled();
+  });
+
+  it('does refetch label values with the correct time range', async () => {
+    const props = createDefaultProps();
+    props.datasource.getDataSamples = jest.fn().mockResolvedValue([]);
+    props.datasource.languageProvider.fetchSeriesLabels = jest
+      .fn()
+      .mockReturnValue({ job: ['a'], instance: ['b'], baz: ['bar'] });
+
+    render(<LokiQueryBuilder {...props} query={defaultQuery} />);
+    await userEvent.click(screen.getByLabelText('Add'));
+    const labels = screen.getByText(/Label filters/);
+    const selects = getAllByRole(getSelectParent(labels)!, 'combobox');
+    await userEvent.click(selects[3]);
+    await waitFor(() => expect(screen.getByText('job')).toBeInTheDocument());
+    await userEvent.click(screen.getByText('job'));
+    await userEvent.click(selects[5]);
+    expect(props.datasource.languageProvider.fetchSeriesLabels).toHaveBeenNthCalledWith(2, '{baz="bar"}', {
+      timeRange: mockTimeRange,
+    });
+  });
+
   it('does not show already existing label names as option in label filter', async () => {
     const props = createDefaultProps();
     props.datasource.getDataSamples = jest.fn().mockResolvedValue([]);
@@ -110,4 +229,96 @@ describe('LokiQueryBuilder', () => {
       expect(screen.queryByText(EXPLAIN_LABEL_FILTER_CONTENT)).not.toBeInTheDocument();
     });
   });
+
+  it('re-runs sample query when query changes', async () => {
+    const query = {
+      labels: [{ label: 'foo', op: '=', value: 'bar' }],
+      operations: [{ id: LokiOperationId.LineContains, params: ['error'] }],
+    };
+    const props = createDefaultProps();
+    props.datasource.getDataSamples = jest.fn().mockResolvedValue([]);
+
+    const { rerender } = render(<LokiQueryBuilder {...props} query={query} />);
+    rerender(
+      <LokiQueryBuilder
+        {...props}
+        query={{ ...query, labels: [...query.labels, { label: 'xyz', op: '=', value: 'abc' }] }}
+      />
+    );
+
+    await waitFor(() => {
+      expect(props.datasource.getDataSamples).toHaveBeenCalledTimes(2);
+    });
+  });
+
+  it('does not re-run sample query when query does not change', async () => {
+    const query = {
+      labels: [{ label: 'foo', op: '=', value: 'bar' }],
+      operations: [{ id: LokiOperationId.LineContains, params: ['error'] }],
+    };
+    const props = createDefaultProps();
+    props.datasource.getDataSamples = jest.fn().mockResolvedValue([]);
+
+    const { rerender } = render(<LokiQueryBuilder {...props} query={query} />);
+    rerender(<LokiQueryBuilder {...props} query={query} />);
+
+    await waitFor(() => {
+      expect(props.datasource.getDataSamples).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  it('re-run sample query when time range changes over 5 minutes', async () => {
+    const query = {
+      labels: [{ label: 'foo', op: '=', value: 'bar' }],
+      operations: [{ id: LokiOperationId.LineContains, params: ['error'] }],
+    };
+    const props = createDefaultProps();
+    const updatedFrom = dateTime(props.timeRange.from.valueOf() + TIME_SPAN_TO_TRIGGER_SAMPLES + 1000);
+    const updatedTo = dateTime(props.timeRange.to.valueOf() + TIME_SPAN_TO_TRIGGER_SAMPLES + 1000);
+    const updatedTimeRange = {
+      from: updatedFrom,
+      to: updatedTo,
+      raw: {
+        from: updatedFrom,
+        to: updatedTo,
+      },
+    };
+    props.datasource.getDataSamples = jest.fn().mockResolvedValue([]);
+
+    const { rerender } = render(<LokiQueryBuilder {...props} query={query} />);
+    rerender(<LokiQueryBuilder {...props} query={query} timeRange={updatedTimeRange} />);
+
+    await waitFor(() => {
+      expect(props.datasource.getDataSamples).toHaveBeenCalledTimes(2);
+    });
+  });
+
+  it('does not re-run sample query when time range changes less than 5 minutes', async () => {
+    const query = {
+      labels: [{ label: 'foo', op: '=', value: 'bar' }],
+      operations: [{ id: LokiOperationId.LineContains, params: ['error'] }],
+    };
+    const props = createDefaultProps();
+    const updatedFrom = dateTime(props.timeRange.from.valueOf() + TIME_SPAN_TO_TRIGGER_SAMPLES - 1000);
+    const updatedTo = dateTime(props.timeRange.to.valueOf() + TIME_SPAN_TO_TRIGGER_SAMPLES - 1000);
+    const updatedTimeRange = {
+      from: updatedFrom,
+      to: updatedTo,
+      raw: {
+        from: updatedFrom,
+        to: updatedTo,
+      },
+    };
+    props.datasource.getDataSamples = jest.fn().mockResolvedValue([]);
+
+    const { rerender } = render(<LokiQueryBuilder {...props} query={query} />);
+    rerender(<LokiQueryBuilder {...props} query={query} timeRange={updatedTimeRange} />);
+
+    await waitFor(() => {
+      expect(props.datasource.getDataSamples).toHaveBeenCalledTimes(1);
+    });
+  });
 });
+
+const getSelectParent = (input: HTMLElement) =>
+  input.parentElement?.parentElement?.parentElement?.parentElement?.parentElement;
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.tsx
index 0e92e3cd358a6..f112874988de3 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.tsx
@@ -1,177 +1,209 @@
+import { isEqual } from 'lodash';
 import React, { useEffect, useMemo, useState } from 'react';
+import { usePrevious } from 'react-use';
 
-import { DataSourceApi, getDefaultTimeRange, LoadingState, PanelData, SelectableValue } from '@grafana/data';
-import { EditorRow } from '@grafana/experimental';
-import { LabelFilters } from 'app/plugins/datasource/prometheus/querybuilder/shared/LabelFilters';
-import { OperationExplainedBox } from 'app/plugins/datasource/prometheus/querybuilder/shared/OperationExplainedBox';
-import { OperationList } from 'app/plugins/datasource/prometheus/querybuilder/shared/OperationList';
-import { OperationListExplained } from 'app/plugins/datasource/prometheus/querybuilder/shared/OperationListExplained';
-import { OperationsEditorRow } from 'app/plugins/datasource/prometheus/querybuilder/shared/OperationsEditorRow';
-import { QueryBuilderHints } from 'app/plugins/datasource/prometheus/querybuilder/shared/QueryBuilderHints';
-import { RawQuery } from 'app/plugins/datasource/prometheus/querybuilder/shared/RawQuery';
+import { DataSourceApi, getDefaultTimeRange, LoadingState, PanelData, SelectableValue, TimeRange } from '@grafana/data';
 import {
+  EditorRow,
+  LabelFilters,
+  OperationExplainedBox,
+  OperationList,
+  OperationListExplained,
+  OperationsEditorRow,
+  QueryBuilderHints,
+  RawQuery,
   QueryBuilderLabelFilter,
   QueryBuilderOperation,
-} from 'app/plugins/datasource/prometheus/querybuilder/shared/types';
+} from '@grafana/experimental';
+import { config } from '@grafana/runtime';
 
 import { testIds } from '../../components/LokiQueryEditor';
 import { LokiDatasource } from '../../datasource';
 import { escapeLabelValueInSelector } from '../../languageUtils';
 import logqlGrammar from '../../syntax';
+import { LokiQuery } from '../../types';
 import { lokiQueryModeller } from '../LokiQueryModeller';
+import { isConflictingFilter } from '../operationUtils';
 import { buildVisualQueryFromString } from '../parsing';
 import { LokiOperationId, LokiVisualQuery } from '../types';
 
 import { EXPLAIN_LABEL_FILTER_CONTENT } from './LokiQueryBuilderExplained';
 import { NestedQueryList } from './NestedQueryList';
 
+export const TIME_SPAN_TO_TRIGGER_SAMPLES = 5 * 60 * 1000;
 export interface Props {
   query: LokiVisualQuery;
   datasource: LokiDatasource;
   showExplain: boolean;
+  timeRange?: TimeRange;
   onChange: (update: LokiVisualQuery) => void;
   onRunQuery: () => void;
 }
-export const LokiQueryBuilder = React.memo<Props>(({ datasource, query, onChange, onRunQuery, showExplain }) => {
-  const [sampleData, setSampleData] = useState<PanelData>();
-  const [highlightedOp, setHighlightedOp] = useState<QueryBuilderOperation | undefined>(undefined);
-
-  const onChangeLabels = (labels: QueryBuilderLabelFilter[]) => {
-    onChange({ ...query, labels });
-  };
-
-  const withTemplateVariableOptions = async (optionsPromise: Promise<string[]>): Promise<SelectableValue[]> => {
-    const options = await optionsPromise;
-    return [...datasource.getVariables(), ...options].map((value) => ({ label: value, value }));
-  };
-
-  const onGetLabelNames = async (forLabel: Partial<QueryBuilderLabelFilter>): Promise<string[]> => {
-    const labelsToConsider = query.labels.filter((x) => x !== forLabel);
-
-    if (labelsToConsider.length === 0) {
-      return await datasource.languageProvider.fetchLabels();
-    }
-
-    const expr = lokiQueryModeller.renderLabels(labelsToConsider);
-    const series = await datasource.languageProvider.fetchSeriesLabels(expr);
-    const labelsNamesToConsider = labelsToConsider.map((l) => l.label);
-
-    const labelNames = Object.keys(series)
-      // Filter out label names that are already selected
-      .filter((name) => !labelsNamesToConsider.includes(name))
-      .sort();
-
-    return labelNames;
-  };
-
-  const onGetLabelValues = async (forLabel: Partial<QueryBuilderLabelFilter>) => {
-    if (!forLabel.label) {
-      return [];
-    }
-
-    let values;
-    const labelsToConsider = query.labels.filter((x) => x !== forLabel);
-    if (labelsToConsider.length === 0) {
-      values = await datasource.languageProvider.fetchLabelValues(forLabel.label);
-    } else {
+export const LokiQueryBuilder = React.memo<Props>(
+  ({ datasource, query, onChange, onRunQuery, showExplain, timeRange }) => {
+    const [sampleData, setSampleData] = useState<PanelData>();
+    const [highlightedOp, setHighlightedOp] = useState<QueryBuilderOperation | undefined>(undefined);
+    const prevQuery = usePrevious(query);
+    const prevTimeRange = usePrevious(timeRange);
+
+    const onChangeLabels = (labels: QueryBuilderLabelFilter[]) => {
+      onChange({ ...query, labels });
+    };
+
+    const withTemplateVariableOptions = async (optionsPromise: Promise<string[]>): Promise<SelectableValue[]> => {
+      const options = await optionsPromise;
+      return [...datasource.getVariables(), ...options].map((value) => ({ label: value, value }));
+    };
+
+    const onGetLabelNames = async (forLabel: Partial<QueryBuilderLabelFilter>): Promise<string[]> => {
+      const labelsToConsider = query.labels.filter((x) => x !== forLabel);
+
+      const hasEqualityOperation = labelsToConsider.find(
+        (filter) => filter.op === '=' || (filter.op === '=~' && new RegExp(filter.value).test('') === false)
+      );
+      if (labelsToConsider.length === 0 || !hasEqualityOperation) {
+        return await datasource.languageProvider.fetchLabels({ timeRange });
+      }
+
       const expr = lokiQueryModeller.renderLabels(labelsToConsider);
-      const result = await datasource.languageProvider.fetchSeriesLabels(expr);
-      values = result[datasource.interpolateString(forLabel.label)];
-    }
-
-    return values ? values.map((v) => escapeLabelValueInSelector(v, forLabel.op)) : []; // Escape values in return
-  };
-
-  const labelFilterRequired: boolean = useMemo(() => {
-    const { labels, operations: op } = query;
-    if (!labels.length && op.length) {
-      // Filter is required when operations are present (empty line contains operation is exception)
-      if (op.length === 1 && op[0].id === LokiOperationId.LineContains && op[0].params[0] === '') {
-        return false;
+      const series = await datasource.languageProvider.fetchSeriesLabels(expr, { timeRange });
+      const labelsNamesToConsider = labelsToConsider.map((l) => l.label);
+
+      const labelNames = Object.keys(series)
+        // Filter out label names that are already selected
+        .filter((name) => !labelsNamesToConsider.includes(name))
+        .sort();
+
+      return labelNames;
+    };
+
+    const onGetLabelValues = async (forLabel: Partial<QueryBuilderLabelFilter>) => {
+      if (!forLabel.label) {
+        return [];
+      }
+
+      let values;
+      const labelsToConsider = query.labels.filter((x) => x !== forLabel);
+      // If we have no equality/regex operation with .*, we can't fetch series as it will throw an error, so we fetch label values
+      const hasEqualityOperation = labelsToConsider.find(
+        (filter) => filter.op === '=' || (filter.op === '=~' && new RegExp(filter.value).test('') === false)
+      );
+      if (labelsToConsider.length === 0 || !hasEqualityOperation) {
+        values = await datasource.languageProvider.fetchLabelValues(forLabel.label, { timeRange });
+      } else {
+        const expr = lokiQueryModeller.renderLabels(labelsToConsider);
+        const result = await datasource.languageProvider.fetchSeriesLabels(expr, { timeRange });
+        values = result[datasource.interpolateString(forLabel.label)];
       }
-      return true;
-    }
-    return false;
-  }, [query]);
-
-  useEffect(() => {
-    const onGetSampleData = async () => {
-      const lokiQuery = { expr: lokiQueryModeller.renderQuery(query), refId: 'data-samples' };
-      const series = await datasource.getDataSamples(lokiQuery);
-      const sampleData = { series, state: LoadingState.Done, timeRange: getDefaultTimeRange() };
-      setSampleData(sampleData);
+
+      return values ? values.map((v) => escapeLabelValueInSelector(v, forLabel.op)) : []; // Escape values in return
     };
 
-    onGetSampleData().catch(console.error);
-  }, [datasource, query]);
-
-  const lang = { grammar: logqlGrammar, name: 'logql' };
-  return (
-    <div data-testid={testIds.editor}>
-      <EditorRow>
-        <LabelFilters
-          onGetLabelNames={(forLabel: Partial<QueryBuilderLabelFilter>) =>
-            withTemplateVariableOptions(onGetLabelNames(forLabel))
-          }
-          onGetLabelValues={(forLabel: Partial<QueryBuilderLabelFilter>) =>
-            withTemplateVariableOptions(onGetLabelValues(forLabel))
-          }
-          labelsFilters={query.labels}
-          onChange={onChangeLabels}
-          labelFilterRequired={labelFilterRequired}
-        />
-      </EditorRow>
-      {showExplain && (
-        <OperationExplainedBox
-          stepNumber={1}
-          title={<RawQuery query={`${lokiQueryModeller.renderLabels(query.labels)}`} lang={lang} />}
-        >
-          {EXPLAIN_LABEL_FILTER_CONTENT}
-        </OperationExplainedBox>
-      )}
-      <OperationsEditorRow>
-        <OperationList
-          queryModeller={lokiQueryModeller}
-          query={query}
-          onChange={onChange}
-          onRunQuery={onRunQuery}
-          datasource={datasource as DataSourceApi}
-          highlightedOp={highlightedOp}
-        />
-        <QueryBuilderHints<LokiVisualQuery>
-          datasource={datasource}
-          query={query}
-          onChange={onChange}
-          data={sampleData}
-          queryModeller={lokiQueryModeller}
-          buildVisualQueryFromString={buildVisualQueryFromString}
-        />
-      </OperationsEditorRow>
-      {showExplain && (
-        <OperationListExplained<LokiVisualQuery>
-          stepNumber={2}
-          queryModeller={lokiQueryModeller}
-          query={query}
-          lang={lang}
-          onMouseEnter={(op) => {
-            setHighlightedOp(op);
-          }}
-          onMouseLeave={() => {
-            setHighlightedOp(undefined);
-          }}
-        />
-      )}
-      {query.binaryQueries && query.binaryQueries.length > 0 && (
-        <NestedQueryList
-          query={query}
-          datasource={datasource}
-          onChange={onChange}
-          onRunQuery={onRunQuery}
-          showExplain={showExplain}
-        />
-      )}
-    </div>
-  );
-});
+    const labelFilterRequired: boolean = useMemo(() => {
+      const { labels, operations: op } = query;
+      if (!labels.length && op.length) {
+        // Filter is required when operations are present (empty line contains operation is exception)
+        if (op.length === 1 && op[0].id === LokiOperationId.LineContains && op[0].params[0] === '') {
+          return false;
+        }
+        return true;
+      }
+      return false;
+    }, [query]);
+
+    useEffect(() => {
+      const onGetSampleData = async () => {
+        const lokiQuery = { expr: lokiQueryModeller.renderQuery(query), refId: 'data-samples' };
+        const range = timeRange ?? getDefaultTimeRange();
+        const series = await datasource.getDataSamples(lokiQuery, range);
+        const sampleData = { series, state: LoadingState.Done, timeRange: range };
+        setSampleData(sampleData);
+      };
+
+      const updateBasedOnChangedTimeRange =
+        prevTimeRange &&
+        timeRange &&
+        (Math.abs(timeRange.to.valueOf() - prevTimeRange.to.valueOf()) > TIME_SPAN_TO_TRIGGER_SAMPLES ||
+          Math.abs(timeRange.from.valueOf() - prevTimeRange.from.valueOf()) > TIME_SPAN_TO_TRIGGER_SAMPLES);
+      const updateBasedOnChangedQuery = !isEqual(prevQuery, query);
+      if (config.featureToggles.lokiQueryHints && (updateBasedOnChangedTimeRange || updateBasedOnChangedQuery)) {
+        onGetSampleData().catch(console.error);
+      }
+    }, [datasource, query, timeRange, prevQuery, prevTimeRange]);
+
+    const lang = { grammar: logqlGrammar, name: 'logql' };
+    return (
+      <div data-testid={testIds.editor}>
+        <EditorRow>
+          <LabelFilters
+            onGetLabelNames={(forLabel: Partial<QueryBuilderLabelFilter>) =>
+              withTemplateVariableOptions(onGetLabelNames(forLabel))
+            }
+            onGetLabelValues={(forLabel: Partial<QueryBuilderLabelFilter>) =>
+              withTemplateVariableOptions(onGetLabelValues(forLabel))
+            }
+            labelsFilters={query.labels}
+            onChange={onChangeLabels}
+            labelFilterRequired={labelFilterRequired}
+          />
+        </EditorRow>
+        {showExplain && (
+          <OperationExplainedBox
+            stepNumber={1}
+            title={<RawQuery query={`${lokiQueryModeller.renderLabels(query.labels)}`} language={lang} />}
+          >
+            {EXPLAIN_LABEL_FILTER_CONTENT}
+          </OperationExplainedBox>
+        )}
+        <OperationsEditorRow>
+          <OperationList
+            queryModeller={lokiQueryModeller}
+            query={query}
+            onChange={onChange}
+            onRunQuery={onRunQuery}
+            datasource={datasource as DataSourceApi}
+            highlightedOp={highlightedOp}
+            isConflictingOperation={(operation: QueryBuilderOperation, otherOperations: QueryBuilderOperation[]) =>
+              operation.id === LokiOperationId.LabelFilter && isConflictingFilter(operation, otherOperations)
+            }
+          />
+          <QueryBuilderHints<LokiVisualQuery, LokiQuery>
+            datasource={datasource}
+            query={query}
+            onChange={onChange}
+            data={sampleData}
+            queryModeller={lokiQueryModeller}
+            buildVisualQueryFromString={buildVisualQueryFromString}
+            buildDataQueryFromQueryString={(queryString) => ({ expr: queryString, refId: 'hints' })}
+            buildQueryStringFromDataQuery={(query) => query.expr}
+          />
+        </OperationsEditorRow>
+        {showExplain && (
+          <OperationListExplained<LokiVisualQuery>
+            stepNumber={2}
+            queryModeller={lokiQueryModeller}
+            query={query}
+            language={lang}
+            onMouseEnter={(op) => {
+              setHighlightedOp(op);
+            }}
+            onMouseLeave={() => {
+              setHighlightedOp(undefined);
+            }}
+          />
+        )}
+        {query.binaryQueries && query.binaryQueries.length > 0 && (
+          <NestedQueryList
+            query={query}
+            datasource={datasource}
+            onChange={onChange}
+            onRunQuery={onRunQuery}
+            showExplain={showExplain}
+          />
+        )}
+      </div>
+    );
+  }
+);
 
 LokiQueryBuilder.displayName = 'LokiQueryBuilder';
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.test.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.test.tsx
index 5c01d8908bc62..8e110352ff76f 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.test.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.test.tsx
@@ -1,10 +1,8 @@
-import { render, screen } from '@testing-library/react';
+import { render, screen, waitFor, findAllByRole } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { DataSourcePluginMeta } from '@grafana/data';
-import { addOperation } from 'app/plugins/datasource/prometheus/querybuilder/shared/OperationList.testUtils';
-
-import { LokiDatasource } from '../../datasource';
+import { createLokiDatasource } from '../../__mocks__/datasource';
 
 import { LokiQueryBuilderContainer } from './LokiQueryBuilderContainer';
 
@@ -15,21 +13,7 @@ describe('LokiQueryBuilderContainer', () => {
         expr: '{job="testjob"}',
         refId: 'A',
       },
-      datasource: new LokiDatasource(
-        {
-          id: 1,
-          uid: '',
-          type: 'loki',
-          name: 'loki-test',
-          access: 'proxy',
-          url: '',
-          jsonData: {},
-          meta: {} as DataSourcePluginMeta,
-          readOnly: false,
-        },
-        undefined,
-        undefined
-      ),
+      datasource: createLokiDatasource(),
       onChange: jest.fn(),
       onRunQuery: () => {},
       showExplain: false,
@@ -46,4 +30,113 @@ describe('LokiQueryBuilderContainer', () => {
       refId: 'A',
     });
   });
+  it('uses | to separate multiple values in label filters', async () => {
+    const props = {
+      query: {
+        expr: '{app="app1"}',
+        refId: 'A',
+      },
+      datasource: createLokiDatasource(),
+      onChange: jest.fn(),
+      onRunQuery: () => {},
+      showExplain: false,
+    };
+    props.datasource.getDataSamples = jest.fn().mockResolvedValue([]);
+    props.datasource.languageProvider.fetchSeriesLabels = jest.fn().mockReturnValue({ job: ['grafana', 'loki'] });
+    props.onChange = jest.fn();
+
+    render(<LokiQueryBuilderContainer {...props} />);
+    await userEvent.click(screen.getByLabelText('Add'));
+    const labels = screen.getByText(/Label filters/);
+    const selects = await findAllByRole(getSelectParent(labels)!, 'combobox');
+    await userEvent.click(selects[3]);
+    await userEvent.click(await screen.findByText('job'));
+
+    await userEvent.click(selects[4]);
+    await userEvent.click(await screen.findByText('=~'));
+
+    await userEvent.click(selects[5]);
+    await userEvent.click(await screen.findByText('grafana'));
+
+    await userEvent.click(selects[5]);
+    await userEvent.click(await screen.findByText('loki'));
+
+    await waitFor(() => {
+      expect(props.onChange).toBeCalledWith({ expr: '{app="app1", job=~"grafana|loki"}', refId: 'A' });
+    });
+  });
+
+  it('highlights the query in preview using loki grammar', async () => {
+    const props = {
+      query: {
+        expr: '{app="baz"} | logfmt',
+        refId: 'A',
+      },
+      datasource: createLokiDatasource(),
+      onChange: jest.fn(),
+      onRunQuery: () => {},
+      showExplain: false,
+    };
+    props.datasource.getDataSamples = jest.fn().mockResolvedValue([]);
+    render(<LokiQueryBuilderContainer {...props} />);
+    expect(screen.getByText('{')).toHaveClass('token punctuation');
+    expect(screen.getByText('"baz"')).toHaveClass('token label-value attr-value');
+    expect(screen.getByText('|')).toHaveClass('token pipe-operator operator');
+    expect(screen.getByText('logfmt')).toHaveClass('token pipe-operations keyword');
+  });
+
+  it('shows conflicting label expressions', async () => {
+    const props = {
+      query: {
+        expr: '{job="grafana"} | app!="bar" | app="bar"',
+        refId: 'A',
+      },
+      datasource: createLokiDatasource(),
+      onChange: jest.fn(),
+      onRunQuery: () => {},
+      showExplain: false,
+    };
+    props.datasource.getDataSamples = jest.fn().mockResolvedValue([]);
+
+    render(<LokiQueryBuilderContainer {...props} />);
+    expect(screen.getAllByText('You have conflicting label filters')).toHaveLength(2);
+  });
+
+  it('uses <expr> as placeholder for query in explain section', async () => {
+    const props = {
+      query: {
+        expr: '{job="grafana"} | logfmt',
+        refId: 'A',
+      },
+      datasource: createLokiDatasource(),
+      onChange: jest.fn(),
+      onRunQuery: () => {},
+      showExplain: true,
+    };
+    props.datasource.getDataSamples = jest.fn().mockResolvedValue([]);
+
+    render(<LokiQueryBuilderContainer {...props} />);
+    expect(screen.getByText('<')).toBeInTheDocument();
+    expect(screen.getByText('expr')).toBeInTheDocument();
+    expect(screen.getByText('>')).toBeInTheDocument();
+  });
 });
+
+async function addOperation(section: string, op: string) {
+  const addOperationButton = screen.getByTitle('Add operation');
+  expect(addOperationButton).toBeInTheDocument();
+  await userEvent.click(addOperationButton);
+  const sectionItem = await screen.findByTitle(section);
+  expect(sectionItem).toBeInTheDocument();
+  // Weirdly the await userEvent.click doesn't work here, it reports the item has pointer-events: none. Don't see that
+  // anywhere when debugging so not sure what style is it picking up.
+  await userEvent.click(sectionItem.children[0], { pointerEventsCheck: 0 });
+  const opItem = screen.getByTitle(op);
+  expect(opItem).toBeInTheDocument();
+  // Weirdly the await userEvent.click doesn't work here, it reports the item has pointer-events: none. Don't see that
+  // anywhere when debugging so not sure what style is it picking up.
+  await userEvent.click(opItem, { pointerEventsCheck: 0 });
+}
+
+const getSelectParent = (input: HTMLElement) =>
+  input.parentElement?.parentElement?.parentElement?.parentElement?.parentElement;
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.tsx
index e903b47b3dfdc..b4715fee0a489 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.tsx
@@ -1,6 +1,8 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import React, { useEffect, useReducer } from 'react';
 
+import { TimeRange } from '@grafana/data';
+
 import { testIds } from '../../components/LokiQueryEditor';
 import { LokiDatasource } from '../../datasource';
 import { LokiQuery } from '../../types';
@@ -17,6 +19,7 @@ export interface Props {
   onChange: (update: LokiQuery) => void;
   onRunQuery: () => void;
   showExplain: boolean;
+  timeRange?: TimeRange;
 }
 
 export interface State {
@@ -28,7 +31,7 @@ export interface State {
  * This component is here just to contain the translation logic between string query and the visual query builder model.
  */
 export function LokiQueryBuilderContainer(props: Props) {
-  const { query, onChange, onRunQuery, datasource, showExplain } = props;
+  const { query, onChange, onRunQuery, datasource, showExplain, timeRange } = props;
   const [state, dispatch] = useReducer(stateSlice.reducer, {
     expr: query.expr,
     // Use initial visual query only if query.expr is empty string
@@ -65,6 +68,7 @@ export function LokiQueryBuilderContainer(props: Props) {
         onRunQuery={onRunQuery}
         showExplain={showExplain}
         data-testid={testIds.editor}
+        timeRange={timeRange}
       />
       {query.expr !== '' && <QueryPreview query={query.expr} />}
     </>
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderExplained.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderExplained.tsx
index 0333c07ec5915..68430e8c2cb9e 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderExplained.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderExplained.tsx
@@ -1,9 +1,7 @@
 import React from 'react';
 
-import { Stack } from '@grafana/experimental';
-import { OperationExplainedBox } from 'app/plugins/datasource/prometheus/querybuilder/shared/OperationExplainedBox';
-import { OperationListExplained } from 'app/plugins/datasource/prometheus/querybuilder/shared/OperationListExplained';
-import { RawQuery } from 'app/plugins/datasource/prometheus/querybuilder/shared/RawQuery';
+import { OperationExplainedBox, OperationListExplained, RawQuery } from '@grafana/experimental';
+import { Stack } from '@grafana/ui';
 
 import { lokiGrammar } from '../../syntax';
 import { lokiQueryModeller } from '../LokiQueryModeller';
@@ -24,7 +22,7 @@ export const LokiQueryBuilderExplained = React.memo<Props>(({ query }) => {
     <Stack gap={0} direction="column">
       <OperationExplainedBox
         stepNumber={1}
-        title={<RawQuery query={`${lokiQueryModeller.renderLabels(visQuery.labels)}`} lang={lang} />}
+        title={<RawQuery query={`${lokiQueryModeller.renderLabels(visQuery.labels)}`} language={lang} />}
       >
         {EXPLAIN_LABEL_FILTER_CONTENT}
       </OperationExplainedBox>
@@ -32,7 +30,7 @@ export const LokiQueryBuilderExplained = React.memo<Props>(({ query }) => {
         stepNumber={2}
         queryModeller={lokiQueryModeller}
         query={visQuery}
-        lang={lang}
+        language={lang}
       />
     </Stack>
   );
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx
index 74934a42d1073..ad9b7ae80f129 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx
@@ -2,10 +2,9 @@ import { trim } from 'lodash';
 import React, { useMemo, useState } from 'react';
 
 import { CoreApp, isValidDuration, isValidGrafanaDuration, SelectableValue } from '@grafana/data';
-import { EditorField, EditorRow } from '@grafana/experimental';
+import { EditorField, EditorRow, QueryOptionGroup } from '@grafana/experimental';
 import { config, reportInteraction } from '@grafana/runtime';
 import { Alert, AutoSizeInput, RadioButtonGroup, Select } from '@grafana/ui';
-import { QueryOptionGroup } from 'app/plugins/datasource/prometheus/querybuilder/shared/QueryOptionGroup';
 
 import { preprocessMaxLines, queryTypeOptions, RESOLUTION_OPTIONS } from '../../components/LokiOptionFields';
 import { getLokiQueryType, isLogsQuery } from '../../queryUtils';
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryCodeEditor.test.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryCodeEditor.test.tsx
index 0ea262a76d50f..2277f31a6407c 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryCodeEditor.test.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryCodeEditor.test.tsx
@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 
-import { createLokiDatasource } from '../../mocks';
+import { createLokiDatasource } from '../../__mocks__/datasource';
 import { LokiQuery } from '../../types';
 
 import { EXPLAIN_LABEL_FILTER_CONTENT } from './LokiQueryBuilderExplained';
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryCodeEditor.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryCodeEditor.tsx
index 7e4fcc2ce3ce0..5db5313f98514 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryCodeEditor.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryCodeEditor.tsx
@@ -4,7 +4,6 @@ import React from 'react';
 import { GrafanaTheme2 } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { useStyles2, HorizontalGroup, IconButton, Tooltip, Icon } from '@grafana/ui';
-import { getModKey } from 'app/core/utils/browser';
 
 import { testIds } from '../../components/LokiQueryEditor';
 import { LokiQueryField } from '../../components/LokiQueryField';
@@ -57,7 +56,7 @@ export function LokiQueryCodeEditor({
                       size="xs"
                       tooltip="Format query"
                     />
-                    <Tooltip content={`Use ${getModKey()}+z to undo`}>
+                    <Tooltip content={`Use ctrl/cmd + z to undo`}>
                       <Icon className={styles.hint} name="keyboard" />
                     </Tooltip>
                   </HorizontalGroup>
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/NestedQuery.test.tsx b/public/app/plugins/datasource/loki/querybuilder/components/NestedQuery.test.tsx
index ec39fff98e8a0..2c3a586fb0008 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/NestedQuery.test.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/NestedQuery.test.tsx
@@ -1,8 +1,8 @@
-import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { createLokiDatasource } from '../../mocks';
+import { createLokiDatasource } from '../../__mocks__/datasource';
 import { LokiVisualQueryBinary } from '../types';
 
 import { NestedQuery, Props as NestedQueryProps } from './NestedQuery';
@@ -71,7 +71,7 @@ describe('exit the nested query', () => {
   it('onRemove is called when clicking (x)', async () => {
     const props = createMockProps();
     render(<NestedQuery {...props} />);
-    fireEvent.click(await screen.findByLabelText('Remove nested query'));
+    await userEvent.click(await screen.findByLabelText('Remove nested query'));
     await waitFor(() => expect(props.onRemove).toHaveBeenCalledTimes(1));
   });
 });
@@ -80,8 +80,8 @@ describe('change operator', () => {
   it('onChange is called with the correct args', async () => {
     const props = createMockProps('/', 'on');
     render(<NestedQuery {...props} />);
-    userEvent.click(await screen.findByLabelText('Select operator'));
-    fireEvent.click(await screen.findByText('+'));
+    await userEvent.click(await screen.findByLabelText('Select operator'));
+    await userEvent.click(await screen.findByText('+'));
     await waitFor(() => expect(props.onChange).toHaveBeenCalledTimes(1));
     await waitFor(() =>
       expect(props.onChange).toHaveBeenCalledWith(0, {
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/NestedQueryList.test.tsx b/public/app/plugins/datasource/loki/querybuilder/components/NestedQueryList.test.tsx
new file mode 100644
index 0000000000000..623a44cbea841
--- /dev/null
+++ b/public/app/plugins/datasource/loki/querybuilder/components/NestedQueryList.test.tsx
@@ -0,0 +1,89 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { createLokiDatasource } from '../../__mocks__/datasource';
+import { LokiDatasource } from '../../datasource';
+import { LokiVisualQuery, LokiVisualQueryBinary } from '../types';
+
+import { EXPLAIN_LABEL_FILTER_CONTENT } from './LokiQueryBuilderExplained';
+import { NestedQueryList, Props as NestedQueryListProps } from './NestedQueryList';
+
+const X_BUTTON_LABEL = 'Remove nested query';
+function createMockProps(nestedQueriesCount = 1, showExplain = false): NestedQueryListProps {
+  const operators: string[] = ['+', '-', '*', '/'];
+  const nestedQueries: LokiVisualQueryBinary[] = [...Array(nestedQueriesCount).keys()].map((i) => ({
+    operator: operators[i % operators.length],
+    query: {
+      labels: [],
+      operations: [],
+    },
+  }));
+
+  const query: LokiVisualQuery = {
+    labels: [],
+    operations: [],
+    binaryQueries: nestedQueries,
+  };
+  const datasource: LokiDatasource = createLokiDatasource();
+
+  const props: NestedQueryListProps = {
+    query: query,
+    datasource: datasource,
+    showExplain: showExplain,
+    onChange: jest.fn(),
+    onRunQuery: jest.fn(),
+  };
+
+  return props;
+}
+
+describe('render nested queries', () => {
+  it.each([1, 3])('%i nested queries can be rendered', async (queriesCount) => {
+    const props = createMockProps(queriesCount, false);
+    render(<NestedQueryList {...props} />);
+
+    const nestedQueryCloseButtons = await screen.findAllByLabelText(X_BUTTON_LABEL);
+    expect(nestedQueryCloseButtons).toHaveLength(queriesCount);
+  });
+
+  it('shows explanations for all nested queries', async () => {
+    const props = createMockProps(3, true);
+    render(<NestedQueryList {...props} />);
+
+    const nestedQueryCloseButtons = await screen.findAllByText(EXPLAIN_LABEL_FILTER_CONTENT);
+    expect(nestedQueryCloseButtons).toHaveLength(3);
+  });
+});
+
+describe('events from nested queries', () => {
+  it('onChange is called when user removes one', async () => {
+    const props: NestedQueryListProps = createMockProps(3, false);
+    render(<NestedQueryList {...props} />);
+
+    const xButton: HTMLElement[] = await screen.findAllByLabelText(X_BUTTON_LABEL);
+    await userEvent.click(xButton[0]);
+
+    const removedQuery: LokiVisualQueryBinary[] = [props.query.binaryQueries![0]];
+    await waitFor(() => {
+      expect(props.onChange).toHaveBeenCalledWith({
+        ...props.query,
+        binaryQueries: expect.not.arrayContaining(removedQuery),
+      });
+    });
+  });
+
+  it('onChange is called from sub-query', async () => {
+    const props = createMockProps(4, false);
+    const subQuery = { ...props.query.binaryQueries![3] };
+    props.query.binaryQueries![0].query.binaryQueries = [subQuery];
+    render(<NestedQueryList {...props} />);
+
+    const xButton: HTMLElement[] = await screen.findAllByLabelText(X_BUTTON_LABEL);
+    await userEvent.click(xButton[1]);
+
+    await waitFor(async () => {
+      expect(props.onChange).toHaveBeenCalledTimes(1);
+    });
+  });
+});
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/NestedQueryList.tsx b/public/app/plugins/datasource/loki/querybuilder/components/NestedQueryList.tsx
index cf71dd0b69c75..4bf7af82923f4 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/NestedQueryList.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/NestedQueryList.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { Stack } from '@grafana/experimental';
+import { Stack } from '@grafana/ui';
 
 import { LokiDatasource } from '../../datasource';
 import { LokiVisualQuery, LokiVisualQueryBinary } from '../types';
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/QueryPattern.tsx b/public/app/plugins/datasource/loki/querybuilder/components/QueryPattern.tsx
index a1b00f4284273..c3d15c9711b23 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/QueryPattern.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/QueryPattern.tsx
@@ -2,8 +2,8 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
+import { RawQuery } from '@grafana/experimental';
 import { Button, Card, useStyles2 } from '@grafana/ui';
-import { RawQuery } from 'app/plugins/datasource/prometheus/querybuilder/shared/RawQuery';
 
 import logqlGrammar from '../../syntax';
 import { lokiQueryModeller } from '../LokiQueryModeller';
@@ -31,7 +31,7 @@ export const QueryPattern = (props: Props) => {
       <div className={styles.rawQueryContainer}>
         <RawQuery
           query={lokiQueryModeller.renderQuery({ labels: [], operations: pattern.operations })}
-          lang={lang}
+          language={lang}
           className={styles.rawQuery}
         />
       </div>
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/QueryPatternsModal.tsx b/public/app/plugins/datasource/loki/querybuilder/components/QueryPatternsModal.tsx
index f2dbd82113318..385b032b05e25 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/QueryPatternsModal.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/QueryPatternsModal.tsx
@@ -2,10 +2,9 @@ import { css } from '@emotion/css';
 import { capitalize } from 'lodash';
 import React, { useMemo, useState } from 'react';
 
-import { CoreApp, DataQuery, GrafanaTheme2 } from '@grafana/data';
+import { CoreApp, DataQuery, GrafanaTheme2, getNextRefId } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
 import { Button, Collapse, Modal, useStyles2 } from '@grafana/ui';
-import { getNextRefIdChar } from 'app/core/utils/query';
 
 import { LokiQuery } from '../../types';
 import { lokiQueryModeller } from '../LokiQueryModeller';
@@ -52,7 +51,7 @@ export const QueryPatternsModal = (props: Props) => {
     if (hasNewQueryOption && selectAsNewQuery) {
       onAddQuery({
         ...query,
-        refId: getNextRefIdChar(queries ?? [query]),
+        refId: getNextRefId(queries ?? [query]),
         expr: lokiQueryModeller.renderQuery(visualQuery.query),
       });
     } else {
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/QueryPreview.tsx b/public/app/plugins/datasource/loki/querybuilder/components/QueryPreview.tsx
index ad64cdc3036d0..04fffba21ae83 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/QueryPreview.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/QueryPreview.tsx
@@ -1,8 +1,7 @@
 import React from 'react';
 
-import { EditorRow, EditorFieldGroup } from '@grafana/experimental';
+import { EditorRow, EditorFieldGroup, RawQuery } from '@grafana/experimental';
 
-import { RawQuery } from '../../../prometheus/querybuilder/shared/RawQuery';
 import { lokiGrammar } from '../../syntax';
 
 export interface Props {
@@ -13,7 +12,7 @@ export function QueryPreview({ query }: Props) {
   return (
     <EditorRow>
       <EditorFieldGroup>
-        <RawQuery query={query} lang={{ grammar: lokiGrammar, name: 'lokiql' }} />
+        <RawQuery query={query} language={{ grammar: lokiGrammar, name: 'lokiql' }} />
       </EditorFieldGroup>
     </EditorRow>
   );
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.test.tsx b/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.test.tsx
index a0b7803a50021..3c5f98e2cbe65 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.test.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.test.tsx
@@ -2,18 +2,26 @@ import { screen, render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React, { ComponentProps } from 'react';
 
-import { DataFrame, DataSourceApi, DataSourcePluginMeta, FieldType, toDataFrame } from '@grafana/data';
-import {
-  QueryBuilderOperation,
-  QueryBuilderOperationParamDef,
-} from 'app/plugins/datasource/prometheus/querybuilder/shared/types';
+import { DataFrame, DataSourceApi, FieldType, toDataFrame } from '@grafana/data';
+import { QueryBuilderOperation, QueryBuilderOperationParamDef } from '@grafana/experimental';
+import { config } from '@grafana/runtime';
 
+import { createLokiDatasource } from '../../__mocks__/datasource';
 import { LokiDatasource } from '../../datasource';
+import { LokiQueryModeller } from '../LokiQueryModeller';
 import { LokiOperationId } from '../types';
 
 import { UnwrapParamEditor } from './UnwrapParamEditor';
 
 describe('UnwrapParamEditor', () => {
+  const queryHintsFeatureToggle = config.featureToggles.lokiQueryHints;
+  beforeAll(() => {
+    config.featureToggles.lokiQueryHints = true;
+  });
+  afterAll(() => {
+    config.featureToggles.lokiQueryHints = queryHintsFeatureToggle;
+  });
+
   it('shows value if value present', () => {
     const props = createProps({ value: 'unique' });
     render(<UnwrapParamEditor {...props} />);
@@ -52,6 +60,16 @@ describe('UnwrapParamEditor', () => {
     expect(await screen.findByText('status')).toBeInTheDocument();
     expect(await screen.findByText('duration')).toBeInTheDocument();
   });
+
+  it('does not show labels with unwrap-friendly values when feature is disabled', async () => {
+    config.featureToggles.lokiQueryHints = false;
+    const props = createProps({}, frames);
+    render(<UnwrapParamEditor {...props} />);
+    const input = screen.getByRole('combobox');
+    await userEvent.click(input);
+    expect(screen.queryByText('status')).not.toBeInTheDocument();
+    expect(screen.queryByText('duration')).not.toBeInTheDocument();
+  });
 });
 
 const createProps = (
@@ -75,21 +93,10 @@ const createProps = (
     },
     paramDef: {} as QueryBuilderOperationParamDef,
     operation: {} as QueryBuilderOperation,
-    datasource: new LokiDatasource(
-      {
-        id: 1,
-        uid: '',
-        type: 'loki',
-        name: 'loki-test',
-        access: 'proxy',
-        url: '',
-        jsonData: {},
-        meta: {} as DataSourcePluginMeta,
-        readOnly: false,
-      },
-      undefined,
-      undefined
-    ) as DataSourceApi,
+    datasource: createLokiDatasource() as DataSourceApi,
+    queryModeller: {
+      renderQuery: jest.fn().mockReturnValue('sum_over_time({foo="bar"} | logfmt | unwrap [5m])'),
+    } as unknown as LokiQueryModeller,
   };
   const props = { ...propsDefault, ...propsOverrides };
 
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.tsx b/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.tsx
index 4e364fc82901f..030b323566649 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.tsx
@@ -1,15 +1,15 @@
 import React, { useState } from 'react';
 
-import { SelectableValue, toOption } from '@grafana/data';
+import { SelectableValue, getDefaultTimeRange, toOption } from '@grafana/data';
+import { QueryBuilderOperationParamEditorProps, VisualQueryModeller } from '@grafana/experimental';
+import { config } from '@grafana/runtime';
 import { Select } from '@grafana/ui';
 
-import { getOperationParamId } from '../../../prometheus/querybuilder/shared/operationUtils';
-import { QueryBuilderOperationParamEditorProps } from '../../../prometheus/querybuilder/shared/types';
 import { placeHolderScopedVars } from '../../components/monaco-query-field/monaco-completion-provider/validation';
 import { LokiDatasource } from '../../datasource';
 import { getLogQueryFromMetricsQuery, isQueryWithError } from '../../queryUtils';
 import { extractUnwrapLabelKeysFromDataFrame } from '../../responseUtils';
-import { lokiQueryModeller } from '../LokiQueryModeller';
+import { getOperationParamId } from '../operationUtils';
 import { LokiVisualQuery } from '../types';
 
 export function UnwrapParamEditor({
@@ -19,6 +19,8 @@ export function UnwrapParamEditor({
   value,
   query,
   datasource,
+  timeRange,
+  queryModeller,
 }: QueryBuilderOperationParamEditorProps) {
   const [state, setState] = useState<{
     options?: Array<SelectableValue<string>>;
@@ -30,9 +32,9 @@ export function UnwrapParamEditor({
       inputId={getOperationParamId(operationId, index)}
       onOpenMenu={async () => {
         // This check is always true, we do it to make typescript happy
-        if (datasource instanceof LokiDatasource) {
+        if (datasource instanceof LokiDatasource && config.featureToggles.lokiQueryHints) {
           setState({ isLoading: true });
-          const options = await loadUnwrapOptions(query, datasource);
+          const options = await loadUnwrapOptions(query, datasource, queryModeller, timeRange);
           setState({ options, isLoading: undefined });
         }
       }}
@@ -53,15 +55,17 @@ export function UnwrapParamEditor({
 
 async function loadUnwrapOptions(
   query: LokiVisualQuery,
-  datasource: LokiDatasource
+  datasource: LokiDatasource,
+  queryModeller: VisualQueryModeller,
+  timeRange = getDefaultTimeRange()
 ): Promise<Array<SelectableValue<string>>> {
-  const queryExpr = lokiQueryModeller.renderQuery(query);
+  const queryExpr = queryModeller.renderQuery(query);
   const logExpr = getLogQueryFromMetricsQuery(queryExpr);
   if (isQueryWithError(datasource.interpolateString(logExpr, placeHolderScopedVars))) {
     return [];
   }
 
-  const samples = await datasource.getDataSamples({ expr: logExpr, refId: 'unwrap_samples' });
+  const samples = await datasource.getDataSamples({ expr: logExpr, refId: 'unwrap_samples' }, timeRange);
   const unwrapLabels = extractUnwrapLabelKeysFromDataFrame(samples[0]);
 
   const labelOptions = unwrapLabels.map((label) => ({
diff --git a/public/app/plugins/datasource/loki/querybuilder/operationUtils.test.ts b/public/app/plugins/datasource/loki/querybuilder/operationUtils.test.ts
index 68484ad6ff152..4ea7b5fed2487 100644
--- a/public/app/plugins/datasource/loki/querybuilder/operationUtils.test.ts
+++ b/public/app/plugins/datasource/loki/querybuilder/operationUtils.test.ts
@@ -1,6 +1,8 @@
-import { QueryBuilderOperation, QueryBuilderOperationDef } from '../../prometheus/querybuilder/shared/types';
+import { QueryBuilderOperation, QueryBuilderOperationDefinition } from '@grafana/experimental';
 
 import {
+  createAggregationOperation,
+  createAggregationOperationWithParam,
   createRangeOperation,
   createRangeOperationWithGrouping,
   getLineFilterRenderer,
@@ -8,7 +10,7 @@ import {
   labelFilterRenderer,
   pipelineRenderer,
 } from './operationUtils';
-import { getOperationDefinitions } from './operations';
+import { operationDefinitions } from './operations';
 import { LokiOperationId, LokiVisualQueryOperationCategory } from './types';
 
 describe('createRangeOperation', () => {
@@ -142,8 +144,12 @@ describe('getLineFilterRenderer', () => {
     id: '__line_contains_case_insensitive',
     params: ['ERrOR'],
   };
+  const MOCK_MODEL_BACKTICKS = {
+    id: '__line_contains',
+    params: ['`error`'],
+  };
 
-  const MOCK_DEF = undefined as unknown as QueryBuilderOperationDef;
+  const MOCK_DEF = undefined as unknown as QueryBuilderOperationDefinition;
 
   const MOCK_INNER_EXPR = '{job="grafana"}';
 
@@ -157,6 +163,11 @@ describe('getLineFilterRenderer', () => {
     expect(lineFilterRenderer(MOCK_MODEL, MOCK_DEF, MOCK_INNER_EXPR)).toBe('{job="grafana"} !~ `error`');
   });
 
+  it('lineFilterRenderer returns the correct query for line contains, containing backticks', () => {
+    const lineFilterRenderer = getLineFilterRenderer('!~');
+    expect(lineFilterRenderer(MOCK_MODEL_BACKTICKS, MOCK_DEF, MOCK_INNER_EXPR)).toBe('{job="grafana"} !~ "`error`"');
+  });
+
   it('lineFilterRenderer returns the correct query for line contains case insensitive', () => {
     const lineFilterRenderer = getLineFilterRenderer('!~', true);
     expect(lineFilterRenderer(MOCK_MODEL_INSENSITIVE, MOCK_DEF, MOCK_INNER_EXPR)).toBe(
@@ -167,7 +178,7 @@ describe('getLineFilterRenderer', () => {
 
 describe('labelFilterRenderer', () => {
   const MOCK_MODEL = { id: '__label_filter', params: ['label', '', 'value'] };
-  const MOCK_DEF = undefined as unknown as QueryBuilderOperationDef;
+  const MOCK_DEF = undefined as unknown as QueryBuilderOperationDefinition;
   const MOCK_INNER_EXPR = '{job="grafana"}';
 
   it.each`
@@ -209,17 +220,276 @@ describe('isConflictingFilter', () => {
 });
 
 describe('pipelineRenderer', () => {
-  let definitions: QueryBuilderOperationDef[];
-  beforeEach(() => {
-    definitions = getOperationDefinitions();
+  it('correctly renders unpack expressions', () => {
+    const model: QueryBuilderOperation = {
+      id: LokiOperationId.Unpack,
+      params: [],
+    };
+    const definition = operationDefinitions.find((def) => def.id === LokiOperationId.Unpack);
+    expect(pipelineRenderer(model, definition!, '{}')).toBe('{} | unpack');
   });
 
-  it('Correctly renders unpack expressions', () => {
+  it('correctly renders unpack expressions', () => {
     const model: QueryBuilderOperation = {
       id: LokiOperationId.Unpack,
       params: [],
     };
-    const definition = definitions.find((def) => def.id === LokiOperationId.Unpack);
+    const definition = operationDefinitions.find((def) => def.id === LokiOperationId.Unpack);
     expect(pipelineRenderer(model, definition!, '{}')).toBe('{} | unpack');
   });
+
+  it('correctly renders empty logfmt expression', () => {
+    const model: QueryBuilderOperation = {
+      id: LokiOperationId.Logfmt,
+      params: [],
+    };
+    const definition = operationDefinitions.find((def) => def.id === LokiOperationId.Logfmt);
+    expect(pipelineRenderer(model, definition!, '{}')).toBe('{} | logfmt');
+  });
+
+  it('correctly renders logfmt expression', () => {
+    const model: QueryBuilderOperation = {
+      id: LokiOperationId.Logfmt,
+      params: [true, false, 'foo', ''],
+    };
+    const definition = operationDefinitions.find((def) => def.id === LokiOperationId.Logfmt);
+    expect(pipelineRenderer(model, definition!, '{}')).toBe('{} | logfmt --strict foo');
+  });
+
+  it('correctly renders logfmt expression with multiple params', () => {
+    const model: QueryBuilderOperation = {
+      id: LokiOperationId.Logfmt,
+      params: [true, false, 'foo', 'bar', 'baz'],
+    };
+    const definition = operationDefinitions.find((def) => def.id === LokiOperationId.Logfmt);
+    expect(pipelineRenderer(model, definition!, '{}')).toBe('{} | logfmt --strict foo, bar, baz');
+  });
+
+  it('correctly renders empty json expression', () => {
+    const model: QueryBuilderOperation = {
+      id: LokiOperationId.Json,
+      params: [],
+    };
+    const definition = operationDefinitions.find((def) => def.id === LokiOperationId.Json);
+    expect(pipelineRenderer(model, definition!, '{}')).toBe('{} | json');
+  });
+
+  it('correctly renders json expression', () => {
+    const model: QueryBuilderOperation = {
+      id: LokiOperationId.Json,
+      params: ['foo', ''],
+    };
+    const definition = operationDefinitions.find((def) => def.id === LokiOperationId.Json);
+    expect(pipelineRenderer(model, definition!, '{}')).toBe('{} | json foo');
+  });
+
+  it('correctly renders json expression with multiple params', () => {
+    const model: QueryBuilderOperation = {
+      id: LokiOperationId.Json,
+      params: ['foo', 'bar', 'baz'],
+    };
+    const definition = operationDefinitions.find((def) => def.id === LokiOperationId.Json);
+    expect(pipelineRenderer(model, definition!, '{}')).toBe('{} | json foo, bar, baz');
+  });
+
+  it('correctly renders keep expression', () => {
+    const model: QueryBuilderOperation = {
+      id: LokiOperationId.Keep,
+      params: ['foo', ''],
+    };
+    const definition = operationDefinitions.find((def) => def.id === LokiOperationId.Keep);
+    expect(pipelineRenderer(model, definition!, '{}')).toBe('{} | keep foo');
+  });
+
+  it('correctly renders keep expression with multiple params', () => {
+    const model: QueryBuilderOperation = {
+      id: LokiOperationId.Keep,
+      params: ['foo', 'bar', 'baz'],
+    };
+    const definition = operationDefinitions.find((def) => def.id === LokiOperationId.Keep);
+    expect(pipelineRenderer(model, definition!, '{}')).toBe('{} | keep foo, bar, baz');
+  });
+
+  it('correctly renders drop expression', () => {
+    const model: QueryBuilderOperation = {
+      id: LokiOperationId.Drop,
+      params: ['foo', ''],
+    };
+    const definition = operationDefinitions.find((def) => def.id === LokiOperationId.Drop);
+    expect(pipelineRenderer(model, definition!, '{}')).toBe('{} | drop foo');
+  });
+
+  it('correctly renders drop expression with multiple params', () => {
+    const model: QueryBuilderOperation = {
+      id: LokiOperationId.Drop,
+      params: ['foo', 'bar', 'baz'],
+    };
+    const definition = operationDefinitions.find((def) => def.id === LokiOperationId.Drop);
+    expect(pipelineRenderer(model, definition!, '{}')).toBe('{} | drop foo, bar, baz');
+  });
+});
+
+describe('createAggregationOperation', () => {
+  it('returns correct aggregation definitions with overrides', () => {
+    expect(createAggregationOperation('test_aggregation', { category: 'test_category' })).toMatchObject([
+      {
+        addOperationHandler: {},
+        alternativesKey: 'plain aggregations',
+        category: 'test_category',
+        defaultParams: [],
+        explainHandler: {},
+        id: 'test_aggregation',
+        name: 'Test aggregation',
+        paramChangedHandler: {},
+        params: [
+          {
+            name: 'By label',
+            optional: true,
+            restParam: true,
+            type: 'string',
+          },
+        ],
+        renderer: {},
+      },
+      {
+        alternativesKey: 'aggregations by',
+        category: 'test_category',
+        defaultParams: [''],
+        explainHandler: {},
+        hideFromList: true,
+        id: '__test_aggregation_by',
+        name: 'Test aggregation by',
+        paramChangedHandler: {},
+        params: [
+          {
+            editor: {},
+            name: 'Label',
+            optional: true,
+            restParam: true,
+            type: 'string',
+          },
+        ],
+        renderer: {},
+      },
+      {
+        alternativesKey: 'aggregations by',
+        category: 'test_category',
+        defaultParams: [''],
+        explainHandler: {},
+        hideFromList: true,
+        id: '__test_aggregation_without',
+        name: 'Test aggregation without',
+        paramChangedHandler: {},
+        params: [
+          {
+            name: 'Label',
+            optional: true,
+            restParam: true,
+            type: 'string',
+          },
+        ],
+        renderer: {},
+      },
+    ]);
+  });
+});
+
+describe('createAggregationOperationWithParams', () => {
+  it('returns correct aggregation definitions with overrides and params', () => {
+    expect(
+      createAggregationOperationWithParam(
+        'test_aggregation',
+        {
+          params: [{ name: 'K-value', type: 'number' }],
+          defaultParams: [5],
+        },
+        { category: 'test_category' }
+      )
+    ).toMatchObject([
+      {
+        addOperationHandler: {},
+        alternativesKey: 'plain aggregations',
+        category: 'test_category',
+        defaultParams: [5],
+        explainHandler: {},
+        id: 'test_aggregation',
+        name: 'Test aggregation',
+        paramChangedHandler: {},
+        params: [
+          { name: 'K-value', type: 'number' },
+          { name: 'By label', optional: true, restParam: true, type: 'string' },
+        ],
+        renderer: {},
+      },
+      {
+        alternativesKey: 'aggregations by',
+        category: 'test_category',
+        defaultParams: [5, ''],
+        explainHandler: {},
+        hideFromList: true,
+        id: '__test_aggregation_by',
+        name: 'Test aggregation by',
+        paramChangedHandler: {},
+        params: [
+          { name: 'K-value', type: 'number' },
+          { editor: {}, name: 'Label', optional: true, restParam: true, type: 'string' },
+        ],
+        renderer: {},
+      },
+      {
+        alternativesKey: 'aggregations by',
+        category: 'test_category',
+        defaultParams: [5, ''],
+        explainHandler: {},
+        hideFromList: true,
+        id: '__test_aggregation_without',
+        name: 'Test aggregation without',
+        paramChangedHandler: {},
+        params: [
+          { name: 'K-value', type: 'number' },
+          { name: 'Label', optional: true, restParam: true, type: 'string' },
+        ],
+        renderer: {},
+      },
+    ]);
+  });
+  it('returns correct query string using aggregation definitions with overrides and number type param', () => {
+    const def = createAggregationOperationWithParam(
+      'test_aggregation',
+      {
+        params: [{ name: 'K-value', type: 'number' }],
+        defaultParams: [5],
+      },
+      { category: 'test_category' }
+    );
+
+    const topKByDefinition = def[1];
+    expect(
+      topKByDefinition.renderer(
+        { id: '__topk_by', params: ['5', 'source', 'place'] },
+        def[1],
+        'rate({place="luna"} |= `` [5m])'
+      )
+    ).toBe('test_aggregation by(source, place) (5, rate({place="luna"} |= `` [5m]))');
+  });
+
+  it('returns correct query string using aggregation definitions with overrides and string type param', () => {
+    const def = createAggregationOperationWithParam(
+      'test_aggregation',
+      {
+        params: [{ name: 'Identifier', type: 'string' }],
+        defaultParams: ['count'],
+      },
+      { category: 'test_category' }
+    );
+
+    const countValueDefinition = def[1];
+    expect(
+      countValueDefinition.renderer(
+        { id: 'count_values', params: ['5', 'source', 'place'] },
+        def[1],
+        'rate({place="luna"} |= `` [5m])'
+      )
+    ).toBe('test_aggregation by(source, place) ("5", rate({place="luna"} |= `` [5m]))');
+  });
 });
diff --git a/public/app/plugins/datasource/loki/querybuilder/operationUtils.ts b/public/app/plugins/datasource/loki/querybuilder/operationUtils.ts
index 3d8f245dd41ea..971ae7e3fc000 100644
--- a/public/app/plugins/datasource/loki/querybuilder/operationUtils.ts
+++ b/public/app/plugins/datasource/loki/querybuilder/operationUtils.ts
@@ -1,21 +1,25 @@
-import { LabelParamEditor } from '../../prometheus/querybuilder/components/LabelParamEditor';
-import {
-  getAggregationExplainer,
-  getLastLabelRemovedHandler,
-  getOnLabelAddedHandler,
-  getPromAndLokiOperationDisplayName,
-} from '../../prometheus/querybuilder/shared/operationUtils';
+import { capitalize } from 'lodash';
+import pluralize from 'pluralize';
+
 import {
   QueryBuilderOperation,
-  QueryBuilderOperationDef,
+  QueryBuilderOperationDefinition,
   QueryBuilderOperationParamDef,
+  QueryBuilderOperationParamValue,
+  VisualQuery,
   VisualQueryModeller,
-} from '../../prometheus/querybuilder/shared/types';
+} from '@grafana/experimental';
+
+import { escapeLabelValueInExactSelector } from '../languageUtils';
 import { FUNCTIONS } from '../syntax';
 
+import { LabelParamEditor } from './components/LabelParamEditor';
 import { LokiOperationId, LokiOperationOrder, LokiVisualQuery, LokiVisualQueryOperationCategory } from './types';
 
-export function createRangeOperation(name: string, isRangeOperationWithGrouping?: boolean): QueryBuilderOperationDef {
+export function createRangeOperation(
+  name: string,
+  isRangeOperationWithGrouping?: boolean
+): QueryBuilderOperationDefinition {
   const params = [getRangeVectorParamDef()];
   const defaultParams = ['$__auto'];
   let paramChangedHandler = undefined;
@@ -41,7 +45,7 @@ export function createRangeOperation(name: string, isRangeOperationWithGrouping?
 
   return {
     id: name,
-    name: getPromAndLokiOperationDisplayName(name),
+    name: getLokiOperationDisplayName(name),
     params: params,
     defaultParams,
     alternativesKey: 'range function',
@@ -62,15 +66,15 @@ export function createRangeOperation(name: string, isRangeOperationWithGrouping?
   };
 }
 
-export function createRangeOperationWithGrouping(name: string): QueryBuilderOperationDef[] {
+export function createRangeOperationWithGrouping(name: string): QueryBuilderOperationDefinition[] {
   const rangeOperation = createRangeOperation(name, true);
   // Copy range operation params without the last param
   const params = rangeOperation.params.slice(0, -1);
-  const operations: QueryBuilderOperationDef[] = [
+  const operations: QueryBuilderOperationDefinition[] = [
     rangeOperation,
     {
       id: `__${name}_by`,
-      name: `${getPromAndLokiOperationDisplayName(name)} by`,
+      name: `${getLokiOperationDisplayName(name)} by`,
       params: [
         ...params,
         {
@@ -92,7 +96,7 @@ export function createRangeOperationWithGrouping(name: string): QueryBuilderOper
     },
     {
       id: `__${name}_without`,
-      name: `${getPromAndLokiOperationDisplayName(name)} without`,
+      name: `${getLokiOperationDisplayName(name)} without`,
       params: [
         ...params,
         {
@@ -118,7 +122,11 @@ export function createRangeOperationWithGrouping(name: string): QueryBuilderOper
 }
 
 export function getRangeAggregationWithGroupingRenderer(aggregation: string, grouping: 'by' | 'without') {
-  return function aggregationRenderer(model: QueryBuilderOperation, def: QueryBuilderOperationDef, innerExpr: string) {
+  return function aggregationRenderer(
+    model: QueryBuilderOperation,
+    def: QueryBuilderOperationDefinition,
+    innerExpr: string
+  ) {
     const restParamIndex = def.params.findIndex((param) => param.restParam);
     const params = model.params.slice(0, restParamIndex);
     const restParams = model.params.slice(restParamIndex);
@@ -133,7 +141,7 @@ export function getRangeAggregationWithGroupingRenderer(aggregation: string, gro
 
 function operationWithRangeVectorRenderer(
   model: QueryBuilderOperation,
-  def: QueryBuilderOperationDef,
+  def: QueryBuilderOperationDefinition,
   innerExpr: string
 ) {
   const params = model.params ?? [];
@@ -147,7 +155,11 @@ function operationWithRangeVectorRenderer(
   return `${model.id}(${innerExpr} [${params[0] ?? '$__auto'}])`;
 }
 
-export function labelFilterRenderer(model: QueryBuilderOperation, def: QueryBuilderOperationDef, innerExpr: string) {
+export function labelFilterRenderer(
+  model: QueryBuilderOperation,
+  def: QueryBuilderOperationDefinition,
+  innerExpr: string
+) {
   const integerOperators = ['<', '<=', '>', '>='];
 
   if (integerOperators.includes(String(model.params[1]))) {
@@ -161,6 +173,9 @@ export function isConflictingFilter(
   operation: QueryBuilderOperation,
   queryOperations: QueryBuilderOperation[]
 ): boolean {
+  if (!operation) {
+    return false;
+  }
   const operationIsNegative = operation.params[1].toString().startsWith('!');
 
   const candidates = queryOperations.filter(
@@ -183,29 +198,39 @@ export function isConflictingFilter(
   return conflict;
 }
 
-export function pipelineRenderer(model: QueryBuilderOperation, def: QueryBuilderOperationDef, innerExpr: string) {
+export function pipelineRenderer(
+  model: QueryBuilderOperation,
+  def: QueryBuilderOperationDefinition,
+  innerExpr: string
+) {
   switch (model.id) {
     case LokiOperationId.Logfmt:
       const [strict = false, keepEmpty = false, ...labels] = model.params;
-      return `${innerExpr} | logfmt${strict ? ' --strict' : ''}${keepEmpty ? ' --keep-empty' : ''} ${labels.join(
-        ', '
-      )}`.trim();
+      return `${innerExpr} | logfmt${strict ? ' --strict' : ''}${keepEmpty ? ' --keep-empty' : ''} ${labels
+        .filter((label) => label)
+        .join(', ')}`.trim();
+    case LokiOperationId.Json:
+      return `${innerExpr} | json ${model.params.filter((param) => param).join(', ')}`.trim();
+    case LokiOperationId.Drop:
+      return `${innerExpr} | drop ${model.params.filter((param) => param).join(', ')}`.trim();
+    case LokiOperationId.Keep:
+      return `${innerExpr} | keep ${model.params.filter((param) => param).join(', ')}`.trim();
     default:
       return `${innerExpr} | ${model.id}`;
   }
 }
 
-function isRangeVectorFunction(def: QueryBuilderOperationDef) {
+function isRangeVectorFunction(def: QueryBuilderOperationDefinition) {
   return def.category === LokiVisualQueryOperationCategory.RangeFunctions;
 }
 
 function getIndexOfOrLast(
   operations: QueryBuilderOperation[],
   queryModeller: VisualQueryModeller,
-  condition: (def: QueryBuilderOperationDef) => boolean
+  condition: (def: QueryBuilderOperationDefinition) => boolean
 ) {
   const index = operations.findIndex((x) => {
-    const opDef = queryModeller.getOperationDef(x.id);
+    const opDef = queryModeller.getOperationDefinition(x.id);
     if (!opDef) {
       return false;
     }
@@ -216,7 +241,7 @@ function getIndexOfOrLast(
 }
 
 export function addLokiOperation(
-  def: QueryBuilderOperationDef,
+  def: QueryBuilderOperationDefinition,
   query: LokiVisualQuery,
   modeller: VisualQueryModeller
 ): LokiVisualQuery {
@@ -228,7 +253,7 @@ export function addLokiOperation(
   const operations = [...query.operations];
 
   const existingRangeVectorFunction = operations.find((x) => {
-    const opDef = modeller.getOperationDef(x.id);
+    const opDef = modeller.getOperationDefinition(x.id);
     if (!opDef) {
       return false;
     }
@@ -274,7 +299,7 @@ export function addLokiOperation(
   };
 }
 
-export function addNestedQueryHandler(def: QueryBuilderOperationDef, query: LokiVisualQuery): LokiVisualQuery {
+export function addNestedQueryHandler(def: QueryBuilderOperationDefinition, query: LokiVisualQuery): LokiVisualQuery {
   return {
     ...query,
     binaryQueries: [
@@ -288,14 +313,27 @@ export function addNestedQueryHandler(def: QueryBuilderOperationDef, query: Loki
 }
 
 export function getLineFilterRenderer(operation: string, caseInsensitive?: boolean) {
-  return function lineFilterRenderer(model: QueryBuilderOperation, def: QueryBuilderOperationDef, innerExpr: string) {
+  return function lineFilterRenderer(
+    model: QueryBuilderOperation,
+    def: QueryBuilderOperationDefinition,
+    innerExpr: string
+  ) {
+    const hasBackticks = model.params.some((param) => typeof param === 'string' && param.includes('`'));
+    const delimiter = hasBackticks ? '"' : '`';
+    let params;
+    if (hasBackticks) {
+      params = model.params.map((param) =>
+        typeof param === 'string' ? escapeLabelValueInExactSelector(param) : param
+      );
+    } else {
+      params = model.params;
+    }
     if (caseInsensitive) {
-      return `${innerExpr} ${operation} \`(?i)${model.params[0]}\``;
+      return `${innerExpr} ${operation} ${delimiter}(?i)${params.join(`${delimiter} or ${delimiter}(?i)`)}${delimiter}`;
     }
-    return `${innerExpr} ${operation} \`${model.params[0]}\``;
+    return `${innerExpr} ${operation} ${delimiter}${params.join(`${delimiter} or ${delimiter}`)}${delimiter}`;
   };
 }
-
 function getRangeVectorParamDef(): QueryBuilderOperationParamDef {
   return {
     name: 'Range',
@@ -303,3 +341,228 @@ function getRangeVectorParamDef(): QueryBuilderOperationParamDef {
     options: ['$__auto', '1m', '5m', '10m', '1h', '24h'],
   };
 }
+
+export function getOperationParamId(operationId: string, paramIndex: number) {
+  return `operations.${operationId}.param.${paramIndex}`;
+}
+
+export function getOnLabelAddedHandler(changeToOperationId: string) {
+  return function onParamChanged(index: number, op: QueryBuilderOperation, def: QueryBuilderOperationDefinition) {
+    // Check if we actually have the label param. As it's optional the aggregation can have one less, which is the
+    // case of just simple aggregation without label. When user adds the label it now has the same number of params
+    // as its definition, and now we can change it to its `_by` variant.
+    if (op.params.length === def.params.length) {
+      return {
+        ...op,
+        id: changeToOperationId,
+      };
+    }
+    return op;
+  };
+}
+
+/**
+ * Very simple poc implementation, needs to be modified to support all aggregation operators
+ */
+export function getAggregationExplainer(aggregationName: string, mode: 'by' | 'without' | '') {
+  return function aggregationExplainer(model: QueryBuilderOperation) {
+    const labels = model.params.map((label) => `\`${label}\``).join(' and ');
+    const labelWord = pluralize('label', model.params.length);
+
+    switch (mode) {
+      case 'by':
+        return `Calculates ${aggregationName} over dimensions while preserving ${labelWord} ${labels}.`;
+      case 'without':
+        return `Calculates ${aggregationName} over the dimensions ${labels}. All other labels are preserved.`;
+      default:
+        return `Calculates ${aggregationName} over the dimensions.`;
+    }
+  };
+}
+
+/**
+ * This function will transform operations without labels to their plan aggregation operation
+ */
+export function getLastLabelRemovedHandler(changeToOperationId: string) {
+  return function onParamChanged(index: number, op: QueryBuilderOperation, def: QueryBuilderOperationDefinition) {
+    // If definition has more params then is defined there are no optional rest params anymore.
+    // We then transform this operation into a different one
+    if (op.params.length < def.params.length) {
+      return {
+        ...op,
+        id: changeToOperationId,
+      };
+    }
+
+    return op;
+  };
+}
+
+export function getLokiOperationDisplayName(funcName: string) {
+  return capitalize(funcName.replace(/_/g, ' '));
+}
+
+export function defaultAddOperationHandler<T extends VisualQuery>(def: QueryBuilderOperationDefinition, query: T) {
+  const newOperation: QueryBuilderOperation = {
+    id: def.id,
+    params: def.defaultParams,
+  };
+
+  return {
+    ...query,
+    operations: [...query.operations, newOperation],
+  };
+}
+
+export function createAggregationOperation(
+  name: string,
+  overrides: Partial<QueryBuilderOperationDefinition> = {}
+): QueryBuilderOperationDefinition[] {
+  const operations: QueryBuilderOperationDefinition[] = [
+    {
+      id: name,
+      name: getLokiOperationDisplayName(name),
+      params: [
+        {
+          name: 'By label',
+          type: 'string',
+          restParam: true,
+          optional: true,
+        },
+      ],
+      defaultParams: [],
+      alternativesKey: 'plain aggregations',
+      category: LokiVisualQueryOperationCategory.Aggregations,
+      renderer: functionRendererLeft,
+      paramChangedHandler: getOnLabelAddedHandler(`__${name}_by`),
+      explainHandler: getAggregationExplainer(name, ''),
+      addOperationHandler: defaultAddOperationHandler,
+      ...overrides,
+    },
+    {
+      id: `__${name}_by`,
+      name: `${getLokiOperationDisplayName(name)} by`,
+      params: [
+        {
+          name: 'Label',
+          type: 'string',
+          restParam: true,
+          optional: true,
+          editor: LabelParamEditor,
+        },
+      ],
+      defaultParams: [''],
+      alternativesKey: 'aggregations by',
+      category: LokiVisualQueryOperationCategory.Aggregations,
+      renderer: getAggregationByRenderer(name),
+      paramChangedHandler: getLastLabelRemovedHandler(name),
+      explainHandler: getAggregationExplainer(name, 'by'),
+      addOperationHandler: defaultAddOperationHandler,
+      hideFromList: true,
+      ...overrides,
+    },
+    {
+      id: `__${name}_without`,
+      name: `${getLokiOperationDisplayName(name)} without`,
+      params: [
+        {
+          name: 'Label',
+          type: 'string',
+          restParam: true,
+          optional: true,
+          editor: LabelParamEditor,
+        },
+      ],
+      defaultParams: [''],
+      alternativesKey: 'aggregations by',
+      category: LokiVisualQueryOperationCategory.Aggregations,
+      renderer: getAggregationWithoutRenderer(name),
+      paramChangedHandler: getLastLabelRemovedHandler(name),
+      explainHandler: getAggregationExplainer(name, 'without'),
+      addOperationHandler: defaultAddOperationHandler,
+      hideFromList: true,
+      ...overrides,
+    },
+  ];
+
+  return operations;
+}
+
+function getAggregationWithoutRenderer(aggregation: string) {
+  return function aggregationRenderer(
+    model: QueryBuilderOperation,
+    def: QueryBuilderOperationDefinition,
+    innerExpr: string
+  ) {
+    return `${aggregation} without(${model.params.join(', ')}) (${innerExpr})`;
+  };
+}
+
+export function functionRendererLeft(
+  model: QueryBuilderOperation,
+  def: QueryBuilderOperationDefinition,
+  innerExpr: string
+) {
+  const params = renderParams(model, def, innerExpr);
+  const str = model.id + '(';
+
+  if (innerExpr) {
+    params.push(innerExpr);
+  }
+
+  return str + params.join(', ') + ')';
+}
+
+function renderParams(model: QueryBuilderOperation, def: QueryBuilderOperationDefinition, innerExpr: string) {
+  return (model.params ?? []).map((value, index) => {
+    const paramDef = def.params[index];
+    if (paramDef.type === 'string') {
+      return '"' + value + '"';
+    }
+
+    return value;
+  });
+}
+
+function getAggregationByRenderer(aggregation: string) {
+  return function aggregationRenderer(
+    model: QueryBuilderOperation,
+    def: QueryBuilderOperationDefinition,
+    innerExpr: string
+  ) {
+    return `${aggregation} by(${model.params.join(', ')}) (${innerExpr})`;
+  };
+}
+
+export function createAggregationOperationWithParam(
+  name: string,
+  paramsDef: { params: QueryBuilderOperationParamDef[]; defaultParams: QueryBuilderOperationParamValue[] },
+  overrides: Partial<QueryBuilderOperationDefinition> = {}
+): QueryBuilderOperationDefinition[] {
+  const operations = createAggregationOperation(name, overrides);
+  operations[0].params.unshift(...paramsDef.params);
+  operations[1].params.unshift(...paramsDef.params);
+  operations[2].params.unshift(...paramsDef.params);
+  operations[0].defaultParams = paramsDef.defaultParams;
+  operations[1].defaultParams = [...paramsDef.defaultParams, ''];
+  operations[2].defaultParams = [...paramsDef.defaultParams, ''];
+  operations[1].renderer = getAggregationByRendererWithParameter(name);
+  operations[2].renderer = getAggregationByRendererWithParameter(name);
+  return operations;
+}
+
+function getAggregationByRendererWithParameter(aggregation: string) {
+  return function aggregationRenderer(
+    model: QueryBuilderOperation,
+    def: QueryBuilderOperationDefinition,
+    innerExpr: string
+  ) {
+    const restParamIndex = def.params.findIndex((param) => param.restParam);
+    const params = model.params.slice(0, restParamIndex);
+    const restParams = model.params.slice(restParamIndex);
+
+    return `${aggregation} by(${restParams.join(', ')}) (${params
+      .map((param, idx) => (def.params[idx].type === 'string' ? `\"${param}\"` : param))
+      .join(', ')}, ${innerExpr})`;
+  };
+}
diff --git a/public/app/plugins/datasource/loki/querybuilder/operations.test.ts b/public/app/plugins/datasource/loki/querybuilder/operations.test.ts
index ccd1ee1254e63..7d0a66741b2d7 100644
--- a/public/app/plugins/datasource/loki/querybuilder/operations.test.ts
+++ b/public/app/plugins/datasource/loki/querybuilder/operations.test.ts
@@ -1,4 +1,4 @@
-import { explainOperator, getOperationDefinitions } from './operations';
+import { explainOperator, operationDefinitions } from './operations';
 import { LokiOperationId } from './types';
 
 const undocumentedOperationsIds: string[] = [
@@ -21,8 +21,7 @@ describe('explainOperator', () => {
   let operations = [];
   let undocumentedOperations = [];
 
-  const definitions = getOperationDefinitions();
-  for (const definition of definitions) {
+  for (const definition of operationDefinitions) {
     if (!undocumentedOperationsIds.includes(definition.id)) {
       operations.push(definition.id);
     } else {
@@ -31,7 +30,7 @@ describe('explainOperator', () => {
   }
 
   test('Resolves operation definitions', () => {
-    expect(definitions.length).toBeGreaterThan(0);
+    expect(operationDefinitions.length).toBeGreaterThan(0);
   });
 
   test.each(operations)('Returns docs for the %s operation', (operation) => {
diff --git a/public/app/plugins/datasource/loki/querybuilder/operations.ts b/public/app/plugins/datasource/loki/querybuilder/operations.ts
index e047d6318a573..1ecdec52d9e2f 100644
--- a/public/app/plugins/datasource/loki/querybuilder/operations.ts
+++ b/public/app/plugins/datasource/loki/querybuilder/operations.ts
@@ -1,14 +1,12 @@
-import {
-  createAggregationOperation,
-  createAggregationOperationWithParam,
-} from '../../prometheus/querybuilder/shared/operationUtils';
-import { QueryBuilderOperationDef, QueryBuilderOperationParamValue } from '../../prometheus/querybuilder/shared/types';
+import { QueryBuilderOperationDefinition, QueryBuilderOperationParamValue } from '@grafana/experimental';
 
 import { binaryScalarOperations } from './binaryScalarOperations';
 import { UnwrapParamEditor } from './components/UnwrapParamEditor';
 import {
   addLokiOperation,
   addNestedQueryHandler,
+  createAggregationOperation,
+  createAggregationOperationWithParam,
   createRangeOperation,
   createRangeOperationWithGrouping,
   getLineFilterRenderer,
@@ -17,7 +15,7 @@ import {
 } from './operationUtils';
 import { LokiOperationId, LokiOperationOrder, lokiOperators, LokiVisualQueryOperationCategory } from './types';
 
-export function getOperationDefinitions(): QueryBuilderOperationDef[] {
+function getOperationDefinitions(): QueryBuilderOperationDefinition[] {
   const aggregations = [
     LokiOperationId.Sum,
     LokiOperationId.Min,
@@ -68,7 +66,7 @@ export function getOperationDefinitions(): QueryBuilderOperationDef[] {
     ...createRangeOperationWithGrouping(LokiOperationId.QuantileOverTime),
   ];
 
-  const list: QueryBuilderOperationDef[] = [
+  const list: QueryBuilderOperationDefinition[] = [
     ...aggregations,
     ...aggregationsWithParam,
     ...rangeOperations,
@@ -92,7 +90,7 @@ export function getOperationDefinitions(): QueryBuilderOperationDef[] {
       alternativesKey: 'format',
       category: LokiVisualQueryOperationCategory.Formats,
       orderRank: LokiOperationOrder.Parsers,
-      renderer: (model, def, innerExpr) => `${innerExpr} | json ${model.params.join(', ')}`.trim(),
+      renderer: pipelineRenderer,
       addOperationHandler: addLokiOperation,
       explainHandler: () =>
         `This will extract keys and values from a [json](https://grafana.com/docs/loki/latest/logql/log_queries/#json) formatted log line as labels. The extracted labels can be used in label filter expressions and used as values for a range aggregation via the unwrap operation.`,
@@ -246,9 +244,10 @@ Example: \`\`error_level=\`level\` \`\`
       name: 'Line contains',
       params: [
         {
-          name: 'String',
+          name: '',
           type: 'string',
           hideName: true,
+          restParam: true,
           placeholder: 'Text to find',
           description: 'Find log lines that contains this text',
           minWidth: 20,
@@ -261,16 +260,17 @@ Example: \`\`error_level=\`level\` \`\`
       orderRank: LokiOperationOrder.LineFilters,
       renderer: getLineFilterRenderer('|='),
       addOperationHandler: addLokiOperation,
-      explainHandler: (op) => `Return log lines that contain string \`${op.params[0]}\`.`,
+      explainHandler: (op) => `Return log lines that contain string \`${op.params?.join('`, or `')}\`.`,
     },
     {
       id: LokiOperationId.LineContainsNot,
       name: 'Line does not contain',
       params: [
         {
-          name: 'String',
+          name: '',
           type: 'string',
           hideName: true,
+          restParam: true,
           placeholder: 'Text to exclude',
           description: 'Find log lines that does not contain this text',
           minWidth: 26,
@@ -283,16 +283,17 @@ Example: \`\`error_level=\`level\` \`\`
       orderRank: LokiOperationOrder.LineFilters,
       renderer: getLineFilterRenderer('!='),
       addOperationHandler: addLokiOperation,
-      explainHandler: (op) => `Return log lines that does not contain string \`${op.params[0]}\`.`,
+      explainHandler: (op) => `Return log lines that does not contain string \`${op.params?.join('`, or `')}\`.`,
     },
     {
       id: LokiOperationId.LineContainsCaseInsensitive,
       name: 'Line contains case insensitive',
       params: [
         {
-          name: 'String',
+          name: '',
           type: 'string',
           hideName: true,
+          restParam: true,
           placeholder: 'Text to find',
           description: 'Find log lines that contains this text',
           minWidth: 33,
@@ -305,16 +306,17 @@ Example: \`\`error_level=\`level\` \`\`
       orderRank: LokiOperationOrder.LineFilters,
       renderer: getLineFilterRenderer('|~', true),
       addOperationHandler: addLokiOperation,
-      explainHandler: (op) => `Return log lines that match regex \`(?i)${op.params[0]}\`.`,
+      explainHandler: (op) => `Return log lines that match regex \`(?i)${op.params?.join('`, or `(?i)')}\`.`,
     },
     {
       id: LokiOperationId.LineContainsNotCaseInsensitive,
       name: 'Line does not contain case insensitive',
       params: [
         {
-          name: 'String',
+          name: '',
           type: 'string',
           hideName: true,
+          restParam: true,
           placeholder: 'Text to exclude',
           description: 'Find log lines that does not contain this text',
           minWidth: 40,
@@ -327,16 +329,17 @@ Example: \`\`error_level=\`level\` \`\`
       orderRank: LokiOperationOrder.LineFilters,
       renderer: getLineFilterRenderer('!~', true),
       addOperationHandler: addLokiOperation,
-      explainHandler: (op) => `Return log lines that does not match regex \`(?i)${op.params[0]}\`.`,
+      explainHandler: (op) => `Return log lines that does not match regex \`(?i)${op.params?.join('`, or `(?i)')}\`.`,
     },
     {
       id: LokiOperationId.LineMatchesRegex,
       name: 'Line contains regex match',
       params: [
         {
-          name: 'Regex',
+          name: '',
           type: 'string',
           hideName: true,
+          restParam: true,
           placeholder: 'Pattern to match',
           description: 'Find log lines that match this regex pattern',
           minWidth: 30,
@@ -349,16 +352,17 @@ Example: \`\`error_level=\`level\` \`\`
       orderRank: LokiOperationOrder.LineFilters,
       renderer: getLineFilterRenderer('|~'),
       addOperationHandler: addLokiOperation,
-      explainHandler: (op) => `Return log lines that match a \`RE2\` regex pattern. \`${op.params[0]}\`.`,
+      explainHandler: (op) => `Return log lines that match a \`RE2\` regex pattern. \`${op.params?.join('`, or `')}\`.`,
     },
     {
       id: LokiOperationId.LineMatchesRegexNot,
       name: 'Line does not match regex',
       params: [
         {
-          name: 'Regex',
+          name: '',
           type: 'string',
           hideName: true,
+          restParam: true,
           placeholder: 'Pattern to exclude',
           description: 'Find log lines that does not match this regex pattern',
           minWidth: 30,
@@ -371,7 +375,8 @@ Example: \`\`error_level=\`level\` \`\`
       orderRank: LokiOperationOrder.LineFilters,
       renderer: getLineFilterRenderer('!~'),
       addOperationHandler: addLokiOperation,
-      explainHandler: (op) => `Return log lines that doesn't match a \`RE2\` regex pattern. \`${op.params[0]}\`.`,
+      explainHandler: (op) =>
+        `Return log lines that doesn't match a \`RE2\` regex pattern. \`${op.params?.join('`, or `')}\`.`,
     },
     {
       id: LokiOperationId.LineFilterIpMatches,
@@ -531,7 +536,7 @@ Example: \`\`error_level=\`level\` \`\`
       alternativesKey: 'format',
       category: LokiVisualQueryOperationCategory.Formats,
       orderRank: LokiOperationOrder.PipeOperations,
-      renderer: (op, def, innerExpr) => `${innerExpr} | drop ${op.params.join(',')}`,
+      renderer: pipelineRenderer,
       addOperationHandler: addLokiOperation,
       explainHandler: () => 'The drop expression will drop the given labels in the pipeline.',
     },
@@ -555,7 +560,7 @@ Example: \`\`error_level=\`level\` \`\`
       alternativesKey: 'format',
       category: LokiVisualQueryOperationCategory.Formats,
       orderRank: LokiOperationOrder.PipeOperations,
-      renderer: (op, def, innerExpr) => `${innerExpr} | keep ${op.params.join(',')}`,
+      renderer: pipelineRenderer,
       addOperationHandler: addLokiOperation,
       explainHandler: () =>
         'The keep expression will keep only the specified labels in the pipeline and drop all the other labels.',
@@ -576,14 +581,14 @@ Example: \`\`error_level=\`level\` \`\`
 }
 
 // Keeping a local copy as an optimization measure.
-const definitions = getOperationDefinitions();
+export const operationDefinitions = getOperationDefinitions();
 
 /**
  * Given an operator, return the corresponding explain.
  * For usage within the Query Editor.
  */
 export function explainOperator(id: LokiOperationId | string): string {
-  const definition = definitions.find((operation) => operation.id === id);
+  const definition = operationDefinitions.find((operation) => operation.id === id);
 
   const explain = definition?.explainHandler?.({ id: '', params: ['<value>'] }) || '';
 
@@ -591,11 +596,14 @@ export function explainOperator(id: LokiOperationId | string): string {
   return explain.replace(/\[(.*)\]\(.*\)/g, '$1');
 }
 
-export function getDefinitionById(id: string): QueryBuilderOperationDef | undefined {
-  return definitions.find((x) => x.id === id);
+export function getDefinitionById(id: string): QueryBuilderOperationDefinition | undefined {
+  return operationDefinitions.find((x) => x.id === id);
 }
 
-export function checkParamsAreValid(def: QueryBuilderOperationDef, params: QueryBuilderOperationParamValue[]): boolean {
+export function checkParamsAreValid(
+  def: QueryBuilderOperationDefinition,
+  params: QueryBuilderOperationParamValue[]
+): boolean {
   // For now we only check if the operation has all the required params.
   if (params.length < def.params.filter((param) => !param.optional).length) {
     return false;
diff --git a/public/app/plugins/datasource/loki/querybuilder/parsing.test.ts b/public/app/plugins/datasource/loki/querybuilder/parsing.test.ts
index 27801581f0563..dd4fe45a5524e 100644
--- a/public/app/plugins/datasource/loki/querybuilder/parsing.test.ts
+++ b/public/app/plugins/datasource/loki/querybuilder/parsing.test.ts
@@ -171,6 +171,26 @@ describe('buildVisualQueryFromString', () => {
     );
   });
 
+  it.each([
+    ['|=', LokiOperationId.LineContains],
+    ['!=', LokiOperationId.LineContainsNot],
+    ['|~', LokiOperationId.LineMatchesRegex],
+    ['!~', LokiOperationId.LineMatchesRegexNot],
+  ])('parses query with line filter and `or` statements', (op: string, id: LokiOperationId) => {
+    expect(buildVisualQueryFromString(`{app="frontend"} ${op} "line" or "text"`)).toEqual(
+      noErrors({
+        labels: [
+          {
+            op: '=',
+            value: 'frontend',
+            label: 'app',
+          },
+        ],
+        operations: [{ id, params: ['line', 'text'] }],
+      })
+    );
+  });
+
   it('parses query with line filters and escaped characters', () => {
     expect(buildVisualQueryFromString('{app="frontend"} |= "\\\\line"')).toEqual(
       noErrors({
@@ -653,6 +673,21 @@ describe('buildVisualQueryFromString', () => {
     );
   });
 
+  it('parses quantile queries with grouping', () => {
+    expect(buildVisualQueryFromString(`quantile_over_time(0.99, {app="frontend"} [1m]) by (host1, host2)`)).toEqual(
+      noErrors({
+        labels: [
+          {
+            op: '=',
+            value: 'frontend',
+            label: 'app',
+          },
+        ],
+        operations: [{ id: LokiOperationId.QuantileOverTime, params: ['1m', '0.99', 'host1', 'host2'] }],
+      })
+    );
+  });
+
   it('parses query with line format', () => {
     expect(buildVisualQueryFromString('{app="frontend"} | line_format "abc"')).toEqual(
       noErrors({
diff --git a/public/app/plugins/datasource/loki/querybuilder/parsing.ts b/public/app/plugins/datasource/loki/querybuilder/parsing.ts
index dc17bae32a242..ea2f0003e8492 100644
--- a/public/app/plugins/datasource/loki/querybuilder/parsing.ts
+++ b/public/app/plugins/datasource/loki/querybuilder/parsing.ts
@@ -1,5 +1,6 @@
 import { SyntaxNode } from '@lezer/common';
 
+import { QueryBuilderLabelFilter, QueryBuilderOperation, QueryBuilderOperationParamValue } from '@grafana/experimental';
 import {
   And,
   BinOpExpr,
@@ -51,8 +52,11 @@ import {
   Without,
   BinOpModifier,
   OnOrIgnoringModifier,
+  OrFilter,
 } from '@grafana/lezer-logql';
 
+import { binaryScalarDefs } from './binaryScalarOperations';
+import { checkParamsAreValid, getDefinitionById } from './operations';
 import {
   ErrorId,
   getAllByType,
@@ -61,15 +65,7 @@ import {
   makeBinOp,
   makeError,
   replaceVariables,
-} from '../../prometheus/querybuilder/shared/parsingUtils';
-import {
-  QueryBuilderLabelFilter,
-  QueryBuilderOperation,
-  QueryBuilderOperationParamValue,
-} from '../../prometheus/querybuilder/shared/types';
-
-import { binaryScalarDefs } from './binaryScalarOperations';
-import { checkParamsAreValid, getDefinitionById } from './operations';
+} from './parsingUtils';
 import { LokiOperationId, LokiVisualQuery, LokiVisualQueryBinary } from './types';
 
 interface Context {
@@ -275,7 +271,6 @@ function getLineFilter(expr: string, node: SyntaxNode): GetOperationResult {
   const filter = getString(expr, node.getChild(Filter));
   const filterExpr = handleQuotes(getString(expr, node.getChild(String)));
   const ipLineFilter = node.getChild(FilterOp)?.getChild(Ip);
-
   if (ipLineFilter) {
     return {
       operation: {
@@ -284,6 +279,14 @@ function getLineFilter(expr: string, node: SyntaxNode): GetOperationResult {
       },
     };
   }
+
+  const params = [filterExpr];
+  let orFilter = node.getChild(OrFilter);
+  while (orFilter) {
+    params.push(handleQuotes(getString(expr, orFilter.getChild(String))));
+    orFilter = orFilter.getChild(OrFilter);
+  }
+
   const mapFilter: Record<string, LokiOperationId> = {
     '|=': LokiOperationId.LineContains,
     '!=': LokiOperationId.LineContainsNot,
@@ -294,7 +297,7 @@ function getLineFilter(expr: string, node: SyntaxNode): GetOperationResult {
   return {
     operation: {
       id: mapFilter[filter],
-      params: [filterExpr],
+      params,
     },
   };
 }
@@ -493,11 +496,16 @@ function handleRangeAggregation(expr: string, node: SyntaxNode, context: Context
   const params = number !== null && number !== undefined ? [getString(expr, number)] : [];
   const range = logExpr?.getChild(Range);
   const rangeValue = range ? getString(expr, range) : null;
+  const grouping = node.getChild(Grouping);
 
   if (rangeValue) {
     params.unshift(rangeValue.substring(1, rangeValue.length - 1));
   }
 
+  if (grouping) {
+    params.push(...getAllByType(expr, grouping, Identifier));
+  }
+
   const op = {
     id: funcName,
     params,
diff --git a/public/app/plugins/datasource/loki/querybuilder/parsingUtils.test.ts b/public/app/plugins/datasource/loki/querybuilder/parsingUtils.test.ts
new file mode 100644
index 0000000000000..df69178940359
--- /dev/null
+++ b/public/app/plugins/datasource/loki/querybuilder/parsingUtils.test.ts
@@ -0,0 +1,42 @@
+import { parser } from '@grafana/lezer-logql';
+
+import { getLeftMostChild, getString, replaceVariables } from './parsingUtils';
+
+describe('getLeftMostChild', () => {
+  it('return left most child', () => {
+    const tree = parser.parse('count_over_time({bar="baz"}[5m])');
+    const child = getLeftMostChild(tree.topNode);
+    expect(child).toBeDefined();
+    expect(child!.name).toBe('CountOverTime');
+  });
+});
+
+describe('replaceVariables', () => {
+  it('should replace variables', () => {
+    expect(replaceVariables('rate([{bar="${app}", baz="[[label_var]]"}[$__auto])')).toBe(
+      'rate([{bar="__V_2__app__V__", baz="__V_1__label_var__V__"}[__V_0____auto__V__])'
+    );
+  });
+});
+
+describe('getString', () => {
+  it('should return correct string representation of the node', () => {
+    const expr = 'count_over_time({bar="baz"}[5m])';
+    const tree = parser.parse(expr);
+    const child = getLeftMostChild(tree.topNode);
+    expect(getString(expr, child)).toBe('count_over_time');
+  });
+
+  it('should return string with correct variables', () => {
+    const expr = 'count_over_time({bar="__V_2__app__V__"}[__V_0____auto__V__])';
+    const tree = parser.parse(expr);
+    expect(getString(expr, tree.topNode)).toBe('count_over_time({bar="${app}"}[$__auto])');
+  });
+
+  it('is symmetrical with replaceVariables', () => {
+    const expr = 'count_over_time({bar="${app}", baz="[[label_var]]"}[$__auto])';
+    const replaced = replaceVariables(expr);
+    const tree = parser.parse(replaced);
+    expect(getString(replaced, tree.topNode)).toBe(expr);
+  });
+});
diff --git a/public/app/plugins/datasource/loki/querybuilder/parsingUtils.ts b/public/app/plugins/datasource/loki/querybuilder/parsingUtils.ts
new file mode 100644
index 0000000000000..adc171134353d
--- /dev/null
+++ b/public/app/plugins/datasource/loki/querybuilder/parsingUtils.ts
@@ -0,0 +1,140 @@
+import { SyntaxNode, TreeCursor } from '@lezer/common';
+
+import { QueryBuilderOperation, QueryBuilderOperationParamValue } from '@grafana/experimental';
+
+// Although 0 isn't explicitly provided in the @grafana/lezer-logql library as the error node ID, it does appear to be the ID of error nodes within lezer.
+export const ErrorId = 0;
+
+export function getLeftMostChild(cur: SyntaxNode): SyntaxNode {
+  return cur.firstChild ? getLeftMostChild(cur.firstChild) : cur;
+}
+
+export function makeError(expr: string, node: SyntaxNode) {
+  return {
+    text: getString(expr, node),
+    // TODO: this are positions in the string with the replaced variables. Means it cannot be used to show exact
+    //  placement of the error for the user. We need some translation table to positions before the variable
+    //  replace.
+    from: node.from,
+    to: node.to,
+    parentType: node.parent?.name,
+  };
+}
+
+// Taken from template_srv, but copied so to not mess with the regex.index which is manipulated in the service
+/*
+ * This regex matches 3 types of variable reference with an optional format specifier
+ * \$(\w+)                          $var1
+ * \[\[([\s\S]+?)(?::(\w+))?\]\]    [[var2]] or [[var2:fmt2]]
+ * \${(\w+)(?::(\w+))?}             ${var3} or ${var3:fmt3}
+ */
+export const variableRegex = /\$(\w+)|\[\[([\s\S]+?)(?::(\w+))?\]\]|\${(\w+)(?:\.([^:^\}]+))?(?::([^\}]+))?}/g;
+
+/**
+ * As variables with $ are creating parsing errors, we first replace them with magic string that is parsable and at
+ * the same time we can get the variable and its format back from it.
+ * @param expr
+ */
+export function replaceVariables(expr: string) {
+  return expr.replace(variableRegex, (match, var1, var2, fmt2, var3, fieldPath, fmt3) => {
+    const fmt = fmt2 || fmt3;
+    let variable = var1;
+    let varType = '0';
+
+    if (var2) {
+      variable = var2;
+      varType = '1';
+    }
+
+    if (var3) {
+      variable = var3;
+      varType = '2';
+    }
+
+    return `__V_${varType}__` + variable + '__V__' + (fmt ? '__F__' + fmt + '__F__' : '');
+  });
+}
+
+const varTypeFunc = [
+  (v: string, f?: string) => `\$${v}`,
+  (v: string, f?: string) => `[[${v}${f ? `:${f}` : ''}]]`,
+  (v: string, f?: string) => `\$\{${v}${f ? `:${f}` : ''}\}`,
+];
+
+/**
+ * Get back the text with variables in their original format.
+ * @param expr
+ */
+export function returnVariables(expr: string) {
+  return expr.replace(/__V_(\d)__(.+?)__V__(?:__F__(\w+)__F__)?/g, (match, type, v, f) => {
+    return varTypeFunc[parseInt(type, 10)](v, f);
+  });
+}
+
+/**
+ * Get the actual string of the expression. That is not stored in the tree so we have to get the indexes from the node
+ * and then based on that get it from the expression.
+ * @param expr
+ * @param node
+ */
+export function getString(expr: string, node: SyntaxNode | TreeCursor | null | undefined) {
+  if (!node) {
+    return '';
+  }
+  return returnVariables(expr.substring(node.from, node.to));
+}
+
+/**
+ * Create simple scalar binary op object.
+ * @param opDef - definition of the op to be created
+ * @param expr
+ * @param numberNode - the node for the scalar
+ * @param hasBool - whether operation has a bool modifier. Is used only for ops for which it makes sense.
+ */
+export function makeBinOp(
+  opDef: { id: string; comparison?: boolean },
+  expr: string,
+  numberNode: SyntaxNode,
+  hasBool: boolean
+): QueryBuilderOperation {
+  const params: QueryBuilderOperationParamValue[] = [parseFloat(getString(expr, numberNode))];
+  if (opDef.comparison) {
+    params.push(hasBool);
+  }
+  return {
+    id: opDef.id,
+    params,
+  };
+}
+
+/**
+ * Get all nodes with type in the tree. This traverses the tree so it is safe only when you know there shouldn't be
+ * too much nesting but you just want to skip some of the wrappers. For example getting function args this way would
+ * not be safe is it would also find arguments of nested functions.
+ * @param expr
+ * @param cur
+ * @param type - can be string or number, some data-sources (loki) haven't migrated over to using numeric constants defined in the lezer parsing library (e.g. lezer-promql).
+ * @todo Remove string type definition when all data-sources have migrated to numeric constants
+ */
+export function getAllByType(expr: string, cur: SyntaxNode, type: number | string): string[] {
+  if (cur.type.id === type || cur.name === type) {
+    return [getString(expr, cur)];
+  }
+  const values: string[] = [];
+  let pos = 0;
+  let child = cur.childAfter(pos);
+  while (child) {
+    values.push(...getAllByType(expr, child, type));
+    pos = child.to;
+    child = cur.childAfter(pos);
+  }
+  return values;
+}
+
+/**
+ * There aren't any spaces in the metric names, so let's introduce a wildcard into the regex for each space to better facilitate a fuzzy search
+ */
+export const regexifyLabelValuesQueryString = (query: string) => {
+  const queryArray = query.split(' ');
+  return queryArray.map((query) => `${query}.*`).join('');
+};
diff --git a/public/app/plugins/datasource/loki/querybuilder/state.test.ts b/public/app/plugins/datasource/loki/querybuilder/state.test.ts
index 2c59c4d9598db..8335414f6e636 100644
--- a/public/app/plugins/datasource/loki/querybuilder/state.test.ts
+++ b/public/app/plugins/datasource/loki/querybuilder/state.test.ts
@@ -1,4 +1,4 @@
-import { QueryEditorMode } from '../../prometheus/querybuilder/shared/types';
+import { QueryEditorMode } from '@grafana/experimental';
 
 import { changeEditorMode, getQueryWithDefaults } from './state';
 
diff --git a/public/app/plugins/datasource/loki/querybuilder/state.ts b/public/app/plugins/datasource/loki/querybuilder/state.ts
index 759a6626d9f0d..590aeffdd8a89 100644
--- a/public/app/plugins/datasource/loki/querybuilder/state.ts
+++ b/public/app/plugins/datasource/loki/querybuilder/state.ts
@@ -1,6 +1,5 @@
-import store from 'app/core/store';
+import { QueryEditorMode } from '@grafana/experimental';
 
-import { QueryEditorMode } from '../../prometheus/querybuilder/shared/types';
 import { LokiQuery, LokiQueryType } from '../types';
 
 const queryEditorModeDefaultLocalStorageKey = 'LokiQueryEditorModeDefault';
@@ -8,7 +7,7 @@ const queryEditorModeDefaultLocalStorageKey = 'LokiQueryEditorModeDefault';
 export function changeEditorMode(query: LokiQuery, editorMode: QueryEditorMode, onChange: (query: LokiQuery) => void) {
   // If empty query store new mode as default
   if (query.expr === '') {
-    store.set(queryEditorModeDefaultLocalStorageKey, editorMode);
+    window.localStorage.setItem(queryEditorModeDefaultLocalStorageKey, editorMode);
   }
 
   onChange({ ...query, editorMode });
@@ -20,7 +19,7 @@ export function getDefaultEditorMode(expr: string) {
     return QueryEditorMode.Code;
   }
 
-  const value: string | undefined = store.get(queryEditorModeDefaultLocalStorageKey);
+  const value: string | null = window.localStorage.getItem(queryEditorModeDefaultLocalStorageKey);
   switch (value) {
     case 'code':
       return QueryEditorMode.Code;
diff --git a/public/app/plugins/datasource/loki/querybuilder/types.ts b/public/app/plugins/datasource/loki/querybuilder/types.ts
index fc08ca7a487ba..c6631fcf164d4 100644
--- a/public/app/plugins/datasource/loki/querybuilder/types.ts
+++ b/public/app/plugins/datasource/loki/querybuilder/types.ts
@@ -1,5 +1,9 @@
-import { VisualQueryBinary } from '../../prometheus/querybuilder/shared/LokiAndPromQueryModellerBase';
-import { QueryBuilderLabelFilter, QueryBuilderOperation } from '../../prometheus/querybuilder/shared/types';
+import {
+  VisualQueryBinary,
+  QueryBuilderLabelFilter,
+  QueryBuilderOperation,
+  BINARY_OPERATIONS_KEY,
+} from '@grafana/experimental';
 
 /**
  * Visual query model
@@ -29,7 +33,7 @@ export enum LokiVisualQueryOperationCategory {
   Formats = 'Formats',
   LineFilters = 'Line filters',
   LabelFilters = 'Label filters',
-  BinaryOps = 'Binary operations',
+  BinaryOps = BINARY_OPERATIONS_KEY,
 }
 
 export enum LokiOperationId {
diff --git a/public/app/plugins/datasource/loki/responseUtils.test.ts b/public/app/plugins/datasource/loki/responseUtils.test.ts
index fe033a3085438..f961007968aa7 100644
--- a/public/app/plugins/datasource/loki/responseUtils.test.ts
+++ b/public/app/plugins/datasource/loki/responseUtils.test.ts
@@ -1,8 +1,7 @@
 import { cloneDeep } from 'lodash';
 
-import { DataQueryResponse, QueryResultMetaStat, DataFrame, FieldType } from '@grafana/data';
+import { DataFrame, FieldType } from '@grafana/data';
 
-import { getMockFrames } from './mocks';
 import {
   dataFrameHasLevelLabel,
   dataFrameHasLokiError,
@@ -10,9 +9,8 @@ import {
   extractLogParserFromDataFrame,
   extractLabelKeysFromDataFrame,
   extractUnwrapLabelKeysFromDataFrame,
-  cloneQueryResponse,
-  combineResponses,
 } from './responseUtils';
+import { LabelType } from './types';
 
 const frame: DataFrame = {
   length: 1,
@@ -38,6 +36,64 @@ const frame: DataFrame = {
   ],
 };
 
+const frameWithTypes: DataFrame = {
+  length: 1,
+  fields: [
+    {
+      name: 'Time',
+      config: {},
+      type: FieldType.time,
+      values: [1],
+    },
+    {
+      name: 'labels',
+      config: {},
+      type: FieldType.other,
+      values: [{ level: 'info', structured: 'foo' }],
+    },
+    {
+      name: 'Line',
+      config: {},
+      type: FieldType.string,
+      values: ['line1'],
+    },
+    {
+      name: 'labelTypes',
+      config: {},
+      type: FieldType.other,
+      values: [{ level: 'I', structured: 'S' }],
+    },
+  ],
+};
+
+const frameWithMultipleLabels: DataFrame = {
+  length: 1,
+  fields: [
+    {
+      name: 'Time',
+      config: {},
+      type: FieldType.time,
+      values: [1, 2, 3],
+    },
+    {
+      name: 'labels',
+      config: {},
+      type: FieldType.other,
+      values: [
+        { level: 'info', foo: 'bar' },
+        { level: 'info', foo: 'baz', new: 'yes' },
+        { level: 'error', foo: 'baz' },
+      ],
+    },
+    {
+      name: 'Line',
+      config: {},
+      type: FieldType.string,
+      values: ['line1', 'line2', 'line3'],
+    },
+  ],
+};
+
 describe('dataFrameHasParsingError', () => {
   it('handles frame with parsing error', () => {
     const input = cloneDeep(frame);
@@ -104,10 +160,31 @@ describe('extractLabelKeysFromDataFrame', () => {
     input.fields[1].values = [];
     expect(extractLabelKeysFromDataFrame(input)).toEqual([]);
   });
+
   it('extracts label keys', () => {
     const input = cloneDeep(frame);
     expect(extractLabelKeysFromDataFrame(input)).toEqual(['level']);
   });
+
+  it('extracts label keys from all logs', () => {
+    const input = cloneDeep(frameWithMultipleLabels);
+    expect(extractLabelKeysFromDataFrame(input)).toEqual(['level', 'foo', 'new']);
+  });
+
+  it('extracts indexed label keys', () => {
+    const input = cloneDeep(frameWithTypes);
+    expect(extractLabelKeysFromDataFrame(input)).toEqual(['level']);
+  });
+
+  it('extracts structured metadata label keys', () => {
+    const input = cloneDeep(frameWithTypes);
+    expect(extractLabelKeysFromDataFrame(input, LabelType.StructuredMetadata)).toEqual(['structured']);
+  });
+
+  it('does not extract structured metadata label keys from non-typed frame', () => {
+    const input = cloneDeep(frame);
+    expect(extractLabelKeysFromDataFrame(input, LabelType.StructuredMetadata)).toEqual([]);
+  });
 });
 
 describe('extractUnwrapLabelKeysFromDataFrame', () => {
@@ -122,410 +199,3 @@ describe('extractUnwrapLabelKeysFromDataFrame', () => {
     expect(extractUnwrapLabelKeysFromDataFrame(input)).toEqual(['number']);
   });
 });
-
-describe('cloneQueryResponse', () => {
-  const { logFrameA } = getMockFrames();
-  const responseA: DataQueryResponse = {
-    data: [logFrameA],
-  };
-  it('clones query responses', () => {
-    const clonedA = cloneQueryResponse(responseA);
-    expect(clonedA).not.toBe(responseA);
-    expect(clonedA).toEqual(clonedA);
-  });
-});
-
-describe('combineResponses', () => {
-  it('combines logs frames', () => {
-    const { logFrameA, logFrameB } = getMockFrames();
-    const responseA: DataQueryResponse = {
-      data: [logFrameA],
-    };
-    const responseB: DataQueryResponse = {
-      data: [logFrameB],
-    };
-    expect(combineResponses(responseA, responseB)).toEqual({
-      data: [
-        {
-          fields: [
-            {
-              config: {},
-              name: 'Time',
-              type: 'time',
-              values: [1, 2, 3, 4],
-            },
-            {
-              config: {},
-              name: 'Line',
-              type: 'string',
-              values: ['line3', 'line4', 'line1', 'line2'],
-            },
-            {
-              config: {},
-              name: 'labels',
-              type: 'other',
-              values: [
-                {
-                  otherLabel: 'other value',
-                },
-                {
-                  label: 'value',
-                },
-                {
-                  otherLabel: 'other value',
-                },
-              ],
-            },
-            {
-              config: {},
-              name: 'tsNs',
-              type: 'string',
-              values: ['1000000', '2000000', '3000000', '4000000'],
-            },
-            {
-              config: {},
-              name: 'id',
-              type: 'string',
-              values: ['id3', 'id4', 'id1', 'id2'],
-            },
-          ],
-          length: 4,
-          meta: {
-            custom: {
-              frameType: 'LabeledTimeValues',
-            },
-            stats: [
-              {
-                displayName: 'Summary: total bytes processed',
-                unit: 'decbytes',
-                value: 33,
-              },
-            ],
-          },
-          refId: 'A',
-        },
-      ],
-    });
-  });
-
-  it('combines metric frames', () => {
-    const { metricFrameA, metricFrameB } = getMockFrames();
-    const responseA: DataQueryResponse = {
-      data: [metricFrameA],
-    };
-    const responseB: DataQueryResponse = {
-      data: [metricFrameB],
-    };
-    expect(combineResponses(responseA, responseB)).toEqual({
-      data: [
-        {
-          fields: [
-            {
-              config: {},
-              name: 'Time',
-              type: 'time',
-              values: [1000000, 2000000, 3000000, 4000000],
-            },
-            {
-              config: {},
-              name: 'Value',
-              type: 'number',
-              values: [6, 7, 5, 4],
-              labels: {
-                level: 'debug',
-              },
-            },
-          ],
-          length: 4,
-          meta: {
-            type: 'timeseries-multi',
-            stats: [
-              {
-                displayName: 'Summary: total bytes processed',
-                unit: 'decbytes',
-                value: 33,
-              },
-            ],
-          },
-          refId: 'A',
-        },
-      ],
-    });
-  });
-
-  it('combines and identifies new frames in the response', () => {
-    const { metricFrameA, metricFrameB, metricFrameC } = getMockFrames();
-    const responseA: DataQueryResponse = {
-      data: [metricFrameA],
-    };
-    const responseB: DataQueryResponse = {
-      data: [metricFrameB, metricFrameC],
-    };
-    expect(combineResponses(responseA, responseB)).toEqual({
-      data: [
-        {
-          fields: [
-            {
-              config: {},
-              name: 'Time',
-              type: 'time',
-              values: [1000000, 2000000, 3000000, 4000000],
-            },
-            {
-              config: {},
-              name: 'Value',
-              type: 'number',
-              values: [6, 7, 5, 4],
-              labels: {
-                level: 'debug',
-              },
-            },
-          ],
-          length: 4,
-          meta: {
-            type: 'timeseries-multi',
-            stats: [
-              {
-                displayName: 'Summary: total bytes processed',
-                unit: 'decbytes',
-                value: 33,
-              },
-            ],
-          },
-          refId: 'A',
-        },
-        metricFrameC,
-      ],
-    });
-  });
-
-  it('combines frames prioritizing refIds over names', () => {
-    const { metricFrameA, metricFrameB } = getMockFrames();
-    const dataFrameA = {
-      ...metricFrameA,
-      refId: 'A',
-      name: 'A',
-    };
-    const dataFrameB = {
-      ...metricFrameB,
-      refId: 'B',
-      name: 'A',
-    };
-    const responseA: DataQueryResponse = {
-      data: [dataFrameA],
-    };
-    const responseB: DataQueryResponse = {
-      data: [dataFrameB],
-    };
-    expect(combineResponses(responseA, responseB)).toEqual({
-      data: [dataFrameA, dataFrameB],
-    });
-  });
-
-  it('combines frames in a new response instance', () => {
-    const { metricFrameA, metricFrameB } = getMockFrames();
-    const responseA: DataQueryResponse = {
-      data: [metricFrameA],
-    };
-    const responseB: DataQueryResponse = {
-      data: [metricFrameB],
-    };
-    expect(combineResponses(null, responseA)).not.toBe(responseA);
-    expect(combineResponses(null, responseB)).not.toBe(responseB);
-  });
-
-  it('combine when first param has errors', () => {
-    const { metricFrameA, metricFrameB } = getMockFrames();
-    const errorA = {
-      message: 'errorA',
-    };
-    const responseA: DataQueryResponse = {
-      data: [metricFrameA],
-      error: errorA,
-      errors: [errorA],
-    };
-    const responseB: DataQueryResponse = {
-      data: [metricFrameB],
-    };
-
-    const combined = combineResponses(responseA, responseB);
-    expect(combined.data[0].length).toBe(4);
-    expect(combined.error?.message).toBe('errorA');
-    expect(combined.errors).toHaveLength(1);
-    expect(combined.errors?.[0]?.message).toBe('errorA');
-  });
-
-  it('combine when second param has errors', () => {
-    const { metricFrameA, metricFrameB } = getMockFrames();
-    const responseA: DataQueryResponse = {
-      data: [metricFrameA],
-    };
-    const errorB = {
-      message: 'errorB',
-    };
-    const responseB: DataQueryResponse = {
-      data: [metricFrameB],
-      error: errorB,
-      errors: [errorB],
-    };
-
-    const combined = combineResponses(responseA, responseB);
-    expect(combined.data[0].length).toBe(4);
-    expect(combined.error?.message).toBe('errorB');
-    expect(combined.errors).toHaveLength(1);
-    expect(combined.errors?.[0]?.message).toBe('errorB');
-  });
-
-  it('combine when both params have errors', () => {
-    const { metricFrameA, metricFrameB } = getMockFrames();
-    const errorA = {
-      message: 'errorA',
-    };
-    const errorB = {
-      message: 'errorB',
-    };
-    const responseA: DataQueryResponse = {
-      data: [metricFrameA],
-      error: errorA,
-      errors: [errorA],
-    };
-    const responseB: DataQueryResponse = {
-      data: [metricFrameB],
-      error: errorB,
-      errors: [errorB],
-    };
-
-    const combined = combineResponses(responseA, responseB);
-    expect(combined.data[0].length).toBe(4);
-    expect(combined.error?.message).toBe('errorA');
-    expect(combined.errors).toHaveLength(2);
-    expect(combined.errors?.[0]?.message).toBe('errorA');
-    expect(combined.errors?.[1]?.message).toBe('errorB');
-  });
-
-  it('combines frames with nanoseconds', () => {
-    const { logFrameA, logFrameB } = getMockFrames();
-    logFrameA.fields[0].nanos = [333333, 444444];
-    logFrameB.fields[0].nanos = [111111, 222222];
-    const responseA: DataQueryResponse = {
-      data: [logFrameA],
-    };
-    const responseB: DataQueryResponse = {
-      data: [logFrameB],
-    };
-    expect(combineResponses(responseA, responseB)).toEqual({
-      data: [
-        {
-          fields: [
-            {
-              config: {},
-              name: 'Time',
-              type: 'time',
-              values: [1, 2, 3, 4],
-              nanos: [111111, 222222, 333333, 444444],
-            },
-            {
-              config: {},
-              name: 'Line',
-              type: 'string',
-              values: ['line3', 'line4', 'line1', 'line2'],
-            },
-            {
-              config: {},
-              name: 'labels',
-              type: 'other',
-              values: [
-                {
-                  otherLabel: 'other value',
-                },
-                {
-                  label: 'value',
-                },
-                {
-                  otherLabel: 'other value',
-                },
-              ],
-            },
-            {
-              config: {},
-              name: 'tsNs',
-              type: 'string',
-              values: ['1000000', '2000000', '3000000', '4000000'],
-            },
-            {
-              config: {},
-              name: 'id',
-              type: 'string',
-              values: ['id3', 'id4', 'id1', 'id2'],
-            },
-          ],
-          length: 4,
-          meta: {
-            custom: {
-              frameType: 'LabeledTimeValues',
-            },
-            stats: [
-              {
-                displayName: 'Summary: total bytes processed',
-                unit: 'decbytes',
-                value: 33,
-              },
-            ],
-          },
-          refId: 'A',
-        },
-      ],
-    });
-  });
-
-  describe('combine stats', () => {
-    const { metricFrameA } = getMockFrames();
-    const makeResponse = (stats?: QueryResultMetaStat[]): DataQueryResponse => ({
-      data: [
-        {
-          ...metricFrameA,
-          meta: {
-            ...metricFrameA.meta,
-            stats,
-          },
-        },
-      ],
-    });
-    it('two values', () => {
-      const responseA = makeResponse([
-        { displayName: 'Ingester: total reached', value: 1 },
-        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 11 },
-      ]);
-      const responseB = makeResponse([
-        { displayName: 'Ingester: total reached', value: 2 },
-        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 22 },
-      ]);
-
-      expect(combineResponses(responseA, responseB).data[0].meta.stats).toStrictEqual([
-        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 33 },
-      ]);
-    });
-
-    it('one value', () => {
-      const responseA = makeResponse([
-        { displayName: 'Ingester: total reached', value: 1 },
-        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 11 },
-      ]);
-      const responseB = makeResponse();
-
-      expect(combineResponses(responseA, responseB).data[0].meta.stats).toStrictEqual([
-        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 11 },
-      ]);
-
-      expect(combineResponses(responseB, responseA).data[0].meta.stats).toStrictEqual([
-        { displayName: 'Summary: total bytes processed', unit: 'decbytes', value: 11 },
-      ]);
-    });
-
-    it('no value', () => {
-      const responseA = makeResponse();
-      const responseB = makeResponse();
-      expect(combineResponses(responseA, responseB).data[0].meta.stats).toHaveLength(0);
-    });
-  });
-});
diff --git a/public/app/plugins/datasource/loki/responseUtils.ts b/public/app/plugins/datasource/loki/responseUtils.ts
index b2afbe3242930..fd18c8f6c88a5 100644
--- a/public/app/plugins/datasource/loki/responseUtils.ts
+++ b/public/app/plugins/datasource/loki/responseUtils.ts
@@ -1,18 +1,8 @@
-import {
-  DataFrame,
-  DataFrameType,
-  DataQueryResponse,
-  DataQueryResponseData,
-  Field,
-  FieldType,
-  isValidGoDuration,
-  Labels,
-  QueryResultMetaStat,
-  shallowCompare,
-} from '@grafana/data';
+import { DataFrame, FieldType, isValidGoDuration, Labels } from '@grafana/data';
 
-import { isBytesString } from './languageUtils';
+import { isBytesString, processLabels } from './languageUtils';
 import { isLogLineJSON, isLogLineLogfmt, isLogLinePacked } from './lineParser';
+import { LabelType } from './types';
 
 export function dataFrameHasLokiError(frame: DataFrame): boolean {
   const labelSets: Labels[] = frame.fields.find((f) => f.name === 'labels')?.values ?? [];
@@ -54,15 +44,36 @@ export function extractLogParserFromDataFrame(frame: DataFrame): {
   return { hasLogfmt, hasJSON, hasPack };
 }
 
-export function extractLabelKeysFromDataFrame(frame: DataFrame): string[] {
+export function extractLabelKeysFromDataFrame(frame: DataFrame, type: LabelType = LabelType.Indexed): string[] {
   const labelsArray: Array<{ [key: string]: string }> | undefined =
     frame?.fields?.find((field) => field.name === 'labels')?.values ?? [];
+  const labelTypeArray: Array<{ [key: string]: string }> | undefined =
+    frame?.fields?.find((field) => field.name === 'labelTypes')?.values ?? [];
 
   if (!labelsArray?.length) {
     return [];
   }
 
-  return Object.keys(labelsArray[0]);
+  // if there are no label types and type is LabelType.Indexed return all label keys
+  if (!labelTypeArray?.length) {
+    if (type === LabelType.Indexed) {
+      const { keys: labelKeys } = processLabels(labelsArray);
+      return labelKeys;
+    }
+    return [];
+  }
+
+  // If we have label types, we can return only label keys that match type
+  let labelsSet = new Set<string>();
+  for (let i = 0; i < labelsArray.length; i++) {
+    const labels = labelsArray[i];
+    const labelsType = labelTypeArray[i];
+
+    const allLabelKeys = Object.keys(labels).filter((key) => labelsType[key] === type);
+    labelsSet = new Set([...labelsSet, ...allLabelKeys]);
+  }
+
+  return Array.from(labelsSet);
 }
 
 export function extractUnwrapLabelKeysFromDataFrame(frame: DataFrame): string[] {
@@ -118,143 +129,3 @@ export function extractLevelLikeLabelFromDataFrame(frame: DataFrame): string | n
   }
   return levelLikeLabel;
 }
-
-function shouldCombine(frame1: DataFrame, frame2: DataFrame): boolean {
-  if (frame1.refId !== frame2.refId) {
-    return false;
-  }
-
-  const frameType1 = frame1.meta?.type;
-  const frameType2 = frame2.meta?.type;
-
-  if (frameType1 !== frameType2) {
-    // we do not join things that have a different type
-    return false;
-  }
-
-  // metric range query data
-  if (frameType1 === DataFrameType.TimeSeriesMulti) {
-    const field1 = frame1.fields.find((f) => f.type === FieldType.number);
-    const field2 = frame2.fields.find((f) => f.type === FieldType.number);
-    if (field1 === undefined || field2 === undefined) {
-      // should never happen
-      return false;
-    }
-
-    return shallowCompare(field1.labels ?? {}, field2.labels ?? {});
-  }
-
-  // logs query data
-  // logs use a special attribute in the dataframe's "custom" section
-  // because we do not have a good "frametype" value for them yet.
-  const customType1 = frame1.meta?.custom?.frameType;
-  const customType2 = frame2.meta?.custom?.frameType;
-
-  if (customType1 === 'LabeledTimeValues' && customType2 === 'LabeledTimeValues') {
-    return true;
-  }
-
-  // should never reach here
-  return false;
-}
-
-export function combineResponses(currentResult: DataQueryResponse | null, newResult: DataQueryResponse) {
-  if (!currentResult) {
-    return cloneQueryResponse(newResult);
-  }
-
-  newResult.data.forEach((newFrame) => {
-    const currentFrame = currentResult.data.find((frame) => shouldCombine(frame, newFrame));
-    if (!currentFrame) {
-      currentResult.data.push(cloneDataFrame(newFrame));
-      return;
-    }
-    combineFrames(currentFrame, newFrame);
-  });
-
-  const mergedErrors = [...(currentResult.errors ?? []), ...(newResult.errors ?? [])];
-
-  // we make sure to have `.errors` as undefined, instead of empty-array
-  // when no errors.
-
-  if (mergedErrors.length > 0) {
-    currentResult.errors = mergedErrors;
-  }
-
-  // the `.error` attribute is obsolete now,
-  // but we have to maintain it, otherwise
-  // some grafana parts do not behave well.
-  // we just choose the old error, if it exists,
-  // otherwise the new error, if it exists.
-  const mergedError = currentResult.error ?? newResult.error;
-  if (mergedError != null) {
-    currentResult.error = mergedError;
-  }
-
-  const mergedTraceIds = [...(currentResult.traceIds ?? []), ...(newResult.traceIds ?? [])];
-  if (mergedTraceIds.length > 0) {
-    currentResult.traceIds = mergedTraceIds;
-  }
-
-  return currentResult;
-}
-
-function combineFrames(dest: DataFrame, source: DataFrame) {
-  const totalFields = dest.fields.length;
-  for (let i = 0; i < totalFields; i++) {
-    dest.fields[i].values = [].concat.apply(source.fields[i].values, dest.fields[i].values);
-    if (source.fields[i].nanos) {
-      const nanos: number[] = dest.fields[i].nanos?.slice() || [];
-      dest.fields[i].nanos = source.fields[i].nanos?.concat(nanos);
-    }
-  }
-  dest.length += source.length;
-  dest.meta = {
-    ...dest.meta,
-    stats: getCombinedMetadataStats(dest.meta?.stats ?? [], source.meta?.stats ?? []),
-  };
-}
-
-const TOTAL_BYTES_STAT = 'Summary: total bytes processed';
-
-function getCombinedMetadataStats(
-  destStats: QueryResultMetaStat[],
-  sourceStats: QueryResultMetaStat[]
-): QueryResultMetaStat[] {
-  // in the current approach, we only handle a single stat
-  const destStat = destStats.find((s) => s.displayName === TOTAL_BYTES_STAT);
-  const sourceStat = sourceStats.find((s) => s.displayName === TOTAL_BYTES_STAT);
-
-  if (sourceStat != null && destStat != null) {
-    return [{ value: sourceStat.value + destStat.value, displayName: TOTAL_BYTES_STAT, unit: destStat.unit }];
-  }
-
-  // maybe one of them exist
-  const eitherStat = sourceStat ?? destStat;
-  if (eitherStat != null) {
-    return [eitherStat];
-  }
-
-  return [];
-}
-
-/**
- * Deep clones a DataQueryResponse
- */
-export function cloneQueryResponse(response: DataQueryResponse): DataQueryResponse {
-  const newResponse = {
-    ...response,
-    data: response.data.map(cloneDataFrame),
-  };
-  return newResponse;
-}
-
-function cloneDataFrame(frame: DataQueryResponseData): DataQueryResponseData {
-  return {
-    ...frame,
-    fields: frame.fields.map((field: Field) => ({
-      ...field,
-      values: field.values,
-    })),
-  };
-}
diff --git a/public/app/plugins/datasource/loki/sortDataFrame.ts b/public/app/plugins/datasource/loki/sortDataFrame.ts
index 0d05531ed85ba..13f8e036cc903 100644
--- a/public/app/plugins/datasource/loki/sortDataFrame.ts
+++ b/public/app/plugins/datasource/loki/sortDataFrame.ts
@@ -1,4 +1,4 @@
-import { DataFrame, Field, FieldType, SortedVector } from '@grafana/data';
+import { DataFrame, Field, FieldType } from '@grafana/data';
 
 export enum SortDirection {
   Ascending,
@@ -85,10 +85,12 @@ export function sortDataFrameByTime(frame: DataFrame, dir: SortDirection): DataF
     ...rest,
     fields: fields.map((field) => ({
       ...field,
-      values: new SortedVector(field.values, index).toArray(),
-      nanos: field.nanos === undefined ? undefined : new SortedVector(field.nanos, index).toArray(),
+      values: sorted(field.values, index),
+      nanos: field.nanos === undefined ? undefined : sorted(field.nanos, index),
     })),
   };
+}
 
-  return frame;
+function sorted<T>(vals: T[], index: number[]): T[] {
+  return vals.map((_, idx) => vals[index[idx]]);
 }
diff --git a/public/app/plugins/datasource/loki/streaming.test.ts b/public/app/plugins/datasource/loki/streaming.test.ts
new file mode 100644
index 0000000000000..04a87d20856e4
--- /dev/null
+++ b/public/app/plugins/datasource/loki/streaming.test.ts
@@ -0,0 +1,45 @@
+import { convertToWebSocketUrl } from './streaming';
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  config: {
+    appSubUrl: '/grafana',
+  },
+}));
+
+describe('convertToWebSocketUrl', () => {
+  const { location } = window;
+
+  beforeEach(() => {
+    // @ts-ignore
+    delete window.location;
+    window.location = {} as Location;
+  });
+
+  afterEach(() => {
+    window.location = location;
+  });
+  it('should convert HTTP URL to WebSocket URL', () => {
+    window.location.protocol = 'http:';
+    window.location.host = 'example.com';
+
+    const httpUrl = '/api/ds/proxy/1/api/v1/tail/loki?query=a';
+    const expectedWebSocketUrl = 'ws://example.com/grafana/api/ds/proxy/1/api/v1/tail/loki?query=a';
+
+    const result = convertToWebSocketUrl(httpUrl);
+
+    expect(result).toBe(expectedWebSocketUrl);
+  });
+
+  it('should convert HTTPS URL to WebSocket URL', () => {
+    window.location.protocol = 'https:';
+    window.location.host = 'example.com';
+
+    const httpsUrl = '/api/ds/proxy/1/api/v1/tail/loki?query=a';
+    const expectedWebSocketUrl = 'wss://example.com/grafana/api/ds/proxy/1/api/v1/tail/loki?query=a';
+
+    const result = convertToWebSocketUrl(httpsUrl);
+
+    expect(result).toBe(expectedWebSocketUrl);
+  });
+});
diff --git a/public/app/plugins/datasource/loki/streaming.ts b/public/app/plugins/datasource/loki/streaming.ts
index edd2878311877..d1db4c4cf0332 100644
--- a/public/app/plugins/datasource/loki/streaming.ts
+++ b/public/app/plugins/datasource/loki/streaming.ts
@@ -8,7 +8,7 @@ import {
   LoadingState,
   StreamingDataFrame,
 } from '@grafana/data';
-import { getGrafanaLiveSrv } from '@grafana/runtime';
+import { getGrafanaLiveSrv, config } from '@grafana/runtime';
 
 import { LokiDatasource } from './datasource';
 import { LokiQuery } from './types';
@@ -45,7 +45,7 @@ export function doLokiChannelStream(
   let frame: StreamingDataFrame | undefined = undefined;
   const updateFrame = (msg: any) => {
     if (msg?.message) {
-      const p = msg.message as DataFrameJSON;
+      const p: DataFrameJSON = msg.message;
       if (!frame) {
         frame = StreamingDataFrame.fromDataFrameJSON(p, {
           maxLength,
@@ -86,3 +86,12 @@ export function doLokiChannelStream(
     })
   );
 }
+
+export const convertToWebSocketUrl = (url: string) => {
+  const protocol = window.location.protocol === 'https:' ? 'wss://' : 'ws://';
+  let backend = `${protocol}${window.location.host}${config.appSubUrl}`;
+  if (backend.endsWith('/')) {
+    backend = backend.slice(0, -1);
+  }
+  return `${backend}${url}`;
+};
diff --git a/public/app/plugins/datasource/loki/syntax.ts b/public/app/plugins/datasource/loki/syntax.ts
index 9790da1ac19b8..ae939af997bcc 100644
--- a/public/app/plugins/datasource/loki/syntax.ts
+++ b/public/app/plugins/datasource/loki/syntax.ts
@@ -191,8 +191,8 @@ export const BUILT_IN_FUNCTIONS = [
 ];
 
 export const FUNCTIONS = [...AGGREGATION_OPERATORS, ...RANGE_VEC_FUNCTIONS, ...BUILT_IN_FUNCTIONS];
-export const LOKI_KEYWORDS = [...FUNCTIONS, ...PIPE_OPERATORS, ...PIPE_PARSERS].map((keyword) => keyword.label);
 
+// Loki grammar is used for query highlight in query previews outside of code editor
 export const lokiGrammar: Grammar = {
   comment: {
     pattern: /#.*/,
diff --git a/public/app/plugins/datasource/loki/tracking.test.ts b/public/app/plugins/datasource/loki/tracking.test.ts
index 9f3a01151d653..6dbd998592b1b 100644
--- a/public/app/plugins/datasource/loki/tracking.test.ts
+++ b/public/app/plugins/datasource/loki/tracking.test.ts
@@ -1,12 +1,10 @@
-import { getQueryOptions } from 'test/helpers/getQueryOptions';
-
-import { dateTime } from '@grafana/data';
+import { DashboardLoadedEvent, DataQueryRequest, dateTime } from '@grafana/data';
+import { QueryEditorMode } from '@grafana/experimental';
 import { reportInteraction } from '@grafana/runtime';
 
-import { QueryEditorMode } from '../prometheus/querybuilder/shared/types';
-
+import pluginJson from './plugin.json';
 import { partitionTimeRange } from './querySplitting';
-import { trackGroupedQueries, trackQuery } from './tracking';
+import { onDashboardLoadedHandler, trackGroupedQueries, trackQuery } from './tracking';
 import { LokiGroupedRequest, LokiQuery } from './types';
 
 jest.mock('@grafana/runtime', () => ({
@@ -26,7 +24,7 @@ const range = {
     to: dateTime('2023-02-10T06:00:00.000Z'),
   },
 };
-const originalRequest = getQueryOptions<LokiQuery>({
+const originalRequest = {
   targets: [
     { expr: 'count_over_time({a="b"}[1m])', refId: 'A', ...baseTarget },
     { expr: '{a="b"}', refId: 'B', maxLines: 10, ...baseTarget },
@@ -34,26 +32,23 @@ const originalRequest = getQueryOptions<LokiQuery>({
   ],
   range,
   app: 'explore',
-});
+} as DataQueryRequest<LokiQuery>;
+
 const requests: LokiGroupedRequest[] = [
   {
     request: {
-      ...getQueryOptions<LokiQuery>({
-        targets: [{ expr: 'count_over_time({a="b"}[1m])', refId: 'A', ...baseTarget }],
-        range,
-      }),
+      targets: [{ expr: 'count_over_time({a="b"}[1m])', refId: 'A', ...baseTarget }],
+      range,
       app: 'explore',
-    },
+    } as DataQueryRequest<LokiQuery>,
     partition: partitionTimeRange(true, range, 60000, 24 * 60 * 60 * 1000),
   },
   {
     request: {
-      ...getQueryOptions<LokiQuery>({
-        targets: [{ expr: '{a="b"}', refId: 'B', maxLines: 10, ...baseTarget }],
-        range,
-      }),
+      targets: [{ expr: '{a="b"}', refId: 'B', maxLines: 10, ...baseTarget }],
+      range,
       app: 'explore',
-    },
+    } as DataQueryRequest<LokiQuery>,
     partition: partitionTimeRange(false, range, 60000, 24 * 60 * 60 * 1000),
   },
 ];
@@ -63,6 +58,7 @@ beforeAll(() => {
 });
 afterAll(() => {
   jest.useRealTimers();
+  jest.clearAllMocks();
 });
 beforeEach(() => {
   jest.mocked(reportInteraction).mockClear();
@@ -82,8 +78,6 @@ test('Tracks queries', () => {
     legend: undefined,
     line_limit: undefined,
     obfuscated_query: 'count_over_time({Identifier=String}[1m])',
-    parsed_query:
-      'LogQL,Expr,MetricExpr,RangeAggregationExpr,RangeOp,CountOverTime,LogRangeExpr,Selector,Matchers,Matcher,Identifier,Eq,String,Range,Duration',
     query_type: 'metric',
     query_vector_type: undefined,
     resolution: 1,
@@ -110,8 +104,6 @@ test('Tracks predefined operations', () => {
     legend: undefined,
     line_limit: undefined,
     obfuscated_query: 'count_over_time({Identifier=String}[1m])',
-    parsed_query:
-      'LogQL,Expr,MetricExpr,RangeAggregationExpr,RangeOp,CountOverTime,LogRangeExpr,Selector,Matchers,Matcher,Identifier,Eq,String,Range,Duration',
     query_type: 'metric',
     query_vector_type: undefined,
     resolution: 1,
@@ -138,8 +130,6 @@ test('Tracks grouped queries', () => {
     legend: undefined,
     line_limit: undefined,
     obfuscated_query: 'count_over_time({Identifier=String}[1m])',
-    parsed_query:
-      'LogQL,Expr,MetricExpr,RangeAggregationExpr,RangeOp,CountOverTime,LogRangeExpr,Selector,Matchers,Matcher,Identifier,Eq,String,Range,Duration',
     query_type: 'metric',
     query_vector_type: undefined,
     resolution: 1,
@@ -166,7 +156,6 @@ test('Tracks grouped queries', () => {
     legend: undefined,
     line_limit: 10,
     obfuscated_query: '{Identifier=String}',
-    parsed_query: 'LogQL,Expr,LogExpr,Selector,Matchers,Matcher,Identifier,Eq,String',
     query_type: 'logs',
     query_vector_type: undefined,
     resolution: 1,
@@ -182,3 +171,41 @@ test('Tracks grouped queries', () => {
     predefined_operations_applied: 'n/a',
   });
 });
+
+describe('onDashboardLoadedHandler', () => {
+  beforeEach(() => {
+    jest.mocked(reportInteraction).mockClear();
+    jest.spyOn(console, 'error');
+  });
+  test('Reports dashboard loaded interactions', () => {
+    const event = new DashboardLoadedEvent({
+      dashboardId: 'test',
+      orgId: 1,
+      userId: 2,
+      grafanaVersion: '11',
+      queries: {
+        [pluginJson.id]: originalRequest.targets,
+      },
+    });
+    onDashboardLoadedHandler(event);
+
+    expect(reportInteraction).toHaveBeenCalled();
+    expect(console.error).not.toHaveBeenCalled();
+  });
+
+  test('Does not report or fails when the dashboard id has no queries', () => {
+    const event = new DashboardLoadedEvent({
+      dashboardId: 'test',
+      orgId: 1,
+      userId: 2,
+      grafanaVersion: '11',
+      queries: {
+        'not loki': originalRequest.targets,
+      },
+    });
+    onDashboardLoadedHandler(event);
+
+    expect(reportInteraction).not.toHaveBeenCalled();
+    expect(console.error).not.toHaveBeenCalled();
+  });
+});
diff --git a/public/app/plugins/datasource/loki/tracking.ts b/public/app/plugins/datasource/loki/tracking.ts
index cd6c117e14787..b48f636bc40fe 100644
--- a/public/app/plugins/datasource/loki/tracking.ts
+++ b/public/app/plugins/datasource/loki/tracking.ts
@@ -1,8 +1,6 @@
 import { CoreApp, DashboardLoadedEvent, DataQueryRequest, DataQueryResponse } from '@grafana/data';
+import { QueryEditorMode } from '@grafana/experimental';
 import { reportInteraction, config } from '@grafana/runtime';
-import { variableRegex } from 'app/features/variables/utils';
-
-import { QueryEditorMode } from '../prometheus/querybuilder/shared/types';
 
 import {
   REF_ID_STARTER_ANNOTATION,
@@ -11,7 +9,8 @@ import {
   REF_ID_STARTER_LOG_VOLUME,
 } from './datasource';
 import pluginJson from './plugin.json';
-import { getNormalizedLokiQuery, isLogsQuery, obfuscate, parseToNodeNamesArray } from './queryUtils';
+import { getNormalizedLokiQuery, isLogsQuery, obfuscate } from './queryUtils';
+import { variableRegex } from './querybuilder/parsingUtils';
 import { LokiGroupedRequest, LokiQuery, LokiQueryType } from './types';
 
 type LokiOnDashboardLoadedTrackingEvent = {
@@ -63,8 +62,8 @@ export const onDashboardLoadedHandler = ({
   try {
     // We only want to track visible Loki queries
     const lokiQueries = queries[pluginJson.id]
-      .filter((query) => !query.hide)
-      .map((query) => getNormalizedLokiQuery(query));
+      ?.filter((query) => !query.hide)
+      ?.map((query) => getNormalizedLokiQuery(query));
 
     if (!lokiQueries?.length) {
       return;
@@ -177,7 +176,6 @@ export function trackQuery(
       has_error: response.error !== undefined,
       legend: query.legendFormat,
       line_limit: query.maxLines,
-      parsed_query: parseToNodeNamesArray(query.expr).join(','),
       obfuscated_query: obfuscate(query.expr),
       query_type: isLogsQuery(query.expr) ? 'logs' : 'metric',
       query_vector_type: query.queryType,
diff --git a/public/app/plugins/datasource/loki/types.ts b/public/app/plugins/datasource/loki/types.ts
index 5ba790263b6e8..806e7e8143443 100644
--- a/public/app/plugins/datasource/loki/types.ts
+++ b/public/app/plugins/datasource/loki/types.ts
@@ -1,6 +1,11 @@
 import { DataQuery, DataQueryRequest, DataSourceJsonData, TimeRange } from '@grafana/data';
 
-import { Loki as LokiQueryFromSchema, LokiQueryType, SupportingQueryType, LokiQueryDirection } from './dataquery.gen';
+import {
+  LokiDataQuery as LokiQueryFromSchema,
+  LokiQueryType,
+  SupportingQueryType,
+  LokiQueryDirection,
+} from './dataquery.gen';
 
 export { LokiQueryDirection, LokiQueryType, SupportingQueryType };
 
@@ -10,6 +15,12 @@ export enum LokiResultType {
   Matrix = 'matrix',
 }
 
+export enum LabelType {
+  Indexed = 'I',
+  StructuredMetadata = 'S',
+  Parsed = 'P',
+}
+
 export interface LokiQuery extends LokiQueryFromSchema {
   direction?: LokiQueryDirection;
   /** Used only to identify supporting queries, e.g. logs volume, logs sample and data sample */
@@ -54,6 +65,7 @@ export type DerivedFieldConfig = {
   url?: string;
   urlDisplayLabel?: string;
   datasourceUid?: string;
+  matcherType?: 'label' | 'regex';
 };
 
 export enum LokiVariableQueryType {
@@ -80,12 +92,12 @@ export interface ContextFilter {
   enabled: boolean;
   label: string;
   value: string;
-  fromParser: boolean;
-  description?: string;
+  nonIndexed: boolean;
 }
 
 export interface ParserAndLabelKeysResult {
   extractedLabelKeys: string[];
+  structuredMetadataKeys: string[];
   hasJSON: boolean;
   hasLogfmt: boolean;
   hasPack: boolean;
diff --git a/public/app/plugins/datasource/loki/variables.test.ts b/public/app/plugins/datasource/loki/variables.test.ts
deleted file mode 100644
index 99a65507af135..0000000000000
--- a/public/app/plugins/datasource/loki/variables.test.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { createLokiDatasource, createMetadataRequest } from './mocks';
-import { LokiVariableQueryType } from './types';
-import { LokiVariableSupport } from './variables';
-
-describe('LokiVariableSupport', () => {
-  let lokiVariableSupport: LokiVariableSupport;
-
-  beforeEach(() => {
-    const datasource = createLokiDatasource();
-    jest
-      .spyOn(datasource, 'metadataRequest')
-      .mockImplementation(
-        createMetadataRequest(
-          { label1: ['value1', 'value2'], label2: ['value3', 'value4'] },
-          { '{label1="value1", label2="value2"}': [{ label5: 'value5' }] }
-        )
-      );
-
-    lokiVariableSupport = new LokiVariableSupport(datasource);
-  });
-
-  it('should return label names for Loki', async () => {
-    // label_names()
-    const response = await lokiVariableSupport.execute({ refId: 'test', type: LokiVariableQueryType.LabelNames }, {});
-
-    expect(response).toEqual([{ text: 'label1' }, { text: 'label2' }]);
-  });
-
-  it('should return label values for Loki when no matcher', async () => {
-    // label_values(label1)
-    const response = await lokiVariableSupport.execute(
-      {
-        refId: 'test',
-        type: LokiVariableQueryType.LabelValues,
-        label: 'label1',
-      },
-      {}
-    );
-
-    expect(response).toEqual([{ text: 'value1' }, { text: 'value2' }]);
-  });
-
-  it('should return label values for Loki with matcher', async () => {
-    // label_values({label1="value1", label2="value2"},label5)
-    const response = await lokiVariableSupport.execute(
-      {
-        refId: 'test',
-        type: LokiVariableQueryType.LabelValues,
-        stream: '{label1="value1", label2="value2"}',
-        label: 'label5',
-      },
-      {}
-    );
-
-    expect(response).toEqual([{ text: 'value5' }]);
-  });
-});
diff --git a/public/app/plugins/datasource/loki/variables.ts b/public/app/plugins/datasource/loki/variables.ts
deleted file mode 100644
index fb31a2e12f8e7..0000000000000
--- a/public/app/plugins/datasource/loki/variables.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { from, Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-
-import { CustomVariableSupport, DataQueryRequest, MetricFindValue, ScopedVars } from '@grafana/data';
-
-import { LokiVariableQueryEditor } from './components/VariableQueryEditor';
-import { LokiDatasource } from './datasource';
-import { LokiVariableQuery } from './types';
-
-export class LokiVariableSupport extends CustomVariableSupport<LokiDatasource, LokiVariableQuery> {
-  editor = LokiVariableQueryEditor;
-
-  constructor(private datasource: LokiDatasource) {
-    super();
-  }
-
-  async execute(query: LokiVariableQuery, scopedVars: ScopedVars) {
-    return this.datasource.metricFindQuery(query, { scopedVars });
-  }
-
-  query(request: DataQueryRequest<LokiVariableQuery>): Observable<{ data: MetricFindValue[] }> {
-    const result = this.execute(request.targets[0], request.scopedVars);
-
-    return from(result).pipe(map((data) => ({ data })));
-  }
-}
diff --git a/public/app/plugins/datasource/mixed/MixedDataSource.ts b/public/app/plugins/datasource/mixed/MixedDataSource.ts
index d0296261f9956..2466cdcbda9c9 100644
--- a/public/app/plugins/datasource/mixed/MixedDataSource.ts
+++ b/public/app/plugins/datasource/mixed/MixedDataSource.ts
@@ -15,6 +15,8 @@ import { getDataSourceSrv, toDataQueryError } from '@grafana/runtime';
 
 export const MIXED_DATASOURCE_NAME = '-- Mixed --';
 
+export const mixedRequestId = (queryIdx: number, requestId?: string) => `mixed-${queryIdx}-${requestId || ''}`;
+
 export interface BatchedQueries {
   datasource: Promise<DataSourceApi>;
   targets: DataQuery[];
@@ -61,7 +63,7 @@ export class MixedDatasource extends DataSourceApi<DataQuery> {
       from(query.datasource).pipe(
         mergeMap((api: DataSourceApi) => {
           const dsRequest = cloneDeep(request);
-          dsRequest.requestId = `mixed-${i}-${dsRequest.requestId || ''}`;
+          dsRequest.requestId = mixedRequestId(i, dsRequest.requestId);
           dsRequest.targets = query.targets;
 
           return from(api.query(dsRequest)).pipe(
@@ -70,7 +72,7 @@ export class MixedDatasource extends DataSourceApi<DataQuery> {
                 ...response,
                 data: response.data || [],
                 state: LoadingState.Loading,
-                key: `mixed-${i}-${response.key || ''}`,
+                key: mixedRequestId(i, response.key),
               };
             }),
             toArray(),
@@ -83,7 +85,7 @@ export class MixedDatasource extends DataSourceApi<DataQuery> {
                   data: [],
                   state: LoadingState.Error,
                   error: err,
-                  key: `mixed-${i}-${dsRequest.requestId || ''}`,
+                  key: mixedRequestId(i, dsRequest.requestId),
                 },
               ]);
             })
diff --git a/public/app/plugins/datasource/mssql/MSSqlQueryModel.ts b/public/app/plugins/datasource/mssql/MSSqlQueryModel.ts
index 45754ed51c9c8..4d7124286799a 100644
--- a/public/app/plugins/datasource/mssql/MSSqlQueryModel.ts
+++ b/public/app/plugins/datasource/mssql/MSSqlQueryModel.ts
@@ -1,7 +1,6 @@
 import { ScopedVars } from '@grafana/data';
 import { TemplateSrv } from '@grafana/runtime';
-import { applyQueryDefaults } from 'app/features/plugins/sql/defaults';
-import { SQLQuery, SqlQueryModel } from 'app/features/plugins/sql/types';
+import { applyQueryDefaults, SQLQuery, SqlQueryModel } from '@grafana/sql';
 
 export class MSSqlQueryModel implements SqlQueryModel {
   target: SQLQuery;
diff --git a/public/app/plugins/datasource/mssql/azureauth/AzureAuth.testMocks.ts b/public/app/plugins/datasource/mssql/azureauth/AzureAuth.testMocks.ts
index bf3b00063ffaa..42daca490efe5 100644
--- a/public/app/plugins/datasource/mssql/azureauth/AzureAuth.testMocks.ts
+++ b/public/app/plugins/datasource/mssql/azureauth/AzureAuth.testMocks.ts
@@ -4,7 +4,12 @@ import { GrafanaBootConfig } from '@grafana/runtime';
 import { AzureAuthSecureJSONDataType, AzureAuthJSONDataType, AzureAuthType } from '../types';
 
 export const configWithManagedIdentityEnabled: Partial<GrafanaBootConfig> = {
-  azure: { managedIdentityEnabled: true, workloadIdentityEnabled: false, userIdentityEnabled: false },
+  azure: {
+    managedIdentityEnabled: true,
+    workloadIdentityEnabled: false,
+    userIdentityEnabled: false,
+    userIdentityFallbackCredentialsEnabled: false,
+  },
 };
 
 export const configWithManagedIdentityDisabled: Partial<GrafanaBootConfig> = {
@@ -13,6 +18,7 @@ export const configWithManagedIdentityDisabled: Partial<GrafanaBootConfig> = {
     workloadIdentityEnabled: false,
     userIdentityEnabled: false,
     cloud: 'AzureCloud',
+    userIdentityFallbackCredentialsEnabled: false,
   },
 };
 
diff --git a/public/app/plugins/datasource/mssql/azureauth/AzureAuthSettings.tsx b/public/app/plugins/datasource/mssql/azureauth/AzureAuthSettings.tsx
index 28b4421a3892f..a47198c75484b 100644
--- a/public/app/plugins/datasource/mssql/azureauth/AzureAuthSettings.tsx
+++ b/public/app/plugins/datasource/mssql/azureauth/AzureAuthSettings.tsx
@@ -1,4 +1,5 @@
 import React, { useMemo } from 'react';
+import { useEffectOnce } from 'react-use';
 
 import { config } from '@grafana/runtime';
 import { HttpSettingsBaseProps } from '@grafana/ui/src/components/DataSourceSettings/types';
@@ -19,6 +20,13 @@ export const AzureAuthSettings = (props: HttpSettingsBaseProps) => {
     onChange(updateCredentials(dsSettings, config, credentials));
   };
 
+  // The auth type needs to be set on the first load of the data source
+  useEffectOnce(() => {
+    if (!dsSettings.jsonData.authType) {
+      onCredentialsChange(credentials);
+    }
+  });
+
   return (
     <AzureCredentialsForm
       managedIdentityEnabled={managedIdentityEnabled}
diff --git a/public/app/plugins/datasource/mssql/configuration/ConfigurationEditor.tsx b/public/app/plugins/datasource/mssql/configuration/ConfigurationEditor.tsx
index 19e1e8a42c8e7..be0ed607137aa 100644
--- a/public/app/plugins/datasource/mssql/configuration/ConfigurationEditor.tsx
+++ b/public/app/plugins/datasource/mssql/configuration/ConfigurationEditor.tsx
@@ -11,6 +11,7 @@ import {
   updateDatasourcePluginResetOption,
 } from '@grafana/data';
 import { ConfigSection, ConfigSubSection, DataSourceDescription } from '@grafana/experimental';
+import { ConnectionLimits, useMigrateDatabaseFields } from '@grafana/sql';
 import {
   Alert,
   FieldSet,
@@ -26,8 +27,6 @@ import {
 } from '@grafana/ui';
 import { NumberInput } from 'app/core/components/OptionsUI/NumberInput';
 import { config } from 'app/core/config';
-import { ConnectionLimits } from 'app/features/plugins/sql/components/configuration/ConnectionLimits';
-import { useMigrateDatabaseFields } from 'app/features/plugins/sql/components/configuration/useMigrateDatabaseFields';
 
 import { AzureAuthSettings } from '../azureauth/AzureAuthSettings';
 import {
@@ -38,6 +37,8 @@ import {
   MssqlSecureOptions,
 } from '../types';
 
+import { KerberosConfig, KerberosAdvancedSettings, UsernameMessage } from './Kerberos';
+
 const LONG_WIDTH = 40;
 
 export const ConfigurationEditor = (props: DataSourcePluginOptionsEditorProps<MssqlOptions, MssqlSecureOptions>) => {
@@ -75,7 +76,14 @@ export const ConfigurationEditor = (props: DataSourcePluginOptionsEditorProps<Ms
     onOptionsChange({
       ...dsSettings,
       ...{
-        jsonData: { ...jsonData, ...{ authenticationType: value.value }, azureCredentials: undefined },
+        jsonData: {
+          ...jsonData,
+          ...{ authenticationType: value.value },
+          azureCredentials: undefined,
+          keytabFilePath: undefined,
+          credentialCache: undefined,
+          credentialCacheLookupFile: undefined,
+        },
         secureJsonData: { ...dsSettings.secureJsonData, ...{ password: '' } },
         secureJsonFields: { ...dsSettings.secureJsonFields, ...{ password: false } },
         user: '',
@@ -91,6 +99,10 @@ export const ConfigurationEditor = (props: DataSourcePluginOptionsEditorProps<Ms
     const basicAuthenticationOptions: Array<SelectableValue<MSSQLAuthenticationType>> = [
       { value: MSSQLAuthenticationType.sqlAuth, label: 'SQL Server Authentication' },
       { value: MSSQLAuthenticationType.windowsAuth, label: 'Windows Authentication' },
+      { value: MSSQLAuthenticationType.kerberosRaw, label: 'Windows AD: Username + password' },
+      { value: MSSQLAuthenticationType.kerberosKeytab, label: 'Windows AD: Keytab file' },
+      { value: MSSQLAuthenticationType.kerberosCredentialCache, label: 'Windows AD: Credential cache' },
+      { value: MSSQLAuthenticationType.kerberosCredentialCacheLookupFile, label: 'Windows AD: Credential cache file' },
     ];
 
     if (azureAuthIsSupported) {
@@ -239,6 +251,21 @@ export const ConfigurationEditor = (props: DataSourcePluginOptionsEditorProps<Ms
                   Azure AD credentials - Managed Service Identity and Client Secret Credentials are supported.
                 </li>
               )}
+              <li>
+                <i>Windows AD: Username + password</i> Windows Active Directory - Sign on for domain user via
+                username/password.
+              </li>
+              <li>
+                <i>Windows AD: Keytab</i> Windows Active Directory - Sign on for domain user via keytab file.
+              </li>
+              <li>
+                <i>Windows AD: Credential cache</i> Windows Active Directory - Sign on for domain user via credential
+                cache.
+              </li>
+              <li>
+                <i>Windows AD: Credential cache file</i> Windows Active Directory - Sign on for domain user via
+                credential cache file.
+              </li>
             </ul>
           }
         >
@@ -252,14 +279,27 @@ export const ConfigurationEditor = (props: DataSourcePluginOptionsEditorProps<Ms
           />
         </Field>
 
+        <KerberosConfig {...props} />
+
         {/* Basic SQL auth. Render if authType === MSSQLAuthenticationType.sqlAuth OR
+        authType === MSSQLAuthenticationType.kerberosRaw OR
         if no authType exists, which will be the case when creating a new data source */}
-        {(jsonData.authenticationType === MSSQLAuthenticationType.sqlAuth || !jsonData.authenticationType) && (
+        {(jsonData.authenticationType === MSSQLAuthenticationType.sqlAuth ||
+          jsonData.authenticationType === MSSQLAuthenticationType.kerberosRaw ||
+          !jsonData.authenticationType) && (
           <>
-            <Field label="Username" required invalid={!dsSettings.user} error={'Username is required'}>
+            <Field
+              label="Username"
+              required
+              invalid={!dsSettings.user}
+              error={'Username is required'}
+              description={jsonData.authenticationType === MSSQLAuthenticationType.kerberosRaw ? UsernameMessage : ''}
+            >
               <Input
                 value={dsSettings.user || ''}
-                placeholder="user"
+                placeholder={
+                  jsonData.authenticationType === MSSQLAuthenticationType.kerberosRaw ? 'name@EXAMPLE.COM' : 'user'
+                }
                 onChange={onDSOptionChanged('user')}
                 width={LONG_WIDTH}
               />
@@ -336,6 +376,7 @@ export const ConfigurationEditor = (props: DataSourcePluginOptionsEditorProps<Ms
         {config.secureSocksDSProxyEnabled && (
           <SecureSocksProxySettings options={dsSettings} onOptionsChange={onOptionsChange} />
         )}
+        <KerberosAdvancedSettings {...props} />
       </ConfigSection>
     </>
   );
diff --git a/public/app/plugins/datasource/mssql/configuration/Kerberos.tsx b/public/app/plugins/datasource/mssql/configuration/Kerberos.tsx
new file mode 100644
index 0000000000000..a73b6eb1a1908
--- /dev/null
+++ b/public/app/plugins/datasource/mssql/configuration/Kerberos.tsx
@@ -0,0 +1,203 @@
+import React, { SyntheticEvent } from 'react';
+
+import { DataSourcePluginOptionsEditorProps, updateDatasourcePluginJsonDataOption } from '@grafana/data';
+import { ConfigSubSection } from '@grafana/experimental';
+import { FieldSet, Input, Field } from '@grafana/ui';
+
+import { MSSQLAuthenticationType, MssqlOptions } from '../types';
+
+export const UsernameMessage = (
+  <span>
+    Use the format <code>user@EXAMPLE.COM</code>. Realm is derived from the username.
+  </span>
+);
+
+export const KerberosConfig = (props: DataSourcePluginOptionsEditorProps<MssqlOptions>) => {
+  const { options: settings, onOptionsChange } = props;
+  const jsonData = settings.jsonData;
+  const LONG_WIDTH = 40;
+
+  const keytabFilePath = jsonData?.keytabFilePath;
+  const credentialCache = jsonData?.credentialCache;
+  const credentialCacheLookupFile = jsonData?.credentialCacheLookupFile;
+
+  const onKeytabFileChanged = (event: SyntheticEvent<HTMLInputElement>) => {
+    updateDatasourcePluginJsonDataOption(props, 'keytabFilePath', event.currentTarget.value);
+  };
+
+  const onCredentialCacheChanged = (event: SyntheticEvent<HTMLInputElement>) => {
+    updateDatasourcePluginJsonDataOption(props, 'credentialCache', event.currentTarget.value);
+  };
+
+  const onCredentialCacheFileChanged = (event: SyntheticEvent<HTMLInputElement>) => {
+    updateDatasourcePluginJsonDataOption(props, 'credentialCacheLookupFile', event.currentTarget.value);
+  };
+
+  return (
+    <>
+      {jsonData.authenticationType === MSSQLAuthenticationType.kerberosKeytab && (
+        <FieldSet label="Windows AD: Keytab">
+          <Field
+            label="Username"
+            required
+            invalid={!settings.user}
+            error={'Username is required'}
+            description={UsernameMessage}
+          >
+            <Input
+              value={settings.user || ''}
+              placeholder="name@EXAMPLE.COM"
+              onChange={(e) => onOptionsChange({ ...settings, ...{ ['user']: e.currentTarget.value } })}
+              width={LONG_WIDTH}
+            />
+          </Field>
+          <Field label="Keytab file path" required invalid={!keytabFilePath} error={'Keytab file path is required'}>
+            <Input
+              placeholder="/home/grot/grot.keytab"
+              onChange={onKeytabFileChanged}
+              width={LONG_WIDTH}
+              required
+              value={keytabFilePath || ''}
+            />
+          </Field>
+        </FieldSet>
+      )}
+
+      {jsonData.authenticationType === MSSQLAuthenticationType.kerberosCredentialCache && (
+        <FieldSet label="Windows AD: Credential cache">
+          <Field
+            label="Credential cache path"
+            required
+            invalid={!credentialCache}
+            error={'Credential cache path is required'}
+          >
+            <Input
+              placeholder="/tmp/krb5cc_1000"
+              onChange={onCredentialCacheChanged}
+              width={LONG_WIDTH}
+              value={credentialCache || ''}
+              required
+            />
+          </Field>
+        </FieldSet>
+      )}
+
+      {jsonData.authenticationType === MSSQLAuthenticationType.kerberosCredentialCacheLookupFile && (
+        <FieldSet label="Windows AD: Credential cache file">
+          <Field
+            label="Username"
+            required
+            invalid={!settings.user}
+            error={'Username is required'}
+            description={UsernameMessage}
+          >
+            <Input
+              value={settings.user || ''}
+              placeholder="name@EXAMPLE.COM"
+              onChange={(e) => onOptionsChange({ ...settings, ...{ ['user']: e.currentTarget.value } })}
+              width={LONG_WIDTH}
+            />
+          </Field>
+          <Field
+            label="Credential cache file path"
+            required
+            invalid={!credentialCacheLookupFile}
+            error={'Credential cache file path is required'}
+          >
+            <Input
+              placeholder="/home/grot/cache.json"
+              onChange={onCredentialCacheFileChanged}
+              width={LONG_WIDTH}
+              value={credentialCacheLookupFile || ''}
+              required
+            />
+          </Field>
+        </FieldSet>
+      )}
+    </>
+  );
+};
+
+export const KerberosAdvancedSettings = (props: DataSourcePluginOptionsEditorProps<MssqlOptions>) => {
+  const { options: settings } = props;
+  const jsonData = settings.jsonData;
+  const configFilePath = jsonData?.configFilePath;
+  const LONG_WIDTH = 40;
+  const onUDPLimitChanged = (val: number) => {
+    updateDatasourcePluginJsonDataOption(props, 'UDPConnectionLimit', val);
+  };
+
+  const onDNSLookupKDCChanged = (event: SyntheticEvent<HTMLInputElement>) => {
+    updateDatasourcePluginJsonDataOption(props, 'enableDNSLookupKDC', event.currentTarget.value);
+  };
+
+  const onKrbConfigChanged = (event: SyntheticEvent<HTMLInputElement>) => {
+    updateDatasourcePluginJsonDataOption(props, 'configFilePath', event.currentTarget.value);
+  };
+
+  return (
+    <>
+      <ConfigSubSection title="Windows AD: Advanced Settings">
+        <FieldSet>
+          <Field
+            label="UDP Preference Limit"
+            description={
+              <span>
+                The default is <code>1</code> and means always use TCP and is optional.
+              </span>
+            }
+          >
+            <Input
+              type="text"
+              width={LONG_WIDTH}
+              placeholder="0"
+              defaultValue={jsonData.UDPConnectionLimit}
+              onChange={(e) => {
+                const val = Number(e.currentTarget.value);
+                if (!Number.isNaN(val)) {
+                  onUDPLimitChanged(val);
+                }
+              }}
+            />
+          </Field>
+          <Field
+            label="DNS Lookup KDC"
+            description={
+              <span>
+                Indicate whether DNS `SRV` records should be used to locate the KDCs and other servers for a realm. The
+                default is <code>true</code>.
+              </span>
+            }
+          >
+            <Input
+              type="text"
+              width={LONG_WIDTH}
+              placeholder="true"
+              defaultValue={jsonData.enableDNSLookupKDC}
+              onChange={onDNSLookupKDCChanged}
+            />
+          </Field>
+          <Field
+            label="krb5 config file path"
+            description={
+              <span>
+                The path to the configuration file for the{' '}
+                <a href="https://web.mit.edu/kerberos/krb5-1.12/doc/admin/conf_files/krb5_conf.html">
+                  MIT krb5 package
+                </a>
+                . The default is <code>/etc/krb5.conf</code>.
+              </span>
+            }
+          >
+            <Input
+              onChange={onKrbConfigChanged}
+              width={LONG_WIDTH}
+              required
+              value={configFilePath || '/etc/krb5.conf'}
+            />
+          </Field>
+        </FieldSet>
+      </ConfigSubSection>
+    </>
+  );
+};
diff --git a/public/app/plugins/datasource/mssql/datasource.test.ts b/public/app/plugins/datasource/mssql/datasource.test.ts
index bff446b08c11d..8c3d8092d4367 100644
--- a/public/app/plugins/datasource/mssql/datasource.test.ts
+++ b/public/app/plugins/datasource/mssql/datasource.test.ts
@@ -11,8 +11,8 @@ import {
   createDataFrame,
   TimeRange,
 } from '@grafana/data';
+import { SQLQuery } from '@grafana/sql';
 import { backendSrv } from 'app/core/services/backend_srv';
-import { SQLQuery } from 'app/features/plugins/sql/types';
 import { TemplateSrv } from 'app/features/templating/template_srv';
 
 import { initialCustomVariableModelState } from '../../../features/variables/custom/reducer';
diff --git a/public/app/plugins/datasource/mssql/datasource.ts b/public/app/plugins/datasource/mssql/datasource.ts
index 13e6781f0bfef..f936ab72a5aae 100644
--- a/public/app/plugins/datasource/mssql/datasource.ts
+++ b/public/app/plugins/datasource/mssql/datasource.ts
@@ -1,9 +1,7 @@
 import { DataSourceInstanceSettings, ScopedVars } from '@grafana/data';
 import { LanguageDefinition } from '@grafana/experimental';
 import { TemplateSrv } from '@grafana/runtime';
-import { SqlDatasource } from 'app/features/plugins/sql/datasource/SqlDatasource';
-import { DB, SQLQuery, SQLSelectableValue } from 'app/features/plugins/sql/types';
-import { formatSQL } from 'app/features/plugins/sql/utils/formatSQL';
+import { DB, SQLQuery, SqlDatasource, SQLSelectableValue, formatSQL } from '@grafana/sql';
 
 import { getSchema, showDatabases, getSchemaAndName } from './MSSqlMetaQuery';
 import { MSSqlQueryModel } from './MSSqlQueryModel';
diff --git a/public/app/plugins/datasource/mssql/module.ts b/public/app/plugins/datasource/mssql/module.ts
index 7af8a5a3f2fb1..230f2f89a41d8 100644
--- a/public/app/plugins/datasource/mssql/module.ts
+++ b/public/app/plugins/datasource/mssql/module.ts
@@ -1,6 +1,5 @@
 import { DataSourcePlugin } from '@grafana/data';
-import { SqlQueryEditor } from 'app/features/plugins/sql/components/QueryEditor';
-import { SQLQuery } from 'app/features/plugins/sql/types';
+import { SQLQuery, SqlQueryEditor } from '@grafana/sql';
 
 import { CheatSheet } from './CheatSheet';
 import { ConfigurationEditor } from './configuration/ConfigurationEditor';
diff --git a/public/app/plugins/datasource/mssql/sqlCompletionProvider.ts b/public/app/plugins/datasource/mssql/sqlCompletionProvider.ts
index e8fcfb4f25bf9..871c2172dfc29 100644
--- a/public/app/plugins/datasource/mssql/sqlCompletionProvider.ts
+++ b/public/app/plugins/datasource/mssql/sqlCompletionProvider.ts
@@ -7,7 +7,7 @@ import {
   TableIdentifier,
   TokenType,
 } from '@grafana/experimental';
-import { DB, SQLQuery } from 'app/features/plugins/sql/types';
+import { DB, SQLQuery } from '@grafana/sql';
 
 interface CompletionProviderGetterArgs {
   getColumns: React.MutableRefObject<(t: SQLQuery) => Promise<ColumnDefinition[]>>;
diff --git a/public/app/plugins/datasource/mssql/sqlUtil.ts b/public/app/plugins/datasource/mssql/sqlUtil.ts
index 49c631d573354..ba7347e77aed2 100644
--- a/public/app/plugins/datasource/mssql/sqlUtil.ts
+++ b/public/app/plugins/datasource/mssql/sqlUtil.ts
@@ -1,7 +1,6 @@
 import { isEmpty } from 'lodash';
 
-import { RAQBFieldTypes, SQLExpression, SQLQuery } from 'app/features/plugins/sql/types';
-import { haveColumns } from 'app/features/plugins/sql/utils/sql.utils';
+import { RAQBFieldTypes, SQLExpression, SQLQuery, haveColumns } from '@grafana/sql';
 
 export function getIcon(type: string): string | undefined {
   switch (type) {
diff --git a/public/app/plugins/datasource/mssql/types.ts b/public/app/plugins/datasource/mssql/types.ts
index d950e4bef0948..ca35d492fb35b 100644
--- a/public/app/plugins/datasource/mssql/types.ts
+++ b/public/app/plugins/datasource/mssql/types.ts
@@ -1,11 +1,15 @@
 import { DataSourceJsonData } from '@grafana/data';
+import { SQLOptions } from '@grafana/sql';
 import { HttpSettingsBaseProps } from '@grafana/ui/src/components/DataSourceSettings/types';
-import { SQLOptions } from 'app/features/plugins/sql/types';
 
 export enum MSSQLAuthenticationType {
   sqlAuth = 'SQL Server Authentication',
   windowsAuth = 'Windows Authentication',
   azureAuth = 'Azure AD Authentication',
+  kerberosRaw = 'Windows AD: Username + password',
+  kerberosKeytab = 'Windows AD: Keytab',
+  kerberosCredentialCache = 'Windows AD: Credential cache',
+  kerberosCredentialCacheLookupFile = 'Windows AD: Credential cache file',
 }
 
 export enum MSSQLEncryptOptions {
@@ -41,6 +45,12 @@ export interface MssqlOptions extends SQLOptions {
   serverName?: string;
   connectionTimeout?: number;
   azureCredentials?: AzureCredentialsType;
+  keytabFilePath?: string;
+  credentialCache?: string;
+  credentialCacheLookupFile?: string;
+  configFilePath?: string;
+  UDPConnectionLimit?: number;
+  enableDNSLookupKDC?: string;
 }
 
 export interface MssqlSecureOptions {
diff --git a/public/app/plugins/datasource/mysql/MySqlDatasource.ts b/public/app/plugins/datasource/mysql/MySqlDatasource.ts
index 74bc814fb36cc..7a30358313cb6 100644
--- a/public/app/plugins/datasource/mysql/MySqlDatasource.ts
+++ b/public/app/plugins/datasource/mysql/MySqlDatasource.ts
@@ -1,8 +1,6 @@
 import { DataSourceInstanceSettings, TimeRange } from '@grafana/data';
 import { CompletionItemKind, LanguageDefinition, TableIdentifier } from '@grafana/experimental';
-import { SqlDatasource } from 'app/features/plugins/sql/datasource/SqlDatasource';
-import { DB, SQLQuery } from 'app/features/plugins/sql/types';
-import { formatSQL } from 'app/features/plugins/sql/utils/formatSQL';
+import { SqlDatasource, DB, SQLQuery, formatSQL } from '@grafana/sql';
 
 import { mapFieldsToTypes } from './fields';
 import { buildColumnQuery, buildTableQuery, showDatabases } from './mySqlMetaQuery';
diff --git a/public/app/plugins/datasource/mysql/configuration/ConfigurationEditor.tsx b/public/app/plugins/datasource/mysql/configuration/ConfigurationEditor.tsx
index 055dc88e27677..c0feed4629bb4 100644
--- a/public/app/plugins/datasource/mysql/configuration/ConfigurationEditor.tsx
+++ b/public/app/plugins/datasource/mysql/configuration/ConfigurationEditor.tsx
@@ -9,6 +9,7 @@ import {
 } from '@grafana/data';
 import { ConfigSection, ConfigSubSection, DataSourceDescription, Stack } from '@grafana/experimental';
 import { config } from '@grafana/runtime';
+import { ConnectionLimits, Divider, TLSSecretsConfig, useMigrateDatabaseFields } from '@grafana/sql';
 import {
   Collapse,
   Field,
@@ -20,10 +21,6 @@ import {
   Switch,
   Tooltip,
 } from '@grafana/ui';
-import { ConnectionLimits } from 'app/features/plugins/sql/components/configuration/ConnectionLimits';
-import { Divider } from 'app/features/plugins/sql/components/configuration/Divider';
-import { TLSSecretsConfig } from 'app/features/plugins/sql/components/configuration/TLSSecretsConfig';
-import { useMigrateDatabaseFields } from 'app/features/plugins/sql/components/configuration/useMigrateDatabaseFields';
 
 import { MySQLOptions } from '../types';
 
@@ -177,11 +174,12 @@ export const ConfigurationEditor = (props: DataSourcePluginOptionsEditorProps<My
                   <Tooltip
                     content={
                       <span>
-                        Specify the time zone used in the database session, e.g. <code>Europe/Berlin</code> or
-                        <code>+02:00</code>. This is necessary, if the timezone of the database (or the host of the
-                        database) is set to something other than UTC. The value is set in the session with
-                        <code>SET time_zone=&apos;...&apos;</code>. If you leave this field empty, the timezone is not
-                        updated. You can find more information in the MySQL documentation.
+                        Specify the timezone used in the database session, such as <code>Europe/Berlin</code> or
+                        <code>+02:00</code>. Required if the timezone of the database (or the host of the database) is
+                        set to something other than UTC. Set this to <code>+00:00</code> so Grafana can handle times
+                        properly. Set the value used in the session with <code>SET time_zone=&apos;...&apos;</code>. If
+                        you leave this field empty, the timezone will not be updated. You can find more information in
+                        the MySQL documentation.
                       </span>
                     }
                   >
diff --git a/public/app/plugins/datasource/mysql/fields.ts b/public/app/plugins/datasource/mysql/fields.ts
index 96eb122c35e86..4154da5873e92 100644
--- a/public/app/plugins/datasource/mysql/fields.ts
+++ b/public/app/plugins/datasource/mysql/fields.ts
@@ -1,4 +1,4 @@
-import { RAQBFieldTypes, SQLSelectableValue } from 'app/features/plugins/sql/types';
+import { RAQBFieldTypes, SQLSelectableValue } from '@grafana/sql';
 
 export function mapFieldsToTypes(columns: SQLSelectableValue[]) {
   const fields: SQLSelectableValue[] = [];
diff --git a/public/app/plugins/datasource/mysql/module.ts b/public/app/plugins/datasource/mysql/module.ts
index c47743252d63e..c2c6616c49249 100644
--- a/public/app/plugins/datasource/mysql/module.ts
+++ b/public/app/plugins/datasource/mysql/module.ts
@@ -1,6 +1,5 @@
 import { DataSourcePlugin } from '@grafana/data';
-import { SqlQueryEditor } from 'app/features/plugins/sql/components/QueryEditor';
-import { SQLQuery } from 'app/features/plugins/sql/types';
+import { SQLQuery, SqlQueryEditor } from '@grafana/sql';
 
 import { CheatSheet } from './CheatSheet';
 import { MySqlDatasource } from './MySqlDatasource';
diff --git a/public/app/plugins/datasource/mysql/specs/datasource.test.ts b/public/app/plugins/datasource/mysql/specs/datasource.test.ts
index aaee5eabf0b15..4bc376dbce13f 100644
--- a/public/app/plugins/datasource/mysql/specs/datasource.test.ts
+++ b/public/app/plugins/datasource/mysql/specs/datasource.test.ts
@@ -3,15 +3,12 @@ import { of } from 'rxjs';
 import {
   dataFrameToJSON,
   getDefaultTimeRange,
-  DataQueryRequest,
   DataSourceInstanceSettings,
-  dateTime,
   FieldType,
   createDataFrame,
 } from '@grafana/data';
 import { FetchResponse } from '@grafana/runtime';
-import { SQLQuery } from 'app/features/plugins/sql/types';
-import { makeVariable } from 'app/features/plugins/sql/utils/testHelpers';
+import { SQLQuery, makeVariable } from '@grafana/sql';
 
 import { MySqlDatasource } from '../MySqlDatasource';
 import { MySQLOptions } from '../types';
@@ -48,34 +45,6 @@ describe('MySQLDatasource', () => {
     replace: (text: string) => text,
   };
 
-  describe('When performing a query with hidden target', () => {
-    it('should return empty result and backendSrv.fetch should not be called', async () => {
-      const options = {
-        range: {
-          from: dateTime(1432288354),
-          to: dateTime(1432288401),
-        },
-        targets: [
-          {
-            format: 'table',
-            rawQuery: true,
-            rawSql: 'select time, metric, value from grafana_metric',
-            refId: 'A',
-            datasource: 'gdev-ds',
-            hide: true,
-          },
-        ],
-      } as unknown as DataQueryRequest<SQLQuery>;
-
-      const { ds, fetchMock } = setupTestContext({});
-
-      await expect(ds.query(options)).toEmitValuesWith((received) => {
-        expect(received[0]).toEqual({ data: [] });
-        expect(fetchMock).not.toHaveBeenCalled();
-      });
-    });
-  });
-
   describe('When runSql returns an empty dataframe', () => {
     const response = {
       results: {
diff --git a/public/app/plugins/datasource/mysql/sqlUtil.ts b/public/app/plugins/datasource/mysql/sqlUtil.ts
index 9116be17a9322..c4e1587fddb24 100644
--- a/public/app/plugins/datasource/mysql/sqlUtil.ts
+++ b/public/app/plugins/datasource/mysql/sqlUtil.ts
@@ -1,7 +1,6 @@
 import { isEmpty } from 'lodash';
 
-import { SQLQuery } from 'app/features/plugins/sql/types';
-import { createSelectClause, haveColumns } from 'app/features/plugins/sql/utils/sql.utils';
+import { SQLQuery, createSelectClause, haveColumns } from '@grafana/sql';
 
 export function toRawSql({ sql, dataset, table }: SQLQuery): string {
   let rawQuery = '';
diff --git a/public/app/plugins/datasource/mysql/types.ts b/public/app/plugins/datasource/mysql/types.ts
index e142f35891a78..cd47ae73ff236 100644
--- a/public/app/plugins/datasource/mysql/types.ts
+++ b/public/app/plugins/datasource/mysql/types.ts
@@ -1,4 +1,4 @@
-import { SQLOptions, SQLQuery } from 'app/features/plugins/sql/types';
+import { SQLOptions, SQLQuery } from '@grafana/sql';
 
 export interface MySQLOptions extends SQLOptions {
   allowCleartextPasswords?: boolean;
diff --git a/public/app/plugins/datasource/opentsdb/components/DownSample.tsx b/public/app/plugins/datasource/opentsdb/components/DownSample.tsx
index ab022d66f482c..74911259d5094 100644
--- a/public/app/plugins/datasource/opentsdb/components/DownSample.tsx
+++ b/public/app/plugins/datasource/opentsdb/components/DownSample.tsx
@@ -1,12 +1,10 @@
 import React from 'react';
 
 import { toOption } from '@grafana/data';
-import { InlineLabel, Select, Input, InlineFormLabel, InlineSwitch } from '@grafana/ui';
+import { InlineLabel, Select, Input, InlineFormLabel, InlineSwitch, Stack } from '@grafana/ui';
 
 import { OpenTsdbQuery } from '../types';
 
-import { paddingRightClass } from './styles';
-
 export interface DownSampleProps {
   query: OpenTsdbQuery;
   onChange: (query: OpenTsdbQuery) => void;
@@ -21,8 +19,8 @@ export function DownSample({ query, onChange, onRunQuery, aggregators, fillPolic
   const fillPolicyOptions = fillPolicies.map((value: string) => toOption(value));
 
   return (
-    <div className="gf-form-inline" data-testid={testIds.section}>
-      <div className="gf-form">
+    <Stack gap={0.5} alignItems="flex-start" data-testid={testIds.section}>
+      <Stack gap={0}>
         <InlineFormLabel
           className="query-keyword"
           width={8}
@@ -36,7 +34,6 @@ export function DownSample({ query, onChange, onRunQuery, aggregators, fillPolic
         </InlineFormLabel>
         <Input
           width={25}
-          className={paddingRightClass}
           data-testid={testIds.interval}
           placeholder="interval"
           value={query.downsampleInterval ?? ''}
@@ -46,13 +43,12 @@ export function DownSample({ query, onChange, onRunQuery, aggregators, fillPolic
           }}
           onBlur={() => onRunQuery()}
         />
-      </div>
-      <div className="gf-form">
+      </Stack>
+      <Stack gap={0}>
         <InlineFormLabel width={'auto'} className="query-keyword">
           Aggregator
         </InlineFormLabel>
         <Select
-          className="gf-form-input"
           value={query.downsampleAggregator ? toOption(query.downsampleAggregator) : undefined}
           options={aggregatorOptions}
           onChange={({ value }) => {
@@ -62,9 +58,9 @@ export function DownSample({ query, onChange, onRunQuery, aggregators, fillPolic
             }
           }}
         />
-      </div>
+      </Stack>
       {tsdbVersion >= 2 && (
-        <div className="gf-form">
+        <Stack gap={0} alignItems="flex-start">
           <InlineLabel className="width-6 query-keyword">Fill</InlineLabel>
           <Select
             inputId="opentsdb-fillpolicy-select"
@@ -77,9 +73,9 @@ export function DownSample({ query, onChange, onRunQuery, aggregators, fillPolic
               }
             }}
           />
-        </div>
+        </Stack>
       )}
-      <div className="gf-form">
+      <Stack gap={0}>
         <InlineFormLabel className="query-keyword">Disable downsampling</InlineFormLabel>
         <InlineSwitch
           value={query.disableDownsampling ?? false}
@@ -89,11 +85,11 @@ export function DownSample({ query, onChange, onRunQuery, aggregators, fillPolic
             onRunQuery();
           }}
         />
-      </div>
-      <div className="gf-form gf-form--grow">
-        <div className="gf-form-label gf-form-label--grow"></div>
-      </div>
-    </div>
+      </Stack>
+      <Stack gap={0} grow={1}>
+        <InlineLabel> </InlineLabel>
+      </Stack>
+    </Stack>
   );
 }
 
diff --git a/public/app/plugins/datasource/opentsdb/components/FilterSection.tsx b/public/app/plugins/datasource/opentsdb/components/FilterSection.tsx
index c947b0017db7e..86c1d0a917fb0 100644
--- a/public/app/plugins/datasource/opentsdb/components/FilterSection.tsx
+++ b/public/app/plugins/datasource/opentsdb/components/FilterSection.tsx
@@ -12,6 +12,7 @@ import {
   clearButtonStyles,
   useStyles2,
   AsyncSelect,
+  Stack,
 } from '@grafana/ui';
 
 import { OpenTsdbFilter, OpenTsdbQuery } from '../types';
@@ -118,46 +119,45 @@ export function FilterSection({
   const tagValueSearch = debounce((query: string) => suggestTagValues(query), 350);
 
   return (
-    <div className="gf-form-inline" data-testid={testIds.section}>
-      <div className="gf-form">
-        <InlineFormLabel
-          className="query-keyword"
-          width={8}
-          tooltip={<div>Filters does not work with tags, either of the two will work but not both.</div>}
-        >
-          Filters
-        </InlineFormLabel>
-        {query.filters &&
-          query.filters.map((fil: OpenTsdbFilter, idx: number) => {
-            return (
-              <InlineFormLabel key={idx} width="auto" data-testid={testIds.list + idx}>
-                {fil.tagk} = {fil.type}({fil.filter}), groupBy = {'' + fil.groupBy}
-                <button type="button" className={buttonStyles} onClick={() => editFilter(fil, idx)}>
-                  <Icon name={'pen'} />
-                </button>
-                <button
-                  type="button"
-                  className={buttonStyles}
-                  onClick={() => removeFilter(idx)}
-                  data-testid={testIds.remove}
-                >
-                  <Icon name={'times'} />
-                </button>
-              </InlineFormLabel>
-            );
-          })}
-        {!addFilterMode && (
-          <button className="gf-form-label" type="button" onClick={changeAddFilterMode} aria-label="Add filter">
+    <Stack gap={0} data-testid={testIds.section}>
+      <InlineFormLabel
+        className="query-keyword"
+        width={8}
+        tooltip={<div>Filters does not work with tags, either of the two will work but not both.</div>}
+      >
+        Filters
+      </InlineFormLabel>
+      {query.filters &&
+        query.filters.map((fil: OpenTsdbFilter, idx: number) => {
+          return (
+            <InlineFormLabel key={idx} width="auto" data-testid={testIds.list + idx}>
+              {fil.tagk} = {fil.type}({fil.filter}), groupBy = {'' + fil.groupBy}
+              <button type="button" className={buttonStyles} onClick={() => editFilter(fil, idx)}>
+                <Icon name={'pen'} />
+              </button>
+              <button
+                type="button"
+                className={buttonStyles}
+                onClick={() => removeFilter(idx)}
+                data-testid={testIds.remove}
+              >
+                <Icon name={'times'} />
+              </button>
+            </InlineFormLabel>
+          );
+        })}
+      {!addFilterMode && (
+        <InlineFormLabel width={2}>
+          <button type="button" className={buttonStyles} onClick={changeAddFilterMode} aria-label="Add filter">
             <Icon name={'plus'} />
           </button>
-        )}
-      </div>
+        </InlineFormLabel>
+      )}
       {addFilterMode && (
-        <div className="gf-form-inline">
-          <div className="gf-form">
+        <Stack gap={0.5} alignItems="center">
+          <Stack gap={0}>
             <Select
               inputId="opentsdb-suggested-tagk-select"
-              className="gf-form-input"
               value={curFilterKey ? toOption(curFilterKey) : undefined}
               placeholder="key"
               allowCustomValue
@@ -177,9 +177,9 @@ export function FilterSection({
                 }
               }}
             />
-          </div>
+          </Stack>
 
-          <div className="gf-form">
+          <Stack gap={0}>
             <InlineLabel className="width-4 query-keyword">Type</InlineLabel>
             <Select
               inputId="opentsdb-aggregator-select"
@@ -191,12 +191,11 @@ export function FilterSection({
                 }
               }}
             />
-          </div>
+          </Stack>
 
-          <div className="gf-form">
+          <Stack gap={0}>
             <AsyncSelect
               inputId="opentsdb-suggested-tagv-select"
-              className="gf-form-input"
               value={curFilterValue ? toOption(curFilterValue) : undefined}
               placeholder="filter"
               allowCustomValue
@@ -208,7 +207,7 @@ export function FilterSection({
                 }
               }}
             />
-          </div>
+          </Stack>
 
           <InlineFormLabel width={5} className="query-keyword">
             Group by
@@ -221,27 +220,27 @@ export function FilterSection({
               updCurFilterGroupBy(!curFilterGroupBy);
             }}
           />
-          <div className="gf-form">
+          <Stack gap={0}>
             {errors && (
-              <div className="gf-form-label" title={errors} data-testid={testIds.error}>
+              <InlineLabel title={errors} data-testid={testIds.error}>
                 <Icon name={'exclamation-triangle'} color={'rgb(229, 189, 28)'} />
-              </div>
+              </InlineLabel>
             )}
-            <div className="gf-form-label">
+            <InlineFormLabel width={5.5}>
               <button type="button" className={buttonStyles} onClick={addFilter}>
                 add filter
               </button>
               <button type="button" className={buttonStyles} onClick={changeAddFilterMode}>
                 <Icon name={'times'} />
               </button>
-            </div>
-          </div>
-        </div>
+            </InlineFormLabel>
+          </Stack>
+        </Stack>
       )}
-      <div className="gf-form gf-form--grow">
-        <div className="gf-form-label gf-form-label--grow"></div>
-      </div>
-    </div>
+      <Stack gap={0} grow={1}>
+        <InlineLabel> </InlineLabel>
+      </Stack>
+    </Stack>
   );
 }
 
diff --git a/public/app/plugins/datasource/opentsdb/components/MetricSection.test.tsx b/public/app/plugins/datasource/opentsdb/components/MetricSection.test.tsx
index 3c40d6a21587b..f95c5b9860fe3 100644
--- a/public/app/plugins/datasource/opentsdb/components/MetricSection.test.tsx
+++ b/public/app/plugins/datasource/opentsdb/components/MetricSection.test.tsx
@@ -16,8 +16,16 @@ const setup = (propOverrides?: Object) => {
     aggregator: 'avg',
     alias: 'alias',
   };
+
+  const varQuery: OpenTsdbQuery = {
+    metric: '$variable',
+    refId: 'A',
+    aggregator: 'avg',
+    alias: 'alias',
+  };
+
   const props: MetricSectionProps = {
-    query,
+    query: !propOverrides ? query : varQuery,
     onChange: onChange,
     onRunQuery: onRunQuery,
     suggestMetrics: suggestMetrics,
@@ -42,6 +50,11 @@ describe('MetricSection', () => {
       setup();
       expect(screen.getByText('cpu')).toBeInTheDocument();
     });
+
+    it('should display variables in the metrics select', () => {
+      setup({ variables: true });
+      expect(screen.getByText('$variable')).toBeInTheDocument();
+    });
   });
 
   describe('metric aggregator', () => {
diff --git a/public/app/plugins/datasource/opentsdb/components/MetricSection.tsx b/public/app/plugins/datasource/opentsdb/components/MetricSection.tsx
index edb3adad01007..a76ff1b4422f7 100644
--- a/public/app/plugins/datasource/opentsdb/components/MetricSection.tsx
+++ b/public/app/plugins/datasource/opentsdb/components/MetricSection.tsx
@@ -2,7 +2,7 @@ import debounce from 'debounce-promise';
 import React from 'react';
 
 import { SelectableValue, toOption } from '@grafana/data';
-import { Select, Input, InlineFormLabel, AsyncSelect } from '@grafana/ui';
+import { Select, Input, InlineFormLabel, AsyncSelect, Stack, InlineLabel } from '@grafana/ui';
 
 import { OpenTsdbQuery } from '../types';
 
@@ -19,8 +19,8 @@ export function MetricSection({ query, onChange, onRunQuery, suggestMetrics, agg
   const metricSearch = debounce((query: string) => suggestMetrics(query), 350);
 
   return (
-    <div className="gf-form-inline" data-testid={testIds.section}>
-      <div className="gf-form">
+    <Stack gap={0.5} alignItems="flex-start" data-testid={testIds.section}>
+      <Stack gap={0}>
         <InlineFormLabel width={8} className="query-keyword">
           Metric
         </InlineFormLabel>
@@ -28,7 +28,6 @@ export function MetricSection({ query, onChange, onRunQuery, suggestMetrics, agg
         <AsyncSelect
           width={25}
           inputId="opentsdb-metric-select"
-          className="gf-form-input"
           value={query.metric ? toOption(query.metric) : undefined}
           placeholder="Metric name"
           allowCustomValue
@@ -41,14 +40,13 @@ export function MetricSection({ query, onChange, onRunQuery, suggestMetrics, agg
             }
           }}
         />
-      </div>
-      <div className="gf-form">
+      </Stack>
+      <Stack gap={0} alignItems="flex-start">
         <InlineFormLabel width={'auto'} className="query-keyword">
           Aggregator
         </InlineFormLabel>
         <Select
           inputId="opentsdb-aggregator-select"
-          className="gf-form-input"
           value={query.aggregator ? toOption(query.aggregator) : undefined}
           options={aggregatorOptions}
           onChange={({ value }) => {
@@ -58,8 +56,8 @@ export function MetricSection({ query, onChange, onRunQuery, suggestMetrics, agg
             }
           }}
         />
-      </div>
-      <div className="gf-form max-width-20">
+      </Stack>
+      <Stack gap={0}>
         <InlineFormLabel
           className="query-keyword"
           width={6}
@@ -77,11 +75,11 @@ export function MetricSection({ query, onChange, onRunQuery, suggestMetrics, agg
           }}
           onBlur={() => onRunQuery()}
         />
-      </div>
-      <div className="gf-form gf-form--grow">
-        <div className="gf-form-label gf-form-label--grow"></div>
-      </div>
-    </div>
+      </Stack>
+      <Stack gap={0} grow={1}>
+        <InlineLabel> </InlineLabel>
+      </Stack>
+    </Stack>
   );
 }
 
diff --git a/public/app/plugins/datasource/opentsdb/components/OpenTsdbQueryEditor.tsx b/public/app/plugins/datasource/opentsdb/components/OpenTsdbQueryEditor.tsx
index ec2518be51005..bdf57dbfbb450 100644
--- a/public/app/plugins/datasource/opentsdb/components/OpenTsdbQueryEditor.tsx
+++ b/public/app/plugins/datasource/opentsdb/components/OpenTsdbQueryEditor.tsx
@@ -2,7 +2,7 @@ import { css } from '@emotion/css';
 import React, { useEffect, useState } from 'react';
 
 import { GrafanaTheme2, QueryEditorProps, textUtil } from '@grafana/data';
-import { useStyles2 } from '@grafana/ui';
+import { useStyles2, Stack } from '@grafana/ui';
 
 import OpenTsDatasource from '../datasource';
 import { OpenTsdbOptions, OpenTsdbQuery } from '../types';
@@ -93,17 +93,26 @@ export function OpenTsdbQueryEditor({
   }
 
   function getTextValues(metrics: Array<{ text: string }>) {
-    return metrics.map((value: { text: string }) => {
+    const variables = datasource.getVariables().map((value) => {
+      return {
+        value: textUtil.escapeHtml(value),
+        description: value,
+      };
+    });
+
+    const values = metrics.map((value: { text: string }) => {
       return {
         value: textUtil.escapeHtml(value.text),
         description: value.text,
       };
     });
+
+    return variables.concat(values);
   }
 
   return (
     <div className={styles.container} data-testid={testIds.editor}>
-      <div className={styles.visualEditor}>
+      <Stack gap={0.5} direction="column" grow={1}>
         <MetricSection
           query={query}
           onChange={onChange}
@@ -138,7 +147,7 @@ export function OpenTsdbQueryEditor({
           tsdbVersion={tsdbVersion}
         />
         <RateSection query={query} onChange={onChange} onRunQuery={onRunQuery} tsdbVersion={tsdbVersion} />
-      </div>
+      </Stack>
     </div>
   );
 }
@@ -148,9 +157,6 @@ function getStyles(theme: GrafanaTheme2) {
     container: css`
       display: flex;
     `,
-    visualEditor: css`
-      flex-grow: 1;
-    `,
     toggleButton: css`
       margin-left: ${theme.spacing(0.5)};
     `,
diff --git a/public/app/plugins/datasource/opentsdb/components/RateSection.tsx b/public/app/plugins/datasource/opentsdb/components/RateSection.tsx
index 868969b39b3f1..e2f9e221eeb5d 100644
--- a/public/app/plugins/datasource/opentsdb/components/RateSection.tsx
+++ b/public/app/plugins/datasource/opentsdb/components/RateSection.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { InlineLabel, Input, InlineFormLabel, InlineSwitch } from '@grafana/ui';
+import { InlineLabel, Input, InlineFormLabel, InlineSwitch, Stack } from '@grafana/ui';
 
 import { OpenTsdbQuery } from '../types';
 
@@ -13,23 +13,22 @@ export interface RateSectionProps {
 
 export function RateSection({ query, onChange, onRunQuery, tsdbVersion }: RateSectionProps) {
   return (
-    <div className="gf-form-inline" data-testid={testIds.section}>
-      <div className="gf-form">
-        <InlineFormLabel className="query-keyword" width={8}>
-          Rate
-        </InlineFormLabel>
-        <InlineSwitch
-          data-testid={testIds.shouldComputeRate}
-          value={query.shouldComputeRate ?? false}
-          onChange={() => {
-            const shouldComputeRate = query.shouldComputeRate ?? false;
-            onChange({ ...query, shouldComputeRate: !shouldComputeRate });
-            onRunQuery();
-          }}
-        />
-      </div>
+    <Stack gap={0} data-testid={testIds.section}>
+      <InlineFormLabel className="query-keyword" width={8}>
+        Rate
+      </InlineFormLabel>
+      <InlineSwitch
+        data-testid={testIds.shouldComputeRate}
+        value={query.shouldComputeRate ?? false}
+        onChange={() => {
+          const shouldComputeRate = query.shouldComputeRate ?? false;
+          onChange({ ...query, shouldComputeRate: !shouldComputeRate });
+          onRunQuery();
+        }}
+      />
+
       {query.shouldComputeRate && (
-        <div className="gf-form">
+        <>
           <InlineFormLabel className="query-keyword" width={'auto'}>
             Counter
           </InlineFormLabel>
@@ -42,10 +41,10 @@ export function RateSection({ query, onChange, onRunQuery, tsdbVersion }: RateSe
               onRunQuery();
             }}
           />
-        </div>
+        </>
       )}
       {query.shouldComputeRate && query.isCounter && (
-        <div className="gf-form">
+        <Stack gap={0}>
           <InlineLabel width={'auto'} className="query-keyword">
             Counter max
           </InlineLabel>
@@ -72,10 +71,10 @@ export function RateSection({ query, onChange, onRunQuery, tsdbVersion }: RateSe
             }}
             onBlur={() => onRunQuery()}
           />
-        </div>
+        </Stack>
       )}
       {tsdbVersion > 2 && (
-        <div className="gf-form">
+        <>
           <InlineFormLabel className="query-keyword" width={'auto'}>
             Explicit tags
           </InlineFormLabel>
@@ -88,12 +87,12 @@ export function RateSection({ query, onChange, onRunQuery, tsdbVersion }: RateSe
               onRunQuery();
             }}
           />
-        </div>
+        </>
       )}
-      <div className="gf-form gf-form--grow">
-        <div className="gf-form-label gf-form-label--grow"></div>
-      </div>
-    </div>
+      <Stack gap={0} grow={1}>
+        <InlineLabel> </InlineLabel>
+      </Stack>
+    </Stack>
   );
 }
 
diff --git a/public/app/plugins/datasource/opentsdb/components/TagSection.tsx b/public/app/plugins/datasource/opentsdb/components/TagSection.tsx
index f292acaa37417..6ffe4b0fc611e 100644
--- a/public/app/plugins/datasource/opentsdb/components/TagSection.tsx
+++ b/public/app/plugins/datasource/opentsdb/components/TagSection.tsx
@@ -3,7 +3,16 @@ import { has, size } from 'lodash';
 import React, { useState } from 'react';
 
 import { SelectableValue, toOption } from '@grafana/data';
-import { Select, InlineFormLabel, Icon, clearButtonStyles, useStyles2, AsyncSelect } from '@grafana/ui';
+import {
+  Select,
+  InlineFormLabel,
+  Icon,
+  clearButtonStyles,
+  useStyles2,
+  AsyncSelect,
+  Stack,
+  InlineLabel,
+} from '@grafana/ui';
 
 import { OpenTsdbQuery } from '../types';
 
@@ -97,47 +106,47 @@ export function TagSection({
   const tagValueSearch = debounce((query: string) => suggestTagValues(query), 350);
 
   return (
-    <div className="gf-form-inline" data-testid={testIds.section}>
-      <div className="gf-form">
-        <InlineFormLabel
-          className="query-keyword"
-          width={8}
-          tooltip={tsdbVersion >= 2 ? <div>Please use filters, tags are deprecated in opentsdb 2.2</div> : undefined}
-        >
-          Tags
-        </InlineFormLabel>
-        {query.tags &&
-          Object.keys(query.tags).map((tagKey: string | number, idx: number) => {
-            const tagValue = query.tags[tagKey];
-            return (
-              <InlineFormLabel key={idx} width="auto" data-testid={testIds.list + idx}>
-                {tagKey}={tagValue}
-                <button type="button" className={buttonStyles} onClick={() => editTag(tagKey, tagValue)}>
-                  <Icon name={'pen'} />
-                </button>
-                <button
-                  type="button"
-                  className={buttonStyles}
-                  onClick={() => removeTag(tagKey)}
-                  data-testid={testIds.remove}
-                >
-                  <Icon name={'times'} />
-                </button>
-              </InlineFormLabel>
-            );
-          })}
-        {!addTagMode && (
-          <button className="gf-form-label" type="button" onClick={changeAddTagMode} aria-label="Add tag">
+    <Stack gap={0} data-testid={testIds.section}>
+      <InlineFormLabel
+        className="query-keyword"
+        width={8}
+        tooltip={tsdbVersion >= 2 ? <div>Please use filters, tags are deprecated in opentsdb 2.2</div> : undefined}
+      >
+        Tags
+      </InlineFormLabel>
+      {query.tags &&
+        Object.keys(query.tags).map((tagKey: string | number, idx: number) => {
+          const tagValue = query.tags[tagKey];
+          return (
+            <InlineFormLabel key={idx} width="auto" data-testid={testIds.list + idx}>
+              {tagKey}={tagValue}
+              <button type="button" className={buttonStyles} onClick={() => editTag(tagKey, tagValue)}>
+                <Icon name={'pen'} />
+              </button>
+              <button
+                type="button"
+                className={buttonStyles}
+                onClick={() => removeTag(tagKey)}
+                data-testid={testIds.remove}
+              >
+                <Icon name={'times'} />
+              </button>
+            </InlineFormLabel>
+          );
+        })}
+      {!addTagMode && (
+        <InlineFormLabel width={2}>
+          <button type="button" className={buttonStyles} onClick={changeAddTagMode} aria-label="Add tag">
             <Icon name={'plus'} />
           </button>
-        )}
-      </div>
+        </InlineFormLabel>
+      )}
+
       {addTagMode && (
-        <div className="gf-form-inline">
-          <div className="gf-form">
+        <Stack gap={0.5} alignItems="center">
+          <Stack gap={0}>
             <Select
               inputId="opentsdb-suggested-tagk-select"
-              className="gf-form-input"
               value={curTagKey ? toOption('' + curTagKey) : undefined}
               placeholder="key"
               allowCustomValue
@@ -156,12 +165,11 @@ export function TagSection({
                 }
               }}
             />
-          </div>
+          </Stack>
 
-          <div className="gf-form">
+          <Stack gap={0}>
             <AsyncSelect
               inputId="opentsdb-suggested-tagv-select"
-              className="gf-form-input"
               value={curTagValue ? toOption(curTagValue) : undefined}
               placeholder="value"
               allowCustomValue
@@ -173,30 +181,30 @@ export function TagSection({
                 }
               }}
             />
-          </div>
+          </Stack>
 
-          <div className="gf-form">
+          <Stack gap={0}>
             {errors && (
-              <div className="gf-form-label" title={errors} data-testid={testIds.error}>
+              <InlineLabel title={errors} data-testid={testIds.error}>
                 <Icon name={'exclamation-triangle'} color={'rgb(229, 189, 28)'} />
-              </div>
+              </InlineLabel>
             )}
 
-            <div className="gf-form-label">
+            <InlineFormLabel width={5.5}>
               <button type="button" className={buttonStyles} onClick={addTag}>
                 add tag
               </button>
               <button type="button" className={buttonStyles} onClick={changeAddTagMode}>
                 <Icon name={'times'} />
               </button>
-            </div>
-          </div>
-        </div>
+            </InlineFormLabel>
+          </Stack>
+        </Stack>
       )}
-      <div className="gf-form gf-form--grow">
-        <div className="gf-form-label gf-form-label--grow"></div>
-      </div>
-    </div>
+      <Stack gap={0} grow={1}>
+        <InlineLabel> </InlineLabel>
+      </Stack>
+    </Stack>
   );
 }
 
diff --git a/public/app/plugins/datasource/opentsdb/datasource.ts b/public/app/plugins/datasource/opentsdb/datasource.ts
index e24677cae61d7..ff07de1c77035 100644
--- a/public/app/plugins/datasource/opentsdb/datasource.ts
+++ b/public/app/plugins/datasource/opentsdb/datasource.ts
@@ -550,6 +550,10 @@ export default class OpenTsDatasource extends DataSourceApi<OpenTsdbQuery, OpenT
     });
   }
 
+  getVariables(): string[] {
+    return this.templateSrv.getVariables().map((v) => `$${v.name}`);
+  }
+
   mapMetricsToTargets(metrics: any, options: any, tsdbVersion: number) {
     let interpolatedTagValue, arrTagV;
     return _map(metrics, (metricData) => {
diff --git a/public/app/plugins/datasource/parca/CHANGELOG.md b/public/app/plugins/datasource/parca/CHANGELOG.md
new file mode 100644
index 0000000000000..825c32f0d03d9
--- /dev/null
+++ b/public/app/plugins/datasource/parca/CHANGELOG.md
@@ -0,0 +1 @@
+# Changelog
diff --git a/public/app/plugins/datasource/parca/ConfigEditor.tsx b/public/app/plugins/datasource/parca/ConfigEditor.tsx
index 0c3f1e9df8adf..b6c694b186c8e 100644
--- a/public/app/plugins/datasource/parca/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/parca/ConfigEditor.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 
 import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
+import { config } from '@grafana/runtime';
 import { DataSourceHttpSettings } from '@grafana/ui';
-import { config } from 'app/core/config';
 
 import { ParcaDataSourceOptions } from './types';
 
diff --git a/public/app/plugins/datasource/parca/QueryEditor/QueryEditor.test.tsx b/public/app/plugins/datasource/parca/QueryEditor/QueryEditor.test.tsx
index 3f4ea1620ab8a..d9bcac8a2f1e8 100644
--- a/public/app/plugins/datasource/parca/QueryEditor/QueryEditor.test.tsx
+++ b/public/app/plugins/datasource/parca/QueryEditor/QueryEditor.test.tsx
@@ -1,8 +1,10 @@
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
+import { of } from 'rxjs';
 
 import { CoreApp, DataSourcePluginMeta, PluginType } from '@grafana/data';
+import { BackendSrv, getBackendSrv, setBackendSrv } from '@grafana/runtime';
 
 import { ParcaDataSource } from '../datasource';
 import { ProfileTypeMessage } from '../types';
@@ -10,13 +12,25 @@ import { ProfileTypeMessage } from '../types';
 import { Props, QueryEditor } from './QueryEditor';
 
 describe('QueryEditor', () => {
+  let origBackendSrv: BackendSrv;
+  const fetchMock = jest.fn().mockReturnValue(of({ data: [] }));
+
+  beforeEach(() => {
+    origBackendSrv = getBackendSrv();
+  });
+
+  afterEach(() => {
+    setBackendSrv(origBackendSrv);
+  });
+
   it('should render without error', async () => {
     setup();
 
-    expect(screen.findByText('process_cpu:cpu')).toBeDefined();
+    expect(await screen.findByText(/process_cpu - cpu/)).toBeDefined();
   });
 
   it('should render options', async () => {
+    setBackendSrv({ ...origBackendSrv, fetch: fetchMock });
     setup();
     await openOptions();
     expect(screen.getByText(/Metric/)).toBeDefined();
@@ -25,6 +39,7 @@ describe('QueryEditor', () => {
   });
 
   it('should render correct options outside of explore', async () => {
+    setBackendSrv({ ...origBackendSrv, fetch: fetchMock });
     setup({ props: { app: CoreApp.Dashboard } });
     await openOptions();
     expect(screen.getByText(/Metric/)).toBeDefined();
diff --git a/public/app/plugins/datasource/parca/QueryEditor/QueryEditor.tsx b/public/app/plugins/datasource/parca/QueryEditor/QueryEditor.tsx
index 561eb26f7473a..d470a5d5e0de4 100644
--- a/public/app/plugins/datasource/parca/QueryEditor/QueryEditor.tsx
+++ b/public/app/plugins/datasource/parca/QueryEditor/QueryEditor.tsx
@@ -5,7 +5,7 @@ import { useMount } from 'react-use';
 import { CoreApp, QueryEditorProps } from '@grafana/data';
 import { ButtonCascader, CascaderOption } from '@grafana/ui';
 
-import { defaultParca, defaultParcaQueryType, Parca } from '../dataquery.gen';
+import { defaultParcaDataQuery, defaultParcaQueryType, ParcaDataQuery as Parca } from '../dataquery.gen';
 import { ParcaDataSource } from '../datasource';
 import { ParcaDataSourceOptions, ProfileTypeMessage, Query } from '../types';
 
@@ -17,7 +17,7 @@ import { QueryOptions } from './QueryOptions';
 export type Props = QueryEditorProps<ParcaDataSource, Query, ParcaDataSourceOptions>;
 
 export const defaultQuery: Partial<Parca> = {
-  ...defaultParca,
+  ...defaultParcaDataQuery,
   queryType: defaultParcaQueryType,
 };
 
diff --git a/public/app/plugins/datasource/parca/README.md b/public/app/plugins/datasource/parca/README.md
new file mode 100644
index 0000000000000..7d89a602dd1b8
--- /dev/null
+++ b/public/app/plugins/datasource/parca/README.md
@@ -0,0 +1,3 @@
+# Grafana Parca data source
+
+Grafana plugin for the Parca data source.
diff --git a/public/app/plugins/datasource/parca/dataquery.gen.ts b/public/app/plugins/datasource/parca/dataquery.gen.ts
index 7542d11ac4482..e39bfa7d76672 100644
--- a/public/app/plugins/datasource/parca/dataquery.gen.ts
+++ b/public/app/plugins/datasource/parca/dataquery.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
@@ -14,7 +14,7 @@ export type ParcaQueryType = ('metrics' | 'profile' | 'both');
 
 export const defaultParcaQueryType: ParcaQueryType = 'both';
 
-export interface Parca extends common.DataQuery {
+export interface ParcaDataQuery extends common.DataQuery {
   /**
    * Specifies the query label selectors.
    */
@@ -25,6 +25,6 @@ export interface Parca extends common.DataQuery {
   profileTypeId: string;
 }
 
-export const defaultParca: Partial<Parca> = {
+export const defaultParcaDataQuery: Partial<ParcaDataQuery> = {
   labelSelector: '{}',
 };
diff --git a/public/app/plugins/datasource/parca/datasource.test.ts b/public/app/plugins/datasource/parca/datasource.test.ts
new file mode 100644
index 0000000000000..1a0a216273fd5
--- /dev/null
+++ b/public/app/plugins/datasource/parca/datasource.test.ts
@@ -0,0 +1,71 @@
+import { DataSourceInstanceSettings, PluginMetaInfo, PluginType } from '@grafana/data';
+import { getTemplateSrv } from '@grafana/runtime';
+
+import { defaultParcaQueryType } from './dataquery.gen';
+import { ParcaDataSource } from './datasource';
+import { Query } from './types';
+
+jest.mock('@grafana/runtime', () => {
+  const actual = jest.requireActual('@grafana/runtime');
+  return {
+    ...actual,
+    getTemplateSrv: () => {
+      return {
+        replace: (query: string): string => {
+          return query.replace(/\$var/g, 'interpolated');
+        },
+      };
+    },
+  };
+});
+
+describe('Parca data source', () => {
+  let ds: ParcaDataSource;
+  beforeEach(() => {
+    ds = new ParcaDataSource(defaultSettings);
+  });
+
+  describe('applyTemplateVariables', () => {
+    const templateSrv = getTemplateSrv();
+
+    it('should not update labelSelector if there are no template variables', () => {
+      ds = new ParcaDataSource(defaultSettings, templateSrv);
+      const query = ds.applyTemplateVariables(defaultQuery({ labelSelector: `no var` }), {});
+      expect(query).toMatchObject({ labelSelector: `no var` });
+    });
+
+    it('should update labelSelector if there are template variables', () => {
+      ds = new ParcaDataSource(defaultSettings, templateSrv);
+      const query = ds.applyTemplateVariables(defaultQuery({ labelSelector: `{$var="$var"}` }), {});
+      expect(query).toMatchObject({ labelSelector: `{interpolated="interpolated"}` });
+    });
+  });
+});
+
+const defaultSettings: DataSourceInstanceSettings = {
+  id: 0,
+  uid: 'parca',
+  type: 'profiling',
+  name: 'parca',
+  access: 'proxy',
+  meta: {
+    id: 'parca',
+    name: 'parca',
+    type: PluginType.datasource,
+    info: {} as PluginMetaInfo,
+    module: '',
+    baseUrl: '',
+  },
+  jsonData: {},
+  readOnly: false,
+};
+
+const defaultQuery = (query: Partial<Query>): Query => {
+  return {
+    refId: 'x',
+    labelSelector: '',
+    profileTypeId: '',
+    queryType: defaultParcaQueryType,
+    ...query,
+  };
+};
diff --git a/public/app/plugins/datasource/parca/datasource.ts b/public/app/plugins/datasource/parca/datasource.ts
index 6418e15d6d3ca..128e7c91d9f89 100644
--- a/public/app/plugins/datasource/parca/datasource.ts
+++ b/public/app/plugins/datasource/parca/datasource.ts
@@ -1,12 +1,15 @@
 import { Observable, of } from 'rxjs';
 
-import { DataQueryRequest, DataQueryResponse, DataSourceInstanceSettings } from '@grafana/data';
-import { DataSourceWithBackend } from '@grafana/runtime';
+import { DataQueryRequest, DataQueryResponse, DataSourceInstanceSettings, ScopedVars } from '@grafana/data';
+import { DataSourceWithBackend, getTemplateSrv, TemplateSrv } from '@grafana/runtime';
 
 import { ParcaDataSourceOptions, Query, ProfileTypeMessage } from './types';
 
 export class ParcaDataSource extends DataSourceWithBackend<Query, ParcaDataSourceOptions> {
-  constructor(instanceSettings: DataSourceInstanceSettings<ParcaDataSourceOptions>) {
+  constructor(
+    instanceSettings: DataSourceInstanceSettings<ParcaDataSourceOptions>,
+    private readonly templateSrv: TemplateSrv = getTemplateSrv()
+  ) {
     super(instanceSettings);
   }
 
@@ -19,6 +22,13 @@ export class ParcaDataSource extends DataSourceWithBackend<Query, ParcaDataSourc
     return super.query(request);
   }
 
+  applyTemplateVariables(query: Query, scopedVars: ScopedVars): Query {
+    return {
+      ...query,
+      labelSelector: this.templateSrv.replace(query.labelSelector ?? '', scopedVars),
+    };
+  }
+
   async getProfileTypes(): Promise<ProfileTypeMessage[]> {
     return await super.getResource('profileTypes');
   }
diff --git a/public/app/plugins/datasource/parca/package.json b/public/app/plugins/datasource/parca/package.json
new file mode 100644
index 0000000000000..978dfc23c51e9
--- /dev/null
+++ b/public/app/plugins/datasource/parca/package.json
@@ -0,0 +1,37 @@
+{
+  "name": "@grafana-plugins/parca",
+  "description": "Continuous profiling for analysis of CPU and memory usage, down to the line number and throughout time. Saving infrastructure cost, improving performance, and increasing reliability.",
+  "private": true,
+  "version": "11.0.0",
+  "dependencies": {
+    "@emotion/css": "11.11.2",
+    "@grafana/data": "11.0.0",
+    "@grafana/runtime": "11.0.0",
+    "@grafana/schema": "11.0.0",
+    "@grafana/ui": "11.0.0",
+    "lodash": "4.17.21",
+    "monaco-editor": "0.34.0",
+    "react": "18.2.0",
+    "react-use": "17.5.0",
+    "rxjs": "7.8.1",
+    "tslib": "2.6.2"
+  },
+  "devDependencies": {
+    "@grafana/plugin-configs": "11.0.0",
+    "@testing-library/react": "14.2.2",
+    "@testing-library/user-event": "14.5.2",
+    "@types/lodash": "4.17.0",
+    "@types/react": "18.2.73",
+    "ts-node": "10.9.2",
+    "webpack": "5.91.0"
+  },
+  "peerDependencies": {
+    "@grafana/runtime": "*"
+  },
+  "scripts": {
+    "build": "webpack -c ./webpack.config.ts --env production",
+    "build:commit": "webpack -c ./webpack.config.ts --env production --env commit=$(git rev-parse --short HEAD)",
+    "dev": "webpack -w -c ./webpack.config.ts --env development"
+  },
+  "packageManager": "yarn@4.1.0"
+}
diff --git a/public/app/plugins/datasource/parca/plugin.json b/public/app/plugins/datasource/parca/plugin.json
index 53b9bfce546c0..99c9c47e03142 100644
--- a/public/app/plugins/datasource/parca/plugin.json
+++ b/public/app/plugins/datasource/parca/plugin.json
@@ -2,6 +2,7 @@
   "type": "datasource",
   "name": "Parca",
   "id": "parca",
+  "executable": "gpx_parca",
   "category": "profiling",
   "metrics": true,
   "backend": true,
@@ -21,6 +22,10 @@
         "name": "GitHub Project",
         "url": "https://github.com/parca-dev/parca"
       }
-    ]
+    ],
+    "version": "%VERSION%"
+  },
+  "dependencies": {
+    "grafanaDependency": ">=10.3.0-0"
   }
 }
diff --git a/public/app/plugins/datasource/parca/tsconfig.json b/public/app/plugins/datasource/parca/tsconfig.json
new file mode 100644
index 0000000000000..7daf2ee8abab6
--- /dev/null
+++ b/public/app/plugins/datasource/parca/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "@grafana/plugin-configs/tsconfig.json",
+  "include": ["."]
+}
diff --git a/public/app/plugins/datasource/parca/types.ts b/public/app/plugins/datasource/parca/types.ts
index 4c039b5fdbb9e..c149c9ef5f38d 100644
--- a/public/app/plugins/datasource/parca/types.ts
+++ b/public/app/plugins/datasource/parca/types.ts
@@ -1,6 +1,6 @@
 import { DataSourceJsonData } from '@grafana/data';
 
-import { Parca as ParcaBase, ParcaQueryType } from './dataquery.gen';
+import { ParcaDataQuery as ParcaBase, ParcaQueryType } from './dataquery.gen';
 
 export interface Query extends ParcaBase {
   queryType: ParcaQueryType;
diff --git a/public/app/plugins/datasource/parca/webpack.config.ts b/public/app/plugins/datasource/parca/webpack.config.ts
new file mode 100644
index 0000000000000..4da5a990cfa57
--- /dev/null
+++ b/public/app/plugins/datasource/parca/webpack.config.ts
@@ -0,0 +1,3 @@
+import config from '@grafana/plugin-configs/webpack.config';
+
+export default config;
diff --git a/public/app/plugins/datasource/postgres/PostgresQueryEditor.tsx b/public/app/plugins/datasource/postgres/PostgresQueryEditor.tsx
deleted file mode 100644
index 18358305450bd..0000000000000
--- a/public/app/plugins/datasource/postgres/PostgresQueryEditor.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from 'react';
-
-import { QueryEditorProps } from '@grafana/data';
-import { SqlQueryEditor } from 'app/features/plugins/sql/components/QueryEditor';
-import { SQLOptions, SQLQuery } from 'app/features/plugins/sql/types';
-
-import { PostgresDatasource } from './datasource';
-
-const queryHeaderProps = { isPostgresInstance: true };
-
-export function PostgresQueryEditor(props: QueryEditorProps<PostgresDatasource, SQLQuery, SQLOptions>) {
-  return <SqlQueryEditor {...props} queryHeaderProps={queryHeaderProps} />;
-}
diff --git a/public/app/plugins/datasource/postgres/datasource.test.ts b/public/app/plugins/datasource/postgres/datasource.test.ts
deleted file mode 100644
index f5379945829e4..0000000000000
--- a/public/app/plugins/datasource/postgres/datasource.test.ts
+++ /dev/null
@@ -1,846 +0,0 @@
-import { Observable, of } from 'rxjs';
-import { TestScheduler } from 'rxjs/testing';
-
-import {
-  getDefaultTimeRange,
-  dataFrameToJSON,
-  DataQueryRequest,
-  DataQueryResponse,
-  DataSourceInstanceSettings,
-  dateTime,
-  FieldType,
-  LoadingState,
-  createDataFrame,
-} from '@grafana/data';
-import {
-  BackendSrv,
-  DataSourceSrv,
-  FetchResponse,
-  getBackendSrv,
-  setBackendSrv,
-  getDataSourceSrv,
-  setDataSourceSrv,
-} from '@grafana/runtime';
-import { QueryFormat, SQLQuery } from 'app/features/plugins/sql/types';
-import { makeVariable } from 'app/features/plugins/sql/utils/testHelpers';
-
-import { PostgresDatasource } from './datasource';
-import { PostgresOptions } from './types';
-
-const backendSrv: BackendSrv = {
-  // this will get mocked below, it only needs to exist
-  fetch: () => undefined,
-} as unknown as BackendSrv; // we cast it so that we do not have to implement all the methods
-
-// we type this as `any` to not have to define the whole type
-const fakeDataSourceSrv: DataSourceSrv = {
-  getInstanceSettings: () => ({ id: 8674 }),
-} as unknown as DataSourceSrv;
-
-let origBackendSrv: BackendSrv;
-let origDataSourceSrv: DataSourceSrv;
-beforeAll(() => {
-  origBackendSrv = getBackendSrv();
-  origDataSourceSrv = getDataSourceSrv();
-  setBackendSrv(backendSrv);
-  setDataSourceSrv(fakeDataSourceSrv);
-});
-
-afterAll(() => {
-  setBackendSrv(origBackendSrv);
-  setDataSourceSrv(origDataSourceSrv);
-});
-
-describe('PostgreSQLDatasource', () => {
-  const defaultRange = getDefaultTimeRange(); // it does not matter what value this has
-  const fetchMock = jest.spyOn(backendSrv, 'fetch');
-  const setupTestContext = (data: unknown, mock?: Observable<FetchResponse<unknown>>, templateSrv?: unknown) => {
-    jest.clearAllMocks();
-    const defaultMock = () => mock ?? of(createFetchResponse(data));
-    fetchMock.mockImplementation(defaultMock);
-    const instanceSettings = {
-      jsonData: {
-        defaultProject: 'testproject',
-      },
-    } as unknown as DataSourceInstanceSettings<PostgresOptions>;
-    const variable = makeVariable('id1', 'name1');
-    const ds = new PostgresDatasource(instanceSettings);
-    if (templateSrv !== undefined) {
-      Reflect.set(ds, 'templateSrv', templateSrv);
-    }
-    return { ds, variable };
-  };
-
-  // https://rxjs-dev.firebaseapp.com/guide/testing/marble-testing
-  const runMarbleTest = (args: {
-    options: DataQueryRequest<SQLQuery>;
-    values: { [marble: string]: FetchResponse };
-    marble: string;
-    expectedValues: { [marble: string]: DataQueryResponse };
-    expectedMarble: string;
-  }) => {
-    const { expectedValues, expectedMarble, options, values, marble } = args;
-    const scheduler: TestScheduler = new TestScheduler((actual, expected) => {
-      expect(actual).toEqual(expected);
-    });
-
-    const { ds } = setupTestContext({});
-
-    scheduler.run(({ cold, expectObservable }) => {
-      const source = cold(marble, values);
-      jest.clearAllMocks();
-      fetchMock.mockImplementation(() => source);
-
-      const result = ds.query(options);
-      expectObservable(result).toBe(expectedMarble, expectedValues);
-    });
-  };
-
-  const simpleTemplateSrv = {
-    replace: (text: string) => text,
-  };
-
-  describe('When performing a time series query', () => {
-    it('should transform response correctly', () => {
-      const options: DataQueryRequest<SQLQuery> = {
-        range: {
-          from: dateTime(1432288354),
-          to: dateTime(1432288401),
-          raw: {
-            from: 'now-24h',
-            to: 'now',
-          },
-        },
-        targets: [
-          {
-            format: QueryFormat.Timeseries,
-            rawQuery: true,
-            rawSql: 'select time, metric from grafana_metric',
-            refId: 'A',
-            datasource: { type: 'gdev-ds', uid: 'gdev-ds' },
-          },
-        ],
-        requestId: 'test',
-        interval: '1m',
-        intervalMs: 60000,
-        scopedVars: {},
-        timezone: 'Etc/UTC',
-        app: 'Grafana',
-        startTime: 1432288354,
-      };
-      const response = {
-        results: {
-          A: {
-            refId: 'A',
-            frames: [
-              dataFrameToJSON(
-                createDataFrame({
-                  fields: [
-                    { name: 'time', values: [1599643351085] },
-                    { name: 'metric', values: [30.226249741223704], labels: { metric: 'America' } },
-                  ],
-                  meta: {
-                    executedQueryString: 'select time, metric from grafana_metric',
-                  },
-                })
-              ),
-            ],
-          },
-        },
-      };
-
-      const values = { a: createFetchResponse(response) };
-      const marble = '-a|';
-      const expectedMarble = '-a|';
-      const expectedValues: { a: DataQueryResponse } = {
-        a: {
-          data: [
-            {
-              fields: [
-                {
-                  config: {},
-                  entities: {},
-                  name: 'time',
-                  type: 'time',
-                  values: [1599643351085],
-                },
-                {
-                  config: {},
-                  entities: {},
-                  labels: {
-                    metric: 'America',
-                  },
-                  name: 'metric',
-                  type: 'number',
-                  values: [30.226249741223704],
-                },
-              ],
-              length: 1,
-              meta: {
-                executedQueryString: 'select time, metric from grafana_metric',
-              },
-              name: undefined,
-              refId: 'A',
-            },
-          ],
-          state: LoadingState.Done,
-        },
-      };
-
-      runMarbleTest({ options, marble, values, expectedMarble, expectedValues });
-    });
-  });
-
-  describe('When performing a table query', () => {
-    it('should transform response correctly', () => {
-      const options: DataQueryRequest<SQLQuery> = {
-        range: {
-          from: dateTime(1432288354),
-          to: dateTime(1432288401),
-          raw: {
-            from: 'now-24h',
-            to: 'now',
-          },
-        },
-        targets: [
-          {
-            format: QueryFormat.Table,
-            rawQuery: true,
-            rawSql: 'select time, metric, value from grafana_metric',
-            refId: 'A',
-            datasource: { type: 'gdev-ds', uid: 'gdev-ds' },
-          },
-        ],
-        requestId: 'test',
-        interval: '1m',
-        intervalMs: 60000,
-        scopedVars: {},
-        timezone: 'Etc/UTC',
-        app: 'Grafana',
-        startTime: 1432288354,
-      };
-      const response = {
-        results: {
-          A: {
-            refId: 'A',
-            frames: [
-              dataFrameToJSON(
-                createDataFrame({
-                  fields: [
-                    { name: 'time', values: [1599643351085] },
-                    { name: 'metric', values: ['America'] },
-                    { name: 'value', values: [30.226249741223704] },
-                  ],
-                  meta: {
-                    executedQueryString: 'select time, metric, value from grafana_metric',
-                  },
-                })
-              ),
-            ],
-          },
-        },
-      };
-
-      const values = { a: createFetchResponse(response) };
-      const marble = '-a|';
-      const expectedMarble = '-a|';
-      const expectedValues: { a: DataQueryResponse } = {
-        a: {
-          data: [
-            {
-              fields: [
-                {
-                  config: {},
-                  entities: {},
-                  name: 'time',
-                  type: 'time',
-                  values: [1599643351085],
-                },
-                {
-                  config: {},
-                  entities: {},
-                  name: 'metric',
-                  type: 'string',
-                  values: ['America'],
-                },
-                {
-                  config: {},
-                  entities: {},
-                  name: 'value',
-                  type: 'number',
-                  values: [30.226249741223704],
-                },
-              ],
-              length: 1,
-              meta: {
-                executedQueryString: 'select time, metric, value from grafana_metric',
-              },
-              name: undefined,
-              refId: 'A',
-            },
-          ],
-          state: LoadingState.Done,
-        },
-      };
-
-      runMarbleTest({ options, marble, values, expectedMarble, expectedValues });
-    });
-  });
-
-  describe('When performing a query with hidden target', () => {
-    it('should return empty result and backendSrv.fetch should not be called', async () => {
-      const options = {
-        range: {
-          from: dateTime(1432288354),
-          to: dateTime(1432288401),
-        },
-        targets: [
-          {
-            format: 'table',
-            rawQuery: true,
-            rawSql: 'select time, metric, value from grafana_metric',
-            refId: 'A',
-            datasource: 'gdev-ds',
-            hide: true,
-          },
-        ],
-      } as unknown as DataQueryRequest<SQLQuery>;
-
-      const { ds } = setupTestContext({});
-
-      await expect(ds.query(options)).toEmitValuesWith((received) => {
-        expect(received[0]).toEqual({ data: [] });
-        expect(fetchMock).not.toHaveBeenCalled();
-      });
-    });
-  });
-
-  describe('When runSql returns an empty dataframe', () => {
-    const response = {
-      results: {
-        tempvar: {
-          refId: 'tempvar',
-          frames: [],
-        },
-      },
-    };
-
-    it('should return an empty array when metricFindQuery is called', async () => {
-      const ds = setupTestContext(response, undefined, simpleTemplateSrv).ds;
-      const query = 'select * from atable';
-      const results = await ds.metricFindQuery(query, { range: defaultRange });
-      expect(results.length).toBe(0);
-    });
-
-    it('should return an empty array when fetchTables is called', async () => {
-      const ds = setupTestContext(response).ds;
-      const results = await ds.fetchTables();
-      expect(results.length).toBe(0);
-    });
-
-    it('should return empty string when getVersion is called', async () => {
-      const ds = setupTestContext(response).ds;
-      const results = await ds.getVersion();
-      expect(results).toBe('');
-    });
-
-    it('should return undefined when getTimescaleDBVersion is called', async () => {
-      const ds = setupTestContext(response).ds;
-      const results = await ds.getTimescaleDBVersion();
-      expect(results).toBe(undefined);
-    });
-
-    it('should return an empty array when fetchFields is called', async () => {
-      const ds = setupTestContext(response).ds;
-      const query: SQLQuery = {
-        refId: 'refId',
-        table: 'schema.table',
-        dataset: 'dataset',
-      };
-      const results = await ds.fetchFields(query);
-      expect(results.length).toBe(0);
-    });
-  });
-
-  describe('When runSql returns a populated dataframe', () => {
-    it('should return a list of tables when fetchTables is called', async () => {
-      const fetchTableResponse = {
-        results: {
-          tables: {
-            refId: 'tables',
-            frames: [
-              dataFrameToJSON(
-                createDataFrame({
-                  fields: [{ name: 'table', type: FieldType.string, values: ['test1', 'test2', 'test3'] }],
-                })
-              ),
-            ],
-          },
-        },
-      };
-
-      const { ds } = setupTestContext(fetchTableResponse);
-
-      const results = await ds.fetchTables();
-      expect(results.length).toBe(3);
-      expect(results).toEqual(['test1', 'test2', 'test3']);
-    });
-
-    it('should return a version string when getVersion is called', async () => {
-      const fetchVersionResponse = {
-        results: {
-          meta: {
-            refId: 'meta',
-            frames: [
-              dataFrameToJSON(
-                createDataFrame({
-                  fields: [{ name: 'version', type: FieldType.string, values: ['test1'] }],
-                })
-              ),
-            ],
-          },
-        },
-      };
-
-      const { ds } = setupTestContext(fetchVersionResponse);
-
-      const version = await ds.getVersion();
-      expect(version).toBe('test1');
-    });
-
-    it('should return a version string when getTimescaleDBVersion is called', async () => {
-      const fetchVersionResponse = {
-        results: {
-          meta: {
-            refId: 'meta',
-            frames: [
-              dataFrameToJSON(
-                createDataFrame({
-                  fields: [{ name: 'extversion', type: FieldType.string, values: ['test1'] }],
-                })
-              ),
-            ],
-          },
-        },
-      };
-
-      const { ds } = setupTestContext(fetchVersionResponse);
-
-      const version = await ds.getTimescaleDBVersion();
-      expect(version).toBe('test1');
-    });
-
-    it('should return a list of fields when fetchFields is called', async () => {
-      const fetchFieldsResponse = {
-        results: {
-          columns: {
-            refId: 'columns',
-            frames: [
-              dataFrameToJSON(
-                createDataFrame({
-                  fields: [
-                    { name: 'column', type: FieldType.string, values: ['test1', 'test2', 'test3'] },
-                    { name: 'type', type: FieldType.string, values: ['int', 'char', 'bool'] },
-                  ],
-                })
-              ),
-            ],
-          },
-        },
-      };
-
-      const { ds } = setupTestContext(fetchFieldsResponse);
-
-      const sqlQuery: SQLQuery = {
-        refId: 'fields',
-        table: 'table',
-        dataset: 'dataset',
-      };
-      const results = await ds.fetchFields(sqlQuery);
-      expect(results.length).toBe(3);
-      expect(results[0].label).toBe('test1');
-      expect(results[0].value).toBe('test1');
-      expect(results[0].type).toBe('int');
-      expect(results[1].label).toBe('test2');
-      expect(results[1].value).toBe('test2');
-      expect(results[1].type).toBe('char');
-      expect(results[2].label).toBe('test3');
-      expect(results[2].value).toBe('test3');
-      expect(results[2].type).toBe('bool');
-    });
-  });
-
-  describe('When performing metricFindQuery that returns multiple string fields', () => {
-    it('should return list of all string field values', async () => {
-      const query = 'select * from atable';
-      const response = {
-        results: {
-          tempvar: {
-            refId: 'tempvar',
-            frames: [
-              dataFrameToJSON(
-                createDataFrame({
-                  fields: [
-                    { name: 'title', values: ['aTitle', 'aTitle2', 'aTitle3'] },
-                    { name: 'text', values: ['some text', 'some text2', 'some text3'] },
-                  ],
-                  meta: {
-                    executedQueryString: 'select * from atable',
-                  },
-                })
-              ),
-            ],
-          },
-        },
-      };
-
-      const { ds } = setupTestContext(response, undefined, simpleTemplateSrv);
-      const results = await ds.metricFindQuery(query, { range: defaultRange });
-
-      expect(results.length).toBe(6);
-      expect(results[0].text).toBe('aTitle');
-      expect(results[5].text).toBe('some text3');
-    });
-  });
-
-  describe('When performing metricFindQuery with $__searchFilter and a searchFilter is given', () => {
-    it('should return list of all column values', async () => {
-      const query = "select title from atable where title LIKE '$__searchFilter'";
-      const response = {
-        results: {
-          tempvar: {
-            refId: 'tempvar',
-            frames: [
-              dataFrameToJSON(
-                createDataFrame({
-                  fields: [
-                    { name: 'title', values: ['aTitle', 'aTitle2', 'aTitle3'] },
-                    { name: 'text', values: ['some text', 'some text2', 'some text3'] },
-                  ],
-                  meta: {
-                    executedQueryString: 'select * from atable',
-                  },
-                })
-              ),
-            ],
-          },
-        },
-      };
-
-      const templateSrv = {
-        replace: (text: string, scopedVars: unknown) => {
-          expect(text).toBe("select title from atable where title LIKE '$__searchFilter'");
-          expect(scopedVars).toStrictEqual({
-            __searchFilter: {
-              value: 'aTit%',
-              text: '',
-            },
-          });
-          return "select title from atable where title LIKE 'aTit%'";
-        },
-      };
-
-      const { ds } = setupTestContext(response, undefined, templateSrv);
-      const results = await ds.metricFindQuery(query, { range: defaultRange, searchFilter: 'aTit' });
-
-      expect(fetchMock).toBeCalledTimes(1);
-      expect(fetchMock.mock.calls[0][0].data.queries[0].rawSql).toBe(
-        "select title from atable where title LIKE 'aTit%'"
-      );
-      expect(results).toEqual([
-        { text: 'aTitle' },
-        { text: 'aTitle2' },
-        { text: 'aTitle3' },
-        { text: 'some text' },
-        { text: 'some text2' },
-        { text: 'some text3' },
-      ]);
-    });
-  });
-
-  describe('When performing metricFindQuery with $__searchFilter but no searchFilter is given', () => {
-    it('should return list of all column values', async () => {
-      const query = "select title from atable where title LIKE '$__searchFilter'";
-      const response = {
-        results: {
-          tempvar: {
-            refId: 'tempvar',
-            frames: [
-              dataFrameToJSON(
-                createDataFrame({
-                  fields: [
-                    { name: 'title', values: ['aTitle', 'aTitle2', 'aTitle3'] },
-                    { name: 'text', values: ['some text', 'some text2', 'some text3'] },
-                  ],
-                  meta: {
-                    executedQueryString: 'select * from atable',
-                  },
-                })
-              ),
-            ],
-          },
-        },
-      };
-
-      const templateSrv = {
-        replace: (text: string, scopedVars: unknown) => {
-          expect(text).toBe("select title from atable where title LIKE '$__searchFilter'");
-          expect(scopedVars).toStrictEqual({
-            __searchFilter: {
-              value: '%',
-              text: '',
-            },
-          });
-          return "select title from atable where title LIKE '%'";
-        },
-      };
-
-      const { ds } = setupTestContext(response, undefined, templateSrv);
-      const results = await ds.metricFindQuery(query, { range: defaultRange });
-
-      expect(fetchMock).toBeCalledTimes(1);
-      expect(fetchMock.mock.calls[0][0].data.queries[0].rawSql).toBe("select title from atable where title LIKE '%'");
-      expect(results).toEqual([
-        { text: 'aTitle' },
-        { text: 'aTitle2' },
-        { text: 'aTitle3' },
-        { text: 'some text' },
-        { text: 'some text2' },
-        { text: 'some text3' },
-      ]);
-    });
-  });
-
-  describe('When performing metricFindQuery with key, value columns', () => {
-    it('should return list of as text, value', async () => {
-      const query = 'select * from atable';
-      const response = {
-        results: {
-          tempvar: {
-            refId: 'tempvar',
-            frames: [
-              dataFrameToJSON(
-                createDataFrame({
-                  fields: [
-                    { name: '__value', values: ['value1', 'value2', 'value3'] },
-                    { name: '__text', values: ['aTitle', 'aTitle2', 'aTitle3'] },
-                  ],
-                  meta: {
-                    executedQueryString: 'select * from atable',
-                  },
-                })
-              ),
-            ],
-          },
-        },
-      };
-      const { ds } = setupTestContext(response, undefined, simpleTemplateSrv);
-      const results = await ds.metricFindQuery(query, { range: defaultRange });
-
-      expect(results).toEqual([
-        { text: 'aTitle', value: 'value1' },
-        { text: 'aTitle2', value: 'value2' },
-        { text: 'aTitle3', value: 'value3' },
-      ]);
-    });
-  });
-
-  describe('When performing metricFindQuery without key, value columns', () => {
-    it('should return list of all field values as text', async () => {
-      const query = 'select id, values from atable';
-      const response = {
-        results: {
-          tempvar: {
-            refId: 'tempvar',
-            frames: [
-              dataFrameToJSON(
-                createDataFrame({
-                  fields: [
-                    { name: 'id', values: [1, 2, 3] },
-                    { name: 'values', values: ['test1', 'test2', 'test3'] },
-                  ],
-                  meta: {
-                    executedQueryString: 'select id, values from atable',
-                  },
-                })
-              ),
-            ],
-          },
-        },
-      };
-      const { ds } = setupTestContext(response, undefined, simpleTemplateSrv);
-      const results = await ds.metricFindQuery(query, { range: defaultRange });
-
-      expect(results).toEqual([
-        { text: 1 },
-        { text: 2 },
-        { text: 3 },
-        { text: 'test1' },
-        { text: 'test2' },
-        { text: 'test3' },
-      ]);
-    });
-  });
-
-  describe('When performing metricFindQuery with key, value columns and with duplicate keys', () => {
-    it('should return list of unique keys', async () => {
-      const query = 'select * from atable';
-      const response = {
-        results: {
-          tempvar: {
-            refId: 'tempvar',
-            frames: [
-              dataFrameToJSON(
-                createDataFrame({
-                  fields: [
-                    { name: '__text', values: ['aTitle', 'aTitle', 'aTitle'] },
-                    { name: '__value', values: ['same', 'same', 'diff'] },
-                  ],
-                  meta: {
-                    executedQueryString: 'select * from atable',
-                  },
-                })
-              ),
-            ],
-          },
-        },
-      };
-      const { ds } = setupTestContext(response, undefined, simpleTemplateSrv);
-      const results = await ds.metricFindQuery(query, { range: defaultRange });
-
-      expect(results).toEqual([{ text: 'aTitle', value: 'same' }]);
-    });
-  });
-
-  describe('When interpolating variables', () => {
-    describe('and value is a string', () => {
-      it('should return an unquoted value', () => {
-        const { ds, variable } = setupTestContext({});
-        expect(ds.interpolateVariable('abc', variable)).toEqual('abc');
-      });
-    });
-
-    describe('and value is a number', () => {
-      it('should return an unquoted value', () => {
-        const { ds, variable } = setupTestContext({});
-        expect(ds.interpolateVariable(1000 as unknown as string, variable)).toEqual(1000);
-      });
-    });
-
-    describe('and value is an array of strings', () => {
-      it('should return comma separated quoted values', () => {
-        const { ds, variable } = setupTestContext({});
-        expect(ds.interpolateVariable(['a', 'b', 'c'], variable)).toEqual("'a','b','c'");
-      });
-    });
-
-    describe('and variable allows multi-value and is a string', () => {
-      it('should return a quoted value', () => {
-        const { ds, variable } = setupTestContext({});
-        variable.multi = true;
-        expect(ds.interpolateVariable('abc', variable)).toEqual("'abc'");
-      });
-    });
-
-    describe('and variable contains single quote', () => {
-      it('should return a quoted value', () => {
-        const { ds, variable } = setupTestContext({});
-        variable.multi = true;
-        expect(ds.interpolateVariable("a'bc", variable)).toEqual("'a''bc'");
-        expect(ds.interpolateVariable("a'b'c", variable)).toEqual("'a''b''c'");
-      });
-    });
-
-    describe('and variable allows all and is a string', () => {
-      it('should return a quoted value', () => {
-        const { ds, variable } = setupTestContext({});
-        variable.includeAll = true;
-        expect(ds.interpolateVariable('abc', variable)).toEqual("'abc'");
-      });
-    });
-  });
-
-  describe('targetContainsTemplate', () => {
-    it('given query that contains template variable it should return true', () => {
-      const rawSql = `SELECT
-      $__timeGroup("createdAt",'$summarize'),
-      avg(value) as "value",
-      hostname as "metric"
-    FROM
-      grafana_metric
-    WHERE
-      $__timeFilter("createdAt") AND
-      measurement = 'logins.count' AND
-      hostname IN($host)
-    GROUP BY time, metric
-    ORDER BY time`;
-      const query: SQLQuery = {
-        rawSql,
-        refId: 'A',
-        rawQuery: true,
-      };
-
-      // a fake template server:
-      // it assumes there are two template variables defined:
-      // - summarize
-      // - host
-      const templateSrv = {
-        containsTemplate: (text: string) => {
-          // when the text arrives here, it has been already pre-processed
-          // by the sql datasource, sql-specific variables have been removed
-          expect(text).toBe(rawSql.replace(/\$__time(Filter)?/g, ''));
-          return true;
-        },
-      };
-      const { ds } = setupTestContext({}, undefined, templateSrv);
-
-      expect(ds.targetContainsTemplate(query)).toBeTruthy();
-    });
-
-    it('given query that only contains global template variable it should return false', () => {
-      const rawSql = `SELECT
-      $__timeGroup("createdAt",'$__interval'),
-      avg(value) as "value",
-      hostname as "metric"
-    FROM
-      grafana_metric
-    WHERE
-      $__timeFilter("createdAt") AND
-      measurement = 'logins.count'
-    GROUP BY time, metric
-    ORDER BY time`;
-      const query: SQLQuery = {
-        rawSql,
-        refId: 'A',
-        rawQuery: true,
-      };
-      // a fake template server:
-      // it assumes there are two template variables defined:
-      // - summarize
-      // - host
-      const templateSrv = {
-        containsTemplate: (text: string) => {
-          // when the text arrives here, it has been already pre-processed
-          // by the sql datasource, sql-specific variables has been removed
-          expect(text).toBe(rawSql.replace(/\$__time(Filter)?/g, ''));
-          return false;
-        },
-      };
-      const { ds } = setupTestContext({}, undefined, templateSrv);
-
-      expect(ds.targetContainsTemplate(query)).toBeFalsy();
-    });
-  });
-});
-
-const createFetchResponse = <T>(data: T): FetchResponse<T> => ({
-  data,
-  status: 200,
-  url: 'http://localhost:3000/api/query',
-  config: { url: 'http://localhost:3000/api/query' },
-  type: 'basic',
-  statusText: 'Ok',
-  redirected: false,
-  headers: {} as unknown as Headers,
-  ok: true,
-});
diff --git a/public/app/plugins/datasource/postgres/datasource.ts b/public/app/plugins/datasource/postgres/datasource.ts
deleted file mode 100644
index 173c17fd7d8e2..0000000000000
--- a/public/app/plugins/datasource/postgres/datasource.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import { DataSourceInstanceSettings, ScopedVars } from '@grafana/data';
-import { LanguageDefinition } from '@grafana/experimental';
-import { TemplateSrv } from '@grafana/runtime';
-import { SqlDatasource } from 'app/features/plugins/sql/datasource/SqlDatasource';
-import { DB, SQLQuery, SQLSelectableValue } from 'app/features/plugins/sql/types';
-import { formatSQL } from 'app/features/plugins/sql/utils/formatSQL';
-
-import { PostgresQueryModel } from './PostgresQueryModel';
-import { getSchema, getTimescaleDBVersion, getVersion, showTables } from './postgresMetaQuery';
-import { fetchColumns, fetchTables, getSqlCompletionProvider } from './sqlCompletionProvider';
-import { getFieldConfig, toRawSql } from './sqlUtil';
-import { PostgresOptions } from './types';
-
-export class PostgresDatasource extends SqlDatasource {
-  sqlLanguageDefinition: LanguageDefinition | undefined = undefined;
-
-  constructor(instanceSettings: DataSourceInstanceSettings<PostgresOptions>) {
-    super(instanceSettings);
-  }
-
-  getQueryModel(target?: SQLQuery, templateSrv?: TemplateSrv, scopedVars?: ScopedVars): PostgresQueryModel {
-    return new PostgresQueryModel(target, templateSrv, scopedVars);
-  }
-
-  async getVersion(): Promise<string> {
-    const value = await this.runSql<{ version: number }>(getVersion());
-    const results = value.fields.version?.values;
-
-    if (!results) {
-      return '';
-    }
-
-    return results[0].toString();
-  }
-
-  async getTimescaleDBVersion(): Promise<string | undefined> {
-    const value = await this.runSql<{ extversion: string }>(getTimescaleDBVersion());
-    const results = value.fields.extversion?.values;
-
-    if (!results) {
-      return undefined;
-    }
-
-    return results[0];
-  }
-
-  async fetchTables(): Promise<string[]> {
-    const tables = await this.runSql<{ table: string[] }>(showTables(), { refId: 'tables' });
-    return tables.fields.table?.values.flat() ?? [];
-  }
-
-  getSqlLanguageDefinition(db: DB): LanguageDefinition {
-    if (this.sqlLanguageDefinition !== undefined) {
-      return this.sqlLanguageDefinition;
-    }
-
-    const args = {
-      getColumns: { current: (query: SQLQuery) => fetchColumns(db, query) },
-      getTables: { current: () => fetchTables(db) },
-    };
-    this.sqlLanguageDefinition = {
-      id: 'pgsql',
-      completionProvider: getSqlCompletionProvider(args),
-      formatter: formatSQL,
-    };
-    return this.sqlLanguageDefinition;
-  }
-
-  async fetchFields(query: SQLQuery): Promise<SQLSelectableValue[]> {
-    const schema = await this.runSql<{ column: string; type: string }>(getSchema(query.table), { refId: 'columns' });
-    const result: SQLSelectableValue[] = [];
-    for (let i = 0; i < schema.length; i++) {
-      const column = schema.fields.column.values[i];
-      const type = schema.fields.type.values[i];
-      result.push({ label: column, value: column, type, ...getFieldConfig(type) });
-    }
-    return result;
-  }
-
-  getDB(): DB {
-    if (this.db !== undefined) {
-      return this.db;
-    }
-
-    return {
-      init: () => Promise.resolve(true),
-      datasets: () => Promise.resolve([]),
-      tables: () => this.fetchTables(),
-      getEditorLanguageDefinition: () => this.getSqlLanguageDefinition(this.db),
-      fields: async (query: SQLQuery) => {
-        if (!query?.table) {
-          return [];
-        }
-        return this.fetchFields(query);
-      },
-      validateQuery: (query) =>
-        Promise.resolve({ isError: false, isValid: true, query, error: '', rawSql: query.rawSql }),
-      dsID: () => this.id,
-      toRawSql,
-      lookup: async () => {
-        const tables = await this.fetchTables();
-        return tables.map((t) => ({ name: t, completion: t }));
-      },
-    };
-  }
-}
diff --git a/public/app/plugins/datasource/postgres/module.ts b/public/app/plugins/datasource/postgres/module.ts
deleted file mode 100644
index 6aa5667cfd01b..0000000000000
--- a/public/app/plugins/datasource/postgres/module.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { DataSourcePlugin } from '@grafana/data';
-import { SQLQuery } from 'app/features/plugins/sql/types';
-
-import { CheatSheet } from './CheatSheet';
-import { PostgresQueryEditor } from './PostgresQueryEditor';
-import { PostgresConfigEditor } from './configuration/ConfigurationEditor';
-import { PostgresDatasource } from './datasource';
-import { PostgresOptions, SecureJsonData } from './types';
-
-export const plugin = new DataSourcePlugin<PostgresDatasource, SQLQuery, PostgresOptions, SecureJsonData>(
-  PostgresDatasource
-)
-  .setQueryEditor(PostgresQueryEditor)
-  .setQueryEditorHelp(CheatSheet)
-  .setConfigEditor(PostgresConfigEditor);
diff --git a/public/app/plugins/datasource/postgres/plugin.json b/public/app/plugins/datasource/postgres/plugin.json
deleted file mode 100644
index 6032d1482d4be..0000000000000
--- a/public/app/plugins/datasource/postgres/plugin.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "type": "datasource",
-  "name": "PostgreSQL",
-  "id": "postgres",
-  "category": "sql",
-
-  "info": {
-    "description": "Data source for PostgreSQL and compatible databases",
-    "author": {
-      "name": "Grafana Labs",
-      "url": "https://grafana.com"
-    },
-    "logos": {
-      "small": "img/postgresql_logo.svg",
-      "large": "img/postgresql_logo.svg"
-    }
-  },
-
-  "alerting": true,
-  "annotations": true,
-  "metrics": true,
-  "logs": true,
-  "backend": true,
-
-  "queryOptions": {
-    "minInterval": true
-  }
-}
diff --git a/public/app/plugins/datasource/postgres/types.ts b/public/app/plugins/datasource/postgres/types.ts
deleted file mode 100644
index bc744f6c9a62f..0000000000000
--- a/public/app/plugins/datasource/postgres/types.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { SQLOptions } from 'app/features/plugins/sql/types';
-
-export enum PostgresTLSModes {
-  disable = 'disable',
-  require = 'require',
-  verifyCA = 'verify-ca',
-  verifyFull = 'verify-full',
-}
-
-export enum PostgresTLSMethods {
-  filePath = 'file-path',
-  fileContent = 'file-content',
-}
-export interface PostgresOptions extends SQLOptions {
-  tlsConfigurationMethod?: PostgresTLSMethods;
-  sslmode?: PostgresTLSModes;
-  sslRootCertFile?: string;
-  sslCertFile?: string;
-  sslKeyFile?: string;
-  postgresVersion?: number;
-  timescaledb?: boolean;
-  enableSecureSocksProxy?: boolean;
-}
-
-export interface SecureJsonData {
-  password?: string;
-}
diff --git a/public/app/plugins/datasource/prometheus/components/AnnotationQueryEditor.tsx b/public/app/plugins/datasource/prometheus/components/AnnotationQueryEditor.tsx
index ad2e1e9011474..0cbaf5978cdd9 100644
--- a/public/app/plugins/datasource/prometheus/components/AnnotationQueryEditor.tsx
+++ b/public/app/plugins/datasource/prometheus/components/AnnotationQueryEditor.tsx
@@ -1,8 +1,9 @@
 import React from 'react';
 
 import { AnnotationQuery } from '@grafana/data';
-import { EditorField, EditorRow, EditorRows, EditorSwitch, Space } from '@grafana/experimental';
-import { AutoSizeInput, Input } from '@grafana/ui';
+import { selectors } from '@grafana/e2e-selectors';
+import { EditorField, EditorRow, EditorRows, EditorSwitch } from '@grafana/experimental';
+import { AutoSizeInput, Input, Space } from '@grafana/ui';
 
 import { PromQueryCodeEditor } from '../querybuilder/components/PromQueryCodeEditor';
 import { PromQuery } from '../types';
@@ -56,6 +57,7 @@ export function AnnotationQueryEditor(props: Props) {
                 });
               }}
               defaultValue={query.interval}
+              id={selectors.components.DataSource.Prometheus.annotations.minStep}
             />
           </EditorField>
         </EditorRow>
@@ -78,6 +80,7 @@ export function AnnotationQueryEditor(props: Props) {
                 titleFormat: event.currentTarget.value,
               });
             }}
+            data-testid={selectors.components.DataSource.Prometheus.annotations.title}
           />
         </EditorField>
         <EditorField label="Tags">
@@ -91,6 +94,7 @@ export function AnnotationQueryEditor(props: Props) {
                 tagKeys: event.currentTarget.value,
               });
             }}
+            data-testid={selectors.components.DataSource.Prometheus.annotations.tags}
           />
         </EditorField>
         <EditorField
@@ -109,6 +113,7 @@ export function AnnotationQueryEditor(props: Props) {
                 textFormat: event.currentTarget.value,
               });
             }}
+            data-testid={selectors.components.DataSource.Prometheus.annotations.text}
           />
         </EditorField>
         <EditorField
@@ -125,6 +130,7 @@ export function AnnotationQueryEditor(props: Props) {
                 useValueForTime: event.currentTarget.value,
               });
             }}
+            data-testid={selectors.components.DataSource.Prometheus.annotations.seriesValueAsTimestamp}
           />
         </EditorField>
       </EditorRow>
diff --git a/public/app/plugins/datasource/prometheus/components/PromLink.test.tsx b/public/app/plugins/datasource/prometheus/components/PromLink.test.tsx
deleted file mode 100644
index bb115283ada07..0000000000000
--- a/public/app/plugins/datasource/prometheus/components/PromLink.test.tsx
+++ /dev/null
@@ -1,123 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import React from 'react';
-
-import { dateTime, PanelData, TimeRange } from '@grafana/data';
-
-import { PrometheusDatasource } from '../datasource';
-import { PromQuery } from '../types';
-
-import PromLink from './PromLink';
-
-jest.mock('@grafana/data', () => ({
-  ...jest.requireActual('@grafana/data'),
-  rangeUtil: {
-    intervalToSeconds: jest.fn(() => 15),
-  },
-}));
-
-const now = dateTime().valueOf();
-const intervalInSeconds = 60 * 5;
-const endInput = encodeURIComponent(dateTime(now).add(5, 'hours').format('Y-MM-DD HH:mm'));
-
-const getPanelData = (panelDataOverrides?: Partial<PanelData>) => {
-  const panelData = {
-    request: {
-      scopedVars: [{ __interval: { text: '15s', value: '15s' } }],
-      targets: [
-        { refId: 'A', datasource: 'prom1' },
-        { refId: 'B', datasource: 'prom2' },
-      ],
-      range: {
-        raw: {},
-        to: dateTime(now), // "now"
-        from: dateTime(now - 1000 * intervalInSeconds), // 5 minutes ago from "now"
-      } as TimeRange,
-    },
-  };
-
-  return Object.assign(panelData, panelDataOverrides) as PanelData;
-};
-
-const getDataSource = (datasourceOverrides?: Partial<PrometheusDatasource>) => {
-  const datasource = {
-    createQuery: () => ({ expr: 'up', step: 15 }),
-    directUrl: 'prom1',
-    getRateIntervalScopedVariable: jest.fn(() => ({ __rate_interval: { text: '60s', value: '60s' } })),
-  };
-
-  return Object.assign(datasource, datasourceOverrides) as unknown as PrometheusDatasource;
-};
-
-const getDataSourceWithCustomQueryParameters = (datasourceOverrides?: Partial<PrometheusDatasource>) => {
-  const datasource = {
-    getPrometheusTime: () => 1677870470,
-    createQuery: () => ({ expr: 'up', step: 20 }),
-    directUrl: 'prom3',
-    getRateIntervalScopedVariable: jest.fn(() => ({ __rate_interval: { text: '60s', value: '60s' } })),
-    customQueryParameters: new URLSearchParams('g0.foo=1'),
-  };
-
-  return Object.assign(datasource, datasourceOverrides) as unknown as PrometheusDatasource;
-};
-
-describe('PromLink', () => {
-  it('should show correct link for 1 component', async () => {
-    render(
-      <div>
-        <PromLink datasource={getDataSource()} panelData={getPanelData()} query={{} as PromQuery} />
-      </div>
-    );
-    expect(screen.getByText('Prometheus')).toHaveAttribute(
-      'href',
-      `prom1/graph?g0.expr=up&g0.range_input=${intervalInSeconds}s&g0.end_input=${endInput}&g0.step_input=15&g0.tab=0`
-    );
-  });
-  it('should show different link when there are 2 components with the same panel data', () => {
-    render(
-      <div>
-        <PromLink datasource={getDataSource()} panelData={getPanelData()} query={{} as PromQuery} />
-        <PromLink
-          datasource={getDataSource({ directUrl: 'prom2' })}
-          panelData={getPanelData()}
-          query={{} as PromQuery}
-        />
-      </div>
-    );
-    const promLinkButtons = screen.getAllByText('Prometheus');
-    expect(promLinkButtons[0]).toHaveAttribute(
-      'href',
-      `prom1/graph?g0.expr=up&g0.range_input=${intervalInSeconds}s&g0.end_input=${endInput}&g0.step_input=15&g0.tab=0`
-    );
-    expect(promLinkButtons[1]).toHaveAttribute(
-      'href',
-      `prom2/graph?g0.expr=up&g0.range_input=${intervalInSeconds}s&g0.end_input=${endInput}&g0.step_input=15&g0.tab=0`
-    );
-  });
-  it('should create sanitized link', async () => {
-    render(
-      <div>
-        <PromLink
-          datasource={getDataSource({ directUrl: "javascript:300?1:2;alert('Hello');//" })}
-          panelData={getPanelData()}
-          query={{} as PromQuery}
-        />
-      </div>
-    );
-    expect(screen.getByText('Prometheus')).toHaveAttribute('href', 'about:blank');
-  });
-  it('should add custom query parameters when it is configured', async () => {
-    render(
-      <div>
-        <PromLink
-          datasource={getDataSourceWithCustomQueryParameters()}
-          panelData={getPanelData()}
-          query={{} as PromQuery}
-        />
-      </div>
-    );
-    expect(screen.getByText('Prometheus')).toHaveAttribute(
-      'href',
-      `prom3/graph?g0.foo=1&g0.expr=up&g0.range_input=${intervalInSeconds}s&g0.end_input=${endInput}&g0.step_input=20&g0.tab=0`
-    );
-  });
-});
diff --git a/public/app/plugins/datasource/prometheus/components/PromLink.tsx b/public/app/plugins/datasource/prometheus/components/PromLink.tsx
deleted file mode 100644
index 5b01ed63837f2..0000000000000
--- a/public/app/plugins/datasource/prometheus/components/PromLink.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-import { map } from 'lodash';
-import React, { useEffect, useState, memo } from 'react';
-
-import { DataQueryRequest, PanelData, ScopedVars, textUtil, rangeUtil } from '@grafana/data';
-
-import { PrometheusDatasource } from '../datasource';
-import { getPrometheusTime } from '../language_utils';
-import { PromQuery } from '../types';
-
-interface Props {
-  datasource: PrometheusDatasource;
-  query: PromQuery;
-  panelData?: PanelData;
-}
-
-const PromLink = ({ panelData, query, datasource }: Props) => {
-  const [href, setHref] = useState('');
-
-  useEffect(() => {
-    if (panelData) {
-      const getExternalLink = () => {
-        if (!panelData.request) {
-          return '';
-        }
-
-        const {
-          request: { range, interval, scopedVars },
-        } = panelData;
-
-        const start = getPrometheusTime(range.from, false);
-        const end = getPrometheusTime(range.to, true);
-        const rangeDiff = Math.ceil(end - start);
-        const endTime = range.to.utc().format('YYYY-MM-DD HH:mm');
-
-        const enrichedScopedVars: ScopedVars = {
-          ...scopedVars,
-          // As we support $__rate_interval variable in min step, we need add it to scopedVars
-          ...datasource.getRateIntervalScopedVariable(
-            rangeUtil.intervalToSeconds(interval),
-            rangeUtil.intervalToSeconds(datasource.interval)
-          ),
-        };
-
-        const options = {
-          interval,
-          scopedVars: enrichedScopedVars,
-        } as DataQueryRequest<PromQuery>;
-
-        const customQueryParameters: { [key: string]: string } = {};
-        if (datasource.customQueryParameters) {
-          for (const [k, v] of datasource.customQueryParameters) {
-            customQueryParameters[k] = v;
-          }
-        }
-
-        const queryOptions = datasource.createQuery(query, options, start, end);
-
-        const expr = {
-          ...customQueryParameters,
-          'g0.expr': queryOptions.expr,
-          'g0.range_input': rangeDiff + 's',
-          'g0.end_input': endTime,
-          'g0.step_input': queryOptions.step,
-          'g0.tab': 0,
-        };
-
-        const args = map(expr, (v: string, k: string) => {
-          return k + '=' + encodeURIComponent(v);
-        }).join('&');
-        return `${datasource.directUrl}/graph?${args}`;
-      };
-
-      setHref(getExternalLink());
-    }
-  }, [datasource, panelData, query]);
-
-  return (
-    <a href={textUtil.sanitizeUrl(href)} target="_blank" rel="noopener noreferrer">
-      Prometheus
-    </a>
-  );
-};
-
-export default memo(PromLink);
diff --git a/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx b/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx
index f011d01a1b742..496322a5a7d4a 100644
--- a/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx
+++ b/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx
@@ -1,23 +1,10 @@
 import { cx } from '@emotion/css';
-import { LanguageMap, languages as prismLanguages } from 'prismjs';
 import React, { ReactNode } from 'react';
-import { Plugin } from 'slate';
-import { Editor } from 'slate-react';
 
 import { isDataFrame, QueryEditorProps, QueryHint, TimeRange, toLegacyResponseData } from '@grafana/data';
-import { reportInteraction } from '@grafana/runtime/src';
-import {
-  BracesPlugin,
-  DOMUtil,
-  Icon,
-  SlatePrism,
-  SuggestionsState,
-  TypeaheadInput,
-  TypeaheadOutput,
-  Themeable2,
-  withTheme2,
-  clearButtonStyles,
-} from '@grafana/ui';
+import { selectors } from '@grafana/e2e-selectors';
+import { reportInteraction } from '@grafana/runtime';
+import { Icon, Themeable2, withTheme2, clearButtonStyles } from '@grafana/ui';
 import { LocalStorageValueProvider } from 'app/core/components/LocalStorageValueProvider';
 import {
   CancelablePromise,
@@ -32,7 +19,6 @@ import { PromOptions, PromQuery } from '../types';
 import { PrometheusMetricsBrowser } from './PrometheusMetricsBrowser';
 import { MonacoQueryFieldWrapper } from './monaco-query-field/MonacoQueryFieldWrapper';
 
-export const RECORDING_RULES_GROUP = '__recording_rules__';
 const LAST_USED_LABELS_KEY = 'grafana.datasources.prometheus.browser.labels';
 
 function getChooserText(metricsLookupDisabled: boolean, hasSyntax: boolean, hasMetrics: boolean) {
@@ -51,33 +37,6 @@ function getChooserText(metricsLookupDisabled: boolean, hasSyntax: boolean, hasM
   return 'Metrics browser';
 }
 
-export function willApplySuggestion(suggestion: string, { typeaheadContext, typeaheadText }: SuggestionsState): string {
-  // Modify suggestion based on context
-  switch (typeaheadContext) {
-    case 'context-labels': {
-      const nextChar = DOMUtil.getNextCharacter();
-      if (!nextChar || nextChar === '}' || nextChar === ',') {
-        suggestion += '=';
-      }
-      break;
-    }
-
-    case 'context-label-values': {
-      // Always add quotes and remove existing ones instead
-      if (!typeaheadText.match(/^(!?=~?"|")/)) {
-        suggestion = `"${suggestion}`;
-      }
-      if (DOMUtil.getNextCharacter() !== '"') {
-        suggestion = `${suggestion}"`;
-      }
-      break;
-    }
-
-    default:
-  }
-  return suggestion;
-}
-
 interface PromQueryFieldProps extends QueryEditorProps<PrometheusDatasource, PromQuery, PromOptions>, Themeable2 {
   ExtraFieldElement?: ReactNode;
   'data-testid'?: string;
@@ -90,22 +49,10 @@ interface PromQueryFieldState {
 }
 
 class PromQueryField extends React.PureComponent<PromQueryFieldProps, PromQueryFieldState> {
-  plugins: Array<Plugin<Editor>>;
   declare languageProviderInitializationPromise: CancelablePromise<any>;
 
-  constructor(props: PromQueryFieldProps, context: React.Context<any>) {
-    super(props, context);
-
-    this.plugins = [
-      BracesPlugin(),
-      SlatePrism(
-        {
-          onlyIn: (node) => 'type' in node && node.type === 'code_block',
-          getSyntax: (node) => 'promql',
-        },
-        { ...(prismLanguages as LanguageMap), promql: this.props.datasource.languageProvider.syntax }
-      ),
-    ];
+  constructor(props: PromQueryFieldProps) {
+    super(props);
 
     this.state = {
       labelBrowserVisible: false,
@@ -174,10 +121,11 @@ class PromQueryField extends React.PureComponent<PromQueryFieldProps, PromQueryF
 
   refreshMetrics = async () => {
     const {
+      range,
       datasource: { languageProvider },
     } = this.props;
 
-    this.languageProviderInitializationPromise = makePromiseCancelable(languageProvider.start());
+    this.languageProviderInitializationPromise = makePromiseCancelable(languageProvider.start(range));
 
     try {
       const remainingTasks = await this.languageProviderInitializationPromise.promise;
@@ -254,26 +202,6 @@ class PromQueryField extends React.PureComponent<PromQueryFieldProps, PromQueryF
     this.setState({ syntaxLoaded: true });
   };
 
-  onTypeahead = async (typeahead: TypeaheadInput): Promise<TypeaheadOutput> => {
-    const {
-      datasource: { languageProvider },
-    } = this.props;
-
-    if (!languageProvider) {
-      return { suggestions: [] };
-    }
-
-    const { history } = this.props;
-    const { prefix, text, value, wrapperClasses, labelKey } = typeahead;
-
-    const result = await languageProvider.provideCompletionItems(
-      { text, value, prefix, wrapperClasses, labelKey },
-      { history }
-    );
-
-    return result;
-  };
-
   render() {
     const {
       datasource,
@@ -303,6 +231,7 @@ class PromQueryField extends React.PureComponent<PromQueryFieldProps, PromQueryF
                   onClick={this.onClickChooserButton}
                   disabled={buttonDisabled}
                   type="button"
+                  data-testid={selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.openButton}
                 >
                   {chooserText}
                   <Icon name={labelBrowserVisible ? 'angle-down' : 'angle-right'} />
@@ -316,6 +245,7 @@ class PromQueryField extends React.PureComponent<PromQueryFieldProps, PromQueryF
                     onRunQuery={this.props.onRunQuery}
                     initialValue={query.expr ?? ''}
                     placeholder="Enter a PromQL query…"
+                    datasource={datasource}
                   />
                 </div>
               </div>
@@ -327,6 +257,7 @@ class PromQueryField extends React.PureComponent<PromQueryFieldProps, PromQueryF
                     lastUsedLabels={lastUsedLabels || []}
                     storeLastUsedLabels={onLastUsedLabelsSave}
                     deleteLastUsedLabels={onLastUsedLabelsDelete}
+                    timeRange={this.props.range}
                   />
                 </div>
               )}
diff --git a/public/app/plugins/datasource/prometheus/components/PrometheusMetricsBrowser.test.tsx b/public/app/plugins/datasource/prometheus/components/PrometheusMetricsBrowser.test.tsx
index 97051f5b8e0e1..b5cc16744a8be 100644
--- a/public/app/plugins/datasource/prometheus/components/PrometheusMetricsBrowser.test.tsx
+++ b/public/app/plugins/datasource/prometheus/components/PrometheusMetricsBrowser.test.tsx
@@ -114,6 +114,12 @@ describe('PrometheusMetricsBrowser', () => {
         }
         return [];
       },
+      // This must always call the series endpoint
+      // until we refactor all of the metrics browser
+      // to never use the series endpoint.
+      // The metrics browser expects both label names and label values.
+      // The labels endpoint with match does not supply label values
+      // and so using it breaks the metrics browser.
       fetchSeriesLabels: (selector: string) => {
         switch (selector) {
           case '{label1="value1-1"}':
diff --git a/public/app/plugins/datasource/prometheus/components/PrometheusMetricsBrowser.tsx b/public/app/plugins/datasource/prometheus/components/PrometheusMetricsBrowser.tsx
index ffd5336d3cb90..b877843cddb52 100644
--- a/public/app/plugins/datasource/prometheus/components/PrometheusMetricsBrowser.tsx
+++ b/public/app/plugins/datasource/prometheus/components/PrometheusMetricsBrowser.tsx
@@ -2,7 +2,8 @@ import { css, cx } from '@emotion/css';
 import React, { ChangeEvent } from 'react';
 import { FixedSizeList } from 'react-window';
 
-import { GrafanaTheme2 } from '@grafana/data';
+import { GrafanaTheme2, TimeRange } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import {
   Button,
   HorizontalGroup,
@@ -31,6 +32,7 @@ export interface BrowserProps {
   lastUsedLabels: string[];
   storeLastUsedLabels: (labels: string[]) => void;
   deleteLastUsedLabels: () => void;
+  timeRange?: TimeRange;
 }
 
 interface BrowserState {
@@ -319,7 +321,7 @@ export class UnthemedPrometheusMetricsBrowser extends React.Component<BrowserPro
     const { languageProvider, lastUsedLabels } = this.props;
     if (languageProvider) {
       const selectedLabels: string[] = lastUsedLabels;
-      languageProvider.start().then(() => {
+      languageProvider.start(this.props.timeRange).then(() => {
         let rawLabels: string[] = languageProvider.getLabelKeys();
         // Get metrics
         this.fetchValues(METRIC_LABEL, EMPTY_SELECTOR);
@@ -492,14 +494,19 @@ export class UnthemedPrometheusMetricsBrowser extends React.Component<BrowserPro
                   onChange={this.onChangeMetricSearch}
                   aria-label="Filter expression for metric"
                   value={metricSearchTerm}
+                  data-testid={selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.selectMetric}
                 />
               </div>
-              <div role="list" className={styles.valueListWrapper}>
+              <div
+                role="list"
+                className={styles.valueListWrapper}
+                data-testid={selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.metricList}
+              >
                 <FixedSizeList
                   height={Math.min(450, metricCount * LIST_ITEM_SIZE)}
                   itemCount={metricCount}
                   itemSize={LIST_ITEM_SIZE}
-                  itemKey={(i) => (metrics!.values as FacettableValue[])[i].name}
+                  itemKey={(i) => metrics!.values![i].name}
                   width={300}
                   className={styles.valueList}
                 >
@@ -536,6 +543,9 @@ export class UnthemedPrometheusMetricsBrowser extends React.Component<BrowserPro
                   onChange={this.onChangeLabelSearch}
                   aria-label="Filter expression for label"
                   value={labelSearchTerm}
+                  data-testid={
+                    selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.labelNamesFilter
+                  }
                 />
               </div>
               {/* Using fixed height here to prevent jumpy layout */}
@@ -563,6 +573,9 @@ export class UnthemedPrometheusMetricsBrowser extends React.Component<BrowserPro
                   onChange={this.onChangeValueSearch}
                   aria-label="Filter expression for label values"
                   value={valueSearchTerm}
+                  data-testid={
+                    selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.labelValuesFilter
+                  }
                 />
               </div>
               <div className={styles.valueListArea} ref={this.valueListsRef}>
@@ -588,7 +601,7 @@ export class UnthemedPrometheusMetricsBrowser extends React.Component<BrowserPro
                       height={Math.min(200, LIST_ITEM_SIZE * (label.values?.length || 0))}
                       itemCount={label.values?.length || 0}
                       itemSize={28}
-                      itemKey={(i) => (label.values as FacettableValue[])[i].name}
+                      itemKey={(i) => label.values![i].name}
                       width={200}
                       className={styles.valueList}
                     >
@@ -624,10 +637,16 @@ export class UnthemedPrometheusMetricsBrowser extends React.Component<BrowserPro
           </div>
           {validationStatus && <div className={styles.validationStatus}>{validationStatus}</div>}
           <HorizontalGroup>
-            <Button aria-label="Use selector for query button" disabled={empty} onClick={this.onClickRunQuery}>
+            <Button
+              data-testid={selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.useQuery}
+              aria-label="Use selector for query button"
+              disabled={empty}
+              onClick={this.onClickRunQuery}
+            >
               Use query
             </Button>
             <Button
+              data-testid={selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.useAsRateQuery}
               aria-label="Use selector as metrics button"
               variant="secondary"
               disabled={empty}
@@ -636,6 +655,7 @@ export class UnthemedPrometheusMetricsBrowser extends React.Component<BrowserPro
               Use as rate query
             </Button>
             <Button
+              data-testid={selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.validateSelector}
               aria-label="Validate submit button"
               variant="secondary"
               disabled={empty}
@@ -643,7 +663,12 @@ export class UnthemedPrometheusMetricsBrowser extends React.Component<BrowserPro
             >
               Validate selector
             </Button>
-            <Button aria-label="Selector clear button" variant="secondary" onClick={this.onClickClear}>
+            <Button
+              data-testid={selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.clear}
+              aria-label="Selector clear button"
+              variant="secondary"
+              onClick={this.onClickClear}
+            >
               Clear
             </Button>
             <div className={cx(styles.status, (status || error) && styles.statusShowing)}>
diff --git a/public/app/plugins/datasource/prometheus/components/VariableQueryEditor.test.tsx b/public/app/plugins/datasource/prometheus/components/VariableQueryEditor.test.tsx
index 7d0af5aa56de1..1804f3efff13a 100644
--- a/public/app/plugins/datasource/prometheus/components/VariableQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/prometheus/components/VariableQueryEditor.test.tsx
@@ -3,6 +3,8 @@ import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
 
+import { dateTime, TimeRange } from '@grafana/data';
+
 import { PrometheusDatasource } from '../datasource';
 import PrometheusLanguageProvider from '../language_provider';
 import { migrateVariableEditorBackToVariableSupport } from '../migrations/variableMigration';
@@ -140,7 +142,7 @@ describe('PromVariableQueryEditor', () => {
           metrics: [],
           metricsMetadata: {},
           getLabelValues: jest.fn().mockImplementation(() => ['that']),
-          fetchSeriesLabelsMatch: jest.fn().mockImplementation(() => Promise.resolve({ those: 'those' })),
+          fetchLabelsWithMatch: jest.fn().mockImplementation(() => Promise.resolve({ those: 'those' })),
         } as Partial<PrometheusLanguageProvider> as PrometheusLanguageProvider,
         getInitHints: () => [],
         getDebounceTimeInMilliseconds: jest.fn(),
@@ -234,11 +236,10 @@ describe('PromVariableQueryEditor', () => {
 
     await selectOptionInTest(screen.getByLabelText('Query type'), 'Metrics');
     const metricInput = screen.getByLabelText('Metric selector');
-    await userEvent.type(metricInput, 'a').then((prom) => {
-      const queryType = screen.getByLabelText('Query type');
-      // click elsewhere to trigger the onBlur
-      return userEvent.click(queryType);
-    });
+    await userEvent.type(metricInput, 'a');
+    const queryType = screen.getByLabelText('Query type');
+    // click elsewhere to trigger the onBlur
+    await userEvent.click(queryType);
 
     await waitFor(() =>
       expect(onChange).toHaveBeenCalledWith({
@@ -368,4 +369,24 @@ describe('PromVariableQueryEditor', () => {
       qryType: 5,
     });
   });
+
+  test('Calls language provider with the time range received in props', async () => {
+    const now = dateTime('2023-09-16T21:26:00Z');
+    const range: TimeRange = {
+      from: dateTime(now).subtract(2, 'days'),
+      to: now,
+      raw: {
+        from: 'now-2d',
+        to: 'now',
+      },
+    };
+    props.range = range;
+
+    const languageProviderStartMock = jest.fn();
+    props.datasource.languageProvider.start = languageProviderStartMock;
+
+    render(<PromVariableQueryEditor {...props} />);
+
+    expect(languageProviderStartMock).toHaveBeenCalledWith(range);
+  });
 });
diff --git a/public/app/plugins/datasource/prometheus/components/VariableQueryEditor.tsx b/public/app/plugins/datasource/prometheus/components/VariableQueryEditor.tsx
index 43f4badad79e5..fce9bf1e1dfe4 100644
--- a/public/app/plugins/datasource/prometheus/components/VariableQueryEditor.tsx
+++ b/public/app/plugins/datasource/prometheus/components/VariableQueryEditor.tsx
@@ -1,6 +1,7 @@
 import React, { FormEvent, useCallback, useEffect, useState } from 'react';
 
 import { QueryEditorProps, SelectableValue } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import { InlineField, InlineFieldRow, Input, Select, TextArea } from '@grafana/ui';
 
 import { PrometheusDatasource } from '../datasource';
@@ -33,7 +34,7 @@ export type Props = QueryEditorProps<PrometheusDatasource, PromQuery, PromOption
 
 const refId = 'PrometheusVariableQueryEditor-VariableQuery';
 
-export const PromVariableQueryEditor = ({ onChange, query, datasource }: Props) => {
+export const PromVariableQueryEditor = ({ onChange, query, datasource, range }: Props) => {
   // to select the query type, i.e. label_names, label_values, etc.
   const [qryType, setQryType] = useState<number | undefined>(undefined);
   // list of variables for each function
@@ -59,6 +60,11 @@ export const PromVariableQueryEditor = ({ onChange, query, datasource }: Props)
   // label filters have been added as a filter for metrics in label values query type
   const [labelFilters, setLabelFilters] = useState<QueryBuilderLabelFilter[]>([]);
 
+  useEffect(() => {
+    datasource.languageProvider.start(range);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   useEffect(() => {
     if (!query) {
       return;
@@ -100,19 +106,11 @@ export const PromVariableQueryEditor = ({ onChange, query, datasource }: Props)
       const labelToConsider = [{ label: '__name__', op: '=', value: metric }];
       const expr = promQueryModeller.renderLabels(labelToConsider);
 
-      if (datasource.hasLabelsMatchAPISupport()) {
-        datasource.languageProvider.fetchSeriesLabelsMatch(expr).then((labelsIndex: Record<string, string[]>) => {
-          const labelNames = Object.keys(labelsIndex);
-          const names = labelNames.map((value) => ({ label: value, value: value }));
-          setLabelOptions([...variables, ...names]);
-        });
-      } else {
-        datasource.languageProvider.fetchSeriesLabels(expr).then((labelsIndex: Record<string, string[]>) => {
-          const labelNames = Object.keys(labelsIndex);
-          const names = labelNames.map((value) => ({ label: value, value: value }));
-          setLabelOptions([...variables, ...names]);
-        });
-      }
+      datasource.languageProvider.fetchLabelsWithMatch(expr).then((labelsIndex: Record<string, string[]>) => {
+        const labelNames = Object.keys(labelsIndex);
+        const names = labelNames.map((value) => ({ label: value, value: value }));
+        setLabelOptions([...variables, ...names]);
+      });
     }
   }, [datasource, qryType, metric]);
 
@@ -238,6 +236,7 @@ export const PromVariableQueryEditor = ({ onChange, query, datasource }: Props)
             value={qryType}
             options={variableOptions}
             width={25}
+            data-testid={selectors.components.DataSource.Prometheus.variableQueryEditor.queryType}
           />
         </InlineField>
       </InlineFieldRow>
@@ -264,6 +263,7 @@ export const PromVariableQueryEditor = ({ onChange, query, datasource }: Props)
                 width={25}
                 allowCustomValue
                 isClearable={true}
+                data-testid={selectors.components.DataSource.Prometheus.variableQueryEditor.labelValues.labelSelect}
               />
             </InlineField>
           </InlineFieldRow>
@@ -298,6 +298,7 @@ export const PromVariableQueryEditor = ({ onChange, query, datasource }: Props)
                 setLabelNamesMatch(e.currentTarget.value);
               }}
               width={25}
+              data-testid={selectors.components.DataSource.Prometheus.variableQueryEditor.labelnames.metricRegex}
             />
           </InlineField>
         </InlineFieldRow>
@@ -324,6 +325,7 @@ export const PromVariableQueryEditor = ({ onChange, query, datasource }: Props)
                 onMetricChange(e.currentTarget.value);
               }}
               width={25}
+              data-testid={selectors.components.DataSource.Prometheus.variableQueryEditor.metricNames.metricRegex}
             />
           </InlineField>
         </InlineFieldRow>
@@ -353,6 +355,7 @@ export const PromVariableQueryEditor = ({ onChange, query, datasource }: Props)
                 }
               }}
               cols={100}
+              data-testid={selectors.components.DataSource.Prometheus.variableQueryEditor.varQueryResult}
             />
           </InlineField>
         </InlineFieldRow>
@@ -384,6 +387,7 @@ export const PromVariableQueryEditor = ({ onChange, query, datasource }: Props)
                 }
               }}
               width={100}
+              data-testid={selectors.components.DataSource.Prometheus.variableQueryEditor.seriesQuery}
             />
           </InlineField>
         </InlineFieldRow>
@@ -413,6 +417,7 @@ export const PromVariableQueryEditor = ({ onChange, query, datasource }: Props)
                 }
               }}
               width={100}
+              data-testid={selectors.components.DataSource.Prometheus.variableQueryEditor.classicQuery}
             />
           </InlineField>
         </InlineFieldRow>
diff --git a/public/app/plugins/datasource/prometheus/components/monaco-query-field/MonacoQueryField.tsx b/public/app/plugins/datasource/prometheus/components/monaco-query-field/MonacoQueryField.tsx
index d79208b1efb49..66a505bcfa291 100644
--- a/public/app/plugins/datasource/prometheus/components/monaco-query-field/MonacoQueryField.tsx
+++ b/public/app/plugins/datasource/prometheus/components/monaco-query-field/MonacoQueryField.tsx
@@ -1,4 +1,5 @@
 import { css } from '@emotion/css';
+import { parser } from '@prometheus-io/lezer-promql';
 import { debounce } from 'lodash';
 import { promLanguageDefinition } from 'monaco-promql';
 import React, { useRef, useEffect } from 'react';
@@ -8,6 +9,10 @@ import { v4 as uuidv4 } from 'uuid';
 import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { useTheme2, ReactMonacoEditor, Monaco, monacoTypes } from '@grafana/ui';
+import {
+  placeHolderScopedVars,
+  validateQuery,
+} from 'app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/validation';
 
 import { Props } from './MonacoQueryFieldProps';
 import { getOverrideServices } from './getOverrideServices';
@@ -83,7 +88,7 @@ const getStyles = (theme: GrafanaTheme2, placeholder: string) => {
       ::after {
         content: '${placeholder}';
         font-family: ${theme.typography.fontFamilyMonospace};
-        opacity: 0.3;
+        opacity: 0.6;
       }
     `,
   };
@@ -95,7 +100,7 @@ const MonacoQueryField = (props: Props) => {
   // we need only one instance of `overrideServices` during the lifetime of the react component
   const overrideServicesRef = useRef(getOverrideServices());
   const containerRef = useRef<HTMLDivElement>(null);
-  const { languageProvider, history, onBlur, onRunQuery, initialValue, placeholder, onChange } = props;
+  const { languageProvider, history, onBlur, onRunQuery, initialValue, placeholder, onChange, datasource } = props;
 
   const lpRef = useLatest(languageProvider);
   const historyRef = useLatest(history);
@@ -117,7 +122,7 @@ const MonacoQueryField = (props: Props) => {
 
   return (
     <div
-      aria-label={selectors.components.QueryField.container}
+      data-testid={selectors.components.QueryField.container}
       className={styles.container}
       // NOTE: we will be setting inline-style-width/height on this element
       ref={containerRef}
@@ -281,6 +286,31 @@ const MonacoQueryField = (props: Props) => {
 
             checkDecorators();
             editor.onDidChangeModelContent(checkDecorators);
+
+            editor.onDidChangeModelContent((e) => {
+              const model = editor.getModel();
+              if (!model) {
+                return;
+              }
+              const query = model.getValue();
+              const errors =
+                validateQuery(
+                  query,
+                  datasource.interpolateString(query, placeHolderScopedVars),
+                  model.getLinesContent(),
+                  parser
+                ) || [];
+
+              const markers = errors.map(({ error, ...boundary }) => ({
+                message: `${
+                  error ? `Error parsing "${error}"` : 'Parse error'
+                }. The query appears to be incorrect and could fail to be executed.`,
+                severity: monaco.MarkerSeverity.Error,
+                ...boundary,
+              }));
+
+              monaco.editor.setModelMarkers(model, 'owner', markers);
+            });
           }
         }}
       />
diff --git a/public/app/plugins/datasource/prometheus/components/monaco-query-field/MonacoQueryFieldProps.ts b/public/app/plugins/datasource/prometheus/components/monaco-query-field/MonacoQueryFieldProps.ts
index 3c5f17fa23da9..1383b565828cf 100644
--- a/public/app/plugins/datasource/prometheus/components/monaco-query-field/MonacoQueryFieldProps.ts
+++ b/public/app/plugins/datasource/prometheus/components/monaco-query-field/MonacoQueryFieldProps.ts
@@ -1,5 +1,6 @@
 import { HistoryItem } from '@grafana/data';
 
+import { PrometheusDatasource } from '../../datasource';
 import type PromQlLanguageProvider from '../../language_provider';
 import { PromQuery } from '../../types';
 
@@ -16,4 +17,5 @@ export type Props = {
   onBlur: (value: string) => void;
   // onChange will never initiate a query, it just denotes that a query value has been changed
   onChange: (value: string) => void;
+  datasource: PrometheusDatasource;
 };
diff --git a/public/app/plugins/datasource/prometheus/components/monaco-query-field/monaco-completion-provider/validation.test.ts b/public/app/plugins/datasource/prometheus/components/monaco-query-field/monaco-completion-provider/validation.test.ts
new file mode 100644
index 0000000000000..2fa5706412d92
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/components/monaco-query-field/monaco-completion-provider/validation.test.ts
@@ -0,0 +1,85 @@
+import { parser } from '@prometheus-io/lezer-promql';
+
+import { validateQuery } from 'app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/validation';
+
+describe('Monaco Query Validation', () => {
+  test('Identifies empty queries as valid', () => {
+    expect(validateQuery('', '', [], parser)).toBeFalsy();
+  });
+
+  test.each([
+    'access_evaluation_duration_sum{job="grafana"}',
+    'http_requests_total{job="apiserver", handler="/api/comments"}[5m]',
+    'http_requests_total{job=~".*server"}',
+    'rate(http_requests_total[5m])[30m:1m]',
+    'max_over_time(deriv(rate(distance_covered_total[5s])[30s:5s])[10m:])',
+    'rate(http_requests_total[5m])',
+    'topk(3, sum by (app, proc) (rate(instance_cpu_time_ns[5m])))',
+  ])('Identifies valid queries', (query: string) => {
+    expect(validateQuery(query, query, [], parser)).toBeFalsy();
+  });
+
+  test('Identifies invalid queries', () => {
+    // Missing } at the end
+    let query = 'access_evaluation_duration_sum{job="grafana"';
+    expect(validateQuery(query, query, [query], parser)).toEqual([
+      {
+        endColumn: 45,
+        endLineNumber: 1,
+        error: '{job="grafana"',
+        startColumn: 31,
+        startLineNumber: 1,
+      },
+    ]);
+
+    // Missing handler="value"
+    query = 'http_requests_total{job="apiserver", handler}[5m]';
+    expect(validateQuery(query, query, [query], parser)).toEqual([
+      {
+        endColumn: 45,
+        endLineNumber: 1,
+        error: 'handler',
+        startColumn: 38,
+        startLineNumber: 1,
+      },
+    ]);
+
+    // Missing : in [30s:5s]
+    query = 'max_over_time(deriv(rate(distance_covered_total[5s])[30s5s])[10m:])';
+    expect(validateQuery(query, query, [query], parser)).toEqual([
+      {
+        endColumn: 60,
+        endLineNumber: 1,
+        error: 'rate(distance_covered_total[5s])[30s5s]',
+        startColumn: 21,
+        startLineNumber: 1,
+      },
+    ]);
+  });
+
+  test('Identifies valid multi-line queries', () => {
+    const query = `
+sum by (job) (
+    rate(http_requests_total[5m])
+)`;
+    const queryLines = query.split('\n');
+    expect(validateQuery(query, query, queryLines, parser)).toBeFalsy();
+  });
+
+  test('Identifies invalid multi-line queries', () => {
+    const query = `
+sum by (job) (
+    rate(http_requests_total[])
+)`;
+    const queryLines = query.split('\n');
+    expect(validateQuery(query, query, queryLines, parser)).toEqual([
+      {
+        endColumn: 30,
+        endLineNumber: 3,
+        error: '',
+        startColumn: 30,
+        startLineNumber: 3,
+      },
+    ]);
+  });
+});
diff --git a/public/app/plugins/datasource/prometheus/configuration/AlertingSettingsOverhaul.tsx b/public/app/plugins/datasource/prometheus/configuration/AlertingSettingsOverhaul.tsx
index dc8243d916371..92e054899132d 100644
--- a/public/app/plugins/datasource/prometheus/configuration/AlertingSettingsOverhaul.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/AlertingSettingsOverhaul.tsx
@@ -2,6 +2,7 @@ import { cx } from '@emotion/css';
 import React from 'react';
 
 import { DataSourceJsonData, DataSourcePluginOptionsEditorProps } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import { ConfigSubSection } from '@grafana/experimental';
 import { config } from '@grafana/runtime';
 import { InlineField, Switch, useTheme2 } from '@grafana/ui';
@@ -53,6 +54,7 @@ export function AlertingSettingsOverhaul<T extends AlertingConfig>({
                     jsonData: { ...options.jsonData, manageAlerts: event!.currentTarget.checked },
                   })
                 }
+                id={selectors.components.DataSource.Prometheus.configPage.manageAlerts}
               />
             </InlineField>
           </div>
diff --git a/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx b/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx
index 3a5f45db77a9b..7327aa6996a9b 100644
--- a/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx
@@ -1,5 +1,6 @@
 import { cx } from '@emotion/css';
 import React, { FormEvent, useMemo, useState } from 'react';
+import { useEffectOnce } from 'react-use';
 
 import { config } from '@grafana/runtime';
 import { InlineField, InlineFieldRow, InlineSwitch, Input } from '@grafana/ui';
@@ -45,6 +46,13 @@ export const AzureAuthSettings = (props: HttpSettingsBaseProps) => {
 
   const labelWidth = prometheusConfigOverhaulAuth ? 24 : 26;
 
+  // The auth type needs to be set on the first load of the data source
+  useEffectOnce(() => {
+    if (!dataSourceConfig.jsonData.authType) {
+      onCredentialsChange(credentials);
+    }
+  });
+
   return (
     <>
       <h6>Azure authentication</h6>
diff --git a/public/app/plugins/datasource/prometheus/configuration/AzureCredentialsForm.tsx b/public/app/plugins/datasource/prometheus/configuration/AzureCredentialsForm.tsx
index 0240671ec49fb..7140dc34b6246 100644
--- a/public/app/plugins/datasource/prometheus/configuration/AzureCredentialsForm.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/AzureCredentialsForm.tsx
@@ -3,9 +3,7 @@ import React, { ChangeEvent, useEffect, useMemo, useReducer, useState } from 're
 
 import { SelectableValue } from '@grafana/data';
 import { config } from '@grafana/runtime';
-import { InlineFormLabel, Button } from '@grafana/ui/src/components';
-import { Input } from '@grafana/ui/src/components/Forms/Legacy/Input/Input';
-import { Select } from '@grafana/ui/src/components/Forms/Legacy/Select/Select';
+import { InlineFormLabel, Button, Select, Input } from '@grafana/ui';
 
 import { AzureAuthType, AzureCredentials, isCredentialsComplete } from './AzureCredentials';
 
@@ -97,8 +95,8 @@ export const AzureCredentialsForm = (props: Props) => {
     const defaultAuthType = managedIdentityEnabled
       ? 'msi'
       : workloadIdentityEnabled
-      ? 'workloadidentity'
-      : 'clientsecret';
+        ? 'workloadidentity'
+        : 'clientsecret';
     const updated: AzureCredentials = {
       ...credentials,
       authType: selected.value || defaultAuthType,
diff --git a/public/app/plugins/datasource/prometheus/configuration/ConfigEditorPackage.tsx b/public/app/plugins/datasource/prometheus/configuration/ConfigEditorPackage.tsx
new file mode 100644
index 0000000000000..a2cb78f884c91
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/configuration/ConfigEditorPackage.tsx
@@ -0,0 +1,152 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { SIGV4ConnectionConfig } from '@grafana/aws-sdk';
+import { DataSourcePluginOptionsEditorProps, DataSourceSettings, GrafanaTheme2 } from '@grafana/data';
+import { AdvancedHttpSettings, ConfigSection, DataSourceDescription } from '@grafana/experimental';
+import { AlertingSettingsOverhaul, PromOptions, PromSettings } from '@grafana/prometheus';
+import { config } from '@grafana/runtime';
+import { Alert, FieldValidationMessage, useTheme2 } from '@grafana/ui';
+
+import { AzureAuthSettings } from './AzureAuthSettings';
+import { hasCredentials, setDefaultCredentials, resetCredentials } from './AzureCredentialsConfig';
+import { DataSourcehttpSettingsOverhaul } from './DataSourceHttpSettingsOverhaulPackage';
+
+export const PROM_CONFIG_LABEL_WIDTH = 30;
+
+export type Props = DataSourcePluginOptionsEditorProps<PromOptions>;
+
+export const ConfigEditor = (props: Props) => {
+  const { options, onOptionsChange } = props;
+
+  const azureAuthSettings = {
+    azureAuthSupported: config.azureAuthEnabled,
+    getAzureAuthEnabled: (config: DataSourceSettings<any, any>): boolean => hasCredentials(config),
+    setAzureAuthEnabled: (config: DataSourceSettings<any, any>, enabled: boolean) =>
+      enabled ? setDefaultCredentials(config) : resetCredentials(config),
+    azureSettingsUI: AzureAuthSettings,
+  };
+
+  const theme = useTheme2();
+  const styles = overhaulStyles(theme);
+
+  return (
+    <>
+      {options.access === 'direct' && (
+        <Alert title="Error" severity="error">
+          Browser access mode in the Prometheus data source is no longer available. Switch to server access mode.
+        </Alert>
+      )}
+      <DataSourceDescription
+        dataSourceName="Prometheus"
+        docsLink="https://grafana.com/docs/grafana/latest/datasources/prometheus/configure-prometheus-data-source/"
+      />
+      <hr className={`${styles.hrTopSpace} ${styles.hrBottomSpace}`} />
+      <DataSourcehttpSettingsOverhaul
+        options={options}
+        onOptionsChange={onOptionsChange}
+        azureAuthSettings={azureAuthSettings}
+        sigV4AuthToggleEnabled={config.sigV4AuthEnabled}
+        renderSigV4Editor={
+          <SIGV4ConnectionConfig inExperimentalAuthComponent={true} {...props}></SIGV4ConnectionConfig>
+        }
+        secureSocksDSProxyEnabled={config.secureSocksDSProxyEnabled}
+      />
+      <hr />
+      <ConfigSection
+        className={styles.advancedSettings}
+        title="Advanced settings"
+        description="Additional settings are optional settings that can be configured for more control over your data source."
+      >
+        <AdvancedHttpSettings
+          className={styles.advancedHTTPSettingsMargin}
+          config={options}
+          onChange={onOptionsChange}
+        />
+        <AlertingSettingsOverhaul<PromOptions> options={options} onOptionsChange={onOptionsChange} />
+        <PromSettings options={options} onOptionsChange={onOptionsChange} />
+      </ConfigSection>
+    </>
+  );
+};
+/**
+ * Use this to return a url in a tooltip in a field. Don't forget to make the field interactive to be able to click on the tooltip
+ * @param url
+ * @returns
+ */
+export function docsTip(url?: string) {
+  const docsUrl = 'https://grafana.com/docs/grafana/latest/datasources/prometheus/#configure-the-data-source';
+
+  return (
+    <a href={url ? url : docsUrl} target="_blank" rel="noopener noreferrer">
+      Visit docs for more details here.
+    </a>
+  );
+}
+
+export const validateInput = (
+  input: string,
+  pattern: string | RegExp,
+  errorMessage?: string
+): boolean | JSX.Element => {
+  const defaultErrorMessage = 'Value is not valid';
+  if (input && !input.match(pattern)) {
+    return <FieldValidationMessage>{errorMessage ? errorMessage : defaultErrorMessage}</FieldValidationMessage>;
+  } else {
+    return true;
+  }
+};
+
+export function overhaulStyles(theme: GrafanaTheme2) {
+  return {
+    additionalSettings: css({
+      marginBottom: '25px',
+    }),
+    secondaryGrey: css({
+      color: `${theme.colors.secondary.text}`,
+      opacity: '65%',
+    }),
+    inlineError: css({
+      margin: '0px 0px 4px 245px',
+    }),
+    switchField: css({
+      alignItems: 'center',
+    }),
+    sectionHeaderPadding: css({
+      paddingTop: '32px',
+    }),
+    sectionBottomPadding: css({
+      paddingBottom: '28px',
+    }),
+    subsectionText: css({
+      fontSize: '12px',
+    }),
+    hrBottomSpace: css({
+      marginBottom: '56px',
+    }),
+    hrTopSpace: css({
+      marginTop: '50px',
+    }),
+    textUnderline: css({
+      textDecoration: 'underline',
+    }),
+    versionMargin: css({
+      marginBottom: '12px',
+    }),
+    advancedHTTPSettingsMargin: css({
+      margin: '24px 0 8px 0',
+    }),
+    advancedSettings: css({
+      paddingTop: '32px',
+    }),
+    alertingTop: css({
+      marginTop: '40px !important',
+    }),
+    overhaulPageHeading: css({
+      fontWeight: '400',
+    }),
+    container: css({
+      maxwidth: '578',
+    }),
+  };
+}
diff --git a/public/app/plugins/datasource/prometheus/configuration/DataSourceHttpSettingsOverhaulPackage.tsx b/public/app/plugins/datasource/prometheus/configuration/DataSourceHttpSettingsOverhaulPackage.tsx
new file mode 100644
index 0000000000000..5054e96de5119
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/configuration/DataSourceHttpSettingsOverhaulPackage.tsx
@@ -0,0 +1,175 @@
+import React, { ReactElement, useState } from 'react';
+
+import { DataSourceSettings } from '@grafana/data';
+import { Auth, ConnectionSettings, convertLegacyAuthProps, AuthMethod } from '@grafana/experimental';
+import { PromOptions, docsTip, overhaulStyles } from '@grafana/prometheus';
+import { SecureSocksProxySettings, useTheme2 } from '@grafana/ui';
+// NEED TO EXPORT THIS FROM GRAFANA/UI FOR EXTERNAL DS
+import { AzureAuthSettings } from '@grafana/ui/src/components/DataSourceSettings/types';
+
+type Props = {
+  options: DataSourceSettings<PromOptions, {}>;
+  onOptionsChange: (options: DataSourceSettings<PromOptions, {}>) => void;
+  azureAuthSettings: AzureAuthSettings;
+  sigV4AuthToggleEnabled: boolean | undefined;
+  renderSigV4Editor: React.ReactNode;
+  secureSocksDSProxyEnabled: boolean;
+};
+
+// these are not available yet in grafana
+export type CustomMethodId = `custom-${string}`;
+
+export type CustomMethod = {
+  id: CustomMethodId;
+  label: string;
+  description: string;
+  component: ReactElement;
+};
+
+export const DataSourcehttpSettingsOverhaul = (props: Props) => {
+  const {
+    options,
+    onOptionsChange,
+    azureAuthSettings,
+    sigV4AuthToggleEnabled,
+    renderSigV4Editor,
+    secureSocksDSProxyEnabled,
+  } = props;
+
+  const newAuthProps = convertLegacyAuthProps({
+    config: options,
+    onChange: onOptionsChange,
+  });
+
+  const theme = useTheme2();
+  const styles = overhaulStyles(theme);
+
+  // for custom auth methods sigV4 and azure auth
+  let customMethods: CustomMethod[] = [];
+
+  const [sigV4Selected, setSigV4Selected] = useState<boolean>(options.jsonData.sigV4Auth || false);
+
+  const sigV4Id = 'custom-sigV4Id';
+
+  const sigV4Option: CustomMethod = {
+    id: sigV4Id,
+    label: 'SigV4 auth',
+    description: 'This is SigV4 auth description',
+    component: <>{renderSigV4Editor}</>,
+  };
+
+  if (sigV4AuthToggleEnabled) {
+    customMethods.push(sigV4Option);
+  }
+
+  const azureAuthEnabled: boolean =
+    (azureAuthSettings?.azureAuthSupported && azureAuthSettings.getAzureAuthEnabled(options)) || false;
+
+  const [azureAuthSelected, setAzureAuthSelected] = useState<boolean>(azureAuthEnabled);
+
+  const azureAuthId = 'custom-azureAuthId';
+
+  const azureAuthOption: CustomMethod = {
+    id: azureAuthId,
+    label: 'Azure auth',
+    description: 'This is Azure auth description',
+    component: (
+      <>
+        {azureAuthSettings.azureSettingsUI && (
+          <azureAuthSettings.azureSettingsUI dataSourceConfig={options} onChange={onOptionsChange} />
+        )}
+      </>
+    ),
+  };
+
+  // allow the option to show in the dropdown
+  if (azureAuthSettings?.azureAuthSupported) {
+    customMethods.push(azureAuthOption);
+  }
+
+  function returnSelectedMethod() {
+    if (sigV4Selected) {
+      return sigV4Id;
+    }
+
+    if (azureAuthSelected) {
+      return azureAuthId;
+    }
+
+    return newAuthProps.selectedMethod;
+  }
+
+  // Do we need this switch anymore? Update the language.
+  let urlTooltip;
+  switch (options.access) {
+    case 'direct':
+      urlTooltip = (
+        <>
+          Your access method is <em>Browser</em>, this means the URL needs to be accessible from the browser.
+          {docsTip()}
+        </>
+      );
+      break;
+    case 'proxy':
+      urlTooltip = (
+        <>
+          Your access method is <em>Server</em>, this means the URL needs to be accessible from the grafana
+          backend/server.
+          {docsTip()}
+        </>
+      );
+      break;
+    default:
+      urlTooltip = <>Specify a complete HTTP URL (for example http://your_server:8080) {docsTip()}</>;
+  }
+
+  return (
+    <>
+      <ConnectionSettings
+        urlPlaceholder="http://localhost:9090"
+        config={options}
+        onChange={onOptionsChange}
+        urlLabel="Prometheus server URL"
+        urlTooltip={urlTooltip}
+      />
+      <hr className={`${styles.hrTopSpace} ${styles.hrBottomSpace}`} />
+      <Auth
+        {...newAuthProps}
+        customMethods={customMethods}
+        onAuthMethodSelect={(method) => {
+          // sigV4Id
+          if (sigV4AuthToggleEnabled) {
+            setSigV4Selected(method === sigV4Id);
+          }
+
+          // Azure
+          if (azureAuthSettings?.azureAuthSupported) {
+            setAzureAuthSelected(method === azureAuthId);
+            azureAuthSettings.setAzureAuthEnabled(options, method === azureAuthId);
+          }
+
+          onOptionsChange({
+            ...options,
+            basicAuth: method === AuthMethod.BasicAuth,
+            withCredentials: method === AuthMethod.CrossSiteCredentials,
+            jsonData: {
+              ...options.jsonData,
+              sigV4Auth: method === sigV4Id,
+              oauthPassThru: method === AuthMethod.OAuthForward,
+            },
+          });
+        }}
+        // If your method is selected pass its id to `selectedMethod`,
+        // otherwise pass the id from converted legacy data
+        selectedMethod={returnSelectedMethod()}
+      />
+      <div className={styles.sectionBottomPadding} />
+      {secureSocksDSProxyEnabled && (
+        <>
+          <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
+          <div className={styles.sectionBottomPadding} />
+        </>
+      )}
+    </>
+  );
+};
diff --git a/public/app/plugins/datasource/prometheus/configuration/ExemplarSetting.tsx b/public/app/plugins/datasource/prometheus/configuration/ExemplarSetting.tsx
index f74752c420de8..21d4fe5464b54 100644
--- a/public/app/plugins/datasource/prometheus/configuration/ExemplarSetting.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/ExemplarSetting.tsx
@@ -40,7 +40,7 @@ export default function ExemplarSetting({ value, onChange, onDelete, disabled }:
         <>
           <Switch
             value={isInternalLink}
-            aria-label={selectors.components.DataSource.Prometheus.configPage.internalLinkSwitch}
+            data-testid={selectors.components.DataSource.Prometheus.configPage.internalLinkSwitch}
             onChange={(ev) => setIsInternalLink(ev.currentTarget.checked)}
           />
         </>
diff --git a/public/app/plugins/datasource/prometheus/configuration/ExemplarsSettings.tsx b/public/app/plugins/datasource/prometheus/configuration/ExemplarsSettings.tsx
index a62c050c5a3ce..f0fb8c1f3f272 100644
--- a/public/app/plugins/datasource/prometheus/configuration/ExemplarsSettings.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/ExemplarsSettings.tsx
@@ -46,7 +46,7 @@ export function ExemplarsSettings({ options, onChange, disabled }: Props) {
         {!disabled && (
           <Button
             variant="secondary"
-            aria-label={selectors.components.DataSource.Prometheus.configPage.exemplarsAddButton}
+            data-testid={selectors.components.DataSource.Prometheus.configPage.exemplarsAddButton}
             className={css`
               margin-bottom: 10px;
             `}
diff --git a/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx b/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx
index d310c8044180b..7d11f4d9bad7d 100644
--- a/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx
@@ -8,6 +8,7 @@ import {
   SelectableValue,
   updateDatasourcePluginJsonDataOption,
 } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import { ConfigSubSection } from '@grafana/experimental';
 import { getBackendSrv } from '@grafana/runtime/src';
 import { InlineField, Input, Select, Switch, useTheme2 } from '@grafana/ui';
@@ -202,6 +203,7 @@ export const PromSettings = (props: Props) => {
                         timeInterval: e.currentTarget.value,
                       })
                     }
+                    data-testid={selectors.components.DataSource.Prometheus.configPage.scrapeInterval}
                   />
                   {validateInput(validDuration.timeInterval, DURATION_REGEX, durationError)}
                 </>
@@ -231,6 +233,7 @@ export const PromSettings = (props: Props) => {
                         queryTimeout: e.currentTarget.value,
                       })
                     }
+                    data-testid={selectors.components.DataSource.Prometheus.configPage.queryTimeout}
                   />
                   {validateInput(validDuration.queryTimeout, DURATION_REGEX, durationError)}
                 </>
@@ -259,6 +262,7 @@ export const PromSettings = (props: Props) => {
                 }
                 onChange={onChangeHandler('defaultEditor', options, onOptionsChange)}
                 width={40}
+                data-testid={selectors.components.DataSource.Prometheus.configPage.defaultEditor}
               />
             </InlineField>
           </div>
@@ -280,6 +284,7 @@ export const PromSettings = (props: Props) => {
               <Switch
                 value={options.jsonData.disableMetricsLookup ?? false}
                 onChange={onUpdateDatasourceJsonDataOptionChecked(props, 'disableMetricsLookup')}
+                id={selectors.components.DataSource.Prometheus.configPage.disableMetricLookup}
               />
             </InlineField>
           </div>
@@ -338,6 +343,7 @@ export const PromSettings = (props: Props) => {
                     }
                   )}
                   width={40}
+                  data-testid={selectors.components.DataSource.Prometheus.configPage.prometheusType}
                 />
               </InlineField>
             </div>
@@ -365,6 +371,7 @@ export const PromSettings = (props: Props) => {
                     )}
                     onChange={onChangeHandler('prometheusVersion', options, onOptionsChange)}
                     width={40}
+                    data-testid={selectors.components.DataSource.Prometheus.configPage.prometheusVersion}
                   />
                 </InlineField>
               </div>
@@ -392,6 +399,7 @@ export const PromSettings = (props: Props) => {
                   value={
                     cacheValueOptions.find((o) => o.value === options.jsonData.cacheLevel) ?? PrometheusCacheLevel.Low
                   }
+                  data-testid={selectors.components.DataSource.Prometheus.configPage.cacheLevel}
                 />
               </InlineField>
             </div>
@@ -416,6 +424,7 @@ export const PromSettings = (props: Props) => {
                 <Switch
                   value={options.jsonData.incrementalQuerying ?? false}
                   onChange={onUpdateDatasourceJsonDataOptionChecked(props, 'incrementalQuerying')}
+                  id={selectors.components.DataSource.Prometheus.configPage.incrementalQuerying}
                 />
               </InlineField>
             </div>
@@ -447,6 +456,7 @@ export const PromSettings = (props: Props) => {
                     value={options.jsonData.incrementalQueryOverlapWindow ?? defaultPrometheusQueryOverlapWindow}
                     onChange={onChangeHandler('incrementalQueryOverlapWindow', options, onOptionsChange)}
                     spellCheck={false}
+                    data-testid={selectors.components.DataSource.Prometheus.configPage.queryOverlapWindow}
                   />
                   {validateInput(validDuration.incrementalQueryOverlapWindow, MULTIPLE_DURATION_REGEX, durationError)}
                 </>
@@ -467,6 +477,7 @@ export const PromSettings = (props: Props) => {
                 <Switch
                   value={options.jsonData.disableRecordingRules ?? false}
                   onChange={onUpdateDatasourceJsonDataOptionChecked(props, 'disableRecordingRules')}
+                  id={selectors.components.DataSource.Prometheus.configPage.disableRecordingRules}
                 />
               </InlineField>
             </div>
@@ -496,6 +507,7 @@ export const PromSettings = (props: Props) => {
                   onChange={onChangeHandler('customQueryParameters', options, onOptionsChange)}
                   spellCheck={false}
                   placeholder="Example: max_source_resolution=5m&timeout=10"
+                  data-testid={selectors.components.DataSource.Prometheus.configPage.customQueryParameters}
                 />
               </InlineField>
             </div>
@@ -522,6 +534,7 @@ export const PromSettings = (props: Props) => {
                   options={httpOptions}
                   value={httpOptions.find((o) => o.value === options.jsonData.httpMethod)}
                   onChange={onChangeHandler('httpMethod', options, onOptionsChange)}
+                  data-testid={selectors.components.DataSource.Prometheus.configPage.httpMethod}
                 />
               </InlineField>
             </div>
@@ -549,11 +562,11 @@ export const getValueFromEventItem = (eventItem: SyntheticEvent<HTMLInputElement
     return '';
   }
 
-  if (eventItem.hasOwnProperty('currentTarget')) {
+  if ('currentTarget' in eventItem) {
     return eventItem.currentTarget.value;
   }
 
-  return (eventItem as SelectableValue<string>).value;
+  return eventItem.value;
 };
 
 const onChangeHandler =
diff --git a/public/app/plugins/datasource/prometheus/configuration/mocks.ts b/public/app/plugins/datasource/prometheus/configuration/mocks.ts
index 8a78cdbd7dcc8..3e5d98f389588 100644
--- a/public/app/plugins/datasource/prometheus/configuration/mocks.ts
+++ b/public/app/plugins/datasource/prometheus/configuration/mocks.ts
@@ -9,7 +9,6 @@ export function createDefaultConfigOptions(): DataSourceSettings<PromOptions> {
       timeInterval: '1m',
       queryTimeout: '1m',
       httpMethod: 'GET',
-      directUrl: 'url',
     },
   });
 }
diff --git a/public/app/plugins/datasource/prometheus/dashboards/grafana_stats.json b/public/app/plugins/datasource/prometheus/dashboards/grafana_stats.json
index b39453b231a6e..a121de7fe5a8e 100644
--- a/public/app/plugins/datasource/prometheus/dashboards/grafana_stats.json
+++ b/public/app/plugins/datasource/prometheus/dashboards/grafana_stats.json
@@ -543,10 +543,10 @@
       "pluginVersion": "8.1.0-pre",
       "targets": [
         {
-          "expr": "sum by (statuscode) (irate(http_request_total{job='grafana'}[5m]))",
+          "expr": "sum by (status_code) (irate(grafana_http_request_duration_seconds_count[5m]))",
           "format": "time_series",
           "intervalFactor": 3,
-          "legendFormat": "{{statuscode}}",
+          "legendFormat": "{{status_code}}",
           "refId": "B",
           "step": 15,
           "target": "dev.grafana.cb-office.alerting.active_alerts"
@@ -735,7 +735,7 @@
       ],
       "targets": [
         {
-          "expr": "sort(topk(8, sum by (handler) (http_request_total{job=\"grafana\"})))",
+          "expr": "sort(topk(8, sum by (handler) (grafana_http_request_duration_seconds_count)))",
           "format": "time_series",
           "instant": true,
           "intervalFactor": 10,
@@ -1183,5 +1183,5 @@
   "timezone": "",
   "title": "Grafana metrics",
   "uid": "isFoa0z7k",
-  "version": 2
+  "version": 3
 }
diff --git a/public/app/plugins/datasource/prometheus/dataquery.cue b/public/app/plugins/datasource/prometheus/dataquery.cue
deleted file mode 100644
index 934c72263f219..0000000000000
--- a/public/app/plugins/datasource/prometheus/dataquery.cue
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2023 Grafana Labs
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package grafanaplugin
-
-import (
-	common "github.com/grafana/grafana/packages/grafana-schema/src/common"
-)
-
-composableKinds: DataQuery: {
-	maturity: "experimental"
-
-	lineage: {
-		schemas: [{
-			version: [0, 0]
-			schema: {
-				common.DataQuery
-
-				// The actual expression/query that will be evaluated by Prometheus
-				expr: string
-				// Returns only the latest value that Prometheus has scraped for the requested time series
-				instant?: bool
-				// Returns a Range vector, comprised of a set of time series containing a range of data points over time for each time series
-				range?: bool
-				// Execute an additional query to identify interesting raw samples relevant for the given expr
-				exemplar?: bool
-				// Specifies which editor is being used to prepare the query. It can be "code" or "builder"
-				editorMode?: #QueryEditorMode
-				// Query format to determine how to display data points in panel. It can be "time_series", "table", "heatmap"
-				format?: #PromQueryFormat
-				// Series name override or template. Ex. {{hostname}} will be replaced with label value for hostname
-				legendFormat?: string
-				// @deprecated Used to specify how many times to divide max data points by. We use max data points under query options
-				// See https://github.com/grafana/grafana/issues/48081
-				intervalFactor?: number
-
-				#QueryEditorMode: "code" | "builder"                  @cuetsy(kind="enum")
-				#PromQueryFormat: "time_series" | "table" | "heatmap" @cuetsy(kind="type")
-			}
-		}]
-		lenses: []
-	}
-}
diff --git a/public/app/plugins/datasource/prometheus/dataquery.ts b/public/app/plugins/datasource/prometheus/dataquery.ts
new file mode 100644
index 0000000000000..54f6cd7bac909
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/dataquery.ts
@@ -0,0 +1,49 @@
+import { Scope } from '@grafana/data';
+import * as common from '@grafana/schema';
+
+export enum QueryEditorMode {
+  Builder = 'builder',
+  Code = 'code',
+}
+
+export type PromQueryFormat = 'time_series' | 'table' | 'heatmap';
+
+export interface Prometheus extends common.DataQuery {
+  /**
+   * Specifies which editor is being used to prepare the query. It can be "code" or "builder"
+   */
+  editorMode?: QueryEditorMode;
+  /**
+   * Execute an additional query to identify interesting raw samples relevant for the given expr
+   */
+  exemplar?: boolean;
+  /**
+   * The actual expression/query that will be evaluated by Prometheus
+   */
+  expr: string;
+  /**
+   * Query format to determine how to display data points in panel. It can be "time_series", "table", "heatmap"
+   */
+  format?: PromQueryFormat;
+  /**
+   * Returns only the latest value that Prometheus has scraped for the requested time series
+   */
+  instant?: boolean;
+  /**
+   * @deprecated Used to specify how many times to divide max data points by. We use max data points under query options
+   * See https://github.com/grafana/grafana/issues/48081
+   */
+  intervalFactor?: number;
+  /**
+   * Series name override or template. Ex. {{hostname}} will be replaced with label value for hostname
+   */
+  legendFormat?: string;
+  /**
+   * Returns a Range vector, comprised of a set of time series containing a range of data points over time for each time series
+   */
+  range?: boolean;
+  /**
+   * A scope object that will be used by Prometheus
+   */
+  scope?: Scope;
+}
diff --git a/public/app/plugins/datasource/prometheus/datasource.test.ts b/public/app/plugins/datasource/prometheus/datasource.test.ts
index afdaf6a19ffbd..c740af7f85d86 100644
--- a/public/app/plugins/datasource/prometheus/datasource.test.ts
+++ b/public/app/plugins/datasource/prometheus/datasource.test.ts
@@ -1,24 +1,20 @@
 import { cloneDeep } from 'lodash';
-import { lastValueFrom, of, throwError } from 'rxjs';
+import { lastValueFrom, of } from 'rxjs';
 
 import {
   AnnotationEvent,
   AnnotationQueryRequest,
   CoreApp,
+  CustomVariableModel,
   DataQueryRequest,
-  DataQueryResponse,
-  DataQueryResponseData,
   DataSourceInstanceSettings,
   dateTime,
-  Field,
-  getFieldDisplayName,
   LoadingState,
-  toDataFrame,
+  rangeUtil,
+  TimeRange,
   VariableHide,
 } from '@grafana/data';
-import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
-import { TemplateSrv } from 'app/features/templating/template_srv';
-import { QueryOptions } from 'app/types';
+import { TemplateSrv } from '@grafana/runtime';
 
 import {
   alignRange,
@@ -28,16 +24,18 @@ import {
   prometheusSpecialRegexEscape,
 } from './datasource';
 import PromQlLanguageProvider from './language_provider';
-import { PrometheusCacheLevel, PromOptions, PromQuery, PromQueryRequest } from './types';
+import { PromApplication, PrometheusCacheLevel, PromOptions, PromQuery, PromQueryRequest } from './types';
 
 const fetchMock = jest.fn().mockReturnValue(of(createDefaultPromResponse()));
 
 jest.mock('./metric_find_query');
+
 jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
   getBackendSrv: () => ({
     fetch: fetchMock,
   }),
+  getTemplateSrv: () => templateSrvStub,
 }));
 
 const replaceMock = jest.fn().mockImplementation((a: string, ...rest: unknown[]) => a);
@@ -49,23 +47,23 @@ const templateSrvStub = {
 const fromSeconds = 1674500289215;
 const toSeconds = 1674500349215;
 
-const timeSrvStubOld = {
-  timeRange() {
-    return {
-      from: dateTime(1531468681),
-      to: dateTime(1531489712),
-    };
+const mockTimeRangeOld: TimeRange = {
+  from: dateTime(1531468681),
+  to: dateTime(1531489712),
+  raw: {
+    from: '1531468681',
+    to: '1531489712',
   },
-} as TimeSrv;
-
-const timeSrvStub: TimeSrv = {
-  timeRange() {
-    return {
-      from: dateTime(fromSeconds),
-      to: dateTime(toSeconds),
-    };
+};
+
+const mockTimeRange: TimeRange = {
+  from: dateTime(fromSeconds),
+  to: dateTime(toSeconds),
+  raw: {
+    from: fromSeconds.toString(),
+    to: toSeconds.toString(),
   },
-} as TimeSrv;
+};
 
 beforeEach(() => {
   jest.clearAllMocks();
@@ -77,9 +75,9 @@ describe('PrometheusDatasource', () => {
     url: 'proxied',
     id: 1,
     uid: 'ABCDEF',
-    directUrl: 'direct',
     user: 'test',
     password: 'mupp',
+    access: 'proxy',
     jsonData: {
       customQueryParameters: '',
       cacheLevel: PrometheusCacheLevel.Low,
@@ -87,7 +85,7 @@ describe('PrometheusDatasource', () => {
   } as unknown as DataSourceInstanceSettings<PromOptions>;
 
   beforeEach(() => {
-    ds = new PrometheusDatasource(instanceSettings, templateSrvStub, timeSrvStub);
+    ds = new PrometheusDatasource(instanceSettings, templateSrvStub);
   });
 
   // Some functions are required by the parent datasource class to provide functionality such as ad-hoc filters, which requires the definition of the getTagKeys, and getTagValues functions
@@ -100,36 +98,14 @@ describe('PrometheusDatasource', () => {
     });
   });
 
-  describe('Query', () => {
-    it('returns empty array when no queries', async () => {
-      await expect(ds.query(createDataRequest([]))).toEmitValuesWith((response) => {
-        expect(response[0].data).toEqual([]);
-        expect(response[0].state).toBe(LoadingState.Done);
-      });
-    });
-
-    it('performs time series queries', async () => {
-      await expect(ds.query(createDataRequest([{}]))).toEmitValuesWith((response) => {
-        expect(response[0].data.length).not.toBe(0);
-        expect(response[0].state).toBe(LoadingState.Done);
-      });
-    });
-
-    it('with 2 queries and used from Explore, sends results as they arrive', async () => {
-      await expect(ds.query(createDataRequest([{}, {}], { app: CoreApp.Explore }))).toEmitValuesWith((response) => {
-        expect(response[0].data.length).not.toBe(0);
-        expect(response[0].state).toBe(LoadingState.Loading);
-        expect(response[1].state).toBe(LoadingState.Done);
-      });
-    });
-
-    it('with 2 queries and used from Panel, waits for all to finish until sending Done status', async () => {
-      await expect(ds.query(createDataRequest([{}, {}], { app: CoreApp.Dashboard }))).toEmitValuesWith((response) => {
-        expect(response[0].data.length).not.toBe(0);
-        expect(response[0].state).toBe(LoadingState.Done);
-      });
+  describe('Type and version', () => {
+    it('Default support labels match endpoint over series when type and version not set', () => {
+      const labelsMatchSupport = ds.hasLabelsMatchAPISupport();
+      expect(labelsMatchSupport).toBe(true);
     });
+  });
 
+  describe('Query', () => {
     it('throws if using direct access', async () => {
       const instanceSettings = {
         url: 'proxied',
@@ -139,13 +115,28 @@ describe('PrometheusDatasource', () => {
         access: 'direct',
         jsonData: {
           customQueryParameters: '',
+          prometheusVersion: '2.20.0',
+          prometheusType: PromApplication.Prometheus,
         },
       } as unknown as DataSourceInstanceSettings<PromOptions>;
       const range = { from: time({ seconds: 63 }), to: time({ seconds: 183 }) };
-      const directDs = new PrometheusDatasource(instanceSettings, templateSrvStub, timeSrvStub);
+      const directDs = new PrometheusDatasource(instanceSettings, templateSrvStub);
 
       await expect(
-        lastValueFrom(directDs.query(createDataRequest([{}, {}], { app: CoreApp.Dashboard })))
+        lastValueFrom(
+          directDs.query(
+            createDataRequest(
+              [
+                {
+                  expr: '',
+                  refId: 'A',
+                },
+                { expr: '', refId: 'B' },
+              ],
+              { app: CoreApp.Dashboard }
+            )
+          )
+        )
       ).rejects.toMatchObject({ message: expect.stringMatching('Browser access') });
 
       // Cannot test because some other tests need "./metric_find_query" to be mocked and that prevents this to be
@@ -191,7 +182,7 @@ describe('PrometheusDatasource', () => {
     it('should still perform a GET request with the DS HTTP method set to POST and not POST-friendly endpoint', () => {
       const postSettings = cloneDeep(instanceSettings);
       postSettings.jsonData.httpMethod = 'POST';
-      const promDs = new PrometheusDatasource(postSettings, templateSrvStub, timeSrvStub);
+      const promDs = new PrometheusDatasource(postSettings, templateSrvStub);
       promDs.metadataRequest('/foo');
       expect(fetchMock.mock.calls.length).toBe(1);
       expect(fetchMock.mock.calls[0][0].method).toBe('GET');
@@ -199,7 +190,7 @@ describe('PrometheusDatasource', () => {
     it('should try to perform a POST request with the DS HTTP method set to POST and POST-friendly endpoint', () => {
       const postSettings = cloneDeep(instanceSettings);
       postSettings.jsonData.httpMethod = 'POST';
-      const promDs = new PrometheusDatasource(postSettings, templateSrvStub, timeSrvStub);
+      const promDs = new PrometheusDatasource(postSettings, templateSrvStub);
       promDs.metadataRequest('api/v1/series', { bar: 'baz baz', foo: 'foo' });
       expect(fetchMock.mock.calls.length).toBe(1);
       expect(fetchMock.mock.calls[0][0].method).toBe('POST');
@@ -209,21 +200,10 @@ describe('PrometheusDatasource', () => {
   });
 
   describe('customQueryParams', () => {
-    const target: PromQuery = { expr: 'test{job="testjob"}', format: 'time_series', refId: '' };
-
-    function makeQuery(target: PromQuery) {
-      return {
-        range: { from: time({ seconds: 63 }), to: time({ seconds: 183 }) },
-        targets: [target],
-        interval: '60s',
-      } as DataQueryRequest<PromQuery>;
-    }
-
     describe('with GET http method', () => {
       const promDs = new PrometheusDatasource(
         { ...instanceSettings, jsonData: { customQueryParameters: 'customQuery=123', httpMethod: 'GET' } },
-        templateSrvStub,
-        timeSrvStub
+        templateSrvStub
       );
 
       it('added to metadata request', () => {
@@ -231,34 +211,12 @@ describe('PrometheusDatasource', () => {
         expect(fetchMock.mock.calls.length).toBe(1);
         expect(fetchMock.mock.calls[0][0].url).toBe('/api/datasources/uid/ABCDEF/resources/foo?customQuery=123');
       });
-
-      it('adds params to timeseries query', () => {
-        promDs.query(makeQuery(target));
-        expect(fetchMock.mock.calls.length).toBe(1);
-        expect(fetchMock.mock.calls[0][0].url).toBe(
-          'proxied/api/v1/query_range?query=test%7Bjob%3D%22testjob%22%7D&start=60&end=180&step=60&customQuery=123'
-        );
-      });
-      it('adds params to exemplars query', () => {
-        promDs.query(makeQuery({ ...target, exemplar: true }));
-        // We do also range query for single exemplars target
-        expect(fetchMock.mock.calls.length).toBe(2);
-        expect(fetchMock.mock.calls[0][0].url).toContain('&customQuery=123');
-        expect(fetchMock.mock.calls[1][0].url).toContain('&customQuery=123');
-      });
-
-      it('adds params to instant query', () => {
-        promDs.query(makeQuery({ ...target, instant: true }));
-        expect(fetchMock.mock.calls.length).toBe(1);
-        expect(fetchMock.mock.calls[0][0].url).toContain('&customQuery=123');
-      });
     });
 
     describe('with POST http method', () => {
       const promDs = new PrometheusDatasource(
         { ...instanceSettings, jsonData: { customQueryParameters: 'customQuery=123', httpMethod: 'POST' } },
-        templateSrvStub,
-        timeSrvStub
+        templateSrvStub
       );
 
       it('added to metadata request with non-POST endpoint', () => {
@@ -273,32 +231,6 @@ describe('PrometheusDatasource', () => {
         expect(fetchMock.mock.calls[0][0].url).toBe('/api/datasources/uid/ABCDEF/resources/api/v1/labels');
         expect(fetchMock.mock.calls[0][0].data.customQuery).toBe('123');
       });
-
-      it('adds params to timeseries query', () => {
-        promDs.query(makeQuery(target));
-        expect(fetchMock.mock.calls.length).toBe(1);
-        expect(fetchMock.mock.calls[0][0].url).toBe('proxied/api/v1/query_range');
-        expect(fetchMock.mock.calls[0][0].data).toEqual({
-          customQuery: '123',
-          query: 'test{job="testjob"}',
-          step: 60,
-          end: 180,
-          start: 60,
-        });
-      });
-      it('adds params to exemplars query', () => {
-        promDs.query(makeQuery({ ...target, exemplar: true }));
-        // We do also range query for single exemplars target
-        expect(fetchMock.mock.calls.length).toBe(2);
-        expect(fetchMock.mock.calls[0][0].data.customQuery).toBe('123');
-        expect(fetchMock.mock.calls[1][0].data.customQuery).toBe('123');
-      });
-
-      it('adds params to instant query', () => {
-        promDs.query(makeQuery({ ...target, instant: true }));
-        expect(fetchMock.mock.calls.length).toBe(1);
-        expect(fetchMock.mock.calls[0][0].data.customQuery).toBe('123');
-      });
     });
   });
 
@@ -307,7 +239,12 @@ describe('PrometheusDatasource', () => {
     const target: PromQuery = { expr: DEFAULT_QUERY_EXPRESSION, refId: 'A' };
 
     it('should not modify expression with no filters', () => {
-      const result = ds.createQuery(target, { interval: '15s' } as DataQueryRequest<PromQuery>, 0, 0);
+      const result = ds.createQuery(
+        target,
+        { interval: '15s', range: getMockTimeRange() } as DataQueryRequest<PromQuery>,
+        0,
+        0
+      );
       expect(result).toMatchObject({ expr: DEFAULT_QUERY_EXPRESSION });
     });
 
@@ -324,7 +261,12 @@ describe('PrometheusDatasource', () => {
           value: 'v2',
         },
       ];
-      const result = ds.createQuery(target, { interval: '15s', filters } as DataQueryRequest<PromQuery>, 0, 0);
+      const result = ds.createQuery(
+        target,
+        { interval: '15s', range: getMockTimeRange(), filters } as DataQueryRequest<PromQuery>,
+        0,
+        0
+      );
       expect(result).toMatchObject({ expr: 'metric{job="foo", k1="v1", k2!="v2"} - metric{k1="v1", k2!="v2"}' });
     });
 
@@ -342,102 +284,18 @@ describe('PrometheusDatasource', () => {
         },
       ];
 
-      const result = ds.createQuery(target, { interval: '15s', filters } as DataQueryRequest<PromQuery>, 0, 0);
+      const result = ds.createQuery(
+        target,
+        { interval: '15s', range: getMockTimeRange(), filters } as DataQueryRequest<PromQuery>,
+        0,
+        0
+      );
       expect(result).toMatchObject({
         expr: `metric{job="foo", k1=~"v.*", k2=~"v\\\\'.*"} - metric{k1=~"v.*", k2=~"v\\\\'.*"}`,
       });
     });
   });
 
-  describe('When converting prometheus histogram to heatmap format', () => {
-    let query: DataQueryRequest<PromQuery>;
-
-    beforeEach(() => {
-      query = {
-        range: { from: dateTime(1443454528000), to: dateTime(1443454528000) },
-        targets: [{ expr: 'test{job="testjob"}', format: 'heatmap', legendFormat: '{{le}}' }],
-        interval: '1s',
-      } as DataQueryRequest<PromQuery>;
-    });
-
-    it('should convert cumulative histogram to ordinary', async () => {
-      const resultMock = [
-        {
-          metric: { __name__: 'metric', job: 'testjob', le: '10' },
-          values: [
-            [1443454528.0, '10'],
-            [1443454528.0, '10'],
-          ],
-        },
-        {
-          metric: { __name__: 'metric', job: 'testjob', le: '20' },
-          values: [
-            [1443454528.0, '20'],
-            [1443454528.0, '10'],
-          ],
-        },
-        {
-          metric: { __name__: 'metric', job: 'testjob', le: '30' },
-          values: [
-            [1443454528.0, '25'],
-            [1443454528.0, '10'],
-          ],
-        },
-      ];
-      const responseMock = { data: { data: { result: resultMock } } };
-
-      ds.performTimeSeriesQuery = jest.fn().mockReturnValue(of(responseMock));
-      await expect(ds.query(query)).toEmitValuesWith((result) => {
-        const results = result[0].data;
-        expect(results[0].fields[1].values).toEqual([10, 10]);
-        expect(results[0].fields[2].values).toEqual([10, 0]);
-        expect(results[0].fields[3].values).toEqual([5, 0]);
-      });
-    });
-
-    it('should sort series by label value', async () => {
-      const resultMock = [
-        {
-          metric: { __name__: 'metric', job: 'testjob', le: '2' },
-          values: [
-            [1443454528.0, '10'],
-            [1443454528.0, '10'],
-          ],
-        },
-        {
-          metric: { __name__: 'metric', job: 'testjob', le: '4' },
-          values: [
-            [1443454528.0, '20'],
-            [1443454528.0, '10'],
-          ],
-        },
-        {
-          metric: { __name__: 'metric', job: 'testjob', le: '+Inf' },
-          values: [
-            [1443454528.0, '25'],
-            [1443454528.0, '10'],
-          ],
-        },
-        {
-          metric: { __name__: 'metric', job: 'testjob', le: '1' },
-          values: [
-            [1443454528.0, '25'],
-            [1443454528.0, '10'],
-          ],
-        },
-      ];
-      const responseMock = { data: { data: { result: resultMock } } };
-
-      const expected = ['1', '2', '4', '+Inf'];
-
-      ds.performTimeSeriesQuery = jest.fn().mockReturnValue(of(responseMock));
-      await expect(ds.query(query)).toEmitValuesWith((result) => {
-        const seriesLabels = result[0].data[0].fields.slice(1).map((field: Field) => getFieldDisplayName(field));
-        expect(seriesLabels).toEqual(expected);
-      });
-    });
-  });
-
   describe('Test query range snapping', () => {
     it('test default 1 minute quantization', () => {
       const dataSource = new PrometheusDatasource(
@@ -445,10 +303,9 @@ describe('PrometheusDatasource', () => {
           ...instanceSettings,
           jsonData: { ...instanceSettings.jsonData, cacheLevel: PrometheusCacheLevel.Low },
         },
-        templateSrvStub as unknown as TemplateSrv,
-        timeSrvStub as unknown as TimeSrv
+        templateSrvStub as unknown as TemplateSrv
       );
-      const quantizedRange = dataSource.getAdjustedInterval();
+      const quantizedRange = dataSource.getAdjustedInterval(mockTimeRange);
       // For "1 minute" the window contains all the minutes, so a query from 1:11:09 - 1:12:09 becomes 1:11 - 1:13
       expect(parseInt(quantizedRange.end, 10) - parseInt(quantizedRange.start, 10)).toBe(120);
     });
@@ -459,10 +316,9 @@ describe('PrometheusDatasource', () => {
           ...instanceSettings,
           jsonData: { ...instanceSettings.jsonData, cacheLevel: PrometheusCacheLevel.Medium },
         },
-        templateSrvStub as unknown as TemplateSrv,
-        timeSrvStub as unknown as TimeSrv
+        templateSrvStub as unknown as TemplateSrv
       );
-      const quantizedRange = dataSource.getAdjustedInterval();
+      const quantizedRange = dataSource.getAdjustedInterval(mockTimeRange);
       expect(parseInt(quantizedRange.end, 10) - parseInt(quantizedRange.start, 10)).toBe(600);
     });
 
@@ -472,10 +328,9 @@ describe('PrometheusDatasource', () => {
           ...instanceSettings,
           jsonData: { ...instanceSettings.jsonData, cacheLevel: PrometheusCacheLevel.High },
         },
-        templateSrvStub as unknown as TemplateSrv,
-        timeSrvStub as unknown as TimeSrv
+        templateSrvStub as unknown as TemplateSrv
       );
-      const quantizedRange = dataSource.getAdjustedInterval();
+      const quantizedRange = dataSource.getAdjustedInterval(mockTimeRange);
       expect(parseInt(quantizedRange.end, 10) - parseInt(quantizedRange.start, 10)).toBe(3600);
     });
 
@@ -485,10 +340,9 @@ describe('PrometheusDatasource', () => {
           ...instanceSettings,
           jsonData: { ...instanceSettings.jsonData, cacheLevel: PrometheusCacheLevel.None },
         },
-        templateSrvStub as unknown as TemplateSrv,
-        timeSrvStub as unknown as TimeSrv
+        templateSrvStub as unknown as TemplateSrv
       );
-      const quantizedRange = dataSource.getAdjustedInterval();
+      const quantizedRange = dataSource.getAdjustedInterval(mockTimeRange);
       expect(parseInt(quantizedRange.end, 10) - parseInt(quantizedRange.start, 10)).toBe(
         (toSeconds - fromSeconds) / 1000
       );
@@ -620,7 +474,7 @@ describe('PrometheusDatasource', () => {
   });
 
   describe('When interpolating variables', () => {
-    let customVariable: any;
+    let customVariable: CustomVariableModel;
     beforeEach(() => {
       customVariable = {
         id: '',
@@ -633,11 +487,14 @@ describe('PrometheusDatasource', () => {
         current: {},
         name: '',
         type: 'custom',
-        label: null,
+        error: null,
+        rootStateKey: '',
+        state: LoadingState.Done,
+        description: '',
+        label: undefined,
         hide: VariableHide.dontHide,
         skipUrlSync: false,
         index: -1,
-        initLock: null,
       };
     });
 
@@ -649,7 +506,7 @@ describe('PrometheusDatasource', () => {
 
     describe('and value is a number', () => {
       it('should return a number', () => {
-        expect(ds.interpolateQueryExpr(1000 as any, customVariable)).toEqual(1000);
+        expect(ds.interpolateQueryExpr(1000 as unknown as string, customVariable)).toEqual(1000);
       });
     });
 
@@ -840,11 +697,10 @@ describe('PrometheusDatasource', () => {
     beforeEach(() => {
       const prometheusDatasource = new PrometheusDatasource(
         { ...instanceSettings, jsonData: { ...instanceSettings.jsonData, cacheLevel: PrometheusCacheLevel.None } },
-        templateSrvStub,
-        timeSrvStubOld
+        templateSrvStub
       );
       const query = 'query_result(topk(5,rate(http_request_duration_microseconds_count[$__interval])))';
-      prometheusDatasource.metricFindQuery(query);
+      prometheusDatasource.metricFindQuery(query, { range: mockTimeRangeOld });
     });
 
     it('should call templateSrv.replace with scopedVars', () => {
@@ -880,7 +736,6 @@ describe('PrometheusDatasource2', () => {
     url: 'proxied',
     id: 1,
     uid: 'ABCDEF',
-    directUrl: 'direct',
     user: 'test',
     password: 'mupp',
     jsonData: { httpMethod: 'GET', cacheLevel: PrometheusCacheLevel.None },
@@ -888,203 +743,7 @@ describe('PrometheusDatasource2', () => {
 
   let ds: PrometheusDatasource;
   beforeEach(() => {
-    ds = new PrometheusDatasource(instanceSettings, templateSrvStub, timeSrvStub);
-  });
-
-  describe('When querying prometheus with one target using query editor target spec', () => {
-    describe('and query syntax is valid', () => {
-      let results: DataQueryResponse;
-      const query = {
-        range: { from: time({ seconds: 63 }), to: time({ seconds: 183 }) },
-        targets: [{ expr: 'test{job="testjob"}', format: 'time_series' }],
-        interval: '60s',
-      } as DataQueryRequest<PromQuery>;
-
-      // Interval alignment with step
-      const urlExpected = `proxied/api/v1/query_range?query=${encodeURIComponent(
-        'test{job="testjob"}'
-      )}&start=60&end=180&step=60`;
-
-      beforeEach(async () => {
-        const response = {
-          data: {
-            status: 'success',
-            data: {
-              resultType: 'matrix',
-              result: [
-                {
-                  metric: { __name__: 'test', job: 'testjob' },
-                  values: [[60, '3846']],
-                },
-              ],
-            },
-          },
-        };
-        fetchMock.mockImplementation(() => of(response));
-        ds.query(query).subscribe((data) => {
-          results = data;
-        });
-      });
-
-      it('should generate the correct query', () => {
-        const res = fetchMock.mock.calls[0][0];
-        expect(res.method).toBe('GET');
-        expect(res.url).toBe(urlExpected);
-      });
-
-      it('should return series list', async () => {
-        const frame = toDataFrame(results.data[0]);
-        expect(results.data.length).toBe(1);
-        expect(getFieldDisplayName(frame.fields[1], frame)).toBe('test{job="testjob"}');
-      });
-    });
-
-    describe('and query syntax is invalid', () => {
-      let results: string;
-      const query = {
-        range: { from: time({ seconds: 63 }), to: time({ seconds: 183 }) },
-        targets: [{ expr: 'tes;;t{job="testjob"}', format: 'time_series' }],
-        interval: '60s',
-      } as DataQueryRequest<PromQuery>;
-
-      const errMessage = 'parse error at char 25: could not parse remaining input';
-      const response = {
-        data: {
-          status: 'error',
-          errorType: 'bad_data',
-          error: errMessage,
-        },
-      };
-
-      it('should generate an error', () => {
-        fetchMock.mockImplementation(() => throwError(response));
-        ds.query(query).subscribe((e: any) => {
-          results = e.message;
-          expect(results).toBe(`"${errMessage}"`);
-        });
-      });
-    });
-  });
-
-  describe('When querying prometheus with one target which returns multiple series', () => {
-    let results: DataQueryResponse;
-    const start = 60;
-    const end = 360;
-    const step = 60;
-
-    const query = {
-      range: { from: time({ seconds: start }), to: time({ seconds: end }) },
-      targets: [{ expr: 'test{job="testjob"}', format: 'time_series' }],
-      interval: '60s',
-    } as DataQueryRequest<PromQuery>;
-
-    beforeEach(async () => {
-      const response = {
-        status: 'success',
-        data: {
-          data: {
-            resultType: 'matrix',
-            result: [
-              {
-                metric: { __name__: 'test', job: 'testjob', series: 'series 1' },
-                values: [
-                  [start + step * 1, '3846'],
-                  [start + step * 3, '3847'],
-                  [end - step * 1, '3848'],
-                ],
-              },
-              {
-                metric: { __name__: 'test', job: 'testjob', series: 'series 2' },
-                values: [[start + step * 2, '4846']],
-              },
-            ],
-          },
-        },
-      };
-
-      fetchMock.mockImplementation(() => of(response));
-
-      ds.query(query).subscribe((data) => {
-        results = data;
-      });
-    });
-
-    it('should be same length', () => {
-      expect(results.data.length).toBe(2);
-      expect(results.data[0].length).toBe((end - start) / step + 1);
-      expect(results.data[1].length).toBe((end - start) / step + 1);
-    });
-
-    it('should fill null until first datapoint in response', () => {
-      expect(results.data[0].fields[0].values[0]).toBe(start * 1000);
-      expect(results.data[0].fields[1].values[0]).toBe(null);
-      expect(results.data[0].fields[0].values[1]).toBe((start + step * 1) * 1000);
-      expect(results.data[0].fields[1].values[1]).toBe(3846);
-    });
-
-    it('should fill null after last datapoint in response', () => {
-      const length = (end - start) / step + 1;
-      expect(results.data[0].fields[0].values[length - 2]).toBe((end - step * 1) * 1000);
-      expect(results.data[0].fields[1].values[length - 2]).toBe(3848);
-      expect(results.data[0].fields[0].values[length - 1]).toBe(end * 1000);
-      expect(results.data[0].fields[1].values[length - 1]).toBe(null);
-    });
-
-    it('should fill null at gap between series', () => {
-      expect(results.data[0].fields[0].values[2]).toBe((start + step * 2) * 1000);
-      expect(results.data[0].fields[1].values[2]).toBe(null);
-      expect(results.data[1].fields[0].values[1]).toBe((start + step * 1) * 1000);
-      expect(results.data[1].fields[1].values[1]).toBe(null);
-      expect(results.data[1].fields[0].values[3]).toBe((start + step * 3) * 1000);
-      expect(results.data[1].fields[1].values[3]).toBe(null);
-    });
-  });
-
-  describe('When querying prometheus with one target and instant = true', () => {
-    let results: DataQueryResponse;
-    const urlExpected = `/api/datasources/uid/ABCDEF/resources/api/v1/query?query=${encodeURIComponent(
-      'test{job="testjob"}'
-    )}&time=123`;
-    const query = {
-      range: { from: time({ seconds: 63 }), to: time({ seconds: 123 }) },
-      targets: [{ expr: 'test{job="testjob"}', format: 'time_series', instant: true }],
-      interval: '60s',
-    } as DataQueryRequest<PromQuery>;
-
-    beforeEach(async () => {
-      const response = {
-        status: 'success',
-        data: {
-          data: {
-            resultType: 'vector',
-            result: [
-              {
-                metric: { __name__: 'test', job: 'testjob' },
-                value: [123, '3846'],
-              },
-            ],
-          },
-        },
-      };
-
-      fetchMock.mockImplementation(() => of(response));
-      ds.query(query).subscribe((data) => {
-        results = data;
-      });
-    });
-
-    it('should generate the correct query', () => {
-      const res = fetchMock.mock.calls[0][0];
-      expect(res.method).toBe('GET');
-      expect(res.url).toBe(urlExpected);
-    });
-
-    it('should return series list', () => {
-      const frame = toDataFrame(results.data[0]);
-      expect(results.data.length).toBe(1);
-      expect(frame.name).toBe('test{job="testjob"}');
-      expect(getFieldDisplayName(frame.fields[1], frame)).toBe('test{job="testjob"}');
-    });
+    ds = new PrometheusDatasource(instanceSettings, templateSrvStub);
   });
 
   describe('annotationQuery', () => {
@@ -1218,7 +877,7 @@ describe('PrometheusDatasource2', () => {
     });
 
     describe('region annotations for sectors', () => {
-      const options: any = {
+      const options = {
         annotation: {
           expr: 'ALERTS{alertstate="firing"}',
           tagKeys: 'job',
@@ -1229,7 +888,7 @@ describe('PrometheusDatasource2', () => {
           from: time({ seconds: 63 }),
           to: time({ seconds: 900 }),
         },
-      };
+      } as unknown as AnnotationQueryRequest;
 
       async function runAnnotationQuery(data: number[][]) {
         let response = createAnnotationResponse();
@@ -1301,569 +960,6 @@ describe('PrometheusDatasource2', () => {
     });
   });
 
-  describe('When resultFormat is table and instant = true', () => {
-    let results: DataQueryResponse;
-    const query = {
-      range: { from: time({ seconds: 63 }), to: time({ seconds: 123 }) },
-      targets: [{ expr: 'test{job="testjob"}', format: 'time_series', instant: true }],
-      interval: '60s',
-    } as DataQueryRequest<PromQuery>;
-
-    beforeEach(async () => {
-      const response = {
-        status: 'success',
-        data: {
-          data: {
-            resultType: 'vector',
-            result: [
-              {
-                metric: { __name__: 'test', job: 'testjob' },
-                value: [123, '3846'],
-              },
-            ],
-          },
-        },
-      };
-
-      fetchMock.mockImplementation(() => of(response));
-      ds.query(query).subscribe((data: any) => {
-        results = data;
-      });
-    });
-
-    it('should return result', () => {
-      expect(results).not.toBe(null);
-    });
-  });
-
-  describe('The "step" query parameter', () => {
-    const response = {
-      status: 'success',
-      data: {
-        data: {
-          resultType: 'matrix',
-          result: [] as DataQueryResponseData[],
-        },
-      },
-    };
-
-    it('should be min interval when greater than auto interval', async () => {
-      const query = {
-        // 6 minute range
-        range: { from: time({ minutes: 1 }), to: time({ minutes: 7 }) },
-        targets: [
-          {
-            expr: 'test',
-            interval: '10s',
-          },
-        ],
-        interval: '5s',
-      } as DataQueryRequest<PromQuery>;
-      const urlExpected = 'proxied/api/v1/query_range?query=test&start=60&end=420&step=10';
-
-      fetchMock.mockImplementation(() => of(response));
-      ds.query(query);
-      const res = fetchMock.mock.calls[0][0];
-      expect(res.method).toBe('GET');
-      expect(res.url).toBe(urlExpected);
-    });
-
-    it('step should be fractional for sub second intervals', async () => {
-      const query = {
-        // 6 minute range
-        range: { from: time({ minutes: 1 }), to: time({ minutes: 7 }) },
-        targets: [{ expr: 'test' }],
-        interval: '100ms',
-      } as DataQueryRequest<PromQuery>;
-      const urlExpected = 'proxied/api/v1/query_range?query=test&start=60&end=420&step=0.1';
-      fetchMock.mockImplementation(() => of(response));
-      ds.query(query);
-      const res = fetchMock.mock.calls[0][0];
-      expect(res.method).toBe('GET');
-      expect(res.url).toBe(urlExpected);
-    });
-
-    it('should be auto interval when greater than min interval', async () => {
-      const query = {
-        // 6 minute range
-        range: { from: time({ minutes: 1 }), to: time({ minutes: 7 }) },
-        targets: [
-          {
-            expr: 'test',
-            interval: '5s',
-          },
-        ],
-        interval: '10s',
-      } as DataQueryRequest<PromQuery>;
-      const urlExpected = 'proxied/api/v1/query_range?query=test&start=60&end=420&step=10';
-      fetchMock.mockImplementation(() => of(response));
-      ds.query(query);
-      const res = fetchMock.mock.calls[0][0];
-      expect(res.method).toBe('GET');
-      expect(res.url).toBe(urlExpected);
-    });
-
-    it('should result in querying fewer than 11000 data points', async () => {
-      const query = {
-        // 6 hour range
-        range: { from: time({ hours: 1 }), to: time({ hours: 7 }) },
-        targets: [{ expr: 'test' }],
-        interval: '1s',
-      } as DataQueryRequest<PromQuery>;
-      const end = 7 * 60 * 60;
-      const start = 60 * 60;
-      const urlExpected = 'proxied/api/v1/query_range?query=test&start=' + start + '&end=' + end + '&step=2';
-      fetchMock.mockImplementation(() => of(response));
-      ds.query(query);
-      const res = fetchMock.mock.calls[0][0];
-      expect(res.method).toBe('GET');
-      expect(res.url).toBe(urlExpected);
-    });
-
-    it('should not apply min interval when interval * intervalFactor greater', async () => {
-      const query = {
-        // 6 minute range
-        range: { from: time({ minutes: 1 }), to: time({ minutes: 7 }) },
-        targets: [
-          {
-            expr: 'test',
-            interval: '10s',
-            intervalFactor: 10,
-          },
-        ],
-        interval: '5s',
-      } as DataQueryRequest<PromQuery>;
-      // times get rounded up to interval
-      const urlExpected = 'proxied/api/v1/query_range?query=test&start=50&end=400&step=50';
-      fetchMock.mockImplementation(() => of(response));
-      ds.query(query);
-      const res = fetchMock.mock.calls[0][0];
-      expect(res.method).toBe('GET');
-      expect(res.url).toBe(urlExpected);
-    });
-
-    it('should apply min interval when interval * intervalFactor smaller', async () => {
-      const query = {
-        // 6 minute range
-        range: { from: time({ minutes: 1 }), to: time({ minutes: 7 }) },
-        targets: [
-          {
-            expr: 'test',
-            interval: '15s',
-            intervalFactor: 2,
-          },
-        ],
-        interval: '5s',
-      } as DataQueryRequest<PromQuery>;
-      const urlExpected = 'proxied/api/v1/query_range?query=test' + '&start=60&end=420&step=15';
-      fetchMock.mockImplementation(() => of(response));
-      ds.query(query);
-      const res = fetchMock.mock.calls[0][0];
-      expect(res.method).toBe('GET');
-      expect(res.url).toBe(urlExpected);
-    });
-
-    it('should apply intervalFactor to auto interval when greater', async () => {
-      const query = {
-        // 6 minute range
-        range: { from: time({ minutes: 1 }), to: time({ minutes: 7 }) },
-        targets: [
-          {
-            expr: 'test',
-            interval: '5s',
-            intervalFactor: 10,
-          },
-        ],
-        interval: '10s',
-      } as DataQueryRequest<PromQuery>;
-      // times get aligned to interval
-      const urlExpected = 'proxied/api/v1/query_range?query=test' + '&start=0&end=400&step=100';
-      fetchMock.mockImplementation(() => of(response));
-      ds.query(query);
-      const res = fetchMock.mock.calls[0][0];
-      expect(res.method).toBe('GET');
-      expect(res.url).toBe(urlExpected);
-    });
-
-    it('should not not be affected by the 11000 data points limit when large enough', async () => {
-      const query = {
-        // 1 week range
-        range: { from: time({}), to: time({ hours: 7 * 24 }) },
-        targets: [
-          {
-            expr: 'test',
-            intervalFactor: 10,
-          },
-        ],
-        interval: '10s',
-      } as DataQueryRequest<PromQuery>;
-      const end = 7 * 24 * 60 * 60;
-      const start = 0;
-      const urlExpected = 'proxied/api/v1/query_range?query=test' + '&start=' + start + '&end=' + end + '&step=100';
-      fetchMock.mockImplementation(() => of(response));
-      ds.query(query);
-      const res = fetchMock.mock.calls[0][0];
-      expect(res.method).toBe('GET');
-      expect(res.url).toBe(urlExpected);
-    });
-
-    it('should be determined by the 11000 data points limit when too small', async () => {
-      const query = {
-        // 1 week range
-        range: { from: time({}), to: time({ hours: 7 * 24 }) },
-        targets: [
-          {
-            expr: 'test',
-            intervalFactor: 10,
-          },
-        ],
-        interval: '5s',
-      } as DataQueryRequest<PromQuery>;
-      let end = 7 * 24 * 60 * 60;
-      end -= end % 55;
-      const start = 0;
-      const step = 55;
-      const adjusted = alignRange(start, end, step, timeSrvStub.timeRange().to.utcOffset() * 60);
-      const urlExpected =
-        'proxied/api/v1/query_range?query=test' +
-        '&start=' +
-        adjusted.start +
-        '&end=' +
-        (adjusted.end + step) +
-        '&step=' +
-        step;
-      fetchMock.mockImplementation(() => of(response));
-      ds.query(query);
-      const res = fetchMock.mock.calls[0][0];
-      expect(res.method).toBe('GET');
-      expect(res.url).toBe(urlExpected);
-    });
-  });
-
-  describe('The __interval and __interval_ms template variables', () => {
-    const response = {
-      status: 'success',
-      data: {
-        data: {
-          resultType: 'matrix',
-          result: [] as DataQueryResponseData[],
-        },
-      },
-    };
-
-    it('should be unchanged when auto interval is greater than min interval', async () => {
-      const query = {
-        // 6 minute range
-        range: { from: time({ minutes: 1 }), to: time({ minutes: 7 }) },
-        targets: [
-          {
-            expr: 'rate(test[$__interval])',
-            interval: '5s',
-          },
-        ],
-        interval: '10s',
-        scopedVars: {
-          __interval: { text: '10s', value: '10s' },
-          __interval_ms: { text: 10 * 1000, value: 10 * 1000 },
-        },
-      };
-
-      const urlExpected =
-        'proxied/api/v1/query_range?query=' +
-        encodeURIComponent('rate(test[$__interval])') +
-        '&start=60&end=420&step=10';
-
-      replaceMock.mockImplementation((str) => str);
-      fetchMock.mockImplementation(() => of(response));
-      ds.query(query as any);
-      const res = fetchMock.mock.calls[0][0];
-      expect(res.method).toBe('GET');
-      expect(res.url).toBe(urlExpected);
-
-      expect(replaceMock.mock.calls[0][1]).toEqual({
-        __interval: {
-          text: '10s',
-          value: '10s',
-        },
-        __interval_ms: {
-          text: 10000,
-          value: 10000,
-        },
-      });
-    });
-
-    it('should be min interval when it is greater than auto interval', async () => {
-      const query = {
-        // 6 minute range
-        range: { from: time({ minutes: 1 }), to: time({ minutes: 7 }) },
-        targets: [
-          {
-            expr: 'rate(test[$__interval])',
-            interval: '10s',
-          },
-        ],
-        interval: '5s',
-        scopedVars: {
-          __interval: { text: '5s', value: '5s' },
-          __interval_ms: { text: 5 * 1000, value: 5 * 1000 },
-        },
-      };
-      const urlExpected =
-        'proxied/api/v1/query_range?query=' +
-        encodeURIComponent('rate(test[$__interval])') +
-        '&start=60&end=420&step=10';
-      fetchMock.mockImplementation(() => of(response));
-      replaceMock.mockImplementation((str) => str);
-      ds.query(query as any);
-      const res = fetchMock.mock.calls[0][0];
-      expect(res.method).toBe('GET');
-      expect(res.url).toBe(urlExpected);
-
-      expect(replaceMock.mock.calls[0][1]).toEqual({
-        __interval: {
-          text: '5s',
-          value: '5s',
-        },
-        __interval_ms: {
-          text: 5000,
-          value: 5000,
-        },
-      });
-    });
-
-    it('should account for intervalFactor', async () => {
-      const query = {
-        // 6 minute range
-        range: { from: time({ minutes: 1 }), to: time({ minutes: 7 }) },
-        targets: [
-          {
-            expr: 'rate(test[$__interval])',
-            interval: '5s',
-            intervalFactor: 10,
-          },
-        ],
-        interval: '10s',
-        scopedVars: {
-          __interval: { text: '10s', value: '10s' },
-          __interval_ms: { text: 10 * 1000, value: 10 * 1000 },
-        },
-      };
-      const urlExpected =
-        'proxied/api/v1/query_range?query=' +
-        encodeURIComponent('rate(test[$__interval])') +
-        '&start=0&end=400&step=100';
-      fetchMock.mockImplementation(() => of(response));
-      replaceMock.mockImplementation((str) => str);
-      ds.query(query as any);
-      const res = fetchMock.mock.calls[0][0];
-      expect(res.method).toBe('GET');
-      expect(res.url).toBe(urlExpected);
-
-      expect(replaceMock.mock.calls[0][1]).toEqual({
-        __interval: {
-          text: '10s',
-          value: '10s',
-        },
-        __interval_ms: {
-          text: 10000,
-          value: 10000,
-        },
-      });
-
-      expect(query.scopedVars.__interval.text).toBe('10s');
-      expect(query.scopedVars.__interval.value).toBe('10s');
-      expect(query.scopedVars.__interval_ms.text).toBe(10 * 1000);
-      expect(query.scopedVars.__interval_ms.value).toBe(10 * 1000);
-    });
-
-    it('should be interval * intervalFactor when greater than min interval', async () => {
-      const query = {
-        // 6 minute range
-        range: { from: time({ minutes: 1 }), to: time({ minutes: 7 }) },
-        targets: [
-          {
-            expr: 'rate(test[$__interval])',
-            interval: '10s',
-            intervalFactor: 10,
-          },
-        ],
-        interval: '5s',
-        scopedVars: {
-          __interval: { text: '5s', value: '5s' },
-          __interval_ms: { text: 5 * 1000, value: 5 * 1000 },
-        },
-      };
-      const urlExpected =
-        'proxied/api/v1/query_range?query=' +
-        encodeURIComponent('rate(test[$__interval])') +
-        '&start=50&end=400&step=50';
-
-      replaceMock.mockImplementation((str) => str);
-      fetchMock.mockImplementation(() => of(response));
-      ds.query(query as any);
-      const res = fetchMock.mock.calls[0][0];
-      expect(res.method).toBe('GET');
-      expect(res.url).toBe(urlExpected);
-
-      expect(replaceMock.mock.calls[0][1]).toEqual({
-        __interval: {
-          text: '5s',
-          value: '5s',
-        },
-        __interval_ms: {
-          text: 5000,
-          value: 5000,
-        },
-      });
-    });
-
-    it('should be min interval when greater than interval * intervalFactor', async () => {
-      const query = {
-        // 6 minute range
-        range: { from: time({ minutes: 1 }), to: time({ minutes: 7 }) },
-        targets: [
-          {
-            expr: 'rate(test[$__interval])',
-            interval: '15s',
-            intervalFactor: 2,
-          },
-        ],
-        interval: '5s',
-        scopedVars: {
-          __interval: { text: '5s', value: '5s' },
-          __interval_ms: { text: 5 * 1000, value: 5 * 1000 },
-        },
-      };
-      const urlExpected =
-        'proxied/api/v1/query_range?query=' +
-        encodeURIComponent('rate(test[$__interval])') +
-        '&start=60&end=420&step=15';
-
-      fetchMock.mockImplementation(() => of(response));
-      ds.query(query as any);
-      const res = fetchMock.mock.calls[0][0];
-      expect(res.method).toBe('GET');
-      expect(res.url).toBe(urlExpected);
-
-      expect(replaceMock.mock.calls[0][1]).toEqual({
-        __interval: {
-          text: '5s',
-          value: '5s',
-        },
-        __interval_ms: {
-          text: 5000,
-          value: 5000,
-        },
-      });
-    });
-
-    it('should be determined by the 11000 data points limit, accounting for intervalFactor', async () => {
-      const query = {
-        // 1 week range
-        range: { from: time({}), to: time({ hours: 7 * 24 }) },
-        targets: [
-          {
-            expr: 'rate(test[$__interval])',
-            intervalFactor: 10,
-          },
-        ],
-        interval: '5s',
-        scopedVars: {
-          __interval: { text: '5s', value: '5s' },
-          __interval_ms: { text: 5 * 1000, value: 5 * 1000 },
-        },
-      };
-      let end = 7 * 24 * 60 * 60;
-      end -= end % 55;
-      const start = 0;
-      const step = 55;
-      const adjusted = alignRange(start, end, step, timeSrvStub.timeRange().to.utcOffset() * 60);
-      const urlExpected =
-        'proxied/api/v1/query_range?query=' +
-        encodeURIComponent('rate(test[$__interval])') +
-        '&start=' +
-        adjusted.start +
-        '&end=' +
-        (adjusted.end + step) +
-        '&step=' +
-        step;
-      fetchMock.mockImplementation(() => of(response));
-      replaceMock.mockImplementation((str) => str);
-      ds.query(query as any);
-      const res = fetchMock.mock.calls[0][0];
-      expect(res.method).toBe('GET');
-      expect(res.url).toBe(urlExpected);
-
-      expect(replaceMock.mock.calls[0][1]).toEqual({
-        __interval: {
-          text: '5s',
-          value: '5s',
-        },
-        __interval_ms: {
-          text: 5000,
-          value: 5000,
-        },
-      });
-    });
-  });
-
-  describe('The __range, __range_s and __range_ms variables', () => {
-    const response = {
-      status: 'success',
-      data: {
-        data: {
-          resultType: 'matrix',
-          result: [] as DataQueryResponseData[],
-        },
-      },
-    };
-
-    it('should use overridden ranges, not dashboard ranges', async () => {
-      const expectedRangeSecond = 3600;
-      const expectedRangeString = '3600s';
-      const query = {
-        range: {
-          from: time({}),
-          to: time({ hours: 1 }),
-        },
-        targets: [
-          {
-            expr: 'test[${__range_s}s]',
-          },
-        ],
-        interval: '60s',
-      } as DataQueryRequest<PromQuery>;
-      const urlExpected = `proxied/api/v1/query_range?query=${encodeURIComponent(
-        query.targets[0].expr
-      )}&start=0&end=3600&step=60`;
-
-      replaceMock.mockImplementation((str) => str);
-      fetchMock.mockImplementation(() => of(response));
-      ds.query(query);
-      const res = fetchMock.mock.calls[0][0];
-      expect(res.url).toBe(urlExpected);
-
-      expect(replaceMock.mock.calls[1][1]).toEqual({
-        __range_s: {
-          text: expectedRangeSecond,
-          value: expectedRangeSecond,
-        },
-        __range: {
-          text: expectedRangeString,
-          value: expectedRangeString,
-        },
-        __range_ms: {
-          text: expectedRangeSecond * 1000,
-          value: expectedRangeSecond * 1000,
-        },
-        __rate_interval: {
-          text: '75s',
-          value: '75s',
-        },
-      });
-    });
-  });
-
   describe('The __rate_interval variable', () => {
     const target = { expr: 'rate(process_cpu_seconds_total[$__rate_interval])', refId: 'A' };
 
@@ -1872,40 +968,70 @@ describe('PrometheusDatasource2', () => {
     });
 
     it('should be 4 times the scrape interval if interval + scrape interval is lower', () => {
-      ds.createQuery(target, { interval: '15s' } as DataQueryRequest<PromQuery>, 0, 300);
+      ds.createQuery(target, { interval: '15s', range: getMockTimeRange() } as DataQueryRequest<PromQuery>, 0, 300);
       expect(replaceMock.mock.calls[1][1]['__rate_interval'].value).toBe('60s');
     });
     it('should be interval + scrape interval if 4 times the scrape interval is lower', () => {
-      ds.createQuery(target, { interval: '5m' } as DataQueryRequest<PromQuery>, 0, 10080);
+      ds.createQuery(target, { interval: '5m', range: getMockTimeRange() } as DataQueryRequest<PromQuery>, 0, 10080);
       expect(replaceMock.mock.calls[1][1]['__rate_interval'].value).toBe('315s');
     });
     it('should fall back to a scrape interval of 15s if min step is set to 0, resulting in 4*15s = 60s', () => {
-      ds.createQuery({ ...target, interval: '' }, { interval: '15s' } as DataQueryRequest<PromQuery>, 0, 300);
+      ds.createQuery(
+        { ...target, interval: '' },
+        { interval: '15s', range: getMockTimeRange() } as DataQueryRequest<PromQuery>,
+        0,
+        300
+      );
       expect(replaceMock.mock.calls[1][1]['__rate_interval'].value).toBe('60s');
     });
     it('should be 4 times the scrape interval if min step set to 1m and interval is 15s', () => {
       // For a 5m graph, $__interval is 15s
-      ds.createQuery({ ...target, interval: '1m' }, { interval: '15s' } as DataQueryRequest<PromQuery>, 0, 300);
+      ds.createQuery(
+        { ...target, interval: '1m' },
+        { interval: '15s', range: getMockTimeRange() } as DataQueryRequest<PromQuery>,
+        0,
+        300
+      );
       expect(replaceMock.mock.calls[2][1]['__rate_interval'].value).toBe('240s');
     });
     it('should be interval + scrape interval if min step set to 1m and interval is 5m', () => {
       // For a 7d graph, $__interval is 5m
-      ds.createQuery({ ...target, interval: '1m' }, { interval: '5m' } as DataQueryRequest<PromQuery>, 0, 10080);
+      ds.createQuery(
+        { ...target, interval: '1m' },
+        { interval: '5m', range: getMockTimeRange() } as DataQueryRequest<PromQuery>,
+        0,
+        10080
+      );
       expect(replaceMock.mock.calls[2][1]['__rate_interval'].value).toBe('360s');
     });
     it('should be interval + scrape interval if resolution is set to 1/2 and interval is 10m', () => {
       // For a 7d graph, $__interval is 10m
-      ds.createQuery({ ...target, intervalFactor: 2 }, { interval: '10m' } as DataQueryRequest<PromQuery>, 0, 10080);
+      ds.createQuery(
+        { ...target, intervalFactor: 2 },
+        { interval: '10m', range: getMockTimeRange() } as DataQueryRequest<PromQuery>,
+        0,
+        10080
+      );
       expect(replaceMock.mock.calls[1][1]['__rate_interval'].value).toBe('1215s');
     });
     it('should be 4 times the scrape interval if resolution is set to 1/2 and interval is 15s', () => {
       // For a 5m graph, $__interval is 15s
-      ds.createQuery({ ...target, intervalFactor: 2 }, { interval: '15s' } as DataQueryRequest<PromQuery>, 0, 300);
+      ds.createQuery(
+        { ...target, intervalFactor: 2 },
+        { interval: '15s', range: getMockTimeRange() } as DataQueryRequest<PromQuery>,
+        0,
+        300
+      );
       expect(replaceMock.mock.calls[1][1]['__rate_interval'].value).toBe('60s');
     });
     it('should interpolate min step if set', () => {
       replaceMock.mockImplementation((_: string) => '15s');
-      ds.createQuery({ ...target, interval: '$int' }, { interval: '15s' } as DataQueryRequest<PromQuery>, 0, 300);
+      ds.createQuery(
+        { ...target, interval: '$int' },
+        { interval: '15s', range: getMockTimeRange() } as DataQueryRequest<PromQuery>,
+        0,
+        300
+      );
       expect(replaceMock.mock.calls).toHaveLength(3);
       replaceMock.mockImplementation((str) => str);
     });
@@ -1941,447 +1067,45 @@ describe('PrometheusDatasource2', () => {
   });
 });
 
-describe('PrometheusDatasource for POST', () => {
+describe('When querying prometheus via check headers X-Dashboard-Id X-Panel-Id and X-Dashboard-UID', () => {
+  const options = { panelId: 2, dashboardUID: 'WFlOM-jM1' } as DataQueryRequest<PromQuery>;
+  const httpOptions = {
+    headers: {} as { [key: string]: number | undefined },
+  } as PromQueryRequest;
   const instanceSettings = {
     url: 'proxied',
     directUrl: 'direct',
     user: 'test',
     password: 'mupp',
+    access: 'proxy',
     jsonData: { httpMethod: 'POST' },
   } as unknown as DataSourceInstanceSettings<PromOptions>;
 
   let ds: PrometheusDatasource;
   beforeEach(() => {
-    ds = new PrometheusDatasource(instanceSettings, templateSrvStub, timeSrvStub);
+    ds = new PrometheusDatasource(instanceSettings, templateSrvStub as unknown as TemplateSrv);
   });
 
-  describe('When querying prometheus with one target using query editor target spec', () => {
-    let results: DataQueryResponse;
-    const urlExpected = 'proxied/api/v1/query_range';
-    const dataExpected = {
-      query: 'test{job="testjob"}',
-      start: 1 * 60,
-      end: 2 * 60,
-      step: 60,
-    };
-    const query = {
-      range: { from: time({ minutes: 1, seconds: 3 }), to: time({ minutes: 2, seconds: 3 }) },
-      targets: [{ expr: 'test{job="testjob"}', format: 'time_series' }],
-      interval: '60s',
-    } as DataQueryRequest<PromQuery>;
-
-    beforeEach(async () => {
-      const response = {
-        status: 'success',
-        data: {
-          data: {
-            resultType: 'matrix',
-            result: [
-              {
-                metric: { __name__: 'test', job: 'testjob' },
-                values: [[2 * 60, '3846']],
-              },
-            ],
-          },
-        },
-      };
-      fetchMock.mockImplementation(() => of(response));
-      ds.query(query).subscribe((data) => {
-        results = data;
-      });
-    });
-
-    it('should generate the correct query', () => {
-      const res = fetchMock.mock.calls[0][0];
-      expect(res.method).toBe('POST');
-      expect(res.url).toBe(urlExpected);
-      expect(res.data).toEqual(dataExpected);
-    });
-
-    it('should return series list', () => {
-      const frame = toDataFrame(results.data[0]);
-      expect(results.data.length).toBe(1);
-      expect(getFieldDisplayName(frame.fields[1], frame)).toBe('test{job="testjob"}');
-    });
+  it('with proxy access tracing headers should be added', () => {
+    ds._addTracingHeaders(httpOptions, options);
+    expect(httpOptions.headers['X-Panel-Id']).toBe(options.panelId);
+    expect(httpOptions.headers['X-Dashboard-UID']).toBe(options.dashboardUID);
   });
 
-  describe('When querying prometheus via check headers X-Dashboard-Id X-Panel-Id and X-Dashboard-UID', () => {
-    const options = { panelId: 2, dashboardUID: 'WFlOM-jM1' } as DataQueryRequest<PromQuery>;
-    const httpOptions = {
-      headers: {} as { [key: string]: number | undefined },
-    } as PromQueryRequest;
+  it('with direct access tracing headers should not be added', () => {
     const instanceSettings = {
       url: 'proxied',
       directUrl: 'direct',
       user: 'test',
       password: 'mupp',
-      access: 'proxy',
       jsonData: { httpMethod: 'POST' },
     } as unknown as DataSourceInstanceSettings<PromOptions>;
 
-    let ds: PrometheusDatasource;
-    beforeEach(() => {
-      ds = new PrometheusDatasource(
-        instanceSettings,
-        templateSrvStub as unknown as TemplateSrv,
-        timeSrvStub as unknown as TimeSrv
-      );
-    });
-
-    it('with proxy access tracing headers should be added', () => {
-      ds._addTracingHeaders(httpOptions, options);
-      expect(httpOptions.headers['X-Panel-Id']).toBe(options.panelId);
-      expect(httpOptions.headers['X-Dashboard-UID']).toBe(options.dashboardUID);
-    });
-
-    it('with direct access tracing headers should not be added', () => {
-      const instanceSettings = {
-        url: 'proxied',
-        directUrl: 'direct',
-        user: 'test',
-        password: 'mupp',
-        jsonData: { httpMethod: 'POST' },
-      } as unknown as DataSourceInstanceSettings<PromOptions>;
-
-      const mockDs = new PrometheusDatasource(
-        { ...instanceSettings, url: 'http://127.0.0.1:8000' },
-        templateSrvStub,
-        timeSrvStub
-      );
-      mockDs._addTracingHeaders(httpOptions, options);
-      expect(httpOptions.headers['X-Dashboard-Id']).toBe(undefined);
-      expect(httpOptions.headers['X-Panel-Id']).toBe(undefined);
-      expect(httpOptions.headers['X-Dashboard-UID']).toBe(undefined);
-    });
-  });
-});
-
-function getPrepareTargetsContext({
-  targets,
-  app,
-  queryOptions,
-  languageProvider,
-}: {
-  targets: PromQuery[];
-  app?: CoreApp;
-  queryOptions?: Partial<QueryOptions>;
-  languageProvider?: PromQlLanguageProvider;
-}) {
-  const instanceSettings = {
-    url: 'proxied',
-    directUrl: 'direct',
-    access: 'proxy',
-    user: 'test',
-    password: 'mupp',
-    jsonData: { httpMethod: 'POST' },
-  } as unknown as DataSourceInstanceSettings<PromOptions>;
-  const start = 0;
-  const end = 1;
-  const panelId = '2';
-  const options = {
-    targets,
-    interval: '1s',
-    panelId,
-    app,
-    ...queryOptions,
-  } as unknown as DataQueryRequest<PromQuery>;
-
-  const ds = new PrometheusDatasource(instanceSettings, templateSrvStub, timeSrvStub);
-  if (languageProvider) {
-    ds.languageProvider = languageProvider;
-  }
-  const { queries, activeTargets } = ds.prepareTargets(options, start, end);
-
-  return {
-    queries,
-    activeTargets,
-    start,
-    end,
-    panelId,
-  };
-}
-
-describe('prepareTargets', () => {
-  describe('when run from a Panel', () => {
-    it('then it should just add targets', () => {
-      const target: PromQuery = {
-        refId: 'A',
-        expr: 'up',
-      };
-
-      const { queries, activeTargets, panelId, end, start } = getPrepareTargetsContext({ targets: [target] });
-
-      expect(queries.length).toBe(1);
-      expect(activeTargets.length).toBe(1);
-      expect(queries[0]).toEqual({
-        end,
-        expr: 'up',
-        headers: {
-          'X-Dashboard-Id': undefined,
-          'X-Dashboard-UID': undefined,
-          'X-Panel-Id': panelId,
-        },
-        hinting: undefined,
-        instant: undefined,
-        refId: target.refId,
-        start,
-        step: 1,
-      });
-      expect(activeTargets[0]).toEqual(target);
-    });
-
-    it('should give back 3 targets when multiple queries with exemplar enabled and same metric', () => {
-      const targetA: PromQuery = {
-        refId: 'A',
-        expr: 'histogram_quantile(0.95, sum(rate(tns_request_duration_seconds_bucket[5m])) by (le))',
-        exemplar: true,
-      };
-      const targetB: PromQuery = {
-        refId: 'B',
-        expr: 'histogram_quantile(0.5, sum(rate(tns_request_duration_seconds_bucket[5m])) by (le))',
-        exemplar: true,
-      };
-
-      const { queries, activeTargets } = getPrepareTargetsContext({
-        targets: [targetA, targetB],
-        languageProvider: {
-          histogramMetrics: ['tns_request_duration_seconds_bucket'],
-        } as PromQlLanguageProvider,
-      });
-      expect(queries).toHaveLength(3);
-      expect(activeTargets).toHaveLength(3);
-    });
-
-    it('should give back 4 targets when multiple queries with exemplar enabled', () => {
-      const targetA: PromQuery = {
-        refId: 'A',
-        expr: 'histogram_quantile(0.95, sum(rate(tns_request_duration_seconds_bucket[5m])) by (le))',
-        exemplar: true,
-      };
-      const targetB: PromQuery = {
-        refId: 'B',
-        expr: 'histogram_quantile(0.5, sum(rate(tns_request_duration_bucket[5m])) by (le))',
-        exemplar: true,
-      };
-
-      const { queries, activeTargets } = getPrepareTargetsContext({
-        targets: [targetA, targetB],
-        languageProvider: {
-          histogramMetrics: ['tns_request_duration_seconds_bucket'],
-        } as PromQlLanguageProvider,
-      });
-      expect(queries).toHaveLength(4);
-      expect(activeTargets).toHaveLength(4);
-    });
-
-    it('should give back 2 targets when exemplar enabled', () => {
-      const target: PromQuery = {
-        refId: 'A',
-        expr: 'up',
-        exemplar: true,
-      };
-
-      const { queries, activeTargets } = getPrepareTargetsContext({ targets: [target] });
-      expect(queries).toHaveLength(2);
-      expect(activeTargets).toHaveLength(2);
-      expect(activeTargets[0].exemplar).toBe(true);
-      expect(activeTargets[1].exemplar).toBe(false);
-    });
-    it('should give back 1 target when exemplar and instant are enabled', () => {
-      const target: PromQuery = {
-        refId: 'A',
-        expr: 'up',
-        exemplar: true,
-        instant: true,
-      };
-
-      const { queries, activeTargets } = getPrepareTargetsContext({ targets: [target] });
-      expect(queries).toHaveLength(1);
-      expect(activeTargets).toHaveLength(1);
-      expect(activeTargets[0].instant).toBe(true);
-    });
-  });
-
-  describe('when run from Explore', () => {
-    describe('when query type Both is selected', () => {
-      it('should give back 6 targets when multiple queries with exemplar enabled', () => {
-        const targetA: PromQuery = {
-          refId: 'A',
-          expr: 'histogram_quantile(0.95, sum(rate(tns_request_duration_seconds_bucket[5m])) by (le))',
-          instant: true,
-          range: true,
-          exemplar: true,
-        };
-        const targetB: PromQuery = {
-          refId: 'B',
-          expr: 'histogram_quantile(0.5, sum(rate(tns_request_duration_bucket[5m])) by (le))',
-          exemplar: true,
-          instant: true,
-          range: true,
-        };
-
-        const { queries, activeTargets } = getPrepareTargetsContext({
-          targets: [targetA, targetB],
-          app: CoreApp.Explore,
-          languageProvider: {
-            histogramMetrics: ['tns_request_duration_seconds_bucket'],
-          } as PromQlLanguageProvider,
-        });
-        expect(queries).toHaveLength(6);
-        expect(activeTargets).toHaveLength(6);
-      });
-
-      it('should give back 5 targets when multiple queries with exemplar enabled and same metric', () => {
-        const targetA: PromQuery = {
-          refId: 'A',
-          expr: 'histogram_quantile(0.95, sum(rate(tns_request_duration_seconds_bucket[5m])) by (le))',
-          instant: true,
-          range: true,
-          exemplar: true,
-        };
-        const targetB: PromQuery = {
-          refId: 'B',
-          expr: 'histogram_quantile(0.5, sum(rate(tns_request_duration_seconds_bucket[5m])) by (le))',
-          exemplar: true,
-          instant: true,
-          range: true,
-        };
-
-        const { queries, activeTargets } = getPrepareTargetsContext({
-          targets: [targetA, targetB],
-          app: CoreApp.Explore,
-          languageProvider: {
-            histogramMetrics: ['tns_request_duration_seconds_bucket'],
-          } as PromQlLanguageProvider,
-        });
-        expect(queries).toHaveLength(5);
-        expect(activeTargets).toHaveLength(5);
-      });
-
-      it('then it should return both instant and time series related objects', () => {
-        const target: PromQuery = {
-          refId: 'A',
-          expr: 'up',
-          range: true,
-          instant: true,
-        };
-
-        const { queries, activeTargets, panelId, end, start } = getPrepareTargetsContext({
-          targets: [target],
-          app: CoreApp.Explore,
-        });
-
-        expect(queries.length).toBe(2);
-        expect(activeTargets.length).toBe(2);
-        expect(queries[0]).toEqual({
-          end,
-          expr: 'up',
-          headers: {
-            'X-Dashboard-Id': undefined,
-            'X-Dashboard-UID': undefined,
-            'X-Panel-Id': panelId,
-          },
-          hinting: undefined,
-          instant: true,
-          refId: target.refId,
-          start,
-          step: 1,
-        });
-        expect(activeTargets[0]).toEqual({
-          ...target,
-          format: 'table',
-          instant: true,
-          valueWithRefId: true,
-        });
-        expect(queries[1]).toEqual({
-          end,
-          expr: 'up',
-          headers: {
-            'X-Dashboard-Id': undefined,
-            'X-Dashboard-UID': undefined,
-            'X-Panel-Id': panelId,
-          },
-          hinting: undefined,
-          instant: false,
-          refId: target.refId,
-          start,
-          step: 1,
-        });
-        expect(activeTargets[1]).toEqual({
-          ...target,
-          format: 'time_series',
-          instant: false,
-        });
-      });
-    });
-
-    describe('when query type Instant is selected', () => {
-      it('then it should target and modify its format to table', () => {
-        const target: PromQuery = {
-          refId: 'A',
-          expr: 'up',
-          instant: true,
-          range: false,
-        };
-
-        const { queries, activeTargets, panelId, end, start } = getPrepareTargetsContext({
-          targets: [target],
-          app: CoreApp.Explore,
-        });
-
-        expect(queries.length).toBe(1);
-        expect(activeTargets.length).toBe(1);
-        expect(queries[0]).toEqual({
-          end,
-          expr: 'up',
-          headers: {
-            'X-Dashboard-Id': undefined,
-            'X-Dashboard-UID': undefined,
-            'X-Panel-Id': panelId,
-          },
-          hinting: undefined,
-          instant: true,
-          refId: target.refId,
-          start,
-          step: 1,
-        });
-        expect(activeTargets[0]).toEqual({ ...target, format: 'table' });
-      });
-    });
-  });
-
-  describe('when query type Range is selected', () => {
-    it('then it should just add targets', () => {
-      const target: PromQuery = {
-        refId: 'A',
-        expr: 'up',
-        range: true,
-        instant: false,
-      };
-
-      const { queries, activeTargets, panelId, end, start } = getPrepareTargetsContext({
-        targets: [target],
-        app: CoreApp.Explore,
-      });
-
-      expect(queries.length).toBe(1);
-      expect(activeTargets.length).toBe(1);
-      expect(queries[0]).toEqual({
-        end,
-        expr: 'up',
-        headers: {
-          'X-Dashboard-Id': undefined,
-          'X-Dashboard-UID': undefined,
-          'X-Panel-Id': panelId,
-        },
-        hinting: undefined,
-        instant: false,
-        refId: target.refId,
-        start,
-        step: 1,
-      });
-      expect(activeTargets[0]).toEqual(target);
-    });
+    const mockDs = new PrometheusDatasource({ ...instanceSettings, url: 'http://127.0.0.1:8000' }, templateSrvStub);
+    mockDs._addTracingHeaders(httpOptions, options);
+    expect(httpOptions.headers['X-Dashboard-Id']).toBe(undefined);
+    expect(httpOptions.headers['X-Panel-Id']).toBe(undefined);
+    expect(httpOptions.headers['X-Dashboard-UID']).toBe(undefined);
   });
 });
 
@@ -2392,7 +1116,7 @@ describe('modifyQuery', () => {
         const query: PromQuery = { refId: 'A', expr: 'go_goroutines' };
         const action = { options: { key: 'cluster', value: 'us-cluster' }, type: 'ADD_FILTER' };
         const instanceSettings = { jsonData: {} } as unknown as DataSourceInstanceSettings<PromOptions>;
-        const ds = new PrometheusDatasource(instanceSettings, templateSrvStub, timeSrvStub);
+        const ds = new PrometheusDatasource(instanceSettings, templateSrvStub);
 
         const result = ds.modifyQuery(query, action);
 
@@ -2406,7 +1130,7 @@ describe('modifyQuery', () => {
         const query: PromQuery = { refId: 'A', expr: 'go_goroutines{cluster="us-cluster"}' };
         const action = { options: { key: 'pod', value: 'pod-123' }, type: 'ADD_FILTER' };
         const instanceSettings = { jsonData: {} } as unknown as DataSourceInstanceSettings<PromOptions>;
-        const ds = new PrometheusDatasource(instanceSettings, templateSrvStub, timeSrvStub);
+        const ds = new PrometheusDatasource(instanceSettings, templateSrvStub);
 
         const result = ds.modifyQuery(query, action);
 
@@ -2422,7 +1146,7 @@ describe('modifyQuery', () => {
         const query: PromQuery = { refId: 'A', expr: 'go_goroutines' };
         const action = { options: { key: 'cluster', value: 'us-cluster' }, type: 'ADD_FILTER_OUT' };
         const instanceSettings = { jsonData: {} } as unknown as DataSourceInstanceSettings<PromOptions>;
-        const ds = new PrometheusDatasource(instanceSettings, templateSrvStub, timeSrvStub);
+        const ds = new PrometheusDatasource(instanceSettings, templateSrvStub);
 
         const result = ds.modifyQuery(query, action);
 
@@ -2436,7 +1160,7 @@ describe('modifyQuery', () => {
         const query: PromQuery = { refId: 'A', expr: 'go_goroutines{cluster="us-cluster"}' };
         const action = { options: { key: 'pod', value: 'pod-123' }, type: 'ADD_FILTER_OUT' };
         const instanceSettings = { jsonData: {} } as unknown as DataSourceInstanceSettings<PromOptions>;
-        const ds = new PrometheusDatasource(instanceSettings, templateSrvStub, timeSrvStub);
+        const ds = new PrometheusDatasource(instanceSettings, templateSrvStub);
 
         const result = ds.modifyQuery(query, action);
 
@@ -2447,24 +1171,29 @@ describe('modifyQuery', () => {
   });
 });
 
-function createDataRequest(targets: any[], overrides?: Partial<DataQueryRequest>): DataQueryRequest<PromQuery> {
-  const defaults = {
+function createDataRequest(targets: PromQuery[], overrides?: Partial<DataQueryRequest>): DataQueryRequest<PromQuery> {
+  const defaults: DataQueryRequest<PromQuery> = {
+    intervalMs: 15000,
+    requestId: 'createDataRequest',
+    startTime: 0,
+    timezone: 'browser',
     app: CoreApp.Dashboard,
-    targets: targets.map((t) => {
-      return {
-        instant: false,
-        start: dateTime().subtract(5, 'minutes'),
-        end: dateTime(),
-        expr: 'test',
-        ...t,
-      };
-    }),
+    targets: targets.map((t, i) => ({
+      instant: false,
+      start: dateTime().subtract(5, 'minutes'),
+      end: dateTime(),
+      ...t,
+    })),
     range: {
       from: dateTime(),
       to: dateTime(),
+      raw: {
+        from: '',
+        to: '',
+      },
     },
     interval: '15s',
-    showingGraph: true,
+    scopedVars: {},
   };
 
   return Object.assign(defaults, overrides || {}) as DataQueryRequest<PromQuery>;
@@ -2559,3 +1288,10 @@ function createEmptyAnnotationResponse() {
 
   return { ...response };
 }
+
+function getMockTimeRange(range = '6h'): TimeRange {
+  return rangeUtil.convertRawToRange({
+    from: `now-${range}`,
+    to: 'now',
+  });
+}
diff --git a/public/app/plugins/datasource/prometheus/datasource.ts b/public/app/plugins/datasource/prometheus/datasource.ts
index 5c684e2c31096..70a40c154a168 100644
--- a/public/app/plugins/datasource/prometheus/datasource.ts
+++ b/public/app/plugins/datasource/prometheus/datasource.ts
@@ -1,6 +1,6 @@
-import { cloneDeep, defaults } from 'lodash';
-import { forkJoin, lastValueFrom, merge, Observable, of, OperatorFunction, pipe, throwError } from 'rxjs';
-import { catchError, filter, map, tap } from 'rxjs/operators';
+import { defaults } from 'lodash';
+import { lastValueFrom, Observable, throwError } from 'rxjs';
+import { map, tap } from 'rxjs/operators';
 import semver from 'semver/preload';
 
 import {
@@ -10,7 +10,6 @@ import {
   AnnotationQueryRequest,
   CoreApp,
   DataFrame,
-  DataQueryError,
   DataQueryRequest,
   DataQueryResponse,
   DataSourceGetTagKeysOptions,
@@ -19,7 +18,8 @@ import {
   DataSourceWithQueryExportSupport,
   DataSourceWithQueryImportSupport,
   dateTime,
-  LoadingState,
+  getDefaultTimeRange,
+  LegacyMetricFindQueryOptions,
   MetricFindValue,
   QueryFixAction,
   rangeUtil,
@@ -30,16 +30,15 @@ import {
 import {
   BackendDataSourceResponse,
   BackendSrvRequest,
+  config,
   DataSourceWithBackend,
-  FetchError,
   FetchResponse,
   getBackendSrv,
+  getTemplateSrv,
   isFetchError,
+  TemplateSrv,
   toDataQueryResponse,
 } from '@grafana/runtime';
-import { safeStringifyValue } from 'app/core/utils/explore';
-import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv';
-import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_srv';
 
 import { addLabelToQuery } from './add_label_to_query';
 import { AnnotationQueryEditor } from './components/AnnotationQueryEditor';
@@ -55,21 +54,15 @@ import { getInitHints, getQueryHints } from './query_hints';
 import { promQueryModeller } from './querybuilder/PromQueryModeller';
 import { QueryBuilderLabelFilter, QueryEditorMode } from './querybuilder/shared/types';
 import { CacheRequestInfo, defaultPrometheusQueryOverlapWindow, QueryCache } from './querycache/QueryCache';
-import { getOriginalMetricName, transform, transformV2 } from './result_transformer';
+import { getOriginalMetricName, transformV2 } from './result_transformer';
 import { trackQuery } from './tracking';
 import {
   ExemplarTraceIdDestination,
   PromApplication,
-  PromDataErrorResponse,
-  PromDataSuccessResponse,
   PrometheusCacheLevel,
-  PromExemplarData,
-  PromMatrixData,
   PromOptions,
   PromQuery,
   PromQueryRequest,
-  PromScalarData,
-  PromVectorData,
 } from './types';
 import { PrometheusVariableSupport } from './variables';
 
@@ -87,7 +80,6 @@ export class PrometheusDatasource
   hasIncrementalQuery: boolean;
   url: string;
   id: number;
-  directUrl: string;
   access: 'direct' | 'proxy';
   basicAuth: any;
   withCredentials: any;
@@ -109,7 +101,6 @@ export class PrometheusDatasource
   constructor(
     instanceSettings: DataSourceInstanceSettings<PromOptions>,
     private readonly templateSrv: TemplateSrv = getTemplateSrv(),
-    private readonly timeSrv: TimeSrv = getTimeSrv(),
     languageProvider?: PrometheusLanguageProvider
   ) {
     super(instanceSettings);
@@ -123,9 +114,6 @@ export class PrometheusDatasource
     this.interval = instanceSettings.jsonData.timeInterval || '15s';
     this.queryTimeout = instanceSettings.jsonData.queryTimeout;
     this.httpMethod = instanceSettings.jsonData.httpMethod || 'GET';
-    // `directUrl` is never undefined, we set it at https://github.com/grafana/grafana/blob/main/pkg/api/frontendsettings.go#L108
-    // here we "fall back" to this.url to make typescript happy, but it should never happen
-    this.directUrl = instanceSettings.jsonData.directUrl ?? this.url;
     this.exemplarTraceIdDestinations = instanceSettings.jsonData.exemplarTraceIdDestinations;
     this.hasIncrementalQuery = instanceSettings.jsonData.incrementalQuerying ?? false;
     this.ruleMappings = {};
@@ -136,7 +124,7 @@ export class PrometheusDatasource
     this.datasourceConfigurationPrometheusVersion = instanceSettings.jsonData.prometheusVersion;
     this.defaultEditor = instanceSettings.jsonData.defaultEditor;
     this.disableRecordingRules = instanceSettings.jsonData.disableRecordingRules ?? false;
-    this.variables = new PrometheusVariableSupport(this, this.templateSrv, this.timeSrv);
+    this.variables = new PrometheusVariableSupport(this, this.templateSrv);
     this.exemplarsAvailable = true;
     this.cacheLevel = instanceSettings.jsonData.cacheLevel ?? PrometheusCacheLevel.Low;
 
@@ -201,9 +189,9 @@ export class PrometheusDatasource
   }
 
   _isDatasourceVersionGreaterOrEqualTo(targetVersion: string, targetFlavor: PromApplication): boolean {
-    // User hasn't configured flavor/version yet, default behavior is to not support features that require version configuration when not provided
+    // User hasn't configured flavor/version yet, default behavior is to support labels match api support
     if (!this.datasourceConfigurationPrometheusVersion || !this.datasourceConfigurationPrometheusFlavor) {
-      return false;
+      return true;
     }
 
     if (targetFlavor !== this.datasourceConfigurationPrometheusFlavor) {
@@ -221,21 +209,27 @@ export class PrometheusDatasource
     }
   }
 
+  directAccessError() {
+    return throwError(
+      () =>
+        new Error(
+          'Browser access mode in the Prometheus datasource is no longer available. Switch to server access mode.'
+        )
+    );
+  }
+
   /**
    * Any request done from this data source should go through here as it contains some common processing for the
    * request. Any processing done here needs to be also copied on the backend as this goes through data source proxy
    * but not through the same code as alerting.
    */
-  _request<T = any>(
+  _request<T = unknown>(
     url: string,
     data: Record<string, string> | null,
     overrides: Partial<BackendSrvRequest> = {}
   ): Observable<FetchResponse<T>> {
     if (this.access === 'direct') {
-      const error = new Error(
-        'Browser access mode in the Prometheus datasource is no longer available. Switch to server access mode.'
-      );
-      return throwError(() => error);
+      return this.directAccessError();
     }
 
     data = data || {};
@@ -345,86 +339,6 @@ export class PrometheusDatasource
     return this.templateSrv.containsTemplate(target.expr);
   }
 
-  prepareTargets = (options: DataQueryRequest<PromQuery>, start: number, end: number) => {
-    const queries: PromQueryRequest[] = [];
-    const activeTargets: PromQuery[] = [];
-    const clonedTargets = cloneDeep(options.targets);
-
-    for (const target of clonedTargets) {
-      if (!target.expr || target.hide) {
-        continue;
-      }
-
-      const metricName = this.languageProvider.histogramMetrics.find((m) => target.expr.includes(m));
-
-      // In Explore, we run both (instant and range) queries if both are true (selected) or both are undefined (legacy Explore queries)
-      if (options.app === CoreApp.Explore && target.range === target.instant) {
-        // Create instant target
-        const instantTarget: any = cloneDeep(target);
-        instantTarget.format = 'table';
-        instantTarget.instant = true;
-        instantTarget.range = false;
-        instantTarget.valueWithRefId = true;
-        delete instantTarget.maxDataPoints;
-
-        // Create range target
-        const rangeTarget: any = cloneDeep(target);
-        rangeTarget.format = 'time_series';
-        rangeTarget.instant = false;
-        instantTarget.range = true;
-
-        // Create exemplar query
-        if (target.exemplar) {
-          // Only create exemplar target for different metric names
-          if (
-            !metricName ||
-            (metricName && !activeTargets.some((activeTarget) => activeTarget.expr.includes(metricName)))
-          ) {
-            const exemplarTarget = cloneDeep(target);
-            exemplarTarget.instant = false;
-            queries.push(this.createQuery(exemplarTarget, options, start, end));
-            activeTargets.push(exemplarTarget);
-          }
-          instantTarget.exemplar = false;
-          rangeTarget.exemplar = false;
-        }
-
-        // Add both targets to activeTargets and queries arrays
-        activeTargets.push(instantTarget, rangeTarget);
-        queries.push(
-          this.createQuery(instantTarget, options, start, end),
-          this.createQuery(rangeTarget, options, start, end)
-        );
-        // If running only instant query in Explore, format as table
-      } else if (target.instant && options.app === CoreApp.Explore) {
-        const instantTarget: any = cloneDeep(target);
-        instantTarget.format = 'table';
-        queries.push(this.createQuery(instantTarget, options, start, end));
-        activeTargets.push(instantTarget);
-      } else {
-        // It doesn't make sense to query for exemplars in dashboard if only instant is selected
-        if (target.exemplar && !target.instant) {
-          if (
-            !metricName ||
-            (metricName && !activeTargets.some((activeTarget) => activeTarget.expr.includes(metricName)))
-          ) {
-            const exemplarTarget = cloneDeep(target);
-            queries.push(this.createQuery(exemplarTarget, options, start, end));
-            activeTargets.push(exemplarTarget);
-          }
-          target.exemplar = false;
-        }
-        queries.push(this.createQuery(target, options, start, end));
-        activeTargets.push(target);
-      }
-    }
-
-    return {
-      queries,
-      activeTargets,
-    };
-  };
-
   shouldRunExemplarQuery(target: PromQuery, request: DataQueryRequest<PromQuery>): boolean {
     if (target.exemplar) {
       // We check all already processed targets and only create exemplar target for not used metric names
@@ -448,8 +362,13 @@ export class PrometheusDatasource
       exemplar: this.shouldRunExemplarQuery(target, request),
       requestId: request.panelId + target.refId,
       // We need to pass utcOffsetSec to backend to calculate aligned range
-      utcOffsetSec: this.timeSrv.timeRange().to.utcOffset() * 60,
+      utcOffsetSec: request.range.to.utcOffset() * 60,
     };
+
+    if (config.featureToggles.promQLScope) {
+      processedTarget.scope = request.scope;
+    }
+
     if (target.instant && target.range) {
       // We have query type "Both" selected
       // We should send separate queries with different refId
@@ -473,150 +392,40 @@ export class PrometheusDatasource
   }
 
   query(request: DataQueryRequest<PromQuery>): Observable<DataQueryResponse> {
-    if (this.access === 'proxy') {
-      let fullOrPartialRequest: DataQueryRequest<PromQuery>;
-      let requestInfo: CacheRequestInfo<PromQuery> | undefined = undefined;
-      const hasInstantQuery = request.targets.some((target) => target.instant);
-
-      // Don't cache instant queries
-      if (this.hasIncrementalQuery && !hasInstantQuery) {
-        requestInfo = this.cache.requestInfo(request);
-        fullOrPartialRequest = requestInfo.requests[0];
-      } else {
-        fullOrPartialRequest = request;
-      }
-
-      const targets = fullOrPartialRequest.targets.map((target) => this.processTargetV2(target, fullOrPartialRequest));
-      const startTime = new Date();
-      return super.query({ ...fullOrPartialRequest, targets: targets.flat() }).pipe(
-        map((response) => {
-          const amendedResponse = {
-            ...response,
-            data: this.cache.procFrames(request, requestInfo, response.data),
-          };
-          return transformV2(amendedResponse, request, {
-            exemplarTraceIdDestinations: this.exemplarTraceIdDestinations,
-          });
-        }),
-        tap((response: DataQueryResponse) => {
-          trackQuery(response, request, startTime);
-        })
-      );
-      // Run queries through browser/proxy
-    } else {
-      const start = getPrometheusTime(request.range.from, false);
-      const end = getPrometheusTime(request.range.to, true);
-      const { queries, activeTargets } = this.prepareTargets(request, start, end);
-
-      // No valid targets, return the empty result to save a round trip.
-      if (!queries || !queries.length) {
-        return of({
-          data: [],
-          state: LoadingState.Done,
-        });
-      }
-
-      if (request.app === CoreApp.Explore) {
-        return this.exploreQuery(queries, activeTargets, end);
-      }
-
-      return this.panelsQuery(queries, activeTargets, end, request.requestId, request.scopedVars);
+    if (this.access === 'direct') {
+      return this.directAccessError();
     }
-  }
 
-  private exploreQuery(queries: PromQueryRequest[], activeTargets: PromQuery[], end: number) {
-    let runningQueriesCount = queries.length;
-
-    const subQueries = queries.map((query, index) => {
-      const target = activeTargets[index];
-
-      const filterAndMapResponse = pipe(
-        // Decrease the counter here. We assume that each request returns only single value and then completes
-        // (should hold until there is some streaming requests involved).
-        tap(() => runningQueriesCount--),
-        filter((response: any) => (response.cancelled ? false : true)),
-        map((response: any) => {
-          const data = transform(response, {
-            query,
-            target,
-            responseListLength: queries.length,
-            exemplarTraceIdDestinations: this.exemplarTraceIdDestinations,
-          });
-          return {
-            data,
-            key: query.requestId,
-            state: runningQueriesCount === 0 ? LoadingState.Done : LoadingState.Loading,
-          } as DataQueryResponse;
-        })
-      );
-
-      return this.runQuery(query, end, filterAndMapResponse);
-    });
+    let fullOrPartialRequest: DataQueryRequest<PromQuery>;
+    let requestInfo: CacheRequestInfo<PromQuery> | undefined = undefined;
+    const hasInstantQuery = request.targets.some((target) => target.instant);
 
-    return merge(...subQueries);
-  }
-
-  private panelsQuery(
-    queries: PromQueryRequest[],
-    activeTargets: PromQuery[],
-    end: number,
-    requestId: string,
-    scopedVars: ScopedVars
-  ) {
-    const observables = queries.map((query, index) => {
-      const target = activeTargets[index];
-
-      const filterAndMapResponse = pipe(
-        filter((response: any) => (response.cancelled ? false : true)),
-        map((response: any) => {
-          const data = transform(response, {
-            query,
-            target,
-            responseListLength: queries.length,
-            scopedVars,
-            exemplarTraceIdDestinations: this.exemplarTraceIdDestinations,
-          });
-          return data;
-        })
-      );
-
-      return this.runQuery(query, end, filterAndMapResponse);
-    });
+    // Don't cache instant queries
+    if (this.hasIncrementalQuery && !hasInstantQuery) {
+      requestInfo = this.cache.requestInfo(request);
+      fullOrPartialRequest = requestInfo.requests[0];
+    } else {
+      fullOrPartialRequest = request;
+    }
 
-    return forkJoin(observables).pipe(
-      map((results) => {
-        const data = results.reduce((result, current) => {
-          return [...result, ...current];
-        }, []);
-        return {
-          data,
-          key: requestId,
-          state: LoadingState.Done,
+    const targets = fullOrPartialRequest.targets.map((target) => this.processTargetV2(target, fullOrPartialRequest));
+    const startTime = new Date();
+    return super.query({ ...fullOrPartialRequest, targets: targets.flat() }).pipe(
+      map((response) => {
+        const amendedResponse = {
+          ...response,
+          data: this.cache.procFrames(request, requestInfo, response.data),
         };
+        return transformV2(amendedResponse, request, {
+          exemplarTraceIdDestinations: this.exemplarTraceIdDestinations,
+        });
+      }),
+      tap((response: DataQueryResponse) => {
+        trackQuery(response, request, startTime);
       })
     );
   }
 
-  private runQuery<T>(query: PromQueryRequest, end: number, filter: OperatorFunction<any, T>): Observable<T> {
-    if (query.instant) {
-      return this.performInstantQuery(query, end).pipe(filter);
-    }
-
-    if (query.exemplar) {
-      return this.getExemplars(query).pipe(
-        catchError(() => {
-          return of({
-            data: [],
-            state: LoadingState.Done,
-          });
-        }),
-        filter
-      );
-    }
-
-    return this.performTimeSeriesQuery(query, query.start, query.end).pipe(filter);
-  }
-
   createQuery(target: PromQuery, options: DataQueryRequest<PromQuery>, start: number, end: number) {
     const query: PromQueryRequest = {
       hinting: target.hinting,
@@ -673,7 +482,7 @@ export class PrometheusDatasource
 
     // Align query interval with step to allow query caching and to ensure
     // that about-same-time query results look the same.
-    const adjusted = alignRange(start, end, query.step, this.timeSrv.timeRange().to.utcOffset() * 60);
+    const adjusted = alignRange(start, end, query.step, options.range.to.utcOffset() * 60);
     query.start = adjusted.start;
     query.end = adjusted.end;
     this._addTracingHeaders(query, options);
@@ -702,94 +511,7 @@ export class PrometheusDatasource
     return Math.max(interval * intervalFactor, minInterval, safeInterval);
   }
 
-  performTimeSeriesQuery(query: PromQueryRequest, start: number, end: number) {
-    if (start > end) {
-      throw { message: 'Invalid time range' };
-    }
-
-    const url = '/api/v1/query_range';
-    const data: any = {
-      query: query.expr,
-      start,
-      end,
-      step: query.step,
-    };
-
-    if (this.queryTimeout) {
-      data['timeout'] = this.queryTimeout;
-    }
-
-    return this._request<PromDataSuccessResponse<PromMatrixData>>(url, data, {
-      requestId: query.requestId,
-      headers: query.headers,
-    }).pipe(
-      catchError((err: FetchError<PromDataErrorResponse<PromMatrixData>>) => {
-        if (err.cancelled) {
-          return of(err);
-        }
-
-        return throwError(this.handleErrors(err, query));
-      })
-    );
-  }
-
-  performInstantQuery(
-    query: PromQueryRequest,
-    time: number
-  ): Observable<FetchResponse<PromDataSuccessResponse<PromVectorData | PromScalarData>> | FetchError> {
-    const url = '/api/v1/query';
-    const data: any = {
-      query: query.expr,
-      time,
-    };
-
-    if (this.queryTimeout) {
-      data['timeout'] = this.queryTimeout;
-    }
-
-    return this._request<PromDataSuccessResponse<PromVectorData | PromScalarData>>(
-      `/api/datasources/uid/${this.uid}/resources${url}`,
-      data,
-      {
-        requestId: query.requestId,
-        headers: query.headers,
-      }
-    ).pipe(
-      catchError((err: FetchError<PromDataErrorResponse<PromVectorData | PromScalarData>>) => {
-        if (err.cancelled) {
-          return of(err);
-        }
-
-        return throwError(this.handleErrors(err, query));
-      })
-    );
-  }
-
-  handleErrors = (err: any, target: PromQuery) => {
-    const error: DataQueryError = {
-      message: (err && err.statusText) || 'Unknown error during query transaction. Please check JS console logs.',
-      refId: target.refId,
-    };
-
-    if (err.data) {
-      if (typeof err.data === 'string') {
-        error.message = err.data;
-      } else if (err.data.error) {
-        error.message = safeStringifyValue(err.data.error);
-      }
-    } else if (err.message) {
-      error.message = err.message;
-    } else if (typeof err === 'string') {
-      error.message = err;
-    }
-
-    error.status = err.status;
-    error.statusText = err.statusText;
-
-    return error;
-  };
-
-  metricFindQuery(query: string) {
+  metricFindQuery(query: string, options?: LegacyMetricFindQueryOptions) {
     if (!query) {
       return Promise.resolve([]);
     }
@@ -797,14 +519,14 @@ export class PrometheusDatasource
     const scopedVars = {
       __interval: { text: this.interval, value: this.interval },
       __interval_ms: { text: rangeUtil.intervalToMs(this.interval), value: rangeUtil.intervalToMs(this.interval) },
-      ...this.getRangeScopedVars(this.timeSrv.timeRange()),
+      ...this.getRangeScopedVars(options?.range ?? getDefaultTimeRange()),
     };
     const interpolated = this.templateSrv.replace(query, scopedVars, this.interpolateQueryExpr);
     const metricFindQuery = new PrometheusMetricFindQuery(this, interpolated);
-    return metricFindQuery.process();
+    return metricFindQuery.process(options?.range ?? getDefaultTimeRange());
   }
 
-  getRangeScopedVars(range: TimeRange = this.timeSrv.timeRange()) {
+  getRangeScopedVars(range: TimeRange) {
     const msRange = range.to.diff(range.from);
     const sRange = Math.round(msRange / 1000);
     return {
@@ -948,22 +670,13 @@ export class PrometheusDatasource
     return eventList;
   };
 
-  getExemplars(query: PromQueryRequest) {
-    const url = '/api/v1/query_exemplars';
-    return this._request<PromDataSuccessResponse<PromExemplarData>>(
-      url,
-      { query: query.expr, start: query.start.toString(), end: query.end.toString() },
-      { requestId: query.requestId, headers: query.headers }
-    );
-  }
-
   // By implementing getTagKeys and getTagValues we add ad-hoc filters functionality
   // this is used to get label keys, a.k.a label names
   // it is used in metric_find_query.ts
   // and in Tempo here grafana/public/app/plugins/datasource/tempo/QueryEditor/ServiceGraphSection.tsx
-  async getTagKeys(options: DataSourceGetTagKeysOptions): Promise<MetricFindValue[]> {
+  async getTagKeys(options: DataSourceGetTagKeysOptions<PromQuery>): Promise<MetricFindValue[]> {
     if (!options || options.filters.length === 0) {
-      await this.languageProvider.fetchLabels();
+      await this.languageProvider.fetchLabels(options.timeRange);
       return this.languageProvider.getLabelKeys().map((k) => ({ value: k, text: k }));
     }
 
@@ -974,13 +687,7 @@ export class PrometheusDatasource
     }));
     const expr = promQueryModeller.renderLabels(labelFilters);
 
-    let labelsIndex: Record<string, string[]>;
-
-    if (this.hasLabelsMatchAPISupport()) {
-      labelsIndex = await this.languageProvider.fetchSeriesLabelsMatch(expr);
-    } else {
-      labelsIndex = await this.languageProvider.fetchSeriesLabels(expr);
-    }
+    let labelsIndex: Record<string, string[]> = await this.languageProvider.fetchLabelsWithMatch(expr);
 
     // filter out already used labels
     return Object.keys(labelsIndex)
@@ -999,13 +706,15 @@ export class PrometheusDatasource
     const expr = promQueryModeller.renderLabels(labelFilters);
 
     if (this.hasLabelsMatchAPISupport()) {
-      return (await this.languageProvider.fetchSeriesValuesWithMatch(options.key, expr)).map((v) => ({
-        value: v,
-        text: v,
-      }));
+      return (await this.languageProvider.fetchSeriesValuesWithMatch(options.key, expr, options.timeRange)).map(
+        (v) => ({
+          value: v,
+          text: v,
+        })
+      );
     }
 
-    const params = this.getTimeRangeParams();
+    const params = this.getTimeRangeParams(options.timeRange ?? getDefaultTimeRange());
     const result = await this.metadataRequest(`/api/v1/label/${options.key}/values`, params);
     return result?.data?.data?.map((value: any) => ({ text: value })) ?? [];
   }
@@ -1123,9 +832,8 @@ export class PrometheusDatasource
   /**
    * Returns the adjusted "snapped" interval parameters
    */
-  getAdjustedInterval(): { start: string; end: string } {
-    const range = this.timeSrv.timeRange();
-    return getRangeSnapInterval(this.cacheLevel, range);
+  getAdjustedInterval(timeRange: TimeRange): { start: string; end: string } {
+    return getRangeSnapInterval(this.cacheLevel, timeRange);
   }
 
   /**
@@ -1133,16 +841,15 @@ export class PrometheusDatasource
    * and then a little extra padding to round up/down to the nearest nth minute,
    * defined by the result of the getCacheDurationInMinutes.
    *
-   * For longer cache durations, and shorter query durations, the window we're calculating might be much bigger then the user's current window,
-   * resulting in us returning labels/values that might not be applicable for the given window, this is a necessary trade off if we want to cache larger durations
-   *
+   * For longer cache durations, and shorter query durations,
+   * the window we're calculating might be much bigger then the user's current window,
+   * resulting in us returning labels/values that might not be applicable for the given window,
+   * this is a necessary trade-off if we want to cache larger durations
    */
-
-  getTimeRangeParams(): { start: string; end: string } {
-    const range = this.timeSrv.timeRange();
+  getTimeRangeParams(timeRange: TimeRange): { start: string; end: string } {
     return {
-      start: getPrometheusTime(range.from, false).toString(),
-      end: getPrometheusTime(range.to, true).toString(),
+      start: getPrometheusTime(timeRange.from, false).toString(),
+      end: getPrometheusTime(timeRange.to, true).toString(),
     };
   }
 
@@ -1175,16 +882,17 @@ export class PrometheusDatasource
   }
 
   // Used when running queries through backend
-  applyTemplateVariables(
-    target: PromQuery,
-    scopedVars: ScopedVars,
-    filters?: AdHocVariableFilter[]
-  ): Record<string, any> {
-    const variables = cloneDeep(scopedVars);
+  applyTemplateVariables(target: PromQuery, scopedVars: ScopedVars, filters?: AdHocVariableFilter[]) {
+    const variables = { ...scopedVars };
 
-    // We want to interpolate these variables on backend
-    delete variables.__interval;
-    delete variables.__interval_ms;
+    // We want to interpolate these variables on backend.
+    // The pre-calculated values are replaced withe the variable strings.
+    variables.__interval = {
+      value: '$__interval',
+    };
+    variables.__interval_ms = {
+      value: '$__interval_ms',
+    };
 
     // interpolate expression
     const expr = this.templateSrv.replace(target.expr, variables, this.interpolateQueryExpr);
@@ -1204,8 +912,8 @@ export class PrometheusDatasource
     return this.templateSrv.getVariables().map((v) => `$${v.name}`);
   }
 
-  interpolateString(string: string) {
-    return this.templateSrv.replace(string, undefined, this.interpolateQueryExpr);
+  interpolateString(string: string, scopedVars?: ScopedVars) {
+    return this.templateSrv.replace(string, scopedVars, this.interpolateQueryExpr);
   }
 
   getDebounceTimeInMilliseconds(): number {
@@ -1303,10 +1011,10 @@ export function extractRuleMappingFromGroups(groups: any[]) {
 // NOTE: these two functions are very similar to the escapeLabelValueIn* functions
 // in language_utils.ts, but they are not exactly the same algorithm, and we found
 // no way to reuse one in the another or vice versa.
-export function prometheusRegularEscape(value: any) {
+export function prometheusRegularEscape(value: unknown) {
   return typeof value === 'string' ? value.replace(/\\/g, '\\\\').replace(/'/g, "\\\\'") : value;
 }
 
-export function prometheusSpecialRegexEscape(value: any) {
+export function prometheusSpecialRegexEscape(value: unknown) {
   return typeof value === 'string' ? value.replace(/\\/g, '\\\\\\\\').replace(/[$^*{}\[\]\'+?.()|]/g, '\\\\$&') : value;
 }
diff --git a/public/app/plugins/datasource/prometheus/language_provider.mock.ts b/public/app/plugins/datasource/prometheus/language_provider.mock.ts
index ed2944ba942d1..731a1977ca97b 100644
--- a/public/app/plugins/datasource/prometheus/language_provider.mock.ts
+++ b/public/app/plugins/datasource/prometheus/language_provider.mock.ts
@@ -12,6 +12,7 @@ export class EmptyLanguageProviderMock {
   fetchSeries = jest.fn().mockReturnValue([]);
   fetchSeriesLabels = jest.fn().mockReturnValue([]);
   fetchSeriesLabelsMatch = jest.fn().mockReturnValue([]);
+  fetchLabelsWithMatch = jest.fn().mockReturnValue([]);
   fetchLabels = jest.fn();
   loadMetricsMetadata = jest.fn();
 }
diff --git a/public/app/plugins/datasource/prometheus/language_provider.test.ts b/public/app/plugins/datasource/prometheus/language_provider.test.ts
index 51d821bc2fbd0..574fec92ef02d 100644
--- a/public/app/plugins/datasource/prometheus/language_provider.test.ts
+++ b/public/app/plugins/datasource/prometheus/language_provider.test.ts
@@ -1,14 +1,10 @@
-import { Editor as SlateEditor } from 'slate';
-import Plain from 'slate-plain-serializer';
-
-import { AbstractLabelOperator, dateTime, HistoryItem, TimeRange } from '@grafana/data';
-import { SearchFunctionType } from '@grafana/ui';
+import { AbstractLabelOperator, dateTime, TimeRange } from '@grafana/data';
 
 import { Label } from './components/monaco-query-field/monaco-completion-provider/situation';
 import { PrometheusDatasource } from './datasource';
 import LanguageProvider from './language_provider';
 import { getClientCacheDurationInMinutes, getPrometheusTime, getRangeSnapInterval } from './language_utils';
-import { PrometheusCacheLevel, PromQuery } from './types';
+import { PrometheusCacheLevel } from './types';
 
 const now = new Date(1681300293392).getTime();
 const timeRangeDurationSeconds = 1;
@@ -17,7 +13,21 @@ const fromPrometheusTime = getPrometheusTime(dateTime(now - timeRangeDurationSec
 const toPrometheusTimeString = toPrometheusTime.toString(10);
 const fromPrometheusTimeString = fromPrometheusTime.toString(10);
 
-const getTimeRangeParams = (override?: Partial<{ start: string; end: string }>): { start: string; end: string } => ({
+const getMockTimeRange = (): TimeRange => {
+  return {
+    to: dateTime(now).utc(),
+    from: dateTime(now).subtract(timeRangeDurationSeconds, 'second').utc(),
+    raw: {
+      from: fromPrometheusTimeString,
+      to: toPrometheusTimeString,
+    },
+  };
+};
+
+const getTimeRangeParams = (
+  timRange: TimeRange,
+  override?: Partial<{ start: string; end: string }>
+): { start: string; end: string } => ({
   start: fromPrometheusTimeString,
   end: toPrometheusTimeString,
   ...override,
@@ -125,7 +135,8 @@ describe('Language completion provider', () => {
     it('should call series endpoint', () => {
       const languageProvider = new LanguageProvider({
         ...defaultDatasource,
-        getAdjustedInterval: () => getRangeSnapInterval(PrometheusCacheLevel.None, getMockQuantizedTimeRangeParams()),
+        getAdjustedInterval: (timeRange: TimeRange) =>
+          getRangeSnapInterval(PrometheusCacheLevel.None, getMockQuantizedTimeRangeParams()),
       } as PrometheusDatasource);
       const getSeriesLabels = languageProvider.getSeriesLabels;
       const requestSpy = jest.spyOn(languageProvider, 'request');
@@ -152,7 +163,8 @@ describe('Language completion provider', () => {
         ...defaultDatasource,
         hasLabelsMatchAPISupport: () => true,
         cacheLevel: PrometheusCacheLevel.Low,
-        getAdjustedInterval: () => getRangeSnapInterval(PrometheusCacheLevel.Low, getMockQuantizedTimeRangeParams()),
+        getAdjustedInterval: (timeRange: TimeRange) =>
+          getRangeSnapInterval(PrometheusCacheLevel.Low, getMockQuantizedTimeRangeParams()),
         getCacheDurationInMinutes: () => timeSnapMinutes,
       } as PrometheusDatasource);
       const getSeriesLabels = languageProvider.getSeriesLabels;
@@ -251,16 +263,21 @@ describe('Language completion provider', () => {
   });
 
   describe('fetchSeries', () => {
-    it('should use match[] parameter', () => {
+    it('should use match[] parameter', async () => {
       const languageProvider = new LanguageProvider(defaultDatasource);
-      const fetchSeries = languageProvider.fetchSeries;
+      const timeRange = getMockTimeRange();
+      await languageProvider.start(timeRange);
       const requestSpy = jest.spyOn(languageProvider, 'request');
-      fetchSeries('{job="grafana"}');
+      await languageProvider.fetchSeries('{job="grafana"}');
       expect(requestSpy).toHaveBeenCalled();
       expect(requestSpy).toHaveBeenCalledWith(
         '/api/v1/series',
         {},
-        { end: toPrometheusTimeString, 'match[]': '{job="grafana"}', start: fromPrometheusTimeString },
+        {
+          end: toPrometheusTimeString,
+          'match[]': '{job="grafana"}',
+          start: fromPrometheusTimeString,
+        },
         undefined
       );
     });
@@ -311,516 +328,7 @@ describe('Language completion provider', () => {
     });
   });
 
-  describe('empty query suggestions', () => {
-    it('returns no suggestions on empty context', async () => {
-      const instance = new LanguageProvider(defaultDatasource);
-      const value = Plain.deserialize('');
-      const result = await instance.provideCompletionItems({ text: '', prefix: '', value, wrapperClasses: [] });
-      expect(result.context).toBeUndefined();
-      expect(result.suggestions).toMatchObject([]);
-    });
-
-    it('returns no suggestions with metrics on empty context even when metrics were provided', async () => {
-      const instance = new LanguageProvider(defaultDatasource);
-      instance.metrics = ['foo', 'bar'];
-      const value = Plain.deserialize('');
-      const result = await instance.provideCompletionItems({ text: '', prefix: '', value, wrapperClasses: [] });
-      expect(result.context).toBeUndefined();
-      expect(result.suggestions).toMatchObject([]);
-    });
-
-    it('returns history on empty context when history was provided', async () => {
-      const instance = new LanguageProvider(defaultDatasource);
-      const value = Plain.deserialize('');
-      const history: Array<HistoryItem<PromQuery>> = [
-        {
-          ts: 0,
-          query: { refId: '1', expr: 'metric' },
-        },
-      ];
-      const result = await instance.provideCompletionItems(
-        { text: '', prefix: '', value, wrapperClasses: [] },
-        { history }
-      );
-      expect(result.context).toBeUndefined();
-
-      expect(result.suggestions).toMatchObject([
-        {
-          label: 'History',
-          items: [
-            {
-              label: 'metric',
-            },
-          ],
-        },
-      ]);
-    });
-  });
-
-  describe('range suggestions', () => {
-    it('returns range suggestions in range context', async () => {
-      const instance = new LanguageProvider(defaultDatasource);
-      const value = Plain.deserialize('1');
-      const result = await instance.provideCompletionItems({
-        text: '1',
-        prefix: '1',
-        value,
-        wrapperClasses: ['context-range'],
-      });
-      expect(result.context).toBe('context-range');
-      expect(result.suggestions).toMatchObject([
-        {
-          items: [
-            { label: '$__interval', sortValue: '$__interval' },
-            { label: '$__rate_interval', sortValue: '$__rate_interval' },
-            { label: '$__range', sortValue: '$__range' },
-            { label: '1m', sortValue: '00:01:00' },
-            { label: '5m', sortValue: '00:05:00' },
-            { label: '10m', sortValue: '00:10:00' },
-            { label: '30m', sortValue: '00:30:00' },
-            { label: '1h', sortValue: '01:00:00' },
-            { label: '1d', sortValue: '24:00:00' },
-          ],
-          label: 'Range vector',
-        },
-      ]);
-    });
-  });
-
-  describe('metric suggestions', () => {
-    it('returns history, metrics and function suggestions in an uknown context ', async () => {
-      const instance = new LanguageProvider(defaultDatasource);
-      instance.metrics = ['foo', 'bar'];
-      const history: Array<HistoryItem<PromQuery>> = [
-        {
-          ts: 0,
-          query: { refId: '1', expr: 'metric' },
-        },
-      ];
-      let value = Plain.deserialize('m');
-      value = value.setSelection({ anchor: { offset: 1 }, focus: { offset: 1 } });
-      // Even though no metric with `m` is present, we still get metric completion items, filtering is done by the consumer
-      const result = await instance.provideCompletionItems(
-        { text: 'm', prefix: 'm', value, wrapperClasses: [] },
-        { history }
-      );
-      expect(result.context).toBeUndefined();
-      expect(result.suggestions).toMatchObject([
-        {
-          label: 'History',
-          items: [
-            {
-              label: 'metric',
-            },
-          ],
-        },
-        {
-          label: 'Functions',
-        },
-        {
-          label: 'Metrics',
-        },
-      ]);
-    });
-
-    it('returns no suggestions directly after a binary operator', async () => {
-      const instance = new LanguageProvider(defaultDatasource);
-      instance.metrics = ['foo', 'bar'];
-      const value = Plain.deserialize('*');
-      const result = await instance.provideCompletionItems({ text: '*', prefix: '', value, wrapperClasses: [] });
-      expect(result.context).toBeUndefined();
-      expect(result.suggestions).toMatchObject([]);
-    });
-
-    it('returns metric suggestions with prefix after a binary operator', async () => {
-      const instance = new LanguageProvider(defaultDatasource);
-      instance.metrics = ['foo', 'bar'];
-      const value = Plain.deserialize('foo + b');
-      const ed = new SlateEditor({ value });
-      const valueWithSelection = ed.moveForward(7).value;
-      const result = await instance.provideCompletionItems({
-        text: 'foo + b',
-        prefix: 'b',
-        value: valueWithSelection,
-        wrapperClasses: [],
-      });
-      expect(result.context).toBeUndefined();
-      expect(result.suggestions).toMatchObject([
-        {
-          label: 'Functions',
-        },
-        {
-          label: 'Metrics',
-        },
-      ]);
-    });
-
-    it('returns no suggestions at the beginning of a non-empty function', async () => {
-      const instance = new LanguageProvider(defaultDatasource);
-      const value = Plain.deserialize('sum(up)');
-      const ed = new SlateEditor({ value });
-
-      const valueWithSelection = ed.moveForward(4).value;
-      const result = await instance.provideCompletionItems({
-        text: '',
-        prefix: '',
-        value: valueWithSelection,
-        wrapperClasses: [],
-      });
-      expect(result.context).toBeUndefined();
-      expect(result.suggestions.length).toEqual(0);
-    });
-  });
-
-  describe('label suggestions', () => {
-    it('returns default label suggestions on label context and no metric', async () => {
-      const instance = new LanguageProvider(defaultDatasource);
-      const value = Plain.deserialize('{}');
-      const ed = new SlateEditor({ value });
-      const valueWithSelection = ed.moveForward(1).value;
-      const result = await instance.provideCompletionItems({
-        text: '',
-        prefix: '',
-        wrapperClasses: ['context-labels'],
-        value: valueWithSelection,
-      });
-      expect(result.context).toBe('context-labels');
-      expect(result.suggestions).toEqual([
-        {
-          items: [{ label: 'job' }, { label: 'instance' }],
-          label: 'Labels',
-          searchFunctionType: SearchFunctionType.Fuzzy,
-        },
-      ]);
-    });
-
-    it('returns label suggestions on label context and metric', async () => {
-      const datasources: PrometheusDatasource = {
-        ...defaultDatasource,
-        metadataRequest: () => ({ data: { data: [{ __name__: 'metric', bar: 'bazinga' }] } }),
-      } as unknown as PrometheusDatasource;
-      const instance = new LanguageProvider(datasources);
-      const value = Plain.deserialize('metric{}');
-      const ed = new SlateEditor({ value });
-      const valueWithSelection = ed.moveForward(7).value;
-      const result = await instance.provideCompletionItems({
-        text: '',
-        prefix: '',
-        wrapperClasses: ['context-labels'],
-        value: valueWithSelection,
-      });
-      expect(result.context).toBe('context-labels');
-      expect(result.suggestions).toEqual([
-        { items: [{ label: 'bar' }], label: 'Labels', searchFunctionType: SearchFunctionType.Fuzzy },
-      ]);
-    });
-
-    it('returns label suggestions on label context but leaves out labels that already exist', async () => {
-      const testDatasource: PrometheusDatasource = {
-        ...defaultDatasource,
-        metadataRequest: () => ({
-          data: {
-            data: [
-              {
-                __name__: 'metric',
-                bar: 'asdasd',
-                job1: 'dsadsads',
-                job2: 'fsfsdfds',
-                job3: 'dsadsad',
-              },
-            ],
-          },
-        }),
-      } as unknown as PrometheusDatasource;
-      const instance = new LanguageProvider(testDatasource);
-      const value = Plain.deserialize('{job1="foo",job2!="foo",job3=~"foo",__name__="metric",}');
-      const ed = new SlateEditor({ value });
-      const valueWithSelection = ed.moveForward(54).value;
-      const result = await instance.provideCompletionItems({
-        text: '',
-        prefix: '',
-        wrapperClasses: ['context-labels'],
-        value: valueWithSelection,
-      });
-      expect(result.context).toBe('context-labels');
-      expect(result.suggestions).toEqual([
-        { items: [{ label: 'bar' }], label: 'Labels', searchFunctionType: SearchFunctionType.Fuzzy },
-      ]);
-    });
-
-    it('returns label value suggestions inside a label value context after a negated matching operator', async () => {
-      const instance = new LanguageProvider({
-        ...defaultDatasource,
-        metadataRequest: () => {
-          return { data: { data: ['value1', 'value2'] } };
-        },
-      } as unknown as PrometheusDatasource);
-      const value = Plain.deserialize('{job!=}');
-      const ed = new SlateEditor({ value });
-      const valueWithSelection = ed.moveForward(6).value;
-      const result = await instance.provideCompletionItems({
-        text: '!=',
-        prefix: '',
-        wrapperClasses: ['context-labels'],
-        labelKey: 'job',
-        value: valueWithSelection,
-      });
-      expect(result.context).toBe('context-label-values');
-      expect(result.suggestions).toEqual([
-        {
-          items: [{ label: 'value1' }, { label: 'value2' }],
-          label: 'Label values for "job"',
-          searchFunctionType: SearchFunctionType.Fuzzy,
-        },
-      ]);
-    });
-
-    it('returns a refresher on label context and unavailable metric', async () => {
-      jest.spyOn(console, 'warn').mockImplementation(() => {});
-      const instance = new LanguageProvider(defaultDatasource);
-      const value = Plain.deserialize('metric{}');
-      const ed = new SlateEditor({ value });
-      const valueWithSelection = ed.moveForward(7).value;
-      const result = await instance.provideCompletionItems({
-        text: '',
-        prefix: '',
-        wrapperClasses: ['context-labels'],
-        value: valueWithSelection,
-      });
-      expect(result.context).toBeUndefined();
-      expect(result.suggestions).toEqual([]);
-      expect(console.warn).toHaveBeenCalledWith('Server did not return any values for selector = {__name__="metric"}');
-    });
-
-    it('returns label values on label context when given a metric and a label key', async () => {
-      const instance = new LanguageProvider({
-        ...defaultDatasource,
-        metadataRequest: () => simpleMetricLabelsResponse,
-      } as unknown as PrometheusDatasource);
-      const value = Plain.deserialize('metric{bar=ba}');
-      const ed = new SlateEditor({ value });
-      const valueWithSelection = ed.moveForward(13).value;
-      const result = await instance.provideCompletionItems({
-        text: '=ba',
-        prefix: 'ba',
-        wrapperClasses: ['context-labels'],
-        labelKey: 'bar',
-        value: valueWithSelection,
-      });
-      expect(result.context).toBe('context-label-values');
-      expect(result.suggestions).toEqual([
-        { items: [{ label: 'baz' }], label: 'Label values for "bar"', searchFunctionType: SearchFunctionType.Fuzzy },
-      ]);
-    });
-
-    it('returns label suggestions on aggregation context and metric w/ selector', async () => {
-      const instance = new LanguageProvider({
-        ...defaultDatasource,
-        metadataRequest: () => simpleMetricLabelsResponse,
-      } as unknown as PrometheusDatasource);
-      const value = Plain.deserialize('sum(metric{foo="xx"}) by ()');
-      const ed = new SlateEditor({ value });
-      const valueWithSelection = ed.moveForward(26).value;
-      const result = await instance.provideCompletionItems({
-        text: '',
-        prefix: '',
-        wrapperClasses: ['context-aggregation'],
-        value: valueWithSelection,
-      });
-      expect(result.context).toBe('context-aggregation');
-      expect(result.suggestions).toEqual([
-        { items: [{ label: 'bar' }], label: 'Labels', searchFunctionType: SearchFunctionType.Fuzzy },
-      ]);
-    });
-
-    it('returns label suggestions on aggregation context and metric w/o selector', async () => {
-      const instance = new LanguageProvider({
-        ...defaultDatasource,
-        metadataRequest: () => simpleMetricLabelsResponse,
-      } as unknown as PrometheusDatasource);
-      const value = Plain.deserialize('sum(metric) by ()');
-      const ed = new SlateEditor({ value });
-      const valueWithSelection = ed.moveForward(16).value;
-      const result = await instance.provideCompletionItems({
-        text: '',
-        prefix: '',
-        wrapperClasses: ['context-aggregation'],
-        value: valueWithSelection,
-      });
-      expect(result.context).toBe('context-aggregation');
-      expect(result.suggestions).toEqual([
-        { items: [{ label: 'bar' }], label: 'Labels', searchFunctionType: SearchFunctionType.Fuzzy },
-      ]);
-    });
-
-    it('returns label suggestions inside a multi-line aggregation context', async () => {
-      const instance = new LanguageProvider({
-        ...defaultDatasource,
-        metadataRequest: () => simpleMetricLabelsResponse,
-      } as unknown as PrometheusDatasource);
-      const value = Plain.deserialize('sum(\nmetric\n)\nby ()');
-      const aggregationTextBlock = value.document.getBlocks().get(3);
-      const ed = new SlateEditor({ value });
-      ed.moveToStartOfNode(aggregationTextBlock);
-      const valueWithSelection = ed.moveForward(4).value;
-      const result = await instance.provideCompletionItems({
-        text: '',
-        prefix: '',
-        wrapperClasses: ['context-aggregation'],
-        value: valueWithSelection,
-      });
-      expect(result.context).toBe('context-aggregation');
-      expect(result.suggestions).toEqual([
-        {
-          items: [{ label: 'bar' }],
-          label: 'Labels',
-          searchFunctionType: SearchFunctionType.Fuzzy,
-        },
-      ]);
-    });
-
-    it('returns label suggestions inside an aggregation context with a range vector', async () => {
-      const instance = new LanguageProvider({
-        ...defaultDatasource,
-        metadataRequest: () => simpleMetricLabelsResponse,
-      } as unknown as PrometheusDatasource);
-      const value = Plain.deserialize('sum(rate(metric[1h])) by ()');
-      const ed = new SlateEditor({ value });
-      const valueWithSelection = ed.moveForward(26).value;
-      const result = await instance.provideCompletionItems({
-        text: '',
-        prefix: '',
-        wrapperClasses: ['context-aggregation'],
-        value: valueWithSelection,
-      });
-      expect(result.context).toBe('context-aggregation');
-      expect(result.suggestions).toEqual([
-        {
-          items: [{ label: 'bar' }],
-          label: 'Labels',
-          searchFunctionType: SearchFunctionType.Fuzzy,
-        },
-      ]);
-    });
-
-    it('returns label suggestions inside an aggregation context with a range vector and label', async () => {
-      const instance = new LanguageProvider({
-        ...defaultDatasource,
-        metadataRequest: () => simpleMetricLabelsResponse,
-      } as unknown as PrometheusDatasource);
-      const value = Plain.deserialize('sum(rate(metric{label1="value"}[1h])) by ()');
-      const ed = new SlateEditor({ value });
-      const valueWithSelection = ed.moveForward(42).value;
-      const result = await instance.provideCompletionItems({
-        text: '',
-        prefix: '',
-        wrapperClasses: ['context-aggregation'],
-        value: valueWithSelection,
-      });
-      expect(result.context).toBe('context-aggregation');
-      expect(result.suggestions).toEqual([
-        {
-          items: [{ label: 'bar' }],
-          label: 'Labels',
-          searchFunctionType: SearchFunctionType.Fuzzy,
-        },
-      ]);
-    });
-
-    it('returns no suggestions inside an unclear aggregation context using alternate syntax', async () => {
-      const instance = new LanguageProvider(defaultDatasource);
-      const value = Plain.deserialize('sum by ()');
-      const ed = new SlateEditor({ value });
-      const valueWithSelection = ed.moveForward(8).value;
-      const result = await instance.provideCompletionItems({
-        text: '',
-        prefix: '',
-        wrapperClasses: ['context-aggregation'],
-        value: valueWithSelection,
-      });
-      expect(result.context).toBe('context-aggregation');
-      expect(result.suggestions).toEqual([]);
-    });
-
-    it('returns label suggestions inside an aggregation context using alternate syntax', async () => {
-      const instance = new LanguageProvider({
-        ...defaultDatasource,
-        metadataRequest: () => simpleMetricLabelsResponse,
-      } as unknown as PrometheusDatasource);
-      const value = Plain.deserialize('sum by () (metric)');
-      const ed = new SlateEditor({ value });
-      const valueWithSelection = ed.moveForward(8).value;
-      const result = await instance.provideCompletionItems({
-        text: '',
-        prefix: '',
-        wrapperClasses: ['context-aggregation'],
-        value: valueWithSelection,
-      });
-      expect(result.context).toBe('context-aggregation');
-      expect(result.suggestions).toEqual([
-        {
-          items: [{ label: 'bar' }],
-          label: 'Labels',
-          searchFunctionType: SearchFunctionType.Fuzzy,
-        },
-      ]);
-    });
-
-    it('does not re-fetch default labels', async () => {
-      const testDatasource: PrometheusDatasource = {
-        ...defaultDatasource,
-        metadataRequest: jest.fn(() => ({ data: { data: [] } })),
-        interpolateString: (string: string) => string,
-        getQuantizedTimeRangeParams: getMockQuantizedTimeRangeParams,
-      } as unknown as PrometheusDatasource;
-
-      const mockedMetadataRequest = jest.mocked(testDatasource.metadataRequest);
-
-      const instance = new LanguageProvider(testDatasource);
-      const value = Plain.deserialize('{}');
-      const ed = new SlateEditor({ value });
-      const valueWithSelection = ed.moveForward(1).value;
-      const args = {
-        text: '',
-        prefix: '',
-        wrapperClasses: ['context-labels'],
-        value: valueWithSelection,
-      };
-      const promise1 = instance.provideCompletionItems(args);
-      // one call for 2 default labels job, instance
-      expect(mockedMetadataRequest.mock.calls.length).toBe(2);
-      const promise2 = instance.provideCompletionItems(args);
-      expect(mockedMetadataRequest.mock.calls.length).toBe(2);
-      await Promise.all([promise1, promise2]);
-      expect(mockedMetadataRequest.mock.calls.length).toBe(2);
-    });
-  });
   describe('disabled metrics lookup', () => {
-    it('does not issue any metadata requests when lookup is disabled', async () => {
-      jest.spyOn(console, 'warn').mockImplementation(() => {});
-      const datasource: PrometheusDatasource = {
-        metadataRequest: jest.fn(() => ({ data: { data: ['foo', 'bar'] as string[] } })),
-        lookupsDisabled: true,
-      } as unknown as PrometheusDatasource;
-      const mockedMetadataRequest = jest.mocked(datasource.metadataRequest);
-      const instance = new LanguageProvider(datasource);
-      const value = Plain.deserialize('{}');
-      const ed = new SlateEditor({ value });
-      const valueWithSelection = ed.moveForward(1).value;
-      const args = {
-        text: '',
-        prefix: '',
-        wrapperClasses: ['context-labels'],
-        value: valueWithSelection,
-      };
-
-      expect(mockedMetadataRequest.mock.calls.length).toBe(0);
-      await instance.start();
-      expect(mockedMetadataRequest.mock.calls.length).toBe(0);
-      await instance.provideCompletionItems(args);
-      expect(mockedMetadataRequest.mock.calls.length).toBe(0);
-      expect(console.warn).toHaveBeenCalledWith('Server did not return any values for selector = {}');
-    });
     it('issues metadata requests when lookup is not disabled', async () => {
       const datasource: PrometheusDatasource = {
         ...defaultDatasource,
@@ -883,14 +391,3 @@ describe('Language completion provider', () => {
     });
   });
 });
-
-const simpleMetricLabelsResponse = {
-  data: {
-    data: [
-      {
-        __name__: 'metric',
-        bar: 'baz',
-      },
-    ],
-  },
-};
diff --git a/public/app/plugins/datasource/prometheus/language_provider.ts b/public/app/plugins/datasource/prometheus/language_provider.ts
index 265b6332e02f0..1f0a23f0a1d50 100644
--- a/public/app/plugins/datasource/prometheus/language_provider.ts
+++ b/public/app/plugins/datasource/prometheus/language_provider.ts
@@ -1,46 +1,33 @@
-import { chain, difference, once } from 'lodash';
+import { once } from 'lodash';
 import Prism from 'prismjs';
-import { Value } from 'slate';
 
 import {
   AbstractLabelMatcher,
   AbstractLabelOperator,
   AbstractQuery,
-  dateTime,
-  HistoryItem,
+  getDefaultTimeRange,
   LanguageProvider,
+  TimeRange,
 } from '@grafana/data';
 import { BackendSrvRequest } from '@grafana/runtime';
-import { CompletionItem, CompletionItemGroup, SearchFunctionType, TypeaheadInput, TypeaheadOutput } from '@grafana/ui';
 
 import { Label } from './components/monaco-query-field/monaco-completion-provider/situation';
 import { PrometheusDatasource } from './datasource';
 import {
-  addLimitInfo,
   extractLabelMatchers,
   fixSummariesMetadata,
-  parseSelector,
   processHistogramMetrics,
   processLabels,
   toPromLikeQuery,
 } from './language_utils';
-import PromqlSyntax, { FUNCTIONS, RATE_RANGES } from './promql';
+import PromqlSyntax from './promql';
 import { PrometheusCacheLevel, PromMetricsMetadata, PromQuery } from './types';
 
 const DEFAULT_KEYS = ['job', 'instance'];
 const EMPTY_SELECTOR = '{}';
-const HISTORY_ITEM_COUNT = 5;
-const HISTORY_COUNT_CUTOFF = 1000 * 60 * 60 * 24; // 24h
 // Max number of items (metrics, labels, values) that we display as suggestions. Prevents from running out of memory.
 export const SUGGESTIONS_LIMIT = 10000;
 
-const wrapLabel = (label: string): CompletionItem => ({ label });
-
-const setFunctionKind = (suggestion: CompletionItem): CompletionItem => {
-  suggestion.kind = 'function';
-  return suggestion;
-};
-
 const buildCacheHeaders = (durationInSeconds: number) => {
   return {
     headers: {
@@ -49,32 +36,6 @@ const buildCacheHeaders = (durationInSeconds: number) => {
   };
 };
 
-export function addHistoryMetadata(item: CompletionItem, history: any[]): CompletionItem {
-  const cutoffTs = Date.now() - HISTORY_COUNT_CUTOFF;
-  const historyForItem = history.filter((h) => h.ts > cutoffTs && h.query === item.label);
-  const count = historyForItem.length;
-  const recent = historyForItem[0];
-  let hint = `Queried ${count} times in the last 24h.`;
-
-  if (recent) {
-    const lastQueried = dateTime(recent.ts).fromNow();
-    hint = `${hint} Last queried ${lastQueried}.`;
-  }
-
-  return {
-    ...item,
-    documentation: hint,
-  };
-}
-
-function addMetricsMetadata(metric: string, metadata?: PromMetricsMetadata): CompletionItem {
-  const item: CompletionItem = { label: metric };
-  if (metadata && metadata[metric]) {
-    item.documentation = getMetadataString(metric, metadata);
-  }
-  return item;
-}
-
 export function getMetadataString(metric: string, metadata: PromMetricsMetadata): string | undefined {
   if (!metadata[metric]) {
     return undefined;
@@ -100,14 +61,10 @@ export function getMetadataType(metric: string, metadata: PromMetricsMetadata):
 const PREFIX_DELIMITER_REGEX =
   /(="|!="|=~"|!~"|\{|\[|\(|\+|-|\/|\*|%|\^|\band\b|\bor\b|\bunless\b|==|>=|!=|<=|>|<|=|~|,)/;
 
-interface AutocompleteContext {
-  history?: Array<HistoryItem<PromQuery>>;
-}
-
 const secondsInDay = 86400;
 export default class PromQlLanguageProvider extends LanguageProvider {
   histogramMetrics: string[];
-  timeRange?: { start: number; end: number };
+  timeRange: TimeRange;
   metrics: string[];
   metricsMetadata?: PromMetricsMetadata;
   declare startTask: Promise<any>;
@@ -120,7 +77,7 @@ export default class PromQlLanguageProvider extends LanguageProvider {
 
     this.datasource = datasource;
     this.histogramMetrics = [];
-    this.timeRange = { start: 0, end: 0 };
+    this.timeRange = getDefaultTimeRange();
     this.metrics = [];
 
     Object.assign(this, initialValues);
@@ -155,7 +112,9 @@ export default class PromQlLanguageProvider extends LanguageProvider {
     return defaultValue;
   };
 
-  start = async (): Promise<any[]> => {
+  start = async (timeRange?: TimeRange): Promise<any[]> => {
+    this.timeRange = timeRange ?? getDefaultTimeRange();
+
     if (this.datasource.lookupsDisabled) {
       return [];
     }
@@ -184,279 +143,6 @@ export default class PromQlLanguageProvider extends LanguageProvider {
     return this.labelKeys;
   }
 
-  provideCompletionItems = async (
-    { prefix, text, value, labelKey, wrapperClasses }: TypeaheadInput,
-    context: AutocompleteContext = {}
-  ): Promise<TypeaheadOutput> => {
-    const emptyResult: TypeaheadOutput = { suggestions: [] };
-
-    if (!value) {
-      return emptyResult;
-    }
-
-    // Local text properties
-    const empty = value.document.text.length === 0;
-    const selectedLines = value.document.getTextsAtRange(value.selection);
-    const currentLine = selectedLines.size === 1 ? selectedLines.first().getText() : null;
-
-    const nextCharacter = currentLine ? currentLine[value.selection.anchor.offset] : null;
-
-    // Syntax spans have 3 classes by default. More indicate a recognized token
-    const tokenRecognized = wrapperClasses.length > 3;
-    // Non-empty prefix, but not inside known token
-    const prefixUnrecognized = prefix && !tokenRecognized;
-
-    // Prevent suggestions in `function(|suffix)`
-    const noSuffix = !nextCharacter || nextCharacter === ')';
-
-    // Prefix is safe if it does not immediately follow a complete expression and has no text after it
-    const safePrefix = prefix && !text.match(/^[\]})\s]+$/) && noSuffix;
-
-    // About to type next operand if preceded by binary operator
-    const operatorsPattern = /[+\-*/^%]/;
-    const isNextOperand = text.match(operatorsPattern);
-
-    // Determine candidates by CSS context
-    if (wrapperClasses.includes('context-range')) {
-      // Suggestions for metric[|]
-      return this.getRangeCompletionItems();
-    } else if (wrapperClasses.includes('context-labels')) {
-      // Suggestions for metric{|} and metric{foo=|}, as well as metric-independent label queries like {|}
-      return this.getLabelCompletionItems({ prefix, text, value, labelKey, wrapperClasses });
-    } else if (wrapperClasses.includes('context-aggregation')) {
-      // Suggestions for sum(metric) by (|)
-      return this.getAggregationCompletionItems(value);
-    } else if (empty) {
-      // Suggestions for empty query field
-      return this.getEmptyCompletionItems(context);
-    } else if (prefixUnrecognized && noSuffix && !isNextOperand) {
-      // Show term suggestions in a couple of scenarios
-      return this.getBeginningCompletionItems(context);
-    } else if (prefixUnrecognized && safePrefix) {
-      // Show term suggestions in a couple of scenarios
-      return this.getTermCompletionItems();
-    }
-
-    return emptyResult;
-  };
-
-  getBeginningCompletionItems = (context: AutocompleteContext): TypeaheadOutput => {
-    return {
-      suggestions: [...this.getEmptyCompletionItems(context).suggestions, ...this.getTermCompletionItems().suggestions],
-    };
-  };
-
-  getEmptyCompletionItems = (context: AutocompleteContext): TypeaheadOutput => {
-    const { history } = context;
-    const suggestions: CompletionItemGroup[] = [];
-
-    if (history && history.length) {
-      const historyItems = chain(history)
-        .map((h) => h.query.expr)
-        .filter()
-        .uniq()
-        .take(HISTORY_ITEM_COUNT)
-        .map(wrapLabel)
-        .map((item) => addHistoryMetadata(item, history))
-        .value();
-
-      suggestions.push({
-        searchFunctionType: SearchFunctionType.Prefix,
-        skipSort: true,
-        label: 'History',
-        items: historyItems,
-      });
-    }
-
-    return { suggestions };
-  };
-
-  getTermCompletionItems = (): TypeaheadOutput => {
-    const { metrics, metricsMetadata } = this;
-    const suggestions: CompletionItemGroup[] = [];
-
-    suggestions.push({
-      searchFunctionType: SearchFunctionType.Prefix,
-      label: 'Functions',
-      items: FUNCTIONS.map(setFunctionKind),
-    });
-
-    if (metrics && metrics.length) {
-      suggestions.push({
-        label: 'Metrics',
-        items: metrics.map((m) => addMetricsMetadata(m, metricsMetadata)),
-        searchFunctionType: SearchFunctionType.Fuzzy,
-      });
-    }
-
-    return { suggestions };
-  };
-
-  getRangeCompletionItems(): TypeaheadOutput {
-    return {
-      context: 'context-range',
-      suggestions: [
-        {
-          label: 'Range vector',
-          items: [...RATE_RANGES],
-        },
-      ],
-    };
-  }
-
-  getAggregationCompletionItems = async (value: Value): Promise<TypeaheadOutput> => {
-    const suggestions: CompletionItemGroup[] = [];
-
-    // Stitch all query lines together to support multi-line queries
-    let queryOffset;
-    const queryText = value.document.getBlocks().reduce((text, block) => {
-      if (text === undefined) {
-        return '';
-      }
-      if (!block) {
-        return text;
-      }
-
-      const blockText = block?.getText();
-
-      if (value.anchorBlock.key === block.key) {
-        // Newline characters are not accounted for but this is irrelevant
-        // for the purpose of extracting the selector string
-        queryOffset = value.selection.anchor.offset + text.length;
-      }
-
-      return text + blockText;
-    }, '');
-
-    // Try search for selector part on the left-hand side, such as `sum (m) by (l)`
-    const openParensAggregationIndex = queryText.lastIndexOf('(', queryOffset);
-    let openParensSelectorIndex = queryText.lastIndexOf('(', openParensAggregationIndex - 1);
-    let closeParensSelectorIndex = queryText.indexOf(')', openParensSelectorIndex);
-
-    // Try search for selector part of an alternate aggregation clause, such as `sum by (l) (m)`
-    if (openParensSelectorIndex === -1) {
-      const closeParensAggregationIndex = queryText.indexOf(')', queryOffset);
-      closeParensSelectorIndex = queryText.indexOf(')', closeParensAggregationIndex + 1);
-      openParensSelectorIndex = queryText.lastIndexOf('(', closeParensSelectorIndex);
-    }
-
-    const result = {
-      suggestions,
-      context: 'context-aggregation',
-    };
-
-    // Suggestions are useless for alternative aggregation clauses without a selector in context
-    if (openParensSelectorIndex === -1) {
-      return result;
-    }
-
-    // Range vector syntax not accounted for by subsequent parse so discard it if present
-    const selectorString = queryText
-      .slice(openParensSelectorIndex + 1, closeParensSelectorIndex)
-      .replace(/\[[^\]]+\]$/, '');
-
-    const selector = parseSelector(selectorString, selectorString.length - 2).selector;
-
-    const series = await this.getSeries(selector);
-    const labelKeys = Object.keys(series);
-    if (labelKeys.length > 0) {
-      const limitInfo = addLimitInfo(labelKeys);
-      suggestions.push({
-        label: `Labels${limitInfo}`,
-        items: labelKeys.map(wrapLabel),
-        searchFunctionType: SearchFunctionType.Fuzzy,
-      });
-    }
-    return result;
-  };
-
-  getLabelCompletionItems = async ({
-    text,
-    wrapperClasses,
-    labelKey,
-    value,
-  }: TypeaheadInput): Promise<TypeaheadOutput> => {
-    if (!value) {
-      return { suggestions: [] };
-    }
-
-    const suggestions: CompletionItemGroup[] = [];
-    const line = value.anchorBlock.getText();
-    const cursorOffset = value.selection.anchor.offset;
-    const suffix = line.substr(cursorOffset);
-    const prefix = line.substr(0, cursorOffset);
-    const isValueStart = text.match(/^(=|=~|!=|!~)/);
-    const isValueEnd = suffix.match(/^"?[,}]|$/);
-    // Detect cursor in front of value, e.g., {key=|"}
-    const isPreValue = prefix.match(/(=|=~|!=|!~)$/) && suffix.match(/^"/);
-
-    // Don't suggest anything at the beginning or inside a value
-    const isValueEmpty = isValueStart && isValueEnd;
-    const hasValuePrefix = isValueEnd && !isValueStart;
-    if ((!isValueEmpty && !hasValuePrefix) || isPreValue) {
-      return { suggestions };
-    }
-
-    // Get normalized selector
-    let selector;
-    let parsedSelector;
-    try {
-      parsedSelector = parseSelector(line, cursorOffset);
-      selector = parsedSelector.selector;
-    } catch {
-      selector = EMPTY_SELECTOR;
-    }
-
-    const containsMetric = selector.includes('__name__=');
-    const existingKeys = parsedSelector ? parsedSelector.labelKeys : [];
-
-    let series: Record<string, string[]> = {};
-    // Query labels for selector
-    if (selector) {
-      series = await this.getSeries(selector, !containsMetric);
-    }
-
-    if (Object.keys(series).length === 0) {
-      console.warn(`Server did not return any values for selector = ${selector}`);
-      return { suggestions };
-    }
-
-    let context: string | undefined;
-
-    if ((text && isValueStart) || wrapperClasses.includes('attr-value')) {
-      // Label values
-      if (labelKey && series[labelKey]) {
-        context = 'context-label-values';
-        const limitInfo = addLimitInfo(series[labelKey]);
-        suggestions.push({
-          label: `Label values for "${labelKey}"${limitInfo}`,
-          items: series[labelKey].map(wrapLabel),
-          searchFunctionType: SearchFunctionType.Fuzzy,
-        });
-      }
-    } else {
-      // Label keys
-      const labelKeys = series ? Object.keys(series) : containsMetric ? null : DEFAULT_KEYS;
-
-      if (labelKeys) {
-        const possibleKeys = difference(labelKeys, existingKeys);
-        if (possibleKeys.length) {
-          context = 'context-labels';
-          const newItems = possibleKeys.map((key) => ({ label: key }));
-          const limitInfo = addLimitInfo(newItems);
-          const newSuggestion: CompletionItemGroup = {
-            label: `Labels${limitInfo}`,
-            items: newItems,
-            searchFunctionType: SearchFunctionType.Fuzzy,
-          };
-          suggestions.push(newSuggestion);
-        }
-      }
-    }
-
-    return { context, suggestions };
-  };
-
   importFromAbstractQuery(labelBasedQuery: AbstractQuery): PromQuery {
     return toPromLikeQuery(labelBasedQuery);
   }
@@ -504,7 +190,7 @@ export default class PromQlLanguageProvider extends LanguageProvider {
    * @param key
    */
   fetchLabelValues = async (key: string): Promise<string[]> => {
-    const params = this.datasource.getAdjustedInterval();
+    const params = this.datasource.getAdjustedInterval(this.timeRange);
     const interpolatedName = this.datasource.interpolateString(key);
     const url = `/api/v1/label/${interpolatedName}/values`;
     const value = await this.request(url, [], params, this.getDefaultCacheHeaders());
@@ -518,9 +204,12 @@ export default class PromQlLanguageProvider extends LanguageProvider {
   /**
    * Fetches all label keys
    */
-  async fetchLabels(): Promise<string[]> {
+  async fetchLabels(timeRange?: TimeRange): Promise<string[]> {
+    if (timeRange) {
+      this.timeRange = timeRange;
+    }
     const url = '/api/v1/labels';
-    const params = this.datasource.getAdjustedInterval();
+    const params = this.datasource.getAdjustedInterval(this.timeRange);
     this.labelFetchTs = Date.now().valueOf();
 
     const res = await this.request(url, [], params, this.getDefaultCacheHeaders());
@@ -550,11 +239,16 @@ export default class PromQlLanguageProvider extends LanguageProvider {
    * Fetches all values for a label, with optional match[]
    * @param name
    * @param match
+   * @param timeRange
    */
-  fetchSeriesValuesWithMatch = async (name: string, match?: string): Promise<string[]> => {
+  fetchSeriesValuesWithMatch = async (
+    name: string,
+    match?: string,
+    timeRange: TimeRange = this.timeRange
+  ): Promise<string[]> => {
     const interpolatedName = name ? this.datasource.interpolateString(name) : null;
     const interpolatedMatch = match ? this.datasource.interpolateString(match) : null;
-    const range = this.datasource.getAdjustedInterval();
+    const range = this.datasource.getAdjustedInterval(timeRange);
     const urlParams = {
       ...range,
       ...(interpolatedMatch && { 'match[]': interpolatedMatch }),
@@ -595,6 +289,20 @@ export default class PromQlLanguageProvider extends LanguageProvider {
     return possibleLabelNames.filter((l) => !usedLabelNames.has(l));
   };
 
+  /**
+   * Fetch labels using the best endpoint that datasource supports.
+   * This is cached by its args but also by the global timeRange currently selected as they can change over requested time.
+   * @param name
+   * @param withName
+   */
+  fetchLabelsWithMatch = async (name: string, withName?: boolean): Promise<Record<string, string[]>> => {
+    if (this.datasource.hasLabelsMatchAPISupport()) {
+      return this.fetchSeriesLabelsMatch(name, withName);
+    } else {
+      return this.fetchSeriesLabels(name, withName);
+    }
+  };
+
   /**
    * Fetch labels for a series using /series endpoint. This is cached by its args but also by the global timeRange currently selected as
    * they can change over requested time.
@@ -603,7 +311,7 @@ export default class PromQlLanguageProvider extends LanguageProvider {
    */
   fetchSeriesLabels = async (name: string, withName?: boolean): Promise<Record<string, string[]>> => {
     const interpolatedName = this.datasource.interpolateString(name);
-    const range = this.datasource.getAdjustedInterval();
+    const range = this.datasource.getAdjustedInterval(this.timeRange);
     const urlParams = {
       ...range,
       'match[]': interpolatedName,
@@ -623,7 +331,7 @@ export default class PromQlLanguageProvider extends LanguageProvider {
    */
   fetchSeriesLabelsMatch = async (name: string, withName?: boolean): Promise<Record<string, string[]>> => {
     const interpolatedName = this.datasource.interpolateString(name);
-    const range = this.datasource.getAdjustedInterval();
+    const range = this.datasource.getAdjustedInterval(this.timeRange);
     const urlParams = {
       ...range,
       'match[]': interpolatedName,
@@ -641,7 +349,7 @@ export default class PromQlLanguageProvider extends LanguageProvider {
    */
   fetchSeries = async (match: string): Promise<Array<Record<string, string>>> => {
     const url = '/api/v1/series';
-    const range = this.datasource.getTimeRangeParams();
+    const range = this.datasource.getTimeRangeParams(this.timeRange);
     const params = { ...range, 'match[]': match };
     return await this.request(url, {}, params, this.getDefaultCacheHeaders());
   };
@@ -659,9 +367,10 @@ export default class PromQlLanguageProvider extends LanguageProvider {
 
 function getNameLabelValue(promQuery: string, tokens: any): string {
   let nameLabelValue = '';
-  for (let prop in tokens) {
-    if (typeof tokens[prop] === 'string') {
-      nameLabelValue = tokens[prop] as string;
+
+  for (const token of tokens) {
+    if (typeof token === 'string') {
+      nameLabelValue = token;
       break;
     }
   }
diff --git a/public/app/plugins/datasource/prometheus/language_utils.test.ts b/public/app/plugins/datasource/prometheus/language_utils.test.ts
index 60151aa884049..65c9239107540 100644
--- a/public/app/plugins/datasource/prometheus/language_utils.test.ts
+++ b/public/app/plugins/datasource/prometheus/language_utils.test.ts
@@ -176,13 +176,39 @@ describe('expandRecordingRules()', () => {
         metricA: 'rate(fooA[])',
         metricB: 'rate(fooB[])',
       })
-    ).toBe('rate(fooA{label1="value1"}[])/ rate(fooB{label2="value2"}[])');
+    ).toBe('rate(fooA{label1="value1"}[]) / rate(fooB{label2="value2"}[])');
     expect(
       expandRecordingRules('metricA{label1="value1",label2="value2"} / metricB{label3="value3"}', {
         metricA: 'rate(fooA[])',
         metricB: 'rate(fooB[])',
       })
-    ).toBe('rate(fooA{label1="value1", label2="value2"}[])/ rate(fooB{label3="value3"}[])');
+    ).toBe('rate(fooA{label1="value1", label2="value2"}[]) / rate(fooB{label3="value3"}[])');
+  });
+
+  it('expands the query even it is wrapped with parentheses', () => {
+    expect(
+      expandRecordingRules('sum (metric{label1="value1"}) by (env)', { metric: 'foo{labelInside="valueInside"}' })
+    ).toBe('sum (foo{labelInside="valueInside", label1="value1"}) by (env)');
+  });
+
+  it('expands the query with regex match', () => {
+    expect(
+      expandRecordingRules('sum (metric{label1=~"/value1/(sa|sb)"}) by (env)', {
+        metric: 'foo{labelInside="valueInside"}',
+      })
+    ).toBe('sum (foo{labelInside="valueInside", label1=~"/value1/(sa|sb)"}) by (env)');
+  });
+
+  it('ins:metric:per{pid="val-42", comp="api"}', () => {
+    const query = `aaa:111{pid="val-42", comp="api"} + bbb:222{pid="val-42"}`;
+    const mapping = {
+      'aaa:111':
+        '(max without (mp) (targetMetric{device=~"/dev/(sda1|sdb)"}) / max without (mp) (targetMetric2{device=~"/dev/(sda1|sdb)"}))',
+      'bbb:222': '(targetMetric2{device=~"/dev/(sda1|sdb)"})',
+    };
+    const expected = `(max without (mp) (targetMetric{device=~"/dev/(sda1|sdb)", pid="val-42", comp="api"}) / max without (mp) (targetMetric2{device=~"/dev/(sda1|sdb)", pid="val-42", comp="api"})) + (targetMetric2{device=~"/dev/(sda1|sdb)", pid="val-42"})`;
+    const result = expandRecordingRules(query, mapping);
+    expect(result).toBe(expected);
   });
 });
 
diff --git a/public/app/plugins/datasource/prometheus/language_utils.ts b/public/app/plugins/datasource/prometheus/language_utils.ts
index 8f024b030af8d..ce5e43e7e58e4 100644
--- a/public/app/plugins/datasource/prometheus/language_utils.ts
+++ b/public/app/plugins/datasource/prometheus/language_utils.ts
@@ -64,7 +64,15 @@ export function processLabels(labels: Array<{ [key: string]: string }>, withName
 
 // const cleanSelectorRegexp = /\{(\w+="[^"\n]*?")(,\w+="[^"\n]*?")*\}/;
 export const selectorRegexp = /\{[^}]*?(\}|$)/;
-export const labelRegexp = /\b(\w+)(!?=~?)("[^"\n]*?")/g;
+
+// This will capture 4 groups. Example label filter => {instance="10.4.11.4:9003"}
+// 1. label:    instance
+// 2. operator: =
+// 3. value:    "10.4.11.4:9003"
+// 4. comma:    if there is a comma it will give ,
+// 5. space:    if there is a space after comma it will give the whole space
+// comma and space is useful for addLabelsToExpression function
+export const labelRegexp = /\b(\w+)(!?=~?)("[^"\n]*?")(,)?(\s*)?/g;
 
 export function parseSelector(query: string, cursorOffset = 1): { labelKeys: any[]; selector: string } {
   if (!query.match(selectorRegexp)) {
@@ -131,20 +139,88 @@ export function parseSelector(query: string, cursorOffset = 1): { labelKeys: any
 }
 
 export function expandRecordingRules(query: string, mapping: { [name: string]: string }): string {
-  const ruleNames = Object.keys(mapping);
-  const rulesRegex = new RegExp(`(\\s|^)(${ruleNames.join('|')})(\\s|$|\\(|\\[|\\{)`, 'ig');
-  const expandedQuery = query.replace(rulesRegex, (match, pre, name, post) => `${pre}${mapping[name]}${post}`);
+  const getRuleRegex = (ruleName: string) => new RegExp(`(\\s|\\(|^)(${ruleName})(\\s|$|\\(|\\[|\\{)`, 'ig');
+
+  // For each mapping key we iterate over the query and split them in parts.
+  // recording:rule{label=~"/label/value"} * some:other:rule{other_label="value"}
+  // We want to keep parts in here like this:
+  // recording:rule
+  // {label=~"/label/value"} *
+  // some:other:rule
+  // {other_label="value"}
+  const tmpSplitParts = Object.keys(mapping).reduce<string[]>(
+    (prev, curr) => {
+      let parts: string[] = [];
+      let tmpParts: string[] = [];
+      let removeIdx: number[] = [];
+
+      // we iterate over prev because it might be like this after first loop
+      // recording:rule and {label=~"/label/value"} * some:other:rule{other_label="value"}
+      // so we need to split the second part too
+      prev.filter(Boolean).forEach((p, i) => {
+        const doesMatch = p.match(getRuleRegex(curr));
+        if (doesMatch) {
+          parts = p.split(curr);
+          if (parts.length === 2) {
+            // this is the case when we have such result for this query
+            // max (metric{label="value"})
+            // "max(", "{label="value"}"
+            removeIdx.push(i);
+            tmpParts.push(...[parts[0], curr, parts[1]].filter(Boolean));
+          } else if (parts.length > 2) {
+            // this is the case when we have such query
+            // metric + metric
+            // when we split it we have such data
+            // "", " + ", ""
+            removeIdx.push(i);
+            parts = parts.map((p) => (p === '' ? curr : p));
+            tmpParts.push(...parts);
+          }
+        }
+      });
+
+      // if we have idx to remove that means we split the value in that index.
+      // No need to keep it. Have the new split values instead.
+      removeIdx.forEach((ri) => (prev[ri] = ''));
+      prev = prev.filter(Boolean);
+      prev.push(...tmpParts);
+
+      return prev;
+    },
+    [query]
+  );
+
+  // we have the separate parts. we need to replace the metric and apply the labels if there is any
+  let labelFound = false;
+  const trulyExpandedQuery = tmpSplitParts.map((tsp, i) => {
+    // if we know this loop tsp is a label, not the metric we want to expand
+    if (labelFound) {
+      labelFound = false;
+      return '';
+    }
 
-  // Split query into array, so if query uses operators, we can correctly add labels to each individual part.
-  const queryArray = expandedQuery.split(/(\+|\-|\*|\/|\%|\^)/);
+    // check if the mapping is there
+    if (mapping[tsp]) {
+      const recordingRule = mapping[tsp];
+      // it is a recording rule. if the following is a label then apply it
+      if (i + 1 !== tmpSplitParts.length && tmpSplitParts[i + 1].match(labelRegexp)) {
+        // the next value in the loop is label. Let's apply labels to the metric
+        labelFound = true;
+        const labels = tmpSplitParts[i + 1];
+        const invalidLabelsRegex = /(\)\{|\}\{|\]\{)/;
+        return addLabelsToExpression(recordingRule + labels, invalidLabelsRegex);
+      } else {
+        // it is not a recording rule and might be a binary operation in between two recording rules
+        // So no need to do anything. just return it.
+        return recordingRule;
+      }
+    }
 
-  // Regex that matches occurrences of ){ or }{ or ]{ which is a sign of incorrecly added labels.
-  const invalidLabelsRegex = /(\)\{|\}\{|\]\{)/;
-  const correctlyExpandedQueryArray = queryArray.map((query) => {
-    return addLabelsToExpression(query, invalidLabelsRegex);
+    return tsp;
   });
 
-  return correctlyExpandedQueryArray.join('');
+  // Remove empty strings and merge them
+  return trulyExpandedQuery.filter(Boolean).join('');
 }
 
 function addLabelsToExpression(expr: string, invalidLabelsRegexp: RegExp) {
@@ -159,9 +235,15 @@ function addLabelsToExpression(expr: string, invalidLabelsRegexp: RegExp) {
   const exprAfterRegexMatch = expr.slice(indexOfRegexMatch + 1);
 
   // Create arrayOfLabelObjects with label objects that have key, operator and value.
-  const arrayOfLabelObjects: Array<{ key: string; operator: string; value: string }> = [];
-  exprAfterRegexMatch.replace(labelRegexp, (label, key, operator, value) => {
-    arrayOfLabelObjects.push({ key, operator, value });
+  const arrayOfLabelObjects: Array<{
+    key: string;
+    operator: string;
+    value: string;
+    comma?: string;
+    space?: string;
+  }> = [];
+  exprAfterRegexMatch.replace(labelRegexp, (label, key, operator, value, comma, space) => {
+    arrayOfLabelObjects.push({ key, operator, value, comma, space });
     return '';
   });
 
@@ -174,7 +256,19 @@ function addLabelsToExpression(expr: string, invalidLabelsRegexp: RegExp) {
     result = addLabelToQuery(result, obj.key, value, obj.operator);
   });
 
-  return result;
+  // reconstruct the labels
+  let existingLabel = arrayOfLabelObjects.reduce((prev, curr) => {
+    prev += `${curr.key}${curr.operator}${curr.value}${curr.comma ?? ''}${curr.space ?? ''}`;
+    return prev;
+  }, '');
+
+  // Check if there is anything besides labels
+  // Useful for this kind of metrics sum (recording_rule_metric{label1="value1"}) by (env)
+  // if we don't check this part, ) by (env) part will be lost
+  existingLabel = '{' + existingLabel + '}';
+  const potentialLeftOver = exprAfterRegexMatch.replace(existingLabel, '');
+
+  return result + potentialLeftOver;
 }
 
 /**
@@ -287,6 +381,7 @@ const FromPromLikeMap: Record<string, AbstractLabelOperator> = {
   '=~': AbstractLabelOperator.EqualRegEx,
   '!~': AbstractLabelOperator.NotEqualRegEx,
 };
+
 const ToPromLikeMap: Record<AbstractLabelOperator, string> = invert(FromPromLikeMap) as Record<
   AbstractLabelOperator,
   string
@@ -321,38 +416,49 @@ export interface PromLikeQuery extends DataQuery {
   range: boolean;
 }
 
+function getMaybeTokenStringContent(token: Token): string {
+  if (typeof token.content === 'string') {
+    return token.content;
+  }
+
+  return '';
+}
+
 export function extractLabelMatchers(tokens: Array<string | Token>): AbstractLabelMatcher[] {
   const labelMatchers: AbstractLabelMatcher[] = [];
 
-  for (let prop in tokens) {
-    if (tokens[prop] instanceof Token) {
-      let token: Token = tokens[prop] as Token;
-      if (token.type === 'context-labels') {
-        let labelKey = '';
-        let labelValue = '';
-        let labelOperator = '';
-        let contentTokens: any[] = token.content as any[];
-        for (let currentToken in contentTokens) {
-          if (typeof contentTokens[currentToken] === 'string') {
-            let currentStr: string;
-            currentStr = contentTokens[currentToken] as string;
-            if (currentStr === '=' || currentStr === '!=' || currentStr === '=~' || currentStr === '!~') {
-              labelOperator = currentStr;
-            }
-          } else if (contentTokens[currentToken] instanceof Token) {
-            switch (contentTokens[currentToken].type) {
-              case 'label-key':
-                labelKey = contentTokens[currentToken].content as string;
-                break;
-              case 'label-value':
-                labelValue = contentTokens[currentToken].content as string;
-                labelValue = labelValue.substring(1, labelValue.length - 1);
-                const labelComparator = FromPromLikeMap[labelOperator];
-                if (labelComparator) {
-                  labelMatchers.push({ name: labelKey, operator: labelComparator, value: labelValue });
-                }
-                break;
-            }
+  for (const token of tokens) {
+    if (!(token instanceof Token)) {
+      continue;
+    }
+
+    if (token.type === 'context-labels') {
+      let labelKey = '';
+      let labelValue = '';
+      let labelOperator = '';
+
+      const contentTokens = Array.isArray(token.content) ? token.content : [token.content];
+
+      for (let currentToken of contentTokens) {
+        if (typeof currentToken === 'string') {
+          let currentStr: string;
+          currentStr = currentToken;
+          if (currentStr === '=' || currentStr === '!=' || currentStr === '=~' || currentStr === '!~') {
+            labelOperator = currentStr;
+          }
+        } else if (currentToken instanceof Token) {
+          switch (currentToken.type) {
+            case 'label-key':
+              labelKey = getMaybeTokenStringContent(currentToken);
+              break;
+            case 'label-value':
+              labelValue = getMaybeTokenStringContent(currentToken);
+              labelValue = labelValue.substring(1, labelValue.length - 1);
+              const labelComparator = FromPromLikeMap[labelOperator];
+              if (labelComparator) {
+                labelMatchers.push({ name: labelKey, operator: labelComparator, value: labelValue });
+              }
+              break;
           }
         }
       }
diff --git a/public/app/plugins/datasource/prometheus/metric_find_query.test.ts b/public/app/plugins/datasource/prometheus/metric_find_query.test.ts
index 8e23307f1b320..d6817259bce59 100644
--- a/public/app/plugins/datasource/prometheus/metric_find_query.test.ts
+++ b/public/app/plugins/datasource/prometheus/metric_find_query.test.ts
@@ -1,12 +1,12 @@
 import 'whatwg-fetch'; // fetch polyfill needed backendSrv
 import { of } from 'rxjs';
 
-import { DataSourceInstanceSettings, toUtc } from '@grafana/data';
-import { FetchResponse } from '@grafana/runtime';
+import { DataSourceInstanceSettings, TimeRange, toUtc } from '@grafana/data';
+import { FetchResponse, TemplateSrv } from '@grafana/runtime';
 import { backendSrv } from 'app/core/services/backend_srv'; // will use the version in __mocks__
-import { TemplateSrv } from 'app/features/templating/template_srv';
 
 import { PrometheusDatasource } from './datasource';
+import { getPrometheusTime } from './language_utils';
 import PrometheusMetricFindQuery from './metric_find_query';
 import { PromApplication, PromOptions } from './types';
 
@@ -21,29 +21,24 @@ const instanceSettings = {
   url: 'proxied',
   id: 1,
   uid: 'ABCDEF',
-  directUrl: 'direct',
   user: 'test',
   password: 'mupp',
-  jsonData: { httpMethod: 'GET' },
+  jsonData: {
+    httpMethod: 'GET',
+    prometheusVersion: '2.20.0',
+    prometheusType: PromApplication.Prometheus,
+  },
 } as Partial<DataSourceInstanceSettings<PromOptions>> as DataSourceInstanceSettings<PromOptions>;
-const raw = {
+
+const raw: TimeRange = {
   from: toUtc('2018-04-25 10:00'),
   to: toUtc('2018-04-25 11:00'),
+  raw: {
+    from: '2018-04-25 10:00',
+    to: '2018-04-25 11:00',
+  },
 };
 
-jest.mock('app/features/dashboard/services/TimeSrv', () => ({
-  __esModule: true,
-  getTimeSrv: jest.fn().mockReturnValue({
-    timeRange() {
-      return {
-        from: raw.from,
-        to: raw.to,
-        raw: raw,
-      };
-    },
-  }),
-}));
-
 const templateSrvStub = {
   getAdhocFilters: jest.fn().mockImplementation(() => []),
   replace: jest.fn().mockImplementation((a: string) => a),
@@ -67,7 +62,15 @@ describe('PrometheusMetricFindQuery', () => {
     );
   });
 
-  const setupMetricFindQuery = (data: any, datasource?: PrometheusDatasource) => {
+  const setupMetricFindQuery = (
+    data: {
+      query: string;
+      response: {
+        data: unknown;
+      };
+    },
+    datasource?: PrometheusDatasource
+  ) => {
     fetchMock.mockImplementation(() => of({ status: 'success', data: data.response } as unknown as FetchResponse));
     return new PrometheusMetricFindQuery(datasource ?? legacyPrometheusDatasource, data.query);
   };
@@ -80,7 +83,7 @@ describe('PrometheusMetricFindQuery', () => {
           data: ['name1', 'name2', 'name3'],
         },
       });
-      const results = await query.process();
+      const results = await query.process(raw);
 
       expect(results).toHaveLength(3);
       expect(fetchMock).toHaveBeenCalledTimes(1);
@@ -102,7 +105,7 @@ describe('PrometheusMetricFindQuery', () => {
           data: ['value1', 'value2', 'value3'],
         },
       });
-      const results = await query.process();
+      const results = await query.process(raw);
 
       expect(results).toHaveLength(3);
       expect(fetchMock).toHaveBeenCalledTimes(1);
@@ -114,6 +117,30 @@ describe('PrometheusMetricFindQuery', () => {
       });
     });
 
+    const emptyFilters = ['{}', '{   }', ' {   }  ', '   {}  '];
+
+    emptyFilters.forEach((emptyFilter) => {
+      const queryString = `label_values(${emptyFilter}, resource)`;
+      it(`Empty filter, query, ${queryString} should just generate label search query`, async () => {
+        const query = setupMetricFindQuery({
+          query: queryString,
+          response: {
+            data: ['value1', 'value2', 'value3'],
+          },
+        });
+        const results = await query.process(raw);
+
+        expect(results).toHaveLength(3);
+        expect(fetchMock).toHaveBeenCalledTimes(1);
+        expect(fetchMock).toHaveBeenCalledWith({
+          method: 'GET',
+          url: `/api/datasources/uid/ABCDEF/resources/api/v1/label/resource/values?start=${raw.from.unix()}&end=${raw.to.unix()}`,
+          hideFromInspector: true,
+          headers: {},
+        });
+      });
+    });
+
     // <LegacyPrometheus>
     it('label_values(metric, resource) should generate series query with correct time', async () => {
       const query = setupMetricFindQuery({
@@ -126,7 +153,7 @@ describe('PrometheusMetricFindQuery', () => {
           ],
         },
       });
-      const results = await query.process();
+      const results = await query.process(raw);
 
       expect(results).toHaveLength(3);
       expect(fetchMock).toHaveBeenCalledTimes(1);
@@ -152,7 +179,7 @@ describe('PrometheusMetricFindQuery', () => {
           ],
         },
       });
-      const results = await query.process();
+      const results = await query.process(raw);
 
       expect(results).toHaveLength(3);
       expect(fetchMock).toHaveBeenCalledTimes(1);
@@ -176,7 +203,7 @@ describe('PrometheusMetricFindQuery', () => {
           ],
         },
       });
-      const results = await query.process();
+      const results = await query.process(raw);
 
       expect(results).toHaveLength(2);
       expect(results[0].text).toBe('value1');
@@ -201,7 +228,7 @@ describe('PrometheusMetricFindQuery', () => {
           data: ['metric1', 'metric2', 'metric3', 'nomatch'],
         },
       });
-      const results = await query.process();
+      const results = await query.process(raw);
 
       expect(results).toHaveLength(3);
       expect(fetchMock).toHaveBeenCalledTimes(1);
@@ -228,7 +255,7 @@ describe('PrometheusMetricFindQuery', () => {
           },
         },
       });
-      const results = await query.process();
+      const results = await query.process(raw);
 
       expect(results).toHaveLength(1);
       expect(results[0].text).toBe('metric{job="testjob"} 3846 1443454528000');
@@ -236,8 +263,40 @@ describe('PrometheusMetricFindQuery', () => {
       expect(fetchMock).toHaveBeenCalledWith({
         method: 'GET',
         url: `/api/datasources/uid/ABCDEF/resources/api/v1/query?query=metric&time=${raw.to.unix()}`,
-        requestId: undefined,
         headers: {},
+        hideFromInspector: true,
+        showErrorAlert: false,
+      });
+    });
+
+    it('query_result(metric) should pass time parameter to datasource.metric_find_query', async () => {
+      const query = setupMetricFindQuery({
+        query: 'query_result(metric)',
+        response: {
+          data: {
+            resultType: 'vector',
+            result: [
+              {
+                metric: { __name__: 'metric', job: 'testjob' },
+                value: [1443454528.0, '3846'],
+              },
+            ],
+          },
+        },
+      });
+      const results = await query.process(raw);
+
+      const expectedTime = getPrometheusTime(raw.to, true);
+
+      expect(results).toHaveLength(1);
+      expect(results[0].text).toBe('metric{job="testjob"} 3846 1443454528000');
+      expect(fetchMock).toHaveBeenCalledTimes(1);
+      expect(fetchMock).toHaveBeenCalledWith({
+        method: 'GET',
+        url: `/api/datasources/uid/ABCDEF/resources/api/v1/query?query=metric&time=${expectedTime}`,
+        headers: {},
+        hideFromInspector: true,
+        showErrorAlert: false,
       });
     });
 
@@ -251,15 +310,16 @@ describe('PrometheusMetricFindQuery', () => {
           },
         },
       });
-      const results = await query.process();
+      const results = await query.process(raw);
       expect(results).toHaveLength(1);
       expect(results[0].text).toBe('2');
       expect(fetchMock).toHaveBeenCalledTimes(1);
       expect(fetchMock).toHaveBeenCalledWith({
         method: 'GET',
         url: `/api/datasources/uid/ABCDEF/resources/api/v1/query?query=1%2B1&time=${raw.to.unix()}`,
-        requestId: undefined,
         headers: {},
+        hideFromInspector: true,
+        showErrorAlert: false,
       });
     });
 
@@ -274,7 +334,7 @@ describe('PrometheusMetricFindQuery', () => {
           ],
         },
       });
-      const results = await query.process();
+      const results = await query.process(raw);
 
       expect(results).toHaveLength(3);
       expect(results[0].text).toBe('up{instance="127.0.0.1:1234",job="job1"}');
@@ -309,7 +369,7 @@ describe('PrometheusMetricFindQuery', () => {
         },
         prometheusDatasource
       );
-      const results = await query.process();
+      const results = await query.process(raw);
 
       expect(results).toHaveLength(3);
       expect(fetchMock).toHaveBeenCalledTimes(1);
@@ -337,7 +397,7 @@ describe('PrometheusMetricFindQuery', () => {
         },
         prometheusDatasource
       );
-      const results = await query.process();
+      const results = await query.process(raw);
 
       expect(results).toHaveLength(1);
       expect(fetchMock).toHaveBeenCalledTimes(1);
diff --git a/public/app/plugins/datasource/prometheus/metric_find_query.ts b/public/app/plugins/datasource/prometheus/metric_find_query.ts
index 6903dfea91eb0..a0933737132d1 100644
--- a/public/app/plugins/datasource/prometheus/metric_find_query.ts
+++ b/public/app/plugins/datasource/prometheus/metric_find_query.ts
@@ -1,9 +1,6 @@
 import { chain, map as _map, uniq } from 'lodash';
-import { lastValueFrom } from 'rxjs';
-import { map } from 'rxjs/operators';
 
-import { MetricFindValue, TimeRange } from '@grafana/data';
-import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
+import { getDefaultTimeRange, MetricFindValue, TimeRange } from '@grafana/data';
 
 import { PrometheusDatasource } from './datasource';
 import { getPrometheusTime } from './language_utils';
@@ -13,7 +10,6 @@ import {
   PrometheusMetricNamesRegex,
   PrometheusQueryResultRegex,
 } from './migrations/variableMigration';
-import { PromQueryRequest } from './types';
 
 export default class PrometheusMetricFindQuery {
   range: TimeRange;
@@ -24,10 +20,11 @@ export default class PrometheusMetricFindQuery {
   ) {
     this.datasource = datasource;
     this.query = query;
-    this.range = getTimeSrv().timeRange();
+    this.range = getDefaultTimeRange();
   }
 
-  process(): Promise<MetricFindValue[]> {
+  process(timeRange: TimeRange): Promise<MetricFindValue[]> {
+    this.range = timeRange;
     const labelNamesRegex = PrometheusLabelNamesRegex;
     const labelNamesRegexWithMatch = PrometheusLabelNamesRegexWithMatch;
     const labelValuesRegex = /^label_values\((?:(.+),\s*)?([a-zA-Z_][a-zA-Z0-9_]*)\)\s*$/;
@@ -46,15 +43,18 @@ export default class PrometheusMetricFindQuery {
     }
 
     if (labelNamesQuery) {
-      return this.datasource.getTagKeys({ filters: [] });
+      return this.datasource.getTagKeys({ filters: [], timeRange });
     }
 
     const labelValuesQuery = this.query.match(labelValuesRegex);
     if (labelValuesQuery) {
-      if (labelValuesQuery[1]) {
-        return this.labelValuesQuery(labelValuesQuery[2], labelValuesQuery[1]);
+      const filter = labelValuesQuery[1];
+      const label = labelValuesQuery[2];
+      if (isFilterDefined(filter)) {
+        return this.labelValuesQuery(label, filter);
       } else {
-        return this.labelValuesQuery(labelValuesQuery[2]);
+        // Exclude the filter part of the expression because it is blank or empty
+        return this.labelValuesQuery(label);
       }
     }
 
@@ -65,7 +65,7 @@ export default class PrometheusMetricFindQuery {
 
     const queryResultQuery = this.query.match(queryResultRegex);
     if (queryResultQuery) {
-      return lastValueFrom(this.queryResultQuery(queryResultQuery[1]));
+      return this.queryResultQuery(queryResultQuery[1]);
     }
 
     // if query contains full metric name, return metric name and label list
@@ -136,41 +136,42 @@ export default class PrometheusMetricFindQuery {
   }
 
   queryResultQuery(query: string) {
-    const end = getPrometheusTime(this.range.to, true);
-    const instantQuery: PromQueryRequest = { expr: query } as PromQueryRequest;
-    return this.datasource.performInstantQuery(instantQuery, end).pipe(
-      map((result) => {
-        switch (result.data.data.resultType) {
-          case 'scalar': // [ <unix_time>, "<scalar_value>" ]
-          case 'string': // [ <unix_time>, "<string_value>" ]
-            return [
-              {
-                text: result.data.data.result[1] || '',
-                expandable: false,
-              },
-            ];
-          case 'vector':
-            return _map(result.data.data.result, (metricData) => {
-              let text = metricData.metric.__name__ || '';
-              delete metricData.metric.__name__;
-              text +=
-                '{' +
-                _map(metricData.metric, (v, k) => {
-                  return k + '="' + v + '"';
-                }).join(',') +
-                '}';
-              text += ' ' + metricData.value[1] + ' ' + metricData.value[0] * 1000;
-
-              return {
-                text: text,
-                expandable: true,
-              };
-            });
-          default:
-            throw Error(`Unknown/Unhandled result type: [${result.data.data.resultType}]`);
-        }
-      })
-    );
+    const url = '/api/v1/query';
+    const params = {
+      query,
+      time: getPrometheusTime(this.range.to, true).toString(),
+    };
+    return this.datasource.metadataRequest(url, params).then((result: any) => {
+      switch (result.data.data.resultType) {
+        case 'scalar': // [ <unix_time>, "<scalar_value>" ]
+        case 'string': // [ <unix_time>, "<string_value>" ]
+          return [
+            {
+              text: result.data.data.result[1] || '',
+              expandable: false,
+            },
+          ];
+        case 'vector':
+          return _map(result.data.data.result, (metricData) => {
+            let text = metricData.metric.__name__ || '';
+            delete metricData.metric.__name__;
+            text +=
+              '{' +
+              _map(metricData.metric, (v, k) => {
+                return k + '="' + v + '"';
+              }).join(',') +
+              '}';
+            text += ' ' + metricData.value[1] + ' ' + metricData.value[0] * 1000;
+
+            return {
+              text: text,
+              expandable: true,
+            };
+          });
+        default:
+          throw Error(`Unknown/Unhandled result type: [${result.data.data.resultType}]`);
+      }
+    });
   }
 
   metricNameAndLabelsQuery(query: string): Promise<MetricFindValue[]> {
@@ -195,3 +196,8 @@ export default class PrometheusMetricFindQuery {
     });
   }
 }
+
+function isFilterDefined(filter: string) {
+  // We consider blank strings or the empty filter {} as an undefined filter
+  return filter && filter.split(' ').join('') !== '{}';
+}
diff --git a/public/app/plugins/datasource/prometheus/module.ts b/public/app/plugins/datasource/prometheus/module.ts
index ba33b7f90cb67..002720ee141d0 100644
--- a/public/app/plugins/datasource/prometheus/module.ts
+++ b/public/app/plugins/datasource/prometheus/module.ts
@@ -1,11 +1,27 @@
 import { DataSourcePlugin } from '@grafana/data';
+import {
+  PrometheusDatasource as PrometheusDatasourcePackage,
+  PromQueryEditorByApp as PromQueryEditorByAppPackage,
+  PromCheatSheet as PromCheatSheetPackage,
+} from '@grafana/prometheus';
+import { config } from '@grafana/runtime';
 
 import PromCheatSheet from './components/PromCheatSheet';
 import PromQueryEditorByApp from './components/PromQueryEditorByApp';
 import { ConfigEditor } from './configuration/ConfigEditor';
+import { ConfigEditor as ConfigEditorPackage } from './configuration/ConfigEditorPackage';
 import { PrometheusDatasource } from './datasource';
 
-export const plugin = new DataSourcePlugin(PrometheusDatasource)
-  .setQueryEditor(PromQueryEditorByApp)
-  .setConfigEditor(ConfigEditor)
-  .setQueryEditorHelp(PromCheatSheet);
+const usePackage = config.featureToggles.usePrometheusFrontendPackage;
+
+const PrometheusDataSourceUsed = usePackage ? PrometheusDatasourcePackage : PrometheusDatasource;
+const PromQueryEditorByAppUsed = usePackage ? PromQueryEditorByAppPackage : PromQueryEditorByApp;
+const ConfigEditorUsed = usePackage ? ConfigEditorPackage : ConfigEditor;
+const PromCheatSheetUsed = usePackage ? PromCheatSheetPackage : PromCheatSheet;
+
+// @ts-ignore These type errors will be removed when we fully migrate to the @grafana/prometheus package
+export const plugin = new DataSourcePlugin(PrometheusDataSourceUsed)
+  // @ts-ignore These type errors will be removed when we fully migrate to the @grafana/prometheus package
+  .setQueryEditor(PromQueryEditorByAppUsed)
+  .setConfigEditor(ConfigEditorUsed)
+  .setQueryEditorHelp(PromCheatSheetUsed);
diff --git a/public/app/plugins/datasource/prometheus/query_hints.test.ts b/public/app/plugins/datasource/prometheus/query_hints.test.ts
index 9f48bb3fa1b86..7089ea3e2e146 100644
--- a/public/app/plugins/datasource/prometheus/query_hints.test.ts
+++ b/public/app/plugins/datasource/prometheus/query_hints.test.ts
@@ -171,4 +171,22 @@ describe('getQueryHints()', () => {
       },
     });
   });
+
+  it('should not return rate hint for a recorded query', () => {
+    const seriesCount = SUM_HINT_THRESHOLD_COUNT;
+    const series = Array.from({ length: seriesCount }, (_) => ({
+      datapoints: [
+        [0, 0],
+        [0, 0],
+      ],
+    }));
+    let hints = getQueryHints('node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate', series);
+    expect(hints!.length).toBe(0);
+
+    hints = getQueryHints('node_namespace_pod_container:container_cpu_usage_seconds_total', series);
+    expect(hints!.length).toBe(0);
+
+    hints = getQueryHints('container_cpu_usage_seconds_total:irate_total', series);
+    expect(hints!.length).toBe(0);
+  });
 });
diff --git a/public/app/plugins/datasource/prometheus/query_hints.ts b/public/app/plugins/datasource/prometheus/query_hints.ts
index 82498f7f4c7d6..05558235d875e 100644
--- a/public/app/plugins/datasource/prometheus/query_hints.ts
+++ b/public/app/plugins/datasource/prometheus/query_hints.ts
@@ -32,7 +32,7 @@ export function getQueryHints(query: string, series?: any[], datasource?: Promet
   // Check for need of rate()
   if (query.indexOf('rate(') === -1 && query.indexOf('increase(') === -1) {
     // Use metric metadata for exact types
-    const nameMatch = query.match(/\b(\w+_(total|sum|count))\b/);
+    const nameMatch = query.match(/\b((?<!:)\w+_(total|sum|count)(?!:))\b/);
     let counterNameMetric = nameMatch ? nameMatch[1] : '';
     const metricsMetadata = datasource?.languageProvider?.metricsMetadata;
     let certain = false;
@@ -138,13 +138,6 @@ export function getQueryHints(query: string, series?: any[], datasource?: Promet
 
 export function getInitHints(datasource: PrometheusDatasource): QueryHint[] {
   const hints = [];
-  // Hint if using Loki as Prometheus data source
-  if (datasource.directUrl.includes('/loki') && !datasource.languageProvider.metrics.length) {
-    hints.push({
-      label: `Using Loki as a Prometheus data source is no longer supported. You must use the Loki data source for your Loki instance.`,
-      type: 'INFO',
-    });
-  }
 
   // Hint for big disabled lookups
   if (datasource.lookupsDisabled) {
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/aggregations.ts b/public/app/plugins/datasource/prometheus/querybuilder/aggregations.ts
index ea3e2c4f83740..4759e82e6c176 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/aggregations.ts
+++ b/public/app/plugins/datasource/prometheus/querybuilder/aggregations.ts
@@ -1,10 +1,10 @@
-import { addOperationWithRangeVector } from './operations';
 import {
   createAggregationOperation,
   createAggregationOperationWithParam,
-  getPromAndLokiOperationDisplayName,
+  getPromOperationDisplayName,
   getRangeVectorParamDef,
-} from './shared/operationUtils';
+} from './operationUtils';
+import { addOperationWithRangeVector } from './operations';
 import { QueryBuilderOperation, QueryBuilderOperationDef } from './shared/types';
 import { PromVisualQueryOperationCategory, PromOperationId } from './types';
 
@@ -42,7 +42,7 @@ export function getAggregationOperations(): QueryBuilderOperationDef[] {
 function createAggregationOverTime(name: string): QueryBuilderOperationDef {
   return {
     id: name,
-    name: getPromAndLokiOperationDisplayName(name),
+    name: getPromOperationDisplayName(name),
     params: [getRangeVectorParamDef()],
     defaultParams: ['$__interval'],
     alternativesKey: 'overtime function',
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/binaryScalarOperations.ts b/public/app/plugins/datasource/prometheus/querybuilder/binaryScalarOperations.ts
index 9c175126e10cb..e596fd2033d87 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/binaryScalarOperations.ts
+++ b/public/app/plugins/datasource/prometheus/querybuilder/binaryScalarOperations.ts
@@ -1,4 +1,4 @@
-import { defaultAddOperationHandler } from './shared/operationUtils';
+import { defaultAddOperationHandler } from './operationUtils';
 import { QueryBuilderOperation, QueryBuilderOperationDef, QueryBuilderOperationParamDef } from './shared/types';
 import { PromOperationId, PromVisualQueryOperationCategory } from './types';
 
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/LabelFilterItem.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/LabelFilterItem.tsx
index 8492059b5331c..1a4bf53bc1c20 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/LabelFilterItem.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/LabelFilterItem.tsx
@@ -52,9 +52,17 @@ export function LabelFilterItem({
 
   const getSelectOptionsFromString = (item?: string): string[] => {
     if (item) {
+      const regExp = /\(([^)]+)\)/;
+      const matches = item?.match(regExp);
+
+      if (matches && matches[0].indexOf('|') > 0) {
+        return [item];
+      }
+
       if (item.indexOf('|') > 0) {
         return item.split('|');
       }
+
       return [item];
     }
     return [];
@@ -65,13 +73,15 @@ export function LabelFilterItem({
     debounceDuration
   );
 
+  const itemValue = item?.value ?? '';
+
   return (
-    <div data-testid="prometheus-dimensions-filter-item">
+    <div key={itemValue} data-testid="prometheus-dimensions-filter-item">
       <InputGroup>
         {/* Label name select, loads all values at once */}
         <Select
           placeholder="Select label"
-          aria-label={selectors.components.QueryBuilder.labelSelect}
+          data-testid={selectors.components.QueryBuilder.labelSelect}
           inputId="prometheus-dimensions-filter-item-key"
           width="auto"
           value={item.label ? toOption(item.label) : null}
@@ -103,7 +113,7 @@ export function LabelFilterItem({
 
         {/* Operator select i.e.   = =~ != !~   */}
         <Select
-          aria-label={selectors.components.QueryBuilder.matchOperatorSelect}
+          data-testid={selectors.components.QueryBuilder.matchOperatorSelect}
           className="query-segment-operator"
           value={toOption(item.op ?? defaultOp)}
           options={operators}
@@ -123,13 +133,13 @@ export function LabelFilterItem({
         {/* Label value async select: autocomplete calls prometheus API */}
         <AsyncSelect
           placeholder="Select value"
-          aria-label={selectors.components.QueryBuilder.valueSelect}
+          data-testid={selectors.components.QueryBuilder.valueSelect}
           inputId="prometheus-dimensions-filter-item-value"
           width="auto"
           value={
             isMultiSelect()
-              ? getSelectOptionsFromString(item?.value).map(toOption)
-              : getSelectOptionsFromString(item?.value).map(toOption)[0]
+              ? getSelectOptionsFromString(itemValue).map(toOption)
+              : getSelectOptionsFromString(itemValue).map(toOption)[0]
           }
           allowCustomValue
           onOpenMenu={async () => {
@@ -171,7 +181,7 @@ export function LabelFilterItem({
           }}
           invalid={invalidValue}
         />
-        <AccessoryButton aria-label="remove" icon="times" variant="secondary" onClick={onDelete} />
+        <AccessoryButton aria-label={`remove-${item.label}`} icon="times" variant="secondary" onClick={onDelete} />
       </InputGroup>
     </div>
   );
@@ -180,8 +190,6 @@ export function LabelFilterItem({
 const operators = [
   { label: '=', value: '=', isMultiValue: false },
   { label: '!=', value: '!=', isMultiValue: false },
-  { label: '<', value: '<', isMultiValue: false },
-  { label: '>', value: '>', isMultiValue: false },
   { label: '=~', value: '=~', isMultiValue: true },
   { label: '!~', value: '!~', isMultiValue: true },
 ];
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/LabelFilters.test.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/LabelFilters.test.tsx
index 4248b73ed468b..71063d6f75d4e 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/LabelFilters.test.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/LabelFilters.test.tsx
@@ -66,10 +66,26 @@ describe('LabelFilters', () => {
 
   it('removes label', async () => {
     const { onChange } = setup({ labelsFilters: [{ label: 'foo', op: '=', value: 'bar' }] });
-    await userEvent.click(screen.getByLabelText(/remove/));
+    await userEvent.click(screen.getByLabelText(/remove-foo/));
     expect(onChange).toBeCalledWith([]);
   });
 
+  it('removes label but preserves a label with a value of empty string', async () => {
+    const { onChange } = setup({
+      labelsFilters: [
+        { label: 'lab', op: '=', value: 'bel' },
+        { label: 'foo', op: '=', value: 'bar' },
+        { label: 'le', op: '=', value: '' },
+      ],
+    });
+    await userEvent.click(screen.getByLabelText(/remove-foo/));
+    expect(onChange).toBeCalledWith([
+      { label: 'lab', op: '=', value: 'bel' },
+      { label: 'le', op: '=', value: '' },
+    ]);
+    expect(screen.queryByText('bar')).toBeNull();
+  });
+
   it('renders empty input when labels are deleted from outside ', async () => {
     const { rerender } = setup({ labelsFilters: [{ label: 'foo', op: '=', value: 'bar' }] });
     expect(screen.getByText(/foo/)).toBeInTheDocument();
@@ -90,6 +106,18 @@ describe('LabelFilters', () => {
     expect(getAddButton()).toBeInTheDocument();
   });
 
+  it('does split regex in the middle of a label value when the value contains the char |', () => {
+    setup({ labelsFilters: [{ label: 'foo', op: '=~', value: 'boop|par' }] });
+
+    expect(screen.getByText('boop')).toBeInTheDocument();
+    expect(screen.getByText('par')).toBeInTheDocument();
+  });
+  it('does not split regex in between parentheses inside of a label value that contains the char |', () => {
+    setup({ labelsFilters: [{ label: 'foo', op: '=~', value: '(b|p)ar' }] });
+
+    expect(screen.getByText('(b|p)ar')).toBeInTheDocument();
+  });
+
   it('shows error when filter with empty strings  and label filter is required', async () => {
     setup({ labelsFilters: [{ label: '', op: '=', value: '' }], labelFilterRequired: true });
     expect(screen.getByText(MISSING_LABEL_FILTER_ERROR_MESSAGE)).toBeInTheDocument();
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/LabelParamEditor.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/LabelParamEditor.tsx
index 5256fcd4e07a7..6cf4e9a9b74ca 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/LabelParamEditor.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/LabelParamEditor.tsx
@@ -4,7 +4,7 @@ import { DataSourceApi, SelectableValue, toOption } from '@grafana/data';
 import { Select } from '@grafana/ui';
 
 import { promQueryModeller } from '../PromQueryModeller';
-import { getOperationParamId } from '../shared/operationUtils';
+import { getOperationParamId } from '../operationUtils';
 import { QueryBuilderLabelFilter, QueryBuilderOperationParamEditorProps } from '../shared/types';
 import { PromVisualQuery } from '../types';
 
@@ -51,7 +51,7 @@ async function loadGroupByLabels(query: PromVisualQuery, datasource: DataSourceA
   }
 
   const expr = promQueryModeller.renderLabels(labels);
-  const result = await datasource.languageProvider.fetchSeriesLabels(expr);
+  const result = await datasource.languageProvider.fetchLabelsWithMatch(expr);
 
   return Object.keys(result).map((x) => ({
     label: x,
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.test.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.test.tsx
index 1d9a62cc7f675..811d3da8aa400 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.test.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.test.tsx
@@ -17,7 +17,6 @@ import {
 const instanceSettings = {
   url: 'proxied',
   id: 1,
-  directUrl: 'direct',
   user: 'test',
   password: 'mupp',
   jsonData: { httpMethod: 'GET' },
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.tsx
index e97de0c32676e..76ace10896684 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/MetricSelect.tsx
@@ -4,6 +4,7 @@ import React, { RefCallback, useCallback, useState } from 'react';
 import Highlighter from 'react-highlight-words';
 
 import { GrafanaTheme2, SelectableValue, toOption } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import { EditorField, EditorFieldGroup } from '@grafana/experimental';
 import { config } from '@grafana/runtime';
 import {
@@ -22,7 +23,7 @@ import { SelectMenuOptions } from '@grafana/ui/src/components/Select/SelectMenu'
 
 import { PrometheusDatasource } from '../../datasource';
 import { truncateResult } from '../../language_utils';
-import { regexifyLabelValuesQueryString } from '../shared/parsingUtils';
+import { regexifyLabelValuesQueryString } from '../parsingUtils';
 import { QueryBuilderLabelFilter } from '../shared/types';
 import { PromVisualQuery } from '../types';
 
@@ -188,6 +189,7 @@ export function MetricSelect({
           {...props.innerProps}
           ref={props.innerRef}
           className={`${styles.customOptionWidth} metric-encyclopedia-open`}
+          aria-label="Select option"
           onKeyDown={(e) => {
             // if there is no metric and the m.e. is enabled, open the modal
             if (e.code === 'Enter') {
@@ -259,6 +261,7 @@ export function MetricSelect({
   const asyncSelect = () => {
     return (
       <AsyncSelect
+        data-testid={selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect}
         isClearable={variableEditor ? true : false}
         inputId="prometheus-metric-select"
         className={styles.select}
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/MetricsLabelsSection.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/MetricsLabelsSection.tsx
index f6b4f26f47ec5..b27af15c16830 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/MetricsLabelsSection.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/MetricsLabelsSection.tsx
@@ -6,7 +6,7 @@ import { PrometheusDatasource } from '../../datasource';
 import { getMetadataString } from '../../language_provider';
 import { truncateResult } from '../../language_utils';
 import { promQueryModeller } from '../PromQueryModeller';
-import { regexifyLabelValuesQueryString } from '../shared/parsingUtils';
+import { regexifyLabelValuesQueryString } from '../parsingUtils';
 import { QueryBuilderLabelFilter } from '../shared/types';
 import { PromVisualQuery } from '../types';
 
@@ -68,12 +68,7 @@ export function MetricsLabelsSection({
     labelsToConsider.push({ label: '__name__', op: '=', value: query.metric });
     const expr = promQueryModeller.renderLabels(labelsToConsider);
 
-    let labelsIndex: Record<string, string[]>;
-    if (datasource.hasLabelsMatchAPISupport()) {
-      labelsIndex = await datasource.languageProvider.fetchSeriesLabelsMatch(expr);
-    } else {
-      labelsIndex = await datasource.languageProvider.fetchSeriesLabels(expr);
-    }
+    let labelsIndex: Record<string, string[]> = await datasource.languageProvider.fetchLabelsWithMatch(expr);
 
     // filter out already used labels
     return Object.keys(labelsIndex)
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/NestedQueryList.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/NestedQueryList.tsx
index 297a72b850193..0dfb5ed75c43f 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/NestedQueryList.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/NestedQueryList.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { Stack } from '@grafana/experimental';
+import { Stack } from '@grafana/ui';
 
 import { PrometheusDatasource } from '../../datasource';
 import { PromVisualQuery, PromVisualQueryBinary } from '../types';
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.test.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.test.tsx
index 3e3b148cd3251..54f44c46f1369 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.test.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.test.tsx
@@ -11,6 +11,7 @@ import {
   QueryHint,
   TimeRange,
 } from '@grafana/data';
+import { config, TemplateSrv } from '@grafana/runtime';
 
 import { PrometheusDatasource } from '../../datasource';
 import PromQlLanguageProvider from '../../language_provider';
@@ -58,6 +59,10 @@ const bugQuery: PromVisualQuery = {
   ],
 };
 
+afterEach(() => {
+  jest.restoreAllMocks();
+});
+
 describe('PromQueryBuilder', () => {
   it('shows empty just with metric selected', async () => {
     setup();
@@ -103,11 +108,33 @@ describe('PromQueryBuilder', () => {
     await waitFor(() => expect(datasource.getVariables).toBeCalled());
   });
 
+  it('checks if the LLM plugin is enabled when the `prometheusPromQAIL` feature is enabled', async () => {
+    jest.replaceProperty(config, 'featureToggles', {
+      prometheusPromQAIL: true,
+    });
+    const mockIsLLMPluginEnabled = jest.fn();
+    mockIsLLMPluginEnabled.mockResolvedValue(true);
+    jest.spyOn(require('./promQail/state/helpers'), 'isLLMPluginEnabled').mockImplementation(mockIsLLMPluginEnabled);
+    setup();
+    await waitFor(() => expect(mockIsLLMPluginEnabled).toHaveBeenCalledTimes(1));
+  });
+
+  it('does not check if the LLM plugin is enabled when the `prometheusPromQAIL` feature is disabled', async () => {
+    jest.replaceProperty(config, 'featureToggles', {
+      prometheusPromQAIL: false,
+    });
+    const mockIsLLMPluginEnabled = jest.fn();
+    mockIsLLMPluginEnabled.mockResolvedValue(true);
+    jest.spyOn(require('./promQail/state/helpers'), 'isLLMPluginEnabled').mockImplementation(mockIsLLMPluginEnabled);
+    setup();
+    await waitFor(() => expect(mockIsLLMPluginEnabled).toHaveBeenCalledTimes(0));
+  });
+
   // <LegacyPrometheus>
   it('tries to load labels when metric selected', async () => {
     const { languageProvider } = setup();
     await openLabelNameSelect();
-    await waitFor(() => expect(languageProvider.fetchSeriesLabels).toBeCalledWith('{__name__="random_metric"}'));
+    await waitFor(() => expect(languageProvider.fetchLabelsWithMatch).toBeCalledWith('{__name__="random_metric"}'));
   });
 
   it('tries to load variables in label field', async () => {
@@ -127,7 +154,9 @@ describe('PromQueryBuilder', () => {
     });
     await openLabelNameSelect(1);
     await waitFor(() =>
-      expect(languageProvider.fetchSeriesLabels).toBeCalledWith('{label_name="label_value", __name__="random_metric"}')
+      expect(languageProvider.fetchLabelsWithMatch).toBeCalledWith(
+        '{label_name="label_value", __name__="random_metric"}'
+      )
     );
   });
   //</LegacyPrometheus>
@@ -274,7 +303,7 @@ describe('PromQueryBuilder', () => {
       jsonData: { prometheusVersion: '2.38.1', prometheusType: PromApplication.Prometheus },
     });
     await openLabelNameSelect();
-    await waitFor(() => expect(languageProvider.fetchSeriesLabelsMatch).toBeCalledWith('{__name__="random_metric"}'));
+    await waitFor(() => expect(languageProvider.fetchLabelsWithMatch).toBeCalledWith('{__name__="random_metric"}'));
   });
 
   it('tries to load variables in label field modern prom', async () => {
@@ -300,7 +329,7 @@ describe('PromQueryBuilder', () => {
     );
     await openLabelNameSelect(1);
     await waitFor(() =>
-      expect(languageProvider.fetchSeriesLabelsMatch).toBeCalledWith(
+      expect(languageProvider.fetchLabelsWithMatch).toBeCalledWith(
         '{label_name="label_value", __name__="random_metric"}'
       )
     );
@@ -317,8 +346,7 @@ function createDatasource(options?: Partial<DataSourceInstanceSettings<PromOptio
       meta: {} as DataSourcePluginMeta,
       ...options,
     } as DataSourceInstanceSettings<PromOptions>,
-    undefined,
-    undefined,
+    mockTemplateSrv(),
     languageProvider
   );
   return { datasource, languageProvider };
@@ -356,3 +384,9 @@ async function openLabelNameSelect(index = 0) {
   const { name } = getLabelSelects(index);
   await userEvent.click(name);
 }
+
+function mockTemplateSrv(): TemplateSrv {
+  return {
+    getVariables: () => [],
+  } as unknown as TemplateSrv;
+}
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.tsx
index fbb17cd8d9f6e..cb67f375e7755 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.tsx
@@ -1,10 +1,11 @@
 import { css } from '@emotion/css';
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 
 import { DataSourceApi, PanelData } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import { EditorRow } from '@grafana/experimental';
 import { config } from '@grafana/runtime';
-import { Button, Drawer } from '@grafana/ui';
+import { Drawer } from '@grafana/ui';
 
 import { PrometheusDatasource } from '../../datasource';
 import promqlGrammar from '../../promql';
@@ -23,7 +24,8 @@ import { MetricsLabelsSection } from './MetricsLabelsSection';
 import { NestedQueryList } from './NestedQueryList';
 import { EXPLAIN_LABEL_FILTER_CONTENT } from './PromQueryBuilderExplained';
 import { PromQail } from './promQail/PromQail';
-import AI_Logo_color from './promQail/resources/AI_Logo_color.svg';
+import { QueryAssistantButton } from './promQail/QueryAssistantButton';
+import { isLLMPluginEnabled } from './promQail/state/helpers';
 
 export interface Props {
   query: PromVisualQuery;
@@ -34,23 +36,32 @@ export interface Props {
   showExplain: boolean;
 }
 
-// initial commit for hackathon-2023-08-promqail
-// AI/ML + Prometheus
-const prometheusPromQAIL = config.featureToggles.prometheusPromQAIL;
-
 export const PromQueryBuilder = React.memo<Props>((props) => {
   const { datasource, query, onChange, onRunQuery, data, showExplain } = props;
   const [highlightedOp, setHighlightedOp] = useState<QueryBuilderOperation | undefined>();
   const [showDrawer, setShowDrawer] = useState<boolean>(false);
+  const [llmAppEnabled, updateLlmAppEnabled] = useState<boolean>(false);
+  const { prometheusPromQAIL } = config.featureToggles; // AI/ML + Prometheus
 
   const lang = { grammar: promqlGrammar, name: 'promql' };
 
   const initHints = datasource.getInitHints();
 
+  useEffect(() => {
+    async function checkLlms() {
+      const check = await isLLMPluginEnabled();
+      updateLlmAppEnabled(check);
+    }
+
+    if (prometheusPromQAIL) {
+      checkLlms();
+    }
+  }, [prometheusPromQAIL]);
+
   return (
     <>
       {prometheusPromQAIL && showDrawer && (
-        <Drawer scrollableContent={true} closeOnMaskClick={false} onClose={() => setShowDrawer(false)}>
+        <Drawer closeOnMaskClick={false} onClose={() => setShowDrawer(false)}>
           <PromQail
             query={query}
             closeDrawer={() => setShowDrawer(false)}
@@ -98,27 +109,19 @@ export const PromQueryBuilder = React.memo<Props>((props) => {
               padding: '0 0 0 6px',
             })}
           >
-            <Button
-              variant={'secondary'}
-              onClick={() => {
-                setShowDrawer(true);
-              }}
-              title={'Get query suggestions.'}
-              disabled={!query.metric}
-            >
-              <img height={16} src={AI_Logo_color} alt="AI logo black and white" />
-              {'\u00A0'}Get query suggestions
-            </Button>
+            <QueryAssistantButton llmAppEnabled={llmAppEnabled} metric={query.metric} setShowDrawer={setShowDrawer} />
           </div>
         )}
-        <QueryBuilderHints<PromVisualQuery>
-          datasource={datasource}
-          query={query}
-          onChange={onChange}
-          data={data}
-          queryModeller={promQueryModeller}
-          buildVisualQueryFromString={buildVisualQueryFromString}
-        />
+        <div data-testid={selectors.components.DataSource.Prometheus.queryEditor.builder.hints}>
+          <QueryBuilderHints<PromVisualQuery>
+            datasource={datasource}
+            query={query}
+            onChange={onChange}
+            data={data}
+            queryModeller={promQueryModeller}
+            buildVisualQueryFromString={buildVisualQueryFromString}
+          />
+        </div>
       </OperationsEditorRow>
       {showExplain && (
         <OperationListExplained<PromVisualQuery>
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderContainer.test.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderContainer.test.tsx
index 3816fb9a3ec9f..5172172fd32a3 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderContainer.test.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderContainer.test.tsx
@@ -8,8 +8,8 @@ import { PrometheusDatasource } from '../../datasource';
 import PromQlLanguageProvider from '../../language_provider';
 import { EmptyLanguageProviderMock } from '../../language_provider.mock';
 import { PromQuery } from '../../types';
-import { addOperation } from '../shared/OperationList.testUtils';
-import { getOperationParamId } from '../shared/operationUtils';
+import { getOperationParamId } from '../operationUtils';
+import { addOperationInQueryBuilder } from '../testUtils';
 
 import { PromQueryBuilderContainer } from './PromQueryBuilderContainer';
 
@@ -18,7 +18,7 @@ describe('PromQueryBuilderContainer', () => {
     const { props } = setup({ expr: 'rate(metric_test{job="testjob"}[$__rate_interval])' });
 
     expect(screen.getByText('metric_test')).toBeInTheDocument();
-    await addOperation('Range functions', 'Rate');
+    await addOperationInQueryBuilder('Range functions', 'Rate');
     expect(props.onChange).toBeCalledWith({
       expr: 'rate(metric_test{job="testjob"}[$__rate_interval])',
       refId: 'A',
@@ -44,7 +44,6 @@ function setup(queryOverrides: Partial<PromQuery> = {}) {
       meta: {} as DataSourcePluginMeta,
     } as DataSourceInstanceSettings,
     undefined,
-    undefined,
     languageProvider
   );
 
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderContainer.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderContainer.tsx
index 70786203eadc2..fe641f9655034 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderContainer.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderContainer.tsx
@@ -51,6 +51,10 @@ export function PromQueryBuilderContainer(props: Props) {
     }
   }, [query]);
 
+  useEffect(() => {
+    datasource.languageProvider.start(data?.timeRange);
+  }, [data?.timeRange, datasource.languageProvider]);
+
   const onVisQueryChange = (visQuery: PromVisualQuery) => {
     const expr = promQueryModeller.renderQuery(visQuery);
     dispatch(visualQueryChange({ visQuery, expr }));
@@ -77,7 +81,7 @@ export function PromQueryBuilderContainer(props: Props) {
         data={data}
         showExplain={showExplain}
       />
-      {<QueryPreview query={query.expr} />}
+      <QueryPreview query={query.expr} />
     </>
   );
 }
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderExplained.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderExplained.tsx
index 038e4e8cbd347..c15fbc0350527 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderExplained.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderExplained.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { Stack } from '@grafana/experimental';
+import { Stack } from '@grafana/ui';
 
 import promqlGrammar from '../../promql';
 import { promQueryModeller } from '../PromQueryModeller';
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderOptions.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderOptions.tsx
index 4ac51127e9747..aa0f055f2a0dd 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderOptions.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderOptions.tsx
@@ -1,11 +1,12 @@
 import React, { SyntheticEvent } from 'react';
 
 import { CoreApp, SelectableValue } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import { EditorField, EditorRow, EditorSwitch } from '@grafana/experimental';
 import { AutoSizeInput, RadioButtonGroup, Select } from '@grafana/ui';
 
 import { getQueryTypeChangeHandler, getQueryTypeOptions } from '../../components/PromExploreExtraField';
-import { PromQueryFormat } from '../../dataquery.gen';
+import { PromQueryFormat } from '../../dataquery';
 import { PromQuery } from '../../types';
 import { QueryOptionGroup } from '../shared/QueryOptionGroup';
 
@@ -35,7 +36,7 @@ export const PromQueryBuilderOptions = React.memo<Props>(({ query, app, onChange
   };
 
   const onChangeStep = (evt: React.FormEvent<HTMLInputElement>) => {
-    onChange({ ...query, interval: evt.currentTarget.value });
+    onChange({ ...query, interval: evt.currentTarget.value.trim() });
     onRunQuery();
   };
 
@@ -61,56 +62,69 @@ export const PromQueryBuilderOptions = React.memo<Props>(({ query, app, onChange
 
   return (
     <EditorRow>
-      <QueryOptionGroup
-        title="Options"
-        collapsedInfo={getCollapsedInfo(query, formatOption.label!, queryTypeLabel, app)}
-      >
-        <PromQueryLegendEditor
-          legendFormat={query.legendFormat}
-          onChange={(legendFormat) => onChange({ ...query, legendFormat })}
-          onRunQuery={onRunQuery}
-        />
-        <EditorField
-          label="Min step"
-          tooltip={
-            <>
-              An additional lower limit for the step parameter of the Prometheus query and for the{' '}
-              <code>$__interval</code> and <code>$__rate_interval</code> variables.
-            </>
-          }
+      <div data-testid={selectors.components.DataSource.Prometheus.queryEditor.options}>
+        <QueryOptionGroup
+          title="Options"
+          collapsedInfo={getCollapsedInfo(query, formatOption.label!, queryTypeLabel, app)}
         >
-          <AutoSizeInput
-            type="text"
-            aria-label="Set lower limit for the step parameter"
-            placeholder={'auto'}
-            minWidth={10}
-            onCommitChange={onChangeStep}
-            defaultValue={query.interval}
+          <PromQueryLegendEditor
+            legendFormat={query.legendFormat}
+            onChange={(legendFormat) => onChange({ ...query, legendFormat })}
+            onRunQuery={onRunQuery}
           />
-        </EditorField>
-        <EditorField label="Format">
-          <Select value={formatOption} allowCustomValue onChange={onChangeFormat} options={FORMAT_OPTIONS} />
-        </EditorField>
-        <EditorField label="Type">
-          <RadioButtonGroup options={queryTypeOptions} value={queryTypeValue} onChange={onQueryTypeChange} />
-        </EditorField>
-        {shouldShowExemplarSwitch(query, app) && (
-          <EditorField label="Exemplars">
-            <EditorSwitch value={query.exemplar || false} onChange={onExemplarChange} />
+          <EditorField
+            label="Min step"
+            tooltip={
+              <>
+                An additional lower limit for the step parameter of the Prometheus query and for the{' '}
+                <code>$__interval</code> and <code>$__rate_interval</code> variables.
+              </>
+            }
+          >
+            <AutoSizeInput
+              id={selectors.components.DataSource.Prometheus.queryEditor.step}
+              type="text"
+              aria-label="Set lower limit for the step parameter"
+              placeholder={'auto'}
+              minWidth={10}
+              onCommitChange={onChangeStep}
+              defaultValue={query.interval}
+            />
           </EditorField>
-        )}
-        {query.intervalFactor && query.intervalFactor > 1 && (
-          <EditorField label="Resolution">
+          <EditorField label="Format">
             <Select
-              aria-label="Select resolution"
-              isSearchable={false}
-              options={INTERVAL_FACTOR_OPTIONS}
-              onChange={onIntervalFactorChange}
-              value={INTERVAL_FACTOR_OPTIONS.find((option) => option.value === query.intervalFactor)}
+              data-testid={selectors.components.DataSource.Prometheus.queryEditor.format}
+              value={formatOption}
+              allowCustomValue
+              onChange={onChangeFormat}
+              options={FORMAT_OPTIONS}
             />
           </EditorField>
-        )}
-      </QueryOptionGroup>
+          <EditorField label="Type" data-testid={selectors.components.DataSource.Prometheus.queryEditor.type}>
+            <RadioButtonGroup options={queryTypeOptions} value={queryTypeValue} onChange={onQueryTypeChange} />
+          </EditorField>
+          {shouldShowExemplarSwitch(query, app) && (
+            <EditorField label="Exemplars">
+              <EditorSwitch
+                value={query.exemplar || false}
+                onChange={onExemplarChange}
+                id={selectors.components.DataSource.Prometheus.queryEditor.exemplars}
+              />
+            </EditorField>
+          )}
+          {query.intervalFactor && query.intervalFactor > 1 && (
+            <EditorField label="Resolution">
+              <Select
+                aria-label="Select resolution"
+                isSearchable={false}
+                options={INTERVAL_FACTOR_OPTIONS}
+                onChange={onIntervalFactorChange}
+                value={INTERVAL_FACTOR_OPTIONS.find((option) => option.value === query.intervalFactor)}
+              />
+            </EditorField>
+          )}
+        </QueryOptionGroup>
+      </div>
     </EditorRow>
   );
 });
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryCodeEditor.test.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryCodeEditor.test.tsx
index 90122c862c7e8..5554f33997dc5 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryCodeEditor.test.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryCodeEditor.test.tsx
@@ -24,7 +24,6 @@ function createDatasource() {
       meta: {} as DataSourcePluginMeta,
     } as DataSourceInstanceSettings,
     undefined,
-    undefined,
     languageProvider
   );
   return { datasource, languageProvider };
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryCodeEditor.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryCodeEditor.tsx
index f9bfe24bf7d0b..8f7987f8d9d76 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryCodeEditor.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryCodeEditor.tsx
@@ -2,6 +2,7 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import { useStyles2 } from '@grafana/ui';
 
 import PromQueryField from '../../components/PromQueryField';
@@ -18,7 +19,10 @@ export function PromQueryCodeEditor(props: Props) {
   const styles = useStyles2(getStyles);
 
   return (
-    <div className={styles.wrapper}>
+    <div
+      data-testid={selectors.components.DataSource.Prometheus.queryEditor.code.queryField}
+      className={styles.wrapper}
+    >
       <PromQueryField
         datasource={datasource}
         query={query}
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryEditorSelector.test.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryEditorSelector.test.tsx
index 87beb07e386fb..8b439224410f3 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryEditorSelector.test.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryEditorSelector.test.tsx
@@ -84,7 +84,6 @@ const getDefaultDatasource = (jsonDataOverrides = {}) =>
       readOnly: false,
     },
     undefined,
-    undefined,
     new EmptyLanguageProviderMock() as unknown as PromQlLanguageProvider
   );
 
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryEditorSelector.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryEditorSelector.tsx
index d222406603d16..f85090e0cadec 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryEditorSelector.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryEditorSelector.tsx
@@ -3,18 +3,18 @@ import React, { SyntheticEvent, useCallback, useEffect, useState } from 'react';
 
 import { CoreApp, LoadingState, SelectableValue } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { EditorHeader, EditorRows, FlexItem, Space } from '@grafana/experimental';
+import { EditorHeader, EditorRows, FlexItem } from '@grafana/experimental';
 import { reportInteraction } from '@grafana/runtime';
-import { Button, ConfirmModal } from '@grafana/ui';
+import { Button, ConfirmModal, Space } from '@grafana/ui';
 
 import { PromQueryEditorProps } from '../../components/types';
-import { PromQueryFormat } from '../../dataquery.gen';
+import { PromQueryFormat } from '../../dataquery';
 import { PromQuery } from '../../types';
 import { QueryPatternsModal } from '../QueryPatternsModal';
+import { promQueryEditorExplainKey, useFlag } from '../hooks/useFlag';
 import { buildVisualQueryFromString } from '../parsing';
 import { QueryEditorModeToggle } from '../shared/QueryEditorModeToggle';
 import { QueryHeaderSwitch } from '../shared/QueryHeaderSwitch';
-import { promQueryEditorExplainKey, useFlag } from '../shared/hooks/useFlag';
 import { QueryEditorMode } from '../shared/types';
 import { changeEditorMode, getQueryWithDefaults } from '../state';
 
@@ -116,14 +116,16 @@ export const PromQueryEditorSelector = React.memo<Props>((props) => {
       />
       <EditorHeader>
         <Button
-          aria-label={selectors.components.QueryBuilder.queryPatterns}
+          data-testid={selectors.components.QueryBuilder.queryPatterns}
           variant="secondary"
           size="sm"
           onClick={() => setQueryPatternsModalOpen((prevValue) => !prevValue)}
         >
           Kick start your query
         </Button>
-        <QueryHeaderSwitch label="Explain" value={explain} onChange={onShowExplainChange} />
+        <div data-testid={selectors.components.DataSource.Prometheus.queryEditor.explain}>
+          <QueryHeaderSwitch label="Explain" value={explain} onChange={onShowExplainChange} />
+        </div>
         <FlexItem grow={1} />
         {app !== CoreApp.Explore && app !== CoreApp.Correlations && (
           <Button
@@ -136,7 +138,9 @@ export const PromQueryEditorSelector = React.memo<Props>((props) => {
             Run queries
           </Button>
         )}
-        <QueryEditorModeToggle mode={editorMode} onChange={onEditorModeChange} />
+        <div data-testid={selectors.components.DataSource.Prometheus.queryEditor.editorToggle}>
+          <QueryEditorModeToggle mode={editorMode} onChange={onEditorModeChange} />
+        </div>
       </EditorHeader>
       <Space v={0.5} />
       <EditorRows>
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryLegendEditor.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryLegendEditor.tsx
index bb1503b0d9d0a..971eac3d52c4a 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryLegendEditor.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryLegendEditor.tsx
@@ -1,6 +1,7 @@
 import React, { useRef } from 'react';
 
 import { SelectableValue } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import { EditorField } from '@grafana/experimental';
 import { Select, AutoSizeInput } from '@grafana/ui';
 
@@ -64,6 +65,7 @@ export const PromQueryLegendEditor = React.memo<Props>(({ legendFormat, onChange
     <EditorField
       label="Legend"
       tooltip="Series name override or template. Ex. {{hostname}} will be replaced with label value for hostname."
+      data-testid={selectors.components.DataSource.Prometheus.queryEditor.legend}
     >
       <>
         {mode === LegendFormatMode.Custom && (
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/FeedbackLink.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/FeedbackLink.tsx
index 88c95c274fc17..4ba1d881147b5 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/FeedbackLink.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/FeedbackLink.tsx
@@ -2,8 +2,7 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Icon, useStyles2 } from '@grafana/ui';
+import { Icon, useStyles2, Stack } from '@grafana/ui';
 
 export interface Props {
   feedbackUrl?: string;
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/MetricsModal.test.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/MetricsModal.test.tsx
index cc0c82f3e8cac..590b41a205145 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/MetricsModal.test.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/MetricsModal.test.tsx
@@ -233,7 +233,6 @@ function createDatasource(withLabels?: boolean) {
       meta: {} as DataSourcePluginMeta,
     } as DataSourceInstanceSettings<PromOptions>,
     undefined,
-    undefined,
     languageProvider
   );
   return datasource;
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/MetricsModal.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/MetricsModal.tsx
index dd10667c0dce2..c44d2cc06c00f 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/MetricsModal.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/MetricsModal.tsx
@@ -3,6 +3,7 @@ import debounce from 'debounce-promise';
 import React, { useCallback, useEffect, useMemo, useReducer } from 'react';
 
 import { SelectableValue } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import {
   Input,
   Modal,
@@ -204,7 +205,10 @@ export const MetricsModal = (props: MetricsModalProps) => {
       className={styles.modal}
     >
       <FeedbackLink feedbackUrl="https://forms.gle/DEMAJHoAMpe3e54CA" />
-      <div className={styles.inputWrapper}>
+      <div
+        className={styles.inputWrapper}
+        data-testid={selectors.components.DataSource.Prometheus.queryEditor.builder.metricsExplorer}
+      >
         <div className={cx(styles.inputItem, styles.inputItemFirst)}>
           <Input
             autoFocus={true}
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/state/helpers.ts b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/state/helpers.ts
index d5da08e3b1cfc..ce35ab9d62f99 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/state/helpers.ts
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/state/helpers.ts
@@ -4,7 +4,7 @@ import { reportInteraction } from '@grafana/runtime';
 import { PrometheusDatasource } from 'app/plugins/datasource/prometheus/datasource';
 import { getMetadataHelp, getMetadataType } from 'app/plugins/datasource/prometheus/language_provider';
 
-import { regexifyLabelValuesQueryString } from '../../../shared/parsingUtils';
+import { regexifyLabelValuesQueryString } from '../../../parsingUtils';
 import { QueryBuilderLabelFilter } from '../../../shared/types';
 import { PromVisualQuery } from '../../../types';
 import { HaystackDictionary, MetricData, MetricsData, PromFilterOption } from '../types';
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/uFuzzy.ts b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/uFuzzy.ts
index 8804d6d52b3a6..7c7e5eb44ea2b 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/uFuzzy.ts
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/metrics-modal/uFuzzy.ts
@@ -10,7 +10,7 @@ const uf = new uFuzzy({
 });
 
 export function fuzzySearch(haystack: string[], query: string, dispatcher: (data: string[][]) => void) {
-  const [idxs, info, order] = uf.search(haystack, query, false, 1e5);
+  const [idxs, info, order] = uf.search(haystack, query, 0, 1e5);
 
   let haystackOrder: string[] = [];
   let matchesSet: Set<string> = new Set();
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/PromQail.test.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/PromQail.test.tsx
index 47d2c09fe348e..f8d2a6b633e9e 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/PromQail.test.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/PromQail.test.tsx
@@ -38,7 +38,7 @@ describe('PromQail', () => {
   it('shows selected metric and asks for a prompt', async () => {
     setup(defaultQuery);
 
-    clickSecurityButton();
+    await clickSecurityButton();
 
     await waitFor(() => {
       expect(screen.getByText('random_metric')).toBeInTheDocument();
@@ -49,7 +49,7 @@ describe('PromQail', () => {
   it('displays a prompt when the user knows what they want to query', async () => {
     setup(defaultQuery);
 
-    clickSecurityButton();
+    await clickSecurityButton();
 
     await waitFor(() => {
       expect(screen.getByText('random_metric')).toBeInTheDocument();
@@ -58,7 +58,7 @@ describe('PromQail', () => {
 
     const aiPrompt = screen.getByTestId(testIds.clickForAi);
 
-    userEvent.click(aiPrompt);
+    await userEvent.click(aiPrompt);
 
     await waitFor(() => {
       expect(screen.getByText('What kind of data do you want to see with your metric?')).toBeInTheDocument();
@@ -68,7 +68,7 @@ describe('PromQail', () => {
   it('does not display a prompt when choosing historical', async () => {
     setup(defaultQuery);
 
-    clickSecurityButton();
+    await clickSecurityButton();
 
     await waitFor(() => {
       expect(screen.getByText('random_metric')).toBeInTheDocument();
@@ -77,7 +77,7 @@ describe('PromQail', () => {
 
     const historicalPrompt = screen.getByTestId(testIds.clickForHistorical);
 
-    userEvent.click(historicalPrompt);
+    await userEvent.click(historicalPrompt);
 
     await waitFor(() => {
       expect(screen.queryByText('What kind of data do you want to see with your metric?')).toBeNull();
@@ -116,7 +116,6 @@ function createDatasource(withLabels?: boolean) {
       meta: {} as DataSourcePluginMeta,
     } as DataSourceInstanceSettings<PromOptions>,
     undefined,
-    undefined,
     languageProvider
   );
   return datasource;
@@ -142,8 +141,8 @@ function setup(query: PromVisualQuery) {
   return container;
 }
 
-function clickSecurityButton() {
+async function clickSecurityButton() {
   const securityInfoButton = screen.getByTestId(testIds.securityInfoButton);
 
-  userEvent.click(securityInfoButton);
+  await userEvent.click(securityInfoButton);
 }
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/PromQail.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/PromQail.tsx
index cae32b6baf1d2..14209f9cf2578 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/PromQail.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/PromQail.tsx
@@ -2,7 +2,8 @@ import { css, cx } from '@emotion/css';
 import React, { useEffect, useReducer, useRef, useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Button, Checkbox, Input, Spinner, useTheme2 } from '@grafana/ui';
+import { reportInteraction } from '@grafana/runtime';
+import { Alert, Button, Checkbox, Input, Spinner, useTheme2 } from '@grafana/ui';
 import store from 'app/core/store';
 
 import { PrometheusDatasource } from '../../../datasource';
@@ -53,12 +54,7 @@ export const PromQail = (props: PromQailProps) => {
 
   useEffect(() => {
     const fetchLabels = async () => {
-      let labelsIndex: Record<string, string[]>;
-      if (datasource.hasLabelsMatchAPISupport()) {
-        labelsIndex = await datasource.languageProvider.fetchSeriesLabelsMatch(query.metric);
-      } else {
-        labelsIndex = await datasource.languageProvider.fetchSeriesLabels(query.metric);
-      }
+      let labelsIndex: Record<string, string[]> = await datasource.languageProvider.fetchLabelsWithMatch(query.metric);
       setLabelNames(Object.keys(labelsIndex));
     };
     fetchLabels();
@@ -82,24 +78,30 @@ export const PromQail = (props: PromQailProps) => {
         </div>
         {state.showStartingMessage ? (
           <>
-            <div className={styles.textPadding}>
-              This assistant can suggest queries based on your use case and the metric you want to query
-            </div>
-            <div className={styles.textPadding}>
-              The assistant will connect to OpenAI using your API key. The following information will be sent to OpenAI:
-            </div>
             <div className={styles.dataList}>
-              <ul>
-                <li>Metrics</li>
-                <li>Labels</li>
-                <li>Metrics metadata</li>
-              </ul>
-            </div>
-            <div className={styles.textPadding}>Check with OpenAI to understand how your data is being used.</div>
-            <div>
-              AI-suggested queries may not always be the right one for your use case. Always take a moment to understand
-              the queries before using them.
+              <ol>
+                <li className={styles.textPadding}>
+                  Query Advisor suggests queries based on a metric and requests you type in.
+                </li>
+                <li className={styles.textPadding}>
+                  Query Advisor sends Prometheus metrics, labels and metadata to the LLM provider you&#39;ve configured.
+                  Be sure to align its usage with your company&#39;s internal policies.
+                </li>
+                <li className={styles.textPadding}>
+                  An AI-suggested query may not fully answer your question. Always take a moment to understand a query
+                  before you use it.
+                </li>
+              </ol>
             </div>
+            <Alert
+              title={''}
+              severity={'info'}
+              key={'promqail-llm-app'}
+              className={cx(styles.textPadding, styles.noMargin)}
+            >
+              Query Advisor is currently in Private Preview. Feedback is appreciated and can be provided on explanations
+              and suggestions.
+            </Alert>
 
             {/* don't show this message again, store in localstorage */}
             <div className={styles.textPadding}>
@@ -184,7 +186,10 @@ export const PromQail = (props: PromQailProps) => {
                         const isLoading = true;
                         const suggestionType = SuggestionType.Historical;
                         dispatch(addInteraction({ suggestionType, isLoading }));
-                        //CHECK THIS???
+                        reportInteraction('grafana_prometheus_promqail_know_what_you_want_to_query', {
+                          promVisualQuery: query,
+                          doYouKnow: 'no',
+                        });
                         promQailSuggest(dispatch, 0, query, labelNames, datasource);
                       }}
                     >
@@ -195,6 +200,10 @@ export const PromQail = (props: PromQailProps) => {
                       variant="primary"
                       data-testid={testIds.clickForAi}
                       onClick={() => {
+                        reportInteraction('grafana_prometheus_promqail_know_what_you_want_to_query', {
+                          promVisualQuery: query,
+                          doYouKnow: 'yes',
+                        });
                         const isLoading = false;
                         const suggestionType = SuggestionType.AI;
                         dispatch(addInteraction({ suggestionType, isLoading }));
@@ -271,6 +280,10 @@ export const PromQail = (props: PromQailProps) => {
                                       interaction: newInteraction,
                                     };
 
+                                    reportInteraction('grafana_prometheus_promqail_suggest_query_instead', {
+                                      promVisualQuery: query,
+                                    });
+
                                     dispatch(updateInteraction(payload));
                                     promQailSuggest(dispatch, idx, query, labelNames, datasource, newInteraction);
                                   }}
@@ -292,6 +305,11 @@ export const PromQail = (props: PromQailProps) => {
                                       interaction: newInteraction,
                                     };
 
+                                    reportInteraction('grafana_prometheus_promqail_prompt_submitted', {
+                                      promVisualQuery: query,
+                                      prompt: interaction.prompt,
+                                    });
+
                                     dispatch(updateInteraction(payload));
                                     // add the suggestions in the API call
                                     promQailSuggest(dispatch, idx, query, labelNames, datasource, interaction);
@@ -392,7 +410,7 @@ export const getStyles = (theme: GrafanaTheme2) => {
       marginRight: '10px',
     }),
     dataList: css({
-      padding: '0px 28px 28px 28px',
+      padding: '0px 28px 0px 28px',
     }),
     textPadding: css({
       paddingBottom: '12px',
@@ -521,6 +539,21 @@ export const getStyles = (theme: GrafanaTheme2) => {
     submitFeedback: css({
       padding: '16px 0',
     }),
+    noMargin: css({
+      margin: 0,
+    }),
+    enableButtonTooltip: css({
+      padding: 8,
+    }),
+    enableButtonTooltipText: css({
+      color: `${theme.colors.text.secondary}`,
+      ul: {
+        marginLeft: 16,
+      },
+    }),
+    link: css({
+      color: `${theme.colors.text.link} !important`,
+    }),
   };
 };
 
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/QueryAssistantButton.test.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/QueryAssistantButton.test.tsx
new file mode 100644
index 0000000000000..2b64277c22ca1
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/QueryAssistantButton.test.tsx
@@ -0,0 +1,51 @@
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { QueryAssistantButton } from './QueryAssistantButton';
+
+const setShowDrawer = jest.fn(() => {});
+
+describe('QueryAssistantButton', () => {
+  it('renders the button', async () => {
+    const props = createProps(true, 'metric', setShowDrawer);
+    render(<QueryAssistantButton {...props} />);
+    expect(screen.getByText('Get query suggestions')).toBeInTheDocument();
+  });
+
+  it('shows the LLM app disabled message when LLM app is not set up with vector DB', async () => {
+    const props = createProps(false, 'metric', setShowDrawer);
+    render(<QueryAssistantButton {...props} />);
+    const button = screen.getByText('Get query suggestions');
+    await userEvent.hover(button);
+    await waitFor(() => {
+      expect(screen.getByText('Install and enable the LLM plugin')).toBeInTheDocument();
+    });
+  });
+
+  it('shows the message to select a metric when LLM is enabled and no metric is selected', async () => {
+    const props = createProps(true, '', setShowDrawer);
+    render(<QueryAssistantButton {...props} />);
+    const button = screen.getByText('Get query suggestions');
+    await userEvent.hover(button);
+    await waitFor(() => {
+      expect(screen.getByText('First, select a metric.')).toBeInTheDocument();
+    });
+  });
+
+  it('calls setShowDrawer when button is clicked', async () => {
+    const props = createProps(true, 'metric', setShowDrawer);
+    render(<QueryAssistantButton {...props} />);
+    const button = screen.getByText('Get query suggestions');
+    fireEvent.click(button);
+    expect(setShowDrawer).toHaveBeenCalled();
+  });
+});
+
+function createProps(llmAppEnabled: boolean, metric: string, setShowDrawer: () => void) {
+  return {
+    llmAppEnabled,
+    metric,
+    setShowDrawer,
+  };
+}
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/QueryAssistantButton.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/QueryAssistantButton.tsx
new file mode 100644
index 0000000000000..5445134b64b96
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/QueryAssistantButton.tsx
@@ -0,0 +1,87 @@
+import React from 'react';
+
+import { selectors } from '@grafana/e2e-selectors';
+import { reportInteraction } from '@grafana/runtime';
+import { Button, Tooltip, useTheme2 } from '@grafana/ui';
+
+import { getStyles } from './PromQail';
+import AI_Logo_color from './resources/AI_Logo_color.svg';
+
+export type Props = {
+  llmAppEnabled: boolean;
+  metric: string;
+  setShowDrawer: (show: boolean) => void;
+};
+
+export function QueryAssistantButton(props: Props) {
+  const { llmAppEnabled, metric, setShowDrawer } = props;
+
+  const llmAppDisabled = !llmAppEnabled;
+  const noMetricSelected = !metric;
+
+  const theme = useTheme2();
+  const styles = getStyles(theme);
+
+  const button = () => {
+    return (
+      <Button
+        variant={'secondary'}
+        onClick={() => {
+          reportInteraction('grafana_prometheus_promqail_ai_button_clicked', {
+            metric: metric,
+          });
+          setShowDrawer(true);
+        }}
+        disabled={!metric || !llmAppEnabled}
+        data-testid={selectors.components.DataSource.Prometheus.queryEditor.builder.queryAdvisor}
+      >
+        <img height={16} src={AI_Logo_color} alt="AI logo black and white" />
+        {'\u00A0'}Get query suggestions
+      </Button>
+    );
+  };
+
+  const selectMetricMessage = (
+    <Tooltip content={'First, select a metric.'} placement={'bottom-end'}>
+      {button()}
+    </Tooltip>
+  );
+
+  const llmAppMessage = (
+    <Tooltip
+      interactive={true}
+      placement={'auto-end'}
+      content={
+        <div className={styles.enableButtonTooltip}>
+          <h6>Query Advisor is disabled</h6>
+          <div className={styles.enableButtonTooltipText}>To enable Query Advisor you must:</div>
+          <div className={styles.enableButtonTooltipText}>
+            <ul>
+              <li>
+                <a
+                  href={'https://grafana.com/docs/grafana-cloud/alerting-and-irm/machine-learning/llm-plugin/'}
+                  target="_blank"
+                  rel="noreferrer noopener"
+                  className={styles.link}
+                >
+                  Install and enable the LLM plugin
+                </a>
+              </li>
+              <li>Select a metric</li>
+            </ul>
+          </div>
+        </div>
+      }
+    >
+      {button()}
+    </Tooltip>
+  );
+
+  if (llmAppDisabled) {
+    return llmAppMessage;
+  } else if (noMetricSelected) {
+    return selectMetricMessage;
+  } else {
+    return button();
+  }
+}
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/QuerySuggestionContainer.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/QuerySuggestionContainer.tsx
index 5eb48cb5a8b82..1f3380cc7396f 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/QuerySuggestionContainer.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/QuerySuggestionContainer.tsx
@@ -31,7 +31,6 @@ export function QuerySuggestionContainer(props: Props) {
 
   if (suggestionType === SuggestionType.Historical) {
     text = `Here are ${querySuggestions.length} query suggestions:`;
-    secondaryText = 'These queries are based off of historical data (top used queries) for your metric.';
     refineText = 'I want to write a prompt';
   } else if (suggestionType === SuggestionType.AI) {
     text = text = 'Here is your query suggestion:';
@@ -42,8 +41,15 @@ export function QuerySuggestionContainer(props: Props) {
 
   return (
     <>
-      <div className={styles.textPadding}>{text}</div>
-      <div className={cx(styles.secondaryText, styles.bottomMargin)}>{secondaryText}</div>
+      {suggestionType === SuggestionType.Historical ? (
+        <div className={styles.bottomMargin}>{text}</div>
+      ) : (
+        <>
+          <div className={styles.textPadding}>{text}</div>
+          <div className={cx(styles.secondaryText, styles.bottomMargin)}>{secondaryText}</div>
+        </>
+      )}
+
       <div className={styles.infoContainerWrapper}>
         <div className={styles.infoContainer}>
           {querySuggestions.map((qs: QuerySuggestion, idx: number) => {
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/QuerySuggestionItem.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/QuerySuggestionItem.tsx
index aa91d00b15eb3..9076faae6bc27 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/QuerySuggestionItem.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/QuerySuggestionItem.tsx
@@ -168,6 +168,9 @@ export function QuerySuggestionItem(props: Props) {
             variant="primary"
             size="sm"
             onClick={() => {
+              reportInteraction('grafana_prometheus_promqail_use_query_button_clicked', {
+                query: querySuggestion.query,
+              });
               const pvq = buildVisualQueryFromString(querySuggestion.query);
               // check for errors!
               onChange(pvq.query);
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/prompts.ts b/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/prompts.ts
index c7004318a284a..b92bd2d2f1431 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/prompts.ts
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/prompts.ts
@@ -67,36 +67,48 @@ export function GetExplainUserPrompt({
     `;
 }
 
+export const SuggestSystemPrompt = `You are a Prometheus Query Language (PromQL) expert assistant inside Grafana.
+When the user asks a question, respond with a valid PromQL query and only the query.
+
+To help you answer the question, you will receive:
+- List of potentially relevant PromQL templates with descriptions, ranked by semantic search score
+- Prometheus metric
+- Metric type
+- Available Prometheus metric labels
+- User question
+
+Policy:
+- Do not invent labels names, you can only use the available labels
+- For rate queries, use the $__rate_interval variable`;
+
 // rewrite with a type
-export type SuggestSystemPromptParams = {
+export type SuggestUserPromptParams = {
   promql: string;
   question: string;
+  metricType: string;
   labels: string;
   templates: string;
 };
 
-export function GetSuggestSystemPrompt({ promql, question, labels, templates }: SuggestSystemPromptParams): string {
+export function GetSuggestUserPrompt({
+  promql,
+  question,
+  metricType,
+  labels,
+  templates,
+}: SuggestUserPromptParams): string {
   if (templates === '') {
     templates = 'No templates provided.';
+  } else {
+    templates = templates.replace(/\n/g, '\n  ');
   }
-  return `You are an PromQL expert assistant. You will be is given a PromQL expression and a user question.
-You are to edit the PromQL expression so that it answers the user question. Show only the edited PromQL.
-
-The initial PromQL query is
-\`\`\`
-${promql}
-\`\`\`
-The user question is: "${question}"
-
-To help you answer the question, here are 2 pieces of information:
-
-1. List of labels to use: ${labels}
-2. Here is a list of possibly relevant PromQL template expressions with descriptions to help target your answer:
-${templates}
-
-Rules:
-- Do not invent labels names, you must use only the labels provided.
-
-Answer:
-\`\`\``;
+  return `Relevant PromQL templates:
+  ${templates}
+  
+  Prometheus metric: ${promql}
+  Metric type: ${metricType}
+  Available Prometheus metric labels: ${labels}
+  User question: ${question}
+  
+  \`\`\`promql`;
 }
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/state/helpers.test.ts b/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/state/helpers.test.ts
new file mode 100644
index 0000000000000..323848bebdc93
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/state/helpers.test.ts
@@ -0,0 +1,74 @@
+import { llms } from '@grafana/experimental';
+
+import { guessMetricType, isLLMPluginEnabled } from './helpers';
+
+// Mock the grafana-experimental llms module
+jest.mock('@grafana/experimental', () => ({
+  llms: {
+    openai: {
+      health: jest.fn(),
+    },
+    vector: {
+      health: jest.fn(),
+    },
+  },
+}));
+
+describe('isLLMPluginEnabled', () => {
+  it('should return true if LLM plugin is enabled', async () => {
+    jest.mocked(llms.openai.health).mockResolvedValue({ ok: true, configured: true });
+    jest.mocked(llms.vector.health).mockResolvedValue({ ok: true, enabled: true });
+
+    const enabled = await isLLMPluginEnabled();
+
+    expect(enabled).toBe(true);
+  });
+
+  it('should return false if LLM plugin is not enabled', async () => {
+    jest.mocked(llms.openai.health).mockResolvedValue({ ok: false, configured: false });
+    jest.mocked(llms.vector.health).mockResolvedValue({ ok: false, enabled: false });
+
+    const enabled = await isLLMPluginEnabled();
+
+    expect(enabled).toBe(false);
+  });
+
+  it('should return false if LLM plugin is enabled but health check fails', async () => {
+    jest.mocked(llms.openai.health).mockResolvedValue({ ok: false, configured: true });
+    jest.mocked(llms.vector.health).mockResolvedValue({ ok: false, enabled: true });
+
+    const enabled = await isLLMPluginEnabled();
+
+    expect(enabled).toBe(false);
+  });
+});
+
+const metricListWithType = [
+  // below is summary metric family
+  ['go_gc_duration_seconds', 'summary'],
+  ['go_gc_duration_seconds_count', 'summary'],
+  ['go_gc_duration_seconds_sum', 'summary'],
+  // below is histogram metric family
+  ['go_gc_heap_allocs_by_size_bytes_total_bucket', 'histogram'],
+  ['go_gc_heap_allocs_by_size_bytes_total_count', 'histogram'],
+  ['go_gc_heap_allocs_by_size_bytes_total_sum', 'histogram'],
+  // below are counters
+  ['go_gc_heap_allocs_bytes_total', 'counter'],
+  ['scrape_samples_post_metric_relabeling', 'counter'],
+  // below are gauges
+  ['go_gc_heap_goal_bytes', 'gauge'],
+  ['nounderscorename', 'gauge'],
+  // below is both a histogram & summary
+  ['alertmanager_http_response_size_bytes', 'histogram,summary'],
+  ['alertmanager_http_response_size_bytes_bucket', 'histogram,summary'],
+  ['alertmanager_http_response_size_bytes_count', 'histogram,summary'],
+  ['alertmanager_http_response_size_bytes_sum', 'histogram,summary'],
+];
+
+const metricList = metricListWithType.map((item) => item[0]);
+
+describe('guessMetricType', () => {
+  it.each(metricListWithType)("where input is '%s'", (metric: string, metricType: string) => {
+    expect(guessMetricType(metric, metricList)).toBe(metricType);
+  });
+});
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/state/helpers.ts b/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/state/helpers.ts
index 7e4aa40ddda46..465fb7bfed803 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/state/helpers.ts
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/state/helpers.ts
@@ -1,6 +1,7 @@
 import { AnyAction } from 'redux';
 
 import { llms } from '@grafana/experimental';
+import { reportInteraction } from '@grafana/runtime';
 import { PrometheusDatasource } from 'app/plugins/datasource/prometheus/datasource';
 import { getMetadataHelp, getMetadataType } from 'app/plugins/datasource/prometheus/language_provider';
 
@@ -10,15 +11,16 @@ import { PromVisualQuery } from '../../../types';
 import {
   ExplainSystemPrompt,
   GetExplainUserPrompt,
-  GetSuggestSystemPrompt,
-  SuggestSystemPromptParams,
+  SuggestSystemPrompt,
+  GetSuggestUserPrompt,
+  SuggestUserPromptParams,
 } from '../prompts';
 import { Interaction, QuerySuggestion, SuggestionType } from '../types';
 
 import { createInteraction, stateSlice } from './state';
 import { getTemplateSuggestions } from './templates';
 
-const OPENAI_MODEL_NAME = 'gpt-3.5-turbo';
+const OPENAI_MODEL_NAME = 'gpt-3.5-turbo-1106';
 const promQLTemplatesCollection = 'grafana.promql.templates';
 // actions to update the state
 const { updateInteraction } = stateSlice.actions;
@@ -76,8 +78,17 @@ export function getExplainMessage(
   ];
 }
 
-function getSuggestMessage({ promql, question, labels, templates }: SuggestSystemPromptParams): llms.openai.Message[] {
-  return [{ role: 'system', content: GetSuggestSystemPrompt({ promql, question, labels, templates }) }];
+function getSuggestMessages({
+  promql,
+  question,
+  metricType,
+  labels,
+  templates,
+}: SuggestUserPromptParams): llms.openai.Message[] {
+  return [
+    { role: 'system', content: SuggestSystemPrompt },
+    { role: 'user', content: GetSuggestUserPrompt({ promql, question, metricType, labels, templates }) },
+  ];
 }
 
 /**
@@ -96,11 +107,6 @@ export async function promQailExplain(
   suggIdx: number,
   datasource: PrometheusDatasource
 ) {
-  // const enabled = await llms.openai.enabled();
-  // if (!enabled) {
-  //   return false;
-  // }
-
   const suggestedQuery = interaction.suggestions[suggIdx].query;
 
   const promptMessages = getExplainMessage(suggestedQuery, query.metric, datasource);
@@ -110,6 +116,7 @@ export async function promQailExplain(
     .streamChatCompletions({
       model: OPENAI_MODEL_NAME,
       messages: promptMessages,
+      temperature: 0,
     })
     .pipe(llms.openai.accumulateContent())
     .subscribe((response) => {
@@ -136,6 +143,145 @@ export async function promQailExplain(
     });
 }
 
+/**
+ * Check if sublist is fully contained in the superlist
+ *
+ * @param sublist
+ * @param superlist
+ * @returns true if fully contained, else false
+ */
+function isContainedIn(sublist: string[], superlist: string[]): boolean {
+  for (const item of sublist) {
+    if (!superlist.includes(item)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+/**
+ * Guess the type of a metric, based on its name and its relation to other metrics available
+ *
+ * @param metric     - name of metric whose type to guess
+ * @param allMetrics - list of all available metrics
+ * @returns          - the guess of the type (string): counter,gauge,summary,histogram,'histogram,summary'
+ */
+export function guessMetricType(metric: string, allMetrics: string[]): string {
+  const synthetic_metrics = new Set<string>([
+    'up',
+    'scrape_duration_seconds',
+    'scrape_samples_post_metric_relabeling',
+    'scrape_series_added',
+    'scrape_samples_scraped',
+    'ALERTS',
+    'ALERTS_FOR_STATE',
+  ]);
+
+  if (synthetic_metrics.has(metric)) {
+    // these are all known to be counters
+    return 'counter';
+  }
+  if (metric.startsWith(':')) {
+    // probably recording rule
+    return 'gauge';
+  }
+  if (metric.endsWith('_info')) {
+    // typically series of 1s only, the labels are the useful part. TODO: add 'info' type
+    return 'counter';
+  }
+
+  if (metric.endsWith('_created') || metric.endsWith('_total')) {
+    // prometheus naming style recommends counters to have these suffixes.
+    return 'counter';
+  }
+
+  const underscoreIndex = metric.lastIndexOf('_');
+  if (underscoreIndex < 0) {
+    // No underscores in the name at all, very little info to go on. Guess
+    return 'gauge';
+  }
+
+  // See if the suffix is histogram-y or summary-y
+  const [root, suffix] = [metric.slice(0, underscoreIndex), metric.slice(underscoreIndex + 1)];
+
+  if (['bucket', 'count', 'sum'].includes(suffix)) {
+    // Might be histogram + summary
+    let familyMetrics = [`${root}_bucket`, `${root}_count`, `${root}_sum`, root];
+    if (isContainedIn(familyMetrics, allMetrics)) {
+      return 'histogram,summary';
+    }
+
+    // Might be a histogram, if so all these metrics should exist too:
+    familyMetrics = [`${root}_bucket`, `${root}_count`, `${root}_sum`];
+    if (isContainedIn(familyMetrics, allMetrics)) {
+      return 'histogram';
+    }
+
+    // Or might be a summary
+    familyMetrics = [`${root}_sum`, `${root}_count`, root];
+    if (isContainedIn(familyMetrics, allMetrics)) {
+      return 'summary';
+    }
+
+    // Otherwise it's probably just a counter!
+    return 'counter';
+  }
+
+  // One case above doesn't catch: summary or histogram,summary where the non-suffixed metric is chosen
+  const familyMetrics = [`${metric}_sum`, `${metric}_count`, metric];
+  if (isContainedIn(familyMetrics, allMetrics)) {
+    if (allMetrics.includes(`${metric}_bucket`)) {
+      return 'histogram,summary';
+    } else {
+      return 'summary';
+    }
+  }
+
+  // All else fails, guess gauge
+  return 'gauge';
+}
+
+/**
+ * Generate a suitable filter structure for the VectorDB call
+ * @param types: list of metric types to include in the result
+ * @returns the structure to pass to the vectorDB call.
+ */
+function generateMetricTypeFilters(types: string[]) {
+  return types.map((type) => ({
+    metric_type: {
+      $eq: type,
+    },
+  }));
+}
+
+/**
+ * Taking in a metric name, try to guess its corresponding metric _family_ name
+ * @param metric name
+ * @returns metric family name
+ */
+function guessMetricFamily(metric: string): string {
+  if (metric.endsWith('_bucket') || metric.endsWith('_count') || metric.endsWith('_sum')) {
+    return metric.slice(0, metric.lastIndexOf('_'));
+  }
+  return metric;
+}
+
+/**
+ * Check if the LLM plugin is enabled.
+ * Used in the PromQueryBuilder to enable/disable the button based on openai and vector db checks
+ * @returns true if the LLM plugin is enabled.
+ */
+export async function isLLMPluginEnabled(): Promise<boolean> {
+  // Check if the LLM plugin is enabled.
+  // If not, we won't be able to make requests, so return early.
+  const openaiEnabled = llms.openai.health().then((response) => response.ok);
+  const vectorEnabled = llms.vector.health().then((response) => response.ok);
+  // combine 2 promises
+  return Promise.all([openaiEnabled, vectorEnabled]).then((results) => {
+    return results.every((result) => result);
+  });
+}
+
 /**
  * Calls the API and adds suggestions to the interaction
  *
@@ -152,16 +298,32 @@ export async function promQailSuggest(
   datasource: PrometheusDatasource,
   interaction?: Interaction
 ) {
-  // when you're not running promqail
-  // @ts-ignore llms types issue
-  const check = (await llms.openai.enabled()) && (await llms.vector.enabled());
-
   const interactionToUpdate = interaction ? interaction : createInteraction(SuggestionType.Historical);
 
-  if (!check || interactionToUpdate.suggestionType === SuggestionType.Historical) {
+  // Decide metric type
+  let metricType = '';
+  // Makes sure we loaded the metadata for metrics. Usually this is done in the start() method of the
+  // provider but we only need the metadata here.
+  if (!datasource.languageProvider.metricsMetadata) {
+    await datasource.languageProvider.loadMetricsMetadata();
+  }
+  if (datasource.languageProvider.metricsMetadata) {
+    // `datasource.languageProvider.metricsMetadata` is a list of metric family names (with desired type)
+    // from the datasource metadata endoint, but unfortunately the expanded _sum, _count, _bucket raw
+    // metric names are also generated and populating this list (all of type counter). We want the metric
+    // family type, so need to guess the metric family name from the chosen metric name, and test if that
+    // metric family has a type specified.
+    const metricFamilyGuess = guessMetricFamily(query.metric);
+    metricType = getMetadataType(metricFamilyGuess, datasource.languageProvider.metricsMetadata) ?? '';
+  }
+  if (metricType === '') {
+    // fallback to heuristic guess
+    metricType = guessMetricType(query.metric, datasource.languageProvider.metrics);
+  }
+
+  if (interactionToUpdate.suggestionType === SuggestionType.Historical) {
     return new Promise<void>((resolve) => {
       return setTimeout(() => {
-        let metricType = getMetadataType(query.metric, datasource.languageProvider.metricsMetadata!) ?? '';
         const suggestions = getTemplateSuggestions(
           query.metric,
           metricType,
@@ -183,9 +345,15 @@ export async function promQailSuggest(
       prompt?: string;
     };
 
+    // get all available labels
+    const metricLabels = await datasource.languageProvider.fetchLabelsWithMatch(query.metric);
+
     let feedTheAI: SuggestionBody = {
       metric: query.metric,
-      labels: promQueryModeller.renderLabels(query.labels),
+      // drop __name__ label because it's not useful
+      labels: Object.keys(metricLabels)
+        .filter((label) => label !== '__name__')
+        .join(','),
     };
 
     // @ts-ignore llms types issue
@@ -193,25 +361,33 @@ export async function promQailSuggest(
     if (interaction?.suggestionType === SuggestionType.AI) {
       feedTheAI = { ...feedTheAI, prompt: interaction.prompt };
 
-      // TODO: filter by metric type
       // @ts-ignore llms types issue
       results = await llms.vector.search<TemplateSearchResult>({
         query: interaction.prompt,
         collection: promQLTemplatesCollection,
         topK: 5,
+        filter: {
+          $or: generateMetricTypeFilters(metricType.split(',').concat(['*'])),
+        },
+      });
+      reportInteraction('grafana_prometheus_promqail_vector_results', {
+        metric: query.metric,
+        prompt: interaction.prompt,
+        results: results,
       });
       // TODO: handle errors from vector search
     }
 
     const resultsString = results
       .map((r) => {
-        return `PromQL: ${r.payload.promql}\nDescription: ${r.payload.description}`;
+        return `${r.payload.promql} | ${r.payload.description} (score=${(r.score * 100).toFixed(1)})`;
       })
       .join('\n');
 
-    const promptMessages = getSuggestMessage({
+    const promptMessages = getSuggestMessages({
       promql: query.metric,
       question: interaction ? interaction.prompt : '',
+      metricType: metricType,
       labels: labelNames.join(', '),
       templates: resultsString,
     });
@@ -220,6 +396,7 @@ export async function promQailSuggest(
       .streamChatCompletions({
         model: OPENAI_MODEL_NAME,
         messages: promptMessages,
+        temperature: 0.5,
       })
       .pipe(llms.openai.accumulateContent())
       .subscribe((response) => {
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/hooks/useFlag.test.ts b/public/app/plugins/datasource/prometheus/querybuilder/hooks/useFlag.test.ts
new file mode 100644
index 0000000000000..4c7ca4e6393ba
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/querybuilder/hooks/useFlag.test.ts
@@ -0,0 +1,23 @@
+import { act, renderHook } from '@testing-library/react';
+
+import { promQueryEditorExplainKey, useFlag } from './useFlag';
+
+describe('useFlag Hook', () => {
+  beforeEach(() => {
+    window.localStorage.removeItem(promQueryEditorExplainKey);
+  });
+
+  it('should return the default flag value as false', () => {
+    const { result } = renderHook(() => useFlag(promQueryEditorExplainKey));
+    expect(result.current.flag).toBe(false);
+  });
+
+  it('should update the flag value without error', () => {
+    const { result } = renderHook(() => useFlag(promQueryEditorExplainKey, true));
+    expect(result.current.flag).toBe(true);
+    act(() => {
+      result.current.setFlag(false);
+    });
+    expect(result.current.flag).toBe(false);
+  });
+});
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/hooks/useFlag.ts b/public/app/plugins/datasource/prometheus/querybuilder/hooks/useFlag.ts
new file mode 100644
index 0000000000000..80602b711df1a
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/querybuilder/hooks/useFlag.ts
@@ -0,0 +1,36 @@
+import { useCallback, useState } from 'react';
+
+import store from '../../../../../core/store';
+
+export const promQueryEditorExplainKey = 'PrometheusQueryEditorExplainDefault';
+
+export type QueryEditorFlags = typeof promQueryEditorExplainKey;
+
+function getFlagValue(key: QueryEditorFlags, defaultValue = false): boolean {
+  const val = store.get(key);
+  return val === undefined ? defaultValue : Boolean(parseInt(val, 10));
+}
+
+function setFlagValue(key: QueryEditorFlags, value: boolean) {
+  store.set(key, value ? '1' : '0');
+}
+
+type UseFlagHookReturnType = { flag: boolean; setFlag: (val: boolean) => void };
+
+/**
+ *
+ * Use and store value of explain switch in local storage.
+ * Needs to be a hook with local state to trigger re-renders.
+ */
+export function useFlag(key: QueryEditorFlags, defaultValue = false): UseFlagHookReturnType {
+  const [flag, updateFlag] = useState(getFlagValue(key, defaultValue));
+  const setter = useCallback(
+    (value: boolean) => {
+      setFlagValue(key, value);
+      updateFlag(value);
+    },
+    [key]
+  );
+
+  return { flag, setFlag: setter };
+}
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/operationUtils.test.ts b/public/app/plugins/datasource/prometheus/querybuilder/operationUtils.test.ts
new file mode 100644
index 0000000000000..da1aabe924ec9
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/querybuilder/operationUtils.test.ts
@@ -0,0 +1,208 @@
+import {
+  createAggregationOperation,
+  createAggregationOperationWithParam,
+  getOperationParamId,
+  isConflictingSelector,
+} from './operationUtils';
+
+describe('createAggregationOperation', () => {
+  it('returns correct aggregation definitions with overrides', () => {
+    expect(createAggregationOperation('test_aggregation', { category: 'test_category' })).toMatchObject([
+      {
+        addOperationHandler: {},
+        alternativesKey: 'plain aggregations',
+        category: 'test_category',
+        defaultParams: [],
+        explainHandler: {},
+        id: 'test_aggregation',
+        name: 'Test aggregation',
+        paramChangedHandler: {},
+        params: [
+          {
+            name: 'By label',
+            optional: true,
+            restParam: true,
+            type: 'string',
+          },
+        ],
+        renderer: {},
+      },
+      {
+        alternativesKey: 'aggregations by',
+        category: 'test_category',
+        defaultParams: [''],
+        explainHandler: {},
+        hideFromList: true,
+        id: '__test_aggregation_by',
+        name: 'Test aggregation by',
+        paramChangedHandler: {},
+        params: [
+          {
+            editor: {},
+            name: 'Label',
+            optional: true,
+            restParam: true,
+            type: 'string',
+          },
+        ],
+        renderer: {},
+      },
+      {
+        alternativesKey: 'aggregations by',
+        category: 'test_category',
+        defaultParams: [''],
+        explainHandler: {},
+        hideFromList: true,
+        id: '__test_aggregation_without',
+        name: 'Test aggregation without',
+        paramChangedHandler: {},
+        params: [
+          {
+            name: 'Label',
+            optional: true,
+            restParam: true,
+            type: 'string',
+          },
+        ],
+        renderer: {},
+      },
+    ]);
+  });
+});
+
+describe('createAggregationOperationWithParams', () => {
+  it('returns correct aggregation definitions with overrides and params', () => {
+    expect(
+      createAggregationOperationWithParam(
+        'test_aggregation',
+        {
+          params: [{ name: 'K-value', type: 'number' }],
+          defaultParams: [5],
+        },
+        { category: 'test_category' }
+      )
+    ).toMatchObject([
+      {
+        addOperationHandler: {},
+        alternativesKey: 'plain aggregations',
+        category: 'test_category',
+        defaultParams: [5],
+        explainHandler: {},
+        id: 'test_aggregation',
+        name: 'Test aggregation',
+        paramChangedHandler: {},
+        params: [
+          { name: 'K-value', type: 'number' },
+          { name: 'By label', optional: true, restParam: true, type: 'string' },
+        ],
+        renderer: {},
+      },
+      {
+        alternativesKey: 'aggregations by',
+        category: 'test_category',
+        defaultParams: [5, ''],
+        explainHandler: {},
+        hideFromList: true,
+        id: '__test_aggregation_by',
+        name: 'Test aggregation by',
+        paramChangedHandler: {},
+        params: [
+          { name: 'K-value', type: 'number' },
+          { editor: {}, name: 'Label', optional: true, restParam: true, type: 'string' },
+        ],
+        renderer: {},
+      },
+      {
+        alternativesKey: 'aggregations by',
+        category: 'test_category',
+        defaultParams: [5, ''],
+        explainHandler: {},
+        hideFromList: true,
+        id: '__test_aggregation_without',
+        name: 'Test aggregation without',
+        paramChangedHandler: {},
+        params: [
+          { name: 'K-value', type: 'number' },
+          { name: 'Label', optional: true, restParam: true, type: 'string' },
+        ],
+        renderer: {},
+      },
+    ]);
+  });
+  it('returns correct query string using aggregation definitions with overrides and number type param', () => {
+    const def = createAggregationOperationWithParam(
+      'test_aggregation',
+      {
+        params: [{ name: 'K-value', type: 'number' }],
+        defaultParams: [5],
+      },
+      { category: 'test_category' }
+    );
+
+    const topKByDefinition = def[1];
+    expect(
+      topKByDefinition.renderer(
+        { id: '__topk_by', params: ['5', 'source', 'place'] },
+        def[1],
+        'rate({place="luna"} |= `` [5m])'
+      )
+    ).toBe('test_aggregation by(source, place) (5, rate({place="luna"} |= `` [5m]))');
+  });
+
+  it('returns correct query string using aggregation definitions with overrides and string type param', () => {
+    const def = createAggregationOperationWithParam(
+      'test_aggregation',
+      {
+        params: [{ name: 'Identifier', type: 'string' }],
+        defaultParams: ['count'],
+      },
+      { category: 'test_category' }
+    );
+
+    const countValueDefinition = def[1];
+    expect(
+      countValueDefinition.renderer(
+        { id: 'count_values', params: ['5', 'source', 'place'] },
+        def[1],
+        'rate({place="luna"} |= `` [5m])'
+      )
+    ).toBe('test_aggregation by(source, place) ("5", rate({place="luna"} |= `` [5m]))');
+  });
+});
+
+describe('isConflictingSelector', () => {
+  it('returns true if selector is conflicting', () => {
+    const newLabel = { label: 'job', op: '!=', value: 'tns/app' };
+    const labels = [
+      { label: 'job', op: '=', value: 'tns/app' },
+      { label: 'job', op: '!=', value: 'tns/app' },
+    ];
+    expect(isConflictingSelector(newLabel, labels)).toBe(true);
+  });
+
+  it('returns false if selector is not complete', () => {
+    const newLabel = { label: 'job', op: '', value: 'tns/app' };
+    const labels = [
+      { label: 'job', op: '=', value: 'tns/app' },
+      { label: 'job', op: '', value: 'tns/app' },
+    ];
+    expect(isConflictingSelector(newLabel, labels)).toBe(false);
+  });
+
+  it('returns false if selector is not conflicting', () => {
+    const newLabel = { label: 'host', op: '=', value: 'docker-desktop' };
+    const labels = [
+      { label: 'job', op: '=', value: 'tns/app' },
+      { label: 'host', op: '=', value: 'docker-desktop' },
+    ];
+    expect(isConflictingSelector(newLabel, labels)).toBe(false);
+  });
+});
+
+describe('getOperationParamId', () => {
+  it('Generates correct id for operation param', () => {
+    const operationId = 'abc';
+    const paramId = 0;
+    expect(getOperationParamId(operationId, paramId)).toBe('operations.abc.param.0');
+  });
+});
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/operationUtils.ts b/public/app/plugins/datasource/prometheus/querybuilder/operationUtils.ts
new file mode 100644
index 0000000000000..b7eec3ec160ff
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/querybuilder/operationUtils.ts
@@ -0,0 +1,351 @@
+import { capitalize } from 'lodash';
+import pluralize from 'pluralize';
+
+import { SelectableValue } from '@grafana/data/src';
+
+import { LabelParamEditor } from './components/LabelParamEditor';
+import {
+  QueryBuilderLabelFilter,
+  QueryBuilderOperation,
+  QueryBuilderOperationDef,
+  QueryBuilderOperationParamDef,
+  QueryBuilderOperationParamValue,
+  QueryWithOperations,
+} from './shared/types';
+import { PromVisualQueryOperationCategory } from './types';
+
+export function functionRendererLeft(model: QueryBuilderOperation, def: QueryBuilderOperationDef, innerExpr: string) {
+  const params = renderParams(model, def, innerExpr);
+  const str = model.id + '(';
+
+  if (innerExpr) {
+    params.push(innerExpr);
+  }
+
+  return str + params.join(', ') + ')';
+}
+
+export function functionRendererRight(model: QueryBuilderOperation, def: QueryBuilderOperationDef, innerExpr: string) {
+  const params = renderParams(model, def, innerExpr);
+  const str = model.id + '(';
+
+  if (innerExpr) {
+    params.unshift(innerExpr);
+  }
+
+  return str + params.join(', ') + ')';
+}
+
+function rangeRendererWithParams(
+  model: QueryBuilderOperation,
+  def: QueryBuilderOperationDef,
+  innerExpr: string,
+  renderLeft: boolean
+) {
+  if (def.params.length < 2) {
+    throw `Cannot render a function with params of length [${def.params.length}]`;
+  }
+
+  let rangeVector = (model.params ?? [])[0] ?? '5m';
+
+  // Next frame the remaining parameters, but get rid of the first one because it's used to move the
+  // instant vector into a range vector.
+  const params = renderParams(
+    {
+      ...model,
+      params: model.params.slice(1),
+    },
+    {
+      ...def,
+      params: def.params.slice(1),
+      defaultParams: def.defaultParams.slice(1),
+    },
+    innerExpr
+  );
+
+  const str = model.id + '(';
+
+  // Depending on the renderLeft variable, render parameters to the left or right
+  // renderLeft === true (renderLeft) => (param1, param2, rangeVector[...])
+  // renderLeft === false (renderRight) => (rangeVector[...], param1, param2)
+  if (innerExpr) {
+    renderLeft ? params.push(`${innerExpr}[${rangeVector}]`) : params.unshift(`${innerExpr}[${rangeVector}]`);
+  }
+
+  // stick everything together
+  return str + params.join(', ') + ')';
+}
+
+export function rangeRendererRightWithParams(
+  model: QueryBuilderOperation,
+  def: QueryBuilderOperationDef,
+  innerExpr: string
+) {
+  return rangeRendererWithParams(model, def, innerExpr, false);
+}
+
+export function rangeRendererLeftWithParams(
+  model: QueryBuilderOperation,
+  def: QueryBuilderOperationDef,
+  innerExpr: string
+) {
+  return rangeRendererWithParams(model, def, innerExpr, true);
+}
+
+function renderParams(model: QueryBuilderOperation, def: QueryBuilderOperationDef, innerExpr: string) {
+  return (model.params ?? []).map((value, index) => {
+    const paramDef = def.params[index];
+    if (paramDef.type === 'string') {
+      return '"' + value + '"';
+    }
+
+    return value;
+  });
+}
+
+export function defaultAddOperationHandler<T extends QueryWithOperations>(def: QueryBuilderOperationDef, query: T) {
+  const newOperation: QueryBuilderOperation = {
+    id: def.id,
+    params: def.defaultParams,
+  };
+
+  return {
+    ...query,
+    operations: [...query.operations, newOperation],
+  };
+}
+
+export function getPromOperationDisplayName(funcName: string) {
+  return capitalize(funcName.replace(/_/g, ' '));
+}
+
+export function getOperationParamId(operationId: string, paramIndex: number) {
+  return `operations.${operationId}.param.${paramIndex}`;
+}
+
+export function getRangeVectorParamDef(withRateInterval = false): QueryBuilderOperationParamDef {
+  const param: QueryBuilderOperationParamDef = {
+    name: 'Range',
+    type: 'string',
+    options: [
+      {
+        label: '$__interval',
+        value: '$__interval',
+        // tooltip: 'Dynamic interval based on max data points, scrape and min interval',
+      },
+      { label: '1m', value: '1m' },
+      { label: '5m', value: '5m' },
+      { label: '10m', value: '10m' },
+      { label: '1h', value: '1h' },
+      { label: '24h', value: '24h' },
+    ],
+  };
+
+  if (withRateInterval) {
+    (param.options as Array<SelectableValue<string>>).unshift({
+      label: '$__rate_interval',
+      value: '$__rate_interval',
+      // tooltip: 'Always above 4x scrape interval',
+    });
+  }
+
+  return param;
+}
+
+export function createAggregationOperation(
+  name: string,
+  overrides: Partial<QueryBuilderOperationDef> = {}
+): QueryBuilderOperationDef[] {
+  const operations: QueryBuilderOperationDef[] = [
+    {
+      id: name,
+      name: getPromOperationDisplayName(name),
+      params: [
+        {
+          name: 'By label',
+          type: 'string',
+          restParam: true,
+          optional: true,
+        },
+      ],
+      defaultParams: [],
+      alternativesKey: 'plain aggregations',
+      category: PromVisualQueryOperationCategory.Aggregations,
+      renderer: functionRendererLeft,
+      paramChangedHandler: getOnLabelAddedHandler(`__${name}_by`),
+      explainHandler: getAggregationExplainer(name, ''),
+      addOperationHandler: defaultAddOperationHandler,
+      ...overrides,
+    },
+    {
+      id: `__${name}_by`,
+      name: `${getPromOperationDisplayName(name)} by`,
+      params: [
+        {
+          name: 'Label',
+          type: 'string',
+          restParam: true,
+          optional: true,
+          editor: LabelParamEditor,
+        },
+      ],
+      defaultParams: [''],
+      alternativesKey: 'aggregations by',
+      category: PromVisualQueryOperationCategory.Aggregations,
+      renderer: getAggregationByRenderer(name),
+      paramChangedHandler: getLastLabelRemovedHandler(name),
+      explainHandler: getAggregationExplainer(name, 'by'),
+      addOperationHandler: defaultAddOperationHandler,
+      hideFromList: true,
+      ...overrides,
+    },
+    {
+      id: `__${name}_without`,
+      name: `${getPromOperationDisplayName(name)} without`,
+      params: [
+        {
+          name: 'Label',
+          type: 'string',
+          restParam: true,
+          optional: true,
+          editor: LabelParamEditor,
+        },
+      ],
+      defaultParams: [''],
+      alternativesKey: 'aggregations by',
+      category: PromVisualQueryOperationCategory.Aggregations,
+      renderer: getAggregationWithoutRenderer(name),
+      paramChangedHandler: getLastLabelRemovedHandler(name),
+      explainHandler: getAggregationExplainer(name, 'without'),
+      addOperationHandler: defaultAddOperationHandler,
+      hideFromList: true,
+      ...overrides,
+    },
+  ];
+
+  return operations;
+}
+
+export function createAggregationOperationWithParam(
+  name: string,
+  paramsDef: { params: QueryBuilderOperationParamDef[]; defaultParams: QueryBuilderOperationParamValue[] },
+  overrides: Partial<QueryBuilderOperationDef> = {}
+): QueryBuilderOperationDef[] {
+  const operations = createAggregationOperation(name, overrides);
+  operations[0].params.unshift(...paramsDef.params);
+  operations[1].params.unshift(...paramsDef.params);
+  operations[2].params.unshift(...paramsDef.params);
+  operations[0].defaultParams = paramsDef.defaultParams;
+  operations[1].defaultParams = [...paramsDef.defaultParams, ''];
+  operations[2].defaultParams = [...paramsDef.defaultParams, ''];
+  operations[1].renderer = getAggregationByRendererWithParameter(name);
+  operations[2].renderer = getAggregationByRendererWithParameter(name);
+  return operations;
+}
+
+function getAggregationByRenderer(aggregation: string) {
+  return function aggregationRenderer(model: QueryBuilderOperation, def: QueryBuilderOperationDef, innerExpr: string) {
+    return `${aggregation} by(${model.params.join(', ')}) (${innerExpr})`;
+  };
+}
+
+function getAggregationWithoutRenderer(aggregation: string) {
+  return function aggregationRenderer(model: QueryBuilderOperation, def: QueryBuilderOperationDef, innerExpr: string) {
+    return `${aggregation} without(${model.params.join(', ')}) (${innerExpr})`;
+  };
+}
+
+/**
+ * Very simple poc implementation, needs to be modified to support all aggregation operators
+ */
+export function getAggregationExplainer(aggregationName: string, mode: 'by' | 'without' | '') {
+  return function aggregationExplainer(model: QueryBuilderOperation) {
+    const labels = model.params.map((label) => `\`${label}\``).join(' and ');
+    const labelWord = pluralize('label', model.params.length);
+
+    switch (mode) {
+      case 'by':
+        return `Calculates ${aggregationName} over dimensions while preserving ${labelWord} ${labels}.`;
+      case 'without':
+        return `Calculates ${aggregationName} over the dimensions ${labels}. All other labels are preserved.`;
+      default:
+        return `Calculates ${aggregationName} over the dimensions.`;
+    }
+  };
+}
+
+function getAggregationByRendererWithParameter(aggregation: string) {
+  return function aggregationRenderer(model: QueryBuilderOperation, def: QueryBuilderOperationDef, innerExpr: string) {
+    const restParamIndex = def.params.findIndex((param) => param.restParam);
+    const params = model.params.slice(0, restParamIndex);
+    const restParams = model.params.slice(restParamIndex);
+
+    return `${aggregation} by(${restParams.join(', ')}) (${params
+      .map((param, idx) => (def.params[idx].type === 'string' ? `\"${param}\"` : param))
+      .join(', ')}, ${innerExpr})`;
+  };
+}
+
+/**
+ * This function will transform operations without labels to their plan aggregation operation
+ */
+export function getLastLabelRemovedHandler(changeToOperationId: string) {
+  return function onParamChanged(index: number, op: QueryBuilderOperation, def: QueryBuilderOperationDef) {
+    // If definition has more params then is defined there are no optional rest params anymore.
+    // We then transform this operation into a different one
+    if (op.params.length < def.params.length) {
+      return {
+        ...op,
+        id: changeToOperationId,
+      };
+    }
+
+    return op;
+  };
+}
+
+export function getOnLabelAddedHandler(changeToOperationId: string) {
+  return function onParamChanged(index: number, op: QueryBuilderOperation, def: QueryBuilderOperationDef) {
+    // Check if we actually have the label param. As it's optional the aggregation can have one less, which is the
+    // case of just simple aggregation without label. When user adds the label it now has the same number of params
+    // as its definition, and now we can change it to its `_by` variant.
+    if (op.params.length === def.params.length) {
+      return {
+        ...op,
+        id: changeToOperationId,
+      };
+    }
+    return op;
+  };
+}
+
+export function isConflictingSelector(
+  newLabel: Partial<QueryBuilderLabelFilter>,
+  labels: Array<Partial<QueryBuilderLabelFilter>>
+): boolean {
+  if (!newLabel.label || !newLabel.op || !newLabel.value) {
+    return false;
+  }
+
+  if (labels.length < 2) {
+    return false;
+  }
+
+  const operationIsNegative = newLabel.op.toString().startsWith('!');
+
+  const candidates = labels.filter(
+    (label) => label.label === newLabel.label && label.value === newLabel.value && label.op !== newLabel.op
+  );
+
+  const conflict = candidates.some((candidate) => {
+    if (operationIsNegative && candidate?.op?.toString().startsWith('!') === false) {
+      return true;
+    }
+    if (operationIsNegative === false && candidate?.op?.toString().startsWith('!')) {
+      return true;
+    }
+    return false;
+  });
+
+  return conflict;
+}
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/operations.ts b/public/app/plugins/datasource/prometheus/querybuilder/operations.ts
index 2c091045bb231..3b445efa37e00 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/operations.ts
+++ b/public/app/plugins/datasource/prometheus/querybuilder/operations.ts
@@ -4,11 +4,11 @@ import {
   defaultAddOperationHandler,
   functionRendererLeft,
   functionRendererRight,
-  getPromAndLokiOperationDisplayName,
+  getPromOperationDisplayName,
   getRangeVectorParamDef,
   rangeRendererLeftWithParams,
   rangeRendererRightWithParams,
-} from './shared/operationUtils';
+} from './operationUtils';
 import {
   QueryBuilderOperation,
   QueryBuilderOperationDef,
@@ -265,7 +265,7 @@ export function createFunction(definition: Partial<QueryBuilderOperationDef>): Q
   return {
     ...definition,
     id: definition.id!,
-    name: definition.name ?? getPromAndLokiOperationDisplayName(definition.id!),
+    name: definition.name ?? getPromOperationDisplayName(definition.id!),
     params: definition.params ?? [],
     defaultParams: definition.defaultParams ?? [],
     category: definition.category ?? PromVisualQueryOperationCategory.Functions,
@@ -277,7 +277,7 @@ export function createFunction(definition: Partial<QueryBuilderOperationDef>): Q
 export function createRangeFunction(name: string, withRateInterval = false): QueryBuilderOperationDef {
   return {
     id: name,
-    name: getPromAndLokiOperationDisplayName(name),
+    name: getPromOperationDisplayName(name),
     params: [getRangeVectorParamDef(withRateInterval)],
     defaultParams: [withRateInterval ? '$__rate_interval' : '$__interval'],
     alternativesKey: 'range function',
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/parsing.ts b/public/app/plugins/datasource/prometheus/querybuilder/parsing.ts
index 79792b8afe237..de1486efc2a59 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/parsing.ts
+++ b/public/app/plugins/datasource/prometheus/querybuilder/parsing.ts
@@ -36,7 +36,7 @@ import {
   makeBinOp,
   makeError,
   replaceVariables,
-} from './shared/parsingUtils';
+} from './parsingUtils';
 import { QueryBuilderLabelFilter, QueryBuilderOperation } from './shared/types';
 import { PromVisualQuery, PromVisualQueryBinary } from './types';
 
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/parsingUtils.test.ts b/public/app/plugins/datasource/prometheus/querybuilder/parsingUtils.test.ts
new file mode 100644
index 0000000000000..81c8d255ca63f
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/querybuilder/parsingUtils.test.ts
@@ -0,0 +1,42 @@
+import { parser } from '@prometheus-io/lezer-promql';
+
+import { getLeftMostChild, getString, replaceVariables } from './parsingUtils';
+
+describe('getLeftMostChild', () => {
+  it('return left most child', () => {
+    const tree = parser.parse('sum_over_time(foo{bar="baz"}[5m])');
+    const child = getLeftMostChild(tree.topNode);
+    expect(child).toBeDefined();
+    expect(child!.name).toBe('SumOverTime');
+  });
+});
+
+describe('replaceVariables', () => {
+  it('should replace variables', () => {
+    expect(replaceVariables('sum_over_time([[metric_var]]{bar="${app}"}[$__interval])')).toBe(
+      'sum_over_time(__V_1__metric_var__V__{bar="__V_2__app__V__"}[__V_0____interval__V__])'
+    );
+  });
+});
+
+describe('getString', () => {
+  it('should return correct string representation of the node', () => {
+    const expr = 'sum_over_time(foo{bar="baz"}[5m])';
+    const tree = parser.parse(expr);
+    const child = getLeftMostChild(tree.topNode);
+    expect(getString(expr, child)).toBe('sum_over_time');
+  });
+
+  it('should return string with correct variables', () => {
+    const expr = 'sum_over_time(__V_1__metric_var__V__{bar="__V_2__app__V__"}[__V_0____interval__V__])';
+    const tree = parser.parse(expr);
+    expect(getString(expr, tree.topNode)).toBe('sum_over_time([[metric_var]]{bar="${app}"}[$__interval])');
+  });
+
+  it('is symmetrical with replaceVariables', () => {
+    const expr = 'sum_over_time([[metric_var]]{bar="${app}"}[$__interval])';
+    const replaced = replaceVariables(expr);
+    const tree = parser.parse(replaced);
+    expect(getString(replaced, tree.topNode)).toBe(expr);
+  });
+});
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/parsingUtils.ts b/public/app/plugins/datasource/prometheus/querybuilder/parsingUtils.ts
new file mode 100644
index 0000000000000..10be8692ebc6b
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/querybuilder/parsingUtils.ts
@@ -0,0 +1,140 @@
+import { SyntaxNode, TreeCursor } from '@lezer/common';
+
+import { QueryBuilderOperation, QueryBuilderOperationParamValue } from './shared/types';
+
+// Although 0 isn't explicitly provided in the lezer-promql library as the error node ID, it does appear to be the ID of error nodes within lezer.
+export const ErrorId = 0;
+
+export function getLeftMostChild(cur: SyntaxNode): SyntaxNode {
+  return cur.firstChild ? getLeftMostChild(cur.firstChild) : cur;
+}
+
+export function makeError(expr: string, node: SyntaxNode) {
+  return {
+    text: getString(expr, node),
+    // TODO: this are positions in the string with the replaced variables. Means it cannot be used to show exact
+    //  placement of the error for the user. We need some translation table to positions before the variable
+    //  replace.
+    from: node.from,
+    to: node.to,
+    parentType: node.parent?.name,
+  };
+}
+
+// Taken from template_srv, but copied so to not mess with the regex.index which is manipulated in the service
+/*
+ * This regex matches 3 types of variable reference with an optional format specifier
+ * \$(\w+)                          $var1
+ * \[\[([\s\S]+?)(?::(\w+))?\]\]    [[var2]] or [[var2:fmt2]]
+ * \${(\w+)(?::(\w+))?}             ${var3} or ${var3:fmt3}
+ */
+const variableRegex = /\$(\w+)|\[\[([\s\S]+?)(?::(\w+))?\]\]|\${(\w+)(?:\.([^:^\}]+))?(?::([^\}]+))?}/g;
+
+/**
+ * As variables with $ are creating parsing errors, we first replace them with magic string that is parsable and at
+ * the same time we can get the variable and its format back from it.
+ * @param expr
+ */
+export function replaceVariables(expr: string) {
+  return expr.replace(variableRegex, (match, var1, var2, fmt2, var3, fieldPath, fmt3) => {
+    const fmt = fmt2 || fmt3;
+    let variable = var1;
+    let varType = '0';
+
+    if (var2) {
+      variable = var2;
+      varType = '1';
+    }
+
+    if (var3) {
+      variable = var3;
+      varType = '2';
+    }
+
+    return `__V_${varType}__` + variable + '__V__' + (fmt ? '__F__' + fmt + '__F__' : '');
+  });
+}
+
+const varTypeFunc = [
+  (v: string, f?: string) => `\$${v}`,
+  (v: string, f?: string) => `[[${v}${f ? `:${f}` : ''}]]`,
+  (v: string, f?: string) => `\$\{${v}${f ? `:${f}` : ''}\}`,
+];
+
+/**
+ * Get back the text with variables in their original format.
+ * @param expr
+ */
+export function returnVariables(expr: string) {
+  return expr.replace(/__V_(\d)__(.+?)__V__(?:__F__(\w+)__F__)?/g, (match, type, v, f) => {
+    return varTypeFunc[parseInt(type, 10)](v, f);
+  });
+}
+
+/**
+ * Get the actual string of the expression. That is not stored in the tree so we have to get the indexes from the node
+ * and then based on that get it from the expression.
+ * @param expr
+ * @param node
+ */
+export function getString(expr: string, node: SyntaxNode | TreeCursor | null | undefined) {
+  if (!node) {
+    return '';
+  }
+  return returnVariables(expr.substring(node.from, node.to));
+}
+
+/**
+ * Create simple scalar binary op object.
+ * @param opDef - definition of the op to be created
+ * @param expr
+ * @param numberNode - the node for the scalar
+ * @param hasBool - whether operation has a bool modifier. Is used only for ops for which it makes sense.
+ */
+export function makeBinOp(
+  opDef: { id: string; comparison?: boolean },
+  expr: string,
+  numberNode: SyntaxNode,
+  hasBool: boolean
+): QueryBuilderOperation {
+  const params: QueryBuilderOperationParamValue[] = [parseFloat(getString(expr, numberNode))];
+  if (opDef.comparison) {
+    params.push(hasBool);
+  }
+  return {
+    id: opDef.id,
+    params,
+  };
+}
+
+/**
+ * Get all nodes with type in the tree. This traverses the tree so it is safe only when you know there shouldn't be
+ * too much nesting but you just want to skip some of the wrappers. For example getting function args this way would
+ * not be safe is it would also find arguments of nested functions.
+ * @param expr
+ * @param cur
+ * @param type - can be string or number, some data-sources (loki) haven't migrated over to using numeric constants defined in the lezer parsing library (e.g. lezer-promql).
+ * @todo Remove string type definition when all data-sources have migrated to numeric constants
+ */
+export function getAllByType(expr: string, cur: SyntaxNode, type: number | string): string[] {
+  if (cur.type.id === type || cur.name === type) {
+    return [getString(expr, cur)];
+  }
+  const values: string[] = [];
+  let pos = 0;
+  let child = cur.childAfter(pos);
+  while (child) {
+    values.push(...getAllByType(expr, child, type));
+    pos = child.to;
+    child = cur.childAfter(pos);
+  }
+  return values;
+}
+
+/**
+ * There aren't any spaces in the metric names, so let's introduce a wildcard into the regex for each space to better facilitate a fuzzy search
+ */
+export const regexifyLabelValuesQueryString = (query: string) => {
+  const queryArray = query.split(' ');
+  return queryArray.map((query) => `${query}.*`).join('');
+};
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/LabelFilterItem.tsx b/public/app/plugins/datasource/prometheus/querybuilder/shared/LabelFilterItem.tsx
index cdd1f7cad000f..dc657f4df0af4 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/shared/LabelFilterItem.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/shared/LabelFilterItem.tsx
@@ -7,7 +7,8 @@ import { AccessoryButton, InputGroup } from '@grafana/experimental';
 import { InlineField, Select } from '@grafana/ui';
 import { lokiOperators } from 'app/plugins/datasource/loki/querybuilder/types';
 
-import { isConflictingSelector } from './operationUtils';
+import { isConflictingSelector } from '../operationUtils';
+
 import { QueryBuilderLabelFilter } from './types';
 
 export interface Props {
@@ -76,7 +77,7 @@ export function LabelFilterItem({
         <InputGroup>
           <Select
             placeholder="Select label"
-            aria-label={selectors.components.QueryBuilder.labelSelect}
+            data-testid={selectors.components.QueryBuilder.labelSelect}
             inputId="prometheus-dimensions-filter-item-key"
             width="auto"
             value={item.label ? toOption(item.label) : null}
@@ -106,7 +107,7 @@ export function LabelFilterItem({
           />
 
           <Select
-            aria-label={selectors.components.QueryBuilder.matchOperatorSelect}
+            data-testid={selectors.components.QueryBuilder.matchOperatorSelect}
             value={toOption(item.op ?? defaultOp)}
             options={operators}
             width="auto"
@@ -124,7 +125,7 @@ export function LabelFilterItem({
 
           <Select
             placeholder="Select value"
-            aria-label={selectors.components.QueryBuilder.valueSelect}
+            data-testid={selectors.components.QueryBuilder.valueSelect}
             inputId="prometheus-dimensions-filter-item-value"
             width="auto"
             value={
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationEditor.tsx b/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationEditor.tsx
index 1b3370b679cd4..36c6f213c48e5 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationEditor.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationEditor.tsx
@@ -2,15 +2,15 @@ import { css, cx } from '@emotion/css';
 import React, { useEffect, useId, useState } from 'react';
 import { Draggable } from 'react-beautiful-dnd';
 
-import { DataSourceApi, GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Button, Icon, InlineField, Tooltip, useTheme2 } from '@grafana/ui';
+import { DataSourceApi, GrafanaTheme2, TimeRange } from '@grafana/data';
+import { Button, Icon, InlineField, Tooltip, useTheme2, Stack } from '@grafana/ui';
 import { isConflictingFilter } from 'app/plugins/datasource/loki/querybuilder/operationUtils';
 import { LokiOperationId } from 'app/plugins/datasource/loki/querybuilder/types';
 
+import { getOperationParamId } from '../operationUtils';
+
 import { OperationHeader } from './OperationHeader';
 import { getOperationParamEditor } from './OperationParamEditor';
-import { getOperationParamId } from './operationUtils';
 import {
   QueryBuilderOperation,
   QueryBuilderOperationDef,
@@ -30,6 +30,7 @@ export interface Props {
   onRunQuery: () => void;
   flash?: boolean;
   highlight?: boolean;
+  timeRange?: TimeRange;
 }
 
 export function OperationEditor({
@@ -43,6 +44,7 @@ export function OperationEditor({
   datasource,
   flash,
   highlight,
+  timeRange,
 }: Props) {
   const def = queryModeller.getOperationDef(operation.id);
   const shouldFlash = useFlash(flash);
@@ -96,7 +98,7 @@ export function OperationEditor({
           </div>
         )}
         <div className={styles.paramValue}>
-          <Stack gap={0.5} direction="row" alignItems="center" wrap={false}>
+          <Stack gap={0.5} direction="row" alignItems="center">
             <Editor
               index={paramIndex}
               paramDef={paramDef}
@@ -107,6 +109,7 @@ export function OperationEditor({
               onRunQuery={onRunQuery}
               query={query}
               datasource={datasource}
+              timeRange={timeRange}
             />
             {paramDef.restParam && (operation.params.length > def.params.length || paramDef.optional) && (
               <Button
@@ -219,7 +222,7 @@ function renderAddRestParamButton(
       <Button
         size="sm"
         icon="plus"
-        title={`Add ${paramDef.name}`}
+        title={`Add ${paramDef.name}`.trimEnd()}
         variant="secondary"
         onClick={onAddRestParam}
         data-testid={`operations.${operationIndex}.add-rest-param`}
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationInfoButton.tsx b/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationInfoButton.tsx
index 4e5bc80065a19..e98b431459a26 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationInfoButton.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationInfoButton.tsx
@@ -1,6 +1,15 @@
 import { css } from '@emotion/css';
+import {
+  autoUpdate,
+  flip,
+  offset,
+  shift,
+  useClick,
+  useDismiss,
+  useFloating,
+  useInteractions,
+} from '@floating-ui/react';
 import React, { useState } from 'react';
-import { usePopperTooltip } from 'react-popper-tooltip';
 
 import { GrafanaTheme2, renderMarkdown } from '@grafana/data';
 import { FlexItem } from '@grafana/experimental';
@@ -16,28 +25,46 @@ export interface Props {
 export const OperationInfoButton = React.memo<Props>(({ def, operation }) => {
   const styles = useStyles2(getStyles);
   const [show, setShow] = useState(false);
-  const { getTooltipProps, setTooltipRef, setTriggerRef, visible } = usePopperTooltip({
+
+  // the order of middleware is important!
+  const middleware = [
+    offset(16),
+    flip({
+      fallbackAxisSideDirection: 'end',
+      // see https://floating-ui.com/docs/flip#combining-with-shift
+      crossAxis: false,
+      boundary: document.body,
+    }),
+    shift(),
+  ];
+
+  const { context, refs, floatingStyles } = useFloating({
+    open: show,
     placement: 'top',
-    visible: show,
-    offset: [0, 16],
-    onVisibleChange: setShow,
-    interactive: true,
-    trigger: ['click'],
+    onOpenChange: setShow,
+    middleware,
+    whileElementsMounted: autoUpdate,
   });
 
+  const click = useClick(context);
+  const dismiss = useDismiss(context);
+
+  const { getReferenceProps, getFloatingProps } = useInteractions([dismiss, click]);
+
   return (
     <>
       <Button
         title="Click to show description"
-        ref={setTriggerRef}
+        ref={refs.setReference}
         icon="info-circle"
         size="sm"
         variant="secondary"
         fill="text"
+        {...getReferenceProps()}
       />
-      {visible && (
+      {show && (
         <Portal>
-          <div ref={setTooltipRef} {...getTooltipProps()} className={styles.docBox}>
+          <div ref={refs.setFloating} style={floatingStyles} {...getFloatingProps()} className={styles.docBox}>
             <div className={styles.docBoxHeader}>
               <span>{def.renderer(operation, def, '<expr>')}</span>
               <FlexItem grow={1} />
@@ -86,14 +113,6 @@ const getStyles = (theme: GrafanaTheme2) => {
       marginBottom: theme.spacing(-1),
       color: theme.colors.text.secondary,
     }),
-    signature: css({
-      fontSize: theme.typography.bodySmall.fontSize,
-      fontFamily: theme.typography.fontFamilyMonospace,
-    }),
-    dropdown: css({
-      opacity: 0,
-      color: theme.colors.text.secondary,
-    }),
   };
 };
 function getOperationDocs(def: QueryBuilderOperationDef, op: QueryBuilderOperation): string {
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationList.test.tsx b/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationList.test.tsx
index 3480d76b86964..02d95b87236b3 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationList.test.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationList.test.tsx
@@ -9,10 +9,10 @@ import PromQlLanguageProvider from '../../language_provider';
 import { EmptyLanguageProviderMock } from '../../language_provider.mock';
 import { PromOptions } from '../../types';
 import { promQueryModeller } from '../PromQueryModeller';
+import { addOperationInQueryBuilder } from '../testUtils';
 import { PromVisualQuery } from '../types';
 
 import { OperationList } from './OperationList';
-import { addOperation } from './OperationList.testUtils';
 
 const defaultQuery: PromVisualQuery = {
   metric: 'random_metric',
@@ -50,7 +50,7 @@ describe('OperationList', () => {
 
   it('adds an operation', async () => {
     const { onChange } = setup();
-    await addOperation('Aggregations', 'Min');
+    await addOperationInQueryBuilder('Aggregations', 'Min');
     expect(onChange).toBeCalledWith({
       labels: [{ label: 'instance', op: '=', value: 'localhost:9090' }],
       metric: 'random_metric',
@@ -73,7 +73,6 @@ function setup(query: PromVisualQuery = defaultQuery) {
         meta: {},
       } as DataSourceInstanceSettings<PromOptions>,
       undefined,
-      undefined,
       languageProvider
     ) as DataSourceApi,
     onRunQuery: () => {},
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationList.testUtils.ts b/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationList.testUtils.ts
deleted file mode 100644
index c0e2a6b93b222..0000000000000
--- a/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationList.testUtils.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-
-export async function addOperation(section: string, op: string) {
-  const addOperationButton = screen.getByTitle('Add operation');
-  expect(addOperationButton).toBeInTheDocument();
-  await userEvent.click(addOperationButton);
-  const sectionItem = await screen.findByTitle(section);
-  expect(sectionItem).toBeInTheDocument();
-  // Weirdly the await userEvent.click doesn't work here, it reports the item has pointer-events: none. Don't see that
-  // anywhere when debugging so not sure what style is it picking up.
-  await userEvent.click(sectionItem.children[0], { pointerEventsCheck: 0 });
-  const opItem = screen.getByTitle(op);
-  expect(opItem).toBeInTheDocument();
-  // Weirdly the await userEvent.click doesn't work here, it reports the item has pointer-events: none. Don't see that
-  // anywhere when debugging so not sure what style is it picking up.
-  await userEvent.click(opItem, { pointerEventsCheck: 0 });
-}
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationList.tsx b/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationList.tsx
index 2bec1adbebe27..6e104e2675fcd 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationList.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationList.tsx
@@ -3,9 +3,8 @@ import React, { useState } from 'react';
 import { DragDropContext, Droppable, DropResult } from 'react-beautiful-dnd';
 import { useMountedState, usePrevious } from 'react-use';
 
-import { DataSourceApi, GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Button, Cascader, CascaderOption, useStyles2 } from '@grafana/ui';
+import { DataSourceApi, GrafanaTheme2, TimeRange } from '@grafana/data';
+import { Button, Cascader, CascaderOption, useStyles2, Stack } from '@grafana/ui';
 
 import { OperationEditor } from './OperationEditor';
 import { QueryBuilderOperation, QueryWithOperations, VisualQueryModeller } from './types';
@@ -18,6 +17,7 @@ export interface Props<T extends QueryWithOperations> {
   queryModeller: VisualQueryModeller;
   explainMode?: boolean;
   highlightedOp?: QueryBuilderOperation;
+  timeRange?: TimeRange;
 }
 
 export function OperationList<T extends QueryWithOperations>({
@@ -27,6 +27,7 @@ export function OperationList<T extends QueryWithOperations>({
   onChange,
   onRunQuery,
   highlightedOp,
+  timeRange,
 }: Props<T>) {
   const styles = useStyles2(getStyles);
   const { operations } = query;
@@ -105,6 +106,7 @@ export function OperationList<T extends QueryWithOperations>({
                         onRunQuery={onRunQuery}
                         flash={opsToHighlight[index]}
                         highlight={highlightedOp === op}
+                        timeRange={timeRange}
                       />
                     );
                   })}
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationParamEditor.tsx b/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationParamEditor.tsx
index 0a30ea0bff105..498f5e439bd0d 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationParamEditor.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationParamEditor.tsx
@@ -2,13 +2,11 @@ import { css } from '@emotion/css';
 import React, { ComponentType } from 'react';
 
 import { GrafanaTheme2, SelectableValue, toOption } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { AutoSizeInput, Button, Checkbox, Select, useStyles2 } from '@grafana/ui';
+import { AutoSizeInput, Button, Checkbox, Select, useStyles2, Stack } from '@grafana/ui';
 
+import { getOperationParamId } from '../operationUtils';
 import { QueryBuilderOperationParamDef, QueryBuilderOperationParamEditorProps } from '../shared/types';
 
-import { getOperationParamId } from './operationUtils';
-
 export function getOperationParamEditor(
   paramDef: QueryBuilderOperationParamDef
 ): ComponentType<QueryBuilderOperationParamEditorProps> {
@@ -97,7 +95,7 @@ function SelectInputParamEditor({
   }
 
   return (
-    <Stack gap={0.5} direction="row" alignItems="center" wrap={false}>
+    <Stack gap={0.5} direction="row" alignItems="center">
       <Select
         id={getOperationParamId(operationId, index)}
         value={valueOption}
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationsEditorRow.tsx b/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationsEditorRow.tsx
index 5493968f3ed7f..00ebc654f068e 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationsEditorRow.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationsEditorRow.tsx
@@ -2,8 +2,7 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { useStyles2 } from '@grafana/ui';
+import { useStyles2, Stack } from '@grafana/ui';
 
 interface Props {
   children: React.ReactNode;
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/QueryHeaderSwitch.tsx b/public/app/plugins/datasource/prometheus/querybuilder/shared/QueryHeaderSwitch.tsx
index 8e591e27c6c5b..b7088bb3f8b7d 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/shared/QueryHeaderSwitch.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/shared/QueryHeaderSwitch.tsx
@@ -3,8 +3,7 @@ import { uniqueId } from 'lodash';
 import React, { HTMLProps, useRef } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Switch, useStyles2 } from '@grafana/ui';
+import { Switch, useStyles2, Stack } from '@grafana/ui';
 
 export interface Props extends Omit<HTMLProps<HTMLInputElement>, 'value' | 'ref'> {
   value?: boolean;
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/QueryOptionGroup.tsx b/public/app/plugins/datasource/prometheus/querybuilder/shared/QueryOptionGroup.tsx
index 4963de23d99ce..1f3b089dfb58b 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/shared/QueryOptionGroup.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/shared/QueryOptionGroup.tsx
@@ -3,9 +3,8 @@ import React from 'react';
 import { useToggle } from 'react-use';
 
 import { getValueFormat, GrafanaTheme2 } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
 import { config } from '@grafana/runtime';
-import { Collapse, Icon, Tooltip, useStyles2 } from '@grafana/ui';
+import { Collapse, Icon, Tooltip, useStyles2, Stack } from '@grafana/ui';
 import { QueryStats } from 'app/plugins/datasource/loki/types';
 
 export interface Props {
@@ -27,7 +26,7 @@ export function QueryOptionGroup({ title, children, collapsedInfo, queryStats }:
         isOpen={isOpen}
         onToggle={toggleOpen}
         label={
-          <Stack gap={0} wrap={false}>
+          <Stack gap={0}>
             <h6 className={styles.title}>{title}</h6>
             {!isOpen && (
               <div className={styles.description}>
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/hooks/useFlag.test.ts b/public/app/plugins/datasource/prometheus/querybuilder/shared/hooks/useFlag.test.ts
deleted file mode 100644
index 4c2ada605b278..0000000000000
--- a/public/app/plugins/datasource/prometheus/querybuilder/shared/hooks/useFlag.test.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { act, renderHook } from '@testing-library/react';
-
-import { lokiQueryEditorExplainKey, promQueryEditorExplainKey, useFlag } from './useFlag';
-
-describe('useFlag Hook', () => {
-  beforeEach(() => {
-    window.localStorage.removeItem(lokiQueryEditorExplainKey);
-    window.localStorage.removeItem(promQueryEditorExplainKey);
-  });
-
-  it('should return the default flag value as false', () => {
-    const { result } = renderHook(() => useFlag(promQueryEditorExplainKey));
-    expect(result.current.flag).toBe(false);
-  });
-
-  it('should update the flag value without error', () => {
-    const { result } = renderHook(() => useFlag(promQueryEditorExplainKey, true));
-    expect(result.current.flag).toBe(true);
-    act(() => {
-      result.current.setFlag(false);
-    });
-    expect(result.current.flag).toBe(false);
-  });
-
-  it('should update different flags at once without conflict', () => {
-    const { result } = renderHook(() => useFlag(promQueryEditorExplainKey, false));
-    expect(result.current.flag).toBe(false);
-    act(() => {
-      result.current.setFlag(true);
-    });
-    expect(result.current.flag).toBe(true);
-
-    const { result: result2 } = renderHook(() => useFlag(lokiQueryEditorExplainKey, false));
-    expect(result.current.flag).toBe(true);
-    expect(result2.current.flag).toBe(false);
-  });
-});
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/hooks/useFlag.ts b/public/app/plugins/datasource/prometheus/querybuilder/shared/hooks/useFlag.ts
deleted file mode 100644
index fe0630a70c30a..0000000000000
--- a/public/app/plugins/datasource/prometheus/querybuilder/shared/hooks/useFlag.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { useCallback, useState } from 'react';
-
-import store from '../../../../../../core/store';
-
-export const promQueryEditorExplainKey = 'PrometheusQueryEditorExplainDefault';
-export const promQueryEditorRawQueryKey = 'PrometheusQueryEditorRawQueryDefault';
-export const lokiQueryEditorExplainKey = 'LokiQueryEditorExplainDefault';
-export const lokiQueryEditorRawQueryKey = 'LokiQueryEditorRawQueryDefault';
-
-export type QueryEditorFlags =
-  | typeof promQueryEditorExplainKey
-  | typeof promQueryEditorRawQueryKey
-  | typeof lokiQueryEditorExplainKey
-  | typeof lokiQueryEditorRawQueryKey;
-
-function getFlagValue(key: QueryEditorFlags, defaultValue = false): boolean {
-  const val = store.get(key);
-  return val === undefined ? defaultValue : Boolean(parseInt(val, 10));
-}
-
-function setFlagValue(key: QueryEditorFlags, value: boolean) {
-  store.set(key, value ? '1' : '0');
-}
-
-type UseFlagHookReturnType = { flag: boolean; setFlag: (val: boolean) => void };
-
-/**
- *
- * Use and store value of explain/rawquery switch in local storage.
- * Needs to be a hook with local state to trigger re-renders.
- */
-export function useFlag(key: QueryEditorFlags, defaultValue = false): UseFlagHookReturnType {
-  const [flag, updateFlag] = useState(getFlagValue(key, defaultValue));
-  const setter = useCallback(
-    (value: boolean) => {
-      setFlagValue(key, value);
-      updateFlag(value);
-    },
-    [key]
-  );
-
-  return { flag, setFlag: setter };
-}
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/operationUtils.ts b/public/app/plugins/datasource/prometheus/querybuilder/shared/operationUtils.ts
deleted file mode 100644
index eb09cb9889674..0000000000000
--- a/public/app/plugins/datasource/prometheus/querybuilder/shared/operationUtils.ts
+++ /dev/null
@@ -1,355 +0,0 @@
-import { capitalize } from 'lodash';
-import pluralize from 'pluralize';
-
-import { SelectableValue } from '@grafana/data/src';
-
-import { LabelParamEditor } from '../components/LabelParamEditor';
-import { PromVisualQueryOperationCategory } from '../types';
-
-import {
-  QueryBuilderLabelFilter,
-  QueryBuilderOperation,
-  QueryBuilderOperationDef,
-  QueryBuilderOperationParamDef,
-  QueryBuilderOperationParamValue,
-  QueryWithOperations,
-} from './types';
-
-export function functionRendererLeft(model: QueryBuilderOperation, def: QueryBuilderOperationDef, innerExpr: string) {
-  const params = renderParams(model, def, innerExpr);
-  const str = model.id + '(';
-
-  if (innerExpr) {
-    params.push(innerExpr);
-  }
-
-  return str + params.join(', ') + ')';
-}
-
-export function functionRendererRight(model: QueryBuilderOperation, def: QueryBuilderOperationDef, innerExpr: string) {
-  const params = renderParams(model, def, innerExpr);
-  const str = model.id + '(';
-
-  if (innerExpr) {
-    params.unshift(innerExpr);
-  }
-
-  return str + params.join(', ') + ')';
-}
-
-function rangeRendererWithParams(
-  model: QueryBuilderOperation,
-  def: QueryBuilderOperationDef,
-  innerExpr: string,
-  renderLeft: boolean
-) {
-  if (def.params.length < 2) {
-    throw `Cannot render a function with params of length [${def.params.length}]`;
-  }
-
-  let rangeVector = (model.params ?? [])[0] ?? '5m';
-
-  // Next frame the remaining parameters, but get rid of the first one because it's used to move the
-  // instant vector into a range vector.
-  const params = renderParams(
-    {
-      ...model,
-      params: model.params.slice(1),
-    },
-    {
-      ...def,
-      params: def.params.slice(1),
-      defaultParams: def.defaultParams.slice(1),
-    },
-    innerExpr
-  );
-
-  const str = model.id + '(';
-
-  // Depending on the renderLeft variable, render parameters to the left or right
-  // renderLeft === true (renderLeft) => (param1, param2, rangeVector[...])
-  // renderLeft === false (renderRight) => (rangeVector[...], param1, param2)
-  if (innerExpr) {
-    renderLeft ? params.push(`${innerExpr}[${rangeVector}]`) : params.unshift(`${innerExpr}[${rangeVector}]`);
-  }
-
-  // stick everything together
-  return str + params.join(', ') + ')';
-}
-
-export function rangeRendererRightWithParams(
-  model: QueryBuilderOperation,
-  def: QueryBuilderOperationDef,
-  innerExpr: string
-) {
-  return rangeRendererWithParams(model, def, innerExpr, false);
-}
-
-export function rangeRendererLeftWithParams(
-  model: QueryBuilderOperation,
-  def: QueryBuilderOperationDef,
-  innerExpr: string
-) {
-  return rangeRendererWithParams(model, def, innerExpr, true);
-}
-
-function renderParams(model: QueryBuilderOperation, def: QueryBuilderOperationDef, innerExpr: string) {
-  return (model.params ?? []).map((value, index) => {
-    const paramDef = def.params[index];
-    if (paramDef.type === 'string') {
-      return '"' + value + '"';
-    }
-
-    return value;
-  });
-}
-
-export function defaultAddOperationHandler<T extends QueryWithOperations>(def: QueryBuilderOperationDef, query: T) {
-  const newOperation: QueryBuilderOperation = {
-    id: def.id,
-    params: def.defaultParams,
-  };
-
-  return {
-    ...query,
-    operations: [...query.operations, newOperation],
-  };
-}
-
-export function getPromAndLokiOperationDisplayName(funcName: string) {
-  return capitalize(funcName.replace(/_/g, ' '));
-}
-
-export function getOperationParamId(operationId: string, paramIndex: number) {
-  return `operations.${operationId}.param.${paramIndex}`;
-}
-
-export function getRangeVectorParamDef(withRateInterval = false): QueryBuilderOperationParamDef {
-  const param: QueryBuilderOperationParamDef = {
-    name: 'Range',
-    type: 'string',
-    options: [
-      {
-        label: '$__interval',
-        value: '$__interval',
-        // tooltip: 'Dynamic interval based on max data points, scrape and min interval',
-      },
-      { label: '1m', value: '1m' },
-      { label: '5m', value: '5m' },
-      { label: '10m', value: '10m' },
-      { label: '1h', value: '1h' },
-      { label: '24h', value: '24h' },
-    ],
-  };
-
-  if (withRateInterval) {
-    (param.options as Array<SelectableValue<string>>).unshift({
-      label: '$__rate_interval',
-      value: '$__rate_interval',
-      // tooltip: 'Always above 4x scrape interval',
-    });
-  }
-
-  return param;
-}
-
-/**
- * This function is shared between Prometheus and Loki variants
- */
-export function createAggregationOperation<T extends QueryWithOperations>(
-  name: string,
-  overrides: Partial<QueryBuilderOperationDef> = {}
-): QueryBuilderOperationDef[] {
-  const operations: QueryBuilderOperationDef[] = [
-    {
-      id: name,
-      name: getPromAndLokiOperationDisplayName(name),
-      params: [
-        {
-          name: 'By label',
-          type: 'string',
-          restParam: true,
-          optional: true,
-        },
-      ],
-      defaultParams: [],
-      alternativesKey: 'plain aggregations',
-      category: PromVisualQueryOperationCategory.Aggregations,
-      renderer: functionRendererLeft,
-      paramChangedHandler: getOnLabelAddedHandler(`__${name}_by`),
-      explainHandler: getAggregationExplainer(name, ''),
-      addOperationHandler: defaultAddOperationHandler,
-      ...overrides,
-    },
-    {
-      id: `__${name}_by`,
-      name: `${getPromAndLokiOperationDisplayName(name)} by`,
-      params: [
-        {
-          name: 'Label',
-          type: 'string',
-          restParam: true,
-          optional: true,
-          editor: LabelParamEditor,
-        },
-      ],
-      defaultParams: [''],
-      alternativesKey: 'aggregations by',
-      category: PromVisualQueryOperationCategory.Aggregations,
-      renderer: getAggregationByRenderer(name),
-      paramChangedHandler: getLastLabelRemovedHandler(name),
-      explainHandler: getAggregationExplainer(name, 'by'),
-      addOperationHandler: defaultAddOperationHandler,
-      hideFromList: true,
-      ...overrides,
-    },
-    {
-      id: `__${name}_without`,
-      name: `${getPromAndLokiOperationDisplayName(name)} without`,
-      params: [
-        {
-          name: 'Label',
-          type: 'string',
-          restParam: true,
-          optional: true,
-          editor: LabelParamEditor,
-        },
-      ],
-      defaultParams: [''],
-      alternativesKey: 'aggregations by',
-      category: PromVisualQueryOperationCategory.Aggregations,
-      renderer: getAggregationWithoutRenderer(name),
-      paramChangedHandler: getLastLabelRemovedHandler(name),
-      explainHandler: getAggregationExplainer(name, 'without'),
-      addOperationHandler: defaultAddOperationHandler,
-      hideFromList: true,
-      ...overrides,
-    },
-  ];
-
-  return operations;
-}
-
-export function createAggregationOperationWithParam(
-  name: string,
-  paramsDef: { params: QueryBuilderOperationParamDef[]; defaultParams: QueryBuilderOperationParamValue[] },
-  overrides: Partial<QueryBuilderOperationDef> = {}
-): QueryBuilderOperationDef[] {
-  const operations = createAggregationOperation(name, overrides);
-  operations[0].params.unshift(...paramsDef.params);
-  operations[1].params.unshift(...paramsDef.params);
-  operations[2].params.unshift(...paramsDef.params);
-  operations[0].defaultParams = paramsDef.defaultParams;
-  operations[1].defaultParams = [...paramsDef.defaultParams, ''];
-  operations[2].defaultParams = [...paramsDef.defaultParams, ''];
-  operations[1].renderer = getAggregationByRendererWithParameter(name);
-  operations[2].renderer = getAggregationByRendererWithParameter(name);
-  return operations;
-}
-
-function getAggregationByRenderer(aggregation: string) {
-  return function aggregationRenderer(model: QueryBuilderOperation, def: QueryBuilderOperationDef, innerExpr: string) {
-    return `${aggregation} by(${model.params.join(', ')}) (${innerExpr})`;
-  };
-}
-
-function getAggregationWithoutRenderer(aggregation: string) {
-  return function aggregationRenderer(model: QueryBuilderOperation, def: QueryBuilderOperationDef, innerExpr: string) {
-    return `${aggregation} without(${model.params.join(', ')}) (${innerExpr})`;
-  };
-}
-
-/**
- * Very simple poc implementation, needs to be modified to support all aggregation operators
- */
-export function getAggregationExplainer(aggregationName: string, mode: 'by' | 'without' | '') {
-  return function aggregationExplainer(model: QueryBuilderOperation) {
-    const labels = model.params.map((label) => `\`${label}\``).join(' and ');
-    const labelWord = pluralize('label', model.params.length);
-
-    switch (mode) {
-      case 'by':
-        return `Calculates ${aggregationName} over dimensions while preserving ${labelWord} ${labels}.`;
-      case 'without':
-        return `Calculates ${aggregationName} over the dimensions ${labels}. All other labels are preserved.`;
-      default:
-        return `Calculates ${aggregationName} over the dimensions.`;
-    }
-  };
-}
-
-function getAggregationByRendererWithParameter(aggregation: string) {
-  return function aggregationRenderer(model: QueryBuilderOperation, def: QueryBuilderOperationDef, innerExpr: string) {
-    const restParamIndex = def.params.findIndex((param) => param.restParam);
-    const params = model.params.slice(0, restParamIndex);
-    const restParams = model.params.slice(restParamIndex);
-
-    return `${aggregation} by(${restParams.join(', ')}) (${params
-      .map((param, idx) => (def.params[idx].type === 'string' ? `\"${param}\"` : param))
-      .join(', ')}, ${innerExpr})`;
-  };
-}
-
-/**
- * This function will transform operations without labels to their plan aggregation operation
- */
-export function getLastLabelRemovedHandler(changeToOperationId: string) {
-  return function onParamChanged(index: number, op: QueryBuilderOperation, def: QueryBuilderOperationDef) {
-    // If definition has more params then is defined there are no optional rest params anymore.
-    // We then transform this operation into a different one
-    if (op.params.length < def.params.length) {
-      return {
-        ...op,
-        id: changeToOperationId,
-      };
-    }
-
-    return op;
-  };
-}
-
-export function getOnLabelAddedHandler(changeToOperationId: string) {
-  return function onParamChanged(index: number, op: QueryBuilderOperation, def: QueryBuilderOperationDef) {
-    // Check if we actually have the label param. As it's optional the aggregation can have one less, which is the
-    // case of just simple aggregation without label. When user adds the label it now has the same number of params
-    // as its definition, and now we can change it to its `_by` variant.
-    if (op.params.length === def.params.length) {
-      return {
-        ...op,
-        id: changeToOperationId,
-      };
-    }
-    return op;
-  };
-}
-
-export function isConflictingSelector(
-  newLabel: Partial<QueryBuilderLabelFilter>,
-  labels: Array<Partial<QueryBuilderLabelFilter>>
-): boolean {
-  if (!newLabel.label || !newLabel.op || !newLabel.value) {
-    return false;
-  }
-
-  if (labels.length < 2) {
-    return false;
-  }
-
-  const operationIsNegative = newLabel.op.toString().startsWith('!');
-
-  const candidates = labels.filter(
-    (label) => label.label === newLabel.label && label.value === newLabel.value && label.op !== newLabel.op
-  );
-
-  const conflict = candidates.some((candidate) => {
-    if (operationIsNegative && candidate?.op?.toString().startsWith('!') === false) {
-      return true;
-    }
-    if (operationIsNegative === false && candidate?.op?.toString().startsWith('!')) {
-      return true;
-    }
-    return false;
-  });
-
-  return conflict;
-}
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/parsingUtils.ts b/public/app/plugins/datasource/prometheus/querybuilder/shared/parsingUtils.ts
deleted file mode 100644
index d0306411e2f1d..0000000000000
--- a/public/app/plugins/datasource/prometheus/querybuilder/shared/parsingUtils.ts
+++ /dev/null
@@ -1,210 +0,0 @@
-import { SyntaxNode, TreeCursor } from '@lezer/common';
-
-import { QueryBuilderOperation, QueryBuilderOperationParamValue } from './types';
-
-// Although 0 isn't explicitly provided in the lezer-promql & @grafana/lezer-logql library as the error node ID, it does appear to be the ID of error nodes within lezer.
-export const ErrorId = 0;
-
-export function getLeftMostChild(cur: SyntaxNode): SyntaxNode {
-  return cur.firstChild ? getLeftMostChild(cur.firstChild) : cur;
-}
-
-export function makeError(expr: string, node: SyntaxNode) {
-  return {
-    text: getString(expr, node),
-    // TODO: this are positions in the string with the replaced variables. Means it cannot be used to show exact
-    //  placement of the error for the user. We need some translation table to positions before the variable
-    //  replace.
-    from: node.from,
-    to: node.to,
-    parentType: node.parent?.name,
-  };
-}
-
-// Taken from template_srv, but copied so to not mess with the regex.index which is manipulated in the service
-/*
- * This regex matches 3 types of variable reference with an optional format specifier
- * \$(\w+)                          $var1
- * \[\[([\s\S]+?)(?::(\w+))?\]\]    [[var2]] or [[var2:fmt2]]
- * \${(\w+)(?::(\w+))?}             ${var3} or ${var3:fmt3}
- */
-const variableRegex = /\$(\w+)|\[\[([\s\S]+?)(?::(\w+))?\]\]|\${(\w+)(?:\.([^:^\}]+))?(?::([^\}]+))?}/g;
-
-/**
- * As variables with $ are creating parsing errors, we first replace them with magic string that is parsable and at
- * the same time we can get the variable and its format back from it.
- * @param expr
- */
-export function replaceVariables(expr: string) {
-  return expr.replace(variableRegex, (match, var1, var2, fmt2, var3, fieldPath, fmt3) => {
-    const fmt = fmt2 || fmt3;
-    let variable = var1;
-    let varType = '0';
-
-    if (var2) {
-      variable = var2;
-      varType = '1';
-    }
-
-    if (var3) {
-      variable = var3;
-      varType = '2';
-    }
-
-    return `__V_${varType}__` + variable + '__V__' + (fmt ? '__F__' + fmt + '__F__' : '');
-  });
-}
-
-const varTypeFunc = [
-  (v: string, f?: string) => `\$${v}`,
-  (v: string, f?: string) => `[[${v}${f ? `:${f}` : ''}]]`,
-  (v: string, f?: string) => `\$\{${v}${f ? `:${f}` : ''}\}`,
-];
-
-/**
- * Get back the text with variables in their original format.
- * @param expr
- */
-export function returnVariables(expr: string) {
-  return expr.replace(/__V_(\d)__(.+?)__V__(?:__F__(\w+)__F__)?/g, (match, type, v, f) => {
-    return varTypeFunc[parseInt(type, 10)](v, f);
-  });
-}
-
-/**
- * Get the actual string of the expression. That is not stored in the tree so we have to get the indexes from the node
- * and then based on that get it from the expression.
- * @param expr
- * @param node
- */
-export function getString(expr: string, node: SyntaxNode | TreeCursor | null | undefined) {
-  if (!node) {
-    return '';
-  }
-  return returnVariables(expr.substring(node.from, node.to));
-}
-
-/**
- * Create simple scalar binary op object.
- * @param opDef - definition of the op to be created
- * @param expr
- * @param numberNode - the node for the scalar
- * @param hasBool - whether operation has a bool modifier. Is used only for ops for which it makes sense.
- */
-export function makeBinOp(
-  opDef: { id: string; comparison?: boolean },
-  expr: string,
-  numberNode: SyntaxNode,
-  hasBool: boolean
-): QueryBuilderOperation {
-  const params: QueryBuilderOperationParamValue[] = [parseFloat(getString(expr, numberNode))];
-  if (opDef.comparison) {
-    params.push(hasBool);
-  }
-  return {
-    id: opDef.id,
-    params,
-  };
-}
-
-/**
- * Get all nodes with type in the tree. This traverses the tree so it is safe only when you know there shouldn't be
- * too much nesting but you just want to skip some of the wrappers. For example getting function args this way would
- * not be safe is it would also find arguments of nested functions.
- * @param expr
- * @param cur
- * @param type - can be string or number, some data-sources (loki) haven't migrated over to using numeric constants defined in the lezer parsing library (e.g. lezer-promql).
- * @todo Remove string type definition when all data-sources have migrated to numeric constants
- */
-export function getAllByType(expr: string, cur: SyntaxNode, type: number | string): string[] {
-  if (cur.type.id === type || cur.name === type) {
-    return [getString(expr, cur)];
-  }
-  const values: string[] = [];
-  let pos = 0;
-  let child = cur.childAfter(pos);
-  while (child) {
-    values.push(...getAllByType(expr, child, type));
-    pos = child.to;
-    child = cur.childAfter(pos);
-  }
-  return values;
-}
-
-// Debugging function for convenience. Gives you nice output similar to linux tree util.
-// @ts-ignore
-export function log(expr: string, cur?: SyntaxNode) {
-  if (!cur) {
-    console.log('<empty>');
-    return;
-  }
-  const json = toJson(expr, cur);
-  const text = jsonToText(json);
-
-  if (!text) {
-    console.log('<empty>');
-    return;
-  }
-  console.log(text);
-}
-
-function toJson(expr: string, cur: SyntaxNode) {
-  const treeJson: any = {};
-  const name = nodeToString(expr, cur);
-  const children = [];
-
-  let pos = 0;
-  let child = cur.childAfter(pos);
-  while (child) {
-    children.push(toJson(expr, child));
-    pos = child.to;
-    child = cur.childAfter(pos);
-  }
-
-  treeJson.name = name;
-  treeJson.children = children;
-  return treeJson;
-}
-
-type JsonNode = {
-  name: string;
-  children: JsonNode[];
-};
-
-function jsonToText(
-  node: JsonNode,
-  context: { lastChild: boolean; indent: string } = {
-    lastChild: true,
-    indent: '',
-  }
-) {
-  const name = node.name;
-  const { lastChild, indent } = context;
-  const newIndent = indent !== '' ? indent + (lastChild ? '└─' : '├─') : '';
-  let text = newIndent + name;
-
-  const children = node.children;
-  children.forEach((child, index) => {
-    const isLastChild = index === children.length - 1;
-    text +=
-      '\n' +
-      jsonToText(child, {
-        lastChild: isLastChild,
-        indent: indent + (lastChild ? '  ' : '│ '),
-      });
-  });
-
-  return text;
-}
-
-function nodeToString(expr: string, node: SyntaxNode) {
-  return node.name + ': ' + getString(expr, node);
-}
-
-/**
- * There aren't any spaces in the metric names, so let's introduce a wildcard into the regex for each space to better facilitate a fuzzy search
- */
-export const regexifyLabelValuesQueryString = (query: string) => {
-  const queryArray = query.split(' ');
-  return queryArray.map((query) => `${query}.*`).join('');
-};
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/types.ts b/public/app/plugins/datasource/prometheus/querybuilder/shared/types.ts
index 7655a6fb27954..e0df629a71c58 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/shared/types.ts
+++ b/public/app/plugins/datasource/prometheus/querybuilder/shared/types.ts
@@ -4,7 +4,7 @@
 
 import { ComponentType } from 'react';
 
-import { DataSourceApi, RegistryItem, SelectableValue } from '@grafana/data';
+import { DataSourceApi, RegistryItem, SelectableValue, TimeRange } from '@grafana/data';
 
 export interface QueryBuilderLabelFilter {
   label: string;
@@ -92,6 +92,7 @@ export interface QueryBuilderOperationParamEditorProps {
   operationId: string;
   query: any;
   datasource: DataSourceApi;
+  timeRange?: TimeRange;
   onChange: (index: number, value: QueryBuilderOperationParamValue) => void;
   onRunQuery: () => void;
 }
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/testUtils.ts b/public/app/plugins/datasource/prometheus/querybuilder/testUtils.ts
index c27db4f68ff40..33a4181b3d650 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/testUtils.ts
+++ b/public/app/plugins/datasource/prometheus/querybuilder/testUtils.ts
@@ -1,4 +1,5 @@
 import { screen, getAllByRole } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 
 export function getLabelSelects(index = 0) {
   const labels = screen.getByText(/Label filters/);
@@ -8,3 +9,19 @@ export function getLabelSelects(index = 0) {
     value: selects[3 * index + 2],
   };
 }
+
+export async function addOperationInQueryBuilder(section: string, op: string) {
+  const addOperationButton = screen.getByTitle('Add operation');
+  expect(addOperationButton).toBeInTheDocument();
+  await userEvent.click(addOperationButton);
+  const sectionItem = await screen.findByTitle(section);
+  expect(sectionItem).toBeInTheDocument();
+  // Weirdly the await userEvent.click doesn't work here, it reports the item has pointer-events: none. Don't see that
+  // anywhere when debugging so not sure what style is it picking up.
+  await userEvent.click(sectionItem.children[0], { pointerEventsCheck: 0 });
+  const opItem = screen.getByTitle(op);
+  expect(opItem).toBeInTheDocument();
+  // Weirdly the await userEvent.click doesn't work here, it reports the item has pointer-events: none. Don't see that
+  // anywhere when debugging so not sure what style is it picking up.
+  await userEvent.click(opItem, { pointerEventsCheck: 0 });
+}
diff --git a/public/app/plugins/datasource/prometheus/querycache/QueryCache.ts b/public/app/plugins/datasource/prometheus/querycache/QueryCache.ts
index 9ce6e910c2eac..e507dff1f7bd8 100644
--- a/public/app/plugins/datasource/prometheus/querycache/QueryCache.ts
+++ b/public/app/plugins/datasource/prometheus/querycache/QueryCache.ts
@@ -12,7 +12,6 @@ import { faro } from '@grafana/faro-web-sdk';
 import { config, reportInteraction } from '@grafana/runtime/src';
 import { amendTable, Table, trimTable } from 'app/features/live/data/amendTimeSeries';
 
-import { getTimeSrv } from '../../../../features/dashboard/services/TimeSrv';
 import { PromQuery } from '../types';
 
 // dashboardUID + panelId + refId
@@ -260,7 +259,7 @@ export class QueryCache<T extends SupportedQueryTypes> {
     let doPartialQuery = shouldCache;
     let prevTo: TimestampMs | undefined = undefined;
 
-    const refreshIntervalMs = getTimeSrv().refreshMS;
+    const refreshIntervalMs = request.intervalMs;
 
     // pre-compute reqTargSigs
     const reqTargSigs = new Map<TargetIdent, TargetSig>();
diff --git a/public/app/plugins/datasource/prometheus/result_transformer.test.ts b/public/app/plugins/datasource/prometheus/result_transformer.test.ts
index 76240c37803d3..93c4d2b37accd 100644
--- a/public/app/plugins/datasource/prometheus/result_transformer.test.ts
+++ b/public/app/plugins/datasource/prometheus/result_transformer.test.ts
@@ -1,14 +1,14 @@
 import {
   cacheFieldDisplayNames,
   createDataFrame,
-  DataFrame,
-  DataQueryRequest,
-  DataQueryResponse,
   FieldType,
-  PreferredVisualisationType,
+  type DataQueryRequest,
+  type DataQueryResponse,
+  type PreferredVisualisationType,
 } from '@grafana/data';
+import { transformToHistogramOverTime } from '@grafana/prometheus/src/result_transformer';
 
-import { parseSampleValue, sortSeriesByLabel, transform, transformDFToTable, transformV2 } from './result_transformer';
+import { parseSampleValue, sortSeriesByLabel, transformDFToTable, transformV2 } from './result_transformer';
 import { PromQuery } from './types';
 
 jest.mock('@grafana/runtime', () => ({
@@ -30,22 +30,6 @@ jest.mock('@grafana/runtime', () => ({
   },
 }));
 
-const matrixResponse = {
-  status: 'success',
-  data: {
-    resultType: 'matrix',
-    result: [
-      {
-        metric: { __name__: 'test', job: 'testjob' },
-        values: [
-          [1, '10'],
-          [2, '0'],
-        ],
-      },
-    ],
-  },
-};
-
 describe('Prometheus Result Transformer', () => {
   describe('parse variants of "+Inf" and "-Inf" strings', () => {
     it('+Inf', () => {
@@ -421,6 +405,7 @@ describe('Prometheus Result Transformer', () => {
       expect(series.data[0].fields[2].name).toEqual('2');
       expect(series.data[0].fields[3].name).toEqual('+Inf');
     });
+
     it('results with heatmap format (with metric name) should be correctly transformed', () => {
       const options = {
         targets: [
@@ -926,7 +911,7 @@ describe('Prometheus Result Transformer', () => {
           },
         ],
       } as unknown as DataQueryRequest<PromQuery>;
-      const testOptions: any = {
+      const testOptions = {
         exemplarTraceIdDestinations: [
           {
             name: 'traceID',
@@ -942,6 +927,89 @@ describe('Prometheus Result Transformer', () => {
       expect(traceField).toBeDefined();
       expect(traceField!.config.links?.length).toBe(0);
     });
+
+    it('should convert values less than 1e-9 to 0', () => {
+      // pulled from real response
+      const bucketValues = [
+        [0.22222222222222218, 0.24444444444444444, 0.19999999999999996], // le=0.005
+        [0.39999999999999997, 0.44444444444444436, 0.42222222222222217],
+        [0.3999999999999999, 0.44444444444444436, 0.42222222222222217],
+        [0.3999999999999999, 0.44444444444444436, 0.42222222222222217],
+        [0.3999999999999999, 0.44444444444444436, 0.42222222222222217],
+        [0.3999999999999999, 0.44444444444444436, 0.42222222222222217],
+        [0.39999999999999997, 0.44444444444444436, 0.42222222222222217],
+        [0.39999999999999997, 0.44444444444444436, 0.42222222222222217],
+        [0.3999999999999999, 0.44444444444444436, 0.42222222222222217],
+        [0.3999999999999999, 0.44444444444444436, 0.42222222222222217],
+        [0.3999999999999999, 0.44444444444444436, 0.42222222222222217],
+        [0.4666666666666666, 0.5111111111111111, 0.4888888888888888],
+        [0.4666666666666666, 0.5111111111111111, 0.4888888888888888],
+        [0.46666666666666656, 0.5111111111111111, 0.4888888888888888],
+        [0.46666666666666656, 0.5111111111111111, 0.4888888888888888], // le=+Inf
+      ];
+
+      const frames = bucketValues.map((vals) =>
+        createDataFrame({
+          refId: 'A',
+          fields: [
+            { type: FieldType.time, values: [1, 2, 3] },
+            {
+              type: FieldType.number,
+              values: vals.slice(),
+            },
+          ],
+        })
+      );
+
+      const fieldValues = transformToHistogramOverTime(frames).map((frame) => frame.fields[1].values);
+
+      expect(fieldValues).toEqual([
+        [0.22222222222222218, 0.24444444444444444, 0.19999999999999996],
+        [0.17777777777777778, 0.19999999999999993, 0.2222222222222222],
+        [0, 0, 0],
+        [0, 0, 0],
+        [0, 0, 0],
+        [0, 0, 0],
+        [0, 0, 0],
+        [0, 0, 0],
+        [0, 0, 0],
+        [0, 0, 0],
+        [0, 0, 0],
+        [0.06666666666666671, 0.06666666666666671, 0.06666666666666665],
+        [0, 0, 0],
+        [0, 0, 0],
+        [0, 0, 0],
+      ]);
+    });
+
+    it('should throw an error if the series does not contain number-type values', () => {
+      const response = {
+        state: 'Done',
+        data: [
+          ['10', '10', '0'],
+          ['20', '10', '30'],
+          ['20', '10', '35'],
+        ].map((values) =>
+          createDataFrame({
+            refId: 'A',
+            fields: [
+              { name: 'Time', type: FieldType.time, values: [6, 5, 4] },
+              { name: 'Value', type: FieldType.string, values },
+            ],
+          })
+        ),
+      } as unknown as DataQueryResponse;
+      const request = {
+        targets: [
+          {
+            format: 'heatmap',
+            refId: 'A',
+          },
+        ],
+      } as unknown as DataQueryRequest<PromQuery>;
+
+      expect(() => transformV2(response, request, {})).toThrow();
+    });
   });
 
   describe('transformDFToTable', () => {
@@ -1088,580 +1156,4 @@ describe('Prometheus Result Transformer', () => {
       expect(transformedTableDataFrames[1].meta?.executedQueryString).toEqual(executedQueryForRefB);
     });
   });
-
-  describe('transform', () => {
-    const options: any = { target: {}, query: {} };
-    describe('When nothing is returned', () => {
-      it('should return empty array', () => {
-        const response = {
-          status: 'success',
-          data: {
-            resultType: '',
-            result: null,
-          },
-        };
-        const series = transform({ data: response } as any, options);
-        expect(series).toEqual([]);
-      });
-      it('should return empty array', () => {
-        const response = {
-          status: 'success',
-          data: {
-            resultType: '',
-            result: null,
-          },
-        };
-        const result = transform({ data: response } as any, { ...options, target: { format: 'table' } });
-        expect(result).toHaveLength(0);
-      });
-    });
-
-    describe('When resultFormat is table', () => {
-      const response = {
-        status: 'success',
-        data: {
-          resultType: 'matrix',
-          result: [
-            {
-              metric: { __name__: 'test', job: 'testjob' },
-              values: [
-                [1443454528, '3846'],
-                [1443454530, '3848'],
-              ],
-            },
-            {
-              metric: {
-                __name__: 'test2',
-                instance: 'localhost:8080',
-                job: 'otherjob',
-              },
-              values: [
-                [1443454529, '3847'],
-                [1443454531, '3849'],
-              ],
-            },
-          ],
-        },
-      };
-
-      it('should return data frame', () => {
-        const result = transform({ data: response } as any, {
-          ...options,
-          target: {
-            responseListLength: 0,
-            refId: 'A',
-            format: 'table',
-          },
-        });
-        expect(result[0].fields[0].values).toEqual([1443454528000, 1443454530000, 1443454529000, 1443454531000]);
-        expect(result[0].fields[0].name).toBe('Time');
-        expect(result[0].fields[0].type).toBe(FieldType.time);
-        expect(result[0].fields[1].values).toEqual(['test', 'test', 'test2', 'test2']);
-        expect(result[0].fields[1].name).toBe('__name__');
-        expect(result[0].fields[1].config.filterable).toBe(true);
-        expect(result[0].fields[1].type).toBe(FieldType.string);
-        expect(result[0].fields[2].values).toEqual(['', '', 'localhost:8080', 'localhost:8080']);
-        expect(result[0].fields[2].name).toBe('instance');
-        expect(result[0].fields[2].type).toBe(FieldType.string);
-        expect(result[0].fields[3].values).toEqual(['testjob', 'testjob', 'otherjob', 'otherjob']);
-        expect(result[0].fields[3].name).toBe('job');
-        expect(result[0].fields[3].type).toBe(FieldType.string);
-        expect(result[0].fields[4].values).toEqual([3846, 3848, 3847, 3849]);
-        expect(result[0].fields[4].name).toEqual('Value');
-        expect(result[0].fields[4].type).toBe(FieldType.number);
-        expect(result[0].refId).toBe('A');
-      });
-
-      it('should include refId if response count is more than 2', () => {
-        const result = transform({ data: response } as any, {
-          ...options,
-          target: {
-            refId: 'B',
-            format: 'table',
-          },
-          responseListLength: 2,
-        });
-
-        expect(result[0].fields[4].name).toEqual('Value #B');
-      });
-    });
-
-    describe('When resultFormat is table and instant = true', () => {
-      const response = {
-        status: 'success',
-        data: {
-          resultType: 'vector',
-          result: [
-            {
-              metric: { __name__: 'test', job: 'testjob' },
-              value: [1443454528, '3846'],
-            },
-          ],
-        },
-      };
-
-      it('should return data frame', () => {
-        const result = transform({ data: response } as any, { ...options, target: { format: 'table' } });
-        expect(result[0].fields[0].values).toEqual([1443454528000]);
-        expect(result[0].fields[0].name).toBe('Time');
-        expect(result[0].fields[1].values).toEqual(['test']);
-        expect(result[0].fields[1].name).toBe('__name__');
-        expect(result[0].fields[2].values).toEqual(['testjob']);
-        expect(result[0].fields[2].name).toBe('job');
-        expect(result[0].fields[3].values).toEqual([3846]);
-        expect(result[0].fields[3].name).toEqual('Value');
-      });
-
-      it('should return le label values parsed as numbers', () => {
-        const response = {
-          status: 'success',
-          data: {
-            resultType: 'vector',
-            result: [
-              {
-                metric: { le: '102' },
-                value: [1594908838, '0'],
-              },
-            ],
-          },
-        };
-        const result = transform({ data: response } as any, { ...options, target: { format: 'table' } });
-        expect(result[0].fields[1].values).toEqual([102]);
-        expect(result[0].fields[1].type).toEqual(FieldType.number);
-      });
-    });
-
-    describe('When instant = true', () => {
-      const response = {
-        status: 'success',
-        data: {
-          resultType: 'vector',
-          result: [
-            {
-              metric: { __name__: 'test', job: 'testjob' },
-              value: [1443454528, '3846'],
-            },
-          ],
-        },
-      };
-
-      it('should return data frame', () => {
-        const result: DataFrame[] = transform({ data: response } as any, { ...options, query: { instant: true } });
-        expect(result[0].name).toBe('test{job="testjob"}');
-      });
-    });
-
-    describe('When resultFormat is heatmap', () => {
-      const getResponse = (result: any) => ({
-        status: 'success',
-        data: {
-          resultType: 'matrix',
-          result,
-        },
-      });
-
-      const options = {
-        format: 'heatmap',
-        start: 1445000010,
-        end: 1445000030,
-        legendFormat: '{{le}}',
-      };
-
-      it('should convert cumulative histogram to regular', () => {
-        const response = getResponse([
-          {
-            metric: { __name__: 'test', job: 'testjob', le: '1' },
-            values: [
-              [1445000010, '10'],
-              [1445000020, '10'],
-              [1445000030, '0'],
-            ],
-          },
-          {
-            metric: { __name__: 'test', job: 'testjob', le: '2' },
-            values: [
-              [1445000010, '20'],
-              [1445000020, '10'],
-              [1445000030, '30'],
-            ],
-          },
-          {
-            metric: { __name__: 'test', job: 'testjob', le: '3' },
-            values: [
-              [1445000010, '30'],
-              [1445000020, '10'],
-              [1445000030, '40'],
-            ],
-          },
-        ]);
-
-        const result = transform({ data: response } as any, { query: options, target: options } as any);
-        expect(result[0].fields[0].values).toEqual([1445000010000, 1445000020000, 1445000030000]);
-        expect(result[0].fields[1].values).toEqual([10, 10, 0]);
-        expect(result[0].fields[2].values).toEqual([10, 0, 30]);
-        expect(result[0].fields[3].values).toEqual([10, 0, 10]);
-      });
-
-      it('should handle missing datapoints', () => {
-        const response = getResponse([
-          {
-            metric: { __name__: 'test', job: 'testjob', le: '1' },
-            values: [
-              [1445000010, '1'],
-              [1445000020, '2'],
-            ],
-          },
-          {
-            metric: { __name__: 'test', job: 'testjob', le: '2' },
-            values: [
-              [1445000010, '2'],
-              [1445000020, '5'],
-              [1445000030, '1'],
-            ],
-          },
-          {
-            metric: { __name__: 'test', job: 'testjob', le: '3' },
-            values: [
-              [1445000010, '3'],
-              [1445000020, '7'],
-            ],
-          },
-        ]);
-        const result = transform({ data: response } as any, { query: options, target: options } as any);
-        expect(result[0].fields[1].values).toEqual([1, 2]);
-        expect(result[0].fields[2].values).toEqual([1, 3, 1]);
-        expect(result[0].fields[3].values).toEqual([1, 2]);
-      });
-    });
-
-    describe('When the response is a matrix', () => {
-      it('should have labels with the value field', () => {
-        const response = {
-          status: 'success',
-          data: {
-            resultType: 'matrix',
-            result: [
-              {
-                metric: { __name__: 'test', job: 'testjob', instance: 'testinstance' },
-                values: [
-                  [0, '10'],
-                  [1, '10'],
-                  [2, '0'],
-                ],
-              },
-            ],
-          },
-        };
-
-        const result: DataFrame[] = transform({ data: response } as any, {
-          ...options,
-        });
-
-        expect(result[0].fields[1].labels).toBeDefined();
-        expect(result[0].fields[1].labels?.instance).toBe('testinstance');
-        expect(result[0].fields[1].labels?.job).toBe('testjob');
-      });
-
-      it('should transform into a data frame', () => {
-        const response = {
-          status: 'success',
-          data: {
-            resultType: 'matrix',
-            result: [
-              {
-                metric: { __name__: 'test', job: 'testjob' },
-                values: [
-                  [0, '10'],
-                  [1, '10'],
-                  [2, '0'],
-                ],
-              },
-            ],
-          },
-        };
-
-        const result: DataFrame[] = transform({ data: response } as any, {
-          ...options,
-          query: {
-            start: 0,
-            end: 2,
-          },
-        });
-        expect(result[0].fields[0].values).toEqual([0, 1000, 2000]);
-        expect(result[0].fields[1].values).toEqual([10, 10, 0]);
-        expect(result[0].name).toBe('test{job="testjob"}');
-      });
-
-      it('should fill null values', () => {
-        const result = transform({ data: matrixResponse } as any, {
-          ...options,
-          query: { step: 1, start: 0, end: 2 },
-        });
-
-        expect(result[0].fields[0].values).toEqual([0, 1000, 2000]);
-        expect(result[0].fields[1].values).toEqual([null, 10, 0]);
-      });
-
-      it('should use __name__ label as series name', () => {
-        const result = transform({ data: matrixResponse } as any, {
-          ...options,
-          query: {
-            step: 1,
-            start: 0,
-            end: 2,
-          },
-        });
-        expect(result[0].name).toEqual('test{job="testjob"}');
-      });
-
-      it('should use query as series name when __name__ is not available and metric is empty', () => {
-        const response = {
-          status: 'success',
-          data: {
-            resultType: 'matrix',
-            result: [
-              {
-                metric: {},
-                values: [[0, '10']],
-              },
-            ],
-          },
-        };
-        const expr = 'histogram_quantile(0.95, sum(rate(tns_request_duration_seconds_bucket[5m])) by (le))';
-        const result = transform({ data: response } as any, {
-          ...options,
-          query: {
-            step: 1,
-            start: 0,
-            end: 2,
-            expr,
-          },
-        });
-        expect(result[0].name).toEqual(expr);
-      });
-
-      it('should set frame name to undefined if no __name__ label but there are other labels', () => {
-        const response = {
-          status: 'success',
-          data: {
-            resultType: 'matrix',
-            result: [
-              {
-                metric: { job: 'testjob' },
-                values: [
-                  [1, '10'],
-                  [2, '0'],
-                ],
-              },
-            ],
-          },
-        };
-
-        const result = transform({ data: response } as any, {
-          ...options,
-          query: {
-            step: 1,
-            start: 0,
-            end: 2,
-          },
-        });
-        expect(result[0].name).toBe('{job="testjob"}');
-      });
-
-      it('should not set displayName for ValueFields', () => {
-        const result = transform({ data: matrixResponse } as any, options);
-        expect(result[0].fields[1].config.displayName).toBeUndefined();
-        expect(result[0].fields[1].config.displayNameFromDS).toBe('test{job="testjob"}');
-      });
-
-      it('should align null values with step', () => {
-        const response = {
-          status: 'success',
-          data: {
-            resultType: 'matrix',
-            result: [
-              {
-                metric: { __name__: 'test', job: 'testjob' },
-                values: [
-                  [4, '10'],
-                  [8, '10'],
-                ],
-              },
-            ],
-          },
-        };
-
-        const result = transform({ data: response } as any, { ...options, query: { step: 2, start: 0, end: 8 } });
-        expect(result[0].fields[0].values).toEqual([0, 2000, 4000, 6000, 8000]);
-        expect(result[0].fields[1].values).toEqual([null, null, 10, null, 10]);
-      });
-    });
-
-    describe('When infinity values are returned', () => {
-      describe('When resultType is scalar', () => {
-        const response = {
-          status: 'success',
-          data: {
-            resultType: 'scalar',
-            result: [1443454528, '+Inf'],
-          },
-        };
-
-        it('should correctly parse values', () => {
-          const result: DataFrame[] = transform({ data: response } as any, {
-            ...options,
-            target: { format: 'table' },
-          });
-          expect(result[0].fields[1].values).toEqual([Number.POSITIVE_INFINITY]);
-        });
-      });
-
-      describe('When resultType is vector', () => {
-        const response = {
-          status: 'success',
-          data: {
-            resultType: 'vector',
-            result: [
-              {
-                metric: { __name__: 'test', job: 'testjob' },
-                value: [1443454528, '+Inf'],
-              },
-              {
-                metric: { __name__: 'test', job: 'testjob' },
-                value: [1443454528, '-Inf'],
-              },
-            ],
-          },
-        };
-
-        describe('When format is table', () => {
-          it('should correctly parse values', () => {
-            const result: DataFrame[] = transform({ data: response } as any, {
-              ...options,
-              target: { format: 'table' },
-            });
-            expect(result[0].fields[3].values).toEqual([Number.POSITIVE_INFINITY, Number.NEGATIVE_INFINITY]);
-          });
-        });
-      });
-    });
-
-    const exemplarsResponse = {
-      status: 'success',
-      data: [
-        {
-          seriesLabels: { __name__: 'test' },
-          exemplars: [
-            {
-              timestamp: 1610449069.957,
-              labels: { traceID: '5020b5bc45117f07' },
-              value: 0.002074123,
-            },
-          ],
-        },
-      ],
-    };
-
-    describe('When the response is exemplar data', () => {
-      it('should return as an data frame with a dataTopic annotations', () => {
-        const result = transform({ data: exemplarsResponse } as any, options);
-
-        expect(result[0].meta?.dataTopic).toBe('annotations');
-        expect(result[0].fields.length).toBe(4); // __name__, traceID, Time, Value
-        expect(result[0].length).toBe(1);
-      });
-
-      it('should return with an empty array when data is empty', () => {
-        const result = transform(
-          {
-            data: {
-              status: 'success',
-              data: [],
-            },
-          } as any,
-          options
-        );
-
-        expect(result).toHaveLength(0);
-      });
-
-      it('should remove exemplars that are too close to each other', () => {
-        const response = {
-          status: 'success',
-          data: [
-            {
-              exemplars: [
-                {
-                  timestamp: 1610449070.0,
-                  value: 5,
-                },
-                {
-                  timestamp: 1610449070.0,
-                  value: 1,
-                },
-                {
-                  timestamp: 1610449070.5,
-                  value: 13,
-                },
-                {
-                  timestamp: 1610449070.3,
-                  value: 20,
-                },
-              ],
-            },
-          ],
-        };
-        /**
-         * the standard deviation for the above values is 8.4 this means that we show the highest
-         * value (20) and then the next value should be 2 times the standard deviation which is 1
-         **/
-        const result = transform({ data: response } as any, options);
-        expect(result[0].length).toBe(2);
-      });
-
-      describe('data link', () => {
-        it('should be added to the field if found with url', () => {
-          const result = transform({ data: exemplarsResponse } as any, {
-            ...options,
-            exemplarTraceIdDestinations: [{ name: 'traceID', url: 'http://localhost' }],
-          });
-
-          expect(result[0].fields.some((f) => f.config.links?.length)).toBe(true);
-        });
-
-        it('should be added to the field if found with internal link', () => {
-          const result = transform({ data: exemplarsResponse } as any, {
-            ...options,
-            exemplarTraceIdDestinations: [{ name: 'traceID', datasourceUid: 'jaeger' }],
-          });
-
-          expect(result[0].fields.some((f) => f.config.links?.length)).toBe(true);
-        });
-
-        it('should not add link if exemplarTraceIdDestinations is not configured', () => {
-          const result = transform({ data: exemplarsResponse } as any, options);
-
-          expect(result[0].fields.some((f) => f.config.links?.length)).toBe(false);
-        });
-
-        it('should not add a datalink with an error when exemplarTraceIdDestinations is not configured', () => {
-          const testOptions: any = {
-            target: {},
-            query: {},
-            exemplarTraceIdDestinations: [
-              {
-                name: 'traceID',
-                datasourceUid: 'unknown',
-              },
-            ],
-          };
-
-          const result = transform({ data: exemplarsResponse } as any, testOptions);
-          const traceField = result[0].fields.find((f) => f.name === 'traceID');
-          expect(traceField).toBeDefined();
-          expect(traceField!.config.links?.length).toBe(0);
-        });
-      });
-    });
-  });
 });
diff --git a/public/app/plugins/datasource/prometheus/result_transformer.ts b/public/app/plugins/datasource/prometheus/result_transformer.ts
index 59308d9208c02..8111e34cc7eb1 100644
--- a/public/app/plugins/datasource/prometheus/result_transformer.ts
+++ b/public/app/plugins/datasource/prometheus/result_transformer.ts
@@ -1,8 +1,6 @@
-import { descending, deviation } from 'd3';
 import { flatten, forOwn, groupBy, partition } from 'lodash';
 
 import {
-  ArrayDataFrame,
   CoreApp,
   DataFrame,
   DataFrameType,
@@ -12,38 +10,19 @@ import {
   DataTopic,
   Field,
   FieldType,
-  formatLabels,
   getDisplayProcessor,
   getFieldDisplayName,
   Labels,
-  renderLegendFormat,
-  ScopedVars,
   TIME_SERIES_TIME_FIELD_NAME,
   TIME_SERIES_VALUE_FIELD_NAME,
 } from '@grafana/data';
-import { config, FetchResponse, getDataSourceSrv, getTemplateSrv } from '@grafana/runtime';
+import { config, getDataSourceSrv } from '@grafana/runtime';
 
-import {
-  ExemplarTraceIdDestination,
-  isExemplarData,
-  isMatrixData,
-  MatrixOrVectorResult,
-  PromDataSuccessResponse,
-  PromMetric,
-  PromQuery,
-  PromQueryRequest,
-  PromValue,
-  TransformOptions,
-} from './types';
+import { ExemplarTraceIdDestination, PromMetric, PromQuery, PromValue } from './types';
 
 // handles case-insensitive Inf, +Inf, -Inf (with optional "inity" suffix)
 const INFINITY_SAMPLE_REGEX = /^[+-]?inf(?:inity)?$/i;
 
-interface TimeAndValue {
-  [TIME_SERIES_TIME_FIELD_NAME]: number;
-  [TIME_SERIES_VALUE_FIELD_NAME]: number;
-}
-
 const isTableResult = (dataFrame: DataFrame, options: DataQueryRequest<PromQuery>): boolean => {
   // We want to process vector and scalar results in Explore as table
   if (
@@ -58,7 +37,11 @@ const isTableResult = (dataFrame: DataFrame, options: DataQueryRequest<PromQuery
   return target?.format === 'table';
 };
 
-const isHeatmapResult = (dataFrame: DataFrame, options: DataQueryRequest<PromQuery>): boolean => {
+const isCumulativeHeatmapResult = (dataFrame: DataFrame, options: DataQueryRequest<PromQuery>): boolean => {
+  if (dataFrame.meta?.type === DataFrameType.HeatmapCells) {
+    return false;
+  }
+
   const target = options.targets.find((target) => target.refId === dataFrame.refId);
   return target?.format === 'heatmap';
 };
@@ -114,7 +97,7 @@ export function transformV2(
 
   const [heatmapResults, framesWithoutTableHeatmapsAndExemplars] = partition<DataFrame>(
     framesWithoutTableAndExemplars,
-    (df) => isHeatmapResult(df, request)
+    (df) => isCumulativeHeatmapResult(df, request)
   );
 
   // this works around the fact that we only get back frame.name with le buckets when legendFormat == {{le}}...which is not the default
@@ -260,104 +243,6 @@ function getValueText(responseLength: number, refId = '') {
   return responseLength > 1 ? `Value #${refId}` : 'Value';
 }
 
-export function transform(
-  response: FetchResponse<PromDataSuccessResponse>,
-  transformOptions: {
-    query: PromQueryRequest;
-    exemplarTraceIdDestinations?: ExemplarTraceIdDestination[];
-    target: PromQuery;
-    responseListLength: number;
-    scopedVars?: ScopedVars;
-  }
-) {
-  // Create options object from transformOptions
-  const options: TransformOptions = {
-    format: transformOptions.target.format,
-    step: transformOptions.query.step,
-    legendFormat: transformOptions.target.legendFormat,
-    start: transformOptions.query.start,
-    end: transformOptions.query.end,
-    query: transformOptions.query.expr,
-    responseListLength: transformOptions.responseListLength,
-    scopedVars: transformOptions.scopedVars,
-    refId: transformOptions.target.refId,
-    valueWithRefId: transformOptions.target.valueWithRefId,
-    meta: {
-      // Fix for showing of Prometheus results in Explore table
-      preferredVisualisationType: transformOptions.query.instant ? 'rawPrometheus' : 'graph',
-    },
-  };
-  const prometheusResult = response.data.data;
-
-  if (isExemplarData(prometheusResult)) {
-    const events: TimeAndValue[] = [];
-    prometheusResult.forEach((exemplarData) => {
-      const data = exemplarData.exemplars.map((exemplar) => {
-        return {
-          [TIME_SERIES_TIME_FIELD_NAME]: exemplar.timestamp * 1000,
-          [TIME_SERIES_VALUE_FIELD_NAME]: exemplar.value,
-          ...exemplar.labels,
-          ...exemplarData.seriesLabels,
-        };
-      });
-      events.push(...data);
-    });
-
-    // Grouping exemplars by step
-    const sampledExemplars = sampleExemplars(events, options);
-
-    const dataFrame = new ArrayDataFrame(sampledExemplars);
-    dataFrame.meta = { dataTopic: DataTopic.Annotations };
-
-    // Add data links if configured
-    if (transformOptions.exemplarTraceIdDestinations?.length) {
-      for (const exemplarTraceIdDestination of transformOptions.exemplarTraceIdDestinations) {
-        const traceIDField = dataFrame.fields.find((field) => field.name === exemplarTraceIdDestination.name);
-        if (traceIDField) {
-          const links = getDataLinks(exemplarTraceIdDestination);
-          traceIDField.config.links = traceIDField.config.links?.length
-            ? [...traceIDField.config.links, ...links]
-            : links;
-        }
-      }
-    }
-    return [dataFrame];
-  }
-
-  if (!prometheusResult?.result) {
-    return [];
-  }
-
-  // Return early if result type is scalar
-  if (prometheusResult.resultType === 'scalar') {
-    const df: DataFrame = {
-      meta: options.meta,
-      refId: options.refId,
-      length: 1,
-      fields: [getTimeField([prometheusResult.result]), getValueField({ data: [prometheusResult.result] })],
-    };
-    return [df];
-  }
-
-  // Return early again if the format is table, this needs special transformation.
-  if (options.format === 'table') {
-    const tableData = transformMetricDataToTable(prometheusResult.result, options);
-    return [tableData];
-  }
-
-  // Process matrix and vector results to DataFrame
-  const dataFrame: DataFrame[] = [];
-  prometheusResult.result.forEach((data: MatrixOrVectorResult) => dataFrame.push(transformToDataFrame(data, options)));
-
-  // When format is heatmap use the already created data frames and transform it more
-  if (options.format === 'heatmap') {
-    return mergeHeatmapFrames(transformToHistogramOverTime(dataFrame.sort(sortSeriesByLabel)));
-  }
-
-  // Return matrix or vector result as DataFrame[]
-  return dataFrame;
-}
-
 function getDataLinks(options: ExemplarTraceIdDestination): DataLink[] {
   const dataLinks: DataLink[] = [];
 
@@ -392,160 +277,6 @@ function getDataLinks(options: ExemplarTraceIdDestination): DataLink[] {
   return dataLinks;
 }
 
-/**
- * Reduce the density of the exemplars by making sure that the highest value exemplar is included
- * and then only the ones that are 2 times the standard deviation of the all the values.
- * This makes sure not to show too many dots near each other.
- */
-function sampleExemplars(events: TimeAndValue[], options: TransformOptions) {
-  const step = options.step || 15;
-  const bucketedExemplars: { [ts: string]: TimeAndValue[] } = {};
-  const values: number[] = [];
-  for (const exemplar of events) {
-    // Align exemplar timestamp to nearest step second
-    const alignedTs = String(Math.floor(exemplar[TIME_SERIES_TIME_FIELD_NAME] / 1000 / step) * step * 1000);
-    if (!bucketedExemplars[alignedTs]) {
-      // New bucket found
-      bucketedExemplars[alignedTs] = [];
-    }
-    bucketedExemplars[alignedTs].push(exemplar);
-    values.push(exemplar[TIME_SERIES_VALUE_FIELD_NAME]);
-  }
-
-  // Getting exemplars from each bucket
-  const standardDeviation = deviation(values);
-  const sampledBuckets = Object.keys(bucketedExemplars).sort();
-  const sampledExemplars = [];
-  for (const ts of sampledBuckets) {
-    const exemplarsInBucket = bucketedExemplars[ts];
-    if (exemplarsInBucket.length === 1) {
-      sampledExemplars.push(exemplarsInBucket[0]);
-    } else {
-      // Choose which values to sample
-      const bucketValues = exemplarsInBucket.map((ex) => ex[TIME_SERIES_VALUE_FIELD_NAME]).sort(descending);
-      const sampledBucketValues = bucketValues.reduce((acc: number[], curr) => {
-        if (acc.length === 0) {
-          // First value is max and is always added
-          acc.push(curr);
-        } else {
-          // Then take values only when at least 2 standard deviation distance to previously taken value
-          const prev = acc[acc.length - 1];
-          if (standardDeviation && prev - curr >= 2 * standardDeviation) {
-            acc.push(curr);
-          }
-        }
-        return acc;
-      }, []);
-      // Find the exemplars for the sampled values
-      sampledExemplars.push(
-        ...sampledBucketValues.map(
-          (value) => exemplarsInBucket.find((ex) => ex[TIME_SERIES_VALUE_FIELD_NAME] === value)!
-        )
-      );
-    }
-  }
-  return sampledExemplars;
-}
-
-/**
- * Transforms matrix and vector result from Prometheus result to DataFrame
- */
-function transformToDataFrame(data: MatrixOrVectorResult, options: TransformOptions): DataFrame {
-  const { name, labels } = createLabelInfo(data.metric, options);
-
-  const fields: Field[] = [];
-
-  if (isMatrixData(data)) {
-    const stepMs = options.step ? options.step * 1000 : NaN;
-    let baseTimestamp = options.start * 1000;
-    const dps: PromValue[] = [];
-
-    for (const value of data.values) {
-      let dpValue: number | null = parseSampleValue(value[1]);
-
-      if (isNaN(dpValue)) {
-        dpValue = null;
-      }
-
-      const timestamp = value[0] * 1000;
-      for (let t = baseTimestamp; t < timestamp; t += stepMs) {
-        dps.push([t, null]);
-      }
-      baseTimestamp = timestamp + stepMs;
-      dps.push([timestamp, dpValue]);
-    }
-
-    const endTimestamp = options.end * 1000;
-    for (let t = baseTimestamp; t <= endTimestamp; t += stepMs) {
-      dps.push([t, null]);
-    }
-    fields.push(getTimeField(dps, true));
-    fields.push(getValueField({ data: dps, parseValue: false, labels, displayNameFromDS: name }));
-  } else {
-    fields.push(getTimeField([data.value]));
-    fields.push(getValueField({ data: [data.value], labels, displayNameFromDS: name }));
-  }
-
-  return {
-    meta: options.meta,
-    refId: options.refId,
-    length: fields[0].values.length,
-    fields,
-    name,
-  };
-}
-
-function transformMetricDataToTable(md: MatrixOrVectorResult[], options: TransformOptions): DataFrame {
-  if (!md || md.length === 0) {
-    return {
-      meta: options.meta,
-      refId: options.refId,
-      length: 0,
-      fields: [],
-    };
-  }
-
-  const valueText = options.responseListLength > 1 || options.valueWithRefId ? `Value #${options.refId}` : 'Value';
-
-  const timeField = getTimeField([]);
-  const metricFields = Object.keys(md.reduce((acc, series) => ({ ...acc, ...series.metric }), {}))
-    .sort()
-    .map((label) => {
-      // Labels have string field type, otherwise table tries to figure out the type which can result in unexpected results
-      // Only "le" label has a number field type
-      const numberField = label === HISTOGRAM_QUANTILE_LABEL_NAME;
-      const field: Field = {
-        name: label,
-        config: { filterable: true },
-        type: numberField ? FieldType.number : FieldType.string,
-        values: [],
-      };
-      return field;
-    });
-  const valueField = getValueField({ data: [], valueName: valueText });
-
-  md.forEach((d) => {
-    if (isMatrixData(d)) {
-      d.values.forEach((val) => {
-        timeField.values.push(val[0] * 1000);
-        metricFields.forEach((metricField) => metricField.values.push(getLabelValue(d.metric, metricField.name)));
-        valueField.values.push(parseSampleValue(val[1]));
-      });
-    } else {
-      timeField.values.push(d.value[0] * 1000);
-      metricFields.forEach((metricField) => metricField.values.push(getLabelValue(d.metric, metricField.name)));
-      valueField.values.push(parseSampleValue(d.value[1]));
-    }
-  });
-
-  return {
-    meta: options.meta,
-    refId: options.refId,
-    length: timeField.values.length,
-    fields: [timeField, ...metricFields, valueField],
-  };
-}
-
 function getLabelValue(metric: PromMetric, label: string): string | number {
   if (metric.hasOwnProperty(label)) {
     if (label === HISTOGRAM_QUANTILE_LABEL_NAME) {
@@ -592,23 +323,6 @@ function getValueField({
   };
 }
 
-function createLabelInfo(labels: { [key: string]: string }, options: TransformOptions) {
-  if (options?.legendFormat) {
-    const title = renderLegendFormat(getTemplateSrv().replace(options.legendFormat, options?.scopedVars), labels);
-    return { name: title, labels };
-  }
-
-  const { __name__, ...labelsWithoutName } = labels;
-  const labelPart = formatLabels(labelsWithoutName);
-  let title = `${__name__ ?? ''}${labelPart}`;
-
-  if (!title) {
-    title = options.query;
-  }
-
-  return { name: title, labels: labelsWithoutName };
-}
-
 export function getOriginalMetricName(labelData: { [key: string]: string }) {
   const metricName = labelData.__name__ || '';
   delete labelData.__name__;
@@ -645,7 +359,7 @@ function mergeHeatmapFrames(frames: DataFrame[]): DataFrame[] {
   ];
 }
 
-function transformToHistogramOverTime(seriesList: DataFrame[]) {
+function transformToHistogramOverTime(seriesList: DataFrame[]): DataFrame[] {
   /*      t1 = timestamp1, t2 = timestamp2 etc.
             t1  t2  t3          t1  t2  t3
     le10    10  10  0     =>    10  10  0
@@ -663,6 +377,10 @@ function transformToHistogramOverTime(seriesList: DataFrame[]) {
     for (let j = 0; j < topSeries.values.length; j++) {
       const bottomPoint = bottomSeries.values[j] || [0];
       topSeries.values[j] -= bottomPoint;
+
+      if (topSeries.values[j] < 1e-9) {
+        topSeries.values[j] = 0;
+      }
     }
   }
 
diff --git a/public/app/plugins/datasource/prometheus/types.ts b/public/app/plugins/datasource/prometheus/types.ts
index 2f0e26f9a9715..f3c5730b3805d 100644
--- a/public/app/plugins/datasource/prometheus/types.ts
+++ b/public/app/plugins/datasource/prometheus/types.ts
@@ -1,7 +1,7 @@
-import { DataSourceJsonData, QueryResultMeta, ScopedVars } from '@grafana/data';
+import { DataSourceJsonData } from '@grafana/data';
 import { DataQuery } from '@grafana/schema';
 
-import { Prometheus as GenPromQuery } from './dataquery.gen';
+import { Prometheus as GenPromQuery } from './dataquery';
 import { QueryBuilderLabelFilter, QueryEditorMode } from './querybuilder/shared/types';
 
 export interface PromQuery extends GenPromQuery, DataQuery {
@@ -39,7 +39,6 @@ export interface PromOptions extends DataSourceJsonData {
   timeInterval?: string;
   queryTimeout?: string;
   httpMethod?: string;
-  directUrl?: string;
   customQueryParameters?: string;
   disableMetricsLookup?: boolean;
   exemplarTraceIdDestinations?: ExemplarTraceIdDestination[];
@@ -79,56 +78,6 @@ export interface PromMetricsMetadata {
   [metric: string]: PromMetricsMetadataItem;
 }
 
-export interface PromDataSuccessResponse<T = PromData> {
-  status: 'success';
-  data: T;
-}
-
-export interface PromDataErrorResponse<T = PromData> {
-  status: 'error';
-  errorType: string;
-  error: string;
-  data: T;
-}
-
-export type PromData = PromMatrixData | PromVectorData | PromScalarData | PromExemplarData[];
-
-export interface Labels {
-  [index: string]: any;
-}
-
-export interface Exemplar {
-  labels: Labels;
-  value: number;
-  timestamp: number;
-}
-
-export interface PromExemplarData {
-  seriesLabels: PromMetric;
-  exemplars: Exemplar[];
-}
-
-export interface PromVectorData {
-  resultType: 'vector';
-  result: Array<{
-    metric: PromMetric;
-    value: PromValue;
-  }>;
-}
-
-export interface PromMatrixData {
-  resultType: 'matrix';
-  result: Array<{
-    metric: PromMetric;
-    values: PromValue[];
-  }>;
-}
-
-export interface PromScalarData {
-  resultType: 'scalar';
-  result: PromValue;
-}
-
 export type PromValue = [number, any];
 
 export interface PromMetric {
@@ -137,33 +86,6 @@ export interface PromMetric {
   [index: string]: any;
 }
 
-export function isMatrixData(result: MatrixOrVectorResult): result is PromMatrixData['result'][0] {
-  return 'values' in result;
-}
-
-export function isExemplarData(result: PromData): result is PromExemplarData[] {
-  if (result == null || !Array.isArray(result)) {
-    return false;
-  }
-  return result.length ? 'exemplars' in result[0] : false;
-}
-
-export type MatrixOrVectorResult = PromMatrixData['result'][0] | PromVectorData['result'][0];
-
-export interface TransformOptions {
-  format?: string;
-  step?: number;
-  legendFormat?: string;
-  start: number;
-  end: number;
-  query: string;
-  responseListLength: number;
-  scopedVars?: ScopedVars;
-  refId: string;
-  valueWithRefId?: boolean;
-  meta: QueryResultMeta;
-}
-
 export interface PromBuildInfoResponse {
   data: {
     application?: string;
diff --git a/public/app/plugins/datasource/prometheus/variables.ts b/public/app/plugins/datasource/prometheus/variables.ts
index c8795f9bf7159..1c2d4c9279360 100644
--- a/public/app/plugins/datasource/prometheus/variables.ts
+++ b/public/app/plugins/datasource/prometheus/variables.ts
@@ -4,8 +4,6 @@ import { map } from 'rxjs/operators';
 import { CustomVariableSupport, DataQueryRequest, DataQueryResponse, rangeUtil } from '@grafana/data';
 import { getTemplateSrv, TemplateSrv } from '@grafana/runtime';
 
-import { getTimeSrv, TimeSrv } from '../../../features/dashboard/services/TimeSrv';
-
 import { PromVariableQueryEditor } from './components/VariableQueryEditor';
 import { PrometheusDatasource } from './datasource';
 import PrometheusMetricFindQuery from './metric_find_query';
@@ -14,8 +12,7 @@ import { PromVariableQuery } from './types';
 export class PrometheusVariableSupport extends CustomVariableSupport<PrometheusDatasource> {
   constructor(
     private readonly datasource: PrometheusDatasource,
-    private readonly templateSrv: TemplateSrv = getTemplateSrv(),
-    private readonly timeSrv: TimeSrv = getTimeSrv()
+    private readonly templateSrv: TemplateSrv = getTemplateSrv()
   ) {
     super();
   }
@@ -49,12 +46,12 @@ export class PrometheusVariableSupport extends CustomVariableSupport<PrometheusD
         text: rangeUtil.intervalToMs(this.datasource.interval),
         value: rangeUtil.intervalToMs(this.datasource.interval),
       },
-      ...this.datasource.getRangeScopedVars(this.timeSrv.timeRange()),
+      ...this.datasource.getRangeScopedVars(request.range),
     };
 
     const interpolated = this.templateSrv.replace(query, scopedVars, this.datasource.interpolateQueryExpr);
     const metricFindQuery = new PrometheusMetricFindQuery(this.datasource, interpolated);
-    const metricFindStream = from(metricFindQuery.process());
+    const metricFindStream = from(metricFindQuery.process(request.range));
 
     return metricFindStream.pipe(map((results) => ({ data: results })));
   }
diff --git a/public/app/plugins/datasource/tempo/.eslintignore b/public/app/plugins/datasource/tempo/.eslintignore
new file mode 100644
index 0000000000000..59ac0834c7a79
--- /dev/null
+++ b/public/app/plugins/datasource/tempo/.eslintignore
@@ -0,0 +1,2 @@
+# TS generate from cue by cuetsy
+**/*.gen.ts
diff --git a/public/app/plugins/datasource/tempo/CHANGELOG.md b/public/app/plugins/datasource/tempo/CHANGELOG.md
new file mode 100644
index 0000000000000..825c32f0d03d9
--- /dev/null
+++ b/public/app/plugins/datasource/tempo/CHANGELOG.md
@@ -0,0 +1 @@
+# Changelog
diff --git a/public/app/plugins/datasource/tempo/CheatSheet.tsx b/public/app/plugins/datasource/tempo/CheatSheet.tsx
index 40afaf9cfff94..a8d98f51f10a1 100644
--- a/public/app/plugins/datasource/tempo/CheatSheet.tsx
+++ b/public/app/plugins/datasource/tempo/CheatSheet.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 
 import { config, reportInteraction } from '@grafana/runtime';
+import { TextLink } from '@grafana/ui';
 
 export default function CheatSheet() {
   reportInteraction('grafana_traces_cheatsheet_clicked', {
@@ -9,19 +10,30 @@ export default function CheatSheet() {
   });
 
   return (
-    <div>
-      <h2 id="tempo-cheat-sheet">Tempo Cheat Sheet</h2>
+    <>
+      <h2>Tempo Cheat Sheet</h2>
       <p>
-        Tempo is a trace id lookup store. Enter a trace id in the above field and hit “Run Query” to retrieve your
-        trace. Tempo is generally paired with other datasources such as Loki or Prometheus to find traces.
+        <TextLink href={'https://grafana.com/docs/tempo/latest/'} external={true}>
+          Grafana Tempo
+        </TextLink>{' '}
+        is an open source, easy-to-use, and high-volume distributed tracing backend.
       </p>
       <p>
-        Here are some{' '}
-        <a href="https://grafana.com/docs/tempo/latest/guides/instrumentation/" target="blank">
-          instrumentation examples
-        </a>{' '}
-        to get you started with trace discovery through logs and metrics (exemplars).
+        Tempo implements{' '}
+        <TextLink href={'https://grafana.com/docs/tempo/latest/traceql'} external={true}>
+          TraceQL
+        </TextLink>
+        , a traces-first query language inspired by LogQL and PromQL. This query language allows users to precisely and
+        easily select spans and jump directly to the spans fulfilling the specified conditions.
       </p>
-    </div>
+      <p>
+        You can compose TraceQL queries using either the Search tab (the TraceQL query builder) or the TraceQL tab (the
+        TraceQL query editor). Both of these methods let you build queries and drill-down into result sets. (
+        <TextLink href={'https://grafana.com/docs/grafana/latest/datasources/tempo/query-editor/'} external={true}>
+          Learn more
+        </TextLink>
+        )
+      </p>
+    </>
   );
 }
diff --git a/public/app/plugins/datasource/tempo/LokiSearch.tsx b/public/app/plugins/datasource/tempo/LokiSearch.tsx
deleted file mode 100644
index a956b1eefe7b4..0000000000000
--- a/public/app/plugins/datasource/tempo/LokiSearch.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import React from 'react';
-import useAsync from 'react-use/lib/useAsync';
-
-import { InlineLabel } from '@grafana/ui';
-
-import { LokiQueryField } from '../loki/components/LokiQueryField';
-import { LokiDatasource } from '../loki/datasource';
-import { LokiQuery } from '../loki/types';
-
-import { TempoQuery } from './types';
-import { getDS } from './utils';
-
-interface LokiSearchProps {
-  logsDatasourceUid?: string;
-  onChange: (value: LokiQuery) => void;
-  onRunQuery: () => void;
-  query: TempoQuery;
-}
-
-export function LokiSearch({ logsDatasourceUid, onChange, onRunQuery, query }: LokiSearchProps) {
-  const dsState = useAsync(() => getDS(logsDatasourceUid), [logsDatasourceUid]);
-  if (dsState.loading) {
-    return null;
-  }
-
-  const ds = dsState.value as LokiDatasource;
-
-  if (ds) {
-    return (
-      <>
-        <InlineLabel>Tempo uses {ds.name} to find traces.</InlineLabel>
-        <LokiQueryField
-          datasource={ds}
-          onChange={onChange}
-          onRunQuery={onRunQuery}
-          query={query.linkedQuery ?? ({ refId: 'linked' } as LokiQuery)}
-          history={[]}
-        />
-      </>
-    );
-  }
-
-  if (!logsDatasourceUid) {
-    return <div className="text-warning">Please set up a Loki search datasource in the datasource settings.</div>;
-  }
-
-  if (logsDatasourceUid && !ds) {
-    return (
-      <div className="text-warning">
-        Loki search datasource is configured but the data source no longer exists. Please configure existing data source
-        to use the search.
-      </div>
-    );
-  }
-
-  return null;
-}
diff --git a/public/app/plugins/datasource/tempo/NativeSearch/NativeSearch.test.tsx b/public/app/plugins/datasource/tempo/NativeSearch/NativeSearch.test.tsx
deleted file mode 100644
index d174380662b2d..0000000000000
--- a/public/app/plugins/datasource/tempo/NativeSearch/NativeSearch.test.tsx
+++ /dev/null
@@ -1,172 +0,0 @@
-import { render, screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import React from 'react';
-
-import { TempoDatasource } from '../datasource';
-import { TempoQuery } from '../types';
-
-import NativeSearch from './NativeSearch';
-
-const getOptionsV1 = jest.fn().mockImplementation(() => {
-  return new Promise((resolve) => {
-    setTimeout(() => {
-      resolve([
-        {
-          value: 'customer',
-          label: 'customer',
-        },
-        {
-          value: 'driver',
-          label: 'driver',
-        },
-      ]);
-    }, 1000);
-  });
-});
-
-// Have to mock CodeEditor else it causes act warnings
-jest.mock('@grafana/ui', () => ({
-  ...jest.requireActual('@grafana/ui'),
-  CodeEditor: function CodeEditor({ value, onSave }: { value: string; onSave: (newQuery: string) => void }) {
-    return <input data-testid="mockeditor" value={value} onChange={(event) => onSave(event.target.value)} />;
-  },
-}));
-
-jest.mock('../language_provider', () => {
-  return jest.fn().mockImplementation(() => {
-    return { getOptionsV1 };
-  });
-});
-
-jest.mock('@grafana/runtime', () => ({
-  ...jest.requireActual('@grafana/runtime'),
-  getTemplateSrv: () => ({
-    replace: jest.fn(),
-    containsTemplate: (val: string): boolean => {
-      return val.includes('$');
-    },
-  }),
-}));
-
-let mockQuery = {
-  refId: 'A',
-  queryType: 'nativeSearch',
-  key: 'Q-595a9bbc-2a25-49a7-9249-a52a0a475d83-0',
-  serviceName: 'driver',
-  spanName: 'customer',
-} as TempoQuery;
-
-describe('NativeSearch', () => {
-  let user: ReturnType<typeof userEvent.setup>;
-
-  beforeEach(() => {
-    jest.useFakeTimers();
-    // Need to use delay: null here to work with fakeTimers
-    // see https://github.com/testing-library/user-event/issues/833
-    user = userEvent.setup({ delay: null });
-  });
-
-  afterEach(() => {
-    jest.useRealTimers();
-  });
-
-  it('should show loader when there is a delay', async () => {
-    render(
-      <NativeSearch datasource={{} as TempoDatasource} query={mockQuery} onChange={jest.fn()} onRunQuery={jest.fn()} />
-    );
-
-    const select = screen.getByRole('combobox', { name: 'select-service-name' });
-
-    await user.click(select);
-    const loader = screen.getByText('Loading options...');
-
-    expect(loader).toBeInTheDocument();
-
-    jest.advanceTimersByTime(1000);
-
-    await waitFor(() => expect(screen.queryByText('Loading options...')).not.toBeInTheDocument());
-  });
-
-  it('should call the `onChange` function on click of the Input', async () => {
-    const promise = Promise.resolve();
-    const handleOnChange = jest.fn(() => promise);
-    const fakeOptionChoice = {
-      key: 'Q-595a9bbc-2a25-49a7-9249-a52a0a475d83-0',
-      queryType: 'nativeSearch',
-      refId: 'A',
-      serviceName: 'driver',
-      spanName: 'customer',
-    };
-
-    render(
-      <NativeSearch
-        datasource={{} as TempoDatasource}
-        query={mockQuery}
-        onChange={handleOnChange}
-        onRunQuery={() => {}}
-      />
-    );
-
-    const select = await screen.findByRole('combobox', { name: 'select-service-name' });
-
-    expect(select).toBeInTheDocument();
-    await user.click(select);
-    jest.advanceTimersByTime(1000);
-
-    await user.type(select, 'd');
-    const driverOption = await screen.findByText('driver');
-    await user.click(driverOption);
-
-    expect(handleOnChange).toHaveBeenCalledWith(fakeOptionChoice);
-  });
-
-  it('should filter the span dropdown when user types a search value', async () => {
-    render(
-      <NativeSearch datasource={{} as TempoDatasource} query={mockQuery} onChange={() => {}} onRunQuery={() => {}} />
-    );
-
-    const select = await screen.findByRole('combobox', { name: 'select-service-name' });
-    await user.click(select);
-    jest.advanceTimersByTime(1000);
-    expect(select).toBeInTheDocument();
-
-    await user.type(select, 'd');
-    let option = await screen.findByText('driver');
-    expect(option).toBeDefined();
-
-    await user.type(select, 'a');
-    option = await screen.findByText('Hit enter to add');
-    expect(option).toBeDefined();
-  });
-
-  it('should add variable to select menu options', async () => {
-    mockQuery = {
-      ...mockQuery,
-      refId: '121314',
-      serviceName: '$service',
-      spanName: '$span',
-    };
-
-    render(
-      <NativeSearch datasource={{} as TempoDatasource} query={mockQuery} onChange={() => {}} onRunQuery={() => {}} />
-    );
-
-    const asyncServiceSelect = screen.getByRole('combobox', { name: 'select-service-name' });
-    expect(asyncServiceSelect).toBeInTheDocument();
-    await user.click(asyncServiceSelect);
-    jest.advanceTimersByTime(3000);
-
-    await user.type(asyncServiceSelect, '$');
-    const serviceOption = await screen.findByText('$service');
-    expect(serviceOption).toBeDefined();
-
-    const asyncSpanSelect = screen.getByRole('combobox', { name: 'select-span-name' });
-    expect(asyncSpanSelect).toBeInTheDocument();
-    await user.click(asyncSpanSelect);
-    jest.advanceTimersByTime(3000);
-
-    await user.type(asyncSpanSelect, '$');
-    const operationOption = await screen.findByText('$span');
-    expect(operationOption).toBeDefined();
-  });
-});
diff --git a/public/app/plugins/datasource/tempo/NativeSearch/NativeSearch.tsx b/public/app/plugins/datasource/tempo/NativeSearch/NativeSearch.tsx
deleted file mode 100644
index 34c3c00a35f0c..0000000000000
--- a/public/app/plugins/datasource/tempo/NativeSearch/NativeSearch.tsx
+++ /dev/null
@@ -1,272 +0,0 @@
-import { css } from '@emotion/css';
-import React, { useCallback, useState, useEffect, useMemo } from 'react';
-
-import { GrafanaTheme2, isValidGoDuration, SelectableValue, toOption } from '@grafana/data';
-import { FetchError, getTemplateSrv, isFetchError, TemplateSrv } from '@grafana/runtime';
-import { InlineFieldRow, InlineField, Input, Alert, useStyles2, fuzzyMatch, Select } from '@grafana/ui';
-import { notifyApp } from 'app/core/actions';
-import { createErrorNotification } from 'app/core/copy/appNotification';
-import { dispatch } from 'app/store/store';
-
-import { DEFAULT_LIMIT, TempoDatasource } from '../datasource';
-import TempoLanguageProvider from '../language_provider';
-import { TempoQuery } from '../types';
-
-import { TagsField } from './TagsField/TagsField';
-
-interface Props {
-  datasource: TempoDatasource;
-  query: TempoQuery;
-  onChange: (value: TempoQuery) => void;
-  onBlur?: () => void;
-  onRunQuery: () => void;
-}
-
-const durationPlaceholder = 'e.g. 1.2s, 100ms';
-
-const NativeSearch = ({ datasource, query, onChange, onBlur, onRunQuery }: Props) => {
-  const styles = useStyles2(getStyles);
-  const languageProvider = useMemo(() => new TempoLanguageProvider(datasource), [datasource]);
-  const [serviceOptions, setServiceOptions] = useState<Array<SelectableValue<string>>>();
-  const [spanOptions, setSpanOptions] = useState<Array<SelectableValue<string>>>();
-  const [error, setError] = useState<Error | FetchError | null>(null);
-  const [inputErrors, setInputErrors] = useState<{ [key: string]: boolean }>({});
-  const [isLoading, setIsLoading] = useState<{
-    serviceName: boolean;
-    spanName: boolean;
-  }>({
-    serviceName: false,
-    spanName: false,
-  });
-
-  const loadOptions = useCallback(
-    async (name: string, query = '') => {
-      const lpName = name === 'serviceName' ? 'service.name' : 'name';
-      setIsLoading((prevValue) => ({ ...prevValue, [name]: true }));
-
-      try {
-        const options = await languageProvider.getOptionsV1(lpName);
-        const filteredOptions = options.filter((item) => (item.value ? fuzzyMatch(item.value, query).found : false));
-        return filteredOptions;
-      } catch (error) {
-        if (isFetchError(error) && error?.status === 404) {
-          setError(error);
-        } else if (error instanceof Error) {
-          dispatch(notifyApp(createErrorNotification('Error', error)));
-        }
-        return [];
-      } finally {
-        setIsLoading((prevValue) => ({ ...prevValue, [name]: false }));
-      }
-    },
-    [languageProvider]
-  );
-
-  useEffect(() => {
-    const fetchOptions = async () => {
-      try {
-        const [services, spans] = await Promise.all([loadOptions('serviceName'), loadOptions('spanName')]);
-        if (query.serviceName && getTemplateSrv().containsTemplate(query.serviceName)) {
-          services.push(toOption(query.serviceName));
-        }
-        setServiceOptions(services);
-        if (query.spanName && getTemplateSrv().containsTemplate(query.spanName)) {
-          spans.push(toOption(query.spanName));
-        }
-        setSpanOptions(spans);
-      } catch (error) {
-        // Display message if Tempo is connected but search 404's
-        if (isFetchError(error) && error?.status === 404) {
-          setError(error);
-        } else if (error instanceof Error) {
-          dispatch(notifyApp(createErrorNotification('Error', error)));
-        }
-      }
-    };
-    fetchOptions();
-  }, [languageProvider, loadOptions, query.serviceName, query.spanName]);
-
-  const onKeyDown = (keyEvent: React.KeyboardEvent) => {
-    if (keyEvent.key === 'Enter' && (keyEvent.shiftKey || keyEvent.ctrlKey)) {
-      onRunQuery();
-    }
-  };
-
-  const handleOnChange = useCallback(
-    (value: string) => {
-      onChange({
-        ...query,
-        search: value,
-      });
-    },
-    [onChange, query]
-  );
-
-  const templateSrv: TemplateSrv = getTemplateSrv();
-
-  return (
-    <>
-      <div className={styles.container}>
-        <Alert title="Deprecated query type" severity="warning">
-          This query type has been deprecated and will be removed in Grafana v10.3. Please migrate to another Tempo
-          query type.
-        </Alert>
-        <InlineFieldRow>
-          <InlineField label="Service Name" labelWidth={14} grow>
-            <Select
-              inputId="service"
-              options={serviceOptions}
-              onOpenMenu={() => {
-                loadOptions('serviceName');
-              }}
-              isLoading={isLoading.serviceName}
-              value={serviceOptions?.find((v) => v?.value === query.serviceName) || query.serviceName}
-              onChange={(v) => {
-                onChange({
-                  ...query,
-                  serviceName: v?.value,
-                });
-              }}
-              placeholder="Select a service"
-              isClearable
-              onKeyDown={onKeyDown}
-              aria-label={'select-service-name'}
-              allowCustomValue={true}
-            />
-          </InlineField>
-        </InlineFieldRow>
-        <InlineFieldRow>
-          <InlineField label="Span Name" labelWidth={14} grow>
-            <Select
-              inputId="spanName"
-              options={spanOptions}
-              onOpenMenu={() => {
-                loadOptions('spanName');
-              }}
-              isLoading={isLoading.spanName}
-              value={spanOptions?.find((v) => v?.value === query.spanName) || query.spanName}
-              onChange={(v) => {
-                onChange({
-                  ...query,
-                  spanName: v?.value,
-                });
-              }}
-              placeholder="Select a span"
-              isClearable
-              onKeyDown={onKeyDown}
-              aria-label={'select-span-name'}
-              allowCustomValue={true}
-            />
-          </InlineField>
-        </InlineFieldRow>
-        <InlineFieldRow>
-          <InlineField label="Tags" labelWidth={14} grow tooltip="Values should be in logfmt.">
-            <TagsField
-              placeholder="http.status_code=200 error=true"
-              value={query.search || ''}
-              onChange={handleOnChange}
-              onBlur={onBlur}
-              datasource={datasource}
-            />
-          </InlineField>
-        </InlineFieldRow>
-        <InlineFieldRow>
-          <InlineField label="Min Duration" invalid={!!inputErrors.minDuration} labelWidth={14} grow>
-            <Input
-              id="minDuration"
-              value={query.minDuration || ''}
-              placeholder={durationPlaceholder}
-              onBlur={() => {
-                const templatedMinDuration = templateSrv.replace(query.minDuration ?? '');
-                if (query.minDuration && !isValidGoDuration(templatedMinDuration)) {
-                  setInputErrors({ ...inputErrors, minDuration: true });
-                } else {
-                  setInputErrors({ ...inputErrors, minDuration: false });
-                }
-              }}
-              onChange={(v) =>
-                onChange({
-                  ...query,
-                  minDuration: v.currentTarget.value,
-                })
-              }
-              onKeyDown={onKeyDown}
-            />
-          </InlineField>
-        </InlineFieldRow>
-        <InlineFieldRow>
-          <InlineField label="Max Duration" invalid={!!inputErrors.maxDuration} labelWidth={14} grow>
-            <Input
-              id="maxDuration"
-              value={query.maxDuration || ''}
-              placeholder={durationPlaceholder}
-              onBlur={() => {
-                const templatedMaxDuration = templateSrv.replace(query.maxDuration ?? '');
-                if (query.maxDuration && !isValidGoDuration(templatedMaxDuration)) {
-                  setInputErrors({ ...inputErrors, maxDuration: true });
-                } else {
-                  setInputErrors({ ...inputErrors, maxDuration: false });
-                }
-              }}
-              onChange={(v) =>
-                onChange({
-                  ...query,
-                  maxDuration: v.currentTarget.value,
-                })
-              }
-              onKeyDown={onKeyDown}
-            />
-          </InlineField>
-        </InlineFieldRow>
-        <InlineFieldRow>
-          <InlineField
-            label="Limit"
-            invalid={!!inputErrors.limit}
-            labelWidth={14}
-            grow
-            tooltip="Maximum number of returned results"
-          >
-            <Input
-              id="limit"
-              value={query.limit || ''}
-              placeholder={`Default: ${DEFAULT_LIMIT}`}
-              type="number"
-              onChange={(v) => {
-                let limit = v.currentTarget.value ? parseInt(v.currentTarget.value, 10) : undefined;
-                if (limit && (!Number.isInteger(limit) || limit <= 0)) {
-                  setInputErrors({ ...inputErrors, limit: true });
-                } else {
-                  setInputErrors({ ...inputErrors, limit: false });
-                }
-
-                onChange({
-                  ...query,
-                  limit: v.currentTarget.value ? parseInt(v.currentTarget.value, 10) : undefined,
-                });
-              }}
-              onKeyDown={onKeyDown}
-            />
-          </InlineField>
-        </InlineFieldRow>
-      </div>
-      {error ? (
-        <Alert title="Unable to connect to Tempo search" severity="info" className={styles.alert}>
-          Please ensure that Tempo is configured with search enabled. If you would like to hide this tab, you can
-          configure it in the <a href={`/datasources/edit/${datasource.uid}`}>datasource settings</a>.
-        </Alert>
-      ) : null}
-    </>
-  );
-};
-
-export default NativeSearch;
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  container: css`
-    max-width: 500px;
-  `,
-  alert: css`
-    max-width: 75ch;
-    margin-top: ${theme.spacing(2)};
-  `,
-});
diff --git a/public/app/plugins/datasource/tempo/NativeSearch/TagsField/TagsField.tsx b/public/app/plugins/datasource/tempo/NativeSearch/TagsField/TagsField.tsx
deleted file mode 100644
index 236b99eee0c5b..0000000000000
--- a/public/app/plugins/datasource/tempo/NativeSearch/TagsField/TagsField.tsx
+++ /dev/null
@@ -1,182 +0,0 @@
-import { css } from '@emotion/css';
-import React, { useEffect, useRef } from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { CodeEditor, Monaco, monacoTypes, useTheme2 } from '@grafana/ui';
-
-import { createErrorNotification } from '../../../../../core/copy/appNotification';
-import { notifyApp } from '../../../../../core/reducers/appNotification';
-import { dispatch } from '../../../../../store/store';
-import { TempoDatasource } from '../../datasource';
-
-import { CompletionProvider } from './autocomplete';
-import { languageDefinition } from './syntax';
-
-interface Props {
-  placeholder: string;
-  value: string;
-  onChange: (val: string) => void;
-  onBlur?: () => void;
-  datasource: TempoDatasource;
-}
-
-export function TagsField(props: Props) {
-  const { onChange, onBlur, placeholder } = props;
-  const setupAutocompleteFn = useAutocomplete(props.datasource);
-  const theme = useTheme2();
-  const styles = getStyles(theme, placeholder);
-
-  return (
-    <CodeEditor
-      value={props.value}
-      language={langId}
-      onBlur={onBlur}
-      onChange={onChange}
-      containerStyles={styles.queryField}
-      monacoOptions={{
-        folding: false,
-        fontSize: 14,
-        lineNumbers: 'off',
-        overviewRulerLanes: 0,
-        renderLineHighlight: 'none',
-        scrollbar: {
-          vertical: 'hidden',
-          verticalScrollbarSize: 8, // used as "padding-right"
-          horizontal: 'hidden',
-          horizontalScrollbarSize: 0,
-        },
-        scrollBeyondLastLine: false,
-        wordWrap: 'on',
-      }}
-      onBeforeEditorMount={ensureTraceQL}
-      onEditorDidMount={(editor, monaco) => {
-        setupAutocompleteFn(editor, monaco);
-        setupPlaceholder(editor, monaco, styles);
-        setupAutoSize(editor);
-      }}
-    />
-  );
-}
-
-function setupPlaceholder(editor: monacoTypes.editor.IStandaloneCodeEditor, monaco: Monaco, styles: EditorStyles) {
-  const placeholderDecorators = [
-    {
-      range: new monaco.Range(1, 1, 1, 1),
-      options: {
-        className: styles.placeholder, // The placeholder text is in styles.placeholder
-        isWholeLine: true,
-      },
-    },
-  ];
-
-  let decorators: string[] = [];
-
-  const checkDecorators = (): void => {
-    const model = editor.getModel();
-
-    if (!model) {
-      return;
-    }
-
-    const newDecorators = model.getValueLength() === 0 ? placeholderDecorators : [];
-    decorators = model.deltaDecorations(decorators, newDecorators);
-  };
-
-  checkDecorators();
-  editor.onDidChangeModelContent(checkDecorators);
-}
-
-function setupAutoSize(editor: monacoTypes.editor.IStandaloneCodeEditor) {
-  const container = editor.getDomNode();
-  const updateHeight = () => {
-    if (container) {
-      const contentHeight = Math.min(1000, editor.getContentHeight());
-      const width = parseInt(container.style.width, 10);
-      container.style.width = `${width}px`;
-      container.style.height = `${contentHeight}px`;
-      editor.layout({ width, height: contentHeight });
-    }
-  };
-  editor.onDidContentSizeChange(updateHeight);
-  updateHeight();
-}
-
-/**
- * Hook that returns function that will set up monaco autocomplete for the label selector
- * @param datasource
- */
-function useAutocomplete(datasource: TempoDatasource) {
-  // We need the provider ref so we can pass it the label/values data later. This is because we run the call for the
-  // values here but there is additional setup needed for the provider later on. We could run the getSeries() in the
-  // returned function but that is run after the monaco is mounted so would delay the request a bit when it does not
-  // need to.
-  const providerRef = useRef<CompletionProvider>(
-    new CompletionProvider({ languageProvider: datasource.languageProvider })
-  );
-
-  useEffect(() => {
-    const fetchTags = async () => {
-      try {
-        await datasource.languageProvider.start();
-      } catch (error) {
-        if (error instanceof Error) {
-          dispatch(notifyApp(createErrorNotification('Error', error)));
-        }
-      }
-    };
-    fetchTags();
-  }, [datasource]);
-
-  const autocompleteDisposeFun = useRef<(() => void) | null>(null);
-  useEffect(() => {
-    // when we unmount, we unregister the autocomplete-function, if it was registered
-    return () => {
-      autocompleteDisposeFun.current?.();
-    };
-  }, []);
-
-  // This should be run in monaco onEditorDidMount
-  return (editor: monacoTypes.editor.IStandaloneCodeEditor, monaco: Monaco) => {
-    providerRef.current.editor = editor;
-    providerRef.current.monaco = monaco;
-
-    const { dispose } = monaco.languages.registerCompletionItemProvider(langId, providerRef.current);
-    autocompleteDisposeFun.current = dispose;
-  };
-}
-
-// we must only run the setup code once
-let setupDone = false;
-const langId = 'tagsfield';
-
-function ensureTraceQL(monaco: Monaco) {
-  if (!setupDone) {
-    setupDone = true;
-    const { aliases, extensions, mimetypes, def } = languageDefinition;
-    monaco.languages.register({ id: langId, aliases, extensions, mimetypes });
-    monaco.languages.setMonarchTokensProvider(langId, def.language);
-    monaco.languages.setLanguageConfiguration(langId, def.languageConfiguration);
-  }
-}
-
-interface EditorStyles {
-  placeholder: string;
-  queryField: string;
-}
-
-const getStyles = (theme: GrafanaTheme2, placeholder: string): EditorStyles => {
-  return {
-    queryField: css`
-      border-radius: ${theme.shape.radius.default};
-      border: 1px solid ${theme.components.input.borderColor};
-      flex: 1;
-    `,
-    placeholder: css`
-      ::after {
-        content: '${placeholder}';
-        font-family: ${theme.typography.fontFamilyMonospace};
-        opacity: 0.3;
-      }
-    `,
-  };
-};
diff --git a/public/app/plugins/datasource/tempo/NativeSearch/TagsField/autocomplete.ts b/public/app/plugins/datasource/tempo/NativeSearch/TagsField/autocomplete.ts
deleted file mode 100644
index 0b8be238785dc..0000000000000
--- a/public/app/plugins/datasource/tempo/NativeSearch/TagsField/autocomplete.ts
+++ /dev/null
@@ -1,245 +0,0 @@
-import { SelectableValue } from '@grafana/data';
-import type { Monaco, monacoTypes } from '@grafana/ui';
-
-import TempoLanguageProvider from '../../language_provider';
-
-interface Props {
-  languageProvider: TempoLanguageProvider;
-}
-
-/**
- * Class that implements CompletionItemProvider interface and allows us to provide suggestion for the Monaco
- * autocomplete system.
- */
-export class CompletionProvider implements monacoTypes.languages.CompletionItemProvider {
-  languageProvider: TempoLanguageProvider;
-
-  constructor(props: Props) {
-    this.languageProvider = props.languageProvider;
-  }
-
-  triggerCharacters = ['=', ' '];
-
-  // We set these directly and ae required for the provider to function.
-  monaco: Monaco | undefined;
-  editor: monacoTypes.editor.IStandaloneCodeEditor | undefined;
-
-  private cachedValues: { [key: string]: Array<SelectableValue<string>> } = {};
-
-  provideCompletionItems(
-    model: monacoTypes.editor.ITextModel,
-    position: monacoTypes.Position
-  ): monacoTypes.languages.ProviderResult<monacoTypes.languages.CompletionList> {
-    // Should not happen, this should not be called before it is initialized
-    if (!(this.monaco && this.editor)) {
-      throw new Error('provideCompletionItems called before CompletionProvider was initialized');
-    }
-
-    // if the model-id does not match, then this call is from a different editor-instance,
-    // not "our instance", so return nothing
-    if (this.editor.getModel()?.id !== model.id) {
-      return { suggestions: [] };
-    }
-
-    const { range, offset } = getRangeAndOffset(this.monaco, model, position);
-    const situation = this.getSituation(model.getValue(), offset);
-    const completionItems = this.getCompletions(situation);
-
-    return completionItems.then((items) => {
-      // monaco by-default alphabetically orders the items.
-      // to stop it, we use a number-as-string sortkey,
-      // so that monaco keeps the order we use
-      const maxIndexDigits = items.length.toString().length;
-      const suggestions: monacoTypes.languages.CompletionItem[] = items.map((item, index) => {
-        const suggestion: monacoTypes.languages.CompletionItem = {
-          kind: getMonacoCompletionItemKind(item.type, this.monaco!),
-          label: item.label,
-          insertText: item.insertText,
-          sortText: index.toString().padStart(maxIndexDigits, '0'), // to force the order we have
-          range,
-        };
-        return suggestion;
-      });
-      return { suggestions };
-    });
-  }
-
-  private async getTagValues(tagName: string): Promise<Array<SelectableValue<string>>> {
-    let tagValues: Array<SelectableValue<string>>;
-
-    if (this.cachedValues.hasOwnProperty(tagName)) {
-      tagValues = this.cachedValues[tagName];
-    } else {
-      tagValues = await this.languageProvider.getOptionsV1(tagName);
-      this.cachedValues[tagName] = tagValues;
-    }
-    return tagValues;
-  }
-
-  /**
-   * Get suggestion based on the situation we are in like whether we should suggest tag names or values.
-   * @param situation
-   * @private
-   */
-  private async getCompletions(situation: Situation): Promise<Completion[]> {
-    switch (situation.type) {
-      // Not really sure what would make sense to suggest in this case so just leave it
-      case 'UNKNOWN': {
-        return [];
-      }
-      case 'EMPTY': {
-        return this.getTagsCompletions();
-      }
-      case 'IN_NAME':
-        return this.getTagsCompletions();
-      case 'IN_VALUE':
-        const tagValues = await this.getTagValues(situation.tagName);
-        const items: Completion[] = [];
-
-        const getInsertionText = (val: SelectableValue<string>): string => `"${val.label}"`;
-
-        tagValues.forEach((val) => {
-          if (val?.label) {
-            items.push({
-              label: val.label,
-              insertText: getInsertionText(val),
-              type: 'TAG_VALUE',
-            });
-          }
-        });
-        return items;
-      default:
-        throw new Error(`Unexpected situation ${situation}`);
-    }
-  }
-
-  private getTagsCompletions(): Completion[] {
-    const tags = this.languageProvider.getAutocompleteTags();
-    return tags
-      .sort((a, b) => a.localeCompare(b, undefined, { sensitivity: 'accent' }))
-      .map((key) => ({
-        label: key,
-        insertText: key,
-        type: 'TAG_NAME',
-      }));
-  }
-
-  /**
-   * Figure out where is the cursor and what kind of suggestions are appropriate.
-   * @param text
-   * @param offset
-   */
-  private getSituation(text: string, offset: number): Situation {
-    if (text === '' || offset === 0 || text[text.length - 1] === ' ') {
-      return {
-        type: 'EMPTY',
-      };
-    }
-
-    const textUntilCaret = text.substring(0, offset);
-
-    const regex = /(?<key>[^= ]+)(?<equals>=)?(?<value>([^ "]+)|"([^"]*)")?/;
-    const matches = textUntilCaret.match(new RegExp(regex, 'g'));
-
-    if (matches?.length) {
-      const last = matches[matches.length - 1];
-      const lastMatched = last.match(regex);
-      if (lastMatched) {
-        const key = lastMatched.groups?.key;
-        const equals = lastMatched.groups?.equals;
-
-        if (!key) {
-          return {
-            type: 'EMPTY',
-          };
-        }
-
-        if (!equals) {
-          return {
-            type: 'IN_NAME',
-          };
-        }
-
-        return {
-          type: 'IN_VALUE',
-          tagName: key,
-        };
-      }
-    }
-
-    return {
-      type: 'EMPTY',
-    };
-  }
-}
-
-/**
- * Get item kind which is used for icon next to the suggestion.
- * @param type
- * @param monaco
- */
-function getMonacoCompletionItemKind(type: CompletionType, monaco: Monaco): monacoTypes.languages.CompletionItemKind {
-  switch (type) {
-    case 'TAG_NAME':
-      return monaco.languages.CompletionItemKind.Enum;
-    case 'KEYWORD':
-      return monaco.languages.CompletionItemKind.Keyword;
-    case 'OPERATOR':
-      return monaco.languages.CompletionItemKind.Operator;
-    case 'TAG_VALUE':
-      return monaco.languages.CompletionItemKind.EnumMember;
-    case 'SCOPE':
-      return monaco.languages.CompletionItemKind.Class;
-    default:
-      throw new Error(`Unexpected CompletionType: ${type}`);
-  }
-}
-
-export type CompletionType = 'TAG_NAME' | 'TAG_VALUE' | 'KEYWORD' | 'OPERATOR' | 'SCOPE';
-type Completion = {
-  type: CompletionType;
-  label: string;
-  insertText: string;
-};
-
-export type Tag = {
-  name: string;
-  value: string;
-};
-
-export type Situation =
-  | {
-      type: 'UNKNOWN';
-    }
-  | {
-      type: 'EMPTY';
-    }
-  | {
-      type: 'IN_NAME';
-    }
-  | {
-      type: 'IN_VALUE';
-      tagName: string;
-    };
-
-function getRangeAndOffset(monaco: Monaco, model: monacoTypes.editor.ITextModel, position: monacoTypes.Position) {
-  const word = model.getWordAtPosition(position);
-  const range =
-    word != null
-      ? monaco.Range.lift({
-          startLineNumber: position.lineNumber,
-          endLineNumber: position.lineNumber,
-          startColumn: word.startColumn,
-          endColumn: word.endColumn,
-        })
-      : monaco.Range.fromPositions(position);
-
-  // documentation says `position` will be "adjusted" in `getOffsetAt` so we clone it here just for sure.
-  const positionClone = {
-    column: position.column,
-    lineNumber: position.lineNumber,
-  };
-
-  const offset = model.getOffsetAt(positionClone);
-  return { offset, range };
-}
diff --git a/public/app/plugins/datasource/tempo/NativeSearch/TagsField/syntax.ts b/public/app/plugins/datasource/tempo/NativeSearch/TagsField/syntax.ts
deleted file mode 100644
index 6dd942b2f119a..0000000000000
--- a/public/app/plugins/datasource/tempo/NativeSearch/TagsField/syntax.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-import type { languages } from 'monaco-editor';
-
-export const languageConfiguration: languages.LanguageConfiguration = {
-  // the default separators except `@$`
-  wordPattern: /(-?\d*\.\d\w*)|([^`~!#%^&*()\-=+\[{\]}\\|;:'",.<>\/?\s]+)/g,
-  brackets: [
-    ['{', '}'],
-    ['(', ')'],
-  ],
-  autoClosingPairs: [
-    { open: '{', close: '}' },
-    { open: '(', close: ')' },
-    { open: '"', close: '"' },
-    { open: "'", close: "'" },
-  ],
-  surroundingPairs: [
-    { open: '{', close: '}' },
-    { open: '(', close: ')' },
-    { open: '"', close: '"' },
-    { open: "'", close: "'" },
-  ],
-  folding: {},
-};
-
-const operators = ['='];
-
-export const language: languages.IMonarchLanguage = {
-  ignoreCase: false,
-  defaultToken: '',
-  tokenPostfix: '.tagsfield',
-
-  operators,
-
-  // we include these common regular expressions
-  symbols: /[=><!~?:&|+\-*\/^%]+/,
-  escapes: /\\(?:[abfnrtv\\"']|x[0-9A-Fa-f]{1,4}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})/,
-  digits: /\d+(_+\d+)*/,
-  octaldigits: /[0-7]+(_+[0-7]+)*/,
-  binarydigits: /[0-1]+(_+[0-1]+)*/,
-  hexdigits: /[[0-9a-fA-F]+(_+[0-9a-fA-F]+)*/,
-  integersuffix: /(ll|LL|u|U|l|L)?(ll|LL|u|U|l|L)?/,
-  floatsuffix: /[fFlL]?/,
-
-  tokenizer: {
-    root: [
-      // labels
-      [/[a-z_.][\w./_-]*(?=\s*(=|!=|>|<|>=|<=|=~|!~))/, 'tag'],
-
-      // all keywords have the same color
-      [
-        /[a-zA-Z_.]\w*/,
-        {
-          cases: {
-            '@default': 'identifier',
-          },
-        },
-      ],
-
-      // strings
-      [/"([^"\\]|\\.)*$/, 'string.invalid'], // non-teminated string
-      [/'([^'\\]|\\.)*$/, 'string.invalid'], // non-teminated string
-      [/"/, 'string', '@string_double'],
-      [/'/, 'string', '@string_single'],
-
-      // whitespace
-      { include: '@whitespace' },
-
-      // delimiters and operators
-      [/[{}()\[\]]/, '@brackets'],
-      [/[<>](?!@symbols)/, '@brackets'],
-      [
-        /@symbols/,
-        {
-          cases: {
-            '@operators': 'delimiter',
-            '@default': '',
-          },
-        },
-      ],
-
-      // numbers
-      [/\d+/, 'number'],
-      [/\d*\d+[eE]([\-+]?\d+)?(@floatsuffix)/, 'number.float'],
-      [/\d*\.\d+([eE][\-+]?\d+)?(@floatsuffix)/, 'number.float'],
-      [/0[xX][0-9a-fA-F']*[0-9a-fA-F](@integersuffix)/, 'number.hex'],
-      [/0[0-7']*[0-7](@integersuffix)/, 'number.octal'],
-      [/0[bB][0-1']*[0-1](@integersuffix)/, 'number.binary'],
-      [/\d[\d']*\d(@integersuffix)/, 'number'],
-      [/\d(@integersuffix)/, 'number'],
-    ],
-
-    string_double: [
-      [/[^\\"]+/, 'string'],
-      [/@escapes/, 'string.escape'],
-      [/\\./, 'string.escape.invalid'],
-      [/"/, 'string', '@pop'],
-    ],
-
-    string_single: [
-      [/[^\\']+/, 'string'],
-      [/@escapes/, 'string.escape'],
-      [/\\./, 'string.escape.invalid'],
-      [/'/, 'string', '@pop'],
-    ],
-
-    clauses: [
-      [/[^(,)]/, 'tag'],
-      [/\)/, 'identifier', '@pop'],
-    ],
-
-    whitespace: [[/[ \t\r\n]+/, 'white']],
-  },
-};
-
-export const languageDefinition = {
-  id: 'tagsfield',
-  extensions: ['.tagsfield'],
-  aliases: ['tagsfield'],
-  mimetypes: [],
-  def: {
-    language,
-    languageConfiguration,
-  },
-};
diff --git a/public/app/plugins/datasource/tempo/QueryField.tsx b/public/app/plugins/datasource/tempo/QueryField.tsx
index 60ce8bc2a27b3..3196be57ba9e5 100644
--- a/public/app/plugins/datasource/tempo/QueryField.tsx
+++ b/public/app/plugins/datasource/tempo/QueryField.tsx
@@ -15,16 +15,13 @@ import {
   withTheme2,
 } from '@grafana/ui';
 
-import { LokiQuery } from '../loki/types';
-
-import { LokiSearch } from './LokiSearch';
-import NativeSearch from './NativeSearch/NativeSearch';
 import TraceQLSearch from './SearchTraceQLEditor/TraceQLSearch';
 import { ServiceGraphSection } from './ServiceGraphSection';
 import { TempoQueryType } from './dataquery.gen';
 import { TempoDatasource } from './datasource';
 import { QueryEditor } from './traceql/QueryEditor';
 import { TempoQuery } from './types';
+import { migrateFromSearchToTraceQLSearch } from './utils';
 
 interface Props extends QueryEditorProps<TempoDatasource, TempoQuery>, Themeable2 {}
 interface State {
@@ -56,18 +53,6 @@ class TempoQueryFieldComponent extends React.PureComponent<Props, State> {
     }
   }
 
-  onChangeLinkedQuery = (value: LokiQuery) => {
-    const { query, onChange } = this.props;
-    onChange({
-      ...query,
-      linkedQuery: { ...value, refId: 'linked' },
-    });
-  };
-
-  onRunLinkedQuery = () => {
-    this.props.onRunQuery();
-  };
-
   onClearResults = () => {
     // Run clear query to clear results
     const { onChange, query, onRunQuery } = this.props;
@@ -81,8 +66,6 @@ class TempoQueryFieldComponent extends React.PureComponent<Props, State> {
   render() {
     const { query, onChange, datasource, app } = this.props;
 
-    const logsDatasourceUid = datasource.getLokiSearchDS();
-
     const graphDatasourceUid = datasource.serviceMap?.datasourceUid;
 
     let queryTypeOptions: Array<SelectableValue<TempoQueryType>> = [
@@ -91,17 +74,7 @@ class TempoQueryFieldComponent extends React.PureComponent<Props, State> {
       { value: 'serviceMap', label: 'Service Graph' },
     ];
 
-    if (logsDatasourceUid) {
-      if (datasource?.search?.hide) {
-        // Place at beginning as Search if no native search
-        queryTypeOptions.unshift({ value: 'search', label: 'Search' });
-      } else {
-        // Place at end as Loki Search if native search is enabled
-        queryTypeOptions.push({ value: 'search', label: 'Loki Search' });
-      }
-    }
-
-    // Show the deprecated search option if any of the deprecated search fields are set
+    // Migrate user to new query type if they are using the old search query type
     if (
       query.spanName ||
       query.serviceName ||
@@ -110,7 +83,7 @@ class TempoQueryFieldComponent extends React.PureComponent<Props, State> {
       query.minDuration ||
       query.queryType === 'nativeSearch'
     ) {
-      queryTypeOptions.unshift({ value: 'nativeSearch', label: '[Deprecated] Search' });
+      onChange(migrateFromSearchToTraceQLSearch(query));
     }
 
     return (
@@ -124,6 +97,9 @@ class TempoQueryFieldComponent extends React.PureComponent<Props, State> {
             <FileDropzone
               options={{ multiple: false }}
               onLoad={(result) => {
+                if (typeof result !== 'string' && result !== null) {
+                  throw Error(`Unexpected result type: ${typeof result}`);
+                }
                 this.props.datasource.uploadedJson = result;
                 onChange({
                   ...query,
@@ -151,7 +127,6 @@ class TempoQueryFieldComponent extends React.PureComponent<Props, State> {
                   });
 
                   this.onClearResults();
-
                   onChange({
                     ...query,
                     queryType: v,
@@ -171,29 +146,14 @@ class TempoQueryFieldComponent extends React.PureComponent<Props, State> {
             </HorizontalGroup>
           </InlineField>
         </InlineFieldRow>
-        {query.queryType === 'search' && (
-          <LokiSearch
-            logsDatasourceUid={logsDatasourceUid}
-            query={query}
-            onRunQuery={this.onRunLinkedQuery}
-            onChange={this.onChangeLinkedQuery}
-          />
-        )}
-        {query.queryType === 'nativeSearch' && (
-          <NativeSearch
-            datasource={this.props.datasource}
-            query={query}
-            onChange={onChange}
-            onBlur={this.props.onBlur}
-            onRunQuery={this.props.onRunQuery}
-          />
-        )}
         {query.queryType === 'traceqlSearch' && (
           <TraceQLSearch
             datasource={this.props.datasource}
             query={query}
             onChange={onChange}
             onBlur={this.props.onBlur}
+            app={app}
+            onClearResults={this.onClearResults}
           />
         )}
         {query.queryType === 'serviceMap' && (
@@ -205,6 +165,8 @@ class TempoQueryFieldComponent extends React.PureComponent<Props, State> {
             query={query}
             onRunQuery={this.props.onRunQuery}
             onChange={onChange}
+            app={app}
+            onClearResults={this.onClearResults}
           />
         )}
       </>
diff --git a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/DurationInput.tsx b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/DurationInput.tsx
index 528099ca86cce..deea6014dabd4 100644
--- a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/DurationInput.tsx
+++ b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/DurationInput.tsx
@@ -18,12 +18,12 @@ interface Props {
 const validationRegex = /^(\$\w+)|(\d+(?:\.\d)?\d*(?:us|µs|ns|ms|s|m|h))$/;
 
 const getStyles = () => ({
-  noBoxShadow: css`
-    box-shadow: none;
-    *:focus {
-      box-shadow: none;
-    }
-  `,
+  noBoxShadow: css({
+    boxShadow: 'none',
+    '*:focus': {
+      boxShadow: 'none',
+    },
+  }),
 });
 
 const DurationInput = ({ filter, operators, updateFilter }: Props) => {
diff --git a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/GroupByField.test.tsx b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/GroupByField.test.tsx
index af230d44ecf4c..95ebbb01afc0e 100644
--- a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/GroupByField.test.tsx
+++ b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/GroupByField.test.tsx
@@ -1,6 +1,6 @@
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import React from 'react';
+import React, { useState } from 'react';
 
 import { TraceqlSearchScope } from '../dataquery.gen';
 import { TempoDatasource } from '../datasource';
@@ -46,6 +46,52 @@ describe('GroupByField', () => {
     jest.useRealTimers();
   });
 
+  it('should only show add/remove tag when necessary', async () => {
+    const GroupByWithProps = () => {
+      const [query, setQuery] = useState<TempoQuery>({
+        refId: 'A',
+        queryType: 'traceqlSearch',
+        key: 'Q-595a9bbc-2a25-49a7-9249-a52a0a475d83-0',
+        filters: [],
+        groupBy: [{ id: 'group-by-id', scope: TraceqlSearchScope.Span }],
+      });
+      return (
+        <GroupByField
+          datasource={datasource}
+          query={query}
+          onChange={(q: TempoQuery) => setQuery(q)}
+          isTagsLoading={false}
+        />
+      );
+    };
+    render(<GroupByWithProps />);
+    expect(screen.queryAllByLabelText('Add tag').length).toBe(0); // not filled in the default tag, so no need to add another one
+    expect(screen.queryAllByLabelText(/Remove tag/).length).toBe(0); // mot filled in the default tag, so no values to remove
+    expect(screen.getAllByText('Select tag').length).toBe(1);
+
+    await user.click(screen.getByText('Select tag'));
+    jest.advanceTimersByTime(1000);
+    await user.click(screen.getByText('http.method'));
+    jest.advanceTimersByTime(1000);
+    expect(screen.getAllByLabelText('Add tag').length).toBe(1);
+    expect(screen.getAllByLabelText(/Remove tag/).length).toBe(1);
+
+    await user.click(screen.getByLabelText('Add tag'));
+    jest.advanceTimersByTime(1000);
+    expect(screen.queryAllByLabelText('Add tag').length).toBe(0); // not filled in the new tag, so no need to add another one
+    expect(screen.getAllByLabelText(/Remove tag/).length).toBe(2); // one for each tag
+
+    await user.click(screen.getAllByLabelText(/Remove tag/)[1]);
+    jest.advanceTimersByTime(1000);
+    expect(screen.queryAllByLabelText('Add tag').length).toBe(1); // filled in the default tag, so can add another one
+    expect(screen.queryAllByLabelText(/Remove tag/).length).toBe(1); // filled in the default tag, so can remove values
+
+    await user.click(screen.getAllByLabelText(/Remove tag/)[0]);
+    jest.advanceTimersByTime(1000);
+    expect(screen.queryAllByLabelText('Add tag').length).toBe(0); // not filled in the default tag, so no need to add another one
+    expect(screen.queryAllByLabelText(/Remove tag/).length).toBe(0); // mot filled in the default tag, so no values to remove
+  });
+
   it('should update scope when new value is selected in scope input', async () => {
     const { container } = render(
       <GroupByField datasource={datasource} query={query} onChange={onChange} isTagsLoading={false} />
diff --git a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/GroupByField.tsx b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/GroupByField.tsx
index 93768010da0e8..e88ab32a21c28 100644
--- a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/GroupByField.tsx
+++ b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/GroupByField.tsx
@@ -101,16 +101,18 @@ export const GroupByField = (props: Props) => {
                 placeholder="Select tag"
                 value={f.tag || ''}
               />
-              <AccessoryButton
-                aria-label={`Remove tag for filter ${i + 1}`}
-                icon="times"
-                onClick={() => removeFilter(f)}
-                tooltip="Remove tag"
-                variant="secondary"
-              />
-
-              {i === (query.groupBy?.length ?? 0) - 1 && (
-                <span className={styles.addFilter}>
+              {(f.tag || (query.groupBy?.length ?? 0) > 1) && (
+                <AccessoryButton
+                  aria-label={`Remove tag for filter ${i + 1}`}
+                  icon="times"
+                  onClick={() => removeFilter(f)}
+                  tooltip="Remove tag"
+                  title={`Remove tag for filter ${i + 1}`}
+                  variant="secondary"
+                />
+              )}
+              {f.tag && i === (query.groupBy?.length ?? 0) - 1 && (
+                <span className={styles.addTag}>
                   <AccessoryButton
                     aria-label="Add tag"
                     icon="plus"
@@ -129,7 +131,7 @@ export const GroupByField = (props: Props) => {
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  addFilter: css`
-    margin-left: ${theme.spacing(2)};
-  `,
+  addTag: css({
+    marginLeft: theme.spacing(1),
+  }),
 });
diff --git a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/SearchField.test.tsx b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/SearchField.test.tsx
index 89bb1ad8be625..42a4935371feb 100644
--- a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/SearchField.test.tsx
+++ b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/SearchField.test.tsx
@@ -1,46 +1,29 @@
-import { render, screen } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
-import { initTemplateSrv } from 'test/helpers/initTemplateSrv';
 
-import { FetchError, setTemplateSrv } from '@grafana/runtime';
+import { LanguageProvider } from '@grafana/data';
 
 import { TraceqlFilter, TraceqlSearchScope } from '../dataquery.gen';
 import { TempoDatasource } from '../datasource';
+import TempoLanguageProvider from '../language_provider';
+import { initTemplateSrv } from '../test_utils';
+import { keywordOperators, numberOperators, operators, stringOperators } from '../traceql/traceql';
 
 import SearchField from './SearchField';
 
-const getOptionsV2 = jest.fn().mockImplementation(() => {
-  return new Promise((resolve) => {
-    setTimeout(() => {
-      resolve([
-        {
-          value: 'customer',
-          label: 'customer',
-          type: 'string',
-        },
-        {
-          value: 'driver',
-          label: 'driver',
-          type: 'string',
-        },
-      ]);
-    }, 1000);
-  });
-});
-
-jest.mock('../language_provider', () => {
-  return jest.fn().mockImplementation(() => {
-    return { getOptionsV2 };
-  });
-});
-
 describe('SearchField', () => {
-  let templateSrv = initTemplateSrv('key', [{ name: 'templateVariable1' }, { name: 'templateVariable2' }]);
   let user: ReturnType<typeof userEvent.setup>;
 
   beforeEach(() => {
-    setTemplateSrv(templateSrv);
+    const expectedValues = {
+      interpolationVar: 'interpolationText',
+      interpolationText: 'interpolationText',
+      interpolationVarWithPipe: 'interpolationTextOne|interpolationTextTwo',
+      scopedInterpolationText: 'scopedInterpolationText',
+    };
+    initTemplateSrv([{ name: 'templateVariable1' }, { name: 'templateVariable2' }], expectedValues);
+
     jest.useFakeTimers();
     // Need to use delay: null here to work with fakeTimers
     // see https://github.com/testing-library/user-event/issues/833
@@ -51,7 +34,7 @@ describe('SearchField', () => {
     jest.useRealTimers();
   });
 
-  it('should not render tag if hideTag is true', () => {
+  it('should not render tag if hideTag is true', async () => {
     const updateFilter = jest.fn((val) => {
       return val;
     });
@@ -59,9 +42,11 @@ describe('SearchField', () => {
 
     const { container } = renderSearchField(updateFilter, filter, [], true);
 
-    expect(container.querySelector(`input[aria-label="select test1 tag"]`)).not.toBeInTheDocument();
-    expect(container.querySelector(`input[aria-label="select test1 operator"]`)).toBeInTheDocument();
-    expect(container.querySelector(`input[aria-label="select test1 value"]`)).toBeInTheDocument();
+    await waitFor(async () => {
+      expect(container.querySelector(`input[aria-label="select test1 tag"]`)).not.toBeInTheDocument();
+      expect(container.querySelector(`input[aria-label="select test1 operator"]`)).toBeInTheDocument();
+      expect(container.querySelector(`input[aria-label="select test1 value"]`)).toBeInTheDocument();
+    });
   });
 
   it('should update operator when new value is selected in operator input', async () => {
@@ -71,7 +56,7 @@ describe('SearchField', () => {
     const filter: TraceqlFilter = { id: 'test1', operator: '=', valueType: 'string', tag: 'test-tag' };
     const { container } = renderSearchField(updateFilter, filter);
 
-    const select = await container.querySelector(`input[aria-label="select test1 operator"]`);
+    const select = container.querySelector(`input[aria-label="select test1 operator"]`);
     expect(select).not.toBeNull();
     expect(select).toBeInTheDocument();
     if (select) {
@@ -95,7 +80,7 @@ describe('SearchField', () => {
     };
     const { container } = renderSearchField(updateFilter, filter);
 
-    const select = await container.querySelector(`input[aria-label="select test1 value"]`);
+    const select = container.querySelector(`input[aria-label="select test1 value"]`);
     expect(select).not.toBeNull();
     expect(select).toBeInTheDocument();
     if (select) {
@@ -139,19 +124,19 @@ describe('SearchField', () => {
       jest.advanceTimersByTime(1000);
       const tag22 = await screen.findByText('tag22');
       await user.click(tag22);
-      expect(updateFilter).toHaveBeenCalledWith({ ...filter, tag: 'tag22' });
+      expect(updateFilter).toHaveBeenCalledWith({ ...filter, tag: 'tag22', value: [] });
 
       // Select tag1 as the tag
       await user.click(select);
       jest.advanceTimersByTime(1000);
       const tag1 = await screen.findByText('tag1');
       await user.click(tag1);
-      expect(updateFilter).toHaveBeenCalledWith({ ...filter, tag: 'tag1' });
+      expect(updateFilter).toHaveBeenCalledWith({ ...filter, tag: 'tag1', value: [] });
 
       // Remove the tag
       const tagRemove = await screen.findByLabelText('select-clear-value');
       await user.click(tagRemove);
-      expect(updateFilter).toHaveBeenCalledWith({ ...filter, value: undefined });
+      expect(updateFilter).toHaveBeenCalledWith({ ...filter, value: [] });
     }
   });
 
@@ -178,14 +163,112 @@ describe('SearchField', () => {
       expect(await screen.findByText('$templateVariable2')).toBeInTheDocument();
     }
   });
+
+  it('should only show keyword operators if options tag type is keyword', async () => {
+    const filter: TraceqlFilter = { id: 'test1', operator: '=', valueType: 'string', tag: 'test-tag' };
+    const lp = {
+      getOptionsV2: jest.fn().mockReturnValue([
+        {
+          value: 'ok',
+          label: 'ok',
+          type: 'keyword',
+        },
+      ]),
+    } as unknown as TempoLanguageProvider;
+
+    const { container } = renderSearchField(jest.fn(), filter, [], false, lp);
+    const select = container.querySelector(`input[aria-label="select test1 operator"]`);
+    if (select) {
+      await user.click(select);
+      await waitFor(async () => {
+        expect(screen.getByText('Equals')).toBeInTheDocument();
+        expect(screen.getByText('Not equals')).toBeInTheDocument();
+        operators
+          .filter((op) => !keywordOperators.includes(op))
+          .forEach((op) => {
+            expect(screen.queryByText(op)).not.toBeInTheDocument();
+          });
+      });
+    }
+  });
+
+  it('should only show string operators if options tag type is string', async () => {
+    const filter: TraceqlFilter = { id: 'test1', operator: '=', valueType: 'string', tag: 'test-tag' };
+    const { container } = renderSearchField(jest.fn(), filter);
+    const select = container.querySelector(`input[aria-label="select test1 operator"]`);
+    if (select) {
+      await user.click(select);
+      await waitFor(async () => {
+        expect(screen.getByText('Equals')).toBeInTheDocument();
+        expect(screen.getByText('Not equals')).toBeInTheDocument();
+        expect(screen.getByText('Matches regex')).toBeInTheDocument();
+        expect(screen.getByText('Does not match regex')).toBeInTheDocument();
+        operators
+          .filter((op) => !stringOperators.includes(op))
+          .forEach((op) => {
+            expect(screen.queryByText(op)).not.toBeInTheDocument();
+          });
+      });
+    }
+  });
+
+  it('should only show number operators if options tag type is number', async () => {
+    const filter: TraceqlFilter = { id: 'test1', operator: '=', valueType: 'string', tag: 'test-tag' };
+    const lp = {
+      getOptionsV2: jest.fn().mockReturnValue([
+        {
+          value: 200,
+          label: 200,
+          type: 'int',
+        },
+      ]),
+    } as unknown as TempoLanguageProvider;
+
+    const { container } = renderSearchField(jest.fn(), filter, [], false, lp);
+    const select = container.querySelector(`input[aria-label="select test1 operator"]`);
+    if (select) {
+      await user.click(select);
+      await waitFor(async () => {
+        expect(screen.getByText('Equals')).toBeInTheDocument();
+        expect(screen.getByText('Not equals')).toBeInTheDocument();
+        expect(screen.getByText('Greater')).toBeInTheDocument();
+        expect(screen.getByText('Less')).toBeInTheDocument();
+        expect(screen.getByText('Greater or Equal')).toBeInTheDocument();
+        expect(screen.getByText('Less or Equal')).toBeInTheDocument();
+        operators
+          .filter((op) => !numberOperators.includes(op))
+          .forEach((op) => {
+            expect(screen.queryByText(op)).not.toBeInTheDocument();
+          });
+      });
+    }
+  });
 });
 
 const renderSearchField = (
   updateFilter: (f: TraceqlFilter) => void,
   filter: TraceqlFilter,
   tags?: string[],
-  hideTag?: boolean
+  hideTag?: boolean,
+  lp?: LanguageProvider
 ) => {
+  const languageProvider =
+    lp ||
+    ({
+      getOptionsV2: jest.fn().mockReturnValue([
+        {
+          value: 'customer',
+          label: 'customer',
+          type: 'string',
+        },
+        {
+          value: 'driver',
+          label: 'driver',
+          type: 'string',
+        },
+      ]),
+    } as unknown as TempoLanguageProvider);
+
   const datasource: TempoDatasource = {
     search: {
       filters: [
@@ -198,15 +281,15 @@ const renderSearchField = (
         { id: 'span-name', type: 'static', tag: 'name', operator: '=', scope: TraceqlSearchScope.Span },
       ],
     },
+    languageProvider,
   } as TempoDatasource;
+
   return render(
     <SearchField
       datasource={datasource}
       updateFilter={updateFilter}
       filter={filter}
-      setError={function (error: FetchError): void {
-        throw error;
-      }}
+      setError={() => {}}
       tags={tags || []}
       hideTag={hideTag}
       query={'{}'}
diff --git a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/SearchField.tsx b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/SearchField.tsx
index 01424057f1750..eaaeda3222113 100644
--- a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/SearchField.tsx
+++ b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/SearchField.tsx
@@ -4,24 +4,20 @@ import React, { useState, useEffect, useMemo } from 'react';
 import useAsync from 'react-use/lib/useAsync';
 
 import { SelectableValue } from '@grafana/data';
-import { AccessoryButton } from '@grafana/experimental';
+import { TemporaryAlert } from '@grafana/o11y-ds-frontend';
 import { FetchError, getTemplateSrv, isFetchError } from '@grafana/runtime';
 import { Select, HorizontalGroup, useStyles2 } from '@grafana/ui';
 
-import { createErrorNotification } from '../../../../core/copy/appNotification';
-import { notifyApp } from '../../../../core/reducers/appNotification';
-import { dispatch } from '../../../../store/store';
 import { TraceqlFilter, TraceqlSearchScope } from '../dataquery.gen';
 import { TempoDatasource } from '../datasource';
-import TempoLanguageProvider from '../language_provider';
-import { operators as allOperators, stringOperators, numberOperators } from '../traceql/traceql';
+import { operators as allOperators, stringOperators, numberOperators, keywordOperators } from '../traceql/traceql';
 
 import { filterScopedTag, operatorSelectableValue } from './utils';
 
 const getStyles = () => ({
-  dropdown: css`
-    box-shadow: none;
-  `,
+  dropdown: css({
+    boxShadow: 'none',
+  }),
 });
 
 interface Props {
@@ -29,31 +25,32 @@ interface Props {
   datasource: TempoDatasource;
   updateFilter: (f: TraceqlFilter) => void;
   deleteFilter?: (f: TraceqlFilter) => void;
-  setError: (error: FetchError) => void;
+  setError: (error: FetchError | null) => void;
   isTagsLoading?: boolean;
   tags: string[];
   hideScope?: boolean;
   hideTag?: boolean;
   hideValue?: boolean;
-  allowDelete?: boolean;
   query: string;
+  isMulti?: boolean;
+  allowCustomValue?: boolean;
 }
 const SearchField = ({
   filter,
   datasource,
   updateFilter,
-  deleteFilter,
   isTagsLoading,
   tags,
   setError,
   hideScope,
   hideTag,
   hideValue,
-  allowDelete,
   query,
+  isMulti = true,
+  allowCustomValue = true,
 }: Props) => {
   const styles = useStyles2(getStyles);
-  const languageProvider = useMemo(() => new TempoLanguageProvider(datasource), [datasource]);
+  const [alertText, setAlertText] = useState<string>();
   const scopedTag = useMemo(() => filterScopedTag(filter), [filter]);
   // We automatically change the operator to the regex op when users select 2 or more values
   // However, they expect this to be automatically rolled back to the previous operator once
@@ -63,13 +60,16 @@ const SearchField = ({
 
   const updateOptions = async () => {
     try {
-      return filter.tag ? await languageProvider.getOptionsV2(scopedTag, query) : [];
+      const result = filter.tag ? await datasource.languageProvider.getOptionsV2(scopedTag, query) : [];
+      setAlertText(undefined);
+      setError(null);
+      return result;
     } catch (error) {
       // Display message if Tempo is connected but search 404's
       if (isFetchError(error) && error?.status === 404) {
         setError(error);
       } else if (error instanceof Error) {
-        dispatch(notifyApp(createErrorNotification('Error', error)));
+        setAlertText(`Error: ${error.message}`);
       }
     }
     return [];
@@ -77,7 +77,7 @@ const SearchField = ({
 
   const { loading: isLoadingValues, value: options } = useAsync(updateOptions, [
     scopedTag,
-    languageProvider,
+    datasource.languageProvider,
     setError,
     query,
   ]);
@@ -88,7 +88,12 @@ const SearchField = ({
   }
 
   useEffect(() => {
-    if (Array.isArray(filter.value) && filter.value.length > 1 && filter.operator !== '=~') {
+    if (
+      Array.isArray(filter.value) &&
+      filter.value.length > 1 &&
+      filter.operator !== '=~' &&
+      filter.operator !== '!~'
+    ) {
       setPrevOperator(filter.operator);
       updateFilter({ ...filter, operator: '=~' });
     }
@@ -110,6 +115,9 @@ const SearchField = ({
   const uniqueOptionType = options?.length === optionsOfFirstType?.length ? options?.[0]?.type : undefined;
   let operatorList = allOperators;
   switch (uniqueOptionType) {
+    case 'keyword':
+      operatorList = keywordOperators;
+      break;
     case 'string':
       operatorList = stringOperators;
       break;
@@ -130,87 +138,85 @@ const SearchField = ({
   };
 
   return (
-    <HorizontalGroup spacing={'none'} width={'auto'}>
-      {!hideScope && (
-        <Select
-          className={styles.dropdown}
-          inputId={`${filter.id}-scope`}
-          options={withTemplateVariableOptions(scopeOptions)}
-          value={filter.scope}
-          onChange={(v) => {
-            updateFilter({ ...filter, scope: v?.value });
-          }}
-          placeholder="Select scope"
-          aria-label={`select ${filter.id} scope`}
-        />
-      )}
-      {!hideTag && (
+    <>
+      <HorizontalGroup spacing={'none'} width={'auto'}>
+        {!hideScope && (
+          <Select
+            className={styles.dropdown}
+            inputId={`${filter.id}-scope`}
+            options={withTemplateVariableOptions(scopeOptions)}
+            value={filter.scope}
+            onChange={(v) => {
+              updateFilter({ ...filter, scope: v?.value });
+            }}
+            placeholder="Select scope"
+            aria-label={`select ${filter.id} scope`}
+          />
+        )}
+        {!hideTag && (
+          <Select
+            className={styles.dropdown}
+            inputId={`${filter.id}-tag`}
+            isLoading={isTagsLoading}
+            // Add the current tag to the list if it doesn't exist in the tags prop, otherwise the field will be empty even though the state has a value
+            options={withTemplateVariableOptions(
+              (filter.tag !== undefined ? uniq([filter.tag, ...tags]) : tags).map((t) => ({
+                label: t,
+                value: t,
+              }))
+            )}
+            value={filter.tag}
+            onChange={(v) => {
+              updateFilter({ ...filter, tag: v?.value, value: [] });
+            }}
+            placeholder="Select tag"
+            isClearable
+            aria-label={`select ${filter.id} tag`}
+            allowCustomValue={true}
+          />
+        )}
         <Select
           className={styles.dropdown}
-          inputId={`${filter.id}-tag`}
-          isLoading={isTagsLoading}
-          // Add the current tag to the list if it doesn't exist in the tags prop, otherwise the field will be empty even though the state has a value
-          options={withTemplateVariableOptions(
-            (filter.tag !== undefined ? uniq([filter.tag, ...tags]) : tags).map((t) => ({
-              label: t,
-              value: t,
-            }))
-          )}
-          value={filter.tag}
+          inputId={`${filter.id}-operator`}
+          options={withTemplateVariableOptions(operatorList.map(operatorSelectableValue))}
+          value={filter.operator}
           onChange={(v) => {
-            updateFilter({ ...filter, tag: v?.value });
+            updateFilter({ ...filter, operator: v?.value });
           }}
-          placeholder="Select tag"
-          isClearable
-          aria-label={`select ${filter.id} tag`}
-          allowCustomValue={true}
-        />
-      )}
-      <Select
-        className={styles.dropdown}
-        inputId={`${filter.id}-operator`}
-        options={withTemplateVariableOptions(operatorList.map(operatorSelectableValue))}
-        value={filter.operator}
-        onChange={(v) => {
-          updateFilter({ ...filter, operator: v?.value });
-        }}
-        isClearable={false}
-        aria-label={`select ${filter.id} operator`}
-        allowCustomValue={true}
-        width={8}
-      />
-      {!hideValue && (
-        <Select
-          className={styles.dropdown}
-          inputId={`${filter.id}-value`}
-          isLoading={isLoadingValues}
-          options={withTemplateVariableOptions(options)}
-          value={filter.value}
-          onChange={(val) => {
-            if (Array.isArray(val)) {
-              updateFilter({ ...filter, value: val.map((v) => v.value), valueType: val[0]?.type || uniqueOptionType });
-            } else {
-              updateFilter({ ...filter, value: val?.value, valueType: val?.type || uniqueOptionType });
-            }
-          }}
-          placeholder="Select value"
           isClearable={false}
-          aria-label={`select ${filter.id} value`}
+          aria-label={`select ${filter.id} operator`}
           allowCustomValue={true}
-          isMulti
-          allowCreateWhileLoading
-        />
-      )}
-      {allowDelete && (
-        <AccessoryButton
-          variant={'secondary'}
-          icon={'times'}
-          onClick={() => deleteFilter?.(filter)}
-          tooltip={'Remove tag'}
-          aria-label={`remove tag with ID ${filter.id}`}
+          width={8}
         />
-      )}
-    </HorizontalGroup>
+        {!hideValue && (
+          <Select
+            className={styles.dropdown}
+            inputId={`${filter.id}-value`}
+            isLoading={isLoadingValues}
+            options={withTemplateVariableOptions(options)}
+            value={filter.value}
+            onChange={(val) => {
+              if (Array.isArray(val)) {
+                updateFilter({
+                  ...filter,
+                  value: val.map((v) => v.value),
+                  valueType: val[0]?.type || uniqueOptionType,
+                });
+              } else {
+                updateFilter({ ...filter, value: val?.value, valueType: val?.type || uniqueOptionType });
+              }
+            }}
+            placeholder="Select value"
+            isClearable={true}
+            aria-label={`select ${filter.id} value`}
+            allowCustomValue={allowCustomValue}
+            isMulti={isMulti}
+            allowCreateWhileLoading
+          />
+        )}
+      </HorizontalGroup>
+      {alertText && <TemporaryAlert severity="error" text={alertText} />}
+    </>
   );
 };
 
diff --git a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/TagsInput.test.tsx b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/TagsInput.test.tsx
index ac20fc2e76855..0edd42264bcc4 100644
--- a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/TagsInput.test.tsx
+++ b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/TagsInput.test.tsx
@@ -1,24 +1,28 @@
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
-import { initTemplateSrv } from 'test/helpers/initTemplateSrv';
-
-import { FetchError, setTemplateSrv } from '@grafana/runtime';
 
 import { TraceqlFilter, TraceqlSearchScope } from '../dataquery.gen';
 import { TempoDatasource } from '../datasource';
 import TempoLanguageProvider from '../language_provider';
+import { initTemplateSrv } from '../test_utils';
 import { Scope } from '../types';
 
 import TagsInput from './TagsInput';
 import { v1Tags, v2Tags } from './utils.test';
 
 describe('TagsInput', () => {
-  let templateSrv = initTemplateSrv('key', [{ name: 'templateVariable1' }, { name: 'templateVariable2' }]);
   let user: ReturnType<typeof userEvent.setup>;
 
   beforeEach(() => {
-    setTemplateSrv(templateSrv);
+    const expectedValues = {
+      interpolationVar: 'interpolationText',
+      interpolationText: 'interpolationText',
+      interpolationVarWithPipe: 'interpolationTextOne|interpolationTextTwo',
+      scopedInterpolationText: 'scopedInterpolationText',
+    };
+    initTemplateSrv([{ name: 'templateVariable1' }, { name: 'templateVariable2' }], expectedValues);
+
     jest.useFakeTimers();
     // Need to use delay: null here to work with fakeTimers
     // see https://github.com/testing-library/user-event/issues/833
@@ -118,9 +122,7 @@ describe('TagsInput', () => {
         updateFilter={jest.fn}
         deleteFilter={jest.fn}
         filters={[filter]}
-        setError={function (error: FetchError): void {
-          throw error;
-        }}
+        setError={() => {}}
         staticTags={[]}
         isTagsLoading={false}
         query={''}
diff --git a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/TagsInput.tsx b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/TagsInput.tsx
index 6439fbbfb5724..9a877b5e5e365 100644
--- a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/TagsInput.tsx
+++ b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/TagsInput.tsx
@@ -2,6 +2,7 @@ import { css } from '@emotion/css';
 import React, { useCallback, useEffect } from 'react';
 import { v4 as uuidv4 } from 'uuid';
 
+import { GrafanaTheme2 } from '@grafana/data';
 import { AccessoryButton } from '@grafana/experimental';
 import { FetchError } from '@grafana/runtime';
 import { useStyles2 } from '@grafana/ui';
@@ -12,17 +13,20 @@ import { TempoDatasource } from '../datasource';
 import SearchField from './SearchField';
 import { getFilteredTags } from './utils';
 
-const getStyles = () => ({
-  vertical: css`
-    display: flex;
-    flex-direction: column;
-    gap: 0.25rem;
-  `,
-  horizontal: css`
-    display: flex;
-    flex-direction: row;
-    gap: 1rem;
-  `,
+const getStyles = (theme: GrafanaTheme2) => ({
+  vertical: css({
+    display: 'flex',
+    flexDirection: 'column',
+    gap: theme.spacing(0.25),
+  }),
+  horizontal: css({
+    display: 'flex',
+    flexDirection: 'row',
+    gap: theme.spacing(1),
+  }),
+  addTag: css({
+    marginLeft: theme.spacing(1),
+  }),
 });
 
 interface Props {
@@ -30,10 +34,11 @@ interface Props {
   deleteFilter: (f: TraceqlFilter) => void;
   filters: TraceqlFilter[];
   datasource: TempoDatasource;
-  setError: (error: FetchError) => void;
+  setError: (error: FetchError | null) => void;
   staticTags: Array<string | undefined>;
   isTagsLoading: boolean;
   hideValues?: boolean;
+  requireTagAndValue?: boolean;
   query: string;
 }
 const TagsInput = ({
@@ -45,10 +50,10 @@ const TagsInput = ({
   staticTags,
   isTagsLoading,
   hideValues,
+  requireTagAndValue,
   query,
 }: Props) => {
   const styles = useStyles2(getStyles);
-  const generateId = () => uuidv4().slice(0, 8);
   const handleOnAdd = useCallback(
     () => updateFilter({ id: generateId(), operator: '=', scope: TraceqlSearchScope.Span }),
     [updateFilter]
@@ -65,6 +70,11 @@ const TagsInput = ({
     return getFilteredTags(tags, staticTags);
   };
 
+  const validInput = (f: TraceqlFilter) => {
+    // If value is removed from the filter, it can be set as an empty array
+    return requireTagAndValue ? f.tag && f.value && f.value.length > 0 : f.tag;
+  };
+
   return (
     <div className={styles.vertical}>
       {filters?.map((f, i) => (
@@ -76,13 +86,28 @@ const TagsInput = ({
             updateFilter={updateFilter}
             tags={getTags(f)}
             isTagsLoading={isTagsLoading}
-            deleteFilter={deleteFilter}
-            allowDelete={true}
             hideValue={hideValues}
             query={query}
           />
-          {i === filters.length - 1 && (
-            <AccessoryButton variant={'secondary'} icon={'plus'} onClick={handleOnAdd} title={'Add tag'} />
+          {(validInput(f) || filters.length > 1) && (
+            <AccessoryButton
+              aria-label={`Remove tag with ID ${f.id}`}
+              variant={'secondary'}
+              icon={'times'}
+              onClick={() => deleteFilter?.(f)}
+              tooltip={'Remove tag'}
+            />
+          )}
+          {validInput(f) && i === filters.length - 1 && (
+            <span className={styles.addTag}>
+              <AccessoryButton
+                aria-label="Add tag"
+                variant={'secondary'}
+                icon={'plus'}
+                onClick={handleOnAdd}
+                tooltip={'Add tag'}
+              />
+            </span>
           )}
         </div>
       ))}
@@ -91,3 +116,5 @@ const TagsInput = ({
 };
 
 export default TagsInput;
+
+export const generateId = () => uuidv4().slice(0, 8);
diff --git a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/TraceQLSearch.test.tsx b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/TraceQLSearch.test.tsx
index 97405e906d523..262582da68c83 100644
--- a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/TraceQLSearch.test.tsx
+++ b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/TraceQLSearch.test.tsx
@@ -1,14 +1,13 @@
-import { render, screen, waitFor } from '@testing-library/react';
+import { act, render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import React from 'react';
-import { act } from 'react-dom/test-utils';
-import { initTemplateSrv } from 'test/helpers/initTemplateSrv';
+import React, { useState } from 'react';
 
 import { config } from '@grafana/runtime';
 
 import { TraceqlSearchScope } from '../dataquery.gen';
 import { TempoDatasource } from '../datasource';
 import TempoLanguageProvider from '../language_provider';
+import { initTemplateSrv } from '../test_utils';
 import { TempoQuery } from '../types';
 
 import TraceQLSearch from './TraceQLSearch';
@@ -43,7 +42,13 @@ jest.mock('../language_provider', () => {
 });
 
 describe('TraceQLSearch', () => {
-  initTemplateSrv('key', []);
+  const expectedValues = {
+    interpolationVar: 'interpolationText',
+    interpolationText: 'interpolationText',
+    interpolationVarWithPipe: 'interpolationTextOne|interpolationTextTwo',
+    scopedInterpolationText: 'scopedInterpolationText',
+  };
+  initTemplateSrv([{ name: 'templateVariable1' }, { name: 'templateVariable2' }], expectedValues);
 
   let user: ReturnType<typeof userEvent.setup>;
 
@@ -70,6 +75,7 @@ describe('TraceQLSearch', () => {
   const onChange = (q: TempoQuery) => {
     query = q;
   };
+  const onClearResults = jest.fn();
 
   beforeEach(() => {
     jest.useFakeTimers();
@@ -82,8 +88,66 @@ describe('TraceQLSearch', () => {
     jest.useRealTimers();
   });
 
+  it('should only show add/remove tag when necessary', async () => {
+    const TraceQLSearchWithProps = () => {
+      const [query, setQuery] = useState<TempoQuery>({
+        refId: 'A',
+        queryType: 'traceqlSearch',
+        key: 'Q-595a9bbc-2a25-49a7-9249-a52a0a475d83-0',
+        filters: [],
+      });
+      return (
+        <TraceQLSearch
+          datasource={datasource}
+          query={query}
+          onChange={(q: TempoQuery) => setQuery(q)}
+          onClearResults={onClearResults}
+        />
+      );
+    };
+    render(<TraceQLSearchWithProps />);
+
+    await act(async () => {
+      expect(screen.queryAllByLabelText('Add tag').length).toBe(0); // not filled in the default tag, so no need to add another one
+      expect(screen.queryAllByLabelText('Remove tag').length).toBe(0); // mot filled in the default tag, so no values to remove
+      expect(screen.getAllByText('Select tag').length).toBe(1);
+    });
+
+    await user.click(screen.getByText('Select tag'));
+    jest.advanceTimersByTime(1000);
+    await user.click(screen.getByText('foo'));
+    jest.advanceTimersByTime(1000);
+    await user.click(screen.getAllByText('Select value')[2]);
+    jest.advanceTimersByTime(1000);
+    await user.click(screen.getByText('driver'));
+    jest.advanceTimersByTime(1000);
+    await act(async () => {
+      expect(screen.getAllByLabelText('Add tag').length).toBe(1);
+      expect(screen.getAllByLabelText(/Remove tag/).length).toBe(1);
+    });
+
+    await user.click(screen.getByLabelText('Add tag'));
+    jest.advanceTimersByTime(1000);
+    expect(screen.queryAllByLabelText('Add tag').length).toBe(0); // not filled in the new tag, so no need to add another one
+    expect(screen.getAllByLabelText(/Remove tag/).length).toBe(2); // one for each tag
+
+    await user.click(screen.getAllByLabelText(/Remove tag/)[1]);
+    jest.advanceTimersByTime(1000);
+    expect(screen.queryAllByLabelText('Add tag').length).toBe(1); // filled in the default tag, so can add another one
+    expect(screen.queryAllByLabelText(/Remove tag/).length).toBe(1); // filled in the default tag, so can remove values
+
+    await user.click(screen.getAllByLabelText(/Remove tag/)[0]);
+    await act(async () => {
+      jest.advanceTimersByTime(1000);
+      expect(screen.queryAllByLabelText('Add tag').length).toBe(0); // not filled in the default tag, so no need to add another one
+      expect(screen.queryAllByLabelText(/Remove tag/).length).toBe(0); // mot filled in the default tag, so no values to remove
+    });
+  });
+
   it('should update operator when new value is selected in operator input', async () => {
-    const { container } = render(<TraceQLSearch datasource={datasource} query={query} onChange={onChange} />);
+    const { container } = render(
+      <TraceQLSearch datasource={datasource} query={query} onChange={onChange} onClearResults={onClearResults} />
+    );
 
     const minDurationOperator = container.querySelector(`input[aria-label="select min-duration operator"]`);
     expect(minDurationOperator).not.toBeNull();
@@ -101,7 +165,9 @@ describe('TraceQLSearch', () => {
   });
 
   it('should add new filter when new value is selected in the service name section', async () => {
-    const { container } = render(<TraceQLSearch datasource={datasource} query={query} onChange={onChange} />);
+    const { container } = render(
+      <TraceQLSearch datasource={datasource} query={query} onChange={onChange} onClearResults={onClearResults} />
+    );
     const serviceNameValue = container.querySelector(`input[aria-label="select service-name value"]`);
     expect(serviceNameValue).not.toBeNull();
     expect(serviceNameValue).toBeInTheDocument();
@@ -136,7 +202,9 @@ describe('TraceQLSearch', () => {
     } as TempoDatasource;
     datasource.languageProvider = new TempoLanguageProvider(datasource);
     await act(async () => {
-      const { container } = render(<TraceQLSearch datasource={datasource} query={query} onChange={onChange} />);
+      const { container } = render(
+        <TraceQLSearch datasource={datasource} query={query} onChange={onChange} onClearResults={onClearResults} />
+      );
       const serviceNameValue = container.querySelector(`input[aria-label="select service-name value"]`);
       expect(serviceNameValue).toBeNull();
       expect(serviceNameValue).not.toBeInTheDocument();
@@ -145,7 +213,9 @@ describe('TraceQLSearch', () => {
 
   it('should not render group by when feature toggle is not enabled', async () => {
     await waitFor(() => {
-      render(<TraceQLSearch datasource={datasource} query={query} onChange={onChange} />);
+      render(
+        <TraceQLSearch datasource={datasource} query={query} onChange={onChange} onClearResults={onClearResults} />
+      );
       const groupBy = screen.queryByText('Aggregate by');
       expect(groupBy).toBeNull();
       expect(groupBy).not.toBeInTheDocument();
@@ -155,7 +225,9 @@ describe('TraceQLSearch', () => {
   it('should render group by when feature toggle enabled', async () => {
     config.featureToggles.metricsSummary = true;
     await waitFor(() => {
-      render(<TraceQLSearch datasource={datasource} query={query} onChange={onChange} />);
+      render(
+        <TraceQLSearch datasource={datasource} query={query} onChange={onChange} onClearResults={onClearResults} />
+      );
       const groupBy = screen.queryByText('Aggregate by');
       expect(groupBy).not.toBeNull();
       expect(groupBy).toBeInTheDocument();
diff --git a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/TraceQLSearch.tsx b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/TraceQLSearch.tsx
index aeaa7a8d166d3..548cc67773e84 100644
--- a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/TraceQLSearch.tsx
+++ b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/TraceQLSearch.tsx
@@ -1,16 +1,13 @@
 import { css } from '@emotion/css';
 import React, { useCallback, useEffect, useState } from 'react';
 
-import { GrafanaTheme2 } from '@grafana/data';
-import { EditorRow } from '@grafana/experimental';
-import { config, FetchError, getTemplateSrv } from '@grafana/runtime';
-import { Alert, HorizontalGroup, useStyles2 } from '@grafana/ui';
-
-import { createErrorNotification } from '../../../../core/copy/appNotification';
-import { notifyApp } from '../../../../core/reducers/appNotification';
-import { dispatch } from '../../../../store/store';
-import { RawQuery } from '../../prometheus/querybuilder/shared/RawQuery';
-import { TraceqlFilter } from '../dataquery.gen';
+import { CoreApp, GrafanaTheme2 } from '@grafana/data';
+import { TemporaryAlert } from '@grafana/o11y-ds-frontend';
+import { config, FetchError, getTemplateSrv, reportInteraction } from '@grafana/runtime';
+import { Alert, Button, HorizontalGroup, Select, useStyles2 } from '@grafana/ui';
+
+import { RawQuery } from '../_importedDependencies/datasources/prometheus/RawQuery';
+import { TraceqlFilter, TraceqlSearchScope } from '../dataquery.gen';
 import { TempoDatasource } from '../datasource';
 import { TempoQueryBuilderOptions } from '../traceql/TempoQueryBuilderOptions';
 import { traceqlGrammar } from '../traceql/traceql';
@@ -28,10 +25,15 @@ interface Props {
   query: TempoQuery;
   onChange: (value: TempoQuery) => void;
   onBlur?: () => void;
+  onClearResults: () => void;
+  app?: CoreApp;
 }
 
-const TraceQLSearch = ({ datasource, query, onChange }: Props) => {
+const hardCodedFilterIds = ['min-duration', 'max-duration', 'status'];
+
+const TraceQLSearch = ({ datasource, query, onChange, onClearResults, app }: Props) => {
   const styles = useStyles2(getStyles);
+  const [alertText, setAlertText] = useState<string>();
   const [error, setError] = useState<Error | FetchError | null>(null);
 
   const [isTagsLoading, setIsTagsLoading] = useState(true);
@@ -70,14 +72,15 @@ const TraceQLSearch = ({ datasource, query, onChange }: Props) => {
       try {
         await datasource.languageProvider.start();
         setIsTagsLoading(false);
+        setAlertText(undefined);
       } catch (error) {
         if (error instanceof Error) {
-          dispatch(notifyApp(createErrorNotification('Error', error)));
+          setAlertText(`Error: ${error.message}`);
         }
       }
     };
     fetchTags();
-  }, [datasource]);
+  }, [datasource, setAlertText]);
 
   useEffect(() => {
     // Initialize state with configured static filters that already have a value from the config
@@ -93,11 +96,15 @@ const TraceQLSearch = ({ datasource, query, onChange }: Props) => {
   // filter out tags that already exist in the static fields
   const staticTags = datasource.search?.filters?.map((f) => f.tag) || [];
   staticTags.push('duration');
+  staticTags.push('traceDuration');
 
   // Dynamic filters are all filters that don't match the ID of a filter in the datasource configuration
-  // The duration tag is a special case since its selector is hard-coded
+  // The duration and status fields are a special case since its selector is hard-coded
   const dynamicFilters = (query.filters || []).filter(
-    (f) => f.tag !== 'duration' && (datasource.search?.filters?.findIndex((sf) => sf.id === f.id) || 0) === -1
+    (f) =>
+      !hardCodedFilterIds.includes(f.id) &&
+      (datasource.search?.filters?.findIndex((sf) => sf.id === f.id) || 0) === -1 &&
+      f.id !== 'duration-type'
   );
 
   return (
@@ -127,11 +134,47 @@ const TraceQLSearch = ({ datasource, query, onChange }: Props) => {
                 </InlineSearchField>
               )
           )}
+          <InlineSearchField label={'Status'}>
+            <SearchField
+              filter={
+                findFilter('status') || {
+                  id: 'status',
+                  tag: 'status',
+                  scope: TraceqlSearchScope.Intrinsic,
+                  operator: '=',
+                }
+              }
+              datasource={datasource}
+              setError={setError}
+              updateFilter={updateFilter}
+              tags={[]}
+              hideScope={true}
+              hideTag={true}
+              query={traceQlQuery}
+              isMulti={false}
+              allowCustomValue={false}
+            />
+          </InlineSearchField>
           <InlineSearchField
             label={'Duration'}
-            tooltip="The span duration, i.e.	end - start time of the span. Accepted units are ns, ms, s, m, h"
+            tooltip="The trace or span duration, i.e. end - start time of the trace/span. Accepted units are ns, ms, s, m, h"
           >
-            <HorizontalGroup spacing={'sm'}>
+            <HorizontalGroup spacing={'none'}>
+              <Select
+                options={[
+                  { label: 'span', value: 'span' },
+                  { label: 'trace', value: 'trace' },
+                ]}
+                value={findFilter('duration-type')?.value ?? 'span'}
+                onChange={(v) => {
+                  const filter = findFilter('duration-type') || {
+                    id: 'duration-type',
+                    value: 'span',
+                  };
+                  updateFilter({ ...filter, value: v?.value });
+                }}
+                aria-label={'duration type'}
+              />
               <DurationInput
                 filter={
                   findFilter('min-duration') || {
@@ -168,15 +211,37 @@ const TraceQLSearch = ({ datasource, query, onChange }: Props) => {
               staticTags={staticTags}
               isTagsLoading={isTagsLoading}
               query={traceQlQuery}
+              requireTagAndValue={true}
             />
           </InlineSearchField>
           {config.featureToggles.metricsSummary && (
             <GroupByField datasource={datasource} onChange={onChange} query={query} isTagsLoading={isTagsLoading} />
           )}
         </div>
-        <EditorRow>
+        <div className={styles.rawQueryContainer}>
           <RawQuery query={templateSrv.replace(traceQlQuery)} lang={{ grammar: traceqlGrammar, name: 'traceql' }} />
-        </EditorRow>
+          <Button
+            variant="secondary"
+            size="sm"
+            onClick={() => {
+              reportInteraction('grafana_traces_copy_to_traceql_clicked', {
+                app: app ?? '',
+                grafana_version: config.buildInfo.version,
+                location: 'search_tab',
+              });
+
+              onClearResults();
+              const traceQlQuery = generateQueryFromFilters(query.filters || []);
+              onChange({
+                ...query,
+                query: traceQlQuery,
+                queryType: 'traceql',
+              });
+            }}
+          >
+            Edit in TraceQL
+          </Button>
+        </div>
         <TempoQueryBuilderOptions onChange={onChange} query={query} />
       </div>
       {error ? (
@@ -185,6 +250,7 @@ const TraceQLSearch = ({ datasource, query, onChange }: Props) => {
           configure it in the <a href={`/datasources/edit/${datasource.uid}`}>datasource settings</a>.
         </Alert>
       ) : null}
+      {alertText && <TemporaryAlert severity={'error'} text={alertText} />}
     </>
   );
 };
@@ -192,14 +258,21 @@ const TraceQLSearch = ({ datasource, query, onChange }: Props) => {
 export default TraceQLSearch;
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  alert: css`
-    max-width: 75ch;
-    margin-top: ${theme.spacing(2)};
-  `,
-  container: css`
-    display: flex;
-    gap: 4px;
-    flex-wrap: wrap;
-    flex-direction: column;
-  `,
+  alert: css({
+    maxWidth: '75ch',
+    marginTop: theme.spacing(2),
+  }),
+  container: css({
+    display: 'flex',
+    gap: '4px',
+    flexWrap: 'wrap',
+    flexDirection: 'column',
+  }),
+  rawQueryContainer: css({
+    alignItems: 'center',
+    backgroundColor: theme.colors.background.secondary,
+    display: 'flex',
+    justifyContent: 'space-between',
+    padding: theme.spacing(1),
+  }),
 });
diff --git a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/utils.test.ts b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/utils.test.ts
index 1355094e33e28..98efdc7182321 100644
--- a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/utils.test.ts
+++ b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/utils.test.ts
@@ -21,6 +21,32 @@ describe('generateQueryFromFilters generates the correct query for', () => {
     expect(generateQueryFromFilters([{ id: 'foo', tag: 'footag', value: 'foovalue' }])).toBe('{}');
   });
 
+  describe('generates correct query for duration when duration type', () => {
+    it('not set', () => {
+      expect(
+        generateQueryFromFilters([
+          { id: 'min-duration', operator: '>', valueType: 'duration', tag: 'duration', value: '100ms' },
+        ])
+      ).toBe('{duration>100ms}');
+    });
+    it('set to span', () => {
+      expect(
+        generateQueryFromFilters([
+          { id: 'min-duration', operator: '>', valueType: 'duration', tag: 'duration', value: '100ms' },
+          { id: 'duration-type', value: 'span' },
+        ])
+      ).toBe('{duration>100ms}');
+    });
+    it('set to trace', () => {
+      expect(
+        generateQueryFromFilters([
+          { id: 'min-duration', operator: '>', valueType: 'duration', tag: 'duration', value: '100ms' },
+          { id: 'duration-type', value: 'trace' },
+        ])
+      ).toBe('{traceDuration>100ms}');
+    });
+  });
+
   it('a field with tag, operator and tag', () => {
     expect(generateQueryFromFilters([{ id: 'foo', tag: 'footag', value: 'foovalue', operator: '=' }])).toBe(
       '{.footag=foovalue}'
@@ -106,27 +132,79 @@ describe('generateQueryFromFilters generates the correct query for', () => {
 describe('gets correct tags', () => {
   it('for filtered tags when no tags supplied', () => {
     const tags = getFilteredTags(emptyTags, []);
-    expect(tags).toEqual(['duration', 'kind', 'name', 'status']);
+    expect(tags).toEqual([
+      'duration',
+      'kind',
+      'name',
+      'rootName',
+      'rootServiceName',
+      'status',
+      'statusMessage',
+      'traceDuration',
+    ]);
   });
 
   it('for filtered tags when API v1 tags supplied', () => {
     const tags = getFilteredTags(v1Tags, []);
-    expect(tags).toEqual(['duration', 'kind', 'name', 'status', 'bar', 'foo']);
+    expect(tags).toEqual([
+      'duration',
+      'kind',
+      'name',
+      'rootName',
+      'rootServiceName',
+      'status',
+      'statusMessage',
+      'traceDuration',
+      'bar',
+      'foo',
+    ]);
   });
 
   it('for filtered tags when API v1 tags supplied with tags to filter out', () => {
     const tags = getFilteredTags(v1Tags, ['duration']);
-    expect(tags).toEqual(['kind', 'name', 'status', 'bar', 'foo']);
+    expect(tags).toEqual([
+      'kind',
+      'name',
+      'rootName',
+      'rootServiceName',
+      'status',
+      'statusMessage',
+      'traceDuration',
+      'bar',
+      'foo',
+    ]);
   });
 
   it('for filtered tags when API v2 tags supplied', () => {
     const tags = getFilteredTags(uniq(getUnscopedTags(v2Tags)), []);
-    expect(tags).toEqual(['duration', 'kind', 'name', 'status', 'cluster', 'container', 'db']);
+    expect(tags).toEqual([
+      'duration',
+      'kind',
+      'name',
+      'rootName',
+      'rootServiceName',
+      'status',
+      'statusMessage',
+      'traceDuration',
+      'cluster',
+      'container',
+      'db',
+    ]);
   });
 
   it('for filtered tags when API v2 tags supplied with tags to filter out', () => {
     const tags = getFilteredTags(getUnscopedTags(v2Tags), ['duration', 'cluster']);
-    expect(tags).toEqual(['kind', 'name', 'status', 'container', 'db']);
+    expect(tags).toEqual([
+      'kind',
+      'name',
+      'rootName',
+      'rootServiceName',
+      'status',
+      'statusMessage',
+      'traceDuration',
+      'container',
+      'db',
+    ]);
   });
 
   it('for unscoped tags', () => {
diff --git a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/utils.ts b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/utils.ts
index c7106b4a1af20..2cb2a79f3ecaf 100644
--- a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/utils.ts
+++ b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/utils.ts
@@ -9,7 +9,7 @@ import { Scope } from '../types';
 export const generateQueryFromFilters = (filters: TraceqlFilter[]) => {
   return `{${filters
     .filter((f) => f.tag && f.operator && f.value?.length)
-    .map((f) => `${scopeHelper(f)}${f.tag}${f.operator}${valueHelper(f)}`)
+    .map((f) => `${scopeHelper(f)}${tagHelper(f, filters)}${f.operator}${valueHelper(f)}`)
     .join(' && ')}}`;
 };
 
@@ -31,6 +31,16 @@ const scopeHelper = (f: TraceqlFilter) => {
     (f.scope === TraceqlSearchScope.Resource || f.scope === TraceqlSearchScope.Span ? f.scope?.toLowerCase() : '') + '.'
   );
 };
+const tagHelper = (f: TraceqlFilter, filters: TraceqlFilter[]) => {
+  if (f.tag === 'duration') {
+    const durationType = filters.find((f) => f.id === 'duration-type');
+    if (durationType) {
+      return durationType.value === 'trace' ? 'traceDuration' : 'duration';
+    }
+    return f.tag;
+  }
+  return f.tag;
+};
 
 export const filterScopedTag = (f: TraceqlFilter) => {
   return scopeHelper(f) + f.tag;
@@ -41,6 +51,10 @@ export const filterTitle = (f: TraceqlFilter) => {
   if (f.tag === 'name') {
     return 'Span Name';
   }
+  // Special case for the resource service name
+  if (f.tag === 'service.name' && f.scope === TraceqlSearchScope.Resource) {
+    return 'Service Name';
+  }
   return startCase(filterScopedTag(f));
 };
 
diff --git a/public/app/plugins/datasource/tempo/ServiceGraphSection.tsx b/public/app/plugins/datasource/tempo/ServiceGraphSection.tsx
index fc174bf971df6..6b770fb5c1949 100644
--- a/public/app/plugins/datasource/tempo/ServiceGraphSection.tsx
+++ b/public/app/plugins/datasource/tempo/ServiceGraphSection.tsx
@@ -5,10 +5,9 @@ import useAsync from 'react-use/lib/useAsync';
 import { GrafanaTheme2 } from '@grafana/data';
 import { Alert, InlineField, InlineFieldRow, useStyles2 } from '@grafana/ui';
 
-import { AdHocFilter } from '../../../features/variables/adhoc/picker/AdHocFilter';
-import { AdHocVariableFilter } from '../../../features/variables/types';
-import { PrometheusDatasource } from '../prometheus/datasource';
-
+import { AdHocFilter } from './_importedDependencies/components/AdHocFilter/AdHocFilter';
+import { AdHocVariableFilter } from './_importedDependencies/components/AdHocFilter/types';
+import { PrometheusDatasource } from './_importedDependencies/datasources/prometheus/types';
 import { TempoQuery } from './types';
 import { getDS } from './utils';
 
@@ -50,7 +49,7 @@ export function ServiceGraphSection({
     return null;
   }
 
-  const ds = dsState.value as PrometheusDatasource;
+  const ds = dsState.value;
 
   if (!graphDatasourceUid) {
     return getWarning(
@@ -68,7 +67,9 @@ export function ServiceGraphSection({
     );
   }
 
-  const filters = queryToFilter(query.serviceMapQuery || '');
+  const filters = queryToFilter(
+    (Array.isArray(query.serviceMapQuery) ? query.serviceMapQuery[0] : query.serviceMapQuery) || ''
+  );
 
   return (
     <div>
@@ -152,12 +153,12 @@ function filtersToQuery(filters: AdHocVariableFilter[]): string {
 }
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  alert: css`
-    max-width: 75ch;
-    margin-top: ${theme.spacing(2)};
-  `,
-  link: css`
-    color: ${theme.colors.text.link};
-    text-decoration: underline;
-  `,
+  alert: css({
+    maxWidth: '75ch',
+    marginTop: theme.spacing(2),
+  }),
+  link: css({
+    color: theme.colors.text.link,
+    textDecoration: 'underline',
+  }),
 });
diff --git a/public/app/plugins/datasource/tempo/VariableQueryEditor.test.tsx b/public/app/plugins/datasource/tempo/VariableQueryEditor.test.tsx
index 57bf7f1d1ace0..3b843ed7a8106 100644
--- a/public/app/plugins/datasource/tempo/VariableQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/tempo/VariableQueryEditor.test.tsx
@@ -1,7 +1,6 @@
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
-import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
 
 import { TemplateSrv } from '@grafana/runtime';
 
@@ -11,6 +10,7 @@ import {
   TempoVariableQueryEditorProps,
   TempoVariableQueryType,
 } from './VariableQueryEditor';
+import { selectOptionInTest } from './_importedDependencies/test/helpers/selectOptionInTest';
 import { createTempoDatasource } from './mocks';
 
 const refId = 'TempoDatasourceVariableQueryEditor-VariableQuery';
diff --git a/public/app/plugins/datasource/tempo/_importedDependencies/README.md b/public/app/plugins/datasource/tempo/_importedDependencies/README.md
new file mode 100644
index 0000000000000..f08e12e6efecc
--- /dev/null
+++ b/public/app/plugins/datasource/tempo/_importedDependencies/README.md
@@ -0,0 +1,3 @@
+This directory contains dependencies that we duplicated from Grafana core while working on the decoupling of Tempo from such core.
+The long-term goal is to move these files away from here by replacing them with packages.
+As such, they are only temporary and meant to be used internally to this package, please avoid using them for example as dependencies (imports) in other data source plugins.
diff --git a/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/AdHocFilter.tsx b/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/AdHocFilter.tsx
new file mode 100644
index 0000000000000..8e3a34183ccde
--- /dev/null
+++ b/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/AdHocFilter.tsx
@@ -0,0 +1,104 @@
+import React, { PureComponent, ReactNode } from 'react';
+
+import { AdHocVariableFilter, DataSourceRef, SelectableValue } from '@grafana/data';
+import { Segment } from '@grafana/ui';
+
+import { AdHocFilterBuilder } from './AdHocFilterBuilder';
+import { REMOVE_FILTER_KEY } from './AdHocFilterKey';
+import { AdHocFilterRenderer } from './AdHocFilterRenderer';
+import { ConditionSegment } from './ConditionSegment';
+
+interface Props {
+  datasource: DataSourceRef | null;
+  filters: AdHocVariableFilter[];
+  baseFilters?: AdHocVariableFilter[];
+  addFilter: (filter: AdHocVariableFilter) => void;
+  removeFilter: (index: number) => void;
+  changeFilter: (index: number, newFilter: AdHocVariableFilter) => void;
+  disabled?: boolean;
+}
+
+/**
+ * Simple filtering component that automatically uses datasource APIs to get available labels and its values, for
+ * dynamic visual filtering without need for much setup. Instead of having single onChange prop this reports all the
+ * change events with separate props so it is usable with AdHocPicker.
+ *
+ * Note: There isn't API on datasource to suggest the operators here so that is hardcoded to use prometheus style
+ * operators. Also filters are assumed to be joined with `AND` operator, which is also hardcoded.
+ */
+export class AdHocFilter extends PureComponent<Props> {
+  onChange = (index: number, prop: string) => (key: SelectableValue<string | null>) => {
+    const { filters } = this.props;
+    const { value } = key;
+
+    if (key.value === REMOVE_FILTER_KEY) {
+      return this.props.removeFilter(index);
+    }
+
+    return this.props.changeFilter(index, {
+      ...filters[index],
+      [prop]: value,
+    });
+  };
+
+  appendFilterToVariable = (filter: AdHocVariableFilter) => {
+    this.props.addFilter(filter);
+  };
+
+  render() {
+    const { filters, disabled } = this.props;
+
+    return (
+      <div className="gf-form-inline">
+        {this.renderFilters(filters, disabled)}
+
+        {!disabled && (
+          <AdHocFilterBuilder
+            datasource={this.props.datasource!}
+            appendBefore={filters.length > 0 ? <ConditionSegment label="AND" /> : null}
+            onCompleted={this.appendFilterToVariable}
+            allFilters={this.getAllFilters()}
+          />
+        )}
+      </div>
+    );
+  }
+
+  getAllFilters() {
+    if (this.props.baseFilters) {
+      return this.props.baseFilters.concat(this.props.filters);
+    }
+
+    return this.props.filters;
+  }
+
+  renderFilters(filters: AdHocVariableFilter[], disabled?: boolean) {
+    if (filters.length === 0 && disabled) {
+      return <Segment disabled={disabled} value="No filters" options={[]} onChange={() => {}} />;
+    }
+
+    return filters.reduce((segments: ReactNode[], filter, index) => {
+      if (segments.length > 0) {
+        segments.push(<ConditionSegment label="AND" key={`condition-${index}`} />);
+      }
+      segments.push(this.renderFilterSegments(filter, index, disabled));
+      return segments;
+    }, []);
+  }
+
+  renderFilterSegments(filter: AdHocVariableFilter, index: number, disabled?: boolean) {
+    return (
+      <React.Fragment key={`filter-${index}`}>
+        <AdHocFilterRenderer
+          disabled={disabled}
+          datasource={this.props.datasource!}
+          filter={filter}
+          onKeyChange={this.onChange(index, 'key')}
+          onOperatorChange={this.onChange(index, 'operator')}
+          onValueChange={this.onChange(index, 'value')}
+          allFilters={this.getAllFilters()}
+        />
+      </React.Fragment>
+    );
+  }
+}
diff --git a/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/AdHocFilterBuilder.tsx b/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/AdHocFilterBuilder.tsx
new file mode 100644
index 0000000000000..956b25682019d
--- /dev/null
+++ b/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/AdHocFilterBuilder.tsx
@@ -0,0 +1,75 @@
+import i18n from 'i18next';
+import React, { useCallback, useState } from 'react';
+
+import { AdHocVariableFilter, DataSourceRef, SelectableValue } from '@grafana/data';
+
+import { AdHocFilterKey, REMOVE_FILTER_KEY } from './AdHocFilterKey';
+import { AdHocFilterRenderer } from './AdHocFilterRenderer';
+
+interface Props {
+  datasource: DataSourceRef;
+  onCompleted: (filter: AdHocVariableFilter) => void;
+  appendBefore?: React.ReactNode;
+  allFilters: AdHocVariableFilter[];
+}
+
+// Reassign t() so i18next-parser doesn't warn on dynamic key, and we can have 'failOnWarnings' enabled
+const tFunc = i18n.t;
+
+// import { t } from 'app/core/internationalization';
+export const t = (id: string, defaultMessage: string, values?: Record<string, unknown>) => {
+  return tFunc(id, defaultMessage, values);
+};
+
+export const AdHocFilterBuilder = ({ datasource, appendBefore, onCompleted, allFilters }: Props) => {
+  const [key, setKey] = useState<string | null>(null);
+  const [operator, setOperator] = useState<string>('=');
+
+  const onKeyChanged = useCallback(
+    (item: SelectableValue<string | null>) => {
+      if (item.value !== REMOVE_FILTER_KEY) {
+        setKey(item.value ?? '');
+        return;
+      }
+      setKey(null);
+    },
+    [setKey]
+  );
+
+  const onOperatorChanged = useCallback(
+    (item: SelectableValue<string>) => setOperator(item.value ?? ''),
+    [setOperator]
+  );
+
+  const onValueChanged = useCallback(
+    (item: SelectableValue<string>) => {
+      onCompleted({
+        value: item.value ?? '',
+        operator: operator,
+        key: key!,
+      });
+      setKey(null);
+      setOperator('=');
+    },
+    [onCompleted, operator, key]
+  );
+
+  if (key === null) {
+    return <AdHocFilterKey datasource={datasource} filterKey={key} onChange={onKeyChanged} allFilters={allFilters} />;
+  }
+
+  return (
+    <React.Fragment key="filter-builder">
+      {appendBefore}
+      <AdHocFilterRenderer
+        datasource={datasource}
+        filter={{ key, value: '', operator }}
+        placeHolder={t('variable.adhoc.placeholder', 'Select value')}
+        onKeyChange={onKeyChanged}
+        onOperatorChange={onOperatorChanged}
+        onValueChange={onValueChanged}
+        allFilters={allFilters}
+      />
+    </React.Fragment>
+  );
+};
diff --git a/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/AdHocFilterKey.tsx b/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/AdHocFilterKey.tsx
new file mode 100644
index 0000000000000..5c0fc5bcf4d9b
--- /dev/null
+++ b/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/AdHocFilterKey.tsx
@@ -0,0 +1,82 @@
+import React, { ReactElement } from 'react';
+
+import { AdHocVariableFilter, DataSourceRef, SelectableValue } from '@grafana/data';
+import { getDataSourceSrv } from '@grafana/runtime';
+import { Icon, SegmentAsync } from '@grafana/ui';
+
+interface Props {
+  datasource: DataSourceRef;
+  filterKey: string | null;
+  onChange: (item: SelectableValue<string | null>) => void;
+  allFilters: AdHocVariableFilter[];
+  disabled?: boolean;
+}
+
+const MIN_WIDTH = 90;
+export const AdHocFilterKey = ({ datasource, onChange, disabled, filterKey, allFilters }: Props) => {
+  const loadKeys = () => fetchFilterKeys(datasource, filterKey, allFilters);
+  const loadKeysWithRemove = () => fetchFilterKeysWithRemove(datasource, filterKey, allFilters);
+
+  if (filterKey === null) {
+    return (
+      <div className="gf-form" data-testid="AdHocFilterKey-add-key-wrapper">
+        <SegmentAsync
+          disabled={disabled}
+          className="query-segment-key"
+          Component={plusSegment}
+          value={filterKey}
+          onChange={onChange}
+          loadOptions={loadKeys}
+          inputMinWidth={MIN_WIDTH}
+        />
+      </div>
+    );
+  }
+
+  return (
+    <div className="gf-form" data-testid="AdHocFilterKey-key-wrapper">
+      <SegmentAsync
+        disabled={disabled}
+        className="query-segment-key"
+        value={filterKey}
+        onChange={onChange}
+        loadOptions={loadKeysWithRemove}
+        inputMinWidth={MIN_WIDTH}
+      />
+    </div>
+  );
+};
+
+export const REMOVE_FILTER_KEY = '-- remove filter --';
+const REMOVE_VALUE = { label: REMOVE_FILTER_KEY, value: REMOVE_FILTER_KEY };
+
+const plusSegment: ReactElement = (
+  <span className="gf-form-label query-part" aria-label="Add Filter">
+    <Icon name="plus" />
+  </span>
+);
+
+const fetchFilterKeys = async (
+  datasource: DataSourceRef,
+  currentKey: string | null,
+  allFilters: AdHocVariableFilter[]
+): Promise<Array<SelectableValue<string>>> => {
+  const ds = await getDataSourceSrv().get(datasource);
+
+  if (!ds || !ds.getTagKeys) {
+    return [];
+  }
+
+  const otherFilters = allFilters.filter((f) => f.key !== currentKey);
+  const metrics = await ds.getTagKeys({ filters: otherFilters });
+  return metrics.map((m) => ({ label: m.text, value: m.text }));
+};
+
+const fetchFilterKeysWithRemove = async (
+  datasource: DataSourceRef,
+  currentKey: string | null,
+  allFilters: AdHocVariableFilter[]
+): Promise<Array<SelectableValue<string>>> => {
+  const keys = await fetchFilterKeys(datasource, currentKey, allFilters);
+  return [REMOVE_VALUE, ...keys];
+};
diff --git a/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/AdHocFilterRenderer.tsx b/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/AdHocFilterRenderer.tsx
new file mode 100644
index 0000000000000..1a5c8fd0054a7
--- /dev/null
+++ b/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/AdHocFilterRenderer.tsx
@@ -0,0 +1,54 @@
+import React from 'react';
+
+import { AdHocVariableFilter, DataSourceRef, SelectableValue } from '@grafana/data';
+
+import { AdHocFilterKey } from './AdHocFilterKey';
+import { AdHocFilterValue } from './AdHocFilterValue';
+import { OperatorSegment } from './OperatorSegment';
+
+interface Props {
+  datasource: DataSourceRef;
+  filter: AdHocVariableFilter;
+  allFilters: AdHocVariableFilter[];
+  onKeyChange: (item: SelectableValue<string | null>) => void;
+  onOperatorChange: (item: SelectableValue<string>) => void;
+  onValueChange: (item: SelectableValue<string>) => void;
+  placeHolder?: string;
+  getTagKeysOptions?: any;
+  disabled?: boolean;
+}
+
+export const AdHocFilterRenderer = ({
+  datasource,
+  filter: { key, operator, value },
+  onKeyChange,
+  onOperatorChange,
+  onValueChange,
+  placeHolder,
+  allFilters,
+  disabled,
+}: Props) => {
+  return (
+    <>
+      <AdHocFilterKey
+        disabled={disabled}
+        datasource={datasource}
+        filterKey={key}
+        onChange={onKeyChange}
+        allFilters={allFilters}
+      />
+      <div className="gf-form">
+        <OperatorSegment disabled={disabled} value={operator} onChange={onOperatorChange} />
+      </div>
+      <AdHocFilterValue
+        disabled={disabled}
+        datasource={datasource}
+        filterKey={key}
+        filterValue={value}
+        allFilters={allFilters}
+        onChange={onValueChange}
+        placeHolder={placeHolder}
+      />
+    </>
+  );
+};
diff --git a/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/AdHocFilterValue.tsx b/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/AdHocFilterValue.tsx
new file mode 100644
index 0000000000000..a8034bf165457
--- /dev/null
+++ b/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/AdHocFilterValue.tsx
@@ -0,0 +1,68 @@
+import React from 'react';
+
+import {
+  AdHocVariableFilter,
+  DataSourceRef,
+  MetricFindValue,
+  SelectableValue,
+  getDefaultTimeRange,
+} from '@grafana/data';
+// import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
+import { getDataSourceSrv } from '@grafana/runtime';
+import { SegmentAsync } from '@grafana/ui';
+
+interface Props {
+  datasource: DataSourceRef;
+  filterKey: string;
+  filterValue?: string;
+  onChange: (item: SelectableValue<string>) => void;
+  placeHolder?: string;
+  disabled?: boolean;
+  allFilters: AdHocVariableFilter[];
+}
+
+export const AdHocFilterValue = ({
+  datasource,
+  disabled,
+  onChange,
+  filterKey,
+  filterValue,
+  placeHolder,
+  allFilters,
+}: Props) => {
+  const loadValues = () => fetchFilterValues(datasource, filterKey, allFilters);
+
+  return (
+    <div className="gf-form" data-testid="AdHocFilterValue-value-wrapper">
+      <SegmentAsync
+        className="query-segment-value"
+        disabled={disabled}
+        placeholder={placeHolder}
+        value={filterValue}
+        onChange={onChange}
+        loadOptions={loadValues}
+      />
+    </div>
+  );
+};
+
+const fetchFilterValues = async (
+  datasource: DataSourceRef,
+  key: string,
+  allFilters: AdHocVariableFilter[]
+): Promise<Array<SelectableValue<string>>> => {
+  const ds = await getDataSourceSrv().get(datasource);
+
+  if (!ds || !ds.getTagValues) {
+    return [];
+  }
+
+  // const timeRange = getTimeSrv().timeRange();
+  // As https://github.com/grafana/grafana/pull/76118/files#diff-260d46415915a2e3e7d294e313bd128666e9f0868aa94d8aee4d4a24a060b542L27-R26
+  const timeRange = getDefaultTimeRange();
+
+  // Filter out the current filter key from the list of all filters
+  const otherFilters = allFilters.filter((f) => f.key !== key);
+  const metrics = await ds.getTagValues({ key, filters: otherFilters, timeRange });
+  return metrics.map((m: MetricFindValue) => ({ label: m.text, value: m.text }));
+};
diff --git a/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/ConditionSegment.tsx b/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/ConditionSegment.tsx
new file mode 100644
index 0000000000000..4c47fd734330d
--- /dev/null
+++ b/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/ConditionSegment.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+
+interface Props {
+  label: string;
+}
+
+export const ConditionSegment = ({ label }: Props) => {
+  return (
+    <div className="gf-form">
+      <span className="gf-form-label query-keyword">{label}</span>
+    </div>
+  );
+};
diff --git a/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/OperatorSegment.tsx b/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/OperatorSegment.tsx
new file mode 100644
index 0000000000000..b8646b466e617
--- /dev/null
+++ b/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/OperatorSegment.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { Segment } from '@grafana/ui';
+
+interface Props {
+  value: string;
+  onChange: (item: SelectableValue<string>) => void;
+  disabled?: boolean;
+}
+
+const options = ['=', '!=', '<', '>', '=~', '!~'].map<SelectableValue<string>>((value) => ({
+  label: value,
+  value,
+}));
+
+export const OperatorSegment = ({ value, disabled, onChange }: Props) => {
+  return (
+    <Segment
+      className="query-segment-operator"
+      value={value}
+      disabled={disabled}
+      options={options}
+      onChange={onChange}
+    />
+  );
+};
diff --git a/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/types.ts b/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/types.ts
new file mode 100644
index 0000000000000..b7ab91300496b
--- /dev/null
+++ b/public/app/plugins/datasource/tempo/_importedDependencies/components/AdHocFilter/types.ts
@@ -0,0 +1,8 @@
+// import { AdHocVariableFilter } from '../../../features/variables/types';
+export interface AdHocVariableFilter {
+  key: string;
+  operator: string;
+  value: string;
+  /** @deprecated  */
+  condition?: string;
+}
diff --git a/public/app/plugins/datasource/tempo/_importedDependencies/datasources/loki/types.ts b/public/app/plugins/datasource/tempo/_importedDependencies/datasources/loki/types.ts
new file mode 100644
index 0000000000000..dab95cafb7733
--- /dev/null
+++ b/public/app/plugins/datasource/tempo/_importedDependencies/datasources/loki/types.ts
@@ -0,0 +1,8 @@
+export interface QueryStats {
+  streams: number;
+  chunks: number;
+  bytes: number;
+  entries: number;
+  // The error message displayed in the UI when we cant estimate the size of the query.
+  message?: string;
+}
diff --git a/public/app/plugins/datasource/tempo/_importedDependencies/datasources/prometheus/QueryOptionGroup.tsx b/public/app/plugins/datasource/tempo/_importedDependencies/datasources/prometheus/QueryOptionGroup.tsx
new file mode 100644
index 0000000000000..d2187f26dde60
--- /dev/null
+++ b/public/app/plugins/datasource/tempo/_importedDependencies/datasources/prometheus/QueryOptionGroup.tsx
@@ -0,0 +1,115 @@
+import { css } from '@emotion/css';
+import React from 'react';
+import { useToggle } from 'react-use';
+
+import { getValueFormat, GrafanaTheme2 } from '@grafana/data';
+import { config } from '@grafana/runtime';
+import { Collapse, Icon, Tooltip, useStyles2, Stack } from '@grafana/ui';
+
+import { QueryStats } from '../loki/types';
+
+export interface Props {
+  title: string;
+  collapsedInfo: string[];
+  queryStats?: QueryStats | null;
+  children: React.ReactNode;
+}
+
+export function QueryOptionGroup({ title, children, collapsedInfo, queryStats }: Props) {
+  const [isOpen, toggleOpen] = useToggle(false);
+  const styles = useStyles2(getStyles);
+
+  return (
+    <div className={styles.wrapper}>
+      <Collapse
+        className={styles.collapse}
+        collapsible
+        isOpen={isOpen}
+        onToggle={toggleOpen}
+        label={
+          <Stack gap={0}>
+            <h6 className={styles.title}>{title}</h6>
+            {!isOpen && (
+              <div className={styles.description}>
+                {collapsedInfo.map((x, i) => (
+                  <span key={i}>{x}</span>
+                ))}
+              </div>
+            )}
+          </Stack>
+        }
+      >
+        <div className={styles.body}>{children}</div>
+      </Collapse>
+
+      {queryStats && config.featureToggles.lokiQuerySplitting && (
+        <Tooltip content="Note: the query will be split into multiple parts and executed in sequence. Query limits will only apply each individual part.">
+          <Icon tabIndex={0} name="info-circle" className={styles.tooltip} size="sm" />
+        </Tooltip>
+      )}
+
+      {queryStats && <p className={styles.stats}>{generateQueryStats(queryStats)}</p>}
+    </div>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    collapse: css({
+      backgroundColor: 'unset',
+      border: 'unset',
+      marginBottom: 0,
+
+      ['> button']: {
+        padding: theme.spacing(0, 1),
+      },
+    }),
+    wrapper: css({
+      width: '100%',
+      display: 'flex',
+      justifyContent: 'space-between',
+      alignItems: 'baseline',
+    }),
+    title: css({
+      flexGrow: 1,
+      overflow: 'hidden',
+      fontSize: theme.typography.bodySmall.fontSize,
+      fontWeight: theme.typography.fontWeightMedium,
+      margin: 0,
+    }),
+    description: css({
+      color: theme.colors.text.secondary,
+      fontSize: theme.typography.bodySmall.fontSize,
+      fontWeight: theme.typography.bodySmall.fontWeight,
+      paddingLeft: theme.spacing(2),
+      gap: theme.spacing(2),
+      display: 'flex',
+    }),
+    body: css({
+      display: 'flex',
+      gap: theme.spacing(2),
+      flexWrap: 'wrap',
+    }),
+    stats: css({
+      margin: '0px',
+      color: theme.colors.text.secondary,
+      fontSize: theme.typography.bodySmall.fontSize,
+    }),
+    tooltip: css({
+      marginRight: theme.spacing(0.25),
+    }),
+  };
+};
+
+const generateQueryStats = (queryStats: QueryStats) => {
+  if (queryStats.message) {
+    return queryStats.message;
+  }
+
+  return `This query will process approximately ${convertUnits(queryStats)}.`;
+};
+
+const convertUnits = (queryStats: QueryStats): string => {
+  const { text, suffix } = getValueFormat('bytes')(queryStats.bytes, 1);
+  return text + suffix;
+};
diff --git a/public/app/plugins/datasource/tempo/_importedDependencies/datasources/prometheus/RawQuery.tsx b/public/app/plugins/datasource/tempo/_importedDependencies/datasources/prometheus/RawQuery.tsx
new file mode 100644
index 0000000000000..4d1f727e9f369
--- /dev/null
+++ b/public/app/plugins/datasource/tempo/_importedDependencies/datasources/prometheus/RawQuery.tsx
@@ -0,0 +1,37 @@
+import { css, cx } from '@emotion/css';
+import Prism, { Grammar } from 'prismjs';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data/src';
+import { useTheme2 } from '@grafana/ui/src';
+
+export interface Props {
+  query: string;
+  lang: {
+    grammar: Grammar;
+    name: string;
+  };
+  className?: string;
+}
+export function RawQuery({ query, lang, className }: Props) {
+  const theme = useTheme2();
+  const styles = getStyles(theme);
+  const highlighted = Prism.highlight(query, lang.grammar, lang.name);
+
+  return (
+    <div
+      className={cx(styles.editorField, 'prism-syntax-highlight', className)}
+      aria-label="selector"
+      dangerouslySetInnerHTML={{ __html: highlighted }}
+    />
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    editorField: css({
+      fontFamily: theme.typography.fontFamilyMonospace,
+      fontSize: theme.typography.bodySmall.fontSize,
+    }),
+  };
+};
diff --git a/public/app/plugins/datasource/prometheus/dataquery.gen.ts b/public/app/plugins/datasource/tempo/_importedDependencies/datasources/prometheus/dataquery.gen.ts
similarity index 100%
rename from public/app/plugins/datasource/prometheus/dataquery.gen.ts
rename to public/app/plugins/datasource/tempo/_importedDependencies/datasources/prometheus/dataquery.gen.ts
diff --git a/public/app/plugins/datasource/tempo/_importedDependencies/datasources/prometheus/language_utils.ts b/public/app/plugins/datasource/tempo/_importedDependencies/datasources/prometheus/language_utils.ts
new file mode 100644
index 0000000000000..456267f1f0f1c
--- /dev/null
+++ b/public/app/plugins/datasource/tempo/_importedDependencies/datasources/prometheus/language_utils.ts
@@ -0,0 +1,122 @@
+import { invert } from 'lodash';
+import { Token } from 'prismjs';
+
+import { AbstractLabelOperator, AbstractLabelMatcher, AbstractQuery } from '@grafana/data';
+
+export const SUGGESTIONS_LIMIT = 10000;
+
+const FromPromLikeMap: Record<string, AbstractLabelOperator> = {
+  '=': AbstractLabelOperator.Equal,
+  '!=': AbstractLabelOperator.NotEqual,
+  '=~': AbstractLabelOperator.EqualRegEx,
+  '!~': AbstractLabelOperator.NotEqualRegEx,
+};
+
+const ToPromLikeMap: Record<AbstractLabelOperator, string> = invert(FromPromLikeMap) as Record<
+  AbstractLabelOperator,
+  string
+>;
+
+export function limitSuggestions(items: string[]) {
+  return items.slice(0, SUGGESTIONS_LIMIT);
+}
+
+export function processLabels(labels: Array<{ [key: string]: string }>, withName = false) {
+  // For processing we are going to use sets as they have significantly better performance than arrays
+  // After we process labels, we will convert sets to arrays and return object with label values in arrays
+  const valueSet: { [key: string]: Set<string> } = {};
+  labels.forEach((label) => {
+    const { __name__, ...rest } = label;
+    if (withName) {
+      valueSet['__name__'] = valueSet['__name__'] || new Set();
+      if (!valueSet['__name__'].has(__name__)) {
+        valueSet['__name__'].add(__name__);
+      }
+    }
+
+    Object.keys(rest).forEach((key) => {
+      if (!valueSet[key]) {
+        valueSet[key] = new Set();
+      }
+      if (!valueSet[key].has(rest[key])) {
+        valueSet[key].add(rest[key]);
+      }
+    });
+  });
+
+  // valueArray that we are going to return in the object
+  const valueArray: { [key: string]: string[] } = {};
+  limitSuggestions(Object.keys(valueSet)).forEach((key) => {
+    valueArray[key] = limitSuggestions(Array.from(valueSet[key]));
+  });
+
+  return { values: valueArray, keys: Object.keys(valueArray) };
+}
+
+export function toPromLikeExpr(labelBasedQuery: AbstractQuery): string {
+  const expr = labelBasedQuery.labelMatchers
+    .map((selector: AbstractLabelMatcher) => {
+      const operator = ToPromLikeMap[selector.operator];
+      if (operator) {
+        return `${selector.name}${operator}"${selector.value}"`;
+      } else {
+        return '';
+      }
+    })
+    .filter((e: string) => e !== '')
+    .join(', ');
+
+  return expr ? `{${expr}}` : '';
+}
+
+function getMaybeTokenStringContent(token: Token): string {
+  if (typeof token.content === 'string') {
+    return token.content;
+  }
+
+  return '';
+}
+
+export function extractLabelMatchers(tokens: Array<string | Token>): AbstractLabelMatcher[] {
+  const labelMatchers: AbstractLabelMatcher[] = [];
+
+  for (const token of tokens) {
+    if (!(token instanceof Token)) {
+      continue;
+    }
+
+    if (token.type === 'context-labels') {
+      let labelKey = '';
+      let labelValue = '';
+      let labelOperator = '';
+
+      const contentTokens = Array.isArray(token.content) ? token.content : [token.content];
+
+      for (let currentToken of contentTokens) {
+        if (typeof currentToken === 'string') {
+          let currentStr: string;
+          currentStr = currentToken;
+          if (currentStr === '=' || currentStr === '!=' || currentStr === '=~' || currentStr === '!~') {
+            labelOperator = currentStr;
+          }
+        } else if (currentToken instanceof Token) {
+          switch (currentToken.type) {
+            case 'label-key':
+              labelKey = getMaybeTokenStringContent(currentToken);
+              break;
+            case 'label-value':
+              labelValue = getMaybeTokenStringContent(currentToken);
+              labelValue = labelValue.substring(1, labelValue.length - 1);
+              const labelComparator = FromPromLikeMap[labelOperator];
+              if (labelComparator) {
+                labelMatchers.push({ name: labelKey, operator: labelComparator, value: labelValue });
+              }
+              break;
+          }
+        }
+      }
+    }
+  }
+
+  return labelMatchers;
+}
diff --git a/public/app/plugins/datasource/tempo/_importedDependencies/datasources/prometheus/types.ts b/public/app/plugins/datasource/tempo/_importedDependencies/datasources/prometheus/types.ts
new file mode 100644
index 0000000000000..abbe1ce1905a9
--- /dev/null
+++ b/public/app/plugins/datasource/tempo/_importedDependencies/datasources/prometheus/types.ts
@@ -0,0 +1,165 @@
+import { Observable } from 'rxjs';
+
+import {
+  DataQueryRequest,
+  DataQueryResponse,
+  DataSourceGetTagKeysOptions,
+  DataSourceJsonData,
+  MetricFindValue,
+} from '@grafana/data';
+import { DataQuery } from '@grafana/schema';
+
+import { Prometheus as GenPromQuery } from './dataquery.gen';
+
+// import { QueryBuilderLabelFilter, QueryEditorMode } from './querybuilder/shared/types';
+export interface QueryBuilderLabelFilter {
+  label: string;
+  op: string;
+  value: string;
+}
+
+export enum QueryEditorMode {
+  Code = 'code',
+  Builder = 'builder',
+}
+
+export interface PromQuery extends GenPromQuery, DataQuery {
+  /**
+   * Timezone offset to align start & end time on backend
+   */
+  utcOffsetSec?: number;
+  valueWithRefId?: boolean;
+  showingGraph?: boolean;
+  showingTable?: boolean;
+  hinting?: boolean;
+  interval?: string;
+  // store the metrics explorer additional settings
+  useBackend?: boolean;
+  disableTextWrap?: boolean;
+  fullMetaSearch?: boolean;
+  includeNullMetadata?: boolean;
+}
+
+export enum PrometheusCacheLevel {
+  Low = 'Low',
+  Medium = 'Medium',
+  High = 'High',
+  None = 'None',
+}
+
+export enum PromApplication {
+  Cortex = 'Cortex',
+  Mimir = 'Mimir',
+  Prometheus = 'Prometheus',
+  Thanos = 'Thanos',
+}
+
+export interface PromOptions extends DataSourceJsonData {
+  timeInterval?: string;
+  queryTimeout?: string;
+  httpMethod?: string;
+  customQueryParameters?: string;
+  disableMetricsLookup?: boolean;
+  exemplarTraceIdDestinations?: ExemplarTraceIdDestination[];
+  prometheusType?: PromApplication;
+  prometheusVersion?: string;
+  cacheLevel?: PrometheusCacheLevel;
+  defaultEditor?: QueryEditorMode;
+  incrementalQuerying?: boolean;
+  incrementalQueryOverlapWindow?: string;
+  disableRecordingRules?: boolean;
+  sigV4Auth?: boolean;
+  oauthPassThru?: boolean;
+}
+
+export type ExemplarTraceIdDestination = {
+  name: string;
+  url?: string;
+  urlDisplayLabel?: string;
+  datasourceUid?: string;
+};
+
+export interface PromQueryRequest extends PromQuery {
+  step?: number;
+  requestId?: string;
+  start: number;
+  end: number;
+  headers?: any;
+}
+
+export interface PromMetricsMetadataItem {
+  type: string;
+  help: string;
+  unit?: string;
+}
+
+export interface PromMetricsMetadata {
+  [metric: string]: PromMetricsMetadataItem;
+}
+
+export type PromValue = [number, any];
+
+export interface PromMetric {
+  __name__?: string;
+
+  [index: string]: any;
+}
+
+export interface PromBuildInfoResponse {
+  data: {
+    application?: string;
+    version: string;
+    revision: string;
+    features?: {
+      ruler_config_api?: 'true' | 'false';
+      alertmanager_config_api?: 'true' | 'false';
+      query_sharding?: 'true' | 'false';
+      federated_rules?: 'true' | 'false';
+    };
+    [key: string]: unknown;
+  };
+  status: 'success';
+}
+
+/**
+ * Auto = query.legendFormat == '__auto'
+ * Verbose = query.legendFormat == null/undefined/''
+ * Custom query.legendFormat.length > 0 && query.legendFormat !== '__auto'
+ */
+export enum LegendFormatMode {
+  Auto = '__auto',
+  Verbose = '__verbose',
+  Custom = '__custom',
+}
+
+export enum PromVariableQueryType {
+  LabelNames,
+  LabelValues,
+  MetricNames,
+  VarQueryResult,
+  SeriesQuery,
+  ClassicQuery,
+}
+
+export interface PromVariableQuery extends DataQuery {
+  query?: string;
+  expr?: string;
+  qryType?: PromVariableQueryType;
+  label?: string;
+  metric?: string;
+  varQuery?: string;
+  seriesQuery?: string;
+  labelFilters?: QueryBuilderLabelFilter[];
+  match?: string;
+  classicQuery?: string;
+}
+
+export type StandardPromVariableQuery = {
+  query: string;
+  refId: string;
+};
+
+export type PrometheusDatasource = {
+  getTagKeys(options: DataSourceGetTagKeysOptions): Promise<MetricFindValue[]>;
+  query(request: DataQueryRequest<PromQuery>): Observable<DataQueryResponse>;
+};
diff --git a/public/app/plugins/datasource/tempo/_importedDependencies/test/helpers/createFetchResponse.ts b/public/app/plugins/datasource/tempo/_importedDependencies/test/helpers/createFetchResponse.ts
new file mode 100644
index 0000000000000..1f75026ed71f9
--- /dev/null
+++ b/public/app/plugins/datasource/tempo/_importedDependencies/test/helpers/createFetchResponse.ts
@@ -0,0 +1,15 @@
+import { FetchResponse } from '@grafana/runtime';
+
+export function createFetchResponse<T>(data: T): FetchResponse<T> {
+  return {
+    data,
+    status: 200,
+    url: 'http://localhost:3000/api/ds/query',
+    config: { url: 'http://localhost:3000/api/ds/query' },
+    type: 'basic',
+    statusText: 'Ok',
+    redirected: false,
+    headers: {} as unknown as Headers,
+    ok: true,
+  };
+}
diff --git a/public/app/plugins/datasource/tempo/_importedDependencies/test/helpers/selectOptionInTest.ts b/public/app/plugins/datasource/tempo/_importedDependencies/test/helpers/selectOptionInTest.ts
new file mode 100644
index 0000000000000..62bd8c169491c
--- /dev/null
+++ b/public/app/plugins/datasource/tempo/_importedDependencies/test/helpers/selectOptionInTest.ts
@@ -0,0 +1,8 @@
+import { waitFor } from '@testing-library/react';
+import { select } from 'react-select-event';
+
+// Used to select an option or options from a Select in unit tests
+export const selectOptionInTest = async (
+  input: HTMLElement,
+  optionOrOptions: string | RegExp | Array<string | RegExp>
+) => await waitFor(() => select(input, optionOrOptions, { container: document.body }));
diff --git a/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx
index 43d5cf502cfa2..9e8a3310e6221 100644
--- a/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx
@@ -6,21 +6,22 @@ import {
   AdvancedHttpSettings,
   Auth,
   ConfigSection,
+  ConfigDescriptionLink,
   ConfigSubSection,
   ConnectionSettings,
   convertLegacyAuthProps,
   DataSourceDescription,
 } from '@grafana/experimental';
+import {
+  NodeGraphSection,
+  SpanBarSection,
+  TraceToLogsSection,
+  TraceToMetricsSection,
+  TraceToProfilesSection,
+} from '@grafana/o11y-ds-frontend';
 import { config } from '@grafana/runtime';
-import { SecureSocksProxySettings, useStyles2 } from '@grafana/ui';
-import { ConfigDescriptionLink } from 'app/core/components/ConfigDescriptionLink';
-import { Divider } from 'app/core/components/Divider';
-import { NodeGraphSection } from 'app/core/components/NodeGraphSettings';
-import { TraceToLogsSection } from 'app/core/components/TraceToLogs/TraceToLogsSettings';
-import { TraceToMetricsSection } from 'app/core/components/TraceToMetrics/TraceToMetricsSettings';
-import { SpanBarSection } from 'app/features/explore/TraceView/components/settings/SpanBarSettings';
-
-import { LokiSearchSettings } from './LokiSearchSettings';
+import { SecureSocksProxySettings, useStyles2, Divider, Stack } from '@grafana/ui';
+
 import { QuerySettings } from './QuerySettings';
 import { ServiceGraphSettings } from './ServiceGraphSettings';
 import { TraceQLSearchSettings } from './TraceQLSearchSettings';
@@ -38,10 +39,10 @@ export const ConfigEditor = ({ options, onOptionsChange }: Props) => {
         hasRequiredFields={false}
       />
 
-      <Divider />
+      <Divider spacing={4} />
       <ConnectionSettings config={options} onChange={onOptionsChange} urlPlaceholder="http://localhost:3200" />
 
-      <Divider />
+      <Divider spacing={4} />
       <Auth
         {...convertLegacyAuthProps({
           config: options,
@@ -49,16 +50,15 @@ export const ConfigEditor = ({ options, onOptionsChange }: Props) => {
         })}
       />
 
-      <Divider />
+      <Divider spacing={4} />
       <TraceToLogsSection options={options} onOptionsChange={onOptionsChange} />
+      <Divider spacing={4} />
+
+      <TraceToMetricsSection options={options} onOptionsChange={onOptionsChange} />
+      <Divider spacing={4} />
 
-      <Divider />
-      {config.featureToggles.traceToMetrics ? (
-        <>
-          <TraceToMetricsSection options={options} onOptionsChange={onOptionsChange} />
-          <Divider />
-        </>
-      ) : null}
+      <TraceToProfilesSection options={options} onOptionsChange={onOptionsChange} />
+      <Divider spacing={4} />
 
       <ConfigSection
         title="Additional settings"
@@ -66,85 +66,67 @@ export const ConfigEditor = ({ options, onOptionsChange }: Props) => {
         isCollapsible={true}
         isInitiallyOpen={false}
       >
-        <AdvancedHttpSettings config={options} onChange={onOptionsChange} />
-
-        {config.secureSocksDSProxyEnabled && (
-          <>
-            <Divider hideLine />
-            <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
-          </>
-        )}
-
-        <Divider hideLine />
-        <ConfigSubSection
-          title="Service graph"
-          description={
-            <ConfigDescriptionLink
-              description="Select a Prometheus data source that contains the service graph data."
-              suffix="tempo/configure-tempo-data-source/#service-graph"
-              feature="the service graph"
-            />
-          }
-        >
-          <ServiceGraphSettings options={options} onOptionsChange={onOptionsChange} />
-        </ConfigSubSection>
-
-        <Divider hideLine />
-        <NodeGraphSection options={options} onOptionsChange={onOptionsChange} />
-
-        <Divider hideLine />
-        <ConfigSubSection
-          title="Tempo search"
-          description={
-            <ConfigDescriptionLink
-              description="Modify how traces are searched."
-              suffix="tempo/configure-tempo-data-source/#tempo-search"
-              feature="Tempo search"
-            />
-          }
-        >
-          <TraceQLSearchSettings options={options} onOptionsChange={onOptionsChange} />
-        </ConfigSubSection>
-
-        <Divider hideLine />
-        <ConfigSubSection
-          title="Loki search"
-          description={
-            <ConfigDescriptionLink
-              description="Select a Loki data source to search for traces. Derived fields must be configured in the Loki data source."
-              suffix="tempo/configure-tempo-data-source/#loki-search"
-              feature="Loki search"
-            />
-          }
-        >
-          <LokiSearchSettings options={options} onOptionsChange={onOptionsChange} />
-        </ConfigSubSection>
-
-        <Divider hideLine />
-        <ConfigSubSection
-          title="TraceID query"
-          description={
-            <ConfigDescriptionLink
-              description="Modify how TraceID queries are run."
-              suffix="tempo/configure-tempo-data-source/#traceid-query"
-              feature="the TraceID query"
-            />
-          }
-        >
-          <QuerySettings options={options} onOptionsChange={onOptionsChange} />
-        </ConfigSubSection>
-
-        <Divider hideLine />
-        <SpanBarSection options={options} onOptionsChange={onOptionsChange} />
+        <Stack gap={5} direction="column">
+          <AdvancedHttpSettings config={options} onChange={onOptionsChange} />
+
+          {config.secureSocksDSProxyEnabled && (
+            <>
+              <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
+            </>
+          )}
+
+          <ConfigSubSection
+            title="Service graph"
+            description={
+              <ConfigDescriptionLink
+                description="Select a Prometheus data source that contains the service graph data."
+                suffix="tempo/configure-tempo-data-source/#service-graph"
+                feature="the service graph"
+              />
+            }
+          >
+            <ServiceGraphSettings options={options} onOptionsChange={onOptionsChange} />
+          </ConfigSubSection>
+
+          <NodeGraphSection options={options} onOptionsChange={onOptionsChange} />
+
+          <ConfigSubSection
+            title="Tempo search"
+            description={
+              <ConfigDescriptionLink
+                description="Modify how traces are searched."
+                suffix="tempo/configure-tempo-data-source/#tempo-search"
+                feature="Tempo search"
+              />
+            }
+          >
+            <TraceQLSearchSettings options={options} onOptionsChange={onOptionsChange} />
+          </ConfigSubSection>
+
+          <ConfigSubSection
+            title="TraceID query"
+            description={
+              <ConfigDescriptionLink
+                description="Modify how TraceID queries are run."
+                suffix="tempo/configure-tempo-data-source/#traceid-query"
+                feature="the TraceID query"
+              />
+            }
+          >
+            <QuerySettings options={options} onOptionsChange={onOptionsChange} />
+          </ConfigSubSection>
+
+          <SpanBarSection options={options} onOptionsChange={onOptionsChange} />
+        </Stack>
       </ConfigSection>
     </div>
   );
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  container: css`
-    label: container;
-    margin-bottom: ${theme.spacing(2)};
-    max-width: 900px;
-  `,
+  container: css({
+    label: 'container',
+    marginBottom: theme.spacing(2),
+    maxWidth: '900px',
+  }),
 });
diff --git a/public/app/plugins/datasource/tempo/configuration/LokiSearchSettings.tsx b/public/app/plugins/datasource/tempo/configuration/LokiSearchSettings.tsx
deleted file mode 100644
index 7ae8e368ee242..0000000000000
--- a/public/app/plugins/datasource/tempo/configuration/LokiSearchSettings.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import React from 'react';
-
-import {
-  DataSourceInstanceSettings,
-  DataSourcePluginOptionsEditorProps,
-  updateDatasourcePluginJsonDataOption,
-} from '@grafana/data';
-import { Button, InlineField, InlineFieldRow, useStyles2 } from '@grafana/ui';
-import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker';
-
-import { TempoJsonData } from '../types';
-
-import { getStyles } from './QuerySettings';
-
-interface Props extends DataSourcePluginOptionsEditorProps<TempoJsonData> {}
-
-export function LokiSearchSettings({ options, onOptionsChange }: Props) {
-  const styles = useStyles2(getStyles);
-
-  // Default to the trace to logs datasource if configured and loki search was enabled
-  // but only if jsonData.lokiSearch hasn't been set
-  const legacyDatasource =
-    options.jsonData.tracesToLogs?.lokiSearch !== false ? options.jsonData.tracesToLogs?.datasourceUid : undefined;
-  if (legacyDatasource && options.jsonData.lokiSearch === undefined) {
-    updateDatasourcePluginJsonDataOption({ onOptionsChange, options }, 'lokiSearch', {
-      datasourceUid: legacyDatasource,
-    });
-  }
-
-  return (
-    <div className={styles.container}>
-      <InlineFieldRow className={styles.row}>
-        <InlineField tooltip="The Loki data source with the service graph data" label="Data source" labelWidth={26}>
-          <DataSourcePicker
-            inputId="loki-search-data-source-picker"
-            pluginId="loki"
-            current={options.jsonData.lokiSearch?.datasourceUid}
-            noDefault={true}
-            width={40}
-            onChange={(ds: DataSourceInstanceSettings) =>
-              updateDatasourcePluginJsonDataOption({ onOptionsChange, options }, 'lokiSearch', {
-                datasourceUid: ds.uid,
-              })
-            }
-          />
-        </InlineField>
-        {options.jsonData.lokiSearch?.datasourceUid ? (
-          <Button
-            type={'button'}
-            variant={'secondary'}
-            size={'sm'}
-            fill={'text'}
-            onClick={() => {
-              updateDatasourcePluginJsonDataOption({ onOptionsChange, options }, 'lokiSearch', {
-                datasourceUid: undefined,
-              });
-            }}
-          >
-            Clear
-          </Button>
-        ) : null}
-      </InlineFieldRow>
-    </div>
-  );
-}
diff --git a/public/app/plugins/datasource/tempo/configuration/QuerySettings.tsx b/public/app/plugins/datasource/tempo/configuration/QuerySettings.tsx
index 76f0ba7ff7110..85adf08d72d8f 100644
--- a/public/app/plugins/datasource/tempo/configuration/QuerySettings.tsx
+++ b/public/app/plugins/datasource/tempo/configuration/QuerySettings.tsx
@@ -2,9 +2,8 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { DataSourcePluginOptionsEditorProps, GrafanaTheme2, updateDatasourcePluginJsonDataOption } from '@grafana/data';
+import { IntervalInput, invalidTimeShiftError } from '@grafana/o11y-ds-frontend';
 import { InlineField, InlineSwitch, useStyles2 } from '@grafana/ui';
-import { IntervalInput } from 'app/core/components/IntervalInput/IntervalInput';
-import { invalidTimeShiftError } from 'app/core/components/TraceToLogs/TraceToLogsSettings';
 
 import { TempoJsonData } from '../types';
 
@@ -72,14 +71,14 @@ export function QuerySettings({ options, onOptionsChange }: Props) {
 }
 
 export const getStyles = (theme: GrafanaTheme2) => ({
-  infoText: css`
-    padding-bottom: ${theme.spacing(2)};
-    color: ${theme.colors.text.secondary};
-  `,
-  container: css`
-    width: 100%;
-  `,
-  row: css`
-    align-items: baseline;
-  `,
+  infoText: css({
+    paddingBottom: theme.spacing(2),
+    color: theme.colors.text.secondary,
+  }),
+  container: css({
+    width: '100%',
+  }),
+  row: css({
+    alignItems: 'baseline',
+  }),
 });
diff --git a/public/app/plugins/datasource/tempo/configuration/ServiceGraphSettings.tsx b/public/app/plugins/datasource/tempo/configuration/ServiceGraphSettings.tsx
index 646d004f88855..b19515e9fc612 100644
--- a/public/app/plugins/datasource/tempo/configuration/ServiceGraphSettings.tsx
+++ b/public/app/plugins/datasource/tempo/configuration/ServiceGraphSettings.tsx
@@ -5,8 +5,8 @@ import {
   DataSourcePluginOptionsEditorProps,
   updateDatasourcePluginJsonDataOption,
 } from '@grafana/data';
+import { DataSourcePicker } from '@grafana/runtime';
 import { Button, InlineField, InlineFieldRow, useStyles2 } from '@grafana/ui';
-import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker';
 
 import { TempoJsonData } from '../types';
 
diff --git a/public/app/plugins/datasource/tempo/dataquery.cue b/public/app/plugins/datasource/tempo/dataquery.cue
index c94c9a16254b4..786f000fef6e8 100644
--- a/public/app/plugins/datasource/tempo/dataquery.cue
+++ b/public/app/plugins/datasource/tempo/dataquery.cue
@@ -38,8 +38,8 @@ composableKinds: DataQuery: {
 					minDuration?: string
 					// @deprecated Define the maximum duration to select traces. Use duration format, for example: 1.2s, 100ms
 					maxDuration?: string
-					// Filters to be included in a PromQL query to select data for the service graph. Example: {client="app",service="app"}
-					serviceMapQuery?: string
+					// Filters to be included in a PromQL query to select data for the service graph. Example: {client="app",service="app"}. Providing multiple values will produce union of results for each filter, using PromQL OR operator internally.
+					serviceMapQuery?: string | [...string]
 					// Use service.namespace in addition to service.name to uniquely identify a service.
 					serviceMapIncludeNamespace?: bool
 					// Defines the maximum number of traces that are returned from Tempo
@@ -53,8 +53,7 @@ composableKinds: DataQuery: {
 					tableType?: #SearchTableType
 				} @cuetsy(kind="interface") @grafana(TSVeneer="type")
 
-				// search = Loki search, nativeSearch = Tempo search for backwards compatibility
-				#TempoQueryType: "traceql" | "traceqlSearch" | "search" | "serviceMap" | "upload" | "nativeSearch" | "traceId" | "clear" @cuetsy(kind="type")
+				#TempoQueryType: "traceql" | "traceqlSearch" | "serviceMap" | "upload" | "nativeSearch" | "traceId" | "clear" @cuetsy(kind="type")
 
 				// The state of the TraceQL streaming search query
 				#SearchStreamingState: "pending" | "streaming" | "done" | "error" @cuetsy(kind="enum")
diff --git a/public/app/plugins/datasource/tempo/dataquery.gen.ts b/public/app/plugins/datasource/tempo/dataquery.gen.ts
index 7cfa4c022b480..17cce1c50d0d2 100644
--- a/public/app/plugins/datasource/tempo/dataquery.gen.ts
+++ b/public/app/plugins/datasource/tempo/dataquery.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
@@ -41,9 +41,9 @@ export interface TempoQuery extends common.DataQuery {
    */
   serviceMapIncludeNamespace?: boolean;
   /**
-   * Filters to be included in a PromQL query to select data for the service graph. Example: {client="app",service="app"}
+   * Filters to be included in a PromQL query to select data for the service graph. Example: {client="app",service="app"}. Providing multiple values will produce union of results for each filter, using PromQL OR operator internally.
    */
-  serviceMapQuery?: string;
+  serviceMapQuery?: (string | Array<string>);
   /**
    * @deprecated Query traces by service name
    */
@@ -67,10 +67,7 @@ export const defaultTempoQuery: Partial<TempoQuery> = {
   groupBy: [],
 };
 
-/**
- * search = Loki search, nativeSearch = Tempo search for backwards compatibility
- */
-export type TempoQueryType = ('traceql' | 'traceqlSearch' | 'search' | 'serviceMap' | 'upload' | 'nativeSearch' | 'traceId' | 'clear');
+export type TempoQueryType = ('traceql' | 'traceqlSearch' | 'serviceMap' | 'upload' | 'nativeSearch' | 'traceId' | 'clear');
 
 /**
  * The state of the TraceQL streaming search query
@@ -127,4 +124,4 @@ export interface TraceqlFilter {
   valueType?: string;
 }
 
-export interface Tempo {}
+export interface TempoDataQuery {}
diff --git a/public/app/plugins/datasource/tempo/datasource.test.ts b/public/app/plugins/datasource/tempo/datasource.test.ts
index 13051aa853459..ab3d90b1a9fc9 100644
--- a/public/app/plugins/datasource/tempo/datasource.test.ts
+++ b/public/app/plugins/datasource/tempo/datasource.test.ts
@@ -1,6 +1,4 @@
 import { lastValueFrom, Observable, of } from 'rxjs';
-import { createFetchResponse } from 'test/helpers/createFetchResponse';
-import { initTemplateSrv } from 'test/helpers/initTemplateSrv';
 
 import {
   DataFrame,
@@ -13,15 +11,27 @@ import {
   createDataFrame,
   PluginType,
   CoreApp,
+  DataSourceApi,
+  DataQueryRequest,
+  getTimeZone,
+  PluginMetaInfo,
 } from '@grafana/data';
-import { BackendDataSourceResponse, FetchResponse, setBackendSrv, setDataSourceSrv } from '@grafana/runtime';
-import { BarGaugeDisplayMode, TableCellDisplayMode } from '@grafana/schema';
-import { TemplateSrv } from 'app/features/templating/template_srv';
+import {
+  BackendDataSourceResponse,
+  config,
+  FetchResponse,
+  setBackendSrv,
+  setDataSourceSrv,
+  TemplateSrv,
+  DataSourceSrv,
+  BackendSrv,
+} from '@grafana/runtime';
+import { BarGaugeDisplayMode, DataQuery, TableCellDisplayMode } from '@grafana/schema';
 
 import { TempoVariableQueryType } from './VariableQueryEditor';
+import { createFetchResponse } from './_importedDependencies/test/helpers/createFetchResponse';
 import { TraceqlSearchScope } from './dataquery.gen';
 import {
-  DEFAULT_LIMIT,
   TempoDatasource,
   buildExpr,
   buildLinkExpr,
@@ -34,9 +44,10 @@ import {
 import mockJson from './mockJsonResponse.json';
 import mockServiceGraph from './mockServiceGraph.json';
 import { createMetadataRequest, createTempoDatasource } from './mocks';
+import { initTemplateSrv } from './test_utils';
 import { TempoJsonData, TempoQuery } from './types';
 
-let mockObservable: () => Observable<any>;
+let mockObservable: () => Observable<unknown>;
 jest.mock('@grafana/runtime', () => {
   return {
     ...jest.requireActual('@grafana/runtime'),
@@ -54,32 +65,111 @@ describe('Tempo data source', () => {
   afterEach(() => (console.error = origError));
   beforeEach(() => (console.error = consoleErrorMock));
 
+  describe('runs correctly', () => {
+    config.featureToggles.traceQLStreaming = true;
+    jest.spyOn(TempoDatasource.prototype, 'isFeatureAvailable').mockImplementation(() => true);
+    const handleStreamingSearch = jest.spyOn(TempoDatasource.prototype, 'handleStreamingSearch');
+    const request = jest.spyOn(TempoDatasource.prototype, '_request');
+    const templateSrv: TemplateSrv = { replace: (s: string) => s } as unknown as TemplateSrv;
+
+    const range = {
+      from: dateTime(new Date(2022, 8, 13, 16, 0, 0, 0)),
+      to: dateTime(new Date(2022, 8, 13, 16, 15, 0, 0)),
+      raw: { from: '15m', to: 'now' },
+    };
+    const traceqlQuery = {
+      targets: [{ refId: 'refid1', queryType: 'traceql', query: '{}' }],
+      range,
+    };
+    const traceqlSearchQuery = {
+      targets: [
+        {
+          refId: 'refid1',
+          queryType: 'traceqlSearch',
+          filters: [
+            {
+              id: 'service-name',
+              operator: '=',
+              scope: TraceqlSearchScope.Resource,
+              tag: 'service.name',
+              valueType: 'string',
+            },
+          ],
+        },
+      ],
+      range,
+    };
+
+    it('for traceql queries when live is enabled', async () => {
+      config.liveEnabled = true;
+      const ds = new TempoDatasource(defaultSettings, templateSrv);
+      await lastValueFrom(ds.query(traceqlQuery as DataQueryRequest<TempoQuery>));
+      expect(handleStreamingSearch).toHaveBeenCalledTimes(1);
+      expect(request).toHaveBeenCalledTimes(0);
+    });
+
+    it('for traceqlSearch queries when live is enabled', async () => {
+      config.liveEnabled = true;
+      const ds = new TempoDatasource(defaultSettings, templateSrv);
+      await lastValueFrom(ds.query(traceqlSearchQuery as DataQueryRequest<TempoQuery>));
+      expect(handleStreamingSearch).toHaveBeenCalledTimes(2);
+      expect(request).toHaveBeenCalledTimes(0);
+    });
+
+    it('for traceql queries when live is not enabled', async () => {
+      config.liveEnabled = false;
+      const ds = new TempoDatasource(defaultSettings, templateSrv);
+      await lastValueFrom(ds.query(traceqlQuery as DataQueryRequest<TempoQuery>));
+      expect(handleStreamingSearch).toHaveBeenCalledTimes(2);
+      expect(request).toHaveBeenCalledTimes(1);
+    });
+
+    it('for traceqlSearch queries when live is not enabled', async () => {
+      config.liveEnabled = false;
+      const ds = new TempoDatasource(defaultSettings, templateSrv);
+      await lastValueFrom(ds.query(traceqlSearchQuery as DataQueryRequest<TempoQuery>));
+      expect(handleStreamingSearch).toHaveBeenCalledTimes(2);
+      expect(request).toHaveBeenCalledTimes(2);
+    });
+  });
+
   it('returns empty response when traceId is empty', async () => {
     const templateSrv: TemplateSrv = { replace: jest.fn() } as unknown as TemplateSrv;
     const ds = new TempoDatasource(defaultSettings, templateSrv);
     const response = await lastValueFrom(
-      ds.query({ targets: [{ refId: 'refid1', queryType: 'traceql', query: '' } as Partial<TempoQuery>] } as any),
+      ds.query({
+        targets: [{ refId: 'refid1', queryType: 'traceql', query: '' } as Partial<TempoQuery>],
+      } as DataQueryRequest<TempoQuery>),
       { defaultValue: 'empty' }
     );
     expect(response).toBe('empty');
   });
 
   describe('Variables should be interpolated correctly', () => {
-    function getQuery(): TempoQuery {
+    function getQuery(serviceMapQuery: string | string[] = '$interpolationVar'): TempoQuery {
       return {
         refId: 'x',
         queryType: 'traceql',
-        linkedQuery: {
-          refId: 'linked',
-          expr: '{instance="$interpolationVar"}',
-        },
         query: '$interpolationVarWithPipe',
-        spanName: '$interpolationVar',
-        serviceName: '$interpolationVar',
-        search: '$interpolationVar',
-        minDuration: '$interpolationVar',
-        maxDuration: '$interpolationVar',
-        filters: [],
+        serviceMapQuery,
+        filters: [
+          {
+            id: 'service-name',
+            operator: '=',
+            scope: TraceqlSearchScope.Resource,
+            tag: 'service.name',
+            value: '$interpolationVarWithPipe',
+            valueType: 'string',
+          },
+          {
+            id: 'tagId',
+            operator: '=',
+            scope: TraceqlSearchScope.Span,
+            tag: '$interpolationVar',
+            value: '$interpolationVar',
+            valueType: 'string',
+          },
+        ],
       };
     }
     let templateSrv: TemplateSrv;
@@ -87,45 +177,50 @@ describe('Tempo data source', () => {
     const textWithPipe = 'interpolationTextOne|interpolationTextTwo';
 
     beforeEach(() => {
-      templateSrv = initTemplateSrv('key', [
-        {
-          type: 'custom',
-          name: 'interpolationVar',
-          current: { value: [text] },
-        },
-        {
-          type: 'custom',
-          name: 'interpolationVarWithPipe',
-          current: { value: [textWithPipe] },
-        },
-      ]);
+      const expectedValues = {
+        interpolationVar: 'scopedInterpolationText',
+        interpolationText: 'interpolationText',
+        interpolationVarWithPipe: 'interpolationTextOne|interpolationTextTwo',
+        scopedInterpolationText: 'scopedInterpolationText',
+      };
+      templateSrv = initTemplateSrv([{ name: 'templateVariable1' }, { name: 'templateVariable2' }], expectedValues);
     });
 
-    it('when traceId query for dashboard->explore', async () => {
+    it('when moving from dashboard to explore', async () => {
+      const expectedValues = {
+        interpolationVar: 'interpolationText',
+        interpolationText: 'interpolationText',
+        interpolationVarWithPipe: 'interpolationTextOne|interpolationTextTwo',
+        scopedInterpolationText: 'scopedInterpolationText',
+      };
+      templateSrv = initTemplateSrv([{ name: 'templateVariable1' }, { name: 'templateVariable2' }], expectedValues);
+
       const ds = new TempoDatasource(defaultSettings, templateSrv);
       const queries = ds.interpolateVariablesInQueries([getQuery()], {});
-      expect(queries[0].linkedQuery?.expr).toBe(`{instance=\"${text}\"}`);
       expect(queries[0].query).toBe(textWithPipe);
-      expect(queries[0].serviceName).toBe(text);
-      expect(queries[0].spanName).toBe(text);
-      expect(queries[0].search).toBe(text);
-      expect(queries[0].minDuration).toBe(text);
-      expect(queries[0].maxDuration).toBe(text);
+      expect(queries[0].serviceMapQuery).toBe(text);
+      expect(queries[0].filters[0].value).toBe(textWithPipe);
+      expect(queries[0].filters[1].value).toBe(text);
+      expect(queries[0].filters[1].tag).toBe(text);
     });
 
-    it('when traceId query for template variable', async () => {
+    it('when applying template variables', async () => {
       const scopedText = 'scopedInterpolationText';
       const ds = new TempoDatasource(defaultSettings, templateSrv);
       const resp = ds.applyTemplateVariables(getQuery(), {
         interpolationVar: { text: scopedText, value: scopedText },
       });
-      expect(resp.linkedQuery?.expr).toBe(`{instance=\"${scopedText}\"}`);
       expect(resp.query).toBe(textWithPipe);
-      expect(resp.serviceName).toBe(scopedText);
-      expect(resp.spanName).toBe(scopedText);
-      expect(resp.search).toBe(scopedText);
-      expect(resp.minDuration).toBe(scopedText);
-      expect(resp.maxDuration).toBe(scopedText);
+      expect(resp.filters[0].value).toBe(textWithPipe);
+      expect(resp.filters[1].value).toBe(scopedText);
+      expect(resp.filters[1].tag).toBe(scopedText);
+    });
+
+    it('when serviceMapQuery is an array', async () => {
+      const ds = new TempoDatasource(defaultSettings, templateSrv);
+      const queries = ds.interpolateVariablesInQueries([getQuery(['$interpolationVar', '$interpolationVar'])], {});
+      expect(queries[0].serviceMapQuery?.[0]).toBe('scopedInterpolationText');
+      expect(queries[0].serviceMapQuery?.[1]).toBe('scopedInterpolationText');
     });
   });
 
@@ -146,9 +241,11 @@ describe('Tempo data source', () => {
         ],
       })
     );
-    const templateSrv: any = { replace: jest.fn() };
+    const templateSrv = { replace: jest.fn() } as unknown as TemplateSrv;
     const ds = new TempoDatasource(defaultSettings, templateSrv);
-    const response = await lastValueFrom(ds.query({ targets: [{ refId: 'refid1', query: '12345' }] } as any));
+    const response = await lastValueFrom(
+      ds.query({ targets: [{ refId: 'refid1', query: '12345' }] } as DataQueryRequest<TempoQuery>)
+    );
 
     expect(
       (response.data[0] as DataFrame).fields.map((f) => ({
@@ -200,7 +297,7 @@ describe('Tempo data source', () => {
     const response = await lastValueFrom(
       ds.query({
         targets: [{ queryType: 'upload', refId: 'A' }],
-      } as any)
+      } as DataQueryRequest<TempoQuery>)
     );
     const field = response.data[0].fields[0];
     expect(field.name).toBe('traceID');
@@ -215,7 +312,7 @@ describe('Tempo data source', () => {
     const response = await lastValueFrom(
       ds.query({
         targets: [{ queryType: 'upload', refId: 'A' }],
-      } as any)
+      } as DataQueryRequest<TempoQuery>)
     );
     expect(response.error?.message).toBeDefined();
     expect(response.data.length).toBe(0);
@@ -227,7 +324,7 @@ describe('Tempo data source', () => {
     const response = await lastValueFrom(
       ds.query({
         targets: [{ queryType: 'upload', refId: 'A' }],
-      } as any)
+      } as DataQueryRequest<TempoQuery>)
     );
     expect(response.data).toHaveLength(2);
     const nodesFrame = response.data[0];
@@ -239,32 +336,6 @@ describe('Tempo data source', () => {
     expect(edgesFrame.meta?.preferredVisualisationType).toBe('nodeGraph');
   });
 
-  it('should build search query correctly', () => {
-    const templateSrv: any = { replace: jest.fn() };
-    const ds = new TempoDatasource(defaultSettings, templateSrv);
-    const duration = '10ms';
-    templateSrv.replace.mockReturnValue(duration);
-    const tempoQuery: TempoQuery = {
-      queryType: 'search',
-      refId: 'A',
-      query: '',
-      serviceName: 'frontend',
-      spanName: '/config',
-      search: 'root.http.status_code=500',
-      minDuration: '$interpolationVar',
-      maxDuration: '$interpolationVar',
-      limit: 10,
-      filters: [],
-    };
-    const builtQuery = ds.buildSearchQuery(tempoQuery);
-    expect(builtQuery).toStrictEqual({
-      tags: 'root.http.status_code=500 service.name="frontend" name="/config"',
-      minDuration: duration,
-      maxDuration: duration,
-      limit: 10,
-    });
-  });
-
   it('should format metrics summary query correctly', () => {
     const ds = new TempoDatasource(defaultSettings, {} as TemplateSrv);
     const queryGroupBy = [
@@ -277,110 +348,6 @@ describe('Tempo data source', () => {
     expect(groupBy).toEqual('.component, span.name, resource.service.name, kind');
   });
 
-  it('should include a default limit', () => {
-    const ds = new TempoDatasource(defaultSettings);
-    const tempoQuery: TempoQuery = {
-      queryType: 'search',
-      refId: 'A',
-      query: '',
-      search: '',
-      filters: [],
-    };
-    const builtQuery = ds.buildSearchQuery(tempoQuery);
-    expect(builtQuery).toStrictEqual({
-      tags: '',
-      limit: DEFAULT_LIMIT,
-    });
-  });
-
-  it('should include time range if provided', () => {
-    const ds = new TempoDatasource(defaultSettings);
-    const tempoQuery: TempoQuery = {
-      queryType: 'search',
-      refId: 'A',
-      query: '',
-      search: '',
-      filters: [],
-    };
-    const timeRange = { startTime: 0, endTime: 1000 };
-    const builtQuery = ds.buildSearchQuery(tempoQuery, timeRange);
-    expect(builtQuery).toStrictEqual({
-      tags: '',
-      limit: DEFAULT_LIMIT,
-      start: timeRange.startTime,
-      end: timeRange.endTime,
-    });
-  });
-
-  it('formats native search query history correctly', () => {
-    const ds = new TempoDatasource(defaultSettings);
-    const tempoQuery: TempoQuery = {
-      filters: [],
-      queryType: 'nativeSearch',
-      refId: 'A',
-      query: '',
-      serviceName: 'frontend',
-      spanName: '/config',
-      search: 'root.http.status_code=500',
-      minDuration: '1ms',
-      maxDuration: '100s',
-      limit: 10,
-    };
-    const result = ds.getQueryDisplayText(tempoQuery);
-    expect(result).toBe(
-      'Service Name: frontend, Span Name: /config, Search: root.http.status_code=500, Min Duration: 1ms, Max Duration: 100s, Limit: 10'
-    );
-  });
-
-  it('should get loki search datasource', () => {
-    // 1. Get lokiSearch.datasource if present
-    const ds1 = new TempoDatasource({
-      ...defaultSettings,
-      jsonData: {
-        lokiSearch: {
-          datasourceUid: 'loki-1',
-        },
-      },
-    });
-    const lokiDS1 = ds1.getLokiSearchDS();
-    expect(lokiDS1).toBe('loki-1');
-
-    // 2. Get traceToLogs.datasource
-    const ds2 = new TempoDatasource({
-      ...defaultSettings,
-      jsonData: {
-        tracesToLogs: {
-          lokiSearch: true,
-          datasourceUid: 'loki-2',
-        },
-      },
-    });
-    const lokiDS2 = ds2.getLokiSearchDS();
-    expect(lokiDS2).toBe('loki-2');
-
-    // 3. Return undefined if neither is available
-    const ds3 = new TempoDatasource(defaultSettings);
-    const lokiDS3 = ds3.getLokiSearchDS();
-    expect(lokiDS3).toBe(undefined);
-
-    // 4. Return undefined if lokiSearch is undefined, even if traceToLogs is present
-    // since this indicates the user cleared the fallback setting
-    const ds4 = new TempoDatasource({
-      ...defaultSettings,
-      jsonData: {
-        tracesToLogs: {
-          lokiSearch: true,
-          datasourceUid: 'loki-2',
-        },
-        lokiSearch: {
-          datasourceUid: undefined,
-        },
-      },
-    });
-    const lokiDS4 = ds4.getLokiSearchDS();
-    expect(lokiDS4).toBe(undefined);
-  });
-
   describe('test the testDatasource function', () => {
     it('should return a success msg if response.ok is true', async () => {
       mockObservable = () => of({ ok: true });
@@ -468,9 +435,13 @@ describe('Tempo service graph view', () => {
         },
       },
     });
-    setDataSourceSrv(backendSrvWithPrometheus as any);
+    setDataSourceSrv(dataSourceSrvWithPrometheus(prometheusMock()));
     const response = await lastValueFrom(
-      ds.query({ targets: [{ queryType: 'serviceMap' }], range: getDefaultTimeRange(), app: CoreApp.Explore } as any)
+      ds.query({
+        targets: [{ queryType: 'serviceMap' }],
+        range: getDefaultTimeRange(),
+        app: CoreApp.Explore,
+      } as DataQueryRequest<TempoQuery>)
     );
 
     expect(response.data).toHaveLength(3);
@@ -552,10 +523,104 @@ describe('Tempo service graph view', () => {
     expect(response.data[2].fields[0].values.length).toBe(2);
   });
 
+  it('runs correct queries with single serviceMapQuery defined', async () => {
+    const ds = new TempoDatasource({
+      ...defaultSettings,
+      jsonData: {
+        serviceMap: {
+          datasourceUid: 'prom',
+        },
+      },
+    });
+    const promMock = prometheusMock();
+    setDataSourceSrv(dataSourceSrvWithPrometheus(promMock));
+    const response = await lastValueFrom(
+      ds.query({
+        targets: [{ queryType: 'serviceMap', serviceMapQuery: '{ foo="bar" }', refId: 'foo', filters: [] }],
+        range: getDefaultTimeRange(),
+        app: CoreApp.Explore,
+        requestId: '1',
+        interval: '60s',
+        intervalMs: 60000,
+        scopedVars: {},
+        startTime: Date.now(),
+        timezone: getTimeZone(),
+      })
+    );
+
+    expect(response.data).toHaveLength(2);
+    expect(response.state).toBe(LoadingState.Done);
+    expect(response.data[0].name).toBe('Nodes');
+    expect(response.data[1].name).toBe('Edges');
+    expect(promMock.query).toHaveBeenCalledTimes(3);
+    const nthQuery = (n: number) =>
+      (promMock.query as jest.MockedFn<jest.MockableFunction>).mock.calls[n][0] as DataQueryRequest<PromQuery>;
+    expect(nthQuery(0).targets[0].expr).toBe(
+      'sum by (client, server) (rate(traces_service_graph_request_server_seconds_sum{ foo="bar" }[$__range]))'
+    );
+    expect(nthQuery(0).targets[1].expr).toBe(
+      'sum by (client, server) (rate(traces_service_graph_request_total{ foo="bar" }[$__range]))'
+    );
+    expect(nthQuery(0).targets[2].expr).toBe(
+      'sum by (client, server) (rate(traces_service_graph_request_failed_total{ foo="bar" }[$__range]))'
+    );
+    expect(nthQuery(0).targets[3].expr).toBe(
+      'sum by (client, server) (rate(traces_service_graph_request_server_seconds_bucket{ foo="bar" }[$__range]))'
+    );
+  });
+
+  it('runs correct queries with multiple serviceMapQuery defined', async () => {
+    const ds = new TempoDatasource({
+      ...defaultSettings,
+      jsonData: {
+        serviceMap: {
+          datasourceUid: 'prom',
+        },
+      },
+    });
+    const promMock = prometheusMock();
+    setDataSourceSrv(dataSourceSrvWithPrometheus(promMock));
+    const response = await lastValueFrom(
+      ds.query({
+        targets: [
+          { queryType: 'serviceMap', serviceMapQuery: ['{ foo="bar" }', '{baz="bad"}'], refId: 'foo', filters: [] },
+        ],
+        requestId: '1',
+        interval: '60s',
+        intervalMs: 60000,
+        scopedVars: {},
+        startTime: Date.now(),
+        timezone: getTimeZone(),
+        range: getDefaultTimeRange(),
+        app: CoreApp.Explore,
+      })
+    );
+
+    expect(response.data).toHaveLength(2);
+    expect(response.state).toBe(LoadingState.Done);
+    expect(response.data[0].name).toBe('Nodes');
+    expect(response.data[1].name).toBe('Edges');
+    expect(promMock.query).toHaveBeenCalledTimes(3);
+    const nthQuery = (n: number) =>
+      (promMock.query as jest.MockedFn<jest.MockableFunction>).mock.calls[n][0] as DataQueryRequest<PromQuery>;
+    expect(nthQuery(0).targets[0].expr).toBe(
+      'sum by (client, server) (rate(traces_service_graph_request_server_seconds_sum{ foo="bar" }[$__range])) OR sum by (client, server) (rate(traces_service_graph_request_server_seconds_sum{baz="bad"}[$__range]))'
+    );
+    expect(nthQuery(0).targets[1].expr).toBe(
+      'sum by (client, server) (rate(traces_service_graph_request_total{ foo="bar" }[$__range])) OR sum by (client, server) (rate(traces_service_graph_request_total{baz="bad"}[$__range]))'
+    );
+    expect(nthQuery(0).targets[2].expr).toBe(
+      'sum by (client, server) (rate(traces_service_graph_request_failed_total{ foo="bar" }[$__range])) OR sum by (client, server) (rate(traces_service_graph_request_failed_total{baz="bad"}[$__range]))'
+    );
+    expect(nthQuery(0).targets[3].expr).toBe(
+      'sum by (client, server) (rate(traces_service_graph_request_server_seconds_bucket{ foo="bar" }[$__range])) OR sum by (client, server) (rate(traces_service_graph_request_server_seconds_bucket{baz="bad"}[$__range]))'
+    );
+  });
+
   it('should build expr correctly', () => {
-    let targets = { targets: [{ queryType: 'serviceMap' }] } as any;
+    let targets = { targets: [{ queryType: 'serviceMap' }] } as DataQueryRequest<TempoQuery>;
     let builtQuery = buildExpr(
-      { expr: 'topk(5, sum(rate(traces_spanmetrics_calls_total{}[$__range])) by (span_name))', params: [] },
+      { expr: 'sum(rate(traces_spanmetrics_calls_total{}[$__range])) by (span_name)', params: [], topk: 5 },
       '',
       targets
     );
@@ -563,8 +628,9 @@ describe('Tempo service graph view', () => {
 
     builtQuery = buildExpr(
       {
-        expr: 'topk(5, sum(rate(traces_spanmetrics_calls_total{}[$__range])) by (span_name))',
+        expr: 'sum(rate(traces_spanmetrics_calls_total{}[$__range])) by (span_name)',
         params: ['status_code="STATUS_CODE_ERROR"'],
+        topk: 5,
       },
       'span_name=~"HTTP Client|HTTP GET|HTTP GET - root|HTTP POST|HTTP POST - post"',
       targets
@@ -585,9 +651,11 @@ describe('Tempo service graph view', () => {
       'histogram_quantile(.9, sum(rate(traces_spanmetrics_latency_bucket{status_code="STATUS_CODE_ERROR",span_name=~"HTTP Client"}[$__range])) by (le))'
     );
 
-    targets = { targets: [{ queryType: 'serviceMap', serviceMapQuery: '{client="app",service="app"}' }] } as any;
+    targets = {
+      targets: [{ queryType: 'serviceMap', serviceMapQuery: '{client="app",service="app"}' }],
+    } as DataQueryRequest<TempoQuery>;
     builtQuery = buildExpr(
-      { expr: 'topk(5, sum(rate(traces_spanmetrics_calls_total{}[$__range])) by (span_name))', params: [] },
+      { expr: 'sum(rate(traces_spanmetrics_calls_total{}[$__range])) by (span_name)', params: [], topk: 5 },
       '',
       targets
     );
@@ -595,12 +663,38 @@ describe('Tempo service graph view', () => {
       'topk(5, sum(rate(traces_spanmetrics_calls_total{service="app",service="app"}[$__range])) by (span_name))'
     );
 
-    targets = { targets: [{ queryType: 'serviceMap', serviceMapQuery: '{client="${app}",service="$app"}' }] } as any;
+    targets = {
+      targets: [{ queryType: 'serviceMap', serviceMapQuery: '{client="app",service="app"}' }],
+    } as DataQueryRequest<TempoQuery>;
     builtQuery = buildExpr(
       { expr: 'topk(5, sum(rate(traces_spanmetrics_calls_total{}[$__range])) by (span_name))', params: [] },
       '',
       targets
     );
+    expect(builtQuery).toBe(
+      'topk(5, sum(rate(traces_spanmetrics_calls_total{service="app",service="app"}[$__range])) by (span_name))'
+    );
+
+    targets = {
+      targets: [{ queryType: 'serviceMap', serviceMapQuery: ['{foo="app"}', '{bar="app"}'] }],
+    } as DataQueryRequest<TempoQuery>;
+    builtQuery = buildExpr(
+      { expr: 'sum(rate(traces_spanmetrics_calls_total{}[$__range])) by (span_name)', params: [], topk: 5 },
+      '',
+      targets
+    );
+    expect(builtQuery).toBe(
+      'topk(5, sum(rate(traces_spanmetrics_calls_total{foo="app"}[$__range])) by (span_name) OR sum(rate(traces_spanmetrics_calls_total{bar="app"}[$__range])) by (span_name))'
+    );
+
+    targets = {
+      targets: [{ queryType: 'serviceMap', serviceMapQuery: '{client="${app}",service="$app"}' }],
+    } as DataQueryRequest<TempoQuery>;
+    builtQuery = buildExpr(
+      { expr: 'sum(rate(traces_spanmetrics_calls_total{}[$__range])) by (span_name)', params: [], topk: 5 },
+      '',
+      targets
+    );
     expect(builtQuery).toBe(
       'topk(5, sum(rate(traces_spanmetrics_calls_total{service="${app}",service="$app"}[$__range])) by (span_name))'
     );
@@ -777,12 +871,20 @@ describe('Tempo service graph view', () => {
               queryType: 'traceqlSearch',
               refId: 'A',
               filters: [
+                {
+                  id: 'service-namespace',
+                  operator: '=',
+                  scope: 'resource',
+                  tag: 'service.namespace',
+                  value: '${__data.fields.targetNamespace}',
+                  valueType: 'string',
+                },
                 {
                   id: 'service-name',
                   operator: '=',
                   scope: 'resource',
                   tag: 'service.name',
-                  value: '${__data.fields.target}',
+                  value: '${__data.fields.targetName}',
                   valueType: 'string',
                 },
               ],
@@ -857,8 +959,8 @@ describe('Tempo service graph view', () => {
     ]);
   });
 
-  it('should make tempo link correctly', () => {
-    const tempoLink = makeTempoLink('Tempo', '', '"${__data.fields[0]}"', 'gdev-tempo');
+  it('should make tempo link correctly without namespace', () => {
+    const tempoLink = makeTempoLink('Tempo', undefined, '', '"${__data.fields[0]}"', 'gdev-tempo');
     expect(tempoLink).toEqual({
       url: '',
       title: 'Tempo',
@@ -882,6 +984,40 @@ describe('Tempo service graph view', () => {
       },
     });
   });
+
+  it('should make tempo link correctly with namespace', () => {
+    const tempoLink = makeTempoLink('Tempo', '"${__data.fields.subtitle}"', '', '"${__data.fields[0]}"', 'gdev-tempo');
+    expect(tempoLink).toEqual({
+      url: '',
+      title: 'Tempo',
+      internal: {
+        query: {
+          queryType: 'traceqlSearch',
+          refId: 'A',
+          filters: [
+            {
+              id: 'service-namespace',
+              operator: '=',
+              scope: 'resource',
+              tag: 'service.namespace',
+              value: '"${__data.fields.subtitle}"',
+              valueType: 'string',
+            },
+            {
+              id: 'span-name',
+              operator: '=',
+              scope: 'span',
+              tag: 'name',
+              value: '"${__data.fields[0]}"',
+              valueType: 'string',
+            },
+          ],
+        },
+        datasourceUid: 'gdev-tempo',
+        datasourceName: 'Tempo',
+      },
+    });
+  });
 });
 
 describe('label names - v2 tags', () => {
@@ -983,37 +1119,95 @@ describe('label values', () => {
   });
 });
 
-const backendSrvWithPrometheus = {
-  async get(uid: string) {
-    if (uid === 'prom') {
-      return {
-        query() {
-          return of({
-            data: [
-              rateMetric,
-              errorRateMetric,
-              durationMetric,
-              emptyDurationMetric,
-              totalsPromMetric,
-              secondsPromMetric,
-              failedPromMetric,
-            ],
-          });
+describe('should provide functionality for ad-hoc filters', () => {
+  let datasource: TempoDatasource;
+
+  beforeEach(() => {
+    datasource = createTempoDatasource();
+    jest.spyOn(datasource, 'metadataRequest').mockImplementation(
+      createMetadataRequest({
+        data: {
+          scopes: [{ name: 'span', tags: ['label1', 'label2'] }],
+          tagValues: [
+            {
+              type: 'value1',
+              value: 'value1',
+              label: 'value1',
+            },
+            {
+              type: 'value2',
+              value: 'value2',
+              label: 'value2',
+            },
+          ],
         },
-      };
-    }
-    throw new Error('unexpected uid');
-  },
-  getDataSourceSettingsByUid(uid: string) {
-    if (uid === 'prom') {
-      return { name: 'Prometheus' };
-    } else if (uid === 'gdev-tempo') {
-      return { name: 'Tempo' };
-    }
-    return '';
-  },
+      })
+    );
+  });
+
+  it('for getTagKeys', async () => {
+    const response = await datasource.getTagKeys();
+    expect(response).toEqual([{ text: 'span.label1' }, { text: 'span.label2' }]);
+  });
+
+  it('for getTagValues', async () => {
+    const now = dateTime('2021-04-20T15:55:00Z');
+    const options = {
+      key: 'span.label1',
+      filters: [],
+      timeRange: {
+        from: now,
+        to: now,
+        raw: {
+          from: 'now-15m',
+          to: 'now',
+        },
+      },
+    };
+    const response = await datasource.getTagValues(options);
+    expect(response).toEqual([
+      { text: { type: 'value1', value: 'value1', label: 'value1' } },
+      { text: { type: 'value2', value: 'value2', label: 'value2' } },
+    ]);
+  });
+});
+
+const prometheusMock = (): DataSourceApi => {
+  return {
+    query: jest.fn(() =>
+      of({
+        data: [
+          rateMetric,
+          errorRateMetric,
+          durationMetric,
+          emptyDurationMetric,
+          totalsPromMetric,
+          secondsPromMetric,
+          failedPromMetric,
+        ],
+      })
+    ),
+  } as unknown as DataSourceApi;
 };
 
+const dataSourceSrvWithPrometheus = (promMock: DataSourceApi) =>
+  ({
+    async get(uid: string) {
+      if (uid === 'prom') {
+        return promMock;
+      }
+      throw new Error('unexpected uid');
+    },
+    getInstanceSettings(uid: string) {
+      if (uid === 'prom') {
+        return { name: 'Prometheus' };
+      } else if (uid === 'gdev-tempo') {
+        return { name: 'Tempo' };
+      }
+      return '';
+    },
+  }) as unknown as DataSourceSrv;
+
 function setupBackendSrv(frame: DataFrame) {
   setBackendSrv({
     fetch(): Observable<FetchResponse<BackendDataSourceResponse>> {
@@ -1027,7 +1221,7 @@ function setupBackendSrv(frame: DataFrame) {
         })
       );
     },
-  } as any);
+  } as unknown as BackendSrv);
 }
 
 export const defaultSettings: DataSourceInstanceSettings<TempoJsonData> = {
@@ -1040,7 +1234,7 @@ export const defaultSettings: DataSourceInstanceSettings<TempoJsonData> = {
     id: 'tempo',
     name: 'tempo',
     type: PluginType.datasource,
-    info: {} as any,
+    info: {} as PluginMetaInfo,
     module: '',
     baseUrl: '',
   },
@@ -1223,7 +1417,7 @@ const serviceGraphLinks = [
             operator: '=',
             scope: 'resource',
             tag: 'service.name',
-            value: '${__data.fields[0]}',
+            value: '${__data.fields.id}',
             valueType: 'string',
           },
         ],
@@ -1233,3 +1427,7 @@ const serviceGraphLinks = [
     },
   },
 ];
+
+interface PromQuery extends DataQuery {
+  expr: string;
+}
diff --git a/public/app/plugins/datasource/tempo/datasource.ts b/public/app/plugins/datasource/tempo/datasource.ts
index f539a54c3ddb0..1825d7ede6d70 100644
--- a/public/app/plugins/datasource/tempo/datasource.ts
+++ b/public/app/plugins/datasource/tempo/datasource.ts
@@ -1,5 +1,5 @@
-import { groupBy, identity, pick, pickBy, startCase } from 'lodash';
-import { EMPTY, from, lastValueFrom, merge, Observable, of, throwError } from 'rxjs';
+import { groupBy, startCase } from 'lodash';
+import { EMPTY, from, lastValueFrom, merge, Observable, of } from 'rxjs';
 import { catchError, concatMap, map, mergeMap, toArray } from 'rxjs/operators';
 import semver from 'semver';
 
@@ -10,37 +10,33 @@ import {
   DataQueryRequest,
   DataQueryResponse,
   DataQueryResponseData,
-  DataSourceApi,
+  DataSourceGetTagValuesOptions,
   DataSourceInstanceSettings,
   dateTime,
   FieldType,
-  isValidGoDuration,
   LoadingState,
   rangeUtil,
   ScopedVars,
+  SelectableValue,
+  TestDataSourceResponse,
+  urlUtil,
 } from '@grafana/data';
+import { NodeGraphOptions, SpanBarOptions, TraceToLogsOptions } from '@grafana/o11y-ds-frontend';
 import {
   BackendSrvRequest,
   config,
   DataSourceWithBackend,
   getBackendSrv,
+  getDataSourceSrv,
   getTemplateSrv,
   reportInteraction,
   TemplateSrv,
 } from '@grafana/runtime';
 import { BarGaugeDisplayMode, TableCellDisplayMode, VariableFormatID } from '@grafana/schema';
-import { NodeGraphOptions } from 'app/core/components/NodeGraphSettings';
-import { TraceToLogsOptions } from 'app/core/components/TraceToLogs/TraceToLogsSettings';
-import { serializeParams } from 'app/core/utils/fetch';
-import { SpanBarOptions } from 'app/features/explore/TraceView/components';
-import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
-
-import { LokiOptions } from '../loki/types';
-import { PrometheusDatasource } from '../prometheus/datasource';
-import { PromQuery } from '../prometheus/types';
 
 import { generateQueryFromFilters } from './SearchTraceQLEditor/utils';
 import { TempoVariableQuery, TempoVariableQueryType } from './VariableQueryEditor';
+import { PrometheusDatasource, PromQuery } from './_importedDependencies/datasources/prometheus/types';
 import { TraceqlFilter, TraceqlSearchScope } from './dataquery.gen';
 import {
   defaultTableFilter,
@@ -56,15 +52,14 @@ import {
 import TempoLanguageProvider from './language_provider';
 import { createTableFrameFromMetricsSummaryQuery, emptyResponse, MetricsSummary } from './metricsSummary';
 import {
-  createTableFrameFromSearch,
+  formatTraceQLMetrics,
+  formatTraceQLResponse,
   transformFromOTLP as transformFromOTEL,
   transformTrace,
-  transformTraceList,
-  formatTraceQLResponse,
 } from './resultTransformer';
 import { doTempoChannelStream } from './streaming';
-import { SearchQueryParams, TempoJsonData, TempoQuery } from './types';
-import { getErrorMessage } from './utils';
+import { TempoJsonData, TempoQuery } from './types';
+import { getErrorMessage, migrateFromSearchToTraceQLSearch } from './utils';
 import { TempoVariableSupport } from './variables';
 
 export const DEFAULT_LIMIT = 20;
@@ -107,15 +102,12 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
     filters?: TraceqlFilter[];
   };
   nodeGraph?: NodeGraphOptions;
-  lokiSearch?: {
-    datasourceUid?: string;
-  };
   traceQuery?: {
     timeShiftEnabled?: boolean;
     spanStartTimeShift?: string;
     spanEndTimeShift?: string;
   };
-  uploadedJson?: string | ArrayBuffer | null = null;
+  uploadedJson?: string | null = null;
   spanBar?: SpanBarOptions;
   languageProvider: TempoLanguageProvider;
 
@@ -127,11 +119,11 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
     private readonly templateSrv: TemplateSrv = getTemplateSrv()
   ) {
     super(instanceSettings);
+
     this.tracesToLogs = instanceSettings.jsonData.tracesToLogs;
     this.serviceMap = instanceSettings.jsonData.serviceMap;
     this.search = instanceSettings.jsonData.search;
     this.nodeGraph = instanceSettings.jsonData.nodeGraph;
-    this.lokiSearch = instanceSettings.jsonData.lokiSearch;
     this.traceQuery = instanceSettings.jsonData.traceQuery;
     this.languageProvider = new TempoLanguageProvider(this);
 
@@ -167,7 +159,7 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
         return this.labelValuesQuery(query.label);
       }
       default: {
-        throw Error('Invalid query type', query.type);
+        throw Error('Invalid query type: ' + query.type);
       }
     }
   }
@@ -206,9 +198,26 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
       options = await this.languageProvider.getOptionsV1(labelName);
     }
 
-    return options.filter((option) => option.value !== undefined).map((option) => ({ text: option.value })) as Array<{
-      text: string;
-    }>;
+    return options.flatMap((option: SelectableValue<string>) =>
+      option.value !== undefined ? [{ text: option.value }] : []
+    );
+  }
+
+  // Allows to retrieve the list of tags for ad-hoc filters
+  async getTagKeys(): Promise<Array<{ text: string }>> {
+    await this.languageProvider.fetchTags();
+    const tags = this.languageProvider.tagsV2 || [];
+    return tags
+      .map(({ name, tags }) =>
+        tags.filter((tag) => tag !== undefined).map((t) => (name !== 'intrinsic' ? `${name}.${t}` : `${t}`))
+      )
+      .flat()
+      .map((tag) => ({ text: tag }));
+  }
+
+  // Allows to retrieve the list of tag values for ad-hoc filters
+  getTagValues(options: DataSourceGetTagValuesOptions): Promise<Array<{ text: string }>> {
+    return this.labelValuesQuery(options.key.replace(/^(resource|span)\./, ''));
   }
 
   init = async () => {
@@ -233,7 +242,7 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
    * @param featureName - the name of the feature to consider
    * @return true if the feature is available, false otherwise
    */
-  private isFeatureAvailable(featureName: FeatureName) {
+  isFeatureAvailable(featureName: FeatureName) {
     // We know for old Tempo instances we don't know their version, so resort to default
     const actualVersion = this.tempoVersion ?? defaultTempoVersion;
 
@@ -254,81 +263,22 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
       return of({ data: [], state: LoadingState.Done });
     }
 
-    const logsDatasourceUid = this.getLokiSearchDS();
-
-    // Run search queries on linked datasource
-    if (logsDatasourceUid && targets.search?.length > 0) {
-      reportInteraction('grafana_traces_loki_search_queried', {
-        datasourceType: 'tempo',
-        app: options.app ?? '',
-        grafana_version: config.buildInfo.version,
-        hasLinkedQueryExpr:
-          targets.search[0].linkedQuery?.expr && targets.search[0].linkedQuery?.expr !== '' ? true : false,
-      });
-
-      const dsSrv = getDatasourceSrv();
-      subQueries.push(
-        from(dsSrv.get(logsDatasourceUid)).pipe(
-          mergeMap((linkedDatasource: DataSourceApi) => {
-            // Wrap linked query into a data request based on original request
-            const linkedRequest: DataQueryRequest = { ...options, targets: targets.search.map((t) => t.linkedQuery!) };
-            // Find trace matchers in derived fields of the linked datasource that's identical to this datasource
-            const settings: DataSourceInstanceSettings<LokiOptions> = (linkedDatasource as any).instanceSettings;
-            const traceLinkMatcher: string[] =
-              settings.jsonData.derivedFields
-                ?.filter((field) => field.datasourceUid === this.uid && field.matcherRegex)
-                .map((field) => field.matcherRegex) || [];
-
-            if (!traceLinkMatcher || traceLinkMatcher.length === 0) {
-              return throwError(
-                () =>
-                  new Error(
-                    'No Loki datasource configured for search. Set up Derived Fields for traces in a Loki datasource settings and link it to this Tempo datasource.'
-                  )
-              );
-            } else {
-              return (linkedDatasource.query(linkedRequest) as Observable<DataQueryResponse>).pipe(
-                map((response) =>
-                  response.error ? response : transformTraceList(response, this.uid, this.name, traceLinkMatcher)
-                )
-              );
-            }
-          })
-        )
-      );
-    }
-
+    // Migrate user to new query type if they are using the old search query type
     if (targets.nativeSearch?.length) {
-      try {
-        reportInteraction('grafana_traces_search_queried', {
-          datasourceType: 'tempo',
-          app: options.app ?? '',
-          grafana_version: config.buildInfo.version,
-          hasServiceName: targets.nativeSearch[0].serviceName ? true : false,
-          hasSpanName: targets.nativeSearch[0].spanName ? true : false,
-          resultLimit: targets.nativeSearch[0].limit ?? '',
-          hasSearch: targets.nativeSearch[0].search ? true : false,
-          minDuration: targets.nativeSearch[0].minDuration ?? '',
-          maxDuration: targets.nativeSearch[0].maxDuration ?? '',
-        });
-
-        const timeRange = { startTime: options.range.from.unix(), endTime: options.range.to.unix() };
-        const query = this.applyVariables(targets.nativeSearch[0], options.scopedVars);
-        const searchQuery = this.buildSearchQuery(query, timeRange);
-        subQueries.push(
-          this._request('/api/search', searchQuery).pipe(
-            map((response) => {
-              return {
-                data: [createTableFrameFromSearch(response.data.traces, this.instanceSettings)],
-              };
-            }),
-            catchError((err) => {
-              return of({ error: { message: getErrorMessage(err.data.message) }, data: [] });
-            })
-          )
-        );
-      } catch (error) {
-        return of({ error: { message: error instanceof Error ? error.message : 'Unknown error occurred' }, data: [] });
+      if (
+        targets.nativeSearch[0].spanName ||
+        targets.nativeSearch[0].serviceName ||
+        targets.nativeSearch[0].search ||
+        targets.nativeSearch[0].maxDuration ||
+        targets.nativeSearch[0].minDuration ||
+        targets.nativeSearch[0].queryType === 'nativeSearch'
+      ) {
+        const migratedQuery = migrateFromSearchToTraceQLSearch(targets.nativeSearch[0]);
+        if (targets.traceqlSearch?.length) {
+          targets.traceqlSearch.push(migratedQuery);
+        } else {
+          targets.traceqlSearch = [migratedQuery];
+        }
       }
     }
 
@@ -336,9 +286,8 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
       try {
         const appliedQuery = this.applyVariables(targets.traceql[0], options.scopedVars);
         const queryValue = appliedQuery?.query || '';
-        const hexOnlyRegex = /^[0-9A-Fa-f]*$/;
         // Check whether this is a trace ID or traceQL query by checking if it only contains hex characters
-        if (queryValue.trim().match(hexOnlyRegex)) {
+        if (this.isTraceIdQuery(queryValue)) {
           // There's only hex characters so let's assume that this is a trace ID
           reportInteraction('grafana_traces_traceID_queried', {
             datasourceType: 'tempo',
@@ -349,39 +298,23 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
 
           subQueries.push(this.handleTraceIdQuery(options, targets.traceql));
         } else {
-          reportInteraction('grafana_traces_traceql_queried', {
-            datasourceType: 'tempo',
-            app: options.app ?? '',
-            grafana_version: config.buildInfo.version,
-            query: queryValue ?? '',
-            streaming: config.featureToggles.traceQLStreaming,
-          });
-
-          if (config.featureToggles.traceQLStreaming && this.isFeatureAvailable(FeatureName.streaming)) {
-            subQueries.push(this.handleStreamingSearch(options, targets.traceql, queryValue));
+          if (this.isTraceQlMetricsQuery(queryValue)) {
+            reportInteraction('grafana_traces_traceql_metrics_queried', {
+              datasourceType: 'tempo',
+              app: options.app ?? '',
+              grafana_version: config.buildInfo.version,
+              query: queryValue ?? '',
+            });
+            subQueries.push(this.handleTraceQlMetricsQuery(options, queryValue));
           } else {
-            subQueries.push(
-              this._request('/api/search', {
-                q: queryValue,
-                limit: options.targets[0].limit ?? DEFAULT_LIMIT,
-                spss: options.targets[0].spss ?? DEFAULT_SPSS,
-                start: options.range.from.unix(),
-                end: options.range.to.unix(),
-              }).pipe(
-                map((response) => {
-                  return {
-                    data: formatTraceQLResponse(
-                      response.data.traces,
-                      this.instanceSettings,
-                      targets.traceql[0].tableType
-                    ),
-                  };
-                }),
-                catchError((err) => {
-                  return of({ error: { message: getErrorMessage(err.data.message) }, data: [] });
-                })
-              )
-            );
+            reportInteraction('grafana_traces_traceql_queried', {
+              datasourceType: 'tempo',
+              app: options.app ?? '',
+              grafana_version: config.buildInfo.version,
+              query: queryValue ?? '',
+              streaming: config.featureToggles.traceQLStreaming,
+            });
+            subQueries.push(this.handleTraceQlQuery(options, targets, queryValue));
           }
         }
       } catch (error) {
@@ -392,9 +325,12 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
     if (targets.traceqlSearch?.length) {
       try {
         if (config.featureToggles.metricsSummary) {
-          const groupBy = targets.traceqlSearch.find((t) => this.hasGroupBy(t));
-          if (groupBy) {
-            subQueries.push(this.handleMetricsSummary(groupBy, generateQueryFromFilters(groupBy.filters), options));
+          const target = targets.traceqlSearch.find((t) => this.hasGroupBy(t));
+          if (target) {
+            const appliedQuery = this.applyVariables(target, options.scopedVars);
+            subQueries.push(
+              this.handleMetricsSummary(appliedQuery, generateQueryFromFilters(appliedQuery.filters), options)
+            );
           }
         }
 
@@ -402,25 +338,27 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
           ? targets.traceqlSearch.filter((t) => !this.hasGroupBy(t))
           : targets.traceqlSearch;
         if (traceqlSearchTargets.length > 0) {
-          const queryValueFromFilters = generateQueryFromFilters(traceqlSearchTargets[0].filters);
-
-          // We want to support template variables also in Search for consistency with other data sources
-          const queryValue = this.templateSrv.replace(queryValueFromFilters, options.scopedVars);
+          const appliedQuery = this.applyVariables(traceqlSearchTargets[0], options.scopedVars);
+          const queryValueFromFilters = generateQueryFromFilters(appliedQuery.filters);
 
           reportInteraction('grafana_traces_traceql_search_queried', {
             datasourceType: 'tempo',
             app: options.app ?? '',
             grafana_version: config.buildInfo.version,
-            query: queryValue ?? '',
+            query: queryValueFromFilters ?? '',
             streaming: config.featureToggles.traceQLStreaming,
           });
 
-          if (config.featureToggles.traceQLStreaming && this.isFeatureAvailable(FeatureName.streaming)) {
-            subQueries.push(this.handleStreamingSearch(options, traceqlSearchTargets, queryValue));
+          if (
+            config.featureToggles.traceQLStreaming &&
+            this.isFeatureAvailable(FeatureName.streaming) &&
+            config.liveEnabled
+          ) {
+            subQueries.push(this.handleStreamingSearch(options, traceqlSearchTargets, queryValueFromFilters));
           } else {
             subQueries.push(
               this._request('/api/search', {
-                q: queryValue,
+                q: queryValueFromFilters,
                 limit: options.targets[0].limit ?? DEFAULT_LIMIT,
                 spss: options.targets[0].spss ?? DEFAULT_SPSS,
                 start: options.range.from.unix(),
@@ -455,7 +393,7 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
           grafana_version: config.buildInfo.version,
         });
 
-        const jsonData = JSON.parse(this.uploadedJson as string);
+        const jsonData = JSON.parse(this.uploadedJson);
         const isTraceData = jsonData.batches;
         const isServiceGraphData =
           Array.isArray(jsonData) && jsonData.some((df) => df?.meta?.preferredVisualisationType === 'nodeGraph');
@@ -496,7 +434,20 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
     return merge(...subQueries);
   }
 
-  applyTemplateVariables(query: TempoQuery, scopedVars: ScopedVars): Record<string, any> {
+  isTraceQlMetricsQuery(query: string): boolean {
+    // Check whether this is a metrics query by checking if it contains a metrics function
+    const metricsFnRegex =
+      /\|\s*(rate|count_over_time|avg_over_time|max_over_time|min_over_time|quantile_over_time)\s*\(/;
+    return !!query.trim().match(metricsFnRegex);
+  }
+
+  isTraceIdQuery(query: string): boolean {
+    const hexOnlyRegex = /^[0-9A-Fa-f]*$/;
+    // Check whether this is a trace ID or traceQL query by checking if it only contains hex characters
+    return !!query.trim().match(hexOnlyRegex);
+  }
+
+  applyTemplateVariables(query: TempoQuery, scopedVars: ScopedVars) {
     return this.applyVariables(query, scopedVars);
   }
 
@@ -517,21 +468,30 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
   applyVariables(query: TempoQuery, scopedVars: ScopedVars) {
     const expandedQuery = { ...query };
 
-    if (query.linkedQuery) {
-      expandedQuery.linkedQuery = {
-        ...query.linkedQuery,
-        expr: this.templateSrv.replace(query.linkedQuery?.expr ?? '', scopedVars),
-      };
+    if (query.filters) {
+      expandedQuery.filters = query.filters.map((filter) => {
+        const updatedFilter = {
+          ...filter,
+          tag: this.templateSrv.replace(filter.tag ?? '', scopedVars),
+        };
+
+        if (filter.value) {
+          updatedFilter.value =
+            typeof filter.value === 'string'
+              ? this.templateSrv.replace(filter.value ?? '', scopedVars, VariableFormatID.Pipe)
+              : filter.value.map((v) => this.templateSrv.replace(v ?? '', scopedVars, VariableFormatID.Pipe));
+        }
+
+        return updatedFilter;
+      });
     }
 
     return {
       ...expandedQuery,
       query: this.templateSrv.replace(query.query ?? '', scopedVars, VariableFormatID.Pipe),
-      serviceName: this.templateSrv.replace(query.serviceName ?? '', scopedVars),
-      spanName: this.templateSrv.replace(query.spanName ?? '', scopedVars),
-      search: this.templateSrv.replace(query.search ?? '', scopedVars),
-      minDuration: this.templateSrv.replace(query.minDuration ?? '', scopedVars),
-      maxDuration: this.templateSrv.replace(query.maxDuration ?? '', scopedVars),
+      serviceMapQuery: Array.isArray(query.serviceMapQuery)
+        ? query.serviceMapQuery.map((query) => this.templateSrv.replace(query, scopedVars))
+        : this.templateSrv.replace(query.serviceMapQuery ?? '', scopedVars),
     };
   }
 
@@ -631,11 +591,64 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
         if (response.error) {
           return response;
         }
-        return transformTrace(response, this.nodeGraph?.enabled);
+        return transformTrace(response, this.instanceSettings, this.nodeGraph?.enabled);
       })
     );
   }
 
+  handleTraceQlQuery = (
+    options: DataQueryRequest<TempoQuery>,
+    targets: {
+      [type: string]: TempoQuery[];
+    },
+    queryValue: string
+  ): Observable<DataQueryResponse> => {
+    if (
+      config.featureToggles.traceQLStreaming &&
+      this.isFeatureAvailable(FeatureName.streaming) &&
+      config.liveEnabled
+    ) {
+      return this.handleStreamingSearch(options, targets.traceql, queryValue);
+    } else {
+      return this._request('/api/search', {
+        q: queryValue,
+        limit: options.targets[0].limit ?? DEFAULT_LIMIT,
+        spss: options.targets[0].spss ?? DEFAULT_SPSS,
+        start: options.range.from.unix(),
+        end: options.range.to.unix(),
+      }).pipe(
+        map((response) => {
+          return {
+            data: formatTraceQLResponse(response.data.traces, this.instanceSettings, targets.traceql[0].tableType),
+          };
+        }),
+        catchError((err) => {
+          return of({ error: { message: getErrorMessage(err.data.message) }, data: [] });
+        })
+      );
+    }
+  };
+
+  handleTraceQlMetricsQuery = (
+    options: DataQueryRequest<TempoQuery>,
+    queryValue: string
+  ): Observable<DataQueryResponse> => {
+    return this._request('/api/metrics/query_range', {
+      query: queryValue,
+      start: options.range.from.unix(),
+      end: options.range.to.unix(),
+    }).pipe(
+      map((response) => {
+        return {
+          data: formatTraceQLMetrics(queryValue, response.data),
+        };
+      }),
+      catchError((err) => {
+        return of({ error: { message: getErrorMessage(err.data.message) }, data: [] });
+      })
+    );
+  };
+
   traceIdQueryRequest(options: DataQueryRequest<TempoQuery>, targets: TempoQuery[]): DataQueryRequest<TempoQuery> {
     const request = {
       ...options,
@@ -685,15 +698,15 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
     return await lastValueFrom(this._request(url, params, { method: 'GET', hideFromInspector: true }));
   }
 
-  private _request(apiUrl: string, data?: any, options?: Partial<BackendSrvRequest>): Observable<Record<string, any>> {
-    const params = data ? serializeParams(data) : '';
+  _request(apiUrl: string, data?: unknown, options?: Partial<BackendSrvRequest>): Observable<Record<string, any>> {
+    const params = data ? urlUtil.serializeParams(data) : '';
     const url = `${this.instanceSettings.url}${apiUrl}${params.length ? `?${params}` : ''}`;
     const req = { ...options, url };
 
     return getBackendSrv().fetch(req);
   }
 
-  async testDatasource(): Promise<any> {
+  async testDatasource(): Promise<TestDataSourceResponse> {
     const options: BackendSrvRequest = {
       headers: {},
       method: 'GET',
@@ -715,79 +728,22 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
   }
 
   getQueryDisplayText(query: TempoQuery) {
-    if (query.queryType === 'nativeSearch') {
-      let result = [];
-      for (const key of ['serviceName', 'spanName', 'search', 'minDuration', 'maxDuration', 'limit']) {
-        if (query.hasOwnProperty(key) && query[key as keyof TempoQuery]) {
-          result.push(`${startCase(key)}: ${query[key as keyof TempoQuery]}`);
-        }
-      }
-      return result.join(', ');
-    }
-    return query.query ?? '';
-  }
-
-  buildSearchQuery(query: TempoQuery, timeRange?: { startTime: number; endTime?: number }): SearchQueryParams {
-    let tags = query.search ?? '';
-
-    let tempoQuery = pick(query, ['minDuration', 'maxDuration', 'limit']);
-    // Remove empty properties
-    tempoQuery = pickBy(tempoQuery, identity);
-
-    if (query.serviceName) {
-      tags += ` service.name="${query.serviceName}"`;
-    }
-    if (query.spanName) {
-      tags += ` name="${query.spanName}"`;
+    if (query.queryType !== 'nativeSearch') {
+      return query.query ?? '';
     }
 
-    // Set default limit
-    if (!tempoQuery.limit) {
-      tempoQuery.limit = DEFAULT_LIMIT;
-    }
-
-    // Validate query inputs and remove spaces if valid
-    if (tempoQuery.minDuration) {
-      tempoQuery.minDuration = this.templateSrv.replace(tempoQuery.minDuration ?? '');
-      if (!isValidGoDuration(tempoQuery.minDuration)) {
-        throw new Error('Please enter a valid min duration.');
-      }
-      tempoQuery.minDuration = tempoQuery.minDuration.replace(/\s/g, '');
-    }
-    if (tempoQuery.maxDuration) {
-      tempoQuery.maxDuration = this.templateSrv.replace(tempoQuery.maxDuration ?? '');
-      if (!isValidGoDuration(tempoQuery.maxDuration)) {
-        throw new Error('Please enter a valid max duration.');
-      }
-      tempoQuery.maxDuration = tempoQuery.maxDuration.replace(/\s/g, '');
-    }
-
-    if (!Number.isInteger(tempoQuery.limit) || tempoQuery.limit <= 0) {
-      throw new Error('Please enter a valid limit.');
-    }
-
-    let searchQuery: SearchQueryParams = { tags, ...tempoQuery };
-
-    if (timeRange) {
-      searchQuery.start = timeRange.startTime;
-      searchQuery.end = timeRange.endTime;
-    }
-
-    return searchQuery;
+    const keys: Array<
+      keyof Pick<TempoQuery, 'serviceName' | 'spanName' | 'search' | 'minDuration' | 'maxDuration' | 'limit'>
+    > = ['serviceName', 'spanName', 'search', 'minDuration', 'maxDuration', 'limit'];
+    return keys
+      .filter((key) => query[key])
+      .map((key) => `${startCase(key)}: ${query[key]}`)
+      .join(', ');
   }
-
-  // Get linked loki search datasource. Fall back to legacy loki search/trace to logs config
-  getLokiSearchDS = (): string | undefined => {
-    const legacyLogsDatasourceUid =
-      this.tracesToLogs?.lokiSearch !== false && this.lokiSearch === undefined
-        ? this.tracesToLogs?.datasourceUid
-        : undefined;
-    return this.lokiSearch?.datasourceUid ?? legacyLogsDatasourceUid;
-  };
 }
 
 function queryPrometheus(request: DataQueryRequest<PromQuery>, datasourceUid: string) {
-  return from(getDatasourceSrv().get(datasourceUid)).pipe(
+  return from(getDataSourceSrv().get(datasourceUid)).pipe(
     mergeMap((ds) => {
       return (ds as PrometheusDatasource).query(request);
     })
@@ -981,9 +937,9 @@ function makePromLink(title: string, expr: string, datasourceUid: string, instan
         range: !instant,
         exemplar: !instant,
         instant: instant,
-      } as PromQuery,
+      },
       datasourceUid,
-      datasourceName: getDatasourceSrv().getDataSourceSettingsByUid(datasourceUid)?.name ?? '',
+      datasourceName: getDataSourceSrv().getInstanceSettings(datasourceUid)?.name ?? '',
     },
   };
 }
@@ -1036,13 +992,35 @@ export function getFieldConfig(
         datasourceUid,
         false
       ),
-      makeTempoLink('View traces', `\${${tempoField}}`, '', tempoDatasourceUid),
+      makeTempoLink(
+        'View traces',
+        namespaceFields !== undefined ? `\${${namespaceFields.targetNamespace}}` : '',
+        `\${${targetField}}`,
+        '',
+        tempoDatasourceUid
+      ),
     ],
   };
 }
 
-export function makeTempoLink(title: string, serviceName: string, spanName: string, datasourceUid: string) {
+export function makeTempoLink(
+  title: string,
+  serviceNamespace: string | undefined,
+  serviceName: string,
+  spanName: string,
+  datasourceUid: string
+) {
   let query: TempoQuery = { refId: 'A', queryType: 'traceqlSearch', filters: [] };
+  if (serviceNamespace !== undefined && serviceNamespace !== '') {
+    query.filters.push({
+      id: 'service-namespace',
+      scope: TraceqlSearchScope.Resource,
+      tag: 'service.namespace',
+      value: serviceNamespace,
+      operator: '=',
+      valueType: 'string',
+    });
+  }
   if (serviceName !== '') {
     query.filters.push({
       id: 'service-name',
@@ -1070,7 +1048,7 @@ export function makeTempoLink(title: string, serviceName: string, spanName: stri
     internal: {
       query,
       datasourceUid,
-      datasourceName: getDatasourceSrv().getDataSourceSettingsByUid(datasourceUid)?.name ?? '',
+      datasourceName: getDataSourceSrv().getInstanceSettings(datasourceUid)?.name ?? '',
     },
   };
 }
@@ -1081,12 +1059,16 @@ function makePromServiceMapRequest(options: DataQueryRequest<TempoQuery>): DataQ
     targets: serviceMapMetrics.map((metric) => {
       const { serviceMapQuery, serviceMapIncludeNamespace: serviceMapIncludeNamespace } = options.targets[0];
       const extraSumByFields = serviceMapIncludeNamespace ? ', client_service_namespace, server_service_namespace' : '';
+      const queries = Array.isArray(serviceMapQuery) ? serviceMapQuery : [serviceMapQuery];
+      const subExprs = queries.map(
+        (query) => `sum by (client, server${extraSumByFields}) (rate(${metric}${query || ''}[$__range]))`
+      );
       return {
         format: 'table',
         refId: metric,
         // options.targets[0] is not correct here, but not sure what should happen if you have multiple queries for
         // service map at the same time anyway
-        expr: `sum by (client, server${extraSumByFields}) (rate(${metric}${serviceMapQuery || ''}[$__range]))`,
+        expr: subExprs.join(' OR '),
         instant: true,
       };
     }),
@@ -1242,7 +1224,7 @@ function getServiceGraphView(
         return 'Tempo';
       }),
       config: {
-        links: [makeTempoLink('Tempo', '', `\${__data.fields[0]}`, tempoDatasourceUid)],
+        links: [makeTempoLink('Tempo', undefined, '', `\${__data.fields[0]}`, tempoDatasourceUid)],
       },
     });
   }
@@ -1251,24 +1233,33 @@ function getServiceGraphView(
 }
 
 export function buildExpr(
-  metric: { expr: string; params: string[] },
+  metric: { expr: string; params: string[]; topk?: number },
   extraParams: string,
   request: DataQueryRequest<TempoQuery>
-) {
+): string {
   let serviceMapQuery = request.targets[0]?.serviceMapQuery ?? '';
-  const serviceMapQueryMatch = serviceMapQuery.match(/^{(.*)}$/);
-  if (serviceMapQueryMatch?.length) {
-    serviceMapQuery = serviceMapQueryMatch[1];
+  const serviceMapQueries = Array.isArray(serviceMapQuery) ? serviceMapQuery : [serviceMapQuery];
+  const metricParamsArray = serviceMapQueries.map((query) => {
+    // remove surrounding curly braces from serviceMapQuery
+    const serviceMapQueryMatch = query.match(/^{(.*)}$/);
+    if (serviceMapQueryMatch?.length) {
+      query = serviceMapQueryMatch[1];
+    }
+    // map serviceGraph metric tags to serviceGraphView metric tags
+    query = query.replace('client', 'service').replace('server', 'service');
+    return query.includes('span_name')
+      ? metric.params.concat(query)
+      : metric.params
+          .concat(query)
+          .concat(extraParams)
+          .filter((item: string) => item);
+  });
+  const exprs = metricParamsArray.map((params) => metric.expr.replace('{}', '{' + params.join(',') + '}'));
+  const expr = exprs.join(' OR ');
+  if (metric.topk) {
+    return `topk(${metric.topk}, ${expr})`;
   }
-  // map serviceGraph metric tags to serviceGraphView metric tags
-  serviceMapQuery = serviceMapQuery.replace('client', 'service').replace('server', 'service');
-  const metricParams = serviceMapQuery.includes('span_name')
-    ? metric.params.concat(serviceMapQuery)
-    : metric.params
-        .concat(serviceMapQuery)
-        .concat(extraParams)
-        .filter((item: string) => item);
-  return metric.expr.replace('{}', '{' + metricParams.join(',') + '}');
+  return expr;
 }
 
 export function buildLinkExpr(expr: string) {
@@ -1297,7 +1288,7 @@ export function getRateAlignedValues(
   return values;
 }
 
-export function makeServiceGraphViewRequest(metrics: any[]) {
+export function makeServiceGraphViewRequest(metrics: string[]): PromQuery[] {
   return metrics.map((metric) => {
     return {
       refId: metric,
diff --git a/public/app/plugins/datasource/tempo/graphTransform.test.ts b/public/app/plugins/datasource/tempo/graphTransform.test.ts
index e6acd91ddd11c..efebee60cd6d2 100644
--- a/public/app/plugins/datasource/tempo/graphTransform.test.ts
+++ b/public/app/plugins/datasource/tempo/graphTransform.test.ts
@@ -80,6 +80,27 @@ it('assigns correct field type even if values are numbers', async () => {
   ]);
 });
 
+it('do not fail on response with empty list', async () => {
+  const range = {
+    from: dateTime('2000-01-01T00:00:00'),
+    to: dateTime('2000-01-01T00:01:00'),
+  };
+  const { nodes } = mapPromMetricsToServiceMap([], {
+    ...range,
+    raw: range,
+  });
+
+  expect(nodes.fields).toMatchObject([
+    { name: 'id', values: [], type: FieldType.string },
+    { name: 'title', values: [], type: FieldType.string },
+    { name: 'subtitle', type: FieldType.string, values: [] },
+    { name: 'mainstat', values: [], type: FieldType.number },
+    { name: 'secondarystat', values: [], type: FieldType.number },
+    { name: 'arc__success', values: [], type: FieldType.number },
+    { name: 'arc__failed', values: [], type: FieldType.number },
+  ]);
+});
+
 describe('mapPromMetricsToServiceMap', () => {
   it('transforms prom metrics to service graph', async () => {
     const range = {
diff --git a/public/app/plugins/datasource/tempo/graphTransform.ts b/public/app/plugins/datasource/tempo/graphTransform.ts
index 4b7b4b56feddd..5c5b9cedfe064 100644
--- a/public/app/plugins/datasource/tempo/graphTransform.ts
+++ b/public/app/plugins/datasource/tempo/graphTransform.ts
@@ -10,8 +10,7 @@ import {
   FieldType,
   toDataFrame,
 } from '@grafana/data';
-
-import { getNonOverlappingDuration, getStats, makeFrames, makeSpanMap } from '../../../core/utils/tracing';
+import { getNonOverlappingDuration, getStats, makeFrames, makeSpanMap } from '@grafana/o11y-ds-frontend';
 
 /**
  * Row in a trace dataFrame
@@ -139,11 +138,13 @@ export const failedMetric = 'traces_service_graph_request_failed_total';
 export const histogramMetric = 'traces_service_graph_request_server_seconds_bucket';
 
 export const rateMetric = {
-  expr: 'topk(5, sum(rate(traces_spanmetrics_calls_total{}[$__range])) by (span_name))',
+  expr: 'sum(rate(traces_spanmetrics_calls_total{}[$__range])) by (span_name)',
+  topk: 5,
   params: [],
 };
 export const errorRateMetric = {
-  expr: 'topk(5, sum(rate(traces_spanmetrics_calls_total{}[$__range])) by (span_name))',
+  expr: 'sum(rate(traces_spanmetrics_calls_total{}[$__range])) by (span_name)',
+  topk: 5,
   params: ['status_code="STATUS_CODE_ERROR"'],
 };
 export const durationMetric = {
@@ -249,7 +250,7 @@ function createServiceMapDataFrames() {
  * @param responses
  */
 function getMetricFrames(responses: DataQueryResponse[]): Record<string, DataFrameView> {
-  return responses[0].data.reduce<Record<string, DataFrameView>>((acc, frameDTO) => {
+  return (responses[0]?.data || []).reduce<Record<string, DataFrameView>>((acc, frameDTO) => {
     const frame = toDataFrame(frameDTO);
     acc[frame.refId ?? 'A'] = new DataFrameView(frame);
     return acc;
@@ -308,7 +309,7 @@ function collectMetricData(
   }
 
   // The name of the value column is in this format
-  // TODO figure out if it can be changed
+  // Improvement: figure out if it can be changed
   const valueName = `Value #${metric}`;
 
   for (let i = 0; i < frame.length; i++) {
diff --git a/public/app/plugins/datasource/tempo/mockServiceGraph.json b/public/app/plugins/datasource/tempo/mockServiceGraph.json
index abdd24a0d189d..267ffe9975df4 100644
--- a/public/app/plugins/datasource/tempo/mockServiceGraph.json
+++ b/public/app/plugins/datasource/tempo/mockServiceGraph.json
@@ -48,7 +48,7 @@
               "title": "View traces",
               "internal": {
                 "query": {
-                  "queryType": "nativeSearch",
+                  "queryType": "traceqlSearch",
                   "serviceName": "${__data.fields[0]}"
                 },
                 "datasourceUid": "TNS Tempo",
diff --git a/public/app/plugins/datasource/tempo/package.json b/public/app/plugins/datasource/tempo/package.json
new file mode 100644
index 0000000000000..a60426c9ff9ba
--- /dev/null
+++ b/public/app/plugins/datasource/tempo/package.json
@@ -0,0 +1,68 @@
+{
+  "name": "@grafana-plugins/tempo",
+  "description": "Grafana plugin for the Tempo data source.",
+  "private": true,
+  "version": "11.0.0",
+  "dependencies": {
+    "@emotion/css": "11.11.2",
+    "@grafana/data": "workspace:*",
+    "@grafana/e2e-selectors": "workspace:*",
+    "@grafana/experimental": "1.7.10",
+    "@grafana/lezer-logql": "0.2.3",
+    "@grafana/lezer-traceql": "0.0.16",
+    "@grafana/monaco-logql": "^0.0.7",
+    "@grafana/o11y-ds-frontend": "workspace:*",
+    "@grafana/runtime": "workspace:*",
+    "@grafana/schema": "workspace:*",
+    "@grafana/ui": "workspace:*",
+    "@lezer/common": "1.2.1",
+    "@lezer/lr": "1.3.3",
+    "@opentelemetry/api": "1.7.0",
+    "@opentelemetry/exporter-collector": "0.25.0",
+    "@opentelemetry/semantic-conventions": "1.21.0",
+    "buffer": "6.0.3",
+    "events": "3.3.0",
+    "i18next": "^23.0.0",
+    "lodash": "4.17.21",
+    "lru-cache": "10.2.0",
+    "monaco-editor": "0.34.0",
+    "prismjs": "1.29.0",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
+    "react-use": "17.5.0",
+    "rxjs": "7.8.1",
+    "semver": "7.6.0",
+    "stream-browserify": "3.0.0",
+    "string_decoder": "1.3.0",
+    "tslib": "2.6.2",
+    "uuid": "9.0.1"
+  },
+  "devDependencies": {
+    "@grafana/plugin-configs": "11.0.0",
+    "@testing-library/jest-dom": "6.4.2",
+    "@testing-library/react": "14.2.2",
+    "@testing-library/user-event": "14.5.2",
+    "@types/jest": "29.5.12",
+    "@types/lodash": "4.17.0",
+    "@types/node": "20.11.30",
+    "@types/prismjs": "1.26.3",
+    "@types/react": "18.2.73",
+    "@types/react-dom": "18.2.22",
+    "@types/semver": "7.5.8",
+    "@types/uuid": "9.0.8",
+    "glob": "10.3.10",
+    "react-select-event": "5.5.1",
+    "ts-node": "10.9.2",
+    "typescript": "5.3.3",
+    "webpack": "5.91.0"
+  },
+  "peerDependencies": {
+    "@grafana/runtime": "*"
+  },
+  "scripts": {
+    "build": "webpack -c ./webpack.config.ts --env production",
+    "build:commit": "webpack -c ./webpack.config.ts --env production --env commit=$(git rev-parse --short HEAD)",
+    "dev": "webpack -w -c ./webpack.config.ts --env development"
+  },
+  "packageManager": "yarn@4.1.0"
+}
diff --git a/public/app/plugins/datasource/tempo/plugin.json b/public/app/plugins/datasource/tempo/plugin.json
index 629290de4a57e..cdc5b81ed947f 100644
--- a/public/app/plugins/datasource/tempo/plugin.json
+++ b/public/app/plugins/datasource/tempo/plugin.json
@@ -3,6 +3,7 @@
   "name": "Tempo",
   "id": "tempo",
   "category": "tracing",
+  "executable": "gpx_tempo",
 
   "metrics": true,
   "alerting": false,
@@ -27,6 +28,11 @@
         "name": "GitHub Project",
         "url": "https://github.com/grafana/tempo"
       }
-    ]
+    ],
+    "version": "%VERSION%"
+  },
+
+  "dependencies": {
+    "grafanaDependency": ">=10.3.0-0"
   }
 }
diff --git a/public/app/plugins/datasource/tempo/resultTransformer.test.ts b/public/app/plugins/datasource/tempo/resultTransformer.test.ts
index 413c58aa011e5..0c9c4750755fb 100644
--- a/public/app/plugins/datasource/tempo/resultTransformer.test.ts
+++ b/public/app/plugins/datasource/tempo/resultTransformer.test.ts
@@ -1,27 +1,18 @@
 import { collectorTypes } from '@opentelemetry/exporter-collector';
 
-import {
-  FieldType,
-  createDataFrame,
-  PluginType,
-  DataSourceInstanceSettings,
-  dateTime,
-  PluginMetaInfo,
-} from '@grafana/data';
+import { PluginType, DataSourceInstanceSettings, PluginMetaInfo } from '@grafana/data';
 
 import {
-  createTableFrame,
   transformToOTLP,
   transformFromOTLP,
-  createTableFrameFromSearch,
   createTableFrameFromTraceQlQuery,
+  createTableFrameFromTraceQlQueryAsSpans,
 } from './resultTransformer';
 import {
   badOTLPResponse,
   otlpDataFrameToResponse,
   otlpDataFrameFromResponse,
   otlpResponse,
-  tempoSearchResponse,
   traceQlResponse,
 } from './testResponse';
 import { TraceSearchMetadata } from './types';
@@ -44,41 +35,6 @@ const defaultSettings: DataSourceInstanceSettings = {
   jsonData: {},
 };
 
-describe('transformTraceList()', () => {
-  const lokiDataFrame = createDataFrame({
-    fields: [
-      {
-        name: 'ts',
-        type: FieldType.time,
-        values: ['2020-02-12T15:05:14.265Z', '2020-02-12T15:05:15.265Z', '2020-02-12T15:05:16.265Z'],
-      },
-      {
-        name: 'line',
-        type: FieldType.string,
-        values: [
-          't=2020-02-12T15:04:51+0000 lvl=info msg="Starting Grafana" logger=server',
-          't=2020-02-12T15:04:52+0000 lvl=info msg="Starting Grafana" logger=server traceID=asdfa1234',
-          't=2020-02-12T15:04:53+0000 lvl=info msg="Starting Grafana" logger=server traceID=asdf88',
-        ],
-      },
-    ],
-    meta: {
-      preferredVisualisationType: 'table',
-    },
-  });
-
-  test('extracts traceIDs from log lines', () => {
-    const frame = createTableFrame(lokiDataFrame, 't1', 'tempo', ['traceID=(\\w+)', 'traceID=(\\w\\w)']);
-    expect(frame.fields[0].name).toBe('Time');
-    expect(frame.fields[0].values[0]).toBe('2020-02-12T15:05:15.265Z');
-    expect(frame.fields[1].name).toBe('traceID');
-    expect(frame.fields[1].values[0]).toBe('asdfa1234');
-    // Second match in new line
-    expect(frame.fields[0].values[1]).toBe('2020-02-12T15:05:15.265Z');
-    expect(frame.fields[1].values[1]).toBe('as');
-  });
-});
-
 describe('transformToOTLP()', () => {
   test('transforms dataframe to OTLP format', () => {
     const otlp = transformToOTLP(otlpDataFrameToResponse);
@@ -99,32 +55,6 @@ describe('transformFromOTLP()', () => {
   });
 });
 
-describe('createTableFrameFromSearch()', () => {
-  const mockTimeUnix = dateTime(1643357709095).valueOf();
-  global.Date.now = jest.fn(() => mockTimeUnix);
-  test('transforms search response to dataFrame', () => {
-    const frame = createTableFrameFromSearch(tempoSearchResponse.traces as TraceSearchMetadata[], defaultSettings);
-    expect(frame.fields[0].name).toBe('traceID');
-    expect(frame.fields[0].values[0]).toBe('e641dcac1c3a0565');
-
-    // TraceID must have unit = 'string' to prevent the ID from rendering as Infinity
-    expect(frame.fields[0].config.unit).toBe('string');
-
-    expect(frame.fields[1].name).toBe('traceService');
-    expect(frame.fields[1].values[0]).toBe('requester');
-
-    expect(frame.fields[2].name).toBe('traceName');
-    expect(frame.fields[2].values[0]).toBe('app');
-
-    expect(frame.fields[3].name).toBe('startTime');
-    expect(frame.fields[3].values[0]).toBe(1643356828724);
-    expect(frame.fields[3].values[1]).toBe(1643342166678.0002);
-
-    expect(frame.fields[4].name).toBe('traceDuration');
-    expect(frame.fields[4].values[0]).toBe(65);
-  });
-});
-
 describe('createTableFrameFromTraceQlQuery()', () => {
   test('transforms TraceQL response to DataFrame', () => {
     const frameList = createTableFrameFromTraceQlQuery(traceQlResponse.traces, defaultSettings);
@@ -149,6 +79,7 @@ describe('createTableFrameFromTraceQlQuery()', () => {
     expect(frame.fields[4].name).toBe('traceDuration');
     expect(frame.fields[4].type).toBe('number');
     expect(frame.fields[4].values[2]).toBe(44);
+    expect(frame.fields[4].values[1]).toBe('<1ms');
     // Subframes field
     expect(frame.fields[5].name).toBe('nested');
     expect(frame.fields[5].type).toBe('nestedFrames');
@@ -198,6 +129,217 @@ describe('createTableFrameFromTraceQlQuery()', () => {
   });
 });
 
+describe('createTableFrameFromTraceQlQueryAsSpans()', () => {
+  test('transforms TraceQL legacy response to DataFrame for Spans table type', () => {
+    const traces = [
+      {
+        traceID: '1',
+        rootServiceName: 'prometheus',
+        rootTraceName: 'POST /api/v1/write',
+        startTimeUnixNano: '1702984850354934104',
+        durationMs: 1,
+        spanSet: {
+          spans: [
+            {
+              spanID: '11',
+              startTimeUnixNano: '1702984850354934104',
+              durationNanos: '1377608',
+            },
+          ],
+          matched: 1,
+          attributes: [{ key: 'attr-key-1', value: { intValue: '123' } }],
+        },
+      },
+      {
+        traceID: '2',
+        rootServiceName: 'prometheus',
+        rootTraceName: 'GET /api/v1/status/config',
+        startTimeUnixNano: '1702984840786143459',
+        spanSet: {
+          spans: [
+            {
+              spanID: '21',
+              startTimeUnixNano: '1702984840786143459',
+              durationNanos: '542316',
+            },
+          ],
+          matched: 1,
+          attributes: [{ key: 'attr-key-2', value: { stringValue: '456' } }],
+        },
+      },
+    ];
+    const frameList = createTableFrameFromTraceQlQueryAsSpans(traces, defaultSettings);
+    const frame = frameList[0];
+
+    // Trace ID field
+    expect(frame.fields[0].name).toBe('traceIdHidden');
+    expect(frame.fields[0].type).toBe('string');
+    expect(frame.fields[0].values[0]).toBe('1');
+    // Trace service field
+    expect(frame.fields[1].name).toBe('traceService');
+    expect(frame.fields[1].type).toBe('string');
+    expect(frame.fields[1].values[0]).toBe('prometheus');
+    // Trace name field
+    expect(frame.fields[2].name).toBe('traceName');
+    expect(frame.fields[2].type).toBe('string');
+    expect(frame.fields[2].values[0]).toBe('POST /api/v1/write');
+    // Span ID field
+    expect(frame.fields[3].name).toBe('spanID');
+    expect(frame.fields[3].type).toBe('string');
+    expect(frame.fields[3].values[0]).toBe('11');
+    // Time field
+    expect(frame.fields[4].name).toBe('time');
+    expect(frame.fields[4].type).toBe('time');
+    expect(frame.fields[4].values[0]).toBe(1702984850354.934);
+    // Name field
+    expect(frame.fields[5].name).toBe('name');
+    expect(frame.fields[5].type).toBe('string');
+    expect(frame.fields[5].values[0]).toBe(undefined);
+    // Dynamic fields
+    expect(frame.fields[6].name).toBe('attr-key-1');
+    expect(frame.fields[6].type).toBe('string');
+    expect(frame.fields[6].values[0]).toBe('123');
+    expect(frame.fields[6].values[1]).toBe(undefined);
+    expect(frame.fields[6].values.length).toBe(2);
+    expect(frame.fields[7].name).toBe('attr-key-2');
+    expect(frame.fields[7].type).toBe('string');
+    expect(frame.fields[7].values[0]).toBe(undefined);
+    expect(frame.fields[7].values[1]).toBe('456');
+    expect(frame.fields[7].values.length).toBe(2);
+    // Duration field
+    expect(frame.fields[8].name).toBe('duration');
+    expect(frame.fields[8].type).toBe('number');
+    expect(frame.fields[8].values[0]).toBe(1377608);
+    // No more fields
+    expect(frame.fields.length).toBe(9);
+  });
+
+  test('transforms TraceQL response to DataFrame for Spans table type', () => {
+    const traces = [
+      {
+        traceID: '1',
+        rootServiceName: 'prometheus',
+        rootTraceName: 'POST /api/v1/write',
+        startTimeUnixNano: '1702984850354934104',
+        durationMs: 1,
+        spanSets: [
+          {
+            spans: [
+              {
+                spanID: '11',
+                startTimeUnixNano: '1702984850354934104',
+                durationNanos: '1377608',
+              },
+            ],
+
+            matched: 1,
+            attributes: [{ key: 'attr-key-1', value: { intValue: '123' } }],
+          },
+        ],
+      },
+      {
+        traceID: '2',
+        rootServiceName: 'prometheus',
+        rootTraceName: 'GET /api/v1/status/config',
+        startTimeUnixNano: '1702984840786143459',
+        spanSets: [
+          {
+            spans: [
+              {
+                spanID: '21',
+                startTimeUnixNano: '1702984840786143459',
+                durationNanos: '542316',
+              },
+            ],
+            matched: 1,
+            attributes: [{ key: 'attr-key-2', value: { stringValue: '456' } }],
+          },
+        ],
+      },
+    ];
+    const frameList = createTableFrameFromTraceQlQueryAsSpans(traces, defaultSettings);
+    const frame = frameList[0];
+
+    // Trace ID field
+    expect(frame.fields[0].name).toBe('traceIdHidden');
+    expect(frame.fields[0].type).toBe('string');
+    expect(frame.fields[0].values[0]).toBe('1');
+    // Trace service field
+    expect(frame.fields[1].name).toBe('traceService');
+    expect(frame.fields[1].type).toBe('string');
+    expect(frame.fields[1].values[0]).toBe('prometheus');
+    // Trace name field
+    expect(frame.fields[2].name).toBe('traceName');
+    expect(frame.fields[2].type).toBe('string');
+    expect(frame.fields[2].values[0]).toBe('POST /api/v1/write');
+    // Span ID field
+    expect(frame.fields[3].name).toBe('spanID');
+    expect(frame.fields[3].type).toBe('string');
+    expect(frame.fields[3].values[0]).toBe('11');
+    // Time field
+    expect(frame.fields[4].name).toBe('time');
+    expect(frame.fields[4].type).toBe('time');
+    expect(frame.fields[4].values[0]).toBe(1702984850354.934);
+    // Name field
+    expect(frame.fields[5].name).toBe('name');
+    expect(frame.fields[5].type).toBe('string');
+    expect(frame.fields[5].values[0]).toBe(undefined);
+    // Dynamic fields
+    expect(frame.fields[6].name).toBe('attr-key-1');
+    expect(frame.fields[6].type).toBe('string');
+    expect(frame.fields[6].values[0]).toBe('123');
+    expect(frame.fields[6].values[1]).toBe(undefined);
+    expect(frame.fields[6].values.length).toBe(2);
+    expect(frame.fields[7].name).toBe('attr-key-2');
+    expect(frame.fields[7].type).toBe('string');
+    expect(frame.fields[7].values[0]).toBe(undefined);
+    expect(frame.fields[7].values[1]).toBe('456');
+    expect(frame.fields[7].values.length).toBe(2);
+    // Duration field
+    expect(frame.fields[8].name).toBe('duration');
+    expect(frame.fields[8].type).toBe('number');
+    expect(frame.fields[8].values[0]).toBe(1377608);
+    // No more fields
+    expect(frame.fields.length).toBe(9);
+  });
+
+  it.each([[undefined], [[]]])('TraceQL response with no data', (traces: TraceSearchMetadata[] | undefined) => {
+    const frameList = createTableFrameFromTraceQlQueryAsSpans(traces, defaultSettings);
+    const frame = frameList[0];
+
+    // Trace ID field
+    expect(frame.fields[0].name).toBe('traceIdHidden');
+    expect(frame.fields[0].type).toBe('string');
+    expect(frame.fields[0].values).toMatchObject([]);
+    // Trace service field
+    expect(frame.fields[1].name).toBe('traceService');
+    expect(frame.fields[1].type).toBe('string');
+    expect(frame.fields[1].values).toMatchObject([]);
+    // Trace name field
+    expect(frame.fields[2].name).toBe('traceName');
+    expect(frame.fields[2].type).toBe('string');
+    expect(frame.fields[2].values).toMatchObject([]);
+    // Span ID field
+    expect(frame.fields[3].name).toBe('spanID');
+    expect(frame.fields[3].type).toBe('string');
+    expect(frame.fields[3].values).toMatchObject([]);
+    // Time field
+    expect(frame.fields[4].name).toBe('time');
+    expect(frame.fields[4].type).toBe('time');
+    expect(frame.fields[4].values).toMatchObject([]);
+    // Name field
+    expect(frame.fields[5].name).toBe('name');
+    expect(frame.fields[5].type).toBe('string');
+    expect(frame.fields[5].values).toMatchObject([]);
+    // Duration field
+    expect(frame.fields[6].name).toBe('duration');
+    expect(frame.fields[6].type).toBe('number');
+    expect(frame.fields[6].values).toMatchObject([]);
+    // No more fields
+    expect(frame.fields.length).toBe(7);
+  });
+});
+
 describe('transformFromOTLP()', () => {
   // Mock the console error so that running the test suite doesnt throw the error
   const origError = console.error;
diff --git a/public/app/plugins/datasource/tempo/resultTransformer.ts b/public/app/plugins/datasource/tempo/resultTransformer.ts
index e63cc21bc7897..c32c0f203e54c 100644
--- a/public/app/plugins/datasource/tempo/resultTransformer.ts
+++ b/public/app/plugins/datasource/tempo/resultTransformer.ts
@@ -3,126 +3,40 @@ import { collectorTypes } from '@opentelemetry/exporter-collector';
 import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
 
 import {
+  createDataFrame,
+  createTheme,
   DataFrame,
+  DataLink,
+  DataLinkConfigOrigin,
   DataQueryResponse,
   DataSourceInstanceSettings,
+  DataSourceJsonData,
+  Field,
+  FieldDTO,
   FieldType,
+  getDisplayProcessor,
+  Labels,
   MutableDataFrame,
+  toDataFrame,
   TraceKeyValuePair,
   TraceLog,
   TraceSpanReference,
   TraceSpanRow,
-  FieldDTO,
-  createDataFrame,
-  getDisplayProcessor,
-  createTheme,
-  DataFrameDTO,
-  toDataFrame,
 } from '@grafana/data';
+import { TraceToProfilesData } from '@grafana/o11y-ds-frontend';
+import { getDataSourceSrv } from '@grafana/runtime';
 
 import { SearchTableType } from './dataquery.gen';
 import { createGraphFrames } from './graphTransform';
-import { Span, SpanAttributes, Spanset, TraceSearchMetadata } from './types';
-
-export function createTableFrame(
-  logsFrame: DataFrame | DataFrameDTO,
-  datasourceUid: string,
-  datasourceName: string,
-  traceRegexs: string[]
-): DataFrame {
-  const tableFrame = new MutableDataFrame({
-    fields: [
-      {
-        name: 'Time',
-        type: FieldType.time,
-        config: {
-          custom: {
-            width: 200,
-          },
-        },
-        values: [],
-      },
-      {
-        name: 'traceID',
-        type: FieldType.string,
-        config: {
-          displayNameFromDS: 'Trace ID',
-          custom: { width: 180 },
-          links: [
-            {
-              title: 'Click to open trace ${__value.raw}',
-              url: '',
-              internal: {
-                datasourceUid,
-                datasourceName,
-                query: {
-                  query: '${__value.raw}',
-                },
-              },
-            },
-          ],
-        },
-        values: [],
-      },
-      {
-        name: 'Message',
-        type: FieldType.string,
-        values: [],
-      },
-    ],
-    meta: {
-      preferredVisualisationType: 'table',
-    },
-  });
-
-  if (!logsFrame || traceRegexs.length === 0) {
-    return tableFrame;
-  }
-
-  const timeField = logsFrame.fields.find((f) => f.type === FieldType.time);
-
-  // Going through all string fields to look for trace IDs
-  for (let field of logsFrame.fields) {
-    let hasMatch = false;
-    if (field.type === FieldType.string) {
-      const values = field.values!;
-      for (let i = 0; i < values.length; i++) {
-        const line = values[i];
-        if (line) {
-          for (let traceRegex of traceRegexs) {
-            const match = line.match(traceRegex);
-            if (match) {
-              const traceId = match[1];
-              const time = timeField ? timeField.values![i] : null;
-              tableFrame.fields[0].values.push(time);
-              tableFrame.fields[1].values.push(traceId);
-              tableFrame.fields[2].values.push(line);
-              hasMatch = true;
-            }
-          }
-        }
-      }
-    }
-    if (hasMatch) {
-      break;
-    }
-  }
-
-  return tableFrame;
-}
-
-export function transformTraceList(
-  response: DataQueryResponse,
-  datasourceId: string,
-  datasourceName: string,
-  traceRegexs: string[]
-): DataQueryResponse {
-  response.data.forEach((data, index) => {
-    const frame = createTableFrame(data, datasourceId, datasourceName, traceRegexs);
-    response.data[index] = frame;
-  });
-  return response;
-}
+import {
+  ProtoValue,
+  Span,
+  SpanAttributes,
+  Spanset,
+  TempoJsonData,
+  TraceqlMetricsResponse,
+  TraceSearchMetadata,
+} from './types';
 
 function getAttributeValue(value: collectorTypes.opentelemetryProto.common.v1.AnyValue): any {
   if (value.stringValue) {
@@ -491,13 +405,54 @@ function getOTLPReferences(
   return links;
 }
 
-export function transformTrace(response: DataQueryResponse, nodeGraph = false): DataQueryResponse {
+export const RelatedProfilesTitle = 'Related profiles';
+
+export function transformTrace(
+  response: DataQueryResponse,
+  instanceSettings: DataSourceInstanceSettings<TempoJsonData>,
+  nodeGraph = false
+): DataQueryResponse {
   const frame = response.data[0];
 
   if (!frame) {
     return emptyDataQueryResponse;
   }
 
+  // Get profiles links
+  const traceToProfilesData: TraceToProfilesData | undefined = instanceSettings?.jsonData;
+  const traceToProfilesOptions = traceToProfilesData?.tracesToProfiles;
+  let profilesDataSourceSettings: DataSourceInstanceSettings<DataSourceJsonData> | undefined;
+  if (traceToProfilesOptions?.datasourceUid) {
+    profilesDataSourceSettings = getDataSourceSrv().getInstanceSettings(traceToProfilesOptions.datasourceUid);
+  }
+
+  if (traceToProfilesOptions && profilesDataSourceSettings) {
+    const customQuery = traceToProfilesOptions.customQuery ? traceToProfilesOptions.query : undefined;
+    const dataLink: DataLink = {
+      title: RelatedProfilesTitle,
+      url: '',
+      internal: {
+        datasourceUid: profilesDataSourceSettings.uid,
+        datasourceName: profilesDataSourceSettings.name,
+        query: {
+          labelSelector: customQuery ? customQuery : '{${__tags}}',
+          groupBy: [],
+          profileTypeId: traceToProfilesOptions.profileTypeId ?? '',
+          queryType: 'profile',
+          spanSelector: ['${__span.tags["pyroscope.profile.id"]}'],
+          refId: 'profile',
+        },
+      },
+      origin: DataLinkConfigOrigin.Datasource,
+    };
+
+    frame.fields.forEach((field: Field) => {
+      if (field.name === 'tags') {
+        field.config.links = [dataLink];
+      }
+    });
+  }
+
   let data = [...response.data];
   if (nodeGraph) {
     data.push(...createGraphFrames(toDataFrame(frame)));
@@ -509,73 +464,66 @@ export function transformTrace(response: DataQueryResponse, nodeGraph = false):
   };
 }
 
-export function createTableFrameFromSearch(data: TraceSearchMetadata[], instanceSettings: DataSourceInstanceSettings) {
-  const frame = new MutableDataFrame({
-    name: 'Traces',
-    refId: 'traces',
-    fields: [
-      {
-        name: 'traceID',
-        type: FieldType.string,
-        values: [],
-        config: {
-          unit: 'string',
-          displayNameFromDS: 'Trace ID',
-          links: [
-            {
-              title: 'Trace: ${__value.raw}',
-              url: '',
-              internal: {
-                datasourceUid: instanceSettings.uid,
-                datasourceName: instanceSettings.name,
-                query: {
-                  query: '${__value.raw}',
-                  queryType: 'traceql',
-                },
-              },
-            },
-          ],
-        },
-      },
-      { name: 'traceService', type: FieldType.string, config: { displayNameFromDS: 'Trace service' }, values: [] },
-      { name: 'traceName', type: FieldType.string, config: { displayNameFromDS: 'Trace name' }, values: [] },
-      { name: 'startTime', type: FieldType.time, config: { displayNameFromDS: 'Start time' }, values: [] },
-      {
-        name: 'traceDuration',
-        type: FieldType.number,
-        config: { displayNameFromDS: 'Duration', unit: 'ms' },
-        values: [],
-      },
-    ],
-    meta: {
-      preferredVisualisationType: 'table',
-    },
-  });
-  if (!data?.length) {
-    return frame;
-  }
-  // Show the most recent traces
-  const traceData = data
-    .sort((a, b) => parseInt(b?.startTimeUnixNano!, 10) / 1000000 - parseInt(a?.startTimeUnixNano!, 10) / 1000000)
-    .map(transformToTraceData);
-
-  for (const trace of traceData) {
-    frame.add(trace);
-  }
-
-  return frame;
-}
-
 function transformToTraceData(data: TraceSearchMetadata) {
   return {
     traceID: data.traceID,
     startTime: parseInt(data.startTimeUnixNano!, 10) / 1000000,
-    traceDuration: data.durationMs,
+    traceDuration: data.durationMs || '<1ms',
     traceService: data.rootServiceName || '',
     traceName: data.rootTraceName || '',
   };
 }
 
+const metricsValueToString = (value: ProtoValue): string => {
+  if (value.stringValue) {
+    return `"${value.stringValue}"`;
+  }
+  return '' + (value.intValue || value.doubleValue || value.boolValue || '""');
+};
+
+export function formatTraceQLMetrics(query: string, data: TraceqlMetricsResponse) {
+  const frames = data.series.map((series, index) => {
+    const labels: Labels = {};
+    series.labels?.forEach((label) => {
+      labels[label.key] = metricsValueToString(label.value);
+    });
+    // If it's a single series, use the query as the displayName fallback
+    let name = data.series.length === 1 ? query : '';
+    if (series.labels) {
+      if (series.labels.length === 1) {
+        // For single label series, use the label value as the displayName to improve readability
+        name = metricsValueToString(series.labels[0].value);
+      } else {
+        // otherwise build a string using the label keys and values
+        name = `{${series.labels.map((label) => `${label.key}=${metricsValueToString(label.value)}`).join(', ')}}`;
+      }
+    }
+    return createDataFrame({
+      refId: name || `A${index}`,
+      fields: [
+        {
+          name: 'time',
+          type: FieldType.time,
+          values: series.samples.map((sample) => parseInt(sample.timestampMs, 10)),
+        },
+        {
+          name: name,
+          labels,
+          type: FieldType.number,
+          values: series.samples.map((sample) => sample.value),
+          config: {
+            displayNameFromDS: name,
+          },
+        },
+      ],
+      meta: {
+        preferredVisualisationType: 'graph',
+      },
+    });
+  });
+  return frames;
+}
+
 export function formatTraceQLResponse(
   data: TraceSearchMetadata[],
   instanceSettings: DataSourceInstanceSettings,
@@ -587,6 +535,11 @@ export function formatTraceQLResponse(
   return createTableFrameFromTraceQlQuery(data, instanceSettings);
 }
 
+/**
+ * Create data frame while adding spans for each trace into a subtable.
+ * @param data
+ * @param instanceSettings
+ */
 export function createTableFrameFromTraceQlQuery(
   data: TraceSearchMetadata[],
   instanceSettings: DataSourceInstanceSettings
@@ -650,6 +603,7 @@ export function createTableFrameFromTraceQlQuery(
     ],
     meta: {
       preferredVisualisationType: 'table',
+      uniqueRowIdFields: [0],
     },
   });
 
@@ -684,35 +638,34 @@ export function createTableFrameFromTraceQlQuery(
 }
 
 export function createTableFrameFromTraceQlQueryAsSpans(
-  data: TraceSearchMetadata[],
+  data: TraceSearchMetadata[] | undefined,
   instanceSettings: DataSourceInstanceSettings
 ): DataFrame[] {
   const spanDynamicAttrs: Record<string, FieldDTO> = {};
   let hasNameAttribute = false;
 
-  data.forEach(
-    (t) =>
-      t.spanSets?.forEach((ss) => {
-        ss.attributes?.forEach((attr) => {
+  data?.forEach((trace) =>
+    getSpanSets(trace).forEach((ss) => {
+      ss.attributes?.forEach((attr) => {
+        spanDynamicAttrs[attr.key] = {
+          name: attr.key,
+          type: FieldType.string,
+          config: { displayNameFromDS: attr.key },
+        };
+      });
+      ss.spans.forEach((span) => {
+        if (span.name) {
+          hasNameAttribute = true;
+        }
+        span.attributes?.forEach((attr) => {
           spanDynamicAttrs[attr.key] = {
             name: attr.key,
             type: FieldType.string,
             config: { displayNameFromDS: attr.key },
           };
         });
-        ss.spans.forEach((span) => {
-          if (span.name) {
-            hasNameAttribute = true;
-          }
-          span.attributes?.forEach((attr) => {
-            spanDynamicAttrs[attr.key] = {
-              name: attr.key,
-              type: FieldType.string,
-              config: { displayNameFromDS: attr.key },
-            };
-          });
-        });
-      })
+      });
+    })
   );
 
   const frame = new MutableDataFrame({
@@ -806,7 +759,7 @@ export function createTableFrameFromTraceQlQueryAsSpans(
     },
   });
 
-  if (!data?.length) {
+  if (!data || !data.length) {
     return [frame];
   }
 
@@ -814,7 +767,7 @@ export function createTableFrameFromTraceQlQueryAsSpans(
     // Show the most recent traces
     .sort((a, b) => parseInt(b?.startTimeUnixNano!, 10) / 1000000 - parseInt(a?.startTimeUnixNano!, 10) / 1000000)
     .forEach((trace) => {
-      trace.spanSets?.forEach((spanSet) => {
+      getSpanSets(trace).forEach((spanSet) => {
         spanSet.spans.forEach((span) => {
           frame.add(transformSpanToTraceData(span, spanSet, trace));
         });
@@ -824,6 +777,19 @@ export function createTableFrameFromTraceQlQueryAsSpans(
   return [frame];
 }
 
+/**
+ * Get the spansets of a trace.
+ *
+ * Field `spanSets` is preferred to `spanSet` since the latter is deprecated in Tempo, but we
+ * support both for backward compatibility.
+ *
+ * @param trace a trace
+ * @returns the spansets of the trace, if existing
+ */
+const getSpanSets = (trace: TraceSearchMetadata): Spanset[] => {
+  return trace.spanSets || (trace.spanSet ? [trace.spanSet] : []);
+};
+
 const traceSubFrame = (
   trace: TraceSearchMetadata,
   spanSet: Spanset,
@@ -930,6 +896,7 @@ const traceSubFrame = (
     },
   });
 
+  // TODO: this should be done in `applyFieldOverrides` instead recursively for the nested `DataFrames`
   const theme = createTheme();
   for (const field of subFrame.fields) {
     field.display = getDisplayProcessor({ field, theme });
@@ -948,7 +915,7 @@ interface TraceTableData {
   spanID?: string;
   startTime?: number;
   name?: string;
-  traceDuration?: number;
+  traceDuration?: number | string;
 }
 
 function transformSpanToTraceData(span: Span, spanSet: Spanset, trace: TraceSearchMetadata): TraceTableData {
diff --git a/public/app/plugins/datasource/tempo/streaming.ts b/public/app/plugins/datasource/tempo/streaming.ts
index baf88073d41c2..23eef3182ced9 100644
--- a/public/app/plugins/datasource/tempo/streaming.ts
+++ b/public/app/plugins/datasource/tempo/streaming.ts
@@ -1,5 +1,5 @@
 import { capitalize } from 'lodash';
-import { map, Observable, defer, mergeMap } from 'rxjs';
+import { map, Observable, takeWhile } from 'rxjs';
 import { v4 as uuidv4 } from 'uuid';
 
 import {
@@ -20,7 +20,7 @@ import { SearchStreamingState } from './dataquery.gen';
 import { DEFAULT_SPSS, TempoDatasource } from './datasource';
 import { formatTraceQLResponse } from './resultTransformer';
 import { SearchMetrics, TempoJsonData, TempoQuery } from './types';
-export async function getLiveStreamKey(): Promise<string> {
+function getLiveStreamKey(): string {
   return uuidv4();
 }
 
@@ -34,59 +34,66 @@ export function doTempoChannelStream(
 
   let frames: DataFrame[] | undefined = undefined;
   let state: LoadingState = LoadingState.NotStarted;
+  const requestTime = performance.now();
 
-  return defer(() => getLiveStreamKey()).pipe(
-    mergeMap((key) => {
-      const requestTime = performance.now();
-      return getGrafanaLiveSrv()
-        .getStream<MutableDataFrame>({
-          scope: LiveChannelScope.DataSource,
-          namespace: ds.uid,
-          path: `search/${key}`,
-          data: {
-            ...query,
-            SpansPerSpanSet: query.spss ?? DEFAULT_SPSS,
-            timeRange: {
-              from: range.from.toISOString(),
-              to: range.to.toISOString(),
-            },
-          },
-        })
-        .pipe(
-          map((evt) => {
-            if ('message' in evt && evt?.message) {
-              const currentTime = performance.now();
-              const elapsedTime = currentTime - requestTime;
-              // Schema should be [traces, metrics, state, error]
-              const traces = evt.message.data.values[0][0];
-              const metrics = evt.message.data.values[1][0];
-              const frameState: SearchStreamingState = evt.message.data.values[2][0];
-              const error = evt.message.data.values[3][0];
+  return getGrafanaLiveSrv()
+    .getStream<MutableDataFrame>({
+      scope: LiveChannelScope.DataSource,
+      namespace: ds.uid,
+      path: `search/${getLiveStreamKey()}`,
+      data: {
+        ...query,
+        SpansPerSpanSet: query.spss ?? DEFAULT_SPSS,
+        timeRange: {
+          from: range.from.toISOString(),
+          to: range.to.toISOString(),
+        },
+      },
+    })
+    .pipe(
+      takeWhile((evt) => {
+        if ('message' in evt && evt?.message) {
+          const frameState: SearchStreamingState = evt.message.data.values[2][0];
+          if (frameState === SearchStreamingState.Done || frameState === SearchStreamingState.Error) {
+            return false;
+          }
+        }
+        return true;
+      }, true)
+    )
+    .pipe(
+      map((evt) => {
+        if ('message' in evt && evt?.message) {
+          const currentTime = performance.now();
+          const elapsedTime = currentTime - requestTime;
+          // Schema should be [traces, metrics, state, error]
+          const traces = evt.message.data.values[0][0];
+          const metrics = evt.message.data.values[1][0];
+          const frameState: SearchStreamingState = evt.message.data.values[2][0];
+          const error = evt.message.data.values[3][0];
 
-              switch (frameState) {
-                case SearchStreamingState.Done:
-                  state = LoadingState.Done;
-                  break;
-                case SearchStreamingState.Streaming:
-                  state = LoadingState.Streaming;
-                  break;
-                case SearchStreamingState.Error:
-                  throw new Error(error);
-              }
+          switch (frameState) {
+            case SearchStreamingState.Done:
+              state = LoadingState.Done;
+              break;
+            case SearchStreamingState.Streaming:
+              state = LoadingState.Streaming;
+              break;
+            case SearchStreamingState.Error:
+              throw new Error(error);
+          }
 
-              frames = [
-                metricsDataFrame(metrics, frameState, elapsedTime),
-                ...formatTraceQLResponse(traces, instanceSettings, query.tableType),
-              ];
-            }
-            return {
-              data: frames || [],
-              state,
-            };
-          })
-        );
-    })
-  );
+          frames = [
+            metricsDataFrame(metrics, frameState, elapsedTime),
+            ...formatTraceQLResponse(traces, instanceSettings, query.tableType),
+          ];
+        }
+        return {
+          data: frames || [],
+          state,
+        };
+      })
+    );
 }
 
 function metricsDataFrame(metrics: SearchMetrics, state: SearchStreamingState, elapsedTime: number) {
diff --git a/public/app/plugins/datasource/tempo/testResponse.ts b/public/app/plugins/datasource/tempo/testResponse.ts
index 6910941082382..493cb97501a63 100644
--- a/public/app/plugins/datasource/tempo/testResponse.ts
+++ b/public/app/plugins/datasource/tempo/testResponse.ts
@@ -2273,28 +2273,6 @@ export const otlpResponse = {
   ],
 };
 
-export const tempoSearchResponse = {
-  traces: [
-    {
-      traceID: 'e641dcac1c3a0565',
-      rootServiceName: 'requester',
-      rootTraceName: 'app',
-      startTimeUnixNano: '1643356828724000000',
-      durationMs: 65,
-    },
-    {
-      traceID: 'c2983496a2b12544',
-      rootServiceName: '<root span not yet received>',
-      startTimeUnixNano: '1643342166678000000',
-      durationMs: 93,
-    },
-  ],
-  metrics: {
-    inspectedTraces: 2,
-    inspectedBytes: '83720',
-  },
-};
-
 export const traceQlResponse = {
   traces: [
     {
@@ -2390,7 +2368,6 @@ export const traceQlResponse = {
       rootServiceName: 'lb',
       rootTraceName: 'HTTP Client',
       startTimeUnixNano: '1643342166678000000',
-      durationMs: 93,
       spanSets: [
         {
           attributes: [
diff --git a/public/app/plugins/datasource/tempo/test_utils.ts b/public/app/plugins/datasource/tempo/test_utils.ts
new file mode 100644
index 0000000000000..4a351355ce4b7
--- /dev/null
+++ b/public/app/plugins/datasource/tempo/test_utils.ts
@@ -0,0 +1,31 @@
+import { TimeRange, ScopedVars } from '@grafana/data';
+import { getTemplateSrv, setTemplateSrv } from '@grafana/runtime';
+
+export const initTemplateSrv = (variables: Array<{ name: string }>, expectedValues: Record<string, string>) => {
+  const replace = (target?: string, scopedVars?: ScopedVars, format?: string | Function): string => {
+    if (!target) {
+      return target ?? '';
+    }
+
+    const variableRegex = /\$(\w+)|\[\[(\w+?)(?::(\w+))?\]\]|\${(\w+)(?:\.([^:^\}]+))?(?::([^\}]+))?}/g;
+    variableRegex.lastIndex = 0;
+
+    return target.replace(variableRegex, (match, var1, var2, fmt2, var3, fieldPath, fmt3) => {
+      const variableName = var1 || var2 || var3;
+      return expectedValues[variableName];
+    });
+  };
+
+  setTemplateSrv({
+    replace: replace,
+    // @ts-ignore
+    getVariables() {
+      return variables;
+    },
+    containsTemplate() {
+      return false;
+    },
+    updateTimeRange(timeRange: TimeRange) {},
+  });
+  return getTemplateSrv();
+};
diff --git a/public/app/plugins/datasource/tempo/traceql/QueryEditor.tsx b/public/app/plugins/datasource/tempo/traceql/QueryEditor.tsx
index 0108d2fcc0506..7e5f7e024e821 100644
--- a/public/app/plugins/datasource/tempo/traceql/QueryEditor.tsx
+++ b/public/app/plugins/datasource/tempo/traceql/QueryEditor.tsx
@@ -1,25 +1,31 @@
 import { css } from '@emotion/css';
 import { defaults } from 'lodash';
-import React from 'react';
+import React, { useState } from 'react';
 
-import { QueryEditorProps } from '@grafana/data';
-import { InlineLabel, useStyles2 } from '@grafana/ui';
+import { GrafanaTheme2, QueryEditorProps } from '@grafana/data';
+import { config, reportInteraction } from '@grafana/runtime';
+import { Button, InlineLabel, useStyles2 } from '@grafana/ui';
 
+import { generateQueryFromFilters } from '../SearchTraceQLEditor/utils';
 import { TempoDatasource } from '../datasource';
 import { defaultQuery, MyDataSourceOptions, TempoQuery } from '../types';
 
 import { TempoQueryBuilderOptions } from './TempoQueryBuilderOptions';
 import { TraceQLEditor } from './TraceQLEditor';
 
-type Props = QueryEditorProps<TempoDatasource, TempoQuery, MyDataSourceOptions>;
+type EditorProps = {
+  onClearResults: () => void;
+};
+
+type Props = EditorProps & QueryEditorProps<TempoDatasource, TempoQuery, MyDataSourceOptions>;
 
 export function QueryEditor(props: Props) {
   const styles = useStyles2(getStyles);
   const query = defaults(props.query, defaultQuery);
-
-  const onEditorChange = (value: string) => {
-    props.onChange({ ...query, query: value });
-  };
+  const [showCopyFromSearchButton, setShowCopyFromSearchButton] = useState(() => {
+    const genQuery = generateQueryFromFilters(query.filters || []);
+    return genQuery === query.query || genQuery === '{}';
+  });
 
   return (
     <>
@@ -29,10 +35,36 @@ export function QueryEditor(props: Props) {
           Documentation
         </a>
       </InlineLabel>
+      {!showCopyFromSearchButton && (
+        <div className={styles.copyContainer}>
+          <span>Continue editing the query from the Search tab?</span>
+          <Button
+            variant="secondary"
+            size="sm"
+            onClick={() => {
+              reportInteraction('grafana_traces_copy_to_traceql_clicked', {
+                app: props.app ?? '',
+                grafana_version: config.buildInfo.version,
+                location: 'traceql_tab',
+              });
+
+              props.onClearResults();
+              props.onChange({
+                ...query,
+                query: generateQueryFromFilters(query.filters || []),
+              });
+              setShowCopyFromSearchButton(true);
+            }}
+            style={{ marginLeft: '10px' }}
+          >
+            Copy query from Search
+          </Button>
+        </div>
+      )}
       <TraceQLEditor
         placeholder="Enter a TraceQL query or trace ID (run with Shift+Enter)"
-        value={query.query || ''}
-        onChange={onEditorChange}
+        query={query}
+        onChange={props.onChange}
         datasource={props.datasource}
         onRunQuery={props.onRunQuery}
       />
@@ -43,8 +75,13 @@ export function QueryEditor(props: Props) {
   );
 }
 
-const getStyles = () => ({
-  optionsContainer: css`
-    margin-top: 10px;
-  `,
+const getStyles = (theme: GrafanaTheme2) => ({
+  optionsContainer: css({
+    marginTop: '10px',
+  }),
+  copyContainer: css({
+    backgroundColor: theme.colors.background.secondary,
+    padding: theme.spacing(0.5, 1),
+    fontSize: theme.typography.body.fontSize,
+  }),
 });
diff --git a/public/app/plugins/datasource/tempo/traceql/TempoQueryBuilderOptions.tsx b/public/app/plugins/datasource/tempo/traceql/TempoQueryBuilderOptions.tsx
index 5c5e239cfcd69..98658945e5417 100644
--- a/public/app/plugins/datasource/tempo/traceql/TempoQueryBuilderOptions.tsx
+++ b/public/app/plugins/datasource/tempo/traceql/TempoQueryBuilderOptions.tsx
@@ -2,8 +2,8 @@ import React from 'react';
 
 import { EditorField, EditorRow } from '@grafana/experimental';
 import { AutoSizeInput, RadioButtonGroup } from '@grafana/ui';
-import { QueryOptionGroup } from 'app/plugins/datasource/prometheus/querybuilder/shared/QueryOptionGroup';
 
+import { QueryOptionGroup } from '../_importedDependencies/datasources/prometheus/QueryOptionGroup';
 import { SearchTableType } from '../dataquery.gen';
 import { DEFAULT_LIMIT, DEFAULT_SPSS } from '../datasource';
 import { TempoQuery } from '../types';
@@ -13,6 +13,19 @@ interface Props {
   query: Partial<TempoQuery> & TempoQuery;
 }
 
+/**
+ * Parse a string value to integer. If the conversion fails, for example because we are prosessing an empty value for
+ * a field, return a fallback (default) value.
+ *
+ * @param val the value to be parsed to an integer
+ * @param fallback the fallback value
+ * @returns the converted value or the fallback value if the conversion fails
+ */
+const parseIntWithFallback = (val: string, fallback: number) => {
+  const parsed = parseInt(val, 10);
+  return isNaN(parsed) ? fallback : parsed;
+};
+
 export const TempoQueryBuilderOptions = React.memo<Props>(({ onChange, query }) => {
   if (!query.hasOwnProperty('limit')) {
     query.limit = DEFAULT_LIMIT;
@@ -23,10 +36,10 @@ export const TempoQueryBuilderOptions = React.memo<Props>(({ onChange, query })
   }
 
   const onLimitChange = (e: React.FormEvent<HTMLInputElement>) => {
-    onChange({ ...query, limit: parseInt(e.currentTarget.value, 10) });
+    onChange({ ...query, limit: parseIntWithFallback(e.currentTarget.value, DEFAULT_LIMIT) });
   };
   const onSpssChange = (e: React.FormEvent<HTMLInputElement>) => {
-    onChange({ ...query, spss: parseInt(e.currentTarget.value, 10) });
+    onChange({ ...query, spss: parseIntWithFallback(e.currentTarget.value, DEFAULT_SPSS) });
   };
   const onTableTypeChange = (val: SearchTableType) => {
     onChange({ ...query, tableType: val });
diff --git a/public/app/plugins/datasource/tempo/traceql/TraceQLEditor.test.tsx b/public/app/plugins/datasource/tempo/traceql/TraceQLEditor.test.tsx
deleted file mode 100644
index 40091386c4adf..0000000000000
--- a/public/app/plugins/datasource/tempo/traceql/TraceQLEditor.test.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { computeErrorMessage, getErrorNodes } from './errorHighlighting';
-
-describe('Check for syntax errors in query', () => {
-  it.each([
-    ['{span.http.status_code = }', 'Invalid value after comparison or aritmetic operator.'],
-    ['{span.http.status_code 200}', 'Invalid comparison operator after field expression.'],
-    ['{span.http.status_code ""}', 'Invalid comparison operator after field expression.'],
-    ['{span.http.status_code @ 200}', 'Invalid comparison operator after field expression.'],
-    ['{span.http.status_code span.http.status_code}', 'Invalid operator after field expression.'],
-    [
-      '{span.http.status_code = 200} {span.http.status_code = 200}',
-      'Invalid spanset combining operator after spanset expression.',
-    ],
-    [
-      '{span.http.status_code = 200} + {span.http.status_code = 200}',
-      'Invalid spanset combining operator after spanset expression.',
-    ],
-    ['{span.http.status_code = 200} &&', 'Invalid spanset expression after spanset combining operator.'],
-    [
-      '{span.http.status_code = 200} && {span.http.status_code = 200} | foo() > 3',
-      'Invalid aggregation operator after pipepile operator.',
-    ],
-    [
-      '{span.http.status_code = 200} && {span.http.status_code = 200} | avg() > 3',
-      'Invalid expression for aggregator operator.',
-    ],
-    ['{ 1 + 1 = 2 + }', 'Invalid value after comparison or aritmetic operator.'],
-    ['{ .a && }', 'Invalid value after logical operator.'],
-    ['{ .a || }', 'Invalid value after logical operator.'],
-    ['{ .a + }', 'Invalid value after comparison or aritmetic operator.'],
-    ['{ 200 = 200 200 }', 'Invalid comparison operator after field expression.'],
-    ['{.foo   300}', 'Invalid comparison operator after field expression.'],
-    ['{.foo  300 && .bar = 200}', 'Invalid operator after field expression.'],
-    ['{.foo  300 && .bar  200}', 'Invalid operator after field expression.'],
-    ['{.foo=1}  {.bar=2}', 'Invalid spanset combining operator after spanset expression.'],
-    ['{ span.http.status_code = 200 &&  }', 'Invalid value after logical operator.'],
-    ['{ span.http.status_code = 200 ||  }', 'Invalid value after logical operator.'],
-    ['{ .foo = 200 } && ', 'Invalid spanset expression after spanset combining operator.'],
-    ['{ .foo = 200 } || ', 'Invalid spanset expression after spanset combining operator.'],
-    ['{ .foo = 200 } >> ', 'Invalid spanset expression after spanset combining operator.'],
-    ['{.foo=1} | avg()', 'Invalid expression for aggregator operator.'],
-    ['{.foo=1} | avg(.foo) > ', 'Invalid value after comparison operator.'],
-    ['{.foo=1} | avg() < 1s', 'Invalid expression for aggregator operator.'],
-    ['{.foo=1} | max() = 3', 'Invalid expression for aggregator operator.'],
-    ['{.foo=1} | by()', 'Invalid expression for aggregator operator.'],
-    ['{.foo=1} | select()', 'Invalid expression for aggregator operator.'],
-    ['{foo}', 'Invalid expression for spanset.'],
-    ['{.}', 'Invalid expression for spanset.'],
-    ['{ resource. }', 'Invalid expression for spanset.'],
-    ['{ span. }', 'Invalid expression for spanset.'],
-    ['{.foo=}', 'Invalid value after comparison or aritmetic operator.'],
-    ['{.foo="}', 'Invalid value after comparison or aritmetic operator.'],
-    ['{.foo=300} |', 'Invalid aggregation operator after pipepile operator.'],
-    ['{.foo=300} && {.bar=200} |', 'Invalid aggregation operator after pipepile operator.'],
-    ['{.foo=300} && {.bar=300} && {.foo=300} |', 'Invalid aggregation operator after pipepile operator.'],
-    ['{.foo=300} | avg(.value)', 'Invalid comparison operator after aggregator operator.'],
-    ['{.foo=300} && {.foo=300} | avg(.value)', 'Invalid comparison operator after aggregator operator.'],
-    ['{.foo=300} | avg(.value) =', 'Invalid value after comparison operator.'],
-    ['{.foo=300} && {.foo=300} | avg(.value) =', 'Invalid value after comparison operator.'],
-    ['{.foo=300} | max(duration) > 1hs', 'Invalid value after comparison operator.'],
-    ['{ span.http.status_code', 'Invalid comparison operator after field expression.'],
-    ['abcxyz', 'Invalid query.'],
-  ])('error message for invalid query - %s, %s', (query: string, expectedErrorMessage: string) => {
-    const errorNode = getErrorNodes(query)[0];
-    expect(computeErrorMessage(errorNode)).toBe(expectedErrorMessage);
-  });
-
-  it.each([
-    ['123'],
-    ['abc'],
-    ['1a2b3c'],
-    ['{span.status = $code}'],
-    ['{span.${attribute} = "GET"}'],
-    ['{span.${attribute:format} = ${value:format} }'],
-    ['{true} >> {true}'],
-    ['{true} << {true}'],
-    ['{true} !>> {true}'],
-    ['{true} !<< {true}'],
-  ])('valid query - %s', (query: string) => {
-    expect(getErrorNodes(query)).toStrictEqual([]);
-  });
-});
diff --git a/public/app/plugins/datasource/tempo/traceql/TraceQLEditor.tsx b/public/app/plugins/datasource/tempo/traceql/TraceQLEditor.tsx
index 05cb706ca9aaa..3f40bc006acdf 100644
--- a/public/app/plugins/datasource/tempo/traceql/TraceQLEditor.tsx
+++ b/public/app/plugins/datasource/tempo/traceql/TraceQLEditor.tsx
@@ -1,33 +1,45 @@
 import { css } from '@emotion/css';
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
+import { TemporaryAlert } from '@grafana/o11y-ds-frontend';
 import { reportInteraction } from '@grafana/runtime';
 import { CodeEditor, Monaco, monacoTypes, useTheme2 } from '@grafana/ui';
 
-import { createErrorNotification } from '../../../../core/copy/appNotification';
-import { notifyApp } from '../../../../core/reducers/appNotification';
-import { dispatch } from '../../../../store/store';
 import { TempoDatasource } from '../datasource';
+import { TempoQuery } from '../types';
 
 import { CompletionProvider, CompletionType } from './autocomplete';
-import { getErrorNodes, setErrorMarkers } from './errorHighlighting';
+import { getErrorNodes, setMarkers } from './highlighting';
 import { languageDefinition } from './traceql';
 
 interface Props {
   placeholder: string;
-  value: string;
-  onChange: (val: string) => void;
+  query: TempoQuery;
+  onChange: (val: TempoQuery) => void;
   onRunQuery: () => void;
   datasource: TempoDatasource;
   readOnly?: boolean;
 }
 
 export function TraceQLEditor(props: Props) {
-  const { onChange, onRunQuery, placeholder } = props;
-  const setupAutocompleteFn = useAutocomplete(props.datasource);
+  const [alertText, setAlertText] = useState<string>();
+
+  const { query, onChange, onRunQuery, placeholder } = props;
+  const setupAutocompleteFn = useAutocomplete(props.datasource, setAlertText);
   const theme = useTheme2();
   const styles = getStyles(theme, placeholder);
+
+  // The Monaco Editor uses the first version of props.onChange in handleOnMount i.e. always has the initial
+  // value of query because underlying Monaco editor is passed `query` below in the onEditorChange callback.
+  // handleOnMount is called only once when the editor is mounted and does not get updates to query.
+  // So we need useRef to get the latest version of query in the onEditorChange callback.
+  const queryRef = useRef(query);
+  queryRef.current = query;
+  const onEditorChange = (value: string) => {
+    onChange({ ...queryRef.current, query: value });
+  };
+
   // work around the problem that `onEditorDidMount` is called once
   // and wouldn't get new version of onRunQuery
   const onRunQueryRef = useRef(onRunQuery);
@@ -36,73 +48,76 @@ export function TraceQLEditor(props: Props) {
   const errorTimeoutId = useRef<number>();
 
   return (
-    <CodeEditor
-      value={props.value}
-      language={langId}
-      onBlur={onChange}
-      onChange={onChange}
-      containerStyles={styles.queryField}
-      readOnly={props.readOnly}
-      monacoOptions={{
-        folding: false,
-        fontSize: 14,
-        lineNumbers: 'off',
-        overviewRulerLanes: 0,
-        renderLineHighlight: 'none',
-        scrollbar: {
-          vertical: 'hidden',
-          verticalScrollbarSize: 8, // used as "padding-right"
-          horizontal: 'hidden',
-          horizontalScrollbarSize: 0,
-        },
-        scrollBeyondLastLine: false,
-        wordWrap: 'on',
-      }}
-      onBeforeEditorMount={ensureTraceQL}
-      onEditorDidMount={(editor, monaco) => {
-        if (!props.readOnly) {
-          setupAutocompleteFn(editor, monaco, setupRegisterInteractionCommand(editor));
-          setupActions(editor, monaco, () => onRunQueryRef.current());
-          setupPlaceholder(editor, monaco, styles);
-        }
-        setupAutoSize(editor);
-
-        // Parse query that might already exist (e.g., after a page refresh)
-        const model = editor.getModel();
-        if (model) {
-          const errorNodes = getErrorNodes(model.getValue());
-          setErrorMarkers(monaco, model, errorNodes);
-        }
+    <>
+      <CodeEditor
+        value={query.query || ''}
+        language={langId}
+        onBlur={onEditorChange}
+        onChange={onEditorChange}
+        containerStyles={styles.queryField}
+        readOnly={props.readOnly}
+        monacoOptions={{
+          folding: false,
+          fontSize: 14,
+          lineNumbers: 'off',
+          overviewRulerLanes: 0,
+          renderLineHighlight: 'none',
+          scrollbar: {
+            vertical: 'hidden',
+            verticalScrollbarSize: 8, // used as "padding-right"
+            horizontal: 'hidden',
+            horizontalScrollbarSize: 0,
+          },
+          scrollBeyondLastLine: false,
+          wordWrap: 'on',
+        }}
+        onBeforeEditorMount={ensureTraceQL}
+        onEditorDidMount={(editor, monaco) => {
+          if (!props.readOnly) {
+            setupAutocompleteFn(editor, monaco, setupRegisterInteractionCommand(editor));
+            setupActions(editor, monaco, () => onRunQueryRef.current());
+            setupPlaceholder(editor, monaco, styles);
+          }
+          setupAutoSize(editor);
 
-        // Register callback for query changes
-        editor.onDidChangeModelContent((changeEvent) => {
+          // Parse query that might already exist (e.g., after a page refresh)
           const model = editor.getModel();
-
-          if (!model) {
-            return;
+          if (model) {
+            const errorNodes = getErrorNodes(model.getValue());
+            setMarkers(monaco, model, errorNodes);
           }
 
-          // Remove previous callback if existing, to prevent squiggles from been shown while the user is still typing
-          window.clearTimeout(errorTimeoutId.current);
-
-          const errorNodes = getErrorNodes(model.getValue());
-          const cursorPosition = changeEvent.changes[0].rangeOffset;
-
-          // Immediately updates the squiggles, in case the user fixed an error,
-          // excluding the error around the cursor position
-          setErrorMarkers(
-            monaco,
-            model,
-            errorNodes.filter((errorNode) => !(errorNode.from <= cursorPosition && cursorPosition <= errorNode.to))
-          );
-
-          // Later on, show all errors
-          errorTimeoutId.current = window.setTimeout(() => {
-            setErrorMarkers(monaco, model, errorNodes);
-          }, 500);
-        });
-      }}
-    />
+          // Register callback for query changes
+          editor.onDidChangeModelContent((changeEvent) => {
+            const model = editor.getModel();
+
+            if (!model) {
+              return;
+            }
+
+            // Remove previous callback if existing, to prevent squiggles from been shown while the user is still typing
+            window.clearTimeout(errorTimeoutId.current);
+
+            const errorNodes = getErrorNodes(model.getValue());
+            const cursorPosition = changeEvent.changes[0].rangeOffset;
+
+            // Immediately updates the squiggles, in case the user fixed an error,
+            // excluding the error around the cursor position
+            setMarkers(
+              monaco,
+              model,
+              errorNodes.filter((errorNode) => !(errorNode.from <= cursorPosition && cursorPosition <= errorNode.to))
+            );
+
+            // Later on, show all errors
+            errorTimeoutId.current = window.setTimeout(() => {
+              setMarkers(monaco, model, errorNodes);
+            }, 500);
+          });
+        }}
+      />
+      {alertText && <TemporaryAlert severity="error" text={alertText} />}
+    </>
   );
 }
 
@@ -175,29 +190,31 @@ function setupAutoSize(editor: monacoTypes.editor.IStandaloneCodeEditor) {
 
 /**
  * Hook that returns function that will set up monaco autocomplete for the label selector
- * @param datasource
+ * @param datasource the Tempo datasource instance
+ * @param setAlertText setter for alert's text
  */
-function useAutocomplete(datasource: TempoDatasource) {
+function useAutocomplete(datasource: TempoDatasource, setAlertText: (text?: string) => void) {
   // We need the provider ref so we can pass it the label/values data later. This is because we run the call for the
   // values here but there is additional setup needed for the provider later on. We could run the getSeries() in the
   // returned function but that is run after the monaco is mounted so would delay the request a bit when it does not
   // need to.
   const providerRef = useRef<CompletionProvider>(
-    new CompletionProvider({ languageProvider: datasource.languageProvider })
+    new CompletionProvider({ languageProvider: datasource.languageProvider, setAlertText })
   );
 
   useEffect(() => {
     const fetchTags = async () => {
       try {
         await datasource.languageProvider.start();
+        setAlertText(undefined);
       } catch (error) {
         if (error instanceof Error) {
-          dispatch(notifyApp(createErrorNotification('Error', error)));
+          setAlertText(`Error: ${error.message}`);
         }
       }
     };
     fetchTags();
-  }, [datasource]);
+  }, [datasource, setAlertText]);
 
   const autocompleteDisposeFun = useRef<(() => void) | null>(null);
   useEffect(() => {
@@ -243,17 +260,17 @@ interface EditorStyles {
 
 const getStyles = (theme: GrafanaTheme2, placeholder: string): EditorStyles => {
   return {
-    queryField: css`
-      border-radius: ${theme.shape.radius.default};
-      border: 1px solid ${theme.components.input.borderColor};
-      flex: 1;
-    `,
-    placeholder: css`
-      ::after {
-        content: '${placeholder}';
-        font-family: ${theme.typography.fontFamilyMonospace};
-        opacity: 0.3;
-      }
-    `,
+    queryField: css({
+      borderRadius: theme.shape.radius.default,
+      border: `1px solid ${theme.components.input.borderColor}`,
+      flex: 1,
+    }),
+    placeholder: css({
+      '::after': {
+        content: `'${placeholder}'`,
+        fontFamily: theme.typography.fontFamilyMonospace,
+        opacity: 0.3,
+      },
+    }),
   };
 };
diff --git a/public/app/plugins/datasource/tempo/traceql/autocomplete.test.ts b/public/app/plugins/datasource/tempo/traceql/autocomplete.test.ts
index bba93e29820fc..fafc6ccf361b1 100644
--- a/public/app/plugins/datasource/tempo/traceql/autocomplete.test.ts
+++ b/public/app/plugins/datasource/tempo/traceql/autocomplete.test.ts
@@ -105,6 +105,28 @@ describe('CompletionProvider', () => {
     ]);
   });
 
+  it('suggests options when inside quotes', async () => {
+    const { provider, model } = setup('{.foo=""}', 7, undefined, v2Tags);
+
+    jest.spyOn(provider.languageProvider, 'getOptionsV2').mockImplementation(
+      () =>
+        new Promise((resolve) => {
+          resolve([
+            {
+              type: 'string',
+              value: 'foobar',
+              label: 'foobar',
+            },
+          ]);
+        })
+    );
+
+    const result = await provider.provideCompletionItems(model, emptyPosition);
+    expect((result! as monacoTypes.languages.CompletionList).suggestions).toEqual([
+      expect.objectContaining({ label: 'foobar', insertText: 'foobar' }),
+    ]);
+  });
+
   it('suggests nothing without tags', async () => {
     const { provider, model } = setup('{.foo="}', 8, emptyTags);
     const result = await provider.provideCompletionItems(model, emptyPosition);
@@ -115,8 +137,8 @@ describe('CompletionProvider', () => {
     const { provider, model } = setup('', 0, v1Tags);
     const result = await provider.provideCompletionItems(model, emptyPosition);
     expect((result! as monacoTypes.languages.CompletionList).suggestions).toEqual([
-      ...scopes.map((s) => expect.objectContaining({ label: s, insertText: `{ ${s}` })),
-      ...intrinsics.map((s) => expect.objectContaining({ label: s, insertText: `{ ${s}` })),
+      ...scopes.map((s) => expect.objectContaining({ label: s, insertText: `{ ${s}$0 }` })),
+      ...intrinsics.map((s) => expect.objectContaining({ label: s, insertText: `{ ${s}$0 }` })),
       expect.objectContaining({ label: 'bar', insertText: '{ .bar' }),
       expect.objectContaining({ label: 'foo', insertText: '{ .foo' }),
       expect.objectContaining({ label: 'status', insertText: '{ .status' }),
@@ -127,8 +149,8 @@ describe('CompletionProvider', () => {
     const { provider, model } = setup('', 0, undefined, v2Tags);
     const result = await provider.provideCompletionItems(model, emptyPosition);
     expect((result! as monacoTypes.languages.CompletionList).suggestions).toEqual([
-      ...scopes.map((s) => expect.objectContaining({ label: s, insertText: `{ ${s}` })),
-      ...intrinsics.map((s) => expect.objectContaining({ label: s, insertText: `{ ${s}` })),
+      ...scopes.map((s) => expect.objectContaining({ label: s, insertText: `{ ${s}$0 }` })),
+      ...intrinsics.map((s) => expect.objectContaining({ label: s, insertText: `{ ${s}$0 }` })),
       expect.objectContaining({ label: 'cluster', insertText: '{ .cluster' }),
       expect.objectContaining({ label: 'container', insertText: '{ .container' }),
       expect.objectContaining({ label: 'db', insertText: '{ .db' }),
@@ -342,6 +364,27 @@ describe('CompletionProvider', () => {
       [...scopes, ...intrinsics].map((s) => expect.objectContaining({ label: s }))
     );
   });
+
+  it.each([
+    ['{span.ht', 8],
+    ['{span.http', 10],
+    ['{span.http.', 11],
+    ['{span.http.status', 17],
+  ])(
+    'suggests attributes when containing trigger characters and missing `}`- %s, %i',
+    async (input: string, offset: number) => {
+      const { provider, model } = setup(input, offset, undefined, [
+        {
+          name: 'span',
+          tags: ['http.status_code'],
+        },
+      ]);
+      const result = await provider.provideCompletionItems(model, emptyPosition);
+      expect((result! as monacoTypes.languages.CompletionList).suggestions).toEqual([
+        expect.objectContaining({ label: 'http.status_code', insertText: 'http.status_code' }),
+      ]);
+    }
+  );
 });
 
 function setup(value: string, offset: number, tagsV1?: string[], tagsV2?: Scope[]) {
@@ -352,7 +395,7 @@ function setup(value: string, offset: number, tagsV1?: string[], tagsV2?: Scope[
   } else if (tagsV2) {
     lp.setV2Tags(tagsV2);
   }
-  const provider = new CompletionProvider({ languageProvider: lp });
+  const provider = new CompletionProvider({ languageProvider: lp, setAlertText: () => {} });
   const model = makeModel(value, offset);
   provider.monaco = {
     Range: {
@@ -366,12 +409,12 @@ function setup(value: string, offset: number, tagsV1?: string[], tagsV2?: Scope[
         EnumMember: 2,
       },
     },
-  } as any;
+  } as unknown as typeof monacoTypes;
   provider.editor = {
     getModel() {
       return model;
     },
-  } as any;
+  } as unknown as monacoTypes.editor.IStandaloneCodeEditor;
 
   return { provider, model } as unknown as { provider: CompletionProvider; model: monacoTypes.editor.ITextModel };
 }
diff --git a/public/app/plugins/datasource/tempo/traceql/autocomplete.ts b/public/app/plugins/datasource/tempo/traceql/autocomplete.ts
index 9d98bab5037fe..15b81656bbf26 100644
--- a/public/app/plugins/datasource/tempo/traceql/autocomplete.ts
+++ b/public/app/plugins/datasource/tempo/traceql/autocomplete.ts
@@ -4,9 +4,6 @@ import { SelectableValue } from '@grafana/data';
 import { isFetchError } from '@grafana/runtime';
 import type { Monaco, monacoTypes } from '@grafana/ui';
 
-import { createErrorNotification } from '../../../../core/copy/appNotification';
-import { notifyApp } from '../../../../core/reducers/appNotification';
-import { dispatch } from '../../../../store/store';
 import TempoLanguageProvider from '../language_provider';
 
 import { getSituation, Situation } from './situation';
@@ -14,6 +11,7 @@ import { intrinsics, scopes } from './traceql';
 
 interface Props {
   languageProvider: TempoLanguageProvider;
+  setAlertText: (text?: string) => void;
 }
 
 type MinimalCompletionItem = {
@@ -33,9 +31,11 @@ type MinimalCompletionItem = {
 export class CompletionProvider implements monacoTypes.languages.CompletionItemProvider {
   languageProvider: TempoLanguageProvider;
   registerInteractionCommandId: string | null;
+  setAlertText: (text?: string) => void;
 
   constructor(props: Props) {
     this.languageProvider = props.languageProvider;
+    this.setAlertText = props.setAlertText;
     this.registerInteractionCommandId = null;
   }
 
@@ -243,7 +243,7 @@ export class CompletionProvider implements monacoTypes.languages.CompletionItemP
 
     const { range, offset } = getRangeAndOffset(this.monaco, model, position);
     const situation = getSituation(model.getValue(), offset);
-    const completionItems = situation != null ? this.getCompletions(situation) : Promise.resolve([]);
+    const completionItems = situation != null ? this.getCompletions(situation, this.setAlertText) : Promise.resolve([]);
 
     return completionItems.then((items) => {
       // monaco by-default alphabetically orders the items.
@@ -282,12 +282,13 @@ export class CompletionProvider implements monacoTypes.languages.CompletionItemP
 
   private async getTagValues(tagName: string, query: string): Promise<Array<SelectableValue<string>>> {
     let tagValues: Array<SelectableValue<string>>;
+    const cacheKey = `${tagName}:${query}`;
 
-    if (this.cachedValues.hasOwnProperty(tagName)) {
-      tagValues = this.cachedValues[tagName];
+    if (this.cachedValues.hasOwnProperty(cacheKey)) {
+      tagValues = this.cachedValues[cacheKey];
     } else {
       tagValues = await this.languageProvider.getOptionsV2(tagName, query);
-      this.cachedValues[tagName] = tagValues;
+      this.cachedValues[cacheKey] = tagValues;
     }
     return tagValues;
   }
@@ -297,15 +298,15 @@ export class CompletionProvider implements monacoTypes.languages.CompletionItemP
    * @param situation
    * @private
    */
-  private async getCompletions(situation: Situation): Promise<Completion[]> {
+  private async getCompletions(situation: Situation, setAlertText: (text?: string) => void): Promise<Completion[]> {
     switch (situation.type) {
       // This should only happen for cases that we do not support yet
       case 'UNKNOWN': {
         return [];
       }
       case 'EMPTY': {
-        return this.getScopesCompletions('{ ')
-          .concat(this.getIntrinsicsCompletions('{ '))
+        return this.getScopesCompletions('{ ', '$0 }')
+          .concat(this.getIntrinsicsCompletions('{ ', '$0 }'))
           .concat(this.getTagsCompletions('{ .'));
       }
       case 'SPANSET_EMPTY':
@@ -369,11 +370,12 @@ export class CompletionProvider implements monacoTypes.languages.CompletionItemP
         let tagValues;
         try {
           tagValues = await this.getTagValues(situation.tagName, situation.query);
+          setAlertText(undefined);
         } catch (error) {
           if (isFetchError(error)) {
-            dispatch(notifyApp(createErrorNotification(error.data.error, new Error(error.data.message))));
+            setAlertText(error.data.error);
           } else if (error instanceof Error) {
-            dispatch(notifyApp(createErrorNotification('Error', error)));
+            setAlertText(`Error: ${error.message}`);
           }
         }
 
diff --git a/public/app/plugins/datasource/tempo/traceql/errorHighlighting.ts b/public/app/plugins/datasource/tempo/traceql/errorHighlighting.ts
deleted file mode 100644
index bd49a30b80c9e..0000000000000
--- a/public/app/plugins/datasource/tempo/traceql/errorHighlighting.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-import { SyntaxNode } from '@lezer/common';
-
-import {
-  Aggregate,
-  And,
-  AttributeField,
-  ComparisonOp,
-  FieldExpression,
-  FieldOp,
-  IntrinsicField,
-  Or,
-  parser,
-  Pipe,
-  ScalarExpression,
-  ScalarFilter,
-  SpansetFilter,
-  SpansetPipelineExpression,
-} from '@grafana/lezer-traceql';
-import { monacoTypes } from '@grafana/ui';
-
-/**
- * Given an error node, generate an error message to be displayed to the user.
- *
- * @param errorNode the error node, as returned by the TraceQL Lezer parser
- * @returns the error message
- */
-export const computeErrorMessage = (errorNode: SyntaxNode) => {
-  switch (errorNode.parent?.type.id) {
-    case FieldExpression:
-      switch (errorNode.prevSibling?.type.id) {
-        case And:
-        case Or:
-          return 'Invalid value after logical operator.';
-        case FieldOp:
-          return 'Invalid value after comparison or aritmetic operator.';
-        default:
-          return 'Invalid operator after field expression.';
-      }
-    case SpansetFilter:
-      if (errorNode.prevSibling?.type.id === FieldExpression) {
-        return 'Invalid comparison operator after field expression.';
-      }
-      return 'Invalid expression for spanset.';
-    case SpansetPipelineExpression:
-      switch (errorNode.prevSibling?.type.id) {
-        case SpansetPipelineExpression:
-          return 'Invalid spanset combining operator after spanset expression.';
-        case Pipe:
-          return 'Invalid aggregation operator after pipepile operator.';
-        default:
-          return 'Invalid spanset expression after spanset combining operator.';
-      }
-    case IntrinsicField:
-    case Aggregate:
-      return 'Invalid expression for aggregator operator.';
-    case AttributeField:
-      return 'Invalid expression for spanset.';
-    case ScalarFilter:
-      switch (errorNode.prevSibling?.type.id) {
-        case ComparisonOp:
-          return 'Invalid value after comparison operator.';
-        case ScalarExpression:
-          if (errorNode.prevSibling?.firstChild?.type.id === Aggregate) {
-            return 'Invalid comparison operator after aggregator operator.';
-          }
-        default:
-          return 'Invalid value after comparison operator.';
-      }
-    default:
-      return 'Invalid query.';
-  }
-};
-
-/**
- * Parse the given query and find the error nodes, if any, in the resulting tree.
- *
- * @param query the TraceQL query of the user
- * @returns the error nodes
- */
-export const getErrorNodes = (query: string): SyntaxNode[] => {
-  // Return immediately if the query is empty, to avoid raising exceptions in processing it
-  if (query.trim() === '') {
-    return [];
-  }
-
-  // Check whether this is a trace ID or traceQL query by checking if it only contains hex characters
-  const hexOnlyRegex = /^[0-9A-Fa-f]*$/;
-  if (query.trim().match(hexOnlyRegex)) {
-    return [];
-  }
-
-  const tree = parser.parse(query);
-
-  // Find all error nodes and compute the associated erro boundaries
-  const errorNodes: SyntaxNode[] = [];
-  tree.iterate({
-    enter: (nodeRef) => {
-      if (nodeRef.type.id === 0) {
-        errorNodes.push(nodeRef.node);
-      }
-    },
-  });
-
-  return errorNodes;
-};
-
-/**
- * Use red markers (squiggles) to highlight syntax errors in queries.
- *
- */
-export const setErrorMarkers = (
-  monaco: typeof monacoTypes,
-  model: monacoTypes.editor.ITextModel,
-  errorNodes: SyntaxNode[]
-) => {
-  monaco.editor.setModelMarkers(
-    model,
-    'owner', // default value
-    errorNodes.map((errorNode) => {
-      let startLine = 0;
-      let endLine = 0;
-      let start = errorNode.from;
-      let end = errorNode.to;
-
-      while (start > 0) {
-        startLine++;
-        start -= model.getLineLength(startLine) + 1; // new lines don't count for getLineLength() but they still count as a character for the parser
-      }
-      while (end > 0) {
-        endLine++;
-        end -= model.getLineLength(endLine) + 1;
-      }
-
-      return {
-        message: computeErrorMessage(errorNode),
-        severity: monaco.MarkerSeverity.Error,
-
-        startLineNumber: startLine,
-        endLineNumber: endLine,
-
-        // `+ 2` because of the above computations
-        startColumn: start + model.getLineLength(startLine) + 2,
-        endColumn: end + model.getLineLength(endLine) + 2,
-      };
-    })
-  );
-};
diff --git a/public/app/plugins/datasource/tempo/traceql/highlighting.test.ts b/public/app/plugins/datasource/tempo/traceql/highlighting.test.ts
new file mode 100644
index 0000000000000..e9b1d2a80edf6
--- /dev/null
+++ b/public/app/plugins/datasource/tempo/traceql/highlighting.test.ts
@@ -0,0 +1,195 @@
+import { monacoTypes } from '@grafana/ui';
+
+import { computeErrorMessage, getErrorNodes, getWarningMarkers } from './highlighting';
+
+describe('Highlighting', () => {
+  describe('gets correct warning markers for', () => {
+    const message = 'Add resource or span scope to attribute to improve query performance.';
+
+    describe('no warnings', () => {
+      it('for span scope', () => {
+        const { model } = setup('{ span.component = "http" }');
+        const marker = getWarningMarkers(4, model);
+        expect(marker).toEqual(expect.objectContaining([]));
+      });
+      it('for resource scope', () => {
+        const { model } = setup('{ resource.component = "http" }');
+        const marker = getWarningMarkers(4, model);
+        expect(marker).toEqual(expect.objectContaining([]));
+      });
+      it('for parent scope', () => {
+        const { model } = setup('{ parent.component = "http" }');
+        const marker = getWarningMarkers(4, model);
+        expect(marker).toEqual(expect.objectContaining([]));
+      });
+    });
+
+    it('single warning', () => {
+      const { model } = setup('{ .component = "http" }');
+      const marker = getWarningMarkers(4, model);
+      expect(marker).toEqual(
+        expect.objectContaining([
+          {
+            message,
+            severity: 4,
+            startLineNumber: 1,
+            endLineNumber: 1,
+            startColumn: 3,
+            endColumn: 3,
+          },
+        ])
+      );
+    });
+
+    it('multiple warnings', () => {
+      const { model } = setup('{ .component = "http" || .http.status_code = 200 }');
+      const marker = getWarningMarkers(4, model);
+      expect(marker).toEqual(
+        expect.objectContaining([
+          {
+            message,
+            severity: 4,
+            startLineNumber: 1,
+            endLineNumber: 1,
+            startColumn: 3,
+            endColumn: 3,
+          },
+          {
+            message,
+            severity: 4,
+            startLineNumber: 1,
+            endLineNumber: 1,
+            startColumn: 26,
+            endColumn: 26,
+          },
+        ])
+      );
+    });
+
+    it('multiple parts, single warning', () => {
+      const { model } = setup('{ resource.component = "http" || .http.status_code = 200 }');
+      const marker = getWarningMarkers(4, model);
+      expect(marker).toEqual(
+        expect.objectContaining([
+          {
+            message,
+            severity: 4,
+            startLineNumber: 1,
+            endLineNumber: 1,
+            startColumn: 34,
+            endColumn: 34,
+          },
+        ])
+      );
+    });
+  });
+
+  describe('check for syntax errors in query', () => {
+    it.each([
+      ['{span.http.status_code = }', 'Invalid value after comparison or arithmetic operator.'],
+      ['{span.http.status_code 200}', 'Invalid comparison operator after field expression.'],
+      ['{span.http.status_code ""}', 'Invalid operator after field expression.'],
+      ['{span.http.status_code @ 200}', 'Invalid comparison operator after field expression.'],
+      ['{span.http.status_code span.http.status_code}', 'Invalid operator after field expression.'],
+      [
+        '{span.http.status_code = 200} {span.http.status_code = 200}',
+        'Invalid spanset combining operator after spanset expression.',
+      ],
+      [
+        '{span.http.status_code = 200} + {span.http.status_code = 200}',
+        'Invalid spanset combining operator after spanset expression.',
+      ],
+      ['{span.http.status_code = 200} &&', 'Invalid spanset expression after spanset combining operator.'],
+      [
+        '{span.http.status_code = 200} && {span.http.status_code = 200} | foo() > 3',
+        'Invalid aggregation operator after pipepile operator.',
+      ],
+      [
+        '{span.http.status_code = 200} && {span.http.status_code = 200} | avg() > 3',
+        'Invalid expression for aggregator operator.',
+      ],
+      ['{ 1 + 1 = 2 + }', 'Invalid value after comparison or arithmetic operator.'],
+      ['{ .a && }', 'Invalid value after logical operator.'],
+      ['{ .a || }', 'Invalid value after logical operator.'],
+      ['{ .a + }', 'Invalid value after comparison or arithmetic operator.'],
+      ['{ 200 = 200 200 }', 'Invalid comparison operator after field expression.'],
+      ['{.foo   300}', 'Invalid comparison operator after field expression.'],
+      ['{.foo  300 && .bar = 200}', 'Invalid operator after field expression.'],
+      ['{.foo  300 && .bar  200}', 'Invalid operator after field expression.'],
+      ['{.foo=1}  {.bar=2}', 'Invalid spanset combining operator after spanset expression.'],
+      ['{ span.http.status_code = 200 &&  }', 'Invalid value after logical operator.'],
+      ['{ span.http.status_code = 200 ||  }', 'Invalid value after logical operator.'],
+      ['{ .foo = 200 } && ', 'Invalid spanset expression after spanset combining operator.'],
+      ['{ .foo = 200 } || ', 'Invalid spanset expression after spanset combining operator.'],
+      ['{ .foo = 200 } >> ', 'Invalid spanset expression after spanset combining operator.'],
+      ['{.foo=1} | avg()', 'Invalid expression for aggregator operator.'],
+      ['{.foo=1} | avg(.foo) > ', 'Invalid value after comparison operator.'],
+      ['{.foo=1} | avg() < 1s', 'Invalid expression for aggregator operator.'],
+      ['{.foo=1} | max() = 3', 'Invalid expression for aggregator operator.'],
+      ['{.foo=1} | by()', 'Invalid expression for by operator.'],
+      ['{.foo=1} | select()', 'Invalid expression for select operator.'],
+      ['{foo}', 'Invalid expression for spanset.'],
+      ['{.}', 'Invalid expression for spanset.'],
+      ['{ resource. }', 'Invalid expression for spanset.'],
+      ['{ span. }', 'Invalid expression for spanset.'],
+      ['{.foo=}', 'Invalid value after comparison or arithmetic operator.'],
+      ['{.foo="}', 'Invalid value after comparison or arithmetic operator.'],
+      ['{.foo=300} |', 'Invalid aggregation operator after pipepile operator.'],
+      ['{.foo=300} && {.bar=200} |', 'Invalid aggregation operator after pipepile operator.'],
+      ['{.foo=300} && {.bar=300} && {.foo=300} |', 'Invalid aggregation operator after pipepile operator.'],
+      ['{.foo=300} | avg(.value)', 'Invalid comparison operator after aggregator operator.'],
+      ['{.foo=300} && {.foo=300} | avg(.value)', 'Invalid comparison operator after aggregator operator.'],
+      ['{.foo=300} | avg(.value) =', 'Invalid value after comparison operator.'],
+      ['{.foo=300} && {.foo=300} | avg(.value) =', 'Invalid value after comparison operator.'],
+      ['{.foo=300} | max(duration) > 1hs', 'Invalid value after comparison operator.'],
+      ['{ span.http.status_code', 'Invalid comparison operator after field expression.'],
+      ['{ .foo = "bar"', 'Invalid comparison operator after field expression.'],
+      ['abcxyz', 'Invalid query.'],
+    ])('error message for invalid query - %s, %s', (query: string, expectedErrorMessage: string) => {
+      const errorNode = getErrorNodes(query)[0];
+      expect(computeErrorMessage(errorNode)).toBe(expectedErrorMessage);
+    });
+
+    it.each([
+      ['123'],
+      ['abc'],
+      ['1a2b3c'],
+      ['{span.status = $code}'],
+      ['{span.${attribute} = "GET"}'],
+      ['{span.${attribute:format} = ${value:format} }'],
+      ['{true} >> {true}'],
+      ['{true} << {true}'],
+      ['{true} !>> {true}'],
+      ['{true} !<< {true}'],
+      [
+        `{ true } /* && { false } && */ && { true } // && { false }
+      && { true }`,
+      ],
+      ['{span.s"t\\"at"us}'],
+      ['{span.s"t\\\\at"us}'],
+      ['{ span.s"tat"us" = "GET123 }'], // weird query, but technically valid
+      ['{ duration = 123.456us}'],
+      ['{ .foo = `GET` && .bar = `P\'O"S\\T` }'],
+      ['{ .foo = `GET` } | by(.foo, name)'],
+    ])('valid query - %s', (query: string) => {
+      expect(getErrorNodes(query)).toStrictEqual([]);
+    });
+  });
+});
+
+function setup(value: string) {
+  const model = makeModel(value);
+  return { model } as unknown as { model: monacoTypes.editor.ITextModel };
+}
+
+function makeModel(value: string) {
+  return {
+    id: 'test_monaco',
+    getValue() {
+      return value;
+    },
+    getLineLength() {
+      return value.length;
+    },
+  };
+}
diff --git a/public/app/plugins/datasource/tempo/traceql/highlighting.ts b/public/app/plugins/datasource/tempo/traceql/highlighting.ts
new file mode 100644
index 0000000000000..9ba47beba6fad
--- /dev/null
+++ b/public/app/plugins/datasource/tempo/traceql/highlighting.ts
@@ -0,0 +1,206 @@
+import { SyntaxNode } from '@lezer/common';
+
+import {
+  Aggregate,
+  And,
+  AttributeField,
+  ComparisonOp,
+  FieldExpression,
+  FieldOp,
+  GroupOperation,
+  Identifier,
+  IntrinsicField,
+  Or,
+  Parent,
+  parser,
+  Pipe,
+  Resource,
+  ScalarExpression,
+  ScalarFilter,
+  SelectOperation,
+  Span,
+  SpansetFilter,
+  SpansetPipelineExpression,
+} from '@grafana/lezer-traceql';
+import { monacoTypes } from '@grafana/ui';
+
+/**
+ * Given an error node, generate an error message to be displayed to the user.
+ *
+ * @param errorNode the error node, as returned by the TraceQL Lezer parser
+ * @returns the error message
+ */
+export const computeErrorMessage = (errorNode: SyntaxNode) => {
+  switch (errorNode.parent?.type.id) {
+    case FieldExpression:
+      switch (errorNode.prevSibling?.type.id) {
+        case And:
+        case Or:
+          return 'Invalid value after logical operator.';
+        case FieldOp:
+          return 'Invalid value after comparison or arithmetic operator.';
+        default:
+          return 'Invalid operator after field expression.';
+      }
+    case SpansetFilter:
+      if (errorNode.prevSibling?.type.id === FieldExpression) {
+        return 'Invalid comparison operator after field expression.';
+      }
+      return 'Invalid expression for spanset.';
+    case SpansetPipelineExpression:
+      switch (errorNode.prevSibling?.type.id) {
+        case SpansetPipelineExpression:
+          return 'Invalid spanset combining operator after spanset expression.';
+        case Pipe:
+          return 'Invalid aggregation operator after pipepile operator.';
+        default:
+          return 'Invalid spanset expression after spanset combining operator.';
+      }
+    case IntrinsicField:
+    case Aggregate:
+      return 'Invalid expression for aggregator operator.';
+    case GroupOperation:
+      return 'Invalid expression for by operator.';
+    case SelectOperation:
+      return 'Invalid expression for select operator.';
+    case AttributeField:
+      return 'Invalid expression for spanset.';
+    case ScalarFilter:
+      switch (errorNode.prevSibling?.type.id) {
+        case ComparisonOp:
+          return 'Invalid value after comparison operator.';
+        case ScalarExpression:
+          if (errorNode.prevSibling?.firstChild?.type.id === Aggregate) {
+            return 'Invalid comparison operator after aggregator operator.';
+          }
+        default:
+          return 'Invalid value after comparison operator.';
+      }
+    default:
+      return 'Invalid query.';
+  }
+};
+
+/**
+ * Parse the given query and find the error nodes, if any, in the resulting tree.
+ *
+ * @param query the TraceQL query of the user
+ * @returns the error nodes
+ */
+export const getErrorNodes = (query: string): SyntaxNode[] => {
+  // Return immediately if the query is empty, to avoid raising exceptions in processing it
+  if (query.trim() === '') {
+    return [];
+  }
+
+  // Check whether this is a trace ID or traceQL query by checking if it only contains hex characters
+  const hexOnlyRegex = /^[0-9A-Fa-f]*$/;
+  if (query.trim().match(hexOnlyRegex)) {
+    return [];
+  }
+
+  const tree = parser.parse(query);
+
+  // Find all error nodes and compute the associated erro boundaries
+  const errorNodes: SyntaxNode[] = [];
+  tree.iterate({
+    enter: (nodeRef) => {
+      if (nodeRef.type.id === 0) {
+        errorNodes.push(nodeRef.node);
+      }
+    },
+  });
+
+  return errorNodes;
+};
+
+/**
+ * Use red markers (squiggles) to highlight syntax errors in queries.
+ *
+ */
+export const setMarkers = (
+  monaco: typeof monacoTypes,
+  model: monacoTypes.editor.ITextModel,
+  errorNodes: SyntaxNode[]
+) => {
+  const markers = [
+    ...getErrorMarkers(monaco.MarkerSeverity.Error, model, errorNodes),
+    ...getWarningMarkers(monaco.MarkerSeverity.Warning, model),
+  ];
+  monaco.editor.setModelMarkers(
+    model,
+    'owner', // default value
+    markers
+  );
+};
+
+export const getErrorMarkers = (severity: number, model: monacoTypes.editor.ITextModel, errorNodes: SyntaxNode[]) => {
+  return errorNodes.map((errorNode) => {
+    const message = computeErrorMessage(errorNode);
+    return getMarker(severity, message, model, errorNode.from, errorNode.to);
+  });
+};
+
+export const getWarningMarkers = (severity: number, model: monacoTypes.editor.ITextModel) => {
+  let markers = [];
+
+  // Check if there are issues that should result in a warning marker
+  const text = model.getValue();
+  const tree = parser.parse(text);
+  const indexOfDot = text.indexOf('.');
+  if (indexOfDot > -1) {
+    const cur = tree.cursorAt(0);
+    do {
+      const { node } = cur;
+      if (node.type.id === Identifier) {
+        // Make sure prevSibling is using the proper scope
+        if (
+          node.prevSibling?.type.id !== Parent &&
+          node.prevSibling?.type.id !== Resource &&
+          node.prevSibling?.type.id !== Span
+        ) {
+          const from = node.prevSibling ? node.prevSibling.from : node.from - 1;
+          const to = node.prevSibling ? node.prevSibling.to : node.from - 1;
+          const message = 'Add resource or span scope to attribute to improve query performance.';
+          markers.push(getMarker(severity, message, model, from, to));
+        }
+      }
+    } while (cur.next());
+  }
+
+  return markers;
+};
+
+export const getMarker = (
+  severity: number,
+  message: string,
+  model: monacoTypes.editor.ITextModel,
+  from: number,
+  to: number
+) => {
+  let startLine = 0;
+  let endLine = 0;
+  let start = from;
+  let end = to;
+
+  while (start > 0) {
+    startLine++;
+    start -= model.getLineLength(startLine) + 1; // new lines don't count for getLineLength() but they still count as a character for the parser
+  }
+  while (end > 0) {
+    endLine++;
+    end -= model.getLineLength(endLine) + 1;
+  }
+
+  return {
+    message,
+    severity,
+
+    startLineNumber: startLine,
+    endLineNumber: endLine,
+
+    // `+ 2` because of the above computations
+    startColumn: start + model.getLineLength(startLine) + 2,
+    endColumn: end + model.getLineLength(endLine) + 2,
+  };
+};
diff --git a/public/app/plugins/datasource/tempo/traceql/situation.ts b/public/app/plugins/datasource/tempo/traceql/situation.ts
index 3f1f6c8988f72..0e60d065f6bb4 100644
--- a/public/app/plugins/datasource/tempo/traceql/situation.ts
+++ b/public/app/plugins/datasource/tempo/traceql/situation.ts
@@ -14,10 +14,12 @@ import {
   Pipe,
   ScalarFilter,
   SelectArgs,
+  SelectOperation,
   SpansetFilter,
   SpansetPipeline,
   SpansetPipelineExpression,
   Static,
+  String as StringNode,
   TraceQL,
 } from '@grafana/lezer-traceql';
 
@@ -86,7 +88,7 @@ type Path = Array<[Direction, NodeType[]]>;
 
 type Resolver = {
   path: NodeType[];
-  fun: (node: SyntaxNode, text: string, pos: number, originalPos: number) => SituationType | null;
+  fun: (node: SyntaxNode, text: string, pos: number, originalPos: number) => SituationType | void;
 };
 
 function getErrorNode(tree: Tree, cursorPos: number): SyntaxNode | null {
@@ -178,7 +180,7 @@ export function getSituation(text: string, offset: number): Situation | null {
     ids.push(cur.type.id);
   }
 
-  let situationType: SituationType | null = null;
+  let situationType: SituationType | void = undefined;
   for (let resolver of RESOLVERS) {
     if (isPathMatch(resolver.path, ids)) {
       situationType = resolver.fun(currentNode, text, shiftedOffset, offset);
@@ -202,9 +204,7 @@ const RESOLVERS: Resolver[] = [
   },
   {
     path: [ERROR_NODE_ID, SpansetFilter],
-    fun: () => ({
-      type: 'SPANSET_EXPRESSION_OPERATORS_WITH_MISSING_CLOSED_BRACE',
-    }),
+    fun: resolveSpansetWithNoClosedBrace,
   },
   {
     path: [ERROR_NODE_ID, Aggregate],
@@ -214,6 +214,14 @@ const RESOLVERS: Resolver[] = [
     path: [ERROR_NODE_ID, IntrinsicField],
     fun: resolveAttributeForFunction,
   },
+  {
+    path: [ERROR_NODE_ID, GroupOperation],
+    fun: resolveAttributeForFunction,
+  },
+  {
+    path: [ERROR_NODE_ID, SelectOperation],
+    fun: resolveAttributeForFunction,
+  },
   {
     path: [ERROR_NODE_ID, SpansetPipelineExpression],
     fun: resolveSpansetPipeline,
@@ -222,14 +230,6 @@ const RESOLVERS: Resolver[] = [
     path: [ERROR_NODE_ID, ScalarFilter, SpansetPipeline],
     fun: resolveArithmeticOperator,
   },
-  {
-    path: [ERROR_NODE_ID, TraceQL],
-    fun: () => {
-      return {
-        type: 'UNKNOWN',
-      };
-    },
-  },
   // Curson on valid node cases (the whole query could contain errors nevertheless)
   {
     path: [FieldExpression],
@@ -247,22 +247,45 @@ const RESOLVERS: Resolver[] = [
     path: [TraceQL],
     fun: resolveNewSpansetExpression,
   },
+  {
+    path: [StringNode, Static],
+    fun: resolveExpression,
+  },
 ];
 
 const resolveAttributeCompletion = (node: SyntaxNode, text: string, pos: number): SituationType | void => {
   // The user is completing an expression. We can take advantage of the fact that the Monaco editor is smart
   // enough to automatically detect that there are some characters before the cursor and to take them into
   // account when providing suggestions.
-  const endOfPathNode = walk(node, [['firstChild', [FieldExpression]]]);
-  if (endOfPathNode && text[pos - 1] !== ' ') {
-    const attributeFieldParent = walk(endOfPathNode, [['firstChild', [AttributeField]]]);
+  const getAttributeFieldUpToDot = (node: SyntaxNode) => {
+    const attributeFieldParent = walk(node, [['firstChild', [AttributeField]]]);
     const attributeFieldParentText = attributeFieldParent ? getNodeText(attributeFieldParent, text) : '';
     const indexOfDot = attributeFieldParentText.indexOf('.');
-    const attributeFieldUpToDot = attributeFieldParentText.slice(0, indexOfDot);
+    return attributeFieldParentText.slice(0, indexOfDot);
+  };
+
+  // If there is a space, for sure the attribute is completed and no suggestions to complete it should be provided
+  if (text[pos - 1] === ' ') {
+    return;
+  }
 
+  const endOfPathNode = walk(node, [['firstChild', [FieldExpression]]]);
+  if (endOfPathNode) {
     return {
       type: 'SPANSET_IN_NAME_SCOPE',
-      scope: attributeFieldUpToDot,
+      scope: getAttributeFieldUpToDot(endOfPathNode),
+    };
+  }
+
+  const endOfPathNode2 = walk(node, [
+    ['parent', [SpansetFilter]],
+    ['firstChild', [FieldExpression]],
+  ]);
+  // In this case, we also need to check the character at `pos`
+  if (endOfPathNode2 && text[pos] !== ' ') {
+    return {
+      type: 'SPANSET_IN_NAME_SCOPE',
+      scope: getAttributeFieldUpToDot(endOfPathNode2),
     };
   }
 };
@@ -336,8 +359,25 @@ function resolveExpression(node: SyntaxNode, text: string, _: number, originalPo
     return situation;
   }
 
+  if (
+    walk(node, [
+      ['parent', [Static]],
+      ['parent', [FieldExpression]],
+      ['prevSibling', [FieldOp]],
+    ])
+  ) {
+    let attributeField = node.parent?.parent?.prevSibling?.prevSibling;
+    if (attributeField) {
+      return {
+        type: 'SPANSET_IN_VALUE',
+        tagName: getNodeText(attributeField, text),
+        betweenQuotes: true,
+      };
+    }
+  }
+
   if (node.prevSibling?.type.id === FieldOp) {
-    let attributeField = node.prevSibling.prevSibling;
+    let attributeField = node.prevSibling?.prevSibling;
     if (attributeField) {
       return {
         type: 'SPANSET_IN_VALUE',
@@ -358,16 +398,12 @@ function resolveExpression(node: SyntaxNode, text: string, _: number, originalPo
   };
 }
 
-function resolveArithmeticOperator(node: SyntaxNode, _0: string, _1: number): SituationType {
-  if (node.prevSibling?.type.id === ComparisonOp) {
+function resolveArithmeticOperator(node: SyntaxNode, _0: string, _1: number): SituationType | void {
+  if (node.prevSibling?.type.id !== ComparisonOp) {
     return {
-      type: 'UNKNOWN',
+      type: 'SPANSET_COMPARISON_OPERATORS',
     };
   }
-
-  return {
-    type: 'SPANSET_COMPARISON_OPERATORS',
-  };
 }
 
 function resolveNewSpansetExpression(node: SyntaxNode, text: string, offset: number): SituationType {
@@ -393,16 +429,13 @@ function resolveNewSpansetExpression(node: SyntaxNode, text: string, offset: num
   };
 }
 
-function resolveAttributeForFunction(node: SyntaxNode, _0: string, _1: number): SituationType {
+function resolveAttributeForFunction(node: SyntaxNode, _0: string, _1: number): SituationType | void {
   const parent = node?.parent;
-  if (!!parent && [IntrinsicField, Aggregate, GroupOperation, SelectArgs].includes(parent.type.id)) {
+  if (!!parent && [IntrinsicField, Aggregate, GroupOperation, SelectOperation, SelectArgs].includes(parent.type.id)) {
     return {
       type: 'ATTRIBUTE_FOR_FUNCTION',
     };
   }
-  return {
-    type: 'UNKNOWN',
-  };
 }
 
 function resolveSpansetPipeline(node: SyntaxNode, _1: string, _2: number): SituationType {
@@ -415,3 +448,14 @@ function resolveSpansetPipeline(node: SyntaxNode, _1: string, _2: number): Situa
     type: 'NEW_SPANSET',
   };
 }
+
+function resolveSpansetWithNoClosedBrace(node: SyntaxNode, text: string, originalPos: number): SituationType {
+  const situation = resolveAttributeCompletion(node, text, originalPos);
+  if (situation) {
+    return situation;
+  }
+
+  return {
+    type: 'SPANSET_EXPRESSION_OPERATORS_WITH_MISSING_CLOSED_BRACE',
+  };
+}
diff --git a/public/app/plugins/datasource/tempo/traceql/traceql.ts b/public/app/plugins/datasource/tempo/traceql/traceql.ts
index 72bf3d0304e43..b2d23399da16a 100644
--- a/public/app/plugins/datasource/tempo/traceql/traceql.ts
+++ b/public/app/plugins/datasource/tempo/traceql/traceql.ts
@@ -24,10 +24,20 @@ export const languageConfiguration: languages.LanguageConfiguration = {
 };
 
 export const operators = ['=', '!=', '>', '<', '>=', '<=', '=~', '!~'];
+export const keywordOperators = ['=', '!='];
 export const stringOperators = ['=', '!=', '=~', '!~'];
 export const numberOperators = ['=', '!=', '>', '<', '>=', '<='];
 
-export const intrinsics = ['duration', 'kind', 'name', 'status'];
+export const intrinsics = [
+  'duration',
+  'kind',
+  'name',
+  'rootName',
+  'rootServiceName',
+  'status',
+  'statusMessage',
+  'traceDuration',
+];
 export const scopes: string[] = ['resource', 'span'];
 
 export const functions = ['avg', 'min', 'max', 'sum', 'count', 'by'];
@@ -36,7 +46,7 @@ const keywords = intrinsics.concat(scopes);
 
 const statusValues = ['ok', 'unset', 'error', 'false', 'true'];
 
-export const language: languages.IMonarchLanguage = {
+const language: languages.IMonarchLanguage = {
   ignoreCase: false,
   defaultToken: '',
   tokenPostfix: '.traceql',
@@ -54,21 +64,38 @@ export const language: languages.IMonarchLanguage = {
 
   tokenizer: {
     root: [
+      // comments
+      [/\/\/.*/, 'comment'], // line comment
+      [/\/\*.*\*\//, 'comment'], // block comment
+
       // durations
       [/[0-9]+(.[0-9]+)?(us|µs|ns|ms|s|m|h)/, 'number'],
 
       // trace ID
       [/^\s*[0-9A-Fa-f]+\s*$/, 'tag'],
 
-      // functions, keywords, predefined values
+      // keywords
       [
-        /[a-zA-Z_.]\w*/,
+        // match only predefined keywords
+        `(?:${keywords.join('|')})`,
         {
           cases: {
-            '@functions': 'predefined',
             '@keywords': 'keyword',
+            '@default': 'tag', // fallback, but should never happen
+          },
+        },
+      ],
+
+      // functions and predefined values
+      [
+        // Inside (double) quotes, all characters are allowed, with the exception of `\` and `"` that must be escaped (`\\` and `\"`).
+        // Outside quotes, some more characters are prohibited, such as `!` and `=`.
+        /(?:\w|^[^{}()=~!<>&|," ]|"(?:\\"|\\\\|[^\\"])*")+/,
+        {
+          cases: {
+            '@functions': 'predefined',
             '@statusValues': 'type',
-            '@default': 'tag',
+            '@default': 'tag', // fallback, used for tag names
           },
         },
       ],
@@ -76,8 +103,9 @@ export const language: languages.IMonarchLanguage = {
       // strings
       [/"([^"\\]|\\.)*$/, 'string.invalid'], // non-teminated string
       [/'([^'\\]|\\.)*$/, 'string.invalid'], // non-teminated string
-      [/"/, 'string', '@string_double'],
-      [/'/, 'string', '@string_single'],
+      [/([^\w])(")/, [{ token: '' }, { token: 'string', next: '@string_double' }]],
+      [/([^\w])(')/, [{ token: '' }, { token: 'string', next: '@string_single' }]],
+      [/([^\w])(`)/, [{ token: '' }, { token: 'string', next: '@string_back' }]],
 
       // delimiters and operators
       [/[{}()\[\]]/, 'delimiter.bracket'],
@@ -113,9 +141,17 @@ export const language: languages.IMonarchLanguage = {
       [/\\./, 'string.escape.invalid'],
       [/'/, 'string', '@pop'],
     ],
+
+    string_back: [
+      [/[^\\`]+/, 'string'],
+      [/@escapes/, 'string.escape'],
+      [/\\./, 'string.escape.invalid'],
+      [/`/, 'string', '@pop'],
+    ],
   },
 };
 
+// For "TraceQL" tab (Monarch editor for TraceQL)
 export const languageDefinition = {
   id: 'traceql',
   extensions: ['.traceql'],
@@ -127,9 +163,10 @@ export const languageDefinition = {
   },
 };
 
+// For "Search" tab (query builder)
 export const traceqlGrammar: Grammar = {
   comment: {
-    pattern: /#.*/,
+    pattern: /\/\/.*/,
   },
   'span-set': {
     pattern: /\{[^}]*}/,
diff --git a/public/app/plugins/datasource/tempo/tracking.test.ts b/public/app/plugins/datasource/tempo/tracking.test.ts
index bb939757e5f41..2066b71a623a3 100644
--- a/public/app/plugins/datasource/tempo/tracking.test.ts
+++ b/public/app/plugins/datasource/tempo/tracking.test.ts
@@ -17,39 +17,6 @@ jest.mock('@grafana/runtime', () => {
             grafanaVersion: 'v9.4.0',
             queries: {
               tempo: [
-                {
-                  datasource: { type: 'tempo', uid: 'abc' },
-                  queryType: 'nativeSearch',
-                  refId: 'A',
-                },
-                {
-                  datasource: { type: 'tempo', uid: 'abc' },
-                  queryType: 'nativeSearch',
-                  spanName: 'HTTP',
-                  refId: 'A',
-                },
-                {
-                  datasource: { type: 'tempo', uid: 'abc' },
-                  queryType: 'nativeSearch',
-                  spanName: '$var',
-                  refId: 'A',
-                },
-                {
-                  datasource: { type: 'tempo', uid: 'abc' },
-                  queryType: 'search',
-                  linkedQuery: {
-                    expr: '{}',
-                  },
-                  refId: 'A',
-                },
-                {
-                  datasource: { type: 'tempo', uid: 'abc' },
-                  queryType: 'search',
-                  linkedQuery: {
-                    expr: '{$var}',
-                  },
-                  refId: 'A',
-                },
                 {
                   datasource: { type: 'tempo', uid: 'abc' },
                   queryType: 'serviceMap',
@@ -100,14 +67,10 @@ describe('on dashboard loaded', () => {
       dashboard_id: 'dash',
       org_id: 1,
       traceql_query_count: 2,
-      search_query_count: 2,
       service_map_query_count: 2,
       upload_query_count: 1,
-      native_search_query_count: 3,
       traceql_queries_with_template_variables_count: 1,
-      search_queries_with_template_variables_count: 1,
       service_map_queries_with_template_variables_count: 1,
-      native_search_queries_with_template_variables_count: 1,
     });
   });
 });
diff --git a/public/app/plugins/datasource/tempo/tracking.ts b/public/app/plugins/datasource/tempo/tracking.ts
index e27d90f507183..e5833a5c4248a 100644
--- a/public/app/plugins/datasource/tempo/tracking.ts
+++ b/public/app/plugins/datasource/tempo/tracking.ts
@@ -8,13 +8,9 @@ type TempoOnDashboardLoadedTrackingEvent = {
   grafana_version?: string;
   dashboard_id?: string;
   org_id?: number;
-  native_search_query_count: number;
-  search_query_count: number;
   service_map_query_count: number;
   traceql_query_count: number;
   upload_query_count: number;
-  native_search_queries_with_template_variables_count: number;
-  search_queries_with_template_variables_count: number;
   service_map_queries_with_template_variables_count: number;
   traceql_queries_with_template_variables_count: number;
 };
@@ -33,13 +29,9 @@ export const onDashboardLoadedHandler = ({
       grafana_version: grafanaVersion,
       dashboard_id: dashboardId,
       org_id: orgId,
-      native_search_query_count: 0,
-      search_query_count: 0,
       service_map_query_count: 0,
       traceql_query_count: 0,
       upload_query_count: 0,
-      native_search_queries_with_template_variables_count: 0,
-      search_queries_with_template_variables_count: 0,
       service_map_queries_with_template_variables_count: 0,
       traceql_queries_with_template_variables_count: 0,
     };
@@ -49,23 +41,7 @@ export const onDashboardLoadedHandler = ({
         continue;
       }
 
-      if (query.queryType === 'nativeSearch') {
-        stats.native_search_query_count++;
-        if (
-          (query.serviceName && hasTemplateVariables(query.serviceName)) ||
-          (query.spanName && hasTemplateVariables(query.spanName)) ||
-          (query.search && hasTemplateVariables(query.search)) ||
-          (query.minDuration && hasTemplateVariables(query.minDuration)) ||
-          (query.maxDuration && hasTemplateVariables(query.maxDuration))
-        ) {
-          stats.native_search_queries_with_template_variables_count++;
-        }
-      } else if (query.queryType === 'search') {
-        stats.search_query_count++;
-        if (query.linkedQuery && query.linkedQuery.expr && hasTemplateVariables(query.linkedQuery.expr)) {
-          stats.search_queries_with_template_variables_count++;
-        }
-      } else if (query.queryType === 'serviceMap') {
+      if (query.queryType === 'serviceMap') {
         stats.service_map_query_count++;
         if (query.serviceMapQuery && hasTemplateVariables(query.serviceMapQuery)) {
           stats.service_map_queries_with_template_variables_count++;
@@ -86,6 +62,6 @@ export const onDashboardLoadedHandler = ({
   }
 };
 
-const hasTemplateVariables = (val?: string): boolean => {
-  return getTemplateSrv().containsTemplate(val);
+const hasTemplateVariables = (val?: string | string[]): boolean => {
+  return (Array.isArray(val) ? val : [val]).some((v) => getTemplateSrv().containsTemplate(v));
 };
diff --git a/public/app/plugins/datasource/tempo/tsconfig.json b/public/app/plugins/datasource/tempo/tsconfig.json
new file mode 100644
index 0000000000000..6dc8a770cba07
--- /dev/null
+++ b/public/app/plugins/datasource/tempo/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "types": ["node", "jest", "@testing-library/jest-dom"]
+  },
+  "extends": "@grafana/plugin-configs/tsconfig.json",
+  "include": ["."]
+}
diff --git a/public/app/plugins/datasource/tempo/types.ts b/public/app/plugins/datasource/tempo/types.ts
index a888b650bc12f..09c31e05b9387 100644
--- a/public/app/plugins/datasource/tempo/types.ts
+++ b/public/app/plugins/datasource/tempo/types.ts
@@ -1,20 +1,8 @@
 import { DataSourceJsonData } from '@grafana/data/src';
-import { NodeGraphOptions } from 'app/core/components/NodeGraphSettings';
-import { TraceToLogsOptions } from 'app/core/components/TraceToLogs/TraceToLogsSettings';
-
-import { LokiQuery } from '../loki/types';
+import { NodeGraphOptions, TraceToLogsOptions } from '@grafana/o11y-ds-frontend';
 
 import { TempoQuery as TempoBase, TempoQueryType, TraceqlFilter } from './dataquery.gen';
 
-export interface SearchQueryParams {
-  minDuration?: string;
-  maxDuration?: string;
-  limit?: number;
-  tags?: string;
-  start?: number;
-  end?: number;
-}
-
 export interface TempoJsonData extends DataSourceJsonData {
   tracesToLogs?: TraceToLogsOptions;
   serviceMap?: {
@@ -25,9 +13,6 @@ export interface TempoJsonData extends DataSourceJsonData {
     filters?: TraceqlFilter[];
   };
   nodeGraph?: NodeGraphOptions;
-  lokiSearch?: {
-    datasourceUid?: string;
-  };
   spanBar?: {
     tag: string;
   };
@@ -39,9 +24,6 @@ export interface TempoJsonData extends DataSourceJsonData {
 }
 
 export interface TempoQuery extends TempoBase {
-  // Query to find list of traces, e.g., via Loki
-  // TODO change this field to the schema type when LokiQuery exists in the schema
-  linkedQuery?: LokiQuery;
   queryType: TempoQueryType;
 }
 
@@ -55,7 +37,7 @@ export type TraceSearchMetadata = {
   rootTraceName: string;
   startTimeUnixNano?: string;
   durationMs?: number;
-  spanSet?: Spanset;
+  spanSet?: Spanset; // deprecated in Tempo, https://github.com/grafana/tempo/blob/3cc44fca03ba7d676dc77da6a18b8222546ede3c/docs/sources/tempo/api_docs/_index.md?plain=1#L619
   spanSets?: Spanset[];
 };
 
@@ -121,3 +103,32 @@ export type Scope = {
   name: string;
   tags: string[];
 };
+
+// Maps to QueryRangeResponse of tempopb https://github.com/grafana/tempo/blob/cfda98fc5cb0777963f41e0949b9ad2d24b4b5b8/pkg/tempopb/tempo.proto#L360
+export type TraceqlMetricsResponse = {
+  series: MetricsSeries[];
+  metrics: SearchMetrics;
+};
+
+export type MetricsSeries = {
+  labels: MetricsSeriesLabel[];
+  samples: MetricsSeriesSample[];
+  promLabels: string;
+};
+
+export type MetricsSeriesLabel = {
+  key: string;
+  value: ProtoValue;
+};
+
+export type ProtoValue = {
+  stringValue?: string;
+  intValue?: string;
+  boolValue?: boolean;
+  doubleValue?: string;
+};
+
+export type MetricsSeriesSample = {
+  timestampMs: string;
+  value: number;
+};
diff --git a/public/app/plugins/datasource/tempo/utils.test.ts b/public/app/plugins/datasource/tempo/utils.test.ts
new file mode 100644
index 0000000000000..65f40f781662b
--- /dev/null
+++ b/public/app/plugins/datasource/tempo/utils.test.ts
@@ -0,0 +1,51 @@
+import { TempoQuery } from './types';
+import { migrateFromSearchToTraceQLSearch } from './utils';
+
+describe('utils', () => {
+  it('migrateFromSearchToTraceQLSearch correctly updates the query', async () => {
+    const query: TempoQuery = {
+      refId: 'A',
+      filters: [],
+      queryType: 'nativeSearch',
+      serviceName: 'frontend',
+      spanName: 'http.server',
+      minDuration: '1s',
+      maxDuration: '10s',
+      search: 'component="net/http" datasource.type="tempo"',
+    };
+
+    const migratedQuery = migrateFromSearchToTraceQLSearch(query);
+    expect(migratedQuery.queryType).toBe('traceqlSearch');
+    expect(migratedQuery.filters.length).toBe(7);
+    expect(migratedQuery.filters[0].scope).toBe('span');
+    expect(migratedQuery.filters[0].tag).toBe('name');
+    expect(migratedQuery.filters[0].operator).toBe('=');
+    expect(migratedQuery.filters[0].value![0]).toBe('http.server');
+    expect(migratedQuery.filters[0].valueType).toBe('string');
+    expect(migratedQuery.filters[1].scope).toBe('resource');
+    expect(migratedQuery.filters[1].tag).toBe('service.name');
+    expect(migratedQuery.filters[1].operator).toBe('=');
+    expect(migratedQuery.filters[1].value![0]).toBe('frontend');
+    expect(migratedQuery.filters[1].valueType).toBe('string');
+    expect(migratedQuery.filters[2].id).toBe('duration-type');
+    expect(migratedQuery.filters[2].value).toBe('trace');
+    expect(migratedQuery.filters[3].tag).toBe('duration');
+    expect(migratedQuery.filters[3].operator).toBe('>');
+    expect(migratedQuery.filters[3].value![0]).toBe('1s');
+    expect(migratedQuery.filters[3].valueType).toBe('duration');
+    expect(migratedQuery.filters[4].tag).toBe('duration');
+    expect(migratedQuery.filters[4].operator).toBe('<');
+    expect(migratedQuery.filters[4].value![0]).toBe('10s');
+    expect(migratedQuery.filters[4].valueType).toBe('duration');
+    expect(migratedQuery.filters[5].scope).toBe('unscoped');
+    expect(migratedQuery.filters[5].tag).toBe('component');
+    expect(migratedQuery.filters[5].operator).toBe('=');
+    expect(migratedQuery.filters[5].value![0]).toBe('net/http');
+    expect(migratedQuery.filters[5].valueType).toBe('string');
+    expect(migratedQuery.filters[6].scope).toBe('unscoped');
+    expect(migratedQuery.filters[6].tag).toBe('datasource.type');
+    expect(migratedQuery.filters[6].operator).toBe('=');
+    expect(migratedQuery.filters[6].value![0]).toBe('tempo');
+    expect(migratedQuery.filters[6].valueType).toBe('string');
+  });
+});
diff --git a/public/app/plugins/datasource/tempo/utils.ts b/public/app/plugins/datasource/tempo/utils.ts
index 1e138747e8a89..f23b77f3e57c8 100644
--- a/public/app/plugins/datasource/tempo/utils.ts
+++ b/public/app/plugins/datasource/tempo/utils.ts
@@ -1,6 +1,10 @@
 import { DataSourceApi } from '@grafana/data';
 import { getDataSourceSrv } from '@grafana/runtime';
 
+import { generateId } from './SearchTraceQLEditor/TagsInput';
+import { TraceqlFilter, TraceqlSearchScope } from './dataquery.gen';
+import { TempoQuery } from './types';
+
 export const getErrorMessage = (message: string | undefined, prefix?: string) => {
   const err = message ? ` (${message})` : '';
   let errPrefix = prefix ? prefix : 'Error';
@@ -20,3 +24,78 @@ export async function getDS(uid?: string): Promise<DataSourceApi | undefined> {
     return undefined;
   }
 }
+
+export const migrateFromSearchToTraceQLSearch = (query: TempoQuery) => {
+  let filters: TraceqlFilter[] = [];
+  if (query.spanName) {
+    filters.push({
+      id: 'span-name',
+      scope: TraceqlSearchScope.Span,
+      tag: 'name',
+      operator: '=',
+      value: [query.spanName],
+      valueType: 'string',
+    });
+  }
+  if (query.serviceName) {
+    filters.push({
+      id: 'service-name',
+      scope: TraceqlSearchScope.Resource,
+      tag: 'service.name',
+      operator: '=',
+      value: [query.serviceName],
+      valueType: 'string',
+    });
+  }
+  if (query.minDuration || query.maxDuration) {
+    filters.push({
+      id: 'duration-type',
+      value: 'trace',
+    });
+  }
+  if (query.minDuration) {
+    filters.push({
+      id: 'min-duration',
+      tag: 'duration',
+      operator: '>',
+      value: [query.minDuration],
+      valueType: 'duration',
+    });
+  }
+  if (query.maxDuration) {
+    filters.push({
+      id: 'max-duration',
+      tag: 'duration',
+      operator: '<',
+      value: [query.maxDuration],
+      valueType: 'duration',
+    });
+  }
+  if (query.search) {
+    const tags = query.search.split(' ');
+    for (const tag of tags) {
+      const [key, value] = tag.split('=');
+      if (key && value) {
+        filters.push({
+          id: generateId(),
+          scope: TraceqlSearchScope.Unscoped,
+          tag: key,
+          operator: '=',
+          value: [value.replace(/(^"|"$)/g, '')], // remove quotes at start and end of string
+          valueType: value.startsWith('"') && value.endsWith('"') ? 'string' : undefined,
+        });
+      }
+    }
+  }
+
+  const migratedQuery: TempoQuery = {
+    datasource: query.datasource,
+    filters,
+    groupBy: query.groupBy,
+    limit: query.limit,
+    query: query.query,
+    queryType: 'traceqlSearch',
+    refId: query.refId,
+  };
+  return migratedQuery;
+};
diff --git a/public/app/plugins/datasource/tempo/webpack.config.ts b/public/app/plugins/datasource/tempo/webpack.config.ts
new file mode 100644
index 0000000000000..4da5a990cfa57
--- /dev/null
+++ b/public/app/plugins/datasource/tempo/webpack.config.ts
@@ -0,0 +1,3 @@
+import config from '@grafana/plugin-configs/webpack.config';
+
+export default config;
diff --git a/public/app/plugins/datasource/zipkin/CHANGELOG.md b/public/app/plugins/datasource/zipkin/CHANGELOG.md
new file mode 100644
index 0000000000000..825c32f0d03d9
--- /dev/null
+++ b/public/app/plugins/datasource/zipkin/CHANGELOG.md
@@ -0,0 +1 @@
+# Changelog
diff --git a/public/app/plugins/datasource/zipkin/ConfigEditor.tsx b/public/app/plugins/datasource/zipkin/ConfigEditor.tsx
index f0447ff486dbf..3bd0a07632871 100644
--- a/public/app/plugins/datasource/zipkin/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/zipkin/ConfigEditor.tsx
@@ -3,13 +3,9 @@ import React from 'react';
 
 import { DataSourcePluginOptionsEditorProps, GrafanaTheme2 } from '@grafana/data';
 import { ConfigSection, DataSourceDescription } from '@grafana/experimental';
+import { NodeGraphSection, SpanBarSection, TraceToLogsSection, TraceToMetricsSection } from '@grafana/o11y-ds-frontend';
 import { config } from '@grafana/runtime';
-import { DataSourceHttpSettings, useStyles2 } from '@grafana/ui';
-import { Divider } from 'app/core/components/Divider';
-import { NodeGraphSection } from 'app/core/components/NodeGraphSettings';
-import { TraceToLogsSection } from 'app/core/components/TraceToLogs/TraceToLogsSettings';
-import { TraceToMetricsSection } from 'app/core/components/TraceToMetrics/TraceToMetricsSettings';
-import { SpanBarSection } from 'app/features/explore/TraceView/components/settings/SpanBarSettings';
+import { DataSourceHttpSettings, useStyles2, Divider, Stack } from '@grafana/ui';
 
 export type Props = DataSourcePluginOptionsEditorProps;
 
@@ -24,7 +20,7 @@ export const ConfigEditor = ({ options, onOptionsChange }: Props) => {
         hasRequiredFields={false}
       />
 
-      <Divider />
+      <Divider spacing={4} />
 
       <DataSourceHttpSettings
         defaultUrl="http://localhost:9411"
@@ -35,15 +31,10 @@ export const ConfigEditor = ({ options, onOptionsChange }: Props) => {
       />
 
       <TraceToLogsSection options={options} onOptionsChange={onOptionsChange} />
+      <Divider spacing={4} />
 
-      <Divider />
-
-      {config.featureToggles.traceToMetrics ? (
-        <>
-          <TraceToMetricsSection options={options} onOptionsChange={onOptionsChange} />
-          <Divider />
-        </>
-      ) : null}
+      <TraceToMetricsSection options={options} onOptionsChange={onOptionsChange} />
+      <Divider spacing={4} />
 
       <ConfigSection
         title="Additional settings"
@@ -51,9 +42,10 @@ export const ConfigEditor = ({ options, onOptionsChange }: Props) => {
         isCollapsible={true}
         isInitiallyOpen={false}
       >
-        <NodeGraphSection options={options} onOptionsChange={onOptionsChange} />
-        <Divider hideLine={true} />
-        <SpanBarSection options={options} onOptionsChange={onOptionsChange} />
+        <Stack gap={5} direction="column">
+          <NodeGraphSection options={options} onOptionsChange={onOptionsChange} />
+          <SpanBarSection options={options} onOptionsChange={onOptionsChange} />
+        </Stack>
       </ConfigSection>
     </div>
   );
diff --git a/public/app/plugins/datasource/zipkin/QueryField.test.tsx b/public/app/plugins/datasource/zipkin/QueryField.test.tsx
index 059c013d74621..ee8c90b6a56cc 100644
--- a/public/app/plugins/datasource/zipkin/QueryField.test.tsx
+++ b/public/app/plugins/datasource/zipkin/QueryField.test.tsx
@@ -37,7 +37,7 @@ describe('useServices', () => {
       },
     } as ZipkinDatasource;
 
-    const { result } = renderHook(() => useServices(ds));
+    const { result } = renderHook(() => useServices(ds, () => {}));
     await waitFor(() => {
       expect(result.current.value).toEqual([
         { label: 'service1', value: 'service1', isLeaf: false },
@@ -62,7 +62,7 @@ describe('useLoadOptions', () => {
       },
     } as ZipkinDatasource;
 
-    const { result } = renderHook(() => useLoadOptions(ds));
+    const { result } = renderHook(() => useLoadOptions(ds, () => {}));
     expect(result.current.allOptions).toEqual({});
 
     act(() => {
diff --git a/public/app/plugins/datasource/zipkin/QueryField.tsx b/public/app/plugins/datasource/zipkin/QueryField.tsx
index df9a83970e8c7..40e04968c6088 100644
--- a/public/app/plugins/datasource/zipkin/QueryField.tsx
+++ b/public/app/plugins/datasource/zipkin/QueryField.tsx
@@ -5,6 +5,7 @@ import { useAsyncFn, useMount, useMountedState } from 'react-use';
 import { AsyncState } from 'react-use/lib/useAsyncFn';
 
 import { GrafanaTheme2, QueryEditorProps } from '@grafana/data';
+import { TemporaryAlert } from '@grafana/o11y-ds-frontend';
 import {
   ButtonCascader,
   CascaderOption,
@@ -19,9 +20,6 @@ import {
   HorizontalGroup,
   Button,
 } from '@grafana/ui';
-import { notifyApp } from 'app/core/actions';
-import { createErrorNotification } from 'app/core/copy/appNotification';
-import { dispatch } from 'app/store/store';
 
 import { apiPrefix } from './constants';
 import { ZipkinDatasource } from './datasource';
@@ -40,10 +38,11 @@ const getStyles = (theme: GrafanaTheme2) => {
 
 export const ZipkinQueryField = ({ query, onChange, onRunQuery, datasource }: Props) => {
   const [uploadModalOpen, setUploadModalOpen] = useState(false);
-  const serviceOptions = useServices(datasource);
+  const [alertText, setAlertText] = useState('');
+  const serviceOptions = useServices(datasource, setAlertText);
   const theme = useTheme2();
   const styles = useStyles2(getStyles);
-  const { onLoadOptions, allOptions } = useLoadOptions(datasource);
+  const { onLoadOptions, allOptions } = useLoadOptions(datasource, setAlertText);
 
   const onSelectTrace = useCallback(
     (values: string[], selectedOptions: CascaderOption[]) => {
@@ -138,12 +137,16 @@ export const ZipkinQueryField = ({ query, onChange, onRunQuery, datasource }: Pr
           </div>
         </InlineFieldRow>
       )}
+      {alertText && <TemporaryAlert text={alertText} severity={'error'} />}
     </>
   );
 };
 
 // Exported for tests
-export function useServices(datasource: ZipkinDatasource): AsyncState<CascaderOption[]> {
+export function useServices(
+  datasource: ZipkinDatasource,
+  setErrorText: (text: string) => void
+): AsyncState<CascaderOption[]> {
   const url = `${apiPrefix}/services`;
 
   const [servicesOptions, fetch] = useAsyncFn(async (): Promise<CascaderOption[]> => {
@@ -159,7 +162,8 @@ export function useServices(datasource: ZipkinDatasource): AsyncState<CascaderOp
       return [];
     } catch (error) {
       const errorToShow = error instanceof Error ? error : 'An unknown error occurred';
-      dispatch(notifyApp(createErrorNotification('Failed to load services from Zipkin', errorToShow)));
+      const errorText = `Failed to load spans from Zipkin: ${errorToShow.toString()}`;
+      setErrorText(errorText);
       throw error;
     }
   }, [datasource]);
@@ -181,9 +185,9 @@ type OptionsState = {
 };
 
 // Exported for tests
-export function useLoadOptions(datasource: ZipkinDatasource) {
+export function useLoadOptions(datasource: ZipkinDatasource, setErrorText: (text: string) => void) {
   const isMounted = useMountedState();
-  const [allOptions, setAllOptions] = useState({} as OptionsState);
+  const [allOptions, setAllOptions] = useState<OptionsState>({});
 
   const [, fetchSpans] = useAsyncFn(
     async function findSpans(service: string): Promise<void> {
@@ -204,7 +208,8 @@ export function useLoadOptions(datasource: ZipkinDatasource) {
         }
       } catch (error) {
         const errorToShow = error instanceof Error ? error : 'An unknown error occurred';
-        dispatch(notifyApp(createErrorNotification('Failed to load spans from Zipkin', errorToShow)));
+        const errorText = `Failed to load spans from Zipkin: ${errorToShow.toString()}`;
+        setErrorText(errorText);
         throw error;
       }
     },
@@ -246,7 +251,8 @@ export function useLoadOptions(datasource: ZipkinDatasource) {
         }
       } catch (error) {
         const errorToShow = error instanceof Error ? error : 'An unknown error occurred';
-        dispatch(notifyApp(createErrorNotification('Failed to load spans from Zipkin', errorToShow)));
+        const errorText = `Failed to load spans from Zipkin: ${errorToShow.toString()}`;
+        setErrorText(errorText);
         throw error;
       }
     },
diff --git a/public/app/plugins/datasource/zipkin/README.md b/public/app/plugins/datasource/zipkin/README.md
index a4d81d38b1d60..8a14e3051bea4 100644
--- a/public/app/plugins/datasource/zipkin/README.md
+++ b/public/app/plugins/datasource/zipkin/README.md
@@ -1,7 +1,3 @@
-# Zipkin Data Source - Native Plugin
+# Grafana Zipkin Data Source - Native Plugin
 
-Grafana ships with **built in** support for Zipkin, an open source, distributed tracing system.
-
-Read more about it here:
-
-[https://docs.grafana.org/datasources/zipkin/](https://docs.grafana.org/datasources/zipkin/)
+Grafana plugin for the Zipkin data source. [https://docs.grafana.org/datasources/zipkin/](Read more about it here).
diff --git a/public/app/plugins/datasource/zipkin/datasource.test.ts b/public/app/plugins/datasource/zipkin/datasource.test.ts
index 99cb2ff5a1c06..10bafa53ad61b 100644
--- a/public/app/plugins/datasource/zipkin/datasource.test.ts
+++ b/public/app/plugins/datasource/zipkin/datasource.test.ts
@@ -2,14 +2,15 @@ import { lastValueFrom, of } from 'rxjs';
 import { createFetchResponse } from 'test/helpers/createFetchResponse';
 
 import { DataQueryRequest, DataSourceInstanceSettings, DataSourcePluginMeta, FieldType } from '@grafana/data';
-import { TemplateSrv } from '@grafana/runtime';
-import { backendSrv } from 'app/core/services/backend_srv';
+import { BackendSrv, TemplateSrv } from '@grafana/runtime';
 
 import { ZipkinDatasource } from './datasource';
 import mockJson from './mockJsonResponse.json';
 import { ZipkinQuery, ZipkinSpan } from './types';
 import { traceFrameFields, zipkinResponse } from './utils/testData';
 
+export const backendSrv = { fetch: jest.fn() } as unknown as BackendSrv;
+
 jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
   getBackendSrv: () => backendSrv,
diff --git a/public/app/plugins/datasource/zipkin/datasource.ts b/public/app/plugins/datasource/zipkin/datasource.ts
index 01e525f0e34fc..0a20d631cc1d5 100644
--- a/public/app/plugins/datasource/zipkin/datasource.ts
+++ b/public/app/plugins/datasource/zipkin/datasource.ts
@@ -10,12 +10,10 @@ import {
   FieldType,
   createDataFrame,
   ScopedVars,
+  urlUtil,
 } from '@grafana/data';
+import { NodeGraphOptions, SpanBarOptions } from '@grafana/o11y-ds-frontend';
 import { BackendSrvRequest, FetchResponse, getBackendSrv, getTemplateSrv, TemplateSrv } from '@grafana/runtime';
-import { NodeGraphOptions } from 'app/core/components/NodeGraphSettings';
-import { SpanBarOptions } from 'app/features/explore/TraceView/components';
-
-import { serializeParams } from '../../../core/utils/fetch';
 
 import { apiPrefix } from './constants';
 import { ZipkinQuery, ZipkinSpan } from './types';
@@ -62,7 +60,7 @@ export class ZipkinDatasource extends DataSourceApi<ZipkinQuery, ZipkinJsonData>
     return of(emptyDataQueryResponse);
   }
 
-  async metadataRequest(url: string, params?: Record<string, any>): Promise<any> {
+  async metadataRequest(url: string, params?: Record<string, unknown>) {
     const res = await lastValueFrom(this.request(url, params, { hideFromInspector: true }));
     return res.data;
   }
@@ -101,10 +99,10 @@ export class ZipkinDatasource extends DataSourceApi<ZipkinQuery, ZipkinJsonData>
 
   private request<T = any>(
     apiUrl: string,
-    data?: any,
+    data?: unknown,
     options?: Partial<BackendSrvRequest>
   ): Observable<FetchResponse<T>> {
-    const params = data ? serializeParams(data) : '';
+    const params = data ? urlUtil.serializeParams(data) : '';
     const url = `${this.instanceSettings.url}${apiUrl}${params.length ? `?${params}` : ''}`;
     const req = {
       ...options,
diff --git a/public/app/plugins/datasource/zipkin/package.json b/public/app/plugins/datasource/zipkin/package.json
new file mode 100644
index 0000000000000..bd16a106e8c02
--- /dev/null
+++ b/public/app/plugins/datasource/zipkin/package.json
@@ -0,0 +1,38 @@
+{
+  "name": "@grafana-plugins/zipkin",
+  "description": "Zipkin plugin for Grafana",
+  "private": true,
+  "version": "11.0.0",
+  "dependencies": {
+    "@emotion/css": "11.11.2",
+    "@grafana/data": "workspace:*",
+    "@grafana/experimental": "1.7.10",
+    "@grafana/o11y-ds-frontend": "workspace:*",
+    "@grafana/runtime": "workspace:*",
+    "@grafana/ui": "workspace:*",
+    "lodash": "4.17.21",
+    "react": "18.2.0",
+    "react-use": "17.5.0",
+    "rxjs": "7.8.1",
+    "tslib": "2.6.2"
+  },
+  "devDependencies": {
+    "@grafana/plugin-configs": "workspace:*",
+    "@testing-library/jest-dom": "6.4.2",
+    "@testing-library/react": "14.2.2",
+    "@types/jest": "29.5.12",
+    "@types/lodash": "4.17.0",
+    "@types/react": "18.2.73",
+    "ts-node": "10.9.2",
+    "webpack": "5.91.0"
+  },
+  "peerDependencies": {
+    "@grafana/runtime": "*"
+  },
+  "scripts": {
+    "build": "webpack -c ./webpack.config.ts --env production",
+    "build:commit": "webpack -c ./webpack.config.ts --env production --env commit=$(git rev-parse --short HEAD)",
+    "dev": "webpack -w -c ./webpack.config.ts --env development"
+  },
+  "packageManager": "yarn@3.6.0"
+}
diff --git a/public/app/plugins/datasource/zipkin/plugin.json b/public/app/plugins/datasource/zipkin/plugin.json
index 74bb006ff8dbb..9437ecd76d957 100644
--- a/public/app/plugins/datasource/zipkin/plugin.json
+++ b/public/app/plugins/datasource/zipkin/plugin.json
@@ -26,6 +26,10 @@
         "name": "Learn more",
         "url": "https://zipkin.io"
       }
-    ]
+    ],
+    "version": "%VERSION%"
+  },
+  "dependencies": {
+    "grafanaDependency": ">=10.3.0-0"
   }
 }
diff --git a/public/app/plugins/datasource/zipkin/tsconfig.json b/public/app/plugins/datasource/zipkin/tsconfig.json
new file mode 100644
index 0000000000000..6dc8a770cba07
--- /dev/null
+++ b/public/app/plugins/datasource/zipkin/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "types": ["node", "jest", "@testing-library/jest-dom"]
+  },
+  "extends": "@grafana/plugin-configs/tsconfig.json",
+  "include": ["."]
+}
diff --git a/public/app/plugins/datasource/zipkin/utils/graphTransform.ts b/public/app/plugins/datasource/zipkin/utils/graphTransform.ts
index 03e441b97b9a3..f67ec7e892937 100644
--- a/public/app/plugins/datasource/zipkin/utils/graphTransform.ts
+++ b/public/app/plugins/datasource/zipkin/utils/graphTransform.ts
@@ -1,6 +1,6 @@
 import { DataFrame, NodeGraphDataFrameFieldNames as Fields } from '@grafana/data';
+import { getNonOverlappingDuration, getStats, makeFrames, makeSpanMap } from '@grafana/o11y-ds-frontend';
 
-import { getNonOverlappingDuration, getStats, makeFrames, makeSpanMap } from '../../../../core/utils/tracing';
 import { ZipkinSpan } from '../types';
 
 interface Node {
diff --git a/public/app/plugins/datasource/zipkin/webpack.config.ts b/public/app/plugins/datasource/zipkin/webpack.config.ts
new file mode 100644
index 0000000000000..4da5a990cfa57
--- /dev/null
+++ b/public/app/plugins/datasource/zipkin/webpack.config.ts
@@ -0,0 +1,3 @@
+import config from '@grafana/plugin-configs/webpack.config';
+
+export default config;
diff --git a/public/app/plugins/gen.go b/public/app/plugins/gen.go
index faf6037d8ea10..9d1d9bb691c0e 100644
--- a/public/app/plugins/gen.go
+++ b/public/app/plugins/gen.go
@@ -14,13 +14,9 @@ import (
 	"strings"
 
 	"github.com/grafana/codejen"
-	"github.com/grafana/kindsys"
-
 	corecodegen "github.com/grafana/grafana/pkg/codegen"
-	"github.com/grafana/grafana/pkg/cuectx"
 	"github.com/grafana/grafana/pkg/plugins/codegen"
 	"github.com/grafana/grafana/pkg/plugins/pfs"
-	"github.com/grafana/thema"
 )
 
 var skipPlugins = map[string]bool{
@@ -41,30 +37,20 @@ func main() {
 		log.Fatal(fmt.Errorf("could not get working directory: %s", err))
 	}
 	groot := filepath.Clean(filepath.Join(cwd, "../../.."))
-	rt := cuectx.GrafanaThemaRuntime()
 
 	pluginKindGen := codejen.JennyListWithNamer(func(d *pfs.PluginDecl) string {
 		return d.PluginMeta.Id
 	})
 
 	pluginKindGen.Append(
-		codegen.PluginTreeListJenny(),
+		&codegen.PluginRegistryJenny{},
 		codegen.PluginGoTypesJenny("pkg/tsdb"),
-		codegen.PluginTSTypesJenny("public/app/plugins", adaptToPipeline(corecodegen.TSTypesJenny{})),
-		kind2pd(rt, corecodegen.DocsJenny(
-			filepath.Join("docs", "sources", "developers", "kinds", "composable"),
-		)),
-		codegen.PluginTSEachMajor(rt),
+		codegen.PluginTSTypesJenny("public/app/plugins"),
 	)
 
-	schifs := kindsys.SchemaInterfaces(rt.Context())
-	schifnames := make([]string, 0, len(schifs))
-	for _, schif := range schifs {
-		schifnames = append(schifnames, strings.ToLower(schif.Name()))
-	}
-	pluginKindGen.AddPostprocessors(corecodegen.SlashHeaderMapper("public/app/plugins/gen.go"), splitSchiffer(schifnames))
+	pluginKindGen.AddPostprocessors(corecodegen.SlashHeaderMapper("public/app/plugins/gen.go"), splitSchiffer())
 
-	declParser := pfs.NewDeclParser(rt, skipPlugins)
+	declParser := pfs.NewDeclParser(skipPlugins)
 	decls, err := declParser.Parse(os.DirFS(cwd))
 	if err != nil {
 		log.Fatalln(fmt.Errorf("parsing plugins in dir failed %s: %s", cwd, err))
@@ -84,30 +70,8 @@ func main() {
 	}
 }
 
-func adaptToPipeline(j codejen.OneToOne[corecodegen.SchemaForGen]) codejen.OneToOne[*pfs.PluginDecl] {
-	return codejen.AdaptOneToOne(j, func(pd *pfs.PluginDecl) corecodegen.SchemaForGen {
-		return corecodegen.SchemaForGen{
-			Name:    strings.ReplaceAll(pd.PluginMeta.Name, " ", ""),
-			Schema:  pd.Lineage.Latest(),
-			IsGroup: pd.SchemaInterface.IsGroup(),
-		}
-	})
-}
-
-func kind2pd(rt *thema.Runtime, j codejen.OneToOne[kindsys.Kind]) codejen.OneToOne[*pfs.PluginDecl] {
-	return codejen.AdaptOneToOne(j, func(pd *pfs.PluginDecl) kindsys.Kind {
-		kd, err := kindsys.BindComposable(rt, pd.KindDecl)
-		if err != nil {
-			return nil
-		}
-		return kd
-	})
-}
-
-func splitSchiffer(names []string) codejen.FileMapper {
-	for i := range names {
-		names[i] = names[i] + "/"
-	}
+func splitSchiffer() codejen.FileMapper {
+	names := []string{"panelcfg", "dataquery"}
 	return func(f codejen.File) (codejen.File, error) {
 		// TODO it's terrible that this has to exist, CODEJEN NEEDS TO BE BETTER
 		path := filepath.ToSlash(f.RelativePath)
diff --git a/public/app/plugins/panel/alertGroups/AlertGroup.tsx b/public/app/plugins/panel/alertGroups/AlertGroup.tsx
deleted file mode 100644
index 2ffb2de9aa361..0000000000000
--- a/public/app/plugins/panel/alertGroups/AlertGroup.tsx
+++ /dev/null
@@ -1,125 +0,0 @@
-import { css } from '@emotion/css';
-import React, { useState, useEffect } from 'react';
-
-import { GrafanaTheme2, intervalToAbbreviatedDurationString } from '@grafana/data';
-import { useStyles2, LinkButton } from '@grafana/ui';
-import { AlertLabels } from 'app/features/alerting/unified/components/AlertLabels';
-import { CollapseToggle } from 'app/features/alerting/unified/components/CollapseToggle';
-import { AlertGroupHeader } from 'app/features/alerting/unified/components/alert-groups/AlertGroupHeader';
-import { getNotificationsTextColors } from 'app/features/alerting/unified/styles/notifications';
-import { makeAMLink, makeLabelBasedSilenceLink } from 'app/features/alerting/unified/utils/misc';
-import { AlertmanagerGroup, AlertState } from 'app/plugins/datasource/alertmanager/types';
-
-type Props = {
-  alertManagerSourceName: string;
-  group: AlertmanagerGroup;
-  expandAll: boolean;
-};
-
-export const AlertGroup = ({ alertManagerSourceName, group, expandAll }: Props) => {
-  const [showAlerts, setShowAlerts] = useState(expandAll);
-  const styles = useStyles2(getStyles);
-  const textStyles = useStyles2(getNotificationsTextColors);
-
-  useEffect(() => setShowAlerts(expandAll), [expandAll]);
-
-  return (
-    <div className={styles.group} data-testid="alert-group">
-      {Object.keys(group.labels).length > 0 ? (
-        <AlertLabels labels={group.labels} size="sm" />
-      ) : (
-        <div className={styles.noGroupingText}>No grouping</div>
-      )}
-      <div className={styles.row}>
-        <CollapseToggle isCollapsed={!showAlerts} onToggle={() => setShowAlerts(!showAlerts)} />{' '}
-        <AlertGroupHeader group={group} />
-      </div>
-      {showAlerts && (
-        <div className={styles.alerts}>
-          {group.alerts.map((alert, index) => {
-            const state = alert.status.state.toUpperCase();
-            const interval = intervalToAbbreviatedDurationString({
-              start: new Date(alert.startsAt),
-              end: Date.now(),
-            });
-
-            return (
-              <div data-testid={'alert-group-alert'} className={styles.alert} key={`${alert.fingerprint}-${index}`}>
-                <div>
-                  <span className={textStyles[alert.status.state]}>{state} </span>for {interval}
-                </div>
-                <div>
-                  <AlertLabels labels={alert.labels} size="sm" />
-                </div>
-                <div className={styles.actionsRow}>
-                  {alert.status.state === AlertState.Suppressed && (
-                    <LinkButton
-                      href={`${makeAMLink(
-                        '/alerting/silences',
-                        alertManagerSourceName
-                      )}&silenceIds=${alert.status.silencedBy.join(',')}`}
-                      className={styles.button}
-                      icon={'bell'}
-                      size={'sm'}
-                    >
-                      Manage silences
-                    </LinkButton>
-                  )}
-                  {alert.status.state === AlertState.Active && (
-                    <LinkButton
-                      href={makeLabelBasedSilenceLink(alertManagerSourceName, alert.labels)}
-                      className={styles.button}
-                      icon={'bell-slash'}
-                      size={'sm'}
-                    >
-                      Silence
-                    </LinkButton>
-                  )}
-                  {alert.generatorURL && (
-                    <LinkButton className={styles.button} href={alert.generatorURL} icon={'chart-line'} size={'sm'}>
-                      See source
-                    </LinkButton>
-                  )}
-                </div>
-              </div>
-            );
-          })}
-        </div>
-      )}
-    </div>
-  );
-};
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  noGroupingText: css`
-    height: ${theme.spacing(4)};
-  `,
-  group: css`
-    background-color: ${theme.colors.background.secondary};
-    margin: ${theme.spacing(0.5, 1, 0.5, 1)};
-    padding: ${theme.spacing(1)};
-  `,
-  row: css`
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    gap: ${theme.spacing(1)};
-  `,
-  alerts: css`
-    margin: ${theme.spacing(0, 2, 0, 4)};
-  `,
-  alert: css`
-    padding: ${theme.spacing(1, 0)};
-    & + & {
-      border-top: 1px solid ${theme.colors.border.medium};
-    }
-  `,
-  button: css`
-    & + & {
-      margin-left: ${theme.spacing(1)};
-    }
-  `,
-  actionsRow: css`
-    padding: ${theme.spacing(1, 0)};
-  `,
-});
diff --git a/public/app/plugins/panel/alertGroups/AlertGroupsPanel.test.tsx b/public/app/plugins/panel/alertGroups/AlertGroupsPanel.test.tsx
deleted file mode 100644
index 6e8b34f1b9c4b..0000000000000
--- a/public/app/plugins/panel/alertGroups/AlertGroupsPanel.test.tsx
+++ /dev/null
@@ -1,145 +0,0 @@
-import { render } from '@testing-library/react';
-import React from 'react';
-import { Provider } from 'react-redux';
-import { byTestId } from 'testing-library-selector';
-
-import { getDefaultTimeRange, LoadingState, PanelProps, FieldConfigSource } from '@grafana/data';
-import { setDataSourceSrv } from '@grafana/runtime';
-import { Dashboard } from '@grafana/schema';
-import { fetchAlertGroups } from 'app/features/alerting/unified/api/alertmanager';
-import {
-  mockAlertGroup,
-  mockAlertmanagerAlert,
-  mockDataSource,
-  MockDataSourceSrv,
-} from 'app/features/alerting/unified/mocks';
-import { DataSourceType } from 'app/features/alerting/unified/utils/datasource';
-import { DashboardSrv, setDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
-import { DashboardModel } from 'app/features/dashboard/state';
-import { configureStore } from 'app/store/configureStore';
-
-import { AlertGroupsPanel } from './AlertGroupsPanel';
-import { Options } from './panelcfg.gen';
-
-jest.mock('app/features/alerting/unified/api/alertmanager');
-
-jest.mock('@grafana/runtime', () => ({
-  ...jest.requireActual('@grafana/runtime'),
-  config: {
-    ...jest.requireActual('@grafana/runtime').config,
-    buildInfo: {},
-    panels: {},
-    unifiedAlertingEnabled: true,
-  },
-}));
-
-const mocks = {
-  api: {
-    fetchAlertGroups: jest.mocked(fetchAlertGroups),
-  },
-};
-
-const dataSources = {
-  am: mockDataSource({
-    name: 'Alertmanager',
-    type: DataSourceType.Alertmanager,
-  }),
-};
-
-const defaultOptions: Options = {
-  labels: '',
-  alertmanager: 'Alertmanager',
-  expandAll: false,
-};
-
-const defaultProps: PanelProps<Options> = {
-  data: { state: LoadingState.Done, series: [], timeRange: getDefaultTimeRange() },
-  id: 1,
-  timeRange: getDefaultTimeRange(),
-  timeZone: 'utc',
-  options: defaultOptions,
-  eventBus: {
-    subscribe: jest.fn(),
-    getStream: jest.fn().mockReturnValue({
-      subscribe: jest.fn(),
-    }),
-    publish: jest.fn(),
-    removeAllListeners: jest.fn(),
-    newScopedBus: jest.fn(),
-  },
-  fieldConfig: {} as unknown as FieldConfigSource,
-  height: 400,
-  onChangeTimeRange: jest.fn(),
-  onFieldConfigChange: jest.fn(),
-  onOptionsChange: jest.fn(),
-  renderCounter: 1,
-  replaceVariables: jest.fn(),
-  title: 'Alert groups test',
-  transparent: false,
-  width: 320,
-};
-
-const renderPanel = (options: Options = defaultOptions) => {
-  const store = configureStore();
-  const dash = new DashboardModel({ id: 1 } as Dashboard);
-  dash.formatDate = (time: number) => new Date(time).toISOString();
-  const dashSrv = { getCurrent: () => dash } as DashboardSrv;
-  setDashboardSrv(dashSrv);
-
-  defaultProps.options = options;
-  const props = { ...defaultProps };
-
-  return render(
-    <Provider store={store}>
-      <AlertGroupsPanel {...props} />
-    </Provider>
-  );
-};
-
-const ui = {
-  group: byTestId('alert-group'),
-  alert: byTestId('alert-group-alert'),
-};
-
-describe('AlertGroupsPanel', () => {
-  beforeAll(() => {
-    mocks.api.fetchAlertGroups.mockImplementation(() => {
-      return Promise.resolve([
-        mockAlertGroup({ labels: {}, alerts: [mockAlertmanagerAlert({ labels: { foo: 'bar' } })] }),
-        mockAlertGroup(),
-      ]);
-    });
-  });
-
-  beforeEach(() => {
-    setDataSourceSrv(new MockDataSourceSrv(dataSources));
-  });
-
-  it('renders the panel with the groups', async () => {
-    renderPanel();
-
-    const groups = await ui.group.findAll();
-
-    expect(groups).toHaveLength(2);
-
-    expect(groups[0]).toHaveTextContent('No grouping');
-    expect(groups[1]).toHaveTextContent('severitywarning regionUS-Central');
-
-    const alerts = ui.alert.queryAll();
-    expect(alerts).toHaveLength(0);
-  });
-
-  it('renders panel with groups expanded', async () => {
-    renderPanel({ labels: '', alertmanager: 'Alertmanager', expandAll: true });
-
-    const alerts = await ui.alert.findAll();
-    expect(alerts).toHaveLength(3);
-  });
-
-  it('filters alerts by label filter', async () => {
-    renderPanel({ labels: 'region=US-Central', alertmanager: 'Alertmanager', expandAll: true });
-
-    const alerts = await ui.alert.findAll();
-    expect(alerts).toHaveLength(2);
-  });
-});
diff --git a/public/app/plugins/panel/alertGroups/AlertGroupsPanel.tsx b/public/app/plugins/panel/alertGroups/AlertGroupsPanel.tsx
deleted file mode 100644
index 8de959e4da1d7..0000000000000
--- a/public/app/plugins/panel/alertGroups/AlertGroupsPanel.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import React, { useEffect } from 'react';
-
-import { PanelProps } from '@grafana/data';
-import { config } from '@grafana/runtime';
-import { CustomScrollbar } from '@grafana/ui';
-import { useUnifiedAlertingSelector } from 'app/features/alerting/unified/hooks/useUnifiedAlertingSelector';
-import { fetchAlertGroupsAction } from 'app/features/alerting/unified/state/actions';
-import { parseMatchers } from 'app/features/alerting/unified/utils/alertmanager';
-import { NOTIFICATIONS_POLL_INTERVAL_MS } from 'app/features/alerting/unified/utils/constants';
-import { initialAsyncRequestState } from 'app/features/alerting/unified/utils/redux';
-import { AlertmanagerGroup, Matcher } from 'app/plugins/datasource/alertmanager/types';
-import { useDispatch } from 'app/types';
-
-import { AlertGroup } from './AlertGroup';
-import { Options } from './panelcfg.gen';
-import { useFilteredGroups } from './useFilteredGroups';
-
-export const AlertGroupsPanel = (props: PanelProps<Options>) => {
-  const dispatch = useDispatch();
-  const isAlertingEnabled = config.unifiedAlertingEnabled;
-
-  const expandAll = props.options.expandAll;
-  const alertManagerSourceName = props.options.alertmanager;
-
-  const alertGroups = useUnifiedAlertingSelector((state) => state.amAlertGroups) || initialAsyncRequestState;
-  const results: AlertmanagerGroup[] = alertGroups[alertManagerSourceName || '']?.result || [];
-  const matchers: Matcher[] = props.options.labels ? parseMatchers(props.options.labels) : [];
-
-  const filteredResults = useFilteredGroups(results, matchers);
-
-  useEffect(() => {
-    function fetchNotifications() {
-      if (alertManagerSourceName) {
-        dispatch(fetchAlertGroupsAction(alertManagerSourceName));
-      }
-    }
-    fetchNotifications();
-    const interval = setInterval(fetchNotifications, NOTIFICATIONS_POLL_INTERVAL_MS);
-    return () => {
-      clearInterval(interval);
-    };
-  }, [dispatch, alertManagerSourceName]);
-
-  const hasResults = filteredResults.length > 0;
-
-  return (
-    <CustomScrollbar autoHeightMax="100%" autoHeightMin="100%">
-      {isAlertingEnabled && (
-        <div>
-          {hasResults &&
-            filteredResults.map((group) => {
-              return (
-                <AlertGroup
-                  alertManagerSourceName={alertManagerSourceName}
-                  key={JSON.stringify(group.labels)}
-                  group={group}
-                  expandAll={expandAll}
-                />
-              );
-            })}
-          {!hasResults && 'No alerts'}
-        </div>
-      )}
-    </CustomScrollbar>
-  );
-};
diff --git a/public/app/plugins/panel/alertGroups/AlertmanagerPicker.tsx b/public/app/plugins/panel/alertGroups/AlertmanagerPicker.tsx
deleted file mode 100644
index 2d18cd111a072..0000000000000
--- a/public/app/plugins/panel/alertGroups/AlertmanagerPicker.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import React, { useMemo } from 'react';
-
-import { SelectableValue } from '@grafana/data';
-import { Select } from '@grafana/ui';
-import { AlertManagerDataSource, GRAFANA_RULES_SOURCE_NAME } from 'app/features/alerting/unified/utils/datasource';
-
-interface Props {
-  onChange: (alertManagerSourceName: string) => void;
-  current?: string;
-  dataSources: AlertManagerDataSource[];
-}
-
-function getAlertManagerLabel(alertManager: AlertManagerDataSource) {
-  return alertManager.name === GRAFANA_RULES_SOURCE_NAME ? 'Grafana' : alertManager.name.slice(0, 37);
-}
-
-export const AlertManagerPicker = ({ onChange, current, dataSources }: Props) => {
-  const options: Array<SelectableValue<string>> = useMemo(() => {
-    return dataSources.map((ds) => ({
-      label: getAlertManagerLabel(ds),
-      value: ds.name,
-      imgUrl: ds.imgUrl,
-      meta: ds.meta,
-    }));
-  }, [dataSources]);
-
-  return (
-    <Select
-      aria-label={'Choose Alertmanager'}
-      width={29}
-      backspaceRemovesValue={false}
-      onChange={(value) => value.value && onChange(value.value)}
-      options={options}
-      maxMenuHeight={500}
-      noOptionsMessage="No datasources found"
-      value={current}
-      getOptionLabel={(o) => o.label}
-    />
-  );
-};
diff --git a/public/app/plugins/panel/alertGroups/img/icn-alertgroups-panel.svg b/public/app/plugins/panel/alertGroups/img/icn-alertgroups-panel.svg
deleted file mode 100644
index ef30f162bd639..0000000000000
--- a/public/app/plugins/panel/alertGroups/img/icn-alertgroups-panel.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 107.68 75"><defs><style>.cls-1{fill:#3865ab;}.cls-2{fill:url(#linear-gradient);}</style><linearGradient id="linear-gradient" x1="55.86" y1="36.22" x2="107.68" y2="36.22" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f2cc0c"/><stop offset="1" stop-color="#ff9830"/></linearGradient></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><rect class="cls-1" x="34.6" y="35.29" width="29.04" height="4.55"/><path class="cls-1" d="M0,0H28V15.72H0Z"/><path class="cls-1" d="M0,29.64H28V45.36H0Z"/><path class="cls-1" d="M0,59.29H28V75H0Z"/><path class="cls-1" d="M38.49,69.48H34V64.93h4.47a4.24,4.24,0,0,0,4.24-4.24V14.31a4.24,4.24,0,0,0-4.24-4.24H33.63V5.52h4.86a8.8,8.8,0,0,1,8.79,8.79V60.69A8.8,8.8,0,0,1,38.49,69.48Z"/><path class="cls-2" d="M107.68,50.59c0-2.89-2.25-5.36-4.85-6.58V32.58A21.22,21.22,0,0,0,83.92,11.52V7a2.28,2.28,0,0,0-4.55,0v4.49A21.22,21.22,0,0,0,60.46,32.58V44c-2.54,1.22-4.71,3.63-4.6,6.61V58H68.71a13.47,13.47,0,0,0,25.87,0h13.1Zm-26,12.55A8.91,8.91,0,0,1,73.55,58H89.74A8.93,8.93,0,0,1,81.64,63.14Zm21.5-9.71H95.3V53.3H68v.13H60.41v-3c0-1.17,1.67-2.36,2.89-2.66L65,47.38V32.58A16.66,16.66,0,0,1,81.6,15.94h.09A16.66,16.66,0,0,1,98.28,32.58V47.41l1.75.41c1.4.33,3.11,1.67,3.11,2.77Z"/></g></g></svg>
\ No newline at end of file
diff --git a/public/app/plugins/panel/alertGroups/module.tsx b/public/app/plugins/panel/alertGroups/module.tsx
deleted file mode 100644
index 3029c08876790..0000000000000
--- a/public/app/plugins/panel/alertGroups/module.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import React, { useMemo } from 'react';
-
-import { PanelPlugin } from '@grafana/data';
-import {
-  getAllAlertManagerDataSources,
-  GRAFANA_RULES_SOURCE_NAME,
-} from 'app/features/alerting/unified/utils/datasource';
-
-import { AlertGroupsPanel } from './AlertGroupsPanel';
-import { AlertManagerPicker } from './AlertmanagerPicker';
-import { Options } from './panelcfg.gen';
-
-export const plugin = new PanelPlugin<Options>(AlertGroupsPanel).setPanelOptions((builder) => {
-  return builder
-    .addCustomEditor({
-      name: 'Alertmanager',
-      path: 'alertmanager',
-      id: 'alertmanager',
-      defaultValue: GRAFANA_RULES_SOURCE_NAME,
-      category: ['Options'],
-      editor: function RenderAlertmanagerPicker(props) {
-        const alertManagers = useMemo(getAllAlertManagerDataSources, []);
-
-        return (
-          <AlertManagerPicker
-            current={props.value}
-            onChange={(alertManagerSourceName) => {
-              return props.onChange(alertManagerSourceName);
-            }}
-            dataSources={alertManagers}
-          />
-        );
-      },
-    })
-    .addBooleanSwitch({
-      name: 'Expand all by default',
-      path: 'expandAll',
-      defaultValue: false,
-      category: ['Options'],
-    })
-    .addTextInput({
-      description: 'Filter results by matching labels, ex: env=production,severity=~critical|warning',
-      name: 'Labels',
-      path: 'labels',
-      category: ['Filter'],
-    });
-});
diff --git a/public/app/plugins/panel/alertGroups/panelcfg.cue b/public/app/plugins/panel/alertGroups/panelcfg.cue
deleted file mode 100644
index d5f595f092701..0000000000000
--- a/public/app/plugins/panel/alertGroups/panelcfg.cue
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2023 Grafana Labs
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package grafanaplugin
-
-composableKinds: PanelCfg: lineage: {
-	schemas: [{
-		version: [0, 0]
-		schema: {
-			Options: {
-				// Comma-separated list of values used to filter alert results
-				labels: string
-				// Name of the alertmanager used as a source for alerts
-				alertmanager: string
-				// Expand all alert groups by default
-				expandAll: bool
-			} @cuetsy(kind="interface")
-		}
-	}]
-	lenses: []
-}
diff --git a/public/app/plugins/panel/alertGroups/panelcfg.gen.ts b/public/app/plugins/panel/alertGroups/panelcfg.gen.ts
deleted file mode 100644
index dccaa7be815e3..0000000000000
--- a/public/app/plugins/panel/alertGroups/panelcfg.gen.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     public/app/plugins/gen.go
-// Using jennies:
-//     TSTypesJenny
-//     PluginTSTypesJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-export interface Options {
-  /**
-   * Name of the alertmanager used as a source for alerts
-   */
-  alertmanager: string;
-  /**
-   * Expand all alert groups by default
-   */
-  expandAll: boolean;
-  /**
-   * Comma-separated list of values used to filter alert results
-   */
-  labels: string;
-}
diff --git a/public/app/plugins/panel/alertGroups/plugin.json b/public/app/plugins/panel/alertGroups/plugin.json
deleted file mode 100644
index 4b86aae539e03..0000000000000
--- a/public/app/plugins/panel/alertGroups/plugin.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "type": "panel",
-  "name": "Alert groups",
-  "id": "alertGroups",
-  "state": "alpha",
-
-  "skipDataQuery": true,
-  "info": {
-    "description": "Shows alertmanager alerts grouped by labels",
-    "author": {
-      "name": "Grafana Labs",
-      "url": "https://grafana.com"
-    },
-    "logos": {
-      "small": "img/icn-alertgroups-panel.svg",
-      "large": "img/icn-alertgroups-panel.svg"
-    }
-  }
-}
diff --git a/public/app/plugins/panel/alertGroups/useFilteredGroups.ts b/public/app/plugins/panel/alertGroups/useFilteredGroups.ts
deleted file mode 100644
index b2aad016a62b5..0000000000000
--- a/public/app/plugins/panel/alertGroups/useFilteredGroups.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { useMemo } from 'react';
-
-import { labelsMatchMatchers } from 'app/features/alerting/unified/utils/alertmanager';
-import { AlertmanagerGroup, Matcher } from 'app/plugins/datasource/alertmanager/types';
-
-export const useFilteredGroups = (groups: AlertmanagerGroup[], matchers: Matcher[]): AlertmanagerGroup[] => {
-  return useMemo(() => {
-    return groups.filter((group) => {
-      return (
-        labelsMatchMatchers(group.labels, matchers) ||
-        group.alerts.some((alert) => labelsMatchMatchers(alert.labels, matchers))
-      );
-    });
-  }, [groups, matchers]);
-};
diff --git a/public/app/plugins/panel/alertlist/AlertInstances.tsx b/public/app/plugins/panel/alertlist/AlertInstances.tsx
index 85c40fd22b309..c7b289690c623 100644
--- a/public/app/plugins/panel/alertlist/AlertInstances.tsx
+++ b/public/app/plugins/panel/alertlist/AlertInstances.tsx
@@ -8,7 +8,7 @@ import { Button, clearButtonStyles, Icon, useStyles2 } from '@grafana/ui';
 import { AlertInstancesTable } from 'app/features/alerting/unified/components/rules/AlertInstancesTable';
 import { INSTANCES_DISPLAY_LIMIT } from 'app/features/alerting/unified/components/rules/RuleDetails';
 import { sortAlerts } from 'app/features/alerting/unified/utils/misc';
-import { Alert } from 'app/types/unified-alerting';
+import { Alert, CombinedRule } from 'app/types/unified-alerting';
 
 import { DEFAULT_PER_PAGE_PAGINATION } from '../../../core/constants';
 
@@ -16,6 +16,7 @@ import { GroupMode, UnifiedAlertListOptions } from './types';
 import { filterAlerts } from './util';
 
 interface Props {
+  rule?: CombinedRule;
   alerts: Alert[];
   options: PanelProps<UnifiedAlertListOptions>['options'];
   grafanaTotalInstances?: number;
@@ -25,6 +26,7 @@ interface Props {
 }
 
 export const AlertInstances = ({
+  rule,
   alerts,
   options,
   grafanaTotalInstances,
@@ -125,6 +127,7 @@ export const AlertInstances = ({
       )}
       {displayInstances && (
         <AlertInstancesTable
+          rule={rule}
           instances={filteredAlerts}
           pagination={{ itemsPerPage: 2 * DEFAULT_PER_PAGE_PAGINATION }}
           footerRow={footerRow}
diff --git a/public/app/plugins/panel/alertlist/AlertList.tsx b/public/app/plugins/panel/alertlist/AlertList.tsx
deleted file mode 100644
index 3ef7825186680..0000000000000
--- a/public/app/plugins/panel/alertlist/AlertList.tsx
+++ /dev/null
@@ -1,273 +0,0 @@
-import { css, cx } from '@emotion/css';
-import { sortBy } from 'lodash';
-import React, { useState } from 'react';
-import { useAsync } from 'react-use';
-
-import { dateMath, dateTime, GrafanaTheme2, PanelProps } from '@grafana/data';
-import { getBackendSrv } from '@grafana/runtime';
-import { Card, CustomScrollbar, Icon, useStyles2 } from '@grafana/ui';
-import alertDef from 'app/features/alerting/state/alertDef';
-import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
-import { AlertRuleDTO, AnnotationItemDTO } from 'app/types';
-
-import { AlertListOptions, ShowOption, SortOrder } from './types';
-
-export function AlertList(props: PanelProps<AlertListOptions>) {
-  const [noAlertsMessage, setNoAlertsMessage] = useState('');
-
-  const currentAlertState = useAsync(async () => {
-    if (props.options.showOptions !== ShowOption.Current) {
-      return;
-    }
-
-    const params: any = {
-      state: getStateFilter(props.options.stateFilter),
-    };
-
-    if (props.options.alertName) {
-      params.query = props.replaceVariables(props.options.alertName);
-    }
-
-    if (props.options.folderId >= 0) {
-      params.folderId = props.options.folderId;
-    }
-
-    if (props.options.dashboardTitle) {
-      params.dashboardQuery = props.options.dashboardTitle;
-    }
-
-    if (props.options.dashboardAlerts) {
-      params.dashboardId = getDashboardSrv().getCurrent()?.id;
-    }
-
-    if (props.options.tags) {
-      params.dashboardTag = props.options.tags;
-    }
-
-    const alerts: AlertRuleDTO[] = await getBackendSrv().get(
-      '/api/alerts',
-      params,
-      `alert-list-get-current-alert-state-${props.id}`
-    );
-    let currentAlerts = sortAlerts(
-      props.options.sortOrder,
-      alerts.map((al) => ({
-        ...al,
-        stateModel: alertDef.getStateDisplayModel(al.state),
-        newStateDateAgo: dateTime(al.newStateDate).locale('en').fromNow(true),
-      }))
-    );
-
-    if (currentAlerts.length > props.options.maxItems) {
-      currentAlerts = currentAlerts.slice(0, props.options.maxItems);
-    }
-    setNoAlertsMessage(currentAlerts.length === 0 ? 'No alerts' : '');
-
-    return currentAlerts;
-  }, [
-    props.options.showOptions,
-    props.options.stateFilter.alerting,
-    props.options.stateFilter.execution_error,
-    props.options.stateFilter.no_data,
-    props.options.stateFilter.ok,
-    props.options.stateFilter.paused,
-    props.options.stateFilter.pending,
-    props.options.maxItems,
-    props.options.tags,
-    props.options.dashboardAlerts,
-    props.options.dashboardTitle,
-    props.options.folderId,
-    props.options.alertName,
-    props.options.sortOrder,
-    props.timeRange,
-  ]);
-
-  const recentStateChanges = useAsync(async () => {
-    if (props.options.showOptions !== ShowOption.RecentChanges) {
-      return;
-    }
-
-    const params: any = {
-      limit: props.options.maxItems,
-      type: 'alert',
-      newState: getStateFilter(props.options.stateFilter),
-    };
-    const currentDashboard = getDashboardSrv().getCurrent();
-
-    if (props.options.dashboardAlerts) {
-      params.dashboardId = currentDashboard?.id;
-    }
-
-    params.from = dateMath.parse(currentDashboard?.time.from)!.unix() * 1000;
-    params.to = dateMath.parse(currentDashboard?.time.to)!.unix() * 1000;
-
-    const data: AnnotationItemDTO[] = await getBackendSrv().get(
-      '/api/annotations',
-      params,
-      `alert-list-get-state-changes-${props.id}`
-    );
-    const alertHistory = sortAlerts(
-      props.options.sortOrder,
-      data.map((al) => {
-        return {
-          ...al,
-          time: currentDashboard?.formatDate(al.time, 'MMM D, YYYY HH:mm:ss'),
-          stateModel: alertDef.getStateDisplayModel(al.newState),
-          info: alertDef.getAlertAnnotationInfo(al),
-        };
-      })
-    );
-
-    setNoAlertsMessage(alertHistory.length === 0 ? 'No alerts in current time range' : '');
-    return alertHistory;
-  }, [
-    props.options.showOptions,
-    props.options.maxItems,
-    props.options.stateFilter.alerting,
-    props.options.stateFilter.execution_error,
-    props.options.stateFilter.no_data,
-    props.options.stateFilter.ok,
-    props.options.stateFilter.paused,
-    props.options.stateFilter.pending,
-    props.options.dashboardAlerts,
-    props.options.sortOrder,
-  ]);
-
-  const styles = useStyles2(getStyles);
-
-  return (
-    <CustomScrollbar autoHeightMin="100%" autoHeightMax="100%">
-      <div className={styles.container}>
-        {noAlertsMessage && <div className={styles.noAlertsMessage}>{noAlertsMessage}</div>}
-        <section>
-          <ol className={styles.alertRuleList}>
-            {props.options.showOptions === ShowOption.Current
-              ? !currentAlertState.loading &&
-                currentAlertState.value &&
-                currentAlertState.value!.map((alert) => (
-                  <li className={styles.alertRuleItem} key={`alert-${alert.id}`}>
-                    <Card href={`${alert.url}?viewPanel=${alert.panelId}`} className={styles.cardContainer}>
-                      <Card.Heading>{alert.name}</Card.Heading>
-                      <Card.Figure className={cx(styles.alertRuleItemIcon, alert.stateModel.stateClass)}>
-                        <Icon name={alert.stateModel.iconClass} size="xl" className={styles.alertIcon} />
-                      </Card.Figure>
-                      <Card.Meta>
-                        <div className={styles.alertRuleItemText}>
-                          <span className={alert.stateModel.stateClass}>{alert.stateModel.text}</span>
-                          <span className={styles.alertRuleItemTime}> for {alert.newStateDateAgo}</span>
-                        </div>
-                      </Card.Meta>
-                    </Card>
-                  </li>
-                ))
-              : !recentStateChanges.loading &&
-                recentStateChanges.value &&
-                recentStateChanges.value.map((alert) => (
-                  <li className={styles.alertRuleItem} key={`alert-${alert.id}`}>
-                    <Card className={styles.cardContainer}>
-                      <Card.Heading>{alert.alertName}</Card.Heading>
-                      <Card.Figure className={cx(styles.alertRuleItemIcon, alert.stateModel.stateClass)}>
-                        <Icon name={alert.stateModel.iconClass} size="xl" />
-                      </Card.Figure>
-                      <Card.Meta>
-                        <span className={cx(styles.alertRuleItemText, alert.stateModel.stateClass)}>
-                          {alert.stateModel.text}
-                        </span>
-                        <span>{alert.time}</span>
-                        {alert.info && <span className={styles.alertRuleItemInfo}>{alert.info}</span>}
-                      </Card.Meta>
-                    </Card>
-                  </li>
-                ))}
-          </ol>
-        </section>
-      </div>
-    </CustomScrollbar>
-  );
-}
-
-function sortAlerts(sortOrder: SortOrder, alerts: any[]) {
-  if (sortOrder === SortOrder.Importance) {
-    // @ts-ignore
-    return sortBy(alerts, (a) => alertDef.alertStateSortScore[a.state || a.newState]);
-  } else if (sortOrder === SortOrder.TimeAsc) {
-    return sortBy(alerts, (a) => new Date(a.newStateDate || a.time));
-  } else if (sortOrder === SortOrder.TimeDesc) {
-    return sortBy(alerts, (a) => new Date(a.newStateDate || a.time)).reverse();
-  }
-
-  const result = sortBy(alerts, (a) => (a.name || a.alertName).toLowerCase());
-  if (sortOrder === SortOrder.AlphaDesc) {
-    result.reverse();
-  }
-
-  return result;
-}
-
-function getStateFilter(stateFilter: Record<string, boolean>) {
-  return Object.entries(stateFilter)
-    .filter(([_, val]) => val)
-    .map(([key, _]) => key);
-}
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  cardContainer: css`
-    padding: ${theme.spacing(0.5)} 0 ${theme.spacing(0.25)} 0;
-    line-height: ${theme.typography.body.lineHeight};
-    margin-bottom: 0px;
-  `,
-  container: css`
-    overflow-y: auto;
-    height: 100%;
-  `,
-  alertRuleList: css`
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-    list-style-type: none;
-  `,
-  alertRuleItem: css`
-    display: flex;
-    align-items: center;
-    width: 100%;
-    height: 100%;
-    background: ${theme.colors.background.secondary};
-    padding: ${theme.spacing(0.5)} ${theme.spacing(1)};
-    border-radius: ${theme.shape.radius.default};
-    margin-bottom: ${theme.spacing(0.5)};
-  `,
-  alertRuleItemIcon: css`
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    width: ${theme.spacing(4)};
-    padding: 0 ${theme.spacing(0.5)} 0 ${theme.spacing(0.25)};
-    margin-right: 0px;
-  `,
-  alertRuleItemText: css`
-    font-weight: ${theme.typography.fontWeightBold};
-    font-size: ${theme.typography.size.sm};
-    margin: 0;
-  `,
-  alertRuleItemTime: css`
-    color: ${theme.colors.text.secondary};
-    font-weight: normal;
-    white-space: nowrap;
-  `,
-  alertRuleItemInfo: css`
-    font-weight: normal;
-    flex-grow: 2;
-    display: flex;
-    align-items: flex-end;
-  `,
-  noAlertsMessage: css`
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 100%;
-    height: 100%;
-  `,
-  alertIcon: css`
-    margin-right: ${theme.spacing(0.5)};
-  `,
-});
diff --git a/public/app/plugins/panel/alertlist/AlertListMigration.test.ts b/public/app/plugins/panel/alertlist/AlertListMigration.test.ts
deleted file mode 100644
index f08b6c7a996a5..0000000000000
--- a/public/app/plugins/panel/alertlist/AlertListMigration.test.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-import { PanelModel } from '@grafana/data';
-
-import { alertListPanelMigrationHandler } from './AlertListMigrationHandler';
-import { AlertListOptions, ShowOption, SortOrder } from './types';
-
-describe('AlertList Panel Migration', () => {
-  it('should migrate from < 7.5', () => {
-    const panel: Omit<PanelModel, 'fieldConfig'> & Record<string, unknown> = {
-      id: 7,
-      links: [],
-      pluginVersion: '7.4.0',
-      targets: [],
-      title: 'Usage',
-      type: 'alertlist',
-      nameFilter: 'Customer',
-      show: 'current',
-      sortOrder: 1,
-      stateFilter: ['ok', 'paused'],
-      dashboardTags: ['tag_a', 'tag_b'],
-      dashboardFilter: '',
-      limit: 10,
-      onlyAlertsOnDashboard: false,
-      options: {},
-    };
-
-    const newOptions = alertListPanelMigrationHandler(panel as unknown as PanelModel);
-    expect(newOptions).toMatchObject({
-      showOptions: ShowOption.Current,
-      maxItems: 10,
-      sortOrder: SortOrder.AlphaAsc,
-      dashboardAlerts: false,
-      alertName: 'Customer',
-      dashboardTitle: '',
-      tags: ['tag_a', 'tag_b'],
-      stateFilter: {
-        ok: true,
-        paused: true,
-      },
-      folderId: undefined,
-    });
-
-    expect(panel).not.toHaveProperty('show');
-    expect(panel).not.toHaveProperty('limit');
-    expect(panel).not.toHaveProperty('sortOrder');
-    expect(panel).not.toHaveProperty('onlyAlertsOnDashboard');
-    expect(panel).not.toHaveProperty('nameFilter');
-    expect(panel).not.toHaveProperty('dashboardFilter');
-    expect(panel).not.toHaveProperty('folderId');
-    expect(panel).not.toHaveProperty('dashboardTags');
-    expect(panel).not.toHaveProperty('stateFilter');
-  });
-
-  it('should handle >= 7.5', () => {
-    const panel: Omit<PanelModel<AlertListOptions>, 'fieldConfig'> & Record<string, unknown> = {
-      id: 7,
-      links: [],
-      pluginVersion: '7.5.0',
-      targets: [],
-      title: 'Usage',
-      type: 'alertlist',
-      options: {
-        showOptions: ShowOption.Current,
-        maxItems: 10,
-        sortOrder: SortOrder.AlphaAsc,
-        dashboardAlerts: false,
-        alertName: 'Customer',
-        dashboardTitle: '',
-        tags: ['tag_a', 'tag_b'],
-        stateFilter: {
-          ok: true,
-          paused: true,
-          no_data: false,
-          execution_error: false,
-          pending: false,
-          alerting: false,
-        },
-        folderId: 1,
-      },
-    };
-
-    const newOptions = alertListPanelMigrationHandler(panel as unknown as PanelModel);
-    expect(newOptions).toMatchObject({
-      showOptions: 'current',
-      maxItems: 10,
-      sortOrder: SortOrder.AlphaAsc,
-      dashboardAlerts: false,
-      alertName: 'Customer',
-      dashboardTitle: '',
-      tags: ['tag_a', 'tag_b'],
-      stateFilter: {
-        ok: true,
-        paused: true,
-        no_data: false,
-        execution_error: false,
-        pending: false,
-        alerting: false,
-      },
-      folderId: 1,
-    });
-
-    expect(panel).not.toHaveProperty('show');
-    expect(panel).not.toHaveProperty('limit');
-    expect(panel).not.toHaveProperty('sortOrder');
-    expect(panel).not.toHaveProperty('onlyAlertsOnDashboard');
-    expect(panel).not.toHaveProperty('nameFilter');
-    expect(panel).not.toHaveProperty('dashboardFilter');
-    expect(panel).not.toHaveProperty('folderId');
-    expect(panel).not.toHaveProperty('dashboardTags');
-    expect(panel).not.toHaveProperty('stateFilter');
-  });
-
-  it('should handle config with no options or stateFilter', () => {
-    const panel: Omit<PanelModel, 'fieldConfig'> & Record<string, unknown> = {
-      id: 7,
-      links: [],
-      pluginVersion: '7.4.0',
-      targets: [],
-      title: 'Usage',
-      type: 'alertlist',
-      onlyAlertsOnDashboard: false,
-      options: {},
-    };
-
-    const newOptions = alertListPanelMigrationHandler(panel as unknown as PanelModel);
-    expect(newOptions).toMatchObject({
-      showOptions: ShowOption.Current,
-      maxItems: 10,
-      sortOrder: SortOrder.AlphaAsc,
-      dashboardAlerts: false,
-      alertName: '',
-      dashboardTitle: '',
-      tags: [],
-      stateFilter: {},
-      folderId: undefined,
-    });
-  });
-});
diff --git a/public/app/plugins/panel/alertlist/AlertListMigrationHandler.ts b/public/app/plugins/panel/alertlist/AlertListMigrationHandler.ts
deleted file mode 100644
index 2fccfa8ddb5c9..0000000000000
--- a/public/app/plugins/panel/alertlist/AlertListMigrationHandler.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { PanelModel } from '@grafana/data';
-
-import { AlertListOptions, ShowOption, SortOrder } from './types';
-
-export const alertListPanelMigrationHandler = (
-  panel: PanelModel<AlertListOptions> & Record<string, any>
-): Partial<AlertListOptions> => {
-  const newOptions: AlertListOptions = {
-    showOptions: panel.options.showOptions ?? panel.show ?? ShowOption.Current,
-    maxItems: panel.options.maxItems ?? panel.limit ?? 10,
-    sortOrder: panel.options.sortOrder ?? panel.sortOrder ?? SortOrder.AlphaAsc,
-    dashboardAlerts: panel.options.dashboardAlerts ?? panel.onlyAlertsOnDashboard ?? false,
-    alertName: panel.options.alertName ?? panel.nameFilter ?? '',
-    dashboardTitle: panel.options.dashboardTitle ?? panel.dashboardFilter ?? '',
-    folderId: panel.options.folderId ?? panel.folderId,
-    tags: panel.options.tags ?? panel.dashboardTags ?? [],
-    stateFilter:
-      panel.options.stateFilter ??
-      panel.stateFilter?.reduce((filterObj: any, curFilter: any) => ({ ...filterObj, [curFilter]: true }), {}) ??
-      {},
-  };
-
-  const previousVersion = parseFloat(panel.pluginVersion || '7.4');
-  if (previousVersion < 7.5) {
-    const oldProps = [
-      'show',
-      'limit',
-      'sortOrder',
-      'onlyAlertsOnDashboard',
-      'nameFilter',
-      'dashboardFilter',
-      'folderId',
-      'dashboardTags',
-      'stateFilter',
-    ];
-    oldProps.forEach((prop) => delete panel[prop]);
-  }
-
-  return newOptions;
-};
diff --git a/public/app/plugins/panel/alertlist/UnifiedAlertList.tsx b/public/app/plugins/panel/alertlist/UnifiedAlertList.tsx
index 544834f342205..c6676c6ad42ee 100644
--- a/public/app/plugins/panel/alertlist/UnifiedAlertList.tsx
+++ b/public/app/plugins/panel/alertlist/UnifiedAlertList.tsx
@@ -16,7 +16,6 @@ import {
   useStyles2,
 } from '@grafana/ui';
 import { config } from 'app/core/config';
-import { contextSrv } from 'app/core/services/context_srv';
 import alertDef from 'app/features/alerting/state/alertDef';
 import { alertRuleApi } from 'app/features/alerting/unified/api/alertRuleApi';
 import { INSTANCES_DISPLAY_LIMIT } from 'app/features/alerting/unified/components/rules/RuleDetails';
@@ -38,9 +37,10 @@ import { flattenCombinedRules, getFirstActiveAt } from 'app/features/alerting/un
 import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
 import { DashboardModel } from 'app/features/dashboard/state';
 import { Matcher } from 'app/plugins/datasource/alertmanager/types';
-import { AccessControlAction, ThunkDispatch, useDispatch } from 'app/types';
+import { ThunkDispatch, useDispatch } from 'app/types';
 import { PromAlertingRuleState } from 'app/types/unified-alerting-dto';
 
+import { AlertingAction, useAlertingAbility } from '../../../features/alerting/unified/hooks/useAbilities';
 import { getAlertingRule } from '../../../features/alerting/unified/utils/rules';
 import { AlertingRule, CombinedRuleWithLocation } from '../../../types/unified-alerting';
 
@@ -93,9 +93,10 @@ const fetchPromAndRuler = ({
   }
 };
 
-export function UnifiedAlertList(props: PanelProps<UnifiedAlertListOptions>) {
+function UnifiedAlertList(props: PanelProps<UnifiedAlertListOptions>) {
   const dispatch = useDispatch();
   const [limitInstances, toggleLimit] = useToggle(true);
+  const [, gmaViewAllowed] = useAlertingAbility(AlertingAction.ViewAlertRule);
 
   const { usePrometheusRulesByNamespaceQuery } = alertRuleApi;
 
@@ -137,7 +138,7 @@ export function UnifiedAlertList(props: PanelProps<UnifiedAlertListOptions>) {
 
   // If the datasource is not defined we should NOT skip the query
   // Undefined dataSourceName means that there is no datasource filter applied and we should fetch all the rules
-  const shouldFetchGrafanaRules = !dataSourceName || dataSourceName === GRAFANA_RULES_SOURCE_NAME;
+  const shouldFetchGrafanaRules = (!dataSourceName || dataSourceName === GRAFANA_RULES_SOURCE_NAME) && gmaViewAllowed;
 
   //For grafana managed rules, get the result using RTK Query to avoid the need of using the redux store
   //See https://github.com/grafana/grafana/pull/70482
@@ -213,45 +214,43 @@ export function UnifiedAlertList(props: PanelProps<UnifiedAlertListOptions>) {
 
   const noAlertsMessage = rules.length === 0 ? 'No alerts matching filters' : undefined;
 
-  if (
-    !contextSrv.hasPermission(AccessControlAction.AlertingRuleRead) &&
-    !contextSrv.hasPermission(AccessControlAction.AlertingRuleExternalRead)
-  ) {
-    return (
-      <Alert title="Permission required">Sorry, you do not have the required permissions to read alert rules</Alert>
-    );
-  }
+  const renderLoading = grafanaRulesLoading || (dispatched && loading && !haveResults);
+
+  const havePreviousResults = Object.values(promRulesRequests).some((state) => state.result);
 
   return (
     <CustomScrollbar autoHeightMin="100%" autoHeightMax="100%">
       <div className={styles.container}>
-        {(grafanaRulesLoading || (dispatched && loading && !haveResults)) && <LoadingPlaceholder text="Loading..." />}
-        {noAlertsMessage && <div className={styles.noAlertsMessage}>{noAlertsMessage}</div>}
-        <section>
-          {props.options.viewMode === ViewMode.Stat && haveResults && (
-            <BigValue
-              width={props.width}
-              height={props.height}
-              graphMode={BigValueGraphMode.None}
-              textMode={BigValueTextMode.Auto}
-              justifyMode={BigValueJustifyMode.Auto}
-              theme={config.theme2}
-              value={{ text: `${rules.length}`, numeric: rules.length }}
-            />
-          )}
-          {props.options.viewMode === ViewMode.List && props.options.groupMode === GroupMode.Custom && haveResults && (
-            <GroupedModeView rules={rules} options={parsedOptions} />
-          )}
-          {props.options.viewMode === ViewMode.List && props.options.groupMode === GroupMode.Default && haveResults && (
-            <UngroupedModeView
-              rules={rules}
-              options={parsedOptions}
-              handleInstancesLimit={handleInstancesLimit}
-              limitInstances={limitInstances}
-              hideViewRuleLinkText={hideViewRuleLinkText}
-            />
-          )}
-        </section>
+        {havePreviousResults && noAlertsMessage && <div className={styles.noAlertsMessage}>{noAlertsMessage}</div>}
+        {havePreviousResults && (
+          <section>
+            {props.options.viewMode === ViewMode.Stat && (
+              <BigValue
+                width={props.width}
+                height={props.height}
+                graphMode={BigValueGraphMode.None}
+                textMode={BigValueTextMode.Auto}
+                justifyMode={BigValueJustifyMode.Auto}
+                theme={config.theme2}
+                value={{ text: `${rules.length}`, numeric: rules.length }}
+              />
+            )}
+            {props.options.viewMode === ViewMode.List && props.options.groupMode === GroupMode.Custom && (
+              <GroupedModeView rules={rules} options={parsedOptions} />
+            )}
+            {props.options.viewMode === ViewMode.List && props.options.groupMode === GroupMode.Default && (
+              <UngroupedModeView
+                rules={rules}
+                options={parsedOptions}
+                handleInstancesLimit={handleInstancesLimit}
+                limitInstances={limitInstances}
+                hideViewRuleLinkText={hideViewRuleLinkText}
+              />
+            )}
+          </section>
+        )}
+        {/* loading moved here to avoid twitching  */}
+        {renderLoading && <LoadingPlaceholder text="Loading..." />}
       </div>
     </CustomScrollbar>
   );
@@ -449,3 +448,16 @@ export const getStyles = (theme: GrafanaTheme2) => ({
     display: none;
   `,
 });
+
+export function UnifiedAlertListPanel(props: PanelProps<UnifiedAlertListOptions>) {
+  const [, gmaReadAllowed] = useAlertingAbility(AlertingAction.ViewAlertRule);
+  const [, externalReadAllowed] = useAlertingAbility(AlertingAction.ViewExternalAlertRule);
+
+  if (!gmaReadAllowed && !externalReadAllowed) {
+    return (
+      <Alert title="Permission required">Sorry, you do not have the required permissions to read alert rules</Alert>
+    );
+  }
+
+  return <UnifiedAlertList {...props} />;
+}
diff --git a/public/app/plugins/panel/alertlist/UnifiedalertList.test.tsx b/public/app/plugins/panel/alertlist/UnifiedalertList.test.tsx
index e98637b8e7da9..d4847dd8289c3 100644
--- a/public/app/plugins/panel/alertlist/UnifiedalertList.test.tsx
+++ b/public/app/plugins/panel/alertlist/UnifiedalertList.test.tsx
@@ -2,11 +2,10 @@ import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { Provider } from 'react-redux';
-import { act } from 'react-test-renderer';
 import { byRole, byText } from 'testing-library-selector';
 
-import { FieldConfigSource, getDefaultTimeRange, LoadingState, PanelProps } from '@grafana/data';
-import { TimeRangeUpdatedEvent } from '@grafana/runtime';
+import { FieldConfigSource, getDefaultTimeRange, LoadingState, PanelProps, PluginExtensionTypes } from '@grafana/data';
+import { getPluginLinkExtensions, TimeRangeUpdatedEvent } from '@grafana/runtime';
 import { setupMswServer } from 'app/features/alerting/unified/mockApi';
 import { mockPromRulesApiResponse } from 'app/features/alerting/unified/mocks/alertRuleApi';
 import { mockRulerRulesApiResponse } from 'app/features/alerting/unified/mocks/rulerApi';
@@ -25,7 +24,7 @@ import {
 } from '../../../features/alerting/unified/mocks';
 import { GRAFANA_RULES_SOURCE_NAME } from '../../../features/alerting/unified/utils/datasource';
 
-import { UnifiedAlertList } from './UnifiedAlertList';
+import { UnifiedAlertListPanel } from './UnifiedAlertList';
 import { GroupMode, SortOrder, UnifiedAlertListOptions, ViewMode } from './types';
 import * as utils from './util';
 
@@ -56,8 +55,16 @@ const grafanaRuleMock = {
   },
 };
 
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getPluginLinkExtensions: jest.fn(),
+}));
 jest.mock('app/features/alerting/unified/api/alertmanager');
 
+const mocks = {
+  getPluginLinkExtensionsMock: jest.mocked(getPluginLinkExtensions),
+};
+
 const fakeResponse: PromRulesResponse = {
   data: { groups: grafanaRuleMock.promRules.grafana.result[0].groups as PromRuleGroupDTO[] },
   status: 'success',
@@ -65,17 +72,32 @@ const fakeResponse: PromRulesResponse = {
 
 const server = setupMswServer();
 
-mockPromRulesApiResponse(server, fakeResponse);
-const originRule: RulerGrafanaRuleDTO = mockRulerGrafanaRule(
-  {
-    for: '1m',
-    labels: { severity: 'critical', region: 'nasa' },
-    annotations: { [Annotation.summary]: 'This is a very important alert rule' },
-  },
-  { uid: 'grafana-rule-1', title: 'First Grafana Rule', data: [] }
-);
-mockRulerRulesApiResponse(server, 'grafana', {
-  'folder-one': [{ name: 'group1', interval: '20s', rules: [originRule] }],
+beforeEach(() => {
+  mockPromRulesApiResponse(server, fakeResponse);
+  const originRule: RulerGrafanaRuleDTO = mockRulerGrafanaRule(
+    {
+      for: '1m',
+      labels: { severity: 'critical', region: 'nasa' },
+      annotations: { [Annotation.summary]: 'This is a very important alert rule' },
+    },
+    { uid: 'grafana-rule-1', title: 'First Grafana Rule', data: [] }
+  );
+  mockRulerRulesApiResponse(server, 'grafana', {
+    'folder-one': [{ name: 'group1', interval: '20s', rules: [originRule] }],
+  });
+  mocks.getPluginLinkExtensionsMock.mockReturnValue({
+    extensions: [
+      {
+        pluginId: 'grafana-ml-app',
+        id: '1',
+        type: PluginExtensionTypes.link,
+        title: 'Run investigation',
+        category: 'Sift',
+        description: 'Run a Sift investigation for this alert',
+        onClick: jest.fn(),
+      },
+    ],
+  });
 });
 
 const defaultOptions: UnifiedAlertListOptions = {
@@ -136,20 +158,20 @@ const renderPanel = (options: Partial<UnifiedAlertListOptions> = defaultOptions)
 
   return render(
     <Provider store={store}>
-      <UnifiedAlertList {...props} />
+      <UnifiedAlertListPanel {...props} />
     </Provider>
   );
 };
 
 describe('UnifiedAlertList', () => {
+  jest.spyOn(contextSrv, 'hasPermission').mockReturnValue(true);
+
   it('subscribes to the dashboard refresh interval', async () => {
     jest.spyOn(defaultProps, 'replaceVariables').mockReturnValue('severity=critical');
 
-    await act(async () => {
-      renderPanel();
-    });
+    renderPanel();
 
-    expect(dashboard.events.subscribe).toHaveBeenCalledTimes(1);
+    await waitFor(() => expect(dashboard.events.subscribe).toHaveBeenCalledTimes(1));
     expect(dashboard.events.subscribe.mock.calls[0][0]).toEqual(TimeRangeUpdatedEvent);
   });
 
@@ -157,21 +179,18 @@ describe('UnifiedAlertList', () => {
     await waitFor(() => {
       expect(screen.queryByText('Loading...')).not.toBeInTheDocument();
     });
-    jest.spyOn(contextSrv, 'hasPermission').mockReturnValue(true);
     const filterAlertsSpy = jest.spyOn(utils, 'filterAlerts');
 
     const replaceVarsSpy = jest.spyOn(defaultProps, 'replaceVariables').mockReturnValue('severity=critical');
 
     const user = userEvent.setup();
 
-    await act(async () => {
-      renderPanel({
-        alertInstanceLabelFilter: '$label',
-        dashboardAlerts: false,
-        alertName: '',
-        datasource: GRAFANA_RULES_SOURCE_NAME,
-        folder: undefined,
-      });
+    renderPanel({
+      alertInstanceLabelFilter: '$label',
+      dashboardAlerts: false,
+      alertName: '',
+      datasource: GRAFANA_RULES_SOURCE_NAME,
+      folder: undefined,
     });
 
     await waitFor(() => {
@@ -199,4 +218,12 @@ describe('UnifiedAlertList', () => {
       expect.anything()
     );
   });
+
+  it('should render authorization error when user has no permission', async () => {
+    jest.spyOn(contextSrv, 'hasPermission').mockReturnValue(false);
+
+    renderPanel();
+
+    expect(screen.getByRole('alert', { name: 'Permission required' })).toBeInTheDocument();
+  });
 });
diff --git a/public/app/plugins/panel/alertlist/module.tsx b/public/app/plugins/panel/alertlist/module.tsx
index 33f3126f92361..23b2f000b5a59 100644
--- a/public/app/plugins/panel/alertlist/module.tsx
+++ b/public/app/plugins/panel/alertlist/module.tsx
@@ -1,162 +1,18 @@
 import React from 'react';
 
 import { DataSourceInstanceSettings, PanelPlugin } from '@grafana/data';
-import { config } from '@grafana/runtime';
-import { TagsInput } from '@grafana/ui';
+import { Button, Stack } from '@grafana/ui';
 import { OldFolderPicker } from 'app/core/components/Select/OldFolderPicker';
-import {
-  ALL_FOLDER,
-  GENERAL_FOLDER,
-  ReadonlyFolderPicker,
-} from 'app/core/components/Select/ReadonlyFolderPicker/ReadonlyFolderPicker';
 import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker';
 import { PermissionLevelString } from 'app/types';
 
 import { GRAFANA_DATASOURCE_NAME } from '../../../features/alerting/unified/utils/datasource';
 
-import { AlertList } from './AlertList';
-import { alertListPanelMigrationHandler } from './AlertListMigrationHandler';
 import { GroupBy } from './GroupByWithLoading';
-import { UnifiedAlertList } from './UnifiedAlertList';
-import { AlertListSuggestionsSupplier } from './suggestions';
-import { AlertListOptions, GroupMode, ShowOption, SortOrder, UnifiedAlertListOptions, ViewMode } from './types';
+import { UnifiedAlertListPanel } from './UnifiedAlertList';
+import { UnifiedAlertListOptions, ViewMode, GroupMode, SortOrder } from './types';
 
-function showIfCurrentState(options: AlertListOptions) {
-  return options.showOptions === ShowOption.Current;
-}
-
-const alertList = new PanelPlugin<AlertListOptions>(AlertList)
-  .setPanelOptions((builder) => {
-    builder
-      .addSelect({
-        name: 'Show',
-        path: 'showOptions',
-        settings: {
-          options: [
-            { label: 'Current state', value: ShowOption.Current },
-            { label: 'Recent state changes', value: ShowOption.RecentChanges },
-          ],
-        },
-        defaultValue: ShowOption.Current,
-        category: ['Options'],
-      })
-      .addNumberInput({
-        name: 'Max items',
-        path: 'maxItems',
-        defaultValue: 10,
-        category: ['Options'],
-      })
-      .addSelect({
-        name: 'Sort order',
-        path: 'sortOrder',
-        settings: {
-          options: [
-            { label: 'Alphabetical (asc)', value: SortOrder.AlphaAsc },
-            { label: 'Alphabetical (desc)', value: SortOrder.AlphaDesc },
-            { label: 'Importance', value: SortOrder.Importance },
-            { label: 'Time (asc)', value: SortOrder.TimeAsc },
-            { label: 'Time (desc)', value: SortOrder.TimeDesc },
-          ],
-        },
-        defaultValue: SortOrder.AlphaAsc,
-        category: ['Options'],
-      })
-      .addBooleanSwitch({
-        path: 'dashboardAlerts',
-        name: 'Alerts from this dashboard',
-        defaultValue: false,
-        category: ['Options'],
-      })
-      .addTextInput({
-        path: 'alertName',
-        name: 'Alert name',
-        defaultValue: '',
-        category: ['Filter'],
-        showIf: showIfCurrentState,
-      })
-      .addTextInput({
-        path: 'dashboardTitle',
-        name: 'Dashboard title',
-        defaultValue: '',
-        category: ['Filter'],
-        showIf: showIfCurrentState,
-      })
-      .addCustomEditor({
-        path: 'folderId',
-        name: 'Folder',
-        id: 'folderId',
-        defaultValue: null,
-        editor: function RenderFolderPicker({ value, onChange }) {
-          return (
-            <ReadonlyFolderPicker
-              initialFolderId={value}
-              onChange={(folder) => onChange(folder?.id)}
-              extraFolders={[ALL_FOLDER, GENERAL_FOLDER]}
-            />
-          );
-        },
-        category: ['Filter'],
-        showIf: showIfCurrentState,
-      })
-      .addCustomEditor({
-        id: 'tags',
-        path: 'tags',
-        name: 'Tags',
-        description: '',
-        defaultValue: [],
-        editor(props) {
-          return <TagsInput tags={props.value} onChange={props.onChange} />;
-        },
-        category: ['Filter'],
-        showIf: showIfCurrentState,
-      })
-      .addBooleanSwitch({
-        path: 'stateFilter.ok',
-        name: 'Ok',
-        defaultValue: false,
-        category: ['State filter'],
-        showIf: showIfCurrentState,
-      })
-      .addBooleanSwitch({
-        path: 'stateFilter.paused',
-        name: 'Paused',
-        defaultValue: false,
-        category: ['State filter'],
-        showIf: showIfCurrentState,
-      })
-      .addBooleanSwitch({
-        path: 'stateFilter.no_data',
-        name: 'No data',
-        defaultValue: false,
-        category: ['State filter'],
-        showIf: showIfCurrentState,
-      })
-      .addBooleanSwitch({
-        path: 'stateFilter.execution_error',
-        name: 'Execution error',
-        defaultValue: false,
-        category: ['State filter'],
-        showIf: showIfCurrentState,
-      })
-      .addBooleanSwitch({
-        path: 'stateFilter.alerting',
-        name: 'Alerting',
-        defaultValue: false,
-        category: ['State filter'],
-        showIf: showIfCurrentState,
-      })
-      .addBooleanSwitch({
-        path: 'stateFilter.pending',
-        name: 'Pending',
-        defaultValue: false,
-        category: ['State filter'],
-        showIf: showIfCurrentState,
-      });
-  })
-  .setMigrationHandler(alertListPanelMigrationHandler)
-  .setSuggestionsSupplier(new AlertListSuggestionsSupplier());
-
-const unifiedAlertList = new PanelPlugin<UnifiedAlertListOptions>(UnifiedAlertList).setPanelOptions((builder) => {
+const unifiedAlertList = new PanelPlugin<UnifiedAlertListOptions>(UnifiedAlertListPanel).setPanelOptions((builder) => {
   builder
     .addRadio({
       path: 'viewMode',
@@ -228,8 +84,8 @@ const unifiedAlertList = new PanelPlugin<UnifiedAlertListOptions>(UnifiedAlertLi
     })
     .addBooleanSwitch({
       path: 'dashboardAlerts',
-      name: 'Alerts from this dashboard',
-      description: 'Show alerts from this dashboard',
+      name: 'Alerts linked to this dashboard',
+      description: 'Only show alerts linked to this dashboard',
       defaultValue: false,
       category: ['Options'],
     })
@@ -250,19 +106,23 @@ const unifiedAlertList = new PanelPlugin<UnifiedAlertListOptions>(UnifiedAlertLi
     .addCustomEditor({
       path: 'datasource',
       name: 'Datasource',
-      description: 'Filter alerts from selected datasource',
+      description: 'Filter from alert source',
       id: 'datasource',
       defaultValue: null,
       editor: function RenderDatasourcePicker(props) {
         return (
-          <DataSourcePicker
-            {...props}
-            type={['prometheus', 'loki', 'grafana']}
-            noDefault
-            current={props.value}
-            onChange={(ds: DataSourceInstanceSettings) => props.onChange(ds.name)}
-            onClear={() => props.onChange(null)}
-          />
+          <Stack gap={1}>
+            <DataSourcePicker
+              {...props}
+              type={['prometheus', 'loki', 'grafana']}
+              noDefault
+              current={props.value}
+              onChange={(ds: DataSourceInstanceSettings) => props.onChange(ds.name)}
+            />
+            <Button variant="secondary" onClick={() => props.onChange(null)}>
+              Clear
+            </Button>
+          </Stack>
         );
       },
       category: ['Filter'],
@@ -322,4 +182,4 @@ const unifiedAlertList = new PanelPlugin<UnifiedAlertListOptions>(UnifiedAlertLi
     });
 });
 
-export const plugin = config.unifiedAlertingEnabled ? unifiedAlertList : alertList;
+export const plugin = unifiedAlertList;
diff --git a/public/app/plugins/panel/alertlist/suggestions.ts b/public/app/plugins/panel/alertlist/suggestions.ts
deleted file mode 100644
index dbae9066a16de..0000000000000
--- a/public/app/plugins/panel/alertlist/suggestions.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { VisualizationSuggestionsBuilder } from '@grafana/data';
-
-import { AlertListOptions } from './types';
-
-export class AlertListSuggestionsSupplier {
-  getSuggestionsForData(builder: VisualizationSuggestionsBuilder) {
-    const { dataSummary } = builder;
-
-    if (dataSummary.hasData) {
-      return;
-    }
-
-    const list = builder.getListAppender<AlertListOptions, {}>({
-      name: 'Dashboard list',
-      pluginId: 'dashlist',
-      options: {},
-    });
-
-    list.append({});
-  }
-}
diff --git a/public/app/plugins/panel/alertlist/types.ts b/public/app/plugins/panel/alertlist/types.ts
index a0e07fd451676..b128b631b66a8 100644
--- a/public/app/plugins/panel/alertlist/types.ts
+++ b/public/app/plugins/panel/alertlist/types.ts
@@ -1,5 +1,3 @@
-import { Alert } from 'app/types/unified-alerting';
-
 export enum SortOrder {
   AlphaAsc = 1,
   AlphaDesc,
@@ -65,5 +63,3 @@ export interface UnifiedAlertListOptions {
   datasource: string;
   viewMode: ViewMode;
 }
-
-export type GroupedRules = Map<string, Alert[]>;
diff --git a/public/app/plugins/panel/alertlist/unified-alerting/GroupedView.tsx b/public/app/plugins/panel/alertlist/unified-alerting/GroupedView.tsx
index cdc28794cbfbf..fbdb1b71db63c 100644
--- a/public/app/plugins/panel/alertlist/unified-alerting/GroupedView.tsx
+++ b/public/app/plugins/panel/alertlist/unified-alerting/GroupedView.tsx
@@ -8,7 +8,7 @@ import { Alert } from 'app/types/unified-alerting';
 import { CombinedRuleWithLocation } from '../../../../types/unified-alerting';
 import { AlertInstances } from '../AlertInstances';
 import { getStyles } from '../UnifiedAlertList';
-import { GroupedRules, UnifiedAlertListOptions } from '../types';
+import { UnifiedAlertListOptions } from '../types';
 import { filterAlerts } from '../util';
 
 type Props = {
@@ -16,14 +16,19 @@ type Props = {
   options: UnifiedAlertListOptions;
 };
 
+type RuleWithAlerts = {
+  rule?: CombinedRuleWithLocation;
+  alerts: Alert[];
+};
+
 export const UNGROUPED_KEY = '__ungrouped__';
 
 const GroupedModeView = ({ rules, options }: Props) => {
   const styles = useStyles2(getStyles);
   const groupBy = options.groupBy;
 
-  const groupedRules = useMemo<GroupedRules>(() => {
-    const groupedRules = new Map<string, Alert[]>();
+  const groupedRules = useMemo<Map<string, RuleWithAlerts>>(() => {
+    const groupedRules = new Map<string, RuleWithAlerts>();
 
     const hasInstancesWithMatchingLabels = (rule: CombinedRuleWithLocation) =>
       groupBy ? alertHasEveryLabelForCombinedRules(rule, groupBy) : true;
@@ -35,33 +40,36 @@ const GroupedModeView = ({ rules, options }: Props) => {
       (alertingRule?.alerts ?? []).forEach((alert) => {
         const mapKey = hasInstancesMatching ? createMapKey(groupBy, alert.labels) : UNGROUPED_KEY;
 
-        const existingAlerts = groupedRules.get(mapKey) ?? [];
-        groupedRules.set(mapKey, [...existingAlerts, alert]);
+        const existingAlerts = groupedRules.get(mapKey)?.alerts ?? [];
+        groupedRules.set(mapKey, { rule, alerts: [...existingAlerts, alert] });
       });
     });
 
     // move the "UNGROUPED" key to the last item in the Map, items are shown in insertion order
-    const ungrouped = groupedRules.get(UNGROUPED_KEY) ?? [];
+    const ungrouped = groupedRules.get(UNGROUPED_KEY)?.alerts ?? [];
     groupedRules.delete(UNGROUPED_KEY);
-    groupedRules.set(UNGROUPED_KEY, ungrouped);
+    groupedRules.set(UNGROUPED_KEY, { alerts: ungrouped });
 
     // Remove groups having no instances
     // This is different from filtering Rules without instances that we do in UnifiedAlertList
-    const filteredGroupedRules = Array.from(groupedRules.entries()).reduce((acc, [groupKey, groupAlerts]) => {
-      const filteredAlerts = filterAlerts(options, groupAlerts);
-      if (filteredAlerts.length > 0) {
-        acc.set(groupKey, filteredAlerts);
-      }
-
-      return acc;
-    }, new Map<string, Alert[]>());
+    const filteredGroupedRules = Array.from(groupedRules.entries()).reduce(
+      (acc, [groupKey, { rule, alerts: groupAlerts }]) => {
+        const filteredAlerts = filterAlerts(options, groupAlerts);
+        if (filteredAlerts.length > 0) {
+          acc.set(groupKey, { rule, alerts: filteredAlerts });
+        }
+
+        return acc;
+      },
+      new Map<string, RuleWithAlerts>()
+    );
 
     return filteredGroupedRules;
   }, [groupBy, rules, options]);
 
   return (
     <>
-      {Array.from(groupedRules).map(([key, alerts]) => (
+      {Array.from(groupedRules).map(([key, { rule, alerts }]) => (
         <li className={styles.alertRuleItem} key={key} data-testid={key}>
           <div>
             <div className={styles.customGroupDetails}>
@@ -71,7 +79,7 @@ const GroupedModeView = ({ rules, options }: Props) => {
                 {key === UNGROUPED_KEY && 'No grouping'}
               </div>
             </div>
-            <AlertInstances alerts={alerts} options={options} />
+            <AlertInstances rule={rule} alerts={alerts} options={options} />
           </div>
         </li>
       ))}
diff --git a/public/app/plugins/panel/alertlist/unified-alerting/UngroupedView.tsx b/public/app/plugins/panel/alertlist/unified-alerting/UngroupedView.tsx
index 6868e620a4241..bfa92a15ec07c 100644
--- a/public/app/plugins/panel/alertlist/unified-alerting/UngroupedView.tsx
+++ b/public/app/plugins/panel/alertlist/unified-alerting/UngroupedView.tsx
@@ -3,8 +3,7 @@ import React from 'react';
 import { useLocation } from 'react-use';
 
 import { GrafanaTheme2, intervalToAbbreviatedDurationString } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
-import { Icon, useStyles2 } from '@grafana/ui';
+import { Icon, useStyles2, Stack } from '@grafana/ui';
 import alertDef from 'app/features/alerting/state/alertDef';
 import { Spacer } from 'app/features/alerting/unified/components/Spacer';
 import { fromCombinedRule, stringifyIdentifier } from 'app/features/alerting/unified/utils/rule-id';
@@ -84,7 +83,7 @@ const UngroupedModeView = ({ rules, options, handleInstancesLimit, limitInstance
                 </div>
                 <div className={styles.alertNameWrapper}>
                   <div className={styles.instanceDetails}>
-                    <Stack direction="row" gap={1} wrap={false}>
+                    <Stack direction="row" gap={1}>
                       <div className={styles.alertName} title={ruleWithLocation.name}>
                         {ruleWithLocation.name}
                       </div>
@@ -120,6 +119,7 @@ const UngroupedModeView = ({ rules, options, handleInstancesLimit, limitInstance
                     </div>
                   </div>
                   <AlertInstances
+                    rule={ruleWithLocation}
                     alerts={alertingRule.alerts ?? []}
                     options={options}
                     grafanaTotalInstances={grafanaInstancesTotal}
diff --git a/public/app/plugins/panel/annolist/AnnoListPanel.test.tsx b/public/app/plugins/panel/annolist/AnnoListPanel.test.tsx
index f42c57ff7b7cf..0e7044af8e2a0 100644
--- a/public/app/plugins/panel/annolist/AnnoListPanel.test.tsx
+++ b/public/app/plugins/panel/annolist/AnnoListPanel.test.tsx
@@ -7,7 +7,7 @@ import { locationService } from '@grafana/runtime';
 
 import { silenceConsoleOutput } from '../../../../test/core/utils/silenceConsoleOutput';
 import { backendSrv } from '../../../core/services/backend_srv';
-import { setDashboardSrv } from '../../../features/dashboard/services/DashboardSrv';
+import { DashboardSrv, setDashboardSrv } from '../../../features/dashboard/services/DashboardSrv';
 
 import { AnnoListPanel, Props } from './AnnoListPanel';
 import { Options } from './panelcfg.gen';
@@ -30,7 +30,7 @@ const defaultOptions: Options = {
   tags: ['tag A', 'tag B'],
 };
 
-const defaultResult: any = {
+const defaultResult = {
   text: 'Result text',
   userId: 1,
   login: 'Result login',
@@ -40,7 +40,7 @@ const defaultResult: any = {
   time: Date.UTC(2021, 0, 1, 0, 0, 0, 0),
   panelId: 13,
   dashboardId: 14, // deliberately different from panelId
-  id: 14,
+  id: '14',
   uid: '7MeksYbmk',
   dashboardUID: '7MeksYbmk',
   url: '/d/asdkjhajksd/some-dash',
@@ -55,8 +55,8 @@ async function setupTestContext({
   const getMock = jest.spyOn(backendSrv, 'get');
   getMock.mockResolvedValue(results);
 
-  const dash: any = { uid: 'srx16xR4z', formatDate: (time: number) => new Date(time).toISOString() };
-  const dashSrv: any = { getCurrent: () => dash };
+  const dash = { uid: 'srx16xR4z', formatDate: (time: number) => new Date(time).toISOString() };
+  const dashSrv = { getCurrent: () => dash } as DashboardSrv;
   setDashboardSrv(dashSrv);
   const pushSpy = jest.spyOn(locationService, 'push');
 
@@ -64,10 +64,9 @@ async function setupTestContext({
     data: { state: LoadingState.Done, timeRange: getDefaultTimeRange(), series: [] },
     eventBus: {
       subscribe: jest.fn(),
-      getStream: () =>
-        ({
-          subscribe: jest.fn(),
-        }) as any,
+      getStream: jest.fn().mockImplementation(() => ({
+        subscribe: jest.fn(),
+      })),
       publish: jest.fn(),
       removeAllListeners: jest.fn(),
       newScopedBus: jest.fn(),
diff --git a/public/app/plugins/panel/annolist/AnnoListPanel.tsx b/public/app/plugins/panel/annolist/AnnoListPanel.tsx
index 252e353dccc01..2e637d7c3bf0d 100644
--- a/public/app/plugins/panel/annolist/AnnoListPanel.tsx
+++ b/public/app/plugins/panel/annolist/AnnoListPanel.tsx
@@ -90,7 +90,11 @@ export class AnnoListPanel extends PureComponent<Props, State> {
     const { options } = this.props;
     const { queryUser, queryTags } = this.state;
 
-    const params: any = {
+    const params: {
+      tags: typeof options.tags;
+      limit: typeof options.limit;
+      type: string;
+    } & Record<string, unknown> = {
       tags: options.tags,
       limit: options.limit,
       type: 'annotation', // Skip the Annotations that are really alerts.  (Use the alerts panel!)
@@ -139,15 +143,12 @@ export class AnnoListPanel extends PureComponent<Props, State> {
     const dashboardSrv = getDashboardSrv();
     const current = dashboardSrv.getCurrent();
 
-    const params: any = {
+    const params = {
       from: this._timeOffset(anno.time, options.navigateBefore, true),
       to: this._timeOffset(anno.timeEnd ?? anno.time, options.navigateAfter, false),
+      viewPanel: options.navigateToPanel ? anno.panelId : undefined,
     };
 
-    if (options.navigateToPanel) {
-      params.viewPanel = anno.panelId;
-    }
-
     if (current?.uid === anno.dashboardUID) {
       locationService.partial(params);
       return;
@@ -157,8 +158,8 @@ export class AnnoListPanel extends PureComponent<Props, State> {
     if (result && result.length && result[0].uid === anno.dashboardUID) {
       const dash = result[0];
       const url = new URL(dash.url, window.location.origin);
-      url.searchParams.set('from', params.from);
-      url.searchParams.set('to', params.to);
+      url.searchParams.set('from', String(params.from));
+      url.searchParams.set('to', String(params.to));
       locationService.push(locationUtil.stripBaseFromUrl(url.toString()));
       return;
     }
diff --git a/public/app/plugins/panel/annolist/module.tsx b/public/app/plugins/panel/annolist/module.tsx
index d719e221fb6f6..e914b3fad98a9 100644
--- a/public/app/plugins/panel/annolist/module.tsx
+++ b/public/app/plugins/panel/annolist/module.tsx
@@ -95,9 +95,9 @@ export const plugin = new PanelPlugin<Options>(AnnoListPanel)
       });
   })
   // TODO, we should support this directly in the plugin infrastructure
-  .setPanelChangeHandler((panel: PanelModel<Options>, prevPluginId: string, prevOptions: unknown) => {
+  .setPanelChangeHandler((panel: PanelModel<Options>, prevPluginId, prevOptions) => {
     if (prevPluginId === 'ryantxu-annolist-panel') {
-      return prevOptions as Options;
+      return prevOptions;
     }
 
     return panel.options;
diff --git a/public/app/plugins/panel/annolist/panelcfg.gen.ts b/public/app/plugins/panel/annolist/panelcfg.gen.ts
index fd2a9274205cc..1734302372885 100644
--- a/public/app/plugins/panel/annolist/panelcfg.gen.ts
+++ b/public/app/plugins/panel/annolist/panelcfg.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/public/app/plugins/panel/barchart/BarChartPanel.tsx b/public/app/plugins/panel/barchart/BarChartPanel.tsx
index c3ea72f4b2167..4bb4be5753b00 100644
--- a/public/app/plugins/panel/barchart/BarChartPanel.tsx
+++ b/public/app/plugins/panel/barchart/BarChartPanel.tsx
@@ -12,12 +12,10 @@ import {
   TimeRange,
   VizOrientation,
 } from '@grafana/data';
-import { PanelDataErrorView } from '@grafana/runtime';
+import { PanelDataErrorView, config } from '@grafana/runtime';
 import { SortOrder } from '@grafana/schema';
 import {
   GraphGradientMode,
-  GraphNG,
-  GraphNGProps,
   measureText,
   PlotLegend,
   Portal,
@@ -30,13 +28,17 @@ import {
   VizLayout,
   VizLegend,
   VizTooltipContainer,
+  TooltipPlugin2,
 } from '@grafana/ui';
-import { PropDiffFn } from '@grafana/ui/src/components/GraphNG/GraphNG';
 import { HoverEvent, addTooltipSupport } from '@grafana/ui/src/components/uPlot/config/addTooltipSupport';
+import { TooltipHoverMode } from '@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2';
 import { CloseButton } from 'app/core/components/CloseButton/CloseButton';
+import { GraphNG, GraphNGProps, PropDiffFn } from 'app/core/components/GraphNG/GraphNG';
 import { getFieldLegendItem } from 'app/core/components/TimelineChart/utils';
 import { DataHoverView } from 'app/features/visualization/data-hover/DataHoverView';
 
+import { TimeSeriesTooltip } from '../timeseries/TimeSeriesTooltip';
+
 import { Options } from './panelcfg.gen';
 import { prepareBarChartDisplayValues, preparePlotConfigBuilder } from './utils';
 
@@ -67,9 +69,9 @@ const propsToDiff: Array<string | PropDiffFn> = [
 
 interface Props extends PanelProps<Options> {}
 
-export const BarChartPanel = ({ data, options, fieldConfig, width, height, timeZone, id }: Props) => {
+export const BarChartPanel = ({ data, options, fieldConfig, width, height, timeZone, id, replaceVariables }: Props) => {
   const theme = useTheme2();
-  const { eventBus } = usePanelContext();
+  const { dataLinkPostProcessor } = usePanelContext();
 
   const oldConfig = useRef<UPlotConfigBuilder | undefined>(undefined);
   const isToolTipOpen = useRef<boolean>(false);
@@ -286,7 +288,6 @@ export const BarChartPanel = ({ data, options, fieldConfig, width, height, timeZ
       timeZone,
       theme,
       timeZones: [timeZone],
-      eventBus,
       orientation,
       barWidth,
       barRadius,
@@ -304,9 +305,12 @@ export const BarChartPanel = ({ data, options, fieldConfig, width, height, timeZ
       fillOpacity,
       allFrames: info.viz,
       fullHighlight,
+      hoverMulti: tooltip.mode === TooltipDisplayMode.Multi,
     });
   };
 
+  const showNewVizTooltips = Boolean(config.featureToggles.newVizTooltips);
+
   return (
     <GraphNG
       theme={theme}
@@ -321,9 +325,37 @@ export const BarChartPanel = ({ data, options, fieldConfig, width, height, timeZ
       structureRev={structureRev}
       width={width}
       height={height}
+      replaceVariables={replaceVariables}
+      dataLinkPostProcessor={dataLinkPostProcessor}
     >
       {(config) => {
-        if (oldConfig.current !== config) {
+        if (showNewVizTooltips && options.tooltip.mode !== TooltipDisplayMode.None) {
+          return (
+            <TooltipPlugin2
+              config={config}
+              hoverMode={
+                options.tooltip.mode === TooltipDisplayMode.Single ? TooltipHoverMode.xOne : TooltipHoverMode.xAll
+              }
+              render={(u, dataIdxs, seriesIdx, isPinned, dismiss, timeRange2) => {
+                return (
+                  <TimeSeriesTooltip
+                    frames={info.viz}
+                    seriesFrame={info.aligned}
+                    dataIdxs={dataIdxs}
+                    seriesIdx={seriesIdx}
+                    mode={options.tooltip.mode}
+                    sortOrder={options.tooltip.sort}
+                    isPinned={isPinned}
+                  />
+                );
+              }}
+              maxWidth={options.tooltip.maxWidth}
+              maxHeight={options.tooltip.maxHeight}
+            />
+          );
+        }
+
+        if (!showNewVizTooltips && oldConfig.current !== config) {
           oldConfig.current = addTooltipSupport({
             config,
             onUPlotClick,
diff --git a/public/app/plugins/panel/barchart/__snapshots__/utils.test.ts.snap b/public/app/plugins/panel/barchart/__snapshots__/utils.test.ts.snap
index e8513d91a0d3e..460a05d35ca37 100644
--- a/public/app/plugins/panel/barchart/__snapshots__/utils.test.ts.snap
+++ b/public/app/plugins/panel/barchart/__snapshots__/utils.test.ts.snap
@@ -68,7 +68,8 @@ exports[`BarChart utils preparePlotConfigBuilder orientation 1`] = `
       "y": false,
     },
     "focus": {
-      "prox": 30,
+      "dist": [Function],
+      "prox": 1000,
     },
     "points": {
       "bbox": [Function],
@@ -223,7 +224,8 @@ exports[`BarChart utils preparePlotConfigBuilder orientation 2`] = `
       "y": false,
     },
     "focus": {
-      "prox": 30,
+      "dist": [Function],
+      "prox": 1000,
     },
     "points": {
       "bbox": [Function],
@@ -378,7 +380,8 @@ exports[`BarChart utils preparePlotConfigBuilder orientation 3`] = `
       "y": false,
     },
     "focus": {
-      "prox": 30,
+      "dist": [Function],
+      "prox": 1000,
     },
     "points": {
       "bbox": [Function],
@@ -533,7 +536,8 @@ exports[`BarChart utils preparePlotConfigBuilder stacking 1`] = `
       "y": false,
     },
     "focus": {
-      "prox": 30,
+      "dist": [Function],
+      "prox": 1000,
     },
     "points": {
       "bbox": [Function],
@@ -688,7 +692,8 @@ exports[`BarChart utils preparePlotConfigBuilder stacking 2`] = `
       "y": false,
     },
     "focus": {
-      "prox": 30,
+      "dist": [Function],
+      "prox": 1000,
     },
     "points": {
       "bbox": [Function],
@@ -843,7 +848,8 @@ exports[`BarChart utils preparePlotConfigBuilder stacking 3`] = `
       "y": false,
     },
     "focus": {
-      "prox": 30,
+      "dist": [Function],
+      "prox": 1000,
     },
     "points": {
       "bbox": [Function],
@@ -998,7 +1004,8 @@ exports[`BarChart utils preparePlotConfigBuilder value visibility 1`] = `
       "y": false,
     },
     "focus": {
-      "prox": 30,
+      "dist": [Function],
+      "prox": 1000,
     },
     "points": {
       "bbox": [Function],
@@ -1153,7 +1160,8 @@ exports[`BarChart utils preparePlotConfigBuilder value visibility 2`] = `
       "y": false,
     },
     "focus": {
-      "prox": 30,
+      "dist": [Function],
+      "prox": 1000,
     },
     "points": {
       "bbox": [Function],
diff --git a/public/app/plugins/panel/barchart/bars.ts b/public/app/plugins/panel/barchart/bars.ts
index be528a0479418..af1d287eae712 100644
--- a/public/app/plugins/panel/barchart/bars.ts
+++ b/public/app/plugins/panel/barchart/bars.ts
@@ -1,6 +1,6 @@
 import uPlot, { Axis, AlignedData, Scale } from 'uplot';
 
-import { DataFrame, GrafanaTheme2, TimeZone } from '@grafana/data';
+import { DataFrame, dateTimeFormat, GrafanaTheme2, systemDateFormats, TimeZone } from '@grafana/data';
 import { alpha } from '@grafana/data/src/themes/colorManipulator';
 import {
   StackingMode,
@@ -11,11 +11,13 @@ import {
   VizLegendOptions,
 } from '@grafana/schema';
 import { measureText, PlotTooltipInterpolator } from '@grafana/ui';
-import { formatTime } from '@grafana/ui/src/components/uPlot/config/UPlotAxisBuilder';
+import { timeUnitSize } from '@grafana/ui/src/components/uPlot/config/UPlotAxisBuilder';
 import { StackingGroup, preparePlotData2 } from '@grafana/ui/src/components/uPlot/utils';
 
+const intervals = systemDateFormats.interval;
+
 import { distribute, SPACE_BETWEEN } from './distribute';
-import { findRect, intersects, pointWithin, Quadtree, Rect } from './quadtree';
+import { findRects, intersects, pointWithin, Quadtree, Rect } from './quadtree';
 
 const groupDistr = SPACE_BETWEEN;
 const barDistr = SPACE_BETWEEN;
@@ -56,6 +58,7 @@ export interface BarsOptions {
   text?: VizTextDisplayOptions;
   onHover?: (seriesIdx: number, valueIdx: number) => void;
   onLeave?: (seriesIdx: number, valueIdx: number) => void;
+  hoverMulti?: boolean;
   legend?: VizLegendOptions;
   xSpacing?: number;
   xTimeAuto?: boolean;
@@ -128,6 +131,8 @@ export function getConfig(opts: BarsOptions, theme: GrafanaTheme2) {
     fillOpacity = 1,
     showValue,
     xSpacing = 0,
+    hoverMulti = false,
+    timeZone = 'browser',
   } = opts;
   const isXHorizontal = xOri === ScaleOrientation.Horizontal;
   const hasAutoValueSize = !Boolean(opts.text?.valueSize);
@@ -141,6 +146,8 @@ export function getConfig(opts: BarsOptions, theme: GrafanaTheme2) {
   }
 
   let qt: Quadtree;
+  const numSeries = 30; // !!
+  const hovered: Array<Rect | null> = Array(numSeries).fill(null);
   let hRect: Rect | null;
 
   // for distr: 2 scales, the splits array should contain indices into data[0] rather than values
@@ -175,22 +182,25 @@ export function getConfig(opts: BarsOptions, theme: GrafanaTheme2) {
   // the splits passed into here are data[0] values looked up by the indices returned from splits()
   const xValues: Axis.Values = (u, splits, axisIdx, foundSpace, foundIncr) => {
     if (opts.xTimeAuto) {
-      // bit of a hack:
-      // temporarily set x scale range to temporal (as expected by formatTime()) rather than ordinal
-      let xScale = u.scales.x;
-      let oMin = xScale.min;
-      let oMax = xScale.max;
-
-      xScale.min = u.data[0][0];
-      xScale.max = u.data[0][u.data[0].length - 1];
-
-      let vals = formatTime(u, splits, axisIdx, foundSpace, foundIncr);
-
-      // revert
-      xScale.min = oMin;
-      xScale.max = oMax;
+      let format = intervals.year;
+
+      if (foundIncr < timeUnitSize.second) {
+        format = intervals.millisecond;
+      } else if (foundIncr < timeUnitSize.minute) {
+        format = intervals.second;
+      } else if (foundIncr < timeUnitSize.hour) {
+        format = intervals.minute;
+      } else if (foundIncr < timeUnitSize.day) {
+        format = intervals.hour;
+      } else if (foundIncr < timeUnitSize.month) {
+        format = intervals.day;
+      } else if (foundIncr < timeUnitSize.year) {
+        format = intervals.month;
+      } else {
+        format = intervals.year;
+      }
 
-      return vals;
+      return splits.map((v) => (v == null ? '' : dateTimeFormat(v, { format, timeZone })));
     }
 
     return splits.map((v) => (isXHorizontal ? formatShortValue(0, v) : formatValue(0, v)));
@@ -289,11 +299,11 @@ export function getConfig(opts: BarsOptions, theme: GrafanaTheme2) {
     radius: pctStacked
       ? 0
       : !isStacked
-      ? barRadius
-      : (u: uPlot, seriesIdx: number) => {
-          let isTopmostSeries = seriesIdx === u.data.length - 1;
-          return isTopmostSeries ? [barRadius, 0] : [0, 0];
-        },
+        ? barRadius
+        : (u: uPlot, seriesIdx: number) => {
+            let isTopmostSeries = seriesIdx === u.data.length - 1;
+            return isTopmostSeries ? [barRadius, 0] : [0, 0];
+          },
     disp: {
       x0: {
         unit: 2,
@@ -324,7 +334,7 @@ export function getConfig(opts: BarsOptions, theme: GrafanaTheme2) {
 
       let barRect = { x: lft, y: top, w: wid, h: hgt, sidx: seriesIdx, didx: dataIdx };
 
-      if (opts.fullHighlight) {
+      if (!isStacked && opts.fullHighlight) {
         if (opts.xOri === ScaleOrientation.Horizontal) {
           barRect.y = 0;
           barRect.h = u.bbox.height;
@@ -443,8 +453,6 @@ export function getConfig(opts: BarsOptions, theme: GrafanaTheme2) {
   });
 
   const init = (u: uPlot) => {
-    let over = u.over;
-    over.style.overflow = 'hidden';
     u.root.querySelectorAll<HTMLDivElement>('.u-cursor-pt').forEach((el) => {
       el.style.borderRadius = '0';
 
@@ -462,7 +470,8 @@ export function getConfig(opts: BarsOptions, theme: GrafanaTheme2) {
       y: false,
     },
     dataIdx: (u, seriesIdx) => {
-      if (seriesIdx === 1) {
+      if (seriesIdx === 0) {
+        hovered.fill(null);
         hRect = null;
 
         let cx = u.cursor.left! * uPlot.pxRatio;
@@ -470,48 +479,37 @@ export function getConfig(opts: BarsOptions, theme: GrafanaTheme2) {
 
         qt.get(cx, cy, 1, 1, (o) => {
           if (pointWithin(cx, cy, o.x, o.y, o.x + o.w, o.y + o.h)) {
-            if (isStacked) {
-              // choose the smallest hovered rect (when stacked bigger ones overlap smaller ones)
-              if (hRect == null || o.h * o.w < hRect.h * hRect.w) {
-                hRect = o;
-              }
-            } else {
-              hRect = o;
-            }
+            hRect = hovered[0] = o;
+            hovered[hRect.sidx] = hRect;
+
+            hoverMulti &&
+              findRects(qt, undefined, hRect.didx).forEach((r) => {
+                hovered[r.sidx] = r;
+              });
           }
         });
       }
 
-      return hRect && seriesIdx === hRect.sidx ? hRect.didx : null;
+      return hovered[seriesIdx]?.didx;
     },
     points: {
       fill: 'rgba(255,255,255,0.4)',
       bbox: (u, seriesIdx) => {
-        let isHovered = hRect && seriesIdx === hRect.sidx;
-
-        let heightReduce = 0;
-        let widthReduce = 0;
-
-        // get height of bar rect at same index of the series below the hovered one
-        if (isStacked && isHovered) {
-          const rect = hRect && hRect.sidx > 1 && findRect(qt, hRect.sidx - 1, hRect.didx);
-          if (rect) {
-            if (isXHorizontal) {
-              heightReduce = rect.h;
-            } else {
-              widthReduce = rect.w;
-            }
-          }
-        }
+        let hRect2 = hovered[seriesIdx];
+        let isHovered = hRect2 != null;
 
         return {
-          left: isHovered ? (hRect!.x + widthReduce) / uPlot.pxRatio : -10,
-          top: isHovered ? hRect!.y / uPlot.pxRatio : -10,
-          width: isHovered ? (hRect!.w - widthReduce) / uPlot.pxRatio : 0,
-          height: isHovered ? (hRect!.h - heightReduce) / uPlot.pxRatio : 0,
+          left: isHovered ? hRect2!.x / uPlot.pxRatio : -10,
+          top: isHovered ? hRect2!.y / uPlot.pxRatio : -10,
+          width: isHovered ? hRect2!.w / uPlot.pxRatio : 0,
+          height: isHovered ? hRect2!.h / uPlot.pxRatio : 0,
         };
       },
     },
+    focus: {
+      prox: 1e3,
+      dist: (u, seriesIdx) => (hRect?.sidx === seriesIdx ? 0 : Infinity),
+    },
   };
 
   // Build bars
diff --git a/public/app/plugins/panel/barchart/migrations.test.ts b/public/app/plugins/panel/barchart/migrations.test.ts
new file mode 100644
index 0000000000000..00af18aec7bae
--- /dev/null
+++ b/public/app/plugins/panel/barchart/migrations.test.ts
@@ -0,0 +1,32 @@
+import { FieldConfigSource, PanelModel } from '@grafana/data';
+
+import { changeToBarChartPanelMigrationHandler } from './migrations';
+
+describe('Bar chart Migrations', () => {
+  let prevFieldConfig: FieldConfigSource;
+
+  beforeEach(() => {
+    prevFieldConfig = {
+      defaults: {},
+      overrides: [],
+    };
+  });
+
+  it('From old graph', () => {
+    const old = {
+      angular: {
+        xaxis: {
+          mode: 'series',
+          values: 'avg',
+        },
+      },
+    };
+
+    const panel = {} as PanelModel;
+    panel.options = changeToBarChartPanelMigrationHandler(panel, 'graph', old, prevFieldConfig);
+
+    const transform = panel.transformations![0];
+    expect(transform.id).toBe('reduce');
+    expect(transform.options.reducers).toBe('avg');
+  });
+});
diff --git a/public/app/plugins/panel/barchart/migrations.ts b/public/app/plugins/panel/barchart/migrations.ts
new file mode 100644
index 0000000000000..4dba05de84013
--- /dev/null
+++ b/public/app/plugins/panel/barchart/migrations.ts
@@ -0,0 +1,36 @@
+import { PanelTypeChangedHandler } from '@grafana/data';
+
+/*
+ * This is called when the panel changes from another panel
+ */
+export const changeToBarChartPanelMigrationHandler: PanelTypeChangedHandler = (
+  panel,
+  prevPluginId,
+  prevOptions,
+  prevFieldConfig
+) => {
+  if (prevPluginId === 'graph') {
+    const graphOptions: GraphOptions = prevOptions.angular;
+
+    if (graphOptions.xaxis?.mode === 'series') {
+      const tranformations = panel.transformations || [];
+      tranformations.push({
+        id: 'reduce',
+        options: {
+          reducers: graphOptions.xaxis?.values ?? ['sum'],
+        },
+      });
+
+      panel.transformations = tranformations;
+    }
+  }
+
+  return {};
+};
+
+interface GraphOptions {
+  xaxis: {
+    mode: 'series' | 'time' | 'histogram';
+    values?: string[];
+  };
+}
diff --git a/public/app/plugins/panel/barchart/module.tsx b/public/app/plugins/panel/barchart/module.tsx
index fbbdefb0b28f5..6fb9254af221c 100644
--- a/public/app/plugins/panel/barchart/module.tsx
+++ b/public/app/plugins/panel/barchart/module.tsx
@@ -9,18 +9,20 @@ import {
   VizOrientation,
 } from '@grafana/data';
 import { config } from '@grafana/runtime';
-import { GraphTransform, GraphTresholdsStyleMode, StackingMode, VisibilityMode } from '@grafana/schema';
+import { GraphTransform, GraphThresholdsStyleMode, StackingMode, VisibilityMode } from '@grafana/schema';
 import { graphFieldOptions, commonOptionsBuilder } from '@grafana/ui';
 
 import { ThresholdsStyleEditor } from '../timeseries/ThresholdsStyleEditor';
 
 import { BarChartPanel } from './BarChartPanel';
 import { TickSpacingEditor } from './TickSpacingEditor';
+import { changeToBarChartPanelMigrationHandler } from './migrations';
 import { FieldConfig, Options, defaultFieldConfig, defaultOptions } from './panelcfg.gen';
 import { BarChartSuggestionsSupplier } from './suggestions';
 import { prepareBarChartDisplayValues } from './utils';
 
 export const plugin = new PanelPlugin<Options, FieldConfig>(BarChartPanel)
+  .setPanelChangeHandler(changeToBarChartPanelMigrationHandler)
   .useFieldConfig({
     standardOptions: {
       [FieldConfigProperty.Color]: {
@@ -93,7 +95,7 @@ export const plugin = new PanelPlugin<Options, FieldConfig>(BarChartPanel)
         path: 'thresholdsStyle',
         name: 'Show thresholds',
         category: ['Thresholds'],
-        defaultValue: { mode: GraphTresholdsStyleMode.Off },
+        defaultValue: { mode: GraphThresholdsStyleMode.Off },
         settings: {
           options: graphFieldOptions.thresholdsDisplayModes,
         },
@@ -225,6 +227,7 @@ export const plugin = new PanelPlugin<Options, FieldConfig>(BarChartPanel)
         path: 'fullHighlight',
         name: 'Highlight full area on hover',
         defaultValue: defaultOptions.fullHighlight,
+        showIf: (c) => c.stacking === StackingMode.None,
       });
 
     builder.addFieldNamePicker({
@@ -233,10 +236,7 @@ export const plugin = new PanelPlugin<Options, FieldConfig>(BarChartPanel)
       description: 'Use the color value for a sibling field to color each bar value.',
     });
 
-    if (!context.options?.fullHighlight || context.options?.stacking === StackingMode.None) {
-      commonOptionsBuilder.addTooltipOptions(builder);
-    }
-
+    commonOptionsBuilder.addTooltipOptions(builder);
     commonOptionsBuilder.addLegendOptions(builder);
     commonOptionsBuilder.addTextSizeOptions(builder, false);
   })
diff --git a/public/app/plugins/panel/barchart/panelcfg.gen.ts b/public/app/plugins/panel/barchart/panelcfg.gen.ts
index 841dee4a260d5..8a30ebf269f28 100644
--- a/public/app/plugins/panel/barchart/panelcfg.gen.ts
+++ b/public/app/plugins/panel/barchart/panelcfg.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/public/app/plugins/panel/barchart/quadtree.ts b/public/app/plugins/panel/barchart/quadtree.ts
index 30446cacf3166..26850a9a8e881 100644
--- a/public/app/plugins/panel/barchart/quadtree.ts
+++ b/public/app/plugins/panel/barchart/quadtree.ts
@@ -14,24 +14,20 @@ export function pointWithin(px: number, py: number, rlft: number, rtop: number,
 /**
  * @internal
  */
-export function findRect(qt: Quadtree, sidx: number, didx: number): Rect | undefined {
-  let out: Rect | undefined;
+export function findRects(qt: Quadtree, sidx?: number, didx?: number) {
+  let rects: Rect[] = [];
 
   if (qt.o.length) {
-    out = qt.o.find((rect) => rect.sidx === sidx && rect.didx === didx);
+    rects.push(...qt.o.filter((rect) => (sidx == null || rect.sidx === sidx) && (didx == null || rect.didx === didx)));
   }
 
-  if (out == null && qt.q) {
+  if (qt.q) {
     for (let i = 0; i < qt.q.length; i++) {
-      out = findRect(qt.q[i], sidx, didx);
-
-      if (out) {
-        break;
-      }
+      rects.push(...findRects(qt.q[i], sidx, didx));
     }
   }
 
-  return out;
+  return rects;
 }
 
 /**
@@ -55,7 +51,7 @@ export class Quadtree {
     public y: number,
     public w: number,
     public h: number,
-    public l: number = 0
+    public l = 0
   ) {
     this.o = [];
     this.q = null;
diff --git a/public/app/plugins/panel/barchart/utils.test.ts b/public/app/plugins/panel/barchart/utils.test.ts
index 99edf5007ea19..07ea9e55e24a6 100644
--- a/public/app/plugins/panel/barchart/utils.test.ts
+++ b/public/app/plugins/panel/barchart/utils.test.ts
@@ -3,7 +3,6 @@ import { assertIsDefined } from 'test/helpers/asserts';
 import {
   createTheme,
   DefaultTimeZone,
-  EventBusSrv,
   FieldConfig,
   FieldType,
   getDefaultTimeRange,
@@ -120,7 +119,6 @@ describe('BarChart utils', () => {
         theme: createTheme(),
         timeZones: [DefaultTimeZone],
         getTimeRange: getDefaultTimeRange,
-        eventBus: new EventBusSrv(),
         allFrames: [frame],
       }).getConfig();
       expect(result).toMatchSnapshot();
@@ -135,7 +133,6 @@ describe('BarChart utils', () => {
           theme: createTheme(),
           timeZones: [DefaultTimeZone],
           getTimeRange: getDefaultTimeRange,
-          eventBus: new EventBusSrv(),
           allFrames: [frame],
         }).getConfig()
       ).toMatchSnapshot();
@@ -150,7 +147,6 @@ describe('BarChart utils', () => {
           theme: createTheme(),
           timeZones: [DefaultTimeZone],
           getTimeRange: getDefaultTimeRange,
-          eventBus: new EventBusSrv(),
           allFrames: [frame],
         }).getConfig()
       ).toMatchSnapshot();
@@ -158,13 +154,29 @@ describe('BarChart utils', () => {
   });
 
   describe('prepareGraphableFrames', () => {
-    it('will warn when there is no data in the response', () => {
+    it('will warn when there is no frames in the response', () => {
       const result = prepareBarChartDisplayValues([], createTheme(), { stacking: StackingMode.None } as Options);
       const warning = assertIsDefined('warn' in result ? result : null);
 
       expect(warning.warn).toEqual('No data in response');
     });
 
+    it('will warn when there is no data in the response', () => {
+      const result = prepareBarChartDisplayValues(
+        [
+          {
+            length: 0,
+            fields: [],
+          },
+        ],
+        createTheme(),
+        { stacking: StackingMode.None } as Options
+      );
+      const warning = assertIsDefined('warn' in result ? result : null);
+
+      expect(warning.warn).toEqual('No data in response');
+    });
+
     it('will warn when there is no string or time field', () => {
       const df = new MutableDataFrame({
         fields: [
@@ -241,9 +253,9 @@ describe('BarChart utils', () => {
       } as Options);
       const displayLegendValuesAsc = assertIsDefined('legend' in resultAsc ? resultAsc : null).legend;
 
+      expect(displayLegendValuesAsc.fields[0].config.unit).toBeUndefined();
       expect(displayLegendValuesAsc.fields[1].config.unit).toBeUndefined();
       expect(displayLegendValuesAsc.fields[2].config.unit).toBeUndefined();
-      expect(displayLegendValuesAsc.fields[3].config.unit).toBeUndefined();
     });
   });
 });
diff --git a/public/app/plugins/panel/barchart/utils.ts b/public/app/plugins/panel/barchart/utils.ts
index 9783cad08498a..e170ead77bd0d 100644
--- a/public/app/plugins/panel/barchart/utils.ts
+++ b/public/app/plugins/panel/barchart/utils.ts
@@ -1,3 +1,4 @@
+import { cloneDeep } from 'lodash';
 import uPlot, { Padding } from 'uplot';
 
 import {
@@ -13,13 +14,15 @@ import {
   outerJoinDataFrames,
   TimeZone,
   VizOrientation,
+  getFieldDisplayName,
 } from '@grafana/data';
 import { maybeSortFrame } from '@grafana/data/src/transformations/transformers/joinDataFrames';
+import { config as runtimeConfig } from '@grafana/runtime';
 import {
   AxisColorMode,
   AxisPlacement,
   GraphTransform,
-  GraphTresholdsStyleMode,
+  GraphThresholdsStyleMode,
   ScaleDirection,
   ScaleDistribution,
   ScaleOrientation,
@@ -31,6 +34,8 @@ import { AxisProps } from '@grafana/ui/src/components/uPlot/config/UPlotAxisBuil
 import { getStackingGroups } from '@grafana/ui/src/components/uPlot/utils';
 import { findField } from 'app/features/dimensions';
 
+import { setClassicPaletteIdxs } from '../timeseries/utils';
+
 import { BarsOptions, getConfig } from './bars';
 import { FieldConfig, Options, defaultFieldConfig } from './panelcfg.gen';
 import { BarChartDisplayValues, BarChartDisplayWarning } from './types';
@@ -58,6 +63,7 @@ export interface BarChartOptionsEX extends Options {
   getColor?: (seriesIdx: number, valueIdx: number, value: unknown) => string | null;
   timeZone?: TimeZone;
   fillOpacity?: number;
+  hoverMulti?: boolean;
 }
 
 export const preparePlotConfigBuilder: UPlotConfigPrepFn<BarChartOptionsEX> = ({
@@ -80,6 +86,7 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<BarChartOptionsEX> = ({
   legend,
   timeZone,
   fullHighlight,
+  hoverMulti,
 }) => {
   const builder = new UPlotConfigBuilder();
 
@@ -120,6 +127,7 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<BarChartOptionsEX> = ({
     xTimeAuto: frame.fields[0]?.type === FieldType.time && !frame.fields[0].config.unit?.startsWith('time:'),
     negY: frame.fields.map((f) => f.config.custom?.transform === GraphTransform.NegativeY),
     fullHighlight,
+    hoverMulti,
   };
 
   const config = getConfig(opts, theme);
@@ -130,7 +138,8 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<BarChartOptionsEX> = ({
   builder.addHook('drawClear', config.drawClear);
   builder.addHook('draw', config.draw);
 
-  builder.setTooltipInterpolator(config.interpolateTooltip);
+  const showNewVizTooltips = Boolean(runtimeConfig.featureToggles.newVizTooltips);
+  !showNewVizTooltips && builder.setTooltipInterpolator(config.interpolateTooltip);
 
   if (xTickLabelRotation !== 0) {
     // these are the amount of space we already have available between plot edge and first label
@@ -207,8 +216,8 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<BarChartOptionsEX> = ({
 
     // Render thresholds in graph
     if (customConfig.thresholdsStyle && field.config.thresholds) {
-      const thresholdDisplay = customConfig.thresholdsStyle.mode ?? GraphTresholdsStyleMode.Off;
-      if (thresholdDisplay !== GraphTresholdsStyleMode.Off) {
+      const thresholdDisplay = customConfig.thresholdsStyle.mode ?? GraphThresholdsStyleMode.Off;
+      if (thresholdDisplay !== GraphThresholdsStyleMode.Off) {
         builder.addThresholds({
           config: customConfig.thresholdsStyle,
           thresholds: field.config.thresholds,
@@ -374,7 +383,7 @@ export function prepareBarChartDisplayValues(
   theme: GrafanaTheme2,
   options: Options
 ): BarChartDisplayValues | BarChartDisplayWarning {
-  if (!series?.length) {
+  if (!series.length || series.every((fr) => fr.length === 0)) {
     return { warn: 'No data in response' };
   }
 
@@ -387,7 +396,8 @@ export function prepareBarChartDisplayValues(
           series[0],
           series[0].fields.findIndex((f) => f.type === FieldType.time)
         )
-      : outerJoinDataFrames({ frames: series });
+      : outerJoinDataFrames({ frames: series, keepDisplayNames: true });
+
   if (!frame) {
     return { warn: 'Unable to join data' };
   }
@@ -476,6 +486,13 @@ export function prepareBarChartDisplayValues(
     };
   }
 
+  // if both string and time fields exist, remove unused leftover time field
+  if (frame.fields[0].type === FieldType.time && frame.fields[0] !== firstField) {
+    frame.fields.shift();
+  }
+
+  setClassicPaletteIdxs([frame], theme, 0);
+
   if (!fields.length) {
     return {
       warn: 'No numeric fields found',
@@ -490,37 +507,30 @@ export function prepareBarChartDisplayValues(
     }
   }
 
-  let legendFields: Field[] = fields;
+  // If stacking is percent, we need to correct the legend fields unit and display
+  let legendFields: Field[] = cloneDeep(fields);
   if (options.stacking === StackingMode.Percent) {
-    legendFields = fields.map((field) => {
-      const alignedFrameField = frame.fields.find((f) => f.state?.displayName === field.state?.displayName)!;
-
-      const copy = {
-        ...field,
-        config: {
-          ...alignedFrameField.config,
-        },
-        values: field.values,
-      };
-
-      copy.display = getDisplayProcessor({ field: copy, theme });
+    legendFields.map((field) => {
+      const alignedFrameField = frame.fields.find(
+        (f) => getFieldDisplayName(f, frame) === getFieldDisplayName(f, frame)
+      );
 
-      return copy;
+      field.config.unit = alignedFrameField?.config?.unit ?? undefined;
+      field.display = getDisplayProcessor({ field: field, theme });
     });
-
-    legendFields.unshift(firstField);
   }
 
-  // String field is first
+  // String field is first, make sure fields / legend fields indexes match
   fields.unshift(firstField);
+  legendFields.unshift(firstField);
 
   return {
     aligned: frame,
     colorByField,
     viz: [
       {
-        length: firstField.values.length,
         fields: fields, // ideally: fields.filter((f) => !Boolean(f.config.custom?.hideFrom?.viz)),
+        length: firstField.values.length,
       },
     ],
     legend: {
diff --git a/public/app/plugins/panel/bargauge/BarGaugePanel.test.tsx b/public/app/plugins/panel/bargauge/BarGaugePanel.test.tsx
index 3d0d37ad973de..af4c44203b3ea 100644
--- a/public/app/plugins/panel/bargauge/BarGaugePanel.test.tsx
+++ b/public/app/plugins/panel/bargauge/BarGaugePanel.test.tsx
@@ -5,7 +5,7 @@ import React from 'react';
 import { dateMath, dateTime, EventBus, LoadingState, TimeRange, toDataFrame, VizOrientation } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { BarGaugeDisplayMode, BarGaugeValueMode } from '@grafana/schema';
-import { BarGaugeNamePlacement } from '@grafana/schema/dist/esm/common/common.gen';
+import { BarGaugeNamePlacement, BarGaugeSizing } from '@grafana/schema/dist/esm/common/common.gen';
 
 import { BarGaugePanel, BarGaugePanelProps } from './BarGaugePanel';
 
@@ -100,10 +100,12 @@ function buildPanelData(overrideValues?: Partial<BarGaugePanelProps>): BarGaugeP
       },
       orientation: VizOrientation.Horizontal,
       showUnfilled: true,
+      maxVizHeight: 100,
       minVizHeight: 10,
       minVizWidth: 0,
       valueMode: BarGaugeValueMode.Color,
       namePlacement: BarGaugeNamePlacement.Auto,
+      sizing: BarGaugeSizing.Auto,
     },
     transparent: false,
     timeRange,
diff --git a/public/app/plugins/panel/bargauge/BarGaugePanel.tsx b/public/app/plugins/panel/bargauge/BarGaugePanel.tsx
index 6eab0ca5a10f3..a76285a079981 100644
--- a/public/app/plugins/panel/bargauge/BarGaugePanel.tsx
+++ b/public/app/plugins/panel/bargauge/BarGaugePanel.tsx
@@ -12,11 +12,12 @@ import {
   DisplayValue,
   VizOrientation,
 } from '@grafana/data';
+import { BarGaugeSizing } from '@grafana/schema';
 import { BarGauge, DataLinksContextMenu, VizRepeater, VizRepeaterRenderValueProps } from '@grafana/ui';
 import { DataLinksContextMenuApi } from '@grafana/ui/src/components/DataLinks/DataLinksContextMenu';
 import { config } from 'app/core/config';
 
-import { Options } from './panelcfg.gen';
+import { Options, defaultOptions } from './panelcfg.gen';
 
 export class BarGaugePanel extends PureComponent<BarGaugePanelProps> {
   renderComponent = (
@@ -93,9 +94,40 @@ export class BarGaugePanel extends PureComponent<BarGaugePanelProps> {
     return 10;
   }
 
+  getOrientation(): VizOrientation {
+    const { options, width, height } = this.props;
+    const { orientation } = options;
+
+    if (orientation === VizOrientation.Auto) {
+      if (width > height) {
+        return VizOrientation.Vertical;
+      } else {
+        return VizOrientation.Horizontal;
+      }
+    }
+
+    return orientation;
+  }
+
+  calcBarSize() {
+    const { options } = this.props;
+
+    const orientation = this.getOrientation();
+    const isManualSizing = options.sizing === BarGaugeSizing.Manual;
+    const isVertical = orientation === VizOrientation.Vertical;
+    const isHorizontal = orientation === VizOrientation.Horizontal;
+    const minVizWidth = isManualSizing && isVertical ? options.minVizWidth : defaultOptions.minVizWidth;
+    const minVizHeight = isManualSizing && isHorizontal ? options.minVizHeight : defaultOptions.minVizHeight;
+    const maxVizHeight = isManualSizing && isHorizontal ? options.maxVizHeight : defaultOptions.maxVizHeight;
+
+    return { minVizWidth, minVizHeight, maxVizHeight };
+  }
+
   render() {
     const { height, width, options, data, renderCounter } = this.props;
 
+    const { minVizWidth, minVizHeight, maxVizHeight } = this.calcBarSize();
+
     return (
       <VizRepeater
         source={data}
@@ -105,8 +137,9 @@ export class BarGaugePanel extends PureComponent<BarGaugePanelProps> {
         renderCounter={renderCounter}
         width={width}
         height={height}
-        minVizWidth={options.minVizWidth}
-        minVizHeight={options.minVizHeight}
+        maxVizHeight={maxVizHeight}
+        minVizWidth={minVizWidth}
+        minVizHeight={minVizHeight}
         itemSpacing={this.getItemSpacing()}
         orientation={options.orientation}
       />
diff --git a/public/app/plugins/panel/bargauge/module.tsx b/public/app/plugins/panel/bargauge/module.tsx
index ebd07747271b1..c3c7841bb4bdd 100644
--- a/public/app/plugins/panel/bargauge/module.tsx
+++ b/public/app/plugins/panel/bargauge/module.tsx
@@ -1,5 +1,5 @@
 import { PanelPlugin, VizOrientation } from '@grafana/data';
-import { BarGaugeDisplayMode, BarGaugeNamePlacement, BarGaugeValueMode } from '@grafana/schema';
+import { BarGaugeDisplayMode, BarGaugeNamePlacement, BarGaugeSizing, BarGaugeValueMode } from '@grafana/schema';
 import { commonOptionsBuilder, sharedSingleStatPanelChangedHandler } from '@grafana/ui';
 
 import { addOrientationOption, addStandardDataReduceOptions } from '../stat/common';
@@ -61,19 +61,58 @@ export const plugin = new PanelPlugin<Options>(BarGaugePanel)
         defaultValue: defaultOptions.showUnfilled,
         showIf: (options) => options.displayMode !== 'lcd',
       })
-      .addNumberInput({
+      .addRadio({
+        path: 'sizing',
+        name: 'Bar size',
+        settings: {
+          options: [
+            { value: BarGaugeSizing.Auto, label: 'Auto' },
+            { value: BarGaugeSizing.Manual, label: 'Manual' },
+          ],
+        },
+        defaultValue: defaultOptions.sizing,
+      })
+      .addSliderInput({
         path: 'minVizWidth',
         name: 'Min width',
-        description: 'Minimum column width',
+        description: 'Minimum column width (vertical orientation)',
         defaultValue: defaultOptions.minVizWidth,
-        showIf: (options) => options.orientation === VizOrientation.Vertical,
+        settings: {
+          min: 0,
+          max: 300,
+          step: 1,
+        },
+        showIf: (options) =>
+          options.sizing === BarGaugeSizing.Manual &&
+          (options.orientation === VizOrientation.Auto || options.orientation === VizOrientation.Vertical),
       })
-      .addNumberInput({
+      .addSliderInput({
         path: 'minVizHeight',
         name: 'Min height',
-        description: 'Minimum row height',
+        description: 'Minimum row height (horizontal orientation)',
         defaultValue: defaultOptions.minVizHeight,
-        showIf: (options) => options.orientation === VizOrientation.Horizontal,
+        settings: {
+          min: 0,
+          max: 300,
+          step: 1,
+        },
+        showIf: (options) =>
+          options.sizing === BarGaugeSizing.Manual &&
+          (options.orientation === VizOrientation.Auto || options.orientation === VizOrientation.Horizontal),
+      })
+      .addSliderInput({
+        path: 'maxVizHeight',
+        name: 'Max height',
+        description: 'Maximum row height (horizontal orientation)',
+        defaultValue: defaultOptions.maxVizHeight,
+        settings: {
+          min: 0,
+          max: 300,
+          step: 1,
+        },
+        showIf: (options) =>
+          options.sizing === BarGaugeSizing.Manual &&
+          (options.orientation === VizOrientation.Auto || options.orientation === VizOrientation.Horizontal),
       });
   })
   .setPanelChangeHandler(sharedSingleStatPanelChangedHandler)
diff --git a/public/app/plugins/panel/bargauge/panelcfg.cue b/public/app/plugins/panel/bargauge/panelcfg.cue
index 9ad72f9ef9c90..984dd1020a46b 100644
--- a/public/app/plugins/panel/bargauge/panelcfg.cue
+++ b/public/app/plugins/panel/bargauge/panelcfg.cue
@@ -31,8 +31,10 @@ composableKinds: PanelCfg: {
 					valueMode:     common.BarGaugeValueMode & (*"color" | _)
 					namePlacement: common.BarGaugeNamePlacement & (*"auto" | _)
 					showUnfilled:  bool | *true
-					minVizWidth:   uint32 | *0
-					minVizHeight:  uint32 | *10
+					sizing:        common.BarGaugeSizing & (*"auto" | _)
+					minVizWidth:   uint32 | *8
+					minVizHeight:  uint32 | *16
+					maxVizHeight:  uint32 | *300
 				} @cuetsy(kind="interface")
 			}
 		}]
diff --git a/public/app/plugins/panel/bargauge/panelcfg.gen.ts b/public/app/plugins/panel/bargauge/panelcfg.gen.ts
index 94b61640a9a5e..eb6f40ef6a5ea 100644
--- a/public/app/plugins/panel/bargauge/panelcfg.gen.ts
+++ b/public/app/plugins/panel/bargauge/panelcfg.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
@@ -12,18 +12,22 @@ import * as common from '@grafana/schema';
 
 export interface Options extends common.SingleStatBaseOptions {
   displayMode: common.BarGaugeDisplayMode;
+  maxVizHeight: number;
   minVizHeight: number;
   minVizWidth: number;
   namePlacement: common.BarGaugeNamePlacement;
   showUnfilled: boolean;
+  sizing: common.BarGaugeSizing;
   valueMode: common.BarGaugeValueMode;
 }
 
 export const defaultOptions: Partial<Options> = {
   displayMode: common.BarGaugeDisplayMode.Gradient,
-  minVizHeight: 10,
-  minVizWidth: 0,
+  maxVizHeight: 300,
+  minVizHeight: 16,
+  minVizWidth: 8,
   namePlacement: common.BarGaugeNamePlacement.Auto,
   showUnfilled: true,
+  sizing: common.BarGaugeSizing.Auto,
   valueMode: common.BarGaugeValueMode.Color,
 };
diff --git a/public/app/plugins/panel/candlestick/CandlestickPanel.tsx b/public/app/plugins/panel/candlestick/CandlestickPanel.tsx
index e0707a3820f4f..fc920337f0bb6 100644
--- a/public/app/plugins/panel/candlestick/CandlestickPanel.tsx
+++ b/public/app/plugins/panel/candlestick/CandlestickPanel.tsx
@@ -1,23 +1,37 @@
 // this file is pretty much a copy-paste of TimeSeriesPanel.tsx :(
 // with some extra renderers passed to the <TimeSeries> component
 
-import React, { useMemo } from 'react';
+import React, { useMemo, useState, useCallback } from 'react';
 import uPlot from 'uplot';
 
-import { Field, getDisplayProcessor, getLinksSupplier, PanelProps } from '@grafana/data';
+import { Field, getDisplayProcessor, PanelProps } from '@grafana/data';
 import { PanelDataErrorView } from '@grafana/runtime';
-import { TooltipDisplayMode } from '@grafana/schema';
-import { TimeSeries, TooltipPlugin, UPlotConfigBuilder, usePanelContext, useTheme2, ZoomPlugin } from '@grafana/ui';
+import { DashboardCursorSync, TooltipDisplayMode } from '@grafana/schema';
+import {
+  EventBusPlugin,
+  KeyboardPlugin,
+  TooltipPlugin,
+  TooltipPlugin2,
+  UPlotConfigBuilder,
+  usePanelContext,
+  useTheme2,
+  ZoomPlugin,
+} from '@grafana/ui';
 import { AxisProps } from '@grafana/ui/src/components/uPlot/config/UPlotAxisBuilder';
 import { ScaleProps } from '@grafana/ui/src/components/uPlot/config/UPlotScaleBuilder';
+import { TimeRange2, TooltipHoverMode } from '@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2';
+import { TimeSeries } from 'app/core/components/TimeSeries/TimeSeries';
 import { config } from 'app/core/config';
 
+import { TimeSeriesTooltip } from '../timeseries/TimeSeriesTooltip';
 import { AnnotationEditorPlugin } from '../timeseries/plugins/AnnotationEditorPlugin';
 import { AnnotationsPlugin } from '../timeseries/plugins/AnnotationsPlugin';
+import { AnnotationsPlugin2 } from '../timeseries/plugins/AnnotationsPlugin2';
 import { ContextMenuPlugin } from '../timeseries/plugins/ContextMenuPlugin';
 import { ExemplarsPlugin } from '../timeseries/plugins/ExemplarsPlugin';
 import { OutsideRangePlugin } from '../timeseries/plugins/OutsideRangePlugin';
 import { ThresholdControlsPlugin } from '../timeseries/plugins/ThresholdControlsPlugin';
+import { isTooltipScrollable } from '../timeseries/utils';
 
 import { prepareCandlestickFields } from './fields';
 import { Options, defaultCandlestickColors, VizDisplayMode } from './types';
@@ -37,14 +51,38 @@ export const CandlestickPanel = ({
   onChangeTimeRange,
   replaceVariables,
 }: CandlestickPanelProps) => {
-  const { sync, canAddAnnotations, onThresholdsChange, canEditThresholds, showThresholds } = usePanelContext();
+  const {
+    sync,
+    canAddAnnotations,
+    onThresholdsChange,
+    canEditThresholds,
+    showThresholds,
+    dataLinkPostProcessor,
+    eventBus,
+  } = usePanelContext();
 
   const theme = useTheme2();
 
+  // TODO: we should just re-init when this changes, and have this be a static setting
+  const syncTooltip = useCallback(
+    () => sync?.() === DashboardCursorSync.Tooltip,
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
+
+  const syncAny = useCallback(
+    () => sync?.() !== DashboardCursorSync.Off,
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
+
   const info = useMemo(() => {
     return prepareCandlestickFields(data.series, options, theme, timeRange);
   }, [data.series, options, theme, timeRange]);
 
+  // temp range set for adding new annotation set by TooltipPlugin2, consumed by AnnotationPlugin2
+  const [newAnnotationRange, setNewAnnotationRange] = useState<TimeRange2 | null>(null);
+
   const { renderers, tweakScale, tweakAxis, shouldRenderPrice } = useMemo(() => {
     let tweakScale = (opts: ScaleProps, forField: Field) => opts;
     let tweakAxis = (opts: AxisProps, forField: Field) => opts;
@@ -225,7 +263,8 @@ export const CandlestickPanel = ({
     }
   }
 
-  const enableAnnotationCreation = Boolean(canAddAnnotations && canAddAnnotations());
+  const enableAnnotationCreation = Boolean(canAddAnnotations?.());
+  const showNewVizTooltips = Boolean(config.featureToggles.newVizTooltips);
 
   return (
     <TimeSeries
@@ -240,87 +279,139 @@ export const CandlestickPanel = ({
       tweakAxis={tweakAxis}
       tweakScale={tweakScale}
       options={options}
+      replaceVariables={replaceVariables}
+      dataLinkPostProcessor={dataLinkPostProcessor}
     >
-      {(config, alignedDataFrame) => {
-        alignedDataFrame.fields.forEach((field) => {
-          field.getLinks = getLinksSupplier(
-            alignedDataFrame,
-            field,
-            field.state!.scopedVars!,
-            replaceVariables,
-            timeZone
-          );
-        });
-
+      {(uplotConfig, alignedFrame) => {
         return (
           <>
-            <ZoomPlugin config={config} onZoom={onChangeTimeRange} withZoomY={true} />
-            <TooltipPlugin
-              data={alignedDataFrame}
-              config={config}
-              mode={TooltipDisplayMode.Multi}
-              sync={sync}
-              timeZone={timeZone}
-            />
-            {/* Renders annotation markers*/}
-            {data.annotations && (
-              <AnnotationsPlugin annotations={data.annotations} config={config} timeZone={timeZone} />
-            )}
-            {/* Enables annotations creation*/}
-            {enableAnnotationCreation ? (
-              <AnnotationEditorPlugin data={alignedDataFrame} timeZone={timeZone} config={config}>
-                {({ startAnnotating }) => {
+            <KeyboardPlugin config={uplotConfig} />
+            <EventBusPlugin config={uplotConfig} sync={syncAny} eventBus={eventBus} frame={alignedFrame} />
+            {showNewVizTooltips ? (
+              <TooltipPlugin2
+                config={uplotConfig}
+                hoverMode={
+                  options.tooltip.mode === TooltipDisplayMode.Single ? TooltipHoverMode.xOne : TooltipHoverMode.xAll
+                }
+                queryZoom={onChangeTimeRange}
+                clientZoom={true}
+                syncTooltip={syncTooltip}
+                render={(u, dataIdxs, seriesIdx, isPinned = false, dismiss, timeRange2, viaSync) => {
+                  if (enableAnnotationCreation && timeRange2 != null) {
+                    setNewAnnotationRange(timeRange2);
+                    dismiss();
+                    return;
+                  }
+
+                  const annotate = () => {
+                    let xVal = u.posToVal(u.cursor.left!, 'x');
+
+                    setNewAnnotationRange({ from: xVal, to: xVal });
+                    dismiss();
+                  };
+
                   return (
-                    <ContextMenuPlugin
-                      data={alignedDataFrame}
-                      config={config}
-                      timeZone={timeZone}
-                      replaceVariables={replaceVariables}
-                      defaultItems={
-                        enableAnnotationCreation
-                          ? [
-                              {
-                                items: [
-                                  {
-                                    label: 'Add annotation',
-                                    ariaLabel: 'Add annotation',
-                                    icon: 'comment-alt',
-                                    onClick: (e, p) => {
-                                      if (!p) {
-                                        return;
-                                      }
-                                      startAnnotating({ coords: p.coords });
-                                    },
-                                  },
-                                ],
-                              },
-                            ]
-                          : []
-                      }
+                    <TimeSeriesTooltip
+                      frames={[info.frame]}
+                      seriesFrame={alignedFrame}
+                      dataIdxs={dataIdxs}
+                      seriesIdx={seriesIdx}
+                      mode={viaSync ? TooltipDisplayMode.Multi : options.tooltip.mode}
+                      sortOrder={options.tooltip.sort}
+                      isPinned={isPinned}
+                      annotate={enableAnnotationCreation ? annotate : undefined}
+                      scrollable={isTooltipScrollable(options.tooltip)}
                     />
                   );
                 }}
-              </AnnotationEditorPlugin>
+                maxWidth={options.tooltip.maxWidth}
+                maxHeight={options.tooltip.maxHeight}
+              />
             ) : (
-              <ContextMenuPlugin
-                data={alignedDataFrame}
-                config={config}
+              <>
+                <ZoomPlugin config={uplotConfig} onZoom={onChangeTimeRange} withZoomY={true} />
+                <TooltipPlugin
+                  data={alignedFrame}
+                  config={uplotConfig}
+                  mode={TooltipDisplayMode.Multi}
+                  sync={sync}
+                  timeZone={timeZone}
+                />
+              </>
+            )}
+            {/* Renders annotation markers*/}
+            {showNewVizTooltips ? (
+              <AnnotationsPlugin2
+                annotations={data.annotations ?? []}
+                config={uplotConfig}
                 timeZone={timeZone}
-                replaceVariables={replaceVariables}
-                defaultItems={[]}
+                newRange={newAnnotationRange}
+                setNewRange={setNewAnnotationRange}
               />
+            ) : (
+              data.annotations && (
+                <AnnotationsPlugin annotations={data.annotations} config={uplotConfig} timeZone={timeZone} />
+              )
+            )}
+            {/* Enables annotations creation*/}
+            {!showNewVizTooltips ? (
+              enableAnnotationCreation ? (
+                <AnnotationEditorPlugin data={alignedFrame} timeZone={timeZone} config={uplotConfig}>
+                  {({ startAnnotating }) => {
+                    return (
+                      <ContextMenuPlugin
+                        data={alignedFrame}
+                        config={uplotConfig}
+                        timeZone={timeZone}
+                        replaceVariables={replaceVariables}
+                        defaultItems={
+                          enableAnnotationCreation
+                            ? [
+                                {
+                                  items: [
+                                    {
+                                      label: 'Add annotation',
+                                      ariaLabel: 'Add annotation',
+                                      icon: 'comment-alt',
+                                      onClick: (e, p) => {
+                                        if (!p) {
+                                          return;
+                                        }
+                                        startAnnotating({ coords: p.coords });
+                                      },
+                                    },
+                                  ],
+                                },
+                              ]
+                            : []
+                        }
+                      />
+                    );
+                  }}
+                </AnnotationEditorPlugin>
+              ) : (
+                <ContextMenuPlugin
+                  data={alignedFrame}
+                  config={uplotConfig}
+                  timeZone={timeZone}
+                  replaceVariables={replaceVariables}
+                  defaultItems={[]}
+                />
+              )
+            ) : undefined}
+            {data.annotations && (
+              <ExemplarsPlugin config={uplotConfig} exemplars={data.annotations} timeZone={timeZone} />
             )}
-            {data.annotations && <ExemplarsPlugin config={config} exemplars={data.annotations} timeZone={timeZone} />}
 
             {((canEditThresholds && onThresholdsChange) || showThresholds) && (
               <ThresholdControlsPlugin
-                config={config}
+                config={uplotConfig}
                 fieldConfig={fieldConfig}
                 onThresholdsChange={canEditThresholds ? onThresholdsChange : undefined}
               />
             )}
 
-            <OutsideRangePlugin config={config} onChangeTimeRange={onChangeTimeRange} />
+            <OutsideRangePlugin config={uplotConfig} onChangeTimeRange={onChangeTimeRange} />
           </>
         );
       }}
diff --git a/public/app/plugins/panel/candlestick/module.tsx b/public/app/plugins/panel/candlestick/module.tsx
index d4ae7b534a93c..2d6c62ab876a9 100644
--- a/public/app/plugins/panel/candlestick/module.tsx
+++ b/public/app/plugins/panel/candlestick/module.tsx
@@ -137,7 +137,10 @@ export const plugin = new PanelPlugin<Options, GraphFieldConfig>(CandlestickPane
       },
     });
 
-    // commonOptionsBuilder.addTooltipOptions(builder);
+    if (config.featureToggles.newVizTooltips) {
+      commonOptionsBuilder.addTooltipOptions(builder, false, true, opts);
+    }
+
     commonOptionsBuilder.addLegendOptions(builder);
   })
   .setDataSupport({ annotations: true, alertStates: true })
diff --git a/public/app/plugins/panel/candlestick/panelcfg.cue b/public/app/plugins/panel/candlestick/panelcfg.cue
index d4d7c769ed647..52c6b8c8a14fc 100644
--- a/public/app/plugins/panel/candlestick/panelcfg.cue
+++ b/public/app/plugins/panel/candlestick/panelcfg.cue
@@ -48,6 +48,7 @@ composableKinds: PanelCfg: {
 				} @cuetsy(kind="interface")
 				Options: {
 					common.OptionsWithLegend
+					common.OptionsWithTooltip
 
 					// Sets which dimensions are used for the visualization
 					mode: VizDisplayMode & (*"candles+volume" | _)
diff --git a/public/app/plugins/panel/candlestick/panelcfg.gen.ts b/public/app/plugins/panel/candlestick/panelcfg.gen.ts
index 8c704e366febe..d527f54d7eb49 100644
--- a/public/app/plugins/panel/candlestick/panelcfg.gen.ts
+++ b/public/app/plugins/panel/candlestick/panelcfg.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
@@ -61,7 +61,7 @@ export const defaultCandlestickColors: Partial<CandlestickColors> = {
   up: 'green',
 };
 
-export interface Options extends common.OptionsWithLegend {
+export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip {
   /**
    * Sets the style of the candlesticks
    */
diff --git a/public/app/plugins/panel/candlestick/plugin.json b/public/app/plugins/panel/candlestick/plugin.json
index c7ab55110198f..f260e1dc951af 100644
--- a/public/app/plugins/panel/candlestick/plugin.json
+++ b/public/app/plugins/panel/candlestick/plugin.json
@@ -4,6 +4,8 @@
   "id": "candlestick",
 
   "info": {
+    "description": "Graphical representation of price movements of a security, derivative, or currency.",
+    "keywords": ["financial", "price", "currency", "k-line"],
     "author": {
       "name": "Grafana Labs",
       "url": "https://grafana.com"
diff --git a/public/app/plugins/panel/candlestick/types.ts b/public/app/plugins/panel/candlestick/types.ts
index 81253afa1a52b..adf699253c8ff 100644
--- a/public/app/plugins/panel/candlestick/types.ts
+++ b/public/app/plugins/panel/candlestick/types.ts
@@ -1,4 +1,4 @@
-import { LegendDisplayMode } from '@grafana/schema';
+import { LegendDisplayMode, SortOrder, TooltipDisplayMode } from '@grafana/schema';
 
 import {
   defaultOptions as defaultOptionsBase,
@@ -21,6 +21,10 @@ export const defaultOptions: Partial<Options> = {
     placement: 'bottom',
     calcs: [],
   },
+  tooltip: {
+    mode: TooltipDisplayMode.Multi,
+    sort: SortOrder.None,
+  },
 };
 
 export {
diff --git a/public/app/plugins/panel/canvas/CanvasPanel.tsx b/public/app/plugins/panel/canvas/CanvasPanel.tsx
index 38838f8091380..195838a4231f4 100644
--- a/public/app/plugins/panel/canvas/CanvasPanel.tsx
+++ b/public/app/plugins/panel/canvas/CanvasPanel.tsx
@@ -67,6 +67,8 @@ export class CanvasPanel extends Component<Props, State> {
       this.props.options.root,
       this.props.options.inlineEditing,
       this.props.options.showAdvancedTypes,
+      this.props.options.panZoom,
+      this.props.options.infinitePan,
       this.onUpdateScene,
       this
     );
@@ -227,14 +229,28 @@ export class CanvasPanel extends Component<Props, State> {
     const inlineEditingSwitched = this.props.options.inlineEditing !== nextProps.options.inlineEditing;
     const shouldShowAdvancedTypesSwitched =
       this.props.options.showAdvancedTypes !== nextProps.options.showAdvancedTypes;
-    if (this.needsReload || inlineEditingSwitched || shouldShowAdvancedTypesSwitched) {
+    const panZoomSwitched = this.props.options.panZoom !== nextProps.options.panZoom;
+    const infinitePanSwitched = this.props.options.infinitePan !== nextProps.options.infinitePan;
+    if (
+      this.needsReload ||
+      inlineEditingSwitched ||
+      shouldShowAdvancedTypesSwitched ||
+      panZoomSwitched ||
+      infinitePanSwitched
+    ) {
       if (inlineEditingSwitched) {
         // Replace scene div to prevent selecto instance leaks
         this.scene.revId++;
       }
 
       this.needsReload = false;
-      this.scene.load(nextProps.options.root, nextProps.options.inlineEditing, nextProps.options.showAdvancedTypes);
+      this.scene.load(
+        nextProps.options.root,
+        nextProps.options.inlineEditing,
+        nextProps.options.showAdvancedTypes,
+        nextProps.options.panZoom,
+        nextProps.options.infinitePan
+      );
       this.scene.updateSize(nextProps.width, nextProps.height);
       this.scene.updateData(nextProps.data);
       changed = true;
diff --git a/public/app/plugins/panel/canvas/components/CanvasContextMenu.tsx b/public/app/plugins/panel/canvas/components/CanvasContextMenu.tsx
index c5868fbbcf2a8..e97619f8e0ab1 100644
--- a/public/app/plugins/panel/canvas/components/CanvasContextMenu.tsx
+++ b/public/app/plugins/panel/canvas/components/CanvasContextMenu.tsx
@@ -15,9 +15,10 @@ import { getElementTypes, onAddItem } from '../utils';
 type Props = {
   scene: Scene;
   panel: CanvasPanel;
+  onVisibilityChange: (v: boolean) => void;
 };
 
-export const CanvasContextMenu = ({ scene, panel }: Props) => {
+export const CanvasContextMenu = ({ scene, panel, onVisibilityChange }: Props) => {
   const inlineEditorOpen = panel.state.openInlineEdit;
   const [isMenuVisible, setIsMenuVisible] = useState<boolean>(false);
   const [anchorPoint, setAnchorPoint] = useState<AnchorPoint>({ x: 0, y: 0 });
@@ -29,7 +30,7 @@ export const CanvasContextMenu = ({ scene, panel }: Props) => {
 
   const handleContextMenu = useCallback(
     (event: Event) => {
-      if (!(event instanceof MouseEvent)) {
+      if (!(event instanceof MouseEvent) || event.ctrlKey) {
         return;
       }
 
@@ -45,8 +46,9 @@ export const CanvasContextMenu = ({ scene, panel }: Props) => {
       }
       setAnchorPoint({ x: event.pageX, y: event.pageY });
       setIsMenuVisible(true);
+      onVisibilityChange(true);
     },
-    [scene, panel]
+    [scene, panel, onVisibilityChange]
   );
 
   useEffect(() => {
@@ -65,9 +67,11 @@ export const CanvasContextMenu = ({ scene, panel }: Props) => {
 
   const closeContextMenu = () => {
     setIsMenuVisible(false);
+    onVisibilityChange(false);
   };
 
   const renderMenuItems = () => {
+    // This is disabled when panel is in edit mode because opening inline editor over panel editor is not ideal UX
     const openCloseEditorMenuItem = !scene.isPanelEditing && (
       <MenuItem
         label={inlineEditorOpen ? 'Close Editor' : 'Open Editor'}
@@ -114,9 +118,10 @@ export const CanvasContextMenu = ({ scene, panel }: Props) => {
         let offsetY = anchorPoint.y;
         let offsetX = anchorPoint.x;
         if (scene.div) {
+          const transformScale = scene.scale;
           const sceneContainerDimensions = scene.div.getBoundingClientRect();
-          offsetY = offsetY - sceneContainerDimensions.top;
-          offsetX = offsetX - sceneContainerDimensions.left;
+          offsetY = (offsetY - sceneContainerDimensions.top) / transformScale;
+          offsetX = (offsetX - sceneContainerDimensions.left) / transformScale;
         }
 
         onAddItem(option, rootLayer, {
@@ -135,7 +140,7 @@ export const CanvasContextMenu = ({ scene, panel }: Props) => {
       return submenuItems;
     };
 
-    const addItemMenuItem = !scene.isPanelEditing && (
+    const addItemMenuItem = (
       <MenuItem
         label="Add item"
         className={styles.menuItem}
@@ -144,7 +149,7 @@ export const CanvasContextMenu = ({ scene, panel }: Props) => {
       />
     );
 
-    const setBackgroundMenuItem = !scene.isPanelEditing && (
+    const setBackgroundMenuItem = (
       <MenuItem
         label={'Set background'}
         onClick={() => {
@@ -244,7 +249,7 @@ export const CanvasContextMenu = ({ scene, panel }: Props) => {
 };
 
 const getStyles = () => ({
-  menuItem: css`
-    max-width: 200px;
-  `,
+  menuItem: css({
+    maxWidth: '200px',
+  }),
 });
diff --git a/public/app/plugins/panel/canvas/components/CanvasTooltip.tsx b/public/app/plugins/panel/canvas/components/CanvasTooltip.tsx
index 6fb46c975a423..da5dbbfee7ea1 100644
--- a/public/app/plugins/panel/canvas/components/CanvasTooltip.tsx
+++ b/public/app/plugins/panel/canvas/components/CanvasTooltip.tsx
@@ -73,8 +73,8 @@ export const CanvasTooltip = ({ scene }: Props) => {
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  wrapper: css`
-    margin-top: 20px;
-    background: ${theme.colors.background.primary};
-  `,
+  wrapper: css({
+    marginTop: '20px',
+    background: theme.colors.background.primary,
+  }),
 });
diff --git a/public/app/plugins/panel/canvas/components/SetBackground.tsx b/public/app/plugins/panel/canvas/components/SetBackground.tsx
index 9b353a096f1df..60284cfefee81 100644
--- a/public/app/plugins/panel/canvas/components/SetBackground.tsx
+++ b/public/app/plugins/panel/canvas/components/SetBackground.tsx
@@ -59,9 +59,9 @@ export function SetBackground({ onClose, scene, anchorPoint }: Props) {
 }
 
 const getStyles = (theme: GrafanaTheme2, anchorPoint: AnchorPoint) => ({
-  portalWrapper: css`
-    width: 315px;
-    height: 445px;
-    transform: translate(${anchorPoint.x}px, ${anchorPoint.y - 200}px);
-  `,
+  portalWrapper: css({
+    width: '315px',
+    height: '445px',
+    transform: `translate(${anchorPoint.x}px, ${anchorPoint.y - 200}px)`,
+  }),
 });
diff --git a/public/app/plugins/panel/canvas/components/connections/ConnectionAnchors.tsx b/public/app/plugins/panel/canvas/components/connections/ConnectionAnchors.tsx
index 944be9d2ffde5..ed9903b30c072 100644
--- a/public/app/plugins/panel/canvas/components/connections/ConnectionAnchors.tsx
+++ b/public/app/plugins/panel/canvas/components/connections/ConnectionAnchors.tsx
@@ -7,6 +7,7 @@ import { ConnectionCoordinates } from 'app/features/canvas';
 
 type Props = {
   setRef: (anchorElement: HTMLDivElement) => void;
+  setAnchorsRef: (anchorsElement: HTMLDivElement) => void;
   handleMouseLeave: (
     event: React.MouseEvent<Element, MouseEvent> | React.FocusEvent<HTMLDivElement, Element>
   ) => boolean;
@@ -15,13 +16,33 @@ type Props = {
 export const CONNECTION_ANCHOR_DIV_ID = 'connectionControl';
 export const CONNECTION_ANCHOR_ALT = 'connection anchor';
 export const CONNECTION_ANCHOR_HIGHLIGHT_OFFSET = 8;
-
-const ANCHOR_PADDING = 3;
-
-export const ConnectionAnchors = ({ setRef, handleMouseLeave }: Props) => {
+// Unit is percentage from the middle of the element
+// 0, 0 middle; -1, -1 bottom left; 1, 1 top right
+export const ANCHORS = [
+  { x: -1, y: 1 },
+  { x: -0.5, y: 1 },
+  { x: 0, y: 1 },
+  { x: 0.5, y: 1 },
+  { x: 1, y: 1 },
+  { x: 1, y: 0.5 },
+  { x: 1, y: 0 },
+  { x: 1, y: -0.5 },
+  { x: 1, y: -1 },
+  { x: 0.5, y: -1 },
+  { x: 0, y: -1 },
+  { x: -0.5, y: -1 },
+  { x: -1, y: -1 },
+  { x: -1, y: -0.5 },
+  { x: -1, y: 0 },
+  { x: -1, y: 0.5 },
+];
+
+export const ANCHOR_PADDING = 3;
+export const HALF_SIZE = 2.5;
+
+export const ConnectionAnchors = ({ setRef, setAnchorsRef, handleMouseLeave }: Props) => {
   const highlightEllipseRef = useRef<HTMLDivElement>(null);
   const styles = useStyles2(getStyles);
-  const halfSize = 2.5;
   const halfSizeHighlightEllipse = 5.5;
   const anchorImage =
     'data:image/svg+xml;base64,PCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIj48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHdpZHRoPSI1cHgiIGhlaWdodD0iNXB4IiB2ZXJzaW9uPSIxLjEiPjxwYXRoIGQ9Im0gMCAwIEwgNSA1IE0gMCA1IEwgNSAwIiBzdHJva2Utd2lkdGg9IjIiIHN0eWxlPSJzdHJva2Utb3BhY2l0eTowLjQiIHN0cm9rZT0iI2ZmZmZmZiIvPjxwYXRoIGQ9Im0gMCAwIEwgNSA1IE0gMCA1IEwgNSAwIiBzdHJva2U9IiMyOWI2ZjIiLz48L3N2Zz4=';
@@ -54,40 +75,25 @@ export const ConnectionAnchors = ({ setRef, handleMouseLeave }: Props) => {
     }
   };
 
-  // Unit is percentage from the middle of the element
-  // 0, 0 middle; -1, -1 bottom left; 1, 1 top right
-  const ANCHORS = [
-    { x: -1, y: 1 },
-    { x: -0.5, y: 1 },
-    { x: 0, y: 1 },
-    { x: 0.5, y: 1 },
-    { x: 1, y: 1 },
-    { x: 1, y: 0.5 },
-    { x: 1, y: 0 },
-    { x: 1, y: -0.5 },
-    { x: 1, y: -1 },
-    { x: 0.5, y: -1 },
-    { x: 0, y: -1 },
-    { x: -0.5, y: -1 },
-    { x: -1, y: -1 },
-    { x: -1, y: -0.5 },
-    { x: -1, y: 0 },
-    { x: -1, y: 0.5 },
-  ];
-
   const generateAnchors = (anchors: ConnectionCoordinates[] = ANCHORS) => {
     return anchors.map((anchor) => {
       const id = `${anchor.x},${anchor.y}`;
 
       // Convert anchor coords to relative percentage
       const style = {
-        top: `calc(${-anchor.y * 50 + 50}% - ${halfSize}px - ${ANCHOR_PADDING}px)`,
-        left: `calc(${anchor.x * 50 + 50}% - ${halfSize}px - ${ANCHOR_PADDING}px)`,
+        top: `calc(${-anchor.y * 50 + 50}% - ${HALF_SIZE}px - ${ANCHOR_PADDING}px)`,
+        left: `calc(${anchor.x * 50 + 50}% - ${HALF_SIZE}px - ${ANCHOR_PADDING}px)`,
       };
 
       return (
         <img
           id={id}
+          ref={(element) => {
+            if (element) {
+              // After React 15+, inline styles no longer support !important
+              element.style.setProperty('pointer-events', 'auto', 'important');
+            }
+          }}
           key={id}
           alt={CONNECTION_ANCHOR_ALT}
           className={styles.anchor}
@@ -108,42 +114,40 @@ export const ConnectionAnchors = ({ setRef, handleMouseLeave }: Props) => {
         className={styles.highlightElement}
         onMouseLeave={onMouseLeaveHighlightElement}
       />
-      {generateAnchors()}
+      <div ref={setAnchorsRef}>{generateAnchors()}</div>
     </div>
   );
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  root: css`
-    position: absolute;
-    display: none;
-  `,
-  mouseoutDiv: css`
-    position: absolute;
-    margin: -30px;
-    width: calc(100% + 60px);
-    height: calc(100% + 60px);
-  `,
-  anchor: css`
-    padding: ${ANCHOR_PADDING}px;
-    position: absolute;
-    cursor: cursor;
-    width: calc(5px + 2 * ${ANCHOR_PADDING}px);
-    height: calc(5px + 2 * ${ANCHOR_PADDING}px);
-    z-index: 100;
-    pointer-events: auto !important;
-  `,
-  highlightElement: css`
-    background-color: #00ff00;
-    opacity: 0.3;
-    position: absolute;
-    cursor: cursor;
-    position: absolute;
-    pointer-events: auto;
-    width: 16px;
-    height: 16px;
-    border-radius: ${theme.shape.radius.circle};
-    display: none;
-    z-index: 110;
-  `,
+  root: css({
+    position: 'absolute',
+    display: 'none',
+  }),
+  mouseoutDiv: css({
+    position: 'absolute',
+    margin: '-30px',
+    width: 'calc(100% + 60px)',
+    height: 'calc(100% + 60px)',
+  }),
+  anchor: css({
+    padding: `${ANCHOR_PADDING}px`,
+    position: 'absolute',
+    cursor: 'cursor',
+    width: `calc(5px + 2 * ${ANCHOR_PADDING}px)`,
+    height: `calc(5px + 2 * ${ANCHOR_PADDING}px)`,
+    zIndex: 100,
+  }),
+  highlightElement: css({
+    backgroundColor: '#00ff00',
+    opacity: 0.3,
+    position: 'absolute',
+    cursor: 'cursor',
+    pointerEvents: 'auto',
+    width: '16px',
+    height: '16px',
+    borderRadius: theme.shape.radius.circle,
+    display: 'none',
+    zIndex: 110,
+  }),
 });
diff --git a/public/app/plugins/panel/canvas/components/connections/ConnectionSVG.tsx b/public/app/plugins/panel/canvas/components/connections/ConnectionSVG.tsx
index ca40af1220030..b7a3d2f449485 100644
--- a/public/app/plugins/panel/canvas/components/connections/ConnectionSVG.tsx
+++ b/public/app/plugins/panel/canvas/components/connections/ConnectionSVG.tsx
@@ -4,20 +4,42 @@ import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { GrafanaTheme2 } from '@grafana/data';
 import { useStyles2 } from '@grafana/ui';
 import { config } from 'app/core/config';
+import { ConnectionDirection } from 'app/features/canvas';
 import { Scene } from 'app/features/canvas/runtime/scene';
 
+import { ConnectionCoordinates } from '../../panelcfg.gen';
 import { ConnectionState } from '../../types';
+import {
+  calculateAngle,
+  calculateCoordinates,
+  calculateDistance,
+  calculateMidpoint,
+  getConnectionStyles,
+  getParentBoundingClientRect,
+} from '../../utils';
+
+import { CONNECTION_VERTEX_ADD_ID, CONNECTION_VERTEX_ID } from './Connections';
 
 type Props = {
   setSVGRef: (anchorElement: SVGSVGElement) => void;
   setLineRef: (anchorElement: SVGLineElement) => void;
+  setSVGVertexRef: (anchorElement: SVGSVGElement) => void;
+  setVertexPathRef: (anchorElement: SVGPathElement) => void;
+  setVertexRef: (anchorElement: SVGCircleElement) => void;
   scene: Scene;
 };
 
 let idCounter = 0;
 const htmlElementTypes = ['input', 'textarea'];
 
-export const ConnectionSVG = ({ setSVGRef, setLineRef, scene }: Props) => {
+export const ConnectionSVG = ({
+  setSVGRef,
+  setLineRef,
+  setSVGVertexRef,
+  setVertexPathRef,
+  setVertexRef,
+  scene,
+}: Props) => {
   const styles = useStyles2(getStyles);
 
   const headId = Date.now() + '_' + idCounter++;
@@ -25,6 +47,8 @@ export const ConnectionSVG = ({ setSVGRef, setLineRef, scene }: Props) => {
   const EDITOR_HEAD_ID = useMemo(() => `editorHead-${headId}`, [headId]);
   const defaultArrowColor = config.theme2.colors.text.primary;
   const defaultArrowSize = 2;
+  const defaultArrowDirection = ConnectionDirection.Forward;
+  const maximumVertices = 10;
 
   const [selectedConnection, setSelectedConnection] = useState<ConnectionState | undefined>(undefined);
 
@@ -97,114 +121,386 @@ export const ConnectionSVG = ({ setSVGRef, setLineRef, scene }: Props) => {
     }
   };
 
-  // @TODO revisit, currently returning last row index for field
-  const getRowIndex = (fieldName: string | undefined) => {
-    if (fieldName) {
-      const series = scene.context.getPanelData()?.series[0];
-      const field = series?.fields.find((f) => (f.name = fieldName));
-      const data = field?.values;
-
-      return data ? data.length - 1 : 0;
-    }
-
-    return 0;
-  };
-
   // Figure out target and then target's relative coordinates drawing (if no target do parent)
   const renderConnections = () => {
-    return scene.connections.state.map((v, idx) => {
-      const { source, target, info } = v;
-      const sourceRect = source.div?.getBoundingClientRect();
-      const parent = source.div?.parentElement;
-      const parentRect = parent?.getBoundingClientRect();
-
-      if (!sourceRect || !parent || !parentRect) {
-        return;
-      }
-
-      const sourceHorizontalCenter = sourceRect.left - parentRect.left + sourceRect.width / 2;
-      const sourceVerticalCenter = sourceRect.top - parentRect.top + sourceRect.height / 2;
-
-      // Convert from connection coords to DOM coords
-      // TODO: Break this out into util function and add tests
-      const x1 = sourceHorizontalCenter + (info.source.x * sourceRect.width) / 2;
-      const y1 = sourceVerticalCenter - (info.source.y * sourceRect.height) / 2;
-
-      let x2;
-      let y2;
-
-      if (info.targetName) {
-        const targetRect = target.div?.getBoundingClientRect();
-
-        const targetHorizontalCenter = targetRect!.left - parentRect.left + targetRect!.width / 2;
-        const targetVerticalCenter = targetRect!.top - parentRect.top + targetRect!.height / 2;
-
-        x2 = targetHorizontalCenter + (info.target.x * targetRect!.width) / 2;
-        y2 = targetVerticalCenter - (info.target.y * targetRect!.height) / 2;
-      } else {
-        const parentHorizontalCenter = parentRect.width / 2;
-        const parentVerticalCenter = parentRect.height / 2;
-
-        x2 = parentHorizontalCenter + (info.target.x * parentRect.width) / 2;
-        y2 = parentVerticalCenter - (info.target.y * parentRect.height) / 2;
-      }
+    return (
+      scene.connections.state
+        // Render selected connection last, ensuring it is above other connections
+        .sort((_a, b) => (selectedConnection === b && scene.panel.context.instanceState.selectedConnection ? -1 : 0))
+        .map((v, idx) => {
+          const { source, target, info, vertices, index } = v;
+          const sourceRect = source.div?.getBoundingClientRect();
+          const parent = source.div?.parentElement;
+          const transformScale = scene.scale;
+          const parentRect = getParentBoundingClientRect(scene);
+
+          if (!sourceRect || !parent || !parentRect) {
+            return;
+          }
+
+          const { x1, y1, x2, y2 } = calculateCoordinates(sourceRect, parentRect, info, target, transformScale);
+
+          let { xStart, yStart, xEnd, yEnd } = { xStart: x1, yStart: y1, xEnd: x2, yEnd: y2 };
+          if (v.sourceOriginal && v.targetOriginal) {
+            xStart = v.sourceOriginal.x;
+            yStart = v.sourceOriginal.y;
+            xEnd = v.targetOriginal.x;
+            yEnd = v.targetOriginal.y;
+          } else if (source.options.connections) {
+            // If original source or target coordinates are not set for the current connection, set them
+            if (
+              !source.options.connections[index].sourceOriginal ||
+              !source.options.connections[index].targetOriginal
+            ) {
+              source.options.connections[index].sourceOriginal = { x: x1, y: y1 };
+              source.options.connections[index].targetOriginal = { x: x2, y: y2 };
+            }
+          }
+
+          const midpoint = calculateMidpoint(x1, y1, x2, y2);
+          const xDist = xEnd - xStart;
+          const yDist = yEnd - yStart;
+
+          const { strokeColor, strokeWidth, strokeRadius, arrowDirection, lineStyle } = getConnectionStyles(
+            info,
+            scene,
+            defaultArrowSize,
+            defaultArrowDirection
+          );
 
-      const isSelected = selectedConnection === v && scene.panel.context.instanceState.selectedConnection;
-
-      const strokeColor = info.color ? scene.context.getColor(info.color).value() : defaultArrowColor;
-      const lastRowIndex = getRowIndex(info.size?.field);
-
-      const strokeWidth = info.size ? scene.context.getScale(info.size).get(lastRowIndex) : defaultArrowSize;
-
-      const connectionCursorStyle = scene.isEditingEnabled ? 'grab' : '';
-      const selectedStyles = { stroke: '#44aaff', strokeOpacity: 0.6, strokeWidth: strokeWidth + 5 };
-
-      const CONNECTION_HEAD_ID = `connectionHead-${headId + Math.random()}`;
-
-      return (
-        <svg className={styles.connection} key={idx}>
-          <g onClick={() => selectConnection(v)}>
-            <defs>
-              <marker
-                id={CONNECTION_HEAD_ID}
-                markerWidth="10"
-                markerHeight="7"
-                refX="10"
-                refY="3.5"
-                orient="auto"
-                stroke={strokeColor}
-              >
-                <polygon points="0 0, 10 3.5, 0 7" fill={strokeColor} />
-              </marker>
-            </defs>
-            <line
-              id={`${CONNECTION_LINE_ID}_transparent`}
-              cursor={connectionCursorStyle}
-              pointerEvents="auto"
-              stroke="transparent"
-              strokeWidth={15}
-              style={isSelected ? selectedStyles : {}}
-              x1={x1}
-              y1={y1}
-              x2={x2}
-              y2={y2}
-            />
-            <line
-              id={CONNECTION_LINE_ID}
-              stroke={strokeColor}
-              pointerEvents="auto"
-              strokeWidth={strokeWidth}
-              markerEnd={`url(#${CONNECTION_HEAD_ID})`}
-              x1={x1}
-              y1={y1}
-              x2={x2}
-              y2={y2}
-              cursor={connectionCursorStyle}
-            />
-          </g>
-        </svg>
-      );
-    });
+          const isSelected = selectedConnection === v && scene.panel.context.instanceState.selectedConnection;
+
+          const connectionCursorStyle = scene.isEditingEnabled ? 'grab' : '';
+          const selectedStyles = { stroke: '#44aaff', strokeOpacity: 0.6, strokeWidth: strokeWidth + 5 };
+
+          const CONNECTION_HEAD_ID_START = `connectionHeadStart-${headId + Math.random()}`;
+          const CONNECTION_HEAD_ID_END = `connectionHeadEnd-${headId + Math.random()}`;
+
+          const radius = strokeRadius;
+          // Create vertex path and populate array of add vertex controls
+          const addVertices: ConnectionCoordinates[] = [];
+          let pathString = `M${x1} ${y1} `;
+          if (vertices?.length) {
+            vertices.map((vertex, index) => {
+              const x = vertex.x;
+              const y = vertex.y;
+
+              // Convert vertex relative coordinates to scene coordinates
+              const X = x * xDist + xStart;
+              const Y = y * yDist + yStart;
+
+              // Initialize coordinates for first arc control point
+              let xa = X;
+              let ya = Y;
+
+              // Initialize coordinates for second arc control point
+              let xb = X;
+              let yb = Y;
+
+              // Initialize half arc distance and segment angles
+              let lHalfArc = 0;
+              let angle1 = 0;
+              let angle2 = 0;
+
+              // Only calculate arcs if there is a radius
+              if (radius) {
+                if (index < vertices.length - 1) {
+                  const Xn = vertices[index + 1].x * xDist + xStart;
+                  const Yn = vertices[index + 1].y * yDist + yStart;
+                  if (index === 0) {
+                    // First vertex
+                    angle1 = calculateAngle(x1, y1, X, Y);
+                    angle2 = calculateAngle(X, Y, Xn, Yn);
+                  } else {
+                    // All vertices
+                    const previousVertex = vertices[index - 1];
+                    const Xp = previousVertex.x * xDist + xStart;
+                    const Yp = previousVertex.y * yDist + yStart;
+                    angle1 = calculateAngle(Xp, Yp, X, Y);
+                    angle2 = calculateAngle(X, Y, Xn, Yn);
+                  }
+                } else {
+                  // Last vertex
+                  if (index > 0) {
+                    // Not also the first vertex
+                    const previousVertex = vertices[index - 1];
+                    const Xp = previousVertex.x * xDist + xStart;
+                    const Yp = previousVertex.y * yDist + yStart;
+                    angle1 = calculateAngle(Xp, Yp, X, Y);
+                  } else {
+                    angle1 = calculateAngle(x1, y1, X, Y);
+                  }
+                  angle2 = calculateAngle(X, Y, x2, y2);
+                }
+
+                // Calculate angle between two segments where arc will be placed
+                const theta = angle2 - angle1; //radians
+                // Attempt to determine if arc is counter clockwise (ccw)
+                const ccw = theta < 0;
+                // Half arc is used for arc control points
+                lHalfArc = radius * Math.tan(theta / 2);
+                if (ccw) {
+                  lHalfArc *= -1;
+                }
+              }
+
+              if (index === 0) {
+                // For first vertex
+                addVertices.push(
+                  calculateMidpoint((x1 - xStart) / (xEnd - xStart), (y1 - yStart) / (yEnd - yStart), x, y)
+                );
+
+                // Only calculate arcs if there is a radius
+                if (radius) {
+                  // Length of segment
+                  const lSegment = calculateDistance(X, Y, x1, y1);
+                  if (Math.abs(lHalfArc) > 0.5 * Math.abs(lSegment)) {
+                    // Limit curve control points to mid segment
+                    lHalfArc = 0.5 * lSegment;
+                  }
+                  // Default next point to last point
+                  let Xn = x2;
+                  let Yn = y2;
+                  if (index < vertices.length - 1) {
+                    // Not also the last point
+                    const nextVertex = vertices[index + 1];
+                    Xn = nextVertex.x * xDist + xStart;
+                    Yn = nextVertex.y * yDist + yStart;
+                  }
+
+                  // Length of next segment
+                  const lSegmentNext = calculateDistance(X, Y, Xn, Yn);
+                  if (Math.abs(lHalfArc) > 0.5 * Math.abs(lSegmentNext)) {
+                    // Limit curve control points to mid segment
+                    lHalfArc = 0.5 * lSegmentNext;
+                  }
+                  // Calculate arc control points
+                  const lDelta = lSegment - lHalfArc;
+                  xa = Math.round(lDelta * Math.cos(angle1) + x1);
+                  ya = Math.round(lDelta * Math.sin(angle1) + y1);
+                  xb = Math.round(lHalfArc * Math.cos(angle2) + X);
+                  yb = Math.round(lHalfArc * Math.sin(angle2) + Y);
+
+                  // Check if arc control points are inside of segment, otherwise swap sign
+                  if ((xa > X && xa > x1) || (xa < X && xa < x1)) {
+                    xa = (lDelta + 2 * lHalfArc) * Math.cos(angle1) + x1;
+                    ya = (lDelta + 2 * lHalfArc) * Math.sin(angle1) + y1;
+                    xb = -lHalfArc * Math.cos(angle2) + X;
+                    yb = -lHalfArc * Math.sin(angle2) + Y;
+                  }
+                }
+              } else {
+                // For all other vertices
+                const previousVertex = vertices[index - 1];
+                addVertices.push(calculateMidpoint(previousVertex.x, previousVertex.y, x, y));
+
+                // Only calculate arcs if there is a radius
+                if (radius) {
+                  // Convert previous vertex relative coorindates to scene coordinates
+                  const Xp = previousVertex.x * xDist + xStart;
+                  const Yp = previousVertex.y * yDist + yStart;
+
+                  // Length of segment
+                  const lSegment = calculateDistance(X, Y, Xp, Yp);
+                  if (Math.abs(lHalfArc) > 0.5 * Math.abs(lSegment)) {
+                    // Limit curve control points to mid segment
+                    lHalfArc = 0.5 * lSegment;
+                  }
+                  // Default next point to last point
+                  let Xn = x2;
+                  let Yn = y2;
+                  if (index < vertices.length - 1) {
+                    // Not also the last point
+                    const nextVertex = vertices[index + 1];
+                    Xn = nextVertex.x * xDist + xStart;
+                    Yn = nextVertex.y * yDist + yStart;
+                  }
+
+                  // Length of next segment
+                  const lSegmentNext = calculateDistance(X, Y, Xn, Yn);
+                  if (Math.abs(lHalfArc) > 0.5 * Math.abs(lSegmentNext)) {
+                    // Limit curve control points to mid segment
+                    lHalfArc = 0.5 * lSegmentNext;
+                  }
+
+                  // Calculate arc control points
+                  const lDelta = lSegment - lHalfArc;
+                  xa = Math.round(lDelta * Math.cos(angle1) + Xp);
+                  ya = Math.round(lDelta * Math.sin(angle1) + Yp);
+                  xb = Math.round(lHalfArc * Math.cos(angle2) + X);
+                  yb = Math.round(lHalfArc * Math.sin(angle2) + Y);
+
+                  // Check if arc control points are inside of segment, otherwise swap sign
+                  if ((xa > X && xa > Xp) || (xa < X && xa < Xp)) {
+                    xa = (lDelta + 2 * lHalfArc) * Math.cos(angle1) + Xp;
+                    ya = (lDelta + 2 * lHalfArc) * Math.sin(angle1) + Yp;
+                    xb = -lHalfArc * Math.cos(angle2) + X;
+                    yb = -lHalfArc * Math.sin(angle2) + Y;
+                  }
+                }
+              }
+              if (index === vertices.length - 1) {
+                // For last vertex only
+                addVertices.push(
+                  calculateMidpoint((x2 - xStart) / (xEnd - xStart), (y2 - yStart) / (yEnd - yStart), x, y)
+                );
+              }
+              // Add segment to path
+              pathString += `L${xa} ${ya} `;
+
+              if (lHalfArc !== 0) {
+                // Add arc if applicable
+                pathString += `Q ${X} ${Y} ${xb} ${yb} `;
+              }
+            });
+            // Add last segment
+            pathString += `L${x2} ${y2}`;
+          }
+
+          const markerStart =
+            arrowDirection === ConnectionDirection.Reverse || arrowDirection === ConnectionDirection.Both
+              ? `url(#${CONNECTION_HEAD_ID_START})`
+              : undefined;
+
+          const markerEnd =
+            arrowDirection === ConnectionDirection.Forward || arrowDirection === ConnectionDirection.Both
+              ? `url(#${CONNECTION_HEAD_ID_END})`
+              : undefined;
+
+          return (
+            <svg className={styles.connection} key={idx}>
+              <g onClick={() => selectConnection(v)}>
+                <defs>
+                  <marker
+                    id={CONNECTION_HEAD_ID_START}
+                    markerWidth="10"
+                    markerHeight="7"
+                    refX="0"
+                    refY="3.5"
+                    orient="auto"
+                    stroke={strokeColor}
+                  >
+                    <polygon points="10 0, 0 3.5, 10 7" fill={strokeColor} />
+                  </marker>
+                  <marker
+                    id={CONNECTION_HEAD_ID_END}
+                    markerWidth="10"
+                    markerHeight="7"
+                    refX="10"
+                    refY="3.5"
+                    orient="auto"
+                    stroke={strokeColor}
+                  >
+                    <polygon points="0 0, 10 3.5, 0 7" fill={strokeColor} />
+                  </marker>
+                </defs>
+                {vertices?.length ? (
+                  <g>
+                    <path
+                      id={`${CONNECTION_LINE_ID}_transparent`}
+                      d={pathString}
+                      cursor={connectionCursorStyle}
+                      pointerEvents="auto"
+                      stroke="transparent"
+                      strokeWidth={15}
+                      fill={'none'}
+                      style={isSelected ? selectedStyles : {}}
+                    />
+                    <path
+                      d={pathString}
+                      stroke={strokeColor}
+                      strokeWidth={strokeWidth}
+                      strokeDasharray={lineStyle}
+                      fill={'none'}
+                      markerEnd={markerEnd}
+                      markerStart={markerStart}
+                    />
+                    {isSelected && (
+                      <g>
+                        {vertices.map((value, index) => {
+                          return (
+                            <circle
+                              id={CONNECTION_VERTEX_ID}
+                              data-index={index}
+                              key={`${CONNECTION_VERTEX_ID}${index}_${idx}`}
+                              cx={value.x * xDist + xStart}
+                              cy={value.y * yDist + yStart}
+                              r={5}
+                              stroke={strokeColor}
+                              className={styles.vertex}
+                              cursor={'crosshair'}
+                              pointerEvents="auto"
+                            />
+                          );
+                        })}
+                        {vertices.length < maximumVertices &&
+                          addVertices.map((value, index) => {
+                            return (
+                              <circle
+                                id={CONNECTION_VERTEX_ADD_ID}
+                                data-index={index}
+                                key={`${CONNECTION_VERTEX_ADD_ID}${index}_${idx}`}
+                                cx={value.x * xDist + xStart}
+                                cy={value.y * yDist + yStart}
+                                r={4}
+                                stroke={strokeColor}
+                                className={styles.addVertex}
+                                cursor={'crosshair'}
+                                pointerEvents="auto"
+                              />
+                            );
+                          })}
+                      </g>
+                    )}
+                  </g>
+                ) : (
+                  <g>
+                    <line
+                      id={`${CONNECTION_LINE_ID}_transparent`}
+                      cursor={connectionCursorStyle}
+                      pointerEvents="auto"
+                      stroke="transparent"
+                      strokeWidth={15}
+                      style={isSelected ? selectedStyles : {}}
+                      x1={x1}
+                      y1={y1}
+                      x2={x2}
+                      y2={y2}
+                    />
+                    <line
+                      id={CONNECTION_LINE_ID}
+                      stroke={strokeColor}
+                      pointerEvents="auto"
+                      strokeWidth={strokeWidth}
+                      markerEnd={markerEnd}
+                      markerStart={markerStart}
+                      strokeDasharray={lineStyle}
+                      x1={x1}
+                      y1={y1}
+                      x2={x2}
+                      y2={y2}
+                      cursor={connectionCursorStyle}
+                    />
+                    {isSelected && (
+                      <circle
+                        id={CONNECTION_VERTEX_ADD_ID}
+                        data-index={0}
+                        cx={midpoint.x}
+                        cy={midpoint.y}
+                        r={4}
+                        stroke={strokeColor}
+                        className={styles.addVertex}
+                        cursor={'crosshair'}
+                        pointerEvents="auto"
+                      />
+                    )}
+                  </g>
+                )}
+              </g>
+            </svg>
+          );
+        })
+    );
   };
 
   return (
@@ -225,25 +521,44 @@ export const ConnectionSVG = ({ setSVGRef, setLineRef, scene }: Props) => {
         </defs>
         <line ref={setLineRef} stroke={defaultArrowColor} strokeWidth={2} markerEnd={`url(#${EDITOR_HEAD_ID})`} />
       </svg>
+      <svg ref={setSVGVertexRef} className={styles.editorSVG}>
+        <path
+          ref={setVertexPathRef}
+          stroke={defaultArrowColor}
+          strokeWidth={2}
+          strokeDasharray={'5, 5'}
+          fill={'none'}
+        />
+        <circle ref={setVertexRef} stroke={defaultArrowColor} r={4} className={styles.vertex} />
+      </svg>
       {renderConnections()}
     </>
   );
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  editorSVG: css`
-    position: absolute;
-    pointer-events: none;
-    width: 100%;
-    height: 100%;
-    z-index: 1000;
-    display: none;
-  `,
-  connection: css`
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    z-index: 1000;
-    pointer-events: none;
-  `,
+  editorSVG: css({
+    position: 'absolute',
+    pointerEvents: 'none',
+    width: '100%',
+    height: '100%',
+    zIndex: 1000,
+    display: 'none',
+  }),
+  connection: css({
+    position: 'absolute',
+    width: '100%',
+    height: '100%',
+    zIndex: 1000,
+    pointerEvents: 'none',
+  }),
+  vertex: css({
+    fill: '#44aaff',
+    strokeWidth: 2,
+  }),
+  addVertex: css({
+    fill: '#44aaff',
+    opacity: 0.5,
+    strokeWidth: 1,
+  }),
 });
diff --git a/public/app/plugins/panel/canvas/components/connections/Connections.tsx b/public/app/plugins/panel/canvas/components/connections/Connections.tsx
index e3e5ac6e49274..2c066bcea635c 100644
--- a/public/app/plugins/panel/canvas/components/connections/Connections.tsx
+++ b/public/app/plugins/panel/canvas/components/connections/Connections.tsx
@@ -2,24 +2,48 @@ import React from 'react';
 import { BehaviorSubject } from 'rxjs';
 
 import { config } from '@grafana/runtime';
-import { CanvasConnection, ConnectionPath } from 'app/features/canvas';
+import { CanvasConnection, ConnectionCoordinates, ConnectionPath } from 'app/features/canvas';
 import { ElementState } from 'app/features/canvas/runtime/element';
 import { Scene } from 'app/features/canvas/runtime/scene';
 
 import { ConnectionState } from '../../types';
-import { getConnections, isConnectionSource, isConnectionTarget } from '../../utils';
-
-import { CONNECTION_ANCHOR_ALT, ConnectionAnchors, CONNECTION_ANCHOR_HIGHLIGHT_OFFSET } from './ConnectionAnchors';
+import {
+  calculateAngle,
+  calculateCoordinates,
+  getConnections,
+  getParentBoundingClientRect,
+  isConnectionSource,
+  isConnectionTarget,
+} from '../../utils';
+
+import {
+  CONNECTION_ANCHOR_ALT,
+  ConnectionAnchors,
+  CONNECTION_ANCHOR_HIGHLIGHT_OFFSET,
+  ANCHORS,
+  ANCHOR_PADDING,
+  HALF_SIZE,
+} from './ConnectionAnchors';
 import { ConnectionSVG } from './ConnectionSVG';
 
+export const CONNECTION_VERTEX_ID = 'vertex';
+export const CONNECTION_VERTEX_ADD_ID = 'vertexAdd';
+const CONNECTION_VERTEX_ORTHO_TOLERANCE = 0.05; // Cartesian ratio against vertical or horizontal tolerance
+const CONNECTION_VERTEX_SNAP_TOLERANCE = (5 / 180) * Math.PI; // Multi-segment snapping angle in radians to trigger vertex removal
+
 export class Connections {
   scene: Scene;
   connectionAnchorDiv?: HTMLDivElement;
+  anchorsDiv?: HTMLDivElement;
   connectionSVG?: SVGElement;
   connectionLine?: SVGLineElement;
+  connectionSVGVertex?: SVGElement;
+  connectionVertexPath?: SVGPathElement;
+  connectionVertex?: SVGCircleElement;
   connectionSource?: ElementState;
   connectionTarget?: ElementState;
   isDrawingConnection?: boolean;
+  selectedVertexIndex?: number;
   didConnectionLeaveHighlight?: boolean;
   state: ConnectionState[] = [];
   readonly selection = new BehaviorSubject<ConnectionState | undefined>(undefined);
@@ -54,6 +78,10 @@ export class Connections {
     this.connectionAnchorDiv = anchorElement;
   };
 
+  setAnchorsRef = (anchorsElement: HTMLDivElement) => {
+    this.anchorsDiv = anchorsElement;
+  };
+
   setConnectionSVGRef = (connectionSVG: SVGSVGElement) => {
     this.connectionSVG = connectionSVG;
   };
@@ -62,6 +90,18 @@ export class Connections {
     this.connectionLine = connectionLine;
   };
 
+  setConnectionSVGVertexRef = (connectionSVG: SVGSVGElement) => {
+    this.connectionSVGVertex = connectionSVG;
+  };
+
+  setConnectionVertexRef = (connectionVertex: SVGCircleElement) => {
+    this.connectionVertex = connectionVertex;
+  };
+
+  setConnectionVertexPathRef = (connectionVertexPath: SVGPathElement) => {
+    this.connectionVertexPath = connectionVertexPath;
+  };
+
   // Recursively find the first parent that is a canvas element
   findElementTarget = (element: Element): ElementState | undefined => {
     let elementTarget = undefined;
@@ -102,8 +142,28 @@ export class Connections {
       }
     }
 
+    const customElementAnchors = element?.item.customConnectionAnchors || ANCHORS;
+    // This type cast is necessary as TS doesn't understand that `Element` is an `HTMLElement`
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    const anchors = Array.from(this.anchorsDiv?.children as HTMLCollectionOf<HTMLElement>);
+    const anchorsAmount = customElementAnchors.length;
+
+    // re-calculate the position of the existing anchors on hover
+    // and hide the rest of the anchors if there are more than the custom ones
+    anchors.forEach((anchor, index) => {
+      if (index >= anchorsAmount) {
+        anchor.style.display = 'none';
+      } else {
+        const { x, y } = customElementAnchors[index];
+        anchor.style.top = `calc(${-y * 50 + 50}% - ${HALF_SIZE}px - ${ANCHOR_PADDING}px)`;
+        anchor.style.left = `calc(${x * 50 + 50}% - ${HALF_SIZE}px - ${ANCHOR_PADDING}px)`;
+        anchor.style.display = 'block';
+      }
+    });
+
     const elementBoundingRect = element.div!.getBoundingClientRect();
-    const parentBoundingRect = this.scene.div?.getBoundingClientRect();
+    const transformScale = this.scene.scale;
+    const parentBoundingRect = getParentBoundingClientRect(this.scene);
 
     const relativeTop = elementBoundingRect.top - (parentBoundingRect?.top ?? 0);
     const relativeLeft = elementBoundingRect.left - (parentBoundingRect?.left ?? 0);
@@ -111,10 +171,10 @@ export class Connections {
     if (this.connectionAnchorDiv) {
       this.connectionAnchorDiv.style.display = 'none';
       this.connectionAnchorDiv.style.display = 'block';
-      this.connectionAnchorDiv.style.top = `${relativeTop}px`;
-      this.connectionAnchorDiv.style.left = `${relativeLeft}px`;
-      this.connectionAnchorDiv.style.height = `${elementBoundingRect.height}px`;
-      this.connectionAnchorDiv.style.width = `${elementBoundingRect.width}px`;
+      this.connectionAnchorDiv.style.top = `${relativeTop / transformScale}px`;
+      this.connectionAnchorDiv.style.left = `${relativeLeft / transformScale}px`;
+      this.connectionAnchorDiv.style.height = `${elementBoundingRect.height / transformScale}px`;
+      this.connectionAnchorDiv.style.width = `${elementBoundingRect.width / transformScale}px`;
     }
   };
 
@@ -140,12 +200,18 @@ export class Connections {
       return;
     }
 
-    const parentBoundingRect = this.scene.div.parentElement.getBoundingClientRect();
-    const x = event.pageX - parentBoundingRect.x;
-    const y = event.pageY - parentBoundingRect.y;
+    const transformScale = this.scene.scale;
+    const parentBoundingRect = getParentBoundingClientRect(this.scene);
+
+    if (!parentBoundingRect) {
+      return;
+    }
+
+    const x = event.pageX - parentBoundingRect.x ?? 0;
+    const y = event.pageY - parentBoundingRect.y ?? 0;
 
-    this.connectionLine.setAttribute('x2', `${x}`);
-    this.connectionLine.setAttribute('y2', `${y}`);
+    this.connectionLine.setAttribute('x2', `${x / transformScale}`);
+    this.connectionLine.setAttribute('y2', `${y / transformScale}`);
 
     const connectionLineX1 = this.connectionLine.x1.baseVal.value;
     const connectionLineY1 = this.connectionLine.y1.baseVal.value;
@@ -161,15 +227,21 @@ export class Connections {
     if (!event.buttons) {
       if (this.connectionSource && this.connectionSource.div && this.connectionSource.div.parentElement) {
         const sourceRect = this.connectionSource.div.getBoundingClientRect();
-        const parentRect = this.connectionSource.div.parentElement.getBoundingClientRect();
 
-        const sourceVerticalCenter = sourceRect.top - parentRect.top + sourceRect.height / 2;
-        const sourceHorizontalCenter = sourceRect.left - parentRect.left + sourceRect.width / 2;
+        const transformScale = this.scene.scale;
+        const parentRect = getParentBoundingClientRect(this.scene);
+
+        if (!parentRect) {
+          return;
+        }
+
+        const sourceVerticalCenter = (sourceRect.top - parentRect.top + sourceRect.height / 2) / transformScale;
+        const sourceHorizontalCenter = (sourceRect.left - parentRect.left + sourceRect.width / 2) / transformScale;
 
         // Convert from DOM coords to connection coords
         // TODO: Break this out into util function and add tests
-        const sourceX = (connectionLineX1 - sourceHorizontalCenter) / (sourceRect.width / 2);
-        const sourceY = (sourceVerticalCenter - connectionLineY1) / (sourceRect.height / 2);
+        const sourceX = (connectionLineX1 - sourceHorizontalCenter) / (sourceRect.width / 2 / transformScale);
+        const sourceY = (sourceVerticalCenter - connectionLineY1) / (sourceRect.height / 2 / transformScale);
 
         let targetX;
         let targetY;
@@ -238,14 +310,328 @@ export class Connections {
     }
   };
 
+  // Handles mousemove and mouseup events when dragging an existing vertex
+  vertexListener = (event: MouseEvent) => {
+    this.scene.selecto!.rootContainer!.style.cursor = 'crosshair';
+
+    event.preventDefault();
+
+    if (!(this.connectionVertex && this.scene.div && this.scene.div.parentElement)) {
+      return;
+    }
+
+    const transformScale = this.scene.scale;
+    const parentBoundingRect = getParentBoundingClientRect(this.scene);
+
+    if (!parentBoundingRect) {
+      return;
+    }
+
+    const x = (event.pageX - parentBoundingRect.x) / transformScale ?? 0;
+    const y = (event.pageY - parentBoundingRect.y) / transformScale ?? 0;
+
+    this.connectionVertex?.setAttribute('cx', `${x}`);
+    this.connectionVertex?.setAttribute('cy', `${y}`);
+
+    const selectedValue = this.selection.value;
+    const sourceRect = selectedValue!.source.div!.getBoundingClientRect();
+
+    // calculate relative coordinates based on source and target coorindates of connection
+    const { x1, y1, x2, y2 } = calculateCoordinates(
+      sourceRect,
+      parentBoundingRect,
+      selectedValue?.info!,
+      selectedValue!.target,
+      transformScale
+    );
+
+    let { xStart, yStart, xEnd, yEnd } = { xStart: x1, yStart: y1, xEnd: x2, yEnd: y2 };
+    if (selectedValue?.sourceOriginal && selectedValue.targetOriginal) {
+      xStart = selectedValue.sourceOriginal.x;
+      yStart = selectedValue.sourceOriginal.y;
+      xEnd = selectedValue.targetOriginal.x;
+      yEnd = selectedValue.targetOriginal.y;
+    }
+
+    const xDist = xEnd - xStart;
+    const yDist = yEnd - yStart;
+
+    let vx1 = x1;
+    let vy1 = y1;
+    let vx2 = x2;
+    let vy2 = y2;
+    if (selectedValue && selectedValue.vertices) {
+      if (this.selectedVertexIndex !== undefined && this.selectedVertexIndex > 0) {
+        vx1 = selectedValue.vertices[this.selectedVertexIndex - 1].x * xDist + xStart;
+        vy1 = selectedValue.vertices[this.selectedVertexIndex - 1].y * yDist + yStart;
+      }
+      if (this.selectedVertexIndex !== undefined && this.selectedVertexIndex < selectedValue.vertices.length - 1) {
+        vx2 = selectedValue.vertices[this.selectedVertexIndex + 1].x * xDist + xStart;
+        vy2 = selectedValue.vertices[this.selectedVertexIndex + 1].y * yDist + yStart;
+      }
+    }
+
+    // Check if slope before vertex and after vertex is within snapping tolerance
+    let xSnap = x;
+    let ySnap = y;
+    let deleteVertex = false;
+    // Ignore if control key being held
+    if (!event.ctrlKey) {
+      // Check if segment before and after vertex are close to vertical or horizontal
+      const verticalBefore = Math.abs((x - vx1) / (y - vy1)) < CONNECTION_VERTEX_ORTHO_TOLERANCE;
+      const verticalAfter = Math.abs((x - vx2) / (y - vy2)) < CONNECTION_VERTEX_ORTHO_TOLERANCE;
+      const horizontalBefore = Math.abs((y - vy1) / (x - vx1)) < CONNECTION_VERTEX_ORTHO_TOLERANCE;
+      const horizontalAfter = Math.abs((y - vy2) / (x - vx2)) < CONNECTION_VERTEX_ORTHO_TOLERANCE;
+
+      if (verticalBefore) {
+        xSnap = vx1;
+      } else if (verticalAfter) {
+        xSnap = vx2;
+      }
+      if (horizontalBefore) {
+        ySnap = vy1;
+      } else if (horizontalAfter) {
+        ySnap = vy2;
+      }
+
+      if ((verticalBefore || verticalAfter) && (horizontalBefore || horizontalAfter)) {
+        this.scene.selecto!.rootContainer!.style.cursor = 'move';
+      } else if (verticalBefore || verticalAfter) {
+        this.scene.selecto!.rootContainer!.style.cursor = 'col-resize';
+      } else if (horizontalBefore || horizontalAfter) {
+        this.scene.selecto!.rootContainer!.style.cursor = 'row-resize';
+      }
+
+      const angleOverall = calculateAngle(vx1, vy1, vx2, vy2);
+      const angleBefore = calculateAngle(vx1, vy1, x, y);
+      deleteVertex = Math.abs(angleBefore - angleOverall) < CONNECTION_VERTEX_SNAP_TOLERANCE;
+    }
+
+    if (deleteVertex) {
+      // Display temporary vertex removal
+      this.connectionVertexPath?.setAttribute('d', `M${vx1} ${vy1} L${vx2} ${vy2}`);
+      this.connectionSVGVertex!.style.display = 'block';
+      this.connectionVertex.style.display = 'none';
+    } else {
+      // Display temporary vertex during drag
+      this.connectionVertexPath?.setAttribute('d', `M${vx1} ${vy1} L${xSnap} ${ySnap} L${vx2} ${vy2}`);
+      this.connectionSVGVertex!.style.display = 'block';
+      this.connectionVertex.style.display = 'block';
+    }
+
+    // Handle mouseup
+    if (!event.buttons) {
+      // Remove existing event listener
+      this.scene.selecto?.rootContainer?.removeEventListener('mousemove', this.vertexListener);
+      this.scene.selecto?.rootContainer?.removeEventListener('mouseup', this.vertexListener);
+      this.scene.selecto!.rootContainer!.style.cursor = 'auto';
+      this.connectionSVGVertex!.style.display = 'none';
+
+      // call onChange here and update appropriate index of connection vertices array
+      const connectionIndex = selectedValue?.index;
+      const vertexIndex = this.selectedVertexIndex;
+
+      if (connectionIndex !== undefined && vertexIndex !== undefined) {
+        const currentSource = selectedValue!.source;
+        if (currentSource.options.connections) {
+          const currentConnections = [...currentSource.options.connections];
+          if (currentConnections[connectionIndex].vertices) {
+            const currentVertices = [...currentConnections[connectionIndex].vertices!];
+
+            // TODO for vertex removal, clear out originals?
+            if (deleteVertex) {
+              currentVertices.splice(vertexIndex, 1);
+            } else {
+              const currentVertex = { ...currentVertices[vertexIndex] };
+
+              currentVertex.x = (xSnap - xStart) / xDist;
+              currentVertex.y = (ySnap - yStart) / yDist;
+
+              currentVertices[vertexIndex] = currentVertex;
+            }
+
+            currentConnections[connectionIndex] = {
+              ...currentConnections[connectionIndex],
+              vertices: currentVertices,
+            };
+
+            // Update save model
+            currentSource.onChange({ ...currentSource.options, connections: currentConnections });
+            this.updateState();
+            this.scene.save();
+          }
+        }
+      }
+    }
+  };
+
+  // Handles mousemove and mouseup events when dragging a new vertex
+  vertexAddListener = (event: MouseEvent) => {
+    this.scene.selecto!.rootContainer!.style.cursor = 'crosshair';
+
+    event.preventDefault();
+
+    if (!(this.connectionVertex && this.scene.div && this.scene.div.parentElement)) {
+      return;
+    }
+
+    const transformScale = this.scene.scale;
+    const parentBoundingRect = getParentBoundingClientRect(this.scene);
+
+    if (!parentBoundingRect) {
+      return;
+    }
+
+    const x = (event.pageX - parentBoundingRect.x) / transformScale ?? 0;
+    const y = (event.pageY - parentBoundingRect.y) / transformScale ?? 0;
+
+    this.connectionVertex?.setAttribute('cx', `${x}`);
+    this.connectionVertex?.setAttribute('cy', `${y}`);
+
+    const selectedValue = this.selection.value;
+    const sourceRect = selectedValue!.source.div!.getBoundingClientRect();
+
+    // calculate relative coordinates based on source and target coorindates of connection
+    const { x1, y1, x2, y2 } = calculateCoordinates(
+      sourceRect,
+      parentBoundingRect,
+      selectedValue?.info!,
+      selectedValue!.target,
+      transformScale
+    );
+
+    let { xStart, yStart, xEnd, yEnd } = { xStart: x1, yStart: y1, xEnd: x2, yEnd: y2 };
+    if (selectedValue?.sourceOriginal && selectedValue.targetOriginal) {
+      xStart = selectedValue.sourceOriginal.x;
+      yStart = selectedValue.sourceOriginal.y;
+      xEnd = selectedValue.targetOriginal.x;
+      yEnd = selectedValue.targetOriginal.y;
+    }
+
+    const xDist = xEnd - xStart;
+    const yDist = yEnd - yStart;
+
+    let vx1 = x1;
+    let vy1 = y1;
+    let vx2 = x2;
+    let vy2 = y2;
+    if (selectedValue && selectedValue.vertices) {
+      if (this.selectedVertexIndex !== undefined && this.selectedVertexIndex > 0) {
+        vx1 = selectedValue.vertices[this.selectedVertexIndex - 1].x * xDist + xStart;
+        vy1 = selectedValue.vertices[this.selectedVertexIndex - 1].y * yDist + yStart;
+      }
+      if (this.selectedVertexIndex !== undefined && this.selectedVertexIndex < selectedValue.vertices.length) {
+        vx2 = selectedValue.vertices[this.selectedVertexIndex].x * xDist + xStart;
+        vy2 = selectedValue.vertices[this.selectedVertexIndex].y * yDist + yStart;
+      }
+    }
+
+    // Check if slope before vertex and after vertex is within snapping tolerance
+    let xSnap = x;
+    let ySnap = y;
+    // Ignore if control key being held
+    if (!event.ctrlKey) {
+      // Check if segment before and after vertex are close to vertical or horizontal
+      const verticalBefore = Math.abs((x - vx1) / (y - vy1)) < CONNECTION_VERTEX_ORTHO_TOLERANCE;
+      const verticalAfter = Math.abs((x - vx2) / (y - vy2)) < CONNECTION_VERTEX_ORTHO_TOLERANCE;
+      const horizontalBefore = Math.abs((y - vy1) / (x - vx1)) < CONNECTION_VERTEX_ORTHO_TOLERANCE;
+      const horizontalAfter = Math.abs((y - vy2) / (x - vx2)) < CONNECTION_VERTEX_ORTHO_TOLERANCE;
+
+      if (verticalBefore) {
+        xSnap = vx1;
+      } else if (verticalAfter) {
+        xSnap = vx2;
+      }
+      if (horizontalBefore) {
+        ySnap = vy1;
+      } else if (horizontalAfter) {
+        ySnap = vy2;
+      }
+
+      if ((verticalBefore || verticalAfter) && (horizontalBefore || horizontalAfter)) {
+        this.scene.selecto!.rootContainer!.style.cursor = 'move';
+      } else if (verticalBefore || verticalAfter) {
+        this.scene.selecto!.rootContainer!.style.cursor = 'col-resize';
+      } else if (horizontalBefore || horizontalAfter) {
+        this.scene.selecto!.rootContainer!.style.cursor = 'row-resize';
+      }
+    }
+
+    this.connectionVertexPath?.setAttribute('d', `M${vx1} ${vy1} L${xSnap} ${ySnap} L${vx2} ${vy2}`);
+    this.connectionSVGVertex!.style.display = 'block';
+    this.connectionVertex.style.display = 'block';
+
+    // Handle mouseup
+    if (!event.buttons) {
+      // Remove existing event listener
+      this.scene.selecto?.rootContainer?.removeEventListener('mousemove', this.vertexAddListener);
+      this.scene.selecto?.rootContainer?.removeEventListener('mouseup', this.vertexAddListener);
+      this.scene.selecto!.rootContainer!.style.cursor = 'auto';
+      this.connectionSVGVertex!.style.display = 'none';
+
+      // call onChange here and insert new vertex at appropriate index of connection vertices array
+      const connectionIndex = selectedValue?.index;
+      const vertexIndex = this.selectedVertexIndex;
+
+      if (connectionIndex !== undefined && vertexIndex !== undefined) {
+        const currentSource = selectedValue!.source;
+        if (currentSource.options.connections) {
+          const currentConnections = [...currentSource.options.connections];
+          const newVertex = { x: (x - xStart) / xDist, y: (y - yStart) / yDist };
+          if (currentConnections[connectionIndex].vertices) {
+            const currentVertices = [...currentConnections[connectionIndex].vertices!];
+            currentVertices.splice(vertexIndex, 0, newVertex);
+            currentConnections[connectionIndex] = {
+              ...currentConnections[connectionIndex],
+              vertices: currentVertices,
+            };
+          } else {
+            // For first vertex creation
+            const currentVertices: ConnectionCoordinates[] = [newVertex];
+            currentConnections[connectionIndex] = {
+              ...currentConnections[connectionIndex],
+              vertices: currentVertices,
+            };
+          }
+
+          // Check for original state
+          if (
+            !currentConnections[connectionIndex].sourceOriginal ||
+            !currentConnections[connectionIndex].targetOriginal
+          ) {
+            currentConnections[connectionIndex] = {
+              ...currentConnections[connectionIndex],
+              sourceOriginal: { x: x1, y: y1 },
+              targetOriginal: { x: x2, y: y2 },
+            };
+          }
+          // Update save model
+          currentSource.onChange({ ...currentSource.options, connections: currentConnections });
+          this.updateState();
+          this.scene.save();
+        }
+      }
+    }
+  };
+
   handleConnectionDragStart = (selectedTarget: HTMLElement, clientX: number, clientY: number) => {
     this.scene.selecto!.rootContainer!.style.cursor = 'crosshair';
     if (this.connectionSVG && this.connectionLine && this.scene.div && this.scene.div.parentElement) {
       const connectionStartTargetBox = selectedTarget.getBoundingClientRect();
-      const parentBoundingRect = this.scene.div.parentElement.getBoundingClientRect();
 
-      const x = connectionStartTargetBox.x - parentBoundingRect.x + CONNECTION_ANCHOR_HIGHLIGHT_OFFSET;
-      const y = connectionStartTargetBox.y - parentBoundingRect.y + CONNECTION_ANCHOR_HIGHLIGHT_OFFSET;
+      const transformScale = this.scene.scale;
+      const parentBoundingRect = getParentBoundingClientRect(this.scene);
+
+      if (!parentBoundingRect) {
+        return;
+      }
+
+      // Multiply by transform scale to calculate the correct scaled offset
+      const connectionAnchorOffsetX = CONNECTION_ANCHOR_HIGHLIGHT_OFFSET * transformScale;
+      const connectionAnchorOffsetY = CONNECTION_ANCHOR_HIGHLIGHT_OFFSET * transformScale;
+
+      const x = (connectionStartTargetBox.x - parentBoundingRect.x + connectionAnchorOffsetX) / transformScale;
+      const y = (connectionStartTargetBox.y - parentBoundingRect.y + connectionAnchorOffsetY) / transformScale;
 
       const mouseX = clientX - parentBoundingRect.x;
       const mouseY = clientY - parentBoundingRect.y;
@@ -260,6 +646,24 @@ export class Connections {
     this.scene.selecto?.rootContainer?.addEventListener('mousemove', this.connectionListener);
   };
 
+  // Add event listener at root container during existing vertex drag
+  handleVertexDragStart = (selectedTarget: HTMLElement) => {
+    // Get vertex index from selected target data
+    this.selectedVertexIndex = Number(selectedTarget.getAttribute('data-index'));
+
+    this.scene.selecto?.rootContainer?.addEventListener('mousemove', this.vertexListener);
+    this.scene.selecto?.rootContainer?.addEventListener('mouseup', this.vertexListener);
+  };
+
+  // Add event listener at root container during creation of new vertex
+  handleVertexAddDragStart = (selectedTarget: HTMLElement) => {
+    // Get vertex index from selected target data
+    this.selectedVertexIndex = Number(selectedTarget.getAttribute('data-index'));
+
+    this.scene.selecto?.rootContainer?.addEventListener('mousemove', this.vertexAddListener);
+    this.scene.selecto?.rootContainer?.addEventListener('mouseup', this.vertexAddListener);
+  };
+
   onChange = (current: ConnectionState, update: CanvasConnection) => {
     const connections = current.source.options.connections?.splice(0) ?? [];
     connections[current.index] = update;
@@ -275,8 +679,19 @@ export class Connections {
   render() {
     return (
       <>
-        <ConnectionAnchors setRef={this.setConnectionAnchorRef} handleMouseLeave={this.handleMouseLeave} />
-        <ConnectionSVG setSVGRef={this.setConnectionSVGRef} setLineRef={this.setConnectionLineRef} scene={this.scene} />
+        <ConnectionAnchors
+          setRef={this.setConnectionAnchorRef}
+          setAnchorsRef={this.setAnchorsRef}
+          handleMouseLeave={this.handleMouseLeave}
+        />
+        <ConnectionSVG
+          setSVGRef={this.setConnectionSVGRef}
+          setLineRef={this.setConnectionLineRef}
+          setSVGVertexRef={this.setConnectionSVGVertexRef}
+          setVertexPathRef={this.setConnectionVertexPathRef}
+          setVertexRef={this.setConnectionVertexRef}
+          scene={this.scene}
+        />
       </>
     );
   }
diff --git a/public/app/plugins/panel/canvas/editor/LineStyleEditor.tsx b/public/app/plugins/panel/canvas/editor/LineStyleEditor.tsx
new file mode 100644
index 0000000000000..75a6b934c0dfc
--- /dev/null
+++ b/public/app/plugins/panel/canvas/editor/LineStyleEditor.tsx
@@ -0,0 +1,24 @@
+import React, { useCallback } from 'react';
+
+import { SelectableValue, StandardEditorProps } from '@grafana/data';
+import { RadioButtonGroup } from '@grafana/ui/src';
+
+import { LineStyle } from '../types';
+
+const options: Array<SelectableValue<LineStyle>> = [
+  { value: LineStyle.Solid, label: 'Solid' },
+  { value: LineStyle.Dashed, label: 'Dashed' },
+];
+
+export const LineStyleEditor = ({ value, onChange }: StandardEditorProps<string, undefined, undefined>) => {
+  const lineStyle = value ?? LineStyle.Solid;
+
+  const onLineStyleChange = useCallback(
+    (lineStyle: string) => {
+      onChange(lineStyle);
+    },
+    [onChange]
+  );
+
+  return <RadioButtonGroup value={lineStyle} options={options} onChange={onLineStyleChange} fullWidth />;
+};
diff --git a/public/app/plugins/panel/canvas/editor/connectionEditor.tsx b/public/app/plugins/panel/canvas/editor/connectionEditor.tsx
index 49689915cac1c..8640bfe41ca24 100644
--- a/public/app/plugins/panel/canvas/editor/connectionEditor.tsx
+++ b/public/app/plugins/panel/canvas/editor/connectionEditor.tsx
@@ -24,9 +24,8 @@ export function getConnectionEditor(opts: CanvasConnectionEditorOptions): Nested
       getValue: (path: string) => {
         return lodashGet(opts.connection.info, path);
       },
-      // TODO: Fix this any (maybe a dimension supplier?)
-      onChange: (path: string, value: any) => {
-        console.log(value, typeof value);
+      // TODO: Fix this unknown (maybe a dimension supplier?)
+      onChange: (path: string, value: unknown) => {
         let options = opts.connection.info;
         options = setOptionImmutably(options, path, value);
         opts.scene.connections.onChange(opts.connection, options);
@@ -37,6 +36,9 @@ export function getConnectionEditor(opts: CanvasConnectionEditorOptions): Nested
       const ctx = { ...context, options: opts.connection.info };
       optionBuilder.addColor(builder, ctx);
       optionBuilder.addSize(builder, ctx);
+      optionBuilder.addRadius(builder, ctx);
+      optionBuilder.addDirection(builder, ctx);
+      optionBuilder.addLineStyle(builder, ctx);
     },
   };
 }
diff --git a/public/app/plugins/panel/canvas/editor/element/ConstraintSelectionBox.tsx b/public/app/plugins/panel/canvas/editor/element/ConstraintSelectionBox.tsx
index 8f8237763dea3..50a895cbae1b3 100644
--- a/public/app/plugins/panel/canvas/editor/element/ConstraintSelectionBox.tsx
+++ b/public/app/plugins/panel/canvas/editor/element/ConstraintSelectionBox.tsx
@@ -141,48 +141,84 @@ const getStyles = (currentConstraints: Constraint) => (theme: GrafanaTheme2) =>
   const selectionBoxColor = theme.isDark ? '#ffffff' : '#000000';
 
   return {
-    constraintHover: css`
-      &:hover {
-        fill: ${HOVER_COLOR};
-        fill-opacity: ${HOVER_OPACITY};
-      }
-    `,
-    topConstraint: css`
-      ${currentConstraints.vertical === VerticalConstraint.Top ||
+    constraintHover: css({
+      '&:hover': {
+        fill: HOVER_COLOR,
+        fillOpacity: HOVER_OPACITY,
+      },
+    }),
+    topConstraint: css({
+      ...(currentConstraints.vertical === VerticalConstraint.Top ||
       currentConstraints.vertical === VerticalConstraint.TopBottom
-        ? `width: 92pt; x: 1085; fill: ${SELECTED_COLOR};`
-        : `fill: ${selectionBoxColor};`}
-    `,
-    bottomConstraint: css`
-      ${currentConstraints.vertical === VerticalConstraint.Bottom ||
+        ? {
+            width: '92pt',
+            x: '1085',
+            fill: SELECTED_COLOR,
+          }
+        : {
+            fill: selectionBoxColor,
+          }),
+    }),
+    bottomConstraint: css({
+      ...(currentConstraints.vertical === VerticalConstraint.Bottom ||
       currentConstraints.vertical === VerticalConstraint.TopBottom
-        ? `width: 92pt; x: 1085; fill: ${SELECTED_COLOR};`
-        : `fill: ${selectionBoxColor};`}
-    `,
-    leftConstraint: css`
-      ${currentConstraints.horizontal === HorizontalConstraint.Left ||
+        ? {
+            width: '92pt',
+            x: '1085',
+            fill: SELECTED_COLOR,
+          }
+        : {
+            fill: selectionBoxColor,
+          }),
+    }),
+    leftConstraint: css({
+      ...(currentConstraints.horizontal === HorizontalConstraint.Left ||
       currentConstraints.horizontal === HorizontalConstraint.LeftRight
-        ? `height: 92pt; y: 1014; fill: ${SELECTED_COLOR};`
-        : `fill: ${selectionBoxColor};`}
-    `,
-    rightConstraint: css`
-      ${currentConstraints.horizontal === HorizontalConstraint.Right ||
+        ? {
+            height: '92pt',
+            y: '1014',
+            fill: SELECTED_COLOR,
+          }
+        : {
+            fill: selectionBoxColor,
+          }),
+    }),
+    rightConstraint: css({
+      ...(currentConstraints.horizontal === HorizontalConstraint.Right ||
       currentConstraints.horizontal === HorizontalConstraint.LeftRight
-        ? `height: 92pt; y: 1014; fill: ${SELECTED_COLOR};`
-        : `fill: ${selectionBoxColor};`}
-    `,
-    horizontalCenterConstraint: css`
-      ${currentConstraints.horizontal === HorizontalConstraint.Center
-        ? `height: 92pt; y: 1014; fill: ${SELECTED_COLOR};`
-        : `fill: ${selectionBoxColor};`}
-    `,
-    verticalCenterConstraint: css`
-      ${currentConstraints.vertical === VerticalConstraint.Center
-        ? `width: 92pt; x: 1085; fill: ${SELECTED_COLOR};`
-        : `fill: ${selectionBoxColor};`}
-    `,
-    box: css`
-      fill: ${selectionBoxColor};
-    `,
+        ? {
+            height: '92pt',
+            y: '1014',
+            fill: SELECTED_COLOR,
+          }
+        : {
+            fill: selectionBoxColor,
+          }),
+    }),
+    horizontalCenterConstraint: css({
+      ...(currentConstraints.horizontal === HorizontalConstraint.Center
+        ? {
+            height: '92pt',
+            y: '1014',
+            fill: SELECTED_COLOR,
+          }
+        : {
+            fill: selectionBoxColor,
+          }),
+    }),
+    verticalCenterConstraint: css({
+      ...(currentConstraints.vertical === VerticalConstraint.Center
+        ? {
+            width: '92pt',
+            x: '1085',
+            fill: SELECTED_COLOR,
+          }
+        : {
+            fill: selectionBoxColor,
+          }),
+    }),
+    box: css({
+      fill: selectionBoxColor,
+    }),
   };
 };
diff --git a/public/app/plugins/panel/canvas/editor/element/PlacementEditor.tsx b/public/app/plugins/panel/canvas/editor/element/PlacementEditor.tsx
index 016193e389266..d2316b4a31b97 100644
--- a/public/app/plugins/panel/canvas/editor/element/PlacementEditor.tsx
+++ b/public/app/plugins/panel/canvas/editor/element/PlacementEditor.tsx
@@ -13,7 +13,7 @@ import { ConstraintSelectionBox } from './ConstraintSelectionBox';
 import { QuickPositioning } from './QuickPositioning';
 import { CanvasEditorOptions } from './elementEditor';
 
-const places: Array<keyof Placement> = ['top', 'left', 'bottom', 'right', 'width', 'height'];
+const places: Array<keyof Placement> = ['top', 'left', 'bottom', 'right', 'width', 'height', 'rotation'];
 
 const horizontalOptions: Array<SelectableValue<HorizontalConstraint>> = [
   { label: 'Left', value: HorizontalConstraint.Left },
@@ -126,10 +126,15 @@ export function PlacementEditor({ item }: Props) {
             if (v == null) {
               return null;
             }
+
+            // Need to set explicit min/max for rotation as logic only can handle 0-360
+            const min = p === 'rotation' ? 0 : undefined;
+            const max = p === 'rotation' ? 360 : undefined;
+
             return (
               <InlineFieldRow key={p}>
                 <InlineField label={p} labelWidth={8} grow={true}>
-                  <NumberInput value={v} onChange={(v) => onPositionChange(v, p)} />
+                  <NumberInput min={min} max={max} value={v} onChange={(v) => onPositionChange(v, p)} />
                 </InlineField>
               </InlineFieldRow>
             );
diff --git a/public/app/plugins/panel/canvas/editor/element/QuickPositioning.tsx b/public/app/plugins/panel/canvas/editor/element/QuickPositioning.tsx
index d3bc421a698f1..b5772abcc4134 100644
--- a/public/app/plugins/panel/canvas/editor/element/QuickPositioning.tsx
+++ b/public/app/plugins/panel/canvas/editor/element/QuickPositioning.tsx
@@ -110,13 +110,13 @@ export const QuickPositioning = ({ onPositionChange, element, settings }: Props)
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  buttonGroup: css`
-    display: flex;
-    flex-wrap: wrap;
-    padding: 12px 0 12px 0;
-  `,
-  button: css`
-    margin-left: 5px;
-    margin-right: 5px;
-  `,
+  buttonGroup: css({
+    display: 'flex',
+    flexWrap: 'wrap',
+    padding: '12px 0 12px 0',
+  }),
+  button: css({
+    marginLeft: '5px',
+    marginRight: '5px',
+  }),
 });
diff --git a/public/app/plugins/panel/canvas/editor/inline/InlineEdit.tsx b/public/app/plugins/panel/canvas/editor/inline/InlineEdit.tsx
index 7149ea5c14e20..636d94031789c 100644
--- a/public/app/plugins/panel/canvas/editor/inline/InlineEdit.tsx
+++ b/public/app/plugins/panel/canvas/editor/inline/InlineEdit.tsx
@@ -106,43 +106,43 @@ export function InlineEdit({ onClose, id, scene }: Props) {
 }
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  inlineEditorContainer: css`
-    display: flex;
-    flex-direction: column;
-    background: ${theme.components.panel.background};
-    border: 1px solid ${theme.colors.border.weak};
-    box-shadow: ${theme.shadows.z3};
-    z-index: 1000;
-    opacity: 1;
-    min-width: 400px;
-  `,
-  draggableWrapper: css`
-    width: 0;
-    height: 0;
-  `,
-  inlineEditorHeader: css`
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    background: ${theme.colors.background.canvas};
-    border-bottom: 1px solid ${theme.colors.border.weak};
-    height: 40px;
-    cursor: move;
-  `,
-  inlineEditorContent: css`
-    white-space: pre-wrap;
-    padding: 10px;
-  `,
-  inlineEditorClose: css`
-    margin-left: auto;
-  `,
-  placeholder: css`
-    width: 24px;
-    height: 24px;
-    visibility: hidden;
-    margin-right: auto;
-  `,
-  inlineEditorContentWrapper: css`
-    overflow: scroll;
-  `,
+  inlineEditorContainer: css({
+    display: 'flex',
+    flexDirection: 'column',
+    background: theme.components.panel.background,
+    border: `1px solid ${theme.colors.border.weak}`,
+    boxShadow: theme.shadows.z3,
+    zIndex: 1000,
+    opacity: 1,
+    minWidth: '400px',
+  }),
+  draggableWrapper: css({
+    width: 0,
+    height: 0,
+  }),
+  inlineEditorHeader: css({
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'center',
+    background: theme.colors.background.canvas,
+    borderBottom: `1px solid ${theme.colors.border.weak}`,
+    height: '40px',
+    cursor: 'move',
+  }),
+  inlineEditorContent: css({
+    whiteSpace: 'pre-wrap',
+    padding: '10px',
+  }),
+  inlineEditorClose: css({
+    marginLeft: 'auto',
+  }),
+  placeholder: css({
+    width: '24px',
+    height: '24px',
+    visibility: 'hidden',
+    marginRight: 'auto',
+  }),
+  inlineEditorContentWrapper: css({
+    overflow: 'scroll',
+  }),
 });
diff --git a/public/app/plugins/panel/canvas/editor/inline/InlineEditBody.tsx b/public/app/plugins/panel/canvas/editor/inline/InlineEditBody.tsx
index 44d4954ad18d5..4e83de31ba143 100644
--- a/public/app/plugins/panel/canvas/editor/inline/InlineEditBody.tsx
+++ b/public/app/plugins/panel/canvas/editor/inline/InlineEditBody.tsx
@@ -18,6 +18,7 @@ import { activePanelSubject, InstanceState } from '../../CanvasPanel';
 import { addStandardCanvasEditorOptions } from '../../module';
 import { InlineEditTabs } from '../../types';
 import { getElementTypes, onAddItem } from '../../utils';
+import { getConnectionEditor } from '../connectionEditor';
 import { getElementEditor } from '../element/elementEditor';
 import { getLayerEditor } from '../layer/layerEditor';
 
@@ -33,7 +34,7 @@ export function InlineEditBody() {
   const pane = useMemo(() => {
     const p = activePanel?.panel;
     const state: InstanceState = instanceState;
-    if (!state || !p) {
+    if (!(state && state.scene) || !p) {
       return new OptionsPaneCategoryDescriptor({ id: 'root', title: 'root' });
     }
 
@@ -42,6 +43,17 @@ export function InlineEditBody() {
         builder.addNestedOptions(getLayerEditor(instanceState));
       }
 
+      const selectedConnection = state.selectedConnection;
+      if (selectedConnection && activeTab === InlineEditTabs.SelectedElement) {
+        builder.addNestedOptions(
+          getConnectionEditor({
+            category: [`Selected connection`],
+            connection: selectedConnection,
+            scene: state.scene,
+          })
+        );
+      }
+
       const selection = state.selected;
       if (selection?.length === 1 && activeTab === InlineEditTabs.SelectedElement) {
         const element = selection[0];
@@ -82,7 +94,10 @@ export function InlineEditBody() {
   const rootLayer: FrameState | undefined = instanceState?.layer;
 
   const noElementSelected =
-    instanceState && activeTab === InlineEditTabs.SelectedElement && instanceState.selected.length === 0;
+    instanceState &&
+    activeTab === InlineEditTabs.SelectedElement &&
+    instanceState.selected.length === 0 &&
+    instanceState.selectedConnection === undefined;
 
   return (
     <>
@@ -151,8 +166,8 @@ function getOptionsPaneCategoryDescriptor<T = any>(
 }
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  selectElement: css`
-    color: ${theme.colors.text.secondary};
-    padding: ${theme.spacing(2)};
-  `,
+  selectElement: css({
+    color: theme.colors.text.secondary,
+    padding: theme.spacing(2),
+  }),
 });
diff --git a/public/app/plugins/panel/canvas/editor/layer/TreeNavigationEditor.tsx b/public/app/plugins/panel/canvas/editor/layer/TreeNavigationEditor.tsx
index 1125634dd1d90..4bb098903a6d4 100644
--- a/public/app/plugins/panel/canvas/editor/layer/TreeNavigationEditor.tsx
+++ b/public/app/plugins/panel/canvas/editor/layer/TreeNavigationEditor.tsx
@@ -167,8 +167,8 @@ export const TreeNavigationEditor = ({ item }: StandardEditorProps<any, TreeView
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  addLayerButton: css`
-    margin-left: 18px;
-    min-width: 150px;
-  `,
+  addLayerButton: css({
+    marginLeft: '18px',
+    minWidth: '150px',
+  }),
 });
diff --git a/public/app/plugins/panel/canvas/editor/layer/TreeNodeTitle.tsx b/public/app/plugins/panel/canvas/editor/layer/TreeNodeTitle.tsx
index 26018ec43bf25..dd983f1cfc086 100644
--- a/public/app/plugins/panel/canvas/editor/layer/TreeNodeTitle.tsx
+++ b/public/app/plugins/panel/canvas/editor/layer/TreeNodeTitle.tsx
@@ -92,29 +92,29 @@ export const TreeNodeTitle = ({ settings, nodeData, setAllowSelection }: Props)
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  actionButtonsWrapper: css`
-    display: flex;
-    align-items: flex-end;
-  `,
-  actionIcon: css`
-    color: ${theme.colors.text.secondary};
-    cursor: pointer;
-    &:hover {
-      color: ${theme.colors.text.primary};
-    }
-  `,
-  textWrapper: css`
-    display: flex;
-    align-items: center;
-    flex-grow: 1;
-    overflow: hidden;
-    margin-right: ${theme.spacing(1)};
-  `,
-  layerName: css`
-    font-weight: ${theme.typography.fontWeightMedium};
-    color: ${theme.colors.primary.text};
-    cursor: pointer;
-    overflow: hidden;
-    margin-left: ${theme.spacing(0.5)};
-  `,
+  actionButtonsWrapper: css({
+    display: 'flex',
+    alignItems: 'flex-end',
+  }),
+  actionIcon: css({
+    color: theme.colors.text.secondary,
+    cursor: 'pointer',
+    '&:hover': {
+      color: theme.colors.text.primary,
+    },
+  }),
+  textWrapper: css({
+    display: 'flex',
+    alignItems: 'center',
+    flexGrow: 1,
+    overflow: 'hidden',
+    marginRight: theme.spacing(1),
+  }),
+  layerName: css({
+    fontWeight: theme.typography.fontWeightMedium,
+    color: theme.colors.primary.text,
+    cursor: 'pointer',
+    overflow: 'hidden',
+    marginLeft: theme.spacing(0.5),
+  }),
 });
diff --git a/public/app/plugins/panel/canvas/editor/options.ts b/public/app/plugins/panel/canvas/editor/options.ts
index 12858d18c7bc5..fb461163dde56 100644
--- a/public/app/plugins/panel/canvas/editor/options.ts
+++ b/public/app/plugins/panel/canvas/editor/options.ts
@@ -1,13 +1,22 @@
+import { capitalize } from 'lodash';
+
 import { PanelOptionsSupplier } from '@grafana/data/src/panel/PanelPlugin';
-import { CanvasConnection, CanvasElementOptions } from 'app/features/canvas';
+import { CanvasConnection, CanvasElementOptions, ConnectionDirection } from 'app/features/canvas';
 import { ColorDimensionEditor, ResourceDimensionEditor, ScaleDimensionEditor } from 'app/features/dimensions/editors';
 import { BackgroundSizeEditor } from 'app/features/dimensions/editors/BackgroundSizeEditor';
 
+import { LineStyle } from '../types';
+
+import { LineStyleEditor } from './LineStyleEditor';
+
 interface OptionSuppliers {
   addBackground: PanelOptionsSupplier<CanvasElementOptions>;
   addBorder: PanelOptionsSupplier<CanvasElementOptions>;
   addColor: PanelOptionsSupplier<CanvasConnection>;
   addSize: PanelOptionsSupplier<CanvasConnection>;
+  addRadius: PanelOptionsSupplier<CanvasConnection>;
+  addDirection: PanelOptionsSupplier<CanvasConnection>;
+  addLineStyle: PanelOptionsSupplier<CanvasConnection>;
 }
 
 const getCategoryName = (str: string, type: string | undefined) => {
@@ -82,6 +91,17 @@ export const optionBuilder: OptionSuppliers = {
         },
       });
     }
+
+    builder.addSliderInput({
+      category,
+      path: 'border.radius',
+      name: 'Radius',
+      defaultValue: 0,
+      settings: {
+        min: 0,
+        max: 60,
+      },
+    });
   },
 
   addColor: (builder, context) => {
@@ -120,4 +140,56 @@ export const optionBuilder: OptionSuppliers = {
       },
     });
   },
+
+  addRadius: (builder, context) => {
+    const category = ['Radius'];
+    builder.addCustomEditor({
+      category,
+      id: 'radius',
+      path: 'radius',
+      name: 'Radius',
+      editor: ScaleDimensionEditor,
+      settings: {
+        min: 0,
+        max: 200,
+      },
+      defaultValue: {
+        // Configured values
+        fixed: 0,
+        min: 0,
+        max: 100,
+      },
+    });
+  },
+
+  addDirection: (builder, context) => {
+    const category = ['Arrow Direction'];
+    builder.addRadio({
+      category,
+      path: 'direction',
+      name: 'Direction',
+      settings: {
+        options: [
+          { value: undefined, label: capitalize(ConnectionDirection.Forward) },
+          { value: ConnectionDirection.Reverse, label: capitalize(ConnectionDirection.Reverse) },
+          { value: ConnectionDirection.Both, label: capitalize(ConnectionDirection.Both) },
+          { value: ConnectionDirection.None, label: capitalize(ConnectionDirection.None) },
+        ],
+      },
+      defaultValue: ConnectionDirection.Forward,
+    });
+  },
+
+  addLineStyle: (builder, context) => {
+    const category = ['Line style'];
+    builder.addCustomEditor({
+      category,
+      id: 'lineStyle',
+      path: 'lineStyle',
+      name: 'Line style',
+      editor: LineStyleEditor,
+      settings: {},
+      defaultValue: { value: LineStyle.Solid, label: 'Solid' },
+    });
+  },
 };
diff --git a/public/app/plugins/panel/canvas/editor/panZoomHelp.tsx b/public/app/plugins/panel/canvas/editor/panZoomHelp.tsx
new file mode 100644
index 0000000000000..14b064ca1e717
--- /dev/null
+++ b/public/app/plugins/panel/canvas/editor/panZoomHelp.tsx
@@ -0,0 +1,57 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { StandardEditorProps, GrafanaTheme2 } from '@grafana/data';
+import { Alert, HorizontalGroup, Icon, VerticalGroup, useStyles2 } from '@grafana/ui';
+
+const helpUrl = 'https://grafana.com/docs/grafana/latest/panels-visualizations/visualizations/canvas/';
+
+export const PanZoomHelp = ({}: StandardEditorProps<string, unknown, unknown, unknown>) => {
+  const styles = useStyles2(getStyles);
+
+  return (
+    <>
+      <HorizontalGroup className={styles.hGroup}>
+        <Alert
+          title="Pan and zoom controls"
+          severity="info"
+          buttonContent={<Icon name="question-circle" size="xl" />}
+          className={styles.alert}
+          onRemove={() => {
+            const newWindow = window.open(helpUrl, '_blank', 'noopener,noreferrer');
+            if (newWindow) {
+              newWindow.opener = null;
+            }
+          }}
+        >
+          <VerticalGroup>
+            <ul>
+              <li>
+                Pan:
+                <ul>
+                  <li>Middle mouse</li>
+                  <li>CTRL + right mouse</li>
+                </ul>
+              </li>
+              <li>Zoom: Scroll wheel</li>
+              <li>Reset: Double click</li>
+            </ul>
+          </VerticalGroup>
+        </Alert>
+      </HorizontalGroup>
+    </>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  alert: css({
+    '& div': { padding: '4px', alignItems: 'start' },
+    marginBottom: '0px',
+    marginTop: '5px',
+    padding: '2px',
+    'ul > li': { marginLeft: '10px' },
+  }),
+  hGroup: css({
+    '& div': { width: '100%' },
+  }),
+});
diff --git a/public/app/plugins/panel/canvas/migrations.ts b/public/app/plugins/panel/canvas/migrations.ts
index 11e43b81d3881..5d0d92271e6d2 100644
--- a/public/app/plugins/panel/canvas/migrations.ts
+++ b/public/app/plugins/panel/canvas/migrations.ts
@@ -18,5 +18,25 @@ export const canvasMigrationHandler = (panel: PanelModel): Partial<Options> => {
     }
   }
 
+  if (pluginVersion.startsWith('11.0')) {
+    // Migration for v11.0 for ellipse element refactor: https://github.com/grafana/grafana/pull/84205
+    const root = panel.options?.root;
+    if (root?.elements) {
+      for (const element of root.elements) {
+        if (element.type === 'ellipse') {
+          // Take existing ellipse specific background and border config and apply it to the element's general background and border config
+          element.background = element.config.backgroundColor;
+          element.border.color = element.config.borderColor;
+          element.border.width = element.config.width;
+
+          // Remove the ellipse specific background and border config
+          delete element.config.backgroundColor;
+          delete element.config.borderColor;
+          delete element.config.width;
+        }
+      }
+    }
+  }
+
   return panel.options;
 };
diff --git a/public/app/plugins/panel/canvas/module.tsx b/public/app/plugins/panel/canvas/module.tsx
index 60936b2c12c5c..e6fa75a725683 100644
--- a/public/app/plugins/panel/canvas/module.tsx
+++ b/public/app/plugins/panel/canvas/module.tsx
@@ -1,10 +1,12 @@
 import { FieldConfigProperty, PanelOptionsEditorBuilder, PanelPlugin } from '@grafana/data';
+import { config } from '@grafana/runtime';
 import { FrameState } from 'app/features/canvas/runtime/frame';
 
 import { CanvasPanel, InstanceState } from './CanvasPanel';
 import { getConnectionEditor } from './editor/connectionEditor';
 import { getElementEditor } from './editor/element/elementEditor';
 import { getLayerEditor } from './editor/layer/layerEditor';
+import { PanZoomHelp } from './editor/panZoomHelp';
 import { canvasMigrationHandler } from './migrations';
 import { Options } from './panelcfg.gen';
 
@@ -22,6 +24,29 @@ export const addStandardCanvasEditorOptions = (builder: PanelOptionsEditorBuilde
     description: 'Enable selection of experimental element types',
     defaultValue: true,
   });
+
+  builder.addBooleanSwitch({
+    path: 'panZoom',
+    name: 'Pan and zoom',
+    description: 'Enable pan and zoom',
+    defaultValue: false,
+    showIf: (opts) => config.featureToggles.canvasPanelPanZoom,
+  });
+  builder.addCustomEditor({
+    id: 'panZoomHelp',
+    path: 'panZoomHelp',
+    name: '',
+    editor: PanZoomHelp,
+    showIf: (opts) => config.featureToggles.canvasPanelPanZoom && opts.panZoom,
+  });
+  builder.addBooleanSwitch({
+    path: 'infinitePan',
+    name: 'Infinite panning',
+    description:
+      'Enable infinite panning - useful for expansive canvases. Warning: this an experimental feature and currently only works well with elements that are top / left constrained',
+    defaultValue: false,
+    showIf: (opts) => config.featureToggles.canvasPanelPanZoom && opts.panZoom,
+  });
 };
 
 export const plugin = new PanelPlugin<Options>(CanvasPanel)
@@ -41,7 +66,7 @@ export const plugin = new PanelPlugin<Options>(CanvasPanel)
 
     addStandardCanvasEditorOptions(builder);
 
-    if (state) {
+    if (state && state.scene) {
       builder.addNestedOptions(getLayerEditor(state));
 
       const selection = state.selected;
diff --git a/public/app/plugins/panel/canvas/panelcfg.cue b/public/app/plugins/panel/canvas/panelcfg.cue
index 0e0be5a305084..6da7cebacc44e 100644
--- a/public/app/plugins/panel/canvas/panelcfg.cue
+++ b/public/app/plugins/panel/canvas/panelcfg.cue
@@ -42,6 +42,8 @@ composableKinds: PanelCfg: {
 
 					width?:  float64
 					height?: float64
+
+					rotation?: float64
 				} @cuetsy(kind="interface")
 
 				BackgroundImageSize: "original" | "contain" | "cover" | "fill" | "tile" @cuetsy(kind="enum", memberNames="Original|Contain|Cover|Fill|Tile")
@@ -52,8 +54,9 @@ composableKinds: PanelCfg: {
 				} @cuetsy(kind="interface")
 
 				LineConfig: {
-					color?: ui.ColorDimensionConfig
-					width?: float64
+					color?:  ui.ColorDimensionConfig
+					width?:  float64
+					radius?: float64
 				} @cuetsy(kind="interface")
 
 				HttpRequestMethod: "GET" | "POST" | "PUT" @cuetsy(kind="enum", memberNames="GET|POST|PUT")
@@ -70,6 +73,9 @@ composableKinds: PanelCfg: {
 					path:        ConnectionPath
 					color?:      ui.ColorDimensionConfig
 					size?:       ui.ScaleDimensionConfig
+					vertices?: [...ConnectionCoordinates]
+					sourceOriginal?: ConnectionCoordinates
+					targetOriginal?: ConnectionCoordinates
 				} @cuetsy(kind="interface")
 				CanvasElementOptions: {
 					name: string
@@ -88,6 +94,10 @@ composableKinds: PanelCfg: {
 					inlineEditing: bool | *true
 					// Show all available element types
 					showAdvancedTypes: bool | *true
+					// Enable pan and zoom
+					panZoom: bool | *true
+					// Enable infinite pan
+					infinitePan: bool | *true
 					// The root element of canvas (frame), where all canvas elements are nested
 					// TODO: Figure out how to define a default value for this
 					root: {
diff --git a/public/app/plugins/panel/canvas/panelcfg.gen.ts b/public/app/plugins/panel/canvas/panelcfg.gen.ts
index c7dee893e3071..9706c886f6d84 100644
--- a/public/app/plugins/panel/canvas/panelcfg.gen.ts
+++ b/public/app/plugins/panel/canvas/panelcfg.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
@@ -36,6 +36,7 @@ export interface Placement {
   height?: number;
   left?: number;
   right?: number;
+  rotation?: number;
   top?: number;
   width?: number;
 }
@@ -56,6 +57,7 @@ export interface BackgroundConfig {
 
 export interface LineConfig {
   color?: ui.ColorDimensionConfig;
+  radius?: number;
   width?: number;
 }
 
@@ -79,10 +81,17 @@ export interface CanvasConnection {
   path: ConnectionPath;
   size?: ui.ScaleDimensionConfig;
   source: ConnectionCoordinates;
+  sourceOriginal?: ConnectionCoordinates;
   target: ConnectionCoordinates;
   targetName?: string;
+  targetOriginal?: ConnectionCoordinates;
+  vertices?: Array<ConnectionCoordinates>;
 }
 
+export const defaultCanvasConnection: Partial<CanvasConnection> = {
+  vertices: [],
+};
+
 export interface CanvasElementOptions {
   background?: BackgroundConfig;
   border?: LineConfig;
@@ -102,10 +111,18 @@ export const defaultCanvasElementOptions: Partial<CanvasElementOptions> = {
 };
 
 export interface Options {
+  /**
+   * Enable infinite pan
+   */
+  infinitePan: boolean;
   /**
    * Enable inline editing
    */
   inlineEditing: boolean;
+  /**
+   * Enable pan and zoom
+   */
+  panZoom: boolean;
   /**
    * The root element of canvas (frame), where all canvas elements are nested
    * TODO: Figure out how to define a default value for this
@@ -131,6 +148,8 @@ export interface Options {
 }
 
 export const defaultOptions: Partial<Options> = {
+  infinitePan: true,
   inlineEditing: true,
+  panZoom: true,
   showAdvancedTypes: true,
 };
diff --git a/public/app/plugins/panel/canvas/types.ts b/public/app/plugins/panel/canvas/types.ts
index aea23f571afea..03680589e2d70 100644
--- a/public/app/plugins/panel/canvas/types.ts
+++ b/public/app/plugins/panel/canvas/types.ts
@@ -1,6 +1,8 @@
 import { CanvasConnection } from '../../../features/canvas';
 import { ElementState } from '../../../features/canvas/runtime/element';
 
+import { ConnectionCoordinates } from './panelcfg.gen';
+
 export enum LayerActionID {
   Delete = 'delete',
   Duplicate = 'duplicate',
@@ -39,4 +41,17 @@ export interface ConnectionState {
   source: ElementState;
   target: ElementState;
   info: CanvasConnection;
+  vertices?: ConnectionCoordinates[];
+  sourceOriginal?: ConnectionCoordinates;
+  targetOriginal?: ConnectionCoordinates;
+}
+
+export enum LineStyle {
+  Solid = 'solid',
+  Dashed = 'dashed',
+}
+
+export enum StrokeDasharray {
+  Solid = '0',
+  Dashed = '8 8',
 }
diff --git a/public/app/plugins/panel/canvas/utils.ts b/public/app/plugins/panel/canvas/utils.ts
index 5e4a03eec9760..fde344779f210 100644
--- a/public/app/plugins/panel/canvas/utils.ts
+++ b/public/app/plugins/panel/canvas/utils.ts
@@ -2,14 +2,15 @@ import { isNumber, isString } from 'lodash';
 
 import { AppEvents, Field, getFieldDisplayName, LinkModel, PluginState, SelectableValue } from '@grafana/data';
 import appEvents from 'app/core/app_events';
-import { hasAlphaPanels } from 'app/core/config';
+import { hasAlphaPanels, config } from 'app/core/config';
 import {
   defaultElementItems,
   advancedElementItems,
   CanvasElementItem,
   canvasElementRegistry,
   CanvasElementOptions,
-  TextConfig,
+  CanvasConnection,
+  ConnectionDirection,
 } from 'app/features/canvas';
 import { notFoundItem } from 'app/features/canvas/elements/notFound';
 import { ElementState } from 'app/features/canvas/runtime/element';
@@ -17,7 +18,7 @@ import { FrameState } from 'app/features/canvas/runtime/frame';
 import { Scene, SelectionParams } from 'app/features/canvas/runtime/scene';
 import { DimensionContext } from 'app/features/dimensions';
 
-import { AnchorPoint, ConnectionState } from './types';
+import { AnchorPoint, ConnectionState, LineStyle, StrokeDasharray } from './types';
 
 export function doSelect(scene: Scene, element: ElementState | FrameState) {
   try {
@@ -106,28 +107,163 @@ export function onAddItem(sel: SelectableValue<string>, rootLayer: FrameState |
   }
 }
 
-export function getDataLinks(ctx: DimensionContext, cfg: TextConfig, textData: string | undefined): LinkModel[] {
-  const panelData = ctx.getPanelData();
+/*
+ * Provided a given field add any matching data links
+ * Mutates the links object in place which is then returned by the `getDataLinks` function downstream
+ */
+const addDataLinkForField = (
+  field: Field<unknown>,
+  data: string | undefined,
+  linkLookup: Set<string>,
+  links: Array<LinkModel<Field>>
+): void => {
+  if (field?.getLinks) {
+    const disp = field.display ? field.display(data) : { text: `${data}`, numeric: +data! };
+    // TODO add more control over which row index each element uses
+    const valueRowIndex = field.values.length - 1;
+    field.getLinks({ calculatedValue: disp, valueRowIndex }).forEach((link) => {
+      const key = `${link.title}/${link.href}`;
+      if (!linkLookup.has(key)) {
+        links.push(link);
+        linkLookup.add(key);
+      }
+    });
+  }
+};
+
+// TODO: This could be refactored a fair amount, ideally the element specific config code should be owned by each element and not in this shared util file
+export function getDataLinks(
+  dimensionContext: DimensionContext,
+  elementOptions: CanvasElementOptions,
+  data: string | undefined
+): LinkModel[] {
+  const panelData = dimensionContext.getPanelData();
   const frames = panelData?.series;
 
   const links: Array<LinkModel<Field>> = [];
   const linkLookup = new Set<string>();
 
+  const elementConfig = elementOptions.config;
+
   frames?.forEach((frame) => {
     const visibleFields = frame.fields.filter((field) => !Boolean(field.config.custom?.hideFrom?.tooltip));
 
-    if (cfg.text?.field && visibleFields.some((f) => getFieldDisplayName(f, frame) === cfg.text?.field)) {
-      const field = visibleFields.filter((field) => getFieldDisplayName(field, frame) === cfg.text?.field)[0];
-      if (field?.getLinks) {
-        const disp = field.display ? field.display(textData) : { text: `${textData}`, numeric: +textData! };
-        field.getLinks({ calculatedValue: disp }).forEach((link) => {
-          const key = `${link.title}/${link.href}`;
-          if (!linkLookup.has(key)) {
-            links.push(link);
-            linkLookup.add(key);
-          }
-        });
-      }
+    // Text config
+    const isTextTiedToFieldData =
+      elementConfig?.text?.field &&
+      visibleFields.some((field) => getFieldDisplayName(field, frame) === elementConfig?.text?.field);
+    const isTextColorTiedToFieldData =
+      elementConfig?.color?.field &&
+      visibleFields.some((field) => getFieldDisplayName(field, frame) === elementConfig?.color?.field);
+
+    // General element config
+    const isElementBackgroundColorTiedToFieldData =
+      elementOptions?.background?.color?.field &&
+      visibleFields.some((field) => getFieldDisplayName(field, frame) === elementOptions?.background?.color?.field);
+    const isElementBackgroundImageTiedToFieldData =
+      elementOptions?.background?.image?.field &&
+      visibleFields.some((field) => getFieldDisplayName(field, frame) === elementOptions?.background?.image?.field);
+    const isElementBorderColorTiedToFieldData =
+      elementOptions?.border?.color?.field &&
+      visibleFields.some((field) => getFieldDisplayName(field, frame) === elementOptions?.border?.color?.field);
+
+    // Icon config
+    const isIconSVGTiedToFieldData =
+      elementConfig?.path?.field &&
+      visibleFields.some((field) => getFieldDisplayName(field, frame) === elementConfig?.path?.field);
+    const isIconColorTiedToFieldData =
+      elementConfig?.fill?.field &&
+      visibleFields.some((field) => getFieldDisplayName(field, frame) === elementConfig?.fill?.field);
+
+    // Wind turbine config (maybe remove / not support this?)
+    const isWindTurbineRPMTiedToFieldData =
+      elementConfig?.rpm?.field &&
+      visibleFields.some((field) => getFieldDisplayName(field, frame) === elementConfig?.rpm?.field);
+
+    // Server config
+    const isServerBlinkRateTiedToFieldData =
+      elementConfig?.blinkRate?.field &&
+      visibleFields.some((field) => getFieldDisplayName(field, frame) === elementConfig?.blinkRate?.field);
+    const isServerStatusColorTiedToFieldData =
+      elementConfig?.statusColor?.field &&
+      visibleFields.some((field) => getFieldDisplayName(field, frame) === elementConfig?.statusColor?.field);
+    const isServerBulbColorTiedToFieldData =
+      elementConfig?.bulbColor?.field &&
+      visibleFields.some((field) => getFieldDisplayName(field, frame) === elementConfig?.bulbColor?.field);
+
+    if (isTextTiedToFieldData) {
+      const field = visibleFields.filter(
+        (field) => getFieldDisplayName(field, frame) === elementConfig?.text?.field
+      )[0];
+      addDataLinkForField(field, data, linkLookup, links);
+    }
+
+    if (isTextColorTiedToFieldData) {
+      const field = visibleFields.filter(
+        (field) => getFieldDisplayName(field, frame) === elementConfig?.color?.field
+      )[0];
+      addDataLinkForField(field, data, linkLookup, links);
+    }
+
+    if (isElementBackgroundColorTiedToFieldData) {
+      const field = visibleFields.filter(
+        (field) => getFieldDisplayName(field, frame) === elementOptions?.background?.color?.field
+      )[0];
+      addDataLinkForField(field, data, linkLookup, links);
+    }
+
+    if (isElementBackgroundImageTiedToFieldData) {
+      const field = visibleFields.filter(
+        (field) => getFieldDisplayName(field, frame) === elementOptions?.background?.image?.field
+      )[0];
+      addDataLinkForField(field, data, linkLookup, links);
+    }
+
+    if (isElementBorderColorTiedToFieldData) {
+      const field = visibleFields.filter(
+        (field) => getFieldDisplayName(field, frame) === elementOptions?.border?.color?.field
+      )[0];
+      addDataLinkForField(field, data, linkLookup, links);
+    }
+
+    if (isIconSVGTiedToFieldData) {
+      const field = visibleFields.filter(
+        (field) => getFieldDisplayName(field, frame) === elementConfig?.path?.field
+      )[0];
+      addDataLinkForField(field, data, linkLookup, links);
+    }
+
+    if (isIconColorTiedToFieldData) {
+      const field = visibleFields.filter(
+        (field) => getFieldDisplayName(field, frame) === elementConfig?.fill?.field
+      )[0];
+      addDataLinkForField(field, data, linkLookup, links);
+    }
+
+    if (isWindTurbineRPMTiedToFieldData) {
+      const field = visibleFields.filter((field) => getFieldDisplayName(field, frame) === elementConfig?.rpm?.field)[0];
+      addDataLinkForField(field, data, linkLookup, links);
+    }
+
+    if (isServerBlinkRateTiedToFieldData) {
+      const field = visibleFields.filter(
+        (field) => getFieldDisplayName(field, frame) === elementConfig?.blinkRate?.field
+      )[0];
+      addDataLinkForField(field, data, linkLookup, links);
+    }
+
+    if (isServerStatusColorTiedToFieldData) {
+      const field = visibleFields.filter(
+        (field) => getFieldDisplayName(field, frame) === elementConfig?.statusColor?.field
+      )[0];
+      addDataLinkForField(field, data, linkLookup, links);
+    }
+
+    if (isServerBulbColorTiedToFieldData) {
+      const field = visibleFields.filter(
+        (field) => getFieldDisplayName(field, frame) === elementConfig?.bulbColor?.field
+      )[0];
+      addDataLinkForField(field, data, linkLookup, links);
     }
   });
 
@@ -163,6 +299,9 @@ export function getConnections(sceneByName: Map<string, ElementState>) {
             source: v,
             target,
             info: c,
+            vertices: c.vertices ?? undefined,
+            sourceOriginal: c.sourceOriginal ?? undefined,
+            targetOriginal: c.targetOriginal ?? undefined,
           });
         }
       });
@@ -183,4 +322,127 @@ export function updateConnectionsForSource(element: ElementState, scene: Scene)
     const connections = sourceConnections.filter((con) => con.targetName !== element.getName());
     connection.source.onChange({ ...connection.source.options, connections });
   });
+
+  // Update scene connection state to clear out old connections
+  scene.connections.updateState();
 }
+
+export const calculateCoordinates = (
+  sourceRect: DOMRect,
+  parentRect: DOMRect,
+  info: CanvasConnection,
+  target: ElementState,
+  transformScale: number
+) => {
+  const sourceHorizontalCenter = sourceRect.left - parentRect.left + sourceRect.width / 2;
+  const sourceVerticalCenter = sourceRect.top - parentRect.top + sourceRect.height / 2;
+
+  // Convert from connection coords to DOM coords
+  const x1 = (sourceHorizontalCenter + (info.source.x * sourceRect.width) / 2) / transformScale;
+  const y1 = (sourceVerticalCenter - (info.source.y * sourceRect.height) / 2) / transformScale;
+
+  let x2: number;
+  let y2: number;
+  const targetRect = target.div?.getBoundingClientRect();
+  if (info.targetName && targetRect) {
+    const targetHorizontalCenter = targetRect.left - parentRect.left + targetRect.width / 2;
+    const targetVerticalCenter = targetRect.top - parentRect.top + targetRect.height / 2;
+
+    x2 = targetHorizontalCenter + (info.target.x * targetRect.width) / 2;
+    y2 = targetVerticalCenter - (info.target.y * targetRect.height) / 2;
+  } else {
+    const parentHorizontalCenter = parentRect.width / 2;
+    const parentVerticalCenter = parentRect.height / 2;
+
+    x2 = parentHorizontalCenter + (info.target.x * parentRect.width) / 2;
+    y2 = parentVerticalCenter - (info.target.y * parentRect.height) / 2;
+  }
+  x2 /= transformScale;
+  y2 /= transformScale;
+
+  // TODO look into a better way to avoid division by zero
+  if (x2 - x1 === 0) {
+    x2 += 1;
+  }
+  if (y2 - y1 === 0) {
+    y2 += 1;
+  }
+  return { x1, y1, x2, y2 };
+};
+
+export const calculateMidpoint = (x1: number, y1: number, x2: number, y2: number) => {
+  return { x: (x1 + x2) / 2, y: (y1 + y2) / 2 };
+};
+
+export const calculateAbsoluteCoords = (
+  x1: number,
+  y1: number,
+  x2: number,
+  y2: number,
+  valueX: number,
+  valueY: number,
+  deltaX: number,
+  deltaY: number
+) => {
+  return { x: valueX * deltaX + x1, y: valueY * deltaY + y1 };
+};
+
+// Calculate angle between two points and return angle in radians
+export const calculateAngle = (x1: number, y1: number, x2: number, y2: number) => {
+  return Math.atan2(y2 - y1, x2 - x1);
+};
+
+export const calculateDistance = (x1: number, y1: number, x2: number, y2: number) => {
+  //TODO add sqrt approx option
+  return Math.sqrt((x2 - x1) ** 2 + (y2 - y1) ** 2);
+};
+
+// @TODO revisit, currently returning last row index for field
+export const getRowIndex = (fieldName: string | undefined, scene: Scene) => {
+  if (fieldName) {
+    const series = scene.context.getPanelData()?.series[0];
+    const field = series?.fields.find((f) => (f.name = fieldName));
+    const data = field?.values;
+    return data ? data.length - 1 : 0;
+  }
+  return 0;
+};
+
+export const getConnectionStyles = (
+  info: CanvasConnection,
+  scene: Scene,
+  defaultArrowSize: number,
+  defaultArrowDirection: ConnectionDirection
+) => {
+  const defaultArrowColor = config.theme2.colors.text.primary;
+  const lastRowIndex = getRowIndex(info.size?.field, scene);
+  const strokeColor = info.color ? scene.context.getColor(info.color).value() : defaultArrowColor;
+  const strokeWidth = info.size ? scene.context.getScale(info.size).get(lastRowIndex) : defaultArrowSize;
+  const strokeRadius = info.radius ? scene.context.getScale(info.radius).get(lastRowIndex) : 0;
+  const arrowDirection = info.direction ? info.direction : defaultArrowDirection;
+  const lineStyle = info.lineStyle === LineStyle.Dashed ? StrokeDasharray.Dashed : StrokeDasharray.Solid;
+  return { strokeColor, strokeWidth, strokeRadius, arrowDirection, lineStyle };
+};
+
+export const getParentBoundingClientRect = (scene: Scene) => {
+  if (config.featureToggles.canvasPanelPanZoom) {
+    const transformRef = scene.transformComponentRef?.current;
+    return transformRef?.instance.contentComponent?.getBoundingClientRect();
+  }
+
+  return scene.div?.getBoundingClientRect();
+};
+
+export const getTransformInstance = (scene: Scene) => {
+  if (config.featureToggles.canvasPanelPanZoom) {
+    return scene.transformComponentRef?.current?.instance;
+  }
+  return undefined;
+};
+
+export const getParent = (scene: Scene) => {
+  if (config.featureToggles.canvasPanelPanZoom) {
+    return scene.transformComponentRef?.current?.instance.contentComponent;
+  }
+  return scene.div;
+};
diff --git a/public/app/plugins/panel/dashlist/DashList.tsx b/public/app/plugins/panel/dashlist/DashList.tsx
index 9f773eb009927..e0a75e7e33be8 100644
--- a/public/app/plugins/panel/dashlist/DashList.tsx
+++ b/public/app/plugins/panel/dashlist/DashList.tsx
@@ -1,16 +1,25 @@
 import { take } from 'lodash';
 import React, { useEffect, useMemo, useState } from 'react';
 
-import { DateTime, InterpolateFunction, PanelProps, textUtil, UrlQueryValue, urlUtil } from '@grafana/data';
+import {
+  DataLinkBuiltInVars,
+  DateTime,
+  InterpolateFunction,
+  PanelProps,
+  textUtil,
+  UrlQueryValue,
+  urlUtil,
+} from '@grafana/data';
 import { CustomScrollbar, useStyles2, IconButton } from '@grafana/ui';
 import { getConfig } from 'app/core/config';
+import { appEvents } from 'app/core/core';
+import { useBusEvent } from 'app/core/hooks/useBusEvent';
 import { setStarred } from 'app/core/reducers/navBarTree';
 import { getBackendSrv } from 'app/core/services/backend_srv';
 import impressionSrv from 'app/core/services/impression_srv';
 import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
-import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { DashboardSearchItem } from 'app/features/search/types';
-import { getVariablesUrlParams } from 'app/features/variables/getAllVariableValuesForUrl';
+import { VariablesChanged } from 'app/features/variables/types';
 import { useDispatch } from 'app/types';
 
 import { Options } from './panelcfg.gen';
@@ -26,6 +35,7 @@ interface DashboardGroup {
 
 async function fetchDashboards(options: Options, replaceVars: InterpolateFunction) {
   let starredDashboards: Promise<DashboardSearchItem[]> = Promise.resolve([]);
+
   if (options.showStarred) {
     const params = { limit: options.maxItems, starred: 'true' };
     starredDashboards = getBackendSrv().search(params);
@@ -92,6 +102,7 @@ async function fetchDashboards(options: Options, replaceVars: InterpolateFunctio
 export function DashList(props: PanelProps<Options>) {
   const [dashboards, setDashboards] = useState(new Map<string, Dashboard>());
   const dispatch = useDispatch();
+
   useEffect(() => {
     fetchDashboards(props.options, props.replaceVariables).then((dashes) => {
       setDashboards(dashes);
@@ -140,27 +151,14 @@ export function DashList(props: PanelProps<Options>) {
   ];
 
   const css = useStyles2(getStyles);
+  const urlParams = useDashListUrlParams(props);
 
   const renderList = (dashboards: Dashboard[]) => (
     <ul>
       {dashboards.map((dash) => {
         let url = dash.url;
-        let params: { [key: string]: string | DateTime | UrlQueryValue } = {};
-
-        if (props.options.keepTime) {
-          const range = getTimeSrv().timeRangeForUrl();
-          params['from'] = range.from;
-          params['to'] = range.to;
-        }
-
-        if (props.options.includeVars) {
-          params = {
-            ...params,
-            ...getVariablesUrlParams(),
-          };
-        }
-
-        url = urlUtil.appendQueryToUrl(url, urlUtil.toUrlParams(params));
+
+        url = urlUtil.appendQueryToUrl(url, urlParams);
         url = getConfig().disableSanitizeHtml ? url : textUtil.sanitizeUrl(url);
 
         return (
@@ -199,3 +197,22 @@ export function DashList(props: PanelProps<Options>) {
     </CustomScrollbar>
   );
 }
+
+function useDashListUrlParams(props: PanelProps<Options>) {
+  // We don't care about the payload just want to get re-render when this event is published
+  useBusEvent(appEvents, VariablesChanged);
+
+  let params: { [key: string]: string | DateTime | UrlQueryValue } = {};
+
+  if (props.options.keepTime) {
+    params[`\$${DataLinkBuiltInVars.keepTime}`] = true;
+  }
+
+  if (props.options.includeVars) {
+    params[`\$${DataLinkBuiltInVars.includeVars}`] = true;
+  }
+
+  const urlParms = props.replaceVariables(urlUtil.toUrlParams(params));
+
+  return urlParms;
+}
diff --git a/public/app/plugins/panel/dashlist/migrations.test.ts b/public/app/plugins/panel/dashlist/migrations.test.ts
index 62f1f51172a4d..607c5b9c7a6d1 100644
--- a/public/app/plugins/panel/dashlist/migrations.test.ts
+++ b/public/app/plugins/panel/dashlist/migrations.test.ts
@@ -19,7 +19,7 @@ describe('dashlist migrations', () => {
     const basePanelModel = wellFormedPanelModel({});
     basePanelModel.pluginVersion = '5.1';
 
-    const angularPanel: PanelModel<any> & AngularModel = {
+    const angularPanel: PanelModel & AngularModel = {
       ...basePanelModel,
       // pluginVersion: '5.1',
       starred: true,
diff --git a/public/app/plugins/panel/dashlist/module.tsx b/public/app/plugins/panel/dashlist/module.tsx
index 6cbc76f964ded..0ac1e61dd7d75 100644
--- a/public/app/plugins/panel/dashlist/module.tsx
+++ b/public/app/plugins/panel/dashlist/module.tsx
@@ -3,6 +3,7 @@ import React from 'react';
 import { PanelPlugin } from '@grafana/data';
 import { TagsInput } from '@grafana/ui';
 import { FolderPicker } from 'app/core/components/Select/FolderPicker';
+import { PermissionLevelString } from 'app/types';
 
 import { DashList } from './DashList';
 import { dashlistMigrationHandler } from './migrations';
@@ -57,7 +58,14 @@ export const plugin = new PanelPlugin<Options>(DashList)
         id: 'folderUID',
         defaultValue: undefined,
         editor: function RenderFolderPicker({ value, onChange }) {
-          return <FolderPicker value={value} onChange={(folderUID) => onChange(folderUID)} />;
+          return (
+            <FolderPicker
+              clearable
+              permission={PermissionLevelString.View}
+              value={value}
+              onChange={(folderUID) => onChange(folderUID)}
+            />
+          );
         },
       })
       .addCustomEditor({
diff --git a/public/app/plugins/panel/dashlist/panelcfg.gen.ts b/public/app/plugins/panel/dashlist/panelcfg.gen.ts
index 4c12168d0a517..7d85f926cfcc8 100644
--- a/public/app/plugins/panel/dashlist/panelcfg.gen.ts
+++ b/public/app/plugins/panel/dashlist/panelcfg.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/public/app/plugins/panel/datagrid/DataGridPanel.test.tsx b/public/app/plugins/panel/datagrid/DataGridPanel.test.tsx
index 7594d3df6de9e..4183fff2f3881 100644
--- a/public/app/plugins/panel/datagrid/DataGridPanel.test.tsx
+++ b/public/app/plugins/panel/datagrid/DataGridPanel.test.tsx
@@ -1,7 +1,7 @@
 import { render, screen, fireEvent, act, waitFor } from '@testing-library/react';
 import * as React from 'react';
 
-import { ArrayVector, DataFrame, dateTime, EventBus, Field, FieldType, LoadingState } from '@grafana/data';
+import { DataFrame, dateTime, EventBus, Field, FieldType, LoadingState } from '@grafana/data';
 
 import { DataGridPanel, DataGridProps } from './DataGridPanel';
 import * as utils from './utils';
@@ -312,7 +312,7 @@ describe('DataGrid', () => {
             expect.objectContaining({
               name: 'newColumn',
               type: 'string',
-              values: new ArrayVector(['', '', '', '']),
+              values: ['', '', '', ''],
             }),
           ]),
         }),
diff --git a/public/app/plugins/panel/datagrid/panelcfg.gen.ts b/public/app/plugins/panel/datagrid/panelcfg.gen.ts
index 40269576d7270..4816dbbc0006b 100644
--- a/public/app/plugins/panel/datagrid/panelcfg.gen.ts
+++ b/public/app/plugins/panel/datagrid/panelcfg.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/public/app/plugins/panel/datagrid/utils.test.ts b/public/app/plugins/panel/datagrid/utils.test.ts
index 3f0a61e0c0f8f..71a0c7ee111ce 100644
--- a/public/app/plugins/panel/datagrid/utils.test.ts
+++ b/public/app/plugins/panel/datagrid/utils.test.ts
@@ -1,4 +1,4 @@
-import { ArrayVector, DataFrame, FieldType } from '@grafana/data';
+import { DataFrame, FieldType } from '@grafana/data';
 
 import { clearCellsFromRangeSelection, deleteRows } from './utils';
 
@@ -14,19 +14,19 @@ describe('when deleting rows', () => {
         {
           name: 'test1',
           type: FieldType.string,
-          values: new ArrayVector(['a', 'b', 'c', 'd', 'e']),
+          values: ['a', 'b', 'c', 'd', 'e'],
           config: {},
         },
         {
           name: 'test2',
           type: FieldType.number,
-          values: new ArrayVector([1, 2, 3, 4, 5]),
+          values: [1, 2, 3, 4, 5],
           config: {},
         },
         {
           name: 'test3',
           type: FieldType.string,
-          values: new ArrayVector(['a', 'b', 'c', 'd', 'e']),
+          values: ['a', 'b', 'c', 'd', 'e'],
           config: {},
         },
       ],
@@ -98,19 +98,19 @@ describe('when clearing cells from range selection', () => {
         {
           name: 'test1',
           type: FieldType.string,
-          values: new ArrayVector(['a', 'b', 'c', 'd', 'e']),
+          values: ['a', 'b', 'c', 'd', 'e'],
           config: {},
         },
         {
           name: 'test2',
           type: FieldType.number,
-          values: new ArrayVector([1, 2, 3, 4, 5]),
+          values: [1, 2, 3, 4, 5],
           config: {},
         },
         {
           name: 'test3',
           type: FieldType.string,
-          values: new ArrayVector(['a', 'b', 'c', 'd', 'e']),
+          values: ['a', 'b', 'c', 'd', 'e'],
           config: {},
         },
       ],
diff --git a/public/app/plugins/panel/debug/EventBusLogger.tsx b/public/app/plugins/panel/debug/EventBusLogger.tsx
index c13501abd61e4..32bedcf6bd9f2 100644
--- a/public/app/plugins/panel/debug/EventBusLogger.tsx
+++ b/public/app/plugins/panel/debug/EventBusLogger.tsx
@@ -52,7 +52,7 @@ export class EventBusLoggerPanel extends PureComponent<Props, State> {
 
   eventObserver: PartialObserver<BusEvent> = {
     next: (event: BusEvent) => {
-      const origin = event.origin as any;
+      const origin: any = event.origin;
       this.history.add({
         key: counter++,
         type: event.type,
diff --git a/public/app/plugins/panel/debug/panelcfg.gen.ts b/public/app/plugins/panel/debug/panelcfg.gen.ts
index 436fb0cd671b6..2163fc29ccd96 100644
--- a/public/app/plugins/panel/debug/panelcfg.gen.ts
+++ b/public/app/plugins/panel/debug/panelcfg.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/public/app/plugins/panel/flamegraph/FlameGraphPanel.tsx b/public/app/plugins/panel/flamegraph/FlameGraphPanel.tsx
index 0b477ebb7e717..a284ee92d82f9 100644
--- a/public/app/plugins/panel/flamegraph/FlameGraphPanel.tsx
+++ b/public/app/plugins/panel/flamegraph/FlameGraphPanel.tsx
@@ -25,10 +25,12 @@ export const FlameGraphPanel = (props: PanelProps) => {
       data={props.data.series[0]}
       stickyHeader={false}
       getTheme={() => config.theme2}
+      showFlameGraphOnly={props.options?.showFlameGraphOnly ?? false}
       onTableSymbolClick={() => interaction('table_item_selected')}
       onViewSelected={(view: string) => interaction('view_selected', { view })}
       onTextAlignSelected={(align: string) => interaction('text_align_selected', { align })}
       onTableSort={(sort: string) => interaction('table_sort_selected', { sort })}
+      disableCollapsing={!config.featureToggles.flameGraphItemCollapsing}
     />
   );
 };
diff --git a/public/app/plugins/panel/gauge/GaugePanel.tsx b/public/app/plugins/panel/gauge/GaugePanel.tsx
index ee4b622e71017..7b798f6340278 100644
--- a/public/app/plugins/panel/gauge/GaugePanel.tsx
+++ b/public/app/plugins/panel/gauge/GaugePanel.tsx
@@ -1,13 +1,14 @@
 import React, { PureComponent } from 'react';
 
 import { FieldDisplay, getDisplayProcessor, getFieldDisplayValues, PanelProps } from '@grafana/data';
+import { BarGaugeSizing, VizOrientation } from '@grafana/schema';
 import { DataLinksContextMenu, Gauge, VizRepeater, VizRepeaterRenderValueProps } from '@grafana/ui';
 import { DataLinksContextMenuApi } from '@grafana/ui/src/components/DataLinks/DataLinksContextMenu';
 import { config } from 'app/core/config';
 
 import { clearNameForSingleSeries } from '../bargauge/BarGaugePanel';
 
-import { Options } from './panelcfg.gen';
+import { defaultOptions, Options } from './panelcfg.gen';
 
 export class GaugePanel extends PureComponent<PanelProps<Options>> {
   renderComponent = (
@@ -78,9 +79,25 @@ export class GaugePanel extends PureComponent<PanelProps<Options>> {
     });
   };
 
+  calculateGaugeSize = () => {
+    const { options } = this.props;
+
+    const orientation = options.orientation;
+    const isManualSizing = options.sizing === BarGaugeSizing.Manual;
+    const isVerticalOrientation = orientation === VizOrientation.Vertical;
+    const isHorizontalOrientation = orientation === VizOrientation.Horizontal;
+
+    const minVizWidth = isManualSizing && isVerticalOrientation ? options.minVizWidth : defaultOptions.minVizWidth;
+    const minVizHeight = isManualSizing && isHorizontalOrientation ? options.minVizHeight : defaultOptions.minVizHeight;
+
+    return { minVizWidth, minVizHeight };
+  };
+
   render() {
     const { height, width, data, renderCounter, options } = this.props;
 
+    const { minVizHeight, minVizWidth } = this.calculateGaugeSize();
+
     return (
       <VizRepeater
         getValues={this.getValues}
@@ -91,8 +108,8 @@ export class GaugePanel extends PureComponent<PanelProps<Options>> {
         autoGrid={true}
         renderCounter={renderCounter}
         orientation={options.orientation}
-        minVizHeight={options.minVizHeight}
-        minVizWidth={options.minVizWidth}
+        minVizHeight={minVizHeight}
+        minVizWidth={minVizWidth}
       />
     );
   }
diff --git a/public/app/plugins/panel/gauge/module.tsx b/public/app/plugins/panel/gauge/module.tsx
index c62938bf84a8d..d2dbf9369fc37 100644
--- a/public/app/plugins/panel/gauge/module.tsx
+++ b/public/app/plugins/panel/gauge/module.tsx
@@ -1,5 +1,5 @@
 import { PanelPlugin } from '@grafana/data';
-import { VizOrientation } from '@grafana/schema';
+import { BarGaugeSizing, VizOrientation } from '@grafana/schema';
 import { commonOptionsBuilder } from '@grafana/ui';
 
 import { addOrientationOption, addStandardDataReduceOptions } from '../stat/common';
@@ -39,19 +39,43 @@ export const plugin = new PanelPlugin<Options>(GaugePanel)
         description: 'Renders the thresholds as an outer bar',
         defaultValue: defaultOptions.showThresholdMarkers,
       })
-      .addNumberInput({
+      .addRadio({
+        path: 'sizing',
+        name: 'Gauge size',
+        settings: {
+          options: [
+            { value: BarGaugeSizing.Auto, label: 'Auto' },
+            { value: BarGaugeSizing.Manual, label: 'Manual' },
+          ],
+        },
+        defaultValue: defaultOptions.sizing,
+        showIf: (options: Options) => options.orientation !== VizOrientation.Auto,
+      })
+      .addSliderInput({
         path: 'minVizWidth',
         name: 'Min width',
-        description: 'Minimum column width',
+        description: 'Minimum column width (vertical orientation)',
         defaultValue: defaultOptions.minVizWidth,
-        showIf: (options: Options) => options.orientation === VizOrientation.Vertical,
+        settings: {
+          min: 0,
+          max: 600,
+          step: 1,
+        },
+        showIf: (options: Options) =>
+          options.sizing === BarGaugeSizing.Manual && options.orientation === VizOrientation.Vertical,
       })
-      .addNumberInput({
+      .addSliderInput({
         path: 'minVizHeight',
         name: 'Min height',
-        description: 'Minimum row height',
+        description: 'Minimum row height (horizontal orientation)',
         defaultValue: defaultOptions.minVizHeight,
-        showIf: (options: Options) => options.orientation === VizOrientation.Horizontal,
+        settings: {
+          min: 0,
+          max: 600,
+          step: 1,
+        },
+        showIf: (options: Options) =>
+          options.sizing === BarGaugeSizing.Manual && options.orientation === VizOrientation.Horizontal,
       });
 
     commonOptionsBuilder.addTextSizeOptions(builder);
diff --git a/public/app/plugins/panel/gauge/panelcfg.cue b/public/app/plugins/panel/gauge/panelcfg.cue
index b3fc121d0ebca..99f67d6da8b7d 100644
--- a/public/app/plugins/panel/gauge/panelcfg.cue
+++ b/public/app/plugins/panel/gauge/panelcfg.cue
@@ -29,6 +29,7 @@ composableKinds: PanelCfg: {
 					common.SingleStatBaseOptions
 					showThresholdLabels:  bool | *false
 					showThresholdMarkers: bool | *true
+					sizing:               common.BarGaugeSizing & (*"auto" | _)
 					minVizWidth:          uint32 | *75
 					minVizHeight:         uint32 | *75
 				} @cuetsy(kind="interface")
diff --git a/public/app/plugins/panel/gauge/panelcfg.gen.ts b/public/app/plugins/panel/gauge/panelcfg.gen.ts
index 742a66a1ea8ee..f5d104afced98 100644
--- a/public/app/plugins/panel/gauge/panelcfg.gen.ts
+++ b/public/app/plugins/panel/gauge/panelcfg.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
@@ -15,6 +15,7 @@ export interface Options extends common.SingleStatBaseOptions {
   minVizWidth: number;
   showThresholdLabels: boolean;
   showThresholdMarkers: boolean;
+  sizing: common.BarGaugeSizing;
 }
 
 export const defaultOptions: Partial<Options> = {
@@ -22,4 +23,5 @@ export const defaultOptions: Partial<Options> = {
   minVizWidth: 75,
   showThresholdLabels: false,
   showThresholdMarkers: true,
+  sizing: common.BarGaugeSizing.Auto,
 };
diff --git a/public/app/plugins/panel/geomap/editor/FitMapViewEditor.tsx b/public/app/plugins/panel/geomap/editor/FitMapViewEditor.tsx
index 576dacf042ac7..a88529a45ea3a 100644
--- a/public/app/plugins/panel/geomap/editor/FitMapViewEditor.tsx
+++ b/public/app/plugins/panel/geomap/editor/FitMapViewEditor.tsx
@@ -79,8 +79,8 @@ export const FitMapViewEditor = ({ labelWidth, value, onChange, context }: Props
   const currentDataScope = value.allLayers
     ? DataScopeValues.all
     : !value.allLayers && value.lastOnly
-    ? DataScopeValues.last
-    : DataScopeValues.layer;
+      ? DataScopeValues.last
+      : DataScopeValues.layer;
 
   const onDataScopeChange = (dataScope: DataScopeValues) => {
     if (dataScope !== DataScopeValues.all && !value.layer) {
diff --git a/public/app/plugins/panel/geomap/editor/StyleEditor.tsx b/public/app/plugins/panel/geomap/editor/StyleEditor.tsx
index 7fb29cc507ff2..e11b5d895e603 100644
--- a/public/app/plugins/panel/geomap/editor/StyleEditor.tsx
+++ b/public/app/plugins/panel/geomap/editor/StyleEditor.tsx
@@ -120,6 +120,7 @@ export const StyleEditor = (props: Props) => {
   const propertyOptions = useObservable(settings?.layerInfo ?? of());
   const featuresHavePoints = propertyOptions?.geometryType === GeometryTypeId.Point;
   const hasTextLabel = styleUsesText(value);
+  const maxFiles = 2000;
 
   // Simple fixed value display
   if (settings?.simpleFixedValues) {
@@ -141,6 +142,7 @@ export const StyleEditor = (props: Props) => {
                         placeholderText: hasTextLabel ? 'Select a symbol' : 'Select a symbol or add a text label',
                         placeholderValue: defaultStyleConfig.symbol.fixed,
                         showSourceRadio: false,
+                        maxFiles,
                       },
                     } as StandardEditorsRegistryItem
                   }
@@ -230,6 +232,7 @@ export const StyleEditor = (props: Props) => {
                     placeholderText: hasTextLabel ? 'Select a symbol' : 'Select a symbol or add a text label',
                     placeholderValue: defaultStyleConfig.symbol.fixed,
                     showSourceRadio: false,
+                    maxFiles,
                   },
                 } as StandardEditorsRegistryItem
               }
diff --git a/public/app/plugins/panel/geomap/layers/data/dayNightLayer.tsx b/public/app/plugins/panel/geomap/layers/data/dayNightLayer.tsx
index fe50748812dc1..e9ef19af26f13 100644
--- a/public/app/plugins/panel/geomap/layers/data/dayNightLayer.tsx
+++ b/public/app/plugins/panel/geomap/layers/data/dayNightLayer.tsx
@@ -163,7 +163,7 @@ export const dayNightLayer: MapLayerRegistryItem<DayNightConfig> = {
     if (false) {
       subscriptions.add(
         eventBus.subscribe(DataHoverEvent, (event) => {
-          const time: number = event.payload?.point?.time;
+          const time = event.payload?.point?.time;
           if (time) {
             const lineTime = new Date(time);
             const nightLinePoints = sourceLine.getCoordinates(lineTime.toString(), 'line');
diff --git a/public/app/plugins/panel/geomap/layers/data/geojsonLayer.ts b/public/app/plugins/panel/geomap/layers/data/geojsonLayer.ts
index 2c49a8f943d27..0f8c1d9028d99 100644
--- a/public/app/plugins/panel/geomap/layers/data/geojsonLayer.ts
+++ b/public/app/plugins/panel/geomap/layers/data/geojsonLayer.ts
@@ -8,25 +8,27 @@ import { Style } from 'ol/style';
 import { ReplaySubject } from 'rxjs';
 import { map as rxjsmap, first } from 'rxjs/operators';
 
-import {
-  MapLayerRegistryItem,
-  MapLayerOptions,
-  GrafanaTheme2,
-  EventBus,
-} from '@grafana/data';
+import { MapLayerRegistryItem, MapLayerOptions, GrafanaTheme2, EventBus } from '@grafana/data';
 import { ComparisonOperation } from '@grafana/schema';
 
 import { GeomapStyleRulesEditor } from '../../editor/GeomapStyleRulesEditor';
 import { StyleEditor } from '../../editor/StyleEditor';
 import { polyStyle } from '../../style/markers';
-import { defaultStyleConfig, StyleConfig, StyleConfigState } from '../../style/types';
+import {
+  defaultStyleConfig,
+  GeoJSONLineStyles,
+  GeoJSONPointStyles,
+  GeoJSONPolyStyles,
+  StyleConfig,
+  StyleConfigState,
+  StyleConfigValues,
+} from '../../style/types';
 import { getStyleConfigState } from '../../style/utils';
 import { FeatureRuleConfig, FeatureStyleConfig } from '../../types';
 import { checkFeatureMatchesStyleRule } from '../../utils/checkFeatureMatchesStyleRule';
 import { getLayerPropertyInfo } from '../../utils/getFeatures';
 import { getPublicGeoJSONFiles } from '../../utils/utils';
 
-
 export interface GeoJSONMapperConfig {
   // URL for a geojson file
   src?: string;
@@ -107,10 +109,16 @@ export const geojsonLayer: MapLayerRegistryItem<GeoJSONMapperConfig> = {
       });
     }
 
+    const polyStyleStrings: string[] = Object.values(GeoJSONPolyStyles);
+    const pointStyleStrings: string[] = Object.values(GeoJSONPointStyles);
+    const lineStyleStrings: string[] = Object.values(GeoJSONLineStyles);
     const vectorLayer = new VectorLayer({
       source,
       style: (feature: FeatureLike) => {
-        const isPoint = feature.getGeometry()?.getType() === 'Point';
+        const featureType = feature.getGeometry()?.getType();
+        const isPoint = featureType === 'Point' || featureType === 'MultiPoint';
+        const isPolygon = featureType === 'Polygon' || featureType === 'MultiPolygon';
+        const isLine = featureType === 'LineString' || featureType === 'MultiLineString';
 
         for (const check of styles) {
           if (check.rule && !checkFeatureMatchesStyleRule(check.rule, feature)) {
@@ -131,6 +139,29 @@ export const geojsonLayer: MapLayerRegistryItem<GeoJSONMapperConfig> = {
             return polyStyle(values);
           }
 
+          // Support styling polygons from Feature properties
+          const featureProps = feature.getProperties();
+          if (isPolygon && Object.keys(featureProps).some((property) => polyStyleStrings.includes(property))) {
+            const values: StyleConfigValues = {
+              color: featureProps[GeoJSONPolyStyles.color] ?? check.state.base.color,
+              opacity: featureProps[GeoJSONPolyStyles.opacity] ?? check.state.base.opacity,
+              lineWidth: featureProps[GeoJSONPolyStyles.lineWidth] ?? check.state.base.lineWidth,
+            };
+            return polyStyle(values);
+          } else if (isLine && Object.keys(featureProps).some((property) => lineStyleStrings.includes(property))) {
+            const values: StyleConfigValues = {
+              color: featureProps[GeoJSONLineStyles.color] ?? check.state.base.color,
+              lineWidth: featureProps[GeoJSONLineStyles.lineWidth] ?? check.state.base.lineWidth,
+            };
+            return check.state.maker(values);
+          } else if (isPoint && Object.keys(featureProps).some((property) => pointStyleStrings.includes(property))) {
+            const values: StyleConfigValues = {
+              color: featureProps[GeoJSONPointStyles.color] ?? check.state.base.color,
+              size: featureProps[GeoJSONPointStyles.size] ?? check.state.base.size,
+            };
+            return check.state.maker(values);
+          }
+
           // Lazy create the style object
           if (isPoint) {
             if (!check.point) {
@@ -196,4 +227,3 @@ export const geojsonLayer: MapLayerRegistryItem<GeoJSONMapperConfig> = {
   },
   defaultOptions,
 };
-
diff --git a/public/app/plugins/panel/geomap/layers/data/routeLayer.tsx b/public/app/plugins/panel/geomap/layers/data/routeLayer.tsx
index 286c07c4fbe57..d7f86b10ab0be 100644
--- a/public/app/plugins/panel/geomap/layers/data/routeLayer.tsx
+++ b/public/app/plugins/panel/geomap/layers/data/routeLayer.tsx
@@ -252,7 +252,7 @@ export const routeLayer: MapLayerRegistryItem<RouteConfig> = {
             const mapExtents = map.getView().calculateExtent(map.getSize());
             const feature = source.getFeatures()[0];
             const frame: DataFrame = feature?.get('frame');
-            const time: number = event.payload?.point?.time;
+            const time = event.payload?.point?.time;
             if (frame && time) {
               const timeField = frame.fields.find((f) => f.type === FieldType.time);
               if (timeField) {
diff --git a/public/app/plugins/panel/geomap/panelcfg.gen.ts b/public/app/plugins/panel/geomap/panelcfg.gen.ts
index 6c3f83f18b44b..7e4288bf05015 100644
--- a/public/app/plugins/panel/geomap/panelcfg.gen.ts
+++ b/public/app/plugins/panel/geomap/panelcfg.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/public/app/plugins/panel/geomap/style/types.ts b/public/app/plugins/panel/geomap/style/types.ts
index cf8bc2c96ce87..7d7d35af89ac7 100644
--- a/public/app/plugins/panel/geomap/style/types.ts
+++ b/public/app/plugins/panel/geomap/style/types.ts
@@ -127,6 +127,22 @@ export interface StyleConfigValues {
   textConfig?: TextStyleConfig;
 }
 
+export enum GeoJSONPolyStyles {
+  color = 'fill',
+  opacity = 'fill-opacity',
+  lineWidth = 'stroke-width',
+}
+
+export enum GeoJSONPointStyles {
+  color = 'marker-color',
+  size = 'marker-size',
+}
+
+export enum GeoJSONLineStyles {
+  color = 'stroke',
+  lineWidth = 'stroke-width',
+}
+
 /** When the style depends on a field */
 export interface StyleConfigFields {
   color?: string;
diff --git a/public/app/plugins/panel/geomap/utils/layers.ts b/public/app/plugins/panel/geomap/utils/layers.ts
index 75a2357c38829..834517fa7df5a 100644
--- a/public/app/plugins/panel/geomap/utils/layers.ts
+++ b/public/app/plugins/panel/geomap/utils/layers.ts
@@ -154,6 +154,6 @@ export async function initLayer(
   return state;
 }
 
-export const getMapLayerState = (l: any) => {
-  return l?.__state as MapLayerState;
+export const getMapLayerState = (l: any): MapLayerState => {
+  return l?.__state;
 };
diff --git a/public/app/plugins/panel/geomap/utils/selection.ts b/public/app/plugins/panel/geomap/utils/selection.ts
index b164c7fe9bfe5..a666ef0049e44 100644
--- a/public/app/plugins/panel/geomap/utils/selection.ts
+++ b/public/app/plugins/panel/geomap/utils/selection.ts
@@ -1,6 +1,6 @@
 import { SelectableValue } from '@grafana/data';
 
-export interface SelectionInfo<T = any> {
+export interface SelectionInfo<T> {
   options: Array<SelectableValue<T>>;
   current?: SelectableValue<T>;
 }
diff --git a/public/app/plugins/panel/geomap/utils/tooltip.ts b/public/app/plugins/panel/geomap/utils/tooltip.ts
index aeb3722a00845..9ce1696fb0161 100644
--- a/public/app/plugins/panel/geomap/utils/tooltip.ts
+++ b/public/app/plugins/panel/geomap/utils/tooltip.ts
@@ -62,7 +62,7 @@ export const pointerMoveListener = (evt: MapBrowserEvent<MouseEvent>, panel: Geo
   panel.map.forEachFeatureAtPixel(
     pixel,
     (feature, layer, geo) => {
-      const s: MapLayerState = getMapLayerState(layer);
+      const s = getMapLayerState(layer);
       //match hover layer to layer in layers
       //check if the layer show tooltip is enabled
       //then also pass the list of tooltip fields if exists
diff --git a/public/app/plugins/panel/gettingstarted/GettingStarted.tsx b/public/app/plugins/panel/gettingstarted/GettingStarted.tsx
index 19753cabb638b..88e161793359b 100644
--- a/public/app/plugins/panel/gettingstarted/GettingStarted.tsx
+++ b/public/app/plugins/panel/gettingstarted/GettingStarted.tsx
@@ -3,7 +3,7 @@ import { css, cx } from '@emotion/css';
 import React, { PureComponent } from 'react';
 
 import { PanelProps } from '@grafana/data';
-import { config } from '@grafana/runtime';
+import { config, reportInteraction } from '@grafana/runtime';
 import { Button, Spinner, stylesFactory } from '@grafana/ui';
 import { contextSrv } from 'app/core/core';
 import { backendSrv } from 'app/core/services/backend_srv';
@@ -53,12 +53,14 @@ export class GettingStarted extends PureComponent<PanelProps, State> {
   }
 
   onForwardClick = () => {
+    reportInteraction('grafana_getting_started_button_to_advanced_tutorials');
     this.setState((prevState) => ({
       currentStep: prevState.currentStep + 1,
     }));
   };
 
   onPreviousClick = () => {
+    reportInteraction('grafana_getting_started_button_to_basic_tutorials');
     this.setState((prevState) => ({
       currentStep: prevState.currentStep - 1,
     }));
@@ -69,6 +71,8 @@ export class GettingStarted extends PureComponent<PanelProps, State> {
     const dashboard = getDashboardSrv().getCurrent();
     const panel = dashboard?.getPanelById(id);
 
+    reportInteraction('grafana_getting_started_remove_panel');
+
     dashboard?.removePanel(panel!);
 
     backendSrv.put('/api/user/helpflags/1', undefined, { showSuccessAlert: false }).then((res) => {
@@ -97,7 +101,7 @@ export class GettingStarted extends PureComponent<PanelProps, State> {
               <Button
                 className={cx(styles.backForwardButtons, styles.previous)}
                 onClick={this.onPreviousClick}
-                aria-label="To advanced tutorials"
+                aria-label="To basic tutorials"
                 icon="angle-left"
                 variant="secondary"
               />
@@ -109,7 +113,7 @@ export class GettingStarted extends PureComponent<PanelProps, State> {
               <Button
                 className={cx(styles.backForwardButtons, styles.forward)}
                 onClick={this.onForwardClick}
-                aria-label="To basic tutorials"
+                aria-label="To advanced tutorials"
                 icon="angle-right"
                 variant="secondary"
               />
@@ -124,86 +128,83 @@ export class GettingStarted extends PureComponent<PanelProps, State> {
 const getStyles = stylesFactory(() => {
   const theme = config.theme2;
   return {
-    container: css`
-      display: flex;
-      flex-direction: column;
-      height: 100%;
-      // background: url(public/img/getting_started_bg_${theme.colors.mode}.svg) no-repeat;
-      background-size: cover;
-      padding: ${theme.spacing(4)} ${theme.spacing(2)} 0;
-    `,
-    content: css`
-      label: content;
-      display: flex;
-      justify-content: center;
-
-      ${theme.breakpoints.down('xxl')} {
-        margin-left: ${theme.spacing(3)};
-        justify-content: flex-start;
-      }
-    `,
-    header: css`
-      label: header;
-      margin-bottom: ${theme.spacing(3)};
-      display: flex;
-      flex-direction: column;
-
-      ${theme.breakpoints.down('lg')} {
-        flex-direction: row;
-      }
-    `,
-    headerLogo: css`
-      height: 58px;
-      padding-right: ${theme.spacing(2)};
-      display: none;
-
-      ${theme.breakpoints.up('md')} {
-        display: block;
-      }
-    `,
-    heading: css`
-      label: heading;
-      margin-right: ${theme.spacing(3)};
-      margin-bottom: ${theme.spacing(3)};
-      flex-grow: 1;
-      display: flex;
-
-      ${theme.breakpoints.up('md')} {
-        margin-bottom: 0;
-      }
-    `,
-    backForwardButtons: css`
-      position: absolute;
-      top: 50%;
-      transform: translateY(-50%);
-    `,
-    previous: css`
-      left: 10px;
-
-      ${theme.breakpoints.down('md')} {
-        left: 0;
-      }
-    `,
-    forward: css`
-      right: 10px;
-
-      ${theme.breakpoints.down('md')} {
-        right: 0;
-      }
-    `,
-    dismiss: css`
-      align-self: flex-end;
-      text-decoration: underline;
-      margin-bottom: ${theme.spacing(1)};
-    `,
-    loading: css`
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      height: 100%;
-    `,
-    loadingText: css`
-      margin-right: ${theme.spacing(1)};
-    `,
+    container: css({
+      display: 'flex',
+      flexDirection: 'column',
+      height: '100%',
+      backgroundSize: 'cover',
+      padding: `${theme.spacing(4)} ${theme.spacing(2)} 0`,
+    }),
+    content: css({
+      label: 'content',
+      display: 'flex',
+      justifyContent: 'center',
+
+      [theme.breakpoints.down('xxl')]: {
+        marginLeft: theme.spacing(3),
+        justifyContent: 'flex-start',
+      },
+    }),
+    header: css({
+      label: 'header',
+      marginBottom: theme.spacing(3),
+      display: 'flex',
+      flexDirection: 'column',
+
+      [theme.breakpoints.down('lg')]: {
+        flexDirection: 'row',
+      },
+    }),
+    headerLogo: css({
+      height: '58px',
+      paddingRight: theme.spacing(2),
+      display: 'none',
+
+      [theme.breakpoints.up('md')]: {
+        display: 'block',
+      },
+    }),
+    heading: css({
+      label: 'heading',
+      marginRight: theme.spacing(3),
+      marginBottom: theme.spacing(3),
+      flexGrow: 1,
+      display: 'flex',
+
+      [theme.breakpoints.up('md')]: {
+        marginBottom: 0,
+      },
+    }),
+    backForwardButtons: css({
+      position: 'absolute',
+      top: '50%',
+      transform: 'translateY(-50%)',
+    }),
+    previous: css({
+      left: '10px',
+      [theme.breakpoints.down('md')]: {
+        left: 0,
+      },
+    }),
+    forward: css({
+      right: '10px',
+      [theme.breakpoints.down('md')]: {
+        right: 0,
+      },
+    }),
+    dismiss: css({
+      alignSelf: 'flex-end',
+      textDecoration: 'underline',
+      marginBottom: theme.spacing(1),
+    }),
+    loading: css({
+      display: 'flex',
+      justifyContent: 'center',
+      alignItems: 'center',
+      height: '100%',
+    }),
+    loadingText: css({
+      marginRight: theme.spacing(1),
+    }),
   };
 });
diff --git a/public/app/plugins/panel/gettingstarted/components/DocsCard.tsx b/public/app/plugins/panel/gettingstarted/components/DocsCard.tsx
index 8a5fe372228dd..39871c408e71f 100644
--- a/public/app/plugins/panel/gettingstarted/components/DocsCard.tsx
+++ b/public/app/plugins/panel/gettingstarted/components/DocsCard.tsx
@@ -2,11 +2,12 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
+import { reportInteraction } from '@grafana/runtime';
 import { Icon, useStyles2 } from '@grafana/ui';
 
 import { Card } from '../types';
 
-import { cardContent, cardStyle, iconStyle } from './sharedStyles';
+import { cardContent, cardStyle } from './sharedStyles';
 
 interface Props {
   card: Card;
@@ -14,17 +15,17 @@ interface Props {
 
 export const DocsCard = ({ card }: Props) => {
   const styles = useStyles2(getStyles, card.done);
-  const iconStyles = useStyles2(iconStyle, card.done);
 
   return (
     <div className={styles.card}>
       <div className={cardContent}>
-        <a href={`${card.href}?utm_source=grafana_gettingstarted`} className={styles.url}>
+        <a
+          href={`${card.href}?utm_source=grafana_gettingstarted`}
+          className={styles.url}
+          onClick={() => reportInteraction('grafana_getting_started_docs', { title: card.title, link: card.href })}
+        >
           <div className={styles.heading}>{card.done ? 'complete' : card.heading}</div>
           <h4 className={styles.title}>{card.title}</h4>
-          <div>
-            <Icon className={iconStyles} name={card.icon} size="xxl" />
-          </div>
         </a>
       </div>
       <a
@@ -32,6 +33,7 @@ export const DocsCard = ({ card }: Props) => {
         className={styles.learnUrl}
         target="_blank"
         rel="noreferrer"
+        onClick={() => reportInteraction('grafana_getting_started_docs', { title: card.title, link: card.learnHref })}
       >
         Learn how in the docs <Icon name="external-link-alt" />
       </a>
diff --git a/public/app/plugins/panel/gettingstarted/components/Step.tsx b/public/app/plugins/panel/gettingstarted/components/Step.tsx
index 43d4064264330..e76a73e36fa4d 100644
--- a/public/app/plugins/panel/gettingstarted/components/Step.tsx
+++ b/public/app/plugins/panel/gettingstarted/components/Step.tsx
@@ -37,34 +37,30 @@ export const Step = ({ step }: Props) => {
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
-    setup: css`
-      display: flex;
-      width: 95%;
-    `,
-    info: css`
-      width: 172px;
-      margin-right: 5%;
+    setup: css({
+      display: 'flex',
+      width: '95%',
+    }),
+    info: css({
+      width: '172px',
+      marginRight: '5%',
 
-      ${theme.breakpoints.down('xxl')} {
-        margin-right: ${theme.spacing(4)};
-      }
-      ${theme.breakpoints.down('sm')} {
-        display: none;
-      }
-    `,
-    title: css`
-      color: ${theme.v1.palette.blue95};
-    `,
-    cards: css`
-      overflow-x: scroll;
-      overflow-y: hidden;
-      width: 100%;
-      display: flex;
-      justify-content: center;
-
-      ${theme.breakpoints.down('xxl')} {
-        justify-content: flex-start;
-      }
-    `,
+      [theme.breakpoints.down('xxl')]: {
+        marginRight: theme.spacing(4),
+      },
+      [theme.breakpoints.down('sm')]: {
+        display: 'none',
+      },
+    }),
+    title: css({
+      color: theme.v1.palette.blue95,
+    }),
+    cards: css({
+      overflowX: 'auto',
+      overflowY: 'hidden',
+      width: '100%',
+      display: 'flex',
+      justifyContent: 'flex-start',
+    }),
   };
 };
diff --git a/public/app/plugins/panel/gettingstarted/components/TutorialCard.tsx b/public/app/plugins/panel/gettingstarted/components/TutorialCard.tsx
index 27ea6e7b53475..029f8844a64a0 100644
--- a/public/app/plugins/panel/gettingstarted/components/TutorialCard.tsx
+++ b/public/app/plugins/panel/gettingstarted/components/TutorialCard.tsx
@@ -2,12 +2,13 @@ import { css } from '@emotion/css';
 import React, { MouseEvent } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Icon, useStyles2 } from '@grafana/ui';
+import { reportInteraction } from '@grafana/runtime';
+import { useStyles2 } from '@grafana/ui';
 import store from 'app/core/store';
 
 import { TutorialCardType } from '../types';
 
-import { cardContent, cardStyle, iconStyle } from './sharedStyles';
+import { cardContent, cardStyle } from './sharedStyles';
 
 interface Props {
   card: TutorialCardType;
@@ -15,7 +16,6 @@ interface Props {
 
 export const TutorialCard = ({ card }: Props) => {
   const styles = useStyles2(getStyles, card.done);
-  const iconStyles = useStyles2(iconStyle, card.done);
 
   return (
     <a
@@ -30,7 +30,6 @@ export const TutorialCard = ({ card }: Props) => {
         <div className={styles.heading}>{card.done ? 'complete' : card.heading}</div>
         <h4 className={styles.cardTitle}>{card.title}</h4>
         <div className={styles.info}>{card.info}</div>
-        <Icon className={iconStyles} name={card.icon} size="xxl" />
       </div>
     </a>
   );
@@ -42,6 +41,7 @@ const handleTutorialClick = (event: MouseEvent<HTMLAnchorElement>, card: Tutoria
   if (!isSet) {
     store.set(card.key, true);
   }
+  reportInteraction('grafana_getting_started_tutorial', { title: card.title });
 };
 
 const getStyles = (theme: GrafanaTheme2, complete: boolean) => {
diff --git a/public/app/plugins/panel/gettingstarted/components/sharedStyles.ts b/public/app/plugins/panel/gettingstarted/components/sharedStyles.ts
index d2bd43184e735..c82ee8dc78d09 100644
--- a/public/app/plugins/panel/gettingstarted/components/sharedStyles.ts
+++ b/public/app/plugins/panel/gettingstarted/components/sharedStyles.ts
@@ -34,14 +34,6 @@ export const cardStyle = (theme: GrafanaTheme2, complete: boolean) => {
 `;
 };
 
-export const iconStyle = (theme: GrafanaTheme2, complete: boolean) => css`
-  color: ${complete ? theme.v1.palette.blue95 : theme.colors.text.secondary};
-
-  ${theme.breakpoints.down('sm')} {
-    display: none;
-  }
-`;
-
 export const cardContent = css`
   padding: 16px;
 `;
diff --git a/public/app/plugins/panel/graph/data_processor.ts b/public/app/plugins/panel/graph/data_processor.ts
index 8f67e3abb5cb0..21afccf65d3fd 100644
--- a/public/app/plugins/panel/graph/data_processor.ts
+++ b/public/app/plugins/panel/graph/data_processor.ts
@@ -1,8 +1,8 @@
 import { find } from 'lodash';
 
 import { DataFrame, dateTime, Field, FieldType, getFieldDisplayName, getTimeField, TimeRange } from '@grafana/data';
+import { applyNullInsertThreshold } from '@grafana/data/src/transformations/transformers/nulls/nullInsertThreshold';
 import { colors } from '@grafana/ui';
-import { applyNullInsertThreshold } from '@grafana/ui/src/components/GraphNG/nullInsertThreshold';
 import config from 'app/core/config';
 import TimeSeries from 'app/core/time_series2';
 
diff --git a/public/app/plugins/panel/graph/graph.ts b/public/app/plugins/panel/graph/graph.ts
index eccc354ac755d..ec4d93dfe5cf3 100644
--- a/public/app/plugins/panel/graph/graph.ts
+++ b/public/app/plugins/panel/graph/graph.ts
@@ -36,7 +36,7 @@ import {
   PanelEvents,
   toUtc,
 } from '@grafana/data';
-import { graphTickFormatter, graphTimeFormat, MenuItemProps, MenuItemsGroup } from '@grafana/ui';
+import { MenuItemProps, MenuItemsGroup } from '@grafana/ui';
 import { coreModule } from 'app/angular/core_module';
 import config from 'app/core/config';
 import { updateLegendValues } from 'app/core/core';
@@ -44,10 +44,9 @@ import { ContextSrv } from 'app/core/services/context_srv';
 import { provideTheme } from 'app/core/utils/ConfigProvider';
 import { tickStep } from 'app/core/utils/ticks';
 import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
+import { DashboardModel } from 'app/features/dashboard/state';
 import { getFieldLinksSupplier } from 'app/features/panel/panellinks/linkSuppliers';
 
-import { DashboardModel } from '../../../features/dashboard/state';
-
 import { GraphContextMenuCtrl } from './GraphContextMenuCtrl';
 import { GraphLegendProps, Legend } from './Legend/Legend';
 import { alignYLevel } from './align_yaxes';
@@ -57,7 +56,7 @@ import { convertToHistogramData } from './histogram';
 import { GraphCtrl } from './module';
 import { ThresholdManager } from './threshold_manager';
 import { TimeRegionManager } from './time_region_manager';
-import { isLegacyGraphHoverEvent } from './utils';
+import { isLegacyGraphHoverEvent, graphTickFormatter, graphTimeFormat } from './utils';
 
 const LegendWithThemeProvider = provideTheme(Legend, config.theme2);
 
diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts
index 0ba8b430085d4..14930db4f182a 100644
--- a/public/app/plugins/panel/graph/module.ts
+++ b/public/app/plugins/panel/graph/module.ts
@@ -14,6 +14,7 @@ import { MetricsPanelCtrl } from 'app/angular/panel/metrics_panel_ctrl';
 import config from 'app/core/config';
 import TimeSeries from 'app/core/time_series2';
 import { ThresholdMapper } from 'app/features/alerting/state/ThresholdMapper';
+import { getPanelPluginToMigrateTo } from 'app/features/dashboard/state/getPanelPluginToMigrateTo';
 import { changePanelPlugin } from 'app/features/panel/state/actions';
 import { dispatch } from 'app/store/store';
 
@@ -356,7 +357,8 @@ export class GraphCtrl extends MetricsPanelCtrl {
   };
 
   migrateToReact() {
-    this.onPluginTypeChange(config.panels['timeseries']);
+    const panelType = getPanelPluginToMigrateTo(this.panel, true);
+    this.onPluginTypeChange(config.panels[panelType!]);
   }
 }
 
diff --git a/public/app/plugins/panel/graph/utils.test.ts b/public/app/plugins/panel/graph/utils.test.ts
index 071ecc5d132e9..d96dad86ce15f 100644
--- a/public/app/plugins/panel/graph/utils.test.ts
+++ b/public/app/plugins/panel/graph/utils.test.ts
@@ -1,6 +1,6 @@
 import { toDataFrame, FieldType } from '@grafana/data';
 
-import { getDataTimeRange } from './utils';
+import { getDataTimeRange, graphTimeFormat } from './utils';
 
 describe('DataFrame utility functions', () => {
   const frame = toDataFrame({
@@ -15,4 +15,14 @@ describe('DataFrame utility functions', () => {
     expect(range!.from).toEqual(2);
     expect(range!.to).toEqual(9);
   });
+
+  describe('graphTimeFormat', () => {
+    it('graphTimeFormat', () => {
+      expect(graphTimeFormat(5, 1, 45 * 5 * 1000)).toBe('HH:mm:ss');
+      expect(graphTimeFormat(5, 1, 7200 * 5 * 1000)).toBe('HH:mm');
+      expect(graphTimeFormat(5, 1, 80000 * 5 * 1000)).toBe('MM/DD HH:mm');
+      expect(graphTimeFormat(5, 1, 2419200 * 5 * 1000)).toBe('MM/DD');
+      expect(graphTimeFormat(5, 1, 12419200 * 5 * 1000)).toBe('YYYY-MM');
+    });
+  });
 });
diff --git a/public/app/plugins/panel/graph/utils.ts b/public/app/plugins/panel/graph/utils.ts
index d637391a216ed..aa2a7e15f78c0 100644
--- a/public/app/plugins/panel/graph/utils.ts
+++ b/public/app/plugins/panel/graph/utils.ts
@@ -5,6 +5,8 @@ import {
   LegacyGraphHoverEventPayload,
   reduceField,
   ReducerID,
+  dateTimeFormat,
+  systemDateFormats,
 } from '@grafana/data';
 
 /**
@@ -34,3 +36,45 @@ export function getDataTimeRange(frames: DataFrame[]): AbsoluteTimeRange | undef
 export function isLegacyGraphHoverEvent(event: unknown): event is LegacyGraphHoverEventPayload {
   return Boolean(event && typeof event === 'object' && event.hasOwnProperty('pos'));
 }
+
+/** @deprecated */
+export const graphTickFormatter = (epoch: number, axis: any) => {
+  return dateTimeFormat(epoch, {
+    format: axis?.options?.timeformat,
+    timeZone: axis?.options?.timezone,
+  });
+};
+
+/** @deprecated */
+export const graphTimeFormat = (ticks: number | null, min: number | null, max: number | null): string => {
+  if (min && max && ticks) {
+    const range = max - min;
+    const secPerTick = range / ticks / 1000;
+    // Need have 10 millisecond margin on the day range
+    // As sometimes last 24 hour dashboard evaluates to more than 86400000
+    const oneDay = 86400010;
+    const oneYear = 31536000000;
+
+    if (secPerTick <= 10) {
+      return systemDateFormats.interval.millisecond;
+    }
+    if (secPerTick <= 45) {
+      return systemDateFormats.interval.second;
+    }
+    if (range <= oneDay) {
+      return systemDateFormats.interval.minute;
+    }
+    if (secPerTick <= 80000) {
+      return systemDateFormats.interval.hour;
+    }
+    if (range <= oneYear) {
+      return systemDateFormats.interval.day;
+    }
+    if (secPerTick <= 31536000) {
+      return systemDateFormats.interval.month;
+    }
+    return systemDateFormats.interval.year;
+  }
+
+  return systemDateFormats.interval.minute;
+};
diff --git a/public/app/plugins/panel/heatmap/ExemplarModalHeader.tsx b/public/app/plugins/panel/heatmap/ExemplarModalHeader.tsx
index 12bcaaa8656bc..e2110122ab314 100644
--- a/public/app/plugins/panel/heatmap/ExemplarModalHeader.tsx
+++ b/public/app/plugins/panel/heatmap/ExemplarModalHeader.tsx
@@ -1,8 +1,15 @@
-import React from 'react';
+import React, { CSSProperties } from 'react';
 
-import { CloseButton } from '../../../core/components/CloseButton/CloseButton';
+import { CloseButton } from 'app/core/components/CloseButton/CloseButton';
+
+export function ExemplarModalHeader(props: { onClick: () => void; style?: React.CSSProperties }) {
+  const defaultStyle: CSSProperties = {
+    position: 'relative',
+    top: 'auto',
+    right: 'auto',
+    marginRight: 0,
+  };
 
-export function ExemplarModalHeader(props: { onClick: () => void }) {
   return (
     <div
       style={{
@@ -12,15 +19,7 @@ export function ExemplarModalHeader(props: { onClick: () => void }) {
         paddingBottom: '6px',
       }}
     >
-      <CloseButton
-        onClick={props.onClick}
-        style={{
-          position: 'relative',
-          top: 'auto',
-          right: 'auto',
-          marginRight: 0,
-        }}
-      />
+      <CloseButton onClick={props.onClick} style={props.style ?? defaultStyle} />
     </div>
   );
 }
diff --git a/public/app/plugins/panel/heatmap/HeatmapHoverView.tsx b/public/app/plugins/panel/heatmap/HeatmapHoverView.tsx
deleted file mode 100644
index 5a05b0ba09e2c..0000000000000
--- a/public/app/plugins/panel/heatmap/HeatmapHoverView.tsx
+++ /dev/null
@@ -1,289 +0,0 @@
-import React, { useEffect, useRef, useState } from 'react';
-
-import {
-  DataFrameType,
-  Field,
-  FieldType,
-  formattedValueToString,
-  getFieldDisplayName,
-  LinkModel,
-  TimeRange,
-  getLinksSupplier,
-  InterpolateFunction,
-  ScopedVars,
-} from '@grafana/data';
-import { HeatmapCellLayout } from '@grafana/schema';
-import { LinkButton, VerticalGroup } from '@grafana/ui';
-import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
-import { isHeatmapCellsDense, readHeatmapRowsCustomMeta } from 'app/features/transformers/calculateHeatmap/heatmap';
-import { DataHoverView } from 'app/features/visualization/data-hover/DataHoverView';
-
-import { HeatmapData } from './fields';
-import { HeatmapHoverEvent } from './utils';
-
-type Props = {
-  data: HeatmapData;
-  hover: HeatmapHoverEvent;
-  showHistogram?: boolean;
-  timeRange: TimeRange;
-  replaceVars: InterpolateFunction;
-  scopedVars: ScopedVars[];
-};
-
-export const HeatmapHoverView = (props: Props) => {
-  if (props.hover.seriesIdx === 2) {
-    return <DataHoverView data={props.data.exemplars} rowIndex={props.hover.dataIdx} header={'Exemplar'} />;
-  }
-  return <HeatmapHoverCell {...props} />;
-};
-
-const HeatmapHoverCell = ({ data, hover, showHistogram, scopedVars, replaceVars }: Props) => {
-  const index = hover.dataIdx;
-  const xField = data.heatmap?.fields[0];
-  const yField = data.heatmap?.fields[1];
-  const countField = data.heatmap?.fields[2];
-
-  const xDisp = (v: number) => {
-    if (xField?.display) {
-      return formattedValueToString(xField.display(v));
-    }
-    if (xField?.type === FieldType.time) {
-      const tooltipTimeFormat = 'YYYY-MM-DD HH:mm:ss';
-      const dashboard = getDashboardSrv().getCurrent();
-      return dashboard?.formatDate(v, tooltipTimeFormat);
-    }
-    return `${v}`;
-  };
-
-  const xVals = xField?.values;
-  const yVals = yField?.values;
-  const countVals = countField?.values;
-
-  // labeled buckets
-  const meta = readHeatmapRowsCustomMeta(data.heatmap);
-  const yDisp = yField?.display ? (v: string) => formattedValueToString(yField.display!(v)) : (v: string) => `${v}`;
-
-  const yValueIdx = index % data.yBucketCount! ?? 0;
-
-  let yBucketMin: string;
-  let yBucketMax: string;
-
-  let nonNumericOrdinalDisplay: string | undefined = undefined;
-
-  if (meta.yOrdinalDisplay) {
-    const yMinIdx = data.yLayout === HeatmapCellLayout.le ? yValueIdx - 1 : yValueIdx;
-    const yMaxIdx = data.yLayout === HeatmapCellLayout.le ? yValueIdx : yValueIdx + 1;
-    yBucketMin = yMinIdx < 0 ? meta.yMinDisplay! : `${meta.yOrdinalDisplay[yMinIdx]}`;
-    yBucketMax = `${meta.yOrdinalDisplay[yMaxIdx]}`;
-
-    // e.g. "pod-xyz123"
-    if (!meta.yOrdinalLabel || Number.isNaN(+meta.yOrdinalLabel[0])) {
-      nonNumericOrdinalDisplay = data.yLayout === HeatmapCellLayout.le ? yBucketMax : yBucketMin;
-    }
-  } else {
-    const value = yVals?.[yValueIdx];
-
-    if (data.yLayout === HeatmapCellLayout.le) {
-      yBucketMax = `${value}`;
-
-      if (data.yLog) {
-        let logFn = data.yLog === 2 ? Math.log2 : Math.log10;
-        let exp = logFn(value) - 1 / data.yLogSplit!;
-        yBucketMin = `${data.yLog ** exp}`;
-      } else {
-        yBucketMin = `${value - data.yBucketSize!}`;
-      }
-    } else {
-      yBucketMin = `${value}`;
-
-      if (data.yLog) {
-        let logFn = data.yLog === 2 ? Math.log2 : Math.log10;
-        let exp = logFn(value) + 1 / data.yLogSplit!;
-        yBucketMax = `${data.yLog ** exp}`;
-      } else {
-        yBucketMax = `${value + data.yBucketSize!}`;
-      }
-    }
-  }
-
-  let xBucketMin: number;
-  let xBucketMax: number;
-
-  if (data.xLayout === HeatmapCellLayout.le) {
-    xBucketMax = xVals?.[index];
-    xBucketMin = xBucketMax - data.xBucketSize!;
-  } else {
-    xBucketMin = xVals?.[index];
-    xBucketMax = xBucketMin + data.xBucketSize!;
-  }
-
-  const count = countVals?.[index];
-
-  const visibleFields = data.heatmap?.fields.filter((f) => !Boolean(f.config.custom?.hideFrom?.tooltip));
-  const links: Array<LinkModel<Field>> = [];
-  const linkLookup = new Set<string>();
-
-  for (const field of visibleFields ?? []) {
-    const hasLinks = field.config.links && field.config.links.length > 0;
-
-    if (hasLinks && data.heatmap) {
-      const appropriateScopedVars = scopedVars.find(
-        (scopedVar) =>
-          scopedVar && scopedVar.__dataContext && scopedVar.__dataContext.value.field.name === nonNumericOrdinalDisplay
-      );
-
-      field.getLinks = getLinksSupplier(data.heatmap, field, appropriateScopedVars || {}, replaceVars);
-    }
-
-    if (field.getLinks) {
-      const value = field.values[index];
-      const display = field.display ? field.display(value) : { text: `${value}`, numeric: +value };
-
-      field.getLinks({ calculatedValue: display, valueRowIndex: index }).forEach((link) => {
-        const key = `${link.title}/${link.href}`;
-        if (!linkLookup.has(key)) {
-          links.push(link);
-          linkLookup.add(key);
-        }
-      });
-    }
-  }
-
-  let can = useRef<HTMLCanvasElement>(null);
-
-  let histCssWidth = 150;
-  let histCssHeight = 50;
-  let histCanWidth = Math.round(histCssWidth * devicePixelRatio);
-  let histCanHeight = Math.round(histCssHeight * devicePixelRatio);
-
-  useEffect(
-    () => {
-      if (showHistogram) {
-        let histCtx = can.current?.getContext('2d');
-
-        if (histCtx && xVals && yVals && countVals) {
-          let fromIdx = index;
-
-          while (xVals[fromIdx--] === xVals[index]) {}
-
-          fromIdx++;
-
-          let toIdx = fromIdx + data.yBucketCount!;
-
-          let maxCount = 0;
-
-          let i = fromIdx;
-          while (i < toIdx) {
-            let c = countVals[i];
-            maxCount = Math.max(maxCount, c);
-            i++;
-          }
-
-          let pHov = new Path2D();
-          let pRest = new Path2D();
-
-          i = fromIdx;
-          let j = 0;
-          while (i < toIdx) {
-            let c = countVals[i];
-
-            if (c > 0) {
-              let pctY = c / maxCount;
-              let pctX = j / (data.yBucketCount! + 1);
-
-              let p = i === index ? pHov : pRest;
-
-              p.rect(
-                Math.round(histCanWidth * pctX),
-                Math.round(histCanHeight * (1 - pctY)),
-                Math.round(histCanWidth / data.yBucketCount!),
-                Math.round(histCanHeight * pctY)
-              );
-            }
-
-            i++;
-            j++;
-          }
-
-          histCtx.clearRect(0, 0, histCanWidth, histCanHeight);
-
-          histCtx.fillStyle = '#ffffff80';
-          histCtx.fill(pRest);
-
-          histCtx.fillStyle = '#ff000080';
-          histCtx.fill(pHov);
-        }
-      }
-    },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [index]
-  );
-
-  const [isSparse] = useState(
-    () => data.heatmap?.meta?.type === DataFrameType.HeatmapCells && !isHeatmapCellsDense(data.heatmap)
-  );
-
-  if (isSparse) {
-    return (
-      <div>
-        <DataHoverView data={data.heatmap} rowIndex={index} />
-      </div>
-    );
-  }
-
-  const renderYBucket = () => {
-    if (nonNumericOrdinalDisplay) {
-      return <div>Name: {nonNumericOrdinalDisplay}</div>;
-    }
-
-    switch (data.yLayout) {
-      case HeatmapCellLayout.unknown:
-        return <div>{yDisp(yBucketMin)}</div>;
-    }
-    return (
-      <div>
-        Bucket: {yDisp(yBucketMin)} - {yDisp(yBucketMax)}
-      </div>
-    );
-  };
-
-  return (
-    <>
-      <div>
-        <div>{xDisp(xBucketMin)}</div>
-        {data.xLayout !== HeatmapCellLayout.unknown && <div>{xDisp(xBucketMax)}</div>}
-      </div>
-      {showHistogram && (
-        <canvas
-          width={histCanWidth}
-          height={histCanHeight}
-          ref={can}
-          style={{ width: histCanWidth + 'px', height: histCanHeight + 'px' }}
-        />
-      )}
-      <div>
-        {renderYBucket()}
-        <div>
-          {getFieldDisplayName(countField!, data.heatmap)}: {data.display!(count)}
-        </div>
-      </div>
-      {links.length > 0 && (
-        <VerticalGroup>
-          {links.map((link, i) => (
-            <LinkButton
-              key={i}
-              icon={'external-link-alt'}
-              target={link.target}
-              href={link.href}
-              onClick={link.onClick}
-              fill="text"
-              style={{ width: '100%' }}
-            >
-              {link.title}
-            </LinkButton>
-          ))}
-        </VerticalGroup>
-      )}
-    </>
-  );
-};
diff --git a/public/app/plugins/panel/heatmap/HeatmapHoverViewOld.tsx b/public/app/plugins/panel/heatmap/HeatmapHoverViewOld.tsx
new file mode 100644
index 0000000000000..f7c73022063ae
--- /dev/null
+++ b/public/app/plugins/panel/heatmap/HeatmapHoverViewOld.tsx
@@ -0,0 +1,222 @@
+import React, { useEffect, useRef, useState } from 'react';
+import uPlot from 'uplot';
+
+import {
+  DataFrameType,
+  Field,
+  FieldType,
+  formattedValueToString,
+  getFieldDisplayName,
+  LinkModel,
+  TimeRange,
+  InterpolateFunction,
+} from '@grafana/data';
+import { HeatmapCellLayout } from '@grafana/schema';
+import { LinkButton, VerticalGroup } from '@grafana/ui';
+import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
+import { isHeatmapCellsDense, readHeatmapRowsCustomMeta } from 'app/features/transformers/calculateHeatmap/heatmap';
+import { DataHoverView } from 'app/features/visualization/data-hover/DataHoverView';
+
+import { getDataLinks } from '../status-history/utils';
+
+import { HeatmapData } from './fields';
+import { renderHistogram } from './renderHistogram';
+import { HeatmapHoverEvent } from './utils';
+
+type Props = {
+  data: HeatmapData;
+  hover: HeatmapHoverEvent;
+  showHistogram?: boolean;
+  timeRange: TimeRange;
+  replaceVars: InterpolateFunction;
+};
+
+export const HeatmapHoverView = (props: Props) => {
+  if (props.hover.seriesIdx === 2) {
+    return <DataHoverView data={props.data.exemplars} rowIndex={props.hover.dataIdx} header={'Exemplar'} />;
+  }
+  return <HeatmapHoverCell {...props} />;
+};
+
+const HeatmapHoverCell = ({ data, hover, showHistogram = false }: Props) => {
+  const index = hover.dataIdx;
+
+  const [isSparse] = useState(
+    () => data.heatmap?.meta?.type === DataFrameType.HeatmapCells && !isHeatmapCellsDense(data.heatmap)
+  );
+
+  const xField = data.heatmap?.fields[0];
+  const yField = data.heatmap?.fields[1];
+  const countField = data.heatmap?.fields[2];
+
+  const xDisp = (v: number) => {
+    if (xField?.display) {
+      return formattedValueToString(xField.display(v));
+    }
+    if (xField?.type === FieldType.time) {
+      const tooltipTimeFormat = 'YYYY-MM-DD HH:mm:ss';
+      const dashboard = getDashboardSrv().getCurrent();
+      return dashboard?.formatDate(v, tooltipTimeFormat);
+    }
+    return `${v}`;
+  };
+
+  const xVals = xField?.values;
+  const yVals = yField?.values;
+  const countVals = countField?.values;
+
+  // labeled buckets
+  const meta = readHeatmapRowsCustomMeta(data.heatmap);
+  const yDisp = yField?.display ? (v: string) => formattedValueToString(yField.display!(v)) : (v: string) => `${v}`;
+
+  const yValueIdx = index % (data.yBucketCount ?? 1);
+  const xValueIdx = Math.floor(index / (data.yBucketCount ?? 1));
+
+  let yBucketMin: string;
+  let yBucketMax: string;
+
+  let nonNumericOrdinalDisplay: string | undefined = undefined;
+
+  if (meta.yOrdinalDisplay) {
+    const yMinIdx = data.yLayout === HeatmapCellLayout.le ? yValueIdx - 1 : yValueIdx;
+    const yMaxIdx = data.yLayout === HeatmapCellLayout.le ? yValueIdx : yValueIdx + 1;
+    yBucketMin = yMinIdx < 0 ? meta.yMinDisplay! : `${meta.yOrdinalDisplay[yMinIdx]}`;
+    yBucketMax = `${meta.yOrdinalDisplay[yMaxIdx]}`;
+
+    // e.g. "pod-xyz123"
+    if (!meta.yOrdinalLabel || Number.isNaN(+meta.yOrdinalLabel[0])) {
+      nonNumericOrdinalDisplay = data.yLayout === HeatmapCellLayout.le ? yBucketMax : yBucketMin;
+    }
+  } else {
+    const value = yVals?.[yValueIdx];
+
+    if (data.yLayout === HeatmapCellLayout.le) {
+      yBucketMax = `${value}`;
+
+      if (data.yLog) {
+        let logFn = data.yLog === 2 ? Math.log2 : Math.log10;
+        let exp = logFn(value) - 1 / data.yLogSplit!;
+        yBucketMin = `${data.yLog ** exp}`;
+      } else {
+        yBucketMin = `${value - data.yBucketSize!}`;
+      }
+    } else {
+      yBucketMin = `${value}`;
+
+      if (data.yLog) {
+        let logFn = data.yLog === 2 ? Math.log2 : Math.log10;
+        let exp = logFn(value) + 1 / data.yLogSplit!;
+        yBucketMax = `${data.yLog ** exp}`;
+      } else {
+        yBucketMax = `${value + data.yBucketSize!}`;
+      }
+    }
+  }
+
+  let xBucketMin: number;
+  let xBucketMax: number;
+
+  if (data.xLayout === HeatmapCellLayout.le) {
+    xBucketMax = xVals?.[index];
+    xBucketMin = xBucketMax - data.xBucketSize!;
+  } else {
+    xBucketMin = xVals?.[index];
+    xBucketMax = xBucketMin + data.xBucketSize!;
+  }
+
+  const count = countVals?.[index];
+
+  let links: Array<LinkModel<Field>> = [];
+
+  const linksField = data.series?.fields[yValueIdx + 1];
+
+  if (linksField != null) {
+    const visible = !Boolean(linksField.config.custom?.hideFrom?.tooltip);
+    const hasLinks = (linksField.config.links?.length ?? 0) > 0;
+
+    if (visible && hasLinks) {
+      links = getDataLinks(linksField, xValueIdx);
+    }
+  }
+
+  let can = useRef<HTMLCanvasElement>(null);
+
+  let histCssWidth = 264;
+  let histCssHeight = 64;
+  let histCanWidth = Math.round(histCssWidth * uPlot.pxRatio);
+  let histCanHeight = Math.round(histCssHeight * uPlot.pxRatio);
+
+  useEffect(
+    () => {
+      if (showHistogram && xVals != null && countVals != null) {
+        renderHistogram(can, histCanWidth, histCanHeight, xVals, countVals, index, data.yBucketCount!);
+      }
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [index]
+  );
+
+  if (isSparse) {
+    return (
+      <div>
+        <DataHoverView data={data.heatmap} rowIndex={index} />
+      </div>
+    );
+  }
+
+  const renderYBucket = () => {
+    if (nonNumericOrdinalDisplay) {
+      return <div>Name: {nonNumericOrdinalDisplay}</div>;
+    }
+
+    switch (data.yLayout) {
+      case HeatmapCellLayout.unknown:
+        return <div>{yDisp(yBucketMin)}</div>;
+    }
+    return (
+      <div>
+        Bucket: {yDisp(yBucketMin)} - {yDisp(yBucketMax)}
+      </div>
+    );
+  };
+
+  return (
+    <>
+      <div>
+        <div>{xDisp(xBucketMin)}</div>
+        {data.xLayout !== HeatmapCellLayout.unknown && <div>{xDisp(xBucketMax)}</div>}
+      </div>
+      {showHistogram && (
+        <canvas
+          width={histCanWidth}
+          height={histCanHeight}
+          ref={can}
+          style={{ width: histCssWidth + 'px', height: histCssHeight + 'px' }}
+        />
+      )}
+      <div>
+        {renderYBucket()}
+        <div>
+          {getFieldDisplayName(countField!, data.heatmap)}: {data.display!(count)}
+        </div>
+      </div>
+      {links.length > 0 && (
+        <VerticalGroup>
+          {links.map((link, i) => (
+            <LinkButton
+              key={i}
+              icon={'external-link-alt'}
+              target={link.target}
+              href={link.href}
+              onClick={link.onClick}
+              fill="text"
+              style={{ width: '100%' }}
+            >
+              {link.title}
+            </LinkButton>
+          ))}
+        </VerticalGroup>
+      )}
+    </>
+  );
+};
diff --git a/public/app/plugins/panel/heatmap/HeatmapPanel.tsx b/public/app/plugins/panel/heatmap/HeatmapPanel.tsx
index 281ddd19f910c..0a0863cf64240 100644
--- a/public/app/plugins/panel/heatmap/HeatmapPanel.tsx
+++ b/public/app/plugins/panel/heatmap/HeatmapPanel.tsx
@@ -1,24 +1,32 @@
 import { css } from '@emotion/css';
 import React, { useCallback, useMemo, useRef, useState } from 'react';
 
-import { DataFrame, DataFrameType, Field, getLinksSupplier, GrafanaTheme2, PanelProps, TimeRange } from '@grafana/data';
-import { PanelDataErrorView } from '@grafana/runtime';
+import { DashboardCursorSync, DataFrameType, GrafanaTheme2, PanelProps, TimeRange } from '@grafana/data';
+import { config, PanelDataErrorView } from '@grafana/runtime';
 import { ScaleDistributionConfig } from '@grafana/schema';
 import {
   Portal,
   ScaleDistribution,
+  TooltipPlugin2,
+  TooltipDisplayMode,
+  ZoomPlugin,
   UPlotChart,
   usePanelContext,
   useStyles2,
   useTheme2,
   VizLayout,
   VizTooltipContainer,
+  EventBusPlugin,
 } from '@grafana/ui';
+import { TimeRange2, TooltipHoverMode } from '@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2';
 import { ColorScale } from 'app/core/components/ColorScale/ColorScale';
 import { isHeatmapCellsDense, readHeatmapRowsCustomMeta } from 'app/features/transformers/calculateHeatmap/heatmap';
 
+import { AnnotationsPlugin2 } from '../timeseries/plugins/AnnotationsPlugin2';
+
 import { ExemplarModalHeader } from './ExemplarModalHeader';
-import { HeatmapHoverView } from './HeatmapHoverView';
+import { HeatmapHoverView } from './HeatmapHoverViewOld';
+import { HeatmapTooltip } from './HeatmapTooltip';
 import { prepareHeatmapData } from './fields';
 import { quantizeScheme } from './palettes';
 import { Options } from './types';
@@ -41,67 +49,66 @@ export const HeatmapPanel = ({
 }: HeatmapPanelProps) => {
   const theme = useTheme2();
   const styles = useStyles2(getStyles);
-  const { sync } = usePanelContext();
-
-  //  necessary for enabling datalinks in hover view
-  let scopedVarsFromRawData = [];
-  for (const series of data.series) {
-    for (const field of series.fields) {
-      if (field.state?.scopedVars) {
-        scopedVarsFromRawData.push(field.state.scopedVars);
-      }
-    }
-  }
+  const { sync, canAddAnnotations } = usePanelContext();
+
+  // TODO: we should just re-init when this changes, and have this be a static setting
+  const syncTooltip = useCallback(
+    () => sync?.() === DashboardCursorSync.Tooltip,
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
+
+  const syncAny = useCallback(
+    () => sync?.() !== DashboardCursorSync.Off,
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
+
+  // temp range set for adding new annotation set by TooltipPlugin2, consumed by AnnotationPlugin2
+  const [newAnnotationRange, setNewAnnotationRange] = useState<TimeRange2 | null>(null);
 
   // ugh
   let timeRangeRef = useRef<TimeRange>(timeRange);
   timeRangeRef.current = timeRange;
 
-  const getFieldLinksSupplier = useCallback(
-    (exemplars: DataFrame, field: Field) => {
-      return getLinksSupplier(exemplars, field, field.state?.scopedVars ?? {}, replaceVariables);
-    },
-    [replaceVariables]
-  );
-
   const palette = useMemo(() => quantizeScheme(options.color, theme), [options.color, theme]);
 
   const info = useMemo(() => {
     try {
-      return prepareHeatmapData(
-        data.series,
-        data.annotations,
-        options,
-        palette,
-        theme,
-        getFieldLinksSupplier,
-        replaceVariables
-      );
+      return prepareHeatmapData(data.series, data.annotations, options, palette, theme, replaceVariables);
     } catch (ex) {
       return { warning: `${ex}` };
     }
-  }, [data.series, data.annotations, options, palette, theme, getFieldLinksSupplier, replaceVariables]);
+  }, [data.series, data.annotations, options, palette, theme, replaceVariables]);
 
   const facets = useMemo(() => {
     let exemplarsXFacet: number[] | undefined = []; // "Time" field
-    let exemplarsyFacet: Array<number | undefined> = [];
+    let exemplarsYFacet: Array<number | undefined> = [];
 
     const meta = readHeatmapRowsCustomMeta(info.heatmap);
-    if (info.exemplars?.length && meta.yMatchWithLabel) {
+
+    if (info.exemplars?.length) {
       exemplarsXFacet = info.exemplars?.fields[0].values;
 
-      // ordinal/labeled heatmap-buckets?
-      const hasLabeledY = meta.yOrdinalDisplay != null;
+      // render by match on ordinal y label
+      if (meta.yMatchWithLabel) {
+        // ordinal/labeled heatmap-buckets?
+        const hasLabeledY = meta.yOrdinalDisplay != null;
 
-      if (hasLabeledY) {
-        let matchExemplarsBy = info.exemplars?.fields.find((field) => field.name === meta.yMatchWithLabel)!.values;
-        exemplarsyFacet = matchExemplarsBy.map((label) => meta.yOrdinalLabel?.indexOf(label));
-      } else {
-        exemplarsyFacet = info.exemplars?.fields[1].values; // "Value" field
+        if (hasLabeledY) {
+          let matchExemplarsBy = info.exemplars?.fields.find((field) => field.name === meta.yMatchWithLabel)!.values;
+          exemplarsYFacet = matchExemplarsBy.map((label) => meta.yOrdinalLabel?.indexOf(label));
+        } else {
+          exemplarsYFacet = info.exemplars?.fields[1].values; // "Value" field
+        }
+      }
+      // render by raw value
+      else {
+        exemplarsYFacet = info.exemplars?.fields[1].values; // "Value" field
       }
     }
 
-    return [null, info.heatmap?.fields.map((f) => f.values), [exemplarsXFacet, exemplarsyFacet]];
+    return [null, info.heatmap?.fields.map((f) => f.values), [exemplarsXFacet, exemplarsYFacet]];
   }, [info.heatmap, info.exemplars]);
 
   const [hover, setHover] = useState<HeatmapHoverEvent | undefined>(undefined);
@@ -132,6 +139,7 @@ export const HeatmapPanel = ({
   // ugh
   const dataRef = useRef(info);
   dataRef.current = info;
+  const showNewVizTooltips = Boolean(config.featureToggles.newVizTooltips);
 
   const builder = useMemo(() => {
     const scaleConfig: ScaleDistributionConfig = dataRef.current?.heatmap?.fields[1].config?.custom?.scaleDistribution;
@@ -139,15 +147,8 @@ export const HeatmapPanel = ({
     return prepConfig({
       dataRef,
       theme,
-      eventBus,
-      onhover: onhover,
-      onclick: options.tooltip.show ? onclick : null,
-      onzoom: (evt) => {
-        const delta = evt.xMax - evt.xMin;
-        if (delta > 1) {
-          onChangeTimeRange({ from: evt.xMin, to: evt.xMax });
-        }
-      },
+      onhover: !showNewVizTooltips ? onhover : null,
+      onclick: !showNewVizTooltips && options.tooltip.mode !== TooltipDisplayMode.None ? onclick : null,
       isToolTipOpen,
       timeZone,
       getTimeRange: () => timeRangeRef.current,
@@ -205,42 +206,99 @@ export const HeatmapPanel = ({
     );
   }
 
+  const enableAnnotationCreation = Boolean(canAddAnnotations && canAddAnnotations());
+
   return (
     <>
       <VizLayout width={width} height={height} legend={renderLegend()}>
         {(vizWidth: number, vizHeight: number) => (
           <UPlotChart config={builder} data={facets as any} width={vizWidth} height={vizHeight}>
-            {/*children ? children(config, alignedFrame) : null*/}
+            <EventBusPlugin config={builder} sync={syncAny} eventBus={eventBus} frame={info.series ?? info.heatmap} />
+            {!showNewVizTooltips && <ZoomPlugin config={builder} onZoom={onChangeTimeRange} />}
+            {showNewVizTooltips && (
+              <>
+                {options.tooltip.mode !== TooltipDisplayMode.None && (
+                  <TooltipPlugin2
+                    config={builder}
+                    hoverMode={TooltipHoverMode.xyOne}
+                    queryZoom={onChangeTimeRange}
+                    syncTooltip={syncTooltip}
+                    render={(u, dataIdxs, seriesIdx, isPinned, dismiss, timeRange2, viaSync) => {
+                      if (enableAnnotationCreation && timeRange2 != null) {
+                        setNewAnnotationRange(timeRange2);
+                        dismiss();
+                        return;
+                      }
+
+                      const annotate = () => {
+                        let xVal = u.posToVal(u.cursor.left!, 'x');
+
+                        setNewAnnotationRange({ from: xVal, to: xVal });
+                        dismiss();
+                      };
+
+                      return (
+                        <HeatmapTooltip
+                          mode={viaSync ? TooltipDisplayMode.Multi : options.tooltip.mode}
+                          dataIdxs={dataIdxs}
+                          seriesIdx={seriesIdx}
+                          dataRef={dataRef}
+                          isPinned={isPinned}
+                          dismiss={dismiss}
+                          showHistogram={options.tooltip.yHistogram}
+                          showColorScale={options.tooltip.showColorScale}
+                          panelData={data}
+                          annotate={enableAnnotationCreation ? annotate : undefined}
+                        />
+                      );
+                    }}
+                    maxWidth={options.tooltip.maxWidth}
+                    maxHeight={options.tooltip.maxHeight}
+                  />
+                )}
+                <AnnotationsPlugin2
+                  annotations={data.annotations ?? []}
+                  config={builder}
+                  timeZone={timeZone}
+                  newRange={newAnnotationRange}
+                  setNewRange={setNewAnnotationRange}
+                  canvasRegionRendering={false}
+                />
+              </>
+            )}
           </UPlotChart>
         )}
       </VizLayout>
-      <Portal>
-        {hover && options.tooltip.show && (
-          <VizTooltipContainer
-            position={{ x: hover.pageX, y: hover.pageY }}
-            offset={{ x: 10, y: 10 }}
-            allowPointerEvents={isToolTipOpen.current}
-          >
-            {shouldDisplayCloseButton && <ExemplarModalHeader onClick={onCloseToolTip} />}
-            <HeatmapHoverView
-              timeRange={timeRange}
-              data={info}
-              hover={hover}
-              showHistogram={options.tooltip.yHistogram}
-              replaceVars={replaceVariables}
-              scopedVars={scopedVarsFromRawData}
-            />
-          </VizTooltipContainer>
-        )}
-      </Portal>
+      {!showNewVizTooltips && (
+        <>
+          <Portal>
+            {hover && options.tooltip.mode !== TooltipDisplayMode.None && (
+              <VizTooltipContainer
+                position={{ x: hover.pageX, y: hover.pageY }}
+                offset={{ x: 10, y: 10 }}
+                allowPointerEvents={isToolTipOpen.current}
+              >
+                {shouldDisplayCloseButton && <ExemplarModalHeader onClick={onCloseToolTip} />}
+                <HeatmapHoverView
+                  timeRange={timeRange}
+                  data={info}
+                  hover={hover}
+                  showHistogram={options.tooltip.yHistogram}
+                  replaceVars={replaceVariables}
+                />
+              </VizTooltipContainer>
+            )}
+          </Portal>
+        </>
+      )}
     </>
   );
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  colorScaleWrapper: css`
-    margin-left: 25px;
-    padding: 10px 0;
-    max-width: 300px;
-  `,
+  colorScaleWrapper: css({
+    marginLeft: '25px',
+    padding: '10px 0',
+    maxWidth: '300px',
+  }),
 });
diff --git a/public/app/plugins/panel/heatmap/HeatmapTooltip.tsx b/public/app/plugins/panel/heatmap/HeatmapTooltip.tsx
new file mode 100644
index 0000000000000..5f3a6b6b53eb6
--- /dev/null
+++ b/public/app/plugins/panel/heatmap/HeatmapTooltip.tsx
@@ -0,0 +1,367 @@
+import React, { ReactElement, useEffect, useRef, useState, ReactNode } from 'react';
+import uPlot from 'uplot';
+
+import {
+  DataFrameType,
+  Field,
+  FieldType,
+  formattedValueToString,
+  getFieldDisplayName,
+  LinkModel,
+  PanelData,
+} from '@grafana/data';
+import { HeatmapCellLayout } from '@grafana/schema';
+import { TooltipDisplayMode, useStyles2, useTheme2 } from '@grafana/ui';
+import { VizTooltipContent } from '@grafana/ui/src/components/VizTooltip/VizTooltipContent';
+import { VizTooltipFooter } from '@grafana/ui/src/components/VizTooltip/VizTooltipFooter';
+import { VizTooltipHeader } from '@grafana/ui/src/components/VizTooltip/VizTooltipHeader';
+import { ColorIndicator, ColorPlacement, VizTooltipItem } from '@grafana/ui/src/components/VizTooltip/types';
+import { ColorScale } from 'app/core/components/ColorScale/ColorScale';
+import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
+import { isHeatmapCellsDense, readHeatmapRowsCustomMeta } from 'app/features/transformers/calculateHeatmap/heatmap';
+import { DataHoverView } from 'app/features/visualization/data-hover/DataHoverView';
+
+import { getDataLinks } from '../status-history/utils';
+import { getStyles } from '../timeseries/TimeSeriesTooltip';
+
+import { HeatmapData } from './fields';
+import { renderHistogram } from './renderHistogram';
+import { formatMilliseconds, getFieldFromData, getHoverCellColor, getSparseCellMinMax } from './tooltip/utils';
+
+interface HeatmapTooltipProps {
+  mode: TooltipDisplayMode;
+  dataIdxs: Array<number | null>;
+  seriesIdx: number | null | undefined;
+  dataRef: React.MutableRefObject<HeatmapData>;
+  showHistogram?: boolean;
+  showColorScale?: boolean;
+  isPinned: boolean;
+  dismiss: () => void;
+  panelData: PanelData;
+  annotate?: () => void;
+}
+
+export const HeatmapTooltip = (props: HeatmapTooltipProps) => {
+  if (props.seriesIdx === 2) {
+    return (
+      <DataHoverView
+        data={props.dataRef.current!.exemplars}
+        rowIndex={props.dataIdxs[2]}
+        header={'Exemplar'}
+        padding={8}
+      />
+    );
+  }
+
+  return <HeatmapHoverCell {...props} />;
+};
+
+const HeatmapHoverCell = ({
+  dataIdxs,
+  dataRef,
+  showHistogram,
+  isPinned,
+  showColorScale = false,
+  mode,
+  annotate,
+}: HeatmapTooltipProps) => {
+  const index = dataIdxs[1]!;
+  const data = dataRef.current;
+
+  const [isSparse] = useState(
+    () => data.heatmap?.meta?.type === DataFrameType.HeatmapCells && !isHeatmapCellsDense(data.heatmap)
+  );
+
+  const xField = getFieldFromData(data.heatmap!, 'x', isSparse)!;
+  const yField = getFieldFromData(data.heatmap!, 'y', isSparse)!;
+  const countField = getFieldFromData(data.heatmap!, 'count', isSparse)!;
+
+  const xDisp = (v: number) => {
+    if (xField?.display) {
+      return formattedValueToString(xField.display(v));
+    }
+    if (xField?.type === FieldType.time) {
+      const tooltipTimeFormat = 'YYYY-MM-DD HH:mm:ss';
+      const dashboard = getDashboardSrv().getCurrent();
+      return dashboard?.formatDate(v, tooltipTimeFormat);
+    }
+    return `${v}`;
+  };
+
+  const xVals = xField.values;
+  const yVals = yField.values;
+  const countVals = countField.values;
+
+  // labeled buckets
+  const meta = readHeatmapRowsCustomMeta(data.heatmap);
+  const yDisp = yField?.display ? (v: string) => formattedValueToString(yField.display!(v)) : (v: string) => `${v}`;
+
+  let interval = xField?.config.interval;
+
+  let yBucketMin: string;
+  let yBucketMax: string;
+
+  let xBucketMin: number;
+  let xBucketMax: number;
+
+  let nonNumericOrdinalDisplay: string | undefined = undefined;
+
+  let contentItems: VizTooltipItem[] = [];
+
+  const getYValueIndex = (idx: number) => {
+    return idx % (data.yBucketCount ?? 1);
+  };
+
+  let yValueIdx = getYValueIndex(index);
+  const xValueIdx = Math.floor(index / (data.yBucketCount ?? 1));
+
+  const getData = (idx: number = index) => {
+    if (meta.yOrdinalDisplay) {
+      const yMinIdx = data.yLayout === HeatmapCellLayout.le ? yValueIdx - 1 : yValueIdx;
+      const yMaxIdx = data.yLayout === HeatmapCellLayout.le ? yValueIdx : yValueIdx + 1;
+      yBucketMin = yMinIdx < 0 ? meta.yMinDisplay! : `${meta.yOrdinalDisplay[yMinIdx]}`;
+      yBucketMax = `${meta.yOrdinalDisplay[yMaxIdx]}`;
+
+      // e.g. "pod-xyz123"
+      if (!meta.yOrdinalLabel || Number.isNaN(+meta.yOrdinalLabel[0])) {
+        nonNumericOrdinalDisplay = data.yLayout === HeatmapCellLayout.le ? yBucketMax : yBucketMin;
+      }
+    } else {
+      const value = yVals?.[yValueIdx];
+
+      if (data.yLayout === HeatmapCellLayout.le) {
+        yBucketMax = `${value}`;
+
+        if (data.yLog) {
+          let logFn = data.yLog === 2 ? Math.log2 : Math.log10;
+          let exp = logFn(value) - 1 / data.yLogSplit!;
+          yBucketMin = `${data.yLog ** exp}`;
+        } else {
+          yBucketMin = `${value - data.yBucketSize!}`;
+        }
+      } else {
+        yBucketMin = `${value}`;
+
+        if (data.yLog) {
+          let logFn = data.yLog === 2 ? Math.log2 : Math.log10;
+          let exp = logFn(value) + 1 / data.yLogSplit!;
+          yBucketMax = `${data.yLog ** exp}`;
+        } else {
+          yBucketMax = `${value + data.yBucketSize!}`;
+        }
+      }
+    }
+
+    if (data.xLayout === HeatmapCellLayout.le) {
+      xBucketMax = xVals[idx];
+      xBucketMin = xBucketMax - data.xBucketSize!;
+    } else {
+      xBucketMin = xVals[idx];
+      xBucketMax = xBucketMin + data.xBucketSize!;
+    }
+  };
+
+  if (isSparse) {
+    ({ xBucketMin, xBucketMax, yBucketMin, yBucketMax } = getSparseCellMinMax(data!, index));
+  } else {
+    getData();
+  }
+
+  const { cellColor, colorPalette } = getHoverCellColor(data, index);
+
+  const getDisplayData = (fromIdx: number, toIdx: number) => {
+    let vals = [];
+    for (let idx = fromIdx; idx <= toIdx; idx++) {
+      if (!countVals?.[idx]) {
+        continue;
+      }
+
+      const color = getHoverCellColor(data, idx).cellColor;
+      count = getCountValue(idx);
+
+      if (isSparse) {
+        ({ xBucketMin, xBucketMax, yBucketMin, yBucketMax } = getSparseCellMinMax(data!, idx));
+      } else {
+        yValueIdx = getYValueIndex(idx);
+        getData(idx);
+      }
+
+      const { label, value } = getContentLabels()[0];
+
+      vals.push({
+        label,
+        value,
+        color: color ?? '#FFF',
+        isActive: index === idx,
+      });
+    }
+
+    return vals;
+  };
+
+  const getContentLabels = (): VizTooltipItem[] => {
+    const isMulti = mode === TooltipDisplayMode.Multi && !isPinned;
+
+    if (nonNumericOrdinalDisplay) {
+      return isMulti
+        ? [{ label: `Name ${nonNumericOrdinalDisplay}`, value: data.display!(count) }]
+        : [{ label: 'Name', value: nonNumericOrdinalDisplay }];
+    }
+
+    switch (data.yLayout) {
+      case HeatmapCellLayout.unknown:
+        return isMulti
+          ? [{ label: yDisp(yBucketMin), value: data.display!(count) }]
+          : [{ label: '', value: yDisp(yBucketMin) }];
+    }
+
+    return isMulti
+      ? [
+          {
+            label: `Bucket ${yDisp(yBucketMin)}` + '-' + `${yDisp(yBucketMax)}`,
+            value: data.display!(count),
+          },
+        ]
+      : [
+          {
+            label: 'Bucket',
+            value: `${yDisp(yBucketMin)}` + '-' + `${yDisp(yBucketMax)}`,
+          },
+        ];
+  };
+
+  const getCountValue = (idx: number) => {
+    return countVals?.[idx];
+  };
+
+  let count = getCountValue(index);
+
+  if (mode === TooltipDisplayMode.Single || isPinned) {
+    const fromToInt: VizTooltipItem[] = interval ? [{ label: 'Duration', value: formatMilliseconds(interval) }] : [];
+
+    contentItems = [
+      {
+        label: getFieldDisplayName(countField, data.heatmap),
+        value: data.display!(count),
+        color: cellColor ?? '#FFF',
+        colorPlacement: ColorPlacement.trailing,
+        colorIndicator: ColorIndicator.value,
+      },
+      ...getContentLabels(),
+      ...fromToInt,
+    ];
+  }
+
+  if (mode === TooltipDisplayMode.Multi && !isPinned) {
+    let xVal = xField.values[index];
+    let fromIdx = index;
+    let toIdx = index;
+
+    while (xField.values[fromIdx - 1] === xVal) {
+      fromIdx--;
+    }
+
+    while (xField.values[toIdx + 1] === xVal) {
+      toIdx++;
+    }
+
+    const vals: VizTooltipItem[] = getDisplayData(fromIdx, toIdx);
+    vals.forEach((val) => {
+      contentItems.push({
+        label: val.label,
+        value: val.value,
+        color: val.color ?? '#FFF',
+        colorIndicator: ColorIndicator.value,
+        colorPlacement: ColorPlacement.trailing,
+        isActive: val.isActive,
+      });
+    });
+  }
+
+  let footer: ReactNode;
+
+  if (isPinned) {
+    let links: Array<LinkModel<Field>> = [];
+
+    const linksField = data.series?.fields[yValueIdx + 1];
+
+    if (linksField != null) {
+      const visible = !Boolean(linksField.config.custom?.hideFrom?.tooltip);
+      const hasLinks = (linksField.config.links?.length ?? 0) > 0;
+
+      if (visible && hasLinks) {
+        links = getDataLinks(linksField, xValueIdx);
+      }
+    }
+
+    footer = <VizTooltipFooter dataLinks={links} annotate={annotate} />;
+  }
+
+  let can = useRef<HTMLCanvasElement>(null);
+
+  let histCssWidth = 264;
+  let histCssHeight = 64;
+  let histCanWidth = Math.round(histCssWidth * uPlot.pxRatio);
+  let histCanHeight = Math.round(histCssHeight * uPlot.pxRatio);
+
+  useEffect(
+    () => {
+      if (showHistogram && xVals != null && countVals != null && mode === TooltipDisplayMode.Single) {
+        renderHistogram(can, histCanWidth, histCanHeight, xVals, countVals, index, data.yBucketCount!);
+      }
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [index]
+  );
+
+  const headerItem: VizTooltipItem = {
+    label: '',
+    value: xDisp(xBucketMax!)!,
+  };
+
+  let customContent: ReactElement[] = [];
+
+  if (mode === TooltipDisplayMode.Single) {
+    // Histogram
+    if (showHistogram && !isSparse) {
+      customContent.push(
+        <canvas
+          width={histCanWidth}
+          height={histCanHeight}
+          ref={can}
+          style={{ width: histCssWidth + 'px', height: histCssHeight + 'px' }}
+        />
+      );
+    }
+
+    // Color scale
+    if (colorPalette && showColorScale) {
+      customContent.push(
+        <ColorScale
+          colorPalette={colorPalette}
+          min={data.heatmapColors?.minValue!}
+          max={data.heatmapColors?.maxValue!}
+          display={data.display}
+          hoverValue={count}
+        />
+      );
+    }
+  }
+
+  const styles = useStyles2(getStyles);
+  const theme = useTheme2();
+
+  return (
+    <div className={styles.wrapper}>
+      <VizTooltipHeader item={headerItem} isPinned={isPinned} />
+      <VizTooltipContent items={contentItems} isPinned={isPinned}>
+        {customContent?.map((content, i) => (
+          <div key={i} style={{ padding: `${theme.spacing(1)} 0` }}>
+            {content}
+          </div>
+        ))}
+      </VizTooltipContent>
+      {footer}
+    </div>
+  );
+};
diff --git a/public/app/plugins/panel/heatmap/fields.ts b/public/app/plugins/panel/heatmap/fields.ts
index 0529ec3fce436..e45b88ae03338 100644
--- a/public/app/plugins/panel/heatmap/fields.ts
+++ b/public/app/plugins/panel/heatmap/fields.ts
@@ -6,12 +6,11 @@ import {
   FieldType,
   formattedValueToString,
   getDisplayProcessor,
+  getLinksSupplier,
   GrafanaTheme2,
   InterpolateFunction,
-  LinkModel,
   outerJoinDataFrames,
   ValueFormatter,
-  ValueLinkConfig,
 } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { HeatmapCellLayout } from '@grafana/schema';
@@ -39,6 +38,8 @@ export interface HeatmapData {
     maxValue: number;
   };
 
+  series?: DataFrame; // the joined single frame for nonNumericOrdinalY data links
+
   exemplars?: DataFrame; // optionally linked exemplars
   exemplarColor?: string;
 
@@ -70,8 +71,7 @@ export function prepareHeatmapData(
   options: Options,
   palette: string[],
   theme: GrafanaTheme2,
-  getFieldLinks?: (exemplars: DataFrame, field: Field) => (config: ValueLinkConfig) => Array<LinkModel<Field>>,
-  replaceVariables?: InterpolateFunction
+  replaceVariables: InterpolateFunction = (v) => v
 ): HeatmapData {
   if (!frames?.length) {
     return {};
@@ -81,11 +81,9 @@ export function prepareHeatmapData(
 
   const exemplars = annotations?.find((f) => f.name === 'exemplar');
 
-  if (getFieldLinks) {
-    exemplars?.fields.forEach((field, index) => {
-      exemplars.fields[index].getLinks = getFieldLinks(exemplars, field);
-    });
-  }
+  exemplars?.fields.forEach((field) => {
+    field.getLinks = getLinksSupplier(exemplars, field, field.state?.scopedVars ?? {}, replaceVariables);
+  });
 
   if (options.calculate) {
     if (config.featureToggles.transformationsVariableSupport) {
@@ -138,7 +136,7 @@ export function prepareHeatmapData(
   }
 
   // Everything past here assumes a field for each row in the heatmap (buckets)
-  if (!rowsHeatmap) {
+  if (rowsHeatmap == null) {
     if (frames.length > 1) {
       let allNamesNumeric = frames.every(
         (frame) => !Number.isNaN(parseSampleValue(frame.fields[1].state?.displayName!))
@@ -148,11 +146,10 @@ export function prepareHeatmapData(
         frames.sort(sortSeriesByLabel);
       }
 
-      rowsHeatmap = [
-        outerJoinDataFrames({
-          frames,
-        })!,
-      ][0];
+      rowsHeatmap = outerJoinDataFrames({
+        frames,
+        keepDisplayNames: true,
+      })!;
     } else {
       let frame = frames[0];
       let numberFields = frame.fields.filter((field) => field.type === FieldType.number);
@@ -171,18 +168,31 @@ export function prepareHeatmapData(
     }
   }
 
-  return getDenseHeatmapData(
-    rowsToCellsHeatmap({
-      unit: options.yAxis?.unit, // used to format the ordinal lookup values
-      decimals: options.yAxis?.decimals,
-      ...options.rowsFrame,
-      frame: rowsHeatmap,
-    }),
-    exemplars,
-    options,
-    palette,
-    theme
-  );
+  // config data links
+  rowsHeatmap.fields.forEach((field) => {
+    if ((field.config.links?.length ?? 0) === 0) {
+      return;
+    }
+
+    // this expects that the tooltip is able to identify the field and rowIndex from a dense hovered index
+    field.getLinks = getLinksSupplier(rowsHeatmap!, field, field.state?.scopedVars ?? {}, replaceVariables);
+  });
+
+  return {
+    ...getDenseHeatmapData(
+      rowsToCellsHeatmap({
+        unit: options.yAxis?.unit, // used to format the ordinal lookup values
+        decimals: options.yAxis?.decimals,
+        ...options.rowsFrame,
+        frame: rowsHeatmap,
+      }),
+      exemplars,
+      options,
+      palette,
+      theme
+    ),
+    series: rowsHeatmap,
+  };
 }
 
 const getSparseHeatmapData = (
diff --git a/public/app/plugins/panel/heatmap/migrations.test.ts b/public/app/plugins/panel/heatmap/migrations.test.ts
index 5d919a9187b48..ce188993215ba 100644
--- a/public/app/plugins/panel/heatmap/migrations.test.ts
+++ b/public/app/plugins/panel/heatmap/migrations.test.ts
@@ -1,6 +1,6 @@
 import { PanelModel, FieldConfigSource } from '@grafana/data';
 
-import { heatmapChangedHandler } from './migrations';
+import { heatmapChangedHandler, heatmapMigrationHandler } from './migrations';
 
 describe('Heatmap Migrations', () => {
   let prevFieldConfig: FieldConfigSource;
@@ -74,7 +74,7 @@ describe('Heatmap Migrations', () => {
           },
           "showValue": "never",
           "tooltip": {
-            "show": true,
+            "mode": "single",
             "yHistogram": true,
           },
           "yAxis": {
@@ -91,6 +91,63 @@ describe('Heatmap Migrations', () => {
     `);
   });
 
+  it('Null Options', () => {
+    const panel = {} as PanelModel;
+    panel.options = null;
+    panel.options = heatmapMigrationHandler(panel);
+    expect(panel).toMatchInlineSnapshot(`
+      {
+        "fieldConfig": {
+          "defaults": {},
+          "overrides": [],
+        },
+        "options": {
+          "calculate": true,
+          "calculation": {},
+          "cellGap": 2,
+          "cellRadius": undefined,
+          "cellValues": {
+            "decimals": undefined,
+          },
+          "color": {
+            "exponent": 0.5,
+            "fill": undefined,
+            "max": undefined,
+            "min": undefined,
+            "mode": "scheme",
+            "reverse": false,
+            "scale": "exponential",
+            "scheme": "Oranges",
+            "steps": 128,
+          },
+          "exemplars": {
+            "color": "rgba(255,0,255,0.7)",
+          },
+          "legend": {
+            "show": false,
+          },
+          "rowsFrame": {
+            "layout": "auto",
+          },
+          "showValue": "never",
+          "tooltip": {
+            "mode": "none",
+            "yHistogram": false,
+          },
+          "yAxis": {
+            "axisPlacement": "left",
+            "axisWidth": undefined,
+            "decimals": undefined,
+            "max": undefined,
+            "min": undefined,
+            "reverse": false,
+            "unit": undefined,
+          },
+        },
+      }
+    `);
+  });
+
   it('Cell padding defaults', () => {
     // zero becomes 1
     expect(
diff --git a/public/app/plugins/panel/heatmap/migrations.ts b/public/app/plugins/panel/heatmap/migrations.ts
index 4771f7850fac2..325159e57586a 100644
--- a/public/app/plugins/panel/heatmap/migrations.ts
+++ b/public/app/plugins/panel/heatmap/migrations.ts
@@ -7,6 +7,7 @@ import {
   HeatmapCalculationMode,
   HeatmapCalculationOptions,
 } from '@grafana/schema';
+import { TooltipDisplayMode } from '@grafana/ui';
 
 import { colorSchemes } from './palettes';
 import { Options, defaultOptions, HeatmapColorMode } from './types';
@@ -14,9 +15,23 @@ import { Options, defaultOptions, HeatmapColorMode } from './types';
 /** Called when the version number changes */
 export const heatmapMigrationHandler = (panel: PanelModel): Partial<Options> => {
   // Migrating from angular
-  if (Object.keys(panel.options).length === 0) {
+  if (Object.keys(panel.options ?? {}).length === 0) {
     return heatmapChangedHandler(panel, 'heatmap', { angular: panel }, panel.fieldConfig);
   }
+
+  // multi tooltip mode in 10.3+
+  let showTooltip = panel.options?.tooltip?.show;
+  if (showTooltip !== undefined) {
+    if (showTooltip === true) {
+      panel.options.tooltip.mode = TooltipDisplayMode.Single;
+    } else if (showTooltip === false) {
+      panel.options.tooltip.mode = TooltipDisplayMode.None;
+    }
+
+    // Remove old tooltip option
+    delete panel.options.tooltip?.show;
+  }
+
   return panel.options;
 };
 
@@ -111,7 +126,7 @@ export function angularToReactHeatmap(angular: any): { fieldConfig: FieldConfigS
     },
     showValue: VisibilityMode.Never,
     tooltip: {
-      show: Boolean(angular.tooltip?.show),
+      mode: Boolean(angular.tooltip?.show) ? TooltipDisplayMode.Single : TooltipDisplayMode.None,
       yHistogram: Boolean(angular.tooltip?.showHistogram),
     },
     exemplars: {
diff --git a/public/app/plugins/panel/heatmap/module.tsx b/public/app/plugins/panel/heatmap/module.tsx
index 47f94f60fc624..5ac97b441c65e 100644
--- a/public/app/plugins/panel/heatmap/module.tsx
+++ b/public/app/plugins/panel/heatmap/module.tsx
@@ -9,6 +9,7 @@ import {
   ScaleDistributionConfig,
   HeatmapCellLayout,
 } from '@grafana/schema';
+import { TooltipDisplayMode } from '@grafana/ui';
 import { addHideFrom, ScaleDistributionEditor } from '@grafana/ui/src/options/builder';
 import { ColorScale } from 'app/core/components/ColorScale/ColorScale';
 import { addHeatmapCalculationOptions } from 'app/features/transformers/calculateHeatmap/editor/helper';
@@ -30,8 +31,8 @@ export const plugin = new PanelPlugin<Options, GraphFieldConfig>(HeatmapPanel)
         path: 'scaleDistribution',
         name: 'Y axis scale',
         category: ['Heatmap'],
-        editor: ScaleDistributionEditor as any,
-        override: ScaleDistributionEditor as any,
+        editor: ScaleDistributionEditor,
+        override: ScaleDistributionEditor,
         defaultValue: { type: ScaleDistribution.Linear },
         shouldApply: (f) => f.type === FieldType.number,
         process: identityOverrideProcessor,
@@ -52,15 +53,7 @@ export const plugin = new PanelPlugin<Options, GraphFieldConfig>(HeatmapPanel)
         // NOTE: this feels like overkill/expensive just to assert if we have an ordinal y
         // can probably simplify without doing full dataprep
         const palette = quantizeScheme(opts.color, config.theme2);
-        const v = prepareHeatmapData(
-          context.data,
-          undefined,
-          opts,
-          palette,
-          config.theme2,
-          undefined,
-          context.replaceVariables
-        );
+        const v = prepareHeatmapData(context.data, undefined, opts, palette, config.theme2);
         isOrdinalY = readHeatmapRowsCustomMeta(v.heatmap).yOrdinalDisplay != null;
       } catch {}
     }
@@ -391,11 +384,18 @@ export const plugin = new PanelPlugin<Options, GraphFieldConfig>(HeatmapPanel)
 
     category = ['Tooltip'];
 
-    builder.addBooleanSwitch({
-      path: 'tooltip.show',
-      name: 'Show tooltip',
-      defaultValue: defaultOptions.tooltip.show,
+    builder.addRadio({
+      path: 'tooltip.mode',
+      name: 'Tooltip mode',
       category,
+      defaultValue: TooltipDisplayMode.Single,
+      settings: {
+        options: [
+          { value: TooltipDisplayMode.Single, label: 'Single' },
+          { value: TooltipDisplayMode.Multi, label: 'All' },
+          { value: TooltipDisplayMode.None, label: 'Hidden' },
+        ],
+      },
     });
 
     builder.addBooleanSwitch({
@@ -403,7 +403,36 @@ export const plugin = new PanelPlugin<Options, GraphFieldConfig>(HeatmapPanel)
       name: 'Show histogram (Y axis)',
       defaultValue: defaultOptions.tooltip.yHistogram,
       category,
-      showIf: (opts) => opts.tooltip.show,
+      showIf: (opts) => opts.tooltip.mode === TooltipDisplayMode.Single,
+    });
+
+    builder.addBooleanSwitch({
+      path: 'tooltip.showColorScale',
+      name: 'Show color scale',
+      defaultValue: defaultOptions.tooltip.showColorScale,
+      category,
+      showIf: (opts) => opts.tooltip.mode === TooltipDisplayMode.Single && config.featureToggles.newVizTooltips,
+    });
+
+    builder.addNumberInput({
+      path: 'tooltip.maxWidth',
+      name: 'Max width',
+      category,
+      settings: {
+        integer: true,
+      },
+      showIf: (options) => false, // config.featureToggles.newVizTooltips && options.tooltip?.mode !== TooltipDisplayMode.None,
+    });
+
+    builder.addNumberInput({
+      path: 'tooltip.maxHeight',
+      name: 'Max height',
+      category,
+      defaultValue: 600,
+      settings: {
+        integer: true,
+      },
+      showIf: (options) => false, // config.featureToggles.newVizTooltips && options.tooltip?.mode !== TooltipDisplayMode.None,
     });
 
     category = ['Legend'];
@@ -422,4 +451,5 @@ export const plugin = new PanelPlugin<Options, GraphFieldConfig>(HeatmapPanel)
       category,
     });
   })
-  .setSuggestionsSupplier(new HeatmapSuggestionsSupplier());
+  .setSuggestionsSupplier(new HeatmapSuggestionsSupplier())
+  .setDataSupport({ annotations: true });
diff --git a/public/app/plugins/panel/heatmap/panelcfg.cue b/public/app/plugins/panel/heatmap/panelcfg.cue
index f6221de747030..2bba82710ad87 100644
--- a/public/app/plugins/panel/heatmap/panelcfg.cue
+++ b/public/app/plugins/panel/heatmap/panelcfg.cue
@@ -78,10 +78,14 @@ composableKinds: PanelCfg: lineage: {
 			} @cuetsy(kind="interface")
 			// Controls tooltip options
 			HeatmapTooltip: {
-				// Controls if the tooltip is shown
-				show: bool
+				// Controls how the tooltip is shown
+				mode:       ui.TooltipDisplayMode
+				maxHeight?: number
+				maxWidth?:  number
 				// Controls if the tooltip shows a histogram of the y-axis values
 				yHistogram?: bool
+				// Controls if the tooltip shows a color scale in header
+				showColorScale?: bool
 			} @cuetsy(kind="interface")
 			// Controls legend options
 			HeatmapLegend: {
@@ -143,8 +147,9 @@ composableKinds: PanelCfg: lineage: {
 				}
 				// Controls tooltip options
 				tooltip: HeatmapTooltip | *{
-					show:       true
-					yHistogram: false
+					mode:           ui.TooltipDisplayMode & (*"single" | _)
+					yHistogram:     false
+					showColorScale: false
 				}
 				// Controls exemplar options
 				exemplars: ExemplarConfig | *{
diff --git a/public/app/plugins/panel/heatmap/panelcfg.gen.ts b/public/app/plugins/panel/heatmap/panelcfg.gen.ts
index f54b0829897fc..ce34f829840ff 100644
--- a/public/app/plugins/panel/heatmap/panelcfg.gen.ts
+++ b/public/app/plugins/panel/heatmap/panelcfg.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
@@ -126,10 +126,16 @@ export interface FilterValueRange {
  * Controls tooltip options
  */
 export interface HeatmapTooltip {
+  maxHeight?: number;
+  maxWidth?: number;
   /**
-   * Controls if the tooltip is shown
+   * Controls how the tooltip is shown
    */
-  show: boolean;
+  mode: ui.TooltipDisplayMode;
+  /**
+   * Controls if the tooltip shows a color scale in header
+   */
+  showColorScale?: boolean;
   /**
    * Controls if the tooltip shows a histogram of the y-axis values
    */
@@ -259,8 +265,9 @@ export const defaultOptions: Partial<Options> = {
   },
   showValue: ui.VisibilityMode.Auto,
   tooltip: {
-    show: true,
+    mode: ui.TooltipDisplayMode.Single,
     yHistogram: false,
+    showColorScale: false,
   },
 };
 
diff --git a/public/app/plugins/panel/heatmap/renderHistogram.tsx b/public/app/plugins/panel/heatmap/renderHistogram.tsx
new file mode 100644
index 0000000000000..14278fcfcc20f
--- /dev/null
+++ b/public/app/plugins/panel/heatmap/renderHistogram.tsx
@@ -0,0 +1,63 @@
+export function renderHistogram(
+  can: React.RefObject<HTMLCanvasElement>,
+  histCanWidth: number,
+  histCanHeight: number,
+  xVals: number[],
+  countVals: number[],
+  index: number,
+  yBucketCount: number
+) {
+  let histCtx = can.current?.getContext('2d');
+
+  if (histCtx != null) {
+    const barsGap = 1;
+    let fromIdx = index;
+
+    while (xVals[fromIdx - 1] === xVals[index]) {
+      fromIdx--;
+    }
+
+    let toIdx = fromIdx + yBucketCount;
+
+    let maxCount = 0;
+
+    let i = fromIdx;
+    while (i < toIdx) {
+      let c = countVals[i];
+      maxCount = Math.max(maxCount, c);
+      i++;
+    }
+
+    let pHov = new Path2D();
+    let pRest = new Path2D();
+
+    i = fromIdx;
+    let j = 0;
+    while (i < toIdx) {
+      let c = countVals[i];
+
+      if (c > 0) {
+        let pctY = c / maxCount;
+        let pctX = j / yBucketCount;
+
+        let p = i === index ? pHov : pRest;
+
+        const xCoord = histCanWidth * pctX + barsGap;
+        const width = histCanWidth / yBucketCount - barsGap;
+
+        p.rect(xCoord, Math.round(histCanHeight * (1 - pctY)), width, Math.round(histCanHeight * pctY));
+      }
+
+      i++;
+      j++;
+    }
+
+    histCtx.clearRect(0, 0, histCanWidth, histCanHeight);
+
+    histCtx.fillStyle = '#2E3036';
+    histCtx.fill(pRest);
+
+    histCtx.fillStyle = '#5794F2';
+    histCtx.fill(pHov);
+  }
+}
diff --git a/public/app/plugins/panel/heatmap/tooltip/tooltipUtils.test.ts b/public/app/plugins/panel/heatmap/tooltip/tooltipUtils.test.ts
new file mode 100644
index 0000000000000..cbc0706c4a2d4
--- /dev/null
+++ b/public/app/plugins/panel/heatmap/tooltip/tooltipUtils.test.ts
@@ -0,0 +1,45 @@
+import { formatMilliseconds } from './utils';
+
+describe('heatmap tooltip utils', () => {
+  it('converts ms to appropriate unit', async () => {
+    let msToFormat = 10;
+    let formatted = formatMilliseconds(msToFormat);
+    expect(formatted).toBe('10 ms');
+
+    msToFormat = 1000;
+    formatted = formatMilliseconds(msToFormat);
+    expect(formatted).toBe('1 s');
+
+    msToFormat = 1000 * 120;
+    formatted = formatMilliseconds(msToFormat);
+    expect(formatted).toBe('2 m');
+
+    msToFormat = 1000 * 60 * 60;
+    formatted = formatMilliseconds(msToFormat);
+    expect(formatted).toBe('1 h');
+
+    msToFormat = 1000 * 60 * 60 * 24;
+    formatted = formatMilliseconds(msToFormat);
+    expect(formatted).toBe('1 day');
+
+    msToFormat = 1000 * 60 * 60 * 24 * 7 * 3;
+    formatted = formatMilliseconds(msToFormat);
+    expect(formatted).toBe('3 weeks');
+
+    msToFormat = 1000 * 60 * 60 * 24 * 7 * 4;
+    formatted = formatMilliseconds(msToFormat);
+    expect(formatted).toBe('4 weeks');
+
+    msToFormat = 1000 * 60 * 60 * 24 * 7 * 5;
+    formatted = formatMilliseconds(msToFormat);
+    expect(formatted).toBe('1 month');
+
+    msToFormat = 1000 * 60 * 60 * 24 * 365;
+    formatted = formatMilliseconds(msToFormat);
+    expect(formatted).toBe('1 year');
+
+    msToFormat = 1000 * 60 * 60 * 24 * 365 * 2;
+    formatted = formatMilliseconds(msToFormat);
+    expect(formatted).toBe('2 years');
+  });
+});
diff --git a/public/app/plugins/panel/heatmap/tooltip/utils.ts b/public/app/plugins/panel/heatmap/tooltip/utils.ts
new file mode 100644
index 0000000000000..58114245d4ee2
--- /dev/null
+++ b/public/app/plugins/panel/heatmap/tooltip/utils.ts
@@ -0,0 +1,93 @@
+import { DataFrame, Field } from '@grafana/data';
+
+import { HeatmapData } from '../fields';
+
+type BucketsMinMax = {
+  xBucketMin: number;
+  xBucketMax: number;
+  yBucketMin: string;
+  yBucketMax: string;
+};
+
+export const getHoverCellColor = (data: HeatmapData, index: number) => {
+  const colorPalette = data.heatmapColors?.palette!;
+  const colorIndex = data.heatmapColors?.values[index];
+
+  let cellColor: string | undefined = undefined;
+
+  if (colorIndex != null) {
+    cellColor = colorPalette[colorIndex];
+  }
+
+  return { cellColor, colorPalette };
+};
+
+const conversions: Record<string, number> = {
+  year: 1000 * 60 * 60 * 24 * 365,
+  month: 1000 * 60 * 60 * 24 * 30,
+  week: 1000 * 60 * 60 * 24 * 7,
+  day: 1000 * 60 * 60 * 24,
+  h: 1000 * 60 * 60,
+  m: 1000 * 60,
+  s: 1000,
+  ms: 1,
+};
+
+const noPluralize = new Set(['ms', 's', 'm', 'h']);
+
+// @TODO: display "~ 1 year/month"?
+export const formatMilliseconds = (milliseconds: number) => {
+  let value = 1;
+  let unit = 'ms';
+
+  for (unit in conversions) {
+    if (milliseconds >= conversions[unit]) {
+      value = Math.floor(milliseconds / conversions[unit]);
+      break;
+    }
+  }
+
+  const plural = value !== 1 && !noPluralize.has(unit);
+  const unitString = plural ? unit + 's' : unit;
+
+  return `${value} ${unitString}`;
+};
+
+export const getFieldFromData = (data: DataFrame, fieldType: string, isSparse: boolean) => {
+  let field: Field | undefined;
+
+  switch (fieldType) {
+    case 'x':
+      field = isSparse
+        ? data?.fields.find(({ name }) => name === 'x' || name === 'xMin' || name === 'xMax')
+        : data?.fields[0];
+      break;
+    case 'y':
+      field = isSparse
+        ? data?.fields.find(({ name }) => name === 'y' || name === 'yMin' || name === 'yMax')
+        : data?.fields[1];
+      break;
+    case 'count':
+      field = isSparse ? data?.fields.find(({ name }) => name === 'count') : data?.fields[2];
+      break;
+  }
+
+  return field;
+};
+
+export const getSparseCellMinMax = (data: HeatmapData, index: number): BucketsMinMax => {
+  let fields = data.heatmap!.fields;
+
+  let xMax = fields.find((f) => f.name === 'xMax')!;
+  let yMin = fields.find((f) => f.name === 'yMin')!;
+  let yMax = fields.find((f) => f.name === 'yMax')!;
+
+  let interval = xMax.config.interval!;
+
+  return {
+    xBucketMin: xMax.values[index] - interval,
+    xBucketMax: xMax.values[index],
+    yBucketMin: yMin.values[index],
+    yBucketMax: yMax.values[index],
+  };
+};
diff --git a/public/app/plugins/panel/heatmap/utils.ts b/public/app/plugins/panel/heatmap/utils.ts
index d5d09e238c186..d6c9589811d35 100644
--- a/public/app/plugins/panel/heatmap/utils.ts
+++ b/public/app/plugins/panel/heatmap/utils.ts
@@ -4,10 +4,6 @@ import uPlot, { Cursor } from 'uplot';
 import {
   DashboardCursorSync,
   DataFrameType,
-  DataHoverClearEvent,
-  DataHoverEvent,
-  DataHoverPayload,
-  EventBus,
   formattedValueToString,
   getValueFormat,
   GrafanaTheme2,
@@ -60,11 +56,10 @@ export interface HeatmapZoomEvent {
 interface PrepConfigOpts {
   dataRef: RefObject<HeatmapData>;
   theme: GrafanaTheme2;
-  eventBus: EventBus;
   onhover?: null | ((evt?: HeatmapHoverEvent | null) => void);
   onclick?: null | ((evt?: Object) => void);
   onzoom?: null | ((evt: HeatmapZoomEvent) => void);
-  isToolTipOpen: MutableRefObject<boolean>;
+  isToolTipOpen?: MutableRefObject<boolean>;
   timeZone: string;
   getTimeRange: () => TimeRange;
   exemplarColor: string;
@@ -82,10 +77,8 @@ export function prepConfig(opts: PrepConfigOpts) {
   const {
     dataRef,
     theme,
-    eventBus,
     onhover,
     onclick,
-    onzoom,
     isToolTipOpen,
     timeZone,
     getTimeRange,
@@ -99,11 +92,9 @@ export function prepConfig(opts: PrepConfigOpts) {
   } = opts;
 
   const xScaleKey = 'x';
-  let xScaleUnit = 'time';
   let isTime = true;
 
   if (dataRef.current?.heatmap?.fields[0].type !== FieldType.time) {
-    xScaleUnit = dataRef.current?.heatmap?.fields[0].config?.unit ?? 'x';
     isTime = false;
   }
 
@@ -143,15 +134,6 @@ export function prepConfig(opts: PrepConfigOpts) {
       );
   });
 
-  onzoom &&
-    builder.addHook('setSelect', (u) => {
-      onzoom({
-        xMin: u.posToVal(u.select.left, xScaleKey),
-        xMax: u.posToVal(u.select.left + u.select.width, xScaleKey),
-      });
-      u.setSelect({ left: 0, top: 0, width: 0, height: 0 }, false);
-    });
-
   if (isTime) {
     // this is a tmp hack because in mode: 2, uplot does not currently call scales.x.range() for setData() calls
     // scales.x.range() typically reads back from drilled-down panelProps.timeRange via getTimeRange()
@@ -176,14 +158,6 @@ export function prepConfig(opts: PrepConfigOpts) {
     rect = r;
   });
 
-  const payload: DataHoverPayload = {
-    point: {
-      [xScaleUnit]: null,
-    },
-    data: dataRef.current?.heatmap,
-  };
-  const hoverEvent = new DataHoverEvent(payload);
-
   let pendingOnleave: ReturnType<typeof setTimeout> | 0;
 
   onhover &&
@@ -193,11 +167,8 @@ export function prepConfig(opts: PrepConfigOpts) {
           const sel = u.cursor.idxs[i];
           if (sel != null) {
             const { left, top } = u.cursor;
-            payload.rowIndex = sel;
-            payload.point[xScaleUnit] = u.posToVal(left!, xScaleKey);
-            eventBus.publish(hoverEvent);
 
-            if (!isToolTipOpen.current) {
+            if (!isToolTipOpen?.current) {
               if (pendingOnleave) {
                 clearTimeout(pendingOnleave);
                 pendingOnleave = 0;
@@ -214,14 +185,11 @@ export function prepConfig(opts: PrepConfigOpts) {
         }
       }
 
-      if (!isToolTipOpen.current) {
+      if (!isToolTipOpen?.current) {
         // if tiles have gaps, reduce flashing / re-render (debounce onleave by 100ms)
         if (!pendingOnleave) {
           pendingOnleave = setTimeout(() => {
             onhover(null);
-            payload.rowIndex = undefined;
-            payload.point[xScaleUnit] = null;
-            eventBus.publish(hoverEvent);
           }, 100);
         }
       }
@@ -314,6 +282,12 @@ export function prepConfig(opts: PrepConfigOpts) {
       // sparse already accounts for le/ge by explicit yMin & yMax cell bounds, so no need to expand y range
       isSparseHeatmap
         ? (u, dataMin, dataMax) => {
+            // ...but uPlot currently only auto-ranges from the yMin facet data, so we have to grow by 1 extra factor
+            // @ts-ignore
+            let bucketFactor = u.data[1][2][0] / u.data[1][1][0];
+
+            dataMax *= bucketFactor;
+
             let scaleMin: number | null, scaleMax: number | null;
 
             [scaleMin, scaleMax] = shouldUseLogScale
@@ -516,13 +490,13 @@ export function prepConfig(opts: PrepConfigOpts) {
         dataRef.current?.xLayout === HeatmapCellLayout.le
           ? -1
           : dataRef.current?.xLayout === HeatmapCellLayout.ge
-          ? 1
-          : 0,
+            ? 1
+            : 0,
       yAlign: ((dataRef.current?.yLayout === HeatmapCellLayout.le
         ? -1
         : dataRef.current?.yLayout === HeatmapCellLayout.ge
-        ? 1
-        : 0) * (yAxisReverse ? -1 : 1)) as -1 | 0 | 1,
+          ? 1
+          : 0) * (yAxisReverse ? -1 : 1)) as -1 | 0 | 1,
       ySizeDivisor,
       disp: {
         fill: {
@@ -561,7 +535,8 @@ export function prepConfig(opts: PrepConfigOpts) {
           });
         },
       },
-      exemplarFillColor
+      exemplarFillColor,
+      dataRef.current.yLayout
     ),
     theme,
     scaleKey: '', // facets' scales used (above)
@@ -589,6 +564,10 @@ export function prepConfig(opts: PrepConfigOpts) {
 
       return hRect && seriesIdx === hRect.sidx ? hRect.didx : null;
     },
+    focus: {
+      prox: 1e3,
+      dist: (u, seriesIdx) => (hRect?.sidx === seriesIdx ? 0 : Infinity),
+    },
     points: {
       fill: 'rgba(255,255,255, 0.3)',
       bbox: (u, seriesIdx) => {
@@ -607,20 +586,7 @@ export function prepConfig(opts: PrepConfigOpts) {
   if (sync && sync() !== DashboardCursorSync.Off) {
     cursor.sync = {
       key: eventsScope,
-      scales: [xScaleKey, yScaleKey],
-      filters: {
-        pub: (type: string, src: uPlot, x: number, y: number, w: number, h: number, dataIdx: number) => {
-          if (x < 0) {
-            payload.point[xScaleUnit] = null;
-            eventBus.publish(new DataHoverClearEvent());
-          } else {
-            payload.point[xScaleUnit] = src.posToVal(x, xScaleKey);
-            eventBus.publish(hoverEvent);
-          }
-
-          return true;
-        },
-      },
+      scales: [xScaleKey, null],
     };
 
     builder.setSync();
@@ -748,7 +714,7 @@ export function heatmapPathsDense(opts: PathbuilderOpts) {
   };
 }
 
-export function heatmapPathsPoints(opts: PointsBuilderOpts, exemplarColor: string) {
+export function heatmapPathsPoints(opts: PointsBuilderOpts, exemplarColor: string, yLayout?: HeatmapCellLayout) {
   return (u: uPlot, seriesIdx: number) => {
     uPlot.orient(
       u,
@@ -776,12 +742,20 @@ export function heatmapPathsPoints(opts: PointsBuilderOpts, exemplarColor: strin
         let fillPaths = [points];
         let fillPalette = [exemplarColor ?? 'rgba(255,0,255,0.7)'];
 
+        let yShift = yLayout === HeatmapCellLayout.le ? -0.5 : yLayout === HeatmapCellLayout.ge ? 0.5 : 0;
+
         for (let i = 0; i < dataX.length; i++) {
           let yVal = dataY[i]!;
-          yVal -= 0.5; // center vertically in bucket (when tiles are le)
-          // y-randomize vertically to distribute exemplars in same bucket at same time
-          let randSign = Math.round(Math.random()) * 2 - 1;
-          yVal += randSign * 0.5 * Math.random();
+
+          // this is a hacky by-proxy check
+          // works okay since we have no exemplars in calculated heatmaps and...
+          //  - heatmap-rows has ordinal y
+          //  - heatmap-cells has log2 y
+          let isSparseHeatmap = scaleY.distr === 3 && scaleY.log === 2;
+
+          if (!isSparseHeatmap) {
+            yVal += yShift;
+          }
 
           let x = valToPosX(dataX[i], scaleX, xDim, xOff);
           let y = valToPosY(yVal, scaleY, yDim, yOff);
@@ -900,8 +874,8 @@ export function heatmapPathsSparse(opts: PathbuilderOpts) {
           xSize = Math.max(1, xSize - cellGap);
           ySize = Math.max(1, ySize - cellGap);
 
-          let x = xMaxPx;
-          let y = yMinPx;
+          let x = xMaxPx - cellGap / 2 - xSize;
+          let y = yMaxPx + cellGap / 2;
 
           let fillPath = fillPaths[fills[i]];
 
@@ -970,8 +944,8 @@ export const valuesToFills = (values: number[], palette: string[], minValue: num
       values[i] < minValue
         ? 0
         : values[i] > maxValue
-        ? paletteSize - 1
-        : Math.min(paletteSize - 1, Math.floor((paletteSize * (values[i] - minValue)) / range));
+          ? paletteSize - 1
+          : Math.min(paletteSize - 1, Math.floor((paletteSize * (values[i] - minValue)) / range));
   }
 
   return indexedFills;
diff --git a/public/app/plugins/panel/histogram/Histogram.tsx b/public/app/plugins/panel/histogram/Histogram.tsx
index 58ec3eab14128..0a042b1afa756 100644
--- a/public/app/plugins/panel/histogram/Histogram.tsx
+++ b/public/app/plugins/panel/histogram/Histogram.tsx
@@ -3,10 +3,12 @@ import uPlot, { AlignedData } from 'uplot';
 
 import {
   DataFrame,
+  FieldType,
   formattedValueToString,
   getFieldColorModeForField,
   getFieldSeriesColor,
   GrafanaTheme2,
+  roundDecimals,
 } from '@grafana/data';
 import {
   histogramBucketSizes,
@@ -22,6 +24,7 @@ import {
   measureText,
   UPLOT_AXIS_FONT_SIZE,
 } from '@grafana/ui';
+import { getStackingGroups, preparePlotData2 } from '@grafana/ui/src/components/uPlot/utils';
 
 import { defaultFieldConfig, FieldConfig, Options } from './panelcfg.gen';
 
@@ -36,6 +39,7 @@ function incrRoundUp(num: number, incr: number) {
 export interface HistogramProps extends Themeable2 {
   options: Options; // used for diff
   alignedFrame: DataFrame; // This could take HistogramFields
+  bucketCount?: number;
   bucketSize: number;
   width: number;
   height: number;
@@ -47,7 +51,16 @@ export interface HistogramProps extends Themeable2 {
 
 export function getBucketSize(frame: DataFrame) {
   // assumes BucketMin is fields[0] and BucktMax is fields[1]
-  return frame.fields[1].values[0] - frame.fields[0].values[0];
+  return frame.fields[0].type === FieldType.string
+    ? 1
+    : roundDecimals(frame.fields[1].values[0] - frame.fields[0].values[0], 9);
+}
+
+export function getBucketSize1(frame: DataFrame) {
+  // assumes BucketMin is fields[0] and BucktMax is fields[1]
+  return frame.fields[0].type === FieldType.string
+    ? 1
+    : roundDecimals(frame.fields[1].values[1] - frame.fields[0].values[1], 9);
 }
 
 const prepConfig = (frame: DataFrame, theme: GrafanaTheme2) => {
@@ -59,8 +72,15 @@ const prepConfig = (frame: DataFrame, theme: GrafanaTheme2) => {
 
   let builder = new UPlotConfigBuilder();
 
+  let isOrdinalX = frame.fields[0].type === FieldType.string;
+
   // assumes BucketMin is fields[0] and BucktMax is fields[1]
   let bucketSize = getBucketSize(frame);
+  let bucketSize1 = getBucketSize1(frame);
+
+  let bucketFactor = bucketSize1 / bucketSize;
+
+  let useLogScale = bucketSize1 !== bucketSize; // (imperfect floats)
 
   // splits shifter, to ensure splits always start at first bucket
   let xSplits: uPlot.Axis.Splits = (u, axisIdx, scaleMin, scaleMax, foundIncr, foundSpace) => {
@@ -84,35 +104,37 @@ const prepConfig = (frame: DataFrame, theme: GrafanaTheme2) => {
   builder.addScale({
     scaleKey: 'x', // bukkits
     isTime: false,
-    distribution: ScaleDistribution.Linear,
+    distribution: isOrdinalX
+      ? ScaleDistribution.Ordinal
+      : useLogScale
+        ? ScaleDistribution.Log
+        : ScaleDistribution.Linear,
+    log: 2,
     orientation: ScaleOrientation.Horizontal,
     direction: ScaleDirection.Right,
-    range: (u, wantedMin, wantedMax) => {
-      // these settings will prevent zooming, probably okay?
-      if (xScaleMin != null) {
-        wantedMin = xScaleMin;
-      }
-      if (xScaleMax != null) {
-        wantedMax = xScaleMax;
-      }
-
-      let fullRangeMin = u.data[0][0];
-      let fullRangeMax = u.data[0][u.data[0].length - 1];
-
-      // snap to bucket divisors...
-
-      if (wantedMax === fullRangeMax) {
-        wantedMax += bucketSize;
-      } else {
-        wantedMax = incrRoundUp(wantedMax, bucketSize);
-      }
-
-      if (wantedMin > fullRangeMin) {
-        wantedMin = incrRoundDn(wantedMin, bucketSize);
-      }
-
-      return [wantedMin, wantedMax];
-    },
+    range: useLogScale
+      ? (u, wantedMin, wantedMax) => {
+          return uPlot.rangeLog(wantedMin, wantedMax * bucketFactor, 2, true);
+        }
+      : (u, wantedMin, wantedMax) => {
+          // these settings will prevent zooming, probably okay?
+          if (xScaleMin != null) {
+            wantedMin = xScaleMin;
+          }
+          if (xScaleMax != null) {
+            wantedMax = xScaleMax;
+          }
+
+          let fullRangeMax = u.data[0][u.data[0].length - 1];
+
+          // isOrdinalX is when we have classic histograms, which are LE, ordinal X, and already have 0 dummy bucket prepended
+          // else we have calculated histograms which are GE and cardinal+linear X, and have no next dummy bucket appended
+          wantedMin = incrRoundUp(wantedMin, bucketSize);
+          wantedMax =
+            !isOrdinalX && wantedMax === fullRangeMax ? wantedMax + bucketSize : incrRoundDn(wantedMax, bucketSize);
+
+          return [wantedMin, wantedMax];
+        },
   });
 
   builder.addScale({
@@ -121,6 +143,7 @@ const prepConfig = (frame: DataFrame, theme: GrafanaTheme2) => {
     distribution: ScaleDistribution.Linear,
     orientation: ScaleOrientation.Vertical,
     direction: ScaleDirection.Up,
+    softMin: 0,
   });
 
   const fmt = frame.fields[0].display!;
@@ -132,22 +155,24 @@ const prepConfig = (frame: DataFrame, theme: GrafanaTheme2) => {
     scaleKey: 'x',
     isTime: false,
     placement: AxisPlacement.Bottom,
-    incrs: histogramBucketSizes,
-    splits: xSplits,
-    values: (u: uPlot, splits: any[]) => {
-      const tickLabels = splits.map(xAxisFormatter);
-
-      const maxWidth = tickLabels.reduce(
-        (curMax, label) => Math.max(measureText(label, UPLOT_AXIS_FONT_SIZE).width, curMax),
-        0
-      );
-
-      const labelSpacing = 10;
-      const maxCount = u.bbox.width / ((maxWidth + labelSpacing) * devicePixelRatio);
-      const keepMod = Math.ceil(tickLabels.length / maxCount);
-
-      return tickLabels.map((label, i) => (i % keepMod === 0 ? label : null));
-    },
+    incrs: isOrdinalX ? [1] : useLogScale ? undefined : histogramBucketSizes,
+    splits: useLogScale || isOrdinalX ? undefined : xSplits,
+    values: isOrdinalX
+      ? (u, splits) => splits
+      : (u, splits) => {
+          const tickLabels = splits.map(xAxisFormatter);
+
+          const maxWidth = tickLabels.reduce(
+            (curMax, label) => Math.max(measureText(label, UPLOT_AXIS_FONT_SIZE).width, curMax),
+            0
+          );
+
+          const labelSpacing = 10;
+          const maxCount = u.bbox.width / ((maxWidth + labelSpacing) * devicePixelRatio);
+          const keepMod = Math.ceil(tickLabels.length / maxCount);
+
+          return tickLabels.map((label, i) => (i % keepMod === 0 ? label : null));
+        },
     //incrs: () => [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map((mult) => mult * bucketSize),
     //splits: config.xSplits,
     //values: config.xValues,
@@ -183,6 +208,9 @@ const prepConfig = (frame: DataFrame, theme: GrafanaTheme2) => {
     },
   });
 
+  let stackingGroups = getStackingGroups(xMinOnlyFrame(frame));
+  builder.setStackingGroups(stackingGroups);
+
   let pathBuilder = uPlot.paths.bars!({ align: 1, size: [1, Infinity] });
 
   let seriesIndex = 0;
@@ -228,31 +256,32 @@ const prepConfig = (frame: DataFrame, theme: GrafanaTheme2) => {
   return builder;
 };
 
-const preparePlotData = (frame: DataFrame) => {
-  let data = [];
-
-  for (const field of frame.fields) {
-    if (field.name !== histogramFrameBucketMaxFieldName) {
-      data.push(field.values);
-    }
-  }
+// since we're reusing timeseries prep for stacking, we need to make a tmp frame where fields match the uplot data
+// by removing the x bucket max field to make sure stacking group series idxs match up
+const xMinOnlyFrame = (frame: DataFrame) => ({
+  ...frame,
+  fields: frame.fields.filter((f) => f.name !== histogramFrameBucketMaxFieldName),
+});
 
+const preparePlotData = (builder: UPlotConfigBuilder, xMinOnlyFrame: DataFrame) => {
   // uPlot's bars pathBuilder will draw rects even if 0 (to distinguish them from nulls)
   // but for histograms we want to omit them, so remap 0s -> nulls
-  for (let i = 1; i < data.length; i++) {
-    let counts = data[i];
+  for (let i = 1; i < xMinOnlyFrame.fields.length; i++) {
+    let counts = xMinOnlyFrame.fields[i].values;
+
     for (let j = 0; j < counts.length; j++) {
       if (counts[j] === 0) {
-        counts[j] = null;
+        counts[j] = null; // mutates!
       }
     }
   }
 
-  return data as AlignedData;
+  return preparePlotData2(xMinOnlyFrame, builder.getStackingGroups());
 };
 
 interface State {
   alignedData: AlignedData;
+  alignedFrame: DataFrame;
   config?: UPlotConfigBuilder;
 }
 
@@ -262,21 +291,17 @@ export class Histogram extends React.Component<HistogramProps, State> {
     this.state = this.prepState(props);
   }
 
-  prepState(props: HistogramProps, withConfig = true) {
-    let state: State = null as any;
-
+  prepState(props: HistogramProps, withConfig = true): State {
     const { alignedFrame } = props;
-    if (alignedFrame) {
-      state = {
-        alignedData: preparePlotData(alignedFrame),
-      };
 
-      if (withConfig) {
-        state.config = prepConfig(alignedFrame, this.props.theme);
-      }
-    }
+    const config = withConfig ? prepConfig(alignedFrame, this.props.theme) : this.state.config!;
+    const alignedData = preparePlotData(config, xMinOnlyFrame(alignedFrame));
 
-    return state;
+    return {
+      alignedFrame,
+      alignedData,
+      config,
+    };
   }
 
   renderLegend(config: UPlotConfigBuilder) {
@@ -286,29 +311,27 @@ export class Histogram extends React.Component<HistogramProps, State> {
       return null;
     }
 
-    return <PlotLegend data={this.props.rawSeries!} config={config} maxHeight="35%" maxWidth="60%" {...legend} />;
+    const frames = this.props.options.combine ? [this.props.alignedFrame] : this.props.rawSeries!;
+
+    return <PlotLegend data={frames} config={config} maxHeight="35%" maxWidth="60%" {...legend} />;
   }
 
   componentDidUpdate(prevProps: HistogramProps) {
-    const { structureRev, alignedFrame, bucketSize } = this.props;
+    const { structureRev, alignedFrame, bucketSize, bucketCount } = this.props;
 
     if (alignedFrame !== prevProps.alignedFrame) {
-      let newState = this.prepState(this.props, false);
-
-      if (newState) {
-        const shouldReconfig =
-          bucketSize !== prevProps.bucketSize ||
-          this.props.options !== prevProps.options ||
-          this.state.config === undefined ||
-          structureRev !== prevProps.structureRev ||
-          !structureRev;
-
-        if (shouldReconfig) {
-          newState.config = prepConfig(alignedFrame, this.props.theme);
-        }
-      }
-
-      newState && this.setState(newState);
+      const shouldReconfig =
+        this.state.config == null ||
+        bucketCount !== prevProps.bucketCount ||
+        bucketSize !== prevProps.bucketSize ||
+        this.props.options !== prevProps.options ||
+        this.state.config === undefined ||
+        structureRev !== prevProps.structureRev ||
+        !structureRev;
+
+      const newState = this.prepState(this.props, shouldReconfig);
+
+      this.setState(newState);
     }
   }
 
diff --git a/public/app/plugins/panel/histogram/HistogramPanel.tsx b/public/app/plugins/panel/histogram/HistogramPanel.tsx
index 8919927cb3ed7..fddee1297d645 100644
--- a/public/app/plugins/panel/histogram/HistogramPanel.tsx
+++ b/public/app/plugins/panel/histogram/HistogramPanel.tsx
@@ -65,6 +65,7 @@ export const HistogramPanel = ({ data, options, width, height }: Props) => {
       height={height}
       alignedFrame={histogram}
       bucketSize={bucketSize}
+      bucketCount={options.bucketCount}
     >
       {(config, alignedFrame) => {
         return null; // <TooltipPlugin data={alignedFrame} config={config} mode={options.tooltip.mode} timeZone={timeZone} />;
diff --git a/public/app/plugins/panel/histogram/config.ts b/public/app/plugins/panel/histogram/config.ts
new file mode 100644
index 0000000000000..88ff8f9089ad6
--- /dev/null
+++ b/public/app/plugins/panel/histogram/config.ts
@@ -0,0 +1,10 @@
+import { StackingMode } from '@grafana/schema';
+
+import { FieldConfig } from './panelcfg.gen';
+
+export const defaultHistogramConfig: FieldConfig = {
+  stacking: {
+    mode: StackingMode.None,
+    group: 'A',
+  },
+};
diff --git a/public/app/plugins/panel/histogram/migrations.test.ts b/public/app/plugins/panel/histogram/migrations.test.ts
new file mode 100644
index 0000000000000..62b31f4fa1fe9
--- /dev/null
+++ b/public/app/plugins/panel/histogram/migrations.test.ts
@@ -0,0 +1,62 @@
+import { FieldConfigSource, PanelModel } from '@grafana/data';
+import { StackingMode } from '@grafana/ui';
+
+import { changeToHistogramPanelMigrationHandler } from './migrations';
+
+describe('Histogram migrations', () => {
+  let prevFieldConfig: FieldConfigSource;
+
+  beforeEach(() => {
+    prevFieldConfig = {
+      defaults: {},
+      overrides: [],
+    };
+  });
+
+  it('Should migrate from old graph', () => {
+    const old = {
+      angular: {
+        xaxis: {
+          mode: 'histogram',
+        },
+      },
+    };
+
+    const panel = {} as PanelModel;
+    panel.options = changeToHistogramPanelMigrationHandler(panel, 'graph', old, prevFieldConfig);
+    expect(panel.options.combine).toBe(false);
+  });
+
+  it('Should migrate from old graph with percent stacking', () => {
+    const old = {
+      angular: {
+        xaxis: {
+          mode: 'histogram',
+        },
+        stack: true,
+        percentage: true,
+      },
+    };
+
+    const panel = {} as PanelModel;
+    panel.options = changeToHistogramPanelMigrationHandler(panel, 'graph', old, prevFieldConfig);
+    expect(panel.fieldConfig.defaults.custom.stacking.mode).toBe(StackingMode.Percent);
+    expect(panel.options.combine).toBe(false);
+  });
+
+  it('Should migrate from old graph with normal stacking', () => {
+    const old = {
+      angular: {
+        xaxis: {
+          mode: 'histogram',
+        },
+        stack: true,
+      },
+    };
+
+    const panel = {} as PanelModel;
+    panel.options = changeToHistogramPanelMigrationHandler(panel, 'graph', old, prevFieldConfig);
+    expect(panel.fieldConfig.defaults.custom.stacking.mode).toBe(StackingMode.Normal);
+    expect(panel.options.combine).toBe(false);
+  });
+});
diff --git a/public/app/plugins/panel/histogram/migrations.ts b/public/app/plugins/panel/histogram/migrations.ts
new file mode 100644
index 0000000000000..983aaedc8a6ea
--- /dev/null
+++ b/public/app/plugins/panel/histogram/migrations.ts
@@ -0,0 +1,91 @@
+import { isNil, omitBy } from 'lodash';
+
+import { FieldConfigSource, PanelTypeChangedHandler } from '@grafana/data';
+import {
+  LegendDisplayMode,
+  SortOrder,
+  StackingMode,
+  TooltipDisplayMode,
+} from '@grafana/schema/dist/esm/common/common.gen';
+
+import { defaultHistogramConfig } from './config';
+import { FieldConfig as HistogramFieldConfig, Options } from './panelcfg.gen';
+
+/*
+ * This is called when the panel changes from another panel
+ */
+export const changeToHistogramPanelMigrationHandler: PanelTypeChangedHandler = (
+  panel,
+  prevPluginId,
+  prevOptions,
+  prevFieldConfig
+) => {
+  if (prevPluginId === 'graph') {
+    const graphOptions: GraphOptions = prevOptions.angular;
+
+    if (graphOptions.xaxis?.mode === 'histogram') {
+      const { fieldConfig, options } = graphToHistogramOptions({
+        ...prevOptions.angular,
+        fieldConfig: prevFieldConfig,
+      });
+
+      panel.fieldConfig = fieldConfig; // Mutates the incoming panel
+
+      return options;
+    }
+  }
+
+  return {};
+};
+
+function graphToHistogramOptions(angular: any): {
+  fieldConfig: FieldConfigSource;
+  options: Options;
+} {
+  const graphOptions: GraphOptions = angular;
+  let histogramFieldConfig: HistogramFieldConfig = {};
+  const options: Options = {
+    legend: {
+      displayMode: LegendDisplayMode.List,
+      showLegend: true,
+      placement: 'bottom',
+      calcs: [],
+    },
+    tooltip: {
+      mode: TooltipDisplayMode.Single,
+      sort: SortOrder.None,
+    },
+    combine: false,
+  };
+
+  if (graphOptions.stack) {
+    histogramFieldConfig.stacking = {
+      mode: graphOptions.percentage ? StackingMode.Percent : StackingMode.Normal,
+      group: defaultHistogramConfig.stacking!.group,
+    };
+
+    options.combine = false;
+  }
+
+  return {
+    fieldConfig: {
+      defaults: omitBy(
+        {
+          custom: histogramFieldConfig,
+        },
+        isNil
+      ),
+      overrides: [],
+    },
+    options,
+  };
+}
+
+interface GraphOptions {
+  stack?: boolean;
+  percentage?: boolean;
+  xaxis: {
+    mode: 'series' | 'time' | 'histogram';
+    values?: string[];
+  };
+}
diff --git a/public/app/plugins/panel/histogram/module.tsx b/public/app/plugins/panel/histogram/module.tsx
index 0b27fa61c1b4c..7bea3f036aa4b 100644
--- a/public/app/plugins/panel/histogram/module.tsx
+++ b/public/app/plugins/panel/histogram/module.tsx
@@ -1,12 +1,22 @@
-import { FieldColorModeId, FieldConfigProperty, PanelPlugin } from '@grafana/data';
+import {
+  FieldColorModeId,
+  FieldConfigProperty,
+  FieldType,
+  identityOverrideProcessor,
+  PanelPlugin,
+} from '@grafana/data';
 import { histogramFieldInfo } from '@grafana/data/src/transformations/transformers/histogram';
 import { commonOptionsBuilder, graphFieldOptions } from '@grafana/ui';
+import { StackingEditor } from '@grafana/ui/src/options/builder';
 
 import { HistogramPanel } from './HistogramPanel';
+import { defaultHistogramConfig } from './config';
+import { changeToHistogramPanelMigrationHandler } from './migrations';
 import { FieldConfig, Options, defaultFieldConfig, defaultOptions } from './panelcfg.gen';
 import { originalDataHasHistogram } from './utils';
 
 export const plugin = new PanelPlugin<Options, FieldConfig>(HistogramPanel)
+  .setPanelChangeHandler(changeToHistogramPanelMigrationHandler)
   .setPanelOptions((builder) => {
     builder
       .addCustomEditor({
@@ -17,6 +27,16 @@ export const plugin = new PanelPlugin<Options, FieldConfig>(HistogramPanel)
         editor: () => null, // empty editor
         showIf: (opts, data) => originalDataHasHistogram(data),
       })
+      .addNumberInput({
+        path: 'bucketCount',
+        name: histogramFieldInfo.bucketCount.name,
+        description: histogramFieldInfo.bucketCount.description,
+        settings: {
+          placeholder: `Default: ${defaultOptions.bucketCount}`,
+          min: 0,
+        },
+        showIf: (opts, data) => !originalDataHasHistogram(data),
+      })
       .addNumberInput({
         path: 'bucketSize',
         name: histogramFieldInfo.bucketSize.name,
@@ -33,10 +53,9 @@ export const plugin = new PanelPlugin<Options, FieldConfig>(HistogramPanel)
         name: histogramFieldInfo.bucketOffset.name,
         description: histogramFieldInfo.bucketOffset.description,
         settings: {
-          placeholder: '0',
+          placeholder: `Default: ${defaultOptions.bucketOffset}`,
           min: 0,
         },
-        defaultValue: defaultOptions.bucketOffset,
         showIf: (opts, data) => !originalDataHasHistogram(data),
       })
       .addBooleanSwitch({
@@ -54,7 +73,9 @@ export const plugin = new PanelPlugin<Options, FieldConfig>(HistogramPanel)
     standardOptions: {
       [FieldConfigProperty.Color]: {
         settings: {
-          byValueSupport: true,
+          byValueSupport: false,
+          bySeriesSupport: true,
+          preferThresholdsMode: false,
         },
         defaultValue: {
           mode: FieldColorModeId.PaletteClassic,
@@ -65,6 +86,21 @@ export const plugin = new PanelPlugin<Options, FieldConfig>(HistogramPanel)
       const cfg = defaultFieldConfig;
 
       builder
+        .addCustomEditor({
+          id: 'stacking',
+          path: 'stacking',
+          name: 'Stacking',
+          category: ['Histogram'],
+          defaultValue: defaultHistogramConfig.stacking,
+          editor: StackingEditor,
+          override: StackingEditor,
+          settings: {
+            options: graphFieldOptions.stacking,
+          },
+          process: identityOverrideProcessor,
+          shouldApply: (f) => f.type === FieldType.number,
+          showIf: (opts, data) => !originalDataHasHistogram(data),
+        })
         .addSliderInput({
           path: 'lineWidth',
           name: 'Line width',
diff --git a/public/app/plugins/panel/histogram/panelcfg.cue b/public/app/plugins/panel/histogram/panelcfg.cue
index 3ccfb387b6837..019ce7d8c8396 100644
--- a/public/app/plugins/panel/histogram/panelcfg.cue
+++ b/public/app/plugins/panel/histogram/panelcfg.cue
@@ -29,10 +29,12 @@ composableKinds: PanelCfg: {
 					common.OptionsWithLegend
 					common.OptionsWithTooltip
 
+					//Bucket count (approx)
+					bucketCount?: int32 & >0 | *30
 					//Size of each bucket
 					bucketSize?: int32
 					//Offset buckets by this amount
-					bucketOffset?: int32 | *0
+					bucketOffset?: float32 | *0
 					//Combines multiple series into a single histogram
 					combine?: bool
 				} @cuetsy(kind="interface")
@@ -40,6 +42,7 @@ composableKinds: PanelCfg: {
 				FieldConfig: {
 					common.AxisConfig
 					common.HideableFieldConfig
+					common.StackableFieldConfig
 
 					// Controls line width of the bars.
 					lineWidth?: uint32 & <=10 | *1
diff --git a/public/app/plugins/panel/histogram/panelcfg.gen.ts b/public/app/plugins/panel/histogram/panelcfg.gen.ts
index 93c7b868bc025..8eff826f474d9 100644
--- a/public/app/plugins/panel/histogram/panelcfg.gen.ts
+++ b/public/app/plugins/panel/histogram/panelcfg.gen.ts
@@ -4,13 +4,17 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as common from '@grafana/schema';
 
 export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip {
+  /**
+   * Bucket count (approx)
+   */
+  bucketCount?: number;
   /**
    * Offset buckets by this amount
    */
@@ -26,10 +30,11 @@ export interface Options extends common.OptionsWithLegend, common.OptionsWithToo
 }
 
 export const defaultOptions: Partial<Options> = {
+  bucketCount: 30,
   bucketOffset: 0,
 };
 
-export interface FieldConfig extends common.AxisConfig, common.HideableFieldConfig {
+export interface FieldConfig extends common.AxisConfig, common.HideableFieldConfig, common.StackableFieldConfig {
   /**
    * Controls the fill opacity of the bars.
    */
diff --git a/public/app/plugins/panel/histogram/plugin.json b/public/app/plugins/panel/histogram/plugin.json
index a8f5500d40b5c..f778c4dacf537 100644
--- a/public/app/plugins/panel/histogram/plugin.json
+++ b/public/app/plugins/panel/histogram/plugin.json
@@ -4,6 +4,8 @@
   "id": "histogram",
 
   "info": {
+    "description": "Distribution of values presented as a bar chart.",
+    "keywords": ["distribution", "bar chart", "frequency", "proportional"],
     "author": {
       "name": "Grafana Labs",
       "url": "https://grafana.com"
diff --git a/public/app/plugins/panel/live/LiveChannelEditor.tsx b/public/app/plugins/panel/live/LiveChannelEditor.tsx
index 02a49f6974d3e..1252d48debdba 100644
--- a/public/app/plugins/panel/live/LiveChannelEditor.tsx
+++ b/public/app/plugins/panel/live/LiveChannelEditor.tsx
@@ -1,5 +1,5 @@
 import { css } from '@emotion/css';
-import React, { PureComponent } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 
 import {
   LiveChannelScope,
@@ -7,9 +7,11 @@ import {
   SelectableValue,
   StandardEditorProps,
   GrafanaTheme2,
+  parseLiveChannelAddress,
 } from '@grafana/data';
 import { Select, Alert, Label, stylesFactory } from '@grafana/ui';
 import { config } from 'app/core/config';
+import { getManagedChannelInfo } from 'app/features/live/info';
 
 import { LivePanelOptions } from './types';
 
@@ -19,39 +21,54 @@ const scopes: Array<SelectableValue<LiveChannelScope>> = [
   { label: 'Grafana', value: LiveChannelScope.Grafana, description: 'Core grafana live features' },
   { label: 'Data Sources', value: LiveChannelScope.DataSource, description: 'Data sources with live support' },
   { label: 'Plugins', value: LiveChannelScope.Plugin, description: 'Plugins with live support' },
+  { label: 'Stream', value: LiveChannelScope.Stream, description: 'data streams (eg, influx style)' },
 ];
 
-interface State {
-  namespaces: Array<SelectableValue<string>>;
-  paths: Array<SelectableValue<string>>;
-}
-
-export class LiveChannelEditor extends PureComponent<Props, State> {
-  state: State = {
-    namespaces: [],
-    paths: [],
-  };
-
-  async componentDidMount() {
-    this.updateSelectOptions();
-  }
-
-  async componentDidUpdate(oldProps: Props) {
-    if (this.props.value !== oldProps.value) {
-      this.updateSelectOptions();
+export function LiveChannelEditor(props: Props) {
+  const [channels, setChannels] = useState<Array<SelectableValue<string>>>([]);
+  const [namespaces, paths] = useMemo(() => {
+    const namespaces: Array<SelectableValue<string>> = [];
+    const paths: Array<SelectableValue<string>> = [];
+    const scope = props.value.scope;
+    const namespace = props.value.namespace;
+    if (!scope?.length) {
+      return [namespaces, paths];
     }
-  }
+    const used: Record<string, boolean> = {};
+
+    for (let channel of channels) {
+      const addr = parseLiveChannelAddress(channel.value);
+      if (!addr || addr.scope !== scope) {
+        continue;
+      }
+
+      if (!used[addr.namespace]) {
+        namespaces.push({
+          value: addr.namespace,
+          label: addr.namespace,
+        });
+        used[addr.namespace] = true;
+      }
+
+      if (namespace?.length && namespace === addr.namespace) {
+        paths.push({
+          ...channel,
+          value: addr.path,
+        });
+      }
+    }
+    return [namespaces, paths];
+  }, [channels, props.value.scope, props.value.namespace]);
 
-  async updateSelectOptions() {
-    this.setState({
-      namespaces: [],
-      paths: [],
+  useEffect(() => {
+    getManagedChannelInfo().then((v) => {
+      setChannels(v.channels);
     });
-  }
+  }, [props.value.scope]);
 
-  onScopeChanged = (v: SelectableValue<LiveChannelScope>) => {
+  const onScopeChanged = (v: SelectableValue<LiveChannelScope>) => {
     if (v.value) {
-      this.props.onChange({
+      props.onChange({
         scope: v.value,
         namespace: undefined,
         path: undefined,
@@ -59,73 +76,72 @@ export class LiveChannelEditor extends PureComponent<Props, State> {
     }
   };
 
-  onNamespaceChanged = (v: SelectableValue<string>) => {
-    this.props.onChange({
-      scope: this.props.value?.scope,
-      namespace: v.value,
+  const onNamespaceChanged = (v: SelectableValue<string>) => {
+    props.onChange({
+      scope: props.value?.scope,
+      namespace: v?.value,
       path: undefined,
     });
   };
 
-  onPathChanged = (v: SelectableValue<string>) => {
-    const { value, onChange } = this.props;
+  const onPathChanged = (v: SelectableValue<string>) => {
+    const { value, onChange } = props;
     onChange({
       scope: value.scope,
       namespace: value.namespace,
-      path: v.value,
+      path: v?.value,
     });
   };
 
-  render() {
-    const { namespaces, paths } = this.state;
-    const { scope, namespace, path } = this.props.value;
-    const style = getStyles(config.theme2);
+  const { scope, namespace, path } = props.value;
+  const style = getStyles(config.theme2);
+
+  return (
+    <>
+      <Alert title="Grafana Live" severity="info">
+        This supports real-time event streams in grafana core. This feature is under heavy development. Expect the
+        intefaces and structures to change as this becomes more production ready.
+      </Alert>
 
-    return (
-      <>
-        <Alert title="Grafana Live" severity="info">
-          This supports real-time event streams in grafana core. This feature is under heavy development. Expect the
-          intefaces and structures to change as this becomes more production ready.
-        </Alert>
+      <div>
+        <div className={style.dropWrap}>
+          <Label>Scope</Label>
+          <Select options={scopes} value={scopes.find((s) => s.value === scope)} onChange={onScopeChanged} />
+        </div>
 
-        <div>
+        {scope && (
           <div className={style.dropWrap}>
-            <Label>Scope</Label>
-            <Select options={scopes} value={scopes.find((s) => s.value === scope)} onChange={this.onScopeChanged} />
+            <Label>Namespace</Label>
+            <Select
+              options={namespaces}
+              value={
+                namespaces.find((s) => s.value === namespace) ??
+                (namespace ? { label: namespace, value: namespace } : undefined)
+              }
+              onChange={onNamespaceChanged}
+              allowCustomValue={true}
+              backspaceRemovesValue={true}
+              isClearable={true}
+            />
           </div>
+        )}
 
-          {scope && (
-            <div className={style.dropWrap}>
-              <Label>Namespace</Label>
-              <Select
-                options={namespaces}
-                value={
-                  namespaces.find((s) => s.value === namespace) ??
-                  (namespace ? { label: namespace, value: namespace } : undefined)
-                }
-                onChange={this.onNamespaceChanged}
-                allowCustomValue={true}
-                backspaceRemovesValue={true}
-              />
-            </div>
-          )}
-
-          {scope && namespace && (
-            <div className={style.dropWrap}>
-              <Label>Path</Label>
-              <Select
-                options={paths}
-                value={findPathOption(paths, path)}
-                onChange={this.onPathChanged}
-                allowCustomValue={true}
-                backspaceRemovesValue={true}
-              />
-            </div>
-          )}
-        </div>
-      </>
-    );
-  }
+        {scope && namespace && (
+          <div className={style.dropWrap}>
+            <Label>Path</Label>
+            <Select
+              options={paths}
+              value={findPathOption(paths, path)}
+              onChange={onPathChanged}
+              allowCustomValue={true}
+              backspaceRemovesValue={true}
+              isClearable={true}
+            />
+          </div>
+        )}
+      </div>
+    </>
+  );
 }
 
 function findPathOption(paths: Array<SelectableValue<string>>, path?: string): SelectableValue<string> | undefined {
diff --git a/public/app/plugins/panel/live/LivePanel.tsx b/public/app/plugins/panel/live/LivePanel.tsx
index ed9f0b48ecb3a..7bb237d0a115e 100644
--- a/public/app/plugins/panel/live/LivePanel.tsx
+++ b/public/app/plugins/panel/live/LivePanel.tsx
@@ -19,11 +19,12 @@ import {
   StreamingDataFrame,
 } from '@grafana/data';
 import { config, getGrafanaLiveSrv } from '@grafana/runtime';
-import { Alert, stylesFactory, Button, JSONFormatter, CustomScrollbar, CodeEditor } from '@grafana/ui';
+import { Alert, stylesFactory, JSONFormatter, CustomScrollbar } from '@grafana/ui';
 
 import { TablePanel } from '../table/TablePanel';
 
-import { LivePanelOptions, MessageDisplayMode } from './types';
+import { LivePublish } from './LivePublish';
+import { LivePanelOptions, MessageDisplayMode, MessagePublishMode } from './types';
 
 interface Props extends PanelProps<LivePanelOptions> {}
 
@@ -133,34 +134,6 @@ export class LivePanel extends PureComponent<Props, State> {
     );
   }
 
-  onSaveJSON = (text: string) => {
-    const { options, onOptionsChange } = this.props;
-
-    try {
-      const json = JSON.parse(text);
-      onOptionsChange({ ...options, json });
-    } catch (err) {
-      console.log('Error reading JSON', err);
-    }
-  };
-
-  onPublishClicked = async () => {
-    const { addr } = this.state;
-    if (!addr) {
-      console.log('invalid address');
-      return;
-    }
-
-    const data = this.props.options?.json;
-    if (!data) {
-      console.log('nothing to publish');
-      return;
-    }
-
-    const rsp = await getGrafanaLiveSrv().publish(addr, data);
-    console.log('onPublishClicked (response from publish)', rsp);
-  };
-
   renderMessage(height: number) {
     const { options } = this.props;
     const { message } = this.state;
@@ -174,11 +147,11 @@ export class LivePanel extends PureComponent<Props, State> {
       );
     }
 
-    if (options.message === MessageDisplayMode.JSON) {
+    if (options.display === MessageDisplayMode.JSON) {
       return <JSONFormatter json={message} open={5} />;
     }
 
-    if (options.message === MessageDisplayMode.Auto) {
+    if (options.display === MessageDisplayMode.Auto) {
       if (message instanceof StreamingDataFrame) {
         const data: PanelData = {
           series: applyFieldOverrides({
@@ -206,20 +179,13 @@ export class LivePanel extends PureComponent<Props, State> {
   renderPublish(height: number) {
     const { options } = this.props;
     return (
-      <>
-        <CodeEditor
-          height={height - 32}
-          language="json"
-          value={options.json ? JSON.stringify(options.json, null, 2) : '{ }'}
-          onBlur={this.onSaveJSON}
-          onSave={this.onSaveJSON}
-          showMiniMap={false}
-          showLineNumbers={true}
-        />
-        <div style={{ height: 32 }}>
-          <Button onClick={this.onPublishClicked}>Publish</Button>
-        </div>
-      </>
+      <LivePublish
+        height={height}
+        body={options.message}
+        mode={options.publish ?? MessagePublishMode.JSON}
+        onSave={(message) => this.props.onOptionsChange({ ...options, message })}
+        addr={this.state.addr}
+      />
     );
   }
 
@@ -239,12 +205,13 @@ export class LivePanel extends PureComponent<Props, State> {
   renderBody() {
     const { status } = this.state;
     const { options, height } = this.props;
+    const publish = options.publish === MessagePublishMode.JSON || options.publish === MessagePublishMode.Influx;
 
-    if (options.publish) {
-      // Only the publish form
-      if (options.message === MessageDisplayMode.None) {
-        return <div>{this.renderPublish(height)}</div>;
+    if (publish) {
+      if (options.display === MessageDisplayMode.None) {
+        return this.renderPublish(height);
       }
+
       // Both message and publish
       const halfHeight = height / 2;
       return (
@@ -258,7 +225,7 @@ export class LivePanel extends PureComponent<Props, State> {
         </div>
       );
     }
-    if (options.message === MessageDisplayMode.None) {
+    if (options.display === MessageDisplayMode.None) {
       return <pre>{JSON.stringify(status)}</pre>;
     }
 
diff --git a/public/app/plugins/panel/live/LivePublish.tsx b/public/app/plugins/panel/live/LivePublish.tsx
new file mode 100644
index 0000000000000..6d7e8b148ff1e
--- /dev/null
+++ b/public/app/plugins/panel/live/LivePublish.tsx
@@ -0,0 +1,67 @@
+import React, { useMemo } from 'react';
+
+import { LiveChannelAddress, isValidLiveChannelAddress } from '@grafana/data';
+import { getBackendSrv, getGrafanaLiveSrv } from '@grafana/runtime';
+import { CodeEditor, Button } from '@grafana/ui';
+
+import { MessagePublishMode } from './types';
+
+interface Props {
+  height: number;
+  addr?: LiveChannelAddress;
+  mode: MessagePublishMode;
+  body?: string | object;
+  onSave: (v: string | object) => void;
+}
+
+export function LivePublish({ height, mode, body, addr, onSave }: Props) {
+  const txt = useMemo(() => {
+    if (mode === MessagePublishMode.JSON) {
+      return body ? JSON.stringify(body, null, 2) : '{ }';
+    }
+    return body == null ? '' : `${body}`;
+  }, [mode, body]);
+
+  const doSave = (v: string) => {
+    if (mode === MessagePublishMode.JSON) {
+      onSave(JSON.parse(v));
+    } else {
+      onSave(v);
+    }
+  };
+
+  const onPublishClicked = async () => {
+    if (mode === MessagePublishMode.Influx) {
+      if (addr?.scope !== 'stream') {
+        alert('expected stream scope!');
+        return;
+      }
+      return getBackendSrv().post(`api/live/push/${addr.namespace}`, body);
+    }
+
+    if (!isValidLiveChannelAddress(addr)) {
+      alert('invalid address');
+      return;
+    }
+
+    const rsp = await getGrafanaLiveSrv().publish(addr, body);
+    console.log('onPublishClicked (response from publish)', rsp);
+  };
+
+  return (
+    <>
+      <CodeEditor
+        height={height - 32}
+        language={mode === MessagePublishMode.JSON ? 'json' : 'text'}
+        value={txt}
+        onBlur={doSave}
+        onSave={doSave}
+        showMiniMap={false}
+        showLineNumbers={true}
+      />
+      <div style={{ height: 32 }}>
+        <Button onClick={onPublishClicked}>Publish</Button>
+      </div>
+    </>
+  );
+}
diff --git a/public/app/plugins/panel/live/module.tsx b/public/app/plugins/panel/live/module.tsx
index 596083f450cfe..e77d6c3fa18d6 100644
--- a/public/app/plugins/panel/live/module.tsx
+++ b/public/app/plugins/panel/live/module.tsx
@@ -2,7 +2,7 @@ import { PanelPlugin } from '@grafana/data';
 
 import { LiveChannelEditor } from './LiveChannelEditor';
 import { LivePanel } from './LivePanel';
-import { LivePanelOptions, MessageDisplayMode } from './types';
+import { LivePanelOptions, MessageDisplayMode, MessagePublishMode } from './types';
 
 export const plugin = new PanelPlugin<LivePanelOptions>(LivePanel).setPanelOptions((builder) => {
   builder.addCustomEditor({
@@ -16,7 +16,7 @@ export const plugin = new PanelPlugin<LivePanelOptions>(LivePanel).setPanelOptio
 
   builder
     .addRadio({
-      path: 'message',
+      path: 'display',
       name: 'Show Message',
       description: 'Display the last message received on this channel',
       settings: {
@@ -29,10 +29,17 @@ export const plugin = new PanelPlugin<LivePanelOptions>(LivePanel).setPanelOptio
       },
       defaultValue: MessageDisplayMode.JSON,
     })
-    .addBooleanSwitch({
+    .addRadio({
       path: 'publish',
-      name: 'Show Publish',
+      name: 'Publish',
       description: 'Display a form to publish values',
-      defaultValue: false,
+      settings: {
+        options: [
+          { value: MessagePublishMode.None, label: 'None' },
+          { value: MessagePublishMode.JSON, label: 'JSON' },
+          { value: MessagePublishMode.Influx, label: 'Influx' },
+        ],
+      },
+      defaultValue: MessagePublishMode.None,
     });
 });
diff --git a/public/app/plugins/panel/live/types.ts b/public/app/plugins/panel/live/types.ts
index a4aba607542de..abf0ce68bed8f 100644
--- a/public/app/plugins/panel/live/types.ts
+++ b/public/app/plugins/panel/live/types.ts
@@ -7,9 +7,15 @@ export enum MessageDisplayMode {
   None = 'none', // do not display
 }
 
+export enum MessagePublishMode {
+  None = 'none', // do not display
+  JSON = 'json', // formatted JSON
+  Influx = 'influx', // influx line protocol
+}
+
 export interface LivePanelOptions {
   channel?: LiveChannelAddress;
-  message?: MessageDisplayMode;
-  publish?: boolean;
-  json?: any; // object
+  display?: MessageDisplayMode;
+  publish?: MessagePublishMode;
+  message?: string | object; // likely JSON
 }
diff --git a/public/app/plugins/panel/logs/LogsPanel.test.tsx b/public/app/plugins/panel/logs/LogsPanel.test.tsx
index 0581c91629e9c..7c3fdbf0726c1 100644
--- a/public/app/plugins/panel/logs/LogsPanel.test.tsx
+++ b/public/app/plugins/panel/logs/LogsPanel.test.tsx
@@ -1,11 +1,52 @@
-import { render, screen } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React, { ComponentProps } from 'react';
+import { DatasourceSrvMock, MockDataSourceApi } from 'test/mocks/datasource_srv';
 
-import { LoadingState, createDataFrame, FieldType, LogsSortOrder } from '@grafana/data';
+import {
+  LoadingState,
+  createDataFrame,
+  FieldType,
+  LogsSortOrder,
+  CoreApp,
+  getDefaultTimeRange,
+  LogsDedupStrategy,
+  EventBusSrv,
+} from '@grafana/data';
+import * as styles from 'app/features/logs/components/getLogRowStyles';
+import { LogRowContextModal } from 'app/features/logs/components/log-context/LogRowContextModal';
 
 import { LogsPanel } from './LogsPanel';
 
 type LogsPanelProps = ComponentProps<typeof LogsPanel>;
+type LogRowContextModalProps = ComponentProps<typeof LogRowContextModal>;
+
+const logRowContextModalMock = jest.fn().mockReturnValue(<div>LogRowContextModal</div>);
+jest.mock('app/features/logs/components/log-context/LogRowContextModal', () => ({
+  LogRowContextModal: (props: LogRowContextModalProps) => logRowContextModalMock(props),
+}));
+
+const defaultDs = new MockDataSourceApi('default datasource', { data: ['default data'] });
+const noShowContextDs = new MockDataSourceApi('no-show-context');
+const showContextDs = new MockDataSourceApi('show-context') as MockDataSourceApi & { getLogRowContext: jest.Mock };
+
+const datasourceSrv = new DatasourceSrvMock(defaultDs, {
+  'no-show-context': noShowContextDs,
+  'show-context': showContextDs,
+});
+const getDataSourceSrvMock = jest.fn().mockReturnValue(datasourceSrv);
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getDataSourceSrv: () => getDataSourceSrvMock(),
+}));
+
+const hasLogsContextSupport = jest.fn().mockImplementation((ds) => {
+  return ds.name === 'show-context';
+});
+jest.mock('@grafana/data', () => ({
+  ...jest.requireActual('@grafana/data'),
+  hasLogsContextSupport: (ds: MockDataSourceApi) => hasLogsContextSupport(ds),
+}));
 
 describe('LogsPanel', () => {
   describe('when returned series include common labels', () => {
@@ -33,35 +74,37 @@ describe('LogsPanel', () => {
       }),
     ];
 
-    it('shows common labels when showCommonLabels is set to true', () => {
+    it('shows common labels when showCommonLabels is set to true', async () => {
       setup({ data: { series: seriesWithCommonLabels }, options: { showCommonLabels: true } });
 
-      expect(screen.getByText(/common labels:/i)).toBeInTheDocument();
-      expect(screen.getByText(/common_app/i)).toBeInTheDocument();
-      expect(screen.getByText(/common_job/i)).toBeInTheDocument();
+      expect(await screen.findByText(/common labels:/i)).toBeInTheDocument();
+      expect(await screen.findByText(/common_app/i)).toBeInTheDocument();
+      expect(await screen.findByText(/common_job/i)).toBeInTheDocument();
     });
-    it('shows common labels on top when descending sort order', () => {
+    it('shows common labels on top when descending sort order', async () => {
       const { container } = setup({
         data: { series: seriesWithCommonLabels },
         options: { showCommonLabels: true, sortOrder: LogsSortOrder.Descending },
       });
-
+      expect(await screen.findByText(/common labels:/i)).toBeInTheDocument();
       expect(container.firstChild?.childNodes[0].textContent).toMatch(/^Common labels:common_appcommon_job/);
     });
-    it('shows common labels on bottom when ascending sort order', () => {
+    it('shows common labels on bottom when ascending sort order', async () => {
       const { container } = setup({
         data: { series: seriesWithCommonLabels },
         options: { showCommonLabels: true, sortOrder: LogsSortOrder.Ascending },
       });
-
+      expect(await screen.findByText(/common labels:/i)).toBeInTheDocument();
       expect(container.firstChild?.childNodes[0].textContent).toMatch(/Common labels:common_appcommon_job$/);
     });
-    it('does not show common labels when showCommonLabels is set to false', () => {
+    it('does not show common labels when showCommonLabels is set to false', async () => {
       setup({ data: { series: seriesWithCommonLabels }, options: { showCommonLabels: false } });
 
-      expect(screen.queryByText(/common labels:/i)).not.toBeInTheDocument();
-      expect(screen.queryByText(/common_app/i)).not.toBeInTheDocument();
-      expect(screen.queryByText(/common_job/i)).not.toBeInTheDocument();
+      await waitFor(async () => {
+        expect(screen.queryByText(/common labels:/i)).toBeNull();
+        expect(screen.queryByText(/common_app/i)).toBeNull();
+        expect(screen.queryByText(/common_job/i)).toBeNull();
+      });
     });
   });
   describe('when returned series does not include common labels', () => {
@@ -84,26 +127,211 @@ describe('LogsPanel', () => {
         ],
       }),
     ];
-    it('shows (no common labels) when showCommonLabels is set to true', () => {
+    it('shows (no common labels) when showCommonLabels is set to true', async () => {
       setup({ data: { series: seriesWithoutCommonLabels }, options: { showCommonLabels: true } });
-      expect(screen.getByText(/common labels:/i)).toBeInTheDocument();
-      expect(screen.getByText(/(no common labels)/i)).toBeInTheDocument();
+
+      expect(await screen.findByText(/common labels:/i)).toBeInTheDocument();
+      expect(await screen.findByText(/(no common labels)/i)).toBeInTheDocument();
     });
-    it('does not show common labels when showCommonLabels is set to false', () => {
+    it('does not show common labels when showCommonLabels is set to false', async () => {
       setup({ data: { series: seriesWithoutCommonLabels }, options: { showCommonLabels: false } });
-      expect(screen.queryByText(/common labels:/i)).not.toBeInTheDocument();
-      expect(screen.queryByText(/(no common labels)/i)).not.toBeInTheDocument();
+      await waitFor(async () => {
+        expect(screen.queryByText(/common labels:/i)).toBeNull();
+        expect(screen.queryByText(/(no common labels)/i)).toBeNull();
+      });
+    });
+  });
+
+  describe('log context', () => {
+    const series = [
+      createDataFrame({
+        refId: 'A',
+        fields: [
+          {
+            name: 'time',
+            type: FieldType.time,
+            values: ['2019-04-26T09:28:11.352440161Z', '2019-04-26T14:42:50.991981292Z'],
+          },
+          {
+            name: 'message',
+            type: FieldType.string,
+            values: ['logline text'],
+            labels: {
+              app: 'common_app',
+              job: 'common_job',
+            },
+          },
+        ],
+      }),
+    ];
+
+    beforeEach(() => {
+      showContextDs.getLogRowContext = jest.fn().mockImplementation(() => {});
+    });
+
+    it('should not show the toggle if the datasource does not support show context', async () => {
+      setup({
+        data: {
+          series,
+          options: { showCommonLabels: false },
+          request: {
+            app: CoreApp.Dashboard,
+            targets: [{ refId: 'A', datasource: { uid: 'no-show-context' } }],
+          },
+        },
+      });
+
+      await waitFor(async () => {
+        await userEvent.hover(screen.getByText(/logline text/i));
+        expect(screen.queryByLabelText(/show context/i)).toBeNull();
+      });
+    });
+
+    it('should show the toggle if the datasource does support show context', async () => {
+      setup({
+        data: {
+          series,
+          options: { showCommonLabels: false },
+          request: {
+            app: CoreApp.Dashboard,
+            targets: [{ refId: 'A', datasource: { uid: 'show-context' } }],
+          },
+        },
+      });
+
+      await waitFor(async () => {
+        await userEvent.hover(screen.getByText(/logline text/i));
+        expect(screen.getByLabelText(/show context/i)).toBeInTheDocument();
+      });
+    });
+
+    it('should not show the toggle if the datasource does support show context but the app is not Dashboard', async () => {
+      setup({
+        data: {
+          series,
+          options: { showCommonLabels: false },
+          request: {
+            app: CoreApp.CloudAlerting,
+            targets: [{ refId: 'A', datasource: { uid: 'show-context' } }],
+          },
+        },
+      });
+
+      await waitFor(async () => {
+        await userEvent.hover(screen.getByText(/logline text/i));
+        expect(screen.queryByLabelText(/show context/i)).toBeNull();
+      });
+    });
+
+    it('should render the mocked `LogRowContextModal` after click', async () => {
+      setup({
+        data: {
+          series,
+          options: { showCommonLabels: false },
+          request: {
+            app: CoreApp.Dashboard,
+            targets: [{ refId: 'A', datasource: { uid: 'show-context' } }],
+          },
+        },
+      });
+      await waitFor(async () => {
+        await userEvent.hover(screen.getByText(/logline text/i));
+        await userEvent.click(screen.getByLabelText(/show context/i));
+        expect(screen.getByText(/LogRowContextModal/i)).toBeInTheDocument();
+      });
+    });
+
+    it('should call `getLogRowContext` if the user clicks the show context toggle', async () => {
+      setup({
+        data: {
+          series,
+          options: { showCommonLabels: false },
+          request: {
+            app: CoreApp.Dashboard,
+            targets: [{ refId: 'A', datasource: { uid: 'show-context' } }],
+          },
+        },
+      });
+      await waitFor(async () => {
+        await userEvent.hover(screen.getByText(/logline text/i));
+        await userEvent.click(screen.getByLabelText(/show context/i));
+
+        const getRowContextCb = logRowContextModalMock.mock.calls[0][0].getRowContext;
+        getRowContextCb();
+        expect(showContextDs.getLogRowContext).toBeCalled();
+      });
+    });
+  });
+
+  describe('Performance regressions', () => {
+    const series = [
+      createDataFrame({
+        refId: 'A',
+        fields: [
+          {
+            name: 'time',
+            type: FieldType.time,
+            values: ['2019-04-26T09:28:11.352440161Z'],
+          },
+          {
+            name: 'message',
+            type: FieldType.string,
+            values: ['logline text'],
+            labels: {
+              app: 'common_app',
+              job: 'common_job',
+            },
+          },
+        ],
+      }),
+    ];
+
+    beforeEach(() => {
+      /**
+       * For the lack of a better option, we spy on getLogRowStyles calls to count re-renders.
+       */
+      jest.spyOn(styles, 'getLogRowStyles');
+      jest.mocked(styles.getLogRowStyles).mockClear();
+    });
+
+    it('does not rerender without changes', async () => {
+      const { rerender, props } = setup({
+        data: {
+          series,
+        },
+      });
+
+      expect(await screen.findByRole('row')).toBeInTheDocument();
+
+      rerender(<LogsPanel {...props} />);
+
+      expect(await screen.findByRole('row')).toBeInTheDocument();
+      expect(styles.getLogRowStyles).toHaveBeenCalledTimes(3);
+    });
+
+    it('rerenders when prop changes', async () => {
+      const { rerender, props } = setup({
+        data: {
+          series,
+        },
+      });
+
+      expect(await screen.findByRole('row')).toBeInTheDocument();
+
+      rerender(<LogsPanel {...props} data={{ ...props.data, series: [...series] }} />);
+
+      expect(await screen.findByRole('row')).toBeInTheDocument();
+      expect(jest.mocked(styles.getLogRowStyles).mock.calls.length).toBeGreaterThan(3);
     });
   });
 });
 
 const setup = (propsOverrides?: {}) => {
-  const props = {
+  const props: LogsPanelProps = {
     data: {
       error: undefined,
       request: {
         panelId: 4,
-        dashboardId: 123,
         app: 'dashboard',
         requestId: 'A',
         timezone: 'browser',
@@ -111,17 +339,44 @@ const setup = (propsOverrides?: {}) => {
         intervalMs: 30000,
         maxDataPoints: 823,
         targets: [],
-        range: {},
+        range: getDefaultTimeRange(),
+        scopedVars: {},
+        startTime: 1,
       },
       series: [],
       state: LoadingState.Done,
+      timeRange: getDefaultTimeRange(),
     },
     timeZone: 'utc',
-    options: {},
+    timeRange: getDefaultTimeRange(),
+    options: {
+      showLabels: false,
+      showTime: false,
+      wrapLogMessage: false,
+      showCommonLabels: false,
+      prettifyLogMessage: false,
+      sortOrder: LogsSortOrder.Descending,
+      dedupStrategy: LogsDedupStrategy.none,
+      enableLogDetails: false,
+      showLogContextToggle: false,
+    },
     title: 'Logs panel',
     id: 1,
+    transparent: false,
+    width: 400,
+    height: 100,
+    renderCounter: 0,
+    fieldConfig: {
+      defaults: {},
+      overrides: [],
+    },
+    eventBus: new EventBusSrv(),
+    onOptionsChange: jest.fn(),
+    onFieldConfigChange: jest.fn(),
+    replaceVariables: jest.fn(),
+    onChangeTimeRange: jest.fn(),
     ...propsOverrides,
-  } as unknown as LogsPanelProps;
+  };
 
-  return render(<LogsPanel {...props} />);
+  return { ...render(<LogsPanel {...props} />), props };
 };
diff --git a/public/app/plugins/panel/logs/LogsPanel.tsx b/public/app/plugins/panel/logs/LogsPanel.tsx
index 31b22f07680a3..8069088e533cf 100644
--- a/public/app/plugins/panel/logs/LogsPanel.tsx
+++ b/public/app/plugins/panel/logs/LogsPanel.tsx
@@ -1,28 +1,43 @@
 import { css, cx } from '@emotion/css';
-import React, { useCallback, useMemo, useRef, useLayoutEffect, useState } from 'react';
+import React, { useCallback, useLayoutEffect, useMemo, useRef, useState } from 'react';
 
 import {
-  PanelProps,
+  CoreApp,
+  DataHoverClearEvent,
+  DataHoverEvent,
+  DataQueryResponse,
   Field,
-  Labels,
   GrafanaTheme2,
-  LogsSortOrder,
+  hasLogsContextSupport,
+  hasLogsContextUiSupport,
+  Labels,
+  LogRowContextOptions,
   LogRowModel,
-  DataHoverClearEvent,
-  DataHoverEvent,
-  CoreApp,
+  LogsSortOrder,
+  PanelProps,
+  TimeRange,
+  toUtc,
+  urlUtil,
 } from '@grafana/data';
-import { CustomScrollbar, useStyles2, usePanelContext } from '@grafana/ui';
+import { CustomScrollbar, usePanelContext, useStyles2 } from '@grafana/ui';
 import { getFieldLinksForExplore } from 'app/features/explore/utils/links';
+import { LogRowContextModal } from 'app/features/logs/components/log-context/LogRowContextModal';
 import { PanelDataErrorView } from 'app/features/panel/components/PanelDataErrorView';
 
+import { createAndCopyShortLink } from '../../../core/utils/shortLinks';
 import { LogLabels } from '../../../features/logs/components/LogLabels';
 import { LogRows } from '../../../features/logs/components/LogRows';
-import { dataFrameToLogsModel, dedupLogRows, COMMON_LABELS } from '../../../features/logs/logsModel';
+import { COMMON_LABELS, dataFrameToLogsModel, dedupLogRows } from '../../../features/logs/logsModel';
 
 import { Options } from './types';
+import { useDatasourcesFromTargets } from './useDatasourcesFromTargets';
 
 interface LogsPanelProps extends PanelProps<Options> {}
+interface LogsPermalinkUrlState {
+  logs?: {
+    id?: string;
+  };
+}
 
 export const LogsPanel = ({
   data,
@@ -37,14 +52,19 @@ export const LogsPanel = ({
     sortOrder,
     dedupStrategy,
     enableLogDetails,
+    showLogContextToggle,
   },
-  title,
   id,
 }: LogsPanelProps) => {
   const isAscending = sortOrder === LogsSortOrder.Ascending;
   const style = useStyles2(getStyles);
   const [scrollTop, setScrollTop] = useState(0);
   const logsContainerRef = useRef<HTMLDivElement>(null);
+  const [contextRow, setContextRow] = useState<LogRowModel | null>(null);
+  const timeRange = data.timeRange;
+  const dataSourcesMap = useDatasourcesFromTargets(data.request?.targets);
+  const [scrollElement, setScrollElement] = useState<HTMLDivElement | null>(null);
+  let closeCallback = useRef<() => void>();
 
   const { eventBus } = usePanelContext();
   const onLogRowHover = useCallback(
@@ -64,6 +84,101 @@ export const LogsPanel = ({
     [eventBus]
   );
 
+  const onCloseContext = useCallback(() => {
+    setContextRow(null);
+    if (closeCallback.current) {
+      closeCallback.current();
+    }
+  }, [closeCallback]);
+
+  const onOpenContext = useCallback(
+    (row: LogRowModel, onClose: () => void) => {
+      setContextRow(row);
+      closeCallback.current = onClose;
+    },
+    [closeCallback]
+  );
+
+  const onPermalinkClick = useCallback(
+    async (row: LogRowModel) => {
+      return await copyDashboardUrl(row, timeRange);
+    },
+    [timeRange]
+  );
+
+  const showContextToggle = useCallback(
+    (row: LogRowModel): boolean => {
+      if (
+        !row.dataFrame.refId ||
+        !dataSourcesMap ||
+        (!showLogContextToggle &&
+          data.request?.app !== CoreApp.Dashboard &&
+          data.request?.app !== CoreApp.PanelEditor &&
+          data.request?.app !== CoreApp.PanelViewer)
+      ) {
+        return false;
+      }
+
+      const dataSource = dataSourcesMap.get(row.dataFrame.refId);
+      return hasLogsContextSupport(dataSource);
+    },
+    [dataSourcesMap, showLogContextToggle, data.request?.app]
+  );
+
+  const showPermaLink = useCallback(() => {
+    return !(
+      data.request?.app !== CoreApp.Dashboard &&
+      data.request?.app !== CoreApp.PanelEditor &&
+      data.request?.app !== CoreApp.PanelViewer
+    );
+  }, [data.request?.app]);
+
+  const getLogRowContext = useCallback(
+    async (row: LogRowModel, origRow: LogRowModel, options: LogRowContextOptions): Promise<DataQueryResponse> => {
+      if (!origRow.dataFrame.refId || !dataSourcesMap) {
+        return Promise.resolve({ data: [] });
+      }
+
+      const query = data.request?.targets[0];
+      if (!query) {
+        return Promise.resolve({ data: [] });
+      }
+
+      const dataSource = dataSourcesMap.get(origRow.dataFrame.refId);
+      if (!hasLogsContextSupport(dataSource)) {
+        return Promise.resolve({ data: [] });
+      }
+
+      return dataSource.getLogRowContext(row, options, query);
+    },
+    [data.request?.targets, dataSourcesMap]
+  );
+
+  const getLogRowContextUi = useCallback(
+    (origRow: LogRowModel, runContextQuery?: () => void): React.ReactNode => {
+      if (!origRow.dataFrame.refId || !dataSourcesMap) {
+        return <></>;
+      }
+
+      const query = data.request?.targets[0];
+      if (!query) {
+        return <></>;
+      }
+
+      const dataSource = dataSourcesMap.get(origRow.dataFrame.refId);
+      if (!hasLogsContextUiSupport(dataSource)) {
+        return <></>;
+      }
+
+      if (!dataSource.getLogRowContextUi) {
+        return <></>;
+      }
+
+      return dataSource.getLogRowContextUi(origRow, runContextQuery, query);
+    },
+    [data.request?.targets, dataSourcesMap]
+  );
+
   // Important to memoize stuff here, as panel rerenders a lot for example when resizing.
   const [logRows, deduplicatedRows, commonLabels] = useMemo(() => {
     const logs = data
@@ -90,6 +205,19 @@ export const LogsPanel = ({
     [data]
   );
 
+  /**
+   * Scrolls the given row into view.
+   */
+  const scrollIntoView = useCallback(
+    (row: HTMLElement) => {
+      scrollElement?.scrollTo({
+        top: row.offsetTop,
+        behavior: 'smooth',
+      });
+    },
+    [scrollElement]
+  );
+
   if (!data || logRows.length === 0) {
     return <PanelDataErrorView fieldConfig={fieldConfig} panelId={id} data={data} needsStringField />;
   }
@@ -102,28 +230,51 @@ export const LogsPanel = ({
   );
 
   return (
-    <CustomScrollbar autoHide scrollTop={scrollTop}>
-      <div className={style.container} ref={logsContainerRef}>
-        {showCommonLabels && !isAscending && renderCommonLabels()}
-        <LogRows
-          logRows={logRows}
-          deduplicatedRows={deduplicatedRows}
-          dedupStrategy={dedupStrategy}
-          showLabels={showLabels}
-          showTime={showTime}
-          wrapLogMessage={wrapLogMessage}
-          prettifyLogMessage={prettifyLogMessage}
-          timeZone={timeZone}
-          getFieldLinks={getFieldLinks}
+    <>
+      {contextRow && (
+        <LogRowContextModal
+          open={contextRow !== null}
+          row={contextRow}
+          onClose={onCloseContext}
+          getRowContext={(row, options) => getLogRowContext(row, contextRow, options)}
           logsSortOrder={sortOrder}
-          enableLogDetails={enableLogDetails}
-          previewLimit={isAscending ? logRows.length : undefined}
-          onLogRowHover={onLogRowHover}
-          app={CoreApp.Dashboard}
+          timeZone={timeZone}
+          getLogRowContextUi={getLogRowContextUi}
         />
-        {showCommonLabels && isAscending && renderCommonLabels()}
-      </div>
-    </CustomScrollbar>
+      )}
+      <CustomScrollbar
+        autoHide
+        scrollTop={scrollTop}
+        scrollRefCallback={(scrollElement) => setScrollElement(scrollElement)}
+      >
+        <div className={style.container} ref={logsContainerRef}>
+          {showCommonLabels && !isAscending && renderCommonLabels()}
+          <LogRows
+            containerRendered={logsContainerRef.current !== null}
+            scrollIntoView={scrollIntoView}
+            permalinkedRowId={getLogsPanelState()?.logs?.id ?? undefined}
+            onPermalinkClick={showPermaLink() ? onPermalinkClick : undefined}
+            logRows={logRows}
+            showContextToggle={showContextToggle}
+            deduplicatedRows={deduplicatedRows}
+            dedupStrategy={dedupStrategy}
+            showLabels={showLabels}
+            showTime={showTime}
+            wrapLogMessage={wrapLogMessage}
+            prettifyLogMessage={prettifyLogMessage}
+            timeZone={timeZone}
+            getFieldLinks={getFieldLinks}
+            logsSortOrder={sortOrder}
+            enableLogDetails={enableLogDetails}
+            previewLimit={isAscending ? logRows.length : undefined}
+            onLogRowHover={onLogRowHover}
+            app={CoreApp.Dashboard}
+            onOpenContext={onOpenContext}
+          />
+          {showCommonLabels && isAscending && renderCommonLabels()}
+        </div>
+      </CustomScrollbar>
+    </>
   );
 };
 
@@ -145,3 +296,49 @@ const getStyles = (theme: GrafanaTheme2) => ({
     fontWeight: theme.typography.fontWeightMedium,
   }),
 });
+
+function getLogsPanelState(): LogsPermalinkUrlState | undefined {
+  const urlParams = urlUtil.getUrlSearchParams();
+  const panelStateEncoded = urlParams?.panelState;
+  if (
+    panelStateEncoded &&
+    Array.isArray(panelStateEncoded) &&
+    panelStateEncoded?.length > 0 &&
+    typeof panelStateEncoded[0] === 'string'
+  ) {
+    try {
+      return JSON.parse(panelStateEncoded[0]);
+    } catch (e) {
+      console.error('error parsing logsPanelState', e);
+    }
+  }
+
+  return undefined;
+}
+
+async function copyDashboardUrl(row: LogRowModel, timeRange: TimeRange) {
+  // this is an extra check, to be sure that we are not
+  // creating permalinks for logs without an id-field.
+  // normally it should never happen, because we do not
+  // display the permalink button in such cases.
+  if (row.rowId === undefined || !row.dataFrame.refId) {
+    return;
+  }
+
+  // get panel state, add log-row-id
+  const panelState = {
+    logs: { id: row.uid },
+  };
+
+  // Grab the current dashboard URL
+  const currentURL = new URL(window.location.href);
+
+  // Add panel state containing the rowId, and absolute time range from the current query, but leave everything else the same, if the user is in edit mode when grabbing the link, that's what will be linked to, etc.
+  currentURL.searchParams.set('panelState', JSON.stringify(panelState));
+  currentURL.searchParams.set('from', toUtc(timeRange.from).valueOf().toString(10));
+  currentURL.searchParams.set('to', toUtc(timeRange.to).valueOf().toString(10));
+
+  await createAndCopyShortLink(currentURL.toString());
+
+  return Promise.resolve();
+}
diff --git a/public/app/plugins/panel/logs/panelcfg.cue b/public/app/plugins/panel/logs/panelcfg.cue
index 5cac83ca9e6ef..fd3719ec65c76 100644
--- a/public/app/plugins/panel/logs/panelcfg.cue
+++ b/public/app/plugins/panel/logs/panelcfg.cue
@@ -26,14 +26,15 @@ composableKinds: PanelCfg: {
 			version: [0, 0]
 			schema: {
 				Options: {
-					showLabels:         bool
-					showCommonLabels:   bool
-					showTime:           bool
-					wrapLogMessage:     bool
-					prettifyLogMessage: bool
-					enableLogDetails:   bool
-					sortOrder:          common.LogsSortOrder
-					dedupStrategy:      common.LogsDedupStrategy
+					showLabels:           bool
+					showCommonLabels:     bool
+					showTime:             bool
+					showLogContextToggle: bool
+					wrapLogMessage:       bool
+					prettifyLogMessage:   bool
+					enableLogDetails:     bool
+					sortOrder:            common.LogsSortOrder
+					dedupStrategy:        common.LogsDedupStrategy
 				} @cuetsy(kind="interface")
 			}
 		}]
diff --git a/public/app/plugins/panel/logs/panelcfg.gen.ts b/public/app/plugins/panel/logs/panelcfg.gen.ts
index decbc6140a08c..62e8fc956ed55 100644
--- a/public/app/plugins/panel/logs/panelcfg.gen.ts
+++ b/public/app/plugins/panel/logs/panelcfg.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
@@ -16,6 +16,7 @@ export interface Options {
   prettifyLogMessage: boolean;
   showCommonLabels: boolean;
   showLabels: boolean;
+  showLogContextToggle: boolean;
   showTime: boolean;
   sortOrder: common.LogsSortOrder;
   wrapLogMessage: boolean;
diff --git a/public/app/plugins/panel/logs/useDatasourcesFromTargets.test.ts b/public/app/plugins/panel/logs/useDatasourcesFromTargets.test.ts
new file mode 100644
index 0000000000000..6c8f820fcb248
--- /dev/null
+++ b/public/app/plugins/panel/logs/useDatasourcesFromTargets.test.ts
@@ -0,0 +1,44 @@
+// CustomHook.test.js
+import { renderHook } from '@testing-library/react-hooks';
+import { MockDataSourceApi, DatasourceSrvMock } from 'test/mocks/datasource_srv';
+
+import { useDatasourcesFromTargets } from './useDatasourcesFromTargets'; // Update the path accordingly
+
+const defaultDs = new MockDataSourceApi('default datasource', { data: ['default data'] });
+const ds1 = new MockDataSourceApi('dataSource1');
+const ds2 = new MockDataSourceApi('dataSource2') as MockDataSourceApi;
+
+const datasourceSrv = new DatasourceSrvMock(defaultDs, {
+  dataSource1: ds1,
+  dataSource2: ds2,
+});
+const getDataSourceSrvMock = jest.fn().mockReturnValue(datasourceSrv);
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getDataSourceSrv: () => getDataSourceSrvMock(),
+}));
+
+describe('useDatasourcesFromTargets', () => {
+  it('returns an empty map when targets are not provided', async () => {
+    const { result, waitForNextUpdate } = renderHook(() => useDatasourcesFromTargets(undefined));
+
+    await waitForNextUpdate();
+
+    expect(result.current.size).toBe(0);
+  });
+
+  it('fetches and returns the data sources map', async () => {
+    const mockTargets = [
+      { refId: '1', datasource: { uid: 'dataSource1' } },
+      { refId: '2', datasource: { uid: 'dataSource2' } },
+    ];
+
+    const { result, waitForNextUpdate } = renderHook(() => useDatasourcesFromTargets(mockTargets));
+
+    await waitForNextUpdate();
+
+    expect(result.current.size).toBe(2);
+    expect(result.current.get('1')).toEqual(ds1);
+    expect(result.current.get('2')).toEqual(ds2);
+  });
+});
diff --git a/public/app/plugins/panel/logs/useDatasourcesFromTargets.ts b/public/app/plugins/panel/logs/useDatasourcesFromTargets.ts
new file mode 100644
index 0000000000000..91d72a4466f1a
--- /dev/null
+++ b/public/app/plugins/panel/logs/useDatasourcesFromTargets.ts
@@ -0,0 +1,31 @@
+import { useState } from 'react';
+import { useAsync } from 'react-use';
+
+import { DataSourceApi } from '@grafana/data';
+import { getDataSourceSrv } from '@grafana/runtime';
+import { DataQuery } from '@grafana/schema';
+
+export const useDatasourcesFromTargets = (targets: DataQuery[] | undefined): Map<string, DataSourceApi> => {
+  const [dataSourcesMap, setDataSourcesMap] = useState(new Map<string, DataSourceApi>());
+
+  useAsync(async () => {
+    if (!targets) {
+      setDataSourcesMap(new Map<string, DataSourceApi>());
+      return;
+    }
+
+    const raw = await Promise.all(
+      targets
+        .filter((target) => !!target.datasource?.uid)
+        .map((target) =>
+          getDataSourceSrv()
+            .get(target.datasource?.uid)
+            .then((ds) => ({ key: target.refId, ds }))
+        )
+    );
+
+    setDataSourcesMap(new Map<string, DataSourceApi>(raw.map(({ key, ds }) => [key, ds])));
+  }, [targets]);
+
+  return dataSourcesMap;
+};
diff --git a/public/app/plugins/panel/news/component/News.tsx b/public/app/plugins/panel/news/component/News.tsx
index 3395ff4b50e3e..c47f1d1ade7f2 100644
--- a/public/app/plugins/panel/news/component/News.tsx
+++ b/public/app/plugins/panel/news/component/News.tsx
@@ -1,8 +1,10 @@
 import { css, cx } from '@emotion/css';
 import React from 'react';
+import Skeleton from 'react-loading-skeleton';
 
 import { DataFrameView, GrafanaTheme2, textUtil, dateTimeFormat } from '@grafana/data';
 import { useStyles2 } from '@grafana/ui';
+import { attachSkeleton, SkeletonComponent } from '@grafana/ui/src/unstable';
 
 import { NewsItem } from '../types';
 
@@ -13,13 +15,14 @@ interface NewsItemProps {
   data: DataFrameView<NewsItem>;
 }
 
-export function News({ width, showImage, data, index }: NewsItemProps) {
+function NewsComponent({ width, showImage, data, index }: NewsItemProps) {
   const styles = useStyles2(getStyles);
   const useWideLayout = width > 600;
   const newsItem = data.get(index);
+  const titleId = encodeURI(newsItem.title);
 
   return (
-    <article className={cx(styles.item, useWideLayout && styles.itemWide)}>
+    <article aria-labelledby={titleId} className={cx(styles.item, useWideLayout && styles.itemWide)}>
       {showImage && newsItem.ogImage && (
         <a
           tabIndex={-1}
@@ -37,7 +40,9 @@ export function News({ width, showImage, data, index }: NewsItemProps) {
           {dateTimeFormat(newsItem.date, { format: 'MMM DD' })}{' '}
         </time>
         <a className={styles.link} href={textUtil.sanitizeUrl(newsItem.link)} target="_blank" rel="noopener noreferrer">
-          <h3 className={styles.title}>{newsItem.title}</h3>
+          <h3 className={styles.title} id={titleId}>
+            {newsItem.title}
+          </h3>
         </a>
         <div className={styles.content} dangerouslySetInnerHTML={{ __html: textUtil.sanitize(newsItem.content) }} />
       </div>
@@ -45,68 +50,97 @@ export function News({ width, showImage, data, index }: NewsItemProps) {
   );
 }
 
+const NewsSkeleton: SkeletonComponent<Pick<NewsItemProps, 'width' | 'showImage'>> = ({
+  width,
+  showImage,
+  rootProps,
+}) => {
+  const styles = useStyles2(getStyles);
+  const useWideLayout = width > 600;
+
+  return (
+    <div className={cx(styles.item, useWideLayout && styles.itemWide)} {...rootProps}>
+      {showImage && (
+        <Skeleton
+          containerClassName={cx(styles.socialImage, useWideLayout && styles.socialImageWide)}
+          width={useWideLayout ? '250px' : '100%'}
+          height={useWideLayout ? '150px' : width * 0.5}
+        />
+      )}
+      <div className={styles.body}>
+        <Skeleton containerClassName={styles.date} width={60} />
+        <Skeleton containerClassName={styles.title} width={250} />
+        <Skeleton containerClassName={styles.content} width="100%" count={6} />
+      </div>
+    </div>
+  );
+};
+
+export const News = attachSkeleton(NewsComponent, NewsSkeleton);
+
 const getStyles = (theme: GrafanaTheme2) => ({
-  container: css`
-    height: 100%;
-  `,
-  item: css`
-    display: flex;
-    padding: ${theme.spacing(1)};
-    position: relative;
-    margin-bottom: 4px;
-    margin-right: ${theme.spacing(1)};
-    border-bottom: 2px solid ${theme.colors.border.weak};
-    background: ${theme.colors.background.primary};
-    flex-direction: column;
-    flex-shrink: 0;
-  `,
-  itemWide: css`
-    flex-direction: row;
-  `,
-  body: css`
-    display: flex;
-    flex-direction: column;
-  `,
-  socialImage: css`
-    display: flex;
-    align-items: center;
-    margin-bottom: ${theme.spacing(1)};
-    > img {
-      width: 100%;
-      border-radius: ${theme.shape.radius.default} ${theme.shape.radius.default} 0 0;
-    }
-  `,
-  socialImageWide: css`
-    margin-right: ${theme.spacing(2)};
-    margin-bottom: 0;
-    > img {
-      width: 250px;
-      border-radius: ${theme.shape.radius.default};
-    }
-  `,
-  link: css`
-    color: ${theme.colors.text.link};
-    display: inline-block;
+  container: css({
+    height: '100%',
+  }),
+  item: css({
+    display: 'flex',
+    padding: theme.spacing(1),
+    position: 'relative',
+    marginBottom: theme.spacing(0.5),
+    marginRight: theme.spacing(1),
+    borderBottom: `2px solid ${theme.colors.border.weak}`,
+    background: theme.colors.background.primary,
+    flexDirection: 'column',
+    flexShrink: 0,
+  }),
+  itemWide: css({
+    flexDirection: 'row',
+  }),
+  body: css({
+    display: 'flex',
+    flexDirection: 'column',
+    flex: 1,
+  }),
+  socialImage: css({
+    display: 'flex',
+    alignItems: 'center',
+    marginBottom: theme.spacing(1),
+    '> img': {
+      width: '100%',
+      borderRadius: `${theme.shape.radius.default} ${theme.shape.radius.default} 0 0`,
+    },
+  }),
+  socialImageWide: css({
+    marginRight: theme.spacing(2),
+    marginBottom: 0,
+    '> img': {
+      width: '250px',
+      borderRadius: theme.shape.radius.default,
+    },
+  }),
+  link: css({
+    color: theme.colors.text.link,
+    display: 'inline-block',
 
-    &:hover {
-      color: ${theme.colors.text.link};
-      text-decoration: underline;
-    }
-  `,
-  title: css`
-    font-size: 16px;
-    margin-bottom: ${theme.spacing(0.5)};
-  `,
-  content: css`
-    p {
-      margin-bottom: 4px;
-      color: ${theme.colors.text};
-    }
-  `,
-  date: css`
-    margin-bottom: ${theme.spacing(0.5)};
-    font-weight: 500;
-    border-radius: 0 0 0 ${theme.shape.radius.default};
-    color: ${theme.colors.text.secondary};
-  `,
+    '&:hover': {
+      color: theme.colors.text.link,
+      textDecoration: 'underline',
+    },
+  }),
+  title: css({
+    fontSize: '16px',
+    marginBottom: theme.spacing(0.5),
+  }),
+  content: css({
+    p: {
+      marginBottom: theme.spacing(0.5),
+      color: theme.colors.text.primary,
+    },
+  }),
+  date: css({
+    marginBottom: theme.spacing(0.5),
+    fontWeight: 500,
+    borderRadius: `0 0 0 ${theme.shape.radius.default}`,
+    color: theme.colors.text.secondary,
+  }),
 });
diff --git a/public/app/plugins/panel/news/panelcfg.gen.ts b/public/app/plugins/panel/news/panelcfg.gen.ts
index 8475aaa2f4ea9..d9e19537df4b7 100644
--- a/public/app/plugins/panel/news/panelcfg.gen.ts
+++ b/public/app/plugins/panel/news/panelcfg.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/public/app/plugins/panel/nodeGraph/Edge.tsx b/public/app/plugins/panel/nodeGraph/Edge.tsx
index b31c49be490cc..b80a22d71d7bc 100644
--- a/public/app/plugins/panel/nodeGraph/Edge.tsx
+++ b/public/app/plugins/panel/nodeGraph/Edge.tsx
@@ -5,19 +5,20 @@ import { computeNodeCircumferenceStrokeWidth, nodeR } from './Node';
 import { EdgeDatum, NodeDatum } from './types';
 import { shortenLine } from './utils';
 
-export const highlightedEdgeColor = '#a00';
+export const defaultHighlightedEdgeColor = '#a00';
 export const defaultEdgeColor = '#999';
 
 interface Props {
   edge: EdgeDatum;
   hovering: boolean;
+  svgIdNamespace: string;
   onClick: (event: MouseEvent<SVGElement>, link: EdgeDatum) => void;
   onMouseEnter: (id: string) => void;
   onMouseLeave: (id: string) => void;
 }
 
 export const Edge = memo(function Edge(props: Props) {
-  const { edge, onClick, onMouseEnter, onMouseLeave, hovering } = props;
+  const { edge, onClick, onMouseEnter, onMouseLeave, hovering, svgIdNamespace } = props;
 
   // Not great typing but after we do layout these properties are full objects not just references
   const { source, target, sourceNodeRadius, targetNodeRadius } = edge as {
@@ -41,12 +42,18 @@ export const Edge = memo(function Edge(props: Props) {
     arrowHeadHeight
   );
 
-  const markerId = `triangle-${edge.id}`;
-  const coloredMarkerId = `triangle-colored-${edge.id}`;
+  const edgeColor = edge.color || defaultEdgeColor;
+
+  // @deprecated -- until 'highlighted' is removed we'll prioritize 'color'
+  // in case both are provided
+  const highlightedEdgeColor = edge.color || defaultHighlightedEdgeColor;
+
+  const markerId = `triangle-${svgIdNamespace}-${edge.id}`;
+  const coloredMarkerId = `triangle-colored-${svgIdNamespace}-${edge.id}`;
 
   return (
     <>
-      <EdgeArrowMarker id={markerId} headHeight={arrowHeadHeight} />
+      <EdgeArrowMarker id={markerId} fill={edgeColor} headHeight={arrowHeadHeight} />
       <EdgeArrowMarker id={coloredMarkerId} fill={highlightedEdgeColor} headHeight={arrowHeadHeight} />
       <g
         onClick={(event) => onClick(event, edge)}
@@ -55,11 +62,12 @@ export const Edge = memo(function Edge(props: Props) {
       >
         <line
           strokeWidth={(hovering ? 1 : 0) + (edge.highlighted ? 1 : 0) + edge.thickness}
-          stroke={edge.highlighted ? highlightedEdgeColor : defaultEdgeColor}
+          stroke={edge.highlighted ? highlightedEdgeColor : edgeColor}
           x1={line.x1}
           y1={line.y1}
           x2={line.x2}
           y2={line.y2}
+          strokeDasharray={edge.strokeDasharray}
           markerEnd={`url(#${edge.highlighted ? coloredMarkerId : markerId})`}
         />
         <line
diff --git a/public/app/plugins/panel/nodeGraph/Legend.test.tsx b/public/app/plugins/panel/nodeGraph/Legend.test.tsx
index 831983305a64f..d0e3e6699eda3 100644
--- a/public/app/plugins/panel/nodeGraph/Legend.test.tsx
+++ b/public/app/plugins/panel/nodeGraph/Legend.test.tsx
@@ -21,10 +21,10 @@ describe('Legend', () => {
       },
     ] as NodeDatum[];
     render(<Legend nodes={nodes} onSort={(sort) => {}} sortable={false} />);
-    const items = screen.getAllByLabelText(/VizLegend series/);
+    const items = screen.getAllByTestId(/VizLegend series/);
     expect(items.length).toBe(3);
 
-    const item = screen.getByLabelText(/VizLegend series error/);
+    const item = screen.getByTestId(/VizLegend series error/);
     expect((item.firstChild as HTMLDivElement).style.getPropertyValue('background')).toBe('rgb(242, 73, 92)');
   });
 });
diff --git a/public/app/plugins/panel/nodeGraph/NodeGraph.tsx b/public/app/plugins/panel/nodeGraph/NodeGraph.tsx
index ccd14fd12b3c3..d49e9edb8ebc9 100644
--- a/public/app/plugins/panel/nodeGraph/NodeGraph.tsx
+++ b/public/app/plugins/panel/nodeGraph/NodeGraph.tsx
@@ -111,8 +111,9 @@ interface Props {
   dataFrames: DataFrame[];
   getLinks: (dataFrame: DataFrame, rowIndex: number) => LinkModel[];
   nodeLimit?: number;
+  panelId?: string;
 }
-export function NodeGraph({ getLinks, dataFrames, nodeLimit }: Props) {
+export function NodeGraph({ getLinks, dataFrames, nodeLimit, panelId }: Props) {
   const nodeCountLimit = nodeLimit || defaultNodeCountLimit;
   const { edges: edgesDataFrames, nodes: nodesDataFrames } = useCategorizeFrames(dataFrames);
 
@@ -122,6 +123,13 @@ export function NodeGraph({ getLinks, dataFrames, nodeLimit }: Props) {
   const firstNodesDataFrame = nodesDataFrames[0];
   const firstEdgesDataFrame = edgesDataFrames[0];
 
+  // Ensure we use unique IDs for the marker tip elements, since IDs are global
+  // in the entire HTML document. This prevents hidden tips when an earlier
+  // occurence is hidden (editor is open in front of an existing node graph
+  // panel) or when the earlier tips have different properties (color, size, or
+  // shape for example).
+  const svgIdNamespace = panelId || 'nodegraphpanel';
+
   // TODO we should be able to allow multiple dataframes for both edges and nodes, could be issue with node ids which in
   //  that case should be unique or figure a way to link edges and nodes dataframes together.
   const processed = useMemo(
@@ -215,6 +223,7 @@ export function NodeGraph({ getLinks, dataFrames, nodeLimit }: Props) {
                 onClick={onEdgeOpen}
                 onMouseEnter={setEdgeHover}
                 onMouseLeave={clearEdgeHover}
+                svgIdNamespace={svgIdNamespace}
               />
             )}
             <Nodes
@@ -305,8 +314,8 @@ const Nodes = memo(function Nodes(props: NodesProps) {
             !props.hoveringIds || props.hoveringIds.length === 0
               ? 'default'
               : props.hoveringIds?.includes(n.id)
-              ? 'active'
-              : 'inactive'
+                ? 'active'
+                : 'inactive'
           }
         />
       ))}
@@ -332,6 +341,7 @@ interface EdgesProps {
   edges: EdgeDatum[];
   nodeHoveringId?: string;
   edgeHoveringId?: string;
+  svgIdNamespace: string;
   onClick: (event: MouseEvent<SVGElement>, link: EdgeDatum) => void;
   onMouseEnter: (id: string) => void;
   onMouseLeave: (id: string) => void;
@@ -351,6 +361,7 @@ const Edges = memo(function Edges(props: EdgesProps) {
           onClick={props.onClick}
           onMouseEnter={props.onMouseEnter}
           onMouseLeave={props.onMouseLeave}
+          svgIdNamespace={props.svgIdNamespace}
         />
       ))}
     </>
diff --git a/public/app/plugins/panel/nodeGraph/NodeGraphPanel.tsx b/public/app/plugins/panel/nodeGraph/NodeGraphPanel.tsx
index c1f256dda5209..feb7e18e1609c 100644
--- a/public/app/plugins/panel/nodeGraph/NodeGraphPanel.tsx
+++ b/public/app/plugins/panel/nodeGraph/NodeGraphPanel.tsx
@@ -1,5 +1,5 @@
 import memoizeOne from 'memoize-one';
-import React from 'react';
+import React, { useId } from 'react';
 
 import { PanelProps } from '@grafana/data';
 
@@ -11,6 +11,8 @@ import { getNodeGraphDataFrames } from './utils';
 
 export const NodeGraphPanel = ({ width, height, data, options }: PanelProps<NodeGraphOptions>) => {
   const getLinks = useLinks(data.timeRange);
+  const panelId = useId();
+
   if (!data || !data.series.length) {
     return (
       <div className="panel-empty">
@@ -22,7 +24,11 @@ export const NodeGraphPanel = ({ width, height, data, options }: PanelProps<Node
   const memoizedGetNodeGraphDataFrames = memoizeOne(getNodeGraphDataFrames);
   return (
     <div style={{ width, height }}>
-      <NodeGraph dataFrames={memoizedGetNodeGraphDataFrames(data.series, options)} getLinks={getLinks} />
+      <NodeGraph
+        dataFrames={memoizedGetNodeGraphDataFrames(data.series, options)}
+        getLinks={getLinks}
+        panelId={panelId}
+      />
     </div>
   );
 };
diff --git a/public/app/plugins/panel/nodeGraph/createLayoutWorker.ts b/public/app/plugins/panel/nodeGraph/createLayoutWorker.ts
index 1aa1f1e908360..d0fef044dac3f 100644
--- a/public/app/plugins/panel/nodeGraph/createLayoutWorker.ts
+++ b/public/app/plugins/panel/nodeGraph/createLayoutWorker.ts
@@ -1,3 +1,4 @@
 import { CorsWorker as Worker } from 'app/core/utils/CorsWorker';
 
 export const createWorker = () => new Worker(new URL('./layout.worker.js', import.meta.url));
+export const createMsaglWorker = () => new Worker(new URL('./layoutLayered.worker.js', import.meta.url));
diff --git a/public/app/plugins/panel/nodeGraph/editor/ArcOptionsEditor.tsx b/public/app/plugins/panel/nodeGraph/editor/ArcOptionsEditor.tsx
index 11b726a2bb64d..1e4427cc398ea 100644
--- a/public/app/plugins/panel/nodeGraph/editor/ArcOptionsEditor.tsx
+++ b/public/app/plugins/panel/nodeGraph/editor/ArcOptionsEditor.tsx
@@ -47,7 +47,6 @@ export const ArcOptionsEditor = ({ value, onChange, context }: ArcOptionsEditorP
                 },
                 id: `arc-field-${i}`,
                 name: `arc-field-${i}`,
-                editor: () => null,
               }}
             />
             <ColorPicker
diff --git a/public/app/plugins/panel/nodeGraph/forceLayout.js b/public/app/plugins/panel/nodeGraph/forceLayout.js
new file mode 100644
index 0000000000000..9c30af6a1ab9d
--- /dev/null
+++ b/public/app/plugins/panel/nodeGraph/forceLayout.js
@@ -0,0 +1,174 @@
+// This file is a workaround so the layout function can be imported in Jest mocks. If the jest mock imports the
+// layout.worker.js file it will attach the eventlistener and then call the layout function with undefined data
+// which causes tests to fail.
+
+import { forceSimulation, forceLink, forceCollide, forceX } from 'd3-force';
+
+/**
+ * Use d3 force layout to lay the nodes in a sensible way. This function modifies the nodes adding the x,y positions
+ * and also fills in node references in edges instead of node ids.
+ */
+export function layout(nodes, edges, config) {
+  // Start with some hardcoded positions so it starts laid out from left to right
+  let { roots, secondLevelRoots } = initializePositions(nodes, edges);
+
+  // There always seems to be one or more root nodes each with single edge and we want to have them static on the
+  // left neatly in something like grid layout
+  [...roots, ...secondLevelRoots].forEach((n, index) => {
+    n.fx = n.x;
+  });
+
+  const simulation = forceSimulation(nodes)
+    .force(
+      'link',
+      forceLink(edges)
+        .id((d) => d.id)
+        .distance(config.linkDistance)
+        .strength(config.linkStrength)
+    )
+    // to keep the left to right layout we add force that pulls all nodes to right but because roots are fixed it will
+    // apply only to non root nodes
+    .force('x', forceX(config.forceX).strength(config.forceXStrength))
+    // Make sure nodes don't overlap
+    .force('collide', forceCollide(config.forceCollide));
+
+  // 300 ticks for the simulation are recommended but less would probably work too, most movement is done in first
+  // few iterations and then all the forces gets smaller https://github.com/d3/d3-force#simulation_alphaDecay
+  simulation.tick(config.tick);
+  simulation.stop();
+
+  // We do centering here instead of using centering force to keep this more stable
+  centerNodes(nodes);
+}
+
+/**
+ * This initializes positions of the graph by going from the root to its children and laying it out in a grid from left
+ * to right. This works only so, so because service map graphs can have cycles and children levels are not ordered in a
+ * way to minimize the edge lengths. Nevertheless this seems to make the graph easier to nudge with the forces later on
+ * than with the d3 default initial positioning. Also we can fix the root positions later on for a bit more neat
+ * organisation.
+ *
+ * This function directly modifies the nodes given and only returns references to root nodes so they do not have to be
+ * found again later on.
+ *
+ * How the spacing could look like approximately:
+ * 0 - 0 - 0 - 0
+ *  \- 0 - 0   |
+ *      \- 0 -/
+ * 0 - 0 -/
+ */
+function initializePositions(nodes, edges) {
+  // To prevent going in cycles
+  const alreadyPositioned = {};
+
+  const nodesMap = nodes.reduce((acc, node) => {
+    acc[node.id] = node;
+    return acc;
+  }, {});
+  const edgesMap = edges.reduce((acc, edge) => {
+    const sourceId = edge.source;
+    acc[sourceId] = [...(acc[sourceId] || []), edge];
+    return acc;
+  }, {});
+
+  let roots = nodes.filter((n) => n.incoming === 0);
+
+  // For things like service maps we assume there is some root (client) node but if there is none then selecting
+  // any node as a starting point should work the same.
+  if (!roots.length) {
+    roots = [nodes[0]];
+  }
+
+  let secondLevelRoots = roots.reduce((acc, r) => {
+    acc.push(...(edgesMap[r.id] ? edgesMap[r.id].map((e) => nodesMap[e.target]) : []));
+    return acc;
+  }, []);
+
+  const rootYSpacing = 300;
+  const nodeYSpacing = 200;
+  const nodeXSpacing = 200;
+
+  let rootY = 0;
+  for (const root of roots) {
+    let graphLevel = [root];
+    let x = 0;
+    while (graphLevel.length > 0) {
+      const nextGraphLevel = [];
+      let y = rootY;
+      for (const node of graphLevel) {
+        if (alreadyPositioned[node.id]) {
+          continue;
+        }
+        // Initialize positions based on the spacing in the grid
+        node.x = x;
+        node.y = y;
+        alreadyPositioned[node.id] = true;
+
+        // Move to next Y position for next node
+        y += nodeYSpacing;
+        if (edgesMap[node.id]) {
+          nextGraphLevel.push(...edgesMap[node.id].map((edge) => nodesMap[edge.target]));
+        }
+      }
+
+      graphLevel = nextGraphLevel;
+      // Move to next X position for next level
+      x += nodeXSpacing;
+      // Reset Y back to baseline for this root
+      y = rootY;
+    }
+    rootY += rootYSpacing;
+  }
+  return { roots, secondLevelRoots };
+}
+
+/**
+ * Makes sure that the center of the graph based on its bound is in 0, 0 coordinates.
+ * Modifies the nodes directly.
+ */
+function centerNodes(nodes) {
+  const bounds = graphBounds(nodes);
+  for (let node of nodes) {
+    node.x = node.x - bounds.center.x;
+    node.y = node.y - bounds.center.y;
+  }
+}
+
+/**
+ * Get bounds of the graph meaning the extent of the nodes in all directions.
+ */
+function graphBounds(nodes) {
+  if (nodes.length === 0) {
+    return { top: 0, right: 0, bottom: 0, left: 0, center: { x: 0, y: 0 } };
+  }
+
+  const bounds = nodes.reduce(
+    (acc, node) => {
+      if (node.x > acc.right) {
+        acc.right = node.x;
+      }
+      if (node.x < acc.left) {
+        acc.left = node.x;
+      }
+      if (node.y > acc.bottom) {
+        acc.bottom = node.y;
+      }
+      if (node.y < acc.top) {
+        acc.top = node.y;
+      }
+      return acc;
+    },
+    { top: Infinity, right: -Infinity, bottom: -Infinity, left: Infinity }
+  );
+
+  const y = bounds.top + (bounds.bottom - bounds.top) / 2;
+  const x = bounds.left + (bounds.right - bounds.left) / 2;
+
+  return {
+    ...bounds,
+    center: {
+      x,
+      y,
+    },
+  };
+}
diff --git a/public/app/plugins/panel/nodeGraph/layeredLayout.js b/public/app/plugins/panel/nodeGraph/layeredLayout.js
new file mode 100644
index 0000000000000..2a3b411bab3be
--- /dev/null
+++ b/public/app/plugins/panel/nodeGraph/layeredLayout.js
@@ -0,0 +1,227 @@
+import {
+  GeomGraph,
+  GeomEdge,
+  GeomNode,
+  Point,
+  CurveFactory,
+  SugiyamaLayoutSettings,
+  LayerDirectionEnum,
+  layoutGeomGraph,
+} from '@msagl/core';
+import { parseDot } from '@msagl/parser';
+
+/**
+ * Use d3 force layout to lay the nodes in a sensible way. This function modifies the nodes adding the x,y positions
+ * and also fills in node references in edges instead of node ids.
+ */
+export function layout(nodes, edges) {
+  const { mappedEdges, DOTToIdMap } = createMappings(nodes, edges);
+
+  const dot = graphToDOT(mappedEdges, DOTToIdMap);
+  const graph = parseDot(dot);
+  const geomGraph = new GeomGraph(graph);
+  for (const e of graph.deepEdges) {
+    new GeomEdge(e);
+  }
+
+  for (const n of graph.nodesBreadthFirst) {
+    const gn = new GeomNode(n);
+    gn.boundaryCurve = CurveFactory.mkCircle(50, new Point(0, 0));
+  }
+  geomGraph.layoutSettings = new SugiyamaLayoutSettings();
+  geomGraph.layoutSettings.layerDirection = LayerDirectionEnum.LR;
+  geomGraph.layoutSettings.LayerSeparation = 60;
+  geomGraph.layoutSettings.commonSettings.NodeSeparation = 40;
+  layoutGeomGraph(geomGraph);
+
+  const nodesMap = {};
+  for (const node of geomGraph.nodesBreadthFirst) {
+    nodesMap[DOTToIdMap[node.id]] = {
+      obj: node,
+    };
+  }
+
+  for (const node of nodes) {
+    nodesMap[node.id] = {
+      ...nodesMap[node.id],
+      datum: {
+        ...node,
+        x: nodesMap[node.id].obj.center.x,
+        y: nodesMap[node.id].obj.center.y,
+      },
+    };
+  }
+  const edgesMapped = edges.map((e) => {
+    return {
+      ...e,
+      source: nodesMap[e.source].datum,
+      target: nodesMap[e.target].datum,
+    };
+  });
+
+  // This section checks if there are separate disjointed subgraphs. If so it groups nodes for each and then aligns
+  // each subgraph, so it starts on a single vertical line. Otherwise, they are laid out randomly from left to right.
+  const subgraphs = [];
+  for (const e of edgesMapped) {
+    const sourceGraph = subgraphs.find((g) => g.nodes.has(e.source));
+    const targetGraph = subgraphs.find((g) => g.nodes.has(e.target));
+    if (sourceGraph && targetGraph) {
+      // if the node sets are not the same we merge them
+      if (sourceGraph !== targetGraph) {
+        targetGraph.nodes.forEach(sourceGraph.nodes.add, sourceGraph.nodes);
+        subgraphs.splice(subgraphs.indexOf(targetGraph), 1);
+        sourceGraph.top = Math.min(sourceGraph.top, targetGraph.top);
+        sourceGraph.bottom = Math.max(sourceGraph.bottom, targetGraph.bottom);
+        sourceGraph.left = Math.min(sourceGraph.left, targetGraph.left);
+        sourceGraph.right = Math.max(sourceGraph.right, targetGraph.right);
+      }
+      // if the sets are the same nothing to do.
+    } else if (sourceGraph) {
+      sourceGraph.nodes.add(e.target);
+      sourceGraph.top = Math.min(sourceGraph.top, e.target.y);
+      sourceGraph.bottom = Math.max(sourceGraph.bottom, e.target.y);
+      sourceGraph.left = Math.min(sourceGraph.left, e.target.x);
+      sourceGraph.right = Math.max(sourceGraph.right, e.target.x);
+    } else if (targetGraph) {
+      targetGraph.nodes.add(e.source);
+      targetGraph.top = Math.min(targetGraph.top, e.source.y);
+      targetGraph.bottom = Math.max(targetGraph.bottom, e.source.y);
+      targetGraph.left = Math.min(targetGraph.left, e.source.x);
+      targetGraph.right = Math.max(targetGraph.right, e.source.x);
+    } else {
+      // we don't have these nodes
+      subgraphs.push({
+        top: Math.min(e.source.y, e.target.y),
+        bottom: Math.max(e.source.y, e.target.y),
+        left: Math.min(e.source.x, e.target.x),
+        right: Math.max(e.source.x, e.target.x),
+        nodes: new Set([e.source, e.target]),
+      });
+    }
+  }
+
+  let top = 0;
+  let left = 0;
+  for (const g of subgraphs) {
+    if (top === 0) {
+      top = g.bottom + 200;
+      left = g.left;
+    } else {
+      const topDiff = top - g.top;
+      const leftDiff = left - g.left;
+      for (const n of g.nodes) {
+        n.x += leftDiff;
+        n.y += topDiff;
+      }
+      top += g.bottom - g.top + 200;
+    }
+  }
+
+  const finalNodes = Object.values(nodesMap).map((v) => v.datum);
+
+  centerNodes(finalNodes);
+  return [finalNodes, edgesMapped];
+}
+
+// We create mapping because the DOT language we use later to create the graph doesn't support arbitrary IDs. So we
+// map our IDs to just an index of the node so the IDs are safe for the DOT parser and also create and inverse mapping
+// for quick lookup.
+function createMappings(nodes, edges) {
+  // Edges where the source and target IDs are the indexes we use for layout
+  const mappedEdges = [];
+
+  // Key is an ID of the node and value is new ID which is just iteration index
+  const idToDOTMap = {};
+
+  // Key is an iteration index and value is actual ID of the node
+  const DOTToIdMap = {};
+
+  let index = 0;
+  for (const node of nodes) {
+    idToDOTMap[node.id] = index.toString(10);
+    DOTToIdMap[index.toString(10)] = node.id;
+    index++;
+  }
+
+  for (const edge of edges) {
+    mappedEdges.push({ source: idToDOTMap[edge.source], target: idToDOTMap[edge.target] });
+  }
+
+  return {
+    mappedEdges,
+    DOTToIdMap,
+    idToDOTMap,
+  };
+}
+
+function graphToDOT(edges, nodeIDsMap) {
+  let dot = `
+  digraph G {
+    rankdir="LR"; TBbalance="min"
+  `;
+  for (const edge of edges) {
+    dot += edge.source + '->' + edge.target + ' ' + '[ minlen=3 ]\n';
+  }
+  dot += nodesDOT(nodeIDsMap);
+  dot += '}';
+  return dot;
+}
+
+function nodesDOT(nodeIdsMap) {
+  let dot = '';
+  for (const node of Object.keys(nodeIdsMap)) {
+    dot += node + ' [fixedsize=true, width=1.2, height=1.7] \n';
+  }
+  return dot;
+}
+
+/**
+ * Makes sure that the center of the graph based on its bound is in 0, 0 coordinates.
+ * Modifies the nodes directly.
+ */
+function centerNodes(nodes) {
+  const bounds = graphBounds(nodes);
+  for (let node of nodes) {
+    node.x = node.x - bounds.center.x;
+    node.y = node.y - bounds.center.y;
+  }
+}
+
+/**
+ * Get bounds of the graph meaning the extent of the nodes in all directions.
+ */
+function graphBounds(nodes) {
+  if (nodes.length === 0) {
+    return { top: 0, right: 0, bottom: 0, left: 0, center: { x: 0, y: 0 } };
+  }
+
+  const bounds = nodes.reduce(
+    (acc, node) => {
+      if (node.x > acc.right) {
+        acc.right = node.x;
+      }
+      if (node.x < acc.left) {
+        acc.left = node.x;
+      }
+      if (node.y > acc.bottom) {
+        acc.bottom = node.y;
+      }
+      if (node.y < acc.top) {
+        acc.top = node.y;
+      }
+      return acc;
+    },
+    { top: Infinity, right: -Infinity, bottom: -Infinity, left: Infinity }
+  );
+
+  const y = bounds.top + (bounds.bottom - bounds.top) / 2;
+  const x = bounds.left + (bounds.right - bounds.left) / 2;
+
+  return {
+    ...bounds,
+    center: {
+      x,
+      y,
+    },
+  };
+}
diff --git a/public/app/plugins/panel/nodeGraph/layeredLayout.test.ts b/public/app/plugins/panel/nodeGraph/layeredLayout.test.ts
new file mode 100644
index 0000000000000..aec26b9b4eb98
--- /dev/null
+++ b/public/app/plugins/panel/nodeGraph/layeredLayout.test.ts
@@ -0,0 +1,10 @@
+import { layout } from './layeredLayout';
+
+describe('layout', () => {
+  it('can render single node', () => {
+    const nodes = [{ id: 'A', incoming: 0 }];
+    const edges: unknown[] = [];
+    const graph = layout(nodes, edges);
+    expect(graph).toEqual([[{ id: 'A', incoming: 0, x: 0, y: 0 }], []]);
+  });
+});
diff --git a/public/app/plugins/panel/nodeGraph/layout.test.ts b/public/app/plugins/panel/nodeGraph/layout.test.ts
index fb662d144501f..63965301e117e 100644
--- a/public/app/plugins/panel/nodeGraph/layout.test.ts
+++ b/public/app/plugins/panel/nodeGraph/layout.test.ts
@@ -1,4 +1,5 @@
 import { renderHook } from '@testing-library/react';
+import { act } from 'react-test-renderer';
 
 import { useLayout } from './layout';
 import { EdgeDatum, NodeDatum } from './types';
@@ -6,6 +7,11 @@ import { EdgeDatum, NodeDatum } from './types';
 let onmessage: jest.Mock;
 let postMessage: jest.Mock;
 let terminate: jest.Mock;
+let worker: {
+  onmessage: (e: MessageEvent) => void;
+  postMessage: (d: unknown) => void;
+  terminate: () => void;
+};
 
 jest.mock('./createLayoutWorker', () => {
   return {
@@ -14,11 +20,23 @@ jest.mock('./createLayoutWorker', () => {
       onmessage = jest.fn();
       postMessage = jest.fn();
       terminate = jest.fn();
-      return {
+      worker = {
         onmessage: onmessage,
         postMessage: postMessage,
         terminate: terminate,
       };
+      return worker;
+    },
+    createMsaglWorker: () => {
+      onmessage = jest.fn();
+      postMessage = jest.fn();
+      terminate = jest.fn();
+      worker = {
+        onmessage: onmessage,
+        postMessage: postMessage,
+        terminate: terminate,
+      };
+      return worker;
     },
   };
 });
@@ -64,6 +82,32 @@ describe('layout', () => {
     expect(result.current.edges).toEqual([]);
     expect(localTerminate).toBeCalledTimes(1);
   });
+
+  it('correctly maps the layout data', async () => {
+    // This specifically tests whether the mapping of data from the layout code back to the original nodes is correct.
+
+    const { result, rerender } = renderHook(
+      ({ nodes, edges }) => {
+        return useLayout(nodes, edges, undefined, 100, 1000);
+      },
+      { initialProps: { nodes: rawNodes, edges: rawEdges } }
+    );
+
+    // Simulate response from the layout worker
+    act(() => {
+      worker.onmessage(new MessageEvent('message', { data: { nodes: testNodes, edges: testEdges } }));
+    });
+
+    rerender({ nodes: rawNodes, edges: rawEdges });
+
+    expect(result.current.nodes).toMatchObject([
+      { id: 'otel-demo-alt/frontend', title: 'frontend' },
+      { id: 'otel-demo-alt/cartservice', title: 'cartservice' },
+      { id: 'otel-demo-alt/checkoutservice', title: 'checkoutservice' },
+      { id: 'otel-demo-alt/frontend-proxy', title: 'frontend-proxy' },
+      { id: 'otel-demo-alt/recommendationservice', title: 'recommendationservice' },
+    ]);
+  });
 });
 
 function makeNode(index: number, incoming: number): NodeDatum {
@@ -92,3 +136,260 @@ function makeEdge(source: number, target: number): EdgeDatum {
     thickness: 1,
   };
 }
+
+const rawNodes: NodeDatum[] = [
+  {
+    dataFrameRowIndex: 0,
+    id: 'otel-demo-alt/cartservice',
+    incoming: 1,
+    subTitle: 'otel-demo-alt',
+    title: 'cartservice',
+    highlighted: false,
+    arcSections: [],
+  },
+  {
+    dataFrameRowIndex: 1,
+    id: 'otel-demo-alt/frontend',
+    incoming: 1,
+    subTitle: 'otel-demo-alt',
+    title: 'frontend',
+    highlighted: false,
+    arcSections: [],
+  },
+  {
+    dataFrameRowIndex: 2,
+    id: 'otel-demo-alt/checkoutservice',
+    incoming: 1,
+    subTitle: 'otel-demo-alt',
+    title: 'checkoutservice',
+    highlighted: false,
+    arcSections: [],
+  },
+  {
+    dataFrameRowIndex: 3,
+    id: 'otel-demo-alt/frontend-proxy',
+    incoming: 1,
+    subTitle: 'otel-demo-alt',
+    title: 'frontend-proxy',
+    highlighted: false,
+    arcSections: [],
+  },
+  {
+    dataFrameRowIndex: 4,
+    id: 'otel-demo-alt/recommendationservice',
+    incoming: 1,
+    subTitle: 'otel-demo-alt',
+    title: 'recommendationservice',
+    highlighted: false,
+    arcSections: [],
+  },
+];
+
+const rawEdges = [
+  {
+    id: 'otel-demo-alt/frontend_otel-demo-alt/cartservice',
+    dataFrameRowIndex: 0,
+    source: 'otel-demo-alt/frontend',
+    target: 'otel-demo-alt/cartservice',
+    sourceNodeRadius: 40,
+    targetNodeRadius: 40,
+    mainStat: '1.08 ms/r',
+    secondaryStat: '0.93 r/sec',
+    highlighted: false,
+    thickness: 1,
+  },
+  {
+    id: 'otel-demo-alt/frontend_otel-demo-alt/checkoutservice',
+    dataFrameRowIndex: 1,
+    source: 'otel-demo-alt/frontend',
+    target: 'otel-demo-alt/checkoutservice',
+    sourceNodeRadius: 40,
+    targetNodeRadius: 40,
+    mainStat: '12.66 ms/r',
+    secondaryStat: '0.12 r/sec',
+    highlighted: false,
+    thickness: 1,
+  },
+  {
+    id: 'otel-demo-alt/frontend_otel-demo-alt/frontend-proxy',
+    dataFrameRowIndex: 2,
+    source: 'otel-demo-alt/frontend',
+    target: 'otel-demo-alt/frontend-proxy',
+    sourceNodeRadius: 40,
+    targetNodeRadius: 40,
+    mainStat: '7.45 ms/r',
+    secondaryStat: '0.99 r/sec',
+    highlighted: false,
+    thickness: 1,
+  },
+  {
+    id: 'otel-demo-alt/frontend_otel-demo-alt/recommendationservice',
+    dataFrameRowIndex: 3,
+    source: 'otel-demo-alt/frontend',
+    target: 'otel-demo-alt/recommendationservice',
+    sourceNodeRadius: 40,
+    targetNodeRadius: 40,
+    mainStat: '13.01 ms/r',
+    secondaryStat: '0.18 r/sec',
+    highlighted: false,
+    thickness: 1,
+  },
+  {
+    id: 'otel-demo-alt/frontend-proxy_otel-demo-alt/frontend',
+    dataFrameRowIndex: 4,
+    source: 'otel-demo-alt/frontend-proxy',
+    target: 'otel-demo-alt/frontend',
+    sourceNodeRadius: 40,
+    targetNodeRadius: 40,
+    mainStat: '7.50 ms/r',
+    secondaryStat: '6.06 r/sec',
+    highlighted: false,
+    thickness: 1,
+  },
+];
+
+const testNodes = [
+  {
+    id: 'otel-demo-alt/frontend',
+    incoming: 1,
+    x: -80.84375,
+    y: -70.49999999999997,
+  },
+  {
+    id: 'otel-demo-alt/cartservice',
+    incoming: 1,
+    x: 80.84375,
+    y: 211.5,
+  },
+  {
+    id: 'otel-demo-alt/checkoutservice',
+    incoming: 1,
+    x: 80.84375,
+    y: 70.5,
+  },
+  {
+    id: 'otel-demo-alt/frontend-proxy',
+    incoming: 1,
+    x: 80.84375,
+    y: -70.5,
+  },
+  {
+    id: 'otel-demo-alt/recommendationservice',
+    incoming: 1,
+    x: 80.84375,
+    y: -211.5,
+  },
+];
+
+const testEdges = [
+  {
+    id: 'otel-demo-alt/frontend_otel-demo-alt/cartservice',
+    dataFrameRowIndex: 0,
+    source: {
+      id: 'otel-demo-alt/frontend',
+      incoming: 1,
+      x: -80.84375,
+      y: -70.49999999999997,
+    },
+    target: {
+      id: 'otel-demo-alt/cartservice',
+      incoming: 1,
+      x: 80.84375,
+      y: 211.5,
+    },
+    sourceNodeRadius: 40,
+    targetNodeRadius: 40,
+    mainStat: '1.07 ms/r',
+    secondaryStat: '1.08 r/sec',
+    highlighted: false,
+    thickness: 1,
+  },
+  {
+    id: 'otel-demo-alt/frontend_otel-demo-alt/checkoutservice',
+    dataFrameRowIndex: 1,
+    source: {
+      id: 'otel-demo-alt/frontend',
+      incoming: 1,
+      x: -80.84375,
+      y: -70.49999999999997,
+    },
+    target: {
+      id: 'otel-demo-alt/checkoutservice',
+      incoming: 1,
+      x: 80.84375,
+      y: 70.5,
+    },
+    sourceNodeRadius: 40,
+    targetNodeRadius: 40,
+    mainStat: '8.18 ms/r',
+    secondaryStat: '0.14 r/sec',
+    highlighted: false,
+    thickness: 1,
+  },
+  {
+    id: 'otel-demo-alt/frontend_otel-demo-alt/frontend-proxy',
+    dataFrameRowIndex: 2,
+    source: {
+      id: 'otel-demo-alt/frontend',
+      incoming: 1,
+      x: -80.84375,
+      y: -70.49999999999997,
+    },
+    target: {
+      id: 'otel-demo-alt/frontend-proxy',
+      incoming: 1,
+      x: 80.84375,
+      y: -70.5,
+    },
+    sourceNodeRadius: 40,
+    targetNodeRadius: 40,
+    mainStat: '7.57 ms/r',
+    secondaryStat: '1.14 r/sec',
+    highlighted: false,
+    thickness: 1,
+  },
+  {
+    id: 'otel-demo-alt/frontend_otel-demo-alt/recommendationservice',
+    dataFrameRowIndex: 3,
+    source: {
+      id: 'otel-demo-alt/frontend',
+      incoming: 1,
+      x: -80.84375,
+      y: -70.49999999999997,
+    },
+    target: {
+      id: 'otel-demo-alt/recommendationservice',
+      incoming: 1,
+      x: 80.84375,
+      y: -211.5,
+    },
+    sourceNodeRadius: 40,
+    targetNodeRadius: 40,
+    mainStat: '8.60 ms/r',
+    secondaryStat: '0.22 r/sec',
+    highlighted: false,
+    thickness: 1,
+  },
+  {
+    id: 'otel-demo-alt/frontend-proxy_otel-demo-alt/frontend',
+    dataFrameRowIndex: 4,
+    source: {
+      id: 'otel-demo-alt/frontend-proxy',
+      incoming: 1,
+      x: 80.84375,
+      y: -70.5,
+    },
+    target: {
+      id: 'otel-demo-alt/frontend',
+      incoming: 1,
+      x: -80.84375,
+      y: -70.49999999999997,
+    },
+    sourceNodeRadius: 40,
+    targetNodeRadius: 40,
+    mainStat: '7.53 ms/r',
+    secondaryStat: '6.82 r/sec',
+    highlighted: false,
+    thickness: 1,
+  },
+];
diff --git a/public/app/plugins/panel/nodeGraph/layout.ts b/public/app/plugins/panel/nodeGraph/layout.ts
index 7587852606868..b3fd26d4c9342 100644
--- a/public/app/plugins/panel/nodeGraph/layout.ts
+++ b/public/app/plugins/panel/nodeGraph/layout.ts
@@ -1,10 +1,12 @@
+import { fromPairs } from 'lodash';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { useUnmount } from 'react-use';
 import useMountedState from 'react-use/lib/useMountedState';
 
 import { Field } from '@grafana/data';
+import { config as grafanaConfig } from '@grafana/runtime';
 
-import { createWorker } from './createLayoutWorker';
+import { createWorker, createMsaglWorker } from './createLayoutWorker';
 import { EdgeDatum, EdgeDatumLayout, NodeDatum } from './types';
 import { useNodeLimit } from './useNodeLimit';
 import { graphBounds } from './utils';
@@ -83,11 +85,14 @@ export function useLayout(
       return;
     }
 
-    setLoading(true);
+    // Layered layout is better but also more expensive, so we switch to default force based layout for bigger graphs.
+    const layoutType =
+      grafanaConfig.featureToggles.nodeGraphDotLayout && rawNodes.length <= 500 ? 'layered' : 'default';
 
-    // This is async but as I wanted to still run the sync grid layout and you cannot return promise from effect so
+    setLoading(true);
+    // This is async but as I wanted to still run the sync grid layout, and you cannot return promise from effect so
     // having callback seems ok here.
-    const cancel = defaultLayout(rawNodes, rawEdges, ({ nodes, edges }) => {
+    const cancel = layout(rawNodes, rawEdges, layoutType, ({ nodes, edges }) => {
       if (isMounted()) {
         setNodesGraph(nodes);
         setEdgesGraph(edges as EdgeDatumLayout[]);
@@ -146,20 +151,25 @@ export function useLayout(
  * Wraps the layout code in a worker as it can take long and we don't want to block the main thread.
  * Returns a cancel function to terminate the worker.
  */
-function defaultLayout(
+function layout(
   nodes: NodeDatum[],
   edges: EdgeDatum[],
+  engine: 'default' | 'layered',
   done: (data: { nodes: NodeDatum[]; edges: EdgeDatum[] }) => void
 ) {
-  const worker = createWorker();
+  const worker = engine === 'default' ? createWorker() : createMsaglWorker();
+
   worker.onmessage = (event: MessageEvent<{ nodes: NodeDatum[]; edges: EdgeDatumLayout[] }>) => {
-    for (let i = 0; i < nodes.length; i++) {
-      // These stats needs to be Field class but the data is stringified over the worker boundary
-      event.data.nodes[i] = {
-        ...nodes[i],
-        ...event.data.nodes[i],
+    const nodesMap = fromPairs(nodes.map((node) => [node.id, node]));
+
+    // Add the x,y coordinates from the layout algorithm to the original nodes.
+    event.data.nodes = event.data.nodes.map((node) => {
+      return {
+        ...nodesMap[node.id],
+        ...node,
       };
-    }
+    });
+
     done(event.data);
   };
 
diff --git a/public/app/plugins/panel/nodeGraph/layout.worker.js b/public/app/plugins/panel/nodeGraph/layout.worker.js
index 205289a1fcd30..ff5c39361090e 100644
--- a/public/app/plugins/panel/nodeGraph/layout.worker.js
+++ b/public/app/plugins/panel/nodeGraph/layout.worker.js
@@ -1,176 +1,8 @@
-import { forceSimulation, forceLink, forceCollide, forceX } from 'd3-force';
+import { layout } from './forceLayout';
 
+// Separate from main implementation so it does not trip out tests
 addEventListener('message', (event) => {
   const { nodes, edges, config } = event.data;
   layout(nodes, edges, config);
   postMessage({ nodes, edges });
 });
-
-/**
- * Use d3 force layout to lay the nodes in a sensible way. This function modifies the nodes adding the x,y positions
- * and also fills in node references in edges instead of node ids.
- */
-export function layout(nodes, edges, config) {
-  // Start with some hardcoded positions so it starts laid out from left to right
-  let { roots, secondLevelRoots } = initializePositions(nodes, edges);
-
-  // There always seems to be one or more root nodes each with single edge and we want to have them static on the
-  // left neatly in something like grid layout
-  [...roots, ...secondLevelRoots].forEach((n, index) => {
-    n.fx = n.x;
-  });
-
-  const simulation = forceSimulation(nodes)
-    .force(
-      'link',
-      forceLink(edges)
-        .id((d) => d.id)
-        .distance(config.linkDistance)
-        .strength(config.linkStrength)
-    )
-    // to keep the left to right layout we add force that pulls all nodes to right but because roots are fixed it will
-    // apply only to non root nodes
-    .force('x', forceX(config.forceX).strength(config.forceXStrength))
-    // Make sure nodes don't overlap
-    .force('collide', forceCollide(config.forceCollide));
-
-  // 300 ticks for the simulation are recommended but less would probably work too, most movement is done in first
-  // few iterations and then all the forces gets smaller https://github.com/d3/d3-force#simulation_alphaDecay
-  simulation.tick(config.tick);
-  simulation.stop();
-
-  // We do centering here instead of using centering force to keep this more stable
-  centerNodes(nodes);
-}
-
-/**
- * This initializes positions of the graph by going from the root to its children and laying it out in a grid from left
- * to right. This works only so, so because service map graphs can have cycles and children levels are not ordered in a
- * way to minimize the edge lengths. Nevertheless this seems to make the graph easier to nudge with the forces later on
- * than with the d3 default initial positioning. Also we can fix the root positions later on for a bit more neat
- * organisation.
- *
- * This function directly modifies the nodes given and only returns references to root nodes so they do not have to be
- * found again later on.
- *
- * How the spacing could look like approximately:
- * 0 - 0 - 0 - 0
- *  \- 0 - 0   |
- *      \- 0 -/
- * 0 - 0 -/
- */
-function initializePositions(nodes, edges) {
-  // To prevent going in cycles
-  const alreadyPositioned = {};
-
-  const nodesMap = nodes.reduce((acc, node) => {
-    acc[node.id] = node;
-    return acc;
-  }, {});
-  const edgesMap = edges.reduce((acc, edge) => {
-    const sourceId = edge.source;
-    acc[sourceId] = [...(acc[sourceId] || []), edge];
-    return acc;
-  }, {});
-
-  let roots = nodes.filter((n) => n.incoming === 0);
-
-  // For things like service maps we assume there is some root (client) node but if there is none then selecting
-  // any node as a starting point should work the same.
-  if (!roots.length) {
-    roots = [nodes[0]];
-  }
-
-  let secondLevelRoots = roots.reduce((acc, r) => {
-    acc.push(...(edgesMap[r.id] ? edgesMap[r.id].map((e) => nodesMap[e.target]) : []));
-    return acc;
-  }, []);
-
-  const rootYSpacing = 300;
-  const nodeYSpacing = 200;
-  const nodeXSpacing = 200;
-
-  let rootY = 0;
-  for (const root of roots) {
-    let graphLevel = [root];
-    let x = 0;
-    while (graphLevel.length > 0) {
-      const nextGraphLevel = [];
-      let y = rootY;
-      for (const node of graphLevel) {
-        if (alreadyPositioned[node.id]) {
-          continue;
-        }
-        // Initialize positions based on the spacing in the grid
-        node.x = x;
-        node.y = y;
-        alreadyPositioned[node.id] = true;
-
-        // Move to next Y position for next node
-        y += nodeYSpacing;
-        if (edgesMap[node.id]) {
-          nextGraphLevel.push(...edgesMap[node.id].map((edge) => nodesMap[edge.target]));
-        }
-      }
-
-      graphLevel = nextGraphLevel;
-      // Move to next X position for next level
-      x += nodeXSpacing;
-      // Reset Y back to baseline for this root
-      y = rootY;
-    }
-    rootY += rootYSpacing;
-  }
-  return { roots, secondLevelRoots };
-}
-
-/**
- * Makes sure that the center of the graph based on its bound is in 0, 0 coordinates.
- * Modifies the nodes directly.
- */
-function centerNodes(nodes) {
-  const bounds = graphBounds(nodes);
-  for (let node of nodes) {
-    node.x = node.x - bounds.center.x;
-    node.y = node.y - bounds.center.y;
-  }
-}
-
-/**
- * Get bounds of the graph meaning the extent of the nodes in all directions.
- */
-function graphBounds(nodes) {
-  if (nodes.length === 0) {
-    return { top: 0, right: 0, bottom: 0, left: 0, center: { x: 0, y: 0 } };
-  }
-
-  const bounds = nodes.reduce(
-    (acc, node) => {
-      if (node.x > acc.right) {
-        acc.right = node.x;
-      }
-      if (node.x < acc.left) {
-        acc.left = node.x;
-      }
-      if (node.y > acc.bottom) {
-        acc.bottom = node.y;
-      }
-      if (node.y < acc.top) {
-        acc.top = node.y;
-      }
-      return acc;
-    },
-    { top: Infinity, right: -Infinity, bottom: -Infinity, left: Infinity }
-  );
-
-  const y = bounds.top + (bounds.bottom - bounds.top) / 2;
-  const x = bounds.left + (bounds.right - bounds.left) / 2;
-
-  return {
-    ...bounds,
-    center: {
-      x,
-      y,
-    },
-  };
-}
diff --git a/public/app/plugins/panel/nodeGraph/layoutLayered.worker.js b/public/app/plugins/panel/nodeGraph/layoutLayered.worker.js
new file mode 100644
index 0000000000000..7fa2caec2c9dc
--- /dev/null
+++ b/public/app/plugins/panel/nodeGraph/layoutLayered.worker.js
@@ -0,0 +1,8 @@
+import { layout } from './layeredLayout';
+
+// Separate from main implementation so it does not trip out tests
+addEventListener('message', async (event) => {
+  const { nodes, edges, config } = event.data;
+  const [newNodes, newEdges] = layout(nodes, edges, config);
+  postMessage({ nodes: newNodes, edges: newEdges });
+});
diff --git a/public/app/plugins/panel/nodeGraph/module.tsx b/public/app/plugins/panel/nodeGraph/module.tsx
index 5d444e17e3cf4..27c4d06a7f2fa 100644
--- a/public/app/plugins/panel/nodeGraph/module.tsx
+++ b/public/app/plugins/panel/nodeGraph/module.tsx
@@ -2,41 +2,44 @@ import { PanelPlugin } from '@grafana/data';
 
 import { NodeGraphPanel } from './NodeGraphPanel';
 import { ArcOptionsEditor } from './editor/ArcOptionsEditor';
+import { NodeGraphSuggestionsSupplier } from './suggestions';
 import { NodeGraphOptions } from './types';
 
-export const plugin = new PanelPlugin<NodeGraphOptions>(NodeGraphPanel).setPanelOptions((builder, context) => {
-  builder.addNestedOptions({
-    category: ['Nodes'],
-    path: 'nodes',
-    build: (builder) => {
-      builder.addUnitPicker({
-        name: 'Main stat unit',
-        path: 'mainStatUnit',
-      });
-      builder.addUnitPicker({
-        name: 'Secondary stat unit',
-        path: 'secondaryStatUnit',
-      });
-      builder.addCustomEditor({
-        name: 'Arc sections',
-        path: 'arcs',
-        id: 'arcs',
-        editor: ArcOptionsEditor,
-      });
-    },
-  });
-  builder.addNestedOptions({
-    category: ['Edges'],
-    path: 'edges',
-    build: (builder) => {
-      builder.addUnitPicker({
-        name: 'Main stat unit',
-        path: 'mainStatUnit',
-      });
-      builder.addUnitPicker({
-        name: 'Secondary stat unit',
-        path: 'secondaryStatUnit',
-      });
-    },
-  });
-});
+export const plugin = new PanelPlugin<NodeGraphOptions>(NodeGraphPanel)
+  .setPanelOptions((builder, context) => {
+    builder.addNestedOptions({
+      category: ['Nodes'],
+      path: 'nodes',
+      build: (builder) => {
+        builder.addUnitPicker({
+          name: 'Main stat unit',
+          path: 'mainStatUnit',
+        });
+        builder.addUnitPicker({
+          name: 'Secondary stat unit',
+          path: 'secondaryStatUnit',
+        });
+        builder.addCustomEditor({
+          name: 'Arc sections',
+          path: 'arcs',
+          id: 'arcs',
+          editor: ArcOptionsEditor,
+        });
+      },
+    });
+    builder.addNestedOptions({
+      category: ['Edges'],
+      path: 'edges',
+      build: (builder) => {
+        builder.addUnitPicker({
+          name: 'Main stat unit',
+          path: 'mainStatUnit',
+        });
+        builder.addUnitPicker({
+          name: 'Secondary stat unit',
+          path: 'secondaryStatUnit',
+        });
+      },
+    });
+  })
+  .setSuggestionsSupplier(new NodeGraphSuggestionsSupplier());
diff --git a/public/app/plugins/panel/nodeGraph/panelcfg.gen.ts b/public/app/plugins/panel/nodeGraph/panelcfg.gen.ts
index 672953359c3ae..d09f8d207cb49 100644
--- a/public/app/plugins/panel/nodeGraph/panelcfg.gen.ts
+++ b/public/app/plugins/panel/nodeGraph/panelcfg.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/public/app/plugins/panel/nodeGraph/suggestions.ts b/public/app/plugins/panel/nodeGraph/suggestions.ts
new file mode 100644
index 0000000000000..eb4a4773ef446
--- /dev/null
+++ b/public/app/plugins/panel/nodeGraph/suggestions.ts
@@ -0,0 +1,71 @@
+import { DataFrame, FieldType, VisualizationSuggestionsBuilder, VisualizationSuggestionScore } from '@grafana/data';
+import { SuggestionName } from 'app/types/suggestions';
+
+export class NodeGraphSuggestionsSupplier {
+  getListWithDefaults(builder: VisualizationSuggestionsBuilder) {
+    return builder.getListAppender<{}, {}>({
+      name: SuggestionName.NodeGraph,
+      pluginId: 'nodeGraph',
+    });
+  }
+
+  hasCorrectFields(frames: DataFrame[]): boolean {
+    let hasNodesFrame = false;
+    let hasEdgesFrame = false;
+
+    const nodeFields: Array<[string, FieldType]> = [
+      ['id', FieldType.string],
+      ['title', FieldType.string],
+      ['mainstat', FieldType.number],
+    ];
+    const edgeFields: Array<[string, FieldType]> = [
+      ['id', FieldType.string],
+      ['source', FieldType.string],
+      ['target', FieldType.string],
+    ];
+
+    for (const frame of frames) {
+      if (this.checkFields(nodeFields, frame)) {
+        hasNodesFrame = true;
+      }
+      if (this.checkFields(edgeFields, frame)) {
+        hasEdgesFrame = true;
+      }
+    }
+
+    return hasNodesFrame && hasEdgesFrame;
+  }
+
+  checkFields(fields: Array<[string, FieldType]>, frame: DataFrame): boolean {
+    let hasCorrectFields = true;
+
+    for (const field of fields) {
+      const [name, type] = field;
+      const frameField = frame.fields.find((f) => f.name === name);
+      if (!frameField || type !== frameField.type) {
+        hasCorrectFields = false;
+        break;
+      }
+    }
+
+    return hasCorrectFields;
+  }
+
+  getSuggestionsForData(builder: VisualizationSuggestionsBuilder) {
+    if (!builder.data) {
+      return;
+    }
+
+    const hasCorrectFields = this.hasCorrectFields(builder.data.series);
+    const nodeGraphFrames = builder.data.series.filter(
+      (df) => df.meta && df.meta.preferredVisualisationType === 'nodeGraph'
+    );
+
+    if (hasCorrectFields || nodeGraphFrames.length === 2) {
+      this.getListWithDefaults(builder).append({
+        name: SuggestionName.NodeGraph,
+        score: VisualizationSuggestionScore.Best,
+      });
+    }
+  }
+}
diff --git a/public/app/plugins/panel/nodeGraph/types.ts b/public/app/plugins/panel/nodeGraph/types.ts
index 6ab3f47481814..1c93bea22e287 100644
--- a/public/app/plugins/panel/nodeGraph/types.ts
+++ b/public/app/plugins/panel/nodeGraph/types.ts
@@ -35,8 +35,13 @@ export type EdgeDatum = LinkDatum & {
   dataFrameRowIndex: number;
   sourceNodeRadius: number;
   targetNodeRadius: number;
+  /**
+   * @deprecated -- for edges use color instead
+   */
   highlighted: boolean;
   thickness: number;
+  color?: string;
+  strokeDasharray?: string;
 };
 
 // After layout is run D3 will change the string IDs for actual references to the nodes.
diff --git a/public/app/plugins/panel/nodeGraph/usePanning.ts b/public/app/plugins/panel/nodeGraph/usePanning.ts
index 1e012c3d0716b..41daf7daf1275 100644
--- a/public/app/plugins/panel/nodeGraph/usePanning.ts
+++ b/public/app/plugins/panel/nodeGraph/usePanning.ts
@@ -183,12 +183,14 @@ function inBounds(value: number, min: number | undefined, max: number | undefine
   return Math.min(Math.max(value, min ?? -Infinity), max ?? Infinity);
 }
 
+// The issue here is that TouchEvent is undefined while using instanceof in Firefox and Safari
+// which will throw an exception but if it's event.changedTouches it will be undefined
+// and the if check will fail so it will go to the else but will not throw an exception
 function getEventXY(event: Event): { x: number; y: number } {
-  if (event instanceof TouchEvent) {
+  if ('changedTouches' in event && event instanceof TouchEvent) {
     return { x: event.changedTouches[0].clientX, y: event.changedTouches[0].clientY };
   } else if (event instanceof MouseEvent) {
     return { x: event.clientX, y: event.clientY };
-  } else {
-    return { x: 0, y: 0 };
   }
+  return { x: 0, y: 0 };
 }
diff --git a/public/app/plugins/panel/nodeGraph/utils.test.ts b/public/app/plugins/panel/nodeGraph/utils.test.ts
index b920dfe59c8eb..00fcf3be24c32 100644
--- a/public/app/plugins/panel/nodeGraph/utils.test.ts
+++ b/public/app/plugins/panel/nodeGraph/utils.test.ts
@@ -275,6 +275,7 @@ function makeNodeDatum(options: Partial<NodeDatum> = {}) {
         config: {
           color: {
             fixedColor: 'green',
+            mode: 'fixed',
           },
         },
         name: 'arc__success',
@@ -285,6 +286,7 @@ function makeNodeDatum(options: Partial<NodeDatum> = {}) {
         config: {
           color: {
             fixedColor: 'red',
+            mode: 'fixed',
           },
         },
         name: 'arc__errors',
diff --git a/public/app/plugins/panel/nodeGraph/utils.ts b/public/app/plugins/panel/nodeGraph/utils.ts
index 97fb11e30618c..b23ad01e74a23 100644
--- a/public/app/plugins/panel/nodeGraph/utils.ts
+++ b/public/app/plugins/panel/nodeGraph/utils.ts
@@ -86,8 +86,13 @@ export type EdgeFields = {
   mainStat?: Field;
   secondaryStat?: Field;
   details: Field[];
+  /**
+   * @deprecated use `color` instead
+   */
   highlighted?: Field;
   thickness?: Field;
+  color?: Field;
+  strokeDasharray?: Field;
 };
 
 export function getEdgeFields(edges: DataFrame): EdgeFields {
@@ -103,8 +108,11 @@ export function getEdgeFields(edges: DataFrame): EdgeFields {
     mainStat: fieldsCache.getFieldByName(NodeGraphDataFrameFieldNames.mainStat.toLowerCase()),
     secondaryStat: fieldsCache.getFieldByName(NodeGraphDataFrameFieldNames.secondaryStat.toLowerCase()),
     details: findFieldsByPrefix(edges, NodeGraphDataFrameFieldNames.detail.toLowerCase()),
+    // @deprecated -- for edges use color instead
     highlighted: fieldsCache.getFieldByName(NodeGraphDataFrameFieldNames.highlighted.toLowerCase()),
     thickness: fieldsCache.getFieldByName(NodeGraphDataFrameFieldNames.thickness.toLowerCase()),
+    color: fieldsCache.getFieldByName(NodeGraphDataFrameFieldNames.color.toLowerCase()),
+    strokeDasharray: fieldsCache.getFieldByName(NodeGraphDataFrameFieldNames.strokeDasharray.toLowerCase()),
   };
 }
 
@@ -234,8 +242,11 @@ function processEdges(edges: DataFrame, edgeFields: EdgeFields, nodesMap: { [id:
       secondaryStat: edgeFields.secondaryStat
         ? statToString(edgeFields.secondaryStat.config, edgeFields.secondaryStat.values[index])
         : '',
+      // @deprecated -- for edges use color instead
       highlighted: edgeFields.highlighted?.values[index] || false,
       thickness: edgeFields.thickness?.values[index] || 1,
+      color: edgeFields.color?.values[index],
+      strokeDasharray: edgeFields.strokeDasharray?.values[index],
     };
   });
 }
@@ -251,8 +262,8 @@ function computableField(field?: Field) {
  * @param edgeFields
  */
 function normalizeStatsForNodes(nodesMap: { [id: string]: NodeDatumFromEdge }, edgeFields: EdgeFields): NodeDatum[] {
-  const secondaryStatValues: any[] = [];
-  const mainStatValues: any[] = [];
+  const secondaryStatValues: Array<number | undefined> = [];
+  const mainStatValues: Array<number | undefined> = [];
   const secondaryStatField = computableField(edgeFields.secondaryStat)
     ? {
         ...edgeFields.secondaryStat!,
@@ -370,7 +381,7 @@ function makeNode(index: number) {
 }
 
 function nodesFrame() {
-  const fields: any = {
+  const fields = {
     [NodeGraphDataFrameFieldNames.id]: {
       values: [],
       type: FieldType.string,
@@ -394,17 +405,17 @@ function nodesFrame() {
     [NodeGraphDataFrameFieldNames.arc + 'success']: {
       values: [],
       type: FieldType.number,
-      config: { color: { fixedColor: 'green' } },
+      config: { color: { mode: FieldColorModeId.Fixed, fixedColor: 'green' } },
     },
     [NodeGraphDataFrameFieldNames.arc + 'errors']: {
       values: [],
       type: FieldType.number,
-      config: { color: { fixedColor: 'red' } },
+      config: { color: { mode: FieldColorModeId.Fixed, fixedColor: 'red' } },
     },
     [NodeGraphDataFrameFieldNames.color]: {
       values: [],
       type: FieldType.number,
-      config: { color: { mode: 'continuous-GrYlRd' } },
+      config: { color: { mode: FieldColorModeId.ContinuousGrYlRd } },
     },
     [NodeGraphDataFrameFieldNames.icon]: {
       values: [],
@@ -418,8 +429,8 @@ function nodesFrame() {
 
   return new MutableDataFrame({
     name: 'nodes',
-    fields: Object.keys(fields).map((key) => ({
-      ...fields[key],
+    fields: Object.entries(fields).map(([key, value]) => ({
+      ...value,
       name: key,
     })),
   });
@@ -440,7 +451,7 @@ export function makeEdgesDataFrame(
 }
 
 function edgesFrame() {
-  const fields: any = {
+  const fields = {
     [NodeGraphDataFrameFieldNames.id]: {
       values: [],
       type: FieldType.string,
@@ -465,8 +476,8 @@ function edgesFrame() {
 
   return new MutableDataFrame({
     name: 'edges',
-    fields: Object.keys(fields).map((key) => ({
-      ...fields[key],
+    fields: Object.entries(fields).map(([key, value]) => ({
+      ...value,
       name: key,
     })),
   });
diff --git a/public/app/plugins/panel/piechart/PieChart.tsx b/public/app/plugins/panel/piechart/PieChart.tsx
index d12f5456667da..674af3e1cf9d4 100644
--- a/public/app/plugins/panel/piechart/PieChart.tsx
+++ b/public/app/plugins/panel/piechart/PieChart.tsx
@@ -249,7 +249,7 @@ function PieSlice({ arc, pie, highlightState, openMenu, fill, tooltip, tooltipOp
       onMouseMove={tooltipOptions.mode !== 'none' ? onMouseMoveOverArc : undefined}
       onMouseOut={onMouseOut}
       onClick={openMenu}
-      aria-label={selectors.components.Panels.Visualization.PieChart.svgSlice}
+      data-testid={selectors.components.Panels.Visualization.PieChart.svgSlice}
     >
       <path d={pie.path({ ...arc })!} fill={fill} stroke={theme.colors.background.primary} strokeWidth={1} />
     </g>
diff --git a/public/app/plugins/panel/piechart/PieChartPanel.test.tsx b/public/app/plugins/panel/piechart/PieChartPanel.test.tsx
index 48b995f634445..99b3d73e1c19b 100644
--- a/public/app/plugins/panel/piechart/PieChartPanel.test.tsx
+++ b/public/app/plugins/panel/piechart/PieChartPanel.test.tsx
@@ -60,7 +60,7 @@ describe('PieChartPanel', () => {
       it('should not filter out any slices or legend items', () => {
         setup({ data: { series: seriesWithNoOverrides } });
 
-        const slices = screen.queryAllByLabelText('Pie Chart Slice');
+        const slices = screen.queryAllByTestId('data testid Pie Chart Slice');
         expect(slices.length).toBe(3);
         expect(screen.queryByText(/Chrome/i)).toBeInTheDocument();
         expect(screen.queryByText(/Firefox/i)).toBeInTheDocument();
@@ -92,7 +92,7 @@ describe('PieChartPanel', () => {
       it('should filter out the Firefox pie chart slice but not the legend', () => {
         setup({ data: { series: seriesWithFirefoxOverride } });
 
-        const slices = screen.queryAllByLabelText('Pie Chart Slice');
+        const slices = screen.queryAllByTestId('data testid Pie Chart Slice');
         expect(slices.length).toBe(2);
         expect(screen.queryByText(/Firefox/i)).toBeInTheDocument();
       });
@@ -122,13 +122,13 @@ describe('PieChartPanel', () => {
       it('should filter out the Firefox series with value 190 from the multi tooltip', async () => {
         setup({ data: { series: seriesWithFirefoxOverride } });
 
-        await userEvent.hover(screen.getAllByLabelText('Pie Chart Slice')[0]);
+        await userEvent.hover(screen.getAllByTestId('data testid Pie Chart Slice')[0]);
         expect(screen.queryByText(/600/i)).toBeInTheDocument();
         expect(screen.queryByText(/190/i)).not.toBeInTheDocument();
         expect(screen.queryByText(/210/i)).toBeInTheDocument();
 
         expect(screen.queryByText(/Firefox/i)).toBeInTheDocument();
-        const slices = screen.queryAllByLabelText('Pie Chart Slice');
+        const slices = screen.queryAllByTestId('data testid Pie Chart Slice');
         expect(slices.length).toBe(3);
       });
     });
@@ -158,7 +158,7 @@ describe('PieChartPanel', () => {
         setup({ data: { series: seriesWithFirefoxOverride } });
 
         expect(screen.queryByText(/Firefox/i)).not.toBeInTheDocument();
-        const slices = screen.queryAllByLabelText('Pie Chart Slice');
+        const slices = screen.queryAllByTestId('data testid Pie Chart Slice');
         expect(slices.length).toBe(3);
       });
     });
diff --git a/public/app/plugins/panel/piechart/panelcfg.gen.ts b/public/app/plugins/panel/piechart/panelcfg.gen.ts
index 6d64ec8f2de4d..494d6678173ed 100644
--- a/public/app/plugins/panel/piechart/panelcfg.gen.ts
+++ b/public/app/plugins/panel/piechart/panelcfg.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/public/app/plugins/panel/stat/StatMigrations.ts b/public/app/plugins/panel/stat/StatMigrations.ts
index 4eb5bbdb6c870..2708ef744125f 100644
--- a/public/app/plugins/panel/stat/StatMigrations.ts
+++ b/public/app/plugins/panel/stat/StatMigrations.ts
@@ -6,7 +6,7 @@ import { Options } from './panelcfg.gen';
 
 // This is called when the panel changes from another panel
 export const statPanelChangedHandler = (
-  panel: PanelModel<Partial<Options>> | any,
+  panel: PanelModel<Partial<Options>>,
   prevPluginId: string,
   prevOptions: any
 ) => {
diff --git a/public/app/plugins/panel/stat/StatPanel.tsx b/public/app/plugins/panel/stat/StatPanel.tsx
index 2300fc20dcd29..4e1b45849b886 100644
--- a/public/app/plugins/panel/stat/StatPanel.tsx
+++ b/public/app/plugins/panel/stat/StatPanel.tsx
@@ -24,7 +24,7 @@ export class StatPanel extends PureComponent<PanelProps<Options>> {
     menuProps: DataLinksContextMenuApi
   ): JSX.Element => {
     const { timeRange, options } = this.props;
-    const { value, alignmentFactors, width, height, count, orientation } = valueProps;
+    const { value, alignmentFactors, width, height, count } = valueProps;
     const { openMenu, targetClassName } = menuProps;
     let sparkline = value.sparkline;
     if (sparkline) {
@@ -41,14 +41,13 @@ export class StatPanel extends PureComponent<PanelProps<Options>> {
         justifyMode={options.justifyMode}
         textMode={this.getTextMode()}
         alignmentFactors={alignmentFactors}
-        parentOrientation={orientation}
         text={options.text}
         width={width}
         height={height}
         theme={config.theme2}
         onClick={openMenu}
         className={targetClassName}
-        disableWideLayout={true}
+        disableWideLayout={!options.wideLayout}
       />
     );
   };
@@ -113,6 +112,7 @@ export class StatPanel extends PureComponent<PanelProps<Options>> {
       theme: config.theme2,
       data: data.series,
       sparkline: options.graphMode !== BigValueGraphMode.None,
+      percentChange: options.showPercentChange,
       timeZone,
     });
   };
diff --git a/public/app/plugins/panel/stat/module.tsx b/public/app/plugins/panel/stat/module.tsx
index 98b5b4c8784a8..5d0a5757c05de 100644
--- a/public/app/plugins/panel/stat/module.tsx
+++ b/public/app/plugins/panel/stat/module.tsx
@@ -17,22 +17,36 @@ export const plugin = new PanelPlugin<Options>(StatPanel)
     addOrientationOption(builder, mainCategory);
     commonOptionsBuilder.addTextSizeOptions(builder);
 
-    builder.addSelect({
-      path: 'textMode',
-      name: 'Text mode',
-      description: 'Control if name and value is displayed or just name',
-      category: mainCategory,
-      settings: {
-        options: [
-          { value: BigValueTextMode.Auto, label: 'Auto' },
-          { value: BigValueTextMode.Value, label: 'Value' },
-          { value: BigValueTextMode.ValueAndName, label: 'Value and name' },
-          { value: BigValueTextMode.Name, label: 'Name' },
-          { value: BigValueTextMode.None, label: 'None' },
-        ],
-      },
-      defaultValue: defaultOptions.textMode,
-    });
+    builder
+      .addSelect({
+        path: 'textMode',
+        name: 'Text mode',
+        description: 'Control if name and value is displayed or just name',
+        category: mainCategory,
+        settings: {
+          options: [
+            { value: BigValueTextMode.Auto, label: 'Auto' },
+            { value: BigValueTextMode.Value, label: 'Value' },
+            { value: BigValueTextMode.ValueAndName, label: 'Value and name' },
+            { value: BigValueTextMode.Name, label: 'Name' },
+            { value: BigValueTextMode.None, label: 'None' },
+          ],
+        },
+        defaultValue: defaultOptions.textMode,
+      })
+      .addRadio({
+        path: 'wideLayout',
+        name: 'Wide layout',
+        category: mainCategory,
+        settings: {
+          options: [
+            { value: true, label: 'On' },
+            { value: false, label: 'Off' },
+          ],
+        },
+        defaultValue: defaultOptions.wideLayout,
+        showIf: (config) => config.textMode === BigValueTextMode.ValueAndName,
+      });
 
     builder
       .addSelect({
@@ -73,6 +87,13 @@ export const plugin = new PanelPlugin<Options>(StatPanel)
             { value: BigValueJustifyMode.Center, label: 'Center' },
           ],
         },
+      })
+      .addBooleanSwitch({
+        path: 'showPercentChange',
+        name: 'Show percent change',
+        defaultValue: defaultOptions.showPercentChange,
+        category: mainCategory,
+        showIf: (config) => !config.reduceOptions.values,
       });
   })
   .setNoPadding()
diff --git a/public/app/plugins/panel/stat/panelcfg.cue b/public/app/plugins/panel/stat/panelcfg.cue
index 1cc5b2d768c04..c38de15d9b18c 100644
--- a/public/app/plugins/panel/stat/panelcfg.cue
+++ b/public/app/plugins/panel/stat/panelcfg.cue
@@ -27,10 +27,12 @@ composableKinds: PanelCfg: {
 			schema: {
 				Options: {
 					common.SingleStatBaseOptions
-					graphMode:   common.BigValueGraphMode & (*"area" | _)
-					colorMode:   common.BigValueColorMode & (*"value" | _)
-					justifyMode: common.BigValueJustifyMode & (*"auto" | _)
-					textMode:    common.BigValueTextMode & (*"auto" | _)
+					graphMode:         common.BigValueGraphMode & (*"area" | _)
+					colorMode:         common.BigValueColorMode & (*"value" | _)
+					justifyMode:       common.BigValueJustifyMode & (*"auto" | _)
+					textMode:          common.BigValueTextMode & (*"auto" | _)
+					wideLayout:        bool | *true
+					showPercentChange: bool | *false
 				} @cuetsy(kind="interface")
 			}
 		}]
diff --git a/public/app/plugins/panel/stat/panelcfg.gen.ts b/public/app/plugins/panel/stat/panelcfg.gen.ts
index 03bf666935c0e..2f02876b8450f 100644
--- a/public/app/plugins/panel/stat/panelcfg.gen.ts
+++ b/public/app/plugins/panel/stat/panelcfg.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
@@ -14,12 +14,16 @@ export interface Options extends common.SingleStatBaseOptions {
   colorMode: common.BigValueColorMode;
   graphMode: common.BigValueGraphMode;
   justifyMode: common.BigValueJustifyMode;
+  showPercentChange: boolean;
   textMode: common.BigValueTextMode;
+  wideLayout: boolean;
 }
 
 export const defaultOptions: Partial<Options> = {
   colorMode: common.BigValueColorMode.Value,
   graphMode: common.BigValueGraphMode.Area,
   justifyMode: common.BigValueJustifyMode.Auto,
+  showPercentChange: false,
   textMode: common.BigValueTextMode.Auto,
+  wideLayout: true,
 };
diff --git a/public/app/plugins/panel/state-timeline/StateTimelinePanel.tsx b/public/app/plugins/panel/state-timeline/StateTimelinePanel.tsx
index 28605270859b9..93874e7ba4fab 100644
--- a/public/app/plugins/panel/state-timeline/StateTimelinePanel.tsx
+++ b/public/app/plugins/panel/state-timeline/StateTimelinePanel.tsx
@@ -2,16 +2,20 @@ import React, { useCallback, useMemo, useRef, useState } from 'react';
 
 import { CartesianCoords2D, DashboardCursorSync, DataFrame, FieldType, PanelProps } from '@grafana/data';
 import { getLastStreamingDataFramePacket } from '@grafana/data/src/dataframe/StreamingDataFrame';
+import { config } from '@grafana/runtime';
 import {
+  EventBusPlugin,
   Portal,
   TooltipDisplayMode,
+  TooltipPlugin2,
   UPlotConfigBuilder,
   usePanelContext,
   useTheme2,
   VizTooltipContainer,
   ZoomPlugin,
 } from '@grafana/ui';
-import { HoverEvent, addTooltipSupport } from '@grafana/ui/src/components/uPlot/config/addTooltipSupport';
+import { addTooltipSupport, HoverEvent } from '@grafana/ui/src/components/uPlot/config/addTooltipSupport';
+import { TimeRange2, TooltipHoverMode } from '@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2';
 import { CloseButton } from 'app/core/components/CloseButton/CloseButton';
 import { TimelineChart } from 'app/core/components/TimelineChart/TimelineChart';
 import {
@@ -22,10 +26,12 @@ import {
 
 import { AnnotationEditorPlugin } from '../timeseries/plugins/AnnotationEditorPlugin';
 import { AnnotationsPlugin } from '../timeseries/plugins/AnnotationsPlugin';
+import { AnnotationsPlugin2 } from '../timeseries/plugins/AnnotationsPlugin2';
 import { OutsideRangePlugin } from '../timeseries/plugins/OutsideRangePlugin';
 import { getTimezones } from '../timeseries/utils';
 
 import { StateTimelineTooltip } from './StateTimelineTooltip';
+import { StateTimelineTooltip2 } from './StateTimelineTooltip2';
 import { Options } from './panelcfg.gen';
 
 const TOOLTIP_OFFSET = 10;
@@ -47,6 +53,19 @@ export const StateTimelinePanel = ({
 }: TimelinePanelProps) => {
   const theme = useTheme2();
 
+  // TODO: we should just re-init when this changes, and have this be a static setting
+  const syncTooltip = useCallback(
+    () => sync?.() === DashboardCursorSync.Tooltip,
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
+
+  const syncAny = useCallback(
+    () => sync?.() !== DashboardCursorSync.Off,
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
+
   const oldConfig = useRef<UPlotConfigBuilder | undefined>(undefined);
   const isToolTipOpen = useRef<boolean>(false);
 
@@ -56,7 +75,9 @@ export const StateTimelinePanel = ({
   const [focusedPointIdx, setFocusedPointIdx] = useState<number | null>(null);
   const [isActive, setIsActive] = useState<boolean>(false);
   const [shouldDisplayCloseButton, setShouldDisplayCloseButton] = useState<boolean>(false);
-  const { sync, canAddAnnotations } = usePanelContext();
+  // temp range set for adding new annotation set by TooltipPlugin2, consumed by AnnotationPlugin2
+  const [newAnnotationRange, setNewAnnotationRange] = useState<TimeRange2 | null>(null);
+  const { sync, canAddAnnotations, dataLinkPostProcessor, eventBus } = usePanelContext();
 
   const onCloseToolTip = () => {
     isToolTipOpen.current = false;
@@ -102,10 +123,7 @@ export const StateTimelinePanel = ({
        * Render nothing in this case to prevent error.
        * See https://github.com/grafana/support-escalations/issues/932
        */
-      if (
-        (!alignedData.meta?.transformations?.length && alignedData.fields.length - 1 !== valueFieldsCount) ||
-        !alignedData.fields[seriesIdx]
-      ) {
+      if (alignedData.fields.length - 1 !== valueFieldsCount || !alignedData.fields[seriesIdx]) {
         return null;
       }
 
@@ -159,6 +177,7 @@ export const StateTimelinePanel = ({
     }
   }
   const enableAnnotationCreation = Boolean(canAddAnnotations && canAddAnnotations());
+  const showNewVizTooltips = Boolean(config.featureToggles.newVizTooltips);
 
   return (
     <TimelineChart
@@ -172,11 +191,13 @@ export const StateTimelinePanel = ({
       legendItems={legendItems}
       {...options}
       mode={TimelineMode.Changes}
+      replaceVariables={replaceVariables}
+      dataLinkPostProcessor={dataLinkPostProcessor}
     >
-      {(config, alignedFrame) => {
-        if (oldConfig.current !== config) {
+      {(builder, alignedFrame) => {
+        if (oldConfig.current !== builder && !showNewVizTooltips) {
           oldConfig.current = addTooltipSupport({
-            config,
+            config: builder,
             onUPlotClick,
             setFocusedSeriesIdx,
             setFocusedPointIdx,
@@ -191,55 +212,112 @@ export const StateTimelinePanel = ({
 
         return (
           <>
-            <ZoomPlugin config={config} onZoom={onChangeTimeRange} />
+            <EventBusPlugin config={builder} sync={syncAny} eventBus={eventBus} frame={alignedFrame} />
+            {showNewVizTooltips ? (
+              <>
+                {options.tooltip.mode !== TooltipDisplayMode.None && (
+                  <TooltipPlugin2
+                    config={builder}
+                    hoverMode={
+                      options.tooltip.mode === TooltipDisplayMode.Multi ? TooltipHoverMode.xAll : TooltipHoverMode.xOne
+                    }
+                    queryZoom={onChangeTimeRange}
+                    syncTooltip={syncTooltip}
+                    render={(u, dataIdxs, seriesIdx, isPinned, dismiss, timeRange2, viaSync) => {
+                      if (enableAnnotationCreation && timeRange2 != null) {
+                        setNewAnnotationRange(timeRange2);
+                        dismiss();
+                        return;
+                      }
 
-            <OutsideRangePlugin config={config} onChangeTimeRange={onChangeTimeRange} />
+                      const annotate = () => {
+                        let xVal = u.posToVal(u.cursor.left!, 'x');
 
-            {data.annotations && (
-              <AnnotationsPlugin annotations={data.annotations} config={config} timeZone={timeZone} />
-            )}
+                        setNewAnnotationRange({ from: xVal, to: xVal });
+                        dismiss();
+                      };
 
-            {enableAnnotationCreation ? (
-              <AnnotationEditorPlugin data={alignedFrame} timeZone={timeZone} config={config}>
-                {({ startAnnotating }) => {
-                  if (options.tooltip.mode === TooltipDisplayMode.None) {
-                    return null;
-                  }
-
-                  if (focusedPointIdx === null || (!isActive && sync && sync() === DashboardCursorSync.Crosshair)) {
-                    return null;
-                  }
-
-                  return (
-                    <Portal>
-                      {hover && coords && focusedSeriesIdx && (
-                        <VizTooltipContainer
-                          position={{ x: coords.viewport.x, y: coords.viewport.y }}
-                          offset={{ x: TOOLTIP_OFFSET, y: TOOLTIP_OFFSET }}
-                          allowPointerEvents={isToolTipOpen.current}
-                        >
-                          {renderCustomTooltip(alignedFrame, focusedSeriesIdx, focusedPointIdx, () => {
-                            startAnnotating({ coords: { plotCanvas: coords.canvas, viewport: coords.viewport } });
-                            onCloseToolTip();
-                          })}
-                        </VizTooltipContainer>
-                      )}
-                    </Portal>
-                  );
-                }}
-              </AnnotationEditorPlugin>
+                      return (
+                        <StateTimelineTooltip2
+                          frames={frames ?? []}
+                          seriesFrame={alignedFrame}
+                          dataIdxs={dataIdxs}
+                          seriesIdx={seriesIdx}
+                          mode={viaSync ? TooltipDisplayMode.Multi : options.tooltip.mode}
+                          sortOrder={options.tooltip.sort}
+                          isPinned={isPinned}
+                          timeRange={timeRange}
+                          annotate={enableAnnotationCreation ? annotate : undefined}
+                          withDuration={true}
+                        />
+                      );
+                    }}
+                    maxWidth={options.tooltip.maxWidth}
+                    maxHeight={options.tooltip.maxHeight}
+                  />
+                )}
+                {/* Renders annotations */}
+                <AnnotationsPlugin2
+                  annotations={data.annotations ?? []}
+                  config={builder}
+                  timeZone={timeZone}
+                  newRange={newAnnotationRange}
+                  setNewRange={setNewAnnotationRange}
+                  canvasRegionRendering={false}
+                />
+              </>
             ) : (
-              <Portal>
-                {options.tooltip.mode !== TooltipDisplayMode.None && hover && coords && (
-                  <VizTooltipContainer
-                    position={{ x: coords.viewport.x, y: coords.viewport.y }}
-                    offset={{ x: TOOLTIP_OFFSET, y: TOOLTIP_OFFSET }}
-                    allowPointerEvents={isToolTipOpen.current}
-                  >
-                    {renderCustomTooltip(alignedFrame, focusedSeriesIdx, focusedPointIdx)}
-                  </VizTooltipContainer>
+              <>
+                <ZoomPlugin config={builder} onZoom={onChangeTimeRange} />
+                <OutsideRangePlugin config={builder} onChangeTimeRange={onChangeTimeRange} />
+                {/* Renders annotation markers*/}
+                {data.annotations && (
+                  <AnnotationsPlugin annotations={data.annotations} config={builder} timeZone={timeZone} />
+                )}
+
+                {enableAnnotationCreation ? (
+                  <AnnotationEditorPlugin data={alignedFrame} timeZone={timeZone} config={builder}>
+                    {({ startAnnotating }) => {
+                      if (options.tooltip.mode === TooltipDisplayMode.None) {
+                        return null;
+                      }
+
+                      if (focusedPointIdx === null || (!isActive && sync && sync() === DashboardCursorSync.Crosshair)) {
+                        return null;
+                      }
+
+                      return (
+                        <Portal>
+                          {hover && coords && focusedSeriesIdx && (
+                            <VizTooltipContainer
+                              position={{ x: coords.viewport.x, y: coords.viewport.y }}
+                              offset={{ x: TOOLTIP_OFFSET, y: TOOLTIP_OFFSET }}
+                              allowPointerEvents={isToolTipOpen.current}
+                            >
+                              {renderCustomTooltip(alignedFrame, focusedSeriesIdx, focusedPointIdx, () => {
+                                startAnnotating({ coords: { plotCanvas: coords.canvas, viewport: coords.viewport } });
+                                onCloseToolTip();
+                              })}
+                            </VizTooltipContainer>
+                          )}
+                        </Portal>
+                      );
+                    }}
+                  </AnnotationEditorPlugin>
+                ) : (
+                  <Portal>
+                    {options.tooltip.mode !== TooltipDisplayMode.None && hover && coords && (
+                      <VizTooltipContainer
+                        position={{ x: coords.viewport.x, y: coords.viewport.y }}
+                        offset={{ x: TOOLTIP_OFFSET, y: TOOLTIP_OFFSET }}
+                        allowPointerEvents={isToolTipOpen.current}
+                      >
+                        {renderCustomTooltip(alignedFrame, focusedSeriesIdx, focusedPointIdx)}
+                      </VizTooltipContainer>
+                    )}
+                  </Portal>
                 )}
-              </Portal>
+              </>
             )}
           </>
         );
diff --git a/public/app/plugins/panel/state-timeline/StateTimelineTooltip2.tsx b/public/app/plugins/panel/state-timeline/StateTimelineTooltip2.tsx
new file mode 100644
index 0000000000000..8c2af2b7c8000
--- /dev/null
+++ b/public/app/plugins/panel/state-timeline/StateTimelineTooltip2.tsx
@@ -0,0 +1,90 @@
+import React, { ReactNode } from 'react';
+
+import { FieldType, getFieldDisplayName, TimeRange } from '@grafana/data';
+import { SortOrder } from '@grafana/schema/dist/esm/common/common.gen';
+import { TooltipDisplayMode, useStyles2 } from '@grafana/ui';
+import { VizTooltipContent } from '@grafana/ui/src/components/VizTooltip/VizTooltipContent';
+import { VizTooltipFooter } from '@grafana/ui/src/components/VizTooltip/VizTooltipFooter';
+import { VizTooltipHeader } from '@grafana/ui/src/components/VizTooltip/VizTooltipHeader';
+import { VizTooltipItem } from '@grafana/ui/src/components/VizTooltip/types';
+import { getContentItems } from '@grafana/ui/src/components/VizTooltip/utils';
+import { findNextStateIndex, fmtDuration } from 'app/core/components/TimelineChart/utils';
+
+import { getDataLinks } from '../status-history/utils';
+import { TimeSeriesTooltipProps, getStyles } from '../timeseries/TimeSeriesTooltip';
+
+interface StateTimelineTooltip2Props extends TimeSeriesTooltipProps {
+  timeRange: TimeRange;
+  withDuration: boolean;
+}
+
+export const StateTimelineTooltip2 = ({
+  frames,
+  seriesFrame,
+  dataIdxs,
+  seriesIdx,
+  mode = TooltipDisplayMode.Single,
+  sortOrder = SortOrder.None,
+  scrollable = false,
+  isPinned,
+  annotate,
+  timeRange,
+  withDuration,
+}: StateTimelineTooltip2Props) => {
+  const styles = useStyles2(getStyles);
+
+  const xField = seriesFrame.fields[0];
+
+  const dataIdx = seriesIdx != null ? dataIdxs[seriesIdx] : dataIdxs.find((idx) => idx != null);
+
+  const xVal = xField.display!(xField.values[dataIdx!]).text;
+
+  mode = isPinned ? TooltipDisplayMode.Single : mode;
+
+  const contentItems = getContentItems(seriesFrame.fields, xField, dataIdxs, seriesIdx, mode, sortOrder);
+
+  // append duration in single mode
+  if (withDuration && mode === TooltipDisplayMode.Single) {
+    const field = seriesFrame.fields[seriesIdx!];
+    const nextStateIdx = findNextStateIndex(field, dataIdx!);
+    let nextStateTs;
+    if (nextStateIdx) {
+      nextStateTs = xField.values[nextStateIdx!];
+    }
+
+    const stateTs = xField.values[dataIdx!];
+    let duration: string;
+
+    if (nextStateTs) {
+      duration = nextStateTs && fmtDuration(nextStateTs - stateTs);
+    } else {
+      const to = timeRange.to.valueOf();
+      duration = fmtDuration(to - stateTs);
+    }
+
+    contentItems.push({ label: 'Duration', value: duration });
+  }
+
+  let footer: ReactNode;
+
+  if (isPinned && seriesIdx != null) {
+    const field = seriesFrame.fields[seriesIdx];
+    const dataIdx = dataIdxs[seriesIdx]!;
+    const links = getDataLinks(field, dataIdx);
+
+    footer = <VizTooltipFooter dataLinks={links} annotate={annotate} />;
+  }
+
+  const headerItem: VizTooltipItem = {
+    label: xField.type === FieldType.time ? '' : getFieldDisplayName(xField, seriesFrame, frames),
+    value: xVal,
+  };
+
+  return (
+    <div className={styles.wrapper}>
+      <VizTooltipHeader item={headerItem} isPinned={isPinned} />
+      <VizTooltipContent items={contentItems} isPinned={isPinned} scrollable={scrollable} />
+      {footer}
+    </div>
+  );
+};
diff --git a/public/app/plugins/panel/state-timeline/module.tsx b/public/app/plugins/panel/state-timeline/module.tsx
index 8dfab7fcdcebb..e18f695f7c3f8 100644
--- a/public/app/plugins/panel/state-timeline/module.tsx
+++ b/public/app/plugins/panel/state-timeline/module.tsx
@@ -5,6 +5,7 @@ import {
   identityOverrideProcessor,
   PanelPlugin,
 } from '@grafana/data';
+import { config } from '@grafana/runtime';
 import { VisibilityMode } from '@grafana/schema';
 import { commonOptionsBuilder } from '@grafana/ui';
 
@@ -14,7 +15,7 @@ import { NullEditorSettings } from '../timeseries/config';
 
 import { StateTimelinePanel } from './StateTimelinePanel';
 import { timelinePanelChangedHandler } from './migrations';
-import { Options, FieldConfig, defaultOptions, defaultFieldConfig } from './panelcfg.gen';
+import { defaultFieldConfig, defaultOptions, FieldConfig, Options } from './panelcfg.gen';
 import { StatTimelineSuggestionsSupplier } from './suggestions';
 
 export const plugin = new PanelPlugin<Options, FieldConfig>(StateTimelinePanel)
@@ -121,7 +122,7 @@ export const plugin = new PanelPlugin<Options, FieldConfig>(StateTimelinePanel)
       });
 
     commonOptionsBuilder.addLegendOptions(builder, false);
-    commonOptionsBuilder.addTooltipOptions(builder, true);
+    commonOptionsBuilder.addTooltipOptions(builder, !config.featureToggles.newVizTooltips);
   })
   .setSuggestionsSupplier(new StatTimelineSuggestionsSupplier())
   .setDataSupport({ annotations: true });
diff --git a/public/app/plugins/panel/state-timeline/panelcfg.gen.ts b/public/app/plugins/panel/state-timeline/panelcfg.gen.ts
index 12d089f67611b..fb03ba0795fc5 100644
--- a/public/app/plugins/panel/state-timeline/panelcfg.gen.ts
+++ b/public/app/plugins/panel/state-timeline/panelcfg.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/public/app/plugins/panel/status-history/StatusHistoryPanel.tsx b/public/app/plugins/panel/status-history/StatusHistoryPanel.tsx
index be421751558c2..57178bf15c8d8 100644
--- a/public/app/plugins/panel/status-history/StatusHistoryPanel.tsx
+++ b/public/app/plugins/panel/status-history/StatusHistoryPanel.tsx
@@ -1,16 +1,20 @@
 import React, { useCallback, useMemo, useRef, useState } from 'react';
 
 import { CartesianCoords2D, DashboardCursorSync, DataFrame, FieldType, PanelProps } from '@grafana/data';
+import { config } from '@grafana/runtime';
 import {
+  EventBusPlugin,
   Portal,
   TooltipDisplayMode,
+  TooltipPlugin2,
   UPlotConfigBuilder,
   usePanelContext,
   useTheme2,
   VizTooltipContainer,
   ZoomPlugin,
 } from '@grafana/ui';
-import { HoverEvent, addTooltipSupport } from '@grafana/ui/src/components/uPlot/config/addTooltipSupport';
+import { addTooltipSupport, HoverEvent } from '@grafana/ui/src/components/uPlot/config/addTooltipSupport';
+import { TimeRange2, TooltipHoverMode } from '@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2';
 import { CloseButton } from 'app/core/components/CloseButton/CloseButton';
 import { TimelineChart } from 'app/core/components/TimelineChart/TimelineChart';
 import {
@@ -19,6 +23,9 @@ import {
   TimelineMode,
 } from 'app/core/components/TimelineChart/utils';
 
+import { StateTimelineTooltip2 } from '../state-timeline/StateTimelineTooltip2';
+import { AnnotationsPlugin } from '../timeseries/plugins/AnnotationsPlugin';
+import { AnnotationsPlugin2 } from '../timeseries/plugins/AnnotationsPlugin2';
 import { OutsideRangePlugin } from '../timeseries/plugins/OutsideRangePlugin';
 import { getTimezones } from '../timeseries/utils';
 
@@ -39,10 +46,24 @@ export const StatusHistoryPanel = ({
   options,
   width,
   height,
+  replaceVariables,
   onChangeTimeRange,
 }: TimelinePanelProps) => {
   const theme = useTheme2();
 
+  // TODO: we should just re-init when this changes, and have this be a static setting
+  const syncTooltip = useCallback(
+    () => sync?.() === DashboardCursorSync.Tooltip,
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
+
+  const syncAny = useCallback(
+    () => sync?.() !== DashboardCursorSync.Off,
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
+
   const oldConfig = useRef<UPlotConfigBuilder | undefined>(undefined);
   const isToolTipOpen = useRef<boolean>(false);
 
@@ -52,7 +73,11 @@ export const StatusHistoryPanel = ({
   const [focusedPointIdx, setFocusedPointIdx] = useState<number | null>(null);
   const [isActive, setIsActive] = useState<boolean>(false);
   const [shouldDisplayCloseButton, setShouldDisplayCloseButton] = useState<boolean>(false);
-  const { sync } = usePanelContext();
+  // temp range set for adding new annotation set by TooltipPlugin2, consumed by AnnotationPlugin2
+  const [newAnnotationRange, setNewAnnotationRange] = useState<TimeRange2 | null>(null);
+  const { sync, canAddAnnotations, dataLinkPostProcessor, eventBus } = usePanelContext();
+
+  const enableAnnotationCreation = Boolean(canAddAnnotations && canAddAnnotations());
 
   const onCloseToolTip = () => {
     isToolTipOpen.current = false;
@@ -98,10 +123,7 @@ export const StatusHistoryPanel = ({
        * Render nothing in this case to prevent error.
        * See https://github.com/grafana/support-escalations/issues/932
        */
-      if (
-        (!alignedData.meta?.transformations?.length && alignedData.fields.length - 1 !== valueFieldsCount) ||
-        !alignedData.fields[seriesIdx]
-      ) {
+      if (alignedData.fields.length - 1 !== valueFieldsCount || !alignedData.fields[seriesIdx]) {
         return null;
       }
 
@@ -185,6 +207,8 @@ export const StatusHistoryPanel = ({
     );
   }
 
+  const showNewVizTooltips = Boolean(config.featureToggles.newVizTooltips);
+
   return (
     <TimelineChart
       theme={theme}
@@ -197,11 +221,13 @@ export const StatusHistoryPanel = ({
       legendItems={legendItems}
       {...options}
       mode={TimelineMode.Samples}
+      replaceVariables={replaceVariables}
+      dataLinkPostProcessor={dataLinkPostProcessor}
     >
-      {(config, alignedFrame) => {
-        if (oldConfig.current !== config) {
+      {(builder, alignedFrame) => {
+        if (oldConfig.current !== builder && !showNewVizTooltips) {
           oldConfig.current = addTooltipSupport({
-            config,
+            config: builder,
             onUPlotClick,
             setFocusedSeriesIdx,
             setFocusedPointIdx,
@@ -215,9 +241,74 @@ export const StatusHistoryPanel = ({
 
         return (
           <>
-            <ZoomPlugin config={config} onZoom={onChangeTimeRange} />
-            {renderTooltip(alignedFrame)}
-            <OutsideRangePlugin config={config} onChangeTimeRange={onChangeTimeRange} />
+            <EventBusPlugin config={builder} sync={syncAny} eventBus={eventBus} frame={alignedFrame} />
+            {showNewVizTooltips ? (
+              <>
+                {options.tooltip.mode !== TooltipDisplayMode.None && (
+                  <TooltipPlugin2
+                    config={builder}
+                    hoverMode={
+                      options.tooltip.mode === TooltipDisplayMode.Multi ? TooltipHoverMode.xAll : TooltipHoverMode.xOne
+                    }
+                    queryZoom={onChangeTimeRange}
+                    syncTooltip={syncTooltip}
+                    render={(u, dataIdxs, seriesIdx, isPinned, dismiss, timeRange2, viaSync) => {
+                      if (enableAnnotationCreation && timeRange2 != null) {
+                        setNewAnnotationRange(timeRange2);
+                        dismiss();
+                        return;
+                      }
+
+                      const annotate = () => {
+                        let xVal = u.posToVal(u.cursor.left!, 'x');
+
+                        setNewAnnotationRange({ from: xVal, to: xVal });
+                        dismiss();
+                      };
+
+                      return (
+                        <StateTimelineTooltip2
+                          frames={frames ?? []}
+                          seriesFrame={alignedFrame}
+                          dataIdxs={dataIdxs}
+                          seriesIdx={seriesIdx}
+                          mode={viaSync ? TooltipDisplayMode.Multi : options.tooltip.mode}
+                          sortOrder={options.tooltip.sort}
+                          isPinned={isPinned}
+                          timeRange={timeRange}
+                          annotate={enableAnnotationCreation ? annotate : undefined}
+                          withDuration={false}
+                        />
+                      );
+                    }}
+                    maxWidth={options.tooltip.maxWidth}
+                    maxHeight={options.tooltip.maxHeight}
+                  />
+                )}
+                <AnnotationsPlugin2
+                  annotations={data.annotations ?? []}
+                  config={builder}
+                  timeZone={timeZone}
+                  newRange={newAnnotationRange}
+                  setNewRange={setNewAnnotationRange}
+                  canvasRegionRendering={false}
+                />
+              </>
+            ) : (
+              <>
+                <ZoomPlugin config={builder} onZoom={onChangeTimeRange} />
+                {renderTooltip(alignedFrame)}
+                <OutsideRangePlugin config={builder} onChangeTimeRange={onChangeTimeRange} />
+                {data.annotations && (
+                  <AnnotationsPlugin
+                    annotations={data.annotations}
+                    config={builder}
+                    timeZone={timeZone}
+                    disableCanvasRendering={true}
+                  />
+                )}
+              </>
+            )}
           </>
         );
       }}
diff --git a/public/app/plugins/panel/status-history/module.tsx b/public/app/plugins/panel/status-history/module.tsx
index 9266f32623181..82b06291a11d8 100644
--- a/public/app/plugins/panel/status-history/module.tsx
+++ b/public/app/plugins/panel/status-history/module.tsx
@@ -1,4 +1,5 @@
 import { FieldColorModeId, FieldConfigProperty, PanelPlugin } from '@grafana/data';
+import { config } from '@grafana/runtime';
 import { VisibilityMode } from '@grafana/schema';
 import { commonOptionsBuilder } from '@grafana/ui';
 
@@ -80,6 +81,7 @@ export const plugin = new PanelPlugin<Options, FieldConfig>(StatusHistoryPanel)
       });
 
     commonOptionsBuilder.addLegendOptions(builder, false);
-    commonOptionsBuilder.addTooltipOptions(builder, true);
+    commonOptionsBuilder.addTooltipOptions(builder, !config.featureToggles.newVizTooltips);
   })
-  .setSuggestionsSupplier(new StatusHistorySuggestionsSupplier());
+  .setSuggestionsSupplier(new StatusHistorySuggestionsSupplier())
+  .setDataSupport({ annotations: true });
diff --git a/public/app/plugins/panel/status-history/panelcfg.gen.ts b/public/app/plugins/panel/status-history/panelcfg.gen.ts
index ef8b01455defc..8bc46e363d0d7 100644
--- a/public/app/plugins/panel/status-history/panelcfg.gen.ts
+++ b/public/app/plugins/panel/status-history/panelcfg.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/public/app/plugins/panel/status-history/utils.ts b/public/app/plugins/panel/status-history/utils.ts
new file mode 100644
index 0000000000000..946424eb2ec32
--- /dev/null
+++ b/public/app/plugins/panel/status-history/utils.ts
@@ -0,0 +1,20 @@
+import { Field, LinkModel } from '@grafana/data';
+
+export const getDataLinks = (field: Field, rowIdx: number) => {
+  const links: Array<LinkModel<Field>> = [];
+  const linkLookup = new Set<string>();
+
+  if ((field.config.links?.length ?? 0) > 0 && field.getLinks != null) {
+    const v = field.values[rowIdx];
+    const disp = field.display ? field.display(v) : { text: `${v}`, numeric: +v };
+    field.getLinks({ calculatedValue: disp, valueRowIndex: rowIdx }).forEach((link) => {
+      const key = `${link.title}/${link.href}`;
+      if (!linkLookup.has(key)) {
+        links.push(link);
+        linkLookup.add(key);
+      }
+    });
+  }
+
+  return links;
+};
diff --git a/public/app/plugins/panel/table-old/README.md b/public/app/plugins/panel/table-old/README.md
index fc55b75a2d350..6f6656bfa2914 100644
--- a/public/app/plugins/panel/table-old/README.md
+++ b/public/app/plugins/panel/table-old/README.md
@@ -4,6 +4,6 @@ The Table Panel is **included** with Grafana.
 
 The table panel is very flexible, supporting both multiple modes for time series as well as for table, annotation and raw JSON data. It also provides date formatting and value formatting and coloring options.
 
-Check out the [Table Panel Showcase in the Grafana Playground](http://play.grafana.org/dashboard/db/table-panel-showcase) or read more about it here:
+Check out the [Table Panel Showcase in the Grafana Playground](https://play.grafana.org/d/U_bZIMRMk/7-table-panel-showcase) or read more about it here:
 
 [https://grafana.com/docs/grafana/latest/features/panels/table_panel/](https://grafana.com/docs/grafana/latest/features/panels/table_panel/)
diff --git a/public/app/plugins/panel/table-old/module.ts b/public/app/plugins/panel/table-old/module.ts
index e6fa9c8ca7535..82d6903929efd 100644
--- a/public/app/plugins/panel/table-old/module.ts
+++ b/public/app/plugins/panel/table-old/module.ts
@@ -1,7 +1,9 @@
+import { IScope, IAngularStatic } from 'angular';
 import $ from 'jquery';
 import { defaults } from 'lodash';
 
 import { isTableData, PanelEvents, PanelPlugin } from '@grafana/data';
+import { AnnotationsSrv } from 'app/angular/services/annotations_srv';
 import config from 'app/core/config';
 import { applyFilterFromTable } from 'app/features/variables/adhoc/actions';
 import { MetricsPanelCtrl } from 'app/plugins/sdk';
@@ -56,9 +58,9 @@ export class TablePanelCtrl extends MetricsPanelCtrl {
   static $inject = ['$scope', '$injector', 'annotationsSrv', '$sanitize'];
 
   constructor(
-    $scope: any,
-    $injector: any,
-    private annotationsSrv: any,
+    $scope: IScope,
+    $injector: IAngularStatic['injector'],
+    private annotationsSrv: AnnotationsSrv,
     private $sanitize: any
   ) {
     super($scope, $injector);
@@ -101,12 +103,11 @@ export class TablePanelCtrl extends MetricsPanelCtrl {
           panel: this.panel,
           range: this.range,
         })
-        .then((anno: any) => {
+        .then((anno) => {
           this.loading = false;
           this.dataRaw = anno;
           this.pageIndex = 0;
           this.render();
-          return { data: this.dataRaw }; // Not used
         });
     }
 
@@ -170,7 +171,7 @@ export class TablePanelCtrl extends MetricsPanelCtrl {
     this.render();
   }
 
-  link(scope: any, elem: JQuery, attrs: any, ctrl: TablePanelCtrl) {
+  link(scope: IScope, elem: JQuery, attrs: any, ctrl: TablePanelCtrl) {
     let data: any;
     const panel = ctrl.panel;
     let pageCount = 0;
@@ -191,7 +192,7 @@ export class TablePanelCtrl extends MetricsPanelCtrl {
       tbodyElem.html(ctrl.renderer.render(ctrl.pageIndex));
     }
 
-    function switchPage(e: any) {
+    function switchPage(e: JQueryEventObject) {
       const el = $(e.currentTarget);
       ctrl.pageIndex = parseInt(el.text(), 10) - 1;
       renderPanel();
@@ -263,7 +264,7 @@ export class TablePanelCtrl extends MetricsPanelCtrl {
       unbindDestroy();
     });
 
-    ctrl.events.on(PanelEvents.render, (renderData: any) => {
+    ctrl.events.on(PanelEvents.render, (renderData: unknown) => {
       data = renderData || data;
       if (data) {
         renderPanel();
diff --git a/public/app/plugins/panel/table/README.md b/public/app/plugins/panel/table/README.md
index fc55b75a2d350..6f6656bfa2914 100644
--- a/public/app/plugins/panel/table/README.md
+++ b/public/app/plugins/panel/table/README.md
@@ -4,6 +4,6 @@ The Table Panel is **included** with Grafana.
 
 The table panel is very flexible, supporting both multiple modes for time series as well as for table, annotation and raw JSON data. It also provides date formatting and value formatting and coloring options.
 
-Check out the [Table Panel Showcase in the Grafana Playground](http://play.grafana.org/dashboard/db/table-panel-showcase) or read more about it here:
+Check out the [Table Panel Showcase in the Grafana Playground](https://play.grafana.org/d/U_bZIMRMk/7-table-panel-showcase) or read more about it here:
 
 [https://grafana.com/docs/grafana/latest/features/panels/table_panel/](https://grafana.com/docs/grafana/latest/features/panels/table_panel/)
diff --git a/public/app/plugins/panel/table/TableCellOptionEditor.tsx b/public/app/plugins/panel/table/TableCellOptionEditor.tsx
index f03957ff0a84d..1374b5ee64ca9 100644
--- a/public/app/plugins/panel/table/TableCellOptionEditor.tsx
+++ b/public/app/plugins/panel/table/TableCellOptionEditor.tsx
@@ -79,6 +79,7 @@ const cellDisplayModeOptions: Array<SelectableValue<TableCellOptions>> = [
   { value: { type: TableCellDisplayMode.ColorText }, label: 'Colored text' },
   { value: { type: TableCellDisplayMode.ColorBackground }, label: 'Colored background' },
   { value: { type: TableCellDisplayMode.Gauge }, label: 'Gauge' },
+  { value: { type: TableCellDisplayMode.DataLinks }, label: 'Data links' },
   { value: { type: TableCellDisplayMode.JSONView }, label: 'JSON View' },
   { value: { type: TableCellDisplayMode.Image }, label: 'Image' },
 ];
diff --git a/public/app/plugins/panel/table/TablePanel.tsx b/public/app/plugins/panel/table/TablePanel.tsx
index d9d4e85ec4080..e3d9d9f774d40 100644
--- a/public/app/plugins/panel/table/TablePanel.tsx
+++ b/public/app/plugins/panel/table/TablePanel.tsx
@@ -1,8 +1,15 @@
 import { css } from '@emotion/css';
 import React from 'react';
 
-import { DataFrame, FieldMatcherID, getFrameDisplayName, PanelProps, SelectableValue } from '@grafana/data';
-import { PanelDataErrorView } from '@grafana/runtime';
+import {
+  DashboardCursorSync,
+  DataFrame,
+  FieldMatcherID,
+  getFrameDisplayName,
+  PanelProps,
+  SelectableValue,
+} from '@grafana/data';
+import { config, PanelDataErrorView } from '@grafana/runtime';
 import { Select, Table, usePanelContext, useTheme2 } from '@grafana/ui';
 import { TableSortByFieldState } from '@grafana/ui/src/components/Table/types';
 
@@ -37,6 +44,8 @@ export function TablePanel(props: Props) {
     tableHeight = height - inputHeight - padding;
   }
 
+  const enableSharedCrosshair = panelContext.sync && panelContext.sync() !== DashboardCursorSync.Off;
+
   const tableElement = (
     <Table
       height={tableHeight}
@@ -53,6 +62,8 @@ export function TablePanel(props: Props) {
       enablePagination={options.footer?.enablePagination}
       cellHeight={options.cellHeight}
       timeRange={timeRange}
+      enableSharedCrosshair={config.featureToggles.tableSharedCrosshair && enableSharedCrosshair}
+      fieldConfig={fieldConfig}
     />
   );
 
diff --git a/public/app/plugins/panel/table/cells/BarGaugeCellOptionsEditor.tsx b/public/app/plugins/panel/table/cells/BarGaugeCellOptionsEditor.tsx
index 02797d3bf6dfd..59bf1e617a79a 100644
--- a/public/app/plugins/panel/table/cells/BarGaugeCellOptionsEditor.tsx
+++ b/public/app/plugins/panel/table/cells/BarGaugeCellOptionsEditor.tsx
@@ -1,9 +1,8 @@
 import React from 'react';
 
 import { SelectableValue } from '@grafana/data';
-import { Stack } from '@grafana/experimental';
 import { BarGaugeDisplayMode, BarGaugeValueMode, TableBarGaugeCellOptions } from '@grafana/schema';
-import { Field, RadioButtonGroup } from '@grafana/ui';
+import { Field, RadioButtonGroup, Stack } from '@grafana/ui';
 
 import { TableCellEditorProps } from '../TableCellOptionEditor';
 
diff --git a/public/app/plugins/panel/table/cells/ColorBackgroundCellOptionsEditor.tsx b/public/app/plugins/panel/table/cells/ColorBackgroundCellOptionsEditor.tsx
index 26bb955edf688..76cdf277e5d83 100644
--- a/public/app/plugins/panel/table/cells/ColorBackgroundCellOptionsEditor.tsx
+++ b/public/app/plugins/panel/table/cells/ColorBackgroundCellOptionsEditor.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { SelectableValue } from '@grafana/data';
 import { TableCellBackgroundDisplayMode, TableColoredBackgroundCellOptions } from '@grafana/schema';
-import { Field, RadioButtonGroup } from '@grafana/ui';
+import { Field, RadioButtonGroup, Switch } from '@grafana/ui';
 
 import { TableCellEditorProps } from '../TableCellOptionEditor';
 
@@ -21,13 +21,27 @@ export const ColorBackgroundCellOptionsEditor = ({
     onChange(cellOptions);
   };
 
+  // Handle row coloring changes
+  const onColorRowChange = () => {
+    cellOptions.applyToRow = !cellOptions.applyToRow;
+    onChange(cellOptions);
+  };
+
   return (
-    <Field label="Background display mode">
-      <RadioButtonGroup
-        value={cellOptions?.mode ?? TableCellBackgroundDisplayMode.Gradient}
-        onChange={onCellOptionsChange}
-        options={colorBackgroundOpts}
-      />
-    </Field>
+    <>
+      <Field label="Background display mode">
+        <RadioButtonGroup
+          value={cellOptions?.mode ?? TableCellBackgroundDisplayMode.Gradient}
+          onChange={onCellOptionsChange}
+          options={colorBackgroundOpts}
+        />
+      </Field>
+      <Field
+        label="Apply to entire row"
+        description="If selected the entire row will be colored as this cell would be."
+      >
+        <Switch value={cellOptions.applyToRow} onChange={onColorRowChange} />
+      </Field>
+    </>
   );
 };
diff --git a/public/app/plugins/panel/table/migrations.test.ts b/public/app/plugins/panel/table/migrations.test.ts
index fd952995ce57e..a40120c885725 100644
--- a/public/app/plugins/panel/table/migrations.test.ts
+++ b/public/app/plugins/panel/table/migrations.test.ts
@@ -126,6 +126,7 @@ describe('Table Migrations', () => {
         ],
       },
     };
+
     const panel = {} as PanelModel;
     tablePanelChangedHandler(panel, 'table-old', oldStyles);
     expect(panel).toMatchInlineSnapshot(`
@@ -269,6 +270,38 @@ describe('Table Migrations', () => {
     `);
   });
 
+  it('migrates hidden fields to override', () => {
+    const oldStyles = {
+      angular: {
+        columns: [],
+        styles: [
+          {
+            dateFormat: 'YYYY-MM-DD HH:mm:ss',
+            pattern: 'time',
+            type: 'hidden',
+          },
+        ],
+      },
+    };
+
+    const panel = {} as PanelModel;
+    tablePanelChangedHandler(panel, 'table-old', oldStyles);
+    expect(panel.fieldConfig.overrides).toEqual([
+      {
+        matcher: {
+          id: 'byName',
+          options: 'time',
+        },
+        properties: [
+          {
+            id: 'custom.hidden',
+            value: true,
+          },
+        ],
+      },
+    ]);
+  });
+
   it('migrates DataFrame[] from format using meta.custom.parentRowIndex to format using FieldType.nestedFrames', () => {
     const mainFrame = (refId: string) => {
       return createDataFrame({
diff --git a/public/app/plugins/panel/table/migrations.ts b/public/app/plugins/panel/table/migrations.ts
index f05ec19e05133..f92d5b60836cd 100644
--- a/public/app/plugins/panel/table/migrations.ts
+++ b/public/app/plugins/panel/table/migrations.ts
@@ -150,6 +150,13 @@ const migrateTableStyleToOverride = (style: Style) => {
     });
   }
 
+  if (style.type === 'hidden') {
+    override.properties.push({
+      id: 'custom.hidden',
+      value: true,
+    });
+  }
+
   if (style.link) {
     override.properties.push({
       id: 'links',
diff --git a/public/app/plugins/panel/table/module.tsx b/public/app/plugins/panel/table/module.tsx
index 17f62aff423b7..f930e45de19b9 100644
--- a/public/app/plugins/panel/table/module.tsx
+++ b/public/app/plugins/panel/table/module.tsx
@@ -53,10 +53,10 @@ export const plugin = new PanelPlugin<Options, FieldConfig>(TablePanel)
           name: 'Column alignment',
           settings: {
             options: [
-              { label: 'auto', value: 'auto' },
-              { label: 'left', value: 'left' },
-              { label: 'center', value: 'center' },
-              { label: 'right', value: 'right' },
+              { label: 'Auto', value: 'auto' },
+              { label: 'Left', value: 'left' },
+              { label: 'Center', value: 'center' },
+              { label: 'Right', value: 'right' },
             ],
           },
           defaultValue: defaultTableFieldOptions.align,
@@ -169,9 +169,7 @@ export const plugin = new PanelPlugin<Options, FieldConfig>(TablePanel)
           },
         },
         defaultValue: '',
-        showIf: (cfg) =>
-          (cfg.footer?.show && !cfg.footer?.countRows) ||
-          (cfg.footer?.reducer?.length === 1 && cfg.footer?.reducer[0] !== ReducerID.count),
+        showIf: (cfg) => cfg.footer?.show && !cfg.footer?.countRows,
       })
       .addCustomEditor({
         id: 'footer.enablePagination',
diff --git a/public/app/plugins/panel/table/panelcfg.gen.ts b/public/app/plugins/panel/table/panelcfg.gen.ts
index fa44e7f982eb5..5b771ff2640c1 100644
--- a/public/app/plugins/panel/table/panelcfg.gen.ts
+++ b/public/app/plugins/panel/table/panelcfg.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/public/app/plugins/panel/text/TextPanel.tsx b/public/app/plugins/panel/text/TextPanel.tsx
index d831532f48ad1..1d040905cdb20 100644
--- a/public/app/plugins/panel/text/TextPanel.tsx
+++ b/public/app/plugins/panel/text/TextPanel.tsx
@@ -53,6 +53,7 @@ export function TextPanel(props: Props) {
   return (
     <CustomScrollbar autoHeightMin="100%" className={styles.containStrict}>
       <DangerouslySetHtmlContent
+        allowRerender
         html={processed.content}
         className={styles.markdown}
         data-testid="TextPanel-converted-content"
@@ -64,7 +65,7 @@ export function TextPanel(props: Props) {
 function processContent(options: Options, interpolate: InterpolateFunction, disableSanitizeHtml: boolean): string {
   let { mode, content } = options;
   if (!content) {
-    return '';
+    return ' ';
   }
 
   // Variables must be interpolated before content is converted to markdown so using variables
diff --git a/public/app/plugins/panel/text/panelcfg.gen.ts b/public/app/plugins/panel/text/panelcfg.gen.ts
index 8b35a85ed209e..cf08ce2468345 100644
--- a/public/app/plugins/panel/text/panelcfg.gen.ts
+++ b/public/app/plugins/panel/text/panelcfg.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/public/app/plugins/panel/timeseries/InsertNullsEditor.tsx b/public/app/plugins/panel/timeseries/InsertNullsEditor.tsx
index b516f069cd557..a9c11c28a01a4 100644
--- a/public/app/plugins/panel/timeseries/InsertNullsEditor.tsx
+++ b/public/app/plugins/panel/timeseries/InsertNullsEditor.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { FieldOverrideEditorProps, SelectableValue } from '@grafana/data';
+import { StandardEditorProps, SelectableValue } from '@grafana/data';
 import { HorizontalGroup, RadioButtonGroup } from '@grafana/ui';
 
 import { InputPrefix, NullsThresholdInput } from './NullsThresholdInput';
@@ -16,7 +16,7 @@ const DISCONNECT_OPTIONS: Array<SelectableValue<boolean | number>> = [
   },
 ];
 
-type Props = FieldOverrideEditorProps<boolean | number, unknown>;
+type Props = StandardEditorProps<boolean | number, { isTime: boolean }>;
 
 export const InsertNullsEditor = ({ value, onChange, item }: Props) => {
   const isThreshold = typeof value === 'number';
@@ -30,7 +30,7 @@ export const InsertNullsEditor = ({ value, onChange, item }: Props) => {
           value={value}
           onChange={onChange}
           inputPrefix={InputPrefix.GreaterThan}
-          isTime={item.settings.isTime}
+          isTime={item.settings?.isTime ?? false}
         />
       )}
     </HorizontalGroup>
diff --git a/public/app/plugins/panel/timeseries/LineStyleEditor.tsx b/public/app/plugins/panel/timeseries/LineStyleEditor.tsx
index 8ac547d52a3dd..cd90f9bdcc995 100644
--- a/public/app/plugins/panel/timeseries/LineStyleEditor.tsx
+++ b/public/app/plugins/panel/timeseries/LineStyleEditor.tsx
@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 
-import { FieldOverrideEditorProps, SelectableValue } from '@grafana/data';
+import { StandardEditorProps, SelectableValue } from '@grafana/data';
 import { LineStyle } from '@grafana/schema';
 import { HorizontalGroup, IconButton, RadioButtonGroup, Select } from '@grafana/ui';
 
@@ -52,7 +52,7 @@ const dotOptions: Array<SelectableValue<string>> = [
   value: txt,
 }));
 
-type Props = FieldOverrideEditorProps<LineStyle, unknown>;
+type Props = StandardEditorProps<LineStyle, unknown>;
 
 export const LineStyleEditor = ({ value, onChange }: Props) => {
   const options = useMemo(() => (value?.fill === 'dash' ? dashOptions : dotOptions), [value]);
diff --git a/public/app/plugins/panel/timeseries/SpanNullsEditor.tsx b/public/app/plugins/panel/timeseries/SpanNullsEditor.tsx
index 9912abf383b2a..5344dc8a5282e 100644
--- a/public/app/plugins/panel/timeseries/SpanNullsEditor.tsx
+++ b/public/app/plugins/panel/timeseries/SpanNullsEditor.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { FieldOverrideEditorProps, SelectableValue } from '@grafana/data';
+import { StandardEditorProps, SelectableValue } from '@grafana/data';
 import { HorizontalGroup, RadioButtonGroup } from '@grafana/ui';
 
 import { InputPrefix, NullsThresholdInput } from './NullsThresholdInput';
@@ -20,7 +20,7 @@ const GAPS_OPTIONS: Array<SelectableValue<boolean | number>> = [
   },
 ];
 
-type Props = FieldOverrideEditorProps<boolean | number, unknown>;
+type Props = StandardEditorProps<boolean | number, { isTime: boolean }>;
 
 export const SpanNullsEditor = ({ value, onChange, item }: Props) => {
   const isThreshold = typeof value === 'number';
@@ -34,7 +34,7 @@ export const SpanNullsEditor = ({ value, onChange, item }: Props) => {
           value={value}
           onChange={onChange}
           inputPrefix={InputPrefix.LessThan}
-          isTime={item.settings.isTime}
+          isTime={item.settings?.isTime ?? false}
         />
       )}
     </HorizontalGroup>
diff --git a/public/app/plugins/panel/timeseries/ThresholdsStyleEditor.tsx b/public/app/plugins/panel/timeseries/ThresholdsStyleEditor.tsx
index 31f4c11a6bf98..bd67c199106a8 100644
--- a/public/app/plugins/panel/timeseries/ThresholdsStyleEditor.tsx
+++ b/public/app/plugins/panel/timeseries/ThresholdsStyleEditor.tsx
@@ -1,19 +1,22 @@
 import React, { useCallback } from 'react';
 
-import { FieldOverrideEditorProps, SelectableValue } from '@grafana/data';
-import { GraphTresholdsStyleMode } from '@grafana/schema';
+import { StandardEditorProps, SelectableValue } from '@grafana/data';
+import { GraphThresholdsStyleMode } from '@grafana/schema';
 import { Select } from '@grafana/ui';
 
-type Props = FieldOverrideEditorProps<SelectableValue<{ mode: GraphTresholdsStyleMode }>, unknown>;
+type Props = StandardEditorProps<
+  SelectableValue<{ mode: GraphThresholdsStyleMode }>,
+  { options: Array<SelectableValue<GraphThresholdsStyleMode>> }
+>;
 
 export const ThresholdsStyleEditor = ({ item, value, onChange, id }: Props) => {
   const onChangeCb = useCallback(
-    (v: SelectableValue<GraphTresholdsStyleMode>) => {
+    (v: SelectableValue<GraphThresholdsStyleMode>) => {
       onChange({
         mode: v.value,
       });
     },
     [onChange]
   );
-  return <Select inputId={id} value={value.mode} options={item.settings.options} onChange={onChangeCb} />;
+  return <Select inputId={id} value={value.mode} options={item.settings?.options ?? []} onChange={onChangeCb} />;
 };
diff --git a/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx b/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
index 752fc49ba3f27..792d1e4000cda 100644
--- a/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
+++ b/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
@@ -1,20 +1,31 @@
-import React, { useMemo } from 'react';
+import React, { useMemo, useState, useCallback } from 'react';
 
-import { PanelProps, DataFrameType } from '@grafana/data';
+import { PanelProps, DataFrameType, DashboardCursorSync } from '@grafana/data';
 import { PanelDataErrorView } from '@grafana/runtime';
-import { TooltipDisplayMode } from '@grafana/schema';
-import { KeyboardPlugin, TimeSeries, TooltipPlugin, usePanelContext, ZoomPlugin } from '@grafana/ui';
+import { TooltipDisplayMode, VizOrientation } from '@grafana/schema';
+import {
+  EventBusPlugin,
+  KeyboardPlugin,
+  TooltipPlugin,
+  TooltipPlugin2,
+  usePanelContext,
+  ZoomPlugin,
+} from '@grafana/ui';
+import { TimeRange2, TooltipHoverMode } from '@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2';
+import { TimeSeries } from 'app/core/components/TimeSeries/TimeSeries';
 import { config } from 'app/core/config';
 
+import { TimeSeriesTooltip } from './TimeSeriesTooltip';
 import { Options } from './panelcfg.gen';
 import { AnnotationEditorPlugin } from './plugins/AnnotationEditorPlugin';
 import { AnnotationsPlugin } from './plugins/AnnotationsPlugin';
+import { AnnotationsPlugin2 } from './plugins/AnnotationsPlugin2';
 import { ContextMenuPlugin } from './plugins/ContextMenuPlugin';
 import { ExemplarsPlugin, getVisibleLabels } from './plugins/ExemplarsPlugin';
 import { OutsideRangePlugin } from './plugins/OutsideRangePlugin';
 import { ThresholdControlsPlugin } from './plugins/ThresholdControlsPlugin';
 import { getPrepareTimeseriesSuggestion } from './suggestions';
-import { getTimezones, prepareGraphableFields, regenerateLinksSupplier } from './utils';
+import { getTimezones, isTooltipScrollable, prepareGraphableFields } from './utils';
 
 interface TimeSeriesPanelProps extends PanelProps<Options> {}
 
@@ -30,9 +41,18 @@ export const TimeSeriesPanel = ({
   replaceVariables,
   id,
 }: TimeSeriesPanelProps) => {
-  const { sync, canAddAnnotations, onThresholdsChange, canEditThresholds, showThresholds, dataLinkPostProcessor } =
-    usePanelContext();
-
+  const {
+    sync,
+    canAddAnnotations,
+    onThresholdsChange,
+    canEditThresholds,
+    showThresholds,
+    dataLinkPostProcessor,
+    eventBus,
+  } = usePanelContext();
+  // Vertical orientation is not available for users through config.
+  // It is simplified version of horizontal time series panel and it does not support all plugins.
+  const isVerticallyOriented = options.orientation === VizOrientation.Vertical;
   const frames = useMemo(() => prepareGraphableFields(data.series, config.theme2, timeRange), [data.series, timeRange]);
   const timezones = useMemo(() => getTimezones(options.timezone, timeZone), [options.timezone, timeZone]);
   const suggestions = useMemo(() => {
@@ -46,6 +66,24 @@ export const TimeSeriesPanel = ({
     return undefined;
   }, [frames, id]);
 
+  const enableAnnotationCreation = Boolean(canAddAnnotations && canAddAnnotations());
+  const showNewVizTooltips = Boolean(config.featureToggles.newVizTooltips);
+  // temp range set for adding new annotation set by TooltipPlugin2, consumed by AnnotationPlugin2
+  const [newAnnotationRange, setNewAnnotationRange] = useState<TimeRange2 | null>(null);
+
+  // TODO: we should just re-init when this changes, and have this be a static setting
+  const syncTooltip = useCallback(
+    () => sync?.() === DashboardCursorSync.Tooltip,
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
+
+  const syncAny = useCallback(
+    () => sync?.() !== DashboardCursorSync.Off,
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
+
   if (!frames || suggestions) {
     return (
       <PanelDataErrorView
@@ -60,7 +98,13 @@ export const TimeSeriesPanel = ({
     );
   }
 
-  const enableAnnotationCreation = Boolean(canAddAnnotations && canAddAnnotations());
+  // which annotation are we editing?
+  // are we adding a new annotation? is annotating?
+  // console.log(data.annotations);
+
+  // annotations plugin includes the editor and the renderer
+  // its annotation state is managed here for now
+  // tooltipplugin2 receives render with annotate range, callback should setstate here that gets passed to annotationsplugin as newAnnotaton or editAnnotation
 
   return (
     <TimeSeries
@@ -72,96 +116,150 @@ export const TimeSeriesPanel = ({
       height={height}
       legend={options.legend}
       options={options}
+      replaceVariables={replaceVariables}
+      dataLinkPostProcessor={dataLinkPostProcessor}
     >
-      {(config, alignedDataFrame) => {
-        if (alignedDataFrame.fields.some((f) => Boolean(f.config.links?.length))) {
-          alignedDataFrame = regenerateLinksSupplier(
-            alignedDataFrame,
-            frames,
-            replaceVariables,
-            timeZone,
-            dataLinkPostProcessor
-          );
-        }
-
+      {(uplotConfig, alignedFrame) => {
         return (
           <>
-            <KeyboardPlugin config={config} />
-            <ZoomPlugin config={config} onZoom={onChangeTimeRange} withZoomY={true} />
+            <KeyboardPlugin config={uplotConfig} />
+            <EventBusPlugin config={uplotConfig} sync={syncAny} eventBus={eventBus} frame={alignedFrame} />
             {options.tooltip.mode === TooltipDisplayMode.None || (
-              <TooltipPlugin
-                frames={frames}
-                data={alignedDataFrame}
-                config={config}
-                mode={options.tooltip.mode}
-                sortOrder={options.tooltip.sort}
-                sync={sync}
-                timeZone={timeZone}
-              />
-            )}
-            {/* Renders annotation markers*/}
-            {data.annotations && (
-              <AnnotationsPlugin annotations={data.annotations} config={config} timeZone={timeZone} />
-            )}
-            {/* Enables annotations creation*/}
-            {enableAnnotationCreation ? (
-              <AnnotationEditorPlugin data={alignedDataFrame} timeZone={timeZone} config={config}>
-                {({ startAnnotating }) => {
-                  return (
-                    <ContextMenuPlugin
-                      data={alignedDataFrame}
-                      config={config}
+              <>
+                {showNewVizTooltips ? (
+                  <TooltipPlugin2
+                    config={uplotConfig}
+                    hoverMode={
+                      options.tooltip.mode === TooltipDisplayMode.Single ? TooltipHoverMode.xOne : TooltipHoverMode.xAll
+                    }
+                    queryZoom={onChangeTimeRange}
+                    clientZoom={true}
+                    syncTooltip={syncTooltip}
+                    render={(u, dataIdxs, seriesIdx, isPinned = false, dismiss, timeRange2, viaSync) => {
+                      if (enableAnnotationCreation && timeRange2 != null) {
+                        setNewAnnotationRange(timeRange2);
+                        dismiss();
+                        return;
+                      }
+
+                      const annotate = () => {
+                        let xVal = u.posToVal(u.cursor.left!, 'x');
+
+                        setNewAnnotationRange({ from: xVal, to: xVal });
+                        dismiss();
+                      };
+
+                      return (
+                        // not sure it header time here works for annotations, since it's taken from nearest datapoint index
+                        <TimeSeriesTooltip
+                          frames={frames}
+                          seriesFrame={alignedFrame}
+                          dataIdxs={dataIdxs}
+                          seriesIdx={seriesIdx}
+                          mode={viaSync ? TooltipDisplayMode.Multi : options.tooltip.mode}
+                          sortOrder={options.tooltip.sort}
+                          isPinned={isPinned}
+                          annotate={enableAnnotationCreation ? annotate : undefined}
+                          scrollable={isTooltipScrollable(options.tooltip)}
+                        />
+                      );
+                    }}
+                    maxWidth={options.tooltip.maxWidth}
+                    maxHeight={options.tooltip.maxHeight}
+                  />
+                ) : (
+                  <>
+                    <ZoomPlugin config={uplotConfig} onZoom={onChangeTimeRange} withZoomY={true} />
+                    <TooltipPlugin
+                      frames={frames}
+                      data={alignedFrame}
+                      config={uplotConfig}
+                      mode={options.tooltip.mode}
+                      sortOrder={options.tooltip.sort}
+                      sync={sync}
                       timeZone={timeZone}
-                      replaceVariables={replaceVariables}
-                      defaultItems={[
-                        {
-                          items: [
-                            {
-                              label: 'Add annotation',
-                              ariaLabel: 'Add annotation',
-                              icon: 'comment-alt',
-                              onClick: (e, p) => {
-                                if (!p) {
-                                  return;
-                                }
-                                startAnnotating({ coords: p.coords });
-                              },
-                            },
-                          ],
-                        },
-                      ]}
                     />
-                  );
-                }}
-              </AnnotationEditorPlugin>
-            ) : (
-              <ContextMenuPlugin
-                data={alignedDataFrame}
-                frames={frames}
-                config={config}
+                  </>
+                )}
+              </>
+            )}
+            {/* Renders annotation markers*/}
+            {!isVerticallyOriented && showNewVizTooltips ? (
+              <AnnotationsPlugin2
+                annotations={data.annotations ?? []}
+                config={uplotConfig}
                 timeZone={timeZone}
-                replaceVariables={replaceVariables}
-                defaultItems={[]}
+                newRange={newAnnotationRange}
+                setNewRange={setNewAnnotationRange}
               />
+            ) : (
+              !isVerticallyOriented &&
+              data.annotations && (
+                <AnnotationsPlugin annotations={data.annotations} config={uplotConfig} timeZone={timeZone} />
+              )
             )}
-            {data.annotations && (
+
+            {/*Enables annotations creation*/}
+            {!showNewVizTooltips ? (
+              enableAnnotationCreation && !isVerticallyOriented ? (
+                <AnnotationEditorPlugin data={alignedFrame} timeZone={timeZone} config={uplotConfig}>
+                  {({ startAnnotating }) => {
+                    return (
+                      <ContextMenuPlugin
+                        data={alignedFrame}
+                        config={uplotConfig}
+                        timeZone={timeZone}
+                        replaceVariables={replaceVariables}
+                        defaultItems={[
+                          {
+                            items: [
+                              {
+                                label: 'Add annotation',
+                                ariaLabel: 'Add annotation',
+                                icon: 'comment-alt',
+                                onClick: (e, p) => {
+                                  if (!p) {
+                                    return;
+                                  }
+                                  startAnnotating({ coords: p.coords });
+                                },
+                              },
+                            ],
+                          },
+                        ]}
+                      />
+                    );
+                  }}
+                </AnnotationEditorPlugin>
+              ) : (
+                <ContextMenuPlugin
+                  data={alignedFrame}
+                  frames={frames}
+                  config={uplotConfig}
+                  timeZone={timeZone}
+                  replaceVariables={replaceVariables}
+                  defaultItems={[]}
+                />
+              )
+            ) : undefined}
+            {data.annotations && !isVerticallyOriented && (
               <ExemplarsPlugin
-                visibleSeries={getVisibleLabels(config, frames)}
-                config={config}
+                visibleSeries={getVisibleLabels(uplotConfig, frames)}
+                config={uplotConfig}
                 exemplars={data.annotations}
                 timeZone={timeZone}
               />
             )}
 
-            {((canEditThresholds && onThresholdsChange) || showThresholds) && (
+            {((canEditThresholds && onThresholdsChange) || showThresholds) && !isVerticallyOriented && (
               <ThresholdControlsPlugin
-                config={config}
+                config={uplotConfig}
                 fieldConfig={fieldConfig}
                 onThresholdsChange={canEditThresholds ? onThresholdsChange : undefined}
               />
             )}
 
-            <OutsideRangePlugin config={config} onChangeTimeRange={onChangeTimeRange} />
+            <OutsideRangePlugin config={uplotConfig} onChangeTimeRange={onChangeTimeRange} />
           </>
         );
       }}
diff --git a/public/app/plugins/panel/timeseries/TimeSeriesTooltip.tsx b/public/app/plugins/panel/timeseries/TimeSeriesTooltip.tsx
new file mode 100644
index 0000000000000..997d7e43c21e1
--- /dev/null
+++ b/public/app/plugins/panel/timeseries/TimeSeriesTooltip.tsx
@@ -0,0 +1,91 @@
+import { css } from '@emotion/css';
+import React, { ReactNode } from 'react';
+
+import { DataFrame, FieldType, getFieldDisplayName } from '@grafana/data';
+import { SortOrder, TooltipDisplayMode } from '@grafana/schema/dist/esm/common/common.gen';
+import { useStyles2 } from '@grafana/ui';
+import { VizTooltipContent } from '@grafana/ui/src/components/VizTooltip/VizTooltipContent';
+import { VizTooltipFooter } from '@grafana/ui/src/components/VizTooltip/VizTooltipFooter';
+import { VizTooltipHeader } from '@grafana/ui/src/components/VizTooltip/VizTooltipHeader';
+import { VizTooltipItem } from '@grafana/ui/src/components/VizTooltip/types';
+import { getContentItems } from '@grafana/ui/src/components/VizTooltip/utils';
+
+import { getDataLinks } from '../status-history/utils';
+
+// exemplar / annotation / time region hovering?
+// add annotation UI / alert dismiss UI?
+
+export interface TimeSeriesTooltipProps {
+  frames?: DataFrame[];
+  // aligned series frame
+  seriesFrame: DataFrame;
+  // hovered points
+  dataIdxs: Array<number | null>;
+  // closest/hovered series
+  seriesIdx?: number | null;
+  mode?: TooltipDisplayMode;
+  sortOrder?: SortOrder;
+
+  isPinned: boolean;
+  scrollable?: boolean;
+
+  annotate?: () => void;
+}
+
+export const TimeSeriesTooltip = ({
+  frames,
+  seriesFrame,
+  dataIdxs,
+  seriesIdx,
+  mode = TooltipDisplayMode.Single,
+  sortOrder = SortOrder.None,
+  scrollable = false,
+  isPinned,
+  annotate,
+}: TimeSeriesTooltipProps) => {
+  const styles = useStyles2(getStyles);
+
+  const xField = seriesFrame.fields[0];
+
+  const xVal = xField.display!(xField.values[dataIdxs[0]!]).text;
+
+  const contentItems = getContentItems(
+    seriesFrame.fields,
+    xField,
+    dataIdxs,
+    seriesIdx,
+    mode,
+    sortOrder,
+    (field) => field.type === FieldType.number || field.type === FieldType.enum
+  );
+
+  let footer: ReactNode;
+
+  if (isPinned && seriesIdx != null) {
+    const field = seriesFrame.fields[seriesIdx];
+    const dataIdx = dataIdxs[seriesIdx]!;
+    const links = getDataLinks(field, dataIdx);
+
+    footer = <VizTooltipFooter dataLinks={links} annotate={annotate} />;
+  }
+
+  const headerItem: VizTooltipItem = {
+    label: xField.type === FieldType.time ? '' : getFieldDisplayName(xField, seriesFrame, frames),
+    value: xVal,
+  };
+
+  return (
+    <div className={styles.wrapper}>
+      <VizTooltipHeader item={headerItem} isPinned={isPinned} />
+      <VizTooltipContent items={contentItems} isPinned={isPinned} scrollable={scrollable} />
+      {footer}
+    </div>
+  );
+};
+
+export const getStyles = () => ({
+  wrapper: css({
+    display: 'flex',
+    flexDirection: 'column',
+  }),
+});
diff --git a/public/app/plugins/panel/timeseries/__snapshots__/migrations.test.ts.snap b/public/app/plugins/panel/timeseries/__snapshots__/migrations.test.ts.snap
index 8c4bec6a30b08..3827c5e88897d 100644
--- a/public/app/plugins/panel/timeseries/__snapshots__/migrations.test.ts.snap
+++ b/public/app/plugins/panel/timeseries/__snapshots__/migrations.test.ts.snap
@@ -552,6 +552,37 @@ exports[`Graph Migrations time regions should migrate 1`] = `
 }
 `;
 
+exports[`Graph Migrations time regions should migrate in scenes dashboard 1`] = `
+{
+  "alert": undefined,
+  "datasource": {
+    "type": "datasource",
+    "uid": "gdev-testdata",
+  },
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "points",
+        "spanNulls": false,
+      },
+    },
+    "overrides": [],
+  },
+  "options": {
+    "legend": {
+      "calcs": [],
+      "displayMode": "list",
+      "placement": "bottom",
+      "showLegend": true,
+    },
+    "tooltip": {
+      "mode": "single",
+      "sort": "none",
+    },
+  },
+}
+`;
+
 exports[`Graph Migrations transforms should preserve "constant" transform 1`] = `
 {
   "defaults": {
@@ -656,6 +687,10 @@ exports[`Graph Migrations twoYAxis 1`] = `
             "id": "max",
             "value": 25,
           },
+          {
+            "id": "custom.axisPlacement",
+            "value": "right",
+          },
           {
             "id": "custom.axisLabel",
             "value": "Y222",
diff --git a/public/app/plugins/panel/timeseries/config.ts b/public/app/plugins/panel/timeseries/config.ts
index a68b457287411..ebb750b71cc42 100644
--- a/public/app/plugins/panel/timeseries/config.ts
+++ b/public/app/plugins/panel/timeseries/config.ts
@@ -15,7 +15,7 @@ import {
   LineStyle,
   VisibilityMode,
   StackingMode,
-  GraphTresholdsStyleMode,
+  GraphThresholdsStyleMode,
   GraphTransform,
 } from '@grafana/schema';
 import { graphFieldOptions, commonOptionsBuilder } from '@grafana/ui';
@@ -228,7 +228,7 @@ export function getGraphFieldConfig(cfg: GraphFieldConfig, isTime = true): SetFi
         path: 'thresholdsStyle',
         name: 'Show thresholds',
         category: ['Thresholds'],
-        defaultValue: { mode: GraphTresholdsStyleMode.Off },
+        defaultValue: { mode: GraphThresholdsStyleMode.Off },
         settings: {
           options: graphFieldOptions.thresholdsDisplayModes,
         },
diff --git a/public/app/plugins/panel/timeseries/migrations.test.ts b/public/app/plugins/panel/timeseries/migrations.test.ts
index 48d08f11329d9..2b86f89ba7f78 100644
--- a/public/app/plugins/panel/timeseries/migrations.test.ts
+++ b/public/app/plugins/panel/timeseries/migrations.test.ts
@@ -5,6 +5,9 @@ import { TooltipDisplayMode, SortOrder } from '@grafana/schema';
 import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
 import { DashboardModel, PanelModel as PanelModelState } from 'app/features/dashboard/state';
 import { createDashboardModelFixture } from 'app/features/dashboard/state/__fixtures__/dashboardFixtures';
+import { dataLayersToAnnotations } from 'app/features/dashboard-scene/serialization/dataLayersToAnnotations';
+import { transformSaveModelToScene } from 'app/features/dashboard-scene/serialization/transformSaveModelToScene';
+import { dashboardSceneGraph } from 'app/features/dashboard-scene/utils/dashboardSceneGraph';
 import { GrafanaQueryType } from 'app/plugins/datasource/grafana/types';
 
 import { graphPanelChangedHandler } from './migrations';
@@ -125,6 +128,42 @@ describe('Graph Migrations', () => {
       ).toHaveLength(1);
       expect(panel).toMatchSnapshot();
     });
+
+    test('should migrate in scenes dashboard', () => {
+      const old = {
+        angular: {
+          timeRegions: [
+            {
+              colorMode: 'red',
+              fill: true,
+              fillColor: 'rgba(234, 112, 112, 0.12)',
+              fromDayOfWeek: 1,
+              line: true,
+              lineColor: 'rgba(237, 46, 24, 0.60)',
+              op: 'time',
+            },
+          ],
+        },
+      };
+
+      const panel = { datasource: { type: 'datasource', uid: 'gdev-testdata' } } as PanelModel;
+
+      dashboard.panels.push(new PanelModelState(panel));
+
+      const scene = transformSaveModelToScene({ dashboard, meta: {} });
+      window.__grafanaSceneContext = scene;
+
+      panel.options = graphPanelChangedHandler(panel, 'graph', old, prevFieldConfig);
+
+      const layers = dashboardSceneGraph.getDataLayers(scene).state.annotationLayers;
+      const annotations = dataLayersToAnnotations(layers);
+
+      expect(annotations).toHaveLength(2); // built-in + time region
+      expect(
+        annotations.filter((annotation) => annotation.target?.queryType === GrafanaQueryType.TimeRegions)
+      ).toHaveLength(1);
+      expect(panel).toMatchSnapshot();
+    });
   });
 
   describe('legend', () => {
diff --git a/public/app/plugins/panel/timeseries/migrations.ts b/public/app/plugins/panel/timeseries/migrations.ts
index fa138cd89a717..176592274db77 100644
--- a/public/app/plugins/panel/timeseries/migrations.ts
+++ b/public/app/plugins/panel/timeseries/migrations.ts
@@ -23,7 +23,7 @@ import {
   GraphDrawStyle,
   GraphFieldConfig,
   GraphGradientMode,
-  GraphTresholdsStyleMode,
+  GraphThresholdsStyleMode,
   LineInterpolation,
   LineStyle,
   VisibilityMode,
@@ -37,6 +37,9 @@ import {
 import { TimeRegionConfig } from 'app/core/utils/timeRegions';
 import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
 import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
+import { DashboardAnnotationsDataLayer } from 'app/features/dashboard-scene/scene/DashboardAnnotationsDataLayer';
+import { DashboardScene } from 'app/features/dashboard-scene/scene/DashboardScene';
+import { dashboardSceneGraph } from 'app/features/dashboard-scene/utils/dashboardSceneGraph';
 import { GrafanaQuery, GrafanaQueryType } from 'app/plugins/datasource/grafana/types';
 
 import { defaultGraphConfig } from './config';
@@ -61,17 +64,8 @@ export const graphPanelChangedHandler: PanelTypeChangedHandler = (
       panel: panel,
     });
 
-    const dashboard = getDashboardSrv().getCurrent();
-    if (dashboard && annotations?.length > 0) {
-      dashboard.annotations.list = [...dashboard.annotations.list, ...annotations];
-
-      // Trigger a full dashboard refresh when annotations change
-      if (dashboardRefreshDebouncer == null) {
-        dashboardRefreshDebouncer = setTimeout(() => {
-          dashboardRefreshDebouncer = null;
-          getTimeSrv().refreshTimeModel();
-        });
-      }
+    if (annotations?.length > 0) {
+      addAnnotationsToDashboard(annotations);
     }
 
     panel.fieldConfig = fieldConfig; // Mutates the incoming panel
@@ -345,9 +339,22 @@ export function graphToTimeseriesOptions(angular: any): {
 
   if (angular.stack) {
     graph.stacking = {
-      mode: StackingMode.Normal,
+      mode: angular.percentage ? StackingMode.Percent : StackingMode.Normal,
       group: defaultGraphConfig.stacking!.group,
     };
+
+    if (angular.percentage) {
+      if (angular.yaxis) {
+        delete y1.min;
+        delete y1.max;
+
+        // TimeSeries currently uses 0-1 for percent, so allowing zero leaves only top and bottom ticks.
+        // removing it feels better. probably should fix in TimeSeries, but let's kick it down the road
+        if (y1.decimals === 0) {
+          delete y1.decimals;
+        }
+      }
+    }
   }
 
   y1.custom = omitBy(graph, isNil);
@@ -399,8 +406,8 @@ export function graphToTimeseriesOptions(angular: any): {
 
   // timeRegions migration
   if (angular.timeRegions?.length) {
-    let regions: any[] = angular.timeRegions.map((old: GraphTimeRegionConfig, idx: number) => ({
-      name: `T${idx + 1}`,
+    let regions = angular.timeRegions.map((old: GraphTimeRegionConfig, idx: number) => ({
+      name: `T${idx}`,
       color: old.colorMode !== 'custom' ? old.colorMode : old.fillColor,
       line: old.line,
       fill: old.fill,
@@ -423,7 +430,7 @@ export function graphToTimeseriesOptions(angular: any): {
           ids: [angular.panel.id],
         },
         iconColor: region.fillColor ?? (region as any).color,
-        name: `T${idx + 1}`,
+        name: `Time region for panel ${angular.panel.title}${idx > 0 ? ` ${idx}` : ''}`,
         target: {
           queryType: GrafanaQueryType.TimeRegions,
           refId: 'Anno',
@@ -529,9 +536,9 @@ export function graphToTimeseriesOptions(angular: any): {
       });
     }
 
-    let displayMode = area ? GraphTresholdsStyleMode.Area : GraphTresholdsStyleMode.Line;
+    let displayMode = area ? GraphThresholdsStyleMode.Area : GraphThresholdsStyleMode.Line;
     if (line && area) {
-      displayMode = GraphTresholdsStyleMode.LineAndArea;
+      displayMode = GraphThresholdsStyleMode.LineAndArea;
     }
 
     // TODO move into standard ThresholdConfig ?
@@ -658,6 +665,11 @@ function fillY2DynamicValues(
     }
   }
 
+  props.push({
+    id: `custom.axisPlacement`,
+    value: AxisPlacement.Right,
+  });
+
   // Add any custom property
   const y1G = y1.custom ?? {};
   const y2G = y2.custom ?? {};
@@ -684,7 +696,7 @@ function validNumber(val: unknown): number | undefined {
   return undefined;
 }
 
-function getReducersFromLegend(obj: Record<string, any>): string[] {
+function getReducersFromLegend(obj: Record<string, unknown>): string[] {
   const ids: string[] = [];
   for (const key of Object.keys(obj)) {
     const r = fieldReducers.getIfExists(key);
@@ -746,3 +758,40 @@ function getStackingFromOverrides(value: Boolean | string) {
     group: isString(value) ? value : defaultGroupName,
   };
 }
+
+function addAnnotationsToDashboard(annotations: AnnotationQuery[]) {
+  const scene = window.__grafanaSceneContext;
+
+  if (scene instanceof DashboardScene) {
+    const dataLayers = dashboardSceneGraph.getDataLayers(scene);
+    const annotationLayers = [...dataLayers.state.annotationLayers];
+
+    for (let annotation of annotations) {
+      const newAnnotation = new DashboardAnnotationsDataLayer({
+        key: `annotations-${annotation.name}`,
+        query: annotation,
+        name: annotation.name,
+        isEnabled: annotation.enable,
+        isHidden: annotation.hide,
+      });
+
+      annotationLayers.push(newAnnotation);
+    }
+
+    dataLayers.setState({ annotationLayers });
+    return;
+  }
+
+  const dashboard = getDashboardSrv().getCurrent();
+  if (dashboard) {
+    dashboard.annotations.list = [...dashboard.annotations.list, ...annotations];
+
+    // Trigger a full dashboard refresh when annotations change
+    if (dashboardRefreshDebouncer == null) {
+      dashboardRefreshDebouncer = setTimeout(() => {
+        dashboardRefreshDebouncer = null;
+        getTimeSrv().refreshTimeModel();
+      });
+    }
+  }
+}
diff --git a/public/app/plugins/panel/timeseries/module.tsx b/public/app/plugins/panel/timeseries/module.tsx
index f0f46f2b6a164..4368a297151e1 100644
--- a/public/app/plugins/panel/timeseries/module.tsx
+++ b/public/app/plugins/panel/timeseries/module.tsx
@@ -12,7 +12,7 @@ export const plugin = new PanelPlugin<Options, FieldConfig>(TimeSeriesPanel)
   .setPanelChangeHandler(graphPanelChangedHandler)
   .useFieldConfig(getGraphFieldConfig(defaultGraphConfig))
   .setPanelOptions((builder) => {
-    commonOptionsBuilder.addTooltipOptions(builder);
+    commonOptionsBuilder.addTooltipOptions(builder, false, true);
     commonOptionsBuilder.addLegendOptions(builder);
 
     builder.addCustomEditor({
diff --git a/public/app/plugins/panel/timeseries/panelcfg.cue b/public/app/plugins/panel/timeseries/panelcfg.cue
index 5d506e8996388..0d2f6decd6796 100644
--- a/public/app/plugins/panel/timeseries/panelcfg.cue
+++ b/public/app/plugins/panel/timeseries/panelcfg.cue
@@ -23,8 +23,9 @@ composableKinds: PanelCfg: lineage: {
 		version: [0, 0]
 		schema: {
 			Options: common.OptionsWithTimezones & {
-				legend:  common.VizLegendOptions
-				tooltip: common.VizTooltipOptions
+				legend:       common.VizLegendOptions
+				tooltip:      common.VizTooltipOptions
+				orientation?: common.VizOrientation
 			} @cuetsy(kind="interface")
 
 			FieldConfig: common.GraphFieldConfig & {} @cuetsy(kind="interface")
diff --git a/public/app/plugins/panel/timeseries/panelcfg.gen.ts b/public/app/plugins/panel/timeseries/panelcfg.gen.ts
index ff2394dc7d19b..e5e4bce7e7b04 100644
--- a/public/app/plugins/panel/timeseries/panelcfg.gen.ts
+++ b/public/app/plugins/panel/timeseries/panelcfg.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
@@ -12,6 +12,7 @@ import * as common from '@grafana/schema';
 
 export interface Options extends common.OptionsWithTimezones {
   legend: common.VizLegendOptions;
+  orientation?: common.VizOrientation;
   tooltip: common.VizTooltipOptions;
 }
 
diff --git a/public/app/plugins/panel/timeseries/plugins/AnnotationsPlugin.tsx b/public/app/plugins/panel/timeseries/plugins/AnnotationsPlugin.tsx
index 8d7f9772918f7..384ec4acd3060 100644
--- a/public/app/plugins/panel/timeseries/plugins/AnnotationsPlugin.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/AnnotationsPlugin.tsx
@@ -11,9 +11,15 @@ interface AnnotationsPluginProps {
   config: UPlotConfigBuilder;
   annotations: DataFrame[];
   timeZone: TimeZone;
+  disableCanvasRendering?: boolean;
 }
 
-export const AnnotationsPlugin = ({ annotations, timeZone, config }: AnnotationsPluginProps) => {
+export const AnnotationsPlugin = ({
+  annotations,
+  timeZone,
+  config,
+  disableCanvasRendering = false,
+}: AnnotationsPluginProps) => {
   const theme = useTheme2();
   const plotInstance = useRef<uPlot>();
 
@@ -69,35 +75,38 @@ export const AnnotationsPlugin = ({ annotations, timeZone, config }: Annotations
         ctx.closePath();
       };
 
-      for (let i = 0; i < annotationsRef.current.length; i++) {
-        const annotationsView = annotationsRef.current[i];
-        for (let j = 0; j < annotationsView.length; j++) {
-          const annotation = annotationsView.get(j);
+      if (!disableCanvasRendering) {
+        for (let i = 0; i < annotationsRef.current.length; i++) {
+          const annotationsView = annotationsRef.current[i];
+          for (let j = 0; j < annotationsView.length; j++) {
+            const annotation = annotationsView.get(j);
 
-          if (!annotation.time) {
-            continue;
-          }
+            if (!annotation.time) {
+              continue;
+            }
 
-          let x0 = u.valToPos(annotation.time, 'x', true);
-          const color = theme.visualization.getColorByName(annotation.color);
+            let x0 = u.valToPos(annotation.time, 'x', true);
+            const color = theme.visualization.getColorByName(annotation.color);
 
-          renderLine(x0, color);
+            renderLine(x0, color);
 
-          if (annotation.isRegion && annotation.timeEnd) {
-            let x1 = u.valToPos(annotation.timeEnd, 'x', true);
+            if (annotation.isRegion && annotation.timeEnd) {
+              let x1 = u.valToPos(annotation.timeEnd, 'x', true);
 
-            renderLine(x1, color);
+              renderLine(x1, color);
 
-            ctx.fillStyle = colorManipulator.alpha(color, 0.1);
-            ctx.rect(x0, u.bbox.top, x1 - x0, u.bbox.height);
-            ctx.fill();
+              ctx.fillStyle = colorManipulator.alpha(color, 0.1);
+              ctx.rect(x0, u.bbox.top, x1 - x0, u.bbox.height);
+              ctx.fill();
+            }
           }
         }
       }
+
       ctx.restore();
       return;
     });
-  }, [config, theme]);
+  }, [config, theme, disableCanvasRendering]);
 
   const mapAnnotationToXYCoords = useCallback((frame: DataFrame, dataFrameFieldIndex: DataFrameFieldIndex) => {
     const view = new DataFrameView<AnnotationsDataFrameViewDTO>(frame);
diff --git a/public/app/plugins/panel/timeseries/plugins/AnnotationsPlugin2.tsx b/public/app/plugins/panel/timeseries/plugins/AnnotationsPlugin2.tsx
new file mode 100644
index 0000000000000..8c0313d1ca476
--- /dev/null
+++ b/public/app/plugins/panel/timeseries/plugins/AnnotationsPlugin2.tsx
@@ -0,0 +1,263 @@
+import { css } from '@emotion/css';
+import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState, useReducer } from 'react';
+import { createPortal } from 'react-dom';
+import tinycolor from 'tinycolor2';
+import uPlot from 'uplot';
+
+import { arrayToDataFrame, colorManipulator, DataFrame, DataTopic } from '@grafana/data';
+import { TimeZone } from '@grafana/schema';
+import { DEFAULT_ANNOTATION_COLOR, getPortalContainer, UPlotConfigBuilder, useStyles2, useTheme2 } from '@grafana/ui';
+
+import { AnnotationMarker2 } from './annotations2/AnnotationMarker2';
+
+// (copied from TooltipPlugin2)
+interface TimeRange2 {
+  from: number;
+  to: number;
+}
+
+interface AnnotationsPluginProps {
+  config: UPlotConfigBuilder;
+  annotations: DataFrame[];
+  timeZone: TimeZone;
+  newRange: TimeRange2 | null;
+  setNewRange: (newRage: TimeRange2 | null) => void;
+  canvasRegionRendering?: boolean;
+}
+
+// TODO: batch by color, use Path2D objects
+const renderLine = (ctx: CanvasRenderingContext2D, y0: number, y1: number, x: number, color: string) => {
+  ctx.beginPath();
+  ctx.moveTo(x, y0);
+  ctx.lineTo(x, y1);
+  ctx.strokeStyle = color;
+  ctx.stroke();
+};
+
+// const renderUpTriangle = (ctx: CanvasRenderingContext2D, x: number, y: number, w: number, h: number, color: string) => {
+//   ctx.beginPath();
+//   ctx.moveTo(x - w/2, y + h/2);
+//   ctx.lineTo(x + w/2, y + h/2);
+//   ctx.lineTo(x, y);
+//   ctx.closePath();
+//   ctx.fillStyle = color;
+//   ctx.fill();
+// }
+
+const DEFAULT_ANNOTATION_COLOR_HEX8 = tinycolor(DEFAULT_ANNOTATION_COLOR).toHex8String();
+
+function getVals(frame: DataFrame) {
+  let vals: Record<string, any[]> = {};
+  frame.fields.forEach((f) => {
+    vals[f.name] = f.values;
+  });
+
+  return vals;
+}
+
+export const AnnotationsPlugin2 = ({
+  annotations,
+  timeZone,
+  config,
+  newRange,
+  setNewRange,
+  canvasRegionRendering = true,
+}: AnnotationsPluginProps) => {
+  const [plot, setPlot] = useState<uPlot>();
+
+  const [portalRoot] = useState(() => getPortalContainer());
+
+  const styles = useStyles2(getStyles);
+  const getColorByName = useTheme2().visualization.getColorByName;
+
+  const [_, forceUpdate] = useReducer((x) => x + 1, 0);
+
+  const annos = useMemo(() => {
+    let annos = annotations.filter(
+      (frame) => frame.name !== 'exemplar' && frame.length > 0 && frame.fields.some((f) => f.name === 'time')
+    );
+
+    if (newRange) {
+      let isRegion = newRange.to > newRange.from;
+
+      const wipAnnoFrame = arrayToDataFrame([
+        {
+          time: newRange.from,
+          timeEnd: isRegion ? newRange.to : null,
+          isRegion: isRegion,
+          color: DEFAULT_ANNOTATION_COLOR_HEX8,
+        },
+      ]);
+
+      wipAnnoFrame.meta = {
+        dataTopic: DataTopic.Annotations,
+        custom: {
+          isWip: true,
+        },
+      };
+
+      annos.push(wipAnnoFrame);
+    }
+
+    return annos;
+  }, [annotations, newRange]);
+
+  const exitWipEdit = useCallback(() => {
+    setNewRange(null);
+  }, [setNewRange]);
+
+  const annoRef = useRef(annos);
+  annoRef.current = annos;
+  const newRangeRef = useRef(newRange);
+  newRangeRef.current = newRange;
+
+  const xAxisRef = useRef<HTMLDivElement>();
+
+  useLayoutEffect(() => {
+    config.addHook('ready', (u) => {
+      let xAxisEl = u.root.querySelector<HTMLDivElement>('.u-axis')!;
+      xAxisRef.current = xAxisEl;
+      setPlot(u);
+    });
+
+    config.addHook('draw', (u) => {
+      let annos = annoRef.current;
+
+      const ctx = u.ctx;
+
+      let y0 = u.bbox.top;
+      let y1 = y0 + u.bbox.height;
+
+      ctx.save();
+
+      ctx.beginPath();
+      ctx.rect(u.bbox.left, u.bbox.top, u.bbox.width, u.bbox.height);
+      ctx.clip();
+
+      ctx.lineWidth = 2;
+      ctx.setLineDash([5, 5]);
+
+      annos.forEach((frame) => {
+        let vals = getVals(frame);
+
+        for (let i = 0; i < vals.time.length; i++) {
+          let color = getColorByName(vals.color?.[i] || DEFAULT_ANNOTATION_COLOR_HEX8);
+
+          let x0 = u.valToPos(vals.time[i], 'x', true);
+
+          if (!vals.isRegion?.[i]) {
+            renderLine(ctx, y0, y1, x0, color);
+            // renderUpTriangle(ctx, x0, y1, 8 * uPlot.pxRatio, 5 * uPlot.pxRatio, color);
+          } else if (canvasRegionRendering) {
+            renderLine(ctx, y0, y1, x0, color);
+
+            let x1 = u.valToPos(vals.timeEnd[i], 'x', true);
+
+            renderLine(ctx, y0, y1, x1, color);
+
+            ctx.fillStyle = colorManipulator.alpha(color, 0.1);
+            ctx.fillRect(x0, y0, x1 - x0, u.bbox.height);
+          }
+        }
+      });
+
+      ctx.restore();
+    });
+  }, [config, canvasRegionRendering, getColorByName]);
+
+  // ensure annos are re-drawn whenever they change
+  useEffect(() => {
+    if (plot) {
+      plot.redraw();
+
+      // this forces a second redraw after uPlot is updated (in the Plot.tsx didUpdate) with new data/scales
+      // and ensures the anno marker positions in the dom are re-rendered in correct places
+      // (this is temp fix until uPlot integrtion is refactored)
+      setTimeout(() => {
+        forceUpdate();
+      }, 0);
+    }
+  }, [annos, plot]);
+
+  if (plot) {
+    let markers = annos.flatMap((frame, frameIdx) => {
+      let vals = getVals(frame);
+
+      let markers: React.ReactNode[] = [];
+
+      for (let i = 0; i < vals.time.length; i++) {
+        let color = getColorByName(vals.color?.[i] || DEFAULT_ANNOTATION_COLOR);
+        let left = plot.valToPos(vals.time[i], 'x');
+        let style: React.CSSProperties | null = null;
+        let className = '';
+        let isVisible = true;
+
+        if (vals.isRegion?.[i]) {
+          let right = plot.valToPos(vals.timeEnd?.[i], 'x');
+
+          isVisible = left < plot.rect.width && right > 0;
+
+          if (isVisible) {
+            let clampedLeft = Math.max(0, left);
+            let clampedRight = Math.min(plot.rect.width, right);
+
+            style = { left: clampedLeft, background: color, width: clampedRight - clampedLeft };
+            className = styles.annoRegion;
+          }
+        } else {
+          isVisible = left > 0 && left <= plot.rect.width;
+
+          if (isVisible) {
+            style = { left, borderBottomColor: color };
+            className = styles.annoMarker;
+          }
+        }
+
+        // @TODO: Reset newRange after annotation is saved
+        if (isVisible) {
+          let isWip = frame.meta?.custom?.isWip;
+
+          markers.push(
+            <AnnotationMarker2
+              annoIdx={i}
+              annoVals={vals}
+              className={className}
+              style={style}
+              timeZone={timeZone}
+              key={`${frameIdx}:${i}`}
+              exitWipEdit={isWip ? exitWipEdit : null}
+              portalRoot={portalRoot}
+            />
+          );
+        }
+      }
+
+      return markers;
+    });
+
+    return createPortal(markers, xAxisRef.current!);
+  }
+
+  return null;
+};
+
+const getStyles = () => ({
+  annoMarker: css({
+    position: 'absolute',
+    width: 0,
+    height: 0,
+    borderLeft: '5px solid transparent',
+    borderRight: '5px solid transparent',
+    borderBottomWidth: '5px',
+    borderBottomStyle: 'solid',
+    transform: 'translateX(-50%)',
+    cursor: 'pointer',
+    zIndex: 1,
+  }),
+  annoRegion: css({
+    position: 'absolute',
+    height: '5px',
+    cursor: 'pointer',
+    zIndex: 1,
+  }),
+});
diff --git a/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx b/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx
index d3e06eaf2d9b4..59c6ad9dcebd0 100644
--- a/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx
@@ -205,7 +205,7 @@ export const ContextMenuView = ({
       <MenuGroup key={`${group.label}${index}`} label={group.label}>
         {(group.items || []).map((item) => (
           <MenuItem
-            key={item.label}
+            key={item.url}
             url={item.url}
             label={item.label}
             target={item.target}
diff --git a/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx b/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx
index 0a60cb13cd7f2..e1f77808965fc 100644
--- a/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx
@@ -1,6 +1,15 @@
 import { css, cx } from '@emotion/css';
-import React, { useCallback, useEffect, useRef, useState } from 'react';
-import { usePopper } from 'react-popper';
+import {
+  autoUpdate,
+  flip,
+  safePolygon,
+  shift,
+  useDismiss,
+  useFloating,
+  useHover,
+  useInteractions,
+} from '@floating-ui/react';
+import React, { CSSProperties, useCallback, useEffect, useState } from 'react';
 
 import {
   DataFrame,
@@ -8,12 +17,17 @@ import {
   dateTimeFormat,
   Field,
   FieldType,
+  formattedValueToString,
   GrafanaTheme2,
+  LinkModel,
   systemDateFormats,
   TimeZone,
 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
+import { config as runtimeConfig } from '@grafana/runtime';
 import { FieldLinkList, Portal, UPlotConfigBuilder, useStyles2 } from '@grafana/ui';
+import { DisplayValue } from 'app/features/visualization/data-hover/DataHoverView';
+import { ExemplarHoverView } from 'app/features/visualization/data-hover/ExemplarHoverView';
 
 import { ExemplarModalHeader } from '../../heatmap/ExemplarModalHeader';
 
@@ -39,25 +53,34 @@ export const ExemplarMarker = ({
   const styles = useStyles2(getExemplarMarkerStyles);
   const [isOpen, setIsOpen] = useState(false);
   const [isLocked, setIsLocked] = useState(false);
-  const [markerElement, setMarkerElement] = React.useState<HTMLDivElement | null>(null);
-  const [popperElement, setPopperElement] = React.useState<HTMLDivElement | null>(null);
-  const { styles: popperStyles, attributes } = usePopper(markerElement, popperElement, {
-    modifiers: [
-      {
-        name: 'preventOverflow',
-        options: {
-          altAxis: true,
-        },
-      },
-      {
-        name: 'flip',
-        options: {
-          fallbackPlacements: ['top', 'left-start'],
-        },
-      },
-    ],
+
+  // the order of middleware is important!
+  const middleware = [
+    flip({
+      fallbackAxisSideDirection: 'end',
+      // see https://floating-ui.com/docs/flip#combining-with-shift
+      crossAxis: false,
+      boundary: document.body,
+    }),
+    shift(),
+  ];
+
+  const { context, refs, floatingStyles } = useFloating({
+    open: isOpen,
+    placement: 'bottom',
+    onOpenChange: setIsOpen,
+    middleware,
+    whileElementsMounted: autoUpdate,
+    strategy: 'fixed',
   });
-  const popoverRenderTimeout = useRef<NodeJS.Timeout>();
+
+  const dismiss = useDismiss(context);
+  const hover = useHover(context, {
+    handleClose: safePolygon(),
+    enabled: clickedExemplarFieldIndex === undefined,
+  });
+
+  const { getReferenceProps, getFloatingProps } = useInteractions([dismiss, hover]);
 
   useEffect(() => {
     if (
@@ -102,25 +125,10 @@ export const ExemplarMarker = ({
     return symbols[dataFrameFieldIndex.frameIndex % symbols.length];
   };
 
-  const onMouseEnter = useCallback(() => {
-    if (clickedExemplarFieldIndex === undefined) {
-      if (popoverRenderTimeout.current) {
-        clearTimeout(popoverRenderTimeout.current);
-      }
-      setIsOpen(true);
-    }
-  }, [setIsOpen, clickedExemplarFieldIndex]);
-
   const lockExemplarModal = () => {
     setIsLocked(true);
   };
 
-  const onMouseLeave = useCallback(() => {
-    popoverRenderTimeout.current = setTimeout(() => {
-      setIsOpen(false);
-    }, 150);
-  }, [setIsOpen]);
-
   const renderMarker = useCallback(() => {
     //Put fields with links on the top
     const fieldsWithLinks =
@@ -143,59 +151,92 @@ export const ExemplarMarker = ({
       setClickedExemplarFieldIndex(undefined);
     };
 
-    return (
-      <div
-        onMouseEnter={onMouseEnter}
-        onMouseLeave={onMouseLeave}
-        className={styles.tooltip}
-        ref={setPopperElement}
-        style={popperStyles.popper}
-        {...attributes.popper}
-      >
-        <div className={styles.wrapper}>
-          {isLocked && <ExemplarModalHeader onClick={onClose} />}
-          <div className={styles.body}>
-            <div className={styles.header}>
-              <span className={styles.title}>Exemplars</span>
-            </div>
-            <div>
-              <table className={styles.exemplarsTable}>
-                <tbody>
-                  {orderedDataFrameFields.map((field: Field, i) => {
-                    const value = field.values[dataFrameFieldIndex.fieldIndex];
-                    const links = field.config.links?.length
-                      ? field.getLinks?.({ valueRowIndex: dataFrameFieldIndex.fieldIndex })
-                      : undefined;
-                    return (
-                      <tr key={i}>
-                        <td valign="top">{field.name}</td>
-                        <td>
-                          <div className={styles.valueWrapper}>
-                            <span>{field.type === FieldType.time ? timeFormatter(value) : value}</span>
-                            {links && <FieldLinkList links={links} />}
-                          </div>
-                        </td>
-                      </tr>
-                    );
-                  })}
-                </tbody>
-              </table>
+    let displayValues: DisplayValue[] = [];
+    let links: LinkModel[] | undefined = [];
+    orderedDataFrameFields.map((field: Field, i) => {
+      const value = field.values[dataFrameFieldIndex.fieldIndex];
+
+      if (field.config.links?.length) {
+        links?.push(...(field.getLinks?.({ valueRowIndex: dataFrameFieldIndex.fieldIndex }) || []));
+      }
+
+      const fieldDisplay = field.display ? field.display(value) : { text: `${value}`, numeric: +value };
+
+      displayValues.push({
+        name: field.name,
+        value,
+        valueString: formattedValueToString(fieldDisplay),
+        highlight: false,
+      });
+    });
+
+    const exemplarHeaderCustomStyle: CSSProperties = {
+      position: 'relative',
+      top: '35px',
+      right: '5px',
+      marginRight: 0,
+    };
+
+    const getExemplarMarkerContent = () => {
+      if (runtimeConfig.featureToggles.newVizTooltips) {
+        return (
+          <>
+            {isLocked && <ExemplarModalHeader onClick={onClose} style={exemplarHeaderCustomStyle} />}
+            <ExemplarHoverView displayValues={displayValues} links={links} />
+          </>
+        );
+      } else {
+        return (
+          <div className={styles.wrapper}>
+            {isLocked && <ExemplarModalHeader onClick={onClose} />}
+            <div className={styles.body}>
+              <div className={styles.header}>
+                <span className={styles.title}>Exemplars</span>
+              </div>
+              <div>
+                <table className={styles.exemplarsTable}>
+                  <tbody>
+                    {orderedDataFrameFields.map((field: Field, i) => {
+                      const value = field.values[dataFrameFieldIndex.fieldIndex];
+                      const links = field.config.links?.length
+                        ? field.getLinks?.({ valueRowIndex: dataFrameFieldIndex.fieldIndex })
+                        : undefined;
+                      return (
+                        <tr key={i}>
+                          <td valign="top">{field.name}</td>
+                          <td>
+                            <div className={styles.valueWrapper}>
+                              <span>{field.type === FieldType.time ? timeFormatter(value) : value}</span>
+                              {links && <FieldLinkList links={links} />}
+                            </div>
+                          </td>
+                        </tr>
+                      );
+                    })}
+                  </tbody>
+                </table>
+              </div>
             </div>
           </div>
-        </div>
+        );
+      }
+    };
+
+    return (
+      <div className={styles.tooltip} ref={refs.setFloating} style={floatingStyles} {...getFloatingProps()}>
+        {getExemplarMarkerContent()}
       </div>
     );
   }, [
-    attributes.popper,
     dataFrame.fields,
     dataFrameFieldIndex,
-    onMouseEnter,
-    onMouseLeave,
-    popperStyles.popper,
     styles,
     timeZone,
     isLocked,
     setClickedExemplarFieldIndex,
+    floatingStyles,
+    getFloatingProps,
+    refs.setFloating,
   ]);
 
   const seriesColor = config
@@ -210,19 +251,18 @@ export const ExemplarMarker = ({
   return (
     <>
       <div
-        ref={setMarkerElement}
+        ref={refs.setReference}
+        className={styles.markerWrapper}
+        data-testid={selectors.components.DataSource.Prometheus.exemplarMarker}
+        role="button"
+        tabIndex={0}
+        {...getReferenceProps()}
         onClick={onExemplarClick}
         onKeyDown={(e: React.KeyboardEvent) => {
           if (e.key === 'Enter') {
             onExemplarClick();
           }
         }}
-        onMouseEnter={onMouseEnter}
-        onMouseLeave={onMouseLeave}
-        className={styles.markerWrapper}
-        aria-label={selectors.components.DataSource.Prometheus.exemplarMarker}
-        role="button"
-        tabIndex={0}
       >
         <svg
           viewBox="0 0 7 7"
@@ -246,102 +286,96 @@ const getExemplarMarkerStyles = (theme: GrafanaTheme2) => {
   const tableBgOdd = theme.isDark ? theme.v1.palette.dark3 : theme.v1.palette.gray6;
 
   return {
-    markerWrapper: css`
-      padding: 0 4px 4px 4px;
-      width: 8px;
-      height: 8px;
-      box-sizing: content-box;
-      transform: translate3d(-50%, 0, 0);
-
-      &:hover {
-        > svg {
-          transform: scale(1.3);
-          opacity: 1;
-          filter: drop-shadow(0 0 8px rgba(0, 0, 0, 0.5));
-        }
-      }
-    `,
-    marker: css`
-      width: 0;
-      height: 0;
-      border-left: 4px solid transparent;
-      border-right: 4px solid transparent;
-      border-bottom: 4px solid ${theme.v1.palette.red};
-      pointer-events: none;
-    `,
-    wrapper: css`
-      background: ${bg};
-      border: 1px solid ${headerBg};
-      border-radius: ${theme.shape.borderRadius(2)};
-      box-shadow: 0 0 20px ${shadowColor};
-      padding: ${theme.spacing(1)};
-    `,
-    exemplarsTable: css`
-      width: 100%;
-
-      tr td {
-        padding: 5px 10px;
-        white-space: nowrap;
-        border-bottom: 4px solid ${theme.components.panel.background};
-      }
-
-      tr {
-        background-color: ${theme.colors.background.primary};
-
-        &:nth-child(even) {
-          background-color: ${tableBgOdd};
-        }
-      }
-    `,
-    valueWrapper: css`
-      display: flex;
-      flex-direction: row;
-      flex-wrap: wrap;
-      column-gap: ${theme.spacing(1)};
-
-      > span {
-        flex-grow: 0;
-      }
-
-      > * {
-        flex: 1 1;
-        align-self: center;
-      }
-    `,
-    tooltip: css`
-      background: none;
-      padding: 0;
-      overflow-y: auto;
-      max-height: 95vh;
-    `,
-    header: css`
-      background: ${headerBg};
-      padding: 6px 10px;
-      display: flex;
-    `,
-    title: css`
-      font-weight: ${theme.typography.fontWeightMedium};
-      padding-right: ${theme.spacing(2)};
-      overflow: hidden;
-      display: inline-block;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-      flex-grow: 1;
-    `,
-    body: css`
-      font-weight: ${theme.typography.fontWeightMedium};
-      border-radius: ${theme.shape.borderRadius(2)};
-      overflow: hidden;
-    `,
-    marble: css`
-      display: block;
-      opacity: 0.5;
-      transition: transform 0.15s ease-out;
-    `,
-    activeMarble: css`
-      transform: scale(1.3);
-      opacity: 1;
-      filter: drop-shadow(0 0 8px rgba(0, 0, 0, 0.5));
-    `,
+    markerWrapper: css({
+      padding: '0 4px 4px 4px',
+      width: '8px',
+      height: '8px',
+      boxSizing: 'content-box',
+      transform: 'translate3d(-50%, 0, 0)',
+      '&:hover': {
+        '> svg': {
+          transform: 'scale(1.3)',
+          opacity: 1,
+          filter: 'drop-shadow(0 0 8px rgba(0, 0, 0, 0.5))',
+        },
+      },
+    }),
+    marker: css({
+      width: 0,
+      height: 0,
+      borderLeft: '4px solid transparent',
+      borderRight: '4px solid transparent',
+      borderBottom: `4px solid ${theme.v1.palette.red}`,
+      pointerEvents: 'none',
+    }),
+    wrapper: css({
+      background: bg,
+      border: `1px solid ${headerBg}`,
+      borderRadius: theme.shape.borderRadius(2),
+      boxShadow: `0 0 20px ${shadowColor}`,
+      padding: theme.spacing(1),
+    }),
+    exemplarsTable: css({
+      width: '100%',
+      'tr td': {
+        padding: '5px 10px',
+        whiteSpace: 'nowrap',
+        borderBottom: `4px solid ${theme.components.panel.background}`,
+      },
+      tr: {
+        backgroundColor: theme.colors.background.primary,
+        '&:nth-child(even)': {
+          backgroundColor: tableBgOdd,
+        },
+      },
+    }),
+    valueWrapper: css({
+      display: 'flex',
+      flexDirection: 'row',
+      flexWrap: 'wrap',
+      columnGap: theme.spacing(1),
+      '> span': {
+        flexGrow: 0,
+      },
+      '> *': {
+        flex: '1 1',
+        alignSelf: 'center',
+      },
+    }),
+    tooltip: css({
+      background: 'none',
+      padding: 0,
+      overflowY: 'auto',
+      maxHeight: '95vh',
+    }),
+    header: css({
+      background: headerBg,
+      padding: '6px 10px',
+      display: 'flex',
+    }),
+    title: css({
+      fontWeight: theme.typography.fontWeightMedium,
+      paddingRight: theme.spacing(2),
+      overflow: 'hidden',
+      display: 'inline-block',
+      whiteSpace: 'nowrap',
+      textOverflow: 'ellipsis',
+      flexGrow: 1,
+    }),
+    body: css({
+      fontWeight: theme.typography.fontWeightMedium,
+      borderRadius: theme.shape.borderRadius(2),
+      overflow: 'hidden',
+    }),
+    marble: css({
+      display: 'block',
+      opacity: 0.5,
+      transition: 'transform 0.15s ease-out',
+    }),
+    activeMarble: css({
+      transform: 'scale(1.3)',
+      opacity: 1,
+      filter: 'drop-shadow(0 0 8px rgba(0, 0, 0, 0.5))',
+    }),
   };
 };
diff --git a/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.tsx b/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.tsx
index 321dbfb1cec61..754e052c7b958 100644
--- a/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.tsx
@@ -9,7 +9,7 @@ import {
   TIME_SERIES_VALUE_FIELD_NAME,
   TimeZone,
 } from '@grafana/data';
-import { EventsCanvas, FIXED_UNIT, UPlotConfigBuilder } from '@grafana/ui';
+import { FIXED_UNIT, EventsCanvas, UPlotConfigBuilder } from '@grafana/ui';
 
 import { ExemplarMarker } from './ExemplarMarker';
 
diff --git a/public/app/plugins/panel/timeseries/plugins/ThresholdControlsPlugin.tsx b/public/app/plugins/panel/timeseries/plugins/ThresholdControlsPlugin.tsx
index 3db8c039e8d9a..a286ce7612f5d 100644
--- a/public/app/plugins/panel/timeseries/plugins/ThresholdControlsPlugin.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/ThresholdControlsPlugin.tsx
@@ -2,7 +2,8 @@ import React, { useState, useLayoutEffect, useMemo, useRef } from 'react';
 import uPlot from 'uplot';
 
 import { FieldConfigSource, ThresholdsConfig, getValueFormat, FieldType } from '@grafana/data';
-import { UPlotConfigBuilder, buildScaleKey } from '@grafana/ui';
+import { UPlotConfigBuilder } from '@grafana/ui';
+import { buildScaleKey } from '@grafana/ui/src/components/uPlot/internal';
 
 import { ThresholdDragHandle } from './ThresholdDragHandle';
 
diff --git a/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationEditor.tsx b/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationEditor.tsx
index 686c076fc8605..1702de0ce4acd 100644
--- a/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationEditor.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationEditor.tsx
@@ -1,6 +1,6 @@
 import { css, cx } from '@emotion/css';
-import React, { HTMLAttributes, useState } from 'react';
-import { usePopper } from 'react-popper';
+import { autoUpdate, flip, shift, useDismiss, useFloating, useInteractions } from '@floating-ui/react';
+import React, { HTMLAttributes } from 'react';
 
 import { colorManipulator, DataFrame, getDisplayProcessor, GrafanaTheme2, TimeZone } from '@grafana/data';
 import { PlotSelection, useStyles2, useTheme2, Portal, DEFAULT_ANNOTATION_COLOR } from '@grafana/ui';
@@ -31,22 +31,35 @@ export const AnnotationEditor = ({
   const theme = useTheme2();
   const styles = useStyles2(getStyles);
   const commonStyles = useStyles2(getCommonAnnotationStyles);
-  const [popperTrigger, setPopperTrigger] = useState<HTMLDivElement | null>(null);
-  const [editorPopover, setEditorPopover] = useState<HTMLDivElement | null>(null);
 
-  const popper = usePopper(popperTrigger, editorPopover, {
-    modifiers: [
-      { name: 'arrow', enabled: false },
-      {
-        name: 'preventOverflow',
-        enabled: true,
-        options: {
-          rootBoundary: 'viewport',
-        },
-      },
-    ],
+  // the order of middleware is important!
+  const middleware = [
+    flip({
+      fallbackAxisSideDirection: 'end',
+      // see https://floating-ui.com/docs/flip#combining-with-shift
+      crossAxis: false,
+      boundary: document.body,
+    }),
+    shift(),
+  ];
+
+  const { context, refs, floatingStyles } = useFloating({
+    open: true,
+    placement: 'bottom',
+    onOpenChange: (open) => {
+      if (!open) {
+        onDismiss();
+      }
+    },
+    middleware,
+    whileElementsMounted: autoUpdate,
+    strategy: 'fixed',
   });
 
+  const dismiss = useDismiss(context);
+
+  const { getReferenceProps, getFloatingProps } = useInteractions([dismiss]);
+
   let xField = data.fields[0];
   if (!xField) {
     return null;
@@ -62,23 +75,24 @@ export const AnnotationEditor = ({
         >
           <div // Annotation marker
             className={cx(
-              css`
-                position: absolute;
-                top: ${selection.bbox.top}px;
-                left: ${selection.bbox.left}px;
-                width: ${selection.bbox.width}px;
-                height: ${selection.bbox.height}px;
-              `,
+              css({
+                position: 'absolute',
+                top: selection.bbox.top,
+                left: selection.bbox.left,
+                width: selection.bbox.width,
+                height: selection.bbox.height,
+              }),
               isRegionAnnotation ? styles.overlayRange(annotation) : styles.overlay(annotation)
             )}
           >
             <div
-              ref={setPopperTrigger}
+              ref={refs.setReference}
               className={
                 isRegionAnnotation
                   ? cx(commonStyles(annotation).markerBar, styles.markerBar)
                   : cx(commonStyles(annotation).markerTriangle, styles.markerTriangle)
               }
+              {...getReferenceProps()}
             />
           </div>
         </div>
@@ -88,9 +102,9 @@ export const AnnotationEditor = ({
           timeFormatter={(v) => xFieldFmt(v).text}
           onSave={onSave}
           onDismiss={onDismiss}
-          ref={setEditorPopover}
-          style={popper.styles.popper}
-          {...popper.attributes.popper}
+          ref={refs.setFloating}
+          style={floatingStyles}
+          {...getFloatingProps()}
         />
       </>
     </Portal>
@@ -101,27 +115,27 @@ const getStyles = (theme: GrafanaTheme2) => {
   return {
     overlay: (annotation?: AnnotationsDataFrameViewDTO) => {
       const color = theme.visualization.getColorByName(annotation?.color || DEFAULT_ANNOTATION_COLOR);
-      return css`
-        border-left: 1px dashed ${color};
-      `;
+      return css({
+        borderLeft: `1px dashed ${color}`,
+      });
     },
     overlayRange: (annotation?: AnnotationsDataFrameViewDTO) => {
       const color = theme.visualization.getColorByName(annotation?.color || DEFAULT_ANNOTATION_COLOR);
-      return css`
-        background: ${colorManipulator.alpha(color, 0.1)};
-        border-left: 1px dashed ${color};
-        border-right: 1px dashed ${color};
-      `;
+      return css({
+        background: colorManipulator.alpha(color, 0.1),
+        borderLeft: `1px dashed ${color}`,
+        borderRight: `1px dashed ${color}`,
+      });
     },
-    markerTriangle: css`
-      top: calc(100% + 2px);
-      left: -4px;
-      position: absolute;
-    `,
-    markerBar: css`
-      top: 100%;
-      left: 0;
-      position: absolute;
-    `,
+    markerTriangle: css({
+      top: `calc(100% + 2px)`,
+      left: '-4px',
+      position: 'absolute',
+    }),
+    markerBar: css({
+      top: '100%',
+      left: 0,
+      position: 'absolute',
+    }),
   };
 };
diff --git a/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationEditorForm.tsx b/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationEditorForm.tsx
index 26e041a17890f..c8de3bd393473 100644
--- a/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationEditorForm.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationEditorForm.tsx
@@ -1,10 +1,12 @@
 import { css, cx } from '@emotion/css';
 import React, { HTMLAttributes, useRef } from 'react';
+import { Controller } from 'react-hook-form';
 import useAsyncFn from 'react-use/lib/useAsyncFn';
 import useClickAway from 'react-use/lib/useClickAway';
 
 import { AnnotationEventUIModel, GrafanaTheme2 } from '@grafana/data';
-import { Button, Field, Form, HorizontalGroup, InputControl, TextArea, usePanelContext, useStyles2 } from '@grafana/ui';
+import { Button, Field, Stack, TextArea, usePanelContext, useStyles2 } from '@grafana/ui';
+import { Form } from 'app/core/components/Form/Form';
 import { TagFilter } from 'app/core/components/TagFilter/TagFilter';
 import { getAnnotationTags } from 'app/features/annotations/api';
 
@@ -73,10 +75,10 @@ export const AnnotationEditorForm = React.forwardRef<HTMLDivElement, AnnotationE
         {...otherProps}
       >
         <div className={styles.header}>
-          <HorizontalGroup justify={'space-between'} align={'center'}>
+          <Stack justifyContent={'space-between'} alignItems={'center'}>
             <div className={styles.title}>Add annotation</div>
             <div className={styles.ts}>{ts}</div>
-          </HorizontalGroup>
+          </Stack>
         </div>
         <div className={styles.editorForm}>
           <Form<AnnotationEditFormDTO>
@@ -94,7 +96,7 @@ export const AnnotationEditorForm = React.forwardRef<HTMLDivElement, AnnotationE
                     />
                   </Field>
                   <Field label={'Tags'}>
-                    <InputControl
+                    <Controller
                       control={control}
                       name="tags"
                       render={({ field: { ref, onChange, ...field } }) => {
@@ -110,14 +112,14 @@ export const AnnotationEditorForm = React.forwardRef<HTMLDivElement, AnnotationE
                       }}
                     />
                   </Field>
-                  <HorizontalGroup justify={'flex-end'}>
+                  <Stack justifyContent={'flex-end'}>
                     <Button size={'sm'} variant="secondary" onClick={onDismiss} fill="outline">
                       Cancel
                     </Button>
                     <Button size={'sm'} type={'submit'} disabled={stateIndicator?.loading}>
                       {stateIndicator?.loading ? 'Saving' : 'Save'}
                     </Button>
-                  </HorizontalGroup>
+                  </Stack>
                 </>
               );
             }}
diff --git a/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx b/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx
index 4c5f312f171ab..2853fbc70d75a 100644
--- a/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx
@@ -1,6 +1,15 @@
 import { css } from '@emotion/css';
-import React, { HTMLAttributes, useCallback, useRef, useState } from 'react';
-import { usePopper } from 'react-popper';
+import {
+  autoUpdate,
+  flip,
+  safePolygon,
+  shift,
+  useDismiss,
+  useFloating,
+  useHover,
+  useInteractions,
+} from '@floating-ui/react';
+import React, { HTMLAttributes, useCallback, useState } from 'react';
 
 import { GrafanaTheme2, dateTimeFormat, systemDateFormats, TimeZone } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
@@ -21,34 +30,40 @@ interface Props extends HTMLAttributes<HTMLDivElement> {
 
 const MIN_REGION_ANNOTATION_WIDTH = 6;
 
-const POPPER_CONFIG = {
-  modifiers: [
-    { name: 'arrow', enabled: false },
-    {
-      name: 'preventOverflow',
-      enabled: true,
-      options: {
-        rootBoundary: 'viewport',
-      },
-    },
-  ],
-};
-
 export function AnnotationMarker({ annotation, timeZone, width }: Props) {
-  const { canAddAnnotations, canEditAnnotations, canDeleteAnnotations, ...panelCtx } = usePanelContext();
+  const { canEditAnnotations, canDeleteAnnotations, ...panelCtx } = usePanelContext();
   const commonStyles = useStyles2(getCommonAnnotationStyles);
   const styles = useStyles2(getStyles);
 
   const [isOpen, setIsOpen] = useState(false);
   const [isEditing, setIsEditing] = useState(false);
-  const [markerRef, setMarkerRef] = useState<HTMLDivElement | null>(null);
-  const [tooltipRef, setTooltipRef] = useState<HTMLDivElement | null>(null);
-  const [editorRef, setEditorRef] = useState<HTMLDivElement | null>(null);
 
-  const popoverRenderTimeout = useRef<NodeJS.Timeout>();
-
-  const popper = usePopper(markerRef, tooltipRef, POPPER_CONFIG);
-  const editorPopper = usePopper(markerRef, editorRef, POPPER_CONFIG);
+  // the order of middleware is important!
+  const middleware = [
+    flip({
+      fallbackAxisSideDirection: 'end',
+      // see https://floating-ui.com/docs/flip#combining-with-shift
+      crossAxis: false,
+      boundary: document.body,
+    }),
+    shift(),
+  ];
+
+  const { context, refs, floatingStyles } = useFloating({
+    open: isOpen,
+    placement: 'bottom',
+    onOpenChange: setIsOpen,
+    middleware,
+    whileElementsMounted: autoUpdate,
+    strategy: 'fixed',
+  });
+
+  const hover = useHover(context, {
+    handleClose: safePolygon(),
+  });
+  const dismiss = useDismiss(context);
+
+  const { getReferenceProps, getFloatingProps } = useInteractions([dismiss, hover]);
 
   const onAnnotationEdit = useCallback(() => {
     setIsEditing(true);
@@ -61,25 +76,6 @@ export function AnnotationMarker({ annotation, timeZone, width }: Props) {
     }
   }, [annotation, panelCtx]);
 
-  const onMouseEnter = useCallback(() => {
-    if (popoverRenderTimeout.current) {
-      clearTimeout(popoverRenderTimeout.current);
-    }
-    setIsOpen(true);
-  }, [setIsOpen]);
-
-  const onPopoverMouseEnter = useCallback(() => {
-    if (popoverRenderTimeout.current) {
-      clearTimeout(popoverRenderTimeout.current);
-    }
-  }, []);
-
-  const onMouseLeave = useCallback(() => {
-    popoverRenderTimeout.current = setTimeout(() => {
-      setIsOpen(false);
-    }, 100);
-  }, [setIsOpen]);
-
   const timeFormatter = useCallback(
     (value: number) => {
       return dateTimeFormat(value, {
@@ -97,11 +93,12 @@ export function AnnotationMarker({ annotation, timeZone, width }: Props) {
         timeFormatter={timeFormatter}
         onEdit={onAnnotationEdit}
         onDelete={onAnnotationDelete}
-        canEdit={canEditAnnotations!(annotation.dashboardUID)}
-        canDelete={canDeleteAnnotations!(annotation.dashboardUID)}
+        canEdit={canEditAnnotations ? canEditAnnotations(annotation.dashboardUID) : false}
+        canDelete={canDeleteAnnotations ? canDeleteAnnotations(annotation.dashboardUID) : false}
       />
     );
   }, [canEditAnnotations, canDeleteAnnotations, onAnnotationDelete, onAnnotationEdit, timeFormatter, annotation]);
+
   const isRegionAnnotation = Boolean(annotation.isRegion) && width > MIN_REGION_ANNOTATION_WIDTH;
 
   let left = `${width / 2}px`;
@@ -123,25 +120,17 @@ export function AnnotationMarker({ annotation, timeZone, width }: Props) {
   return (
     <>
       <div
-        ref={setMarkerRef}
-        onMouseEnter={onMouseEnter}
-        onMouseLeave={onMouseLeave}
+        ref={refs.setReference}
         className={!isRegionAnnotation ? styles.markerWrapper : undefined}
         data-testid={selectors.pages.Dashboard.Annotations.marker}
+        {...getReferenceProps()}
       >
         {marker}
       </div>
 
       {isOpen && (
         <Portal>
-          <div
-            ref={setTooltipRef}
-            style={popper.styles.popper}
-            {...popper.attributes.popper}
-            className={styles.tooltip}
-            onMouseEnter={onPopoverMouseEnter}
-            onMouseLeave={onMouseLeave}
-          >
+          <div className={styles.tooltip} ref={refs.setFloating} style={floatingStyles} {...getFloatingProps()}>
             {renderTooltip()}
           </div>
         </Portal>
@@ -154,9 +143,9 @@ export function AnnotationMarker({ annotation, timeZone, width }: Props) {
             onSave={() => setIsEditing(false)}
             timeFormatter={timeFormatter}
             annotation={annotation}
-            ref={setEditorRef}
-            style={editorPopper.styles.popper}
-            {...editorPopper.attributes.popper}
+            ref={refs.setFloating}
+            style={floatingStyles}
+            {...getFloatingProps()}
           />
         </Portal>
       )}
@@ -166,16 +155,13 @@ export function AnnotationMarker({ annotation, timeZone, width }: Props) {
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
-    markerWrapper: css`
-      label: markerWrapper;
-      padding: 0 4px 4px 4px;
-    `,
-    wrapper: css`
-      max-width: 400px;
-    `,
-    tooltip: css`
-      ${getTooltipContainerStyles(theme)};
-      padding: 0;
-    `,
+    markerWrapper: css({
+      label: 'markerWrapper',
+      padding: theme.spacing(0, 0.5, 0.5, 0.5),
+    }),
+    tooltip: css({
+      ...getTooltipContainerStyles(theme),
+      padding: 0,
+    }),
   };
 };
diff --git a/public/app/plugins/panel/timeseries/plugins/annotations2/AnnotationEditor2.tsx b/public/app/plugins/panel/timeseries/plugins/annotations2/AnnotationEditor2.tsx
new file mode 100644
index 0000000000000..21f998ce69656
--- /dev/null
+++ b/public/app/plugins/panel/timeseries/plugins/annotations2/AnnotationEditor2.tsx
@@ -0,0 +1,159 @@
+import { css } from '@emotion/css';
+import React, { useRef } from 'react';
+import { Controller } from 'react-hook-form';
+import { useAsyncFn, useClickAway } from 'react-use';
+
+import { AnnotationEventUIModel, GrafanaTheme2, dateTimeFormat, systemDateFormats } from '@grafana/data';
+import { Button, Field, Stack, TextArea, usePanelContext, useStyles2 } from '@grafana/ui';
+import { Form } from 'app/core/components/Form/Form';
+import { TagFilter } from 'app/core/components/TagFilter/TagFilter';
+import { getAnnotationTags } from 'app/features/annotations/api';
+
+interface Props {
+  annoVals: Record<string, any[]>;
+  annoIdx: number;
+  timeZone: string;
+  dismiss: () => void;
+}
+
+interface AnnotationEditFormDTO {
+  description: string;
+  tags: string[];
+}
+
+export const AnnotationEditor2 = ({ annoVals, annoIdx, dismiss, timeZone, ...otherProps }: Props) => {
+  const styles = useStyles2(getStyles);
+  const { onAnnotationCreate, onAnnotationUpdate } = usePanelContext();
+
+  const clickAwayRef = useRef(null);
+
+  useClickAway(clickAwayRef, dismiss);
+
+  const [createAnnotationState, createAnnotation] = useAsyncFn(async (event: AnnotationEventUIModel) => {
+    const result = await onAnnotationCreate!(event);
+    dismiss();
+    return result;
+  });
+
+  const [updateAnnotationState, updateAnnotation] = useAsyncFn(async (event: AnnotationEventUIModel) => {
+    const result = await onAnnotationUpdate!(event);
+    dismiss();
+    return result;
+  });
+
+  const timeFormatter = (value: number) =>
+    dateTimeFormat(value, {
+      format: systemDateFormats.fullDate,
+      timeZone,
+    });
+
+  const isUpdatingAnnotation = annoVals.id?.[annoIdx] != null;
+  const isRegionAnnotation = annoVals.isRegion?.[annoIdx];
+  const operation = isUpdatingAnnotation ? updateAnnotation : createAnnotation;
+  const stateIndicator = isUpdatingAnnotation ? updateAnnotationState : createAnnotationState;
+  const time = isRegionAnnotation
+    ? `${timeFormatter(annoVals.time[annoIdx])} - ${timeFormatter(annoVals.timeEnd[annoIdx])}`
+    : timeFormatter(annoVals.time[annoIdx]);
+
+  const onSubmit = ({ tags, description }: AnnotationEditFormDTO) => {
+    operation({
+      id: annoVals.id?.[annoIdx] ?? undefined,
+      tags,
+      description,
+      from: Math.round(annoVals.time[annoIdx]!),
+      to: Math.round(annoVals.timeEnd?.[annoIdx] ?? annoVals.time[annoIdx]!),
+    });
+  };
+
+  // Annotation editor
+  return (
+    <div ref={clickAwayRef} className={styles.editor} {...otherProps}>
+      <div className={styles.header}>
+        <Stack justifyContent={'space-between'} alignItems={'center'}>
+          <div>{isUpdatingAnnotation ? 'Edit annotation' : 'Add annotation'}</div>
+          <div>{time}</div>
+        </Stack>
+      </div>
+      <Form<AnnotationEditFormDTO>
+        onSubmit={onSubmit}
+        defaultValues={{ description: annoVals.text?.[annoIdx], tags: annoVals.tags?.[annoIdx] || [] }}
+      >
+        {({ register, errors, control }) => {
+          return (
+            <>
+              <div className={styles.content}>
+                <Field label={'Description'} invalid={!!errors.description} error={errors?.description?.message}>
+                  <TextArea
+                    className={styles.textarea}
+                    {...register('description', {
+                      required: 'Annotation description is required',
+                    })}
+                  />
+                </Field>
+                <Field label={'Tags'}>
+                  <Controller
+                    control={control}
+                    name="tags"
+                    render={({ field: { ref, onChange, ...field } }) => {
+                      return (
+                        <TagFilter
+                          allowCustomValue
+                          placeholder="Add tags"
+                          onChange={onChange}
+                          tagOptions={getAnnotationTags}
+                          tags={field.value}
+                        />
+                      );
+                    }}
+                  />
+                </Field>
+              </div>
+              <div className={styles.footer}>
+                <Stack justifyContent={'flex-end'}>
+                  <Button size={'sm'} variant="secondary" onClick={dismiss} fill="outline">
+                    Cancel
+                  </Button>
+                  <Button size={'sm'} type={'submit'} disabled={stateIndicator?.loading}>
+                    {stateIndicator?.loading ? 'Saving' : 'Save'}
+                  </Button>
+                </Stack>
+              </div>
+            </>
+          );
+        }}
+      </Form>
+    </div>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    editor: css({
+      // zIndex: theme.zIndex.tooltip,
+      background: theme.colors.background.primary,
+      border: `1px solid ${theme.colors.border.weak}`,
+      borderRadius: theme.shape.radius.default,
+      boxShadow: theme.shadows.z3,
+      userSelect: 'text',
+      width: '460px',
+    }),
+    content: css({
+      padding: theme.spacing(1),
+    }),
+    header: css({
+      borderBottom: `1px solid ${theme.colors.border.weak}`,
+      padding: theme.spacing(0.5, 1),
+      fontWeight: theme.typography.fontWeightBold,
+      fontSize: theme.typography.fontSize,
+      color: theme.colors.text.primary,
+    }),
+    footer: css({
+      borderTop: `1px solid ${theme.colors.border.weak}`,
+      padding: theme.spacing(1, 1),
+    }),
+    textarea: css({
+      color: theme.colors.text.secondary,
+      fontSize: theme.typography.bodySmall.fontSize,
+    }),
+  };
+};
diff --git a/public/app/plugins/panel/timeseries/plugins/annotations2/AnnotationMarker2.tsx b/public/app/plugins/panel/timeseries/plugins/annotations2/AnnotationMarker2.tsx
new file mode 100644
index 0000000000000..db27a162b9faf
--- /dev/null
+++ b/public/app/plugins/panel/timeseries/plugins/annotations2/AnnotationMarker2.tsx
@@ -0,0 +1,109 @@
+import { css } from '@emotion/css';
+import { flip, shift, autoUpdate } from '@floating-ui/dom';
+import { useFloating } from '@floating-ui/react';
+import React, { useState } from 'react';
+import { createPortal } from 'react-dom';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { TimeZone } from '@grafana/schema';
+import { useStyles2 } from '@grafana/ui';
+
+import { AnnotationEditor2 } from './AnnotationEditor2';
+import { AnnotationTooltip2 } from './AnnotationTooltip2';
+
+interface AnnoBoxProps {
+  annoVals: Record<string, any[]>;
+  annoIdx: number;
+  style: React.CSSProperties | null;
+  className: string;
+  timeZone: TimeZone;
+  exitWipEdit?: null | (() => void);
+  portalRoot: HTMLElement;
+}
+
+const STATE_DEFAULT = 0;
+const STATE_EDITING = 1;
+const STATE_HOVERED = 2;
+
+export const AnnotationMarker2 = ({
+  annoVals,
+  annoIdx,
+  className,
+  style,
+  exitWipEdit,
+  timeZone,
+  portalRoot,
+}: AnnoBoxProps) => {
+  const styles = useStyles2(getStyles);
+
+  const [state, setState] = useState(exitWipEdit != null ? STATE_EDITING : STATE_DEFAULT);
+  const { refs, floatingStyles } = useFloating({
+    open: true,
+    placement: 'bottom',
+    middleware: [
+      flip({
+        fallbackAxisSideDirection: 'end',
+        // see https://floating-ui.com/docs/flip#combining-with-shift
+        crossAxis: false,
+        boundary: document.body,
+      }),
+      shift(),
+    ],
+    whileElementsMounted: autoUpdate,
+    strategy: 'fixed',
+  });
+
+  const contents =
+    state === STATE_HOVERED ? (
+      <AnnotationTooltip2
+        annoIdx={annoIdx}
+        annoVals={annoVals}
+        timeZone={timeZone}
+        onEdit={() => setState(STATE_EDITING)}
+      />
+    ) : state === STATE_EDITING ? (
+      <AnnotationEditor2
+        annoIdx={annoIdx}
+        annoVals={annoVals}
+        timeZone={timeZone}
+        dismiss={() => {
+          exitWipEdit?.();
+          setState(STATE_DEFAULT);
+        }}
+      />
+    ) : null;
+
+  return (
+    <div
+      ref={refs.setReference}
+      className={className}
+      style={style!}
+      onMouseEnter={() => state !== STATE_EDITING && setState(STATE_HOVERED)}
+      onMouseLeave={() => state !== STATE_EDITING && setState(STATE_DEFAULT)}
+    >
+      {contents &&
+        createPortal(
+          <div ref={refs.setFloating} className={styles.annoBox} style={floatingStyles}>
+            {contents}
+          </div>,
+          portalRoot
+        )}
+    </div>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  // NOTE: shares much with TooltipPlugin2
+  annoBox: css({
+    top: 0,
+    left: 0,
+    zIndex: theme.zIndex.tooltip,
+    borderRadius: theme.shape.radius.default,
+    position: 'absolute',
+    background: theme.colors.background.primary,
+    border: `1px solid ${theme.colors.border.weak}`,
+    boxShadow: theme.shadows.z2,
+    userSelect: 'text',
+    minWidth: '300px',
+  }),
+});
diff --git a/public/app/plugins/panel/timeseries/plugins/annotations2/AnnotationTooltip2.tsx b/public/app/plugins/panel/timeseries/plugins/annotations2/AnnotationTooltip2.tsx
new file mode 100644
index 0000000000000..b7c7f5290eb4d
--- /dev/null
+++ b/public/app/plugins/panel/timeseries/plugins/annotations2/AnnotationTooltip2.tsx
@@ -0,0 +1,158 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2, dateTimeFormat, systemDateFormats, textUtil } from '@grafana/data';
+import { HorizontalGroup, IconButton, Tag, usePanelContext, useStyles2 } from '@grafana/ui';
+import alertDef from 'app/features/alerting/state/alertDef';
+
+interface Props {
+  annoVals: Record<string, any[]>;
+  annoIdx: number;
+  timeZone: string;
+  onEdit: () => void;
+}
+
+const retFalse = () => false;
+
+export const AnnotationTooltip2 = ({ annoVals, annoIdx, timeZone, onEdit }: Props) => {
+  const annoId = annoVals.id?.[annoIdx];
+
+  const styles = useStyles2(getStyles);
+
+  const { canEditAnnotations = retFalse, canDeleteAnnotations = retFalse, onAnnotationDelete } = usePanelContext();
+
+  const dashboardUID = annoVals.dashboardUID?.[annoIdx];
+  const canEdit = canEditAnnotations(dashboardUID);
+  const canDelete = canDeleteAnnotations(dashboardUID) && onAnnotationDelete != null;
+
+  const timeFormatter = (value: number) =>
+    dateTimeFormat(value, {
+      format: systemDateFormats.fullDate,
+      timeZone,
+    });
+
+  let time = timeFormatter(annoVals.time[annoIdx]);
+  let text = annoVals.text?.[annoIdx] ?? '';
+
+  if (annoVals.isRegion?.[annoIdx]) {
+    time += ' - ' + timeFormatter(annoVals.timeEnd[annoIdx]);
+  }
+
+  let avatar;
+  if (annoVals.login?.[annoIdx] && annoVals.avatarUrl?.[annoIdx]) {
+    avatar = <img className={styles.avatar} alt="Annotation avatar" src={annoVals.avatarUrl[annoIdx]} />;
+  }
+
+  let state: React.ReactNode | null = null;
+  let alertText = '';
+
+  if (annoVals.alertId?.[annoIdx] !== undefined && annoVals.newState?.[annoIdx]) {
+    const stateModel = alertDef.getStateDisplayModel(annoVals.newState[annoIdx]);
+    state = (
+      <div className={styles.alertState}>
+        <i className={stateModel.stateClass}>{stateModel.text}</i>
+      </div>
+    );
+
+    alertText = annoVals.data?.[annoIdx] ? alertDef.getAlertAnnotationText(annoVals.data[annoIdx]) : '';
+  } else if (annoVals.title?.[annoIdx]) {
+    text = annoVals.title[annoIdx] + (text ? `<br />${text}` : '');
+  }
+
+  return (
+    <div className={styles.wrapper}>
+      <div className={styles.header}>
+        <HorizontalGroup justify={'space-between'} align={'center'} spacing={'md'}>
+          <div className={styles.meta}>
+            <span>
+              {avatar}
+              {state}
+            </span>
+            {time}
+          </div>
+          {(canEdit || canDelete) && (
+            <div className={styles.editControls}>
+              {canEdit && <IconButton name={'pen'} size={'sm'} onClick={onEdit} tooltip="Edit" />}
+              {canDelete && (
+                <IconButton
+                  name={'trash-alt'}
+                  size={'sm'}
+                  onClick={() => onAnnotationDelete(annoId)}
+                  tooltip="Delete"
+                />
+              )}
+            </div>
+          )}
+        </HorizontalGroup>
+      </div>
+
+      <div className={styles.body}>
+        {text && <div className={styles.text} dangerouslySetInnerHTML={{ __html: textUtil.sanitize(text) }} />}
+        {alertText}
+        <div>
+          <HorizontalGroup spacing="xs" wrap>
+            {annoVals.tags?.[annoIdx]?.map((t: string, i: number) => <Tag name={t} key={`${t}-${i}`} />)}
+          </HorizontalGroup>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  wrapper: css({
+    zIndex: theme.zIndex.tooltip,
+    whiteSpace: 'initial',
+    borderRadius: theme.shape.radius.default,
+    background: theme.colors.background.primary,
+    border: `1px solid ${theme.colors.border.weak}`,
+    boxShadow: theme.shadows.z2,
+    userSelect: 'text',
+  }),
+  header: css({
+    padding: theme.spacing(0.5, 1),
+    borderBottom: `1px solid ${theme.colors.border.weak}`,
+    fontWeight: theme.typography.fontWeightBold,
+    fontSize: theme.typography.fontSize,
+    color: theme.colors.text.primary,
+    display: 'flex',
+  }),
+  meta: css({
+    display: 'flex',
+    justifyContent: 'space-between',
+    color: theme.colors.text.primary,
+    fontWeight: 400,
+  }),
+  editControls: css({
+    display: 'flex',
+    alignItems: 'center',
+    '> :last-child': {
+      marginLeft: 0,
+    },
+  }),
+  body: css({
+    padding: theme.spacing(1),
+    fontSize: theme.typography.bodySmall.fontSize,
+    color: theme.colors.text.secondary,
+    fontWeight: 400,
+    a: {
+      color: theme.colors.text.link,
+      '&:hover': {
+        textDecoration: 'underline',
+      },
+    },
+  }),
+  text: css({
+    paddingBottom: theme.spacing(1),
+  }),
+  avatar: css({
+    borderRadius: theme.shape.radius.circle,
+    width: 16,
+    height: 16,
+    marginRight: theme.spacing(1),
+  }),
+  alertState: css({
+    paddingRight: theme.spacing(1),
+    fontWeight: theme.typography.fontWeightMedium,
+  }),
+});
diff --git a/public/app/plugins/panel/timeseries/utils.ts b/public/app/plugins/panel/timeseries/utils.ts
index 27cb4845a6a55..3f9212ee4d7aa 100644
--- a/public/app/plugins/panel/timeseries/utils.ts
+++ b/public/app/plugins/panel/timeseries/utils.ts
@@ -1,28 +1,24 @@
 import {
-  ArrayVector,
   DataFrame,
   Field,
   FieldType,
   getDisplayProcessor,
-  getLinksSupplier,
   GrafanaTheme2,
-  DataLinkPostProcessor,
-  InterpolateFunction,
   isBooleanUnit,
-  SortedVector,
   TimeRange,
+  cacheFieldDisplayNames,
 } from '@grafana/data';
 import { convertFieldType } from '@grafana/data/src/transformations/transformers/convertFieldType';
-import { GraphFieldConfig, LineInterpolation } from '@grafana/schema';
-import { applyNullInsertThreshold } from '@grafana/ui/src/components/GraphNG/nullInsertThreshold';
-import { nullToValue } from '@grafana/ui/src/components/GraphNG/nullToValue';
-import { buildScaleKey } from '@grafana/ui/src/components/GraphNG/utils';
+import { applyNullInsertThreshold } from '@grafana/data/src/transformations/transformers/nulls/nullInsertThreshold';
+import { nullToValue } from '@grafana/data/src/transformations/transformers/nulls/nullToValue';
+import { GraphFieldConfig, LineInterpolation, TooltipDisplayMode, VizTooltipOptions } from '@grafana/schema';
+import { buildScaleKey } from '@grafana/ui/src/components/uPlot/internal';
 
 type ScaleKey = string;
 
 // this will re-enumerate all enum fields on the same scale to create one ordinal progression
 // e.g. ['a','b'][0,1,0] + ['c','d'][1,0,1] -> ['a','b'][0,1,0] + ['c','d'][3,2,3]
-function reEnumFields(frames: DataFrame[]) {
+function reEnumFields(frames: DataFrame[]): DataFrame[] {
   let allTextsByKey: Map<ScaleKey, string[]> = new Map();
 
   let frames2: DataFrame[] = frames.map((frame) => {
@@ -55,7 +51,7 @@ function reEnumFields(frames: DataFrame[]) {
 
           return {
             ...field,
-            values: new ArrayVector(idxs),
+            values: idxs,
           };
 
           // TODO: update displayProcessor?
@@ -83,6 +79,8 @@ export function prepareGraphableFields(
     return null;
   }
 
+  cacheFieldDisplayNames(series);
+
   let useNumericX = xNumFieldIdx != null;
 
   // Make sure the numeric x field is first in the frame
@@ -240,7 +238,7 @@ const matchEnumColorToSeriesColor = (frames: DataFrame[], theme: GrafanaTheme2)
   }
 };
 
-const setClassicPaletteIdxs = (frames: DataFrame[], theme: GrafanaTheme2, skipFieldIdx?: number) => {
+export const setClassicPaletteIdxs = (frames: DataFrame[], theme: GrafanaTheme2, skipFieldIdx?: number) => {
   let seriesIndex = 0;
   frames.forEach((frame) => {
     frame.fields.forEach((field, fieldIdx) => {
@@ -265,49 +263,6 @@ export function getTimezones(timezones: string[] | undefined, defaultTimezone: s
   return timezones.map((v) => (v?.length ? v : defaultTimezone));
 }
 
-export function regenerateLinksSupplier(
-  alignedDataFrame: DataFrame,
-  frames: DataFrame[],
-  replaceVariables: InterpolateFunction,
-  timeZone: string,
-  dataLinkPostProcessor?: DataLinkPostProcessor
-): DataFrame {
-  alignedDataFrame.fields.forEach((field) => {
-    if (field.state?.origin?.frameIndex === undefined || frames[field.state?.origin?.frameIndex] === undefined) {
-      return;
-    }
-
-    /* check if field has sortedVector values
-      if it does, sort all string fields in the original frame by the order array already used for the field
-      otherwise just attach the fields to the temporary frame used to get the links
-    */
-    const tempFields: Field[] = [];
-    for (const frameField of frames[field.state?.origin?.frameIndex].fields) {
-      if (frameField.type === FieldType.string) {
-        if (field.values instanceof SortedVector) {
-          const copiedField = { ...frameField };
-          copiedField.values = new SortedVector(frameField.values, field.values.getOrderArray());
-          tempFields.push(copiedField);
-        } else {
-          tempFields.push(frameField);
-        }
-      }
-    }
-
-    const tempFrame: DataFrame = {
-      fields: [...alignedDataFrame.fields, ...tempFields],
-      length: alignedDataFrame.fields.length + tempFields.length,
-    };
-
-    field.getLinks = getLinksSupplier(
-      tempFrame,
-      field,
-      field.state!.scopedVars!,
-      replaceVariables,
-      timeZone,
-      dataLinkPostProcessor
-    );
-  });
-
-  return alignedDataFrame;
-}
+export const isTooltipScrollable = (tooltipOptions: VizTooltipOptions) => {
+  return tooltipOptions.mode === TooltipDisplayMode.Multi && tooltipOptions.maxHeight != null;
+};
diff --git a/public/app/plugins/panel/traces/TracesPanel.tsx b/public/app/plugins/panel/traces/TracesPanel.tsx
index c09c812515e87..f33e04f64eba1 100644
--- a/public/app/plugins/panel/traces/TracesPanel.tsx
+++ b/public/app/plugins/panel/traces/TracesPanel.tsx
@@ -2,11 +2,10 @@ import { css } from '@emotion/css';
 import React, { useMemo, createRef } from 'react';
 import { useAsync } from 'react-use';
 
-import { PanelProps } from '@grafana/data';
+import { Field, LinkModel, PanelProps } from '@grafana/data';
 import { getDataSourceSrv } from '@grafana/runtime';
 import { TraceView } from 'app/features/explore/TraceView/TraceView';
 import { SpanLinkFunc } from 'app/features/explore/TraceView/components';
-import { TopOfViewRefType } from 'app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView';
 import { transformDataFrames } from 'app/features/explore/TraceView/utils/transform';
 
 const styles = {
@@ -18,6 +17,8 @@ const styles = {
 
 export interface TracesPanelOptions {
   createSpanLink?: SpanLinkFunc;
+  focusedSpanId?: string;
+  createFocusSpanLink?: (traceId: string, spanId: string) => LinkModel<Field>;
 }
 
 export const TracesPanel = ({ data, options }: PanelProps<TracesPanelOptions>) => {
@@ -42,11 +43,11 @@ export const TracesPanel = ({ data, options }: PanelProps<TracesPanelOptions>) =
         dataFrames={data.series}
         scrollElementClass={styles.wrapper}
         traceProp={traceProp}
-        queryResponse={data}
         datasource={dataSource.value}
         topOfViewRef={topOfViewRef}
-        topOfViewRefType={TopOfViewRefType.Panel}
         createSpanLink={options.createSpanLink}
+        focusedSpanId={options.focusedSpanId}
+        createFocusSpanLink={options.createFocusSpanLink}
       />
     </div>
   );
diff --git a/public/app/plugins/panel/traces/module.tsx b/public/app/plugins/panel/traces/module.tsx
index 06b2f4fee43ed..19fae657d5f66 100644
--- a/public/app/plugins/panel/traces/module.tsx
+++ b/public/app/plugins/panel/traces/module.tsx
@@ -1,5 +1,6 @@
 import { PanelPlugin } from '@grafana/data';
 
 import { TracesPanel } from './TracesPanel';
+import { TracesSuggestionsSupplier } from './suggestions';
 
-export const plugin = new PanelPlugin(TracesPanel);
+export const plugin = new PanelPlugin(TracesPanel).setSuggestionsSupplier(new TracesSuggestionsSupplier());
diff --git a/public/app/plugins/panel/traces/suggestions.ts b/public/app/plugins/panel/traces/suggestions.ts
new file mode 100644
index 0000000000000..bda2e4639274b
--- /dev/null
+++ b/public/app/plugins/panel/traces/suggestions.ts
@@ -0,0 +1,29 @@
+import { VisualizationSuggestionsBuilder, VisualizationSuggestionScore } from '@grafana/data';
+import { SuggestionName } from 'app/types/suggestions';
+
+export class TracesSuggestionsSupplier {
+  getListWithDefaults(builder: VisualizationSuggestionsBuilder) {
+    return builder.getListAppender<{}, {}>({
+      name: SuggestionName.Trace,
+      pluginId: 'traces',
+    });
+  }
+
+  getSuggestionsForData(builder: VisualizationSuggestionsBuilder) {
+    if (!builder.data) {
+      return;
+    }
+
+    const dataFrame = builder.data.series[0];
+    if (!dataFrame) {
+      return;
+    }
+
+    if (builder.data.series[0].meta?.preferredVisualisationType === 'trace') {
+      this.getListWithDefaults(builder).append({
+        name: SuggestionName.Trace,
+        score: VisualizationSuggestionScore.Best,
+      });
+    }
+  }
+}
diff --git a/public/app/plugins/panel/trend/TrendPanel.tsx b/public/app/plugins/panel/trend/TrendPanel.tsx
index 371b0679a6521..cb90f861f3e7c 100644
--- a/public/app/plugins/panel/trend/TrendPanel.tsx
+++ b/public/app/plugins/panel/trend/TrendPanel.tsx
@@ -3,18 +3,15 @@ import React, { useMemo } from 'react';
 import { DataFrame, FieldMatcherID, fieldMatchers, FieldType, PanelProps, TimeRange } from '@grafana/data';
 import { isLikelyAscendingVector } from '@grafana/data/src/transformations/transformers/joinDataFrames';
 import { config, PanelDataErrorView } from '@grafana/runtime';
-import {
-  KeyboardPlugin,
-  preparePlotFrame,
-  TimeSeries,
-  TooltipDisplayMode,
-  TooltipPlugin,
-  usePanelContext,
-} from '@grafana/ui';
-import { XYFieldMatchers } from '@grafana/ui/src/components/GraphNG/types';
+import { KeyboardPlugin, TooltipDisplayMode, usePanelContext, TooltipPlugin, TooltipPlugin2 } from '@grafana/ui';
+import { TooltipHoverMode } from '@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2';
+import { XYFieldMatchers } from 'app/core/components/GraphNG/types';
+import { preparePlotFrame } from 'app/core/components/GraphNG/utils';
+import { TimeSeries } from 'app/core/components/TimeSeries/TimeSeries';
 import { findFieldIndex } from 'app/features/dimensions';
 
-import { prepareGraphableFields, regenerateLinksSupplier } from '../timeseries/utils';
+import { TimeSeriesTooltip } from '../timeseries/TimeSeriesTooltip';
+import { isTooltipScrollable, prepareGraphableFields } from '../timeseries/utils';
 
 import { Options } from './panelcfg.gen';
 
@@ -29,7 +26,9 @@ export const TrendPanel = ({
   replaceVariables,
   id,
 }: PanelProps<Options>) => {
-  const { sync, dataLinkPostProcessor } = usePanelContext();
+  const showNewVizTooltips = Boolean(config.featureToggles.newVizTooltips);
+
+  const { dataLinkPostProcessor } = usePanelContext();
   // Need to fallback to first number field if no xField is set in options otherwise panel crashes 😬
   const trendXFieldName =
     options.xField ?? data.series[0].fields.find((field) => field.type === FieldType.number)?.name;
@@ -54,7 +53,7 @@ export const TrendPanel = ({
     let frames = data.series;
     let xFieldIdx: number | undefined;
     if (options.xField) {
-      xFieldIdx = findFieldIndex(frames[0], options.xField);
+      xFieldIdx = findFieldIndex(options.xField, frames[0]);
       if (xFieldIdx == null) {
         return {
           warning: 'Unable to find field: ' + options.xField,
@@ -110,31 +109,49 @@ export const TrendPanel = ({
       legend={options.legend}
       options={options}
       preparePlotFrame={preparePlotFrameTimeless}
+      replaceVariables={replaceVariables}
+      dataLinkPostProcessor={dataLinkPostProcessor}
     >
-      {(config, alignedDataFrame) => {
-        if (alignedDataFrame.fields.some((f) => Boolean(f.config.links?.length))) {
-          alignedDataFrame = regenerateLinksSupplier(
-            alignedDataFrame,
-            info.frames!,
-            replaceVariables,
-            timeZone,
-            dataLinkPostProcessor
-          );
-        }
-
+      {(uPlotConfig, alignedDataFrame) => {
         return (
           <>
-            <KeyboardPlugin config={config} />
-            {options.tooltip.mode === TooltipDisplayMode.None || (
-              <TooltipPlugin
-                frames={info.frames!}
-                data={alignedDataFrame}
-                config={config}
-                mode={options.tooltip.mode}
-                sortOrder={options.tooltip.sort}
-                sync={sync}
-                timeZone={timeZone}
-              />
+            <KeyboardPlugin config={uPlotConfig} />
+            {options.tooltip.mode !== TooltipDisplayMode.None && (
+              <>
+                {showNewVizTooltips ? (
+                  <TooltipPlugin2
+                    config={uPlotConfig}
+                    hoverMode={
+                      options.tooltip.mode === TooltipDisplayMode.Single ? TooltipHoverMode.xOne : TooltipHoverMode.xAll
+                    }
+                    render={(u, dataIdxs, seriesIdx, isPinned = false) => {
+                      return (
+                        <TimeSeriesTooltip
+                          frames={info.frames!}
+                          seriesFrame={alignedDataFrame}
+                          dataIdxs={dataIdxs}
+                          seriesIdx={seriesIdx}
+                          mode={options.tooltip.mode}
+                          sortOrder={options.tooltip.sort}
+                          isPinned={isPinned}
+                          scrollable={isTooltipScrollable(options.tooltip)}
+                        />
+                      );
+                    }}
+                    maxWidth={options.tooltip.maxWidth}
+                    maxHeight={options.tooltip.maxHeight}
+                  />
+                ) : (
+                  <TooltipPlugin
+                    frames={info.frames!}
+                    data={alignedDataFrame}
+                    config={uPlotConfig}
+                    mode={options.tooltip.mode}
+                    sortOrder={options.tooltip.sort}
+                    timeZone={timeZone}
+                  />
+                )}
+              </>
             )}
           </>
         );
diff --git a/public/app/plugins/panel/trend/module.tsx b/public/app/plugins/panel/trend/module.tsx
index 502840a9fe37b..24421f2ea6ee0 100644
--- a/public/app/plugins/panel/trend/module.tsx
+++ b/public/app/plugins/panel/trend/module.tsx
@@ -24,7 +24,7 @@ export const plugin = new PanelPlugin<Options, FieldConfig>(TrendPanel)
       },
     });
 
-    commonOptionsBuilder.addTooltipOptions(builder);
+    commonOptionsBuilder.addTooltipOptions(builder, false, true);
     commonOptionsBuilder.addLegendOptions(builder);
   })
   .setSuggestionsSupplier(new TrendSuggestionsSupplier());
diff --git a/public/app/plugins/panel/trend/panelcfg.gen.ts b/public/app/plugins/panel/trend/panelcfg.gen.ts
index af1edc3126d45..f72cfaceb7293 100644
--- a/public/app/plugins/panel/trend/panelcfg.gen.ts
+++ b/public/app/plugins/panel/trend/panelcfg.gen.ts
@@ -4,7 +4,7 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
diff --git a/public/app/plugins/panel/xychart/AutoEditor.tsx b/public/app/plugins/panel/xychart/AutoEditor.tsx
index f8eb9aad8ec3f..82a346fd3f07e 100644
--- a/public/app/plugins/panel/xychart/AutoEditor.tsx
+++ b/public/app/plugins/panel/xychart/AutoEditor.tsx
@@ -15,7 +15,7 @@ import { XYDimensionConfig, Options } from './panelcfg.gen';
 
 interface XYInfo {
   numberFields: Array<SelectableValue<string>>;
-  xAxis: SelectableValue<string>;
+  xAxis?: SelectableValue<string>;
   yFields: Array<SelectableValue<boolean>>;
 }
 
@@ -24,7 +24,7 @@ export const AutoEditor = ({ value, onChange, context }: StandardEditorProps<XYD
     if (context?.data?.length) {
       return context.data.map((f, idx) => ({
         value: idx,
-        label: getFrameDisplayName(f, idx),
+        label: `${getFrameDisplayName(f, idx)} (index: ${idx}, rows: ${f.length})`,
       }));
     }
     return [{ value: 0, label: 'First result' }];
@@ -33,23 +33,19 @@ export const AutoEditor = ({ value, onChange, context }: StandardEditorProps<XYD
   const dims = useMemo(() => getXYDimensions(value, context.data), [context.data, value]);
 
   const info = useMemo(() => {
-    const first = {
-      label: '?',
-      value: undefined, // empty
-    };
     const v: XYInfo = {
-      numberFields: [first],
+      numberFields: [],
       yFields: [],
       xAxis: value?.x
         ? {
             label: `${value.x} (Not found)`,
             value: value.x, // empty
           }
-        : first,
+        : undefined,
     };
     const frame = context.data ? context.data[value?.frame ?? 0] : undefined;
     if (frame) {
-      const xName = dims.x ? getFieldDisplayName(dims.x, dims.frame, context.data) : undefined;
+      const xName = 'x' in dims ? getFieldDisplayName(dims.x, dims.frame, context.data) : undefined;
       for (let field of frame.fields) {
         if (isGraphable(field)) {
           const name = getFieldDisplayName(field, frame, context.data);
@@ -58,9 +54,6 @@ export const AutoEditor = ({ value, onChange, context }: StandardEditorProps<XYD
             value: name,
           };
           v.numberFields.push(sel);
-          if (first.label === '?') {
-            first.label = `${name} (First)`;
-          }
           if (value?.x && name === value.x) {
             v.xAxis = sel;
           }
@@ -72,6 +65,9 @@ export const AutoEditor = ({ value, onChange, context }: StandardEditorProps<XYD
           }
         }
       }
+      if (!v.xAxis) {
+        v.xAxis = { label: xName, value: xName };
+      }
     }
 
     return v;
@@ -79,7 +75,7 @@ export const AutoEditor = ({ value, onChange, context }: StandardEditorProps<XYD
 
   const styles = useStyles2(getStyles);
 
-  if (!context.data) {
+  if (!context.data?.length) {
     return <div>No data...</div>;
   }
 
@@ -87,24 +83,29 @@ export const AutoEditor = ({ value, onChange, context }: StandardEditorProps<XYD
     <div>
       <Field label={'Data'}>
         <Select
+          isClearable={true}
           options={frameNames}
-          value={frameNames.find((v) => v.value === value?.frame) ?? frameNames[0]}
+          placeholder={'Change filter'}
+          value={frameNames.find((v) => v.value === value?.frame)}
           onChange={(v) => {
             onChange({
               ...value,
-              frame: v.value!,
+              frame: v?.value!,
+              x: undefined,
             });
           }}
         />
       </Field>
       <Field label={'X Field'}>
         <Select
+          isClearable={true}
           options={info.numberFields}
           value={info.xAxis}
+          placeholder={`${info.numberFields?.[0].label} (First numeric)`}
           onChange={(v) => {
             onChange({
               ...value,
-              x: v.value,
+              x: v?.value,
             });
           }}
         />
diff --git a/public/app/plugins/panel/xychart/ManualEditor.tsx b/public/app/plugins/panel/xychart/ManualEditor.tsx
index d4ec2b67fe45e..f86ff255393a0 100644
--- a/public/app/plugins/panel/xychart/ManualEditor.tsx
+++ b/public/app/plugins/panel/xychart/ManualEditor.tsx
@@ -1,23 +1,38 @@
 import { css, cx } from '@emotion/css';
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useMemo } from 'react';
 
-import { GrafanaTheme2, StandardEditorProps } from '@grafana/data';
-import { Button, Field, IconButton, useStyles2 } from '@grafana/ui';
-import { FieldNamePicker } from '@grafana/ui/src/components/MatchersUI/FieldNamePicker';
+import {
+  GrafanaTheme2,
+  StandardEditorProps,
+  FieldNamePickerBaseNameMode,
+  StandardEditorsRegistryItem,
+  getFrameDisplayName,
+} from '@grafana/data';
+import { Button, Field, IconButton, Select, useStyles2 } from '@grafana/ui';
 import { LayerName } from 'app/core/components/Layers/LayerName';
-import { ColorDimensionEditor, ScaleDimensionEditor } from 'app/features/dimensions/editors';
 
+import { ScatterSeriesEditor } from './ScatterSeriesEditor';
 import { Options, ScatterSeriesConfig, defaultFieldConfig } from './panelcfg.gen';
 
 export const ManualEditor = ({
   value,
   onChange,
   context,
-}: StandardEditorProps<ScatterSeriesConfig[], any, Options>) => {
+}: StandardEditorProps<ScatterSeriesConfig[], unknown, Options>) => {
+  const frameNames = useMemo(() => {
+    if (context?.data?.length) {
+      return context.data.map((frame, index) => ({
+        value: index,
+        label: `${getFrameDisplayName(frame, index)} (index: ${index}, rows: ${frame.length})`,
+      }));
+    }
+    return [{ value: 0, label: 'First result' }];
+  }, [context.data]);
+
   const [selected, setSelected] = useState(0);
   const style = useStyles2(getStyles);
 
-  const onFieldChange = (val: any | undefined, index: number, field: string) => {
+  const onFieldChange = (val: unknown | undefined, index: number, field: string) => {
     onChange(
       value.map((obj, i) => {
         if (i === index) {
@@ -32,7 +47,7 @@ export const ManualEditor = ({
     onChange([
       ...value,
       {
-        pointColor: {} as any,
+        pointColor: undefined,
         pointSize: defaultFieldConfig.pointSize,
       },
     ]);
@@ -98,40 +113,51 @@ export const ManualEditor = ({
 
       {selected >= 0 && value[selected] && (
         <>
-          <div key={`series/${selected}`}>
-            <Field label={'X Field'}>
-              <FieldNamePicker
-                value={value[selected].x ?? ''}
-                context={context}
-                onChange={(field) => onFieldChange(field, selected, 'x')}
-                item={{} as any}
-              />
-            </Field>
-            <Field label={'Y Field'}>
-              <FieldNamePicker
-                value={value[selected].y ?? ''}
-                context={context}
-                onChange={(field) => onFieldChange(field, selected, 'y')}
-                item={{} as any}
-              />
-            </Field>
-            <Field label={'Point color'}>
-              <ColorDimensionEditor
-                value={value[selected].pointColor!}
-                context={context}
-                onChange={(field) => onFieldChange(field, selected, 'pointColor')}
-                item={{} as any}
-              />
-            </Field>
-            <Field label={'Point size'}>
-              <ScaleDimensionEditor
-                value={value[selected].pointSize!}
-                context={context}
-                onChange={(field) => onFieldChange(field, selected, 'pointSize')}
-                item={{ settings: { min: 1, max: 100 } } as any}
+          {frameNames.length > 1 && (
+            <Field label={'Data'}>
+              <Select
+                isClearable={false}
+                options={frameNames}
+                placeholder={'Change filter'}
+                value={
+                  frameNames.find((v) => {
+                    return v.value === value[selected].frame;
+                  }) ?? 0
+                }
+                onChange={(val) => {
+                  onChange(
+                    value.map((obj, i) => {
+                      if (i === selected) {
+                        if (val === null) {
+                          return { ...value[i], frame: undefined };
+                        }
+                        return { ...value[i], frame: val?.value!, x: undefined, y: undefined };
+                      }
+                      return obj;
+                    })
+                  );
+                }}
               />
             </Field>
-          </div>
+          )}
+          <ScatterSeriesEditor
+            key={`series/${selected}`}
+            baseNameMode={FieldNamePickerBaseNameMode.ExcludeBaseNames}
+            item={{} as StandardEditorsRegistryItem}
+            context={context}
+            value={value[selected]}
+            onChange={(val) => {
+              onChange(
+                value.map((obj, i) => {
+                  if (i === selected) {
+                    return val!;
+                  }
+                  return obj;
+                })
+              );
+            }}
+            frameFilter={value[selected].frame ?? undefined}
+          />
         </>
       )}
     </>
@@ -139,35 +165,35 @@ export const ManualEditor = ({
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  marginBot: css`
-    margin-bottom: 20px;
-  `,
-  row: css`
-    padding: ${theme.spacing(0.5, 1)};
-    border-radius: ${theme.shape.radius.default};
-    background: ${theme.colors.background.secondary};
-    min-height: ${theme.spacing(4)};
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-bottom: 3px;
-    cursor: pointer;
-
-    border: 1px solid ${theme.components.input.borderColor};
-    &:hover {
-      border: 1px solid ${theme.components.input.borderHover};
-    }
-  `,
-  sel: css`
-    border: 1px solid ${theme.colors.primary.border};
-    &:hover {
-      border: 1px solid ${theme.colors.primary.border};
-    }
-  `,
-  actionIcon: css`
-    color: ${theme.colors.text.secondary};
-    &:hover {
-      color: ${theme.colors.text};
-    }
-  `,
+  marginBot: css({
+    marginBottom: '20px',
+  }),
+  row: css({
+    padding: `${theme.spacing(0.5, 1)}`,
+    borderRadius: `${theme.shape.radius.default}`,
+    background: `${theme.colors.background.secondary}`,
+    minHeight: `${theme.spacing(4)}`,
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    marginBottom: '3px',
+    cursor: 'pointer',
+
+    border: `1px solid ${theme.components.input.borderColor}`,
+    '&:hover': {
+      border: `1px solid ${theme.components.input.borderHover}`,
+    },
+  }),
+  sel: css({
+    border: `1px solid ${theme.colors.primary.border}`,
+    '&:hover': {
+      border: `1px solid ${theme.colors.primary.border}`,
+    },
+  }),
+  actionIcon: css({
+    color: `${theme.colors.text.secondary}`,
+    '&:hover': {
+      color: `${theme.colors.text}`,
+    },
+  }),
 });
diff --git a/public/app/plugins/panel/xychart/ScatterSeriesEditor.tsx b/public/app/plugins/panel/xychart/ScatterSeriesEditor.tsx
new file mode 100644
index 0000000000000..a100d91980783
--- /dev/null
+++ b/public/app/plugins/panel/xychart/ScatterSeriesEditor.tsx
@@ -0,0 +1,91 @@
+import React from 'react';
+
+import { StandardEditorProps, FieldNamePickerBaseNameMode } from '@grafana/data';
+import { Field } from '@grafana/ui';
+import { FieldNamePicker } from '@grafana/ui/src/components/MatchersUI/FieldNamePicker';
+import { ColorDimensionEditor, ScaleDimensionEditor } from 'app/features/dimensions/editors';
+
+import { Options, ScatterSeriesConfig } from './panelcfg.gen';
+
+export interface Props extends StandardEditorProps<ScatterSeriesConfig, unknown, Options> {
+  baseNameMode: FieldNamePickerBaseNameMode;
+  frameFilter?: number;
+}
+
+export const ScatterSeriesEditor = ({ value, onChange, context, baseNameMode, frameFilter = -1 }: Props) => {
+  const onFieldChange = (val: unknown | undefined, field: string) => {
+    onChange({ ...value, [field]: val });
+  };
+
+  const frame = context.data && frameFilter > -1 ? context.data[frameFilter] : undefined;
+
+  return (
+    <div>
+      <Field label={'X Field'}>
+        <FieldNamePicker
+          value={value.x ?? ''}
+          context={context}
+          onChange={(field) => onFieldChange(field, 'x')}
+          item={{
+            id: 'x',
+            name: 'x',
+            settings: {
+              filter: (field) =>
+                frame?.fields.some((obj) => obj.state?.displayName === field.state?.displayName) ?? true,
+              baseNameMode,
+              placeholderText: 'select X field',
+            },
+          }}
+        />
+      </Field>
+      <Field label={'Y Field'}>
+        <FieldNamePicker
+          value={value.y ?? ''}
+          context={context}
+          onChange={(field) => onFieldChange(field, 'y')}
+          item={{
+            id: 'y',
+            name: 'y',
+            settings: {
+              filter: (field) =>
+                frame?.fields.some((obj) => obj.state?.displayName === field.state?.displayName) ?? true,
+              baseNameMode,
+              placeholderText: 'select Y field',
+            },
+          }}
+        />
+      </Field>
+      <Field label={'Point color'}>
+        <ColorDimensionEditor
+          value={value.pointColor!}
+          context={context}
+          onChange={(field) => onFieldChange(field, 'pointColor')}
+          item={{
+            id: 'x',
+            name: 'x',
+            settings: {
+              baseNameMode,
+              isClearable: true,
+              placeholder: 'Use standard color scheme',
+            },
+          }}
+        />
+      </Field>
+      <Field label={'Point size'}>
+        <ScaleDimensionEditor
+          value={value.pointSize!}
+          context={context}
+          onChange={(field) => onFieldChange(field, 'pointSize')}
+          item={{
+            id: 'x',
+            name: 'x',
+            settings: {
+              min: 1,
+              max: 100,
+            },
+          }}
+        />
+      </Field>
+    </div>
+  );
+};
diff --git a/public/app/plugins/panel/xychart/TooltipView.tsx b/public/app/plugins/panel/xychart/TooltipView.tsx
index 5bfe57ff54cdf..2ea5c1e4de9ac 100644
--- a/public/app/plugins/panel/xychart/TooltipView.tsx
+++ b/public/app/plugins/panel/xychart/TooltipView.tsx
@@ -163,22 +163,22 @@ function fmt(field: Field, val: number): string {
 }
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  infoWrap: css`
-    padding: 8px;
-    width: 100%;
-    th {
-      font-weight: ${theme.typography.fontWeightMedium};
-      padding: ${theme.spacing(0.25, 2)};
-    }
-  `,
-  highlight: css`
-    background: ${theme.colors.action.hover};
-  `,
-  xVal: css`
-    font-weight: ${theme.typography.fontWeightBold};
-  `,
-  icon: css`
-    margin-right: ${theme.spacing(1)};
-    vertical-align: middle;
-  `,
+  infoWrap: css({
+    padding: '8px',
+    width: '100%',
+    th: {
+      fontWeight: theme.typography.fontWeightMedium,
+      padding: theme.spacing(0.25, 2),
+    },
+  }),
+  highlight: css({
+    background: theme.colors.action.hover,
+  }),
+  xVal: css({
+    fontWeight: theme.typography.fontWeightBold,
+  }),
+  icon: css({
+    marginRight: theme.spacing(1),
+    verticalAlign: 'middle',
+  }),
 });
diff --git a/public/app/plugins/panel/xychart/XYChartPanel.tsx b/public/app/plugins/panel/xychart/XYChartPanel.tsx
new file mode 100644
index 0000000000000..f42441155bed8
--- /dev/null
+++ b/public/app/plugins/panel/xychart/XYChartPanel.tsx
@@ -0,0 +1,292 @@
+import { css } from '@emotion/css';
+import React, { useState, useEffect, useCallback, useRef } from 'react';
+import { usePrevious } from 'react-use';
+
+import {
+  DisplayProcessor,
+  DisplayValue,
+  fieldReducers,
+  PanelProps,
+  reduceField,
+  ReducerID,
+  getDisplayProcessor,
+} from '@grafana/data';
+import { alpha } from '@grafana/data/src/themes/colorManipulator';
+import { config } from '@grafana/runtime';
+import {
+  Portal,
+  TooltipDisplayMode,
+  TooltipPlugin2,
+  UPlotChart,
+  UPlotConfigBuilder,
+  VizLayout,
+  VizLegend,
+  VizLegendItem,
+  VizTooltipContainer,
+} from '@grafana/ui';
+import { TooltipHoverMode } from '@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2';
+import { FacetedData } from '@grafana/ui/src/components/uPlot/types';
+import { CloseButton } from 'app/core/components/CloseButton/CloseButton';
+
+import { TooltipView } from './TooltipView';
+import { XYChartTooltip } from './XYChartTooltip';
+import { Options, SeriesMapping } from './panelcfg.gen';
+import { prepData, prepScatter, ScatterPanelInfo } from './scatter';
+import { ScatterHoverEvent, ScatterSeries } from './types';
+
+type Props = PanelProps<Options>;
+const TOOLTIP_OFFSET = 10;
+
+export const XYChartPanel = (props: Props) => {
+  const [error, setError] = useState<string | undefined>();
+  const [series, setSeries] = useState<ScatterSeries[]>([]);
+  const [builder, setBuilder] = useState<UPlotConfigBuilder | undefined>();
+  const [facets, setFacets] = useState<FacetedData | undefined>();
+  const [hover, setHover] = useState<ScatterHoverEvent | undefined>();
+  const [shouldDisplayCloseButton, setShouldDisplayCloseButton] = useState<boolean>(false);
+  const showNewVizTooltips = Boolean(config.featureToggles.newVizTooltips);
+
+  const isToolTipOpen = useRef<boolean>(false);
+  const oldOptions = usePrevious(props.options);
+  const oldData = usePrevious(props.data);
+
+  const onCloseToolTip = () => {
+    isToolTipOpen.current = false;
+    setShouldDisplayCloseButton(false);
+    scatterHoverCallback(undefined);
+  };
+
+  const onUPlotClick = () => {
+    isToolTipOpen.current = !isToolTipOpen.current;
+
+    // Linking into useState required to re-render tooltip
+    setShouldDisplayCloseButton(isToolTipOpen.current);
+  };
+
+  const scatterHoverCallback = (hover?: ScatterHoverEvent) => {
+    setHover(hover);
+  };
+
+  const initSeries = useCallback(() => {
+    const getData = () => props.data.series;
+    const info: ScatterPanelInfo = prepScatter(
+      props.options,
+      getData,
+      config.theme2,
+      showNewVizTooltips ? null : scatterHoverCallback,
+      showNewVizTooltips ? null : onUPlotClick,
+      showNewVizTooltips ? null : isToolTipOpen
+    );
+
+    if (info.error) {
+      setError(info.error);
+    } else if (info.series.length && props.data.series) {
+      setBuilder(info.builder);
+      setSeries(info.series);
+      setFacets(() => prepData(info, props.data.series));
+      setError(undefined);
+    }
+  }, [props.data.series, props.options, showNewVizTooltips]);
+
+  const initFacets = useCallback(() => {
+    setFacets(() => prepData({ error, series }, props.data.series));
+  }, [props.data.series, error, series]);
+
+  useEffect(() => {
+    if (oldOptions !== props.options || oldData?.structureRev !== props.data.structureRev) {
+      initSeries();
+    } else if (oldData?.series !== props.data.series) {
+      initFacets();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [props]);
+
+  const renderLegend = () => {
+    const items: VizLegendItem[] = [];
+    const defaultFormatter = (v: any) => (v == null ? '-' : v.toFixed(1));
+    const theme = config.theme2;
+
+    for (let si = 0; si < series.length; si++) {
+      const s = series[si];
+      const frame = s.frame(props.data.series);
+      if (frame) {
+        for (const item of s.legend()) {
+          item.getDisplayValues = () => {
+            const calcs = props.options.legend.calcs;
+
+            if (!calcs?.length) {
+              return [];
+            }
+
+            const field = s.y(frame);
+
+            const fmt = field.display ?? defaultFormatter;
+            let countFormatter: DisplayProcessor | null = null;
+
+            const fieldCalcs = reduceField({
+              field,
+              reducers: calcs,
+            });
+
+            return calcs.map<DisplayValue>((reducerId) => {
+              const fieldReducer = fieldReducers.get(reducerId);
+              let formatter = fmt;
+
+              if (fieldReducer.id === ReducerID.diffperc) {
+                formatter = getDisplayProcessor({
+                  field: {
+                    ...field,
+                    config: {
+                      ...field.config,
+                      unit: 'percent',
+                    },
+                  },
+                  theme,
+                });
+              }
+
+              if (
+                fieldReducer.id === ReducerID.count ||
+                fieldReducer.id === ReducerID.changeCount ||
+                fieldReducer.id === ReducerID.distinctCount
+              ) {
+                if (!countFormatter) {
+                  countFormatter = getDisplayProcessor({
+                    field: {
+                      ...field,
+                      config: {
+                        ...field.config,
+                        unit: 'none',
+                      },
+                    },
+                    theme,
+                  });
+                }
+                formatter = countFormatter;
+              }
+
+              return {
+                ...formatter(fieldCalcs[reducerId]),
+                title: fieldReducer.name,
+                description: fieldReducer.description,
+              };
+            });
+          };
+
+          item.disabled = !(s.show ?? true);
+
+          if (props.options.seriesMapping === SeriesMapping.Manual) {
+            item.label = props.options.series?.[si]?.name ?? `Series ${si + 1}`;
+          }
+
+          item.color = alpha(s.lineColor(frame) as string, 1);
+
+          items.push(item);
+        }
+      }
+    }
+
+    if (!props.options.legend.showLegend) {
+      return null;
+    }
+
+    const legendStyle = {
+      flexStart: css({
+        div: {
+          justifyContent: 'flex-start',
+        },
+      }),
+    };
+
+    return (
+      <VizLayout.Legend placement={props.options.legend.placement} width={props.options.legend.width}>
+        <VizLegend
+          className={legendStyle.flexStart}
+          placement={props.options.legend.placement}
+          items={items}
+          displayMode={props.options.legend.displayMode}
+        />
+      </VizLayout.Legend>
+    );
+  };
+
+  if (error || !builder || !facets) {
+    return (
+      <div className="panel-empty">
+        <p>{error}</p>
+      </div>
+    );
+  }
+
+  return (
+    <>
+      <VizLayout width={props.width} height={props.height} legend={renderLegend()}>
+        {(vizWidth: number, vizHeight: number) => (
+          <UPlotChart config={builder} data={facets} width={vizWidth} height={vizHeight}>
+            {showNewVizTooltips && props.options.tooltip.mode !== TooltipDisplayMode.None && (
+              <TooltipPlugin2
+                config={builder}
+                hoverMode={TooltipHoverMode.xyOne}
+                render={(u, dataIdxs, seriesIdx, isPinned, dismiss) => {
+                  return (
+                    <XYChartTooltip
+                      data={props.data.series}
+                      dataIdxs={dataIdxs}
+                      allSeries={series}
+                      dismiss={dismiss}
+                      isPinned={isPinned}
+                      options={props.options}
+                      seriesIdx={seriesIdx}
+                    />
+                  );
+                }}
+                maxWidth={props.options.tooltip.maxWidth}
+                maxHeight={props.options.tooltip.maxHeight}
+              />
+            )}
+          </UPlotChart>
+        )}
+      </VizLayout>
+      {!showNewVizTooltips && (
+        <Portal>
+          {hover && props.options.tooltip.mode !== TooltipDisplayMode.None && (
+            <VizTooltipContainer
+              position={{ x: hover.pageX, y: hover.pageY }}
+              offset={{ x: TOOLTIP_OFFSET, y: TOOLTIP_OFFSET }}
+              allowPointerEvents={isToolTipOpen.current}
+            >
+              {shouldDisplayCloseButton && (
+                <div
+                  style={{
+                    width: '100%',
+                    display: 'flex',
+                    justifyContent: 'flex-end',
+                  }}
+                >
+                  <CloseButton
+                    onClick={onCloseToolTip}
+                    style={{
+                      position: 'relative',
+                      top: 'auto',
+                      right: 'auto',
+                      marginRight: 0,
+                    }}
+                  />
+                </div>
+              )}
+              <TooltipView
+                options={props.options.tooltip}
+                allSeries={series}
+                manualSeriesConfigs={props.options.series}
+                seriesMapping={props.options.seriesMapping!}
+                rowIndex={hover.xIndex}
+                hoveredPointIndex={hover.scatterIndex}
+                data={props.data.series}
+              />
+            </VizTooltipContainer>
+          )}
+        </Portal>
+      )}
+    </>
+  );
+};
diff --git a/public/app/plugins/panel/xychart/XYChartPanel2.tsx b/public/app/plugins/panel/xychart/XYChartPanel2.tsx
deleted file mode 100644
index df9cf4b4ccca4..0000000000000
--- a/public/app/plugins/panel/xychart/XYChartPanel2.tsx
+++ /dev/null
@@ -1,261 +0,0 @@
-import { css } from '@emotion/css';
-import React, { useState, useEffect, useCallback, useRef } from 'react';
-import { usePrevious } from 'react-use';
-
-import {
-  DisplayProcessor,
-  DisplayValue,
-  fieldReducers,
-  PanelProps,
-  reduceField,
-  ReducerID,
-  getDisplayProcessor,
-} from '@grafana/data';
-import { config } from '@grafana/runtime';
-import {
-  Portal,
-  TooltipDisplayMode,
-  UPlotChart,
-  UPlotConfigBuilder,
-  VizLayout,
-  VizLegend,
-  VizLegendItem,
-  VizTooltipContainer,
-} from '@grafana/ui';
-import { FacetedData } from '@grafana/ui/src/components/uPlot/types';
-import { CloseButton } from 'app/core/components/CloseButton/CloseButton';
-
-import { TooltipView } from './TooltipView';
-import { Options, SeriesMapping } from './panelcfg.gen';
-import { prepData, prepScatter, ScatterPanelInfo } from './scatter';
-import { ScatterHoverEvent, ScatterSeries } from './types';
-
-type Props = PanelProps<Options>;
-const TOOLTIP_OFFSET = 10;
-
-export const XYChartPanel2 = (props: Props) => {
-  const [error, setError] = useState<string | undefined>();
-  const [series, setSeries] = useState<ScatterSeries[]>([]);
-  const [builder, setBuilder] = useState<UPlotConfigBuilder | undefined>();
-  const [facets, setFacets] = useState<FacetedData | undefined>();
-  const [hover, setHover] = useState<ScatterHoverEvent | undefined>();
-  const [shouldDisplayCloseButton, setShouldDisplayCloseButton] = useState<boolean>(false);
-
-  const isToolTipOpen = useRef<boolean>(false);
-  const oldOptions = usePrevious(props.options);
-  const oldData = usePrevious(props.data);
-
-  const onCloseToolTip = () => {
-    isToolTipOpen.current = false;
-    setShouldDisplayCloseButton(false);
-    scatterHoverCallback(undefined);
-  };
-
-  const onUPlotClick = () => {
-    isToolTipOpen.current = !isToolTipOpen.current;
-
-    // Linking into useState required to re-render tooltip
-    setShouldDisplayCloseButton(isToolTipOpen.current);
-  };
-
-  const scatterHoverCallback = (hover?: ScatterHoverEvent) => {
-    setHover(hover);
-  };
-
-  const initSeries = useCallback(() => {
-    const getData = () => props.data.series;
-    const info: ScatterPanelInfo = prepScatter(
-      props.options,
-      getData,
-      config.theme2,
-      scatterHoverCallback,
-      onUPlotClick,
-      isToolTipOpen
-    );
-
-    if (info.error) {
-      setError(info.error);
-    } else if (info.series.length && props.data.series) {
-      setBuilder(info.builder);
-      setSeries(info.series);
-      setFacets(() => prepData(info, props.data.series));
-      setError(undefined);
-    }
-  }, [props.data.series, props.options]);
-
-  const initFacets = useCallback(() => {
-    setFacets(() => prepData({ error, series }, props.data.series));
-  }, [props.data.series, error, series]);
-
-  useEffect(() => {
-    if (oldOptions !== props.options || oldData?.structureRev !== props.data.structureRev) {
-      initSeries();
-    } else if (oldData?.series !== props.data.series) {
-      initFacets();
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [props]);
-
-  const renderLegend = () => {
-    const items: VizLegendItem[] = [];
-    const defaultFormatter = (v: any) => (v == null ? '-' : v.toFixed(1));
-    const theme = config.theme2;
-
-    for (let si = 0; si < series.length; si++) {
-      const s = series[si];
-      const frame = s.frame(props.data.series);
-      if (frame) {
-        for (const item of s.legend()) {
-          item.getDisplayValues = () => {
-            const calcs = props.options.legend.calcs;
-
-            if (!calcs?.length) {
-              return [];
-            }
-
-            const field = s.y(frame);
-
-            const fmt = field.display ?? defaultFormatter;
-            let countFormatter: DisplayProcessor | null = null;
-
-            const fieldCalcs = reduceField({
-              field,
-              reducers: calcs,
-            });
-
-            return calcs.map<DisplayValue>((reducerId) => {
-              const fieldReducer = fieldReducers.get(reducerId);
-              let formatter = fmt;
-
-              if (fieldReducer.id === ReducerID.diffperc) {
-                formatter = getDisplayProcessor({
-                  field: {
-                    ...field,
-                    config: {
-                      ...field.config,
-                      unit: 'percent',
-                    },
-                  },
-                  theme,
-                });
-              }
-
-              if (
-                fieldReducer.id === ReducerID.count ||
-                fieldReducer.id === ReducerID.changeCount ||
-                fieldReducer.id === ReducerID.distinctCount
-              ) {
-                if (!countFormatter) {
-                  countFormatter = getDisplayProcessor({
-                    field: {
-                      ...field,
-                      config: {
-                        ...field.config,
-                        unit: 'none',
-                      },
-                    },
-                    theme,
-                  });
-                }
-                formatter = countFormatter;
-              }
-
-              return {
-                ...formatter(fieldCalcs[reducerId]),
-                title: fieldReducer.name,
-                description: fieldReducer.description,
-              };
-            });
-          };
-
-          item.disabled = !(s.show ?? true);
-
-          if (props.options.seriesMapping === SeriesMapping.Manual) {
-            item.label = props.options.series?.[si]?.name ?? `Series ${si + 1}`;
-          }
-
-          items.push(item);
-        }
-      }
-    }
-
-    if (!props.options.legend.showLegend) {
-      return null;
-    }
-
-    const legendStyle = {
-      flexStart: css`
-        div {
-          justify-content: flex-start !important;
-        }
-      `,
-    };
-
-    return (
-      <VizLayout.Legend placement={props.options.legend.placement} width={props.options.legend.width}>
-        <VizLegend
-          className={legendStyle.flexStart}
-          placement={props.options.legend.placement}
-          items={items}
-          displayMode={props.options.legend.displayMode}
-        />
-      </VizLayout.Legend>
-    );
-  };
-
-  if (error || !builder || !facets) {
-    return (
-      <div className="panel-empty">
-        <p>{error}</p>
-      </div>
-    );
-  }
-
-  return (
-    <>
-      <VizLayout width={props.width} height={props.height} legend={renderLegend()}>
-        {(vizWidth: number, vizHeight: number) => (
-          <UPlotChart config={builder} data={facets} width={vizWidth} height={vizHeight} />
-        )}
-      </VizLayout>
-      <Portal>
-        {hover && props.options.tooltip.mode !== TooltipDisplayMode.None && (
-          <VizTooltipContainer
-            position={{ x: hover.pageX, y: hover.pageY }}
-            offset={{ x: TOOLTIP_OFFSET, y: TOOLTIP_OFFSET }}
-            allowPointerEvents={isToolTipOpen.current}
-          >
-            {shouldDisplayCloseButton && (
-              <div
-                style={{
-                  width: '100%',
-                  display: 'flex',
-                  justifyContent: 'flex-end',
-                }}
-              >
-                <CloseButton
-                  onClick={onCloseToolTip}
-                  style={{
-                    position: 'relative',
-                    top: 'auto',
-                    right: 'auto',
-                    marginRight: 0,
-                  }}
-                />
-              </div>
-            )}
-            <TooltipView
-              options={props.options.tooltip}
-              allSeries={series}
-              manualSeriesConfigs={props.options.series}
-              seriesMapping={props.options.seriesMapping!}
-              rowIndex={hover.xIndex}
-              hoveredPointIndex={hover.scatterIndex}
-              data={props.data.series}
-            />
-          </VizTooltipContainer>
-        )}
-      </Portal>
-    </>
-  );
-};
diff --git a/public/app/plugins/panel/xychart/XYChartTooltip.test.tsx b/public/app/plugins/panel/xychart/XYChartTooltip.test.tsx
new file mode 100644
index 0000000000000..b899962059719
--- /dev/null
+++ b/public/app/plugins/panel/xychart/XYChartTooltip.test.tsx
@@ -0,0 +1,180 @@
+import { render } from '@testing-library/react';
+import React from 'react';
+
+import { DataFrame, FieldType, ValueLinkConfig, LinkTarget } from '@grafana/data';
+import { SortOrder, VisibilityMode } from '@grafana/schema';
+import { LegendDisplayMode, TooltipDisplayMode } from '@grafana/ui';
+
+import { XYChartTooltip, Props } from './XYChartTooltip';
+import { ScatterSeries } from './types';
+
+describe('XYChartTooltip', () => {
+  it('should render null when `allSeries` is empty', () => {
+    const { container } = render(<XYChartTooltip {...getProps()} />);
+
+    expect(container.firstChild).toBeNull();
+  });
+
+  it('should render null when `dataIdxs` is null', () => {
+    const { container } = render(<XYChartTooltip {...getProps({ dataIdxs: [null] })} />);
+
+    expect(container.firstChild).toBeNull();
+  });
+
+  it('should render the tooltip header label with series name', () => {
+    const seriesName = 'seriesName_1';
+    const { getByText } = render(
+      <XYChartTooltip
+        {...getProps({ allSeries: buildAllSeries(seriesName), data: buildData(), dataIdxs: [1], seriesIdx: 1 })}
+      />
+    );
+
+    expect(getByText(seriesName)).toBeInTheDocument();
+  });
+
+  it('should render the tooltip content with x and y field names and values', () => {
+    const field1Name = 'test_field_1';
+    const field2Name = 'test_field_2';
+    const { getByText } = render(
+      <XYChartTooltip
+        {...getProps({
+          allSeries: buildAllSeries(),
+          data: buildData({ field1Name, field2Name }),
+          dataIdxs: [1],
+          seriesIdx: 1,
+        })}
+      />
+    );
+
+    expect(getByText(field1Name)).toBeInTheDocument();
+    expect(getByText('32.799')).toBeInTheDocument();
+    expect(getByText(field2Name)).toBeInTheDocument();
+    expect(getByText(300)).toBeInTheDocument();
+  });
+
+  it('should render the tooltip footer with data links', () => {
+    const dataLinkTitle = 'Google';
+    const { getByText } = render(
+      <XYChartTooltip
+        {...getProps({
+          allSeries: buildAllSeries(),
+          data: buildData({ dataLinkTitle }),
+          dataIdxs: [1],
+          seriesIdx: 1,
+          isPinned: true,
+        })}
+      />
+    );
+
+    expect(getByText(dataLinkTitle)).toBeInTheDocument();
+  });
+});
+
+function getProps(additionalProps: Partial<Props> | null = null): Props {
+  if (!additionalProps) {
+    return getDefaultProps();
+  }
+
+  return { ...getDefaultProps(), ...additionalProps };
+}
+
+function getDefaultProps(): Props {
+  return {
+    data: [],
+    allSeries: [],
+    dataIdxs: [],
+    seriesIdx: null,
+    isPinned: false,
+    dismiss: jest.fn(),
+    options: {
+      dims: {
+        frame: 0,
+      },
+      series: [],
+      legend: {
+        calcs: [],
+        displayMode: LegendDisplayMode.List,
+        placement: 'bottom',
+        showLegend: true,
+      },
+      tooltip: {
+        mode: TooltipDisplayMode.Single,
+        sort: SortOrder.Ascending,
+      },
+    },
+  };
+}
+
+function buildAllSeries(testSeriesName = 'test'): ScatterSeries[] {
+  return [
+    {
+      name: testSeriesName,
+      legend: jest.fn(),
+      frame: (frames: DataFrame[]) => frames[0],
+      x: (frame: DataFrame) => frame.fields[0],
+      y: (frame: DataFrame) => frame.fields[1],
+      pointColor: (_frame: DataFrame) => '#111',
+      showLine: false,
+      lineWidth: 1,
+      lineStyle: {},
+      lineColor: jest.fn(),
+      showPoints: VisibilityMode.Always,
+      pointSize: jest.fn(),
+      pointSymbol: jest.fn(),
+      label: VisibilityMode.Always,
+      labelValue: jest.fn(),
+      show: true,
+      hints: {
+        pointSize: { fixed: 10, max: 10, min: 1 },
+        pointColor: {
+          mode: {
+            id: 'threshold',
+            name: 'Threshold',
+            getCalculator: jest.fn(),
+          },
+        },
+      },
+    },
+  ];
+}
+
+function buildData({ dataLinkTitle = 'Grafana', field1Name = 'field_1', field2Name = 'field_2' } = {}): DataFrame[] {
+  return [
+    {
+      fields: [
+        {
+          name: field1Name,
+          type: FieldType.number,
+          config: {},
+          values: [
+            61.385, 32.799, 33.7712, 36.17, 39.0646, 27.8333, 42.0046, 40.3363, 39.8647, 37.669, 42.2373, 43.3504,
+            35.6411, 40.314, 34.8375, 40.3736, 44.5672,
+          ],
+        },
+        {
+          name: field2Name,
+          type: FieldType.number,
+          config: {
+            links: [
+              {
+                title: dataLinkTitle,
+                targetBlank: true,
+                url: 'http://www.someWebsite.com',
+              },
+            ],
+          },
+          values: [500, 300, 150, 250, 600, 500, 700, 400, 540, 630, 460, 250, 500, 400, 800, 930, 360],
+          getLinks: (_config: ValueLinkConfig) => [
+            {
+              href: 'http://www.someWebsite.com',
+              title: dataLinkTitle,
+              target: '_blank' as LinkTarget,
+              origin: { name: '', type: FieldType.boolean, config: {}, values: [] },
+            },
+          ],
+        },
+      ],
+      length: 17,
+    },
+  ];
+}
diff --git a/public/app/plugins/panel/xychart/XYChartTooltip.tsx b/public/app/plugins/panel/xychart/XYChartTooltip.tsx
new file mode 100644
index 0000000000000..9012ccca99cf9
--- /dev/null
+++ b/public/app/plugins/panel/xychart/XYChartTooltip.tsx
@@ -0,0 +1,101 @@
+import React, { ReactNode } from 'react';
+
+import { DataFrame, Field, getFieldDisplayName } from '@grafana/data';
+import { alpha } from '@grafana/data/src/themes/colorManipulator';
+import { useStyles2 } from '@grafana/ui';
+import { VizTooltipContent } from '@grafana/ui/src/components/VizTooltip/VizTooltipContent';
+import { VizTooltipFooter } from '@grafana/ui/src/components/VizTooltip/VizTooltipFooter';
+import { VizTooltipHeader } from '@grafana/ui/src/components/VizTooltip/VizTooltipHeader';
+import { ColorIndicator, VizTooltipItem } from '@grafana/ui/src/components/VizTooltip/types';
+
+import { getDataLinks } from '../status-history/utils';
+import { getStyles } from '../timeseries/TimeSeriesTooltip';
+
+import { Options } from './panelcfg.gen';
+import { ScatterSeries } from './types';
+import { fmt } from './utils';
+
+export interface Props {
+  dataIdxs: Array<number | null>;
+  seriesIdx: number | null | undefined;
+  isPinned: boolean;
+  dismiss: () => void;
+  options: Options;
+  data: DataFrame[]; // source data
+  allSeries: ScatterSeries[];
+}
+
+export const XYChartTooltip = ({ dataIdxs, seriesIdx, data, allSeries, dismiss, options, isPinned }: Props) => {
+  const styles = useStyles2(getStyles);
+
+  const rowIndex = dataIdxs.find((idx) => idx !== null);
+  // @todo: remove -1 when uPlot v2 arrive
+  // context: first value in dataIdxs always null and represent X series
+  const hoveredPointIndex = seriesIdx! - 1;
+
+  if (!allSeries || rowIndex == null) {
+    return null;
+  }
+
+  const series = allSeries[hoveredPointIndex];
+  const frame = series.frame(data);
+  const xField = series.x(frame);
+  const yField = series.y(frame);
+
+  let label = series.name;
+  if (options.seriesMapping === 'manual') {
+    label = options.series?.[hoveredPointIndex]?.name ?? `Series ${hoveredPointIndex + 1}`;
+  }
+
+  let colorThing = series.pointColor(frame);
+
+  if (Array.isArray(colorThing)) {
+    colorThing = colorThing[rowIndex];
+  }
+
+  const headerItem: VizTooltipItem = {
+    label,
+    value: '',
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    color: alpha(colorThing as string, 0.5),
+    colorIndicator: ColorIndicator.marker_md,
+  };
+
+  const contentItems: VizTooltipItem[] = [
+    {
+      label: getFieldDisplayName(xField, frame),
+      value: fmt(xField, xField.values[rowIndex]),
+    },
+    {
+      label: getFieldDisplayName(yField, frame),
+      value: fmt(yField, yField.values[rowIndex]),
+    },
+  ];
+
+  // add extra fields
+  const extraFields: Field[] = frame.fields.filter((f) => f !== xField && f !== yField);
+  if (extraFields) {
+    extraFields.forEach((field) => {
+      contentItems.push({
+        label: field.name,
+        value: fmt(field, field.values[rowIndex]),
+      });
+    });
+  }
+
+  let footer: ReactNode;
+
+  if (isPinned && seriesIdx != null) {
+    const links = getDataLinks(yField, rowIndex);
+
+    footer = <VizTooltipFooter dataLinks={links} />;
+  }
+
+  return (
+    <div className={styles.wrapper}>
+      <VizTooltipHeader item={headerItem} isPinned={isPinned} />
+      <VizTooltipContent items={contentItems} isPinned={isPinned} />
+      {footer}
+    </div>
+  );
+};
diff --git a/public/app/plugins/panel/xychart/dims.ts b/public/app/plugins/panel/xychart/dims.ts
index 30320448330d6..c6d93854d4918 100644
--- a/public/app/plugins/panel/xychart/dims.ts
+++ b/public/app/plugins/panel/xychart/dims.ts
@@ -1,5 +1,5 @@
 import { DataFrame, Field, FieldMatcher, FieldType, getFieldDisplayName } from '@grafana/data';
-import { XYFieldMatchers } from '@grafana/ui/src/components/GraphNG/types';
+import { XYFieldMatchers } from 'app/core/components/GraphNG/types';
 
 import { XYDimensionConfig } from './panelcfg.gen';
 
@@ -15,18 +15,21 @@ export interface XYDimensions {
   frame: DataFrame; // matches order from configs, excluds non-graphable values
   x: Field;
   fields: XYFieldMatchers;
-  error?: DimensionError;
   hasData?: boolean;
   hasTime?: boolean;
 }
 
+export interface XYDimensionsError {
+  error: DimensionError;
+}
+
 export function isGraphable(field: Field) {
   return field.type === FieldType.number;
 }
 
-export function getXYDimensions(cfg?: XYDimensionConfig, data?: DataFrame[]): XYDimensions {
+export function getXYDimensions(cfg?: XYDimensionConfig, data?: DataFrame[]): XYDimensions | XYDimensionsError {
   if (!data || !data.length) {
-    return { error: DimensionError.NoData } as XYDimensions;
+    return { error: DimensionError.NoData };
   }
   if (!cfg) {
     cfg = {
@@ -36,7 +39,7 @@ export function getXYDimensions(cfg?: XYDimensionConfig, data?: DataFrame[]): XY
 
   let frame = data[cfg.frame ?? 0];
   if (!frame) {
-    return { error: DimensionError.BadFrameSelection } as XYDimensions;
+    return { error: DimensionError.BadFrameSelection };
   }
 
   let xIndex = -1;
@@ -99,5 +102,5 @@ function getSimpleFieldNotMatcher(f: Field): FieldMatcher {
     return () => false;
   }
   const m = getSimpleFieldMatcher(f);
-  return (field) => !m(field, undefined as any, undefined as any);
+  return (field) => !m(field, { fields: [], length: 0 }, []);
 }
diff --git a/public/app/plugins/panel/xychart/module.tsx b/public/app/plugins/panel/xychart/module.tsx
index 6fbafbe8aa06c..930755e40aa45 100644
--- a/public/app/plugins/panel/xychart/module.tsx
+++ b/public/app/plugins/panel/xychart/module.tsx
@@ -3,11 +3,11 @@ import { commonOptionsBuilder } from '@grafana/ui';
 
 import { AutoEditor } from './AutoEditor';
 import { ManualEditor } from './ManualEditor';
-import { XYChartPanel2 } from './XYChartPanel2';
+import { XYChartPanel } from './XYChartPanel';
 import { getScatterFieldConfig } from './config';
 import { Options, FieldConfig, defaultFieldConfig } from './panelcfg.gen';
 
-export const plugin = new PanelPlugin<Options, FieldConfig>(XYChartPanel2)
+export const plugin = new PanelPlugin<Options, FieldConfig>(XYChartPanel)
   .useFieldConfig(getScatterFieldConfig(defaultFieldConfig))
   .setPanelOptions((builder) => {
     builder
@@ -17,8 +17,8 @@ export const plugin = new PanelPlugin<Options, FieldConfig>(XYChartPanel2)
         defaultValue: 'auto',
         settings: {
           options: [
-            { value: 'auto', label: 'Auto', description: 'No changes to saved model since 8.0' },
-            { value: 'manual', label: 'Manual' },
+            { value: 'auto', label: 'Table', description: 'Plot values within a single table result' },
+            { value: 'manual', label: 'Manual', description: 'Construct values from any result' },
           ],
         },
       })
@@ -38,6 +38,6 @@ export const plugin = new PanelPlugin<Options, FieldConfig>(XYChartPanel2)
         showIf: (cfg) => cfg.seriesMapping === 'manual',
       });
 
-    commonOptionsBuilder.addTooltipOptions(builder);
+    commonOptionsBuilder.addTooltipOptions(builder, true);
     commonOptionsBuilder.addLegendOptions(builder);
   });
diff --git a/public/app/plugins/panel/xychart/panelcfg.cue b/public/app/plugins/panel/xychart/panelcfg.cue
index 6e260de16b89d..6e7012c24020a 100644
--- a/public/app/plugins/panel/xychart/panelcfg.cue
+++ b/public/app/plugins/panel/xychart/panelcfg.cue
@@ -25,10 +25,11 @@ composableKinds: PanelCfg: {
 		schemas: [{
 			version: [0, 0]
 			schema: {
-
+				// Auto is "table" in the UI
 				SeriesMapping: "auto" | "manual"                   @cuetsy(kind="enum")
 				ScatterShow:   "points" | "lines" | "points+lines" @cuetsy(kind="enum", memberNames="Points|Lines|PointsAndLines")
 
+				// Configuration for the Table/Auto mode
 				XYDimensionConfig: {
 					frame: int32 & >=0
 					x?:    string
@@ -56,9 +57,10 @@ composableKinds: PanelCfg: {
 
 				ScatterSeriesConfig: {
 					FieldConfig
-					x?:    string
-					y?:    string
-					name?: string
+					x?:     string
+					y?:     string
+					name?:  string
+					frame?: number
 				} @cuetsy(kind="interface")
 
 				Options: {
@@ -66,7 +68,11 @@ composableKinds: PanelCfg: {
 					common.OptionsWithTooltip
 
 					seriesMapping?: SeriesMapping
-					dims:           XYDimensionConfig
+
+					// Table Mode (auto)
+					dims: XYDimensionConfig
+
+					// Manual Mode
 					series: [...ScatterSeriesConfig]
 				} @cuetsy(kind="interface")
 			}
diff --git a/public/app/plugins/panel/xychart/panelcfg.gen.ts b/public/app/plugins/panel/xychart/panelcfg.gen.ts
index 7a835a614a297..09f7869c536d8 100644
--- a/public/app/plugins/panel/xychart/panelcfg.gen.ts
+++ b/public/app/plugins/panel/xychart/panelcfg.gen.ts
@@ -4,12 +4,15 @@
 //     public/app/plugins/gen.go
 // Using jennies:
 //     TSTypesJenny
-//     PluginTSTypesJenny
+//     PluginTsTypesJenny
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
 import * as common from '@grafana/schema';
 
+/**
+ * Auto is "table" in the UI
+ */
 export enum SeriesMapping {
   Auto = 'auto',
   Manual = 'manual',
@@ -21,6 +24,9 @@ export enum ScatterShow {
   PointsAndLines = 'points+lines',
 }
 
+/**
+ * Configuration for the Table/Auto mode
+ */
 export interface XYDimensionConfig {
   exclude?: Array<string>;
   frame: number;
@@ -48,13 +54,20 @@ export const defaultFieldConfig: Partial<FieldConfig> = {
 };
 
 export interface ScatterSeriesConfig extends FieldConfig {
+  frame?: number;
   name?: string;
   x?: string;
   y?: string;
 }
 
 export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip {
+  /**
+   * Table Mode (auto)
+   */
   dims: XYDimensionConfig;
+  /**
+   * Manual Mode
+   */
   series: Array<ScatterSeriesConfig>;
   seriesMapping?: SeriesMapping;
 }
diff --git a/public/app/plugins/panel/xychart/plugin.json b/public/app/plugins/panel/xychart/plugin.json
index ed72646bf35cc..13721d65fb057 100644
--- a/public/app/plugins/panel/xychart/plugin.json
+++ b/public/app/plugins/panel/xychart/plugin.json
@@ -5,6 +5,8 @@
   "state": "beta",
 
   "info": {
+    "description": "Supports arbitrary X vs Y in a graph to visualize the relationship between two variables.",
+    "keywords": ["scatter", "plot"],
     "author": {
       "name": "Grafana Labs",
       "url": "https://grafana.com"
diff --git a/public/app/plugins/panel/xychart/scatter.ts b/public/app/plugins/panel/xychart/scatter.ts
index f112be980e8b0..e4bd194670700 100644
--- a/public/app/plugins/panel/xychart/scatter.ts
+++ b/public/app/plugins/panel/xychart/scatter.ts
@@ -46,9 +46,9 @@ export function prepScatter(
   options: Options,
   getData: () => DataFrame[],
   theme: GrafanaTheme2,
-  ttip: ScatterHoverCallback,
+  ttip: null | ScatterHoverCallback,
   onUPlotClick: null | ((evt?: Object) => void),
-  isToolTipOpen: MutableRefObject<boolean>
+  isToolTipOpen: null | MutableRefObject<boolean>
 ): ScatterPanelInfo {
   let series: ScatterSeries[];
   let builder: UPlotConfigBuilder;
@@ -224,12 +224,16 @@ function prepSeries(options: Options, frames: DataFrame[]): ScatterSeries[] {
       }
 
       for (let frameIndex = 0; frameIndex < frames.length; frameIndex++) {
+        // When a frame filter is applied, only include matching frame index
+        if (series.frame !== undefined && series.frame !== frameIndex) {
+          continue;
+        }
         const frame = frames[frameIndex];
-        const xIndex = findFieldIndex(frame, series.x);
+        const xIndex = findFieldIndex(series.x, frame, frames);
 
         if (xIndex != null) {
           // TODO: this should find multiple y fields
-          const yIndex = findFieldIndex(frame, series.y);
+          const yIndex = findFieldIndex(series.y, frame, frames);
 
           if (yIndex == null) {
             throw 'Y must be in the same frame as X';
@@ -237,9 +241,9 @@ function prepSeries(options: Options, frames: DataFrame[]): ScatterSeries[] {
 
           const dims: Dims = {
             pointColorFixed: series.pointColor?.fixed,
-            pointColorIndex: findFieldIndex(frame, series.pointColor?.field),
+            pointColorIndex: findFieldIndex(series.pointColor?.field, frame, frames),
             pointSizeConfig: series.pointSize,
-            pointSizeIndex: findFieldIndex(frame, series.pointSize?.field),
+            pointSizeIndex: findFieldIndex(series.pointSize?.field, frame, frames),
           };
           scatterSeries.push(getScatterSeries(seriesIndex++, frames, frameIndex, xIndex, yIndex, dims));
         }
@@ -255,7 +259,7 @@ function prepSeries(options: Options, frames: DataFrame[]): ScatterSeries[] {
   const frame = frames[frameIndex];
   const numericIndices: number[] = [];
 
-  let xIndex = findFieldIndex(frame, dims.x);
+  let xIndex = findFieldIndex(dims.x, frame, frames);
   for (let i = 0; i < frame.fields.length; i++) {
     if (isGraphable(frame.fields[i])) {
       if (xIndex == null || i === xIndex) {
@@ -294,14 +298,13 @@ interface DrawBubblesOpts {
   };
 }
 
-//const prepConfig: UPlotConfigPrepFnXY<Options> = ({ frames, series, theme }) => {
 const prepConfig = (
   getData: () => DataFrame[],
   scatterSeries: ScatterSeries[],
   theme: GrafanaTheme2,
-  ttip: ScatterHoverCallback,
+  ttip: null | ScatterHoverCallback,
   onUPlotClick: null | ((evt?: Object) => void),
-  isToolTipOpen: MutableRefObject<boolean>
+  isToolTipOpen: null | MutableRefObject<boolean>
 ) => {
   let qt: Quadtree;
   let hRect: Rect | null;
@@ -393,6 +396,9 @@ const prepConfig = (
               }
 
               if (showPoints) {
+                // if pointHints.fixed? don't recalc size
+                // if pointColor has 0 opacity, draw as single path (assuming all strokes are alpha 1)
+
                 u.ctx.moveTo(cx + size / 2, cy);
                 u.ctx.beginPath();
                 u.ctx.arc(cx, cy, size / 2, 0, deg360);
@@ -519,8 +525,10 @@ const prepConfig = (
   });
 
   const clearPopupIfOpened = () => {
-    if (isToolTipOpen.current) {
-      ttip(undefined);
+    if (isToolTipOpen?.current) {
+      if (ttip) {
+        ttip(undefined);
+      }
       if (onUPlotClick) {
         onUPlotClick();
       }
@@ -531,7 +539,11 @@ const prepConfig = (
 
   // clip hover points/bubbles to plotting area
   builder.addHook('init', (u, r) => {
-    u.over.style.overflow = 'hidden';
+    const showNewVizTooltips = Boolean(config.featureToggles.newVizTooltips);
+
+    if (!showNewVizTooltips) {
+      u.over.style.overflow = 'hidden';
+    }
     ref_parent = u.root.parentElement;
 
     if (onUPlotClick) {
@@ -553,26 +565,28 @@ const prepConfig = (
     rect = r;
   });
 
-  builder.addHook('setLegend', (u) => {
-    if (u.cursor.idxs != null) {
-      for (let i = 0; i < u.cursor.idxs.length; i++) {
-        const sel = u.cursor.idxs[i];
-        if (sel != null && !isToolTipOpen.current) {
-          ttip({
-            scatterIndex: i - 1,
-            xIndex: sel,
-            pageX: rect.left + u.cursor.left!,
-            pageY: rect.top + u.cursor.top!,
-          });
-          return; // only show the first one
+  if (ttip) {
+    builder.addHook('setLegend', (u) => {
+      if (u.cursor.idxs != null) {
+        for (let i = 0; i < u.cursor.idxs.length; i++) {
+          const sel = u.cursor.idxs[i];
+          if (sel != null && !isToolTipOpen?.current) {
+            ttip({
+              scatterIndex: i - 1,
+              xIndex: sel,
+              pageX: rect.left + u.cursor.left!,
+              pageY: rect.top + u.cursor.top!,
+            });
+            return; // only show the first one
+          }
         }
       }
-    }
 
-    if (!isToolTipOpen.current) {
-      ttip(undefined);
-    }
-  });
+      if (!isToolTipOpen?.current) {
+        ttip(undefined);
+      }
+    });
+  }
 
   builder.addHook('drawClear', (u) => {
     clearPopupIfOpened();
@@ -595,8 +609,8 @@ const prepConfig = (
   const frames = getData();
   let xField = scatterSeries[0].x(scatterSeries[0].frame(frames));
 
-  let config = xField.config;
-  let customConfig = config.custom;
+  let fieldConfig = xField.config;
+  let customConfig = fieldConfig.custom;
   let scaleDistr = customConfig?.scaleDistribution;
 
   builder.addScale({
@@ -607,12 +621,12 @@ const prepConfig = (
     distribution: scaleDistr?.type,
     log: scaleDistr?.log,
     linearThreshold: scaleDistr?.linearThreshold,
-    min: config.min,
-    max: config.max,
+    min: fieldConfig.min,
+    max: fieldConfig.max,
     softMin: customConfig?.axisSoftMin,
     softMax: customConfig?.axisSoftMax,
     centeredZero: customConfig?.axisCenteredZero,
-    decimals: config.decimals,
+    decimals: fieldConfig.decimals,
   });
 
   // why does this fall back to '' instead of null or undef?
@@ -693,7 +707,7 @@ const prepConfig = (
       pathBuilder: drawBubbles, // drawBubbles({disp: {size: {values: () => }}})
       theme,
       scaleKey: '', // facets' scales used (above)
-      lineColor: lineColor as string,
+      lineColor: alpha('' + lineColor, 1),
       fillColor: alpha(pointColor, 0.5),
       show: !customConfig.hideFrom?.viz,
     });
diff --git a/public/app/plugins/panel/xychart/types.ts b/public/app/plugins/panel/xychart/types.ts
index bd44ef4b27ef3..fa329c1ee490a 100644
--- a/public/app/plugins/panel/xychart/types.ts
+++ b/public/app/plugins/panel/xychart/types.ts
@@ -50,3 +50,14 @@ export interface ScatterSeries {
     };
   };
 }
+
+export interface ExtraFacets {
+  colorFacetFieldName: string;
+  sizeFacetFieldName: string;
+  colorFacetValue: number;
+  sizeFacetValue: number;
+}
+
+export interface DataFilterBySeries {
+  frame: number;
+}
diff --git a/public/app/plugins/panel/xychart/utils.ts b/public/app/plugins/panel/xychart/utils.ts
new file mode 100644
index 0000000000000..512a46d3d7aa8
--- /dev/null
+++ b/public/app/plugins/panel/xychart/utils.ts
@@ -0,0 +1,9 @@
+import { Field, formattedValueToString } from '@grafana/data';
+
+export function fmt(field: Field, val: number): string {
+  if (field.display) {
+    return formattedValueToString(field.display(val));
+  }
+
+  return `${val}`;
+}
diff --git a/public/app/plugins/panel/xychart/v2/README.md b/public/app/plugins/panel/xychart/v2/README.md
new file mode 100644
index 0000000000000..bfe0168a3291c
--- /dev/null
+++ b/public/app/plugins/panel/xychart/v2/README.md
@@ -0,0 +1,3 @@
+# XY Chart - Native Plugin
+
+Support arbitrary X vs Y in graph
diff --git a/public/app/plugins/panel/xychart/v2/SeriesEditor.tsx b/public/app/plugins/panel/xychart/v2/SeriesEditor.tsx
new file mode 100644
index 0000000000000..74f7ae224944e
--- /dev/null
+++ b/public/app/plugins/panel/xychart/v2/SeriesEditor.tsx
@@ -0,0 +1,329 @@
+import { css, cx } from '@emotion/css';
+import React, { Fragment, useState } from 'react';
+import { usePrevious } from 'react-use';
+
+import {
+  getFrameDisplayName,
+  StandardEditorProps,
+  // getFieldDisplayName,
+  FrameMatcherID,
+  FieldMatcherID,
+  FieldNamePickerBaseNameMode,
+  FieldType,
+  GrafanaTheme2,
+} from '@grafana/data';
+import { Button, Field, IconButton, Select, useStyles2 } from '@grafana/ui';
+import { FieldNamePicker } from '@grafana/ui/src/components/MatchersUI/FieldNamePicker';
+import { LayerName } from 'app/core/components/Layers/LayerName';
+
+import { Options, SeriesMapping, XYSeriesConfig } from './panelcfg.gen';
+
+export const SeriesEditor = ({
+  value: seriesCfg,
+  onChange,
+  context,
+}: StandardEditorProps<XYSeriesConfig[], unknown, Options>) => {
+  const style = useStyles2(getStyles);
+
+  // reset opts when mapping changes (no way to do this in panel opts builder?)
+  const mapping = context.options?.mapping as SeriesMapping;
+  const prevMapping = usePrevious(mapping);
+  const mappingChanged = prevMapping != null && mapping !== prevMapping;
+
+  const defaultFrame = { frame: { matcher: { id: FrameMatcherID.byIndex, options: 0 } } };
+
+  if (mappingChanged || seriesCfg == null) {
+    seriesCfg = [{ ...defaultFrame }];
+    onChange([...seriesCfg]);
+  }
+
+  const [selectedIdx, setSelectedIdx] = useState(0);
+
+  const addSeries = () => {
+    seriesCfg = seriesCfg.concat({ ...defaultFrame });
+    setSelectedIdx(seriesCfg.length - 1);
+    onChange([...seriesCfg]);
+  };
+
+  const deleteSeries = (index: number) => {
+    seriesCfg = seriesCfg.filter((s, i) => i !== index);
+    setSelectedIdx(0);
+    onChange([...seriesCfg]);
+  };
+
+  const series = seriesCfg[selectedIdx];
+  const formKey = `${mapping}${selectedIdx}`;
+
+  const baseNameMode =
+    mapping === SeriesMapping.Manual
+      ? FieldNamePickerBaseNameMode.ExcludeBaseNames
+      : context.data.length === 1
+        ? FieldNamePickerBaseNameMode.IncludeAll
+        : FieldNamePickerBaseNameMode.OnlyBaseNames;
+
+  context.data.forEach((frame, frameIndex) => {
+    frame.fields.forEach((field, fieldIndex) => {
+      field.state = {
+        ...field.state,
+        origin: {
+          frameIndex,
+          fieldIndex,
+        },
+      };
+    });
+  });
+
+  return (
+    <>
+      {mapping === SeriesMapping.Manual && (
+        <>
+          <Button icon="plus" size="sm" variant="secondary" onClick={addSeries} className={style.marginBot}>
+            Add series
+          </Button>
+
+          <div className={style.marginBot}>
+            {seriesCfg.map((series, index) => {
+              return (
+                <div
+                  key={`series/${index}`}
+                  className={index === selectedIdx ? `${style.row} ${style.sel}` : style.row}
+                  onClick={() => setSelectedIdx(index)}
+                  role="button"
+                  aria-label={`Select series ${index + 1}`}
+                  tabIndex={0}
+                  onKeyPress={(e) => {
+                    if (e.key === 'Enter') {
+                      setSelectedIdx(index);
+                    }
+                  }}
+                >
+                  <LayerName
+                    name={series.name?.fixed ?? `Series ${index + 1}`}
+                    onChange={(v) => {
+                      series.name = {
+                        fixed: v === '' || v === `Series ${index + 1}` ? undefined : v,
+                      };
+                      onChange([...seriesCfg]);
+                    }}
+                  />
+                  <IconButton
+                    name="trash-alt"
+                    title={'remove'}
+                    className={cx(style.actionIcon)}
+                    onClick={() => deleteSeries(index)}
+                    tooltip="Delete series"
+                  />
+                </div>
+              );
+            })}
+          </div>
+        </>
+      )}
+
+      {selectedIdx >= 0 && series != null && (
+        <Fragment key={formKey}>
+          <Field label="Frame">
+            <Select
+              placeholder={mapping === SeriesMapping.Auto ? 'All frames' : 'Select frame'}
+              isClearable={true}
+              options={context.data.map((frame, index) => ({
+                value: index,
+                label: `${getFrameDisplayName(frame, index)} (index: ${index}, rows: ${frame.length})`,
+              }))}
+              value={series.frame?.matcher.options}
+              onChange={(opt) => {
+                if (opt == null) {
+                  delete series.frame;
+                } else {
+                  series.frame = {
+                    matcher: {
+                      id: FrameMatcherID.byIndex,
+                      options: Number(opt.value),
+                    },
+                  };
+                }
+
+                onChange([...seriesCfg]);
+              }}
+            />
+          </Field>
+          <Field label="X field">
+            <FieldNamePicker
+              value={series.x?.matcher.options as string}
+              context={context}
+              onChange={(fieldName) => {
+                if (fieldName == null) {
+                  delete series.x;
+                } else {
+                  // TODO: reset any other dim that was set to fieldName
+                  series.x = {
+                    matcher: {
+                      id: FieldMatcherID.byName,
+                      options: fieldName,
+                    },
+                  };
+                }
+
+                onChange([...seriesCfg]);
+              }}
+              item={{
+                id: 'x',
+                name: 'x',
+                settings: {
+                  filter: (field) =>
+                    (mapping === SeriesMapping.Auto ||
+                      field.state?.origin?.frameIndex === series.frame?.matcher.options) &&
+                    field.type === FieldType.number &&
+                    !field.config.custom?.hideFrom?.viz,
+                  baseNameMode,
+                  placeholderText: mapping === SeriesMapping.Auto ? 'First number field in each frame' : undefined,
+                },
+              }}
+            />
+          </Field>
+          <Field label="Y field">
+            <FieldNamePicker
+              value={series.y?.matcher?.options as string}
+              context={context}
+              onChange={(fieldName) => {
+                if (fieldName == null) {
+                  delete series.y;
+                } else {
+                  // TODO: reset any other dim that was set to fieldName
+                  series.y = {
+                    matcher: {
+                      id: FieldMatcherID.byName,
+                      options: fieldName,
+                    },
+                  };
+                }
+
+                onChange([...seriesCfg]);
+              }}
+              item={{
+                id: 'y',
+                name: 'y',
+                settings: {
+                  // TODO: filter out series.y?.exclude.options, series.size.matcher.options, series.color.matcher.options
+                  filter: (field) =>
+                    (mapping === SeriesMapping.Auto ||
+                      field.state?.origin?.frameIndex === series.frame?.matcher.options) &&
+                    field.type === FieldType.number &&
+                    !field.config.custom?.hideFrom?.viz,
+                  baseNameMode,
+                  placeholderText: mapping === SeriesMapping.Auto ? 'Remaining number fields in each frame' : undefined,
+                },
+              }}
+            />
+          </Field>
+          <Field label="Size field">
+            <FieldNamePicker
+              value={series.size?.matcher?.options as string}
+              context={context}
+              onChange={(fieldName) => {
+                if (fieldName == null) {
+                  delete series.size;
+                } else {
+                  // TODO: reset any other dim that was set to fieldName
+                  series.size = {
+                    matcher: {
+                      id: FieldMatcherID.byName,
+                      options: fieldName,
+                    },
+                  };
+                }
+
+                onChange([...seriesCfg]);
+              }}
+              item={{
+                id: 'size',
+                name: 'size',
+                settings: {
+                  // TODO: filter out series.y?.exclude.options, series.size.matcher.options, series.color.matcher.options
+                  filter: (field) =>
+                    field.name !== series.x?.matcher.options &&
+                    (mapping === SeriesMapping.Auto ||
+                      field.state?.origin?.frameIndex === series.frame?.matcher.options) &&
+                    field.type === FieldType.number &&
+                    !field.config.custom?.hideFrom?.viz,
+                  baseNameMode,
+                  placeholderText: '',
+                },
+              }}
+            />
+          </Field>
+          <Field label="Color field">
+            <FieldNamePicker
+              value={series.color?.matcher?.options as string}
+              context={context}
+              onChange={(fieldName) => {
+                if (fieldName == null) {
+                  delete series.color;
+                } else {
+                  // TODO: reset any other dim that was set to fieldName
+                  series.color = {
+                    matcher: {
+                      id: FieldMatcherID.byName,
+                      options: fieldName,
+                    },
+                  };
+                }
+
+                onChange([...seriesCfg]);
+              }}
+              item={{
+                id: 'color',
+                name: 'color',
+                settings: {
+                  // TODO: filter out series.y?.exclude.options, series.size.matcher.options, series.color.matcher.options
+                  filter: (field) =>
+                    field.name !== series.x?.matcher.options &&
+                    (mapping === SeriesMapping.Auto ||
+                      field.state?.origin?.frameIndex === series.frame?.matcher.options) &&
+                    field.type === FieldType.number &&
+                    !field.config.custom?.hideFrom?.viz,
+                  baseNameMode,
+                  placeholderText: '',
+                },
+              }}
+            />
+          </Field>
+        </Fragment>
+      )}
+    </>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  marginBot: css({
+    marginBottom: '20px',
+  }),
+  row: css({
+    padding: `${theme.spacing(0.5, 1)}`,
+    borderRadius: `${theme.shape.radius.default}`,
+    background: `${theme.colors.background.secondary}`,
+    minHeight: `${theme.spacing(4)}`,
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    marginBottom: '3px',
+    cursor: 'pointer',
+
+    border: `1px solid ${theme.components.input.borderColor}`,
+    '&:hover': {
+      border: `1px solid ${theme.components.input.borderHover}`,
+    },
+  }),
+  sel: css({
+    border: `1px solid ${theme.colors.primary.border}`,
+    '&:hover': {
+      border: `1px solid ${theme.colors.primary.border}`,
+    },
+  }),
+  actionIcon: css({
+    color: `${theme.colors.text.secondary}`,
+    '&:hover': {
+      color: `${theme.colors.text}`,
+    },
+  }),
+});
diff --git a/public/app/plugins/panel/xychart/v2/XYChartPanel.tsx b/public/app/plugins/panel/xychart/v2/XYChartPanel.tsx
new file mode 100644
index 0000000000000..2957c58a0e361
--- /dev/null
+++ b/public/app/plugins/panel/xychart/v2/XYChartPanel.tsx
@@ -0,0 +1,134 @@
+import { css } from '@emotion/css';
+import React, { useMemo } from 'react';
+
+import { PanelProps } from '@grafana/data';
+import { alpha } from '@grafana/data/src/themes/colorManipulator';
+import { config } from '@grafana/runtime';
+import {
+  TooltipDisplayMode,
+  TooltipPlugin2,
+  UPlotChart,
+  VizLayout,
+  VizLegend,
+  VizLegendItem,
+  useStyles2,
+} from '@grafana/ui';
+import { TooltipHoverMode } from '@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2';
+
+import { XYChartTooltip } from './XYChartTooltip';
+import { Options } from './panelcfg.gen';
+import { prepConfig } from './scatter';
+import { prepSeries } from './utils';
+
+type Props2 = PanelProps<Options>;
+
+export const XYChartPanel2 = (props: Props2) => {
+  const styles = useStyles2(getStyles);
+
+  let { mapping, series: mappedSeries } = props.options;
+
+  // regenerate series schema when mappings or data changes
+  let series = useMemo(
+    () => prepSeries(mapping, mappedSeries, props.data.series, props.fieldConfig),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [mapping, mappedSeries, props.data.series, props.fieldConfig]
+  );
+
+  // if series changed due to mappings or data structure, re-init config & renderers
+  let { builder, prepData } = useMemo(
+    () => prepConfig(series, config.theme2),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [mapping, mappedSeries, props.data.structureRev, props.fieldConfig, props.options.tooltip]
+  );
+
+  // generate data struct for uPlot mode: 2
+  let data = useMemo(
+    () => prepData(series),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [series]
+  );
+
+  // todo: handle errors
+  let error = builder == null || data.length === 0 ? 'Err' : '';
+
+  // TODO: React.memo()
+  const renderLegend = () => {
+    if (!props.options.legend.showLegend) {
+      return null;
+    }
+
+    const items: VizLegendItem[] = [];
+
+    series.forEach((s, idx) => {
+      let yField = s.y.field;
+      let config = yField.config;
+      let custom = config.custom;
+
+      if (!custom.hideFrom?.legend) {
+        items.push({
+          yAxis: 1, // TODO: pull from y field
+          label: s.name.value,
+          color: alpha(s.color.fixed!, 1),
+          getItemKey: () => `${idx}-${s.name.value}`,
+          fieldName: yField.state?.displayName ?? yField.name,
+          disabled: yField.state?.hideFrom?.viz ?? false,
+        });
+      }
+    });
+
+    // sort series by calcs? table mode?
+
+    const { placement, displayMode, width } = props.options.legend;
+
+    return (
+      <VizLayout.Legend placement={placement} width={width}>
+        <VizLegend className={styles.legend} placement={placement} items={items} displayMode={displayMode} />
+      </VizLayout.Legend>
+    );
+  };
+
+  if (error) {
+    return (
+      <div className="panel-empty">
+        <p>{error}</p>
+      </div>
+    );
+  }
+
+  return (
+    <VizLayout width={props.width} height={props.height} legend={renderLegend()}>
+      {(vizWidth: number, vizHeight: number) => (
+        <UPlotChart config={builder!} data={data} width={vizWidth} height={vizHeight}>
+          {props.options.tooltip.mode !== TooltipDisplayMode.None && (
+            <TooltipPlugin2
+              config={builder!}
+              hoverMode={TooltipHoverMode.xyOne}
+              render={(u, dataIdxs, seriesIdx, isPinned, dismiss) => {
+                return (
+                  <XYChartTooltip
+                    data={props.data.series}
+                    dataIdxs={dataIdxs}
+                    xySeries={series}
+                    dismiss={dismiss}
+                    isPinned={isPinned}
+                    seriesIdx={seriesIdx!}
+                  />
+                );
+              }}
+              maxWidth={props.options.tooltip.maxWidth}
+              maxHeight={props.options.tooltip.maxHeight}
+            />
+          )}
+        </UPlotChart>
+      )}
+    </VizLayout>
+  );
+};
+
+const getStyles = () => ({
+  legend: css({
+    div: {
+      justifyContent: 'flex-start',
+    },
+  }),
+});
diff --git a/public/app/plugins/panel/xychart/v2/XYChartTooltip.tsx b/public/app/plugins/panel/xychart/v2/XYChartTooltip.tsx
new file mode 100644
index 0000000000000..76618d3728e8b
--- /dev/null
+++ b/public/app/plugins/panel/xychart/v2/XYChartTooltip.tsx
@@ -0,0 +1,111 @@
+import React, { ReactNode } from 'react';
+
+import { DataFrame } from '@grafana/data';
+import { alpha } from '@grafana/data/src/themes/colorManipulator';
+import { useStyles2 } from '@grafana/ui';
+import { VizTooltipContent } from '@grafana/ui/src/components/VizTooltip/VizTooltipContent';
+import { VizTooltipFooter } from '@grafana/ui/src/components/VizTooltip/VizTooltipFooter';
+import { VizTooltipHeader } from '@grafana/ui/src/components/VizTooltip/VizTooltipHeader';
+import { ColorIndicator, VizTooltipItem } from '@grafana/ui/src/components/VizTooltip/types';
+
+import { getDataLinks } from '../../status-history/utils';
+import { getStyles } from '../../timeseries/TimeSeriesTooltip';
+
+import { XYSeries } from './types2';
+import { fmt } from './utils';
+
+export interface Props {
+  dataIdxs: Array<number | null>;
+  seriesIdx: number | null | undefined;
+  isPinned: boolean;
+  dismiss: () => void;
+  data: DataFrame[];
+  xySeries: XYSeries[];
+}
+
+function stripSeriesName(fieldName: string, seriesName: string) {
+  if (fieldName !== seriesName && fieldName.includes(' ')) {
+    fieldName = fieldName.replace(seriesName, '').trim();
+  }
+
+  return fieldName;
+}
+
+export const XYChartTooltip = ({ dataIdxs, seriesIdx, data, xySeries, dismiss, isPinned }: Props) => {
+  const styles = useStyles2(getStyles);
+
+  const rowIndex = dataIdxs.find((idx) => idx !== null)!;
+
+  const series = xySeries[seriesIdx! - 1];
+  const xField = series.x.field;
+  const yField = series.y.field;
+
+  const sizeField = series.size.field;
+  const colorField = series.color.field;
+
+  let label = series.name.value;
+
+  let seriesColor = series.color.fixed;
+  // let colorField = series.color.field;
+  // let pointColor: string;
+
+  // if (colorField != null) {
+  //   pointColor = colorField.display?.(colorField.values[rowIndex]).color!;
+  // }
+
+  const headerItem: VizTooltipItem = {
+    label,
+    value: '',
+    color: alpha(seriesColor!, 0.5),
+    colorIndicator: ColorIndicator.marker_md,
+  };
+
+  const contentItems: VizTooltipItem[] = [
+    {
+      label: stripSeriesName(xField.state?.displayName ?? xField.name, label),
+      value: fmt(xField, xField.values[rowIndex]),
+    },
+    {
+      label: stripSeriesName(yField.state?.displayName ?? yField.name, label),
+      value: fmt(yField, yField.values[rowIndex]),
+    },
+  ];
+
+  // mapped fields for size/color
+  if (sizeField != null) {
+    contentItems.push({
+      label: stripSeriesName(sizeField.state?.displayName ?? sizeField.name, label),
+      value: fmt(sizeField, sizeField.values[rowIndex]),
+    });
+  }
+
+  if (colorField != null) {
+    contentItems.push({
+      label: stripSeriesName(colorField.state?.displayName ?? colorField.name, label),
+      value: fmt(colorField, colorField.values[rowIndex]),
+    });
+  }
+
+  series._rest.forEach((field) => {
+    contentItems.push({
+      label: stripSeriesName(field.state?.displayName ?? field.name, label),
+      value: fmt(field, field.values[rowIndex]),
+    });
+  });
+
+  let footer: ReactNode;
+
+  if (isPinned && seriesIdx != null) {
+    const links = getDataLinks(yField, rowIndex);
+
+    footer = <VizTooltipFooter dataLinks={links} />;
+  }
+
+  return (
+    <div className={styles.wrapper}>
+      <VizTooltipHeader item={headerItem} isPinned={isPinned} />
+      <VizTooltipContent items={contentItems} isPinned={isPinned} />
+      {footer}
+    </div>
+  );
+};
diff --git a/public/app/plugins/panel/xychart/v2/config.ts b/public/app/plugins/panel/xychart/v2/config.ts
new file mode 100644
index 0000000000000..4706af19f3f74
--- /dev/null
+++ b/public/app/plugins/panel/xychart/v2/config.ts
@@ -0,0 +1,151 @@
+import {
+  FieldColorModeId,
+  FieldConfigProperty,
+  FieldType,
+  identityOverrideProcessor,
+  SetFieldConfigOptionsArgs,
+} from '@grafana/data';
+import { LineStyle } from '@grafana/schema';
+import { commonOptionsBuilder } from '@grafana/ui';
+
+import { LineStyleEditor } from '../../timeseries/LineStyleEditor';
+
+import { FieldConfig, XYShowMode } from './panelcfg.gen';
+
+export const DEFAULT_POINT_SIZE = 5;
+
+export function getScatterFieldConfig(cfg: FieldConfig): SetFieldConfigOptionsArgs<FieldConfig> {
+  return {
+    standardOptions: {
+      [FieldConfigProperty.Min]: {
+        hideFromDefaults: true,
+      },
+      [FieldConfigProperty.Max]: {
+        hideFromDefaults: true,
+      },
+      [FieldConfigProperty.Unit]: {
+        hideFromDefaults: true,
+      },
+      [FieldConfigProperty.Decimals]: {
+        hideFromDefaults: true,
+      },
+      [FieldConfigProperty.NoValue]: {
+        hideFromDefaults: true,
+      },
+      [FieldConfigProperty.DisplayName]: {
+        hideFromDefaults: true,
+      },
+
+      [FieldConfigProperty.Thresholds]: {
+        hideFromDefaults: true,
+      },
+      [FieldConfigProperty.Mappings]: {
+        hideFromDefaults: true,
+      },
+
+      // TODO: this still leaves Color series by: [ Last | Min | Max ]
+      // because item.settings?.bySeriesSupport && colorMode.isByValue
+      [FieldConfigProperty.Color]: {
+        settings: {
+          byValueSupport: true,
+          bySeriesSupport: true,
+          preferThresholdsMode: false,
+        },
+        defaultValue: {
+          mode: FieldColorModeId.PaletteClassic,
+        },
+      },
+    },
+
+    useCustomConfig: (builder) => {
+      builder
+        .addRadio({
+          path: 'show',
+          name: 'Show',
+          defaultValue: cfg.show,
+          settings: {
+            options: [
+              { label: 'Points', value: XYShowMode.Points },
+              { label: 'Lines', value: XYShowMode.Lines },
+              { label: 'Both', value: XYShowMode.PointsAndLines },
+            ],
+          },
+        })
+        // .addGenericEditor(
+        //   {
+        //     path: 'pointSymbol',
+        //     name: 'Point symbol',
+        //     defaultValue: defaultFieldConfig.pointSymbol ?? {
+        //       mode: 'fixed',
+        //       fixed: 'img/icons/marker/circle.svg',
+        //     },
+        //     settings: {
+        //       resourceType: MediaType.Icon,
+        //       folderName: ResourceFolderName.Marker,
+        //       placeholderText: 'Select a symbol',
+        //       placeholderValue: 'img/icons/marker/circle.svg',
+        //       showSourceRadio: false,
+        //     },
+        //     showIf: (c) => c.show !== ScatterShow.Lines,
+        //   },
+        //   SymbolEditor // ResourceDimensionEditor
+        // )
+        .addSliderInput({
+          path: 'pointSize.fixed',
+          name: 'Point size',
+          defaultValue: cfg.pointSize?.fixed ?? DEFAULT_POINT_SIZE,
+          settings: {
+            min: 1,
+            max: 100,
+            step: 1,
+          },
+          showIf: (c) => c.show !== XYShowMode.Lines,
+        })
+        .addNumberInput({
+          path: 'pointSize.min',
+          name: 'Min point size',
+          showIf: (c) => c.show !== XYShowMode.Lines,
+        })
+        .addNumberInput({
+          path: 'pointSize.max',
+          name: 'Max point size',
+          showIf: (c) => c.show !== XYShowMode.Lines,
+        })
+        // .addSliderInput({
+        //   path: 'fillOpacity',
+        //   name: 'Fill opacity',
+        //   defaultValue: 0.4, // defaultFieldConfig.fillOpacity,
+        //   settings: {
+        //     min: 0, // hidden?  or just outlines?
+        //     max: 1,
+        //     step: 0.05,
+        //   },
+        //   showIf: (c) => c.show !== ScatterShow.Lines,
+        // })
+        .addCustomEditor<void, LineStyle>({
+          id: 'lineStyle',
+          path: 'lineStyle',
+          name: 'Line style',
+          showIf: (c) => c.show !== XYShowMode.Points,
+          editor: LineStyleEditor,
+          override: LineStyleEditor,
+          process: identityOverrideProcessor,
+          shouldApply: (f) => f.type === FieldType.number,
+        })
+        .addSliderInput({
+          path: 'lineWidth',
+          name: 'Line width',
+          defaultValue: cfg.lineWidth,
+          settings: {
+            min: 0,
+            max: 10,
+            step: 1,
+          },
+          showIf: (c) => c.show !== XYShowMode.Points,
+        });
+
+      commonOptionsBuilder.addAxisConfig(builder, cfg);
+      commonOptionsBuilder.addHideFrom(builder);
+    },
+  };
+}
diff --git a/public/app/plugins/panel/xychart/v2/migrations.test.ts b/public/app/plugins/panel/xychart/v2/migrations.test.ts
new file mode 100644
index 0000000000000..e3a0202a4282d
--- /dev/null
+++ b/public/app/plugins/panel/xychart/v2/migrations.test.ts
@@ -0,0 +1,149 @@
+import { PanelModel } from '@grafana/data';
+
+import { xyChartMigrationHandler } from './migrations';
+import { Options } from './panelcfg.gen';
+
+describe('XYChart migrations', () => {
+  it('keep import', () => {
+    let input = { series: [] } as unknown as Options;
+    const options = xyChartMigrationHandler({
+      pluginVersion: 'x.y.z', // when defined
+      options: input,
+    } as PanelModel);
+
+    // no changes
+    expect(options).toBe(input);
+  });
+
+  /*
+  it('should migrate to new format for GA 10.4 release', () => {
+    const panel = {
+      options: {
+        series: [
+          {
+            x: 'x',
+            y: 'y',
+            size: {
+              fixed: 10,
+            },
+            color: {
+              fixed: 'red',
+            },
+          },
+        ],
+      },
+    } as PanelModel;
+
+    const options = xyChartMigrationHandler(panel);
+    expect(options.series![0].x).toEqual({
+      field: {
+        matcher: {
+          id: 'byName',
+          options: 'x',
+        },
+      },
+    });
+
+    expect(options.series![0].y).toEqual({
+      field: {
+        matcher: {
+          id: 'byName',
+          options: 'y',
+        },
+      },
+    });
+
+    // Update these `as any` when types are settled
+    expect((options.series![0] as any).size).toEqual({
+      fixed: 10,
+    });
+    expect((options.series![0] as any).color).toEqual({
+      fixed: 'red',
+    });
+  });
+
+  // test to make sure that migration does not run if the plugin version is not empty
+  it('should not run migration if plugin version is not empty', () => {
+    const panel = {
+      pluginVersion: '10.4.0',
+      // Old options
+      options: {
+        series: [
+          {
+            x: 'x',
+            y: 'y',
+            size: {
+              fixed: 10,
+            },
+            color: {
+              fixed: 'red',
+            },
+          },
+        ],
+      },
+    } as PanelModel;
+
+    const options = xyChartMigrationHandler(panel);
+    expect(options).toEqual(panel.options);
+  });
+
+  // Include y exclude fields as well as field matchers for size and color
+  it('should include y exclude fields as well as field matchers for size and color', () => {
+    const panel = {
+      options: {
+        series: [
+          {
+            x: 'x',
+            y: 'y',
+            size: {
+              fixed: 10,
+              field: 'size',
+            },
+            color: {
+              fixed: 'red',
+              field: 'color',
+            },
+            dims: {
+              exclude: ['y1', 'y2'],
+            },
+          },
+        ],
+      },
+    } as PanelModel;
+
+    const options = xyChartMigrationHandler(panel);
+    expect(options.series![0].y).toEqual({
+      field: {
+        matcher: {
+          id: 'byName',
+          options: 'y',
+        },
+        exclude: {
+          id: 'byNames',
+          options: ['y1', 'y2'],
+        },
+      },
+    });
+
+    // Update these `as any` when types are settled
+    expect((options.series![0] as any).size).toEqual({
+      fixed: 10,
+      field: {
+        matcher: {
+          id: 'byName',
+          options: 'size',
+        },
+      },
+    });
+    expect((options.series![0] as any).color).toEqual({
+      fixed: 'red',
+      field: {
+        matcher: {
+          id: 'byName',
+          options: 'color',
+        },
+      },
+    });
+  });
+  */
+});
diff --git a/public/app/plugins/panel/xychart/v2/migrations.ts b/public/app/plugins/panel/xychart/v2/migrations.ts
new file mode 100644
index 0000000000000..6cbe5b4875aff
--- /dev/null
+++ b/public/app/plugins/panel/xychart/v2/migrations.ts
@@ -0,0 +1,233 @@
+import { FieldMatcherID, FrameMatcherID, MatcherConfig, PanelModel } from '@grafana/data';
+
+import { ScatterSeriesConfig, SeriesMapping, XYDimensionConfig, Options as PrevOptions } from '../panelcfg.gen';
+
+import { XYSeriesConfig, Options } from './panelcfg.gen';
+
+export const xyChartMigrationHandler = (panel: PanelModel): Options => {
+  const pluginVersion = panel?.pluginVersion ?? '';
+
+  if (pluginVersion === '') {
+    return migrateOptions(panel);
+  }
+
+  return panel.options as Options;
+};
+
+function migrateOptions(panel: PanelModel): Options {
+  const { dims, seriesMapping, series: oldSeries, ...cleanedOpts } = panel.options as PrevOptions;
+  const { exclude = [], frame: frameShared, x: xShared }: XYDimensionConfig = dims ?? {};
+
+  const custDefaults = panel.fieldConfig.defaults.custom;
+
+  let oldSeries2 = oldSeries;
+
+  if (seriesMapping === SeriesMapping.Auto) {
+    oldSeries2 = [
+      {
+        x: undefined,
+        y: undefined,
+      },
+    ];
+  }
+
+  /*
+  // old manual mode example
+  "series": [
+    {
+      "pointColor": {
+        "fixed": "purple"       // this becomes override for y field.config.custom.pointColor.fixed, (or config.color?)
+        "field": "BMI Male",    // ...unless another field is mapped, then ignore
+      },
+      "pointSize": {
+        "field": "Weight Male",
+        "max": 40,              // this becomes override for y field.config.custom.pointSize.max
+        "min": 1,               // ...and .min
+        "fixed": 50.5
+      },
+      "frame": 0,               // byIndex frame matcher
+      "x": "Height Male",       // byName field matcher, falls back to byType/number field matcher
+      "y": "Weight Male"        // byName field matcher, falls back to byType/number field matcher
+    }
+  ],
+*/
+  let i = 0;
+
+  const newSeries: XYSeriesConfig[] = oldSeries2.map(({ x, y, pointColor, pointSize, frame }: ScatterSeriesConfig) => {
+    const { fixed: colorFixed, field: colorField } = pointColor ?? {};
+    const { fixed: sizeFixed, field: sizeField, min: sizeMin, max: sizeMax } = pointSize ?? {};
+
+    let xMatcherConfig: MatcherConfig;
+    let yMatcherConfig: MatcherConfig;
+
+    // old auto mode did not require x field defined
+    if (x == null && xShared == null) {
+      // TODO: this should just be the internal default. no need to store on save model
+      xMatcherConfig = {
+        id: FieldMatcherID.byType,
+        options: 'number',
+      };
+    } else {
+      xMatcherConfig = {
+        id: FieldMatcherID.byName,
+        options: x ?? xShared,
+      };
+    }
+
+    if (y == null) {
+      // TODO: this should just be the internal default. no need to store on save model
+      yMatcherConfig = {
+        id: FieldMatcherID.byType,
+        options: 'number',
+      };
+    } else {
+      yMatcherConfig = {
+        id: FieldMatcherID.byName,
+        options: y,
+      };
+    }
+
+    if (colorField == null && colorFixed && custDefaults.pointColor?.fixed !== colorFixed) {
+      // NOTE: intentionally not using custom.pointColor.fixed
+      let hasOverride = panel.fieldConfig.overrides.some(
+        (o) =>
+          o.matcher.id === yMatcherConfig.id &&
+          o.matcher.options === yMatcherConfig.options &&
+          o.properties.some((p) => p.id === 'color')
+      );
+
+      if (!hasOverride) {
+        panel.fieldConfig.overrides.push({
+          matcher: yMatcherConfig,
+          properties: [
+            {
+              id: 'color',
+              value: {
+                mode: 'fixed',
+                fixedColor: colorFixed,
+              },
+            },
+          ],
+        });
+      }
+    }
+
+    // add field overrides for custom pointSize.fixed
+    if (sizeField == null && sizeFixed && custDefaults.pointSize?.fixed !== sizeFixed) {
+      let hasOverride = panel.fieldConfig.overrides.some(
+        (o) =>
+          o.matcher.id === yMatcherConfig.id &&
+          o.matcher.options === yMatcherConfig.options &&
+          o.properties.some((p) => p.id === 'custom.pointSize.fixed')
+      );
+
+      if (!hasOverride) {
+        panel.fieldConfig.overrides.push({
+          matcher: yMatcherConfig,
+          properties: [
+            {
+              id: 'custom.pointSize.fixed',
+              value: sizeFixed,
+            },
+          ],
+        });
+      }
+    }
+
+    if (sizeField != null) {
+      // add field overrides for custom pointSize.min
+      if (sizeMin && custDefaults.pointSize?.min !== sizeMin) {
+        let hasOverride = panel.fieldConfig.overrides.some(
+          (o) =>
+            o.matcher.id === yMatcherConfig.id &&
+            o.matcher.options === yMatcherConfig.options &&
+            o.properties.some((p) => p.id === 'custom.pointSize.min')
+        );
+
+        if (!hasOverride) {
+          panel.fieldConfig.overrides.push({
+            matcher: {
+              id: FieldMatcherID.byName,
+              options: sizeField,
+            },
+            properties: [
+              {
+                id: 'custom.pointSize.min',
+                value: sizeMin,
+              },
+            ],
+          });
+        }
+      }
+      // add field overrides for custom pointSize.min
+      if (sizeMax && custDefaults.pointSize?.max !== sizeMax) {
+        let hasOverride = panel.fieldConfig.overrides.some(
+          (o) =>
+            o.matcher.id === yMatcherConfig.id &&
+            o.matcher.options === yMatcherConfig.options &&
+            o.properties.some((p) => p.id === 'custom.pointSize.max')
+        );
+
+        if (!hasOverride) {
+          panel.fieldConfig.overrides.push({
+            matcher: {
+              id: FieldMatcherID.byName,
+              options: sizeField,
+            },
+            properties: [
+              {
+                id: 'custom.pointSize.max',
+                value: sizeMax,
+              },
+            ],
+          });
+        }
+      }
+    }
+
+    return {
+      frame: {
+        matcher: {
+          id: FrameMatcherID.byIndex,
+          options: frame ?? (seriesMapping === SeriesMapping.Manual ? i++ : frameShared ?? 0),
+        },
+      },
+      x: {
+        matcher: xMatcherConfig,
+      },
+      y: {
+        matcher: yMatcherConfig,
+        ...(exclude.length && {
+          exclude: {
+            id: FieldMatcherID.byNames,
+            options: exclude,
+          },
+        }),
+      },
+      ...(colorField && {
+        color: {
+          matcher: {
+            id: FieldMatcherID.byName,
+            options: colorField,
+          },
+        },
+      }),
+      ...(sizeField && {
+        size: {
+          matcher: {
+            id: FieldMatcherID.byName,
+            options: sizeField,
+          },
+        },
+      }),
+    };
+  });
+
+  const newOptions: Options = {
+    ...cleanedOpts,
+    mapping: seriesMapping === SeriesMapping.Auto ? SeriesMapping.Auto : SeriesMapping.Manual,
+    series: newSeries,
+  };
+
+  return newOptions;
+}
diff --git a/public/app/plugins/panel/xychart/v2/module.tsx b/public/app/plugins/panel/xychart/v2/module.tsx
new file mode 100644
index 0000000000000..f0fd0b0b6a558
--- /dev/null
+++ b/public/app/plugins/panel/xychart/v2/module.tsx
@@ -0,0 +1,37 @@
+import { PanelPlugin } from '@grafana/data';
+import { commonOptionsBuilder } from '@grafana/ui';
+
+import { SeriesEditor } from './SeriesEditor';
+import { XYChartPanel2 } from './XYChartPanel';
+import { getScatterFieldConfig } from './config';
+import { xyChartMigrationHandler } from './migrations';
+import { FieldConfig, defaultFieldConfig, Options } from './panelcfg.gen';
+
+export const plugin = new PanelPlugin<Options, FieldConfig>(XYChartPanel2)
+  // .setPanelChangeHandler(xyChartChangeHandler)
+  .setMigrationHandler(xyChartMigrationHandler)
+  .useFieldConfig(getScatterFieldConfig(defaultFieldConfig))
+  .setPanelOptions((builder) => {
+    builder
+      .addRadio({
+        path: 'mapping',
+        name: 'Series mapping',
+        defaultValue: 'auto',
+        settings: {
+          options: [
+            { value: 'auto', label: 'Auto' },
+            { value: 'manual', label: 'Manual' },
+          ],
+        },
+      })
+      .addCustomEditor({
+        id: 'series',
+        path: 'series',
+        name: '',
+        editor: SeriesEditor,
+        defaultValue: [{}],
+      });
+
+    commonOptionsBuilder.addTooltipOptions(builder, true);
+    commonOptionsBuilder.addLegendOptions(builder);
+  });
diff --git a/public/app/plugins/panel/xychart/v2/panelcfg.cue b/public/app/plugins/panel/xychart/v2/panelcfg.cue
new file mode 100644
index 0000000000000..18d5370bf9561
--- /dev/null
+++ b/public/app/plugins/panel/xychart/v2/panelcfg.cue
@@ -0,0 +1,82 @@
+// Copyright 2023 Grafana Labs
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package grafanaplugin
+
+import (
+	"github.com/grafana/grafana/packages/grafana-schema/src/common"
+)
+
+composableKinds: PanelCfg: {
+	maturity: "experimental"
+
+	lineage: {
+		schemas: [{
+			version: [0, 0]
+			schema: {
+				SeriesMapping: "auto" | "manual"                   @cuetsy(kind="enum")
+				XYShowMode:    "points" | "lines" | "points+lines" @cuetsy(kind="enum", memberNames="Points|Lines|PointsAndLines")
+
+				// NOTE: (copied from dashboard_kind.cue, since not exported)
+				// Matcher is a predicate configuration. Based on the config a set of field(s) or values is filtered in order to apply override / transformation.
+				// It comes with in id ( to resolve implementation from registry) and a configuration that’s specific to a particular matcher type.
+				#MatcherConfig: {
+					// The matcher id. This is used to find the matcher implementation from registry.
+					id: string | *"" @grafanamaturity(NeedsExpertReview)
+					// The matcher options. This is specific to the matcher implementation.
+					options?: _ @grafanamaturity(NeedsExpertReview)
+				} @cuetsy(kind="interface") @grafana(TSVeneer="type")
+
+				FieldConfig: {
+					common.HideableFieldConfig
+					common.AxisConfig
+
+					show?: XYShowMode & (*"points" | _)
+
+					pointSize?:  {
+						fixed?: int32 & >=0
+						min?:   int32 & >=0
+						max?:   int32 & >=0
+					}
+
+					// pointSymbol?: common.ResourceDimensionConfig
+					// fillOpacity?: number & >=0 & <=1 | *0.5
+					// lineColor?: common.ColorDimensionConfig
+
+					lineWidth?: int32 & >=0
+					lineStyle?: common.LineStyle
+				} @cuetsy(kind="interface",TSVeneer="type")
+
+				XYSeriesConfig: {
+					name?:   { fixed?: string }
+					frame?:  { matcher: #MatcherConfig }
+					x?:      { matcher: #MatcherConfig }
+					y?:      { matcher: #MatcherConfig }
+					color?:  { matcher: #MatcherConfig }
+					size?:   { matcher: #MatcherConfig }
+				} @cuetsy(kind="interface")
+
+				Options: {
+					common.OptionsWithLegend
+					common.OptionsWithTooltip
+
+					mapping: SeriesMapping
+
+					series: [...XYSeriesConfig]
+				} @cuetsy(kind="interface")
+			}
+		}]
+		lenses: []
+	}
+}
diff --git a/public/app/plugins/panel/xychart/v2/panelcfg.gen.ts b/public/app/plugins/panel/xychart/v2/panelcfg.gen.ts
new file mode 100644
index 0000000000000..4d3b2fec1533f
--- /dev/null
+++ b/public/app/plugins/panel/xychart/v2/panelcfg.gen.ts
@@ -0,0 +1,87 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+//
+// Generated by:
+//     public/app/plugins/gen.go
+// Using jennies:
+//     TSTypesJenny
+//     PluginTsTypesJenny
+//
+// Run 'make gen-cue' from repository root to regenerate.
+
+import * as common from '@grafana/schema';
+
+export enum SeriesMapping {
+  Auto = 'auto',
+  Manual = 'manual',
+}
+
+export enum XYShowMode {
+  Lines = 'lines',
+  Points = 'points',
+  PointsAndLines = 'points+lines',
+}
+
+/**
+ * NOTE: (copied from dashboard_kind.cue, since not exported)
+ * Matcher is a predicate configuration. Based on the config a set of field(s) or values is filtered in order to apply override / transformation.
+ * It comes with in id ( to resolve implementation from registry) and a configuration that’s specific to a particular matcher type.
+ */
+export interface MatcherConfig {
+  /**
+   * The matcher id. This is used to find the matcher implementation from registry.
+   */
+  id: string;
+  /**
+   * The matcher options. This is specific to the matcher implementation.
+   */
+  options?: unknown;
+}
+
+export const defaultMatcherConfig: Partial<MatcherConfig> = {
+  id: '',
+};
+
+export interface FieldConfig extends common.HideableFieldConfig, common.AxisConfig {
+  lineStyle?: common.LineStyle;
+  lineWidth?: number;
+  pointSize?: {
+    fixed?: number;
+    min?: number;
+    max?: number;
+  };
+  show?: XYShowMode;
+}
+
+export const defaultFieldConfig: Partial<FieldConfig> = {
+  show: XYShowMode.Points,
+};
+
+export interface XYSeriesConfig {
+  color?: {
+    matcher: MatcherConfig;
+  };
+  frame?: {
+    matcher: MatcherConfig;
+  };
+  name?: {
+    fixed?: string;
+  };
+  size?: {
+    matcher: MatcherConfig;
+  };
+  x?: {
+    matcher: MatcherConfig;
+  };
+  y?: {
+    matcher: MatcherConfig;
+  };
+}
+
+export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip {
+  mapping: SeriesMapping;
+  series: Array<XYSeriesConfig>;
+}
+
+export const defaultOptions: Partial<Options> = {
+  series: [],
+};
diff --git a/public/app/plugins/panel/xychart/v2/plugin.json b/public/app/plugins/panel/xychart/v2/plugin.json
new file mode 100644
index 0000000000000..13721d65fb057
--- /dev/null
+++ b/public/app/plugins/panel/xychart/v2/plugin.json
@@ -0,0 +1,19 @@
+{
+  "type": "panel",
+  "name": "XY Chart",
+  "id": "xychart",
+  "state": "beta",
+
+  "info": {
+    "description": "Supports arbitrary X vs Y in a graph to visualize the relationship between two variables.",
+    "keywords": ["scatter", "plot"],
+    "author": {
+      "name": "Grafana Labs",
+      "url": "https://grafana.com"
+    },
+    "logos": {
+      "small": "img/icn-xychart.svg",
+      "large": "img/icn-xychart.svg"
+    }
+  }
+}
diff --git a/public/app/plugins/panel/xychart/v2/scatter.ts b/public/app/plugins/panel/xychart/v2/scatter.ts
new file mode 100644
index 0000000000000..c908eec8a4252
--- /dev/null
+++ b/public/app/plugins/panel/xychart/v2/scatter.ts
@@ -0,0 +1,482 @@
+import uPlot from 'uplot';
+
+import { formattedValueToString, GrafanaTheme2 } from '@grafana/data';
+import { alpha } from '@grafana/data/src/themes/colorManipulator';
+import { AxisPlacement, ScaleDirection, ScaleOrientation, VisibilityMode } from '@grafana/schema';
+import { UPlotConfigBuilder } from '@grafana/ui';
+import { FacetedData, FacetSeries } from '@grafana/ui/src/components/uPlot/types';
+
+import { pointWithin, Quadtree, Rect } from '../../barchart/quadtree';
+
+import { XYSeries } from './types2';
+import { getCommonPrefixSuffix } from './utils';
+
+interface DrawBubblesOpts {
+  each: (u: uPlot, seriesIdx: number, dataIdx: number, lft: number, top: number, wid: number, hgt: number) => void;
+  disp: {
+    //unit: 3,
+    size: {
+      values: (u: uPlot, seriesIdx: number) => number[];
+    };
+    color: {
+      values: (u: uPlot, seriesIdx: number) => string[];
+      alpha: number;
+    };
+  };
+}
+
+export const prepConfig = (xySeries: XYSeries[], theme: GrafanaTheme2) => {
+  if (xySeries.length === 0) {
+    return { builder: null, prepData: () => [] };
+  }
+
+  let qt: Quadtree;
+  let hRect: Rect | null;
+
+  function drawBubblesFactory(opts: DrawBubblesOpts) {
+    const drawBubbles: uPlot.Series.PathBuilder = (u, seriesIdx, idx0, idx1) => {
+      uPlot.orient(
+        u,
+        seriesIdx,
+        (
+          series,
+          dataX,
+          dataY,
+          scaleX,
+          scaleY,
+          valToPosX,
+          valToPosY,
+          xOff,
+          yOff,
+          xDim,
+          yDim,
+          moveTo,
+          lineTo,
+          rect,
+          arc
+        ) => {
+          const pxRatio = uPlot.pxRatio;
+          const scatterInfo = xySeries[seriesIdx - 1];
+          let d = u.data[seriesIdx] as unknown as FacetSeries;
+
+          // showLine: boolean;
+          // lineStyle: common.LineStyle;
+          // showPoints: common.VisibilityMode;
+
+          let showLine = scatterInfo.showLine;
+          let showPoints = scatterInfo.showPoints === VisibilityMode.Always;
+
+          let strokeWidth = 1;
+
+          u.ctx.save();
+
+          u.ctx.rect(u.bbox.left, u.bbox.top, u.bbox.width, u.bbox.height);
+          u.ctx.clip();
+
+          u.ctx.fillStyle = (series.fill as any)(); // assumes constant
+          u.ctx.strokeStyle = (series.stroke as any)();
+          u.ctx.lineWidth = strokeWidth;
+
+          let deg360 = 2 * Math.PI;
+
+          let xKey = scaleX.key!;
+          let yKey = scaleY.key!;
+
+          // let pointHints = scatterInfo.hints.pointSize;
+          // const colorByValue = scatterInfo.hints.pointColor.mode.isByValue;
+          const pointHints = { max: undefined, fixed: 5 };
+          const colorByValue = false;
+
+          let maxSize = (pointHints.max ?? pointHints.fixed) * pxRatio;
+
+          // todo: this depends on direction & orientation
+          // todo: calc once per redraw, not per path
+          let filtLft = u.posToVal(-maxSize / 2, xKey);
+          let filtRgt = u.posToVal(u.bbox.width / pxRatio + maxSize / 2, xKey);
+          let filtBtm = u.posToVal(u.bbox.height / pxRatio + maxSize / 2, yKey);
+          let filtTop = u.posToVal(-maxSize / 2, yKey);
+
+          let sizes = opts.disp.size.values(u, seriesIdx);
+          let pointColors = opts.disp.color.values(u, seriesIdx);
+          let pointAlpha = opts.disp.color.alpha;
+
+          let linePath: Path2D | null = showLine ? new Path2D() : null;
+
+          let curColor: CanvasRenderingContext2D['fillStyle'] | null = null;
+
+          for (let i = 0; i < d[0].length; i++) {
+            let xVal = d[0][i];
+            let yVal = d[1][i];
+            let size = sizes[i] * pxRatio;
+
+            if (xVal >= filtLft && xVal <= filtRgt && yVal >= filtBtm && yVal <= filtTop) {
+              let cx = valToPosX(xVal, scaleX, xDim, xOff);
+              let cy = valToPosY(yVal, scaleY, yDim, yOff);
+
+              if (showLine) {
+                linePath!.lineTo(cx, cy);
+              }
+
+              if (showPoints) {
+                // if pointHints.fixed? don't recalc size
+                // if pointColor has 0 opacity, draw as single path (assuming all strokes are alpha 1)
+
+                u.ctx.moveTo(cx + size / 2, cy);
+                u.ctx.beginPath();
+                u.ctx.arc(cx, cy, size / 2, 0, deg360);
+
+                if (colorByValue) {
+                  if (pointColors[i] !== curColor) {
+                    curColor = pointColors[i];
+                    u.ctx.fillStyle = alpha(curColor, pointAlpha);
+                    u.ctx.strokeStyle = curColor;
+                  }
+                }
+
+                u.ctx.fill();
+                u.ctx.stroke();
+                opts.each(
+                  u,
+                  seriesIdx,
+                  i,
+                  cx - size / 2 - strokeWidth / 2,
+                  cy - size / 2 - strokeWidth / 2,
+                  size + strokeWidth,
+                  size + strokeWidth
+                );
+              }
+            }
+          }
+
+          if (showLine) {
+            u.ctx.strokeStyle = scatterInfo.color.fixed!;
+            u.ctx.lineWidth = scatterInfo.lineWidth * pxRatio;
+
+            const { lineStyle } = scatterInfo;
+            if (lineStyle && lineStyle.fill !== 'solid') {
+              if (lineStyle.fill === 'dot') {
+                u.ctx.lineCap = 'round';
+              }
+              u.ctx.setLineDash(lineStyle.dash ?? [10, 10]);
+            }
+
+            u.ctx.stroke(linePath!);
+          }
+
+          u.ctx.restore();
+        }
+      );
+
+      return null;
+    };
+
+    return drawBubbles;
+  }
+
+  let drawBubbles = drawBubblesFactory({
+    disp: {
+      size: {
+        //unit: 3, // raw CSS pixels
+        values: (u, seriesIdx) => {
+          return u.data[seriesIdx][2] as any; // already contains final pixel geometry
+          //let [minValue, maxValue] = getSizeMinMax(u);
+          //return u.data[seriesIdx][2].map(v => getSize(v, minValue, maxValue));
+        },
+      },
+      color: {
+        // string values
+        values: (u, seriesIdx) => {
+          return u.data[seriesIdx][3] as any;
+        },
+        alpha: 0.5,
+      },
+    },
+    each: (u, seriesIdx, dataIdx, lft, top, wid, hgt) => {
+      // we get back raw canvas coords (included axes & padding). translate to the plotting area origin
+      lft -= u.bbox.left;
+      top -= u.bbox.top;
+      qt.add({ x: lft, y: top, w: wid, h: hgt, sidx: seriesIdx, didx: dataIdx });
+    },
+  });
+
+  const builder = new UPlotConfigBuilder();
+
+  builder.setCursor({
+    drag: { setScale: true },
+    dataIdx: (u, seriesIdx) => {
+      if (seriesIdx === 1) {
+        const pxRatio = uPlot.pxRatio;
+
+        hRect = null;
+
+        let dist = Infinity;
+        let cx = u.cursor.left! * pxRatio;
+        let cy = u.cursor.top! * pxRatio;
+
+        qt.get(cx, cy, 1, 1, (o) => {
+          if (pointWithin(cx, cy, o.x, o.y, o.x + o.w, o.y + o.h)) {
+            let ocx = o.x + o.w / 2;
+            let ocy = o.y + o.h / 2;
+
+            let dx = ocx - cx;
+            let dy = ocy - cy;
+
+            let d = Math.sqrt(dx ** 2 + dy ** 2);
+
+            // test against radius for actual hover
+            if (d <= o.w / 2) {
+              // only hover bbox with closest distance
+              if (d <= dist) {
+                dist = d;
+                hRect = o;
+              }
+            }
+          }
+        });
+      }
+
+      return hRect && seriesIdx === hRect.sidx ? hRect.didx : null;
+    },
+    points: {
+      size: (u, seriesIdx) => {
+        return hRect && seriesIdx === hRect.sidx ? hRect.w / uPlot.pxRatio : 0;
+      },
+      fill: (u, seriesIdx) => 'rgba(255,255,255,0.4)',
+    },
+  });
+
+  // clip hover points/bubbles to plotting area
+  builder.addHook('init', (u, r) => {
+    // TODO: re-enable once we global portal again
+    u.over.style.overflow = 'hidden';
+  });
+
+  builder.addHook('drawClear', (u) => {
+    qt = qt || new Quadtree(0, 0, u.bbox.width, u.bbox.height);
+
+    qt.clear();
+
+    // force-clear the path cache to cause drawBars() to rebuild new quadtree
+    u.series.forEach((s, i) => {
+      if (i > 0) {
+        // @ts-ignore
+        s._paths = null;
+      }
+    });
+  });
+
+  builder.setMode(2);
+
+  let xField = xySeries[0].x.field;
+
+  let fieldConfig = xField.config;
+  let customConfig = fieldConfig.custom;
+  let scaleDistr = customConfig?.scaleDistribution;
+
+  builder.addScale({
+    scaleKey: 'x',
+    isTime: false,
+    orientation: ScaleOrientation.Horizontal,
+    direction: ScaleDirection.Right,
+    distribution: scaleDistr?.type,
+    log: scaleDistr?.log,
+    linearThreshold: scaleDistr?.linearThreshold,
+    min: fieldConfig.min,
+    max: fieldConfig.max,
+    softMin: customConfig?.axisSoftMin,
+    softMax: customConfig?.axisSoftMax,
+    centeredZero: customConfig?.axisCenteredZero,
+    decimals: fieldConfig.decimals,
+  });
+
+  // why does this fall back to '' instead of null or undef?
+  let xAxisLabel = customConfig.axisLabel;
+
+  if (xAxisLabel == null || xAxisLabel === '') {
+    let dispNames = xySeries.map((s) => s.x.field.state?.displayName ?? '');
+
+    let xAxisAutoLabel =
+      xySeries.length === 1
+        ? xField.state?.displayName ?? xField.name
+        : new Set(dispNames).size === 1
+          ? dispNames[0]
+          : getCommonPrefixSuffix(dispNames);
+
+    if (xAxisAutoLabel !== '') {
+      xAxisLabel = xAxisAutoLabel;
+    }
+  }
+
+  builder.addAxis({
+    scaleKey: 'x',
+    placement: customConfig?.axisPlacement !== AxisPlacement.Hidden ? AxisPlacement.Bottom : AxisPlacement.Hidden,
+    show: customConfig?.axisPlacement !== AxisPlacement.Hidden,
+    grid: { show: customConfig?.axisGridShow },
+    border: { show: customConfig?.axisBorderShow },
+    theme,
+    label: xAxisLabel,
+    formatValue: (v, decimals) => formattedValueToString(xField.display!(v, decimals)),
+  });
+
+  xySeries.forEach((s, si) => {
+    let field = s.y.field;
+
+    const lineColor = s.color.fixed;
+    const pointColor = s.color.fixed;
+    //const lineColor = s.lineColor(frame);
+    //const lineWidth = s.lineWidth;
+
+    let scaleKey = field.config.unit ?? 'y';
+    let config = field.config;
+    let customConfig = config.custom;
+    let scaleDistr = customConfig?.scaleDistribution;
+
+    builder.addScale({
+      scaleKey,
+      orientation: ScaleOrientation.Vertical,
+      direction: ScaleDirection.Up,
+      distribution: scaleDistr?.type,
+      log: scaleDistr?.log,
+      linearThreshold: scaleDistr?.linearThreshold,
+      min: config.min,
+      max: config.max,
+      softMin: customConfig?.axisSoftMin,
+      softMax: customConfig?.axisSoftMax,
+      centeredZero: customConfig?.axisCenteredZero,
+      decimals: config.decimals,
+    });
+
+    // why does this fall back to '' instead of null or undef?
+    let yAxisLabel = customConfig.axisLabel;
+
+    if (yAxisLabel == null || yAxisLabel === '') {
+      let dispNames = xySeries.map((s) => s.y.field.state?.displayName ?? '');
+
+      let yAxisAutoLabel =
+        xySeries.length === 1
+          ? field.state?.displayName ?? field.name
+          : new Set(dispNames).size === 1
+            ? dispNames[0]
+            : getCommonPrefixSuffix(dispNames);
+
+      if (yAxisAutoLabel !== '') {
+        yAxisLabel = yAxisAutoLabel;
+      }
+    }
+
+    builder.addAxis({
+      scaleKey,
+      theme,
+      placement: customConfig?.axisPlacement === AxisPlacement.Auto ? AxisPlacement.Left : customConfig?.axisPlacement,
+      show: customConfig?.axisPlacement !== AxisPlacement.Hidden,
+      grid: { show: customConfig?.axisGridShow },
+      border: { show: customConfig?.axisBorderShow },
+      size: customConfig?.axisWidth,
+      // label: yAxisLabel == null || yAxisLabel === '' ? fieldDisplayName : yAxisLabel,
+      label: yAxisLabel,
+      formatValue: (v, decimals) => formattedValueToString(field.display!(v, decimals)),
+    });
+
+    builder.addSeries({
+      facets: [
+        {
+          scale: 'x',
+          auto: true,
+        },
+        {
+          scale: scaleKey,
+          auto: true,
+        },
+      ],
+      pathBuilder: drawBubbles, // drawBubbles({disp: {size: {values: () => }}})
+      theme,
+      scaleKey: '', // facets' scales used (above)
+      lineColor: alpha('' + lineColor, 1),
+      fillColor: alpha(pointColor ?? '#ffff', 0.5),
+      show: !field.state?.hideFrom?.viz,
+    });
+  });
+
+  /*
+  builder.setPrepData((frames) => {
+    let seriesData = lookup.fieldMaps.flatMap((f, i) => {
+      let { fields } = frames[i];
+
+      return f.y.map((yIndex, frameSeriesIndex) => {
+        let xValues = fields[f.x[frameSeriesIndex]].values;
+        let yValues = fields[f.y[frameSeriesIndex]].values;
+        let sizeValues = f.size![frameSeriesIndex](frames[i]);
+
+        if (!Array.isArray(sizeValues)) {
+          sizeValues = Array(xValues.length).fill(sizeValues);
+        }
+
+        return [xValues, yValues, sizeValues];
+      });
+    });
+
+    return [null, ...seriesData];
+  });
+  */
+
+  return { builder, prepData };
+};
+
+export type PrepData = (xySeries: XYSeries[]) => FacetedData;
+
+/**
+ * This is called everytime the data changes
+ *
+ * from?  is this where we would support that?  -- need the previous values
+ */
+export function prepData(xySeries: XYSeries[]): FacetedData {
+  // if (info.error || !data.length) {
+  //   return [null];
+  // }
+
+  return [
+    null,
+    ...xySeries.map((s, idx) => {
+      let len = s.x.field.values.length;
+
+      let diams: number[];
+
+      if (s.size.field != null) {
+        let { min, max } = s.size;
+
+        // todo: this scaling should be in renderer from raw values (not by passing css pixel diams via data)
+        let minPx = min! ** 2;
+        let maxPx = max! ** 2;
+        // use quadratic size scaling in byValue modes
+        let pxRange = maxPx - minPx;
+
+        // todo: add shared, local, or key-group min/max option?
+        // todo: better min/max with ignoring non-finite values
+        // todo: allow this to come from fieldConfig min/max ? or field.state.min/max (shared)
+        let vals = s.size.field.values;
+        let minVal = Math.min(...vals);
+        let maxVal = Math.max(...vals);
+        let valRange = maxVal - minVal;
+
+        diams = Array(len);
+
+        for (let i = 0; i < vals.length; i++) {
+          let val = vals[i];
+
+          let valPct = (val - minVal) / valRange;
+          let pxArea = minPx + valPct * pxRange;
+          diams[i] = pxArea ** 0.5;
+        }
+      } else {
+        diams = Array(len).fill(s.size.fixed!);
+      }
+
+      return [
+        s.x.field.values, // X
+        s.y.field.values, // Y
+        diams, // TODO: fails for by value
+        Array(len).fill(s.color.fixed!), // TODO: fails for by value
+      ];
+    }),
+  ];
+}
diff --git a/public/app/plugins/panel/xychart/v2/types2.ts b/public/app/plugins/panel/xychart/v2/types2.ts
new file mode 100644
index 0000000000000..207738abaf58f
--- /dev/null
+++ b/public/app/plugins/panel/xychart/v2/types2.ts
@@ -0,0 +1,88 @@
+import { Field } from '@grafana/data';
+import * as common from '@grafana/schema';
+
+// import { SeriesMapping, XYSeriesConfig } from './panelcfg.gen';
+
+// // panel save model
+// export interface XYSeriesConfig {
+//   name?: {
+//     fixed?: string; // (if explicitly defined in manual mode)
+
+//   /*
+//     replace?: {
+//       // default: 'field'
+//       source: 'field' | 'frame';
+//       // default: whatever is matched for y field
+//       matcher: common.MatcherConfig;
+//       // default: 'displayName'
+//       prop: 'displayName' | 'name' | 'query' | 'target';
+
+//       // similar to renameByRegex & RenameByRegexTransformerOptions
+//       // default: '(.*)'
+//       regex: string;
+//       // default: '$1'
+//       rename: string;
+//     }
+//   */
+//   }
+
+//   // required in manual mode (can match same frame multiple times)
+//   frame?: {
+//     matcher: common.MatcherConfig;
+//   };
+//   x?: {
+//     matcher: common.MatcherConfig;
+//   };
+//   y?: {
+//     matcher: common.MatcherConfig;
+//   };
+//   color?: {
+//     matcher: common.MatcherConfig;
+//   };
+//   size?: {
+//     matcher: common.MatcherConfig;
+//   };
+// }
+
+// materialized series (internal)
+export interface XYSeries {
+  showPoints: common.VisibilityMode;
+
+  showLine: boolean;
+  lineWidth: number;
+  lineStyle: common.LineStyle;
+
+  name: {
+    // extracted from fieldConfig + overrides of y field
+    value: string;
+  };
+  x: {
+    field: Field;
+  };
+  y: {
+    field: Field;
+  };
+  color: {
+    field?: Field;
+
+    // fixed value extracted from fieldConfig + overrides of y field
+    fixed?: string;
+  };
+  size: {
+    field?: Field;
+    // extracted from fieldConfig + overrides of size field
+    min?: number;
+    max?: number;
+
+    // fixed value extracted from fieldConfig + overrides of y field
+    fixed?: number;
+  };
+  // remaining unmapped fields in this frame (for showing remaining fields in tooltip)
+  _rest: Field[];
+}
+
+// export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip {
+//   // source: 'annotations' | 'series', // maybe render directly from annotations (exemplars)
+//   mapping: SeriesMapping;
+//   series: XYSeriesConfig[]; // uses series[0] in auto mode to generate
+// }
diff --git a/public/app/plugins/panel/xychart/v2/utils.ts b/public/app/plugins/panel/xychart/v2/utils.ts
new file mode 100644
index 0000000000000..5bdc09cdcec32
--- /dev/null
+++ b/public/app/plugins/panel/xychart/v2/utils.ts
@@ -0,0 +1,319 @@
+import {
+  Field,
+  formattedValueToString,
+  getFieldMatcher,
+  FieldType,
+  getFieldDisplayName,
+  DataFrame,
+  FrameMatcherID,
+  MatcherConfig,
+  FieldColorModeId,
+  cacheFieldDisplayNames,
+  FieldMatcherID,
+  FieldConfigSource,
+} from '@grafana/data';
+import { decoupleHideFromState } from '@grafana/data/src/field/fieldState';
+import { config } from '@grafana/runtime';
+import { VisibilityMode } from '@grafana/schema';
+
+import { XYShowMode, SeriesMapping, XYSeriesConfig } from './panelcfg.gen';
+import { XYSeries } from './types2';
+
+export function fmt(field: Field, val: number): string {
+  if (field.display) {
+    return formattedValueToString(field.display(val));
+  }
+
+  return `${val}`;
+}
+
+// cause we dont have a proper matcher for this currently
+function getFrameMatcher2(config: MatcherConfig) {
+  if (config.id === FrameMatcherID.byIndex) {
+    return (frame: DataFrame, index: number) => index === config.options;
+  }
+
+  return () => false;
+}
+
+export function prepSeries(
+  mapping: SeriesMapping,
+  mappedSeries: XYSeriesConfig[],
+  frames: DataFrame[],
+  fieldConfig: FieldConfigSource<any>
+) {
+  cacheFieldDisplayNames(frames);
+  decoupleHideFromState(frames, fieldConfig);
+
+  let series: XYSeries[] = [];
+
+  if (mappedSeries.length === 0) {
+    mappedSeries = [{}];
+  }
+
+  const { palette, getColorByName } = config.theme2.visualization;
+
+  mappedSeries.forEach((seriesCfg, seriesIdx) => {
+    if (mapping === SeriesMapping.Manual) {
+      if (seriesCfg.frame?.matcher == null || seriesCfg.x?.matcher == null || seriesCfg.y?.matcher == null) {
+        return;
+      }
+    }
+
+    let xMatcher = getFieldMatcher(
+      seriesCfg.x?.matcher ?? {
+        id: FieldMatcherID.byType,
+        options: 'number',
+      }
+    );
+    let yMatcher = getFieldMatcher(
+      seriesCfg.y?.matcher ?? {
+        id: FieldMatcherID.byType,
+        options: 'number',
+      }
+    );
+    let colorMatcher = seriesCfg.color ? getFieldMatcher(seriesCfg.color.matcher) : null;
+    let sizeMatcher = seriesCfg.size ? getFieldMatcher(seriesCfg.size.matcher) : null;
+    // let frameMatcher = seriesCfg.frame ? getFrameMatchers(seriesCfg.frame) : null;
+    let frameMatcher = seriesCfg.frame ? getFrameMatcher2(seriesCfg.frame.matcher) : null;
+
+    // loop over all frames and fields, adding a new series for each y dim
+    frames.forEach((frame, frameIdx) => {
+      // must match frame in manual mode
+      if (frameMatcher != null && !frameMatcher(frame, frameIdx)) {
+        return;
+      }
+
+      // shared across each series in this frame
+      let restFields: Field[] = [];
+
+      let frameSeries: XYSeries[] = [];
+
+      // only grabbing number fields (exclude time, string, enum, other)
+      let onlyNumFields = frame.fields.filter((field) => field.type === FieldType.number);
+
+      // only one of these per frame
+      let x = onlyNumFields.find((field) => xMatcher(field, frame, frames));
+      let color =
+        colorMatcher != null
+          ? onlyNumFields.find((field) => field !== x && colorMatcher!(field, frame, frames))
+          : undefined;
+      let size =
+        sizeMatcher != null
+          ? onlyNumFields.find((field) => field !== x && field !== color && sizeMatcher!(field, frame, frames))
+          : undefined;
+
+      // x field is required
+      if (x != null) {
+        // match y fields and create series
+        onlyNumFields.forEach((field) => {
+          // don't reuse already-mapped fields
+          if (field === x || field === color || field === size) {
+            return;
+          }
+
+          // in manual mode only add single series for this config
+          if (mapping === SeriesMapping.Manual && frameSeries.length > 0) {
+            return;
+          }
+
+          // if we match non-excluded y, create series
+          if (yMatcher(field, frame, frames) && !field.config.custom?.hideFrom?.viz) {
+            let y = field;
+            let name = seriesCfg.name?.fixed ?? getFieldDisplayName(y, frame, frames);
+
+            let ser: XYSeries = {
+              // these typically come from y field
+              name: {
+                value: name,
+              },
+
+              showPoints: y.config.custom.show === XYShowMode.Lines ? VisibilityMode.Never : VisibilityMode.Always,
+
+              showLine: y.config.custom.show !== XYShowMode.Points,
+              lineWidth: y.config.custom.lineWidth ?? 2,
+              lineStyle: y.config.custom.lineStyle,
+              // lineColor: () => seriesColor,
+              x: {
+                field: x!,
+              },
+              y: {
+                field: y,
+              },
+              color: {},
+              size: {},
+              _rest: restFields,
+            };
+
+            if (color != null) {
+              ser.color.field = color;
+            }
+
+            if (size != null) {
+              ser.size.field = size;
+              ser.size.min = size.config.custom.pointSize?.min ?? 5;
+              ser.size.max = size.config.custom.pointSize?.max ?? 100;
+              // ser.size.mode =
+            }
+
+            frameSeries.push(ser);
+          }
+        });
+
+        if (frameSeries.length === 0) {
+          // TODO: could not create series, skip & show error?
+        }
+
+        // populate rest fields
+        frame.fields.forEach((field) => {
+          let isUsedField = frameSeries.some(
+            ({ x, y, color, size }) =>
+              x.field === field || y.field === field || color.field === field || size.field === field
+          );
+
+          if (!isUsedField) {
+            restFields.push(field);
+          }
+        });
+
+        series.push(...frameSeries);
+      } else {
+        // x is missing in this frame!
+      }
+    });
+  });
+
+  if (series.length === 0) {
+    // TODO: could not create series, skip & show error?
+  } else {
+    // assign classic palette colors by index, as fallbacks for all series
+
+    let paletteIdx = 0;
+
+    // todo: populate min, max, mode from field + hints
+    series.forEach((s, i) => {
+      if (s.color.field == null) {
+        // derive fixed color from y field config
+        let colorCfg = s.y.field.config.color ?? { mode: FieldColorModeId.PaletteClassic };
+
+        let value = '';
+
+        if (colorCfg.mode === FieldColorModeId.PaletteClassic) {
+          value = getColorByName(palette[paletteIdx++ % palette.length]); // todo: do this via state.seriesIdx and re-init displayProcessor
+        } else if (colorCfg.mode === FieldColorModeId.Fixed) {
+          value = getColorByName(colorCfg.fixedColor!);
+        }
+
+        s.color.fixed = value;
+      }
+
+      if (s.size.field == null) {
+        // derive fixed size from y field config
+        s.size.fixed = s.y.field.config.custom.pointSize?.fixed ?? 5;
+        // ser.size.mode =
+      }
+    });
+
+    autoNameSeries(series);
+
+    // TODO: re-assign y display names?
+    // y.state = {
+    //   ...y.state,
+    //   seriesIndex: series.length + ,
+    // };
+    // y.display = getDisplayProcessor({ field, theme });
+  }
+
+  return series;
+}
+
+// strip common prefixes and suffixes from y field names
+function autoNameSeries(series: XYSeries[]) {
+  let names = series.map((s) => s.name.value.split(/\s+/g));
+
+  const { prefix, suffix } = findCommonPrefixSuffixLengths(names);
+
+  if (prefix < Infinity || suffix < Infinity) {
+    series.forEach((s, i) => {
+      s.name.value = names[i].slice(prefix, names[i].length - suffix).join(' ');
+    });
+  }
+}
+
+export function getCommonPrefixSuffix(strs: string[]) {
+  let names = strs.map((s) => s.split(/\s+/g));
+
+  let { prefix, suffix } = findCommonPrefixSuffixLengths(names);
+
+  let n = names[0];
+
+  if (n.length === 1 && prefix === 1 && suffix === 1) {
+    return '';
+  }
+
+  let parts = [];
+
+  if (prefix > 0) {
+    parts.push(...n.slice(0, prefix));
+  }
+
+  if (suffix > 0) {
+    parts.push(...n.slice(-suffix));
+  }
+
+  return parts.join(' ');
+}
+
+// lengths are in number of tokens (segments) in a phrase
+function findCommonPrefixSuffixLengths(names: string[][]) {
+  let commonPrefixLen = Infinity;
+  let commonSuffixLen = Infinity;
+
+  // if auto naming strategy, rename fields by stripping common prefixes and suffixes
+  let segs0: string[] = names[0];
+
+  for (let i = 1; i < names.length; i++) {
+    if (names[i].length < segs0.length) {
+      segs0 = names[i];
+    }
+  }
+
+  for (let i = 1; i < names.length; i++) {
+    let segs = names[i];
+
+    if (segs !== segs0) {
+      // prefixes
+      let preLen = 0;
+      for (let j = 0; j < segs0.length; j++) {
+        if (segs[j] === segs0[j]) {
+          preLen++;
+        } else {
+          break;
+        }
+      }
+
+      if (preLen < commonPrefixLen) {
+        commonPrefixLen = preLen;
+      }
+
+      // suffixes
+      let sufLen = 0;
+      for (let j = segs0.length - 1; j >= 0; j--) {
+        if (segs[j] === segs0[j]) {
+          sufLen++;
+        } else {
+          break;
+        }
+      }
+
+      if (sufLen < commonSuffixLen) {
+        commonSuffixLen = sufLen;
+      }
+    }
+  }
+
+  return {
+    prefix: commonPrefixLen,
+    suffix: commonSuffixLen,
+  };
+}
diff --git a/public/app/routes/routes.tsx b/public/app/routes/routes.tsx
index 5814ad5ce5a6f..fc6a987364420 100644
--- a/public/app/routes/routes.tsx
+++ b/public/app/routes/routes.tsx
@@ -10,7 +10,6 @@ import { contextSrv } from 'app/core/services/context_srv';
 import UserAdminPage from 'app/features/admin/UserAdminPage';
 import LdapPage from 'app/features/admin/ldap/LdapPage';
 import { getAlertingRoutes } from 'app/features/alerting/routes';
-import { newBrowseDashboardsEnabled } from 'app/features/browse-dashboards/featureFlag';
 import { ConnectionsRedirectNotice } from 'app/features/connections/components/ConnectionsRedirectNotice';
 import { ROUTES as CONNECTIONS_ROUTES } from 'app/features/connections/constants';
 import { getRoutes as getDataConnectionsRoutes } from 'app/features/connections/routes';
@@ -36,7 +35,7 @@ export function getAppRoutes(): RouteDescriptor[] {
       pageClass: 'page-dashboard',
       routeName: DashboardRoutes.Home,
       component: SafeDynamicImport(
-        () => import(/* webpackChunkName: "DashboardPage" */ '../features/dashboard/containers/DashboardPage')
+        () => import(/* webpackChunkName: "DashboardPageProxy" */ '../features/dashboard/containers/DashboardPageProxy')
       ),
     },
     {
@@ -44,7 +43,7 @@ export function getAppRoutes(): RouteDescriptor[] {
       pageClass: 'page-dashboard',
       routeName: DashboardRoutes.Normal,
       component: SafeDynamicImport(
-        () => import(/* webpackChunkName: "DashboardPage" */ '../features/dashboard/containers/DashboardPage')
+        () => import(/* webpackChunkName: "DashboardPageProxy" */ '../features/dashboard/containers/DashboardPageProxy')
       ),
     },
     {
@@ -53,7 +52,7 @@ export function getAppRoutes(): RouteDescriptor[] {
       pageClass: 'page-dashboard',
       routeName: DashboardRoutes.New,
       component: SafeDynamicImport(
-        () => import(/* webpackChunkName: "DashboardPage" */ '../features/dashboard/containers/DashboardPage')
+        () => import(/* webpackChunkName: "DashboardPage" */ '../features/dashboard/containers/DashboardPageProxy')
       ),
     },
     {
@@ -68,30 +67,33 @@ export function getAppRoutes(): RouteDescriptor[] {
       pageClass: 'page-dashboard',
       routeName: DashboardRoutes.Normal,
       component: SafeDynamicImport(
-        () => import(/* webpackChunkName: "DashboardPage" */ '../features/dashboard/containers/DashboardPage')
+        () => import(/* webpackChunkName: "DashboardPage" */ '../features/dashboard/containers/DashboardPageProxy')
       ),
     },
     {
-      path: '/d-solo/:uid/:slug',
-      pageClass: 'dashboard-solo',
-      routeName: DashboardRoutes.Normal,
-      chromeless: true,
+      // We currently have no core usage of the embedded dashboard so is to have a page for e2e to test
+      path: '/dashboards/embedding-test',
       component: SafeDynamicImport(
-        () => import(/* webpackChunkName: "SoloPanelPage" */ '../features/dashboard/containers/SoloPanelPage')
+        () =>
+          import(
+            /* webpackChunkName: "DashboardPage"*/ 'app/features/dashboard-scene/embedding/EmbeddedDashboardTestPage'
+          )
       ),
     },
-    // This route handles embedding of snapshot/scripted dashboard panels
     {
-      path: '/dashboard-solo/:type/:slug',
+      path: '/d-solo/:uid/:slug?',
       pageClass: 'dashboard-solo',
       routeName: DashboardRoutes.Normal,
       chromeless: true,
-      component: SafeDynamicImport(
-        () => import(/* webpackChunkName: "SoloPanelPage" */ '../features/dashboard/containers/SoloPanelPage')
+      component: SafeDynamicImport(() =>
+        config.featureToggles.dashboardSceneSolo
+          ? import(/* webpackChunkName: "SoloPanelPage" */ '../features/dashboard-scene/solo/SoloPanelPage')
+          : import(/* webpackChunkName: "SoloPanelPageOld" */ '../features/dashboard/containers/SoloPanelPage')
       ),
     },
+    // This route handles embedding of snapshot/scripted dashboard panels
     {
-      path: '/d-solo/:uid',
+      path: '/dashboard-solo/:type/:slug',
       pageClass: 'dashboard-solo',
       routeName: DashboardRoutes.Normal,
       chromeless: true,
@@ -101,7 +103,6 @@ export function getAppRoutes(): RouteDescriptor[] {
     },
     {
       path: '/dashboard/import',
-      roles: () => contextSrv.evaluatePermission([AccessControlAction.DashboardsCreate]),
       component: SafeDynamicImport(
         () => import(/* webpackChunkName: "DashboardImport"*/ 'app/features/manage-dashboards/DashboardImportPage')
       ),
@@ -139,38 +140,19 @@ export function getAppRoutes(): RouteDescriptor[] {
     {
       path: '/dashboards',
       component: SafeDynamicImport(
-        () => import(/* webpackChunkName: "DashboardListPage"*/ 'app/features/search/components/DashboardListPage')
-      ),
-    },
-    {
-      path: '/dashboards/folder/new',
-      roles: () => contextSrv.evaluatePermission([AccessControlAction.FoldersCreate]),
-      component: SafeDynamicImport(
-        () => import(/* webpackChunkName: "NewDashboardsFolder"*/ 'app/features/folders/components/NewDashboardsFolder')
-      ),
-    },
-    !newBrowseDashboardsEnabled() && {
-      path: '/dashboards/f/:uid/:slug/permissions',
-      component: SafeDynamicImport(
-        () => import(/* webpackChunkName: "FolderPermissions"*/ 'app/features/folders/AccessControlFolderPermissions')
-      ),
-    },
-    !newBrowseDashboardsEnabled() && {
-      path: '/dashboards/f/:uid/:slug/settings',
-      component: SafeDynamicImport(
-        () => import(/* webpackChunkName: "FolderSettingsPage"*/ 'app/features/folders/FolderSettingsPage')
+        () => import(/* webpackChunkName: "DashboardListPage"*/ 'app/features/browse-dashboards/BrowseDashboardsPage')
       ),
     },
     {
       path: '/dashboards/f/:uid/:slug',
       component: SafeDynamicImport(
-        () => import(/* webpackChunkName: "DashboardListPage"*/ 'app/features/search/components/DashboardListPage')
+        () => import(/* webpackChunkName: "DashboardListPage"*/ 'app/features/browse-dashboards/BrowseDashboardsPage')
       ),
     },
     {
       path: '/dashboards/f/:uid',
       component: SafeDynamicImport(
-        () => import(/* webpackChunkName: "DashboardListPage"*/ 'app/features/search/components/DashboardListPage')
+        () => import(/* webpackChunkName: "DashboardListPage"*/ 'app/features/browse-dashboards/BrowseDashboardsPage')
       ),
     },
     {
@@ -191,10 +173,22 @@ export function getAppRoutes(): RouteDescriptor[] {
       path: '/alerts-and-incidents',
       component: () => <NavLandingPage navId="alerts-and-incidents" />,
     },
+    {
+      path: '/testing-and-synthetics',
+      component: () => <NavLandingPage navId="testing-and-synthetics" />,
+    },
     {
       path: '/monitoring',
       component: () => <NavLandingPage navId="monitoring" />,
     },
+    {
+      path: '/infrastructure',
+      component: () => <NavLandingPage navId="infrastructure" />,
+    },
+    {
+      path: '/frontend',
+      component: () => <NavLandingPage navId="frontend" />,
+    },
     {
       path: '/admin/general',
       component: () => <NavLandingPage navId="cfg/general" />,
@@ -289,12 +283,26 @@ export function getAppRoutes(): RouteDescriptor[] {
       path: '/admin/authentication',
       roles: () => contextSrv.evaluatePermission([AccessControlAction.SettingsWrite]),
       component:
-        config.licenseInfo.enabledFeatures?.saml || config.ldapEnabled
+        config.licenseInfo.enabledFeatures?.saml || config.ldapEnabled || config.featureToggles.ssoSettingsApi
           ? SafeDynamicImport(
-              () => import(/* webpackChunkName: "AdminAuthentication" */ 'app/features/auth-config/AuthConfigPage')
+              () =>
+                import(/* webpackChunkName: "AdminAuthentication" */ '../features/auth-config/AuthProvidersListPage')
             )
           : () => <Redirect to="/admin" />,
     },
+    {
+      path: '/admin/authentication/ldap',
+      component: LdapPage,
+    },
+    {
+      path: '/admin/authentication/:provider',
+      roles: () => contextSrv.evaluatePermission([AccessControlAction.SettingsWrite]),
+      component: config.featureToggles.ssoSettingsApi
+        ? SafeDynamicImport(
+            () => import(/* webpackChunkName: "AdminAuthentication" */ '../features/auth-config/ProviderConfigPage')
+          )
+        : () => <Redirect to="/admin" />,
+    },
     {
       path: '/admin/settings',
       component: SafeDynamicImport(
@@ -354,9 +362,12 @@ export function getAppRoutes(): RouteDescriptor[] {
         () => import(/* webpackChunkName: "ServerStats" */ 'app/features/admin/ServerStats')
       ),
     },
-    {
-      path: '/admin/authentication/ldap',
-      component: LdapPage,
+    config.featureToggles.onPremToCloudMigrations && {
+      path: '/admin/migrate-to-cloud',
+      roles: () => ['Admin'],
+      component: SafeDynamicImport(
+        () => import(/* webpackChunkName: "MigrateToCloud" */ 'app/features/migrate-to-cloud/MigrateToCloud')
+      ),
     },
     // LOGIN / SIGNUP
     {
@@ -454,23 +465,17 @@ export function getAppRoutes(): RouteDescriptor[] {
     {
       path: '/dashboards/f/:uid/:slug/library-panels',
       component: SafeDynamicImport(
-        newBrowseDashboardsEnabled()
-          ? () =>
-              import(
-                /* webpackChunkName: "FolderLibraryPanelsPage"*/ 'app/features/browse-dashboards/BrowseFolderLibraryPanelsPage'
-              )
-          : () =>
-              import(/* webpackChunkName: "FolderLibraryPanelsPage"*/ 'app/features/folders/FolderLibraryPanelsPage')
+        () =>
+          import(
+            /* webpackChunkName: "FolderLibraryPanelsPage"*/ 'app/features/browse-dashboards/BrowseFolderLibraryPanelsPage'
+          )
       ),
     },
     {
       path: '/dashboards/f/:uid/:slug/alerting',
       roles: () => contextSrv.evaluatePermission([AccessControlAction.AlertingRuleRead]),
       component: SafeDynamicImport(
-        newBrowseDashboardsEnabled()
-          ? () =>
-              import(/* webpackChunkName: "FolderAlerting"*/ 'app/features/browse-dashboards/BrowseFolderAlertingPage')
-          : () => import(/* webpackChunkName: "FolderAlerting"*/ 'app/features/folders/FolderAlerting')
+        () => import(/* webpackChunkName: "FolderAlerting"*/ 'app/features/browse-dashboards/BrowseFolderAlertingPage')
       ),
     },
     {
@@ -485,7 +490,14 @@ export function getAppRoutes(): RouteDescriptor[] {
         () => import(/* webpackChunkName: "NotificationsPage"*/ 'app/features/notifications/NotificationsPage')
       ),
     },
-    ...getDynamicDashboardRoutes(),
+    {
+      path: '/explore/metrics',
+      chromeless: false,
+      exact: false,
+      component: SafeDynamicImport(
+        () => import(/* webpackChunkName: "DataTrailsPage"*/ 'app/features/trails/DataTrailsPage')
+      ),
+    },
     ...getPluginCatalogRoutes(),
     ...getSupportBundleRoutes(),
     ...getAlertingRoutes(),
@@ -520,38 +532,3 @@ export function getSupportBundleRoutes(cfg = config): RouteDescriptor[] {
     },
   ];
 }
-
-export function getDynamicDashboardRoutes(cfg = config): RouteDescriptor[] {
-  if (!cfg.featureToggles.scenes) {
-    return [];
-  }
-  return [
-    {
-      path: '/scenes',
-      component: SafeDynamicImport(() => import(/* webpackChunkName: "scenes"*/ 'app/features/scenes/SceneListPage')),
-    },
-    {
-      path: '/scenes/dashboard/:uid',
-      component: SafeDynamicImport(
-        () => import(/* webpackChunkName: "scenes"*/ 'app/features/dashboard-scene/pages/DashboardScenePage')
-      ),
-    },
-    {
-      path: '/scenes/dashboard/:uid/panel-edit/:panelId',
-      component: SafeDynamicImport(
-        () => import(/* webpackChunkName: "scenes"*/ 'app/features/dashboard-scene/pages/PanelEditPage')
-      ),
-    },
-    {
-      path: '/scenes/grafana-monitoring',
-      exact: false,
-      component: SafeDynamicImport(
-        () => import(/* webpackChunkName: "scenes"*/ 'app/features/scenes/apps/GrafanaMonitoringApp')
-      ),
-    },
-    {
-      path: '/scenes/:name',
-      component: SafeDynamicImport(() => import(/* webpackChunkName: "scenes"*/ 'app/features/scenes/ScenePage')),
-    },
-  ];
-}
diff --git a/public/app/store/configureStore.ts b/public/app/store/configureStore.ts
index c2c6cc8962537..ce1a65c1f0bf5 100644
--- a/public/app/store/configureStore.ts
+++ b/public/app/store/configureStore.ts
@@ -1,9 +1,9 @@
 import { configureStore as reduxConfigureStore, createListenerMiddleware } from '@reduxjs/toolkit';
 import { setupListeners } from '@reduxjs/toolkit/query';
 
-import { togglesApi } from 'app/features/admin/AdminFeatureTogglesAPI';
 import { browseDashboardsAPI } from 'app/features/browse-dashboards/api/browseDashboardsAPI';
 import { publicDashboardApi } from 'app/features/dashboard/api/publicDashboardApi';
+import { migrateToCloudAPI } from 'app/features/migrate-to-cloud/api';
 import { StoreState } from 'app/types/store';
 
 import { buildInitialState } from '../core/reducers/navModel';
@@ -30,7 +30,7 @@ export function configureStore(initialState?: Partial<StoreState>) {
         alertingApi.middleware,
         publicDashboardApi.middleware,
         browseDashboardsAPI.middleware,
-        togglesApi.middleware
+        migrateToCloudAPI.middleware
       ),
     devTools: process.env.NODE_ENV !== 'production',
     preloadedState: {
diff --git a/public/app/types/acl.ts b/public/app/types/acl.ts
index 5c9e80d71e415..c419632e955e9 100644
--- a/public/app/types/acl.ts
+++ b/public/app/types/acl.ts
@@ -9,65 +9,6 @@ export enum TeamPermissionLevel {
 
 export { OrgRole as OrgRole };
 
-export interface DashboardAclDTO {
-  id?: number;
-  dashboardId?: number;
-  userId?: number;
-  userLogin?: string;
-  userEmail?: string;
-  teamId?: number;
-  team?: string;
-  permission?: PermissionLevel;
-  role?: OrgRole;
-  icon?: string;
-  inherited?: boolean;
-}
-
-export interface DashboardAclUpdateDTO {
-  userId?: number;
-  teamId?: number;
-  role?: OrgRole;
-  permission?: PermissionLevel;
-}
-
-export interface DashboardAcl {
-  id?: number;
-  dashboardId?: number;
-  userId?: number;
-  userLogin?: string;
-  userEmail?: string;
-  teamId?: number;
-  team?: string;
-  permission?: PermissionLevel;
-  role?: OrgRole;
-  icon?: string;
-  name?: string;
-  inherited?: boolean;
-  sortRank?: number;
-  userAvatarUrl?: string;
-  teamAvatarUrl?: string;
-}
-
-export interface DashboardPermissionInfo {
-  value: PermissionLevel;
-  label: string;
-  description: string;
-}
-
-export interface NewDashboardAclItem {
-  teamId: number;
-  userId: number;
-  role?: OrgRole;
-  permission: PermissionLevel;
-  type: AclTarget;
-}
-
-export enum PermissionLevel {
-  View = 1,
-  Edit = 2,
-  Admin = 4,
-}
-
 export enum PermissionLevelString {
   View = 'View',
   Edit = 'Edit',
@@ -79,61 +20,3 @@ export enum SearchQueryType {
   Dashboard = 'dash-db',
   AlertFolder = 'dash-folder-alerting',
 }
-
-export enum DataSourcePermissionLevel {
-  Query = 1,
-  Admin = 2,
-}
-
-export enum AclTarget {
-  Team = 'Team',
-  User = 'User',
-  ServiceAccount = 'ServiceAccount',
-  Viewer = 'Viewer',
-  Editor = 'Editor',
-}
-
-export interface AclTargetInfo {
-  value: AclTarget;
-  label: string;
-}
-
-export const dataSourceAclLevels = [
-  { value: DataSourcePermissionLevel.Query, label: 'Query', description: 'Can query data source.' },
-];
-
-export const dashboardAclTargets: AclTargetInfo[] = [
-  { value: AclTarget.Team, label: 'Team' },
-  { value: AclTarget.User, label: 'User' },
-  { value: AclTarget.Viewer, label: 'Everyone With Viewer Role' },
-  { value: AclTarget.Editor, label: 'Everyone With Editor Role' },
-];
-
-export const dashboardPermissionLevels: DashboardPermissionInfo[] = [
-  { value: PermissionLevel.View, label: PermissionLevelString.View, description: 'Can view dashboards.' },
-  {
-    value: PermissionLevel.Edit,
-    label: PermissionLevelString.Edit,
-    description: 'Can add, edit and delete dashboards.',
-  },
-  {
-    value: PermissionLevel.Admin,
-    label: 'Admin',
-    description: 'Can add/remove permissions and can add, edit and delete dashboards.',
-  },
-];
-
-export interface TeamPermissionInfo {
-  value: TeamPermissionLevel;
-  label: string;
-  description: string;
-}
-
-export const teamsPermissionLevels: TeamPermissionInfo[] = [
-  { value: TeamPermissionLevel.Member, label: 'Member', description: 'Is team member' },
-  {
-    value: TeamPermissionLevel.Admin,
-    label: 'Admin',
-    description: 'Can add/remove permissions, members and delete team.',
-  },
-];
diff --git a/public/app/types/dashboard.ts b/public/app/types/dashboard.ts
index 73540389d23d3..828557e4329ca 100644
--- a/public/app/types/dashboard.ts
+++ b/public/app/types/dashboard.ts
@@ -2,14 +2,29 @@ import { DataQuery } from '@grafana/data';
 import { Dashboard, DataSourceRef } from '@grafana/schema';
 import { DashboardModel } from 'app/features/dashboard/state/DashboardModel';
 
-import { DashboardAcl } from './acl';
-
 export interface DashboardDTO {
   redirectUri?: string;
   dashboard: DashboardDataDTO;
   meta: DashboardMeta;
 }
 
+export interface ImportDashboardResponseDTO {
+  uid: string;
+  pluginId: string;
+  title: string;
+  imported: boolean;
+  importedRevision?: number;
+  importedUri: string;
+  importedUrl: string;
+  slug: string;
+  dashboardId: number;
+  folderId: number;
+  folderUid: string;
+  description: string;
+  path: string;
+  removed: boolean;
+}
+
 export interface SaveDashboardResponseDTO {
   id: number;
   slug: string;
@@ -29,7 +44,6 @@ export interface DashboardMeta {
   canStar?: boolean;
   canAdmin?: boolean;
   url?: string;
-  folderId?: number;
   folderUid?: string;
   canMakeEditable?: boolean;
   provisioned?: boolean;
@@ -52,6 +66,8 @@ export interface DashboardMeta {
   publicDashboardUid?: string;
   publicDashboardEnabled?: boolean;
   dashboardNotFound?: boolean;
+  isEmbedded?: boolean;
+  isNew?: boolean;
 }
 
 export interface AnnotationActions {
@@ -80,6 +96,7 @@ export enum DashboardRoutes {
   Scripted = 'scripted-dashboard',
   Public = 'public-dashboard',
   Embedded = 'embedded-dashboard',
+  Report = 'report-dashboard',
 }
 
 export enum DashboardInitPhase {
@@ -112,5 +129,4 @@ export interface DashboardState {
   initPhase: DashboardInitPhase;
   initialDatasource?: DataSourceRef['uid'];
   initError: DashboardInitError | null;
-  permissions: DashboardAcl[];
 }
diff --git a/public/app/types/events.ts b/public/app/types/events.ts
index 6f3e86e5134a1..9d742e99e8ac8 100644
--- a/public/app/types/events.ts
+++ b/public/app/types/events.ts
@@ -160,6 +160,18 @@ export class ShiftTimeEvent extends BusEventWithPayload<ShiftTimeEventPayload> {
   static type = 'shift-time';
 }
 
+export class CopyTimeEvent extends BusEventBase {
+  static type = 'copy-time';
+}
+
+interface PasteTimeEventPayload {
+  updateUrl?: boolean;
+}
+
+export class PasteTimeEvent extends BusEventWithPayload<PasteTimeEventPayload> {
+  static type = 'paste-time';
+}
+
 interface AbsoluteTimeEventPayload {
   updateUrl: boolean;
 }
diff --git a/public/app/types/explore.ts b/public/app/types/explore.ts
index cf1d21524abf4..e0b5afaa0dfd0 100644
--- a/public/app/types/explore.ts
+++ b/public/app/types/explore.ts
@@ -17,6 +17,7 @@ import {
   SupplementaryQueryType,
   UrlQueryMap,
   ExploreCorrelationHelperData,
+  DataLinkTransformationConfig,
 } from '@grafana/data';
 import { RichHistorySearchFilters, RichHistorySettings } from 'app/core/utils/richHistoryTypes';
 
@@ -27,21 +28,25 @@ export type ExploreQueryParams = UrlQueryMap;
 export enum CORRELATION_EDITOR_POST_CONFIRM_ACTION {
   CLOSE_PANE,
   CHANGE_DATASOURCE,
+  CLOSE_EDITOR,
 }
 
 export interface CorrelationEditorDetails {
   editorMode: boolean;
-  dirty: boolean;
+  correlationDirty: boolean;
+  queryEditorDirty: boolean;
   isExiting: boolean;
   postConfirmAction?: {
     // perform an action after a confirmation modal instead of exiting editor mode
     exploreId: string;
     action: CORRELATION_EDITOR_POST_CONFIRM_ACTION;
     changeDatasourceUid?: string;
+    isActionLeft: boolean;
   };
   canSave?: boolean;
   label?: string;
   description?: string;
+  transformations?: DataLinkTransformationConfig[];
 }
 
 // updates can have any properties
diff --git a/public/app/types/folders.ts b/public/app/types/folders.ts
index 2b79f57042e78..83d01c5c273b4 100644
--- a/public/app/types/folders.ts
+++ b/public/app/types/folders.ts
@@ -1,6 +1,9 @@
 import { WithAccessControlMetadata } from '@grafana/data';
 
-import { DashboardAcl } from './acl';
+export interface FolderListItemDTO {
+  uid: string;
+  title: string;
+}
 
 export interface FolderDTO extends WithAccessControlMetadata {
   canAdmin: boolean;
@@ -30,8 +33,6 @@ export interface FolderState {
   canDelete: boolean;
   hasChanged: boolean;
   version: number;
-  permissions: DashboardAcl[];
-  canViewFolderPermissions: boolean;
 }
 
 export interface DescendantCountDTO {
@@ -57,5 +58,4 @@ export interface FolderInfo {
   uid?: string;
   title?: string;
   url?: string;
-  canViewFolderPermissions?: boolean;
 }
diff --git a/public/app/types/plugins.ts b/public/app/types/plugins.ts
index a6d6f68ab47a6..d5d09b0eef2a1 100644
--- a/public/app/types/plugins.ts
+++ b/public/app/types/plugins.ts
@@ -3,7 +3,6 @@ import { PanelPlugin, PluginError, PluginMeta } from '@grafana/data';
 export interface PluginDashboard {
   dashboardId: number;
   description: string;
-  folderId: number;
   imported: boolean;
   importedRevision: number;
   importedUri: string;
diff --git a/public/app/types/serviceaccount.ts b/public/app/types/serviceaccount.ts
index cad4fea10d926..a2ae3846c5421 100644
--- a/public/app/types/serviceaccount.ts
+++ b/public/app/types/serviceaccount.ts
@@ -34,8 +34,11 @@ export interface ServiceAccountDTO extends WithAccessControlMetadata {
   avatarUrl?: string;
   createdAt: string;
   isDisabled: boolean;
+  isExternal?: boolean;
+  requiredBy?: string;
   teams: string[];
   role: OrgRole;
+  roles?: Role[];
 }
 
 export interface ServiceAccountCreateApiResponse {
@@ -52,12 +55,14 @@ export interface ServiceAccountCreateApiResponse {
 export interface ServiceAccountProfileState {
   serviceAccount: ServiceAccountDTO;
   isLoading: boolean;
+  rolesLoading?: boolean;
   tokens: ApiKey[];
 }
 
 export enum ServiceAccountStateFilter {
   All = 'All',
   WithExpiredTokens = 'WithExpiredTokens',
+  External = 'External',
   Disabled = 'Disabled',
 }
 
diff --git a/public/app/types/suggestions.ts b/public/app/types/suggestions.ts
index 95a10a419fcc9..2df8c82b9af1c 100644
--- a/public/app/types/suggestions.ts
+++ b/public/app/types/suggestions.ts
@@ -28,4 +28,6 @@ export enum SuggestionName {
   DashboardList = 'Dashboard list',
   Logs = 'Logs',
   FlameGraph = 'Flame graph',
+  Trace = 'Trace',
+  NodeGraph = 'Node graph',
 }
diff --git a/public/app/types/teams.ts b/public/app/types/teams.ts
index 5e4c7bf16b2a8..38f5abcf01a5a 100644
--- a/public/app/types/teams.ts
+++ b/public/app/types/teams.ts
@@ -1,5 +1,6 @@
 import { Team as TeamDTO } from '@grafana/schema/src/raw/team/x/team_types.gen';
 
+import { Role } from './accessControl';
 import { TeamPermissionLevel } from './acl';
 
 // The team resource
@@ -37,6 +38,10 @@ export interface Team {
    * TODO - it seems it's a team_member.permission, unlikely it should belong to the team kind
    */
   permission: TeamPermissionLevel;
+  /**
+   * RBAC roles assigned to the team.
+   */
+  roles?: Role[];
 }
 
 export interface TeamMember {
@@ -64,6 +69,7 @@ export interface TeamsState {
   totalPages: number;
   hasFetched: boolean;
   sort?: string;
+  rolesLoading?: boolean;
 }
 
 export interface TeamState {
diff --git a/public/app/types/templates.ts b/public/app/types/templates.ts
index 897044a93fe5b..17bb0edb3fbf9 100644
--- a/public/app/types/templates.ts
+++ b/public/app/types/templates.ts
@@ -1,5 +1,5 @@
 export interface Variable {
   name: string;
   type: string;
-  current: any;
+  current: unknown;
 }
diff --git a/public/app/types/unified-alerting-dto.ts b/public/app/types/unified-alerting-dto.ts
index 4e1e444dc2855..c7d8251c10c4b 100644
--- a/public/app/types/unified-alerting-dto.ts
+++ b/public/app/types/unified-alerting-dto.ts
@@ -38,11 +38,8 @@ export function isGrafanaAlertState(state: string): state is GrafanaAlertState {
 export function isAlertStateWithReason(
   state: PromAlertingRuleState | GrafanaAlertStateWithReason
 ): state is GrafanaAlertStateWithReason {
-  return (
-    state !== null &&
-    typeof state !== 'undefined' &&
-    !Object.values(PromAlertingRuleState).includes(state as PromAlertingRuleState)
-  );
+  const propAlertingRuleStateValues: string[] = Object.values(PromAlertingRuleState);
+  return state !== null && state !== undefined && !propAlertingRuleStateValues.includes(state);
 }
 
 export function mapStateWithReasonToBaseState(
@@ -181,7 +178,7 @@ export interface RulerAlertingRuleDTO extends RulerRuleBaseDTO {
 export enum GrafanaAlertStateDecision {
   Alerting = 'Alerting',
   NoData = 'NoData',
-  KeepLastState = 'KeepLastState',
+  KeepLast = 'KeepLast',
   OK = 'OK',
   Error = 'Error',
 }
@@ -200,6 +197,14 @@ export interface AlertQuery {
   model: AlertDataQuery;
 }
 
+export interface GrafanaNotificationSettings {
+  receiver: string;
+  group_by?: string[];
+  group_wait?: string;
+  group_interval?: string;
+  repeat_interval?: string;
+  mute_time_intervals?: string[];
+}
 export interface PostableGrafanaRuleDefinition {
   uid?: string;
   title: string;
@@ -208,12 +213,12 @@ export interface PostableGrafanaRuleDefinition {
   exec_err_state: GrafanaAlertStateDecision;
   data: AlertQuery[];
   is_paused?: boolean;
+  notification_settings?: GrafanaNotificationSettings;
 }
 export interface GrafanaRuleDefinition extends PostableGrafanaRuleDefinition {
   id?: string;
   uid: string;
   namespace_uid: string;
-  namespace_id: number;
   provenance?: string;
 }
 
diff --git a/public/app/types/unified-alerting.ts b/public/app/types/unified-alerting.ts
index a553b6dff92e2..e641ab278481f 100644
--- a/public/app/types/unified-alerting.ts
+++ b/public/app/types/unified-alerting.ts
@@ -26,8 +26,11 @@ export function hasAlertState(alert: Alert, state: PromAlertingRuleState | Grafa
   return mapStateWithReasonToBaseState(alert.state) === state;
 }
 
+// Prometheus API uses "err" but grafana API uses "error" *sigh*
+export type RuleHealth = 'nodata' | 'error' | 'err' | string;
+
 interface RuleBase {
-  health: string;
+  health: RuleHealth;
   name: string;
   query: string;
   lastEvaluation?: string;
@@ -128,6 +131,7 @@ export interface CombinedRuleNamespace {
   rulesSource: RulesSource;
   name: string;
   groups: CombinedRuleGroup[];
+  uid?: string; //available only in grafana rules
 }
 
 export interface RuleWithLocation<T = RulerRuleDTO> {
@@ -135,6 +139,7 @@ export interface RuleWithLocation<T = RulerRuleDTO> {
   namespace: string;
   group: RulerRuleGroupDTO;
   rule: T;
+  namespace_uid?: string;
 }
 
 export interface CombinedRuleWithLocation extends CombinedRule {
diff --git a/public/app/types/user.ts b/public/app/types/user.ts
index 66107cd1f271a..8731658c6f5f1 100644
--- a/public/app/types/user.ts
+++ b/public/app/types/user.ts
@@ -1,6 +1,8 @@
 import { SelectableValue, WithAccessControlMetadata } from '@grafana/data';
+import { Role } from 'app/types';
 
 import { OrgRole } from '.';
+
 export interface OrgUser extends WithAccessControlMetadata {
   avatarUrl: string;
   email: string;
@@ -10,6 +12,8 @@ export interface OrgUser extends WithAccessControlMetadata {
   name: string;
   orgId: number;
   role: OrgRole;
+  // RBAC roles
+  roles?: Role[];
   userId: number;
   isDisabled: boolean;
   authLabels?: string[];
@@ -76,6 +80,7 @@ export interface UsersState {
   externalUserMngLinkName: string;
   externalUserMngInfo: string;
   isLoading: boolean;
+  rolesLoading?: boolean;
   page: number;
   perPage: number;
   totalPages: number;
@@ -126,3 +131,26 @@ export interface UserListAdminState {
   isLoading: boolean;
   sort?: string;
 }
+
+export interface UserAnonymousDeviceDTO {
+  login?: string;
+  clientIp: string;
+  deviceId: string;
+  userAgent: string;
+  updatedAt: string;
+  lastSeenAt: string;
+  avatarUrl?: string;
+}
+
+export type AnonUserFilter = Record<string, string | boolean | SelectableValue[]>;
+
+export interface UserListAnonymousDevicesState {
+  devices: UserAnonymousDeviceDTO[];
+  query: string;
+  perPage: number;
+  page: number;
+  totalPages: number;
+  showPaging: boolean;
+  filters: AnonUserFilter[];
+  sort?: string;
+}
diff --git a/public/dashboards/home.json b/public/dashboards/home.json
index 821a7eaa35a7a..fe1d0cda9dc00 100644
--- a/public/dashboards/home.json
+++ b/public/dashboards/home.json
@@ -2,7 +2,7 @@
   "links": [],
   "panels": [
     {
-      "datasource": null,
+      "content": "<div class=\"text-center dashboard-header\">\n  <span>Home Dashboard</span>\n</div>",
       "gridPos": {
         "h": 3,
         "w": 24,
@@ -12,45 +12,42 @@
       "id": 1,
       "title": "",
       "transparent": false,
-      "type": "welcome"
+      "type": "text"
     },
     {
-      "datasource": null,
       "folderId": 0,
       "gridPos": {
-        "h": 15,
+        "h": 17,
         "w": 12,
         "x": 0,
-        "y": 4
+        "y": 6
       },
+      "transparent": false,
       "headings": true,
       "id": 3,
-      "limit": 30,
+      "limit": 4,
       "links": [],
-      "options": {},
       "query": "",
       "recent": true,
       "search": false,
       "starred": true,
       "tags": [],
-      "title": "Dashboards",
+      "title": "",
       "type": "dashlist"
     },
     {
-      "datasource": null,
       "gridPos": {
-        "h": 15,
+        "h": 17,
         "w": 12,
         "x": 12,
-        "y": 4
+        "y": 6
       },
+      "editable": true,
+      "error": false,
+      "transparent": false,
       "id": 4,
-      "links": [],
-      "options": {
-        "feedUrl": "https://grafana.com/blog/news.xml"
-      },
-      "title": "Latest from the blog",
-      "type": "news"
+      "title": "",
+      "type": "pluginlist"
     }
   ],
   "schemaVersion": 22,
diff --git a/public/emails/README.md b/public/emails/README.md
index bd86730f096c7..ad34cc8cb4deb 100644
--- a/public/emails/README.md
+++ b/public/emails/README.md
@@ -1 +1,5 @@
 html files in this folder are generated from templates and build system in repo_root/emails
+
+Psiphon change - the templates in repo_root/emails have been edited and the html files regenerated, so these regenerated files have custom Psiphon content. To make custom changes to these email template files, make changes in the templates in repo_root/emails and run `make` in repo_root/emails to generate the updated files.
+
+Psiphon change - alert_notification.html and alert_notification.txt do not have corresponding template files in repo_root/emails so those files are not generated from a template and changes should be made to them directly in this folder.
diff --git a/public/emails/alert_notification.html b/public/emails/alert_notification.html
index 4408da8d9160d..8b1e2487367a2 100644
--- a/public/emails/alert_notification.html
+++ b/public/emails/alert_notification.html
@@ -4,7 +4,7 @@
   <title>{{Subject .Subject .TemplateData "{{.Title}}"}}</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="viewport" content="width=device-width" />
-	
+
 <style>body {
 width: 100% !important; min-width: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; margin: 0; padding: 0;
 }
@@ -166,9 +166,11 @@
   }
 }
 </style></head>
-<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" class="main" style="height: 100% !important; width: 100% !important; min-width: 100%; -webkit-text-size-adjust: none; -ms-text-size-adjust: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; margin: 0 auto; padding: 0;" bgcolor="#2e2e2e">
+<!-- Psiphon change - change bgcolor to a light theme color -->
+<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" class="main" style="height: 100% !important; width: 100% !important; min-width: 100%; -webkit-text-size-adjust: none; -ms-text-size-adjust: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; margin: 0 auto; padding: 0;" bgcolor="#f7f8fa">
 
-	<table class="body" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; height: 100%; width: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" bgcolor="#2e2e2e">
+	<!-- Psiphon change - change bgcolor to a light theme color -->
+  <table class="body" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; height: 100%; width: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" bgcolor="#f7f8fa">
 		<tr style="vertical-align: top; padding: 0;" align="left">
 			<td class="center" align="center" valign="top" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;">
         <center style="width: 100%; min-width: 580px;">
@@ -184,7 +186,8 @@
 						            <table class="twelve columns" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 580px; margin: 0 auto; padding: 0;">
 						              <tr style="vertical-align: top; padding: 0;" align="left">
 						                <td class="twelve sub-columns center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; min-width: 0px; width: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 10px 10px 0px;" align="center" valign="top">
-                              <img class="logo" src="https://grafana.com/static/assets/img/logo_new_transparent_200x48.png" style="width: 200px; display: inline; outline: none !important; text-decoration: none !important; -ms-interpolation-mode: bicubic; clear: both; border-width: 0;" align="none" />
+                              <!-- Psiphon change - change logo image to the PDE logo and change width of logo to be 300px -->
+                              <img class="logo" src="https://psix.ca/public/img/pde_icon.png" style="width: 300px; display: inline; outline: none !important; text-decoration: none !important; -ms-interpolation-mode: bicubic; clear: both; border-width: 0;" align="none" />
                             </td>
                             <td class="expander" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; visibility: hidden; width: 0px; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0;" align="left" valign="top"></td>
                           </tr>
@@ -201,7 +204,8 @@
 
 					<table class="container" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: inherit; width: 580px; margin: 0 auto; padding: 0;" width="600" bgcolor="#efefef">
 						<tr style="vertical-align: top; padding: 0;" align="left">
-							<td height="2" class="spacer mb-shorten" style="font-size: 0; line-height: 0; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-image: linear-gradient(to right, #ffed00 0%, #f26529 75%); height: 2px !important; word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0; border-width: 0;" valign="top" align="left"> </td>
+							<!-- Psiphon change - change accent color from Grafan gradient to Psiphon orange -->
+              <td height="2" class="spacer mb-shorten" style="font-size: 0; line-height: 0; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ff7941; height: 2px !important; word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0; border-width: 0;" valign="top" align="left"> </td>
 						</tr>
 						<tr style="vertical-align: top; padding: 0;" align="left">
 							<td class="mini-centered-text" style="color: #343b41; mso-table-lspace: 0pt; mso-table-rspace: 0pt; word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 25px 35px; font: 400 16px/27px 'Helvetica Neue', Helvetica, Arial, sans-serif;" align="center" valign="top">
@@ -316,21 +320,15 @@ <h5 class="data" style="color: #222222; font-family: 'Open Sans', 'Helvetica Neu
           <td class="center six" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; width: 50%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 0px 10px;" align="center" valign="top">
             <table class="better-button" align="center" border="0" cellspacing="0" cellpadding="0" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; margin-top: 10px; margin-bottom: 20px; padding: 0;">
               <tr style="vertical-align: top; padding: 0;" align="left">
-                <td align="center" class="better-button" bgcolor="#ff8f2b" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; margin: 0; padding: 0px;" valign="top">
-                  <a rel="noopener noreferrer" href="{{.RuleUrl}}" target="_blank" style="color: #FFF; text-decoration: none; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; display: inline-block; padding: 12px 25px; border: 1px solid #ff8f2b;">View your Alert rule</a>
+                <!-- Psiphon change - change bgcolor to a light theme color -->
+                <td align="center" class="better-button" bgcolor="#ff7941" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; margin: 0; padding: 0px;" valign="top">
+                  <!-- Psiphon change - change color to Psiphon orange and change wording of action link -->
+                  <a rel="noopener noreferrer" href="{{.RuleUrl}}" target="_blank" style="color: #FFF; text-decoration: none; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; display: inline-block; padding: 12px 25px; border: 1px solid #ff7941;">Check your Dashboards</a>
                 </td>
               </tr>
             </table>
             </td>
-            <td class="center six" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; width: 50%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 0px 10px;" align="center" valign="top">
-            <table class="better-button" align="center" border="0" cellspacing="0" cellpadding="0" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; margin-top: 10px; margin-bottom: 20px; padding: 0;">
-              <tr style="vertical-align: top; padding: 0;" align="left">
-                <td align="center" class="better-button-alt" bgcolor="#efefef" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; margin: 0; padding: 0px;" valign="top">
-                  <a rel="noopener noreferrer" href="{{.AlertPageUrl}}" target="_blank" style="color: #ff8f2b; text-decoration: none; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; display: inline-block; background-color: #EFEFEF; padding: 12px 25px; border: 1px solid #ff8f2b;"> Go to the Alerts page</a>
-                </td>
-              </tr>
-            </table>
-          </td>
+            <!-- Psiphon change - remove "Go to the Alerts page link"-->
         </tr>
       </table>
     </td>
@@ -339,12 +337,13 @@ <h5 class="data" style="color: #222222; font-family: 'Open Sans', 'Helvetica Neu
 
 
 
-								
+
 							</td>
 						</tr>
 					</table>
-					
-					<table class="footer center" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: center; color: #999999; width: 100%; margin: 0 auto; padding: 0;" bgcolor="#2e2e2e">
+
+					<!-- Psiphon change - change bgcolor to match light theme -->
+          <table class="footer center" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: center; color: #999999; width: 100%; margin: 0 auto; padding: 0;" bgcolor="#f7f8fa">
 						<tr style="vertical-align: top; padding: 0;" align="left">
 							<td class="wrapper last" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; position: relative; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 10px 20px 0px 0px;" align="left" valign="top">
 								<table class="twelve columns center" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: center; width: 580px; margin: 0 auto; padding: 0;">
@@ -352,8 +351,9 @@ <h5 class="data" style="color: #222222; font-family: 'Open Sans', 'Helvetica Neu
 										<td class="twelve" align="center" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; width: 100%; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 0px 0px 10px;" valign="top">
 											<center style="width: 100%; min-width: 580px;">
 												<p style="font-size: 12px; color: #999999; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0 0 10px; padding: 0;" align="center">
-													Sent by <a href="{{.AppUrl}}" style="color: #E67612; text-decoration: none;">Grafana v{{.BuildVersion}}</a>
-													<br />© 2022 Grafana Labs
+													<!-- Psiphon change - footer has Psiphon content and branding -->
+                          Sent by <a href="https://psix.ca" style="color: #ff7941; text-decoration: none;">PDE v{{.BuildVersion}}</a>
+													<br />© {{ now | date "2006" }} Psiphon Inc.
 												</p>
 											</center>
 										</td>
diff --git a/public/emails/alert_notification.txt b/public/emails/alert_notification.txt
index bd2942b356f0c..d2704449bef82 100644
--- a/public/emails/alert_notification.txt
+++ b/public/emails/alert_notification.txt
@@ -19,11 +19,7 @@ Value:
 {{end}}
 {{end}}
 
-View your Alert rule:
+Check your Dashboards:
 {{.RuleUrl}}"
 
-Go to the Alerts page:
-{{.AlertPageUrl}}
-
-
-Sent by Grafana v{{.BuildVersion}} (c) {{now | date "2006"}} Grafana Labs
+Sent by PDE v{{.BuildVersion}} (c)  {{now | date "2006"}} Psiphon Inc.
diff --git a/public/emails/alert_notification_example.html b/public/emails/alert_notification_example.html
index 34c0c34ab05aa..1a3ed71c80046 100644
--- a/public/emails/alert_notification_example.html
+++ b/public/emails/alert_notification_example.html
@@ -218,7 +218,7 @@
 			<table class="twelve columns" style="border-collapse: collapse; border-spacing: 0; margin: 0 auto; padding: 0; text-align: left; vertical-align: top; width: 580px;">
 				<tr style="padding: 0; vertical-align: top;" align="left">
 					<td class="center" style="-moz-hyphens: auto; -webkit-font-smoothing: antialiased; -webkit-hyphens: auto; -webkit-text-size-adjust: none; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; hyphens: auto; line-height: 19px; margin: 0; padding: 0px 0px 10px; word-break: break-word;" align="center" valign="top">
-						<h3 style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; /*text-align: center*/; color: #D63232; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 22px; font-style: italic; font-weight: bold; line-height: 1.3; margin: 20px 0 0; padding: 0; word-break: normal;" align="left"><img src="http://play.grafana.org/img/critical.svg" style="-ms-interpolation-mode: bicubic; border: 0; clear: both; display: block; margin-right: 10px; outline: none !important; text-decoration: none !important; width: 40px;" align="left" /> [CRITICAL] Imaginary timeseries alert</h3>
+						<h3 style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; /*text-align: center*/; color: #D63232; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 22px; font-style: italic; font-weight: bold; line-height: 1.3; margin: 20px 0 0; padding: 0; word-break: normal;" align="left"><img src="http://play.grafana.org/public/img/critical.svg" style="-ms-interpolation-mode: bicubic; border: 0; clear: both; display: block; margin-right: 10px; outline: none !important; text-decoration: none !important; width: 40px;" align="left" /> [CRITICAL] Imaginary timeseries alert</h3>
 					</td>
 				</tr>
 			</table>
diff --git a/public/emails/invited_to_org.html b/public/emails/invited_to_org.html
index 504a5c84ea85a..a528e4ddc3a7a 100644
--- a/public/emails/invited_to_org.html
+++ b/public/emails/invited_to_org.html
@@ -1,10 +1,8 @@
 <!doctype html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
+<html lang="und" dir="auto" xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
 
 <head>
-  <title>
-    {{ Subject .Subject .TemplateData "{{ .InvitedBy }} has added you to the {{ .OrgName }} organization" }}
-  </title>
+  <title>{{ Subject .Subject .TemplateData "{{ .InvitedBy }} has added you to the {{ .OrgName }} organization" }}</title>
   {{ __dangerouslyInjectHTML `<!--[if !mso]><!-->` }}
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   {{ __dangerouslyInjectHTML `<!--<![endif]-->` }}
@@ -83,7 +81,7 @@
 
   </style>
   <style type="text/css">
-    @media only screen and (max-width:480px) {
+    @media only screen and (max-width:479px) {
       table.mj-full-width-mobile {
         width: 100% !important;
       }
@@ -94,12 +92,10 @@
     }
 
   </style>
-  <style type="text/css">
-  </style>
 </head>
 
 <body style="word-spacing:normal;">
-  <div class="canvas" style="background-color: #fff;">
+  <div class="canvas" style="background-color: #fff;" lang="und" dir="auto">
     {{ __dangerouslyInjectHTML `<!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->` }}
     <div style="margin:0px auto;max-width:600px;">
       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
@@ -115,8 +111,8 @@
                         <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
                           <tbody>
                             <tr>
-                              <td style="width:200px;">
-                                <img height="auto" src="https://grafana.com/static/assets/img/logo_new_transparent_light_400x100.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="200">
+                              <td style="width:300px;">
+                                <img alt src="https://psix.ca/public/img/pde_icon.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="300" height="auto">
                               </td>
                             </tr>
                           </tbody>
@@ -146,7 +142,8 @@
                       <td align="left" class="txt" style="font-size:0px;padding:10px 25px;word-break:break-word;">
                         <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: left; color: #000000;">
                           <h2>You have been added to {{ .OrgName }}</h2>
-                          <strong>{{ .InvitedBy }}</strong> has added you to the <strong>{{ .OrgName }}</strong> organization in Grafana.
+                          {{ __dangerouslyInjectHTML `<!-- Psiphon change - change organization information -->` }}
+                          <strong>{{ .InvitedBy }}</strong> has added you to the <strong>{{ .OrgName }}</strong> organization.
                         </div>
                       </td>
                     </tr>
@@ -161,12 +158,13 @@ <h2>You have been added to {{ .OrgName }}</h2>
                       </td>
                     </tr>
                     <tr>
-                      <td align="center" vertical-align="middle" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
                         <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
                           <tbody>
                             <tr>
                               <td align="center" bgcolor="#3D71D9" role="presentation" style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:10px 25px;background:#3D71D9;" valign="middle">
-                                <a href="{{ .AppUrl }}" rel="noopener" style="display: inline-block; background: #3D71D9; color: #ffffff; font-family: Inter, Helvetica, Arial; font-size: 13px; font-weight: normal; line-height: 120%; margin: 0; text-decoration: none; text-transform: none; padding: 10px 25px; mso-padding-alt: 0px; border-radius: 3px;" target="_blank"> Login to Grafana </a>
+                                <a href="{{ .AppUrl }}" rel="noopener" style="display: inline-block; background: #3D71D9; color: #ffffff; font-family: Inter, Helvetica, Arial; font-size: 13px; font-weight: normal; line-height: 120%; margin: 0; text-decoration: none; text-transform: none; padding: 10px 25px; mso-padding-alt: 0px; border-radius: 3px;" target="_blank">
+                                  {{ __dangerouslyInjectHTML `<!-- Psiphon change - change organization information -->` }} Login </a>
                               </td>
                             </tr>
                           </tbody>
@@ -204,7 +202,7 @@ <h2>You have been added to {{ .OrgName }}</h2>
                   <tbody>
                     <tr>
                       <td align="center" class="txt" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                        <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: center; color: #000000;">&copy; {{ now | date "2006" }} Grafana Labs. Sent by <a href="{{ .AppUrl }}" style="color: #6E9FFF;">Grafana v{{ .BuildVersion }}</a>.</div>
+                        <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: center; color: #000000;">{{ __dangerouslyInjectHTML `<!-- Psiphon change - replace footer info with Psiphon footer info -->` }} &copy; {{ now | date "2006" }} Psiphon Inc. Sent by <a href="https://psix.ca" style="color: #6E9FFF;">PDE v{{ .BuildVersion }}</a>.</div>
                       </td>
                     </tr>
                   </tbody>
diff --git a/public/emails/invited_to_org.txt b/public/emails/invited_to_org.txt
index c0dd496f6f9bb..b714b4922fd58 100644
--- a/public/emails/invited_to_org.txt
+++ b/public/emails/invited_to_org.txt
@@ -2,11 +2,10 @@
 
 You have been added to {{.OrgName}}
 
-{{.InvitedBy}} has added you to the {{.OrgName}} organization in Grafana.
+{{.InvitedBy}} has added you to the {{.OrgName}} organization.
 Once logged in, {{.OrgName}} will be available in the left side menu, in the dropdown below your username.
 
 Log in now:
 {{.AppUrl}}
 
-
-Sent by Grafana v{{.BuildVersion}} (c) {{now | date "2006"}} Grafana Labs
+Sent by PDE v{{.BuildVersion}} (c) {{now | date "2006"}} Psiphon Inc.
diff --git a/public/emails/new_user_invite.html b/public/emails/new_user_invite.html
index c43ade4bf9846..bc5830a483fe8 100644
--- a/public/emails/new_user_invite.html
+++ b/public/emails/new_user_invite.html
@@ -1,9 +1,9 @@
 <!doctype html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
+<html lang="und" dir="auto" xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
 
 <head>
-  <title>
-    {{ Subject .Subject .TemplateData "{{ .InvitedBy }} has invited you to join Grafana" }}
+  <title>{{ __dangerouslyInjectHTML `<!-- Psiphon change - change organization name information in email subject -->` }}
+    {{ Subject .Subject .TemplateData "{{ .InvitedBy }} has invited you to join the Psiphon Data Engine" }}
   </title>
   {{ __dangerouslyInjectHTML `<!--[if !mso]><!-->` }}
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -83,7 +83,7 @@
 
   </style>
   <style type="text/css">
-    @media only screen and (max-width:480px) {
+    @media only screen and (max-width:479px) {
       table.mj-full-width-mobile {
         width: 100% !important;
       }
@@ -94,12 +94,10 @@
     }
 
   </style>
-  <style type="text/css">
-  </style>
 </head>
 
 <body style="word-spacing:normal;">
-  <div class="canvas" style="background-color: #fff;">
+  <div class="canvas" style="background-color: #fff;" lang="und" dir="auto">
     {{ __dangerouslyInjectHTML `<!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->` }}
     <div style="margin:0px auto;max-width:600px;">
       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
@@ -115,8 +113,8 @@
                         <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
                           <tbody>
                             <tr>
-                              <td style="width:200px;">
-                                <img height="auto" src="https://grafana.com/static/assets/img/logo_new_transparent_light_400x100.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="200">
+                              <td style="width:300px;">
+                                <img alt src="https://psix.ca/public/img/pde_icon.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="300" height="auto">
                               </td>
                             </tr>
                           </tbody>
@@ -155,7 +153,7 @@ <h2>You're invited to join {{ .OrgName }}</h2>
                       </td>
                     </tr>
                     <tr>
-                      <td align="center" vertical-align="middle" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
                         <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
                           <tbody>
                             <tr>
@@ -198,7 +196,7 @@ <h2>You're invited to join {{ .OrgName }}</h2>
                   <tbody>
                     <tr>
                       <td align="center" class="txt" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                        <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: center; color: #000000;">&copy; {{ now | date "2006" }} Grafana Labs. Sent by <a href="{{ .AppUrl }}" style="color: #6E9FFF;">Grafana v{{ .BuildVersion }}</a>.</div>
+                        <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: center; color: #000000;">{{ __dangerouslyInjectHTML `<!-- Psiphon change - replace footer info with Psiphon footer info -->` }} &copy; {{ now | date "2006" }} Psiphon Inc. Sent by <a href="https://psix.ca" style="color: #6E9FFF;">PDE v{{ .BuildVersion }}</a>.</div>
                       </td>
                     </tr>
                   </tbody>
diff --git a/public/emails/new_user_invite.txt b/public/emails/new_user_invite.txt
index ba52605d4321d..542f7a7091bf1 100644
--- a/public/emails/new_user_invite.txt
+++ b/public/emails/new_user_invite.txt
@@ -1,9 +1,8 @@
-{{HiddenSubject .Subject "{{.InvitedBy}} has invited you to join Grafana"}}
+{{HiddenSubject .Subject "{{.InvitedBy}} has invited you to join the Psiphon Data Engine"}}
 
 You're invited to join {{.OrgName}}
 
 You've been invited to join the {{.OrgName}} organization by {{.InvitedBy}}. To accept your invitation and join the team, copy and paste the link below into your browser directly:
 
 {{.LinkUrl}}
-
-Sent by Grafana v{{.BuildVersion}} (c) {{now | date "2006"}} Grafana Labs
+Sent by PDE v{{.BuildVersion}} (c) {{now | date "2006"}} Psiphon Inc.
diff --git a/public/emails/ng_alert_notification.html b/public/emails/ng_alert_notification.html
index 43fabdb678778..af8c7dce7b30b 100644
--- a/public/emails/ng_alert_notification.html
+++ b/public/emails/ng_alert_notification.html
@@ -1,10 +1,8 @@
 <!doctype html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
+<html lang="und" dir="auto" xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
 
 <head>
-  <title>
-    {{ Subject .Subject .TemplateData "{{ .Title }}" }}
-  </title>
+  <title>{{ Subject .Subject .TemplateData "{{ .Title }}" }}</title>
   {{ __dangerouslyInjectHTML `<!--[if !mso]><!-->` }}
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   {{ __dangerouslyInjectHTML `<!--<![endif]-->` }}
@@ -103,7 +101,7 @@
 
   </style>
   <style type="text/css">
-    @media only screen and (max-width:480px) {
+    @media only screen and (max-width:479px) {
       table.mj-full-width-mobile {
         width: 100% !important;
       }
@@ -113,16 +111,13 @@
       }
     }
 
-  </style>
-  <style type="text/css">
   </style>
   {{ $numberOfFiringInstance := (len .Alerts.Firing) }}
   {{ $numberOfResolvedAlerts := (len .Alerts.Resolved) }}
 </head>
 
 <body style="word-spacing:normal;">
-  <div style="display:none;font-size:1px;color:#ffffff;line-height:1px;max-height:0px;max-width:0px;opacity:0;overflow:hidden;">
-    <mj-raw>
+  <div style="display:none;font-size:1px;color:#ffffff;line-height:1px;max-height:0px;max-width:0px;opacity:0;overflow:hidden;"><mj-raw>
       {{ if $numberOfFiringInstance }}
     </mj-raw>
     <strong>{{ $numberOfFiringInstance }} firing</strong> alert {{ $numberOfFiringInstance| plural "instance" "instances" }}
@@ -142,7 +137,7 @@
       {{ end }}
     </mj-raw>
   </div>
-  <div class="canvas" style="background-color: #fff;">
+  <div class="canvas" style="background-color: #fff;" lang="und" dir="auto">
     {{ __dangerouslyInjectHTML `<!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->` }}
     <div style="margin:0px auto;max-width:600px;">
       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
@@ -158,8 +153,8 @@
                         <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
                           <tbody>
                             <tr>
-                              <td style="width:200px;">
-                                <img height="auto" src="https://grafana.com/static/assets/img/logo_new_transparent_light_400x100.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="200">
+                              <td style="width:300px;">
+                                <img alt src="https://psix.ca/public/img/pde_icon.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="300" height="auto">
                               </td>
                             </tr>
                           </tbody>
@@ -238,8 +233,7 @@ <h2> 📁 Grouped by&nbsp; </h2>
                             <tbody>
                               <tr>
                                 <td align="left" class="txt" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                  <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: left; color: #000000;">
-                                    <mj-raw>
+                                  <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: left; color: #000000;"><mj-raw>
                                       {{ range $line := (splitList "\n" .Message) }}
                                     </mj-raw>
                                     {{ $line }}<br>
@@ -311,7 +305,7 @@ <h3>🔥 {{ .Alerts.Firing | len }} firing instances</h3>
                           <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:middle;" width="100%">
                             <tbody>
                               <tr>
-                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0;word-break:break-word;">
+                                <td align="center" style="font-size:0px;padding:0;word-break:break-word;">
                                   <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
                                     <tbody>
                                       <tr>
@@ -345,7 +339,7 @@ <h3>🔥 {{ .Alerts.Firing | len }} firing instances</h3>
                           <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:middle;" width="100%">
                             <tbody>
                               <tr>
-                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0;word-break:break-word;">
+                                <td align="center" style="font-size:0px;padding:0;word-break:break-word;">
                                   <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
                                     <tbody>
                                       <tr>
@@ -387,7 +381,7 @@ <h3>🔥 {{ .Alerts.Firing | len }} firing instances</h3>
                                       <tr>
                                         <td style="width:600px;">
                                           <a href="{{ .ImageURL }}" target="_blank" style="color: #6E9FFF;">
-                                            <img height="auto" src="{{ .ImageURL }}" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="600">
+                                            <img alt src="{{ .ImageURL }}" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="600" height="auto">
                                           </a>
                                         </td>
                                       </tr>
@@ -422,7 +416,7 @@ <h3>🔥 {{ .Alerts.Firing | len }} firing instances</h3>
                                     <tbody>
                                       <tr>
                                         <td style="width:600px;">
-                                          <img height="auto" src="cid:{{ .EmbeddedImage }}" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="600">
+                                          <img alt src="cid:{{ .EmbeddedImage }}" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="600" height="auto">
                                         </td>
                                       </tr>
                                     </tbody>
@@ -469,8 +463,7 @@ <h3>🔥 {{ .Alerts.Firing | len }} firing instances</h3>
                               </tr>
                               <tr>
                                 <td align="left" class="txt" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                  <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: left; color: #000000;">
-                                    <mj-raw>{{ range $line := (splitList "\n" .Annotations.description) }}</mj-raw>
+                                  <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: left; color: #000000;"><mj-raw>{{ range $line := (splitList "\n" .Annotations.description) }}</mj-raw>
                                     {{ $line }}<br>
                                     <mj-raw>{{ end }}</mj-raw>
                                   </div>
@@ -528,8 +521,7 @@ <h3>🔥 {{ .Alerts.Firing | len }} firing instances</h3>
                                     <tbody>
                                       <tr>
                                         <td align="left" class="txt" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                          <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: left; color: #000000;">
-                                            <mj-raw>{{ range $refID, $value := .Values }}</mj-raw>
+                                          <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: left; color: #000000;"><mj-raw>{{ range $refID, $value := .Values }}</mj-raw>
                                             {{ $refID }}={{ $value }}&nbsp; <mj-raw>{{ end }}</mj-raw>
                                           </div>
                                         </td>
@@ -624,7 +616,7 @@ <h3>🔥 {{ .Alerts.Firing | len }} firing instances</h3>
                           <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                             <tbody>
                               <tr>
-                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0;word-break:break-word;">
+                                <td align="center" style="font-size:0px;padding:0;word-break:break-word;">
                                   <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
                                     <tbody>
                                       <tr>
@@ -646,7 +638,7 @@ <h3>🔥 {{ .Alerts.Firing | len }} firing instances</h3>
                           <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                             <tbody>
                               <tr>
-                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0;word-break:break-word;">
+                                <td align="center" style="font-size:0px;padding:0;word-break:break-word;">
                                   <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
                                     <tbody>
                                       <tr>
@@ -668,7 +660,7 @@ <h3>🔥 {{ .Alerts.Firing | len }} firing instances</h3>
                           <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                             <tbody>
                               <tr>
-                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0;word-break:break-word;">
+                                <td align="center" style="font-size:0px;padding:0;word-break:break-word;">
                                   <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
                                     <tbody>
                                       <tr>
@@ -690,7 +682,7 @@ <h3>🔥 {{ .Alerts.Firing | len }} firing instances</h3>
                           <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                             <tbody>
                               <tr>
-                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0;word-break:break-word;">
+                                <td align="center" style="font-size:0px;padding:0;word-break:break-word;">
                                   <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
                                     <tbody>
                                       <tr>
@@ -802,7 +794,7 @@ <h3>✅ {{ .Alerts.Resolved | len }} resolved instances</h3>
                           <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:middle;" width="100%">
                             <tbody>
                               <tr>
-                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0;word-break:break-word;">
+                                <td align="center" style="font-size:0px;padding:0;word-break:break-word;">
                                   <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
                                     <tbody>
                                       <tr>
@@ -836,7 +828,7 @@ <h3>✅ {{ .Alerts.Resolved | len }} resolved instances</h3>
                           <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:middle;" width="100%">
                             <tbody>
                               <tr>
-                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0;word-break:break-word;">
+                                <td align="center" style="font-size:0px;padding:0;word-break:break-word;">
                                   <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
                                     <tbody>
                                       <tr>
@@ -878,7 +870,7 @@ <h3>✅ {{ .Alerts.Resolved | len }} resolved instances</h3>
                                       <tr>
                                         <td style="width:600px;">
                                           <a href="{{ .ImageURL }}" target="_blank" style="color: #6E9FFF;">
-                                            <img height="auto" src="{{ .ImageURL }}" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="600">
+                                            <img alt src="{{ .ImageURL }}" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="600" height="auto">
                                           </a>
                                         </td>
                                       </tr>
@@ -913,7 +905,7 @@ <h3>✅ {{ .Alerts.Resolved | len }} resolved instances</h3>
                                     <tbody>
                                       <tr>
                                         <td style="width:600px;">
-                                          <img height="auto" src="cid:{{ .EmbeddedImage }}" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="600">
+                                          <img alt src="cid:{{ .EmbeddedImage }}" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="600" height="auto">
                                         </td>
                                       </tr>
                                     </tbody>
@@ -960,8 +952,7 @@ <h3>✅ {{ .Alerts.Resolved | len }} resolved instances</h3>
                               </tr>
                               <tr>
                                 <td align="left" class="txt" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                  <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: left; color: #000000;">
-                                    <mj-raw>{{ range $line := (splitList "\n" .Annotations.description) }}</mj-raw>
+                                  <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: left; color: #000000;"><mj-raw>{{ range $line := (splitList "\n" .Annotations.description) }}</mj-raw>
                                     {{ $line }}<br>
                                     <mj-raw>{{ end }}</mj-raw>
                                   </div>
@@ -1019,8 +1010,7 @@ <h3>✅ {{ .Alerts.Resolved | len }} resolved instances</h3>
                                     <tbody>
                                       <tr>
                                         <td align="left" class="txt" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                          <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: left; color: #000000;">
-                                            <mj-raw>{{ range $refID, $value := .Values }}</mj-raw>
+                                          <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: left; color: #000000;"><mj-raw>{{ range $refID, $value := .Values }}</mj-raw>
                                             {{ $refID }}={{ $value }}&nbsp; <mj-raw>{{ end }}</mj-raw>
                                           </div>
                                         </td>
@@ -1115,7 +1105,7 @@ <h3>✅ {{ .Alerts.Resolved | len }} resolved instances</h3>
                           <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                             <tbody>
                               <tr>
-                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0;word-break:break-word;">
+                                <td align="center" style="font-size:0px;padding:0;word-break:break-word;">
                                   <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
                                     <tbody>
                                       <tr>
@@ -1137,7 +1127,7 @@ <h3>✅ {{ .Alerts.Resolved | len }} resolved instances</h3>
                           <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                             <tbody>
                               <tr>
-                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0;word-break:break-word;">
+                                <td align="center" style="font-size:0px;padding:0;word-break:break-word;">
                                   <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
                                     <tbody>
                                       <tr>
@@ -1159,7 +1149,7 @@ <h3>✅ {{ .Alerts.Resolved | len }} resolved instances</h3>
                           <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                             <tbody>
                               <tr>
-                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0;word-break:break-word;">
+                                <td align="center" style="font-size:0px;padding:0;word-break:break-word;">
                                   <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
                                     <tbody>
                                       <tr>
@@ -1181,7 +1171,7 @@ <h3>✅ {{ .Alerts.Resolved | len }} resolved instances</h3>
                           <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                             <tbody>
                               <tr>
-                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0;word-break:break-word;">
+                                <td align="center" style="font-size:0px;padding:0;word-break:break-word;">
                                   <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
                                     <tbody>
                                       <tr>
@@ -1260,7 +1250,7 @@ <h3>✅ {{ .Alerts.Resolved | len }} resolved instances</h3>
                   <tbody>
                     <tr>
                       <td align="center" class="txt" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                        <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: center; color: #000000;">&copy; {{ now | date "2006" }} Grafana Labs. Sent by <a href="{{ .AppUrl }}" style="color: #6E9FFF;">Grafana v{{ .BuildVersion }}</a>.</div>
+                        <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: center; color: #000000;">{{ __dangerouslyInjectHTML `<!-- Psiphon change - replace footer info with Psiphon footer info -->` }} &copy; {{ now | date "2006" }} Psiphon Inc. Sent by <a href="https://psix.ca" style="color: #6E9FFF;">PDE v{{ .BuildVersion }}</a>.</div>
                       </td>
                     </tr>
                   </tbody>
diff --git a/public/emails/ng_alert_notification.txt b/public/emails/ng_alert_notification.txt
index 357a6a1ff4cbf..bfc3757c9a5e6 100644
--- a/public/emails/ng_alert_notification.txt
+++ b/public/emails/ng_alert_notification.txt
@@ -12,7 +12,6 @@ You have {{ len .Alerts.Firing }} firing alert(s), and {{ len .Alerts.Resolved }
 -------------
 {{ template "__default_alerts_summarize" .Alerts.Resolved }}
 {{- end }}
-Go to the Alerts page: {{ .AlertPageUrl }}
 {{- end -}}
 
 {{- define "__default_alerts_summarize" -}}
@@ -62,5 +61,4 @@ Annotations: {{ template "__default_sorted_pairs" $annotations }}
     {{ template "__default_message" . }}
 {{- end }}
 
-
-Sent by Grafana v{{.BuildVersion}} (c) {{now | date "2006"}} Grafana Labs
+Sent by PDE v{{.BuildVersion}} (c) {{now | date "2006"}} Psiphon Inc.
diff --git a/public/emails/reset_password.html b/public/emails/reset_password.html
index 6133b5c59faa5..5ff4d2b149643 100644
--- a/public/emails/reset_password.html
+++ b/public/emails/reset_password.html
@@ -1,9 +1,9 @@
 <!doctype html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
+<html lang="und" dir="auto" xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
 
 <head>
-  <title>
-    {{ Subject .Subject .TemplateData "Reset your Grafana password - {{.Name}}" }}
+  <title>{{ __dangerouslyInjectHTML `<!-- Psiphon change - remove organization name in email subject line -->` }}
+    {{ Subject .Subject .TemplateData "Reset your password - {{.Name}}" }}
   </title>
   {{ __dangerouslyInjectHTML `<!--[if !mso]><!-->` }}
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -83,7 +83,7 @@
 
   </style>
   <style type="text/css">
-    @media only screen and (max-width:480px) {
+    @media only screen and (max-width:479px) {
       table.mj-full-width-mobile {
         width: 100% !important;
       }
@@ -94,12 +94,10 @@
     }
 
   </style>
-  <style type="text/css">
-  </style>
 </head>
 
 <body style="word-spacing:normal;">
-  <div class="canvas" style="background-color: #fff;">
+  <div class="canvas" style="background-color: #fff;" lang="und" dir="auto">
     {{ __dangerouslyInjectHTML `<!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->` }}
     <div style="margin:0px auto;max-width:600px;">
       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
@@ -115,8 +113,8 @@
                         <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
                           <tbody>
                             <tr>
-                              <td style="width:200px;">
-                                <img height="auto" src="https://grafana.com/static/assets/img/logo_new_transparent_light_400x100.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="200">
+                              <td style="width:300px;">
+                                <img alt src="https://psix.ca/public/img/pde_icon.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="300" height="auto">
                               </td>
                             </tr>
                           </tbody>
@@ -155,7 +153,7 @@ <h2>Hi {{ .Name }},</h2>
                       </td>
                     </tr>
                     <tr>
-                      <td align="center" vertical-align="middle" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
                         <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
                           <tbody>
                             <tr>
@@ -198,7 +196,7 @@ <h2>Hi {{ .Name }},</h2>
                   <tbody>
                     <tr>
                       <td align="center" class="txt" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                        <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: center; color: #000000;">&copy; {{ now | date "2006" }} Grafana Labs. Sent by <a href="{{ .AppUrl }}" style="color: #6E9FFF;">Grafana v{{ .BuildVersion }}</a>.</div>
+                        <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: center; color: #000000;">{{ __dangerouslyInjectHTML `<!-- Psiphon change - replace footer info with Psiphon footer info -->` }} &copy; {{ now | date "2006" }} Psiphon Inc. Sent by <a href="https://psix.ca" style="color: #6E9FFF;">PDE v{{ .BuildVersion }}</a>.</div>
                       </td>
                     </tr>
                   </tbody>
diff --git a/public/emails/reset_password.txt b/public/emails/reset_password.txt
index b8bf248c1a578..4943218b73592 100644
--- a/public/emails/reset_password.txt
+++ b/public/emails/reset_password.txt
@@ -1,9 +1,8 @@
-{{HiddenSubject .Subject "Reset your Grafana password - {{.Name}}"}}
+{{HiddenSubject .Subject "Reset your password - {{.Name}}"}}
 
 Hi {{.Name}},
 
 Copy and paste the following link directly in your browser to reset your password within {{.EmailCodeValidHours}} hours.
 {{.AppUrl}}user/password/reset?code={{.Code}}
 
-
-Sent by Grafana v{{.BuildVersion}} (c) {{now | date "2006"}} Grafana Labs
+Sent by PDE v{{.BuildVersion}} (c) {{now | date "2006"}} Psiphon Inc.
diff --git a/public/emails/signup_started.html b/public/emails/signup_started.html
index 47363a9f5c545..227eddc5bfb99 100644
--- a/public/emails/signup_started.html
+++ b/public/emails/signup_started.html
@@ -1,9 +1,9 @@
 <!doctype html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
+<html lang="und" dir="auto" xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
 
 <head>
-  <title>
-    {{ Subject .Subject .TemplateData "Welcome to Grafana, please complete your sign up!" }}
+  <title>{{ __dangerouslyInjectHTML `<!-- Psiphon change - change organization name in email subject line -->` }}
+    {{ Subject .Subject .TemplateData "Welcome to the Psiphon Data Engine, please complete your sign up!" }}
   </title>
   {{ __dangerouslyInjectHTML `<!--[if !mso]><!-->` }}
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -83,7 +83,7 @@
 
   </style>
   <style type="text/css">
-    @media only screen and (max-width:480px) {
+    @media only screen and (max-width:479px) {
       table.mj-full-width-mobile {
         width: 100% !important;
       }
@@ -94,12 +94,10 @@
     }
 
   </style>
-  <style type="text/css">
-  </style>
 </head>
 
 <body style="word-spacing:normal;">
-  <div class="canvas" style="background-color: #fff;">
+  <div class="canvas" style="background-color: #fff;" lang="und" dir="auto">
     {{ __dangerouslyInjectHTML `<!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->` }}
     <div style="margin:0px auto;max-width:600px;">
       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
@@ -115,8 +113,8 @@
                         <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
                           <tbody>
                             <tr>
-                              <td style="width:200px;">
-                                <img height="auto" src="https://grafana.com/static/assets/img/logo_new_transparent_light_400x100.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="200">
+                              <td style="width:300px;">
+                                <img alt src="https://psix.ca/public/img/pde_icon.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="300" height="auto">
                               </td>
                             </tr>
                           </tbody>
@@ -204,7 +202,7 @@ <h2>Complete the signup</h2>
                           <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                             <tbody>
                               <tr>
-                                <td align="center" vertical-align="middle" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                                <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
                                   <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
                                     <tbody>
                                       <tr>
@@ -253,7 +251,7 @@ <h2>Complete the signup</h2>
                   <tbody>
                     <tr>
                       <td align="center" class="txt" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                        <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: center; color: #000000;">&copy; {{ now | date "2006" }} Grafana Labs. Sent by <a href="{{ .AppUrl }}" style="color: #6E9FFF;">Grafana v{{ .BuildVersion }}</a>.</div>
+                        <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: center; color: #000000;">{{ __dangerouslyInjectHTML `<!-- Psiphon change - replace footer info with Psiphon footer info -->` }} &copy; {{ now | date "2006" }} Psiphon Inc. Sent by <a href="https://psix.ca" style="color: #6E9FFF;">PDE v{{ .BuildVersion }}</a>.</div>
                       </td>
                     </tr>
                   </tbody>
diff --git a/public/emails/signup_started.txt b/public/emails/signup_started.txt
index d3ef663dcd540..0446a981a1bc2 100644
--- a/public/emails/signup_started.txt
+++ b/public/emails/signup_started.txt
@@ -1,4 +1,4 @@
-{{HiddenSubject .Subject "Welcome to Grafana, please complete your sign up!"}}
+{{HiddenSubject .Subject "Welcome to the Psiphon Data Engine, please complete your sign up!"}}
 
 Complete the signup
 
@@ -8,5 +8,4 @@ in the sign up form or use the link below.
 
 {{.SignUpUrl}}
 
-
-Sent by Grafana v{{.BuildVersion}} (c) {{now | date "2006"}} Grafana Labs
+Sent by PDE v{{.BuildVersion}} (c) {{now | date "2006"}} Psiphon Inc.
diff --git a/public/emails/verify_email.html b/public/emails/verify_email.html
new file mode 100644
index 0000000000000..fadbcc6118e51
--- /dev/null
+++ b/public/emails/verify_email.html
@@ -0,0 +1,213 @@
+<!doctype html>
+<html lang="und" dir="auto" xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
+
+<head>
+  <title>{{ Subject .Subject .TemplateData "Verify your email - {{.Name}}" }}</title>
+  {{ __dangerouslyInjectHTML `<!--[if !mso]><!-->` }}
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  {{ __dangerouslyInjectHTML `<!--<![endif]-->` }}
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <style type="text/css">
+    #outlook a {
+      padding: 0;
+    }
+
+    body {
+      margin: 0;
+      padding: 0;
+      -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+    }
+
+    table,
+    td {
+      border-collapse: collapse;
+      mso-table-lspace: 0pt;
+      mso-table-rspace: 0pt;
+    }
+
+    img {
+      border: 0;
+      height: auto;
+      line-height: 100%;
+      outline: none;
+      text-decoration: none;
+      -ms-interpolation-mode: bicubic;
+    }
+
+    p {
+      display: block;
+      margin: 13px 0;
+    }
+
+  </style>
+  {{ __dangerouslyInjectHTML `<!--[if mso]>
+    <noscript>
+    <xml>
+    <o:OfficeDocumentSettings>
+      <o:AllowPNG/>
+      <o:PixelsPerInch>96</o:PixelsPerInch>
+    </o:OfficeDocumentSettings>
+    </xml>
+    </noscript>
+    <![endif]-->` }}
+  {{ __dangerouslyInjectHTML `<!--[if lte mso 11]>
+    <style type="text/css">
+      .mj-outlook-group-fix { width:100% !important; }
+    </style>
+    <![endif]-->` }}
+  {{ __dangerouslyInjectHTML `<!--[if !mso]><!-->` }}
+  <link href="https://fonts.googleapis.com/css?family=Inter" rel="stylesheet" type="text/css">
+  <style type="text/css">
+    @import url(https://fonts.googleapis.com/css?family=Inter);
+
+  </style>
+  {{ __dangerouslyInjectHTML `<!--<![endif]-->` }}
+  <style type="text/css">
+    @media only screen and (min-width:480px) {
+      .mj-column-per-100 {
+        width: 100% !important;
+        max-width: 100%;
+      }
+    }
+
+  </style>
+  <style media="screen and (min-width:480px)">
+    .moz-text-html .mj-column-per-100 {
+      width: 100% !important;
+      max-width: 100%;
+    }
+
+  </style>
+  <style type="text/css">
+    @media only screen and (max-width:479px) {
+      table.mj-full-width-mobile {
+        width: 100% !important;
+      }
+
+      td.mj-full-width-mobile {
+        width: auto !important;
+      }
+    }
+
+  </style>
+</head>
+
+<body style="word-spacing:normal;">
+  <div class="canvas" style="background-color: #fff;" lang="und" dir="auto">
+    {{ __dangerouslyInjectHTML `<!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->` }}
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+              {{ __dangerouslyInjectHTML `<!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->` }}
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="background-color:transparent;vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="left" style="font-size:0px;padding:0;word-break:break-word;">
+                        <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
+                          <tbody>
+                            <tr>
+                              <td style="width:300px;">
+                                <img alt src="https://psix.ca/public/img/pde_icon.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="300" height="auto">
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              {{ __dangerouslyInjectHTML `<!--[if mso | IE]></td></tr></table><![endif]-->` }}
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    {{ __dangerouslyInjectHTML `<!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="background-outlook" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->` }}
+    <div class="background" style="background-color: #FFF; border: 1px solid #e4e5e6; margin: 0px auto; max-width: 600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+              {{ __dangerouslyInjectHTML `<!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->` }}
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="left" class="txt" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: left; color: #000000;">
+                          <h2>Hi {{ .Name }},</h2>
+                        </div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="left" class="txt" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: left; color: #000000;">Please click the following link to verify your email within <strong>{{ .VerificationEmailLifetimeHours }} hour(s)</strong>.</div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+                          <tbody>
+                            <tr>
+                              <td align="center" bgcolor="#3D71D9" role="presentation" style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:10px 25px;background:#3D71D9;" valign="middle">
+                                <a href="{{ .AppUrl }}user/email/update?code={{ .Code }}" rel="noopener" style="display: inline-block; background: #3D71D9; color: #ffffff; font-family: Inter, Helvetica, Arial; font-size: 13px; font-weight: normal; line-height: 120%; margin: 0; text-decoration: none; text-transform: none; padding: 10px 25px; mso-padding-alt: 0px; border-radius: 3px;" target="_blank"> Verify Email </a>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="left" class="txt" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: left; color: #000000;">You can also copy and paste this link into your browser directly:</div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="left" class="txt" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: left; color: #000000;"><a rel="noopener" href="{{ .AppUrl }}user/email/update?code={{ .Code }}" style="color: #6E9FFF;">{{ .AppUrl }}user/email/update?code={{ .Code }}</a></div>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              {{ __dangerouslyInjectHTML `<!--[if mso | IE]></td></tr></table><![endif]-->` }}
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    {{ __dangerouslyInjectHTML `<!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->` }}
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+              {{ __dangerouslyInjectHTML `<!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->` }}
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="background-color:transparent;vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="center" class="txt" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: center; color: #000000;">{{ __dangerouslyInjectHTML `<!-- Psiphon change - replace footer info with Psiphon footer info -->` }} &copy; {{ now | date "2006" }} Psiphon Inc. Sent by <a href="https://psix.ca" style="color: #6E9FFF;">PDE v{{ .BuildVersion }}</a>.</div>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              {{ __dangerouslyInjectHTML `<!--[if mso | IE]></td></tr></table><![endif]-->` }}
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    {{ __dangerouslyInjectHTML `<!--[if mso | IE]></td></tr></table><![endif]-->` }}
+  </div>
+</body>
+
+</html>
diff --git a/public/emails/verify_email.txt b/public/emails/verify_email.txt
new file mode 100644
index 0000000000000..6c9adb44e5bf9
--- /dev/null
+++ b/public/emails/verify_email.txt
@@ -0,0 +1,8 @@
+{{HiddenSubject .Subject "Verify your email - {{.Name}}"}}
+
+Hi {{.Name}},
+
+Copy and paste the following link directly in your browser to verify your email within {{.VerificationEmailLifetimeHours}} hour(s).
+{{.AppUrl}}user/email/update?code={{.Code}}
+
+Sent by PDE v{{.BuildVersion}} (c) {{now | date "2006"}} Psiphon Inc.
diff --git a/public/emails/welcome_on_signup.html b/public/emails/welcome_on_signup.html
index 34620adaa3ddb..4ee5a33f88317 100644
--- a/public/emails/welcome_on_signup.html
+++ b/public/emails/welcome_on_signup.html
@@ -1,9 +1,9 @@
 <!doctype html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
+<html lang="und" dir="auto" xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
 
 <head>
-  <title>
-    {{ Subject .Subject .TemplateData "Welcome to Grafana" }}
+  <title>{{ __dangerouslyInjectHTML `<!-- Psiphon change - change organization name in email subject line -->` }}
+    {{ Subject .Subject .TemplateData "Welcome to the Psiphon Data Engine" }}
   </title>
   {{ __dangerouslyInjectHTML `<!--[if !mso]><!-->` }}
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -83,7 +83,7 @@
 
   </style>
   <style type="text/css">
-    @media only screen and (max-width:480px) {
+    @media only screen and (max-width:479px) {
       table.mj-full-width-mobile {
         width: 100% !important;
       }
@@ -94,12 +94,10 @@
     }
 
   </style>
-  <style type="text/css">
-  </style>
 </head>
 
 <body style="word-spacing:normal;">
-  <div class="canvas" style="background-color: #fff;">
+  <div class="canvas" style="background-color: #fff;" lang="und" dir="auto">
     {{ __dangerouslyInjectHTML `<!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->` }}
     <div style="margin:0px auto;max-width:600px;">
       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
@@ -115,8 +113,8 @@
                         <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
                           <tbody>
                             <tr>
-                              <td style="width:200px;">
-                                <img height="auto" src="https://grafana.com/static/assets/img/logo_new_transparent_light_400x100.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="200">
+                              <td style="width:300px;">
+                                <img alt src="https://psix.ca/public/img/pde_icon.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="300" height="auto">
                               </td>
                             </tr>
                           </tbody>
@@ -151,35 +149,22 @@ <h2>Hi {{ .Name }},</h2>
                     </tr>
                     <tr>
                       <td align="left" class="txt" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                        <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: left; color: #000000;">Welcome! Ready to start building some beautiful metric and analytic dashboards?</div>
+                        <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: left; color: #000000;">{{ __dangerouslyInjectHTML `<!-- Psiphon change - change welcome message -->` }} Welcome! Ready to explore real-time open network measurements?</div>
                       </td>
                     </tr>
                     <tr>
                       <td align="left" class="txt" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                        <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: left; color: #000000;">If you are new to Grafana, refer to the <a href="https://grafana.com/docs/grafana/latest/getting-started/getting-started/" style="color: #6E9FFF;">Getting started with Grafana</a> guide.</div>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td align="center" vertical-align="middle" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                        <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
-                          <tbody>
-                            <tr>
-                              <td align="center" bgcolor="#3D71D9" role="presentation" style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:10px 25px;background:#3D71D9;" valign="middle">
-                                <a href="https://grafana.com/docs/grafana/latest/getting-started/getting-started/" rel="noopener" style="display: inline-block; background: #3D71D9; color: #ffffff; font-family: Inter, Helvetica, Arial; font-size: 13px; font-weight: normal; line-height: 120%; margin: 0; text-decoration: none; text-transform: none; padding: 10px 25px; mso-padding-alt: 0px; border-radius: 3px;" target="_blank"> Check out our getting started guide </a>
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
+                        <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: left; color: #000000;">{{ __dangerouslyInjectHTML `<!-- Psiphon change - change help message and link -->` }} If you are new to the Psiphon Data Engine and have questions, please read the <a href="https://psix.ca/d/g6Mhku6Zz/faqs" style="color: #6E9FFF;">FAQs</a></div>
                       </td>
                     </tr>
                     <tr>
                       <td align="left" class="txt" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                        <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: left; color: #000000;">Thank you for joining our community.</div>
+                        <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: left; color: #000000;">{{ __dangerouslyInjectHTML `<!-- Psiphon change - change thank you message -->` }} Thank you for joining.</div>
                       </td>
                     </tr>
                     <tr>
                       <td align="left" class="txt" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                        <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: left; color: #000000;">The Grafana Team</div>
+                        <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: left; color: #000000;">Psiphon</div>
                       </td>
                     </tr>
                   </tbody>
@@ -203,7 +188,7 @@ <h2>Hi {{ .Name }},</h2>
                   <tbody>
                     <tr>
                       <td align="center" class="txt" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                        <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: center; color: #000000;">&copy; {{ now | date "2006" }} Grafana Labs. Sent by <a href="{{ .AppUrl }}" style="color: #6E9FFF;">Grafana v{{ .BuildVersion }}</a>.</div>
+                        <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: center; color: #000000;">{{ __dangerouslyInjectHTML `<!-- Psiphon change - replace footer info with Psiphon footer info -->` }} &copy; {{ now | date "2006" }} Psiphon Inc. Sent by <a href="https://psix.ca" style="color: #6E9FFF;">PDE v{{ .BuildVersion }}</a>.</div>
                       </td>
                     </tr>
                   </tbody>
diff --git a/public/emails/welcome_on_signup.txt b/public/emails/welcome_on_signup.txt
index 7cb76f788ddc4..080f36a32a648 100644
--- a/public/emails/welcome_on_signup.txt
+++ b/public/emails/welcome_on_signup.txt
@@ -1,14 +1,13 @@
-{{HiddenSubject .Subject "Welcome to Grafana"}}
+{{HiddenSubject .Subject "Welcome to the Psiphon Data Engine"}}
 
 Hi {{.Name}},
 
-Welcome! Ready to start building some beautiful metric and analytic dashboards?
+Welcome! Ready to explore real-time open network measurements?
 
-If you are new to Grafana, refer to the Getting started with Grafana guide on https://grafana.com/docs/grafana/latest/getting-started/getting-started/.
+If you are new to the Psiphon Data Engine and have questions, please read the FAQs on https://psix.ca/d/g6Mhku6Zz/faqs .
 
-Thank you for joining our community.
+Thank you for joining.
 
-The Grafana team
+Psiphon
 
-
-Sent by Grafana v{{.BuildVersion}} (c) {{now | date "2006"}} Grafana Labs
+Sent by PDE v{{.BuildVersion}} (c) {{now | date "2006"}} Psiphon Inc.
diff --git a/public/fonts/inter/Inter-Medium.woff2 b/public/fonts/inter/Inter-Medium.woff2
new file mode 100644
index 0000000000000..0fd2ee7370b34
Binary files /dev/null and b/public/fonts/inter/Inter-Medium.woff2 differ
diff --git a/public/fonts/inter/Inter-Regular.woff2 b/public/fonts/inter/Inter-Regular.woff2
new file mode 100644
index 0000000000000..b8699af29b021
Binary files /dev/null and b/public/fonts/inter/Inter-Regular.woff2 differ
diff --git a/public/fonts/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa0ZL7SUc.woff2 b/public/fonts/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa0ZL7SUc.woff2
deleted file mode 100644
index 1b018738cf2d1..0000000000000
Binary files a/public/fonts/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa0ZL7SUc.woff2 and /dev/null differ
diff --git a/public/fonts/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1ZL7.woff2 b/public/fonts/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1ZL7.woff2
deleted file mode 100644
index 422a5538da0cd..0000000000000
Binary files a/public/fonts/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1ZL7.woff2 and /dev/null differ
diff --git a/public/fonts/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1pL7SUc.woff2 b/public/fonts/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1pL7SUc.woff2
deleted file mode 100644
index a7f9f92d1aa65..0000000000000
Binary files a/public/fonts/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1pL7SUc.woff2 and /dev/null differ
diff --git a/public/fonts/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa25L7SUc.woff2 b/public/fonts/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa25L7SUc.woff2
deleted file mode 100644
index 7ab936085046d..0000000000000
Binary files a/public/fonts/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa25L7SUc.woff2 and /dev/null differ
diff --git a/public/fonts/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2JL7SUc.woff2 b/public/fonts/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2JL7SUc.woff2
deleted file mode 100644
index 27b06439cadda..0000000000000
Binary files a/public/fonts/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2JL7SUc.woff2 and /dev/null differ
diff --git a/public/fonts/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2ZL7SUc.woff2 b/public/fonts/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2ZL7SUc.woff2
deleted file mode 100644
index 9026d23107761..0000000000000
Binary files a/public/fonts/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2ZL7SUc.woff2 and /dev/null differ
diff --git a/public/fonts/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2pL7SUc.woff2 b/public/fonts/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2pL7SUc.woff2
deleted file mode 100644
index 11afe85d70795..0000000000000
Binary files a/public/fonts/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2pL7SUc.woff2 and /dev/null differ
diff --git a/public/gazetteer/countries.json b/public/gazetteer/countries.json
index 46317bcdf00a6..b2f526385a26b 100644
--- a/public/gazetteer/countries.json
+++ b/public/gazetteer/countries.json
@@ -90,7 +90,7 @@
     "name": "Aruba"
   },
   {
-    "key": "AX",
+    "keys": ["AX", "ALA"],
     "latitude": 60.3385485,
     "longitude": 20.2712585,
     "name": "Åland"
@@ -156,7 +156,7 @@
     "name": "Benin"
   },
   {
-    "key": "BL",
+    "keys": ["BL", "BLM"],
     "latitude": 17.9,
     "longitude": -62.833333,
     "name": "Saint-Barthélemy"
@@ -180,7 +180,7 @@
     "name": "Bolivia"
   },
   {
-    "key": "BQ",
+    "keys": ["BQ", "BES"],
     "latitude": 12.1783611,
     "longitude": -68.2385339,
     "name": "Bonaire, Sint Eustatius, and Saba"
@@ -318,7 +318,7 @@
     "name": "Cape Verde"
   },
   {
-    "key": "CW",
+    "keys": ["CW", "CUW"],
     "latitude": 12.16957,
     "longitude": -68.99002,
     "name": "Curaçao"
@@ -852,7 +852,7 @@
     "name": "Montenegro"
   },
   {
-    "key": "MF",
+    "keys": ["MF", "MAF"],
     "latitude": 18.08255,
     "longitude": -63.052251,
     "name": "Saint Martin"
@@ -1266,7 +1266,7 @@
     "name": "El Salvador"
   },
   {
-    "key": "SX",
+    "keys": ["SX", "SXM"],
     "latitude": 18.030827,
     "longitude": -63.073633,
     "name": "Sint Maarten"
diff --git a/public/img/grafana-psiphon-login.png b/public/img/grafana-psiphon-login.png
new file mode 100644
index 0000000000000..16215e12bc344
Binary files /dev/null and b/public/img/grafana-psiphon-login.png differ
diff --git a/public/img/grot-404-dark.svg b/public/img/grot-404-dark.svg
deleted file mode 100644
index dd6e81f4f0e50..0000000000000
--- a/public/img/grot-404-dark.svg
+++ /dev/null
@@ -1,61 +0,0 @@
-<svg width="722" height="480" viewBox="0 0 722 480" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M514.59 3.80879C447.52 -7.78121 379.51 8.58879 314.8 32.5588C275.1 47.2688 236.85 58.9488 196.11 69.7588C150.35 81.8988 102.13 94.2588 62.7402 123.959C15.7502 159.389 -0.05983 214.349 0.000170029 274.969C0.04017 319.049 7.54023 365.349 33.0602 399.379C71.8302 451.069 139.04 459.809 196.03 455.539C267.53 450.189 313.45 436.549 383.95 458.929C471.35 486.669 580.88 498.339 659.07 416.129C765.14 304.599 726.89 126.169 614.63 45.6788C598.19 33.8888 580.48 24.2188 561.98 16.9888C546.27 10.8488 530.46 6.53878 514.59 3.79878V3.80879Z" fill="#9087E9" fill-opacity="0.3"/>
-<path opacity="0.3" d="M273.041 410.45C346.097 410.45 405.321 403.497 405.321 394.92C405.321 386.343 346.097 379.39 273.041 379.39C199.985 379.39 140.761 386.343 140.761 394.92C140.761 403.497 199.985 410.45 273.041 410.45Z" fill="black"/>
-<path d="M346.921 293.19C358.131 296.32 448.181 322.33 432.881 344.87C418.531 366 348.841 340.92 326.921 325.65" fill="#F99F10"/>
-<path d="M346.921 293.19C358.131 296.32 448.181 322.33 432.881 344.87C418.531 366 348.841 340.92 326.921 325.65" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M218.861 115.04C187.091 92.89 146.441 87.92 139.291 95.87C133.491 102.31 155.401 137.59 151.851 147.9C148.311 158.21 117.231 151.54 113.831 164.65C112.221 170.88 136.061 185.91 135.421 194.61C134.781 203.31 116.371 200.85 115.021 212.11C114.111 219.68 130.911 221.35 130.271 230.37C129.631 239.39 117.501 237.74 118.031 246.48C118.461 253.57 131.721 248.9 135.271 260.82C138.811 272.74 218.871 115.04 218.871 115.04H218.861Z" fill="#EF6122"/>
-<path d="M77.1408 326.59C78.1108 297.43 98.4608 290.96 113.241 295.94C128.011 300.92 127.191 318.09 123.461 324.55C117.501 334.86 108.751 330.41 112.021 323.19C114.441 316.26 114.891 306.64 103.441 309.7C89.2109 313.51 93.6408 351.77 123.601 344.25C144.121 339.1 142.511 317.37 140.881 285.68C136.511 255.02 141.241 214.82 154.281 176.66C180.701 99.34 339.851 74.21 392.681 145.73C461.311 238.63 385.631 329.37 373.991 340.96C337.731 369.1 343.611 394.56 317.631 396.25C292.941 397.86 294.971 372.77 278.641 371.37C277.681 371.37 276.721 371.37 275.761 371.35C256.591 372.76 252.891 396.67 223.981 396.25C200.421 395.91 210.911 375.33 195.171 365.46C191.871 363.9 189.011 362.8 186.371 362.08C184.291 361.64 181.981 361.32 179.371 361.16C178.771 361.12 175.141 361.14 174.081 361.14C164.731 361.31 159.121 363.52 137.991 367.82C99.9208 375.56 76.3208 351.26 77.1408 326.59Z" fill="#FAC20C" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10"/>
-<path d="M181.051 134.78C235.171 96.44 298.161 117.38 306.211 122.7C314.261 128.02 325.671 121.7 319.261 105.73C297.781 52.25 242.361 25.05 227.441 34.26C210.761 44.56 231.741 90.5 220.841 101.27C212.091 109.91 206.131 103.31 191.251 98.32C177.811 93.81 181.051 134.78 181.051 134.78Z" fill="#EF6122"/>
-<path d="M262.101 239.52L410.381 239.52C428.197 239.52 442.641 225.077 442.641 207.26V207.25C442.641 189.433 428.197 174.99 410.381 174.99L262.101 174.99C244.284 174.99 229.841 189.433 229.841 207.25V207.26C229.841 225.077 244.284 239.52 262.101 239.52Z" fill="#5545EF" stroke="#231735" stroke-width="5" stroke-miterlimit="10"/>
-<path d="M296.28 228.67L408.8 228.67C420.619 228.67 430.2 219.089 430.2 207.27C430.2 195.451 420.619 185.87 408.8 185.87H296.28C284.461 185.87 274.88 195.451 274.88 207.27C274.88 219.089 284.461 228.67 296.28 228.67Z" fill="#19052D"/>
-<path d="M257.971 297.31C257.351 316.15 250.621 333.66 236.651 332.47C221.221 331.16 217.391 315.15 217.921 297.76" fill="#F99F10"/>
-<path d="M257.971 297.31C257.351 316.15 250.621 333.66 236.651 332.47C221.221 331.16 217.391 315.15 217.921 297.76" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M200.23 104.32C172.95 91.48 146.34 84.67 139.29 95.87C131.67 107.98 157.65 133.7 151.85 147.9C146.43 161.18 115.82 149.78 113.83 164.65C112.24 176.55 136.06 185.91 135.42 194.61C134.78 203.31 116.14 199.76 114.78 211.03C113.87 218.6 130.91 221.35 130.26 230.37C129.62 239.39 118.02 237.73 118.02 246.48C118.02 253.6 138.81 254.21 139.4 269.02" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10"/>
-<path d="M306.211 122.7C314.261 128.02 325.671 121.7 319.261 105.73C297.781 52.25 244.001 24.95 227.441 34.26C210.061 44.03 231.741 90.5 220.841 101.27C214.751 107.29 206.751 107.03 199.421 103.95" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10"/>
-<path d="M306.531 122.94C277.581 105.78 226.39 104.87 180.98 138.83" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10"/>
-<path d="M341.4 253.66C351.4 254.03 366.49 259.17 366.02 269.49C365.55 279.82 349.3 283.19 335.71 279.29C322.12 275.39 323.16 265.5 325.3 262.15C327.44 258.8 332.12 253.32 341.41 253.66H341.4Z" fill="black"/>
-<path d="M345.16 258.45C351.6 259.28 356.39 262.63 356.39 262.63C356.39 262.63 355.45 269.62 344.22 269.4C332.99 269.18 336.07 258.72 336.07 258.72C336.07 258.72 339.03 257.66 345.15 258.44L345.16 258.45Z" fill="white"/>
-<g opacity="0.6">
-<path d="M621.96 318.31V332.84" stroke="#7F73F2" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M629.23 325.58H614.69" stroke="#7F73F2" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M657.411 162.86V175.25" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M663.601 169.05H651.221" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<g opacity="0.4">
-<path d="M497.061 209.35V221.73" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M503.25 215.54H490.87" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-</g>
-<path d="M660.051 285.01L668.811 293.76" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M668.811 285.01L660.051 293.76" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M476.391 312.83L482.341 318.78" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M482.341 312.83L476.391 318.78" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M519 113.2H527.41" stroke="#7F73F2" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M523.21 109V117.41" stroke="#7F73F2" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M609.581 239.16L616.861 231.87C617.721 231.01 617.721 229.61 616.861 228.74C616.001 227.88 614.601 227.88 613.731 228.74L606.451 236.03L599.161 228.75C598.301 227.89 596.901 227.89 596.031 228.75C595.171 229.61 595.171 231.01 596.031 231.88L603.321 239.16L596.041 246.45C595.181 247.31 595.181 248.71 596.041 249.58C596.471 250.01 597.041 250.23 597.601 250.23C598.161 250.23 598.731 250.01 599.161 249.58L606.441 242.29L613.731 249.57C614.161 250 614.731 250.22 615.291 250.22C615.851 250.22 616.421 250 616.851 249.57C617.711 248.71 617.711 247.31 616.851 246.44L609.561 239.16H609.581Z" fill="#B4ADF8"/>
-<path d="M557.84 280.71V267.77C557.83 266.23 556.581 264.99 555.051 264.99C553.521 264.99 552.271 266.23 552.271 267.77V280.71C552.281 282.25 553.531 283.49 555.061 283.49C556.591 283.49 557.84 282.25 557.84 280.71Z" fill="#A59DF7"/>
-<path d="M648.21 244.27V257.21C648.22 258.75 649.47 259.99 651 259.99C652.53 259.99 653.78 258.75 653.78 257.21V244.27C653.77 242.73 652.52 241.49 650.99 241.49C649.46 241.49 648.21 242.73 648.21 244.27Z" fill="#402EED"/>
-<path d="M561.34 181.68H548.4C546.86 181.69 545.62 182.94 545.62 184.47C545.62 186 546.86 187.25 548.4 187.25H561.34C562.88 187.24 564.12 185.99 564.12 184.46C564.12 182.93 562.88 181.68 561.34 181.68Z" fill="#5041E4"/>
-<path d="M568.931 247.36L568.951 280.7C568.951 282.24 570.191 283.48 571.731 283.48C573.271 283.48 574.511 282.24 574.511 280.7L574.491 247.36C574.491 245.82 573.251 244.58 571.711 244.58C570.171 244.58 568.931 245.82 568.931 247.36Z" fill="#A59DF7"/>
-<path d="M574.791 321.8L541.451 321.82C539.911 321.82 538.671 323.06 538.671 324.6C538.671 326.14 539.911 327.38 541.451 327.38L574.791 327.36C576.331 327.36 577.571 326.12 577.571 324.58C577.571 323.04 576.331 321.8 574.791 321.8Z" fill="#5041E4"/>
-<path d="M601.3 192.84H588.12C586.46 192.84 585.11 194.2 585.11 195.86V209.04C585.11 210.71 586.47 212.05 588.13 212.05H601.31C602.97 212.05 604.32 210.7 604.32 209.03V195.85C604.32 194.19 602.96 192.84 601.3 192.84ZM599.82 207.55H589.61V197.35H599.82V207.55Z" fill="#7C6FFD"/>
-<path d="M541.171 280.72V258.49C541.161 256.95 539.911 255.71 538.381 255.71C536.851 255.71 535.601 256.95 535.601 258.49V280.72C535.611 282.26 536.861 283.5 538.391 283.5C539.921 283.5 541.171 282.26 541.171 280.72Z" fill="#A59DF7"/>
-<path d="M524.981 318.59C528.361 318.59 531.111 321.34 531.111 324.72C531.111 328.1 528.361 330.85 524.981 330.85C521.601 330.85 518.851 328.1 518.851 324.72C518.851 321.34 521.601 318.59 524.981 318.59ZM524.981 326.76C526.111 326.76 527.021 325.84 527.021 324.72C527.021 323.6 526.101 322.68 524.981 322.68C523.861 322.68 522.941 323.6 522.941 324.72C522.941 325.84 523.861 326.76 524.981 326.76Z" fill="#5545EF"/>
-<path d="M656.781 228.23C656.781 231.6 654.041 234.34 650.671 234.34C647.301 234.34 644.561 231.6 644.561 228.23C644.561 224.86 647.301 222.12 650.671 222.12C654.041 222.12 656.781 224.86 656.781 228.23ZM648.641 228.23C648.641 229.35 649.551 230.27 650.681 230.27C651.811 230.27 652.72 229.36 652.72 228.23C652.72 227.1 651.811 226.19 650.681 226.19C649.551 226.19 648.641 227.1 648.641 228.23Z" fill="#402EED"/>
-<path d="M607.45 279.74C607.04 279.74 606.56 279.67 606.15 279.47C605.74 279.33 605.33 279.06 605.06 278.72C604.72 278.45 604.45 278.04 604.31 277.63C604.1 277.22 604.04 276.81 604.04 276.33C604.04 275.44 604.38 274.55 605.06 273.94C605.33 273.6 605.74 273.33 606.15 273.19C606.97 272.85 607.93 272.85 608.75 273.19C609.16 273.33 609.57 273.6 609.84 273.94C610.52 274.55 610.87 275.44 610.87 276.33C610.87 276.81 610.8 277.22 610.6 277.63C610.46 278.04 610.19 278.45 609.85 278.72C609.58 279.06 609.17 279.34 608.76 279.47C608.35 279.67 607.94 279.74 607.46 279.74H607.45Z" fill="#7F73F2"/>
-<path d="M560.38 219.83C559.24 219.83 558.111 219.4 557.331 218.52C556.461 217.74 556.021 216.61 556.021 215.47C556.021 214.33 556.451 213.21 557.331 212.42C558.901 210.77 561.861 210.77 563.421 212.42C563.861 212.77 564.21 213.3 564.38 213.82C564.64 214.35 564.73 214.95 564.73 215.48C564.73 216.08 564.64 216.61 564.38 217.13C564.21 217.66 563.861 218.18 563.421 218.53C562.641 219.41 561.51 219.84 560.37 219.84L560.38 219.83Z" fill="#5545EF"/>
-<path d="M678.98 214.927C678.2 214.927 677.43 214.627 676.89 214.027C676.29 213.487 676 212.717 676 211.937C676 211.157 676.3 210.387 676.89 209.847C677.96 208.717 679.99 208.717 681.06 209.847C681.36 210.087 681.6 210.447 681.72 210.807C681.9 211.167 681.96 211.578 681.96 211.948C681.96 212.358 681.9 212.717 681.72 213.077C681.6 213.437 681.36 213.798 681.06 214.038C680.52 214.638 679.75 214.937 678.97 214.937L678.98 214.927Z" fill="#B4ADF8"/>
-<path d="M614.5 106.948C614.08 106.948 613.59 106.878 613.17 106.668C612.75 106.528 612.33 106.247 612.05 105.897C611.35 105.267 611 104.358 611 103.448C611 102.958 611.07 102.537 611.28 102.117C611.42 101.697 611.7 101.278 612.05 100.998C613.31 99.6675 615.69 99.6675 616.95 100.998C617.3 101.278 617.58 101.697 617.72 102.117C617.93 102.537 618 102.958 618 103.448C618 104.358 617.65 105.267 616.95 105.897C616.67 106.247 616.25 106.528 615.83 106.668C615.41 106.878 614.92 106.948 614.5 106.948Z" fill="#5545EF"/>
-<path d="M614.231 301.93H493.311C485.081 301.93 477.641 296.42 475.231 288.53C474.831 287.21 475.571 285.81 476.891 285.41C478.211 285.01 479.611 285.75 480.011 287.07C481.791 292.88 487.261 296.93 493.311 296.93H614.231C621.901 296.93 628.131 290.69 628.131 283.03V192.28C628.131 184.62 621.891 178.38 614.231 178.38H575.251C573.871 178.38 572.751 177.26 572.751 175.88C572.751 174.5 573.871 173.38 575.251 173.38H614.231C624.651 173.38 633.131 181.86 633.131 192.28V283.03C633.131 293.45 624.651 301.93 614.231 301.93Z" fill="#5A49FA"/>
-<path d="M564.94 154.74V131.41L549.33 148.14H569.88" stroke="#A69DF7" stroke-width="5.18" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M624.88 154.74V131.41L609.271 148.14H629.831" stroke="#A69DF7" stroke-width="5.18" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M589.431 152.79C595.202 152.79 599.88 148.402 599.88 142.99C599.88 137.578 595.202 133.19 589.431 133.19C583.659 133.19 578.98 137.578 578.98 142.99C578.98 148.402 583.659 152.79 589.431 152.79Z" stroke="#A69DF7" stroke-width="5.18" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<path d="M364.23 218.6L394.26 198.12" stroke="white" stroke-width="5.18" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M394.26 218.6L364.23 198.12" stroke="white" stroke-width="5.18" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M319.95 218.6L349.99 198.12" stroke="white" stroke-width="5.18" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M349.99 218.6L319.95 198.12" stroke="white" stroke-width="5.18" stroke-miterlimit="10" stroke-linecap="round"/>
-<path opacity="0.15" d="M459.55 269.6C493.527 269.6 521.07 242.057 521.07 208.08C521.07 174.103 493.527 146.56 459.55 146.56C425.574 146.56 398.03 174.103 398.03 208.08C398.03 242.057 425.574 269.6 459.55 269.6Z" fill="white"/>
-<path d="M531.381 221.52C532.261 216.9 532.671 212.18 532.621 207.48C532.571 202.87 532.071 198.24 531.131 193.71C530.201 189.23 528.831 184.82 527.061 180.6C525.291 176.38 523.111 172.3 520.581 168.5C518.021 164.65 515.071 161.04 511.831 157.77C508.521 154.43 504.861 151.42 500.961 148.8C496.961 146.12 492.661 143.82 488.171 141.98C483.681 140.14 479.011 138.75 474.271 137.85C469.651 136.97 464.931 136.56 460.231 136.61C455.621 136.66 450.99 137.16 446.46 138.1C441.98 139.03 437.571 140.4 433.351 142.17C429.131 143.94 425.051 146.12 421.251 148.65C417.401 151.21 413.791 154.16 410.521 157.4C407.181 160.71 404.171 164.37 401.551 168.27C398.871 172.27 396.571 176.57 394.731 181.06C392.891 185.55 391.501 190.22 390.601 194.96C389.721 199.58 389.311 204.3 389.361 209C389.411 213.61 389.911 218.24 390.851 222.77C391.781 227.25 393.151 231.66 394.921 235.88C396.691 240.1 398.871 244.18 401.401 247.98C403.961 251.83 406.911 255.44 410.151 258.71C413.461 262.05 417.121 265.06 421.021 267.68C423.211 269.15 425.491 270.5 427.841 271.73L420.241 290.27L419.321 289.89C416.121 288.58 412.441 290.12 411.131 293.32L383.451 360.83C382.141 364.03 383.681 367.71 386.881 369.02L400.891 374.77C404.091 376.08 407.771 374.54 409.081 371.34L436.761 303.83C438.071 300.63 436.531 296.95 433.331 295.64L432.411 295.26L440.011 276.72C442.551 277.5 445.121 278.14 447.711 278.63C452.331 279.51 457.051 279.92 461.751 279.87C466.361 279.82 470.991 279.32 475.521 278.38C480.001 277.45 484.411 276.08 488.631 274.31C492.851 272.54 496.931 270.36 500.731 267.83C504.581 265.27 508.19 262.32 511.46 259.08C514.8 255.77 517.811 252.11 520.431 248.21C523.111 244.21 525.411 239.91 527.251 235.42C529.091 230.93 530.481 226.26 531.381 221.52ZM438.471 263.14C408.151 250.71 393.651 216.04 406.081 185.72C418.511 155.4 453.181 140.9 483.501 153.33C513.821 165.76 528.321 200.43 515.891 230.75C503.461 261.07 468.791 275.57 438.471 263.14Z" fill="black"/>
-<path opacity="0.3" d="M431.661 246.88C433.981 248.49 436.401 249.85 438.881 250.99C422.951 235.18 420.151 209.77 433.381 190.69C446.611 171.61 471.401 165.33 491.781 174.71C489.841 172.79 487.721 171 485.401 169.39C464.001 154.55 434.621 159.86 419.781 181.26C404.941 202.66 410.251 232.04 431.651 246.88H431.661Z" fill="white"/>
-<path d="M425.671 350.09C437.371 343.43 440.131 329.99 437.201 321.33C434.781 314.19 424.271 311.27 418.091 319.96C411.221 329.61 422.451 339.87 422.451 339.87" fill="#F99F10"/>
-<path d="M425.671 350.09C437.371 343.43 440.131 329.99 437.201 321.33C434.781 314.19 424.271 311.27 418.091 319.96C411.221 329.61 422.451 339.87 422.451 339.87" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-</svg>
diff --git a/public/img/grot-404-light.svg b/public/img/grot-404-light.svg
deleted file mode 100644
index 2c9ca391204fa..0000000000000
--- a/public/img/grot-404-light.svg
+++ /dev/null
@@ -1,61 +0,0 @@
-<svg width="722" height="480" viewBox="0 0 722 480" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M514.59 3.80879C447.52 -7.78121 379.51 8.58879 314.8 32.5588C275.1 47.2688 236.85 58.9488 196.11 69.7588C150.35 81.8988 102.13 94.2588 62.7402 123.959C15.7502 159.389 -0.05983 214.349 0.000170029 274.969C0.04017 319.049 7.54023 365.349 33.0602 399.379C71.8302 451.069 139.04 459.809 196.03 455.539C267.53 450.189 313.45 436.549 383.95 458.929C471.35 486.669 580.88 498.339 659.07 416.129C765.14 304.599 726.89 126.169 614.63 45.6788C598.19 33.8888 580.48 24.2188 561.98 16.9888C546.27 10.8488 530.46 6.53878 514.59 3.79878V3.80879Z" fill="#5545EF" fill-opacity="0.1"/>
-<path opacity="0.1" d="M273.041 410.45C346.097 410.45 405.321 403.497 405.321 394.92C405.321 386.343 346.097 379.39 273.041 379.39C199.985 379.39 140.761 386.343 140.761 394.92C140.761 403.497 199.985 410.45 273.041 410.45Z" fill="black"/>
-<path d="M346.921 293.19C358.131 296.32 448.181 322.33 432.881 344.87C418.531 366 348.841 340.92 326.921 325.65" fill="#F99F10"/>
-<path d="M346.921 293.19C358.131 296.32 448.181 322.33 432.881 344.87C418.531 366 348.841 340.92 326.921 325.65" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M218.861 115.04C187.091 92.89 146.441 87.92 139.291 95.87C133.491 102.31 155.401 137.59 151.851 147.9C148.311 158.21 117.231 151.54 113.831 164.65C112.221 170.88 136.061 185.91 135.421 194.61C134.781 203.31 116.371 200.85 115.021 212.11C114.111 219.68 130.911 221.35 130.271 230.37C129.631 239.39 117.501 237.74 118.031 246.48C118.461 253.57 131.721 248.9 135.271 260.82C138.811 272.74 218.871 115.04 218.871 115.04H218.861Z" fill="#EF6122"/>
-<path d="M77.1408 326.59C78.1108 297.43 98.4608 290.96 113.241 295.94C128.011 300.92 127.191 318.09 123.461 324.55C117.501 334.86 108.751 330.41 112.021 323.19C114.441 316.26 114.891 306.64 103.441 309.7C89.2109 313.51 93.6408 351.77 123.601 344.25C144.121 339.1 142.511 317.37 140.881 285.68C136.511 255.02 141.241 214.82 154.281 176.66C180.701 99.34 339.851 74.21 392.681 145.73C461.311 238.63 385.631 329.37 373.991 340.96C337.731 369.1 343.611 394.56 317.631 396.25C292.941 397.86 294.971 372.77 278.641 371.37C277.681 371.37 276.721 371.37 275.761 371.35C256.591 372.76 252.891 396.67 223.981 396.25C200.421 395.91 210.911 375.33 195.171 365.46C191.871 363.9 189.011 362.8 186.371 362.08C184.291 361.64 181.981 361.32 179.371 361.16C178.771 361.12 175.141 361.14 174.081 361.14C164.731 361.31 159.121 363.52 137.991 367.82C99.9208 375.56 76.3208 351.26 77.1408 326.59Z" fill="#FAC20C" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10"/>
-<path d="M181.051 134.78C235.171 96.44 298.161 117.38 306.211 122.7C314.261 128.02 325.671 121.7 319.261 105.73C297.781 52.25 242.361 25.05 227.441 34.26C210.761 44.56 231.741 90.5 220.841 101.27C212.091 109.91 206.131 103.31 191.251 98.32C177.811 93.81 181.051 134.78 181.051 134.78Z" fill="#EF6122"/>
-<path d="M262.101 239.52L410.381 239.52C428.197 239.52 442.641 225.077 442.641 207.26V207.25C442.641 189.433 428.197 174.99 410.381 174.99L262.101 174.99C244.284 174.99 229.841 189.433 229.841 207.25V207.26C229.841 225.077 244.284 239.52 262.101 239.52Z" fill="#5545EF" stroke="#231735" stroke-width="5" stroke-miterlimit="10"/>
-<path d="M296.28 228.67L408.8 228.67C420.619 228.67 430.2 219.089 430.2 207.27C430.2 195.451 420.619 185.87 408.8 185.87H296.28C284.461 185.87 274.88 195.451 274.88 207.27C274.88 219.089 284.461 228.67 296.28 228.67Z" fill="#19052D"/>
-<path d="M257.971 297.31C257.351 316.15 250.621 333.66 236.651 332.47C221.221 331.16 217.391 315.15 217.921 297.76" fill="#F99F10"/>
-<path d="M257.971 297.31C257.351 316.15 250.621 333.66 236.651 332.47C221.221 331.16 217.391 315.15 217.921 297.76" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M200.23 104.32C172.95 91.48 146.34 84.67 139.29 95.87C131.67 107.98 157.65 133.7 151.85 147.9C146.43 161.18 115.82 149.78 113.83 164.65C112.24 176.55 136.06 185.91 135.42 194.61C134.78 203.31 116.14 199.76 114.78 211.03C113.87 218.6 130.91 221.35 130.26 230.37C129.62 239.39 118.02 237.73 118.02 246.48C118.02 253.6 138.81 254.21 139.4 269.02" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10"/>
-<path d="M306.211 122.7C314.261 128.02 325.671 121.7 319.261 105.73C297.781 52.25 244.001 24.95 227.441 34.26C210.061 44.03 231.741 90.5 220.841 101.27C214.751 107.29 206.751 107.03 199.421 103.95" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10"/>
-<path d="M306.531 122.94C277.581 105.78 226.39 104.87 180.98 138.83" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10"/>
-<path d="M341.4 253.66C351.4 254.03 366.49 259.17 366.02 269.49C365.55 279.82 349.3 283.19 335.71 279.29C322.12 275.39 323.16 265.5 325.3 262.15C327.44 258.8 332.12 253.32 341.41 253.66H341.4Z" fill="black"/>
-<path d="M345.16 258.45C351.6 259.28 356.39 262.63 356.39 262.63C356.39 262.63 355.45 269.62 344.22 269.4C332.99 269.18 336.07 258.72 336.07 258.72C336.07 258.72 339.03 257.66 345.15 258.44L345.16 258.45Z" fill="white"/>
-<g opacity="0.5">
-<path d="M621.96 318.31V332.84" stroke="#7F73F2" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M629.23 325.58H614.69" stroke="#7F73F2" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M657.411 162.86V175.25" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M663.601 169.05H651.221" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<g opacity="0.4">
-<path d="M497.061 209.35V221.73" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M503.25 215.54H490.87" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-</g>
-<path d="M668 293L676.76 301.75" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M676.76 293L668 301.75" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M476.391 312.83L482.341 318.78" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M482.341 312.83L476.391 318.78" stroke="#5545EF" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M515 125.2H523.41" stroke="#7F73F2" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M519.21 121V129.41" stroke="#7F73F2" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M609.581 239.16L616.861 231.87C617.721 231.01 617.721 229.61 616.861 228.74C616.001 227.88 614.601 227.88 613.731 228.74L606.451 236.03L599.161 228.75C598.301 227.89 596.901 227.89 596.031 228.75C595.171 229.61 595.171 231.01 596.031 231.88L603.321 239.16L596.041 246.45C595.181 247.31 595.181 248.71 596.041 249.58C596.471 250.01 597.041 250.23 597.601 250.23C598.161 250.23 598.731 250.01 599.161 249.58L606.441 242.29L613.731 249.57C614.161 250 614.731 250.22 615.291 250.22C615.851 250.22 616.421 250 616.851 249.57C617.711 248.71 617.711 247.31 616.851 246.44L609.561 239.16H609.581Z" fill="#B4ADF8"/>
-<path d="M557.84 280.71V267.77C557.83 266.23 556.581 264.99 555.051 264.99C553.521 264.99 552.271 266.23 552.271 267.77V280.71C552.281 282.25 553.531 283.49 555.061 283.49C556.591 283.49 557.84 282.25 557.84 280.71Z" fill="#A59DF7"/>
-<path d="M648.21 244.27V257.21C648.22 258.75 649.47 259.99 651 259.99C652.53 259.99 653.78 258.75 653.78 257.21V244.27C653.77 242.73 652.52 241.49 650.99 241.49C649.46 241.49 648.21 242.73 648.21 244.27Z" fill="#402EED"/>
-<path d="M561.34 181.68H548.4C546.86 181.69 545.62 182.94 545.62 184.47C545.62 186 546.86 187.25 548.4 187.25H561.34C562.88 187.24 564.12 185.99 564.12 184.46C564.12 182.93 562.88 181.68 561.34 181.68Z" fill="#402EED"/>
-<path d="M568.931 247.36L568.951 280.7C568.951 282.24 570.191 283.48 571.731 283.48C573.271 283.48 574.511 282.24 574.511 280.7L574.491 247.36C574.491 245.82 573.251 244.58 571.711 244.58C570.171 244.58 568.931 245.82 568.931 247.36Z" fill="#A59DF7"/>
-<path d="M574.791 321.8L541.451 321.82C539.911 321.82 538.671 323.06 538.671 324.6C538.671 326.14 539.911 327.38 541.451 327.38L574.791 327.36C576.331 327.36 577.571 326.12 577.571 324.58C577.571 323.04 576.331 321.8 574.791 321.8Z" fill="#402EED"/>
-<path d="M601.3 192.84H588.12C586.46 192.84 585.11 194.2 585.11 195.86V209.04C585.11 210.71 586.47 212.05 588.13 212.05H601.31C602.97 212.05 604.32 210.7 604.32 209.03V195.85C604.32 194.19 602.96 192.84 601.3 192.84ZM599.82 207.55H589.61V197.35H599.82V207.55Z" fill="#5545EF"/>
-<path d="M541.171 280.72V258.49C541.161 256.95 539.911 255.71 538.381 255.71C536.851 255.71 535.601 256.95 535.601 258.49V280.72C535.611 282.26 536.861 283.5 538.391 283.5C539.921 283.5 541.171 282.26 541.171 280.72Z" fill="#A59DF7"/>
-<path d="M524.981 318.59C528.361 318.59 531.111 321.34 531.111 324.72C531.111 328.1 528.361 330.85 524.981 330.85C521.601 330.85 518.851 328.1 518.851 324.72C518.851 321.34 521.601 318.59 524.981 318.59ZM524.981 326.76C526.111 326.76 527.021 325.84 527.021 324.72C527.021 323.6 526.101 322.68 524.981 322.68C523.861 322.68 522.941 323.6 522.941 324.72C522.941 325.84 523.861 326.76 524.981 326.76Z" fill="#5545EF"/>
-<path d="M656.781 228.23C656.781 231.6 654.041 234.34 650.671 234.34C647.301 234.34 644.561 231.6 644.561 228.23C644.561 224.86 647.301 222.12 650.671 222.12C654.041 222.12 656.781 224.86 656.781 228.23ZM648.641 228.23C648.641 229.35 649.551 230.27 650.681 230.27C651.811 230.27 652.72 229.36 652.72 228.23C652.72 227.1 651.811 226.19 650.681 226.19C649.551 226.19 648.641 227.1 648.641 228.23Z" fill="#402EED"/>
-<path d="M607.45 279.74C607.04 279.74 606.56 279.67 606.15 279.47C605.74 279.33 605.33 279.06 605.06 278.72C604.72 278.45 604.45 278.04 604.31 277.63C604.1 277.22 604.04 276.81 604.04 276.33C604.04 275.44 604.38 274.55 605.06 273.94C605.33 273.6 605.74 273.33 606.15 273.19C606.97 272.85 607.93 272.85 608.75 273.19C609.16 273.33 609.57 273.6 609.84 273.94C610.52 274.55 610.87 275.44 610.87 276.33C610.87 276.81 610.8 277.22 610.6 277.63C610.46 278.04 610.19 278.45 609.85 278.72C609.58 279.06 609.17 279.34 608.76 279.47C608.35 279.67 607.94 279.74 607.46 279.74H607.45Z" fill="#7F73F2"/>
-<path d="M560.38 219.83C559.24 219.83 558.111 219.4 557.331 218.52C556.461 217.74 556.021 216.61 556.021 215.47C556.021 214.33 556.451 213.21 557.331 212.42C558.901 210.77 561.861 210.77 563.421 212.42C563.861 212.77 564.21 213.3 564.38 213.82C564.64 214.35 564.73 214.95 564.73 215.48C564.73 216.08 564.64 216.61 564.38 217.13C564.21 217.66 563.861 218.18 563.421 218.53C562.641 219.41 561.51 219.84 560.37 219.84L560.38 219.83Z" fill="#5545EF"/>
-<path d="M659.59 202.46C658.81 202.46 658.04 202.16 657.5 201.56C656.9 201.02 656.61 200.25 656.61 199.47C656.61 198.69 656.91 197.92 657.5 197.38C658.57 196.25 660.6 196.25 661.67 197.38C661.97 197.62 662.21 197.98 662.33 198.34C662.51 198.7 662.57 199.11 662.57 199.48C662.57 199.89 662.51 200.25 662.33 200.61C662.21 200.97 661.97 201.33 661.67 201.57C661.13 202.17 660.36 202.47 659.58 202.47L659.59 202.46Z" fill="#B4ADF8"/>
-<path d="M636.5 120.948C636.08 120.948 635.59 120.878 635.17 120.668C634.75 120.528 634.33 120.247 634.05 119.897C633.35 119.267 633 118.358 633 117.448C633 116.958 633.07 116.537 633.28 116.117C633.42 115.697 633.7 115.278 634.05 114.998C635.31 113.668 637.69 113.668 638.95 114.998C639.3 115.278 639.58 115.697 639.72 116.117C639.93 116.537 640 116.958 640 117.448C640 118.358 639.65 119.267 638.95 119.897C638.67 120.247 638.25 120.528 637.83 120.668C637.41 120.878 636.92 120.948 636.5 120.948Z" fill="#5545EF"/>
-<path d="M614.231 301.93H493.311C485.081 301.93 477.641 296.42 475.231 288.53C474.831 287.21 475.571 285.81 476.891 285.41C478.211 285.01 479.611 285.75 480.011 287.07C481.791 292.88 487.261 296.93 493.311 296.93H614.231C621.901 296.93 628.131 290.69 628.131 283.03V192.28C628.131 184.62 621.891 178.38 614.231 178.38H575.251C573.871 178.38 572.751 177.26 572.751 175.88C572.751 174.5 573.871 173.38 575.251 173.38H614.231C624.651 173.38 633.131 181.86 633.131 192.28V283.03C633.131 293.45 624.651 301.93 614.231 301.93Z" fill="#402EED"/>
-<path d="M564.94 154.74V131.41L549.33 148.14H569.88" stroke="#A69DF7" stroke-width="5.18" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M624.88 154.74V131.41L609.271 148.14H629.831" stroke="#A69DF7" stroke-width="5.18" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M589.431 152.79C595.202 152.79 599.88 148.402 599.88 142.99C599.88 137.578 595.202 133.19 589.431 133.19C583.659 133.19 578.98 137.578 578.98 142.99C578.98 148.402 583.659 152.79 589.431 152.79Z" stroke="#A69DF7" stroke-width="5.18" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<path d="M364.23 218.6L394.26 198.12" stroke="white" stroke-width="5.18" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M394.26 218.6L364.23 198.12" stroke="white" stroke-width="5.18" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M319.95 218.6L349.99 198.12" stroke="white" stroke-width="5.18" stroke-miterlimit="10" stroke-linecap="round"/>
-<path d="M349.99 218.6L319.95 198.12" stroke="white" stroke-width="5.18" stroke-miterlimit="10" stroke-linecap="round"/>
-<path opacity="0.25" d="M459.55 269.6C493.527 269.6 521.07 242.057 521.07 208.08C521.07 174.103 493.527 146.56 459.55 146.56C425.574 146.56 398.03 174.103 398.03 208.08C398.03 242.057 425.574 269.6 459.55 269.6Z" fill="white"/>
-<path d="M531.381 221.52C532.261 216.9 532.671 212.18 532.621 207.48C532.571 202.87 532.071 198.24 531.131 193.71C530.201 189.23 528.831 184.82 527.061 180.6C525.291 176.38 523.111 172.3 520.581 168.5C518.021 164.65 515.071 161.04 511.831 157.77C508.521 154.43 504.861 151.42 500.961 148.8C496.961 146.12 492.661 143.82 488.171 141.98C483.681 140.14 479.011 138.75 474.271 137.85C469.651 136.97 464.931 136.56 460.231 136.61C455.621 136.66 450.991 137.16 446.46 138.1C441.98 139.03 437.571 140.4 433.351 142.17C429.131 143.94 425.051 146.12 421.251 148.65C417.401 151.21 413.791 154.16 410.521 157.4C407.181 160.71 404.171 164.37 401.551 168.27C398.871 172.27 396.571 176.57 394.731 181.06C392.891 185.55 391.501 190.22 390.601 194.96C389.721 199.58 389.311 204.3 389.361 209C389.411 213.61 389.911 218.24 390.851 222.77C391.781 227.25 393.151 231.66 394.921 235.88C396.691 240.1 398.871 244.18 401.401 247.98C403.961 251.83 406.911 255.44 410.151 258.71C413.461 262.05 417.121 265.06 421.021 267.68C423.211 269.15 425.491 270.5 427.841 271.73L420.241 290.27L419.321 289.89C416.121 288.58 412.441 290.12 411.131 293.32L383.451 360.83C382.141 364.03 383.681 367.71 386.881 369.02L400.891 374.77C404.091 376.08 407.771 374.54 409.081 371.34L436.761 303.83C438.071 300.63 436.531 296.95 433.331 295.64L432.411 295.26L440.011 276.72C442.551 277.5 445.121 278.14 447.711 278.63C452.331 279.51 457.051 279.92 461.751 279.87C466.361 279.82 470.991 279.32 475.521 278.38C480.001 277.45 484.411 276.08 488.631 274.31C492.851 272.54 496.931 270.36 500.731 267.83C504.581 265.27 508.19 262.32 511.46 259.08C514.8 255.77 517.811 252.11 520.431 248.21C523.111 244.21 525.411 239.91 527.251 235.42C529.091 230.93 530.481 226.26 531.381 221.52ZM438.471 263.14C408.151 250.71 393.651 216.04 406.081 185.72C418.511 155.4 453.181 140.9 483.501 153.33C513.821 165.76 528.321 200.43 515.891 230.75C503.461 261.07 468.791 275.57 438.471 263.14Z" fill="#0A0016"/>
-<path opacity="0.6" d="M431.661 246.88C433.981 248.49 436.401 249.85 438.881 250.99C422.951 235.18 420.151 209.77 433.381 190.69C446.611 171.61 471.401 165.33 491.781 174.71C489.841 172.79 487.721 171 485.401 169.39C464.001 154.55 434.621 159.86 419.781 181.26C404.941 202.66 410.251 232.04 431.651 246.88H431.661Z" fill="white"/>
-<path d="M425.671 350.09C437.371 343.43 440.131 329.99 437.201 321.33C434.781 314.19 424.271 311.27 418.091 319.96C411.221 329.61 422.451 339.87 422.451 339.87" fill="#F99F10"/>
-<path d="M425.671 350.09C437.371 343.43 440.131 329.99 437.201 321.33C434.781 314.19 424.271 311.27 418.091 319.96C411.221 329.61 422.451 339.87 422.451 339.87" stroke="#3A1103" stroke-width="5" stroke-miterlimit="10" stroke-linecap="round"/>
-</svg>
diff --git a/public/img/icons/README.md b/public/img/icons/README.md
new file mode 100644
index 0000000000000..7bc59fcf984ca
--- /dev/null
+++ b/public/img/icons/README.md
@@ -0,0 +1,12 @@
+# How to add a new icon
+
+- Add the new icon svg to the `unicons/` directory
+  - Yes, even if it's not a unicon icon or from [IconScout](https://iconscout.com/unicons/solid-icons)
+  - We will eventually condense all the separate folders into a single `icons/` directory, and since `unicons/` is the default it makes sense to add new icons there
+- Ensure the new icon source is formatted correctly:
+  - Remove any `width` or `height` attributes
+  - If the icon is a single color, ensure any explicitly defined fill or stroke colors are either removed (or set to `currentColor` if a color must be defined)
+    - This allows the consumer to control the color of the `Icon`, which is useful for hover/focus states
+- Modify the [`availableIconsIndex` map in `@grafana/data`](https://github.com/grafana/grafana/blob/main/packages/grafana-data/src/types/icon.ts#L1) and add the new icon
+  - **Note:** the key must exactly match the icon filename, e.g. if your new icon is `my-icon.svg`, the key must be `my-icon`
+- Run `yarn storybook` and verify the new icon appears correctly in the `Icon` story
diff --git a/public/img/icons/unicons/ai.svg b/public/img/icons/unicons/ai.svg
index d8df892aa90d7..0ea0f2502f759 100644
--- a/public/img/icons/unicons/ai.svg
+++ b/public/img/icons/unicons/ai.svg
@@ -1,4 +1,4 @@
-<svg width="10" height="10" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 10 10" xmlns="http://www.w3.org/2000/svg">
 <g id="Group 204">
 <path id="Vector" d="M7.5 5C5.56722 5 4.00015 7.0148 4.00015 9.5C4.00015 7.0148 2.43309 5 0.5 5C2.43309 5 4.00015 2.9855 4.00015 0.5C4.00015 2.9855 5.56722 5 7.5 5Z" fill="url(#paint0_linear_344_481)"/>
 <path id="Vector_2" d="M9.5 2.5C8.39555 2.5 7.50009 3.39547 7.50009 4.5C7.50009 3.39547 6.60462 2.5 5.5 2.5C6.60462 2.5 7.50009 1.60467 7.50009 0.5C7.50009 1.60467 8.39555 2.5 9.5 2.5Z" fill="url(#paint1_linear_344_481)"/>
diff --git a/public/img/icons/unicons/application-observability.svg b/public/img/icons/unicons/application-observability.svg
new file mode 100644
index 0000000000000..cc33bd99ddf63
--- /dev/null
+++ b/public/img/icons/unicons/application-observability.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-50 -50 524.55 535.34">
+  <defs>
+    <style>.application-observability-1{fill:currentColor;stroke-width:0px;}</style>
+  </defs>
+  <g id="Layer_1-2">
+    <path class="application-observability-1" d="m424.19,427.44L268.02,3.84c-.85-2.31-3.05-3.84-5.51-3.84h-99.87c-2.46,0-4.65,1.53-5.5,3.83L.37,427.43c-1.42,3.83,1.42,7.91,5.5,7.91h93.43c2.55,0,4.82-1.65,5.59-4.09l29.62-92.92c.78-2.43,3.04-4.09,5.59-4.09h144.35c2.54,0,4.8,1.64,5.58,4.05l30.22,92.99c.79,2.42,3.04,4.05,5.58,4.05h92.84c4.08,0,6.92-4.07,5.51-7.9Zm-252.11-178.19c0,4.68-3.81,8.48-8.48,8.48h-13.86c-4.68,0-8.48-3.81-8.48-8.48v-93.63c0-4.68,3.81-8.49,8.48-8.49h13.86c4.68,0,8.48,3.81,8.48,8.49v93.63Zm55.61,0c0,4.68-3.81,8.48-8.48,8.48h-13.86c-4.68,0-8.48-3.81-8.48-8.48V90.2c0-4.68,3.81-8.48,8.48-8.48h13.86c4.68,0,8.48,3.81,8.48,8.48v159.05Zm55.61,0c0,4.68-3.81,8.48-8.49,8.48h-13.86c-4.68,0-8.49-3.81-8.49-8.48v-64.14c0-4.68,3.81-8.48,8.49-8.48h13.86c4.68,0,8.49,3.81,8.49,8.48v64.14Z"/>
+  </g>
+</svg>
diff --git a/public/img/icons/unicons/asserts.svg b/public/img/icons/unicons/asserts.svg
new file mode 100644
index 0000000000000..459045ebb908a
--- /dev/null
+++ b/public/img/icons/unicons/asserts.svg
@@ -0,0 +1,5 @@
+<svg viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg">
+  <path d="M9.69232 7.38464C10.7969 7.38464 11.6923 6.48921 11.6923 5.38465C11.6923 4.28008 10.7969 3.38464 9.69232 3.38464C8.58777 3.38464 7.69232 4.28008 7.69232 5.38465C7.69232 6.48921 8.58777 7.38464 9.69232 7.38464Z" fill="currentColor" />
+  <path d="M4.76858 6.76787C5.53292 6.76787 6.15252 6.14827 6.15252 5.38393C6.15252 4.61961 5.53292 4 4.76858 4C4.00424 4 3.38464 4.61961 3.38464 5.38393C3.38464 6.14827 4.00424 6.76787 4.76858 6.76787Z" fill="currentColor" />
+  <path d="M1.23074 6.15387C1.57061 6.15387 1.84613 5.87836 1.84613 5.53846C1.84613 5.19861 1.57061 4.9231 1.23074 4.9231C0.890872 4.9231 0.615356 5.19861 0.615356 5.53846C0.615356 5.87836 0.890872 6.15387 1.23074 6.15387Z" fill="currentColor" />
+</svg>
diff --git a/public/img/icons/unicons/frontend-observability.svg b/public/img/icons/unicons/frontend-observability.svg
new file mode 100644
index 0000000000000..db73e4f518112
--- /dev/null
+++ b/public/img/icons/unicons/frontend-observability.svg
@@ -0,0 +1,6 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.79998 8.9999C4.79998 8.66853 5.06861 8.3999 5.39998 8.3999H5.99998C6.33135 8.3999 6.59998 8.66853 6.59998 8.9999C6.59998 9.33127 6.33135 9.5999 5.99998 9.5999H5.39998C5.0686 9.5999 4.79998 9.33127 4.79998 8.9999Z" />
+<path d="M7.79998 8.3999C7.46861 8.3999 7.19998 8.66853 7.19998 8.9999C7.19998 9.33127 7.4686 9.5999 7.79998 9.5999H8.39998C8.73135 9.5999 8.99998 9.33127 8.99998 8.9999C8.99998 8.66853 8.73135 8.3999 8.39998 8.3999H7.79998Z" />
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19 2H9C8.20435 2 7.44129 2.31607 6.87868 2.87868C6.31607 3.44129 6 4.20435 6 5V6H5C4.20435 6 3.44129 6.31607 2.87868 6.87868C2.31607 7.44129 2 8.20435 2 9V19C2 19.7957 2.31607 20.5587 2.87868 21.1213C3.44129 21.6839 4.20435 22 5 22H15C15.7956 22 16.5587 21.6839 17.1213 21.1213C17.6839 20.5587 18 19.7957 18 19V18H19C19.7957 18 20.5587 17.6839 21.1213 17.1213C21.6839 16.5587 22 15.7956 22 15V5C22 4.20435 21.6839 3.44129 21.1213 2.87868C20.5587 2.31607 19.7957 2 19 2ZM16 19C16 19.2652 15.8946 19.5196 15.7071 19.7071C15.5196 19.8946 15.2652 20 15 20H5C4.73478 20 4.48043 19.8946 4.29289 19.7071C4.10536 19.5196 4 19.2652 4 19V12H16V19ZM16 10H4V9C4 8.73478 4.10536 8.48043 4.29289 8.29289C4.48043 8.10536 4.73478 8 5 8H15C15.2652 8 15.5196 8.10536 15.7071 8.29289C15.8946 8.48043 16 8.73478 16 9V10ZM20 15C20 15.2652 19.8946 15.5196 19.7071 15.7071C19.5196 15.8946 19.2652 16 19 16H18V9C17.9973 8.65886 17.9364 8.32067 17.82 8H20V15ZM20 6H8V5C8 4.73478 8.10536 4.48043 8.29289 4.29289C8.48043 4.10536 8.73478 4 9 4H19C19.2652 4 19.5196 4.10536 19.7071 4.29289C19.8946 4.48043 20 4.73478 20 5V6Z" />
+<path d="M12.8201 14.986C12.8201 14.986 12.8201 14.986 12.8201 14.9709C12.6083 14.3921 12.224 13.8924 11.7192 13.5393C11.2143 13.1862 10.6133 12.9969 9.99749 12.9969C9.38164 12.9969 8.78066 13.1862 8.27583 13.5393C7.771 13.8924 7.38669 14.3921 7.17489 14.9709C7.17489 14.9709 7.17489 14.9709 7.17489 14.986C6.93836 15.6391 6.93836 16.3547 7.17489 17.0079C7.17489 17.0079 7.17489 17.0079 7.17489 17.0229C7.38669 17.6017 7.771 18.1015 8.27583 18.4545C8.78066 18.8076 9.38164 18.9969 9.99749 18.9969C10.6133 18.9969 11.2143 18.8076 11.7192 18.4545C12.224 18.1015 12.6083 17.6017 12.8201 17.0229C12.8201 17.0229 12.8201 17.0229 12.8201 17.0079C13.0566 16.3547 13.0566 15.6391 12.8201 14.986ZM7.66486 16.5987C7.56062 16.2043 7.56062 15.7895 7.66486 15.3952H8.22397C8.17589 15.7949 8.17589 16.1989 8.22397 16.5987H7.66486ZM7.91135 17.2004H8.33219C8.40274 17.4688 8.50359 17.7282 8.63278 17.9737C8.33799 17.7727 8.09156 17.5085 7.91135 17.2004ZM8.33219 14.7934H7.91135C8.08897 14.4862 8.33225 14.2222 8.62377 14.0201C8.49768 14.266 8.39986 14.5254 8.33219 14.7934ZM9.69088 18.3137C9.32168 18.0425 9.06238 17.6473 8.96043 17.2004H9.69088V18.3137ZM9.69088 16.5987H8.83118C8.77508 16.1995 8.77508 15.7944 8.83118 15.3952H9.69088V16.5987ZM9.69088 14.7934H8.96043C9.06238 14.3465 9.32168 13.9513 9.69088 13.6802V14.7934ZM12.0716 14.7934H11.6508C11.5802 14.5251 11.4794 14.2656 11.3502 14.0201C11.645 14.2212 11.8914 14.4853 12.0716 14.7934ZM10.2921 13.6802C10.6613 13.9513 10.9206 14.3465 11.0225 14.7934H10.2921V13.6802ZM10.2921 18.3137V17.2004H11.0225C10.9206 17.6473 10.6613 18.0425 10.2921 18.3137ZM11.1518 16.5987H10.2921V15.3952H11.1518C11.2079 15.7944 11.2079 16.1995 11.1518 16.5987ZM11.3592 17.9737C11.4884 17.7282 11.5892 17.4688 11.6598 17.2004H12.0806C11.9004 17.5085 11.654 17.7727 11.3592 17.9737ZM12.3181 16.5987H11.759C11.7834 16.399 11.7955 16.1981 11.7951 15.9969C11.7954 15.7958 11.7833 15.5948 11.759 15.3952H12.3181C12.4223 15.7895 12.4223 16.2043 12.3181 16.5987Z"/>
+</svg>
diff --git a/public/img/icons/unicons/k6.svg b/public/img/icons/unicons/k6.svg
index 26107f6960dc1..ba5cd2d7e3908 100644
--- a/public/img/icons/unicons/k6.svg
+++ b/public/img/icons/unicons/k6.svg
@@ -1,5 +1,5 @@
-<svg width="567" height="567" viewBox="0 0 567 567" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M441.118 53.8103L542.177 546.75H31.4615L196.718 183.554L290.242 254.396L307.934 267.797L319.661 248.955L441.118 53.8103Z" stroke="currentColor" stroke-width="40.5" fill="none" />
-<path d="M232.072 428.282L265.231 475.2H300.671L261.676 420.785L296.342 372.669L273.347 356.785L263.183 370.157L232.034 414.099V325.79L201 300.477V475.161H232.034V428.244L232.072 428.282Z" fill="currentColor"/>
-<path d="M410.7 404.129C407.994 397.946 403.936 392.419 398.796 387.975C390.178 379.318 378.545 374.332 366.333 373.985H365.405C363.821 373.985 362.197 374.178 360.69 374.642L390.719 330.004L366.796 313.309L355.473 330.004L326.526 374.216C321.541 381.559 317.406 388.013 314.816 392.496C312.15 397.25 309.831 402.197 307.937 407.298C305.773 412.709 304.652 418.506 304.652 424.342C304.575 431.259 305.966 438.139 308.749 444.515C311.493 450.892 315.589 456.573 320.691 461.288C330.7 471.027 344.149 476.477 358.101 476.477L359.222 476.399H360.458C374.526 476.361 388.091 470.95 398.217 461.172C403.434 456.457 407.569 450.699 410.352 444.245C413.134 437.791 414.564 430.834 414.448 423.839C414.68 417.076 413.405 410.351 410.7 404.129V404.129ZM375.569 440.303C371.241 444.593 365.405 446.989 359.299 447.027C353.231 447.066 347.434 444.67 343.144 440.38C338.855 436.09 336.459 430.293 336.459 424.226C336.459 418.158 338.855 412.361 343.144 408.071C347.434 403.781 353.231 401.385 359.299 401.385H359.492C362.507 401.385 365.482 402.004 368.226 403.163C371.009 404.361 373.482 406.062 375.569 408.264C377.772 410.274 379.511 412.709 380.671 415.453C381.869 418.197 382.449 421.134 382.449 424.11C382.371 430.216 379.898 436.013 375.569 440.303V440.303Z" fill="currentColor"/>
+<svg viewBox="0 0 567 567" xmlns="http://www.w3.org/2000/svg">
+  <path d="M441.118 53.8103L542.177 546.75H31.4615L196.718 183.554L290.242 254.396L307.934 267.797L319.661 248.955L441.118 53.8103Z" stroke="currentColor" stroke-width="40.5" fill="none" />
+  <path d="M232.072 428.282L265.231 475.2H300.671L261.676 420.785L296.342 372.669L273.347 356.785L263.183 370.157L232.034 414.099V325.79L201 300.477V475.161H232.034V428.244L232.072 428.282Z" fill="currentColor"/>
+  <path d="M410.7 404.129C407.994 397.946 403.936 392.419 398.796 387.975C390.178 379.318 378.545 374.332 366.333 373.985H365.405C363.821 373.985 362.197 374.178 360.69 374.642L390.719 330.004L366.796 313.309L355.473 330.004L326.526 374.216C321.541 381.559 317.406 388.013 314.816 392.496C312.15 397.25 309.831 402.197 307.937 407.298C305.773 412.709 304.652 418.506 304.652 424.342C304.575 431.259 305.966 438.139 308.749 444.515C311.493 450.892 315.589 456.573 320.691 461.288C330.7 471.027 344.149 476.477 358.101 476.477L359.222 476.399H360.458C374.526 476.361 388.091 470.95 398.217 461.172C403.434 456.457 407.569 450.699 410.352 444.245C413.134 437.791 414.564 430.834 414.448 423.839C414.68 417.076 413.405 410.351 410.7 404.129V404.129ZM375.569 440.303C371.241 444.593 365.405 446.989 359.299 447.027C353.231 447.066 347.434 444.67 343.144 440.38C338.855 436.09 336.459 430.293 336.459 424.226C336.459 418.158 338.855 412.361 343.144 408.071C347.434 403.781 353.231 401.385 359.299 401.385H359.492C362.507 401.385 365.482 402.004 368.226 403.163C371.009 404.361 373.482 406.062 375.569 408.264C377.772 410.274 379.511 412.709 380.671 415.453C381.869 418.197 382.449 421.134 382.449 424.11C382.371 430.216 379.898 436.013 375.569 440.303V440.303Z" fill="currentColor"/>
 </svg>
diff --git a/public/img/icons/unicons/spinner.svg b/public/img/icons/unicons/spinner.svg
index fca18c3939356..62eb684eb27e9 100644
--- a/public/img/icons/unicons/spinner.svg
+++ b/public/img/icons/unicons/spinner.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1664" height="1728" viewBox="0 0 1664 1728">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1664 1728">
   <path fill="currentColor" d="M462 1394q0 53-37.5 90.5T334 1522q-52 0-90-38t-38-90q0-53 37.5-90.5T334 1266t90.5 37.5T462 1394zm498 206q0 53-37.5 90.5T832 1728t-90.5-37.5T704 1600t37.5-90.5T832 1472t90.5 37.5T960 1600zM256 896q0 53-37.5 90.5T128 1024t-90.5-37.5T0 896t37.5-90.5T128 768t90.5 37.5T256 896zm1202 498q0 52-38 90t-90 38q-53 0-90.5-37.5T1202 1394t37.5-90.5t90.5-37.5t90.5 37.5t37.5 90.5zM494 398q0 66-47 113t-113 47t-113-47t-47-113t47-113t113-47t113 47t47 113zm1170 498q0 53-37.5 90.5T1536 1024t-90.5-37.5T1408 896t37.5-90.5T1536 768t90.5 37.5T1664 896zm-640-704q0 80-56 136t-136 56t-136-56t-56-136t56-136T832 0t136 56t56 136zm530 206q0 93-66 158.5T1330 622q-93 0-158.5-65.5T1106 398q0-92 65.5-158t158.5-66q92 0 158 66t66 158z"/>
 </svg>
diff --git a/public/img/icons/unicons/table-collapse-all.svg b/public/img/icons/unicons/table-collapse-all.svg
new file mode 100644
index 0000000000000..bacf4ac77a9f7
--- /dev/null
+++ b/public/img/icons/unicons/table-collapse-all.svg
@@ -0,0 +1,7 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+  <path
+    d="M8.35355 7.64645C8.15829 7.45118 7.84171 7.45118 7.64645 7.64645L4.46447 10.8284C4.2692 11.0237 4.2692 11.3403 4.46447 11.5355C4.65973 11.7308 4.97631 11.7308 5.17157 11.5355L8 8.70711L10.8284 11.5355C11.0237 11.7308 11.3403 11.7308 11.5355 11.5355C11.7308 11.3403 11.7308 11.0237 11.5355 10.8284L8.35355 7.64645ZM8.5 14L8.5 8L7.5 8L7.5 14L8.5 14Z"
+    fill="currentColor"/>
+  <line x1="2" y1="5.5" x2="14" y2="5.5" stroke="currentColor"/>
+  <line x1="2" y1="2.5" x2="14" y2="2.5" stroke="currentColor"/>
+</svg>
diff --git a/public/img/icons/unicons/table-expand-all.svg b/public/img/icons/unicons/table-expand-all.svg
new file mode 100644
index 0000000000000..06682bc0605e9
--- /dev/null
+++ b/public/img/icons/unicons/table-expand-all.svg
@@ -0,0 +1,7 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+  <path stroke="currentColor" fill="transparent" d="M2.5 5.5h11v2H2.5Z"/>
+  <path stroke="currentColor" fill="transparent" d="M2.5 1.5h11v2H2.5Z"/>
+  <path
+    d="M7.64645 14.3536C7.84171 14.5488 8.15829 14.5488 8.35355 14.3536L11.5355 11.1716C11.7308 10.9763 11.7308 10.6597 11.5355 10.4645C11.3403 10.2692 11.0237 10.2692 10.8284 10.4645L8 13.2929L5.17157 10.4645C4.97631 10.2692 4.65973 10.2692 4.46447 10.4645C4.2692 10.6597 4.2692 10.9763 4.46447 11.1716L7.64645 14.3536ZM7.5 8V14H8.5V8H7.5Z"
+    fill="currentColor"/>
+</svg>
diff --git a/public/img/icons/unicons/unarchive.svg b/public/img/icons/unicons/unarchive.svg
new file mode 100644
index 0000000000000..afe7b426b383b
--- /dev/null
+++ b/public/img/icons/unicons/unarchive.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path d="M19.0002 3H5.00017C4.29663 3.00546 3.61738 3.25801 3.08118 3.71352C2.54497 4.16902 2.18591 4.79849 2.06677 5.49189C1.94763 6.18529 2.07598 6.89851 2.4294 7.50687C2.78281 8.11523 3.3388 8.58002 4.00017 8.82V18C4.00017 18.7957 4.31624 19.5587 4.87885 20.1213C5.44146 20.6839 6.20452 21 7.00017 21H17.0002C17.7958 21 18.5589 20.6839 19.1215 20.1213C19.6841 19.5587 20.0002 18.7957 20.0002 18V8.82C20.6615 8.58002 21.2175 8.11523 21.5709 7.50687C21.9244 6.89851 22.0527 6.18529 21.9336 5.49189C21.8144 4.79849 21.4554 4.16902 20.9192 3.71352C20.383 3.25801 19.7037 3.00546 19.0002 3ZM18.0002 18C18.0002 18.2652 17.8948 18.5196 17.7073 18.7071C17.5197 18.8946 17.2654 19 17.0002 19H7.00017C6.73495 19 6.4806 18.8946 6.29306 18.7071C6.10553 18.5196 6.00017 18.2652 6.00017 18V9H18.0002V18ZM19.0002 7H5.00017C4.73495 7 4.4806 6.89464 4.29306 6.70711C4.10553 6.51957 4.00017 6.26522 4.00017 6C4.00017 5.73478 4.10553 5.48043 4.29306 5.29289C4.4806 5.10536 4.73495 5 5.00017 5H19.0002C19.2654 5 19.5197 5.10536 19.7073 5.29289C19.8948 5.48043 20.0002 5.73478 20.0002 6C20.0002 6.26522 19.8948 6.51957 19.7073 6.70711C19.5197 6.89464 19.2654 7 19.0002 7Z" fill="currentColor"/>
+  <path d="M10.9993 14.205L10.2093 15.005C10.021 15.1933 9.76562 15.2991 9.49931 15.2991C9.23301 15.2991 8.97762 15.1933 8.78931 15.005C8.60101 14.8167 8.49522 14.5613 8.49522 14.295C8.49522 14.0287 8.60101 13.7733 8.78931 13.585L11.2893 11.085C11.3844 10.994 11.4966 10.9226 11.6193 10.875C11.8628 10.775 12.1359 10.775 12.3793 10.875C12.5021 10.9226 12.6142 10.994 12.7093 11.085L15.2093 13.585C15.303 13.678 15.3774 13.7886 15.4282 13.9104C15.479 14.0323 15.5051 14.163 15.5051 14.295C15.5051 14.427 15.479 14.5577 15.4282 14.6796C15.3774 14.8015 15.303 14.9121 15.2093 15.005C15.1164 15.0987 15.0057 15.1731 14.8839 15.2239C14.762 15.2747 14.6313 15.3008 14.4993 15.3008C14.3673 15.3008 14.2366 15.2747 14.1147 15.2239C13.9929 15.1731 13.8823 15.0987 13.7893 15.005L12.9993 14.205V16.795C12.9993 17.0602 12.894 17.3146 12.7064 17.5021C12.5189 17.6897 12.2645 17.795 11.9993 17.795C11.7341 17.795 11.4797 17.6897 11.2922 17.5021C11.1047 17.3146 10.9993 17.0602 10.9993 16.795V14.205Z" fill="currentColor"/>
+</svg>
diff --git a/public/img/plugins/pagerduty.svg b/public/img/plugins/pagerduty.svg
new file mode 100644
index 0000000000000..ff1cac4bc8ef0
--- /dev/null
+++ b/public/img/plugins/pagerduty.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="256px" height="256px" viewBox="0 0 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 58 (84663) - https://sketch.com -->
+    <title>216px copy</title>
+    <desc>Created with Sketch.</desc>
+    <g id="App-Icons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Labels-+-Background" transform="translate(-1640.000000, -740.000000)">
+            <g id="App-Icon" transform="translate(1640.000000, 740.000000)">
+                <rect id="App-Icon-Background" fill="#04AC38" x="0" y="0" width="256" height="256"></rect>
+                <g id="PagerDuty-Logo" stroke-width="1" fill="#FFFFFF">
+                    <polygon id="Fill-1" points="75 213 100 213 100 167.5 75 167.5"></polygon>
+                    <path
+                        d="M129.825299,124.131615 L99.8809036,124.131615 L99.8809036,64.5112748 L128.155461,64.2731633 C153.919002,64.0341983 166.800772,73.0966607 166.800772,93.6061146 C166.800772,115.78491 150.818077,124.131615 129.825299,124.131615 M169.014702,50.6800387 C155.655713,43.5258824 146.285497,42.3333333 124.339136,42.3333333 L74.8333333,42.3333333 L74.8333333,145.833333 L99.8809036,145.833333 L103.117851,145.833333 L124.100384,145.833333 C143.661222,145.833333 158.279419,144.640784 171.161474,136.055398 C185.235863,126.754256 192.5,111.253678 192.5,93.3671496 C192.5,74.0510982 183.566025,58.5493831 169.014702,50.6800387"
+                        id="Fill-2"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/public/img/psiphon-logo-512x512.png b/public/img/psiphon-logo-512x512.png
new file mode 100644
index 0000000000000..7ab80b65ddbed
Binary files /dev/null and b/public/img/psiphon-logo-512x512.png differ
diff --git a/public/img/psiphon_pde_icon.png b/public/img/psiphon_pde_icon.png
new file mode 100644
index 0000000000000..d7e414e8eb417
Binary files /dev/null and b/public/img/psiphon_pde_icon.png differ
diff --git a/public/img/psiphonlogo.png b/public/img/psiphonlogo.png
new file mode 100644
index 0000000000000..f38d69242e276
Binary files /dev/null and b/public/img/psiphonlogo.png differ
diff --git a/public/img/transformations/dark/groupToNestedTable.svg b/public/img/transformations/dark/groupToNestedTable.svg
new file mode 100644
index 0000000000000..6c3a608acb3c1
--- /dev/null
+++ b/public/img/transformations/dark/groupToNestedTable.svg
@@ -0,0 +1,52 @@
+<svg width="106" height="50" viewBox="0 0 106 50" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1899_468)">
+<path d="M0 0.800641V10H24V1.05456e-06H1.00292L0.000198677 0L0 0.800641Z" fill="url(#paint0_linear_1899_468)"/>
+<path d="M24 13H0V22.5H24V13Z" fill="#84AFF1"/>
+<path d="M24 25.75H0V35.25H24V25.75Z" fill="#84AFF1"/>
+<path d="M24 38.5H0V48H24V38.5Z" fill="#84AFF1"/>
+<path d="M13 14.6179H11.5716L10 15.5378V16.7917L11.4253 15.9714H11.4627V20.6179H13V14.6179Z" fill="#24292E"/>
+<path d="M9.83733 33.5H14.25V32.3468H11.8341V32.3092L12.5472 31.6561C13.8396 30.5376 14.1772 29.9682 14.1772 29.289C14.1772 28.2225 13.3011 27.5 11.9476 27.5C10.629 27.5 9.7471 28.2543 9.75001 29.4595H11.1151C11.1151 28.9249 11.447 28.6156 11.9418 28.6156C12.4279 28.6156 12.7801 28.9133 12.7801 29.4017C12.7801 29.8439 12.5006 30.1445 12.0116 30.5809L9.83733 32.4711V33.5Z" fill="#24292E"/>
+<path d="M9.83733 46.25H14.25V45.0968H11.8341V45.0592L12.5472 44.4061C13.8396 43.2876 14.1772 42.7182 14.1772 42.039C14.1772 40.9725 13.3011 40.25 11.9476 40.25C10.629 40.25 9.7471 41.0043 9.75001 42.2095H11.1151C11.1151 41.6749 11.447 41.3656 11.9418 41.3656C12.4279 41.3656 12.7801 41.6633 12.7801 42.1517C12.7801 42.5939 12.5006 42.8945 12.0116 43.3309L9.83733 45.2211V46.25Z" fill="#24292E"/>
+</g>
+<g clip-path="url(#clip1_1899_468)">
+<path d="M28 0.800641V10H52V1.05456e-06H29.0029L28.0002 0L28 0.800641Z" fill="url(#paint1_linear_1899_468)"/>
+<path d="M52 13H28V22.5H52V13Z" fill="#84AFF1"/>
+<path d="M52 25.75H28V35.25H52V25.75Z" fill="#84AFF1"/>
+<path d="M52 38.5H28V48H52V38.5Z" fill="#84AFF1"/>
+<path d="M39.9792 20.875C41.3085 20.875 42.2528 20.1507 42.25 19.1355C42.2528 18.4168 41.7958 17.9035 40.9208 17.798V17.7524C41.5771 17.6554 42.0423 17.202 42.0395 16.5461C42.0423 15.5936 41.206 14.875 39.9903 14.875C38.7663 14.875 37.8746 15.605 37.8635 16.6431H39.1734C39.1845 16.2438 39.5334 15.9758 39.9903 15.9758C40.4251 15.9758 40.7214 16.2467 40.7186 16.6374C40.7214 17.0423 40.3725 17.3218 39.8685 17.3218H39.3174V18.3256H39.8685C40.4417 18.3256 40.8155 18.6164 40.81 19.0271C40.8155 19.4406 40.4721 19.7286 39.9848 19.7286C39.5001 19.7286 39.1429 19.4634 39.1291 19.0784H37.75C37.7611 20.1336 38.6832 20.875 39.9792 20.875Z" fill="#24292E"/>
+<path d="M37.5 32.4453V31.4463L40.0893 27.5H41.7308V31.4287H42.5V32.4453H41.7308V33.5H40.477V32.4453H37.5ZM40.5012 31.4287V28.8828H40.4528L38.8204 31.3818V31.4287H40.5012Z" fill="#24292E"/>
+<path d="M40.2102 46.25C38.8025 46.25 37.7766 45.5188 37.75 44.4957H39.1444C39.1776 44.9552 39.6391 45.2673 40.2102 45.2673C40.8841 45.2673 41.3655 44.8425 41.3655 44.2269C41.3655 43.6055 40.8742 43.1749 40.1902 43.172C39.7885 43.172 39.3835 43.3251 39.1743 43.5708L37.8961 43.3714L38.2181 40.25H42.3748V41.2731H39.4034L39.2274 42.7558H39.2673C39.5063 42.4639 40.0209 42.2471 40.6185 42.2471C41.8436 42.2471 42.7533 43.0621 42.75 44.1951C42.7533 45.3916 41.7241 46.25 40.2102 46.25Z" fill="#24292E"/>
+</g>
+<path d="M80 0.800641V10H104V1.05456e-06H81.0029L80.0002 0L80 0.800641Z" fill="url(#paint2_linear_1899_468)"/>
+<path d="M104 17H80V24H104V17Z" fill="#84AFF1"/>
+<path d="M104 33H80V40H104V33Z" fill="#84AFF1"/>
+<path d="M104 41H80V48H104V41Z" fill="#84AFF1"/>
+<path d="M91.8577 23C92.9654 23 93.7523 22.3964 93.75 21.5504C93.7523 20.9515 93.3715 20.5238 92.6423 20.4358V20.3978C93.1892 20.317 93.5769 19.9392 93.5746 19.3926C93.5769 18.5989 92.88 18 91.8669 18C90.8469 18 90.1038 18.6084 90.0946 19.4734H91.1862C91.1954 19.1407 91.4861 18.9173 91.8669 18.9173C92.2292 18.9173 92.4761 19.1431 92.4738 19.4686C92.4761 19.8061 92.1854 20.039 91.7654 20.039H91.3062V20.8755H91.7654C92.2431 20.8755 92.5546 21.1179 92.55 21.4601C92.5546 21.8047 92.2685 22.0447 91.8623 22.0447C91.4585 22.0447 91.1608 21.8237 91.1492 21.5029H90C90.0092 22.3821 90.7777 23 91.8577 23Z" fill="#24292E"/>
+<path d="M90 38.1211V37.2886L92.1578 34H93.5256V37.2739H94.1667V38.1211H93.5256V39H92.4808V38.1211H90ZM92.501 37.2739V35.1523H92.4606L91.1003 37.2349V37.2739H92.501Z" fill="#24292E"/>
+<path d="M92.0501 47C90.877 47 90.0221 46.3907 90 45.5381H91.162C91.1897 45.921 91.5743 46.1811 92.0501 46.1811C92.6118 46.1811 93.0129 45.8271 93.0129 45.3141C93.0129 44.7962 92.6035 44.4374 92.0335 44.435C91.6988 44.435 91.3612 44.5626 91.1869 44.7673L90.1217 44.6012L90.3901 42H93.854V42.8526H91.3778L91.2312 44.0881H91.2644C91.4636 43.8449 91.8924 43.6643 92.3904 43.6643C93.4113 43.6643 94.1694 44.3434 94.1667 45.2876C94.1694 46.2847 93.3117 47 92.0501 47Z" fill="#24292E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M104 33H80V47.579H104V33ZM78 28V50H106V28L78 28Z" fill="#CCCCDC"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M104 17H80V24H104V17ZM78 12V26H106V12H78Z" fill="#CCCCDC"/>
+<path d="M65.9067 31.75C66.6011 31.75 71.9327 27.75 71.9327 25.75C71.9327 23.75 66.7357 19.75 65.9067 19.75C65.0777 19.75 64.4023 20.25 64.4023 21.2256C64.4023 22.2012 67.9067 24.6706 67.9067 24.6706C67.9067 24.6706 60.2539 24 60 24.6706C59.7461 25.3411 59.7461 26.1589 60 26.8294C60.2539 27.5 67.9067 26.8294 67.9067 26.8294C67.9067 26.8294 64.4023 29.5 64.4023 30.2801C64.4023 31.0603 65.2123 31.75 65.9067 31.75Z" fill="#CCCCDC"/>
+<path d="M81.25 13H80.1787L79 13.6899V14.6304L80.069 14.0151H80.097V17.5H81.25V13Z" fill="#24292E"/>
+<path d="M79.0655 33.5H82.375V32.6351H80.5631V32.6069L81.0979 32.1171C82.0672 31.2782 82.3204 30.8512 82.3204 30.3418C82.3204 29.5419 81.6633 29 80.6482 29C79.6593 29 78.9978 29.5658 79 30.4697H80.0239C80.0239 30.0686 80.2727 29.8367 80.6438 29.8367C81.0084 29.8367 81.2726 30.06 81.2726 30.4263C81.2726 30.7579 81.063 30.9834 80.6962 31.3107L79.0655 32.7283V33.5Z" fill="#24292E"/>
+<defs>
+<linearGradient id="paint0_linear_1899_468" x1="0.00781255" y1="5.004" x2="24.0078" y2="5.004" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F2CC0C"/>
+<stop offset="1" stop-color="#FF9830"/>
+</linearGradient>
+<linearGradient id="paint1_linear_1899_468" x1="28.0078" y1="5.004" x2="52.0078" y2="5.004" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F2CC0C"/>
+<stop offset="1" stop-color="#FF9830"/>
+</linearGradient>
+<linearGradient id="paint2_linear_1899_468" x1="80.0078" y1="5.004" x2="104.008" y2="5.004" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F2CC0C"/>
+<stop offset="1" stop-color="#FF9830"/>
+</linearGradient>
+<clipPath id="clip0_1899_468">
+<rect width="24" height="48" fill="white"/>
+</clipPath>
+<clipPath id="clip1_1899_468">
+<rect width="24" height="48" fill="white" transform="translate(28)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/img/transformations/dark/regression.svg b/public/img/transformations/dark/regression.svg
new file mode 100644
index 0000000000000..d3b53dfcde98d
--- /dev/null
+++ b/public/img/transformations/dark/regression.svg
@@ -0,0 +1,41 @@
+<svg width="95" height="48" viewBox="0 0 95 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1834_14939)">
+<path d="M0 0.611699V7.64012H14.394V0H0.601504C0.441975 0 0.28898 0.0644467 0.176176 0.179162C0.0633725 0.293878 0 0.449466 0 0.611699Z" fill="url(#paint0_linear_1834_14939)"/>
+<path d="M33.606 7.64012H48V0.611699C48 0.449466 47.9366 0.293878 47.8238 0.179162C47.711 0.0644467 47.558 0 47.3985 0L33.606 0V7.64012Z" fill="url(#paint1_linear_1834_14939)"/>
+<path d="M31.194 0H16.8V7.64012H31.194V0Z" fill="url(#paint2_linear_1834_14939)"/>
+<path d="M31.194 10.0869H16.8V17.727H31.194V10.0869Z" fill="#84AFF1"/>
+<path d="M14.394 10.0869H0V17.727H14.394V10.0869Z" fill="#84AFF1"/>
+<path d="M48 10.0869H33.606V17.727H48V10.0869Z" fill="#84AFF1"/>
+<path d="M48 20.1799H33.606V27.8262H48V20.1799Z" fill="#3865AB"/>
+<path d="M31.194 20.1799H16.8V27.8262H31.194V20.1799Z" fill="#3865AB"/>
+<path d="M14.394 20.1799H0V27.8262H14.394V20.1799Z" fill="#3865AB"/>
+<path d="M31.194 30.2668H16.8V37.907H31.194V30.2668Z" fill="#84AFF1"/>
+<path d="M48 30.2668H33.606V37.907H48V30.2668Z" fill="#84AFF1"/>
+<path d="M14.394 30.2668H0V37.907H14.394V30.2668Z" fill="#84AFF1"/>
+<path d="M31.194 40.3599H16.8V48H31.194V40.3599Z" fill="#3865AB"/>
+<path d="M48 47.3883V40.3721H33.606V48H47.3985C47.558 48 47.711 47.9355 47.8238 47.8208C47.9366 47.7061 48 47.5505 48 47.3883Z" fill="#3865AB"/>
+<path d="M14.394 48V40.3721H0V47.3883C0 47.5505 0.0633725 47.7061 0.176176 47.8208C0.28898 47.9355 0.441975 48 0.601504 48H14.394Z" fill="#3865AB"/>
+</g>
+<path d="M61.9067 30.4001C62.6011 30.4001 67.9327 26.1334 67.9327 24.0001C67.9327 21.8668 62.7357 17.6001 61.9067 17.6001C61.0777 17.6001 60.4023 18.1334 60.4023 19.1741C60.4023 20.2147 63.9067 22.8487 63.9067 22.8487C63.9067 22.8487 56.2539 22.1334 56 22.8487C55.7461 23.564 55.7461 24.4362 56 25.1515C56.2539 25.8668 63.9067 25.1515 63.9067 25.1515C63.9067 25.1515 60.4023 28.0001 60.4023 28.8323C60.4023 29.6644 61.2123 30.4001 61.9067 30.4001Z" fill="#CCCCDC"/>
+<path d="M93.9457 25.1875C93.9457 26.9347 93.4911 28.3835 92.4542 29.6477H90.5366C91.3178 28.7102 91.9002 26.8637 91.9002 25.1875C91.9002 23.5114 91.3178 21.6648 90.5366 20.7273H92.4542C93.4911 21.9915 93.9457 23.4404 93.9457 25.1875Z" fill="white"/>
+<path d="M86.6153 22.5457L87.4107 24.236L88.2488 22.5457H90.1948L88.7317 25.2729L90.2658 28.0002H88.334L87.4107 26.2672L86.5158 28.0002H84.5556L86.1039 25.2729L84.655 22.5457H86.6153Z" fill="white"/>
+<path d="M80.8757 25.1875C80.8757 23.4404 81.3303 21.9915 82.3672 20.7273H84.2848C83.5036 21.6648 82.9212 23.5114 82.9212 25.1875C82.9212 26.8637 83.5036 28.7102 84.2848 29.6477H82.3672C81.3303 28.3835 80.8757 26.9347 80.8757 25.1875Z" fill="white"/>
+<path d="M79.7642 22.5456V23.966H78.7699V28.0001H76.8097V23.966H76.1136V22.5456H76.8097V22.3893C76.8097 21.0399 77.5767 20.3865 78.7699 20.3865C79.2671 20.3865 79.7926 20.4859 80.0199 20.5427L79.7358 21.949C79.5938 21.9064 79.3807 21.878 79.2386 21.878C78.8693 21.878 78.7699 22.0484 78.7699 22.3041V22.5456H79.7642Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_1834_14939" x1="0" y1="3.82312" x2="14.394" y2="3.82312" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F2CC0C"/>
+<stop offset="1" stop-color="#FF9830"/>
+</linearGradient>
+<linearGradient id="paint1_linear_1834_14939" x1="33.606" y1="3.82312" x2="48" y2="3.82312" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F2CC0C"/>
+<stop offset="1" stop-color="#FF9830"/>
+</linearGradient>
+<linearGradient id="paint2_linear_1834_14939" x1="16.8" y1="3.82312" x2="31.2" y2="3.82312" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F2CC0C"/>
+<stop offset="1" stop-color="#FF9830"/>
+</linearGradient>
+<clipPath id="clip0_1834_14939">
+<rect width="48" height="48" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/img/transformations/disabled/groupToNestedTable.svg b/public/img/transformations/disabled/groupToNestedTable.svg
new file mode 100644
index 0000000000000..fe73d885f7b0e
--- /dev/null
+++ b/public/img/transformations/disabled/groupToNestedTable.svg
@@ -0,0 +1,40 @@
+<svg width="106" height="50" viewBox="0 0 106 50" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1899_35965)">
+<path d="M0 0.800641V10H24V1.05456e-06H1.00292L0.000198677 0L0 0.800641Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M24 13H0V22.5H24V13Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M24 25.75H0V35.25H24V25.75Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M24 38.5H0V48H24V38.5Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M13 14.6179H11.5716L10 15.5378V16.7917L11.4253 15.9714H11.4627V20.6179H13V14.6179Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M9.83733 33.5H14.25V32.3468H11.8341V32.3092L12.5472 31.6561C13.8396 30.5376 14.1772 29.9682 14.1772 29.289C14.1772 28.2225 13.3011 27.5 11.9476 27.5C10.629 27.5 9.7471 28.2543 9.75001 29.4595H11.1151C11.1151 28.9249 11.447 28.6156 11.9418 28.6156C12.4279 28.6156 12.7801 28.9133 12.7801 29.4017C12.7801 29.8439 12.5006 30.1445 12.0116 30.5809L9.83733 32.4711V33.5Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M9.83733 46.25H14.25V45.0968H11.8341V45.0592L12.5472 44.4061C13.8396 43.2876 14.1772 42.7182 14.1772 42.039C14.1772 40.9725 13.3011 40.25 11.9476 40.25C10.629 40.25 9.7471 41.0043 9.75001 42.2095H11.1151C11.1151 41.6749 11.447 41.3656 11.9418 41.3656C12.4279 41.3656 12.7801 41.6633 12.7801 42.1517C12.7801 42.5939 12.5006 42.8945 12.0116 43.3309L9.83733 45.2211V46.25Z" fill="#CCCCDC" fill-opacity="0.4"/>
+</g>
+<g clip-path="url(#clip1_1899_35965)">
+<path d="M28 0.800641V10H52V1.05456e-06H29.0029L28.0002 0L28 0.800641Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M52 13H28V22.5H52V13Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M52 25.75H28V35.25H52V25.75Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M52 38.5H28V48H52V38.5Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M39.9792 20.875C41.3085 20.875 42.2528 20.1507 42.25 19.1355C42.2528 18.4168 41.7958 17.9035 40.9208 17.798V17.7524C41.5771 17.6554 42.0423 17.202 42.0395 16.5461C42.0423 15.5936 41.206 14.875 39.9903 14.875C38.7663 14.875 37.8746 15.605 37.8635 16.6431H39.1734C39.1845 16.2438 39.5334 15.9758 39.9903 15.9758C40.4251 15.9758 40.7214 16.2467 40.7186 16.6374C40.7214 17.0423 40.3725 17.3218 39.8685 17.3218H39.3174V18.3256H39.8685C40.4417 18.3256 40.8155 18.6164 40.81 19.0271C40.8155 19.4406 40.4721 19.7286 39.9848 19.7286C39.5001 19.7286 39.1429 19.4634 39.1291 19.0784H37.75C37.7611 20.1336 38.6832 20.875 39.9792 20.875Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M37.5 32.4453V31.4463L40.0893 27.5H41.7308V31.4287H42.5V32.4453H41.7308V33.5H40.477V32.4453H37.5ZM40.5012 31.4287V28.8828H40.4528L38.8204 31.3818V31.4287H40.5012Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M40.2102 46.25C38.8025 46.25 37.7766 45.5188 37.75 44.4957H39.1444C39.1776 44.9552 39.6391 45.2673 40.2102 45.2673C40.8841 45.2673 41.3655 44.8425 41.3655 44.2269C41.3655 43.6055 40.8742 43.1749 40.1902 43.172C39.7885 43.172 39.3835 43.3251 39.1743 43.5708L37.8961 43.3714L38.2181 40.25H42.3748V41.2731H39.4034L39.2274 42.7558H39.2673C39.5063 42.4639 40.0209 42.2471 40.6185 42.2471C41.8436 42.2471 42.7533 43.0621 42.75 44.1951C42.7533 45.3916 41.7241 46.25 40.2102 46.25Z" fill="#CCCCDC" fill-opacity="0.4"/>
+</g>
+<path d="M80 0.800641V10H104V1.05456e-06H81.0029L80.0002 0L80 0.800641Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M104 17H80V24H104V17Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M104 33H80V40H104V33Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M104 41H80V48H104V41Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M91.8577 23C92.9654 23 93.7523 22.3964 93.75 21.5504C93.7523 20.9515 93.3715 20.5238 92.6423 20.4358V20.3978C93.1892 20.317 93.5769 19.9392 93.5746 19.3926C93.5769 18.5989 92.88 18 91.8669 18C90.8469 18 90.1038 18.6084 90.0946 19.4734H91.1862C91.1954 19.1407 91.4861 18.9173 91.8669 18.9173C92.2292 18.9173 92.4761 19.1431 92.4738 19.4686C92.4761 19.8061 92.1854 20.039 91.7654 20.039H91.3062V20.8755H91.7654C92.2431 20.8755 92.5546 21.1179 92.55 21.4601C92.5546 21.8047 92.2685 22.0447 91.8623 22.0447C91.4585 22.0447 91.1608 21.8237 91.1492 21.5029H90C90.0092 22.3821 90.7777 23 91.8577 23Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M90 38.1211V37.2886L92.1578 34H93.5256V37.2739H94.1667V38.1211H93.5256V39H92.4808V38.1211H90ZM92.501 37.2739V35.1523H92.4606L91.1003 37.2349V37.2739H92.501Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M92.0501 47C90.877 47 90.0221 46.3907 90 45.5381H91.162C91.1897 45.921 91.5743 46.1811 92.0501 46.1811C92.6118 46.1811 93.0129 45.8271 93.0129 45.3141C93.0129 44.7962 92.6035 44.4374 92.0335 44.435C91.6988 44.435 91.3612 44.5626 91.1869 44.7673L90.1217 44.6012L90.3901 42H93.854V42.8526H91.3778L91.2312 44.0881H91.2644C91.4636 43.8449 91.8924 43.6643 92.3904 43.6643C93.4113 43.6643 94.1694 44.3434 94.1667 45.2876C94.1694 46.2847 93.3117 47 92.0501 47Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M104 33H80V47.579H104V33ZM78 28V50H106V28L78 28Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M104 17H80V24H104V17ZM78 12V26H106V12H78Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M65.9067 31.75C66.6011 31.75 71.9327 27.75 71.9327 25.75C71.9327 23.75 66.7357 19.75 65.9067 19.75C65.0777 19.75 64.4023 20.25 64.4023 21.2256C64.4023 22.2012 67.9067 24.6706 67.9067 24.6706C67.9067 24.6706 60.2539 24 60 24.6706C59.7461 25.3411 59.7461 26.1589 60 26.8294C60.2539 27.5 67.9067 26.8294 67.9067 26.8294C67.9067 26.8294 64.4023 29.5 64.4023 30.2801C64.4023 31.0603 65.2123 31.75 65.9067 31.75Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M81.25 13H80.1787L79 13.6899V14.6304L80.069 14.0151H80.097V17.5H81.25V13Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M79.0655 33.5H82.375V32.6351H80.5631V32.6069L81.0979 32.1171C82.0672 31.2782 82.3204 30.8512 82.3204 30.3418C82.3204 29.5419 81.6633 29 80.6482 29C79.6593 29 78.9978 29.5658 79 30.4697H80.0239C80.0239 30.0686 80.2727 29.8367 80.6438 29.8367C81.0084 29.8367 81.2726 30.06 81.2726 30.4263C81.2726 30.7579 81.063 30.9834 80.6962 31.3107L79.0655 32.7283V33.5Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<defs>
+<clipPath id="clip0_1899_35965">
+<rect width="24" height="48" fill="white"/>
+</clipPath>
+<clipPath id="clip1_1899_35965">
+<rect width="24" height="48" fill="white" transform="translate(28)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/img/transformations/disabled/timeSeriesTable.svg b/public/img/transformations/disabled/timeSeriesTable.svg
new file mode 100644
index 0000000000000..7a32c9940cc28
--- /dev/null
+++ b/public/img/transformations/disabled/timeSeriesTable.svg
@@ -0,0 +1,33 @@
+<svg width="124" height="48" viewBox="0 0 124 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1764_106195)">
+<path d="M76 0.611699V7.64012H90.394V0H76.6015C76.442 0 76.289 0.0644467 76.1762 0.179162C76.0634 0.293878 76 0.449466 76 0.611699Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M109.606 7.64012H124V0.611699C124 0.449466 123.937 0.293878 123.824 0.179162C123.711 0.0644467 123.558 0 123.398 0L109.606 0V7.64012Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M107.194 0H92.8V7.64012H107.194V0Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M107.194 10.0869H92.8V17.727H107.194V10.0869Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M90.394 10.0869H76V17.727H90.394V10.0869Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M124 10.0869H109.606V17.727H124V10.0869Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M124 20.1799H109.606V27.8262H124V20.1799Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M107.194 20.1799H92.8V27.8262H107.194V20.1799Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M90.394 20.1799H76V27.8262H90.394V20.1799Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M107.194 30.2668H92.8V37.907H107.194V30.2668Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M124 30.2668H109.606V37.907H124V30.2668Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M90.394 30.2668H76V37.907H90.394V30.2668Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M107.194 40.3599H92.8V48H107.194V40.3599Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M124 47.3883V40.3721H109.606V48H123.398C123.558 48 123.711 47.9355 123.824 47.8208C123.937 47.7061 124 47.5505 124 47.3883Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M90.394 48V40.3721H76V47.3883C76 47.5505 76.0634 47.7061 76.1762 47.8208C76.289 47.9355 76.442 48 76.6015 48H90.394Z" fill="#CCCCDC" fill-opacity="0.04"/>
+</g>
+<path d="M61.9067 30.4C62.6011 30.4 67.9327 26.1333 67.9327 24C67.9327 21.8666 62.7357 17.6 61.9067 17.6C61.0777 17.6 60.4023 18.1333 60.4023 19.1739C60.4023 20.2146 63.9067 22.8486 63.9067 22.8486C63.9067 22.8486 56.2539 22.1333 56 22.8486C55.7461 23.5639 55.7461 24.4361 56 25.1514C56.2539 25.8666 63.9067 25.1514 63.9067 25.1514C63.9067 25.1514 60.4023 28 60.4023 28.8321C60.4023 29.6643 61.2123 30.4 61.9067 30.4Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<g clip-path="url(#clip1_1764_106195)">
+<path d="M20.5657 14.8473C20.3886 14.8474 20.2136 14.8094 20.0525 14.736L10.963 10.6159L1.68804 14.1483C1.38138 14.2648 1.04102 14.2546 0.741842 14.12C0.442666 13.9854 0.209179 13.7375 0.0927449 13.4307C-0.0236892 13.1238 -0.0135325 12.7833 0.120981 12.484C0.255494 12.1847 0.503345 11.9511 0.81001 11.8346L10.5796 8.12275C10.8825 7.9973 11.2228 7.9973 11.5257 8.12275L20.2813 12.0882L29.5562 2.19003C29.7339 2.01998 29.9583 1.90678 30.2006 1.86491C30.4429 1.82304 30.6922 1.85438 30.9166 1.95495L40.2843 6.01939L49.0832 0.204206C49.2187 0.111618 49.3713 0.0469507 49.5321 0.0139747C49.6929 -0.0190012 49.8586 -0.0196266 50.0197 0.0121352C50.1807 0.043897 50.3338 0.10741 50.47 0.198973C50.6063 0.290536 50.7229 0.408317 50.8132 0.545449C50.9035 0.682581 50.9656 0.836322 50.9959 0.997709C51.0262 1.1591 51.024 1.3249 50.9896 1.48546C50.9552 1.64602 50.8892 1.79812 50.7954 1.93289C50.7017 2.06766 50.582 2.18241 50.4435 2.27045L41.0881 8.45682C40.916 8.56985 40.7184 8.63811 40.5133 8.6554C40.3081 8.67268 40.1019 8.63845 39.9133 8.5558L30.7434 4.57178L21.4685 14.47C21.3516 14.591 21.2112 14.6869 21.056 14.7518C20.9008 14.8167 20.7339 14.8492 20.5657 14.8473Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M49.7632 10.9623L40.4079 20.8605L30.4342 13.4368L20.5656 20.8605L11.0062 19.0046L1.23657 27.0468H1.30459V47.9939H49.8931L49.7632 10.9623Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M1.30458 28.2841H1.23657C0.98245 28.2834 0.734739 28.2043 0.527135 28.0577C0.319532 27.911 0.162116 27.704 0.0763042 27.4647C-0.00950775 27.2254 -0.0195494 26.9654 0.0475455 26.7202C0.11464 26.475 0.255614 26.2564 0.451287 26.0942L10.2209 18.0519C10.3614 17.9361 10.5257 17.8528 10.702 17.8079C10.8784 17.763 11.0625 17.7576 11.2412 17.7921L20.2626 19.5428L29.6798 12.447C29.8939 12.2864 30.1542 12.1996 30.4218 12.1996C30.6894 12.1996 30.9498 12.2864 31.1638 12.447L40.2533 19.2149L48.8481 10.1148C48.9577 9.9891 49.0916 9.88688 49.2417 9.81428C49.3918 9.74167 49.555 9.70018 49.7215 9.6923C49.8881 9.68442 50.0545 9.7103 50.2107 9.76841C50.367 9.82651 50.5099 9.91562 50.6309 10.0304C50.7519 10.1452 50.8484 10.2832 50.9147 10.4363C50.981 10.5893 51.0156 10.7542 51.0166 10.921C51.0176 11.0878 50.9848 11.2531 50.9203 11.4069C50.8558 11.5607 50.7609 11.6999 50.6413 11.816L41.3045 21.7142C41.0966 21.9331 40.8159 22.0685 40.5152 22.0947C40.2145 22.1209 39.9147 22.0362 39.6721 21.8565L30.4404 14.9835L21.3076 21.8503C21.1698 21.9547 21.0117 22.0289 20.8434 22.0684C20.6751 22.1078 20.5004 22.1115 20.3307 22.0792L11.3401 20.3347L2.31247 27.7583C2.19874 27.9202 2.04786 28.0524 1.87249 28.1439C1.69712 28.2354 1.50237 28.2835 1.30458 28.2841Z" fill="#CCCCDC" fill-opacity="0.12"/>
+</g>
+<defs>
+<clipPath id="clip0_1764_106195">
+<rect width="48" height="48" fill="white" transform="translate(76)"/>
+</clipPath>
+<clipPath id="clip1_1764_106195">
+<rect width="51" height="48" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/img/transformations/light/groupToNestedTable.svg b/public/img/transformations/light/groupToNestedTable.svg
new file mode 100644
index 0000000000000..31c148c855edf
--- /dev/null
+++ b/public/img/transformations/light/groupToNestedTable.svg
@@ -0,0 +1,52 @@
+<svg width="106" height="50" viewBox="0 0 106 50" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1899_521)">
+<path d="M0 0.800641V10H24V1.05456e-06H1.00292L0.000198677 0L0 0.800641Z" fill="url(#paint0_linear_1899_521)"/>
+<path d="M24 13H0V22.5H24V13Z" fill="#84AFF1"/>
+<path d="M24 25.75H0V35.25H24V25.75Z" fill="#84AFF1"/>
+<path d="M24 38.5H0V48H24V38.5Z" fill="#84AFF1"/>
+<path d="M13 14.6179H11.5716L10 15.5378V16.7917L11.4253 15.9714H11.4627V20.6179H13V14.6179Z" fill="#24292E"/>
+<path d="M9.83733 33.5H14.25V32.3468H11.8341V32.3092L12.5472 31.6561C13.8396 30.5376 14.1772 29.9682 14.1772 29.289C14.1772 28.2225 13.3011 27.5 11.9476 27.5C10.629 27.5 9.7471 28.2543 9.75001 29.4595H11.1151C11.1151 28.9249 11.447 28.6156 11.9418 28.6156C12.4279 28.6156 12.7801 28.9133 12.7801 29.4017C12.7801 29.8439 12.5006 30.1445 12.0116 30.5809L9.83733 32.4711V33.5Z" fill="#24292E"/>
+<path d="M9.83733 46.25H14.25V45.0968H11.8341V45.0592L12.5472 44.4061C13.8396 43.2876 14.1772 42.7182 14.1772 42.039C14.1772 40.9725 13.3011 40.25 11.9476 40.25C10.629 40.25 9.7471 41.0043 9.75001 42.2095H11.1151C11.1151 41.6749 11.447 41.3656 11.9418 41.3656C12.4279 41.3656 12.7801 41.6633 12.7801 42.1517C12.7801 42.5939 12.5006 42.8945 12.0116 43.3309L9.83733 45.2211V46.25Z" fill="#24292E"/>
+</g>
+<g clip-path="url(#clip1_1899_521)">
+<path d="M28 0.800641V10H52V1.05456e-06H29.0029L28.0002 0L28 0.800641Z" fill="url(#paint1_linear_1899_521)"/>
+<path d="M52 13H28V22.5H52V13Z" fill="#84AFF1"/>
+<path d="M52 25.75H28V35.25H52V25.75Z" fill="#84AFF1"/>
+<path d="M52 38.5H28V48H52V38.5Z" fill="#84AFF1"/>
+<path d="M39.9792 20.875C41.3085 20.875 42.2528 20.1507 42.25 19.1355C42.2528 18.4168 41.7958 17.9035 40.9208 17.798V17.7524C41.5771 17.6554 42.0423 17.202 42.0395 16.5461C42.0423 15.5936 41.206 14.875 39.9903 14.875C38.7663 14.875 37.8746 15.605 37.8635 16.6431H39.1734C39.1845 16.2438 39.5334 15.9758 39.9903 15.9758C40.4251 15.9758 40.7214 16.2467 40.7186 16.6374C40.7214 17.0423 40.3725 17.3218 39.8685 17.3218H39.3174V18.3256H39.8685C40.4417 18.3256 40.8155 18.6164 40.81 19.0271C40.8155 19.4406 40.4721 19.7286 39.9848 19.7286C39.5001 19.7286 39.1429 19.4634 39.1291 19.0784H37.75C37.7611 20.1336 38.6832 20.875 39.9792 20.875Z" fill="#24292E"/>
+<path d="M37.5 32.4453V31.4463L40.0893 27.5H41.7308V31.4287H42.5V32.4453H41.7308V33.5H40.477V32.4453H37.5ZM40.5012 31.4287V28.8828H40.4528L38.8204 31.3818V31.4287H40.5012Z" fill="#24292E"/>
+<path d="M40.2102 46.25C38.8025 46.25 37.7766 45.5188 37.75 44.4957H39.1444C39.1776 44.9552 39.6391 45.2673 40.2102 45.2673C40.8841 45.2673 41.3655 44.8425 41.3655 44.2269C41.3655 43.6055 40.8742 43.1749 40.1902 43.172C39.7885 43.172 39.3835 43.3251 39.1743 43.5708L37.8961 43.3714L38.2181 40.25H42.3748V41.2731H39.4034L39.2274 42.7558H39.2673C39.5063 42.4639 40.0209 42.2471 40.6185 42.2471C41.8436 42.2471 42.7533 43.0621 42.75 44.1951C42.7533 45.3916 41.7241 46.25 40.2102 46.25Z" fill="#24292E"/>
+</g>
+<path d="M80 0.800641V10H104V1.05456e-06H81.0029L80.0002 0L80 0.800641Z" fill="url(#paint2_linear_1899_521)"/>
+<path d="M104 17H80V24H104V17Z" fill="#84AFF1"/>
+<path d="M104 33H80V40H104V33Z" fill="#84AFF1"/>
+<path d="M104 41H80V48H104V41Z" fill="#84AFF1"/>
+<path d="M91.8577 23C92.9654 23 93.7523 22.3964 93.75 21.5504C93.7523 20.9515 93.3715 20.5238 92.6423 20.4358V20.3978C93.1892 20.317 93.5769 19.9392 93.5746 19.3926C93.5769 18.5989 92.88 18 91.8669 18C90.8469 18 90.1038 18.6084 90.0946 19.4734H91.1862C91.1954 19.1407 91.4861 18.9173 91.8669 18.9173C92.2292 18.9173 92.4761 19.1431 92.4738 19.4686C92.4761 19.8061 92.1854 20.039 91.7654 20.039H91.3062V20.8755H91.7654C92.2431 20.8755 92.5546 21.1179 92.55 21.4601C92.5546 21.8047 92.2685 22.0447 91.8623 22.0447C91.4585 22.0447 91.1608 21.8237 91.1492 21.5029H90C90.0092 22.3821 90.7777 23 91.8577 23Z" fill="#24292E"/>
+<path d="M90 38.1211V37.2886L92.1578 34H93.5256V37.2739H94.1667V38.1211H93.5256V39H92.4808V38.1211H90ZM92.501 37.2739V35.1523H92.4606L91.1003 37.2349V37.2739H92.501Z" fill="#24292E"/>
+<path d="M92.0501 47C90.877 47 90.0221 46.3907 90 45.5381H91.162C91.1897 45.921 91.5743 46.1811 92.0501 46.1811C92.6118 46.1811 93.0129 45.8271 93.0129 45.3141C93.0129 44.7962 92.6035 44.4374 92.0335 44.435C91.6988 44.435 91.3612 44.5626 91.1869 44.7673L90.1217 44.6012L90.3901 42H93.854V42.8526H91.3778L91.2312 44.0881H91.2644C91.4636 43.8449 91.8924 43.6643 92.3904 43.6643C93.4113 43.6643 94.1694 44.3434 94.1667 45.2876C94.1694 46.2847 93.3117 47 92.0501 47Z" fill="#24292E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M104 33H80V47.579H104V33ZM78 28V50H106V28L78 28Z" fill="#24292E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M104 17H80V24H104V17ZM78 12V26H106V12H78Z" fill="#24292E"/>
+<path d="M65.9067 31.75C66.6011 31.75 71.9327 27.75 71.9327 25.75C71.9327 23.75 66.7357 19.75 65.9067 19.75C65.0777 19.75 64.4023 20.25 64.4023 21.2256C64.4023 22.2012 67.9067 24.6706 67.9067 24.6706C67.9067 24.6706 60.2539 24 60 24.6706C59.7461 25.3411 59.7461 26.1589 60 26.8294C60.2539 27.5 67.9067 26.8294 67.9067 26.8294C67.9067 26.8294 64.4023 29.5 64.4023 30.2801C64.4023 31.0603 65.2123 31.75 65.9067 31.75Z" fill="#24292E"/>
+<path d="M81.25 13H80.1787L79 13.6899V14.6304L80.069 14.0151H80.097V17.5H81.25V13Z" fill="white"/>
+<path d="M79.0655 33.5H82.375V32.6351H80.5631V32.6069L81.0979 32.1171C82.0672 31.2782 82.3204 30.8512 82.3204 30.3418C82.3204 29.5419 81.6633 29 80.6482 29C79.6593 29 78.9978 29.5658 79 30.4697H80.0239C80.0239 30.0686 80.2727 29.8367 80.6438 29.8367C81.0084 29.8367 81.2726 30.06 81.2726 30.4263C81.2726 30.7579 81.063 30.9834 80.6962 31.3107L79.0655 32.7283V33.5Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_1899_521" x1="0.00781255" y1="5.004" x2="24.0078" y2="5.004" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F2CC0C"/>
+<stop offset="1" stop-color="#FF9830"/>
+</linearGradient>
+<linearGradient id="paint1_linear_1899_521" x1="28.0078" y1="5.004" x2="52.0078" y2="5.004" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F2CC0C"/>
+<stop offset="1" stop-color="#FF9830"/>
+</linearGradient>
+<linearGradient id="paint2_linear_1899_521" x1="80.0078" y1="5.004" x2="104.008" y2="5.004" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F2CC0C"/>
+<stop offset="1" stop-color="#FF9830"/>
+</linearGradient>
+<clipPath id="clip0_1899_521">
+<rect width="24" height="48" fill="white"/>
+</clipPath>
+<clipPath id="clip1_1899_521">
+<rect width="24" height="48" fill="white" transform="translate(28)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/img/transformations/light/regression.svg b/public/img/transformations/light/regression.svg
new file mode 100644
index 0000000000000..b9c80a7188986
--- /dev/null
+++ b/public/img/transformations/light/regression.svg
@@ -0,0 +1,41 @@
+<svg width="95" height="48" viewBox="0 0 95 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1834_45844)">
+<path d="M0 0.611699V7.64012H14.394V0H0.601504C0.441975 0 0.28898 0.0644467 0.176176 0.179162C0.0633725 0.293878 0 0.449466 0 0.611699Z" fill="url(#paint0_linear_1834_45844)"/>
+<path d="M33.606 7.64012H48V0.611699C48 0.449466 47.9366 0.293878 47.8238 0.179162C47.711 0.0644467 47.558 0 47.3985 0L33.606 0V7.64012Z" fill="url(#paint1_linear_1834_45844)"/>
+<path d="M31.194 0H16.8V7.64012H31.194V0Z" fill="url(#paint2_linear_1834_45844)"/>
+<path d="M31.194 10.0869H16.8V17.727H31.194V10.0869Z" fill="#84AFF1"/>
+<path d="M14.394 10.0869H0V17.727H14.394V10.0869Z" fill="#84AFF1"/>
+<path d="M48 10.0869H33.606V17.727H48V10.0869Z" fill="#84AFF1"/>
+<path d="M48 20.1799H33.606V27.8262H48V20.1799Z" fill="#3865AB"/>
+<path d="M31.194 20.1799H16.8V27.8262H31.194V20.1799Z" fill="#3865AB"/>
+<path d="M14.394 20.1799H0V27.8262H14.394V20.1799Z" fill="#3865AB"/>
+<path d="M31.194 30.2668H16.8V37.907H31.194V30.2668Z" fill="#84AFF1"/>
+<path d="M48 30.2668H33.606V37.907H48V30.2668Z" fill="#84AFF1"/>
+<path d="M14.394 30.2668H0V37.907H14.394V30.2668Z" fill="#84AFF1"/>
+<path d="M31.194 40.3599H16.8V48H31.194V40.3599Z" fill="#3865AB"/>
+<path d="M48 47.3883V40.3721H33.606V48H47.3985C47.558 48 47.711 47.9355 47.8238 47.8208C47.9366 47.7061 48 47.5505 48 47.3883Z" fill="#3865AB"/>
+<path d="M14.394 48V40.3721H0V47.3883C0 47.5505 0.0633725 47.7061 0.176176 47.8208C0.28898 47.9355 0.441975 48 0.601504 48H14.394Z" fill="#3865AB"/>
+</g>
+<path d="M61.9067 30.4001C62.6011 30.4001 67.9327 26.1334 67.9327 24.0001C67.9327 21.8668 62.7357 17.6001 61.9067 17.6001C61.0778 17.6001 60.4023 18.1334 60.4023 19.1741C60.4023 20.2147 63.9067 22.8487 63.9067 22.8487C63.9067 22.8487 56.2539 22.1334 56 22.8487C55.7461 23.564 55.7461 24.4362 56 25.1515C56.2539 25.8668 63.9067 25.1515 63.9067 25.1515C63.9067 25.1515 60.4023 28.0001 60.4023 28.8323C60.4023 29.6644 61.2124 30.4001 61.9067 30.4001Z" fill="#CCCCDC"/>
+<path d="M93.832 24.801C93.832 26.5482 93.3775 27.9971 92.3406 29.2613H90.4229C91.2042 28.3238 91.7866 26.4772 91.7866 24.801C91.7866 23.1249 91.2042 21.2783 90.4229 20.3408H92.3406C93.3775 21.605 93.832 23.0539 93.832 24.801Z" fill="#24292E"/>
+<path d="M86.5016 22.1592L87.297 23.8495L88.1351 22.1592H90.0811L88.6181 24.8865L90.1522 27.6137H88.2203L87.297 25.8808L86.4022 27.6137H84.4419L85.9902 24.8865L84.5414 22.1592H86.5016Z" fill="#24292E"/>
+<path d="M80.7621 24.801C80.7621 23.0539 81.2166 21.605 82.2536 20.3408H84.1712C83.3899 21.2783 82.8075 23.1249 82.8075 24.801C82.8075 26.4772 83.3899 28.3238 84.1712 29.2613H82.2536C81.2166 27.9971 80.7621 26.5482 80.7621 24.801Z" fill="#24292E"/>
+<path d="M79.6506 22.1591V23.5795H78.6563V27.6136H76.696V23.5795H76V22.1591H76.696V22.0028C76.696 20.6534 77.4631 20 78.6563 20C79.1534 20 79.679 20.0994 79.9063 20.1562L79.6222 21.5625C79.4801 21.5199 79.267 21.4915 79.125 21.4915C78.7557 21.4915 78.6563 21.6619 78.6563 21.9176V22.1591H79.6506Z" fill="#24292E"/>
+<defs>
+<linearGradient id="paint0_linear_1834_45844" x1="0" y1="3.82312" x2="14.394" y2="3.82312" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F2CC0C"/>
+<stop offset="1" stop-color="#FF9830"/>
+</linearGradient>
+<linearGradient id="paint1_linear_1834_45844" x1="33.606" y1="3.82312" x2="48" y2="3.82312" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F2CC0C"/>
+<stop offset="1" stop-color="#FF9830"/>
+</linearGradient>
+<linearGradient id="paint2_linear_1834_45844" x1="16.8" y1="3.82312" x2="31.2" y2="3.82312" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F2CC0C"/>
+<stop offset="1" stop-color="#FF9830"/>
+</linearGradient>
+<clipPath id="clip0_1834_45844">
+<rect width="48" height="48" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/lib/monaco-languages/kusto.ts b/public/lib/monaco-languages/kusto.ts
index 92adf5f801e87..27a10c4a83aa7 100644
--- a/public/lib/monaco-languages/kusto.ts
+++ b/public/lib/monaco-languages/kusto.ts
@@ -1,5 +1,5 @@
+import { CorsWorker as Worker } from 'app/core/utils/CorsWorker';
+
 export default function loadKusto() {
-  return new Promise<void>((resolve) =>
-    __non_webpack_require__(['vs/language/kusto/monaco.contribution'], () => resolve())
-  );
+  return new Worker(new URL('@kusto/monaco-kusto/release/esm/kusto.worker', import.meta.url));
 }
diff --git a/public/locales/de-DE/grafana.json b/public/locales/de-DE/grafana.json
index d2bd547ab4db6..bc45911293905 100644
--- a/public/locales/de-DE/grafana.json
+++ b/public/locales/de-DE/grafana.json
@@ -1,97 +1,99 @@
 {
-  "_comment": "",
+  "_comment": "Diese Datei ist die zuverlässige Quelle für englische Strings. Bearbeiten Sie diese im Code, um Pluralformen und andere Ausdrücke für die Benutzeroberfläche zu ändern.",
   "access-control": {
     "add-permission": {
-      "role-label": "",
-      "serviceaccount-label": "",
-      "team-label": "",
-      "title": "",
-      "user-label": ""
+      "role-label": "Rolle",
+      "serviceaccount-label": "Service-Konto",
+      "team-label": "Team",
+      "title": "Berechtigung hinzufügen für",
+      "user-label": "Nutzer"
     },
     "add-permissions": {
-      "save": ""
+      "save": "Speichern"
     },
     "permission-list": {
-      "permission": ""
+      "permission": "Berechtigung"
     },
     "permissions": {
-      "add-label": "",
-      "no-permissions": "",
-      "permissions-change-warning": "",
-      "role": "",
-      "serviceaccount": "",
-      "team": "",
-      "title": "",
-      "user": ""
+      "add-label": "Berechtigung hinzufügen",
+      "no-permissions": "Keine Berechtigungen vorhanden",
+      "permissions-change-warning": "Dadurch werden die Berechtigungen für diesen Ordner und alle seine Unterordner geändert. Insgesamt betrifft dies Folgendes:",
+      "role": "Rolle",
+      "serviceaccount": "Service-Konto",
+      "team": "Team",
+      "title": "Berechtigung",
+      "user": "Nutzer"
     }
   },
+  "bouncing-loader": {
+    "label": "Wird geladen"
+  },
   "browse-dashboards": {
     "action": {
-      "cancel-button": "",
-      "cannot-move-folders": "",
-      "delete-button": "",
-      "delete-modal-invalid-text": "",
-      "delete-modal-invalid-title": "",
-      "delete-modal-text": "",
-      "delete-modal-title": "",
-      "deleting": "",
-      "manage-permissions-button": "",
-      "move-button": "",
-      "move-modal-alert": "",
-      "move-modal-field-label": "",
-      "move-modal-text": "",
-      "move-modal-title": "",
-      "moving": "",
-      "new-folder-name-required-phrase": ""
+      "cancel-button": "Abbrechen",
+      "cannot-move-folders": "Ordner können nicht verschoben werden",
+      "delete-button": "Löschen",
+      "delete-modal-invalid-text": "Ein oder mehrere Ordner enthalten Bibliotheksfenster oder Alarmierungsregeln. Löschen Sie diese zuerst, um fortzufahren.",
+      "delete-modal-invalid-title": "Ordner kann nicht gelöscht werden",
+      "delete-modal-text": "Diese Aktion wird folgenden Inhalt löschen:",
+      "delete-modal-title": "Löschen",
+      "deleting": "Löschen...",
+      "manage-permissions-button": "Berechtigungen verwalten",
+      "move-button": "Verschieben",
+      "move-modal-alert": "Das Verschieben dieses Elements kann seine Berechtigungen ändern.",
+      "move-modal-field-label": "Ordnername",
+      "move-modal-text": "Diese Aktion wird folgenden Inhalt verschieben:",
+      "move-modal-title": "Verschieben",
+      "moving": "Verschieben...",
+      "new-folder-name-required-phrase": "Ordnername ist erforderlich."
     },
     "counts": {
-      "alertRule_one": "",
-      "alertRule_other": "",
-      "dashboard_one": "",
-      "dashboard_other": "",
-      "folder_one": "",
-      "folder_other": "",
-      "libraryPanel_one": "",
-      "libraryPanel_other": "",
-      "total_one": "",
-      "total_other": ""
+      "alertRule_one": "{{count}} Alarmierungsregel",
+      "alertRule_other": "{{count}} Alarmierungsregeln",
+      "dashboard_one": "{{count}} Dashboard",
+      "dashboard_other": "{{count}} Dashboards",
+      "folder_one": "{{count}} Ordner",
+      "folder_other": "{{count}} Ordner",
+      "libraryPanel_one": "{{count}} Bibliotheksfenster",
+      "libraryPanel_other": "{{count}} Bibliotheksfenster",
+      "total_one": "{{count}} Element",
+      "total_other": "{{count}} Elemente"
     },
     "dashboards-tree": {
-      "collapse-folder-button": "",
-      "expand-folder-button": "",
-      "name-column": "",
-      "select-all-header-checkbox": "",
-      "select-checkbox": "",
-      "tags-column": ""
+      "collapse-folder-button": "Ordner einklappen {{title}}",
+      "expand-folder-button": "Ordner ausklappen {{title}}",
+      "name-column": "Name",
+      "select-all-header-checkbox": "Alle auswählen",
+      "select-checkbox": "Auswählen",
+      "tags-column": "Tags"
     },
     "folder-actions-button": {
-      "delete": "",
-      "folder-actions": "",
-      "manage-permissions": "",
-      "move": ""
+      "delete": "Löschen",
+      "folder-actions": "Ordneraktionen",
+      "manage-permissions": "Berechtigungen verwalten",
+      "move": "Verschieben"
     },
     "folder-picker": {
-      "accessible-label": "",
-      "button-label": "",
-      "empty-message": "",
-      "error-title": "",
-      "search-placeholder": "",
-      "unknown-error": ""
+      "accessible-label": "Ordner auswählen: {{ label }} aktuell ausgewählt",
+      "button-label": "Ordner auswählen",
+      "clear-selection": "Auswahl löschen",
+      "empty-message": "Keine Ordner gefunden",
+      "error-title": "Fehler beim Laden der Ordner",
+      "search-placeholder": "Ordner suchen",
+      "unknown-error": "Unbekannter Fehler"
     },
     "manage-folder-nav": {
-      "alert-rules": "",
-      "dashboards": "",
-      "panels": "",
-      "permissions": "",
-      "settings": ""
+      "alert-rules": "Warnregeln",
+      "dashboards": "Dashboards",
+      "panels": "Fenster"
     },
     "new-folder-form": {
-      "cancel-label": "",
-      "create-label": "",
-      "name-label": ""
+      "cancel-label": "Abbrechen",
+      "create-label": "Erstellen",
+      "name-label": "Ordnername"
     },
     "no-results": {
-      "clear": "",
+      "clear": "Suche und Filter löschen",
       "text": ""
     }
   },
@@ -126,29 +128,104 @@
   },
   "connections": {
     "connect-data": {
-      "category-header-label": ""
+      "category-header-label": "Datenquellen",
+      "empty-message": ""
     },
     "search": {
-      "placeholder": ""
+      "placeholder": "Alle durchsuchen"
     }
   },
   "correlations": {
-    "add-new": "",
+    "add-new": "Neu",
     "alert": {
-      "error-message": "",
-      "title": ""
+      "error-message": "Beim Abrufen der Korrelationsdaten ist ein unbekannter Fehler aufgetreten. Bitte versuchen Sie es erneut.",
+      "title": "Fehler beim Abrufen der Korrelationsdaten"
+    },
+    "basic-info-form": {
+      "description-description": "Optionale Beschreibung mit weiteren Informationen über den Link",
+      "description-label": "Beschreibung",
+      "label-description": "Dieser Name wird als Bezeichnung für die Korrelation verwendet. Dies wird als Button-Text, Menüpunkt oder schwebender Text auf einem Link angezeigt.",
+      "label-label": "Label",
+      "label-placeholder": "z.B. Tempospuren",
+      "label-required": "Dieses Feld ist erforderlich.",
+      "sub-text": "<0>Text definieren, der die Korrelation beschreibt.</0>",
+      "title": "Korrelationsbezeichnung definieren (Schritt 1 von 3)"
     },
     "list": {
-      "delete": "",
-      "label": "",
-      "loading": "",
-      "read-only": "",
-      "source": "",
-      "target": ""
-    },
-    "page-content": "",
-    "page-heading": "",
-    "sub-title": ""
+      "delete": "Korrelation löschen",
+      "label": "Label",
+      "loading": "wird geladen...",
+      "read-only": "Nur lesen",
+      "source": "Quelle",
+      "target": "Ziel"
+    },
+    "navigation-form": {
+      "add-button": "Hinzufügen",
+      "back-button": "Zurück",
+      "next-button": "Weiter",
+      "save-button": "Speichern"
+    },
+    "page-content": "Um Korrelationen zu aktivieren, fügen Sie es in die Grafana-Konfiguration ein:",
+    "page-heading": "Korrelationen sind deaktiviert",
+    "query-editor": {
+      "control-rules": "Die ausgewählte Zieldatenquelle muss einen Abfrageeditor exportieren.",
+      "data-source-text": "Bitte wählen Sie zuerst eine Zieldatenquelle aus.",
+      "data-source-title": "Keine Datenquelle ausgewählt",
+      "error-text": "Die ausgewählte Datenquelle konnte nicht geladen werden.",
+      "error-title": "Fehler beim Laden der Datenquelle",
+      "loading": "Abfrageeditor wird geladen...",
+      "query-description": "Definieren Sie die Abfrage, die ausgeführt wird, wenn der Link angeklickt wird. Sie können <2>Variablen</2> verwenden, um auf bestimmte Feldwerte zuzugreifen.",
+      "query-editor-title": "Datenquelle exportiert keinen Abfrageeditor.",
+      "query-label": "Abfrage"
+    },
+    "source-form": {
+      "control-required": "Dieses Feld ist erforderlich.",
+      "description": "Sie haben folgende Variablen in der Zielabfrage verwendet: <1></1><2></2>Ein Datenpunkt muss Werte für alle Variablen als Felder oder als Transformationsausgabe bereitstellen, um die Korrelationsschaltfläche in der Visualisierung erscheinen zu lassen.<4></4>Hinweis: Nicht jede Variable muss unten explizit definiert werden. Eine Transformation wie <7>logfmt</7> erzeugt Variablen für jedes Schlüssel-/Wert-Paar.",
+      "heading": "In der Zielabfrage verwendete Variablen",
+      "results-description": "Der Link wird neben dem Wert dieses Feldes angezeigt",
+      "results-label": "Ergebnisfeld",
+      "results-required": "Dieses Feld ist erforderlich.",
+      "source-description": "Die Ergebnisse aus der ausgewählten Quelldatenquelle verfügen über Links, die im Fenster angezeigt werden",
+      "source-label": "Quelle",
+      "sub-text": "<0>Definieren, welche Datenquelle die Korrelation anzeigt und welche Daten die zuvor definierten Variablen ersetzen sollen. </0>",
+      "title": "Konfigurieren Sie die Datenquelle, die auf {{dataSourceName}} verlinkt wird (Schritt 3 von 3)"
+    },
+    "sub-title": "Definieren, wie sich Daten in verschiedenen Datenquellen miteinander verbinden. Lesen Sie mehr in der <2>Dokumentation<1></1></2>",
+    "target-form": {
+      "control-rules": "Dieses Feld ist erforderlich.",
+      "sub-text": "<0>Definieren Sie, mit welcher Datenquelle die Korrelation verknüpft wird und welche Abfrage ausgeführt wird, wenn die Korrelation angeklickt wird.</0>",
+      "target-description": "Geben Sie an, welche Datenquelle beim Anklicken des Links abgefragt wird",
+      "target-label": "Ziel",
+      "title": "Ziel für die Korrelation einrichten (Schritt 2 von 3)"
+    },
+    "trans-details": {
+      "logfmt-description": "Das angegebene Feld mit logfmt analysieren, um Variablen zu erhalten",
+      "logfmt-label": "Logfmt",
+      "regex-description": "Das Feld wird mit Regex analysiert. Verwenden Sie benannte Erfassungsgruppen, um mehrere Variablen zurückzugeben, oder eine einzelne unbenannte Erfassungsgruppe, um eine Variable zu einem benannten Zuordnungswert hinzuzufügen. Regex unterscheidet nicht zwischen Groß- und Kleinschreibung.",
+      "regex-expression": "Verwenden Sie Erfassungsgruppen, um einen Teil des Feldes zu extrahieren.",
+      "regex-label": "Regulärer Ausdruck",
+      "regex-map-values": "Definiert den Namen der Variable, wenn die Erfassungsgruppe nicht benannt ist."
+    },
+    "transform": {
+      "add-button": "Transformation hinzufügen",
+      "heading": "Transformationen",
+      "no-transform": "Keine Transformationen definiert."
+    },
+    "transform-row": {
+      "expression-label": "Ausdruck",
+      "expression-required": "Bitte definieren Sie einen Ausdruck",
+      "expression-tooltip": "Erforderlich für regulären Ausdruck. Der Ausdruck, den die Transformation verwenden wird. Logfmt verwendet keine weiteren Spezifikationen.",
+      "field-input": "Feld",
+      "field-label": "Feld",
+      "field-tooltip": "Optional. Das zu transformierende Feld. Wenn nicht angegeben, wird die Transformation auf das Ergebnisfeld angewendet.",
+      "map-value-label": "Kartenwert",
+      "map-value-tooltip": "Optional. Definiert den Namen der Variablen. Dies ist derzeit nur für reguläre Ausdrücke mit einer einzigen, unbenannten Erfassungsgruppe gültig.",
+      "remove-button": "Entfernen",
+      "remove-tooltip": "Transformation entfernen",
+      "transform-required": "Bitte wählen Sie einen Transformationstyp",
+      "type-label": "Typ",
+      "type-tooltip": "Die Art der Transformation, die auf die Quelldaten angewendet wird."
+    }
   },
   "dashboard": {
     "add-menu": {
@@ -156,21 +233,25 @@
       "paste-panel": "Panel einfügen",
       "row": "Zeile",
       "visualization": "Visualisierung",
-      "widget": ""
+      "widget": "Widget"
+    },
+    "alert-rules-drawer": {
+      "redirect-link": "Liste in Grafana Alerting",
+      "subtitle": "Benachrichtigungsregeln im Zusammenhang mit diesem Dashboard"
     },
     "empty": {
-      "add-library-panel-body": "",
-      "add-library-panel-button": "",
-      "add-library-panel-header": "",
+      "add-library-panel-body": "Visualisierungen hinzufügen, die mit anderen Dashboards geteilt werden.",
+      "add-library-panel-button": "Bibliotheksfenster hinzufügen",
+      "add-library-panel-header": "Ein Bibliotheksfenster hinzufügen",
       "add-visualization-body": "Wählen Sie eine Datenquelle aus und visualisieren und fragen Sie dann Ihre Daten mit Diagrammen, Statistiken und Tabellen ab oder erstellen Sie Listen, Markierungen und andere Widgets.",
       "add-visualization-button": "Visualisierung hinzufügen",
       "add-visualization-header": "Starten Sie Ihr neues Dashboard, indem Sie eine Visualisierung hinzufügen",
-      "add-widget-body": "",
-      "add-widget-button": "",
-      "add-widget-header": "",
-      "import-a-dashboard-body": "",
-      "import-a-dashboard-header": "",
-      "import-dashboard-button": ""
+      "add-widget-body": "Listen, Markdowns und andere Widgets erstellen",
+      "add-widget-button": "Widget hinzufügen",
+      "add-widget-header": "Widget hinzufügen",
+      "import-a-dashboard-body": "Dashboard aus Datei oder <1>grafana.com</1> importieren.",
+      "import-a-dashboard-header": "Dashboard importieren",
+      "import-dashboard-button": "Dashboard importieren"
     },
     "inspect": {
       "data-tab": "Daten",
@@ -226,7 +307,7 @@
     },
     "toolbar": {
       "add": "Hinzufügen",
-      "add-panel": "Panel hinzufügen",
+      "alert-rules": "Warnregeln",
       "mark-favorite": "Als Favorit markieren",
       "open-original": "Original-Dashboard öffnen",
       "playlist-next": "Zum nächsten Dashboard",
@@ -236,133 +317,255 @@
       "save": "Dashboard speichern",
       "settings": "Dashboard-Einstellungen",
       "share": "Dashboard oder Panel teilen",
+      "share-button": "Teilen",
       "unmark-favorite": "Markierung als Favorit entfernen"
     },
     "validation": {
-      "invalid-dashboard-id": "",
-      "invalid-json": "",
-      "tags-expected-array": "",
-      "tags-expected-strings": ""
+      "invalid-dashboard-id": "Konnte keine gültige Grafana.com-ID finden",
+      "invalid-json": "JSON ungültig",
+      "tags-expected-array": "Array der jeweiligen Tags",
+      "tags-expected-strings": "String-Array der jeweiligen Tags"
     }
   },
   "dashboard-import": {
     "file-dropzone": {
-      "primary-text": "",
-      "secondary-text": ""
+      "primary-text": "Dashboard JSON-Datei hochladen",
+      "secondary-text": "Ziehen Sie hierher oder klicken Sie zum Durchsuchen"
     },
     "form-actions": {
-      "cancel": "",
-      "load": ""
+      "cancel": "Abbrechen",
+      "load": "Laden"
     },
     "gcom-field": {
-      "label": "",
-      "load-button": "",
-      "placeholder": "",
-      "validation-required": ""
+      "label": "Dashboards für gängige Anwendungen finden und importieren unter <1></1>",
+      "load-button": "Laden",
+      "placeholder": "Grafana.com Dashboard URL oder ID",
+      "validation-required": "Eine Grafana Dashboard URL oder ID ist erforderlich"
     },
     "json-field": {
-      "label": "",
-      "validation-required": ""
+      "label": "Import per Dashboard JSON-Modell",
+      "validation-required": "Benötigt ein Dashboard JSON-Modell"
     }
   },
   "dashboard-settings": {
     "annotations": {
-      "title": ""
+      "title": "Anmerkungen"
     },
-    "dashboard-delete-button": "",
+    "dashboard-delete-button": "Dashboard löschen",
     "general": {
-      "auto-refresh-description": "",
-      "auto-refresh-label": "",
-      "description-label": "",
-      "editable-description": "",
-      "editable-label": "",
-      "folder-label": "",
-      "panel-options-graph-tooltip-description": "",
-      "panel-options-graph-tooltip-label": "",
-      "panel-options-label": "",
-      "tags-label": "",
-      "title": "",
-      "title-label": ""
+      "auto-refresh-description": "Definieren Sie die automatischen Aktualisierungsintervalle, die in der Liste der automatischen Aktualisierungen verfügbar sein sollen.",
+      "auto-refresh-label": "Automatisch aktualisieren",
+      "description-label": "Beschreibung",
+      "editable-description": "Schreibgeschützt um alle Bearbeitung zu deaktivieren. Aktualisieren Sie das Dashboard, damit Änderungen wirksam werden",
+      "editable-label": "Editierbar",
+      "folder-label": "Ordner",
+      "panel-options-graph-tooltip-description": "Steuert das Tooltip- und Hover-Highlight-Verhalten in verschiedenen Bereichen. Laden Sie das Dashboard neu, damit die Änderungen wirksam werden",
+      "panel-options-graph-tooltip-label": "Graph-Tooltip",
+      "panel-options-label": "Fenster-Optionen",
+      "tags-label": "Tags",
+      "title": "Allgemein",
+      "title-label": "Titel"
     },
     "json-editor": {
-      "save-button": "",
-      "subtitle": "",
-      "title": ""
+      "save-button": "Änderungen speichern",
+      "subtitle": "Das JSON-Modell unten ist die Datenstruktur, die das Dashboard definiert. Dazu gehören Dashboard-Einstellungen, Fenster-Einstellungen, Layout, Abfragen und so weiter.",
+      "title": "JSON-Modell"
     },
     "links": {
-      "title": ""
+      "title": "Links"
     },
     "permissions": {
-      "title": ""
+      "title": "Berechtigungen"
     },
     "settings": {
-      "title": ""
+      "title": "Einstellungen"
     },
     "time-picker": {
-      "hide-time-picker": "",
-      "now-delay-description": "",
-      "now-delay-label": "",
-      "refresh-live-dashboards-description": "",
-      "refresh-live-dashboards-label": "",
-      "time-options-label": "",
-      "time-zone-label": "",
-      "week-start-label": ""
+      "hide-time-picker": "Zeitauswahl ausblenden",
+      "now-delay-description": "Ausschließen aktueller Daten, die unvollständig sein könnten.",
+      "now-delay-label": "Jetzt Verzögerung",
+      "refresh-live-dashboards-description": "Leiste ständig neu zeichnen, in denen der Zeitbereich „jetzt“ referenziert",
+      "refresh-live-dashboards-label": "Live-Dashboards aktualisieren",
+      "time-options-label": "Zeitoptionen",
+      "time-zone-label": "Zeitzone",
+      "week-start-label": "Wochenbeginn"
     },
     "variables": {
-      "title": ""
+      "title": "Variable"
     },
     "versions": {
-      "title": ""
+      "title": "Versionen"
     }
   },
   "data-source-picker": {
-    "add-new-data-source": "",
+    "add-new-data-source": "Neue Datenquelle konfigurieren",
     "built-in-list": {
-      "description-dashboard": "",
-      "description-grafana": "",
-      "description-mixed": ""
+      "description-dashboard": "Abfrageergebnisse von anderen Visualisierungen wiederverwenden",
+      "description-grafana": "Visualisierungen mit Scheindaten entdecken",
+      "description-mixed": "Mehrere Datenquellen verwenden"
     },
     "list": {
-      "no-data-source-message": ""
+      "no-data-source-message": "Keine Datenquellen gefunden"
     },
     "modal": {
-      "configure-new-data-source": "",
-      "input-placeholder": "",
-      "title": ""
+      "configure-new-data-source": "Neuen Tab öffnen und Datenquelle konfigurieren",
+      "input-placeholder": "Datenquelle auswählen",
+      "title": "Datenquelle auswählen"
     },
-    "open-advanced-button": ""
+    "open-advanced-button": "Erweiterte Datenquellauswahl öffnen"
   },
   "data-sources": {
     "datasource-add-button": {
-      "label": ""
+      "label": "Neue Datenquelle hinzufügen"
     }
   },
   "explore": {
-    "add-to-dashboard": "",
+    "add-to-dashboard": "Zum Dashboard hinzufügen",
+    "rich-history": {
+      "close-tooltip": "Abfrageverlauf schließen",
+      "datasource-a-z": "Datenquelle A-Z",
+      "datasource-z-a": "Datenquelle Z-A",
+      "newest-first": "Neueste zuerst",
+      "oldest-first": "Älteste zuerst",
+      "query-history": "Abfrageverlauf",
+      "settings": "Einstellungen",
+      "starred": "Hervorgehoben"
+    },
+    "rich-history-card": {
+      "add-comment-form": "Kommentarformular hinzufügen",
+      "add-comment-tooltip": "Kommentar hinzufügen",
+      "cancel": "Abbrechen",
+      "confirm-delete": "Löschen",
+      "copy-query-tooltip": "Abfrage in Zwischenablage kopieren",
+      "copy-shortened-link-tooltip": "Kopiere verkürzten Link in die Zwischenablage",
+      "datasource-icon-label": "Datenquellen-Symbol",
+      "datasource-name-label": "Datenquellname",
+      "datasource-not-exist": "Datenquelle existiert nicht mehr",
+      "delete-query-confirmation-title": "Löschen",
+      "delete-query-title": "Abfrage löschen",
+      "delete-query-tooltip": "Abfrage löschen",
+      "delete-starred-query-confirmation-text": "Sind Sie sicher, dass Sie die markierte Abfrage dauerhaft löschen möchten?",
+      "edit-comment-tooltip": "Kommentar bearbeiten",
+      "loading-text": "wird geladen...",
+      "optional-description": "Eine optionale Beschreibung dessen, was die Abfrage tut.",
+      "query-comment-label": "Abfrage-Kommentar",
+      "query-text-label": "Abfragetext",
+      "run-query-button": "Abfrage ausführen",
+      "save-comment": "Kommentar speichern",
+      "star-query-tooltip": "Abfrage anwählen",
+      "switch-datasource-button": "Datenquelle wechseln und Abfrage ausführen",
+      "unstar-query-tooltip": "Abfrage abwählen",
+      "update-comment-form": "Kommentarformular aktualisieren"
+    },
+    "rich-history-container": {
+      "loading": "Wird geladen ..."
+    },
+    "rich-history-notification": {
+      "query-copied": "Abfrage in Zwischenablage kopiert",
+      "query-deleted": "Abfrage gelöscht"
+    },
+    "rich-history-queries-tab": {
+      "displaying-partial-queries": "{{ count }} Abfragen anzeigen",
+      "displaying-queries": "{{ count }} Abfragen",
+      "filter-aria-label": "Filterabfragen nach Datenquelle(n)",
+      "filter-history": "Filterverlauf",
+      "filter-placeholder": "Filterabfragen nach Datenquelle(n)",
+      "history-local": "Der Verlauf ist lokal in Ihrem Browser gespeichert und wird nicht mit anderen geteilt.",
+      "loading": "Wird geladen ...",
+      "loading-results": "Ergebnisse werden geladen...",
+      "search-placeholder": "Suchabfragen",
+      "showing-queries": "Zeige {{ shown }} von {{ total }} <0>Mehr laden</0>",
+      "sort-aria-label": "Abfragen sortieren",
+      "sort-placeholder": "Abfragen sortieren nach"
+    },
+    "rich-history-settings-tab": {
+      "alert-info": "Grafana hält Einträge bis {{optionLabel}}. Markierte Einträge werden nicht gelöscht.",
+      "change-default-tab": "Ändern Sie den aktiven Standard-Tab von „Abfragehistorie“ zu „Markiert“",
+      "clear-history-info": "Lösche den gesamten Abfrageverlauf dauerhaft.",
+      "clear-query-history": "Abfrageverlauf löschen",
+      "clear-query-history-button": "Abfrageverlauf löschen",
+      "delete-confirm": "Löschen",
+      "delete-confirm-text": "Sind Sie sicher, dass Sie Ihren Abfrageverlauf dauerhaft löschen möchten?",
+      "delete-title": "Löschen",
+      "history-time-span": "Verlauf Zeitspanne",
+      "history-time-span-description": "Wählen Sie den Zeitraum, für den Grafana Ihren Abfrageverlauf speichern wird. Bis zu {{MAX_HISTORY_ITEMS}} Einträge werden gespeichert.",
+      "only-show-active-datasource": "Nur Abfragen für derzeit aktive Datenquelle anzeigen",
+      "query-history-deleted": "Abfrageverlauf gelöscht",
+      "retention-period": {
+        "1-week": "1 Woche",
+        "2-days": "2 Tage",
+        "2-weeks": "2 Wochen",
+        "5-days": "5 Tage"
+      }
+    },
+    "rich-history-starred-tab": {
+      "filter-queries-aria-label": "Filterabfragen für Datenquelle(n)",
+      "filter-queries-placeholder": "Filterabfragen für Datenquelle(n)",
+      "loading": "Wird geladen ...",
+      "loading-results": "Ergebnisse werden geladen...",
+      "local-history-message": "Der Verlauf ist lokal in Ihrem Browser gespeichert und wird nicht mit anderen geteilt.",
+      "search-queries-placeholder": "Suchabfragen",
+      "showing-queries": "Zeige {{ shown }} von {{ total }} <0>Mehr laden</0>",
+      "sort-queries-aria-label": "Abfragen sortieren",
+      "sort-queries-placeholder": "Abfragen sortieren nach"
+    },
+    "rich-history-utils": {
+      "a-week-ago": "vor einer Woche",
+      "days-ago": "vor {{num}} Tagen",
+      "default-from": "jetzt bis 1 Stunde",
+      "default-to": "jetzt",
+      "today": "heute",
+      "two-weeks-ago": "vor zwei Wochen",
+      "yesterday": "gestern"
+    },
+    "rich-history-utils-notification": {
+      "saving-failed": "Speichern des umfangreichen Verlaufs fehlgeschlagen",
+      "update-failed": "Aktualisierung des umfangreichen Verlaufs fehlgeschlagen"
+    },
+    "secondary-actions": {
+      "query-add-button": "Abfrage hinzufügen",
+      "query-add-button-aria-label": "Abfrage hinzufügen",
+      "query-history-button": "Abfrageverlauf",
+      "query-history-button-aria-label": "Abfrageverlauf",
+      "query-inspector-button": "Abfrage-Inspektor",
+      "query-inspector-button-aria-label": "Abfrage-Inspektor"
+    },
     "table": {
-      "no-data": "",
-      "title": "",
-      "title-with-name": ""
+      "no-data": "0 Serien zurückgegeben",
+      "title": "Tabelle",
+      "title-with-name": "Tabelle - {{name}}"
     },
     "toolbar": {
-      "aria-label": "",
-      "copy-shortened-link": "",
-      "refresh-picker-cancel": "",
-      "refresh-picker-run": "",
-      "split-close": "",
-      "split-close-tooltip": "",
-      "split-narrow": "",
-      "split-title": "",
-      "split-tooltip": "",
-      "split-widen": ""
+      "aria-label": "Werkzeugleiste durchsuchen",
+      "copy-link": "URL kopieren",
+      "copy-link-abs-time": "Absolute URL kopieren",
+      "copy-links-absolute-category": "Zeitsynchronisierte URL-Links (Freigabe mit intaktem Zeitraum)",
+      "copy-links-normal-category": "Normale URL-Links",
+      "copy-shortened-link": "Gekürzte URL kopieren",
+      "copy-shortened-link-abs-time": "Absolut verkürzte URL kopieren",
+      "copy-shortened-link-menu": "Verkürztes Linkmenü öffnen",
+      "refresh-picker-cancel": "Abbrechen",
+      "refresh-picker-run": "Abfrage ausführen",
+      "split-close": "Schließen",
+      "split-close-tooltip": "Teilbereich schließen",
+      "split-narrow": "Schmaler Bereich",
+      "split-title": "Teilen",
+      "split-tooltip": "Bereich teilen",
+      "split-widen": "Bereich verbreitern"
     }
   },
   "folder-picker": {
     "loading": "Ordner werden geladen …"
   },
   "grafana-ui": {
+    "drawer": {
+      "close": "Schließen"
+    },
+    "empty-state": {
+      "not-found-message": ""
+    },
     "modal": {
-      "close-tooltip": ""
+      "close-tooltip": "Schließen"
     },
     "segment-async": {
       "error": "Fehler beim Laden der Optionen",
@@ -370,66 +573,68 @@
       "no-options": "Keine Optionen gefunden"
     },
     "select": {
-      "no-options-label": "",
-      "placeholder": ""
+      "no-options-label": "Keine Optionen gefunden",
+      "placeholder": "Auswählen"
     }
   },
   "graph": {
     "container": {
-      "content": "",
-      "show-all-series": "",
-      "show-only-series": "",
-      "title": ""
+      "content": "Die Darstellung von zu vielen Reihen in einem einzigen Fenster kann die Leistung beeinträchtigen und die Lesbarkeit der Daten erschweren. Erwägen Sie eine Verfeinerung Ihrer Abfragen.",
+      "show-all-series": "Alle {{length}} anzeigen",
+      "show-only-series": "Zeige nur {{MAX_NUMBER_OF_TIME_SERIES}} Serie",
+      "title": "Diagramm"
     }
   },
   "help-modal": {
     "shortcuts-category": {
-      "dashboard": "",
-      "focused-panel": "",
-      "global": "",
-      "time-range": ""
+      "dashboard": "Dashboard",
+      "focused-panel": "Fokussiertes Fenster",
+      "global": "Global",
+      "time-range": "Zeitraum"
     },
     "shortcuts-description": {
-      "change-theme": "",
-      "collapse-all-rows": "",
-      "dashboard-settings": "",
-      "duplicate-panel": "",
-      "exit-edit/setting-views": "",
-      "expand-all-rows": "",
-      "go-to-dashboards": "",
-      "go-to-explore": "",
-      "go-to-home-dashboard": "",
-      "go-to-profile": "",
-      "make-time-range-permanent": "",
-      "move-time-range-back": "",
-      "move-time-range-forward": "",
-      "open-search": "",
-      "open-shared-modal": "",
-      "refresh-all-panels": "",
-      "remove-panel": "",
-      "save-dashboard": "",
-      "show-all-shortcuts": "",
-      "toggle-active-mode": "",
-      "toggle-all-panel-legends": "",
-      "toggle-auto-fit": "",
-      "toggle-exemplars": "",
-      "toggle-graph-crosshair": "",
-      "toggle-kiosk": "",
-      "toggle-panel-edit": "",
-      "toggle-panel-fullscreen": "",
-      "toggle-panel-legend": "",
-      "zoom-out-time-range": ""
-    },
-    "title": ""
+      "change-theme": "Thema ändern",
+      "collapse-all-rows": "Alle Zeilen einklappen",
+      "copy-time-range": "Zeitraum kopieren",
+      "dashboard-settings": "Dashboard-Einstellungen",
+      "duplicate-panel": "Fenster duplizieren",
+      "exit-edit/setting-views": "Ansicht beenden/einstellen",
+      "expand-all-rows": "Alle Zeilen erweitern",
+      "go-to-dashboards": "Gehe zu Dashboards",
+      "go-to-explore": "Gehe zu Erkunden",
+      "go-to-home-dashboard": "Gehe zu Home-Dashboard",
+      "go-to-profile": "Gehe zu Profil",
+      "make-time-range-permanent": "Zeitspanne absolut/dauerhaft machen",
+      "move-time-range-back": "Zeitspanne zurück bewegen",
+      "move-time-range-forward": "Zeitbereich nach vorne verschieben",
+      "open-search": "Suche öffnen",
+      "open-shared-modal": "Geteilter Fenstermodus öffnen",
+      "paste-time-range": "Zeitraum einfügen",
+      "refresh-all-panels": "Alle Fenster aktualisieren",
+      "remove-panel": "Fenster entfernen",
+      "save-dashboard": "Dashboard speichern",
+      "show-all-shortcuts": "Alle Tastaturkürzel anzeigen",
+      "toggle-active-mode": "Inaktiv/Anzeigemodus umschalten",
+      "toggle-all-panel-legends": "Alle Fenster-Legenden umschalten",
+      "toggle-auto-fit": "Automatisches Einpassen von Fenstern umschalten (experimentelle Funktion)",
+      "toggle-exemplars": "Beispiele in allen Fenstern umschalten",
+      "toggle-graph-crosshair": "Gemeinsames Diagrammadenkreuz umschalten",
+      "toggle-kiosk": "Kiosk-Modus umschalten (versteckt obere Navigation)",
+      "toggle-panel-edit": "Fenster bearbeiten-Ansicht umschalten",
+      "toggle-panel-fullscreen": "Vollbildansicht des Fensters umschalten",
+      "toggle-panel-legend": "Legende des Fensters umschalten",
+      "zoom-out-time-range": "Zeitbereich verkleinern"
+    },
+    "title": "Shortcuts"
   },
   "inspector": {
     "query": {
-      "collapse-all": "",
-      "copy-to-clipboard": "",
-      "description": "",
-      "expand-all": "",
-      "no-data": "",
-      "refresh": ""
+      "collapse-all": "Alle einklappen",
+      "copy-to-clipboard": "In die Zwischenablage kopieren",
+      "description": "Mit dem Query Inspector können Sie die Rohdaten von Anfrage und Antwort einsehen. Um diese Daten zu sammeln, muss Grafana eine neue Abfrage erstellen. Klicken Sie unten auf Aktualisieren, um eine neue Abfrage zu starten.",
+      "expand-all": "Alle ausklappen",
+      "no-data": "Noch keine Anfrage und Antwort gesammelt. Auf Aktualisieren klicken",
+      "refresh": "Aktualisieren"
     }
   },
   "library-panel": {
@@ -446,16 +651,19 @@
     }
   },
   "library-panels": {
+    "empty-state": {
+      "message": ""
+    },
     "modal": {
-      "body_one": "",
-      "body_other": "",
-      "button-cancel": "",
-      "button-view-panel1": "",
-      "button-view-panel2": "",
-      "panel-not-linked": "",
-      "select-no-options-message": "",
-      "select-placeholder": "",
-      "title": ""
+      "button-cancel": "<0>Abbrechen</0>",
+      "button-view-panel1": "Fenster in {{label}} anzeigen...",
+      "button-view-panel2": "Fenster im Dashboard anzeigen...",
+      "panel-not-linked": "Fenster ist nicht mit einem Dashboard verbunden. Fügen Sie das Fenster einem Dashboard hinzu und versuchen Sie es erneut.",
+      "select-no-options-message": "Keine Dashboards gefunden",
+      "select-placeholder": "Tippen, um nach Dashboard zu suchen",
+      "title": "Fenster im Dashboard anzeigen",
+      "body_one": "Dieses Fenster wird in {{count}} Dashboard verwendet. Bitte wählen Sie aus, in welchem Dashboard Sie das Fenster sehen möchten:",
+      "body_other": "Dieses Fenster wird in {{count}} Dashboards verwendet. Bitte wählen Sie aus, in welchem Dashboard Sie das Fenster sehen möchten:"
     },
     "save": {
       "error": "Fehler beim Speichern des Bibliotheks-Panels: „{{errorMsg}}“",
@@ -464,20 +672,159 @@
   },
   "login": {
     "error": {
-      "blocked": "",
-      "invalid-user-or-password": "",
-      "title": "",
-      "unknown": ""
+      "blocked": "Sie haben die Anzahl der Anmeldeversuche für diesen Benutzer überschritten. Bitte versuchen Sie es später erneut.",
+      "invalid-user-or-password": "Ungültiger Benutzername oder Passwort",
+      "title": "Login fehlgeschlagen",
+      "unknown": "Unbekannter Fehler aufgetreten"
+    },
+    "forgot-password": "Passwort vergessen?",
+    "form": {
+      "password-label": "Passwort",
+      "password-required": "Passwort ist erforderlich",
+      "submit-label": "Einloggen",
+      "submit-loading-label": "Einloggen...",
+      "username-label": "E-Mail oder Benutzername",
+      "username-required": "E-Mail oder Benutzername ist erforderlich"
+    },
+    "services": {
+      "sing-in-with-prefix": "Mit {{serviceName}} anmelden"
+    },
+    "signup": {
+      "button-label": "Registrieren",
+      "new-to-question": "Neu bei Grafana?"
+    }
+  },
+  "migrate-to-cloud": {
+    "can-i-move": {
+      "body": "Sobald Sie diese Installation mit einem Cloud Stack verbinden, können Sie Datenquellen und Dashboards hochladen.",
+      "link-title": "Erfahren Sie, wie Sie andere Einstellungen migrieren",
+      "title": "Kann ich diese Installation in die Grafana Cloud verschieben?"
+    },
+    "connect-modal": {
+      "body-cloud-stack": "Sie benötigen außerdem einen Cloud Stack. Wenn Sie sich gerade angemeldet haben, erstellen wir automatisch Ihren ersten Stack. Wenn Sie bereits ein Konto haben, müssen Sie einen Stack auswählen oder erstellen.",
+      "body-get-started": "Um loszulegen, benötigen Sie einen Grafana.com-Account.",
+      "body-paste-stack": "Wenn Sie sich für einen Stack entschieden haben, fügen Sie die URL unten ein.",
+      "body-sign-up": "Für einen Grafana.com-Account registrieren",
+      "body-token": "Ihre selbstverwaltete Grafana-Installation benötigt einen speziellen Zugang, um Inhalte sicher zu migrieren. Sie müssen ein Migrationstoken für den von Ihnen gewählten Cloud-Stack erstellen.",
+      "body-token-field": "Migrationstoken",
+      "body-token-field-placeholder": "Token hier einfügen",
+      "body-token-instructions": "Loggen Sie sich in Ihren Cloud Stack ein und navigieren Sie zu Administration, Allgemein, Zu Grafana Cloud migrieren. Erstellen Sie auf diesem Bildschirm ein Migrationstoken und fügen Sie das Token hier ein.",
+      "body-url-field": "Cloud Stack-URL",
+      "body-view-stacks": "Meine Cloud Stacks anzeigen",
+      "cancel": "Abbrechen",
+      "connect": "Mit diesem Stack verbinden",
+      "connecting": "Verbindung mit diesem Stack läuft...",
+      "stack-required-error": "Stack-URL ist erforderlich",
+      "title": "Mit einem Cloud Stack verbinden",
+      "token-required-error": "Migrationstoken ist erforderlich"
+    },
+    "cta": {
+      "button": "Diese Instanz in die Cloud migrieren",
+      "header": "Lassen Sie uns Ihren Grafana Stack verwalten"
+    },
+    "disconnect-modal": {
+      "body": "Dadurch wird das Migrationstoken von dieser Installation entfernt. Wenn Sie in Zukunft weitere Ressourcen hochladen möchten, müssen Sie ein neues Migrationstoken eingeben.",
+      "cancel": "Abbrechen",
+      "disconnect": "Verbindung trennen",
+      "disconnecting": "Verbindung wird getrennt...",
+      "error": "Es gab einen Fehler beim Trennen der Verbindung",
+      "title": "Vom Cloud Stack trennen"
+    },
+    "get-started": {
+      "body": "Der Migrationsprozess muss von Ihrer selbstverwalteten Grafana-Instanz aus gestartet werden.",
+      "configure-pdc-link": "PDC für diesen Stack konfigurieren",
+      "link-title": "Erfahren Sie mehr über Private Data Source Connect",
+      "step-1": "Loggen Sie sich in Ihre selbstverwaltete Instanz ein und navigieren Sie zur Administration, Allgemein, Zu Grafana Cloud migrieren.",
+      "step-2": "Wählen Sie „Diese Instanz in die Cloud migrieren“.",
+      "step-3": "Sie werden nach einem Migrationstoken gefragt. Generieren Sie eines von diesem Bildschirm.",
+      "step-4": "Wählen Sie in Ihrer selbstverwalteten Instanz „Alles hochladen“ aus, um Datenquellen und Dashboards auf diesen Cloud Stack hochzuladen.",
+      "step-5": "Wenn einige Ihrer Datenquellen nicht über das öffentliche Internet funktionieren, müssen Sie Private Data Source Connect in Ihrer selbstverwalteten Umgebung installieren.",
+      "title": "So legen Sie los"
+    },
+    "is-it-secure": {
+      "body": "Grafana Labs verpflichtet sich, die höchsten Standards in Bezug auf Datenschutz und Sicherheit zu wahren. Durch die Einführung branchenüblicher Sicherheitstechnologien und -verfahren schützen wir die Daten unserer Kunden vor unbefugtem Zugriff, Nutzung oder Offenlegung.",
+      "link-title": "Grafana Labs Trust Center",
+      "title": "Ist es sicher?"
+    },
+    "migrate-to-this-stack": {
+      "body": "Einige Konfigurationen von Ihrer selbst verwalteten Grafana-Instanz können automatisch in diesen Cloud Stack kopiert werden.",
+      "link-title": "Gesamte Migrationsanleitung anzeigen",
+      "title": "Konfiguration zu diesem Stack migrieren"
+    },
+    "migration-token": {
+      "body": "Ihre selbst verwaltete Grafana-Instanz benötigt ein spezielles Authentifizierungs-Token, um sich sicher mit diesem Cloud Stack zu verbinden.",
+      "delete-button": "Diesen Migrationstoken löschen",
+      "delete-modal-body": "Wenn Sie dieses Token bereits mit einer selbst verwalteten Installation verwendet haben, kann diese Installation keine Inhalte mehr hochladen.",
+      "delete-modal-cancel": "Abbrechen",
+      "delete-modal-confirm": "Löschen",
+      "delete-modal-deleting": "Wird gelöscht...",
+      "delete-modal-title": "Migrationstoken löschen",
+      "generate-button": "Migrationstoken generieren",
+      "generate-button-loading": "Migrationstoken wird generiert...",
+      "modal-close": "Schließen",
+      "modal-copy-and-close": "In Zwischenablage kopieren und schließen",
+      "modal-copy-button": "In die Zwischenablage kopieren",
+      "modal-field-description": "Kopieren Sie den Token jetzt, denn Sie werden ihn später nicht mehr sehen können. Wenn Sie einen Token verlieren, müssen Sie einen neuen Token erstellen.",
+      "modal-field-label": "Token",
+      "modal-title": "Migrationstoken erstellt",
+      "status": "Aktueller Status: <2></2>",
+      "title": "Migrationstoken"
+    },
+    "pdc": {
+      "body": "Wenn Sie Ihre Datenquellen dem Internet aussetzen, kann dies zu Sicherheitsrisiken führen. Private Data Source Connect (PDC) ermöglicht Grafana Cloud den Zugriff auf Ihre bestehenden Datenquellen über einen sicheren Netzwerktunnel.",
+      "link-title": "Mehr über PDC erfahren",
+      "title": "Nicht alle meine Datenquellen sind im öffentlichen Internet"
+    },
+    "pricing": {
+      "body": "Grafana Cloud bietet einen großzügigen kostenlosen Tarif und eine 14-tägige Testphase mit unbegrenzter Nutzung. Nach Ablauf der Testphase wird Ihnen die Nutzung über die Grenzen des kostenlosen Tarifs hinaus in Rechnung gestellt.",
+      "link-title": "Grafana Cloud Preisgestaltung",
+      "title": "Was kostet es?"
+    },
+    "resource-status": {
+      "error-details-button": "Details",
+      "failed": "Fehler",
+      "migrated": "In die Cloud hochgeladen",
+      "migrating": "Wird hochgeladen...",
+      "not-migrated": "Noch nicht hochgeladen",
+      "unknown": "Unbekannt"
+    },
+    "resource-type": {
+      "dashboard": "Dashboard",
+      "datasource": "Datenquelle",
+      "unknown": "Unbekannt"
+    },
+    "summary": {
+      "disconnect": "",
+      "error-starting-migration": "",
+      "start-migration": "",
+      "target-stack-title": ""
+    },
+    "token-status": {
+      "active": "Token erstellt und aktiv",
+      "no-active": "Kein aktiver Token"
+    },
+    "what-is-cloud": {
+      "body": "Grafana Cloud ist eine vollständig verwaltete, in der Cloud gehostete Observability-Plattform, die ideal für Cloud-native Umgebungen ist. Sie enthält alles, was Sie an Grafana lieben, ohne den Aufwand für Wartung, Upgrades und Betreuung einer Installation.",
+      "link-title": "Erfahren Sie mehr über Cloud-Funktionen",
+      "title": "Was ist Grafana Cloud?"
+    },
+    "why-host": {
+      "body": "Zusätzlich zum Komfort des Managed Hosting bietet Grafana Cloud viele Cloud-exklusive Funktionen wie SLOs, Incident Management, maschinelles Lernen und leistungsstarke Observability-Integrationen.",
+      "link-title": "Weitere Fragen? Sprechen Sie mit einem Experten",
+      "title": "Warum mit Grafana hosten?"
     }
   },
   "nav": {
     "add-new-connections": {
-      "title": ""
+      "title": "Neue Verbindung hinzufügen"
     },
     "admin": {
       "subtitle": "Serverweite Einstellungen und Zugriff auf Ressourcen wie Organisationen, Benutzer und Lizenzen verwalten",
       "title": "Server-Administrator"
     },
+    "alert-list-legacy": {
+      "title": "Warnregeln"
+    },
     "alerting": {
       "subtitle": "Informiere dich über Probleme in deinen Systemen kurz nach deren Auftreten",
       "title": "Meldungen"
@@ -514,6 +861,10 @@
       "subtitle": "Schalte Benachrichtigungen von einer oder mehrerer Warnregeln aus",
       "title": "Stummschalten"
     },
+    "alerting-upgrade": {
+      "subtitle": "Aktualisieren Sie Ihre vorhandenen Legacy-Benachrichtigungen und Benachrichtigungskanäle auf das neue Grafana Alerting",
+      "title": "Alerting-Upgrade"
+    },
     "alerts-and-incidents": {
       "subtitle": "Warn- und Vorfallmanagement-Apps",
       "title": "Warnungen und IRM"
@@ -523,36 +874,39 @@
       "title": "API-Schlüssel"
     },
     "application": {
-      "title": ""
+      "title": "Anwendung"
     },
     "apps": {
       "subtitle": "App-Plug-ins, die das Grafana-Erlebnis erweitern",
       "title": "Apps"
     },
     "authentication": {
-      "title": ""
+      "title": "Authentifizierung"
+    },
+    "collector": {
+      "title": "Sammler"
     },
     "config": {
       "title": "Verwaltung"
     },
     "config-access": {
-      "subtitle": "",
-      "title": ""
+      "subtitle": "Konfigurieren Sie den Zugriff für einzelne Benutzer, Teams und Service-Konten",
+      "title": "Benutzer und Zugriff"
     },
     "config-general": {
-      "subtitle": "",
-      "title": ""
+      "subtitle": "Standardeinstellungen in Grafana verwalten",
+      "title": "Allgemein"
     },
     "config-plugins": {
-      "subtitle": "",
-      "title": ""
+      "subtitle": "Plugins installieren und Beziehungen zwischen den Daten definieren",
+      "title": "Plugins und Daten"
     },
     "connect-data": {
-      "title": ""
+      "title": "Daten verbinden"
     },
     "connections": {
-      "subtitle": "",
-      "title": ""
+      "subtitle": "Durchsuchen und neue Verbindungen erstellen",
+      "title": "Verbindungen"
     },
     "correlations": {
       "subtitle": "Füge Korrelationen hinzu und konfiguriere sie",
@@ -578,21 +932,25 @@
       "title": "Dashboards"
     },
     "data-sources": {
-      "subtitle": "",
-      "title": ""
+      "subtitle": "Ihre verbundenen Datenquellen-Verbindungen anzeigen und verwalten",
+      "title": "Datenquellen"
     },
     "datasources": {
       "subtitle": "Füge Datenquellen hinzu und konfiguriere sie",
       "title": "Datenquellen"
     },
     "detect": {
-      "title": ""
+      "title": "Erkennen"
     },
     "explore": {
       "title": "Entdecken"
     },
     "frontend": {
-      "title": ""
+      "subtitle": "Erhalten Sie echte Einblicke in die Benutzerüberwachung",
+      "title": "Frontend"
+    },
+    "frontend-app": {
+      "title": "Frontend"
     },
     "global-orgs": {
       "subtitle": "Isolierte Instanzen von Grafana auf dem gleichen Server",
@@ -603,7 +961,7 @@
       "title": "Benutzer"
     },
     "grafana-quaderno": {
-      "title": ""
+      "title": "Grafana Quaderno"
     },
     "help": {
       "title": "Hilfe"
@@ -616,24 +974,35 @@
       "title": "Home"
     },
     "incidents": {
-      "title": ""
+      "title": "Störungen"
     },
     "infrastructure": {
-      "title": ""
+      "subtitle": "Verstehen Sie den Zustand Ihrer Infrastruktur",
+      "title": "Infrastruktur"
+    },
+    "integrations": {
+      "title": "Integrationen"
+    },
+    "k6": {
+      "title": "Leistung"
     },
     "kubernetes": {
-      "title": ""
+      "title": "Kubernetes"
     },
     "library-panels": {
       "subtitle": "Wiederverwendbare Panels, die zu mehreren Dashboards hinzugefügt werden können",
       "title": "Bibliotheks-Panels"
     },
     "machine-learning": {
-      "title": ""
+      "title": "Maschinelles Lernen"
     },
     "manage-folder": {
       "subtitle": "Ordner-Dashboards und Berechtigungen verwalten"
     },
+    "migrate-to-cloud": {
+      "subtitle": "Kopieren Sie die Konfiguration von Ihrer selbstverwalteten Installation in einen Cloud Stack",
+      "title": "In die Grafana Cloud migrieren"
+    },
     "monitoring": {
       "subtitle": "Überwachungs- und Infrastruktur-Apps",
       "title": "Beobachtbarkeit"
@@ -648,18 +1017,15 @@
       "title": "Neuer Ordner"
     },
     "observability": {
-      "title": ""
+      "title": "Beobachtbarkeit"
     },
     "oncall": {
-      "title": ""
+      "title": "OnCall"
     },
     "org-settings": {
       "subtitle": "Verwalte Einstellungen in der gesamten Organisation",
       "title": "Standardeinstellungen"
     },
-    "performance-testing": {
-      "title": ""
-    },
     "playlists": {
       "subtitle": "Gruppen von Dashboards, die in einer bestimmten Reihenfolge angezeigt werden",
       "title": "Playlisten"
@@ -668,6 +1034,10 @@
       "subtitle": "Erweitere das Grafana-Erlebnis mit Plug-ins",
       "title": "Plug-ins"
     },
+    "private-data-source-connections": {
+      "subtitle": "Daten abfragen, die in einem gesicherten Netzwerk vorhanden sind, ohne das Netzwerk für eingehenden Datenverkehr von Grafana Cloud zu öffnen. Erfahren Sie mehr in unseren Dokumenten.",
+      "title": "Private Datenquelle verbinden"
+    },
     "profile/notifications": {
       "title": "Benachrichtigungsverlauf"
     },
@@ -678,16 +1048,16 @@
       "title": "Profil"
     },
     "profiles": {
-      "title": ""
+      "title": "Profile"
     },
     "public": {
       "title": "Öffentliche Dashboards"
     },
     "recorded-queries": {
-      "title": ""
+      "title": "Aufgezeichnete Abfragen"
     },
     "reporting": {
-      "title": ""
+      "title": "Meldung"
     },
     "scenes": {
       "title": "Szenen"
@@ -710,7 +1080,7 @@
       "title": "Abmelden"
     },
     "slo": {
-      "title": ""
+      "title": "SLO"
     },
     "snapshots": {
       "subtitle": "Interaktive, öffentlich verfügbare Point-in-Time-Darstellungen von Dashboards",
@@ -723,7 +1093,7 @@
       "title": "Deine hervorgehobenen Dashboards werden hier angezeigt"
     },
     "statistics-and-licensing": {
-      "title": ""
+      "title": "Statistiken und Lizenzierung"
     },
     "storage": {
       "subtitle": "Dateispeicher verwalten",
@@ -734,12 +1104,16 @@
       "title": "Support-Bundles"
     },
     "synthetics": {
-      "title": ""
+      "title": "Synthetik"
     },
     "teams": {
       "subtitle": "Gruppen von Benutzern mit gemeinsamen Dashboards und Benachrichtigungen",
       "title": "Teams"
     },
+    "testing-and-synthetics": {
+      "subtitle": "Optimieren Sie die Leistung mit Erkenntnissen aus k6 und Synthetic Monitoring",
+      "title": "Testen & Synthetics"
+    },
     "upgrading": {
       "title": "Statistiken und Lizenz"
     },
@@ -753,17 +1127,22 @@
       "tv-alert": "Drücke ESC, um den Kiosk-Modus zu verlassen"
     },
     "megamenu": {
-      "close": "",
-      "dock": "",
-      "undock": ""
+      "close": "Menü schließen",
+      "dock": "Menü andocken",
+      "list-label": "Navigation",
+      "undock": "Menü abdocken"
     },
     "toolbar": {
+      "close-menu": "Menü schließen",
       "enable-kiosk": "Kiosk-Modus aktivieren",
-      "toggle-menu": "Menü umschalten",
+      "open-menu": "Menü öffnen",
       "toggle-search-bar": "Obere Suchleiste umschalten"
     }
   },
   "news": {
+    "drawer": {
+      "close": "Drawer schließen"
+    },
     "title": "Das Neueste aus dem Blog"
   },
   "notifications": {
@@ -773,7 +1152,6 @@
   "panel": {
     "header-menu": {
       "copy": "Kopieren",
-      "create-alert": "",
       "create-library-panel": "Bibliotheksleiste erstellen",
       "duplicate": "Duplikat",
       "edit": "Bearbeiten",
@@ -784,6 +1162,7 @@
       "inspect-data": "Daten",
       "inspect-json": "Panel-JSON",
       "more": "Mehr …",
+      "new-alert-rule": "Neue Warnregel",
       "query": "Abfrage",
       "remove": "Entfernen",
       "share": "Teilen",
@@ -793,65 +1172,199 @@
     }
   },
   "playlist-edit": {
-    "error-prefix": "",
+    "error-prefix": "Fehler beim Laden der Wiedergabeliste:",
     "form": {
-      "add-tag-label": "",
-      "add-tag-placeholder": "",
-      "add-title-label": "",
-      "cancel": "",
-      "heading": "",
-      "interval-label": "",
-      "interval-placeholder": "",
-      "interval-required": "",
-      "name-label": "",
-      "name-placeholder": "",
-      "name-required": "",
-      "save": "",
-      "table-delete": "",
-      "table-drag": "",
-      "table-empty": "",
-      "table-heading": ""
-    },
-    "sub-title": "",
-    "title": ""
+      "add-tag-label": "Per Tag hinzufügen",
+      "add-tag-placeholder": "Tag auswählen",
+      "add-title-label": "Nach Titel hinzufügen",
+      "cancel": "Abbrechen",
+      "heading": "Dashboards hinzufügen",
+      "interval-label": "Intervall",
+      "interval-placeholder": "5 m",
+      "interval-required": "Intervall ist erforderlich",
+      "name-label": "Name",
+      "name-placeholder": "Name",
+      "name-required": "Name ist erforderlich",
+      "save": "Speichern",
+      "table-delete": "Playlist-Element löschen",
+      "table-drag": "Ziehen und Ablegen zum Neuordnen",
+      "table-empty": "Die Wiedergabeliste ist leer. Dashboards unten hinzufügen.",
+      "table-heading": "Dashboards"
+    },
+    "sub-title": "Eine Playlist rotiert durch eine vorausgewählte Liste von Dashboards. Eine Playlist kann eine großartige Möglichkeit sein, das Situationsbewusstsein zu schärfen oder Ihrem Team oder Ihren Besuchern einfach nur Ihre Metriken zu präsentieren.",
+    "title": "Playlist bearbeiten"
   },
   "playlist-page": {
     "card": {
-      "delete": "",
-      "edit": "",
-      "start": "",
-      "tooltip": ""
+      "delete": "Playlist löschen",
+      "edit": "Playlist bearbeiten",
+      "start": "Playlist starten",
+      "tooltip": "Playlist teilen"
     },
     "create-button": {
-      "title": ""
+      "title": "Neue Playlist"
     },
     "delete-modal": {
-      "body": "",
-      "confirm-text": ""
+      "body": "Sind Sie sicher, dass Sie {{name}} Playlist löschen möchten?",
+      "confirm-text": "Löschen"
     },
     "empty": {
-      "button": "",
-      "pro-tip": "",
-      "pro-tip-link-title": "",
-      "title": ""
+      "button": "Playlist erstellen",
+      "pro-tip": "Sie können Playlists verwenden, um Dashboards auf TV-Geräten ohne Benutzersteuerung zu steuern",
+      "pro-tip-link-title": "Mehr erfahren",
+      "title": "Es gibt noch keine Playlists erstellt"
+    }
+  },
+  "playlists": {
+    "empty-state": {
+      "message": ""
     }
   },
   "profile": {
     "change-password": {
-      "cancel-button": "",
-      "cannot-change-password-message": "",
-      "change-password-button": "",
-      "confirm-password-label": "",
-      "confirm-password-required": "",
-      "ldap-auth-proxy-message": "",
-      "new-password-label": "",
-      "new-password-required": "",
-      "new-password-same-as-old": "",
-      "old-password-label": "",
-      "old-password-required": "",
-      "passwords-must-match": ""
+      "cancel-button": "Abbrechen",
+      "cannot-change-password-message": "Das Passwort kann hier nicht geändert werden.",
+      "change-password-button": "Passwort ändern",
+      "confirm-password-label": "Passwort bestätigen",
+      "confirm-password-required": "Neue Passwortbestätigung ist erforderlich",
+      "ldap-auth-proxy-message": "Sie können das Passwort nicht ändern, wenn Sie sich mit LDAP oder Auth-Proxy angemeldet haben.",
+      "new-password-label": "Neues Passwort",
+      "new-password-required": "Neues Passwort ist erforderlich",
+      "new-password-same-as-old": "Neues Passwort kann nicht das gleiche sein wie das alte.",
+      "old-password-label": "Altes Passwort",
+      "old-password-required": "Altes Passwort ist erforderlich",
+      "passwords-must-match": "Passwörter müssen übereinstimmen",
+      "strong-password-validation-register": "Passwort entspricht nicht den strengen Kennwortrichtlinien"
     }
   },
+  "public-dashboard": {
+    "acknowledgment-checkboxes": {
+      "ack-title": "Bevor Sie das Dashboard veröffentlichen, bestätigen Sie Folgendes:",
+      "data-src-ack-desc": "Die Veröffentlichung funktioniert derzeit nur mit einer Teilmenge von Datenquellen*",
+      "data-src-ack-tooltip": "Erfahren Sie mehr über öffentliche Datenquellen",
+      "public-ack-desc": "Ihr gesamtes Dashboard wird öffentlich sein*",
+      "public-ack-tooltip": "Erfahren Sie mehr über öffentliche Dashboards",
+      "usage-ack-desc": "Wenn ein Dashboard öffentlich gemacht wird, werden die Abfragen jedes Mal beim Anzeigen ausgeführt, was zur Erhöhung der Kosten führen kann*",
+      "usage-ack-desc-tooltip": "Erfahren Sie mehr zum Abfrage-Caching"
+    },
+    "config": {
+      "can-view-dashboard-radio-button-label": "Kann Dashboard anzeigen",
+      "copy-button": "Kopieren",
+      "dashboard-url-field-label": "Dashboard-URL",
+      "email-share-type-option-label": "Nur bestimmte Personen",
+      "pause-sharing-dashboard-label": "Teilen des Dashboards pausieren",
+      "public-share-type-option-label": "Jeder mit einem Link",
+      "revoke-public-URL-button": "Öffentliche URL widerrufen",
+      "revoke-public-URL-button-title": "Öffentliche URL widerrufen",
+      "settings-title": "Einstellungen"
+    },
+    "create-page": {
+      "generate-public-url-button": "Öffentliche URL generieren",
+      "unsupported-features-desc": "Momentan unterstützen wir keine Template-Variablen oder Frontend-Datenquellen",
+      "welcome-title": "Willkommen zu öffentlichen Dashboards!"
+    },
+    "delete-modal": {
+      "revoke-nonorphaned-body-text": "Sind Sie sicher, dass Sie diese URL widerrufen möchten? Das Dashboard wird nicht mehr öffentlich sein.",
+      "revoke-orphaned-body-text": "Das verwaiste öffentliche Dashboard wird nicht mehr öffentlich sein.",
+      "revoke-title": "Öffentliche URL widerrufen"
+    },
+    "email-sharing": {
+      "input-invalid-email-text": "Ungültige E-Mail",
+      "input-required-email-text": "E-Mail-Adresse ist erforderlich",
+      "invite-button": "Einladen",
+      "invite-field-desc": "Personen per E-Mail einladen",
+      "invite-field-label": "Einladen",
+      "resend-button": "Erneut senden",
+      "resend-button-title": "Erneut senden",
+      "revoke-button": "Widerrufen",
+      "revoke-button-title": "Widerrufen"
+    },
+    "modal-alerts": {
+      "no-upsert-perm-alert-desc": "Kontaktieren Sie Ihren Administrator, um die Berechtigung zu {{mode}} öffentlichen Dashboards zu erhalten",
+      "no-upsert-perm-alert-title": "Sie sind nicht berechtigt, ein öffentliches Dashboard zu {{ mode }}",
+      "save-dashboard-changes-alert-title": "Bitte speichern Sie Ihre Dashboard-Änderungen bevor Sie die öffentliche Konfiguration aktualisieren",
+      "unsupport-data-source-alert-readmore-link": "Erfahren Sie mehr über unterstützte Datenquellen",
+      "unsupported-data-source-alert-desc": "In diesem Dashboard gibt es Datenquellen, die für öffentliche Dashboards nicht unterstützt werden. Panels, die diese Datenquellen nutzen, funktionieren möglicherweise nicht ordnungsgemäß: {{unsupportedDataSources}}.",
+      "unsupported-data-source-alert-title": "Nicht unterstützte Datenquellen",
+      "unsupported-template-variable-alert-desc": "Dieses öffentliche Dashboard funktioniert möglicherweise nicht, da es Template-Variablen verwendet",
+      "unsupported-template-variable-alert-title": "Template-Variablen werden nicht unterstützt"
+    },
+    "settings-bar-header": {
+      "collapse-settings-tooltip": "Einstellungen einklappen",
+      "expand-settings-tooltip": "Einstellungen aufklappen"
+    },
+    "settings-configuration": {
+      "default-time-range-label": "Standardzeitraum",
+      "default-time-range-label-desc": "Das öffentliche Dashboard verwendet die Standard-Zeitraumeinstellungen des Dashboards",
+      "show-annotations-label": "Anmerkungen anzeigen",
+      "show-annotations-label-desc": "Anmerkungen im öffentlichen Dashboard anzeigen",
+      "time-range-picker-label": "Zeitraumauswahl aktiviert",
+      "time-range-picker-label-desc": "Betrachtern erlauben, den Zeitraum zu ändern"
+    },
+    "settings-summary": {
+      "annotations-hide-text": "Anmerkungen = ausblenden",
+      "annotations-show-text": "Anmerkungen = anzeigen",
+      "time-range-picker-disabled-text": "Zeitraumauswahl = deaktiviert",
+      "time-range-picker-enabled-text": "Zeitraumauswahl = aktiviert",
+      "time-range-text": "Zeitraum = "
+    }
+  },
+  "public-dashboard-list": {
+    "button": {
+      "config-button-tooltip": "Öffentliches Dashboard konfigurieren",
+      "revoke-button-text": "Öffentliche URL widerrufen",
+      "revoke-button-tooltip": "Öffentliche Dashboard-URL widerrufen",
+      "view-button-tooltip": "Öffentliches Dashboard anzeigen"
+    },
+    "dashboard-title": {
+      "orphaned-title": "<0>Verwaistes öffentliches Dashboard</0>",
+      "orphaned-tooltip": "Das verlinkte Dashboard wurde bereits gelöscht"
+    },
+    "toggle": {
+      "pause-sharing-toggle-text": "Teilen pausieren"
+    }
+  },
+  "public-dashboard-users-access-list": {
+    "dashboard-modal": {
+      "loading-text": "Wird geladen ...",
+      "open-dashboard-list-text": "Dashboard-Liste öffnen",
+      "public-dashboard-link": "Öffentliches Dashboard-URL",
+      "public-dashboard-setting": "Einstellungen des öffentlichen Dashboards"
+    },
+    "delete-user-modal": {
+      "delete-user-button-text": "Benutzer löschen",
+      "delete-user-cancel-button": "Abbrechen",
+      "delete-user-revoke-access-button": "Zugriff widerrufen",
+      "revoke-access-title": "Zugriff widerrufen",
+      "revoke-user-access-modal-desc-line1": "Sind Sie sicher, dass Sie den Zugriff für {{email}} widerrufen möchten?",
+      "revoke-user-access-modal-desc-line2": "Durch diese Aktion wird {{email}}&apos; sofort der Zugriff auf alle öffentlichen Dashboards entzogen."
+    },
+    "modal": {
+      "dashboard-modal-title": "Öffentliche Dashboards"
+    },
+    "table-header": {
+      "activated-label": "Aktiviert",
+      "activated-tooltip": "Frühester Zeitpunkt, zu dem ein Benutzer ein aktiver Benutzer eines Dashboards war",
+      "email-label": "E-Mail-Adresse",
+      "last-active-label": "Zuletzt aktiv",
+      "origin-label": "Ursprung",
+      "role-label": "Rolle"
+    }
+  },
+  "query-operation": {
+    "header": {
+      "collapse-row": "Abfragezeile einklappen",
+      "datasource-help": "Datenquellen-Hilfe anzeigen",
+      "drag-and-drop": "Ziehen und Ablegen zum Neuordnen",
+      "duplicate-query": "Abfrage duplizieren",
+      "expand-row": "Suchzeile erweitern",
+      "hide-response": "",
+      "remove-query": "Abfrage entfernen",
+      "show-response": "",
+      "toggle-edit-mode": "Textbearbeitungsmodus umschalten"
+    },
+    "query-editor-not-exported": "Datenquellen-Plugin exportiert keine Komponente des Abfrageeditors"
+  },
   "refresh-picker": {
     "aria-label": {
       "choose-interval": "Automatische Aktualisierung ausgeschaltet. Aktualisierungszeitintervall auswählen",
@@ -870,10 +1383,16 @@
       "label": "Aus"
     },
     "tooltip": {
-      "interval-selected": "",
-      "turned-off": ""
+      "interval-selected": "Automatisches Aktualisierungsintervall festlegen",
+      "turned-off": "Automatische Aktualisierung aus"
     }
   },
+  "return-to-previous": {
+    "button": {
+      "label": "Zurück zu {{title}}"
+    },
+    "dismissable-button": "Schließen"
+  },
   "search": {
     "actions": {
       "include-panels": "Panels einschließen",
@@ -889,15 +1408,6 @@
       "new-dashboard": "Neues Dashboard",
       "new-folder": "Neuer Ordner"
     },
-    "folder-view": {
-      "go-to-folder": "Zum Ordner",
-      "select-folder": "Ordner auswählen"
-    },
-    "result-kind": {
-      "dashboard": "Dashboard",
-      "folder": "Ordner",
-      "panel": "Panel"
-    },
     "results-table": {
       "datasource-header": "Datenquelle",
       "location-header": "Standort",
@@ -912,12 +1422,6 @@
       "placeholder": "Nach Dashboards suchen"
     }
   },
-  "search-view": {
-    "no-results": {
-      "clear": "",
-      "text": ""
-    }
-  },
   "share-modal": {
     "dashboard": {
       "title": "Teilen"
@@ -931,11 +1435,10 @@
       "time-range-description": "Wandelt den aktuellen relativen Zeitbereich in einen absoluten Zeitbereich um"
     },
     "export": {
-      "back-button": "",
+      "back-button": "Zurück zum Export der Konfiguration",
       "cancel-button": "Abbrechen",
       "info-text": "Dieses Dashboard exportieren.",
       "save-button": "In Datei speichern …",
-      "share-default-label": "Export mit entfernten Standardwerten",
       "share-externally-label": "Export für externe Freigabe",
       "view-button": "JSON anzeigen"
     },
@@ -967,10 +1470,10 @@
       "expire-day": "1 Tag",
       "expire-hour": "1 Stunde",
       "expire-never": "Nie",
-      "expire-week": "7 Tage",
+      "expire-week": "1 Woche",
       "info-text-1": "Ein Schnappschuss ist eine Möglichkeit, ein interaktives Dashboard sofort öffentlich zu teilen. Beim Erstellen entfernen wir sensible Daten wie Abfragen (Metriken, Vorlagen und Anmerkungen) und Panel-Links, sodass nur die sichtbaren Metrikdaten und die in dein Dashboard eingebetteten Seriennamen angezeigt werden.",
       "info-text-2": "Beachte, dass dein Schnappschuss <1>für jeden sichtbar ist</1>, der den Link hat und auf die URL zugreifen kann. Teile Schnappschüsse daher mit Bedacht.",
-      "local-button": "Lokaler Schnappschuss",
+      "local-button": "Snapshot veröffentlichen",
       "mistake-message": "Hast du einen Fehler gemacht? ",
       "name": "Name des Schnappschusses",
       "timeout": "Timeout (Sekunden)",
@@ -982,6 +1485,9 @@
       "export": "Exportieren",
       "library-panel": "Bibliotheks-Panel",
       "link": "Link",
+      "panel-embed": "Einbetten",
+      "public-dashboard": "",
+      "public-dashboard-title": "Öffentliches Dashboard",
       "snapshot": "Schnappschuss"
     },
     "theme-picker": {
@@ -995,22 +1501,22 @@
     }
   },
   "share-playlist": {
-    "checkbox-description": "",
-    "checkbox-label": "",
-    "copy-link-button": "",
-    "link-url-label": "",
-    "mode": "",
-    "mode-kiosk": "",
-    "mode-normal": "",
-    "mode-tv": "",
-    "title": ""
+    "checkbox-description": "Fensterhöhen werden an die Bildschirmgröße angepasst",
+    "checkbox-label": "Autofit",
+    "copy-link-button": "Kopieren",
+    "link-url-label": "Link-URL",
+    "mode": "Modus",
+    "mode-kiosk": "Kiosk",
+    "mode-normal": "Normal",
+    "mode-tv": "TM",
+    "title": "Wiedergabeliste teilen"
   },
   "shared": {
     "preferences": {
       "theme": {
-        "dark-label": "",
-        "light-label": "",
-        "system-label": ""
+        "dark-label": "Dunkel",
+        "light-label": "Hell",
+        "system-label": "Systemeinstellung"
       }
     }
   },
@@ -1034,10 +1540,10 @@
     "title": "Einstellungen"
   },
   "snapshot": {
-    "external-badge": "",
-    "name-column-header": "",
-    "url-column-header": "",
-    "view-button": ""
+    "external-badge": "Extern",
+    "name-column-header": "Name",
+    "url-column-header": "Snapshot url",
+    "view-button": "Anzeigen"
   },
   "tag-filter": {
     "loading": "Wird geladen ...",
@@ -1052,6 +1558,7 @@
     "calendar": {
       "apply-button": "Zeitbereich anwenden",
       "cancel-button": "Abbrechen",
+      "close": "Kalender schließen",
       "select-time": "Einen Zeitbereich auswählen"
     },
     "content": {
@@ -1059,6 +1566,13 @@
       "empty-recent-list-info": "Es sieht so aus, als hätten Sie diesen Zeit-Auswähler noch nie benutzt. Sobald Sie einige Zeitintervalle eingeben, werden hier die zuletzt verwendeten Intervalle angezeigt.",
       "filter-placeholder": "Schnellbereiche suchen"
     },
+    "copy-paste": {
+      "copy-success-message": "Zeitraum in Zwischenablage kopiert",
+      "default-error-message": "{{error}} ist kein gültiger Zeitraum",
+      "default-error-title": "Ungültiger Zeitraum",
+      "tooltip-copy": "Zeitraum in Zwischenablage kopieren",
+      "tooltip-paste": "Zeitraum einfügen"
+    },
     "footer": {
       "change-settings-button": "Zeiteinstellungen ändern",
       "fiscal-year-option": "Geschäftsjahr",
@@ -1071,6 +1585,7 @@
       "default-error": "Ein vergangenes Datum oder \"heutiges\" eingeben",
       "fiscal-year": "Geschäftsjahr",
       "from-input": "Von",
+      "open-input-calendar": "Kalender öffnen",
       "range-error": "„Von“ darf nicht nach „Bis“ sein",
       "to-input": "Bis"
     },
@@ -1093,6 +1608,12 @@
       "select-search-input": "Suchbegriff eingeben (Land, Stadt, Abkürzung)"
     }
   },
+  "transformations": {
+    "empty": {
+      "add-transformation-body": "Mithilfe von Transformationen können Daten auf verschiedene Arten geändert werden, bevor Ihre Visualisierung angezeigt wird.<1></1>Dies beinhaltet die Verknüpfung von Daten, das Umbenennen von Feldern, die Erstellung von Berechnungen, das Formatieren von Daten für die Anzeige und mehr.",
+      "add-transformation-header": "Daten transformieren beginnen"
+    }
+  },
   "user-orgs": {
     "current-org-button": "Aktuell",
     "name-column": "Name",
@@ -1107,6 +1628,9 @@
       "name-error": "Name ist erforderlich",
       "name-label": "Name",
       "username-label": "Benutzername"
+    },
+    "tabs": {
+      "general": "Allgemein"
     }
   },
   "user-session": {
@@ -1119,6 +1643,11 @@
   "user-sessions": {
     "loading": "Sitzungen werden geladen …"
   },
+  "users-access-list": {
+    "tabs": {
+      "public-dashboard-users-tab-title": "Nutzer des öffentlichen Dashboards"
+    }
+  },
   "variable": {
     "adhoc": {
       "placeholder": "Wert auswählen"
@@ -1136,4 +1665,4 @@
       "placeholder": "Variablenwert eingeben"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index d0369489aa91d..d3ff914a833c9 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -1,5 +1,5 @@
 {
-  "_comment": "This file is the source of truth for English strings. Edit this to change plurals and other phrases for the UI.",
+  "_comment": "This file is the source of truth for English strings. Edit this in the codebase to change plurals and other phrases for the UI.",
   "access-control": {
     "add-permission": {
       "role-label": "Role",
@@ -25,6 +25,14 @@
       "user": "User"
     }
   },
+  "api-keys": {
+    "empty-state": {
+      "message": "No API keys found"
+    }
+  },
+  "bouncing-loader": {
+    "label": "Loading"
+  },
   "browse-dashboards": {
     "action": {
       "cancel-button": "Cancel",
@@ -73,6 +81,7 @@
     "folder-picker": {
       "accessible-label": "Select folder: {{ label }} currently selected",
       "button-label": "Select folder",
+      "clear-selection": "Clear selection",
       "empty-message": "No folders found",
       "error-title": "Error loading folders",
       "search-placeholder": "Search folders",
@@ -81,9 +90,7 @@
     "manage-folder-nav": {
       "alert-rules": "Alert rules",
       "dashboards": "Dashboards",
-      "panels": "Panels",
-      "permissions": "Permissions",
-      "settings": "Settings"
+      "panels": "Panels"
     },
     "new-folder-form": {
       "cancel-label": "Cancel",
@@ -92,7 +99,7 @@
     },
     "no-results": {
       "clear": "Clear search and filters",
-      "text": "No results found for your query."
+      "text": "No results found for your query"
     }
   },
   "clipboard-button": {
@@ -106,6 +113,9 @@
       "dark-theme": "Dark",
       "light-theme": "Light"
     },
+    "empty-state": {
+      "message": "No results found"
+    },
     "search-box": {
       "placeholder": "Search or jump to..."
     },
@@ -126,7 +136,8 @@
   },
   "connections": {
     "connect-data": {
-      "category-header-label": "Data sources"
+      "category-header-label": "Data sources",
+      "empty-message": "No results matching your query were found"
     },
     "search": {
       "placeholder": "Search all"
@@ -138,6 +149,16 @@
       "error-message": "An unknown error occurred while fetching correlation data. Please try again.",
       "title": "Error fetching correlation data"
     },
+    "basic-info-form": {
+      "description-description": "Optional description with more information about the link",
+      "description-label": "Description",
+      "label-description": "This name will be used as the label for the correlation. This will show as button text, a menu item, or hover text on a link.",
+      "label-label": "Label",
+      "label-placeholder": "e.g. Tempo traces",
+      "label-required": "This field is required.",
+      "sub-text": "<0>Define text that will describe the correlation.</0>",
+      "title": "Define correlation label (Step 1 of 3)"
+    },
     "list": {
       "delete": "delete correlation",
       "label": "Label",
@@ -146,9 +167,73 @@
       "source": "Source",
       "target": "Target"
     },
+    "navigation-form": {
+      "add-button": "Add",
+      "back-button": "Back",
+      "next-button": "Next",
+      "save-button": "Save"
+    },
     "page-content": "To enable Correlations, add it in the Grafana config:",
     "page-heading": "Correlations are disabled",
-    "sub-title": "Define how data living in different data sources relates to each other. Read more in the <2>documentation<1></1></2>"
+    "query-editor": {
+      "control-rules": "The selected target data source must export a query editor.",
+      "data-source-text": "Please select a target data source first.",
+      "data-source-title": "No data source selected",
+      "error-text": "The selected data source could not be loaded.",
+      "error-title": "Error loading data source",
+      "loading": "Loading query editor...",
+      "query-description": "Define the query that is run when the link is clicked. You can use <2>variables</2> to access specific field values.",
+      "query-editor-title": "Data source does not export a query editor.",
+      "query-label": "Query"
+    },
+    "source-form": {
+      "control-required": "This field is required.",
+      "description": "You have used following variables in the target query: <1></1><2></2>A data point needs to provide values to all variables as fields or as transformations output to make the correlation button appear in the visualization.<4></4>Note: Not every variable needs to be explicitly defined below. A transformation such as <7>logfmt</7> will create variables for every key/value pair.",
+      "heading": "Variables used in the target query",
+      "results-description": "The link will be shown next to the value of this field",
+      "results-label": "Results field",
+      "results-required": "This field is required.",
+      "source-description": "Results from selected source data source have links displayed in the panel",
+      "source-label": "Source",
+      "sub-text": "<0>Define what data source will display the correlation, and what data will replace previously defined variables.</0>",
+      "title": "Configure the data source that will link to {{dataSourceName}} (Step 3 of 3)"
+    },
+    "sub-title": "Define how data living in different data sources relates to each other. Read more in the <2>documentation<1></1></2>",
+    "target-form": {
+      "control-rules": "This field is required.",
+      "sub-text": "<0>Define what data source the correlation will link to, and what query will run when the correlation is clicked.</0>",
+      "target-description": "Specify which data source is queried when the link is clicked",
+      "target-label": "Target",
+      "title": "Setup the target for the correlation (Step 2 of 3)"
+    },
+    "trans-details": {
+      "logfmt-description": "Parse provided field with logfmt to get variables",
+      "logfmt-label": "Logfmt",
+      "regex-description": "Field will be parsed with regex. Use named capture groups to return multiple variables, or a single unnamed capture group to add variable to named map value. Regex is case insensitive.",
+      "regex-expression": "Use capture groups to extract a portion of the field.",
+      "regex-label": "Regular expression",
+      "regex-map-values": "Defines the name of the variable if the capture group is not named."
+    },
+    "transform": {
+      "add-button": "Add transformation",
+      "heading": "Transformations",
+      "no-transform": "No transformations defined."
+    },
+    "transform-row": {
+      "expression-label": "Expression",
+      "expression-required": "Please define an expression",
+      "expression-tooltip": "Required for regular expression. The expression the transformation will use. Logfmt does not use further specifications.",
+      "field-input": "field",
+      "field-label": "Field",
+      "field-tooltip": "Optional. The field to transform. If not specified, the transformation will be applied to the results field.",
+      "map-value-label": "Map value",
+      "map-value-tooltip": "Optional. Defines the name of the variable. This is currently only valid for regular expressions with a single, unnamed capture group.",
+      "remove-button": "Remove",
+      "remove-tooltip": "Remove transformation",
+      "transform-required": "Please select a transformation type",
+      "type-label": "Type",
+      "type-tooltip": "The type of transformation that will be applied to the source data."
+    }
   },
   "dashboard": {
     "add-menu": {
@@ -158,6 +243,10 @@
       "visualization": "Visualization",
       "widget": "Widget"
     },
+    "alert-rules-drawer": {
+      "redirect-link": "List in Grafana Alerting",
+      "subtitle": "Alert rules related to this dashboard"
+    },
     "empty": {
       "add-library-panel-body": "Add visualizations that are shared with other dashboards.",
       "add-library-panel-button": "Add library panel",
@@ -226,7 +315,7 @@
     },
     "toolbar": {
       "add": "Add",
-      "add-panel": "Add panel",
+      "alert-rules": "Alert rules",
       "mark-favorite": "Mark as favorite",
       "open-original": "Open original dashboard",
       "playlist-next": "Go to next dashboard",
@@ -236,6 +325,7 @@
       "save": "Save dashboard",
       "settings": "Dashboard settings",
       "share": "Share dashboard",
+      "share-button": "Share",
       "unmark-favorite": "Unmark as favorite"
     },
     "validation": {
@@ -335,10 +425,122 @@
   "data-sources": {
     "datasource-add-button": {
       "label": "Add new data source"
+    },
+    "empty-state": {
+      "message": "No data sources found"
     }
   },
   "explore": {
     "add-to-dashboard": "Add to dashboard",
+    "rich-history": {
+      "close-tooltip": "Close query history",
+      "datasource-a-z": "Data source A-Z",
+      "datasource-z-a": "Data source Z-A",
+      "newest-first": "Newest first",
+      "oldest-first": "Oldest first",
+      "query-history": "Query history",
+      "settings": "Settings",
+      "starred": "Starred"
+    },
+    "rich-history-card": {
+      "add-comment-form": "Add comment form",
+      "add-comment-tooltip": "Add comment",
+      "cancel": "Cancel",
+      "confirm-delete": "Delete",
+      "copy-query-tooltip": "Copy query to clipboard",
+      "copy-shortened-link-tooltip": "Copy shortened link to clipboard",
+      "datasource-icon-label": "Data source icon",
+      "datasource-name-label": "Data source name",
+      "datasource-not-exist": "Data source does not exist anymore",
+      "delete-query-confirmation-title": "Delete",
+      "delete-query-title": "Delete query",
+      "delete-query-tooltip": "Delete query",
+      "delete-starred-query-confirmation-text": "Are you sure you want to permanently delete your starred query?",
+      "edit-comment-tooltip": "Edit comment",
+      "loading-text": "loading...",
+      "optional-description": "An optional description of what the query does.",
+      "query-comment-label": "Query comment",
+      "query-text-label": "Query text",
+      "run-query-button": "Run query",
+      "save-comment": "Save comment",
+      "star-query-tooltip": "Star query",
+      "switch-datasource-button": "Switch data source and run query",
+      "unstar-query-tooltip": "Unstar query",
+      "update-comment-form": "Update comment form"
+    },
+    "rich-history-container": {
+      "loading": "Loading..."
+    },
+    "rich-history-notification": {
+      "query-copied": "Query copied to clipboard",
+      "query-deleted": "Query deleted"
+    },
+    "rich-history-queries-tab": {
+      "displaying-partial-queries": "Displaying {{ count }} queries",
+      "displaying-queries": "{{ count }} queries",
+      "filter-aria-label": "Filter queries for data sources(s)",
+      "filter-history": "Filter history",
+      "filter-placeholder": "Filter queries for data sources(s)",
+      "history-local": "The history is local to your browser and is not shared with others.",
+      "loading": "Loading...",
+      "loading-results": "Loading results...",
+      "search-placeholder": "Search queries",
+      "showing-queries": "Showing {{ shown }} of {{ total }} <0>Load more</0>",
+      "sort-aria-label": "Sort queries",
+      "sort-placeholder": "Sort queries by"
+    },
+    "rich-history-settings-tab": {
+      "alert-info": "Grafana will keep entries up to {{optionLabel}}.Starred entries won't be deleted.",
+      "change-default-tab": "Change the default active tab from “Query history” to “Starred”",
+      "clear-history-info": "Delete all of your query history, permanently.",
+      "clear-query-history": "Clear query history",
+      "clear-query-history-button": "Clear query history",
+      "delete-confirm": "Delete",
+      "delete-confirm-text": "Are you sure you want to permanently delete your query history?",
+      "delete-title": "Delete",
+      "history-time-span": "History time span",
+      "history-time-span-description": "Select the period of time for which Grafana will save your query history. Up to {{MAX_HISTORY_ITEMS}} entries will be stored.",
+      "only-show-active-datasource": "Only show queries for data source currently active in Explore",
+      "query-history-deleted": "Query history deleted",
+      "retention-period": {
+        "1-week": "1 week",
+        "2-days": "2 days",
+        "2-weeks": "2 weeks",
+        "5-days": "5 days"
+      }
+    },
+    "rich-history-starred-tab": {
+      "filter-queries-aria-label": "Filter queries for data sources(s)",
+      "filter-queries-placeholder": "Filter queries for data sources(s)",
+      "loading": "Loading...",
+      "loading-results": "Loading results...",
+      "local-history-message": "The history is local to your browser and is not shared with others.",
+      "search-queries-placeholder": "Search queries",
+      "showing-queries": "Showing {{ shown }} of {{ total }} <0>Load more</0>",
+      "sort-queries-aria-label": "Sort queries",
+      "sort-queries-placeholder": "Sort queries by"
+    },
+    "rich-history-utils": {
+      "a-week-ago": "a week ago",
+      "days-ago": "{{num}} days ago",
+      "default-from": "now-1h",
+      "default-to": "now",
+      "today": "today",
+      "two-weeks-ago": "two weeks ago",
+      "yesterday": "yesterday"
+    },
+    "rich-history-utils-notification": {
+      "saving-failed": "Saving rich history failed",
+      "update-failed": "Rich History update failed"
+    },
+    "secondary-actions": {
+      "query-add-button": "Add query",
+      "query-add-button-aria-label": "Add query",
+      "query-history-button": "Query history",
+      "query-history-button-aria-label": "Query history",
+      "query-inspector-button": "Query inspector",
+      "query-inspector-button-aria-label": "Query inspector"
+    },
     "table": {
       "no-data": "0 series returned",
       "title": "Table",
@@ -346,7 +548,13 @@
     },
     "toolbar": {
       "aria-label": "Explore toolbar",
-      "copy-shortened-link": "Copy shortened link",
+      "copy-link": "Copy URL",
+      "copy-link-abs-time": "Copy absolute URL",
+      "copy-links-absolute-category": "Time-sync URL links (share with time range intact)",
+      "copy-links-normal-category": "Normal URL links",
+      "copy-shortened-link": "Copy shortened URL",
+      "copy-shortened-link-abs-time": "Copy absolute shortened URL",
+      "copy-shortened-link-menu": "Open shortened link menu",
       "refresh-picker-cancel": "Cancel",
       "refresh-picker-run": "Run query",
       "split-close": "Close",
@@ -361,6 +569,9 @@
     "loading": "Loading folders..."
   },
   "grafana-ui": {
+    "drawer": {
+      "close": "Close"
+    },
     "modal": {
       "close-tooltip": "Close"
     },
@@ -392,6 +603,7 @@
     "shortcuts-description": {
       "change-theme": "Change theme",
       "collapse-all-rows": "Collapse all rows",
+      "copy-time-range": "Copy time range",
       "dashboard-settings": "Dashboard settings",
       "duplicate-panel": "Duplicate Panel",
       "exit-edit/setting-views": "Exit edit/setting views",
@@ -405,6 +617,7 @@
       "move-time-range-forward": "Move time range forward",
       "open-search": "Open search",
       "open-shared-modal": "Open Panel Share Modal",
+      "paste-time-range": "Paste time range",
       "refresh-all-panels": "Refresh all panels",
       "remove-panel": "Remove Panel",
       "save-dashboard": "Save dashboard",
@@ -446,6 +659,9 @@
     }
   },
   "library-panels": {
+    "empty-state": {
+      "message": "No library panels found"
+    },
     "modal": {
       "body_one": "This panel is being used in {{count}} dashboard. Please choose which dashboard to view the panel in:",
       "body_other": "This panel is being used in {{count}} dashboards. Please choose which dashboard to view the panel in:",
@@ -468,6 +684,144 @@
       "invalid-user-or-password": "Invalid username or password",
       "title": "Login failed",
       "unknown": "Unknown error occurred"
+    },
+    "forgot-password": "Forgot your password?",
+    "form": {
+      "password-label": "Password",
+      "password-required": "Password is required",
+      "submit-label": "Log in",
+      "submit-loading-label": "Logging in...",
+      "username-label": "Email or username",
+      "username-required": "Email or username is required"
+    },
+    "services": {
+      "sing-in-with-prefix": "Sign in with {{serviceName}}"
+    },
+    "signup": {
+      "button-label": "Sign up",
+      "new-to-question": "New to Grafana?"
+    }
+  },
+  "migrate-to-cloud": {
+    "can-i-move": {
+      "body": "Once you connect this installation to a cloud stack, you'll be able to upload data sources and dashboards.",
+      "link-title": "Learn about migrating other settings",
+      "title": "Can I move this installation to Grafana Cloud?"
+    },
+    "connect-modal": {
+      "body-cloud-stack": "You'll also need a cloud stack. If you just signed up, we'll automatically create your first stack. If you have an account, you'll need to select or create a stack.",
+      "body-get-started": "To get started, you'll need a Grafana.com account.",
+      "body-paste-stack": "Once you've decided on a stack, paste the URL below.",
+      "body-sign-up": "Sign up for a Grafana.com account",
+      "body-token": "Your self-managed Grafana installation needs special access to securely migrate content. You'll need to create a migration token on your chosen cloud stack.",
+      "body-token-field": "Migration token",
+      "body-token-field-placeholder": "Paste token here",
+      "body-token-instructions": "Log into your cloud stack and navigate to Administration, General, Migrate to Grafana Cloud. Create a migration token on that screen and paste the token here.",
+      "body-url-field": "Cloud stack URL",
+      "body-view-stacks": "View my cloud stacks",
+      "cancel": "Cancel",
+      "connect": "Connect to this stack",
+      "connecting": "Connecting to this stack...",
+      "stack-required-error": "Stack URL is required",
+      "title": "Connect to a cloud stack",
+      "token-error-description": "There was an error saving the token. See the Grafana server logs for more details.",
+      "token-error-title": "Error saving token",
+      "token-required-error": "Migration token is required"
+    },
+    "cta": {
+      "button": "Migrate this instance to Cloud",
+      "header": "Let us manage your Grafana stack"
+    },
+    "disconnect-modal": {
+      "body": "This will remove the migration token from this installation. If you wish to upload more resources in the future, you will need to enter a new migration token.",
+      "cancel": "Cancel",
+      "disconnect": "Disconnect",
+      "disconnecting": "Disconnecting...",
+      "error": "There was an error disconnecting",
+      "title": "Disconnect from cloud stack"
+    },
+    "get-started": {
+      "body": "The migration process must be started from your self-managed Grafana instance.",
+      "configure-pdc-link": "Configure PDC for this stack",
+      "link-title": "Learn more about Private Data Source Connect",
+      "step-1": "Log in to your self-managed instance and navigate to Administration, General, Migrate to Grafana Cloud.",
+      "step-2": "Select \"Migrate this instance to Cloud\".",
+      "step-3": "You'll be prompted for a migration token. Generate one from this screen.",
+      "step-4": "In your self-managed instance, select \"Upload everything\" to upload data sources and dashboards to this cloud stack.",
+      "step-5": "If some of your data sources will not work over the public internet, you’ll need to install Private Data Source Connect in your self-managed environment.",
+      "title": "How to get started"
+    },
+    "is-it-secure": {
+      "body": "Grafana Labs is committed to maintaining the highest standards of data privacy and security. By implementing industry-standard security technologies and procedures, we help protect our customers' data from unauthorized access, use, or disclosure.",
+      "link-title": "Grafana Labs Trust Center",
+      "title": "Is it secure?"
+    },
+    "migrate-to-this-stack": {
+      "body": "Some configuration from your self-managed Grafana instance can be automatically copied to this cloud stack.",
+      "link-title": "View the full migration guide",
+      "title": "Migrate configuration to this stack"
+    },
+    "migration-token": {
+      "body": "Your self-managed Grafana instance will require a special authentication token to securely connect to this cloud stack.",
+      "delete-button": "Delete this migration token",
+      "delete-modal-body": "If you've already used this token with a self-managed installation, that installation will no longer be able to upload content.",
+      "delete-modal-cancel": "Cancel",
+      "delete-modal-confirm": "Delete",
+      "delete-modal-deleting": "Deleting...",
+      "delete-modal-title": "Delete migration token",
+      "generate-button": "Generate a migration token",
+      "generate-button-loading": "Generating a migration token...",
+      "modal-close": "Close",
+      "modal-copy-and-close": "Copy to clipboard and close",
+      "modal-copy-button": "Copy to clipboard",
+      "modal-field-description": "Copy the token now as you will not be able to see it again. Losing a token requires creating a new one.",
+      "modal-field-label": "Token",
+      "modal-title": "Migration token created",
+      "status": "Current status: <2></2>",
+      "title": "Migration token"
+    },
+    "pdc": {
+      "body": "Exposing your data sources to the internet can raise security concerns. Private data source connect (PDC) allows Grafana Cloud to access your existing data sources over a secure network tunnel.",
+      "link-title": "Learn about PDC",
+      "title": "Not all my data sources are on the public internet"
+    },
+    "pricing": {
+      "body": "Grafana Cloud has a generous free plan and a 14 day unlimited usage trial. After your trial expires, you'll be billed based on usage over the free plan limits.",
+      "link-title": "Grafana Cloud pricing",
+      "title": "How much does it cost?"
+    },
+    "resource-status": {
+      "error-details-button": "Details",
+      "failed": "Error",
+      "migrated": "Uploaded to cloud",
+      "migrating": "Uploading...",
+      "not-migrated": "Not yet uploaded",
+      "unknown": "Unknown"
+    },
+    "resource-type": {
+      "dashboard": "Dashboard",
+      "datasource": "Data source",
+      "unknown": "Unknown"
+    },
+    "summary": {
+      "disconnect": "Disconnect",
+      "error-starting-migration": "There was an error starting cloud migration",
+      "start-migration": "Upload everything",
+      "target-stack-title": "Uploading to"
+    },
+    "token-status": {
+      "active": "Token created and active",
+      "no-active": "No active token"
+    },
+    "what-is-cloud": {
+      "body": "Grafana cloud is a fully managed cloud-hosted observability platform ideal for cloud native environments. It's everything you love about Grafana without the overhead of maintaining, upgrading, and supporting an installation.",
+      "link-title": "Learn about cloud features",
+      "title": "What is Grafana Cloud?"
+    },
+    "why-host": {
+      "body": "In addition to the convenience of managed hosting, Grafana Cloud includes many cloud-exclusive features like SLOs, incident management, machine learning, and powerful observability integrations.",
+      "link-title": "More questions? Talk to an expert",
+      "title": "Why host with Grafana?"
     }
   },
   "nav": {
@@ -478,6 +832,9 @@
       "subtitle": "Manage server-wide settings and access to resources such as organizations, users, and licenses",
       "title": "Server admin"
     },
+    "alert-list-legacy": {
+      "title": "Alert rules"
+    },
     "alerting": {
       "subtitle": "Learn about problems in your systems moments after they occur",
       "title": "Alerting"
@@ -514,6 +871,10 @@
       "subtitle": "Stop notifications from one or more alerting rules",
       "title": "Silences"
     },
+    "alerting-upgrade": {
+      "subtitle": "Upgrade your existing legacy alerts and notification channels to the new Grafana Alerting",
+      "title": "Alerting upgrade"
+    },
     "alerts-and-incidents": {
       "subtitle": "Alerting and incident management apps",
       "title": "Alerts & IRM"
@@ -523,7 +884,7 @@
       "title": "API keys"
     },
     "application": {
-      "title": "Application (preview)"
+      "title": "Application"
     },
     "apps": {
       "subtitle": "App plugins that extend the Grafana experience",
@@ -532,6 +893,9 @@
     "authentication": {
       "title": "Authentication"
     },
+    "collector": {
+      "title": "Collector"
+    },
     "config": {
       "title": "Administration"
     },
@@ -592,6 +956,10 @@
       "title": "Explore"
     },
     "frontend": {
+      "subtitle": "Gain real user monitoring insights",
+      "title": "Frontend"
+    },
+    "frontend-app": {
       "title": "Frontend"
     },
     "global-orgs": {
@@ -619,8 +987,15 @@
       "title": "Incidents"
     },
     "infrastructure": {
+      "subtitle": "Understand your infrastructure's health",
+      "title": "Infrastructure"
+    },
+    "integrations": {
       "title": "Integrations"
     },
+    "k6": {
+      "title": "Performance"
+    },
     "kubernetes": {
       "title": "Kubernetes"
     },
@@ -634,6 +1009,10 @@
     "manage-folder": {
       "subtitle": "Manage folder dashboards and permissions"
     },
+    "migrate-to-cloud": {
+      "subtitle": "Copy configuration from your self-managed installation to a cloud stack",
+      "title": "Migrate to Grafana Cloud"
+    },
     "monitoring": {
       "subtitle": "Monitoring and infrastructure apps",
       "title": "Observability"
@@ -657,9 +1036,6 @@
       "subtitle": "Manage preferences across an organization",
       "title": "Default preferences"
     },
-    "performance-testing": {
-      "title": "Performance testing"
-    },
     "playlists": {
       "subtitle": "Groups of dashboards that are displayed in a sequence",
       "title": "Playlists"
@@ -668,6 +1044,10 @@
       "subtitle": "Extend the Grafana experience with plugins",
       "title": "Plugins"
     },
+    "private-data-source-connections": {
+      "subtitle": "Query data that lives within a secured network without opening the network to inbound traffic from Grafana Cloud. Learn more in our docs.",
+      "title": "Private data source connect"
+    },
     "profile/notifications": {
       "title": "Notification history"
     },
@@ -740,6 +1120,10 @@
       "subtitle": "Groups of users that have common dashboard and permission needs",
       "title": "Teams"
     },
+    "testing-and-synthetics": {
+      "subtitle": "Optimize performance with k6 and Synthetic Monitoring insights",
+      "title": "Testing & synthetics"
+    },
     "upgrading": {
       "title": "Stats and license"
     },
@@ -755,15 +1139,20 @@
     "megamenu": {
       "close": "Close menu",
       "dock": "Dock menu",
+      "list-label": "Navigation",
       "undock": "Undock menu"
     },
     "toolbar": {
+      "close-menu": "Close menu",
       "enable-kiosk": "Enable kiosk mode",
-      "toggle-menu": "Toggle menu",
+      "open-menu": "Open menu",
       "toggle-search-bar": "Toggle top search bar"
     }
   },
   "news": {
+    "drawer": {
+      "close": "Close Drawer"
+    },
     "title": "Latest from the blog"
   },
   "notifications": {
@@ -773,7 +1162,6 @@
   "panel": {
     "header-menu": {
       "copy": "Copy",
-      "create-alert": "Create alert",
       "create-library-panel": "Create library panel",
       "duplicate": "Duplicate",
       "edit": "Edit",
@@ -784,6 +1172,7 @@
       "inspect-data": "Data",
       "inspect-json": "Panel JSON",
       "more": "More...",
+      "new-alert-rule": "New alert rule",
       "query": "Query",
       "remove": "Remove",
       "share": "Share",
@@ -836,6 +1225,16 @@
       "title": "There are no playlists created yet"
     }
   },
+  "playlists": {
+    "empty-state": {
+      "message": "No playlists found"
+    }
+  },
+  "plugins": {
+    "empty-state": {
+      "message": "No plugins found"
+    }
+  },
   "profile": {
     "change-password": {
       "cancel-button": "Cancel",
@@ -849,9 +1248,138 @@
       "new-password-same-as-old": "New password can't be the same as the old one.",
       "old-password-label": "Old password",
       "old-password-required": "Old password is required",
-      "passwords-must-match": "Passwords must match"
+      "passwords-must-match": "Passwords must match",
+      "strong-password-validation-register": "Password does not comply with the strong password policy"
+    }
+  },
+  "public-dashboard": {
+    "acknowledgment-checkboxes": {
+      "ack-title": "Before you make the dashboard public, acknowledge the following:",
+      "data-src-ack-desc": "Publishing currently only works with a subset of data sources*",
+      "data-src-ack-tooltip": "Learn more about public datasources",
+      "public-ack-desc": "Your entire dashboard will be public*",
+      "public-ack-tooltip": "Learn more about public dashboards",
+      "usage-ack-desc": "Making a dashboard public will cause queries to run each time it is viewed, which may increase costs*",
+      "usage-ack-desc-tooltip": "Learn more about query caching"
+    },
+    "config": {
+      "can-view-dashboard-radio-button-label": "Can view dashboard",
+      "copy-button": "Copy",
+      "dashboard-url-field-label": "Dashboard URL",
+      "email-share-type-option-label": "Only specified people",
+      "pause-sharing-dashboard-label": "Pause sharing dashboard",
+      "public-share-type-option-label": "Anyone with a link",
+      "revoke-public-URL-button": "Revoke public URL",
+      "revoke-public-URL-button-title": "Revoke public URL",
+      "settings-title": "Settings"
+    },
+    "create-page": {
+      "generate-public-url-button": "Generate public URL",
+      "unsupported-features-desc": "Currently, we don’t support template variables or frontend data sources",
+      "welcome-title": "Welcome to public dashboards!"
+    },
+    "delete-modal": {
+      "revoke-nonorphaned-body-text": "Are you sure you want to revoke this URL? The dashboard will no longer be public.",
+      "revoke-orphaned-body-text": "Orphaned public dashboard will no longer be public.",
+      "revoke-title": "Revoke public URL"
+    },
+    "email-sharing": {
+      "input-invalid-email-text": "Invalid email",
+      "input-required-email-text": "Email is required",
+      "invite-button": "Invite",
+      "invite-field-desc": "Invite people by email",
+      "invite-field-label": "Invite",
+      "resend-button": "Resend",
+      "resend-button-title": "Resend",
+      "revoke-button": "Revoke",
+      "revoke-button-title": "Revoke"
+    },
+    "modal-alerts": {
+      "no-upsert-perm-alert-desc": "Contact your admin to get permission to {{mode}} public dashboards",
+      "no-upsert-perm-alert-title": "You don’t have permission to {{ mode }} a public dashboard",
+      "save-dashboard-changes-alert-title": "Please save your dashboard changes before updating the public configuration",
+      "unsupport-data-source-alert-readmore-link": "Read more about supported data sources",
+      "unsupported-data-source-alert-desc": "There are data sources in this dashboard that are unsupported for public dashboards. Panels that use these data sources may not function properly: {{unsupportedDataSources}}.",
+      "unsupported-data-source-alert-title": "Unsupported data sources",
+      "unsupported-template-variable-alert-desc": "This public dashboard may not work since it uses template variables",
+      "unsupported-template-variable-alert-title": "Template variables are not supported"
+    },
+    "settings-bar-header": {
+      "collapse-settings-tooltip": "Collapse settings",
+      "expand-settings-tooltip": "Expand settings"
+    },
+    "settings-configuration": {
+      "default-time-range-label": "Default time range",
+      "default-time-range-label-desc": "The public dashboard uses the default time range settings of the dashboard",
+      "show-annotations-label": "Show annotations",
+      "show-annotations-label-desc": "Show annotations on public dashboard",
+      "time-range-picker-label": "Time range picker enabled",
+      "time-range-picker-label-desc": "Allow viewers to change time range"
+    },
+    "settings-summary": {
+      "annotations-hide-text": "Annotations = hide",
+      "annotations-show-text": "Annotations = show",
+      "time-range-picker-disabled-text": "Time range picker = disabled",
+      "time-range-picker-enabled-text": "Time range picker = enabled",
+      "time-range-text": "Time range = "
     }
   },
+  "public-dashboard-list": {
+    "button": {
+      "config-button-tooltip": "Configure public dashboard",
+      "revoke-button-text": "Revoke public URL",
+      "revoke-button-tooltip": "Revoke public dashboard URL",
+      "view-button-tooltip": "View public dashboard"
+    },
+    "dashboard-title": {
+      "orphaned-title": "<0>Orphaned public dashboard</0>",
+      "orphaned-tooltip": "The linked dashboard has already been deleted"
+    },
+    "toggle": {
+      "pause-sharing-toggle-text": "Pause sharing"
+    }
+  },
+  "public-dashboard-users-access-list": {
+    "dashboard-modal": {
+      "loading-text": "Loading...",
+      "open-dashboard-list-text": "Open dashboards list",
+      "public-dashboard-link": "Public dashboard URL",
+      "public-dashboard-setting": "Public dashboard settings"
+    },
+    "delete-user-modal": {
+      "delete-user-button-text": "Delete user",
+      "delete-user-cancel-button": "Cancel",
+      "delete-user-revoke-access-button": "Revoke access",
+      "revoke-access-title": "Revoke access",
+      "revoke-user-access-modal-desc-line1": "Are you sure you want to revoke access for {{email}}?",
+      "revoke-user-access-modal-desc-line2": "This action will immediately revoke {{email}}&apos;s access to all public dashboards."
+    },
+    "modal": {
+      "dashboard-modal-title": "Public dashboards"
+    },
+    "table-header": {
+      "activated-label": "Activated",
+      "activated-tooltip": "Earliest time user has been an active user to a dashboard",
+      "email-label": "Email",
+      "last-active-label": "Last active",
+      "origin-label": "Origin",
+      "role-label": "Role"
+    }
+  },
+  "query-operation": {
+    "header": {
+      "collapse-row": "Collapse query row",
+      "datasource-help": "Show data source help",
+      "drag-and-drop": "Drag and drop to reorder",
+      "duplicate-query": "Duplicate query",
+      "expand-row": "Expand query row",
+      "hide-response": "Hide response",
+      "remove-query": "Remove query",
+      "show-response": "Show response",
+      "toggle-edit-mode": "Toggle text edit mode"
+    },
+    "query-editor-not-exported": "Data source plugin does not export any Query Editor component"
+  },
   "refresh-picker": {
     "aria-label": {
       "choose-interval": "Auto refresh turned off. Choose refresh time interval",
@@ -874,6 +1402,12 @@
       "turned-off": "Auto refresh off"
     }
   },
+  "return-to-previous": {
+    "button": {
+      "label": "Back to {{title}}"
+    },
+    "dismissable-button": "Close"
+  },
   "search": {
     "actions": {
       "include-panels": "Include panels",
@@ -889,15 +1423,6 @@
       "new-dashboard": "New dashboard",
       "new-folder": "New folder"
     },
-    "folder-view": {
-      "go-to-folder": "Go to folder",
-      "select-folder": "Select folder"
-    },
-    "result-kind": {
-      "dashboard": "Dashboard",
-      "folder": "Folder",
-      "panel": "Panel"
-    },
     "results-table": {
       "datasource-header": "Data source",
       "location-header": "Location",
@@ -912,10 +1437,9 @@
       "placeholder": "Search for dashboards and folders"
     }
   },
-  "search-view": {
-    "no-results": {
-      "clear": "Clear search and filters",
-      "text": "No results found for your query."
+  "service-accounts": {
+    "empty-state": {
+      "message": "No services accounts found"
     }
   },
   "share-modal": {
@@ -935,7 +1459,6 @@
       "cancel-button": "Cancel",
       "info-text": "Export this dashboard.",
       "save-button": "Save to file",
-      "share-default-label": "Export with default values removed",
       "share-externally-label": "Export for sharing externally",
       "view-button": "View JSON"
     },
@@ -967,10 +1490,10 @@
       "expire-day": "1 Day",
       "expire-hour": "1 Hour",
       "expire-never": "Never",
-      "expire-week": "7 Days",
+      "expire-week": "1 Week",
       "info-text-1": "A snapshot is an instant way to share an interactive dashboard publicly. When created, we strip sensitive data like queries (metric, template, and annotation) and panel links, leaving only the visible metric data and series names embedded in your dashboard.",
       "info-text-2": "Keep in mind, your snapshot <1>can be viewed by anyone</1> that has the link and can access the URL. Share wisely.",
-      "local-button": "Local Snapshot",
+      "local-button": "Publish Snapshot",
       "mistake-message": "Did you make a mistake? ",
       "name": "Snapshot name",
       "timeout": "Timeout (seconds)",
@@ -982,6 +1505,9 @@
       "export": "Export",
       "library-panel": "Library panel",
       "link": "Link",
+      "panel-embed": "Embed",
+      "public-dashboard": "Public Dashboard",
+      "public-dashboard-title": "Public dashboard",
       "snapshot": "Snapshot"
     },
     "theme-picker": {
@@ -1044,6 +1570,11 @@
     "no-tags": "No tags found",
     "placeholder": "Filter by tag"
   },
+  "teams": {
+    "empty-state": {
+      "message": "No teams found"
+    }
+  },
   "time-picker": {
     "absolute": {
       "recent-title": "Recently used absolute ranges",
@@ -1052,6 +1583,7 @@
     "calendar": {
       "apply-button": "Apply time range",
       "cancel-button": "Cancel",
+      "close": "Close calendar",
       "select-time": "Select a time range"
     },
     "content": {
@@ -1059,6 +1591,13 @@
       "empty-recent-list-info": "It looks like you haven't used this time picker before. As soon as you enter some time intervals, recently used intervals will appear here.",
       "filter-placeholder": "Search quick ranges"
     },
+    "copy-paste": {
+      "copy-success-message": "Time range copied to clipboard",
+      "default-error-message": "{{error}} is not a valid time range",
+      "default-error-title": "Invalid time range",
+      "tooltip-copy": "Copy time range to clipboard",
+      "tooltip-paste": "Paste time range"
+    },
     "footer": {
       "change-settings-button": "Change time settings",
       "fiscal-year-option": "Fiscal year",
@@ -1071,6 +1610,7 @@
       "default-error": "Please enter a past date or \"now\"",
       "fiscal-year": "Fiscal year",
       "from-input": "From",
+      "open-input-calendar": "Open calendar",
       "range-error": "\"From\" can't be after \"To\"",
       "to-input": "To"
     },
@@ -1093,6 +1633,12 @@
       "select-search-input": "Type to search (country, city, abbreviation)"
     }
   },
+  "transformations": {
+    "empty": {
+      "add-transformation-body": "Transformations allow data to be changed in various ways before your visualization is shown.<1></1>This includes joining data together, renaming fields, making calculations, formatting data for display, and more.",
+      "add-transformation-header": "Start transforming data"
+    }
+  },
   "user-orgs": {
     "current-org-button": "Current",
     "name-column": "Name",
@@ -1107,6 +1653,9 @@
       "name-error": "Name is required",
       "name-label": "Name",
       "username-label": "Username"
+    },
+    "tabs": {
+      "general": "General"
     }
   },
   "user-session": {
@@ -1119,6 +1668,16 @@
   "user-sessions": {
     "loading": "Loading sessions..."
   },
+  "users": {
+    "empty-state": {
+      "message": "No users found"
+    }
+  },
+  "users-access-list": {
+    "tabs": {
+      "public-dashboard-users-tab-title": "Public dashboard users"
+    }
+  },
   "variable": {
     "adhoc": {
       "placeholder": "Select value"
diff --git a/public/locales/es-ES/grafana.json b/public/locales/es-ES/grafana.json
index d80df14b05f09..a37e2bda0f02f 100644
--- a/public/locales/es-ES/grafana.json
+++ b/public/locales/es-ES/grafana.json
@@ -1,102 +1,99 @@
 {
-  "_comment": "",
+  "_comment": "Este archivo es la fuente original para las cadenas en inglés. Edita la base del código para cambiar los plurales y otras frases de la interfaz de usuario.",
   "access-control": {
     "add-permission": {
-      "role-label": "",
-      "serviceaccount-label": "",
-      "team-label": "",
-      "title": "",
-      "user-label": ""
+      "role-label": "Rol",
+      "serviceaccount-label": "Cuenta de servicio",
+      "team-label": "Equipo",
+      "title": "Añadir permiso para",
+      "user-label": "Usuario"
     },
     "add-permissions": {
-      "save": ""
+      "save": "Guardar"
     },
     "permission-list": {
-      "permission": ""
+      "permission": "Permiso"
     },
     "permissions": {
-      "add-label": "",
-      "no-permissions": "",
-      "permissions-change-warning": "",
-      "role": "",
-      "serviceaccount": "",
-      "team": "",
-      "title": "",
-      "user": ""
+      "add-label": "Añadir un permiso",
+      "no-permissions": "No hay ningún permiso",
+      "permissions-change-warning": "Esto cambiará los permisos para esta carpeta y todos sus descendientes. En total, esto afectará:",
+      "role": "Rol",
+      "serviceaccount": "Cuenta de servicio",
+      "team": "Equipo",
+      "title": "Permisos",
+      "user": "Usuario"
     }
   },
+  "bouncing-loader": {
+    "label": "Cargando"
+  },
   "browse-dashboards": {
     "action": {
-      "cancel-button": "",
-      "cannot-move-folders": "",
-      "delete-button": "",
-      "delete-modal-invalid-text": "",
-      "delete-modal-invalid-title": "",
-      "delete-modal-text": "",
-      "delete-modal-title": "",
-      "deleting": "",
-      "manage-permissions-button": "",
-      "move-button": "",
-      "move-modal-alert": "",
-      "move-modal-field-label": "",
-      "move-modal-text": "",
-      "move-modal-title": "",
-      "moving": "",
-      "new-folder-name-required-phrase": ""
+      "cancel-button": "Cancelar",
+      "cannot-move-folders": "Las carpetas no se pueden mover",
+      "delete-button": "Eliminar",
+      "delete-modal-invalid-text": "Una o más carpetas contienen paneles de biblioteca o reglas de alerta. Para continuar, primero elimínelas.",
+      "delete-modal-invalid-title": "No se puede eliminar la carpeta",
+      "delete-modal-text": "Esta acción eliminará el siguiente contenido:",
+      "delete-modal-title": "Eliminar",
+      "deleting": "Eliminando...",
+      "manage-permissions-button": "Gestionar permisos",
+      "move-button": "Mover",
+      "move-modal-alert": "Al mover este elemento puede cambiar sus permisos.",
+      "move-modal-field-label": "Nombre de la carpeta",
+      "move-modal-text": "Esta acción moverá el siguiente contenido:",
+      "move-modal-title": "Mover",
+      "moving": "Moviendo...",
+      "new-folder-name-required-phrase": "Se requiere el nombre de la carpeta."
     },
     "counts": {
-      "alertRule_one": "",
-      "alertRule_many": "",
-      "alertRule_other": "",
-      "dashboard_one": "",
-      "dashboard_many": "",
-      "dashboard_other": "",
-      "folder_one": "",
-      "folder_many": "",
-      "folder_other": "",
-      "libraryPanel_one": "",
-      "libraryPanel_many": "",
-      "libraryPanel_other": "",
-      "total_one": "",
-      "total_many": "",
-      "total_other": ""
+      "alertRule_one": "{{count}} regla de alerta",
+      "alertRule_other": "{{count}} reglas de alerta",
+      "dashboard_one": "{{count}} panel de control",
+      "dashboard_other": "{{count}} paneles de control",
+      "folder_one": "{{count}} carpeta",
+      "folder_other": "{{count}} carpetas",
+      "libraryPanel_one": "{{count}} panel de librería",
+      "libraryPanel_other": "{{count}} paneles de librería",
+      "total_one": "{{count}} elemento",
+      "total_other": "{{count}} elementos"
     },
     "dashboards-tree": {
-      "collapse-folder-button": "",
-      "expand-folder-button": "",
-      "name-column": "",
-      "select-all-header-checkbox": "",
-      "select-checkbox": "",
-      "tags-column": ""
+      "collapse-folder-button": "Contraer la carpeta {{title}}",
+      "expand-folder-button": "Expandir la carpeta {{title}}",
+      "name-column": "Nombre",
+      "select-all-header-checkbox": "Seleccionar todo",
+      "select-checkbox": "Seleccionar",
+      "tags-column": "Etiquetas"
     },
     "folder-actions-button": {
-      "delete": "",
-      "folder-actions": "",
-      "manage-permissions": "",
-      "move": ""
+      "delete": "Eliminar",
+      "folder-actions": "Acciones de la carpeta",
+      "manage-permissions": "Gestionar permisos",
+      "move": "Mover"
     },
     "folder-picker": {
-      "accessible-label": "",
-      "button-label": "",
-      "empty-message": "",
-      "error-title": "",
-      "search-placeholder": "",
-      "unknown-error": ""
+      "accessible-label": "Seleccionar carpeta: {{ label }} seleccionada actualmente",
+      "button-label": "Seleccionar carpeta",
+      "clear-selection": "Eliminar selección",
+      "empty-message": "No se ha encontrado ninguna carpeta",
+      "error-title": "Error al cargar las carpetas",
+      "search-placeholder": "Buscar carpetas",
+      "unknown-error": "Error desconocido"
     },
     "manage-folder-nav": {
-      "alert-rules": "",
-      "dashboards": "",
-      "panels": "",
-      "permissions": "",
-      "settings": ""
+      "alert-rules": "Reglas de alerta",
+      "dashboards": "Paneles de control",
+      "panels": "Paneles"
     },
     "new-folder-form": {
-      "cancel-label": "",
-      "create-label": "",
-      "name-label": ""
+      "cancel-label": "Cancelar",
+      "create-label": "Crear",
+      "name-label": "Nombre de la carpeta"
     },
     "no-results": {
-      "clear": "",
+      "clear": "Borrar la búsqueda y los filtros",
       "text": ""
     }
   },
@@ -131,29 +128,104 @@
   },
   "connections": {
     "connect-data": {
-      "category-header-label": ""
+      "category-header-label": "Orígenes de datos",
+      "empty-message": ""
     },
     "search": {
-      "placeholder": ""
+      "placeholder": "Buscar todo"
     }
   },
   "correlations": {
-    "add-new": "",
+    "add-new": "Añadir nuevo",
     "alert": {
-      "error-message": "",
-      "title": ""
+      "error-message": "Se ha producido un error desconocido al recuperar los datos de correlación. Por favor, inténtelo de nuevo.",
+      "title": "Error al recuperar los datos de correlación"
+    },
+    "basic-info-form": {
+      "description-description": "Descripción opcional con más información sobre el enlace",
+      "description-label": "Descripción",
+      "label-description": "Este nombre se utilizará como etiqueta para la correlación. Esta se mostrará como el texto del botón, un elemento del menú o el texto del cursor en un enlace.",
+      "label-label": "Etiqueta",
+      "label-placeholder": "p. ej. seguimiento de Tempo",
+      "label-required": "Este campo es obligatorio.",
+      "sub-text": "<0>Defina el texto que describirá la correlación.</0>",
+      "title": "Definir la etiqueta de correlación (paso 1 de 3)"
     },
     "list": {
-      "delete": "",
-      "label": "",
-      "loading": "",
-      "read-only": "",
-      "source": "",
-      "target": ""
-    },
-    "page-content": "",
-    "page-heading": "",
-    "sub-title": ""
+      "delete": "eliminar correlación",
+      "label": "Etiqueta",
+      "loading": "cargando...",
+      "read-only": "Solo lectura",
+      "source": "Fuente",
+      "target": "Destino"
+    },
+    "navigation-form": {
+      "add-button": "Añadir",
+      "back-button": "Atrás",
+      "next-button": "Siguiente",
+      "save-button": "Guardar"
+    },
+    "page-content": "Para habilitar las correlaciones, añádala en la configuración de Grafana:",
+    "page-heading": "Las correlaciones están deshabilitadas",
+    "query-editor": {
+      "control-rules": "La fuente de datos de destino seleccionada debe exportar un editor de consultas.",
+      "data-source-text": "Seleccione primero una fuente de datos de destino.",
+      "data-source-title": "No se ha seleccionado ninguna fuente de datos",
+      "error-text": "No se ha podido cargar la fuente de datos seleccionada.",
+      "error-title": "Error al cargar la fuente de datos",
+      "loading": "Cargando el editor de consultas...",
+      "query-description": "Defina la consulta que se ejecuta cuando se hace clic en el enlace. Puede usar <2>variables</2> para acceder a los valores de campo específicos.",
+      "query-editor-title": "La fuente de datos no exporta un editor de consultas.",
+      "query-label": "Consulta"
+    },
+    "source-form": {
+      "control-required": "Este campo es obligatorio.",
+      "description": "Ha utilizado las siguientes variables en la consulta de destino: <1></1><2></2>Un punto de datos necesita proporcionar valores a todas las variables como campos o como salida de transformaciones para hacer que el botón de correlación aparezca en la visualización. 4></4>Nota: No todas las variables deben definirse explícitamente a continuación. Una transformación como <7>logfmt</7> creará variables para cada par clave/valor.",
+      "heading": "Variables utilizadas en la consulta de destino",
+      "results-description": "El enlace se mostrará junto al valor de este campo",
+      "results-label": "Campo de resultados",
+      "results-required": "Este campo es obligatorio.",
+      "source-description": "Los resultados de la fuente de datos seleccionada tienen enlaces que se muestran en el panel",
+      "source-label": "Fuente",
+      "sub-text": "<0>Defina qué fuente de datos mostrará la correlación y qué datos reemplazarán a las variables previamente definidas.</0>",
+      "title": "Configurar la fuente de datos que se vinculará a {{dataSourceName}} (paso 3 de 3)"
+    },
+    "sub-title": "Defina cómo se relacionan los datos que se encuentran en diferentes fuentes de datos. Más información en la <2>documentación<1></1></2>",
+    "target-form": {
+      "control-rules": "Este campo es obligatorio.",
+      "sub-text": "<0>Defina a qué fuente de datos enlazará la correlación y qué consulta se ejecutará cuando se haga clic en la correlación.</0>",
+      "target-description": "Especifique qué fuente de datos se consulta cuando se hace clic en el enlace",
+      "target-label": "Destino",
+      "title": "Configurar el destino de la correlación (paso 2 de 3)"
+    },
+    "trans-details": {
+      "logfmt-description": "Analice el campo proporcionado con logfmt para obtener variables",
+      "logfmt-label": "Logfm",
+      "regex-description": "El campo se analizará con regex. Utilice grupos de captura con nombre para devolver múltiples variables o un solo grupo de captura sin nombre para agregar una variable al valor de mapa con nombre. Regex no distingue entre mayúsculas y minúsculas.",
+      "regex-expression": "Utilice los grupos de captura para extraer una porción del campo.",
+      "regex-label": "Expresión regular",
+      "regex-map-values": "Define el nombre de la variable si el grupo de captura no tiene nombre."
+    },
+    "transform": {
+      "add-button": "Añadir transformación",
+      "heading": "Transformaciones",
+      "no-transform": "No se ha definido ninguna transformación."
+    },
+    "transform-row": {
+      "expression-label": "Expresión",
+      "expression-required": "Por favor, defina una expresión",
+      "expression-tooltip": "Se requiere para la expresión regular. La expresión que usará la transformación. Logfmt no utiliza más especificaciones.",
+      "field-input": "campo",
+      "field-label": "Campo",
+      "field-tooltip": "Opcional. El campo a transformar. Si no se especifica, la transformación se aplicará al campo de resultados.",
+      "map-value-label": "Valor del mapa",
+      "map-value-tooltip": "Opcional. Define el nombre de la variable. Actualmente solo es válido para expresiones regulares con un único grupo de captura sin nombre.",
+      "remove-button": "Eliminar",
+      "remove-tooltip": "Eliminar transformación",
+      "transform-required": "Por favor, seleccione un tipo de transformación",
+      "type-label": "Tipo",
+      "type-tooltip": "El tipo de transformación que se aplicará a los datos de origen."
+    }
   },
   "dashboard": {
     "add-menu": {
@@ -161,21 +233,25 @@
       "paste-panel": "Pegar panel",
       "row": "Fila",
       "visualization": "Visualización",
-      "widget": ""
+      "widget": "«Widget»"
+    },
+    "alert-rules-drawer": {
+      "redirect-link": "Lista en Alertas de Grafana",
+      "subtitle": "Reglas de alerta relacionadas con este tablero"
     },
     "empty": {
-      "add-library-panel-body": "",
-      "add-library-panel-button": "",
-      "add-library-panel-header": "",
+      "add-library-panel-body": "Añadir las visualizaciones que se comparten con otros tableros.",
+      "add-library-panel-button": "Añadir panel de biblioteca",
+      "add-library-panel-header": "Añadir un panel de biblioteca",
       "add-visualization-body": "Selecciona una fuente de datos y luego consulta y visualiza tus datos con gráficos, estadísticas y tablas o cree listas, anotaciones y otros widgets.",
       "add-visualization-button": "Añadir visualización",
       "add-visualization-header": "Comienza tu nuevo panel de control añadiendo una visualización",
-      "add-widget-body": "",
-      "add-widget-button": "",
-      "add-widget-header": "",
-      "import-a-dashboard-body": "",
-      "import-a-dashboard-header": "",
-      "import-dashboard-button": ""
+      "add-widget-body": "Crear listas, reducciones y otros «widgets»",
+      "add-widget-button": "Añadir widget",
+      "add-widget-header": "Añadir un «widget»",
+      "import-a-dashboard-body": "Importar el tablero desde el archivo o <1>grafana.com</1>.",
+      "import-a-dashboard-header": "Importar un tablero",
+      "import-dashboard-button": "Importar panel de control"
     },
     "inspect": {
       "data-tab": "Datos",
@@ -231,7 +307,7 @@
     },
     "toolbar": {
       "add": "Añadir",
-      "add-panel": "Añadir panel",
+      "alert-rules": "Reglas de alerta",
       "mark-favorite": "Marcar como favorito",
       "open-original": "Abrir el panel de control original",
       "playlist-next": "Ir al siguiente panel de control",
@@ -241,133 +317,255 @@
       "save": "Guardar panel de control",
       "settings": "Ajustes del panel de control",
       "share": "Compartir panel o panel de control",
+      "share-button": "Compartir",
       "unmark-favorite": "Deshacer marca como favorito"
     },
     "validation": {
-      "invalid-dashboard-id": "",
-      "invalid-json": "",
-      "tags-expected-array": "",
-      "tags-expected-strings": ""
+      "invalid-dashboard-id": "No se ha podido encontrar un ID de Grafana.com válido",
+      "invalid-json": "JSON no válido",
+      "tags-expected-array": "etiquetas: matriz prevista",
+      "tags-expected-strings": "etiquetas: matriz de cadenas prevista"
     }
   },
   "dashboard-import": {
     "file-dropzone": {
-      "primary-text": "",
-      "secondary-text": ""
+      "primary-text": "Subir archivo JSON del tablero",
+      "secondary-text": "Arrastrar y soltar aquí o hacer clic para navegar"
     },
     "form-actions": {
-      "cancel": "",
-      "load": ""
+      "cancel": "Cancelar",
+      "load": "Cargar"
     },
     "gcom-field": {
-      "label": "",
-      "load-button": "",
-      "placeholder": "",
-      "validation-required": ""
+      "label": "Buscar e importar tableros para las aplicaciones comunes en <1></1>",
+      "load-button": "Cargar",
+      "placeholder": "URL o ID del tablero de Grafana.com",
+      "validation-required": "Se requiere una URL o ID del tablero de Grafana"
     },
     "json-field": {
-      "label": "",
-      "validation-required": ""
+      "label": "Importar a través del modelo JSON del tablero",
+      "validation-required": "Se necesita un modelo JSON del tablero"
     }
   },
   "dashboard-settings": {
     "annotations": {
-      "title": ""
+      "title": "Anotaciones"
     },
-    "dashboard-delete-button": "",
+    "dashboard-delete-button": "Eliminar tablero",
     "general": {
-      "auto-refresh-description": "",
-      "auto-refresh-label": "",
-      "description-label": "",
-      "editable-description": "",
-      "editable-label": "",
-      "folder-label": "",
-      "panel-options-graph-tooltip-description": "",
-      "panel-options-graph-tooltip-label": "",
-      "panel-options-label": "",
-      "tags-label": "",
-      "title": "",
-      "title-label": ""
+      "auto-refresh-description": "Definir los intervalos de actualización automática que deberían estar disponibles en la lista de actualización automática.",
+      "auto-refresh-label": "Actualización automática",
+      "description-label": "Descripción",
+      "editable-description": "Establecer como de solo lectura para desactivar toda la edición. Recargar el tablero para que los cambios surtan efecto",
+      "editable-label": "Editable",
+      "folder-label": "Carpeta",
+      "panel-options-graph-tooltip-description": "Controla la descripción y el comportamiento de resaltado en diferentes paneles. Recargar el tablero para que los cambios surtan efecto",
+      "panel-options-graph-tooltip-label": "Descripción gráfica",
+      "panel-options-label": "Opciones del panel",
+      "tags-label": "Etiquetas",
+      "title": "General",
+      "title-label": "Título"
     },
     "json-editor": {
-      "save-button": "",
-      "subtitle": "",
-      "title": ""
+      "save-button": "Guardar cambios",
+      "subtitle": "El siguiente modelo JSON es la estructura de datos que define el tablero. Incluye ajustes del tablero, ajustes del panel, diseño, consultas, etc.",
+      "title": "Modelo JSON"
     },
     "links": {
-      "title": ""
+      "title": "Enlaces"
     },
     "permissions": {
-      "title": ""
+      "title": "Permisos"
     },
     "settings": {
-      "title": ""
+      "title": "Configuración"
     },
     "time-picker": {
-      "hide-time-picker": "",
-      "now-delay-description": "",
-      "now-delay-label": "",
-      "refresh-live-dashboards-description": "",
-      "refresh-live-dashboards-label": "",
-      "time-options-label": "",
-      "time-zone-label": "",
-      "week-start-label": ""
+      "hide-time-picker": "Ocultar el selector de tiempo",
+      "now-delay-description": "Excluir los datos recientes que puedan estar incompletos.",
+      "now-delay-label": "Retraso ahora",
+      "refresh-live-dashboards-description": "Redibujar continuamente los paneles en los que el rango de tiempo hace referencia a «ahora»",
+      "refresh-live-dashboards-label": "Actualizar paneles de control activos",
+      "time-options-label": "Opciones de tiempo",
+      "time-zone-label": "Huso horario",
+      "week-start-label": "Inicio de la semana"
     },
     "variables": {
-      "title": ""
+      "title": "Variables"
     },
     "versions": {
-      "title": ""
+      "title": "Versiones"
     }
   },
   "data-source-picker": {
-    "add-new-data-source": "",
+    "add-new-data-source": "Configurar una nueva fuente de datos",
     "built-in-list": {
-      "description-dashboard": "",
-      "description-grafana": "",
-      "description-mixed": ""
+      "description-dashboard": "Reutilizar los resultados de la consulta de otras visualizaciones",
+      "description-grafana": "Descubrir las visualizaciones usando datos simulados",
+      "description-mixed": "Usar múltiples fuentes de datos"
     },
     "list": {
-      "no-data-source-message": ""
+      "no-data-source-message": "No se ha encontrado ninguna fuente de datos"
     },
     "modal": {
-      "configure-new-data-source": "",
-      "input-placeholder": "",
-      "title": ""
+      "configure-new-data-source": "Abrir una nueva pestaña y configurar una fuente de datos",
+      "input-placeholder": "Seleccionar fuente de datos",
+      "title": "Seleccionar fuente de datos"
     },
-    "open-advanced-button": ""
+    "open-advanced-button": "Abrir selector avanzado de fuentes de datos"
   },
   "data-sources": {
     "datasource-add-button": {
-      "label": ""
+      "label": "Añadir nueva fuente de datos"
     }
   },
   "explore": {
-    "add-to-dashboard": "",
+    "add-to-dashboard": "Añadir al tablero",
+    "rich-history": {
+      "close-tooltip": "Cerrar el historial de consultas",
+      "datasource-a-z": "Fuente de datos A-Z",
+      "datasource-z-a": "Fuente de datos Z-A",
+      "newest-first": "El más reciente primero",
+      "oldest-first": "El más antiguo primero",
+      "query-history": "Historial de consultas",
+      "settings": "Configuración",
+      "starred": "Destacado"
+    },
+    "rich-history-card": {
+      "add-comment-form": "Añadir formulario de comentarios",
+      "add-comment-tooltip": "Añadir comentario",
+      "cancel": "Cancelar",
+      "confirm-delete": "Eliminar",
+      "copy-query-tooltip": "Copiar consulta al portapapeles",
+      "copy-shortened-link-tooltip": "Copiar enlace acortado al portapapeles",
+      "datasource-icon-label": "Icono de fuente de datos",
+      "datasource-name-label": "Nombre de fuente de datos",
+      "datasource-not-exist": "La fuente de datos ya no existe",
+      "delete-query-confirmation-title": "Eliminar",
+      "delete-query-title": "Eliminar consulta",
+      "delete-query-tooltip": "Eliminar consulta",
+      "delete-starred-query-confirmation-text": "¿Seguro que desea eliminar permanentemente su consulta destacada?",
+      "edit-comment-tooltip": "Editar comentario",
+      "loading-text": "cargando...",
+      "optional-description": "Una descripción opcional de lo que hace la consulta.",
+      "query-comment-label": "Comentario de la consulta",
+      "query-text-label": "Texto de la consulta",
+      "run-query-button": "Ejecutar consulta",
+      "save-comment": "Guardar comentario",
+      "star-query-tooltip": "Consulta destacada",
+      "switch-datasource-button": "Cambiar la fuente de datos y ejecutar la consulta",
+      "unstar-query-tooltip": "Desmarcar consulta",
+      "update-comment-form": "Actualizar el formulario de comentarios"
+    },
+    "rich-history-container": {
+      "loading": "Cargando..."
+    },
+    "rich-history-notification": {
+      "query-copied": "Consulta copiada al portapapeles",
+      "query-deleted": "Consulta eliminada"
+    },
+    "rich-history-queries-tab": {
+      "displaying-partial-queries": "Mostrando {{ count }} consultas",
+      "displaying-queries": "{{ count }} consultas",
+      "filter-aria-label": "Filtrar consultas para la(s) fuente(s) de datos",
+      "filter-history": "Filtrar historial",
+      "filter-placeholder": "Filtrar consultas para la(s) fuente(s) de datos",
+      "history-local": "El historial se almacena en su navegador y no se comparte con otras personas.",
+      "loading": "Cargando...",
+      "loading-results": "Cargando resultados...",
+      "search-placeholder": "Buscar consultas",
+      "showing-queries": "Mostrando {{ shown }} de {{ total }} <0>Cargar más</0>",
+      "sort-aria-label": "Ordenar consultas",
+      "sort-placeholder": "Ordenar consultas por"
+    },
+    "rich-history-settings-tab": {
+      "alert-info": "Grafana mantendrá las entradas hasta {{optionLabel}}. Las entradas destacadas no se eliminarán.",
+      "change-default-tab": "Cambiar la pestaña activa por defecto de «Historial de consultas» a «Destacadas»",
+      "clear-history-info": "Eliminar todo su historial de consultas de forma permanente.",
+      "clear-query-history": "Borrar historial de consultas",
+      "clear-query-history-button": "Borrar historial de consultas",
+      "delete-confirm": "Eliminar",
+      "delete-confirm-text": "¿Seguro que desea eliminar permanentemente su historial de consultas?",
+      "delete-title": "Eliminar",
+      "history-time-span": "Rango de tiempo del historial",
+      "history-time-span-description": "Seleccione el periodo de tiempo durante el cual Grafana guardará su historial de búsquedas. Se almacenarán hasta {{MAX_HISTORY_ITEMS}} entradas.",
+      "only-show-active-datasource": "Mostrar solo las consultas para la fuente de datos actualmente activa en Explorar",
+      "query-history-deleted": "Historial de consultas borrado",
+      "retention-period": {
+        "1-week": "1 semana",
+        "2-days": "2 días",
+        "2-weeks": "2 semanas",
+        "5-days": "5 días"
+      }
+    },
+    "rich-history-starred-tab": {
+      "filter-queries-aria-label": "Filtrar consultas para la(s) fuente(s) de datos",
+      "filter-queries-placeholder": "Filtrar consultas para la(s) fuente(s) de datos",
+      "loading": "Cargando...",
+      "loading-results": "Cargando resultados...",
+      "local-history-message": "El historial se almacena en su navegador y no se comparte con otras personas.",
+      "search-queries-placeholder": "Buscar consultas",
+      "showing-queries": "Mostrando {{ shown }} de {{ total }} <0>Cargar más</0>",
+      "sort-queries-aria-label": "Ordenar consultas",
+      "sort-queries-placeholder": "Ordenar consultas por"
+    },
+    "rich-history-utils": {
+      "a-week-ago": "hace una semana",
+      "days-ago": "hace {{num}} días",
+      "default-from": "ahora-1 h",
+      "default-to": "ahora",
+      "today": "hoy",
+      "two-weeks-ago": "hace dos semanas",
+      "yesterday": "ayer"
+    },
+    "rich-history-utils-notification": {
+      "saving-failed": "Error al guardar el historial enriquecido",
+      "update-failed": "Error al actualizar el extenso historial"
+    },
+    "secondary-actions": {
+      "query-add-button": "Añadir consulta",
+      "query-add-button-aria-label": "Añadir consulta",
+      "query-history-button": "Historial de consultas",
+      "query-history-button-aria-label": "Historial de consultas",
+      "query-inspector-button": "Inspector de consultas",
+      "query-inspector-button-aria-label": "Inspector de consultas"
+    },
     "table": {
-      "no-data": "",
-      "title": "",
-      "title-with-name": ""
+      "no-data": "0 series devueltas",
+      "title": "Tabla",
+      "title-with-name": "Tabla - {{name}}"
     },
     "toolbar": {
-      "aria-label": "",
-      "copy-shortened-link": "",
-      "refresh-picker-cancel": "",
-      "refresh-picker-run": "",
-      "split-close": "",
-      "split-close-tooltip": "",
-      "split-narrow": "",
-      "split-title": "",
-      "split-tooltip": "",
-      "split-widen": ""
+      "aria-label": "Barra de herramientas de Explore",
+      "copy-link": "Copiar URL",
+      "copy-link-abs-time": "Copiar URL absoluta",
+      "copy-links-absolute-category": "Enlaces URL de sincronización temporal (compartir con intervalo de tiempo intacto)",
+      "copy-links-normal-category": "Enlaces URL normales",
+      "copy-shortened-link": "Copiar URL acortada",
+      "copy-shortened-link-abs-time": "Copiar URL absoluta acortada",
+      "copy-shortened-link-menu": "Abrir menú de enlace acortado",
+      "refresh-picker-cancel": "Cancelar",
+      "refresh-picker-run": "Ejecutar consulta",
+      "split-close": "Cerrar",
+      "split-close-tooltip": "Cerrar panel dividido",
+      "split-narrow": "Reducir panel",
+      "split-title": "Dividir",
+      "split-tooltip": "Dividir el panel",
+      "split-widen": "Agrandar panel"
     }
   },
   "folder-picker": {
     "loading": "Cargando carpetas..."
   },
   "grafana-ui": {
+    "drawer": {
+      "close": "Cerrar"
+    },
+    "empty-state": {
+      "not-found-message": ""
+    },
     "modal": {
-      "close-tooltip": ""
+      "close-tooltip": "Cerrar"
     },
     "segment-async": {
       "error": "No se han podido cargar las opciones",
@@ -375,66 +573,68 @@
       "no-options": "No se ha encontrado ninguna opción"
     },
     "select": {
-      "no-options-label": "",
-      "placeholder": ""
+      "no-options-label": "No se ha encontrado ninguna opción",
+      "placeholder": "Elegir"
     }
   },
   "graph": {
     "container": {
-      "content": "",
-      "show-all-series": "",
-      "show-only-series": "",
-      "title": ""
+      "content": "Renderizar demasiadas series en un solo panel puede afectar al rendimiento y hacer que los datos sean más difíciles de leer. Considere refinar sus consultas.",
+      "show-all-series": "Mostrar todo {{length}}",
+      "show-only-series": "Mostrando solo la serie {{MAX_NUMBER_OF_TIME_SERIES}}",
+      "title": "Gráfico"
     }
   },
   "help-modal": {
     "shortcuts-category": {
-      "dashboard": "",
-      "focused-panel": "",
-      "global": "",
-      "time-range": ""
+      "dashboard": "Panel de control",
+      "focused-panel": "Panel focalizado",
+      "global": "Global",
+      "time-range": "Rango de tiempo"
     },
     "shortcuts-description": {
-      "change-theme": "",
-      "collapse-all-rows": "",
-      "dashboard-settings": "",
-      "duplicate-panel": "",
-      "exit-edit/setting-views": "",
-      "expand-all-rows": "",
-      "go-to-dashboards": "",
-      "go-to-explore": "",
-      "go-to-home-dashboard": "",
-      "go-to-profile": "",
-      "make-time-range-permanent": "",
-      "move-time-range-back": "",
-      "move-time-range-forward": "",
-      "open-search": "",
-      "open-shared-modal": "",
-      "refresh-all-panels": "",
-      "remove-panel": "",
-      "save-dashboard": "",
-      "show-all-shortcuts": "",
-      "toggle-active-mode": "",
-      "toggle-all-panel-legends": "",
-      "toggle-auto-fit": "",
-      "toggle-exemplars": "",
-      "toggle-graph-crosshair": "",
-      "toggle-kiosk": "",
-      "toggle-panel-edit": "",
-      "toggle-panel-fullscreen": "",
-      "toggle-panel-legend": "",
-      "zoom-out-time-range": ""
-    },
-    "title": ""
+      "change-theme": "Cambiar tema",
+      "collapse-all-rows": "Contraer todas las filas",
+      "copy-time-range": "Copiar rango de tiempo",
+      "dashboard-settings": "Ajustes del panel de control",
+      "duplicate-panel": "Duplicar panel",
+      "exit-edit/setting-views": "Salir de las opciones de edición/ajustes",
+      "expand-all-rows": "Expandir todas las filas",
+      "go-to-dashboards": "Ir a paneles de control",
+      "go-to-explore": "Ir a Explorar",
+      "go-to-home-dashboard": "Ir al panel de control de inicio",
+      "go-to-profile": "Ir al perfil",
+      "make-time-range-permanent": "Hacer que el rango de tiempo sea absoluto/permanente",
+      "move-time-range-back": "Retrasar el rango de tiempo",
+      "move-time-range-forward": "Mover el rango de tiempo hacia delante",
+      "open-search": "Abrir búsqueda",
+      "open-shared-modal": "Abrir el modo de panel compartido",
+      "paste-time-range": "Pegar rango de tiempo",
+      "refresh-all-panels": "Actualizar todos los paneles",
+      "remove-panel": "Eliminar panel",
+      "save-dashboard": "Guardar panel de control",
+      "show-all-shortcuts": "Mostrar todos los accesos directos del teclado",
+      "toggle-active-mode": "Alternar el modo activo/vista",
+      "toggle-all-panel-legends": "Cambiar todas las leyendas del panel",
+      "toggle-auto-fit": "Cambiar los paneles de ajuste automático (característica experimental)",
+      "toggle-exemplars": "Alternar los ejemplares en todo el panel",
+      "toggle-graph-crosshair": "Alternar la retícula del gráfico compartido",
+      "toggle-kiosk": "Alternar el modo quiosco (oculta la navegación superior)",
+      "toggle-panel-edit": "Cambiar la vista de edición del panel",
+      "toggle-panel-fullscreen": "Cambiar la vista de pantalla completa del panel",
+      "toggle-panel-legend": "Cambiar leyenda del panel",
+      "zoom-out-time-range": "Reducir el intervalo de tiempo"
+    },
+    "title": "Accesos directos"
   },
   "inspector": {
     "query": {
-      "collapse-all": "",
-      "copy-to-clipboard": "",
-      "description": "",
-      "expand-all": "",
-      "no-data": "",
-      "refresh": ""
+      "collapse-all": "Contraer todo",
+      "copy-to-clipboard": "Copiar al portapapeles",
+      "description": "El inspector de consultas le permite ver la solicitud y la respuesta sin procesar. Para recopilar estos datos, Grafana necesita emitir una nueva consulta. Haga clic en el botón actualizar situado debajo para activar una nueva consulta.",
+      "expand-all": "Expandir todo",
+      "no-data": "Aún no se ha recogido ninguna solicitud o respuesta. Pulse el botón de actualizar",
+      "refresh": "Actualizar"
     }
   },
   "library-panel": {
@@ -451,17 +651,19 @@
     }
   },
   "library-panels": {
+    "empty-state": {
+      "message": ""
+    },
     "modal": {
-      "body_one": "",
-      "body_many": "",
-      "body_other": "",
-      "button-cancel": "",
-      "button-view-panel1": "",
-      "button-view-panel2": "",
-      "panel-not-linked": "",
-      "select-no-options-message": "",
-      "select-placeholder": "",
-      "title": ""
+      "button-cancel": "<0>Cancelar</0>",
+      "button-view-panel1": "Ver panel en {{label}}...",
+      "button-view-panel2": "Ver panel en el panel de control...",
+      "panel-not-linked": "El panel no está vinculado a un panel de control. Añádalo a un panel de control y vuelva a intentarlo.",
+      "select-no-options-message": "No se ha encontrado ningún tablero",
+      "select-placeholder": "Empezar a escribir para buscar el panel de control",
+      "title": "Ver el panel en el tablero",
+      "body_one": "Este panel se está utilizando en {{count}} tablero. Por favor, elija qué tablero quiere ver en el panel:",
+      "body_other": "Este panel se está utilizando en {{count}} paneles de control. Elija qué panel quiere ver en el panel de control:"
     },
     "save": {
       "error": "Error al guardar el panel de la librería: «{{errorMsg}}»",
@@ -470,20 +672,159 @@
   },
   "login": {
     "error": {
-      "blocked": "",
-      "invalid-user-or-password": "",
-      "title": "",
-      "unknown": ""
+      "blocked": "Ha excedido el número de intentos de inicio de sesión para este usuario. Inténtelo de nuevo más tarde.",
+      "invalid-user-or-password": "Nombre de usuario o contraseña no válidos",
+      "title": "Error al iniciar sesión",
+      "unknown": "Se ha producido un error desconocido"
+    },
+    "forgot-password": "¿Has olvidado tu contraseña?",
+    "form": {
+      "password-label": "Contraseña",
+      "password-required": "La contraseña es obligatoria",
+      "submit-label": "Iniciar sesión",
+      "submit-loading-label": "Iniciando sesión...",
+      "username-label": "Correo o nombre de usuario",
+      "username-required": "El correo o el nombre de usuario es obligatorio"
+    },
+    "services": {
+      "sing-in-with-prefix": "Iniciar sesión con {{serviceName}}"
+    },
+    "signup": {
+      "button-label": "Regístrate",
+      "new-to-question": "¿Te acabas de unir a Grafana?"
+    }
+  },
+  "migrate-to-cloud": {
+    "can-i-move": {
+      "body": "Una vez que conectes esta instalación a una pila en la nube, podrás cargar fuentes de datos y paneles.",
+      "link-title": "Infórmate sobre el proceso de migrar otros ajustes",
+      "title": "¿Puedo mover esta instalación a Grafana Cloud?"
+    },
+    "connect-modal": {
+      "body-cloud-stack": "También necesitarás una pila en la nube. Si te acabas de registrar, crearemos automáticamente tu primera pila. Si tienes una cuenta, deberás seleccionar o crear una.",
+      "body-get-started": "Para empezar, necesitarás una cuenta de Grafana.com.",
+      "body-paste-stack": "Una vez que te decidas por una pila, pega la URL a continuación.",
+      "body-sign-up": "Crea una cuenta de Grafana.com",
+      "body-token": "Tu instalación autogestionada de Grafana necesita acceso especial para poder migrar el contenido de forma segura. Tendrás que crear un token de migración en la pila en la nube que hayas elegido.",
+      "body-token-field": "Token de migración",
+      "body-token-field-placeholder": "Pega el token aquí",
+      "body-token-instructions": "Inicia sesión en tu pila en la nube y ve a Administración > General > Migrar a Grafana Cloud. Crea un token de migración en esa pantalla y pégalo aquí.",
+      "body-url-field": "URL de la pila en la nube",
+      "body-view-stacks": "Ver mis pilas en la nube",
+      "cancel": "Cancelar",
+      "connect": "Conectar con esta pila",
+      "connecting": "Conectando con esta pila...",
+      "stack-required-error": "La URL de la pila es obligatoria",
+      "title": "Conectar a una pila en la nube",
+      "token-required-error": "El token de migración es obligatorio"
+    },
+    "cta": {
+      "button": "Migrar esta instancia a Cloud",
+      "header": "Déjanos gestionar tu pila de Grafana"
+    },
+    "disconnect-modal": {
+      "body": "Se eliminará el token de migración de la instalación. Si quieres subir más recursos en el futuro, deberás introducir un nuevo token de migración.",
+      "cancel": "Cancelar",
+      "disconnect": "Desconectar",
+      "disconnecting": "Desconectando...",
+      "error": "Se ha producido un error durante la desconexión",
+      "title": "Desconectar de la pila en la nube"
+    },
+    "get-started": {
+      "body": "El proceso de migración debe iniciarse desde tu instancia autogestionada de Grafana.",
+      "configure-pdc-link": "Configurar PDC para esta pila",
+      "link-title": "Más información sobre Private Data Source Connect",
+      "step-1": "Inicia sesión en tu instancia autogestionada y ve a Administración > General > Migrar a Grafana Cloud.",
+      "step-2": "Selecciona «Migrar esta instancia a Cloud».",
+      "step-3": "Se te pedirá un token de migración. Genera uno desde esta pantalla.",
+      "step-4": "En tu instancia autogestionada, selecciona «Subir todo» para subir fuentes de datos y paneles a esta pila en la nube.",
+      "step-5": "Si algunas de tus fuentes de datos no funcionan a través de la red de Internet pública, deberás instalar Private Data Source Connect en tu entorno autogestionado.",
+      "title": "Cómo empezar"
+    },
+    "is-it-secure": {
+      "body": "Grafana Labs se compromete a mantener los más altos estándares de privacidad y seguridad. Al implementar las tecnologías y los procedimientos de seguridad estándar del sector, ayudamos a proteger los datos de nuestros clientes de accesos, usos o divulgaciones no autorizados.",
+      "link-title": "Centro de confianza de Grafana Labs",
+      "title": "¿Es seguro?"
+    },
+    "migrate-to-this-stack": {
+      "body": "Puedes copiar parte de la configuración de tu instancia autogestionada de Grafana automáticamente en esta pila en la nube.",
+      "link-title": "Ver la guía de migración completa",
+      "title": "Migrar la configuración a esta pila"
+    },
+    "migration-token": {
+      "body": "Tu instancia autogestionada de Grafana necesitará un token de autenticación especial para poder conectarse de forma segura a esta pila en la nube.",
+      "delete-button": "Eliminar este token de migración",
+      "delete-modal-body": "Si ya has utilizado este token con una instalación autogestionada, la instalación ya no podrá cargar contenido.",
+      "delete-modal-cancel": "Cancelar",
+      "delete-modal-confirm": "Eliminar",
+      "delete-modal-deleting": "Eliminando...",
+      "delete-modal-title": "Eliminar token de migración",
+      "generate-button": "Generar un token de migración",
+      "generate-button-loading": "Generando un token de migración...",
+      "modal-close": "Cerrar",
+      "modal-copy-and-close": "Copiar al portapapeles y cerrar",
+      "modal-copy-button": "Copiar al portapapeles",
+      "modal-field-description": "Copia el token ahora, ya que no lo volverás a ver. Si lo pierdes, deberás crear uno nuevo.",
+      "modal-field-label": "Token",
+      "modal-title": "Se ha creado el token de migración",
+      "status": "Estado actual: <2></2>",
+      "title": "Token de migración"
+    },
+    "pdc": {
+      "body": "Exponer tus fuentes de datos en Internet puede plantear problemas de seguridad. Private Data Source Connect (PDC) permite a Grafana Cloud acceder a tus fuentes de datos a través de un túnel de red seguro.",
+      "link-title": "Infórmate sobre PDC",
+      "title": "No todas mis fuentes de datos están en la red de Internet pública"
+    },
+    "pricing": {
+      "body": "Grafana Cloud te ofrece un generoso plan gratuito y una prueba de 14 días de uso ilimitado. Una vez finalizado el período de prueba, se te facturará en función del uso que supere los límites del plan gratuito.",
+      "link-title": "Precios de Grafana Cloud",
+      "title": "¿Cuánto cuesta?"
+    },
+    "resource-status": {
+      "error-details-button": "Detalles",
+      "failed": "Error",
+      "migrated": "Se ha subido a la nube",
+      "migrating": "Subiendo...",
+      "not-migrated": "Aún no se ha subido",
+      "unknown": "Desconocido"
+    },
+    "resource-type": {
+      "dashboard": "Panel de control",
+      "datasource": "Fuente de datos",
+      "unknown": "Desconocido"
+    },
+    "summary": {
+      "disconnect": "",
+      "error-starting-migration": "",
+      "start-migration": "",
+      "target-stack-title": ""
+    },
+    "token-status": {
+      "active": "Token creado y activo",
+      "no-active": "Ningún token activo"
+    },
+    "what-is-cloud": {
+      "body": "Grafana Cloud es una plataforma de observabilidad en la nube completamente gestionada, ideal para entornos nativos de la nube. Incluye todo lo que te encanta de Grafana sin que tengas que preocuparte por el mantenimiento, las actualizaciones o la instalación.",
+      "link-title": "Más información sobre las funciones en la nube",
+      "title": "¿Qué es Grafana Cloud?"
+    },
+    "why-host": {
+      "body": "Además de la comodidad del alojamiento gestionado, Grafana Cloud incluye muchas funciones exclusivas en la nube, como SLO, gestión de incidencias, aprendizaje automático y prácticas integraciones de observabilidad.",
+      "link-title": "¿Tienes preguntas? Habla con un experto",
+      "title": "¿Por qué alojar con Grafana?"
     }
   },
   "nav": {
     "add-new-connections": {
-      "title": ""
+      "title": "Añadir nueva conexión"
     },
     "admin": {
       "subtitle": "Administrar la configuración de todo el servidor y el acceso a recursos como organizaciones, usuarios y licencias",
       "title": "Administrador del servidor"
     },
+    "alert-list-legacy": {
+      "title": "Reglas de alerta"
+    },
     "alerting": {
       "subtitle": "Conozca los problemas de sus sistemas justo después de que se produzcan",
       "title": "Alertas"
@@ -520,6 +861,10 @@
       "subtitle": "Detener notificaciones de una o más reglas de alerta",
       "title": "Silencios"
     },
+    "alerting-upgrade": {
+      "subtitle": "Actualiza tus alertas y canales de notificación existentes a la nueva alerta de Grafana",
+      "title": "Actualización de alertas"
+    },
     "alerts-and-incidents": {
       "subtitle": "Aplicaciones de gestión de alertas e incidentes",
       "title": "Alertas e IRM"
@@ -529,36 +874,39 @@
       "title": "Claves API"
     },
     "application": {
-      "title": ""
+      "title": "Aplicación"
     },
     "apps": {
       "subtitle": "Complementos de aplicaciones que amplían la experiencia de Grafana",
       "title": "Aplicaciones"
     },
     "authentication": {
-      "title": ""
+      "title": "Autenticación"
+    },
+    "collector": {
+      "title": "Colector"
     },
     "config": {
       "title": "Administración"
     },
     "config-access": {
-      "subtitle": "",
-      "title": ""
+      "subtitle": "Configurar el acceso para usuarios individuales, equipos y cuentas de servicio",
+      "title": "Usuarios y acceso"
     },
     "config-general": {
-      "subtitle": "",
-      "title": ""
+      "subtitle": "Gestionar las preferencias y ajustes por defecto en Grafana",
+      "title": "General"
     },
     "config-plugins": {
-      "subtitle": "",
-      "title": ""
+      "subtitle": "Instalar complementos y definir las relaciones entre los datos",
+      "title": "Complementos y datos"
     },
     "connect-data": {
-      "title": ""
+      "title": "Conectar datos"
     },
     "connections": {
-      "subtitle": "",
-      "title": ""
+      "subtitle": "Navegar y crear nuevas conexiones",
+      "title": "Conexiones"
     },
     "correlations": {
       "subtitle": "Añadir y configurar correlaciones",
@@ -584,21 +932,25 @@
       "title": "Paneles de control"
     },
     "data-sources": {
-      "subtitle": "",
-      "title": ""
+      "subtitle": "Vea y gestione las conexiones de sus fuentes de datos",
+      "title": "Orígenes de datos"
     },
     "datasources": {
       "subtitle": "Añadir y configurar orígenes de datos",
       "title": "Orígenes de datos"
     },
     "detect": {
-      "title": ""
+      "title": "Detectar"
     },
     "explore": {
       "title": "Explorar"
     },
     "frontend": {
-      "title": ""
+      "subtitle": "Obtén información de seguimiento real del usuario",
+      "title": "Interfaz"
+    },
+    "frontend-app": {
+      "title": "Interfaz"
     },
     "global-orgs": {
       "subtitle": "Instancias aisladas de Grafana ejecutándose en el mismo servidor",
@@ -609,7 +961,7 @@
       "title": "Usuarios"
     },
     "grafana-quaderno": {
-      "title": ""
+      "title": "Grafana Quaderno"
     },
     "help": {
       "title": "Ayuda"
@@ -622,24 +974,35 @@
       "title": "Inicio"
     },
     "incidents": {
-      "title": ""
+      "title": "Incidentes"
     },
     "infrastructure": {
-      "title": ""
+      "subtitle": "Mantente al tanto de la salud de tu infraestructura",
+      "title": "Infraestructura"
+    },
+    "integrations": {
+      "title": "Integraciones"
+    },
+    "k6": {
+      "title": "Rendimiento"
     },
     "kubernetes": {
-      "title": ""
+      "title": "Kubernetes"
     },
     "library-panels": {
       "subtitle": "Paneles reutilizables que se pueden añadir a varios paneles de control",
       "title": "Paneles de librería"
     },
     "machine-learning": {
-      "title": ""
+      "title": "Aprendizaje automático"
     },
     "manage-folder": {
       "subtitle": "Gestionar paneles de control de carpetas y permisos"
     },
+    "migrate-to-cloud": {
+      "subtitle": "Copia la configuración de tu instalación autogestionada a una pila en la nube",
+      "title": "Migrar a Grafana Cloud"
+    },
     "monitoring": {
       "subtitle": "Aplicaciones de supervisión e infraestructura",
       "title": "Observabilidad"
@@ -654,18 +1017,15 @@
       "title": "Nueva carpeta"
     },
     "observability": {
-      "title": ""
+      "title": "Observabilidad"
     },
     "oncall": {
-      "title": ""
+      "title": "OnCall"
     },
     "org-settings": {
       "subtitle": "Gestionar las preferencias en una organización",
       "title": "Preferencias por defecto"
     },
-    "performance-testing": {
-      "title": ""
-    },
     "playlists": {
       "subtitle": "Grupos de paneles de control que se muestran en una secuencia",
       "title": "Listas de reproducción"
@@ -674,6 +1034,10 @@
       "subtitle": "Amplíe la experiencia de Grafana con los complementos",
       "title": "Complementos"
     },
+    "private-data-source-connections": {
+      "subtitle": "Consulta los datos existentes en una red segura sin abrirla al tráfico entrante de Grafana Cloud. Tienes más información en nuestros documentos.",
+      "title": "Conexión a la fuente de datos privada"
+    },
     "profile/notifications": {
       "title": "Historial de notificaciones"
     },
@@ -684,16 +1048,16 @@
       "title": "Perfil"
     },
     "profiles": {
-      "title": ""
+      "title": "Perfiles"
     },
     "public": {
       "title": "Paneles de control públicos"
     },
     "recorded-queries": {
-      "title": ""
+      "title": "Consultas grabadas"
     },
     "reporting": {
-      "title": ""
+      "title": "Creación de informes"
     },
     "scenes": {
       "title": "Escenas"
@@ -716,7 +1080,7 @@
       "title": "Cerrar sesión"
     },
     "slo": {
-      "title": ""
+      "title": "SLO"
     },
     "snapshots": {
       "subtitle": "Representaciones interactivas, públicamente disponibles y puntuales de los paneles de control",
@@ -729,7 +1093,7 @@
       "title": "Tus paneles de control destacados aparecerán aquí"
     },
     "statistics-and-licensing": {
-      "title": ""
+      "title": "Estadísticas y licencias"
     },
     "storage": {
       "subtitle": "Gestionar el almacenamiento de archivos",
@@ -740,12 +1104,16 @@
       "title": "Paquetes de apoyo"
     },
     "synthetics": {
-      "title": ""
+      "title": "Sintéticos"
     },
     "teams": {
       "subtitle": "Grupos de usuarios que tienen necesidades comunes de permisos y de panel de control",
       "title": "Equipos"
     },
+    "testing-and-synthetics": {
+      "subtitle": "Optimiza el rendimiento con información de seguimiento k6 y sintética",
+      "title": "Pruebas y síntesis"
+    },
     "upgrading": {
       "title": "Estadísticas y licencia"
     },
@@ -759,17 +1127,22 @@
       "tv-alert": "Pulse ESC para salir del modo de quiosco"
     },
     "megamenu": {
-      "close": "",
-      "dock": "",
-      "undock": ""
+      "close": "Cerrar menú",
+      "dock": "Anclar el menú",
+      "list-label": "Navegación",
+      "undock": "Desanclar el menú"
     },
     "toolbar": {
+      "close-menu": "Cerrar menú",
       "enable-kiosk": "Activar el modo de quiosco",
-      "toggle-menu": "Activar o desactivar menú",
+      "open-menu": "Abrir menú",
       "toggle-search-bar": "Activar o desactivar la barra de búsqueda superior"
     }
   },
   "news": {
+    "drawer": {
+      "close": "Cerrar Drawer"
+    },
     "title": "Últimas entradas del blog"
   },
   "notifications": {
@@ -779,7 +1152,6 @@
   "panel": {
     "header-menu": {
       "copy": "Copiar",
-      "create-alert": "",
       "create-library-panel": "Crear panel de librería",
       "duplicate": "Duplicar",
       "edit": "Editar",
@@ -790,6 +1162,7 @@
       "inspect-data": "Datos",
       "inspect-json": "JSON de panel",
       "more": "Más...",
+      "new-alert-rule": "Nueva regla de alerta",
       "query": "Consulta",
       "remove": "Eliminar",
       "share": "Compartir",
@@ -799,65 +1172,199 @@
     }
   },
   "playlist-edit": {
-    "error-prefix": "",
+    "error-prefix": "Error al cargar la lista de reproducción:",
     "form": {
-      "add-tag-label": "",
-      "add-tag-placeholder": "",
-      "add-title-label": "",
-      "cancel": "",
-      "heading": "",
-      "interval-label": "",
-      "interval-placeholder": "",
-      "interval-required": "",
-      "name-label": "",
-      "name-placeholder": "",
-      "name-required": "",
-      "save": "",
-      "table-delete": "",
-      "table-drag": "",
-      "table-empty": "",
-      "table-heading": ""
-    },
-    "sub-title": "",
-    "title": ""
+      "add-tag-label": "Añadir por etiqueta",
+      "add-tag-placeholder": "Seleccionar una etiqueta",
+      "add-title-label": "Añadir por título",
+      "cancel": "Cancelar",
+      "heading": "Añadir paneles de control",
+      "interval-label": "Intervalo",
+      "interval-placeholder": "5 min",
+      "interval-required": "El intervalo es obligatorio",
+      "name-label": "Nombre",
+      "name-placeholder": "Nombre",
+      "name-required": "El nombre es obligatorio",
+      "save": "Guardar",
+      "table-delete": "Eliminar elemento de la lista de reproducción",
+      "table-drag": "Arrastrar y soltar para reordenar",
+      "table-empty": "La lista de reproducción está vacía. Añadir tableros a continuación.",
+      "table-heading": "Paneles de control"
+    },
+    "sub-title": "Una lista de reproducción rota a través de una lista de paneles de control preseleccionada. Una lista de reproducción puede ser una buena manera de crear conciencia sobre una situación, o simplemente una forma de mostrar sus métricas a su equipo o a demás visitantes.",
+    "title": "Editar lista de reproducción"
   },
   "playlist-page": {
     "card": {
-      "delete": "",
-      "edit": "",
-      "start": "",
-      "tooltip": ""
+      "delete": "Eliminar lista de reproducción",
+      "edit": "Editar lista de reproducción",
+      "start": "Iniciar lista de reproducción",
+      "tooltip": "Compartir lista de reproducción"
     },
     "create-button": {
-      "title": ""
+      "title": "Nueva lista de reproducción"
     },
     "delete-modal": {
-      "body": "",
-      "confirm-text": ""
+      "body": "¿Seguro que desea eliminar la lista de reproducción {{name}}?",
+      "confirm-text": "Eliminar"
     },
     "empty": {
-      "button": "",
-      "pro-tip": "",
-      "pro-tip-link-title": "",
-      "title": ""
+      "button": "Crear lista de reproducción",
+      "pro-tip": "Puede usar las listas de reproducción para crear ciclos de tableros en televisiones sin control de usuario",
+      "pro-tip-link-title": "Más información",
+      "title": "Aún no se ha creado ninguna lista de reproducción"
+    }
+  },
+  "playlists": {
+    "empty-state": {
+      "message": ""
     }
   },
   "profile": {
     "change-password": {
-      "cancel-button": "",
-      "cannot-change-password-message": "",
-      "change-password-button": "",
-      "confirm-password-label": "",
-      "confirm-password-required": "",
-      "ldap-auth-proxy-message": "",
-      "new-password-label": "",
-      "new-password-required": "",
-      "new-password-same-as-old": "",
-      "old-password-label": "",
-      "old-password-required": "",
-      "passwords-must-match": ""
+      "cancel-button": "Cancelar",
+      "cannot-change-password-message": "La contraseña no se puede cambiar aquí.",
+      "change-password-button": "Cambiar contraseña",
+      "confirm-password-label": "Confirmar contraseña",
+      "confirm-password-required": "Se requiere confirmación de la nueva contraseña",
+      "ldap-auth-proxy-message": "No puede cambiar la contraseña al iniciar sesión con un LDAP o con un proxy de autenticación.",
+      "new-password-label": "Nueva contraseña",
+      "new-password-required": "Se requiere una nueva contraseña",
+      "new-password-same-as-old": "La nueva contraseña no puede ser la misma que la antigua.",
+      "old-password-label": "Contraseña antigua",
+      "old-password-required": "Se requiere la contraseña antigua",
+      "passwords-must-match": "Las contraseñas deben coincidir",
+      "strong-password-validation-register": "La contraseña no cumple con la política de contraseñas seguras"
     }
   },
+  "public-dashboard": {
+    "acknowledgment-checkboxes": {
+      "ack-title": "Antes de hacer público el tablero, ten en cuenta lo siguiente:",
+      "data-src-ack-desc": "Actualmente, la publicación solo funciona con un subconjunto de fuentes de datos*",
+      "data-src-ack-tooltip": "Más información sobre las fuentes de datos públicas",
+      "public-ack-desc": "Tu tablero será totalmente público*",
+      "public-ack-tooltip": "Más información sobre los tableros públicos",
+      "usage-ack-desc": "Convertir un tablero en público hará que las consultas se ejecuten cada vez que se visualice, lo que puede aumentar los costes*",
+      "usage-ack-desc-tooltip": "Más información sobre la caché de consultas"
+    },
+    "config": {
+      "can-view-dashboard-radio-button-label": "Puedes ver el tablero",
+      "copy-button": "Copiar",
+      "dashboard-url-field-label": "URL del tablero",
+      "email-share-type-option-label": "Solo personas especificadas",
+      "pause-sharing-dashboard-label": "Pausar el panel compartido",
+      "public-share-type-option-label": "Cualquiera con un enlace",
+      "revoke-public-URL-button": "Revocar la URL pública",
+      "revoke-public-URL-button-title": "Revocar URL pública",
+      "settings-title": "Configuración"
+    },
+    "create-page": {
+      "generate-public-url-button": "Generar URL pública",
+      "unsupported-features-desc": "Actualmente, no son compatibles las variables de plantillas o las fuentes de datos de la interfaz",
+      "welcome-title": "¡Bienvenidos al tablero público!"
+    },
+    "delete-modal": {
+      "revoke-nonorphaned-body-text": "¿Seguro que quieres revocar esta URL? El tablero dejará de ser público.",
+      "revoke-orphaned-body-text": "El tablero público huérfano ya no será público.",
+      "revoke-title": "Revocar URL pública"
+    },
+    "email-sharing": {
+      "input-invalid-email-text": "Correo no válido",
+      "input-required-email-text": "El correo electrónico es obligatorio",
+      "invite-button": "Invitar",
+      "invite-field-desc": "Invitar a otras personas por correo electrónico",
+      "invite-field-label": "Invitar",
+      "resend-button": "Reenviar",
+      "resend-button-title": "Reenviar",
+      "revoke-button": "Revocar",
+      "revoke-button-title": "Revocar"
+    },
+    "modal-alerts": {
+      "no-upsert-perm-alert-desc": "Ponte en contacto con tu administrador para obtener permiso para {{mode}} los tableros públicos",
+      "no-upsert-perm-alert-title": "No tienes permiso para {{ mode }} un tablero público",
+      "save-dashboard-changes-alert-title": "Guarda los cambios realizados en el tablero antes de actualizar la configuración pública",
+      "unsupport-data-source-alert-readmore-link": "Leer más sobre las fuentes de datos compatibles",
+      "unsupported-data-source-alert-desc": "Hay fuentes de datos en este tablero que no son compatibles con los tableros públicos. Los paneles que utilizan estas fuentes de datos puede que no funcionen correctamente: {{unsupportedDataSources}}.",
+      "unsupported-data-source-alert-title": "Fuentes de datos no compatibles",
+      "unsupported-template-variable-alert-desc": "Este tablero público puede que no funcione, ya que utiliza variables de plantillas",
+      "unsupported-template-variable-alert-title": "Las variables de plantillas no son compatibles"
+    },
+    "settings-bar-header": {
+      "collapse-settings-tooltip": "Contraer ajustes",
+      "expand-settings-tooltip": "Expandir ajustes"
+    },
+    "settings-configuration": {
+      "default-time-range-label": "Rango de tiempo predeterminado",
+      "default-time-range-label-desc": "El tablero público utiliza la configuración predeterminada del rango de tiempo del tablero",
+      "show-annotations-label": "Mostrar anotaciones",
+      "show-annotations-label-desc": "Mostrar anotaciones en el tablero público",
+      "time-range-picker-label": "Selector de rango de tiempo activado",
+      "time-range-picker-label-desc": "Permitir que los usuarios cambien el rango de tiempo"
+    },
+    "settings-summary": {
+      "annotations-hide-text": "Anotaciones = ocultar",
+      "annotations-show-text": "Anotaciones = mostrar",
+      "time-range-picker-disabled-text": "Selector de rango de tiempo = desactivado",
+      "time-range-picker-enabled-text": "Selector de rango de tiempo = activado",
+      "time-range-text": "Rango de tiempo = "
+    }
+  },
+  "public-dashboard-list": {
+    "button": {
+      "config-button-tooltip": "Configurar tablero público",
+      "revoke-button-text": "Revocar URL pública",
+      "revoke-button-tooltip": "Revocar URL del tablero público",
+      "view-button-tooltip": "Ver tablero público"
+    },
+    "dashboard-title": {
+      "orphaned-title": "<0>Tablero público huérfano</0>",
+      "orphaned-tooltip": "El tablero vinculado ya se ha eliminado"
+    },
+    "toggle": {
+      "pause-sharing-toggle-text": "Pausar el uso compartido"
+    }
+  },
+  "public-dashboard-users-access-list": {
+    "dashboard-modal": {
+      "loading-text": "Cargando...",
+      "open-dashboard-list-text": "Abrir lista de tableros",
+      "public-dashboard-link": "URL del tablero público",
+      "public-dashboard-setting": "Ajustes del tablero público"
+    },
+    "delete-user-modal": {
+      "delete-user-button-text": "Eliminar usuario",
+      "delete-user-cancel-button": "Cancelar",
+      "delete-user-revoke-access-button": "Revocar acceso",
+      "revoke-access-title": "Revocar acceso",
+      "revoke-user-access-modal-desc-line1": "¿Seguro que quieres revocar el acceso para {{email}}?",
+      "revoke-user-access-modal-desc-line2": "Esta acción revocará inmediatamente el acceso de {{email}} a todos los tableros públicos."
+    },
+    "modal": {
+      "dashboard-modal-title": "Paneles de control públicos"
+    },
+    "table-header": {
+      "activated-label": "Activado",
+      "activated-tooltip": "El usuario más antiguo ha estado activo en un tablero de control",
+      "email-label": "Correo electrónico",
+      "last-active-label": "Último activo",
+      "origin-label": "Origen",
+      "role-label": "Rol"
+    }
+  },
+  "query-operation": {
+    "header": {
+      "collapse-row": "Contraer la fila de la consulta",
+      "datasource-help": "Mostrar la ayuda de la fuente de datos",
+      "drag-and-drop": "Arrastrar y soltar para reordenar",
+      "duplicate-query": "Duplicar consulta",
+      "expand-row": "Expandir la fila de la consulta",
+      "hide-response": "",
+      "remove-query": "Eliminar consulta",
+      "show-response": "",
+      "toggle-edit-mode": "Alternar el modo de edición de texto"
+    },
+    "query-editor-not-exported": "El complemento de la fuente de datos no exporta ningún componente del editor de consultas"
+  },
   "refresh-picker": {
     "aria-label": {
       "choose-interval": "Actualización automática desactivada. Elija un intervalo de tiempo de actualización",
@@ -876,10 +1383,16 @@
       "label": "Apagado"
     },
     "tooltip": {
-      "interval-selected": "",
-      "turned-off": ""
+      "interval-selected": "Establecer intervalo de actualización automática",
+      "turned-off": "Actualización automática desactivada"
     }
   },
+  "return-to-previous": {
+    "button": {
+      "label": "Volver a {{title}}"
+    },
+    "dismissable-button": "Cerrar"
+  },
   "search": {
     "actions": {
       "include-panels": "Incluir paneles",
@@ -895,15 +1408,6 @@
       "new-dashboard": "Nuevo panel de control",
       "new-folder": "Nueva carpeta"
     },
-    "folder-view": {
-      "go-to-folder": "Ir a la carpeta",
-      "select-folder": "Seleccionar carpeta"
-    },
-    "result-kind": {
-      "dashboard": "Panel de control",
-      "folder": "Carpeta",
-      "panel": "Panel"
-    },
     "results-table": {
       "datasource-header": "Fuente de datos",
       "location-header": "Ubicación",
@@ -918,12 +1422,6 @@
       "placeholder": "Buscar paneles de control"
     }
   },
-  "search-view": {
-    "no-results": {
-      "clear": "",
-      "text": ""
-    }
-  },
   "share-modal": {
     "dashboard": {
       "title": "Compartir"
@@ -937,11 +1435,10 @@
       "time-range-description": "Transforma el intervalo de tiempo relativo actual en un intervalo de tiempo absoluto"
     },
     "export": {
-      "back-button": "",
+      "back-button": "Volver a la configuración de exportación",
       "cancel-button": "Cancelar",
       "info-text": "Exporte este panel de control.",
       "save-button": "Guardar en archivo",
-      "share-default-label": "Exportar con los valores predeterminados eliminados",
       "share-externally-label": "Exportar para compartir externamente",
       "view-button": "Ver JSON"
     },
@@ -973,10 +1470,10 @@
       "expire-day": "1 día",
       "expire-hour": "1 hora",
       "expire-never": "Nunca",
-      "expire-week": "7 días",
+      "expire-week": "1 semana",
       "info-text-1": "Una instantánea es una forma inmediata de compartir un panel interactivo públicamente. Cuando se crean, eliminamos datos confidenciales como consultas (métricas, plantilla y anotación) y enlaces de panel, dejando solo los datos de métricas visibles y los nombres de serie incrustados en el panel.",
       "info-text-2": "Tenga en cuenta que su instantánea <1>puede ser vista por cualquiera</1> que tenga el enlace y pueda acceder a la URL. Comparta sus instantáneas con cautela.",
-      "local-button": "Instantánea local",
+      "local-button": "Publicar instantánea",
       "mistake-message": "¿Ha cometido un error? ",
       "name": "Nombre de la instantánea",
       "timeout": "Tiempo de espera (segundos)",
@@ -988,6 +1485,9 @@
       "export": "Exportar",
       "library-panel": "Panel de librería",
       "link": "Enlace",
+      "panel-embed": "Incrustar",
+      "public-dashboard": "",
+      "public-dashboard-title": "Tablero público",
       "snapshot": "Instantánea"
     },
     "theme-picker": {
@@ -1001,22 +1501,22 @@
     }
   },
   "share-playlist": {
-    "checkbox-description": "",
-    "checkbox-label": "",
-    "copy-link-button": "",
-    "link-url-label": "",
-    "mode": "",
-    "mode-kiosk": "",
-    "mode-normal": "",
-    "mode-tv": "",
-    "title": ""
+    "checkbox-description": "La altura del panel se ajustará para adecuarse al tamaño de la pantalla",
+    "checkbox-label": "Ajuste automático",
+    "copy-link-button": "Copiar",
+    "link-url-label": "URL del enlace",
+    "mode": "Modo",
+    "mode-kiosk": "Quiosco",
+    "mode-normal": "Normal",
+    "mode-tv": "TV",
+    "title": "Compartir lista de reproducción"
   },
   "shared": {
     "preferences": {
       "theme": {
-        "dark-label": "",
-        "light-label": "",
-        "system-label": ""
+        "dark-label": "Oscuro",
+        "light-label": "Claro",
+        "system-label": "Preferencias del sistema"
       }
     }
   },
@@ -1040,10 +1540,10 @@
     "title": "Preferencias"
   },
   "snapshot": {
-    "external-badge": "",
-    "name-column-header": "",
-    "url-column-header": "",
-    "view-button": ""
+    "external-badge": "Externo",
+    "name-column-header": "Nombre",
+    "url-column-header": "URL de la instantánea",
+    "view-button": "Vista"
   },
   "tag-filter": {
     "loading": "Cargando...",
@@ -1058,6 +1558,7 @@
     "calendar": {
       "apply-button": "Aplicar intervalo de tiempo",
       "cancel-button": "Cancelar",
+      "close": "Cerrar calendario",
       "select-time": "Seleccionar un intervalo de tiempo"
     },
     "content": {
@@ -1065,6 +1566,13 @@
       "empty-recent-list-info": "Parece que no ha utilizado antes este selector de tiempo. En cuanto introduzca algún intervalo de tiempo, los intervalos que haya usado recientemente aparecerán aquí.",
       "filter-placeholder": "Buscar intervalos rápidos"
     },
+    "copy-paste": {
+      "copy-success-message": "Rango de tiempo copiado al portapapeles",
+      "default-error-message": "{{error}} no es un rango de tiempo válido",
+      "default-error-title": "Rango de tiempo no válido",
+      "tooltip-copy": "Copiar rango de tiempo al portapapeles",
+      "tooltip-paste": "Pegar rango de tiempo"
+    },
     "footer": {
       "change-settings-button": "Cambiar ajustes de tiempo",
       "fiscal-year-option": "Ejercicio fiscal",
@@ -1077,6 +1585,7 @@
       "default-error": "Introducir una fecha anterior o «ahora»",
       "fiscal-year": "Ejercicio fiscal",
       "from-input": "Desde",
+      "open-input-calendar": "Abrir calendario",
       "range-error": "«Desde» no puede ser posterior a «hasta»",
       "to-input": "Hasta"
     },
@@ -1099,6 +1608,12 @@
       "select-search-input": "Escribir para buscar (país, ciudad, abreviatura)"
     }
   },
+  "transformations": {
+    "empty": {
+      "add-transformation-body": "Las transformaciones permiten cambiar los datos de varias maneras antes de que se muestre su visualización.<1></1>Aquí se incluyen acciones como unir datos, renombrar campos, hacer cálculos, dar formato a los datos para mostrarlos, etc.",
+      "add-transformation-header": "Empezar a transformar datos"
+    }
+  },
   "user-orgs": {
     "current-org-button": "Actual",
     "name-column": "Nombre",
@@ -1113,6 +1628,9 @@
       "name-error": "El nombre es obligatorio",
       "name-label": "Nombre",
       "username-label": "Nombre de usuario"
+    },
+    "tabs": {
+      "general": "General"
     }
   },
   "user-session": {
@@ -1125,6 +1643,11 @@
   "user-sessions": {
     "loading": "Cargando sesiones..."
   },
+  "users-access-list": {
+    "tabs": {
+      "public-dashboard-users-tab-title": "Usuarios del tablero público"
+    }
+  },
   "variable": {
     "adhoc": {
       "placeholder": "Seleccionar valor"
@@ -1142,4 +1665,4 @@
       "placeholder": "Introducir el valor de la variable"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json
index f703114f1ff70..bbc526de6e3bd 100644
--- a/public/locales/fr-FR/grafana.json
+++ b/public/locales/fr-FR/grafana.json
@@ -1,102 +1,99 @@
 {
-  "_comment": "",
+  "_comment": "Ce fichier est la source de vérité pour les chaînes anglaises. Modifiez-le dans la base de code pour adapter les pluriels et les autres phrases pour l'interface utilisateur.",
   "access-control": {
     "add-permission": {
-      "role-label": "",
-      "serviceaccount-label": "",
-      "team-label": "",
-      "title": "",
-      "user-label": ""
+      "role-label": "Rôle",
+      "serviceaccount-label": "Compte de service",
+      "team-label": "Équipe",
+      "title": "Ajouter une autorisation pour",
+      "user-label": "Utilisateur"
     },
     "add-permissions": {
-      "save": ""
+      "save": "Enregistrer"
     },
     "permission-list": {
-      "permission": ""
+      "permission": "Autorisation"
     },
     "permissions": {
-      "add-label": "",
-      "no-permissions": "",
-      "permissions-change-warning": "",
-      "role": "",
-      "serviceaccount": "",
-      "team": "",
-      "title": "",
-      "user": ""
+      "add-label": "Ajouter une autorisation",
+      "no-permissions": "Il n'y a aucune autorisation",
+      "permissions-change-warning": "Cette action modifiera les autorisations pour ce dossier et tous ses descendants. Au total, elle affectera :",
+      "role": "Rôle",
+      "serviceaccount": "Compte de service",
+      "team": "Équipe",
+      "title": "Autorisations",
+      "user": "Utilisateur"
     }
   },
+  "bouncing-loader": {
+    "label": "Chargement"
+  },
   "browse-dashboards": {
     "action": {
-      "cancel-button": "",
-      "cannot-move-folders": "",
-      "delete-button": "",
-      "delete-modal-invalid-text": "",
-      "delete-modal-invalid-title": "",
-      "delete-modal-text": "",
-      "delete-modal-title": "",
-      "deleting": "",
-      "manage-permissions-button": "",
-      "move-button": "",
-      "move-modal-alert": "",
-      "move-modal-field-label": "",
-      "move-modal-text": "",
-      "move-modal-title": "",
-      "moving": "",
-      "new-folder-name-required-phrase": ""
+      "cancel-button": "Annuler",
+      "cannot-move-folders": "Les dossiers ne peuvent pas être déplacés",
+      "delete-button": "Supprimer",
+      "delete-modal-invalid-text": "Un ou plusieurs dossiers contiennent des panneaux Bibliothèque ou des règles d'alerte. Vous devez d'abord les supprimer.",
+      "delete-modal-invalid-title": "Impossible de supprimer le dossier",
+      "delete-modal-text": "Cette action supprimera le contenu suivant :",
+      "delete-modal-title": "Supprimer",
+      "deleting": "Suppression...",
+      "manage-permissions-button": "Gérer les autorisations",
+      "move-button": "Déplacer",
+      "move-modal-alert": "Le déplacement de cet élément peut modifier ses permissions.",
+      "move-modal-field-label": "Nom du dossier",
+      "move-modal-text": "Cette action déplacera le contenu suivant :",
+      "move-modal-title": "Déplacer",
+      "moving": "Déplacement...",
+      "new-folder-name-required-phrase": "Vous devez saisir le nom du dossier."
     },
     "counts": {
-      "alertRule_one": "",
-      "alertRule_many": "",
-      "alertRule_other": "",
-      "dashboard_one": "",
-      "dashboard_many": "",
-      "dashboard_other": "",
-      "folder_one": "",
-      "folder_many": "",
-      "folder_other": "",
-      "libraryPanel_one": "",
-      "libraryPanel_many": "",
-      "libraryPanel_other": "",
-      "total_one": "",
-      "total_many": "",
-      "total_other": ""
+      "alertRule_one": "{{count}} règle d'alerte",
+      "alertRule_other": "{{count}} règles d'alerte",
+      "dashboard_one": "{{count}} tableau de bord",
+      "dashboard_other": "{{count}} tableaux de bord",
+      "folder_one": "{{count}} dossier",
+      "folder_other": "{{count}} dossiers",
+      "libraryPanel_one": "{{count}} panneau Bibliothèque",
+      "libraryPanel_other": "{{count}} panneaux Bibliothèque",
+      "total_one": "{{count}} objet",
+      "total_other": "{{count}} objets"
     },
     "dashboards-tree": {
-      "collapse-folder-button": "",
-      "expand-folder-button": "",
-      "name-column": "",
-      "select-all-header-checkbox": "",
-      "select-checkbox": "",
-      "tags-column": ""
+      "collapse-folder-button": "Réduire le dossier {{title}}",
+      "expand-folder-button": "Développer le dossier {{title}}",
+      "name-column": "Nom",
+      "select-all-header-checkbox": "Tout sélectionner",
+      "select-checkbox": "Sélectionner",
+      "tags-column": "Étiquettes"
     },
     "folder-actions-button": {
-      "delete": "",
-      "folder-actions": "",
-      "manage-permissions": "",
-      "move": ""
+      "delete": "Supprimer",
+      "folder-actions": "Actions sur le dossier",
+      "manage-permissions": "Gérer les autorisations",
+      "move": "Déplacer"
     },
     "folder-picker": {
-      "accessible-label": "",
-      "button-label": "",
-      "empty-message": "",
-      "error-title": "",
-      "search-placeholder": "",
-      "unknown-error": ""
+      "accessible-label": "Sélectionnez un dossier : {{ label }} est sélectionné actuellement",
+      "button-label": "Sélectionner un dossier",
+      "clear-selection": "Effacer la sélection",
+      "empty-message": "Aucun dossier trouvé",
+      "error-title": "Impossible de charger les dossiers",
+      "search-placeholder": "Rechercher dans les dossiers",
+      "unknown-error": "Erreur inconnue"
     },
     "manage-folder-nav": {
-      "alert-rules": "",
-      "dashboards": "",
-      "panels": "",
-      "permissions": "",
-      "settings": ""
+      "alert-rules": "Règles d'alerte",
+      "dashboards": "Tableaux de bord",
+      "panels": "Panneaux"
     },
     "new-folder-form": {
-      "cancel-label": "",
-      "create-label": "",
-      "name-label": ""
+      "cancel-label": "Annuler",
+      "create-label": "Créer",
+      "name-label": "Nom du dossier"
     },
     "no-results": {
-      "clear": "",
+      "clear": "Effacer la recherche et les filtres",
       "text": ""
     }
   },
@@ -131,29 +128,104 @@
   },
   "connections": {
     "connect-data": {
-      "category-header-label": ""
+      "category-header-label": "Sources de données",
+      "empty-message": ""
     },
     "search": {
-      "placeholder": ""
+      "placeholder": "Rechercher tout"
     }
   },
   "correlations": {
-    "add-new": "",
+    "add-new": "Ajouter un nouveau",
     "alert": {
-      "error-message": "",
-      "title": ""
+      "error-message": "Une erreur inconnue s'est produite lors de la récupération des données de corrélation. Veuillez réessayer.",
+      "title": "Erreur lors de la récupération des données de corrélation"
+    },
+    "basic-info-form": {
+      "description-description": "Description facultative avec plus d'informations sur le lien",
+      "description-label": "Description",
+      "label-description": "Ce nom sera utilisé comme étiquette pour la corrélation. Il s'affichera comme texte de bouton, élément de menu ou info-bulle quand on survole un lien.",
+      "label-label": "Étiquette",
+      "label-placeholder": "par exemple les traces Tempo",
+      "label-required": "Ce champ est obligatoire.",
+      "sub-text": "<0>Définissez le texte qui décrira la corrélation.</0>",
+      "title": "Définir l'étiquette de corrélation (Étape 1 sur 3)"
     },
     "list": {
-      "delete": "",
-      "label": "",
-      "loading": "",
-      "read-only": "",
-      "source": "",
-      "target": ""
-    },
-    "page-content": "",
-    "page-heading": "",
-    "sub-title": ""
+      "delete": "supprimer la corrélation",
+      "label": "Étiquette",
+      "loading": "chargement...",
+      "read-only": "Lecture seule",
+      "source": "Source",
+      "target": "Cible"
+    },
+    "navigation-form": {
+      "add-button": "Ajouter",
+      "back-button": "Précédent",
+      "next-button": "Suivant",
+      "save-button": "Enregistrer"
+    },
+    "page-content": "Pour activer les corrélations, ajoutez-les dans la configuration Grafana :",
+    "page-heading": "Les corrélations sont désactivées",
+    "query-editor": {
+      "control-rules": "La source de données cible sélectionnée doit exporter un éditeur de requête.",
+      "data-source-text": "Vous devez d'abord sélectionner une source de données cible.",
+      "data-source-title": "Aucune source de données sélectionnée",
+      "error-text": "La source de données sélectionnée n'a pas pu être chargée.",
+      "error-title": "Erreur lors du chargement de la source de données",
+      "loading": "Chargement de l'éditeur de requête...",
+      "query-description": "Définissez la requête à exécuter lorsqu'on clique sur le lien. Vous pouvez utiliser des <2>variables</2> pour accéder à des valeurs de champs spécifiques.",
+      "query-editor-title": "La source de données n'exporte pas un éditeur de requête.",
+      "query-label": "Requête"
+    },
+    "source-form": {
+      "control-required": "Ce champ est obligatoire.",
+      "description": "Vous avez utilisé les variables suivantes dans la requête cible: : <1></1><2></2>Un point de données doit fournir des valeurs à toutes les variables en tant que champs ou en tant que résultat de transformations pour faire apparaître le bouton de corrélation dans la visualisation. <4></4>Remarque : toutes les variables ne doivent pas être explicitement définies ci-dessous. Une transformation telle que <7>logfmt</7> créera des variables pour chaque paire clé/valeur.",
+      "heading": "Variables utilisées dans la requête cible",
+      "results-description": "Le lien apparaîtra à côté de la valeur de ce champ",
+      "results-label": "Champ résultats",
+      "results-required": "Ce champ est obligatoire.",
+      "source-description": "Les résultats de la source de données source sélectionnée ont des liens affichés dans le panneau",
+      "source-label": "Source",
+      "sub-text": "<0>Définissez quelle source de données affichera la corrélation et quelles données remplaceront les variables précédemment définies.</0>",
+      "title": "Configurer la source de données qui sera liée à {{dataSourceName}} (Étape 3 sur 3)"
+    },
+    "sub-title": "Définissez comment les données provenant de différentes sources de données se rapportent l’une à l’autre. En savoir plus dans la <2>documentation<1></1></2>",
+    "target-form": {
+      "control-rules": "Ce champ est obligatoire.",
+      "sub-text": "<0>Définissez la source de données vers laquelle la corrélation renverra, et la requête qui sera exécutée en cliquant sur la corrélation.</0>",
+      "target-description": "Spécifiez quelle source de données est interrogée lorsqu'on clique sur le lien",
+      "target-label": "Cible",
+      "title": "Configurez la cible pour la corrélation (Étape 2 sur 3)"
+    },
+    "trans-details": {
+      "logfmt-description": "Analyser le champ fourni avec logfmt pour récupérer les variables",
+      "logfmt-label": "Logfmt",
+      "regex-description": "Le champ sera analysé avec regex. Utilisez des groupes de capture nommés pour retourner plusieurs variables, ou un seul groupe de capture sans nom pour ajouter une variable à la valeur de la carte nommée. Regex est insensible à la casse.",
+      "regex-expression": "Utilisez des groupes de capture pour extraire une partie du champ.",
+      "regex-label": "Expression régulière",
+      "regex-map-values": "Définit le nom de la variable si le groupe de capture n'est pas nommé."
+    },
+    "transform": {
+      "add-button": "Ajouter une transformation",
+      "heading": "Transformations",
+      "no-transform": "Aucune transformation définie."
+    },
+    "transform-row": {
+      "expression-label": "Expression",
+      "expression-required": "Vous devez définir une expression",
+      "expression-tooltip": "Requis pour l'expression régulière. L'expression que la transformation utilisera. Logfmt n'utilise pas d'autres spécifications.",
+      "field-input": "champ",
+      "field-label": "Champ",
+      "field-tooltip": "Facultatif. Le champ à transformer. Sans autre spécification, la transformation sera appliquée au champ de résultats.",
+      "map-value-label": "Valeur de la carte",
+      "map-value-tooltip": "Facultatif. Définit le nom de la variable. Actuellement valide uniquement pour les expressions régulières avec un groupe de capture unique sans nom.",
+      "remove-button": "Supprimer",
+      "remove-tooltip": "Supprimer la transformation",
+      "transform-required": "Sélectionnez un type de transformation",
+      "type-label": "Type",
+      "type-tooltip": "Le type de transformation qui sera appliqué aux données source."
+    }
   },
   "dashboard": {
     "add-menu": {
@@ -161,21 +233,25 @@
       "paste-panel": "Coller le panneau",
       "row": "Ligne",
       "visualization": "Visualisation",
-      "widget": ""
+      "widget": "Widget"
+    },
+    "alert-rules-drawer": {
+      "redirect-link": "Liste dans Alertes Grafana",
+      "subtitle": "Règles d'alerte liées à ce tableau de bord"
     },
     "empty": {
-      "add-library-panel-body": "",
-      "add-library-panel-button": "",
-      "add-library-panel-header": "",
+      "add-library-panel-body": "Ajoutez des visualisations partagées avec d'autres tableaux de bord.",
+      "add-library-panel-button": "Ajouter un panneau Bibliothèque",
+      "add-library-panel-header": "Ajouter un panneau Bibliothèque",
       "add-visualization-body": "Sélectionnez une source de données, puis examinez et visualisez vos données avec des graphiques, des statistiques et des tableaux ou créez des listes, des markdowns et d'autres widgets.",
       "add-visualization-button": "Ajouter une visualisation",
       "add-visualization-header": "Commencez votre nouveau tableau de bord en ajoutant une visualisation",
-      "add-widget-body": "",
-      "add-widget-button": "",
-      "add-widget-header": "",
-      "import-a-dashboard-body": "",
-      "import-a-dashboard-header": "",
-      "import-dashboard-button": ""
+      "add-widget-body": "Créez des listes, des markdowns et d'autres widgets",
+      "add-widget-button": "Ajouter un widget",
+      "add-widget-header": "Ajouter un widget",
+      "import-a-dashboard-body": "Importer un tableau de bord depuis un fichier ou <1>grafana.com</1>.",
+      "import-a-dashboard-header": "Importer un tableau de bord",
+      "import-dashboard-button": "Importer un tableau de bord"
     },
     "inspect": {
       "data-tab": "Données",
@@ -185,7 +261,7 @@
       "query-tab": "Requête",
       "stats-tab": "Statistiques",
       "subtitle": "{{queryCount}} requêtes avec un délai total de requête de {{formatted}}",
-      "title": "Inspecter\u00a0: {{panelTitle}}"
+      "title": "Inspecter : {{panelTitle}}"
     },
     "inspect-data": {
       "data-options": "Options de données",
@@ -215,7 +291,7 @@
       "panel-json-description": "Le modèle enregistré dans le tableau de bord JSON qui configure comment tout fonctionne.",
       "panel-json-label": "Panneau JSON",
       "select-source": "Sélectionner la source",
-      "unknown": "Objet inconnu\u00a0: {{show}}"
+      "unknown": "Objet inconnu : {{show}}"
     },
     "inspect-meta": {
       "no-inspector": "Pas d'inspecteur de métadonnées"
@@ -231,7 +307,7 @@
     },
     "toolbar": {
       "add": "Ajouter",
-      "add-panel": "Ajouter un panneau",
+      "alert-rules": "Règles d'alerte",
       "mark-favorite": "Marquer comme favori",
       "open-original": "Ouvrir le tableau de bord d'origine",
       "playlist-next": "Accéder au tableau de bord suivant",
@@ -241,133 +317,255 @@
       "save": "Enregistrer le tableau de bord",
       "settings": "Paramètres du tableau de bord",
       "share": "Partager le tableau de bord ou le panneau",
+      "share-button": "Partager",
       "unmark-favorite": "Supprimer des favoris"
     },
     "validation": {
-      "invalid-dashboard-id": "",
-      "invalid-json": "",
-      "tags-expected-array": "",
-      "tags-expected-strings": ""
+      "invalid-dashboard-id": "Impossible de trouver un ID Grafana.com valide",
+      "invalid-json": "JSON non valide",
+      "tags-expected-array": "étiquettes attendues tableau",
+      "tags-expected-strings": "étiquettes attendues tableau de chaînes"
     }
   },
   "dashboard-import": {
     "file-dropzone": {
-      "primary-text": "",
-      "secondary-text": ""
+      "primary-text": "Importer le fichier JSON du tableau de bord",
+      "secondary-text": "Glissez et déposez ici ou cliquez pour parcourir"
     },
     "form-actions": {
-      "cancel": "",
-      "load": ""
+      "cancel": "Annuler",
+      "load": "Charger"
     },
     "gcom-field": {
-      "label": "",
-      "load-button": "",
-      "placeholder": "",
-      "validation-required": ""
+      "label": "Trouvez et importez des tableaux de bord pour les applications courantes sur <1></1>",
+      "load-button": "Charger",
+      "placeholder": "URL ou ID du tableau de bord Grafana.com",
+      "validation-required": "Vous devez renseigner une URL ou un ID de tableau de bord Grafana"
     },
     "json-field": {
-      "label": "",
-      "validation-required": ""
+      "label": "Importer via le modèle JSON du tableau de bord",
+      "validation-required": "Nécessite un modèle JSON de tableau de bord"
     }
   },
   "dashboard-settings": {
     "annotations": {
-      "title": ""
+      "title": "Annotations"
     },
-    "dashboard-delete-button": "",
+    "dashboard-delete-button": "Supprimer le tableau de bord",
     "general": {
-      "auto-refresh-description": "",
-      "auto-refresh-label": "",
-      "description-label": "",
-      "editable-description": "",
-      "editable-label": "",
-      "folder-label": "",
-      "panel-options-graph-tooltip-description": "",
-      "panel-options-graph-tooltip-label": "",
-      "panel-options-label": "",
-      "tags-label": "",
-      "title": "",
-      "title-label": ""
+      "auto-refresh-description": "Définir les intervalles de mise à jour automatique qui seront disponibles dans la liste de mise à jour automatique.",
+      "auto-refresh-label": "Actualisation automatique",
+      "description-label": "Description",
+      "editable-description": "Définissez en lecture seule pour désactiver toutes les modifications. Les modifications seront appliquées au prochain chargement du tableau de bord",
+      "editable-label": "Modifiable",
+      "folder-label": "Dossier",
+      "panel-options-graph-tooltip-description": "Contrôle le comportement des infobulles et surbrillances sur différents panneaux. Les modifications seront appliquées au prochain chargement du tableau de bord",
+      "panel-options-graph-tooltip-label": "Info-bulle graphique",
+      "panel-options-label": "Options du panneau",
+      "tags-label": "Étiquettes",
+      "title": "Général",
+      "title-label": "Titre"
     },
     "json-editor": {
-      "save-button": "",
-      "subtitle": "",
-      "title": ""
+      "save-button": "Enregistrer les modifications",
+      "subtitle": "Le modèle JSON ci-dessous est la structure de données qui définit le tableau de bord. Il inclut les paramètres du tableau de bord, les paramètres du panneau, la mise en page, les requêtes, etc.",
+      "title": "Modèle JSON"
     },
     "links": {
-      "title": ""
+      "title": "Liens"
     },
     "permissions": {
-      "title": ""
+      "title": "Autorisations"
     },
     "settings": {
-      "title": ""
+      "title": "Paramètres"
     },
     "time-picker": {
-      "hide-time-picker": "",
-      "now-delay-description": "",
-      "now-delay-label": "",
-      "refresh-live-dashboards-description": "",
-      "refresh-live-dashboards-label": "",
-      "time-options-label": "",
-      "time-zone-label": "",
-      "week-start-label": ""
+      "hide-time-picker": "Cacher le sélecteur de temps",
+      "now-delay-description": "Exclure les données récentes qui peuvent être incomplètes.",
+      "now-delay-label": "Délai actuel",
+      "refresh-live-dashboards-description": "Redessiner en continu les panneaux où la plage de temps indique « maintenant »",
+      "refresh-live-dashboards-label": "Actualiser les tableaux de bord en direct",
+      "time-options-label": "Options de temps",
+      "time-zone-label": "Fuseau horaire",
+      "week-start-label": "Début de la semaine"
     },
     "variables": {
-      "title": ""
+      "title": "Variables"
     },
     "versions": {
-      "title": ""
+      "title": "Versions"
     }
   },
   "data-source-picker": {
-    "add-new-data-source": "",
+    "add-new-data-source": "Configurer une nouvelle source de données",
     "built-in-list": {
-      "description-dashboard": "",
-      "description-grafana": "",
-      "description-mixed": ""
+      "description-dashboard": "Réutiliser les résultats de requête d'autres visualisations",
+      "description-grafana": "Découvrez les visualisations à l'aide de données fictives",
+      "description-mixed": "Utiliser plusieurs sources de données"
     },
     "list": {
-      "no-data-source-message": ""
+      "no-data-source-message": "Aucune source de données trouvée"
     },
     "modal": {
-      "configure-new-data-source": "",
-      "input-placeholder": "",
-      "title": ""
+      "configure-new-data-source": "Ouvrir un nouvel onglet et configurer une source de données",
+      "input-placeholder": "Sélectionner la source de données",
+      "title": "Sélectionner la source de données"
     },
-    "open-advanced-button": ""
+    "open-advanced-button": "Ouvrir le sélecteur de données avancé"
   },
   "data-sources": {
     "datasource-add-button": {
-      "label": ""
+      "label": "Ajouter une nouvelle source de données"
     }
   },
   "explore": {
-    "add-to-dashboard": "",
+    "add-to-dashboard": "Ajouter au tableau de bord",
+    "rich-history": {
+      "close-tooltip": "Fermer l'historique des requêtes",
+      "datasource-a-z": "Source de données A-Z",
+      "datasource-z-a": "Source de données Z-A",
+      "newest-first": "Plus récent en premier",
+      "oldest-first": "Plus ancien en premier",
+      "query-history": "Historique des requêtes",
+      "settings": "Paramètres",
+      "starred": "Favoris"
+    },
+    "rich-history-card": {
+      "add-comment-form": "Ajouter un formulaire de commentaire",
+      "add-comment-tooltip": "Ajouter un commentaire",
+      "cancel": "Annuler",
+      "confirm-delete": "Supprimer",
+      "copy-query-tooltip": "Copier la requête dans le presse-papiers",
+      "copy-shortened-link-tooltip": "Copier le lien raccourci dans le presse-papiers",
+      "datasource-icon-label": "Icône de la source de données",
+      "datasource-name-label": "Nom de la source de données",
+      "datasource-not-exist": "La source de données n'existe plus",
+      "delete-query-confirmation-title": "Supprimer",
+      "delete-query-title": "Supprimer la requête",
+      "delete-query-tooltip": "Supprimer la requête",
+      "delete-starred-query-confirmation-text": "Souhaitez-vous vraiment supprimer définitivement votre requête favorite ?",
+      "edit-comment-tooltip": "Modifier le commentaire",
+      "loading-text": "chargement...",
+      "optional-description": "Une description facultative de l'action de la requête.",
+      "query-comment-label": "Commentaire sur la requête",
+      "query-text-label": "Texte de la requête",
+      "run-query-button": "Exécuter la requête",
+      "save-comment": "Enregistrer le commentaire",
+      "star-query-tooltip": "Mettre la requête en favori",
+      "switch-datasource-button": "Changer de source de données et exécuter la requête",
+      "unstar-query-tooltip": "Retirer la requête des favoris",
+      "update-comment-form": "Modifier le formulaire de commentaire"
+    },
+    "rich-history-container": {
+      "loading": "Chargement en cours..."
+    },
+    "rich-history-notification": {
+      "query-copied": "Requête copiée dans le presse-papiers",
+      "query-deleted": "Requête supprimée"
+    },
+    "rich-history-queries-tab": {
+      "displaying-partial-queries": "Affichage de {{ count }} requêtes",
+      "displaying-queries": "{{ count }} requêtes",
+      "filter-aria-label": "Filtrer les requêtes pour la ou les sources de données",
+      "filter-history": "Filtrer l'historique",
+      "filter-placeholder": "Filtrer les requêtes pour la ou les sources de données",
+      "history-local": "L'historique est local à votre navigateur et n'est pas partagé avec d'autres personnes.",
+      "loading": "Chargement en cours...",
+      "loading-results": "Chargement des résultats...",
+      "search-placeholder": "Rechercher des requêtes",
+      "showing-queries": "Affichage de {{ shown }} sur {{ total }} <0>Charger plus</0>",
+      "sort-aria-label": "Trier les requêtes",
+      "sort-placeholder": "Trier les requêtes par"
+    },
+    "rich-history-settings-tab": {
+      "alert-info": "Grafana gardera les entrées jusqu'à {{optionLabel}}. Les entrées en favori ne seront pas supprimées.",
+      "change-default-tab": "Changer l'onglet actif par défaut « Historique des requêtes » en « Favorites »",
+      "clear-history-info": "Supprimer définitivement tout votre historique des requêtes.",
+      "clear-query-history": "Effacer l'historique des requêtes",
+      "clear-query-history-button": "Effacer l'historique des requêtes",
+      "delete-confirm": "Supprimer",
+      "delete-confirm-text": "Souhaitez-vous vraiment supprimer définitivement votre historique des requêtes ?",
+      "delete-title": "Supprimer",
+      "history-time-span": "Période de l'historique",
+      "history-time-span-description": "Sélectionnez la période de temps pendant laquelle Grafana enregistrera votre historique des requêtes. Un maximum de {{MAX_HISTORY_ITEMS}} entrées pourront être sauvegarées.",
+      "only-show-active-datasource": "Afficher uniquement les requêtes pour la source de données actuellement active dans Explorer",
+      "query-history-deleted": "L'historique des requêtes a été supprimé",
+      "retention-period": {
+        "1-week": "1 semaine",
+        "2-days": "2 jours",
+        "2-weeks": "2 semaines",
+        "5-days": "5 jours"
+      }
+    },
+    "rich-history-starred-tab": {
+      "filter-queries-aria-label": "Filtrer les requêtes pour la ou les sources de données",
+      "filter-queries-placeholder": "Filtrer les requêtes pour la ou les sources de données",
+      "loading": "Chargement en cours...",
+      "loading-results": "Chargement des résultats...",
+      "local-history-message": "L'historique est local à votre navigateur et n'est pas partagé avec d'autres personnes.",
+      "search-queries-placeholder": "Rechercher des requêtes",
+      "showing-queries": "Affichage de {{ shown }} sur {{ total }} <0>Charger plus</0>",
+      "sort-queries-aria-label": "Trier les requêtes",
+      "sort-queries-placeholder": "Trier les requêtes par"
+    },
+    "rich-history-utils": {
+      "a-week-ago": "il y a une semaine",
+      "days-ago": "il y a {{num}} jours",
+      "default-from": "il y a 1 h",
+      "default-to": "maintenant",
+      "today": "aujourd'hui",
+      "two-weeks-ago": "il y a deux semaines",
+      "yesterday": "hier"
+    },
+    "rich-history-utils-notification": {
+      "saving-failed": "L'enregistrement de l'historique riche a échoué",
+      "update-failed": "La mise à jour de l'historique riche a échoué"
+    },
+    "secondary-actions": {
+      "query-add-button": "Ajouter une requête",
+      "query-add-button-aria-label": "Ajouter une requête",
+      "query-history-button": "Historique des requêtes",
+      "query-history-button-aria-label": "Historique des requêtes",
+      "query-inspector-button": "Inspecteur de requête",
+      "query-inspector-button-aria-label": "Inspecteur de requête"
+    },
     "table": {
-      "no-data": "",
-      "title": "",
-      "title-with-name": ""
+      "no-data": "0 série retournée",
+      "title": "Tableau",
+      "title-with-name": "Tableau – {{name}}"
     },
     "toolbar": {
-      "aria-label": "",
-      "copy-shortened-link": "",
-      "refresh-picker-cancel": "",
-      "refresh-picker-run": "",
-      "split-close": "",
-      "split-close-tooltip": "",
-      "split-narrow": "",
-      "split-title": "",
-      "split-tooltip": "",
-      "split-widen": ""
+      "aria-label": "Explorer la barre d'outils",
+      "copy-link": "Copier l'URL",
+      "copy-link-abs-time": "Copier l'URL absolue",
+      "copy-links-absolute-category": "Liens URL de synchronisation temporelle (partager avec intervalle de temps intact)",
+      "copy-links-normal-category": "Liens URL normaux",
+      "copy-shortened-link": "Copier l'URL abrégée",
+      "copy-shortened-link-abs-time": "Copier l'URL abrégée absolue",
+      "copy-shortened-link-menu": "Ouvrir le lien de menu raccourci",
+      "refresh-picker-cancel": "Annuler",
+      "refresh-picker-run": "Exécuter la requête",
+      "split-close": "Fermer",
+      "split-close-tooltip": "Fermer le panneau scindé",
+      "split-narrow": "Panneau étroit",
+      "split-title": "Scinder",
+      "split-tooltip": "Scinder le panneau",
+      "split-widen": "Élargir le panneau"
     }
   },
   "folder-picker": {
     "loading": "Chargement des dossiers..."
   },
   "grafana-ui": {
+    "drawer": {
+      "close": "Fermer"
+    },
+    "empty-state": {
+      "not-found-message": ""
+    },
     "modal": {
-      "close-tooltip": ""
+      "close-tooltip": "Fermer"
     },
     "segment-async": {
       "error": "Échec du chargement des options",
@@ -375,66 +573,68 @@
       "no-options": "Aucune option trouvée"
     },
     "select": {
-      "no-options-label": "",
-      "placeholder": ""
+      "no-options-label": "Aucune option trouvée",
+      "placeholder": "Choisir"
     }
   },
   "graph": {
     "container": {
-      "content": "",
-      "show-all-series": "",
-      "show-only-series": "",
-      "title": ""
+      "content": "L'affichage de trop nombreuses séries dans un seul panneau peut affecter les performances et compliquer la lecture des données. Pensez à affiner vos requêtes.",
+      "show-all-series": "Afficher tous les {{length}}",
+      "show-only-series": "Affichage de {{MAX_NUMBER_OF_TIME_SERIES}} seulement",
+      "title": "Graphique"
     }
   },
   "help-modal": {
     "shortcuts-category": {
-      "dashboard": "",
-      "focused-panel": "",
-      "global": "",
-      "time-range": ""
+      "dashboard": "Tableau de bord",
+      "focused-panel": "Panneau ciblé",
+      "global": "Global",
+      "time-range": "Période"
     },
     "shortcuts-description": {
-      "change-theme": "",
-      "collapse-all-rows": "",
-      "dashboard-settings": "",
-      "duplicate-panel": "",
-      "exit-edit/setting-views": "",
-      "expand-all-rows": "",
-      "go-to-dashboards": "",
-      "go-to-explore": "",
-      "go-to-home-dashboard": "",
-      "go-to-profile": "",
-      "make-time-range-permanent": "",
-      "move-time-range-back": "",
-      "move-time-range-forward": "",
-      "open-search": "",
-      "open-shared-modal": "",
-      "refresh-all-panels": "",
-      "remove-panel": "",
-      "save-dashboard": "",
-      "show-all-shortcuts": "",
-      "toggle-active-mode": "",
-      "toggle-all-panel-legends": "",
-      "toggle-auto-fit": "",
-      "toggle-exemplars": "",
-      "toggle-graph-crosshair": "",
-      "toggle-kiosk": "",
-      "toggle-panel-edit": "",
-      "toggle-panel-fullscreen": "",
-      "toggle-panel-legend": "",
-      "zoom-out-time-range": ""
-    },
-    "title": ""
+      "change-theme": "Modifier le thème",
+      "collapse-all-rows": "Réduire toutes les lignes",
+      "copy-time-range": "Copier l'intervalle de temps",
+      "dashboard-settings": "Paramètres du tableau de bord",
+      "duplicate-panel": "Dupliquer le panneau",
+      "exit-edit/setting-views": "Quitter les affichages de modification/configuration",
+      "expand-all-rows": "Développer toutes les lignes",
+      "go-to-dashboards": "Aller aux tableaux de bord",
+      "go-to-explore": "Aller à Explorer",
+      "go-to-home-dashboard": "Aller au tableau de bord d'accueil",
+      "go-to-profile": "Aller au profil",
+      "make-time-range-permanent": "Rendre l'intervalle de temps absolu/permanent",
+      "move-time-range-back": "Reculer la plage de temps",
+      "move-time-range-forward": "Avancer la plage de temps",
+      "open-search": "Ouvrir la recherche",
+      "open-shared-modal": "Ouvrir le panneau de partage modal",
+      "paste-time-range": "Coller l'intervalle de temps",
+      "refresh-all-panels": "Actualiser tous les panneaux",
+      "remove-panel": "Retirer le panneau",
+      "save-dashboard": "Enregistrer le tableau de bord",
+      "show-all-shortcuts": "Afficher tous les raccourcis clavier",
+      "toggle-active-mode": "Activer le mode actif / affichage",
+      "toggle-all-panel-legends": "Activer/Désactiver toutes les légendes du panneau",
+      "toggle-auto-fit": "Activer/Désactiver les panneaux d'ajustement automatique (fonctionnalité expérimentale)",
+      "toggle-exemplars": "Activer/désactiver les exemples dans tous les panneaux",
+      "toggle-graph-crosshair": "Activer/désactiver le curseur de forme de croix du graphique partagé",
+      "toggle-kiosk": "Activer/Désactiver le mode kiosque (masque la navigation supérieure)",
+      "toggle-panel-edit": "Activer/Désactiver la vue Édition du panneau",
+      "toggle-panel-fullscreen": "Activer/Désactiver la vue Plein écran",
+      "toggle-panel-legend": "Activer/désactiver la légende du panneau",
+      "zoom-out-time-range": "Dézoomer la plage de temps"
+    },
+    "title": "Raccourcis"
   },
   "inspector": {
     "query": {
-      "collapse-all": "",
-      "copy-to-clipboard": "",
-      "description": "",
-      "expand-all": "",
-      "no-data": "",
-      "refresh": ""
+      "collapse-all": "Tout réduire",
+      "copy-to-clipboard": "Copier dans le presse-papiers",
+      "description": "L'inspecteur de requêtes vous permet de consulter la requête brute et la réponse. Pour collecter ces données, Grafana a besoin de lancer une nouvelle requête. Cliquez sur le bouton Actualiser ci-dessous pour déclencher une nouvelle requête.",
+      "expand-all": "Développer tout",
+      "no-data": "Aucune requête et réponse n'a encore été collectée. Appuyez sur le bouton Actualiser",
+      "refresh": "Actualiser"
     }
   },
   "library-panel": {
@@ -451,39 +651,180 @@
     }
   },
   "library-panels": {
+    "empty-state": {
+      "message": ""
+    },
     "modal": {
-      "body_one": "",
-      "body_many": "",
-      "body_other": "",
-      "button-cancel": "",
-      "button-view-panel1": "",
-      "button-view-panel2": "",
-      "panel-not-linked": "",
-      "select-no-options-message": "",
-      "select-placeholder": "",
-      "title": ""
+      "button-cancel": "<0>Annuler</0>",
+      "button-view-panel1": "Voir le panneau dans {{label}}...",
+      "button-view-panel2": "Voir le panneau dans le tableau de bord...",
+      "panel-not-linked": "Le panneau n'est pas lié à un tableau de bord. Ajoutez le panneau à un tableau de bord et réessayez.",
+      "select-no-options-message": "Aucun tableau de bord trouvé",
+      "select-placeholder": "Commencez à taper pour rechercher le tableau de bord",
+      "title": "Voir le panneau dans le tableau de bord",
+      "body_one": "Ce panneau est utilisé dans {{count}} tableau de bord. Choisissez dans quel tableau de bord le panneau sera affiché :",
+      "body_other": "Ce panneau est utilisé dans {{count}} tableaux de bord. Choisissez dans quel tableau de bord le panneau sera affiché :"
     },
     "save": {
-      "error": "Erreur lors de l'enregistrement du panneau de bibliothèque\u00a0: \"{{errorMsg}}\"",
+      "error": "Erreur lors de l'enregistrement du panneau de bibliothèque : \"{{errorMsg}}\"",
       "success": "Panneau de bibliothèque enregistré"
     }
   },
   "login": {
     "error": {
-      "blocked": "",
-      "invalid-user-or-password": "",
-      "title": "",
-      "unknown": ""
+      "blocked": "Vous avez dépassé le nombre de tentatives de connexion pour cet utilisateur. Veuillez réessayer plus tard.",
+      "invalid-user-or-password": "Nom d'utilisateur ou mot de passe invalide",
+      "title": "Échec de la connexion",
+      "unknown": "Une erreur inconnue est survenue"
+    },
+    "forgot-password": "Vous avez oublié votre mot de passe ?",
+    "form": {
+      "password-label": "Mot de passe",
+      "password-required": "Vous devez renseigner le mot de passe",
+      "submit-label": "Connexion",
+      "submit-loading-label": "Connexion…",
+      "username-label": "E-mail ou nom d'utilisateur",
+      "username-required": "Vous devez renseigner l'e-mail ou le nom d'utilisateur"
+    },
+    "services": {
+      "sing-in-with-prefix": "Se connecter avec {{serviceName}}"
+    },
+    "signup": {
+      "button-label": "Inscription",
+      "new-to-question": "Nouveau sur Grafana ?"
+    }
+  },
+  "migrate-to-cloud": {
+    "can-i-move": {
+      "body": "Une fois que vous aurez connecté cette installation à une pile cloud, vous pourrez importer les sources de données et les tableaux de bord.",
+      "link-title": "En savoir plus sur la migration des autres paramètres",
+      "title": "Puis-je déplacer cette installation vers Grafana Cloud ?"
+    },
+    "connect-modal": {
+      "body-cloud-stack": "Vous aurez également besoin d'une pile cloud. Si vous venez de vous inscrire, nous créerons automatiquement votre première pile. Si vous avez déjà un compte, vous devez sélectionner ou créer une pile.",
+      "body-get-started": "Pour commencer, vous aurez besoin d'un compte Grafana.com.",
+      "body-paste-stack": "Lorsque vous aurez choisi une pile, collez l'URL ci-dessous.",
+      "body-sign-up": "Créez un compte Grafana.com",
+      "body-token": "Votre installation Grafana autogérée a besoin d'un accès spécial pour migrer du contenu de manière sécurisée. Vous devrez créer un jeton de migration sur la pile cloud que vous avez choisie.",
+      "body-token-field": "Jeton de migration",
+      "body-token-field-placeholder": "Coller le jeton ici",
+      "body-token-instructions": "Connectez-vous à votre pile cloud et accédez à Administration > Général > Migrer vers Grafana Cloud. Créez un jeton de migration sur cet écran et collez-le ici.",
+      "body-url-field": "URL de la pile cloud",
+      "body-view-stacks": "Voir mes piles cloud",
+      "cancel": "Annuler",
+      "connect": "Se connecter à cette pile",
+      "connecting": "Connexion à cette pile…",
+      "stack-required-error": "Vous devez renseigner l'URL de la pile",
+      "title": "Se connecter à une pile cloud",
+      "token-required-error": "Vous devez renseigner le jeton de migration"
+    },
+    "cta": {
+      "button": "Migrer cette instance vers le cloud",
+      "header": "Laissez-nous gérer votre pile Grafana"
+    },
+    "disconnect-modal": {
+      "body": "Cette action supprimera le jeton de migration de cette installation. Si vous souhaitez importer plus de ressources dans le futur, vous devrez entrer un nouveau jeton de migration.",
+      "cancel": "Annuler",
+      "disconnect": "Déconnecter",
+      "disconnecting": "Déconnexion…",
+      "error": "La déconnexion a échoué",
+      "title": "Se déconnecter de la pile cloud"
+    },
+    "get-started": {
+      "body": "Le processus de migration doit être démarré à partir de votre instance Grafana autogérée.",
+      "configure-pdc-link": "Configurer la PDC pour cette pile",
+      "link-title": "En savoir plus sur la connexion privée aux sources de données",
+      "step-1": "Connectez-vous à votre instance autogérée et accédez à Administration > Général > Migrer vers Grafana Cloud.",
+      "step-2": "Sélectionnez Migrer cette instance vers le cloud.",
+      "step-3": "Le système vous demandera un jeton de migration. Générez-en un à partir de cet écran.",
+      "step-4": "Dans votre instance autogérée, sélectionnez Importer tout pour importer les sources de données et les tableaux de bord vers cette pile cloud.",
+      "step-5": "Si certaines de vos sources de données ne fonctionnent pas sur le réseau Internet public, vous devez installer une connexion privée aux sources de données dans votre environnement autogéré.",
+      "title": "Comment commencer"
+    },
+    "is-it-secure": {
+      "body": "Grafana Labs s'engage à appliquer les normes les plus strictes en matière de confidentialité et de sécurité des données. En utilisant des technologies et des procédures de sécurité conformes aux normes du secteur, nous contribuons à protéger les données de nos clients contre l'accès, l'utilisation ou la divulgation non autorisés.",
+      "link-title": "Centre de confiance Grafana Labs",
+      "title": "La solution est-elle sécurisée ?"
+    },
+    "migrate-to-this-stack": {
+      "body": "Certaines configurations de votre instance Grafana autogérée peuvent être copiées automatiquement dans cette pile cloud.",
+      "link-title": "Voir le guide de migration complet",
+      "title": "Migrer la configuration vers cette pile"
+    },
+    "migration-token": {
+      "body": "Votre instance Grafana autogérée aura besoin d'un jeton d'authentification spécial pour se connecter de manière sécurisée à cette pile cloud.",
+      "delete-button": "Supprimer ce jeton de migration",
+      "delete-modal-body": "Si vous avez déjà utilisé ce jeton avec une installation autogérée, celle-ci ne pourra plus importer de contenu.",
+      "delete-modal-cancel": "Annuler",
+      "delete-modal-confirm": "Supprimer",
+      "delete-modal-deleting": "Suppression...",
+      "delete-modal-title": "Supprimer le jeton de migration",
+      "generate-button": "Générer un jeton de migration",
+      "generate-button-loading": "Génération d'un jeton de migration…",
+      "modal-close": "Fermer",
+      "modal-copy-and-close": "Copier dans le presse-papiers et fermer",
+      "modal-copy-button": "Copier dans le presse-papiers",
+      "modal-field-description": "Copiez le jeton maintenant, car vous ne pourrez plus le revoir. Si vous perdez un jeton, vous devrez 'en créer un nouveau.",
+      "modal-field-label": "Jeton",
+      "modal-title": "Jeton de migration créé",
+      "status": "Statut actuel : <2></2>",
+      "title": "Jeton de migration"
+    },
+    "pdc": {
+      "body": "L'exposition de vos sources de données sur Internet peut compromettre la sécurité. La connexion privée aux sources de données (PDC) permet à Grafana Cloud d'accéder à vos sources de données existantes en passant par un tunnel réseau sécurisé.",
+      "link-title": "En savoir plus sur la PDC",
+      "title": "Toutes mes sources de données ne sont pas sur le réseau Internet public"
+    },
+    "pricing": {
+      "body": "Grafana Cloud propose une formule gratuite généreuse et un essai illimité de 14 jours. Après votre période d'essai, nous vous facturerons en fonction de votre utilisation dépassant les limites de la formule gratuite.",
+      "link-title": "Tarifs de Grafana Cloud",
+      "title": "Combien ça coûte ?"
+    },
+    "resource-status": {
+      "error-details-button": "Détails",
+      "failed": "Erreur",
+      "migrated": "Importé dans le cloud",
+      "migrating": "Importation…",
+      "not-migrated": "Pas encore importé",
+      "unknown": "Inconnu"
+    },
+    "resource-type": {
+      "dashboard": "Tableau de bord",
+      "datasource": "Source de données",
+      "unknown": "Inconnu"
+    },
+    "summary": {
+      "disconnect": "",
+      "error-starting-migration": "",
+      "start-migration": "",
+      "target-stack-title": ""
+    },
+    "token-status": {
+      "active": "Jeton créé et actif",
+      "no-active": "Aucun jeton actif"
+    },
+    "what-is-cloud": {
+      "body": "Grafana cloud est une plateforme d'observabilité hébergée dans le cloud et entièrement gérée. Elle est idéale pour les environnements natifs du cloud. Elle offre tout ce que vous aimez dans Grafana sans les frais d'entretien, de mise à niveau et de support qu'implique une installation.",
+      "link-title": "En savoir plus sur les fonctionnalités cloud",
+      "title": "Qu'est-ce que Grafana Cloud ?"
+    },
+    "why-host": {
+      "body": "En plus de la commodité de l'hébergement géré, Grafana Cloud comprend de nombreuses fonctionnalités exclusives au cloud comme les SLO, la gestion des incidents, l'apprentissage automatique et de puissantes intégrations d'observabilité.",
+      "link-title": "Vous avez d'autres questions ? Posez-les à un expert",
+      "title": "Pourquoi héberger avec Grafana ?"
     }
   },
   "nav": {
     "add-new-connections": {
-      "title": ""
+      "title": "Ajouter une nouvelle connexion"
     },
     "admin": {
       "subtitle": "Gérer les paramètres à l'échelle du serveur et l'accès aux ressources telles que les organisations, les utilisateurs et les licences",
       "title": "Administrateur de serveur"
     },
+    "alert-list-legacy": {
+      "title": "Règles d'alerte"
+    },
     "alerting": {
       "subtitle": "En savoir plus sur les problèmes dans vos systèmes quelques instants après qu'ils se produisent",
       "title": "Alertes"
@@ -520,6 +861,10 @@
       "subtitle": "Arrêter les notifications résultant d'une ou plusieurs règles d'alerte",
       "title": "Silences"
     },
+    "alerting-upgrade": {
+      "subtitle": "Mettez à niveau vos alertes existantes et vos canaux de notification vers le nouveau système d'alerte Grafana",
+      "title": "Mise à niveau des alertes"
+    },
     "alerts-and-incidents": {
       "subtitle": "Applications de gestion des incidents et des alertes",
       "title": "Alertes et IRM"
@@ -529,36 +874,39 @@
       "title": "Clés API"
     },
     "application": {
-      "title": ""
+      "title": "Application"
     },
     "apps": {
       "subtitle": "Plugins d'application qui prolongent l'expérience Grafana",
       "title": "Applications"
     },
     "authentication": {
-      "title": ""
+      "title": "Authentification"
+    },
+    "collector": {
+      "title": "Collecteur"
     },
     "config": {
       "title": "Administration"
     },
     "config-access": {
-      "subtitle": "",
-      "title": ""
+      "subtitle": "Configurer l'accès pour les utilisateurs, les équipes et les comptes de service individuels",
+      "title": "Utilisateurs et droits d'accès"
     },
     "config-general": {
-      "subtitle": "",
-      "title": ""
+      "subtitle": "Gérer les préférences et paramètres par défaut dans Grafana",
+      "title": "Général"
     },
     "config-plugins": {
-      "subtitle": "",
-      "title": ""
+      "subtitle": "Installer des plugins et définir les relations entre les données",
+      "title": "Modules complémentaires et données"
     },
     "connect-data": {
-      "title": ""
+      "title": "Connecter les données"
     },
     "connections": {
-      "subtitle": "",
-      "title": ""
+      "subtitle": "Parcourir et créer de nouvelles connexions",
+      "title": "Connexions"
     },
     "correlations": {
       "subtitle": "Ajouter et configurer des corrélations",
@@ -584,21 +932,25 @@
       "title": "Tableaux de bord"
     },
     "data-sources": {
-      "subtitle": "",
-      "title": ""
+      "subtitle": "Voir et gérer vos connexions de sources de données connectées",
+      "title": "Sources de données"
     },
     "datasources": {
       "subtitle": "Ajouter et configurer des sources de données",
       "title": "Sources de données"
     },
     "detect": {
-      "title": ""
+      "title": "Détecter"
     },
     "explore": {
       "title": "Explorer"
     },
     "frontend": {
-      "title": ""
+      "subtitle": "Obtenez des analyses de suivi des utilisateurs réels",
+      "title": "Frontend"
+    },
+    "frontend-app": {
+      "title": "Frontend"
     },
     "global-orgs": {
       "subtitle": "Instances isolées de Grafana exécutées sur le même serveur",
@@ -609,7 +961,7 @@
       "title": "Utilisateurs"
     },
     "grafana-quaderno": {
-      "title": ""
+      "title": "Grafana Quaderno"
     },
     "help": {
       "title": "Aide"
@@ -622,24 +974,35 @@
       "title": "Accueil"
     },
     "incidents": {
-      "title": ""
+      "title": "Incidents"
     },
     "infrastructure": {
-      "title": ""
+      "subtitle": "Connaissez l'état de santé de votre infrastructure",
+      "title": "Infrastructure"
+    },
+    "integrations": {
+      "title": "Intégrations"
+    },
+    "k6": {
+      "title": "Performance"
     },
     "kubernetes": {
-      "title": ""
+      "title": "Kubernetes"
     },
     "library-panels": {
       "subtitle": "Panneaux réutilisables pouvant être ajoutés à plusieurs tableaux de bord",
       "title": "Panneaux de bibliothèque"
     },
     "machine-learning": {
-      "title": ""
+      "title": "Apprentissage automatique"
     },
     "manage-folder": {
       "subtitle": "Gérer les tableaux de bord et les autorisations des dossiers"
     },
+    "migrate-to-cloud": {
+      "subtitle": "Copier la configuration de votre installation autogérée vers une pile cloud",
+      "title": "Migrer vers Grafana Cloud"
+    },
     "monitoring": {
       "subtitle": "Applications de suivi et d'infrastructure",
       "title": "Observabilité"
@@ -654,18 +1017,15 @@
       "title": "Nouveau dossier"
     },
     "observability": {
-      "title": ""
+      "title": "Observabilité"
     },
     "oncall": {
-      "title": ""
+      "title": "OnCall"
     },
     "org-settings": {
       "subtitle": "Gérer les préférences au sein d'une organisation",
       "title": "Préférences par défaut"
     },
-    "performance-testing": {
-      "title": ""
-    },
     "playlists": {
       "subtitle": "Groupes de tableaux de bord affichés dans une séquence",
       "title": "Listes de lecture"
@@ -674,6 +1034,10 @@
       "subtitle": "Prolonger l'expérience Grafana avec des plug-ins",
       "title": "Plug-ins"
     },
+    "private-data-source-connections": {
+      "subtitle": "Obtenez des données qui vivent au sein d'un réseau sécurisé sans ouvrir le réseau au trafic entrant à partir de Grafana Cloud. En savoir plus dans notre documentation.",
+      "title": "Connexion à la source de données privée"
+    },
     "profile/notifications": {
       "title": "Historique des notifications"
     },
@@ -684,16 +1048,16 @@
       "title": "Profil"
     },
     "profiles": {
-      "title": ""
+      "title": "Profils"
     },
     "public": {
       "title": "Tableaux de bord publics"
     },
     "recorded-queries": {
-      "title": ""
+      "title": "Requêtes enregistrées"
     },
     "reporting": {
-      "title": ""
+      "title": "Rapports"
     },
     "scenes": {
       "title": "Scènes"
@@ -716,7 +1080,7 @@
       "title": "Se déconnecter"
     },
     "slo": {
-      "title": ""
+      "title": "SLO"
     },
     "snapshots": {
       "subtitle": "Représentations interactives, accessibles au public et ponctuelles des tableaux de bord",
@@ -729,7 +1093,7 @@
       "title": "Vos tableaux de bord favoris apparaîtront ici"
     },
     "statistics-and-licensing": {
-      "title": ""
+      "title": "Statistiques et licences"
     },
     "storage": {
       "subtitle": "Gérer le stockage de fichiers",
@@ -740,12 +1104,16 @@
       "title": "Packs d’assistance"
     },
     "synthetics": {
-      "title": ""
+      "title": "Synthèses"
     },
     "teams": {
       "subtitle": "Groupes d'utilisateurs ayant des besoins communs en matière de tableau de bord et d'autorisations",
       "title": "Équipes"
     },
+    "testing-and-synthetics": {
+      "subtitle": "Optimisez les performances grâce aux analyses de la surveillance synthétique et k6",
+      "title": "Tests et synthèses"
+    },
     "upgrading": {
       "title": "Statistiques et licence"
     },
@@ -759,17 +1127,22 @@
       "tv-alert": "Appuyez sur ESC pour quitter le mode kiosque"
     },
     "megamenu": {
-      "close": "",
-      "dock": "",
-      "undock": ""
+      "close": "Fermer le menu",
+      "dock": "Ancrer le menu",
+      "list-label": "Navigation",
+      "undock": "Ancrer le menu"
     },
     "toolbar": {
+      "close-menu": "Fermer le menu",
       "enable-kiosk": "Activer le mode kiosque",
-      "toggle-menu": "Afficher/Masquer le menu",
+      "open-menu": "Ouvrir le menu",
       "toggle-search-bar": "Afficher/Masquer la barre de recherche"
     }
   },
   "news": {
+    "drawer": {
+      "close": "Fermer le tiroir"
+    },
     "title": "Dernières nouvelles sur le blog"
   },
   "notifications": {
@@ -779,7 +1152,6 @@
   "panel": {
     "header-menu": {
       "copy": "Copier",
-      "create-alert": "",
       "create-library-panel": "Créer un panneau Bibliothèque",
       "duplicate": "Dupliquer",
       "edit": "Modifier",
@@ -790,6 +1162,7 @@
       "inspect-data": "Données",
       "inspect-json": "Panneau JSON",
       "more": "Plus...",
+      "new-alert-rule": "Nouvelle règle d'alerte",
       "query": "Requête",
       "remove": "Supprimer",
       "share": "Partager",
@@ -799,65 +1172,199 @@
     }
   },
   "playlist-edit": {
-    "error-prefix": "",
+    "error-prefix": "Erreur lors du chargement de la playlist :",
     "form": {
-      "add-tag-label": "",
-      "add-tag-placeholder": "",
-      "add-title-label": "",
-      "cancel": "",
-      "heading": "",
-      "interval-label": "",
-      "interval-placeholder": "",
-      "interval-required": "",
-      "name-label": "",
-      "name-placeholder": "",
-      "name-required": "",
-      "save": "",
-      "table-delete": "",
-      "table-drag": "",
-      "table-empty": "",
-      "table-heading": ""
-    },
-    "sub-title": "",
-    "title": ""
+      "add-tag-label": "Ajouter par étiquette",
+      "add-tag-placeholder": "Sélectionner une étiquette",
+      "add-title-label": "Ajouter par titre",
+      "cancel": "Annuler",
+      "heading": "Ajouter des tableaux de bord",
+      "interval-label": "Intervalle",
+      "interval-placeholder": "5m",
+      "interval-required": "Vous devez saisir un intervalle",
+      "name-label": "Nom",
+      "name-placeholder": "Nom",
+      "name-required": "Un nom est obligatoire",
+      "save": "Enregistrer",
+      "table-delete": "Supprimer l'élément de la playlist",
+      "table-drag": "Glisser et déposer pour réorganiser",
+      "table-empty": "La playlist est vide. Ajoutez des tableaux de bord ci-dessous.",
+      "table-heading": "Tableaux de bord"
+    },
+    "sub-title": "Une playlist tourne en boucle dans une liste présélectionnée de tableaux de bord. Une playlist peut être un excellent moyen de sensibiliser votre équipe à la situation ou de montrer fièrement vos résultats à votre équipe ou à vos visiteurs.",
+    "title": "Modifier la playlist"
   },
   "playlist-page": {
     "card": {
-      "delete": "",
-      "edit": "",
-      "start": "",
-      "tooltip": ""
+      "delete": "Supprimer la playlist",
+      "edit": "Modifier la playlist",
+      "start": "Lancer la playlist",
+      "tooltip": "Partager la playlist"
     },
     "create-button": {
-      "title": ""
+      "title": "Nouvelle playlist"
     },
     "delete-modal": {
-      "body": "",
-      "confirm-text": ""
+      "body": "Souhaitez-vous vraiment supprimer la playlist {{name}} ?",
+      "confirm-text": "Supprimer"
     },
     "empty": {
-      "button": "",
-      "pro-tip": "",
-      "pro-tip-link-title": "",
-      "title": ""
+      "button": "Créer une playlist",
+      "pro-tip": "Vous pouvez utiliser des playlists pour faire défiler des tableaux de bord sur des téléviseurs sans contrôle utilisateur",
+      "pro-tip-link-title": "En savoir plus",
+      "title": "Il n'y a aucune playlist créée"
+    }
+  },
+  "playlists": {
+    "empty-state": {
+      "message": ""
     }
   },
   "profile": {
     "change-password": {
-      "cancel-button": "",
-      "cannot-change-password-message": "",
-      "change-password-button": "",
-      "confirm-password-label": "",
-      "confirm-password-required": "",
-      "ldap-auth-proxy-message": "",
-      "new-password-label": "",
-      "new-password-required": "",
-      "new-password-same-as-old": "",
-      "old-password-label": "",
-      "old-password-required": "",
-      "passwords-must-match": ""
+      "cancel-button": "Annuler",
+      "cannot-change-password-message": "Le mot de passe ne peut pas être modifié ici.",
+      "change-password-button": "Modifier le mot de passe",
+      "confirm-password-label": "Confirmer le mot de passe",
+      "confirm-password-required": "Vous devez confirmer le nouveau mot de passe",
+      "ldap-auth-proxy-message": "Vous ne pouvez pas modifier le mot de passe lorsque vous êtes connecté avec un proxy LDAP ou authentifié.",
+      "new-password-label": "Nouveau mot de passe",
+      "new-password-required": "Vous devez saisir un nouveau mot de passe",
+      "new-password-same-as-old": "Le nouveau mot de passe ne peut pas être le même que l'ancien.",
+      "old-password-label": "Ancien mot de passe",
+      "old-password-required": "Vous devez saisir l'ancien mot de passe",
+      "passwords-must-match": "Les mots de passe doivent être identiques",
+      "strong-password-validation-register": "Selon notre politique, votre mot de passe n'est pas suffisamment sécurisé"
     }
   },
+  "public-dashboard": {
+    "acknowledgment-checkboxes": {
+      "ack-title": "Avant de rendre le tableau de bord public, acceptez ce qui suit :",
+      "data-src-ack-desc": "La publication ne fonctionne actuellement qu'avec un sous-ensemble de sources de données*",
+      "data-src-ack-tooltip": "En savoir plus sur les sources de données publiques",
+      "public-ack-desc": "Votre tableau de bord sera entièrement public*",
+      "public-ack-tooltip": "En savoir plus sur les tableaux de bord publics",
+      "usage-ack-desc": "Si vous rendez le tableau de bord public, les requêtes seront exécutées à chaque fois qu'il sera affiché, ce qui peut augmenter les coûts*",
+      "usage-ack-desc-tooltip": "En savoir plus sur la mise en cache des requêtes"
+    },
+    "config": {
+      "can-view-dashboard-radio-button-label": "Peut voir le tableau de bord",
+      "copy-button": "Copier",
+      "dashboard-url-field-label": "URL du tableau de bord",
+      "email-share-type-option-label": "Uniquement les personnes spécifiées",
+      "pause-sharing-dashboard-label": "Interrompre le partage du tableau de bord",
+      "public-share-type-option-label": "Toute personne ayant un lien",
+      "revoke-public-URL-button": "Désactiver l'URL publique",
+      "revoke-public-URL-button-title": "Désactiver l'URL publique",
+      "settings-title": "Paramètres"
+    },
+    "create-page": {
+      "generate-public-url-button": "Générer une URL publique",
+      "unsupported-features-desc": "Actuellement, nous ne prenons pas en charge les variables de modèle ou les données provenant des utilisateurs",
+      "welcome-title": "Bienvenue dans les tableaux de bord publics !"
+    },
+    "delete-modal": {
+      "revoke-nonorphaned-body-text": "Souhaitez-vous vraiment désactiver cette URL ? Le tableau de bord ne sera plus public.",
+      "revoke-orphaned-body-text": "Le tableau de bord public orphelin ne sera plus public.",
+      "revoke-title": "Désactiver l'URL publique"
+    },
+    "email-sharing": {
+      "input-invalid-email-text": "E-mail non valide",
+      "input-required-email-text": "Une adresse e-mail est obligatoire",
+      "invite-button": "Inviter",
+      "invite-field-desc": "Invitez des personnes par e-mail",
+      "invite-field-label": "Inviter",
+      "resend-button": "Renvoyer",
+      "resend-button-title": "Renvoyer",
+      "revoke-button": "Retirer",
+      "revoke-button-title": "Retirer"
+    },
+    "modal-alerts": {
+      "no-upsert-perm-alert-desc": "Contactez votre administrateur pour obtenir la permission d'accéder aux tableaux de bord publics {{mode}}",
+      "no-upsert-perm-alert-title": "Vous n'avez pas l'autorisation nécessaire pour {{ mode }} un tableau de bord public",
+      "save-dashboard-changes-alert-title": "Veuillez enregistrer les modifications de votre tableau de bord avant de modifier la configuration publique",
+      "unsupport-data-source-alert-readmore-link": "En savoir plus sur les sources de données prises en charge",
+      "unsupported-data-source-alert-desc": "Ce tableau de bord comprend des sources de données qui ne sont pas prises en charge pour les tableaux de bord publics. Les panneaux qui utilisent ces sources de données peuvent ne pas fonctionner correctement : {{unsupportedDataSources}}.",
+      "unsupported-data-source-alert-title": "Sources de données non prises en charge",
+      "unsupported-template-variable-alert-desc": "Ce tableau de bord public peut ne pas fonctionner car il utilise des variables de modèle",
+      "unsupported-template-variable-alert-title": "Les variables de modèle ne sont pas prises en charge"
+    },
+    "settings-bar-header": {
+      "collapse-settings-tooltip": "Réduire les paramètres",
+      "expand-settings-tooltip": "Développer les paramètres"
+    },
+    "settings-configuration": {
+      "default-time-range-label": "Intervalle de temps par défaut",
+      "default-time-range-label-desc": "Le tableau de bord public utilise les paramètres d'intervalle de temps par défaut du tableau de bord",
+      "show-annotations-label": "Afficher les annotations",
+      "show-annotations-label-desc": "Afficher les annotations sur le tableau de bord public",
+      "time-range-picker-label": "Sélecteur de plage de temps activé",
+      "time-range-picker-label-desc": "Permettre de modifier la plage de temps pendant l'affichage"
+    },
+    "settings-summary": {
+      "annotations-hide-text": "Annotations = masquer",
+      "annotations-show-text": "Annotations = montrer",
+      "time-range-picker-disabled-text": "Sélecteur de plage de temps = désactivé",
+      "time-range-picker-enabled-text": "Sélecteur de plage de temps = activé",
+      "time-range-text": "Plage de temps = "
+    }
+  },
+  "public-dashboard-list": {
+    "button": {
+      "config-button-tooltip": "Configurer le tableau de bord public",
+      "revoke-button-text": "Désactiver l'URL publique",
+      "revoke-button-tooltip": "Désactiver l'URL du tableau de bord public",
+      "view-button-tooltip": "Afficher le tableau de bord public"
+    },
+    "dashboard-title": {
+      "orphaned-title": "<0>Tableau de bord public orphelin</0>",
+      "orphaned-tooltip": "Le tableau de bord lié a déjà été supprimé"
+    },
+    "toggle": {
+      "pause-sharing-toggle-text": "Suspendre le partage"
+    }
+  },
+  "public-dashboard-users-access-list": {
+    "dashboard-modal": {
+      "loading-text": "Chargement en cours...",
+      "open-dashboard-list-text": "Ouvrir la liste des tableaux de bord",
+      "public-dashboard-link": "URL du tableau de bord public",
+      "public-dashboard-setting": "Paramètres du tableau de bord public"
+    },
+    "delete-user-modal": {
+      "delete-user-button-text": "Supprimer l'utilisateur",
+      "delete-user-cancel-button": "Annuler",
+      "delete-user-revoke-access-button": "Retirer l'accès",
+      "revoke-access-title": "Retirer l'accès",
+      "revoke-user-access-modal-desc-line1": "Souhaitez-vous vraiment retirer l'accès pour {{email}} ?",
+      "revoke-user-access-modal-desc-line2": "Cette action retirera immédiatement l'accès de {{email}}&apos;s à tous les tableaux de bord publics."
+    },
+    "modal": {
+      "dashboard-modal-title": "Tableaux de bord publics"
+    },
+    "table-header": {
+      "activated-label": "Activé",
+      "activated-tooltip": "Première heure à laquelle l'utilisateur a été un utilisateur actif sur un tableau de bord",
+      "email-label": "Adresse e-mail",
+      "last-active-label": "Dernière activité",
+      "origin-label": "Origine",
+      "role-label": "Rôle"
+    }
+  },
+  "query-operation": {
+    "header": {
+      "collapse-row": "Réduire la ligne de requête",
+      "datasource-help": "Afficher l'aide de la source de données",
+      "drag-and-drop": "Glisser et déposer pour réorganiser",
+      "duplicate-query": "Dupliquer la requête",
+      "expand-row": "Développer la ligne de requête",
+      "hide-response": "",
+      "remove-query": "Supprimer la requête",
+      "show-response": "",
+      "toggle-edit-mode": "Activer/désactiver le mode édition de texte"
+    },
+    "query-editor-not-exported": "Le plugin source de données n'exporte aucun composant de l'éditeur de requête"
+  },
   "refresh-picker": {
     "aria-label": {
       "choose-interval": "Actualisation automatique désactivée. Choisir un intervalle de temps d'actualisation",
@@ -876,10 +1383,16 @@
       "label": "Désactivé"
     },
     "tooltip": {
-      "interval-selected": "",
-      "turned-off": ""
+      "interval-selected": "Définir l'intervalle d'actualisation automatique",
+      "turned-off": "Actualisation automatique désactivée"
     }
   },
+  "return-to-previous": {
+    "button": {
+      "label": "Retour à {{title}}"
+    },
+    "dismissable-button": "Fermer"
+  },
   "search": {
     "actions": {
       "include-panels": "Inclure des panneaux",
@@ -895,15 +1408,6 @@
       "new-dashboard": "Nouveau tableau de bord",
       "new-folder": "Nouveau dossier"
     },
-    "folder-view": {
-      "go-to-folder": "Aller dans le dossier",
-      "select-folder": "Sélectionner un dossier"
-    },
-    "result-kind": {
-      "dashboard": "Tableau de bord",
-      "folder": "Dossier",
-      "panel": "Panneau"
-    },
     "results-table": {
       "datasource-header": "Source de données",
       "location-header": "Emplacement",
@@ -918,12 +1422,6 @@
       "placeholder": "Rechercher des tableaux de bord"
     }
   },
-  "search-view": {
-    "no-results": {
-      "clear": "",
-      "text": ""
-    }
-  },
   "share-modal": {
     "dashboard": {
       "title": "Partager"
@@ -937,11 +1435,10 @@
       "time-range-description": "Transforme la période temporelle relative actuelle en une période temporelle absolue"
     },
     "export": {
-      "back-button": "",
+      "back-button": "Retour à la configuration de l'exportation",
       "cancel-button": "Annuler",
       "info-text": "Exporter ce tableau de bord.",
       "save-button": "Enregistrer dans un fichier",
-      "share-default-label": "Exporter avec les valeurs par défaut supprimées",
       "share-externally-label": "Exporter pour un partage externe",
       "view-button": "Afficher au format JSON"
     },
@@ -973,11 +1470,11 @@
       "expire-day": "1 jour",
       "expire-hour": "1 heure",
       "expire-never": "Jamais",
-      "expire-week": "7 jours",
+      "expire-week": "1 semaine",
       "info-text-1": "Un instantané est un moyen instantané de partager publiquement un tableau de bord interactif. Lors de la création, nous supprimons les données sensibles telles que les requêtes (métrique, modèle et annotation) et les liens du panneau, pour ne laisser que les métriques visibles et les noms de séries intégrés dans votre tableau de bord.",
       "info-text-2": "N'oubliez pas que votre instantané <1>peut être consulté par une personne</1> qui dispose du lien et qui peut accéder à l'URL. Partagez judicieusement.",
-      "local-button": "Instantané local",
-      "mistake-message": "Avez-vous commis une erreur\u00a0? ",
+      "local-button": "Publier un instantané",
+      "mistake-message": "Avez-vous commis une erreur ? ",
       "name": "Nom de l'instantané",
       "timeout": "Délai d’expiration (secondes)",
       "timeout-description": "Vous devrez peut-être configurer la valeur du délai d'expiration si la collecte des métriques de votre tableau de bord prend beaucoup de temps.",
@@ -988,6 +1485,9 @@
       "export": "Exporter",
       "library-panel": "Panneau de bibliothèque",
       "link": "Lien",
+      "panel-embed": "Intégrer",
+      "public-dashboard": "",
+      "public-dashboard-title": "Tableau de bord public",
       "snapshot": "Instantané"
     },
     "theme-picker": {
@@ -1001,22 +1501,22 @@
     }
   },
   "share-playlist": {
-    "checkbox-description": "",
-    "checkbox-label": "",
-    "copy-link-button": "",
-    "link-url-label": "",
-    "mode": "",
-    "mode-kiosk": "",
-    "mode-normal": "",
-    "mode-tv": "",
-    "title": ""
+    "checkbox-description": "Les hauteurs du panneau seront ajustées à la taille de l'écran",
+    "checkbox-label": "Ajustement automatique",
+    "copy-link-button": "Copier",
+    "link-url-label": "Lien URL",
+    "mode": "Mode",
+    "mode-kiosk": "Kiosque",
+    "mode-normal": "Normal",
+    "mode-tv": "Téléviseur",
+    "title": "Partager la playlist"
   },
   "shared": {
     "preferences": {
       "theme": {
-        "dark-label": "",
-        "light-label": "",
-        "system-label": ""
+        "dark-label": "Sombre",
+        "light-label": "Clair",
+        "system-label": "Préférences du système"
       }
     }
   },
@@ -1040,10 +1540,10 @@
     "title": "Préférences"
   },
   "snapshot": {
-    "external-badge": "",
-    "name-column-header": "",
-    "url-column-header": "",
-    "view-button": ""
+    "external-badge": "Externe",
+    "name-column-header": "Nom",
+    "url-column-header": "URL de l'instantané",
+    "view-button": "Afficher"
   },
   "tag-filter": {
     "loading": "Chargement en cours...",
@@ -1058,6 +1558,7 @@
     "calendar": {
       "apply-button": "Appliquer la plage de temps",
       "cancel-button": "Annuler",
+      "close": "Fermer le calendrier",
       "select-time": "Sélectionner une plage de temps"
     },
     "content": {
@@ -1065,6 +1566,13 @@
       "empty-recent-list-info": "Il semble que vous n'ayez jamais utilisé ce sélecteur de temps dans le passé. Lorsque vous commencerez à utiliser des plages de temps, celles récemment utilisées apparaîtront ici.",
       "filter-placeholder": "Rechercher dans les plages rapides"
     },
+    "copy-paste": {
+      "copy-success-message": "Intervalle de temps copié dans le presse-papiers",
+      "default-error-message": "{{error}} n'est pas un intervalle de temps valide",
+      "default-error-title": "Intervalle de temps invalide",
+      "tooltip-copy": "Copier l'intervalle de temps dans le presse-papiers",
+      "tooltip-paste": "Coller l'intervalle de temps"
+    },
     "footer": {
       "change-settings-button": "Modifier les paramètres de l'heure",
       "fiscal-year-option": "Exercice fiscal",
@@ -1077,6 +1585,7 @@
       "default-error": "Entrez une date dans le passé ou « maintenant »",
       "fiscal-year": "Exercice fiscal",
       "from-input": "De",
+      "open-input-calendar": "Ouvrir le calendrier",
       "range-error": "« De » ne peut pas être ultérieur à « À »",
       "to-input": "À"
     },
@@ -1099,6 +1608,12 @@
       "select-search-input": "Tapez pour rechercher (pays, ville, abréviation)"
     }
   },
+  "transformations": {
+    "empty": {
+      "add-transformation-body": "Les transformations permettent de modifier les données de différentes manières avant l'affichage de votre visualisation.<1></1>Vous pouvez notamment rassembler des données, renommer des champs, faire des calculs, formater les données à afficher, etc.",
+      "add-transformation-header": "Commencer la transformation des données"
+    }
+  },
   "user-orgs": {
     "current-org-button": "Actuel",
     "name-column": "Nom",
@@ -1113,6 +1628,9 @@
       "name-error": "Un nom est obligatoire",
       "name-label": "Nom",
       "username-label": "Nom d’utilisateur"
+    },
+    "tabs": {
+      "general": "Général"
     }
   },
   "user-session": {
@@ -1125,6 +1643,11 @@
   "user-sessions": {
     "loading": "Chargement des sessions..."
   },
+  "users-access-list": {
+    "tabs": {
+      "public-dashboard-users-tab-title": "Utilisateurs du tableau de bord public"
+    }
+  },
   "variable": {
     "adhoc": {
       "placeholder": "Sélectionner une valeur"
@@ -1142,4 +1665,4 @@
       "placeholder": "Entrer la valeur de la variable"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/public/locales/i18next-parser.config.js b/public/locales/i18next-parser.config.js
index 0628220503ac5..c83f5e0ce7475 100644
--- a/public/locales/i18next-parser.config.js
+++ b/public/locales/i18next-parser.config.js
@@ -1,8 +1,8 @@
 module.exports = {
   // Default namespace used in your i18next config
   defaultNamespace: 'grafana',
-
-  locales: ['en-US', 'fr-FR', 'es-ES', "de-DE", "zh-Hans", 'pseudo-LOCALE'],
+  // Adds changes only to en-US when extracting keys, every other language is provided by Crowdin
+  locales: ['en-US'],
 
   output: './public/locales/$LOCALE/$NAMESPACE.json',
 
@@ -13,7 +13,4 @@ module.exports = {
   failOnWarnings: true,
 
   verbose: false,
-
-  // Don't include default values for English, they'll remain in the source code
-  skipDefaultValues: (locale) => locale !== 'en-US',
 };
diff --git a/public/locales/pseudo-LOCALE/grafana.json b/public/locales/pseudo-LOCALE/grafana.json
index 172d2a2111438..102f8dbd0a380 100644
--- a/public/locales/pseudo-LOCALE/grafana.json
+++ b/public/locales/pseudo-LOCALE/grafana.json
@@ -1,5 +1,5 @@
 {
-  "_comment": "Ŧĥįş ƒįľę įş ŧĥę şőūřčę őƒ ŧřūŧĥ ƒőř Ēʼnģľįşĥ şŧřįʼnģş. Ēđįŧ ŧĥįş ŧő čĥäʼnģę pľūřäľş äʼnđ őŧĥęř pĥřäşęş ƒőř ŧĥę ŮĨ.",
+  "_comment": "Ŧĥįş ƒįľę įş ŧĥę şőūřčę őƒ ŧřūŧĥ ƒőř Ēʼnģľįşĥ şŧřįʼnģş. Ēđįŧ ŧĥįş įʼn ŧĥę čőđęþäşę ŧő čĥäʼnģę pľūřäľş äʼnđ őŧĥęř pĥřäşęş ƒőř ŧĥę ŮĨ.",
   "access-control": {
     "add-permission": {
       "role-label": "Ŗőľę",
@@ -25,6 +25,14 @@
       "user": "Ůşęř"
     }
   },
+  "api-keys": {
+    "empty-state": {
+      "message": "Ńő ÅPĨ ĸęyş ƒőūʼnđ"
+    }
+  },
+  "bouncing-loader": {
+    "label": "Ŀőäđįʼnģ"
+  },
   "browse-dashboards": {
     "action": {
       "cancel-button": "Cäʼnčęľ",
@@ -73,6 +81,7 @@
     "folder-picker": {
       "accessible-label": "Ŝęľęčŧ ƒőľđęř: {{ label }} čūřřęʼnŧľy şęľęčŧęđ",
       "button-label": "Ŝęľęčŧ ƒőľđęř",
+      "clear-selection": "Cľęäř şęľęčŧįőʼn",
       "empty-message": "Ńő ƒőľđęřş ƒőūʼnđ",
       "error-title": "Ēřřőř ľőäđįʼnģ ƒőľđęřş",
       "search-placeholder": "Ŝęäřčĥ ƒőľđęřş",
@@ -81,9 +90,7 @@
     "manage-folder-nav": {
       "alert-rules": "Åľęřŧ řūľęş",
       "dashboards": "Đäşĥþőäřđş",
-      "panels": "Päʼnęľş",
-      "permissions": "Pęřmįşşįőʼnş",
-      "settings": "Ŝęŧŧįʼnģş"
+      "panels": "Päʼnęľş"
     },
     "new-folder-form": {
       "cancel-label": "Cäʼnčęľ",
@@ -92,7 +99,7 @@
     },
     "no-results": {
       "clear": "Cľęäř şęäřčĥ äʼnđ ƒįľŧęřş",
-      "text": "Ńő řęşūľŧş ƒőūʼnđ ƒőř yőūř qūęřy."
+      "text": "Ńő řęşūľŧş ƒőūʼnđ ƒőř yőūř qūęřy"
     }
   },
   "clipboard-button": {
@@ -106,6 +113,9 @@
       "dark-theme": "Đäřĸ",
       "light-theme": "Ŀįģĥŧ"
     },
+    "empty-state": {
+      "message": "Ńő řęşūľŧş ƒőūʼnđ"
+    },
     "search-box": {
       "placeholder": "Ŝęäřčĥ őř ĵūmp ŧő..."
     },
@@ -126,7 +136,8 @@
   },
   "connections": {
     "connect-data": {
-      "category-header-label": "Đäŧä şőūřčęş"
+      "category-header-label": "Đäŧä şőūřčęş",
+      "empty-message": "Ńő řęşūľŧş mäŧčĥįʼnģ yőūř qūęřy ŵęřę ƒőūʼnđ"
     },
     "search": {
       "placeholder": "Ŝęäřčĥ äľľ"
@@ -138,6 +149,16 @@
       "error-message": "Åʼn ūʼnĸʼnőŵʼn ęřřőř őččūřřęđ ŵĥįľę ƒęŧčĥįʼnģ čőřřęľäŧįőʼn đäŧä. Pľęäşę ŧřy äģäįʼn.",
       "title": "Ēřřőř ƒęŧčĥįʼnģ čőřřęľäŧįőʼn đäŧä"
     },
+    "basic-info-form": {
+      "description-description": "Øpŧįőʼnäľ đęşčřįpŧįőʼn ŵįŧĥ mőřę įʼnƒőřmäŧįőʼn äþőūŧ ŧĥę ľįʼnĸ",
+      "description-label": "Đęşčřįpŧįőʼn",
+      "label-description": "Ŧĥįş ʼnämę ŵįľľ þę ūşęđ äş ŧĥę ľäþęľ ƒőř ŧĥę čőřřęľäŧįőʼn. Ŧĥįş ŵįľľ şĥőŵ äş þūŧŧőʼn ŧęχŧ, ä męʼnū įŧęm, őř ĥővęř ŧęχŧ őʼn ä ľįʼnĸ.",
+      "label-label": "Ŀäþęľ",
+      "label-placeholder": "ę.ģ. Ŧęmpő ŧřäčęş",
+      "label-required": "Ŧĥįş ƒįęľđ įş řęqūįřęđ.",
+      "sub-text": "<0>Đęƒįʼnę ŧęχŧ ŧĥäŧ ŵįľľ đęşčřįþę ŧĥę čőřřęľäŧįőʼn.</0>",
+      "title": "Đęƒįʼnę čőřřęľäŧįőʼn ľäþęľ (Ŝŧęp 1 őƒ 3)"
+    },
     "list": {
       "delete": "đęľęŧę čőřřęľäŧįőʼn",
       "label": "Ŀäþęľ",
@@ -146,9 +167,73 @@
       "source": "Ŝőūřčę",
       "target": "Ŧäřģęŧ"
     },
+    "navigation-form": {
+      "add-button": "Åđđ",
+      "back-button": "ßäčĸ",
+      "next-button": "Ńęχŧ",
+      "save-button": "Ŝävę"
+    },
     "page-content": "Ŧő ęʼnäþľę Cőřřęľäŧįőʼnş, äđđ įŧ įʼn ŧĥę Ğřäƒäʼnä čőʼnƒįģ:",
     "page-heading": "Cőřřęľäŧįőʼnş äřę đįşäþľęđ",
-    "sub-title": "Đęƒįʼnę ĥőŵ đäŧä ľįvįʼnģ įʼn đįƒƒęřęʼnŧ đäŧä şőūřčęş řęľäŧęş ŧő ęäčĥ őŧĥęř. Ŗęäđ mőřę įʼn ŧĥę <2>đőčūmęʼnŧäŧįőʼn<1></1></2>"
+    "query-editor": {
+      "control-rules": "Ŧĥę şęľęčŧęđ ŧäřģęŧ đäŧä şőūřčę mūşŧ ęχpőřŧ ä qūęřy ęđįŧőř.",
+      "data-source-text": "Pľęäşę şęľęčŧ ä ŧäřģęŧ đäŧä şőūřčę ƒįřşŧ.",
+      "data-source-title": "Ńő đäŧä şőūřčę şęľęčŧęđ",
+      "error-text": "Ŧĥę şęľęčŧęđ đäŧä şőūřčę čőūľđ ʼnőŧ þę ľőäđęđ.",
+      "error-title": "Ēřřőř ľőäđįʼnģ đäŧä şőūřčę",
+      "loading": "Ŀőäđįʼnģ qūęřy ęđįŧőř...",
+      "query-description": "Đęƒįʼnę ŧĥę qūęřy ŧĥäŧ įş řūʼn ŵĥęʼn ŧĥę ľįʼnĸ įş čľįčĸęđ. Ÿőū čäʼn ūşę <2>väřįäþľęş</2> ŧő äččęşş şpęčįƒįč ƒįęľđ väľūęş.",
+      "query-editor-title": "Đäŧä şőūřčę đőęş ʼnőŧ ęχpőřŧ ä qūęřy ęđįŧőř.",
+      "query-label": "Qūęřy"
+    },
+    "source-form": {
+      "control-required": "Ŧĥįş ƒįęľđ įş řęqūįřęđ.",
+      "description": "Ÿőū ĥävę ūşęđ ƒőľľőŵįʼnģ väřįäþľęş įʼn ŧĥę ŧäřģęŧ qūęřy: <1></1><2></2>Å đäŧä pőįʼnŧ ʼnęęđş ŧő přővįđę väľūęş ŧő äľľ väřįäþľęş äş ƒįęľđş őř äş ŧřäʼnşƒőřmäŧįőʼnş őūŧpūŧ ŧő mäĸę ŧĥę čőřřęľäŧįőʼn þūŧŧőʼn äppęäř įʼn ŧĥę vįşūäľįžäŧįőʼn.<4></4>Ńőŧę: Ńőŧ ęvęřy väřįäþľę ʼnęęđş ŧő þę ęχpľįčįŧľy đęƒįʼnęđ þęľőŵ. Å ŧřäʼnşƒőřmäŧįőʼn şūčĥ äş <7>ľőģƒmŧ</7> ŵįľľ čřęäŧę väřįäþľęş ƒőř ęvęřy ĸęy/väľūę päįř.",
+      "heading": "Väřįäþľęş ūşęđ įʼn ŧĥę ŧäřģęŧ qūęřy",
+      "results-description": "Ŧĥę ľįʼnĸ ŵįľľ þę şĥőŵʼn ʼnęχŧ ŧő ŧĥę väľūę őƒ ŧĥįş ƒįęľđ",
+      "results-label": "Ŗęşūľŧş ƒįęľđ",
+      "results-required": "Ŧĥįş ƒįęľđ įş řęqūįřęđ.",
+      "source-description": "Ŗęşūľŧş ƒřőm şęľęčŧęđ şőūřčę đäŧä şőūřčę ĥävę ľįʼnĸş đįşpľäyęđ įʼn ŧĥę päʼnęľ",
+      "source-label": "Ŝőūřčę",
+      "sub-text": "<0>Đęƒįʼnę ŵĥäŧ đäŧä şőūřčę ŵįľľ đįşpľäy ŧĥę čőřřęľäŧįőʼn, äʼnđ ŵĥäŧ đäŧä ŵįľľ řępľäčę přęvįőūşľy đęƒįʼnęđ väřįäþľęş.</0>",
+      "title": "Cőʼnƒįģūřę ŧĥę đäŧä şőūřčę ŧĥäŧ ŵįľľ ľįʼnĸ ŧő {{dataSourceName}} (Ŝŧęp 3 őƒ 3)"
+    },
+    "sub-title": "Đęƒįʼnę ĥőŵ đäŧä ľįvįʼnģ įʼn đįƒƒęřęʼnŧ đäŧä şőūřčęş řęľäŧęş ŧő ęäčĥ őŧĥęř. Ŗęäđ mőřę įʼn ŧĥę <2>đőčūmęʼnŧäŧįőʼn<1></1></2>",
+    "target-form": {
+      "control-rules": "Ŧĥįş ƒįęľđ įş řęqūįřęđ.",
+      "sub-text": "<0>Đęƒįʼnę ŵĥäŧ đäŧä şőūřčę ŧĥę čőřřęľäŧįőʼn ŵįľľ ľįʼnĸ ŧő, äʼnđ ŵĥäŧ qūęřy ŵįľľ řūʼn ŵĥęʼn ŧĥę čőřřęľäŧįőʼn įş čľįčĸęđ.</0>",
+      "target-description": "Ŝpęčįƒy ŵĥįčĥ đäŧä şőūřčę įş qūęřįęđ ŵĥęʼn ŧĥę ľįʼnĸ įş čľįčĸęđ",
+      "target-label": "Ŧäřģęŧ",
+      "title": "Ŝęŧūp ŧĥę ŧäřģęŧ ƒőř ŧĥę čőřřęľäŧįőʼn (Ŝŧęp 2 őƒ 3)"
+    },
+    "trans-details": {
+      "logfmt-description": "Päřşę přővįđęđ ƒįęľđ ŵįŧĥ ľőģƒmŧ ŧő ģęŧ väřįäþľęş",
+      "logfmt-label": "Ŀőģƒmŧ",
+      "regex-description": "Fįęľđ ŵįľľ þę päřşęđ ŵįŧĥ řęģęχ. Ůşę ʼnämęđ čäpŧūřę ģřőūpş ŧő řęŧūřʼn mūľŧįpľę väřįäþľęş, őř ä şįʼnģľę ūʼnʼnämęđ čäpŧūřę ģřőūp ŧő äđđ väřįäþľę ŧő ʼnämęđ mäp väľūę. Ŗęģęχ įş čäşę įʼnşęʼnşįŧįvę.",
+      "regex-expression": "Ůşę čäpŧūřę ģřőūpş ŧő ęχŧřäčŧ ä pőřŧįőʼn őƒ ŧĥę ƒįęľđ.",
+      "regex-label": "Ŗęģūľäř ęχpřęşşįőʼn",
+      "regex-map-values": "Đęƒįʼnęş ŧĥę ʼnämę őƒ ŧĥę väřįäþľę įƒ ŧĥę čäpŧūřę ģřőūp įş ʼnőŧ ʼnämęđ."
+    },
+    "transform": {
+      "add-button": "Åđđ ŧřäʼnşƒőřmäŧįőʼn",
+      "heading": "Ŧřäʼnşƒőřmäŧįőʼnş",
+      "no-transform": "Ńő ŧřäʼnşƒőřmäŧįőʼnş đęƒįʼnęđ."
+    },
+    "transform-row": {
+      "expression-label": "Ēχpřęşşįőʼn",
+      "expression-required": "Pľęäşę đęƒįʼnę äʼn ęχpřęşşįőʼn",
+      "expression-tooltip": "Ŗęqūįřęđ ƒőř řęģūľäř ęχpřęşşįőʼn. Ŧĥę ęχpřęşşįőʼn ŧĥę ŧřäʼnşƒőřmäŧįőʼn ŵįľľ ūşę. Ŀőģƒmŧ đőęş ʼnőŧ ūşę ƒūřŧĥęř şpęčįƒįčäŧįőʼnş.",
+      "field-input": "ƒįęľđ",
+      "field-label": "Fįęľđ",
+      "field-tooltip": "Øpŧįőʼnäľ. Ŧĥę ƒįęľđ ŧő ŧřäʼnşƒőřm. Ĩƒ ʼnőŧ şpęčįƒįęđ, ŧĥę ŧřäʼnşƒőřmäŧįőʼn ŵįľľ þę äppľįęđ ŧő ŧĥę řęşūľŧş ƒįęľđ.",
+      "map-value-label": "Mäp väľūę",
+      "map-value-tooltip": "Øpŧįőʼnäľ. Đęƒįʼnęş ŧĥę ʼnämę őƒ ŧĥę väřįäþľę. Ŧĥįş įş čūřřęʼnŧľy őʼnľy väľįđ ƒőř řęģūľäř ęχpřęşşįőʼnş ŵįŧĥ ä şįʼnģľę, ūʼnʼnämęđ čäpŧūřę ģřőūp.",
+      "remove-button": "Ŗęmővę",
+      "remove-tooltip": "Ŗęmővę ŧřäʼnşƒőřmäŧįőʼn",
+      "transform-required": "Pľęäşę şęľęčŧ ä ŧřäʼnşƒőřmäŧįőʼn ŧypę",
+      "type-label": "Ŧypę",
+      "type-tooltip": "Ŧĥę ŧypę őƒ ŧřäʼnşƒőřmäŧįőʼn ŧĥäŧ ŵįľľ þę äppľįęđ ŧő ŧĥę şőūřčę đäŧä."
+    }
   },
   "dashboard": {
     "add-menu": {
@@ -158,6 +243,10 @@
       "visualization": "Vįşūäľįžäŧįőʼn",
       "widget": "Ŵįđģęŧ"
     },
+    "alert-rules-drawer": {
+      "redirect-link": "Ŀįşŧ įʼn Ğřäƒäʼnä Åľęřŧįʼnģ",
+      "subtitle": "Åľęřŧ řūľęş řęľäŧęđ ŧő ŧĥįş đäşĥþőäřđ"
+    },
     "empty": {
       "add-library-panel-body": "Åđđ vįşūäľįžäŧįőʼnş ŧĥäŧ äřę şĥäřęđ ŵįŧĥ őŧĥęř đäşĥþőäřđş.",
       "add-library-panel-button": "Åđđ ľįþřäřy päʼnęľ",
@@ -226,7 +315,7 @@
     },
     "toolbar": {
       "add": "Åđđ",
-      "add-panel": "Åđđ päʼnęľ",
+      "alert-rules": "Åľęřŧ řūľęş",
       "mark-favorite": "Mäřĸ äş ƒävőřįŧę",
       "open-original": "Øpęʼn őřįģįʼnäľ đäşĥþőäřđ",
       "playlist-next": "Ğő ŧő ʼnęχŧ đäşĥþőäřđ",
@@ -236,6 +325,7 @@
       "save": "Ŝävę đäşĥþőäřđ",
       "settings": "Đäşĥþőäřđ şęŧŧįʼnģş",
       "share": "Ŝĥäřę đäşĥþőäřđ",
+      "share-button": "Ŝĥäřę",
       "unmark-favorite": "Ůʼnmäřĸ äş ƒävőřįŧę"
     },
     "validation": {
@@ -335,10 +425,122 @@
   "data-sources": {
     "datasource-add-button": {
       "label": "Åđđ ʼnęŵ đäŧä şőūřčę"
+    },
+    "empty-state": {
+      "message": "Ńő đäŧä şőūřčęş ƒőūʼnđ"
     }
   },
   "explore": {
     "add-to-dashboard": "Åđđ ŧő đäşĥþőäřđ",
+    "rich-history": {
+      "close-tooltip": "Cľőşę qūęřy ĥįşŧőřy",
+      "datasource-a-z": "Đäŧä şőūřčę Å-Ż",
+      "datasource-z-a": "Đäŧä şőūřčę Ż-Å",
+      "newest-first": "Ńęŵęşŧ ƒįřşŧ",
+      "oldest-first": "Øľđęşŧ ƒįřşŧ",
+      "query-history": "Qūęřy ĥįşŧőřy",
+      "settings": "Ŝęŧŧįʼnģş",
+      "starred": "Ŝŧäřřęđ"
+    },
+    "rich-history-card": {
+      "add-comment-form": "Åđđ čőmmęʼnŧ ƒőřm",
+      "add-comment-tooltip": "Åđđ čőmmęʼnŧ",
+      "cancel": "Cäʼnčęľ",
+      "confirm-delete": "Đęľęŧę",
+      "copy-query-tooltip": "Cőpy qūęřy ŧő čľįpþőäřđ",
+      "copy-shortened-link-tooltip": "Cőpy şĥőřŧęʼnęđ ľįʼnĸ ŧő čľįpþőäřđ",
+      "datasource-icon-label": "Đäŧä şőūřčę įčőʼn",
+      "datasource-name-label": "Đäŧä şőūřčę ʼnämę",
+      "datasource-not-exist": "Đäŧä şőūřčę đőęş ʼnőŧ ęχįşŧ äʼnymőřę",
+      "delete-query-confirmation-title": "Đęľęŧę",
+      "delete-query-title": "Đęľęŧę qūęřy",
+      "delete-query-tooltip": "Đęľęŧę qūęřy",
+      "delete-starred-query-confirmation-text": "Åřę yőū şūřę yőū ŵäʼnŧ ŧő pęřmäʼnęʼnŧľy đęľęŧę yőūř şŧäřřęđ qūęřy?",
+      "edit-comment-tooltip": "Ēđįŧ čőmmęʼnŧ",
+      "loading-text": "ľőäđįʼnģ...",
+      "optional-description": "Åʼn őpŧįőʼnäľ đęşčřįpŧįőʼn őƒ ŵĥäŧ ŧĥę qūęřy đőęş.",
+      "query-comment-label": "Qūęřy čőmmęʼnŧ",
+      "query-text-label": "Qūęřy ŧęχŧ",
+      "run-query-button": "Ŗūʼn qūęřy",
+      "save-comment": "Ŝävę čőmmęʼnŧ",
+      "star-query-tooltip": "Ŝŧäř qūęřy",
+      "switch-datasource-button": "Ŝŵįŧčĥ đäŧä şőūřčę äʼnđ řūʼn qūęřy",
+      "unstar-query-tooltip": "Ůʼnşŧäř qūęřy",
+      "update-comment-form": "Ůpđäŧę čőmmęʼnŧ ƒőřm"
+    },
+    "rich-history-container": {
+      "loading": "Ŀőäđįʼnģ..."
+    },
+    "rich-history-notification": {
+      "query-copied": "Qūęřy čőpįęđ ŧő čľįpþőäřđ",
+      "query-deleted": "Qūęřy đęľęŧęđ"
+    },
+    "rich-history-queries-tab": {
+      "displaying-partial-queries": "Đįşpľäyįʼnģ {{ count }} qūęřįęş",
+      "displaying-queries": "{{ count }} qūęřįęş",
+      "filter-aria-label": "Fįľŧęř qūęřįęş ƒőř đäŧä şőūřčęş(ş)",
+      "filter-history": "Fįľŧęř ĥįşŧőřy",
+      "filter-placeholder": "Fįľŧęř qūęřįęş ƒőř đäŧä şőūřčęş(ş)",
+      "history-local": "Ŧĥę ĥįşŧőřy įş ľőčäľ ŧő yőūř þřőŵşęř äʼnđ įş ʼnőŧ şĥäřęđ ŵįŧĥ őŧĥęřş.",
+      "loading": "Ŀőäđįʼnģ...",
+      "loading-results": "Ŀőäđįʼnģ řęşūľŧş...",
+      "search-placeholder": "Ŝęäřčĥ qūęřįęş",
+      "showing-queries": "Ŝĥőŵįʼnģ {{ shown }} őƒ {{ total }} <0>Ŀőäđ mőřę</0>",
+      "sort-aria-label": "Ŝőřŧ qūęřįęş",
+      "sort-placeholder": "Ŝőřŧ qūęřįęş þy"
+    },
+    "rich-history-settings-tab": {
+      "alert-info": "Ğřäƒäʼnä ŵįľľ ĸęęp ęʼnŧřįęş ūp ŧő {{optionLabel}}.Ŝŧäřřęđ ęʼnŧřįęş ŵőʼn'ŧ þę đęľęŧęđ.",
+      "change-default-tab": "Cĥäʼnģę ŧĥę đęƒäūľŧ äčŧįvę ŧäþ ƒřőm “Qūęřy ĥįşŧőřy” ŧő “Ŝŧäřřęđ”",
+      "clear-history-info": "Đęľęŧę äľľ őƒ yőūř qūęřy ĥįşŧőřy, pęřmäʼnęʼnŧľy.",
+      "clear-query-history": "Cľęäř qūęřy ĥįşŧőřy",
+      "clear-query-history-button": "Cľęäř qūęřy ĥįşŧőřy",
+      "delete-confirm": "Đęľęŧę",
+      "delete-confirm-text": "Åřę yőū şūřę yőū ŵäʼnŧ ŧő pęřmäʼnęʼnŧľy đęľęŧę yőūř qūęřy ĥįşŧőřy?",
+      "delete-title": "Đęľęŧę",
+      "history-time-span": "Ħįşŧőřy ŧįmę şpäʼn",
+      "history-time-span-description": "Ŝęľęčŧ ŧĥę pęřįőđ őƒ ŧįmę ƒőř ŵĥįčĥ Ğřäƒäʼnä ŵįľľ şävę yőūř qūęřy ĥįşŧőřy. Ůp ŧő {{MAX_HISTORY_ITEMS}} ęʼnŧřįęş ŵįľľ þę şŧőřęđ.",
+      "only-show-active-datasource": "Øʼnľy şĥőŵ qūęřįęş ƒőř đäŧä şőūřčę čūřřęʼnŧľy äčŧįvę įʼn Ēχpľőřę",
+      "query-history-deleted": "Qūęřy ĥįşŧőřy đęľęŧęđ",
+      "retention-period": {
+        "1-week": "1 ŵęęĸ",
+        "2-days": "2 đäyş",
+        "2-weeks": "2 ŵęęĸş",
+        "5-days": "5 đäyş"
+      }
+    },
+    "rich-history-starred-tab": {
+      "filter-queries-aria-label": "Fįľŧęř qūęřįęş ƒőř đäŧä şőūřčęş(ş)",
+      "filter-queries-placeholder": "Fįľŧęř qūęřįęş ƒőř đäŧä şőūřčęş(ş)",
+      "loading": "Ŀőäđįʼnģ...",
+      "loading-results": "Ŀőäđįʼnģ řęşūľŧş...",
+      "local-history-message": "Ŧĥę ĥįşŧőřy įş ľőčäľ ŧő yőūř þřőŵşęř äʼnđ įş ʼnőŧ şĥäřęđ ŵįŧĥ őŧĥęřş.",
+      "search-queries-placeholder": "Ŝęäřčĥ qūęřįęş",
+      "showing-queries": "Ŝĥőŵįʼnģ {{ shown }} őƒ {{ total }} <0>Ŀőäđ mőřę</0>",
+      "sort-queries-aria-label": "Ŝőřŧ qūęřįęş",
+      "sort-queries-placeholder": "Ŝőřŧ qūęřįęş þy"
+    },
+    "rich-history-utils": {
+      "a-week-ago": "ä ŵęęĸ äģő",
+      "days-ago": "{{num}} đäyş äģő",
+      "default-from": "ʼnőŵ-1ĥ",
+      "default-to": "ʼnőŵ",
+      "today": "ŧőđäy",
+      "two-weeks-ago": "ŧŵő ŵęęĸş äģő",
+      "yesterday": "yęşŧęřđäy"
+    },
+    "rich-history-utils-notification": {
+      "saving-failed": "Ŝävįʼnģ řįčĥ ĥįşŧőřy ƒäįľęđ",
+      "update-failed": "Ŗįčĥ Ħįşŧőřy ūpđäŧę ƒäįľęđ"
+    },
+    "secondary-actions": {
+      "query-add-button": "Åđđ qūęřy",
+      "query-add-button-aria-label": "Åđđ qūęřy",
+      "query-history-button": "Qūęřy ĥįşŧőřy",
+      "query-history-button-aria-label": "Qūęřy ĥįşŧőřy",
+      "query-inspector-button": "Qūęřy įʼnşpęčŧőř",
+      "query-inspector-button-aria-label": "Qūęřy įʼnşpęčŧőř"
+    },
     "table": {
       "no-data": "0 şęřįęş řęŧūřʼnęđ",
       "title": "Ŧäþľę",
@@ -346,7 +548,13 @@
     },
     "toolbar": {
       "aria-label": "Ēχpľőřę ŧőőľþäř",
-      "copy-shortened-link": "Cőpy şĥőřŧęʼnęđ ľįʼnĸ",
+      "copy-link": "Cőpy ŮŖĿ",
+      "copy-link-abs-time": "Cőpy äþşőľūŧę ŮŖĿ",
+      "copy-links-absolute-category": "Ŧįmę-şyʼnč ŮŖĿ ľįʼnĸş (şĥäřę ŵįŧĥ ŧįmę řäʼnģę įʼnŧäčŧ)",
+      "copy-links-normal-category": "Ńőřmäľ ŮŖĿ ľįʼnĸş",
+      "copy-shortened-link": "Cőpy şĥőřŧęʼnęđ ŮŖĿ",
+      "copy-shortened-link-abs-time": "Cőpy äþşőľūŧę şĥőřŧęʼnęđ ŮŖĿ",
+      "copy-shortened-link-menu": "Øpęʼn şĥőřŧęʼnęđ ľįʼnĸ męʼnū",
       "refresh-picker-cancel": "Cäʼnčęľ",
       "refresh-picker-run": "Ŗūʼn qūęřy",
       "split-close": "Cľőşę",
@@ -361,6 +569,9 @@
     "loading": "Ŀőäđįʼnģ ƒőľđęřş..."
   },
   "grafana-ui": {
+    "drawer": {
+      "close": "Cľőşę"
+    },
     "modal": {
       "close-tooltip": "Cľőşę"
     },
@@ -392,6 +603,7 @@
     "shortcuts-description": {
       "change-theme": "Cĥäʼnģę ŧĥęmę",
       "collapse-all-rows": "Cőľľäpşę äľľ řőŵş",
+      "copy-time-range": "Cőpy ŧįmę řäʼnģę",
       "dashboard-settings": "Đäşĥþőäřđ şęŧŧįʼnģş",
       "duplicate-panel": "Đūpľįčäŧę Päʼnęľ",
       "exit-edit/setting-views": "Ēχįŧ ęđįŧ/şęŧŧįʼnģ vįęŵş",
@@ -405,6 +617,7 @@
       "move-time-range-forward": "Mővę ŧįmę řäʼnģę ƒőřŵäřđ",
       "open-search": "Øpęʼn şęäřčĥ",
       "open-shared-modal": "Øpęʼn Päʼnęľ Ŝĥäřę Mőđäľ",
+      "paste-time-range": "Päşŧę ŧįmę řäʼnģę",
       "refresh-all-panels": "Ŗęƒřęşĥ äľľ päʼnęľş",
       "remove-panel": "Ŗęmővę Päʼnęľ",
       "save-dashboard": "Ŝävę đäşĥþőäřđ",
@@ -446,6 +659,9 @@
     }
   },
   "library-panels": {
+    "empty-state": {
+      "message": "Ńő ľįþřäřy päʼnęľş ƒőūʼnđ"
+    },
     "modal": {
       "body_one": "Ŧĥįş päʼnęľ įş þęįʼnģ ūşęđ įʼn {{count}} đäşĥþőäřđ. Pľęäşę čĥőőşę ŵĥįčĥ đäşĥþőäřđ ŧő vįęŵ ŧĥę päʼnęľ įʼn:",
       "body_other": "Ŧĥįş päʼnęľ įş þęįʼnģ ūşęđ įʼn {{count}} đäşĥþőäřđş. Pľęäşę čĥőőşę ŵĥįčĥ đäşĥþőäřđ ŧő vįęŵ ŧĥę päʼnęľ įʼn:",
@@ -468,6 +684,144 @@
       "invalid-user-or-password": "Ĩʼnväľįđ ūşęřʼnämę őř päşşŵőřđ",
       "title": "Ŀőģįʼn ƒäįľęđ",
       "unknown": "Ůʼnĸʼnőŵʼn ęřřőř őččūřřęđ"
+    },
+    "forgot-password": "Főřģőŧ yőūř päşşŵőřđ?",
+    "form": {
+      "password-label": "Päşşŵőřđ",
+      "password-required": "Päşşŵőřđ įş řęqūįřęđ",
+      "submit-label": "Ŀőģ įʼn",
+      "submit-loading-label": "Ŀőģģįʼnģ įʼn...",
+      "username-label": "Ēmäįľ őř ūşęřʼnämę",
+      "username-required": "Ēmäįľ őř ūşęřʼnämę įş řęqūįřęđ"
+    },
+    "services": {
+      "sing-in-with-prefix": "Ŝįģʼn įʼn ŵįŧĥ {{serviceName}}"
+    },
+    "signup": {
+      "button-label": "Ŝįģʼn ūp",
+      "new-to-question": "Ńęŵ ŧő Ğřäƒäʼnä?"
+    }
+  },
+  "migrate-to-cloud": {
+    "can-i-move": {
+      "body": "Øʼnčę yőū čőʼnʼnęčŧ ŧĥįş įʼnşŧäľľäŧįőʼn ŧő ä čľőūđ şŧäčĸ, yőū'ľľ þę äþľę ŧő ūpľőäđ đäŧä şőūřčęş äʼnđ đäşĥþőäřđş.",
+      "link-title": "Ŀęäřʼn äþőūŧ mįģřäŧįʼnģ őŧĥęř şęŧŧįʼnģş",
+      "title": "Cäʼn Ĩ mővę ŧĥįş įʼnşŧäľľäŧįőʼn ŧő Ğřäƒäʼnä Cľőūđ?"
+    },
+    "connect-modal": {
+      "body-cloud-stack": "Ÿőū'ľľ äľşő ʼnęęđ ä čľőūđ şŧäčĸ. Ĩƒ yőū ĵūşŧ şįģʼnęđ ūp, ŵę'ľľ äūŧőmäŧįčäľľy čřęäŧę yőūř ƒįřşŧ şŧäčĸ. Ĩƒ yőū ĥävę äʼn äččőūʼnŧ, yőū'ľľ ʼnęęđ ŧő şęľęčŧ őř čřęäŧę ä şŧäčĸ.",
+      "body-get-started": "Ŧő ģęŧ şŧäřŧęđ, yőū'ľľ ʼnęęđ ä Ğřäƒäʼnä.čőm äččőūʼnŧ.",
+      "body-paste-stack": "Øʼnčę yőū'vę đęčįđęđ őʼn ä şŧäčĸ, päşŧę ŧĥę ŮŖĿ þęľőŵ.",
+      "body-sign-up": "Ŝįģʼn ūp ƒőř ä Ğřäƒäʼnä.čőm äččőūʼnŧ",
+      "body-token": "Ÿőūř şęľƒ-mäʼnäģęđ Ğřäƒäʼnä įʼnşŧäľľäŧįőʼn ʼnęęđş şpęčįäľ äččęşş ŧő şęčūřęľy mįģřäŧę čőʼnŧęʼnŧ. Ÿőū'ľľ ʼnęęđ ŧő čřęäŧę ä mįģřäŧįőʼn ŧőĸęʼn őʼn yőūř čĥőşęʼn čľőūđ şŧäčĸ.",
+      "body-token-field": "Mįģřäŧįőʼn ŧőĸęʼn",
+      "body-token-field-placeholder": "Päşŧę ŧőĸęʼn ĥęřę",
+      "body-token-instructions": "Ŀőģ įʼnŧő yőūř čľőūđ şŧäčĸ äʼnđ ʼnävįģäŧę ŧő Åđmįʼnįşŧřäŧįőʼn, Ğęʼnęřäľ, Mįģřäŧę ŧő Ğřäƒäʼnä Cľőūđ. Cřęäŧę ä mįģřäŧįőʼn ŧőĸęʼn őʼn ŧĥäŧ şčřęęʼn äʼnđ päşŧę ŧĥę ŧőĸęʼn ĥęřę.",
+      "body-url-field": "Cľőūđ şŧäčĸ ŮŖĿ",
+      "body-view-stacks": "Vįęŵ my čľőūđ şŧäčĸş",
+      "cancel": "Cäʼnčęľ",
+      "connect": "Cőʼnʼnęčŧ ŧő ŧĥįş şŧäčĸ",
+      "connecting": "Cőʼnʼnęčŧįʼnģ ŧő ŧĥįş şŧäčĸ...",
+      "stack-required-error": "Ŝŧäčĸ ŮŖĿ įş řęqūįřęđ",
+      "title": "Cőʼnʼnęčŧ ŧő ä čľőūđ şŧäčĸ",
+      "token-error-description": "Ŧĥęřę ŵäş äʼn ęřřőř şävįʼnģ ŧĥę ŧőĸęʼn. Ŝęę ŧĥę Ğřäƒäʼnä şęřvęř ľőģş ƒőř mőřę đęŧäįľş.",
+      "token-error-title": "Ēřřőř şävįʼnģ ŧőĸęʼn",
+      "token-required-error": "Mįģřäŧįőʼn ŧőĸęʼn įş řęqūįřęđ"
+    },
+    "cta": {
+      "button": "Mįģřäŧę ŧĥįş įʼnşŧäʼnčę ŧő Cľőūđ",
+      "header": "Ŀęŧ ūş mäʼnäģę yőūř Ğřäƒäʼnä şŧäčĸ"
+    },
+    "disconnect-modal": {
+      "body": "Ŧĥįş ŵįľľ řęmővę ŧĥę mįģřäŧįőʼn ŧőĸęʼn ƒřőm ŧĥįş įʼnşŧäľľäŧįőʼn. Ĩƒ yőū ŵįşĥ ŧő ūpľőäđ mőřę řęşőūřčęş įʼn ŧĥę ƒūŧūřę, yőū ŵįľľ ʼnęęđ ŧő ęʼnŧęř ä ʼnęŵ mįģřäŧįőʼn ŧőĸęʼn.",
+      "cancel": "Cäʼnčęľ",
+      "disconnect": "Đįşčőʼnʼnęčŧ",
+      "disconnecting": "Đįşčőʼnʼnęčŧįʼnģ...",
+      "error": "Ŧĥęřę ŵäş äʼn ęřřőř đįşčőʼnʼnęčŧįʼnģ",
+      "title": "Đįşčőʼnʼnęčŧ ƒřőm čľőūđ şŧäčĸ"
+    },
+    "get-started": {
+      "body": "Ŧĥę mįģřäŧįőʼn přőčęşş mūşŧ þę şŧäřŧęđ ƒřőm yőūř şęľƒ-mäʼnäģęđ Ğřäƒäʼnä įʼnşŧäʼnčę.",
+      "configure-pdc-link": "Cőʼnƒįģūřę PĐC ƒőř ŧĥįş şŧäčĸ",
+      "link-title": "Ŀęäřʼn mőřę äþőūŧ Přįväŧę Đäŧä Ŝőūřčę Cőʼnʼnęčŧ",
+      "step-1": "Ŀőģ įʼn ŧő yőūř şęľƒ-mäʼnäģęđ įʼnşŧäʼnčę äʼnđ ʼnävįģäŧę ŧő Åđmįʼnįşŧřäŧįőʼn, Ğęʼnęřäľ, Mįģřäŧę ŧő Ğřäƒäʼnä Cľőūđ.",
+      "step-2": "Ŝęľęčŧ \"Mįģřäŧę ŧĥįş įʼnşŧäʼnčę ŧő Cľőūđ\".",
+      "step-3": "Ÿőū'ľľ þę přőmpŧęđ ƒőř ä mįģřäŧįőʼn ŧőĸęʼn. Ğęʼnęřäŧę őʼnę ƒřőm ŧĥįş şčřęęʼn.",
+      "step-4": "Ĩʼn yőūř şęľƒ-mäʼnäģęđ įʼnşŧäʼnčę, şęľęčŧ \"Ůpľőäđ ęvęřyŧĥįʼnģ\" ŧő ūpľőäđ đäŧä şőūřčęş äʼnđ đäşĥþőäřđş ŧő ŧĥįş čľőūđ şŧäčĸ.",
+      "step-5": "Ĩƒ şőmę őƒ yőūř đäŧä şőūřčęş ŵįľľ ʼnőŧ ŵőřĸ ővęř ŧĥę pūþľįč įʼnŧęřʼnęŧ, yőū’ľľ ʼnęęđ ŧő įʼnşŧäľľ Přįväŧę Đäŧä Ŝőūřčę Cőʼnʼnęčŧ įʼn yőūř şęľƒ-mäʼnäģęđ ęʼnvįřőʼnmęʼnŧ.",
+      "title": "Ħőŵ ŧő ģęŧ şŧäřŧęđ"
+    },
+    "is-it-secure": {
+      "body": "Ğřäƒäʼnä Ŀäþş įş čőmmįŧŧęđ ŧő mäįʼnŧäįʼnįʼnģ ŧĥę ĥįģĥęşŧ şŧäʼnđäřđş őƒ đäŧä přįväčy äʼnđ şęčūřįŧy. ßy įmpľęmęʼnŧįʼnģ įʼnđūşŧřy-şŧäʼnđäřđ şęčūřįŧy ŧęčĥʼnőľőģįęş äʼnđ přőčęđūřęş, ŵę ĥęľp přőŧęčŧ őūř čūşŧőmęřş' đäŧä ƒřőm ūʼnäūŧĥőřįžęđ äččęşş, ūşę, őř đįşčľőşūřę.",
+      "link-title": "Ğřäƒäʼnä Ŀäþş Ŧřūşŧ Cęʼnŧęř",
+      "title": "Ĩş įŧ şęčūřę?"
+    },
+    "migrate-to-this-stack": {
+      "body": "Ŝőmę čőʼnƒįģūřäŧįőʼn ƒřőm yőūř şęľƒ-mäʼnäģęđ Ğřäƒäʼnä įʼnşŧäʼnčę čäʼn þę äūŧőmäŧįčäľľy čőpįęđ ŧő ŧĥįş čľőūđ şŧäčĸ.",
+      "link-title": "Vįęŵ ŧĥę ƒūľľ mįģřäŧįőʼn ģūįđę",
+      "title": "Mįģřäŧę čőʼnƒįģūřäŧįőʼn ŧő ŧĥįş şŧäčĸ"
+    },
+    "migration-token": {
+      "body": "Ÿőūř şęľƒ-mäʼnäģęđ Ğřäƒäʼnä įʼnşŧäʼnčę ŵįľľ řęqūįřę ä şpęčįäľ äūŧĥęʼnŧįčäŧįőʼn ŧőĸęʼn ŧő şęčūřęľy čőʼnʼnęčŧ ŧő ŧĥįş čľőūđ şŧäčĸ.",
+      "delete-button": "Đęľęŧę ŧĥįş mįģřäŧįőʼn ŧőĸęʼn",
+      "delete-modal-body": "Ĩƒ yőū'vę äľřęäđy ūşęđ ŧĥįş ŧőĸęʼn ŵįŧĥ ä şęľƒ-mäʼnäģęđ įʼnşŧäľľäŧįőʼn, ŧĥäŧ įʼnşŧäľľäŧįőʼn ŵįľľ ʼnő ľőʼnģęř þę äþľę ŧő ūpľőäđ čőʼnŧęʼnŧ.",
+      "delete-modal-cancel": "Cäʼnčęľ",
+      "delete-modal-confirm": "Đęľęŧę",
+      "delete-modal-deleting": "Đęľęŧįʼnģ...",
+      "delete-modal-title": "Đęľęŧę mįģřäŧįőʼn ŧőĸęʼn",
+      "generate-button": "Ğęʼnęřäŧę ä mįģřäŧįőʼn ŧőĸęʼn",
+      "generate-button-loading": "Ğęʼnęřäŧįʼnģ ä mįģřäŧįőʼn ŧőĸęʼn...",
+      "modal-close": "Cľőşę",
+      "modal-copy-and-close": "Cőpy ŧő čľįpþőäřđ äʼnđ čľőşę",
+      "modal-copy-button": "Cőpy ŧő čľįpþőäřđ",
+      "modal-field-description": "Cőpy ŧĥę ŧőĸęʼn ʼnőŵ äş yőū ŵįľľ ʼnőŧ þę äþľę ŧő şęę įŧ äģäįʼn. Ŀőşįʼnģ ä ŧőĸęʼn řęqūįřęş čřęäŧįʼnģ ä ʼnęŵ őʼnę.",
+      "modal-field-label": "Ŧőĸęʼn",
+      "modal-title": "Mįģřäŧįőʼn ŧőĸęʼn čřęäŧęđ",
+      "status": "Cūřřęʼnŧ şŧäŧūş: <2></2>",
+      "title": "Mįģřäŧįőʼn ŧőĸęʼn"
+    },
+    "pdc": {
+      "body": "Ēχpőşįʼnģ yőūř đäŧä şőūřčęş ŧő ŧĥę įʼnŧęřʼnęŧ čäʼn řäįşę şęčūřįŧy čőʼnčęřʼnş. Přįväŧę đäŧä şőūřčę čőʼnʼnęčŧ (PĐC) äľľőŵş Ğřäƒäʼnä Cľőūđ ŧő äččęşş yőūř ęχįşŧįʼnģ đäŧä şőūřčęş ővęř ä şęčūřę ʼnęŧŵőřĸ ŧūʼnʼnęľ.",
+      "link-title": "Ŀęäřʼn äþőūŧ PĐC",
+      "title": "Ńőŧ äľľ my đäŧä şőūřčęş äřę őʼn ŧĥę pūþľįč įʼnŧęřʼnęŧ"
+    },
+    "pricing": {
+      "body": "Ğřäƒäʼnä Cľőūđ ĥäş ä ģęʼnęřőūş ƒřęę pľäʼn äʼnđ ä 14 đäy ūʼnľįmįŧęđ ūşäģę ŧřįäľ. Ńŧęř yőūř ŧřįäľ ęχpįřęş, yőū'ľľ þę þįľľęđ þäşęđ őʼn ūşäģę ővęř ŧĥę ƒřęę pľäʼn ľįmįŧş.",
+      "link-title": "Ğřäƒäʼnä Cľőūđ přįčįʼnģ",
+      "title": "Ħőŵ mūčĥ đőęş įŧ čőşŧ?"
+    },
+    "resource-status": {
+      "error-details-button": "Đęŧäįľş",
+      "failed": "Ēřřőř",
+      "migrated": "Ůpľőäđęđ ŧő čľőūđ",
+      "migrating": "Ůpľőäđįʼnģ...",
+      "not-migrated": "Ńőŧ yęŧ ūpľőäđęđ",
+      "unknown": "Ůʼnĸʼnőŵʼn"
+    },
+    "resource-type": {
+      "dashboard": "Đäşĥþőäřđ",
+      "datasource": "Đäŧä şőūřčę",
+      "unknown": "Ůʼnĸʼnőŵʼn"
+    },
+    "summary": {
+      "disconnect": "Đįşčőʼnʼnęčŧ",
+      "error-starting-migration": "Ŧĥęřę ŵäş äʼn ęřřőř şŧäřŧįʼnģ čľőūđ mįģřäŧįőʼn",
+      "start-migration": "Ůpľőäđ ęvęřyŧĥįʼnģ",
+      "target-stack-title": "Ůpľőäđįʼnģ ŧő"
+    },
+    "token-status": {
+      "active": "Ŧőĸęʼn čřęäŧęđ äʼnđ äčŧįvę",
+      "no-active": "Ńő äčŧįvę ŧőĸęʼn"
+    },
+    "what-is-cloud": {
+      "body": "Ğřäƒäʼnä čľőūđ įş ä ƒūľľy mäʼnäģęđ čľőūđ-ĥőşŧęđ őþşęřväþįľįŧy pľäŧƒőřm įđęäľ ƒőř čľőūđ ʼnäŧįvę ęʼnvįřőʼnmęʼnŧş. Ĩŧ'ş ęvęřyŧĥįʼnģ yőū ľővę äþőūŧ Ğřäƒäʼnä ŵįŧĥőūŧ ŧĥę ővęřĥęäđ őƒ mäįʼnŧäįʼnįʼnģ, ūpģřäđįʼnģ, äʼnđ şūppőřŧįʼnģ äʼn įʼnşŧäľľäŧįőʼn.",
+      "link-title": "Ŀęäřʼn äþőūŧ čľőūđ ƒęäŧūřęş",
+      "title": "Ŵĥäŧ įş Ğřäƒäʼnä Cľőūđ?"
+    },
+    "why-host": {
+      "body": "Ĩʼn äđđįŧįőʼn ŧő ŧĥę čőʼnvęʼnįęʼnčę őƒ mäʼnäģęđ ĥőşŧįʼnģ, Ğřäƒäʼnä Cľőūđ įʼnčľūđęş mäʼny čľőūđ-ęχčľūşįvę ƒęäŧūřęş ľįĸę ŜĿØş, įʼnčįđęʼnŧ mäʼnäģęmęʼnŧ, mäčĥįʼnę ľęäřʼnįʼnģ, äʼnđ pőŵęřƒūľ őþşęřväþįľįŧy įʼnŧęģřäŧįőʼnş.",
+      "link-title": "Mőřę qūęşŧįőʼnş? Ŧäľĸ ŧő äʼn ęχpęřŧ",
+      "title": "Ŵĥy ĥőşŧ ŵįŧĥ Ğřäƒäʼnä?"
     }
   },
   "nav": {
@@ -478,6 +832,9 @@
       "subtitle": "Mäʼnäģę şęřvęř-ŵįđę şęŧŧįʼnģş äʼnđ äččęşş ŧő řęşőūřčęş şūčĥ äş őřģäʼnįžäŧįőʼnş, ūşęřş, äʼnđ ľįčęʼnşęş",
       "title": "Ŝęřvęř äđmįʼn"
     },
+    "alert-list-legacy": {
+      "title": "Åľęřŧ řūľęş"
+    },
     "alerting": {
       "subtitle": "Ŀęäřʼn äþőūŧ přőþľęmş įʼn yőūř şyşŧęmş mőmęʼnŧş äƒŧęř ŧĥęy őččūř",
       "title": "Åľęřŧįʼnģ"
@@ -514,6 +871,10 @@
       "subtitle": "Ŝŧőp ʼnőŧįƒįčäŧįőʼnş ƒřőm őʼnę őř mőřę äľęřŧįʼnģ řūľęş",
       "title": "Ŝįľęʼnčęş"
     },
+    "alerting-upgrade": {
+      "subtitle": "Ůpģřäđę yőūř ęχįşŧįʼnģ ľęģäčy äľęřŧş äʼnđ ʼnőŧįƒįčäŧįőʼn čĥäʼnʼnęľş ŧő ŧĥę ʼnęŵ Ğřäƒäʼnä Åľęřŧįʼnģ",
+      "title": "Åľęřŧįʼnģ ūpģřäđę"
+    },
     "alerts-and-incidents": {
       "subtitle": "Åľęřŧįʼnģ äʼnđ įʼnčįđęʼnŧ mäʼnäģęmęʼnŧ äppş",
       "title": "Åľęřŧş & ĨŖM"
@@ -523,7 +884,7 @@
       "title": "ÅPĨ ĸęyş"
     },
     "application": {
-      "title": "Åppľįčäŧįőʼn (přęvįęŵ)"
+      "title": "Åppľįčäŧįőʼn"
     },
     "apps": {
       "subtitle": "Åpp pľūģįʼnş ŧĥäŧ ęχŧęʼnđ ŧĥę Ğřäƒäʼnä ęχpęřįęʼnčę",
@@ -532,6 +893,9 @@
     "authentication": {
       "title": "Åūŧĥęʼnŧįčäŧįőʼn"
     },
+    "collector": {
+      "title": "Cőľľęčŧőř"
+    },
     "config": {
       "title": "Åđmįʼnįşŧřäŧįőʼn"
     },
@@ -592,6 +956,10 @@
       "title": "Ēχpľőřę"
     },
     "frontend": {
+      "subtitle": "Ğäįʼn řęäľ ūşęř mőʼnįŧőřįʼnģ įʼnşįģĥŧş",
+      "title": "Fřőʼnŧęʼnđ"
+    },
+    "frontend-app": {
       "title": "Fřőʼnŧęʼnđ"
     },
     "global-orgs": {
@@ -619,8 +987,15 @@
       "title": "Ĩʼnčįđęʼnŧş"
     },
     "infrastructure": {
+      "subtitle": "Ůʼnđęřşŧäʼnđ yőūř įʼnƒřäşŧřūčŧūřę'ş ĥęäľŧĥ",
+      "title": "Ĩʼnƒřäşŧřūčŧūřę"
+    },
+    "integrations": {
       "title": "Ĩʼnŧęģřäŧįőʼnş"
     },
+    "k6": {
+      "title": "Pęřƒőřmäʼnčę"
+    },
     "kubernetes": {
       "title": "Ķūþęřʼnęŧęş"
     },
@@ -634,6 +1009,10 @@
     "manage-folder": {
       "subtitle": "Mäʼnäģę ƒőľđęř đäşĥþőäřđş äʼnđ pęřmįşşįőʼnş"
     },
+    "migrate-to-cloud": {
+      "subtitle": "Cőpy čőʼnƒįģūřäŧįőʼn ƒřőm yőūř şęľƒ-mäʼnäģęđ įʼnşŧäľľäŧįőʼn ŧő ä čľőūđ şŧäčĸ",
+      "title": "Mįģřäŧę ŧő Ğřäƒäʼnä Cľőūđ"
+    },
     "monitoring": {
       "subtitle": "Mőʼnįŧőřįʼnģ äʼnđ įʼnƒřäşŧřūčŧūřę äppş",
       "title": "Øþşęřväþįľįŧy"
@@ -657,9 +1036,6 @@
       "subtitle": "Mäʼnäģę přęƒęřęʼnčęş äčřőşş äʼn őřģäʼnįžäŧįőʼn",
       "title": "Đęƒäūľŧ přęƒęřęʼnčęş"
     },
-    "performance-testing": {
-      "title": "Pęřƒőřmäʼnčę ŧęşŧįʼnģ"
-    },
     "playlists": {
       "subtitle": "Ğřőūpş őƒ đäşĥþőäřđş ŧĥäŧ äřę đįşpľäyęđ įʼn ä şęqūęʼnčę",
       "title": "Pľäyľįşŧş"
@@ -668,6 +1044,10 @@
       "subtitle": "Ēχŧęʼnđ ŧĥę Ğřäƒäʼnä ęχpęřįęʼnčę ŵįŧĥ pľūģįʼnş",
       "title": "Pľūģįʼnş"
     },
+    "private-data-source-connections": {
+      "subtitle": "Qūęřy đäŧä ŧĥäŧ ľįvęş ŵįŧĥįʼn ä şęčūřęđ ʼnęŧŵőřĸ ŵįŧĥőūŧ őpęʼnįʼnģ ŧĥę ʼnęŧŵőřĸ ŧő įʼnþőūʼnđ ŧř䃃įč ƒřőm Ğřäƒäʼnä Cľőūđ. Ŀęäřʼn mőřę įʼn őūř đőčş.",
+      "title": "Přįväŧę đäŧä şőūřčę čőʼnʼnęčŧ"
+    },
     "profile/notifications": {
       "title": "Ńőŧįƒįčäŧįőʼn ĥįşŧőřy"
     },
@@ -740,6 +1120,10 @@
       "subtitle": "Ğřőūpş őƒ ūşęřş ŧĥäŧ ĥävę čőmmőʼn đäşĥþőäřđ äʼnđ pęřmįşşįőʼn ʼnęęđş",
       "title": "Ŧęämş"
     },
+    "testing-and-synthetics": {
+      "subtitle": "Øpŧįmįžę pęřƒőřmäʼnčę ŵįŧĥ ĸ6 äʼnđ Ŝyʼnŧĥęŧįč Mőʼnįŧőřįʼnģ įʼnşįģĥŧş",
+      "title": "Ŧęşŧįʼnģ & şyʼnŧĥęŧįčş"
+    },
     "upgrading": {
       "title": "Ŝŧäŧş äʼnđ ľįčęʼnşę"
     },
@@ -755,15 +1139,20 @@
     "megamenu": {
       "close": "Cľőşę męʼnū",
       "dock": "Đőčĸ męʼnū",
+      "list-label": "Ńävįģäŧįőʼn",
       "undock": "Ůʼnđőčĸ męʼnū"
     },
     "toolbar": {
+      "close-menu": "Cľőşę męʼnū",
       "enable-kiosk": "Ēʼnäþľę ĸįőşĸ mőđę",
-      "toggle-menu": "Ŧőģģľę męʼnū",
+      "open-menu": "Øpęʼn męʼnū",
       "toggle-search-bar": "Ŧőģģľę ŧőp şęäřčĥ þäř"
     }
   },
   "news": {
+    "drawer": {
+      "close": "Cľőşę Đřäŵęř"
+    },
     "title": "Ŀäŧęşŧ ƒřőm ŧĥę þľőģ"
   },
   "notifications": {
@@ -773,7 +1162,6 @@
   "panel": {
     "header-menu": {
       "copy": "Cőpy",
-      "create-alert": "Cřęäŧę äľęřŧ",
       "create-library-panel": "Cřęäŧę ľįþřäřy päʼnęľ",
       "duplicate": "Đūpľįčäŧę",
       "edit": "Ēđįŧ",
@@ -784,6 +1172,7 @@
       "inspect-data": "Đäŧä",
       "inspect-json": "Päʼnęľ ĴŜØŃ",
       "more": "Mőřę...",
+      "new-alert-rule": "Ńęŵ äľęřŧ řūľę",
       "query": "Qūęřy",
       "remove": "Ŗęmővę",
       "share": "Ŝĥäřę",
@@ -836,6 +1225,16 @@
       "title": "Ŧĥęřę äřę ʼnő pľäyľįşŧş čřęäŧęđ yęŧ"
     }
   },
+  "playlists": {
+    "empty-state": {
+      "message": "Ńő pľäyľįşŧş ƒőūʼnđ"
+    }
+  },
+  "plugins": {
+    "empty-state": {
+      "message": "Ńő pľūģįʼnş ƒőūʼnđ"
+    }
+  },
   "profile": {
     "change-password": {
       "cancel-button": "Cäʼnčęľ",
@@ -849,9 +1248,138 @@
       "new-password-same-as-old": "Ńęŵ päşşŵőřđ čäʼn'ŧ þę ŧĥę şämę äş ŧĥę őľđ őʼnę.",
       "old-password-label": "Øľđ päşşŵőřđ",
       "old-password-required": "Øľđ päşşŵőřđ įş řęqūįřęđ",
-      "passwords-must-match": "Päşşŵőřđş mūşŧ mäŧčĥ"
+      "passwords-must-match": "Päşşŵőřđş mūşŧ mäŧčĥ",
+      "strong-password-validation-register": "Päşşŵőřđ đőęş ʼnőŧ čőmpľy ŵįŧĥ ŧĥę şŧřőʼnģ päşşŵőřđ pőľįčy"
+    }
+  },
+  "public-dashboard": {
+    "acknowledgment-checkboxes": {
+      "ack-title": "ßęƒőřę yőū mäĸę ŧĥę đäşĥþőäřđ pūþľįč, äčĸʼnőŵľęđģę ŧĥę ƒőľľőŵįʼnģ:",
+      "data-src-ack-desc": "Pūþľįşĥįʼnģ čūřřęʼnŧľy őʼnľy ŵőřĸş ŵįŧĥ ä şūþşęŧ őƒ đäŧä şőūřčęş*",
+      "data-src-ack-tooltip": "Ŀęäřʼn mőřę äþőūŧ pūþľįč đäŧäşőūřčęş",
+      "public-ack-desc": "Ÿőūř ęʼnŧįřę đäşĥþőäřđ ŵįľľ þę pūþľįč*",
+      "public-ack-tooltip": "Ŀęäřʼn mőřę äþőūŧ pūþľįč đäşĥþőäřđş",
+      "usage-ack-desc": "Mäĸįʼnģ ä đäşĥþőäřđ pūþľįč ŵįľľ čäūşę qūęřįęş ŧő řūʼn ęäčĥ ŧįmę įŧ įş vįęŵęđ, ŵĥįčĥ mäy įʼnčřęäşę čőşŧş*",
+      "usage-ack-desc-tooltip": "Ŀęäřʼn mőřę äþőūŧ qūęřy čäčĥįʼnģ"
+    },
+    "config": {
+      "can-view-dashboard-radio-button-label": "Cäʼn vįęŵ đäşĥþőäřđ",
+      "copy-button": "Cőpy",
+      "dashboard-url-field-label": "Đäşĥþőäřđ ŮŖĿ",
+      "email-share-type-option-label": "Øʼnľy şpęčįƒįęđ pęőpľę",
+      "pause-sharing-dashboard-label": "Päūşę şĥäřįʼnģ đäşĥþőäřđ",
+      "public-share-type-option-label": "Åʼnyőʼnę ŵįŧĥ ä ľįʼnĸ",
+      "revoke-public-URL-button": "Ŗęvőĸę pūþľįč ŮŖĿ",
+      "revoke-public-URL-button-title": "Ŗęvőĸę pūþľįč ŮŖĿ",
+      "settings-title": "Ŝęŧŧįʼnģş"
+    },
+    "create-page": {
+      "generate-public-url-button": "Ğęʼnęřäŧę pūþľįč ŮŖĿ",
+      "unsupported-features-desc": "Cūřřęʼnŧľy, ŵę đőʼn’ŧ şūppőřŧ ŧęmpľäŧę väřįäþľęş őř ƒřőʼnŧęʼnđ đäŧä şőūřčęş",
+      "welcome-title": "Ŵęľčőmę ŧő pūþľįč đäşĥþőäřđş!"
+    },
+    "delete-modal": {
+      "revoke-nonorphaned-body-text": "Åřę yőū şūřę yőū ŵäʼnŧ ŧő řęvőĸę ŧĥįş ŮŖĿ? Ŧĥę đäşĥþőäřđ ŵįľľ ʼnő ľőʼnģęř þę pūþľįč.",
+      "revoke-orphaned-body-text": "Øřpĥäʼnęđ pūþľįč đäşĥþőäřđ ŵįľľ ʼnő ľőʼnģęř þę pūþľįč.",
+      "revoke-title": "Ŗęvőĸę pūþľįč ŮŖĿ"
+    },
+    "email-sharing": {
+      "input-invalid-email-text": "Ĩʼnväľįđ ęmäįľ",
+      "input-required-email-text": "Ēmäįľ įş řęqūįřęđ",
+      "invite-button": "Ĩʼnvįŧę",
+      "invite-field-desc": "Ĩʼnvįŧę pęőpľę þy ęmäįľ",
+      "invite-field-label": "Ĩʼnvįŧę",
+      "resend-button": "Ŗęşęʼnđ",
+      "resend-button-title": "Ŗęşęʼnđ",
+      "revoke-button": "Ŗęvőĸę",
+      "revoke-button-title": "Ŗęvőĸę"
+    },
+    "modal-alerts": {
+      "no-upsert-perm-alert-desc": "Cőʼnŧäčŧ yőūř äđmįʼn ŧő ģęŧ pęřmįşşįőʼn ŧő {{mode}} pūþľįč đäşĥþőäřđş",
+      "no-upsert-perm-alert-title": "Ÿőū đőʼn’ŧ ĥävę pęřmįşşįőʼn ŧő {{ mode }} ä pūþľįč đäşĥþőäřđ",
+      "save-dashboard-changes-alert-title": "Pľęäşę şävę yőūř đäşĥþőäřđ čĥäʼnģęş þęƒőřę ūpđäŧįʼnģ ŧĥę pūþľįč čőʼnƒįģūřäŧįőʼn",
+      "unsupport-data-source-alert-readmore-link": "Ŗęäđ mőřę äþőūŧ şūppőřŧęđ đäŧä şőūřčęş",
+      "unsupported-data-source-alert-desc": "Ŧĥęřę äřę đäŧä şőūřčęş įʼn ŧĥįş đäşĥþőäřđ ŧĥäŧ äřę ūʼnşūppőřŧęđ ƒőř pūþľįč đäşĥþőäřđş. Päʼnęľş ŧĥäŧ ūşę ŧĥęşę đäŧä şőūřčęş mäy ʼnőŧ ƒūʼnčŧįőʼn přőpęřľy: {{unsupportedDataSources}}.",
+      "unsupported-data-source-alert-title": "Ůʼnşūppőřŧęđ đäŧä şőūřčęş",
+      "unsupported-template-variable-alert-desc": "Ŧĥįş pūþľįč đäşĥþőäřđ mäy ʼnőŧ ŵőřĸ şįʼnčę įŧ ūşęş ŧęmpľäŧę väřįäþľęş",
+      "unsupported-template-variable-alert-title": "Ŧęmpľäŧę väřįäþľęş äřę ʼnőŧ şūppőřŧęđ"
+    },
+    "settings-bar-header": {
+      "collapse-settings-tooltip": "Cőľľäpşę şęŧŧįʼnģş",
+      "expand-settings-tooltip": "Ēχpäʼnđ şęŧŧįʼnģş"
+    },
+    "settings-configuration": {
+      "default-time-range-label": "Đęƒäūľŧ ŧįmę řäʼnģę",
+      "default-time-range-label-desc": "Ŧĥę pūþľįč đäşĥþőäřđ ūşęş ŧĥę đęƒäūľŧ ŧįmę řäʼnģę şęŧŧįʼnģş őƒ ŧĥę đäşĥþőäřđ",
+      "show-annotations-label": "Ŝĥőŵ äʼnʼnőŧäŧįőʼnş",
+      "show-annotations-label-desc": "Ŝĥőŵ äʼnʼnőŧäŧįőʼnş őʼn pūþľįč đäşĥþőäřđ",
+      "time-range-picker-label": "Ŧįmę řäʼnģę pįčĸęř ęʼnäþľęđ",
+      "time-range-picker-label-desc": "Åľľőŵ vįęŵęřş ŧő čĥäʼnģę ŧįmę řäʼnģę"
+    },
+    "settings-summary": {
+      "annotations-hide-text": "Åʼnʼnőŧäŧįőʼnş = ĥįđę",
+      "annotations-show-text": "Åʼnʼnőŧäŧįőʼnş = şĥőŵ",
+      "time-range-picker-disabled-text": "Ŧįmę řäʼnģę pįčĸęř = đįşäþľęđ",
+      "time-range-picker-enabled-text": "Ŧįmę řäʼnģę pįčĸęř = ęʼnäþľęđ",
+      "time-range-text": "Ŧįmę řäʼnģę = "
     }
   },
+  "public-dashboard-list": {
+    "button": {
+      "config-button-tooltip": "Cőʼnƒįģūřę pūþľįč đäşĥþőäřđ",
+      "revoke-button-text": "Ŗęvőĸę pūþľįč ŮŖĿ",
+      "revoke-button-tooltip": "Ŗęvőĸę pūþľįč đäşĥþőäřđ ŮŖĿ",
+      "view-button-tooltip": "Vįęŵ pūþľįč đäşĥþőäřđ"
+    },
+    "dashboard-title": {
+      "orphaned-title": "<0>Øřpĥäʼnęđ pūþľįč đäşĥþőäřđ</0>",
+      "orphaned-tooltip": "Ŧĥę ľįʼnĸęđ đäşĥþőäřđ ĥäş äľřęäđy þęęʼn đęľęŧęđ"
+    },
+    "toggle": {
+      "pause-sharing-toggle-text": "Päūşę şĥäřįʼnģ"
+    }
+  },
+  "public-dashboard-users-access-list": {
+    "dashboard-modal": {
+      "loading-text": "Ŀőäđįʼnģ...",
+      "open-dashboard-list-text": "Øpęʼn đäşĥþőäřđş ľįşŧ",
+      "public-dashboard-link": "Pūþľįč đäşĥþőäřđ ŮŖĿ",
+      "public-dashboard-setting": "Pūþľįč đäşĥþőäřđ şęŧŧįʼnģş"
+    },
+    "delete-user-modal": {
+      "delete-user-button-text": "Đęľęŧę ūşęř",
+      "delete-user-cancel-button": "Cäʼnčęľ",
+      "delete-user-revoke-access-button": "Ŗęvőĸę äččęşş",
+      "revoke-access-title": "Ŗęvőĸę äččęşş",
+      "revoke-user-access-modal-desc-line1": "Åřę yőū şūřę yőū ŵäʼnŧ ŧő řęvőĸę äččęşş ƒőř {{email}}?",
+      "revoke-user-access-modal-desc-line2": "Ŧĥįş äčŧįőʼn ŵįľľ įmmęđįäŧęľy řęvőĸę {{email}}&äpőş;ş äččęşş ŧő äľľ pūþľįč đäşĥþőäřđş."
+    },
+    "modal": {
+      "dashboard-modal-title": "Pūþľįč đäşĥþőäřđş"
+    },
+    "table-header": {
+      "activated-label": "Åčŧįväŧęđ",
+      "activated-tooltip": "Ēäřľįęşŧ ŧįmę ūşęř ĥäş þęęʼn äʼn äčŧįvę ūşęř ŧő ä đäşĥþőäřđ",
+      "email-label": "Ēmäįľ",
+      "last-active-label": "Ŀäşŧ äčŧįvę",
+      "origin-label": "Øřįģįʼn",
+      "role-label": "Ŗőľę"
+    }
+  },
+  "query-operation": {
+    "header": {
+      "collapse-row": "Cőľľäpşę qūęřy řőŵ",
+      "datasource-help": "Ŝĥőŵ đäŧä şőūřčę ĥęľp",
+      "drag-and-drop": "Đřäģ äʼnđ đřőp ŧő řęőřđęř",
+      "duplicate-query": "Đūpľįčäŧę qūęřy",
+      "expand-row": "Ēχpäʼnđ qūęřy řőŵ",
+      "hide-response": "Ħįđę řęşpőʼnşę",
+      "remove-query": "Ŗęmővę qūęřy",
+      "show-response": "Ŝĥőŵ řęşpőʼnşę",
+      "toggle-edit-mode": "Ŧőģģľę ŧęχŧ ęđįŧ mőđę"
+    },
+    "query-editor-not-exported": "Đäŧä şőūřčę pľūģįʼn đőęş ʼnőŧ ęχpőřŧ äʼny Qūęřy Ēđįŧőř čőmpőʼnęʼnŧ"
+  },
   "refresh-picker": {
     "aria-label": {
       "choose-interval": "Åūŧő řęƒřęşĥ ŧūřʼnęđ őƒƒ. Cĥőőşę řęƒřęşĥ ŧįmę įʼnŧęřväľ",
@@ -874,6 +1402,12 @@
       "turned-off": "Åūŧő řęƒřęşĥ őƒƒ"
     }
   },
+  "return-to-previous": {
+    "button": {
+      "label": "ßäčĸ ŧő {{title}}"
+    },
+    "dismissable-button": "Cľőşę"
+  },
   "search": {
     "actions": {
       "include-panels": "Ĩʼnčľūđę päʼnęľş",
@@ -889,15 +1423,6 @@
       "new-dashboard": "Ńęŵ đäşĥþőäřđ",
       "new-folder": "Ńęŵ ƒőľđęř"
     },
-    "folder-view": {
-      "go-to-folder": "Ğő ŧő ƒőľđęř",
-      "select-folder": "Ŝęľęčŧ ƒőľđęř"
-    },
-    "result-kind": {
-      "dashboard": "Đäşĥþőäřđ",
-      "folder": "Főľđęř",
-      "panel": "Päʼnęľ"
-    },
     "results-table": {
       "datasource-header": "Đäŧä şőūřčę",
       "location-header": "Ŀőčäŧįőʼn",
@@ -912,10 +1437,9 @@
       "placeholder": "Ŝęäřčĥ ƒőř đäşĥþőäřđş äʼnđ ƒőľđęřş"
     }
   },
-  "search-view": {
-    "no-results": {
-      "clear": "Cľęäř şęäřčĥ äʼnđ ƒįľŧęřş",
-      "text": "Ńő řęşūľŧş ƒőūʼnđ ƒőř yőūř qūęřy."
+  "service-accounts": {
+    "empty-state": {
+      "message": "Ńő şęřvįčęş äččőūʼnŧş ƒőūʼnđ"
     }
   },
   "share-modal": {
@@ -935,7 +1459,6 @@
       "cancel-button": "Cäʼnčęľ",
       "info-text": "Ēχpőřŧ ŧĥįş đäşĥþőäřđ.",
       "save-button": "Ŝävę ŧő ƒįľę",
-      "share-default-label": "Ēχpőřŧ ŵįŧĥ đęƒäūľŧ väľūęş řęmővęđ",
       "share-externally-label": "Ēχpőřŧ ƒőř şĥäřįʼnģ ęχŧęřʼnäľľy",
       "view-button": "Vįęŵ ĴŜØŃ"
     },
@@ -967,10 +1490,10 @@
       "expire-day": "1 Đäy",
       "expire-hour": "1 Ħőūř",
       "expire-never": "Ńęvęř",
-      "expire-week": "7 Đäyş",
+      "expire-week": "1 Ŵęęĸ",
       "info-text-1": "Å şʼnäpşĥőŧ įş äʼn įʼnşŧäʼnŧ ŵäy ŧő şĥäřę äʼn įʼnŧęřäčŧįvę đäşĥþőäřđ pūþľįčľy. Ŵĥęʼn čřęäŧęđ, ŵę şŧřįp şęʼnşįŧįvę đäŧä ľįĸę qūęřįęş (męŧřįč, ŧęmpľäŧę, äʼnđ äʼnʼnőŧäŧįőʼn) äʼnđ päʼnęľ ľįʼnĸş, ľęävįʼnģ őʼnľy ŧĥę vįşįþľę męŧřįč đäŧä äʼnđ şęřįęş ʼnämęş ęmþęđđęđ įʼn yőūř đäşĥþőäřđ.",
       "info-text-2": "Ķęęp įʼn mįʼnđ, yőūř şʼnäpşĥőŧ <1>čäʼn þę vįęŵęđ þy äʼnyőʼnę</1> ŧĥäŧ ĥäş ŧĥę ľįʼnĸ äʼnđ čäʼn äččęşş ŧĥę ŮŖĿ. Ŝĥäřę ŵįşęľy.",
-      "local-button": "Ŀőčäľ Ŝʼnäpşĥőŧ",
+      "local-button": "Pūþľįşĥ Ŝʼnäpşĥőŧ",
       "mistake-message": "Đįđ yőū mäĸę ä mįşŧäĸę? ",
       "name": "Ŝʼnäpşĥőŧ ʼnämę",
       "timeout": "Ŧįmęőūŧ (şęčőʼnđş)",
@@ -982,6 +1505,9 @@
       "export": "Ēχpőřŧ",
       "library-panel": "Ŀįþřäřy päʼnęľ",
       "link": "Ŀįʼnĸ",
+      "panel-embed": "Ēmþęđ",
+      "public-dashboard": "Pūþľįč Đäşĥþőäřđ",
+      "public-dashboard-title": "Pūþľįč đäşĥþőäřđ",
       "snapshot": "Ŝʼnäpşĥőŧ"
     },
     "theme-picker": {
@@ -1044,6 +1570,11 @@
     "no-tags": "Ńő ŧäģş ƒőūʼnđ",
     "placeholder": "Fįľŧęř þy ŧäģ"
   },
+  "teams": {
+    "empty-state": {
+      "message": "Ńő ŧęämş ƒőūʼnđ"
+    }
+  },
   "time-picker": {
     "absolute": {
       "recent-title": "Ŗęčęʼnŧľy ūşęđ äþşőľūŧę řäʼnģęş",
@@ -1052,6 +1583,7 @@
     "calendar": {
       "apply-button": "Åppľy ŧįmę řäʼnģę",
       "cancel-button": "Cäʼnčęľ",
+      "close": "Cľőşę čäľęʼnđäř",
       "select-time": "Ŝęľęčŧ ä ŧįmę řäʼnģę"
     },
     "content": {
@@ -1059,6 +1591,13 @@
       "empty-recent-list-info": "Ĩŧ ľőőĸş ľįĸę yőū ĥävęʼn'ŧ ūşęđ ŧĥįş ŧįmę pįčĸęř þęƒőřę. Åş şőőʼn äş yőū ęʼnŧęř şőmę ŧįmę įʼnŧęřväľş, řęčęʼnŧľy ūşęđ įʼnŧęřväľş ŵįľľ äppęäř ĥęřę.",
       "filter-placeholder": "Ŝęäřčĥ qūįčĸ řäʼnģęş"
     },
+    "copy-paste": {
+      "copy-success-message": "Ŧįmę řäʼnģę čőpįęđ ŧő čľįpþőäřđ",
+      "default-error-message": "{{error}} įş ʼnőŧ ä väľįđ ŧįmę řäʼnģę",
+      "default-error-title": "Ĩʼnväľįđ ŧįmę řäʼnģę",
+      "tooltip-copy": "Cőpy ŧįmę řäʼnģę ŧő čľįpþőäřđ",
+      "tooltip-paste": "Päşŧę ŧįmę řäʼnģę"
+    },
     "footer": {
       "change-settings-button": "Cĥäʼnģę ŧįmę şęŧŧįʼnģş",
       "fiscal-year-option": "Fįşčäľ yęäř",
@@ -1071,6 +1610,7 @@
       "default-error": "Pľęäşę ęʼnŧęř ä päşŧ đäŧę őř \"ʼnőŵ\"",
       "fiscal-year": "Fįşčäľ yęäř",
       "from-input": "Fřőm",
+      "open-input-calendar": "Øpęʼn čäľęʼnđäř",
       "range-error": "\"Fřőm\" čäʼn'ŧ þę äƒŧęř \"Ŧő\"",
       "to-input": "Ŧő"
     },
@@ -1093,6 +1633,12 @@
       "select-search-input": "Ŧypę ŧő şęäřčĥ (čőūʼnŧřy, čįŧy, äþþřęvįäŧįőʼn)"
     }
   },
+  "transformations": {
+    "empty": {
+      "add-transformation-body": "Ŧřäʼnşƒőřmäŧįőʼnş äľľőŵ đäŧä ŧő þę čĥäʼnģęđ įʼn väřįőūş ŵäyş þęƒőřę yőūř vįşūäľįžäŧįőʼn įş şĥőŵʼn.<1></1>Ŧĥįş įʼnčľūđęş ĵőįʼnįʼnģ đäŧä ŧőģęŧĥęř, řęʼnämįʼnģ ƒįęľđş, mäĸįʼnģ čäľčūľäŧįőʼnş, ƒőřmäŧŧįʼnģ đäŧä ƒőř đįşpľäy, äʼnđ mőřę.",
+      "add-transformation-header": "Ŝŧäřŧ ŧřäʼnşƒőřmįʼnģ đäŧä"
+    }
+  },
   "user-orgs": {
     "current-org-button": "Cūřřęʼnŧ",
     "name-column": "Ńämę",
@@ -1107,6 +1653,9 @@
       "name-error": "Ńämę įş řęqūįřęđ",
       "name-label": "Ńämę",
       "username-label": "Ůşęřʼnämę"
+    },
+    "tabs": {
+      "general": "Ğęʼnęřäľ"
     }
   },
   "user-session": {
@@ -1119,6 +1668,16 @@
   "user-sessions": {
     "loading": "Ŀőäđįʼnģ şęşşįőʼnş..."
   },
+  "users": {
+    "empty-state": {
+      "message": "Ńő ūşęřş ƒőūʼnđ"
+    }
+  },
+  "users-access-list": {
+    "tabs": {
+      "public-dashboard-users-tab-title": "Pūþľįč đäşĥþőäřđ ūşęřş"
+    }
+  },
   "variable": {
     "adhoc": {
       "placeholder": "Ŝęľęčŧ väľūę"
diff --git a/public/locales/pt-BR/grafana.json b/public/locales/pt-BR/grafana.json
new file mode 100644
index 0000000000000..844e7948b0cc7
--- /dev/null
+++ b/public/locales/pt-BR/grafana.json
@@ -0,0 +1,1668 @@
+{
+  "_comment": "Esse arquivo é a fonte da verdade para strings em inglês. Edite isto na base de código para alterar os plurais e outras frases para a interface do usuário.",
+  "access-control": {
+    "add-permission": {
+      "role-label": "Função",
+      "serviceaccount-label": "Conta de serviço",
+      "team-label": "Equipe",
+      "title": "Adicionar permissão para",
+      "user-label": "Usuário"
+    },
+    "add-permissions": {
+      "save": "Salvar"
+    },
+    "permission-list": {
+      "permission": "Permissão"
+    },
+    "permissions": {
+      "add-label": "Adicionar uma permissão",
+      "no-permissions": "Não há permissões",
+      "permissions-change-warning": "Isto irá alterar as permissões para este diretório e todos os seus descendentes. No total, isto afetará:",
+      "role": "Função",
+      "serviceaccount": "Conta de serviço",
+      "team": "Equipe",
+      "title": "Permissões",
+      "user": "Usuário"
+    }
+  },
+  "bouncing-loader": {
+    "label": "Carregando"
+  },
+  "browse-dashboards": {
+    "action": {
+      "cancel-button": "Cancelar",
+      "cannot-move-folders": "As pastas não podem ser movidas",
+      "delete-button": "Excluir",
+      "delete-modal-invalid-text": "Uma ou mais pastas contêm painéis de biblioteca, ou regras de alerta. Exclua-as primeiro para prosseguir.",
+      "delete-modal-invalid-title": "Não é possível excluir pasta",
+      "delete-modal-text": "Esta ação apagará o seguinte conteúdo:",
+      "delete-modal-title": "Excluir",
+      "deleting": "Excluindo...",
+      "manage-permissions-button": "Gerenciar permissões",
+      "move-button": "Mover",
+      "move-modal-alert": "Mover este item pode alterar suas permissões.",
+      "move-modal-field-label": "Nome da pasta",
+      "move-modal-text": "Esta ação moverá o seguinte conteúdo:",
+      "move-modal-title": "Mover",
+      "moving": "Movendo...",
+      "new-folder-name-required-phrase": "O nome da pasta é obrigatório."
+    },
+    "counts": {
+      "alertRule_one": "{{count}} regra de alerta",
+      "alertRule_other": "{{count}} regras de alerta",
+      "dashboard_one": "{{count}} painel de controle",
+      "dashboard_other": "{{count}} painéis de controle",
+      "folder_one": "{{count}} pasta",
+      "folder_other": "{{count}} pastas",
+      "libraryPanel_one": "{{count}} painel de biblioteca",
+      "libraryPanel_other": "{{count}} painéis de biblioteca",
+      "total_one": "{{count}} item",
+      "total_other": "{{count}} itens"
+    },
+    "dashboards-tree": {
+      "collapse-folder-button": "Recolher pasta {{title}}",
+      "expand-folder-button": "Expandir pasta {{title}}",
+      "name-column": "Nome",
+      "select-all-header-checkbox": "Selecionar tudo",
+      "select-checkbox": "Selecionar",
+      "tags-column": "Tags"
+    },
+    "folder-actions-button": {
+      "delete": "Excluir",
+      "folder-actions": "Ações da pasta",
+      "manage-permissions": "Gerenciar permissões",
+      "move": "Mover"
+    },
+    "folder-picker": {
+      "accessible-label": "Selecionar pasta: {{ label }} atualmente selecionada",
+      "button-label": "Selecionar pasta",
+      "clear-selection": "Limpar seleção",
+      "empty-message": "Nenhuma pasta encontrada",
+      "error-title": "Erro ao carregar pastas",
+      "search-placeholder": "Buscar pastas",
+      "unknown-error": "Erro desconhecido"
+    },
+    "manage-folder-nav": {
+      "alert-rules": "Regras de alerta",
+      "dashboards": "Painéis de controle",
+      "panels": "Painéis"
+    },
+    "new-folder-form": {
+      "cancel-label": "Cancelar",
+      "create-label": "Criar",
+      "name-label": "Nome da pasta"
+    },
+    "no-results": {
+      "clear": "Limpar busca e filtros",
+      "text": ""
+    }
+  },
+  "clipboard-button": {
+    "inline-toast": {
+      "success": "Copiado"
+    }
+  },
+  "command-palette": {
+    "action": {
+      "change-theme": "Alterar tema...",
+      "dark-theme": "Escuro",
+      "light-theme": "Claro"
+    },
+    "search-box": {
+      "placeholder": "Buscar ou pular para..."
+    },
+    "section": {
+      "actions": "Ações",
+      "dashboard-search-results": "Painéis de controle",
+      "folder-search-results": "Pastas",
+      "pages": "Páginas",
+      "preferences": "Preferências",
+      "recent-dashboards": "Painéis de controle recentes"
+    }
+  },
+  "common": {
+    "locale": {
+      "default": "Padrão"
+    },
+    "save": "Salvar"
+  },
+  "connections": {
+    "connect-data": {
+      "category-header-label": "Fontes de dados",
+      "empty-message": ""
+    },
+    "search": {
+      "placeholder": "Buscar tudo"
+    }
+  },
+  "correlations": {
+    "add-new": "Adicionar novo",
+    "alert": {
+      "error-message": "Ocorreu um erro desconhecido ao obter dados de correlação. Tente novamente.",
+      "title": "Erro ao obter dados de correlação"
+    },
+    "basic-info-form": {
+      "description-description": "Descrição opcional com mais informações sobre o link",
+      "description-label": "Descrição",
+      "label-description": "Este nome será usado como rótulo para a correlação. Isto mostrará como texto do botão, um item de menu ou texto de foco em um link.",
+      "label-label": "Etiqueta",
+      "label-placeholder": "ex: Rastreamentos de tempo",
+      "label-required": "Este campo é obrigatório.",
+      "sub-text": "<0>Defina o texto que descreverá a correlação.</0>",
+      "title": "Definir rótulo de correlação (Passo 1 de 3)"
+    },
+    "list": {
+      "delete": "excluir correlação",
+      "label": "Etiqueta",
+      "loading": "carregando...",
+      "read-only": "Apenas leitura",
+      "source": "Fonte",
+      "target": "Alvo"
+    },
+    "navigation-form": {
+      "add-button": "Adicionar",
+      "back-button": "Voltar",
+      "next-button": "Avançar",
+      "save-button": "Salvar"
+    },
+    "page-content": "Para ativar as correlações, adicione-as nas configurações do Grafana:",
+    "page-heading": "Correlações desativadas",
+    "query-editor": {
+      "control-rules": "A fonte de dados de destino selecionada deve exportar um editor de consulta.",
+      "data-source-text": "Selecione uma fonte de dados alvo primeiro.",
+      "data-source-title": "Nenhuma fonte de dados selecionada",
+      "error-text": "A fonte de dados selecionada não pôde ser carregada.",
+      "error-title": "Erro ao carregar fonte de dados",
+      "loading": "Carregando editor de consultas...",
+      "query-description": "Defina a consulta executada quando o link é clicado. Você pode usar <2>variáveis</2> para acessar valores específicos do campo.",
+      "query-editor-title": "A fonte de dados não exporta um editor de consulta.",
+      "query-label": "Consulta"
+    },
+    "source-form": {
+      "control-required": "Este campo é obrigatório.",
+      "description": "Você usou as seguintes variáveis na consulta alvo: <1></1><2></2>Um ponto de dados precisa fornecer valores para todas as variáveis como campos ou saída de transformações para fazer com que o botão de correlação apareça na visualização. <4></4>Observação: nem toda variável precisa ser explicitamente definida abaixo. Uma transformação como <7>logfmt</7> criará variáveis para cada par chave/valor.",
+      "heading": "Variáveis usadas na consulta alvo",
+      "results-description": "O link será exibido ao lado do valor deste campo",
+      "results-label": "Campo de resultados",
+      "results-required": "Este campo é obrigatório.",
+      "source-description": "Os resultados da fonte de dados selecionada têm links exibidos no painel",
+      "source-label": "Fonte",
+      "sub-text": "<0>Defina qual fonte de dados exibirá a correlação e quais dados substituirão variáveis predefinidas. </0>",
+      "title": "Configurar a fonte de dados que vinculará a {{dataSourceName}} (Passo 3 de 3)"
+    },
+    "sub-title": "Defina como os dados que vivem em fontes de dados diferentes se relacionam entre si. Leia mais na <2>documentação<1></1></2>",
+    "target-form": {
+      "control-rules": "Este campo é obrigatório.",
+      "sub-text": "<0>Defina para qual fonte de dados a correlação será vinculada e qual consulta será executada quando a correlação for clicada.</0>",
+      "target-description": "Especifique qual fonte de dados é consultada quando o link é clicado",
+      "target-label": "Alvo",
+      "title": "Configurar o alvo para a correlação (Passo 2 de 3)"
+    },
+    "trans-details": {
+      "logfmt-description": "Analisa o campo fornecido com logfmt para obter variáveis",
+      "logfmt-label": "Logfmt",
+      "regex-description": "O campo será analisado com regex. Use grupos de captura nomeados para retornar várias variáveis, ou um único grupo de captura não nomeado para adicionar uma variável ao valor de mapa nomeado. Regex não é sensível a letras maiúsculas e minúsculas.",
+      "regex-expression": "Use grupos de captura para extrair uma porção do campo.",
+      "regex-label": "Expressão regular",
+      "regex-map-values": "Define o nome da variável se o grupo de captura não for nomeado."
+    },
+    "transform": {
+      "add-button": "Adicionar transformação",
+      "heading": "Transformações",
+      "no-transform": "Nenhuma transformação definida."
+    },
+    "transform-row": {
+      "expression-label": "Expressão",
+      "expression-required": "Defina uma expressão",
+      "expression-tooltip": "Necessário para expressão regular. A expressão que a transformação usará. O logfmt não usa mais especificações.",
+      "field-input": "campo",
+      "field-label": "Campo",
+      "field-tooltip": "Opcional. O campo para transformar. Se não especificado, a transformação será aplicada ao campo de resultados.",
+      "map-value-label": "Valor do mapa",
+      "map-value-tooltip": "Opcional. Define o nome da variável. Isso é válido atualmente apenas para expressões regulares com um grupo de captura único e não nomeado.",
+      "remove-button": "Remover",
+      "remove-tooltip": "Remover transformação",
+      "transform-required": "Selecione um tipo de transformação",
+      "type-label": "Tipo",
+      "type-tooltip": "O tipo de transformação que será aplicado a fonte de dados."
+    }
+  },
+  "dashboard": {
+    "add-menu": {
+      "import": "Importar da biblioteca",
+      "paste-panel": "Colar painel",
+      "row": "Linha",
+      "visualization": "Visualização",
+      "widget": "Widget"
+    },
+    "alert-rules-drawer": {
+      "redirect-link": "Lista no alerta do Grafana",
+      "subtitle": "Regras de alerta relacionadas a este painel de controle"
+    },
+    "empty": {
+      "add-library-panel-body": "Adicione visualizações que são compartilhadas com outros painéis de controle.",
+      "add-library-panel-button": "Adicionar painel de biblioteca",
+      "add-library-panel-header": "Adicionar um painel de biblioteca",
+      "add-visualization-body": "Selecione uma fonte de dados e consulte e visualize seus dados com gráficos, estatísticas e tabelas ou crie listas, markdowns e outros widgets.",
+      "add-visualization-button": "Adicionar visualização",
+      "add-visualization-header": "Comece seu novo painel de controle adicionando uma visualização",
+      "add-widget-body": "Criar listas, markdowns e outros widgets",
+      "add-widget-button": "Adicionar widget",
+      "add-widget-header": "Adicionar um widget",
+      "import-a-dashboard-body": "Importar painel de controle do arquivo ou <1>grafana.com</1>.",
+      "import-a-dashboard-header": "Importar um painel de controle",
+      "import-dashboard-button": "Importar painel de controle"
+    },
+    "inspect": {
+      "data-tab": "Dados",
+      "error-tab": "Erro",
+      "json-tab": "JSON",
+      "meta-tab": "Metadados",
+      "query-tab": "Consulta",
+      "stats-tab": "Estatísticas",
+      "subtitle": "{{queryCount}} consultas com o tempo total de consulta de {{formatted}}",
+      "title": "Inspecionar: {{panelTitle}}"
+    },
+    "inspect-data": {
+      "data-options": "Opções de dados",
+      "dataframe-aria-label": "Selecionar quadro de dados",
+      "dataframe-label": "Mostrar quadro de dados",
+      "download-csv": "Baixar CSV",
+      "download-excel-description": "Adiciona cabeçalho ao CSV para usar com o Excel",
+      "download-excel-label": "Baixar para Excel",
+      "download-logs": "Baixar registros",
+      "download-service": "Baixar gráfico de serviço",
+      "download-traces": "Baixar rastreamentos",
+      "excel-header": "Cabeçalho do Excel",
+      "formatted": "Dados formatados",
+      "formatted-data-description": "Os dados da tabela estão formatados com opções definidas no campo e nas guias de substituição.",
+      "formatted-data-label": "Dados formatados",
+      "panel-transforms": "Transformações de painel",
+      "series-to-columns": "Séries acompanhadas pelo tempo",
+      "transformation": "Séries acompanhadas pelo tempo",
+      "transformations-description": "Os dados da tabela são exibidos com transformações definidas na guia Transformação do painel.",
+      "transformations-label": "Aplicar transformações de painel"
+    },
+    "inspect-json": {
+      "dataframe-description": "Dados brutos sem transformações e configuração de campo aplicada. ",
+      "dataframe-label": "DataFrame JSON (da consulta)",
+      "panel-data-description": "O modelo bruto passado para a visualização do painel",
+      "panel-data-label": "Dados do painel",
+      "panel-json-description": "O modelo salvo no JSON do painel de controle que configura como tudo funciona.",
+      "panel-json-label": "Painel JSON",
+      "select-source": "Selecionar fonte",
+      "unknown": "Objeto desconhecido: {{show}}"
+    },
+    "inspect-meta": {
+      "no-inspector": "Sem inspetor de metadados"
+    },
+    "inspect-stats": {
+      "data-title": "Estatísticas de fonte de dados",
+      "data-traceids": "IDs de rastreamento",
+      "processing-time": "Tempo de processamento de dados",
+      "queries": "Número de consultas",
+      "request-time": "Tempo total do pedido",
+      "rows": "Número total de linhas",
+      "table-title": "Estatísticas"
+    },
+    "toolbar": {
+      "add": "Adicionar",
+      "alert-rules": "Regras de alerta",
+      "mark-favorite": "Marcar como favorito",
+      "open-original": "Abrir painel de controle original",
+      "playlist-next": "Ir para o próximo painel de controle",
+      "playlist-previous": "Ir para o painel de controle anterior",
+      "playlist-stop": "Parar lista de reprodução",
+      "refresh": "Atualizar painel de controle",
+      "save": "Salvar painel de controle",
+      "settings": "Configurações do painel de controle",
+      "share": "Compartilhar painel de controle",
+      "share-button": "Compartilhar",
+      "unmark-favorite": "Desmarcar como favorito"
+    },
+    "validation": {
+      "invalid-dashboard-id": "Não foi possível encontrar um ID do Grafana.com válido",
+      "invalid-json": "JSON inválido",
+      "tags-expected-array": "matriz de tags esperada",
+      "tags-expected-strings": "matriz de strings de tags esperada"
+    }
+  },
+  "dashboard-import": {
+    "file-dropzone": {
+      "primary-text": "Enviar arquivo JSON do painel de controle",
+      "secondary-text": "Arraste e solte aqui ou clique para procurar"
+    },
+    "form-actions": {
+      "cancel": "Cancelar",
+      "load": "Carregar"
+    },
+    "gcom-field": {
+      "label": "Encontre e importe painéis de controle para aplicações comuns em <1></1>",
+      "load-button": "Carregar",
+      "placeholder": "URL ou ID do painel de controle do Grafana.com",
+      "validation-required": "Um URL ou ID do painel de controle do Grafana é obrigatório"
+    },
+    "json-field": {
+      "label": "Importar via modelo JSON de painel de controle",
+      "validation-required": "Precisa de um modelo JSON de painel de controle"
+    }
+  },
+  "dashboard-settings": {
+    "annotations": {
+      "title": "Anotações"
+    },
+    "dashboard-delete-button": "Excluir painel de controle",
+    "general": {
+      "auto-refresh-description": "Defina os intervalos de atualização automática que devem estar disponíveis na lista de atualização automática.",
+      "auto-refresh-label": "Atualização automática",
+      "description-label": "Descrição",
+      "editable-description": "Defina como somente leitura para desativar toda a edição. Recarregue o painel de controle para que as alterações tenham efeito",
+      "editable-label": "Editável",
+      "folder-label": "Pasta",
+      "panel-options-graph-tooltip-description": "Controla as dicas e o comportamento de destaque do mouse em diferentes painéis. Recarregue o painel de controle para que as alterações tenham efeito",
+      "panel-options-graph-tooltip-label": "Gráfico de dica",
+      "panel-options-label": "Opções do painel",
+      "tags-label": "Tags",
+      "title": "Geral",
+      "title-label": "Título"
+    },
+    "json-editor": {
+      "save-button": "Salvar alterações",
+      "subtitle": "O modelo JSON abaixo é a estrutura de dados que define o painel de controle. Isto inclui configurações do painel, layout, consultas e assim por diante.",
+      "title": "Modelo JSON"
+    },
+    "links": {
+      "title": "Links"
+    },
+    "permissions": {
+      "title": "Permissões"
+    },
+    "settings": {
+      "title": "Configurações"
+    },
+    "time-picker": {
+      "hide-time-picker": "Ocultar seletor de hora",
+      "now-delay-description": "Exclui dados recentes que podem estar incompletos.",
+      "now-delay-label": "Atraso agora",
+      "refresh-live-dashboards-description": "Redesenha painéis continuamente onde as referências de intervalo de tempo são \"agora\"",
+      "refresh-live-dashboards-label": "Atualizar painéis de controle ao vivo",
+      "time-options-label": "Opções de hora",
+      "time-zone-label": "Fuso horário",
+      "week-start-label": "Início da semana"
+    },
+    "variables": {
+      "title": "Variáveis"
+    },
+    "versions": {
+      "title": "Versões"
+    }
+  },
+  "data-source-picker": {
+    "add-new-data-source": "Configurar uma nova fonte de dados",
+    "built-in-list": {
+      "description-dashboard": "Reutiliza resultados de consultas de outras visualizações",
+      "description-grafana": "Descubra visualizações usando dados de simulação",
+      "description-mixed": "Usar múltiplas fontes de dados"
+    },
+    "list": {
+      "no-data-source-message": "Nenhuma fonte de dados encontrada"
+    },
+    "modal": {
+      "configure-new-data-source": "Abrir uma nova guia e configurar a fonte de dados",
+      "input-placeholder": "Selecionar fonte de dados",
+      "title": "Selecionar fonte de dados"
+    },
+    "open-advanced-button": "Abrir seletor de código avançado de fonte de dados"
+  },
+  "data-sources": {
+    "datasource-add-button": {
+      "label": "Adicionar nova fonte de dados"
+    }
+  },
+  "explore": {
+    "add-to-dashboard": "Adicionar ao painel de controle",
+    "rich-history": {
+      "close-tooltip": "Fechar histórico de consultas",
+      "datasource-a-z": "Fonte de dados A-Z",
+      "datasource-z-a": "Fonte de dados Z-A",
+      "newest-first": "Mais recentes primeiro",
+      "oldest-first": "Mais antigos primeiro",
+      "query-history": "Histórico de consultas",
+      "settings": "Configurações",
+      "starred": "Favorito"
+    },
+    "rich-history-card": {
+      "add-comment-form": "Adicionar formulário de comentários",
+      "add-comment-tooltip": "Adicionar comentário",
+      "cancel": "Cancelar",
+      "confirm-delete": "Excluir",
+      "copy-query-tooltip": "Copiar consulta para a área de transferência",
+      "copy-shortened-link-tooltip": "Copiar link encurtado para a área de transferência",
+      "datasource-icon-label": "Ícone da fonte de dados",
+      "datasource-name-label": "Nome da fonte de dados",
+      "datasource-not-exist": "A fonte de dados não existe mais",
+      "delete-query-confirmation-title": "Excluir",
+      "delete-query-title": "Excluir consulta",
+      "delete-query-tooltip": "Excluir consulta",
+      "delete-starred-query-confirmation-text": "Tem certeza de que deseja excluir permanentemente sua consulta favorita?",
+      "edit-comment-tooltip": "Editar comentário",
+      "loading-text": "carregando...",
+      "optional-description": "Uma descrição opcional do que a consulta faz.",
+      "query-comment-label": "Comentário de consulta",
+      "query-text-label": "Texto da consulta",
+      "run-query-button": "Executar consulta",
+      "save-comment": "Salvar comentário",
+      "star-query-tooltip": "Favoritar consulta",
+      "switch-datasource-button": "Alternar fonte de dados e executar consulta",
+      "unstar-query-tooltip": "Remover consulta dos favoritos",
+      "update-comment-form": "Atualizar formulário de comentários"
+    },
+    "rich-history-container": {
+      "loading": "Carregando..."
+    },
+    "rich-history-notification": {
+      "query-copied": "Consulta copiada para a área de transferência",
+      "query-deleted": "Consulta excluída"
+    },
+    "rich-history-queries-tab": {
+      "displaying-partial-queries": "Exibindo {{ count }} consultas",
+      "displaying-queries": "{{ count }} consultas",
+      "filter-aria-label": "Filtrar consultas de fonte(s) de dados",
+      "filter-history": "Histórico de filtros",
+      "filter-placeholder": "Filtrar consultas de fonte(s) de dados",
+      "history-local": "O histórico é local no seu navegador e não é compartilhado com outras pessoas.",
+      "loading": "Carregando...",
+      "loading-results": "Carregando resultados...",
+      "search-placeholder": "Buscar consultas",
+      "showing-queries": "Mostrando {{ shown }} de {{ total }} <0>Carregar mais</0>",
+      "sort-aria-label": "Ordenar consultas",
+      "sort-placeholder": "Ordenar consultas por"
+    },
+    "rich-history-settings-tab": {
+      "alert-info": "O Grafana manterá lançamentos para {{optionLabel}}. As entradas nos favoritos não serão excluídas.",
+      "change-default-tab": "Altere a guia ativa padrão de \"Histórico de consultas\" para \"Marcado como favorito\"",
+      "clear-history-info": "Exclui todo o seu histórico de consultas permanentemente.",
+      "clear-query-history": "Limpar histórico de consultas",
+      "clear-query-history-button": "Limpar histórico de consultas",
+      "delete-confirm": "Excluir",
+      "delete-confirm-text": "Tem certeza de que deseja excluir permanentemente seu histórico de consultas?",
+      "delete-title": "Excluir",
+      "history-time-span": "Histórico de tempo",
+      "history-time-span-description": "Selecione o período de tempo para o qual o Grafana salvará seu histórico de consultas. Até {{MAX_HISTORY_ITEMS}} entradas serão armazenadas.",
+      "only-show-active-datasource": "Mostrar somente consultas para fontes de dados atualmente ativas em Explorar",
+      "query-history-deleted": "Histórico de consultas excluído",
+      "retention-period": {
+        "1-week": "1 semana",
+        "2-days": "2 dias",
+        "2-weeks": "2 semanas",
+        "5-days": "5 dias"
+      }
+    },
+    "rich-history-starred-tab": {
+      "filter-queries-aria-label": "Filtrar consultas de fonte(s) de dados",
+      "filter-queries-placeholder": "Filtrar consultas de fonte(s) de dados",
+      "loading": "Carregando...",
+      "loading-results": "Carregando resultados...",
+      "local-history-message": "O histórico é local no seu navegador e não é compartilhado com outras pessoas.",
+      "search-queries-placeholder": "Buscar consultas",
+      "showing-queries": "Mostrando {{ shown }} de {{ total }} <0>Carregar mais</0>",
+      "sort-queries-aria-label": "Ordenar consultas",
+      "sort-queries-placeholder": "Ordenar consultas por"
+    },
+    "rich-history-utils": {
+      "a-week-ago": "há uma semana",
+      "days-ago": "Há {{num}} dias",
+      "default-from": "agora-1h",
+      "default-to": "agora",
+      "today": "hoje",
+      "two-weeks-ago": "há duas semanas",
+      "yesterday": "ontem"
+    },
+    "rich-history-utils-notification": {
+      "saving-failed": "Falha ao salvar histórico rico",
+      "update-failed": "A atualização do histórico rico falhou"
+    },
+    "secondary-actions": {
+      "query-add-button": "Adicionar consulta",
+      "query-add-button-aria-label": "Adicionar consulta",
+      "query-history-button": "Histórico de consultas",
+      "query-history-button-aria-label": "Histórico de consultas",
+      "query-inspector-button": "Inspetor da consulta",
+      "query-inspector-button-aria-label": "Inspetor da consulta"
+    },
+    "table": {
+      "no-data": "0 séries retornadas",
+      "title": "Tabela",
+      "title-with-name": "Tabela — {{name}}"
+    },
+    "toolbar": {
+      "aria-label": "Explorar barra de ferramentas",
+      "copy-link": "Copiar URL",
+      "copy-link-abs-time": "Copiar URL absoluto",
+      "copy-links-absolute-category": "Links de URL de sincronização de tempo (compartilhar com intervalo de tempo intacto)",
+      "copy-links-normal-category": "Links de URL normais",
+      "copy-shortened-link": "Copiar URL encurtado",
+      "copy-shortened-link-abs-time": "Copiar URL absoluto encurtado",
+      "copy-shortened-link-menu": "Abrir menu de link encurtado",
+      "refresh-picker-cancel": "Cancelar",
+      "refresh-picker-run": "Executar consulta",
+      "split-close": "Fechar",
+      "split-close-tooltip": "Fechar painel dividido",
+      "split-narrow": "Painel estreito",
+      "split-title": "Dividir",
+      "split-tooltip": "Dividir o painel",
+      "split-widen": "Painel amplo"
+    }
+  },
+  "folder-picker": {
+    "loading": "Carregando pastas..."
+  },
+  "grafana-ui": {
+    "drawer": {
+      "close": "Fechar"
+    },
+    "empty-state": {
+      "not-found-message": ""
+    },
+    "modal": {
+      "close-tooltip": "Fechar"
+    },
+    "segment-async": {
+      "error": "Falha ao carregar opções",
+      "loading": "Carregando opções...",
+      "no-options": "Nenhuma opção encontrada"
+    },
+    "select": {
+      "no-options-label": "Nenhuma opção encontrada",
+      "placeholder": "Escolher"
+    }
+  },
+  "graph": {
+    "container": {
+      "content": "Renderizar muitas séries em um único painel pode afetar o desempenho e dificultar a leitura dos dados. Considere refinar suas consultas.",
+      "show-all-series": "Mostrar tudo {{length}}",
+      "show-only-series": "Mostrando apenas {{MAX_NUMBER_OF_TIME_SERIES}} séries",
+      "title": "Gráfico"
+    }
+  },
+  "help-modal": {
+    "shortcuts-category": {
+      "dashboard": "Painel de controle",
+      "focused-panel": "Painel focado",
+      "global": "Global",
+      "time-range": "Intervalo de tempo"
+    },
+    "shortcuts-description": {
+      "change-theme": "Alterar tema",
+      "collapse-all-rows": "Recolher todas as linhas",
+      "copy-time-range": "Copiar intervalo de tempo",
+      "dashboard-settings": "Configurações do painel de controle",
+      "duplicate-panel": "Duplicar painel",
+      "exit-edit/setting-views": "Sair/editar visualizações",
+      "expand-all-rows": "Expandir todas as linhas",
+      "go-to-dashboards": "Ir para Painéis de controle",
+      "go-to-explore": "Ir para Explorar",
+      "go-to-home-dashboard": "Ir para Painel de controle inicial",
+      "go-to-profile": "Ir para Perfil",
+      "make-time-range-permanent": "Tornar o intervalo de tempo absoluto/permanente",
+      "move-time-range-back": "Mover intervalo de tempo para trás",
+      "move-time-range-forward": "Avançar intervalo de tempo",
+      "open-search": "Abrir busca",
+      "open-shared-modal": "Abrir módulo de compartilhamento de painel",
+      "paste-time-range": "Colar intervalo de tempo",
+      "refresh-all-panels": "Atualizar todos os painéis",
+      "remove-panel": "Remover painel",
+      "save-dashboard": "Salvar painel de controle",
+      "show-all-shortcuts": "Mostrar todos os atalhos de teclado",
+      "toggle-active-mode": "Alternar modo em ativo/visualização",
+      "toggle-all-panel-legends": "Alternar todas as legendas de painel",
+      "toggle-auto-fit": "Alternar painéis de autoajuste (recurso experimental)",
+      "toggle-exemplars": "Alternar exemplares em todo o painel",
+      "toggle-graph-crosshair": "Alternar mira compartilhada nos gráficos",
+      "toggle-kiosk": "Alternar modo de quiosque (oculta a navegação superior)",
+      "toggle-panel-edit": "Alternar visualização de edição de painel",
+      "toggle-panel-fullscreen": "Alternar visualização de painel em tela cheia",
+      "toggle-panel-legend": "Alternar legenda de painel",
+      "zoom-out-time-range": "Diminuir o intervalo de tempo"
+    },
+    "title": "Atalhos"
+  },
+  "inspector": {
+    "query": {
+      "collapse-all": "Recolher tudo",
+      "copy-to-clipboard": "Copiar para a área de transferência",
+      "description": "O inspector de consulta permite que você veja a solicitação bruta e a resposta. Para coletar estes dados, o Grafana precisa emitir uma nova consulta. Clique no botão atualizar abaixo para acionar uma nova consulta.",
+      "expand-all": "Expandir tudo",
+      "no-data": "Nenhuma solicitação e resposta coletada ainda. Clique no botão atualizar",
+      "refresh": "Atualizar"
+    }
+  },
+  "library-panel": {
+    "add-modal": {
+      "cancel": "Cancelar",
+      "create": "Criar painel de biblioteca",
+      "error": "Já existe um painel de biblioteca com este nome",
+      "folder": "Salvar na pasta",
+      "folder-description": "As permissões do painel da biblioteca são derivadas das permissões das pastas",
+      "name": "Nome do painel de biblioteca"
+    },
+    "add-widget": {
+      "title": "Adicionar painel a partir da biblioteca de painéis"
+    }
+  },
+  "library-panels": {
+    "empty-state": {
+      "message": ""
+    },
+    "modal": {
+      "button-cancel": "<0>Cancelar</0>",
+      "button-view-panel1": "Visualizar painel em {{label}}...",
+      "button-view-panel2": "Visualizar painel no painel de controle...",
+      "panel-not-linked": "O painel não está vinculado a um painel de controle. Adicione o painel a um painel de controle e tente novamente.",
+      "select-no-options-message": "Nenhum painel de controle encontrado",
+      "select-placeholder": "Comece a digitar para buscar um painel de controle",
+      "title": "Visualizar painel no painel de controle",
+      "body_one": "Este painel está sendo usado em {{count}} painel de controle. Escolha em qual painel de controle você poderá visualizar:",
+      "body_other": "Este painel está sendo usado em {{count}} painéis de controle. Escolha em qual painel de controle você poderá visualizar:"
+    },
+    "save": {
+      "error": "Erro ao salvar painel de biblioteca: \"{{errorMsg}}\"",
+      "success": "Painel de biblioteca salvo"
+    }
+  },
+  "login": {
+    "error": {
+      "blocked": "Você excedeu o número de tentativas de login para este usuário. Tente novamente mais tarde.",
+      "invalid-user-or-password": "Usuário ou senha inválidos",
+      "title": "Falha ao fazer login",
+      "unknown": "Ocorreu um erro desconhecido"
+    },
+    "forgot-password": "Esqueceu sua senha?",
+    "form": {
+      "password-label": "Senha",
+      "password-required": "A senha é obrigatória",
+      "submit-label": "Fazer login",
+      "submit-loading-label": "Fazendo login...",
+      "username-label": "E-mail ou nome de usuário",
+      "username-required": "O e-mail ou nome de usuário é obrigatório"
+    },
+    "services": {
+      "sing-in-with-prefix": "Fazer login com {{serviceName}}"
+    },
+    "signup": {
+      "button-label": "Inscreva-se",
+      "new-to-question": "Novo no Grafana?"
+    }
+  },
+  "migrate-to-cloud": {
+    "can-i-move": {
+      "body": "Depois de conectar esta instalação a uma pilha na nuvem, você será capaz de enviar fontes de dados e painéis de controle.",
+      "link-title": "Aprenda sobre como migrar outras configurações",
+      "title": "Posso mover esta instalação para o Grafana Cloud?"
+    },
+    "connect-modal": {
+      "body-cloud-stack": "Você também precisará de uma pilha na nuvem. Se você se inscreveu, criaremos automaticamente sua primeira pilha. Se você tem uma conta, precisará selecionar ou criar uma pilha.",
+      "body-get-started": "Para começar, você precisará de uma conta do Grafana.com.",
+      "body-paste-stack": "Quando você se decidir sobre a pilha, cole o URL abaixo.",
+      "body-sign-up": "Inscreva-se para criar uma conta do Grafana.com",
+      "body-token": "Sua instalação autogerenciada do Grafana precisa de acesso especial para migrar conteúdo com segurança. Você precisará criar um token de migração para a pilha na nuvem escolhida.",
+      "body-token-field": "Token de migração",
+      "body-token-field-placeholder": "Cole o token aqui",
+      "body-token-instructions": "Entre na sua pilha de nuvem e navegue para Administração, Geral, Migrar para o Grafana Cloud. Crie um token de migração nesta tela e cole o token aqui.",
+      "body-url-field": "URL da pilha na nuvem",
+      "body-view-stacks": "Visualizar minhas pilhas na nuvem",
+      "cancel": "Cancelar",
+      "connect": "Conectar-se a esta pilha",
+      "connecting": "Conectando-se a esta pilha...",
+      "stack-required-error": "O URL da pilha é obrigatório",
+      "title": "Conectar-se a uma pilha na nuvem",
+      "token-required-error": "O token de migração é obrigatório"
+    },
+    "cta": {
+      "button": "Migrar esta instância para a nuvem",
+      "header": "Deixe-nos gerenciar a sua pilha do Grafana"
+    },
+    "disconnect-modal": {
+      "body": "Isto removerá o token de migração desta instalação. Se você deseja carregar mais recursos no futuro, precisará inserir um novo token de migração.",
+      "cancel": "Cancelar",
+      "disconnect": "Desconectar",
+      "disconnecting": "Desconectando...",
+      "error": "Ocorreu um erro ao desconectar",
+      "title": "Desconectar da pilha na nuvem"
+    },
+    "get-started": {
+      "body": "O processo de migração deve ser iniciado a partir da sua instância autogerenciada do Grafana.",
+      "configure-pdc-link": "Configurar PDC para esta pilha",
+      "link-title": "Saiba mais sobre conexão privada de fonte de dados",
+      "step-1": "Faça login na sua instância autogerenciada e navegue para Administração, Geral, Migrar para o Grafana Cloud.",
+      "step-2": "Selecione \"Migrar esta instância para a nuvem\".",
+      "step-3": "Você receberá uma solicitação por um token de migração. Gere um nessa tela.",
+      "step-4": "Na sua instância autogerenciada, selecione \"Enviar tudo\" para enviar fontes de dados e painéis de controle para esta pilha na nuvem.",
+      "step-5": "Se algumas das suas fontes de dados não funcionarem em Internet pública, você precisará instalar o Private Source Connect no seu ambiente autogerenciado.",
+      "title": "Como começar"
+    },
+    "is-it-secure": {
+      "body": "O Grafana Labs está empenhado em manter os mais elevados padrões de privacidade e segurança de dados. Ao implementar tecnologias e procedimentos de segurança padrão do setor, ajudamos a proteger os dados de nossos clientes de acessos não autorizados, uso ou divulgação.",
+      "link-title": "Centro de Confiança do Grafana Labs",
+      "title": "É seguro?"
+    },
+    "migrate-to-this-stack": {
+      "body": "Algumas configurações da sua instância autogerenciada do Grafana podem ser copiadas automaticamente para esta pilha na nuvem.",
+      "link-title": "Visualizar o guia completo de migração",
+      "title": "Migrar configurações para esta pilha"
+    },
+    "migration-token": {
+      "body": "Sua instância autogerenciada do Grafana exigirá um token de autenticação especial para se conectar com segurança a esta pilha na nuvem.",
+      "delete-button": "Excluir este token de migração",
+      "delete-modal-body": "Se você já usou este token com uma instalação autogerenciada, essa instalação não poderá mais enviar conteúdos.",
+      "delete-modal-cancel": "Cancelar",
+      "delete-modal-confirm": "Excluir",
+      "delete-modal-deleting": "Excluindo...",
+      "delete-modal-title": "Excluir token de migração",
+      "generate-button": "Gerar um token de migração",
+      "generate-button-loading": "Gerando um token de migração...",
+      "modal-close": "Fechar",
+      "modal-copy-and-close": "Copiar para a área de transferência e fechar",
+      "modal-copy-button": "Copiar para a área de transferência",
+      "modal-field-description": "Copie o token agora, já que você não será capaz de vê-lo novamente. Perder um token requer criar um novo.",
+      "modal-field-label": "Token",
+      "modal-title": "Token de migração criado",
+      "status": "Status atual: <2></2>",
+      "title": "Token de migração"
+    },
+    "pdc": {
+      "body": "Expor suas fontes de dados à Internet pode suscitar questões de segurança. A fonte de dados privada de conexão (PDC) permite ao Grafana Cloud acessar seus recursos de dados existentes por meio de um túnel de rede seguro.",
+      "link-title": "Saiba mais sobre o PDC",
+      "title": "Nem todas as minhas fontes de dados estão na Internet pública"
+    },
+    "pricing": {
+      "body": "O Grafana Cloud tem um plano grátis generoso e um teste de uso ilimitado de 14 dias. Depois que o seu período de teste expirar, você receberá uma cobrança com base no uso acima dos limites do plano grátis.",
+      "link-title": "Preços do Grafana Cloud",
+      "title": "Quanto isto custa?"
+    },
+    "resource-status": {
+      "error-details-button": "Detalhes",
+      "failed": "Erro",
+      "migrated": "Enviado para a nuvem",
+      "migrating": "Enviando...",
+      "not-migrated": "Ainda não enviado",
+      "unknown": "Desconhecido"
+    },
+    "resource-type": {
+      "dashboard": "Painel de controle",
+      "datasource": "Fonte de dados",
+      "unknown": "Desconhecido"
+    },
+    "summary": {
+      "disconnect": "",
+      "error-starting-migration": "",
+      "start-migration": "",
+      "target-stack-title": ""
+    },
+    "token-status": {
+      "active": "Token criado e ativo",
+      "no-active": "Nenhum token ativo"
+    },
+    "what-is-cloud": {
+      "body": "O Grafana Cloud é uma plataforma de observação hospedada na nuvem totalmente gerenciada ideal para ambientes nativos em nuvem. É tudo o que você adora sobre o Grafana sem a sobrecarga de manter, atualizar e apoiar uma instalação.",
+      "link-title": "Conheça os recursos da nuvem",
+      "title": "O que é o Grafana Cloud?"
+    },
+    "why-host": {
+      "body": "Além da conveniência da hospedagem gerenciada, o Grafana Cloud inclui muitos recursos exclusivos na nuvem, como SLOs, gestão de incidentes, aprendizado de máquina e eficientes integrações de observabilidade.",
+      "link-title": "Tem mais perguntas? Fale com um especialista",
+      "title": "Por que hospedar com o Grafana?"
+    }
+  },
+  "nav": {
+    "add-new-connections": {
+      "title": "Adicionar nova conexão"
+    },
+    "admin": {
+      "subtitle": "Gerencie configurações do servidor e acesso a recursos como organizações, usuários e licenças",
+      "title": "Administrador do servidor"
+    },
+    "alert-list-legacy": {
+      "title": "Regras de alerta"
+    },
+    "alerting": {
+      "subtitle": "Saiba mais sobre problemas no seu sistema logo depois que ocorrerem",
+      "title": "Alertas"
+    },
+    "alerting-admin": {
+      "title": "Administrador"
+    },
+    "alerting-am-routes": {
+      "subtitle": "Determine como os alertas são encaminhados para pontos de contato",
+      "title": "Política de notificações"
+    },
+    "alerting-channels": {
+      "title": "Canais de notificações"
+    },
+    "alerting-groups": {
+      "subtitle": "Veja alertas agrupados de uma instância de Alertmanager",
+      "title": "Grupos"
+    },
+    "alerting-home": {
+      "title": "Página inicial"
+    },
+    "alerting-legacy": {
+      "title": "Alerta (legado)"
+    },
+    "alerting-list": {
+      "subtitle": "Regras que determinam se um alerta disparará",
+      "title": "Regras de alerta"
+    },
+    "alerting-receivers": {
+      "subtitle": "Escolha como notificar seus pontos de contato quando um alerta disparar",
+      "title": "Pontos de contato"
+    },
+    "alerting-silences": {
+      "subtitle": "Interrompe notificações de uma ou mais regras de alerta",
+      "title": "Silenciados"
+    },
+    "alerting-upgrade": {
+      "subtitle": "Evolua os seus alertas legados existentes e canais de notificação para os novos alertas do Grafana",
+      "title": "Alerta de atualização"
+    },
+    "alerts-and-incidents": {
+      "subtitle": "Aplicativos de gestão de alertas e incidentes",
+      "title": "Alertas e IRM"
+    },
+    "api-keys": {
+      "subtitle": "Gerencie e crie chaves de API que são usadas para interagir com as APIs HTTP do Grafana",
+      "title": "Chaves de API"
+    },
+    "application": {
+      "title": "Aplicativo"
+    },
+    "apps": {
+      "subtitle": "Plug-ins de aplicativos que ampliam a experiência do Grafana",
+      "title": "Aplicativos"
+    },
+    "authentication": {
+      "title": "Autenticação"
+    },
+    "collector": {
+      "title": "Coletor"
+    },
+    "config": {
+      "title": "Administração"
+    },
+    "config-access": {
+      "subtitle": "Configure o acesso para usuários individuais, equipes e contas de serviço",
+      "title": "Usuários e acesso"
+    },
+    "config-general": {
+      "subtitle": "Gerencie preferências e configurações padrão no Grafana",
+      "title": "Geral"
+    },
+    "config-plugins": {
+      "subtitle": "Instale plug-ins e defina as relações entre os dados",
+      "title": "Plug-ins e dados"
+    },
+    "connect-data": {
+      "title": "Dados de conexão"
+    },
+    "connections": {
+      "subtitle": "Procure e crie novas conexões",
+      "title": "Conexões"
+    },
+    "correlations": {
+      "subtitle": "Adicione e configure correlações",
+      "title": "Correlações"
+    },
+    "create": {
+      "title": "Criar"
+    },
+    "create-alert": {
+      "title": "Criar regra de alerta"
+    },
+    "create-dashboard": {
+      "title": "Painel de controle"
+    },
+    "create-folder": {
+      "title": "Pasta"
+    },
+    "create-import": {
+      "title": "Importar painel de controle"
+    },
+    "dashboards": {
+      "subtitle": "Crie e gerencie painéis de controle para visualizar seus dados",
+      "title": "Painéis de controle"
+    },
+    "data-sources": {
+      "subtitle": "Visualize e gerencie suas conexões de fonte de dados conectadas",
+      "title": "Fontes de dados"
+    },
+    "datasources": {
+      "subtitle": "Adicione e configure fontes de dados",
+      "title": "Fontes de dados"
+    },
+    "detect": {
+      "title": "Detectar"
+    },
+    "explore": {
+      "title": "Explorar"
+    },
+    "frontend": {
+      "subtitle": "Ganhe dicas reais de monitoramento de usuários",
+      "title": "Front-end"
+    },
+    "frontend-app": {
+      "title": "Front-end"
+    },
+    "global-orgs": {
+      "subtitle": "Instâncias isoladas do Grafana em execução no mesmo servidor",
+      "title": "Organizações"
+    },
+    "global-users": {
+      "subtitle": "Gerencie usuários no Grafana",
+      "title": "Usuários"
+    },
+    "grafana-quaderno": {
+      "title": "Grafana Quaderno"
+    },
+    "help": {
+      "title": "Ajuda"
+    },
+    "help/community": "Comunidade",
+    "help/documentation": "Documentação",
+    "help/keyboard-shortcuts": "Atalhos do teclado",
+    "help/support": "Suporte",
+    "home": {
+      "title": "Página inicial"
+    },
+    "incidents": {
+      "title": "Incidentes"
+    },
+    "infrastructure": {
+      "subtitle": "Conheça a saúde da sua infraestrutura",
+      "title": "Infraestrutura"
+    },
+    "integrations": {
+      "title": "Integrações"
+    },
+    "k6": {
+      "title": "Desempenho"
+    },
+    "kubernetes": {
+      "title": "Kubernetes"
+    },
+    "library-panels": {
+      "subtitle": "Painéis reutilizáveis que podem ser adicionados a vários painéis de controle",
+      "title": "Painéis de biblioteca"
+    },
+    "machine-learning": {
+      "title": "Aprendizado de máquina"
+    },
+    "manage-folder": {
+      "subtitle": "Gerencie painéis de controle de pastas e permissões"
+    },
+    "migrate-to-cloud": {
+      "subtitle": "Copie a configuração da sua instalação autogerenciada para uma pilha na nuvem",
+      "title": "Migrar para o Grafana Cloud"
+    },
+    "monitoring": {
+      "subtitle": "Monitoramento e infraestrutura de aplicativos",
+      "title": "Observação"
+    },
+    "new": {
+      "title": "Novo"
+    },
+    "new-dashboard": {
+      "title": "Novo painel de controle"
+    },
+    "new-folder": {
+      "title": "Nova pasta"
+    },
+    "observability": {
+      "title": "Observação"
+    },
+    "oncall": {
+      "title": "OnCall"
+    },
+    "org-settings": {
+      "subtitle": "Gerencie as preferências em uma organização",
+      "title": "Preferências padrão"
+    },
+    "playlists": {
+      "subtitle": "Grupos de painéis de controle exibidos em uma sequência",
+      "title": "Listas de reprodução"
+    },
+    "plugins": {
+      "subtitle": "Amplie a experiência do Grafana com plug-ins",
+      "title": "Plug-ins"
+    },
+    "private-data-source-connections": {
+      "subtitle": "Consulte dados que vivem em uma rede segura sem abrir a rede ao tráfego de entrada do Grafana Cloud. Saiba mais na nossa documentação.",
+      "title": "Conexão privada de dados"
+    },
+    "profile/notifications": {
+      "title": "Histórico de notificações"
+    },
+    "profile/password": {
+      "title": "Alterar senha"
+    },
+    "profile/settings": {
+      "title": "Perfil"
+    },
+    "profiles": {
+      "title": "Perfis"
+    },
+    "public": {
+      "title": "Painéis de controle públicos"
+    },
+    "recorded-queries": {
+      "title": "Consultas gravadas"
+    },
+    "reporting": {
+      "title": "Reportar"
+    },
+    "scenes": {
+      "title": "Cenários"
+    },
+    "search": {
+      "placeholderCommandPalette": "Buscar ou pular para..."
+    },
+    "search-dashboards": {
+      "title": "Buscar painéis de controle"
+    },
+    "server-settings": {
+      "subtitle": "Veja as configurações definidas nas suas configurações do Grafana",
+      "title": "Configurações"
+    },
+    "service-accounts": {
+      "subtitle": "Use contas de serviço para executar cargas de trabalho automatizadas no Grafana",
+      "title": "Contas de serviço"
+    },
+    "sign-out": {
+      "title": "Finalizar sessão"
+    },
+    "slo": {
+      "title": "SLO"
+    },
+    "snapshots": {
+      "subtitle": "Representações interativas, publicamente disponíveis e pontuais dos painéis de controle",
+      "title": "Capturas"
+    },
+    "starred": {
+      "title": "Favorito"
+    },
+    "starred-empty": {
+      "title": "Seus painéis de controle favoritos aparecerão aqui"
+    },
+    "statistics-and-licensing": {
+      "title": "Estatísticas e licenciamento"
+    },
+    "storage": {
+      "subtitle": "Gerenciar armazenamento de arquivos",
+      "title": "Armazenamento"
+    },
+    "support-bundles": {
+      "subtitle": "Baixar pacotes de suporte",
+      "title": "Pacotes de suporte"
+    },
+    "synthetics": {
+      "title": "Sintéticos"
+    },
+    "teams": {
+      "subtitle": "Grupos de usuários que têm painel de controle comum e necessidades de permissão",
+      "title": "Equipes"
+    },
+    "testing-and-synthetics": {
+      "subtitle": "Otimize o desempenho com visões k6 e monitorização sintética",
+      "title": "Teste e sintética"
+    },
+    "upgrading": {
+      "title": "Estatísticas e licença"
+    },
+    "users": {
+      "subtitle": "Convide e atribua funções aos usuários",
+      "title": "Usuários"
+    }
+  },
+  "navigation": {
+    "kiosk": {
+      "tv-alert": "Pressione ESC para sair do modo de quiosque"
+    },
+    "megamenu": {
+      "close": "Fechar menu",
+      "dock": "Menu da dock",
+      "list-label": "Navegação",
+      "undock": "Desacoplar menu"
+    },
+    "toolbar": {
+      "close-menu": "Fechar menu",
+      "enable-kiosk": "Ativar modo de quiosque",
+      "open-menu": "Abrir menu",
+      "toggle-search-bar": "Alternar barra de busca superior"
+    }
+  },
+  "news": {
+    "drawer": {
+      "close": "Fechar menu"
+    },
+    "title": "Mais recentes do blog"
+  },
+  "notifications": {
+    "starred-dashboard": "Painel de controle marcado como favorito",
+    "unstarred-dashboard": "Painel de controle não marcado como favorito"
+  },
+  "panel": {
+    "header-menu": {
+      "copy": "Copiar",
+      "create-library-panel": "Criar painel de biblioteca",
+      "duplicate": "Duplicar",
+      "edit": "Editar",
+      "explore": "Explorar",
+      "get-help": "Obter ajuda",
+      "hide-legend": "Ocultar legenda",
+      "inspect": "Inspecionar",
+      "inspect-data": "Dados",
+      "inspect-json": "Painel JSON",
+      "more": "Mais...",
+      "new-alert-rule": "Nova regra de alerta",
+      "query": "Consulta",
+      "remove": "Remover",
+      "share": "Compartilhar",
+      "show-legend": "Mostrar legenda",
+      "unlink-library-panel": "Desvincular painel de biblioteca",
+      "view": "Visualizar"
+    }
+  },
+  "playlist-edit": {
+    "error-prefix": "Erro ao carregar lista de reprodução:",
+    "form": {
+      "add-tag-label": "Adicionar por tag",
+      "add-tag-placeholder": "Selecione uma tag",
+      "add-title-label": "Adicionar por título",
+      "cancel": "Cancelar",
+      "heading": "Adicionar painéis de controle",
+      "interval-label": "Intervalo",
+      "interval-placeholder": "5m",
+      "interval-required": "O intervalo é obrigatório",
+      "name-label": "Nome",
+      "name-placeholder": "Nome",
+      "name-required": "O nome é obrigatório",
+      "save": "Salvar",
+      "table-delete": "Excluir item da lista de reprodução",
+      "table-drag": "Arraste e solte para reordenar",
+      "table-empty": "A lista de reprodução está vazia. Adicione painéis de controle abaixo.",
+      "table-heading": "Painéis de controle"
+    },
+    "sub-title": "Uma lista de reprodução gira por uma lista de painéis de controle pré-selecionada. Uma lista de reprodução pode ser uma ótima maneira de construir uma consciência de situação, ou apenas exibir suas métricas para sua equipe ou visitantes.",
+    "title": "Editar lista de reprodução"
+  },
+  "playlist-page": {
+    "card": {
+      "delete": "Excluir lista de reprodução",
+      "edit": "Editar lista de reprodução",
+      "start": "Começar lista de reprodução",
+      "tooltip": "Compartilhar lista de reprodução"
+    },
+    "create-button": {
+      "title": "Nova lista de reprodução"
+    },
+    "delete-modal": {
+      "body": "Tem certeza de que deseja excluir a lista de reprodução {{name}}?",
+      "confirm-text": "Excluir"
+    },
+    "empty": {
+      "button": "Criar lista de reprodução",
+      "pro-tip": "Você pode usar listas de reprodução para alternar entre painéis de controle na TVs sem controle de usuário",
+      "pro-tip-link-title": "Saiba mais",
+      "title": "Não há listas de reprodução criadas ainda"
+    }
+  },
+  "playlists": {
+    "empty-state": {
+      "message": ""
+    }
+  },
+  "profile": {
+    "change-password": {
+      "cancel-button": "Cancelar",
+      "cannot-change-password-message": "A senha não pode ser alterada aqui.",
+      "change-password-button": "Alterar senha",
+      "confirm-password-label": "Confirmar senha",
+      "confirm-password-required": "A confirmação da nova senha é obrigatória",
+      "ldap-auth-proxy-message": "Você não pode alterar a senha quando conectado com LDAP ou proxy de autenticação.",
+      "new-password-label": "Nova senha",
+      "new-password-required": "A nova senha é obrigatória",
+      "new-password-same-as-old": "A nova senha não pode ser igual à antiga.",
+      "old-password-label": "Senha antiga",
+      "old-password-required": "A senha antiga é obrigatória",
+      "passwords-must-match": "As senhas devem corresponder",
+      "strong-password-validation-register": "A senha não está de acordo com a política de senha forte"
+    }
+  },
+  "public-dashboard": {
+    "acknowledgment-checkboxes": {
+      "ack-title": "Antes de tornar público o painel de controle, reconheça o seguinte:",
+      "data-src-ack-desc": "A publicação atualmente só funciona com um subconjunto de fontes de dados*",
+      "data-src-ack-tooltip": "Saiba mais sobre os dados públicos",
+      "public-ack-desc": "Todo o seu painel de controle será público*",
+      "public-ack-tooltip": "Saiba mais sobre painéis de controle públicos",
+      "usage-ack-desc": "Tornar um painel de controle público fará com que as consultas sejam executadas cada vez que forem visualizadas, o que pode aumentar os custos*",
+      "usage-ack-desc-tooltip": "Saiba mais sobre consultas de cache"
+    },
+    "config": {
+      "can-view-dashboard-radio-button-label": "Pode visualizar o painel de controle",
+      "copy-button": "Copiar",
+      "dashboard-url-field-label": "URL do painel de controle",
+      "email-share-type-option-label": "Apenas pessoas especificadas",
+      "pause-sharing-dashboard-label": "Pausar compartilhamento de painel de controle",
+      "public-share-type-option-label": "Qualquer pessoa com um link",
+      "revoke-public-URL-button": "Revogar URL público",
+      "revoke-public-URL-button-title": "Revogar URL público",
+      "settings-title": "Configurações"
+    },
+    "create-page": {
+      "generate-public-url-button": "Gerar URL público",
+      "unsupported-features-desc": "Atualmente, não oferecemos suporte a variáveis de modelo ou fontes de dados frontend",
+      "welcome-title": "Boas-vindas aos painéis de controle públicos!"
+    },
+    "delete-modal": {
+      "revoke-nonorphaned-body-text": "Tem certeza de que deseja revogar este URL? O painel de controle não será mais público.",
+      "revoke-orphaned-body-text": "O painel de controle público órfão já não será público.",
+      "revoke-title": "Revogar URL público"
+    },
+    "email-sharing": {
+      "input-invalid-email-text": "E-mail inválido",
+      "input-required-email-text": "O e-mail é obrigatório",
+      "invite-button": "Convidar",
+      "invite-field-desc": "Convidar pessoas por e-mail",
+      "invite-field-label": "Convidar",
+      "resend-button": "Reenviar",
+      "resend-button-title": "Reenviar",
+      "revoke-button": "Revogar",
+      "revoke-button-title": "Revogar"
+    },
+    "modal-alerts": {
+      "no-upsert-perm-alert-desc": "Entre em contato com seu administrador para obter permissão para painéis de controle {{mode}} públicos",
+      "no-upsert-perm-alert-title": "Você não tem permissão para um painel de controle {{ mode }} público",
+      "save-dashboard-changes-alert-title": "Salve as alterações do seu painel de controle antes de atualizar a configuração pública",
+      "unsupport-data-source-alert-readmore-link": "Leia mais sobre as fontes de dados suportadas",
+      "unsupported-data-source-alert-desc": "Há fontes de dados neste painel de controle que não são suportadas por painéis de controle públicos. Os painéis que usam essas fontes de dados podem não funcionar corretamente: {{unsupportedDataSources}}.",
+      "unsupported-data-source-alert-title": "Fontes de dados não suportadas",
+      "unsupported-template-variable-alert-desc": "Este painel de controle público pode não funcionar, pois ele usa variáveis de modelo",
+      "unsupported-template-variable-alert-title": "As variáveis de modelo não são suportadas"
+    },
+    "settings-bar-header": {
+      "collapse-settings-tooltip": "Recolher configurações",
+      "expand-settings-tooltip": "Expandir configurações"
+    },
+    "settings-configuration": {
+      "default-time-range-label": "Intervalo de tempo padrão",
+      "default-time-range-label-desc": "O painel de controle público usa as configurações padrão do intervalo de tempo do painel de controle",
+      "show-annotations-label": "Mostrar anotações",
+      "show-annotations-label-desc": "Mostrar anotações no painel de controle público",
+      "time-range-picker-label": "Seletor de intervalo de tempo ativado",
+      "time-range-picker-label-desc": "Permitir que os espectadores alterem o intervalo de tempo"
+    },
+    "settings-summary": {
+      "annotations-hide-text": "Anotações = ocultar",
+      "annotations-show-text": "Anotações = mostrar",
+      "time-range-picker-disabled-text": "Seletor de intervalo de tempo = desativado",
+      "time-range-picker-enabled-text": "Seletor de intervalo de tempo = ativado",
+      "time-range-text": "Intervalo de tempo = "
+    }
+  },
+  "public-dashboard-list": {
+    "button": {
+      "config-button-tooltip": "Configurar painel de controle público",
+      "revoke-button-text": "Revogar URL público",
+      "revoke-button-tooltip": "Revogar URL do painel de controle público",
+      "view-button-tooltip": "Visualizar painel de controle público"
+    },
+    "dashboard-title": {
+      "orphaned-title": "<0>Painel de controle público órfão</0>",
+      "orphaned-tooltip": "O painel de controle vinculado já foi excluído"
+    },
+    "toggle": {
+      "pause-sharing-toggle-text": "Pausar compartilhamento"
+    }
+  },
+  "public-dashboard-users-access-list": {
+    "dashboard-modal": {
+      "loading-text": "Carregando...",
+      "open-dashboard-list-text": "Abrir lista de painéis de controle",
+      "public-dashboard-link": "URL do painel de controle público",
+      "public-dashboard-setting": "Configurações do painel de controle público"
+    },
+    "delete-user-modal": {
+      "delete-user-button-text": "Excluir usuário",
+      "delete-user-cancel-button": "Cancelar",
+      "delete-user-revoke-access-button": "Revogar acesso",
+      "revoke-access-title": "Revogar acesso",
+      "revoke-user-access-modal-desc-line1": "Tem certeza de que deseja revogar o acesso por {{email}}?",
+      "revoke-user-access-modal-desc-line2": "Esta ação irá imediatamente revogar o acesso por {{email}} a todos os painéis de controle públicos."
+    },
+    "modal": {
+      "dashboard-modal-title": "Painéis de controle públicos"
+    },
+    "table-header": {
+      "activated-label": "Ativado",
+      "activated-tooltip": "O usuário mais recente foi um usuário ativo em um painel de controle",
+      "email-label": "E-mail",
+      "last-active-label": "Última atividade",
+      "origin-label": "Origem",
+      "role-label": "Função"
+    }
+  },
+  "query-operation": {
+    "header": {
+      "collapse-row": "Recolher linha de consulta",
+      "datasource-help": "Mostrar ajuda da fonte de dados",
+      "drag-and-drop": "Arraste e solte para reordenar",
+      "duplicate-query": "Duplicar consulta",
+      "expand-row": "Expandir linha de consulta",
+      "hide-response": "",
+      "remove-query": "Remover consulta",
+      "show-response": "",
+      "toggle-edit-mode": "Alternar modo de edição de texto"
+    },
+    "query-editor-not-exported": "O plug-in de origem de dados não exporta nenhum componente de editor de consulta"
+  },
+  "refresh-picker": {
+    "aria-label": {
+      "choose-interval": "Atualização automática desativada. Escolha o intervalo de tempo de atualização",
+      "duration-selected": "Escolha o intervalo de tempo de atualização com o intervalo atual de {{durationAriaLabel}} selecionado"
+    },
+    "auto-option": {
+      "aria-label": "",
+      "label": ""
+    },
+    "live-option": {
+      "aria-label": "Ativar transmissão ao vivo",
+      "label": "Ao vivo"
+    },
+    "off-option": {
+      "aria-label": "Desativar atualização automática",
+      "label": "Desativar"
+    },
+    "tooltip": {
+      "interval-selected": "Definir intervalo de atualização automática",
+      "turned-off": "Atualização automática desativada"
+    }
+  },
+  "return-to-previous": {
+    "button": {
+      "label": "Voltar para {{title}}"
+    },
+    "dismissable-button": "Fechar"
+  },
+  "search": {
+    "actions": {
+      "include-panels": "Incluir painéis",
+      "remove-datasource-filter": "Banco de dados: {{datasource}}",
+      "sort-placeholder": "Ordenar",
+      "starred": "Favorito",
+      "view-as-folders": "Visualizar por pastas",
+      "view-as-list": "Visualizar como lista"
+    },
+    "dashboard-actions": {
+      "import": "Importar",
+      "new": "Novo",
+      "new-dashboard": "Novo painel de controle",
+      "new-folder": "Nova pasta"
+    },
+    "results-table": {
+      "datasource-header": "Fonte de dados",
+      "location-header": "Localização",
+      "name-header": "Nome",
+      "tags-header": "Tags",
+      "type-dashboard": "Painel de controle",
+      "type-folder": "Pasta",
+      "type-header": "Tipo"
+    },
+    "search-input": {
+      "include-panels-placeholder": "Buscar painéis de controle, pastas e painéis",
+      "placeholder": "Buscar painéis de controle e pastas"
+    }
+  },
+  "share-modal": {
+    "dashboard": {
+      "title": "Compartilhar"
+    },
+    "embed": {
+      "copy": "Copiar para a área de transferência",
+      "html": "HTML incorporado",
+      "html-description": "O código HTML abaixo pode ser colado e incluído em outra página da Web. A menos que o acesso anônimo esteja ativado, o usuário visualizando essa página precisa estar logado no Grafana para que o gráfico carregue.",
+      "info": "Gera HTML para incorporar um iframe com esse painel.",
+      "time-range": "Intervalo de tempo atual",
+      "time-range-description": "Transforma o intervalo de tempo relativo atual para um intervalo de tempo absoluto"
+    },
+    "export": {
+      "back-button": "Voltar para exportar configuração",
+      "cancel-button": "Cancelar",
+      "info-text": "Exportar este painel de controle.",
+      "save-button": "Salvar no arquivo",
+      "share-externally-label": "Exportar para compartilhamento externo",
+      "view-button": "Visualizar JSON"
+    },
+    "library": {
+      "info": "Criar painel de biblioteca."
+    },
+    "link": {
+      "copy-link-button": "Copiar",
+      "info-text": "Crie um link direto para este painel de controle ou painel, personalizado com as opções abaixo.",
+      "link-url": "URL do link",
+      "render-alert": "Plug-in renderizador de imagem não instalado",
+      "render-instructions": "Para renderizar uma imagem de painel, você deve instalar o <1>plug-in de renderização de imagens do Grafana</1>. Contate o administrador do Grafana para instalar o plug-in.",
+      "rendered-image": "Link direto de imagem renderizada",
+      "save-alert": "O painel de controle não está salvo",
+      "save-dashboard": "Para renderizar uma imagem do painel, você deve salvar o painel de controle primeiro.",
+      "shorten-url": "Encurtar URL",
+      "time-range-description": "Transforma o intervalo de tempo relativo atual para um intervalo de tempo absoluto",
+      "time-range-label": "Bloquear intervalo de tempo"
+    },
+    "panel": {
+      "title": "Compartilhar painel"
+    },
+    "snapshot": {
+      "cancel-button": "Cancelar",
+      "copy-link-button": "Copiar",
+      "delete-button": "Excluir captura.",
+      "deleted-message": "A captura foi excluída. Se você já a acessou uma vez, pode levar até uma hora antes de ser removida dos caches de navegador ou cache de CDN.",
+      "expire": "Expira",
+      "expire-day": "1 dia",
+      "expire-hour": "1 hora",
+      "expire-never": "Nunca",
+      "expire-week": "1 semana",
+      "info-text-1": "Uma captura é uma maneira instantânea de compartilhar um painel de controle interativo publicamente. Quando criadas, nós tiramos dados confidenciais como consultas (métrica, modelo e anotação) e links do painel, deixando apenas os dados métricos e nomes de séries visíveis incorporados no seu painel de controle.",
+      "info-text-2": "Tenha em mente que sua captura <1>pode ser visualizada por qualquer pessoa</1> que possui o link e pode acessar o URL. Compartilhe com sabedoria.",
+      "local-button": "Publicar captura",
+      "mistake-message": "Você cometeu um erro? ",
+      "name": "Nome da captura",
+      "timeout": "Tempo limite (segundos)",
+      "timeout-description": "Talvez você precise configurar o valor de tempo limite se demorar muito para coletar as métricas do painel de controle.",
+      "url-label": "URL da captura"
+    },
+    "tab-title": {
+      "embed": "Incorporado",
+      "export": "Exportar",
+      "library-panel": "Painel de biblioteca",
+      "link": "Link",
+      "panel-embed": "Incorporado",
+      "public-dashboard": "",
+      "public-dashboard-title": "Painel de controle público",
+      "snapshot": "Captura"
+    },
+    "theme-picker": {
+      "current": "Atual",
+      "dark": "Escuro",
+      "field-name": "Tema",
+      "light": "Claro"
+    },
+    "view-json": {
+      "copy-button": "Copiar para a área de transferência"
+    }
+  },
+  "share-playlist": {
+    "checkbox-description": "As alturas do painel serão ajustadas para caber no tamanho da tela",
+    "checkbox-label": "Ajuste automático",
+    "copy-link-button": "Copiar",
+    "link-url-label": "URL do link",
+    "mode": "Modo",
+    "mode-kiosk": "Quiosque",
+    "mode-normal": "Normal",
+    "mode-tv": "TV",
+    "title": "Compartilhar lista de reprodução"
+  },
+  "shared": {
+    "preferences": {
+      "theme": {
+        "dark-label": "Escuro",
+        "light-label": "Claro",
+        "system-label": "Preferências do sistema"
+      }
+    }
+  },
+  "shared-dashboard": {
+    "fields": {
+      "timezone-label": "Fuso horário"
+    }
+  },
+  "shared-preferences": {
+    "fields": {
+      "home-dashboard-label": "Painel de controle inicial",
+      "home-dashboard-placeholder": "Painel de controle padrão",
+      "locale-label": "Idioma",
+      "locale-placeholder": "Escolher idioma",
+      "theme-label": "Tema da interface",
+      "week-start-label": "Início da semana"
+    },
+    "theme": {
+      "default-label": "Padrão"
+    },
+    "title": "Preferências"
+  },
+  "snapshot": {
+    "external-badge": "Externo",
+    "name-column-header": "Nome",
+    "url-column-header": "URL da captura",
+    "view-button": "Visualizar"
+  },
+  "tag-filter": {
+    "loading": "Carregando...",
+    "no-tags": "Nenhuma tag encontrada",
+    "placeholder": "Filtrar por tag"
+  },
+  "time-picker": {
+    "absolute": {
+      "recent-title": "Intervalos absolutos usados recentemente",
+      "title": "Intervalo de tempo absoluto"
+    },
+    "calendar": {
+      "apply-button": "Aplicar intervalo de tempo",
+      "cancel-button": "Cancelar",
+      "close": "Fechar calendário",
+      "select-time": "Selecionar um intervalo de tempo"
+    },
+    "content": {
+      "empty-recent-list-docs": "<0><0>Leia a documentação</0><1> para saber mais sobre como entrar em intervalos de tempo personalizados.</1></0>",
+      "empty-recent-list-info": "Parece que você não usou este seletor de tempo antes. Assim que você inserir alguns intervalos de tempo, os intervalos usados recentemente aparecerão aqui.",
+      "filter-placeholder": "Buscar intervalos rápidos"
+    },
+    "copy-paste": {
+      "copy-success-message": "Intervalo de tempo copiado para a área de transferência",
+      "default-error-message": "{{error}} não é um intervalo de tempo válido",
+      "default-error-title": "Intervalo de tempo inválido",
+      "tooltip-copy": "Copiar intervalo de tempo para a área de transferência",
+      "tooltip-paste": "Colar intervalo de tempo"
+    },
+    "footer": {
+      "change-settings-button": "Alterar configurações de hora",
+      "fiscal-year-option": "Ano fiscal",
+      "fiscal-year-start": "Mês inicial do ano fiscal",
+      "time-zone-option": "Fuso horário",
+      "time-zone-selection": "Seleção de fuso horário"
+    },
+    "range-content": {
+      "apply-button": "Aplicar intervalo de tempo",
+      "default-error": "Insira uma data passada ou \"agora\"",
+      "fiscal-year": "Ano fiscal",
+      "from-input": "De",
+      "open-input-calendar": "Abrir calendário",
+      "range-error": "\"De\" não pode ser após \"Para\"",
+      "to-input": "Para"
+    },
+    "range-picker": {
+      "backwards-time-aria-label": "Mover intervalo de tempo para trás",
+      "current-time-selected": "Intervalo de tempo selecionado: {{currentTimeRange}}",
+      "forwards-time-aria-label": "Avançar intervalo de tempo",
+      "to": "para",
+      "zoom-out-button": "Diminuir o intervalo de tempo",
+      "zoom-out-tooltip": "Redução de intervalo de tempo <1></1> CTRL+Z"
+    },
+    "time-range": {
+      "aria-role": "Intervalo de tempo selecionado",
+      "default-title": "Intervalos de tempo",
+      "example-title": "Exemplos de intervalos de tempo",
+      "specify": "Especifique o intervalo de tempo <1></1>"
+    },
+    "zone": {
+      "select-aria-label": "Seletor de fuso horário",
+      "select-search-input": "Tipo de busca (país, cidade, abreviação)"
+    }
+  },
+  "transformations": {
+    "empty": {
+      "add-transformation-body": "As transformações permitem que os dados sejam alterados de várias maneiras antes de sua visualização ser mostrada. <1></1>Isso inclui juntar dados, renomear campos, fazer cálculos, formatar dados para exibição e muito mais.",
+      "add-transformation-header": "Começar a transformar dados"
+    }
+  },
+  "user-orgs": {
+    "current-org-button": "Atual",
+    "name-column": "Nome",
+    "role-column": "Função",
+    "select-org-button": "Selecionar organização",
+    "title": "Organizações"
+  },
+  "user-profile": {
+    "fields": {
+      "email-error": "O e-mail é obrigatório",
+      "email-label": "E-mail",
+      "name-error": "O nome é obrigatório",
+      "name-label": "Nome",
+      "username-label": "Nome de usuário"
+    },
+    "tabs": {
+      "general": "Geral"
+    }
+  },
+  "user-session": {
+    "browser-column": "Navegador e SO",
+    "created-at-column": "Logado",
+    "ip-column": "Endereço de IP",
+    "revoke": "Revogar sessão de usuário",
+    "seen-at-column": "Última visualização"
+  },
+  "user-sessions": {
+    "loading": "Carregando sessões..."
+  },
+  "users-access-list": {
+    "tabs": {
+      "public-dashboard-users-tab-title": "Usuários do painel de controle público"
+    }
+  },
+  "variable": {
+    "adhoc": {
+      "placeholder": "Selecionar valor"
+    },
+    "dropdown": {
+      "placeholder": "Inserir valor da variável"
+    },
+    "picker": {
+      "link-all": "Tudo",
+      "option-all": "Tudo",
+      "option-selected-values": "Selecionado",
+      "option-tooltip": "Limpar seleções"
+    },
+    "textbox": {
+      "placeholder": "Inserir valor da variável"
+    }
+  }
+}
\ No newline at end of file
diff --git a/public/locales/zh-Hans/grafana.json b/public/locales/zh-Hans/grafana.json
index 9e5da4eb6d7dc..ecdf114a2cdc0 100644
--- a/public/locales/zh-Hans/grafana.json
+++ b/public/locales/zh-Hans/grafana.json
@@ -1,92 +1,94 @@
 {
-  "_comment": "",
+  "_comment": "此文件是英文字符串的真实来源。在代码库中编辑此文件以更改复数形式和 UI 的其他短语。",
   "access-control": {
     "add-permission": {
-      "role-label": "",
-      "serviceaccount-label": "",
-      "team-label": "",
-      "title": "",
-      "user-label": ""
+      "role-label": "角色",
+      "serviceaccount-label": "服务帐户",
+      "team-label": "团队",
+      "title": "添加权限：",
+      "user-label": "用户"
     },
     "add-permissions": {
-      "save": ""
+      "save": "保存"
     },
     "permission-list": {
-      "permission": ""
+      "permission": "权限"
     },
     "permissions": {
-      "add-label": "",
-      "no-permissions": "",
-      "permissions-change-warning": "",
-      "role": "",
-      "serviceaccount": "",
-      "team": "",
-      "title": "",
-      "user": ""
+      "add-label": "添加权限",
+      "no-permissions": "没有任何权限",
+      "permissions-change-warning": "这将更改此文件夹及其所有子文件夹的权限。总体而言，这将影响：",
+      "role": "角色",
+      "serviceaccount": "服务帐户",
+      "team": "团队",
+      "title": "权限",
+      "user": "用户"
     }
   },
+  "bouncing-loader": {
+    "label": "正在加载"
+  },
   "browse-dashboards": {
     "action": {
-      "cancel-button": "",
-      "cannot-move-folders": "",
-      "delete-button": "",
-      "delete-modal-invalid-text": "",
-      "delete-modal-invalid-title": "",
-      "delete-modal-text": "",
-      "delete-modal-title": "",
-      "deleting": "",
-      "manage-permissions-button": "",
-      "move-button": "",
-      "move-modal-alert": "",
-      "move-modal-field-label": "",
-      "move-modal-text": "",
-      "move-modal-title": "",
-      "moving": "",
-      "new-folder-name-required-phrase": ""
+      "cancel-button": "取消",
+      "cannot-move-folders": "文件夹无法移动",
+      "delete-button": "删除",
+      "delete-modal-invalid-text": "一个或多个文件夹包含库面板或警报规则。请首先删除这些以便继续。",
+      "delete-modal-invalid-title": "无法删除文件夹",
+      "delete-modal-text": "此操作将删除以下内容：",
+      "delete-modal-title": "删除",
+      "deleting": "正在删除...",
+      "manage-permissions-button": "管理权限",
+      "move-button": "移动",
+      "move-modal-alert": "移动此项目可能会改变其权限。",
+      "move-modal-field-label": "文件夹名称",
+      "move-modal-text": "此操作将移动以下内容：",
+      "move-modal-title": "移动",
+      "moving": "正在移动...",
+      "new-folder-name-required-phrase": "文件夹名称是必需项。"
     },
     "counts": {
-      "alertRule_other": "",
-      "dashboard_other": "",
-      "folder_other": "",
-      "libraryPanel_other": "",
-      "total_other": ""
+      "alertRule_other": "{{count}} 条警告规则",
+      "dashboard_other": "{{count}} 个仪表板",
+      "folder_other": "{{count}} 个文件夹",
+      "libraryPanel_other": "{{count}} 个库面板",
+      "total_other": "{{count}} 个项目"
     },
     "dashboards-tree": {
-      "collapse-folder-button": "",
-      "expand-folder-button": "",
-      "name-column": "",
-      "select-all-header-checkbox": "",
-      "select-checkbox": "",
-      "tags-column": ""
+      "collapse-folder-button": "折叠文件夹 {{title}}",
+      "expand-folder-button": "展开文件夹 {{title}}",
+      "name-column": "名称",
+      "select-all-header-checkbox": "全选",
+      "select-checkbox": "选择",
+      "tags-column": "标签"
     },
     "folder-actions-button": {
-      "delete": "",
-      "folder-actions": "",
-      "manage-permissions": "",
-      "move": ""
+      "delete": "删除",
+      "folder-actions": "文件夹操作",
+      "manage-permissions": "管理权限",
+      "move": "移动"
     },
     "folder-picker": {
-      "accessible-label": "",
-      "button-label": "",
-      "empty-message": "",
-      "error-title": "",
-      "search-placeholder": "",
-      "unknown-error": ""
+      "accessible-label": "选择文件夹：{{ label }} 当前已选择",
+      "button-label": "选择文件夹",
+      "clear-selection": "清除选择",
+      "empty-message": "未找到文件夹",
+      "error-title": "加载文件夹时出错",
+      "search-placeholder": "搜索文件夹",
+      "unknown-error": "未知错误"
     },
     "manage-folder-nav": {
-      "alert-rules": "",
-      "dashboards": "",
-      "panels": "",
-      "permissions": "",
-      "settings": ""
+      "alert-rules": "警报规则",
+      "dashboards": "仪表板",
+      "panels": "面板"
     },
     "new-folder-form": {
-      "cancel-label": "",
-      "create-label": "",
-      "name-label": ""
+      "cancel-label": "取消",
+      "create-label": "创建",
+      "name-label": "文件夹名称"
     },
     "no-results": {
-      "clear": "",
+      "clear": "清除搜索和筛选条件",
       "text": ""
     }
   },
@@ -121,29 +123,104 @@
   },
   "connections": {
     "connect-data": {
-      "category-header-label": ""
+      "category-header-label": "数据源",
+      "empty-message": ""
     },
     "search": {
-      "placeholder": ""
+      "placeholder": "搜索全部"
     }
   },
   "correlations": {
-    "add-new": "",
+    "add-new": "添加新的",
     "alert": {
-      "error-message": "",
-      "title": ""
+      "error-message": "获取关联数据时发生未知错误。请重试。",
+      "title": "获取关联数据时出错"
+    },
+    "basic-info-form": {
+      "description-description": "可选描述，包含关于链接的更多信息",
+      "description-label": "描述",
+      "label-description": "此名称将被用作关联的标签。这将显示为按钮文本、菜单项或在链接上悬停文本。",
+      "label-label": "标签",
+      "label-placeholder": "例如：Tempo traces",
+      "label-required": "此字段是必填字段。",
+      "sub-text": "<0>定义将会描述关联的文本。</0>",
+      "title": "定义关联标签（第 1 步，共 3 步）"
     },
     "list": {
-      "delete": "",
-      "label": "",
-      "loading": "",
-      "read-only": "",
-      "source": "",
-      "target": ""
-    },
-    "page-content": "",
-    "page-heading": "",
-    "sub-title": ""
+      "delete": "删除关联",
+      "label": "标签",
+      "loading": "正在加载...",
+      "read-only": "只读",
+      "source": "源",
+      "target": "目标"
+    },
+    "navigation-form": {
+      "add-button": "添加",
+      "back-button": "上一步",
+      "next-button": "下一步",
+      "save-button": "保存"
+    },
+    "page-content": "要启用 Correlations，请将其在 Grafana 配置中添加：",
+    "page-heading": "Correlations 已禁用",
+    "query-editor": {
+      "control-rules": "选定的目标数据源必须导出查询编辑器。",
+      "data-source-text": "请首先选择目标数据源。",
+      "data-source-title": "没有选择数据源",
+      "error-text": "无法加载所选的数据源。",
+      "error-title": "加载数据源时出错",
+      "loading": "正在加载查询编辑器...",
+      "query-description": "定义点击链接时运行的查询。您可以使用<2>变量</2>访问特定的字段值。",
+      "query-editor-title": "数据源未导出查询编辑器。",
+      "query-label": "查询"
+    },
+    "source-form": {
+      "control-required": "此字段是必填字段。",
+      "description": "您在目标查询中使用了以下变量：<1></1><2></2>数据点需要为所有变量提供作为字段或转换输出的值，以使关联按钮出现在可视化中。 <4></4>注意：并非每个变量都需要在下面明确定义。<7>logfmt</7> 等变换将为每个键/值对创建变量。",
+      "heading": "目标查询中使用的变量",
+      "results-description": "此链接将显示在此字段的值旁边",
+      "results-label": "结果字段",
+      "results-required": "此字段是必填字段。",
+      "source-description": "所选源数据源得到的结果有在面板中显示的链接",
+      "source-label": "源",
+      "sub-text": "<0>定义哪些数据源将显示关联，以及哪些数据将取代先前定义的变量。</0>",
+      "title": "配置将链接到 {{dataSourceName}} 的数据源（第 3 步，共 3 步）。"
+    },
+    "sub-title": "定义不同数据源中存在的数据如何相互关联。详细信息请参阅<2>文档<1></1></2>。",
+    "target-form": {
+      "control-rules": "此字段是必填字段。",
+      "sub-text": "<0>定义关联将链接到哪个数据源，以及点击关联时将会运行什么查询。</0>",
+      "target-description": "指定点击链接时查询哪个数据源",
+      "target-label": "目标",
+      "title": "设置关联的目标（第 2 步，共 3 步）"
+    },
+    "trans-details": {
+      "logfmt-description": "使用 logfmt 解析提供的字段以获取变量",
+      "logfmt-label": "Logfmt",
+      "regex-description": "字段将使用正则表达式解析。请使用命名捕获组以返回多个变量，或使用单个未命名捕获组将变量添加到命名映射值。正则表达式不区分大小写。",
+      "regex-expression": "使用捕获组来提取部分字段。",
+      "regex-label": "正则表达式",
+      "regex-map-values": "定义捕获组未命名时变量的名称。"
+    },
+    "transform": {
+      "add-button": "添加转换",
+      "heading": "转换",
+      "no-transform": "未定义转换。"
+    },
+    "transform-row": {
+      "expression-label": "表达式",
+      "expression-required": "请定义表达式",
+      "expression-tooltip": "正则表达式所必需。这是转换将使用的表达式。Logfmt 不使用其他规范。",
+      "field-input": "字段",
+      "field-label": "字段",
+      "field-tooltip": "可选。要转换的字段。如果未指定，转换将应用于结果字段。",
+      "map-value-label": "映射值",
+      "map-value-tooltip": "可选。定义变量的名称。目前仅适用于单个未命名捕获组的正则表达式。",
+      "remove-button": "删除",
+      "remove-tooltip": "删除转换",
+      "transform-required": "请选择转换类型",
+      "type-label": "类型",
+      "type-tooltip": "将应用于源数据的转换类型。"
+    }
   },
   "dashboard": {
     "add-menu": {
@@ -151,21 +228,25 @@
       "paste-panel": "粘贴面板",
       "row": "行",
       "visualization": "可视化",
-      "widget": ""
+      "widget": "小部件"
+    },
+    "alert-rules-drawer": {
+      "redirect-link": "Grafana Alerting 中的列表",
+      "subtitle": "与此仪表板相关的警报规则"
     },
     "empty": {
-      "add-library-panel-body": "",
-      "add-library-panel-button": "",
-      "add-library-panel-header": "",
+      "add-library-panel-body": "添加与其他仪表板共享的可视化。",
+      "add-library-panel-button": "添加库面板",
+      "add-library-panel-header": "添加一个库面板",
       "add-visualization-body": "选择一个数据源，然后用图表、统计信息和表格查询您的数据以及将其可视化，或创建列表、Markdown 和其他小部件。",
       "add-visualization-button": "添加可视化",
       "add-visualization-header": "通过添加可视化开始您的新仪表板",
-      "add-widget-body": "",
-      "add-widget-button": "",
-      "add-widget-header": "",
-      "import-a-dashboard-body": "",
-      "import-a-dashboard-header": "",
-      "import-dashboard-button": ""
+      "add-widget-body": "创建列表、Markdown 和其他小部件",
+      "add-widget-button": "添加小部件",
+      "add-widget-header": "添加一个小部件",
+      "import-a-dashboard-body": "从文件或 <1>grafana.com/</1> 导入仪表板。",
+      "import-a-dashboard-header": "导入仪表板",
+      "import-dashboard-button": "导入仪表板"
     },
     "inspect": {
       "data-tab": "数据",
@@ -221,7 +302,7 @@
     },
     "toolbar": {
       "add": "添加",
-      "add-panel": "添加面板",
+      "alert-rules": "警报规则",
       "mark-favorite": "标记为收藏",
       "open-original": "打开原始仪表板",
       "playlist-next": "前往下一个仪表板",
@@ -231,133 +312,255 @@
       "save": "保存仪表板",
       "settings": "仪表板设置",
       "share": "分享仪表板或面板",
+      "share-button": "分享",
       "unmark-favorite": "取消标记为收藏"
     },
     "validation": {
-      "invalid-dashboard-id": "",
-      "invalid-json": "",
-      "tags-expected-array": "",
-      "tags-expected-strings": ""
+      "invalid-dashboard-id": "找不到有效的 Grafana.com ID",
+      "invalid-json": "无有效的 JSON",
+      "tags-expected-array": "标签预期数组",
+      "tags-expected-strings": "标签预期字符串数组"
     }
   },
   "dashboard-import": {
     "file-dropzone": {
-      "primary-text": "",
-      "secondary-text": ""
+      "primary-text": "上传仪表板 JSON 文件",
+      "secondary-text": "拖放到此处或点击浏览"
     },
     "form-actions": {
-      "cancel": "",
-      "load": ""
+      "cancel": "取消",
+      "load": "加载"
     },
     "gcom-field": {
-      "label": "",
-      "load-button": "",
-      "placeholder": "",
-      "validation-required": ""
+      "label": "在<1></1>查找并导入常见应用程序的仪表板",
+      "load-button": "加载",
+      "placeholder": "Grafana.com 仪表板网址或 ID",
+      "validation-required": "Grafana 仪表板网址或 ID 是必需项"
     },
     "json-field": {
-      "label": "",
-      "validation-required": ""
+      "label": "通过仪表板 JSON 模型导入",
+      "validation-required": "需要一个仪表板 JSON 模型"
     }
   },
   "dashboard-settings": {
     "annotations": {
-      "title": ""
+      "title": "注释"
     },
-    "dashboard-delete-button": "",
+    "dashboard-delete-button": "删除仪表板",
     "general": {
-      "auto-refresh-description": "",
-      "auto-refresh-label": "",
-      "description-label": "",
-      "editable-description": "",
-      "editable-label": "",
-      "folder-label": "",
-      "panel-options-graph-tooltip-description": "",
-      "panel-options-graph-tooltip-label": "",
-      "panel-options-label": "",
-      "tags-label": "",
-      "title": "",
-      "title-label": ""
+      "auto-refresh-description": "定义自动刷新列表中可用的自动刷新间隔。",
+      "auto-refresh-label": "自动刷新",
+      "description-label": "描述",
+      "editable-description": "设置为只读以禁用所有编辑。重新加载仪表板以使更改生效",
+      "editable-label": "可编辑",
+      "folder-label": "文件夹",
+      "panel-options-graph-tooltip-description": "控制不同面板上的工具提示和悬停高亮行为。重新加载仪表板以使更改生效",
+      "panel-options-graph-tooltip-label": "图表工具提示",
+      "panel-options-label": "面板选项",
+      "tags-label": "标签",
+      "title": "概况",
+      "title-label": "标题"
     },
     "json-editor": {
-      "save-button": "",
-      "subtitle": "",
-      "title": ""
+      "save-button": "保存更改",
+      "subtitle": "下面的 JSON 模型是定义仪表板的数据结构。这包括仪表板设置、面板设置、布局和查询等等。",
+      "title": "JSON 模型"
     },
     "links": {
-      "title": ""
+      "title": "链接"
     },
     "permissions": {
-      "title": ""
+      "title": "权限"
     },
     "settings": {
-      "title": ""
+      "title": "设置"
     },
     "time-picker": {
-      "hide-time-picker": "",
-      "now-delay-description": "",
-      "now-delay-label": "",
-      "refresh-live-dashboards-description": "",
-      "refresh-live-dashboards-label": "",
-      "time-options-label": "",
-      "time-zone-label": "",
-      "week-start-label": ""
+      "hide-time-picker": "隐藏时间选择器",
+      "now-delay-description": "排除可能不完整的最近数据。",
+      "now-delay-label": "现在延迟",
+      "refresh-live-dashboards-description": "连续重新绘制在其中时间范围引用“现在”的面板。",
+      "refresh-live-dashboards-label": "刷新直播仪表板",
+      "time-options-label": "时间选项",
+      "time-zone-label": "时区",
+      "week-start-label": "每周开始日"
     },
     "variables": {
-      "title": ""
+      "title": "变量"
     },
     "versions": {
-      "title": ""
+      "title": "版本"
     }
   },
   "data-source-picker": {
-    "add-new-data-source": "",
+    "add-new-data-source": "配置新数据源",
     "built-in-list": {
-      "description-dashboard": "",
-      "description-grafana": "",
-      "description-mixed": ""
+      "description-dashboard": "重新使用其他可视化得到的查询结果",
+      "description-grafana": "探索使用模拟数据的可视化",
+      "description-mixed": "使用多个数据源"
     },
     "list": {
-      "no-data-source-message": ""
+      "no-data-source-message": "未找到数据源"
     },
     "modal": {
-      "configure-new-data-source": "",
-      "input-placeholder": "",
-      "title": ""
+      "configure-new-data-source": "打开新标选项卡并配置数据源",
+      "input-placeholder": "选择数据源",
+      "title": "选择数据源"
     },
-    "open-advanced-button": ""
+    "open-advanced-button": "打开高级数据源选择器"
   },
   "data-sources": {
     "datasource-add-button": {
-      "label": ""
+      "label": "添加新数据源"
     }
   },
   "explore": {
-    "add-to-dashboard": "",
+    "add-to-dashboard": "添加到仪表板",
+    "rich-history": {
+      "close-tooltip": "关闭查询历史记录",
+      "datasource-a-z": "数据源 A-Z",
+      "datasource-z-a": "数据源 Z-A",
+      "newest-first": "最新在前",
+      "oldest-first": "最早在前",
+      "query-history": "查询历史记录",
+      "settings": "设置",
+      "starred": "已加星标"
+    },
+    "rich-history-card": {
+      "add-comment-form": "添加备注表单",
+      "add-comment-tooltip": "添加备注",
+      "cancel": "取消",
+      "confirm-delete": "删除",
+      "copy-query-tooltip": "将查询复制到剪贴板",
+      "copy-shortened-link-tooltip": "将短链接复制到剪贴板",
+      "datasource-icon-label": "数据源图标",
+      "datasource-name-label": "数据源名称",
+      "datasource-not-exist": "数据源不再存在",
+      "delete-query-confirmation-title": "删除",
+      "delete-query-title": "删除查询",
+      "delete-query-tooltip": "删除查询",
+      "delete-starred-query-confirmation-text": "您是否确定要永久删除您的星标查询？",
+      "edit-comment-tooltip": "编辑备注",
+      "loading-text": "正在加载...",
+      "optional-description": "查询所完成操作的可选描述。",
+      "query-comment-label": "查询备注",
+      "query-text-label": "查询文本",
+      "run-query-button": "运行查询",
+      "save-comment": "保存备注",
+      "star-query-tooltip": "星标查询",
+      "switch-datasource-button": "切换数据源并运行查询",
+      "unstar-query-tooltip": "取消星标查询",
+      "update-comment-form": "更新备注表单"
+    },
+    "rich-history-container": {
+      "loading": "加载中..."
+    },
+    "rich-history-notification": {
+      "query-copied": "查询已复制到剪贴板",
+      "query-deleted": "查询已删除"
+    },
+    "rich-history-queries-tab": {
+      "displaying-partial-queries": "显示 {{ count }} 条查询",
+      "displaying-queries": "{{ count }} 条查询",
+      "filter-aria-label": "数据源筛选查询",
+      "filter-history": "筛选历史记录",
+      "filter-placeholder": "数据源筛选查询",
+      "history-local": "历史记录为您的浏览器本地，不与他人共享。",
+      "loading": "加载中...",
+      "loading-results": "正在加载结果...",
+      "search-placeholder": "搜索查询",
+      "showing-queries": "显示 {{ shown }}/{{ total }} <0>了解更多</0>",
+      "sort-aria-label": "排序查询",
+      "sort-placeholder": "查询排序方式："
+    },
+    "rich-history-settings-tab": {
+      "alert-info": "Grafana 将最多保留 {{optionLabel}} 的条目。标有星标的条目不会被删除。",
+      "change-default-tab": "将默认活动选项卡从“查询历史记录”更改为“星标”",
+      "clear-history-info": "永久删除您所有的查询历史记录。",
+      "clear-query-history": "清除查询历史记录",
+      "clear-query-history-button": "清除查询历史记录",
+      "delete-confirm": "删除",
+      "delete-confirm-text": "您确定是否要永久删除您的查询历史记录？",
+      "delete-title": "删除",
+      "history-time-span": "历史记录时间范围",
+      "history-time-span-description": "选择 Grafana 将保存您查询历史记录的时间段。将存储最多 {{MAX_HISTORY_ITEMS}} 个条目。",
+      "only-show-active-datasource": "只显示当前在 浏览 中活动状态数据源的查询",
+      "query-history-deleted": "查询历史记录已删除",
+      "retention-period": {
+        "1-week": "1 周",
+        "2-days": "2 天",
+        "2-weeks": "2 周",
+        "5-days": "5 天"
+      }
+    },
+    "rich-history-starred-tab": {
+      "filter-queries-aria-label": "数据源筛选查询",
+      "filter-queries-placeholder": "数据源筛选查询",
+      "loading": "加载中...",
+      "loading-results": "正在加载结果...",
+      "local-history-message": "历史记录为您的浏览器本地，不与他人共享。",
+      "search-queries-placeholder": "搜索查询",
+      "showing-queries": "显示 {{ shown }}/{{ total }} <0>了解更多</0>",
+      "sort-queries-aria-label": "排序查询",
+      "sort-queries-placeholder": "查询排序方式："
+    },
+    "rich-history-utils": {
+      "a-week-ago": "一周前",
+      "days-ago": "{{num}} 天前",
+      "default-from": "现在-1 小时",
+      "default-to": "现在",
+      "today": "今天",
+      "two-weeks-ago": "两周前",
+      "yesterday": "昨天"
+    },
+    "rich-history-utils-notification": {
+      "saving-failed": "保存 Rich History 失败",
+      "update-failed": "Rich History 更新失败"
+    },
+    "secondary-actions": {
+      "query-add-button": "添加查询",
+      "query-add-button-aria-label": "添加查询",
+      "query-history-button": "查询历史记录",
+      "query-history-button-aria-label": "查询历史记录",
+      "query-inspector-button": "查询检查器",
+      "query-inspector-button-aria-label": "查询检查器"
+    },
     "table": {
-      "no-data": "",
-      "title": "",
-      "title-with-name": ""
+      "no-data": "返回了 0 个序列",
+      "title": "表格",
+      "title-with-name": "表格 - {{name}}"
     },
     "toolbar": {
-      "aria-label": "",
-      "copy-shortened-link": "",
-      "refresh-picker-cancel": "",
-      "refresh-picker-run": "",
-      "split-close": "",
-      "split-close-tooltip": "",
-      "split-narrow": "",
-      "split-title": "",
-      "split-tooltip": "",
-      "split-widen": ""
+      "aria-label": "浏览 工具栏",
+      "copy-link": "复制网址",
+      "copy-link-abs-time": "复制绝对网址",
+      "copy-links-absolute-category": "时间同步网址链接（保持时间范围共享）",
+      "copy-links-normal-category": "正常链接地址",
+      "copy-shortened-link": "复制短网址",
+      "copy-shortened-link-abs-time": "复制绝对短网址",
+      "copy-shortened-link-menu": "打开短链接菜单",
+      "refresh-picker-cancel": "取消",
+      "refresh-picker-run": "运行查询",
+      "split-close": "关闭",
+      "split-close-tooltip": "关闭拆分窗格",
+      "split-narrow": "窄窗格",
+      "split-title": "拆分",
+      "split-tooltip": "拆分窗格",
+      "split-widen": "宽窗格"
     }
   },
   "folder-picker": {
     "loading": "正在加载文件夹..."
   },
   "grafana-ui": {
+    "drawer": {
+      "close": "关闭"
+    },
+    "empty-state": {
+      "not-found-message": ""
+    },
     "modal": {
-      "close-tooltip": ""
+      "close-tooltip": "关闭"
     },
     "segment-async": {
       "error": "加载选项失败",
@@ -365,66 +568,68 @@
       "no-options": "未找到选项"
     },
     "select": {
-      "no-options-label": "",
-      "placeholder": ""
+      "no-options-label": "未找到选项",
+      "placeholder": "选择"
     }
   },
   "graph": {
     "container": {
-      "content": "",
-      "show-all-series": "",
-      "show-only-series": "",
-      "title": ""
+      "content": "在单个面板中呈现太多系列可能会影响性能并使数据更难读取。请考虑完善您的查询。",
+      "show-all-series": "显示全部 {{length}}",
+      "show-only-series": "仅显示 {{MAX_NUMBER_OF_TIME_SERIES}} 序列",
+      "title": "图表"
     }
   },
   "help-modal": {
     "shortcuts-category": {
-      "dashboard": "",
-      "focused-panel": "",
-      "global": "",
-      "time-range": ""
+      "dashboard": "仪表板",
+      "focused-panel": "聚焦面板",
+      "global": "全局",
+      "time-range": "时间范围"
     },
     "shortcuts-description": {
-      "change-theme": "",
-      "collapse-all-rows": "",
-      "dashboard-settings": "",
-      "duplicate-panel": "",
-      "exit-edit/setting-views": "",
-      "expand-all-rows": "",
-      "go-to-dashboards": "",
-      "go-to-explore": "",
-      "go-to-home-dashboard": "",
-      "go-to-profile": "",
-      "make-time-range-permanent": "",
-      "move-time-range-back": "",
-      "move-time-range-forward": "",
-      "open-search": "",
-      "open-shared-modal": "",
-      "refresh-all-panels": "",
-      "remove-panel": "",
-      "save-dashboard": "",
-      "show-all-shortcuts": "",
-      "toggle-active-mode": "",
-      "toggle-all-panel-legends": "",
-      "toggle-auto-fit": "",
-      "toggle-exemplars": "",
-      "toggle-graph-crosshair": "",
-      "toggle-kiosk": "",
-      "toggle-panel-edit": "",
-      "toggle-panel-fullscreen": "",
-      "toggle-panel-legend": "",
-      "zoom-out-time-range": ""
-    },
-    "title": ""
+      "change-theme": "更改主题",
+      "collapse-all-rows": "折叠所有行",
+      "copy-time-range": "复制时间范围",
+      "dashboard-settings": "仪表板设置",
+      "duplicate-panel": "复制面板",
+      "exit-edit/setting-views": "退出编辑/设置视图",
+      "expand-all-rows": "展开所有行",
+      "go-to-dashboards": "转到仪表板",
+      "go-to-explore": "转到 浏览",
+      "go-to-home-dashboard": "转到主仪表板",
+      "go-to-profile": "转到个人资料",
+      "make-time-range-permanent": "使时间范围成为绝对/永久",
+      "move-time-range-back": "向后移动时间范围",
+      "move-time-range-forward": "向前移动时间范围",
+      "open-search": "打开搜索",
+      "open-shared-modal": "打开面板分享模式",
+      "paste-time-range": "粘贴时间范围",
+      "refresh-all-panels": "刷新所有面板",
+      "remove-panel": "删除面板",
+      "save-dashboard": "保存仪表板",
+      "show-all-shortcuts": "显示所有快捷键",
+      "toggle-active-mode": "切换非活动/视图模式",
+      "toggle-all-panel-legends": "切换所有面板图例",
+      "toggle-auto-fit": "切换自动适合面板（实验性功能）",
+      "toggle-exemplars": "切换所有面板中的示例",
+      "toggle-graph-crosshair": "切换分享的图形交叉点",
+      "toggle-kiosk": "切换 kiosk 模式（隐藏顶部导航）",
+      "toggle-panel-edit": "切换面板编辑视图",
+      "toggle-panel-fullscreen": "切换面板全屏视图",
+      "toggle-panel-legend": "切换面板图例",
+      "zoom-out-time-range": "缩放时间范围"
+    },
+    "title": "快捷键"
   },
   "inspector": {
     "query": {
-      "collapse-all": "",
-      "copy-to-clipboard": "",
-      "description": "",
-      "expand-all": "",
-      "no-data": "",
-      "refresh": ""
+      "collapse-all": "折叠全部",
+      "copy-to-clipboard": "复制到剪贴板",
+      "description": "查询查看器允许您查看原始请求和响应。要收集此数据，Grafana 需要发布新查询。请点击下面的刷新按钮触发一个新查询。",
+      "expand-all": "展开全部",
+      "no-data": "尚未收集任何请求和响应。请点击刷新按钮",
+      "refresh": "刷新"
     }
   },
   "library-panel": {
@@ -441,15 +646,18 @@
     }
   },
   "library-panels": {
+    "empty-state": {
+      "message": ""
+    },
     "modal": {
-      "body_other": "",
-      "button-cancel": "",
-      "button-view-panel1": "",
-      "button-view-panel2": "",
-      "panel-not-linked": "",
-      "select-no-options-message": "",
-      "select-placeholder": "",
-      "title": ""
+      "button-cancel": "<0>取消</0>",
+      "button-view-panel1": "在 {{label}} 中查看面板...",
+      "button-view-panel2": "在仪表板中查看面板...",
+      "panel-not-linked": "面板没有链接到仪表板。请将面板添加到仪表板，然后重试。",
+      "select-no-options-message": "未找到仪表板",
+      "select-placeholder": "开始输入以搜索仪表板",
+      "title": "在仪表板中查看面板",
+      "body_other": "此面板在 {{count}} 个仪表板中使用。请选择要在哪个仪表板中查看此面板："
     },
     "save": {
       "error": "保存库面板时出错：\"{{errorMsg}}\"",
@@ -458,20 +666,159 @@
   },
   "login": {
     "error": {
-      "blocked": "",
-      "invalid-user-or-password": "",
-      "title": "",
-      "unknown": ""
+      "blocked": "您已超过此用户的登录尝试次数。请稍后再试。",
+      "invalid-user-or-password": "用户名或密码无效",
+      "title": "登录失败",
+      "unknown": "发生了未知错误"
+    },
+    "forgot-password": "忘记密码？",
+    "form": {
+      "password-label": "密码",
+      "password-required": "必须输入密码",
+      "submit-label": "登录",
+      "submit-loading-label": "正在登录...",
+      "username-label": "电子邮箱或用户名",
+      "username-required": "电子邮箱或用户名是必填项"
+    },
+    "services": {
+      "sing-in-with-prefix": "使用 {{serviceName}} 登录"
+    },
+    "signup": {
+      "button-label": "注册",
+      "new-to-question": "初次使用 Grafana？"
+    }
+  },
+  "migrate-to-cloud": {
+    "can-i-move": {
+      "body": "将此安装连接到云堆栈后，就可以上传数据源和仪表盘。",
+      "link-title": "了解如何迁移其他设置",
+      "title": "我可以将此安装移动到Grafana Cloud吗？"
+    },
+    "connect-modal": {
+      "body-cloud-stack": "您还需要一个云堆栈。如果您刚刚注册，我们会自动创建您的第一个堆栈。 如果您已有帐户，您需要选择或创建一个堆栈。",
+      "body-get-started": "要开始使用，您需要一个 Grafana.com 账户。",
+      "body-paste-stack": "确定堆栈后，请将其 URL 粘贴到下面。",
+      "body-sign-up": "注册 Grafana.com 帐户",
+      "body-token": "自我管理的 Grafana 安装需要特殊访问权限才能安全迁移内容。您需要在所选云栈上创建一个迁移令牌。",
+      "body-token-field": "迁移令牌",
+      "body-token-field-placeholder": "在此粘贴令牌",
+      "body-token-instructions": "登录云堆栈，并导航至“管理”、“通用”、“迁移到 Grafana Cloud”。在该屏幕上创建迁移令牌，并将令牌粘贴到此处。",
+      "body-url-field": "云堆栈网址",
+      "body-view-stacks": "查看我的云堆栈。",
+      "cancel": "取消",
+      "connect": "连接到这个堆栈",
+      "connecting": "正在连接此堆栈...",
+      "stack-required-error": "堆栈网址是必需项",
+      "title": "连接到云堆栈",
+      "token-required-error": "迁移令牌是必需项"
+    },
+    "cta": {
+      "button": "将此实例迁移到云端",
+      "header": "让我们管理你的 Grafana 堆栈"
+    },
+    "disconnect-modal": {
+      "body": "这将删除此安装中的迁移令牌。如果将来想上传更多资源，则需要输入新的迁移令牌。",
+      "cancel": "取消",
+      "disconnect": "断开连接",
+      "disconnecting": "正在断开连接...",
+      "error": "断开连接时出错",
+      "title": "断开云堆栈连接"
+    },
+    "get-started": {
+      "body": "迁移过程必须从您自己管理的 Grafana 实例开始。",
+      "configure-pdc-link": "配置此堆栈的 PDC",
+      "link-title": "了解更多关于私人数据源连接的信息",
+      "step-1": "登录到您自己管理的实例，并导航到“管理”、“通用”、“迁移到 Grafana Cloud”。",
+      "step-2": "选择“将此实例迁移到云端”。",
+      "step-3": "系统将提示您输入迁移令牌。您可以从该屏幕生成一个。",
+      "step-4": "在您自己管理的实例中，选择“上传所有内容”，以将数据源和仪表盘上传到此云堆栈。",
+      "step-5": "如果某些数据源无法通过公共互联网运行，则需要在您自己管理的环境中安装专用数据源连接。",
+      "title": "如何开始"
+    },
+    "is-it-secure": {
+      "body": "Grafana Labs 致力于维护最高标准的数据隐私和安全。通过实施行业标准的安全技术和程序，我们帮助保护客户的数据免遭未经授权的访问、使用或披露。",
+      "link-title": "Grafana 实验室信任中心",
+      "title": "它是否安全？"
+    },
+    "migrate-to-this-stack": {
+      "body": "您自己管理的 Grafana 实例中的一些配置可自动复制到此云堆栈中。",
+      "link-title": "查看完整的迁移指南",
+      "title": "将配置迁移到此堆栈中"
+    },
+    "migration-token": {
+      "body": "您自己管理的 Grafana 实例需要特殊的身份验证令牌才能安全地连接到该云堆栈。",
+      "delete-button": "删除此迁移令牌",
+      "delete-modal-body": "如果您已经在自己管理的安装中使用了此令牌，则该安装将无法再上传内容。",
+      "delete-modal-cancel": "取消",
+      "delete-modal-confirm": "删除",
+      "delete-modal-deleting": "正在删除...",
+      "delete-modal-title": "删除迁移令牌",
+      "generate-button": "生成迁移令牌",
+      "generate-button-loading": "正在生成迁移令牌...",
+      "modal-close": "关闭",
+      "modal-copy-and-close": "复制到剪贴板并关闭",
+      "modal-copy-button": "复制到剪贴板",
+      "modal-field-description": "现在就复制令牌，因为您将无法再次看到它。丢失令牌后需要创建一个新令牌。",
+      "modal-field-label": "令牌",
+      "modal-title": "已创建迁移令牌",
+      "status": "当前状态： <2></2>",
+      "title": "迁移令牌"
+    },
+    "pdc": {
+      "body": "将您的数据源暴露在互联网上可能会引发安全问题。专用数据源连接 (PDC) 允许 Grafana Cloud 通过安全的网络隧道访问您的现有数据源。",
+      "link-title": "了解 PDC",
+      "title": "并非我所有的数据源都在公共互联网上"
+    },
+    "pricing": {
+      "body": "Grafana Cloud 提供宽松的免费计划和 14 天的无限使用试用期。试用到期后，您将根据超出免费计划限制的使用量付费。",
+      "link-title": "Grafana Cloud 价格",
+      "title": "费用如何？"
+    },
+    "resource-status": {
+      "error-details-button": "详情",
+      "failed": "错误",
+      "migrated": "上传到云端",
+      "migrating": "正在上传...",
+      "not-migrated": "尚未上传",
+      "unknown": "未知"
+    },
+    "resource-type": {
+      "dashboard": "仪表板",
+      "datasource": "数据源",
+      "unknown": "未知"
+    },
+    "summary": {
+      "disconnect": "",
+      "error-starting-migration": "",
+      "start-migration": "",
+      "target-stack-title": ""
+    },
+    "token-status": {
+      "active": "令牌已创建并激活",
+      "no-active": "无激活的令牌"
+    },
+    "what-is-cloud": {
+      "body": "Grafana Cloud 是一个完全托管的云托管观测平台，是云原生环境的理想选择。它拥有您所喜爱的 Grafana 的一切，而无需维护、升级和支持安装。",
+      "link-title": "了解云端功能",
+      "title": "Grafana Cloud 是什么？"
+    },
+    "why-host": {
+      "body": "除了托管的便利性外，Grafana Cloud 还包括许多云专属功能，如 SLO、事件管理、机器学习和强大的观测能力集成。",
+      "link-title": "还有问题？咨询专家",
+      "title": "为什么使用 Grafana 托管？"
     }
   },
   "nav": {
     "add-new-connections": {
-      "title": ""
+      "title": "添加新连接"
     },
     "admin": {
       "subtitle": "管理整个服务器范围的设置，以及对组织、用户和许可证等资源的访问权限",
       "title": "服务器管理员"
     },
+    "alert-list-legacy": {
+      "title": "警报规则"
+    },
     "alerting": {
       "subtitle": "在系统发生问题后立即获悉",
       "title": "警报"
@@ -508,6 +855,10 @@
       "subtitle": "停止来自一个或多个警报规则的通知",
       "title": "静默"
     },
+    "alerting-upgrade": {
+      "subtitle": "将您现有的旧版警报和通知通道升级到新的 Grafana 告警",
+      "title": "Alerting 升级"
+    },
     "alerts-and-incidents": {
       "subtitle": "警报和事件管理应用",
       "title": "警报和 IRM"
@@ -517,36 +868,39 @@
       "title": "API 密钥"
     },
     "application": {
-      "title": ""
+      "title": "应用程序"
     },
     "apps": {
       "subtitle": "扩展 Grafana 体验的应用插件",
       "title": "应用"
     },
     "authentication": {
-      "title": ""
+      "title": "身份验证"
+    },
+    "collector": {
+      "title": "收集器"
     },
     "config": {
       "title": "管理"
     },
     "config-access": {
-      "subtitle": "",
-      "title": ""
+      "subtitle": "配置个人用户、团队和服务帐户的访问权限",
+      "title": "用户和访问权限"
     },
     "config-general": {
-      "subtitle": "",
-      "title": ""
+      "subtitle": "管理 Grafana 上的默认首选项和设置",
+      "title": "概况"
     },
     "config-plugins": {
-      "subtitle": "",
-      "title": ""
+      "subtitle": "安装插件并定义数据之间的关系",
+      "title": "插件和数据"
     },
     "connect-data": {
-      "title": ""
+      "title": "连接数据"
     },
     "connections": {
-      "subtitle": "",
-      "title": ""
+      "subtitle": "浏览和创建新连接",
+      "title": "连接"
     },
     "correlations": {
       "subtitle": "添加并配置相关性",
@@ -572,21 +926,25 @@
       "title": "仪表板"
     },
     "data-sources": {
-      "subtitle": "",
-      "title": ""
+      "subtitle": "查看和管理您已连接的数据源连接",
+      "title": "数据源"
     },
     "datasources": {
       "subtitle": "添加并配置数据源",
       "title": "数据源"
     },
     "detect": {
-      "title": ""
+      "title": "检测"
     },
     "explore": {
       "title": "探索"
     },
     "frontend": {
-      "title": ""
+      "subtitle": "获得真正的用户监测洞察",
+      "title": "前端"
+    },
+    "frontend-app": {
+      "title": "前端"
     },
     "global-orgs": {
       "subtitle": "在同一服务器上运行的 Grafana 的孤立实例",
@@ -597,7 +955,7 @@
       "title": "用户"
     },
     "grafana-quaderno": {
-      "title": ""
+      "title": "Grafana Quaderno"
     },
     "help": {
       "title": "帮助"
@@ -610,24 +968,35 @@
       "title": "首页"
     },
     "incidents": {
-      "title": ""
+      "title": "事件"
     },
     "infrastructure": {
-      "title": ""
+      "subtitle": "了解您基础设施的健康",
+      "title": "基础设施"
+    },
+    "integrations": {
+      "title": "集成"
+    },
+    "k6": {
+      "title": "性能"
     },
     "kubernetes": {
-      "title": ""
+      "title": "Kubernetes"
     },
     "library-panels": {
       "subtitle": "可重复使用的面板，可以添加到多个仪表板",
       "title": "库面板"
     },
     "machine-learning": {
-      "title": ""
+      "title": "机器学习"
     },
     "manage-folder": {
       "subtitle": "管理文件夹仪表板和权限"
     },
+    "migrate-to-cloud": {
+      "subtitle": "将配置从您自己管理的安装复制到云堆栈",
+      "title": "迁移到Grafana Cloud"
+    },
     "monitoring": {
       "subtitle": "监控和基础设施应用",
       "title": "可观测性"
@@ -642,18 +1011,15 @@
       "title": "新建文件夹"
     },
     "observability": {
-      "title": ""
+      "title": "可观测性"
     },
     "oncall": {
-      "title": ""
+      "title": "OnCall"
     },
     "org-settings": {
       "subtitle": "管理整个组织的首选项",
       "title": "默认首选项"
     },
-    "performance-testing": {
-      "title": ""
-    },
     "playlists": {
       "subtitle": "以序列显示的仪表板组",
       "title": "播放列表"
@@ -662,6 +1028,10 @@
       "subtitle": "使用插件扩展 Grafana 体验",
       "title": "插件"
     },
+    "private-data-source-connections": {
+      "subtitle": "查询安全网络中的数据，无需打开网络从 Grafana Cloud 传入流量。请在我们的文档中了解更多信息。",
+      "title": "私有数据源连接"
+    },
     "profile/notifications": {
       "title": "通知历史记录"
     },
@@ -672,16 +1042,16 @@
       "title": "个人资料"
     },
     "profiles": {
-      "title": ""
+      "title": "个人资料"
     },
     "public": {
       "title": "公共仪表板"
     },
     "recorded-queries": {
-      "title": ""
+      "title": "已记录查询"
     },
     "reporting": {
-      "title": ""
+      "title": "正在报告"
     },
     "scenes": {
       "title": "场景"
@@ -704,7 +1074,7 @@
       "title": "退出登录"
     },
     "slo": {
-      "title": ""
+      "title": "SLO"
     },
     "snapshots": {
       "subtitle": "交互式、可公开获取的仪表板时间点表示",
@@ -717,7 +1087,7 @@
       "title": "您已加星标的仪表板将显示在这里"
     },
     "statistics-and-licensing": {
-      "title": ""
+      "title": "统计信息和许可"
     },
     "storage": {
       "subtitle": "管理文件存储",
@@ -728,12 +1098,16 @@
       "title": "支持包"
     },
     "synthetics": {
-      "title": ""
+      "title": "合成"
     },
     "teams": {
       "subtitle": "具有共同仪表板和权限需求的用户组",
       "title": "团队"
     },
+    "testing-and-synthetics": {
+      "subtitle": "使用 k6 和 Synthetic Monitoring 洞察优化性能。",
+      "title": "测试与合成"
+    },
     "upgrading": {
       "title": "统计信息和许可证"
     },
@@ -747,17 +1121,22 @@
       "tv-alert": "按 ESC 退出 kiosk 模式"
     },
     "megamenu": {
-      "close": "",
-      "dock": "",
-      "undock": ""
+      "close": "关闭菜单",
+      "dock": "停靠菜单",
+      "list-label": "导航",
+      "undock": "取消停靠菜单"
     },
     "toolbar": {
+      "close-menu": "关闭菜单",
       "enable-kiosk": "启用 kiosk 模式",
-      "toggle-menu": "切换菜单",
+      "open-menu": "打开菜单",
       "toggle-search-bar": "切换顶部搜索栏"
     }
   },
   "news": {
+    "drawer": {
+      "close": "关闭抽屉"
+    },
     "title": "最新博客"
   },
   "notifications": {
@@ -767,7 +1146,6 @@
   "panel": {
     "header-menu": {
       "copy": "复制",
-      "create-alert": "",
       "create-library-panel": "创建库面板",
       "duplicate": "复制",
       "edit": "编辑",
@@ -778,6 +1156,7 @@
       "inspect-data": "数据",
       "inspect-json": "面板 JSON",
       "more": "更多...",
+      "new-alert-rule": "新建警报规则",
       "query": "查询",
       "remove": "删除",
       "share": "分享",
@@ -787,65 +1166,199 @@
     }
   },
   "playlist-edit": {
-    "error-prefix": "",
+    "error-prefix": "加载播放列表时发生错误：",
     "form": {
-      "add-tag-label": "",
-      "add-tag-placeholder": "",
-      "add-title-label": "",
-      "cancel": "",
-      "heading": "",
-      "interval-label": "",
-      "interval-placeholder": "",
-      "interval-required": "",
-      "name-label": "",
-      "name-placeholder": "",
-      "name-required": "",
-      "save": "",
-      "table-delete": "",
-      "table-drag": "",
-      "table-empty": "",
-      "table-heading": ""
-    },
-    "sub-title": "",
-    "title": ""
+      "add-tag-label": "按标签添加",
+      "add-tag-placeholder": "选择一个标签",
+      "add-title-label": "按标题添加",
+      "cancel": "取消",
+      "heading": "添加仪表板",
+      "interval-label": "间隔",
+      "interval-placeholder": "5m",
+      "interval-required": "间隔是必需项",
+      "name-label": "名称",
+      "name-placeholder": "名称",
+      "name-required": "姓名是必填项",
+      "save": "保存",
+      "table-delete": "删除播放列表项",
+      "table-drag": "拖放以重新排序",
+      "table-empty": "播放列表为空。请在下方添加仪表板。",
+      "table-heading": "仪表板"
+    },
+    "sub-title": "播放列表循环播放预先选择的仪表板列表。播放列表可能是建立情景意识的极好方式，或者只是向您的团队或访客展示您的指标。",
+    "title": "编辑播放列表"
   },
   "playlist-page": {
     "card": {
-      "delete": "",
-      "edit": "",
-      "start": "",
-      "tooltip": ""
+      "delete": "删除播放列表",
+      "edit": "编辑播放列表",
+      "start": "启动播放列表",
+      "tooltip": "分享播放列表"
     },
     "create-button": {
-      "title": ""
+      "title": "新建播放列表"
     },
     "delete-modal": {
-      "body": "",
-      "confirm-text": ""
+      "body": "您是否确定要删除 {{name}} 播放列表？",
+      "confirm-text": "删除"
     },
     "empty": {
-      "button": "",
-      "pro-tip": "",
-      "pro-tip-link-title": "",
-      "title": ""
+      "button": "创建播放列表",
+      "pro-tip": "您可以使用播放列表来循环电视上的仪表板而不受用户控制",
+      "pro-tip-link-title": "了解更多",
+      "title": "尚未创建播放列表"
+    }
+  },
+  "playlists": {
+    "empty-state": {
+      "message": ""
     }
   },
   "profile": {
     "change-password": {
-      "cancel-button": "",
-      "cannot-change-password-message": "",
-      "change-password-button": "",
-      "confirm-password-label": "",
-      "confirm-password-required": "",
-      "ldap-auth-proxy-message": "",
-      "new-password-label": "",
-      "new-password-required": "",
-      "new-password-same-as-old": "",
-      "old-password-label": "",
-      "old-password-required": "",
-      "passwords-must-match": ""
+      "cancel-button": "取消",
+      "cannot-change-password-message": "密码不能在这里更改。",
+      "change-password-button": "更改密码",
+      "confirm-password-label": "确认密码",
+      "confirm-password-required": "新密码确认是必需项",
+      "ldap-auth-proxy-message": "使用 LDAP 或身份验证代理登录时无法更改密码。",
+      "new-password-label": "新密码",
+      "new-password-required": "新密码是必需项",
+      "new-password-same-as-old": "新密码不能和旧密码相同。",
+      "old-password-label": "旧密码",
+      "old-password-required": "旧密码是必需项",
+      "passwords-must-match": "密码必须一致",
+      "strong-password-validation-register": "密码不符合强密码政策"
     }
   },
+  "public-dashboard": {
+    "acknowledgment-checkboxes": {
+      "ack-title": "在发布仪表板前，请确认以下内容：",
+      "data-src-ack-desc": "发布当前仅适用于数据源子集*",
+      "data-src-ack-tooltip": "了解更多关于公共数据源的信息",
+      "public-ack-desc": "您的整个仪表板将公开*",
+      "public-ack-tooltip": "了解更多关于公共仪表板的信息",
+      "usage-ack-desc": "公布仪表板将导致其每次被查看时运行查询，这可能会增加费用*",
+      "usage-ack-desc-tooltip": "了解更多关于查询缓存的信息"
+    },
+    "config": {
+      "can-view-dashboard-radio-button-label": "可以查看仪表板",
+      "copy-button": "复制",
+      "dashboard-url-field-label": "仪表板网址",
+      "email-share-type-option-label": "仅指定人员",
+      "pause-sharing-dashboard-label": "暂停共享仪表板",
+      "public-share-type-option-label": "任何有链接的人",
+      "revoke-public-URL-button": "撤销公共网址",
+      "revoke-public-URL-button-title": "注销公共网址",
+      "settings-title": "设置"
+    },
+    "create-page": {
+      "generate-public-url-button": "生成公共网址",
+      "unsupported-features-desc": "目前，我们不支持模板变量或前端数据源",
+      "welcome-title": "欢迎使用公共仪表板 ！"
+    },
+    "delete-modal": {
+      "revoke-nonorphaned-body-text": "您确定要注销此网址吗？仪表板将不再公开。",
+      "revoke-orphaned-body-text": "孤立的公共仪表板将不再公开。",
+      "revoke-title": "注销公共网址"
+    },
+    "email-sharing": {
+      "input-invalid-email-text": "无效电子邮箱",
+      "input-required-email-text": "电子邮箱是必填项",
+      "invite-button": "邀请",
+      "invite-field-desc": "通过电子邮件邀请人员",
+      "invite-field-label": "邀请",
+      "resend-button": "重新发送",
+      "resend-button-title": "重新发送",
+      "revoke-button": "注销",
+      "revoke-button-title": "注销"
+    },
+    "modal-alerts": {
+      "no-upsert-perm-alert-desc": "请联系您的管理员以获得{{mode}}公共仪表板的权限",
+      "no-upsert-perm-alert-title": "您没有{{mode}}公共仪表板的权限",
+      "save-dashboard-changes-alert-title": "请在更新公共配置之前保存您的仪表板更改",
+      "unsupport-data-source-alert-readmore-link": "阅读更多关于支持的数据源的信息",
+      "unsupported-data-source-alert-desc": "此仪表板中有公共仪表板不支持的数据源。使用这些数据源的面板可能无法正常运行：{{unsupportedDataSources}}。",
+      "unsupported-data-source-alert-title": "不受支持的数据源",
+      "unsupported-template-variable-alert-desc": "此公共仪表板可能无法工作，因为其使用了模板变量",
+      "unsupported-template-variable-alert-title": "模板变量不受支持"
+    },
+    "settings-bar-header": {
+      "collapse-settings-tooltip": "折叠设置",
+      "expand-settings-tooltip": "展开设置"
+    },
+    "settings-configuration": {
+      "default-time-range-label": "默认时间范围",
+      "default-time-range-label-desc": "公共仪表板使用仪表板的默认时间范围设置",
+      "show-annotations-label": "显示注释",
+      "show-annotations-label-desc": "在公共仪表板上显示注释",
+      "time-range-picker-label": "已启用时间范围选择器",
+      "time-range-picker-label-desc": "允许查看者更改时间范围"
+    },
+    "settings-summary": {
+      "annotations-hide-text": "注释 = 隐藏",
+      "annotations-show-text": "注释 = 显示",
+      "time-range-picker-disabled-text": "时间范围选择器 = 已禁用",
+      "time-range-picker-enabled-text": "时间范围选择器 = 已启用",
+      "time-range-text": "时间范围 = "
+    }
+  },
+  "public-dashboard-list": {
+    "button": {
+      "config-button-tooltip": "配置公共仪表板",
+      "revoke-button-text": "注销公共网址",
+      "revoke-button-tooltip": "撤销公共仪表板网址",
+      "view-button-tooltip": "查看公共仪表板"
+    },
+    "dashboard-title": {
+      "orphaned-title": "<0>孤立的公共仪表板</0>",
+      "orphaned-tooltip": "链接的仪表板已被删除"
+    },
+    "toggle": {
+      "pause-sharing-toggle-text": "暂停共享"
+    }
+  },
+  "public-dashboard-users-access-list": {
+    "dashboard-modal": {
+      "loading-text": "加载中...",
+      "open-dashboard-list-text": "打开仪表板列表",
+      "public-dashboard-link": "公共仪表板网址",
+      "public-dashboard-setting": "公共仪表板设置"
+    },
+    "delete-user-modal": {
+      "delete-user-button-text": "删除用户",
+      "delete-user-cancel-button": "取消",
+      "delete-user-revoke-access-button": "注销访问权限",
+      "revoke-access-title": "注销访问权限",
+      "revoke-user-access-modal-desc-line1": "您确定要注销对 {{email}} 的访问权限吗？",
+      "revoke-user-access-modal-desc-line2": "此操作将立即注销 {{email}} 对所有公共仪表板的访问权限。"
+    },
+    "modal": {
+      "dashboard-modal-title": "公共仪表板"
+    },
+    "table-header": {
+      "activated-label": "已激活",
+      "activated-tooltip": "最早时间用户已是仪表板的活动用户",
+      "email-label": "电子邮箱",
+      "last-active-label": "上次处于活动状态",
+      "origin-label": "原始",
+      "role-label": "角色"
+    }
+  },
+  "query-operation": {
+    "header": {
+      "collapse-row": "折叠查询行",
+      "datasource-help": "显示数据源帮助",
+      "drag-and-drop": "拖放以重新排序",
+      "duplicate-query": "复制查询",
+      "expand-row": "展开查询行",
+      "hide-response": "",
+      "remove-query": "删除查询",
+      "show-response": "",
+      "toggle-edit-mode": "切换文本编辑模式"
+    },
+    "query-editor-not-exported": "数据源插件不导出任何查询编辑器组件"
+  },
   "refresh-picker": {
     "aria-label": {
       "choose-interval": "自动刷新已关闭。选择刷新时间间隔",
@@ -864,10 +1377,16 @@
       "label": "关"
     },
     "tooltip": {
-      "interval-selected": "",
-      "turned-off": ""
+      "interval-selected": "设置自动刷新间隔",
+      "turned-off": "自动刷新关闭"
     }
   },
+  "return-to-previous": {
+    "button": {
+      "label": "返回到 {{title}}"
+    },
+    "dismissable-button": "关闭"
+  },
   "search": {
     "actions": {
       "include-panels": "包括面板",
@@ -883,15 +1402,6 @@
       "new-dashboard": "新建仪表板",
       "new-folder": "新建文件夹"
     },
-    "folder-view": {
-      "go-to-folder": "前往文件夹",
-      "select-folder": "选择文件夹"
-    },
-    "result-kind": {
-      "dashboard": "仪表板",
-      "folder": "文件夹",
-      "panel": "面板"
-    },
     "results-table": {
       "datasource-header": "数据源",
       "location-header": "位置",
@@ -906,12 +1416,6 @@
       "placeholder": "搜索仪表板"
     }
   },
-  "search-view": {
-    "no-results": {
-      "clear": "",
-      "text": ""
-    }
-  },
   "share-modal": {
     "dashboard": {
       "title": "分享"
@@ -925,11 +1429,10 @@
       "time-range-description": "将当前相对时间范围转换为绝对时间范围"
     },
     "export": {
-      "back-button": "",
+      "back-button": "返回到导出配置",
       "cancel-button": "取消",
       "info-text": "导出此仪表板。",
       "save-button": "保存至文件",
-      "share-default-label": "导出时清除默认值",
       "share-externally-label": "导出以供外部分享",
       "view-button": "查看 JSON"
     },
@@ -961,10 +1464,10 @@
       "expire-day": "1 天",
       "expire-hour": "1 小时",
       "expire-never": "从不",
-      "expire-week": "7 天",
+      "expire-week": "1 周",
       "info-text-1": "可通过快照即时、公开地分享交互式仪表板。创建后，我们会剥离敏感数据，如查询（指标、模板和注释）和面板链接，仅将可见指标数据和系列名称嵌入到仪表板中。",
       "info-text-2": "请注意，知晓该链接并能够访问该网址的<1>任何人都可以</1>查看您的快照。分享需谨慎。",
-      "local-button": "本地快照",
+      "local-button": "发布快照",
       "mistake-message": "是不是弄错了什么？",
       "name": "快照名称",
       "timeout": "超时（秒）",
@@ -976,6 +1479,9 @@
       "export": "导出",
       "library-panel": "库面板",
       "link": "链接",
+      "panel-embed": "嵌入",
+      "public-dashboard": "",
+      "public-dashboard-title": "公共仪表板",
       "snapshot": "快照"
     },
     "theme-picker": {
@@ -989,22 +1495,22 @@
     }
   },
   "share-playlist": {
-    "checkbox-description": "",
-    "checkbox-label": "",
-    "copy-link-button": "",
-    "link-url-label": "",
-    "mode": "",
-    "mode-kiosk": "",
-    "mode-normal": "",
-    "mode-tv": "",
-    "title": ""
+    "checkbox-description": "将调整面板高度以适应屏幕大小",
+    "checkbox-label": "自动调整",
+    "copy-link-button": "复制",
+    "link-url-label": "链接网址",
+    "mode": "模式",
+    "mode-kiosk": "Kiosk",
+    "mode-normal": "正常",
+    "mode-tv": "电视",
+    "title": "共享播放列表"
   },
   "shared": {
     "preferences": {
       "theme": {
-        "dark-label": "",
-        "light-label": "",
-        "system-label": ""
+        "dark-label": "深色",
+        "light-label": "浅色",
+        "system-label": "系统首选项"
       }
     }
   },
@@ -1028,10 +1534,10 @@
     "title": "首选项"
   },
   "snapshot": {
-    "external-badge": "",
-    "name-column-header": "",
-    "url-column-header": "",
-    "view-button": ""
+    "external-badge": "外部",
+    "name-column-header": "名称",
+    "url-column-header": "快照网址",
+    "view-button": "查看"
   },
   "tag-filter": {
     "loading": "加载中...",
@@ -1046,6 +1552,7 @@
     "calendar": {
       "apply-button": "应用时间范围",
       "cancel-button": "取消",
+      "close": "关闭日历",
       "select-time": "选择时间范围"
     },
     "content": {
@@ -1053,6 +1560,13 @@
       "empty-recent-list-info": "看起来您之前没有使用过这个时间选择器。一旦您输入了某些时间间隔，最近使用的间隔就会出现在此处。",
       "filter-placeholder": "搜索快速范围"
     },
+    "copy-paste": {
+      "copy-success-message": "时间范围已复制到剪贴板",
+      "default-error-message": "{{error}} 不是一个有效的日期范围",
+      "default-error-title": "无效时间范围",
+      "tooltip-copy": "将时间范围复制到剪贴板",
+      "tooltip-paste": "粘贴时间范围"
+    },
     "footer": {
       "change-settings-button": "更改时间设置",
       "fiscal-year-option": "财政年度",
@@ -1065,6 +1579,7 @@
       "default-error": "请输入一个过去的日期或\"现在\"",
       "fiscal-year": "财政年度",
       "from-input": "发件人",
+      "open-input-calendar": "打开日历",
       "range-error": "“发件人”不能在“收件人”之后",
       "to-input": "结束"
     },
@@ -1087,6 +1602,12 @@
       "select-search-input": "输入以搜索(国家、城市、缩写)"
     }
   },
+  "transformations": {
+    "empty": {
+      "add-transformation-body": "转换允许在显示可视化之前以各种方式更改数据。 <1></1>这包括合并数据、重命名字段、进行计算、格式化数据以便显示等等。",
+      "add-transformation-header": "开始转换数据"
+    }
+  },
   "user-orgs": {
     "current-org-button": "当前",
     "name-column": "姓名",
@@ -1101,6 +1622,9 @@
       "name-error": "姓名是必填项",
       "name-label": "姓名",
       "username-label": "用户名"
+    },
+    "tabs": {
+      "general": "概况"
     }
   },
   "user-session": {
@@ -1113,6 +1637,11 @@
   "user-sessions": {
     "loading": "正在加载会话..."
   },
+  "users-access-list": {
+    "tabs": {
+      "public-dashboard-users-tab-title": "公共仪表板用户"
+    }
+  },
   "variable": {
     "adhoc": {
       "placeholder": "选择值"
@@ -1130,4 +1659,4 @@
       "placeholder": "输入变量值"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/public/maps/example-with-style.geojson b/public/maps/example-with-style.geojson
new file mode 100644
index 0000000000000..932ed42bce72e
--- /dev/null
+++ b/public/maps/example-with-style.geojson
@@ -0,0 +1,150 @@
+{
+  "type": "FeatureCollection",
+  "name": "Example with Style",
+  "features": [
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Bermuda Triangle",
+        "fill": "red",
+        "fill-opacity": 0.5,
+        "stroke-width": 10
+      },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-80.226529, 25.789106],
+            [-66.1057427, 18.4663188],
+            [-64.78138, 32.294887]
+          ]
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Bermuda Triangles",
+        "fill": "red",
+        "fill-opacity": 0.1,
+        "stroke-width": 1
+      },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [-72.5039545, 29.0419965],
+              [-73.16613585, 22.1277124],
+              [-80.226529, 25.789106]
+            ],
+            [
+              [-65.44356135, 25.3806029],
+              [-73.16613585, 22.12771244],
+              [-66.1057427, 18.4663188]
+            ],
+            [
+              [-65.44356135, 25.3806029],
+              [-72.5039545, 29.0419965],
+              [-64.78138, 32.294887]
+            ]
+          ]
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": { "type": "Point", "coordinates": [-80.226529, 25.789106] },
+      "properties": {
+        "name": "Miami",
+        "marker-color": "rgb(255,255,0)",
+        "marker-size": 20
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "MultiPoint",
+        "coordinates": [
+          [-66.1057427, 18.4663188],
+          [-64.78138, 32.294887]
+        ]
+      },
+      "properties": {
+        "name": "San Juan and Hamilton",
+        "marker-color": "#F99E26",
+        "marker-size": 10
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "LineString",
+        "coordinates": [
+          [-77.76975242, 13.2503978],
+          [-73.16613585, 22.1277124]
+        ]
+      },
+      "properties": {
+        "name": "Line 1",
+        "stroke": "red",
+        "stroke-width": 2
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "LineString",
+        "coordinates": [
+          [-55.48910779, 24.42726436],
+          [-65.44356135, 25.3806029]
+        ]
+      },
+      "properties": {
+        "name": "Line 2",
+        "stroke": "white",
+        "stroke-width": 2
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "LineString",
+        "coordinates": [
+          [-76.38582213, 38.25780378],
+          [-72.5039545, 29.0419965]
+        ]
+      },
+      "properties": {
+        "name": "Line 3",
+        "stroke": "blue",
+        "stroke-width": 2
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "MultiLineString",
+        "coordinates": [
+          [
+            [-80.226529, 25.789106],
+            [-66.1057427, 18.4663188]
+          ],
+          [
+            [-66.1057427, 18.4663188],
+            [-64.78138, 32.294887]
+          ],
+          [
+            [-64.78138, 32.294887],
+            [-80.226529, 25.789106]
+          ]
+        ]
+      },
+      "properties": {
+        "name": "Bermuda Triangle Thin Line",
+        "stroke": "yellow",
+        "stroke-width": 1
+      }
+    }
+  ]
+}
diff --git a/public/openapi3.json b/public/openapi3.json
index c855b84e7d4bb..3c289c32df146 100644
--- a/public/openapi3.json
+++ b/public/openapi3.json
@@ -1,6 +1,52 @@
 {
   "components": {
     "responses": {
+      "GetAllIntervalsResponse": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "items": {
+                "$ref": "#/components/schemas/GettableTimeIntervals"
+              },
+              "type": "array"
+            }
+          }
+        },
+        "description": "(empty)"
+      },
+      "GetIntervalsByNameResponse": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "$ref": "#/components/schemas/GettableTimeIntervals"
+            }
+          }
+        },
+        "description": "(empty)"
+      },
+      "GetReceiverResponse": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "$ref": "#/components/schemas/GettableApiReceiver"
+            }
+          }
+        },
+        "description": "(empty)"
+      },
+      "GetReceiversResponse": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "items": {
+                "$ref": "#/components/schemas/GettableApiReceiver"
+              },
+              "type": "array"
+            }
+          }
+        },
+        "description": "(empty)"
+      },
       "GettableHistoricUserConfigs": {
         "content": {
           "application/json": {
@@ -50,25 +96,6 @@
         },
         "description": "AcceptedResponse"
       },
-      "addPermissionResponse": {
-        "content": {
-          "application/json": {
-            "schema": {
-              "properties": {
-                "message": {
-                  "type": "string"
-                },
-                "permissionId": {
-                  "format": "int64",
-                  "type": "integer"
-                }
-              },
-              "type": "object"
-            }
-          }
-        },
-        "description": "(empty)"
-      },
       "adminCreateUserResponse": {
         "content": {
           "application/json": {
@@ -122,6 +149,16 @@
         },
         "description": "BadRequestError is returned when the request is invalid and it cannot be processed."
       },
+      "badRequestPublicError": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "$ref": "#/components/schemas/publicError"
+            }
+          }
+        },
+        "description": "BadRequestPublicError is returned when the request is invalid and it cannot be processed."
+      },
       "calculateDashboardDiffResponse": {
         "content": {
           "application/json": {
@@ -275,6 +312,16 @@
         },
         "description": "(empty)"
       },
+      "createPublicDashboardResponse": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "$ref": "#/components/schemas/PublicDashboard"
+            }
+          }
+        },
+        "description": "(empty)"
+      },
       "createReportResponse": {
         "content": {
           "application/json": {
@@ -376,32 +423,6 @@
         },
         "description": "(empty)"
       },
-      "deleteAlertNotificationChannelResponse": {
-        "content": {
-          "application/json": {
-            "schema": {
-              "properties": {
-                "id": {
-                  "description": "ID Identifier of the deleted notification channel.",
-                  "example": 65,
-                  "format": "int64",
-                  "type": "integer"
-                },
-                "message": {
-                  "description": "Message Message of the deleted notificatiton channel.",
-                  "type": "string"
-                }
-              },
-              "required": [
-                "id",
-                "message"
-              ],
-              "type": "object"
-            }
-          }
-        },
-        "description": "(empty)"
-      },
       "deleteCorrelationResponse": {
         "content": {
           "application/json": {
@@ -505,42 +526,12 @@
         },
         "description": "(empty)"
       },
-      "folderResponse": {
-        "content": {
-          "application/json": {
-            "schema": {
-              "$ref": "#/components/schemas/Folder"
-            }
-          }
-        },
-        "description": "(empty)"
-      },
-      "forbiddenError": {
-        "content": {
-          "application/json": {
-            "schema": {
-              "$ref": "#/components/schemas/ErrorResponseBody"
-            }
-          }
-        },
-        "description": "ForbiddenError is returned if the user/token has insufficient permissions to access the requested resource."
-      },
-      "genericError": {
-        "content": {
-          "application/json": {
-            "schema": {
-              "$ref": "#/components/schemas/ErrorResponseBody"
-            }
-          }
-        },
-        "description": "A GenericError is the default error message that is generated.\nFor certain status codes there are more appropriate error structures."
-      },
-      "getAPIkeyResponse": {
+      "devicesResponse": {
         "content": {
           "application/json": {
             "schema": {
               "items": {
-                "$ref": "#/components/schemas/ApiKeyDTO"
+                "$ref": "#/components/schemas/deviceDTO"
               },
               "type": "array"
             }
@@ -548,68 +539,62 @@
         },
         "description": "(empty)"
       },
-      "getAccessControlStatusResponse": {
+      "devicesSearchResponse": {
         "content": {
           "application/json": {
             "schema": {
-              "$ref": "#/components/schemas/Status"
+              "$ref": "#/components/schemas/SearchDeviceQueryResult"
             }
           }
         },
         "description": "(empty)"
       },
-      "getAlertNotificationChannelResponse": {
+      "folderResponse": {
         "content": {
           "application/json": {
             "schema": {
-              "$ref": "#/components/schemas/AlertNotification"
+              "$ref": "#/components/schemas/Folder"
             }
           }
         },
         "description": "(empty)"
       },
-      "getAlertNotificationChannelsResponse": {
+      "forbiddenError": {
         "content": {
           "application/json": {
             "schema": {
-              "items": {
-                "$ref": "#/components/schemas/AlertNotification"
-              },
-              "type": "array"
+              "$ref": "#/components/schemas/ErrorResponseBody"
             }
           }
         },
-        "description": "(empty)"
+        "description": "ForbiddenError is returned if the user/token has insufficient permissions to access the requested resource."
       },
-      "getAlertNotificationLookupResponse": {
+      "forbiddenPublicError": {
         "content": {
           "application/json": {
             "schema": {
-              "items": {
-                "$ref": "#/components/schemas/AlertNotificationLookup"
-              },
-              "type": "array"
+              "$ref": "#/components/schemas/publicError"
             }
           }
         },
-        "description": "(empty)"
+        "description": "ForbiddenPublicError is returned if the user/token has insufficient permissions to access the requested resource."
       },
-      "getAlertResponse": {
+      "genericError": {
         "content": {
           "application/json": {
             "schema": {
-              "$ref": "#/components/schemas/LegacyAlert"
+              "$ref": "#/components/schemas/ErrorResponseBody"
             }
           }
         },
-        "description": "(empty)"
+        "description": "A GenericError is the default error message that is generated.\nFor certain status codes there are more appropriate error structures."
       },
-      "getAlertsResponse": {
+      "getAPIkeyResponse": {
         "content": {
           "application/json": {
             "schema": {
               "items": {
-                "$ref": "#/components/schemas/AlertListItemDTO"
+                "$ref": "#/components/schemas/ApiKeyDTO"
               },
               "type": "array"
             }
@@ -617,11 +602,11 @@
         },
         "description": "(empty)"
       },
-      "getAllPermissionseResponse": {
+      "getAccessControlStatusResponse": {
         "content": {
           "application/json": {
             "schema": {
-              "$ref": "#/components/schemas/DataSourcePermissionsDTO"
+              "$ref": "#/components/schemas/Status"
             }
           }
         },
@@ -644,7 +629,7 @@
         "content": {
           "application/json": {
             "schema": {
-              "$ref": "#/components/schemas/ItemDTO"
+              "$ref": "#/components/schemas/Annotation"
             }
           }
         },
@@ -665,7 +650,7 @@
           "application/json": {
             "schema": {
               "items": {
-                "$ref": "#/components/schemas/ItemDTO"
+                "$ref": "#/components/schemas/Annotation"
               },
               "type": "array"
             }
@@ -719,19 +704,6 @@
         },
         "description": "(empty)"
       },
-      "getCustomPermissionsReportResponse": {
-        "content": {
-          "application/json": {
-            "schema": {
-              "items": {
-                "$ref": "#/components/schemas/CustomPermissionsRecordDTO"
-              },
-              "type": "array"
-            }
-          }
-        },
-        "description": "(empty)"
-      },
       "getDashboardPermissionsListResponse": {
         "content": {
           "application/json": {
@@ -748,19 +720,6 @@
       "getDashboardSnapshotResponse": {
         "description": "(empty)"
       },
-      "getDashboardStatesResponse": {
-        "content": {
-          "application/json": {
-            "schema": {
-              "items": {
-                "$ref": "#/components/schemas/AlertStateInfoDTO"
-              },
-              "type": "array"
-            }
-          }
-        },
-        "description": "(empty)"
-      },
       "getDashboardsTagsResponse": {
         "content": {
           "application/json": {
@@ -861,6 +820,16 @@
         },
         "description": "(empty)"
       },
+      "getLibraryElementArrayResponse": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "$ref": "#/components/schemas/LibraryElementArrayResponse"
+            }
+          }
+        },
+        "description": "(empty)"
+      },
       "getLibraryElementConnectionsResponse": {
         "content": {
           "application/json": {
@@ -1010,7 +979,30 @@
         "content": {
           "application/json": {
             "schema": {
-              "$ref": "#/components/schemas/Spec"
+              "$ref": "#/components/schemas/Preferences"
+            }
+          }
+        },
+        "description": "(empty)"
+      },
+      "getPublicAnnotationsResponse": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "items": {
+                "$ref": "#/components/schemas/AnnotationEvent"
+              },
+              "type": "array"
+            }
+          }
+        },
+        "description": "(empty)"
+      },
+      "getPublicDashboardResponse": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "$ref": "#/components/schemas/PublicDashboard"
             }
           }
         },
@@ -1063,7 +1055,7 @@
         "content": {
           "application/json": {
             "schema": {
-              "$ref": "#/components/schemas/ConfigDTO"
+              "$ref": "#/components/schemas/Report"
             }
           }
         },
@@ -1073,7 +1065,7 @@
         "content": {
           "application/json": {
             "schema": {
-              "$ref": "#/components/schemas/SettingsDTO"
+              "$ref": "#/components/schemas/ReportSettings"
             }
           }
         },
@@ -1084,7 +1076,20 @@
           "application/json": {
             "schema": {
               "items": {
-                "$ref": "#/components/schemas/ConfigDTO"
+                "$ref": "#/components/schemas/Report"
+              },
+              "type": "array"
+            }
+          }
+        },
+        "description": "(empty)"
+      },
+      "getResourcePermissionsResponse": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "items": {
+                "$ref": "#/components/schemas/resourcePermissionDTO"
               },
               "type": "array"
             }
@@ -1112,6 +1117,31 @@
         },
         "description": "(empty)"
       },
+      "getSSOSettingsResponse": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "properties": {
+                "id": {
+                  "type": "string"
+                },
+                "provider": {
+                  "type": "string"
+                },
+                "settings": {
+                  "additionalProperties": false,
+                  "type": "object"
+                },
+                "source": {
+                  "type": "string"
+                }
+              },
+              "type": "object"
+            }
+          }
+        },
+        "description": "(empty)"
+      },
       "getSharingOptionsResponse": {
         "content": {
           "application/json": {
@@ -1286,6 +1316,16 @@
         },
         "description": "InternalServerError is a general error indicating something went wrong internally."
       },
+      "internalServerPublicError": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "$ref": "#/components/schemas/publicError"
+            }
+          }
+        },
+        "description": "InternalServerPublicError is a general error indicating something went wrong internally."
+      },
       "jwksResponse": {
         "content": {
           "application/json": {
@@ -1320,6 +1360,16 @@
         },
         "description": "(empty)"
       },
+      "listPublicDashboardsResponse": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "$ref": "#/components/schemas/PublicDashboardListResponseWithPagination"
+            }
+          }
+        },
+        "description": "(empty)"
+      },
       "listRecordingRulesResponse": {
         "content": {
           "application/json": {
@@ -1346,13 +1396,41 @@
         },
         "description": "(empty)"
       },
-      "listSortOptionsResponse": {
+      "listSSOSettingsResponse": {
         "content": {
           "application/json": {
             "schema": {
-              "properties": {
-                "description": {
-                  "type": "string"
+              "items": {
+                "properties": {
+                  "id": {
+                    "type": "string"
+                  },
+                  "provider": {
+                    "type": "string"
+                  },
+                  "settings": {
+                    "additionalProperties": false,
+                    "type": "object"
+                  },
+                  "source": {
+                    "type": "string"
+                  }
+                },
+                "type": "object"
+              },
+              "type": "array"
+            }
+          }
+        },
+        "description": "(empty)"
+      },
+      "listSortOptionsResponse": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "properties": {
+                "description": {
+                  "type": "string"
                 },
                 "displayName": {
                   "type": "string"
@@ -1370,90 +1448,80 @@
         },
         "description": "(empty)"
       },
+      "listTeamsRolesResponse": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "additionalProperties": {
+                "items": {
+                  "$ref": "#/components/schemas/RoleDTO"
+                },
+                "type": "array"
+              },
+              "type": "object"
+            }
+          }
+        },
+        "description": "(empty)"
+      },
       "listTokensResponse": {
         "content": {
           "application/json": {
             "schema": {
-              "$ref": "#/components/schemas/TokenDTO"
+              "items": {
+                "$ref": "#/components/schemas/TokenDTO"
+              },
+              "type": "array"
             }
           }
         },
         "description": "(empty)"
       },
-      "notFoundError": {
+      "listUsersRolesResponse": {
         "content": {
           "application/json": {
             "schema": {
-              "$ref": "#/components/schemas/ErrorResponseBody"
+              "additionalProperties": {
+                "items": {
+                  "$ref": "#/components/schemas/RoleDTO"
+                },
+                "type": "array"
+              },
+              "type": "object"
             }
           }
         },
-        "description": "NotFoundError is returned when the requested resource was not found."
+        "description": "(empty)"
       },
-      "okResponse": {
+      "notFoundError": {
         "content": {
           "application/json": {
             "schema": {
-              "$ref": "#/components/schemas/SuccessResponseBody"
+              "$ref": "#/components/schemas/ErrorResponseBody"
             }
           }
         },
-        "description": "An OKResponse is returned if the request was successful."
+        "description": "NotFoundError is returned when the requested resource was not found."
       },
-      "pauseAlertResponse": {
+      "notFoundPublicError": {
         "content": {
           "application/json": {
             "schema": {
-              "properties": {
-                "alertId": {
-                  "format": "int64",
-                  "type": "integer"
-                },
-                "message": {
-                  "type": "string"
-                },
-                "state": {
-                  "description": "Alert result state\nrequired true",
-                  "type": "string"
-                }
-              },
-              "required": [
-                "alertId",
-                "message"
-              ],
-              "type": "object"
+              "$ref": "#/components/schemas/publicError"
             }
           }
         },
-        "description": "(empty)"
+        "description": "NotFoundPublicError is returned when the requested resource was not found."
       },
-      "pauseAlertsResponse": {
+      "okResponse": {
         "content": {
           "application/json": {
             "schema": {
-              "properties": {
-                "alertsAffected": {
-                  "description": "AlertsAffected is the number of the affected alerts.",
-                  "format": "int64",
-                  "type": "integer"
-                },
-                "message": {
-                  "type": "string"
-                },
-                "state": {
-                  "description": "Alert result state\nrequired true",
-                  "type": "string"
-                }
-              },
-              "required": [
-                "alertsAffected",
-                "message"
-              ],
-              "type": "object"
+              "$ref": "#/components/schemas/SuccessResponseBody"
             }
           }
         },
-        "description": "(empty)"
+        "description": "An OKResponse is returned if the request was successful."
       },
       "postAPIkeyResponse": {
         "content": {
@@ -1496,6 +1564,10 @@
           "application/json": {
             "schema": {
               "properties": {
+                "folderUid": {
+                  "description": "FolderUID The unique identifier (uid) of the folder the dashboard belongs to.",
+                  "type": "string"
+                },
                 "id": {
                   "description": "ID The unique identifier (id) of the created/updated dashboard.",
                   "example": 1,
@@ -1556,6 +1628,16 @@
         },
         "description": "PreconditionFailedError"
       },
+      "publicErrorResponse": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "$ref": "#/components/schemas/publicError"
+            }
+          }
+        },
+        "description": "(empty)"
+      },
       "queryMetricsWithExpressionsRespons": {
         "content": {
           "application/json": {
@@ -1566,6 +1648,16 @@
         },
         "description": "(empty)"
       },
+      "queryPublicDashboardResponse": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "$ref": "#/components/schemas/QueryDataResponse"
+            }
+          }
+        },
+        "description": "(empty)"
+      },
       "receiversResponse": {
         "content": {
           "application/json": {
@@ -1609,6 +1701,16 @@
         },
         "description": "(empty)"
       },
+      "resourcePermissionsDescription": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "$ref": "#/components/schemas/Description"
+            }
+          }
+        },
+        "description": "(empty)"
+      },
       "retrieveServiceAccountResponse": {
         "content": {
           "application/json": {
@@ -1738,27 +1840,27 @@
         },
         "description": "(empty)"
       },
-      "testAlertResponse": {
+      "unauthorisedError": {
         "content": {
           "application/json": {
             "schema": {
-              "$ref": "#/components/schemas/AlertTestResult"
+              "$ref": "#/components/schemas/ErrorResponseBody"
             }
           }
         },
-        "description": "(empty)"
+        "description": "UnauthorizedError is returned when the request is not authenticated."
       },
-      "trimDashboardResponse": {
+      "unauthorisedPublicError": {
         "content": {
           "application/json": {
             "schema": {
-              "$ref": "#/components/schemas/TrimDashboardFullWithMeta"
+              "$ref": "#/components/schemas/publicError"
             }
           }
         },
-        "description": "(empty)"
+        "description": "UnauthorisedPublicError is returned when the request is not authenticated."
       },
-      "unauthorisedError": {
+      "unprocessableEntityError": {
         "content": {
           "application/json": {
             "schema": {
@@ -1766,33 +1868,33 @@
             }
           }
         },
-        "description": "UnauthorizedError is returned when the request is not authenticated."
+        "description": "UnprocessableEntityError"
       },
-      "unprocessableEntityError": {
+      "updateCorrelationResponse": {
         "content": {
           "application/json": {
             "schema": {
-              "$ref": "#/components/schemas/ErrorResponseBody"
+              "$ref": "#/components/schemas/UpdateCorrelationResponseBody"
             }
           }
         },
-        "description": "UnprocessableEntityError"
+        "description": "(empty)"
       },
-      "updateCorrelationResponse": {
+      "updatePlaylistResponse": {
         "content": {
           "application/json": {
             "schema": {
-              "$ref": "#/components/schemas/UpdateCorrelationResponseBody"
+              "$ref": "#/components/schemas/PlaylistDTO"
             }
           }
         },
         "description": "(empty)"
       },
-      "updatePlaylistResponse": {
+      "updatePublicDashboardResponse": {
         "content": {
           "application/json": {
             "schema": {
-              "$ref": "#/components/schemas/PlaylistDTO"
+              "$ref": "#/components/schemas/PublicDashboard"
             }
           }
         },
@@ -1833,20 +1935,15 @@
         },
         "description": "(empty)"
       },
-      "validateDashboardResponse": {
-        "description": "(empty)",
-        "headers": {
-          "isValid": {
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          "message": {
+      "viewPublicDashboardResponse": {
+        "content": {
+          "application/json": {
             "schema": {
-              "type": "string"
+              "$ref": "#/components/schemas/DashboardFullWithMeta"
             }
           }
-        }
+        },
+        "description": "(empty)"
       }
     },
     "schemas": {
@@ -1878,6 +1975,10 @@
             "format": "int64",
             "type": "integer"
           },
+          "active_anonymous_devices": {
+            "format": "int64",
+            "type": "integer"
+          },
           "active_users": {
             "format": "int64",
             "type": "integer"
@@ -1889,7 +1990,7 @@
         },
         "type": "object"
       },
-      "AddCommand": {
+      "AddAPIKeyCommand": {
         "properties": {
           "name": {
             "type": "string"
@@ -1998,25 +2099,6 @@
         },
         "type": "object"
       },
-      "AddPermissionDTO": {
-        "properties": {
-          "builtinRole": {
-            "type": "string"
-          },
-          "permission": {
-            "$ref": "#/components/schemas/DsPermissionType"
-          },
-          "teamId": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "userId": {
-            "format": "int64",
-            "type": "integer"
-          }
-        },
-        "type": "object"
-      },
       "AddServiceAccountTokenCommand": {
         "properties": {
           "name": {
@@ -2096,7 +2178,7 @@
             "type": "integer"
           },
           "password": {
-            "type": "string"
+            "$ref": "#/components/schemas/Password"
           }
         },
         "type": "object"
@@ -2119,6 +2201,10 @@
             "format": "int64",
             "type": "integer"
           },
+          "activeDevices": {
+            "format": "int64",
+            "type": "integer"
+          },
           "activeEditors": {
             "format": "int64",
             "type": "integer"
@@ -2213,7 +2299,7 @@
       "AdminUpdateUserPasswordForm": {
         "properties": {
           "password": {
-            "type": "string"
+            "$ref": "#/components/schemas/Password"
           }
         },
         "type": "object"
@@ -2285,52 +2371,6 @@
         },
         "type": "object"
       },
-      "AlertListItemDTO": {
-        "properties": {
-          "dashboardId": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "dashboardSlug": {
-            "type": "string"
-          },
-          "dashboardUid": {
-            "type": "string"
-          },
-          "evalData": {
-            "$ref": "#/components/schemas/Json"
-          },
-          "evalDate": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "executionError": {
-            "type": "string"
-          },
-          "id": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "name": {
-            "type": "string"
-          },
-          "newStateDate": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "panelId": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "state": {
-            "$ref": "#/components/schemas/AlertStateType"
-          },
-          "url": {
-            "type": "string"
-          }
-        },
-        "type": "object"
-      },
       "AlertManager": {
         "properties": {
           "url": {
@@ -2361,103 +2401,35 @@
         "title": "AlertManagersResult contains the result from querying the alertmanagers endpoint.",
         "type": "object"
       },
-      "AlertNotification": {
+      "AlertQuery": {
         "properties": {
-          "created": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "disableResolveMessage": {
-            "type": "boolean"
-          },
-          "frequency": {
-            "type": "string"
-          },
-          "id": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "isDefault": {
-            "type": "boolean"
-          },
-          "name": {
+          "datasourceUid": {
+            "description": "Grafana data source unique identifier; it should be '__expr__' for a Server Side Expression operation.",
             "type": "string"
           },
-          "secureFields": {
-            "additionalProperties": {
-              "type": "boolean"
-            },
+          "model": {
+            "description": "JSON is the raw JSON query and includes the above properties as well as custom properties.",
             "type": "object"
           },
-          "sendReminder": {
-            "type": "boolean"
-          },
-          "settings": {
-            "$ref": "#/components/schemas/Json"
-          },
-          "type": {
+          "queryType": {
+            "description": "QueryType is an optional identifier for the type of query.\nIt can be used to distinguish different types of queries.",
             "type": "string"
           },
-          "uid": {
+          "refId": {
+            "description": "RefID is the unique identifier of the query, set by the frontend call.",
             "type": "string"
           },
-          "updated": {
-            "format": "date-time",
-            "type": "string"
+          "relativeTimeRange": {
+            "$ref": "#/components/schemas/RelativeTimeRange"
           }
         },
+        "title": "AlertQuery represents a single query associated with an alert definition.",
         "type": "object"
       },
-      "AlertNotificationLookup": {
+      "AlertQueryExport": {
         "properties": {
-          "id": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "isDefault": {
-            "type": "boolean"
-          },
-          "name": {
-            "type": "string"
-          },
-          "type": {
-            "type": "string"
-          },
-          "uid": {
-            "type": "string"
-          }
-        },
-        "type": "object"
-      },
-      "AlertQuery": {
-        "properties": {
-          "datasourceUid": {
-            "description": "Grafana data source unique identifier; it should be '__expr__' for a Server Side Expression operation.",
-            "type": "string"
-          },
-          "model": {
-            "description": "JSON is the raw JSON query and includes the above properties as well as custom properties.",
-            "type": "object"
-          },
-          "queryType": {
-            "description": "QueryType is an optional identifier for the type of query.\nIt can be used to distinguish different types of queries.",
-            "type": "string"
-          },
-          "refId": {
-            "description": "RefID is the unique identifier of the query, set by the frontend call.",
-            "type": "string"
-          },
-          "relativeTimeRange": {
-            "$ref": "#/components/schemas/RelativeTimeRange"
-          }
-        },
-        "title": "AlertQuery represents a single query associated with an alert definition.",
-        "type": "object"
-      },
-      "AlertQueryExport": {
-        "properties": {
-          "datasourceUid": {
-            "type": "string"
+          "datasourceUid": {
+            "type": "string"
           },
           "model": {
             "additionalProperties": false,
@@ -2544,6 +2516,9 @@
             ],
             "type": "string"
           },
+          "notification_settings": {
+            "$ref": "#/components/schemas/AlertRuleNotificationSettingsExport"
+          },
           "panelId": {
             "format": "int64",
             "type": "integer"
@@ -2613,84 +2588,88 @@
         },
         "type": "object"
       },
-      "AlertStateInfoDTO": {
+      "AlertRuleNotificationSettings": {
         "properties": {
-          "dashboardId": {
-            "format": "int64",
-            "type": "integer"
+          "group_by": {
+            "default": [
+              "alertname",
+              "grafana_folder"
+            ],
+            "description": "Override the labels by which incoming alerts are grouped together. For example, multiple alerts coming in for\ncluster=A and alertname=LatencyHigh would be batched into a single group. To aggregate by all possible labels\nuse the special value '...' as the sole label name.\nThis effectively disables aggregation entirely, passing through all alerts as-is. This is unlikely to be what\nyou want, unless you have a very low alert volume or your upstream notification system performs its own grouping.\nMust include 'alertname' and 'grafana_folder' if not using '...'.",
+            "example": [
+              "alertname",
+              "grafana_folder",
+              "cluster"
+            ],
+            "items": {
+              "type": "string"
+            },
+            "type": "array"
           },
-          "id": {
-            "format": "int64",
-            "type": "integer"
+          "group_interval": {
+            "description": "Override how long to wait before sending a notification about new alerts that are added to a group of alerts for\nwhich an initial notification has already been sent. (Usually ~5m or more.)",
+            "example": "5m",
+            "type": "string"
           },
-          "newStateDate": {
-            "format": "date-time",
+          "group_wait": {
+            "description": "Override how long to initially wait to send a notification for a group of alerts. Allows to wait for an\ninhibiting alert to arrive or collect more initial alerts for the same group. (Usually ~0s to few minutes.)",
+            "example": "30s",
             "type": "string"
           },
-          "panelId": {
-            "format": "int64",
-            "type": "integer"
+          "mute_time_intervals": {
+            "description": "Override the times when notifications should be muted. These must match the name of a mute time interval defined\nin the alertmanager configuration mute_time_intervals section. When muted it will not send any notifications, but\notherwise acts normally.",
+            "example": [
+              "maintenance"
+            ],
+            "items": {
+              "type": "string"
+            },
+            "type": "array"
           },
-          "state": {
-            "$ref": "#/components/schemas/AlertStateType"
-          }
-        },
-        "type": "object"
-      },
-      "AlertStateType": {
-        "type": "string"
-      },
-      "AlertTestCommand": {
-        "properties": {
-          "dashboard": {
-            "$ref": "#/components/schemas/Json"
+          "receiver": {
+            "description": "Name of the receiver to send notifications to.",
+            "example": "grafana-default-email",
+            "type": "string"
           },
-          "panelId": {
-            "format": "int64",
-            "type": "integer"
+          "repeat_interval": {
+            "description": "Override how long to wait before sending a notification again if it has already been sent successfully for an\nalert. (Usually ~3h or more).\nNote that this parameter is implicitly bound by Alertmanager's `--data.retention` configuration flag.\nNotifications will be resent after either repeat_interval or the data retention period have passed, whichever\noccurs first. `repeat_interval` should not be less than `group_interval`.",
+            "example": "4h",
+            "type": "string"
           }
         },
+        "required": [
+          "receiver"
+        ],
         "type": "object"
       },
-      "AlertTestResult": {
+      "AlertRuleNotificationSettingsExport": {
         "properties": {
-          "conditionEvals": {
-            "type": "string"
-          },
-          "error": {
-            "type": "string"
-          },
-          "firing": {
-            "type": "boolean"
-          },
-          "logs": {
+          "group_by": {
             "items": {
-              "$ref": "#/components/schemas/AlertTestResultLog"
+              "type": "string"
             },
             "type": "array"
           },
-          "matches": {
+          "group_interval": {
+            "type": "string"
+          },
+          "group_wait": {
+            "type": "string"
+          },
+          "mute_time_intervals": {
             "items": {
-              "$ref": "#/components/schemas/EvalMatch"
+              "type": "string"
             },
             "type": "array"
           },
-          "state": {
-            "$ref": "#/components/schemas/AlertStateType"
-          },
-          "timeMs": {
+          "receiver": {
             "type": "string"
-          }
-        },
-        "type": "object"
-      },
-      "AlertTestResultLog": {
-        "properties": {
-          "data": {},
-          "message": {
+          },
+          "repeat_interval": {
             "type": "string"
           }
         },
+        "title": "AlertRuleNotificationSettingsExport is the provisioned export of models.NotificationSettings.",
         "type": "object"
       },
       "AlertingFileExport": {
@@ -2711,6 +2690,12 @@
             },
             "type": "array"
           },
+          "muteTimes": {
+            "items": {
+              "$ref": "#/components/schemas/MuteTimeIntervalExport"
+            },
+            "type": "array"
+          },
           "policies": {
             "items": {
               "$ref": "#/components/schemas/NotificationPolicyExport"
@@ -2814,121 +2799,339 @@
         },
         "type": "object"
       },
-      "AnnotationActions": {
+      "Annotation": {
         "properties": {
-          "canAdd": {
-            "type": "boolean"
+          "alertId": {
+            "format": "int64",
+            "type": "integer"
           },
-          "canDelete": {
-            "type": "boolean"
+          "alertName": {
+            "type": "string"
           },
-          "canEdit": {
-            "type": "boolean"
-          }
-        },
-        "type": "object"
-      },
-      "AnnotationPermission": {
-        "properties": {
-          "dashboard": {
-            "$ref": "#/components/schemas/AnnotationActions"
+          "avatarUrl": {
+            "type": "string"
           },
-          "organization": {
-            "$ref": "#/components/schemas/AnnotationActions"
-          }
-        },
-        "type": "object"
-      },
-      "ApiKeyDTO": {
-        "properties": {
-          "accessControl": {
-            "$ref": "#/components/schemas/Metadata"
+          "created": {
+            "format": "int64",
+            "type": "integer"
           },
-          "expiration": {
-            "format": "date-time",
+          "dashboardId": {
+            "format": "int64",
+            "type": "integer"
+          },
+          "dashboardUID": {
+            "type": "string"
+          },
+          "data": {
+            "$ref": "#/components/schemas/Json"
+          },
+          "email": {
             "type": "string"
           },
           "id": {
             "format": "int64",
             "type": "integer"
           },
-          "lastUsedAt": {
-            "format": "date-time",
+          "login": {
             "type": "string"
           },
-          "name": {
+          "newState": {
             "type": "string"
           },
-          "role": {
-            "enum": [
-              "None",
-              "Viewer",
-              "Editor",
-              "Admin"
-            ],
-            "type": "string"
-          }
-        },
-        "type": "object"
-      },
-      "ApiRuleNode": {
-        "properties": {
-          "alert": {
+          "panelId": {
+            "format": "int64",
+            "type": "integer"
+          },
+          "prevState": {
             "type": "string"
           },
-          "annotations": {
-            "additionalProperties": {
+          "tags": {
+            "items": {
               "type": "string"
             },
-            "type": "object"
+            "type": "array"
           },
-          "expr": {
+          "text": {
             "type": "string"
           },
-          "for": {
-            "type": "string"
+          "time": {
+            "format": "int64",
+            "type": "integer"
           },
-          "keep_firing_for": {
-            "type": "string"
+          "timeEnd": {
+            "format": "int64",
+            "type": "integer"
           },
-          "labels": {
-            "additionalProperties": {
-              "type": "string"
-            },
-            "type": "object"
+          "updated": {
+            "format": "int64",
+            "type": "integer"
           },
-          "record": {
-            "type": "string"
+          "userId": {
+            "format": "int64",
+            "type": "integer"
           }
         },
         "type": "object"
       },
-      "AttributeTypeAndValue": {
-        "description": "AttributeTypeAndValue mirrors the ASN.1 structure of the same name in\nRFC 5280, Section 4.1.2.4.",
-        "properties": {
-          "Type": {
-            "$ref": "#/components/schemas/ObjectIdentifier"
-          },
-          "Value": {}
-        },
-        "type": "object"
-      },
-      "Authorization": {
+      "AnnotationActions": {
         "properties": {
-          "credentials": {
-            "$ref": "#/components/schemas/Secret"
+          "canAdd": {
+            "type": "boolean"
           },
-          "credentials_file": {
-            "type": "string"
+          "canDelete": {
+            "type": "boolean"
           },
-          "type": {
-            "type": "string"
+          "canEdit": {
+            "type": "boolean"
           }
         },
-        "title": "Authorization contains HTTP authorization credentials.",
         "type": "object"
       },
-      "BacktestConfig": {
+      "AnnotationEvent": {
+        "properties": {
+          "color": {
+            "type": "string"
+          },
+          "dashboardId": {
+            "format": "int64",
+            "type": "integer"
+          },
+          "id": {
+            "format": "int64",
+            "type": "integer"
+          },
+          "isRegion": {
+            "type": "boolean"
+          },
+          "panelId": {
+            "format": "int64",
+            "type": "integer"
+          },
+          "source": {
+            "$ref": "#/components/schemas/AnnotationQuery"
+          },
+          "tags": {
+            "items": {
+              "type": "string"
+            },
+            "type": "array"
+          },
+          "text": {
+            "type": "string"
+          },
+          "time": {
+            "format": "int64",
+            "type": "integer"
+          },
+          "timeEnd": {
+            "format": "int64",
+            "type": "integer"
+          }
+        },
+        "type": "object"
+      },
+      "AnnotationPanelFilter": {
+        "properties": {
+          "exclude": {
+            "description": "Should the specified panels be included or excluded",
+            "type": "boolean"
+          },
+          "ids": {
+            "description": "Panel IDs that should be included or excluded",
+            "items": {
+              "format": "int64",
+              "type": "integer"
+            },
+            "type": "array"
+          }
+        },
+        "title": "AnnotationPanelFilter defines model for AnnotationPanelFilter.",
+        "type": "object"
+      },
+      "AnnotationPermission": {
+        "properties": {
+          "dashboard": {
+            "$ref": "#/components/schemas/AnnotationActions"
+          },
+          "organization": {
+            "$ref": "#/components/schemas/AnnotationActions"
+          }
+        },
+        "type": "object"
+      },
+      "AnnotationQuery": {
+        "description": "TODO docs\nFROM: AnnotationQuery in grafana-data/src/types/annotations.ts",
+        "properties": {
+          "builtIn": {
+            "description": "Set to 1 for the standard annotation query all dashboards have by default.",
+            "format": "float",
+            "type": "number"
+          },
+          "datasource": {
+            "$ref": "#/components/schemas/DataSourceRef"
+          },
+          "enable": {
+            "description": "When enabled the annotation query is issued with every dashboard refresh",
+            "type": "boolean"
+          },
+          "filter": {
+            "$ref": "#/components/schemas/AnnotationPanelFilter"
+          },
+          "hide": {
+            "description": "Annotation queries can be toggled on or off at the top of the dashboard.\nWhen hide is true, the toggle is not shown in the dashboard.",
+            "type": "boolean"
+          },
+          "iconColor": {
+            "description": "Color to use for the annotation event markers",
+            "type": "string"
+          },
+          "name": {
+            "description": "Name of annotation.",
+            "type": "string"
+          },
+          "target": {
+            "$ref": "#/components/schemas/AnnotationTarget"
+          },
+          "type": {
+            "description": "TODO -- this should not exist here, it is based on the --grafana-- datasource",
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
+      "AnnotationTarget": {
+        "description": "TODO: this should be a regular DataQuery that depends on the selected dashboard\nthese match the properties of the \"grafana\" datasouce that is default in most dashboards",
+        "properties": {
+          "limit": {
+            "description": "Only required/valid for the grafana datasource...\nbut code+tests is already depending on it so hard to change",
+            "format": "int64",
+            "type": "integer"
+          },
+          "matchAny": {
+            "description": "Only required/valid for the grafana datasource...\nbut code+tests is already depending on it so hard to change",
+            "type": "boolean"
+          },
+          "tags": {
+            "description": "Only required/valid for the grafana datasource...\nbut code+tests is already depending on it so hard to change",
+            "items": {
+              "type": "string"
+            },
+            "type": "array"
+          },
+          "type": {
+            "description": "Only required/valid for the grafana datasource...\nbut code+tests is already depending on it so hard to change",
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
+      "ApiKeyDTO": {
+        "properties": {
+          "accessControl": {
+            "$ref": "#/components/schemas/Metadata"
+          },
+          "expiration": {
+            "format": "date-time",
+            "type": "string"
+          },
+          "id": {
+            "format": "int64",
+            "type": "integer"
+          },
+          "lastUsedAt": {
+            "format": "date-time",
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "role": {
+            "enum": [
+              "None",
+              "Viewer",
+              "Editor",
+              "Admin"
+            ],
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
+      "ApiRuleNode": {
+        "properties": {
+          "alert": {
+            "type": "string"
+          },
+          "annotations": {
+            "additionalProperties": {
+              "type": "string"
+            },
+            "type": "object"
+          },
+          "expr": {
+            "type": "string"
+          },
+          "for": {
+            "type": "string"
+          },
+          "keep_firing_for": {
+            "type": "string"
+          },
+          "labels": {
+            "additionalProperties": {
+              "type": "string"
+            },
+            "type": "object"
+          },
+          "record": {
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
+      "Assignments": {
+        "properties": {
+          "builtInRoles": {
+            "type": "boolean"
+          },
+          "serviceAccounts": {
+            "type": "boolean"
+          },
+          "teams": {
+            "type": "boolean"
+          },
+          "users": {
+            "type": "boolean"
+          }
+        },
+        "type": "object"
+      },
+      "AttributeTypeAndValue": {
+        "description": "AttributeTypeAndValue mirrors the ASN.1 structure of the same name in\nRFC 5280, Section 4.1.2.4.",
+        "properties": {
+          "Type": {
+            "$ref": "#/components/schemas/ObjectIdentifier"
+          },
+          "Value": {}
+        },
+        "type": "object"
+      },
+      "Authorization": {
+        "properties": {
+          "credentials": {
+            "$ref": "#/components/schemas/Secret"
+          },
+          "credentials_file": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string"
+          }
+        },
+        "title": "Authorization contains HTTP authorization credentials.",
+        "type": "object"
+      },
+      "BacktestConfig": {
         "properties": {
           "annotations": {
             "additionalProperties": {
@@ -2992,29 +3195,12 @@
           },
           "username": {
             "type": "string"
-          }
-        },
-        "title": "BasicAuth contains basic HTTP authentication credentials.",
-        "type": "object"
-      },
-      "BrandingOptionsDTO": {
-        "properties": {
-          "emailFooterLink": {
-            "type": "string"
-          },
-          "emailFooterMode": {
-            "type": "string"
-          },
-          "emailFooterText": {
-            "type": "string"
-          },
-          "emailLogoUrl": {
-            "type": "string"
           },
-          "reportLogoUrl": {
+          "username_file": {
             "type": "string"
           }
         },
+        "title": "BasicAuth contains basic HTTP authentication credentials.",
         "type": "object"
       },
       "CalculateDiffTarget": {
@@ -3277,10 +3463,10 @@
       "ChangeUserPasswordCommand": {
         "properties": {
           "newPassword": {
-            "type": "string"
+            "$ref": "#/components/schemas/Password"
           },
           "oldPassword": {
-            "type": "string"
+            "$ref": "#/components/schemas/Password"
           }
         },
         "type": "object"
@@ -3302,6 +3488,7 @@
             "type": "array"
           },
           "mute_time_intervals": {
+            "description": "MuteTimeIntervals is deprecated and will be removed before Alertmanager 1.0.",
             "items": {
               "$ref": "#/components/schemas/MuteTimeInterval"
             },
@@ -3315,105 +3502,29 @@
               "type": "string"
             },
             "type": "array"
+          },
+          "time_intervals": {
+            "items": {
+              "$ref": "#/components/schemas/TimeInterval"
+            },
+            "type": "array"
           }
         },
         "title": "Config is the top-level configuration for Alertmanager's config files.",
         "type": "object"
       },
-      "ConfigDTO": {
-        "description": "ConfigDTO is model representation in transfer",
+      "ContactPointExport": {
         "properties": {
-          "created": {
-            "format": "date-time",
+          "name": {
             "type": "string"
           },
-          "dashboardId": {
+          "orgId": {
             "format": "int64",
             "type": "integer"
           },
-          "dashboardName": {
-            "type": "string"
-          },
-          "dashboardUid": {
-            "type": "string"
-          },
-          "dashboards": {
+          "receivers": {
             "items": {
-              "$ref": "#/components/schemas/DashboardDTO"
-            },
-            "type": "array"
-          },
-          "enableCsv": {
-            "type": "boolean"
-          },
-          "enableDashboardUrl": {
-            "type": "boolean"
-          },
-          "formats": {
-            "items": {
-              "$ref": "#/components/schemas/Type"
-            },
-            "type": "array"
-          },
-          "id": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "message": {
-            "type": "string"
-          },
-          "name": {
-            "type": "string"
-          },
-          "options": {
-            "$ref": "#/components/schemas/ReportOptionsDTO"
-          },
-          "orgId": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "recipients": {
-            "type": "string"
-          },
-          "replyTo": {
-            "type": "string"
-          },
-          "scaleFactor": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "schedule": {
-            "$ref": "#/components/schemas/ScheduleDTO"
-          },
-          "state": {
-            "$ref": "#/components/schemas/State"
-          },
-          "templateVars": {
-            "type": "object"
-          },
-          "updated": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "userId": {
-            "format": "int64",
-            "type": "integer"
-          }
-        },
-        "type": "object"
-      },
-      "ContactPointExport": {
-        "properties": {
-          "name": {
-            "type": "string"
-          },
-          "orgId": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "receivers": {
-            "items": {
-              "$ref": "#/components/schemas/ReceiverExport"
+              "$ref": "#/components/schemas/ReceiverExport"
             },
             "type": "array"
           }
@@ -3570,41 +3681,6 @@
         "title": "CounterResetHint contains the known information about a counter reset,",
         "type": "integer"
       },
-      "CreateAlertNotificationCommand": {
-        "properties": {
-          "disableResolveMessage": {
-            "type": "boolean"
-          },
-          "frequency": {
-            "type": "string"
-          },
-          "isDefault": {
-            "type": "boolean"
-          },
-          "name": {
-            "type": "string"
-          },
-          "secureSettings": {
-            "additionalProperties": {
-              "type": "string"
-            },
-            "type": "object"
-          },
-          "sendReminder": {
-            "type": "boolean"
-          },
-          "settings": {
-            "$ref": "#/components/schemas/Json"
-          },
-          "type": {
-            "type": "string"
-          },
-          "uid": {
-            "type": "string"
-          }
-        },
-        "type": "object"
-      },
       "CreateCorrelationCommand": {
         "description": "CreateCorrelationCommand is the command for creating a correlation",
         "properties": {
@@ -3648,8 +3724,12 @@
       },
       "CreateDashboardSnapshotCommand": {
         "properties": {
+          "apiVersion": {
+            "description": "APIVersion defines the versioned schema of this representation of an object.\nServers should convert recognized schemas to the latest internal value, and\nmay reject unrecognized values.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources\n+optional",
+            "type": "string"
+          },
           "dashboard": {
-            "$ref": "#/components/schemas/Json"
+            "$ref": "#/components/schemas/Unstructured"
           },
           "deleteKey": {
             "description": "Unique key used to delete the snapshot. It is different from the `key` so that only the creator can delete the snapshot. Required if `external` is `true`.",
@@ -3670,6 +3750,10 @@
             "description": "Define the unique key. Required if `external` is `true`.",
             "type": "string"
           },
+          "kind": {
+            "description": "Kind is a string value representing the REST resource this object represents.\nServers may infer this from the endpoint the client submits requests to.\nCannot be updated.\nIn CamelCase.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds\n+optional",
+            "type": "string"
+          },
           "name": {
             "description": "Snapshot name",
             "type": "string"
@@ -3702,7 +3786,7 @@
         "description": "CreateLibraryElementCommand is the command for adding a LibraryElement",
         "properties": {
           "folderId": {
-            "description": "ID of the folder where the library element is stored.",
+            "description": "ID of the folder where the library element is stored.\n\nDeprecated: use FolderUID instead",
             "format": "int64",
             "type": "integer"
           },
@@ -3733,18 +3817,11 @@
         },
         "type": "object"
       },
-      "CreateOrUpdateConfigCmd": {
+      "CreateOrUpdateReportConfig": {
         "properties": {
-          "dashboardId": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "dashboardUid": {
-            "type": "string"
-          },
           "dashboards": {
             "items": {
-              "$ref": "#/components/schemas/DashboardDTO"
+              "$ref": "#/components/schemas/ReportDashboard"
             },
             "type": "array"
           },
@@ -3767,7 +3844,7 @@
             "type": "string"
           },
           "options": {
-            "$ref": "#/components/schemas/ReportOptionsDTO"
+            "$ref": "#/components/schemas/ReportOptions"
           },
           "recipients": {
             "type": "string"
@@ -3780,13 +3857,10 @@
             "type": "integer"
           },
           "schedule": {
-            "$ref": "#/components/schemas/ScheduleDTO"
+            "$ref": "#/components/schemas/ReportSchedule"
           },
           "state": {
             "$ref": "#/components/schemas/State"
-          },
-          "templateVars": {
-            "type": "object"
           }
         },
         "type": "object"
@@ -3903,53 +3977,6 @@
         },
         "type": "object"
       },
-      "CustomPermissionsRecordDTO": {
-        "properties": {
-          "customPermissions": {
-            "type": "string"
-          },
-          "granteeName": {
-            "type": "string"
-          },
-          "granteeType": {
-            "type": "string"
-          },
-          "granteeUrl": {
-            "type": "string"
-          },
-          "id": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "isFolder": {
-            "type": "boolean"
-          },
-          "orgId": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "orgRole": {
-            "type": "string"
-          },
-          "slug": {
-            "type": "string"
-          },
-          "title": {
-            "type": "string"
-          },
-          "uid": {
-            "type": "string"
-          },
-          "url": {
-            "type": "string"
-          },
-          "usersCount": {
-            "format": "int64",
-            "type": "integer"
-          }
-        },
-        "type": "object"
-      },
       "DashboardACLInfoDTO": {
         "properties": {
           "created": {
@@ -3961,6 +3988,7 @@
             "type": "integer"
           },
           "folderId": {
+            "description": "Deprecated: use FolderUID instead",
             "format": "int64",
             "type": "integer"
           },
@@ -4058,18 +4086,39 @@
         },
         "type": "object"
       },
-      "DashboardDTO": {
+      "DashboardCreateCommand": {
+        "description": "These are the values expected to be sent from an end user\n+k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object",
         "properties": {
+          "apiVersion": {
+            "description": "APIVersion defines the versioned schema of this representation of an object.\nServers should convert recognized schemas to the latest internal value, and\nmay reject unrecognized values.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources\n+optional",
+            "type": "string"
+          },
           "dashboard": {
-            "$ref": "#/components/schemas/DashboardReportDTO"
+            "$ref": "#/components/schemas/Unstructured"
           },
-          "reportVariables": {
-            "type": "object"
+          "expires": {
+            "default": 0,
+            "description": "When the snapshot should expire in seconds in seconds. Default is never to expire.",
+            "format": "int64",
+            "type": "integer"
           },
-          "timeRange": {
-            "$ref": "#/components/schemas/TimeRangeDTO"
+          "external": {
+            "default": false,
+            "description": "these are passed when storing an external snapshot ref\nSave the snapshot on an external server rather than locally.",
+            "type": "boolean"
+          },
+          "kind": {
+            "description": "Kind is a string value representing the REST resource this object represents.\nServers may infer this from the endpoint the client submits requests to.\nCannot be updated.\nIn CamelCase.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds\n+optional",
+            "type": "string"
+          },
+          "name": {
+            "description": "Snapshot name",
+            "type": "string"
           }
         },
+        "required": [
+          "dashboard"
+        ],
         "type": "object"
       },
       "DashboardFullWithMeta": {
@@ -4115,6 +4164,7 @@
             "type": "string"
           },
           "folderId": {
+            "description": "Deprecated: use FolderUID instead",
             "format": "int64",
             "type": "integer"
           },
@@ -4182,21 +4232,6 @@
         },
         "type": "object"
       },
-      "DashboardReportDTO": {
-        "properties": {
-          "id": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "name": {
-            "type": "string"
-          },
-          "uid": {
-            "type": "string"
-          }
-        },
-        "type": "object"
-      },
       "DashboardSnapshotDTO": {
         "description": "DashboardSnapshotDTO without dashboard map",
         "properties": {
@@ -4214,27 +4249,15 @@
           "externalUrl": {
             "type": "string"
           },
-          "id": {
-            "format": "int64",
-            "type": "integer"
-          },
           "key": {
             "type": "string"
           },
           "name": {
             "type": "string"
           },
-          "orgId": {
-            "format": "int64",
-            "type": "integer"
-          },
           "updated": {
             "format": "date-time",
             "type": "string"
-          },
-          "userId": {
-            "format": "int64",
-            "type": "integer"
           }
         },
         "type": "object"
@@ -4457,112 +4480,89 @@
         },
         "type": "object"
       },
-      "DataSourcePermissionRuleDTO": {
+      "DataSourceRef": {
+        "description": "Ref to a DataSource instance",
         "properties": {
-          "builtInRole": {
-            "type": "string"
-          },
-          "created": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "datasourceId": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "id": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "isManaged": {
-            "type": "boolean"
-          },
-          "permission": {
-            "$ref": "#/components/schemas/DsPermissionType"
-          },
-          "permissionName": {
+          "type": {
+            "description": "The plugin type-id",
             "type": "string"
           },
-          "team": {
+          "uid": {
+            "description": "Specific datasource instance",
             "type": "string"
-          },
-          "teamAvatarUrl": {
+          }
+        },
+        "type": "object"
+      },
+      "DataTopic": {
+        "description": "nolint:revive",
+        "title": "DataTopic is used to identify which topic the frame should be assigned to.",
+        "type": "string"
+      },
+      "DeleteCorrelationResponseBody": {
+        "properties": {
+          "message": {
+            "example": "Correlation deleted",
             "type": "string"
-          },
-          "teamEmail": {
-            "type": "string"
-          },
-          "teamId": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "updated": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "userAvatarUrl": {
-            "type": "string"
-          },
-          "userEmail": {
-            "type": "string"
-          },
-          "userId": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "userLogin": {
+          }
+        },
+        "type": "object"
+      },
+      "DeleteTokenCommand": {
+        "properties": {
+          "instance": {
             "type": "string"
           }
         },
         "type": "object"
       },
-      "DataSourcePermissionsDTO": {
+      "DescendantCounts": {
+        "additionalProperties": {
+          "format": "int64",
+          "type": "integer"
+        },
+        "type": "object"
+      },
+      "Description": {
         "properties": {
-          "datasourceId": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "enabled": {
-            "type": "boolean"
+          "assignments": {
+            "$ref": "#/components/schemas/Assignments"
           },
           "permissions": {
             "items": {
-              "$ref": "#/components/schemas/DataSourcePermissionRuleDTO"
+              "type": "string"
             },
             "type": "array"
           }
         },
         "type": "object"
       },
-      "DataTopic": {
-        "description": "nolint:revive",
-        "title": "DataTopic is used to identify which topic the frame should be assigned to.",
-        "type": "string"
-      },
-      "DeleteCorrelationResponseBody": {
+      "DeviceSearchHitDTO": {
         "properties": {
-          "message": {
-            "example": "Correlation deleted",
+          "clientIp": {
             "type": "string"
-          }
-        },
-        "type": "object"
-      },
-      "DeleteTokenCommand": {
-        "properties": {
-          "instance": {
+          },
+          "createdAt": {
+            "format": "date-time",
+            "type": "string"
+          },
+          "deviceId": {
+            "type": "string"
+          },
+          "lastSeenAt": {
+            "format": "date-time",
+            "type": "string"
+          },
+          "updatedAt": {
+            "format": "date-time",
+            "type": "string"
+          },
+          "userAgent": {
             "type": "string"
           }
         },
         "type": "object"
       },
-      "DescendantCounts": {
-        "additionalProperties": {
-          "format": "int64",
-          "type": "integer"
-        },
-        "type": "object"
-      },
       "DiscordConfig": {
         "properties": {
           "http_config": {
@@ -4579,6 +4579,9 @@
           },
           "webhook_url": {
             "$ref": "#/components/schemas/SecretURL"
+          },
+          "webhook_url_file": {
+            "type": "string"
           }
         },
         "title": "DiscordConfig configures notifications via Discord.",
@@ -4669,6 +4672,17 @@
         "title": "EmailConfig configures notifications via mail.",
         "type": "object"
       },
+      "EmailDTO": {
+        "properties": {
+          "recipient": {
+            "type": "string"
+          },
+          "uid": {
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
       "EmbeddedContactPoint": {
         "description": "EmbeddedContactPoint is the contact point type that is used\nby grafanas embedded alertmanager implementation.",
         "properties": {
@@ -4808,25 +4822,11 @@
         },
         "type": "object"
       },
-      "EvalMatch": {
+      "EvalQueriesPayload": {
         "properties": {
-          "metric": {
+          "condition": {
             "type": "string"
           },
-          "tags": {
-            "additionalProperties": {
-              "type": "string"
-            },
-            "type": "object"
-          },
-          "value": {
-            "type": "string"
-          }
-        },
-        "type": "object"
-      },
-      "EvalQueriesPayload": {
-        "properties": {
           "data": {
             "items": {
               "$ref": "#/components/schemas/AlertQuery"
@@ -5111,6 +5111,11 @@
             "type": "boolean"
           },
           "id": {
+            "description": "Deprecated: use UID instead",
+            "format": "int64",
+            "type": "integer"
+          },
+          "orgId": {
             "format": "int64",
             "type": "integer"
           },
@@ -5166,6 +5171,14 @@
         },
         "type": "object"
       },
+      "ForbiddenError": {
+        "properties": {
+          "body": {
+            "$ref": "#/components/schemas/PublicError"
+          }
+        },
+        "type": "object"
+      },
       "Frame": {
         "description": "Each Field is well typed by its FieldType and supports optional Labels.\n\nA Frame is a general data container for Grafana. A Frame can be table data\nor time series data depending on its content and field types.",
         "properties": {
@@ -5249,13 +5262,22 @@
           },
           "typeVersion": {
             "$ref": "#/components/schemas/FrameTypeVersion"
+          },
+          "uniqueRowIdFields": {
+            "description": "Array of field indices which values create a unique id for each row. Ideally this should be globally unique ID\nbut that isn't guarantied. Should help with keeping track and deduplicating rows in visualizations, especially\nwith streaming data with frequent updates.",
+            "example": "TraceID in Tempo, table name + primary key in SQL",
+            "items": {
+              "format": "int64",
+              "type": "integer"
+            },
+            "type": "array"
           }
         },
         "title": "FrameMeta matches:",
         "type": "object"
       },
       "FrameType": {
-        "description": "A FrameType string, when present in a frame's metadata, asserts that the\nframe's structure conforms to the FrameType's specification.\nThis property is currently optional, so FrameType may be FrameTypeUnknown even if the properties of\nthe Frame correspond to a defined FrameType.",
+        "description": "A FrameType string, when present in a frame's metadata, asserts that the\nframe's structure conforms to the FrameType's specification.\nThis property is currently optional, so FrameType may be FrameTypeUnknown even if the properties of\nthe Frame correspond to a defined FrameType.\n+enum",
         "type": "string"
       },
       "FrameTypeVersion": {
@@ -5274,6 +5296,14 @@
         "title": "Frames is a slice of Frame pointers.",
         "type": "array"
       },
+      "GenericPublicError": {
+        "properties": {
+          "body": {
+            "$ref": "#/components/schemas/PublicError"
+          }
+        },
+        "type": "object"
+      },
       "GetAnnotationTagsResponse": {
         "properties": {
           "result": {
@@ -5336,6 +5366,7 @@
             "type": "object"
           },
           "mute_time_intervals": {
+            "description": "MuteTimeIntervals is deprecated and will be removed before Alertmanager 1.0.",
             "items": {
               "$ref": "#/components/schemas/MuteTimeInterval"
             },
@@ -5356,6 +5387,12 @@
               "type": "string"
             },
             "type": "array"
+          },
+          "time_intervals": {
+            "items": {
+              "$ref": "#/components/schemas/TimeInterval"
+            },
+            "type": "array"
           }
         },
         "type": "object"
@@ -5558,10 +5595,6 @@
           "is_paused": {
             "type": "boolean"
           },
-          "namespace_id": {
-            "format": "int64",
-            "type": "integer"
-          },
           "namespace_uid": {
             "type": "string"
           },
@@ -5573,6 +5606,9 @@
             ],
             "type": "string"
           },
+          "notification_settings": {
+            "$ref": "#/components/schemas/AlertRuleNotificationSettings"
+          },
           "orgId": {
             "format": "int64",
             "type": "integer"
@@ -5689,6 +5725,23 @@
         ],
         "type": "object"
       },
+      "GettableTimeIntervals": {
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "provenance": {
+            "$ref": "#/components/schemas/Provenance"
+          },
+          "time_intervals": {
+            "items": {
+              "$ref": "#/components/schemas/TimeIntervalItem"
+            },
+            "type": "array"
+          }
+        },
+        "type": "object"
+      },
       "GettableUserConfig": {
         "properties": {
           "alertmanager_config": {
@@ -5849,6 +5902,7 @@
       "Hit": {
         "properties": {
           "folderId": {
+            "description": "Deprecated: use FolderUID instead",
             "format": "int64",
             "type": "integer"
           },
@@ -5968,6 +6022,7 @@
             "$ref": "#/components/schemas/Json"
           },
           "folderId": {
+            "description": "Deprecated: use FolderUID instead",
             "format": "int64",
             "type": "integer"
           },
@@ -6003,6 +6058,7 @@
             "type": "string"
           },
           "folderId": {
+            "description": "Deprecated: use FolderUID instead",
             "format": "int64",
             "type": "integer"
           },
@@ -6113,81 +6169,8 @@
         },
         "type": "object"
       },
-      "ItemDTO": {
-        "properties": {
-          "alertId": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "alertName": {
-            "type": "string"
-          },
-          "avatarUrl": {
-            "type": "string"
-          },
-          "created": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "dashboardId": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "dashboardUID": {
-            "type": "string"
-          },
-          "data": {
-            "$ref": "#/components/schemas/Json"
-          },
-          "email": {
-            "type": "string"
-          },
-          "id": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "login": {
-            "type": "string"
-          },
-          "newState": {
-            "type": "string"
-          },
-          "panelId": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "prevState": {
-            "type": "string"
-          },
-          "tags": {
-            "items": {
-              "type": "string"
-            },
-            "type": "array"
-          },
-          "text": {
-            "type": "string"
-          },
-          "time": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "timeEnd": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "updated": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "userId": {
-            "format": "int64",
-            "type": "integer"
-          }
-        },
-        "type": "object"
-      },
       "JSONWebKey": {
+        "description": "JSONWebKey represents a public or private key in JWK format. It can be\nmarshaled into JSON and unmarshaled from JSON.",
         "properties": {
           "Algorithm": {
             "description": "Key algorithm, parsed from `alg` header.",
@@ -6220,7 +6203,7 @@
             "$ref": "#/components/schemas/URL"
           },
           "Key": {
-            "description": "Cryptographic key, can be a symmetric or asymmetric key."
+            "description": "Key is the Go in-memory representation of this key. It must have one\nof these types:\ned25519.PublicKey\ned25519.PrivateKey\necdsa.PublicKey\necdsa.PrivateKey\nrsa.PublicKey\nrsa.PrivateKey\n[]byte (a symmetric key)\n\nWhen marshaling this JSONWebKey into JSON, the \"kty\" header parameter\nwill be automatically set based on the type of this field."
           },
           "KeyID": {
             "description": "Key identifier, parsed from `kid` header.",
@@ -6231,7 +6214,6 @@
             "type": "string"
           }
         },
-        "title": "JSONWebKey represents a public or private key in JWK format.",
         "type": "object"
       },
       "Json": {
@@ -6280,107 +6262,43 @@
         },
         "type": "array"
       },
-      "LegacyAlert": {
+      "LibraryElementArrayResponse": {
         "properties": {
-          "Created": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "DashboardID": {
+          "result": {
+            "items": {
+              "$ref": "#/components/schemas/LibraryElementDTO"
+            },
+            "type": "array"
+          }
+        },
+        "title": "LibraryElementArrayResponse is a response struct for an array of LibraryElementDTO.",
+        "type": "object"
+      },
+      "LibraryElementConnectionDTO": {
+        "properties": {
+          "connectionId": {
             "format": "int64",
             "type": "integer"
           },
-          "EvalData": {
-            "$ref": "#/components/schemas/Json"
-          },
-          "ExecutionError": {
+          "connectionUid": {
             "type": "string"
           },
-          "For": {
-            "$ref": "#/components/schemas/Duration"
+          "created": {
+            "format": "date-time",
+            "type": "string"
           },
-          "Frequency": {
-            "format": "int64",
-            "type": "integer"
+          "createdBy": {
+            "$ref": "#/components/schemas/LibraryElementDTOMetaUser"
           },
-          "Handler": {
+          "elementId": {
             "format": "int64",
             "type": "integer"
           },
-          "ID": {
+          "id": {
             "format": "int64",
             "type": "integer"
           },
-          "Message": {
-            "type": "string"
-          },
-          "Name": {
-            "type": "string"
-          },
-          "NewStateDate": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "OrgID": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "PanelID": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "Settings": {
-            "$ref": "#/components/schemas/Json"
-          },
-          "Severity": {
-            "type": "string"
-          },
-          "Silenced": {
-            "type": "boolean"
-          },
-          "State": {
-            "$ref": "#/components/schemas/AlertStateType"
-          },
-          "StateChanges": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "Updated": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "Version": {
-            "format": "int64",
-            "type": "integer"
-          }
-        },
-        "type": "object"
-      },
-      "LibraryElementConnectionDTO": {
-        "properties": {
-          "connectionId": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "connectionUid": {
-            "type": "string"
-          },
-          "created": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "createdBy": {
-            "$ref": "#/components/schemas/LibraryElementDTOMetaUser"
-          },
-          "elementId": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "id": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "kind": {
+          "kind": {
             "format": "int64",
             "type": "integer"
           }
@@ -6406,6 +6324,7 @@
             "type": "string"
           },
           "folderId": {
+            "description": "Deprecated: use FolderUID instead",
             "format": "int64",
             "type": "integer"
           },
@@ -6564,6 +6483,9 @@
           "send_resolved": {
             "type": "boolean"
           },
+          "summary": {
+            "type": "string"
+          },
           "text": {
             "type": "string"
           },
@@ -6572,6 +6494,9 @@
           },
           "webhook_url": {
             "$ref": "#/components/schemas/SecretURL"
+          },
+          "webhook_url_file": {
+            "type": "string"
           }
         },
         "type": "object"
@@ -6598,7 +6523,7 @@
       },
       "MatchRegexps": {
         "additionalProperties": {
-          "$ref": "#/components/schemas/Regexp"
+          "type": "string"
         },
         "title": "MatchRegexps represents a map of Regexp.",
         "type": "object"
@@ -6706,6 +6631,24 @@
         "title": "MuteTimeInterval represents a named set of time intervals for which a route should be muted.",
         "type": "object"
       },
+      "MuteTimeIntervalExport": {
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "orgId": {
+            "format": "int64",
+            "type": "integer"
+          },
+          "time_intervals": {
+            "items": {
+              "$ref": "#/components/schemas/TimeInterval"
+            },
+            "type": "array"
+          }
+        },
+        "type": "object"
+      },
       "MuteTimings": {
         "items": {
           "$ref": "#/components/schemas/MuteTimeInterval"
@@ -6810,12 +6753,58 @@
       },
       "NotificationPolicyExport": {
         "properties": {
-          "Policy": {
-            "$ref": "#/components/schemas/RouteExport"
+          "continue": {
+            "type": "boolean"
+          },
+          "group_by": {
+            "items": {
+              "type": "string"
+            },
+            "type": "array"
+          },
+          "group_interval": {
+            "type": "string"
+          },
+          "group_wait": {
+            "type": "string"
+          },
+          "match": {
+            "additionalProperties": {
+              "type": "string"
+            },
+            "description": "Deprecated. Remove before v1.0 release.",
+            "type": "object"
+          },
+          "match_re": {
+            "$ref": "#/components/schemas/MatchRegexps"
+          },
+          "matchers": {
+            "$ref": "#/components/schemas/Matchers"
+          },
+          "mute_time_intervals": {
+            "items": {
+              "type": "string"
+            },
+            "type": "array"
+          },
+          "object_matchers": {
+            "$ref": "#/components/schemas/ObjectMatchers"
           },
           "orgId": {
             "format": "int64",
             "type": "integer"
+          },
+          "receiver": {
+            "type": "string"
+          },
+          "repeat_interval": {
+            "type": "string"
+          },
+          "routes": {
+            "items": {
+              "$ref": "#/components/schemas/RouteExport"
+            },
+            "type": "array"
           }
         },
         "title": "NotificationPolicyExport is the provisioned file export of alerting.NotificiationPolicyV1.",
@@ -6849,39 +6838,6 @@
         },
         "type": "array"
       },
-      "NotificationTestCommand": {
-        "properties": {
-          "disableResolveMessage": {
-            "type": "boolean"
-          },
-          "frequency": {
-            "type": "string"
-          },
-          "id": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "name": {
-            "type": "string"
-          },
-          "secureSettings": {
-            "additionalProperties": {
-              "type": "string"
-            },
-            "type": "object"
-          },
-          "sendReminder": {
-            "type": "boolean"
-          },
-          "settings": {
-            "$ref": "#/components/schemas/Json"
-          },
-          "type": {
-            "type": "string"
-          }
-        },
-        "type": "object"
-      },
       "NotifierConfig": {
         "properties": {
           "send_resolved": {
@@ -6946,8 +6902,19 @@
         "title": "An ObjectIdentifier represents an ASN.1 OBJECT IDENTIFIER.",
         "type": "array"
       },
+      "ObjectMatcher": {
+        "items": {
+          "type": "string"
+        },
+        "title": "ObjectMatcher is a matcher that can be used to filter alerts.",
+        "type": "array"
+      },
       "ObjectMatchers": {
-        "$ref": "#/components/schemas/Matchers"
+        "items": {
+          "$ref": "#/components/schemas/ObjectMatcher"
+        },
+        "title": "ObjectMatchers is a list of matchers that can be used to filter alerts.",
+        "type": "array"
       },
       "OpsGenieConfig": {
         "properties": {
@@ -7204,6 +7171,9 @@
         },
         "type": "object"
       },
+      "Password": {
+        "type": "string"
+      },
       "PatchAnnotationsCmd": {
         "properties": {
           "data": {
@@ -7237,7 +7207,7 @@
         "description": "PatchLibraryElementCommand is the command for patching a LibraryElement",
         "properties": {
           "folderId": {
-            "description": "ID of the folder where the library element is stored.",
+            "description": "ID of the folder where the library element is stored.\n\nDeprecated: use FolderUID instead",
             "format": "int64",
             "type": "integer"
           },
@@ -7326,26 +7296,6 @@
         },
         "type": "object"
       },
-      "PauseAlertCommand": {
-        "properties": {
-          "alertId": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "paused": {
-            "type": "boolean"
-          }
-        },
-        "type": "object"
-      },
-      "PauseAllAlertsCommand": {
-        "properties": {
-          "paused": {
-            "type": "boolean"
-          }
-        },
-        "type": "object"
-      },
       "Permission": {
         "properties": {
           "action": {
@@ -7496,24 +7446,6 @@
         },
         "type": "array"
       },
-      "Point": {
-        "description": "If H is not nil, then this is a histogram point and only (T, H) is valid.\nIf H is nil, then only (T, V) is valid.",
-        "properties": {
-          "H": {
-            "$ref": "#/components/schemas/FloatHistogram"
-          },
-          "T": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "V": {
-            "format": "double",
-            "type": "number"
-          }
-        },
-        "title": "Point represents a single data point for a given timestamp.",
-        "type": "object"
-      },
       "PostAnnotationsCmd": {
         "properties": {
           "dashboardId": {
@@ -7570,6 +7502,7 @@
         "type": "object"
       },
       "PostableApiAlertingConfig": {
+        "description": "nolint:revive",
         "properties": {
           "global": {
             "$ref": "#/components/schemas/GlobalConfig"
@@ -7581,6 +7514,7 @@
             "type": "array"
           },
           "mute_time_intervals": {
+            "description": "MuteTimeIntervals is deprecated and will be removed before Alertmanager 1.0.",
             "items": {
               "$ref": "#/components/schemas/MuteTimeInterval"
             },
@@ -7601,11 +7535,18 @@
               "type": "string"
             },
             "type": "array"
+          },
+          "time_intervals": {
+            "items": {
+              "$ref": "#/components/schemas/TimeInterval"
+            },
+            "type": "array"
           }
         },
         "type": "object"
       },
       "PostableApiReceiver": {
+        "description": "nolint:revive",
         "properties": {
           "discord_configs": {
             "items": {
@@ -7823,6 +7764,9 @@
             ],
             "type": "string"
           },
+          "notification_settings": {
+            "$ref": "#/components/schemas/AlertRuleNotificationSettings"
+          },
           "title": {
             "type": "string"
           },
@@ -7862,6 +7806,20 @@
         },
         "type": "object"
       },
+      "PostableTimeIntervals": {
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "time_intervals": {
+            "items": {
+              "$ref": "#/components/schemas/TimeIntervalItem"
+            },
+            "type": "array"
+          }
+        },
+        "type": "object"
+      },
       "PostableUserConfig": {
         "properties": {
           "alertmanager_config": {
@@ -7876,6 +7834,38 @@
         },
         "type": "object"
       },
+      "Preferences": {
+        "description": "Spec defines user, team or org Grafana preferences",
+        "properties": {
+          "cookiePreferences": {
+            "$ref": "#/components/schemas/CookiePreferences"
+          },
+          "homeDashboardUID": {
+            "description": "UID for the home dashboard",
+            "type": "string"
+          },
+          "language": {
+            "description": "Selected language (beta)",
+            "type": "string"
+          },
+          "queryHistory": {
+            "$ref": "#/components/schemas/QueryHistoryPreference"
+          },
+          "theme": {
+            "description": "Theme light, dark, empty is default",
+            "type": "string"
+          },
+          "timezone": {
+            "description": "The timezone selection\nTODO: this should use the timezone defined in common",
+            "type": "string"
+          },
+          "weekStart": {
+            "description": "WeekStart day of the week (sunday, monday, etc)",
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
       "PrometheusRemoteWriteTargetJSON": {
         "properties": {
           "data_source_uid": {
@@ -7999,6 +7989,9 @@
             ],
             "type": "string"
           },
+          "notification_settings": {
+            "$ref": "#/components/schemas/AlertRuleNotificationSettings"
+          },
           "orgID": {
             "format": "int64",
             "type": "integer"
@@ -8068,22 +8061,159 @@
         },
         "type": "object"
       },
-      "PublicKeyAlgorithm": {
-        "format": "int64",
-        "type": "integer"
-      },
-      "PushoverConfig": {
+      "PublicDashboard": {
         "properties": {
-          "device": {
-            "type": "string"
-          },
-          "expire": {
+          "accessToken": {
             "type": "string"
           },
-          "html": {
+          "annotationsEnabled": {
             "type": "boolean"
           },
-          "http_config": {
+          "createdAt": {
+            "format": "date-time",
+            "type": "string"
+          },
+          "createdBy": {
+            "format": "int64",
+            "type": "integer"
+          },
+          "dashboardUid": {
+            "type": "string"
+          },
+          "isEnabled": {
+            "type": "boolean"
+          },
+          "recipients": {
+            "items": {
+              "$ref": "#/components/schemas/EmailDTO"
+            },
+            "type": "array"
+          },
+          "share": {
+            "$ref": "#/components/schemas/ShareType"
+          },
+          "timeSelectionEnabled": {
+            "type": "boolean"
+          },
+          "uid": {
+            "type": "string"
+          },
+          "updatedAt": {
+            "format": "date-time",
+            "type": "string"
+          },
+          "updatedBy": {
+            "format": "int64",
+            "type": "integer"
+          }
+        },
+        "type": "object"
+      },
+      "PublicDashboardDTO": {
+        "properties": {
+          "accessToken": {
+            "type": "string"
+          },
+          "annotationsEnabled": {
+            "type": "boolean"
+          },
+          "isEnabled": {
+            "type": "boolean"
+          },
+          "share": {
+            "$ref": "#/components/schemas/ShareType"
+          },
+          "timeSelectionEnabled": {
+            "type": "boolean"
+          },
+          "uid": {
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
+      "PublicDashboardListResponse": {
+        "properties": {
+          "accessToken": {
+            "type": "string"
+          },
+          "dashboardUid": {
+            "type": "string"
+          },
+          "isEnabled": {
+            "type": "boolean"
+          },
+          "slug": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "uid": {
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
+      "PublicDashboardListResponseWithPagination": {
+        "properties": {
+          "page": {
+            "format": "int64",
+            "type": "integer"
+          },
+          "perPage": {
+            "format": "int64",
+            "type": "integer"
+          },
+          "publicDashboards": {
+            "items": {
+              "$ref": "#/components/schemas/PublicDashboardListResponse"
+            },
+            "type": "array"
+          },
+          "totalCount": {
+            "format": "int64",
+            "type": "integer"
+          }
+        },
+        "type": "object"
+      },
+      "PublicError": {
+        "description": "PublicError is derived from Error and only contains information\navailable to the end user.",
+        "properties": {
+          "extra": {
+            "additionalProperties": false,
+            "type": "object"
+          },
+          "message": {
+            "type": "string"
+          },
+          "messageId": {
+            "type": "string"
+          },
+          "statusCode": {
+            "format": "int64",
+            "type": "integer"
+          }
+        },
+        "type": "object"
+      },
+      "PublicKeyAlgorithm": {
+        "format": "int64",
+        "type": "integer"
+      },
+      "PushoverConfig": {
+        "properties": {
+          "device": {
+            "type": "string"
+          },
+          "expire": {
+            "type": "string"
+          },
+          "html": {
+            "type": "boolean"
+          },
+          "http_config": {
             "$ref": "#/components/schemas/HTTPClientConfig"
           },
           "message": {
@@ -8131,7 +8261,7 @@
       "QueryDataResponse": {
         "description": "It is the return type of a QueryData call.",
         "properties": {
-          "Responses": {
+          "results": {
             "$ref": "#/components/schemas/Responses"
           }
         },
@@ -8182,9 +8312,11 @@
       "QueryHistoryPreference": {
         "properties": {
           "homeTab": {
+            "description": "HomeTab one of: '' | 'query' | 'starred';",
             "type": "string"
           }
         },
+        "title": "QueryHistoryPreference defines model for QueryHistoryPreference.",
         "type": "object"
       },
       "QueryHistoryResponse": {
@@ -8489,11 +8621,6 @@
         },
         "type": "object"
       },
-      "Regexp": {
-        "description": "A Regexp is safe for concurrent use by multiple goroutines,\nexcept for configuration methods, such as Longest.",
-        "title": "Regexp is the representation of a compiled regular expression.",
-        "type": "object"
-      },
       "RelativeTimeRange": {
         "description": "RelativeTimeRange is the per query start and end time\nfor requests.",
         "properties": {
@@ -8519,90 +8646,271 @@
         },
         "type": "object"
       },
-      "ReportEmailDTO": {
+      "Report": {
+        "description": "ConfigDTO is model representation in transfer",
         "properties": {
-          "email": {
+          "created": {
+            "format": "date-time",
             "type": "string"
           },
-          "emails": {
-            "description": "Comma-separated list of emails to which to send the report to.",
-            "type": "string"
+          "dashboards": {
+            "items": {
+              "$ref": "#/components/schemas/ReportDashboard"
+            },
+            "type": "array"
+          },
+          "enableCsv": {
+            "type": "boolean"
+          },
+          "enableDashboardUrl": {
+            "type": "boolean"
+          },
+          "formats": {
+            "items": {
+              "$ref": "#/components/schemas/Type"
+            },
+            "type": "array"
           },
           "id": {
-            "description": "Send the report to the emails specified in the report. Required if emails is not present.",
             "format": "int64",
+            "type": "integer"
+          },
+          "message": {
             "type": "string"
           },
-          "useEmailsFromReport": {
-            "description": "Send the report to the emails specified in the report. Required if emails is not present.",
-            "type": "boolean"
+          "name": {
+            "type": "string"
+          },
+          "options": {
+            "$ref": "#/components/schemas/ReportOptions"
+          },
+          "orgId": {
+            "format": "int64",
+            "type": "integer"
+          },
+          "recipients": {
+            "type": "string"
+          },
+          "replyTo": {
+            "type": "string"
+          },
+          "scaleFactor": {
+            "format": "int64",
+            "type": "integer"
+          },
+          "schedule": {
+            "$ref": "#/components/schemas/ReportSchedule"
+          },
+          "state": {
+            "$ref": "#/components/schemas/State"
+          },
+          "uid": {
+            "type": "string"
+          },
+          "updated": {
+            "format": "date-time",
+            "type": "string"
+          },
+          "userId": {
+            "format": "int64",
+            "type": "integer"
           }
         },
         "type": "object"
       },
-      "ReportOptionsDTO": {
+      "ReportBrandingOptions": {
         "properties": {
-          "layout": {
+          "emailFooterLink": {
             "type": "string"
           },
-          "orientation": {
+          "emailFooterMode": {
             "type": "string"
           },
-          "timeRange": {
-            "$ref": "#/components/schemas/TimeRangeDTO"
+          "emailFooterText": {
+            "type": "string"
+          },
+          "emailLogoUrl": {
+            "type": "string"
+          },
+          "reportLogoUrl": {
+            "type": "string"
           }
         },
         "type": "object"
       },
-      "ResponseDetails": {
+      "ReportDashboard": {
         "properties": {
-          "msg": {
-            "type": "string"
+          "dashboard": {
+            "$ref": "#/components/schemas/ReportDashboardID"
+          },
+          "reportVariables": {
+            "type": "object"
+          },
+          "timeRange": {
+            "$ref": "#/components/schemas/ReportTimeRange"
           }
         },
         "type": "object"
       },
-      "Responses": {
-        "additionalProperties": {
-          "$ref": "#/components/schemas/DataResponse"
-        },
-        "description": "The QueryData method the QueryDataHandler method will set the RefId\nproperty on the DataResponses' frames based on these RefIDs.",
-        "title": "Responses is a map of RefIDs (Unique Query ID) to DataResponses.",
-        "type": "object"
-      },
-      "RestoreDashboardVersionCommand": {
+      "ReportDashboardID": {
         "properties": {
-          "version": {
+          "id": {
             "format": "int64",
             "type": "integer"
+          },
+          "name": {
+            "type": "string"
+          },
+          "uid": {
+            "type": "string"
           }
         },
         "type": "object"
       },
-      "RevokeAuthTokenCmd": {
+      "ReportEmail": {
         "properties": {
-          "authTokenId": {
+          "emails": {
+            "description": "Comma-separated list of emails to which to send the report to.",
+            "type": "string"
+          },
+          "id": {
+            "description": "Send the report to the emails specified in the report. Required if emails is not present.",
             "format": "int64",
-            "type": "integer"
+            "type": "string"
+          },
+          "useEmailsFromReport": {
+            "description": "Send the report to the emails specified in the report. Required if emails is not present.",
+            "type": "boolean"
           }
         },
         "type": "object"
       },
-      "RoleAssignmentsDTO": {
+      "ReportOptions": {
         "properties": {
-          "role_uid": {
+          "layout": {
             "type": "string"
           },
-          "service_accounts": {
-            "items": {
-              "format": "int64",
-              "type": "integer"
-            },
-            "type": "array"
+          "orientation": {
+            "type": "string"
           },
-          "teams": {
-            "items": {
-              "format": "int64",
+          "timeRange": {
+            "$ref": "#/components/schemas/ReportTimeRange"
+          }
+        },
+        "type": "object"
+      },
+      "ReportSchedule": {
+        "properties": {
+          "dayOfMonth": {
+            "type": "string"
+          },
+          "endDate": {
+            "format": "date-time",
+            "type": "string"
+          },
+          "frequency": {
+            "type": "string"
+          },
+          "intervalAmount": {
+            "format": "int64",
+            "type": "integer"
+          },
+          "intervalFrequency": {
+            "type": "string"
+          },
+          "startDate": {
+            "format": "date-time",
+            "type": "string"
+          },
+          "timeZone": {
+            "type": "string"
+          },
+          "workdaysOnly": {
+            "type": "boolean"
+          }
+        },
+        "type": "object"
+      },
+      "ReportSettings": {
+        "properties": {
+          "branding": {
+            "$ref": "#/components/schemas/ReportBrandingOptions"
+          },
+          "id": {
+            "format": "int64",
+            "type": "integer"
+          },
+          "orgId": {
+            "format": "int64",
+            "type": "integer"
+          },
+          "userId": {
+            "format": "int64",
+            "type": "integer"
+          }
+        },
+        "type": "object"
+      },
+      "ReportTimeRange": {
+        "properties": {
+          "from": {
+            "type": "string"
+          },
+          "to": {
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
+      "ResponseDetails": {
+        "properties": {
+          "msg": {
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
+      "Responses": {
+        "additionalProperties": {
+          "$ref": "#/components/schemas/DataResponse"
+        },
+        "description": "The QueryData method the QueryDataHandler method will set the RefId\nproperty on the DataResponses' frames based on these RefIDs.",
+        "title": "Responses is a map of RefIDs (Unique Query ID) to DataResponses.",
+        "type": "object"
+      },
+      "RestoreDashboardVersionCommand": {
+        "properties": {
+          "version": {
+            "format": "int64",
+            "type": "integer"
+          }
+        },
+        "type": "object"
+      },
+      "RevokeAuthTokenCmd": {
+        "properties": {
+          "authTokenId": {
+            "format": "int64",
+            "type": "integer"
+          }
+        },
+        "type": "object"
+      },
+      "RoleAssignmentsDTO": {
+        "properties": {
+          "role_uid": {
+            "type": "string"
+          },
+          "service_accounts": {
+            "items": {
+              "format": "int64",
+              "type": "integer"
+            },
+            "type": "array"
+          },
+          "teams": {
+            "items": {
+              "format": "int64",
               "type": "integer"
             },
             "type": "array"
@@ -8632,6 +8940,9 @@
           "displayName": {
             "type": "string"
           },
+          "global": {
+            "type": "boolean"
+          },
           "group": {
             "type": "string"
           },
@@ -8661,6 +8972,32 @@
         },
         "type": "object"
       },
+      "RolesSearchQuery": {
+        "properties": {
+          "includeHidden": {
+            "type": "boolean"
+          },
+          "orgId": {
+            "format": "int64",
+            "type": "integer"
+          },
+          "teamIds": {
+            "items": {
+              "format": "int64",
+              "type": "integer"
+            },
+            "type": "array"
+          },
+          "userIds": {
+            "items": {
+              "format": "int64",
+              "type": "integer"
+            },
+            "type": "array"
+          }
+        },
+        "type": "object"
+      },
       "Route": {
         "description": "A Route is a node that contains definitions of how to handle alerts. This is modified\nfrom the upstream alertmanager in that it adds the ObjectMatchers property.",
         "properties": {
@@ -8962,7 +9299,12 @@
         "type": "object"
       },
       "Sample": {
+        "description": "Sample is a single sample belonging to a metric. It represents either a float\nsample or a histogram sample. If H is nil, it is a float sample. Otherwise,\nit is a histogram sample.",
         "properties": {
+          "F": {
+            "format": "double",
+            "type": "number"
+          },
           "H": {
             "$ref": "#/components/schemas/FloatHistogram"
           },
@@ -8972,13 +9314,8 @@
           "T": {
             "format": "int64",
             "type": "integer"
-          },
-          "V": {
-            "format": "double",
-            "type": "number"
           }
         },
-        "title": "Sample is a single sample belonging to a metric.",
         "type": "object"
       },
       "SaveDashboardCommand": {
@@ -9014,45 +9351,25 @@
         },
         "type": "object"
       },
-      "ScheduleDTO": {
+      "SearchDeviceQueryResult": {
         "properties": {
-          "day": {
-            "type": "string"
-          },
-          "dayOfMonth": {
-            "type": "string"
-          },
-          "endDate": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "frequency": {
-            "type": "string"
+          "devices": {
+            "items": {
+              "$ref": "#/components/schemas/DeviceSearchHitDTO"
+            },
+            "type": "array"
           },
-          "hour": {
+          "page": {
             "format": "int64",
             "type": "integer"
           },
-          "intervalAmount": {
+          "perPage": {
             "format": "int64",
             "type": "integer"
           },
-          "intervalFrequency": {
-            "type": "string"
-          },
-          "minute": {
+          "totalCount": {
             "format": "int64",
             "type": "integer"
-          },
-          "startDate": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "timeZone": {
-            "type": "string"
-          },
-          "workdaysOnly": {
-            "type": "boolean"
           }
         },
         "type": "object"
@@ -9300,6 +9617,10 @@
             "format": "int64",
             "type": "integer"
           },
+          "requiredBy": {
+            "example": "grafana-app",
+            "type": "string"
+          },
           "role": {
             "example": "Editor",
             "type": "string"
@@ -9323,6 +9644,25 @@
         },
         "type": "object"
       },
+      "SetResourcePermissionCommand": {
+        "properties": {
+          "builtInRole": {
+            "type": "string"
+          },
+          "permission": {
+            "type": "string"
+          },
+          "teamId": {
+            "format": "int64",
+            "type": "integer"
+          },
+          "userId": {
+            "format": "int64",
+            "type": "integer"
+          }
+        },
+        "type": "object"
+      },
       "SetRoleAssignmentsCommand": {
         "properties": {
           "service_accounts": {
@@ -9375,25 +9715,8 @@
         },
         "type": "object"
       },
-      "SettingsDTO": {
-        "properties": {
-          "branding": {
-            "$ref": "#/components/schemas/BrandingOptionsDTO"
-          },
-          "id": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "orgId": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "userId": {
-            "format": "int64",
-            "type": "integer"
-          }
-        },
-        "type": "object"
+      "ShareType": {
+        "type": "string"
       },
       "SigV4Config": {
         "description": "SigV4Config is the configuration for signing remote write requests with\nAWS's SigV4 verification process. Empty values will be retrieved using the\nAWS default credentials chain.",
@@ -9586,38 +9909,6 @@
         "title": "A Span defines a continuous sequence of buckets.",
         "type": "object"
       },
-      "Spec": {
-        "properties": {
-          "cookiePreferences": {
-            "$ref": "#/components/schemas/CookiePreferences"
-          },
-          "homeDashboardUID": {
-            "description": "UID for the home dashboard",
-            "type": "string"
-          },
-          "language": {
-            "description": "Selected language (beta)",
-            "type": "string"
-          },
-          "queryHistory": {
-            "$ref": "#/components/schemas/QueryHistoryPreference"
-          },
-          "theme": {
-            "description": "Theme light, dark, empty is default",
-            "type": "string"
-          },
-          "timezone": {
-            "description": "The timezone selection\nTODO: this should use the timezone defined in common",
-            "type": "string"
-          },
-          "weekStart": {
-            "description": "WeekStart day of the week (sunday, monday, etc)",
-            "type": "string"
-          }
-        },
-        "title": "Spec defines model for Spec.",
-        "type": "object"
-      },
       "State": {
         "type": "string"
       },
@@ -10136,26 +10427,40 @@
         "type": "string"
       },
       "TimeInterval": {
-        "description": "TimeInterval describes intervals of time. ContainsTime will tell you if a golang time is contained\nwithin the interval.",
         "properties": {
-          "days_of_month": {
-            "items": {
-              "type": "string"
-            },
-            "type": "array"
-          },
-          "location": {
+          "name": {
             "type": "string"
           },
-          "months": {
+          "time_intervals": {
             "items": {
-              "type": "string"
+              "$ref": "#/components/schemas/TimeInterval"
+            },
+            "type": "array"
+          }
+        },
+        "title": "TimeInterval represents a named set of time intervals for which a route should be muted.",
+        "type": "object"
+      },
+      "TimeIntervalItem": {
+        "properties": {
+          "days_of_month": {
+            "items": {
+              "type": "string"
+            },
+            "type": "array"
+          },
+          "location": {
+            "type": "string"
+          },
+          "months": {
+            "items": {
+              "type": "string"
             },
             "type": "array"
           },
           "times": {
             "items": {
-              "$ref": "#/components/schemas/TimeRange"
+              "$ref": "#/components/schemas/TimeIntervalTimeRange"
             },
             "type": "array"
           },
@@ -10174,26 +10479,26 @@
         },
         "type": "object"
       },
-      "TimeRange": {
-        "description": "Redefining this to avoid an import cycle",
+      "TimeIntervalTimeRange": {
         "properties": {
-          "from": {
-            "format": "date-time",
+          "end_time": {
             "type": "string"
           },
-          "to": {
-            "format": "date-time",
+          "start_time": {
             "type": "string"
           }
         },
         "type": "object"
       },
-      "TimeRangeDTO": {
+      "TimeRange": {
+        "description": "Redefining this to avoid an import cycle",
         "properties": {
           "from": {
+            "format": "date-time",
             "type": "string"
           },
           "to": {
+            "format": "date-time",
             "type": "string"
           }
         },
@@ -10204,6 +10509,10 @@
           "account": {
             "type": "string"
           },
+          "anonymousRatio": {
+            "format": "int64",
+            "type": "integer"
+          },
           "company": {
             "type": "string"
           },
@@ -10359,31 +10668,24 @@
         },
         "type": "array"
       },
-      "TrimDashboardCommand": {
-        "properties": {
-          "dashboard": {
-            "$ref": "#/components/schemas/Json"
-          },
-          "meta": {
-            "$ref": "#/components/schemas/Json"
-          }
-        },
-        "type": "object"
+      "Type": {
+        "type": "string"
       },
-      "TrimDashboardFullWithMeta": {
+      "TypeMeta": {
+        "description": "+k8s:deepcopy-gen=false",
         "properties": {
-          "dashboard": {
-            "$ref": "#/components/schemas/Json"
+          "apiVersion": {
+            "description": "APIVersion defines the versioned schema of this representation of an object.\nServers should convert recognized schemas to the latest internal value, and\nmay reject unrecognized values.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources\n+optional",
+            "type": "string"
           },
-          "meta": {
-            "$ref": "#/components/schemas/Json"
+          "kind": {
+            "description": "Kind is a string value representing the REST resource this object represents.\nServers may infer this from the endpoint the client submits requests to.\nCannot be updated.\nIn CamelCase.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds\n+optional",
+            "type": "string"
           }
         },
+        "title": "TypeMeta describes an individual object in an API response or request\nwith strings representing the type of the object and its API schema version.\nStructures that are versioned or persisted should inline TypeMeta.",
         "type": "object"
       },
-      "Type": {
-        "type": "string"
-      },
       "URL": {
         "description": "The general form represented is:\n\n[scheme:][//[userinfo@]host][/]path[?query][#fragment]\n\nURLs that do not start with a slash after the scheme are interpreted as:\n\nscheme:opaque[?query][#fragment]\n\nNote that the Path field is stored in decoded form: /%47%6f%2f becomes /Go/.\nA consequence is that it is impossible to tell which slashes in the Path were\nslashes in the raw URL and which were %2f. This distinction is rarely important,\nbut when it is, the code should use the EscapedPath method, which preserves\nthe original encoding of Path.\n\nThe RawPath field is an optional field which is only set when the default\nencoding of Path is different from the escaped path. See the EscapedPath method\nfor more details.\n\nURL's String method uses the EscapedPath method to obtain the path.",
         "properties": {
@@ -10424,76 +10726,13 @@
         "title": "A URL represents a parsed URL (technically, a URI reference).",
         "type": "object"
       },
-      "UpdateAlertNotificationCommand": {
-        "properties": {
-          "disableResolveMessage": {
-            "type": "boolean"
-          },
-          "frequency": {
-            "type": "string"
-          },
-          "id": {
-            "format": "int64",
-            "type": "integer"
-          },
-          "isDefault": {
-            "type": "boolean"
-          },
-          "name": {
-            "type": "string"
-          },
-          "secureSettings": {
-            "additionalProperties": {
-              "type": "string"
-            },
-            "type": "object"
-          },
-          "sendReminder": {
-            "type": "boolean"
-          },
-          "settings": {
-            "$ref": "#/components/schemas/Json"
-          },
-          "type": {
-            "type": "string"
-          },
-          "uid": {
-            "type": "string"
-          }
-        },
-        "type": "object"
-      },
-      "UpdateAlertNotificationWithUidCommand": {
+      "Unstructured": {
+        "description": "Unstructured allows objects that do not have Golang structs registered to be manipulated\ngenerically.",
         "properties": {
-          "disableResolveMessage": {
-            "type": "boolean"
-          },
-          "frequency": {
-            "type": "string"
-          },
-          "isDefault": {
-            "type": "boolean"
-          },
-          "name": {
-            "type": "string"
-          },
-          "secureSettings": {
-            "additionalProperties": {
-              "type": "string"
-            },
+          "Object": {
+            "additionalProperties": false,
+            "description": "Object is a JSON compatible map with string, float, int, bool, []interface{},\nor map[string]interface{} children.",
             "type": "object"
-          },
-          "sendReminder": {
-            "type": "boolean"
-          },
-          "settings": {
-            "$ref": "#/components/schemas/Json"
-          },
-          "type": {
-            "type": "string"
-          },
-          "uid": {
-            "type": "string"
           }
         },
         "type": "object"
@@ -10980,6 +11219,9 @@
           "theme": {
             "type": "string"
           },
+          "uid": {
+            "type": "string"
+          },
           "updatedAt": {
             "format": "date-time",
             "type": "string"
@@ -11023,6 +11265,9 @@
           },
           "name": {
             "type": "string"
+          },
+          "uid": {
+            "type": "string"
           }
         },
         "type": "object"
@@ -11103,7 +11348,7 @@
         "type": "array"
       },
       "Vector": {
-        "description": "Vector is basically only an alias for model.Samples, but the\ncontract is that in a Vector, all Samples have the same timestamp.",
+        "description": "Vector is basically only an alias for []Sample, but the contract is that\nin a Vector, all Samples have the same timestamp.",
         "items": {
           "$ref": "#/components/schemas/Sample"
         },
@@ -11256,6 +11501,7 @@
         "type": "object"
       },
       "alertGroup": {
+        "description": "AlertGroup alert group",
         "properties": {
           "alerts": {
             "description": "alerts",
@@ -11383,6 +11629,34 @@
         ],
         "type": "object"
       },
+      "deviceDTO": {
+        "properties": {
+          "avatarUrl": {
+            "type": "string"
+          },
+          "clientIp": {
+            "type": "string"
+          },
+          "createdAt": {
+            "format": "date-time",
+            "type": "string"
+          },
+          "deviceId": {
+            "type": "string"
+          },
+          "lastSeenAt": {
+            "type": "string"
+          },
+          "updatedAt": {
+            "format": "date-time",
+            "type": "string"
+          },
+          "userAgent": {
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
       "gettableAlert": {
         "description": "GettableAlert gettable alert",
         "properties": {
@@ -11494,12 +11768,14 @@
         "type": "object"
       },
       "gettableSilences": {
+        "description": "GettableSilences gettable silences",
         "items": {
           "$ref": "#/components/schemas/gettableSilence"
         },
         "type": "array"
       },
       "integration": {
+        "description": "Integration integration",
         "properties": {
           "lastNotifyAttempt": {
             "description": "A timestamp indicating the last attempt to deliver a notification regardless of the outcome.\nFormat: date-time",
@@ -11680,8 +11956,35 @@
         ],
         "type": "object"
       },
+      "publicError": {
+        "description": "PublicError is derived from Error and only contains information\navailable to the end user.",
+        "properties": {
+          "extra": {
+            "additionalProperties": false,
+            "description": "Extra Additional information about the error",
+            "type": "object"
+          },
+          "message": {
+            "description": "Message A human readable message",
+            "type": "string"
+          },
+          "messageId": {
+            "description": "MessageID A unique identifier for the error",
+            "type": "string"
+          },
+          "statusCode": {
+            "description": "StatusCode The HTTP status code returned",
+            "format": "int64",
+            "type": "integer"
+          }
+        },
+        "required": [
+          "statusCode",
+          "messageId"
+        ],
+        "type": "object"
+      },
       "receiver": {
-        "description": "Receiver receiver",
         "properties": {
           "active": {
             "description": "active",
@@ -11706,6 +12009,78 @@
         ],
         "type": "object"
       },
+      "resourcePermissionDTO": {
+        "properties": {
+          "actions": {
+            "items": {
+              "type": "string"
+            },
+            "type": "array"
+          },
+          "builtInRole": {
+            "type": "string"
+          },
+          "id": {
+            "format": "int64",
+            "type": "integer"
+          },
+          "isInherited": {
+            "type": "boolean"
+          },
+          "isManaged": {
+            "type": "boolean"
+          },
+          "isServiceAccount": {
+            "type": "boolean"
+          },
+          "permission": {
+            "type": "string"
+          },
+          "roleName": {
+            "type": "string"
+          },
+          "team": {
+            "type": "string"
+          },
+          "teamAvatarUrl": {
+            "type": "string"
+          },
+          "teamId": {
+            "format": "int64",
+            "type": "integer"
+          },
+          "userAvatarUrl": {
+            "type": "string"
+          },
+          "userId": {
+            "format": "int64",
+            "type": "integer"
+          },
+          "userLogin": {
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
+      "setPermissionCommand": {
+        "properties": {
+          "permission": {
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
+      "setPermissionsCommand": {
+        "properties": {
+          "permissions": {
+            "items": {
+              "$ref": "#/components/schemas/SetResourcePermissionCommand"
+            },
+            "type": "array"
+          }
+        },
+        "type": "object"
+      },
       "silence": {
         "description": "Silence silence",
         "properties": {
@@ -12138,21 +12513,57 @@
         ]
       }
     },
-    "/access-control/teams/{teamId}/roles": {
-      "get": {
-        "description": "You need to have a permission with action `teams.roles:read` and scope `teams:id:\u003cteam ID\u003e`.",
-        "operationId": "listTeamRoles",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "teamId",
-            "required": true,
-            "schema": {
-              "format": "int64",
-              "type": "integer"
+    "/access-control/teams/roles/search": {
+      "post": {
+        "description": "Lists the roles that have been directly assigned to the given teams.\n\nYou need to have a permission with action `teams.roles:read` and scope `teams:id:*`.",
+        "operationId": "listTeamsRoles",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/RolesSearchQuery"
+              }
             }
-          }
-        ],
+          },
+          "required": true,
+          "x-originalParamName": "body"
+        },
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/listTeamsRolesResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "summary": "List roles assigned to multiple teams.",
+        "tags": [
+          "access_control",
+          "enterprise"
+        ]
+      }
+    },
+    "/access-control/teams/{teamId}/roles": {
+      "get": {
+        "description": "You need to have a permission with action `teams.roles:read` and scope `teams:id:\u003cteam ID\u003e`.",
+        "operationId": "listTeamRoles",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "teamId",
+            "required": true,
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
+          }
+        ],
         "responses": {
           "200": {
             "$ref": "#/components/responses/okResponse"
@@ -12306,6 +12717,42 @@
         ]
       }
     },
+    "/access-control/users/roles/search": {
+      "post": {
+        "description": "Lists the roles that have been directly assigned to the given users. The list does not include built-in roles (Viewer, Editor, Admin or Grafana Admin), and it does not include roles that have been inherited from a team.\n\nYou need to have a permission with action `users.roles:read` and scope `users:id:*`.",
+        "operationId": "listUsersRoles",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/RolesSearchQuery"
+              }
+            }
+          },
+          "required": true,
+          "x-originalParamName": "body"
+        },
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/listUsersRolesResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "summary": "List roles assigned to multiple users.",
+        "tags": [
+          "access_control",
+          "enterprise"
+        ]
+      }
+    },
     "/access-control/users/{userId}/roles": {
       "get": {
         "description": "Lists the roles that have been directly assigned to a given user. The list does not include built-in roles (Viewer, Editor, Admin or Grafana Admin), and it does not include roles that have been inherited from a team.\n\nYou need to have a permission with action `users.roles:read` and scope `users:id:\u003cuser ID\u003e`.",
@@ -12490,16 +12937,22 @@
         ]
       }
     },
-    "/admin/ldap-sync-status": {
+    "/access-control/{resource}/description": {
       "get": {
-        "description": "You need to have a permission with action `ldap.status:read`.",
-        "operationId": "getSyncStatus",
+        "operationId": "getResourceDescription",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "resource",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getSyncStatusResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
+            "$ref": "#/components/responses/resourcePermissionsDescription"
           },
           "403": {
             "$ref": "#/components/responses/forbiddenError"
@@ -12508,175 +12961,341 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Returns the current state of the LDAP background sync integration.",
+        "summary": "Get a description of a resource's access control properties.",
         "tags": [
-          "ldap_debug",
-          "enterprise"
+          "access_control"
         ]
       }
     },
-    "/admin/ldap/reload": {
-      "post": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `ldap.config:reload`.",
-        "operationId": "reloadLDAPCfg",
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
+    "/access-control/{resource}/{resourceID}": {
+      "get": {
+        "operationId": "getResourcePermissions",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "resource",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
           },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
-          }
-        },
-        "security": [
           {
-            "basic": []
+            "in": "path",
+            "name": "resourceID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
           }
         ],
-        "summary": "Reloads the LDAP configuration.",
-        "tags": [
-          "admin_ldap"
-        ]
-      }
-    },
-    "/admin/ldap/status": {
-      "get": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `ldap.status:read`.",
-        "operationId": "getLDAPStatus",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
+            "$ref": "#/components/responses/getResourcePermissionsResponse"
           },
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "security": [
-          {
-            "basic": []
-          }
-        ],
-        "summary": "Attempts to connect to all the configured LDAP servers and returns information on whenever they're available or not.",
+        "summary": "Get permissions for a resource.",
         "tags": [
-          "admin_ldap"
+          "access_control"
         ]
-      }
-    },
-    "/admin/ldap/sync/{user_id}": {
+      },
       "post": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `ldap.user:sync`.",
-        "operationId": "postSyncUserWithLDAP",
+        "description": "Assigns permissions for a resource by a given type (`:resource`) and `:resourceID` to one or many\nassignment types. Allowed resources are `datasources`, `teams`, `dashboards`, `folders`, and `serviceaccounts`.\nRefer to the `/access-control/{resource}/description` endpoint for allowed Permissions.",
+        "operationId": "setResourcePermissions",
         "parameters": [
           {
             "in": "path",
-            "name": "user_id",
+            "name": "resource",
             "required": true,
             "schema": {
-              "format": "int64",
-              "type": "integer"
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "resourceID",
+            "required": true,
+            "schema": {
+              "type": "string"
             }
           }
         ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/setPermissionsCommand"
+              }
+            }
+          },
+          "required": true,
+          "x-originalParamName": "Body"
+        },
         "responses": {
           "200": {
             "$ref": "#/components/responses/okResponse"
           },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "security": [
-          {
-            "basic": []
-          }
-        ],
-        "summary": "Enables a single Grafana user to be synchronized against LDAP.",
+        "summary": "Set resource permissions.",
         "tags": [
-          "admin_ldap"
+          "access_control"
         ]
       }
     },
-    "/admin/ldap/{user_name}": {
-      "get": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `ldap.user:read`.",
-        "operationId": "getUserFromLDAP",
+    "/access-control/{resource}/{resourceID}/builtInRoles/{builtInRole}": {
+      "post": {
+        "description": "Assigns permissions for a resource by a given type (`:resource`) and `:resourceID` to a built-in role.\nAllowed resources are `datasources`, `teams`, `dashboards`, `folders`, and `serviceaccounts`.\nRefer to the `/access-control/{resource}/description` endpoint for allowed Permissions.",
+        "operationId": "setResourcePermissionsForBuiltInRole",
         "parameters": [
           {
             "in": "path",
-            "name": "user_name",
+            "name": "resource",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "resourceID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "builtInRole",
             "required": true,
             "schema": {
               "type": "string"
             }
           }
         ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/setPermissionCommand"
+              }
+            }
+          },
+          "required": true,
+          "x-originalParamName": "Body"
+        },
         "responses": {
           "200": {
             "$ref": "#/components/responses/okResponse"
           },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "security": [
-          {
-            "basic": []
-          }
-        ],
-        "summary": "Finds an user based on a username in LDAP. This helps illustrate how would the particular user be mapped in Grafana when synced.",
+        "summary": "Set resource permissions for a built-in role.",
         "tags": [
-          "admin_ldap"
+          "access_control"
         ]
       }
     },
-    "/admin/pause-all-alerts": {
+    "/access-control/{resource}/{resourceID}/teams/{teamID}": {
       "post": {
-        "operationId": "pauseAllAlerts",
+        "description": "Assigns permissions for a resource by a given type (`:resource`) and `:resourceID` to a team.\nAllowed resources are `datasources`, `teams`, `dashboards`, `folders`, and `serviceaccounts`.\nRefer to the `/access-control/{resource}/description` endpoint for allowed Permissions.",
+        "operationId": "setResourcePermissionsForTeam",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "resource",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "resourceID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "teamID",
+            "required": true,
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
+          }
+        ],
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/PauseAllAlertsCommand"
+                "$ref": "#/components/schemas/setPermissionCommand"
               }
             }
           },
           "required": true,
-          "x-originalParamName": "body"
+          "x-originalParamName": "Body"
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/pauseAlertsResponse"
+            "$ref": "#/components/responses/okResponse"
           },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "500": {
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "summary": "Set resource permissions for a team.",
+        "tags": [
+          "access_control"
+        ]
+      }
+    },
+    "/access-control/{resource}/{resourceID}/users/{userID}": {
+      "post": {
+        "description": "Assigns permissions for a resource by a given type (`:resource`) and `:resourceID` to a user or a service account.\nAllowed resources are `datasources`, `teams`, `dashboards`, `folders`, and `serviceaccounts`.\nRefer to the `/access-control/{resource}/description` endpoint for allowed Permissions.",
+        "operationId": "setResourcePermissionsForUser",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "resource",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "resourceID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "userID",
+            "required": true,
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/setPermissionCommand"
+              }
+            }
+          },
+          "required": true,
+          "x-originalParamName": "Body"
+        },
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "summary": "Set resource permissions for a user.",
+        "tags": [
+          "access_control"
+        ]
+      }
+    },
+    "/admin/ldap-sync-status": {
+      "get": {
+        "description": "You need to have a permission with action `ldap.status:read`.",
+        "operationId": "getSyncStatus",
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/getSyncStatusResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "summary": "Returns the current state of the LDAP background sync integration.",
+        "tags": [
+          "ldap_debug",
+          "enterprise"
+        ]
+      }
+    },
+    "/admin/ldap/reload": {
+      "post": {
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `ldap.config:reload`.",
+        "operationId": "reloadLDAPCfg",
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/okResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
@@ -12685,37 +13304,56 @@
             "basic": []
           }
         ],
-        "summary": "Pause/unpause all (legacy) alerts.",
+        "summary": "Reloads the LDAP configuration.",
         "tags": [
-          "admin"
+          "admin_ldap"
         ]
       }
     },
-    "/admin/provisioning/access-control/reload": {
-      "post": {
-        "operationId": "adminProvisioningReloadAccessControl",
+    "/admin/ldap/status": {
+      "get": {
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `ldap.status:read`.",
+        "operationId": "getLDAPStatus",
         "responses": {
-          "202": {
-            "$ref": "#/components/responses/acceptedResponse"
+          "200": {
+            "$ref": "#/components/responses/okResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
           "403": {
             "$ref": "#/components/responses/forbiddenError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "You need to have a permission with action `provisioning:reload` with scope `provisioners:accesscontrol`.",
+        "security": [
+          {
+            "basic": []
+          }
+        ],
+        "summary": "Attempts to connect to all the configured LDAP servers and returns information on whenever they're available or not.",
         "tags": [
-          "access_control_provisioning",
-          "enterprise"
+          "admin_ldap"
         ]
       }
     },
-    "/admin/provisioning/dashboards/reload": {
+    "/admin/ldap/sync/{user_id}": {
       "post": {
-        "description": "Reloads the provisioning config files for dashboards again. It won’t return until the new provisioned entities are already stored in the database. In case of dashboards, it will stop polling for changes in dashboard files and then restart it with new configurations after returning.\nIf you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `provisioning:reload` and scope `provisioners:dashboards`.",
-        "operationId": "adminProvisioningReloadDashboards",
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `ldap.user:sync`.",
+        "operationId": "postSyncUserWithLDAP",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "user_id",
+            "required": true,
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
+          }
+        ],
         "responses": {
           "200": {
             "$ref": "#/components/responses/okResponse"
@@ -12735,16 +13373,76 @@
             "basic": []
           }
         ],
-        "summary": "Reload dashboard provisioning configurations.",
+        "summary": "Enables a single Grafana user to be synchronized against LDAP.",
         "tags": [
-          "admin_provisioning"
+          "admin_ldap"
         ]
       }
     },
-    "/admin/provisioning/datasources/reload": {
+    "/admin/ldap/{user_name}": {
+      "get": {
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `ldap.user:read`.",
+        "operationId": "getUserFromLDAP",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "user_name",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/okResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "security": [
+          {
+            "basic": []
+          }
+        ],
+        "summary": "Finds an user based on a username in LDAP. This helps illustrate how would the particular user be mapped in Grafana when synced.",
+        "tags": [
+          "admin_ldap"
+        ]
+      }
+    },
+    "/admin/provisioning/access-control/reload": {
       "post": {
-        "description": "Reloads the provisioning config files for datasources again. It won’t return until the new provisioned entities are already stored in the database. In case of dashboards, it will stop polling for changes in dashboard files and then restart it with new configurations after returning.\nIf you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `provisioning:reload` and scope `provisioners:datasources`.",
-        "operationId": "adminProvisioningReloadDatasources",
+        "operationId": "adminProvisioningReloadAccessControl",
+        "responses": {
+          "202": {
+            "$ref": "#/components/responses/acceptedResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          }
+        },
+        "summary": "You need to have a permission with action `provisioning:reload` with scope `provisioners:accesscontrol`.",
+        "tags": [
+          "access_control_provisioning",
+          "enterprise"
+        ]
+      }
+    },
+    "/admin/provisioning/dashboards/reload": {
+      "post": {
+        "description": "Reloads the provisioning config files for dashboards again. It won’t return until the new provisioned entities are already stored in the database. In case of dashboards, it will stop polling for changes in dashboard files and then restart it with new configurations after returning.\nIf you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `provisioning:reload` and scope `provisioners:dashboards`.",
+        "operationId": "adminProvisioningReloadDashboards",
         "responses": {
           "200": {
             "$ref": "#/components/responses/okResponse"
@@ -12764,16 +13462,16 @@
             "basic": []
           }
         ],
-        "summary": "Reload datasource provisioning configurations.",
+        "summary": "Reload dashboard provisioning configurations.",
         "tags": [
           "admin_provisioning"
         ]
       }
     },
-    "/admin/provisioning/notifications/reload": {
+    "/admin/provisioning/datasources/reload": {
       "post": {
-        "description": "Reloads the provisioning config files for legacy alert notifiers again. It won’t return until the new provisioned entities are already stored in the database. In case of dashboards, it will stop polling for changes in dashboard files and then restart it with new configurations after returning.\nIf you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `provisioning:reload` and scope `provisioners:notifications`.",
-        "operationId": "adminProvisioningReloadNotifications",
+        "description": "Reloads the provisioning config files for datasources again. It won’t return until the new provisioned entities are already stored in the database. In case of dashboards, it will stop polling for changes in dashboard files and then restart it with new configurations after returning.\nIf you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `provisioning:reload` and scope `provisioners:datasources`.",
+        "operationId": "adminProvisioningReloadDatasources",
         "responses": {
           "200": {
             "$ref": "#/components/responses/okResponse"
@@ -12793,7 +13491,7 @@
             "basic": []
           }
         ],
-        "summary": "Reload legacy alert notifier provisioning configurations.",
+        "summary": "Reload datasource provisioning configurations.",
         "tags": [
           "admin_provisioning"
         ]
@@ -13404,37 +14102,138 @@
         ]
       }
     },
-    "/alert-notifications": {
+    "/annotations": {
       "get": {
-        "description": "Returns all notification channels that the authenticated user has permission to view.",
-        "operationId": "getAlertNotificationChannels",
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/getAlertNotificationChannelsResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
+        "description": "Starting in Grafana v6.4 regions annotations are now returned in one entity that now includes the timeEnd property.",
+        "operationId": "getAnnotations",
+        "parameters": [
+          {
+            "description": "Find annotations created after specific epoch datetime in milliseconds.",
+            "in": "query",
+            "name": "from",
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
           },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
+          {
+            "description": "Find annotations created before specific epoch datetime in milliseconds.",
+            "in": "query",
+            "name": "to",
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
           },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+          {
+            "description": "Limit response to annotations created by specific user.",
+            "in": "query",
+            "name": "userId",
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
+          },
+          {
+            "description": "Find annotations for a specified alert.",
+            "in": "query",
+            "name": "alertId",
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
+          },
+          {
+            "description": "Find annotations that are scoped to a specific dashboard",
+            "in": "query",
+            "name": "dashboardId",
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
+          },
+          {
+            "description": "Find annotations that are scoped to a specific dashboard",
+            "in": "query",
+            "name": "dashboardUID",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "description": "Find annotations that are scoped to a specific panel",
+            "in": "query",
+            "name": "panelId",
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
+          },
+          {
+            "description": "Max limit for results returned.",
+            "in": "query",
+            "name": "limit",
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
+          },
+          {
+            "description": "Use this to filter organization annotations. Organization annotations are annotations from an annotation data source that are not connected specifically to a dashboard or panel. You can filter by multiple tags.",
+            "in": "query",
+            "name": "tags",
+            "schema": {
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
+          },
+          {
+            "description": "Return alerts or user created annotations",
+            "in": "query",
+            "name": "type",
+            "schema": {
+              "enum": [
+                "alert",
+                "annotation"
+              ],
+              "type": "string"
+            }
+          },
+          {
+            "description": "Match any or all tags",
+            "in": "query",
+            "name": "matchAny",
+            "schema": {
+              "type": "boolean"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/getAnnotationsResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get all notification channels.",
+        "summary": "Find Annotations.",
         "tags": [
-          "legacy_alerts_notification_channels"
+          "annotations"
         ]
       },
       "post": {
-        "description": "You can find the full list of [supported notifiers](https://grafana.com/docs/grafana/latest/alerting/old-alerting/notifications/#list-of-supported-notifiers) on the alert notifiers page.",
-        "operationId": "createAlertNotificationChannel",
+        "description": "Creates an annotation in the Grafana database. The dashboardId and panelId fields are optional. If they are not specified then an organization annotation is created and can be queried in any dashboard that adds the Grafana annotations data source. When creating a region annotation include the timeEnd property.\nThe format for `time` and `timeEnd` should be epoch numbers in millisecond resolution.\nThe response for this HTTP request is slightly different in versions prior to v6.4. In prior versions you would also get an endId if you where creating a region. But in 6.4 regions are represented using a single event with time and timeEnd properties.",
+        "operationId": "postAnnotation",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/CreateAlertNotificationCommand"
+                "$ref": "#/components/schemas/PostAnnotationsCmd"
               }
             }
           },
@@ -13443,7 +14242,10 @@
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getAlertNotificationChannelResponse"
+            "$ref": "#/components/responses/postAnnotationResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -13451,26 +14253,37 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "409": {
-            "$ref": "#/components/responses/conflictError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Create notification channel.",
+        "summary": "Create Annotation.",
         "tags": [
-          "legacy_alerts_notification_channels"
+          "annotations"
         ]
       }
     },
-    "/alert-notifications/lookup": {
-      "get": {
-        "description": "Returns all notification channels, but with less detailed information. Accessible by any authenticated user and is mainly used by providing alert notification channels in Grafana UI when configuring alert rule.",
-        "operationId": "getAlertNotificationLookup",
+    "/annotations/graphite": {
+      "post": {
+        "description": "Creates an annotation by using Graphite-compatible event format. The `when` and `data` fields are optional. If `when` is not specified then the current time will be used as annotation’s timestamp. The `tags` field can also be in prior to Graphite `0.10.0` format (string with multiple tags being separated by a space).",
+        "operationId": "postGraphiteAnnotation",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PostGraphiteAnnotationsCmd"
+              }
+            }
+          },
+          "required": true,
+          "x-originalParamName": "body"
+        },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getAlertNotificationLookupResponse"
+            "$ref": "#/components/responses/postAnnotationResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -13482,21 +14295,20 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get all notification channels (lookup).",
+        "summary": "Create Annotation in Graphite format.",
         "tags": [
-          "legacy_alerts_notification_channels"
+          "annotations"
         ]
       }
     },
-    "/alert-notifications/test": {
+    "/annotations/mass-delete": {
       "post": {
-        "description": "Sends a test notification to the channel.",
-        "operationId": "notificationChannelTest",
+        "operationId": "massDeleteAnnotations",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/NotificationTestCommand"
+                "$ref": "#/components/schemas/MassDeleteAnnotationsCmd"
               }
             }
           },
@@ -13507,36 +14319,67 @@
           "200": {
             "$ref": "#/components/responses/okResponse"
           },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
-          },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "summary": "Delete multiple annotations.",
+        "tags": [
+          "annotations"
+        ]
+      }
+    },
+    "/annotations/tags": {
+      "get": {
+        "description": "Find all the event tags created in the annotations.",
+        "operationId": "getAnnotationTags",
+        "parameters": [
+          {
+            "description": "Tag is a string that you can use to filter tags.",
+            "in": "query",
+            "name": "tag",
+            "schema": {
+              "type": "string"
+            }
           },
-          "412": {
-            "$ref": "#/components/responses/SMTPNotEnabledError"
+          {
+            "description": "Max limit for results returned.",
+            "in": "query",
+            "name": "limit",
+            "schema": {
+              "default": "100",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/getAnnotationTagsResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
           },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Test notification channel.",
+        "summary": "Find Annotations Tags.",
         "tags": [
-          "legacy_alerts_notification_channels"
+          "annotations"
         ]
       }
     },
-    "/alert-notifications/uid/{notification_channel_uid}": {
+    "/annotations/{annotation_id}": {
       "delete": {
-        "description": "Deletes an existing notification channel identified by UID.",
-        "operationId": "deleteAlertNotificationChannelByUID",
+        "description": "Deletes the annotation that matches the specified ID.",
+        "operationId": "deleteAnnotationByID",
         "parameters": [
           {
             "in": "path",
-            "name": "notification_channel_uid",
+            "name": "annotation_id",
             "required": true,
             "schema": {
               "type": "string"
@@ -13545,7 +14388,7 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/deleteAlertNotificationChannelResponse"
+            "$ref": "#/components/responses/okResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -13553,25 +14396,21 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Delete alert notification by UID.",
+        "summary": "Delete Annotation By ID.",
         "tags": [
-          "legacy_alerts_notification_channels"
+          "annotations"
         ]
       },
       "get": {
-        "description": "Returns the notification channel given the notification channel UID.",
-        "operationId": "getAlertNotificationChannelByUID",
+        "operationId": "getAnnotationByID",
         "parameters": [
           {
             "in": "path",
-            "name": "notification_channel_uid",
+            "name": "annotation_id",
             "required": true,
             "schema": {
               "type": "string"
@@ -13580,33 +14419,27 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getAlertNotificationChannelResponse"
+            "$ref": "#/components/responses/getAnnotationByIDResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get notification channel by UID.",
+        "summary": "Get Annotation by ID.",
         "tags": [
-          "legacy_alerts_notification_channels"
+          "annotations"
         ]
       },
-      "put": {
-        "description": "Updates an existing notification channel identified by uid.",
-        "operationId": "updateAlertNotificationChannelByUID",
+      "patch": {
+        "description": "Updates one or more properties of an annotation that matches the specified ID.\nThis operation currently supports updating of the `text`, `tags`, `time` and `timeEnd` properties.\nThis is available in Grafana 6.0.0-beta2 and above.",
+        "operationId": "patchAnnotation",
         "parameters": [
           {
             "in": "path",
-            "name": "notification_channel_uid",
+            "name": "annotation_id",
             "required": true,
             "schema": {
               "type": "string"
@@ -13617,7 +14450,7 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/UpdateAlertNotificationWithUidCommand"
+                "$ref": "#/components/schemas/PatchAnnotationsCmd"
               }
             }
           },
@@ -13626,7 +14459,7 @@
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getAlertNotificationChannelResponse"
+            "$ref": "#/components/responses/okResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -13641,66 +14474,76 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Update notification channel by UID.",
+        "summary": "Patch Annotation.",
         "tags": [
-          "legacy_alerts_notification_channels"
+          "annotations"
         ]
-      }
-    },
-    "/alert-notifications/{notification_channel_id}": {
-      "delete": {
-        "description": "Deletes an existing notification channel identified by ID.",
-        "operationId": "deleteAlertNotificationChannel",
+      },
+      "put": {
+        "description": "Updates all properties of an annotation that matches the specified id. To only update certain property, consider using the Patch Annotation operation.",
+        "operationId": "updateAnnotation",
         "parameters": [
           {
             "in": "path",
-            "name": "notification_channel_id",
+            "name": "annotation_id",
             "required": true,
             "schema": {
-              "format": "int64",
-              "type": "integer"
+              "type": "string"
             }
           }
         ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateAnnotationsCmd"
+              }
+            }
+          },
+          "required": true,
+          "x-originalParamName": "body"
+        },
         "responses": {
           "200": {
             "$ref": "#/components/responses/okResponse"
           },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
+          },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Delete alert notification by ID.",
+        "summary": "Update Annotation.",
         "tags": [
-          "legacy_alerts_notification_channels"
+          "annotations"
         ]
-      },
+      }
+    },
+    "/auth/keys": {
       "get": {
-        "description": "Returns the notification channel given the notification channel ID.",
-        "operationId": "getAlertNotificationChannelByID",
+        "description": "Will return auth keys.\n\nDeprecated: true.\n\nDeprecated. Please use GET /api/serviceaccounts and GET /api/serviceaccounts/{id}/tokens instead\nsee https://grafana.com/docs/grafana/next/administration/api-keys/#migrate-api-keys-to-grafana-service-accounts-using-the-api.",
+        "operationId": "getAPIkeys",
         "parameters": [
           {
-            "in": "path",
-            "name": "notification_channel_id",
-            "required": true,
+            "description": "Show expired keys",
+            "in": "query",
+            "name": "includeExpired",
             "schema": {
-              "format": "int64",
-              "type": "integer"
+              "default": false,
+              "type": "boolean"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getAlertNotificationChannelResponse"
+            "$ref": "#/components/responses/getAPIkeyResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -13715,39 +14558,32 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get notification channel by ID.",
+        "summary": "Get auth keys.",
         "tags": [
-          "legacy_alerts_notification_channels"
+          "api_keys"
         ]
       },
-      "put": {
-        "description": "Updates an existing notification channel identified by ID.",
-        "operationId": "updateAlertNotificationChannel",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "notification_channel_id",
-            "required": true,
-            "schema": {
-              "format": "int64",
-              "type": "integer"
-            }
-          }
-        ],
+      "post": {
+        "deprecated": true,
+        "description": "Will return details of the created API key.",
+        "operationId": "addAPIkey",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/UpdateAlertNotificationCommand"
+                "$ref": "#/components/schemas/AddAPIKeyCommand"
               }
             }
           },
           "required": true,
-          "x-originalParamName": "body"
+          "x-originalParamName": "Body"
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getAlertNotificationChannelResponse"
+            "$ref": "#/components/responses/postAPIkeyResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -13755,179 +14591,179 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
+          "409": {
+            "$ref": "#/components/responses/conflictError"
           },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Update notification channel by ID.",
+        "summary": "Creates an API key.",
         "tags": [
-          "legacy_alerts_notification_channels"
+          "api_keys"
         ]
       }
     },
-    "/alerts": {
-      "get": {
-        "operationId": "getAlerts",
+    "/auth/keys/{id}": {
+      "delete": {
+        "deprecated": true,
+        "description": "Deletes an API key.\nDeprecated. See: https://grafana.com/docs/grafana/next/administration/api-keys/#migrate-api-keys-to-grafana-service-accounts-using-the-api.",
+        "operationId": "deleteAPIkey",
         "parameters": [
           {
-            "description": "Limit response to alerts in specified dashboard(s). You can specify multiple dashboards.",
-            "in": "query",
-            "name": "dashboardId",
-            "schema": {
-              "items": {
-                "type": "string"
-              },
-              "type": "array"
-            }
-          },
-          {
-            "description": "Limit response to alert for a specified panel on a dashboard.",
-            "in": "query",
-            "name": "panelId",
+            "in": "path",
+            "name": "id",
+            "required": true,
             "schema": {
               "format": "int64",
               "type": "integer"
             }
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/okResponse"
           },
-          {
-            "description": "Limit response to alerts having a name like this value.",
-            "in": "query",
-            "name": "query",
-            "schema": {
-              "type": "string"
-            }
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
           },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "summary": "Delete API key.",
+        "tags": [
+          "api_keys"
+        ]
+      }
+    },
+    "/dashboard/snapshots": {
+      "get": {
+        "operationId": "searchDashboardSnapshots",
+        "parameters": [
           {
-            "description": "Return alerts with one or more of the following alert states",
+            "description": "Search Query",
             "in": "query",
-            "name": "state",
+            "name": "query",
             "schema": {
-              "enum": [
-                "all",
-                "no_data",
-                "paused",
-                "alerting",
-                "ok",
-                "pending",
-                "unknown"
-              ],
               "type": "string"
             }
           },
           {
-            "description": "Limit response to X number of alerts.",
+            "description": "Limit the number of returned results",
             "in": "query",
             "name": "limit",
             "schema": {
+              "default": 1000,
               "format": "int64",
               "type": "integer"
             }
-          },
-          {
-            "description": "Limit response to alerts of dashboards in specified folder(s). You can specify multiple folders",
-            "in": "query",
-            "name": "folderId",
-            "schema": {
-              "items": {
-                "type": "string"
-              },
-              "type": "array"
-            }
-          },
-          {
-            "description": "Limit response to alerts having a dashboard name like this value./ Limit response to alerts having a dashboard name like this value.",
-            "in": "query",
-            "name": "dashboardQuery",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "description": "Limit response to alerts of dashboards with specified tags. To do an “AND” filtering with multiple tags, specify the tags parameter multiple times",
-            "in": "query",
-            "name": "dashboardTag",
-            "schema": {
-              "items": {
-                "type": "string"
-              },
-              "type": "array"
-            }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getAlertsResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
+            "$ref": "#/components/responses/searchDashboardSnapshotsResponse"
           },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get legacy alerts.",
+        "summary": "List snapshots.",
         "tags": [
-          "legacy_alerts"
+          "snapshots"
         ]
       }
     },
-    "/alerts/states-for-dashboard": {
-      "get": {
-        "operationId": "getDashboardStates",
-        "parameters": [
-          {
-            "in": "query",
-            "name": "dashboardId",
-            "required": true,
-            "schema": {
-              "format": "int64",
-              "type": "integer"
+    "/dashboards/calculate-diff": {
+      "post": {
+        "operationId": "calculateDashboardDiff",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "properties": {
+                  "base": {
+                    "$ref": "#/components/schemas/CalculateDiffTarget"
+                  },
+                  "diffType": {
+                    "description": "The type of diff to return\nDescription:\n`basic`\n`json`",
+                    "enum": [
+                      "basic",
+                      "json"
+                    ],
+                    "type": "string"
+                  },
+                  "new": {
+                    "$ref": "#/components/schemas/CalculateDiffTarget"
+                  }
+                },
+                "type": "object"
+              }
             }
-          }
-        ],
+          },
+          "required": true,
+          "x-originalParamName": "Body"
+        },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getDashboardStatesResponse"
+            "$ref": "#/components/responses/calculateDashboardDiffResponse"
           },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
           },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get alert states for a dashboard.",
+        "summary": "Perform diff on two dashboards.",
         "tags": [
-          "legacy_alerts"
+          "dashboards"
         ]
       }
     },
-    "/alerts/test": {
+    "/dashboards/db": {
       "post": {
-        "operationId": "testAlert",
+        "description": "Creates a new dashboard or updates an existing dashboard.\nNote: This endpoint is not intended for creating folders, use `POST /api/folders` for that.",
+        "operationId": "postDashboard",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/AlertTestCommand"
+                "$ref": "#/components/schemas/SaveDashboardCommand"
               }
             }
           },
-          "x-originalParamName": "body"
+          "required": true,
+          "x-originalParamName": "Body"
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/testAlertResponse"
+            "$ref": "#/components/responses/postDashboardResponse"
           },
           "400": {
             "$ref": "#/components/responses/badRequestError"
           },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "412": {
+            "$ref": "#/components/responses/preconditionFailedError"
+          },
           "422": {
             "$ref": "#/components/responses/unprocessableEntityError"
           },
@@ -13935,53 +14771,82 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Test alert.",
+        "summary": "Create / Update dashboard",
+        "tags": [
+          "dashboards"
+        ]
+      }
+    },
+    "/dashboards/home": {
+      "get": {
+        "operationId": "getHomeDashboard",
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/getHomeDashboardResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "summary": "Get home dashboard.",
         "tags": [
-          "legacy_alerts"
+          "dashboards"
         ]
       }
     },
-    "/alerts/{alert_id}": {
+    "/dashboards/id/{DashboardID}/permissions": {
       "get": {
-        "description": "“evalMatches” data in the response is cached in the db when and only when the state of the alert changes (e.g. transitioning from “ok” to “alerting” state).\nIf data from one server triggers the alert first and, before that server is seen leaving alerting state, a second server also enters a state that would trigger the alert, the second server will not be visible in “evalMatches” data.",
-        "operationId": "getAlertByID",
+        "deprecated": true,
+        "description": "Please refer to [updated API](#/dashboard_permissions/getDashboardPermissionsListByUID) instead",
+        "operationId": "getDashboardPermissionsListByID",
         "parameters": [
           {
             "in": "path",
-            "name": "alert_id",
+            "name": "DashboardID",
             "required": true,
             "schema": {
-              "type": "string"
+              "format": "int64",
+              "type": "integer"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getAlertResponse"
+            "$ref": "#/components/responses/getDashboardPermissionsListResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get alert by ID.",
+        "summary": "Gets all existing permissions for the given dashboard.",
         "tags": [
-          "legacy_alerts"
+          "dashboard_permissions"
         ]
-      }
-    },
-    "/alerts/{alert_id}/pause": {
+      },
       "post": {
-        "operationId": "pauseAlert",
+        "deprecated": true,
+        "description": "Please refer to [updated API](#/dashboard_permissions/updateDashboardPermissionsByUID) instead\n\nThis operation will remove existing permissions if they’re not included in the request.",
+        "operationId": "updateDashboardPermissionsByID",
         "parameters": [
           {
             "in": "path",
-            "name": "alert_id",
+            "name": "DashboardID",
             "required": true,
             "schema": {
-              "type": "string"
+              "format": "int64",
+              "type": "integer"
             }
           }
         ],
@@ -13989,16 +14854,19 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/PauseAlertCommand"
+                "$ref": "#/components/schemas/UpdateDashboardACLCommand"
               }
             }
           },
           "required": true,
-          "x-originalParamName": "body"
+          "x-originalParamName": "Body"
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/pauseAlertResponse"
+            "$ref": "#/components/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -14013,153 +14881,166 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Pause/unpause alert by id.",
+        "summary": "Updates permissions for a dashboard.",
         "tags": [
-          "legacy_alerts"
+          "dashboard_permissions"
         ]
       }
     },
-    "/annotations": {
-      "get": {
-        "description": "Starting in Grafana v6.4 regions annotations are now returned in one entity that now includes the timeEnd property.",
-        "operationId": "getAnnotations",
+    "/dashboards/id/{DashboardID}/restore": {
+      "post": {
+        "deprecated": true,
+        "description": "Please refer to [updated API](#/dashboard_versions/restoreDashboardVersionByUID) instead",
+        "operationId": "restoreDashboardVersionByID",
         "parameters": [
           {
-            "description": "Find annotations created after specific epoch datetime in milliseconds.",
-            "in": "query",
-            "name": "from",
-            "schema": {
-              "format": "int64",
-              "type": "integer"
-            }
-          },
-          {
-            "description": "Find annotations created before specific epoch datetime in milliseconds.",
-            "in": "query",
-            "name": "to",
+            "in": "path",
+            "name": "DashboardID",
+            "required": true,
             "schema": {
               "format": "int64",
               "type": "integer"
             }
-          },
-          {
-            "description": "Limit response to annotations created by specific user.",
-            "in": "query",
-            "name": "userId",
-            "schema": {
-              "format": "int64",
-              "type": "integer"
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/RestoreDashboardVersionCommand"
+              }
             }
           },
-          {
-            "description": "Find annotations for a specified alert.",
-            "in": "query",
-            "name": "alertId",
-            "schema": {
-              "format": "int64",
-              "type": "integer"
-            }
+          "required": true,
+          "x-originalParamName": "Body"
+        },
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/postDashboardResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
           },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "summary": "Restore a dashboard to a given dashboard version.",
+        "tags": [
+          "dashboard_versions"
+        ]
+      }
+    },
+    "/dashboards/id/{DashboardID}/versions": {
+      "get": {
+        "deprecated": true,
+        "description": "Please refer to [updated API](#/dashboard_versions/getDashboardVersionsByUID) instead",
+        "operationId": "getDashboardVersionsByID",
+        "parameters": [
           {
-            "description": "Find annotations that are scoped to a specific dashboard",
-            "in": "query",
-            "name": "dashboardId",
+            "in": "path",
+            "name": "DashboardID",
+            "required": true,
             "schema": {
               "format": "int64",
               "type": "integer"
             }
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/dashboardVersionsResponse"
           },
-          {
-            "description": "Find annotations that are scoped to a specific dashboard",
-            "in": "query",
-            "name": "dashboardUID",
-            "schema": {
-              "type": "string"
-            }
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
           },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "summary": "Gets all existing versions for the dashboard.",
+        "tags": [
+          "dashboard_versions"
+        ]
+      }
+    },
+    "/dashboards/id/{DashboardID}/versions/{DashboardVersionID}": {
+      "get": {
+        "deprecated": true,
+        "description": "Please refer to [updated API](#/dashboard_versions/getDashboardVersionByUID) instead",
+        "operationId": "getDashboardVersionByID",
+        "parameters": [
           {
-            "description": "Find annotations that are scoped to a specific panel",
-            "in": "query",
-            "name": "panelId",
+            "in": "path",
+            "name": "DashboardID",
+            "required": true,
             "schema": {
               "format": "int64",
               "type": "integer"
             }
           },
           {
-            "description": "Max limit for results returned.",
-            "in": "query",
-            "name": "limit",
+            "in": "path",
+            "name": "DashboardVersionID",
+            "required": true,
             "schema": {
               "format": "int64",
               "type": "integer"
             }
-          },
-          {
-            "description": "Use this to filter organization annotations. Organization annotations are annotations from an annotation data source that are not connected specifically to a dashboard or panel. You can filter by multiple tags.",
-            "in": "query",
-            "name": "tags",
-            "schema": {
-              "items": {
-                "type": "string"
-              },
-              "type": "array"
-            }
-          },
-          {
-            "description": "Return alerts or user created annotations",
-            "in": "query",
-            "name": "type",
-            "schema": {
-              "enum": [
-                "alert",
-                "annotation"
-              ],
-              "type": "string"
-            }
-          },
-          {
-            "description": "Match any or all tags",
-            "in": "query",
-            "name": "matchAny",
-            "schema": {
-              "type": "boolean"
-            }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getAnnotationsResponse"
+            "$ref": "#/components/responses/dashboardVersionResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Find Annotations.",
+        "summary": "Get a specific dashboard version.",
         "tags": [
-          "annotations"
+          "dashboard_versions"
         ]
-      },
+      }
+    },
+    "/dashboards/import": {
       "post": {
-        "description": "Creates an annotation in the Grafana database. The dashboardId and panelId fields are optional. If they are not specified then an organization annotation is created and can be queried in any dashboard that adds the Grafana annotations data source. When creating a region annotation include the timeEnd property.\nThe format for `time` and `timeEnd` should be epoch numbers in millisecond resolution.\nThe response for this HTTP request is slightly different in versions prior to v6.4. In prior versions you would also get an endId if you where creating a region. But in 6.4 regions are represented using a single event with time and timeEnd properties.",
-        "operationId": "postAnnotation",
+        "operationId": "importDashboard",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/PostAnnotationsCmd"
+                "$ref": "#/components/schemas/ImportDashboardRequest"
               }
             }
           },
           "required": true,
-          "x-originalParamName": "body"
+          "x-originalParamName": "Body"
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/postAnnotationResponse"
+            "$ref": "#/components/responses/importDashboardResponse"
           },
           "400": {
             "$ref": "#/components/responses/badRequestError"
@@ -14167,74 +15048,51 @@
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
+          "412": {
+            "$ref": "#/components/responses/preconditionFailedError"
+          },
+          "422": {
+            "$ref": "#/components/responses/unprocessableEntityError"
           },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Create Annotation.",
+        "summary": "Import dashboard.",
         "tags": [
-          "annotations"
+          "dashboards"
         ]
       }
     },
-    "/annotations/graphite": {
-      "post": {
-        "description": "Creates an annotation by using Graphite-compatible event format. The `when` and `data` fields are optional. If `when` is not specified then the current time will be used as annotation’s timestamp. The `tags` field can also be in prior to Graphite `0.10.0` format (string with multiple tags being separated by a space).",
-        "operationId": "postGraphiteAnnotation",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/PostGraphiteAnnotationsCmd"
-              }
-            }
-          },
-          "required": true,
-          "x-originalParamName": "body"
-        },
+    "/dashboards/public-dashboards": {
+      "get": {
+        "description": "Get list of public dashboards",
+        "operationId": "listPublicDashboards",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/postAnnotationResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
+            "$ref": "#/components/responses/listPublicDashboardsResponse"
           },
           "401": {
-            "$ref": "#/components/responses/unauthorisedError"
+            "$ref": "#/components/responses/unauthorisedPublicError"
           },
           "403": {
-            "$ref": "#/components/responses/forbiddenError"
+            "$ref": "#/components/responses/forbiddenPublicError"
           },
           "500": {
-            "$ref": "#/components/responses/internalServerError"
+            "$ref": "#/components/responses/internalServerPublicError"
           }
         },
-        "summary": "Create Annotation in Graphite format.",
         "tags": [
-          "annotations"
+          "dashboard_public"
         ]
       }
     },
-    "/annotations/mass-delete": {
-      "post": {
-        "operationId": "massDeleteAnnotations",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/MassDeleteAnnotationsCmd"
-              }
-            }
-          },
-          "required": true,
-          "x-originalParamName": "body"
-        },
+    "/dashboards/tags": {
+      "get": {
+        "operationId": "getDashboardTags",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
+            "$ref": "#/components/responses/getDashboardsTagsResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -14243,91 +15101,112 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Delete multiple annotations.",
+        "summary": "Get all dashboards tags of an organisation.",
         "tags": [
-          "annotations"
+          "dashboards"
         ]
       }
     },
-    "/annotations/tags": {
+    "/dashboards/uid/{dashboardUid}/public-dashboards": {
       "get": {
-        "description": "Find all the event tags created in the annotations.",
-        "operationId": "getAnnotationTags",
+        "description": "Get public dashboard by dashboardUid",
+        "operationId": "getPublicDashboard",
         "parameters": [
           {
-            "description": "Tag is a string that you can use to filter tags.",
-            "in": "query",
-            "name": "tag",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "description": "Max limit for results returned.",
-            "in": "query",
-            "name": "limit",
+            "in": "path",
+            "name": "dashboardUid",
+            "required": true,
             "schema": {
-              "default": "100",
               "type": "string"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getAnnotationTagsResponse"
+            "$ref": "#/components/responses/getPublicDashboardResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestPublicError"
           },
           "401": {
-            "$ref": "#/components/responses/unauthorisedError"
+            "$ref": "#/components/responses/unauthorisedPublicError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenPublicError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundPublicError"
           },
           "500": {
-            "$ref": "#/components/responses/internalServerError"
+            "$ref": "#/components/responses/internalServerPublicError"
           }
         },
-        "summary": "Find Annotations Tags.",
         "tags": [
-          "annotations"
+          "dashboard_public"
         ]
-      }
-    },
-    "/annotations/{annotation_id}": {
-      "delete": {
-        "description": "Deletes the annotation that matches the specified ID.",
-        "operationId": "deleteAnnotationByID",
+      },
+      "post": {
+        "description": "Create public dashboard for a dashboard",
+        "operationId": "createPublicDashboard",
         "parameters": [
           {
             "in": "path",
-            "name": "annotation_id",
+            "name": "dashboardUid",
             "required": true,
             "schema": {
               "type": "string"
             }
           }
         ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PublicDashboardDTO"
+              }
+            }
+          },
+          "required": true,
+          "x-originalParamName": "Body"
+        },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
+            "$ref": "#/components/responses/createPublicDashboardResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestPublicError"
           },
           "401": {
-            "$ref": "#/components/responses/unauthorisedError"
+            "$ref": "#/components/responses/unauthorisedPublicError"
           },
           "403": {
-            "$ref": "#/components/responses/forbiddenError"
+            "$ref": "#/components/responses/forbiddenPublicError"
           },
           "500": {
-            "$ref": "#/components/responses/internalServerError"
+            "$ref": "#/components/responses/internalServerPublicError"
           }
         },
-        "summary": "Delete Annotation By ID.",
         "tags": [
-          "annotations"
+          "dashboard_public"
         ]
-      },
-      "get": {
-        "operationId": "getAnnotationByID",
+      }
+    },
+    "/dashboards/uid/{dashboardUid}/public-dashboards/{uid}": {
+      "delete": {
+        "description": "Delete public dashboard for a dashboard",
+        "operationId": "deletePublicDashboard",
         "parameters": [
           {
             "in": "path",
-            "name": "annotation_id",
+            "name": "dashboardUid",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "uid",
             "required": true,
             "schema": {
               "type": "string"
@@ -14336,27 +15215,40 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getAnnotationByIDResponse"
+            "$ref": "#/components/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestPublicError"
           },
           "401": {
-            "$ref": "#/components/responses/unauthorisedError"
+            "$ref": "#/components/responses/unauthorisedPublicError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenPublicError"
           },
           "500": {
-            "$ref": "#/components/responses/internalServerError"
+            "$ref": "#/components/responses/internalServerPublicError"
           }
         },
-        "summary": "Get Annotation by ID.",
         "tags": [
-          "annotations"
+          "dashboard_public"
         ]
       },
       "patch": {
-        "description": "Updates one or more properties of an annotation that matches the specified ID.\nThis operation currently supports updating of the `text`, `tags`, `time` and `timeEnd` properties.\nThis is available in Grafana 6.0.0-beta2 and above.",
-        "operationId": "patchAnnotation",
+        "description": "Update public dashboard for a dashboard",
+        "operationId": "updatePublicDashboard",
         "parameters": [
           {
             "in": "path",
-            "name": "annotation_id",
+            "name": "dashboardUid",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "uid",
             "required": true,
             "schema": {
               "type": "string"
@@ -14367,16 +15259,52 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/PatchAnnotationsCmd"
+                "$ref": "#/components/schemas/PublicDashboardDTO"
               }
             }
           },
           "required": true,
-          "x-originalParamName": "body"
+          "x-originalParamName": "Body"
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
+            "$ref": "#/components/responses/updatePublicDashboardResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestPublicError"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedPublicError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenPublicError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerPublicError"
+          }
+        },
+        "tags": [
+          "dashboard_public"
+        ]
+      }
+    },
+    "/dashboards/uid/{uid}": {
+      "delete": {
+        "description": "Will delete the dashboard given the specified unique identifier (uid).",
+        "operationId": "deleteDashboardByUID",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "uid",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/deleteDashboardResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -14391,41 +15319,27 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Patch Annotation.",
+        "summary": "Delete dashboard by uid.",
         "tags": [
-          "annotations"
+          "dashboards"
         ]
       },
-      "put": {
-        "description": "Updates all properties of an annotation that matches the specified id. To only update certain property, consider using the Patch Annotation operation.",
-        "operationId": "updateAnnotation",
+      "get": {
+        "description": "Will return the dashboard given the dashboard unique identifier (uid).",
+        "operationId": "getDashboardByUID",
         "parameters": [
           {
             "in": "path",
-            "name": "annotation_id",
+            "name": "uid",
             "required": true,
             "schema": {
               "type": "string"
             }
           }
         ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/UpdateAnnotationsCmd"
-              }
-            }
-          },
-          "required": true,
-          "x-originalParamName": "body"
-        },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
+            "$ref": "#/components/responses/dashboardResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -14433,42 +15347,62 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Update Annotation.",
+        "summary": "Get dashboard by uid.",
         "tags": [
-          "annotations"
+          "dashboards"
         ]
       }
     },
-    "/api/v1/provisioning/alert-rules": {
+    "/dashboards/uid/{uid}/permissions": {
       "get": {
-        "operationId": "RouteGetAlertRules",
+        "operationId": "getDashboardPermissionsListByUID",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "uid",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
         "responses": {
           "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ProvisionedAlertRules"
-                }
-              }
-            },
-            "description": "ProvisionedAlertRules"
+            "$ref": "#/components/responses/getDashboardPermissionsListResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get all the alert rules.",
+        "summary": "Gets all existing permissions for the given dashboard.",
         "tags": [
-          "provisioning"
+          "dashboard_permissions"
         ]
       },
       "post": {
-        "operationId": "RoutePostAlertRule",
+        "description": "This operation will remove existing permissions if they’re not included in the request.",
+        "operationId": "updateDashboardPermissionsByUID",
         "parameters": [
           {
-            "in": "header",
-            "name": "X-Disable-Provenance",
+            "in": "path",
+            "name": "uid",
+            "required": true,
             "schema": {
               "type": "string"
             }
@@ -14478,142 +15412,158 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/ProvisionedAlertRule"
+                "$ref": "#/components/schemas/UpdateDashboardACLCommand"
               }
             }
           },
+          "required": true,
           "x-originalParamName": "Body"
         },
         "responses": {
-          "201": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ProvisionedAlertRule"
-                }
-              }
-            },
-            "description": "ProvisionedAlertRule"
+          "200": {
+            "$ref": "#/components/responses/okResponse"
           },
           "400": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ValidationError"
-                }
-              }
-            },
-            "description": "ValidationError"
+            "$ref": "#/components/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Create a new alert rule.",
+        "summary": "Updates permissions for a dashboard.",
         "tags": [
-          "provisioning"
+          "dashboard_permissions"
         ]
       }
     },
-    "/api/v1/provisioning/alert-rules/export": {
-      "get": {
-        "operationId": "RouteGetAlertRulesExport",
+    "/dashboards/uid/{uid}/restore": {
+      "post": {
+        "operationId": "restoreDashboardVersionByUID",
         "parameters": [
           {
-            "description": "Whether to initiate a download of the file or not.",
-            "in": "query",
-            "name": "download",
-            "schema": {
-              "default": false,
-              "type": "boolean"
-            }
-          },
-          {
-            "description": "Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.",
-            "in": "query",
-            "name": "format",
+            "in": "path",
+            "name": "uid",
+            "required": true,
             "schema": {
-              "default": "yaml",
               "type": "string"
             }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/RestoreDashboardVersionCommand"
+              }
+            }
           },
-          {
-            "description": "UIDs of folders from which to export rules",
-            "in": "query",
-            "name": "folderUid",
+          "required": true,
+          "x-originalParamName": "Body"
+        },
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/postDashboardResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "summary": "Restore a dashboard to a given dashboard version using UID.",
+        "tags": [
+          "dashboard_versions"
+        ]
+      }
+    },
+    "/dashboards/uid/{uid}/versions": {
+      "get": {
+        "operationId": "getDashboardVersionsByUID",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "uid",
+            "required": true,
             "schema": {
-              "items": {
-                "type": "string"
-              },
-              "type": "array"
+              "type": "string"
             }
           },
           {
-            "description": "Name of group of rules to export. Must be specified only together with a single folder UID",
+            "description": "Maximum number of results to return",
             "in": "query",
-            "name": "group",
+            "name": "limit",
             "schema": {
-              "type": "string"
+              "default": 0,
+              "format": "int64",
+              "type": "integer"
             }
           },
           {
-            "description": "UID of alert rule to export. If specified, parameters folderUid and group must be empty.",
+            "description": "Version to start from when returning queries",
             "in": "query",
-            "name": "ruleUid",
+            "name": "start",
             "schema": {
-              "type": "string"
+              "default": 0,
+              "format": "int64",
+              "type": "integer"
             }
           }
         ],
         "responses": {
           "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/AlertingFileExport"
-                }
-              }
-            },
-            "description": "AlertingFileExport"
+            "$ref": "#/components/responses/dashboardVersionsResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
           },
           "404": {
-            "description": " Not found."
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Export all alert rules in provisioning file format.",
+        "summary": "Gets all existing versions for the dashboard using UID.",
         "tags": [
-          "provisioning"
+          "dashboard_versions"
         ]
       }
     },
-    "/api/v1/provisioning/alert-rules/{UID}": {
-      "delete": {
-        "operationId": "RouteDeleteAlertRule",
+    "/dashboards/uid/{uid}/versions/{DashboardVersionID}": {
+      "get": {
+        "operationId": "getDashboardVersionByUID",
         "parameters": [
           {
-            "description": "Alert rule UID",
             "in": "path",
-            "name": "UID",
+            "name": "DashboardVersionID",
             "required": true,
             "schema": {
-              "type": "string"
+              "format": "int64",
+              "type": "integer"
             }
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": " The alert rule was deleted successfully."
-          }
-        },
-        "summary": "Delete a specific alert rule by UID.",
-        "tags": [
-          "provisioning"
-        ]
-      },
-      "get": {
-        "operationId": "RouteGetAlertRule",
-        "parameters": [
+          },
           {
-            "description": "Alert rule UID",
             "in": "path",
-            "name": "UID",
+            "name": "uid",
             "required": true,
             "schema": {
               "type": "string"
@@ -14622,153 +15572,153 @@
         ],
         "responses": {
           "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ProvisionedAlertRule"
-                }
-              }
-            },
-            "description": "ProvisionedAlertRule"
+            "$ref": "#/components/responses/dashboardVersionResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
           },
           "404": {
-            "description": " Not found."
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get a specific alert rule by UID.",
+        "summary": "Get a specific dashboard version using UID.",
         "tags": [
-          "provisioning"
+          "dashboard_versions"
         ]
-      },
-      "put": {
-        "operationId": "RoutePutAlertRule",
-        "parameters": [
-          {
-            "description": "Alert rule UID",
-            "in": "path",
-            "name": "UID",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
+      }
+    },
+    "/datasources": {
+      "get": {
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:read` and scope: `datasources:*`.",
+        "operationId": "getDataSources",
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/getDataSourcesResponse"
           },
-          {
-            "in": "header",
-            "name": "X-Disable-Provenance",
-            "schema": {
-              "type": "string"
-            }
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
-        ],
+        },
+        "summary": "Get all data sources.",
+        "tags": [
+          "datasources"
+        ]
+      },
+      "post": {
+        "description": "By defining `password` and `basicAuthPassword` under secureJsonData property\nGrafana encrypts them securely as an encrypted blob in the database.\nThe response then lists the encrypted fields under secureJsonFields.\n\nIf you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:create`",
+        "operationId": "addDataSource",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/ProvisionedAlertRule"
+                "$ref": "#/components/schemas/AddDataSourceCommand"
               }
             }
           },
+          "required": true,
           "x-originalParamName": "Body"
         },
         "responses": {
           "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ProvisionedAlertRule"
-                }
-              }
-            },
-            "description": "ProvisionedAlertRule"
+            "$ref": "#/components/responses/createOrUpdateDatasourceResponse"
           },
-          "400": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ValidationError"
-                }
-              }
-            },
-            "description": "ValidationError"
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "409": {
+            "$ref": "#/components/responses/conflictError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Update an existing alert rule.",
+        "summary": "Create a data source.",
         "tags": [
-          "provisioning"
+          "datasources"
         ]
       }
     },
-    "/api/v1/provisioning/alert-rules/{UID}/export": {
+    "/datasources/correlations": {
       "get": {
-        "operationId": "RouteGetAlertRuleExport",
+        "operationId": "getCorrelations",
         "parameters": [
           {
-            "description": "Whether to initiate a download of the file or not.",
+            "description": "Limit the maximum number of correlations to return per page",
             "in": "query",
-            "name": "download",
+            "name": "limit",
             "schema": {
-              "default": false,
-              "type": "boolean"
+              "default": 100,
+              "format": "int64",
+              "maximum": 1000,
+              "type": "integer"
             }
           },
           {
-            "description": "Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.",
+            "description": "Page index for starting fetching correlations",
             "in": "query",
-            "name": "format",
+            "name": "page",
             "schema": {
-              "default": "yaml",
-              "type": "string"
+              "default": 1,
+              "format": "int64",
+              "type": "integer"
             }
           },
           {
-            "description": "Alert rule UID",
-            "in": "path",
-            "name": "UID",
-            "required": true,
+            "description": "Source datasource UID filter to be applied to correlations",
+            "in": "query",
+            "name": "sourceUID",
             "schema": {
-              "type": "string"
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
             }
           }
         ],
         "responses": {
           "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/AlertingFileExport"
-                }
-              },
-              "application/yaml": {
-                "schema": {
-                  "$ref": "#/components/schemas/AlertingFileExport"
-                }
-              },
-              "text/yaml": {
-                "schema": {
-                  "$ref": "#/components/schemas/AlertingFileExport"
-                }
-              }
-            },
-            "description": "AlertingFileExport"
+            "$ref": "#/components/responses/getCorrelationsResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
           },
           "404": {
-            "description": " Not found."
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Export an alert rule in provisioning file format.",
+        "summary": "Gets all correlations.",
         "tags": [
-          "provisioning"
+          "correlations"
         ]
       }
     },
-    "/api/v1/provisioning/contact-points": {
+    "/datasources/id/{name}": {
       "get": {
-        "operationId": "RouteGetContactpoints",
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:read` and scopes: `datasources:*`, `datasources:name:*` and `datasources:name:test_datasource` (single data source).",
+        "operationId": "getDataSourceIdByName",
         "parameters": [
           {
-            "description": "Filter by name",
-            "in": "query",
+            "in": "path",
             "name": "name",
+            "required": true,
             "schema": {
               "type": "string"
             }
@@ -14776,137 +15726,35 @@
         ],
         "responses": {
           "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ContactPoints"
-                }
-              }
-            },
-            "description": "ContactPoints"
-          }
-        },
-        "summary": "Get all the contact points.",
-        "tags": [
-          "provisioning"
-        ]
-      },
-      "post": {
-        "operationId": "RoutePostContactpoints",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/EmbeddedContactPoint"
-              }
-            }
-          },
-          "x-originalParamName": "Body"
-        },
-        "responses": {
-          "202": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/EmbeddedContactPoint"
-                }
-              }
-            },
-            "description": "EmbeddedContactPoint"
-          },
-          "400": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ValidationError"
-                }
-              }
-            },
-            "description": "ValidationError"
-          }
-        },
-        "summary": "Create a contact point.",
-        "tags": [
-          "provisioning"
-        ]
-      }
-    },
-    "/api/v1/provisioning/contact-points/export": {
-      "get": {
-        "operationId": "RouteGetContactpointsExport",
-        "parameters": [
-          {
-            "description": "Whether to initiate a download of the file or not.",
-            "in": "query",
-            "name": "download",
-            "schema": {
-              "default": false,
-              "type": "boolean"
-            }
+            "$ref": "#/components/responses/getDataSourceIDResponse"
           },
-          {
-            "description": "Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.",
-            "in": "query",
-            "name": "format",
-            "schema": {
-              "default": "yaml",
-              "type": "string"
-            }
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
           },
-          {
-            "description": "Whether any contained secure settings should be decrypted or left redacted. Redacted settings will contain RedactedValue instead. Currently, only org admin can view decrypted secure settings.",
-            "in": "query",
-            "name": "decrypt",
-            "schema": {
-              "default": false,
-              "type": "boolean"
-            }
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
           },
-          {
-            "description": "Filter by name",
-            "in": "query",
-            "name": "name",
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/AlertingFileExport"
-                }
-              }
-            },
-            "description": "AlertingFileExport"
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
           },
-          "403": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/PermissionDenied"
-                }
-              }
-            },
-            "description": "PermissionDenied"
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Export all contact points in provisioning file format.",
+        "summary": "Get data source Id by Name.",
         "tags": [
-          "provisioning"
+          "datasources"
         ]
       }
     },
-    "/api/v1/provisioning/contact-points/{UID}": {
+    "/datasources/name/{name}": {
       "delete": {
-        "operationId": "RouteDeleteContactpoints",
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:delete` and scopes: `datasources:*`, `datasources:name:*` and `datasources:name:test_datasource` (single data source).",
+        "operationId": "deleteDataSourceByName",
         "parameters": [
           {
-            "description": "UID is the contact point unique identifier",
             "in": "path",
-            "name": "UID",
+            "name": "name",
             "required": true,
             "schema": {
               "type": "string"
@@ -14914,73 +15762,68 @@
           }
         ],
         "responses": {
-          "204": {
-            "description": " The contact point was deleted successfully."
+          "200": {
+            "$ref": "#/components/responses/deleteDataSourceByNameResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Delete a contact point.",
+        "summary": "Delete an existing data source by name.",
         "tags": [
-          "provisioning"
+          "datasources"
         ]
       },
-      "put": {
-        "operationId": "RoutePutContactpoint",
+      "get": {
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:read` and scopes: `datasources:*`, `datasources:name:*` and `datasources:name:test_datasource` (single data source).",
+        "operationId": "getDataSourceByName",
         "parameters": [
           {
-            "description": "UID is the contact point unique identifier",
             "in": "path",
-            "name": "UID",
+            "name": "name",
             "required": true,
             "schema": {
               "type": "string"
             }
           }
         ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/EmbeddedContactPoint"
-              }
-            }
-          },
-          "x-originalParamName": "Body"
-        },
         "responses": {
-          "202": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Ack"
-                }
-              }
-            },
-            "description": "Ack"
+          "200": {
+            "$ref": "#/components/responses/getDataSourceResponse"
           },
-          "400": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ValidationError"
-                }
-              }
-            },
-            "description": "ValidationError"
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Update an existing contact point.",
+        "summary": "Get a single data source by Name.",
         "tags": [
-          "provisioning"
+          "datasources"
         ]
       }
     },
-    "/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}": {
-      "get": {
-        "operationId": "RouteGetAlertRuleGroup",
+    "/datasources/proxy/uid/{uid}/{datasource_proxy_route}": {
+      "delete": {
+        "description": "Proxies all calls to the actual data source.",
+        "operationId": "datasourceProxyDELETEByUIDcalls",
         "parameters": [
           {
             "in": "path",
-            "name": "FolderUID",
+            "name": "uid",
             "required": true,
             "schema": {
               "type": "string"
@@ -14988,7 +15831,7 @@
           },
           {
             "in": "path",
-            "name": "Group",
+            "name": "datasource_proxy_route",
             "required": true,
             "schema": {
               "type": "string"
@@ -14996,31 +15839,37 @@
           }
         ],
         "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/AlertRuleGroup"
-                }
-              }
-            },
-            "description": "AlertRuleGroup"
+          "202": {
+            "description": "(empty)"
           },
-          "404": {
-            "description": " Not found."
-          }
-        },
-        "summary": "Get a rule group.",
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "summary": "Data source proxy DELETE calls.",
         "tags": [
-          "provisioning"
+          "datasources"
         ]
       },
-      "put": {
-        "operationId": "RoutePutAlertRuleGroup",
+      "get": {
+        "description": "Proxies all calls to the actual data source.",
+        "operationId": "datasourceProxyGETByUIDcalls",
         "parameters": [
           {
             "in": "path",
-            "name": "FolderUID",
+            "name": "datasource_proxy_route",
             "required": true,
             "schema": {
               "type": "string"
@@ -15028,76 +15877,45 @@
           },
           {
             "in": "path",
-            "name": "Group",
+            "name": "uid",
             "required": true,
             "schema": {
               "type": "string"
             }
           }
         ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/AlertRuleGroup"
-              }
-            }
-          },
-          "x-originalParamName": "Body"
-        },
         "responses": {
           "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/AlertRuleGroup"
-                }
-              }
-            },
-            "description": "AlertRuleGroup"
+            "description": "(empty)"
           },
           "400": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ValidationError"
-                }
-              }
-            },
-            "description": "ValidationError"
+            "$ref": "#/components/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Update the interval of a rule group.",
+        "summary": "Data source proxy GET calls.",
         "tags": [
-          "provisioning"
+          "datasources"
         ]
-      }
-    },
-    "/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}/export": {
-      "get": {
-        "operationId": "RouteGetAlertRuleGroupExport",
+      },
+      "post": {
+        "description": "Proxies all calls to the actual data source. The data source should support POST methods for the specific path and role as defined",
+        "operationId": "datasourceProxyPOSTByUIDcalls",
         "parameters": [
-          {
-            "description": "Whether to initiate a download of the file or not.",
-            "in": "query",
-            "name": "download",
-            "schema": {
-              "default": false,
-              "type": "boolean"
-            }
-          },
-          {
-            "description": "Format of the downloaded file, either yaml or json. Accept header can also be used, but the query parameter will take precedence.",
-            "in": "query",
-            "name": "format",
-            "schema": {
-              "default": "yaml",
-              "type": "string"
-            }
-          },
           {
             "in": "path",
-            "name": "FolderUID",
+            "name": "datasource_proxy_route",
             "required": true,
             "schema": {
               "type": "string"
@@ -15105,112 +15923,68 @@
           },
           {
             "in": "path",
-            "name": "Group",
+            "name": "uid",
             "required": true,
             "schema": {
               "type": "string"
             }
           }
         ],
-        "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/AlertingFileExport"
-                }
-              },
-              "application/yaml": {
-                "schema": {
-                  "$ref": "#/components/schemas/AlertingFileExport"
-                }
-              },
-              "text/yaml": {
-                "schema": {
-                  "$ref": "#/components/schemas/AlertingFileExport"
-                }
-              }
-            },
-            "description": "AlertingFileExport"
-          },
-          "404": {
-            "description": " Not found."
-          }
-        },
-        "summary": "Export an alert rule group in provisioning file format.",
-        "tags": [
-          "provisioning"
-        ]
-      }
-    },
-    "/api/v1/provisioning/mute-timings": {
-      "get": {
-        "operationId": "RouteGetMuteTimings",
-        "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/MuteTimings"
-                }
-              }
-            },
-            "description": "MuteTimings"
-          }
-        },
-        "summary": "Get all the mute timings.",
-        "tags": [
-          "provisioning"
-        ]
-      },
-      "post": {
-        "operationId": "RoutePostMuteTiming",
         "requestBody": {
           "content": {
             "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/MuteTimeInterval"
-              }
+              "schema": {}
             }
           },
-          "x-originalParamName": "Body"
+          "required": true,
+          "x-originalParamName": "DatasourceProxyParam"
         },
         "responses": {
           "201": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/MuteTimeInterval"
-                }
-              }
-            },
-            "description": "MuteTimeInterval"
+            "description": "(empty)"
+          },
+          "202": {
+            "description": "(empty)"
           },
           "400": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ValidationError"
-                }
-              }
-            },
-            "description": "ValidationError"
+            "$ref": "#/components/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Create a new mute timing.",
+        "summary": "Data source proxy POST calls.",
         "tags": [
-          "provisioning"
+          "datasources"
         ]
       }
     },
-    "/api/v1/provisioning/mute-timings/{name}": {
+    "/datasources/proxy/{id}/{datasource_proxy_route}": {
       "delete": {
-        "operationId": "RouteDeleteMuteTiming",
+        "deprecated": true,
+        "description": "Proxies all calls to the actual data source.\n\nPlease refer to [updated API](#/datasources/datasourceProxyDELETEByUIDcalls) instead",
+        "operationId": "datasourceProxyDELETEcalls",
         "parameters": [
           {
-            "description": "Mute timing name",
             "in": "path",
-            "name": "name",
+            "name": "id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "datasource_proxy_route",
             "required": true,
             "schema": {
               "type": "string"
@@ -15218,22 +15992,46 @@
           }
         ],
         "responses": {
-          "204": {
-            "description": " The mute timing was deleted successfully."
+          "202": {
+            "description": "(empty)"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Delete a mute timing.",
+        "summary": "Data source proxy DELETE calls.",
         "tags": [
-          "provisioning"
+          "datasources"
         ]
       },
       "get": {
-        "operationId": "RouteGetMuteTiming",
+        "deprecated": true,
+        "description": "Proxies all calls to the actual data source.\n\nPlease refer to [updated API](#/datasources/datasourceProxyGETByUIDcalls) instead",
+        "operationId": "datasourceProxyGETcalls",
         "parameters": [
           {
-            "description": "Mute timing name",
             "in": "path",
-            "name": "name",
+            "name": "datasource_proxy_route",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "id",
             "required": true,
             "schema": {
               "type": "string"
@@ -15242,31 +16040,45 @@
         ],
         "responses": {
           "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/MuteTimeInterval"
-                }
-              }
-            },
-            "description": "MuteTimeInterval"
+            "description": "(empty)"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
           },
           "404": {
-            "description": " Not found."
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get a mute timing.",
+        "summary": "Data source proxy GET calls.",
         "tags": [
-          "provisioning"
+          "datasources"
         ]
       },
-      "put": {
-        "operationId": "RoutePutMuteTiming",
+      "post": {
+        "deprecated": true,
+        "description": "Proxies all calls to the actual data source. The data source should support POST methods for the specific path and role as defined\n\nPlease refer to [updated API](#/datasources/datasourceProxyPOSTByUIDcalls) instead",
+        "operationId": "datasourceProxyPOSTcalls",
         "parameters": [
           {
-            "description": "Mute timing name",
             "in": "path",
-            "name": "name",
+            "name": "datasource_proxy_route",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "id",
             "required": true,
             "schema": {
               "type": "string"
@@ -15276,207 +16088,137 @@
         "requestBody": {
           "content": {
             "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/MuteTimeInterval"
-              }
+              "schema": {}
             }
           },
-          "x-originalParamName": "Body"
+          "required": true,
+          "x-originalParamName": "DatasourceProxyParam"
         },
         "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/MuteTimeInterval"
-                }
-              }
-            },
-            "description": "MuteTimeInterval"
+          "201": {
+            "description": "(empty)"
+          },
+          "202": {
+            "description": "(empty)"
           },
           "400": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ValidationError"
-                }
-              }
-            },
-            "description": "ValidationError"
+            "$ref": "#/components/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Replace an existing mute timing.",
+        "summary": "Data source proxy POST calls.",
         "tags": [
-          "provisioning"
+          "datasources"
         ]
       }
     },
-    "/api/v1/provisioning/policies": {
-      "delete": {
-        "operationId": "RouteResetPolicyTree",
-        "responses": {
-          "202": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Ack"
-                }
-              }
-            },
-            "description": "Ack"
-          }
-        },
-        "summary": "Clears the notification policy tree.",
-        "tags": [
-          "provisioning"
-        ]
-      },
+    "/datasources/uid/{sourceUID}/correlations": {
       "get": {
-        "operationId": "RouteGetPolicyTree",
+        "operationId": "getCorrelationsBySourceUID",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "sourceUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
         "responses": {
           "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Route"
-                }
-              }
-            },
-            "description": "Route"
+            "$ref": "#/components/responses/getCorrelationsBySourceUIDResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get the notification policy tree.",
+        "summary": "Gets all correlations originating from the given data source.",
         "tags": [
-          "provisioning"
+          "correlations"
         ]
       },
-      "put": {
-        "operationId": "RoutePutPolicyTree",
+      "post": {
+        "operationId": "createCorrelation",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "sourceUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/Route"
+                "$ref": "#/components/schemas/CreateCorrelationCommand"
               }
             }
           },
-          "description": "The new notification routing tree to use",
-          "x-originalParamName": "Body"
+          "required": true,
+          "x-originalParamName": "body"
         },
         "responses": {
-          "202": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Ack"
-                }
-              }
-            },
-            "description": "Ack"
+          "200": {
+            "$ref": "#/components/responses/createCorrelationResponse"
           },
           "400": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ValidationError"
-                }
-              }
-            },
-            "description": "ValidationError"
-          }
-        },
-        "summary": "Sets the notification policy tree.",
-        "tags": [
-          "provisioning"
-        ]
-      }
-    },
-    "/api/v1/provisioning/policies/export": {
-      "get": {
-        "operationId": "RouteGetPolicyTreeExport",
-        "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/AlertingFileExport"
-                }
-              }
-            },
-            "description": "AlertingFileExport"
+            "$ref": "#/components/responses/badRequestError"
           },
-          "404": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/NotFound"
-                }
-              }
-            },
-            "description": "NotFound"
-          }
-        },
-        "summary": "Export the notification policy tree in provisioning file format.",
-        "tags": [
-          "provisioning"
-        ]
-      }
-    },
-    "/api/v1/provisioning/templates": {
-      "get": {
-        "operationId": "RouteGetTemplates",
-        "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/NotificationTemplates"
-                }
-              }
-            },
-            "description": "NotificationTemplates"
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
           },
           "404": {
-            "description": " Not found."
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get all notification templates.",
+        "summary": "Add correlation.",
         "tags": [
-          "provisioning"
+          "correlations"
         ]
       }
     },
-    "/api/v1/provisioning/templates/{name}": {
-      "delete": {
-        "operationId": "RouteDeleteTemplate",
+    "/datasources/uid/{sourceUID}/correlations/{correlationUID}": {
+      "get": {
+        "operationId": "getCorrelation",
         "parameters": [
           {
-            "description": "Template Name",
             "in": "path",
-            "name": "name",
+            "name": "sourceUID",
             "required": true,
             "schema": {
               "type": "string"
             }
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": " The template was deleted successfully."
-          }
-        },
-        "summary": "Delete a template.",
-        "tags": [
-          "provisioning"
-        ]
-      },
-      "get": {
-        "operationId": "RouteGetTemplate",
-        "parameters": [
+          },
           {
-            "description": "Template Name",
             "in": "path",
-            "name": "name",
+            "name": "correlationUID",
             "required": true,
             "schema": {
               "type": "string"
@@ -15485,31 +16227,37 @@
         ],
         "responses": {
           "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/NotificationTemplate"
-                }
-              }
-            },
-            "description": "NotificationTemplate"
+            "$ref": "#/components/responses/getCorrelationResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
           },
           "404": {
-            "description": " Not found."
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get a notification template.",
+        "summary": "Gets a correlation.",
         "tags": [
-          "provisioning"
+          "correlations"
         ]
       },
-      "put": {
-        "operationId": "RoutePutTemplate",
+      "patch": {
+        "operationId": "updateCorrelation",
         "parameters": [
           {
-            "description": "Template Name",
             "in": "path",
-            "name": "name",
+            "name": "sourceUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "correlationUID",
             "required": true,
             "schema": {
               "type": "string"
@@ -15520,58 +16268,93 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/NotificationTemplateContent"
+                "$ref": "#/components/schemas/UpdateCorrelationCommand"
               }
             }
           },
-          "x-originalParamName": "Body"
+          "x-originalParamName": "body"
         },
         "responses": {
-          "202": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/NotificationTemplate"
-                }
-              }
-            },
-            "description": "NotificationTemplate"
+          "200": {
+            "$ref": "#/components/responses/updateCorrelationResponse"
           },
           "400": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ValidationError"
-                }
-              }
-            },
-            "description": "ValidationError"
+            "$ref": "#/components/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Updates an existing notification template.",
+        "summary": "Updates a correlation.",
         "tags": [
-          "provisioning"
+          "correlations"
         ]
       }
     },
-    "/auth/keys": {
+    "/datasources/uid/{uid}": {
+      "delete": {
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:delete` and scopes: `datasources:*`, `datasources:uid:*` and `datasources:uid:kLtEtcRGk` (single data source).",
+        "operationId": "deleteDataSourceByUID",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "uid",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/okResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "summary": "Delete an existing data source by UID.",
+        "tags": [
+          "datasources"
+        ]
+      },
       "get": {
-        "description": "Will return auth keys.\n\nDeprecated: true.\n\nDeprecated. Please use GET /api/serviceaccounts and GET /api/serviceaccounts/{id}/tokens instead\nsee https://grafana.com/docs/grafana/next/administration/api-keys/#migrate-api-keys-to-grafana-service-accounts-using-the-api.",
-        "operationId": "getAPIkeys",
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:read` and scopes: `datasources:*`, `datasources:uid:*` and `datasources:uid:kLtEtcRGk` (single data source).",
+        "operationId": "getDataSourceByUID",
         "parameters": [
           {
-            "description": "Show expired keys",
-            "in": "query",
-            "name": "includeExpired",
+            "in": "path",
+            "name": "uid",
+            "required": true,
             "schema": {
-              "default": false,
-              "type": "boolean"
+              "type": "string"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getAPIkeyResponse"
+            "$ref": "#/components/responses/getDataSourceResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -15586,20 +16369,29 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get auth keys.",
+        "summary": "Get a single data source by UID.",
         "tags": [
-          "api_keys"
+          "datasources"
         ]
       },
-      "post": {
-        "deprecated": true,
-        "description": "Will return details of the created API key.",
-        "operationId": "addAPIkey",
+      "put": {
+        "description": "Similar to creating a data source, `password` and `basicAuthPassword` should be defined under\nsecureJsonData in order to be stored securely as an encrypted blob in the database. Then, the\nencrypted fields are listed under secureJsonFields section in the response.\n\nIf you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:write` and scopes: `datasources:*`, `datasources:uid:*` and `datasources:uid:1` (single data source).",
+        "operationId": "updateDataSourceByUID",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "uid",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/AddCommand"
+                "$ref": "#/components/schemas/UpdateDataSourceCommand"
               }
             }
           },
@@ -15608,10 +16400,7 @@
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/postAPIkeyResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
+            "$ref": "#/components/responses/createOrUpdateDatasourceResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -15619,38 +16408,40 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "409": {
-            "$ref": "#/components/responses/conflictError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Creates an API key.",
+        "summary": "Update an existing data source.",
         "tags": [
-          "api_keys"
+          "datasources"
         ]
       }
     },
-    "/auth/keys/{id}": {
+    "/datasources/uid/{uid}/correlations/{correlationUID}": {
       "delete": {
-        "deprecated": true,
-        "description": "Deletes an API key.\nDeprecated. See: https://grafana.com/docs/grafana/next/administration/api-keys/#migrate-api-keys-to-grafana-service-accounts-using-the-api.",
-        "operationId": "deleteAPIkey",
+        "operationId": "deleteCorrelation",
         "parameters": [
           {
             "in": "path",
-            "name": "id",
+            "name": "uid",
             "required": true,
             "schema": {
-              "format": "int64",
-              "type": "integer"
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "correlationUID",
+            "required": true,
+            "schema": {
+              "type": "string"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
+            "$ref": "#/components/responses/deleteCorrelationResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -15665,117 +16456,72 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Delete API key.",
+        "summary": "Delete a correlation.",
         "tags": [
-          "api_keys"
+          "correlations"
         ]
       }
     },
-    "/dashboard/snapshots": {
+    "/datasources/uid/{uid}/health": {
       "get": {
-        "operationId": "searchDashboardSnapshots",
+        "operationId": "checkDatasourceHealthWithUID",
         "parameters": [
           {
-            "description": "Search Query",
-            "in": "query",
-            "name": "query",
+            "in": "path",
+            "name": "uid",
+            "required": true,
             "schema": {
               "type": "string"
             }
-          },
-          {
-            "description": "Limit the number of returned results",
-            "in": "query",
-            "name": "limit",
-            "schema": {
-              "default": 1000,
-              "format": "int64",
-              "type": "integer"
-            }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/searchDashboardSnapshotsResponse"
+            "$ref": "#/components/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
           },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "List snapshots.",
+        "summary": "Sends a health check request to the plugin datasource identified by the UID.",
         "tags": [
-          "snapshots"
+          "datasources"
         ]
       }
     },
-    "/dashboards/calculate-diff": {
-      "post": {
-        "operationId": "calculateDashboardDiff",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "properties": {
-                  "base": {
-                    "$ref": "#/components/schemas/CalculateDiffTarget"
-                  },
-                  "diffType": {
-                    "description": "The type of diff to return\nDescription:\n`basic`\n`json`",
-                    "enum": [
-                      "basic",
-                      "json"
-                    ],
-                    "type": "string"
-                  },
-                  "new": {
-                    "$ref": "#/components/schemas/CalculateDiffTarget"
-                  }
-                },
-                "type": "object"
-              }
+    "/datasources/uid/{uid}/resources/{datasource_proxy_route}": {
+      "get": {
+        "operationId": "callDatasourceResourceWithUID",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "datasource_proxy_route",
+            "required": true,
+            "schema": {
+              "type": "string"
             }
           },
-          "required": true,
-          "x-originalParamName": "Body"
-        },
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/calculateDashboardDiffResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
-          }
-        },
-        "summary": "Perform diff on two dashboards.",
-        "tags": [
-          "dashboards"
-        ]
-      }
-    },
-    "/dashboards/db": {
-      "post": {
-        "description": "Creates a new dashboard or updates an existing dashboard.",
-        "operationId": "postDashboard",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/SaveDashboardCommand"
-              }
+          {
+            "in": "path",
+            "name": "uid",
+            "required": true,
+            "schema": {
+              "type": "string"
             }
-          },
-          "required": true,
-          "x-originalParamName": "Body"
-        },
+          }
+        ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/postDashboardResponse"
+            "$ref": "#/components/responses/okResponse"
           },
           "400": {
             "$ref": "#/components/responses/badRequestError"
@@ -15789,61 +16535,34 @@
           "404": {
             "$ref": "#/components/responses/notFoundError"
           },
-          "412": {
-            "$ref": "#/components/responses/preconditionFailedError"
-          },
-          "422": {
-            "$ref": "#/components/responses/unprocessableEntityError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
-          }
-        },
-        "summary": "Create / Update dashboard",
-        "tags": [
-          "dashboards"
-        ]
-      }
-    },
-    "/dashboards/home": {
-      "get": {
-        "operationId": "getHomeDashboard",
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/getHomeDashboardResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get home dashboard.",
+        "summary": "Fetch data source resources.",
         "tags": [
-          "dashboards"
+          "datasources"
         ]
       }
     },
-    "/dashboards/id/{DashboardID}/permissions": {
-      "get": {
+    "/datasources/{id}": {
+      "delete": {
         "deprecated": true,
-        "description": "Please refer to [updated API](#/dashboard_permissions/getDashboardPermissionsListByUID) instead",
-        "operationId": "getDashboardPermissionsListByID",
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:delete` and scopes: `datasources:*`, `datasources:id:*` and `datasources:id:1` (single data source).\n\nPlease refer to [updated API](#/datasources/deleteDataSourceByUID) instead",
+        "operationId": "deleteDataSourceByID",
         "parameters": [
           {
             "in": "path",
-            "name": "DashboardID",
+            "name": "id",
             "required": true,
             "schema": {
-              "format": "int64",
-              "type": "integer"
+              "type": "string"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getDashboardPermissionsListResponse"
+            "$ref": "#/components/responses/okResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -15858,40 +16577,28 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Gets all existing permissions for the given dashboard.",
+        "summary": "Delete an existing data source by id.",
         "tags": [
-          "dashboard_permissions"
+          "datasources"
         ]
       },
-      "post": {
+      "get": {
         "deprecated": true,
-        "description": "Please refer to [updated API](#/dashboard_permissions/updateDashboardPermissionsByUID) instead\n\nThis operation will remove existing permissions if they’re not included in the request.",
-        "operationId": "updateDashboardPermissionsByID",
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:read` and scopes: `datasources:*`, `datasources:id:*` and `datasources:id:1` (single data source).\n\nPlease refer to [updated API](#/datasources/getDataSourceByUID) instead",
+        "operationId": "getDataSourceByID",
         "parameters": [
           {
             "in": "path",
-            "name": "DashboardID",
+            "name": "id",
             "required": true,
             "schema": {
-              "format": "int64",
-              "type": "integer"
+              "type": "string"
             }
           }
         ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/UpdateDashboardACLCommand"
-              }
-            }
-          },
-          "required": true,
-          "x-originalParamName": "Body"
-        },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
+            "$ref": "#/components/responses/getDataSourceResponse"
           },
           "400": {
             "$ref": "#/components/responses/badRequestError"
@@ -15909,25 +16616,22 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Updates permissions for a dashboard.",
+        "summary": "Get a single data source by Id.",
         "tags": [
-          "dashboard_permissions"
+          "datasources"
         ]
-      }
-    },
-    "/dashboards/id/{DashboardID}/restore": {
-      "post": {
+      },
+      "put": {
         "deprecated": true,
-        "description": "Please refer to [updated API](#/dashboard_versions/restoreDashboardVersionByUID) instead",
-        "operationId": "restoreDashboardVersionByID",
+        "description": "Similar to creating a data source, `password` and `basicAuthPassword` should be defined under\nsecureJsonData in order to be stored securely as an encrypted blob in the database. Then, the\nencrypted fields are listed under secureJsonFields section in the response.\n\nIf you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:write` and scopes: `datasources:*`, `datasources:id:*` and `datasources:id:1` (single data source).\n\nPlease refer to [updated API](#/datasources/updateDataSourceByUID) instead",
+        "operationId": "updateDataSourceByID",
         "parameters": [
           {
             "in": "path",
-            "name": "DashboardID",
+            "name": "id",
             "required": true,
             "schema": {
-              "format": "int64",
-              "type": "integer"
+              "type": "string"
             }
           }
         ],
@@ -15935,7 +16639,7 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/RestoreDashboardVersionCommand"
+                "$ref": "#/components/schemas/UpdateDataSourceCommand"
               }
             }
           },
@@ -15944,7 +16648,7 @@
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/postDashboardResponse"
+            "$ref": "#/components/responses/createOrUpdateDatasourceResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -15952,38 +16656,37 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Restore a dashboard to a given dashboard version.",
+        "summary": "Update an existing data source by its sequential ID.",
         "tags": [
-          "dashboard_versions"
+          "datasources"
         ]
       }
     },
-    "/dashboards/id/{DashboardID}/versions": {
+    "/datasources/{id}/health": {
       "get": {
         "deprecated": true,
-        "description": "Please refer to [updated API](#/dashboard_versions/getDashboardVersionsByUID) instead",
-        "operationId": "getDashboardVersionsByID",
+        "description": "Please refer to [updated API](#/datasources/checkDatasourceHealthWithUID) instead",
+        "operationId": "checkDatasourceHealthByID",
         "parameters": [
           {
             "in": "path",
-            "name": "DashboardID",
+            "name": "id",
             "required": true,
             "schema": {
-              "format": "int64",
-              "type": "integer"
+              "type": "string"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/dashboardVersionsResponse"
+            "$ref": "#/components/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -15991,47 +16694,45 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Gets all existing versions for the dashboard.",
+        "summary": "Sends a health check request to the plugin datasource identified by the ID.",
         "tags": [
-          "dashboard_versions"
+          "datasources"
         ]
       }
     },
-    "/dashboards/id/{DashboardID}/versions/{DashboardVersionID}": {
+    "/datasources/{id}/resources/{datasource_proxy_route}": {
       "get": {
         "deprecated": true,
-        "description": "Please refer to [updated API](#/dashboard_versions/getDashboardVersionByUID) instead",
-        "operationId": "getDashboardVersionByID",
+        "description": "Please refer to [updated API](#/datasources/callDatasourceResourceWithUID) instead",
+        "operationId": "callDatasourceResourceByID",
         "parameters": [
           {
             "in": "path",
-            "name": "DashboardID",
+            "name": "datasource_proxy_route",
             "required": true,
             "schema": {
-              "format": "int64",
-              "type": "integer"
+              "type": "string"
             }
           },
           {
             "in": "path",
-            "name": "DashboardVersionID",
+            "name": "id",
             "required": true,
             "schema": {
-              "format": "int64",
-              "type": "integer"
+              "type": "string"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/dashboardVersionResponse"
+            "$ref": "#/components/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -16046,29 +16747,33 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get a specific dashboard version.",
+        "summary": "Fetch data source resources by Id.",
         "tags": [
-          "dashboard_versions"
+          "datasources"
         ]
       }
     },
-    "/dashboards/import": {
+    "/ds/query": {
       "post": {
-        "operationId": "importDashboard",
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:query`.",
+        "operationId": "queryMetricsWithExpressions",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/ImportDashboardRequest"
+                "$ref": "#/components/schemas/MetricRequest"
               }
             }
           },
           "required": true,
-          "x-originalParamName": "Body"
+          "x-originalParamName": "body"
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/importDashboardResponse"
+            "$ref": "#/components/responses/queryMetricsWithExpressionsRespons"
+          },
+          "207": {
+            "$ref": "#/components/responses/queryMetricsWithExpressionsRespons"
           },
           "400": {
             "$ref": "#/components/responses/badRequestError"
@@ -16076,90 +16781,144 @@
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
-          "412": {
-            "$ref": "#/components/responses/preconditionFailedError"
-          },
-          "422": {
-            "$ref": "#/components/responses/unprocessableEntityError"
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
           },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Import dashboard.",
+        "summary": "DataSource query metrics with expressions.",
         "tags": [
-          "dashboards"
+          "ds"
         ]
       }
     },
-    "/dashboards/tags": {
+    "/folders": {
       "get": {
-        "operationId": "getDashboardTags",
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/getDashboardsTagsResponse"
+        "description": "It returns all folders that the authenticated user has permission to view.\nIf nested folders are enabled, it expects an additional query parameter with the parent folder UID\nand returns the immediate subfolders that the authenticated user has permission to view.\nIf the parameter is not supplied then it returns immediate subfolders under the root\nthat the authenticated user has permission to view.",
+        "operationId": "getFolders",
+        "parameters": [
+          {
+            "description": "Limit the maximum number of folders to return",
+            "in": "query",
+            "name": "limit",
+            "schema": {
+              "default": 1000,
+              "format": "int64",
+              "type": "integer"
+            }
+          },
+          {
+            "description": "Page index for starting fetching folders",
+            "in": "query",
+            "name": "page",
+            "schema": {
+              "default": 1,
+              "format": "int64",
+              "type": "integer"
+            }
+          },
+          {
+            "description": "The parent folder UID",
+            "in": "query",
+            "name": "parentUid",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "description": "Set to `Edit` to return folders that the user can edit",
+            "in": "query",
+            "name": "permission",
+            "schema": {
+              "default": "View",
+              "enum": [
+                "Edit",
+                "View"
+              ],
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/getFoldersResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get all dashboards tags of an organisation.",
+        "summary": "Get all folders.",
         "tags": [
-          "dashboards"
+          "folders"
         ]
-      }
-    },
-    "/dashboards/trim": {
+      },
       "post": {
-        "operationId": "trimDashboard",
+        "description": "If nested folders are enabled then it additionally expects the parent folder UID.",
+        "operationId": "createFolder",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/TrimDashboardCommand"
+                "$ref": "#/components/schemas/CreateFolderCommand"
               }
             }
           },
           "required": true,
-          "x-originalParamName": "Body"
+          "x-originalParamName": "body"
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/trimDashboardResponse"
+            "$ref": "#/components/responses/folderResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "409": {
+            "$ref": "#/components/responses/conflictError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Trim defaults from dashboard.",
+        "summary": "Create folder.",
         "tags": [
-          "dashboards"
+          "folders"
         ]
       }
     },
-    "/dashboards/uid/{uid}": {
-      "delete": {
-        "description": "Will delete the dashboard given the specified unique identifier (uid).",
-        "operationId": "deleteDashboardByUID",
+    "/folders/id/{folder_id}": {
+      "get": {
+        "deprecated": true,
+        "description": "Returns the folder identified by id. This is deprecated.\nPlease refer to [updated API](#/folders/getFolderByUID) instead",
+        "operationId": "getFolderByID",
         "parameters": [
           {
             "in": "path",
-            "name": "uid",
+            "name": "folder_id",
             "required": true,
             "schema": {
-              "type": "string"
+              "format": "int64",
+              "type": "integer"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/deleteDashboardResponse"
+            "$ref": "#/components/responses/folderResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -16174,27 +16933,41 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Delete dashboard by uid.",
+        "summary": "Get folder by id.",
         "tags": [
-          "dashboards"
+          "folders"
         ]
-      },
-      "get": {
-        "description": "Will return the dashboard given the dashboard unique identifier (uid).",
-        "operationId": "getDashboardByUID",
+      }
+    },
+    "/folders/{folder_uid}": {
+      "delete": {
+        "description": "Deletes an existing folder identified by UID along with all dashboards (and their alerts) stored in the folder. This operation cannot be reverted.\nIf nested folders are enabled then it also deletes all the subfolders.",
+        "operationId": "deleteFolder",
         "parameters": [
           {
             "in": "path",
-            "name": "uid",
+            "name": "folder_uid",
             "required": true,
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "description": "If `true` any Grafana 8 Alerts under this folder will be deleted.\nSet to `false` so that the request will fail if the folder contains any Grafana 8 Alerts.",
+            "in": "query",
+            "name": "forceDeleteRules",
+            "schema": {
+              "default": false,
+              "type": "boolean"
+            }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/dashboardResponse"
+            "$ref": "#/components/responses/deleteFolderResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -16209,19 +16982,17 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get dashboard by uid.",
+        "summary": "Delete folder.",
         "tags": [
-          "dashboards"
+          "folders"
         ]
-      }
-    },
-    "/dashboards/uid/{uid}/permissions": {
+      },
       "get": {
-        "operationId": "getDashboardPermissionsListByUID",
+        "operationId": "getFolderByUID",
         "parameters": [
           {
             "in": "path",
-            "name": "uid",
+            "name": "folder_uid",
             "required": true,
             "schema": {
               "type": "string"
@@ -16230,7 +17001,7 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getDashboardPermissionsListResponse"
+            "$ref": "#/components/responses/folderResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -16245,18 +17016,17 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Gets all existing permissions for the given dashboard.",
+        "summary": "Get folder by uid.",
         "tags": [
-          "dashboard_permissions"
+          "folders"
         ]
       },
-      "post": {
-        "description": "This operation will remove existing permissions if they’re not included in the request.",
-        "operationId": "updateDashboardPermissionsByUID",
+      "put": {
+        "operationId": "updateFolder",
         "parameters": [
           {
             "in": "path",
-            "name": "uid",
+            "name": "folder_uid",
             "required": true,
             "schema": {
               "type": "string"
@@ -16267,16 +17037,17 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/UpdateDashboardACLCommand"
+                "$ref": "#/components/schemas/UpdateFolderCommand"
               }
             }
           },
+          "description": "To change the unique identifier (uid), provide another one.\nTo overwrite an existing folder with newer version, set `overwrite` to `true`.\nProvide the current version to safelly update the folder: if the provided version differs from the stored one the request will fail, unless `overwrite` is `true`.",
           "required": true,
-          "x-originalParamName": "Body"
+          "x-originalParamName": "body"
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
+            "$ref": "#/components/responses/folderResponse"
           },
           "400": {
             "$ref": "#/components/responses/badRequestError"
@@ -16290,43 +17061,35 @@
           "404": {
             "$ref": "#/components/responses/notFoundError"
           },
+          "409": {
+            "$ref": "#/components/responses/conflictError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Updates permissions for a dashboard.",
+        "summary": "Update folder.",
         "tags": [
-          "dashboard_permissions"
+          "folders"
         ]
       }
     },
-    "/dashboards/uid/{uid}/restore": {
-      "post": {
-        "operationId": "restoreDashboardVersionByUID",
+    "/folders/{folder_uid}/counts": {
+      "get": {
+        "operationId": "getFolderDescendantCounts",
         "parameters": [
           {
             "in": "path",
-            "name": "uid",
+            "name": "folder_uid",
             "required": true,
             "schema": {
               "type": "string"
             }
           }
         ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/RestoreDashboardVersionCommand"
-              }
-            }
-          },
-          "required": true,
-          "x-originalParamName": "Body"
-        },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/postDashboardResponse"
+            "$ref": "#/components/responses/getFolderDescendantCountsResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -16341,48 +17104,39 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Restore a dashboard to a given dashboard version using UID.",
+        "summary": "Gets the count of each descendant of a folder by kind. The folder is identified by UID.",
         "tags": [
-          "dashboard_versions"
+          "folders"
         ]
       }
     },
-    "/dashboards/uid/{uid}/versions": {
-      "get": {
-        "operationId": "getDashboardVersionsByUID",
+    "/folders/{folder_uid}/move": {
+      "post": {
+        "operationId": "moveFolder",
         "parameters": [
           {
             "in": "path",
-            "name": "uid",
+            "name": "folder_uid",
             "required": true,
             "schema": {
               "type": "string"
             }
-          },
-          {
-            "description": "Maximum number of results to return",
-            "in": "query",
-            "name": "limit",
-            "schema": {
-              "default": 0,
-              "format": "int64",
-              "type": "integer"
-            }
-          },
-          {
-            "description": "Version to start from when returning queries",
-            "in": "query",
-            "name": "start",
-            "schema": {
-              "default": 0,
-              "format": "int64",
-              "type": "integer"
-            }
           }
         ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/MoveFolderCommand"
+              }
+            }
+          },
+          "required": true,
+          "x-originalParamName": "body"
+        },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/dashboardVersionsResponse"
+            "$ref": "#/components/responses/folderResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -16397,28 +17151,19 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Gets all existing versions for the dashboard using UID.",
+        "summary": "Move folder.",
         "tags": [
-          "dashboard_versions"
+          "folders"
         ]
       }
     },
-    "/dashboards/uid/{uid}/versions/{DashboardVersionID}": {
+    "/folders/{folder_uid}/permissions": {
       "get": {
-        "operationId": "getDashboardVersionByUID",
+        "operationId": "getFolderPermissionList",
         "parameters": [
           {
             "in": "path",
-            "name": "DashboardVersionID",
-            "required": true,
-            "schema": {
-              "format": "int64",
-              "type": "integer"
-            }
-          },
-          {
-            "in": "path",
-            "name": "uid",
+            "name": "folder_uid",
             "required": true,
             "schema": {
               "type": "string"
@@ -16427,7 +17172,7 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/dashboardVersionResponse"
+            "$ref": "#/components/responses/getFolderPermissionListResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -16442,43 +17187,28 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get a specific dashboard version using UID.",
+        "summary": "Gets all existing permissions for the folder with the given `uid`.",
         "tags": [
-          "dashboard_versions"
-        ]
-      }
-    },
-    "/datasources": {
-      "get": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:read` and scope: `datasources:*`.",
-        "operationId": "getDataSources",
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/getDataSourcesResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
-          }
-        },
-        "summary": "Get all data sources.",
-        "tags": [
-          "datasources"
+          "folder_permissions"
         ]
       },
       "post": {
-        "description": "By defining `password` and `basicAuthPassword` under secureJsonData property\nGrafana encrypts them securely as an encrypted blob in the database.\nThe response then lists the encrypted fields under secureJsonFields.\n\nIf you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:create`",
-        "operationId": "addDataSource",
+        "operationId": "updateFolderPermissions",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "folder_uid",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/AddDataSourceCommand"
+                "$ref": "#/components/schemas/UpdateDashboardACLCommand"
               }
             }
           },
@@ -16487,7 +17217,7 @@
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/createOrUpdateDatasourceResponse"
+            "$ref": "#/components/responses/okResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -16495,63 +17225,145 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "409": {
-            "$ref": "#/components/responses/conflictError"
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
           },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Create a data source.",
+        "summary": "Updates permissions for a folder. This operation will remove existing permissions if they’re not included in the request.",
         "tags": [
-          "datasources"
+          "folder_permissions"
         ]
       }
     },
-    "/datasources/correlations": {
+    "/library-elements": {
       "get": {
-        "operationId": "getCorrelations",
+        "description": "Returns a list of all library elements the authenticated user has permission to view.\nUse the `perPage` query parameter to control the maximum number of library elements returned; the default limit is `100`.\nYou can also use the `page` query parameter to fetch library elements from any page other than the first one.",
+        "operationId": "getLibraryElements",
         "parameters": [
           {
-            "description": "Limit the maximum number of correlations to return per page",
+            "description": "Part of the name or description searched for.",
             "in": "query",
-            "name": "limit",
+            "name": "searchString",
             "schema": {
-              "default": 100,
+              "type": "string"
+            }
+          },
+          {
+            "description": "Kind of element to search for.",
+            "in": "query",
+            "name": "kind",
+            "schema": {
+              "enum": [
+                1,
+                2
+              ],
               "format": "int64",
-              "maximum": 1000,
               "type": "integer"
             }
           },
           {
-            "description": "Page index for starting fetching correlations",
+            "description": "Sort order of elements.",
             "in": "query",
-            "name": "page",
+            "name": "sortDirection",
             "schema": {
-              "default": 1,
+              "enum": [
+                "alpha-asc",
+                "alpha-desc"
+              ],
+              "type": "string"
+            }
+          },
+          {
+            "description": "A comma separated list of types to filter the elements by",
+            "in": "query",
+            "name": "typeFilter",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "description": "Element UID to exclude from search results.",
+            "in": "query",
+            "name": "excludeUid",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "description": "A comma separated list of folder ID(s) to filter the elements by.",
+            "in": "query",
+            "name": "folderFilter",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "description": "The number of results per page.",
+            "in": "query",
+            "name": "perPage",
+            "schema": {
+              "default": 100,
               "format": "int64",
               "type": "integer"
             }
           },
           {
-            "description": "Source datasource UID filter to be applied to correlations",
+            "description": "The page for a set of records, given that only perPage records are returned at a time. Numbering starts at 1.",
             "in": "query",
-            "name": "sourceUID",
+            "name": "page",
             "schema": {
-              "items": {
-                "type": "string"
-              },
-              "type": "array"
+              "default": 1,
+              "format": "int64",
+              "type": "integer"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getCorrelationsResponse"
+            "$ref": "#/components/responses/getLibraryElementsResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "summary": "Get all library elements.",
+        "tags": [
+          "library_elements"
+        ]
+      },
+      "post": {
+        "description": "Creates a new library element.",
+        "operationId": "createLibraryElement",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateLibraryElementCommand"
+              }
+            }
+          },
+          "required": true,
+          "x-originalParamName": "body"
+        },
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/getLibraryElementResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
           "404": {
             "$ref": "#/components/responses/notFoundError"
           },
@@ -16559,20 +17371,20 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Gets all correlations.",
+        "summary": "Create library element.",
         "tags": [
-          "correlations"
+          "library_elements"
         ]
       }
     },
-    "/datasources/id/{name}": {
+    "/library-elements/name/{library_element_name}": {
       "get": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:read` and scopes: `datasources:*`, `datasources:name:*` and `datasources:name:test_datasource` (single data source).",
-        "operationId": "getDataSourceIdByName",
+        "description": "Returns a library element with the given name.",
+        "operationId": "getLibraryElementByName",
         "parameters": [
           {
             "in": "path",
-            "name": "name",
+            "name": "library_element_name",
             "required": true,
             "schema": {
               "type": "string"
@@ -16581,14 +17393,11 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getDataSourceIDResponse"
+            "$ref": "#/components/responses/getLibraryElementArrayResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
           "404": {
             "$ref": "#/components/responses/notFoundError"
           },
@@ -16596,20 +17405,20 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get data source Id by Name.",
+        "summary": "Get library element by name.",
         "tags": [
-          "datasources"
+          "library_elements"
         ]
       }
     },
-    "/datasources/name/{name}": {
+    "/library-elements/{library_element_uid}": {
       "delete": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:delete` and scopes: `datasources:*`, `datasources:name:*` and `datasources:name:test_datasource` (single data source).",
-        "operationId": "deleteDataSourceByName",
+        "description": "Deletes an existing library element as specified by the UID. This operation cannot be reverted.\nYou cannot delete a library element that is connected. This operation cannot be reverted.",
+        "operationId": "deleteLibraryElementByUID",
         "parameters": [
           {
             "in": "path",
-            "name": "name",
+            "name": "library_element_uid",
             "required": true,
             "schema": {
               "type": "string"
@@ -16618,7 +17427,10 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/deleteDataSourceByNameResponse"
+            "$ref": "#/components/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -16633,18 +17445,18 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Delete an existing data source by name.",
+        "summary": "Delete library element.",
         "tags": [
-          "datasources"
+          "library_elements"
         ]
       },
       "get": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:read` and scopes: `datasources:*`, `datasources:name:*` and `datasources:name:test_datasource` (single data source).",
-        "operationId": "getDataSourceByName",
+        "description": "Returns a library element with the given UID.",
+        "operationId": "getLibraryElementByUID",
         "parameters": [
           {
             "in": "path",
-            "name": "name",
+            "name": "library_element_uid",
             "required": true,
             "schema": {
               "type": "string"
@@ -16653,7 +17465,7 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getDataSourceResponse"
+            "$ref": "#/components/responses/getLibraryElementResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -16661,41 +17473,45 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get a single data source by Name.",
+        "summary": "Get library element by UID.",
         "tags": [
-          "datasources"
+          "library_elements"
         ]
-      }
-    },
-    "/datasources/proxy/uid/{uid}/{datasource_proxy_route}": {
-      "delete": {
-        "description": "Proxies all calls to the actual data source.",
-        "operationId": "datasourceProxyDELETEByUIDcalls",
+      },
+      "patch": {
+        "description": "Updates an existing library element identified by uid.",
+        "operationId": "updateLibraryElement",
         "parameters": [
           {
             "in": "path",
-            "name": "uid",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "datasource_proxy_route",
+            "name": "library_element_uid",
             "required": true,
             "schema": {
               "type": "string"
             }
           }
         ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PatchLibraryElementCommand"
+              }
+            }
+          },
+          "required": true,
+          "x-originalParamName": "body"
+        },
         "responses": {
-          "202": {
-            "description": "(empty)"
+          "200": {
+            "$ref": "#/components/responses/getLibraryElementResponse"
           },
           "400": {
             "$ref": "#/components/responses/badRequestError"
@@ -16709,42 +17525,36 @@
           "404": {
             "$ref": "#/components/responses/notFoundError"
           },
+          "412": {
+            "$ref": "#/components/responses/preconditionFailedError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Data source proxy DELETE calls.",
+        "summary": "Update library element.",
         "tags": [
-          "datasources"
+          "library_elements"
         ]
-      },
+      }
+    },
+    "/library-elements/{library_element_uid}/connections/": {
       "get": {
-        "description": "Proxies all calls to the actual data source.",
-        "operationId": "datasourceProxyGETByUIDcalls",
+        "description": "Returns a list of connections for a library element based on the UID specified.",
+        "operationId": "getLibraryElementConnections",
         "parameters": [
           {
             "in": "path",
-            "name": "datasource_proxy_route",
+            "name": "library_element_uid",
             "required": true,
             "schema": {
               "type": "string"
             }
-          },
-          {
-            "in": "path",
-            "name": "uid",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "(empty)"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/getLibraryElementConnectionsResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -16759,202 +17569,98 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Data source proxy GET calls.",
+        "summary": "Get library element connections.",
         "tags": [
-          "datasources"
+          "library_elements"
         ]
-      },
-      "post": {
-        "description": "Proxies all calls to the actual data source. The data source should support POST methods for the specific path and role as defined",
-        "operationId": "datasourceProxyPOSTByUIDcalls",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "datasource_proxy_route",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "uid",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
+      }
+    },
+    "/licensing/check": {
+      "get": {
+        "operationId": "getStatus",
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/getStatusResponse"
           }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {}
-            }
-          },
-          "required": true,
-          "x-originalParamName": "DatasourceProxyParam"
         },
+        "summary": "Check license availability.",
+        "tags": [
+          "licensing",
+          "enterprise"
+        ]
+      }
+    },
+    "/licensing/custom-permissions": {
+      "get": {
+        "deprecated": true,
+        "description": "You need to have a permission with action `licensing.reports:read`.",
+        "operationId": "getCustomPermissionsReport",
         "responses": {
-          "201": {
-            "description": "(empty)"
-          },
-          "202": {
-            "description": "(empty)"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Data source proxy POST calls.",
+        "summary": "Get custom permissions report.",
         "tags": [
-          "datasources"
+          "licensing",
+          "enterprise"
         ]
       }
     },
-    "/datasources/proxy/{id}/{datasource_proxy_route}": {
-      "delete": {
+    "/licensing/custom-permissions-csv": {
+      "get": {
         "deprecated": true,
-        "description": "Proxies all calls to the actual data source.\n\nPlease refer to [updated API](#/datasources/datasourceProxyDELETEByUIDcalls) instead",
-        "operationId": "datasourceProxyDELETEcalls",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "id",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "datasource_proxy_route",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
+        "description": "You need to have a permission with action `licensing.reports:read`.",
+        "operationId": "getCustomPermissionsCSV",
         "responses": {
-          "202": {
-            "description": "(empty)"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Data source proxy DELETE calls.",
+        "summary": "Get custom permissions report in CSV format.",
         "tags": [
-          "datasources"
+          "licensing",
+          "enterprise"
         ]
-      },
+      }
+    },
+    "/licensing/refresh-stats": {
       "get": {
-        "deprecated": true,
-        "description": "Proxies all calls to the actual data source.\n\nPlease refer to [updated API](#/datasources/datasourceProxyGETByUIDcalls) instead",
-        "operationId": "datasourceProxyGETcalls",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "datasource_proxy_route",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "id",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
+        "description": "You need to have a permission with action `licensing:read`.",
+        "operationId": "refreshLicenseStats",
         "responses": {
           "200": {
-            "description": "(empty)"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
+            "$ref": "#/components/responses/refreshLicenseStatsResponse"
           },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Data source proxy GET calls.",
+        "summary": "Refresh license stats.",
         "tags": [
-          "datasources"
+          "licensing",
+          "enterprise"
         ]
-      },
-      "post": {
-        "deprecated": true,
-        "description": "Proxies all calls to the actual data source. The data source should support POST methods for the specific path and role as defined\n\nPlease refer to [updated API](#/datasources/datasourceProxyPOSTByUIDcalls) instead",
-        "operationId": "datasourceProxyPOSTcalls",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "datasource_proxy_route",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "id",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
+      }
+    },
+    "/licensing/token": {
+      "delete": {
+        "description": "Removes the license stored in the Grafana database. Available in Grafana Enterprise v7.4+.\n\nYou need to have a permission with action `licensing:delete`.",
+        "operationId": "deleteLicenseToken",
         "requestBody": {
           "content": {
             "application/json": {
-              "schema": {}
+              "schema": {
+                "$ref": "#/components/schemas/DeleteTokenCommand"
+              }
             }
           },
           "required": true,
-          "x-originalParamName": "DatasourceProxyParam"
+          "x-originalParamName": "body"
         },
         "responses": {
-          "201": {
-            "description": "(empty)"
-          },
           "202": {
-            "description": "(empty)"
+            "$ref": "#/components/responses/acceptedResponse"
           },
           "400": {
             "$ref": "#/components/responses/badRequestError"
@@ -16965,68 +17671,41 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
+          "422": {
+            "$ref": "#/components/responses/unprocessableEntityError"
           },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Data source proxy POST calls.",
+        "summary": "Remove license from database.",
         "tags": [
-          "datasources"
+          "licensing",
+          "enterprise"
         ]
-      }
-    },
-    "/datasources/uid/{sourceUID}/correlations": {
+      },
       "get": {
-        "operationId": "getCorrelationsBySourceUID",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "sourceUID",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
+        "description": "You need to have a permission with action `licensing:read`.",
+        "operationId": "getLicenseToken",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getCorrelationsBySourceUIDResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+            "$ref": "#/components/responses/getLicenseTokenResponse"
           }
         },
-        "summary": "Gets all correlations originating from the given data source.",
+        "summary": "Get license token.",
         "tags": [
-          "correlations"
+          "licensing",
+          "enterprise"
         ]
       },
       "post": {
-        "operationId": "createCorrelation",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "sourceUID",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
+        "description": "You need to have a permission with action `licensing:update`.",
+        "operationId": "postLicenseToken",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/CreateCorrelationCommand"
+                "$ref": "#/components/schemas/DeleteTokenCommand"
               }
             }
           },
@@ -17035,16 +17714,58 @@
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/createCorrelationResponse"
+            "$ref": "#/components/responses/getLicenseTokenResponse"
           },
           "400": {
             "$ref": "#/components/responses/badRequestError"
+          }
+        },
+        "summary": "Create license token.",
+        "tags": [
+          "licensing",
+          "enterprise"
+        ]
+      }
+    },
+    "/licensing/token/renew": {
+      "post": {
+        "description": "Manually ask license issuer for a new token. Available in Grafana Enterprise v7.4+.\n\nYou need to have a permission with action `licensing:update`.",
+        "operationId": "postRenewLicenseToken",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object"
+              }
+            }
+          },
+          "required": true,
+          "x-originalParamName": "body"
+        },
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/postRenewLicenseTokenResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          }
+        },
+        "summary": "Manually force license refresh.",
+        "tags": [
+          "licensing",
+          "enterprise"
+        ]
+      }
+    },
+    "/logout/saml": {
+      "get": {
+        "operationId": "getSAMLLogout",
+        "responses": {
+          "302": {
+            "description": "(empty)"
           },
           "404": {
             "$ref": "#/components/responses/notFoundError"
@@ -17053,85 +17774,51 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Add correlation.",
+        "summary": "GetLogout initiates single logout process.",
         "tags": [
-          "correlations"
+          "saml",
+          "enterprise"
         ]
       }
     },
-    "/datasources/uid/{sourceUID}/correlations/{correlationUID}": {
+    "/org": {
       "get": {
-        "operationId": "getCorrelation",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "sourceUID",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "correlationUID",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
+        "operationId": "getCurrentOrg",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getCorrelationResponse"
+            "$ref": "#/components/responses/getCurrentOrgResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
           },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Gets a correlation.",
+        "summary": "Get current Organization.",
         "tags": [
-          "correlations"
+          "org"
         ]
       },
-      "patch": {
-        "operationId": "updateCorrelation",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "sourceUID",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "correlationUID",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
+      "put": {
+        "operationId": "updateCurrentOrg",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/UpdateCorrelationCommand"
+                "$ref": "#/components/schemas/UpdateOrgForm"
               }
             }
           },
+          "required": true,
           "x-originalParamName": "body"
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/updateCorrelationResponse"
+            "$ref": "#/components/responses/okResponse"
           },
           "400": {
             "$ref": "#/components/responses/badRequestError"
@@ -17142,74 +17829,59 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Updates a correlation.",
+        "summary": "Update current Organization.",
         "tags": [
-          "correlations"
+          "org"
         ]
       }
     },
-    "/datasources/uid/{uid}": {
-      "delete": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:delete` and scopes: `datasources:*`, `datasources:uid:*` and `datasources:uid:kLtEtcRGk` (single data source).",
-        "operationId": "deleteDataSourceByUID",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "uid",
-            "required": true,
-            "schema": {
-              "type": "string"
+    "/org/address": {
+      "put": {
+        "operationId": "updateCurrentOrgAddress",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateOrgAddressForm"
+              }
             }
-          }
-        ],
+          },
+          "required": true,
+          "x-originalParamName": "body"
+        },
         "responses": {
           "200": {
             "$ref": "#/components/responses/okResponse"
           },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
+          },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Delete an existing data source by UID.",
+        "summary": "Update current Organization's address.",
         "tags": [
-          "datasources"
+          "org"
         ]
-      },
+      }
+    },
+    "/org/invites": {
       "get": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:read` and scopes: `datasources:*`, `datasources:uid:*` and `datasources:uid:kLtEtcRGk` (single data source).",
-        "operationId": "getDataSourceByUID",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "uid",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
+        "operationId": "getPendingOrgInvites",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getDataSourceResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
+            "$ref": "#/components/responses/getPendingOrgInvitesResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -17217,45 +17889,34 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get a single data source by UID.",
+        "summary": "Get pending invites.",
         "tags": [
-          "datasources"
+          "org_invites"
         ]
       },
-      "put": {
-        "description": "Similar to creating a data source, `password` and `basicAuthPassword` should be defined under\nsecureJsonData in order to be stored securely as an encrypted blob in the database. Then, the\nencrypted fields are listed under secureJsonFields section in the response.\n\nIf you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:write` and scopes: `datasources:*`, `datasources:uid:*` and `datasources:uid:1` (single data source).",
-        "operationId": "updateDataSourceByUID",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "uid",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
+      "post": {
+        "operationId": "addOrgInvite",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/UpdateDataSourceCommand"
+                "$ref": "#/components/schemas/AddInviteForm"
               }
             }
           },
           "required": true,
-          "x-originalParamName": "Body"
+          "x-originalParamName": "body"
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/createOrUpdateDatasourceResponse"
+            "$ref": "#/components/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -17263,31 +17924,26 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
+          "412": {
+            "$ref": "#/components/responses/SMTPNotEnabledError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Update an existing data source.",
+        "summary": "Add invite.",
         "tags": [
-          "datasources"
+          "org_invites"
         ]
       }
     },
-    "/datasources/uid/{uid}/correlations/{correlationUID}": {
+    "/org/invites/{invitation_code}/revoke": {
       "delete": {
-        "operationId": "deleteCorrelation",
+        "operationId": "revokeInvite",
         "parameters": [
           {
             "in": "path",
-            "name": "uid",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "correlationUID",
+            "name": "invitation_code",
             "required": true,
             "schema": {
               "type": "string"
@@ -17296,7 +17952,7 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/deleteCorrelationResponse"
+            "$ref": "#/components/responses/okResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -17311,31 +17967,18 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Delete a correlation.",
+        "summary": "Revoke invite.",
         "tags": [
-          "correlations"
+          "org_invites"
         ]
       }
     },
-    "/datasources/uid/{uid}/health": {
+    "/org/preferences": {
       "get": {
-        "operationId": "checkDatasourceHealthWithUID",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "uid",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
+        "operationId": "getOrgPreferences",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
+            "$ref": "#/components/responses/getPreferencesResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -17347,33 +17990,24 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Sends a health check request to the plugin datasource identified by the UID.",
+        "summary": "Get Current Org Prefs.",
         "tags": [
-          "datasources"
+          "org_preferences"
         ]
-      }
-    },
-    "/datasources/uid/{uid}/resources/{datasource_proxy_route}": {
-      "get": {
-        "operationId": "callDatasourceResourceWithUID",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "datasource_proxy_route",
-            "required": true,
-            "schema": {
-              "type": "string"
+      },
+      "patch": {
+        "operationId": "patchOrgPreferences",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PatchPrefsCmd"
+              }
             }
           },
-          {
-            "in": "path",
-            "name": "uid",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
+          "required": true,
+          "x-originalParamName": "body"
+        },
         "responses": {
           "200": {
             "$ref": "#/components/responses/okResponse"
@@ -17387,36 +18021,31 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Fetch data source resources.",
+        "summary": "Patch Current Org Prefs.",
         "tags": [
-          "datasources"
+          "org_preferences"
         ]
-      }
-    },
-    "/datasources/{datasourceId}/disable-permissions": {
-      "post": {
-        "description": "Disables permissions for the data source with the given id. All existing permissions will be removed and anyone will be able to query the data source.\n\nYou need to have a permission with action `datasources.permissions:toggle` and scopes `datasources:*`, `datasources:id:*`, `datasources:id:1` (single data source).\n\nDeprecated: true.",
-        "operationId": "disablePermissions",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "datasourceId",
-            "required": true,
-            "schema": {
-              "type": "string"
+      },
+      "put": {
+        "operationId": "updateOrgPreferences",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdatePrefsCmd"
+              }
             }
-          }
-        ],
+          },
+          "required": true,
+          "x-originalParamName": "body"
+        },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/createOrUpdateDatasourceResponse"
+            "$ref": "#/components/responses/okResponse"
           },
           "400": {
             "$ref": "#/components/responses/badRequestError"
@@ -17427,40 +18056,23 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Disable permissions for a data source.",
+        "summary": "Update Current Org Prefs.",
         "tags": [
-          "datasource_permissions",
-          "enterprise"
+          "org_preferences"
         ]
       }
     },
-    "/datasources/{datasourceId}/enable-permissions": {
-      "post": {
-        "description": "Enables permissions for the data source with the given id.\nNo one except Org Admins will be able to query the data source until permissions have been added\nwhich permit certain users or teams to query the data source.\n\nYou need to have a permission with action `datasources.permissions:toggle` and scopes `datasources:*`, `datasources:id:*`, `datasources:id:1` (single data source).\n\nDeprecated: true.",
-        "operationId": "enablePermissions",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "datasourceId",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
+    "/org/quotas": {
+      "get": {
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `orgs.quotas:read` and scope `org:id:1` (orgIDScope).",
+        "operationId": "getCurrentOrgQuota",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/createOrUpdateDatasourceResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
+            "$ref": "#/components/responses/getQuotaResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -17475,30 +18087,19 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Enable permissions for a data source.",
+        "summary": "Fetch Organization quota.",
         "tags": [
-          "datasource_permissions",
-          "enterprise"
+          "getCurrentOrg"
         ]
       }
     },
-    "/datasources/{datasourceId}/permissions": {
+    "/org/users": {
       "get": {
-        "description": "Gets all existing permissions for the data source with the given id.\n\nYou need to have a permission with action `datasources.permissions:read` and scopes `datasources:*`, `datasources:id:*`, `datasources:id:1` (single data source).\n\nDeprecated: true.\nDeprecated. Please use GET /api/access-control/datasources/:uid",
-        "operationId": "getAllPermissions",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "datasourceId",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
+        "description": "Returns all org users within the current organization. Accessible to users with org admin role.\nIf you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:read` with scope `users:*`.",
+        "operationId": "getOrgUsersForCurrentOrg",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getAllPermissionseResponse"
+            "$ref": "#/components/responses/getOrgUsersForCurrentOrgResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -17506,66 +18107,32 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get permissions for a data source.",
+        "summary": "Get all users within the current organization.",
         "tags": [
-          "datasource_permissions",
-          "enterprise"
+          "org"
         ]
       },
       "post": {
-        "description": "You need to have a permission with action `datasources.permissions:read` and scopes `datasources:*`, `datasources:id:*`, `datasources:id:1` (single data source).\n\nDeprecated: true.\nDeprecated. Please use POST /api/access-control/datasources/:uid/users/:id, /api/access-control/datasources/:uid/teams/:id or /api/access-control/datasources/:uid/buildInRoles/:id",
-        "operationId": "addPermission",
-        "parameters": [
-          {
-            "in": "query",
-            "name": "userId",
-            "schema": {
-              "format": "int64",
-              "type": "integer"
-            }
-          },
-          {
-            "in": "query",
-            "name": "teamId",
-            "schema": {
-              "format": "int64",
-              "type": "integer"
-            }
-          },
-          {
-            "in": "query",
-            "name": "builtinRole",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "query",
-            "name": "permission",
-            "schema": {
-              "format": "int64",
-              "type": "integer"
+        "description": "Adds a global user to the current organization.\n\nIf you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:add` with scope `users:*`.",
+        "operationId": "addOrgUserToCurrentOrg",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/AddOrgUserCommand"
+              }
             }
           },
-          {
-            "in": "path",
-            "name": "datasourceId",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
+          "required": true,
+          "x-originalParamName": "body"
+        },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/addPermissionResponse"
+            "$ref": "#/components/responses/okResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -17573,45 +18140,40 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Add permissions for a data source.",
+        "summary": "Add a new user to the current organization.",
         "tags": [
-          "datasource_permissions",
-          "enterprise"
+          "org"
         ]
       }
     },
-    "/datasources/{datasourceId}/permissions/{permissionId}": {
-      "delete": {
-        "description": "Removes the permission with the given permissionId for the data source with the given id.\n\nYou need to have a permission with action `datasources.permissions:delete` and scopes `datasources:*`, `datasources:id:*`, `datasources:id:1` (single data source).\n\nDeprecated: true.\nDeprecated. Please use POST /api/access-control/datasources/:uid/users/:id, /api/access-control/datasources/:uid/teams/:id or /api/access-control/datasources/:uid/buildInRoles/:id",
-        "operationId": "deletePermissions",
+    "/org/users/lookup": {
+      "get": {
+        "description": "Returns all org users within the current organization, but with less detailed information.\nAccessible to users with org admin role, admin in any folder or admin of any team.\nMainly used by Grafana UI for providing list of users when adding team members and when editing folder/dashboard permissions.",
+        "operationId": "getOrgUsersForCurrentOrgLookup",
         "parameters": [
           {
-            "in": "path",
-            "name": "datasourceId",
-            "required": true,
+            "in": "query",
+            "name": "query",
             "schema": {
               "type": "string"
             }
           },
           {
-            "in": "path",
-            "name": "permissionId",
-            "required": true,
+            "in": "query",
+            "name": "limit",
             "schema": {
-              "type": "string"
+              "format": "int64",
+              "type": "integer"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
+            "$ref": "#/components/responses/getOrgUsersForCurrentOrgLookupResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -17619,29 +18181,28 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Remove permission for a data source.",
+        "summary": "Get all users within the current organization (lookup)",
         "tags": [
-          "datasource_permissions",
-          "enterprise"
+          "org"
         ]
       }
     },
-    "/datasources/{id}": {
+    "/org/users/{user_id}": {
       "delete": {
-        "deprecated": true,
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:delete` and scopes: `datasources:*`, `datasources:id:*` and `datasources:id:1` (single data source).\n\nPlease refer to [updated API](#/datasources/deleteDataSourceByUID) instead",
-        "operationId": "deleteDataSourceByID",
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:remove` with scope `users:*`.",
+        "operationId": "removeOrgUserForCurrentOrg",
         "parameters": [
           {
             "in": "path",
-            "name": "id",
+            "name": "user_id",
             "required": true,
             "schema": {
-              "type": "string"
+              "format": "int64",
+              "type": "integer"
             }
           }
         ],
@@ -17649,74 +18210,35 @@
           "200": {
             "$ref": "#/components/responses/okResponse"
           },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
+          },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Delete an existing data source by id.",
+        "summary": "Delete user in current organization.",
         "tags": [
-          "datasources"
+          "org"
         ]
       },
-      "get": {
-        "deprecated": true,
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:read` and scopes: `datasources:*`, `datasources:id:*` and `datasources:id:1` (single data source).\n\nPlease refer to [updated API](#/datasources/getDataSourceByUID) instead",
-        "operationId": "getDataSourceByID",
+      "patch": {
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users.role:update` with scope `users:*`.",
+        "operationId": "updateOrgUserForCurrentOrg",
         "parameters": [
           {
             "in": "path",
-            "name": "id",
+            "name": "user_id",
             "required": true,
             "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/getDataSourceResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
-          }
-        },
-        "summary": "Get a single data source by Id.",
-        "tags": [
-          "datasources"
-        ]
-      },
-      "put": {
-        "deprecated": true,
-        "description": "Similar to creating a data source, `password` and `basicAuthPassword` should be defined under\nsecureJsonData in order to be stored securely as an encrypted blob in the database. Then, the\nencrypted fields are listed under secureJsonFields section in the response.\n\nIf you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:write` and scopes: `datasources:*`, `datasources:id:*` and `datasources:id:1` (single data source).\n\nPlease refer to [updated API](#/datasources/updateDataSourceByUID) instead",
-        "operationId": "updateDataSourceByID",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "id",
-            "required": true,
-            "schema": {
-              "type": "string"
+              "format": "int64",
+              "type": "integer"
             }
           }
         ],
@@ -17724,16 +18246,19 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/UpdateDataSourceCommand"
+                "$ref": "#/components/schemas/UpdateOrgUserCommand"
               }
             }
           },
           "required": true,
-          "x-originalParamName": "Body"
+          "x-originalParamName": "body"
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/createOrUpdateDatasourceResponse"
+            "$ref": "#/components/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -17745,68 +18270,46 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Update an existing data source by its sequential ID.",
+        "summary": "Updates the given user.",
         "tags": [
-          "datasources"
+          "org"
         ]
       }
     },
-    "/datasources/{id}/health": {
+    "/orgs": {
       "get": {
-        "deprecated": true,
-        "description": "Please refer to [updated API](#/datasources/checkDatasourceHealthWithUID) instead",
-        "operationId": "checkDatasourceHealthByID",
+        "operationId": "searchOrgs",
         "parameters": [
           {
-            "in": "path",
-            "name": "id",
-            "required": true,
+            "in": "query",
+            "name": "page",
             "schema": {
-              "type": "string"
+              "default": 1,
+              "format": "int64",
+              "type": "integer"
             }
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
           },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
+          {
+            "description": "Number of items per page\nThe totalCount field in the response can be used for pagination list E.g. if totalCount is equal to 100 teams and the perpage parameter is set to 10 then there are 10 pages of teams.",
+            "in": "query",
+            "name": "perpage",
+            "schema": {
+              "default": 1000,
+              "format": "int64",
+              "type": "integer"
+            }
           },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
-          }
-        },
-        "summary": "Sends a health check request to the plugin datasource identified by the ID.",
-        "tags": [
-          "datasources"
-        ]
-      }
-    },
-    "/datasources/{id}/resources/{datasource_proxy_route}": {
-      "get": {
-        "deprecated": true,
-        "description": "Please refer to [updated API](#/datasources/callDatasourceResourceWithUID) instead",
-        "operationId": "callDatasourceResourceByID",
-        "parameters": [
           {
-            "in": "path",
-            "name": "datasource_proxy_route",
-            "required": true,
+            "in": "query",
+            "name": "name",
             "schema": {
               "type": "string"
             }
           },
           {
-            "in": "path",
-            "name": "id",
-            "required": true,
+            "description": "If set it will return results where the query value is contained in the name field. Query values with spaces need to be URL encoded.",
+            "in": "query",
+            "name": "query",
             "schema": {
               "type": "string"
             }
@@ -17814,10 +18317,7 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
+            "$ref": "#/components/responses/searchOrgsResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -17825,28 +18325,31 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
+          "409": {
+            "$ref": "#/components/responses/conflictError"
           },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Fetch data source resources by Id.",
+        "security": [
+          {
+            "basic": []
+          }
+        ],
+        "summary": "Search all Organizations.",
         "tags": [
-          "datasources"
+          "orgs"
         ]
-      }
-    },
-    "/ds/query": {
+      },
       "post": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `datasources:query`.",
-        "operationId": "queryMetricsWithExpressions",
+        "description": "Only works if [users.allow_org_create](https://grafana.com/docs/grafana/latest/administration/configuration/#allow_org_create) is set.",
+        "operationId": "createOrg",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/MetricRequest"
+                "$ref": "#/components/schemas/CreateOrgCommand"
               }
             }
           },
@@ -17855,13 +18358,7 @@
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/queryMetricsWithExpressionsRespons"
-          },
-          "207": {
-            "$ref": "#/components/responses/queryMetricsWithExpressionsRespons"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
+            "$ref": "#/components/responses/createOrgResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -17869,45 +18366,27 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
+          "409": {
+            "$ref": "#/components/responses/conflictError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "DataSource query metrics with expressions.",
+        "summary": "Create Organization.",
         "tags": [
-          "ds"
+          "orgs"
         ]
       }
     },
-    "/folders": {
+    "/orgs/name/{org_name}": {
       "get": {
-        "description": "Returns all folders that the authenticated user has permission to view.\nIf nested folders are enabled, it expects an additional query parameter with the parent folder UID\nand returns the immediate subfolders that the authenticated user has permission to view.\nIf the parameter is not supplied then it returns immediate subfolders under the root\nthat the authenticated user has permission to view.",
-        "operationId": "getFolders",
+        "operationId": "getOrgByName",
         "parameters": [
           {
-            "description": "Limit the maximum number of folders to return",
-            "in": "query",
-            "name": "limit",
-            "schema": {
-              "default": 1000,
-              "format": "int64",
-              "type": "integer"
-            }
-          },
-          {
-            "description": "Page index for starting fetching folders",
-            "in": "query",
-            "name": "page",
-            "schema": {
-              "default": 1,
-              "format": "int64",
-              "type": "integer"
-            }
-          },
-          {
-            "description": "The parent folder UID",
-            "in": "query",
-            "name": "parentUid",
+            "in": "path",
+            "name": "org_name",
+            "required": true,
             "schema": {
               "type": "string"
             }
@@ -17915,7 +18394,7 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getFoldersResponse"
+            "$ref": "#/components/responses/getOrgByNameResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -17927,28 +18406,34 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get all folders.",
+        "security": [
+          {
+            "basic": []
+          }
+        ],
+        "summary": "Get Organization by ID.",
         "tags": [
-          "folders"
+          "orgs"
         ]
-      },
-      "post": {
-        "description": "If nested folders are enabled then it additionally expects the parent folder UID.",
-        "operationId": "createFolder",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/CreateFolderCommand"
-              }
+      }
+    },
+    "/orgs/{org_id}": {
+      "delete": {
+        "operationId": "deleteOrgByID",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "org_id",
+            "required": true,
+            "schema": {
+              "format": "int64",
+              "type": "integer"
             }
-          },
-          "required": true,
-          "x-originalParamName": "body"
-        },
+          }
+        ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/folderResponse"
+            "$ref": "#/components/responses/okResponse"
           },
           "400": {
             "$ref": "#/components/responses/badRequestError"
@@ -17959,28 +18444,29 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "409": {
-            "$ref": "#/components/responses/conflictError"
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
           },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Create folder.",
+        "security": [
+          {
+            "basic": []
+          }
+        ],
+        "summary": "Delete Organization.",
         "tags": [
-          "folders"
+          "orgs"
         ]
-      }
-    },
-    "/folders/id/{folder_id}": {
+      },
       "get": {
-        "deprecated": true,
-        "description": "Returns the folder identified by id. This is deprecated.\nPlease refer to [updated API](#/folders/getFolderByUID) instead",
-        "operationId": "getFolderByID",
+        "operationId": "getOrgByID",
         "parameters": [
           {
             "in": "path",
-            "name": "folder_id",
+            "name": "org_id",
             "required": true,
             "schema": {
               "format": "int64",
@@ -17990,7 +18476,7 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/folderResponse"
+            "$ref": "#/components/responses/getOrgByIDResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -17998,45 +18484,47 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get folder by id.",
+        "security": [
+          {
+            "basic": []
+          }
+        ],
+        "summary": "Get Organization by ID.",
         "tags": [
-          "folders"
+          "orgs"
         ]
-      }
-    },
-    "/folders/{folder_uid}": {
-      "delete": {
-        "description": "Deletes an existing folder identified by UID along with all dashboards (and their alerts) stored in the folder. This operation cannot be reverted.\nIf nested folders are enabled then it also deletes all the subfolders.",
-        "operationId": "deleteFolder",
+      },
+      "put": {
+        "operationId": "updateOrg",
         "parameters": [
           {
             "in": "path",
-            "name": "folder_uid",
+            "name": "org_id",
             "required": true,
             "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "description": "If `true` any Grafana 8 Alerts under this folder will be deleted.\nSet to `false` so that the request will fail if the folder contains any Grafana 8 Alerts.",
-            "in": "query",
-            "name": "forceDeleteRules",
-            "schema": {
-              "default": false,
-              "type": "boolean"
+              "format": "int64",
+              "type": "integer"
             }
           }
         ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateOrgForm"
+              }
+            }
+          },
+          "required": true,
+          "x-originalParamName": "body"
+        },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/deleteFolderResponse"
+            "$ref": "#/components/responses/okResponse"
           },
           "400": {
             "$ref": "#/components/responses/badRequestError"
@@ -18047,61 +18535,32 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Delete folder.",
-        "tags": [
-          "folders"
-        ]
-      },
-      "get": {
-        "operationId": "getFolderByUID",
-        "parameters": [
+        "security": [
           {
-            "in": "path",
-            "name": "folder_uid",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
+            "basic": []
           }
         ],
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/folderResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
-          }
-        },
-        "summary": "Get folder by uid.",
+        "summary": "Update Organization.",
         "tags": [
-          "folders"
+          "orgs"
         ]
-      },
+      }
+    },
+    "/orgs/{org_id}/address": {
       "put": {
-        "operationId": "updateFolder",
+        "operationId": "updateOrgAddress",
         "parameters": [
           {
             "in": "path",
-            "name": "folder_uid",
+            "name": "org_id",
             "required": true,
             "schema": {
-              "type": "string"
+              "format": "int64",
+              "type": "integer"
             }
           }
         ],
@@ -18109,17 +18568,16 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/UpdateFolderCommand"
+                "$ref": "#/components/schemas/UpdateOrgAddressForm"
               }
             }
           },
-          "description": "To change the unique identifier (uid), provide another one.\nTo overwrite an existing folder with newer version, set `overwrite` to `true`.\nProvide the current version to safelly update the folder: if the provided version differs from the stored one the request will fail, unless `overwrite` is `true`.",
           "required": true,
           "x-originalParamName": "body"
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/folderResponse"
+            "$ref": "#/components/responses/okResponse"
           },
           "400": {
             "$ref": "#/components/responses/badRequestError"
@@ -18130,38 +18588,34 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
-          "409": {
-            "$ref": "#/components/responses/conflictError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Update folder.",
+        "summary": "Update Organization's address.",
         "tags": [
-          "folders"
+          "orgs"
         ]
       }
     },
-    "/folders/{folder_uid}/counts": {
+    "/orgs/{org_id}/quotas": {
       "get": {
-        "operationId": "getFolderDescendantCounts",
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `orgs.quotas:read` and scope `org:id:1` (orgIDScope).",
+        "operationId": "getOrgQuota",
         "parameters": [
           {
             "in": "path",
-            "name": "folder_uid",
+            "name": "org_id",
             "required": true,
             "schema": {
-              "type": "string"
+              "format": "int64",
+              "type": "integer"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getFolderDescendantCountsResponse"
+            "$ref": "#/components/responses/getQuotaResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -18176,30 +18630,40 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Gets the count of each descendant of a folder by kind. The folder is identified by UID.",
+        "summary": "Fetch Organization quota.",
         "tags": [
-          "folders"
+          "orgs"
         ]
       }
     },
-    "/folders/{folder_uid}/move": {
-      "post": {
-        "operationId": "moveFolder",
+    "/orgs/{org_id}/quotas/{quota_target}": {
+      "put": {
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `orgs.quotas:write` and scope `org:id:1` (orgIDScope).",
+        "operationId": "updateOrgQuota",
         "parameters": [
           {
             "in": "path",
-            "name": "folder_uid",
+            "name": "quota_target",
             "required": true,
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "in": "path",
+            "name": "org_id",
+            "required": true,
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
           }
         ],
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/MoveFolderCommand"
+                "$ref": "#/components/schemas/UpdateQuotaCmd"
               }
             }
           },
@@ -18208,7 +18672,7 @@
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/folderResponse"
+            "$ref": "#/components/responses/okResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -18223,28 +18687,35 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Move folder.",
+        "security": [
+          {
+            "basic": []
+          }
+        ],
+        "summary": "Update user quota.",
         "tags": [
-          "folders"
+          "orgs"
         ]
       }
     },
-    "/folders/{folder_uid}/permissions": {
+    "/orgs/{org_id}/users": {
       "get": {
-        "operationId": "getFolderPermissionList",
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:read` with scope `users:*`.",
+        "operationId": "getOrgUsers",
         "parameters": [
           {
             "in": "path",
-            "name": "folder_uid",
+            "name": "org_id",
             "required": true,
             "schema": {
-              "type": "string"
+              "format": "int64",
+              "type": "integer"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getFolderPermissionListResponse"
+            "$ref": "#/components/responses/getOrgUsersResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -18252,27 +18723,31 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Gets all existing permissions for the folder with the given `uid`.",
+        "security": [
+          {
+            "basic": []
+          }
+        ],
+        "summary": "Get Users in Organization.",
         "tags": [
-          "folder_permissions"
+          "orgs"
         ]
       },
       "post": {
-        "operationId": "updateFolderPermissions",
+        "description": "Adds a global user to the current organization.\n\nIf you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:add` with scope `users:*`.",
+        "operationId": "addOrgUser",
         "parameters": [
           {
             "in": "path",
-            "name": "folder_uid",
+            "name": "org_id",
             "required": true,
             "schema": {
-              "type": "string"
+              "format": "int64",
+              "type": "integer"
             }
           }
         ],
@@ -18280,12 +18755,12 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/UpdateDashboardACLCommand"
+                "$ref": "#/components/schemas/AddOrgUserCommand"
               }
             }
           },
           "required": true,
-          "x-originalParamName": "Body"
+          "x-originalParamName": "body"
         },
         "responses": {
           "200": {
@@ -18297,97 +18772,75 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Updates permissions for a folder. This operation will remove existing permissions if they’re not included in the request.",
+        "summary": "Add a new user to the current organization.",
         "tags": [
-          "folder_permissions"
+          "orgs"
         ]
       }
     },
-    "/library-elements": {
+    "/orgs/{org_id}/users/search": {
       "get": {
-        "description": "Returns a list of all library elements the authenticated user has permission to view.\nUse the `perPage` query parameter to control the maximum number of library elements returned; the default limit is `100`.\nYou can also use the `page` query parameter to fetch library elements from any page other than the first one.",
-        "operationId": "getLibraryElements",
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:read` with scope `users:*`.",
+        "operationId": "searchOrgUsers",
         "parameters": [
           {
-            "description": "Part of the name or description searched for.",
-            "in": "query",
-            "name": "searchString",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "description": "Kind of element to search for.",
-            "in": "query",
-            "name": "kind",
+            "in": "path",
+            "name": "org_id",
+            "required": true,
             "schema": {
-              "enum": [
-                1,
-                2
-              ],
               "format": "int64",
               "type": "integer"
             }
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/searchOrgUsersResponse"
           },
-          {
-            "description": "Sort order of elements.",
-            "in": "query",
-            "name": "sortDirection",
-            "schema": {
-              "enum": [
-                "alpha-asc",
-                "alpha-desc"
-              ],
-              "type": "string"
-            }
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
           },
-          {
-            "description": "A comma separated list of types to filter the elements by",
-            "in": "query",
-            "name": "typeFilter",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "description": "Element UID to exclude from search results.",
-            "in": "query",
-            "name": "excludeUid",
-            "schema": {
-              "type": "string"
-            }
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
           },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "security": [
           {
-            "description": "A comma separated list of folder ID(s) to filter the elements by.",
-            "in": "query",
-            "name": "folderFilter",
-            "schema": {
-              "type": "string"
-            }
-          },
+            "basic": []
+          }
+        ],
+        "summary": "Search Users in Organization.",
+        "tags": [
+          "orgs"
+        ]
+      }
+    },
+    "/orgs/{org_id}/users/{user_id}": {
+      "delete": {
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:remove` with scope `users:*`.",
+        "operationId": "removeOrgUser",
+        "parameters": [
           {
-            "description": "The number of results per page.",
-            "in": "query",
-            "name": "perPage",
+            "in": "path",
+            "name": "org_id",
+            "required": true,
             "schema": {
-              "default": 100,
               "format": "int64",
               "type": "integer"
             }
           },
           {
-            "description": "The page for a set of records, given that only perPage records are returned at a time. Numbering starts at 1.",
-            "in": "query",
-            "name": "page",
+            "in": "path",
+            "name": "user_id",
+            "required": true,
             "schema": {
-              "default": 1,
               "format": "int64",
               "type": "integer"
             }
@@ -18395,28 +18848,54 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getLibraryElementsResponse"
+            "$ref": "#/components/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get all library elements.",
+        "summary": "Delete user in current organization.",
         "tags": [
-          "library_elements"
+          "orgs"
         ]
       },
-      "post": {
-        "description": "Creates a new library element.",
-        "operationId": "createLibraryElement",
+      "patch": {
+        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users.role:update` with scope `users:*`.",
+        "operationId": "updateOrgUser",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "org_id",
+            "required": true,
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
+          },
+          {
+            "in": "path",
+            "name": "user_id",
+            "required": true,
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
+          }
+        ],
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/CreateLibraryElementCommand"
+                "$ref": "#/components/schemas/UpdateOrgUserCommand"
               }
             }
           },
@@ -18425,7 +18904,7 @@
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getLibraryElementResponse"
+            "$ref": "#/components/responses/okResponse"
           },
           "400": {
             "$ref": "#/components/responses/badRequestError"
@@ -18436,40 +18915,73 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Create library element.",
+        "summary": "Update Users in Organization.",
         "tags": [
-          "library_elements"
+          "orgs"
         ]
       }
     },
-    "/library-elements/name/{library_element_name}": {
+    "/playlists": {
       "get": {
-        "description": "Returns a library element with the given name.",
-        "operationId": "getLibraryElementByName",
+        "operationId": "searchPlaylists",
         "parameters": [
           {
-            "in": "path",
-            "name": "library_element_name",
-            "required": true,
+            "in": "query",
+            "name": "query",
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "description": "in:limit",
+            "in": "query",
+            "name": "limit",
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getLibraryElementResponse"
+            "$ref": "#/components/responses/searchPlaylistsResponse"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "summary": "Get playlists.",
+        "tags": [
+          "playlists"
+        ]
+      },
+      "post": {
+        "operationId": "createPlaylist",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreatePlaylistCommand"
+              }
+            }
+          },
+          "required": true,
+          "x-originalParamName": "Body"
+        },
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/createPlaylistResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
           "404": {
             "$ref": "#/components/responses/notFoundError"
           },
@@ -18477,20 +18989,19 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get library element by name.",
+        "summary": "Create playlist.",
         "tags": [
-          "library_elements"
+          "playlists"
         ]
       }
     },
-    "/library-elements/{library_element_uid}": {
+    "/playlists/{uid}": {
       "delete": {
-        "description": "Deletes an existing library element as specified by the UID. This operation cannot be reverted.\nYou cannot delete a library element that is connected. This operation cannot be reverted.",
-        "operationId": "deleteLibraryElementByUID",
+        "operationId": "deletePlaylist",
         "parameters": [
           {
             "in": "path",
-            "name": "library_element_uid",
+            "name": "uid",
             "required": true,
             "schema": {
               "type": "string"
@@ -18501,9 +19012,6 @@
           "200": {
             "$ref": "#/components/responses/okResponse"
           },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
-          },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
@@ -18517,18 +19025,17 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Delete library element.",
+        "summary": "Delete playlist.",
         "tags": [
-          "library_elements"
+          "playlists"
         ]
       },
       "get": {
-        "description": "Returns a library element with the given UID.",
-        "operationId": "getLibraryElementByUID",
+        "operationId": "getPlaylist",
         "parameters": [
           {
             "in": "path",
-            "name": "library_element_uid",
+            "name": "uid",
             "required": true,
             "schema": {
               "type": "string"
@@ -18537,7 +19044,7 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getLibraryElementResponse"
+            "$ref": "#/components/responses/getPlaylistResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -18552,18 +19059,17 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get library element by UID.",
+        "summary": "Get playlist.",
         "tags": [
-          "library_elements"
+          "playlists"
         ]
       },
-      "patch": {
-        "description": "Updates an existing library element identified by uid.",
-        "operationId": "updateLibraryElement",
+      "put": {
+        "operationId": "updatePlaylist",
         "parameters": [
           {
             "in": "path",
-            "name": "library_element_uid",
+            "name": "uid",
             "required": true,
             "schema": {
               "type": "string"
@@ -18574,19 +19080,16 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/PatchLibraryElementCommand"
+                "$ref": "#/components/schemas/UpdatePlaylistCommand"
               }
             }
           },
           "required": true,
-          "x-originalParamName": "body"
+          "x-originalParamName": "Body"
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getLibraryElementResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
+            "$ref": "#/components/responses/updatePlaylistResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -18597,27 +19100,23 @@
           "404": {
             "$ref": "#/components/responses/notFoundError"
           },
-          "412": {
-            "$ref": "#/components/responses/preconditionFailedError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Update library element.",
+        "summary": "Update playlist.",
         "tags": [
-          "library_elements"
+          "playlists"
         ]
       }
     },
-    "/library-elements/{library_element_uid}/connections/": {
+    "/playlists/{uid}/items": {
       "get": {
-        "description": "Returns a list of connections for a library element based on the UID specified.",
-        "operationId": "getLibraryElementConnections",
+        "operationId": "getPlaylistItems",
         "parameters": [
           {
             "in": "path",
-            "name": "library_element_uid",
+            "name": "uid",
             "required": true,
             "schema": {
               "type": "string"
@@ -18626,7 +19125,7 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getLibraryElementConnectionsResponse"
+            "$ref": "#/components/responses/getPlaylistItemsResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -18641,93 +19140,244 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get library element connections.",
+        "summary": "Get playlist items.",
         "tags": [
-          "library_elements"
+          "playlists"
         ]
       }
     },
-    "/licensing/check": {
+    "/public/dashboards/{accessToken}": {
       "get": {
-        "operationId": "getStatus",
+        "description": "Get public dashboard for view",
+        "operationId": "viewPublicDashboard",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "accessToken",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getStatusResponse"
+            "$ref": "#/components/responses/viewPublicDashboardResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestPublicError"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedPublicError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenPublicError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundPublicError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerPublicError"
           }
         },
-        "summary": "Check license availability.",
         "tags": [
-          "licensing",
-          "enterprise"
+          "dashboard_public"
         ]
       }
     },
-    "/licensing/custom-permissions": {
+    "/public/dashboards/{accessToken}/annotations": {
       "get": {
-        "description": "You need to have a permission with action `licensing.reports:read`.",
-        "operationId": "getCustomPermissionsReport",
+        "description": "Get annotations for a public dashboard",
+        "operationId": "getPublicAnnotations",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "accessToken",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getCustomPermissionsReportResponse"
+            "$ref": "#/components/responses/getPublicAnnotationsResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestPublicError"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedPublicError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenPublicError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundPublicError"
           },
           "500": {
-            "$ref": "#/components/responses/internalServerError"
+            "$ref": "#/components/responses/internalServerPublicError"
           }
         },
-        "summary": "Get custom permissions report.",
         "tags": [
-          "licensing",
-          "enterprise"
+          "dashboard_public"
         ]
       }
     },
-    "/licensing/custom-permissions-csv": {
-      "get": {
-        "description": "You need to have a permission with action `licensing.reports:read`.",
-        "operationId": "getCustomPermissionsCSV",
+    "/public/dashboards/{accessToken}/panels/{panelId}/query": {
+      "post": {
+        "description": "Get results for a given panel on a public dashboard",
+        "operationId": "queryPublicDashboard",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "accessToken",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "panelId",
+            "required": true,
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
+          }
+        ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getCustomPermissionsReportResponse"
+            "$ref": "#/components/responses/queryPublicDashboardResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestPublicError"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedPublicError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenPublicError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundPublicError"
           },
           "500": {
-            "$ref": "#/components/responses/internalServerError"
+            "$ref": "#/components/responses/internalServerPublicError"
           }
         },
-        "summary": "Get custom permissions report in CSV format.",
         "tags": [
-          "licensing",
-          "enterprise"
+          "dashboard_public"
         ]
       }
     },
-    "/licensing/refresh-stats": {
+    "/query-history": {
       "get": {
-        "description": "You need to have a permission with action `licensing:read`.",
-        "operationId": "refreshLicenseStats",
+        "description": "Returns a list of queries in the query history that matches the search criteria.\nQuery history search supports pagination. Use the `limit` parameter to control the maximum number of queries returned; the default limit is 100.\nYou can also use the `page` query parameter to fetch queries from any page other than the first one.",
+        "operationId": "searchQueries",
+        "parameters": [
+          {
+            "description": "List of data source UIDs to search for",
+            "in": "query",
+            "name": "datasourceUid",
+            "schema": {
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
+          },
+          {
+            "description": "Text inside query or comments that is searched for",
+            "in": "query",
+            "name": "searchString",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "description": "Flag indicating if only starred queries should be returned",
+            "in": "query",
+            "name": "onlyStarred",
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "description": "Sort method",
+            "in": "query",
+            "name": "sort",
+            "schema": {
+              "default": "time-desc",
+              "enum": [
+                "time-desc",
+                "time-asc"
+              ],
+              "type": "string"
+            }
+          },
+          {
+            "description": "Use this parameter to access hits beyond limit. Numbering starts at 1. limit param acts as page size.",
+            "in": "query",
+            "name": "page",
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
+          },
+          {
+            "description": "Limit the number of returned results",
+            "in": "query",
+            "name": "limit",
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
+          },
+          {
+            "description": "From range for the query history search",
+            "in": "query",
+            "name": "from",
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
+          },
+          {
+            "description": "To range for the query history search",
+            "in": "query",
+            "name": "to",
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
+          }
+        ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/refreshLicenseStatsResponse"
+            "$ref": "#/components/responses/getQueryHistorySearchResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
           },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Refresh license stats.",
+        "summary": "Query history search.",
         "tags": [
-          "licensing",
-          "enterprise"
+          "query_history"
         ]
-      }
-    },
-    "/licensing/token": {
-      "delete": {
-        "description": "Removes the license stored in the Grafana database. Available in Grafana Enterprise v7.4+.\n\nYou need to have a permission with action `licensing:delete`.",
-        "operationId": "deleteLicenseToken",
+      },
+      "post": {
+        "description": "Adds new query to query history.",
+        "operationId": "createQuery",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/DeleteTokenCommand"
+                "$ref": "#/components/schemas/CreateQueryInQueryHistoryCommand"
               }
             }
           },
@@ -18735,8 +19385,8 @@
           "x-originalParamName": "body"
         },
         "responses": {
-          "202": {
-            "$ref": "#/components/responses/acceptedResponse"
+          "200": {
+            "$ref": "#/components/responses/getQueryHistoryResponse"
           },
           "400": {
             "$ref": "#/components/responses/badRequestError"
@@ -18744,104 +19394,162 @@
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "422": {
-            "$ref": "#/components/responses/unprocessableEntityError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Remove license from database.",
+        "summary": "Add query to query history.",
         "tags": [
-          "licensing",
-          "enterprise"
+          "query_history"
         ]
-      },
-      "get": {
-        "description": "You need to have a permission with action `licensing:read`.",
-        "operationId": "getLicenseToken",
+      }
+    },
+    "/query-history/star/{query_history_uid}": {
+      "delete": {
+        "description": "Removes star from query in query history as specified by the UID.",
+        "operationId": "unstarQuery",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "query_history_uid",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getLicenseTokenResponse"
+            "$ref": "#/components/responses/getQueryHistoryResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get license token.",
+        "summary": "Remove star to query in query history.",
         "tags": [
-          "licensing",
-          "enterprise"
+          "query_history"
         ]
       },
       "post": {
-        "description": "You need to have a permission with action `licensing:update`.",
-        "operationId": "postLicenseToken",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/DeleteTokenCommand"
-              }
+        "description": "Adds star to query in query history as specified by the UID.",
+        "operationId": "starQuery",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "query_history_uid",
+            "required": true,
+            "schema": {
+              "type": "string"
             }
-          },
-          "required": true,
-          "x-originalParamName": "body"
-        },
+          }
+        ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getLicenseTokenResponse"
+            "$ref": "#/components/responses/getQueryHistoryResponse"
           },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Create license token.",
+        "summary": "Add star to query in query history.",
         "tags": [
-          "licensing",
-          "enterprise"
+          "query_history"
         ]
       }
     },
-    "/licensing/token/renew": {
-      "post": {
-        "description": "Manually ask license issuer for a new token. Available in Grafana Enterprise v7.4+.\n\nYou need to have a permission with action `licensing:update`.",
-        "operationId": "postRenewLicenseToken",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object"
-              }
+    "/query-history/{query_history_uid}": {
+      "delete": {
+        "description": "Deletes an existing query in query history as specified by the UID. This operation cannot be reverted.",
+        "operationId": "deleteQuery",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "query_history_uid",
+            "required": true,
+            "schema": {
+              "type": "string"
             }
-          },
-          "required": true,
-          "x-originalParamName": "body"
-        },
+          }
+        ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/postRenewLicenseTokenResponse"
+            "$ref": "#/components/responses/getQueryHistoryDeleteQueryResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Manually force license refresh.",
+        "summary": "Delete query in query history.",
         "tags": [
-          "licensing",
-          "enterprise"
+          "query_history"
+        ]
+      },
+      "patch": {
+        "description": "Updates comment for query in query history as specified by the UID.",
+        "operationId": "patchQueryComment",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "query_history_uid",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PatchQueryCommentInQueryHistoryCommand"
+              }
+            }
+          },
+          "required": true,
+          "x-originalParamName": "body"
+        },
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/getQueryHistoryResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "summary": "Update comment for query in query history.",
+        "tags": [
+          "query_history"
         ]
       }
     },
-    "/logout/saml": {
+    "/recording-rules": {
       "get": {
-        "operationId": "getSAMLLogout",
+        "operationId": "listRecordingRules",
         "responses": {
-          "302": {
-            "description": "(empty)"
+          "200": {
+            "$ref": "#/components/responses/listRecordingRulesResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
           },
           "404": {
             "$ref": "#/components/responses/notFoundError"
@@ -18850,19 +19558,28 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "GetLogout initiates single logout process.",
+        "summary": "Lists all rules in the database: active or deleted.",
         "tags": [
-          "saml",
+          "recording_rules",
           "enterprise"
         ]
-      }
-    },
-    "/org": {
-      "get": {
-        "operationId": "getCurrentOrg",
+      },
+      "post": {
+        "operationId": "createRecordingRule",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/RecordingRuleJSON"
+              }
+            }
+          },
+          "required": true,
+          "x-originalParamName": "body"
+        },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getCurrentOrgResponse"
+            "$ref": "#/components/responses/recordingRuleResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -18870,22 +19587,26 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get current Organization.",
+        "summary": "Create a recording rule that is then registered and started.",
         "tags": [
-          "org"
+          "recording_rules",
+          "enterprise"
         ]
       },
       "put": {
-        "operationId": "updateCurrentOrg",
+        "operationId": "updateRecordingRule",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/UpdateOrgForm"
+                "$ref": "#/components/schemas/RecordingRuleJSON"
               }
             }
           },
@@ -18894,10 +19615,7 @@
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
+            "$ref": "#/components/responses/recordingRuleResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -18905,24 +19623,28 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Update current Organization.",
+        "summary": "Update the active status of a rule.",
         "tags": [
-          "org"
+          "recording_rules",
+          "enterprise"
         ]
       }
     },
-    "/org/address": {
-      "put": {
-        "operationId": "updateCurrentOrgAddress",
+    "/recording-rules/test": {
+      "post": {
+        "operationId": "testCreateRecordingRule",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/UpdateOrgAddressForm"
+                "$ref": "#/components/schemas/RecordingRuleJSON"
               }
             }
           },
@@ -18933,31 +19655,60 @@
           "200": {
             "$ref": "#/components/responses/okResponse"
           },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
-          },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "422": {
+            "$ref": "#/components/responses/unprocessableEntityError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Update current Organization's address.",
+        "summary": "Test a recording rule.",
         "tags": [
-          "org"
+          "recording_rules",
+          "enterprise"
         ]
       }
     },
-    "/org/invites": {
+    "/recording-rules/writer": {
+      "delete": {
+        "operationId": "deleteRecordingRuleWriteTarget",
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/okResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "summary": "Delete the remote write target.",
+        "tags": [
+          "recording_rules",
+          "enterprise"
+        ]
+      },
       "get": {
-        "operationId": "getPendingOrgInvites",
+        "operationId": "getRecordingRuleWriteTarget",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getPendingOrgInvitesResponse"
+            "$ref": "#/components/responses/recordingRuleWriteTargetResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -18965,22 +19716,27 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get pending invites.",
+        "summary": "Return the prometheus remote write target.",
         "tags": [
-          "org_invites"
+          "recording_rules",
+          "enterprise"
         ]
       },
       "post": {
-        "operationId": "addOrgInvite",
+        "description": "It returns a 422 if there is not an existing prometheus data source configured.",
+        "operationId": "createRecordingRuleWriteTarget",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/AddInviteForm"
+                "$ref": "#/components/schemas/PrometheusRemoteWriteTargetJSON"
               }
             }
           },
@@ -18989,10 +19745,7 @@
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
+            "$ref": "#/components/responses/recordingRuleWriteTargetResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -19000,29 +19753,34 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "412": {
-            "$ref": "#/components/responses/SMTPNotEnabledError"
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "422": {
+            "$ref": "#/components/responses/unprocessableEntityError"
           },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Add invite.",
+        "summary": "Create a remote write target.",
         "tags": [
-          "org_invites"
+          "recording_rules",
+          "enterprise"
         ]
       }
     },
-    "/org/invites/{invitation_code}/revoke": {
+    "/recording-rules/{recordingRuleID}": {
       "delete": {
-        "operationId": "revokeInvite",
+        "operationId": "deleteRecordingRule",
         "parameters": [
           {
             "in": "path",
-            "name": "invitation_code",
+            "name": "recordingRuleID",
             "required": true,
             "schema": {
-              "type": "string"
+              "format": "int64",
+              "type": "integer"
             }
           }
         ],
@@ -19043,18 +19801,20 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Revoke invite.",
+        "summary": "Delete removes the rule from the registry and stops it.",
         "tags": [
-          "org_invites"
+          "recording_rules",
+          "enterprise"
         ]
       }
     },
-    "/org/preferences": {
+    "/reports": {
       "get": {
-        "operationId": "getOrgPreferences",
+        "description": "Available to org admins only and with a valid or expired license.\n\nYou need to have a permission with action `reports:read` with scope `reports:*`.",
+        "operationId": "getReports",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getPreferencesResponse"
+            "$ref": "#/components/responses/getReportsResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -19066,18 +19826,20 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get Current Org Prefs.",
+        "summary": "List reports.",
         "tags": [
-          "org_preferences"
+          "reports",
+          "enterprise"
         ]
       },
-      "patch": {
-        "operationId": "patchOrgPreferences",
+      "post": {
+        "description": "Available to org admins only and with a valid license.\n\nYou need to have a permission with action `reports.admin:create`.",
+        "operationId": "createReport",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/PatchPrefsCmd"
+                "$ref": "#/components/schemas/CreateOrUpdateReportConfig"
               }
             }
           },
@@ -19086,7 +19848,7 @@
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
+            "$ref": "#/components/responses/createReportResponse"
           },
           "400": {
             "$ref": "#/components/responses/badRequestError"
@@ -19097,22 +19859,29 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Patch Current Org Prefs.",
+        "summary": "Create a report.",
         "tags": [
-          "org_preferences"
+          "reports",
+          "enterprise"
         ]
-      },
-      "put": {
-        "operationId": "updateOrgPreferences",
+      }
+    },
+    "/reports/email": {
+      "post": {
+        "description": "Generate and send a report. This API waits for the report to be generated before returning. We recommend that you set the client’s timeout to at least 60 seconds. Available to org admins only and with a valid license.\n\nOnly available in Grafana Enterprise v7.0+.\nThis API endpoint is experimental and may be deprecated in a future release. On deprecation, a migration strategy will be provided and the endpoint will remain functional until the next major release of Grafana.\n\nYou need to have a permission with action `reports:send`.",
+        "operationId": "sendReport",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/UpdatePrefsCmd"
+                "$ref": "#/components/schemas/ReportEmail"
               }
             }
           },
@@ -19132,50 +19901,96 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Update Current Org Prefs.",
+        "summary": "Send a report.",
         "tags": [
-          "org_preferences"
+          "reports",
+          "enterprise"
         ]
       }
     },
-    "/org/quotas": {
+    "/reports/render/pdfs": {
       "get": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `orgs.quotas:read` and scope `org:id:1` (orgIDScope).",
-        "operationId": "getCurrentOrgQuota",
+        "description": "Available to all users and with a valid license.",
+        "operationId": "renderReportPDFs",
+        "parameters": [
+          {
+            "in": "query",
+            "name": "dashboardID",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "orientation",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "layout",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "title",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "scaleFactor",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "includeTables",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getQuotaResponse"
+            "$ref": "#/components/responses/contentResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Fetch Organization quota.",
+        "summary": "Render report for multiple dashboards.",
         "tags": [
-          "getCurrentOrg"
+          "reports",
+          "enterprise"
         ]
       }
     },
-    "/org/users": {
+    "/reports/settings": {
       "get": {
-        "description": "Returns all org users within the current organization. Accessible to users with org admin role.\nIf you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:read` with scope `users:*`.",
-        "operationId": "getOrgUsersForCurrentOrg",
+        "description": "Available to org admins only and with a valid or expired license.\n\nYou need to have a permission with action `reports.settings:read`x.",
+        "operationId": "getReportSettings",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getOrgUsersForCurrentOrgResponse"
+            "$ref": "#/components/responses/getReportSettingsResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -19187,19 +20002,20 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get all users within the current organization.",
+        "summary": "Get settings.",
         "tags": [
-          "org"
+          "reports",
+          "enterprise"
         ]
       },
       "post": {
-        "description": "Adds a global user to the current organization.\n\nIf you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:add` with scope `users:*`.",
-        "operationId": "addOrgUserToCurrentOrg",
+        "description": "Available to org admins only and with a valid or expired license.\n\nYou need to have a permission with action `reports.settings:write`xx.",
+        "operationId": "saveReportSettings",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/AddOrgUserCommand"
+                "$ref": "#/components/schemas/ReportSettings"
               }
             }
           },
@@ -19210,6 +20026,9 @@
           "200": {
             "$ref": "#/components/responses/okResponse"
           },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
+          },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
@@ -19220,27 +20039,64 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Add a new user to the current organization.",
+        "summary": "Save settings.",
         "tags": [
-          "org"
+          "reports",
+          "enterprise"
         ]
       }
     },
-    "/org/users/lookup": {
-      "get": {
-        "description": "Returns all org users within the current organization, but with less detailed information.\nAccessible to users with org admin role, admin in any folder or admin of any team.\nMainly used by Grafana UI for providing list of users when adding team members and when editing folder/dashboard permissions.",
-        "operationId": "getOrgUsersForCurrentOrgLookup",
-        "parameters": [
-          {
-            "in": "query",
-            "name": "query",
-            "schema": {
-              "type": "string"
+    "/reports/test-email": {
+      "post": {
+        "description": "Available to org admins only and with a valid license.\n\nYou need to have a permission with action `reports:send`.",
+        "operationId": "sendTestEmail",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateOrUpdateReportConfig"
+              }
             }
           },
+          "required": true,
+          "x-originalParamName": "body"
+        },
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "summary": "Send test report via email.",
+        "tags": [
+          "reports",
+          "enterprise"
+        ]
+      }
+    },
+    "/reports/{id}": {
+      "delete": {
+        "description": "Available to org admins only and with a valid or expired license.\n\nYou need to have a permission with action `reports.delete` with scope `reports:id:\u003creport ID\u003e`.",
+        "operationId": "deleteReport",
+        "parameters": [
           {
-            "in": "query",
-            "name": "limit",
+            "in": "path",
+            "name": "id",
+            "required": true,
             "schema": {
               "format": "int64",
               "type": "integer"
@@ -19249,7 +20105,10 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getOrgUsersForCurrentOrgLookupResponse"
+            "$ref": "#/components/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -19257,24 +20116,26 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get all users within the current organization (lookup)",
+        "summary": "Delete a report.",
         "tags": [
-          "org"
+          "reports",
+          "enterprise"
         ]
-      }
-    },
-    "/org/users/{user_id}": {
-      "delete": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:remove` with scope `users:*`.",
-        "operationId": "removeOrgUserForCurrentOrg",
+      },
+      "get": {
+        "description": "Available to org admins only and with a valid or expired license.\n\nYou need to have a permission with action `reports:read` with scope `reports:id:\u003creport ID\u003e`.",
+        "operationId": "getReport",
         "parameters": [
           {
             "in": "path",
-            "name": "user_id",
+            "name": "id",
             "required": true,
             "schema": {
               "format": "int64",
@@ -19284,7 +20145,7 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
+            "$ref": "#/components/responses/getReportResponse"
           },
           "400": {
             "$ref": "#/components/responses/badRequestError"
@@ -19295,22 +20156,26 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Delete user in current organization.",
+        "summary": "Get a report.",
         "tags": [
-          "org"
+          "reports",
+          "enterprise"
         ]
       },
-      "patch": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users.role:update` with scope `users:*`.",
-        "operationId": "updateOrgUserForCurrentOrg",
+      "put": {
+        "description": "Available to org admins only and with a valid or expired license.\n\nYou need to have a permission with action `reports.admin:write` with scope `reports:id:\u003creport ID\u003e`.",
+        "operationId": "updateReport",
         "parameters": [
           {
             "in": "path",
-            "name": "user_id",
+            "name": "id",
             "required": true,
             "schema": {
               "format": "int64",
@@ -19322,7 +20187,7 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/UpdateOrgUserCommand"
+                "$ref": "#/components/schemas/CreateOrUpdateReportConfig"
               }
             }
           },
@@ -19342,138 +20207,114 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Updates the given user.",
+        "summary": "Update a report.",
         "tags": [
-          "org"
+          "reports",
+          "enterprise"
         ]
       }
     },
-    "/orgs": {
-      "get": {
-        "operationId": "searchOrgs",
+    "/saml/acs": {
+      "post": {
+        "operationId": "postACS",
         "parameters": [
           {
             "in": "query",
-            "name": "page",
-            "schema": {
-              "default": 1,
-              "format": "int64",
-              "type": "integer"
-            }
-          },
-          {
-            "description": "Number of items per page\nThe totalCount field in the response can be used for pagination list E.g. if totalCount is equal to 100 teams and the perpage parameter is set to 10 then there are 10 pages of teams.",
-            "in": "query",
-            "name": "perpage",
-            "schema": {
-              "default": 1000,
-              "format": "int64",
-              "type": "integer"
-            }
-          },
-          {
-            "in": "query",
-            "name": "name",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "description": "If set it will return results where the query value is contained in the name field. Query values with spaces need to be URL encoded.",
-            "in": "query",
-            "name": "query",
+            "name": "RelayState",
             "schema": {
               "type": "string"
             }
           }
         ],
         "responses": {
-          "200": {
-            "$ref": "#/components/responses/searchOrgsResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
+          "302": {
+            "description": "(empty)"
           },
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "409": {
-            "$ref": "#/components/responses/conflictError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "security": [
-          {
-            "basic": []
-          }
-        ],
-        "summary": "Search all Organizations.",
+        "summary": "It performs Assertion Consumer Service (ACS).",
         "tags": [
-          "orgs"
+          "saml",
+          "enterprise"
         ]
-      },
-      "post": {
-        "description": "Only works if [users.allow_org_create](https://grafana.com/docs/grafana/latest/administration/configuration/#allow_org_create) is set.",
-        "operationId": "createOrg",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/CreateOrgCommand"
-              }
-            }
-          },
-          "required": true,
-          "x-originalParamName": "body"
-        },
+      }
+    },
+    "/saml/metadata": {
+      "get": {
+        "operationId": "getMetadata",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/createOrgResponse"
+            "$ref": "#/components/responses/contentResponse"
+          }
+        },
+        "summary": "It exposes the SP (Grafana's) metadata for the IdP's consumption.",
+        "tags": [
+          "saml",
+          "enterprise"
+        ]
+      }
+    },
+    "/saml/slo": {
+      "get": {
+        "description": "There might be two possible requests:\n1. Logout response (callback) when Grafana initiates single logout and IdP returns response to logout request.\n2. Logout request when another SP initiates single logout and IdP sends logout request to the Grafana,\nor in case of IdP-initiated logout.",
+        "operationId": "getSLO",
+        "responses": {
+          "302": {
+            "description": "(empty)"
           },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "409": {
-            "$ref": "#/components/responses/conflictError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Create Organization.",
+        "summary": "It performs Single Logout (SLO) callback.",
         "tags": [
-          "orgs"
+          "saml",
+          "enterprise"
         ]
-      }
-    },
-    "/orgs/name/{org_name}": {
-      "get": {
-        "operationId": "getOrgByName",
+      },
+      "post": {
+        "description": "There might be two possible requests:\n1. Logout response (callback) when Grafana initiates single logout and IdP returns response to logout request.\n2. Logout request when another SP initiates single logout and IdP sends logout request to the Grafana,\nor in case of IdP-initiated logout.",
+        "operationId": "postSLO",
         "parameters": [
           {
-            "in": "path",
-            "name": "org_name",
-            "required": true,
+            "in": "query",
+            "name": "SAMLRequest",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "SAMLResponse",
             "schema": {
               "type": "string"
             }
           }
         ],
         "responses": {
-          "200": {
-            "$ref": "#/components/responses/getOrgByNameResponse"
+          "302": {
+            "description": "(empty)"
           },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "403": {
             "$ref": "#/components/responses/forbiddenError"
@@ -19482,128 +20323,170 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "security": [
-          {
-            "basic": []
-          }
-        ],
-        "summary": "Get Organization by ID.",
+        "summary": "It performs Single Logout (SLO) callback.",
         "tags": [
-          "orgs"
+          "saml",
+          "enterprise"
         ]
       }
     },
-    "/orgs/{org_id}": {
-      "delete": {
-        "operationId": "deleteOrgByID",
+    "/search": {
+      "get": {
+        "operationId": "search",
         "parameters": [
           {
-            "in": "path",
-            "name": "org_id",
-            "required": true,
+            "description": "Search Query",
+            "in": "query",
+            "name": "query",
             "schema": {
-              "format": "int64",
-              "type": "integer"
+              "type": "string"
             }
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/okResponse"
           },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
+          {
+            "description": "List of tags to search for",
+            "in": "query",
+            "name": "tag",
+            "schema": {
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
+          {
+            "description": "Type to search for, dash-folder or dash-db",
+            "in": "query",
+            "name": "type",
+            "schema": {
+              "enum": [
+                "dash-folder",
+                "dash-db"
+              ],
+              "type": "string"
+            }
           },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
+          {
+            "description": "List of dashboard id’s to search for\nThis is deprecated: users should use the `dashboardUIDs` query parameter instead",
+            "in": "query",
+            "name": "dashboardIds",
+            "schema": {
+              "items": {
+                "format": "int64",
+                "type": "integer"
+              },
+              "type": "array"
+            }
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
+          {
+            "description": "List of dashboard uid’s to search for",
+            "in": "query",
+            "name": "dashboardUIDs",
+            "schema": {
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
           },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
-          }
-        },
-        "security": [
           {
-            "basic": []
-          }
-        ],
-        "summary": "Delete Organization.",
-        "tags": [
-          "orgs"
-        ]
-      },
-      "get": {
-        "operationId": "getOrgByID",
-        "parameters": [
+            "description": "List of folder id’s to search in for dashboards\nIf it's `0` then it will query for the top level folders\nThis is deprecated: users should use the `folderUIDs` query parameter instead",
+            "in": "query",
+            "name": "folderIds",
+            "schema": {
+              "items": {
+                "format": "int64",
+                "type": "integer"
+              },
+              "type": "array"
+            }
+          },
           {
-            "in": "path",
-            "name": "org_id",
-            "required": true,
+            "description": "List of folder UID’s to search in for dashboards\nIf it's an empty string then it will query for the top level folders",
+            "in": "query",
+            "name": "folderUIDs",
+            "schema": {
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
+          },
+          {
+            "description": "Flag indicating if only starred Dashboards should be returned",
+            "in": "query",
+            "name": "starred",
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "description": "Limit the number of returned results (max 5000)",
+            "in": "query",
+            "name": "limit",
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
+          },
+          {
+            "description": "Use this parameter to access hits beyond limit. Numbering starts at 1. limit param acts as page size. Only available in Grafana v6.2+.",
+            "in": "query",
+            "name": "page",
             "schema": {
               "format": "int64",
               "type": "integer"
             }
+          },
+          {
+            "description": "Set to `Edit` to return dashboards/folders that the user can edit",
+            "in": "query",
+            "name": "permission",
+            "schema": {
+              "default": "View",
+              "enum": [
+                "Edit",
+                "View"
+              ],
+              "type": "string"
+            }
+          },
+          {
+            "description": "Sort method; for listing all the possible sort methods use the search sorting endpoint.",
+            "in": "query",
+            "name": "sort",
+            "schema": {
+              "default": "alpha-asc",
+              "enum": [
+                "alpha-asc",
+                "alpha-desc"
+              ],
+              "type": "string"
+            }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getOrgByIDResponse"
+            "$ref": "#/components/responses/searchResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
+          "422": {
+            "$ref": "#/components/responses/unprocessableEntityError"
           },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "security": [
-          {
-            "basic": []
-          }
-        ],
-        "summary": "Get Organization by ID.",
         "tags": [
-          "orgs"
+          "search"
         ]
       },
-      "put": {
-        "operationId": "updateOrg",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "org_id",
-            "required": true,
-            "schema": {
-              "format": "int64",
-              "type": "integer"
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/UpdateOrgForm"
-              }
-            }
-          },
-          "required": true,
-          "x-originalParamName": "body"
-        },
+      "post": {
+        "operationId": "SearchDevices",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
+            "$ref": "#/components/responses/devicesSearchResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -19611,49 +20494,53 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "security": [
-          {
-            "basic": []
-          }
-        ],
-        "summary": "Update Organization.",
+        "summary": "Lists all devices within the last 30 days",
         "tags": [
-          "orgs"
+          "devices"
         ]
       }
     },
-    "/orgs/{org_id}/address": {
-      "put": {
-        "operationId": "updateOrgAddress",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "org_id",
-            "required": true,
-            "schema": {
-              "format": "int64",
-              "type": "integer"
-            }
+    "/search/sorting": {
+      "get": {
+        "operationId": "listSortOptions",
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/listSortOptionsResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
           }
-        ],
+        },
+        "summary": "List search sorting options.",
+        "tags": [
+          "search"
+        ]
+      }
+    },
+    "/serviceaccounts": {
+      "post": {
+        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:write` scope: `serviceaccounts:*`\n\nRequires basic authentication and that the authenticated user is a Grafana Admin.",
+        "operationId": "createServiceAccount",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/UpdateOrgAddressForm"
+                "$ref": "#/components/schemas/CreateServiceAccountForm"
               }
             }
           },
-          "required": true,
-          "x-originalParamName": "body"
+          "x-originalParamName": "Body"
         },
         "responses": {
-          "200": {
-            "$ref": "#/components/responses/okResponse"
+          "201": {
+            "$ref": "#/components/responses/createServiceAccountResponse"
           },
           "400": {
             "$ref": "#/components/responses/badRequestError"
@@ -19668,21 +20555,52 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Update Organization's address.",
+        "summary": "Create service account",
         "tags": [
-          "orgs"
+          "service_accounts"
         ]
       }
     },
-    "/orgs/{org_id}/quotas": {
+    "/serviceaccounts/search": {
       "get": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `orgs.quotas:read` and scope `org:id:1` (orgIDScope).",
-        "operationId": "getOrgQuota",
+        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:read` scope: `serviceaccounts:*`",
+        "operationId": "searchOrgServiceAccountsWithPaging",
         "parameters": [
           {
-            "in": "path",
-            "name": "org_id",
-            "required": true,
+            "in": "query",
+            "name": "Disabled",
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "in": "query",
+            "name": "expiredTokens",
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "description": "It will return results where the query value is contained in one of the name.\nQuery values with spaces need to be URL encoded.",
+            "in": "query",
+            "name": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "description": "The default value is 1000.",
+            "in": "query",
+            "name": "perpage",
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
+          },
+          {
+            "description": "The default value is 1.",
+            "in": "query",
+            "name": "page",
             "schema": {
               "format": "int64",
               "type": "integer"
@@ -19691,7 +20609,7 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getQuotaResponse"
+            "$ref": "#/components/responses/searchOrgServiceAccountsWithPagingResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -19699,35 +20617,24 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Fetch Organization quota.",
+        "summary": "Search service accounts with paging",
         "tags": [
-          "orgs"
+          "service_accounts"
         ]
       }
     },
-    "/orgs/{org_id}/quotas/{quota_target}": {
-      "put": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled, you need to have a permission with action `orgs.quotas:write` and scope `org:id:1` (orgIDScope).",
-        "operationId": "updateOrgQuota",
+    "/serviceaccounts/{serviceAccountId}": {
+      "delete": {
+        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:delete` scope: `serviceaccounts:id:1` (single service account)",
+        "operationId": "deleteServiceAccount",
         "parameters": [
           {
             "in": "path",
-            "name": "quota_target",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "org_id",
+            "name": "serviceAccountId",
             "required": true,
             "schema": {
               "format": "int64",
@@ -19735,53 +20642,35 @@
             }
           }
         ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/UpdateQuotaCmd"
-              }
-            }
-          },
-          "required": true,
-          "x-originalParamName": "body"
-        },
         "responses": {
           "200": {
             "$ref": "#/components/responses/okResponse"
           },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
+          },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "security": [
-          {
-            "basic": []
-          }
-        ],
-        "summary": "Update user quota.",
+        "summary": "Delete service account",
         "tags": [
-          "orgs"
+          "service_accounts"
         ]
-      }
-    },
-    "/orgs/{org_id}/users": {
+      },
       "get": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:read` with scope `users:*`.",
-        "operationId": "getOrgUsers",
+        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:read` scope: `serviceaccounts:id:1` (single service account)",
+        "operationId": "retrieveServiceAccount",
         "parameters": [
           {
             "in": "path",
-            "name": "org_id",
+            "name": "serviceAccountId",
             "required": true,
             "schema": {
               "format": "int64",
@@ -19791,7 +20680,10 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getOrgUsersResponse"
+            "$ref": "#/components/responses/retrieveServiceAccountResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -19799,27 +20691,25 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "security": [
-          {
-            "basic": []
-          }
-        ],
-        "summary": "Get Users in Organization.",
+        "summary": "Get single serviceaccount by Id",
         "tags": [
-          "orgs"
+          "service_accounts"
         ]
       },
-      "post": {
-        "description": "Adds a global user to the current organization.\n\nIf you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:add` with scope `users:*`.",
-        "operationId": "addOrgUser",
+      "patch": {
+        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:write` scope: `serviceaccounts:id:1` (single service account)",
+        "operationId": "updateServiceAccount",
         "parameters": [
           {
             "in": "path",
-            "name": "org_id",
+            "name": "serviceAccountId",
             "required": true,
             "schema": {
               "format": "int64",
@@ -19831,16 +20721,18 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/AddOrgUserCommand"
+                "$ref": "#/components/schemas/UpdateServiceAccountForm"
               }
             }
           },
-          "required": true,
-          "x-originalParamName": "body"
+          "x-originalParamName": "Body"
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
+            "$ref": "#/components/responses/updateServiceAccountResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -19848,24 +20740,27 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Add a new user to the current organization.",
+        "summary": "Update service account",
         "tags": [
-          "orgs"
+          "service_accounts"
         ]
       }
     },
-    "/orgs/{org_id}/users/search": {
+    "/serviceaccounts/{serviceAccountId}/tokens": {
       "get": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:read` with scope `users:*`.",
-        "operationId": "searchOrgUsers",
+        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:read` scope: `global:serviceaccounts:id:1` (single service account)\n\nRequires basic authentication and that the authenticated user is a Grafana Admin.",
+        "operationId": "listTokens",
         "parameters": [
           {
             "in": "path",
-            "name": "org_id",
+            "name": "serviceAccountId",
             "required": true,
             "schema": {
               "format": "int64",
@@ -19875,7 +20770,10 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/searchOrgUsersResponse"
+            "$ref": "#/components/responses/listTokensResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -19887,34 +20785,18 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "security": [
-          {
-            "basic": []
-          }
-        ],
-        "summary": "Search Users in Organization.",
+        "summary": "Get service account tokens",
         "tags": [
-          "orgs"
+          "service_accounts"
         ]
-      }
-    },
-    "/orgs/{org_id}/users/{user_id}": {
-      "delete": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users:remove` with scope `users:*`.",
-        "operationId": "removeOrgUser",
+      },
+      "post": {
+        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:write` scope: `serviceaccounts:id:1` (single service account)",
+        "operationId": "createToken",
         "parameters": [
           {
             "in": "path",
-            "name": "org_id",
-            "required": true,
-            "schema": {
-              "format": "int64",
-              "type": "integer"
-            }
-          },
-          {
-            "in": "path",
-            "name": "user_id",
+            "name": "serviceAccountId",
             "required": true,
             "schema": {
               "format": "int64",
@@ -19922,9 +20804,19 @@
             }
           }
         ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/AddServiceAccountTokenCommand"
+              }
+            }
+          },
+          "x-originalParamName": "Body"
+        },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
+            "$ref": "#/components/responses/createTokenResponse"
           },
           "400": {
             "$ref": "#/components/responses/badRequestError"
@@ -19935,22 +20827,30 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "409": {
+            "$ref": "#/components/responses/conflictError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Delete user in current organization.",
+        "summary": "CreateNewToken adds a token to a service account",
         "tags": [
-          "orgs"
+          "service_accounts"
         ]
-      },
-      "patch": {
-        "description": "If you are running Grafana Enterprise and have Fine-grained access control enabled\nyou need to have a permission with action: `org.users.role:update` with scope `users:*`.",
-        "operationId": "updateOrgUser",
+      }
+    },
+    "/serviceaccounts/{serviceAccountId}/tokens/{tokenId}": {
+      "delete": {
+        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:write` scope: `serviceaccounts:id:1` (single service account)\n\nRequires basic authentication and that the authenticated user is a Grafana Admin.",
+        "operationId": "deleteToken",
         "parameters": [
           {
             "in": "path",
-            "name": "org_id",
+            "name": "tokenId",
             "required": true,
             "schema": {
               "format": "int64",
@@ -19959,7 +20859,7 @@
           },
           {
             "in": "path",
-            "name": "user_id",
+            "name": "serviceAccountId",
             "required": true,
             "schema": {
               "format": "int64",
@@ -19967,17 +20867,6 @@
             }
           }
         ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/UpdateOrgUserCommand"
-              }
-            }
-          },
-          "required": true,
-          "x-originalParamName": "body"
-        },
         "responses": {
           "200": {
             "$ref": "#/components/responses/okResponse"
@@ -19991,66 +20880,72 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Update Users in Organization.",
+        "summary": "DeleteToken deletes service account tokens",
         "tags": [
-          "orgs"
+          "service_accounts"
         ]
       }
     },
-    "/playlists": {
+    "/signing-keys/keys": {
       "get": {
-        "operationId": "searchPlaylists",
-        "parameters": [
-          {
-            "in": "query",
-            "name": "query",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "description": "in:limit",
-            "in": "query",
-            "name": "limit",
-            "schema": {
-              "format": "int64",
-              "type": "integer"
-            }
-          }
-        ],
+        "description": "Required permissions\nNone",
+        "operationId": "retrieveJWKS",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/searchPlaylistsResponse"
+            "$ref": "#/components/responses/jwksResponse"
           },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get playlists.",
+        "summary": "Get JSON Web Key Set (JWKS) with all the keys that can be used to verify tokens (public keys)",
         "tags": [
-          "playlists"
+          "signing_keys"
         ]
-      },
+      }
+    },
+    "/snapshot/shared-options": {
+      "get": {
+        "operationId": "getSharingOptions",
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/getSharingOptionsResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          }
+        },
+        "summary": "Get snapshot sharing settings.",
+        "tags": [
+          "snapshots"
+        ]
+      }
+    },
+    "/snapshots": {
       "post": {
-        "operationId": "createPlaylist",
+        "description": "Snapshot public mode should be enabled or authentication is required.",
+        "operationId": "createDashboardSnapshot",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/CreatePlaylistCommand"
+                "$ref": "#/components/schemas/CreateDashboardSnapshotCommand"
               }
             }
           },
           "required": true,
-          "x-originalParamName": "Body"
+          "x-originalParamName": "body"
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/createPlaylistResponse"
+            "$ref": "#/components/responses/createDashboardSnapshotResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -20058,26 +20953,24 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Create playlist.",
+        "summary": "When creating a snapshot using the API, you have to provide the full dashboard payload including the snapshot data. This endpoint is designed for the Grafana UI.",
         "tags": [
-          "playlists"
+          "snapshots"
         ]
       }
     },
-    "/playlists/{uid}": {
-      "delete": {
-        "operationId": "deletePlaylist",
+    "/snapshots-delete/{deleteKey}": {
+      "get": {
+        "description": "Snapshot public mode should be enabled or authentication is required.",
+        "operationId": "deleteDashboardSnapshotByDeleteKey",
         "parameters": [
           {
             "in": "path",
-            "name": "uid",
+            "name": "deleteKey",
             "required": true,
             "schema": {
               "type": "string"
@@ -20101,17 +20994,19 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Delete playlist.",
+        "summary": "Delete Snapshot by deleteKey.",
         "tags": [
-          "playlists"
+          "snapshots"
         ]
-      },
-      "get": {
-        "operationId": "getPlaylist",
+      }
+    },
+    "/snapshots/{key}": {
+      "delete": {
+        "operationId": "deleteDashboardSnapshot",
         "parameters": [
           {
             "in": "path",
-            "name": "uid",
+            "name": "key",
             "required": true,
             "schema": {
               "type": "string"
@@ -20120,10 +21015,7 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getPlaylistResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
+            "$ref": "#/components/responses/okResponse"
           },
           "403": {
             "$ref": "#/components/responses/forbiddenError"
@@ -20135,37 +21027,49 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get playlist.",
+        "summary": "Delete Snapshot by Key.",
         "tags": [
-          "playlists"
+          "snapshots"
         ]
       },
-      "put": {
-        "operationId": "updatePlaylist",
+      "get": {
+        "operationId": "getDashboardSnapshot",
         "parameters": [
           {
             "in": "path",
-            "name": "uid",
+            "name": "key",
             "required": true,
             "schema": {
               "type": "string"
             }
           }
         ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/UpdatePlaylistCommand"
-              }
-            }
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/getDashboardSnapshotResponse"
           },
-          "required": true,
-          "x-originalParamName": "Body"
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
         },
+        "summary": "Get Snapshot by Key.",
+        "tags": [
+          "snapshots"
+        ]
+      }
+    },
+    "/stats": {
+      "get": {
+        "operationId": "listDevices",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/updatePlaylistResponse"
+            "$ref": "#/components/responses/devicesResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -20180,28 +21084,29 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Update playlist.",
+        "summary": "Lists all devices within the last 30 days",
         "tags": [
-          "playlists"
+          "devices"
         ]
       }
     },
-    "/playlists/{uid}/items": {
-      "get": {
-        "operationId": "getPlaylistItems",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "uid",
-            "required": true,
-            "schema": {
-              "type": "string"
+    "/teams": {
+      "post": {
+        "operationId": "createTeam",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateTeamCommand"
+              }
             }
-          }
-        ],
+          },
+          "required": true,
+          "x-originalParamName": "body"
+        },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getPlaylistItemsResponse"
+            "$ref": "#/components/responses/createTeamResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -20209,95 +21114,132 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
+          "409": {
+            "$ref": "#/components/responses/conflictError"
           },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get playlist items.",
+        "summary": "Add Team.",
         "tags": [
-          "playlists"
+          "teams"
         ]
       }
     },
-    "/query-history": {
+    "/teams/search": {
       "get": {
-        "description": "Returns a list of queries in the query history that matches the search criteria.\nQuery history search supports pagination. Use the `limit` parameter to control the maximum number of queries returned; the default limit is 100.\nYou can also use the `page` query parameter to fetch queries from any page other than the first one.",
-        "operationId": "searchQueries",
+        "operationId": "searchTeams",
         "parameters": [
           {
-            "description": "List of data source UIDs to search for",
             "in": "query",
-            "name": "datasourceUid",
+            "name": "page",
             "schema": {
-              "items": {
-                "type": "string"
-              },
-              "type": "array"
+              "default": 1,
+              "format": "int64",
+              "type": "integer"
             }
           },
           {
-            "description": "Text inside query or comments that is searched for",
+            "description": "Number of items per page\nThe totalCount field in the response can be used for pagination list E.g. if totalCount is equal to 100 teams and the perpage parameter is set to 10 then there are 10 pages of teams.",
             "in": "query",
-            "name": "searchString",
+            "name": "perpage",
             "schema": {
-              "type": "string"
+              "default": 1000,
+              "format": "int64",
+              "type": "integer"
             }
           },
           {
-            "description": "Flag indicating if only starred queries should be returned",
             "in": "query",
-            "name": "onlyStarred",
+            "name": "name",
             "schema": {
-              "type": "boolean"
+              "type": "string"
             }
           },
           {
-            "description": "Sort method",
+            "description": "If set it will return results where the query value is contained in the name field. Query values with spaces need to be URL encoded.",
             "in": "query",
-            "name": "sort",
+            "name": "query",
             "schema": {
-              "default": "time-desc",
-              "enum": [
-                "time-desc",
-                "time-asc"
-              ],
               "type": "string"
             }
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/searchTeamsResponse"
           },
-          {
-            "description": "Use this parameter to access hits beyond limit. Numbering starts at 1. limit param acts as page size.",
-            "in": "query",
-            "name": "page",
-            "schema": {
-              "format": "int64",
-              "type": "integer"
-            }
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
           },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "summary": "Team Search With Paging.",
+        "tags": [
+          "teams"
+        ]
+      }
+    },
+    "/teams/{teamId}/groups": {
+      "delete": {
+        "operationId": "removeTeamGroupApiQuery",
+        "parameters": [
           {
-            "description": "Limit the number of returned results",
             "in": "query",
-            "name": "limit",
+            "name": "groupId",
             "schema": {
-              "format": "int64",
-              "type": "integer"
+              "type": "string"
             }
           },
           {
-            "description": "From range for the query history search",
-            "in": "query",
-            "name": "from",
+            "in": "path",
+            "name": "teamId",
+            "required": true,
             "schema": {
               "format": "int64",
               "type": "integer"
             }
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
           },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "summary": "Remove External Group.",
+        "tags": [
+          "sync_team_groups",
+          "enterprise"
+        ]
+      },
+      "get": {
+        "operationId": "getTeamGroupsApi",
+        "parameters": [
           {
-            "description": "To range for the query history search",
-            "in": "query",
-            "name": "to",
+            "in": "path",
+            "name": "teamId",
+            "required": true,
             "schema": {
               "format": "int64",
               "type": "integer"
@@ -20306,28 +21248,48 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getQueryHistorySearchResponse"
+            "$ref": "#/components/responses/getTeamGroupsApiResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Query history search.",
+        "summary": "Get External Groups.",
         "tags": [
-          "query_history"
+          "sync_team_groups",
+          "enterprise"
         ]
       },
       "post": {
-        "description": "Adds new query to query history.",
-        "operationId": "createQuery",
+        "operationId": "addTeamGroupApi",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "teamId",
+            "required": true,
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
+          }
+        ],
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/CreateQueryInQueryHistoryCommand"
+                "$ref": "#/components/schemas/TeamGroupMapping"
               }
             }
           },
@@ -20336,7 +21298,7 @@
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getQueryHistoryResponse"
+            "$ref": "#/components/responses/okResponse"
           },
           "400": {
             "$ref": "#/components/responses/badRequestError"
@@ -20344,24 +21306,30 @@
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Add query to query history.",
+        "summary": "Add External Group.",
         "tags": [
-          "query_history"
+          "sync_team_groups",
+          "enterprise"
         ]
       }
     },
-    "/query-history/star/{query_history_uid}": {
+    "/teams/{team_id}": {
       "delete": {
-        "description": "Removes star from query in query history as specified by the UID.",
-        "operationId": "unstarQuery",
+        "operationId": "deleteTeamByID",
         "parameters": [
           {
             "in": "path",
-            "name": "query_history_uid",
+            "name": "team_id",
             "required": true,
             "schema": {
               "type": "string"
@@ -20370,27 +21338,32 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getQueryHistoryResponse"
+            "$ref": "#/components/responses/okResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Remove star to query in query history.",
+        "summary": "Delete Team By ID.",
         "tags": [
-          "query_history"
+          "teams"
         ]
       },
-      "post": {
-        "description": "Adds star to query in query history as specified by the UID.",
-        "operationId": "starQuery",
+      "get": {
+        "operationId": "getTeamByID",
         "parameters": [
           {
             "in": "path",
-            "name": "query_history_uid",
+            "name": "team_id",
             "required": true,
             "schema": {
               "type": "string"
@@ -20399,58 +21372,32 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getQueryHistoryResponse"
+            "$ref": "#/components/responses/getTeamByIDResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
-          }
-        },
-        "summary": "Add star to query in query history.",
-        "tags": [
-          "query_history"
-        ]
-      }
-    },
-    "/query-history/{query_history_uid}": {
-      "delete": {
-        "description": "Deletes an existing query in query history as specified by the UID. This operation cannot be reverted.",
-        "operationId": "deleteQuery",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "query_history_uid",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/getQueryHistoryDeleteQueryResponse"
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
           },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
           },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Delete query in query history.",
+        "summary": "Get Team By ID.",
         "tags": [
-          "query_history"
+          "teams"
         ]
       },
-      "patch": {
-        "description": "Updates comment for query in query history as specified by the UID.",
-        "operationId": "patchQueryComment",
+      "put": {
+        "operationId": "updateTeam",
         "parameters": [
           {
             "in": "path",
-            "name": "query_history_uid",
+            "name": "team_id",
             "required": true,
             "schema": {
               "type": "string"
@@ -20461,7 +21408,7 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/PatchQueryCommentInQueryHistoryCommand"
+                "$ref": "#/components/schemas/UpdateTeamCommand"
               }
             }
           },
@@ -20470,31 +21417,47 @@
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getQueryHistoryResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
+            "$ref": "#/components/responses/okResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "409": {
+            "$ref": "#/components/responses/conflictError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Update comment for query in query history.",
+        "summary": "Update Team.",
         "tags": [
-          "query_history"
+          "teams"
         ]
       }
     },
-    "/recording-rules": {
+    "/teams/{team_id}/members": {
       "get": {
-        "operationId": "listRecordingRules",
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/listRecordingRulesResponse"
-          },
+        "operationId": "getTeamMembers",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "team_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/getTeamMembersResponse"
+          },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
@@ -20508,19 +21471,28 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Lists all rules in the database: active or deleted.",
+        "summary": "Get Team Members.",
         "tags": [
-          "recording_rules",
-          "enterprise"
+          "teams"
         ]
       },
       "post": {
-        "operationId": "createRecordingRule",
+        "operationId": "addTeamMember",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "team_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/RecordingRuleJSON"
+                "$ref": "#/components/schemas/AddTeamMemberCommand"
               }
             }
           },
@@ -20529,7 +21501,7 @@
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/recordingRuleResponse"
+            "$ref": "#/components/responses/okResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -20544,28 +21516,37 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Create a recording rule that is then registered and started.",
+        "summary": "Add Team Member.",
         "tags": [
-          "recording_rules",
-          "enterprise"
+          "teams"
         ]
-      },
-      "put": {
-        "operationId": "updateRecordingRule",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/RecordingRuleJSON"
-              }
+      }
+    },
+    "/teams/{team_id}/members/{user_id}": {
+      "delete": {
+        "operationId": "removeTeamMember",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "team_id",
+            "required": true,
+            "schema": {
+              "type": "string"
             }
           },
-          "required": true,
-          "x-originalParamName": "body"
-        },
+          {
+            "in": "path",
+            "name": "user_id",
+            "required": true,
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
+          }
+        ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/recordingRuleResponse"
+            "$ref": "#/components/responses/okResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -20580,21 +21561,37 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Update the active status of a rule.",
+        "summary": "Remove Member From Team.",
         "tags": [
-          "recording_rules",
-          "enterprise"
+          "teams"
         ]
-      }
-    },
-    "/recording-rules/test": {
-      "post": {
-        "operationId": "testCreateRecordingRule",
+      },
+      "put": {
+        "operationId": "updateTeamMember",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "team_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "user_id",
+            "required": true,
+            "schema": {
+              "format": "int64",
+              "type": "integer"
+            }
+          }
+        ],
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/RecordingRuleJSON"
+                "$ref": "#/components/schemas/UpdateTeamMemberCommand"
               }
             }
           },
@@ -20614,51 +21611,95 @@
           "404": {
             "$ref": "#/components/responses/notFoundError"
           },
-          "422": {
-            "$ref": "#/components/responses/unprocessableEntityError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Test a recording rule.",
+        "summary": "Update Team Member.",
         "tags": [
-          "recording_rules",
-          "enterprise"
+          "teams"
         ]
       }
     },
-    "/recording-rules/writer": {
-      "delete": {
-        "operationId": "deleteRecordingRuleWriteTarget",
+    "/teams/{team_id}/preferences": {
+      "get": {
+        "operationId": "getTeamPreferences",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "team_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
+            "$ref": "#/components/responses/getPreferencesResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "summary": "Get Team Preferences.",
+        "tags": [
+          "teams"
+        ]
+      },
+      "put": {
+        "operationId": "updateTeamPreferences",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "team_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdatePrefsCmd"
+              }
+            }
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
+          "required": true,
+          "x-originalParamName": "body"
+        },
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
           },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Delete the remote write target.",
+        "summary": "Update Team Preferences.",
         "tags": [
-          "recording_rules",
-          "enterprise"
+          "teams"
         ]
-      },
+      }
+    },
+    "/user": {
       "get": {
-        "operationId": "getRecordingRuleWriteTarget",
+        "description": "Get (current authenticated user)",
+        "operationId": "getSignedInUser",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/recordingRuleWriteTargetResponse"
+            "$ref": "#/components/responses/userResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -20673,29 +21714,27 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Return the prometheus remote write target.",
         "tags": [
-          "recording_rules",
-          "enterprise"
+          "signed_in_user"
         ]
       },
-      "post": {
-        "description": "It returns a 422 if there is not an existing prometheus data source configured.",
-        "operationId": "createRecordingRuleWriteTarget",
+      "put": {
+        "operationId": "updateSignedInUser",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/PrometheusRemoteWriteTargetJSON"
+                "$ref": "#/components/schemas/UpdateUserCommand"
               }
             }
           },
+          "description": "To change the email, name, login, theme, provide another one.",
           "required": true,
           "x-originalParamName": "body"
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/recordingRuleWriteTargetResponse"
+            "$ref": "#/components/responses/okResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -20703,40 +21742,26 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
-          "422": {
-            "$ref": "#/components/responses/unprocessableEntityError"
+          "409": {
+            "$ref": "#/components/responses/conflictError"
           },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Create a remote write target.",
+        "summary": "Update signed in User.",
         "tags": [
-          "recording_rules",
-          "enterprise"
+          "signed_in_user"
         ]
       }
     },
-    "/recording-rules/{recordingRuleID}": {
-      "delete": {
-        "operationId": "deleteRecordingRule",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "recordingRuleID",
-            "required": true,
-            "schema": {
-              "format": "int64",
-              "type": "integer"
-            }
-          }
-        ],
+    "/user/auth-tokens": {
+      "get": {
+        "description": "Return a list of all auth tokens (devices) that the actual user currently have logged in from.",
+        "operationId": "getUserAuthTokens",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
+            "$ref": "#/components/responses/getUserAuthTokensResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -20744,64 +21769,37 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Delete removes the rule from the registry and stops it.",
+        "summary": "Auth tokens of the actual User.",
         "tags": [
-          "recording_rules",
-          "enterprise"
+          "signed_in_user"
         ]
       }
     },
-    "/reports": {
+    "/user/email/update": {
       "get": {
-        "description": "Available to org admins only and with a valid or expired license.\n\nYou need to have a permission with action `reports:read` with scope `reports:*`.",
-        "operationId": "getReports",
+        "description": "Update the email of user given a verification code.",
+        "operationId": "updateUserEmail",
         "responses": {
-          "200": {
-            "$ref": "#/components/responses/getReportsResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+          "302": {
+            "$ref": "#/components/responses/okResponse"
           }
         },
-        "summary": "List reports.",
+        "summary": "Update user email.",
         "tags": [
-          "reports",
-          "enterprise"
+          "user"
         ]
-      },
-      "post": {
-        "description": "Available to org admins only and with a valid license.\n\nYou need to have a permission with action `reports.admin:create`.",
-        "operationId": "createReport",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/CreateOrUpdateConfigCmd"
-              }
-            }
-          },
-          "required": true,
-          "x-originalParamName": "body"
-        },
+      }
+    },
+    "/user/helpflags/clear": {
+      "get": {
+        "operationId": "clearHelpFlags",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/createReportResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
+            "$ref": "#/components/responses/helpFlagResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -20809,41 +21807,32 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Create a report.",
+        "summary": "Clear user help flag.",
         "tags": [
-          "reports",
-          "enterprise"
+          "signed_in_user"
         ]
       }
     },
-    "/reports/email": {
-      "post": {
-        "description": "Generate and send a report. This API waits for the report to be generated before returning. We recommend that you set the client’s timeout to at least 60 seconds. Available to org admins only and with a valid license.\n\nOnly available in Grafana Enterprise v7.0+.\nThis API endpoint is experimental and may be deprecated in a future release. On deprecation, a migration strategy will be provided and the endpoint will remain functional until the next major release of Grafana.\n\nYou need to have a permission with action `reports:send`.",
-        "operationId": "sendReport",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/ReportEmailDTO"
-              }
+    "/user/helpflags/{flag_id}": {
+      "put": {
+        "operationId": "setHelpFlag",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "flag_id",
+            "required": true,
+            "schema": {
+              "type": "string"
             }
-          },
-          "required": true,
-          "x-originalParamName": "body"
-        },
+          }
+        ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
+            "$ref": "#/components/responses/helpFlagResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -20851,138 +21840,64 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Send a report.",
+        "summary": "Set user help flag.",
         "tags": [
-          "reports",
-          "enterprise"
+          "signed_in_user"
         ]
       }
     },
-    "/reports/render/pdf/{dashboardID}": {
+    "/user/orgs": {
       "get": {
-        "deprecated": true,
-        "description": "Please refer to [reports enterprise](#/reports/renderReportPDFs) instead. This will be removed in Grafana 10.",
-        "operationId": "renderReportPDF",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "DashboardID",
-            "required": true,
-            "schema": {
-              "format": "int64",
-              "type": "integer"
-            }
-          },
-          {
-            "in": "path",
-            "name": "dashboardID",
-            "required": true,
-            "schema": {
-              "format": "int64",
-              "type": "integer"
-            }
-          },
-          {
-            "in": "query",
-            "name": "title",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "query",
-            "name": "variables",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "query",
-            "name": "from",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "query",
-            "name": "to",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "query",
-            "name": "orientation",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "query",
-            "name": "layout",
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
+        "description": "Return a list of all organizations of the current user.",
+        "operationId": "getSignedInUserOrgList",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/contentResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
+            "$ref": "#/components/responses/getSignedInUserOrgListResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Render report for dashboard.",
+        "security": [
+          {
+            "basic": []
+          }
+        ],
+        "summary": "Organizations of the actual User.",
         "tags": [
-          "reports",
-          "enterprise"
+          "signed_in_user"
         ]
       }
     },
-    "/reports/render/pdfs": {
-      "get": {
-        "description": "Available to all users and with a valid license.",
-        "operationId": "renderReportPDFs",
-        "parameters": [
-          {
-            "in": "query",
-            "name": "dashboardID",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "query",
-            "name": "orientation",
-            "schema": {
-              "type": "string"
+    "/user/password": {
+      "put": {
+        "description": "Changes the password for the user.",
+        "operationId": "changeUserPassword",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ChangeUserPasswordCommand"
+              }
             }
           },
-          {
-            "in": "query",
-            "name": "layout",
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
+          "description": "To change the email, name, login, theme, provide another one.",
+          "required": true,
+          "x-originalParamName": "body"
+        },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/contentResponse"
+            "$ref": "#/components/responses/okResponse"
           },
           "400": {
             "$ref": "#/components/responses/badRequestError"
@@ -20990,49 +21905,50 @@
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Render report for multiple dashboards.",
+        "security": [
+          {
+            "basic": []
+          }
+        ],
+        "summary": "Change Password.",
         "tags": [
-          "reports",
-          "enterprise"
+          "signed_in_user"
         ]
       }
     },
-    "/reports/settings": {
+    "/user/preferences": {
       "get": {
-        "description": "Available to org admins only and with a valid or expired license.\n\nYou need to have a permission with action `reports.settings:read`x.",
-        "operationId": "getReportSettings",
+        "operationId": "getUserPreferences",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getReportSettingsResponse"
+            "$ref": "#/components/responses/getPreferencesResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get settings.",
+        "summary": "Get user preferences.",
         "tags": [
-          "reports",
-          "enterprise"
+          "user_preferences"
         ]
       },
-      "post": {
-        "description": "Available to org admins only and with a valid or expired license.\n\nYou need to have a permission with action `reports.settings:write`xx.",
-        "operationId": "saveReportSettings",
+      "patch": {
+        "operationId": "patchUserPreferences",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/SettingsDTO"
+                "$ref": "#/components/schemas/PatchPrefsCmd"
               }
             }
           },
@@ -21049,29 +21965,23 @@
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Save settings.",
+        "summary": "Patch user preferences.",
         "tags": [
-          "reports",
-          "enterprise"
+          "user_preferences"
         ]
-      }
-    },
-    "/reports/test-email": {
-      "post": {
-        "description": "Available to org admins only and with a valid license.\n\nYou need to have a permission with action `reports:send`.",
-        "operationId": "sendTestEmail",
-        "requestBody": {
-          "content": {
-            "application/json": {
+      },
+      "put": {
+        "description": "Omitting a key (`theme`, `homeDashboardId`, `timezone`) will cause the current value to be replaced with the system default value.",
+        "operationId": "updateUserPreferences",
+        "requestBody": {
+          "content": {
+            "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/CreateOrUpdateConfigCmd"
+                "$ref": "#/components/schemas/UpdatePrefsCmd"
               }
             }
           },
@@ -21088,6 +21998,26 @@
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "summary": "Update user preferences.",
+        "tags": [
+          "user_preferences"
+        ]
+      }
+    },
+    "/user/quotas": {
+      "get": {
+        "operationId": "getUserQuotas",
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/getQuotaResponse"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
@@ -21098,25 +22028,61 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Send test report via email.",
+        "summary": "Fetch user quota.",
         "tags": [
-          "reports",
-          "enterprise"
+          "signed_in_user"
         ]
       }
     },
-    "/reports/{id}": {
+    "/user/revoke-auth-token": {
+      "post": {
+        "description": "Revokes the given auth token (device) for the actual user. User of issued auth token (device) will no longer be logged in and will be required to authenticate again upon next activity.",
+        "operationId": "revokeUserAuthToken",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/RevokeAuthTokenCmd"
+              }
+            }
+          },
+          "required": true,
+          "x-originalParamName": "body"
+        },
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
+          }
+        },
+        "summary": "Revoke an auth token of the actual User.",
+        "tags": [
+          "signed_in_user"
+        ]
+      }
+    },
+    "/user/stars/dashboard/uid/{dashboard_uid}": {
       "delete": {
-        "description": "Available to org admins only and with a valid or expired license.\n\nYou need to have a permission with action `reports.delete` with scope `reports:id:\u003creport ID\u003e`.",
-        "operationId": "deleteReport",
+        "description": "Deletes the starring of the given Dashboard for the actual user.",
+        "operationId": "unstarDashboardByUID",
         "parameters": [
           {
             "in": "path",
-            "name": "id",
+            "name": "dashboard_uid",
             "required": true,
             "schema": {
-              "format": "int64",
-              "type": "integer"
+              "type": "string"
             }
           }
         ],
@@ -21133,36 +22099,31 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Delete a report.",
+        "summary": "Unstar a dashboard.",
         "tags": [
-          "reports",
-          "enterprise"
+          "signed_in_user"
         ]
       },
-      "get": {
-        "description": "Available to org admins only and with a valid or expired license.\n\nYou need to have a permission with action `reports:read` with scope `reports:id:\u003creport ID\u003e`.",
-        "operationId": "getReport",
+      "post": {
+        "description": "Stars the given Dashboard for the actual user.",
+        "operationId": "starDashboardByUID",
         "parameters": [
           {
             "in": "path",
-            "name": "id",
+            "name": "dashboard_uid",
             "required": true,
             "schema": {
-              "format": "int64",
-              "type": "integer"
+              "type": "string"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getReportResponse"
+            "$ref": "#/components/responses/okResponse"
           },
           "400": {
             "$ref": "#/components/responses/badRequestError"
@@ -21173,44 +22134,31 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get a report.",
+        "summary": "Star a dashboard.",
         "tags": [
-          "reports",
-          "enterprise"
+          "signed_in_user"
         ]
-      },
-      "put": {
-        "description": "Available to org admins only and with a valid or expired license.\n\nYou need to have a permission with action `reports.admin:write` with scope `reports:id:\u003creport ID\u003e`.",
-        "operationId": "updateReport",
+      }
+    },
+    "/user/stars/dashboard/{dashboard_id}": {
+      "delete": {
+        "deprecated": true,
+        "description": "Deletes the starring of the given Dashboard for the actual user.",
+        "operationId": "unstarDashboard",
         "parameters": [
           {
             "in": "path",
-            "name": "id",
+            "name": "dashboard_id",
             "required": true,
             "schema": {
-              "format": "int64",
-              "type": "integer"
+              "type": "string"
             }
           }
         ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/CreateOrUpdateConfigCmd"
-              }
-            }
-          },
-          "required": true,
-          "x-originalParamName": "body"
-        },
         "responses": {
           "200": {
             "$ref": "#/components/responses/okResponse"
@@ -21224,35 +22172,38 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Update a report.",
+        "summary": "Unstar a dashboard.",
         "tags": [
-          "reports",
-          "enterprise"
+          "signed_in_user"
         ]
-      }
-    },
-    "/saml/acs": {
+      },
       "post": {
-        "operationId": "postACS",
+        "deprecated": true,
+        "description": "Stars the given Dashboard for the actual user.",
+        "operationId": "starDashboard",
         "parameters": [
           {
-            "in": "query",
-            "name": "RelayState",
+            "in": "path",
+            "name": "dashboard_id",
+            "required": true,
             "schema": {
               "type": "string"
             }
           }
         ],
         "responses": {
-          "302": {
-            "description": "(empty)"
+          "200": {
+            "$ref": "#/components/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
           },
           "403": {
             "$ref": "#/components/responses/forbiddenError"
@@ -21261,38 +22212,22 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "It performs Assertion Consumer Service (ACS).",
+        "summary": "Star a dashboard.",
         "tags": [
-          "saml",
-          "enterprise"
+          "signed_in_user"
         ]
       }
     },
-    "/saml/metadata": {
+    "/user/teams": {
       "get": {
-        "operationId": "getMetadata",
+        "description": "Return a list of all teams that the current user is member of.",
+        "operationId": "getSignedInUserTeamList",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/contentResponse"
-          }
-        },
-        "summary": "It exposes the SP (Grafana's) metadata for the IdP's consumption.",
-        "tags": [
-          "saml",
-          "enterprise"
-        ]
-      }
-    },
-    "/saml/slo": {
-      "get": {
-        "description": "There might be two possible requests:\n1. Logout response (callback) when Grafana initiates single logout and IdP returns response to logout request.\n2. Logout request when another SP initiates single logout and IdP sends logout request to the Grafana,\nor in case of IdP-initiated logout.",
-        "operationId": "getSLO",
-        "responses": {
-          "302": {
-            "description": "(empty)"
+            "$ref": "#/components/responses/getSignedInUserTeamListResponse"
           },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
           },
           "403": {
             "$ref": "#/components/responses/forbiddenError"
@@ -21301,38 +22236,37 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "It performs Single Logout (SLO) callback.",
+        "summary": "Teams that the actual User is member of.",
         "tags": [
-          "saml",
-          "enterprise"
+          "signed_in_user"
         ]
-      },
+      }
+    },
+    "/user/using/{org_id}": {
       "post": {
-        "description": "There might be two possible requests:\n1. Logout response (callback) when Grafana initiates single logout and IdP returns response to logout request.\n2. Logout request when another SP initiates single logout and IdP sends logout request to the Grafana,\nor in case of IdP-initiated logout.",
-        "operationId": "postSLO",
+        "description": "Switch user context to the given organization.",
+        "operationId": "userSetUsingOrg",
         "parameters": [
           {
-            "in": "query",
-            "name": "SAMLRequest",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "query",
-            "name": "SAMLResponse",
+            "in": "path",
+            "name": "org_id",
+            "required": true,
             "schema": {
-              "type": "string"
+              "format": "int64",
+              "type": "integer"
             }
           }
         ],
         "responses": {
-          "302": {
-            "description": "(empty)"
+          "200": {
+            "$ref": "#/components/responses/okResponse"
           },
           "400": {
             "$ref": "#/components/responses/badRequestError"
           },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
@@ -21340,203 +22274,101 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "It performs Single Logout (SLO) callback.",
+        "summary": "Switch user context for signed in user.",
         "tags": [
-          "saml",
-          "enterprise"
+          "signed_in_user"
         ]
       }
     },
-    "/search": {
+    "/users": {
       "get": {
-        "operationId": "search",
+        "description": "Returns all users that the authenticated user has permission to view, admin permission required.",
+        "operationId": "searchUsers",
         "parameters": [
           {
-            "description": "Search Query",
+            "description": "Limit the maximum number of users to return per page",
             "in": "query",
-            "name": "query",
+            "name": "perpage",
             "schema": {
-              "type": "string"
+              "default": 1000,
+              "format": "int64",
+              "type": "integer"
             }
           },
           {
-            "description": "List of tags to search for",
-            "in": "query",
-            "name": "tag",
-            "schema": {
-              "items": {
-                "type": "string"
-              },
-              "type": "array"
-            }
-          },
-          {
-            "description": "Type to search for, dash-folder or dash-db",
-            "in": "query",
-            "name": "type",
-            "schema": {
-              "enum": [
-                "dash-folder",
-                "dash-db"
-              ],
-              "type": "string"
-            }
-          },
-          {
-            "description": "List of dashboard id’s to search for\nThis is deprecated: users should use the `dashboardUIDs` query parameter instead",
-            "in": "query",
-            "name": "dashboardIds",
-            "schema": {
-              "items": {
-                "format": "int64",
-                "type": "integer"
-              },
-              "type": "array"
-            }
-          },
-          {
-            "description": "List of dashboard uid’s to search for",
-            "in": "query",
-            "name": "dashboardUIDs",
-            "schema": {
-              "items": {
-                "type": "string"
-              },
-              "type": "array"
-            }
-          },
-          {
-            "description": "List of folder id’s to search in for dashboards\nIf it's `0` then it will query for the top level folders\nThis is deprecated: users should use the `folderUIDs` query parameter instead",
-            "in": "query",
-            "name": "folderIds",
-            "schema": {
-              "items": {
-                "format": "int64",
-                "type": "integer"
-              },
-              "type": "array"
-            }
-          },
-          {
-            "description": "List of folder UID’s to search in for dashboards\nIf it's an empty string then it will query for the top level folders",
-            "in": "query",
-            "name": "folderUIDs",
-            "schema": {
-              "items": {
-                "type": "string"
-              },
-              "type": "array"
-            }
-          },
-          {
-            "description": "Flag indicating if only starred Dashboards should be returned",
-            "in": "query",
-            "name": "starred",
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          {
-            "description": "Limit the number of returned results (max 5000)",
-            "in": "query",
-            "name": "limit",
-            "schema": {
-              "format": "int64",
-              "type": "integer"
-            }
-          },
-          {
-            "description": "Use this parameter to access hits beyond limit. Numbering starts at 1. limit param acts as page size. Only available in Grafana v6.2+.",
+            "description": "Page index for starting fetching users",
             "in": "query",
             "name": "page",
             "schema": {
+              "default": 1,
               "format": "int64",
               "type": "integer"
             }
-          },
-          {
-            "description": "Set to `Edit` to return dashboards/folders that the user can edit",
-            "in": "query",
-            "name": "permission",
-            "schema": {
-              "default": "View",
-              "enum": [
-                "Edit",
-                "View"
-              ],
-              "type": "string"
-            }
-          },
-          {
-            "description": "Sort method; for listing all the possible sort methods use the search sorting endpoint.",
-            "in": "query",
-            "name": "sort",
-            "schema": {
-              "default": "alpha-asc",
-              "enum": [
-                "alpha-asc",
-                "alpha-desc"
-              ],
-              "type": "string"
-            }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/searchResponse"
+            "$ref": "#/components/responses/searchUsersResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
-          "422": {
-            "$ref": "#/components/responses/unprocessableEntityError"
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
           },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
+        "summary": "Get users.",
         "tags": [
-          "search"
+          "users"
         ]
       }
     },
-    "/search/sorting": {
+    "/users/lookup": {
       "get": {
-        "operationId": "listSortOptions",
+        "operationId": "getUserByLoginOrEmail",
+        "parameters": [
+          {
+            "description": "loginOrEmail of the user",
+            "in": "query",
+            "name": "loginOrEmail",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/listSortOptionsResponse"
+            "$ref": "#/components/responses/userResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
+          },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "500": {
+            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "List search sorting options.",
+        "summary": "Get user by login or email.",
         "tags": [
-          "search"
+          "users"
         ]
       }
     },
-    "/serviceaccounts": {
-      "post": {
-        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:write` scope: `serviceaccounts:*`\n\nRequires basic authentication and that the authenticated user is a Grafana Admin.",
-        "operationId": "createServiceAccount",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/CreateServiceAccountForm"
-              }
-            }
-          },
-          "x-originalParamName": "Body"
-        },
+    "/users/search": {
+      "get": {
+        "operationId": "searchUsersWithPaging",
         "responses": {
-          "201": {
-            "$ref": "#/components/responses/createServiceAccountResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
+          "200": {
+            "$ref": "#/components/responses/searchUsersWithPagingResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -21544,56 +22376,27 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Create service account",
+        "summary": "Get users with paging.",
         "tags": [
-          "service_accounts"
+          "users"
         ]
       }
     },
-    "/serviceaccounts/search": {
+    "/users/{user_id}": {
       "get": {
-        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:read` scope: `serviceaccounts:*`",
-        "operationId": "searchOrgServiceAccountsWithPaging",
+        "operationId": "getUserByID",
         "parameters": [
           {
-            "in": "query",
-            "name": "Disabled",
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          {
-            "in": "query",
-            "name": "expiredTokens",
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          {
-            "description": "It will return results where the query value is contained in one of the name.\nQuery values with spaces need to be URL encoded.",
-            "in": "query",
-            "name": "query",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "description": "The default value is 1000.",
-            "in": "query",
-            "name": "perpage",
-            "schema": {
-              "format": "int64",
-              "type": "integer"
-            }
-          },
-          {
-            "description": "The default value is 1.",
-            "in": "query",
-            "name": "page",
+            "in": "path",
+            "name": "user_id",
+            "required": true,
             "schema": {
               "format": "int64",
               "type": "integer"
@@ -21602,7 +22405,7 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/searchOrgServiceAccountsWithPagingResponse"
+            "$ref": "#/components/responses/userResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -21610,24 +22413,25 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Search service accounts with paging",
+        "summary": "Get user by id.",
         "tags": [
-          "service_accounts"
+          "users"
         ]
-      }
-    },
-    "/serviceaccounts/{serviceAccountId}": {
-      "delete": {
-        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:delete` scope: `serviceaccounts:id:1` (single service account)",
-        "operationId": "deleteServiceAccount",
+      },
+      "put": {
+        "description": "Update the user identified by id.",
+        "operationId": "updateUser",
         "parameters": [
           {
             "in": "path",
-            "name": "serviceAccountId",
+            "name": "user_id",
             "required": true,
             "schema": {
               "format": "int64",
@@ -21635,12 +22439,21 @@
             }
           }
         ],
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/okResponse"
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateUserCommand"
+              }
+            }
           },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
+          "description": "To change the email, name, login, theme, provide another one.",
+          "required": true,
+          "x-originalParamName": "body"
+        },
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/okResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -21648,22 +22461,30 @@
           "403": {
             "$ref": "#/components/responses/forbiddenError"
           },
+          "404": {
+            "$ref": "#/components/responses/notFoundError"
+          },
+          "409": {
+            "$ref": "#/components/responses/conflictError"
+          },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Delete service account",
+        "summary": "Update user.",
         "tags": [
-          "service_accounts"
+          "users"
         ]
-      },
+      }
+    },
+    "/users/{user_id}/orgs": {
       "get": {
-        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:read` scope: `serviceaccounts:id:1` (single service account)",
-        "operationId": "retrieveServiceAccount",
+        "description": "Get organizations for user identified by id.",
+        "operationId": "getUserOrgList",
         "parameters": [
           {
             "in": "path",
-            "name": "serviceAccountId",
+            "name": "user_id",
             "required": true,
             "schema": {
               "format": "int64",
@@ -21673,10 +22494,7 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/retrieveServiceAccountResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
+            "$ref": "#/components/responses/getUserOrgListResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -21691,18 +22509,20 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get single serviceaccount by Id",
+        "summary": "Get organizations for user.",
         "tags": [
-          "service_accounts"
+          "users"
         ]
-      },
-      "patch": {
-        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:write` scope: `serviceaccounts:id:1` (single service account)",
-        "operationId": "updateServiceAccount",
+      }
+    },
+    "/users/{user_id}/teams": {
+      "get": {
+        "description": "Get teams for user identified by id.",
+        "operationId": "getUserTeams",
         "parameters": [
           {
             "in": "path",
-            "name": "serviceAccountId",
+            "name": "user_id",
             "required": true,
             "schema": {
               "format": "int64",
@@ -21710,22 +22530,9 @@
             }
           }
         ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/UpdateServiceAccountForm"
-              }
-            }
-          },
-          "x-originalParamName": "Body"
-        },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/updateServiceAccountResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
+            "$ref": "#/components/responses/getUserTeamsResponse"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -21740,60 +22547,40 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Update service account",
+        "summary": "Get teams for user.",
         "tags": [
-          "service_accounts"
+          "users"
         ]
       }
     },
-    "/serviceaccounts/{serviceAccountId}/tokens": {
+    "/v1/provisioning/alert-rules": {
       "get": {
-        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:read` scope: `global:serviceaccounts:id:1` (single service account)\n\nRequires basic authentication and that the authenticated user is a Grafana Admin.",
-        "operationId": "listTokens",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "serviceAccountId",
-            "required": true,
-            "schema": {
-              "format": "int64",
-              "type": "integer"
-            }
-          }
-        ],
+        "operationId": "RouteGetAlertRules",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/listTokensResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProvisionedAlertRules"
+                }
+              }
+            },
+            "description": "ProvisionedAlertRules"
           }
         },
-        "summary": "Get service account tokens",
+        "summary": "Get all the alert rules.",
         "tags": [
-          "service_accounts"
+          "provisioning"
         ]
       },
       "post": {
-        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:write` scope: `serviceaccounts:id:1` (single service account)",
-        "operationId": "createToken",
+        "operationId": "RoutePostAlertRule",
         "parameters": [
           {
-            "in": "path",
-            "name": "serviceAccountId",
-            "required": true,
+            "in": "header",
+            "name": "X-Disable-Provenance",
             "schema": {
-              "format": "int64",
-              "type": "integer"
+              "type": "string"
             }
           }
         ],
@@ -21801,205 +22588,174 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/AddServiceAccountTokenCommand"
+                "$ref": "#/components/schemas/ProvisionedAlertRule"
               }
             }
           },
           "x-originalParamName": "Body"
         },
         "responses": {
-          "200": {
-            "$ref": "#/components/responses/createTokenResponse"
+          "201": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProvisionedAlertRule"
+                }
+              }
+            },
+            "description": "ProvisionedAlertRule"
           },
           "400": {
-            "$ref": "#/components/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
-          "409": {
-            "$ref": "#/components/responses/conflictError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ValidationError"
+                }
+              }
+            },
+            "description": "ValidationError"
           }
         },
-        "summary": "CreateNewToken adds a token to a service account",
+        "summary": "Create a new alert rule.",
         "tags": [
-          "service_accounts"
+          "provisioning"
         ]
       }
     },
-    "/serviceaccounts/{serviceAccountId}/tokens/{tokenId}": {
-      "delete": {
-        "description": "Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):\naction: `serviceaccounts:write` scope: `serviceaccounts:id:1` (single service account)\n\nRequires basic authentication and that the authenticated user is a Grafana Admin.",
-        "operationId": "deleteToken",
+    "/v1/provisioning/alert-rules/export": {
+      "get": {
+        "operationId": "RouteGetAlertRulesExport",
         "parameters": [
           {
-            "in": "path",
-            "name": "tokenId",
-            "required": true,
+            "description": "Whether to initiate a download of the file or not.",
+            "in": "query",
+            "name": "download",
             "schema": {
-              "format": "int64",
-              "type": "integer"
+              "default": false,
+              "type": "boolean"
             }
           },
           {
-            "in": "path",
-            "name": "serviceAccountId",
-            "required": true,
+            "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+            "in": "query",
+            "name": "format",
             "schema": {
-              "format": "int64",
-              "type": "integer"
+              "default": "yaml",
+              "enum": [
+                "yaml",
+                "json",
+                "hcl"
+              ],
+              "type": "string"
+            }
+          },
+          {
+            "description": "UIDs of folders from which to export rules",
+            "in": "query",
+            "name": "folderUid",
+            "schema": {
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
+          },
+          {
+            "description": "Name of group of rules to export. Must be specified only together with a single folder UID",
+            "in": "query",
+            "name": "group",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "description": "UID of alert rule to export. If specified, parameters folderUid and group must be empty.",
+            "in": "query",
+            "name": "ruleUid",
+            "schema": {
+              "type": "string"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "application/terraform+hcl": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "application/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "text/hcl": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "text/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              }
+            },
+            "description": "AlertingFileExport"
           },
           "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+            "description": " Not found."
           }
         },
-        "summary": "DeleteToken deletes service account tokens",
-        "tags": [
-          "service_accounts"
-        ]
-      }
-    },
-    "/signing-keys/keys": {
-      "get": {
-        "description": "Required permissions\nNone",
-        "operationId": "retrieveJWKS",
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/jwksResponse"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
-          }
-        },
-        "summary": "Get JSON Web Key Set (JWKS) with all the keys that can be used to verify tokens (public keys)",
-        "tags": [
-          "signing_keys"
-        ]
-      }
-    },
-    "/snapshot/shared-options": {
-      "get": {
-        "operationId": "getSharingOptions",
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/getSharingOptionsResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          }
-        },
-        "summary": "Get snapshot sharing settings.",
-        "tags": [
-          "snapshots"
-        ]
-      }
-    },
-    "/snapshots": {
-      "post": {
-        "description": "Snapshot public mode should be enabled or authentication is required.",
-        "operationId": "createDashboardSnapshot",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/CreateDashboardSnapshotCommand"
-              }
-            }
-          },
-          "required": true,
-          "x-originalParamName": "body"
-        },
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/createDashboardSnapshotResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
-          }
-        },
-        "summary": "When creating a snapshot using the API, you have to provide the full dashboard payload including the snapshot data. This endpoint is designed for the Grafana UI.",
+        "summary": "Export all alert rules in provisioning file format.",
         "tags": [
-          "snapshots"
+          "provisioning"
         ]
       }
     },
-    "/snapshots-delete/{deleteKey}": {
-      "get": {
-        "description": "Snapshot public mode should be enabled or authentication is required.",
-        "operationId": "deleteDashboardSnapshotByDeleteKey",
+    "/v1/provisioning/alert-rules/{UID}": {
+      "delete": {
+        "operationId": "RouteDeleteAlertRule",
         "parameters": [
           {
+            "description": "Alert rule UID",
             "in": "path",
-            "name": "deleteKey",
+            "name": "UID",
             "required": true,
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "in": "header",
+            "name": "X-Disable-Provenance",
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "responses": {
-          "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+          "204": {
+            "description": " The alert rule was deleted successfully."
           }
         },
-        "summary": "Delete Snapshot by deleteKey.",
+        "summary": "Delete a specific alert rule by UID.",
         "tags": [
-          "snapshots"
+          "provisioning"
         ]
-      }
-    },
-    "/snapshots/{key}": {
-      "delete": {
-        "operationId": "deleteDashboardSnapshot",
+      },
+      "get": {
+        "operationId": "RouteGetAlertRule",
         "parameters": [
           {
+            "description": "Alert rule UID",
             "in": "path",
-            "name": "key",
+            "name": "UID",
             "required": true,
             "schema": {
               "type": "string"
@@ -22008,126 +22764,114 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProvisionedAlertRule"
+                }
+              }
+            },
+            "description": "ProvisionedAlertRule"
           },
           "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+            "description": " Not found."
           }
         },
-        "summary": "Delete Snapshot by Key.",
+        "summary": "Get a specific alert rule by UID.",
         "tags": [
-          "snapshots"
+          "provisioning"
         ]
       },
-      "get": {
-        "operationId": "getDashboardSnapshot",
+      "put": {
+        "operationId": "RoutePutAlertRule",
         "parameters": [
           {
+            "description": "Alert rule UID",
             "in": "path",
-            "name": "key",
+            "name": "UID",
             "required": true,
             "schema": {
               "type": "string"
             }
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/getDashboardSnapshotResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+          {
+            "in": "header",
+            "name": "X-Disable-Provenance",
+            "schema": {
+              "type": "string"
+            }
           }
-        },
-        "summary": "Get Snapshot by Key.",
-        "tags": [
-          "snapshots"
-        ]
-      }
-    },
-    "/teams": {
-      "post": {
-        "operationId": "createTeam",
+        ],
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/CreateTeamCommand"
+                "$ref": "#/components/schemas/ProvisionedAlertRule"
               }
             }
           },
-          "required": true,
-          "x-originalParamName": "body"
+          "x-originalParamName": "Body"
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/createTeamResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "409": {
-            "$ref": "#/components/responses/conflictError"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProvisionedAlertRule"
+                }
+              }
+            },
+            "description": "ProvisionedAlertRule"
           },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+          "400": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ValidationError"
+                }
+              }
+            },
+            "description": "ValidationError"
           }
         },
-        "summary": "Add Team.",
+        "summary": "Update an existing alert rule.",
         "tags": [
-          "teams"
+          "provisioning"
         ]
       }
     },
-    "/teams/search": {
+    "/v1/provisioning/alert-rules/{UID}/export": {
       "get": {
-        "operationId": "searchTeams",
+        "operationId": "RouteGetAlertRuleExport",
         "parameters": [
           {
+            "description": "Whether to initiate a download of the file or not.",
             "in": "query",
-            "name": "page",
-            "schema": {
-              "default": 1,
-              "format": "int64",
-              "type": "integer"
-            }
-          },
-          {
-            "description": "Number of items per page\nThe totalCount field in the response can be used for pagination list E.g. if totalCount is equal to 100 teams and the perpage parameter is set to 10 then there are 10 pages of teams.",
-            "in": "query",
-            "name": "perpage",
+            "name": "download",
             "schema": {
-              "default": 1000,
-              "format": "int64",
-              "type": "integer"
+              "default": false,
+              "type": "boolean"
             }
           },
           {
+            "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
             "in": "query",
-            "name": "name",
+            "name": "format",
             "schema": {
+              "default": "yaml",
+              "enum": [
+                "yaml",
+                "json",
+                "hcl"
+              ],
               "type": "string"
             }
           },
           {
-            "description": "If set it will return results where the query value is contained in the name field. Query values with spaces need to be URL encoded.",
-            "in": "query",
-            "name": "query",
+            "description": "Alert rule UID",
+            "in": "path",
+            "name": "UID",
+            "required": true,
             "schema": {
               "type": "string"
             }
@@ -22135,120 +22879,83 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/searchTeamsResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "application/terraform+hcl": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "application/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "text/hcl": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "text/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              }
+            },
+            "description": "AlertingFileExport"
           },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+          "404": {
+            "description": " Not found."
           }
         },
-        "summary": "Team Search With Paging.",
+        "summary": "Export an alert rule in provisioning file format.",
         "tags": [
-          "teams"
+          "provisioning"
         ]
       }
     },
-    "/teams/{teamId}/groups": {
-      "delete": {
-        "operationId": "removeTeamGroupApiQuery",
+    "/v1/provisioning/contact-points": {
+      "get": {
+        "operationId": "RouteGetContactpoints",
         "parameters": [
           {
+            "description": "Filter by name",
             "in": "query",
-            "name": "groupId",
+            "name": "name",
             "schema": {
               "type": "string"
             }
-          },
-          {
-            "in": "path",
-            "name": "teamId",
-            "required": true,
-            "schema": {
-              "format": "int64",
-              "type": "integer"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
-          }
-        },
-        "summary": "Remove External Group.",
-        "tags": [
-          "sync_team_groups",
-          "enterprise"
-        ]
-      },
-      "get": {
-        "operationId": "getTeamGroupsApi",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "teamId",
-            "required": true,
-            "schema": {
-              "format": "int64",
-              "type": "integer"
-            }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getTeamGroupsApiResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ContactPoints"
+                }
+              }
+            },
+            "description": "ContactPoints"
           }
         },
-        "summary": "Get External Groups.",
+        "summary": "Get all the contact points.",
         "tags": [
-          "sync_team_groups",
-          "enterprise"
+          "provisioning"
         ]
       },
       "post": {
-        "operationId": "addTeamGroupApi",
+        "operationId": "RoutePostContactpoints",
         "parameters": [
           {
-            "in": "path",
-            "name": "teamId",
-            "required": true,
+            "in": "header",
+            "name": "X-Disable-Provenance",
             "schema": {
-              "format": "int64",
-              "type": "integer"
+              "type": "string"
             }
           }
         ],
@@ -22256,82 +22963,80 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/TeamGroupMapping"
+                "$ref": "#/components/schemas/EmbeddedContactPoint"
               }
             }
           },
-          "required": true,
-          "x-originalParamName": "body"
+          "x-originalParamName": "Body"
         },
         "responses": {
-          "200": {
-            "$ref": "#/components/responses/okResponse"
+          "202": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EmbeddedContactPoint"
+                }
+              }
+            },
+            "description": "EmbeddedContactPoint"
           },
           "400": {
-            "$ref": "#/components/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ValidationError"
+                }
+              }
+            },
+            "description": "ValidationError"
           }
         },
-        "summary": "Add External Group.",
+        "summary": "Create a contact point.",
         "tags": [
-          "sync_team_groups",
-          "enterprise"
+          "provisioning"
         ]
       }
     },
-    "/teams/{team_id}": {
-      "delete": {
-        "operationId": "deleteTeamByID",
+    "/v1/provisioning/contact-points/export": {
+      "get": {
+        "operationId": "RouteGetContactpointsExport",
         "parameters": [
           {
-            "in": "path",
-            "name": "team_id",
-            "required": true,
+            "description": "Whether to initiate a download of the file or not.",
+            "in": "query",
+            "name": "download",
             "schema": {
-              "type": "string"
+              "default": false,
+              "type": "boolean"
             }
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
           },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
+          {
+            "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+            "in": "query",
+            "name": "format",
+            "schema": {
+              "default": "yaml",
+              "enum": [
+                "yaml",
+                "json",
+                "hcl"
+              ],
+              "type": "string"
+            }
           },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
+          {
+            "description": "Whether any contained secure settings should be decrypted or left redacted. Redacted settings will contain RedactedValue instead. Currently, only org admin can view decrypted secure settings.",
+            "in": "query",
+            "name": "decrypt",
+            "schema": {
+              "default": false,
+              "type": "boolean"
+            }
           },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
-          }
-        },
-        "summary": "Delete Team By ID.",
-        "tags": [
-          "teams"
-        ]
-      },
-      "get": {
-        "operationId": "getTeamByID",
-        "parameters": [
           {
-            "in": "path",
-            "name": "team_id",
-            "required": true,
+            "description": "Filter by name",
+            "in": "query",
+            "name": "name",
             "schema": {
               "type": "string"
             }
@@ -22339,82 +23044,80 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getTeamByIDResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
-          }
-        },
-        "summary": "Get Team By ID.",
-        "tags": [
-          "teams"
-        ]
-      },
-      "put": {
-        "operationId": "updateTeam",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "team_id",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/UpdateTeamCommand"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "application/terraform+hcl": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "application/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "text/hcl": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "text/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
               }
-            }
-          },
-          "required": true,
-          "x-originalParamName": "body"
-        },
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
+            },
+            "description": "AlertingFileExport"
           },
           "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
-          "409": {
-            "$ref": "#/components/responses/conflictError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PermissionDenied"
+                }
+              },
+              "application/terraform+hcl": {
+                "schema": {
+                  "$ref": "#/components/schemas/PermissionDenied"
+                }
+              },
+              "application/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/PermissionDenied"
+                }
+              },
+              "text/hcl": {
+                "schema": {
+                  "$ref": "#/components/schemas/PermissionDenied"
+                }
+              },
+              "text/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/PermissionDenied"
+                }
+              }
+            },
+            "description": "PermissionDenied"
           }
         },
-        "summary": "Update Team.",
+        "summary": "Export all contact points in provisioning file format.",
         "tags": [
-          "teams"
+          "provisioning"
         ]
       }
     },
-    "/teams/{team_id}/members": {
-      "get": {
-        "operationId": "getTeamMembers",
+    "/v1/provisioning/contact-points/{UID}": {
+      "delete": {
+        "operationId": "RouteDeleteContactpoints",
         "parameters": [
           {
+            "description": "UID is the contact point unique identifier",
             "in": "path",
-            "name": "team_id",
+            "name": "UID",
             "required": true,
             "schema": {
               "type": "string"
@@ -22422,80 +23125,81 @@
           }
         ],
         "responses": {
-          "200": {
-            "$ref": "#/components/responses/getTeamMembersResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+          "202": {
+            "description": " The contact point was deleted successfully."
           }
         },
-        "summary": "Get Team Members.",
+        "summary": "Delete a contact point.",
         "tags": [
-          "teams"
+          "provisioning"
         ]
       },
-      "post": {
-        "operationId": "addTeamMember",
+      "put": {
+        "operationId": "RoutePutContactpoint",
         "parameters": [
           {
+            "description": "UID is the contact point unique identifier",
             "in": "path",
-            "name": "team_id",
+            "name": "UID",
             "required": true,
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "in": "header",
+            "name": "X-Disable-Provenance",
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/AddTeamMemberCommand"
+                "$ref": "#/components/schemas/EmbeddedContactPoint"
               }
             }
           },
-          "required": true,
-          "x-originalParamName": "body"
+          "x-originalParamName": "Body"
         },
         "responses": {
-          "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
+          "202": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Ack"
+                }
+              }
+            },
+            "description": "Ack"
           },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+          "400": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ValidationError"
+                }
+              }
+            },
+            "description": "ValidationError"
           }
         },
-        "summary": "Add Team Member.",
+        "summary": "Update an existing contact point.",
         "tags": [
-          "teams"
+          "provisioning"
         ]
       }
     },
-    "/teams/{team_id}/members/{user_id}": {
+    "/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}": {
       "delete": {
-        "operationId": "removeTeamMember",
+        "description": "Delete rule group",
+        "operationId": "RouteDeleteAlertRuleGroup",
         "parameters": [
           {
             "in": "path",
-            "name": "team_id",
+            "name": "FolderUID",
             "required": true,
             "schema": {
               "type": "string"
@@ -22503,42 +23207,48 @@
           },
           {
             "in": "path",
-            "name": "user_id",
+            "name": "Group",
             "required": true,
             "schema": {
-              "format": "int64",
-              "type": "integer"
+              "type": "string"
             }
           }
         ],
         "responses": {
-          "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
+          "204": {
+            "description": " The alert rule group was deleted successfully."
           },
           "403": {
-            "$ref": "#/components/responses/forbiddenError"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ForbiddenError"
+                }
+              }
+            },
+            "description": "ForbiddenError"
           },
           "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/NotFound"
+                }
+              }
+            },
+            "description": "NotFound"
           }
         },
-        "summary": "Remove Member From Team.",
         "tags": [
-          "teams"
+          "provisioning"
         ]
       },
-      "put": {
-        "operationId": "updateTeamMember",
+      "get": {
+        "operationId": "RouteGetAlertRuleGroup",
         "parameters": [
           {
             "in": "path",
-            "name": "team_id",
+            "name": "FolderUID",
             "required": true,
             "schema": {
               "type": "string"
@@ -22546,83 +23256,54 @@
           },
           {
             "in": "path",
-            "name": "user_id",
+            "name": "Group",
             "required": true,
             "schema": {
-              "format": "int64",
-              "type": "integer"
+              "type": "string"
             }
           }
         ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/UpdateTeamMemberCommand"
-              }
-            }
-          },
-          "required": true,
-          "x-originalParamName": "body"
-        },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertRuleGroup"
+                }
+              }
+            },
+            "description": "AlertRuleGroup"
           },
           "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+            "description": " Not found."
           }
         },
-        "summary": "Update Team Member.",
+        "summary": "Get a rule group.",
         "tags": [
-          "teams"
+          "provisioning"
         ]
-      }
-    },
-    "/teams/{team_id}/preferences": {
-      "get": {
-        "operationId": "getTeamPreferences",
+      },
+      "put": {
+        "operationId": "RoutePutAlertRuleGroup",
         "parameters": [
+          {
+            "in": "header",
+            "name": "X-Disable-Provenance",
+            "schema": {
+              "type": "string"
+            }
+          },
           {
             "in": "path",
-            "name": "team_id",
+            "name": "FolderUID",
             "required": true,
             "schema": {
               "type": "string"
             }
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/getPreferencesResponse"
           },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
-          }
-        },
-        "summary": "Get Team Preferences.",
-        "tags": [
-          "teams"
-        ]
-      },
-      "put": {
-        "operationId": "updateTeamPreferences",
-        "parameters": [
           {
             "in": "path",
-            "name": "team_id",
+            "name": "Group",
             "required": true,
             "schema": {
               "type": "string"
@@ -22633,437 +23314,446 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/UpdatePrefsCmd"
+                "$ref": "#/components/schemas/AlertRuleGroup"
               }
             }
           },
-          "required": true,
-          "x-originalParamName": "body"
+          "x-originalParamName": "Body"
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertRuleGroup"
+                }
+              }
+            },
+            "description": "AlertRuleGroup"
           },
           "400": {
-            "$ref": "#/components/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ValidationError"
+                }
+              }
+            },
+            "description": "ValidationError"
           }
         },
-        "summary": "Update Team Preferences.",
+        "summary": "Create or update alert rule group.",
         "tags": [
-          "teams"
+          "provisioning"
         ]
       }
     },
-    "/user": {
+    "/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}/export": {
       "get": {
-        "description": "Get (current authenticated user)",
-        "operationId": "getSignedInUser",
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/userResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
-          }
-        },
-        "tags": [
-          "signed_in_user"
-        ]
-      },
-      "put": {
-        "operationId": "updateSignedInUser",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/UpdateUserCommand"
-              }
+        "operationId": "RouteGetAlertRuleGroupExport",
+        "parameters": [
+          {
+            "description": "Whether to initiate a download of the file or not.",
+            "in": "query",
+            "name": "download",
+            "schema": {
+              "default": false,
+              "type": "boolean"
             }
           },
-          "description": "To change the email, name, login, theme, provide another one.",
-          "required": true,
-          "x-originalParamName": "body"
-        },
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
+          {
+            "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+            "in": "query",
+            "name": "format",
+            "schema": {
+              "default": "yaml",
+              "enum": [
+                "yaml",
+                "json",
+                "hcl"
+              ],
+              "type": "string"
+            }
           },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
+          {
+            "in": "path",
+            "name": "FolderUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
           },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+          {
+            "in": "path",
+            "name": "Group",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
           }
-        },
-        "summary": "Update signed in User.",
-        "tags": [
-          "signed_in_user"
-        ]
-      }
-    },
-    "/user/auth-tokens": {
-      "get": {
-        "description": "Return a list of all auth tokens (devices) that the actual user currently have logged in from.",
-        "operationId": "getUserAuthTokens",
+        ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getUserAuthTokensResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "application/terraform+hcl": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "application/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "text/hcl": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "text/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              }
+            },
+            "description": "AlertingFileExport"
           },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+          "404": {
+            "description": " Not found."
           }
         },
-        "summary": "Auth tokens of the actual User.",
+        "summary": "Export an alert rule group in provisioning file format.",
         "tags": [
-          "signed_in_user"
+          "provisioning"
         ]
       }
     },
-    "/user/helpflags/clear": {
+    "/v1/provisioning/mute-timings": {
       "get": {
-        "operationId": "clearHelpFlags",
+        "operationId": "RouteGetMuteTimings",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/helpFlagResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/MuteTimings"
+                }
+              }
+            },
+            "description": "MuteTimings"
           }
         },
-        "summary": "Clear user help flag.",
+        "summary": "Get all the mute timings.",
         "tags": [
-          "signed_in_user"
+          "provisioning"
         ]
-      }
-    },
-    "/user/helpflags/{flag_id}": {
-      "put": {
-        "operationId": "setHelpFlag",
+      },
+      "post": {
+        "operationId": "RoutePostMuteTiming",
         "parameters": [
           {
-            "in": "path",
-            "name": "flag_id",
-            "required": true,
+            "in": "header",
+            "name": "X-Disable-Provenance",
             "schema": {
               "type": "string"
             }
           }
         ],
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/helpFlagResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/MuteTimeInterval"
+              }
+            }
           },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+          "x-originalParamName": "Body"
+        },
+        "responses": {
+          "201": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/MuteTimeInterval"
+                }
+              }
+            },
+            "description": "MuteTimeInterval"
+          },
+          "400": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ValidationError"
+                }
+              }
+            },
+            "description": "ValidationError"
           }
         },
-        "summary": "Set user help flag.",
+        "summary": "Create a new mute timing.",
         "tags": [
-          "signed_in_user"
+          "provisioning"
         ]
       }
     },
-    "/user/orgs": {
+    "/v1/provisioning/mute-timings/export": {
       "get": {
-        "description": "Return a list of all organizations of the current user.",
-        "operationId": "getSignedInUserOrgList",
+        "operationId": "RouteExportMuteTimings",
+        "parameters": [
+          {
+            "description": "Whether to initiate a download of the file or not.",
+            "in": "query",
+            "name": "download",
+            "schema": {
+              "default": false,
+              "type": "boolean"
+            }
+          },
+          {
+            "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+            "in": "query",
+            "name": "format",
+            "schema": {
+              "default": "yaml",
+              "enum": [
+                "yaml",
+                "json",
+                "hcl"
+              ],
+              "type": "string"
+            }
+          }
+        ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getSignedInUserOrgListResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "application/terraform+hcl": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "application/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "text/hcl": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "text/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              }
+            },
+            "description": "AlertingFileExport"
           },
           "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PermissionDenied"
+                }
+              },
+              "application/terraform+hcl": {
+                "schema": {
+                  "$ref": "#/components/schemas/PermissionDenied"
+                }
+              },
+              "application/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/PermissionDenied"
+                }
+              },
+              "text/hcl": {
+                "schema": {
+                  "$ref": "#/components/schemas/PermissionDenied"
+                }
+              },
+              "text/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/PermissionDenied"
+                }
+              }
+            },
+            "description": "PermissionDenied"
           }
         },
-        "security": [
-          {
-            "basic": []
-          }
-        ],
-        "summary": "Organizations of the actual User.",
+        "summary": "Export all mute timings in provisioning format.",
         "tags": [
-          "signed_in_user"
+          "provisioning"
         ]
       }
     },
-    "/user/password": {
-      "put": {
-        "description": "Changes the password for the user.",
-        "operationId": "changeUserPassword",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/ChangeUserPasswordCommand"
-              }
+    "/v1/provisioning/mute-timings/{name}": {
+      "delete": {
+        "operationId": "RouteDeleteMuteTiming",
+        "parameters": [
+          {
+            "description": "Mute timing name",
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "schema": {
+              "type": "string"
             }
-          },
-          "description": "To change the email, name, login, theme, provide another one.",
-          "required": true,
-          "x-originalParamName": "body"
-        },
+          }
+        ],
         "responses": {
-          "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
+          "204": {
+            "description": " The mute timing was deleted successfully."
           },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+          "409": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GenericPublicError"
+                }
+              }
+            },
+            "description": "GenericPublicError"
           }
         },
-        "security": [
-          {
-            "basic": []
-          }
-        ],
-        "summary": "Change Password.",
+        "summary": "Delete a mute timing.",
         "tags": [
-          "signed_in_user"
+          "provisioning"
         ]
-      }
-    },
-    "/user/preferences": {
+      },
       "get": {
-        "operationId": "getUserPreferences",
+        "operationId": "RouteGetMuteTiming",
+        "parameters": [
+          {
+            "description": "Mute timing name",
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getPreferencesResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/MuteTimeInterval"
+                }
+              }
+            },
+            "description": "MuteTimeInterval"
           },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+          "404": {
+            "description": " Not found."
           }
         },
-        "summary": "Get user preferences.",
+        "summary": "Get a mute timing.",
         "tags": [
-          "user_preferences"
+          "provisioning"
         ]
       },
-      "patch": {
-        "operationId": "patchUserPreferences",
+      "put": {
+        "operationId": "RoutePutMuteTiming",
+        "parameters": [
+          {
+            "description": "Mute timing name",
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "header",
+            "name": "X-Disable-Provenance",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/PatchPrefsCmd"
+                "$ref": "#/components/schemas/MuteTimeInterval"
               }
             }
           },
-          "required": true,
-          "x-originalParamName": "body"
+          "x-originalParamName": "Body"
         },
         "responses": {
-          "200": {
-            "$ref": "#/components/responses/okResponse"
+          "202": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/MuteTimeInterval"
+                }
+              }
+            },
+            "description": "MuteTimeInterval"
           },
           "400": {
-            "$ref": "#/components/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
-          }
-        },
-        "summary": "Patch user preferences.",
-        "tags": [
-          "user_preferences"
-        ]
-      },
-      "put": {
-        "description": "Omitting a key (`theme`, `homeDashboardId`, `timezone`) will cause the current value to be replaced with the system default value.",
-        "operationId": "updateUserPreferences",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/UpdatePrefsCmd"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ValidationError"
+                }
               }
-            }
-          },
-          "required": true,
-          "x-originalParamName": "body"
-        },
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+            },
+            "description": "ValidationError"
           }
         },
-        "summary": "Update user preferences.",
+        "summary": "Replace an existing mute timing.",
         "tags": [
-          "user_preferences"
+          "provisioning"
         ]
       }
     },
-    "/user/quotas": {
+    "/v1/provisioning/mute-timings/{name}/export": {
       "get": {
-        "operationId": "getUserQuotas",
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/getQuotaResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
-          }
-        },
-        "summary": "Fetch user quota.",
-        "tags": [
-          "signed_in_user"
-        ]
-      }
-    },
-    "/user/revoke-auth-token": {
-      "post": {
-        "description": "Revokes the given auth token (device) for the actual user. User of issued auth token (device) will no longer be logged in and will be required to authenticate again upon next activity.",
-        "operationId": "revokeUserAuthToken",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/RevokeAuthTokenCmd"
-              }
+        "operationId": "RouteExportMuteTiming",
+        "parameters": [
+          {
+            "description": "Whether to initiate a download of the file or not.",
+            "in": "query",
+            "name": "download",
+            "schema": {
+              "default": false,
+              "type": "boolean"
             }
           },
-          "required": true,
-          "x-originalParamName": "body"
-        },
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
-          }
-        },
-        "summary": "Revoke an auth token of the actual User.",
-        "tags": [
-          "signed_in_user"
-        ]
-      }
-    },
-    "/user/stars/dashboard/uid/{dashboard_uid}": {
-      "delete": {
-        "description": "Deletes the starring of the given Dashboard for the actual user.",
-        "operationId": "unstarDashboardByUID",
-        "parameters": [
           {
-            "in": "path",
-            "name": "dashboard_uid",
-            "required": true,
+            "description": "Format of the downloaded file. Supported yaml, json or hcl. Accept header can also be used, but the query parameter will take precedence.",
+            "in": "query",
+            "name": "format",
             "schema": {
+              "default": "yaml",
+              "enum": [
+                "yaml",
+                "json",
+                "hcl"
+              ],
               "type": "string"
             }
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
           },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
-          }
-        },
-        "summary": "Unstar a dashboard.",
-        "tags": [
-          "signed_in_user"
-        ]
-      },
-      "post": {
-        "description": "Stars the given Dashboard for the actual user.",
-        "operationId": "starDashboardByUID",
-        "parameters": [
           {
+            "description": "Mute timing name",
             "in": "path",
-            "name": "dashboard_uid",
+            "name": "name",
             "required": true,
             "schema": {
               "type": "string"
@@ -23072,217 +23762,264 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "application/terraform+hcl": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "application/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "text/hcl": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "text/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              }
+            },
+            "description": "AlertingFileExport"
           },
           "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PermissionDenied"
+                }
+              },
+              "application/terraform+hcl": {
+                "schema": {
+                  "$ref": "#/components/schemas/PermissionDenied"
+                }
+              },
+              "application/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/PermissionDenied"
+                }
+              },
+              "text/hcl": {
+                "schema": {
+                  "$ref": "#/components/schemas/PermissionDenied"
+                }
+              },
+              "text/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/PermissionDenied"
+                }
+              }
+            },
+            "description": "PermissionDenied"
           }
         },
-        "summary": "Star a dashboard.",
+        "summary": "Export a mute timing in provisioning format.",
         "tags": [
-          "signed_in_user"
+          "provisioning"
         ]
       }
     },
-    "/user/stars/dashboard/{dashboard_id}": {
+    "/v1/provisioning/policies": {
       "delete": {
-        "deprecated": true,
-        "description": "Deletes the starring of the given Dashboard for the actual user.",
-        "operationId": "unstarDashboard",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "dashboard_id",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
+        "operationId": "RouteResetPolicyTree",
+        "responses": {
+          "202": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Ack"
+                }
+              }
+            },
+            "description": "Ack"
           }
-        ],
+        },
+        "summary": "Clears the notification policy tree.",
+        "tags": [
+          "provisioning"
+        ]
+      },
+      "get": {
+        "operationId": "RouteGetPolicyTree",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Route"
+                }
+              }
+            },
+            "description": "Route"
           }
         },
-        "summary": "Unstar a dashboard.",
+        "summary": "Get the notification policy tree.",
         "tags": [
-          "signed_in_user"
+          "provisioning"
         ]
       },
-      "post": {
-        "deprecated": true,
-        "description": "Stars the given Dashboard for the actual user.",
-        "operationId": "starDashboard",
+      "put": {
+        "operationId": "RoutePutPolicyTree",
         "parameters": [
           {
-            "in": "path",
-            "name": "dashboard_id",
-            "required": true,
+            "in": "header",
+            "name": "X-Disable-Provenance",
             "schema": {
               "type": "string"
             }
           }
         ],
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Route"
+              }
+            }
           },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
-          }
+          "description": "The new notification routing tree to use",
+          "x-originalParamName": "Body"
         },
-        "summary": "Star a dashboard.",
-        "tags": [
-          "signed_in_user"
-        ]
-      }
-    },
-    "/user/teams": {
-      "get": {
-        "description": "Return a list of all teams that the current user is member of.",
-        "operationId": "getSignedInUserTeamList",
         "responses": {
-          "200": {
-            "$ref": "#/components/responses/getSignedInUserTeamListResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
+          "202": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Ack"
+                }
+              }
+            },
+            "description": "Ack"
           },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+          "400": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ValidationError"
+                }
+              }
+            },
+            "description": "ValidationError"
           }
         },
-        "summary": "Teams that the actual User is member of.",
+        "summary": "Sets the notification policy tree.",
         "tags": [
-          "signed_in_user"
+          "provisioning"
         ]
       }
     },
-    "/user/using/{org_id}": {
-      "post": {
-        "description": "Switch user context to the given organization.",
-        "operationId": "userSetUsingOrg",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "org_id",
-            "required": true,
-            "schema": {
-              "format": "int64",
-              "type": "integer"
-            }
-          }
-        ],
+    "/v1/provisioning/policies/export": {
+      "get": {
+        "operationId": "RouteGetPolicyTreeExport",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
-          },
-          "400": {
-            "$ref": "#/components/responses/badRequestError"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "application/terraform+hcl": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "application/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "text/hcl": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              },
+              "text/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/AlertingFileExport"
+                }
+              }
+            },
+            "description": "AlertingFileExport"
           },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+          "404": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/NotFound"
+                }
+              },
+              "application/terraform+hcl": {
+                "schema": {
+                  "$ref": "#/components/schemas/NotFound"
+                }
+              },
+              "application/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/NotFound"
+                }
+              },
+              "text/hcl": {
+                "schema": {
+                  "$ref": "#/components/schemas/NotFound"
+                }
+              },
+              "text/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/NotFound"
+                }
+              }
+            },
+            "description": "NotFound"
           }
         },
-        "summary": "Switch user context for signed in user.",
+        "summary": "Export the notification policy tree in provisioning file format.",
         "tags": [
-          "signed_in_user"
+          "provisioning"
         ]
       }
     },
-    "/users": {
+    "/v1/provisioning/templates": {
       "get": {
-        "description": "Returns all users that the authenticated user has permission to view, admin permission required.",
-        "operationId": "searchUsers",
-        "parameters": [
-          {
-            "description": "Limit the maximum number of users to return per page",
-            "in": "query",
-            "name": "perpage",
-            "schema": {
-              "default": 1000,
-              "format": "int64",
-              "type": "integer"
-            }
-          },
-          {
-            "description": "Page index for starting fetching users",
-            "in": "query",
-            "name": "page",
-            "schema": {
-              "default": 1,
-              "format": "int64",
-              "type": "integer"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/searchUsersResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
+        "operationId": "RouteGetTemplates",
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/NotificationTemplates"
+                }
+              }
+            },
+            "description": "NotificationTemplates"
           },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+          "404": {
+            "description": " Not found."
           }
         },
-        "summary": "Get users.",
+        "summary": "Get all notification templates.",
         "tags": [
-          "users"
+          "provisioning"
         ]
       }
     },
-    "/users/lookup": {
-      "get": {
-        "operationId": "getUserByLoginOrEmail",
+    "/v1/provisioning/templates/{name}": {
+      "delete": {
+        "operationId": "RouteDeleteTemplate",
         "parameters": [
           {
-            "description": "loginOrEmail of the user",
-            "in": "query",
-            "name": "loginOrEmail",
+            "description": "Template Name",
+            "in": "path",
+            "name": "name",
             "required": true,
             "schema": {
               "type": "string"
@@ -23290,101 +24027,65 @@
           }
         ],
         "responses": {
-          "200": {
-            "$ref": "#/components/responses/userResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
-          }
-        },
-        "summary": "Get user by login or email.",
-        "tags": [
-          "users"
-        ]
-      }
-    },
-    "/users/search": {
-      "get": {
-        "operationId": "searchUsersWithPaging",
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/searchUsersWithPagingResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+          "204": {
+            "description": " The template was deleted successfully."
           }
         },
-        "summary": "Get users with paging.",
+        "summary": "Delete a template.",
         "tags": [
-          "users"
+          "provisioning"
         ]
-      }
-    },
-    "/users/{user_id}": {
+      },
       "get": {
-        "operationId": "getUserByID",
+        "operationId": "RouteGetTemplate",
         "parameters": [
           {
+            "description": "Template Name",
             "in": "path",
-            "name": "user_id",
+            "name": "name",
             "required": true,
             "schema": {
-              "format": "int64",
-              "type": "integer"
+              "type": "string"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/userResponse"
-          },
-          "401": {
-            "$ref": "#/components/responses/unauthorisedError"
-          },
-          "403": {
-            "$ref": "#/components/responses/forbiddenError"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/NotificationTemplate"
+                }
+              }
+            },
+            "description": "NotificationTemplate"
           },
           "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
+            "description": " Not found."
           }
         },
-        "summary": "Get user by id.",
+        "summary": "Get a notification template.",
         "tags": [
-          "users"
+          "provisioning"
         ]
       },
       "put": {
-        "description": "Update the user identified by id.",
-        "operationId": "updateUser",
+        "operationId": "RoutePutTemplate",
         "parameters": [
           {
+            "description": "Template Name",
             "in": "path",
-            "name": "user_id",
+            "name": "name",
             "required": true,
             "schema": {
-              "format": "int64",
-              "type": "integer"
+              "type": "string"
+            }
+          },
+          {
+            "in": "header",
+            "name": "X-Disable-Provenance",
+            "schema": {
+              "type": "string"
             }
           }
         ],
@@ -23392,55 +24093,84 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/UpdateUserCommand"
+                "$ref": "#/components/schemas/NotificationTemplateContent"
               }
             }
           },
-          "description": "To change the email, name, login, theme, provide another one.",
-          "required": true,
-          "x-originalParamName": "body"
+          "x-originalParamName": "Body"
+        },
+        "responses": {
+          "202": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/NotificationTemplate"
+                }
+              }
+            },
+            "description": "NotificationTemplate"
+          },
+          "400": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ValidationError"
+                }
+              }
+            },
+            "description": "ValidationError"
+          }
         },
+        "summary": "Updates an existing notification template.",
+        "tags": [
+          "provisioning"
+        ]
+      }
+    },
+    "/v1/sso-settings": {
+      "get": {
+        "description": "You need to have a permission with action `settings:read` with scope `settings:auth.\u003cprovider\u003e:*`.",
+        "operationId": "listAllProvidersSettings",
         "responses": {
           "200": {
-            "$ref": "#/components/responses/okResponse"
+            "$ref": "#/components/responses/listSSOSettingsResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
           },
           "403": {
             "$ref": "#/components/responses/forbiddenError"
-          },
-          "404": {
-            "$ref": "#/components/responses/notFoundError"
-          },
-          "500": {
-            "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Update user.",
+        "summary": "List all SSO Settings entries",
         "tags": [
-          "users"
+          "sso_settings"
         ]
       }
     },
-    "/users/{user_id}/orgs": {
-      "get": {
-        "description": "Get organizations for user identified by id.",
-        "operationId": "getUserOrgList",
+    "/v1/sso-settings/{key}": {
+      "delete": {
+        "description": "Removes the SSO Settings for a provider.\n\nYou need to have a permission with action `settings:write` and scope `settings:auth.\u003cprovider\u003e:*`.",
+        "operationId": "removeProviderSettings",
         "parameters": [
           {
             "in": "path",
-            "name": "user_id",
+            "name": "key",
             "required": true,
             "schema": {
-              "format": "int64",
-              "type": "integer"
+              "type": "string"
             }
           }
         ],
         "responses": {
-          "200": {
-            "$ref": "#/components/responses/getUserOrgListResponse"
+          "204": {
+            "$ref": "#/components/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -23455,30 +24185,30 @@
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get organizations for user.",
+        "summary": "Remove SSO Settings",
         "tags": [
-          "users"
+          "sso_settings"
         ]
-      }
-    },
-    "/users/{user_id}/teams": {
+      },
       "get": {
-        "description": "Get teams for user identified by id.",
-        "operationId": "getUserTeams",
+        "description": "You need to have a permission with action `settings:read` with scope `settings:auth.\u003cprovider\u003e:*`.",
+        "operationId": "getProviderSettings",
         "parameters": [
           {
             "in": "path",
-            "name": "user_id",
+            "name": "key",
             "required": true,
             "schema": {
-              "format": "int64",
-              "type": "integer"
+              "type": "string"
             }
           }
         ],
         "responses": {
           "200": {
-            "$ref": "#/components/responses/getUserTeamsResponse"
+            "$ref": "#/components/responses/getSSOSettingsResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
           },
           "401": {
             "$ref": "#/components/responses/unauthorisedError"
@@ -23488,14 +24218,69 @@
           },
           "404": {
             "$ref": "#/components/responses/notFoundError"
+          }
+        },
+        "summary": "Get an SSO Settings entry by Key",
+        "tags": [
+          "sso_settings"
+        ]
+      },
+      "put": {
+        "description": "Inserts or updates the SSO Settings for a provider.\n\nYou need to have a permission with action `settings:write` and scope `settings:auth.\u003cprovider\u003e:*`.",
+        "operationId": "updateProviderSettings",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "key",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "properties": {
+                  "id": {
+                    "type": "string"
+                  },
+                  "provider": {
+                    "type": "string"
+                  },
+                  "settings": {
+                    "additionalProperties": false,
+                    "type": "object"
+                  }
+                },
+                "type": "object"
+              }
+            }
+          },
+          "required": true,
+          "x-originalParamName": "body"
+        },
+        "responses": {
+          "204": {
+            "$ref": "#/components/responses/okResponse"
+          },
+          "400": {
+            "$ref": "#/components/responses/badRequestError"
+          },
+          "401": {
+            "$ref": "#/components/responses/unauthorisedError"
+          },
+          "403": {
+            "$ref": "#/components/responses/forbiddenError"
           },
           "500": {
             "$ref": "#/components/responses/internalServerError"
           }
         },
-        "summary": "Get teams for user.",
+        "summary": "Update SSO Settings",
         "tags": [
-          "users"
+          "sso_settings"
         ]
       }
     }
diff --git a/public/sass/_grafana.scss b/public/sass/_grafana.scss
index b21905e838d6d..9a7ad2a5ef81e 100644
--- a/public/sass/_grafana.scss
+++ b/public/sass/_grafana.scss
@@ -31,7 +31,6 @@
 @import 'layout/lists';
 
 // COMPONENTS
-@import '../app/features/dashboard/components/AddPanelWidget/AddPanelWidget';
 @import 'components/scrollbar';
 @import 'components/buttons';
 @import 'components/navs';
diff --git a/public/sass/_variables.generated.scss b/public/sass/_variables.generated.scss
index 290ebadaeddcd..1a2e11a065177 100644
--- a/public/sass/_variables.generated.scss
+++ b/public/sass/_variables.generated.scss
@@ -163,7 +163,6 @@ $form-icon-danger: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www
 // -------------------------
 // Used for a bird's eye view of components dependent on the z-axis
 // Try to avoid customizing these :)
-$zindex-active-panel: 999;
 $zindex-dropdown: 1030;
 $zindex-navbar-fixed: 1000;
 $zindex-sidemenu: 1020;
diff --git a/public/sass/_variables.light.generated.scss b/public/sass/_variables.light.generated.scss
index 34a3fa204c5f2..8681b26b874cf 100644
--- a/public/sass/_variables.light.generated.scss
+++ b/public/sass/_variables.light.generated.scss
@@ -20,8 +20,8 @@ $colors-action-selected: rgba(36, 41, 46, 0.08);
 // New Colors
 // -------------------------
 $blue-light: #1F62E0;
-$blue-base: #3871DC;
-$blue-shade: rgb(44, 90, 176);
+$blue-base: #fd6222;
+$blue-shade: rgb(202, 78, 27);
 $red-base: #E0226E;
 $red-shade: rgb(179, 27, 88);
 $green-base: #1B855E;
diff --git a/public/sass/base/_fonts.scss b/public/sass/base/_fonts.scss
index 3d08a216a3304..f75c1d8aaff42 100644
--- a/public/sass/base/_fonts.scss
+++ b/public/sass/base/_fonts.scss
@@ -25,131 +25,26 @@
     U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 
-/* cyrillic-ext */
-@font-face {
-  font-family: 'Inter';
-  font-style: normal;
-  font-weight: 400;
-  font-display: swap;
-  src: url(#{$font-file-path}/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2JL7SUc.woff2) format('woff2');
-  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
-}
-/* cyrillic */
-@font-face {
-  font-family: 'Inter';
-  font-style: normal;
-  font-weight: 400;
-  font-display: swap;
-  src: url(#{$font-file-path}/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa0ZL7SUc.woff2) format('woff2');
-  unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-/* greek-ext */
-@font-face {
-  font-family: 'Inter';
-  font-style: normal;
-  font-weight: 400;
-  font-display: swap;
-  src: url(#{$font-file-path}/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2ZL7SUc.woff2) format('woff2');
-  unicode-range: U+1F00-1FFF;
-}
-/* greek */
-@font-face {
-  font-family: 'Inter';
-  font-style: normal;
-  font-weight: 400;
-  font-display: swap;
-  src: url(#{$font-file-path}/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1pL7SUc.woff2) format('woff2');
-  unicode-range: U+0370-03FF;
-}
-/* vietnamese */
-@font-face {
-  font-family: 'Inter';
-  font-style: normal;
-  font-weight: 400;
-  font-display: swap;
-  src: url(#{$font-file-path}/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2pL7SUc.woff2) format('woff2');
-  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
-}
-/* latin-ext */
-@font-face {
-  font-family: 'Inter';
-  font-style: normal;
-  font-weight: 400;
-  font-display: swap;
-  src: url(#{$font-file-path}/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa25L7SUc.woff2) format('woff2');
-  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
+/*
+To add new variations/version of Inter, download from https://rsms.me/inter/ and add the
+web font files to the public/fonts/inter folder. Do not download the fonts from Google Fonts
+or somewhere else because they don't support the features we require (like tabular numerals).
+
+If adding additional weights, consider switching to the InterVariable variable font as combined
+it may take less space than multiple static weights.
+*/
 @font-face {
   font-family: 'Inter';
   font-style: normal;
   font-weight: 400;
   font-display: swap;
-  src: url(#{$font-file-path}/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1ZL7.woff2) format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC,
-    U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-/* cyrillic-ext */
-@font-face {
-  font-family: 'Inter';
-  font-style: normal;
-  font-weight: 500;
-  font-display: swap;
-  src: url(#{$font-file-path}/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2JL7SUc.woff2) format('woff2');
-  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
-}
-/* cyrillic */
-@font-face {
-  font-family: 'Inter';
-  font-style: normal;
-  font-weight: 500;
-  font-display: swap;
-  src: url(#{$font-file-path}/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa0ZL7SUc.woff2) format('woff2');
-  unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-/* greek-ext */
-@font-face {
-  font-family: 'Inter';
-  font-style: normal;
-  font-weight: 500;
-  font-display: swap;
-  src: url(#{$font-file-path}/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2ZL7SUc.woff2) format('woff2');
-  unicode-range: U+1F00-1FFF;
-}
-/* greek */
-@font-face {
-  font-family: 'Inter';
-  font-style: normal;
-  font-weight: 500;
-  font-display: swap;
-  src: url(#{$font-file-path}/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1pL7SUc.woff2) format('woff2');
-  unicode-range: U+0370-03FF;
-}
-/* vietnamese */
-@font-face {
-  font-family: 'Inter';
-  font-style: normal;
-  font-weight: 500;
-  font-display: swap;
-  src: url(#{$font-file-path}/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2pL7SUc.woff2) format('woff2');
-  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+  src: url('#{$font-file-path}/inter/Inter-Regular.woff2') format('woff2');
 }
-/* latin-ext */
-@font-face {
-  font-family: 'Inter';
-  font-style: normal;
-  font-weight: 500;
-  font-display: swap;
-  src: url(#{$font-file-path}/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa25L7SUc.woff2) format('woff2');
-  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
+
 @font-face {
   font-family: 'Inter';
   font-style: normal;
   font-weight: 500;
   font-display: swap;
-  src: url(#{$font-file-path}/inter/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1ZL7.woff2) format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC,
-    U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+  src: url('#{$font-file-path}/inter/Inter-Medium.woff2') format('woff2');
 }
diff --git a/public/sass/components/_add_data_source.scss b/public/sass/components/_add_data_source.scss
index 5e574e43e9a28..c641948c285d2 100644
--- a/public/sass/components/_add_data_source.scss
+++ b/public/sass/components/_add_data_source.scss
@@ -24,16 +24,12 @@
   display: flex;
   align-items: center;
   cursor: pointer;
-  background: $panel-editor-viz-item-bg;
-  border: 1px solid transparent;
+  background: $card-background;
   border-radius: 3px;
   margin-bottom: $space-xxs;
 
   &:hover {
-    box-shadow: $panel-editor-viz-item-shadow-hover;
-    background: $panel-editor-viz-item-bg-hover;
-    border: $panel-editor-viz-item-border-hover;
-    color: $text-color-strong;
+    background: $card-background-hover;
 
     .add-data-source-item-actions {
       opacity: 1;
diff --git a/public/sass/components/_dashboard_grid.scss b/public/sass/components/_dashboard_grid.scss
index 7bba52c7524c0..7185a2a9be2ce 100644
--- a/public/sass/components/_dashboard_grid.scss
+++ b/public/sass/components/_dashboard_grid.scss
@@ -13,7 +13,6 @@
   &:hover {
     .react-resizable-handle {
       visibility: visible;
-      z-index: $zindex-active-panel;
     }
   }
 }
@@ -86,22 +85,11 @@
   }
 }
 
-// Hack to prevent panel overlap during drag/hover (due to descending z-index assignment)
-.react-grid-item:not(.context-menu-open, .resizing) {
-  &:hover,
-  &:active,
-  &:focus {
-    z-index: $zindex-active-panel !important;
-  }
-}
-
 // Hack for preventing panel menu overlapping.
-.react-grid-item.context-menu-open,
-.react-grid-item.resizing,
 .react-grid-item.resizing.panel,
 .react-grid-item.panel.dropdown-menu-open,
 .react-grid-item.react-draggable-dragging.panel {
-  z-index: $zindex-dropdown !important;
+  z-index: $zindex-dropdown;
 }
 
 // Disable animation on initial rendering and enable it when component has been mounted.
@@ -109,8 +97,10 @@
   transition-property: none;
 }
 
-.react-grid-layout--enable-move-animations {
-  .react-grid-item.cssTransforms {
-    transition-property: transform;
+@media (prefers-reduced-motion: no-preference) {
+  .react-grid-layout--enable-move-animations {
+    .react-grid-item.cssTransforms {
+      transition-property: transform;
+    }
   }
 }
diff --git a/public/sass/components/_filter-list.scss b/public/sass/components/_filter-list.scss
index 90d0a21c53909..8c4b453c3dde3 100644
--- a/public/sass/components/_filter-list.scss
+++ b/public/sass/components/_filter-list.scss
@@ -67,17 +67,17 @@
   text-transform: uppercase;
 
   &.online {
-    background-image: url('/img/online.svg');
+    background-image: url('../img/online.svg');
     color: $online;
   }
 
   &.warn {
-    background-image: url('/img/warn-tiny.svg');
+    background-image: url('../img/warn-tiny.svg');
     color: $warn;
   }
 
   &.critical {
-    background-image: url('/img/critical.svg');
+    background-image: url('../img/critical.svg');
     color: $critical;
   }
 }
diff --git a/public/sass/components/_scrollbar.scss b/public/sass/components/_scrollbar.scss
index ee242a0d9aadb..edb379ae5b6cc 100644
--- a/public/sass/components/_scrollbar.scss
+++ b/public/sass/components/_scrollbar.scss
@@ -115,6 +115,7 @@
 }
 
 // Scrollbars
+// Note, this is not applied by default if the `betterPageScrolling` feature flag is applied
 .no-overlay-scrollbar {
   ::-webkit-scrollbar {
     width: 8px;
diff --git a/public/sass/pages/_signup.scss b/public/sass/pages/_signup.scss
index ff808cc737176..960021f57a5a3 100644
--- a/public/sass/pages/_signup.scss
+++ b/public/sass/pages/_signup.scss
@@ -6,7 +6,7 @@
   bottom: 0;
   height: 100%;
   width: 100%;
-  background-image: url(/img/background_tease.jpg);
+  background-image: url(../img/background_tease.jpg);
 
   .signup-logo-container {
     width: 150px;
diff --git a/public/test/core/redux/mocks.ts b/public/test/core/redux/mocks.ts
index a65bf971c7f05..e6ad9c835ec46 100644
--- a/public/test/core/redux/mocks.ts
+++ b/public/test/core/redux/mocks.ts
@@ -1,6 +1,6 @@
 import { ActionCreatorWithoutPayload, PayloadActionCreator } from '@reduxjs/toolkit';
 
-export const mockToolkitActionCreator = <T extends string>(creator: PayloadActionCreator<any, T>) => {
+export const mockToolkitActionCreator = <P = void, T extends string = string>(creator: PayloadActionCreator<P, T>) => {
   return Object.assign(jest.fn(), creator);
 };
 
diff --git a/public/test/core/redux/reducerTester.ts b/public/test/core/redux/reducerTester.ts
index 145dadb0e9a61..38c466afa2b6b 100644
--- a/public/test/core/redux/reducerTester.ts
+++ b/public/test/core/redux/reducerTester.ts
@@ -2,7 +2,9 @@ import { AnyAction } from '@reduxjs/toolkit';
 import { cloneDeep } from 'lodash';
 import { Action } from 'redux';
 
-type GrafanaReducer<S = any, A extends Action = AnyAction> = (state: S, action: A) => S;
+import { StoreState } from 'app/types';
+
+type GrafanaReducer<S = StoreState, A extends Action = AnyAction> = (state: S, action: A) => S;
 
 export interface Given<State> {
   givenReducer: (
@@ -23,36 +25,29 @@ export interface Then<State> {
   whenActionIsDispatched: (action: AnyAction) => Then<State>;
 }
 
-interface ObjectType extends Object {
-  [key: string]: any;
-}
+const isNotException = (object: unknown, propertyName: string) =>
+  typeof object === 'function'
+    ? propertyName !== 'caller' && propertyName !== 'callee' && propertyName !== 'arguments'
+    : true;
 
 export const deepFreeze = <T>(obj: T): T => {
-  Object.freeze(obj);
-
-  const isNotException = (object: unknown, propertyName: string) =>
-    typeof object === 'function'
-      ? propertyName !== 'caller' && propertyName !== 'callee' && propertyName !== 'arguments'
-      : true;
-  const hasOwnProp = Object.prototype.hasOwnProperty;
-
-  if (obj && obj instanceof Object) {
-    const object: ObjectType = obj;
-    Object.getOwnPropertyNames(object).forEach((propertyName) => {
-      const objectProperty = object[propertyName];
+  if (typeof obj === 'object') {
+    for (const key in obj) {
+      const prop = obj[key];
+
       if (
-        hasOwnProp.call(object, propertyName) &&
-        isNotException(object, propertyName) &&
-        objectProperty &&
-        (typeof objectProperty === 'object' || typeof objectProperty === 'function') &&
-        Object.isFrozen(objectProperty) === false
+        prop &&
+        Object.hasOwn(obj, key) &&
+        isNotException(obj, key) &&
+        (typeof prop === 'object' || typeof prop === 'function') &&
+        !Object.isFrozen(prop)
       ) {
-        deepFreeze(objectProperty);
+        deepFreeze(prop);
       }
-    });
+    }
   }
 
-  return obj;
+  return Object.freeze(obj);
 };
 
 interface ReducerTester<State> extends Given<State>, When<State>, Then<State> {}
diff --git a/public/test/core/thunk/thunkTester.ts b/public/test/core/thunk/thunkTester.ts
index 8afedcb53bf76..9e228630d2ec4 100644
--- a/public/test/core/thunk/thunkTester.ts
+++ b/public/test/core/thunk/thunkTester.ts
@@ -1,4 +1,3 @@
-// @ts-ignore
 import { PayloadAction } from '@reduxjs/toolkit';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
@@ -13,7 +12,7 @@ export interface ThunkWhen {
   whenThunkIsDispatched: (...args: any) => Promise<Array<PayloadAction<any>>>;
 }
 
-export const thunkTester = (initialState: any, debug?: boolean): ThunkGiven => {
+export const thunkTester = (initialState: unknown, debug?: boolean): ThunkGiven => {
   const store = mockStore(initialState);
   let thunkUnderTest: any = null;
   let dispatchedActions: Array<PayloadAction<any>> = [];
diff --git a/public/test/helpers/TestProvider.tsx b/public/test/helpers/TestProvider.tsx
index b7b232f041a97..873c85c415b11 100644
--- a/public/test/helpers/TestProvider.tsx
+++ b/public/test/helpers/TestProvider.tsx
@@ -5,7 +5,9 @@ import { Router } from 'react-router-dom';
 import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock';
 
 import { locationService } from '@grafana/runtime';
+import { ModalRoot } from '@grafana/ui';
 import { GrafanaContext, GrafanaContextType } from 'app/core/context/GrafanaContext';
+import { ModalsContextProvider } from 'app/core/context/ModalsContextProvider';
 import { configureStore } from 'app/store/configureStore';
 import { StoreState } from 'app/types/store';
 
@@ -30,7 +32,10 @@ export function TestProvider(props: Props) {
   return (
     <Provider store={store}>
       <Router history={locationService.getHistory()}>
-        <GrafanaContext.Provider value={context}>{children}</GrafanaContext.Provider>
+        <ModalsContextProvider>
+          <GrafanaContext.Provider value={context}>{children}</GrafanaContext.Provider>
+          <ModalRoot />
+        </ModalsContextProvider>
       </Router>
     </Provider>
   );
diff --git a/public/test/helpers/alertingRuleEditor.tsx b/public/test/helpers/alertingRuleEditor.tsx
index 7752de2b0921e..feca69b1f625b 100644
--- a/public/test/helpers/alertingRuleEditor.tsx
+++ b/public/test/helpers/alertingRuleEditor.tsx
@@ -1,7 +1,7 @@
 import { render } from '@testing-library/react';
 import React from 'react';
 import { Route } from 'react-router-dom';
-import { byRole, byTestId } from 'testing-library-selector';
+import { byRole, byTestId, byText } from 'testing-library-selector';
 
 import { selectors } from '@grafana/e2e-selectors';
 import { locationService } from '@grafana/runtime';
@@ -13,7 +13,7 @@ export const ui = {
   inputs: {
     name: byRole('textbox', { name: 'name' }),
     alertType: byTestId('alert-type-picker'),
-    dataSource: byTestId('datasource-picker'),
+    dataSource: byTestId(selectors.components.DataSourcePicker.inputV2),
     folder: byTestId('folder-picker'),
     folderContainer: byTestId(selectors.components.FolderPicker.containerV2),
     namespace: byTestId('namespace-picker'),
@@ -23,6 +23,11 @@ export const ui = {
     labelKey: (idx: number) => byTestId(`label-key-${idx}`),
     labelValue: (idx: number) => byTestId(`label-value-${idx}`),
     expr: byTestId('expr'),
+    simplifiedRouting: {
+      contactPointRouting: byRole('radio', { name: /select contact point/i }),
+      contactPoint: byTestId('contact-point-picker'),
+      routingOptions: byText(/muting, grouping and timings \(optional\)/i),
+    },
   },
   buttons: {
     saveAndExit: byRole('button', { name: 'Save rule and exit' }),
diff --git a/public/test/helpers/convertToStoreState.ts b/public/test/helpers/convertToStoreState.ts
index 8a93487ae02e3..9f696b0e45a6a 100644
--- a/public/test/helpers/convertToStoreState.ts
+++ b/public/test/helpers/convertToStoreState.ts
@@ -1,8 +1,11 @@
+import { TypedVariableModel } from '@grafana/data';
+
 import { getPreloadedState } from '../../app/features/variables/state/helpers';
+import { VariablesState } from '../../app/features/variables/state/types';
 import { StoreState } from '../../app/types';
 
-export const convertToStoreState = (key: string, models: any[]): StoreState => {
-  const variables = models.reduce((byName, variable) => {
+export const convertToStoreState = (key: string, models: TypedVariableModel[]): StoreState => {
+  const variables = models.reduce<VariablesState>((byName, variable) => {
     byName[variable.name] = variable;
     return byName;
   }, {});
diff --git a/public/test/jest-resolver.js b/public/test/jest-resolver.js
index 75b29ad00dc52..40046b872d5ba 100644
--- a/public/test/jest-resolver.js
+++ b/public/test/jest-resolver.js
@@ -27,6 +27,23 @@ module.exports = (path, options) => {
         delete pkg['exports'];
         delete pkg['module'];
       }
+      // Jest + jsdom acts like a browser (i.e., it looks for "browser" imports
+      // under pkg.exports), but msw knows that you're operating in a Node
+      // environment:
+      //
+      // https://github.com/mswjs/msw/issues/1786#issuecomment-1782559851
+      //
+      // The MSW project's recommended workaround is to disable Jest's
+      // customExportConditions completely, so no packages use their browser's
+      // versions.  We'll instead clear export conditions only for MSW.
+      //
+      // Taken from https://github.com/mswjs/msw/issues/1786#issuecomment-1787730599
+      if (pkg.name === 'msw') {
+        delete pkg.exports['./node'].browser;
+      }
+      if (pkg.name === '@mswjs/interceptors') {
+        delete pkg.exports;
+      }
       return pkg;
     },
   });
diff --git a/public/test/matchers/index.ts b/public/test/matchers/index.ts
index b6f8a091aaa51..b62de8d6974e9 100644
--- a/public/test/matchers/index.ts
+++ b/public/test/matchers/index.ts
@@ -4,7 +4,7 @@ import { toEmitValues } from './toEmitValues';
 import { toEmitValuesWith } from './toEmitValuesWith';
 import { ObservableMatchers } from './types';
 
-export const matchers: ObservableMatchers<void, Observable<any>> = {
+export const matchers: ObservableMatchers<void, Observable<unknown>> = {
   toEmitValues,
   toEmitValuesWith,
 };
diff --git a/public/test/matchers/toEmitValuesWith.ts b/public/test/matchers/toEmitValuesWith.ts
index d9a53e965a08c..23d9e819e4159 100644
--- a/public/test/matchers/toEmitValuesWith.ts
+++ b/public/test/matchers/toEmitValuesWith.ts
@@ -3,7 +3,7 @@ import { Observable, Subscription } from 'rxjs';
 
 import { expectObservable, forceObservableCompletion } from './utils';
 
-function tryExpectations(received: unknown[], expectations: (received: unknown[]) => void): jest.CustomMatcherResult {
+function tryExpectations<T = unknown>(received: T[], expectations: (received: T[]) => void): jest.CustomMatcherResult {
   try {
     expectations(received);
     return {
@@ -27,9 +27,9 @@ function tryExpectations(received: unknown[], expectations: (received: unknown[]
  * the observable ended (or emitted error). If Observable does not complete within OBSERVABLE_TEST_TIMEOUT_IN_MS the
  * test fails.
  */
-export function toEmitValuesWith(
-  received: Observable<any>,
-  expectations: (actual: any[]) => void
+export function toEmitValuesWith<T = unknown>(
+  received: Observable<T>,
+  expectations: (actual: T[]) => void
 ): Promise<jest.CustomMatcherResult> {
   const failsChecks = expectObservable(received);
   if (failsChecks) {
@@ -37,7 +37,7 @@ export function toEmitValuesWith(
   }
 
   return new Promise((resolve) => {
-    const receivedValues: any[] = [];
+    const receivedValues: T[] = [];
     const subscription = new Subscription();
 
     subscription.add(
diff --git a/public/test/matchers/types.ts b/public/test/matchers/types.ts
index c67b32897f52a..2c8cd92ff3b1e 100644
--- a/public/test/matchers/types.ts
+++ b/public/test/matchers/types.ts
@@ -2,12 +2,10 @@ import { Observable } from 'rxjs';
 
 export const OBSERVABLE_TEST_TIMEOUT_IN_MS = 1000;
 
-export type ObservableType<T> = T extends Observable<infer V> ? V : never;
-
 export interface ObservableMatchers<R, T = {}> extends jest.ExpectExtendMap {
-  toEmitValues<E = ObservableType<T>>(received: T, expected: E[]): Promise<jest.CustomMatcherResult>;
-  toEmitValuesWith<E = ObservableType<T>>(
-    received: T,
-    expectations: (received: E[]) => void
+  toEmitValues<T>(received: Observable<T>, expected: T[]): Promise<jest.CustomMatcherResult>;
+  toEmitValuesWith<T>(
+    received: Observable<T>,
+    expectations: (received: T[]) => void
   ): Promise<jest.CustomMatcherResult>;
 }
diff --git a/public/test/matchers/utils.ts b/public/test/matchers/utils.ts
index e7758bb917786..08a57f060b8f9 100644
--- a/public/test/matchers/utils.ts
+++ b/public/test/matchers/utils.ts
@@ -3,7 +3,10 @@ import { asapScheduler, Subscription, timer, isObservable } from 'rxjs';
 
 import { OBSERVABLE_TEST_TIMEOUT_IN_MS } from './types';
 
-export function forceObservableCompletion(subscription: Subscription, resolve: (args: any) => void) {
+export function forceObservableCompletion(
+  subscription: Subscription,
+  resolve: (args: jest.CustomMatcherResult | PromiseLike<jest.CustomMatcherResult>) => void
+) {
   const timeoutObservable = timer(OBSERVABLE_TEST_TIMEOUT_IN_MS, asapScheduler);
 
   subscription.add(
diff --git a/public/test/mocks/datasource_srv.ts b/public/test/mocks/datasource_srv.ts
index 9da05b83ac2f9..9179f7258b121 100644
--- a/public/test/mocks/datasource_srv.ts
+++ b/public/test/mocks/datasource_srv.ts
@@ -36,12 +36,14 @@ export class MockDataSourceApi extends DataSourceApi {
   result: DataQueryResponse = { data: [] };
 
   constructor(
-    name?: string,
+    datasource: string | DataSourceInstanceSettings = 'MockDataSourceApi',
     result?: DataQueryResponse,
     meta?: DataSourcePluginMeta,
     public error: string | null = null
   ) {
-    super({ name: name ? name : 'MockDataSourceApi' } as DataSourceInstanceSettings);
+    const instaceSettings =
+      typeof datasource === 'string' ? ({ name: datasource } as DataSourceInstanceSettings) : datasource;
+    super(instaceSettings);
     if (result) {
       this.result = result;
     }
@@ -49,7 +51,7 @@ export class MockDataSourceApi extends DataSourceApi {
     this.meta = meta || ({} as DataSourcePluginMeta);
   }
 
-  query(request: DataQueryRequest): Promise<DataQueryResponse> {
+  query(request: DataQueryRequest): Promise<DataQueryResponse> | Observable<DataQueryResponse> {
     if (this.error) {
       return Promise.reject(this.error);
     }
diff --git a/public/test/mocks/getGrafanaContextMock.ts b/public/test/mocks/getGrafanaContextMock.ts
index feb0155cabd39..fd6aaec843e6b 100644
--- a/public/test/mocks/getGrafanaContextMock.ts
+++ b/public/test/mocks/getGrafanaContextMock.ts
@@ -2,6 +2,7 @@ import { GrafanaConfig } from '@grafana/data';
 import { LocationService } from '@grafana/runtime';
 import { AppChromeService } from 'app/core/components/AppChrome/AppChromeService';
 import { GrafanaContextType } from 'app/core/context/GrafanaContext';
+import { NewFrontendAssetsChecker } from 'app/core/services/NewFrontendAssetsChecker';
 import { backendSrv } from 'app/core/services/backend_srv';
 import { KeybindingSrv } from 'app/core/services/keybindingSrv';
 
@@ -20,6 +21,10 @@ export function getGrafanaContextMock(overrides: Partial<GrafanaContextType> = {
       setupDashboardBindings: jest.fn(),
       setupTimeRangeBindings: jest.fn(),
     } as unknown as KeybindingSrv,
+    newAssetsChecker: {
+      start: jest.fn(),
+      reloadIfUpdateDetected: jest.fn(),
+    } as unknown as NewFrontendAssetsChecker,
     ...overrides,
   };
 }
diff --git a/public/test/mocks/monaco.ts b/public/test/mocks/monaco.ts
deleted file mode 100644
index 2de6c5f4a29e6..0000000000000
--- a/public/test/mocks/monaco.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const monaco = 'monaco';
diff --git a/public/test/mocks/workers.ts b/public/test/mocks/workers.ts
index 2b7802a4a1f80..70ec661c12cba 100644
--- a/public/test/mocks/workers.ts
+++ b/public/test/mocks/workers.ts
@@ -1,9 +1,12 @@
-const { layout } = jest.requireActual('../../app/plugins/panel/nodeGraph/layout.worker.js');
+import { Config } from 'app/plugins/panel/nodeGraph/layout';
+import { EdgeDatum, NodeDatum } from 'app/plugins/panel/nodeGraph/types';
+
+const { layout } = jest.requireActual('../../app/plugins/panel/nodeGraph/forceLayout.js');
 
 class LayoutMockWorker {
   timeout: number | undefined;
   constructor() {}
-  postMessage(data: any) {
+  postMessage(data: { nodes: NodeDatum[]; edges: EdgeDatum[]; config: Config }) {
     const { nodes, edges, config } = data;
     this.timeout = window.setTimeout(() => {
       this.timeout = undefined;
diff --git a/public/test/setupTests.ts b/public/test/setupTests.ts
index b345588c35584..4b59a6b5b5b5d 100644
--- a/public/test/setupTests.ts
+++ b/public/test/setupTests.ts
@@ -1,4 +1,5 @@
 import '@testing-library/jest-dom';
+import { configure } from '@testing-library/react';
 import i18next from 'i18next';
 import failOnConsole from 'jest-fail-on-console';
 import { initReactI18next } from 'react-i18next';
@@ -20,3 +21,12 @@ i18next.use(initReactI18next).init({
   returnEmptyString: false,
   lng: 'en-US', // this should be the locale of the phrases in our source JSX
 });
+
+// mock out the worker that detects changes in the dashboard
+// The mock is needed because JSDOM does not support workers and
+// the factory uses import.meta.url so we can't use it in CommonJS modules.
+jest.mock('app/features/dashboard-scene/saving/createDetectChangesWorker.ts');
+
+// our tests are heavy in CI due to parallelisation and monaco and kusto
+// so we increase the default timeout to 2secs to avoid flakiness
+configure({ asyncUtilTimeout: 2000 });
diff --git a/public/test/specs/helpers.ts b/public/test/specs/helpers.ts
index 303421c4584a1..ad14ee1d4f231 100644
--- a/public/test/specs/helpers.ts
+++ b/public/test/specs/helpers.ts
@@ -39,7 +39,7 @@ export function ControllerTestContext(this: any) {
       $provide.value('templateSrv', self.templateSrv);
       $provide.value('$element', self.$element);
       $provide.value('$sanitize', self.$sanitize);
-      each(mocks, (value: any, key: any) => {
+      each(mocks, (value, key) => {
         $provide.value(key, value);
       });
     });
@@ -101,7 +101,7 @@ export function ControllerTestContext(this: any) {
     });
   };
 
-  this.setIsUtc = (isUtc: any = false) => {
+  this.setIsUtc = (isUtc = false) => {
     self.isUtc = isUtc;
   };
 }
@@ -129,7 +129,7 @@ export class TimeSrvStub {
     };
   }
 
-  setTime(time: any) {
+  setTime(time: RawTimeRange) {
     this.time = time;
   }
 }
@@ -161,7 +161,7 @@ export function TemplateSrvStub(this: any) {
     return template(text, this.templateSettings)(this.data);
   };
   this.init = () => {};
-  this.getAdhocFilters = (): any => {
+  this.getAdhocFilters = () => {
     return [];
   };
   this.fillVariableValuesForUrl = () => {};
diff --git a/public/views/error-template.html b/public/views/error-template.html
deleted file mode 100644
index 28e828a155439..0000000000000
--- a/public/views/error-template.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-    <meta name="viewport" content="width=device-width" />
-    <meta name="theme-color" content="#000" />
-
-    <title>[[.AppTitle]] - Error</title>
-
-    <base href="[[.AppSubUrl]]/" />
-
-    [[ if eq .Theme "light" ]]
-    <link rel="stylesheet" href="public/build/<%= htmlWebpackPlugin.files.cssChunks.light %>" />
-    [[ else ]]
-    <link rel="stylesheet" href="public/build/<%= htmlWebpackPlugin.files.cssChunks.dark %>" />
-    [[ end ]]
-
-    <link rel="icon" type="image/png" href="public/img/fav32.png" />
-    <link rel="mask-icon" href="public/img/grafana_mask_icon.svg" color="#F05A28" />
-  </head>
-
-  <body class="theme-[[ .Theme ]]">
-    <div class="main-view">
-      <div class="page-container">
-        <div class="page-header">
-          <div class="page-header__inner">
-            <span class="page-header__logo">
-              <i class="page-header__icon fa fa-frown-o"></i>
-            </span>
-            <div class="page-header__info-block">
-              <h1 class="page-header__title">
-                <a class="text-link" href="login">Grafana</a><span> / Server Error</span><span></span>
-              </h1>
-              <div class="page-header__sub-title">Sadly something went wrong</div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="page-container page-body ng-scope" style="padding: 2rem">
-        <div class="alert">
-          <div class="alert-icon"><icon name="'exclamation-triangle'"></icon></div>
-          <div class="alert-body">
-            <div class="alert-title">[[.Title]]</div>
-          </div>
-        </div>
-        <br />
-        [[if .ErrorMsg]]
-        <h4 class="page-heading">Error details</h4>
-        <div class="alert-text">
-          <pre>[[.ErrorMsg]]</pre>
-        </div>
-        [[end]]
-        <div style="padding: 2rem 0 0">
-          <p>Check the Grafana server logs for the detailed error message.</p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/public/views/error.html b/public/views/error.html
new file mode 100644
index 0000000000000..1eb195cd125b9
--- /dev/null
+++ b/public/views/error.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <meta name="viewport" content="width=device-width" />
+    <meta name="theme-color" content="#000" />
+
+    <title>[[.AppTitle]] - Error</title>
+
+    <base href="[[.AppSubUrl]]/" />
+
+    [[ if eq .ThemeType "light" ]]
+    <link rel="stylesheet" href="[[.Assets.Light]]" />
+    [[ else ]]
+    <link rel="stylesheet" href="[[.Assets.Dark]]" />
+    [[ end ]]
+
+    <link rel="icon" type="image/png" href="public/img/fav32.png" />
+    <link rel="mask-icon" href="public/img/grafana_mask_icon.svg" color="#F05A28" />
+  </head>
+
+  <body class="theme-[[ .ThemeType ]]">
+    <div class="main-view">
+      <div class="page-container">
+        <div class="page-header">
+          <div class="page-header__inner">
+            <span class="page-header__logo">
+              <i class="page-header__icon fa fa-frown-o"></i>
+            </span>
+            <div class="page-header__info-block">
+              <h1 class="page-header__title">
+                <a class="text-link" href="login">Grafana</a><span> / Server Error</span><span></span>
+              </h1>
+              <div class="page-header__sub-title">Sadly something went wrong</div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="page-container page-body ng-scope" style="padding: 2rem">
+        <div class="alert">
+          <div class="alert-icon"><icon name="'exclamation-triangle'"></icon></div>
+          <div class="alert-body">
+            <div class="alert-title">[[.Title]]</div>
+          </div>
+        </div>
+        <br />
+        [[if .ErrorMsg]]
+        <h4 class="page-heading">Error details</h4>
+        <div class="alert-text">
+          <pre>[[.ErrorMsg]]</pre>
+        </div>
+        [[end]]
+        <div style="padding: 2rem 0 0">
+          <p>Check the Grafana server logs for the detailed error message.</p>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/public/views/index-template.html b/public/views/index-template.html
deleted file mode 100644
index 77f030a9de5c0..0000000000000
--- a/public/views/index-template.html
+++ /dev/null
@@ -1,356 +0,0 @@
-<!DOCTYPE html>
-<html lang="[[.User.Language]]">
-  <head>
-    [[ if and .CSPEnabled .IsDevelopmentEnv ]]
-    <!-- Cypress overwrites CSP headers in HTTP requests, so this is required for e2e tests-->
-    <meta  http-equiv="Content-Security-Policy" content="[[.CSPContent]]"/>
-    [[ end ]]
-    <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-    <meta name="viewport" content="width=device-width" />
-    <meta name="theme-color" content="#000" />
-
-    <title>[[.AppTitle]]</title>
-
-    <base href="[[.AppSubUrl]]/" />
-
-    <link rel="icon" type="image/png" href="[[.FavIcon]]" />
-    <link rel="apple-touch-icon" sizes="180x180" href="[[.AppleTouchIcon]]" />
-    <link rel="mask-icon" href="[[.ContentDeliveryURL]]public/img/grafana_mask_icon.svg" color="#F05A28" />
-
-    <!-- If theme is "system", we inject the stylesheets with javascript further down the page -->
-    [[ if eq .ThemeType "light" ]]
-    <link rel="stylesheet" href="[[.ContentDeliveryURL]]public/build/<%= htmlWebpackPlugin.files.cssChunks.light %>" />
-    [[ else if eq .ThemeType "dark" ]]
-    <link rel="stylesheet" href="[[.ContentDeliveryURL]]public/build/<%= htmlWebpackPlugin.files.cssChunks.dark %>" />
-    [[ end ]]
-
-    <script nonce="[[.Nonce]]">
-      performance.mark('frontend_boot_css_time_seconds');
-    </script>
-
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
-    <meta name="msapplication-TileColor" content="#2b5797" />
-    <meta name="msapplication-config" content="public/img/browserconfig.xml" />
-  </head>
-
-  <body class="theme-[[ .ThemeType ]] [[.AppNameBodyClass]]">
-    <style>
-      .preloader {
-        height: 100%;
-        flex-direction: column;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-      }
-
-      .preloader__enter {
-        opacity: 0;
-        animation-name: preloader-fade-in;
-        animation-iteration-count: 1;
-        animation-duration: 0.9s;
-        animation-delay: 1.35s;
-        animation-fill-mode: forwards;
-      }
-
-      .preloader__bounce {
-        text-align: center;
-        animation-name: preloader-bounce;
-        animation-duration: 0.9s;
-        animation-iteration-count: infinite;
-      }
-
-      .preloader__logo {
-        display: inline-block;
-        animation-name: preloader-squash;
-        animation-duration: 0.9s;
-        animation-iteration-count: infinite;
-        width: 60px;
-        height: 60px;
-        background-repeat: no-repeat;
-        background-size: contain;
-        background-image: url('[[.LoadingLogo]]');
-      }
-
-      .preloader__text {
-        margin-top: 16px;
-        font-weight: 500;
-        font-size: 14px;
-        font-family: Sans-serif;
-        opacity: 0;
-        animation-name: preloader-fade-in;
-        animation-duration: 0.9s;
-        animation-delay: 1.8s;
-        animation-fill-mode: forwards;
-      }
-
-      .theme-light .preloader__text {
-        color: #52545c;
-      }
-
-      .theme-dark .preloader__text {
-        color: #d8d9da;
-      }
-
-      @keyframes preloader-fade-in {
-        0% {
-          opacity: 0;
-          /*animation-timing-function: linear;*/
-          animation-timing-function: cubic-bezier(0, 0, 0.5, 1);
-        }
-        100% {
-          opacity: 1;
-        }
-      }
-
-      @keyframes preloader-bounce {
-        from,
-        to {
-          transform: translateY(0px);
-          animation-timing-function: cubic-bezier(0.3, 0, 0.1, 1);
-        }
-        50% {
-          transform: translateY(-50px);
-          animation-timing-function: cubic-bezier(0.9, 0, 0.7, 1);
-        }
-      }
-
-      @keyframes preloader-squash {
-        0% {
-          transform: scaleX(1.3) scaleY(0.8);
-          animation-timing-function: cubic-bezier(0.3, 0, 0.1, 1);
-          transform-origin: bottom center;
-        }
-        15% {
-          transform: scaleX(0.75) scaleY(1.25);
-          animation-timing-function: cubic-bezier(0, 0, 0.7, 0.75);
-          transform-origin: bottom center;
-        }
-        55% {
-          transform: scaleX(1.05) scaleY(0.95);
-          animation-timing-function: cubic-bezier(0.9, 0, 1, 1);
-          transform-origin: top center;
-        }
-        95% {
-          transform: scaleX(0.75) scaleY(1.25);
-          animation-timing-function: cubic-bezier(0, 0, 0, 1);
-          transform-origin: bottom center;
-        }
-        100% {
-          transform: scaleX(1.3) scaleY(0.8);
-          transform-origin: bottom center;
-          animation-timing-function: cubic-bezier(0, 0, 0.7, 1);
-        }
-      }
-
-      /* Fail info */
-      .preloader__text--fail {
-        display: none;
-      }
-
-      /* stop logo animation */
-      .preloader--done .preloader__bounce,
-      .preloader--done .preloader__logo {
-        animation-name: none;
-        display: none;
-      }
-
-      .preloader--done .preloader__logo,
-      .preloader--done .preloader__text {
-        display: none;
-        color: #ff5705 !important;
-        font-size: 15px;
-      }
-
-      .preloader--done .preloader__text--fail {
-        display: block;
-      }
-
-      [ng\:cloak],
-      [ng-cloak],
-      .ng-cloak {
-        display: none !important;
-      }
-    </style>
-
-    <div class="preloader">
-      <div class="preloader__enter">
-        <div class="preloader__bounce">
-          <div class="preloader__logo"></div>
-        </div>
-      </div>
-      <div class="preloader__text">Loading Grafana</div>
-      <div class="preloader__text preloader__text--fail">
-        <p>
-          <strong>If you're seeing this Grafana has failed to load its application files</strong>
-          <br />
-          <br />
-        </p>
-        <p>
-          1. This could be caused by your reverse proxy settings.<br /><br />
-          2. If you host grafana under subpath make sure your grafana.ini root_url setting includes subpath. If not
-          using a reverse proxy make sure to set serve_from_sub_path to true.<br />
-          <br />
-          3. If you have a local dev build make sure you build frontend using: yarn start, or yarn build<br />
-          <br />
-          4. Sometimes restarting grafana-server can help<br />
-          <br />
-          5. Check if you are using a non-supported browser. For more information, refer to the list of
-          <a href="https://grafana.com/docs/grafana/latest/installation/requirements/#supported-web-browsers">
-            supported browsers</a
-          >.
-        </p>
-      </div>
-      <script nonce="[[.Nonce]]">
-        // Check to see if browser is not supported by Grafana
-        // Source file in app/core/utils/browser.ts & tests make edits there and copy compiled typescript here
-        function checkBrowserCompatibility() {
-          var isIE = navigator.userAgent.indexOf('MSIE') > -1;
-          var isEdge = navigator.userAgent.indexOf('Edge/') > -1 || navigator.userAgent.indexOf('Edg/') > -1;
-          var isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
-          var isChrome = /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor);
-
-          /* Check for
-          <= IE11 (Trident 7)
-          Edge <= 16
-          Firefox <= 64
-          Chrome <= 54
-          */
-          var isEdgeVersion = /Edge\/([0-9.]+)/.exec(navigator.userAgent);
-
-          if (isIE && parseFloat(/Trident\/([0-9.]+)/.exec(navigator.userAgent)[1]) <= 7) {
-            return false;
-          } else if (
-            isEdge &&
-            ((isEdgeVersion && parseFloat(isEdgeVersion[1]) <= 16) ||
-              parseFloat(/Edg\/([0-9.]+)/.exec(navigator.userAgent)[1]) <= 16)
-          ) {
-            return false;
-          } else if (isFirefox && parseFloat(/Firefox\/([0-9.]+)/.exec(navigator.userAgent)[1]) <= 64) {
-            return false;
-          } else if (isChrome && parseFloat(/Chrome\/([0-9.]+)/.exec(navigator.userAgent)[1]) <= 54) {
-            return false;
-          }
-
-          return true;
-        }
-
-        if (!checkBrowserCompatibility()) {
-          alert('Your browser is not fully supported, please try newer version.');
-        }
-      </script>
-    </div>
-
-    <div id="reactRoot"></div>
-
-    <script nonce="[[.Nonce]]">
-      window.grafanaBootData = {
-        user: [[.User]],
-        settings: [[.Settings]],
-        navTree: [[.NavTree]],
-        themePaths: {
-          light: '[[.ContentDeliveryURL]]public/build/<%= htmlWebpackPlugin.files.cssChunks.light %>',
-          dark: '[[.ContentDeliveryURL]]public/build/<%= htmlWebpackPlugin.files.cssChunks.dark %>'
-        }
-      };
-
-      // Set theme to match system only on startup.
-      // Do not react to changes in system theme after startup.
-      if (window.grafanaBootData.user.theme === "system") {
-        document.body.classList.remove("theme-system");
-        var darkQuery = window.matchMedia("(prefers-color-scheme: dark)");
-        var cssLink = document.createElement("link");
-        cssLink.rel = 'stylesheet';
-
-        if (darkQuery.matches) {
-          document.body.classList.add("theme-dark");
-          cssLink.href = window.grafanaBootData.themePaths.dark;
-          window.grafanaBootData.user.lightTheme = false;
-        } else {
-          document.body.classList.add("theme-light");
-          cssLink.href = window.grafanaBootData.themePaths.light;
-          window.grafanaBootData.user.lightTheme = true;
-        }
-        document.head.appendChild(cssLink);
-      }
-
-      window.__grafana_load_failed = function() {
-        var preloader = document.getElementsByClassName("preloader");
-        if (preloader.length) {
-          preloader[0].className = "preloader preloader--done";
-        }
-      }
-
-      // In case the js files fails to load the code below will show an info message.
-      window.onload = function() {
-        if (window.__grafana_app_bundle_loaded) {
-          return;
-        }
-        window.__grafana_load_failed();
-      };
-
-      [[if .ContentDeliveryURL]]
-        window.public_cdn_path = '[[.ContentDeliveryURL]]public/build/';
-      [[end]]
-      [[if .Nonce]]
-        window.nonce = '[[.Nonce]]';
-      [[end]]
-    </script>
-
-    [[if .GoogleTagManagerId]]
-    <!-- Google Tag Manager -->
-    <script nonce="[[.Nonce]]">
-      dataLayer = [
-        {
-          IsSignedIn: '[[.User.IsSignedIn]]',
-          Email: '[[.User.Email]]',
-          Name: '[[.User.Name]]',
-          UserId: '[[.User.Id]]',
-          OrgId: '[[.User.OrgId]]',
-          OrgName: '[[.User.OrgName]]',
-        },
-      ];
-    </script>
-    <noscript>
-      <iframe
-        src="//www.googletagmanager.com/ns.html?id=[[.GoogleTagManagerId]]"
-        height="0"
-        width="0"
-        style="display: none; visibility: hidden"
-      ></iframe>
-    </noscript>
-    <script nonce="[[.Nonce]]">
-      (function (w, d, s, l, i) {
-        w[l] = w[l] || [];
-        w[l].push({ 'gtm.start': new Date().getTime(), event: 'gtm.js' });
-        var f = d.getElementsByTagName(s)[0],
-          j = d.createElement(s),
-          dl = l != 'dataLayer' ? '&l=' + l : '';
-        j.async = true;
-        j.src = '//www.googletagmanager.com/gtm.js?id=' + i + dl;
-        f.parentNode.insertBefore(j, f);
-      })(window, document, 'script', 'dataLayer', '[[.GoogleTagManagerId]]');
-    </script>
-    <!-- End Google Tag Manager -->
-    [[end]] <% for (index in htmlWebpackPlugin.files.js) { %> <% if (htmlWebpackPlugin.files.jsIntegrity) { %>
-    <script
-      nonce="[[.Nonce]]"
-      src="[[.ContentDeliveryURL]]<%= htmlWebpackPlugin.files.js[index] %>"
-      type="text/javascript"
-      integrity="<%= htmlWebpackPlugin.files.jsIntegrity[index] %>"
-      crossorigin="<%= webpackConfig.output.crossOriginLoading %>"
-    ></script>
-    <% } else { %>
-    <script
-      nonce="[[.Nonce]]"
-      src="[[.ContentDeliveryURL]]<%= htmlWebpackPlugin.files.js[index] %>"
-      type="text/javascript"
-    ></script>
-    <% } %> <% } %>
-
-    <script nonce="[[.Nonce]]">
-      performance.mark('frontend_boot_js_done_time_seconds');
-    </script>
-  </body>
-</html>
diff --git a/public/views/index.html b/public/views/index.html
new file mode 100644
index 0000000000000..3bf6889f52070
--- /dev/null
+++ b/public/views/index.html
@@ -0,0 +1,341 @@
+<!DOCTYPE html>
+<html lang="[[.User.Language]]">
+  <head>
+    [[ if and .CSPEnabled .IsDevelopmentEnv ]]
+    <!-- Cypress overwrites CSP headers in HTTP requests, so this is required for e2e tests-->
+    <meta  http-equiv="Content-Security-Policy" content="[[.CSPContent]]"/>
+    [[ end ]]
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <meta name="viewport" content="width=device-width" />
+    <meta name="theme-color" content="#000" />
+
+    <title>[[.AppTitle]]</title>
+
+    <base href="[[.AppSubUrl]]/" />
+
+    <link rel="icon" type="image/png" href="[[.FavIcon]]" />
+    <link rel="apple-touch-icon" sizes="180x180" href="[[.AppleTouchIcon]]" />
+    <link rel="mask-icon" href="[[.Assets.ContentDeliveryURL]]public/img/grafana_mask_icon.svg" color="#F05A28" />
+
+    <!-- If theme is "system", we inject the stylesheets with javascript further down the page -->
+    [[ if eq .ThemeType "light" ]]
+    <link rel="stylesheet" href="[[.Assets.Light]]" />
+    [[ else if eq .ThemeType "dark" ]]
+    <link rel="stylesheet" href="[[.Assets.Dark]]" />
+    [[ end ]]
+
+    <script nonce="[[.Nonce]]">
+      performance.mark('frontend_boot_css_time_seconds');
+    </script>
+
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+    <meta name="msapplication-TileColor" content="#2b5797" />
+    <meta name="msapplication-config" content="public/img/browserconfig.xml" />
+  </head>
+
+  <body class="theme-[[ .ThemeType ]] [[.AppNameBodyClass]]">
+    <style>
+      .preloader {
+        height: 100%;
+        flex-direction: column;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+
+      .preloader__enter {
+        opacity: 0;
+        animation-name: preloader-fade-in;
+        animation-iteration-count: 1;
+        animation-duration: 0.9s;
+        animation-delay: 0.5s;
+        animation-fill-mode: forwards;
+      }
+
+      .preloader__bounce {
+        text-align: center;
+        animation-name: preloader-bounce;
+        animation-duration: 0.9s;
+        animation-iteration-count: infinite;
+      }
+
+      .preloader__logo {
+        display: inline-block;
+        animation-name: preloader-squash;
+        animation-duration: 0.9s;
+        animation-iteration-count: infinite;
+        width: 60px;
+        height: 60px;
+        background-repeat: no-repeat;
+        background-size: contain;
+        background-image: url('[[.LoadingLogo]]');
+      }
+
+      .preloader__text {
+        margin-top: 16px;
+        font-weight: 500;
+        font-size: 14px;
+        font-family: Sans-serif;
+        opacity: 0;
+        animation-name: preloader-fade-in;
+        animation-duration: 0.9s;
+        animation-delay: 0.5s;
+        animation-fill-mode: forwards;
+      }
+
+      .theme-light .preloader__text {
+        color: #52545c;
+      }
+
+      .theme-dark .preloader__text {
+        color: #d8d9da;
+      }
+
+      @keyframes preloader-fade-in {
+        0% {
+          opacity: 0;
+          /*animation-timing-function: linear;*/
+          animation-timing-function: cubic-bezier(0, 0, 0.5, 1);
+        }
+        100% {
+          opacity: 1;
+        }
+      }
+
+      @keyframes preloader-bounce {
+        from,
+        to {
+          transform: translateY(0px);
+          animation-timing-function: cubic-bezier(0.3, 0, 0.1, 1);
+        }
+        50% {
+          transform: translateY(-50px);
+          animation-timing-function: cubic-bezier(0.9, 0, 0.7, 1);
+        }
+      }
+
+      @keyframes preloader-squash {
+        0% {
+          transform: scaleX(1.3) scaleY(0.8);
+          animation-timing-function: cubic-bezier(0.3, 0, 0.1, 1);
+        }
+        15% {
+          transform: scaleX(0.75) scaleY(1.25);
+          animation-timing-function: cubic-bezier(0, 0, 0.7, 0.75);
+        }
+        55% {
+          transform: scaleX(1.05) scaleY(0.95);
+          animation-timing-function: cubic-bezier(0.9, 0, 1, 1);
+        }
+        95% {
+          transform: scaleX(0.75) scaleY(1.25);
+          animation-timing-function: cubic-bezier(0, 0, 0, 1);
+        }
+        100% {
+          transform: scaleX(1.3) scaleY(0.8);
+          animation-timing-function: cubic-bezier(0, 0, 0.7, 1);
+        }
+      }
+
+      /* Fail info */
+      .preloader__text--fail {
+        display: none;
+      }
+
+      /* stop logo animation */
+      .preloader--done .preloader__bounce,
+      .preloader--done .preloader__logo {
+        animation-name: none;
+        display: none;
+      }
+
+      .preloader--done .preloader__logo,
+      .preloader--done .preloader__text {
+        display: none;
+        color: #ff5705 !important;
+        font-size: 15px;
+      }
+
+      .preloader--done .preloader__text--fail {
+        display: block;
+      }
+
+      [ng\:cloak],
+      [ng-cloak],
+      .ng-cloak {
+        display: none !important;
+      }
+    </style>
+
+    <div class="preloader">
+      <div class="preloader__enter">
+        <div class="preloader__bounce">
+          <div class="preloader__logo" aria-live="polite" role="status" aria-label="Loading Grafana"></div>
+        </div>
+      </div>
+      <div class="preloader__text preloader__text--fail">
+        <p>
+          <strong>If you're seeing this Grafana has failed to load its application files</strong>
+          <br />
+          <br />
+        </p>
+        <p>
+          1. This could be caused by your reverse proxy settings.<br /><br />
+          2. If you host grafana under subpath make sure your grafana.ini root_url setting includes subpath. If not
+          using a reverse proxy make sure to set serve_from_sub_path to true.<br />
+          <br />
+          3. If you have a local dev build make sure you build frontend using: yarn start, or yarn build<br />
+          <br />
+          4. Sometimes restarting grafana-server can help<br />
+          <br />
+          5. Check if you are using a non-supported browser. For more information, refer to the list of
+          <a href="https://grafana.com/docs/grafana/latest/installation/requirements/#supported-web-browsers">
+            supported browsers</a
+          >.
+        </p>
+      </div>
+      <script nonce="[[.Nonce]]">
+        // Check to see if browser is not supported by Grafana
+        // Source file in app/core/utils/browser.ts & tests make edits there and copy compiled typescript here
+        function checkBrowserCompatibility() {
+          var isIE = navigator.userAgent.indexOf('MSIE') > -1;
+          var isEdge = navigator.userAgent.indexOf('Edge/') > -1 || navigator.userAgent.indexOf('Edg/') > -1;
+          var isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
+          var isChrome = /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor);
+
+          /* Check for
+          <= IE11 (Trident 7)
+          Edge <= 16
+          Firefox <= 64
+          Chrome <= 54
+          */
+          var isEdgeVersion = /Edge\/([0-9.]+)/.exec(navigator.userAgent);
+
+          if (isIE && parseFloat(/Trident\/([0-9.]+)/.exec(navigator.userAgent)[1]) <= 7) {
+            return false;
+          } else if (
+            isEdge &&
+            ((isEdgeVersion && parseFloat(isEdgeVersion[1]) <= 16) ||
+              parseFloat(/Edg\/([0-9.]+)/.exec(navigator.userAgent)[1]) <= 16)
+          ) {
+            return false;
+          } else if (isFirefox && parseFloat(/Firefox\/([0-9.]+)/.exec(navigator.userAgent)[1]) <= 64) {
+            return false;
+          } else if (isChrome && parseFloat(/Chrome\/([0-9.]+)/.exec(navigator.userAgent)[1]) <= 54) {
+            return false;
+          }
+
+          return true;
+        }
+
+        if (!checkBrowserCompatibility()) {
+          alert('Your browser is not fully supported, please try newer version.');
+        }
+      </script>
+    </div>
+
+    <div id="reactRoot"></div>
+
+    <script nonce="[[.Nonce]]">
+      window.grafanaBootData = {
+        user: [[.User]],
+        settings: [[.Settings]],
+        navTree: [[.NavTree]],
+        assets: [[.Assets]]
+      };
+
+      // Set theme to match system only on startup.
+      // Do not react to changes in system theme after startup.
+      if (window.grafanaBootData.user.theme === "system") {
+        document.body.classList.remove("theme-system");
+        var darkQuery = window.matchMedia("(prefers-color-scheme: dark)");
+        var cssLink = document.createElement("link");
+        cssLink.rel = 'stylesheet';
+
+        if (darkQuery.matches) {
+          document.body.classList.add("theme-dark");
+          cssLink.href = window.grafanaBootData.assets.dark;
+          window.grafanaBootData.user.lightTheme = false;
+        } else {
+          document.body.classList.add("theme-light");
+          cssLink.href = window.grafanaBootData.assets.light;
+          window.grafanaBootData.user.lightTheme = true;
+        }
+        document.head.appendChild(cssLink);
+      }
+
+      window.__grafana_load_failed = function() {
+        var preloader = document.getElementsByClassName("preloader");
+        if (preloader.length) {
+          preloader[0].className = "preloader preloader--done";
+        }
+      }
+
+      // In case the js files fails to load the code below will show an info message.
+      window.onload = function() {
+        if (window.__grafana_app_bundle_loaded) {
+          return;
+        }
+        window.__grafana_load_failed();
+      };
+
+      [[if .Assets.ContentDeliveryURL]]
+        window.public_cdn_path = '[[.Assets.ContentDeliveryURL]]public/build/';
+      [[end]]
+      [[if .Nonce]]
+        window.nonce = '[[.Nonce]]';
+      [[end]]
+    </script>
+
+    [[if .GoogleTagManagerId]]
+    <!-- Google Tag Manager -->
+    <script nonce="[[.Nonce]]">
+      dataLayer = [
+        {
+          IsSignedIn: '[[.User.IsSignedIn]]',
+          Email: '[[.User.Email]]',
+          Name: '[[.User.Name]]',
+          UserId: '[[.User.Id]]',
+          OrgId: '[[.User.OrgId]]',
+          OrgName: '[[.User.OrgName]]',
+        },
+      ];
+    </script>
+    <noscript>
+      <iframe
+        src="//www.googletagmanager.com/ns.html?id=[[.GoogleTagManagerId]]"
+        height="0"
+        width="0"
+        style="display: none; visibility: hidden"
+      ></iframe>
+    </noscript>
+    <script nonce="[[.Nonce]]">
+      (function (w, d, s, l, i) {
+        w[l] = w[l] || [];
+        w[l].push({ 'gtm.start': new Date().getTime(), event: 'gtm.js' });
+        var f = d.getElementsByTagName(s)[0],
+          j = d.createElement(s),
+          dl = l != 'dataLayer' ? '&l=' + l : '';
+        j.async = true;
+        j.src = '//www.googletagmanager.com/gtm.js?id=' + i + dl;
+        f.parentNode.insertBefore(j, f);
+      })(window, document, 'script', 'dataLayer', '[[.GoogleTagManagerId]]');
+    </script>
+    <!-- End Google Tag Manager -->
+    [[end]]
+
+    [[range $asset := .Assets.JSFiles]]
+      <script
+      nonce="[[$.Nonce]]"
+      src="[[$asset.FilePath]]"
+      type="text/javascript"
+    ></script>
+    [[end]]
+
+    <script nonce="[[.Nonce]]">
+      performance.mark('frontend_boot_js_done_time_seconds');
+    </script>
+  </body>
+</html>
diff --git a/public/views/openapi3.html b/public/views/openapi3.html
deleted file mode 100644
index 87c1fae1a1946..0000000000000
--- a/public/views/openapi3.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!-- HTML for static distribution bundle build -->
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8">
-    <title>Swagger UI</title>
-    <link rel="stylesheet" type="text/css" href="https://unpkg.com/swagger-ui-dist@4.3.0/swagger-ui.css" integrity="sha384-pzdBB6iZwPIzBHgXle+9cgvKuMgtWNrBopXkjrWnKCi3m4uJsPPdLQ4IPMqRDirS" crossorigin="anonymous" referrerpolicy="no-referrer" />
-    <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
-    <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
-    <style>
-      html
-      {
-        box-sizing: border-box;
-        overflow: -moz-scrollbars-vertical;
-        overflow-y: scroll;
-      }
-
-      *,
-      *:before,
-      *:after
-      {
-        box-sizing: inherit;
-      }
-
-      body
-      {
-        margin:0;
-        background: #fafafa;
-      }
-    </style>
-  </head>
-
-  <body>
-    <div id="swagger-ui"></div>
-
-    <script nonce="[[.Nonce]]" src="https://unpkg.com/swagger-ui-dist@4.3.0/swagger-ui-bundle.js" charset="UTF-8" integrity="sha384-BGJ5JzR5LEl4ETmxXXlZtXtMWj3uQ9jj9/OHe3yrn5rrtAyLOz1SyyzwMfuwZgPc" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-    <script nonce="[[.Nonce]]" src="https://unpkg.com/swagger-ui-dist@4.3.0/swagger-ui-standalone-preset.js" charset="UTF-8" integrity="sha384-AWSfISmlS8fS336GXRkpL0Uv6EbCpsFfXDUwmklhbb3SctGSuvXWBcbjERjgf/e4" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-    <script nonce="[[.Nonce]]">
-    window.onload = function() {
-      // Begin Swagger UI call region
-      const ui = SwaggerUIBundle({
-        url: "/public/openapi3.json",
-        dom_id: '#swagger-ui',
-        deepLinking: true,
-        presets: [
-          SwaggerUIBundle.presets.apis,
-          SwaggerUIStandalonePreset
-        ],
-        plugins: [
-          SwaggerUIBundle.plugins.DownloadUrl
-        ],
-        layout: "StandaloneLayout",
-        filter: true,
-        tagsSorter: "alpha",
-        tryItOutEnabled: true
-      });
-      // End Swagger UI call region
-
-      window.ui = ui;
-    };
-  </script>
-  </body>
-</html>
diff --git a/public/views/swagger.html b/public/views/swagger.html
index a4ebd4036e325..4b56f31731f11 100644
--- a/public/views/swagger.html
+++ b/public/views/swagger.html
@@ -1,15 +1,21 @@
 <!-- HTML for static distribution bundle build -->
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
-    <meta charset="UTF-8">
+    <meta charset="UTF-8" />
     <title>Swagger UI</title>
-    <link rel="stylesheet" type="text/css" href="https://unpkg.com/swagger-ui-dist@4.3.0/swagger-ui.css" integrity="sha384-pzdBB6iZwPIzBHgXle+9cgvKuMgtWNrBopXkjrWnKCi3m4uJsPPdLQ4IPMqRDirS" crossorigin="anonymous" referrerpolicy="no-referrer" />
-    <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
-    <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://unpkg.com/swagger-ui-dist@4.3.0/swagger-ui.css"
+      integrity="sha384-pzdBB6iZwPIzBHgXle+9cgvKuMgtWNrBopXkjrWnKCi3m4uJsPPdLQ4IPMqRDirS"
+      crossorigin="anonymous"
+      referrerpolicy="no-referrer"
+    />
+    <link rel="icon" type="image/png" href="favicon-32x32.png" sizes="32x32" />
+    <link rel="icon" type="image/png" href="favicon-16x16.png" sizes="16x16" />
     <style>
-      html
-      {
+      html {
         box-sizing: border-box;
         overflow: -moz-scrollbars-vertical;
         overflow-y: scroll;
@@ -17,47 +23,86 @@
 
       *,
       *:before,
-      *:after
-      {
+      *:after {
         box-sizing: inherit;
       }
 
-      body
-      {
-        margin:0;
+      body {
+        margin: 0;
         background: #fafafa;
       }
+
+      .topbar-wrapper img {
+        content: url('public/img/grafana_icon.svg');
+      }
     </style>
   </head>
 
   <body>
     <div id="swagger-ui"></div>
 
-    <script nonce="[[.Nonce]]" src="https://unpkg.com/swagger-ui-dist@4.3.0/swagger-ui-bundle.js" charset="UTF-8" integrity="sha384-BGJ5JzR5LEl4ETmxXXlZtXtMWj3uQ9jj9/OHe3yrn5rrtAyLOz1SyyzwMfuwZgPc" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-    <script nonce="[[.Nonce]]" src="https://unpkg.com/swagger-ui-dist@4.3.0/swagger-ui-standalone-preset.js" charset="UTF-8" integrity="sha384-AWSfISmlS8fS336GXRkpL0Uv6EbCpsFfXDUwmklhbb3SctGSuvXWBcbjERjgf/e4" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <script
+      nonce="[[.Nonce]]"
+      src="https://unpkg.com/swagger-ui-dist@4.3.0/swagger-ui-bundle.js"
+      charset="UTF-8"
+      integrity="sha384-BGJ5JzR5LEl4ETmxXXlZtXtMWj3uQ9jj9/OHe3yrn5rrtAyLOz1SyyzwMfuwZgPc"
+      crossorigin="anonymous"
+      referrerpolicy="no-referrer"
+    ></script>
+    <script
+      nonce="[[.Nonce]]"
+      src="https://unpkg.com/swagger-ui-dist@4.3.0/swagger-ui-standalone-preset.js"
+      charset="UTF-8"
+      integrity="sha384-AWSfISmlS8fS336GXRkpL0Uv6EbCpsFfXDUwmklhbb3SctGSuvXWBcbjERjgf/e4"
+      crossorigin="anonymous"
+      referrerpolicy="no-referrer"
+    ></script>
     <script nonce="[[.Nonce]]">
-    window.onload = function() {
-      // Begin Swagger UI call region
-      const ui = SwaggerUIBundle({
-        url: "/public/api-merged.json",
-        dom_id: '#swagger-ui',
-        deepLinking: true,
-        presets: [
-          SwaggerUIBundle.presets.apis,
-          SwaggerUIStandalonePreset
-        ],
-        plugins: [
-          SwaggerUIBundle.plugins.DownloadUrl
-        ],
-        layout: "StandaloneLayout",
-        filter: true,
-        tagsSorter: "alpha",
-        tryItOutEnabled: true
-      });
-      // End Swagger UI call region
-
-      window.ui = ui;
-    };
-  </script>
+      window.onload = async function () {
+        // the trailing slash breaks relative URL loading
+        if (window.location.pathname.endsWith('/')) {
+          const idx = window.location.href.lastIndexOf('/');
+          window.location.href = window.location.href.substring(0, idx);
+          return;
+        }
+
+        const urlParams = new URLSearchParams(window.location.search);
+        const v2 = { name: 'Grafana API (OpenAPI v2)', url: 'public/api-merged.json' };
+        const v3 = { name: 'Grafana API (OpenAPI v3)', url: 'public/openapi3.json' };
+        const urls = urlParams.get('show') == 'v3' ? [v3, v2] : [v2, v3];
+        try {
+          const rsp = await fetch('openapi/v3');
+          const apis = await rsp.json();
+          for (const [key, value] of Object.entries(apis.paths)) {
+            const parts = key.split('/');
+            if (parts.length == 3) {
+              urls.push({
+                name: `${parts[1]}/${parts[2]}`,
+                url: value.serverRelativeURL.substring(1), // remove initial slash
+              });
+            }
+          }
+          urls.push({ name: 'Grafana apps (OpenAPI v2)', url: 'openapi/v2' });
+        } catch (err) {
+          // console.warn('Error loading k8s apis', err);
+        }
+
+        // Begin Swagger UI call region
+        const ui = SwaggerUIBundle({
+          urls,
+          dom_id: '#swagger-ui',
+          deepLinking: true,
+          presets: [SwaggerUIBundle.presets.apis, SwaggerUIStandalonePreset],
+          plugins: [SwaggerUIBundle.plugins.DownloadUrl],
+          layout: 'StandaloneLayout',
+          filter: true,
+          tagsSorter: 'alpha',
+          tryItOutEnabled: true,
+          queryConfigEnabled: true, // keeps the selected ?urls.primaryName=...
+        });
+
+        window.ui = ui;
+      };
+    </script>
   </body>
 </html>
diff --git a/scripts/build/ci-build/.gitignore b/scripts/build/ci-build/.gitignore
deleted file mode 100644
index aa96d47e101f4..0000000000000
--- a/scripts/build/ci-build/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-MacOSX*.tar.xz
diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile
deleted file mode 100644
index fc44fd9c08aec..0000000000000
--- a/scripts/build/ci-build/Dockerfile
+++ /dev/null
@@ -1,193 +0,0 @@
-# Use old Debian (LTS into 2024) in order to ensure binary compatibility with older glibc's.
-FROM debian:buster-20220822 AS toolchain
-
-ENV OSX_MIN=10.10 \
-    CTNG=1.24.0 \
-    CTNG_CHKSUM=89b8794a4184ad4928750e29712ed4f194aa1d0b93768d67ff64f30c30f1b1e165647cafc6de94d68d3ef70e50446e544dad65aa36137511a32ee7a667dddfb4 \
-    # This is the last revision that builds on Debian Stretch
-    OSX_CROSS_REV=a1d7d7a8d569f9f0b8c3140b8b32848dbcd62afa
-
-# Use ARG so as not to persist environment variable in image
-ARG DEBIAN_FRONTEND=noninteractive
-
-WORKDIR /tmp
-
-# FIRST PART
-# build osx64 toolchain (stripped of man documentation)
-# the toolchain produced is not self contained, it needs clang at runtime
-#
-# SECOND PART
-# build gcc (no g++) centos6-x64 toolchain
-# doc: https://crosstool-ng.github.io/docs/
-# apt-get should be all dep to build toolchain
-# sed and 1st echo are for convenience to get the toolchain in /tmp/x86_64-centos6-linux-gnu
-# other echo are to enable build by root (crosstool-NG refuse to do that by default)
-# the last 2 rm are just to save some time and space writing docker layers
-#
-# THIRD PART
-# build fpm and creates a set of deb from gem
-# ruby2.0 depends on ruby1.9.3 which is install as default ruby
-# rm/ln are here to change that
-# created deb depends on rubygem-json but json gem is not build
-# so do by hand
-
-# might wanna make sure osx cross and the other tarball as well as the packages ends up somewhere other than tmp
-# might also wanna put them as their own layer to not have to unpack them every time?
-
-RUN apt-get update && \
-    apt-get install -yq \
-        clang patch libxml2-dev \
-        build-essential \
-        ca-certificates \
-        curl            \
-        git             \
-        make            \
-        cmake           \
-        libssl-dev      \
-        xz-utils        \
-        lzma-dev
-RUN git clone https://github.com/tpoechtrager/osxcross.git /tmp/osxcross && \
-      cd /tmp/osxcross && git reset --hard $OSX_CROSS_REV
-COPY MacOSX10.15.sdk.tar.xz /tmp/osxcross/tarballs/
-RUN ln -s /usr/bin/llvm-dsymutil-6.0 /usr/bin/dsymutil
-RUN UNATTENDED=1 OSX_VERSION_MIN=${OSX_MIN} /tmp/osxcross/build.sh
-RUN rm -rf /tmp/osxcross/target/SDK/*/usr/share && \
-    cd /tmp                                              && \
-    tar cfJ osxcross.tar.xz osxcross/target              && \
-    rm -rf /tmp/osxcross
-RUN apt-get install -yq                     \
-        unzip libtool-bin bison flex gawk gcc g++ gperf help2man libncurses5-dev make patch python-dev texinfo xz-utils
-RUN curl -fLO http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-${CTNG}.tar.xz
-RUN echo $CTNG_CHKSUM crosstool-ng-${CTNG}.tar.xz | sha512sum --check --strict --status
-RUN tar xf crosstool-ng-${CTNG}.tar.xz
-RUN cd /tmp/crosstool-ng-${CTNG}        && \
-    ./configure --enable-local          && \
-    make && \
-    ./ct-ng x86_64-centos6-linux-gnu    && \
-    sed -i '/CT_PREFIX_DIR=/d' .config  && \
-    echo 'CT_PREFIX_DIR="/tmp/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}"' >> .config && \
-    echo 'CT_EXPERIMENTAL=y' >> .config && \
-    echo 'CT_ALLOW_BUILD_AS_ROOT=y' >> .config && \
-    echo 'CT_ALLOW_BUILD_AS_ROOT_SURE=y' >> .config && \
-    mkdir -p .build/tarballs && \
-    cd .build/tarballs && \
-    curl -fLO https://libisl.sourceforge.io/isl-0.20.tar.gz && \
-    curl -fLO https://github.com/libexpat/libexpat/releases/download/R_2_1_0/expat-2.1.0.tar.gz && \
-    cd - && \
-    ./ct-ng build
-RUN cd /tmp && \
-    rm /tmp/x86_64-centos6-linux-gnu/build.log.bz2 && \
-    tar cfJ x86_64-centos6-linux-gnu.tar.xz x86_64-centos6-linux-gnu/ && \
-    rm -rf /tmp/x86_64-centos6-linux-gnu/ && \
-    rm -rf /tmp/crosstool-ng-${CTNG}
-
-ARG SHELLCHECK_VERSION=0.7.1
-ARG SHELLCHECK_CHKSUM=beca3d7819a6bdcfbd044576df4fc284053b48f468b2f03428fe66f4ceb2c05d9b5411357fa15003cb0311406c255084cf7283a3b8fce644c340c2f6aa910b9f
-RUN curl -fLO http://storage.googleapis.com/grafana-downloads/ci-dependencies/shellcheck-v${SHELLCHECK_VERSION}.linux.x86_64.tar.xz
-RUN echo $SHELLCHECK_CHKSUM shellcheck-v${SHELLCHECK_VERSION}.linux.x86_64.tar.xz | sha512sum --check --strict --status
-RUN tar xf shellcheck-v${SHELLCHECK_VERSION}.linux.x86_64.tar.xz && mv shellcheck-v${SHELLCHECK_VERSION}/shellcheck /tmp/
-
-ARG BUILDIFIER_VERSION=5.1.0
-ARG BUILDIFIER_CHKSUM=52bf6b102cb4f88464e197caac06d69793fa2b05f5ad50a7e7bf6fbd656648a3
-RUN curl -fLO https://github.com/bazelbuild/buildtools/releases/download/${BUILDIFIER_VERSION}/buildifier-linux-amd64
-RUN echo $BUILDIFIER_CHKSUM buildifier-linux-amd64 | sha256sum --check --strict --status
-RUN mv buildifier-linux-amd64 /tmp/buildifier && chmod +x /tmp/buildifier
-
-ARG CUE_VERSION=0.3.0-alpha5
-ARG CUE_CHKSUM=9d3131e470cdb5182afd9966688f1c052d383145cce005a947156b5591da39b7
-RUN curl -fLO https://github.com/cuelang/cue/releases/download/v${CUE_VERSION}/cue_${CUE_VERSION}_Linux_x86_64.tar.gz
-RUN echo $CUE_CHKSUM cue_${CUE_VERSION}_Linux_x86_64.tar.gz | sha256sum --check --strict --status
-RUN tar xf cue_${CUE_VERSION}_Linux_x86_64.tar.gz -C /tmp cue
-
-ARG DOCKERIZE_VERSION=0.6.1
-RUN curl -fLO https://github.com/jwilder/dockerize/releases/download/v${DOCKERIZE_VERSION}/dockerize-linux-amd64-v${DOCKERIZE_VERSION}.tar.gz
-RUN tar -xzvf dockerize-linux-amd64-v${DOCKERIZE_VERSION}.tar.gz -C /tmp/
-RUN rm dockerize-linux-amd64-v${DOCKERIZE_VERSION}.tar.gz
-
-# Base image to crossbuild grafana.
-# Use old Debian (LTS into 2024) in order to ensure binary compatibility with older glibc's.
-FROM debian:buster-20220822
-
-ENV GOVERSION=1.20.10 \
-    PATH=/usr/local/go/bin:$PATH \
-    GOPATH=/go \
-    NODEVERSION=20.9.0-1nodesource1 \
-    YARNVERSION=1.22.19-1
-
-# Use ARG so as not to persist environment variable in image
-ARG DEBIAN_FRONTEND=noninteractive
-
-COPY --from=toolchain /tmp/x86_64-centos6-linux-gnu.tar.xz /tmp/osxcross.tar.xz /tmp/
-COPY --from=toolchain /tmp/shellcheck /usr/local/bin/
-COPY --from=toolchain /tmp/buildifier /usr/local/bin/
-COPY --from=toolchain /tmp/cue /usr/local/bin/
-COPY --from=toolchain /tmp/dockerize /usr/local/bin/
-
-RUN apt-get update && \
-    apt-get install -yq \
-        apt-transport-https \
-        build-essential netcat-traditional clang gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-mingw-w64-x86-64 \
-        python-pip      \
-        ca-certificates \
-        curl            \
-        gcc             \
-        g++             \
-        git             \
-	      jq		          \
-        make            \
-        rpm             \
-        xz-utils        \
-        expect          \
-        gnupg2          \
-        procps          \
-        ruby            \
-        ruby-dev        \
-        rubygems        \
-        unzip && \
-    gem install -N public_suffix -v 4.0.7 && \
-    gem install --conservative -N fpm && \
-    ln -s /usr/bin/llvm-dsymutil-6.0 /usr/bin/dsymutil && \
-    curl -fsS https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -  && \
-    curl -O https://deb.nodesource.com/node_20.x/pool/main/n/nodejs/nodejs_${NODEVERSION}_amd64.deb &&\
-    dpkg -i nodejs_${NODEVERSION}_amd64.deb &&\
-    rm nodejs_${NODEVERSION}_amd64.deb &&\
-    curl -fsS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
-    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
-    apt-get update && apt-get install -yq yarn=${YARNVERSION} && \
-    curl -fL https://storage.googleapis.com/golang/go${GOVERSION}.linux-amd64.tar.gz \
-      | tar -xz -C /usr/local && \
-    git clone https://github.com/raspberrypi/tools.git /opt/rpi-tools --depth=1 && \
-    pip install codespell
-
-# We build our own musl cross-compilers via the musl-cross-make project, on the same OS as this image's base image,
-# to ensure compatibility. We also make sure to target musl 1.1.x, since musl 1.2.x introduces 64-bit time types
-# that breaks compatibility on some 32-bit architectures (https://github.com/grafana/grafana/issues/23500).
-#
-# Use ARG so as not to persist environment variable in image
-ARG CHKSUM_ARMV7_MUSL=5db487fb0a4aa61667de45a9cfbf7940360bd7256583b8a1e7810b4d9dd0e02a8aac737ca634b57bf269195e776ef503832ed22a6689a1c8fcdcc956f846bef7
-ARG CHKSUM_ARMV8_MUSL=50f4899cc2f637dbc39470bbe307074ccf7f40da2ab730218d13a9f75d578266311db6a0785919dcdcb5e7ce4517b13ee8d4a56d76e6fca7c6d4c2510d71aa8b
-ARG CHKSUM_AMD64_MUSL=493a79e9e29a1eab3fdff6435bac6509253d2e54ac30ad9098ce5da638bbb8ad18a7ebf3520bcaf2f9588befeff23402d8bbf54fa3809bfe18c984a4ecabcb12
-
-# Install musl cross compilers
-RUN cd /tmp && \
-    curl -fLO https://grafana-downloads.storage.googleapis.com/compilers/arm-linux-musleabihf-cross.tgz && \
-    ([ "$(sha512sum arm-linux-musleabihf-cross.tgz|cut -f1 -d ' ')" = "$CHKSUM_ARMV7_MUSL" ] || (echo "Mismatching checksums armv7"; exit 1)) && \
-    tar xf arm-linux-musleabihf-cross.tgz && \
-    rm arm-linux-musleabihf-cross.tgz && \
-    curl -fLO https://grafana-downloads.storage.googleapis.com/compilers/aarch64-linux-musl-cross.tgz && \
-    ([ "$(sha512sum aarch64-linux-musl-cross.tgz|cut -f1 -d ' ')" = "$CHKSUM_ARMV8_MUSL" ] || (echo "Mismatching checksums armv8"; exit 1)) && \
-    tar xf aarch64-linux-musl-cross.tgz && \
-    rm aarch64-linux-musl-cross.tgz && \
-    curl -fLO https://grafana-downloads.storage.googleapis.com/compilers/x86_64-linux-musl-cross.tgz && \
-    ([ "$(sha512sum x86_64-linux-musl-cross.tgz|cut -f1 -d ' ')" = "$CHKSUM_AMD64_MUSL" ] || (echo "Mismatching checksums amd64"; exit 1)) && \
-    tar xf x86_64-linux-musl-cross.tgz && \
-    rm x86_64-linux-musl-cross.tgz
-
-RUN go install github.com/mgechev/revive@v1.0.2 && \
-  mv ${GOPATH}/bin/revive /usr/local/bin/ && \
-  go install github.com/google/go-jsonnet/cmd/jsonnetfmt@latest && \
-  mv ${GOPATH}/bin/jsonnetfmt /usr/local/bin/ && \
-  go install github.com/monitoring-mixins/mixtool/cmd/mixtool@latest && \
-  mv ${GOPATH}/bin/mixtool /usr/local/bin/
-
-COPY ./bootstrap.sh /tmp/bootstrap.sh
diff --git a/scripts/build/ci-build/README.md b/scripts/build/ci-build/README.md
deleted file mode 100644
index ed6dbe509aa69..0000000000000
--- a/scripts/build/ci-build/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# grafana-build-container
-
-These are the sources for the Docker image that we use for the Grafana build containers. The image source itself
-is in Dockerfile, but there are supporting scripts such as the Makefile, for building images.
-
-The image is based on Debian Buster, since we want an older Linux distribution (Buster has long-term support into 2024) to build binaries that are as portable as possible.
-
-## Build/Publish Docker Image
-
-In order to build and publish the Grafana build Docker image, execute the following:
-
-```
-# Download MacOSX10.15.sdk.tar.xz from our private GCS bucket into this directory
-docker build -t grafana/build-container:<VERSION> --ulimit nofile=2048:2048 .
-docker push grafana/build-container:<VERSION>
-```
-
-If you're running on a machine that has an ARM chip (Apple M1/M2, etc.), add `--platform linux/amd64` to the `docker build` command. It can take approximately four hours for an initial build to complete. Due to caching, subsequent builds take less time (~10 mins or so).
diff --git a/scripts/build/ci-build/bootstrap.sh b/scripts/build/ci-build/bootstrap.sh
deleted file mode 100755
index 0c4f5ac876e5f..0000000000000
--- a/scripts/build/ci-build/bootstrap.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-cd /tmp || exit 1
-tar xfJ x86_64-centos6-linux-gnu.tar.xz
-tar xfJ osxcross.tar.xz
diff --git a/scripts/build/release_publisher/publisher_test.go b/scripts/build/release_publisher/publisher_test.go
index dbd013405ff1c..d31d161d21a55 100644
--- a/scripts/build/release_publisher/publisher_test.go
+++ b/scripts/build/release_publisher/publisher_test.go
@@ -9,7 +9,6 @@ import (
 )
 
 func TestPreparingReleaseFromRemote(t *testing.T) {
-
 	cases := []struct {
 		version         string
 		expectedVersion string
diff --git a/scripts/check-breaking-changes.sh b/scripts/check-breaking-changes.sh
index 31de6ecbbaab3..07ff141e6baf7 100755
--- a/scripts/check-breaking-changes.sh
+++ b/scripts/check-breaking-changes.sh
@@ -4,53 +4,68 @@
 PACKAGES=$(ls -d ./packages/*/)
 EXIT_CODE=0
 GITHUB_MESSAGE=""
-SKIP_PACKAGES=("grafana-eslint-rules" "grafana-plugin-configs")
+SKIP_PACKAGES=("grafana-eslint-rules" "grafana-plugin-configs" "grafana-o11y-ds-frontend" "grafana-sql")
 
 # Loop through the packages
 while IFS=" " read -r -a package; do
 
-    # shellcheck disable=SC2128
-    PACKAGE_PATH=$(basename "$package")
+  # shellcheck disable=SC2128
+  PACKAGE_PATH=$(basename "$package")
 
-    # Calculate current and previous package paths / names
-    PREV="./base/$PACKAGE_PATH"
-    CURRENT="./pr/$PACKAGE_PATH"
+  # Calculate current and previous package paths / names
+  PREV="./base/$PACKAGE_PATH"
+  CURRENT="./pr/$PACKAGE_PATH"
 
-    # Temporarily skipping these packages as they don't have any exposed static typing
-    if [[ ${SKIP_PACKAGES[@]} =~ "$PACKAGE_PATH" ]]; then
-        continue
+  # Temporarily skipping these packages as they don't have any exposed static typing
+  SKIP_PACKAGE_FOUND=0
+  for skip_pkg in "${SKIP_PACKAGES[@]}"; do
+    if [[ "$PACKAGE_PATH" == "$skip_pkg" ]]; then
+      SKIP_PACKAGE_FOUND=1
+      break
     fi
+  done
 
-    # Extract the npm package tarballs into separate directories e.g. ./base/@grafana-data.tgz -> ./base/grafana-data/
-    mkdir "$PREV"
-    tar -xf "./base/@$PACKAGE_PATH.tgz" --strip-components=1 -C "$PREV"
-    mkdir "$CURRENT"
-    tar -xf "./pr/@$PACKAGE_PATH.tgz" --strip-components=1 -C "$CURRENT"
-
-    # Run the comparison and record the exit code
-    echo ""
-    echo ""
-    echo "${PACKAGE_PATH}"
-    echo "================================================="
-    npm exec -- @grafana/levitate compare --prev "$PREV" --current "$CURRENT"
-
-    # Check if the comparison returned with a non-zero exit code
-    # Record the output, maybe with some additional information
-    STATUS=$?
-
-    # Final exit code
-    # (non-zero if any of the packages failed the checks)
-    if [ $STATUS -gt 0 ]
-    then
-        EXIT_CODE=1
-        GITHUB_MESSAGE="${GITHUB_MESSAGE}**\\\`${PACKAGE_PATH}\\\`** has possible breaking changes ([more info](${GITHUB_JOB_LINK}#step:${GITHUB_STEP_NUMBER}:1))<br />"
-    fi
+  if [[ $SKIP_PACKAGE_FOUND -eq 1 ]]; then
+    continue
+  fi
+
+  # Skip packages that are marked as private in their package.json (private: true)
+  if [[ $(jq -r '.private' "./packages/$PACKAGE_PATH/package.json") == "true" ]]; then
+    continue
+  fi
+
+  # Extract the npm package tarballs into separate directories e.g. ./base/@grafana-data.tgz -> ./base/grafana-data/
+  mkdir "$PREV"
+  tar -xf "./base/@$PACKAGE_PATH.tgz" --strip-components=1 -C "$PREV"
+  mkdir "$CURRENT"
+  tar -xf "./pr/@$PACKAGE_PATH.tgz" --strip-components=1 -C "$CURRENT"
+
+  # Run the comparison and record the exit code
+  echo ""
+  echo ""
+  echo "$PACKAGE_PATH"
+  echo "================================================="
+  npm exec -- @grafana/levitate@latest compare --prev "$PREV" --current "$CURRENT" --json >data.json
+
+  # Check if the comparison returned with a non-zero exit code
+  # Record the output, maybe with some additional information
+  STATUS=$?
+  CURRENT_REPORT=$(node ./scripts/levitate-parse-json-report.js)
+  # Final exit code
+  # (non-zero if any of the packages failed the checks)
+  if [ "$STATUS" -gt 0 ]; then
+    EXIT_CODE=1
+    GITHUB_MESSAGE="${GITHUB_MESSAGE}**\\\`${PACKAGE_PATH}\\\`** has possible breaking changes ([more info](${GITHUB_JOB_LINK}#step:${GITHUB_STEP_NUMBER}:1))<br />"
+    GITHUB_LEVITATE_MARKDOWN+="<h3>${PACKAGE_PATH}</h3>${CURRENT_REPORT}<br>"
+  fi
 
-done <<< "$PACKAGES"
+done <<<"$PACKAGES"
 
 # "Export" the message to an environment variable that can be used across Github Actions steps
-echo "is_breaking=$EXIT_CODE" >> "$GITHUB_OUTPUT"
-echo "message=$GITHUB_MESSAGE" >> "$GITHUB_OUTPUT"
+echo "is_breaking=$EXIT_CODE" >>"$GITHUB_OUTPUT"
+echo "message=$GITHUB_MESSAGE" >>"$GITHUB_OUTPUT"
+mkdir -p ./levitate
+echo "$GITHUB_LEVITATE_MARKDOWN" >./levitate/levitate.md
 
 # We will exit the workflow accordingly at another step
 exit 0
diff --git a/scripts/ci-frontend-metrics.sh b/scripts/ci-frontend-metrics.sh
index 7fec6a1c3fc99..21313cd4c43c0 100755
--- a/scripts/ci-frontend-metrics.sh
+++ b/scripts/ci-frontend-metrics.sh
@@ -15,7 +15,7 @@ CLASSNAME_PROP="$(grep -r -o -E --include="*.ts*" "\.*.className=\W.*\W.*" publi
 EMOTION_IMPORTS="$(grep -r -o -E --include="*.ts*" --exclude="*.test*" "\{.*css.*\} from '@emotion/css'" public/app | wc -l)"
 TS_FILES="$(find public/app -type f -name "*.ts*" -not -name "*.test*" | wc -l)"
 
-TOTAL_BUNDLE="$(du -sk $BUILD_FOLDER | cut -f1)"
+TOTAL_BUNDLE="$(du -sk "$BUILD_FOLDER" | cut -f1)"
 OUTDATED_DEPENDENCIES="$(yarn outdated --all | grep -oP '[[:digit:]]+ *(?= dependencies are out of date)')"
 ## Disabled due to yarn PnP update breaking npm audit
 #VULNERABILITY_AUDIT="$(yarn npm audit --all --recursive --json)"
diff --git a/scripts/cli/bettererResultsToJson.ts b/scripts/cli/bettererResultsToJson.ts
new file mode 100644
index 0000000000000..310cd74b4c592
--- /dev/null
+++ b/scripts/cli/bettererResultsToJson.ts
@@ -0,0 +1,42 @@
+import { BettererFileIssue, betterer } from '@betterer/betterer';
+import { writeFile } from 'fs/promises';
+
+interface Issue {
+  message: string;
+  count: string;
+}
+
+type ResultMap = Record<string, Record<string, Issue[]>>;
+
+/**
+ *  Produces a JSON file for consumption directly in Grafana
+ */
+async function main() {
+  const results = await betterer.results();
+  const resultMap: ResultMap = {};
+
+  for (const suite of results.resultSummaries) {
+    resultMap[suite.name] = {};
+
+    // Aggregate issues for each file in the suite
+    for (const [file, details] of Object.entries(suite.details)) {
+      const fileIssues: Issue[] = [];
+      for (const issue of details) {
+        const issueExists = fileIssues.find((i) => i.message === issue.message)!!;
+        if (issueExists) {
+          continue;
+        }
+        fileIssues.push({
+          message: issue.message,
+          count: details.filter((i: BettererFileIssue) => i.message === issue.message).length,
+        });
+      }
+      const relativePath = file.replace(process.cwd(), '');
+      resultMap[suite.name][relativePath] = fileIssues;
+    }
+  }
+
+  await writeFile('.betterer.results.json', JSON.stringify(resultMap, undefined, 2));
+}
+
+main().catch(console.error);
diff --git a/scripts/docs/generate-transformations.ts b/scripts/docs/generate-transformations.ts
index c28cb37d553fd..8e12986ce9ebd 100644
--- a/scripts/docs/generate-transformations.ts
+++ b/scripts/docs/generate-transformations.ts
@@ -1,13 +1,15 @@
+import { writeFileSync, readFileSync, read } from 'fs';
+import { resolve } from 'path';
+
 import {
   transformationDocsContent,
   TransformationDocsContentType,
   ImageRenderType,
 } from '../../public/app/features/transformers/docs/content';
 
-const template = `---
-comments: |
-  This Markdown file is auto-generated. DO NOT EDIT THIS FILE DIRECTLY.
+const WRITE_PATH = 'docs/sources/panels-visualizations/query-transform-data/transform-data/index.md';
 
+export const readMeContent = `
   To update this Markdown, navigate to the following Typescript files and edit them based on what you need to update:
 
   scripts/docs/generate-transformations.ts - Includes all content not specific to a transformation.
@@ -24,6 +26,12 @@ comments: |
   Browse to http://localhost:3003/docs/grafana/latest/panels-visualizations/query-transform-data/transform-data/
 
   Refer to ./docs/README.md "Content guidelines" for more information about editing and building these docs.
+`;
+
+export const templateMetaContent = `---
+comments: |
+  This Markdown file is auto-generated. DO NOT EDIT THIS FILE DIRECTLY.
+${readMeContent}
 
 aliases:
   - ../../panels/reference-transformation-functions/
@@ -45,10 +53,11 @@ labels:
     - enterprise
     - oss
 title: Transform data
+description: Use transformations to rename fields, join series data, apply mathematical operations, and more
 weight: 100
----
+---`;
 
-# Transform data
+const templateIntroContent = `# Transform data
 
 Transformations are a powerful way to manipulate data returned by a query before the system applies a visualization. Using transformations, you can:
 
@@ -86,7 +95,7 @@ The following steps guide you in adding a transformation to data. This documenta
    For information about available calculations, refer to [Calculation types][].
 1. To apply another transformation, click **Add transformation**.
    This transformation acts on the result set returned by the previous transformation.
-   {{< figure src="/static/img/docs/transformations/transformations-7-0.png" class="docs-image--no-shadow" max-width= "1100px" >}}
+   {{< figure src="/static/img/docs/transformations/transformations-7-0.png" class="docs-image--no-shadow" max-width= "1100px" alt="Transform tab in the panel editor" >}}
 
 ## Debug a transformation
 
@@ -94,19 +103,21 @@ To see the input and the output result sets of the transformation, click the bug
 
 The input and output results sets can help you debug a transformation.
 
-{{< figure src="/static/img/docs/transformations/debug-transformations-7-0.png" class="docs-image--no-shadow" max-width= "1100px" >}}
+{{< figure src="/static/img/docs/transformations/debug-transformations-7-0.png" class="docs-image--no-shadow" max-width= "1100px" alt="The debug transformation screen with the debug icon highlighted" >}}
 
 ## Disable a transformation
 
 You can disable or hide one or more transformations by clicking on the eye icon on the top right side of the transformation row. This disables the applied actions of that specific transformation and can help to identify issues when you change several transformations one after another.
 
-{{< figure src="/static/img/docs/transformations/screenshot-example-disable-transformation.png" class="docs-image--no-shadow" max-width= "1100px" >}}
+{{< figure src="/static/img/docs/transformations/screenshot-example-disable-transformation.png" class="docs-image--no-shadow" max-width= "1100px" alt="A transformation row with the disable transformation icon highlighted" >}}
 
 ## Filter a transformation
 
 If your panel uses more than one query, you can filter these and apply the selected transformation to only one of the queries. To do this, click the filter icon on the top right of the transformation row. This opens a drop-down with a list of queries used on the panel. From here, you can select the query you want to transform.
 
-Note that the filter icon is always displayed if your panel has more than one query, but it may not work if previous transformations for merging the queries' outputs are applied. This is because one transformation takes the output of the previous one.
+You can also filter by annotations (which includes exemplars) to apply transformations to them. When you do so, the list of fields changes to reflect those in the annotation or exemplar tooltip.
+
+The filter icon is always displayed if your panel has more than one query or source of data (that is, panel or annotation data) but it may not work if previous transformations for merging the queries’ outputs are applied. This is because one transformation takes the output of the previous one.
 
 ## Delete a transformation
 
@@ -122,20 +133,22 @@ We recommend that you remove transformations that you don't need. When you delet
 1. Click the **Transform** tab.
 1. Click the trash icon next to the transformation you want to delete.
 
-{{< figure src="/static/img/docs/transformations/screenshot-example-remove-transformation.png" class="docs-image--no-shadow" max-width= "1100px" >}}
+{{< figure src="/static/img/docs/transformations/screenshot-example-remove-transformation.png" class="docs-image--no-shadow" max-width= "1100px" alt="A transformation row with the remove transformation icon highlighted" >}}
+`;
+
+export const completeTemplate = `${templateMetaContent}
 
+${templateIntroContent}
 ## Transformation functions
 
 You can perform the following transformations on your data.
-
 ${buildTransformationDocsContent(transformationDocsContent)}
-
 {{% docs/reference %}}
 [Table panel]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/table"
 [Table panel]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/table"
 
-[Calculation types]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/calculation-types"
-[Calculation types]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/calculation-types"
+[Calculation types]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/query-transform-data/calculation-types"
+[Calculation types]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data/calculation-types"
 
 [sparkline cell type]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/table#sparkline"
 [sparkline cell type]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/table#sparkline"
@@ -166,9 +179,8 @@ function buildTransformationDocsContent(transformationDocsContent: Transformatio
   const content = transformationsList
     .map((transformationName) => {
       return `
-  ### ${transformationDocsContent[transformationName].name}
-  ${transformationDocsContent[transformationName].getHelperDocs(ImageRenderType.ShortcodeFigure)}
-  `;
+### ${transformationDocsContent[transformationName].name}
+${transformationDocsContent[transformationName].getHelperDocs(ImageRenderType.ShortcodeFigure)}`;
     })
     // Remove the superfluous commas.
     .join('');
@@ -176,9 +188,20 @@ function buildTransformationDocsContent(transformationDocsContent: Transformatio
   return content;
 }
 
-/*
-  `process.stdout.write(template + '\n')` was not functioning as expected.
-  Neither the tsc nor ts-node compiler could identify the node `process` object.
-  Fortunately, `console.log` also writes to the standard output.
-*/
-console.log(template);
+export function buildMarkdownContent(): void {
+  // Build the path to the Markdown file.
+  const indexPath = resolve(__dirname, '../../' + WRITE_PATH);
+
+  // Write content to the Markdown file.
+  writeFileSync(indexPath, completeTemplate, 'utf-8');
+}
+
+export function getMarkdownContent(): string {
+  const rootDir = resolve(__dirname, '../../');
+  const pathToMarkdown = resolve(rootDir, WRITE_PATH);
+  return readFileSync(pathToMarkdown, 'utf-8');
+}
+
+export function getJavaScriptContent(): string {
+  return completeTemplate;
+}
diff --git a/scripts/drone/env-var-check.sh b/scripts/drone/env-var-check.sh
new file mode 100755
index 0000000000000..adfbe88f4ce5d
--- /dev/null
+++ b/scripts/drone/env-var-check.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# ensure DRONE_SERVER and DRONE_TOKEN env variables are set
+if [ -z "$DRONE_SERVER" ]; then
+    echo "DRONE_SERVER environment variable is not set."
+    exit 1
+fi
+
+if [ -z "$DRONE_TOKEN" ]; then
+    echo "DRONE_TOKEN environment variable is not set."
+    exit 1
+fi
\ No newline at end of file
diff --git a/scripts/drone/events/pr.star b/scripts/drone/events/pr.star
index d7b751511975f..d5a81aa78c819 100644
--- a/scripts/drone/events/pr.star
+++ b/scripts/drone/events/pr.star
@@ -96,6 +96,7 @@ def pr_pipelines():
         test_backend(
             get_pr_trigger(
                 include_paths = [
+                    "Makefile",
                     "pkg/**",
                     "packaging/**",
                     ".drone.yml",
@@ -103,6 +104,7 @@ def pr_pipelines():
                     "go.sum",
                     "go.mod",
                     "public/app/plugins/**/plugin.json",
+                    "docs/sources/setup-grafana/configure-grafana/feature-toggles/**",
                     "devenv/**",
                 ],
             ),
@@ -111,6 +113,8 @@ def pr_pipelines():
         lint_backend_pipeline(
             get_pr_trigger(
                 include_paths = [
+                    ".golangci.toml",
+                    "Makefile",
                     "pkg/**",
                     "packaging/**",
                     ".drone.yml",
@@ -142,7 +146,6 @@ def pr_pipelines():
         docs_pipelines(ver_mode, trigger_docs_pr()),
         shellcheck_pipeline(),
         swagger_gen(
-            get_pr_trigger(include_paths = ["pkg/**"]),
             ver_mode,
         ),
         integration_benchmarks(
diff --git a/scripts/drone/events/release.star b/scripts/drone/events/release.star
index 5e71f1eed045e..cdf8c9883c030 100644
--- a/scripts/drone/events/release.star
+++ b/scripts/drone/events/release.star
@@ -62,7 +62,7 @@ def retrieve_npm_packages_step():
 def release_npm_packages_step():
     return {
         "name": "release-npm-packages",
-        "image": images["go"],
+        "image": images["node"],
         "depends_on": [
             "compile-build-cmd",
             "retrieve-npm-packages",
diff --git a/scripts/drone/pipelines/build.star b/scripts/drone/pipelines/build.star
index ee60b7b51030e..395ae441ca745 100644
--- a/scripts/drone/pipelines/build.star
+++ b/scripts/drone/pipelines/build.star
@@ -13,6 +13,9 @@ load(
     "frontend_metrics_step",
     "grafana_server_step",
     "identify_runner_step",
+    "playwright_e2e_report_post_link",
+    "playwright_e2e_report_upload",
+    "playwright_e2e_tests_step",
     "publish_images_step",
     "release_canary_npm_packages_step",
     "store_storybook_step",
@@ -28,8 +31,8 @@ load(
 )
 load(
     "scripts/drone/steps/rgm.star",
+    "rgm_artifacts_step",
     "rgm_build_docker_step",
-    "rgm_package_step",
 )
 load(
     "scripts/drone/utils/images.star",
@@ -70,14 +73,22 @@ def build_e2e(trigger, ver_mode):
             [
                 build_frontend_package_step(),
                 enterprise_downstream_step(ver_mode = ver_mode),
-                rgm_package_step(distros = "linux/amd64,linux/arm64", file = "packages.txt"),
+                rgm_artifacts_step(artifacts = ["targz:grafana:linux/amd64", "targz:grafana:linux/arm64", "targz:grafana:linux/arm/v7"], file = "packages.txt"),
             ],
         )
     else:
         build_steps.extend([
             update_package_json_version(),
             build_frontend_package_step(depends_on = ["update-package-json-version"]),
-            rgm_package_step(depends_on = ["update-package-json-version"], distros = "linux/amd64,linux/arm64", file = "packages.txt"),
+            rgm_artifacts_step(
+                artifacts = [
+                    "targz:grafana:linux/amd64",
+                    "targz:grafana:linux/arm64",
+                    "targz:grafana:linux/arm/v7",
+                ],
+                depends_on = ["update-package-json-version"],
+                file = "packages.txt",
+            ),
         ])
 
     build_steps.extend(
@@ -92,6 +103,9 @@ def build_e2e(trigger, ver_mode):
                 cloud = "azure",
                 trigger = trigger_oss,
             ),
+            playwright_e2e_tests_step(),
+            playwright_e2e_report_upload(),
+            playwright_e2e_report_post_link(),
             e2e_tests_artifacts(),
             build_storybook_step(ver_mode = ver_mode),
             test_a11y_frontend_step(ver_mode = ver_mode),
@@ -104,9 +118,9 @@ def build_e2e(trigger, ver_mode):
                 store_storybook_step(trigger = trigger_oss, ver_mode = ver_mode),
                 frontend_metrics_step(trigger = trigger_oss),
                 rgm_build_docker_step(
-                    "packages.txt",
                     images["ubuntu"],
                     images["alpine"],
+                    depends_on = ["update-package-json-version"],
                     tag_format = "{{ .version_base }}-{{ .buildID }}-{{ .arch }}",
                     ubuntu_tag_format = "{{ .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}",
                 ),
@@ -135,7 +149,6 @@ def build_e2e(trigger, ver_mode):
         build_steps.extend(
             [
                 rgm_build_docker_step(
-                    "packages.txt",
                     images["ubuntu"],
                     images["alpine"],
                     tag_format = "{{ .version_base }}-{{ .buildID }}-{{ .arch }}",
diff --git a/scripts/drone/pipelines/ci_images.star b/scripts/drone/pipelines/ci_images.star
index e8180d6d0efc0..1304cdedebd3c 100644
--- a/scripts/drone/pipelines/ci_images.star
+++ b/scripts/drone/pipelines/ci_images.star
@@ -2,10 +2,6 @@
 This module contains steps and pipelines relating to creating CI Docker images.
 """
 
-load(
-    "scripts/drone/utils/images.star",
-    "images",
-)
 load(
     "scripts/drone/utils/utils.star",
     "pipeline",
@@ -17,7 +13,6 @@ load(
 load(
     "scripts/drone/vault.star",
     "from_secret",
-    "gcp_download_build_container_assets_key",
 )
 
 def publish_ci_windows_test_image_pipeline():
@@ -69,50 +64,3 @@ def publish_ci_windows_test_image_pipeline():
     }
 
     return [pl]
-
-def publish_ci_build_container_image_pipeline():
-    trigger = {
-        "event": ["promote"],
-        "target": ["ci-build-container-image"],
-    }
-    pl = pipeline(
-        name = "publish-ci-build-container-image",
-        trigger = trigger,
-        steps = [
-            {
-                "name": "validate-version",
-                "image": images["alpine"],
-                "commands": [
-                    "if [ -z \"${BUILD_CONTAINER_VERSION}\" ]; then echo Missing BUILD_CONTAINER_VERSION; false; fi",
-                ],
-            },
-            {
-                "name": "download-macos-sdk",
-                "image": images["cloudsdk"],
-                "environment": {
-                    "GCP_KEY": from_secret(gcp_download_build_container_assets_key),
-                },
-                "commands": [
-                    "printenv GCP_KEY > /tmp/key.json",
-                    "gcloud auth activate-service-account --key-file=/tmp/key.json",
-                    "gsutil cp gs://grafana-private-downloads/MacOSX10.15.sdk.tar.xz ./scripts/build/ci-build/MacOSX10.15.sdk.tar.xz",
-                ],
-            },
-            {
-                "name": "build-and-publish",  # Consider splitting the build and the upload task.
-                "image": images["cloudsdk"],
-                "volumes": [{"name": "docker", "path": "/var/run/docker.sock"}],
-                "environment": {
-                    "DOCKER_USERNAME": from_secret("docker_username"),
-                    "DOCKER_PASSWORD": from_secret("docker_password"),
-                },
-                "commands": [
-                    "printenv DOCKER_PASSWORD | docker login -u \"$DOCKER_USERNAME\" --password-stdin",
-                    "docker build -t \"grafana/build-container:${BUILD_CONTAINER_VERSION}\" ./scripts/build/ci-build",
-                    "docker push \"grafana/build-container:${BUILD_CONTAINER_VERSION}\"",
-                ],
-            },
-        ],
-    )
-
-    return [pl]
diff --git a/scripts/drone/pipelines/swagger_gen.star b/scripts/drone/pipelines/swagger_gen.star
index ef82ce15474e1..41018250cd234 100644
--- a/scripts/drone/pipelines/swagger_gen.star
+++ b/scripts/drone/pipelines/swagger_gen.star
@@ -4,7 +4,7 @@ This module returns all pipelines used in OpenAPI specification generation of Gr
 
 load(
     "scripts/drone/steps/lib.star",
-    "clone_enterprise_step_pr",
+    "enterprise_setup_step",
 )
 load(
     "scripts/drone/utils/images.star",
@@ -33,22 +33,24 @@ def swagger_gen_step(ver_mode):
             "apk add --update git make",
             "make swagger-clean && make openapi3-gen",
             "for f in public/api-merged.json public/openapi3.json; do git add $f; done",
-            'if [ -z "$(git diff --name-only --cached)" ]; then echo "Everything seems up to date!"; else echo "Please ensure the branch is up-to-date, then regenerate the specification by running make swagger-clean && make openapi3-gen" && return 1; fi',
+            'if [ -z "$(git diff --name-only --cached)" ]; then echo "Everything seems up to date!"; else git diff --cached && echo "Please ensure the branch is up-to-date, then regenerate the specification by running make swagger-clean && make openapi3-gen" && return 1; fi',
         ],
         "depends_on": [
             "clone-enterprise",
         ],
     }
 
-def swagger_gen(trigger, ver_mode, source = "${DRONE_SOURCE_BRANCH}"):
+def swagger_gen(ver_mode, source = "${DRONE_SOURCE_BRANCH}"):
     test_steps = [
-        clone_enterprise_step_pr(source = source, canFail = True),
+        enterprise_setup_step(source = source, canFail = True),
         swagger_gen_step(ver_mode = ver_mode),
     ]
 
     p = pipeline(
         name = "{}-swagger-gen".format(ver_mode),
-        trigger = trigger,
+        trigger = {
+            "event": ["pull_request"],
+        },
         services = [],
         steps = test_steps,
     )
diff --git a/scripts/drone/pipelines/trigger_downstream.star b/scripts/drone/pipelines/trigger_downstream.star
index fdff59792ed61..9004bf6e712b6 100644
--- a/scripts/drone/pipelines/trigger_downstream.star
+++ b/scripts/drone/pipelines/trigger_downstream.star
@@ -24,7 +24,7 @@ trigger = {
         ],
     },
     "repo": [
-        "grafana/grafana-security-mirror",
+        "grafana/grafana",
     ],
 }
 
diff --git a/scripts/drone/rgm.star b/scripts/drone/rgm.star
index 411d4a4c969c6..ab852f3f2739a 100644
--- a/scripts/drone/rgm.star
+++ b/scripts/drone/rgm.star
@@ -137,6 +137,8 @@ def rgm_run(name, script):
     """
     env = {
         "GO_VERSION": golang_version,
+        "ALPINE_BASE": images["alpine"],
+        "UBUNTU_BASE": images["ubuntu"],
     }
     rgm_run_step = {
         "name": name,
@@ -164,7 +166,7 @@ def rgm_copy(src, dst):
       dst: destination of the files.
 
     Returns:
-      Drone steps.
+      Drone step.
     """
     commands = [
         "printenv GCP_KEY_BASE64 | base64 -d > /tmp/key.json",
@@ -172,20 +174,13 @@ def rgm_copy(src, dst):
         "gcloud storage cp -r {} {}".format(src, dst),
     ]
 
-    if not dst.startswith("gs://"):
-        commands.insert(0, "mkdir -p {}".format(dst))
-
-    rgm_copy_step = {
+    return {
         "name": "rgm-copy",
         "image": "google/cloud-sdk:alpine",
         "commands": commands,
         "environment": rgm_env_secrets({}),
     }
 
-    return [
-        rgm_copy_step,
-    ]
-
 def rgm_publish_packages(bucket = "grafana-packages"):
     """Publish deb and rpm packages.
 
@@ -256,10 +251,18 @@ def rgm_version_branch():
     )
 
 def rgm_nightly_build():
+    """Nightly build pipeline.
+
+    Returns:
+      Drone pipeline.
+    """
     src = "$${DRONE_WORKSPACE}/dist/*"
     dst = "$${DESTINATION}/$${DRONE_BUILD_EVENT}"
+    copy_step = rgm_copy(src, dst)
+    if not dst.startswith("gs://"):
+        copy_step["commands"].insert(0, "mkdir -p {}".format(dst))
 
-    copy_steps = with_deps(rgm_copy(src, dst), ["rgm-build"])
+    copy_steps = with_deps([copy_step], ["rgm-build"])
 
     return pipeline(
         name = "rgm-nightly-build",
@@ -279,11 +282,13 @@ def rgm_nightly_publish():
 
     publish_steps = with_deps(rgm_run("rgm-publish", "drone_publish_nightly_grafana.sh"), ["rgm-copy"])
     package_steps = with_deps(rgm_publish_packages(), ["rgm-publish"])
-
+    copy_step = rgm_copy(src, dst)
+    if not dst.startswith("gs://"):
+        copy_step["commands"].insert(0, "mkdir -p {}".format(dst))
     return pipeline(
         name = "rgm-nightly-publish",
         trigger = nightly_trigger,
-        steps = rgm_copy(src, dst) + publish_steps + package_steps,
+        steps = [copy_step] + publish_steps + package_steps,
         depends_on = ["rgm-nightly-build"],
     )
 
@@ -331,10 +336,68 @@ def rgm_main_pipeline():
         rgm_main(),
     ]
 
+def rgm_promotion_pipeline():
+    """Promotion build pipeline.
+
+    Returns:
+      Drone pipeline.
+    """
+    promotion_trigger = {
+        "event": ["promote"],
+        "target": "upload-packages",
+    }
+
+    env = {
+        "GO_VERSION": golang_version,
+        "ALPINE_BASE": images["alpine"],
+        "UBUNTU_BASE": images["ubuntu"],
+    }
+
+    # Expected promotion args:
+    # * GRAFANA_REF = commit hash, branch name, or tag name
+    # * ENTERPRISE_REF = commit hash, branch name, or tag name. If not building an enterprise artifact, then this can be
+    #   left empty.
+    # * ARTIFACTS = comma delimited list of artifacts (ex: "targz:grafana:linux/amd64,rpm:grafana:linux/amd64")
+    # * VERSION = version string of Grafana that is being built (ex: v10.0.0)
+    # * UPLOAD_TO = Google Cloud Storage URL to upload the built artifacts to. (ex: gs://some-bucket/path)
+    build_step = {
+        "name": "rgm-build",
+        "image": "grafana/grafana-build:main",
+        "pull": "always",
+        "commands": [
+            "dagger run --silent /src/grafana-build artifacts " +
+            "-a $${ARTIFACTS} " +
+            "--grafana-ref=$${GRAFANA_REF} " +
+            "--enterprise-ref=$${ENTERPRISE_REF} " +
+            "--grafana-repo=$${GRAFANA_REPO} " +
+            "--version=$${VERSION} ",
+        ],
+        "environment": rgm_env_secrets(env),
+        # The docker socket is a requirement for running dagger programs
+        # In the future we should find a way to use dagger without mounting the docker socket.
+        "volumes": [{"name": "docker", "path": "/var/run/docker.sock"}],
+    }
+
+    publish_step = rgm_copy("dist/*", "$${UPLOAD_TO}")
+
+    steps = [
+        build_step,
+        publish_step,
+    ]
+
+    return [
+        pipeline(
+            name = "rgm-promotion",
+            trigger = promotion_trigger,
+            steps = steps,
+        ),
+    ]
+
 def rgm():
     return (
         rgm_main_pipeline() +
         rgm_tag_pipeline() +
         rgm_version_branch_pipeline() +
-        rgm_nightly_pipeline()
+        rgm_nightly_pipeline() +
+        rgm_promotion_pipeline()
     )
diff --git a/scripts/drone/services/services.star b/scripts/drone/services/services.star
index 911aacfb000c3..6d3044e932a68 100644
--- a/scripts/drone/services/services.star
+++ b/scripts/drone/services/services.star
@@ -57,7 +57,7 @@ def integration_test_services():
             "name": "mimir_backend",
             "image": images["mimir"],
             "environment": {},
-            "commands": ["/bin/mimir -target=backend"],
+            "commands": ["/bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled"],
         },
         {
             "name": "redis",
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index c723d84dd6148..fa2d1180aa42c 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -35,7 +35,9 @@ def yarn_install_step():
         "name": "yarn-install",
         "image": images["node"],
         "commands": [
-            "yarn install --immutable",
+            # Python is needed to build `esfx`, which is needed by `msagl`
+            "apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python",
+            "yarn install --immutable || yarn install --immutable",
         ],
         "depends_on": [],
     }
@@ -342,6 +344,8 @@ def e2e_tests_artifacts():
             "GITHUB_TOKEN": from_secret("github_token"),
         },
         "commands": [
+            # if no videos found do nothing
+            "if [ -z `find ./e2e -type f -name *spec.ts.mp4` ]; then echo 'missing videos'; false; fi",
             "apt-get update",
             "apt-get install -yq zip",
             "printenv GCP_GRAFANA_UPLOAD_ARTIFACTS_KEY > /tmp/gcpkey_upload_artifacts.json",
@@ -356,6 +360,65 @@ def e2e_tests_artifacts():
         ],
     }
 
+def playwright_e2e_report_upload():
+    return {
+        "name": "playwright-e2e-report-upload",
+        "image": images["cloudsdk"],
+        "depends_on": [
+            "playwright-plugin-e2e",
+        ],
+        "failure": "ignore",
+        "when": {
+            "status": [
+                "success",
+                "failure",
+            ],
+        },
+        "environment": {
+            "GCP_GRAFANA_UPLOAD_ARTIFACTS_KEY": from_secret(gcp_upload_artifacts_key),
+        },
+        "commands": [
+            "apt-get update",
+            "apt-get install -yq zip",
+            "printenv GCP_GRAFANA_UPLOAD_ARTIFACTS_KEY > /tmp/gcpkey_upload_artifacts.json",
+            "gcloud auth activate-service-account --key-file=/tmp/gcpkey_upload_artifacts.json",
+            "gsutil cp -r ./playwright-report/. gs://releng-pipeline-artifacts-dev/${DRONE_BUILD_NUMBER}/playwright-report",
+            "export E2E_PLAYWRIGHT_REPORT_URL=https://storage.googleapis.com/releng-pipeline-artifacts-dev/${DRONE_BUILD_NUMBER}/playwright-report/index.html",
+            'echo "E2E Playwright report uploaded to: \n $${E2E_PLAYWRIGHT_REPORT_URL}"',
+        ],
+    }
+
+def playwright_e2e_report_post_link():
+    return {
+        "name": "playwright-e2e-report-post-link",
+        "image": images["curl"],
+        "depends_on": [
+            "playwright-e2e-report-upload",
+        ],
+        "failure": "ignore",
+        "when": {
+            "status": [
+                "success",
+                "failure",
+            ],
+        },
+        "environment": {
+            "GITHUB_TOKEN": from_secret("github_token"),
+        },
+        "commands": [
+            # if the trace doesn't folder exists, it means that there are no failed tests.
+            "if [ ! -d ./playwright-report/trace ]; then echo 'all tests passed'; exit 0; fi",
+            # if it exists, we will post a comment on the PR with the link to the report
+            "export E2E_PLAYWRIGHT_REPORT_URL=https://storage.googleapis.com/releng-pipeline-artifacts-dev/${DRONE_BUILD_NUMBER}/playwright-report/index.html",
+            "curl -L " +
+            "-X POST https://api.github.com/repos/grafana/grafana/issues/${DRONE_PULL_REQUEST}/comments " +
+            '-H "Accept: application/vnd.github+json" ' +
+            '-H "Authorization: Bearer $${GITHUB_TOKEN}" ' +
+            '-H "X-GitHub-Api-Version: 2022-11-28" -d ' +
+            '"{\\"body\\":\\"❌ Failed to run Playwright plugin e2e tests. <br /> <br /> Click [here]($${E2E_PLAYWRIGHT_REPORT_URL}) to browse the Playwright report and trace viewer. <br /> For information on how to run Playwright tests locally, refer to the [Developer guide](https://github.com/grafana/grafana/blob/main/contribute/developer-guide.md#to-run-the-playwright-tests). \\"}"',
+        ],
+    }
+
 def upload_cdn_step(ver_mode, trigger = None):
     """Uploads CDN assets using the Grafana build tool.
 
@@ -434,7 +497,7 @@ def update_package_json_version():
         ],
         "commands": [
             "apk add --update jq",
-            "new_version=$(cat package.json | jq .version | sed s/pre/${DRONE_BUILD_NUMBER}/g)",
+            "new_version=$(cat package.json | jq -r .version | sed s/pre/${DRONE_BUILD_NUMBER}/g)",
             "echo \"New version: $new_version\"",
             "yarn run lerna version $new_version --exact --no-git-tag-version --no-push --force-publish -y",
             "yarn install --mode=update-lockfile",
@@ -502,7 +565,7 @@ def test_backend_step():
             # shared-mime-info and shared-mime-info-lang is used for exactly 1 test for the
             # mime.TypeByExtension function.
             "apk add --update build-base shared-mime-info shared-mime-info-lang",
-            "go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...",
+            "go list -f '{{.Dir}}/...' -m | xargs go test -tags requires_buildifer -short -covermode=atomic -timeout=5m",
         ],
     }
 
@@ -585,6 +648,7 @@ def verify_i18n_step():
         "depends_on": [
             "yarn-install",
         ],
+        "failure": "ignore",
         "commands": [
             "apk add --update git",
             "yarn run i18n:extract || (echo \"{}\" && false)".format(extract_error_message),
@@ -597,7 +661,6 @@ def verify_i18n_step():
                 exit 1
             fi
             '''.format(uncommited_error_message),
-            "yarn run i18n:compile",
         ],
     }
 
@@ -614,7 +677,8 @@ def test_a11y_frontend_step(ver_mode, port = 3001):
       Drone step.
     """
     commands = [
-        "yarn wait-on http://$HOST:$PORT",
+        # Note - this runs in a container running node 14, which does not support the -y option to npx
+        "npx wait-on@7.0.1 http://$HOST:$PORT",
     ]
     failure = "ignore"
     if ver_mode == "pr":
@@ -682,7 +746,7 @@ def codespell_step():
         "image": images["python"],
         "commands": [
             "pip3 install codespell",
-            "codespell -I .codespellignore docs/",
+            "codespell -I docs/.codespellignore docs/",
         ],
     }
 
@@ -781,11 +845,30 @@ def cloud_plugins_e2e_tests_step(suite, cloud, trigger = None):
     step = dict(step, when = when)
     return step
 
+def playwright_e2e_tests_step():
+    return {
+        "environment": {
+            "PORT": "3001",
+            "HOST": "grafana-server",
+            "PROV_DIR": "/grafana/scripts/grafana-server/tmp/conf/provisioning",
+        },
+        "name": "playwright-plugin-e2e",
+        "image": images["playwright"],
+        "depends_on": [
+            "grafana-server",
+        ],
+        "commands": [
+            "sleep 10s",  # it seems sometimes that grafana-server is not actually ready when the step starts, so waiting for a few seconds before running the tests
+            "yarn e2e:playwright",
+        ],
+    }
+
 def build_docs_website_step():
     return {
         "name": "build-docs-website",
         # Use latest revision here, since we want to catch if it breaks
         "image": images["docs"],
+        "pull": "always",
         "commands": [
             "mkdir -p /hugo/content/docs/grafana/latest",
             "echo -e '---\\nredirectURL: /docs/grafana/latest/\\ntype: redirect\\nversioned: true\\n---\\n' > /hugo/content/docs/grafana/_index.md",
@@ -952,7 +1035,7 @@ def mysql_integration_tests_steps(hostname, version):
 def redis_integration_tests_steps():
     cmds = [
         "go clean -testcache",
-        "go test -run IntegrationRedis -covermode=atomic -timeout=2m ./pkg/...",
+        "go list -f '{{.Dir}}/...' -m | xargs go test -run IntegrationRedis -covermode=atomic -timeout=2m",
     ]
 
     environment = {
@@ -964,12 +1047,11 @@ def redis_integration_tests_steps():
 def remote_alertmanager_integration_tests_steps():
     cmds = [
         "go clean -testcache",
-        "go test -run TestIntegrationRemoteAlertmanager -covermode=atomic -timeout=2m ./pkg/services/ngalert/notifier/...",
+        "go test -run TestIntegrationRemoteAlertmanager -covermode=atomic -timeout=2m ./pkg/services/ngalert/...",
     ]
 
     environment = {
         "AM_TENANT_ID": "test",
-        "AM_PASSWORD": "test",
         "AM_URL": "http://mimir_backend:8080",
     }
 
@@ -978,7 +1060,7 @@ def remote_alertmanager_integration_tests_steps():
 def memcached_integration_tests_steps():
     cmds = [
         "go clean -testcache",
-        "go test -run IntegrationMemcached -covermode=atomic -timeout=2m ./pkg/...",
+        "go list -f '{{.Dir}}/...' -m | xargs go test -run IntegrationMemcached -covermode=atomic -timeout=2m",
     ]
 
     environment = {
diff --git a/scripts/drone/steps/rgm.star b/scripts/drone/steps/rgm.star
index 6d86ac48b3440..7890bc3955ee7 100644
--- a/scripts/drone/steps/rgm.star
+++ b/scripts/drone/steps/rgm.star
@@ -7,16 +7,34 @@ load(
     "scripts/drone/variables.star",
     "golang_version",
 )
+load(
+    "scripts/drone/vault.star",
+    "from_secret",
+    "rgm_dagger_token",
+)
+
+def artifacts_cmd(artifacts = []):
+    cmd = "/src/grafana-build artifacts "
+
+    for artifact in artifacts:
+        cmd += "-a {} ".format(artifact)
+
+    return cmd
+
+# rgm_artifacts_step will create artifacts using the '/src/build artifacts' command.
+def rgm_artifacts_step(name = "rgm-package", artifacts = ["targz:grafana:linux/amd64", "targz:grafana:linux/arm64"], file = "packages.txt", depends_on = ["yarn-install"]):
+    cmd = artifacts_cmd(artifacts = artifacts)
 
-# rgm_package_step will create a tar.gz for use in e2e tests or other PR testing related activities..
-def rgm_package_step(distros = "linux/amd64,linux/arm64", file = "packages.txt", depends_on = ["yarn-install"]):
     return {
-        "name": "rgm-package",
+        "name": name,
         "image": "grafana/grafana-build:main",
         "pull": "always",
         "depends_on": depends_on,
+        "environment": {
+            "_EXPERIMENTAL_DAGGER_CLOUD_TOKEN": from_secret(rgm_dagger_token),
+        },
         "commands": [
-            "/src/grafana-build package --distro={} ".format(distros) +
+            cmd +
             "--go-version={} ".format(golang_version) +
             "--yarn-cache=$$YARN_CACHE_FOLDER " +
             "--build-id=$$DRONE_BUILD_NUMBER " +
@@ -28,31 +46,33 @@ def rgm_package_step(distros = "linux/amd64,linux/arm64", file = "packages.txt",
 # rgm_build_backend will create compile the grafana backend for various platforms. It's preferred to use
 # 'rgm_package_step' if you creating a "usable" artifact. This should really only be used to verify that the code is
 # compilable.
-def rgm_build_backend_step(distros = "linux/amd64,linux/arm64"):
-    return {
-        "name": "rgm-package",
-        "image": "grafana/grafana-build:main",
-        "pull": "always",
-        "commands": [
-            "/src/grafana-build build " +
-            "--go-version={} ".format(golang_version) +
-            "--distro={} --grafana-dir=$$PWD".format(distros),
-        ],
-        "volumes": [{"name": "docker", "path": "/var/run/docker.sock"}],
-    }
+def rgm_build_backend_step(artifacts = ["backend:grafana:linux/amd64", "backend:grafana:linux/arm64"]):
+    return rgm_artifacts_step(name = "rgm-build-backend", artifacts = artifacts, depends_on = [])
 
-def rgm_build_docker_step(packages, ubuntu, alpine, depends_on = ["rgm-package"], file = "docker.txt", tag_format = "{{ .version }}-{{ .arch }}", ubuntu_tag_format = "{{ .version }}-ubuntu-{{ .arch }}"):
+def rgm_build_docker_step(ubuntu, alpine, depends_on = ["yarn-install"], file = "docker.txt", tag_format = "{{ .version }}-{{ .arch }}", ubuntu_tag_format = "{{ .version }}-ubuntu-{{ .arch }}"):
     return {
         "name": "rgm-build-docker",
         "image": "grafana/grafana-build:main",
         "pull": "always",
+        "environment": {
+            "_EXPERIMENTAL_DAGGER_CLOUD_TOKEN": from_secret(rgm_dagger_token),
+        },
         "commands": [
             "docker run --privileged --rm tonistiigi/binfmt --install all",
-            "/src/grafana-build docker " +
-            "$(cat {} | grep tar.gz | grep -v docker | grep -v sha256 | awk '{{print \"--package=\" $0}}') ".format(packages) +
+            "/src/grafana-build artifacts " +
+            "-a docker:grafana:linux/amd64 " +
+            "-a docker:grafana:linux/amd64:ubuntu " +
+            "-a docker:grafana:linux/arm64 " +
+            "-a docker:grafana:linux/arm64:ubuntu " +
+            "-a docker:grafana:linux/arm/v7 " +
+            "-a docker:grafana:linux/arm/v7:ubuntu " +
+            "--yarn-cache=$$YARN_CACHE_FOLDER " +
+            "--build-id=$$DRONE_BUILD_NUMBER " +
+            "--go-version={} ".format(golang_version) +
             "--ubuntu-base={} ".format(ubuntu) +
             "--alpine-base={} ".format(alpine) +
             "--tag-format='{}' ".format(tag_format) +
+            "--grafana-dir=$$PWD " +
             "--ubuntu-tag-format='{}' > {}".format(ubuntu_tag_format, file),
             "find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i",
         ],
diff --git a/scripts/drone/utils/images.star b/scripts/drone/utils/images.star
index fad25eb52da4c..dcdca5a23ee9c 100644
--- a/scripts/drone/utils/images.star
+++ b/scripts/drone/utils/images.star
@@ -14,13 +14,13 @@ images = {
     "node": "node:{}-alpine".format(nodejs_version),
     "cloudsdk": "google/cloud-sdk:431.0.0",
     "publish": "grafana/grafana-ci-deploy:1.3.3",
-    "alpine": "alpine:3.18.3",
+    "alpine": "alpine:3.19.1",
     "ubuntu": "ubuntu:22.04",
     "curl": "byrnedo/alpine-curl:0.1.8",
     "plugins_slack": "plugins/slack",
     "python": "python:3.8",
     "postgres_alpine": "postgres:12.3-alpine",
-    "mimir": "grafana/mimir:latest",
+    "mimir": "us.gcr.io/kubernetes-dev/mimir:santihernandezc-remove_id_from_grafana_config-d3826b4f8-WIP",
     "mysql5": "mysql:5.7.39",
     "mysql8": "mysql:8.0.32",
     "redis_alpine": "redis:6.2.11-alpine",
@@ -29,8 +29,9 @@ images = {
     "openldap": "osixia/openldap:1.4.0",
     "drone_downstream": "grafana/drone-downstream",
     "docker_puppeteer": "grafana/docker-puppeteer:1.1.0",
-    "docs": "grafana/docs-base:dbd975af06",
+    "docs": "grafana/docs-base:latest",
     "cypress": "cypress/included:13.1.0",
     "dockerize": "jwilder/dockerize:0.6.1",
     "shellcheck": "koalaman/shellcheck:stable",
+    "playwright": "mcr.microsoft.com/playwright:v1.42.1-jammy",
 }
diff --git a/scripts/drone/utils/utils.star b/scripts/drone/utils/utils.star
index aea832018cf70..4cc7aac6e499e 100644
--- a/scripts/drone/utils/utils.star
+++ b/scripts/drone/utils/utils.star
@@ -6,7 +6,11 @@ load(
     "scripts/drone/steps/lib.star",
     "slack_step",
 )
-load("scripts/drone/vault.star", "pull_secret")
+load(
+    "scripts/drone/vault.star",
+    "gar_pull_secret",
+    "gcr_pull_secret",
+)
 
 failure_template = "Build {{build.number}} failed for commit: <https://github.com/{{repo.owner}}/{{repo.name}}/commit/{{build.commit}}|{{ truncate build.commit 8 }}>: {{build.link}}\nBranch: <https://github.com/{{ repo.owner }}/{{ repo.name }}/commits/{{ build.branch }}|{{ build.branch }}>\nAuthor: {{build.author}}"
 
@@ -83,7 +87,7 @@ def pipeline(
             },
         ],
         "depends_on": depends_on,
-        "image_pull_secrets": [pull_secret],
+        "image_pull_secrets": [gcr_pull_secret, gar_pull_secret],
     }
     if environment:
         pipeline.update(
diff --git a/scripts/drone/variables.star b/scripts/drone/variables.star
index 6686f201ece62..a08f7126a1ea1 100644
--- a/scripts/drone/variables.star
+++ b/scripts/drone/variables.star
@@ -2,8 +2,8 @@
 global variables
 """
 
-grabpl_version = "v3.0.42"
-golang_version = "1.20.10"
+grabpl_version = "v3.0.50"
+golang_version = "1.21.10"
 
 # nodejs_version should match what's in ".nvmrc", but without the v prefix.
 nodejs_version = "20.9.0"
diff --git a/scripts/drone/vault.star b/scripts/drone/vault.star
index 6a27cf517859e..7c90b89ca5dca 100644
--- a/scripts/drone/vault.star
+++ b/scripts/drone/vault.star
@@ -1,7 +1,8 @@
 """
 This module returns functions for generating Drone secrets fetched from Vault.
 """
-pull_secret = "dockerconfigjson"
+gcr_pull_secret = "gcr"
+gar_pull_secret = "gar"
 drone_token = "drone_token"
 prerelease_bucket = "prerelease_bucket"
 gcp_upload_artifacts_key = "gcp_upload_artifacts_key"
@@ -43,7 +44,8 @@ def secrets():
         vault_secret(gcp_grafanauploads, "infra/data/ci/grafana-release-eng/grafanauploads", "credentials.json"),
         vault_secret(gcp_grafanauploads_base64, "infra/data/ci/grafana-release-eng/grafanauploads", "credentials_base64"),
         vault_secret("grafana_api_key", "infra/data/ci/grafana-release-eng/grafanacom", "api_key"),
-        vault_secret(pull_secret, "secret/data/common/gcr", ".dockerconfigjson"),
+        vault_secret(gcr_pull_secret, "secret/data/common/gcr", ".dockerconfigjson"),
+        vault_secret(gar_pull_secret, "secret/data/common/gar", ".dockerconfigjson"),
         vault_secret("github_token", "infra/data/ci/github/grafanabot", "pat"),
         vault_secret(drone_token, "infra/data/ci/drone", "machine-user-token"),
         vault_secret(prerelease_bucket, "infra/data/ci/grafana/prerelease", "bucket"),
diff --git a/scripts/grafana-server/start-server b/scripts/grafana-server/start-server
index 2c804314dad7d..75259985cc161 100755
--- a/scripts/grafana-server/start-server
+++ b/scripts/grafana-server/start-server
@@ -30,6 +30,7 @@ mkdir $RUNDIR/conf
 mkdir $PROV_DIR
 mkdir $PROV_DIR/datasources
 mkdir $PROV_DIR/dashboards
+mkdir $PROV_DIR/alerting
 
 cp ./scripts/grafana-server/custom.ini $RUNDIR/conf/custom.ini
 cp ./conf/defaults.ini $RUNDIR/conf/defaults.ini
@@ -49,6 +50,7 @@ echo -e "Copy provisioning setup from devenv"
 
 cp devenv/datasources.yaml $PROV_DIR/datasources
 cp devenv/dashboards.yaml $PROV_DIR/dashboards
+cp devenv/alert_rules.yaml $PROV_DIR/alerting
 
 cp -r devenv $RUNDIR
 
diff --git a/scripts/levitate-parse-json-report.js b/scripts/levitate-parse-json-report.js
new file mode 100644
index 0000000000000..fd82fb342805e
--- /dev/null
+++ b/scripts/levitate-parse-json-report.js
@@ -0,0 +1,31 @@
+const fs = require('fs');
+
+const data = JSON.parse(fs.readFileSync('data.json', 'utf8'));
+
+function stripAnsi(str) {
+  return str.replace(/\x1b\[[0-9;]*m/g, '');
+}
+
+const printSection = (title, items) => {
+  let output = `<h4>${title}</h4>`;
+  items.forEach((item) => {
+    const language = item.declaration ? 'typescript' : 'diff';
+    const code = item.declaration ? item.declaration : stripAnsi(item.diff);
+
+    output += `<b>${item.name}</b><br>\n`;
+    output += `<sub>${item.location}</sub><br>\n`;
+    output += `<pre lang="${language}">\n${code}\n</pre><br>\n`;
+  });
+  return output;
+};
+
+let markdown = '';
+
+if (data.removals.length > 0) {
+  markdown += printSection('Removals', data.removals);
+}
+if (data.changes.length > 0) {
+  markdown += printSection('Changes', data.changes);
+}
+
+console.log(markdown);
diff --git a/scripts/list-release-artifacts.sh b/scripts/list-release-artifacts.sh
index 0deee90c935b5..059bfed2f224f 100755
--- a/scripts/list-release-artifacts.sh
+++ b/scripts/list-release-artifacts.sh
@@ -12,8 +12,6 @@ ERSION_DEB="${ERSION//-/\~}"
 ASSETS=$(cat << EOF
 gs://${BUCKET}/artifacts/downloads/${VERSION}/oss/release/grafana-${ERSION_DEB}-1.aarch64.rpm
 gs://${BUCKET}/artifacts/downloads/${VERSION}/oss/release/grafana-${ERSION_DEB}-1.aarch64.rpm.sha256
-gs://${BUCKET}/artifacts/downloads/${VERSION}/oss/release/grafana-${ERSION_DEB}-1.armhfp.rpm
-gs://${BUCKET}/artifacts/downloads/${VERSION}/oss/release/grafana-${ERSION_DEB}-1.armhfp.rpm.sha256
 gs://${BUCKET}/artifacts/downloads/${VERSION}/oss/release/grafana-${ERSION_DEB}-1.x86_64.rpm
 gs://${BUCKET}/artifacts/downloads/${VERSION}/oss/release/grafana-${ERSION_DEB}-1.x86_64.rpm.sha256
 gs://${BUCKET}/artifacts/downloads/${VERSION}/oss/release/grafana-${ERSION}.darwin-amd64.tar.gz
diff --git a/scripts/modowners/README.md b/scripts/modowners/README.md
index f93e841ac8294..06640dab31c1b 100644
--- a/scripts/modowners/README.md
+++ b/scripts/modowners/README.md
@@ -35,7 +35,7 @@ Example CLI command to get a list of all owners with a count of the number of de
 Example output:
 
 ```
-@grafana/grafana-delivery 5
+@grafana/grafana-release-guild 5
 @grafana/grafana-bi-squad 2
 @grafana/grafana-app-platform-squad 13
 @grafana/observability-metrics 4
@@ -47,7 +47,7 @@ Example output:
 @grafana/dataviz-squad 1
 @grafana/backend-platform 75
 @grafana/grafana-as-code 11
-@grafana/grafana-authnz-team 6
+@grafana/identity-access-team 6
 @grafana/partner-datasources 4
 ```
 
@@ -67,7 +67,7 @@ List all dependencies of given owner(s).
 
 Example CLI command to list all direct dependencies owned by Delivery and Authnz:
 
-`go run scripts/modowners/modowners.go modules -o @grafana/grafana-delivery,@grafana/grafana-authnz-team go.mod`
+`go run scripts/modowners/modowners.go modules -o @grafana/grafana-release-guild,@grafana/identity-access-team go.mod`
 
 Example output:
 
@@ -79,7 +79,6 @@ golang.org/x/oauth2@v0.8.0
 github.com/drone/drone-cli@v1.6.1
 github.com/google/go-github/v45@v45.2.0
 github.com/Masterminds/semver/v3@v3.1.1
-github.com/ory/fosite@v0.44.1-0.20230317114349-45a6785cc54f
 gopkg.in/square/go-jose.v2@v2.6.0
 filippo.io/age@v1.1.1
 github.com/docker/docker@v23.0.4+incompatible
diff --git a/scripts/modowners/modowners.go b/scripts/modowners/modowners.go
index 9650e53243269..c2597f90ef093 100755
--- a/scripts/modowners/modowners.go
+++ b/scripts/modowners/modowners.go
@@ -129,7 +129,7 @@ func owners(fileSystem fs.FS, logger *log.Logger, args []string) error {
 }
 
 // Print dependencies for a given owner. Can specify one or more owners.
-// An example CLI command to list all direct dependencies owned by Delivery and Authnz `go run scripts/modowners/modowners.go modules -o @grafana/grafana-delivery,@grafana/grafana-authnz-team go.mod`
+// An example CLI command to list all direct dependencies owned by Delivery and Authnz `go run scripts/modowners/modowners.go modules -o @grafana/grafana-release-guild,@grafana/identity-access-team go.mod`
 func modules(fileSystem fs.FS, logger *log.Logger, args []string) error {
 	fs := flag.NewFlagSet("modules", flag.ExitOnError)
 	indirect := fs.Bool("i", false, "print indirect dependencies")
diff --git a/scripts/tests/generate-transformations.test.ts b/scripts/tests/generate-transformations.test.ts
new file mode 100644
index 0000000000000..1f50222ebdad7
--- /dev/null
+++ b/scripts/tests/generate-transformations.test.ts
@@ -0,0 +1,59 @@
+import { getMarkdownContent, getJavaScriptContent } from '../docs/generate-transformations.ts';
+
+describe('makefile script tests', () => {
+  // If these tests fail, refer to `./docs/README.md` "Content guidelines" for more information
+  // about editing and building the Transformations docs.
+
+  // This test isn't playing well, it passes locally, but continues to fail in Drone.
+  // TODO: Investigate why this test is failing in Drone ONLY.
+  it.skip('should execute without error and match the content written to index.md', () => {
+    // Normalize and compare.
+    expect(contentDoesMatch(getJavaScriptContent(), getMarkdownContent())).toBe(true);
+  });
+
+  it('should be able to tell if the content DOES NOT match', () => {
+    const wrongContent = getJavaScriptContent().concat('additional content to mismatch');
+    // Normalize and compare.
+    expect(contentDoesMatch(wrongContent, getMarkdownContent())).toBe(false);
+  });
+});
+
+export function contentDoesMatch(jsContent: string, mdContent: string): Boolean {
+  return normalizeContent(jsContent) === normalizeContent(mdContent);
+}
+
+/*
+  Normalize content by removing all whitespace (spaces, tabs, newlines, carriage returns,
+  form feeds, and vertical tabs) and special characters.
+
+  NOTE: There are numerous unpredictable formatting oddities when transforming JavaScript to Markdown;
+  almost all of them are irrelevant to the actual content of the file, which is why we strip them out here.
+
+  For example:
+
+  In JavaScript, the following string table
+
+  | A | B | C |
+  | - | - | - |
+  | 1 | 3 | 5 |
+  | 2 | 4 | 6 |
+  | 3 | 5 | 7 |
+  | 4 | 6 | 8 |
+  | 5 | 7 | 9 |
+
+  parses to Markdown as
+
+  | A   | B   | C   |
+  | --- | --- | --- | <--------- notice the extra hyphens
+  | 1   | 3   | 5   | <--------- notice the extra spaces
+  | 2   | 4   | 6   |
+  | 3   | 5   | 7   |
+  | 4   | 6   | 8   |
+  | 5   | 7   | 9   |
+
+  This is one of many arbitrary formatting anomalies that we can ignore by normalizing the
+  content before comparing the JavaScript template literals and the final Markdown.
+*/
+function normalizeContent(content: string): string {
+  return content.replace(/\s+|[`~!@#$%^&*()_|+\-=?;:'",.<>\{\}\[\]\\\/]/g, '').trim();
+}
diff --git a/scripts/validate-npm-packages.sh b/scripts/validate-npm-packages.sh
index b196ea7d26e72..f360a00aa3710 100755
--- a/scripts/validate-npm-packages.sh
+++ b/scripts/validate-npm-packages.sh
@@ -22,7 +22,7 @@ for file in "$ARTIFACTS_DIR"/*.tgz; do
   pushd "./npm-artifacts/$dir_name" || exit
 
   # Check for required files
-	check_files=("package.json" "README.md" "CHANGELOG.md" "LICENSE_APACHE2")
+	check_files=("package.json" "README.md" "CHANGELOG.md")
 	for check_file in "${check_files[@]}"; do
 		if [ ! -f "$check_file" ]; then
 			echo -e "❌ Failed: Missing required file $check_file in package $dir_name.\n"
@@ -30,6 +30,14 @@ for file in "$ARTIFACTS_DIR"/*.tgz; do
 		fi
 	done
 
+  # Check license files
+  if [ -f "LICENSE_APACHE2" ] || [ -f "LICENSE_AGPL" ]; then
+    echo -e "Found required license file in package $dir_name.\n"
+  else
+    echo -e "❌ Failed: Missing required license file in package $dir_name.\n"
+    exit 1
+  fi
+
   # Assert commonjs builds
   if [ ! -d dist ] || [ ! -f dist/index.js ] || [ ! -f dist/index.d.ts ]; then
     echo -e "❌ Failed: Missing 'dist' directory or required commonjs files in package $dir_name.\n"
diff --git a/scripts/webpack/plugins/HTMLWebpackCSSChunks.js b/scripts/webpack/plugins/HTMLWebpackCSSChunks.js
deleted file mode 100644
index 434d350f71823..0000000000000
--- a/scripts/webpack/plugins/HTMLWebpackCSSChunks.js
+++ /dev/null
@@ -1,42 +0,0 @@
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-
-/*
- * This plugin returns the css associated with entrypoints. Those chunks can be found
- * in `htmlWebpackPlugin.files.cssChunks`.
- * The HTML Webpack plugin removed the chunks object in v5 in favour of an array however if we want
- * to do anything smart with hashing (e.g. [contenthash]) we need a map of { themeName: chunkNameWithHash }.
- */
-class HTMLWebpackCSSChunks {
-  /**
-   * @param {import('webpack').Compiler} compiler
-   */
-  apply(compiler) {
-    compiler.hooks.compilation.tap(
-      'HTMLWebpackCSSChunks',
-      /**
-       * @param {import('webpack').Compilation} compilation
-       */
-      (compilation) => {
-        HtmlWebpackPlugin.getHooks(compilation).beforeAssetTagGeneration.tapAsync(
-          'HTMLWebpackCSSChunks',
-          (data, cb) => {
-            data.assets.cssChunks = {};
-
-            for (const entryPoint of compilation.entrypoints.values()) {
-              for (const chunk of entryPoint.chunks) {
-                const cssFile = [...chunk.files].find((file) => file.endsWith('.css'));
-                if (cssFile !== undefined) {
-                  data.assets.cssChunks[chunk.name] = cssFile;
-                }
-              }
-            }
-
-            cb(null, data);
-          }
-        );
-      }
-    );
-  }
-}
-
-module.exports = HTMLWebpackCSSChunks;
diff --git a/scripts/webpack/webpack.common.js b/scripts/webpack/webpack.common.js
index 91f47219042ff..599c4a1fb415f 100644
--- a/scripts/webpack/webpack.common.js
+++ b/scripts/webpack/webpack.common.js
@@ -1,4 +1,3 @@
-const CopyWebpackPlugin = require('copy-webpack-plugin');
 const path = require('path');
 const webpack = require('webpack');
 
@@ -33,7 +32,16 @@ module.exports = {
         '@locker/near-membrane-dom/custom-devtools-formatter.js'
       ),
     },
-    modules: ['node_modules', path.resolve('public')],
+    modules: [
+      // default value
+      'node_modules',
+
+      // required for grafana enterprise resolution
+      path.resolve('node_modules'),
+
+      // required to for 'bare' imports (like 'app/core/utils' etc)
+      path.resolve('public'),
+    ],
     fallback: {
       buffer: false,
       fs: false,
@@ -42,13 +50,14 @@ module.exports = {
       https: false,
       string_decoder: false,
     },
-    symlinks: false,
-  },
-  ignoreWarnings: [/export .* was not found in/],
-  stats: {
-    children: false,
-    source: false,
   },
+  ignoreWarnings: [
+    /export .* was not found in/,
+    {
+      module: /@kusto\/language-service\/bridge\.min\.js$/,
+      message: /^Critical dependency: the request of a dependency is an expression$/,
+    },
+  ],
   plugins: [
     new webpack.NormalModuleReplacementPlugin(/^@grafana\/schema\/dist\/esm\/(.*)$/, (resource) => {
       resource.request = resource.request.replace('@grafana/schema/dist/esm', '@grafana/schema/src');
@@ -57,25 +66,6 @@ module.exports = {
     new webpack.ProvidePlugin({
       Buffer: ['buffer', 'Buffer'],
     }),
-    new CopyWebpackPlugin({
-      patterns: [
-        {
-          context: path.join(require.resolve('monaco-editor/package.json'), '../min/vs/'),
-          from: '**/*',
-          to: '../lib/monaco/min/vs/', // inside the public/build folder
-          globOptions: {
-            ignore: [
-              '**/*.map', // debug files
-            ],
-          },
-        },
-        {
-          context: path.join(require.resolve('@kusto/monaco-kusto/package.json'), '../release/min'),
-          from: '**/*',
-          to: '../lib/monaco/min/vs/language/kusto/',
-        },
-      ],
-    }),
   ],
   module: {
     rules: [
@@ -119,6 +109,13 @@ module.exports = {
         test: /(unicons|mono|custom)[\\/].*\.svg$/,
         type: 'asset/source',
       },
+      {
+        // Required for msagl library (used in Nodegraph panel) to work
+        test: /\.m?js$/,
+        resolve: {
+          fullySpecified: false,
+        },
+      },
     ],
   },
   // https://webpack.js.org/plugins/split-chunks-plugin/#split-chunks-example-3
diff --git a/scripts/webpack/webpack.dev.js b/scripts/webpack/webpack.dev.js
index 8d3b497b0edd3..eca2fd0c9d69a 100644
--- a/scripts/webpack/webpack.dev.js
+++ b/scripts/webpack/webpack.dev.js
@@ -1,16 +1,16 @@
 'use strict';
-
+const { getPackagesSync } = require('@manypkg/get-packages');
 const browserslist = require('browserslist');
 const { resolveToEsbuildTarget } = require('esbuild-plugin-browserslist');
 const ESLintPlugin = require('eslint-webpack-plugin');
 const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const path = require('path');
 const { DefinePlugin } = require('webpack');
+const WebpackAssetsManifest = require('webpack-assets-manifest');
 const { merge } = require('webpack-merge');
+const WebpackBar = require('webpackbar');
 
-const HTMLWebpackCSSChunks = require('./plugins/HTMLWebpackCSSChunks');
 const common = require('./webpack.common.js');
 const esbuildTargets = resolveToEsbuildTarget(browserslist(), { printUnknownTargets: false });
 // esbuild-loader 3.0.0+ requires format to be set to prevent it
@@ -20,6 +20,12 @@ const esbuildOptions = {
   format: undefined,
 };
 
+// To speed up webpack and prevent unnecessary rebuilds we ignore decoupled packages
+function getDecoupledPlugins() {
+  const { packages } = getPackagesSync(process.cwd());
+  return packages.filter((pkg) => pkg.dir.includes('plugins/datasource')).map((pkg) => `${pkg.dir}/**`);
+}
+
 module.exports = (env = {}) => {
   return merge(common, {
     devtool: 'source-map',
@@ -33,7 +39,19 @@ module.exports = (env = {}) => {
 
     // If we enabled watch option via CLI
     watchOptions: {
-      ignored: /node_modules/,
+      ignored: ['/node_modules/', ...getDecoupledPlugins()],
+    },
+
+    resolve: {
+      alias: {
+        // Packages linked for development need react to be resolved from the same location
+        react: require.resolve('react'),
+
+        // Also Grafana packages need to be resolved from the same location so they share
+        // the same singletons
+        '@grafana/runtime': path.resolve(__dirname, '../../packages/grafana-runtime'),
+        '@grafana/data': path.resolve(__dirname, '../../packages/grafana-data'),
+      },
     },
 
     module: {
@@ -41,7 +59,6 @@ module.exports = (env = {}) => {
       rules: [
         {
           test: /\.tsx?$/,
-          exclude: /node_modules/,
           use: {
             loader: 'esbuild-loader',
             options: esbuildOptions,
@@ -54,6 +71,8 @@ module.exports = (env = {}) => {
       ],
     },
 
+    // infrastructureLogging: { level: 'error' },
+
     // https://webpack.js.org/guides/build-performance/#output-without-path-info
     output: {
       pathinfo: false,
@@ -101,26 +120,22 @@ module.exports = (env = {}) => {
       new MiniCssExtractPlugin({
         filename: 'grafana.[name].[contenthash].css',
       }),
-      new HtmlWebpackPlugin({
-        filename: path.resolve(__dirname, '../../public/views/error.html'),
-        template: path.resolve(__dirname, '../../public/views/error-template.html'),
-        inject: false,
-        chunksSortMode: 'none',
-        excludeChunks: ['dark', 'light'],
-      }),
-      new HtmlWebpackPlugin({
-        filename: path.resolve(__dirname, '../../public/views/index.html'),
-        template: path.resolve(__dirname, '../../public/views/index-template.html'),
-        inject: false,
-        chunksSortMode: 'none',
-        excludeChunks: ['dark', 'light'],
-      }),
-      new HTMLWebpackCSSChunks(),
       new DefinePlugin({
         'process.env': {
           NODE_ENV: JSON.stringify('development'),
         },
       }),
+      new WebpackAssetsManifest({
+        entrypoints: true,
+        integrity: true,
+        publicPath: true,
+      }),
+      new WebpackBar({
+        color: '#eb7b18',
+        name: 'Grafana',
+      }),
     ],
+
+    stats: 'minimal',
   });
 };
diff --git a/scripts/webpack/webpack.hot.js b/scripts/webpack/webpack.hot.js
index 9c049c4755a24..173f53f65c0d7 100644
--- a/scripts/webpack/webpack.hot.js
+++ b/scripts/webpack/webpack.hot.js
@@ -1,13 +1,11 @@
 'use strict';
 
 const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const path = require('path');
 const { DefinePlugin } = require('webpack');
 const { merge } = require('webpack-merge');
 
-const HTMLWebpackCSSChunks = require('./plugins/HTMLWebpackCSSChunks');
 const common = require('./webpack.common.js');
 
 module.exports = merge(common, {
@@ -32,9 +30,12 @@ module.exports = merge(common, {
     hot: true,
     open: false,
     port: 3333,
-    proxy: {
-      '!/public/build': 'http://localhost:3000',
-    },
+    proxy: [
+      {
+        context: '!/public/build',
+        target: 'http://localhost:3000',
+      },
+    ],
     static: {
       publicPath: '/public/build/',
     },
@@ -80,14 +81,6 @@ module.exports = merge(common, {
     new MiniCssExtractPlugin({
       filename: 'grafana.[name].[contenthash].css',
     }),
-    new HtmlWebpackPlugin({
-      filename: path.resolve(__dirname, '../../public/views/index.html'),
-      template: path.resolve(__dirname, '../../public/views/index-template.html'),
-      inject: false,
-      chunksSortMode: 'none',
-      excludeChunks: ['dark', 'light'],
-    }),
-    new HTMLWebpackCSSChunks(),
     new ReactRefreshWebpackPlugin(),
     new DefinePlugin({
       'process.env': {
diff --git a/scripts/webpack/webpack.prod.js b/scripts/webpack/webpack.prod.js
index 2845e6639c220..a94550fd0a523 100644
--- a/scripts/webpack/webpack.prod.js
+++ b/scripts/webpack/webpack.prod.js
@@ -4,13 +4,12 @@ const browserslist = require('browserslist');
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const { EsbuildPlugin } = require('esbuild-loader');
 const { resolveToEsbuildTarget } = require('esbuild-plugin-browserslist');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const path = require('path');
+const WebpackAssetsManifest = require('webpack-assets-manifest');
 const { WebpackManifestPlugin } = require('webpack-manifest-plugin');
 const { merge } = require('webpack-merge');
 
-const HTMLWebpackCSSChunks = require('./plugins/HTMLWebpackCSSChunks');
 const common = require('./webpack.common.js');
 const esbuildTargets = resolveToEsbuildTarget(browserslist(), { printUnknownTargets: false });
 
@@ -36,7 +35,6 @@ module.exports = (env = {}) =>
       rules: [
         {
           test: /\.tsx?$/,
-          exclude: /node_modules/,
           use: {
             loader: 'esbuild-loader',
             options: esbuildOptions,
@@ -67,21 +65,15 @@ module.exports = (env = {}) =>
       new MiniCssExtractPlugin({
         filename: 'grafana.[name].[contenthash].css',
       }),
-      new HtmlWebpackPlugin({
-        filename: path.resolve(__dirname, '../../public/views/error.html'),
-        template: path.resolve(__dirname, '../../public/views/error-template.html'),
-        inject: false,
-        excludeChunks: ['dark', 'light'],
-        chunksSortMode: 'none',
+      /**
+       * I know we have two manifest plugins here.
+       * WebpackManifestPlugin was only used in prod before and does not support integrity hashes
+       */
+      new WebpackAssetsManifest({
+        entrypoints: true,
+        integrity: true,
+        publicPath: true,
       }),
-      new HtmlWebpackPlugin({
-        filename: path.resolve(__dirname, '../../public/views/index.html'),
-        template: path.resolve(__dirname, '../../public/views/index-template.html'),
-        inject: false,
-        excludeChunks: ['manifest', 'dark', 'light'],
-        chunksSortMode: 'none',
-      }),
-      new HTMLWebpackCSSChunks(),
       new WebpackManifestPlugin({
         fileName: path.join(process.cwd(), 'manifest.json'),
         filter: (file) => !file.name.endsWith('.map'),
diff --git a/stylelint.config.js b/stylelint.config.js
index 442ea0945a85f..e92d9fd3e0427 100644
--- a/stylelint.config.js
+++ b/stylelint.config.js
@@ -1,9 +1,8 @@
 module.exports = {
-  extends: ['stylelint-config-sass-guidelines', 'stylelint-config-prettier'],
+  extends: ['stylelint-config-sass-guidelines'],
   ignoreFiles: ['**/node_modules/**/*.scss'],
   rules: {
     'at-rule-no-vendor-prefix': null,
-    'color-hex-case': null,
     'color-hex-length': null,
     'color-named': null,
     'declaration-block-no-duplicate-properties': [
@@ -21,11 +20,9 @@ module.exports = {
       'border-right': [],
       'border-top': [],
     },
-    'function-comma-space-after': null,
     'function-url-quotes': null,
     'length-zero-no-unit': null,
     'max-nesting-depth': null,
-    'number-no-trailing-zeros': null,
     'property-no-vendor-prefix': null,
     'rule-empty-line-before': null,
     'scss/at-function-pattern': null,
diff --git a/tsconfig.json b/tsconfig.json
index 65e4f668b3bff..4949f581e7ade 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -10,7 +10,6 @@
     "useUnknownInCatchVariables": true,
     "incremental": true,
     "tsBuildInfoFile": "./tsconfig.tsbuildinfo",
-    "preserveSymlinks": true,
     "paths": {
       "@grafana/schema/dist/esm/*": ["../packages/grafana-schema/src/*"]
     }
diff --git a/yarn.lock b/yarn.lock
index f5b24299c09a6..be039e9343c42 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,20 +2,20 @@
 # Manual changes might be lost - proceed with caution!
 
 __metadata:
-  version: 6
-  cacheKey: 8
+  version: 8
+  cacheKey: 10
 
 "@aashutoshrathi/word-wrap@npm:^1.2.3":
   version: 1.2.6
   resolution: "@aashutoshrathi/word-wrap@npm:1.2.6"
-  checksum: ada901b9e7c680d190f1d012c84217ce0063d8f5c5a7725bb91ec3c5ed99bb7572680eb2d2938a531ccbaec39a95422fcd8a6b4a13110c7d98dd75402f66a0cd
+  checksum: 10/6eebd12a5cd03cee38fcb915ef9f4ea557df6a06f642dfc7fe8eb4839eb5c9ca55a382f3604d52c14200b0c214c12af5e1f23d2a6d8e23ef2d016b105a9d6c0a
   languageName: node
   linkType: hard
 
-"@adobe/css-tools@npm:^4.0.1, @adobe/css-tools@npm:^4.3.0":
-  version: 4.3.1
-  resolution: "@adobe/css-tools@npm:4.3.1"
-  checksum: ad43456379ff391132aff687ece190cb23ea69395e23c9b96690eeabe2468da89a4aaf266e4f8b6eaab53db3d1064107ce0f63c3a974e864f4a04affc768da3f
+"@adobe/css-tools@npm:^4.3.2":
+  version: 4.3.2
+  resolution: "@adobe/css-tools@npm:4.3.2"
+  checksum: 10/973dcb7ba5141f57ec726ddec2e94e8947361bb0c5f0e8ebd1e8aa3a84b28e66db4ad843908825f99730d59784ff3c43868b014a7268676a65950cdb850c42cc
   languageName: node
   linkType: hard
 
@@ -23,9 +23,9 @@ __metadata:
   version: 2.2.0
   resolution: "@ampproject/remapping@npm:2.2.0"
   dependencies:
-    "@jridgewell/gen-mapping": ^0.1.0
-    "@jridgewell/trace-mapping": ^0.3.9
-  checksum: d74d170d06468913921d72430259424b7e4c826b5a7d39ff839a29d547efb97dc577caa8ba3fb5cf023624e9af9d09651afc3d4112a45e2050328abc9b3a2292
+    "@jridgewell/gen-mapping": "npm:^0.1.0"
+    "@jridgewell/trace-mapping": "npm:^0.3.9"
+  checksum: 10/503a58d6e9d645a20debd34fa8df79fb435a79a34b1d487b9ff0be9f20712b1594ce21da16b63af7db8a6b34472212572e53a55613a5a6b3134b23fc74843d04
   languageName: node
   linkType: hard
 
@@ -33,62 +33,127 @@ __metadata:
   version: 1.4.126
   resolution: "@aw-web-design/x-default-browser@npm:1.4.126"
   dependencies:
-    default-browser-id: 3.0.0
+    default-browser-id: "npm:3.0.0"
   bin:
     x-default-browser: bin/x-default-browser.js
-  checksum: f63b68a0ff41c8fe478b1b4822e169cac0d26c61b123c0400d5e16a8a5987732b85795aff16d6b21936f9c955f0d32bffbfc166890d3446f74a72a7a2c9633ea
+  checksum: 10/f7111a6f00953f32d344a05c9a1bc1f22124dfc2696b2b7906ca856a9f845a282f272f603c997ebbb8a2d6b865664f46fda3bec1c480f040e21b815ff8ed3607
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.3, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.18.6, @babel/code-frame@npm:^7.22.13":
-  version: 7.22.13
-  resolution: "@babel/code-frame@npm:7.22.13"
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.3, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.18.6, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.24.1, @babel/code-frame@npm:^7.24.2":
+  version: 7.24.2
+  resolution: "@babel/code-frame@npm:7.24.2"
   dependencies:
-    "@babel/highlight": ^7.22.13
-    chalk: ^2.4.2
-  checksum: 22e342c8077c8b77eeb11f554ecca2ba14153f707b85294fcf6070b6f6150aae88a7b7436dd88d8c9289970585f3fe5b9b941c5aa3aa26a6d5a8ef3f292da058
+    "@babel/highlight": "npm:^7.24.2"
+    picocolors: "npm:^1.0.0"
+  checksum: 10/7db8f5b36ffa3f47a37f58f61e3d130b9ecad21961f3eede7e2a4ac2c7e4a5efb6e9d03a810c669bc986096831b6c0dfc2c3082673d93351b82359c1b03e0590
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.20.5, @babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.22.9, @babel/compat-data@npm:^7.23.2":
-  version: 7.23.2
-  resolution: "@babel/compat-data@npm:7.23.2"
-  checksum: d8dc27437d40907b271161d4c88ffe72ccecb034c730deb1960a417b59a14d7c5ebca8cd80dd458a01cd396a7a329eb48cddcc3791b5a84da33d7f278f7bec6a
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.23.2, @babel/compat-data@npm:^7.23.5, @babel/compat-data@npm:^7.24.4":
+  version: 7.24.4
+  resolution: "@babel/compat-data@npm:7.24.4"
+  checksum: 10/e51faec0ac8259f03cc5029d2b4a944b4fee44cb5188c11530769d5beb81f384d031dba951febc3e33dbb48ceb8045b1184f5c1ac4c5f86ab1f5e951e9aaf7af
+  languageName: node
+  linkType: hard
+
+"@babel/compat-data@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/compat-data@npm:7.24.1"
+  checksum: 10/d5460b99c07ff8487467c52f742a219c7e3bcdcaa2882456a13c0d0c8116405f0c85a651fb60511284dc64ed627a5e989f24c3cd6e71d07a9947e7c8954b433c
   languageName: node
   linkType: hard
 
-"@babel/core@npm:7.23.2, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.13.16, @babel/core@npm:^7.22.9, @babel/core@npm:^7.7.5":
+"@babel/core@npm:7.23.2":
   version: 7.23.2
   resolution: "@babel/core@npm:7.23.2"
   dependencies:
-    "@ampproject/remapping": ^2.2.0
-    "@babel/code-frame": ^7.22.13
-    "@babel/generator": ^7.23.0
-    "@babel/helper-compilation-targets": ^7.22.15
-    "@babel/helper-module-transforms": ^7.23.0
-    "@babel/helpers": ^7.23.2
-    "@babel/parser": ^7.23.0
-    "@babel/template": ^7.22.15
-    "@babel/traverse": ^7.23.2
-    "@babel/types": ^7.23.0
-    convert-source-map: ^2.0.0
-    debug: ^4.1.0
-    gensync: ^1.0.0-beta.2
-    json5: ^2.2.3
-    semver: ^6.3.1
-  checksum: 003897718ded16f3b75632d63cd49486bf67ff206cc7ebd1a10d49e2456f8d45740910d5ec7e42e3faf0deec7a2e96b1a02e766d19a67a8309053f0d4e57c0fe
-  languageName: node
-  linkType: hard
-
-"@babel/generator@npm:^7.12.11, @babel/generator@npm:^7.22.9, @babel/generator@npm:^7.23.0, @babel/generator@npm:^7.7.2":
-  version: 7.23.0
-  resolution: "@babel/generator@npm:7.23.0"
-  dependencies:
-    "@babel/types": ^7.23.0
-    "@jridgewell/gen-mapping": ^0.3.2
-    "@jridgewell/trace-mapping": ^0.3.17
-    jsesc: ^2.5.1
-  checksum: 8efe24adad34300f1f8ea2add420b28171a646edc70f2a1b3e1683842f23b8b7ffa7e35ef0119294e1901f45bfea5b3dc70abe1f10a1917ccdfb41bed69be5f1
+    "@ampproject/remapping": "npm:^2.2.0"
+    "@babel/code-frame": "npm:^7.22.13"
+    "@babel/generator": "npm:^7.23.0"
+    "@babel/helper-compilation-targets": "npm:^7.22.15"
+    "@babel/helper-module-transforms": "npm:^7.23.0"
+    "@babel/helpers": "npm:^7.23.2"
+    "@babel/parser": "npm:^7.23.0"
+    "@babel/template": "npm:^7.22.15"
+    "@babel/traverse": "npm:^7.23.2"
+    "@babel/types": "npm:^7.23.0"
+    convert-source-map: "npm:^2.0.0"
+    debug: "npm:^4.1.0"
+    gensync: "npm:^1.0.0-beta.2"
+    json5: "npm:^2.2.3"
+    semver: "npm:^6.3.1"
+  checksum: 10/b69d7008695b2ac7a3a2db83c5c712fbb79f7031c4480f6351cde327930e38873003d1d021059b729a1d0cb48093f1d384c64269b78f6189f50051fe4f64dc2d
+  languageName: node
+  linkType: hard
+
+"@babel/core@npm:7.24.3":
+  version: 7.24.3
+  resolution: "@babel/core@npm:7.24.3"
+  dependencies:
+    "@ampproject/remapping": "npm:^2.2.0"
+    "@babel/code-frame": "npm:^7.24.2"
+    "@babel/generator": "npm:^7.24.1"
+    "@babel/helper-compilation-targets": "npm:^7.23.6"
+    "@babel/helper-module-transforms": "npm:^7.23.3"
+    "@babel/helpers": "npm:^7.24.1"
+    "@babel/parser": "npm:^7.24.1"
+    "@babel/template": "npm:^7.24.0"
+    "@babel/traverse": "npm:^7.24.1"
+    "@babel/types": "npm:^7.24.0"
+    convert-source-map: "npm:^2.0.0"
+    debug: "npm:^4.1.0"
+    gensync: "npm:^1.0.0-beta.2"
+    json5: "npm:^2.2.3"
+    semver: "npm:^6.3.1"
+  checksum: 10/3a7b9931fe0d93c500dcdb6b36f038b0f9d5090c048818e62aa8321c8f6e8ccc3d47373f0b40591c1fe3b13e5096bacabb1ade83f9f4d86f57878c39a9d1ade1
+  languageName: node
+  linkType: hard
+
+"@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.13.16, @babel/core@npm:^7.21.3, @babel/core@npm:^7.22.9, @babel/core@npm:^7.7.5":
+  version: 7.24.4
+  resolution: "@babel/core@npm:7.24.4"
+  dependencies:
+    "@ampproject/remapping": "npm:^2.2.0"
+    "@babel/code-frame": "npm:^7.24.2"
+    "@babel/generator": "npm:^7.24.4"
+    "@babel/helper-compilation-targets": "npm:^7.23.6"
+    "@babel/helper-module-transforms": "npm:^7.23.3"
+    "@babel/helpers": "npm:^7.24.4"
+    "@babel/parser": "npm:^7.24.4"
+    "@babel/template": "npm:^7.24.0"
+    "@babel/traverse": "npm:^7.24.1"
+    "@babel/types": "npm:^7.24.0"
+    convert-source-map: "npm:^2.0.0"
+    debug: "npm:^4.1.0"
+    gensync: "npm:^1.0.0-beta.2"
+    json5: "npm:^2.2.3"
+    semver: "npm:^6.3.1"
+  checksum: 10/1e049f8df26be0fe5be36173fd7c33dfb004eeeec28152fea83c90e71784f9a6f2237296f43a2ee7d9041e2a33a05f43da48ce2d4e0cd473a682328ca07ce7e0
+  languageName: node
+  linkType: hard
+
+"@babel/generator@npm:^7.12.11, @babel/generator@npm:^7.22.9, @babel/generator@npm:^7.24.1, @babel/generator@npm:^7.24.4, @babel/generator@npm:^7.7.2":
+  version: 7.24.4
+  resolution: "@babel/generator@npm:7.24.4"
+  dependencies:
+    "@babel/types": "npm:^7.24.0"
+    "@jridgewell/gen-mapping": "npm:^0.3.5"
+    "@jridgewell/trace-mapping": "npm:^0.3.25"
+    jsesc: "npm:^2.5.1"
+  checksum: 10/69e1772dcf8f95baec951f422cca091d59a3f29b5eedc989ad87f7262289b94625983f6fe654302ca17aae0a32f9232332b83fcc85533311d6267b09c58b1061
+  languageName: node
+  linkType: hard
+
+"@babel/generator@npm:^7.23.0":
+  version: 7.24.1
+  resolution: "@babel/generator@npm:7.24.1"
+  dependencies:
+    "@babel/types": "npm:^7.24.0"
+    "@jridgewell/gen-mapping": "npm:^0.3.5"
+    "@jridgewell/trace-mapping": "npm:^0.3.25"
+    jsesc: "npm:^2.5.1"
+  checksum: 10/c6160e9cd63d7ed7168dee27d827f9c46fab820c45861a5df56cd5c78047f7c3fc97c341e9ccfa1a6f97c87ec2563d9903380b5f92794e3540a6c5f99eb8f075
   languageName: node
   linkType: hard
 
@@ -96,84 +161,114 @@ __metadata:
   version: 7.22.5
   resolution: "@babel/helper-annotate-as-pure@npm:7.22.5"
   dependencies:
-    "@babel/types": ^7.22.5
-  checksum: 53da330f1835c46f26b7bf4da31f7a496dee9fd8696cca12366b94ba19d97421ce519a74a837f687749318f94d1a37f8d1abcbf35e8ed22c32d16373b2f6198d
+    "@babel/types": "npm:^7.22.5"
+  checksum: 10/53da330f1835c46f26b7bf4da31f7a496dee9fd8696cca12366b94ba19d97421ce519a74a837f687749318f94d1a37f8d1abcbf35e8ed22c32d16373b2f6198d
   languageName: node
   linkType: hard
 
-"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.22.5"
+"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.22.15":
+  version: 7.22.15
+  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.22.15"
   dependencies:
-    "@babel/types": ^7.22.5
-  checksum: d753acac62399fc6dd354cf1b9441bde0c331c2fe792a4c14904c5e5eafc3cac79478f6aa038e8a51c1148b0af6710a2e619855e4b5d54497ac972eaffed5884
+    "@babel/types": "npm:^7.22.15"
+  checksum: 10/639c697a1c729f9fafa2dd4c9af2e18568190299b5907bd4c2d0bc818fcbd1e83ffeecc2af24327a7faa7ac4c34edd9d7940510a5e66296c19bad17001cf5c7a
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.20.7, @babel/helper-compilation-targets@npm:^7.22.15, @babel/helper-compilation-targets@npm:^7.22.5, @babel/helper-compilation-targets@npm:^7.22.6":
-  version: 7.22.15
-  resolution: "@babel/helper-compilation-targets@npm:7.22.15"
+"@babel/helper-compilation-targets@npm:^7.22.15, @babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.23.6":
+  version: 7.23.6
+  resolution: "@babel/helper-compilation-targets@npm:7.23.6"
   dependencies:
-    "@babel/compat-data": ^7.22.9
-    "@babel/helper-validator-option": ^7.22.15
-    browserslist: ^4.21.9
-    lru-cache: ^5.1.1
-    semver: ^6.3.1
-  checksum: ce85196769e091ae54dd39e4a80c2a9df1793da8588e335c383d536d54f06baf648d0a08fc873044f226398c4ded15c4ae9120ee18e7dfd7c639a68e3cdc9980
+    "@babel/compat-data": "npm:^7.23.5"
+    "@babel/helper-validator-option": "npm:^7.23.5"
+    browserslist: "npm:^4.22.2"
+    lru-cache: "npm:^5.1.1"
+    semver: "npm:^6.3.1"
+  checksum: 10/05595cd73087ddcd81b82d2f3297aac0c0422858dfdded43d304786cf680ec33e846e2317e6992d2c964ee61d93945cbf1fa8ec80b55aee5bfb159227fb02cb9
   languageName: node
   linkType: hard
 
-"@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.22.11, @babel/helper-create-class-features-plugin@npm:^7.22.15, @babel/helper-create-class-features-plugin@npm:^7.22.5, @babel/helper-create-class-features-plugin@npm:^7.22.9":
-  version: 7.22.15
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.22.15"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-environment-visitor": ^7.22.5
-    "@babel/helper-function-name": ^7.22.5
-    "@babel/helper-member-expression-to-functions": ^7.22.15
-    "@babel/helper-optimise-call-expression": ^7.22.5
-    "@babel/helper-replace-supers": ^7.22.9
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
-    "@babel/helper-split-export-declaration": ^7.22.6
-    semver: ^6.3.1
+"@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.22.15, @babel/helper-create-class-features-plugin@npm:^7.24.1, @babel/helper-create-class-features-plugin@npm:^7.24.4":
+  version: 7.24.4
+  resolution: "@babel/helper-create-class-features-plugin@npm:7.24.4"
+  dependencies:
+    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
+    "@babel/helper-environment-visitor": "npm:^7.22.20"
+    "@babel/helper-function-name": "npm:^7.23.0"
+    "@babel/helper-member-expression-to-functions": "npm:^7.23.0"
+    "@babel/helper-optimise-call-expression": "npm:^7.22.5"
+    "@babel/helper-replace-supers": "npm:^7.24.1"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
+    "@babel/helper-split-export-declaration": "npm:^7.22.6"
+    semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 52c500d8d164abb3a360b1b7c4b8fff77bc4a5920d3a2b41ae6e1d30617b0dc0b972c1f5db35b1752007e04a748908b4a99bc872b73549ae837e87dcdde005a3
+  checksum: 10/86153719d98e4402f92f24d6b1be94e6b59c0236a6cc36b173a570a64b5156dbc2f16ccfe3c8485dc795524ca88acca65b14863be63049586668c45567f2acd4
   languageName: node
   linkType: hard
 
-"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.22.5":
-  version: 7.22.9
-  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.22.9"
+"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.22.15, @babel/helper-create-regexp-features-plugin@npm:^7.22.5":
+  version: 7.22.15
+  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.22.15"
   dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    regexpu-core: ^5.3.1
-    semver: ^6.3.1
+    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
+    regexpu-core: "npm:^5.3.1"
+    semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 87cb48a7ee898ab205374274364c3adc70b87b08c7bd07f51019ae4562c0170d7148e654d591f825dee14b5fe11666a0e7966872dfdbfa0d1b94b861ecf0e4e1
+  checksum: 10/886b675e82f1327b4f7a2c69a68eefdb5dbb0b9d4762c2d4f42a694960a9ccf61e1a3bcad601efd92c110033eb1a944fcd1e5cac188aa6b2e2076b541e210e20
+  languageName: node
+  linkType: hard
+
+"@babel/helper-define-polyfill-provider@npm:^0.4.4":
+  version: 0.4.4
+  resolution: "@babel/helper-define-polyfill-provider@npm:0.4.4"
+  dependencies:
+    "@babel/helper-compilation-targets": "npm:^7.22.6"
+    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    debug: "npm:^4.1.1"
+    lodash.debounce: "npm:^4.0.8"
+    resolve: "npm:^1.14.2"
+  peerDependencies:
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: 10/16c312e40ecf2ead81f3ab7275387079071012d2363022c04cf16d56fe0d781185f3a517b928f4556c716ae45e0567b817b636d5cd2fee8fb2ce2b18a04c5bcd
+  languageName: node
+  linkType: hard
+
+"@babel/helper-define-polyfill-provider@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "@babel/helper-define-polyfill-provider@npm:0.5.0"
+  dependencies:
+    "@babel/helper-compilation-targets": "npm:^7.22.6"
+    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    debug: "npm:^4.1.1"
+    lodash.debounce: "npm:^4.0.8"
+    resolve: "npm:^1.14.2"
+  peerDependencies:
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: 10/f849e816ec4b182a3e8fa8e09ff016f88bb95259cd6b2190b815c48f83c3d3b68e973a8ec72acc5086bfe93705cbd46ec089c06476421d858597780e42235a03
   languageName: node
   linkType: hard
 
-"@babel/helper-define-polyfill-provider@npm:^0.4.3":
-  version: 0.4.3
-  resolution: "@babel/helper-define-polyfill-provider@npm:0.4.3"
+"@babel/helper-define-polyfill-provider@npm:^0.6.1":
+  version: 0.6.1
+  resolution: "@babel/helper-define-polyfill-provider@npm:0.6.1"
   dependencies:
-    "@babel/helper-compilation-targets": ^7.22.6
-    "@babel/helper-plugin-utils": ^7.22.5
-    debug: ^4.1.1
-    lodash.debounce: ^4.0.8
-    resolve: ^1.14.2
+    "@babel/helper-compilation-targets": "npm:^7.22.6"
+    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    debug: "npm:^4.1.1"
+    lodash.debounce: "npm:^4.0.8"
+    resolve: "npm:^1.14.2"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 5d21e3f47b320e4b5b644195ec405e7ebc3739e48e65899efc808c5fa9c3bf5b06ce0d8ff5246ca99d1411e368f4557bc66730196c5781a5c4e986ee703bee79
+  checksum: 10/316e7c0f05d2ae233d5fbb622c6339436da8d2b2047be866b64a16e6996c078a23b4adfebbdb33bc6a9882326a6cc20b95daa79a5e0edc92e9730e36d45fa523
   languageName: node
   linkType: hard
 
-"@babel/helper-environment-visitor@npm:^7.22.20, @babel/helper-environment-visitor@npm:^7.22.5":
+"@babel/helper-environment-visitor@npm:^7.22.20":
   version: 7.22.20
   resolution: "@babel/helper-environment-visitor@npm:7.22.20"
-  checksum: d80ee98ff66f41e233f36ca1921774c37e88a803b2f7dca3db7c057a5fea0473804db9fb6729e5dbfd07f4bed722d60f7852035c2c739382e84c335661590b69
+  checksum: 10/d80ee98ff66f41e233f36ca1921774c37e88a803b2f7dca3db7c057a5fea0473804db9fb6729e5dbfd07f4bed722d60f7852035c2c739382e84c335661590b69
   languageName: node
   linkType: hard
 
@@ -181,9 +276,9 @@ __metadata:
   version: 7.23.0
   resolution: "@babel/helper-function-name@npm:7.23.0"
   dependencies:
-    "@babel/template": ^7.22.15
-    "@babel/types": ^7.23.0
-  checksum: e44542257b2d4634a1f979244eb2a4ad8e6d75eb6761b4cfceb56b562f7db150d134bc538c8e6adca3783e3bc31be949071527aa8e3aab7867d1ad2d84a26e10
+    "@babel/template": "npm:^7.22.15"
+    "@babel/types": "npm:^7.23.0"
+  checksum: 10/7b2ae024cd7a09f19817daf99e0153b3bf2bc4ab344e197e8d13623d5e36117ed0b110914bc248faa64e8ccd3e97971ec7b41cc6fd6163a2b980220c58dcdf6d
   languageName: node
   linkType: hard
 
@@ -191,41 +286,41 @@ __metadata:
   version: 7.22.5
   resolution: "@babel/helper-hoist-variables@npm:7.22.5"
   dependencies:
-    "@babel/types": ^7.22.5
-  checksum: 394ca191b4ac908a76e7c50ab52102669efe3a1c277033e49467913c7ed6f7c64d7eacbeabf3bed39ea1f41731e22993f763b1edce0f74ff8563fd1f380d92cc
+    "@babel/types": "npm:^7.22.5"
+  checksum: 10/394ca191b4ac908a76e7c50ab52102669efe3a1c277033e49467913c7ed6f7c64d7eacbeabf3bed39ea1f41731e22993f763b1edce0f74ff8563fd1f380d92cc
   languageName: node
   linkType: hard
 
-"@babel/helper-member-expression-to-functions@npm:^7.0.0, @babel/helper-member-expression-to-functions@npm:^7.22.15, @babel/helper-member-expression-to-functions@npm:^7.22.5":
+"@babel/helper-member-expression-to-functions@npm:^7.0.0, @babel/helper-member-expression-to-functions@npm:^7.23.0":
   version: 7.23.0
   resolution: "@babel/helper-member-expression-to-functions@npm:7.23.0"
   dependencies:
-    "@babel/types": ^7.23.0
-  checksum: 494659361370c979ada711ca685e2efe9460683c36db1b283b446122596602c901e291e09f2f980ecedfe6e0f2bd5386cb59768285446530df10c14df1024e75
+    "@babel/types": "npm:^7.23.0"
+  checksum: 10/325feb6e200478c8cd6e10433fabe993a7d3315cc1a2a457e45514a5f95a73dff4c69bea04cc2daea0ffe72d8ed85d504b3f00b2e0767b7d4f5ae25fec9b35b2
   languageName: node
   linkType: hard
 
-"@babel/helper-module-imports@npm:^7.0.0, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.22.15, @babel/helper-module-imports@npm:^7.22.5":
-  version: 7.22.15
-  resolution: "@babel/helper-module-imports@npm:7.22.15"
+"@babel/helper-module-imports@npm:^7.0.0, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.22.15, @babel/helper-module-imports@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/helper-module-imports@npm:7.24.1"
   dependencies:
-    "@babel/types": ^7.22.15
-  checksum: ecd7e457df0a46f889228f943ef9b4a47d485d82e030676767e6a2fdcbdaa63594d8124d4b55fd160b41c201025aec01fc27580352b1c87a37c9c6f33d116702
+    "@babel/types": "npm:^7.24.0"
+  checksum: 10/f771c1e8776890d85c2af06a6a36410cb41ff4bbcf162e7eecce7d53ebdc5196cc38c3abea3a06df9d778bb20edccb2909dfb8187ae82730e4d021329b631921
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.22.5, @babel/helper-module-transforms@npm:^7.23.0":
-  version: 7.23.0
-  resolution: "@babel/helper-module-transforms@npm:7.23.0"
+"@babel/helper-module-transforms@npm:^7.23.0, @babel/helper-module-transforms@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/helper-module-transforms@npm:7.23.3"
   dependencies:
-    "@babel/helper-environment-visitor": ^7.22.20
-    "@babel/helper-module-imports": ^7.22.15
-    "@babel/helper-simple-access": ^7.22.5
-    "@babel/helper-split-export-declaration": ^7.22.6
-    "@babel/helper-validator-identifier": ^7.22.20
+    "@babel/helper-environment-visitor": "npm:^7.22.20"
+    "@babel/helper-module-imports": "npm:^7.22.15"
+    "@babel/helper-simple-access": "npm:^7.22.5"
+    "@babel/helper-split-export-declaration": "npm:^7.22.6"
+    "@babel/helper-validator-identifier": "npm:^7.22.20"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 6e2afffb058cf3f8ce92f5116f710dda4341c81cfcd872f9a0197ea594f7ce0ab3cb940b0590af2fe99e60d2e5448bfba6bca8156ed70a2ed4be2adc8586c891
+  checksum: 10/583fa580f8e50e6f45c4f46aa76a8e49c2528deb84e25f634d66461b9a0e2420e13979b0a607b67aef67eaf8db8668eb9edc038b4514b16e3879fe09e8fd294b
   languageName: node
   linkType: hard
 
@@ -233,41 +328,41 @@ __metadata:
   version: 7.22.5
   resolution: "@babel/helper-optimise-call-expression@npm:7.22.5"
   dependencies:
-    "@babel/types": ^7.22.5
-  checksum: c70ef6cc6b6ed32eeeec4482127e8be5451d0e5282d5495d5d569d39eb04d7f1d66ec99b327f45d1d5842a9ad8c22d48567e93fc502003a47de78d122e355f7c
+    "@babel/types": "npm:^7.22.5"
+  checksum: 10/c70ef6cc6b6ed32eeeec4482127e8be5451d0e5282d5495d5d569d39eb04d7f1d66ec99b327f45d1d5842a9ad8c22d48567e93fc502003a47de78d122e355f7c
   languageName: node
   linkType: hard
 
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
-  version: 7.22.5
-  resolution: "@babel/helper-plugin-utils@npm:7.22.5"
-  checksum: c0fc7227076b6041acd2f0e818145d2e8c41968cc52fb5ca70eed48e21b8fe6dd88a0a91cbddf4951e33647336eb5ae184747ca706817ca3bef5e9e905151ff5
+"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.18.9, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.0, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
+  version: 7.24.0
+  resolution: "@babel/helper-plugin-utils@npm:7.24.0"
+  checksum: 10/dc8c7af321baf7653d93315beffee1790eb2c464b4f529273a24c8743a3f3095bf3f2d11828cb2c52d56282ef43a4bdc67a79c9ab8dd845e35d01871f3f28a0e
   languageName: node
   linkType: hard
 
-"@babel/helper-remap-async-to-generator@npm:^7.22.20, @babel/helper-remap-async-to-generator@npm:^7.22.5":
+"@babel/helper-remap-async-to-generator@npm:^7.22.20":
   version: 7.22.20
   resolution: "@babel/helper-remap-async-to-generator@npm:7.22.20"
   dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-environment-visitor": ^7.22.20
-    "@babel/helper-wrap-function": ^7.22.20
+    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
+    "@babel/helper-environment-visitor": "npm:^7.22.20"
+    "@babel/helper-wrap-function": "npm:^7.22.20"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 2fe6300a6f1b58211dffa0aed1b45d4958506d096543663dba83bd9251fe8d670fa909143a65b45e72acb49e7e20fbdb73eae315d9ddaced467948c3329986e7
+  checksum: 10/2fe6300a6f1b58211dffa0aed1b45d4958506d096543663dba83bd9251fe8d670fa909143a65b45e72acb49e7e20fbdb73eae315d9ddaced467948c3329986e7
   languageName: node
   linkType: hard
 
-"@babel/helper-replace-supers@npm:^7.0.0, @babel/helper-replace-supers@npm:^7.22.5, @babel/helper-replace-supers@npm:^7.22.9":
-  version: 7.22.9
-  resolution: "@babel/helper-replace-supers@npm:7.22.9"
+"@babel/helper-replace-supers@npm:^7.0.0, @babel/helper-replace-supers@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/helper-replace-supers@npm:7.24.1"
   dependencies:
-    "@babel/helper-environment-visitor": ^7.22.5
-    "@babel/helper-member-expression-to-functions": ^7.22.5
-    "@babel/helper-optimise-call-expression": ^7.22.5
+    "@babel/helper-environment-visitor": "npm:^7.22.20"
+    "@babel/helper-member-expression-to-functions": "npm:^7.23.0"
+    "@babel/helper-optimise-call-expression": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: d41471f56ff2616459d35a5df1900d5f0756ae78b1027040365325ef332d66e08e3be02a9489756d870887585ff222403a228546e93dd7019e19e59c0c0fe586
+  checksum: 10/1103b28ce0cc7fba903c21bc78035c696ff191bdbbe83c20c37030a2e10ae6254924556d942cdf8c44c48ba606a8266fdb105e6bb10945de9285f79cb1905df1
   languageName: node
   linkType: hard
 
@@ -275,8 +370,8 @@ __metadata:
   version: 7.22.5
   resolution: "@babel/helper-simple-access@npm:7.22.5"
   dependencies:
-    "@babel/types": ^7.22.5
-  checksum: fe9686714caf7d70aedb46c3cce090f8b915b206e09225f1e4dbc416786c2fdbbee40b38b23c268b7ccef749dd2db35f255338fb4f2444429874d900dede5ad2
+    "@babel/types": "npm:^7.22.5"
+  checksum: 10/7d5430eecf880937c27d1aed14245003bd1c7383ae07d652b3932f450f60bfcf8f2c1270c593ab063add185108d26198c69d1aca0e6fb7c6fdada4bcf72ab5b7
   languageName: node
   linkType: hard
 
@@ -284,8 +379,8 @@ __metadata:
   version: 7.22.5
   resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.22.5"
   dependencies:
-    "@babel/types": ^7.22.5
-  checksum: 1012ef2295eb12dc073f2b9edf3425661e9b8432a3387e62a8bc27c42963f1f216ab3124228015c748770b2257b4f1fda882ca8fa34c0bf485e929ae5bc45244
+    "@babel/types": "npm:^7.22.5"
+  checksum: 10/1012ef2295eb12dc073f2b9edf3425661e9b8432a3387e62a8bc27c42963f1f216ab3124228015c748770b2257b4f1fda882ca8fa34c0bf485e929ae5bc45244
   languageName: node
   linkType: hard
 
@@ -293,29 +388,29 @@ __metadata:
   version: 7.22.6
   resolution: "@babel/helper-split-export-declaration@npm:7.22.6"
   dependencies:
-    "@babel/types": ^7.22.5
-  checksum: e141cace583b19d9195f9c2b8e17a3ae913b7ee9b8120246d0f9ca349ca6f03cb2c001fd5ec57488c544347c0bb584afec66c936511e447fd20a360e591ac921
+    "@babel/types": "npm:^7.22.5"
+  checksum: 10/e141cace583b19d9195f9c2b8e17a3ae913b7ee9b8120246d0f9ca349ca6f03cb2c001fd5ec57488c544347c0bb584afec66c936511e447fd20a360e591ac921
   languageName: node
   linkType: hard
 
-"@babel/helper-string-parser@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-string-parser@npm:7.22.5"
-  checksum: 836851ca5ec813077bbb303acc992d75a360267aa3b5de7134d220411c852a6f17de7c0d0b8c8dcc0f567f67874c00f4528672b2a4f1bc978a3ada64c8c78467
+"@babel/helper-string-parser@npm:^7.23.4":
+  version: 7.23.4
+  resolution: "@babel/helper-string-parser@npm:7.23.4"
+  checksum: 10/c352082474a2ee1d2b812bd116a56b2e8b38065df9678a32a535f151ec6f58e54633cc778778374f10544b930703cca6ddf998803888a636afa27e2658068a9c
   languageName: node
   linkType: hard
 
 "@babel/helper-validator-identifier@npm:^7.22.20":
   version: 7.22.20
   resolution: "@babel/helper-validator-identifier@npm:7.22.20"
-  checksum: 136412784d9428266bcdd4d91c32bcf9ff0e8d25534a9d94b044f77fe76bc50f941a90319b05aafd1ec04f7d127cd57a179a3716009ff7f3412ef835ada95bdc
+  checksum: 10/df882d2675101df2d507b95b195ca2f86a3ef28cb711c84f37e79ca23178e13b9f0d8b522774211f51e40168bf5142be4c1c9776a150cddb61a0d5bf3e95750b
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-option@npm:^7.22.15, @babel/helper-validator-option@npm:^7.22.5":
-  version: 7.22.15
-  resolution: "@babel/helper-validator-option@npm:7.22.15"
-  checksum: 68da52b1e10002a543161494c4bc0f4d0398c8fdf361d5f7f4272e95c45d5b32d974896d44f6a0ea7378c9204988879d73613ca683e13bd1304e46d25ff67a8d
+"@babel/helper-validator-option@npm:^7.22.15, @babel/helper-validator-option@npm:^7.23.5":
+  version: 7.23.5
+  resolution: "@babel/helper-validator-option@npm:7.23.5"
+  checksum: 10/537cde2330a8aede223552510e8a13e9c1c8798afee3757995a7d4acae564124fe2bf7e7c3d90d62d3657434a74340a274b3b3b1c6f17e9a2be1f48af29cb09e
   languageName: node
   linkType: hard
 
@@ -323,117 +418,150 @@ __metadata:
   version: 7.22.20
   resolution: "@babel/helper-wrap-function@npm:7.22.20"
   dependencies:
-    "@babel/helper-function-name": ^7.22.5
-    "@babel/template": ^7.22.15
-    "@babel/types": ^7.22.19
-  checksum: 221ed9b5572612aeb571e4ce6a256f2dee85b3c9536f1dd5e611b0255e5f59a3d0ec392d8d46d4152149156a8109f92f20379b1d6d36abb613176e0e33f05fca
+    "@babel/helper-function-name": "npm:^7.22.5"
+    "@babel/template": "npm:^7.22.15"
+    "@babel/types": "npm:^7.22.19"
+  checksum: 10/b22e4666dec3d401bdf8ebd01d448bb3733617dae5aa6fbd1b684a22a35653cca832edd876529fd139577713b44fb89b4f5e52b7315ab218620f78b8a8ae23de
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.23.2":
-  version: 7.23.2
-  resolution: "@babel/helpers@npm:7.23.2"
+"@babel/helpers@npm:^7.23.2, @babel/helpers@npm:^7.24.4":
+  version: 7.24.4
+  resolution: "@babel/helpers@npm:7.24.4"
   dependencies:
-    "@babel/template": ^7.22.15
-    "@babel/traverse": ^7.23.2
-    "@babel/types": ^7.23.0
-  checksum: aaf4828df75ec460eaa70e5c9f66e6dadc28dae3728ddb7f6c13187dbf38030e142194b83d81aa8a31bbc35a5529a5d7d3f3cf59d5d0b595f5dd7f9d8f1ced8e
+    "@babel/template": "npm:^7.24.0"
+    "@babel/traverse": "npm:^7.24.1"
+    "@babel/types": "npm:^7.24.0"
+  checksum: 10/54a9d0f86f2803fcc216cfa23b66b871ea0fa0a892af1c9a79075872c2437de71afbb150ed8216f30e00b19a0b9c5c9d5845173d170e1ebfbbf8887839b89dde
   languageName: node
   linkType: hard
 
-"@babel/highlight@npm:^7.22.13":
-  version: 7.22.20
-  resolution: "@babel/highlight@npm:7.22.20"
+"@babel/helpers@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/helpers@npm:7.24.1"
   dependencies:
-    "@babel/helper-validator-identifier": ^7.22.20
-    chalk: ^2.4.2
-    js-tokens: ^4.0.0
-  checksum: 84bd034dca309a5e680083cd827a766780ca63cef37308404f17653d32366ea76262bd2364b2d38776232f2d01b649f26721417d507e8b4b6da3e4e739f6d134
+    "@babel/template": "npm:^7.24.0"
+    "@babel/traverse": "npm:^7.24.1"
+    "@babel/types": "npm:^7.24.0"
+  checksum: 10/82d3cdd3beafc4583f237515ef220bc205ced8b0540c6c6e191fc367a9589bd7304b8f9800d3d7574d4db9f079bd555979816b1874c86e53b3e7dd2032ad6c7c
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.13.16, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.22.7, @babel/parser@npm:^7.23.0":
-  version: 7.23.0
-  resolution: "@babel/parser@npm:7.23.0"
+"@babel/highlight@npm:^7.24.2":
+  version: 7.24.2
+  resolution: "@babel/highlight@npm:7.24.2"
+  dependencies:
+    "@babel/helper-validator-identifier": "npm:^7.22.20"
+    chalk: "npm:^2.4.2"
+    js-tokens: "npm:^4.0.0"
+    picocolors: "npm:^1.0.0"
+  checksum: 10/4555124235f34403bb28f55b1de58edf598491cc181c75f8afc8fe529903cb598cd52fe3bf2faab9bc1f45c299681ef0e44eea7a848bb85c500c5a4fe13f54f6
+  languageName: node
+  linkType: hard
+
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.13.16, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.7, @babel/parser@npm:^7.23.0, @babel/parser@npm:^7.24.0, @babel/parser@npm:^7.24.1, @babel/parser@npm:^7.24.4":
+  version: 7.24.4
+  resolution: "@babel/parser@npm:7.24.4"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 453fdf8b9e2c2b7d7b02139e0ce003d1af21947bbc03eb350fb248ee335c9b85e4ab41697ddbdd97079698de825a265e45a0846bb2ed47a2c7c1df833f42a354
+  checksum: 10/3742cc5068036287e6395269dce5a2735e6349cdc8d4b53297c75f98c580d7e1c8cb43235623999d151f2ef975d677dbc2c2357573a1855caa71c271bf3046c9
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.22.15"
+"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.4":
+  version: 7.24.4
+  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.4"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-environment-visitor": "npm:^7.22.20"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 8910ca21a7ec7c06f7b247d4b86c97c5aa15ef321518f44f6f490c5912fdf82c605aaa02b90892e375d82ccbedeadfdeadd922c1b836c9dd4c596871bf654753
+  checksum: 10/1439e2ceec512b72f05f036503bf2c31e807d1b75ae22cf2676145e9f20740960a1c9575ea3065c6fb9f44f6b46163aab76eac513694ffa10de674e3cdd6219e
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.22.15"
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.22.15, @babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.24.1"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10/ec5fddc8db6de0e0082a883f21141d6f4f9f9f0bc190d662a732b5e9a506aae5d7d2337049a1bf055d7cb7add6f128036db6d4f47de5e9ac1be29e043c8b7ca8
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.22.15, @babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
-    "@babel/plugin-transform-optional-chaining": ^7.22.15
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.24.1"
   peerDependencies:
     "@babel/core": ^7.13.0
-  checksum: fbefedc0da014c37f1a50a8094ce7dbbf2181ae93243f23d6ecba2499b5b20196c2124d6a4dfe3e9e0125798e80593103e456352a4beb4e5c6f7c75efb80fdac
+  checksum: 10/e18235463e716ac2443938aaec3c18b40c417a1746fba0fa4c26cf4d71326b76ef26c002081ab1b445abfae98e063d561519aa55672dddc1ef80b3940211ffbb
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-class-properties@npm:7.18.6, @babel/plugin-proposal-class-properties@npm:^7.13.0":
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.24.1"
+  dependencies:
+    "@babel/helper-environment-visitor": "npm:^7.22.20"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10/3483f329bb099b438d05e5e206229ddbc1703972a69ba0240a796b5477369930b0ab2e7f6c9539ecad2cea8b0c08fa65498778b92cf87ad3d156f613de1fd2fa
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-proposal-class-properties@npm:^7.13.0":
   version: 7.18.6
   resolution: "@babel/plugin-proposal-class-properties@npm:7.18.6"
   dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
+    "@babel/helper-create-class-features-plugin": "npm:^7.18.6"
+    "@babel/helper-plugin-utils": "npm:^7.18.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 49a78a2773ec0db56e915d9797e44fd079ab8a9b2e1716e0df07c92532f2c65d76aeda9543883916b8e0ff13606afeffa67c5b93d05b607bc87653ad18a91422
+  checksum: 10/49a78a2773ec0db56e915d9797e44fd079ab8a9b2e1716e0df07c92532f2c65d76aeda9543883916b8e0ff13606afeffa67c5b93d05b607bc87653ad18a91422
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-nullish-coalescing-operator@npm:7.18.6, @babel/plugin-proposal-nullish-coalescing-operator@npm:^7.13.8":
-  version: 7.18.6
-  resolution: "@babel/plugin-proposal-nullish-coalescing-operator@npm:7.18.6"
+"@babel/plugin-proposal-export-namespace-from@npm:^7.18.9":
+  version: 7.18.9
+  resolution: "@babel/plugin-proposal-export-namespace-from@npm:7.18.9"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-    "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
+    "@babel/helper-plugin-utils": "npm:^7.18.9"
+    "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 949c9ddcdecdaec766ee610ef98f965f928ccc0361dd87cf9f88cf4896a6ccd62fce063d4494778e50da99dea63d270a1be574a62d6ab81cbe9d85884bf55a7d
+  checksum: 10/84ff22bacc5d30918a849bfb7e0e90ae4c5b8d8b65f2ac881803d1cf9068dffbe53bd657b0e4bc4c20b4db301b1c85f1e74183cf29a0dd31e964bd4e97c363ef
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-object-rest-spread@npm:7.20.7":
-  version: 7.20.7
-  resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.20.7"
+"@babel/plugin-proposal-nullish-coalescing-operator@npm:^7.13.8":
+  version: 7.18.6
+  resolution: "@babel/plugin-proposal-nullish-coalescing-operator@npm:7.18.6"
   dependencies:
-    "@babel/compat-data": ^7.20.5
-    "@babel/helper-compilation-targets": ^7.20.7
-    "@babel/helper-plugin-utils": ^7.20.2
-    "@babel/plugin-syntax-object-rest-spread": ^7.8.3
-    "@babel/plugin-transform-parameters": ^7.20.7
+    "@babel/helper-plugin-utils": "npm:^7.18.6"
+    "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 1329db17009964bc644484c660eab717cb3ca63ac0ab0f67c651a028d1bc2ead51dc4064caea283e46994f1b7221670a35cbc0b4beb6273f55e915494b5aa0b2
+  checksum: 10/949c9ddcdecdaec766ee610ef98f965f928ccc0361dd87cf9f88cf4896a6ccd62fce063d4494778e50da99dea63d270a1be574a62d6ab81cbe9d85884bf55a7d
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-optional-chaining@npm:7.21.0, @babel/plugin-proposal-optional-chaining@npm:^7.13.12":
+"@babel/plugin-proposal-optional-chaining@npm:^7.13.12":
   version: 7.21.0
   resolution: "@babel/plugin-proposal-optional-chaining@npm:7.21.0"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.20.2
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.20.0
-    "@babel/plugin-syntax-optional-chaining": ^7.8.3
+    "@babel/helper-plugin-utils": "npm:^7.20.2"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.20.0"
+    "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 11c5449e01b18bb8881e8e005a577fa7be2fe5688e2382c8822d51f8f7005342a301a46af7b273b1f5645f9a7b894c428eee8526342038a275ef6ba4c8d8d746
+  checksum: 10/522cd133aff5c94c0ef36ff83c64f03deee183815da68b65b6950e81972ace3b514e032df07ea76d0f9ec8cc7a49578092907adfa17fccb4612117557c04a882
   languageName: node
   linkType: hard
 
@@ -442,7 +570,7 @@ __metadata:
   resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.21.0-placeholder-for-preset-env.2"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: d97745d098b835d55033ff3a7fb2b895b9c5295b08a5759e4f20df325aa385a3e0bc9bd5ad8f2ec554a44d4e6525acfc257b8c5848a1345cb40f26a30e277e91
+  checksum: 10/fab70f399aa869275690ec6c7cedb4ef361d4e8b6f55c3d7b04bfee61d52fb93c87cec2c65d73cddbaca89fb8ef5ec0921fce675c9169d9d51f18305ab34e78a
   languageName: node
   linkType: hard
 
@@ -450,10 +578,10 @@ __metadata:
   version: 7.8.4
   resolution: "@babel/plugin-syntax-async-generators@npm:7.8.4"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.8.0
+    "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 7ed1c1d9b9e5b64ef028ea5e755c0be2d4e5e4e3d6cf7df757b9a8c4cfa4193d268176d0f1f7fbecdda6fe722885c7fda681f480f3741d8a2d26854736f05367
+  checksum: 10/7ed1c1d9b9e5b64ef028ea5e755c0be2d4e5e4e3d6cf7df757b9a8c4cfa4193d268176d0f1f7fbecdda6fe722885c7fda681f480f3741d8a2d26854736f05367
   languageName: node
   linkType: hard
 
@@ -461,10 +589,10 @@ __metadata:
   version: 7.8.3
   resolution: "@babel/plugin-syntax-bigint@npm:7.8.3"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.8.0
+    "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3a10849d83e47aec50f367a9e56a6b22d662ddce643334b087f9828f4c3dd73bdc5909aaeabe123fed78515767f9ca43498a0e621c438d1cd2802d7fae3c9648
+  checksum: 10/3a10849d83e47aec50f367a9e56a6b22d662ddce643334b087f9828f4c3dd73bdc5909aaeabe123fed78515767f9ca43498a0e621c438d1cd2802d7fae3c9648
   languageName: node
   linkType: hard
 
@@ -472,10 +600,10 @@ __metadata:
   version: 7.12.13
   resolution: "@babel/plugin-syntax-class-properties@npm:7.12.13"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.12.13
+    "@babel/helper-plugin-utils": "npm:^7.12.13"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 24f34b196d6342f28d4bad303612d7ff566ab0a013ce89e775d98d6f832969462e7235f3e7eaf17678a533d4be0ba45d3ae34ab4e5a9dcbda5d98d49e5efa2fc
+  checksum: 10/24f34b196d6342f28d4bad303612d7ff566ab0a013ce89e775d98d6f832969462e7235f3e7eaf17678a533d4be0ba45d3ae34ab4e5a9dcbda5d98d49e5efa2fc
   languageName: node
   linkType: hard
 
@@ -483,21 +611,21 @@ __metadata:
   version: 7.14.5
   resolution: "@babel/plugin-syntax-class-static-block@npm:7.14.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
+    "@babel/helper-plugin-utils": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3e80814b5b6d4fe17826093918680a351c2d34398a914ce6e55d8083d72a9bdde4fbaf6a2dcea0e23a03de26dc2917ae3efd603d27099e2b98380345703bf948
+  checksum: 10/3e80814b5b6d4fe17826093918680a351c2d34398a914ce6e55d8083d72a9bdde4fbaf6a2dcea0e23a03de26dc2917ae3efd603d27099e2b98380345703bf948
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-dynamic-import@npm:7.8.3, @babel/plugin-syntax-dynamic-import@npm:^7.8.3":
+"@babel/plugin-syntax-dynamic-import@npm:^7.8.3":
   version: 7.8.3
   resolution: "@babel/plugin-syntax-dynamic-import@npm:7.8.3"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.8.0
+    "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: ce307af83cf433d4ec42932329fad25fa73138ab39c7436882ea28742e1c0066626d224e0ad2988724c82644e41601cef607b36194f695cb78a1fcdc959637bd
+  checksum: 10/ce307af83cf433d4ec42932329fad25fa73138ab39c7436882ea28742e1c0066626d224e0ad2988724c82644e41601cef607b36194f695cb78a1fcdc959637bd
   languageName: node
   linkType: hard
 
@@ -505,10 +633,10 @@ __metadata:
   version: 7.8.3
   resolution: "@babel/plugin-syntax-export-namespace-from@npm:7.8.3"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.8.3
+    "@babel/helper-plugin-utils": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 85740478be5b0de185228e7814451d74ab8ce0a26fcca7613955262a26e99e8e15e9da58f60c754b84515d4c679b590dbd3f2148f0f58025f4ae706f1c5a5d4a
+  checksum: 10/85740478be5b0de185228e7814451d74ab8ce0a26fcca7613955262a26e99e8e15e9da58f60c754b84515d4c679b590dbd3f2148f0f58025f4ae706f1c5a5d4a
   languageName: node
   linkType: hard
 
@@ -516,32 +644,32 @@ __metadata:
   version: 7.22.5
   resolution: "@babel/plugin-syntax-flow@npm:7.22.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 84c8c40fcfe8e78cecdd6fb90e8f97f419e3f3b27a33de8324ae97d5ce1b87cdd98a636fa21a68d4d2c37c7d63f3a279bb84b6956b849921affed6b806b6ffe7
+  checksum: 10/84c8c40fcfe8e78cecdd6fb90e8f97f419e3f3b27a33de8324ae97d5ce1b87cdd98a636fa21a68d4d2c37c7d63f3a279bb84b6956b849921affed6b806b6ffe7
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-import-assertions@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-syntax-import-assertions@npm:7.22.5"
+"@babel/plugin-syntax-import-assertions@npm:^7.22.5, @babel/plugin-syntax-import-assertions@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-syntax-import-assertions@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 2b8b5572db04a7bef1e6cd20debf447e4eef7cb012616f5eceb8fa3e23ce469b8f76ee74fd6d1e158ba17a8f58b0aec579d092fb67c5a30e83ccfbc5754916c1
+  checksum: 10/2a463928a63b62052e9fb8f8b0018aa11a926e94f32c168260ae012afe864875c6176c6eb361e13f300542c31316dad791b08a5b8ed92436a3095c7a0e4fce65
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-import-attributes@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-syntax-import-attributes@npm:7.22.5"
+"@babel/plugin-syntax-import-attributes@npm:^7.22.5, @babel/plugin-syntax-import-attributes@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-syntax-import-attributes@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 197b3c5ea2a9649347f033342cb222ab47f4645633695205c0250c6bf2af29e643753b8bb24a2db39948bef08e7c540babfd365591eb57fc110cb30b425ffc47
+  checksum: 10/87c8aa4a5ef931313f956871b27f2c051556f627b97ed21e9a5890ca4906b222d89062a956cde459816f5e0dec185ff128d7243d3fdc389504522acb88f0464e
   languageName: node
   linkType: hard
 
@@ -549,10 +677,10 @@ __metadata:
   version: 7.10.4
   resolution: "@babel/plugin-syntax-import-meta@npm:7.10.4"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.10.4
+    "@babel/helper-plugin-utils": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 166ac1125d10b9c0c430e4156249a13858c0366d38844883d75d27389621ebe651115cb2ceb6dc011534d5055719fa1727b59f39e1ab3ca97820eef3dcab5b9b
+  checksum: 10/166ac1125d10b9c0c430e4156249a13858c0366d38844883d75d27389621ebe651115cb2ceb6dc011534d5055719fa1727b59f39e1ab3ca97820eef3dcab5b9b
   languageName: node
   linkType: hard
 
@@ -560,21 +688,21 @@ __metadata:
   version: 7.8.3
   resolution: "@babel/plugin-syntax-json-strings@npm:7.8.3"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.8.0
+    "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: bf5aea1f3188c9a507e16efe030efb996853ca3cadd6512c51db7233cc58f3ac89ff8c6bdfb01d30843b161cfe7d321e1bf28da82f7ab8d7e6bc5464666f354a
+  checksum: 10/bf5aea1f3188c9a507e16efe030efb996853ca3cadd6512c51db7233cc58f3ac89ff8c6bdfb01d30843b161cfe7d321e1bf28da82f7ab8d7e6bc5464666f354a
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-jsx@npm:^7.22.5, @babel/plugin-syntax-jsx@npm:^7.7.2":
-  version: 7.22.5
-  resolution: "@babel/plugin-syntax-jsx@npm:7.22.5"
+"@babel/plugin-syntax-jsx@npm:^7.22.5, @babel/plugin-syntax-jsx@npm:^7.23.3, @babel/plugin-syntax-jsx@npm:^7.7.2":
+  version: 7.24.1
+  resolution: "@babel/plugin-syntax-jsx@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 8829d30c2617ab31393d99cec2978e41f014f4ac6f01a1cecf4c4dd8320c3ec12fdc3ce121126b2d8d32f6887e99ca1a0bad53dedb1e6ad165640b92b24980ce
+  checksum: 10/712f7e7918cb679f106769f57cfab0bc99b311032665c428b98f4c3e2e6d567601d45386a4f246df6a80d741e1f94192b3f008800d66c4f1daae3ad825c243f0
   languageName: node
   linkType: hard
 
@@ -582,10 +710,10 @@ __metadata:
   version: 7.10.4
   resolution: "@babel/plugin-syntax-logical-assignment-operators@npm:7.10.4"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.10.4
+    "@babel/helper-plugin-utils": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: aff33577037e34e515911255cdbb1fd39efee33658aa00b8a5fd3a4b903585112d037cce1cc9e4632f0487dc554486106b79ccd5ea63a2e00df4363f6d4ff886
+  checksum: 10/aff33577037e34e515911255cdbb1fd39efee33658aa00b8a5fd3a4b903585112d037cce1cc9e4632f0487dc554486106b79ccd5ea63a2e00df4363f6d4ff886
   languageName: node
   linkType: hard
 
@@ -593,10 +721,10 @@ __metadata:
   version: 7.8.3
   resolution: "@babel/plugin-syntax-nullish-coalescing-operator@npm:7.8.3"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.8.0
+    "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 87aca4918916020d1fedba54c0e232de408df2644a425d153be368313fdde40d96088feed6c4e5ab72aac89be5d07fef2ddf329a15109c5eb65df006bf2580d1
+  checksum: 10/87aca4918916020d1fedba54c0e232de408df2644a425d153be368313fdde40d96088feed6c4e5ab72aac89be5d07fef2ddf329a15109c5eb65df006bf2580d1
   languageName: node
   linkType: hard
 
@@ -604,10 +732,10 @@ __metadata:
   version: 7.10.4
   resolution: "@babel/plugin-syntax-numeric-separator@npm:7.10.4"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.10.4
+    "@babel/helper-plugin-utils": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 01ec5547bd0497f76cc903ff4d6b02abc8c05f301c88d2622b6d834e33a5651aa7c7a3d80d8d57656a4588f7276eba357f6b7e006482f5b564b7a6488de493a1
+  checksum: 10/01ec5547bd0497f76cc903ff4d6b02abc8c05f301c88d2622b6d834e33a5651aa7c7a3d80d8d57656a4588f7276eba357f6b7e006482f5b564b7a6488de493a1
   languageName: node
   linkType: hard
 
@@ -615,10 +743,10 @@ __metadata:
   version: 7.8.3
   resolution: "@babel/plugin-syntax-object-rest-spread@npm:7.8.3"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.8.0
+    "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: fddcf581a57f77e80eb6b981b10658421bc321ba5f0a5b754118c6a92a5448f12a0c336f77b8abf734841e102e5126d69110a306eadb03ca3e1547cab31f5cbf
+  checksum: 10/fddcf581a57f77e80eb6b981b10658421bc321ba5f0a5b754118c6a92a5448f12a0c336f77b8abf734841e102e5126d69110a306eadb03ca3e1547cab31f5cbf
   languageName: node
   linkType: hard
 
@@ -626,10 +754,10 @@ __metadata:
   version: 7.8.3
   resolution: "@babel/plugin-syntax-optional-catch-binding@npm:7.8.3"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.8.0
+    "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 910d90e72bc90ea1ce698e89c1027fed8845212d5ab588e35ef91f13b93143845f94e2539d831dc8d8ededc14ec02f04f7bd6a8179edd43a326c784e7ed7f0b9
+  checksum: 10/910d90e72bc90ea1ce698e89c1027fed8845212d5ab588e35ef91f13b93143845f94e2539d831dc8d8ededc14ec02f04f7bd6a8179edd43a326c784e7ed7f0b9
   languageName: node
   linkType: hard
 
@@ -637,10 +765,10 @@ __metadata:
   version: 7.8.3
   resolution: "@babel/plugin-syntax-optional-chaining@npm:7.8.3"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.8.0
+    "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: eef94d53a1453361553c1f98b68d17782861a04a392840341bc91780838dd4e695209c783631cf0de14c635758beafb6a3a65399846ffa4386bff90639347f30
+  checksum: 10/eef94d53a1453361553c1f98b68d17782861a04a392840341bc91780838dd4e695209c783631cf0de14c635758beafb6a3a65399846ffa4386bff90639347f30
   languageName: node
   linkType: hard
 
@@ -648,10 +776,10 @@ __metadata:
   version: 7.14.5
   resolution: "@babel/plugin-syntax-private-property-in-object@npm:7.14.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
+    "@babel/helper-plugin-utils": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: b317174783e6e96029b743ccff2a67d63d38756876e7e5d0ba53a322e38d9ca452c13354a57de1ad476b4c066dbae699e0ca157441da611117a47af88985ecda
+  checksum: 10/b317174783e6e96029b743ccff2a67d63d38756876e7e5d0ba53a322e38d9ca452c13354a57de1ad476b4c066dbae699e0ca157441da611117a47af88985ecda
   languageName: node
   linkType: hard
 
@@ -659,10 +787,10 @@ __metadata:
   version: 7.14.5
   resolution: "@babel/plugin-syntax-top-level-await@npm:7.14.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
+    "@babel/helper-plugin-utils": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: bbd1a56b095be7820029b209677b194db9b1d26691fe999856462e66b25b281f031f3dfd91b1619e9dcf95bebe336211833b854d0fb8780d618e35667c2d0d7e
+  checksum: 10/bbd1a56b095be7820029b209677b194db9b1d26691fe999856462e66b25b281f031f3dfd91b1619e9dcf95bebe336211833b854d0fb8780d618e35667c2d0d7e
   languageName: node
   linkType: hard
 
@@ -670,10 +798,10 @@ __metadata:
   version: 7.22.5
   resolution: "@babel/plugin-syntax-typescript@npm:7.22.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 8ab7718fbb026d64da93681a57797d60326097fd7cb930380c8bffd9eb101689e90142c760a14b51e8e69c88a73ba3da956cb4520a3b0c65743aee5c71ef360a
+  checksum: 10/8ab7718fbb026d64da93681a57797d60326097fd7cb930380c8bffd9eb101689e90142c760a14b51e8e69c88a73ba3da956cb4520a3b0c65743aee5c71ef360a
   languageName: node
   linkType: hard
 
@@ -681,646 +809,628 @@ __metadata:
   version: 7.18.6
   resolution: "@babel/plugin-syntax-unicode-sets-regex@npm:7.18.6"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.18.6"
+    "@babel/helper-plugin-utils": "npm:^7.18.6"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: a651d700fe63ff0ddfd7186f4ebc24447ca734f114433139e3c027bc94a900d013cf1ef2e2db8430425ba542e39ae160c3b05f06b59fd4656273a3df97679e9c
+  checksum: 10/a651d700fe63ff0ddfd7186f4ebc24447ca734f114433139e3c027bc94a900d013cf1ef2e2db8430425ba542e39ae160c3b05f06b59fd4656273a3df97679e9c
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-arrow-functions@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-arrow-functions@npm:7.22.5"
+"@babel/plugin-transform-arrow-functions@npm:^7.22.5, @babel/plugin-transform-arrow-functions@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-arrow-functions@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 35abb6c57062802c7ce8bd96b2ef2883e3124370c688bbd67609f7d2453802fb73944df8808f893b6c67de978eb2bcf87bbfe325e46d6f39b5fcb09ece11d01a
+  checksum: 10/58f9aa9b0de8382f8cfa3f1f1d40b69d98cd2f52340e2391733d0af745fdddda650ba392e509bc056157c880a2f52834a38ab2c5aa5569af8c61bb6ecbf45f34
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-generator-functions@npm:^7.23.2":
-  version: 7.23.2
-  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.2"
+"@babel/plugin-transform-async-generator-functions@npm:^7.23.2, @babel/plugin-transform-async-generator-functions@npm:^7.24.3":
+  version: 7.24.3
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.24.3"
   dependencies:
-    "@babel/helper-environment-visitor": ^7.22.20
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-remap-async-to-generator": ^7.22.20
-    "@babel/plugin-syntax-async-generators": ^7.8.4
+    "@babel/helper-environment-visitor": "npm:^7.22.20"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-remap-async-to-generator": "npm:^7.22.20"
+    "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: e1abae0edcda7304d7c17702ac25a127578791b89c4f767d60589249fa3e50ec33f8c9ff39d3d8d41f00b29947654eaddd4fd586e04c4d598122db745fab2868
+  checksum: 10/4ccc3755a3d51544cd43575db2c5c2ef42cdcd35bd5940d13cdf23f04c75496290e79ea585a62427ec6bd508a1bffb329e01556cd1114be9b38ae4254935cd19
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-to-generator@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-async-to-generator@npm:7.22.5"
+"@babel/plugin-transform-async-to-generator@npm:^7.22.5, @babel/plugin-transform-async-to-generator@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-async-to-generator@npm:7.24.1"
   dependencies:
-    "@babel/helper-module-imports": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-remap-async-to-generator": ^7.22.5
+    "@babel/helper-module-imports": "npm:^7.24.1"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-remap-async-to-generator": "npm:^7.22.20"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: b95f23f99dcb379a9f0a1c2a3bbea3f8dc0e1b16dc1ac8b484fe378370169290a7a63d520959a9ba1232837cf74a80e23f6facbe14fd42a3cda6d3c2d7168e62
+  checksum: 10/429004a6596aa5c9e707b604156f49a146f8d029e31a3152b1649c0b56425264fda5fd38e5db1ddaeb33c3fe45c97dc8078d7abfafe3542a979b49f229801135
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoped-functions@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.22.5"
+"@babel/plugin-transform-block-scoped-functions@npm:^7.22.5, @babel/plugin-transform-block-scoped-functions@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 416b1341858e8ca4e524dee66044735956ced5f478b2c3b9bc11ec2285b0c25d7dbb96d79887169eb938084c95d0a89338c8b2fe70d473bd9dc92e5d9db1732c
+  checksum: 10/d8e18bd57b156da1cd4d3c1780ab9ea03afed56c6824ca8e6e74f67959d7989a0e953ec370fe9b417759314f2eef30c8c437395ce63ada2e26c2f469e4704f82
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoping@npm:^7.23.0":
-  version: 7.23.0
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.23.0"
+"@babel/plugin-transform-block-scoping@npm:^7.23.0, @babel/plugin-transform-block-scoping@npm:^7.24.4":
+  version: 7.24.4
+  resolution: "@babel/plugin-transform-block-scoping@npm:7.24.4"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 0cfe925cc3b5a3ad407e2253fab3ceeaa117a4b291c9cb245578880872999bca91bd83ffa0128ae9ca356330702e1ef1dcb26804f28d2cef678239caf629f73e
+  checksum: 10/4093fa109cd256e8ad0b26e3ffa67ec6dac4078a1a24b7755bed63e650cf938b2a315e01696c35b221db1a37606f93cb82696c8d1bf563c2a9845620e551736e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-properties@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-class-properties@npm:7.22.5"
+"@babel/plugin-transform-block-scoping@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-block-scoping@npm:7.24.1"
   dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: b830152dfc2ff2f647f0abe76e6251babdfbef54d18c4b2c73a6bf76b1a00050a5d998dac80dc901a48514e95604324943a9dd39317073fe0928b559e0e0c579
+  checksum: 10/443069c6410079c007c40425254a5d0416e4fefe38c1cb354884694a3029dfa6ea8c196398726d2bd4ec3e5c4559ef85efc1ad0b068f1330df4aa03b414781e0
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-static-block@npm:^7.22.11":
-  version: 7.22.11
-  resolution: "@babel/plugin-transform-class-static-block@npm:7.22.11"
+"@babel/plugin-transform-class-properties@npm:^7.22.5, @babel/plugin-transform-class-properties@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-class-properties@npm:7.24.1"
   dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.22.11
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-class-static-block": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.12.0
-  checksum: 69f040506fad66f1c6918d288d0e0edbc5c8a07c8b4462c1184ad2f9f08995d68b057126c213871c0853ae0c72afc60ec87492049dfacb20902e32346a448bcb
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-classes@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/plugin-transform-classes@npm:7.22.15"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-compilation-targets": ^7.22.15
-    "@babel/helper-environment-visitor": ^7.22.5
-    "@babel/helper-function-name": ^7.22.5
-    "@babel/helper-optimise-call-expression": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-replace-supers": ^7.22.9
-    "@babel/helper-split-export-declaration": ^7.22.6
-    globals: ^11.1.0
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.1"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: d3f4d0c107dd8a3557ea3575cc777fab27efa92958b41e4a9822f7499725c1f554beae58855de16ddec0a7b694e45f59a26cea8fbde4275563f72f09c6e039a0
+  checksum: 10/95779e9eef0c0638b9631c297d48aee53ffdbb2b1b5221bf40d7eccd566a8e34f859ff3571f8f20b9159b67f1bff7d7dc81da191c15d69fbae5a645197eae7e0
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-computed-properties@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-computed-properties@npm:7.22.5"
+"@babel/plugin-transform-class-static-block@npm:^7.22.11, @babel/plugin-transform-class-static-block@npm:^7.24.4":
+  version: 7.24.4
+  resolution: "@babel/plugin-transform-class-static-block@npm:7.24.4"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/template": ^7.22.5
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.4"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
   peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: c2a77a0f94ec71efbc569109ec14ea2aa925b333289272ced8b33c6108bdbb02caf01830ffc7e49486b62dec51911924d13f3a76f1149f40daace1898009e131
+    "@babel/core": ^7.12.0
+  checksum: 10/3b1db3308b57ba21d47772a9f183804234c23fd64c9ca40915d2d65c5dc7a48b49a6de16b8b90b7a354eacbb51232a862f0fca3dbd23e27d34641f511decddab
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-destructuring@npm:^7.23.0":
-  version: 7.23.0
-  resolution: "@babel/plugin-transform-destructuring@npm:7.23.0"
+"@babel/plugin-transform-class-static-block@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-class-static-block@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.1"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
   peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: cd6dd454ccc2766be551e4f8a04b1acc2aa539fa19e5c7501c56cc2f8cc921dd41a7ffb78455b4c4b2f954fcab8ca4561ba7c9c7bd5af9f19465243603d18cc3
+    "@babel/core": ^7.12.0
+  checksum: 10/253c627c11d9df79e3b32e78bfa1fe0dd1f91c3579da52bf73f76c83de53b140dcb1c9cc5f4c65ff1505754a01b59bc83987c35bcc8f89492b63dae46adef78f
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-dotall-regex@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-dotall-regex@npm:7.22.5"
+"@babel/plugin-transform-classes@npm:^7.22.15, @babel/plugin-transform-classes@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-classes@npm:7.24.1"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
+    "@babel/helper-compilation-targets": "npm:^7.23.6"
+    "@babel/helper-environment-visitor": "npm:^7.22.20"
+    "@babel/helper-function-name": "npm:^7.23.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-replace-supers": "npm:^7.24.1"
+    "@babel/helper-split-export-declaration": "npm:^7.22.6"
+    globals: "npm:^11.1.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 409b658d11e3082c8f69e9cdef2d96e4d6d11256f005772425fb230cc48fd05945edbfbcb709dab293a1a2f01f9c8a5bb7b4131e632b23264039d9f95864b453
+  checksum: 10/eb7f4a3d852cfa20f4efd299929c564bd2b45106ac1cf4ac8b0c87baf078d4a15c39b8a21bbb01879c1922acb9baaf3c9b150486e18d84b30129e9671639793d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-duplicate-keys@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.22.5"
+"@babel/plugin-transform-computed-properties@npm:^7.22.5, @babel/plugin-transform-computed-properties@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-computed-properties@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/template": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: bb1280fbabaab6fab2ede585df34900712698210a3bd413f4df5bae6d8c24be36b496c92722ae676a7a67d060a4624f4d6c23b923485f906bfba8773c69f55b4
+  checksum: 10/62bbfe1bd508517d96ba6909e68b1adb9dfd24ea61af1f4b0aa909bfc5e476044afe9c55b10ef74508fd147aa665e818df67ece834d164a9fd69b80c9ede3875
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-dynamic-import@npm:^7.22.11":
-  version: 7.22.11
-  resolution: "@babel/plugin-transform-dynamic-import@npm:7.22.11"
+"@babel/plugin-transform-destructuring@npm:^7.23.0, @babel/plugin-transform-destructuring@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-destructuring@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-dynamic-import": ^7.8.3
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 78fc9c532210bf9e8f231747f542318568ac360ee6c27e80853962c984283c73da3f8f8aebe83c2096090a435b356b092ed85de617a156cbe0729d847632be45
+  checksum: 10/03d9a81cd9eeb24d48e207be536d460d6ad228238ac70da9b7ad4bae799847bb3be0aecfa4ea6223752f3a8d4ada3a58cd9a0f8fc70c01fdfc87ad0618f897d3
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-exponentiation-operator@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.22.5"
+"@babel/plugin-transform-dotall-regex@npm:^7.22.5, @babel/plugin-transform-dotall-regex@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-dotall-regex@npm:7.24.1"
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.22.15"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: f2d660c1b1d51ad5fec1cd5ad426a52187204068c4158f8c4aa977b31535c61b66898d532603eef21c15756827be8277f724c869b888d560f26d7fe848bb5eae
+  checksum: 10/7f623d25b6f213b94ebc1754e9e31c1077c8e288626d8b7bfa76a97b067ce80ddcd0ede402a546706c65002c0ccf45cd5ec621511c2668eed31ebcabe8391d35
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-export-namespace-from@npm:^7.22.11":
-  version: 7.22.11
-  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.22.11"
+"@babel/plugin-transform-duplicate-keys@npm:^7.22.5, @babel/plugin-transform-duplicate-keys@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-export-namespace-from": ^7.8.3
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 73af5883a321ed56a4bfd43c8a7de0164faebe619287706896fc6ee2f7a4e69042adaa1338c0b8b4bdb9f7e5fdceb016fb1d40694cb43ca3b8827429e8aac4bf
+  checksum: 10/de600a958ad146fc8aca71fd2dfa5ebcfdb97df4eaa530fc9a4b0d28d85442ddb9b7039f260b396785211e88c6817125a94c183459763c363847e8c84f318ff0
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-flow-strip-types@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-flow-strip-types@npm:7.22.5"
+"@babel/plugin-transform-dynamic-import@npm:^7.22.11, @babel/plugin-transform-dynamic-import@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-dynamic-import@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-flow": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 1ba48187d6f33814be01c6870489f0b1858256cf2b9dd7e62f02af8b30049bf375112f1d44692c5fed3cb9cd26ee2fb32e358cd79b6ad2360a51e8f993e861bf
+  checksum: 10/59fc561ee40b1a69f969c12c6c5fac206226d6642213985a569dd0f99f8e41c0f4eaedebd36936c255444a8335079842274c42a975a433beadb436d4c5abb79b
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-for-of@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/plugin-transform-for-of@npm:7.22.15"
+"@babel/plugin-transform-exponentiation-operator@npm:^7.22.5, @babel/plugin-transform-exponentiation-operator@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-builder-binary-assignment-operator-visitor": "npm:^7.22.15"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: f395ae7bce31e14961460f56cf751b5d6e37dd27d7df5b1f4e49fec1c11b6f9cf71991c7ffbe6549878591e87df0d66af798cf26edfa4bfa6b4c3dba1fb2f73a
+  checksum: 10/f90841fe1a1e9f680b4209121d3e2992f923e85efcd322b26e5901c180ef44ff727fb89790803a23fac49af34c1ce2e480018027c22b4573b615512ac5b6fc50
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-function-name@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-function-name@npm:7.22.5"
+"@babel/plugin-transform-export-namespace-from@npm:^7.22.11, @babel/plugin-transform-export-namespace-from@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.24.1"
   dependencies:
-    "@babel/helper-compilation-targets": ^7.22.5
-    "@babel/helper-function-name": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: cff3b876357999cb8ae30e439c3ec6b0491a53b0aa6f722920a4675a6dd5b53af97a833051df4b34791fe5b3dd326ccf769d5c8e45b322aa50ee11a660b17845
+  checksum: 10/bc710ac231919df9555331885748385c11c5e695d7271824fe56fba51dd637d48d3e5cd52e1c69f2b1a384fbbb41552572bc1ca3a2285ee29571f002e9bb2421
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-json-strings@npm:^7.22.11":
-  version: 7.22.11
-  resolution: "@babel/plugin-transform-json-strings@npm:7.22.11"
+"@babel/plugin-transform-flow-strip-types@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-flow-strip-types@npm:7.22.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-json-strings": ^7.8.3
+    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/plugin-syntax-flow": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 50665e5979e66358c50e90a26db53c55917f78175127ac2fa05c7888d156d418ffb930ec0a109353db0a7c5f57c756ce01bfc9825d24cbfd2b3ec453f2ed8cba
+  checksum: 10/0657042178061517cd5641a9a5eed1251aa1d8cf93a4111568ae663773854a1e8f6af167ecae042237d261389751dc5ee32ba12a15e65e41af29d04150005cab
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-literals@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-literals@npm:7.22.5"
+"@babel/plugin-transform-for-of@npm:^7.22.15, @babel/plugin-transform-for-of@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-for-of@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: ec37cc2ffb32667af935ab32fe28f00920ec8a1eb999aa6dc6602f2bebd8ba205a558aeedcdccdebf334381d5c57106c61f52332045730393e73410892a9735b
+  checksum: 10/befd0908c3f6b31f9fa9363a3c112d25eaa0bc4a79cfad1f0a8bb5010937188b043a44fb23443bc8ffbcc40c015bb25f80e4cc585ce5cc580708e2d56e76fe37
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-logical-assignment-operators@npm:^7.22.11":
-  version: 7.22.11
-  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.22.11"
+"@babel/plugin-transform-function-name@npm:^7.22.5, @babel/plugin-transform-function-name@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-function-name@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
+    "@babel/helper-compilation-targets": "npm:^7.23.6"
+    "@babel/helper-function-name": "npm:^7.23.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: c664e9798e85afa7f92f07b867682dee7392046181d82f5d21bae6f2ca26dfe9c8375cdc52b7483c3fc09a983c1989f60eff9fbc4f373b0c0a74090553d05739
+  checksum: 10/31eb3c75297dda7265f78eba627c446f2324e30ec0124a645ccc3e9f341254aaa40d6787bd62b2280d77c0a5c9fbfce1da2c200ef7c7f8e0a1b16a8eb3644c6f
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-member-expression-literals@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.22.5"
+"@babel/plugin-transform-json-strings@npm:^7.22.11, @babel/plugin-transform-json-strings@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-json-strings@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: ec4b0e07915ddd4fda0142fd104ee61015c208608a84cfa13643a95d18760b1dc1ceb6c6e0548898b8c49e5959a994e46367260176dbabc4467f729b21868504
+  checksum: 10/f42302d42fc81ac00d14e9e5d80405eb80477d7f9039d7208e712d6bcd486a4e3b32fdfa07b5f027d6c773723d8168193ee880f93b0e430c828e45f104fb82a4
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-amd@npm:^7.23.0":
-  version: 7.23.0
-  resolution: "@babel/plugin-transform-modules-amd@npm:7.23.0"
+"@babel/plugin-transform-literals@npm:^7.22.5, @babel/plugin-transform-literals@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-literals@npm:7.24.1"
   dependencies:
-    "@babel/helper-module-transforms": ^7.23.0
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 5d92875170a37b8282d4bcd805f55829b8fab0f9c8d08b53d32a7a0bfdc62b868e489b52d329ae768ecafc0c993eed0ad7a387baa673ac33211390a9f833ab5d
+  checksum: 10/2df94e9478571852483aca7588419e574d76bde97583e78551c286f498e01321e7dbb1d0ef67bee16e8f950688f79688809cfde370c5c4b84c14d841a3ef217a
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-commonjs@npm:^7.13.8, @babel/plugin-transform-modules-commonjs@npm:^7.23.0":
-  version: 7.23.0
-  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.23.0"
+"@babel/plugin-transform-logical-assignment-operators@npm:^7.22.11, @babel/plugin-transform-logical-assignment-operators@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.24.1"
   dependencies:
-    "@babel/helper-module-transforms": ^7.23.0
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-simple-access": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 7fb25997194053e167c4207c319ff05362392da841bd9f42ddb3caf9c8798a5d203bd926d23ddf5830fdf05eddc82c2810f40d1287e3a4f80b07eff13d1024b5
+  checksum: 10/895f2290adf457cbf327428bdb4fb90882a38a22f729bcf0629e8ad66b9b616d2721fbef488ac00411b647489d1dda1d20171bb3772d0796bb7ef5ecf057808a
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-systemjs@npm:^7.23.0":
-  version: 7.23.0
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.23.0"
+"@babel/plugin-transform-member-expression-literals@npm:^7.22.5, @babel/plugin-transform-member-expression-literals@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.24.1"
   dependencies:
-    "@babel/helper-hoist-variables": ^7.22.5
-    "@babel/helper-module-transforms": ^7.23.0
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-validator-identifier": ^7.22.20
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 2d481458b22605046badea2317d5cc5c94ac3031c2293e34c96f02063f5b02af0979c4da6a8fbc67cc249541575dc9c6d710db6b919ede70b7337a22d9fd57a7
+  checksum: 10/4ea641cc14a615f9084e45ad2319f95e2fee01c77ec9789685e7e11a6c286238a426a98f9c1ed91568a047d8ac834393e06e8c82d1ff01764b7aa61bee8e9023
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-umd@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-modules-umd@npm:7.22.5"
+"@babel/plugin-transform-modules-amd@npm:^7.23.0, @babel/plugin-transform-modules-amd@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-modules-amd@npm:7.24.1"
   dependencies:
-    "@babel/helper-module-transforms": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-module-transforms": "npm:^7.23.3"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 46622834c54c551b231963b867adbc80854881b3e516ff29984a8da989bd81665bd70e8cba6710345248e97166689310f544aee1a5773e262845a8f1b3e5b8b4
+  checksum: 10/5a324f7c630cf0be1f09098a3a36248c2521622f2c7ea1a44a5980f54b718f5e0dd4af92a337f4b445a8824c8d533853ebea7c16de829b8a7bc8bcca127d4d73
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.22.5"
+"@babel/plugin-transform-modules-commonjs@npm:^7.13.8, @babel/plugin-transform-modules-commonjs@npm:^7.22.5, @babel/plugin-transform-modules-commonjs@npm:^7.23.0, @babel/plugin-transform-modules-commonjs@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.24.1"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-module-transforms": "npm:^7.23.3"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-simple-access": "npm:^7.22.5"
   peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 3ee564ddee620c035b928fdc942c5d17e9c4b98329b76f9cefac65c111135d925eb94ed324064cd7556d4f5123beec79abea1d4b97d1c8a2a5c748887a2eb623
+    "@babel/core": ^7.0.0-0
+  checksum: 10/7326a62ed5f766f93ee75684868635b59884e2801533207ea11561c296de53037949fecad4055d828fa7ebeb6cc9e55908aa3e7c13f930ded3e62ad9f24680d7
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-new-target@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-new-target@npm:7.22.5"
+"@babel/plugin-transform-modules-systemjs@npm:^7.23.0, @babel/plugin-transform-modules-systemjs@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-hoist-variables": "npm:^7.22.5"
+    "@babel/helper-module-transforms": "npm:^7.23.3"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-validator-identifier": "npm:^7.22.20"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 6b72112773487a881a1d6ffa680afde08bad699252020e86122180ee7a88854d5da3f15d9bca3331cf2e025df045604494a8208a2e63b486266b07c14e2ffbf3
+  checksum: 10/565ec4518037b3d957431e29bda97b3d2fbb2e245fb5ba19889310ccb8fb71353e8ce2c325cc8d3fbc5a376d3af7d7e21782d5f502c46f8da077bee7807a590f
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.11":
-  version: 7.22.11
-  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.22.11"
+"@babel/plugin-transform-modules-umd@npm:^7.22.5, @babel/plugin-transform-modules-umd@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-modules-umd@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
+    "@babel/helper-module-transforms": "npm:^7.23.3"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 167babecc8b8fe70796a7b7d34af667ebbf43da166c21689502e5e8cc93180b7a85979c77c9f64b7cce431b36718bd0a6df9e5e0ffea4ae22afb22cfef886372
+  checksum: 10/323bb9367e1967117a829f67788ec2ff55504b4faf8f6d83ec85d398e50b41cf7d1c375c67d63883dd7ad5e75b35c8ae776d89e422330ec0c0a1fda24e362083
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-numeric-separator@npm:^7.22.11":
-  version: 7.22.11
-  resolution: "@babel/plugin-transform-numeric-separator@npm:7.22.11"
+"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.22.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-numeric-separator": ^7.10.4
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: af064d06a4a041767ec396a5f258103f64785df290e038bba9f0ef454e6c914f2ac45d862bbdad8fac2c7ad47fa4e95356f29053c60c100a0160b02a995fe2a3
+    "@babel/core": ^7.0.0
+  checksum: 10/3ee564ddee620c035b928fdc942c5d17e9c4b98329b76f9cefac65c111135d925eb94ed324064cd7556d4f5123beec79abea1d4b97d1c8a2a5c748887a2eb623
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-rest-spread@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.22.15"
+"@babel/plugin-transform-new-target@npm:^7.22.5, @babel/plugin-transform-new-target@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-new-target@npm:7.24.1"
   dependencies:
-    "@babel/compat-data": ^7.22.9
-    "@babel/helper-compilation-targets": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-object-rest-spread": ^7.8.3
-    "@babel/plugin-transform-parameters": ^7.22.15
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 62197a6f12289c1c1bd57f3bed9f0f765ca32390bfe91e0b5561dd94dd9770f4480c4162dec98da094bc0ba99d2c2ebba68de47c019454041b0b7a68ba2ec66d
+  checksum: 10/e0d3af66cd0fad29c9d0e3fc65e711255e18b77e2e35bbd8f10059e3db7de6c16799ef74e704daf784950feb71e7a93c5bf2c771d98f1ca3fba1ff2e0240b24a
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-super@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-object-super@npm:7.22.5"
+"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.11, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-replace-supers": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: b71887877d74cb64dbccb5c0324fa67e31171e6a5311991f626650e44a4083e5436a1eaa89da78c0474fb095d4ec322d63ee778b202d33aa2e4194e1ed8e62d7
+  checksum: 10/74025e191ceb7cefc619c15d33753aab81300a03d81b96ae249d9b599bc65878f962d608f452462d3aad5d6e334b7ab2b09a6bdcfe8d101fe77ac7aacca4261e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-catch-binding@npm:^7.22.11":
-  version: 7.22.11
-  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.22.11"
+"@babel/plugin-transform-numeric-separator@npm:^7.22.11, @babel/plugin-transform-numeric-separator@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-numeric-separator@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/plugin-syntax-numeric-separator": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: f17abd90e1de67c84d63afea29c8021c74abb2794d3a6eeafb0bbe7372d3db32aefca386e392116ec63884537a4a2815d090d26264d259bacc08f6e3ed05294c
+  checksum: 10/3247bd7d409574fc06c59e0eb573ae7470d6d61ecf780df40b550102bb4406747d8f39dcbec57eb59406df6c565a86edd3b429e396ad02e4ce201ad92050832e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-chaining@npm:^7.22.15, @babel/plugin-transform-optional-chaining@npm:^7.23.0":
-  version: 7.23.0
-  resolution: "@babel/plugin-transform-optional-chaining@npm:7.23.0"
+"@babel/plugin-transform-object-rest-spread@npm:^7.22.15, @babel/plugin-transform-object-rest-spread@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
-    "@babel/plugin-syntax-optional-chaining": ^7.8.3
+    "@babel/helper-compilation-targets": "npm:^7.23.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3"
+    "@babel/plugin-transform-parameters": "npm:^7.24.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: f702634f2b97e5260dbec0d4bde05ccb6f4d96d7bfa946481aeacfa205ca846cb6e096a38312f9d51fdbdac1f258f211138c5f7075952e46a5bf8574de6a1329
+  checksum: 10/ff6eeefbc5497cf33d62dc86b797c6db0e9455d6a4945d6952f3b703d04baab048974c6573b503e0ec097b8112d3b98b5f4ee516e1b8a74ed47aebba4d9d2643
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-parameters@npm:^7.20.7, @babel/plugin-transform-parameters@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/plugin-transform-parameters@npm:7.22.15"
+"@babel/plugin-transform-object-super@npm:^7.22.5, @babel/plugin-transform-object-super@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-object-super@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-replace-supers": "npm:^7.24.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 541188bb7d1876cad87687b5c7daf90f63d8208ae83df24acb1e2b05020ad1c78786b2723ca4054a83fcb74fb6509f30c4cacc5b538ee684224261ad5fb047c1
+  checksum: 10/d34d437456a54e2a5dcb26e9cf09ed4c55528f2a327c5edca92c93e9483c37176e228d00d6e0cf767f3d6fdbef45ae3a5d034a7c59337a009e20ae541c8220fa
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-methods@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-private-methods@npm:7.22.5"
+"@babel/plugin-transform-optional-catch-binding@npm:^7.22.11, @babel/plugin-transform-optional-catch-binding@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.24.1"
   dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 321479b4fcb6d3b3ef622ab22fd24001e43d46e680e8e41324c033d5810c84646e470f81b44cbcbef5c22e99030784f7cac92f1829974da7a47a60a7139082c3
+  checksum: 10/ff7c02449d32a6de41e003abb38537b4a1ad90b1eaa4c0b578cb1b55548201a677588a8c47f3e161c72738400ae811a6673ea7b8a734344755016ca0ac445dac
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-property-in-object@npm:^7.22.11":
-  version: 7.22.11
-  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.22.11"
+"@babel/plugin-transform-optional-chaining@npm:^7.23.0, @babel/plugin-transform-optional-chaining@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.1"
   dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-create-class-features-plugin": ^7.22.11
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-private-property-in-object": ^7.14.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
+    "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 4d029d84901e53c46dead7a46e2990a7bc62470f4e4ca58a0d063394f86652fd58fe4eea1eb941da3669cd536b559b9d058b342b59300026346b7a2a51badac8
+  checksum: 10/d41031b8e472b9b30aacd905a1561904bcec597dd888ad639b234971714dc9cd0dcb60df91a89219fc72e4feeb148e20f97bcddc39d7676e743ff0c23f62a7eb
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-property-literals@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-property-literals@npm:7.22.5"
+"@babel/plugin-transform-parameters@npm:^7.22.15, @babel/plugin-transform-parameters@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-parameters@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 796176a3176106f77fcb8cd04eb34a8475ce82d6d03a88db089531b8f0453a2fb8b0c6ec9a52c27948bc0ea478becec449893741fc546dfc3930ab927e3f9f2e
+  checksum: 10/c289c188710cd1c60991db169d8173b6e8e05624ae61a7da0b64354100bfba9e44bc1332dd9223c4e3fe1b9cbc0c061e76e7c7b3a75c9588bf35d0ffec428070
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-constant-elements@npm:7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-react-constant-elements@npm:7.22.5"
+"@babel/plugin-transform-private-methods@npm:^7.22.5, @babel/plugin-transform-private-methods@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-private-methods@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.1"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 596db90e37174dd703f4859fef3c86156a7c8564d8351168ac6fdca79c912ef8b8746ae04516ac3909d2cc750702d58d451badacb3c54ea998938ad05d99f9d2
+  checksum: 10/7208c30bb3f3fbc73fb3a88bdcb78cd5cddaf6d523eb9d67c0c04e78f6fc6319ece89f4a5abc41777ceab16df55b3a13a4120e0efc9275ca6d2d89beaba80aa0
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-display-name@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-react-display-name@npm:7.22.5"
+"@babel/plugin-transform-private-property-in-object@npm:^7.22.11, @babel/plugin-transform-private-property-in-object@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.1"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: a12bfd1e4e93055efca3ace3c34722571bda59d9740dca364d225d9c6e3ca874f134694d21715c42cc63d79efd46db9665bd4a022998767f9245f1e29d5d204d
+  checksum: 10/466d1943960c2475c0361eba2ea72d504d4d8329a8e293af0eedd26887bf30a074515b330ea84be77331ace77efbf5533d5f04f8cff63428d2615f4a509ae7a4
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx-development@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-react-jsx-development@npm:7.22.5"
+"@babel/plugin-transform-property-literals@npm:^7.22.5, @babel/plugin-transform-property-literals@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-property-literals@npm:7.24.1"
   dependencies:
-    "@babel/plugin-transform-react-jsx": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 36bc3ff0b96bb0ef4723070a50cfdf2e72cfd903a59eba448f9fe92fea47574d6f22efd99364413719e1f3fb3c51b6c9b2990b87af088f8486a84b2a5f9e4560
+  checksum: 10/a73646d7ecd95b3931a3ead82c7d5efeb46e68ba362de63eb437d33531f294ec18bd31b6d24238cd3b6a3b919a6310c4a0ba4a2629927721d4d10b0518eb7715
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx@npm:^7.22.15, @babel/plugin-transform-react-jsx@npm:^7.22.5":
-  version: 7.22.15
-  resolution: "@babel/plugin-transform-react-jsx@npm:7.22.15"
+"@babel/plugin-transform-react-display-name@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-react-display-name@npm:7.24.1"
   dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-module-imports": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-jsx": ^7.22.5
-    "@babel/types": ^7.22.15
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3899054e89550c3a0ef041af7c47ee266e2e934f498ee80fefeda778a6aa177b48aa8b4d2a8bf5848de977fec564571699ab952d9fa089c4c19b45ddb121df09
+  checksum: 10/4cc7268652bd73a9e249db006d7278e3e90c033684e59801012311536f1ff93eb63fea845325035533aa281e428e6ec2ae0ad04659893ec1318250ddcf4a2f77
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-pure-annotations@npm:^7.22.5":
+"@babel/plugin-transform-react-jsx-development@npm:^7.22.5":
   version: 7.22.5
-  resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.22.5"
+  resolution: "@babel/plugin-transform-react-jsx-development@npm:7.22.5"
   dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-transform-react-jsx": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 092021c4f404e267002099ec20b3f12dd730cb90b0d83c5feed3dc00dbe43b9c42c795a18e7c6c7d7bddea20c7dd56221b146aec81b37f2e7eb5137331c61120
+  checksum: 10/36bc3ff0b96bb0ef4723070a50cfdf2e72cfd903a59eba448f9fe92fea47574d6f22efd99364413719e1f3fb3c51b6c9b2990b87af088f8486a84b2a5f9e4560
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-regenerator@npm:^7.22.10":
-  version: 7.22.10
-  resolution: "@babel/plugin-transform-regenerator@npm:7.22.10"
+"@babel/plugin-transform-react-jsx@npm:^7.22.5, @babel/plugin-transform-react-jsx@npm:^7.23.4":
+  version: 7.23.4
+  resolution: "@babel/plugin-transform-react-jsx@npm:7.23.4"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    regenerator-transform: ^0.15.2
+    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
+    "@babel/helper-module-imports": "npm:^7.22.15"
+    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/plugin-syntax-jsx": "npm:^7.23.3"
+    "@babel/types": "npm:^7.23.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: e13678d62d6fa96f11cb8b863f00e8693491e7adc88bfca3f2820f80cbac8336e7dec3a596eee6a1c4663b7ececc3564f2cd7fb44ed6d4ce84ac2bb7f39ecc6e
+  checksum: 10/d83806701349addfb77b8347b4f0dc8e76fb1c9ac21bdef69f4002394fce2396d61facfc6e1a3de54cbabcdadf991a1f642e69edb5116ac14f95e33d9f7c221d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-reserved-words@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-reserved-words@npm:7.22.5"
+"@babel/plugin-transform-react-pure-annotations@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3ffd7dbc425fe8132bfec118b9817572799cab1473113a635d25ab606c1f5a2341a636c04cf6b22df3813320365ed5a965b5eeb3192320a10e4cc2c137bd8bfc
+  checksum: 10/06a6bfe80f1f36408d07dd80c48cf9f61177c8e5d814e80ddbe88cfad81a8b86b3110e1fe9d1ac943db77e74497daa7f874b5490c788707106ad26ecfbe44813
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-runtime@npm:7.23.2":
-  version: 7.23.2
-  resolution: "@babel/plugin-transform-runtime@npm:7.23.2"
+"@babel/plugin-transform-regenerator@npm:^7.22.10, @babel/plugin-transform-regenerator@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-regenerator@npm:7.24.1"
   dependencies:
-    "@babel/helper-module-imports": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.22.5
-    babel-plugin-polyfill-corejs2: ^0.4.6
-    babel-plugin-polyfill-corejs3: ^0.8.5
-    babel-plugin-polyfill-regenerator: ^0.5.3
-    semver: ^6.3.1
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    regenerator-transform: "npm:^0.15.2"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 09f4273bfe9600c67e72e26f853f11c24ee4c1cbb3935c4a28a94d388e7c0d8733479d868c333cb34e9c236f1765788c6daef7852331f5c70a3b5543fd0247a1
+  checksum: 10/a04319388a0a7931c3f8e15715d01444c32519692178b70deccc86d53304e74c0f589a4268f6c68578d86f75e934dd1fe6e6ed9071f54ee8379f356f88ef6e42
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-shorthand-properties@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.22.5"
+"@babel/plugin-transform-reserved-words@npm:^7.22.5, @babel/plugin-transform-reserved-words@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-reserved-words@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: a5ac902c56ea8effa99f681340ee61bac21094588f7aef0bc01dff98246651702e677552fa6d10e548c4ac22a3ffad047dd2f8c8f0540b68316c2c203e56818b
+  checksum: 10/132c6040c65aabae2d98a39289efb5c51a8632546dc50d2ad032c8660aec307fbed74ef499856ea4f881fc8505905f49b48e0270585da2ea3d50b75e962afd89
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-spread@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-spread@npm:7.22.5"
+"@babel/plugin-transform-shorthand-properties@npm:^7.22.5, @babel/plugin-transform-shorthand-properties@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 5587f0deb60b3dfc9b274e269031cc45ec75facccf1933ea2ea71ced9fd3ce98ed91bb36d6cd26817c14474b90ed998c5078415f0eab531caf301496ce24c95c
+  checksum: 10/006a2032d1c57dca76579ce6598c679c2f20525afef0a36e9d42affe3c8cf33c1427581ad696b519cc75dfee46c5e8ecdf0c6a29ffb14250caa3e16dd68cb424
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-sticky-regex@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-sticky-regex@npm:7.22.5"
+"@babel/plugin-transform-spread@npm:^7.22.5, @babel/plugin-transform-spread@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-spread@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 63b2c575e3e7f96c32d52ed45ee098fb7d354b35c2223b8c8e76840b32cc529ee0c0ceb5742fd082e56e91e3d82842a367ce177e82b05039af3d602c9627a729
+  checksum: 10/0b60cfe2f700ec2c9c1af979bb805860258539648dadcd482a5ddfc2330b733fb61bb60266404f3e068246ad0d6376040b4f9c5ab9037a3d777624d64acd89e9
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-template-literals@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-template-literals@npm:7.22.5"
+"@babel/plugin-transform-sticky-regex@npm:^7.22.5, @babel/plugin-transform-sticky-regex@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-sticky-regex@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 27e9bb030654cb425381c69754be4abe6a7c75b45cd7f962cd8d604b841b2f0fb7b024f2efc1c25cc53f5b16d79d5e8cfc47cacbdaa983895b3aeefa3e7e24ff
+  checksum: 10/e326e96a9eeb6bb01dbc4d3362f989411490671b97f62edf378b8fb102c463a018b777f28da65344d41b22aa6efcdfa01ed43d2b11fdcf202046d3174be137c5
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typeof-symbol@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.22.5"
+"@babel/plugin-transform-template-literals@npm:^7.22.5, @babel/plugin-transform-template-literals@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-template-literals@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 82a53a63ffc3010b689ca9a54e5f53b2718b9f4b4a9818f36f9b7dba234f38a01876680553d2716a645a61920b5e6e4aaf8d4a0064add379b27ca0b403049512
+  checksum: 10/4c9009c72321caf20e3b6328bbe9d7057006c5ae57b794cf247a37ca34d87dfec5e27284169a16df5a6235a083bf0f3ab9e1bfcb005d1c8b75b04aed75652621
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typescript@npm:7.22.9":
-  version: 7.22.9
-  resolution: "@babel/plugin-transform-typescript@npm:7.22.9"
+"@babel/plugin-transform-typeof-symbol@npm:^7.22.5, @babel/plugin-transform-typeof-symbol@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.24.1"
   dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-create-class-features-plugin": ^7.22.9
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-typescript": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 6d1317a54d093b302599a4bee8ba9865d0de8b7b6ac1a0746c4316231d632f75b7f086e6e78acb9ac95ba12ba3b9da462dc9ca69370abb4603c4cc987f62e67e
+  checksum: 10/3dda5074abf8b5df9cdef697d6ebe14a72c199bd6c2019991d033d9ad91b0be937b126b8f34c3c5a9725afee9016a3776aeef3e3b06ab9b3f54f2dd5b5aefa37
   languageName: node
   linkType: hard
 
@@ -1328,60 +1438,60 @@ __metadata:
   version: 7.22.15
   resolution: "@babel/plugin-transform-typescript@npm:7.22.15"
   dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-create-class-features-plugin": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-typescript": ^7.22.5
+    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
+    "@babel/helper-create-class-features-plugin": "npm:^7.22.15"
+    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/plugin-syntax-typescript": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: c5d96cdbf0e1512707aa1c1e3ac6b370a25fd9c545d26008ce44eb13a47bd7fd67a1eb799c98b5ccc82e33a345fda55c0055e1fe3ed97646ed405dd13020b226
+  checksum: 10/95c35fbc823773058e9f077635fbe579d00b8f1762756b14a6fcae0c2db1aefddb93093fda4ca462e9e7d49edd49d71afe0a17422698d7418a6d156fc2dfba19
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-escapes@npm:^7.22.10":
-  version: 7.22.10
-  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.22.10"
+"@babel/plugin-transform-unicode-escapes@npm:^7.22.10, @babel/plugin-transform-unicode-escapes@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 807f40ed1324c8cb107c45358f1903384ca3f0ef1d01c5a3c5c9b271c8d8eec66936a3dcc8d75ddfceea9421420368c2e77ae3adef0a50557e778dfe296bf382
+  checksum: 10/d39041ff6b0cef78271ebe88be6dfd2882a3c6250a54ddae783f1b9adc815e8486a7d0ca054fabfa3fde1301c531d5be89224999fc7be83ff1eda9b77d173051
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-property-regex@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.22.5"
+"@babel/plugin-transform-unicode-property-regex@npm:^7.22.5, @babel/plugin-transform-unicode-property-regex@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.24.1"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.22.15"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 2495e5f663cb388e3d888b4ba3df419ac436a5012144ac170b622ddfc221f9ea9bdba839fa2bc0185cb776b578030666406452ec7791cbf0e7a3d4c88ae9574c
+  checksum: 10/276099b4483e707f80b054e2d29bc519158bfe52461ef5ff76f70727d592df17e30b1597ef4d8a0f04d810f6cb5a8dd887bdc1d0540af3744751710ef280090f
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-regex@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-unicode-regex@npm:7.22.5"
+"@babel/plugin-transform-unicode-regex@npm:^7.22.5, @babel/plugin-transform-unicode-regex@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-unicode-regex@npm:7.24.1"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.22.15"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 6b5d1404c8c623b0ec9bd436c00d885a17d6a34f3f2597996343ddb9d94f6379705b21582dfd4cec2c47fd34068872e74ab6b9580116c0566b3f9447e2a7fa06
+  checksum: 10/400a0927bdb1425b4c0dc68a61b5b2d7d17c7d9f0e07317a1a6a373c080ef94be1dd65fdc4ac9a78fcdb58f89fd128450c7bc0d5b8ca0ae7eca3fbd98e50acba
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-sets-regex@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.22.5"
+"@babel/plugin-transform-unicode-sets-regex@npm:^7.22.5, @babel/plugin-transform-unicode-sets-regex@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.24.1"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.22.15"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: c042070f980b139547f8b0179efbc049ac5930abec7fc26ed7a41d89a048d8ab17d362200e204b6f71c3c20d6991a0e74415e1a412a49adc8131c2a40c04822e
+  checksum: 10/364342fb8e382dfaa23628b88e6484dc1097e53fb7199f4d338f1e2cd71d839bb0a35a9b1380074f6a10adb2e98b79d53ca3ec78c0b8c557ca895ffff42180df
   languageName: node
   linkType: hard
 
@@ -1389,99 +1499,280 @@ __metadata:
   version: 7.12.1
   resolution: "@babel/polyfill@npm:7.12.1"
   dependencies:
-    core-js: ^2.6.5
-    regenerator-runtime: ^0.13.4
-  checksum: 3f59a9d85a41b390b044a1be13e11ae6d8efbfcf4e07217964585c7cef337b828eecfc5e164083227189146d2b6efc1affae8f59c831438eb40b848ab6fe5f39
+    core-js: "npm:^2.6.5"
+    regenerator-runtime: "npm:^0.13.4"
+  checksum: 10/8b6839593f26db556b09a33736d0648edad2239a7f7abff1636c1275cc3f76f98b67e1d9e378cc518b44bfb05e71ca88cc7637ee661ffa68f99241f0896fc9f8
   languageName: node
   linkType: hard
 
-"@babel/preset-env@npm:7.23.2, @babel/preset-env@npm:^7.22.9":
+"@babel/preset-env@npm:7.23.2":
   version: 7.23.2
   resolution: "@babel/preset-env@npm:7.23.2"
   dependencies:
-    "@babel/compat-data": ^7.23.2
-    "@babel/helper-compilation-targets": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-validator-option": ^7.22.15
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.22.15
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.22.15
-    "@babel/plugin-proposal-private-property-in-object": 7.21.0-placeholder-for-preset-env.2
-    "@babel/plugin-syntax-async-generators": ^7.8.4
-    "@babel/plugin-syntax-class-properties": ^7.12.13
-    "@babel/plugin-syntax-class-static-block": ^7.14.5
-    "@babel/plugin-syntax-dynamic-import": ^7.8.3
-    "@babel/plugin-syntax-export-namespace-from": ^7.8.3
-    "@babel/plugin-syntax-import-assertions": ^7.22.5
-    "@babel/plugin-syntax-import-attributes": ^7.22.5
-    "@babel/plugin-syntax-import-meta": ^7.10.4
-    "@babel/plugin-syntax-json-strings": ^7.8.3
-    "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
-    "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
-    "@babel/plugin-syntax-numeric-separator": ^7.10.4
-    "@babel/plugin-syntax-object-rest-spread": ^7.8.3
-    "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
-    "@babel/plugin-syntax-optional-chaining": ^7.8.3
-    "@babel/plugin-syntax-private-property-in-object": ^7.14.5
-    "@babel/plugin-syntax-top-level-await": ^7.14.5
-    "@babel/plugin-syntax-unicode-sets-regex": ^7.18.6
-    "@babel/plugin-transform-arrow-functions": ^7.22.5
-    "@babel/plugin-transform-async-generator-functions": ^7.23.2
-    "@babel/plugin-transform-async-to-generator": ^7.22.5
-    "@babel/plugin-transform-block-scoped-functions": ^7.22.5
-    "@babel/plugin-transform-block-scoping": ^7.23.0
-    "@babel/plugin-transform-class-properties": ^7.22.5
-    "@babel/plugin-transform-class-static-block": ^7.22.11
-    "@babel/plugin-transform-classes": ^7.22.15
-    "@babel/plugin-transform-computed-properties": ^7.22.5
-    "@babel/plugin-transform-destructuring": ^7.23.0
-    "@babel/plugin-transform-dotall-regex": ^7.22.5
-    "@babel/plugin-transform-duplicate-keys": ^7.22.5
-    "@babel/plugin-transform-dynamic-import": ^7.22.11
-    "@babel/plugin-transform-exponentiation-operator": ^7.22.5
-    "@babel/plugin-transform-export-namespace-from": ^7.22.11
-    "@babel/plugin-transform-for-of": ^7.22.15
-    "@babel/plugin-transform-function-name": ^7.22.5
-    "@babel/plugin-transform-json-strings": ^7.22.11
-    "@babel/plugin-transform-literals": ^7.22.5
-    "@babel/plugin-transform-logical-assignment-operators": ^7.22.11
-    "@babel/plugin-transform-member-expression-literals": ^7.22.5
-    "@babel/plugin-transform-modules-amd": ^7.23.0
-    "@babel/plugin-transform-modules-commonjs": ^7.23.0
-    "@babel/plugin-transform-modules-systemjs": ^7.23.0
-    "@babel/plugin-transform-modules-umd": ^7.22.5
-    "@babel/plugin-transform-named-capturing-groups-regex": ^7.22.5
-    "@babel/plugin-transform-new-target": ^7.22.5
-    "@babel/plugin-transform-nullish-coalescing-operator": ^7.22.11
-    "@babel/plugin-transform-numeric-separator": ^7.22.11
-    "@babel/plugin-transform-object-rest-spread": ^7.22.15
-    "@babel/plugin-transform-object-super": ^7.22.5
-    "@babel/plugin-transform-optional-catch-binding": ^7.22.11
-    "@babel/plugin-transform-optional-chaining": ^7.23.0
-    "@babel/plugin-transform-parameters": ^7.22.15
-    "@babel/plugin-transform-private-methods": ^7.22.5
-    "@babel/plugin-transform-private-property-in-object": ^7.22.11
-    "@babel/plugin-transform-property-literals": ^7.22.5
-    "@babel/plugin-transform-regenerator": ^7.22.10
-    "@babel/plugin-transform-reserved-words": ^7.22.5
-    "@babel/plugin-transform-shorthand-properties": ^7.22.5
-    "@babel/plugin-transform-spread": ^7.22.5
-    "@babel/plugin-transform-sticky-regex": ^7.22.5
-    "@babel/plugin-transform-template-literals": ^7.22.5
-    "@babel/plugin-transform-typeof-symbol": ^7.22.5
-    "@babel/plugin-transform-unicode-escapes": ^7.22.10
-    "@babel/plugin-transform-unicode-property-regex": ^7.22.5
-    "@babel/plugin-transform-unicode-regex": ^7.22.5
-    "@babel/plugin-transform-unicode-sets-regex": ^7.22.5
-    "@babel/preset-modules": 0.1.6-no-external-plugins
-    "@babel/types": ^7.23.0
-    babel-plugin-polyfill-corejs2: ^0.4.6
-    babel-plugin-polyfill-corejs3: ^0.8.5
-    babel-plugin-polyfill-regenerator: ^0.5.3
-    core-js-compat: ^3.31.0
-    semver: ^6.3.1
+    "@babel/compat-data": "npm:^7.23.2"
+    "@babel/helper-compilation-targets": "npm:^7.22.15"
+    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-validator-option": "npm:^7.22.15"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.22.15"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.22.15"
+    "@babel/plugin-proposal-private-property-in-object": "npm:7.21.0-placeholder-for-preset-env.2"
+    "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
+    "@babel/plugin-syntax-class-properties": "npm:^7.12.13"
+    "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
+    "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
+    "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
+    "@babel/plugin-syntax-import-assertions": "npm:^7.22.5"
+    "@babel/plugin-syntax-import-attributes": "npm:^7.22.5"
+    "@babel/plugin-syntax-import-meta": "npm:^7.10.4"
+    "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
+    "@babel/plugin-syntax-numeric-separator": "npm:^7.10.4"
+    "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3"
+    "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
+    "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
+    "@babel/plugin-syntax-top-level-await": "npm:^7.14.5"
+    "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6"
+    "@babel/plugin-transform-arrow-functions": "npm:^7.22.5"
+    "@babel/plugin-transform-async-generator-functions": "npm:^7.23.2"
+    "@babel/plugin-transform-async-to-generator": "npm:^7.22.5"
+    "@babel/plugin-transform-block-scoped-functions": "npm:^7.22.5"
+    "@babel/plugin-transform-block-scoping": "npm:^7.23.0"
+    "@babel/plugin-transform-class-properties": "npm:^7.22.5"
+    "@babel/plugin-transform-class-static-block": "npm:^7.22.11"
+    "@babel/plugin-transform-classes": "npm:^7.22.15"
+    "@babel/plugin-transform-computed-properties": "npm:^7.22.5"
+    "@babel/plugin-transform-destructuring": "npm:^7.23.0"
+    "@babel/plugin-transform-dotall-regex": "npm:^7.22.5"
+    "@babel/plugin-transform-duplicate-keys": "npm:^7.22.5"
+    "@babel/plugin-transform-dynamic-import": "npm:^7.22.11"
+    "@babel/plugin-transform-exponentiation-operator": "npm:^7.22.5"
+    "@babel/plugin-transform-export-namespace-from": "npm:^7.22.11"
+    "@babel/plugin-transform-for-of": "npm:^7.22.15"
+    "@babel/plugin-transform-function-name": "npm:^7.22.5"
+    "@babel/plugin-transform-json-strings": "npm:^7.22.11"
+    "@babel/plugin-transform-literals": "npm:^7.22.5"
+    "@babel/plugin-transform-logical-assignment-operators": "npm:^7.22.11"
+    "@babel/plugin-transform-member-expression-literals": "npm:^7.22.5"
+    "@babel/plugin-transform-modules-amd": "npm:^7.23.0"
+    "@babel/plugin-transform-modules-commonjs": "npm:^7.23.0"
+    "@babel/plugin-transform-modules-systemjs": "npm:^7.23.0"
+    "@babel/plugin-transform-modules-umd": "npm:^7.22.5"
+    "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.22.5"
+    "@babel/plugin-transform-new-target": "npm:^7.22.5"
+    "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.22.11"
+    "@babel/plugin-transform-numeric-separator": "npm:^7.22.11"
+    "@babel/plugin-transform-object-rest-spread": "npm:^7.22.15"
+    "@babel/plugin-transform-object-super": "npm:^7.22.5"
+    "@babel/plugin-transform-optional-catch-binding": "npm:^7.22.11"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.23.0"
+    "@babel/plugin-transform-parameters": "npm:^7.22.15"
+    "@babel/plugin-transform-private-methods": "npm:^7.22.5"
+    "@babel/plugin-transform-private-property-in-object": "npm:^7.22.11"
+    "@babel/plugin-transform-property-literals": "npm:^7.22.5"
+    "@babel/plugin-transform-regenerator": "npm:^7.22.10"
+    "@babel/plugin-transform-reserved-words": "npm:^7.22.5"
+    "@babel/plugin-transform-shorthand-properties": "npm:^7.22.5"
+    "@babel/plugin-transform-spread": "npm:^7.22.5"
+    "@babel/plugin-transform-sticky-regex": "npm:^7.22.5"
+    "@babel/plugin-transform-template-literals": "npm:^7.22.5"
+    "@babel/plugin-transform-typeof-symbol": "npm:^7.22.5"
+    "@babel/plugin-transform-unicode-escapes": "npm:^7.22.10"
+    "@babel/plugin-transform-unicode-property-regex": "npm:^7.22.5"
+    "@babel/plugin-transform-unicode-regex": "npm:^7.22.5"
+    "@babel/plugin-transform-unicode-sets-regex": "npm:^7.22.5"
+    "@babel/preset-modules": "npm:0.1.6-no-external-plugins"
+    "@babel/types": "npm:^7.23.0"
+    babel-plugin-polyfill-corejs2: "npm:^0.4.6"
+    babel-plugin-polyfill-corejs3: "npm:^0.8.5"
+    babel-plugin-polyfill-regenerator: "npm:^0.5.3"
+    core-js-compat: "npm:^3.31.0"
+    semver: "npm:^6.3.1"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/7bc8aeed59047f99af2f608f3143044517582b6bd7b041e3c7a12eface47e0313a57e78fad2e0d450cda2ce6c58451d67493f3d3677c5c1031cf59b7db1161c3
+  languageName: node
+  linkType: hard
+
+"@babel/preset-env@npm:7.24.3":
+  version: 7.24.3
+  resolution: "@babel/preset-env@npm:7.24.3"
+  dependencies:
+    "@babel/compat-data": "npm:^7.24.1"
+    "@babel/helper-compilation-targets": "npm:^7.23.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-validator-option": "npm:^7.23.5"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.24.1"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.24.1"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.24.1"
+    "@babel/plugin-proposal-private-property-in-object": "npm:7.21.0-placeholder-for-preset-env.2"
+    "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
+    "@babel/plugin-syntax-class-properties": "npm:^7.12.13"
+    "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
+    "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
+    "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
+    "@babel/plugin-syntax-import-assertions": "npm:^7.24.1"
+    "@babel/plugin-syntax-import-attributes": "npm:^7.24.1"
+    "@babel/plugin-syntax-import-meta": "npm:^7.10.4"
+    "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
+    "@babel/plugin-syntax-numeric-separator": "npm:^7.10.4"
+    "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3"
+    "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
+    "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
+    "@babel/plugin-syntax-top-level-await": "npm:^7.14.5"
+    "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6"
+    "@babel/plugin-transform-arrow-functions": "npm:^7.24.1"
+    "@babel/plugin-transform-async-generator-functions": "npm:^7.24.3"
+    "@babel/plugin-transform-async-to-generator": "npm:^7.24.1"
+    "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.1"
+    "@babel/plugin-transform-block-scoping": "npm:^7.24.1"
+    "@babel/plugin-transform-class-properties": "npm:^7.24.1"
+    "@babel/plugin-transform-class-static-block": "npm:^7.24.1"
+    "@babel/plugin-transform-classes": "npm:^7.24.1"
+    "@babel/plugin-transform-computed-properties": "npm:^7.24.1"
+    "@babel/plugin-transform-destructuring": "npm:^7.24.1"
+    "@babel/plugin-transform-dotall-regex": "npm:^7.24.1"
+    "@babel/plugin-transform-duplicate-keys": "npm:^7.24.1"
+    "@babel/plugin-transform-dynamic-import": "npm:^7.24.1"
+    "@babel/plugin-transform-exponentiation-operator": "npm:^7.24.1"
+    "@babel/plugin-transform-export-namespace-from": "npm:^7.24.1"
+    "@babel/plugin-transform-for-of": "npm:^7.24.1"
+    "@babel/plugin-transform-function-name": "npm:^7.24.1"
+    "@babel/plugin-transform-json-strings": "npm:^7.24.1"
+    "@babel/plugin-transform-literals": "npm:^7.24.1"
+    "@babel/plugin-transform-logical-assignment-operators": "npm:^7.24.1"
+    "@babel/plugin-transform-member-expression-literals": "npm:^7.24.1"
+    "@babel/plugin-transform-modules-amd": "npm:^7.24.1"
+    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.1"
+    "@babel/plugin-transform-modules-systemjs": "npm:^7.24.1"
+    "@babel/plugin-transform-modules-umd": "npm:^7.24.1"
+    "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.22.5"
+    "@babel/plugin-transform-new-target": "npm:^7.24.1"
+    "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.24.1"
+    "@babel/plugin-transform-numeric-separator": "npm:^7.24.1"
+    "@babel/plugin-transform-object-rest-spread": "npm:^7.24.1"
+    "@babel/plugin-transform-object-super": "npm:^7.24.1"
+    "@babel/plugin-transform-optional-catch-binding": "npm:^7.24.1"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.24.1"
+    "@babel/plugin-transform-parameters": "npm:^7.24.1"
+    "@babel/plugin-transform-private-methods": "npm:^7.24.1"
+    "@babel/plugin-transform-private-property-in-object": "npm:^7.24.1"
+    "@babel/plugin-transform-property-literals": "npm:^7.24.1"
+    "@babel/plugin-transform-regenerator": "npm:^7.24.1"
+    "@babel/plugin-transform-reserved-words": "npm:^7.24.1"
+    "@babel/plugin-transform-shorthand-properties": "npm:^7.24.1"
+    "@babel/plugin-transform-spread": "npm:^7.24.1"
+    "@babel/plugin-transform-sticky-regex": "npm:^7.24.1"
+    "@babel/plugin-transform-template-literals": "npm:^7.24.1"
+    "@babel/plugin-transform-typeof-symbol": "npm:^7.24.1"
+    "@babel/plugin-transform-unicode-escapes": "npm:^7.24.1"
+    "@babel/plugin-transform-unicode-property-regex": "npm:^7.24.1"
+    "@babel/plugin-transform-unicode-regex": "npm:^7.24.1"
+    "@babel/plugin-transform-unicode-sets-regex": "npm:^7.24.1"
+    "@babel/preset-modules": "npm:0.1.6-no-external-plugins"
+    babel-plugin-polyfill-corejs2: "npm:^0.4.10"
+    babel-plugin-polyfill-corejs3: "npm:^0.10.4"
+    babel-plugin-polyfill-regenerator: "npm:^0.6.1"
+    core-js-compat: "npm:^3.31.0"
+    semver: "npm:^6.3.1"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/42de398cb7655f3748a03f9f5ca6132dd8e84315ccf286e47740455dfb5be6358df7cfcbecf84426c14176a4d02d0b0b3c97ddf6c5c4c8fb7f1f307692a103ee
+  languageName: node
+  linkType: hard
+
+"@babel/preset-env@npm:^7.22.9":
+  version: 7.24.4
+  resolution: "@babel/preset-env@npm:7.24.4"
+  dependencies:
+    "@babel/compat-data": "npm:^7.24.4"
+    "@babel/helper-compilation-targets": "npm:^7.23.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-validator-option": "npm:^7.23.5"
+    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.24.4"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.24.1"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.24.1"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.24.1"
+    "@babel/plugin-proposal-private-property-in-object": "npm:7.21.0-placeholder-for-preset-env.2"
+    "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
+    "@babel/plugin-syntax-class-properties": "npm:^7.12.13"
+    "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
+    "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
+    "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
+    "@babel/plugin-syntax-import-assertions": "npm:^7.24.1"
+    "@babel/plugin-syntax-import-attributes": "npm:^7.24.1"
+    "@babel/plugin-syntax-import-meta": "npm:^7.10.4"
+    "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
+    "@babel/plugin-syntax-numeric-separator": "npm:^7.10.4"
+    "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3"
+    "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
+    "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
+    "@babel/plugin-syntax-top-level-await": "npm:^7.14.5"
+    "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6"
+    "@babel/plugin-transform-arrow-functions": "npm:^7.24.1"
+    "@babel/plugin-transform-async-generator-functions": "npm:^7.24.3"
+    "@babel/plugin-transform-async-to-generator": "npm:^7.24.1"
+    "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.1"
+    "@babel/plugin-transform-block-scoping": "npm:^7.24.4"
+    "@babel/plugin-transform-class-properties": "npm:^7.24.1"
+    "@babel/plugin-transform-class-static-block": "npm:^7.24.4"
+    "@babel/plugin-transform-classes": "npm:^7.24.1"
+    "@babel/plugin-transform-computed-properties": "npm:^7.24.1"
+    "@babel/plugin-transform-destructuring": "npm:^7.24.1"
+    "@babel/plugin-transform-dotall-regex": "npm:^7.24.1"
+    "@babel/plugin-transform-duplicate-keys": "npm:^7.24.1"
+    "@babel/plugin-transform-dynamic-import": "npm:^7.24.1"
+    "@babel/plugin-transform-exponentiation-operator": "npm:^7.24.1"
+    "@babel/plugin-transform-export-namespace-from": "npm:^7.24.1"
+    "@babel/plugin-transform-for-of": "npm:^7.24.1"
+    "@babel/plugin-transform-function-name": "npm:^7.24.1"
+    "@babel/plugin-transform-json-strings": "npm:^7.24.1"
+    "@babel/plugin-transform-literals": "npm:^7.24.1"
+    "@babel/plugin-transform-logical-assignment-operators": "npm:^7.24.1"
+    "@babel/plugin-transform-member-expression-literals": "npm:^7.24.1"
+    "@babel/plugin-transform-modules-amd": "npm:^7.24.1"
+    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.1"
+    "@babel/plugin-transform-modules-systemjs": "npm:^7.24.1"
+    "@babel/plugin-transform-modules-umd": "npm:^7.24.1"
+    "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.22.5"
+    "@babel/plugin-transform-new-target": "npm:^7.24.1"
+    "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.24.1"
+    "@babel/plugin-transform-numeric-separator": "npm:^7.24.1"
+    "@babel/plugin-transform-object-rest-spread": "npm:^7.24.1"
+    "@babel/plugin-transform-object-super": "npm:^7.24.1"
+    "@babel/plugin-transform-optional-catch-binding": "npm:^7.24.1"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.24.1"
+    "@babel/plugin-transform-parameters": "npm:^7.24.1"
+    "@babel/plugin-transform-private-methods": "npm:^7.24.1"
+    "@babel/plugin-transform-private-property-in-object": "npm:^7.24.1"
+    "@babel/plugin-transform-property-literals": "npm:^7.24.1"
+    "@babel/plugin-transform-regenerator": "npm:^7.24.1"
+    "@babel/plugin-transform-reserved-words": "npm:^7.24.1"
+    "@babel/plugin-transform-shorthand-properties": "npm:^7.24.1"
+    "@babel/plugin-transform-spread": "npm:^7.24.1"
+    "@babel/plugin-transform-sticky-regex": "npm:^7.24.1"
+    "@babel/plugin-transform-template-literals": "npm:^7.24.1"
+    "@babel/plugin-transform-typeof-symbol": "npm:^7.24.1"
+    "@babel/plugin-transform-unicode-escapes": "npm:^7.24.1"
+    "@babel/plugin-transform-unicode-property-regex": "npm:^7.24.1"
+    "@babel/plugin-transform-unicode-regex": "npm:^7.24.1"
+    "@babel/plugin-transform-unicode-sets-regex": "npm:^7.24.1"
+    "@babel/preset-modules": "npm:0.1.6-no-external-plugins"
+    babel-plugin-polyfill-corejs2: "npm:^0.4.10"
+    babel-plugin-polyfill-corejs3: "npm:^0.10.4"
+    babel-plugin-polyfill-regenerator: "npm:^0.6.1"
+    core-js-compat: "npm:^3.31.0"
+    semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 49327ef584b529b56aedd6577937b80c0d89603c68b23795495a13af04b5aa008db9ad04cd280423600cdc0d3cce13ae9d0d9a977db5c8193697b20ced8a10b2
+  checksum: 10/3d5cbdc2501bc1959fc76ed9d409d0ee5264bc475fa809958fd2e8e7db9b12f8eccdae750a0e05d25207373c42ca115b42bb3d5c743bc770cb12b6af05bf3bd8
   languageName: node
   linkType: hard
 
@@ -1489,12 +1780,12 @@ __metadata:
   version: 7.22.15
   resolution: "@babel/preset-flow@npm:7.22.15"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-validator-option": ^7.22.15
-    "@babel/plugin-transform-flow-strip-types": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-validator-option": "npm:^7.22.15"
+    "@babel/plugin-transform-flow-strip-types": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 17f8b80b1012802f983227b423c8823990db9748aec4f8bfd56ff774d8d954e9bdea67377788abac526754b3d307215c063c9beadf5f1b4331b30d4ba0593286
+  checksum: 10/17f8b80b1012802f983227b423c8823990db9748aec4f8bfd56ff774d8d954e9bdea67377788abac526754b3d307215c063c9beadf5f1b4331b30d4ba0593286
   languageName: node
   linkType: hard
 
@@ -1502,59 +1793,43 @@ __metadata:
   version: 0.1.6-no-external-plugins
   resolution: "@babel/preset-modules@npm:0.1.6-no-external-plugins"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.0.0
-    "@babel/types": ^7.4.4
-    esutils: ^2.0.2
+    "@babel/helper-plugin-utils": "npm:^7.0.0"
+    "@babel/types": "npm:^7.4.4"
+    esutils: "npm:^2.0.2"
   peerDependencies:
     "@babel/core": ^7.0.0-0 || ^8.0.0-0 <8.0.0
-  checksum: 4855e799bc50f2449fb5210f78ea9e8fd46cf4f242243f1e2ed838e2bd702e25e73e822e7f8447722a5f4baa5e67a8f7a0e403f3e7ce04540ff743a9c411c375
-  languageName: node
-  linkType: hard
-
-"@babel/preset-react@npm:7.22.5":
-  version: 7.22.5
-  resolution: "@babel/preset-react@npm:7.22.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-validator-option": ^7.22.5
-    "@babel/plugin-transform-react-display-name": ^7.22.5
-    "@babel/plugin-transform-react-jsx": ^7.22.5
-    "@babel/plugin-transform-react-jsx-development": ^7.22.5
-    "@babel/plugin-transform-react-pure-annotations": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: b977c7ee83e93f62d77e61929ca3d97e5291e026e2f025a1b8b7ac9186486ed56c7d5bc36f0becabe0c24e8c42a4e4f2243a3cf841384cfafc3204c5d3e6c619
+  checksum: 10/039aba98a697b920d6440c622aaa6104bb6076d65356b29dad4b3e6627ec0354da44f9621bafbeefd052cd4ac4d7f88c9a2ab094efcb50963cb352781d0c6428
   languageName: node
   linkType: hard
 
-"@babel/preset-react@npm:^7.22.5":
-  version: 7.22.15
-  resolution: "@babel/preset-react@npm:7.22.15"
+"@babel/preset-react@npm:7.24.1, @babel/preset-react@npm:^7.22.5":
+  version: 7.24.1
+  resolution: "@babel/preset-react@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-validator-option": ^7.22.15
-    "@babel/plugin-transform-react-display-name": ^7.22.5
-    "@babel/plugin-transform-react-jsx": ^7.22.15
-    "@babel/plugin-transform-react-jsx-development": ^7.22.5
-    "@babel/plugin-transform-react-pure-annotations": ^7.22.5
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-validator-option": "npm:^7.23.5"
+    "@babel/plugin-transform-react-display-name": "npm:^7.24.1"
+    "@babel/plugin-transform-react-jsx": "npm:^7.23.4"
+    "@babel/plugin-transform-react-jsx-development": "npm:^7.22.5"
+    "@babel/plugin-transform-react-pure-annotations": "npm:^7.24.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: c3ef99dfa2e9f57d2e08603e883aa20f47630a826c8e413888a93ae6e0084b5016871e463829be125329d40a1ba0a89f7c43d77b6dab52083c225cb43e63d10e
+  checksum: 10/a796c609ace7d58a56b42b6630cdd9e1d896ce2f8b35331b9ea040eaaf3cc9aa99cd2614e379a27c10410f34e89355e2739c7097e8065ce5e40900a77b13d716
   languageName: node
   linkType: hard
 
-"@babel/preset-typescript@npm:7.23.2, @babel/preset-typescript@npm:^7.13.0":
+"@babel/preset-typescript@npm:^7.13.0":
   version: 7.23.2
   resolution: "@babel/preset-typescript@npm:7.23.2"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-validator-option": ^7.22.15
-    "@babel/plugin-syntax-jsx": ^7.22.5
-    "@babel/plugin-transform-modules-commonjs": ^7.23.0
-    "@babel/plugin-transform-typescript": ^7.22.15
+    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-validator-option": "npm:^7.22.15"
+    "@babel/plugin-syntax-jsx": "npm:^7.22.5"
+    "@babel/plugin-transform-modules-commonjs": "npm:^7.23.0"
+    "@babel/plugin-transform-typescript": "npm:^7.22.15"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: c4b065c90e7f085dd7a0e57032983ac230c7ffd1d616e4c2b66581e765d5befc9271495f33250bf1cf9b4d436239c8ca3b19ada9f6c419c70bdab2cf6c868f9f
+  checksum: 10/fab17c24f737928e6e399425463808b4c4d850ea2cbe751c98cc2da86314e48d2f910da0f10d72525dad72a68aced5bd74edacf76b0f06db25abab07bec64b32
   languageName: node
   linkType: hard
 
@@ -1562,21 +1837,21 @@ __metadata:
   version: 7.21.0
   resolution: "@babel/register@npm:7.21.0"
   dependencies:
-    clone-deep: ^4.0.1
-    find-cache-dir: ^2.0.0
-    make-dir: ^2.1.0
-    pirates: ^4.0.5
-    source-map-support: ^0.5.16
+    clone-deep: "npm:^4.0.1"
+    find-cache-dir: "npm:^2.0.0"
+    make-dir: "npm:^2.1.0"
+    pirates: "npm:^4.0.5"
+    source-map-support: "npm:^0.5.16"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 9745cc7520b4c5e64cc54f4851c3b78af82e1f8cffc9041f5cc0b9aef62d86a9a8617327fc975b5e0e39cb5cc0aba7ae02429884390ee93e0de29152fa849b4f
+  checksum: 10/9745cc7520b4c5e64cc54f4851c3b78af82e1f8cffc9041f5cc0b9aef62d86a9a8617327fc975b5e0e39cb5cc0aba7ae02429884390ee93e0de29152fa849b4f
   languageName: node
   linkType: hard
 
 "@babel/regjsgen@npm:^0.8.0":
   version: 0.8.0
   resolution: "@babel/regjsgen@npm:0.8.0"
-  checksum: 89c338fee774770e5a487382170711014d49a68eb281e74f2b5eac88f38300a4ad545516a7786a8dd5702e9cf009c94c2f582d200f077ac5decd74c56b973730
+  checksum: 10/c57fb730b17332b7572574b74364a77d70faa302a281a62819476fa3b09822974fd75af77aea603ad77378395be64e81f89f0e800bf86cbbf21652d49ce12ee8
   languageName: node
   linkType: hard
 
@@ -1584,72 +1859,81 @@ __metadata:
   version: 7.22.3
   resolution: "@babel/runtime-corejs3@npm:7.22.3"
   dependencies:
-    core-js-pure: ^3.30.2
-    regenerator-runtime: ^0.13.11
-  checksum: ec92a0b874669bb5eff9e7f20d4e0dbfb0bb5d433bd9e2d6f892c38884079d657240165306a402bb4747942765bdd37b7b5857c573505d2179c1fa4162bf966b
+    core-js-pure: "npm:^3.30.2"
+    regenerator-runtime: "npm:^0.13.11"
+  checksum: 10/0e0065320f5a3f8aa390e5b0904a67de98d583c6f4f7fd5330f265a41397850708eb638470a3c224dabbbeab63d3080412b21a217858090f60f3f778a314f318
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:7.23.2, @babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.11.1, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.0, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.19.4, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
-  version: 7.23.2
-  resolution: "@babel/runtime@npm:7.23.2"
+"@babel/runtime@npm:7.24.1, @babel/runtime@npm:^7.14.5":
+  version: 7.24.1
+  resolution: "@babel/runtime@npm:7.24.1"
   dependencies:
-    regenerator-runtime: ^0.14.0
-  checksum: 6c4df4839ec75ca10175f636d6362f91df8a3137f86b38f6cd3a4c90668a0fe8e9281d320958f4fbd43b394988958585a17c3aab2a4ea6bf7316b22916a371fb
+    regenerator-runtime: "npm:^0.14.0"
+  checksum: 10/3a8d61400c636d1ce3a42895a106cd4dfb4e9b88832a8a754a724c68652f821d7a46dce394305d7623f9f0d3597bf0a98aeb5f9c150ef60e14bbbf66caab4654
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.22.15, @babel/template@npm:^7.22.5, @babel/template@npm:^7.3.3":
-  version: 7.22.15
-  resolution: "@babel/template@npm:7.22.15"
+"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.11.1, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.0, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.23.9, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
+  version: 7.24.4
+  resolution: "@babel/runtime@npm:7.24.4"
   dependencies:
-    "@babel/code-frame": ^7.22.13
-    "@babel/parser": ^7.22.15
-    "@babel/types": ^7.22.15
-  checksum: 1f3e7dcd6c44f5904c184b3f7fe280394b191f2fed819919ffa1e529c259d5b197da8981b6ca491c235aee8dbad4a50b7e31304aa531271cb823a4a24a0dd8fd
+    regenerator-runtime: "npm:^0.14.0"
+  checksum: 10/8ec8ce2c145bc7e31dd39ab66df124f357f65c11489aefacb30f431bae913b9aaa66aa5efe5321ea2bf8878af3fcee338c87e7599519a952e3a6f83aa1b03308
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.22.8, @babel/traverse@npm:^7.23.2":
-  version: 7.23.2
-  resolution: "@babel/traverse@npm:7.23.2"
+"@babel/template@npm:^7.22.15, @babel/template@npm:^7.22.5, @babel/template@npm:^7.24.0, @babel/template@npm:^7.3.3":
+  version: 7.24.0
+  resolution: "@babel/template@npm:7.24.0"
   dependencies:
-    "@babel/code-frame": ^7.22.13
-    "@babel/generator": ^7.23.0
-    "@babel/helper-environment-visitor": ^7.22.20
-    "@babel/helper-function-name": ^7.23.0
-    "@babel/helper-hoist-variables": ^7.22.5
-    "@babel/helper-split-export-declaration": ^7.22.6
-    "@babel/parser": ^7.23.0
-    "@babel/types": ^7.23.0
-    debug: ^4.1.0
-    globals: ^11.1.0
-  checksum: 26a1eea0dde41ab99dde8b9773a013a0dc50324e5110a049f5d634e721ff08afffd54940b3974a20308d7952085ac769689369e9127dea655f868c0f6e1ab35d
+    "@babel/code-frame": "npm:^7.23.5"
+    "@babel/parser": "npm:^7.24.0"
+    "@babel/types": "npm:^7.24.0"
+  checksum: 10/8c538338c7de8fac8ada691a5a812bdcbd60bd4a4eb5adae2cc9ee19773e8fb1a724312a00af9e1ce49056ffd3c3475e7287b5668cf6360bfb3f8ac827a06ffe
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.2.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.23.0
-  resolution: "@babel/types@npm:7.23.0"
+"@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.22.8, @babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/traverse@npm:7.24.1"
+  dependencies:
+    "@babel/code-frame": "npm:^7.24.1"
+    "@babel/generator": "npm:^7.24.1"
+    "@babel/helper-environment-visitor": "npm:^7.22.20"
+    "@babel/helper-function-name": "npm:^7.23.0"
+    "@babel/helper-hoist-variables": "npm:^7.22.5"
+    "@babel/helper-split-export-declaration": "npm:^7.22.6"
+    "@babel/parser": "npm:^7.24.1"
+    "@babel/types": "npm:^7.24.0"
+    debug: "npm:^4.3.1"
+    globals: "npm:^11.1.0"
+  checksum: 10/b9b0173c286ef549e179f3725df3c4958069ad79fe5b9840adeb99692eb4a5a08db4e735c0f086aab52e7e08ec711cee9e7c06cb908d8035641d1382172308d3
+  languageName: node
+  linkType: hard
+
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.2.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.3, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.4, @babel/types@npm:^7.24.0, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.24.0
+  resolution: "@babel/types@npm:7.24.0"
   dependencies:
-    "@babel/helper-string-parser": ^7.22.5
-    "@babel/helper-validator-identifier": ^7.22.20
-    to-fast-properties: ^2.0.0
-  checksum: 215fe04bd7feef79eeb4d33374b39909ce9cad1611c4135a4f7fdf41fe3280594105af6d7094354751514625ea92d0875aba355f53e86a92600f290e77b0e604
+    "@babel/helper-string-parser": "npm:^7.23.4"
+    "@babel/helper-validator-identifier": "npm:^7.22.20"
+    to-fast-properties: "npm:^2.0.0"
+  checksum: 10/a0b4875ce2e132f9daff0d5b27c7f4c4fcc97f2b084bdc5834e92c9d32592778489029e65d99d00c406da612d87b72d7a236c0afccaa1435c028d0c94c9b6da4
   languageName: node
   linkType: hard
 
 "@base2/pretty-print-object@npm:1.0.1":
   version: 1.0.1
   resolution: "@base2/pretty-print-object@npm:1.0.1"
-  checksum: 1e8a5af578037a9d47d72f815983f9e4efb038e5f03e7635fc893194c5daa723215d71af33267893a9b618656c8eaea7be931b1c063c9b066a40994be0d23545
+  checksum: 10/c1b78a521ac712baa076589f3bc81318d07c34a5747e9177b6af37043592252587d98f9b7b59ec174968c6bea31a99fe4d7884121173a449b75fe602b7eb2839
   languageName: node
   linkType: hard
 
 "@bcoe/v8-coverage@npm:^0.2.3":
   version: 0.2.3
   resolution: "@bcoe/v8-coverage@npm:0.2.3"
-  checksum: 850f9305536d0f2bd13e9e0881cb5f02e4f93fad1189f7b2d4bebf694e3206924eadee1068130d43c11b750efcc9405f88a8e42ef098b6d75239c0f047de1a27
+  checksum: 10/1a1f0e356a3bb30b5f1ced6f79c413e6ebacf130421f15fac5fcd8be5ddf98aedb4404d7f5624e3285b700e041f9ef938321f3ca4d359d5b716f96afa120d88d
   languageName: node
   linkType: hard
 
@@ -1657,26 +1941,26 @@ __metadata:
   version: 5.4.0
   resolution: "@betterer/betterer@npm:5.4.0"
   dependencies:
-    "@betterer/constraints": ^5.3.0
-    "@betterer/errors": ^5.3.0
-    "@betterer/logger": ^5.3.4
-    "@betterer/reporter": ^5.4.0
-    "@phenomnomnominal/debug": ^0.2.5
-    "@phenomnomnominal/worker-require": ^0.0.34
-    chokidar: ^3.3.1
-    djb2a: ^1.2.0
-    fast-memoize: ^2.5.2
-    lines-and-columns: ^2.0.3
-    minimatch: ^5.0.1
-    prettier: ^2.3.2
-    simple-git: ^3.6.0
-    ts-node: ^10.2.1
-    tslib: ^2.3.1
-    typescript: ">=2.7"
+    "@betterer/constraints": "npm:^5.3.0"
+    "@betterer/errors": "npm:^5.3.0"
+    "@betterer/logger": "npm:^5.3.4"
+    "@betterer/reporter": "npm:^5.4.0"
+    "@phenomnomnominal/debug": "npm:^0.2.5"
+    "@phenomnomnominal/worker-require": "npm:^0.0.34"
+    chokidar: "npm:^3.3.1"
+    djb2a: "npm:^1.2.0"
+    fast-memoize: "npm:^2.5.2"
+    lines-and-columns: "npm:^2.0.3"
+    minimatch: "npm:^5.0.1"
+    prettier: "npm:^2.3.2"
+    simple-git: "npm:^3.6.0"
+    ts-node: "npm:^10.2.1"
+    tslib: "npm:^2.3.1"
+    typescript: "npm:>=2.7"
   dependenciesMeta:
     typescript:
       optional: true
-  checksum: 9f9b8ab6a9980eee77860fc6449b7a6d7c20d71702854f3aa6a59be98e49ff54cd43a1f93273c3a0b9fea95dfcff541188949ddb3333d6178abb07d120ff7437
+  checksum: 10/4d866d2acfc5e46375a29701122571544d60a4c38985a154b7a4a31ffffad8434d584496e8baaa724a7a929b87ff8a65ce5d5a86b0b6f4aedae894e53e4d7d80
   languageName: node
   linkType: hard
 
@@ -1684,22 +1968,22 @@ __metadata:
   version: 5.4.0
   resolution: "@betterer/cli@npm:5.4.0"
   dependencies:
-    "@betterer/betterer": ^5.4.0
-    "@betterer/errors": ^5.3.0
-    "@betterer/render": ^5.3.4
-    "@betterer/tasks": ^5.3.6
-    "@phenomnomnominal/tsquery": ^4.1.1
-    "@phenomnomnominal/tstemplate": ^0.1.0
-    "@phenomnomnominal/worker-require": ^0.0.34
-    chalk: ^4.1.2
-    commander: ^8.3.0
-    find-up: ^5.0.0
-    jest-diff: ^27.1.0
-    prettier: ^2.3.2
-    tslib: ^2.3.1
+    "@betterer/betterer": "npm:^5.4.0"
+    "@betterer/errors": "npm:^5.3.0"
+    "@betterer/render": "npm:^5.3.4"
+    "@betterer/tasks": "npm:^5.3.6"
+    "@phenomnomnominal/tsquery": "npm:^4.1.1"
+    "@phenomnomnominal/tstemplate": "npm:^0.1.0"
+    "@phenomnomnominal/worker-require": "npm:^0.0.34"
+    chalk: "npm:^4.1.2"
+    commander: "npm:^8.3.0"
+    find-up: "npm:^5.0.0"
+    jest-diff: "npm:^27.1.0"
+    prettier: "npm:^2.3.2"
+    tslib: "npm:^2.3.1"
   bin:
     betterer: bin/betterer
-  checksum: 1086d7d786bc24187c328cd0d3403060a2c61795fa4786743d1c1f79070366a4e23de7a9c80c0489e2e9d6027af8b94c0cd2ac5387e72196e4e6dee667e3bce2
+  checksum: 10/4f07c6a6cad8c143b655e3bd6a2f35856437fbbc18569a8c3a30c8d80cc1aa04c07e19b11075155b66d6afeec5fef94ef740d53a439ba2b35ed871c84e2cdd15
   languageName: node
   linkType: hard
 
@@ -1707,15 +1991,15 @@ __metadata:
   version: 5.3.0
   resolution: "@betterer/constraints@npm:5.3.0"
   dependencies:
-    tslib: ^2.3.1
-  checksum: a3991bc4f138bfaff2ddd842790ea43c50edc6ea4b50546e44b8489231dfb5a7f9ef995d1c7d8695149fda5cd4b1aa79731c76482708a18cbfe398c39b9dcee8
+    tslib: "npm:^2.3.1"
+  checksum: 10/1945efcf47a25803788f43cb5ab111dcac2ea4308b12345ac415b470d67a079d1e9d4f965e30958022c67a76632761b56c012307b67f642175c394b79a29ca83
   languageName: node
   linkType: hard
 
 "@betterer/errors@npm:^5.3.0":
   version: 5.3.0
   resolution: "@betterer/errors@npm:5.3.0"
-  checksum: 15d6679dca00a97ee1845225af662fdbcf84a684286d3ae654023ec5d1e2e61bb6c7a97ba5e6e50dfeebbeb5247f4bf5d5e4705a0468ea067bff30e22b7ccaf3
+  checksum: 10/189d5ca5f0d5dfa2251fd633780875a35801d7c3b738ebc1320e19f7503e143c16eb65c0155121b46abd7565babde41735ec8f7f19603b8efba250f1a74dd772
   languageName: node
   linkType: hard
 
@@ -1723,12 +2007,12 @@ __metadata:
   version: 5.4.0
   resolution: "@betterer/eslint@npm:5.4.0"
   dependencies:
-    "@betterer/betterer": ^5.4.0
-    "@betterer/errors": ^5.3.0
-    tslib: ^2.3.1
+    "@betterer/betterer": "npm:^5.4.0"
+    "@betterer/errors": "npm:^5.3.0"
+    tslib: "npm:^2.3.1"
   peerDependencies:
     eslint: ">=7.0.0"
-  checksum: 98677a9f2071d7ae2e209a5d075b795764d7685eaa48673101416fa28e40b5ad0becfb15e06d29e295f08ccb2b6d8c206d64fecc8cd7ee84cedb9b64189959dc
+  checksum: 10/8af4e490814c3c7e93dd23ea23d5aff19abb2a1b5e179307fb1ec5a66018ce1a14b9b4d5dce05df6862b642d6cfadb561b020ddb637cb761ceddd4f9d63a49c6
   languageName: node
   linkType: hard
 
@@ -1736,29 +2020,18 @@ __metadata:
   version: 5.3.4
   resolution: "@betterer/logger@npm:5.3.4"
   dependencies:
-    "@babel/code-frame": ^7.10.3
-    jest-diff: ^27.0.6
-    lines-and-columns: ^2.0.3
-    tslib: ^2.3.1
-  checksum: f458fe2434f0df4b8cba1d9676987d0e7b0fa5617f44f3d0f921189f88efe61adf53cf0411f622d4a5eeac258773de84bb9c9f21cd3e033061d6f21f2e8d6eab
-  languageName: node
-  linkType: hard
-
-"@betterer/regexp@npm:5.4.0":
-  version: 5.4.0
-  resolution: "@betterer/regexp@npm:5.4.0"
-  dependencies:
-    "@betterer/betterer": ^5.4.0
-    "@betterer/errors": ^5.3.0
-    tslib: ^2.3.1
-  checksum: eaa16b3ec83f587ea12f67ac76e92e40ebdc839a264baa600ea82282fff45f27351a863289e4425b753066242bd6ef017cdbef8e06d9229cf40ccbaeb8ad6b71
+    "@babel/code-frame": "npm:^7.10.3"
+    jest-diff: "npm:^27.0.6"
+    lines-and-columns: "npm:^2.0.3"
+    tslib: "npm:^2.3.1"
+  checksum: 10/377422dc52dd85002dd32967fb3f59f07d584e18386039831ad4bab6bee0f767ae1a31d33aa1039e76e1167cb308d0706a6d76b6c915a0bc1439ea6cbfdb5d09
   languageName: node
   linkType: hard
 
 "@betterer/render@npm:^5.3.4":
   version: 5.3.4
   resolution: "@betterer/render@npm:5.3.4"
-  checksum: cd39bb092f100eb90189de39a703fabec85ce78793da30d10891026b399c617651d6eee8b1bbf8a8b46b8dc7037d1240865fbd0f742b86f283b33236aeab2a7d
+  checksum: 10/b979b78490cc2cc2032d40e6a46390c5efac9cad1e1262d8a7647dd37c9aec73098298fc721711e71e4b7e15b5501f431f45ed835104c0bd9e7e414b389e6639
   languageName: node
   linkType: hard
 
@@ -1766,13 +2039,13 @@ __metadata:
   version: 5.4.0
   resolution: "@betterer/reporter@npm:5.4.0"
   dependencies:
-    "@betterer/betterer": ^5.4.0
-    "@betterer/errors": ^5.3.0
-    "@betterer/logger": ^5.3.4
-    "@betterer/render": ^5.3.4
-    "@betterer/tasks": ^5.3.6
-    tslib: ^2.3.1
-  checksum: a8a1a4e301d0a9e07551757ac4a90f3013906c2e93fa09a3cf616b9e7fb3fa772535cffc39270f432432c9865a3a48e025e94046876163a9288289c2a5263ed9
+    "@betterer/betterer": "npm:^5.4.0"
+    "@betterer/errors": "npm:^5.3.0"
+    "@betterer/logger": "npm:^5.3.4"
+    "@betterer/render": "npm:^5.3.4"
+    "@betterer/tasks": "npm:^5.3.6"
+    tslib: "npm:^2.3.1"
+  checksum: 10/09169f068fbb9de82088d54368ccf1b3eb143e18eba1e7963e9a94b49f0bf3e122e26c7b536ddb2d20da79ce12270747b9507d9271a73047e3640fa6acde1977
   languageName: node
   linkType: hard
 
@@ -1780,26 +2053,44 @@ __metadata:
   version: 5.3.6
   resolution: "@betterer/tasks@npm:5.3.6"
   dependencies:
-    "@betterer/errors": ^5.3.0
-    "@betterer/logger": ^5.3.4
-    "@betterer/render": ^5.3.4
-    chalk: ^4.1.2
-    tslib: ^2.3.1
-  checksum: 1cf1dcc92f6c16e1c7d0942ad0224b52ead2bd55238ce72a2320c4d83aec5f36c1acb316f558ceea75885d441ef32dc965c13ee2d780af95b5d874d6c3a9aa51
+    "@betterer/errors": "npm:^5.3.0"
+    "@betterer/logger": "npm:^5.3.4"
+    "@betterer/render": "npm:^5.3.4"
+    chalk: "npm:^4.1.2"
+    tslib: "npm:^2.3.1"
+  checksum: 10/b85cfb54198ac94b476839aac9a8f717b28c7f5bf07d576cb4821d6828bcce0c5c4ec9a54eb29f94e42187bbef2e6266482484718a1417b456b73816f0740cdf
   languageName: node
   linkType: hard
 
-"@braintree/sanitize-url@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@braintree/sanitize-url@npm:6.0.2"
-  checksum: 6a9dfd4081cc96516eeb281d1a83d3b5f1ad3d2837adf968fcc2ba18889ee833554f9c641b4083c36d3360a932e4504ddf25b0b51e9933c3742622df82cf7c9a
+"@braintree/sanitize-url@npm:7.0.1":
+  version: 7.0.1
+  resolution: "@braintree/sanitize-url@npm:7.0.1"
+  checksum: 10/5e01e6faf81b2289c8e7829aed185c834a88d501c51f569a9f2bc72549d4f2367eeb6f8a9e8039fbe3ef52b094c6afc32dc8272185c687ab6812340b1249cf4d
+  languageName: node
+  linkType: hard
+
+"@bundled-es-modules/cookie@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@bundled-es-modules/cookie@npm:2.0.0"
+  dependencies:
+    cookie: "npm:^0.5.0"
+  checksum: 10/c8ef02aa5d3f6c786cfa407e1c93b4af29c600eb09990973f47a7a49e4771c1bec37c8f8e567638bb9cbc41f4e38d065ff1d8eaf9bf91f0c3613a6d60bc82c8c
+  languageName: node
+  linkType: hard
+
+"@bundled-es-modules/statuses@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "@bundled-es-modules/statuses@npm:1.0.1"
+  dependencies:
+    statuses: "npm:^2.0.1"
+  checksum: 10/9bf6a2bcf040a66fb805da0e1446041fd9def7468bb5da29c5ce02adf121a3f7cec123664308059a62a46fcaee666add83094b76df6dce72e5cafa8e6bebe60d
   languageName: node
   linkType: hard
 
 "@colors/colors@npm:1.5.0":
   version: 1.5.0
   resolution: "@colors/colors@npm:1.5.0"
-  checksum: d64d5260bed1d5012ae3fc617d38d1afc0329fec05342f4e6b838f46998855ba56e0a73833f4a80fa8378c84810da254f76a8a19c39d038260dc06dc4e007425
+  checksum: 10/9d226461c1e91e95f067be2bdc5e6f99cfe55a721f45afb44122e23e4b8602eeac4ff7325af6b5a369f36396ee1514d3809af3f57769066d80d83790d8e53339
   languageName: node
   linkType: hard
 
@@ -1807,43 +2098,43 @@ __metadata:
   version: 0.8.1
   resolution: "@cspotcode/source-map-support@npm:0.8.1"
   dependencies:
-    "@jridgewell/trace-mapping": 0.3.9
-  checksum: 5718f267085ed8edb3e7ef210137241775e607ee18b77d95aa5bd7514f47f5019aa2d82d96b3bf342ef7aa890a346fa1044532ff7cc3009e7d24fce3ce6200fa
+    "@jridgewell/trace-mapping": "npm:0.3.9"
+  checksum: 10/b6e38a1712fab242c86a241c229cf562195aad985d0564bd352ac404be583029e89e93028ffd2c251d2c407ecac5fb0cbdca94a2d5c10f29ac806ede0508b3ff
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^2.3.1":
-  version: 2.3.2
-  resolution: "@csstools/css-parser-algorithms@npm:2.3.2"
+"@csstools/css-parser-algorithms@npm:^2.6.1":
+  version: 2.6.1
+  resolution: "@csstools/css-parser-algorithms@npm:2.6.1"
   peerDependencies:
-    "@csstools/css-tokenizer": ^2.2.1
-  checksum: 71663a00369014727ac89ae738f0acd1341b2dc1474ff16799a6f4d24674c55c3ddb89d70c8f1ffc4e03508b18a621830f8f8a51707fda6cc5ea48f1a53cc559
+    "@csstools/css-tokenizer": ^2.2.4
+  checksum: 10/4ad4778525a92240c87ba063f3415216b36b81c45bbfcf69a4c82aab140e8943c269ef353ad6ac31de0950b776d972feb622df76b66180b402cba50951d0d58c
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^2.2.0":
-  version: 2.2.1
-  resolution: "@csstools/css-tokenizer@npm:2.2.1"
-  checksum: ebd9f65b253037d3a575ded45dbe41c12e71d83d6aa8a6a3a9fc2427862a805678df2a825cd19cf36b587be93f5cb1bd0932bb5c362d227ed9533db35b1fc6fa
+"@csstools/css-tokenizer@npm:^2.2.4":
+  version: 2.2.4
+  resolution: "@csstools/css-tokenizer@npm:2.2.4"
+  checksum: 10/13cc71a8ebc3ff81c49a459e57e1a94031969b70ce0e582bc949fa4f2d97900c07319866b080c57020896e4f5bee0968cc14f7bf41e7f105eb1c04a6c7bc33c4
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^2.1.4":
-  version: 2.1.5
-  resolution: "@csstools/media-query-list-parser@npm:2.1.5"
+"@csstools/media-query-list-parser@npm:^2.1.9":
+  version: 2.1.9
+  resolution: "@csstools/media-query-list-parser@npm:2.1.9"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.3.2
-    "@csstools/css-tokenizer": ^2.2.1
-  checksum: 119c27951377781c06c0b68ee6f7815c71d7623e439da0d5009f2101a6cd996f60b3fd60466d7059b8f7a936fbc9fbd2306ba953fa2daf9728a710881971ab08
+    "@csstools/css-parser-algorithms": ^2.6.1
+    "@csstools/css-tokenizer": ^2.2.4
+  checksum: 10/320b5916189b4899ec1186e4802483bcd28943d06af88d158f0f8289b04f57914fc6ff6a3fa9cd5b6a612b955a10f43e31d8de7ba74a7f9092c0a5dfced57102
   languageName: node
   linkType: hard
 
-"@csstools/selector-specificity@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@csstools/selector-specificity@npm:3.0.0"
+"@csstools/selector-specificity@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "@csstools/selector-specificity@npm:3.0.2"
   peerDependencies:
     postcss-selector-parser: ^6.0.13
-  checksum: 4a2dfe69998a499155d9dab4c2a0e7ae7594d8db98bb8a487d2d5347c0c501655051eb5eacad3fe323c86b0ba8212fe092c27fc883621e6ac2a27662edfc3528
+  checksum: 10/af3cc9282b600170b7de0fed2106830ab353359bd11f66cf71259419c9bddf8f0773c3a6e513cd9f66fd7e4920a1786a7c288723cbb3ae207974c1e7de26293e
   languageName: node
   linkType: hard
 
@@ -1851,25 +2142,25 @@ __metadata:
   version: 2.88.11
   resolution: "@cypress/request@npm:2.88.11"
   dependencies:
-    aws-sign2: ~0.7.0
-    aws4: ^1.8.0
-    caseless: ~0.12.0
-    combined-stream: ~1.0.6
-    extend: ~3.0.2
-    forever-agent: ~0.6.1
-    form-data: ~2.3.2
-    http-signature: ~1.3.6
-    is-typedarray: ~1.0.0
-    isstream: ~0.1.2
-    json-stringify-safe: ~5.0.1
-    mime-types: ~2.1.19
-    performance-now: ^2.1.0
-    qs: ~6.10.3
-    safe-buffer: ^5.1.2
-    tough-cookie: ~2.5.0
-    tunnel-agent: ^0.6.0
-    uuid: ^8.3.2
-  checksum: e4b3f62e0c41c4ccca6c942828461d8ea717e752fd918d685e9f74e2ebcfa8b7942427f7ce971e502635c3bf3d40011476db84dc753d3dc360c6d08350da6f93
+    aws-sign2: "npm:~0.7.0"
+    aws4: "npm:^1.8.0"
+    caseless: "npm:~0.12.0"
+    combined-stream: "npm:~1.0.6"
+    extend: "npm:~3.0.2"
+    forever-agent: "npm:~0.6.1"
+    form-data: "npm:~2.3.2"
+    http-signature: "npm:~1.3.6"
+    is-typedarray: "npm:~1.0.0"
+    isstream: "npm:~0.1.2"
+    json-stringify-safe: "npm:~5.0.1"
+    mime-types: "npm:~2.1.19"
+    performance-now: "npm:^2.1.0"
+    qs: "npm:~6.10.3"
+    safe-buffer: "npm:^5.1.2"
+    tough-cookie: "npm:~2.5.0"
+    tunnel-agent: "npm:^0.6.0"
+    uuid: "npm:^8.3.2"
+  checksum: 10/a185eea04924ce7cad2cb167d4f265bf5d8356c687b38b29e606f7c902710f6ed3914bd246bae4da506668af0e70bbcdbd86fe2d8805812c79a9edc73a82abc4
   languageName: node
   linkType: hard
 
@@ -1877,25 +2168,25 @@ __metadata:
   version: 3.0.1
   resolution: "@cypress/request@npm:3.0.1"
   dependencies:
-    aws-sign2: ~0.7.0
-    aws4: ^1.8.0
-    caseless: ~0.12.0
-    combined-stream: ~1.0.6
-    extend: ~3.0.2
-    forever-agent: ~0.6.1
-    form-data: ~2.3.2
-    http-signature: ~1.3.6
-    is-typedarray: ~1.0.0
-    isstream: ~0.1.2
-    json-stringify-safe: ~5.0.1
-    mime-types: ~2.1.19
-    performance-now: ^2.1.0
-    qs: 6.10.4
-    safe-buffer: ^5.1.2
-    tough-cookie: ^4.1.3
-    tunnel-agent: ^0.6.0
-    uuid: ^8.3.2
-  checksum: 7175522ebdbe30e3c37973e204c437c23ce659e58d5939466615bddcd58d778f3a8ea40f087b965ae8b8138ea8d102b729c6eb18c6324f121f3778f4a2e8e727
+    aws-sign2: "npm:~0.7.0"
+    aws4: "npm:^1.8.0"
+    caseless: "npm:~0.12.0"
+    combined-stream: "npm:~1.0.6"
+    extend: "npm:~3.0.2"
+    forever-agent: "npm:~0.6.1"
+    form-data: "npm:~2.3.2"
+    http-signature: "npm:~1.3.6"
+    is-typedarray: "npm:~1.0.0"
+    isstream: "npm:~0.1.2"
+    json-stringify-safe: "npm:~5.0.1"
+    mime-types: "npm:~2.1.19"
+    performance-now: "npm:^2.1.0"
+    qs: "npm:6.10.4"
+    safe-buffer: "npm:^5.1.2"
+    tough-cookie: "npm:^4.1.3"
+    tunnel-agent: "npm:^0.6.0"
+    uuid: "npm:^8.3.2"
+  checksum: 10/bf48bed6d6e493c05493902fb08b1d0646e7ec4300cf834816c2616f781db1a7fc447bd6f81de7c3076d738e8a6d75354e21d332f8f7ef8d9101d9b2f8e15b3a
   languageName: node
   linkType: hard
 
@@ -1903,15 +2194,31 @@ __metadata:
   version: 5.17.1
   resolution: "@cypress/webpack-preprocessor@npm:5.17.1"
   dependencies:
-    bluebird: 3.7.1
-    debug: ^4.3.4
-    lodash: ^4.17.20
+    bluebird: "npm:3.7.1"
+    debug: "npm:^4.3.4"
+    lodash: "npm:^4.17.20"
   peerDependencies:
     "@babel/core": ^7.0.1
     "@babel/preset-env": ^7.0.0
     babel-loader: ^8.0.2 || ^9
     webpack: ^4 || ^5
-  checksum: 4dc2babc77df5fad7eb16629ca716f73df930739563be6bff4e336f9a8f08cf80915a7eed2ea582294ed67336313b62cc30d04ebe3fc2a9b1e48e1445be3c297
+  checksum: 10/34cb577fb2fb49817ae72a02ca759bb4c0066ed3d90d4e9d0d3a0a028975d4df4dd787d19f209aeaeb6d6896c66a6d4ce81a41c6eb39886a09a6f783417e94e3
+  languageName: node
+  linkType: hard
+
+"@cypress/webpack-preprocessor@npm:6.0.1":
+  version: 6.0.1
+  resolution: "@cypress/webpack-preprocessor@npm:6.0.1"
+  dependencies:
+    bluebird: "npm:3.7.1"
+    debug: "npm:^4.3.4"
+    lodash: "npm:^4.17.20"
+  peerDependencies:
+    "@babel/core": ^7.0.1
+    "@babel/preset-env": ^7.0.0
+    babel-loader: ^8.3 || ^9
+    webpack: ^4 || ^5
+  checksum: 10/2c8423c7b0808a04c1b12d4f26fbac55ba488d22f55396822d3ad76735c1f60573e31935c4250afe87150260d592f88e2678a0a34ae569cc8e4bb7af1ab65aaa
   languageName: node
   linkType: hard
 
@@ -1919,30 +2226,37 @@ __metadata:
   version: 1.2.4
   resolution: "@cypress/xvfb@npm:1.2.4"
   dependencies:
-    debug: ^3.1.0
-    lodash.once: ^4.1.1
-  checksum: 7bdcdaeb1bb692ec9d9bf8ec52538aa0bead6764753f4a067a171a511807a43fab016f7285a56bef6a606c2467ff3f1365e1ad2d2d583b81beed849ee1573fd1
+    debug: "npm:^3.1.0"
+    lodash.once: "npm:^4.1.1"
+  checksum: 10/cb995b069f8c4f1e7857049bda0bd73a58e0048ccaf276ef0e66d1e1c03ba6fa099b5d765ad12ea37a7e5b7685f7413a2b9a99b27891407565b915f4a2f919a7
   languageName: node
   linkType: hard
 
-"@daybrush/utils@npm:1.13.0, @daybrush/utils@npm:^1.0.0, @daybrush/utils@npm:^1.1.1, @daybrush/utils@npm:^1.10.0, @daybrush/utils@npm:^1.13.0, @daybrush/utils@npm:^1.4.0, @daybrush/utils@npm:^1.6.0, @daybrush/utils@npm:^1.7.1":
+"@daybrush/utils@npm:1.13.0, @daybrush/utils@npm:^1.0.0, @daybrush/utils@npm:^1.1.1, @daybrush/utils@npm:^1.13.0, @daybrush/utils@npm:^1.4.0, @daybrush/utils@npm:^1.6.0, @daybrush/utils@npm:^1.7.1":
   version: 1.13.0
   resolution: "@daybrush/utils@npm:1.13.0"
-  checksum: 0ec0670016efc66b367fbef6581718eb5fc383b612d1290637845b9b9572e3cc19717ad63a35689f12d5a95a3dbdc9552fd1e57169077745ef0fee1a0b4e0fcd
+  checksum: 10/79a09fe785868b486d61effe665823642682c843f77b9e6ae840d75e5570975e1c85dc5b882369c05f6c4dee3215df0d954a7747e9c41e0ddeec56573ae49151
   languageName: node
   linkType: hard
 
 "@discoveryjs/json-ext@npm:0.5.7, @discoveryjs/json-ext@npm:^0.5.0, @discoveryjs/json-ext@npm:^0.5.3":
   version: 0.5.7
   resolution: "@discoveryjs/json-ext@npm:0.5.7"
-  checksum: 2176d301cc258ea5c2324402997cf8134ebb212469c0d397591636cea8d3c02f2b3cf9fd58dcb748c7a0dade77ebdc1b10284fa63e608c033a1db52fddc69918
+  checksum: 10/b95682a852448e8ef50d6f8e3b7ba288aab3fd98a2bafbe46881a3db0c6e7248a2debe9e1ee0d4137c521e4743ca5bbcb1c0765c9d7b3e0ef53231506fec42b4
+  languageName: node
+  linkType: hard
+
+"@dual-bundle/import-meta-resolve@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@dual-bundle/import-meta-resolve@npm:4.0.0"
+  checksum: 10/d41a39dcc5659c3ad066f7c59dfd585ca0b3de9f5efe15d043c8170979d65c469870c7cab0d9c286a687616ba4c226a038c52637df1190e60a5e9fefa2bb3ed5
   languageName: node
   linkType: hard
 
 "@egjs/agent@npm:^2.2.1":
   version: 2.3.0
   resolution: "@egjs/agent@npm:2.3.0"
-  checksum: 2506e8feff559ae256d5bf6ad15be5e207eb1b22d0c19aabe8292c41288ad7a0fe0527ca8a4c9227e16381a0e71237c6d061b5337d460a2cfad04859b41b0f20
+  checksum: 10/072b0a965bbdf7e939236953a7795d115996d5906efbf19a821f236dccb7e13b6479898534377af03f142d919f6de3416279c71f9d983acd21b934cf6d1760ba
   languageName: node
   linkType: hard
 
@@ -1950,15 +2264,15 @@ __metadata:
   version: 1.0.1
   resolution: "@egjs/children-differ@npm:1.0.1"
   dependencies:
-    "@egjs/list-differ": ^1.0.0
-  checksum: 087f286822a93cc5ac2ba0beb9f332f3828a8870fea0e9d0a177078c96fc265ce74979be827a78dab674a833e3a22d4fe60636112a1aae93252e0a38f58ff754
+    "@egjs/list-differ": "npm:^1.0.0"
+  checksum: 10/42377610027d55f680c345fac74ca2ba05277d5c766d9b8694ad8c806ed9966718c1fb1d3e50fc4cda30285aef3b99a05c7edb2227f9397b7064a6419e76e98e
   languageName: node
   linkType: hard
 
 "@egjs/list-differ@npm:^1.0.0":
   version: 1.0.0
   resolution: "@egjs/list-differ@npm:1.0.0"
-  checksum: d1827d134ddab12a024358367cb8a3b70d2ba0f286e5beb6ce2a6bbd021594f26b02c38b2d8b3d1dfd76bd7d1fcda54de3b40decaa9b4fc939230f6e7d531d0c
+  checksum: 10/803d8e981886d47c42601b0f02ebcc43407f175f1dc6c8777529c99184f5cde5f2721dfadfa2b66bd6d131d27cbb59887142631fc69caed84cfe5f3ca3af0d0e
   languageName: node
   linkType: hard
 
@@ -1966,18 +2280,18 @@ __metadata:
   version: 11.11.0
   resolution: "@emotion/babel-plugin@npm:11.11.0"
   dependencies:
-    "@babel/helper-module-imports": ^7.16.7
-    "@babel/runtime": ^7.18.3
-    "@emotion/hash": ^0.9.1
-    "@emotion/memoize": ^0.8.1
-    "@emotion/serialize": ^1.1.2
-    babel-plugin-macros: ^3.1.0
-    convert-source-map: ^1.5.0
-    escape-string-regexp: ^4.0.0
-    find-root: ^1.1.0
-    source-map: ^0.5.7
-    stylis: 4.2.0
-  checksum: 6b363edccc10290f7a23242c06f88e451b5feb2ab94152b18bb8883033db5934fb0e421e2d67d09907c13837c21218a3ac28c51707778a54d6cd3706c0c2f3f9
+    "@babel/helper-module-imports": "npm:^7.16.7"
+    "@babel/runtime": "npm:^7.18.3"
+    "@emotion/hash": "npm:^0.9.1"
+    "@emotion/memoize": "npm:^0.8.1"
+    "@emotion/serialize": "npm:^1.1.2"
+    babel-plugin-macros: "npm:^3.1.0"
+    convert-source-map: "npm:^1.5.0"
+    escape-string-regexp: "npm:^4.0.0"
+    find-root: "npm:^1.1.0"
+    source-map: "npm:^0.5.7"
+    stylis: "npm:4.2.0"
+  checksum: 10/8de017666838fc06b1a961d7a49b4e6dc0c83dbb064ea33512bae056594f0811a87e3242ef90fa2aa49fc080fab1cc7af536e7aee9398eaca7a1fc020d2dd527
   languageName: node
   linkType: hard
 
@@ -1985,11 +2299,11 @@ __metadata:
   version: 10.0.29
   resolution: "@emotion/cache@npm:10.0.29"
   dependencies:
-    "@emotion/sheet": 0.9.4
-    "@emotion/stylis": 0.8.5
-    "@emotion/utils": 0.11.3
-    "@emotion/weak-memoize": 0.2.5
-  checksum: 78b37fb0c2e513c90143a927abef229e995b6738ef8a92ce17abe2ed409b38859ddda7c14d7f4854d6f4e450b6db50231532f53a7fec4903d7ae775b2ae3fd64
+    "@emotion/sheet": "npm:0.9.4"
+    "@emotion/stylis": "npm:0.8.5"
+    "@emotion/utils": "npm:0.11.3"
+    "@emotion/weak-memoize": "npm:0.2.5"
+  checksum: 10/9978106bb1965e7167d37112fd8de3d12e877cdcf352da095cce7543615bfd4489f0ec798449bd4c8c77c80847175d52df60a84d259ec960af93f4c85293fd6a
   languageName: node
   linkType: hard
 
@@ -1997,12 +2311,12 @@ __metadata:
   version: 11.11.0
   resolution: "@emotion/cache@npm:11.11.0"
   dependencies:
-    "@emotion/memoize": ^0.8.1
-    "@emotion/sheet": ^1.2.2
-    "@emotion/utils": ^1.2.1
-    "@emotion/weak-memoize": ^0.3.1
-    stylis: 4.2.0
-  checksum: 8eb1dc22beaa20c21a2e04c284d5a2630a018a9d51fb190e52de348c8d27f4e8ca4bbab003d68b4f6cd9cc1c569ca747a997797e0f76d6c734a660dc29decf08
+    "@emotion/memoize": "npm:^0.8.1"
+    "@emotion/sheet": "npm:^1.2.2"
+    "@emotion/utils": "npm:^1.2.1"
+    "@emotion/weak-memoize": "npm:^0.3.1"
+    stylis: "npm:4.2.0"
+  checksum: 10/ef29756247dafb87168b4ffb76ee60feb06b8a1016323ecb1d3ba8aed3f4300ca10049bedbfe83aa11e0d81e616c328002a9d50020ebb3af6e4f5337a785c1fe
   languageName: node
   linkType: hard
 
@@ -2010,12 +2324,12 @@ __metadata:
   version: 11.11.2
   resolution: "@emotion/css@npm:11.11.2"
   dependencies:
-    "@emotion/babel-plugin": ^11.11.0
-    "@emotion/cache": ^11.11.0
-    "@emotion/serialize": ^1.1.2
-    "@emotion/sheet": ^1.2.2
-    "@emotion/utils": ^1.2.1
-  checksum: 1edea109dfc31005243334bc351ba127220ea5c4986225e0f1b8f7aa71fb2f83fb8f51d8f5b8afb8432d4c6397c23f5061038449f2876888eecc6eac1dd2f0da
+    "@emotion/babel-plugin": "npm:^11.11.0"
+    "@emotion/cache": "npm:^11.11.0"
+    "@emotion/serialize": "npm:^1.1.2"
+    "@emotion/sheet": "npm:^1.2.2"
+    "@emotion/utils": "npm:^1.2.1"
+  checksum: 10/718f758575f05e3610cdef9bdcfcdf17eae1992616c7cc85e29a24ff3b4d3da9968cc1c253a510874c056c22dc73b6b12bd759be9943e20141e0603a3cb35630
   languageName: node
   linkType: hard
 
@@ -2024,56 +2338,65 @@ __metadata:
   resolution: "@emotion/eslint-plugin@npm:11.11.0"
   peerDependencies:
     eslint: 6 || 7 || 8
-  checksum: 2d555b6790700e0d0c2862d4aa2fd697ea5851faa7e406ab459028e66daad2ee0dc3dec29362c2edc2656a63f826ac15629112d3e9aca64323fa40f9e5674bd4
+  checksum: 10/16ebc9d882ac89b9901e24c67507e16ec1fd12de3ed57f12541d32a2060b21162a414cb8cc65bf3a4ee2e96d8684322bb8a95b411d7c9cc36695cd99855dc836
   languageName: node
   linkType: hard
 
 "@emotion/hash@npm:0.8.0":
   version: 0.8.0
   resolution: "@emotion/hash@npm:0.8.0"
-  checksum: 4b35d88a97e67275c1d990c96d3b0450451d089d1508619488fc0acb882cb1ac91e93246d471346ebd1b5402215941ef4162efe5b51534859b39d8b3a0e3ffaa
+  checksum: 10/4b35d88a97e67275c1d990c96d3b0450451d089d1508619488fc0acb882cb1ac91e93246d471346ebd1b5402215941ef4162efe5b51534859b39d8b3a0e3ffaa
   languageName: node
   linkType: hard
 
 "@emotion/hash@npm:^0.9.1":
   version: 0.9.1
   resolution: "@emotion/hash@npm:0.9.1"
-  checksum: 716e17e48bf9047bf9383982c071de49f2615310fb4e986738931776f5a823bc1f29c84501abe0d3df91a3803c80122d24e28b57351bca9e01356ebb33d89876
+  checksum: 10/716e17e48bf9047bf9383982c071de49f2615310fb4e986738931776f5a823bc1f29c84501abe0d3df91a3803c80122d24e28b57351bca9e01356ebb33d89876
+  languageName: node
+  linkType: hard
+
+"@emotion/is-prop-valid@npm:^1.2.0":
+  version: 1.2.1
+  resolution: "@emotion/is-prop-valid@npm:1.2.1"
+  dependencies:
+    "@emotion/memoize": "npm:^0.8.1"
+  checksum: 10/fe231c472d38b3bbe519bcc9a5585cd41c45604147f3a065e333caf0f695d668aa21bc4229e657c1b6ea7398e096899e6ad54662548c73f11f6ba594aebd76a1
   languageName: node
   linkType: hard
 
 "@emotion/memoize@npm:0.7.4":
   version: 0.7.4
   resolution: "@emotion/memoize@npm:0.7.4"
-  checksum: 4e3920d4ec95995657a37beb43d3f4b7d89fed6caa2b173a4c04d10482d089d5c3ea50bbc96618d918b020f26ed6e9c4026bbd45433566576c1f7b056c3271dc
+  checksum: 10/4e3920d4ec95995657a37beb43d3f4b7d89fed6caa2b173a4c04d10482d089d5c3ea50bbc96618d918b020f26ed6e9c4026bbd45433566576c1f7b056c3271dc
   languageName: node
   linkType: hard
 
 "@emotion/memoize@npm:^0.8.1":
   version: 0.8.1
   resolution: "@emotion/memoize@npm:0.8.1"
-  checksum: a19cc01a29fcc97514948eaab4dc34d8272e934466ed87c07f157887406bc318000c69ae6f813a9001c6a225364df04249842a50e692ef7a9873335fbcc141b0
+  checksum: 10/a19cc01a29fcc97514948eaab4dc34d8272e934466ed87c07f157887406bc318000c69ae6f813a9001c6a225364df04249842a50e692ef7a9873335fbcc141b0
   languageName: node
   linkType: hard
 
-"@emotion/react@npm:11.11.1, @emotion/react@npm:^11.8.1":
-  version: 11.11.1
-  resolution: "@emotion/react@npm:11.11.1"
+"@emotion/react@npm:11.11.4, @emotion/react@npm:^11.8.1":
+  version: 11.11.4
+  resolution: "@emotion/react@npm:11.11.4"
   dependencies:
-    "@babel/runtime": ^7.18.3
-    "@emotion/babel-plugin": ^11.11.0
-    "@emotion/cache": ^11.11.0
-    "@emotion/serialize": ^1.1.2
-    "@emotion/use-insertion-effect-with-fallbacks": ^1.0.1
-    "@emotion/utils": ^1.2.1
-    "@emotion/weak-memoize": ^0.3.1
-    hoist-non-react-statics: ^3.3.1
+    "@babel/runtime": "npm:^7.18.3"
+    "@emotion/babel-plugin": "npm:^11.11.0"
+    "@emotion/cache": "npm:^11.11.0"
+    "@emotion/serialize": "npm:^1.1.3"
+    "@emotion/use-insertion-effect-with-fallbacks": "npm:^1.0.1"
+    "@emotion/utils": "npm:^1.2.1"
+    "@emotion/weak-memoize": "npm:^0.3.1"
+    hoist-non-react-statics: "npm:^3.3.1"
   peerDependencies:
     react: ">=16.8.0"
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: aec3c36650f5f0d3d4445ff44d73dd88712b1609645b6af3e6d08049cfbc51f1785fe13dea1a1d4ab1b0800d68f2339ab11e459687180362b1ef98863155aae5
+  checksum: 10/e7da3a1ddc1d72a4179010bdfd17423c13b1a77bf83a8b18271e919fd382d08c62dc2313ed5347acfd1ef85bb1bae8932597647a986e8a1ea1462552716cd495
   languageName: node
   linkType: hard
 
@@ -2081,60 +2404,60 @@ __metadata:
   version: 0.11.16
   resolution: "@emotion/serialize@npm:0.11.16"
   dependencies:
-    "@emotion/hash": 0.8.0
-    "@emotion/memoize": 0.7.4
-    "@emotion/unitless": 0.7.5
-    "@emotion/utils": 0.11.3
-    csstype: ^2.5.7
-  checksum: 2949832fab9d803e6236f2af6aad021c09c6b6722ae910b06b4ec3bfb84d77cbecfe3eab9a7dcc269ac73e672ef4b696c7836825931670cb110731712e331438
+    "@emotion/hash": "npm:0.8.0"
+    "@emotion/memoize": "npm:0.7.4"
+    "@emotion/unitless": "npm:0.7.5"
+    "@emotion/utils": "npm:0.11.3"
+    csstype: "npm:^2.5.7"
+  checksum: 10/a6c3b70417bb0fc0ca65da139b147fe5f2067010bd8f4e3dadebe3006777b020f4dc4317e82a5644aaa1c64026ffa9283fdc9777d365b37fcea57d9e1fed7a6c
   languageName: node
   linkType: hard
 
-"@emotion/serialize@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "@emotion/serialize@npm:1.1.2"
+"@emotion/serialize@npm:^1.1.2, @emotion/serialize@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "@emotion/serialize@npm:1.1.3"
   dependencies:
-    "@emotion/hash": ^0.9.1
-    "@emotion/memoize": ^0.8.1
-    "@emotion/unitless": ^0.8.1
-    "@emotion/utils": ^1.2.1
-    csstype: ^3.0.2
-  checksum: 413c352e657f1b5e27ea6437b3ef7dcc3860669b7ae17fd5c18bfbd44e033af1acc56b64d252284a813ca4f3b3e1b0841c42d3fb08e02d2df56fd3cd63d72986
+    "@emotion/hash": "npm:^0.9.1"
+    "@emotion/memoize": "npm:^0.8.1"
+    "@emotion/unitless": "npm:^0.8.1"
+    "@emotion/utils": "npm:^1.2.1"
+    csstype: "npm:^3.0.2"
+  checksum: 10/48d88923663273ae70359bc1a1f30454136716cbe0ddd9664be08e257ce56acedab911f125b627627358e37c9f450bbac3ea09b534ef42f9f67325d47b1e2a7b
   languageName: node
   linkType: hard
 
 "@emotion/sheet@npm:0.9.4":
   version: 0.9.4
   resolution: "@emotion/sheet@npm:0.9.4"
-  checksum: 53bb833b4bb69ea2af04e1ecad164f78fb2614834d2820f584c909686a8e047c44e96a6e824798c5c558e6d95e10772454a9e5c473c5dbe0d198e50deb2815bc
+  checksum: 10/53bb833b4bb69ea2af04e1ecad164f78fb2614834d2820f584c909686a8e047c44e96a6e824798c5c558e6d95e10772454a9e5c473c5dbe0d198e50deb2815bc
   languageName: node
   linkType: hard
 
 "@emotion/sheet@npm:^1.2.2":
   version: 1.2.2
   resolution: "@emotion/sheet@npm:1.2.2"
-  checksum: d973273c9c15f1c291ca2269728bf044bd3e92a67bca87943fa9ec6c3cd2b034f9a6bfe95ef1b5d983351d128c75b547b43ff196a00a3875f7e1d269793cecfe
+  checksum: 10/cc46b20ef7273dc28de889927ae1498f854be2890905745fcc3154fbbacaa54df1e28c3d89ff3339c2022782c78933f51955bb950d105d5a219576db1eadfb7a
   languageName: node
   linkType: hard
 
 "@emotion/stylis@npm:0.8.5":
   version: 0.8.5
   resolution: "@emotion/stylis@npm:0.8.5"
-  checksum: 67ff5958449b2374b329fb96e83cb9025775ffe1e79153b499537c6c8b2eb64b77f32d7b5d004d646973662356ceb646afd9269001b97c54439fceea3203ce65
+  checksum: 10/ceaa673457f501a393cb52873b2bc34dbe35ef0fb8faa4b943d73ecbbb42bc3cea53b87cbf482038b7b9b1f95859be3d8b58d508422b4d15aec5b62314cc3c1e
   languageName: node
   linkType: hard
 
 "@emotion/unitless@npm:0.7.5":
   version: 0.7.5
   resolution: "@emotion/unitless@npm:0.7.5"
-  checksum: f976e5345b53fae9414a7b2e7a949aa6b52f8bdbcc84458b1ddc0729e77ba1d1dfdff9960e0da60183877873d3a631fa24d9695dd714ed94bcd3ba5196586a6b
+  checksum: 10/f976e5345b53fae9414a7b2e7a949aa6b52f8bdbcc84458b1ddc0729e77ba1d1dfdff9960e0da60183877873d3a631fa24d9695dd714ed94bcd3ba5196586a6b
   languageName: node
   linkType: hard
 
 "@emotion/unitless@npm:^0.8.1":
   version: 0.8.1
   resolution: "@emotion/unitless@npm:0.8.1"
-  checksum: 385e21d184d27853bb350999471f00e1429fa4e83182f46cd2c164985999d9b46d558dc8b9cc89975cb337831ce50c31ac2f33b15502e85c299892e67e7b4a88
+  checksum: 10/918f73c46ac0b7161e3c341cc07d651ce87e31ab1695e74b12adb7da6bb98dfbff8c69cf68a4e40d9eb3d820ca055dc1267aeb3007927ce88f98b885bf729b63
   languageName: node
   linkType: hard
 
@@ -2143,57 +2466,71 @@ __metadata:
   resolution: "@emotion/use-insertion-effect-with-fallbacks@npm:1.0.1"
   peerDependencies:
     react: ">=16.8.0"
-  checksum: 700b6e5bbb37a9231f203bb3af11295eed01d73b2293abece0bc2a2237015e944d7b5114d4887ad9a79776504aa51ed2a8b0ddbc117c54495dd01a6b22f93786
+  checksum: 10/7d7ead9ba3f615510f550aea67815281ec5a5487de55aafc250f820317afc1fd419bd9e9e27602a0206ec5c152f13dc6130bccad312c1036706c584c65d66ef7
   languageName: node
   linkType: hard
 
 "@emotion/utils@npm:0.11.3":
   version: 0.11.3
   resolution: "@emotion/utils@npm:0.11.3"
-  checksum: 9c4204bda84f9acd153a9be9478a83f9baa74d5d7a4c21882681c4d1b86cd113b84540cb1f92e1c30313b5075f024da2658dbc553f5b00776ef9b6ec7991c0c9
+  checksum: 10/c69d9fe0846283354fae7c97e4fbc8fc7116ab48313665c3b5a11c9dabeb311b30d8f53ed358625070b9b7538462d80106228b00d7db7985d40c40225d01b276
   languageName: node
   linkType: hard
 
 "@emotion/utils@npm:^1.2.1":
   version: 1.2.1
   resolution: "@emotion/utils@npm:1.2.1"
-  checksum: e0b44be0705b56b079c55faff93952150be69e79b660ae70ddd5b6e09fc40eb1319654315a9f34bb479d7f4ec94be6068c061abbb9e18b9778ae180ad5d97c73
+  checksum: 10/472fa529c64a13edff80aa11698092e8841c1ffb5001c739d84eb9d0fdd6d8e1cd1848669310578ccfa6383b8601132eca54f8749fca40af85d21fdfc9b776c4
   languageName: node
   linkType: hard
 
 "@emotion/weak-memoize@npm:0.2.5":
   version: 0.2.5
   resolution: "@emotion/weak-memoize@npm:0.2.5"
-  checksum: 27d402b0c683b94658220b6d47840346ee582329ca2a15ec9c233492e0f1a27687ccb233b76eedc922f2e185e444cc89f7b97a81a1d3e5ae9f075bab08e965ea
+  checksum: 10/27d402b0c683b94658220b6d47840346ee582329ca2a15ec9c233492e0f1a27687ccb233b76eedc922f2e185e444cc89f7b97a81a1d3e5ae9f075bab08e965ea
   languageName: node
   linkType: hard
 
 "@emotion/weak-memoize@npm:^0.3.1":
   version: 0.3.1
   resolution: "@emotion/weak-memoize@npm:0.3.1"
-  checksum: b2be47caa24a8122622ea18cd2d650dbb4f8ad37b636dc41ed420c2e082f7f1e564ecdea68122b546df7f305b159bf5ab9ffee872abd0f052e687428459af594
+  checksum: 10/b2be47caa24a8122622ea18cd2d650dbb4f8ad37b636dc41ed420c2e082f7f1e564ecdea68122b546df7f305b159bf5ab9ffee872abd0f052e687428459af594
   languageName: node
   linkType: hard
 
-"@es-joy/jsdoccomment@npm:~0.39.4":
-  version: 0.39.4
-  resolution: "@es-joy/jsdoccomment@npm:0.39.4"
+"@es-joy/jsdoccomment@npm:~0.40.1":
+  version: 0.40.1
+  resolution: "@es-joy/jsdoccomment@npm:0.40.1"
   dependencies:
-    comment-parser: 1.3.1
-    esquery: ^1.5.0
-    jsdoc-type-pratt-parser: ~4.0.0
-  checksum: efae229ae998840fdcb4faf44574bcc0a070e4aa6df69c01afedaeaddf6d2ea857a68b463df45f9437231201201f092402968c0c53c34e3c09842fef0da7f2d4
+    comment-parser: "npm:1.4.0"
+    esquery: "npm:^1.5.0"
+    jsdoc-type-pratt-parser: "npm:~4.0.0"
+  checksum: 10/6501c292067b261be553cdc0dca97cc7075c012a5cf283b26e8baa2f5544f487019244af3283c5503f18a5d1d5ba68d00b7581b9fa321866603bf34b3288a1b7
   languageName: node
   linkType: hard
 
-"@es-joy/jsdoccomment@npm:~0.40.1":
-  version: 0.40.1
-  resolution: "@es-joy/jsdoccomment@npm:0.40.1"
+"@es-joy/jsdoccomment@npm:~0.42.0":
+  version: 0.42.0
+  resolution: "@es-joy/jsdoccomment@npm:0.42.0"
   dependencies:
-    comment-parser: 1.4.0
-    esquery: ^1.5.0
-    jsdoc-type-pratt-parser: ~4.0.0
-  checksum: 6098394cd97ad0532dde4f3171980e700e4199c231969311efd2362c2b5a4eefa9d59a0bc1fe513afbb5cc456ef7633491a2984d64252e7bd8ebe22489120610
+    comment-parser: "npm:1.4.1"
+    esquery: "npm:^1.5.0"
+    jsdoc-type-pratt-parser: "npm:~4.0.0"
+  checksum: 10/413c058f224f91cf6370a514e7024944d20977819724878121178e598714cc4734ee9898b3eca6396f67542ad81acd9d46d5a0209e62306b0ef17a28626ec566
+  languageName: node
+  linkType: hard
+
+"@esbuild/aix-ppc64@npm:0.20.1":
+  version: 0.20.1
+  resolution: "@esbuild/aix-ppc64@npm:0.20.1"
+  conditions: os=aix & cpu=ppc64
+  languageName: node
+  linkType: hard
+
+"@esbuild/aix-ppc64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/aix-ppc64@npm:0.20.2"
+  conditions: os=aix & cpu=ppc64
   languageName: node
   linkType: hard
 
@@ -2218,6 +2555,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/android-arm64@npm:0.20.1":
+  version: 0.20.1
+  resolution: "@esbuild/android-arm64@npm:0.20.1"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/android-arm64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/android-arm64@npm:0.20.2"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@esbuild/android-arm@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/android-arm@npm:0.17.19"
@@ -2239,6 +2590,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/android-arm@npm:0.20.1":
+  version: 0.20.1
+  resolution: "@esbuild/android-arm@npm:0.20.1"
+  conditions: os=android & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@esbuild/android-arm@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/android-arm@npm:0.20.2"
+  conditions: os=android & cpu=arm
+  languageName: node
+  linkType: hard
+
 "@esbuild/android-x64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/android-x64@npm:0.17.19"
@@ -2260,6 +2625,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/android-x64@npm:0.20.1":
+  version: 0.20.1
+  resolution: "@esbuild/android-x64@npm:0.20.1"
+  conditions: os=android & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/android-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/android-x64@npm:0.20.2"
+  conditions: os=android & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/darwin-arm64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/darwin-arm64@npm:0.17.19"
@@ -2281,6 +2660,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/darwin-arm64@npm:0.20.1":
+  version: 0.20.1
+  resolution: "@esbuild/darwin-arm64@npm:0.20.1"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/darwin-arm64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/darwin-arm64@npm:0.20.2"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@esbuild/darwin-x64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/darwin-x64@npm:0.17.19"
@@ -2302,6 +2695,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/darwin-x64@npm:0.20.1":
+  version: 0.20.1
+  resolution: "@esbuild/darwin-x64@npm:0.20.1"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/darwin-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/darwin-x64@npm:0.20.2"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/freebsd-arm64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/freebsd-arm64@npm:0.17.19"
@@ -2323,7 +2730,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/freebsd-x64@npm:0.17.19":
+"@esbuild/freebsd-arm64@npm:0.20.1":
+  version: 0.20.1
+  resolution: "@esbuild/freebsd-arm64@npm:0.20.1"
+  conditions: os=freebsd & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/freebsd-arm64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/freebsd-arm64@npm:0.20.2"
+  conditions: os=freebsd & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/freebsd-x64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/freebsd-x64@npm:0.17.19"
   conditions: os=freebsd & cpu=x64
@@ -2344,6 +2765,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/freebsd-x64@npm:0.20.1":
+  version: 0.20.1
+  resolution: "@esbuild/freebsd-x64@npm:0.20.1"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/freebsd-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/freebsd-x64@npm:0.20.2"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-arm64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/linux-arm64@npm:0.17.19"
@@ -2365,6 +2800,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-arm64@npm:0.20.1":
+  version: 0.20.1
+  resolution: "@esbuild/linux-arm64@npm:0.20.1"
+  conditions: os=linux & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-arm64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-arm64@npm:0.20.2"
+  conditions: os=linux & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-arm@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/linux-arm@npm:0.17.19"
@@ -2386,6 +2835,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-arm@npm:0.20.1":
+  version: 0.20.1
+  resolution: "@esbuild/linux-arm@npm:0.20.1"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-arm@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-arm@npm:0.20.2"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-ia32@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/linux-ia32@npm:0.17.19"
@@ -2407,6 +2870,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-ia32@npm:0.20.1":
+  version: 0.20.1
+  resolution: "@esbuild/linux-ia32@npm:0.20.1"
+  conditions: os=linux & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-ia32@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-ia32@npm:0.20.2"
+  conditions: os=linux & cpu=ia32
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-loong64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/linux-loong64@npm:0.17.19"
@@ -2428,6 +2905,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-loong64@npm:0.20.1":
+  version: 0.20.1
+  resolution: "@esbuild/linux-loong64@npm:0.20.1"
+  conditions: os=linux & cpu=loong64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-loong64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-loong64@npm:0.20.2"
+  conditions: os=linux & cpu=loong64
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-mips64el@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/linux-mips64el@npm:0.17.19"
@@ -2449,6 +2940,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-mips64el@npm:0.20.1":
+  version: 0.20.1
+  resolution: "@esbuild/linux-mips64el@npm:0.20.1"
+  conditions: os=linux & cpu=mips64el
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-mips64el@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-mips64el@npm:0.20.2"
+  conditions: os=linux & cpu=mips64el
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-ppc64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/linux-ppc64@npm:0.17.19"
@@ -2470,6 +2975,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-ppc64@npm:0.20.1":
+  version: 0.20.1
+  resolution: "@esbuild/linux-ppc64@npm:0.20.1"
+  conditions: os=linux & cpu=ppc64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-ppc64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-ppc64@npm:0.20.2"
+  conditions: os=linux & cpu=ppc64
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-riscv64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/linux-riscv64@npm:0.17.19"
@@ -2491,6 +3010,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-riscv64@npm:0.20.1":
+  version: 0.20.1
+  resolution: "@esbuild/linux-riscv64@npm:0.20.1"
+  conditions: os=linux & cpu=riscv64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-riscv64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-riscv64@npm:0.20.2"
+  conditions: os=linux & cpu=riscv64
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-s390x@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/linux-s390x@npm:0.17.19"
@@ -2512,6 +3045,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-s390x@npm:0.20.1":
+  version: 0.20.1
+  resolution: "@esbuild/linux-s390x@npm:0.20.1"
+  conditions: os=linux & cpu=s390x
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-s390x@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-s390x@npm:0.20.2"
+  conditions: os=linux & cpu=s390x
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-x64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/linux-x64@npm:0.17.19"
@@ -2533,6 +3080,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-x64@npm:0.20.1":
+  version: 0.20.1
+  resolution: "@esbuild/linux-x64@npm:0.20.1"
+  conditions: os=linux & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-x64@npm:0.20.2"
+  conditions: os=linux & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/netbsd-x64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/netbsd-x64@npm:0.17.19"
@@ -2554,6 +3115,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/netbsd-x64@npm:0.20.1":
+  version: 0.20.1
+  resolution: "@esbuild/netbsd-x64@npm:0.20.1"
+  conditions: os=netbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/netbsd-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/netbsd-x64@npm:0.20.2"
+  conditions: os=netbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/openbsd-x64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/openbsd-x64@npm:0.17.19"
@@ -2575,6 +3150,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/openbsd-x64@npm:0.20.1":
+  version: 0.20.1
+  resolution: "@esbuild/openbsd-x64@npm:0.20.1"
+  conditions: os=openbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/openbsd-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/openbsd-x64@npm:0.20.2"
+  conditions: os=openbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/sunos-x64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/sunos-x64@npm:0.17.19"
@@ -2596,6 +3185,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/sunos-x64@npm:0.20.1":
+  version: 0.20.1
+  resolution: "@esbuild/sunos-x64@npm:0.20.1"
+  conditions: os=sunos & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/sunos-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/sunos-x64@npm:0.20.2"
+  conditions: os=sunos & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/win32-arm64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/win32-arm64@npm:0.17.19"
@@ -2617,6 +3220,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/win32-arm64@npm:0.20.1":
+  version: 0.20.1
+  resolution: "@esbuild/win32-arm64@npm:0.20.1"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/win32-arm64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/win32-arm64@npm:0.20.2"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@esbuild/win32-ia32@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/win32-ia32@npm:0.17.19"
@@ -2638,6 +3255,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/win32-ia32@npm:0.20.1":
+  version: 0.20.1
+  resolution: "@esbuild/win32-ia32@npm:0.20.1"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"@esbuild/win32-ia32@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/win32-ia32@npm:0.20.2"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
 "@esbuild/win32-x64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/win32-x64@npm:0.17.19"
@@ -2659,59 +3290,165 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint-community/eslint-utils@npm:^4.2.0":
+"@esbuild/win32-x64@npm:0.20.1":
+  version: 0.20.1
+  resolution: "@esbuild/win32-x64@npm:0.20.1"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/win32-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/win32-x64@npm:0.20.2"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esfx/collection-core@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@esfx/collection-core@npm:1.0.0"
+  checksum: 10/7e26d89953a201a6c965af18516e48ea0628ca2674c56c51368d61a3dc47b7d47b05984dc2392fecbbda4bb7134e735da0a01445818dd843a2b54e5b2010b4a2
+  languageName: node
+  linkType: hard
+
+"@esfx/collections-hashmap@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "@esfx/collections-hashmap@npm:1.0.2"
+  dependencies:
+    "@esfx/collection-core": "npm:^1.0.0"
+    "@esfx/equatable": "npm:^1.0.2"
+  checksum: 10/caef6a231ad6bb9aee06cce1a5da4918c07868be9732c96cf268762d1e7cf06365409d59c2e4d47acd3ad81022a5e552f6c1b75660ecdb2eb68265b70f67749d
+  languageName: node
+  linkType: hard
+
+"@esfx/collections-hashset@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "@esfx/collections-hashset@npm:1.0.2"
+  dependencies:
+    "@esfx/collection-core": "npm:^1.0.0"
+    "@esfx/equatable": "npm:^1.0.2"
+  checksum: 10/75250e1682f42af85ff5e6b837e02faf27977515f52551857fcb28854025bc02d019801f062b92eef25b1781d1686453cb18726fa1468ed1c41eabe517860a4f
+  languageName: node
+  linkType: hard
+
+"@esfx/collections-linkedlist@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "@esfx/collections-linkedlist@npm:1.0.2"
+  dependencies:
+    "@esfx/collection-core": "npm:^1.0.0"
+    "@esfx/equatable": "npm:^1.0.2"
+  checksum: 10/ddaafab0d90a8588b4292639e194217dfa5403fe4e6acc375b235ba1736a69dd43893b507f9c4aaae04377d66b23a1da0bee063be578940a03124cf0a6372096
+  languageName: node
+  linkType: hard
+
+"@esfx/collections-multimap@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "@esfx/collections-multimap@npm:1.0.2"
+  dependencies:
+    "@esfx/collection-core": "npm:^1.0.0"
+    "@esfx/collections-hashmap": "npm:^1.0.2"
+    "@esfx/collections-hashset": "npm:^1.0.2"
+    "@esfx/equatable": "npm:^1.0.2"
+  checksum: 10/ba6aebb8c737d9f6d9c6a06edd6904bf731c0e0eddc4aaa1fd67cf074f04441c368feee7a37af7dcab658602959d75002cc314283accf37dc1789c7a81d65914
+  languageName: node
+  linkType: hard
+
+"@esfx/collections-sortedmap@npm:^1.0.0, @esfx/collections-sortedmap@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "@esfx/collections-sortedmap@npm:1.0.2"
+  dependencies:
+    "@esfx/collection-core": "npm:^1.0.0"
+    "@esfx/equatable": "npm:^1.0.2"
+  checksum: 10/428f752583b5fa78e57137952f4925ca8f54daa3816a34b699adcf2206e816f3771c0bf7cfcbeafcf36e4036df200ab90bd7e6d1067bc7dc04e1dcc10f24706a
+  languageName: node
+  linkType: hard
+
+"@esfx/collections-sortedset@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "@esfx/collections-sortedset@npm:1.0.2"
+  dependencies:
+    "@esfx/collection-core": "npm:^1.0.0"
+    "@esfx/equatable": "npm:^1.0.2"
+  checksum: 10/3f0f1fac9a861bcad3965ffa23b9519b92b6aa54bd163e72a4220cc699a7a0f8fa120deb05152fdc3a2071bd543103fe0de74760e5ce3366e3b79874b2749b1d
+  languageName: node
+  linkType: hard
+
+"@esfx/collections@npm:^1.0.0":
+  version: 1.0.2
+  resolution: "@esfx/collections@npm:1.0.2"
+  dependencies:
+    "@esfx/collections-hashmap": "npm:^1.0.2"
+    "@esfx/collections-hashset": "npm:^1.0.2"
+    "@esfx/collections-linkedlist": "npm:^1.0.2"
+    "@esfx/collections-multimap": "npm:^1.0.2"
+    "@esfx/collections-sortedmap": "npm:^1.0.2"
+    "@esfx/collections-sortedset": "npm:^1.0.2"
+  checksum: 10/3f7f8d908e0e4c7ec31f48b5f52a44d3ba00fa74dc20aa2fdb811a69612ff477b2c96a288970a29073c8a7281d1cdda58614272dd1ce7d2a88305a5f98b33f9f
+  languageName: node
+  linkType: hard
+
+"@esfx/equatable@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "@esfx/equatable@npm:1.0.2"
+  dependencies:
+    "@mapbox/node-pre-gyp": "npm:^1.0.9"
+  checksum: 10/54e9de6092116699fb206676c5afd7b513e7b3e3fa03d08b8ee84a6f3b4d0057346606ceb2745f47cb1e73be28e77ca3fa403f1dcc66151a1f7a2e9cb48f7df3
+  languageName: node
+  linkType: hard
+
+"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0":
   version: 4.4.0
   resolution: "@eslint-community/eslint-utils@npm:4.4.0"
   dependencies:
-    eslint-visitor-keys: ^3.3.0
+    eslint-visitor-keys: "npm:^3.3.0"
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
-  checksum: cdfe3ae42b4f572cbfb46d20edafe6f36fc5fb52bf2d90875c58aefe226892b9677fef60820e2832caf864a326fe4fc225714c46e8389ccca04d5f9288aabd22
+  checksum: 10/8d70bcdcd8cd279049183aca747d6c2ed7092a5cf0cf5916faac1ef37ffa74f0c245c2a3a3d3b9979d9dfdd4ca59257b4c5621db699d637b847a2c5e02f491c2
   languageName: node
   linkType: hard
 
-"@eslint-community/regexpp@npm:^4.4.0, @eslint-community/regexpp@npm:^4.6.1":
-  version: 4.9.1
-  resolution: "@eslint-community/regexpp@npm:4.9.1"
-  checksum: 06fb839e9c756f6375cc545c2f2e05a0a64576bd6370e8e3c07983fd29a3d6e164ef4aa48a361f7d27e6713ab79c83053ff6a2ccb78748bc955e344279c4a3b6
+"@eslint-community/regexpp@npm:^4.5.1, @eslint-community/regexpp@npm:^4.6.1":
+  version: 4.10.0
+  resolution: "@eslint-community/regexpp@npm:4.10.0"
+  checksum: 10/8c36169c815fc5d726078e8c71a5b592957ee60d08c6470f9ce0187c8046af1a00afbda0a065cc40ff18d5d83f82aed9793c6818f7304a74a7488dc9f3ecbd42
   languageName: node
   linkType: hard
 
-"@eslint/eslintrc@npm:^2.0.3, @eslint/eslintrc@npm:^2.1.2":
-  version: 2.1.2
-  resolution: "@eslint/eslintrc@npm:2.1.2"
+"@eslint/eslintrc@npm:^2.1.2, @eslint/eslintrc@npm:^2.1.4":
+  version: 2.1.4
+  resolution: "@eslint/eslintrc@npm:2.1.4"
   dependencies:
-    ajv: ^6.12.4
-    debug: ^4.3.2
-    espree: ^9.6.0
-    globals: ^13.19.0
-    ignore: ^5.2.0
-    import-fresh: ^3.2.1
-    js-yaml: ^4.1.0
-    minimatch: ^3.1.2
-    strip-json-comments: ^3.1.1
-  checksum: bc742a1e3b361f06fedb4afb6bf32cbd27171292ef7924f61c62f2aed73048367bcc7ac68f98c06d4245cd3fabc43270f844e3c1699936d4734b3ac5398814a7
-  languageName: node
-  linkType: hard
-
-"@eslint/js@npm:8.42.0":
-  version: 8.42.0
-  resolution: "@eslint/js@npm:8.42.0"
-  checksum: 750558843ac458f7da666122083ee05306fc087ecc1e5b21e7e14e23885775af6c55bcc92283dff1862b7b0d8863ec676c0f18c7faf1219c722fe91a8ece56b6
+    ajv: "npm:^6.12.4"
+    debug: "npm:^4.3.2"
+    espree: "npm:^9.6.0"
+    globals: "npm:^13.19.0"
+    ignore: "npm:^5.2.0"
+    import-fresh: "npm:^3.2.1"
+    js-yaml: "npm:^4.1.0"
+    minimatch: "npm:^3.1.2"
+    strip-json-comments: "npm:^3.1.1"
+  checksum: 10/7a3b14f4b40fc1a22624c3f84d9f467a3d9ea1ca6e9a372116cb92507e485260359465b58e25bcb6c9981b155416b98c9973ad9b796053fd7b3f776a6946bce8
   languageName: node
   linkType: hard
 
 "@eslint/js@npm:8.52.0":
   version: 8.52.0
   resolution: "@eslint/js@npm:8.52.0"
-  checksum: 490893b8091a66415f4ac98b963d23eb287264ea3bd6af7ec788f0570705cf64fd6ab84b717785980f55e39d08ff5c7fde6d8e4391ccb507169370ce3a6d091a
+  checksum: 10/86beff213d0ae4ced203a922b74e2cc4d767d109e7815f985bf648946ba072198977102e32afc9fa04f7825a6de83a831874f6b6675ba0c1d0743ade2dc2d53d
+  languageName: node
+  linkType: hard
+
+"@eslint/js@npm:8.57.0":
+  version: 8.57.0
+  resolution: "@eslint/js@npm:8.57.0"
+  checksum: 10/3c501ce8a997cf6cbbaf4ed358af5492875e3550c19b9621413b82caa9ae5382c584b0efa79835639e6e0ddaa568caf3499318e5bdab68643ef4199dce5eb0a0
   languageName: node
   linkType: hard
 
 "@fal-works/esbuild-plugin-global-externals@npm:^2.1.2":
   version: 2.1.2
   resolution: "@fal-works/esbuild-plugin-global-externals@npm:2.1.2"
-  checksum: c59715902b9062aa7ff38973f298b509499fd146dbf564dc338b3f9e896da5bffb4ca676c27587fde79b3586003e24d65960acb62f009bca43dca34c76f8cbf7
+  checksum: 10/fd68714cccfbd33a8ec31d11ac7c6373100a5e1b8e31941a45c723c802feccb0a00dde946f55cc91d58bff77d405adc2064b22f0faf5ee165968965e5da758a1
   languageName: node
   linkType: hard
 
@@ -2719,46 +3456,60 @@ __metadata:
   version: 3.4.2
   resolution: "@fingerprintjs/fingerprintjs@npm:3.4.2"
   dependencies:
-    tslib: ^2.4.1
-  checksum: 3b9dc81e4186f1aaa39e208c17939f5747bf9a8eb1c8175264a352e46e263abd81bcf89439240bd1a4755d7e3dfb4a83164e294f940abc290e7f2076d3b603ce
+    tslib: "npm:^2.4.1"
+  checksum: 10/14117347b17ae359a62bb81baf8840018e8e65a97c372835819ab1a947c10b907e9e369b3c02b0359f6298a379916475aa12e61989f2def57709a50facd341f0
   languageName: node
   linkType: hard
 
-"@floating-ui/core@npm:^1.4.2":
-  version: 1.5.0
-  resolution: "@floating-ui/core@npm:1.5.0"
+"@floating-ui/core@npm:^1.6.0":
+  version: 1.6.0
+  resolution: "@floating-ui/core@npm:1.6.0"
   dependencies:
-    "@floating-ui/utils": ^0.1.3
-  checksum: 54b4fe26b3c228746ac5589f97303abf158b80aa5f8b99027259decd68d1c2030c4c637648ebd33dfe78a4212699453bc2bd7537fd5a594d3bd3e63d362f666f
+    "@floating-ui/utils": "npm:^0.2.1"
+  checksum: 10/d6a47cacde193cd8ccb4c268b91ccc4ca254dffaec6242b07fd9bcde526044cc976d27933a7917f9a671de0a0e27f8d358f46400677dbd0c8199de293e9746e1
   languageName: node
   linkType: hard
 
-"@floating-ui/dom@npm:^1.0.1, @floating-ui/dom@npm:^1.5.1":
-  version: 1.5.3
-  resolution: "@floating-ui/dom@npm:1.5.3"
+"@floating-ui/dom@npm:^1.0.1, @floating-ui/dom@npm:^1.6.1":
+  version: 1.6.1
+  resolution: "@floating-ui/dom@npm:1.6.1"
   dependencies:
-    "@floating-ui/core": ^1.4.2
-    "@floating-ui/utils": ^0.1.3
-  checksum: 00053742064aac70957f0bd5c1542caafb3bfe9716588bfe1d409fef72a67ed5e60450d08eb492a77f78c22ed1ce4f7955873cc72bf9f9caf2b0f43ae3561c21
+    "@floating-ui/core": "npm:^1.6.0"
+    "@floating-ui/utils": "npm:^0.2.1"
+  checksum: 10/c010feb55be37662eb4cc8d0a22e21359c25247bbdcd9557617fd305cf08c8f020435b17e4b4f410201ba9abe3a0dd96b5c42d56e85f7a5e11e7d30b85afc116
   languageName: node
   linkType: hard
 
 "@floating-ui/react-dom@npm:^2.0.0":
-  version: 2.0.2
-  resolution: "@floating-ui/react-dom@npm:2.0.2"
+  version: 2.0.8
+  resolution: "@floating-ui/react-dom@npm:2.0.8"
   dependencies:
-    "@floating-ui/dom": ^1.5.1
+    "@floating-ui/dom": "npm:^1.6.1"
   peerDependencies:
     react: ">=16.8.0"
     react-dom: ">=16.8.0"
-  checksum: 4797e1f7a19c1e531ed0d578ccdcbe58970743e5a480ba30424857fc953063f36d481f8c5d69248a8f1d521b739e94bf5e1ffb35506400dea3d914f166ed2f7f
+  checksum: 10/e57b2a498aecf8de0ec28adf434257fca7893bd9bd7e78b63ac98c63b29b9fc086fc175630154352f3610f5c4a0d329823837f4f6c235cc0459fde6417065590
   languageName: node
   linkType: hard
 
-"@floating-ui/utils@npm:^0.1.3":
-  version: 0.1.4
-  resolution: "@floating-ui/utils@npm:0.1.4"
-  checksum: e6195ded5b3a6fd38411a833605184c31f24609b08feab2615e90ccc063bf4d3965383d817642fc7e8ca5ab6a54c29c71103e874f3afb0518595c8bd3390ba16
+"@floating-ui/react@npm:0.26.10":
+  version: 0.26.10
+  resolution: "@floating-ui/react@npm:0.26.10"
+  dependencies:
+    "@floating-ui/react-dom": "npm:^2.0.0"
+    "@floating-ui/utils": "npm:^0.2.0"
+    tabbable: "npm:^6.0.0"
+  peerDependencies:
+    react: ">=16.8.0"
+    react-dom: ">=16.8.0"
+  checksum: 10/7bbb22d61f180a3ef245da4c57c8773c38994087e1f593b2be7377796d66a0050109a4f3f57f63653662130bcf01c47a7b254d7448383339870bf9208624640d
+  languageName: node
+  linkType: hard
+
+"@floating-ui/utils@npm:^0.2.0, @floating-ui/utils@npm:^0.2.1":
+  version: 0.2.1
+  resolution: "@floating-ui/utils@npm:0.2.1"
+  checksum: 10/33c9ab346e7b05c5a1e6a95bc902aafcfc2c9d513a147e2491468843bd5607531b06d0b9aa56aa491cbf22a6c2495c18ccfc4c0344baec54a689a7bb8e4898d6
   languageName: node
   linkType: hard
 
@@ -2766,9 +3517,9 @@ __metadata:
   version: 1.12.0
   resolution: "@formatjs/ecma402-abstract@npm:1.12.0"
   dependencies:
-    "@formatjs/intl-localematcher": 0.2.31
-    tslib: 2.4.0
-  checksum: 29dc157d669f4fe267b850d06ae2c5a9b666a2b859ba1c99a8228bb10e9b2d7cbc19fdf0e247efed6f5100fd33333cecfb0e86315b52fad639cb137aef44b367
+    "@formatjs/intl-localematcher": "npm:0.2.31"
+    tslib: "npm:2.4.0"
+  checksum: 10/c839e2304effd8fa4cf5bd21f5a84cfa06a558735e272be7fe4a7718f47e882c1b6c6a8bdd7b980802cb6eac7e26ec9a7b0e01e850f59991f6d59ee006517702
   languageName: node
   linkType: hard
 
@@ -2776,8 +3527,8 @@ __metadata:
   version: 1.2.6
   resolution: "@formatjs/fast-memoize@npm:1.2.6"
   dependencies:
-    tslib: 2.4.0
-  checksum: cdb944a9207b5d74e0b4cdcd047e32d904b52b8f893227809a906f65882a46ae8b342872161d797dffd4fafd565f91efebb18989ffe888786bb5e5d911bc0193
+    tslib: "npm:2.4.0"
+  checksum: 10/cdb944a9207b5d74e0b4cdcd047e32d904b52b8f893227809a906f65882a46ae8b342872161d797dffd4fafd565f91efebb18989ffe888786bb5e5d911bc0193
   languageName: node
   linkType: hard
 
@@ -2785,10 +3536,10 @@ __metadata:
   version: 2.1.7
   resolution: "@formatjs/icu-messageformat-parser@npm:2.1.7"
   dependencies:
-    "@formatjs/ecma402-abstract": 1.12.0
-    "@formatjs/icu-skeleton-parser": 1.3.13
-    tslib: 2.4.0
-  checksum: 4a7e7b3628852c2379bd30b540c87fd1a84d0878ddd221b7b0fbad317263626d4ba063bf1be104aa9779bad3b819cfaf41f51cda0573787bdbea7acc607025cf
+    "@formatjs/ecma402-abstract": "npm:1.12.0"
+    "@formatjs/icu-skeleton-parser": "npm:1.3.13"
+    tslib: "npm:2.4.0"
+  checksum: 10/700e14a5be66306ea3b6521232dd6087dba5af6bb3b20fb3fe67ecdd1abd4318e0f83b2b1cd47723334fba16cca547f498031e57a3345d7e841745334cc2f580
   languageName: node
   linkType: hard
 
@@ -2796,9 +3547,9 @@ __metadata:
   version: 1.3.13
   resolution: "@formatjs/icu-skeleton-parser@npm:1.3.13"
   dependencies:
-    "@formatjs/ecma402-abstract": 1.12.0
-    tslib: 2.4.0
-  checksum: 8d52b4da2e25b1ab79300da1e7026b740467d3e66e99ae61cf7b6e890dc4a5790ee9c66944319a3f7a74d3e2807c81fa8573e7d33337311ffd9128b90d03c8c7
+    "@formatjs/ecma402-abstract": "npm:1.12.0"
+    tslib: "npm:2.4.0"
+  checksum: 10/053fa337c246451159aa132f39a9c75577eee5a553a76dcb2b57d7fe7e6e5c212f53b3eeb6810a9f7d5ced4f93f3ac2019f1ed5f437ee49275dea9bd73438e70
   languageName: node
   linkType: hard
 
@@ -2806,260 +3557,500 @@ __metadata:
   version: 0.2.31
   resolution: "@formatjs/intl-localematcher@npm:0.2.31"
   dependencies:
-    tslib: 2.4.0
-  checksum: c05bf5854f04ad0cc5ad78436023805c9542d97cdf000c685793e2053b84b585be3603b370e27921a617bbb87ef021239d773bc5326ab99850786c73d46a5156
+    tslib: "npm:2.4.0"
+  checksum: 10/c05bf5854f04ad0cc5ad78436023805c9542d97cdf000c685793e2053b84b585be3603b370e27921a617bbb87ef021239d773bc5326ab99850786c73d46a5156
   languageName: node
   linkType: hard
 
-"@gar/promisify@npm:^1.0.1, @gar/promisify@npm:^1.1.3":
+"@gar/promisify@npm:^1.0.1":
   version: 1.1.3
   resolution: "@gar/promisify@npm:1.1.3"
-  checksum: 4059f790e2d07bf3c3ff3e0fec0daa8144fe35c1f6e0111c9921bd32106adaa97a4ab096ad7dab1e28ee6a9060083c4d1a4ada42a7f5f3f7a96b8812e2b757c1
+  checksum: 10/052dd232140fa60e81588000cbe729a40146579b361f1070bce63e2a761388a22a16d00beeffc504bd3601cb8e055c57b21a185448b3ed550cf50716f4fd442e
   languageName: node
   linkType: hard
 
-"@glideapps/glide-data-grid@npm:^5.2.1":
-  version: 5.2.1
-  resolution: "@glideapps/glide-data-grid@npm:5.2.1"
+"@glideapps/glide-data-grid@npm:^6.0.0":
+  version: 6.0.3
+  resolution: "@glideapps/glide-data-grid@npm:6.0.3"
   dependencies:
-    canvas-hypertxt: ^0.0.7
-    react-number-format: ^5.0.0
+    "@linaria/react": "npm:^4.5.3"
+    canvas-hypertxt: "npm:^1.0.3"
+    react-number-format: "npm:^5.0.0"
   peerDependencies:
     lodash: ^4.17.19
     marked: ^4.0.10
     react: ^16.12.0 || 17.x || 18.x
     react-dom: ^16.12.0 || 17.x || 18.x
     react-responsive-carousel: ^3.2.7
-  checksum: a91d4049e7c6e1db8a8c00326adbc71c52f90d66398e9ea4b85218b8cf9ffd421a18188cb6e5abf6765ebcc73b376389222e42a87dd5ec441a22f8f197775e7c
+  checksum: 10/aa5f80b1bdba6550460771412794a75555e71807456e1906d512294128da3008c293fe9a6ee6ea1f2573ae24fb87ad8bb39fd1cb188419220b874b899993ada8
   languageName: node
   linkType: hard
 
-"@grafana-plugins/grafana-testdata-datasource@workspace:*, @grafana-plugins/grafana-testdata-datasource@workspace:public/app/plugins/datasource/grafana-testdata-datasource":
+"@grafana-plugins/grafana-azure-monitor-datasource@workspace:public/app/plugins/datasource/azuremonitor":
   version: 0.0.0-use.local
-  resolution: "@grafana-plugins/grafana-testdata-datasource@workspace:public/app/plugins/datasource/grafana-testdata-datasource"
-  dependencies:
-    "@emotion/css": 11.11.2
-    "@grafana/data": 10.3.0-pre
-    "@grafana/e2e-selectors": 10.3.0-pre
-    "@grafana/experimental": 1.7.0
-    "@grafana/plugin-configs": 10.3.0-pre
-    "@grafana/runtime": 10.3.0-pre
-    "@grafana/schema": 10.3.0-pre
-    "@grafana/ui": 10.3.0-pre
-    "@testing-library/react": 14.0.0
-    "@testing-library/user-event": 14.5.1
-    "@types/jest": 29.5.4
-    "@types/lodash": 4.14.195
-    "@types/node": 18.18.5
-    "@types/react": 18.2.15
-    "@types/testing-library__jest-dom": 5.14.8
-    lodash: 4.17.21
-    react: 18.2.0
-    react-use: 17.4.0
-    rxjs: 7.8.1
-    ts-node: 10.9.1
-    tslib: 2.6.0
-    webpack: 5.89.0
+  resolution: "@grafana-plugins/grafana-azure-monitor-datasource@workspace:public/app/plugins/datasource/azuremonitor"
+  dependencies:
+    "@emotion/css": "npm:11.11.2"
+    "@grafana/data": "npm:11.0.0"
+    "@grafana/e2e-selectors": "npm:11.0.0"
+    "@grafana/experimental": "npm:1.7.10"
+    "@grafana/plugin-configs": "npm:11.0.0"
+    "@grafana/runtime": "npm:11.0.0"
+    "@grafana/schema": "npm:11.0.0"
+    "@grafana/ui": "npm:11.0.0"
+    "@kusto/monaco-kusto": "npm:^10.0.0"
+    "@testing-library/react": "npm:14.2.2"
+    "@testing-library/user-event": "npm:14.5.2"
+    "@types/jest": "npm:29.5.12"
+    "@types/lodash": "npm:4.17.0"
+    "@types/node": "npm:20.11.30"
+    "@types/prismjs": "npm:1.26.3"
+    "@types/react": "npm:18.2.73"
+    "@types/testing-library__jest-dom": "npm:5.14.9"
+    fast-deep-equal: "npm:^3.1.3"
+    i18next: "npm:^23.0.0"
+    immer: "npm:10.0.4"
+    lodash: "npm:4.17.21"
+    monaco-editor: "npm:0.34.0"
+    prismjs: "npm:1.29.0"
+    react: "npm:18.2.0"
+    react-select-event: "npm:5.5.1"
+    react-use: "npm:17.5.0"
+    rxjs: "npm:7.8.1"
+    ts-node: "npm:10.9.2"
+    tslib: "npm:2.6.2"
+    typescript: "npm:5.3.3"
+    webpack: "npm:5.91.0"
   peerDependencies:
     "@grafana/runtime": "*"
   languageName: unknown
   linkType: soft
 
-"@grafana-plugins/input-datasource@workspace:plugins-bundled/internal/input-datasource":
+"@grafana-plugins/grafana-pyroscope-datasource@workspace:public/app/plugins/datasource/grafana-pyroscope-datasource":
   version: 0.0.0-use.local
-  resolution: "@grafana-plugins/input-datasource@workspace:plugins-bundled/internal/input-datasource"
-  dependencies:
-    "@grafana/data": 10.3.0-pre
-    "@grafana/tsconfig": ^1.2.0-rc1
-    "@grafana/ui": 10.3.0-pre
-    "@types/jest": 26.0.15
-    "@types/react": 18.0.28
-    copy-webpack-plugin: 11.0.0
-    eslint-webpack-plugin: 4.0.0
-    fork-ts-checker-webpack-plugin: 8.0.0
-    jest: 29.3.1
-    jest-environment-jsdom: 29.3.1
-    react: 18.2.0
-    swc-loader: 0.2.3
-    ts-jest: 29.0.5
-    ts-node: 10.9.1
-    tslib: 2.5.0
-    webpack: 5.76.0
+  resolution: "@grafana-plugins/grafana-pyroscope-datasource@workspace:public/app/plugins/datasource/grafana-pyroscope-datasource"
+  dependencies:
+    "@emotion/css": "npm:11.11.2"
+    "@grafana/data": "npm:11.0.0"
+    "@grafana/plugin-configs": "npm:11.0.0"
+    "@grafana/runtime": "npm:11.0.0"
+    "@grafana/schema": "npm:11.0.0"
+    "@grafana/ui": "npm:11.0.0"
+    "@testing-library/jest-dom": "npm:6.4.2"
+    "@testing-library/react": "npm:14.2.2"
+    "@testing-library/user-event": "npm:14.5.2"
+    "@types/jest": "npm:29.5.12"
+    "@types/lodash": "npm:4.17.0"
+    "@types/prismjs": "npm:1.26.3"
+    "@types/react": "npm:18.2.73"
+    "@types/react-dom": "npm:18.2.22"
+    "@types/testing-library__jest-dom": "npm:5.14.9"
+    css-loader: "npm:6.10.0"
+    fast-deep-equal: "npm:^3.1.3"
+    jest: "npm:29.7.0"
+    lodash: "npm:4.17.21"
+    monaco-editor: "npm:0.34.0"
+    prismjs: "npm:1.29.0"
+    react: "npm:18.2.0"
+    react-dom: "npm:18.2.0"
+    react-use: "npm:17.5.0"
+    rxjs: "npm:7.8.1"
+    style-loader: "npm:3.3.4"
+    ts-node: "npm:10.9.2"
+    tslib: "npm:2.6.2"
+    typescript: "npm:5.3.3"
+    webpack: "npm:5.91.0"
+  peerDependencies:
+    "@grafana/runtime": "*"
   languageName: unknown
   linkType: soft
 
-"@grafana/async-query-data@npm:0.1.4":
-  version: 0.1.4
-  resolution: "@grafana/async-query-data@npm:0.1.4"
-  dependencies:
-    tslib: ^2.4.1
-  checksum: e1954d2b77841cdf8a7686a6bd132fbdf647c2fb810d895b721b936bb883fdd00c13257edd4d3352c39cb3e0d2106ba424457e02c7cbe6ab359139c3e1e044a2
-  languageName: node
-  linkType: hard
-
-"@grafana/aws-sdk@npm:0.2.0":
-  version: 0.2.0
-  resolution: "@grafana/aws-sdk@npm:0.2.0"
-  dependencies:
-    "@grafana/async-query-data": 0.1.4
-    "@grafana/experimental": 1.1.0
-  checksum: 0ca92f9661c4557344a3ed0b696d3ef655b8c69fa2299de1cc9fd3a8f77c566be832492827aedf4ea38c1a5e892d0e170b7bd1e86d2892644cc274ebd72d21a0
-  languageName: node
-  linkType: hard
-
-"@grafana/data@10.3.0-pre, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data":
+"@grafana-plugins/grafana-testdata-datasource@workspace:public/app/plugins/datasource/grafana-testdata-datasource":
   version: 0.0.0-use.local
-  resolution: "@grafana/data@workspace:packages/grafana-data"
+  resolution: "@grafana-plugins/grafana-testdata-datasource@workspace:public/app/plugins/datasource/grafana-testdata-datasource"
   dependencies:
-    "@braintree/sanitize-url": 6.0.2
-    "@grafana/schema": 10.3.0-pre
-    "@grafana/tsconfig": ^1.2.0-rc1
-    "@rollup/plugin-commonjs": 25.0.2
-    "@rollup/plugin-json": 6.0.0
-    "@rollup/plugin-node-resolve": 15.2.3
-    "@testing-library/dom": 9.3.3
-    "@testing-library/jest-dom": 5.16.5
-    "@testing-library/react": 14.0.0
-    "@testing-library/user-event": 14.5.1
-    "@types/d3-interpolate": ^3.0.0
-    "@types/dompurify": ^2
-    "@types/history": 4.7.11
-    "@types/jest": 29.5.4
-    "@types/jquery": 3.5.16
-    "@types/lodash": 4.14.195
-    "@types/marked": 5.0.1
-    "@types/node": 18.18.4
-    "@types/papaparse": 5.3.7
-    "@types/react": 18.2.15
-    "@types/react-dom": 18.2.7
-    "@types/string-hash": 1.1.1
-    "@types/testing-library__jest-dom": 5.14.8
-    "@types/tinycolor2": 1.4.3
-    d3-interpolate: 3.0.1
-    date-fns: 2.30.0
-    dompurify: ^2.4.3
-    esbuild: 0.18.12
-    eventemitter3: 5.0.1
-    fast_array_intersect: 1.1.0
-    history: 4.10.1
-    lodash: 4.17.21
-    marked: 5.1.1
-    marked-mangle: 1.1.0
-    moment: 2.29.4
-    moment-timezone: 0.5.43
-    ol: 7.4.0
-    papaparse: 5.4.1
-    react: 18.2.0
-    react-dom: 18.2.0
-    react-test-renderer: 18.2.0
-    react-use: 17.4.0
-    regenerator-runtime: 0.14.0
-    rimraf: 5.0.1
-    rollup: 2.79.1
-    rollup-plugin-dts: ^5.0.0
-    rollup-plugin-esbuild: 5.0.0
-    rollup-plugin-node-externals: ^5.0.0
-    rxjs: 7.8.1
-    string-hash: ^1.1.3
-    tinycolor2: 1.6.0
-    tslib: 2.6.0
-    typescript: 4.8.4
-    uplot: 1.6.26
-    xss: ^1.0.14
+    "@emotion/css": "npm:11.11.2"
+    "@grafana/data": "npm:11.0.0"
+    "@grafana/e2e-selectors": "npm:11.0.0"
+    "@grafana/experimental": "npm:1.7.10"
+    "@grafana/plugin-configs": "npm:11.0.0"
+    "@grafana/runtime": "npm:11.0.0"
+    "@grafana/schema": "npm:11.0.0"
+    "@grafana/ui": "npm:11.0.0"
+    "@testing-library/react": "npm:14.2.2"
+    "@testing-library/user-event": "npm:14.5.2"
+    "@types/d3-random": "npm:^3.0.2"
+    "@types/jest": "npm:29.5.12"
+    "@types/lodash": "npm:4.17.0"
+    "@types/node": "npm:20.11.30"
+    "@types/react": "npm:18.2.73"
+    "@types/testing-library__jest-dom": "npm:5.14.9"
+    "@types/uuid": "npm:9.0.8"
+    d3-random: "npm:^3.0.1"
+    lodash: "npm:4.17.21"
+    micro-memoize: "npm:^4.1.2"
+    react: "npm:18.2.0"
+    react-use: "npm:17.5.0"
+    rxjs: "npm:7.8.1"
+    ts-node: "npm:10.9.2"
+    tslib: "npm:2.6.2"
+    uuid: "npm:9.0.1"
+    webpack: "npm:5.91.0"
   peerDependencies:
-    react: ^17.0.0 || ^18.0.0
-    react-dom: ^17.0.0 || ^18.0.0
+    "@grafana/runtime": "*"
   languageName: unknown
   linkType: soft
 
-"@grafana/e2e-selectors@10.3.0-pre, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors":
+"@grafana-plugins/jaeger@workspace:public/app/plugins/datasource/jaeger":
   version: 0.0.0-use.local
-  resolution: "@grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors"
+  resolution: "@grafana-plugins/jaeger@workspace:public/app/plugins/datasource/jaeger"
   dependencies:
-    "@grafana/tsconfig": ^1.2.0-rc1
-    "@rollup/plugin-commonjs": 25.0.2
-    "@rollup/plugin-node-resolve": 15.2.3
-    "@types/node": 18.18.4
-    esbuild: 0.18.12
-    rimraf: 5.0.1
-    rollup: 2.79.1
-    rollup-plugin-dts: ^5.0.0
-    rollup-plugin-esbuild: 5.0.0
-    rollup-plugin-node-externals: ^5.0.0
-    tslib: 2.6.0
-    typescript: 4.8.4
+    "@emotion/css": "npm:11.11.2"
+    "@grafana/data": "workspace:*"
+    "@grafana/experimental": "npm:1.7.10"
+    "@grafana/o11y-ds-frontend": "workspace:*"
+    "@grafana/plugin-configs": "workspace:*"
+    "@grafana/runtime": "workspace:*"
+    "@grafana/ui": "workspace:*"
+    "@testing-library/jest-dom": "npm:6.4.2"
+    "@testing-library/react": "npm:14.2.2"
+    "@testing-library/user-event": "npm:14.5.2"
+    "@types/jest": "npm:29.5.12"
+    "@types/lodash": "npm:4.17.0"
+    "@types/logfmt": "npm:^1.2.3"
+    "@types/react-window": "npm:1.8.8"
+    "@types/uuid": "npm:9.0.8"
+    lodash: "npm:4.17.21"
+    logfmt: "npm:^1.3.2"
+    react-window: "npm:1.8.10"
+    rxjs: "npm:7.8.1"
+    stream-browserify: "npm:3.0.0"
+    ts-node: "npm:10.9.2"
+    tslib: "npm:2.6.2"
+    uuid: "npm:9.0.1"
+    webpack: "npm:5.91.0"
+  peerDependencies:
+    "@grafana/runtime": "*"
   languageName: unknown
   linkType: soft
 
-"@grafana/e2e-selectors@npm:10.0.2":
-  version: 10.0.2
-  resolution: "@grafana/e2e-selectors@npm:10.0.2"
-  dependencies:
-    "@grafana/tsconfig": ^1.2.0-rc1
-    tslib: 2.5.0
-    typescript: 4.8.4
-  checksum: d8fc1ad3d9142d6fd9cd95fc54b825033565ad722145ab38dd922425a441d96b5c62866b4c17043dfc5a46c7f40050d81ba7e2847b1538abac51092e7358fbff
-  languageName: node
-  linkType: hard
-
-"@grafana/e2e@workspace:packages/grafana-e2e":
+"@grafana-plugins/parca@workspace:public/app/plugins/datasource/parca":
   version: 0.0.0-use.local
-  resolution: "@grafana/e2e@workspace:packages/grafana-e2e"
-  dependencies:
-    "@babel/core": 7.23.2
-    "@babel/preset-env": 7.23.2
-    "@cypress/webpack-preprocessor": 5.17.1
-    "@grafana/e2e-selectors": 10.3.0-pre
-    "@grafana/schema": 10.3.0-pre
-    "@grafana/tsconfig": ^1.2.0-rc1
-    "@mochajs/json-file-reporter": ^1.2.0
-    "@rollup/plugin-node-resolve": 15.2.3
-    "@types/chrome-remote-interface": 0.31.10
-    "@types/lodash": 4.14.195
-    "@types/node": 18.18.4
-    "@types/uuid": 9.0.2
-    babel-loader: 9.1.3
-    blink-diff: 1.0.13
-    chrome-remote-interface: 0.33.0
-    commander: 8.3.0
-    cypress: 9.5.1
-    cypress-file-upload: 5.0.8
-    devtools-protocol: 0.0.1170333
-    esbuild: 0.18.12
-    execa: 5.1.1
-    lodash: 4.17.21
-    mocha: 10.2.0
-    resolve-bin: 1.0.1
-    rimraf: 5.0.1
-    rollup: 2.79.1
-    rollup-plugin-dts: ^5.0.0
-    rollup-plugin-esbuild: 5.0.0
-    rollup-plugin-node-externals: ^5.0.0
-    tracelib: 1.0.1
-    ts-loader: 8.4.0
-    tslib: 2.6.0
-    typescript: 4.8.4
-    uuid: 9.0.0
-    webpack: 5.89.0
-    yaml: ^2.0.0
+  resolution: "@grafana-plugins/parca@workspace:public/app/plugins/datasource/parca"
+  dependencies:
+    "@emotion/css": "npm:11.11.2"
+    "@grafana/data": "npm:11.0.0"
+    "@grafana/plugin-configs": "npm:11.0.0"
+    "@grafana/runtime": "npm:11.0.0"
+    "@grafana/schema": "npm:11.0.0"
+    "@grafana/ui": "npm:11.0.0"
+    "@testing-library/react": "npm:14.2.2"
+    "@testing-library/user-event": "npm:14.5.2"
+    "@types/lodash": "npm:4.17.0"
+    "@types/react": "npm:18.2.73"
+    lodash: "npm:4.17.21"
+    monaco-editor: "npm:0.34.0"
+    react: "npm:18.2.0"
+    react-use: "npm:17.5.0"
+    rxjs: "npm:7.8.1"
+    ts-node: "npm:10.9.2"
+    tslib: "npm:2.6.2"
+    webpack: "npm:5.91.0"
+  peerDependencies:
+    "@grafana/runtime": "*"
+  languageName: unknown
+  linkType: soft
+
+"@grafana-plugins/stackdriver@workspace:public/app/plugins/datasource/cloud-monitoring":
+  version: 0.0.0-use.local
+  resolution: "@grafana-plugins/stackdriver@workspace:public/app/plugins/datasource/cloud-monitoring"
+  dependencies:
+    "@emotion/css": "npm:11.11.2"
+    "@grafana/data": "npm:11.0.0"
+    "@grafana/e2e-selectors": "npm:11.0.0"
+    "@grafana/experimental": "npm:1.7.10"
+    "@grafana/google-sdk": "npm:0.1.2"
+    "@grafana/plugin-configs": "npm:11.0.0"
+    "@grafana/runtime": "npm:11.0.0"
+    "@grafana/schema": "npm:11.0.0"
+    "@grafana/ui": "npm:11.0.0"
+    "@testing-library/react": "npm:14.2.2"
+    "@testing-library/user-event": "npm:14.5.2"
+    "@types/debounce-promise": "npm:3.1.9"
+    "@types/jest": "npm:29.5.12"
+    "@types/lodash": "npm:4.17.0"
+    "@types/node": "npm:20.11.30"
+    "@types/prismjs": "npm:1.26.3"
+    "@types/react": "npm:18.2.73"
+    "@types/react-test-renderer": "npm:18.0.7"
+    "@types/testing-library__jest-dom": "npm:5.14.9"
+    debounce-promise: "npm:3.1.2"
+    fast-deep-equal: "npm:^3.1.3"
+    i18next: "npm:^23.0.0"
+    immer: "npm:10.0.4"
+    lodash: "npm:4.17.21"
+    monaco-editor: "npm:0.34.0"
+    prismjs: "npm:1.29.0"
+    react: "npm:18.2.0"
+    react-select-event: "npm:5.5.1"
+    react-test-renderer: "npm:18.2.0"
+    react-use: "npm:17.5.0"
+    rxjs: "npm:7.8.1"
+    ts-node: "npm:10.9.2"
+    tslib: "npm:2.6.2"
+    typescript: "npm:5.3.3"
+    webpack: "npm:5.91.0"
+  peerDependencies:
+    "@grafana/runtime": "*"
+  languageName: unknown
+  linkType: soft
+
+"@grafana-plugins/tempo@workspace:public/app/plugins/datasource/tempo":
+  version: 0.0.0-use.local
+  resolution: "@grafana-plugins/tempo@workspace:public/app/plugins/datasource/tempo"
+  dependencies:
+    "@emotion/css": "npm:11.11.2"
+    "@grafana/data": "workspace:*"
+    "@grafana/e2e-selectors": "workspace:*"
+    "@grafana/experimental": "npm:1.7.10"
+    "@grafana/lezer-logql": "npm:0.2.3"
+    "@grafana/lezer-traceql": "npm:0.0.16"
+    "@grafana/monaco-logql": "npm:^0.0.7"
+    "@grafana/o11y-ds-frontend": "workspace:*"
+    "@grafana/plugin-configs": "npm:11.0.0"
+    "@grafana/runtime": "workspace:*"
+    "@grafana/schema": "workspace:*"
+    "@grafana/ui": "workspace:*"
+    "@lezer/common": "npm:1.2.1"
+    "@lezer/lr": "npm:1.3.3"
+    "@opentelemetry/api": "npm:1.7.0"
+    "@opentelemetry/exporter-collector": "npm:0.25.0"
+    "@opentelemetry/semantic-conventions": "npm:1.21.0"
+    "@testing-library/jest-dom": "npm:6.4.2"
+    "@testing-library/react": "npm:14.2.2"
+    "@testing-library/user-event": "npm:14.5.2"
+    "@types/jest": "npm:29.5.12"
+    "@types/lodash": "npm:4.17.0"
+    "@types/node": "npm:20.11.30"
+    "@types/prismjs": "npm:1.26.3"
+    "@types/react": "npm:18.2.73"
+    "@types/react-dom": "npm:18.2.22"
+    "@types/semver": "npm:7.5.8"
+    "@types/uuid": "npm:9.0.8"
+    buffer: "npm:6.0.3"
+    events: "npm:3.3.0"
+    glob: "npm:10.3.10"
+    i18next: "npm:^23.0.0"
+    lodash: "npm:4.17.21"
+    lru-cache: "npm:10.2.0"
+    monaco-editor: "npm:0.34.0"
+    prismjs: "npm:1.29.0"
+    react: "npm:18.2.0"
+    react-dom: "npm:18.2.0"
+    react-select-event: "npm:5.5.1"
+    react-use: "npm:17.5.0"
+    rxjs: "npm:7.8.1"
+    semver: "npm:7.6.0"
+    stream-browserify: "npm:3.0.0"
+    string_decoder: "npm:1.3.0"
+    ts-node: "npm:10.9.2"
+    tslib: "npm:2.6.2"
+    typescript: "npm:5.3.3"
+    uuid: "npm:9.0.1"
+    webpack: "npm:5.91.0"
+  peerDependencies:
+    "@grafana/runtime": "*"
+  languageName: unknown
+  linkType: soft
+
+"@grafana-plugins/zipkin@workspace:public/app/plugins/datasource/zipkin":
+  version: 0.0.0-use.local
+  resolution: "@grafana-plugins/zipkin@workspace:public/app/plugins/datasource/zipkin"
+  dependencies:
+    "@emotion/css": "npm:11.11.2"
+    "@grafana/data": "workspace:*"
+    "@grafana/experimental": "npm:1.7.10"
+    "@grafana/o11y-ds-frontend": "workspace:*"
+    "@grafana/plugin-configs": "workspace:*"
+    "@grafana/runtime": "workspace:*"
+    "@grafana/ui": "workspace:*"
+    "@testing-library/jest-dom": "npm:6.4.2"
+    "@testing-library/react": "npm:14.2.2"
+    "@types/jest": "npm:29.5.12"
+    "@types/lodash": "npm:4.17.0"
+    "@types/react": "npm:18.2.73"
+    lodash: "npm:4.17.21"
+    react: "npm:18.2.0"
+    react-use: "npm:17.5.0"
+    rxjs: "npm:7.8.1"
+    ts-node: "npm:10.9.2"
+    tslib: "npm:2.6.2"
+    webpack: "npm:5.91.0"
+  peerDependencies:
+    "@grafana/runtime": "*"
+  languageName: unknown
+  linkType: soft
+
+"@grafana/async-query-data@npm:0.1.4":
+  version: 0.1.4
+  resolution: "@grafana/async-query-data@npm:0.1.4"
+  dependencies:
+    tslib: "npm:^2.4.1"
+  checksum: 10/634dfe91c6bbc9742bf296062ead0414055b5e003da5ac776896d2ee22c8674476dd84c77637cc01a618906ab68531dfa9a45f971b0ffa78400943fe61378ab7
+  languageName: node
+  linkType: hard
+
+"@grafana/aws-sdk@npm:0.3.3":
+  version: 0.3.3
+  resolution: "@grafana/aws-sdk@npm:0.3.3"
+  dependencies:
+    "@grafana/async-query-data": "npm:0.1.4"
+    "@grafana/experimental": "npm:1.7.0"
+  checksum: 10/794de025e6c852ed77bd2bcc76f2b9bbe75af73e92c5d092824b4f053df23f1d4085a5710fe3851a158087283722f2b4b73a73c4b7a46c27fa879899d243bea9
+  languageName: node
+  linkType: hard
+
+"@grafana/data@npm:11.0.0, @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": "npm:7.0.1"
+    "@grafana/schema": "npm:11.0.0"
+    "@grafana/tsconfig": "npm:^1.3.0-rc1"
+    "@rollup/plugin-node-resolve": "npm:15.2.3"
+    "@types/d3-interpolate": "npm:^3.0.0"
+    "@types/dompurify": "npm:^3.0.0"
+    "@types/history": "npm:4.7.11"
+    "@types/lodash": "npm:4.17.0"
+    "@types/marked": "npm:5.0.2"
+    "@types/node": "npm:20.11.30"
+    "@types/papaparse": "npm:5.3.14"
+    "@types/react": "npm:18.2.73"
+    "@types/react-dom": "npm:18.2.22"
+    "@types/string-hash": "npm:1.1.3"
+    "@types/tinycolor2": "npm:1.4.6"
+    d3-interpolate: "npm:3.0.1"
+    date-fns: "npm:3.6.0"
+    dompurify: "npm:^3.0.0"
+    esbuild: "npm:0.18.12"
+    eventemitter3: "npm:5.0.1"
+    fast_array_intersect: "npm:1.1.0"
+    history: "npm:4.10.1"
+    lodash: "npm:4.17.21"
+    marked: "npm:12.0.1"
+    marked-mangle: "npm:1.1.7"
+    moment: "npm:2.30.1"
+    moment-timezone: "npm:0.5.45"
+    ol: "npm:7.4.0"
+    papaparse: "npm:5.4.1"
+    react: "npm:18.2.0"
+    react-dom: "npm:18.2.0"
+    react-use: "npm:17.5.0"
+    rimraf: "npm:5.0.5"
+    rollup: "npm:2.79.1"
+    rollup-plugin-dts: "npm:^5.0.0"
+    rollup-plugin-esbuild: "npm:5.0.0"
+    rollup-plugin-node-externals: "npm:^5.0.0"
+    rxjs: "npm:7.8.1"
+    string-hash: "npm:^1.1.3"
+    tinycolor2: "npm:1.6.0"
+    tslib: "npm:2.6.2"
+    typescript: "npm:5.3.3"
+    uplot: "npm:1.6.30"
+    xss: "npm:^1.0.14"
+  peerDependencies:
+    react: ^18.0.0
+    react-dom: ^18.0.0
+  languageName: unknown
+  linkType: soft
+
+"@grafana/e2e-selectors@npm:11.0.0, @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:
+    "@grafana/tsconfig": "npm:^1.3.0-rc1"
+    "@rollup/plugin-node-resolve": "npm:15.2.3"
+    "@types/node": "npm:20.11.30"
+    esbuild: "npm:0.18.12"
+    rimraf: "npm:5.0.5"
+    rollup: "npm:2.79.1"
+    rollup-plugin-dts: "npm:^5.0.0"
+    rollup-plugin-esbuild: "npm:5.0.0"
+    rollup-plugin-node-externals: "npm:^5.0.0"
+    tslib: "npm:2.6.2"
+    typescript: "npm:5.3.3"
+  languageName: unknown
+  linkType: soft
+
+"@grafana/e2e-selectors@npm:^10.4.1":
+  version: 10.4.2
+  resolution: "@grafana/e2e-selectors@npm:10.4.2"
+  dependencies:
+    "@grafana/tsconfig": "npm:^1.2.0-rc1"
+    tslib: "npm:2.6.2"
+    typescript: "npm:5.3.3"
+  checksum: 10/a8eb622ff0137eb759cead6d7cc81c1fc9e00a6666655cf3043ea8ba23aada8e1148810471ac92911b412854028a527fd75be7a9519e4fa7826a111c555b5ffb
+  languageName: node
+  linkType: hard
+
+"@grafana/e2e@npm:11.0.0, @grafana/e2e@workspace:packages/grafana-e2e":
+  version: 0.0.0-use.local
+  resolution: "@grafana/e2e@workspace:packages/grafana-e2e"
+  dependencies:
+    "@babel/core": "npm:7.23.2"
+    "@babel/preset-env": "npm:7.23.2"
+    "@cypress/webpack-preprocessor": "npm:5.17.1"
+    "@grafana/e2e-selectors": "npm:11.0.0"
+    "@grafana/schema": "npm:11.0.0"
+    "@grafana/tsconfig": "npm:^1.3.0-rc1"
+    "@mochajs/json-file-reporter": "npm:^1.2.0"
+    "@rollup/plugin-node-resolve": "npm:15.2.3"
+    "@types/chrome-remote-interface": "npm:0.31.10"
+    "@types/lodash": "npm:4.14.195"
+    "@types/node": "npm:18.18.4"
+    "@types/uuid": "npm:9.0.2"
+    babel-loader: "npm:9.1.3"
+    blink-diff: "npm:1.0.13"
+    chrome-remote-interface: "npm:0.33.0"
+    commander: "npm:8.3.0"
+    cypress: "npm:9.5.1"
+    cypress-file-upload: "npm:5.0.8"
+    devtools-protocol: "npm:0.0.1170333"
+    esbuild: "npm:0.18.12"
+    execa: "npm:5.1.1"
+    lodash: "npm:4.17.21"
+    mocha: "npm:10.2.0"
+    resolve-bin: "npm:1.0.1"
+    rimraf: "npm:5.0.1"
+    rollup: "npm:2.79.1"
+    rollup-plugin-dts: "npm:^5.0.0"
+    rollup-plugin-esbuild: "npm:5.0.0"
+    rollup-plugin-node-externals: "npm:^5.0.0"
+    tracelib: "npm:1.0.1"
+    ts-loader: "npm:8.4.0"
+    tslib: "npm:2.6.0"
+    typescript: "npm:5.2.2"
+    uuid: "npm:9.0.0"
+    webpack: "npm:5.89.0"
+    yaml: "npm:^2.0.0"
   bin:
     grafana-e2e: bin/grafana-e2e.js
   languageName: unknown
   linkType: soft
 
-"@grafana/eslint-config@npm:6.0.1":
-  version: 6.0.1
-  resolution: "@grafana/eslint-config@npm:6.0.1"
+"@grafana/eslint-config@npm:7.0.0":
+  version: 7.0.0
+  resolution: "@grafana/eslint-config@npm:7.0.0"
   dependencies:
-    "@typescript-eslint/eslint-plugin": 5.59.9
-    "@typescript-eslint/parser": 5.59.9
-    eslint: 8.42.0
-    eslint-config-prettier: 8.8.0
-    eslint-plugin-jsdoc: 46.2.6
-    eslint-plugin-react: 7.32.2
-    eslint-plugin-react-hooks: 4.6.0
-    typescript: 4.8.4
-  checksum: 6744cc4b48d7504f574798fc442e1c794f784bc408b435ed43cb1baef8d0ab83554c5ac2a6437af352ee5df241055050217d5a67e15491a6116555c92c349c31
+    "@typescript-eslint/eslint-plugin": "npm:6.18.1"
+    "@typescript-eslint/parser": "npm:6.18.1"
+    eslint: "npm:8.52.0"
+    eslint-config-prettier: "npm:8.8.0"
+    eslint-plugin-jsdoc: "npm:46.8.2"
+    eslint-plugin-react: "npm:7.33.2"
+    eslint-plugin-react-hooks: "npm:4.6.0"
+    typescript: "npm:5.2.2"
+  checksum: 10/62af39e70bea66585684877e5afd2cb48432ac8a5b6b2b18ba3ecc20a47dd53249946891d107c120e80d2cbbb69dd902d6c0748fe216c7987b965ba15e33e2d2
   languageName: node
   linkType: hard
 
@@ -3073,37 +4064,19 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@grafana/eslint-plugin@workspace:packages/grafana-eslint-rules"
   dependencies:
-    "@typescript-eslint/types": ^5.46.1
-    "@typescript-eslint/utils": ^5.46.1
-    eslint: 8.52.0
-    tslib: 2.6.0
+    "@typescript-eslint/types": "npm:^6.0.0"
+    "@typescript-eslint/utils": "npm:^6.0.0"
+    eslint: "npm:8.57.0"
+    tslib: "npm:2.6.2"
   languageName: unknown
   linkType: soft
 
-"@grafana/experimental@npm:1.1.0":
-  version: 1.1.0
-  resolution: "@grafana/experimental@npm:1.1.0"
-  dependencies:
-    "@types/uuid": ^8.3.3
-    uuid: ^8.3.2
-  peerDependencies:
-    "@emotion/css": 11.1.3
-    "@grafana/data": ^9.2.0
-    "@grafana/runtime": ^9.2.0
-    "@grafana/ui": ^9.2.0
-    react: 17.0.2
-    react-dom: 17.0.2
-    react-select: ^5.2.1
-  checksum: 821be35785cfdfb64402cf30c8125cdb2b64ac913f5131931afbd3244f31faeccb900e6be431e145a085536ee91a64d4bced5f8a1e067f77201868321722b26d
-  languageName: node
-  linkType: hard
-
 "@grafana/experimental@npm:1.7.0":
   version: 1.7.0
   resolution: "@grafana/experimental@npm:1.7.0"
   dependencies:
-    "@types/uuid": ^8.3.3
-    uuid: ^8.3.2
+    "@types/uuid": "npm:^8.3.3"
+    uuid: "npm:^8.3.2"
   peerDependencies:
     "@emotion/css": 11.1.3
     "@grafana/data": ^10.0.0
@@ -3113,50 +4086,75 @@ __metadata:
     react-dom: 17.0.2
     react-select: ^5.2.1
     rxjs: 7.8.0
-  checksum: f418072aab298bf5fa4b80d59593f10c62e77347e346cc5f669bdee1de2626fdd9f3d999da55a3079ccf6c6df979fc82e8e4d2e3d3bff2e66e49a0c38b8b80a0
+  checksum: 10/1d30e266d3b2b26f66ff8981ebd0f9804574349079e205b70690cff6f5e742a26096dc90fa90e8faa44cf4bc91a2650cae7994b5eb396663f8b7e73beaccda9b
   languageName: node
   linkType: hard
 
-"@grafana/experimental@npm:1.7.4":
-  version: 1.7.4
-  resolution: "@grafana/experimental@npm:1.7.4"
+"@grafana/experimental@npm:1.7.10":
+  version: 1.7.10
+  resolution: "@grafana/experimental@npm:1.7.10"
   dependencies:
-    "@types/uuid": ^8.3.3
-    semver: ^7.5.4
-    uuid: ^8.3.2
+    "@types/uuid": "npm:^8.3.3"
+    lodash: "npm:^4.17.21"
+    prismjs: "npm:^1.29.0"
+    react-beautiful-dnd: "npm:^13.1.1"
+    react-popper-tooltip: "npm:^4.4.2"
+    react-use: "npm:^17.4.2"
+    semver: "npm:^7.5.4"
+    uuid: "npm:^8.3.2"
   peerDependencies:
-    "@emotion/css": 11.1.3
+    "@emotion/css": 11.11.2
     "@grafana/data": ^10.0.0
+    "@grafana/e2e-selectors": ^10.0.0
     "@grafana/runtime": ^10.0.0
     "@grafana/ui": ^10.0.0
     react: 17.0.2
     react-dom: 17.0.2
     react-select: ^5.2.1
     rxjs: 7.8.0
-  checksum: f5d7074cfe1e2efebcb16d458d1e3715ab4cf2d90b4be7b16612fdd0c0269527b9b9394a6f265f1cfc4958b046416f52c6d6f5f6647c051ee5dccd9884859ba7
+  checksum: 10/3de84835b6927449a796e9f9f6c48a9bf71d8e5eee414532b173a77b131f9e795bfc2ac3df10eb751b204197903f09ecb627ff208ad844ae2cd83b7797d95c19
   languageName: node
   linkType: hard
 
-"@grafana/faro-core@npm:1.2.1, @grafana/faro-core@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "@grafana/faro-core@npm:1.2.1"
+"@grafana/faro-core@npm:^1.3.6, @grafana/faro-core@npm:^1.6.0":
+  version: 1.6.0
+  resolution: "@grafana/faro-core@npm:1.6.0"
   dependencies:
-    "@opentelemetry/api": ^1.4.1
-    "@opentelemetry/api-metrics": ^0.33.0
-    "@opentelemetry/otlp-transformer": ^0.41.2
-    murmurhash-js: ^1.0.0
-  checksum: 3a298c49336c99cf782b0459bdf848c2bac83a0230bceebfe3e7818a310e03fb1001d55cc756fc5fce093869bceb5df59378a3db80cb9693c6c80205492f666d
+    "@opentelemetry/api": "npm:^1.7.0"
+    "@opentelemetry/otlp-transformer": "npm:^0.48.0"
+  checksum: 10/42fe689be231126793e8129dd6c29661618ede36d479756aa02835c7687838861fd795119543c732359388d4f253bfe0ae01f04b2bee9253294ea9ff7bd3aa25
   languageName: node
   linkType: hard
 
-"@grafana/faro-web-sdk@npm:1.2.1":
-  version: 1.2.1
-  resolution: "@grafana/faro-web-sdk@npm:1.2.1"
+"@grafana/faro-core@npm:^1.5.0":
+  version: 1.5.0
+  resolution: "@grafana/faro-core@npm:1.5.0"
+  dependencies:
+    "@opentelemetry/api": "npm:^1.7.0"
+    "@opentelemetry/otlp-transformer": "npm:^0.48.0"
+  checksum: 10/d02fe9bf2096dd1461a7b753898b982e19cb4165ea946bd571f4b0aa8f53b3c4a291576cbeb88fe1c3d203b53dde8bf332ea3e194582b0dd8302c98f11baf5ad
+  languageName: node
+  linkType: hard
+
+"@grafana/faro-web-sdk@npm:1.5.0":
+  version: 1.5.0
+  resolution: "@grafana/faro-web-sdk@npm:1.5.0"
+  dependencies:
+    "@grafana/faro-core": "npm:^1.5.0"
+    ua-parser-js: "npm:^1.0.32"
+    web-vitals: "npm:^3.1.1"
+  checksum: 10/3bdec02093eaed76fb2518948d355aea414bf83a83489c89026c14523d6a4cbcf2c88377fc2ca89b65c209f8554431a23c722124d98d6fd4a4e79d0d6104a64b
+  languageName: node
+  linkType: hard
+
+"@grafana/faro-web-sdk@npm:^1.3.6":
+  version: 1.6.0
+  resolution: "@grafana/faro-web-sdk@npm:1.6.0"
   dependencies:
-    "@grafana/faro-core": ^1.2.1
-    ua-parser-js: ^1.0.32
-    web-vitals: ^3.1.1
-  checksum: bc91b2a282dbcb66c5530c5b915de4166a9bd51d58914cbfadd64201f95c757d71a36ebf65f4a73dedde506d68201baa522e3fbe63af2fbc8beb5305da68dcbd
+    "@grafana/faro-core": "npm:^1.6.0"
+    ua-parser-js: "npm:^1.0.32"
+    web-vitals: "npm:^3.1.1"
+  checksum: 10/65db25703bd4f26bf7509ddf5bfa5a47df38e5a6a014612eb707a2475641baff95a27196f760ee68301347735b10006e0cf58e6f47fed553c2c01c264232e76f
   languageName: node
   linkType: hard
 
@@ -3164,74 +4162,74 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@grafana/flamegraph@workspace:packages/grafana-flamegraph"
   dependencies:
-    "@babel/core": 7.23.2
-    "@babel/preset-env": 7.23.2
-    "@babel/preset-react": 7.22.5
-    "@emotion/css": 11.11.2
-    "@grafana/data": 10.3.0-pre
-    "@grafana/tsconfig": ^1.2.0-rc1
-    "@grafana/ui": 10.3.0-pre
-    "@leeoniya/ufuzzy": 1.0.8
-    "@rollup/plugin-node-resolve": 15.2.3
-    "@testing-library/jest-dom": ^6.1.2
-    "@testing-library/react": 14.0.0
-    "@testing-library/user-event": 14.5.1
-    "@types/d3": ^7
-    "@types/jest": ^29.5.4
-    "@types/lodash": 4.14.195
-    "@types/react": 18.2.15
-    "@types/react-virtualized-auto-sizer": 1.0.1
-    "@types/tinycolor2": 1.4.3
-    babel-jest: 29.7.0
-    d3: ^7.8.5
-    jest: ^29.6.4
-    jest-canvas-mock: 2.5.2
-    lodash: 4.17.21
-    react: 18.2.0
-    react-use: 17.4.0
-    react-virtualized-auto-sizer: 1.0.7
-    rollup: 2.79.1
-    rollup-plugin-dts: ^5.0.0
-    rollup-plugin-esbuild: 5.0.0
-    rollup-plugin-node-externals: ^5.0.0
-    tinycolor2: 1.6.0
-    ts-jest: 29.1.1
-    ts-node: 10.9.1
-    tslib: 2.6.0
-    typescript: 4.8.4
+    "@babel/core": "npm:7.24.3"
+    "@babel/preset-env": "npm:7.24.3"
+    "@babel/preset-react": "npm:7.24.1"
+    "@emotion/css": "npm:11.11.2"
+    "@grafana/data": "npm:11.0.0"
+    "@grafana/tsconfig": "npm:^1.3.0-rc1"
+    "@grafana/ui": "npm:11.0.0"
+    "@leeoniya/ufuzzy": "npm:1.0.14"
+    "@rollup/plugin-node-resolve": "npm:15.2.3"
+    "@testing-library/jest-dom": "npm:^6.1.2"
+    "@testing-library/react": "npm:14.2.2"
+    "@testing-library/user-event": "npm:14.5.2"
+    "@types/d3": "npm:^7"
+    "@types/jest": "npm:^29.5.4"
+    "@types/lodash": "npm:4.17.0"
+    "@types/react": "npm:18.2.73"
+    "@types/react-virtualized-auto-sizer": "npm:1.0.4"
+    "@types/tinycolor2": "npm:1.4.6"
+    babel-jest: "npm:29.7.0"
+    d3: "npm:^7.8.5"
+    jest: "npm:^29.6.4"
+    jest-canvas-mock: "npm:2.5.2"
+    lodash: "npm:4.17.21"
+    react: "npm:18.2.0"
+    react-use: "npm:17.5.0"
+    react-virtualized-auto-sizer: "npm:1.0.24"
+    rollup: "npm:2.79.1"
+    rollup-plugin-dts: "npm:^5.0.0"
+    rollup-plugin-esbuild: "npm:5.0.0"
+    rollup-plugin-node-externals: "npm:^5.0.0"
+    tinycolor2: "npm:1.6.0"
+    ts-jest: "npm:29.1.2"
+    ts-node: "npm:10.9.2"
+    tslib: "npm:2.6.2"
+    typescript: "npm:5.3.3"
   peerDependencies:
-    react: ^17.0.0 || ^18.0.0
-    react-dom: ^17.0.0 || ^18.0.0
+    react: ^18.0.0
+    react-dom: ^18.0.0
   languageName: unknown
   linkType: soft
 
-"@grafana/google-sdk@npm:0.1.1":
-  version: 0.1.1
-  resolution: "@grafana/google-sdk@npm:0.1.1"
+"@grafana/google-sdk@npm:0.1.2":
+  version: 0.1.2
+  resolution: "@grafana/google-sdk@npm:0.1.2"
   peerDependencies:
     "@grafana/data": 9.4.1
     "@grafana/ui": 9.4.1
     react: 17.0.2
     react-dom: 17.0.2
-  checksum: a49e8b09eed421ddaed0e32ef5e7bed55d2342550cdf6c0b59b60f4a038ccb3a31566ca55ad0e22c3a6c8ad145d534c31de949df07ec6eb4f4c5c6e4ce778cc7
+  checksum: 10/98cb06a971f151e9504ab2b6640edb41fced12ecc6e033df5069937f82ab10a682f63314f713f79a8870975fb42c3cd74f23a605b58d961e632aa6cd35adf44b
   languageName: node
   linkType: hard
 
-"@grafana/lezer-logql@npm:0.2.1":
-  version: 0.2.1
-  resolution: "@grafana/lezer-logql@npm:0.2.1"
+"@grafana/lezer-logql@npm:0.2.3":
+  version: 0.2.3
+  resolution: "@grafana/lezer-logql@npm:0.2.3"
   peerDependencies:
     "@lezer/lr": ^1.0.0
-  checksum: c964cec7ae846f480d6d8bbdc523e2063ebdd48ee2f168745b849be9a1cd6b36636980e777d62c13b7276715e90f8eb5adcdfd1112749fc1367f1bd9ca1c4e9b
+  checksum: 10/a7f2f07d328d3e8c3d5cd31c5a0ea9379beeb7d65def078bae159298814d92881d978b088f05eff5148c8e26528de84a6fb6add8edf7bb383863fa51e9bc5f56
   languageName: node
   linkType: hard
 
-"@grafana/lezer-traceql@npm:0.0.8":
-  version: 0.0.8
-  resolution: "@grafana/lezer-traceql@npm:0.0.8"
+"@grafana/lezer-traceql@npm:0.0.16":
+  version: 0.0.16
+  resolution: "@grafana/lezer-traceql@npm:0.0.16"
   peerDependencies:
     "@lezer/lr": ^1.3.0
-  checksum: cd257010689de4c3177fd3e3bb74460d0d8669b9c25530c4ad1efa3cb2793a73c99f34a38058463b93790d3b80bf585992165801d6fd4b617823f1570c8dffad
+  checksum: 10/64443356f9ef880cbd2ccba7990c7a05d8eb73b165ef79d6ea55a269a775954a22262c3c90988dff82a21f4081dd8236ffe2c4af7c3ea41d03f7d994bea1af93
   languageName: node
   linkType: hard
 
@@ -3240,365 +4238,611 @@ __metadata:
   resolution: "@grafana/monaco-logql@npm:0.0.7"
   peerDependencies:
     monaco-editor: ^0.32.1
-  checksum: cce4a8ed8aaefee9211c4f2e283e5b4e551a942cd6673f13c5b9afca750432493388e383815f0f81bd2f119526115c2ecd8dfb23060ea61511eeecfc2a9750a4
+  checksum: 10/a900e24912476997f30349e6ee24041c0cffebf6706d8b9203eb952f12c768fc0fd6be8d7abe86d02019a0d8f26b83d15ffd0fb09d97047307e2ba5b4ba43a1b
   languageName: node
   linkType: hard
 
-"@grafana/plugin-configs@10.3.0-pre, @grafana/plugin-configs@workspace:packages/grafana-plugin-configs":
+"@grafana/o11y-ds-frontend@workspace:*, @grafana/o11y-ds-frontend@workspace:packages/grafana-o11y-ds-frontend":
+  version: 0.0.0-use.local
+  resolution: "@grafana/o11y-ds-frontend@workspace:packages/grafana-o11y-ds-frontend"
+  dependencies:
+    "@emotion/css": "npm:11.11.2"
+    "@grafana/data": "npm:11.0.0"
+    "@grafana/e2e-selectors": "npm:11.0.0"
+    "@grafana/experimental": "npm:1.7.10"
+    "@grafana/runtime": "npm:11.0.0"
+    "@grafana/schema": "npm:11.0.0"
+    "@grafana/tsconfig": "npm:^1.3.0-rc1"
+    "@grafana/ui": "npm:11.0.0"
+    "@testing-library/jest-dom": "npm:^6.1.2"
+    "@testing-library/react": "npm:14.2.2"
+    "@testing-library/user-event": "npm:14.5.2"
+    "@types/jest": "npm:^29.5.4"
+    "@types/react": "npm:18.2.73"
+    "@types/systemjs": "npm:6.13.5"
+    "@types/testing-library__jest-dom": "npm:5.14.9"
+    jest: "npm:^29.6.4"
+    react: "npm:18.2.0"
+    react-use: "npm:17.5.0"
+    rxjs: "npm:7.8.1"
+    ts-jest: "npm:29.1.2"
+    ts-node: "npm:10.9.2"
+    tslib: "npm:2.6.2"
+    typescript: "npm:5.3.3"
+  peerDependencies:
+    react: ^18.0.0
+    react-dom: ^18.0.0
+  languageName: unknown
+  linkType: soft
+
+"@grafana/plugin-configs@npm:11.0.0, @grafana/plugin-configs@workspace:*, @grafana/plugin-configs@workspace:packages/grafana-plugin-configs":
   version: 0.0.0-use.local
   resolution: "@grafana/plugin-configs@workspace:packages/grafana-plugin-configs"
   dependencies:
-    "@grafana/tsconfig": ^1.2.0-rc1
-    copy-webpack-plugin: 11.0.0
-    eslint-webpack-plugin: 4.0.1
-    fork-ts-checker-webpack-plugin: 8.0.0
-    glob: 10.3.3
-    replace-in-file-webpack-plugin: 1.0.6
-    swc-loader: 0.2.3
-    tslib: 2.6.0
-    webpack: 5.89.0
+    "@grafana/tsconfig": "npm:^1.3.0-rc1"
+    copy-webpack-plugin: "npm:12.0.2"
+    eslint-webpack-plugin: "npm:4.1.0"
+    fork-ts-checker-webpack-plugin: "npm:9.0.2"
+    glob: "npm:10.3.10"
+    replace-in-file-webpack-plugin: "npm:1.0.6"
+    swc-loader: "npm:0.2.6"
+    tslib: "npm:2.6.2"
+    webpack: "npm:5.91.0"
   languageName: unknown
   linkType: soft
 
-"@grafana/runtime@10.3.0-pre, @grafana/runtime@workspace:*, @grafana/runtime@workspace:packages/grafana-runtime":
+"@grafana/plugin-e2e@npm:^0.25.0":
+  version: 0.25.0
+  resolution: "@grafana/plugin-e2e@npm:0.25.0"
+  dependencies:
+    semver: "npm:^7.5.4"
+    uuid: "npm:^9.0.1"
+    yaml: "npm:^2.3.4"
+  peerDependencies:
+    "@playwright/test": ^1.41.2
+  checksum: 10/31a6106839e47d59b67bb550aa5f6ae0affa0685973c70b23ca396d095ed93ee69afaa602b50359e0e3de970a82772755c2e03786752b8b31825053673ccb0c6
+  languageName: node
+  linkType: hard
+
+"@grafana/prometheus@workspace:*, @grafana/prometheus@workspace:packages/grafana-prometheus":
+  version: 0.0.0-use.local
+  resolution: "@grafana/prometheus@workspace:packages/grafana-prometheus"
+  dependencies:
+    "@emotion/css": "npm:11.11.2"
+    "@emotion/eslint-plugin": "npm:11.11.0"
+    "@floating-ui/react": "npm:0.26.10"
+    "@grafana/data": "npm:11.0.0"
+    "@grafana/e2e": "npm:11.0.0"
+    "@grafana/e2e-selectors": "npm:11.0.0"
+    "@grafana/experimental": "npm:1.7.10"
+    "@grafana/faro-web-sdk": "npm:1.5.0"
+    "@grafana/runtime": "npm:11.0.0"
+    "@grafana/schema": "npm:11.0.0"
+    "@grafana/tsconfig": "npm:^1.3.0-rc1"
+    "@grafana/ui": "npm:11.0.0"
+    "@leeoniya/ufuzzy": "npm:1.0.14"
+    "@lezer/common": "npm:1.2.1"
+    "@lezer/highlight": "npm:1.2.0"
+    "@lezer/lr": "npm:1.3.3"
+    "@prometheus-io/lezer-promql": "npm:^0.37.0-rc.1"
+    "@reduxjs/toolkit": "npm:1.9.5"
+    "@rollup/plugin-image": "npm:3.0.3"
+    "@rollup/plugin-node-resolve": "npm:15.2.3"
+    "@swc/core": "npm:1.4.2"
+    "@swc/helpers": "npm:0.5.8"
+    "@testing-library/dom": "npm:9.3.4"
+    "@testing-library/jest-dom": "npm:6.4.2"
+    "@testing-library/react": "npm:14.2.2"
+    "@testing-library/user-event": "npm:14.5.2"
+    "@types/d3": "npm:7.4.3"
+    "@types/debounce-promise": "npm:3.1.9"
+    "@types/eslint": "npm:8.56.6"
+    "@types/jest": "npm:29.5.12"
+    "@types/jquery": "npm:3.5.29"
+    "@types/lodash": "npm:4.17.0"
+    "@types/marked": "npm:5.0.2"
+    "@types/node": "npm:20.11.30"
+    "@types/pluralize": "npm:^0.0.33"
+    "@types/prismjs": "npm:1.26.3"
+    "@types/react": "npm:18.2.73"
+    "@types/react-beautiful-dnd": "npm:13.1.8"
+    "@types/react-dom": "npm:18.2.22"
+    "@types/react-highlight-words": "npm:0.16.7"
+    "@types/react-window": "npm:1.8.8"
+    "@types/semver": "npm:7.5.8"
+    "@types/testing-library__jest-dom": "npm:5.14.9"
+    "@types/uuid": "npm:9.0.8"
+    "@typescript-eslint/eslint-plugin": "npm:6.21.0"
+    "@typescript-eslint/parser": "npm:6.21.0"
+    copy-webpack-plugin: "npm:12.0.2"
+    css-loader: "npm:6.10.0"
+    d3: "npm:7.9.0"
+    date-fns: "npm:3.6.0"
+    debounce-promise: "npm:3.1.2"
+    esbuild: "npm:0.18.12"
+    eslint: "npm:8.57.0"
+    eslint-config-prettier: "npm:9.1.0"
+    eslint-plugin-import: "npm:^2.26.0"
+    eslint-plugin-jest: "npm:27.9.0"
+    eslint-plugin-jsdoc: "npm:48.2.2"
+    eslint-plugin-jsx-a11y: "npm:6.8.0"
+    eslint-plugin-lodash: "npm:7.4.0"
+    eslint-plugin-react: "npm:7.34.1"
+    eslint-plugin-react-hooks: "npm:4.6.0"
+    eslint-webpack-plugin: "npm:4.1.0"
+    eventemitter3: "npm:5.0.1"
+    fork-ts-checker-webpack-plugin: "npm:9.0.2"
+    glob: "npm:10.3.10"
+    jest: "npm:29.7.0"
+    jest-environment-jsdom: "npm:29.7.0"
+    jest-matcher-utils: "npm:29.7.0"
+    lodash: "npm:4.17.21"
+    lru-cache: "npm:10.2.0"
+    marked: "npm:12.0.1"
+    marked-mangle: "npm:1.1.7"
+    moment: "npm:2.30.1"
+    moment-timezone: "npm:0.5.45"
+    monaco-promql: "npm:1.7.4"
+    pluralize: "npm:8.0.0"
+    prettier: "npm:3.2.5"
+    prismjs: "npm:1.29.0"
+    react: "npm:18.2.0"
+    react-beautiful-dnd: "npm:13.1.1"
+    react-dom: "npm:18.2.0"
+    react-highlight-words: "npm:0.20.0"
+    react-select: "npm:5.8.0"
+    react-select-event: "npm:5.5.1"
+    react-test-renderer: "npm:18.2.0"
+    react-use: "npm:17.5.0"
+    react-window: "npm:1.8.10"
+    rollup: "npm:2.79.1"
+    rollup-plugin-dts: "npm:^5.0.0"
+    rollup-plugin-esbuild: "npm:5.0.0"
+    rollup-plugin-node-externals: "npm:^5.0.0"
+    rxjs: "npm:7.8.1"
+    sass: "npm:1.72.0"
+    sass-loader: "npm:14.1.1"
+    semver: "npm:7.6.0"
+    style-loader: "npm:3.3.4"
+    testing-library-selector: "npm:0.3.1"
+    ts-node: "npm:10.9.2"
+    tslib: "npm:2.6.2"
+    typescript: "npm:5.3.3"
+    uuid: "npm:9.0.1"
+    webpack: "npm:5.91.0"
+    webpack-cli: "npm:5.1.4"
+    whatwg-fetch: "npm:3.6.20"
+  peerDependencies:
+    react: ^18.0.0
+    react-dom: ^18.0.0
+  languageName: unknown
+  linkType: soft
+
+"@grafana/runtime@npm:11.0.0, @grafana/runtime@workspace:*, @grafana/runtime@workspace:packages/grafana-runtime":
   version: 0.0.0-use.local
   resolution: "@grafana/runtime@workspace:packages/grafana-runtime"
   dependencies:
-    "@grafana/data": 10.3.0-pre
-    "@grafana/e2e-selectors": 10.3.0-pre
-    "@grafana/faro-web-sdk": 1.2.1
-    "@grafana/tsconfig": ^1.2.0-rc1
-    "@grafana/ui": 10.3.0-pre
-    "@rollup/plugin-commonjs": 25.0.2
-    "@rollup/plugin-node-resolve": 15.2.3
-    "@testing-library/dom": 9.3.3
-    "@testing-library/react": 14.0.0
-    "@testing-library/user-event": 14.5.1
-    "@types/angular": 1.8.5
-    "@types/history": 4.7.11
-    "@types/jest": 29.5.4
-    "@types/lodash": 4.14.195
-    "@types/react": 18.2.15
-    "@types/react-dom": 18.2.7
-    "@types/systemjs": 6.13.1
-    esbuild: 0.18.12
-    history: 4.10.1
-    lodash: 4.17.21
-    react: 18.2.0
-    react-dom: 18.2.0
-    rimraf: 5.0.1
-    rollup: 2.79.1
-    rollup-plugin-dts: ^5.0.0
-    rollup-plugin-esbuild: 5.0.0
-    rollup-plugin-node-externals: ^5.0.0
-    rollup-plugin-sourcemaps: 0.6.3
-    rollup-plugin-terser: 7.0.2
-    rxjs: 7.8.1
-    systemjs: 6.14.2
-    systemjs-cjs-extra: 0.2.0
-    tslib: 2.6.0
-    typescript: 4.8.4
+    "@grafana/data": "npm:11.0.0"
+    "@grafana/e2e-selectors": "npm:11.0.0"
+    "@grafana/faro-web-sdk": "npm:^1.3.6"
+    "@grafana/schema": "npm:11.0.0"
+    "@grafana/tsconfig": "npm:^1.3.0-rc1"
+    "@grafana/ui": "npm:11.0.0"
+    "@rollup/plugin-node-resolve": "npm:15.2.3"
+    "@rollup/plugin-terser": "npm:0.4.4"
+    "@testing-library/dom": "npm:9.3.4"
+    "@testing-library/react": "npm:14.2.2"
+    "@testing-library/user-event": "npm:14.5.2"
+    "@types/angular": "npm:1.8.9"
+    "@types/history": "npm:4.7.11"
+    "@types/jest": "npm:29.5.12"
+    "@types/lodash": "npm:4.17.0"
+    "@types/react": "npm:18.2.73"
+    "@types/react-dom": "npm:18.2.22"
+    "@types/systemjs": "npm:6.13.5"
+    esbuild: "npm:0.18.12"
+    history: "npm:4.10.1"
+    lodash: "npm:4.17.21"
+    react: "npm:18.2.0"
+    react-dom: "npm:18.2.0"
+    rimraf: "npm:5.0.5"
+    rollup: "npm:2.79.1"
+    rollup-plugin-dts: "npm:^5.0.0"
+    rollup-plugin-esbuild: "npm:5.0.0"
+    rollup-plugin-node-externals: "npm:^5.0.0"
+    rollup-plugin-sourcemaps: "npm:0.6.3"
+    rxjs: "npm:7.8.1"
+    tslib: "npm:2.6.2"
+    typescript: "npm:5.3.3"
+  peerDependencies:
+    react: ^18.0.0
+    react-dom: ^18.0.0
+  languageName: unknown
+  linkType: soft
+
+"@grafana/saga-icons@workspace:*, @grafana/saga-icons@workspace:packages/grafana-icons":
+  version: 0.0.0-use.local
+  resolution: "@grafana/saga-icons@workspace:packages/grafana-icons"
+  dependencies:
+    "@grafana/tsconfig": "npm:^1.3.0-rc1"
+    "@rollup/plugin-node-resolve": "npm:^15.2.3"
+    "@rollup/plugin-typescript": "npm:^11.1.6"
+    "@svgr/babel-plugin-remove-jsx-attribute": "npm:^8.0.0"
+    "@svgr/cli": "npm:^8.1.0"
+    "@svgr/plugin-jsx": "npm:^8.1.0"
+    "@svgr/plugin-prettier": "npm:^8.1.0"
+    "@svgr/plugin-svgo": "npm:^8.1.0"
+    "@types/node": "npm:20.11.30"
+    "@types/react": "npm:18.2.73"
+    "@types/react-dom": "npm:18.2.22"
+    esbuild: "npm:0.18.12"
+    prettier: "npm:3.2.5"
+    react: "npm:18.2.0"
+    react-dom: "npm:18.2.0"
+    rimraf: "npm:5.0.5"
+    rollup: "npm:2.79.1"
+    rollup-plugin-dts: "npm:^6.1.0"
+    rollup-plugin-esbuild: "npm:5.0.0"
+    rollup-plugin-node-externals: "npm:5.0.0"
+    ts-node: "npm:10.9.2"
+    typescript: "npm:5.3.3"
   peerDependencies:
     react: ^17.0.0 || ^18.0.0
     react-dom: ^17.0.0 || ^18.0.0
   languageName: unknown
   linkType: soft
 
-"@grafana/scenes@npm:^1.18.0":
-  version: 1.19.0
-  resolution: "@grafana/scenes@npm:1.19.0"
+"@grafana/scenes@npm:^4.14.0":
+  version: 4.14.0
+  resolution: "@grafana/scenes@npm:4.14.0"
   dependencies:
-    "@grafana/e2e-selectors": 10.0.2
-    react-grid-layout: 1.3.4
-    react-use: 17.4.0
-    react-virtualized-auto-sizer: 1.0.7
-    uuid: ^9.0.0
+    "@grafana/e2e-selectors": "npm:^10.4.1"
+    react-grid-layout: "npm:1.3.4"
+    react-use: "npm:17.4.0"
+    react-virtualized-auto-sizer: "npm:1.0.7"
+    uuid: "npm:^9.0.0"
   peerDependencies:
-    "@grafana/data": 10.0.3
-    "@grafana/runtime": 10.0.3
-    "@grafana/schema": 10.0.3
-    "@grafana/ui": 10.0.3
-  checksum: ce6f7db1126417c7516f0d72c9fd327f7952fdef0da14951798088e1d30498033e47cb988abcd90d72db9c9882328e1804fd6ec0be68bc021c5830b122e5b575
+    "@grafana/data": ^10.4.1
+    "@grafana/runtime": ^10.4.1
+    "@grafana/schema": ^10.4.1
+    "@grafana/ui": ^10.4.1
+    react: ^18.0.0
+    react-dom: ^18.0.0
+  checksum: 10/f8b5dc7e8b6aa5c7fa96d0b579292822ce1cbe274af6b9af7221660c3c960897a9744e2eaa1847ae0381cac72f8250e6e95a881a387fe42f8eeaebdd0241031e
   languageName: node
   linkType: hard
 
-"@grafana/schema@10.3.0-pre, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
+"@grafana/schema@npm:11.0.0, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
   version: 0.0.0-use.local
   resolution: "@grafana/schema@workspace:packages/grafana-schema"
   dependencies:
-    "@grafana/tsconfig": ^1.2.0-rc1
-    "@rollup/plugin-commonjs": 25.0.2
-    "@rollup/plugin-json": 6.0.0
-    "@rollup/plugin-node-resolve": 15.2.3
-    esbuild: 0.18.12
-    glob: ^10.2.7
-    rimraf: 5.0.1
-    rollup: 2.79.1
-    rollup-plugin-dts: ^5.0.0
-    rollup-plugin-esbuild: 5.0.0
-    rollup-plugin-node-externals: ^5.0.0
-    tslib: 2.6.0
-    typescript: 4.8.4
+    "@grafana/tsconfig": "npm:^1.3.0-rc1"
+    "@rollup/plugin-node-resolve": "npm:15.2.3"
+    esbuild: "npm:0.18.12"
+    glob: "npm:^10.2.7"
+    rimraf: "npm:5.0.5"
+    rollup: "npm:2.79.1"
+    rollup-plugin-dts: "npm:^5.0.0"
+    rollup-plugin-esbuild: "npm:5.0.0"
+    rollup-plugin-node-externals: "npm:^5.0.0"
+    tslib: "npm:2.6.2"
+    typescript: "npm:5.3.3"
+  languageName: unknown
+  linkType: soft
+
+"@grafana/sql@workspace:*, @grafana/sql@workspace:packages/grafana-sql":
+  version: 0.0.0-use.local
+  resolution: "@grafana/sql@workspace:packages/grafana-sql"
+  dependencies:
+    "@emotion/css": "npm:11.11.2"
+    "@grafana/data": "npm:11.0.0"
+    "@grafana/experimental": "npm:1.7.10"
+    "@grafana/runtime": "npm:11.0.0"
+    "@grafana/tsconfig": "npm:^1.3.0-rc1"
+    "@grafana/ui": "npm:11.0.0"
+    "@react-awesome-query-builder/ui": "npm:6.4.2"
+    "@testing-library/jest-dom": "npm:^6.1.2"
+    "@testing-library/react": "npm:14.2.2"
+    "@testing-library/react-hooks": "npm:^8.0.1"
+    "@testing-library/user-event": "npm:14.5.2"
+    "@types/jest": "npm:^29.5.4"
+    "@types/lodash": "npm:4.17.0"
+    "@types/react": "npm:18.2.73"
+    "@types/react-virtualized-auto-sizer": "npm:1.0.4"
+    "@types/systemjs": "npm:6.13.5"
+    "@types/testing-library__jest-dom": "npm:5.14.9"
+    "@types/uuid": "npm:9.0.8"
+    immutable: "npm:4.3.5"
+    jest: "npm:^29.6.4"
+    lodash: "npm:4.17.21"
+    react: "npm:18.2.0"
+    react-use: "npm:17.5.0"
+    react-virtualized-auto-sizer: "npm:1.0.24"
+    rxjs: "npm:7.8.1"
+    sql-formatter-plus: "npm:^1.3.6"
+    ts-jest: "npm:29.1.2"
+    ts-node: "npm:10.9.2"
+    tslib: "npm:2.6.2"
+    typescript: "npm:5.3.3"
+    uuid: "npm:9.0.1"
+  peerDependencies:
+    "@grafana/runtime": 10.4.0-pre
   languageName: unknown
   linkType: soft
 
 "@grafana/tsconfig@npm:^1.2.0-rc1":
   version: 1.2.0-rc1
   resolution: "@grafana/tsconfig@npm:1.2.0-rc1"
-  checksum: 621a400a762b97a33aade0c03eb8e7bdd1aa1635fab9eb2c03cd7cb7d80fb56e0fbdfc68b74a2abafacc623ad118e2ccaaf46164ee577b9c9c186a83a923d01d
+  checksum: 10/621a400a762b97a33aade0c03eb8e7bdd1aa1635fab9eb2c03cd7cb7d80fb56e0fbdfc68b74a2abafacc623ad118e2ccaaf46164ee577b9c9c186a83a923d01d
   languageName: node
   linkType: hard
 
 "@grafana/tsconfig@npm:^1.3.0-rc1":
   version: 1.3.0-rc1
   resolution: "@grafana/tsconfig@npm:1.3.0-rc1"
-  checksum: 3ed039967ae9e0c6ab70387b6aee648086aed00bf0c831ca4d82088cd829e15dac953387413e18941cc75958eec89e58c53ed1a6dedc02a34bbb794fa9658ea0
+  checksum: 10/3ed039967ae9e0c6ab70387b6aee648086aed00bf0c831ca4d82088cd829e15dac953387413e18941cc75958eec89e58c53ed1a6dedc02a34bbb794fa9658ea0
   languageName: node
   linkType: hard
 
-"@grafana/ui@10.3.0-pre, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui":
+"@grafana/ui@npm:11.0.0, @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.23.2
-    "@emotion/css": 11.11.2
-    "@emotion/react": 11.11.1
-    "@grafana/data": 10.3.0-pre
-    "@grafana/e2e-selectors": 10.3.0-pre
-    "@grafana/faro-web-sdk": 1.2.1
-    "@grafana/schema": 10.3.0-pre
-    "@grafana/tsconfig": ^1.2.0-rc1
-    "@leeoniya/ufuzzy": 1.0.8
-    "@mdx-js/react": 1.6.22
-    "@monaco-editor/react": 4.6.0
-    "@popperjs/core": 2.11.8
-    "@react-aria/button": 3.8.0
-    "@react-aria/dialog": 3.5.3
-    "@react-aria/focus": 3.13.0
-    "@react-aria/menu": 3.10.0
-    "@react-aria/overlays": 3.15.0
-    "@react-aria/utils": 3.18.0
-    "@react-stately/menu": 3.5.3
-    "@rollup/plugin-node-resolve": 15.2.3
-    "@storybook/addon-a11y": 7.4.5
-    "@storybook/addon-actions": 7.4.5
-    "@storybook/addon-docs": 7.4.5
-    "@storybook/addon-essentials": 7.4.5
-    "@storybook/addon-storysource": 7.4.5
-    "@storybook/api": 7.4.5
-    "@storybook/blocks": 7.4.5
-    "@storybook/client-api": 7.4.5
-    "@storybook/components": 7.4.5
-    "@storybook/core-events": 7.4.5
-    "@storybook/mdx2-csf": 1.1.0
-    "@storybook/preset-scss": 1.0.3
-    "@storybook/react": 7.4.5
-    "@storybook/react-webpack5": 7.4.5
-    "@storybook/theming": 7.4.5
-    "@testing-library/dom": 9.3.3
-    "@testing-library/jest-dom": 5.16.5
-    "@testing-library/react": 14.0.0
-    "@testing-library/user-event": 14.5.1
-    "@types/common-tags": ^1.8.0
-    "@types/d3": 7.4.0
-    "@types/hoist-non-react-statics": 3.3.1
-    "@types/is-hotkey": 0.1.7
-    "@types/jest": 29.5.4
-    "@types/jquery": 3.5.16
-    "@types/lodash": 4.14.195
-    "@types/mock-raf": 1.0.3
-    "@types/node": 18.18.4
-    "@types/prismjs": 1.26.0
-    "@types/react": 18.2.15
-    "@types/react-beautiful-dnd": 13.1.4
-    "@types/react-calendar": 3.9.0
-    "@types/react-color": 3.0.6
-    "@types/react-dom": 18.2.7
-    "@types/react-highlight-words": 0.16.4
-    "@types/react-router-dom": 5.3.3
-    "@types/react-table": 7.7.14
-    "@types/react-test-renderer": 18.0.0
-    "@types/react-transition-group": 4.4.6
-    "@types/react-window": 1.8.5
-    "@types/slate": 0.47.11
-    "@types/slate-plain-serializer": 0.7.2
-    "@types/slate-react": 0.22.9
-    "@types/testing-library__jest-dom": 5.14.8
-    "@types/tinycolor2": 1.4.3
-    "@types/uuid": 9.0.2
-    ansicolor: 1.1.100
-    calculate-size: 1.1.1
-    classnames: 2.3.2
-    common-tags: 1.8.2
-    core-js: 3.33.0
-    css-loader: 6.8.1
-    csstype: 3.1.2
-    d3: 7.8.5
-    date-fns: 2.30.0
-    esbuild: 0.18.12
-    expose-loader: 4.1.0
-    hoist-non-react-statics: 3.3.2
-    i18next: ^22.0.0
-    i18next-browser-languagedetector: ^7.0.2
-    immutable: 4.3.1
-    is-hotkey: 0.2.0
-    jquery: 3.7.0
-    lodash: 4.17.21
-    micro-memoize: ^4.1.2
-    mock-raf: 1.0.1
-    moment: 2.29.4
-    monaco-editor: 0.34.0
-    ol: 7.4.0
-    prismjs: 1.29.0
-    process: ^0.11.10
-    rc-cascader: 3.19.0
-    rc-drawer: 6.5.2
-    rc-slider: 10.3.1
-    rc-time-picker: ^3.7.3
-    rc-tooltip: 6.1.1
-    react: 18.2.0
-    react-beautiful-dnd: 13.1.1
-    react-calendar: 4.6.0
-    react-colorful: 5.6.1
-    react-custom-scrollbars-2: 4.5.0
-    react-dom: 18.2.0
-    react-dropzone: 14.2.3
-    react-highlight-words: 0.20.0
-    react-hook-form: 7.5.3
-    react-i18next: ^12.0.0
-    react-inlinesvg: 3.0.2
-    react-loading-skeleton: 3.3.1
-    react-popper: 2.3.0
-    react-popper-tooltip: 4.4.2
-    react-router-dom: 5.3.3
-    react-select: 5.7.4
-    react-select-event: ^5.1.0
-    react-table: 7.8.0
-    react-test-renderer: 18.2.0
-    react-transition-group: 4.4.5
-    react-use: 17.4.0
-    react-window: 1.8.9
-    rimraf: 5.0.1
-    rollup: 2.79.1
-    rollup-plugin-copy: 3.5.0
-    rollup-plugin-dts: ^5.0.0
-    rollup-plugin-esbuild: 5.0.0
-    rollup-plugin-node-externals: ^5.0.0
-    rxjs: 7.8.1
-    sass-loader: 13.3.2
-    slate: 0.47.9
-    slate-plain-serializer: 0.7.13
-    slate-react: 0.22.10
-    storybook: 7.4.5
-    storybook-addon-turbo-build: 2.0.1
-    storybook-dark-mode: 3.0.1
-    style-loader: 3.3.3
-    tinycolor2: 1.6.0
-    tslib: 2.6.0
-    typescript: 4.8.4
-    uplot: 1.6.26
-    uuid: 9.0.0
-    webpack: 5.89.0
+    "@babel/core": "npm:7.24.3"
+    "@emotion/css": "npm:11.11.2"
+    "@emotion/react": "npm:11.11.4"
+    "@floating-ui/react": "npm:0.26.10"
+    "@grafana/data": "npm:11.0.0"
+    "@grafana/e2e-selectors": "npm:11.0.0"
+    "@grafana/faro-web-sdk": "npm:^1.3.6"
+    "@grafana/schema": "npm:11.0.0"
+    "@grafana/tsconfig": "npm:^1.3.0-rc1"
+    "@leeoniya/ufuzzy": "npm:1.0.14"
+    "@monaco-editor/react": "npm:4.6.0"
+    "@popperjs/core": "npm:2.11.8"
+    "@react-aria/dialog": "npm:3.5.12"
+    "@react-aria/focus": "npm:3.16.2"
+    "@react-aria/overlays": "npm:3.21.1"
+    "@react-aria/utils": "npm:3.23.2"
+    "@rollup/plugin-node-resolve": "npm:15.2.3"
+    "@storybook/addon-a11y": "npm:7.4.5"
+    "@storybook/addon-actions": "npm:7.4.5"
+    "@storybook/addon-docs": "npm:7.4.5"
+    "@storybook/addon-essentials": "npm:7.4.5"
+    "@storybook/addon-storysource": "npm:7.4.5"
+    "@storybook/api": "npm:7.4.5"
+    "@storybook/blocks": "npm:7.4.5"
+    "@storybook/client-api": "npm:7.4.5"
+    "@storybook/components": "npm:7.4.5"
+    "@storybook/core-events": "npm:7.4.5"
+    "@storybook/mdx2-csf": "npm:1.1.0"
+    "@storybook/preset-scss": "npm:1.0.3"
+    "@storybook/react": "npm:7.4.5"
+    "@storybook/react-webpack5": "npm:7.4.5"
+    "@storybook/theming": "npm:7.4.5"
+    "@testing-library/dom": "npm:9.3.4"
+    "@testing-library/jest-dom": "npm:6.4.2"
+    "@testing-library/react": "npm:14.2.2"
+    "@testing-library/user-event": "npm:14.5.2"
+    "@types/common-tags": "npm:^1.8.0"
+    "@types/d3": "npm:7.4.3"
+    "@types/hoist-non-react-statics": "npm:3.3.5"
+    "@types/is-hotkey": "npm:0.1.10"
+    "@types/jest": "npm:29.5.12"
+    "@types/jquery": "npm:3.5.29"
+    "@types/lodash": "npm:4.17.0"
+    "@types/mock-raf": "npm:1.0.6"
+    "@types/node": "npm:20.11.30"
+    "@types/prismjs": "npm:1.26.3"
+    "@types/react": "npm:18.2.73"
+    "@types/react-beautiful-dnd": "npm:13.1.8"
+    "@types/react-calendar": "npm:3.9.0"
+    "@types/react-color": "npm:3.0.12"
+    "@types/react-dom": "npm:18.2.22"
+    "@types/react-highlight-words": "npm:0.16.7"
+    "@types/react-router-dom": "npm:5.3.3"
+    "@types/react-table": "npm:7.7.20"
+    "@types/react-test-renderer": "npm:18.0.7"
+    "@types/react-transition-group": "npm:4.4.10"
+    "@types/react-window": "npm:1.8.8"
+    "@types/slate": "npm:0.47.11"
+    "@types/slate-plain-serializer": "npm:0.7.5"
+    "@types/slate-react": "npm:0.22.9"
+    "@types/testing-library__jest-dom": "npm:5.14.9"
+    "@types/tinycolor2": "npm:1.4.6"
+    "@types/uuid": "npm:9.0.8"
+    ansicolor: "npm:1.1.100"
+    calculate-size: "npm:1.1.1"
+    classnames: "npm:2.5.1"
+    common-tags: "npm:1.8.2"
+    core-js: "npm:3.36.1"
+    css-loader: "npm:6.10.0"
+    csstype: "npm:3.1.3"
+    d3: "npm:7.9.0"
+    date-fns: "npm:3.6.0"
+    esbuild: "npm:0.18.12"
+    expose-loader: "npm:5.0.0"
+    hoist-non-react-statics: "npm:3.3.2"
+    i18next: "npm:^23.0.0"
+    i18next-browser-languagedetector: "npm:^7.0.2"
+    immutable: "npm:4.3.5"
+    is-hotkey: "npm:0.2.0"
+    jquery: "npm:3.7.1"
+    lodash: "npm:4.17.21"
+    micro-memoize: "npm:^4.1.2"
+    mock-raf: "npm:1.0.1"
+    moment: "npm:2.30.1"
+    monaco-editor: "npm:0.34.0"
+    ol: "npm:7.4.0"
+    prismjs: "npm:1.29.0"
+    process: "npm:^0.11.10"
+    rc-cascader: "npm:3.24.0"
+    rc-drawer: "npm:7.1.0"
+    rc-slider: "npm:10.5.0"
+    rc-time-picker: "npm:^3.7.3"
+    rc-tooltip: "npm:6.2.0"
+    react: "npm:18.2.0"
+    react-beautiful-dnd: "npm:13.1.1"
+    react-calendar: "npm:4.8.0"
+    react-colorful: "npm:5.6.1"
+    react-custom-scrollbars-2: "npm:4.5.0"
+    react-dom: "npm:18.2.0"
+    react-dropzone: "npm:14.2.3"
+    react-highlight-words: "npm:0.20.0"
+    react-hook-form: "npm:^7.49.2"
+    react-i18next: "npm:^12.0.0"
+    react-inlinesvg: "npm:3.0.2"
+    react-loading-skeleton: "npm:3.4.0"
+    react-router-dom: "npm:5.3.3"
+    react-select: "npm:5.8.0"
+    react-select-event: "npm:^5.1.0"
+    react-table: "npm:7.8.0"
+    react-test-renderer: "npm:18.2.0"
+    react-transition-group: "npm:4.4.5"
+    react-use: "npm:17.5.0"
+    react-window: "npm:1.8.10"
+    rimraf: "npm:5.0.5"
+    rollup: "npm:2.79.1"
+    rollup-plugin-copy: "npm:3.5.0"
+    rollup-plugin-dts: "npm:^5.0.0"
+    rollup-plugin-esbuild: "npm:5.0.0"
+    rollup-plugin-node-externals: "npm:^5.0.0"
+    rollup-plugin-svg-import: "npm:1.6.0"
+    rxjs: "npm:7.8.1"
+    sass-loader: "npm:14.1.1"
+    slate: "npm:0.47.9"
+    slate-plain-serializer: "npm:0.7.13"
+    slate-react: "npm:0.22.10"
+    storybook: "npm:7.4.5"
+    storybook-addon-turbo-build: "npm:2.0.1"
+    storybook-dark-mode: "npm:3.0.1"
+    style-loader: "npm:3.3.4"
+    tinycolor2: "npm:1.6.0"
+    tslib: "npm:2.6.2"
+    typescript: "npm:5.3.3"
+    uplot: "npm:1.6.30"
+    uuid: "npm:9.0.1"
+    webpack: "npm:5.91.0"
   peerDependencies:
-    react: ^17.0.0 || ^18.0.0
-    react-dom: ^17.0.0 || ^18.0.0
+    react: ^18.0.0
+    react-dom: ^18.0.0
   languageName: unknown
   linkType: soft
 
-"@hapi/hoek@npm:^9.0.0":
-  version: 9.3.0
-  resolution: "@hapi/hoek@npm:9.3.0"
-  checksum: 4771c7a776242c3c022b168046af4e324d116a9d2e1d60631ee64f474c6e38d1bb07092d898bf95c7bc5d334c5582798a1456321b2e53ca817d4e7c88bc25b43
-  languageName: node
-  linkType: hard
-
-"@hapi/topo@npm:^5.0.0":
-  version: 5.1.0
-  resolution: "@hapi/topo@npm:5.1.0"
-  dependencies:
-    "@hapi/hoek": ^9.0.0
-  checksum: 604dfd5dde76d5c334bd03f9001fce69c7ce529883acf92da96f4fe7e51221bf5e5110e964caca287a6a616ba027c071748ab636ff178ad750547fba611d6014
-  languageName: node
-  linkType: hard
-
-"@headlessui/react@npm:^1.5.0":
-  version: 1.7.11
-  resolution: "@headlessui/react@npm:1.7.11"
+"@gulpjs/to-absolute-glob@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@gulpjs/to-absolute-glob@npm:4.0.0"
   dependencies:
-    client-only: ^0.0.1
-  peerDependencies:
-    react: ^16 || ^17 || ^18
-    react-dom: ^16 || ^17 || ^18
-  checksum: 3c9abbc5eaf039fccd309b34269aad761f518c4863e482afddf47579384243ecc0d7b69ecd2f05997e4e079237efa8846c568f5ed8d32df358814a239600de1f
+    is-negated-glob: "npm:^1.0.0"
+  checksum: 10/30ec7825064422b6f02c1975ab6c779ff73409411c37bec2e984262459935afd196c1dbe960075e914967a047743ccf726fce3d3ebb4417ca2e3c34538fbceb8
   languageName: node
   linkType: hard
 
-"@humanwhocodes/config-array@npm:^0.11.10, @humanwhocodes/config-array@npm:^0.11.13":
-  version: 0.11.13
-  resolution: "@humanwhocodes/config-array@npm:0.11.13"
+"@humanwhocodes/config-array@npm:^0.11.13, @humanwhocodes/config-array@npm:^0.11.14":
+  version: 0.11.14
+  resolution: "@humanwhocodes/config-array@npm:0.11.14"
   dependencies:
-    "@humanwhocodes/object-schema": ^2.0.1
-    debug: ^4.1.1
-    minimatch: ^3.0.5
-  checksum: f8ea57b0d7ed7f2d64cd3944654976829d9da91c04d9c860e18804729a33f7681f78166ef4c761850b8c324d362f7d53f14c5c44907a6b38b32c703ff85e4805
+    "@humanwhocodes/object-schema": "npm:^2.0.2"
+    debug: "npm:^4.3.1"
+    minimatch: "npm:^3.0.5"
+  checksum: 10/3ffb24ecdfab64014a230e127118d50a1a04d11080cbb748bc21629393d100850496456bbcb4e8c438957fe0934430d731042f1264d6a167b62d32fc2863580a
   languageName: node
   linkType: hard
 
 "@humanwhocodes/module-importer@npm:^1.0.1":
   version: 1.0.1
   resolution: "@humanwhocodes/module-importer@npm:1.0.1"
-  checksum: 0fd22007db8034a2cdf2c764b140d37d9020bbfce8a49d3ec5c05290e77d4b0263b1b972b752df8c89e5eaa94073408f2b7d977aed131faf6cf396ebb5d7fb61
+  checksum: 10/e993950e346331e5a32eefb27948ecdee2a2c4ab3f072b8f566cd213ef485dd50a3ca497050608db91006f5479e43f91a439aef68d2a313bd3ded06909c7c5b3
   languageName: node
   linkType: hard
 
-"@humanwhocodes/object-schema@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@humanwhocodes/object-schema@npm:2.0.1"
-  checksum: 24929487b1ed48795d2f08346a0116cc5ee4634848bce64161fb947109352c562310fd159fc64dda0e8b853307f5794605191a9547f7341158559ca3c8262a45
+"@humanwhocodes/object-schema@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@humanwhocodes/object-schema@npm:2.0.2"
+  checksum: 10/ef915e3e2f34652f3d383b28a9a99cfea476fa991482370889ab14aac8ecd2b38d47cc21932526c6d949da0daf4a4a6bf629d30f41b0caca25e146819cbfa70e
   languageName: node
   linkType: hard
 
 "@hutson/parse-repository-url@npm:^3.0.0":
   version: 3.0.2
   resolution: "@hutson/parse-repository-url@npm:3.0.2"
-  checksum: 39992c5f183c5ca3d761d6ed9dfabcb79b5f3750bf1b7f3532e1dc439ca370138bbd426ee250fdaba460bc948e6761fbefd484b8f4f36885d71ded96138340d1
+  checksum: 10/dae0656f2e77315a3027ab9ca438ed344bf78a5fda7b145f65a1fface20dfb17e94e1d31e146c8b76de4657c21020aabc72dc53b53941c9f5fe2c27416559283
   languageName: node
   linkType: hard
 
-"@internationalized/date@npm:^3.3.0":
-  version: 3.3.0
-  resolution: "@internationalized/date@npm:3.3.0"
+"@inquirer/confirm@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@inquirer/confirm@npm:3.0.0"
   dependencies:
-    "@swc/helpers": ^0.5.0
-  checksum: f79f272f845b9adde73dfea396248114a545cacb1082c90c58115cffe386fc46984033f383c10a866dc02ebeac1cb8c1464a2e4dedb4f7fd95aaf15a2996a012
+    "@inquirer/core": "npm:^7.0.0"
+    "@inquirer/type": "npm:^1.2.0"
+  checksum: 10/ed16dc0e5b22115474853ca57dbe3dacdcd15bcb37cc50020e8e76ff8d0875d62d8b63b93b3092c653faeb6c83a139eac997ff05638b0f1f78ae919f29ee29d4
   languageName: node
   linkType: hard
 
-"@internationalized/message@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "@internationalized/message@npm:3.1.1"
+"@inquirer/core@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "@inquirer/core@npm:7.0.0"
+  dependencies:
+    "@inquirer/type": "npm:^1.2.0"
+    "@types/mute-stream": "npm:^0.0.4"
+    "@types/node": "npm:^20.11.16"
+    "@types/wrap-ansi": "npm:^3.0.0"
+    ansi-escapes: "npm:^4.3.2"
+    chalk: "npm:^4.1.2"
+    cli-spinners: "npm:^2.9.2"
+    cli-width: "npm:^4.1.0"
+    figures: "npm:^3.2.0"
+    mute-stream: "npm:^1.0.0"
+    run-async: "npm:^3.0.0"
+    signal-exit: "npm:^4.1.0"
+    strip-ansi: "npm:^6.0.1"
+    wrap-ansi: "npm:^6.2.0"
+  checksum: 10/78c0ef4bb82cb7be23f16a80c9cff02839c77e378d272327f49878788a4c3b1cc00137387317053d242a87634954850a4d2546b3e48b1abd27130a21f598afef
+  languageName: node
+  linkType: hard
+
+"@inquirer/type@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "@inquirer/type@npm:1.2.0"
+  checksum: 10/12f68a16d8995efb409bd243d6ccc501b366e8009630a075071a9d9497cebd36bbd6c46d7d59b37435629e5e50236394679f414f7676b68b913ecc28a85cba0a
+  languageName: node
+  linkType: hard
+
+"@internationalized/date@npm:^3.5.2":
+  version: 3.5.2
+  resolution: "@internationalized/date@npm:3.5.2"
   dependencies:
-    "@swc/helpers": ^0.5.0
-    intl-messageformat: ^10.1.0
-  checksum: c8658847e80a2dd6f5a253bdc20ce45d304ffa2147248e6422d72714ac501edd0d4cce09e4baf7753cd393e4df7014df747425ff9658728cd1f892d71c3d591b
+    "@swc/helpers": "npm:^0.5.0"
+  checksum: 10/e37cdea4efa6214e72148f55f42782b3e8cd40bdca29705e52e6c490855f9ccbf38d0182632be005d9555463b50e8bf5fdb0d759cadff1baf7bae4fdaa28e96f
   languageName: node
   linkType: hard
 
-"@internationalized/number@npm:^3.2.1":
-  version: 3.2.1
-  resolution: "@internationalized/number@npm:3.2.1"
+"@internationalized/message@npm:^3.1.2":
+  version: 3.1.2
+  resolution: "@internationalized/message@npm:3.1.2"
   dependencies:
-    "@swc/helpers": ^0.5.0
-  checksum: 5b716de97a491c8e276679a47a131d9fc94484f27ae7d2dba2d9e312c607fbdd2deabe0702a9faa79ad1d84ea0676061fd051c3565946f520acfdccc73dd1956
+    "@swc/helpers": "npm:^0.5.0"
+    intl-messageformat: "npm:^10.1.0"
+  checksum: 10/c6b8f9983f1922f27c45586d82500a8fd4e75cab622c367b70047bb9f45749ab8153c77b02fd3da635e3d6649d8609ae6d1df6da710a166361078e32b4516d2e
   languageName: node
   linkType: hard
 
-"@internationalized/string@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "@internationalized/string@npm:3.1.1"
+"@internationalized/number@npm:^3.5.1":
+  version: 3.5.1
+  resolution: "@internationalized/number@npm:3.5.1"
   dependencies:
-    "@swc/helpers": ^0.5.0
-  checksum: 686b4d443dbf6794b5f32e0c3a0ee9333a64bfe2a01aec705fb71f5721f5c9e8aa25b380bdae85e21be0dc72103843642363efcaed437ebad3e7169e478b91ae
+    "@swc/helpers": "npm:^0.5.0"
+  checksum: 10/4ad68d98285a18a910d19455a0fa9c3960a919a139f0b01d2d589bfda1a2ebb8378b8c912e17c0d82cf756e7b3f48b0bff8a6decef1644c6c2f894da4e1e7c79
+  languageName: node
+  linkType: hard
+
+"@internationalized/string@npm:^3.2.1":
+  version: 3.2.1
+  resolution: "@internationalized/string@npm:3.2.1"
+  dependencies:
+    "@swc/helpers": "npm:^0.5.0"
+  checksum: 10/69603641a90fee37fc539adc8f3f5cbdd61909da486515bd4580fcce05495a9f0f303e6d8a36a8accb86c95845d84e78b088e4680ca087928b6b588756eb879b
   languageName: node
   linkType: hard
 
@@ -3606,20 +4850,13 @@ __metadata:
   version: 8.0.2
   resolution: "@isaacs/cliui@npm:8.0.2"
   dependencies:
-    string-width: ^5.1.2
+    string-width: "npm:^5.1.2"
     string-width-cjs: "npm:string-width@^4.2.0"
-    strip-ansi: ^7.0.1
+    strip-ansi: "npm:^7.0.1"
     strip-ansi-cjs: "npm:strip-ansi@^6.0.1"
-    wrap-ansi: ^8.1.0
+    wrap-ansi: "npm:^8.1.0"
     wrap-ansi-cjs: "npm:wrap-ansi@^7.0.0"
-  checksum: 4a473b9b32a7d4d3cfb7a614226e555091ff0c5a29a1734c28c72a182c2f6699b26fc6b5c2131dfd841e86b185aea714c72201d7c98c2fba5f17709333a67aeb
-  languageName: node
-  linkType: hard
-
-"@isaacs/string-locale-compare@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "@isaacs/string-locale-compare@npm:1.1.0"
-  checksum: 7287da5d11497b82c542d3c2abe534808015be4f4883e71c26853277b5456f6bbe4108535db847a29f385ad6dc9318ffb0f55ee79bb5f39993233d7dccf8751d
+  checksum: 10/e9ed5fd27c3aec1095e3a16e0c0cf148d1fee55a38665c35f7b3f86a9b5d00d042ddaabc98e8a1cb7463b9378c15f22a94eb35e99469c201453eb8375191f243
   languageName: node
   linkType: hard
 
@@ -3627,19 +4864,19 @@ __metadata:
   version: 1.1.0
   resolution: "@istanbuljs/load-nyc-config@npm:1.1.0"
   dependencies:
-    camelcase: ^5.3.1
-    find-up: ^4.1.0
-    get-package-type: ^0.1.0
-    js-yaml: ^3.13.1
-    resolve-from: ^5.0.0
-  checksum: d578da5e2e804d5c93228450a1380e1a3c691de4953acc162f387b717258512a3e07b83510a936d9fab03eac90817473917e24f5d16297af3867f59328d58568
+    camelcase: "npm:^5.3.1"
+    find-up: "npm:^4.1.0"
+    get-package-type: "npm:^0.1.0"
+    js-yaml: "npm:^3.13.1"
+    resolve-from: "npm:^5.0.0"
+  checksum: 10/b000a5acd8d4fe6e34e25c399c8bdbb5d3a202b4e10416e17bfc25e12bab90bb56d33db6089ae30569b52686f4b35ff28ef26e88e21e69821d2b85884bd055b8
   languageName: node
   linkType: hard
 
 "@istanbuljs/schema@npm:^0.1.2, @istanbuljs/schema@npm:^0.1.3":
   version: 0.1.3
   resolution: "@istanbuljs/schema@npm:0.1.3"
-  checksum: 5282759d961d61350f33d9118d16bcaed914ebf8061a52f4fa474b2cb08720c9c81d165e13b82f2e5a8a212cc5af482f0c6fc1ac27b9e067e5394c9a6ed186c9
+  checksum: 10/a9b1e49acdf5efc2f5b2359f2df7f90c5c725f2656f16099e8b2cd3a000619ecca9fc48cf693ba789cf0fd989f6e0df6a22bc05574be4223ecdbb7997d04384b
   languageName: node
   linkType: hard
 
@@ -3647,66 +4884,66 @@ __metadata:
   version: 29.7.0
   resolution: "@jest/console@npm:29.7.0"
   dependencies:
-    "@jest/types": ^29.6.3
-    "@types/node": "*"
-    chalk: ^4.0.0
-    jest-message-util: ^29.7.0
-    jest-util: ^29.7.0
-    slash: ^3.0.0
-  checksum: 0e3624e32c5a8e7361e889db70b170876401b7d70f509a2538c31d5cd50deb0c1ae4b92dc63fe18a0902e0a48c590c21d53787a0df41a52b34fa7cab96c384d6
+    "@jest/types": "npm:^29.6.3"
+    "@types/node": "npm:*"
+    chalk: "npm:^4.0.0"
+    jest-message-util: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+    slash: "npm:^3.0.0"
+  checksum: 10/4a80c750e8a31f344233cb9951dee9b77bf6b89377cb131f8b3cde07ff218f504370133a5963f6a786af4d2ce7f85642db206ff7a15f99fe58df4c38ac04899e
   languageName: node
   linkType: hard
 
-"@jest/core@npm:^29.3.1, @jest/core@npm:^29.7.0":
+"@jest/core@npm:^29.7.0":
   version: 29.7.0
   resolution: "@jest/core@npm:29.7.0"
   dependencies:
-    "@jest/console": ^29.7.0
-    "@jest/reporters": ^29.7.0
-    "@jest/test-result": ^29.7.0
-    "@jest/transform": ^29.7.0
-    "@jest/types": ^29.6.3
-    "@types/node": "*"
-    ansi-escapes: ^4.2.1
-    chalk: ^4.0.0
-    ci-info: ^3.2.0
-    exit: ^0.1.2
-    graceful-fs: ^4.2.9
-    jest-changed-files: ^29.7.0
-    jest-config: ^29.7.0
-    jest-haste-map: ^29.7.0
-    jest-message-util: ^29.7.0
-    jest-regex-util: ^29.6.3
-    jest-resolve: ^29.7.0
-    jest-resolve-dependencies: ^29.7.0
-    jest-runner: ^29.7.0
-    jest-runtime: ^29.7.0
-    jest-snapshot: ^29.7.0
-    jest-util: ^29.7.0
-    jest-validate: ^29.7.0
-    jest-watcher: ^29.7.0
-    micromatch: ^4.0.4
-    pretty-format: ^29.7.0
-    slash: ^3.0.0
-    strip-ansi: ^6.0.0
+    "@jest/console": "npm:^29.7.0"
+    "@jest/reporters": "npm:^29.7.0"
+    "@jest/test-result": "npm:^29.7.0"
+    "@jest/transform": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    "@types/node": "npm:*"
+    ansi-escapes: "npm:^4.2.1"
+    chalk: "npm:^4.0.0"
+    ci-info: "npm:^3.2.0"
+    exit: "npm:^0.1.2"
+    graceful-fs: "npm:^4.2.9"
+    jest-changed-files: "npm:^29.7.0"
+    jest-config: "npm:^29.7.0"
+    jest-haste-map: "npm:^29.7.0"
+    jest-message-util: "npm:^29.7.0"
+    jest-regex-util: "npm:^29.6.3"
+    jest-resolve: "npm:^29.7.0"
+    jest-resolve-dependencies: "npm:^29.7.0"
+    jest-runner: "npm:^29.7.0"
+    jest-runtime: "npm:^29.7.0"
+    jest-snapshot: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+    jest-validate: "npm:^29.7.0"
+    jest-watcher: "npm:^29.7.0"
+    micromatch: "npm:^4.0.4"
+    pretty-format: "npm:^29.7.0"
+    slash: "npm:^3.0.0"
+    strip-ansi: "npm:^6.0.0"
   peerDependencies:
     node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
   peerDependenciesMeta:
     node-notifier:
       optional: true
-  checksum: af759c9781cfc914553320446ce4e47775ae42779e73621c438feb1e4231a5d4862f84b1d8565926f2d1aab29b3ec3dcfdc84db28608bdf5f29867124ebcfc0d
+  checksum: 10/ab6ac2e562d083faac7d8152ec1cc4eccc80f62e9579b69ed40aedf7211a6b2d57024a6cd53c4e35fd051c39a236e86257d1d99ebdb122291969a0a04563b51e
   languageName: node
   linkType: hard
 
-"@jest/environment@npm:^29.3.1, @jest/environment@npm:^29.7.0":
+"@jest/environment@npm:^29.7.0":
   version: 29.7.0
   resolution: "@jest/environment@npm:29.7.0"
   dependencies:
-    "@jest/fake-timers": ^29.7.0
-    "@jest/types": ^29.6.3
-    "@types/node": "*"
-    jest-mock: ^29.7.0
-  checksum: 6fb398143b2543d4b9b8d1c6dbce83fa5247f84f550330604be744e24c2bd2178bb893657d62d1b97cf2f24baf85c450223f8237cccb71192c36a38ea2272934
+    "@jest/fake-timers": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    "@types/node": "npm:*"
+    jest-mock: "npm:^29.7.0"
+  checksum: 10/90b5844a9a9d8097f2cf107b1b5e57007c552f64315da8c1f51217eeb0a9664889d3f145cdf8acf23a84f4d8309a6675e27d5b059659a004db0ea9546d1c81a8
   languageName: node
   linkType: hard
 
@@ -3714,8 +4951,8 @@ __metadata:
   version: 29.7.0
   resolution: "@jest/expect-utils@npm:29.7.0"
   dependencies:
-    jest-get-type: ^29.6.3
-  checksum: 75eb177f3d00b6331bcaa057e07c0ccb0733a1d0a1943e1d8db346779039cb7f103789f16e502f888a3096fb58c2300c38d1f3748b36a7fa762eb6f6d1b160ed
+    jest-get-type: "npm:^29.6.3"
+  checksum: 10/ef8d379778ef574a17bde2801a6f4469f8022a46a5f9e385191dc73bb1fc318996beaed4513fbd7055c2847227a1bed2469977821866534593a6e52a281499ee
   languageName: node
   linkType: hard
 
@@ -3723,23 +4960,23 @@ __metadata:
   version: 29.7.0
   resolution: "@jest/expect@npm:29.7.0"
   dependencies:
-    expect: ^29.7.0
-    jest-snapshot: ^29.7.0
-  checksum: a01cb85fd9401bab3370618f4b9013b90c93536562222d920e702a0b575d239d74cecfe98010aaec7ad464f67cf534a353d92d181646a4b792acaa7e912ae55e
+    expect: "npm:^29.7.0"
+    jest-snapshot: "npm:^29.7.0"
+  checksum: 10/fea6c3317a8da5c840429d90bfe49d928e89c9e89fceee2149b93a11b7e9c73d2f6e4d7cdf647163da938fc4e2169e4490be6bae64952902bc7a701033fd4880
   languageName: node
   linkType: hard
 
-"@jest/fake-timers@npm:^29.3.1, @jest/fake-timers@npm:^29.7.0":
+"@jest/fake-timers@npm:^29.7.0":
   version: 29.7.0
   resolution: "@jest/fake-timers@npm:29.7.0"
   dependencies:
-    "@jest/types": ^29.6.3
-    "@sinonjs/fake-timers": ^10.0.2
-    "@types/node": "*"
-    jest-message-util: ^29.7.0
-    jest-mock: ^29.7.0
-    jest-util: ^29.7.0
-  checksum: caf2bbd11f71c9241b458d1b5a66cbe95debc5a15d96442444b5d5c7ba774f523c76627c6931cca5e10e76f0d08761f6f1f01a608898f4751a0eee54fc3d8d00
+    "@jest/types": "npm:^29.6.3"
+    "@sinonjs/fake-timers": "npm:^10.0.2"
+    "@types/node": "npm:*"
+    jest-message-util: "npm:^29.7.0"
+    jest-mock: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+  checksum: 10/9b394e04ffc46f91725ecfdff34c4e043eb7a16e1d78964094c9db3fde0b1c8803e45943a980e8c740d0a3d45661906de1416ca5891a538b0660481a3a828c27
   languageName: node
   linkType: hard
 
@@ -3747,11 +4984,11 @@ __metadata:
   version: 29.7.0
   resolution: "@jest/globals@npm:29.7.0"
   dependencies:
-    "@jest/environment": ^29.7.0
-    "@jest/expect": ^29.7.0
-    "@jest/types": ^29.6.3
-    jest-mock: ^29.7.0
-  checksum: 97dbb9459135693ad3a422e65ca1c250f03d82b2a77f6207e7fa0edd2c9d2015fbe4346f3dc9ebff1678b9d8da74754d4d440b7837497f8927059c0642a22123
+    "@jest/environment": "npm:^29.7.0"
+    "@jest/expect": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    jest-mock: "npm:^29.7.0"
+  checksum: 10/97dbb9459135693ad3a422e65ca1c250f03d82b2a77f6207e7fa0edd2c9d2015fbe4346f3dc9ebff1678b9d8da74754d4d440b7837497f8927059c0642a22123
   languageName: node
   linkType: hard
 
@@ -3759,36 +4996,36 @@ __metadata:
   version: 29.7.0
   resolution: "@jest/reporters@npm:29.7.0"
   dependencies:
-    "@bcoe/v8-coverage": ^0.2.3
-    "@jest/console": ^29.7.0
-    "@jest/test-result": ^29.7.0
-    "@jest/transform": ^29.7.0
-    "@jest/types": ^29.6.3
-    "@jridgewell/trace-mapping": ^0.3.18
-    "@types/node": "*"
-    chalk: ^4.0.0
-    collect-v8-coverage: ^1.0.0
-    exit: ^0.1.2
-    glob: ^7.1.3
-    graceful-fs: ^4.2.9
-    istanbul-lib-coverage: ^3.0.0
-    istanbul-lib-instrument: ^6.0.0
-    istanbul-lib-report: ^3.0.0
-    istanbul-lib-source-maps: ^4.0.0
-    istanbul-reports: ^3.1.3
-    jest-message-util: ^29.7.0
-    jest-util: ^29.7.0
-    jest-worker: ^29.7.0
-    slash: ^3.0.0
-    string-length: ^4.0.1
-    strip-ansi: ^6.0.0
-    v8-to-istanbul: ^9.0.1
+    "@bcoe/v8-coverage": "npm:^0.2.3"
+    "@jest/console": "npm:^29.7.0"
+    "@jest/test-result": "npm:^29.7.0"
+    "@jest/transform": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    "@jridgewell/trace-mapping": "npm:^0.3.18"
+    "@types/node": "npm:*"
+    chalk: "npm:^4.0.0"
+    collect-v8-coverage: "npm:^1.0.0"
+    exit: "npm:^0.1.2"
+    glob: "npm:^7.1.3"
+    graceful-fs: "npm:^4.2.9"
+    istanbul-lib-coverage: "npm:^3.0.0"
+    istanbul-lib-instrument: "npm:^6.0.0"
+    istanbul-lib-report: "npm:^3.0.0"
+    istanbul-lib-source-maps: "npm:^4.0.0"
+    istanbul-reports: "npm:^3.1.3"
+    jest-message-util: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+    jest-worker: "npm:^29.7.0"
+    slash: "npm:^3.0.0"
+    string-length: "npm:^4.0.1"
+    strip-ansi: "npm:^6.0.0"
+    v8-to-istanbul: "npm:^9.0.1"
   peerDependencies:
     node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
   peerDependenciesMeta:
     node-notifier:
       optional: true
-  checksum: 7eadabd62cc344f629024b8a268ecc8367dba756152b761bdcb7b7e570a3864fc51b2a9810cd310d85e0a0173ef002ba4528d5ea0329fbf66ee2a3ada9c40455
+  checksum: 10/a17d1644b26dea14445cedd45567f4ba7834f980be2ef74447204e14238f121b50d8b858fde648083d2cd8f305f81ba434ba49e37a5f4237a6f2a61180cc73dc
   languageName: node
   linkType: hard
 
@@ -3796,8 +5033,8 @@ __metadata:
   version: 29.6.3
   resolution: "@jest/schemas@npm:29.6.3"
   dependencies:
-    "@sinclair/typebox": ^0.27.8
-  checksum: 910040425f0fc93cd13e68c750b7885590b8839066dfa0cd78e7def07bbb708ad869381f725945d66f2284de5663bbecf63e8fdd856e2ae6e261ba30b1687e93
+    "@sinclair/typebox": "npm:^0.27.8"
+  checksum: 10/910040425f0fc93cd13e68c750b7885590b8839066dfa0cd78e7def07bbb708ad869381f725945d66f2284de5663bbecf63e8fdd856e2ae6e261ba30b1687e93
   languageName: node
   linkType: hard
 
@@ -3805,10 +5042,10 @@ __metadata:
   version: 29.6.3
   resolution: "@jest/source-map@npm:29.6.3"
   dependencies:
-    "@jridgewell/trace-mapping": ^0.3.18
-    callsites: ^3.0.0
-    graceful-fs: ^4.2.9
-  checksum: bcc5a8697d471396c0003b0bfa09722c3cd879ad697eb9c431e6164e2ea7008238a01a07193dfe3cbb48b1d258eb7251f6efcea36f64e1ebc464ea3c03ae2deb
+    "@jridgewell/trace-mapping": "npm:^0.3.18"
+    callsites: "npm:^3.0.0"
+    graceful-fs: "npm:^4.2.9"
+  checksum: 10/bcc5a8697d471396c0003b0bfa09722c3cd879ad697eb9c431e6164e2ea7008238a01a07193dfe3cbb48b1d258eb7251f6efcea36f64e1ebc464ea3c03ae2deb
   languageName: node
   linkType: hard
 
@@ -3816,11 +5053,11 @@ __metadata:
   version: 29.7.0
   resolution: "@jest/test-result@npm:29.7.0"
   dependencies:
-    "@jest/console": ^29.7.0
-    "@jest/types": ^29.6.3
-    "@types/istanbul-lib-coverage": ^2.0.0
-    collect-v8-coverage: ^1.0.0
-  checksum: 67b6317d526e335212e5da0e768e3b8ab8a53df110361b80761353ad23b6aea4432b7c5665bdeb87658ea373b90fb1afe02ed3611ef6c858c7fba377505057fa
+    "@jest/console": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    "@types/istanbul-lib-coverage": "npm:^2.0.0"
+    collect-v8-coverage: "npm:^1.0.0"
+  checksum: 10/c073ab7dfe3c562bff2b8fee6cc724ccc20aa96bcd8ab48ccb2aa309b4c0c1923a9e703cea386bd6ae9b71133e92810475bb9c7c22328fc63f797ad3324ed189
   languageName: node
   linkType: hard
 
@@ -3828,11 +5065,11 @@ __metadata:
   version: 29.7.0
   resolution: "@jest/test-sequencer@npm:29.7.0"
   dependencies:
-    "@jest/test-result": ^29.7.0
-    graceful-fs: ^4.2.9
-    jest-haste-map: ^29.7.0
-    slash: ^3.0.0
-  checksum: 73f43599017946be85c0b6357993b038f875b796e2f0950487a82f4ebcb115fa12131932dd9904026b4ad8be131fe6e28bd8d0aa93b1563705185f9804bff8bd
+    "@jest/test-result": "npm:^29.7.0"
+    graceful-fs: "npm:^4.2.9"
+    jest-haste-map: "npm:^29.7.0"
+    slash: "npm:^3.0.0"
+  checksum: 10/4420c26a0baa7035c5419b0892ff8ffe9a41b1583ec54a10db3037cd46a7e29dd3d7202f8aa9d376e9e53be5f8b1bc0d16e1de6880a6d319b033b01dc4c8f639
   languageName: node
   linkType: hard
 
@@ -3840,49 +5077,36 @@ __metadata:
   version: 29.7.0
   resolution: "@jest/transform@npm:29.7.0"
   dependencies:
-    "@babel/core": ^7.11.6
-    "@jest/types": ^29.6.3
-    "@jridgewell/trace-mapping": ^0.3.18
-    babel-plugin-istanbul: ^6.1.1
-    chalk: ^4.0.0
-    convert-source-map: ^2.0.0
-    fast-json-stable-stringify: ^2.1.0
-    graceful-fs: ^4.2.9
-    jest-haste-map: ^29.7.0
-    jest-regex-util: ^29.6.3
-    jest-util: ^29.7.0
-    micromatch: ^4.0.4
-    pirates: ^4.0.4
-    slash: ^3.0.0
-    write-file-atomic: ^4.0.2
-  checksum: 0f8ac9f413903b3cb6d240102db848f2a354f63971ab885833799a9964999dd51c388162106a807f810071f864302cdd8e3f0c241c29ce02d85a36f18f3f40ab
-  languageName: node
-  linkType: hard
-
-"@jest/types@npm:^26.6.2":
-  version: 26.6.2
-  resolution: "@jest/types@npm:26.6.2"
-  dependencies:
-    "@types/istanbul-lib-coverage": ^2.0.0
-    "@types/istanbul-reports": ^3.0.0
-    "@types/node": "*"
-    "@types/yargs": ^15.0.0
-    chalk: ^4.0.0
-  checksum: a0bd3d2f22f26ddb23f41fddf6e6a30bf4fab2ce79ec1cb6ce6fdfaf90a72e00f4c71da91ec61e13db3b10c41de22cf49d07c57ff2b59171d64b29f909c1d8d6
-  languageName: node
-  linkType: hard
-
-"@jest/types@npm:^29.3.1, @jest/types@npm:^29.6.3":
+    "@babel/core": "npm:^7.11.6"
+    "@jest/types": "npm:^29.6.3"
+    "@jridgewell/trace-mapping": "npm:^0.3.18"
+    babel-plugin-istanbul: "npm:^6.1.1"
+    chalk: "npm:^4.0.0"
+    convert-source-map: "npm:^2.0.0"
+    fast-json-stable-stringify: "npm:^2.1.0"
+    graceful-fs: "npm:^4.2.9"
+    jest-haste-map: "npm:^29.7.0"
+    jest-regex-util: "npm:^29.6.3"
+    jest-util: "npm:^29.7.0"
+    micromatch: "npm:^4.0.4"
+    pirates: "npm:^4.0.4"
+    slash: "npm:^3.0.0"
+    write-file-atomic: "npm:^4.0.2"
+  checksum: 10/30f42293545ab037d5799c81d3e12515790bb58513d37f788ce32d53326d0d72ebf5b40f989e6896739aa50a5f77be44686e510966370d58511d5ad2637c68c1
+  languageName: node
+  linkType: hard
+
+"@jest/types@npm:^29.6.3":
   version: 29.6.3
   resolution: "@jest/types@npm:29.6.3"
   dependencies:
-    "@jest/schemas": ^29.6.3
-    "@types/istanbul-lib-coverage": ^2.0.0
-    "@types/istanbul-reports": ^3.0.0
-    "@types/node": "*"
-    "@types/yargs": ^17.0.8
-    chalk: ^4.0.0
-  checksum: a0bcf15dbb0eca6bdd8ce61a3fb055349d40268622a7670a3b2eb3c3dbafe9eb26af59938366d520b86907b9505b0f9b29b85cec11579a9e580694b87cd90fcc
+    "@jest/schemas": "npm:^29.6.3"
+    "@types/istanbul-lib-coverage": "npm:^2.0.0"
+    "@types/istanbul-reports": "npm:^3.0.0"
+    "@types/node": "npm:*"
+    "@types/yargs": "npm:^17.0.8"
+    chalk: "npm:^4.0.0"
+  checksum: 10/f74bf512fd09bbe2433a2ad460b04668b7075235eea9a0c77d6a42222c10a79b9747dc2b2a623f140ed40d6865a2ed8f538f3cbb75169120ea863f29a7ed76cd
   languageName: node
   linkType: hard
 
@@ -3890,58 +5114,51 @@ __metadata:
   version: 0.1.1
   resolution: "@jridgewell/gen-mapping@npm:0.1.1"
   dependencies:
-    "@jridgewell/set-array": ^1.0.0
-    "@jridgewell/sourcemap-codec": ^1.4.10
-  checksum: 3bcc21fe786de6ffbf35c399a174faab05eb23ce6a03e8769569de28abbf4facc2db36a9ddb0150545ae23a8d35a7cf7237b2aa9e9356a7c626fb4698287d5cc
+    "@jridgewell/set-array": "npm:^1.0.0"
+    "@jridgewell/sourcemap-codec": "npm:^1.4.10"
+  checksum: 10/ba76fae1d8ea52b181474518c705a8eac36405dfc836fb07e9c25730a84d29e05fd6d954f121057742639f3128a24ea45d205c9c989efd464d1114671c19fa6c
   languageName: node
   linkType: hard
 
-"@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.2":
-  version: 0.3.2
-  resolution: "@jridgewell/gen-mapping@npm:0.3.2"
+"@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.5":
+  version: 0.3.5
+  resolution: "@jridgewell/gen-mapping@npm:0.3.5"
   dependencies:
-    "@jridgewell/set-array": ^1.0.1
-    "@jridgewell/sourcemap-codec": ^1.4.10
-    "@jridgewell/trace-mapping": ^0.3.9
-  checksum: 1832707a1c476afebe4d0fbbd4b9434fdb51a4c3e009ab1e9938648e21b7a97049fa6009393bdf05cab7504108413441df26d8a3c12193996e65493a4efb6882
+    "@jridgewell/set-array": "npm:^1.2.1"
+    "@jridgewell/sourcemap-codec": "npm:^1.4.10"
+    "@jridgewell/trace-mapping": "npm:^0.3.24"
+  checksum: 10/81587b3c4dd8e6c60252122937cea0c637486311f4ed208b52b62aae2e7a87598f63ec330e6cd0984af494bfb16d3f0d60d3b21d7e5b4aedd2602ff3fe9d32e2
   languageName: node
   linkType: hard
 
-"@jridgewell/resolve-uri@npm:3.1.0, @jridgewell/resolve-uri@npm:^3.0.3":
-  version: 3.1.0
-  resolution: "@jridgewell/resolve-uri@npm:3.1.0"
-  checksum: b5ceaaf9a110fcb2780d1d8f8d4a0bfd216702f31c988d8042e5f8fbe353c55d9b0f55a1733afdc64806f8e79c485d2464680ac48a0d9fcadb9548ee6b81d267
+"@jridgewell/resolve-uri@npm:^3.0.3, @jridgewell/resolve-uri@npm:^3.1.0":
+  version: 3.1.1
+  resolution: "@jridgewell/resolve-uri@npm:3.1.1"
+  checksum: 10/64d59df8ae1a4e74315eb1b61e012f1c7bc8aac47a3a1e683f6fe7008eab07bc512a742b7aa7c0405685d1421206de58c9c2e6adbfe23832f8bd69408ffc183e
   languageName: node
   linkType: hard
 
-"@jridgewell/set-array@npm:^1.0.0, @jridgewell/set-array@npm:^1.0.1":
-  version: 1.1.2
-  resolution: "@jridgewell/set-array@npm:1.1.2"
-  checksum: 69a84d5980385f396ff60a175f7177af0b8da4ddb81824cb7016a9ef914eee9806c72b6b65942003c63f7983d4f39a5c6c27185bbca88eb4690b62075602e28e
+"@jridgewell/set-array@npm:^1.0.0, @jridgewell/set-array@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "@jridgewell/set-array@npm:1.2.1"
+  checksum: 10/832e513a85a588f8ed4f27d1279420d8547743cc37fcad5a5a76fc74bb895b013dfe614d0eed9cb860048e6546b798f8f2652020b4b2ba0561b05caa8c654b10
   languageName: node
   linkType: hard
 
-"@jridgewell/source-map@npm:^0.3.2":
-  version: 0.3.2
-  resolution: "@jridgewell/source-map@npm:0.3.2"
+"@jridgewell/source-map@npm:^0.3.3":
+  version: 0.3.5
+  resolution: "@jridgewell/source-map@npm:0.3.5"
   dependencies:
-    "@jridgewell/gen-mapping": ^0.3.0
-    "@jridgewell/trace-mapping": ^0.3.9
-  checksum: 1b83f0eb944e77b70559a394d5d3b3f98a81fcc186946aceb3ef42d036762b52ef71493c6c0a3b7c1d2f08785f53ba2df1277fe629a06e6109588ff4cdcf7482
-  languageName: node
-  linkType: hard
-
-"@jridgewell/sourcemap-codec@npm:1.4.14":
-  version: 1.4.14
-  resolution: "@jridgewell/sourcemap-codec@npm:1.4.14"
-  checksum: 61100637b6d173d3ba786a5dff019e1a74b1f394f323c1fee337ff390239f053b87266c7a948777f4b1ee68c01a8ad0ab61e5ff4abb5a012a0b091bec391ab97
+    "@jridgewell/gen-mapping": "npm:^0.3.0"
+    "@jridgewell/trace-mapping": "npm:^0.3.9"
+  checksum: 10/73838ac43235edecff5efc850c0d759704008937a56b1711b28c261e270fe4bf2dc06d0b08663aeb1ab304f81f6de4f5fb844344403cf53ba7096967a9953cae
   languageName: node
   linkType: hard
 
-"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.13, @jridgewell/sourcemap-codec@npm:^1.4.15":
+"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.15":
   version: 1.4.15
   resolution: "@jridgewell/sourcemap-codec@npm:1.4.15"
-  checksum: b881c7e503db3fc7f3c1f35a1dd2655a188cc51a3612d76efc8a6eb74728bef5606e6758ee77423e564092b4a518aba569bbb21c9bac5ab7a35b0c6ae7e344c8
+  checksum: 10/89960ac087781b961ad918978975bcdf2051cd1741880469783c42de64239703eab9db5230d776d8e6a09d73bb5e4cb964e07d93ee6e2e7aea5a7d726e865c09
   languageName: node
   linkType: hard
 
@@ -3949,57 +5166,57 @@ __metadata:
   version: 0.3.9
   resolution: "@jridgewell/trace-mapping@npm:0.3.9"
   dependencies:
-    "@jridgewell/resolve-uri": ^3.0.3
-    "@jridgewell/sourcemap-codec": ^1.4.10
-  checksum: d89597752fd88d3f3480845691a05a44bd21faac18e2185b6f436c3b0fd0c5a859fbbd9aaa92050c4052caf325ad3e10e2e1d1b64327517471b7d51babc0ddef
+    "@jridgewell/resolve-uri": "npm:^3.0.3"
+    "@jridgewell/sourcemap-codec": "npm:^1.4.10"
+  checksum: 10/83deafb8e7a5ca98993c2c6eeaa93c270f6f647a4c0dc00deb38c9cf9b2d3b7bf15e8839540155247ef034a052c0ec4466f980bf0c9e2ab63b97d16c0cedd3ff
   languageName: node
   linkType: hard
 
-"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.18, @jridgewell/trace-mapping@npm:^0.3.9":
-  version: 0.3.18
-  resolution: "@jridgewell/trace-mapping@npm:0.3.18"
+"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.18, @jridgewell/trace-mapping@npm:^0.3.20, @jridgewell/trace-mapping@npm:^0.3.21, @jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25, @jridgewell/trace-mapping@npm:^0.3.9":
+  version: 0.3.25
+  resolution: "@jridgewell/trace-mapping@npm:0.3.25"
   dependencies:
-    "@jridgewell/resolve-uri": 3.1.0
-    "@jridgewell/sourcemap-codec": 1.4.14
-  checksum: 0572669f855260808c16fe8f78f5f1b4356463b11d3f2c7c0b5580c8ba1cbf4ae53efe9f627595830856e57dbac2325ac17eb0c3dd0ec42102e6f227cc289c02
+    "@jridgewell/resolve-uri": "npm:^3.1.0"
+    "@jridgewell/sourcemap-codec": "npm:^1.4.14"
+  checksum: 10/dced32160a44b49d531b80a4a2159dceab6b3ddf0c8e95a0deae4b0e894b172defa63d5ac52a19c2068e1fe7d31ea4ba931fbeec103233ecb4208953967120fc
   languageName: node
   linkType: hard
 
 "@juggle/resize-observer@npm:^3.3.1":
   version: 3.4.0
   resolution: "@juggle/resize-observer@npm:3.4.0"
-  checksum: 2505028c05cc2e17639fcad06218b1c4b60f932a4ebb4b41ab546ef8c157031ae377e3f560903801f6d01706dbefd4943b6c4704bf19ed86dfa1c62f1473a570
+  checksum: 10/73d1d00ee9132fb6f0aea0531940a6b93603e935590bd450fc6285a328d906102eeeb95dea77b2edac0e779031a9708aa8c82502bd298ee4dd26e7dff48f397a
   languageName: node
   linkType: hard
 
-"@kusto/language-service-next@npm:0.0.121":
-  version: 0.0.121
-  resolution: "@kusto/language-service-next@npm:0.0.121"
-  checksum: 783eb817557ac70c3956f41a530d2a76e466cf2e1472ad06caf12869d48cac388932cffea71b10b1696e46f26b42e5c7c346ddabb16a3d69a0ec995ac1fbf8b4
+"@kusto/language-service-next@npm:11.5.0":
+  version: 11.5.0
+  resolution: "@kusto/language-service-next@npm:11.5.0"
+  checksum: 10/e42b5f223e4692bec5a7acb49c67c8fd1f748f68e0273b64f52b77b2ca6e1d43851e087cf511463b9027e7d769e52d63b7f6b136620f992ce3a3f230108a6f65
   languageName: node
   linkType: hard
 
-"@kusto/language-service@npm:0.0.98":
-  version: 0.0.98
-  resolution: "@kusto/language-service@npm:0.0.98"
-  checksum: b3b8226eb686c73a4cc5fa618c40323f56a7b1973e991a543625eb190bb314d3987bde92332f1fc84e6d7b475f287526da85bd293d1b038f5a977a920939b40d
+"@kusto/language-service@npm:0.0.278":
+  version: 0.0.278
+  resolution: "@kusto/language-service@npm:0.0.278"
+  checksum: 10/5a84f169e2669feaa1cbc071ec12a154afe2b3a1adb9e3687d95d10a7087fd04d9c2238fb58f783a2cd320fffd6ace4c052caf63be563189f3aee9ad3a241395
   languageName: node
   linkType: hard
 
-"@kusto/monaco-kusto@npm:^7.4.0":
-  version: 7.7.0
-  resolution: "@kusto/monaco-kusto@npm:7.7.0"
+"@kusto/monaco-kusto@npm:^10.0.0":
+  version: 10.0.18
+  resolution: "@kusto/monaco-kusto@npm:10.0.18"
   dependencies:
-    "@kusto/language-service": 0.0.98
-    "@kusto/language-service-next": 0.0.121
-    lodash-es: ^4.17.21
-    vscode-languageserver-types: 3.16.0
-    xregexp: ^5.1.1
+    "@kusto/language-service": "npm:0.0.278"
+    "@kusto/language-service-next": "npm:11.5.0"
+    lodash-es: "npm:^4.17.21"
+    vscode-languageserver-types: "npm:^3.17.4"
+    xregexp: "npm:^5.1.1"
   peerDependencies:
-    monaco-editor: ~0.40.0
+    monaco-editor: ^0.46.0
   bin:
     copyMonacoFilesAMD: copyMonacoFilesAMD.js
-  checksum: 7cf2f9f86f60c3b2a4c140d3ef376ccb20f89b14971b0f1b65721a77754d2531d7650f6ea3dd22a9eed378bce2427664ed69fd229974919df51758f57f0d8768
+  checksum: 10/f49ddc435a9f5c67897e4f948334fe112a3b4ee1b3abf6e2f68fdbd987855b69bea17963f12a1534528b64c2c50f76556c30fa54aeb9fd4e05f560b0928916be
   languageName: node
   linkType: hard
 
@@ -4007,1256 +5224,733 @@ __metadata:
   version: 1.1.1
   resolution: "@kwsites/file-exists@npm:1.1.1"
   dependencies:
-    debug: ^4.1.1
-  checksum: 4ff945de7293285133aeae759caddc71e73c4a44a12fac710fdd4f574cce2671a3f89d8165fdb03d383cfc97f3f96f677d8de3c95133da3d0e12a123a23109fe
+    debug: "npm:^4.1.1"
+  checksum: 10/4ff945de7293285133aeae759caddc71e73c4a44a12fac710fdd4f574cce2671a3f89d8165fdb03d383cfc97f3f96f677d8de3c95133da3d0e12a123a23109fe
   languageName: node
   linkType: hard
 
 "@kwsites/promise-deferred@npm:^1.1.1":
   version: 1.1.1
   resolution: "@kwsites/promise-deferred@npm:1.1.1"
-  checksum: 07455477a0123d9a38afb503739eeff2c5424afa8d3dbdcc7f9502f13604488a4b1d9742fc7288832a52a6422cf1e1c0a1d51f69a39052f14d27c9a0420b6629
+  checksum: 10/07455477a0123d9a38afb503739eeff2c5424afa8d3dbdcc7f9502f13604488a4b1d9742fc7288832a52a6422cf1e1c0a1d51f69a39052f14d27c9a0420b6629
   languageName: node
   linkType: hard
 
-"@leeoniya/ufuzzy@npm:1.0.8":
-  version: 1.0.8
-  resolution: "@leeoniya/ufuzzy@npm:1.0.8"
-  checksum: 899a9269fa72c773c4806ff6ca7277a9ed69a8e3e7f0e8db9d3f4c9aa9c23d1d5c1df1e5cbea47d720af85ae6aa2ad88822443cd18ef94631876b96d23f4d7e2
+"@leeoniya/ufuzzy@npm:1.0.14":
+  version: 1.0.14
+  resolution: "@leeoniya/ufuzzy@npm:1.0.14"
+  checksum: 10/852b580a8eaaf92e2d448f5b720e3c53e4bea22187bf5e8459256677c47183321b47b8384982e15751f42da7e77a216fd86c80e6185677d8270adeab4a4fb771
   languageName: node
   linkType: hard
 
 "@leichtgewicht/ip-codec@npm:^2.0.1":
   version: 2.0.3
   resolution: "@leichtgewicht/ip-codec@npm:2.0.3"
-  checksum: 5b6bee0481c82ac05c748322e34ac68aa01757451b4f49f1ab9cc91e420a1ea4cd0fc4678251e6fa41d566a3e3683cca3e179fb767c87845286863ac98b54f15
-  languageName: node
-  linkType: hard
-
-"@lerna/add@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/add@npm:5.5.4"
-  dependencies:
-    "@lerna/bootstrap": 5.5.4
-    "@lerna/command": 5.5.4
-    "@lerna/filter-options": 5.5.4
-    "@lerna/npm-conf": 5.5.4
-    "@lerna/validation-error": 5.5.4
-    dedent: ^0.7.0
-    npm-package-arg: 8.1.1
-    p-map: ^4.0.0
-    pacote: ^13.6.1
-    semver: ^7.3.4
-  checksum: f4f17fda326a550cdbb3025a98a5ccf0e275b378fb1a1df6f518b5cbd3f334d5486394f84d12adddc8341d2802a37715390fdbf71375327dc89bdcd4986ef364
-  languageName: node
-  linkType: hard
-
-"@lerna/bootstrap@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/bootstrap@npm:5.5.4"
-  dependencies:
-    "@lerna/command": 5.5.4
-    "@lerna/filter-options": 5.5.4
-    "@lerna/has-npm-version": 5.5.4
-    "@lerna/npm-install": 5.5.4
-    "@lerna/package-graph": 5.5.4
-    "@lerna/pulse-till-done": 5.5.4
-    "@lerna/rimraf-dir": 5.5.4
-    "@lerna/run-lifecycle": 5.5.4
-    "@lerna/run-topologically": 5.5.4
-    "@lerna/symlink-binary": 5.5.4
-    "@lerna/symlink-dependencies": 5.5.4
-    "@lerna/validation-error": 5.5.4
-    "@npmcli/arborist": 5.3.0
-    dedent: ^0.7.0
-    get-port: ^5.1.1
-    multimatch: ^5.0.0
-    npm-package-arg: 8.1.1
-    npmlog: ^6.0.2
-    p-map: ^4.0.0
-    p-map-series: ^2.1.0
-    p-waterfall: ^2.1.1
-    semver: ^7.3.4
-  checksum: 67a5f30045690b2b62be901c0272f6a67d830ca7183f1296d1b551a1d25c4e13ed0c1e6286a682685e42e2b6d5cd421dd16e812c12cefc43dd62036376fe4230
-  languageName: node
-  linkType: hard
-
-"@lerna/changed@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/changed@npm:5.5.4"
-  dependencies:
-    "@lerna/collect-updates": 5.5.4
-    "@lerna/command": 5.5.4
-    "@lerna/listable": 5.5.4
-    "@lerna/output": 5.5.4
-  checksum: f2ff13b2a00740832428cfc626ae559c1cd210e8a6e71ee489c6872942c62cdec252598180bb3bada96d4ef6bc3ae494b5bb83b1b03e5313df96c52b4daf5e0d
-  languageName: node
-  linkType: hard
-
-"@lerna/check-working-tree@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/check-working-tree@npm:5.5.4"
-  dependencies:
-    "@lerna/collect-uncommitted": 5.5.4
-    "@lerna/describe-ref": 5.5.4
-    "@lerna/validation-error": 5.5.4
-  checksum: 43d28c714b96ddf6d7cd9023f0f24a32786420d40746037a3cf4e35d03441ba4c3760826034034692ac355091d2a8a5166ee5538833762db51301982f732abaa
-  languageName: node
-  linkType: hard
-
-"@lerna/child-process@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/child-process@npm:5.5.4"
-  dependencies:
-    chalk: ^4.1.0
-    execa: ^5.0.0
-    strong-log-transformer: ^2.1.0
-  checksum: f481252bd3aa2b1dc61fedf527840e5acf19e893ad15e3589ffa2466110d11f595b86402197cbc03fe8286339d8da1076f3bb25ef3d618a7aa4d18417a63e7e7
-  languageName: node
-  linkType: hard
-
-"@lerna/clean@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/clean@npm:5.5.4"
-  dependencies:
-    "@lerna/command": 5.5.4
-    "@lerna/filter-options": 5.5.4
-    "@lerna/prompt": 5.5.4
-    "@lerna/pulse-till-done": 5.5.4
-    "@lerna/rimraf-dir": 5.5.4
-    p-map: ^4.0.0
-    p-map-series: ^2.1.0
-    p-waterfall: ^2.1.1
-  checksum: cf2aadf90f825cf5d458ba4dd4e4182e40983b23b6b3cd6ffc7ff9780b02f7552ca4106007e2af080728470a6e935ec1ba0a925b21d806fce1eb290838e0ee06
-  languageName: node
-  linkType: hard
-
-"@lerna/cli@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/cli@npm:5.5.4"
-  dependencies:
-    "@lerna/global-options": 5.5.4
-    dedent: ^0.7.0
-    npmlog: ^6.0.2
-    yargs: ^16.2.0
-  checksum: 54f4106233550c98fabd3771d4f813f2e0284a6d8e71f8fd7105fcade317cc46016529441af0042dd38c713a35d4f6c992fa0add51025667b729c674f630a2da
-  languageName: node
-  linkType: hard
-
-"@lerna/collect-uncommitted@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/collect-uncommitted@npm:5.5.4"
-  dependencies:
-    "@lerna/child-process": 5.5.4
-    chalk: ^4.1.0
-    npmlog: ^6.0.2
-  checksum: 3d0c1a9526651499799df689974f9e8efb4a3aac760f421ae18013cadd53c62eda4d1d3dbd152ceb8c864096b71ade01aeab5335e461495a12159a7cb33119d9
-  languageName: node
-  linkType: hard
-
-"@lerna/collect-updates@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/collect-updates@npm:5.5.4"
-  dependencies:
-    "@lerna/child-process": 5.5.4
-    "@lerna/describe-ref": 5.5.4
-    minimatch: ^3.0.4
-    npmlog: ^6.0.2
-    slash: ^3.0.0
-  checksum: dc051fdd205099dd005520549e50bf0c94a318c7d0e6ab51246e2278525c66dc98f513d3bbde7b33a9e9dd9d6d6d811666527570a56c0c9cadedca32db156969
-  languageName: node
-  linkType: hard
-
-"@lerna/command@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/command@npm:5.5.4"
-  dependencies:
-    "@lerna/child-process": 5.5.4
-    "@lerna/package-graph": 5.5.4
-    "@lerna/project": 5.5.4
-    "@lerna/validation-error": 5.5.4
-    "@lerna/write-log-file": 5.5.4
-    clone-deep: ^4.0.1
-    dedent: ^0.7.0
-    execa: ^5.0.0
-    is-ci: ^2.0.0
-    npmlog: ^6.0.2
-  checksum: 096aadc9e3c0c0dc9f6127af9f655058360658ca73ffea476998a89594e29c6492894311ee7021df7532273b657c930d1060917b488ffccdff7643fa65bbeb25
-  languageName: node
-  linkType: hard
-
-"@lerna/conventional-commits@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/conventional-commits@npm:5.5.4"
-  dependencies:
-    "@lerna/validation-error": 5.5.4
-    conventional-changelog-angular: ^5.0.12
-    conventional-changelog-core: ^4.2.4
-    conventional-recommended-bump: ^6.1.0
-    fs-extra: ^9.1.0
-    get-stream: ^6.0.0
-    npm-package-arg: 8.1.1
-    npmlog: ^6.0.2
-    pify: ^5.0.0
-    semver: ^7.3.4
-  checksum: 866731a1e1ff2bcb9795a10f6b462935f3e98bf353f24b7f04deea31c58a128e99ca9aabab24a6eb2181ea5f3f2e645d437bb485750cd2876853d48ec78211c0
-  languageName: node
-  linkType: hard
-
-"@lerna/create-symlink@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/create-symlink@npm:5.5.4"
-  dependencies:
-    cmd-shim: ^5.0.0
-    fs-extra: ^9.1.0
-    npmlog: ^6.0.2
-  checksum: 05c1bc24f450fc74b38991fd6a7f8a6df83b6777fe9456e1a0875071b032289942cba9d43173caef19df8946ef9eac7d423ed8c0fcb78980ddc6f24884298990
-  languageName: node
-  linkType: hard
-
-"@lerna/create@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/create@npm:5.5.4"
-  dependencies:
-    "@lerna/child-process": 5.5.4
-    "@lerna/command": 5.5.4
-    "@lerna/npm-conf": 5.5.4
-    "@lerna/validation-error": 5.5.4
-    dedent: ^0.7.0
-    fs-extra: ^9.1.0
-    globby: ^11.0.2
-    init-package-json: ^3.0.2
-    npm-package-arg: 8.1.1
-    p-reduce: ^2.1.0
-    pacote: ^13.6.1
-    pify: ^5.0.0
-    semver: ^7.3.4
-    slash: ^3.0.0
-    validate-npm-package-license: ^3.0.4
-    validate-npm-package-name: ^4.0.0
-    yargs-parser: 20.2.4
-  checksum: 44e63b3ea4cae77abd0fbd1fd5227e6d5691a67f48e8bcf53bb657a6014230ed3baf6584982a1c25811c47d751563e59850224dd3291c61ca30a7fb8ef69eff7
+  checksum: 10/1144b3634f02532316d811d33844c992caf7dc70e1dde454952fb446a3c67848b3e76deb3e8de2a7a29faaf7cee34bd00890b647508cd8d44623b1a2953ed030
   languageName: node
   linkType: hard
 
-"@lerna/describe-ref@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/describe-ref@npm:5.5.4"
-  dependencies:
-    "@lerna/child-process": 5.5.4
-    npmlog: ^6.0.2
-  checksum: 2ba2d0a8e6f6d81b007a42b1c799f5759b68003ca93a922b091450cd66cd08ae60e5c55e306883609f7762a253a07215f40aa03c5c0652348acab9ede4d09848
-  languageName: node
-  linkType: hard
-
-"@lerna/diff@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/diff@npm:5.5.4"
-  dependencies:
-    "@lerna/child-process": 5.5.4
-    "@lerna/command": 5.5.4
-    "@lerna/validation-error": 5.5.4
-    npmlog: ^6.0.2
-  checksum: 5a171e653c3074bc1c1d4d200dd2a82cf36e92ad7f9ab03f9d38cd9cd33b44ea0a568c3804d5d15323931ee353f51870ba3f000a917c041df77a8412bcffdb2f
-  languageName: node
-  linkType: hard
-
-"@lerna/exec@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/exec@npm:5.5.4"
-  dependencies:
-    "@lerna/child-process": 5.5.4
-    "@lerna/command": 5.5.4
-    "@lerna/filter-options": 5.5.4
-    "@lerna/profiler": 5.5.4
-    "@lerna/run-topologically": 5.5.4
-    "@lerna/validation-error": 5.5.4
-    p-map: ^4.0.0
-  checksum: 90ba92303def5a1d39e15c3275282e6782005d52c7c880d2d1305f87c6f4a641cff67e2d1ef86dea46c8d18a1a03cb4b21ead7c60306cde5e9fb1d00396086fa
-  languageName: node
-  linkType: hard
-
-"@lerna/filter-options@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/filter-options@npm:5.5.4"
-  dependencies:
-    "@lerna/collect-updates": 5.5.4
-    "@lerna/filter-packages": 5.5.4
-    dedent: ^0.7.0
-    npmlog: ^6.0.2
-  checksum: a3fc09f042a66373231237fd9521b2d6e35ea56cb2cdf428de80fe7817cf27130718db2ddf68cfd7d7269c34f1cf266208c8e5c8b8dc2fa469fe8c35cbea8ee4
-  languageName: node
-  linkType: hard
-
-"@lerna/filter-packages@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/filter-packages@npm:5.5.4"
-  dependencies:
-    "@lerna/validation-error": 5.5.4
-    multimatch: ^5.0.0
-    npmlog: ^6.0.2
-  checksum: 889c26a659228c041f70ce27c81feaa360e8659299851208c931b726983449a885e943ca50db7c975b670adb07424c83bba0d0f4dc71ea99f9f6143b88a05315
-  languageName: node
-  linkType: hard
-
-"@lerna/get-npm-exec-opts@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/get-npm-exec-opts@npm:5.5.4"
-  dependencies:
-    npmlog: ^6.0.2
-  checksum: b4c0e88a53a32eb538b0730b316d7df51281d11d05f2ed928b6ef553c25611af1346921856999b6a8d69ff64742f51dde3e32156dba37ff950206bdebf51048f
-  languageName: node
-  linkType: hard
-
-"@lerna/get-packed@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/get-packed@npm:5.5.4"
-  dependencies:
-    fs-extra: ^9.1.0
-    ssri: ^9.0.1
-    tar: ^6.1.0
-  checksum: e53c57740651086c0d5c3eb8aa5a9cd777e7aa9b4ec8bb3d997f1d9df783f67597c6418d73c5d680926998f45fb3ff3735fb72e232098bfb6e788c5fee416a5f
-  languageName: node
-  linkType: hard
-
-"@lerna/github-client@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/github-client@npm:5.5.4"
-  dependencies:
-    "@lerna/child-process": 5.5.4
-    "@octokit/plugin-enterprise-rest": ^6.0.1
-    "@octokit/rest": ^19.0.3
-    git-url-parse: ^13.1.0
-    npmlog: ^6.0.2
-  checksum: 6f531f1c133c2643fa7c716c0d986bf59d18eed13099195fcf4c7fe683b49dc7fad1d410985d3f5273ec0f607763ef800b4d0d841557adc4a3fe4fe05a78dca2
-  languageName: node
-  linkType: hard
-
-"@lerna/gitlab-client@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/gitlab-client@npm:5.5.4"
-  dependencies:
-    node-fetch: ^2.6.1
-    npmlog: ^6.0.2
-  checksum: bcd867c6e66f5eaa790c2c40a85f88b7fc37dc2504b17d096102630049bcb3dbf6d0ec33e8369fb6204e5537a263bbaeefacae42ab8570e104a5f5a17fa59685
-  languageName: node
-  linkType: hard
-
-"@lerna/global-options@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/global-options@npm:5.5.4"
-  checksum: 5a501be802d3bc02f8525a8ee32bab7833e387323b7b52e86c8ed273ed197ca81aa12651a462a98eef11cabd61dca1e5e1a2390023cb056dae30da246ca94b72
-  languageName: node
-  linkType: hard
-
-"@lerna/has-npm-version@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/has-npm-version@npm:5.5.4"
-  dependencies:
-    "@lerna/child-process": 5.5.4
-    semver: ^7.3.4
-  checksum: e28690f9efc7034da6f0e49b84816a184cea95376088c526621395add30a4e3475f5b66fc4945e126412e72aaa67cf557af236a65d5905084485f0acaf129140
-  languageName: node
-  linkType: hard
-
-"@lerna/import@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/import@npm:5.5.4"
-  dependencies:
-    "@lerna/child-process": 5.5.4
-    "@lerna/command": 5.5.4
-    "@lerna/prompt": 5.5.4
-    "@lerna/pulse-till-done": 5.5.4
-    "@lerna/validation-error": 5.5.4
-    dedent: ^0.7.0
-    fs-extra: ^9.1.0
-    p-map-series: ^2.1.0
-  checksum: e04b2e85fef25c1ced9f98e607cf6ad25f3e98fe8fe80ae359614c34de4679c45b082a8cae164c6fbe6af86d9ce72128640a225bd603d3faa89d285406adf1f9
+"@lerna/create@npm:8.1.2":
+  version: 8.1.2
+  resolution: "@lerna/create@npm:8.1.2"
+  dependencies:
+    "@npmcli/run-script": "npm:7.0.2"
+    "@nx/devkit": "npm:>=17.1.2 < 19"
+    "@octokit/plugin-enterprise-rest": "npm:6.0.1"
+    "@octokit/rest": "npm:19.0.11"
+    byte-size: "npm:8.1.1"
+    chalk: "npm:4.1.0"
+    clone-deep: "npm:4.0.1"
+    cmd-shim: "npm:6.0.1"
+    columnify: "npm:1.6.0"
+    conventional-changelog-core: "npm:5.0.1"
+    conventional-recommended-bump: "npm:7.0.1"
+    cosmiconfig: "npm:^8.2.0"
+    dedent: "npm:0.7.0"
+    execa: "npm:5.0.0"
+    fs-extra: "npm:^11.1.1"
+    get-stream: "npm:6.0.0"
+    git-url-parse: "npm:13.1.0"
+    glob-parent: "npm:5.1.2"
+    globby: "npm:11.1.0"
+    graceful-fs: "npm:4.2.11"
+    has-unicode: "npm:2.0.1"
+    ini: "npm:^1.3.8"
+    init-package-json: "npm:5.0.0"
+    inquirer: "npm:^8.2.4"
+    is-ci: "npm:3.0.1"
+    is-stream: "npm:2.0.0"
+    js-yaml: "npm:4.1.0"
+    libnpmpublish: "npm:7.3.0"
+    load-json-file: "npm:6.2.0"
+    lodash: "npm:^4.17.21"
+    make-dir: "npm:4.0.0"
+    minimatch: "npm:3.0.5"
+    multimatch: "npm:5.0.0"
+    node-fetch: "npm:2.6.7"
+    npm-package-arg: "npm:8.1.1"
+    npm-packlist: "npm:5.1.1"
+    npm-registry-fetch: "npm:^14.0.5"
+    npmlog: "npm:^6.0.2"
+    nx: "npm:>=17.1.2 < 19"
+    p-map: "npm:4.0.0"
+    p-map-series: "npm:2.1.0"
+    p-queue: "npm:6.6.2"
+    p-reduce: "npm:^2.1.0"
+    pacote: "npm:^17.0.5"
+    pify: "npm:5.0.0"
+    read-cmd-shim: "npm:4.0.0"
+    read-package-json: "npm:6.0.4"
+    resolve-from: "npm:5.0.0"
+    rimraf: "npm:^4.4.1"
+    semver: "npm:^7.3.4"
+    signal-exit: "npm:3.0.7"
+    slash: "npm:^3.0.0"
+    ssri: "npm:^9.0.1"
+    strong-log-transformer: "npm:2.1.0"
+    tar: "npm:6.1.11"
+    temp-dir: "npm:1.0.0"
+    upath: "npm:2.0.1"
+    uuid: "npm:^9.0.0"
+    validate-npm-package-license: "npm:^3.0.4"
+    validate-npm-package-name: "npm:5.0.0"
+    write-file-atomic: "npm:5.0.1"
+    write-pkg: "npm:4.0.0"
+    yargs: "npm:17.7.2"
+    yargs-parser: "npm:21.1.1"
+  checksum: 10/d12b378cec4396d01f05127f9921dba83aae5f9c682d9cc01a15092bcd806625ad97126cd7b0dcc3cbfa851a9886c398d7562106ce9972603e00d02ddf6a6c61
+  languageName: node
+  linkType: hard
+
+"@lezer/common@npm:1.2.1, @lezer/common@npm:^1.0.0":
+  version: 1.2.1
+  resolution: "@lezer/common@npm:1.2.1"
+  checksum: 10/b362ed2e97664e4b36b3dbff49b52d1bfc5accc0152b577fefd46e585d012ff685d1fd336d75d80066e01c0505b1135d4cf69be5e330b5bfec2e2650c437bcae
   languageName: node
   linkType: hard
 
-"@lerna/info@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/info@npm:5.5.4"
+"@lezer/highlight@npm:1.2.0":
+  version: 1.2.0
+  resolution: "@lezer/highlight@npm:1.2.0"
   dependencies:
-    "@lerna/command": 5.5.4
-    "@lerna/output": 5.5.4
-    envinfo: ^7.7.4
-  checksum: 2bfb409a6b60bf2e7f755fe8443adbd3a414a50ea99119294c949770fa800ab6ebbc0a05c6646f2aed1d503ec1b7bfbf06688cfa7ae090d1132b4f041456ac6e
+    "@lezer/common": "npm:^1.0.0"
+  checksum: 10/14a80cbfb0cd1ce716decb4f3a045d42e7146f539cfd483b62ce46c4586a26d2f4fbdc35ace1cad81645304be4d30eafb95a2b057c34dfd471d56c7fbd82df3a
   languageName: node
   linkType: hard
 
-"@lerna/init@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/init@npm:5.5.4"
+"@lezer/lr@npm:1.3.3":
+  version: 1.3.3
+  resolution: "@lezer/lr@npm:1.3.3"
   dependencies:
-    "@lerna/child-process": 5.5.4
-    "@lerna/command": 5.5.4
-    "@lerna/project": 5.5.4
-    fs-extra: ^9.1.0
-    p-map: ^4.0.0
-    write-json-file: ^4.3.0
-  checksum: 610bfc08593d54095898e02adc1e49b742eb385cf6168ec0c134e2f04231fa695924f5bfd404730fc11ae72dfb8700f408fb6514d56333e6e4cc46d4547563a1
+    "@lezer/common": "npm:^1.0.0"
+  checksum: 10/7e61dc2554b85560ef1af6d3a6112c711d20d54e0c3184657099be8dc40d2747d28d5d332cc1b0d75064846d51fbff0bed162550a332aeccdfa36836b5541cfd
   languageName: node
   linkType: hard
 
-"@lerna/link@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/link@npm:5.5.4"
+"@linaria/core@npm:^4.5.4":
+  version: 4.5.4
+  resolution: "@linaria/core@npm:4.5.4"
   dependencies:
-    "@lerna/command": 5.5.4
-    "@lerna/package-graph": 5.5.4
-    "@lerna/symlink-dependencies": 5.5.4
-    "@lerna/validation-error": 5.5.4
-    p-map: ^4.0.0
-    slash: ^3.0.0
-  checksum: 391cb0e93f324cb1b7e72c7a415f23ab0690912ff72f0e40b5794ad7c32c4ecd3500f75efac73efd08dc83978aa23bf343b527d2b501d156e8f857ee9fe4f1d9
+    "@linaria/logger": "npm:^4.5.0"
+    "@linaria/tags": "npm:^4.5.4"
+    "@linaria/utils": "npm:^4.5.3"
+  checksum: 10/3eff66a8d7ce272fbf3cd680a916d133e5194b8d65410c0512b768948fd81306b6d435b09834793428b005d43f65b20ad5d1569a0a77b81d7dbf11679cd69c55
   languageName: node
   linkType: hard
 
-"@lerna/list@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/list@npm:5.5.4"
+"@linaria/logger@npm:^4.5.0":
+  version: 4.5.0
+  resolution: "@linaria/logger@npm:4.5.0"
   dependencies:
-    "@lerna/command": 5.5.4
-    "@lerna/filter-options": 5.5.4
-    "@lerna/listable": 5.5.4
-    "@lerna/output": 5.5.4
-  checksum: ccbea2a102b6c9ebfdfb38bd8fac81a329a8c8bcd466e334ebb7626bf094361fff00a5895523744f12ba3ea4ed4e9798f8ddebc8006fb642f758b79014a3b64e
+    debug: "npm:^4.1.1"
+    picocolors: "npm:^1.0.0"
+  checksum: 10/8a01717e4935244c44d0952442811a8c4fa57aade9b99ab811d30ecbef5261859839af9f0c78645b6549d40c97eef79754cd12a8436f54e4c2139635c60cab91
   languageName: node
   linkType: hard
 
-"@lerna/listable@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/listable@npm:5.5.4"
+"@linaria/react@npm:^4.5.3":
+  version: 4.5.4
+  resolution: "@linaria/react@npm:4.5.4"
   dependencies:
-    "@lerna/query-graph": 5.5.4
-    chalk: ^4.1.0
-    columnify: ^1.6.0
-  checksum: db4e674fc75f320e5888a2ada8c2447d5111584f3c35e744a6d8fb9a026abe557ad6d02430915aeb7b4cb99cd129f391825053fa785d4ce2db2df462291c8ded
+    "@emotion/is-prop-valid": "npm:^1.2.0"
+    "@linaria/core": "npm:^4.5.4"
+    "@linaria/tags": "npm:^4.5.4"
+    "@linaria/utils": "npm:^4.5.3"
+    minimatch: "npm:^9.0.3"
+    react-html-attributes: "npm:^1.4.6"
+    ts-invariant: "npm:^0.10.3"
+  peerDependencies:
+    react: ">=16"
+  checksum: 10/d41fc7743b3cbae460e75c6f320d519bc0626d4dfead115bb8cf5dc2ddf3d098f3e42f3db972498d3113f5ee30ec8c688bc613f594c35f37b2ef7b064a0a4cde
   languageName: node
   linkType: hard
 
-"@lerna/log-packed@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/log-packed@npm:5.5.4"
+"@linaria/tags@npm:^4.5.4":
+  version: 4.5.4
+  resolution: "@linaria/tags@npm:4.5.4"
   dependencies:
-    byte-size: ^7.0.0
-    columnify: ^1.6.0
-    has-unicode: ^2.0.1
-    npmlog: ^6.0.2
-  checksum: 83af3e1b63e658b9fde75feb9508a38492f23743ce028d74bde674ffba01bb7d9b0607f751f42c3b805c6b1a5c2ca70cd4e7ec70997f200875ce5ff4e4798e51
+    "@babel/generator": "npm:^7.22.9"
+    "@linaria/logger": "npm:^4.5.0"
+    "@linaria/utils": "npm:^4.5.3"
+  checksum: 10/e637d304587e97749fb1376ca081022fcbfb848605fe57296c4eb3966d24234017ccd254cb82fa4713aefe90cec38e39bfe4b9ac4e7056f4ef71d150f1a0ad7f
   languageName: node
   linkType: hard
 
-"@lerna/npm-conf@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/npm-conf@npm:5.5.4"
+"@linaria/utils@npm:^4.5.3":
+  version: 4.5.3
+  resolution: "@linaria/utils@npm:4.5.3"
   dependencies:
-    config-chain: ^1.1.12
-    pify: ^5.0.0
-  checksum: dfbad876fd5bb92d6a34f0f4ec58eeaeaea323cd40be0e7b7cc8235093af7c855be3fd1aa689992aa884e404f5a16d38ea7a4c244f112b43f630d18aef8a162d
+    "@babel/core": "npm:^7.22.9"
+    "@babel/generator": "npm:^7.22.9"
+    "@babel/plugin-proposal-export-namespace-from": "npm:^7.18.9"
+    "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
+    "@babel/plugin-transform-modules-commonjs": "npm:^7.22.5"
+    "@babel/template": "npm:^7.22.5"
+    "@babel/traverse": "npm:^7.22.8"
+    "@babel/types": "npm:^7.22.5"
+    "@linaria/logger": "npm:^4.5.0"
+    babel-merge: "npm:^3.0.0"
+    find-up: "npm:^5.0.0"
+    minimatch: "npm:^9.0.3"
+  checksum: 10/8b1ec27ebf8078b82631de1c5debcb950267c5b098d81c66d7c1626654f822d3776dafe766214d667d1090ff7bdc8f20477912147951658f02a5121dbd29e52e
   languageName: node
   linkType: hard
 
-"@lerna/npm-dist-tag@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/npm-dist-tag@npm:5.5.4"
+"@locker/near-membrane-base@npm:0.13.6":
+  version: 0.13.6
+  resolution: "@locker/near-membrane-base@npm:0.13.6"
   dependencies:
-    "@lerna/otplease": 5.5.4
-    npm-package-arg: 8.1.1
-    npm-registry-fetch: ^13.3.0
-    npmlog: ^6.0.2
-  checksum: 4fb1fa54c1dd2e6a5c5ab68723a753bc74542f7031e513c5ada7507496f3dae10884a6727486024b1b6f272c81d4e1a1f63dfc012180d3e27b896689dc79f402
+    "@locker/near-membrane-shared": "npm:0.13.6"
+  checksum: 10/308ff2a9a4a078837116d1ce140f9f367feb49f6a0802f7427ec225b594092d653918adceb9dd4a279c56433546002ccbcc64ada3fa0a72616ea598f061767bb
   languageName: node
   linkType: hard
 
-"@lerna/npm-install@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/npm-install@npm:5.5.4"
+"@locker/near-membrane-dom@npm:0.13.6":
+  version: 0.13.6
+  resolution: "@locker/near-membrane-dom@npm:0.13.6"
   dependencies:
-    "@lerna/child-process": 5.5.4
-    "@lerna/get-npm-exec-opts": 5.5.4
-    fs-extra: ^9.1.0
-    npm-package-arg: 8.1.1
-    npmlog: ^6.0.2
-    signal-exit: ^3.0.3
-    write-pkg: ^4.0.0
-  checksum: 156524225ab1e504e86aa025c464b1557f04e0cc72ff1c288afe69334eea3b394640ee0e48582e9cae357daa186a14066a8ad6be12eb4f497ac1cbe5bc3f1df5
+    "@locker/near-membrane-base": "npm:0.13.6"
+    "@locker/near-membrane-shared": "npm:0.13.6"
+    "@locker/near-membrane-shared-dom": "npm:0.13.6"
+  checksum: 10/ad622f0a57c9041e396663c1cd293cdb1a98ae2a48a08616fc8331526d836716f7a25774a55d87d4b716f2ff0c03013239790a2261eb9c9992f570d75d7c0f8a
   languageName: node
   linkType: hard
 
-"@lerna/npm-publish@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/npm-publish@npm:5.5.4"
+"@locker/near-membrane-shared-dom@npm:0.13.6":
+  version: 0.13.6
+  resolution: "@locker/near-membrane-shared-dom@npm:0.13.6"
   dependencies:
-    "@lerna/otplease": 5.5.4
-    "@lerna/run-lifecycle": 5.5.4
-    fs-extra: ^9.1.0
-    libnpmpublish: ^6.0.4
-    npm-package-arg: 8.1.1
-    npmlog: ^6.0.2
-    pify: ^5.0.0
-    read-package-json: ^5.0.1
-  checksum: 6a28621b59bc91a411c78f87d2b6aa9bdfd406cd7b2e05b448c5e94fdcab4643933cbc6b708e013ad158f9b839bb0ac8d305b92a2bd398ebc3e7fed72407af27
+    "@locker/near-membrane-shared": "npm:0.13.6"
+  checksum: 10/2171637f36f780df424de705d4ee792a5499c6b09e050458c0d0eb2d021ed0b900c70f13c35354299b3bc8ff2484615c4e9967a4c794a90b35222d6431d75142
   languageName: node
   linkType: hard
 
-"@lerna/npm-run-script@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/npm-run-script@npm:5.5.4"
-  dependencies:
-    "@lerna/child-process": 5.5.4
-    "@lerna/get-npm-exec-opts": 5.5.4
-    npmlog: ^6.0.2
-  checksum: 488d32847ac2f15e7d8c5ef3564438029fecc92da5b643f5b642bb0706e041ca93c753b36f0325a4c62e78226379de201a1eb5b65c32287421dee3d0fb0d84c0
+"@locker/near-membrane-shared@npm:0.13.6":
+  version: 0.13.6
+  resolution: "@locker/near-membrane-shared@npm:0.13.6"
+  checksum: 10/4596c9167f27483cd1875a70f25f395125943ff4dcc5b03e95f785ccc00d8b767c2b1d8e81271f7923ec5c6189efcd58d4c5f531bdf45be2be37fdd6ac7a6023
   languageName: node
   linkType: hard
 
-"@lerna/otplease@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/otplease@npm:5.5.4"
-  dependencies:
-    "@lerna/prompt": 5.5.4
-  checksum: 13970bae350dbbc58588a475ee706b1c5ecff556dfbc9858da0d0fc75f5687d608e0bd134260c354fbbc0108d9bdac6b2f2cc3e1c61f5cba9c188210835eae7e
+"@lukeed/csprng@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@lukeed/csprng@npm:1.1.0"
+  checksum: 10/926f5f7fc629470ca9a8af355bfcd0271d34535f7be3890f69902432bddc3262029bb5dbe9025542cf6c9883d878692eef2815fc2f3ba5b92e9da1f9eba2e51b
   languageName: node
   linkType: hard
 
-"@lerna/output@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/output@npm:5.5.4"
+"@lukeed/uuid@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "@lukeed/uuid@npm:2.0.1"
   dependencies:
-    npmlog: ^6.0.2
-  checksum: f72633c06f8052c8283d039e10fa7aa4e9c965d6c838bdc736bd51d635a0ba20e173fc2e19173f3537b6d94a5881ac964b10ebaf99704ec5105a303563b64afe
+    "@lukeed/csprng": "npm:^1.1.0"
+  checksum: 10/f5e71e4da852dbff49b93cad27d5a2f61c2241e307bbe89b3b54b889ecb7927f2487246467f90ebb6cbdb7e0ac2a213e2e58b1182cb7990cef6e049aa7c39e7b
   languageName: node
   linkType: hard
 
-"@lerna/pack-directory@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/pack-directory@npm:5.5.4"
+"@manypkg/find-root@npm:^2.2.0":
+  version: 2.2.1
+  resolution: "@manypkg/find-root@npm:2.2.1"
   dependencies:
-    "@lerna/get-packed": 5.5.4
-    "@lerna/package": 5.5.4
-    "@lerna/run-lifecycle": 5.5.4
-    "@lerna/temp-write": 5.5.4
-    npm-packlist: ^5.1.1
-    npmlog: ^6.0.2
-    tar: ^6.1.0
-  checksum: 1d31a76e463957e8441e53d96b228da92daa1c2c242a9a1d2b4a4e95fca710f3b6f9e01f2f129cb33f0a9bf3d3e63ae579cf8f79f48c774ba604078b90b8775b
+    "@manypkg/tools": "npm:^1.1.0"
+    find-up: "npm:^4.1.0"
+    fs-extra: "npm:^8.1.0"
+  checksum: 10/7f31120c3ef0711f6e65857ea232fb4f7caf4db388080e738f82d979d7f72572dae60519c8fcd45c431a8e94095b6628257fbf7373b34401359def00687bab13
   languageName: node
   linkType: hard
 
-"@lerna/package-graph@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/package-graph@npm:5.5.4"
+"@manypkg/get-packages@npm:^2.2.0":
+  version: 2.2.1
+  resolution: "@manypkg/get-packages@npm:2.2.1"
   dependencies:
-    "@lerna/prerelease-id-from-version": 5.5.4
-    "@lerna/validation-error": 5.5.4
-    npm-package-arg: 8.1.1
-    npmlog: ^6.0.2
-    semver: ^7.3.4
-  checksum: 4e48d8993eec4e381f817535e0f45472191889ba596e812941caeaf7fd57b28c7cd24e27ad23085db5ad1df6a82498812521b9698e2fad5d8be23d2d7a376f9d
+    "@manypkg/find-root": "npm:^2.2.0"
+    "@manypkg/tools": "npm:^1.1.0"
+  checksum: 10/648da51cf0bf301cfb133b51b816f04f7caf3c29c386c7fb38a106e6ffdc00823e6aa54b3f72eca49c7a64a1fdf00d55c85095ca9ebcbadfa02b89f6acd4fcdb
   languageName: node
   linkType: hard
 
-"@lerna/package@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/package@npm:5.5.4"
+"@manypkg/tools@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@manypkg/tools@npm:1.1.0"
   dependencies:
-    load-json-file: ^6.2.0
-    npm-package-arg: 8.1.1
-    write-pkg: ^4.0.0
-  checksum: 9e2ef5f6c43f02f8f81ccc33b6a195f5a3b505e0112a8a72c8169211249abeff1ccc1480a6f9dcf7e23068541cefa0eb26541fabf867d452657145aaef88dd6b
+    fs-extra: "npm:^8.1.0"
+    globby: "npm:^11.0.0"
+    jju: "npm:^1.4.0"
+    read-yaml-file: "npm:^1.1.0"
+  checksum: 10/85bd2a656c46a475a8f7232515302ffc374005f8cea893e2505271a757fc14accca40e298f7c3acd0df2277ab436b30efeb22af5c6b0d7cd238bc413456a150b
   languageName: node
   linkType: hard
 
-"@lerna/prerelease-id-from-version@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/prerelease-id-from-version@npm:5.5.4"
-  dependencies:
-    semver: ^7.3.4
-  checksum: 6213fe4dc060d7c41e153e4e6c1f6214bad88e911659846ea39ccc874801d276c7751b836cf0bf17cb63e45943f1c67396717f6843fe58c6a31806a49c26cbd7
+"@mapbox/jsonlint-lines-primitives@npm:~2.0.2":
+  version: 2.0.2
+  resolution: "@mapbox/jsonlint-lines-primitives@npm:2.0.2"
+  checksum: 10/6d8e64d34d912ebf29fead0d1917c8d8ad86e96f69b6100a9764af8cba391609474cdce7f7e4a2d579ccea58a142d1454257b795403179e9133a09af13101068
   languageName: node
   linkType: hard
 
-"@lerna/profiler@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/profiler@npm:5.5.4"
+"@mapbox/mapbox-gl-style-spec@npm:^13.23.1":
+  version: 13.25.0
+  resolution: "@mapbox/mapbox-gl-style-spec@npm:13.25.0"
   dependencies:
-    fs-extra: ^9.1.0
-    npmlog: ^6.0.2
-    upath: ^2.0.1
-  checksum: 1c3eb01eccf7d478ee3197886b60d43f743058c9f2591bf40d0b0737d263af3169a9d55d42fcc7b02c41d60cba1ac4bee1f146318c4c2e85a9892b0190b2d3ae
+    "@mapbox/jsonlint-lines-primitives": "npm:~2.0.2"
+    "@mapbox/point-geometry": "npm:^0.1.0"
+    "@mapbox/unitbezier": "npm:^0.0.0"
+    csscolorparser: "npm:~1.0.2"
+    json-stringify-pretty-compact: "npm:^2.0.0"
+    minimist: "npm:^1.2.5"
+    rw: "npm:^1.3.3"
+    sort-object: "npm:^0.3.2"
+  bin:
+    gl-style-composite: bin/gl-style-composite.js
+    gl-style-format: bin/gl-style-format.js
+    gl-style-migrate: bin/gl-style-migrate.js
+    gl-style-validate: bin/gl-style-validate.js
+  checksum: 10/cabd9629bde72fe961f9a9d957534f75eb74bddb10068bf7b43fa73868eeb857a31196a12dc2a4532ab732bc7d38392e9bd4582fa9021ef9a5c3465e964201d2
   languageName: node
   linkType: hard
 
-"@lerna/project@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/project@npm:5.5.4"
-  dependencies:
-    "@lerna/package": 5.5.4
-    "@lerna/validation-error": 5.5.4
-    cosmiconfig: ^7.0.0
-    dedent: ^0.7.0
-    dot-prop: ^6.0.1
-    glob-parent: ^5.1.1
-    globby: ^11.0.2
-    js-yaml: ^4.1.0
-    load-json-file: ^6.2.0
-    npmlog: ^6.0.2
-    p-map: ^4.0.0
-    resolve-from: ^5.0.0
-    write-json-file: ^4.3.0
-  checksum: a97b76a6fc655e7d3177f9bfeff4da5e2b353322dfbeb70ae619fdd2b69f0ab6b2d2cb772388f396f8b21fbe0fade882303fbed9fb5c476a26f9b3b7aaa722dc
+"@mapbox/node-pre-gyp@npm:^1.0.9":
+  version: 1.0.11
+  resolution: "@mapbox/node-pre-gyp@npm:1.0.11"
+  dependencies:
+    detect-libc: "npm:^2.0.0"
+    https-proxy-agent: "npm:^5.0.0"
+    make-dir: "npm:^3.1.0"
+    node-fetch: "npm:^2.6.7"
+    nopt: "npm:^5.0.0"
+    npmlog: "npm:^5.0.1"
+    rimraf: "npm:^3.0.2"
+    semver: "npm:^7.3.5"
+    tar: "npm:^6.1.11"
+  bin:
+    node-pre-gyp: bin/node-pre-gyp
+  checksum: 10/59529a2444e44fddb63057152452b00705aa58059079191126c79ac1388ae4565625afa84ed4dd1bf017d1111ab6e47907f7c5192e06d83c9496f2f3e708680a
   languageName: node
   linkType: hard
 
-"@lerna/prompt@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/prompt@npm:5.5.4"
-  dependencies:
-    inquirer: ^8.2.4
-    npmlog: ^6.0.2
-  checksum: 652293aac0a159bc4eea11c85014e8368447f36b18810b7c92f3c33614890e74528d77ddceccd7ea038b3aa7f3976428329b34ca6f7cad8b424502bf64240b40
+"@mapbox/point-geometry@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "@mapbox/point-geometry@npm:0.1.0"
+  checksum: 10/f6f78ac8a7f798efb19db6eb1a9e05da7ba942102f5347c1a673d94202d0c606ec3f522efa3e76d583cdca46fb96dde52c3d37234f162d21df42f9e8c4f182bd
   languageName: node
   linkType: hard
 
-"@lerna/publish@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/publish@npm:5.5.4"
-  dependencies:
-    "@lerna/check-working-tree": 5.5.4
-    "@lerna/child-process": 5.5.4
-    "@lerna/collect-updates": 5.5.4
-    "@lerna/command": 5.5.4
-    "@lerna/describe-ref": 5.5.4
-    "@lerna/log-packed": 5.5.4
-    "@lerna/npm-conf": 5.5.4
-    "@lerna/npm-dist-tag": 5.5.4
-    "@lerna/npm-publish": 5.5.4
-    "@lerna/otplease": 5.5.4
-    "@lerna/output": 5.5.4
-    "@lerna/pack-directory": 5.5.4
-    "@lerna/prerelease-id-from-version": 5.5.4
-    "@lerna/prompt": 5.5.4
-    "@lerna/pulse-till-done": 5.5.4
-    "@lerna/run-lifecycle": 5.5.4
-    "@lerna/run-topologically": 5.5.4
-    "@lerna/validation-error": 5.5.4
-    "@lerna/version": 5.5.4
-    fs-extra: ^9.1.0
-    libnpmaccess: ^6.0.3
-    npm-package-arg: 8.1.1
-    npm-registry-fetch: ^13.3.0
-    npmlog: ^6.0.2
-    p-map: ^4.0.0
-    p-pipe: ^3.1.0
-    pacote: ^13.6.1
-    semver: ^7.3.4
-  checksum: 466de9cade594c1f9bcb28f6e68dd51b7180a2eda864b0a55b46ddca59250ed7b91c996bd2f8a10ce6024e8f9b914561832b07cf149c8e7c66d596a3159591cc
+"@mapbox/unitbezier@npm:^0.0.0":
+  version: 0.0.0
+  resolution: "@mapbox/unitbezier@npm:0.0.0"
+  checksum: 10/211fc5b0a40fafa0127baf87938a6a00535b22b51bec95df2f6141cf1dd50339bca2a9729c7a9803cdee5c2b4e0e3323a882655c74f1a86e557096684196e1ff
   languageName: node
   linkType: hard
 
-"@lerna/pulse-till-done@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/pulse-till-done@npm:5.5.4"
+"@mdx-js/react@npm:^2.1.5":
+  version: 2.3.0
+  resolution: "@mdx-js/react@npm:2.3.0"
   dependencies:
-    npmlog: ^6.0.2
-  checksum: a296b1617590188ad51da84020afc09db906a98c2d9b993bb93db493a8d9297dfdecdedc31e7f52c996e3b9fec9891c4d8dea7f5a7da912b8e711aa320ab6901
+    "@types/mdx": "npm:^2.0.0"
+    "@types/react": "npm:>=16"
+  peerDependencies:
+    react: ">=16"
+  checksum: 10/bce1cb1dde0a9a2b786cd9167b9e2bc0e3be52c195a4a79aaf1677470566d1fd2979d01baca2380c76aa4a1a27cd89f051484e595fdc4144a428d6af39bb667a
   languageName: node
   linkType: hard
 
-"@lerna/query-graph@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/query-graph@npm:5.5.4"
-  dependencies:
-    "@lerna/package-graph": 5.5.4
-  checksum: b360f980ff5ab5706a61b11b5d3ea256a729142b52af5c41a926e481b9722c8a04ca9d0c9a4a474a6258c49365ae8fdc3188be37a97acd48cec2174a09a9bb52
+"@mochajs/json-file-reporter@npm:^1.2.0":
+  version: 1.3.0
+  resolution: "@mochajs/json-file-reporter@npm:1.3.0"
+  peerDependencies:
+    mocha: 6.x || 7.x || 8.x
+  checksum: 10/b916b4ba048b2935026e61c09a84043f2f345c8f245a8505eb3e645fe300969fa9262fed6fc1391b25f1ea4e2120e5bfae35b33b49038d0306a44b86ef9675a3
   languageName: node
   linkType: hard
 
-"@lerna/resolve-symlink@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/resolve-symlink@npm:5.5.4"
+"@monaco-editor/loader@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "@monaco-editor/loader@npm:1.4.0"
   dependencies:
-    fs-extra: ^9.1.0
-    npmlog: ^6.0.2
-    read-cmd-shim: ^3.0.0
-  checksum: b3ddc7c92404385d6ba8a67cd63594192f84655af19cbe5fcc781f4d0d09348c480bf6d8eb86b689a02dac0e729fbf97355f3a6645312098992d2a47d1db57a0
+    state-local: "npm:^1.0.6"
+  peerDependencies:
+    monaco-editor: ">= 0.21.0 < 1"
+  checksum: 10/32ad01de015fc187450aa1cc0aa763af167664b6a61efcb9e1523a0f51ca5d0b35ba11ed95889edd6d774dfe98f196ef58f1607243abcbdd3d6d743f82ba8285
   languageName: node
   linkType: hard
 
-"@lerna/rimraf-dir@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/rimraf-dir@npm:5.5.4"
+"@monaco-editor/react@npm:4.6.0":
+  version: 4.6.0
+  resolution: "@monaco-editor/react@npm:4.6.0"
   dependencies:
-    "@lerna/child-process": 5.5.4
-    npmlog: ^6.0.2
-    path-exists: ^4.0.0
-    rimraf: ^3.0.2
-  checksum: fd7255b7fcd895db588eb01b2c4387d9f43b0b618b1dfba426250545e2c3e3586bdaf8274ea4631c5f574cb973e6daf2c3fda1aee69dfa75d4ee5b681d8689dc
+    "@monaco-editor/loader": "npm:^1.4.0"
+  peerDependencies:
+    monaco-editor: ">= 0.25.0 < 1"
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+  checksum: 10/e32724ebcc2fc81e91169d69eff8533e15a595c13156ec57965238a0f0afa67e2ed2abbf735a57cfaae15430bbc905b016b644bf7383a82d607501d557a6dd82
   languageName: node
   linkType: hard
 
-"@lerna/run-lifecycle@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/run-lifecycle@npm:5.5.4"
+"@msagl/core@npm:^1.1.16, @msagl/core@npm:^1.1.18":
+  version: 1.1.18
+  resolution: "@msagl/core@npm:1.1.18"
   dependencies:
-    "@lerna/npm-conf": 5.5.4
-    "@npmcli/run-script": ^4.1.7
-    npmlog: ^6.0.2
-    p-queue: ^6.6.2
-  checksum: 3bbf90da32e83f3a909b190a174c215aa14ebc90c2eba62de79216d6c3c08411abba03d3dee1f2146c5552a36b9507ec0550ce38769265a5ede5f1f8c0b1fd75
+    "@esfx/collections": "npm:^1.0.0"
+    "@esfx/collections-sortedmap": "npm:^1.0.0"
+    queue-typescript: "npm:^1.0.1"
+    reliable-random: "npm:^0.0.1"
+    stack-typescript: "npm:^1.0.4"
+    typescript-string-operations: "npm:^1.4.1"
+  checksum: 10/90dddc3f311eb2f61631d03907c70e8f948d424b5da9617b2c5b59bbb6c997804a171bb9af148226315659bb717b8cd770bef22b28983f68e1803d32a93c58d1
   languageName: node
   linkType: hard
 
-"@lerna/run-topologically@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/run-topologically@npm:5.5.4"
+"@msagl/drawing@npm:^1.1.18":
+  version: 1.1.18
+  resolution: "@msagl/drawing@npm:1.1.18"
   dependencies:
-    "@lerna/query-graph": 5.5.4
-    p-queue: ^6.6.2
-  checksum: 2fc3f2bcc6180e6b41e8cbc5bda35180c1fc6f69e6cf17306bc532c8d59667104dc3f65e6f05669b9cd222e06788ea4d110503bd26f75204657edb01d7389ae0
+    "@msagl/core": "npm:^1.1.18"
+  checksum: 10/4cba6bd172dc39e09da9487c87b9caf511fb12eff433715ba3efeac95650315c5a5fb8cc6dfffd6f76de304a8cab0ecb839fc933268f0a0a004ee130594e4773
   languageName: node
   linkType: hard
 
-"@lerna/run@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/run@npm:5.5.4"
+"@msagl/parser@npm:^1.1.16":
+  version: 1.1.18
+  resolution: "@msagl/parser@npm:1.1.18"
   dependencies:
-    "@lerna/command": 5.5.4
-    "@lerna/filter-options": 5.5.4
-    "@lerna/npm-run-script": 5.5.4
-    "@lerna/output": 5.5.4
-    "@lerna/profiler": 5.5.4
-    "@lerna/run-topologically": 5.5.4
-    "@lerna/timer": 5.5.4
-    "@lerna/validation-error": 5.5.4
-    fs-extra: ^9.1.0
-    p-map: ^4.0.0
-  checksum: aab32307bf40ff5c6bd061deaa1911068f1f02125b599148e1b7b8344ce26209ba7807f86a713531710fe7ffb46186980ffaf801b3f3151afb8e4952b5ab6ef6
+    "@msagl/core": "npm:^1.1.18"
+    "@msagl/drawing": "npm:^1.1.18"
+    "@types/parse-color": "npm:^1.0.1"
+    dotparser: "npm:^1.1.1"
+    parse-color: "npm:^1.0.0"
+  checksum: 10/f2b2d01d08e82341251cc8907a19881b2b203480342a49d14432922d68edf03a26bf3b4959d6673f45347afce7655f7cb95ace2218e06617cde5f4ed5a669f80
   languageName: node
   linkType: hard
 
-"@lerna/symlink-binary@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/symlink-binary@npm:5.5.4"
-  dependencies:
-    "@lerna/create-symlink": 5.5.4
-    "@lerna/package": 5.5.4
-    fs-extra: ^9.1.0
-    p-map: ^4.0.0
-  checksum: a4bff1050a379f237fbcfe7145ea1b3ad0ccce3daff44be19dd3ca96f542d78cec24be7ac14ef97163fb4024c679ee1d748c8035faf4cedc3a0270fc965b9f4d
+"@mswjs/cookies@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@mswjs/cookies@npm:1.1.0"
+  checksum: 10/168ed1966e579a4f454e6d2af5a015150cca570ac4c660f5b656e7bc021afacbf0b3d4ed3d03e9293550f3965c28ce1e293fa7037c6cf46ed7e268e21a1053a4
   languageName: node
   linkType: hard
 
-"@lerna/symlink-dependencies@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/symlink-dependencies@npm:5.5.4"
+"@mswjs/interceptors@npm:^0.26.14":
+  version: 0.26.14
+  resolution: "@mswjs/interceptors@npm:0.26.14"
   dependencies:
-    "@lerna/create-symlink": 5.5.4
-    "@lerna/resolve-symlink": 5.5.4
-    "@lerna/symlink-binary": 5.5.4
-    fs-extra: ^9.1.0
-    p-map: ^4.0.0
-    p-map-series: ^2.1.0
-  checksum: d7675966af7cb83a8e0a963e4b08049be4cdf4381196d4fbc975f571a5b3f5f0bf5002b5c15a5256ae861bacf86856469fa2bc90f64270998f4ac529bbdb08ed
+    "@open-draft/deferred-promise": "npm:^2.2.0"
+    "@open-draft/logger": "npm:^0.3.0"
+    "@open-draft/until": "npm:^2.0.0"
+    is-node-process: "npm:^1.2.0"
+    outvariant: "npm:^1.2.1"
+    strict-event-emitter: "npm:^0.5.1"
+  checksum: 10/ed5080f2f08079a0139677491ec101a94de2c06db81967580d6f777840aaaf0567e15c8a2fa6e078e3f2acba2a4bf288e8390d9de6c003206c69ff5134d061dd
   languageName: node
   linkType: hard
 
-"@lerna/temp-write@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/temp-write@npm:5.5.4"
+"@ndelangen/get-tarball@npm:^3.0.7":
+  version: 3.0.7
+  resolution: "@ndelangen/get-tarball@npm:3.0.7"
   dependencies:
-    graceful-fs: ^4.1.15
-    is-stream: ^2.0.0
-    make-dir: ^3.0.0
-    temp-dir: ^1.0.0
-    uuid: ^8.3.2
-  checksum: f9d61e997dd10d4445da1f85582c4649b8ee1bcf3e9cd3ce52013cc88d3f39b7b26445dfe7a222eb5fde2687d759281a5222994fe1dcf1fa5f3d68dec22a51a6
+    gunzip-maybe: "npm:^1.4.2"
+    pump: "npm:^3.0.0"
+    tar-fs: "npm:^2.1.1"
+  checksum: 10/382689de9d4a8e5e5eca0647c958969b4debd977f7acf398388c4515baf242a13f57f22adb6d02c558f68c4945834c2470982828da7247caaee90a2c9053a396
   languageName: node
   linkType: hard
 
-"@lerna/timer@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/timer@npm:5.5.4"
-  checksum: b15c10881a5e2e8e6c42643bdb1d1e0c73930545f522f161fb24c007bf373b8d7d59694cd24d1ea17bc631f72bd40f45095a538bd86b03fa7161febec4ec94c5
-  languageName: node
-  linkType: hard
-
-"@lerna/validation-error@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/validation-error@npm:5.5.4"
+"@ndhoule/each@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@ndhoule/each@npm:2.0.1"
   dependencies:
-    npmlog: ^6.0.2
-  checksum: 86cc66dd8f3d35ff333ad6e5009f176cb21c3e073e4591dc714f18d7f8d44cd3838ae365d5e9d927d7d8a08248296b76048f7d5948052bddecc9920ad8f5a013
+    "@ndhoule/keys": "npm:^2.0.0"
+  checksum: 10/bbf700f3f172620e050b7eee44d7461a2cf88fdb9faf211423771616d6e1167e5f34084bf17300c0f5f558d13d1335a75b50fdf440f5975d8449259fade8b9f0
   languageName: node
   linkType: hard
 
-"@lerna/version@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/version@npm:5.5.4"
-  dependencies:
-    "@lerna/check-working-tree": 5.5.4
-    "@lerna/child-process": 5.5.4
-    "@lerna/collect-updates": 5.5.4
-    "@lerna/command": 5.5.4
-    "@lerna/conventional-commits": 5.5.4
-    "@lerna/github-client": 5.5.4
-    "@lerna/gitlab-client": 5.5.4
-    "@lerna/output": 5.5.4
-    "@lerna/prerelease-id-from-version": 5.5.4
-    "@lerna/prompt": 5.5.4
-    "@lerna/run-lifecycle": 5.5.4
-    "@lerna/run-topologically": 5.5.4
-    "@lerna/temp-write": 5.5.4
-    "@lerna/validation-error": 5.5.4
-    chalk: ^4.1.0
-    dedent: ^0.7.0
-    load-json-file: ^6.2.0
-    minimatch: ^3.0.4
-    npmlog: ^6.0.2
-    p-map: ^4.0.0
-    p-pipe: ^3.1.0
-    p-reduce: ^2.1.0
-    p-waterfall: ^2.1.1
-    semver: ^7.3.4
-    slash: ^3.0.0
-    write-json-file: ^4.3.0
-  checksum: 785d1cfb837cd6c2559a4f777ee621fd760019d591b6e878b2845d257595bdad4eb3a11710beac91e1a2244b95f7ca708b576ecf59a8747cc85de074b7f0e086
+"@ndhoule/keys@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@ndhoule/keys@npm:2.0.0"
+  checksum: 10/f77be060eb706a072e9c41d8939dcbd7bf27ead2f113a75fd9718b3c6a623540f324f7200e474418feb6277f1b99952b67667129bd66a39fdf93531980066488
   languageName: node
   linkType: hard
 
-"@lerna/write-log-file@npm:5.5.4":
-  version: 5.5.4
-  resolution: "@lerna/write-log-file@npm:5.5.4"
+"@nodelib/fs.scandir@npm:2.1.5":
+  version: 2.1.5
+  resolution: "@nodelib/fs.scandir@npm:2.1.5"
   dependencies:
-    npmlog: ^6.0.2
-    write-file-atomic: ^4.0.1
-  checksum: c25c235f5399e0d510a4b6d7b3a675d0a8dabd8b84dd663fbf713a4174e234e21bc1b5d35c50f442cc4e57000482955bbd351fbd9181cd56fe4f5dd730ada001
+    "@nodelib/fs.stat": "npm:2.0.5"
+    run-parallel: "npm:^1.1.9"
+  checksum: 10/6ab2a9b8a1d67b067922c36f259e3b3dfd6b97b219c540877a4944549a4d49ea5ceba5663905ab5289682f1f3c15ff441d02f0447f620a42e1cb5e1937174d4b
   languageName: node
   linkType: hard
 
-"@lezer/common@npm:1.0.2, @lezer/common@npm:^1.0.0":
-  version: 1.0.2
-  resolution: "@lezer/common@npm:1.0.2"
-  checksum: bbcc58e07be02652bf0700d2856042ec089d5be0b95893d628b3e18192ade864fac83b61b19653e10b9f1472261a178b12318d934e9004edd5483a577c0db56b
+"@nodelib/fs.stat@npm:2.0.5, @nodelib/fs.stat@npm:^2.0.2":
+  version: 2.0.5
+  resolution: "@nodelib/fs.stat@npm:2.0.5"
+  checksum: 10/012480b5ca9d97bff9261571dbbec7bbc6033f69cc92908bc1ecfad0792361a5a1994bc48674b9ef76419d056a03efadfce5a6cf6dbc0a36559571a7a483f6f0
   languageName: node
   linkType: hard
 
-"@lezer/highlight@npm:1.1.3":
-  version: 1.1.3
-  resolution: "@lezer/highlight@npm:1.1.3"
+"@nodelib/fs.walk@npm:^1.2.3, @nodelib/fs.walk@npm:^1.2.6, @nodelib/fs.walk@npm:^1.2.8":
+  version: 1.2.8
+  resolution: "@nodelib/fs.walk@npm:1.2.8"
   dependencies:
-    "@lezer/common": ^1.0.0
-  checksum: 90ec143ce46b32f6779c3b245f1b5a540d66686939816d3daed8318821acc4bc719466dc222336cfd483bf04a8de4fdc6f279e904cf114d4d9f786f9feccbbd8
+    "@nodelib/fs.scandir": "npm:2.1.5"
+    fastq: "npm:^1.6.0"
+  checksum: 10/40033e33e96e97d77fba5a238e4bba4487b8284678906a9f616b5579ddaf868a18874c0054a75402c9fbaaa033a25ceae093af58c9c30278e35c23c9479e79b0
   languageName: node
   linkType: hard
 
-"@lezer/lr@npm:1.3.3":
-  version: 1.3.3
-  resolution: "@lezer/lr@npm:1.3.3"
+"@npmcli/agent@npm:^2.0.0":
+  version: 2.2.0
+  resolution: "@npmcli/agent@npm:2.2.0"
   dependencies:
-    "@lezer/common": ^1.0.0
-  checksum: 1804074c794005a31c54d80ab72127f19ae5be29bb627c52bc001a57b1af97a9e62732ff13e3aeb7bc53b330202b6bd3747272c64d87f257dbba533e75a183a3
+    agent-base: "npm:^7.1.0"
+    http-proxy-agent: "npm:^7.0.0"
+    https-proxy-agent: "npm:^7.0.1"
+    lru-cache: "npm:^10.0.1"
+    socks-proxy-agent: "npm:^8.0.1"
+  checksum: 10/822ea077553cd9cfc5cbd6d92380b0950fcb054a7027cd1b63a33bd0cbb16b0c6626ea75d95ec0e804643c8904472d3361d2da8c2444b1fb02a9b525d9c07c41
   languageName: node
   linkType: hard
 
-"@locker/near-membrane-base@npm:0.13.3":
-  version: 0.13.3
-  resolution: "@locker/near-membrane-base@npm:0.13.3"
+"@npmcli/fs@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@npmcli/fs@npm:1.0.0"
   dependencies:
-    "@locker/near-membrane-shared": 0.13.3
-  checksum: c523503566823cd82ef8e7f0a848b903c8b0d547c04d2498028497f8ccc63f2fc552c86f0196164627f391cec050d8df46244ba21b8675907a7581c0e7b5194a
+    "@gar/promisify": "npm:^1.0.1"
+    semver: "npm:^7.3.5"
+  checksum: 10/3f93c1d9a89f5a483f04e84a25bd0c7b9f8a66ee1b78a7debce3af013689dd0fa48fa17edf77c5eac6d2e4c2344a603c2563b0f81075d3812a5153f4164ef664
   languageName: node
   linkType: hard
 
-"@locker/near-membrane-dom@npm:0.13.3":
-  version: 0.13.3
-  resolution: "@locker/near-membrane-dom@npm:0.13.3"
+"@npmcli/fs@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "@npmcli/fs@npm:3.1.0"
   dependencies:
-    "@locker/near-membrane-base": 0.13.3
-    "@locker/near-membrane-shared": 0.13.3
-    "@locker/near-membrane-shared-dom": 0.13.3
-  checksum: 3f226a6d4eb60d46fbacee6c837110321e958758b23c0669a85e938f5b4282ba5c46356938948eb40b7339431165904149ebd935a40f6e4e71cc173ce023bea3
+    semver: "npm:^7.3.5"
+  checksum: 10/f3a7ab3a31de65e42aeb6ed03ed035ef123d2de7af4deb9d4a003d27acc8618b57d9fb9d259fe6c28ca538032a028f37337264388ba27d26d37fff7dde22476e
   languageName: node
   linkType: hard
 
-"@locker/near-membrane-shared-dom@npm:0.13.3":
-  version: 0.13.3
-  resolution: "@locker/near-membrane-shared-dom@npm:0.13.3"
+"@npmcli/git@npm:^5.0.0":
+  version: 5.0.4
+  resolution: "@npmcli/git@npm:5.0.4"
   dependencies:
-    "@locker/near-membrane-shared": 0.13.3
-  checksum: d6428c57702ecbee660b4c57f7d1de6f3068a44218795547697f506f07aab56dca919f289163e0c61c397ca605a446b3b78e47a2fa39b86da57d7fcecd9fe42d
-  languageName: node
-  linkType: hard
-
-"@locker/near-membrane-shared@npm:0.13.3":
-  version: 0.13.3
-  resolution: "@locker/near-membrane-shared@npm:0.13.3"
-  checksum: ccab2a50a01abb84be0428eb77c817d86a292d954e58eb56d9df0e69793bbfb1557611e21a4d3220af9d959f2129f8e170527ba9d994cd0208a3164b3a29c69c
+    "@npmcli/promise-spawn": "npm:^7.0.0"
+    lru-cache: "npm:^10.0.1"
+    npm-pick-manifest: "npm:^9.0.0"
+    proc-log: "npm:^3.0.0"
+    promise-inflight: "npm:^1.0.1"
+    promise-retry: "npm:^2.0.1"
+    semver: "npm:^7.3.5"
+    which: "npm:^4.0.0"
+  checksum: 10/136e71f4de73ef315285ebaf172b4681d1d22aff4c87ec526af1e57ab88ad7c864272523382009a2e3fab00f932bea204ed90cbdf187c7b7bd3d5c6e3d6c6d1a
   languageName: node
   linkType: hard
 
-"@mapbox/jsonlint-lines-primitives@npm:~2.0.2":
+"@npmcli/installed-package-contents@npm:^2.0.1":
   version: 2.0.2
-  resolution: "@mapbox/jsonlint-lines-primitives@npm:2.0.2"
-  checksum: 4eb31edd3ccff530f7b687ddc6d813d6e24fc66e9a563460882e7861b49f9331c5ded6fd7e927b37affbbd98f83bff1f7b916119044f1931df03c6ffedba2cfb
-  languageName: node
-  linkType: hard
-
-"@mapbox/mapbox-gl-style-spec@npm:^13.23.1":
-  version: 13.25.0
-  resolution: "@mapbox/mapbox-gl-style-spec@npm:13.25.0"
+  resolution: "@npmcli/installed-package-contents@npm:2.0.2"
   dependencies:
-    "@mapbox/jsonlint-lines-primitives": ~2.0.2
-    "@mapbox/point-geometry": ^0.1.0
-    "@mapbox/unitbezier": ^0.0.0
-    csscolorparser: ~1.0.2
-    json-stringify-pretty-compact: ^2.0.0
-    minimist: ^1.2.5
-    rw: ^1.3.3
-    sort-object: ^0.3.2
+    npm-bundled: "npm:^3.0.0"
+    npm-normalize-package-bin: "npm:^3.0.0"
   bin:
-    gl-style-composite: bin/gl-style-composite.js
-    gl-style-format: bin/gl-style-format.js
-    gl-style-migrate: bin/gl-style-migrate.js
-    gl-style-validate: bin/gl-style-validate.js
-  checksum: a1639069bba39e82755c67ff7218075154459614f0d6f13b7ef478bbcbea4b81e47f23ce5e2ec76ca1f083f3f1e9acd93e8110d1a7bbc3cd443f1a250c971c92
-  languageName: node
-  linkType: hard
-
-"@mapbox/point-geometry@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "@mapbox/point-geometry@npm:0.1.0"
-  checksum: ed41c1ce0140de81039424415d9a199abba72cdb2287314e1b8c3e295da3224f7e8c1b0ae99a9b097703e7abe63e1978a518e29896989cc8bba3d482360bc22f
-  languageName: node
-  linkType: hard
-
-"@mapbox/unitbezier@npm:^0.0.0":
-  version: 0.0.0
-  resolution: "@mapbox/unitbezier@npm:0.0.0"
-  checksum: 22ae6d56f743570fb222a5b0d323398e342007f689ae6445b6238d60a2faaa312b41c1de1fb2553bca4ccdb2d3f7006af04d94457c54b44a6454ce0198eebf9e
-  languageName: node
-  linkType: hard
-
-"@mdx-js/react@npm:1.6.22":
-  version: 1.6.22
-  resolution: "@mdx-js/react@npm:1.6.22"
-  peerDependencies:
-    react: ^16.13.1 || ^17.0.0
-  checksum: bc84bd514bc127f898819a0c6f1a6915d9541011bd8aefa1fcc1c9bea8939f31051409e546bdec92babfa5b56092a16d05ef6d318304ac029299df5181dc94c8
-  languageName: node
-  linkType: hard
-
-"@mdx-js/react@npm:^2.1.5":
-  version: 2.3.0
-  resolution: "@mdx-js/react@npm:2.3.0"
-  dependencies:
-    "@types/mdx": ^2.0.0
-    "@types/react": ">=16"
-  peerDependencies:
-    react: ">=16"
-  checksum: f45fe779556e6cd9a787f711274480e0638b63c460f192ebdcd77cc07ffa61e23c98cb46dd46e577093e1cb4997a232a848d1fb0ba850ae204422cf603add524
-  languageName: node
-  linkType: hard
-
-"@mochajs/json-file-reporter@npm:^1.2.0":
-  version: 1.3.0
-  resolution: "@mochajs/json-file-reporter@npm:1.3.0"
-  peerDependencies:
-    mocha: 6.x || 7.x || 8.x
-  checksum: b916b4ba048b2935026e61c09a84043f2f345c8f245a8505eb3e645fe300969fa9262fed6fc1391b25f1ea4e2120e5bfae35b33b49038d0306a44b86ef9675a3
-  languageName: node
-  linkType: hard
-
-"@monaco-editor/loader@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "@monaco-editor/loader@npm:1.4.0"
-  dependencies:
-    state-local: ^1.0.6
-  peerDependencies:
-    monaco-editor: ">= 0.21.0 < 1"
-  checksum: 374ec0ea872ee15b33310e105a43217148161480d3955c5cece87d0f801754cd2c45a3f6c539a75da18a066c1615756fb87eaf1003f1df6a64a0cbce5d2c3749
-  languageName: node
-  linkType: hard
-
-"@monaco-editor/react@npm:4.6.0":
-  version: 4.6.0
-  resolution: "@monaco-editor/react@npm:4.6.0"
-  dependencies:
-    "@monaco-editor/loader": ^1.4.0
-  peerDependencies:
-    monaco-editor: ">= 0.25.0 < 1"
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 9d44e76c5baad6db5f84c90a5540fbd3c9af691b97d76cf2a99b3c8273004d0efe44c2572d80e9d975c9af10022c21e4a66923924950a5201e82017c8b20428c
-  languageName: node
-  linkType: hard
-
-"@mswjs/cookies@npm:^0.2.2":
-  version: 0.2.2
-  resolution: "@mswjs/cookies@npm:0.2.2"
-  dependencies:
-    "@types/set-cookie-parser": ^2.4.0
-    set-cookie-parser: ^2.4.6
-  checksum: 23b1ef56d57efcc1b44600076f531a1fb703855af342a31e01bad4adaf0dab51f6d3b5595a95a7988c3f612ba075835f9a06c52833205284d101eb9a51dd72b0
+    installed-package-contents: lib/index.js
+  checksum: 10/4598a97e3d6e4c8602157d9ac47723071f09662852add0f275af62d1038d8e44d0c5ff9afa05358ba3ca7e100c860d679964be0a163add6ea028dc72d31f0af1
   languageName: node
   linkType: hard
 
-"@mswjs/interceptors@npm:^0.17.10":
-  version: 0.17.10
-  resolution: "@mswjs/interceptors@npm:0.17.10"
-  dependencies:
-    "@open-draft/until": ^1.0.3
-    "@types/debug": ^4.1.7
-    "@xmldom/xmldom": ^0.8.3
-    debug: ^4.3.3
-    headers-polyfill: 3.2.5
-    outvariant: ^1.2.1
-    strict-event-emitter: ^0.2.4
-    web-encoding: ^1.1.5
-  checksum: 0e6d32f399144b5cefe6fd7620f2776c83adc9bbbbccf2eb4ea347332be059f585136c44168c09b544c41cd3d686f88e43432e10192227a24fbb0c98a2f52dc8
-  languageName: node
-  linkType: hard
-
-"@ndelangen/get-tarball@npm:^3.0.7":
-  version: 3.0.7
-  resolution: "@ndelangen/get-tarball@npm:3.0.7"
-  dependencies:
-    gunzip-maybe: ^1.4.2
-    pump: ^3.0.0
-    tar-fs: ^2.1.1
-  checksum: f0a44392b8a452cb76f0bf80b1392c968bbf1a8535ea502c99ff3615a454140c41c65003771d017d1de73aa7ca969e14c9fbec8b36027dae74d3b0b85888b482
-  languageName: node
-  linkType: hard
-
-"@nodelib/fs.scandir@npm:2.1.5":
-  version: 2.1.5
-  resolution: "@nodelib/fs.scandir@npm:2.1.5"
+"@npmcli/move-file@npm:^1.0.1":
+  version: 1.1.2
+  resolution: "@npmcli/move-file@npm:1.1.2"
   dependencies:
-    "@nodelib/fs.stat": 2.0.5
-    run-parallel: ^1.1.9
-  checksum: a970d595bd23c66c880e0ef1817791432dbb7acbb8d44b7e7d0e7a22f4521260d4a83f7f9fd61d44fda4610105577f8f58a60718105fb38352baed612fd79e59
+    mkdirp: "npm:^1.0.4"
+    rimraf: "npm:^3.0.2"
+  checksum: 10/c96381d4a37448ea280951e46233f7e541058cf57a57d4094dd4bdcaae43fa5872b5f2eb6bfb004591a68e29c5877abe3cdc210cb3588cbf20ab2877f31a7de7
   languageName: node
   linkType: hard
 
-"@nodelib/fs.stat@npm:2.0.5, @nodelib/fs.stat@npm:^2.0.2":
-  version: 2.0.5
-  resolution: "@nodelib/fs.stat@npm:2.0.5"
-  checksum: 012480b5ca9d97bff9261571dbbec7bbc6033f69cc92908bc1ecfad0792361a5a1994bc48674b9ef76419d056a03efadfce5a6cf6dbc0a36559571a7a483f6f0
+"@npmcli/node-gyp@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@npmcli/node-gyp@npm:3.0.0"
+  checksum: 10/dd9fed3e80df8fbb20443f28651a8ed7235f2c15286ecc010e2d3cd392c85912e59ef29218c0b02f098defb4cbc8cdf045aab1d32d5cef6ace289913196ed5df
   languageName: node
   linkType: hard
 
-"@nodelib/fs.walk@npm:^1.2.3, @nodelib/fs.walk@npm:^1.2.6, @nodelib/fs.walk@npm:^1.2.8":
-  version: 1.2.8
-  resolution: "@nodelib/fs.walk@npm:1.2.8"
+"@npmcli/package-json@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "@npmcli/package-json@npm:5.0.0"
   dependencies:
-    "@nodelib/fs.scandir": 2.1.5
-    fastq: ^1.6.0
-  checksum: 190c643f156d8f8f277bf2a6078af1ffde1fd43f498f187c2db24d35b4b4b5785c02c7dc52e356497b9a1b65b13edc996de08de0b961c32844364da02986dc53
+    "@npmcli/git": "npm:^5.0.0"
+    glob: "npm:^10.2.2"
+    hosted-git-info: "npm:^7.0.0"
+    json-parse-even-better-errors: "npm:^3.0.0"
+    normalize-package-data: "npm:^6.0.0"
+    proc-log: "npm:^3.0.0"
+    semver: "npm:^7.5.3"
+  checksum: 10/bb907e934e96dae3d3aa26aa45cbaa87b318cb64c4aaaacfa3596b1ca5147ad1b51c3281eb529df12116a163d33ca99f48c4593b0c168e38412dfbf2c5cced72
   languageName: node
   linkType: hard
 
-"@npmcli/arborist@npm:5.3.0":
-  version: 5.3.0
-  resolution: "@npmcli/arborist@npm:5.3.0"
-  dependencies:
-    "@isaacs/string-locale-compare": ^1.1.0
-    "@npmcli/installed-package-contents": ^1.0.7
-    "@npmcli/map-workspaces": ^2.0.3
-    "@npmcli/metavuln-calculator": ^3.0.1
-    "@npmcli/move-file": ^2.0.0
-    "@npmcli/name-from-folder": ^1.0.1
-    "@npmcli/node-gyp": ^2.0.0
-    "@npmcli/package-json": ^2.0.0
-    "@npmcli/run-script": ^4.1.3
-    bin-links: ^3.0.0
-    cacache: ^16.0.6
-    common-ancestor-path: ^1.0.1
-    json-parse-even-better-errors: ^2.3.1
-    json-stringify-nice: ^1.1.4
-    mkdirp: ^1.0.4
-    mkdirp-infer-owner: ^2.0.0
-    nopt: ^5.0.0
-    npm-install-checks: ^5.0.0
-    npm-package-arg: ^9.0.0
-    npm-pick-manifest: ^7.0.0
-    npm-registry-fetch: ^13.0.0
-    npmlog: ^6.0.2
-    pacote: ^13.6.1
-    parse-conflict-json: ^2.0.1
-    proc-log: ^2.0.0
-    promise-all-reject-late: ^1.0.0
-    promise-call-limit: ^1.0.1
-    read-package-json-fast: ^2.0.2
-    readdir-scoped-modules: ^1.1.0
-    rimraf: ^3.0.2
-    semver: ^7.3.7
-    ssri: ^9.0.0
-    treeverse: ^2.0.0
-    walk-up-path: ^1.0.0
-  bin:
-    arborist: bin/index.js
-  checksum: 7f99f451ba625dd3532e7a69b27cc399cab1e7ef2a069bbc04cf22ef9d16a0076f8f5fb92c4cd146c256cd8a41963b2e417684f063a108e96939c440bad0e95e
+"@npmcli/promise-spawn@npm:^7.0.0":
+  version: 7.0.1
+  resolution: "@npmcli/promise-spawn@npm:7.0.1"
+  dependencies:
+    which: "npm:^4.0.0"
+  checksum: 10/7cbfc3c5e0bcad28e362dc34418b7507afea4fa82d692b802d9b8999ebdc99ceb2686f5959b5b9890e424983cee801401d3e972638f6942f75a2976a2c61774c
   languageName: node
   linkType: hard
 
-"@npmcli/fs@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@npmcli/fs@npm:1.0.0"
+"@npmcli/run-script@npm:7.0.2":
+  version: 7.0.2
+  resolution: "@npmcli/run-script@npm:7.0.2"
   dependencies:
-    "@gar/promisify": ^1.0.1
-    semver: ^7.3.5
-  checksum: f2b4990107dd2a5b18794c89aaff6f62f3a67883d49a20602fdfc353cbc7f8c5fd50edeffdc769e454900e01b8b8e43d0b9eb524d00963d69f3c829be1a2e8ac
+    "@npmcli/node-gyp": "npm:^3.0.0"
+    "@npmcli/promise-spawn": "npm:^7.0.0"
+    node-gyp: "npm:^10.0.0"
+    read-package-json-fast: "npm:^3.0.0"
+    which: "npm:^4.0.0"
+  checksum: 10/4549311f3b937ca81d147b72fbfd41aa6ed7daf70ecc4e9ee3838f9cce1749e9c62c301943a8a67364a96c31bbc67c49ee31526fb12ec2f4b15148f0ef472f98
   languageName: node
   linkType: hard
 
-"@npmcli/fs@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "@npmcli/fs@npm:2.1.0"
+"@npmcli/run-script@npm:^7.0.0":
+  version: 7.0.4
+  resolution: "@npmcli/run-script@npm:7.0.4"
   dependencies:
-    "@gar/promisify": ^1.1.3
-    semver: ^7.3.5
-  checksum: 6ec6d678af6da49f9dac50cd882d7f661934dd278972ffbaacde40d9eaa2871292d634000a0cca9510f6fc29855fbd4af433e1adbff90a524ec3eaf140f1219b
+    "@npmcli/node-gyp": "npm:^3.0.0"
+    "@npmcli/package-json": "npm:^5.0.0"
+    "@npmcli/promise-spawn": "npm:^7.0.0"
+    node-gyp: "npm:^10.0.0"
+    which: "npm:^4.0.0"
+  checksum: 10/f09268051f74af7d7be46e9911a23126d531160c338d3c05d53e6cd7994b88271fb4ec524139fe7f2d826525f15a281eafef3be02831adc1f68556a8a668621a
   languageName: node
   linkType: hard
 
-"@npmcli/git@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "@npmcli/git@npm:3.0.1"
+"@nrwl/devkit@npm:18.0.4":
+  version: 18.0.4
+  resolution: "@nrwl/devkit@npm:18.0.4"
   dependencies:
-    "@npmcli/promise-spawn": ^3.0.0
-    lru-cache: ^7.4.4
-    mkdirp: ^1.0.4
-    npm-pick-manifest: ^7.0.0
-    proc-log: ^2.0.0
-    promise-inflight: ^1.0.1
-    promise-retry: ^2.0.1
-    semver: ^7.3.5
-    which: ^2.0.2
-  checksum: 0e289d11e2d6034652993f2d05f68396d8377603a1c1f983b2d0893e7591a22bcf3896a43c7dfbcc43f03c308a110f0b9ec37e0191e48b0bd1d236e0f57a3ec6
+    "@nx/devkit": "npm:18.0.4"
+  checksum: 10/0ae56acdae6be74de5609fbb873b00e65605bca772ab22d13721b8465dff1926b3473522c836b904552214f79672bdfa19a5e9ce5e8ca30a1f6cf3ee8b15b29d
   languageName: node
   linkType: hard
 
-"@npmcli/installed-package-contents@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "@npmcli/installed-package-contents@npm:1.0.7"
+"@nrwl/tao@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nrwl/tao@npm:18.1.3"
   dependencies:
-    npm-bundled: ^1.1.1
-    npm-normalize-package-bin: ^1.0.1
+    nx: "npm:18.1.3"
+    tslib: "npm:^2.3.0"
   bin:
-    installed-package-contents: index.js
-  checksum: a4a29b99d439827ce2e7817c1f61b56be160e640696e31dc513a2c8a37c792f75cdb6258ec15a1e22904f20df0a8a3019dd3766de5e6619f259834cf64233538
+    tao: index.js
+  checksum: 10/338bf2cf323dc1accf252ce6650f182b8550948cf647005178679ed36ef8e5ec49ef11f20f249b83e1be671fac9f1b6c186662a4412a0c086068209de0afdd58
   languageName: node
   linkType: hard
 
-"@npmcli/map-workspaces@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "@npmcli/map-workspaces@npm:2.0.3"
+"@nx/devkit@npm:18.0.4, @nx/devkit@npm:>=17.1.2 < 19":
+  version: 18.0.4
+  resolution: "@nx/devkit@npm:18.0.4"
   dependencies:
-    "@npmcli/name-from-folder": ^1.0.1
-    glob: ^8.0.1
-    minimatch: ^5.0.1
-    read-package-json-fast: ^2.0.3
-  checksum: c9878a22168d3f2d8df9e339ed0799628db3ea8502bd623b5bbe7b0dfcac065b3310e4093df94667a4a28ef2c54c02ce6956467a8aaa2e150305f2fe1cd64f9d
+    "@nrwl/devkit": "npm:18.0.4"
+    ejs: "npm:^3.1.7"
+    enquirer: "npm:~2.3.6"
+    ignore: "npm:^5.0.4"
+    semver: "npm:^7.5.3"
+    tmp: "npm:~0.2.1"
+    tslib: "npm:^2.3.0"
+    yargs-parser: "npm:21.1.1"
+  peerDependencies:
+    nx: ">= 16 <= 18"
+  checksum: 10/a3368c2d58e92aa96b0432930b302aa02c6e4b3a73a5f61f58e513f1a8f10606b1973c588277f48a2d37e3a4ede5d27aa837c4a9b4de25ae4c475cafe6c6305d
   languageName: node
   linkType: hard
 
-"@npmcli/metavuln-calculator@npm:^3.0.1":
-  version: 3.1.1
-  resolution: "@npmcli/metavuln-calculator@npm:3.1.1"
-  dependencies:
-    cacache: ^16.0.0
-    json-parse-even-better-errors: ^2.3.1
-    pacote: ^13.0.3
-    semver: ^7.3.5
-  checksum: dc9846fdb82a1f4274ff8943f81452c75615bd9bca523c862956ea2c32e18c5a4be5572e169104d3a0eb262b7ede72c8dbbc202a4ab3b3f4946fa55f226dcc64
+"@nx/nx-darwin-arm64@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/nx-darwin-arm64@npm:18.1.3"
+  conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@npmcli/move-file@npm:^1.0.1":
-  version: 1.1.2
-  resolution: "@npmcli/move-file@npm:1.1.2"
-  dependencies:
-    mkdirp: ^1.0.4
-    rimraf: ^3.0.2
-  checksum: c96381d4a37448ea280951e46233f7e541058cf57a57d4094dd4bdcaae43fa5872b5f2eb6bfb004591a68e29c5877abe3cdc210cb3588cbf20ab2877f31a7de7
+"@nx/nx-darwin-x64@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/nx-darwin-x64@npm:18.1.3"
+  conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@npmcli/move-file@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@npmcli/move-file@npm:2.0.0"
-  dependencies:
-    mkdirp: ^1.0.4
-    rimraf: ^3.0.2
-  checksum: 1388777b507b0c592d53f41b9d182e1a8de7763bc625fc07999b8edbc22325f074e5b3ec90af79c89d6987fdb2325bc66d59f483258543c14a43661621f841b0
+"@nx/nx-freebsd-x64@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/nx-freebsd-x64@npm:18.1.3"
+  conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@npmcli/name-from-folder@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "@npmcli/name-from-folder@npm:1.0.1"
-  checksum: 67339f4096e32b712d2df0250cc95c087569f09e657d7f81a1760fa2cc5123e29c3c3e1524388832310ba2d96ec4679985b643b44627f6a51f4a00c3b0075de9
+"@nx/nx-linux-arm-gnueabihf@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/nx-linux-arm-gnueabihf@npm:18.1.3"
+  conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@npmcli/node-gyp@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@npmcli/node-gyp@npm:2.0.0"
-  checksum: b6bbf0015000f9b64d31aefdc30f244b0348c57adb64017667e0304e96c38644d83da46a4581252652f5d606268df49118f9c9993b41d8020f62b7b15dd2c8d8
+"@nx/nx-linux-arm64-gnu@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/nx-linux-arm64-gnu@npm:18.1.3"
+  conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@npmcli/package-json@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@npmcli/package-json@npm:2.0.0"
-  dependencies:
-    json-parse-even-better-errors: ^2.3.1
-  checksum: 7a598e42d2778654ec87438ebfafbcbafbe5a5f5e89ed2ca1db6ca3f94ef14655e304aa41f77632a2a3f5c66b6bd5960bd9370e0ceb4902ea09346720364f9e4
+"@nx/nx-linux-arm64-musl@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/nx-linux-arm64-musl@npm:18.1.3"
+  conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@npmcli/promise-spawn@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@npmcli/promise-spawn@npm:3.0.0"
-  dependencies:
-    infer-owner: ^1.0.4
-  checksum: 3454465a2731cea5875ba51f80873e2205e5bd878c31517286b0ede4ea931c7bf3de895382287e906d03710fff6f9e44186bd0eee068ce578901c5d3b58e7692
+"@nx/nx-linux-x64-gnu@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/nx-linux-x64-gnu@npm:18.1.3"
+  conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@npmcli/run-script@npm:^4.1.0, @npmcli/run-script@npm:^4.1.3, @npmcli/run-script@npm:^4.1.7":
-  version: 4.2.1
-  resolution: "@npmcli/run-script@npm:4.2.1"
-  dependencies:
-    "@npmcli/node-gyp": ^2.0.0
-    "@npmcli/promise-spawn": ^3.0.0
-    node-gyp: ^9.0.0
-    read-package-json-fast: ^2.0.3
-    which: ^2.0.2
-  checksum: 7b8d6676353f157e68b26baf848e01e5d887bcf90ce81a52f23fc9a5d93e6ffb60057532d664cfd7aeeb76d464d0c8b0d314ee6cccb56943acb3b6c570b756c8
+"@nx/nx-linux-x64-musl@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/nx-linux-x64-musl@npm:18.1.3"
+  conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@nrwl/cli@npm:14.8.2":
-  version: 14.8.2
-  resolution: "@nrwl/cli@npm:14.8.2"
-  dependencies:
-    nx: 14.8.2
-  checksum: 18d698397cd0536109b1a6dbe50e9ec13063dde2793b49ab25d3db3f55ec74931ad20ae32375c5d2a1554d9c91f5b1152e42d6738aaca3ebecca4735bd4916c8
+"@nx/nx-win32-arm64-msvc@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/nx-win32-arm64-msvc@npm:18.1.3"
+  conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@nrwl/tao@npm:14.8.2":
-  version: 14.8.2
-  resolution: "@nrwl/tao@npm:14.8.2"
-  dependencies:
-    nx: 14.8.2
-  bin:
-    tao: index.js
-  checksum: 78067a5c61b88c7cc43b0313dd1a96cc40149b84f349f2c634dd8ee5514b9d71deca28267a03fa081c8c5877d406e3774046c4927f0111c9f5c5571fd617e254
+"@nx/nx-win32-x64-msvc@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/nx-win32-x64-msvc@npm:18.1.3"
+  conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
@@ -5264,23 +5958,23 @@ __metadata:
   version: 3.0.0
   resolution: "@octokit/auth-token@npm:3.0.0"
   dependencies:
-    "@octokit/types": ^6.0.3
-  checksum: 70dc50385ae25e26ea23782a6730ac680a241a4c6bd401a88c1b4820d6f14a333c6a0e6c10a3a998d1909f95725e8df4477fb6c9e32ff13e056f6324cfebc3bb
+    "@octokit/types": "npm:^6.0.3"
+  checksum: 10/cd6d3b0039f32c5744b9befce22b48cdd5a1042673473c65ea3c0ec48ebc3b558a9e9260fee5228f3541f25749280c4838f88c3c555d81bbc0dc13e5c7a767ec
   languageName: node
   linkType: hard
 
-"@octokit/core@npm:^4.0.0":
-  version: 4.0.4
-  resolution: "@octokit/core@npm:4.0.4"
+"@octokit/core@npm:^4.2.1":
+  version: 4.2.4
+  resolution: "@octokit/core@npm:4.2.4"
   dependencies:
-    "@octokit/auth-token": ^3.0.0
-    "@octokit/graphql": ^5.0.0
-    "@octokit/request": ^6.0.0
-    "@octokit/request-error": ^3.0.0
-    "@octokit/types": ^6.0.3
-    before-after-hook: ^2.2.0
-    universal-user-agent: ^6.0.0
-  checksum: c9ae1e5706ab568a725cc5dba314049fbd37d77f1595dd2c19733abddfd72f4e1d46d6980e212d845dde4625ce5f170af951ac0eb0d7bc09e56a159b88cbe5dd
+    "@octokit/auth-token": "npm:^3.0.0"
+    "@octokit/graphql": "npm:^5.0.0"
+    "@octokit/request": "npm:^6.0.0"
+    "@octokit/request-error": "npm:^3.0.0"
+    "@octokit/types": "npm:^9.0.0"
+    before-after-hook: "npm:^2.2.0"
+    universal-user-agent: "npm:^6.0.0"
+  checksum: 10/53ba8f990ce2c0ea4583d8c142377770c3ac8fb9221b563d82dbca9d642f19be49607b9e9b472767075e4afa16c2203339680d75f3ebf5ad853af2646e8604ca
   languageName: node
   linkType: hard
 
@@ -5288,10 +5982,10 @@ __metadata:
   version: 7.0.0
   resolution: "@octokit/endpoint@npm:7.0.0"
   dependencies:
-    "@octokit/types": ^6.0.3
-    is-plain-object: ^5.0.0
-    universal-user-agent: ^6.0.0
-  checksum: e6d7a2876c4a09852e671074b34f0a70722866e60bc218e475d2bdce7dea17de275dcd01f34c381bcc21d77def915c25a2f46e21f65a8d12aa4c6e418e5e01e2
+    "@octokit/types": "npm:^6.0.3"
+    is-plain-object: "npm:^5.0.0"
+    universal-user-agent: "npm:^6.0.0"
+  checksum: 10/ec433d3ac72c5958ec08eb9a26602936a1a7aeb3419a7f07c3318a3109b2f0e9a8bdf5962ce2dd9167dbce729adaad4889266fa3ba2e908e3840b552242b23df
   languageName: node
   linkType: hard
 
@@ -5299,35 +5993,43 @@ __metadata:
   version: 5.0.0
   resolution: "@octokit/graphql@npm:5.0.0"
   dependencies:
-    "@octokit/request": ^6.0.0
-    "@octokit/types": ^6.0.3
-    universal-user-agent: ^6.0.0
-  checksum: 94c3f4fb6ff6dd6151a8ba6d8a2397329eedd5c30d1119b70d2be84add12efb4405ae0af9111f06dd047fc02d12063263357e53b4d04d3ab1ae2c07717ddfef5
+    "@octokit/request": "npm:^6.0.0"
+    "@octokit/types": "npm:^6.0.3"
+    universal-user-agent: "npm:^6.0.0"
+  checksum: 10/d492d0ac55c1120e8875a03ee9c07e01aaa441bbc3463e06a964584b5b02fd1f25775a767a2cd535fd2891388fd54b9ca7c28e2851e2313eaaf18e6d864f1943
   languageName: node
   linkType: hard
 
 "@octokit/openapi-types@npm:^12.10.0":
   version: 12.10.1
   resolution: "@octokit/openapi-types@npm:12.10.1"
-  checksum: 2f0e1e90eac1e73a146d9a42e0f13f4ae290a8a465bd39a377dc723af3d5b2dff51c3c6fecd085adbdd8e63f10c94934d32e79a8559981486c78866e477cd84c
+  checksum: 10/07c37742adbbc0107ce427f58423d96006a3a10b0b51afa0b57144bbe0470f423c5c05993db59ecbdcb198e9c5fe08a70c818d797ee08392cdd5c3921c8bca64
+  languageName: node
+  linkType: hard
+
+"@octokit/openapi-types@npm:^18.0.0":
+  version: 18.1.1
+  resolution: "@octokit/openapi-types@npm:18.1.1"
+  checksum: 10/bd2920a238f74c6ccc1e2ee916bd3e17adeeef3bbb1726f821b8722dceaeff5ea2786b3170cc25dd51775cb9179d3cdf448a3526e70b8a1fc21cdd8aa52e5d4c
   languageName: node
   linkType: hard
 
-"@octokit/plugin-enterprise-rest@npm:^6.0.1":
+"@octokit/plugin-enterprise-rest@npm:6.0.1":
   version: 6.0.1
   resolution: "@octokit/plugin-enterprise-rest@npm:6.0.1"
-  checksum: 1c9720002f31daf62f4f48e73557dcdd7fcde6e0f6d43256e3f2ec827b5548417297186c361fb1af497fdcc93075a7b681e6ff06e2f20e4a8a3e74cc09d1f7e3
+  checksum: 10/2ea8aca141a0329479cfaf9425f7bc226fe6aa0064fd6e7798b565aa962a5a757a89a03e78b956909e767aa86cd28e1346bf82908dfdf614af921d175a6a95e1
   languageName: node
   linkType: hard
 
-"@octokit/plugin-paginate-rest@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@octokit/plugin-paginate-rest@npm:3.0.0"
+"@octokit/plugin-paginate-rest@npm:^6.1.2":
+  version: 6.1.2
+  resolution: "@octokit/plugin-paginate-rest@npm:6.1.2"
   dependencies:
-    "@octokit/types": ^6.39.0
+    "@octokit/tsconfig": "npm:^1.0.2"
+    "@octokit/types": "npm:^9.2.3"
   peerDependencies:
     "@octokit/core": ">=4"
-  checksum: 1d2c900254f3dcd43f7ba69dfd12ff63f93a0d39a1bf542b1d0f006e95da4924ae0a26044c864ad7fb0309047f44becaf76293aae334d14c946910d65edd2523
+  checksum: 10/6d5b97fb44a3ed8ff25196b56ebe7bdac64f4023c165792f77938c77876934c01b46e79b83712e26cd3f2f9e36e0735bd3c292a37e8060a2b259f3a6456116dc
   languageName: node
   linkType: hard
 
@@ -5336,19 +6038,18 @@ __metadata:
   resolution: "@octokit/plugin-request-log@npm:1.0.4"
   peerDependencies:
     "@octokit/core": ">=3"
-  checksum: 2086db00056aee0f8ebd79797b5b57149ae1014e757ea08985b71eec8c3d85dbb54533f4fd34b6b9ecaa760904ae6a7536be27d71e50a3782ab47809094bfc0c
+  checksum: 10/2086db00056aee0f8ebd79797b5b57149ae1014e757ea08985b71eec8c3d85dbb54533f4fd34b6b9ecaa760904ae6a7536be27d71e50a3782ab47809094bfc0c
   languageName: node
   linkType: hard
 
-"@octokit/plugin-rest-endpoint-methods@npm:^6.0.0":
-  version: 6.1.2
-  resolution: "@octokit/plugin-rest-endpoint-methods@npm:6.1.2"
+"@octokit/plugin-rest-endpoint-methods@npm:^7.1.2":
+  version: 7.2.3
+  resolution: "@octokit/plugin-rest-endpoint-methods@npm:7.2.3"
   dependencies:
-    "@octokit/types": ^6.40.0
-    deprecation: ^2.3.1
+    "@octokit/types": "npm:^10.0.0"
   peerDependencies:
     "@octokit/core": ">=3"
-  checksum: 88ba028da00f73cf8a0471e9ffe0da2ba61c15b91fbaf252e33863bd4115db7dcd3bd426f22a01c7492affe89e37117fc3f0d15569cd5cf5a4b978f1bc22738b
+  checksum: 10/59fb4e786ab85a5f3ad701e1b193dd3113833cfd1f2657cb06864e45b80a53a1f9ba6c3c66a855c4bf2593c539299fdfe51db639e3a87dc16ffa7602fe9bb999
   languageName: node
   linkType: hard
 
@@ -5356,10 +6057,10 @@ __metadata:
   version: 3.0.0
   resolution: "@octokit/request-error@npm:3.0.0"
   dependencies:
-    "@octokit/types": ^6.0.3
-    deprecation: ^2.0.0
-    once: ^1.4.0
-  checksum: 5778904ed5421e955107eb7fd2ed1655f3eb1bf3f6433278a5382efa2dd02082c35c2454cdc8818c88c9feef71f08489abdefee376dd51eac9caf72b133ec176
+    "@octokit/types": "npm:^6.0.3"
+    deprecation: "npm:^2.0.0"
+    once: "npm:^1.4.0"
+  checksum: 10/5778904ed5421e955107eb7fd2ed1655f3eb1bf3f6433278a5382efa2dd02082c35c2454cdc8818c88c9feef71f08489abdefee376dd51eac9caf72b133ec176
   languageName: node
   linkType: hard
 
@@ -5367,50 +6068,92 @@ __metadata:
   version: 6.2.0
   resolution: "@octokit/request@npm:6.2.0"
   dependencies:
-    "@octokit/endpoint": ^7.0.0
-    "@octokit/request-error": ^3.0.0
-    "@octokit/types": ^6.16.1
-    is-plain-object: ^5.0.0
-    node-fetch: ^2.6.7
-    universal-user-agent: ^6.0.0
-  checksum: d66a2248e4cc15b7b8d558f0d947b0ec6e6deca121922b81a99df916e69fb98ecf2269ec03beb933f3df4006b60a8e2a843a67304d08f90aed8b8edcea7f71b2
+    "@octokit/endpoint": "npm:^7.0.0"
+    "@octokit/request-error": "npm:^3.0.0"
+    "@octokit/types": "npm:^6.16.1"
+    is-plain-object: "npm:^5.0.0"
+    node-fetch: "npm:^2.6.7"
+    universal-user-agent: "npm:^6.0.0"
+  checksum: 10/8e8221cd9b50e8c9dca2372ef14042aa4f5509128196656feeb3507de7512dc8eb4e73f6836c7ed138e470959c015d25ca8f65e664e1d6651e1264cb8eff5e04
   languageName: node
   linkType: hard
 
-"@octokit/rest@npm:^19.0.3":
-  version: 19.0.3
-  resolution: "@octokit/rest@npm:19.0.3"
+"@octokit/rest@npm:19.0.11":
+  version: 19.0.11
+  resolution: "@octokit/rest@npm:19.0.11"
   dependencies:
-    "@octokit/core": ^4.0.0
-    "@octokit/plugin-paginate-rest": ^3.0.0
-    "@octokit/plugin-request-log": ^1.0.4
-    "@octokit/plugin-rest-endpoint-methods": ^6.0.0
-  checksum: 9ee96976c4c22dab11b3dacd541e694f3ad9bb1d44243985dc90ce6e8a42c3e3176a206e8d3a883b63b517fc15af8c8c88d8d0ecd9bac2b86a635a9667fc6ff4
+    "@octokit/core": "npm:^4.2.1"
+    "@octokit/plugin-paginate-rest": "npm:^6.1.2"
+    "@octokit/plugin-request-log": "npm:^1.0.4"
+    "@octokit/plugin-rest-endpoint-methods": "npm:^7.1.2"
+  checksum: 10/c9b15de6b544506c85c0297e48aa51a2aeb8f73415eef7331fc5c951c7eaa75f6fcf9d549ca5bb52a5f631553c94a70ac550ef9a3202ee765c49c04a85523d8b
   languageName: node
   linkType: hard
 
-"@octokit/types@npm:^6.0.3, @octokit/types@npm:^6.16.1, @octokit/types@npm:^6.39.0, @octokit/types@npm:^6.40.0":
+"@octokit/tsconfig@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "@octokit/tsconfig@npm:1.0.2"
+  checksum: 10/74d56f3e9f326a8dd63700e9a51a7c75487180629c7a68bbafee97c612fbf57af8347369bfa6610b9268a3e8b833c19c1e4beb03f26db9a9dce31f6f7a19b5b1
+  languageName: node
+  linkType: hard
+
+"@octokit/types@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "@octokit/types@npm:10.0.0"
+  dependencies:
+    "@octokit/openapi-types": "npm:^18.0.0"
+  checksum: 10/6345e605d30c99639a0207cfc7bea5bf29d9007e93cdcd78be3f8218830a462a0f0fbb976f5c2d9ebe70ee2aa33d1b72243cdb955478581ee2cead059ac4f030
+  languageName: node
+  linkType: hard
+
+"@octokit/types@npm:^6.0.3, @octokit/types@npm:^6.16.1":
   version: 6.40.0
   resolution: "@octokit/types@npm:6.40.0"
   dependencies:
-    "@octokit/openapi-types": ^12.10.0
-  checksum: e8854fefd24003423bb03c3530449d1b390d340dc21f078a34adfa89a356138e9ab8f02493c6aa1e1bd101f630658dce24877e0615c130911fac8adc721eac42
+    "@octokit/openapi-types": "npm:^12.10.0"
+  checksum: 10/0e741e583b2a74cd6882066f684cb542cac33fd37c205b04cee7dda9efe2aa94c90ebf2f2f7ea57c04692159ec780a0d06e183b010bfb2eca581fb85a37ee335
   languageName: node
   linkType: hard
 
-"@open-draft/until@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "@open-draft/until@npm:1.0.3"
-  checksum: 323e92ebef0150ed0f8caedc7d219b68cdc50784fa4eba0377eef93533d3f46514eb2400ced83dda8c51bddc3d2c7b8e9cf95e5ec85ab7f62dfc015d174f62f2
+"@octokit/types@npm:^9.0.0, @octokit/types@npm:^9.2.3":
+  version: 9.3.2
+  resolution: "@octokit/types@npm:9.3.2"
+  dependencies:
+    "@octokit/openapi-types": "npm:^18.0.0"
+  checksum: 10/4bcd18850d5397e5835f5686be88ad95e5d7c23e7d53f898b82a8ca5fc1f6a7b53816ef6f9f3b7a06799c0b030d259bf2bd50a258a1656df2dc7f3e533e334f8
+  languageName: node
+  linkType: hard
+
+"@open-draft/deferred-promise@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "@open-draft/deferred-promise@npm:2.2.0"
+  checksum: 10/bc3bb1668a555bb87b33383cafcf207d9561e17d2ca0d9e61b7ce88e82b66e36a333d3676c1d39eb5848022c03c8145331fcdc828ba297f88cb1de9c5cef6c19
+  languageName: node
+  linkType: hard
+
+"@open-draft/logger@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "@open-draft/logger@npm:0.3.0"
+  dependencies:
+    is-node-process: "npm:^1.2.0"
+    outvariant: "npm:^1.4.0"
+  checksum: 10/7a280f170bcd4e91d3eedbefe628efd10c3bd06dd2461d06a7fdbced89ef457a38785847f88cc630fb4fd7dfa176d6f77aed17e5a9b08000baff647433b5ff78
+  languageName: node
+  linkType: hard
+
+"@open-draft/until@npm:^2.0.0, @open-draft/until@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "@open-draft/until@npm:2.1.0"
+  checksum: 10/622be42950afc8e89715d0fd6d56cbdcd13e36625e23b174bd3d9f06f80e25f9adf75d6698af93bca1e1bf465b9ce00ec05214a12189b671fb9da0f58215b6f4
   languageName: node
   linkType: hard
 
-"@opentelemetry/api-logs@npm:0.41.2":
-  version: 0.41.2
-  resolution: "@opentelemetry/api-logs@npm:0.41.2"
+"@opentelemetry/api-logs@npm:0.48.0":
+  version: 0.48.0
+  resolution: "@opentelemetry/api-logs@npm:0.48.0"
   dependencies:
-    "@opentelemetry/api": ^1.0.0
-  checksum: 9a33466baa5269df2c9153cf8385b06b957c1abdbae0c1fe3e16183d25fd89f93df58e98efb72994518ae07abb8215b803f67f62bdfb7a5050762cca1a3a3f07
+    "@opentelemetry/api": "npm:^1.0.0"
+  checksum: 10/6af4746236f96d523c2826861656deb474ac20c0790cc5421c1ed02b88670dfbffcc237bdfa988803f2316046c6c25795826d06c0f269c271f029699d3aaee62
   languageName: node
   linkType: hard
 
@@ -5419,23 +6162,21 @@ __metadata:
   resolution: "@opentelemetry/api-metrics@npm:0.25.0"
   peerDependencies:
     "@opentelemetry/api": ^1.0.2
-  checksum: fbc440990fa5fd5f9dfe51b6e2b1ffb79b0f5440beb7a6e2db36fdfb02c8d1e66965408f28e037570c0cc1d365131b27192698fe85a73f8d9a2f186d3b62aa14
+  checksum: 10/95677dd39dee97f0cfb56065ba31cd2690d2d6d980171f5257d116529224ce42a8b5333ed638bafb8682fd42cac797bd27c8b4c98056eb7185edc96be3554777
   languageName: node
   linkType: hard
 
-"@opentelemetry/api-metrics@npm:^0.33.0":
-  version: 0.33.0
-  resolution: "@opentelemetry/api-metrics@npm:0.33.0"
-  dependencies:
-    "@opentelemetry/api": ^1.0.0
-  checksum: 8c4fc342e96bc3bea8d5f152faab7dec479c75b9a9b0796a4a8f17525734dcabab2366c0ea0f3d1f3e575d5e26315086b0ddf6ceda5625f5bd6322f425a2c074
+"@opentelemetry/api@npm:1.7.0":
+  version: 1.7.0
+  resolution: "@opentelemetry/api@npm:1.7.0"
+  checksum: 10/bcf7afa7051dcd4583898a68f8a57fb4c85b5cedddf7b6eb3616595c0b3bcd7f5448143b8355b00935a755de004d6285489f8e132f34127efe7b1be404622a3e
   languageName: node
   linkType: hard
 
-"@opentelemetry/api@npm:1.6.0, @opentelemetry/api@npm:^1.0.0, @opentelemetry/api@npm:^1.4.1":
-  version: 1.6.0
-  resolution: "@opentelemetry/api@npm:1.6.0"
-  checksum: 3283b78b62a39f6568eaa050ac7045fcca747679e255874f6d2107cb8e1a3b2e10bfbf553c3e82a72500fb5fdca49dc07a5fe27fd6980debac24506cca638859
+"@opentelemetry/api@npm:^1.0.0, @opentelemetry/api@npm:^1.7.0":
+  version: 1.8.0
+  resolution: "@opentelemetry/api@npm:1.8.0"
+  checksum: 10/62f0c42711b9f0c56ea9527c2e6e609e371bfb47d0b78956c91fe27365b4744d7dcc407636ef5b19a24a1d5e2c3cfa79c1b715deca829074e24e3ffba1315ba2
   languageName: node
   linkType: hard
 
@@ -5443,22 +6184,22 @@ __metadata:
   version: 0.25.0
   resolution: "@opentelemetry/core@npm:0.25.0"
   dependencies:
-    "@opentelemetry/semantic-conventions": 0.25.0
-    semver: ^7.3.5
+    "@opentelemetry/semantic-conventions": "npm:0.25.0"
+    semver: "npm:^7.3.5"
   peerDependencies:
     "@opentelemetry/api": ^1.0.2
-  checksum: 305c724cb2dbb4dfa57359fcc553a9fc60ed8a48ca9ee0fdd9c85fb7172d3e636a82e22e25bbcd08bf87059bd05c2f13c8b843bdda332fb64a1d16828bf155fa
+  checksum: 10/43a685aa57b7c05ec0c4b1b6d6212f89e0097b1844c855eeb5659b46f1a25cb2b950af2aa1b3b353a8f13c91b5415c3e7bc54c6600816ba5d6de2e95d0d49227
   languageName: node
   linkType: hard
 
-"@opentelemetry/core@npm:1.15.2":
-  version: 1.15.2
-  resolution: "@opentelemetry/core@npm:1.15.2"
+"@opentelemetry/core@npm:1.21.0":
+  version: 1.21.0
+  resolution: "@opentelemetry/core@npm:1.21.0"
   dependencies:
-    "@opentelemetry/semantic-conventions": 1.15.2
+    "@opentelemetry/semantic-conventions": "npm:1.21.0"
   peerDependencies:
-    "@opentelemetry/api": ">=1.0.0 <1.5.0"
-  checksum: 0040d1952b13d1cf5c7f428f9b061806023e2d08acd716e9aa72caa0c4bca99059ac4ddfbecebc4f3b993c576b834d4bcf0914586d0020719a1b1c428461a16a
+    "@opentelemetry/api": ">=1.0.0 <1.8.0"
+  checksum: 10/7d34098c0cc83b3fde3fdd7bfb5ac652bfc793ce51f3af340ba2489e220097b90d9002b0f52da89cb2bda1dcf5fec17bc69109584a7e66118f677dc6d7ecae30
   languageName: node
   linkType: hard
 
@@ -5466,30 +6207,30 @@ __metadata:
   version: 0.25.0
   resolution: "@opentelemetry/exporter-collector@npm:0.25.0"
   dependencies:
-    "@opentelemetry/api-metrics": 0.25.0
-    "@opentelemetry/core": 0.25.0
-    "@opentelemetry/resources": 0.25.0
-    "@opentelemetry/sdk-metrics-base": 0.25.0
-    "@opentelemetry/sdk-trace-base": 0.25.0
+    "@opentelemetry/api-metrics": "npm:0.25.0"
+    "@opentelemetry/core": "npm:0.25.0"
+    "@opentelemetry/resources": "npm:0.25.0"
+    "@opentelemetry/sdk-metrics-base": "npm:0.25.0"
+    "@opentelemetry/sdk-trace-base": "npm:0.25.0"
   peerDependencies:
     "@opentelemetry/api": ^1.0.2
-  checksum: 71db7d99e81421ce707580650c06b74631ff0d593591305f825cd1c1df85f2f49a0af6f66821cf3280fc66ae3903b5c7195dbd22dbd824d46aa135fe2261f7f1
+  checksum: 10/16bf6022be9142488e8f430b610f7080cf6ca920636dbcc527f0d817225d5f16f95cae53b4676bcbc028af8f89fb8bf87626a0d4654cb71111b7adedaf2fa334
   languageName: node
   linkType: hard
 
-"@opentelemetry/otlp-transformer@npm:^0.41.2":
-  version: 0.41.2
-  resolution: "@opentelemetry/otlp-transformer@npm:0.41.2"
+"@opentelemetry/otlp-transformer@npm:^0.48.0":
+  version: 0.48.0
+  resolution: "@opentelemetry/otlp-transformer@npm:0.48.0"
   dependencies:
-    "@opentelemetry/api-logs": 0.41.2
-    "@opentelemetry/core": 1.15.2
-    "@opentelemetry/resources": 1.15.2
-    "@opentelemetry/sdk-logs": 0.41.2
-    "@opentelemetry/sdk-metrics": 1.15.2
-    "@opentelemetry/sdk-trace-base": 1.15.2
+    "@opentelemetry/api-logs": "npm:0.48.0"
+    "@opentelemetry/core": "npm:1.21.0"
+    "@opentelemetry/resources": "npm:1.21.0"
+    "@opentelemetry/sdk-logs": "npm:0.48.0"
+    "@opentelemetry/sdk-metrics": "npm:1.21.0"
+    "@opentelemetry/sdk-trace-base": "npm:1.21.0"
   peerDependencies:
-    "@opentelemetry/api": ">=1.3.0 <1.5.0"
-  checksum: dc3332377012296597243b45faca0e83ad4b60b30b6b256d81056a211bf70c3a4ec27be15bf07a9e9f21338e862016792029c1320ce41ffe73db7a413dd38be5
+    "@opentelemetry/api": ">=1.3.0 <1.8.0"
+  checksum: 10/6034da4c330e21bce2226b2544a95c6cbb8aa38f81ba251d936fe9b9639520a4208fa2da75056bea47868b43901bd79d767d57806be0823add3b7406afacad55
   languageName: node
   linkType: hard
 
@@ -5497,36 +6238,36 @@ __metadata:
   version: 0.25.0
   resolution: "@opentelemetry/resources@npm:0.25.0"
   dependencies:
-    "@opentelemetry/core": 0.25.0
-    "@opentelemetry/semantic-conventions": 0.25.0
+    "@opentelemetry/core": "npm:0.25.0"
+    "@opentelemetry/semantic-conventions": "npm:0.25.0"
   peerDependencies:
     "@opentelemetry/api": ^1.0.2
-  checksum: c90186e3051e5993108d49052479a693f80959ba95c4d8343f2459c34c71574c03cd84832f6f77a7fd05debd89ccea63eda054dc178bc9eafd399f217abae338
+  checksum: 10/00101e968f3e59fcad1df945be80acd93ea783eeb8ac5bea78a03f9741b8bf42f21849ffee092ee91814caf1c2931cce68b9fae1e8e35d8022fcce4a6dd49926
   languageName: node
   linkType: hard
 
-"@opentelemetry/resources@npm:1.15.2":
-  version: 1.15.2
-  resolution: "@opentelemetry/resources@npm:1.15.2"
+"@opentelemetry/resources@npm:1.21.0":
+  version: 1.21.0
+  resolution: "@opentelemetry/resources@npm:1.21.0"
   dependencies:
-    "@opentelemetry/core": 1.15.2
-    "@opentelemetry/semantic-conventions": 1.15.2
+    "@opentelemetry/core": "npm:1.21.0"
+    "@opentelemetry/semantic-conventions": "npm:1.21.0"
   peerDependencies:
-    "@opentelemetry/api": ">=1.0.0 <1.5.0"
-  checksum: 072d64bee2a073ac3f1218ba9d24bd0a20fc69988d206688c2f53e813c9d84ae325093c3c0e8909c2208cfa583fe5bad71d16af7d6b087a348d866c1d0857396
+    "@opentelemetry/api": ">=1.0.0 <1.8.0"
+  checksum: 10/5001362fa5b91947decf9fe3d188232fc2e532c766a063f80cd4d784841b010d83a0db7a38e07f4f5d4acb5cb17bd24e6e1b3250b94cc82698d92f4bc3d7cc3b
   languageName: node
   linkType: hard
 
-"@opentelemetry/sdk-logs@npm:0.41.2":
-  version: 0.41.2
-  resolution: "@opentelemetry/sdk-logs@npm:0.41.2"
+"@opentelemetry/sdk-logs@npm:0.48.0":
+  version: 0.48.0
+  resolution: "@opentelemetry/sdk-logs@npm:0.48.0"
   dependencies:
-    "@opentelemetry/core": 1.15.2
-    "@opentelemetry/resources": 1.15.2
+    "@opentelemetry/core": "npm:1.21.0"
+    "@opentelemetry/resources": "npm:1.21.0"
   peerDependencies:
-    "@opentelemetry/api": ">=1.4.0 <1.5.0"
+    "@opentelemetry/api": ">=1.4.0 <1.8.0"
     "@opentelemetry/api-logs": ">=0.39.1"
-  checksum: 055dd8dbb78442dc9742bce12491c5ccb48ffa8b9a5ed3046294a21bf40802cc4ddc753a6324b1f571a1af8d2936c93027c1d4e90bb7c8536390be12fc9cbc8a
+  checksum: 10/34d3279ff1b7e2c0a2c2d7ec1898899fd1bc48ea5e1fb54d0f68cb237e6bfbf2b60516b7522a7336879a6da1a0c8776c07ecc983e49e84fed7202fdc196bd50b
   languageName: node
   linkType: hard
 
@@ -5534,26 +6275,26 @@ __metadata:
   version: 0.25.0
   resolution: "@opentelemetry/sdk-metrics-base@npm:0.25.0"
   dependencies:
-    "@opentelemetry/api-metrics": 0.25.0
-    "@opentelemetry/core": 0.25.0
-    "@opentelemetry/resources": 0.25.0
-    lodash.merge: ^4.6.2
+    "@opentelemetry/api-metrics": "npm:0.25.0"
+    "@opentelemetry/core": "npm:0.25.0"
+    "@opentelemetry/resources": "npm:0.25.0"
+    lodash.merge: "npm:^4.6.2"
   peerDependencies:
     "@opentelemetry/api": ^1.0.2
-  checksum: 49992e4bd91cad23bc94bc9a486d9ee72ca2ddc509051245f398249defc44316ec2d3fc5e34921d81eaef8bc6477d87e492217a7eda7307b2aeabaf58ad5bd4e
+  checksum: 10/d32be1f660823117638eb795e49dbe45d04c8e8b43809b53d1df946ade854fe9f01a50573215b4c89ade362df60b63e4a5e7863913651d01c2bb6f49f4ba3d00
   languageName: node
   linkType: hard
 
-"@opentelemetry/sdk-metrics@npm:1.15.2":
-  version: 1.15.2
-  resolution: "@opentelemetry/sdk-metrics@npm:1.15.2"
+"@opentelemetry/sdk-metrics@npm:1.21.0":
+  version: 1.21.0
+  resolution: "@opentelemetry/sdk-metrics@npm:1.21.0"
   dependencies:
-    "@opentelemetry/core": 1.15.2
-    "@opentelemetry/resources": 1.15.2
-    lodash.merge: ^4.6.2
+    "@opentelemetry/core": "npm:1.21.0"
+    "@opentelemetry/resources": "npm:1.21.0"
+    lodash.merge: "npm:^4.6.2"
   peerDependencies:
-    "@opentelemetry/api": ">=1.3.0 <1.5.0"
-  checksum: 15eb40b977618ea24a7ce5bea264ab4c8a428d91c2ef0d824c9c98bea9fe3e136c92d03e5538ce86438e123f59977516112a657c4fc572e71ac544d483348b17
+    "@opentelemetry/api": ">=1.3.0 <1.8.0"
+  checksum: 10/9e40aef9ab8c5810016c5532f0137d2ae5fb4bf6fccaa53ac2b06aea8ec9e60e5c79634ed87c25f806a0c00c7a3f9f9861981038e86021a48a75edeb9db758ba
   languageName: node
   linkType: hard
 
@@ -5561,65 +6302,47 @@ __metadata:
   version: 0.25.0
   resolution: "@opentelemetry/sdk-trace-base@npm:0.25.0"
   dependencies:
-    "@opentelemetry/core": 0.25.0
-    "@opentelemetry/resources": 0.25.0
-    "@opentelemetry/semantic-conventions": 0.25.0
-    lodash.merge: ^4.6.2
+    "@opentelemetry/core": "npm:0.25.0"
+    "@opentelemetry/resources": "npm:0.25.0"
+    "@opentelemetry/semantic-conventions": "npm:0.25.0"
+    lodash.merge: "npm:^4.6.2"
   peerDependencies:
     "@opentelemetry/api": ^1.0.2
-  checksum: b8ae1ddad1eb29852ef75d75c7bb4bf90e19ecb7428d504fb9bba67a7222dc08f45169e162ea62d43abee1ccd07f8ddf3b543f8fc9b38d1d34fc54659f864023
+  checksum: 10/e2a465e97f5c0675b2ae07cf918e666f25f938a6e9c0776c0a13dbdf1fe0c573dd3b2be78f38b05fa3e51f9258201780d5574fe35eb35589e247cfaadbd0ae52
   languageName: node
   linkType: hard
 
-"@opentelemetry/sdk-trace-base@npm:1.15.2":
-  version: 1.15.2
-  resolution: "@opentelemetry/sdk-trace-base@npm:1.15.2"
+"@opentelemetry/sdk-trace-base@npm:1.21.0":
+  version: 1.21.0
+  resolution: "@opentelemetry/sdk-trace-base@npm:1.21.0"
   dependencies:
-    "@opentelemetry/core": 1.15.2
-    "@opentelemetry/resources": 1.15.2
-    "@opentelemetry/semantic-conventions": 1.15.2
+    "@opentelemetry/core": "npm:1.21.0"
+    "@opentelemetry/resources": "npm:1.21.0"
+    "@opentelemetry/semantic-conventions": "npm:1.21.0"
   peerDependencies:
-    "@opentelemetry/api": ">=1.0.0 <1.5.0"
-  checksum: 3ca9d71919451f8e4a0644434981c7fa6dc29d002da03784578fbe47689625d106c00ab5b35539a8d348e40676ea57d44ba6845a9a604dd6be670911f83835bf
+    "@opentelemetry/api": ">=1.0.0 <1.8.0"
+  checksum: 10/fd812f8e1ef758f2d88809352d30ccedac430a2d19350ba9e2b46b55c03e8f1ac7187888528beac77c436c5dc7a682a3fd76d72efa4d1bf16f431ff214aaab8f
   languageName: node
   linkType: hard
 
 "@opentelemetry/semantic-conventions@npm:0.25.0":
   version: 0.25.0
   resolution: "@opentelemetry/semantic-conventions@npm:0.25.0"
-  checksum: 0771e3298ed67f87d466e3eeac17fb3363cd7759b0b306b42d296464ef40c5f00e351535bc5eab0b678f3c60cb256309d6c4779b586beaf5edf99300d1e0ab45
-  languageName: node
-  linkType: hard
-
-"@opentelemetry/semantic-conventions@npm:1.15.2":
-  version: 1.15.2
-  resolution: "@opentelemetry/semantic-conventions@npm:1.15.2"
-  checksum: 6de4f8ffa277af18351dff19b821f04438bd4f3917f84816f0bf1577a810424d11ba5f15dca9739a17812a996eeb251048fc7d61b0eef9dc39beb9d4304f57e2
+  checksum: 10/525e334c3daf4a0da87a662f4d09aca2741dbaf11cc07d6c4933fdf452c7bc87788399de4e9a4d79733f128d4ecb619c50ffee683a8579686581ac078cbe0b7d
   languageName: node
   linkType: hard
 
-"@opentelemetry/semantic-conventions@npm:1.17.1":
-  version: 1.17.1
-  resolution: "@opentelemetry/semantic-conventions@npm:1.17.1"
-  checksum: 16161f70526d2abcd37a39771229ffe01a25d569f76c86e97200dc20399e7fa87b231c557a9654629b4789e945350e4fc55f88df979a502911f1dde4643ad416
-  languageName: node
-  linkType: hard
-
-"@parcel/watcher@npm:2.0.4":
-  version: 2.0.4
-  resolution: "@parcel/watcher@npm:2.0.4"
-  dependencies:
-    node-addon-api: ^3.2.1
-    node-gyp: latest
-    node-gyp-build: ^4.3.0
-  checksum: 890bdc69a52942791b276caa2cd65ef816576d6b5ada91aa28cf302b35d567c801dafe167f2525dcb313f5b420986ea11bd56228dd7ddde1116944d8f924a0a1
+"@opentelemetry/semantic-conventions@npm:1.21.0":
+  version: 1.21.0
+  resolution: "@opentelemetry/semantic-conventions@npm:1.21.0"
+  checksum: 10/49503a01ea5bb0b067c08c33e5dc8f5ecc5ad269825f1b183a477ddaa496df05f47439ff381e9d5850257c2797afb47f7456fb605b07c4cbec517384c0b0d9b2
   languageName: node
   linkType: hard
 
 "@petamoriken/float16@npm:^3.4.7":
   version: 3.5.0
   resolution: "@petamoriken/float16@npm:3.5.0"
-  checksum: 59ee9af1de990e92d9eb4a56ec5ca7f2ef2cc84b210778cd945d92be117c262ed58f738d20d60a9ac6e6e25101b0fdb5b0d2b5609ef998742eb900b7c0a32635
+  checksum: 10/a39d1040553b98019633c7a9e530931be9182ec1c6271a0d690ed6ab409a340255dcf578fece21f7fd1a7c036bb425544e42f59a0a109e84f641c73cd6e99b6d
   languageName: node
   linkType: hard
 
@@ -5627,11 +6350,11 @@ __metadata:
   version: 0.2.5
   resolution: "@phenomnomnominal/debug@npm:0.2.5"
   dependencies:
-    callsite: ^1.0.0
-    esprima: ^4.0.1
-    esquery: ^1.3.1
-    tslib: ^2.0.3
-  checksum: af8edc142f7004d604b12964fd72ae27469ae223f6166175fd1177d7909ed67a582b41b2b3e0d83662127d32b37ae1c3a514d7dd810c5f1ced0a964f9c261cae
+    callsite: "npm:^1.0.0"
+    esprima: "npm:^4.0.1"
+    esquery: "npm:^1.3.1"
+    tslib: "npm:^2.0.3"
+  checksum: 10/eedc309988bc679f573c89bb75f7065d59a0b01b0bd4abb8b4c0e077541e4319c66c9550f7f0fea4bcd613bf08cb27f11f7a69ffc08e5938761b433b0f784d51
   languageName: node
   linkType: hard
 
@@ -5639,17 +6362,17 @@ __metadata:
   version: 4.2.0
   resolution: "@phenomnomnominal/tsquery@npm:4.2.0"
   dependencies:
-    esquery: ^1.0.1
+    esquery: "npm:^1.0.1"
   peerDependencies:
     typescript: ^3 || ^4
-  checksum: c55cdd8c5041a71c873a5f90cc7d14ce869558599dcd7b8f7a8d8517f2a06a6ca59c5a687709fa8ba4aaf396d33fda1870dd1d3e76f831e736f8ff31b8877654
+  checksum: 10/5ad8bdf28fd09614023f629aadc1a166f59fca8e7274cafa6afd795eabe9af8bb756c8dd7e49aff20c8467989600f9888840de648d1902887cda81ce48d4ce3c
   languageName: node
   linkType: hard
 
 "@phenomnomnominal/tstemplate@npm:^0.1.0":
   version: 0.1.0
   resolution: "@phenomnomnominal/tstemplate@npm:0.1.0"
-  checksum: ee8bac21d8a8b745bca971f6266209d1c9607d9c4f3c4a2d6ad64dcd223323ebe2bd09603481fee528334626048251213d2c31ffef4992c85b4f1cdc771da57e
+  checksum: 10/19bc55fc2b61d57194a792f2edd5ef10d2965e4f7fea127f39426adf1128d5a99e4dcbb3d9503a4f3291dc2bf25ba4fe6f5b59121ec52726dbb2308c8fca95e1
   languageName: node
   linkType: hard
 
@@ -5657,38 +6380,49 @@ __metadata:
   version: 0.0.34
   resolution: "@phenomnomnominal/worker-require@npm:0.0.34"
   dependencies:
-    callsite: ^1.0.0
-    comlink: ^4.3.0
-    tslib: ^1.10.0
-  checksum: b2c42f978ecd8a2f193d7b05479994007be05ed28048d999f2610bc86cfae0e88201483542d8ee7ed5871f961cca5e9f888f03e71e4928fdc5baa568e4f99974
+    callsite: "npm:^1.0.0"
+    comlink: "npm:^4.3.0"
+    tslib: "npm:^1.10.0"
+  checksum: 10/86453c1c7d1f866cf7c021795011353698cd64865e91cf334d0df793a8984f7e2563a275c22c840ea07b0de64f538573bf56e98118f7cb7ac4ec15d0be1d0c06
   languageName: node
   linkType: hard
 
 "@pkgjs/parseargs@npm:^0.11.0":
   version: 0.11.0
   resolution: "@pkgjs/parseargs@npm:0.11.0"
-  checksum: 6ad6a00fc4f2f2cfc6bff76fb1d88b8ee20bc0601e18ebb01b6d4be583733a860239a521a7fbca73b612e66705078809483549d2b18f370eb346c5155c8e4a0f
+  checksum: 10/115e8ceeec6bc69dff2048b35c0ab4f8bbee12d8bb6c1f4af758604586d802b6e669dcb02dda61d078de42c2b4ddce41b3d9e726d7daa6b4b850f4adbf7333ff
   languageName: node
   linkType: hard
 
-"@pmmmwh/react-refresh-webpack-plugin@npm:0.5.10, @pmmmwh/react-refresh-webpack-plugin@npm:^0.5.5":
-  version: 0.5.10
-  resolution: "@pmmmwh/react-refresh-webpack-plugin@npm:0.5.10"
-  dependencies:
-    ansi-html-community: ^0.0.8
-    common-path-prefix: ^3.0.0
-    core-js-pure: ^3.23.3
-    error-stack-parser: ^2.0.6
-    find-up: ^5.0.0
-    html-entities: ^2.1.0
-    loader-utils: ^2.0.4
-    schema-utils: ^3.0.0
-    source-map: ^0.7.3
+"@playwright/test@npm:1.42.1":
+  version: 1.42.1
+  resolution: "@playwright/test@npm:1.42.1"
+  dependencies:
+    playwright: "npm:1.42.1"
+  bin:
+    playwright: cli.js
+  checksum: 10/5bd7f1c77963cacc6f44cf4c1ef46f9ad41e79a3e6f34eb81398afaa09b1b08a4cbe0f7064f03c71c094414d1c4507d6183b61c63aa4b6a93846d386f7c651a2
+  languageName: node
+  linkType: hard
+
+"@pmmmwh/react-refresh-webpack-plugin@npm:0.5.11, @pmmmwh/react-refresh-webpack-plugin@npm:^0.5.5":
+  version: 0.5.11
+  resolution: "@pmmmwh/react-refresh-webpack-plugin@npm:0.5.11"
+  dependencies:
+    ansi-html-community: "npm:^0.0.8"
+    common-path-prefix: "npm:^3.0.0"
+    core-js-pure: "npm:^3.23.3"
+    error-stack-parser: "npm:^2.0.6"
+    find-up: "npm:^5.0.0"
+    html-entities: "npm:^2.1.0"
+    loader-utils: "npm:^2.0.4"
+    schema-utils: "npm:^3.0.0"
+    source-map: "npm:^0.7.3"
   peerDependencies:
     "@types/webpack": 4.x || 5.x
     react-refresh: ">=0.10.0 <1.0.0"
     sockjs-client: ^1.4.0
-    type-fest: ">=0.17.0 <4.0.0"
+    type-fest: ">=0.17.0 <5.0.0"
     webpack: ">=4.43.0 <6.0.0"
     webpack-dev-server: 3.x || 4.x
     webpack-hot-middleware: 2.x
@@ -5706,21 +6440,21 @@ __metadata:
       optional: true
     webpack-plugin-serve:
       optional: true
-  checksum: c45beded9c56fbbdc7213a2c36131ace5db360ed704d462cc39d6678f980173a91c9a3f691e6bd3a026f25486644cd0027e8a12a0a4eced8e8b886a0472e7d34
+  checksum: 10/ee7eff63ef930c8ec37b341d12f180598a5173938a5b8d1d7c53306eab10b3f3f23adcba4824e5a93ddcd0cf185a90baa0b6f483f27a320dd86ad61941940eb6
   languageName: node
   linkType: hard
 
-"@polka/url@npm:^1.0.0-next.20":
-  version: 1.0.0-next.21
-  resolution: "@polka/url@npm:1.0.0-next.21"
-  checksum: c7654046d38984257dd639eab3dc770d1b0340916097b2fac03ce5d23506ada684e05574a69b255c32ea6a144a957c8cd84264159b545fca031c772289d88788
+"@polka/url@npm:^1.0.0-next.24":
+  version: 1.0.0-next.24
+  resolution: "@polka/url@npm:1.0.0-next.24"
+  checksum: 10/00baec4458ac86ca27edf7ce807ccfad97cd1d4b67bdedaf3401a9e755757588f3331e891290d1deea52d88df2bf2387caf8d94a6835b614d5b37b638a688273
   languageName: node
   linkType: hard
 
 "@popperjs/core@npm:2.11.8, @popperjs/core@npm:^2.11.5":
   version: 2.11.8
   resolution: "@popperjs/core@npm:2.11.8"
-  checksum: e5c69fdebf52a4012f6a1f14817ca8e9599cb1be73dd1387e1785e2ed5e5f0862ff817f420a87c7fc532add1f88a12e25aeb010ffcbdc98eace3d55ce2139cf0
+  checksum: 10/ddd16090cde777aaf102940f05d0274602079a95ad9805bd20bc55dcc7c3a2ba1b99dd5c73e5cc2753c3d31250ca52a67d58059459d7d27debb983a9f552936c
   languageName: node
   linkType: hard
 
@@ -5730,35 +6464,35 @@ __metadata:
   peerDependencies:
     "@lezer/highlight": ^1.0.0
     "@lezer/lr": ^1.0.0
-  checksum: 17722456a67dbbbc92c923656f43c65d99e0e8f7d4a7086fb63438286cc51b02bc1713506ec1b1f3a7337aa4dd9840261d8abdcb6518c90d8b8ebaf2608bb672
+  checksum: 10/00a3ef7a292ae17c7059da73e1ebd4568135eb5189be0eb60f039915f1c20a0bf355fe02cec1c11955e9e3885b5ecfdd8a67d57ce25fa09ad74575ba0fbc7386
   languageName: node
   linkType: hard
 
 "@protobufjs/aspromise@npm:^1.1.1, @protobufjs/aspromise@npm:^1.1.2":
   version: 1.1.2
   resolution: "@protobufjs/aspromise@npm:1.1.2"
-  checksum: 011fe7ef0826b0fd1a95935a033a3c0fd08483903e1aa8f8b4e0704e3233406abb9ee25350ec0c20bbecb2aad8da0dcea58b392bbd77d6690736f02c143865d2
+  checksum: 10/8a938d84fe4889411296db66b29287bd61ea3c14c2d23e7a8325f46a2b8ce899857c5f038d65d7641805e6c1d06b495525c7faf00c44f85a7ee6476649034969
   languageName: node
   linkType: hard
 
 "@protobufjs/base64@npm:^1.1.2":
   version: 1.1.2
   resolution: "@protobufjs/base64@npm:1.1.2"
-  checksum: 67173ac34de1e242c55da52c2f5bdc65505d82453893f9b51dc74af9fe4c065cf4a657a4538e91b0d4a1a1e0a0642215e31894c31650ff6e3831471061e1ee9e
+  checksum: 10/c71b100daeb3c9bdccab5cbc29495b906ba0ae22ceedc200e1ba49717d9c4ab15a6256839cebb6f9c6acae4ed7c25c67e0a95e734f612b258261d1a3098fe342
   languageName: node
   linkType: hard
 
 "@protobufjs/codegen@npm:^2.0.4":
   version: 2.0.4
   resolution: "@protobufjs/codegen@npm:2.0.4"
-  checksum: 59240c850b1d3d0b56d8f8098dd04787dcaec5c5bd8de186fa548de86b86076e1c50e80144b90335e705a044edf5bc8b0998548474c2a10a98c7e004a1547e4b
+  checksum: 10/c6ee5fa172a8464f5253174d3c2353ea520c2573ad7b6476983d9b1346f4d8f2b44aa29feb17a949b83c1816bc35286a5ea265ed9d8fdd2865acfa09668c0447
   languageName: node
   linkType: hard
 
 "@protobufjs/eventemitter@npm:^1.1.0":
   version: 1.1.0
   resolution: "@protobufjs/eventemitter@npm:1.1.0"
-  checksum: 0369163a3d226851682f855f81413cbf166cd98f131edb94a0f67f79e75342d86e89df9d7a1df08ac28be2bc77e0a7f0200526bb6c2a407abbfee1f0262d5fd7
+  checksum: 10/03af3e99f17ad421283d054c88a06a30a615922a817741b43ca1b13e7c6b37820a37f6eba9980fb5150c54dba6e26cb6f7b64a6f7d8afa83596fafb3afa218c3
   languageName: node
   linkType: hard
 
@@ -5766,44 +6500,44 @@ __metadata:
   version: 1.1.0
   resolution: "@protobufjs/fetch@npm:1.1.0"
   dependencies:
-    "@protobufjs/aspromise": ^1.1.1
-    "@protobufjs/inquire": ^1.1.0
-  checksum: 3fce7e09eb3f1171dd55a192066450f65324fd5f7cc01a431df01bb00d0a895e6bfb5b0c5561ce157ee1d886349c90703d10a4e11a1a256418ff591b969b3477
+    "@protobufjs/aspromise": "npm:^1.1.1"
+    "@protobufjs/inquire": "npm:^1.1.0"
+  checksum: 10/67ae40572ad536e4ef94269199f252c024b66e3059850906bdaee161ca1d75c73d04d35cd56f147a8a5a079f5808e342b99e61942c1dae15604ff0600b09a958
   languageName: node
   linkType: hard
 
 "@protobufjs/float@npm:^1.0.2":
   version: 1.0.2
   resolution: "@protobufjs/float@npm:1.0.2"
-  checksum: 5781e1241270b8bd1591d324ca9e3a3128d2f768077a446187a049e36505e91bc4156ed5ac3159c3ce3d2ba3743dbc757b051b2d723eea9cd367bfd54ab29b2f
+  checksum: 10/634c2c989da0ef2f4f19373d64187e2a79f598c5fb7991afb689d29a2ea17c14b796b29725945fa34b9493c17fb799e08ac0a7ccaae460ee1757d3083ed35187
   languageName: node
   linkType: hard
 
 "@protobufjs/inquire@npm:^1.1.0":
   version: 1.1.0
   resolution: "@protobufjs/inquire@npm:1.1.0"
-  checksum: ca06f02eaf65ca36fb7498fc3492b7fc087bfcc85c702bac5b86fad34b692bdce4990e0ef444c1e2aea8c034227bd1f0484be02810d5d7e931c55445555646f4
+  checksum: 10/c09efa34a5465cb120775e1a482136f2340a58b4abce7e93d72b8b5a9324a0e879275016ef9fcd73d72a4731639c54f2bb755bb82f916e4a78892d1d840bb3d2
   languageName: node
   linkType: hard
 
 "@protobufjs/path@npm:^1.1.2":
   version: 1.1.2
   resolution: "@protobufjs/path@npm:1.1.2"
-  checksum: 856eeb532b16a7aac071cacde5c5620df800db4c80cee6dbc56380524736205aae21e5ae47739114bf669ab5e8ba0e767a282ad894f3b5e124197cb9224445ee
+  checksum: 10/bb709567935fd385a86ad1f575aea98131bbd719c743fb9b6edd6b47ede429ff71a801cecbd64fc72deebf4e08b8f1bd8062793178cdaed3713b8d15771f9b83
   languageName: node
   linkType: hard
 
 "@protobufjs/pool@npm:^1.1.0":
   version: 1.1.0
   resolution: "@protobufjs/pool@npm:1.1.0"
-  checksum: d6a34fbbd24f729e2a10ee915b74e1d77d52214de626b921b2d77288bd8f2386808da2315080f2905761527cceffe7ec34c7647bd21a5ae41a25e8212ff79451
+  checksum: 10/b9c7047647f6af28e92aac54f6f7c1f7ff31b201b4bfcc7a415b2861528854fce3ec666d7e7e10fd744da905f7d4aef2205bbcc8944ca0ca7a82e18134d00c46
   languageName: node
   linkType: hard
 
 "@protobufjs/utf8@npm:^1.1.0":
   version: 1.1.0
   resolution: "@protobufjs/utf8@npm:1.1.0"
-  checksum: f9bf3163d13aaa3b6f5e6fbf37a116e094ea021c0e1f2a7ccd0e12a29e2ce08dafba4e8b36e13f8ed7397e1591610ce880ed1289af4d66cf4ace8a36a9557278
+  checksum: 10/131e289c57534c1d73a0e55782d6751dd821db1583cb2f7f7e017c9d6747addaebe79f28120b2e0185395d990aad347fb14ffa73ef4096fa38508d61a0e64602
   languageName: node
   linkType: hard
 
@@ -5811,8 +6545,8 @@ __metadata:
   version: 1.0.1
   resolution: "@radix-ui/number@npm:1.0.1"
   dependencies:
-    "@babel/runtime": ^7.13.10
-  checksum: 621ea8b7d4195d1a65a9c0aee918e8335e7f198088eec91577512c89c2ba3a3bab4a767cfb872a2b9c3092a78ff41cad9a924845a939f6bb87fe9356241ea0ea
+    "@babel/runtime": "npm:^7.13.10"
+  checksum: 10/621ea8b7d4195d1a65a9c0aee918e8335e7f198088eec91577512c89c2ba3a3bab4a767cfb872a2b9c3092a78ff41cad9a924845a939f6bb87fe9356241ea0ea
   languageName: node
   linkType: hard
 
@@ -5820,8 +6554,8 @@ __metadata:
   version: 1.0.1
   resolution: "@radix-ui/primitive@npm:1.0.1"
   dependencies:
-    "@babel/runtime": ^7.13.10
-  checksum: 2b93e161d3fdabe9a64919def7fa3ceaecf2848341e9211520c401181c9eaebb8451c630b066fad2256e5c639c95edc41de0ba59c40eff37e799918d019822d1
+    "@babel/runtime": "npm:^7.13.10"
+  checksum: 10/2b93e161d3fdabe9a64919def7fa3ceaecf2848341e9211520c401181c9eaebb8451c630b066fad2256e5c639c95edc41de0ba59c40eff37e799918d019822d1
   languageName: node
   linkType: hard
 
@@ -5829,8 +6563,8 @@ __metadata:
   version: 1.0.3
   resolution: "@radix-ui/react-arrow@npm:1.0.3"
   dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/react-primitive": 1.0.3
+    "@babel/runtime": "npm:^7.13.10"
+    "@radix-ui/react-primitive": "npm:1.0.3"
   peerDependencies:
     "@types/react": "*"
     "@types/react-dom": "*"
@@ -5841,7 +6575,7 @@ __metadata:
       optional: true
     "@types/react-dom":
       optional: true
-  checksum: 8cca086f0dbb33360e3c0142adf72f99fc96352d7086d6c2356dbb2ea5944cfb720a87d526fc48087741c602cd8162ca02b0af5e6fdf5f56d20fddb44db8b4c3
+  checksum: 10/8cca086f0dbb33360e3c0142adf72f99fc96352d7086d6c2356dbb2ea5944cfb720a87d526fc48087741c602cd8162ca02b0af5e6fdf5f56d20fddb44db8b4c3
   languageName: node
   linkType: hard
 
@@ -5849,11 +6583,11 @@ __metadata:
   version: 1.0.3
   resolution: "@radix-ui/react-collection@npm:1.0.3"
   dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/react-compose-refs": 1.0.1
-    "@radix-ui/react-context": 1.0.1
-    "@radix-ui/react-primitive": 1.0.3
-    "@radix-ui/react-slot": 1.0.2
+    "@babel/runtime": "npm:^7.13.10"
+    "@radix-ui/react-compose-refs": "npm:1.0.1"
+    "@radix-ui/react-context": "npm:1.0.1"
+    "@radix-ui/react-primitive": "npm:1.0.3"
+    "@radix-ui/react-slot": "npm:1.0.2"
   peerDependencies:
     "@types/react": "*"
     "@types/react-dom": "*"
@@ -5864,7 +6598,7 @@ __metadata:
       optional: true
     "@types/react-dom":
       optional: true
-  checksum: acfbc9b0b2c553d343c22f02c9f098bc5cfa99e6e48df91c0d671855013f8b877ade9c657b7420a7aa523b5aceadea32a60dd72c23b1291f415684fb45d00cff
+  checksum: 10/2ac740ab746f411942dc95100f1eb60b9a3670960a805e266533fa1bc7dec31a6dabddd746ab788ebd5a9c22b468e38922f39d30447925515f8e44f0a3b2e56c
   languageName: node
   linkType: hard
 
@@ -5872,14 +6606,14 @@ __metadata:
   version: 1.0.1
   resolution: "@radix-ui/react-compose-refs@npm:1.0.1"
   dependencies:
-    "@babel/runtime": ^7.13.10
+    "@babel/runtime": "npm:^7.13.10"
   peerDependencies:
     "@types/react": "*"
     react: ^16.8 || ^17.0 || ^18.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 2b9a613b6db5bff8865588b6bf4065f73021b3d16c0a90b2d4c23deceeb63612f1f15de188227ebdc5f88222cab031be617a9dd025874c0487b303be3e5cc2a8
+  checksum: 10/2b9a613b6db5bff8865588b6bf4065f73021b3d16c0a90b2d4c23deceeb63612f1f15de188227ebdc5f88222cab031be617a9dd025874c0487b303be3e5cc2a8
   languageName: node
   linkType: hard
 
@@ -5887,14 +6621,14 @@ __metadata:
   version: 1.0.1
   resolution: "@radix-ui/react-context@npm:1.0.1"
   dependencies:
-    "@babel/runtime": ^7.13.10
+    "@babel/runtime": "npm:^7.13.10"
   peerDependencies:
     "@types/react": "*"
     react: ^16.8 || ^17.0 || ^18.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 60e9b81d364f40c91a6213ec953f7c64fcd9d75721205a494a5815b3e5ae0719193429b62ee6c7002cd6aaf70f8c0e2f08bdbaba9ffcc233044d32b56d2127d1
+  checksum: 10/a02187a3bae3a0f1be5fab5ad19c1ef06ceff1028d957e4d9994f0186f594a9c3d93ee34bacb86d1fa8eb274493362944398e1c17054d12cb3b75384f9ae564b
   languageName: node
   linkType: hard
 
@@ -5902,14 +6636,14 @@ __metadata:
   version: 1.0.1
   resolution: "@radix-ui/react-direction@npm:1.0.1"
   dependencies:
-    "@babel/runtime": ^7.13.10
+    "@babel/runtime": "npm:^7.13.10"
   peerDependencies:
     "@types/react": "*"
     react: ^16.8 || ^17.0 || ^18.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 5336a8b0d4f1cde585d5c2b4448af7b3d948bb63a1aadb37c77771b0e5902dc6266e409cf35fd0edaca7f33e26424be19e64fb8f9d7f7be2d6f1714ea2764210
+  checksum: 10/5336a8b0d4f1cde585d5c2b4448af7b3d948bb63a1aadb37c77771b0e5902dc6266e409cf35fd0edaca7f33e26424be19e64fb8f9d7f7be2d6f1714ea2764210
   languageName: node
   linkType: hard
 
@@ -5917,12 +6651,12 @@ __metadata:
   version: 1.0.4
   resolution: "@radix-ui/react-dismissable-layer@npm:1.0.4"
   dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/primitive": 1.0.1
-    "@radix-ui/react-compose-refs": 1.0.1
-    "@radix-ui/react-primitive": 1.0.3
-    "@radix-ui/react-use-callback-ref": 1.0.1
-    "@radix-ui/react-use-escape-keydown": 1.0.3
+    "@babel/runtime": "npm:^7.13.10"
+    "@radix-ui/primitive": "npm:1.0.1"
+    "@radix-ui/react-compose-refs": "npm:1.0.1"
+    "@radix-ui/react-primitive": "npm:1.0.3"
+    "@radix-ui/react-use-callback-ref": "npm:1.0.1"
+    "@radix-ui/react-use-escape-keydown": "npm:1.0.3"
   peerDependencies:
     "@types/react": "*"
     "@types/react-dom": "*"
@@ -5933,7 +6667,7 @@ __metadata:
       optional: true
     "@types/react-dom":
       optional: true
-  checksum: ea86004ed56a10609dd84eef39dc1e57b400d687a35be41bb4aaa06dc7ad6dbd0a8da281e08c8c077fdbd523122e4d860cb7438a60c664f024f77c8b41299ec6
+  checksum: 10/bcc14f0704fdc19430a2b922106a278e64401decffd6e47f427aa5de2d63367ba3e848b012c464a6b39a6e057060e41ad16964385941735a329e319cea46711a
   languageName: node
   linkType: hard
 
@@ -5941,14 +6675,14 @@ __metadata:
   version: 1.0.1
   resolution: "@radix-ui/react-focus-guards@npm:1.0.1"
   dependencies:
-    "@babel/runtime": ^7.13.10
+    "@babel/runtime": "npm:^7.13.10"
   peerDependencies:
     "@types/react": "*"
     react: ^16.8 || ^17.0 || ^18.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 1f8ca8f83b884b3612788d0742f3f054e327856d90a39841a47897dbed95e114ee512362ae314177de226d05310047cabbf66b686ae86ad1b65b6b295be24ef7
+  checksum: 10/1f8ca8f83b884b3612788d0742f3f054e327856d90a39841a47897dbed95e114ee512362ae314177de226d05310047cabbf66b686ae86ad1b65b6b295be24ef7
   languageName: node
   linkType: hard
 
@@ -5956,10 +6690,10 @@ __metadata:
   version: 1.0.3
   resolution: "@radix-ui/react-focus-scope@npm:1.0.3"
   dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/react-compose-refs": 1.0.1
-    "@radix-ui/react-primitive": 1.0.3
-    "@radix-ui/react-use-callback-ref": 1.0.1
+    "@babel/runtime": "npm:^7.13.10"
+    "@radix-ui/react-compose-refs": "npm:1.0.1"
+    "@radix-ui/react-primitive": "npm:1.0.3"
+    "@radix-ui/react-use-callback-ref": "npm:1.0.1"
   peerDependencies:
     "@types/react": "*"
     "@types/react-dom": "*"
@@ -5970,7 +6704,7 @@ __metadata:
       optional: true
     "@types/react-dom":
       optional: true
-  checksum: e5b1a089071fbe77aca11124a4ad9623fc2bcaf4c019759b0cd044bf0878ecc924131ee09c6a22d38a3f094684ef68ed18fa65c8d891918412e0afc685a464e0
+  checksum: 10/d62631cc06a2f37d483d106f3732ffc00831498fc2306df51c675d7cdb9727169512a1ca43ce06d1bfd578e8d8d67a80858c7531579bacaf6079d3aaf0ca8663
   languageName: node
   linkType: hard
 
@@ -5978,15 +6712,15 @@ __metadata:
   version: 1.0.1
   resolution: "@radix-ui/react-id@npm:1.0.1"
   dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/react-use-layout-effect": 1.0.1
+    "@babel/runtime": "npm:^7.13.10"
+    "@radix-ui/react-use-layout-effect": "npm:1.0.1"
   peerDependencies:
     "@types/react": "*"
     react: ^16.8 || ^17.0 || ^18.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 446a453d799cc790dd2a1583ff8328da88271bff64530b5a17c102fa7fb35eece3cf8985359d416f65e330cd81aa7b8fe984ea125fc4f4eaf4b3801d698e49fe
+  checksum: 10/446a453d799cc790dd2a1583ff8328da88271bff64530b5a17c102fa7fb35eece3cf8985359d416f65e330cd81aa7b8fe984ea125fc4f4eaf4b3801d698e49fe
   languageName: node
   linkType: hard
 
@@ -5994,17 +6728,17 @@ __metadata:
   version: 1.1.2
   resolution: "@radix-ui/react-popper@npm:1.1.2"
   dependencies:
-    "@babel/runtime": ^7.13.10
-    "@floating-ui/react-dom": ^2.0.0
-    "@radix-ui/react-arrow": 1.0.3
-    "@radix-ui/react-compose-refs": 1.0.1
-    "@radix-ui/react-context": 1.0.1
-    "@radix-ui/react-primitive": 1.0.3
-    "@radix-ui/react-use-callback-ref": 1.0.1
-    "@radix-ui/react-use-layout-effect": 1.0.1
-    "@radix-ui/react-use-rect": 1.0.1
-    "@radix-ui/react-use-size": 1.0.1
-    "@radix-ui/rect": 1.0.1
+    "@babel/runtime": "npm:^7.13.10"
+    "@floating-ui/react-dom": "npm:^2.0.0"
+    "@radix-ui/react-arrow": "npm:1.0.3"
+    "@radix-ui/react-compose-refs": "npm:1.0.1"
+    "@radix-ui/react-context": "npm:1.0.1"
+    "@radix-ui/react-primitive": "npm:1.0.3"
+    "@radix-ui/react-use-callback-ref": "npm:1.0.1"
+    "@radix-ui/react-use-layout-effect": "npm:1.0.1"
+    "@radix-ui/react-use-rect": "npm:1.0.1"
+    "@radix-ui/react-use-size": "npm:1.0.1"
+    "@radix-ui/rect": "npm:1.0.1"
   peerDependencies:
     "@types/react": "*"
     "@types/react-dom": "*"
@@ -6015,7 +6749,7 @@ __metadata:
       optional: true
     "@types/react-dom":
       optional: true
-  checksum: 4929daa0d1cccada3cff50de0e00c0d186ffea97a5f28545c77fa85ff9bc5c105a54dddac400c2e2dcac631f0f7ea88e59f2e5ad0f80bb2cb7b62cc7cd30400f
+  checksum: 10/be32677e846ef93e8cbf219550e55b99583cb927b572a9ee466b0c242156d42ddc70f43135e22acffe48bba4cd3fe28888cc3f929947e078d8732bee958df4c4
   languageName: node
   linkType: hard
 
@@ -6023,8 +6757,8 @@ __metadata:
   version: 1.0.3
   resolution: "@radix-ui/react-portal@npm:1.0.3"
   dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/react-primitive": 1.0.3
+    "@babel/runtime": "npm:^7.13.10"
+    "@radix-ui/react-primitive": "npm:1.0.3"
   peerDependencies:
     "@types/react": "*"
     "@types/react-dom": "*"
@@ -6035,7 +6769,7 @@ __metadata:
       optional: true
     "@types/react-dom":
       optional: true
-  checksum: d352bcd6ad65eb43c9e0d72d0755c2aae85e03fb287770866262be3a2d5302b2885aee3cd99f2bbf62ecd14fcb1460703f1dcdc40351f77ad887b931c6f0012a
+  checksum: 10/d352bcd6ad65eb43c9e0d72d0755c2aae85e03fb287770866262be3a2d5302b2885aee3cd99f2bbf62ecd14fcb1460703f1dcdc40351f77ad887b931c6f0012a
   languageName: node
   linkType: hard
 
@@ -6043,8 +6777,8 @@ __metadata:
   version: 1.0.3
   resolution: "@radix-ui/react-primitive@npm:1.0.3"
   dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/react-slot": 1.0.2
+    "@babel/runtime": "npm:^7.13.10"
+    "@radix-ui/react-slot": "npm:1.0.2"
   peerDependencies:
     "@types/react": "*"
     "@types/react-dom": "*"
@@ -6055,7 +6789,7 @@ __metadata:
       optional: true
     "@types/react-dom":
       optional: true
-  checksum: 9402bc22923c8e5c479051974a721c301535c36521c0237b83e5fa213d013174e77f3ad7905e6d60ef07e14f88ec7f4ea69891dc7a2b39047f8d3640e8f8d713
+  checksum: 10/bedb934ac07c710dc5550a7bfc7065d47e099d958cde1d37e4b1947ae5451f1b7e6f8ff5965e242578bf2c619065e6038c3a3aa779e5eafa7da3e3dbc685799f
   languageName: node
   linkType: hard
 
@@ -6063,16 +6797,16 @@ __metadata:
   version: 1.0.4
   resolution: "@radix-ui/react-roving-focus@npm:1.0.4"
   dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/primitive": 1.0.1
-    "@radix-ui/react-collection": 1.0.3
-    "@radix-ui/react-compose-refs": 1.0.1
-    "@radix-ui/react-context": 1.0.1
-    "@radix-ui/react-direction": 1.0.1
-    "@radix-ui/react-id": 1.0.1
-    "@radix-ui/react-primitive": 1.0.3
-    "@radix-ui/react-use-callback-ref": 1.0.1
-    "@radix-ui/react-use-controllable-state": 1.0.1
+    "@babel/runtime": "npm:^7.13.10"
+    "@radix-ui/primitive": "npm:1.0.1"
+    "@radix-ui/react-collection": "npm:1.0.3"
+    "@radix-ui/react-compose-refs": "npm:1.0.1"
+    "@radix-ui/react-context": "npm:1.0.1"
+    "@radix-ui/react-direction": "npm:1.0.1"
+    "@radix-ui/react-id": "npm:1.0.1"
+    "@radix-ui/react-primitive": "npm:1.0.3"
+    "@radix-ui/react-use-callback-ref": "npm:1.0.1"
+    "@radix-ui/react-use-controllable-state": "npm:1.0.1"
   peerDependencies:
     "@types/react": "*"
     "@types/react-dom": "*"
@@ -6083,7 +6817,7 @@ __metadata:
       optional: true
     "@types/react-dom":
       optional: true
-  checksum: 69b1c82c2d9db3ba71549a848f2704200dab1b2cd22d050c1e081a78b9a567dbfdc7fd0403ee010c19b79652de69924d8ca2076cd031d6552901e4213493ffc7
+  checksum: 10/a23ffb1e3e29a8209b94ce3857bf559dcf2175c4f316169dc47d018e8e94cd018dc914331a1d1762f32448e2594b7c8945efaa7059056f9940ce92cc35cc7026
   languageName: node
   linkType: hard
 
@@ -6091,28 +6825,28 @@ __metadata:
   version: 1.2.2
   resolution: "@radix-ui/react-select@npm:1.2.2"
   dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/number": 1.0.1
-    "@radix-ui/primitive": 1.0.1
-    "@radix-ui/react-collection": 1.0.3
-    "@radix-ui/react-compose-refs": 1.0.1
-    "@radix-ui/react-context": 1.0.1
-    "@radix-ui/react-direction": 1.0.1
-    "@radix-ui/react-dismissable-layer": 1.0.4
-    "@radix-ui/react-focus-guards": 1.0.1
-    "@radix-ui/react-focus-scope": 1.0.3
-    "@radix-ui/react-id": 1.0.1
-    "@radix-ui/react-popper": 1.1.2
-    "@radix-ui/react-portal": 1.0.3
-    "@radix-ui/react-primitive": 1.0.3
-    "@radix-ui/react-slot": 1.0.2
-    "@radix-ui/react-use-callback-ref": 1.0.1
-    "@radix-ui/react-use-controllable-state": 1.0.1
-    "@radix-ui/react-use-layout-effect": 1.0.1
-    "@radix-ui/react-use-previous": 1.0.1
-    "@radix-ui/react-visually-hidden": 1.0.3
-    aria-hidden: ^1.1.1
-    react-remove-scroll: 2.5.5
+    "@babel/runtime": "npm:^7.13.10"
+    "@radix-ui/number": "npm:1.0.1"
+    "@radix-ui/primitive": "npm:1.0.1"
+    "@radix-ui/react-collection": "npm:1.0.3"
+    "@radix-ui/react-compose-refs": "npm:1.0.1"
+    "@radix-ui/react-context": "npm:1.0.1"
+    "@radix-ui/react-direction": "npm:1.0.1"
+    "@radix-ui/react-dismissable-layer": "npm:1.0.4"
+    "@radix-ui/react-focus-guards": "npm:1.0.1"
+    "@radix-ui/react-focus-scope": "npm:1.0.3"
+    "@radix-ui/react-id": "npm:1.0.1"
+    "@radix-ui/react-popper": "npm:1.1.2"
+    "@radix-ui/react-portal": "npm:1.0.3"
+    "@radix-ui/react-primitive": "npm:1.0.3"
+    "@radix-ui/react-slot": "npm:1.0.2"
+    "@radix-ui/react-use-callback-ref": "npm:1.0.1"
+    "@radix-ui/react-use-controllable-state": "npm:1.0.1"
+    "@radix-ui/react-use-layout-effect": "npm:1.0.1"
+    "@radix-ui/react-use-previous": "npm:1.0.1"
+    "@radix-ui/react-visually-hidden": "npm:1.0.3"
+    aria-hidden: "npm:^1.1.1"
+    react-remove-scroll: "npm:2.5.5"
   peerDependencies:
     "@types/react": "*"
     "@types/react-dom": "*"
@@ -6123,7 +6857,7 @@ __metadata:
       optional: true
     "@types/react-dom":
       optional: true
-  checksum: af7b63cc9e2c6006ec08163392d244941e9e03534e7add1b7c5a86059d0eb8a0398d4f3e80d43ff22126874a02b985e44f1722d1de9218922f7aa653d09412e3
+  checksum: 10/4d7b6d9d988f78764783a4b2fd6523457ff735436829e122dae824bdea4f2835ad0150dfc060517d6c29d953ef61ee12d7ce10cf160593e56967e528bf6f8ee5
   languageName: node
   linkType: hard
 
@@ -6131,8 +6865,8 @@ __metadata:
   version: 1.0.3
   resolution: "@radix-ui/react-separator@npm:1.0.3"
   dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/react-primitive": 1.0.3
+    "@babel/runtime": "npm:^7.13.10"
+    "@radix-ui/react-primitive": "npm:1.0.3"
   peerDependencies:
     "@types/react": "*"
     "@types/react-dom": "*"
@@ -6143,7 +6877,7 @@ __metadata:
       optional: true
     "@types/react-dom":
       optional: true
-  checksum: 42f8c95e404de2ce9387040d78049808a48d423cd4c3bad8cca92c4b0bcbdcb3566b5b52a920d4e939a74b51188697f20a012221f0e630fc7f56de64096c15d2
+  checksum: 10/b5ea8f1996c86d3f9df73c72926f3d1a400a2eb46a482a345d486651c503895af2ccf9d7723f97a4e612f7c1317eb622078ddf014b13e2b26070d8cf0ad0da1d
   languageName: node
   linkType: hard
 
@@ -6151,15 +6885,15 @@ __metadata:
   version: 1.0.2
   resolution: "@radix-ui/react-slot@npm:1.0.2"
   dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/react-compose-refs": 1.0.1
+    "@babel/runtime": "npm:^7.13.10"
+    "@radix-ui/react-compose-refs": "npm:1.0.1"
   peerDependencies:
     "@types/react": "*"
     react: ^16.8 || ^17.0 || ^18.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: edf5edf435ff594bea7e198bf16d46caf81b6fb559493acad4fa8c308218896136acb16f9b7238c788fd13e94a904f2fd0b6d834e530e4cae94522cdb8f77ce9
+  checksum: 10/734866561e991438fbcf22af06e56b272ed6ee8f7b536489ee3bf2f736f8b53bf6bc14ebde94834aa0aceda854d018a0ce20bb171defffbaed1f566006cbb887
   languageName: node
   linkType: hard
 
@@ -6167,14 +6901,14 @@ __metadata:
   version: 1.0.4
   resolution: "@radix-ui/react-toggle-group@npm:1.0.4"
   dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/primitive": 1.0.1
-    "@radix-ui/react-context": 1.0.1
-    "@radix-ui/react-direction": 1.0.1
-    "@radix-ui/react-primitive": 1.0.3
-    "@radix-ui/react-roving-focus": 1.0.4
-    "@radix-ui/react-toggle": 1.0.3
-    "@radix-ui/react-use-controllable-state": 1.0.1
+    "@babel/runtime": "npm:^7.13.10"
+    "@radix-ui/primitive": "npm:1.0.1"
+    "@radix-ui/react-context": "npm:1.0.1"
+    "@radix-ui/react-direction": "npm:1.0.1"
+    "@radix-ui/react-primitive": "npm:1.0.3"
+    "@radix-ui/react-roving-focus": "npm:1.0.4"
+    "@radix-ui/react-toggle": "npm:1.0.3"
+    "@radix-ui/react-use-controllable-state": "npm:1.0.1"
   peerDependencies:
     "@types/react": "*"
     "@types/react-dom": "*"
@@ -6185,7 +6919,7 @@ __metadata:
       optional: true
     "@types/react-dom":
       optional: true
-  checksum: b6c11fbbc3ca857ff68c0fa31f293c0d0111bcc8aa0cde2566214c090907530bfcb3b862f81585c2b02d8989b5c7971acff4d5c07c429870d80bd5602e30d376
+  checksum: 10/96ea35f0e959399f239ff3b75dcad72d5880c66966114c80293ab1450801c87353c0cb2a7a4a5e9825f43c9bd3d881f312a9c14bdacfa70f4050d406bec98c2b
   languageName: node
   linkType: hard
 
@@ -6193,10 +6927,10 @@ __metadata:
   version: 1.0.3
   resolution: "@radix-ui/react-toggle@npm:1.0.3"
   dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/primitive": 1.0.1
-    "@radix-ui/react-primitive": 1.0.3
-    "@radix-ui/react-use-controllable-state": 1.0.1
+    "@babel/runtime": "npm:^7.13.10"
+    "@radix-ui/primitive": "npm:1.0.1"
+    "@radix-ui/react-primitive": "npm:1.0.3"
+    "@radix-ui/react-use-controllable-state": "npm:1.0.1"
   peerDependencies:
     "@types/react": "*"
     "@types/react-dom": "*"
@@ -6207,7 +6941,7 @@ __metadata:
       optional: true
     "@types/react-dom":
       optional: true
-  checksum: ed5407f48254f20cda542017774f259d0b2c0007ea4bd7287d10d751016dbf269cb13d1142591432c269c3ab768cde2f1ba0344743027d36bbec10af909f19de
+  checksum: 10/ed5407f48254f20cda542017774f259d0b2c0007ea4bd7287d10d751016dbf269cb13d1142591432c269c3ab768cde2f1ba0344743027d36bbec10af909f19de
   languageName: node
   linkType: hard
 
@@ -6215,14 +6949,14 @@ __metadata:
   version: 1.0.4
   resolution: "@radix-ui/react-toolbar@npm:1.0.4"
   dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/primitive": 1.0.1
-    "@radix-ui/react-context": 1.0.1
-    "@radix-ui/react-direction": 1.0.1
-    "@radix-ui/react-primitive": 1.0.3
-    "@radix-ui/react-roving-focus": 1.0.4
-    "@radix-ui/react-separator": 1.0.3
-    "@radix-ui/react-toggle-group": 1.0.4
+    "@babel/runtime": "npm:^7.13.10"
+    "@radix-ui/primitive": "npm:1.0.1"
+    "@radix-ui/react-context": "npm:1.0.1"
+    "@radix-ui/react-direction": "npm:1.0.1"
+    "@radix-ui/react-primitive": "npm:1.0.3"
+    "@radix-ui/react-roving-focus": "npm:1.0.4"
+    "@radix-ui/react-separator": "npm:1.0.3"
+    "@radix-ui/react-toggle-group": "npm:1.0.4"
   peerDependencies:
     "@types/react": "*"
     "@types/react-dom": "*"
@@ -6233,7 +6967,7 @@ __metadata:
       optional: true
     "@types/react-dom":
       optional: true
-  checksum: 7ebee1f8add6510108979433c5b38627e2de9d48ef2172ca15274b9edbbc106ff43bcd47ff733b03ed2215b92e7af364ff82c79e5a1728374847e2b1e315552c
+  checksum: 10/57f75b6617d4e2bb8f7782d6065e70fd0db44038588b3e8e5f8cd1101dc2c94744bd52b9c011c7b722cb5f9ca96d21fc78ee7caac07722894453019fd5ade3b0
   languageName: node
   linkType: hard
 
@@ -6241,14 +6975,14 @@ __metadata:
   version: 1.0.1
   resolution: "@radix-ui/react-use-callback-ref@npm:1.0.1"
   dependencies:
-    "@babel/runtime": ^7.13.10
+    "@babel/runtime": "npm:^7.13.10"
   peerDependencies:
     "@types/react": "*"
     react: ^16.8 || ^17.0 || ^18.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: b9fd39911c3644bbda14a84e4fca080682bef84212b8d8931fcaa2d2814465de242c4cfd8d7afb3020646bead9c5e539d478cea0a7031bee8a8a3bb164f3bc4c
+  checksum: 10/b9fd39911c3644bbda14a84e4fca080682bef84212b8d8931fcaa2d2814465de242c4cfd8d7afb3020646bead9c5e539d478cea0a7031bee8a8a3bb164f3bc4c
   languageName: node
   linkType: hard
 
@@ -6256,15 +6990,15 @@ __metadata:
   version: 1.0.1
   resolution: "@radix-ui/react-use-controllable-state@npm:1.0.1"
   dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/react-use-callback-ref": 1.0.1
+    "@babel/runtime": "npm:^7.13.10"
+    "@radix-ui/react-use-callback-ref": "npm:1.0.1"
   peerDependencies:
     "@types/react": "*"
     react: ^16.8 || ^17.0 || ^18.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: dee2be1937d293c3a492cb6d279fc11495a8f19dc595cdbfe24b434e917302f9ac91db24e8cc5af9a065f3f209c3423115b5442e65a5be9fd1e9091338972be9
+  checksum: 10/dee2be1937d293c3a492cb6d279fc11495a8f19dc595cdbfe24b434e917302f9ac91db24e8cc5af9a065f3f209c3423115b5442e65a5be9fd1e9091338972be9
   languageName: node
   linkType: hard
 
@@ -6272,15 +7006,15 @@ __metadata:
   version: 1.0.3
   resolution: "@radix-ui/react-use-escape-keydown@npm:1.0.3"
   dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/react-use-callback-ref": 1.0.1
+    "@babel/runtime": "npm:^7.13.10"
+    "@radix-ui/react-use-callback-ref": "npm:1.0.1"
   peerDependencies:
     "@types/react": "*"
     react: ^16.8 || ^17.0 || ^18.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: c6ed0d9ce780f67f924980eb305af1f6cce2a8acbaf043a58abe0aa3cc551d9aa76ccee14531df89bbee302ead7ecc7fce330886f82d4672c5eda52f357ef9b8
+  checksum: 10/c6ed0d9ce780f67f924980eb305af1f6cce2a8acbaf043a58abe0aa3cc551d9aa76ccee14531df89bbee302ead7ecc7fce330886f82d4672c5eda52f357ef9b8
   languageName: node
   linkType: hard
 
@@ -6288,14 +7022,14 @@ __metadata:
   version: 1.0.1
   resolution: "@radix-ui/react-use-layout-effect@npm:1.0.1"
   dependencies:
-    "@babel/runtime": ^7.13.10
+    "@babel/runtime": "npm:^7.13.10"
   peerDependencies:
     "@types/react": "*"
     react: ^16.8 || ^17.0 || ^18.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: bed9c7e8de243a5ec3b93bb6a5860950b0dba359b6680c84d57c7a655e123dec9b5891c5dfe81ab970652e7779fe2ad102a23177c7896dde95f7340817d47ae5
+  checksum: 10/bed9c7e8de243a5ec3b93bb6a5860950b0dba359b6680c84d57c7a655e123dec9b5891c5dfe81ab970652e7779fe2ad102a23177c7896dde95f7340817d47ae5
   languageName: node
   linkType: hard
 
@@ -6303,14 +7037,14 @@ __metadata:
   version: 1.0.1
   resolution: "@radix-ui/react-use-previous@npm:1.0.1"
   dependencies:
-    "@babel/runtime": ^7.13.10
+    "@babel/runtime": "npm:^7.13.10"
   peerDependencies:
     "@types/react": "*"
     react: ^16.8 || ^17.0 || ^18.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 66b4312e857c58b75f3bf62a2048ef090b79a159e9da06c19a468c93e62336969c33dbef60ff16969f00b20386cc25d138f6a353f1658b35baac0a6eff4761b9
+  checksum: 10/66b4312e857c58b75f3bf62a2048ef090b79a159e9da06c19a468c93e62336969c33dbef60ff16969f00b20386cc25d138f6a353f1658b35baac0a6eff4761b9
   languageName: node
   linkType: hard
 
@@ -6318,15 +7052,15 @@ __metadata:
   version: 1.0.1
   resolution: "@radix-ui/react-use-rect@npm:1.0.1"
   dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/rect": 1.0.1
+    "@babel/runtime": "npm:^7.13.10"
+    "@radix-ui/rect": "npm:1.0.1"
   peerDependencies:
     "@types/react": "*"
     react: ^16.8 || ^17.0 || ^18.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 433f07e61e04eb222349825bb05f3591fca131313a1d03709565d6226d8660bd1d0423635553f95ee4fcc25c8f2050972d848808d753c388e2a9ae191ebf17f3
+  checksum: 10/433f07e61e04eb222349825bb05f3591fca131313a1d03709565d6226d8660bd1d0423635553f95ee4fcc25c8f2050972d848808d753c388e2a9ae191ebf17f3
   languageName: node
   linkType: hard
 
@@ -6334,15 +7068,15 @@ __metadata:
   version: 1.0.1
   resolution: "@radix-ui/react-use-size@npm:1.0.1"
   dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/react-use-layout-effect": 1.0.1
+    "@babel/runtime": "npm:^7.13.10"
+    "@radix-ui/react-use-layout-effect": "npm:1.0.1"
   peerDependencies:
     "@types/react": "*"
     react: ^16.8 || ^17.0 || ^18.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 6cc150ad1e9fa85019c225c5a5d50a0af6cdc4653dad0c21b4b40cd2121f36ee076db326c43e6bc91a69766ccff5a84e917d27970176b592577deea3c85a3e26
+  checksum: 10/6cc150ad1e9fa85019c225c5a5d50a0af6cdc4653dad0c21b4b40cd2121f36ee076db326c43e6bc91a69766ccff5a84e917d27970176b592577deea3c85a3e26
   languageName: node
   linkType: hard
 
@@ -6350,8 +7084,8 @@ __metadata:
   version: 1.0.3
   resolution: "@radix-ui/react-visually-hidden@npm:1.0.3"
   dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/react-primitive": 1.0.3
+    "@babel/runtime": "npm:^7.13.10"
+    "@radix-ui/react-primitive": "npm:1.0.3"
   peerDependencies:
     "@types/react": "*"
     "@types/react-dom": "*"
@@ -6362,7 +7096,7 @@ __metadata:
       optional: true
     "@types/react-dom":
       optional: true
-  checksum: 2e9d0c8253f97e7d6ffb2e52a5cfd40ba719f813b39c3e2e42c496d54408abd09ef66b5aec4af9b8ab0553215e32452a5d0934597a49c51dd90dc39181ed0d57
+  checksum: 10/2e9d0c8253f97e7d6ffb2e52a5cfd40ba719f813b39c3e2e42c496d54408abd09ef66b5aec4af9b8ab0553215e32452a5d0934597a49c51dd90dc39181ed0d57
   languageName: node
   linkType: hard
 
@@ -6370,8 +7104,8 @@ __metadata:
   version: 1.0.1
   resolution: "@radix-ui/rect@npm:1.0.1"
   dependencies:
-    "@babel/runtime": ^7.13.10
-  checksum: aeec13b234a946052512d05239067d2d63422f9ec70bf2fe7acfd6b9196693fc33fbaf43c2667c167f777d90a095c6604eb487e0bce79e230b6df0f6cacd6a55
+    "@babel/runtime": "npm:^7.13.10"
+  checksum: 10/e25492cb8a683246161d781f0f3205f79507280a60f50eb763f06e8b6fa211b940b784aa581131ed76695bd5df5d1033a6246b43a6996cf8959a326fe4d3eb00
   languageName: node
   linkType: hard
 
@@ -6379,597 +7113,573 @@ __metadata:
   version: 1.1.1
   resolution: "@rc-component/portal@npm:1.1.1"
   dependencies:
-    "@babel/runtime": ^7.18.0
-    classnames: ^2.3.2
-    rc-util: ^5.24.4
+    "@babel/runtime": "npm:^7.18.0"
+    classnames: "npm:^2.3.2"
+    rc-util: "npm:^5.24.4"
   peerDependencies:
     react: ">=16.9.0"
     react-dom: ">=16.9.0"
-  checksum: 4a2aef7cfd71a7614dc83b5ee5863ef49613e392b9aec0fa5913de4fb04ca6c9b13fd4ed183d8696475999d9c2bb945d707b245f7f28b7c0615a5f613416206a
+  checksum: 10/def7394572e0dd35226139414e97203e90ef324c0d5e28eef236f5416bc7e94f1e77213dc866db5dd5c2cde048f6ae13d7ba1ced9e60c85ea6317f9eceb9421d
   languageName: node
   linkType: hard
 
-"@rc-component/trigger@npm:^1.17.0, @rc-component/trigger@npm:^1.5.0":
-  version: 1.17.1
-  resolution: "@rc-component/trigger@npm:1.17.1"
+"@rc-component/trigger@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@rc-component/trigger@npm:2.0.0"
   dependencies:
-    "@babel/runtime": ^7.23.2
-    "@rc-component/portal": ^1.1.0
-    classnames: ^2.3.2
-    rc-motion: ^2.0.0
-    rc-resize-observer: ^1.3.1
-    rc-util: ^5.38.0
+    "@babel/runtime": "npm:^7.23.2"
+    "@rc-component/portal": "npm:^1.1.0"
+    classnames: "npm:^2.3.2"
+    rc-motion: "npm:^2.0.0"
+    rc-resize-observer: "npm:^1.3.1"
+    rc-util: "npm:^5.38.0"
   peerDependencies:
     react: ">=16.9.0"
     react-dom: ">=16.9.0"
-  checksum: 7bb2e2ebc9bbd21450a3f20036aadb41517efb17822c7359c8e1646af5bc95b8e067fa793ffec60749fc1efaca6ee15ef1f14ba3029dc452fe4701317f234d67
+  checksum: 10/6ae8eee1bbc639aa2426d1a0e00cc4bfc93e54e7cd57fcf97971d3acdb72de4b852b2377d4cca778de898f7024444da03ed0f41a94d702daf5a9c73b45fbb920
   languageName: node
   linkType: hard
 
 "@reach/observe-rect@npm:^1.1.0":
   version: 1.2.0
   resolution: "@reach/observe-rect@npm:1.2.0"
-  checksum: 7dd903eeaad0e22c6d973bd26265d91eadba56ab5134701ceb3e85214db75339fae94aa7e8b88a65e8daa64bc7cf1b915d4ffcdfd324466b561dc6adc3c6e070
+  checksum: 10/7dd903eeaad0e22c6d973bd26265d91eadba56ab5134701ceb3e85214db75339fae94aa7e8b88a65e8daa64bc7cf1b915d4ffcdfd324466b561dc6adc3c6e070
   languageName: node
   linkType: hard
 
-"@react-aria/button@npm:3.8.0":
-  version: 3.8.0
-  resolution: "@react-aria/button@npm:3.8.0"
+"@react-aria/dialog@npm:3.5.12":
+  version: 3.5.12
+  resolution: "@react-aria/dialog@npm:3.5.12"
   dependencies:
-    "@react-aria/focus": ^3.13.0
-    "@react-aria/interactions": ^3.16.0
-    "@react-aria/utils": ^3.18.0
-    "@react-stately/toggle": ^3.6.0
-    "@react-types/button": ^3.7.3
-    "@react-types/shared": ^3.18.1
-    "@swc/helpers": ^0.5.0
+    "@react-aria/focus": "npm:^3.16.2"
+    "@react-aria/overlays": "npm:^3.21.1"
+    "@react-aria/utils": "npm:^3.23.2"
+    "@react-types/dialog": "npm:^3.5.8"
+    "@react-types/shared": "npm:^3.22.1"
+    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: ad24c87609bdff0fb6fc975c6c84a3d3b38f2f2981c0e1914aaed82654db388c9abd16fa127d1b15c1def61085afc63acf2d3686321086215cbb1f148cf54012
-  languageName: node
-  linkType: hard
-
-"@react-aria/dialog@npm:3.5.3":
-  version: 3.5.3
-  resolution: "@react-aria/dialog@npm:3.5.3"
-  dependencies:
-    "@react-aria/focus": ^3.13.0
-    "@react-aria/overlays": ^3.15.0
-    "@react-aria/utils": ^3.18.0
-    "@react-stately/overlays": ^3.6.0
-    "@react-types/dialog": ^3.5.3
-    "@react-types/shared": ^3.18.1
-    "@swc/helpers": ^0.5.0
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: 053e37148b75b32a818936f85eb0e9619ca5fe48c79c7f6fd464d3f11702839a54d85f1fcef8447960f6f8df60f3399a6d2ea341f3c2cd2fa208449e1d8eae63
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  checksum: 10/3de699980e8582056675fef747746c23f8875940d85bd6dafadacf9e59c0edd0d9b1dc2f011fb1cfbcbdebdf4a2796fa9bc19e953c4c809f671151975031d6bf
   languageName: node
   linkType: hard
 
-"@react-aria/focus@npm:3.13.0, @react-aria/focus@npm:^3.13.0":
-  version: 3.13.0
-  resolution: "@react-aria/focus@npm:3.13.0"
+"@react-aria/focus@npm:3.16.2, @react-aria/focus@npm:^3.16.2":
+  version: 3.16.2
+  resolution: "@react-aria/focus@npm:3.16.2"
   dependencies:
-    "@react-aria/interactions": ^3.16.0
-    "@react-aria/utils": ^3.18.0
-    "@react-types/shared": ^3.18.1
-    "@swc/helpers": ^0.5.0
-    clsx: ^1.1.1
+    "@react-aria/interactions": "npm:^3.21.1"
+    "@react-aria/utils": "npm:^3.23.2"
+    "@react-types/shared": "npm:^3.22.1"
+    "@swc/helpers": "npm:^0.5.0"
+    clsx: "npm:^2.0.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: ef78efc7b1e2cc9e7c23cf61d1fa533f7d0ab4b231082ef7aacff002d79c53d3fff2861c4b660693f6c2122c2f6b2ac42ddb7c3768a68880a025cf3c1cac9d29
+  checksum: 10/da25d79534443652ed2ad560ce1e56653a28ac5ccbd5a7be2822c11b748f46e8a544f37bea0bff8ad1a82493c77c6f17c418c86c995abe45df36fbe33bae0156
   languageName: node
   linkType: hard
 
-"@react-aria/i18n@npm:^3.8.0":
-  version: 3.8.0
-  resolution: "@react-aria/i18n@npm:3.8.0"
+"@react-aria/i18n@npm:^3.10.2":
+  version: 3.10.2
+  resolution: "@react-aria/i18n@npm:3.10.2"
   dependencies:
-    "@internationalized/date": ^3.3.0
-    "@internationalized/message": ^3.1.1
-    "@internationalized/number": ^3.2.1
-    "@internationalized/string": ^3.1.1
-    "@react-aria/ssr": ^3.7.0
-    "@react-aria/utils": ^3.18.0
-    "@react-types/shared": ^3.18.1
-    "@swc/helpers": ^0.5.0
+    "@internationalized/date": "npm:^3.5.2"
+    "@internationalized/message": "npm:^3.1.2"
+    "@internationalized/number": "npm:^3.5.1"
+    "@internationalized/string": "npm:^3.2.1"
+    "@react-aria/ssr": "npm:^3.9.2"
+    "@react-aria/utils": "npm:^3.23.2"
+    "@react-types/shared": "npm:^3.22.1"
+    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: 5f142daf8c18f4e70832afbda65614697bc9af32d88ee193781b5be66bb4670c6d6c81767eed84d43634c7f1b22e730dd4838ad498549545e84df453b0de22eb
+  checksum: 10/e24558e3f659246b59e5a2862a99debec7cd9ec152c74fbfbfc15c0816a77448d455a131790b954697fcc0bf8633bc102c1b27121a8b7043820563c7b5987095
   languageName: node
   linkType: hard
 
-"@react-aria/interactions@npm:3.16.0, @react-aria/interactions@npm:^3.16.0":
-  version: 3.16.0
-  resolution: "@react-aria/interactions@npm:3.16.0"
+"@react-aria/interactions@npm:^3.21.1":
+  version: 3.21.1
+  resolution: "@react-aria/interactions@npm:3.21.1"
   dependencies:
-    "@react-aria/ssr": ^3.7.0
-    "@react-aria/utils": ^3.18.0
-    "@react-types/shared": ^3.18.1
-    "@swc/helpers": ^0.5.0
+    "@react-aria/ssr": "npm:^3.9.2"
+    "@react-aria/utils": "npm:^3.23.2"
+    "@react-types/shared": "npm:^3.22.1"
+    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: 17b1f7c738f858b751206c659551ef860ab8e4de86fe765859a35c805767c2e8b5a0867b722da460301d14f238e608269932da579b69846ec4928c0480bac7fa
-  languageName: node
-  linkType: hard
-
-"@react-aria/menu@npm:3.10.0":
-  version: 3.10.0
-  resolution: "@react-aria/menu@npm:3.10.0"
-  dependencies:
-    "@react-aria/focus": ^3.13.0
-    "@react-aria/i18n": ^3.8.0
-    "@react-aria/interactions": ^3.16.0
-    "@react-aria/overlays": ^3.15.0
-    "@react-aria/selection": ^3.16.0
-    "@react-aria/utils": ^3.18.0
-    "@react-stately/collections": ^3.9.0
-    "@react-stately/menu": ^3.5.3
-    "@react-stately/tree": ^3.7.0
-    "@react-types/button": ^3.7.3
-    "@react-types/menu": ^3.9.2
-    "@react-types/shared": ^3.18.1
-    "@swc/helpers": ^0.5.0
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: b6722c5ddbfa082addea4d7edaa57ba441f0a150dca0ecf5d174c795a91678a11b1fa5a5d6ebb626276d7e74d1919b4b0bf5933bfb5eb11b2ff298d9ee56ed54
+  checksum: 10/ca0918dca1ee41e7ac9129eeb5a23f02a9043cae55f0ee381dc93bd763ac31928a809e029e8bd144223b0f44275736b29079d99fbd22891c244f09c50d16665b
   languageName: node
   linkType: hard
 
-"@react-aria/overlays@npm:3.15.0, @react-aria/overlays@npm:^3.15.0":
-  version: 3.15.0
-  resolution: "@react-aria/overlays@npm:3.15.0"
-  dependencies:
-    "@react-aria/focus": ^3.13.0
-    "@react-aria/i18n": ^3.8.0
-    "@react-aria/interactions": ^3.16.0
-    "@react-aria/ssr": ^3.7.0
-    "@react-aria/utils": ^3.18.0
-    "@react-aria/visually-hidden": ^3.8.2
-    "@react-stately/overlays": ^3.6.0
-    "@react-types/button": ^3.7.3
-    "@react-types/overlays": ^3.8.0
-    "@react-types/shared": ^3.18.1
-    "@swc/helpers": ^0.5.0
+"@react-aria/overlays@npm:3.21.1, @react-aria/overlays@npm:^3.21.1":
+  version: 3.21.1
+  resolution: "@react-aria/overlays@npm:3.21.1"
+  dependencies:
+    "@react-aria/focus": "npm:^3.16.2"
+    "@react-aria/i18n": "npm:^3.10.2"
+    "@react-aria/interactions": "npm:^3.21.1"
+    "@react-aria/ssr": "npm:^3.9.2"
+    "@react-aria/utils": "npm:^3.23.2"
+    "@react-aria/visually-hidden": "npm:^3.8.10"
+    "@react-stately/overlays": "npm:^3.6.5"
+    "@react-types/button": "npm:^3.9.2"
+    "@react-types/overlays": "npm:^3.8.5"
+    "@react-types/shared": "npm:^3.22.1"
+    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: 999ba27b4cfeefec544339223d74d65a03c1bb8aa89b5f0264a26c7c70cf30671298eac339b5297c48579036f828003b894638ddd99de490157f21a3dfd0b0aa
-  languageName: node
-  linkType: hard
-
-"@react-aria/selection@npm:^3.16.0":
-  version: 3.16.0
-  resolution: "@react-aria/selection@npm:3.16.0"
-  dependencies:
-    "@react-aria/focus": ^3.13.0
-    "@react-aria/i18n": ^3.8.0
-    "@react-aria/interactions": ^3.16.0
-    "@react-aria/utils": ^3.18.0
-    "@react-stately/collections": ^3.9.0
-    "@react-stately/selection": ^3.13.2
-    "@react-types/shared": ^3.18.1
-    "@swc/helpers": ^0.5.0
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: fb12513e0f5e13f429a1a38af5c9f7480e913d42aa20fb1677a7de12d62605ea05484e4611eaae1b62081eb449fff7b7a0b264de4f050274b2faf529cdda2467
+  checksum: 10/3143558dfb6e266194c0581475d10827d1296bb517e3cb3b50e4fe09a5e44a5616440a8f857389ab83572bbb507d738976651fcbf8eec9df0730a93aca159eb7
   languageName: node
   linkType: hard
 
-"@react-aria/ssr@npm:^3.7.0":
-  version: 3.7.0
-  resolution: "@react-aria/ssr@npm:3.7.0"
+"@react-aria/ssr@npm:^3.9.2":
+  version: 3.9.2
+  resolution: "@react-aria/ssr@npm:3.9.2"
   dependencies:
-    "@swc/helpers": ^0.5.0
+    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: cf4af47feb47c72ad1a5987b6ca341cba44687fd9bea6155e672c44dcb575e6801c3aaf4a036bb36da9e72f509eaf99c35c993a121017a8c0b0569125b27edfe
+  checksum: 10/fe4ce0ccc647d14f158724c0605433291f1403a73c82cb6654c323b5153fa3afbf0d36618bb3ecac38217b56837c27490c32b7d2082034b1171de6e95a4382a8
   languageName: node
   linkType: hard
 
-"@react-aria/utils@npm:3.18.0, @react-aria/utils@npm:^3.18.0":
-  version: 3.18.0
-  resolution: "@react-aria/utils@npm:3.18.0"
+"@react-aria/utils@npm:3.23.2, @react-aria/utils@npm:^3.23.2":
+  version: 3.23.2
+  resolution: "@react-aria/utils@npm:3.23.2"
   dependencies:
-    "@react-aria/ssr": ^3.7.0
-    "@react-stately/utils": ^3.7.0
-    "@react-types/shared": ^3.18.1
-    "@swc/helpers": ^0.5.0
-    clsx: ^1.1.1
+    "@react-aria/ssr": "npm:^3.9.2"
+    "@react-stately/utils": "npm:^3.9.1"
+    "@react-types/shared": "npm:^3.22.1"
+    "@swc/helpers": "npm:^0.5.0"
+    clsx: "npm:^2.0.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: 960b26b1c34cd10c36d9e560b2b1dc8782d7b81e23963377fadfb9a69ef34629b4361377b9fe24c1d05a4ec9f252fb29a6561f2405c1ab73e30ca713662d21e5
+  checksum: 10/132ac6e2e6f5eb7469a52ebc5a909ad2bdb8606b835c0cc8e5320447dc3cd34f8d0ed3441a75827ae1cd91bef435c0c6e463fec72fe4fa5fe565c7d87576301d
   languageName: node
   linkType: hard
 
-"@react-aria/visually-hidden@npm:^3.8.2":
-  version: 3.8.2
-  resolution: "@react-aria/visually-hidden@npm:3.8.2"
+"@react-aria/visually-hidden@npm:^3.8.10":
+  version: 3.8.10
+  resolution: "@react-aria/visually-hidden@npm:3.8.10"
   dependencies:
-    "@react-aria/interactions": ^3.16.0
-    "@react-aria/utils": ^3.18.0
-    "@react-types/shared": ^3.18.1
-    "@swc/helpers": ^0.5.0
-    clsx: ^1.1.1
+    "@react-aria/interactions": "npm:^3.21.1"
+    "@react-aria/utils": "npm:^3.23.2"
+    "@react-types/shared": "npm:^3.22.1"
+    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: c46f0ccb4d19bf9cd4f6a017badc9b52aa793e35111cbaadc1fe90b87b1ae437960e8cfd75ab9b0ea884bfb2107adc4e1037fa6cb4c8880b1200fc51cb230d55
+  checksum: 10/a7f9d8dccfeefb035d01ad8d9db4576f6acf7f0fcb94aad717cec177f113f6507f0dca0c7ee157abe40b358685b4cb84f9bce0c24dab2af753698ec8c1504264
   languageName: node
   linkType: hard
 
-"@react-awesome-query-builder/core@npm:6.4.1, @react-awesome-query-builder/core@npm:^6.4.1":
-  version: 6.4.1
-  resolution: "@react-awesome-query-builder/core@npm:6.4.1"
+"@react-awesome-query-builder/core@npm:6.4.2, @react-awesome-query-builder/core@npm:^6.4.2":
+  version: 6.4.2
+  resolution: "@react-awesome-query-builder/core@npm:6.4.2"
   dependencies:
-    clone: ^2.1.2
-    immutable: ^3.8.2
-    json-logic-js: ^2.0.2
-    lodash: ^4.17.21
-    moment: ^2.29.4
-    spel2js: ^0.2.8
-    sqlstring: ^2.3.3
-  checksum: 0eafbe012ab25aa2e918207e46950d2f39ee56c542d4a34c74b64a17f4228eb9323320f38820cf18a93e90f570a2b3517a37c9a80ddbc5d6919f3efda76a2260
+    clone: "npm:^2.1.2"
+    immutable: "npm:^3.8.2"
+    json-logic-js: "npm:^2.0.2"
+    lodash: "npm:^4.17.21"
+    moment: "npm:^2.29.4"
+    spel2js: "npm:^0.2.8"
+    sqlstring: "npm:^2.3.3"
+  checksum: 10/0bffa978d7f2608ee288ce2e6f054176cb17944a4b2ac76ef386b143cf90e8234fba4295e15e4bd1eb380ce127b50a8e06372dd6d7a3e58c18acd7c5a64c3557
   languageName: node
   linkType: hard
 
-"@react-awesome-query-builder/ui@npm:6.4.1":
-  version: 6.4.1
-  resolution: "@react-awesome-query-builder/ui@npm:6.4.1"
+"@react-awesome-query-builder/ui@npm:6.4.2":
+  version: 6.4.2
+  resolution: "@react-awesome-query-builder/ui@npm:6.4.2"
   dependencies:
-    "@react-awesome-query-builder/core": ^6.4.1
-    classnames: ^2.3.1
-    lodash: ^4.17.21
-    prop-types: ^15.7.2
-    react-redux: ^7.2.2
-    redux: ^4.2.0
+    "@react-awesome-query-builder/core": "npm:^6.4.2"
+    classnames: "npm:^2.3.1"
+    lodash: "npm:^4.17.21"
+    prop-types: "npm:^15.7.2"
+    react-redux: "npm:^7.2.2"
+    redux: "npm:^4.2.0"
   peerDependencies:
     react: ^16.8.4 || ^17.0.1 || ^18.0.0
     react-dom: ^16.8.4 || ^17.0.1 || ^18.0.0
-  checksum: 34103e9dd2a76d0d57310436babd35d7aabe70d34ed60de6338ceb75b9e2faad73372d799e0b26d2766d33df7ca959e17026a13e600c27469023e19fddce89f8
+  checksum: 10/36dfc21caeb3d6db4c044fdb8913d8c5ff38738baa0d81f9123048d7ddcc9f6e5e130d1550257faf0373a118e8deb0dfb2f5b17e46da6f3a28483454b19890f0
   languageName: node
   linkType: hard
 
-"@react-stately/collections@npm:3.9.0, @react-stately/collections@npm:^3.9.0":
-  version: 3.9.0
-  resolution: "@react-stately/collections@npm:3.9.0"
+"@react-stately/overlays@npm:^3.6.5":
+  version: 3.6.5
+  resolution: "@react-stately/overlays@npm:3.6.5"
   dependencies:
-    "@react-types/shared": ^3.18.1
-    "@swc/helpers": ^0.5.0
+    "@react-stately/utils": "npm:^3.9.1"
+    "@react-types/overlays": "npm:^3.8.5"
+    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: f8bcba4e7ea5d035486dda18c1dab95c8fcb73ab22e2ea4f7e8d20de2710968504262339f58d54aba1c7f51764a230cb9b2601122e4428abe4e3d3dec414d519
+  checksum: 10/83805f078eb42290ddb9f88d8cbd7403a4d5f15177fce4c9f8cec91acf177af1d5a414472c58029fc1f8bf6730d5ca9716a8b3cd750f2afd6b57e592a7f09ef7
   languageName: node
   linkType: hard
 
-"@react-stately/menu@npm:3.5.3, @react-stately/menu@npm:^3.5.3":
-  version: 3.5.3
-  resolution: "@react-stately/menu@npm:3.5.3"
+"@react-stately/utils@npm:^3.9.1":
+  version: 3.9.1
+  resolution: "@react-stately/utils@npm:3.9.1"
   dependencies:
-    "@react-stately/overlays": ^3.6.0
-    "@react-stately/utils": ^3.7.0
-    "@react-types/menu": ^3.9.2
-    "@react-types/shared": ^3.18.1
-    "@swc/helpers": ^0.5.0
+    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: 3c3d69208a1eec0616bd9e34d50b43a3e616e374031126d1e957efb50d34cba6666dfc7e7d981ec5f0ac77ac00d3be611c09cf50b66f04edb9582e5d850fffad
+  checksum: 10/17ddef6415db0950c474c6ad87a0d7b20a98aac817771887922ea6c6a90b9b91eb49205adf021349034f8da012fc0e3c30f6c9b378265ae6d0df93c3b4104b53
   languageName: node
   linkType: hard
 
-"@react-stately/overlays@npm:^3.6.0":
-  version: 3.6.0
-  resolution: "@react-stately/overlays@npm:3.6.0"
+"@react-types/button@npm:3.9.2, @react-types/button@npm:^3.9.2":
+  version: 3.9.2
+  resolution: "@react-types/button@npm:3.9.2"
   dependencies:
-    "@react-stately/utils": ^3.7.0
-    "@react-types/overlays": ^3.8.0
-    "@swc/helpers": ^0.5.0
+    "@react-types/shared": "npm:^3.22.1"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: bf8b272ced51bb93c6ecc1a9e9d9611efbb04bb278eec8759edfb3cd93718d2834d83293145c32a6fa61be01c5e01204108f1513fe0d1e03b299e17823039bd7
+  checksum: 10/8393ba87dfd6ca73fedf8f7ab3567361f1d6057f640346f2a0cc631e9659ad7c1aa2ddb255e1df6b880d8f6cd209e8c9d1d01c73e2ee2a149f180d8ebaabf1db
   languageName: node
   linkType: hard
 
-"@react-stately/selection@npm:^3.13.2":
-  version: 3.13.2
-  resolution: "@react-stately/selection@npm:3.13.2"
+"@react-types/dialog@npm:^3.5.8":
+  version: 3.5.8
+  resolution: "@react-types/dialog@npm:3.5.8"
   dependencies:
-    "@react-stately/collections": ^3.9.0
-    "@react-stately/utils": ^3.7.0
-    "@react-types/shared": ^3.18.1
-    "@swc/helpers": ^0.5.0
+    "@react-types/overlays": "npm:^3.8.5"
+    "@react-types/shared": "npm:^3.22.1"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: bdb5b24ed9400e9d6738c80962c6a8260c4e197a975c5ac23c10df652df4efc910cf69cdd88b30bd8c72d1f565b132872d373e24175910ec2a38b567ab9769a3
+  checksum: 10/c0c387367fd697dff96fa7252cdd1d63fe7c871c93f57ed313c890ef1366e0dd85763966e1e9adc16aa9486414075b349757198572c5c5feb010897f6af9d0bf
   languageName: node
   linkType: hard
 
-"@react-stately/toggle@npm:^3.6.0":
-  version: 3.6.0
-  resolution: "@react-stately/toggle@npm:3.6.0"
+"@react-types/menu@npm:3.9.7":
+  version: 3.9.7
+  resolution: "@react-types/menu@npm:3.9.7"
   dependencies:
-    "@react-stately/utils": ^3.7.0
-    "@react-types/checkbox": ^3.4.4
-    "@react-types/shared": ^3.18.1
-    "@swc/helpers": ^0.5.0
+    "@react-types/overlays": "npm:^3.8.5"
+    "@react-types/shared": "npm:^3.22.1"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: 8ab0bd4e65133019c74f6f30d40f620a48d3c6592f558131553181cd98b4d014fba387d554d412a65ca3b6460294f968d8ded694432635c00e11ee358e497219
+  checksum: 10/97cec66432e6c53909dab25d9a7d5c2646d484caeb6c4eff402f152baf667079ef5774c31098f29d66045a1b0f841b0cd579aaa1948353631739ddf61042a0e7
   languageName: node
   linkType: hard
 
-"@react-stately/tree@npm:3.7.0, @react-stately/tree@npm:^3.7.0":
-  version: 3.7.0
-  resolution: "@react-stately/tree@npm:3.7.0"
+"@react-types/overlays@npm:3.8.5, @react-types/overlays@npm:^3.8.5":
+  version: 3.8.5
+  resolution: "@react-types/overlays@npm:3.8.5"
   dependencies:
-    "@react-stately/collections": ^3.9.0
-    "@react-stately/selection": ^3.13.2
-    "@react-stately/utils": ^3.7.0
-    "@react-types/shared": ^3.18.1
-    "@swc/helpers": ^0.5.0
+    "@react-types/shared": "npm:^3.22.1"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: 407f616775f6d605ac1136534218b37db1117fcee51e0edbcec2082cc5205b86ff64c1bc1a02c6adeaf4fe524506fef1a224cd1264fdb98694fefd180b6378a1
+  checksum: 10/6c952fdbe7724b07cade95e8d3fe6bf61cb6e993b730051c1ada33da2afe246e3124a8981127977cc55f6df32124b049504fda7d19593446895559ca00a9f0b9
   languageName: node
   linkType: hard
 
-"@react-stately/utils@npm:^3.7.0":
-  version: 3.7.0
-  resolution: "@react-stately/utils@npm:3.7.0"
-  dependencies:
-    "@swc/helpers": ^0.5.0
+"@react-types/shared@npm:3.22.1, @react-types/shared@npm:^3.22.1":
+  version: 3.22.1
+  resolution: "@react-types/shared@npm:3.22.1"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: 91feaae770d38a644b9ba3f633afb0560a51fddd153f75c9e486fca86409cb1b6917366859e59d0f62eab3440e530af97452949671e0f90a8a7e5638ba15b263
+  checksum: 10/da5fc6775a79ae8148d80a6cd7025ff0d44462c5b8923cdd072ac34626ac7416049f297ec078ebed29fd49d65fd356f21ede9587517b88f20f9d6236107c1333
   languageName: node
   linkType: hard
 
-"@react-types/button@npm:3.9.0, @react-types/button@npm:^3.7.3":
-  version: 3.9.0
-  resolution: "@react-types/button@npm:3.9.0"
+"@reduxjs/toolkit@npm:1.9.5":
+  version: 1.9.5
+  resolution: "@reduxjs/toolkit@npm:1.9.5"
   dependencies:
-    "@react-types/shared": ^3.21.0
+    immer: "npm:^9.0.21"
+    redux: "npm:^4.2.1"
+    redux-thunk: "npm:^2.4.2"
+    reselect: "npm:^4.1.8"
   peerDependencies:
-    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: 93bd08f894c2a5e0b53b680759326b3151773bf3594f3169ecff012cbfc376e6a0472506f8b2bbf43aa41e37e410d8054dfaee728da9db86287d06adb80c9809
+    react: ^16.9.0 || ^17.0.0 || ^18
+    react-redux: ^7.2.1 || ^8.0.2
+  peerDependenciesMeta:
+    react:
+      optional: true
+    react-redux:
+      optional: true
+  checksum: 10/ac24173de599b830232da5e040ea2b898c34cc803cb219e537ce15c5b914c85dfdb97f8f7015ea4e8cc9110430e2a081766b0dcbc1e71f99639b8bec136d3499
   languageName: node
   linkType: hard
 
-"@react-types/checkbox@npm:^3.4.4":
-  version: 3.4.4
-  resolution: "@react-types/checkbox@npm:3.4.4"
-  dependencies:
-    "@react-types/shared": ^3.18.1
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: 147bd4288ee714ead98433388589673632d92e26a7152032809dbcab9424b219505aabed9ad49770197c5d8cc0e660cad7cb077426eb08f333b333aecacd40fc
+"@remix-run/router@npm:1.14.2":
+  version: 1.14.2
+  resolution: "@remix-run/router@npm:1.14.2"
+  checksum: 10/422844e88b985f1e287301b302c6cf8169c9eea792f80d40464f97b25393bb2e697228ebd7a7b61444d5a51c5873c4a637aad20acde5886a5caf62e833c5ceee
   languageName: node
   linkType: hard
 
-"@react-types/dialog@npm:^3.5.3":
-  version: 3.5.3
-  resolution: "@react-types/dialog@npm:3.5.3"
-  dependencies:
-    "@react-types/overlays": ^3.8.0
-    "@react-types/shared": ^3.18.1
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: 0c9970ee7e37a1fd45a5665b36c94aafdb2856023a71612ed036c692db10d2882f0c736c2f4c1a0e0b6e797aa5a6c101df043e29ae415242d95e2fd420acb74c
+"@remix-run/router@npm:^1.5.0":
+  version: 1.11.0
+  resolution: "@remix-run/router@npm:1.11.0"
+  checksum: 10/629ec578b9dfd3c5cb5de64a0798dd7846ec5ba0351aa66f42b1c65efb43da8f30366be59b825303648965b0df55b638c110949b24ef94fd62e98117fdfb0c0f
   languageName: node
   linkType: hard
 
-"@react-types/menu@npm:3.9.2, @react-types/menu@npm:^3.9.2":
-  version: 3.9.2
-  resolution: "@react-types/menu@npm:3.9.2"
+"@rollup/plugin-image@npm:3.0.3":
+  version: 3.0.3
+  resolution: "@rollup/plugin-image@npm:3.0.3"
   dependencies:
-    "@react-types/overlays": ^3.8.0
-    "@react-types/shared": ^3.18.1
+    "@rollup/pluginutils": "npm:^5.0.1"
+    mini-svg-data-uri: "npm:^1.4.4"
   peerDependencies:
-    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: b8b8b20aa009032200c4034c84d9718ee304add9bb0247b2d7cf0a662e9a97ffb902ab45d2547209e096821578798b8287633c5d52a44d41e507977da8ddd7d8
+    rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: 10/30363d50c3d43fc35add135ce1b9591a69f378d696829724ce229e7c78ed00bc646280c150bd4b872d9359aeee656fae7107876c802dd7374aa71e21cb0af371
   languageName: node
   linkType: hard
 
-"@react-types/overlays@npm:3.8.0, @react-types/overlays@npm:^3.8.0":
-  version: 3.8.0
-  resolution: "@react-types/overlays@npm:3.8.0"
+"@rollup/plugin-node-resolve@npm:15.2.3, @rollup/plugin-node-resolve@npm:^15.2.3":
+  version: 15.2.3
+  resolution: "@rollup/plugin-node-resolve@npm:15.2.3"
   dependencies:
-    "@react-types/shared": ^3.18.1
+    "@rollup/pluginutils": "npm:^5.0.1"
+    "@types/resolve": "npm:1.20.2"
+    deepmerge: "npm:^4.2.2"
+    is-builtin-module: "npm:^3.2.1"
+    is-module: "npm:^1.0.0"
+    resolve: "npm:^1.22.1"
   peerDependencies:
-    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: c409d05548a04f6d8267226d3aa560268d0abbe867d963f8494d599b753820c602dc555c4eb70471f317050e69837dd703723f529bc102a9e7ad394b457ee1b9
+    rollup: ^2.78.0||^3.0.0||^4.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: 10/d36a6792fbe9d8673d3a7c7dc88920be669ac54fba02ac0093d3c00fc9463fce2e87da1906a2651016742709c3d202b367fb49a62acd0d98f18409343f27b8b4
   languageName: node
   linkType: hard
 
-"@react-types/shared@npm:3.21.0, @react-types/shared@npm:^3.18.1, @react-types/shared@npm:^3.21.0":
-  version: 3.21.0
-  resolution: "@react-types/shared@npm:3.21.0"
+"@rollup/plugin-terser@npm:0.4.4":
+  version: 0.4.4
+  resolution: "@rollup/plugin-terser@npm:0.4.4"
+  dependencies:
+    serialize-javascript: "npm:^6.0.1"
+    smob: "npm:^1.0.0"
+    terser: "npm:^5.17.4"
   peerDependencies:
-    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: 1decbd6765c345104225e9245eb865e154fa6b869f6f9ee298f4e0a988333b9d819fb05217eb6ce38c7f3d3f1b81e6aabf14c1ee378acbc2c21a162d1181ac12
+    rollup: ^2.0.0||^3.0.0||^4.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: 10/a5e066ddea55fc8c32188bc8b484cca619713516f10e3a06801881ec98bf37459ca24e5fe8711f93a5fa7f26a6e9132a47bc1a61c01e0b513dfd79a96cdc6eb7
   languageName: node
   linkType: hard
 
-"@reduxjs/toolkit@npm:1.9.5":
-  version: 1.9.5
-  resolution: "@reduxjs/toolkit@npm:1.9.5"
+"@rollup/plugin-typescript@npm:^11.1.6":
+  version: 11.1.6
+  resolution: "@rollup/plugin-typescript@npm:11.1.6"
   dependencies:
-    immer: ^9.0.21
-    redux: ^4.2.1
-    redux-thunk: ^2.4.2
-    reselect: ^4.1.8
+    "@rollup/pluginutils": "npm:^5.1.0"
+    resolve: "npm:^1.22.1"
   peerDependencies:
-    react: ^16.9.0 || ^17.0.0 || ^18
-    react-redux: ^7.2.1 || ^8.0.2
+    rollup: ^2.14.0||^3.0.0||^4.0.0
+    tslib: "*"
+    typescript: ">=3.7.0"
   peerDependenciesMeta:
-    react:
+    rollup:
       optional: true
-    react-redux:
+    tslib:
       optional: true
-  checksum: 54672c5593d05208af577e948a338f23128d3aa01ef056ab0d40bcfa14400cf6566be99e11715388f12c1d7655cdf7c5c6b63cb92eb0fecf996c454a46a3914c
+  checksum: 10/4ae4d6cfc929393171288df2f18b5eb837fa53d8689118d9661b3064567341f6f6cf8389af55f1d5f015e3682abf30a64ab609fdf75ecb5a84224505e407eb69
   languageName: node
   linkType: hard
 
-"@remix-run/router@npm:1.5.0, @remix-run/router@npm:^1.5.0":
-  version: 1.5.0
-  resolution: "@remix-run/router@npm:1.5.0"
-  checksum: 9c510c174af1553edd1f039ba16e7e3d34e04d53b3bac18814660e31cd0c48297ea4291ff86d0736b560123ebc63ecb62fa525829181d16a8dad15270d6672d7
+"@rollup/pluginutils@npm:^3.0.9":
+  version: 3.1.0
+  resolution: "@rollup/pluginutils@npm:3.1.0"
+  dependencies:
+    "@types/estree": "npm:0.0.39"
+    estree-walker: "npm:^1.0.1"
+    picomatch: "npm:^2.2.2"
+  peerDependencies:
+    rollup: ^1.20.0||^2.0.0
+  checksum: 10/3b69f02893eea42455fb97b81f612ac6bfadf94ac73bebd481ea13e90a693eef52c163210a095b12e574a25603af5e55f86a020889019167f331aa8dd3ff30e0
   languageName: node
   linkType: hard
 
-"@rollup/plugin-commonjs@npm:25.0.2":
-  version: 25.0.2
-  resolution: "@rollup/plugin-commonjs@npm:25.0.2"
+"@rollup/pluginutils@npm:^4.1.1":
+  version: 4.2.1
+  resolution: "@rollup/pluginutils@npm:4.2.1"
   dependencies:
-    "@rollup/pluginutils": ^5.0.1
-    commondir: ^1.0.1
-    estree-walker: ^2.0.2
-    glob: ^8.0.3
-    is-reference: 1.2.1
-    magic-string: ^0.27.0
-  peerDependencies:
-    rollup: ^2.68.0||^3.0.0
-  peerDependenciesMeta:
-    rollup:
-      optional: true
-  checksum: d8c4e22d264c5b9286f697653c2f9288149c0fe0169d49b83b5dc8b542f96cc0b9113da3f30d241f2f277513fbf3f8c207d95def5559eb3800190f1872add794
+    estree-walker: "npm:^2.0.1"
+    picomatch: "npm:^2.2.2"
+  checksum: 10/503a6f0a449e11a2873ac66cfdfb9a3a0b77ffa84c5cad631f5e4bc1063c850710e8d5cd5dab52477c0d66cda2ec719865726dbe753318cd640bab3fff7ca476
   languageName: node
   linkType: hard
 
-"@rollup/plugin-json@npm:6.0.0":
-  version: 6.0.0
-  resolution: "@rollup/plugin-json@npm:6.0.0"
+"@rollup/pluginutils@npm:^5.0.1, @rollup/pluginutils@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "@rollup/pluginutils@npm:5.1.0"
   dependencies:
-    "@rollup/pluginutils": ^5.0.1
+    "@types/estree": "npm:^1.0.0"
+    estree-walker: "npm:^2.0.2"
+    picomatch: "npm:^2.3.1"
   peerDependencies:
-    rollup: ^1.20.0||^2.0.0||^3.0.0
+    rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
   peerDependenciesMeta:
     rollup:
       optional: true
-  checksum: 77cfc941edaf77a5307977704ffaba706d83bea66f265b2b68f14be2a0af6d08b0fb1b04fdd773146c84cc70938ff64b00ae946808fd6ac057058af824d78128
+  checksum: 10/abb15eaec5b36f159ec351b48578401bedcefdfa371d24a914cfdbb1e27d0ebfbf895299ec18ccc343d247e71f2502cba21202bc1362d7ef27d5ded699e5c2b2
   languageName: node
   linkType: hard
 
-"@rollup/plugin-node-resolve@npm:15.2.3":
-  version: 15.2.3
-  resolution: "@rollup/plugin-node-resolve@npm:15.2.3"
+"@rtsao/plugin-proposal-class-properties@npm:7.0.1-patch.1":
+  version: 7.0.1-patch.1
+  resolution: "@rtsao/plugin-proposal-class-properties@npm:7.0.1-patch.1"
   dependencies:
-    "@rollup/pluginutils": ^5.0.1
-    "@types/resolve": 1.20.2
-    deepmerge: ^4.2.2
-    is-builtin-module: ^3.2.1
-    is-module: ^1.0.0
-    resolve: ^1.22.1
+    "@babel/helper-function-name": "npm:^7.0.0"
+    "@babel/helper-member-expression-to-functions": "npm:^7.0.0"
+    "@babel/helper-optimise-call-expression": "npm:^7.0.0"
+    "@babel/helper-plugin-utils": "npm:^7.0.0"
+    "@babel/helper-replace-supers": "npm:^7.0.0"
+    "@babel/plugin-syntax-class-properties": "npm:^7.0.0"
   peerDependencies:
-    rollup: ^2.78.0||^3.0.0||^4.0.0
-  peerDependenciesMeta:
-    rollup:
-      optional: true
-  checksum: 730f32c2f8fdddff07cf0fca86a5dac7c475605fb96930197a868c066e62eb6388c557545e4f7d99b7a283411754c9fbf98944ab086b6074e04fc1292e234aa8
+    "@babel/core": ^7.0.0-0
+  checksum: 10/81875f96d900f30189c216d4186d8e5383b7e5026f68feb7b3bd43731cf8a4520159582c0002cf81affd16861d03588addc408a02443ce184d8ec05201c508a0
   languageName: node
   linkType: hard
 
-"@rollup/pluginutils@npm:^3.0.9":
-  version: 3.1.0
-  resolution: "@rollup/pluginutils@npm:3.1.0"
+"@scena/dragscroll@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "@scena/dragscroll@npm:1.4.0"
+  dependencies:
+    "@daybrush/utils": "npm:^1.6.0"
+    "@scena/event-emitter": "npm:^1.0.2"
+  checksum: 10/97b4df54b7cc84256a91765eae72e09c2707f4477e30d1074865ced2c8bba1f7cac0d9d601fae642c447a467cb3e476eac46c9ab7e5965207bcba720c12bcb73
+  languageName: node
+  linkType: hard
+
+"@scena/event-emitter@npm:^1.0.2, @scena/event-emitter@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "@scena/event-emitter@npm:1.0.5"
+  dependencies:
+    "@daybrush/utils": "npm:^1.1.1"
+  checksum: 10/986e68f664f20d2bfee035b864ca4e0cffed7fc370b8624d8760e6e1ba905ee77d0f816057dbe7e3dd8e783d7d2a902279ca4726d65e3e0fc06f9d1d2e04e4a4
+  languageName: node
+  linkType: hard
+
+"@scena/matrix@npm:^1.0.0, @scena/matrix@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "@scena/matrix@npm:1.1.1"
+  dependencies:
+    "@daybrush/utils": "npm:^1.4.0"
+  checksum: 10/713bb4178d1df4f739f7c1d29bae59be7bcde15b2d4ad12faea5b618ee05462db3302a261f2305e6af4cd2f9975b3b8c7c0968fd519b590dc481221914b9fad0
+  languageName: node
+  linkType: hard
+
+"@segment/localstorage-retry@npm:1.3.0":
+  version: 1.3.0
+  resolution: "@segment/localstorage-retry@npm:1.3.0"
   dependencies:
-    "@types/estree": 0.0.39
-    estree-walker: ^1.0.1
-    picomatch: ^2.2.2
-  peerDependencies:
-    rollup: ^1.20.0||^2.0.0
-  checksum: 8be16e27863c219edbb25a4e6ec2fe0e1e451d9e917b6a43cf2ae5bc025a6b8faaa40f82a6e53b66d0de37b58ff472c6c3d57a83037ae635041f8df959d6d9aa
+    "@lukeed/uuid": "npm:^2.0.0"
+    "@ndhoule/each": "npm:^2.0.1"
+    "@ndhoule/keys": "npm:^2.0.0"
+    component-emitter: "npm:^1.2.1"
+    debug: "npm:^0.7.4"
+  checksum: 10/56e27b8d9bb22e3ee60d65d0c50246d809b46131fd177f1ca76e1c0aa1a41d060f8c1d9016199061ff56e844054dffe6e078e4826e47dcbdc6a85a6c444570ac
   languageName: node
   linkType: hard
 
-"@rollup/pluginutils@npm:^5.0.1":
-  version: 5.0.2
-  resolution: "@rollup/pluginutils@npm:5.0.2"
+"@sigstore/bundle@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@sigstore/bundle@npm:1.1.0"
   dependencies:
-    "@types/estree": ^1.0.0
-    estree-walker: ^2.0.2
-    picomatch: ^2.3.1
-  peerDependencies:
-    rollup: ^1.20.0||^2.0.0||^3.0.0
-  peerDependenciesMeta:
-    rollup:
-      optional: true
-  checksum: edea15e543bebc7dcac3b0ac8bc7b8e8e6dbd46e2864dbe5dd28072de1fbd5b0e10d545a610c0edaa178e8a7ac432e2a2a52e547ece1308471412caba47db8ce
+    "@sigstore/protobuf-specs": "npm:^0.2.0"
+  checksum: 10/79e6cc4cc1858bccbd852dee85d95c66c891b109ea415d5b7b00b6d73791c4f6064c40d09b5aa3f9ec6c19b3145c5cfeece02302f912c186ff0a769667bb9491
   languageName: node
   linkType: hard
 
-"@rtsao/plugin-proposal-class-properties@npm:7.0.1-patch.1":
-  version: 7.0.1-patch.1
-  resolution: "@rtsao/plugin-proposal-class-properties@npm:7.0.1-patch.1"
+"@sigstore/bundle@npm:^2.1.1":
+  version: 2.1.1
+  resolution: "@sigstore/bundle@npm:2.1.1"
   dependencies:
-    "@babel/helper-function-name": ^7.0.0
-    "@babel/helper-member-expression-to-functions": ^7.0.0
-    "@babel/helper-optimise-call-expression": ^7.0.0
-    "@babel/helper-plugin-utils": ^7.0.0
-    "@babel/helper-replace-supers": ^7.0.0
-    "@babel/plugin-syntax-class-properties": ^7.0.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 9907fc79b091d24cb3aee6451e80236238f200afd498b47dbd62b4380b1f4bc8e85bd6b99e29c4b5a2c540b93a49f09539acab4270cde9294d93ac4c4df7c365
+    "@sigstore/protobuf-specs": "npm:^0.2.1"
+  checksum: 10/e29916ad3f37d4e1c5b98d7a614cddb1301d4bdfa5ebe0cb2733f4cbc78710b8320aa62ad033e4702c5ec7bcd9c371278b7934ce45f3df71bb3ffa07f5502742
   languageName: node
   linkType: hard
 
-"@scena/dragscroll@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "@scena/dragscroll@npm:1.4.0"
-  dependencies:
-    "@daybrush/utils": ^1.6.0
-    "@scena/event-emitter": ^1.0.2
-  checksum: 90c75e3e858b159fd856a6e6fc071c5d0975174f4d9201a53bca1ae86748d3fa1e302ed9195532162d7bb08ac91c3a0040d863cf6a8ebe4ca18739eef65f76f5
+"@sigstore/core@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "@sigstore/core@npm:0.2.0"
+  checksum: 10/6a9e7f0dcbaad3e330207f6ce0aa0cb229416eb8ece71a31e427f71f021ce25ef8230faaca93c8abf428dab391f63ef7a08c8a88e0237dee3b15daf35c53a86a
   languageName: node
   linkType: hard
 
-"@scena/event-emitter@npm:^1.0.2, @scena/event-emitter@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "@scena/event-emitter@npm:1.0.5"
+"@sigstore/protobuf-specs@npm:^0.2.0, @sigstore/protobuf-specs@npm:^0.2.1":
+  version: 0.2.1
+  resolution: "@sigstore/protobuf-specs@npm:0.2.1"
+  checksum: 10/cb0b9d9b3ef44a9f1729d85616c5d7c2ebccde303836a5a345ec33a500c7bd5205ffcc31332e0a90831cccc581dafbdf5b868f050c84270c8df6a4a6f2ce0bcb
+  languageName: node
+  linkType: hard
+
+"@sigstore/sign@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@sigstore/sign@npm:1.0.0"
   dependencies:
-    "@daybrush/utils": ^1.1.1
-  checksum: 400e0f6ab847aff6c1a6a6b62a0187193bdf9dedbe002ac31764b104bddb3c3bd1631df4252f52aa1677879842e96359aca46e025ed78d53c01facf8c76a5559
+    "@sigstore/bundle": "npm:^1.1.0"
+    "@sigstore/protobuf-specs": "npm:^0.2.0"
+    make-fetch-happen: "npm:^11.0.1"
+  checksum: 10/44f23fc5eef5b160c0c36c6b19863039bbf375834eeca1ce7f711c82eb5a022174a475f0c06594f17732473c6878f2512f37e65949b7d33af3b2e2773f1bd34f
   languageName: node
   linkType: hard
 
-"@scena/matrix@npm:^1.0.0, @scena/matrix@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "@scena/matrix@npm:1.1.1"
+"@sigstore/sign@npm:^2.2.1":
+  version: 2.2.1
+  resolution: "@sigstore/sign@npm:2.2.1"
   dependencies:
-    "@daybrush/utils": ^1.4.0
-  checksum: e96aeab712e5fac4a437b1c1c2f5b445e47050c8b94dac2354bbece7d298b46bab5ea0049a24b360385f4edef8010538ee8d6f0ead570fbb83fdad9fe7e7b180
+    "@sigstore/bundle": "npm:^2.1.1"
+    "@sigstore/core": "npm:^0.2.0"
+    "@sigstore/protobuf-specs": "npm:^0.2.1"
+    make-fetch-happen: "npm:^13.0.0"
+  checksum: 10/a829c479418a86f9919d85aec0349fd4a9c297aaacc4e838580bc9b5ba9a372fb318b4829b78cc5c9e56b8fd1b7d11a06e31384eff55bd0813f5d0993f5fb9db
   languageName: node
   linkType: hard
 
-"@sideway/address@npm:^4.1.3":
-  version: 4.1.4
-  resolution: "@sideway/address@npm:4.1.4"
+"@sigstore/tuf@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "@sigstore/tuf@npm:1.0.3"
   dependencies:
-    "@hapi/hoek": ^9.0.0
-  checksum: b9fca2a93ac2c975ba12e0a6d97853832fb1f4fb02393015e012b47fa916a75ca95102d77214b2a29a2784740df2407951af8c5dde054824c65577fd293c4cdb
+    "@sigstore/protobuf-specs": "npm:^0.2.0"
+    tuf-js: "npm:^1.1.7"
+  checksum: 10/5aa1cdea05fabb78232f802821f7e8ee9db3352719b325f2f703f940aac75fc2e71d89cfbd3623ef6b0429e125a5c6145c1fc8ede8d3d5af3affcb71c6453c7b
   languageName: node
   linkType: hard
 
-"@sideway/formula@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@sideway/formula@npm:3.0.1"
-  checksum: e4beeebc9dbe2ff4ef0def15cec0165e00d1612e3d7cea0bc9ce5175c3263fc2c818b679bd558957f49400ee7be9d4e5ac90487e1625b4932e15c4aa7919c57a
+"@sigstore/tuf@npm:^2.3.0":
+  version: 2.3.0
+  resolution: "@sigstore/tuf@npm:2.3.0"
+  dependencies:
+    "@sigstore/protobuf-specs": "npm:^0.2.1"
+    tuf-js: "npm:^2.2.0"
+  checksum: 10/c4a9e87c1d4b48de87526fd37b154382dd7caf6fe784329b829270ed431741bb1a4ecde6d8aa2bbe72124a24ef1b616c098a4b036cd04965e02f039de11acd4f
   languageName: node
   linkType: hard
 
-"@sideway/pinpoint@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@sideway/pinpoint@npm:2.0.0"
-  checksum: 0f4491e5897fcf5bf02c46f5c359c56a314e90ba243f42f0c100437935daa2488f20482f0f77186bd6bf43345095a95d8143ecf8b1f4d876a7bc0806aba9c3d2
+"@sigstore/verify@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "@sigstore/verify@npm:0.1.0"
+  dependencies:
+    "@sigstore/bundle": "npm:^2.1.1"
+    "@sigstore/core": "npm:^0.2.0"
+    "@sigstore/protobuf-specs": "npm:^0.2.1"
+  checksum: 10/9dc208a4d0ace4d836aa1717cd02236b480d883e2a7a4f40fb87ccb0e7b7e6d4805c5628bb5cc3aec392bafe866e59f3ce55c2b16ef9ed224ae6a60c07984e65
   languageName: node
   linkType: hard
 
 "@sinclair/typebox@npm:^0.27.8":
   version: 0.27.8
   resolution: "@sinclair/typebox@npm:0.27.8"
-  checksum: 00bd7362a3439021aa1ea51b0e0d0a0e8ca1351a3d54c606b115fdcc49b51b16db6e5f43b4fe7a28c38688523e22a94d49dd31168868b655f0d4d50f032d07a1
+  checksum: 10/297f95ff77c82c54de8c9907f186076e715ff2621c5222ba50b8d40a170661c0c5242c763cba2a4791f0f91cb1d8ffa53ea1d7294570cf8cd4694c0e383e484d
+  languageName: node
+  linkType: hard
+
+"@sindresorhus/merge-streams@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@sindresorhus/merge-streams@npm:1.0.0"
+  checksum: 10/453c2a28164113a5ec4fd23ba636e291a4112f6ee9e91cd5476b9a96e0fc9ee5ff40d405fe81bbf284c9773b7ed718a3a0f31df7895a0efd413b1f9775d154fe
   languageName: node
   linkType: hard
 
@@ -6977,8 +7687,8 @@ __metadata:
   version: 3.0.0
   resolution: "@sinonjs/commons@npm:3.0.0"
   dependencies:
-    type-detect: 4.0.8
-  checksum: b4b5b73d4df4560fb8c0c7b38c7ad4aeabedd362f3373859d804c988c725889cde33550e4bcc7cd316a30f5152a2d1d43db71b6d0c38f5feef71fd8d016763f8
+    type-detect: "npm:4.0.8"
+  checksum: 10/086720ae0bc370829322df32612205141cdd44e592a8a9ca97197571f8f970352ea39d3bda75b347c43789013ddab36b34b59e40380a49bdae1c2df3aa85fe4f
   languageName: node
   linkType: hard
 
@@ -6986,8 +7696,8 @@ __metadata:
   version: 10.3.0
   resolution: "@sinonjs/fake-timers@npm:10.3.0"
   dependencies:
-    "@sinonjs/commons": ^3.0.0
-  checksum: 614d30cb4d5201550c940945d44c9e0b6d64a888ff2cd5b357f95ad6721070d6b8839cd10e15b76bf5e14af0bcc1d8f9ec00d49a46318f1f669a4bec1d7f3148
+    "@sinonjs/commons": "npm:^3.0.0"
+  checksum: 10/78155c7bd866a85df85e22028e046b8d46cf3e840f72260954f5e3ed5bd97d66c595524305a6841ffb3f681a08f6e5cef572a2cce5442a8a232dc29fb409b83e
   languageName: node
   linkType: hard
 
@@ -6995,19 +7705,19 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/addon-a11y@npm:7.4.5"
   dependencies:
-    "@storybook/addon-highlight": 7.4.5
-    "@storybook/channels": 7.4.5
-    "@storybook/client-logger": 7.4.5
-    "@storybook/components": 7.4.5
-    "@storybook/core-events": 7.4.5
-    "@storybook/global": ^5.0.0
-    "@storybook/manager-api": 7.4.5
-    "@storybook/preview-api": 7.4.5
-    "@storybook/theming": 7.4.5
-    "@storybook/types": 7.4.5
-    axe-core: ^4.2.0
-    lodash: ^4.17.21
-    react-resize-detector: ^7.1.2
+    "@storybook/addon-highlight": "npm:7.4.5"
+    "@storybook/channels": "npm:7.4.5"
+    "@storybook/client-logger": "npm:7.4.5"
+    "@storybook/components": "npm:7.4.5"
+    "@storybook/core-events": "npm:7.4.5"
+    "@storybook/global": "npm:^5.0.0"
+    "@storybook/manager-api": "npm:7.4.5"
+    "@storybook/preview-api": "npm:7.4.5"
+    "@storybook/theming": "npm:7.4.5"
+    "@storybook/types": "npm:7.4.5"
+    axe-core: "npm:^4.2.0"
+    lodash: "npm:^4.17.21"
+    react-resize-detector: "npm:^7.1.2"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -7016,7 +7726,7 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-  checksum: 4c4013d3221b62d4870f3ab7e91e278d464f2ef267253e56a9099eaccd7f90393f6c794e3b616bdfcf06ad27ae51d13b3b29ca9dd0c060d84c214e3706835652
+  checksum: 10/945ddcdeecd2c1bd42a01561363764cc97faa2e12c1282179a4e4fe30794204d329ea77d616a5625e35013c1d1c4edc2e741ff4ee79e068b8911bd4b46fd55b4
   languageName: node
   linkType: hard
 
@@ -7024,22 +7734,22 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/addon-actions@npm:7.4.5"
   dependencies:
-    "@storybook/client-logger": 7.4.5
-    "@storybook/components": 7.4.5
-    "@storybook/core-events": 7.4.5
-    "@storybook/global": ^5.0.0
-    "@storybook/manager-api": 7.4.5
-    "@storybook/preview-api": 7.4.5
-    "@storybook/theming": 7.4.5
-    "@storybook/types": 7.4.5
-    dequal: ^2.0.2
-    lodash: ^4.17.21
-    polished: ^4.2.2
-    prop-types: ^15.7.2
-    react-inspector: ^6.0.0
-    telejson: ^7.2.0
-    ts-dedent: ^2.0.0
-    uuid: ^9.0.0
+    "@storybook/client-logger": "npm:7.4.5"
+    "@storybook/components": "npm:7.4.5"
+    "@storybook/core-events": "npm:7.4.5"
+    "@storybook/global": "npm:^5.0.0"
+    "@storybook/manager-api": "npm:7.4.5"
+    "@storybook/preview-api": "npm:7.4.5"
+    "@storybook/theming": "npm:7.4.5"
+    "@storybook/types": "npm:7.4.5"
+    dequal: "npm:^2.0.2"
+    lodash: "npm:^4.17.21"
+    polished: "npm:^4.2.2"
+    prop-types: "npm:^15.7.2"
+    react-inspector: "npm:^6.0.0"
+    telejson: "npm:^7.2.0"
+    ts-dedent: "npm:^2.0.0"
+    uuid: "npm:^9.0.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -7048,7 +7758,7 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-  checksum: c6b2603d31302bcaf02521ffb177cc9bcf89030cad1035a3bc6c1a0b38c6c65aa5c3e45c4cf5cb85c1402a013f6530ee95e4d9cf8f16d83e8e5e9b3737bbced9
+  checksum: 10/95700d2b114ba4653b622eac689982338f567bf54815ccba3f970c7be356d71a0243062872a85198d0b709e912e1ebc89bc3db574c4741921a93e810cd2b77c1
   languageName: node
   linkType: hard
 
@@ -7056,16 +7766,16 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/addon-backgrounds@npm:7.4.5"
   dependencies:
-    "@storybook/client-logger": 7.4.5
-    "@storybook/components": 7.4.5
-    "@storybook/core-events": 7.4.5
-    "@storybook/global": ^5.0.0
-    "@storybook/manager-api": 7.4.5
-    "@storybook/preview-api": 7.4.5
-    "@storybook/theming": 7.4.5
-    "@storybook/types": 7.4.5
-    memoizerific: ^1.11.3
-    ts-dedent: ^2.0.0
+    "@storybook/client-logger": "npm:7.4.5"
+    "@storybook/components": "npm:7.4.5"
+    "@storybook/core-events": "npm:7.4.5"
+    "@storybook/global": "npm:^5.0.0"
+    "@storybook/manager-api": "npm:7.4.5"
+    "@storybook/preview-api": "npm:7.4.5"
+    "@storybook/theming": "npm:7.4.5"
+    "@storybook/types": "npm:7.4.5"
+    memoizerific: "npm:^1.11.3"
+    ts-dedent: "npm:^2.0.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -7074,7 +7784,7 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-  checksum: e5d629278cb351bc0b0c07abacb0315f90826a50ac31f5766fc3166278bfecaa430df1719f1469decde37d3452b829d79213345e33d4b4305b44bc45ba206c16
+  checksum: 10/0331b1f02fb738e8671c1bb1485a2caec10d7537bf99fba50ac30d08e21591cdd4c7e8c653bab63ae7a689e6d6d3f8b74728d1003d3b1de5555921944ccda1e8
   languageName: node
   linkType: hard
 
@@ -7082,18 +7792,18 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/addon-controls@npm:7.4.5"
   dependencies:
-    "@storybook/blocks": 7.4.5
-    "@storybook/client-logger": 7.4.5
-    "@storybook/components": 7.4.5
-    "@storybook/core-common": 7.4.5
-    "@storybook/core-events": 7.4.5
-    "@storybook/manager-api": 7.4.5
-    "@storybook/node-logger": 7.4.5
-    "@storybook/preview-api": 7.4.5
-    "@storybook/theming": 7.4.5
-    "@storybook/types": 7.4.5
-    lodash: ^4.17.21
-    ts-dedent: ^2.0.0
+    "@storybook/blocks": "npm:7.4.5"
+    "@storybook/client-logger": "npm:7.4.5"
+    "@storybook/components": "npm:7.4.5"
+    "@storybook/core-common": "npm:7.4.5"
+    "@storybook/core-events": "npm:7.4.5"
+    "@storybook/manager-api": "npm:7.4.5"
+    "@storybook/node-logger": "npm:7.4.5"
+    "@storybook/preview-api": "npm:7.4.5"
+    "@storybook/theming": "npm:7.4.5"
+    "@storybook/types": "npm:7.4.5"
+    lodash: "npm:^4.17.21"
+    ts-dedent: "npm:^2.0.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -7102,7 +7812,7 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-  checksum: c8af5ca66bef246c65ffe051115af6a0a02c4267b62e471a5c7686529f63454a481dc3b8c0aeb6d7604cbd6e8716abefe081d5b767cec79d66c718b81a0eddcd
+  checksum: 10/80502fcb8834b8e6dc5ff536d9d96873e887dafe1c277951fe6bd2bdeee3dfd71c29332cf3ebae761323cb3899b0a594e9977f13db8d5b5ac90176860fe8baff
   languageName: node
   linkType: hard
 
@@ -7110,29 +7820,29 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/addon-docs@npm:7.4.5"
   dependencies:
-    "@jest/transform": ^29.3.1
-    "@mdx-js/react": ^2.1.5
-    "@storybook/blocks": 7.4.5
-    "@storybook/client-logger": 7.4.5
-    "@storybook/components": 7.4.5
-    "@storybook/csf-plugin": 7.4.5
-    "@storybook/csf-tools": 7.4.5
-    "@storybook/global": ^5.0.0
-    "@storybook/mdx2-csf": ^1.0.0
-    "@storybook/node-logger": 7.4.5
-    "@storybook/postinstall": 7.4.5
-    "@storybook/preview-api": 7.4.5
-    "@storybook/react-dom-shim": 7.4.5
-    "@storybook/theming": 7.4.5
-    "@storybook/types": 7.4.5
-    fs-extra: ^11.1.0
-    remark-external-links: ^8.0.0
-    remark-slug: ^6.0.0
-    ts-dedent: ^2.0.0
+    "@jest/transform": "npm:^29.3.1"
+    "@mdx-js/react": "npm:^2.1.5"
+    "@storybook/blocks": "npm:7.4.5"
+    "@storybook/client-logger": "npm:7.4.5"
+    "@storybook/components": "npm:7.4.5"
+    "@storybook/csf-plugin": "npm:7.4.5"
+    "@storybook/csf-tools": "npm:7.4.5"
+    "@storybook/global": "npm:^5.0.0"
+    "@storybook/mdx2-csf": "npm:^1.0.0"
+    "@storybook/node-logger": "npm:7.4.5"
+    "@storybook/postinstall": "npm:7.4.5"
+    "@storybook/preview-api": "npm:7.4.5"
+    "@storybook/react-dom-shim": "npm:7.4.5"
+    "@storybook/theming": "npm:7.4.5"
+    "@storybook/types": "npm:7.4.5"
+    fs-extra: "npm:^11.1.0"
+    remark-external-links: "npm:^8.0.0"
+    remark-slug: "npm:^6.0.0"
+    ts-dedent: "npm:^2.0.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 8110acf52b73885f14acf3bd596a89385d4ca839d6d5f6ddaf8157bee622b0ba38d58d5061b9eadfa76d69143936e66732fa3ba2a328735fd8301d51b7e0514b
+  checksum: 10/0c66b537c8dcba0e5f5b4021f3d01783a225a75e7adc74f6f9f5f814d833d38b3baf0037b23f0446f5723cdc644e21c43da72506c64232e52bebd739e42f517d
   languageName: node
   linkType: hard
 
@@ -7140,24 +7850,24 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/addon-essentials@npm:7.4.5"
   dependencies:
-    "@storybook/addon-actions": 7.4.5
-    "@storybook/addon-backgrounds": 7.4.5
-    "@storybook/addon-controls": 7.4.5
-    "@storybook/addon-docs": 7.4.5
-    "@storybook/addon-highlight": 7.4.5
-    "@storybook/addon-measure": 7.4.5
-    "@storybook/addon-outline": 7.4.5
-    "@storybook/addon-toolbars": 7.4.5
-    "@storybook/addon-viewport": 7.4.5
-    "@storybook/core-common": 7.4.5
-    "@storybook/manager-api": 7.4.5
-    "@storybook/node-logger": 7.4.5
-    "@storybook/preview-api": 7.4.5
-    ts-dedent: ^2.0.0
+    "@storybook/addon-actions": "npm:7.4.5"
+    "@storybook/addon-backgrounds": "npm:7.4.5"
+    "@storybook/addon-controls": "npm:7.4.5"
+    "@storybook/addon-docs": "npm:7.4.5"
+    "@storybook/addon-highlight": "npm:7.4.5"
+    "@storybook/addon-measure": "npm:7.4.5"
+    "@storybook/addon-outline": "npm:7.4.5"
+    "@storybook/addon-toolbars": "npm:7.4.5"
+    "@storybook/addon-viewport": "npm:7.4.5"
+    "@storybook/core-common": "npm:7.4.5"
+    "@storybook/manager-api": "npm:7.4.5"
+    "@storybook/node-logger": "npm:7.4.5"
+    "@storybook/preview-api": "npm:7.4.5"
+    ts-dedent: "npm:^2.0.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 3e09e0d9a583363ae7a8281cb9bc0a7e32b083d680ba58b47a594a94727513ffb0a92841dd0c0e1462c4645e3679d63a27f408ed496b143610ae36afe658f16d
+  checksum: 10/f1bf5dd8ba871c5a7b2074657cceff0424e4beecb1266df6f30824deba9a8d2d48c3090735087ee66b85d15e15148f317d73cf6631d41fe2cd13bef6cf4f4325
   languageName: node
   linkType: hard
 
@@ -7165,10 +7875,10 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/addon-highlight@npm:7.4.5"
   dependencies:
-    "@storybook/core-events": 7.4.5
-    "@storybook/global": ^5.0.0
-    "@storybook/preview-api": 7.4.5
-  checksum: 2621da0b77df2539ce5c4f368f4dc1b7bfbc6e64bec69c05c432767fa89e274e3d6756877359288b62c7e5baea49e04ea2cc551ea21dbad9a0e1fbbf8bb8f94b
+    "@storybook/core-events": "npm:7.4.5"
+    "@storybook/global": "npm:^5.0.0"
+    "@storybook/preview-api": "npm:7.4.5"
+  checksum: 10/7ef1be9257fb6999ec319c696ca0b297add4e475eb689b4a36dfb8df1f6f3132de03170fde1dc7496f71be5162f274cc5a267e20a5a992692309c75fb9d08a67
   languageName: node
   linkType: hard
 
@@ -7176,14 +7886,14 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/addon-measure@npm:7.4.5"
   dependencies:
-    "@storybook/client-logger": 7.4.5
-    "@storybook/components": 7.4.5
-    "@storybook/core-events": 7.4.5
-    "@storybook/global": ^5.0.0
-    "@storybook/manager-api": 7.4.5
-    "@storybook/preview-api": 7.4.5
-    "@storybook/types": 7.4.5
-    tiny-invariant: ^1.3.1
+    "@storybook/client-logger": "npm:7.4.5"
+    "@storybook/components": "npm:7.4.5"
+    "@storybook/core-events": "npm:7.4.5"
+    "@storybook/global": "npm:^5.0.0"
+    "@storybook/manager-api": "npm:7.4.5"
+    "@storybook/preview-api": "npm:7.4.5"
+    "@storybook/types": "npm:7.4.5"
+    tiny-invariant: "npm:^1.3.1"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -7192,7 +7902,7 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-  checksum: d8989a39af1d3154fe79531c664f13be0b35da3dee969b2a7de45618a06a5a78bee06ac79ef1631d8ab9d9aeb3dca8ce965d39479dbe02d64830bd6a502d9713
+  checksum: 10/b4fd05c4145df0a0332e746620497b52a6426d9632bea9cf1e2acb5920876323f081d23c5bb110ec74ed96a81a7073ed18af18e100d9d0671ead9a2d818088f0
   languageName: node
   linkType: hard
 
@@ -7200,14 +7910,14 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/addon-outline@npm:7.4.5"
   dependencies:
-    "@storybook/client-logger": 7.4.5
-    "@storybook/components": 7.4.5
-    "@storybook/core-events": 7.4.5
-    "@storybook/global": ^5.0.0
-    "@storybook/manager-api": 7.4.5
-    "@storybook/preview-api": 7.4.5
-    "@storybook/types": 7.4.5
-    ts-dedent: ^2.0.0
+    "@storybook/client-logger": "npm:7.4.5"
+    "@storybook/components": "npm:7.4.5"
+    "@storybook/core-events": "npm:7.4.5"
+    "@storybook/global": "npm:^5.0.0"
+    "@storybook/manager-api": "npm:7.4.5"
+    "@storybook/preview-api": "npm:7.4.5"
+    "@storybook/types": "npm:7.4.5"
+    ts-dedent: "npm:^2.0.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -7216,7 +7926,7 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-  checksum: bf7331aa240af61bf539efa6132d2a1246dcac661bafd5dd8ecdc2fdb99bceee01c348279a5787ab68d4d6f0d7645766ba17627e3f3dba23659a745a02d84c5e
+  checksum: 10/16b4ab12a6bc1ed173575acf963c21c3e2fe64715278f0d4ccfbd071d9b27d5d260091e2ca814994fdc3653920e25de70bd6b01e191f7f138ab5e94389a5320b
   languageName: node
   linkType: hard
 
@@ -7224,17 +7934,17 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/addon-storysource@npm:7.4.5"
   dependencies:
-    "@storybook/client-logger": 7.4.5
-    "@storybook/components": 7.4.5
-    "@storybook/manager-api": 7.4.5
-    "@storybook/preview-api": 7.4.5
-    "@storybook/router": 7.4.5
-    "@storybook/source-loader": 7.4.5
-    "@storybook/theming": 7.4.5
-    estraverse: ^5.2.0
-    prop-types: ^15.7.2
-    react-syntax-highlighter: ^15.5.0
-    tiny-invariant: ^1.3.1
+    "@storybook/client-logger": "npm:7.4.5"
+    "@storybook/components": "npm:7.4.5"
+    "@storybook/manager-api": "npm:7.4.5"
+    "@storybook/preview-api": "npm:7.4.5"
+    "@storybook/router": "npm:7.4.5"
+    "@storybook/source-loader": "npm:7.4.5"
+    "@storybook/theming": "npm:7.4.5"
+    estraverse: "npm:^5.2.0"
+    prop-types: "npm:^15.7.2"
+    react-syntax-highlighter: "npm:^15.5.0"
+    tiny-invariant: "npm:^1.3.1"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -7243,7 +7953,7 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-  checksum: e145fbc8fce4c58e4ee3b20d0049c1eb473242145cd474d7cb1a7ba65cdd14a720edd86e9224f39e3a78d2f01bc2e2e90afa4281ecff9b63681847a9667f1d3b
+  checksum: 10/74b86e6bd230c382ea9c788c4d29b2d342feb05ff39dc9bfaa757cde272ee66e4f546de3b709897e452840da45a8b54441975fdaea2da4daee46727dcbc81532
   languageName: node
   linkType: hard
 
@@ -7251,11 +7961,11 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/addon-toolbars@npm:7.4.5"
   dependencies:
-    "@storybook/client-logger": 7.4.5
-    "@storybook/components": 7.4.5
-    "@storybook/manager-api": 7.4.5
-    "@storybook/preview-api": 7.4.5
-    "@storybook/theming": 7.4.5
+    "@storybook/client-logger": "npm:7.4.5"
+    "@storybook/components": "npm:7.4.5"
+    "@storybook/manager-api": "npm:7.4.5"
+    "@storybook/preview-api": "npm:7.4.5"
+    "@storybook/theming": "npm:7.4.5"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -7264,7 +7974,7 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-  checksum: 922f126b1db30b2f5b473374c4e977d32dd26b0ec3e04517ca42f0929328affa579e375f477338d7a940b427742ef244428c9549687dcd08af4dc91ee11afe4d
+  checksum: 10/e038eb801b658cb6681baf2e87b72edb5623394e72f6677ff37e35f4eb919468925fefad1b29f8708c027dab74d85bf9e9822c3ad2c07f03d0dff154c8543147
   languageName: node
   linkType: hard
 
@@ -7272,15 +7982,15 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/addon-viewport@npm:7.4.5"
   dependencies:
-    "@storybook/client-logger": 7.4.5
-    "@storybook/components": 7.4.5
-    "@storybook/core-events": 7.4.5
-    "@storybook/global": ^5.0.0
-    "@storybook/manager-api": 7.4.5
-    "@storybook/preview-api": 7.4.5
-    "@storybook/theming": 7.4.5
-    memoizerific: ^1.11.3
-    prop-types: ^15.7.2
+    "@storybook/client-logger": "npm:7.4.5"
+    "@storybook/components": "npm:7.4.5"
+    "@storybook/core-events": "npm:7.4.5"
+    "@storybook/global": "npm:^5.0.0"
+    "@storybook/manager-api": "npm:7.4.5"
+    "@storybook/preview-api": "npm:7.4.5"
+    "@storybook/theming": "npm:7.4.5"
+    memoizerific: "npm:^1.11.3"
+    prop-types: "npm:^15.7.2"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -7289,7 +7999,7 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-  checksum: 324cfa3f9164bd0333e938b6c15f51c9f244a4108f4a8ba7588a9e47dde35266d907f5a3dc028c6ae489840f63342fc128307e50243f6d3d5ad1a1ca499d2d32
+  checksum: 10/d0d3b0522c7ee383523f3f41c6a6b3e93af959bd705be0cb62519cbf54632f002a2ae9ee8d6db0044a02bb8ab4381e97dccb8ae66e25a1b9fbc34a07097d23df
   languageName: node
   linkType: hard
 
@@ -7297,13 +8007,13 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/addons@npm:7.4.5"
   dependencies:
-    "@storybook/manager-api": 7.4.5
-    "@storybook/preview-api": 7.4.5
-    "@storybook/types": 7.4.5
+    "@storybook/manager-api": "npm:7.4.5"
+    "@storybook/preview-api": "npm:7.4.5"
+    "@storybook/types": "npm:7.4.5"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: fa906a0ac86b2a00ddbf154d636ff17f102de7c173fdd7362021e2ce11053e45c36dc74d99a11bc090eec97d2be4cfe7a57b5ebb5d058917a2d4cfd395d894ce
+  checksum: 10/693f5813cb838a708c7652b9b54cb7e8338dbafb0388fc456cae14a1981cacbe46302650b6c94b3e36d906d1dc1f6f8c5fd06637a3f3beeeb7b7588821f78274
   languageName: node
   linkType: hard
 
@@ -7311,8 +8021,8 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/api@npm:7.4.5"
   dependencies:
-    "@storybook/client-logger": 7.4.5
-    "@storybook/manager-api": 7.4.5
+    "@storybook/client-logger": "npm:7.4.5"
+    "@storybook/manager-api": "npm:7.4.5"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -7321,7 +8031,7 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-  checksum: 750a852aa6e21be99eb15901894daecdb58025b3d02f5396a827d47a77e4f4a6e4a753720761119c3eb4b057726277c6747ecac80f610d30f3c05f7ac9e55206
+  checksum: 10/750a852aa6e21be99eb15901894daecdb58025b3d02f5396a827d47a77e4f4a6e4a753720761119c3eb4b057726277c6747ecac80f610d30f3c05f7ac9e55206
   languageName: node
   linkType: hard
 
@@ -7329,33 +8039,33 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/blocks@npm:7.4.5"
   dependencies:
-    "@storybook/channels": 7.4.5
-    "@storybook/client-logger": 7.4.5
-    "@storybook/components": 7.4.5
-    "@storybook/core-events": 7.4.5
-    "@storybook/csf": ^0.1.0
-    "@storybook/docs-tools": 7.4.5
-    "@storybook/global": ^5.0.0
-    "@storybook/manager-api": 7.4.5
-    "@storybook/preview-api": 7.4.5
-    "@storybook/theming": 7.4.5
-    "@storybook/types": 7.4.5
-    "@types/lodash": ^4.14.167
-    color-convert: ^2.0.1
-    dequal: ^2.0.2
-    lodash: ^4.17.21
-    markdown-to-jsx: ^7.1.8
-    memoizerific: ^1.11.3
-    polished: ^4.2.2
-    react-colorful: ^5.1.2
-    telejson: ^7.2.0
-    tocbot: ^4.20.1
-    ts-dedent: ^2.0.0
-    util-deprecate: ^1.0.2
+    "@storybook/channels": "npm:7.4.5"
+    "@storybook/client-logger": "npm:7.4.5"
+    "@storybook/components": "npm:7.4.5"
+    "@storybook/core-events": "npm:7.4.5"
+    "@storybook/csf": "npm:^0.1.0"
+    "@storybook/docs-tools": "npm:7.4.5"
+    "@storybook/global": "npm:^5.0.0"
+    "@storybook/manager-api": "npm:7.4.5"
+    "@storybook/preview-api": "npm:7.4.5"
+    "@storybook/theming": "npm:7.4.5"
+    "@storybook/types": "npm:7.4.5"
+    "@types/lodash": "npm:^4.14.167"
+    color-convert: "npm:^2.0.1"
+    dequal: "npm:^2.0.2"
+    lodash: "npm:^4.17.21"
+    markdown-to-jsx: "npm:^7.1.8"
+    memoizerific: "npm:^1.11.3"
+    polished: "npm:^4.2.2"
+    react-colorful: "npm:^5.1.2"
+    telejson: "npm:^7.2.0"
+    tocbot: "npm:^4.20.1"
+    ts-dedent: "npm:^2.0.0"
+    util-deprecate: "npm:^1.0.2"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: bfca218cd0b6f938a0044233c2d150b131f4a975d5dd8ed5a18a4a1e101fe26576c0d13dbfbe26fd15cd15fead87d5d99354923e6f8580ec770b6f7b2643ecc8
+  checksum: 10/1a222794669c4cec662c4e6edd9920cab5cd5c102362ba0258eeb5327c26bd3bb8e64a0686cf60d8d6fd3f869171046128a5bb99b8ec4ae98f6f9acaab1a434e
   languageName: node
   linkType: hard
 
@@ -7363,33 +8073,33 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/blocks@patch:@storybook/blocks@npm%3A7.4.5#./.yarn/patches/@storybook-blocks-npm-7.4.5-5a2374564a.patch::version=7.4.5&hash=c93e7b&locator=grafana%40workspace%3A."
   dependencies:
-    "@storybook/channels": 7.4.5
-    "@storybook/client-logger": 7.4.5
-    "@storybook/components": 7.4.5
-    "@storybook/core-events": 7.4.5
-    "@storybook/csf": ^0.1.0
-    "@storybook/docs-tools": 7.4.5
-    "@storybook/global": ^5.0.0
-    "@storybook/manager-api": 7.4.5
-    "@storybook/preview-api": 7.4.5
-    "@storybook/theming": 7.4.5
-    "@storybook/types": 7.4.5
-    "@types/lodash": ^4.14.167
-    color-convert: ^2.0.1
-    dequal: ^2.0.2
-    lodash: ^4.17.21
-    markdown-to-jsx: ^7.1.8
-    memoizerific: ^1.11.3
-    polished: ^4.2.2
-    react-colorful: ^5.1.2
-    telejson: ^7.2.0
-    tocbot: ^4.20.1
-    ts-dedent: ^2.0.0
-    util-deprecate: ^1.0.2
+    "@storybook/channels": "npm:7.4.5"
+    "@storybook/client-logger": "npm:7.4.5"
+    "@storybook/components": "npm:7.4.5"
+    "@storybook/core-events": "npm:7.4.5"
+    "@storybook/csf": "npm:^0.1.0"
+    "@storybook/docs-tools": "npm:7.4.5"
+    "@storybook/global": "npm:^5.0.0"
+    "@storybook/manager-api": "npm:7.4.5"
+    "@storybook/preview-api": "npm:7.4.5"
+    "@storybook/theming": "npm:7.4.5"
+    "@storybook/types": "npm:7.4.5"
+    "@types/lodash": "npm:^4.14.167"
+    color-convert: "npm:^2.0.1"
+    dequal: "npm:^2.0.2"
+    lodash: "npm:^4.17.21"
+    markdown-to-jsx: "npm:^7.1.8"
+    memoizerific: "npm:^1.11.3"
+    polished: "npm:^4.2.2"
+    react-colorful: "npm:^5.1.2"
+    telejson: "npm:^7.2.0"
+    tocbot: "npm:^4.20.1"
+    ts-dedent: "npm:^2.0.0"
+    util-deprecate: "npm:^1.0.2"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 9f0957019bfc56e96a499c3eb85f889cafbac3a17eb4e22ae16653f27d7dc3791472bae92f9e0bd8bf35efaf63b107f7a1beddd153a485bd00bddfb1c13dc360
+  checksum: 10/a00c56fb6e854e53548931180ecca4d687fd4ff0775bae5cf1035de1ba0dd359268bfa9816aa7caf511c5bd03117f114428bc86602e631f724158e67502bcb3d
   languageName: node
   linkType: hard
 
@@ -7397,23 +8107,23 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/builder-manager@npm:7.4.5"
   dependencies:
-    "@fal-works/esbuild-plugin-global-externals": ^2.1.2
-    "@storybook/core-common": 7.4.5
-    "@storybook/manager": 7.4.5
-    "@storybook/node-logger": 7.4.5
-    "@types/ejs": ^3.1.1
-    "@types/find-cache-dir": ^3.2.1
-    "@yarnpkg/esbuild-plugin-pnp": ^3.0.0-rc.10
-    browser-assert: ^1.2.1
-    ejs: ^3.1.8
-    esbuild: ^0.18.0
-    esbuild-plugin-alias: ^0.2.1
-    express: ^4.17.3
-    find-cache-dir: ^3.0.0
-    fs-extra: ^11.1.0
-    process: ^0.11.10
-    util: ^0.12.4
-  checksum: 887898e7c131376f517a653d686e3166a72a10877e34ed25c49e108dfc9f38c5978fea187ceebe56960c49c0ce8b93237634325f8cd36e456ffc9d815fbcb49d
+    "@fal-works/esbuild-plugin-global-externals": "npm:^2.1.2"
+    "@storybook/core-common": "npm:7.4.5"
+    "@storybook/manager": "npm:7.4.5"
+    "@storybook/node-logger": "npm:7.4.5"
+    "@types/ejs": "npm:^3.1.1"
+    "@types/find-cache-dir": "npm:^3.2.1"
+    "@yarnpkg/esbuild-plugin-pnp": "npm:^3.0.0-rc.10"
+    browser-assert: "npm:^1.2.1"
+    ejs: "npm:^3.1.8"
+    esbuild: "npm:^0.18.0"
+    esbuild-plugin-alias: "npm:^0.2.1"
+    express: "npm:^4.17.3"
+    find-cache-dir: "npm:^3.0.0"
+    fs-extra: "npm:^11.1.0"
+    process: "npm:^0.11.10"
+    util: "npm:^0.12.4"
+  checksum: 10/0acb9946cadad4f3150f59a4fcf3542165ef91ac2d5630b7ba87d72d45cc142497cc3af15796be5bdfdb1cc589f8645b758c52d8e73ce7fa332b278e9e93e909
   languageName: node
   linkType: hard
 
@@ -7421,57 +8131,57 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/builder-webpack5@npm:7.4.5"
   dependencies:
-    "@babel/core": ^7.22.9
-    "@storybook/addons": 7.4.5
-    "@storybook/channels": 7.4.5
-    "@storybook/client-api": 7.4.5
-    "@storybook/client-logger": 7.4.5
-    "@storybook/components": 7.4.5
-    "@storybook/core-common": 7.4.5
-    "@storybook/core-events": 7.4.5
-    "@storybook/core-webpack": 7.4.5
-    "@storybook/global": ^5.0.0
-    "@storybook/manager-api": 7.4.5
-    "@storybook/node-logger": 7.4.5
-    "@storybook/preview": 7.4.5
-    "@storybook/preview-api": 7.4.5
-    "@storybook/router": 7.4.5
-    "@storybook/store": 7.4.5
-    "@storybook/theming": 7.4.5
-    "@swc/core": ^1.3.49
-    "@types/node": ^16.0.0
-    "@types/semver": ^7.3.4
-    babel-loader: ^9.0.0
-    babel-plugin-named-exports-order: ^0.0.2
-    browser-assert: ^1.2.1
-    case-sensitive-paths-webpack-plugin: ^2.4.0
-    constants-browserify: ^1.0.0
-    css-loader: ^6.7.1
-    express: ^4.17.3
-    fork-ts-checker-webpack-plugin: ^8.0.0
-    fs-extra: ^11.1.0
-    html-webpack-plugin: ^5.5.0
-    path-browserify: ^1.0.1
-    process: ^0.11.10
-    semver: ^7.3.7
-    style-loader: ^3.3.1
-    swc-loader: ^0.2.3
-    terser-webpack-plugin: ^5.3.1
-    ts-dedent: ^2.0.0
-    url: ^0.11.0
-    util: ^0.12.4
-    util-deprecate: ^1.0.2
-    webpack: 5
-    webpack-dev-middleware: ^6.1.1
-    webpack-hot-middleware: ^2.25.1
-    webpack-virtual-modules: ^0.5.0
+    "@babel/core": "npm:^7.22.9"
+    "@storybook/addons": "npm:7.4.5"
+    "@storybook/channels": "npm:7.4.5"
+    "@storybook/client-api": "npm:7.4.5"
+    "@storybook/client-logger": "npm:7.4.5"
+    "@storybook/components": "npm:7.4.5"
+    "@storybook/core-common": "npm:7.4.5"
+    "@storybook/core-events": "npm:7.4.5"
+    "@storybook/core-webpack": "npm:7.4.5"
+    "@storybook/global": "npm:^5.0.0"
+    "@storybook/manager-api": "npm:7.4.5"
+    "@storybook/node-logger": "npm:7.4.5"
+    "@storybook/preview": "npm:7.4.5"
+    "@storybook/preview-api": "npm:7.4.5"
+    "@storybook/router": "npm:7.4.5"
+    "@storybook/store": "npm:7.4.5"
+    "@storybook/theming": "npm:7.4.5"
+    "@swc/core": "npm:^1.3.49"
+    "@types/node": "npm:^16.0.0"
+    "@types/semver": "npm:^7.3.4"
+    babel-loader: "npm:^9.0.0"
+    babel-plugin-named-exports-order: "npm:^0.0.2"
+    browser-assert: "npm:^1.2.1"
+    case-sensitive-paths-webpack-plugin: "npm:^2.4.0"
+    constants-browserify: "npm:^1.0.0"
+    css-loader: "npm:^6.7.1"
+    express: "npm:^4.17.3"
+    fork-ts-checker-webpack-plugin: "npm:^8.0.0"
+    fs-extra: "npm:^11.1.0"
+    html-webpack-plugin: "npm:^5.5.0"
+    path-browserify: "npm:^1.0.1"
+    process: "npm:^0.11.10"
+    semver: "npm:^7.3.7"
+    style-loader: "npm:^3.3.1"
+    swc-loader: "npm:^0.2.3"
+    terser-webpack-plugin: "npm:^5.3.1"
+    ts-dedent: "npm:^2.0.0"
+    url: "npm:^0.11.0"
+    util: "npm:^0.12.4"
+    util-deprecate: "npm:^1.0.2"
+    webpack: "npm:5"
+    webpack-dev-middleware: "npm:^6.1.1"
+    webpack-hot-middleware: "npm:^2.25.1"
+    webpack-virtual-modules: "npm:^0.5.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 126395eecfaac0d9696f6f46260ac067aeec10936ec85ad89e93e74146d93f493063b9fdc6558dd6f92d7c8ce8d7585b46e42c8d058261f41e2abea7420dd079
+  checksum: 10/a7172fceca6da79496eb63d88fb912c2d1c86ec55c03d8ef084a2b62f5a67dd8be98078053cbb83807b242411e690b79f64b2a38026bd4b1fd9702230048bfd3
   languageName: node
   linkType: hard
 
@@ -7479,13 +8189,13 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/channels@npm:7.4.5"
   dependencies:
-    "@storybook/client-logger": 7.4.5
-    "@storybook/core-events": 7.4.5
-    "@storybook/global": ^5.0.0
-    qs: ^6.10.0
-    telejson: ^7.2.0
-    tiny-invariant: ^1.3.1
-  checksum: a0781c6148940296191626bb16ea580d7406a435aa446ad1ba9eef9e8576ebd5b7247676b06a1e864d7b4fc616fc12f9cf38179a88ec55f537ca2d521bdcb592
+    "@storybook/client-logger": "npm:7.4.5"
+    "@storybook/core-events": "npm:7.4.5"
+    "@storybook/global": "npm:^5.0.0"
+    qs: "npm:^6.10.0"
+    telejson: "npm:^7.2.0"
+    tiny-invariant: "npm:^1.3.1"
+  checksum: 10/0266db2d43f4d64f9bb13051ee7f6470504b35f6c89802d2ca41dbab6a7ea7427a567019d03c17a2f27c80d819f276a0e7f374665679ceac6e44776e9cf3ce9d
   languageName: node
   linkType: hard
 
@@ -7493,51 +8203,51 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/cli@npm:7.4.5"
   dependencies:
-    "@babel/core": ^7.22.9
-    "@babel/preset-env": ^7.22.9
-    "@babel/types": ^7.22.5
-    "@ndelangen/get-tarball": ^3.0.7
-    "@storybook/codemod": 7.4.5
-    "@storybook/core-common": 7.4.5
-    "@storybook/core-events": 7.4.5
-    "@storybook/core-server": 7.4.5
-    "@storybook/csf-tools": 7.4.5
-    "@storybook/node-logger": 7.4.5
-    "@storybook/telemetry": 7.4.5
-    "@storybook/types": 7.4.5
-    "@types/semver": ^7.3.4
-    "@yarnpkg/fslib": 2.10.3
-    "@yarnpkg/libzip": 2.3.0
-    chalk: ^4.1.0
-    commander: ^6.2.1
-    cross-spawn: ^7.0.3
-    detect-indent: ^6.1.0
-    envinfo: ^7.7.3
-    execa: ^5.0.0
-    express: ^4.17.3
-    find-up: ^5.0.0
-    fs-extra: ^11.1.0
-    get-npm-tarball-url: ^2.0.3
-    get-port: ^5.1.1
-    giget: ^1.0.0
-    globby: ^11.0.2
-    jscodeshift: ^0.14.0
-    leven: ^3.1.0
-    ora: ^5.4.1
-    prettier: ^2.8.0
-    prompts: ^2.4.0
-    puppeteer-core: ^2.1.1
-    read-pkg-up: ^7.0.1
-    semver: ^7.3.7
-    simple-update-notifier: ^2.0.0
-    strip-json-comments: ^3.0.1
-    tempy: ^1.0.1
-    ts-dedent: ^2.0.0
-    util-deprecate: ^1.0.2
+    "@babel/core": "npm:^7.22.9"
+    "@babel/preset-env": "npm:^7.22.9"
+    "@babel/types": "npm:^7.22.5"
+    "@ndelangen/get-tarball": "npm:^3.0.7"
+    "@storybook/codemod": "npm:7.4.5"
+    "@storybook/core-common": "npm:7.4.5"
+    "@storybook/core-events": "npm:7.4.5"
+    "@storybook/core-server": "npm:7.4.5"
+    "@storybook/csf-tools": "npm:7.4.5"
+    "@storybook/node-logger": "npm:7.4.5"
+    "@storybook/telemetry": "npm:7.4.5"
+    "@storybook/types": "npm:7.4.5"
+    "@types/semver": "npm:^7.3.4"
+    "@yarnpkg/fslib": "npm:2.10.3"
+    "@yarnpkg/libzip": "npm:2.3.0"
+    chalk: "npm:^4.1.0"
+    commander: "npm:^6.2.1"
+    cross-spawn: "npm:^7.0.3"
+    detect-indent: "npm:^6.1.0"
+    envinfo: "npm:^7.7.3"
+    execa: "npm:^5.0.0"
+    express: "npm:^4.17.3"
+    find-up: "npm:^5.0.0"
+    fs-extra: "npm:^11.1.0"
+    get-npm-tarball-url: "npm:^2.0.3"
+    get-port: "npm:^5.1.1"
+    giget: "npm:^1.0.0"
+    globby: "npm:^11.0.2"
+    jscodeshift: "npm:^0.14.0"
+    leven: "npm:^3.1.0"
+    ora: "npm:^5.4.1"
+    prettier: "npm:^2.8.0"
+    prompts: "npm:^2.4.0"
+    puppeteer-core: "npm:^2.1.1"
+    read-pkg-up: "npm:^7.0.1"
+    semver: "npm:^7.3.7"
+    simple-update-notifier: "npm:^2.0.0"
+    strip-json-comments: "npm:^3.0.1"
+    tempy: "npm:^1.0.1"
+    ts-dedent: "npm:^2.0.0"
+    util-deprecate: "npm:^1.0.2"
   bin:
     getstorybook: ./bin/index.js
     sb: ./bin/index.js
-  checksum: 8915e7f37780362fcd3ff3077a423d7c29595a444ec78a0dd66946597d5028c576d922e2c78d9d7dc4a719aaf2f0c9908f56869680c7aed9c7c14c2dc7cf3e63
+  checksum: 10/9ef6e42cb48a948f5aa2dc360f79e8636716008793de33e0da0f84cfce4d459db9682fb91b2e335854b716e245d3e6edb7f2f327f60313937028f3ef5967a82b
   languageName: node
   linkType: hard
 
@@ -7545,9 +8255,9 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/client-api@npm:7.4.5"
   dependencies:
-    "@storybook/client-logger": 7.4.5
-    "@storybook/preview-api": 7.4.5
-  checksum: 25dc07c003ca490171e365ba2dbae5760261195e5fe99b1bc62c263c6ffe82b3466ad4acb3896af7e2649205af4bb304a952bc3ced7265fd934f3d52fb087713
+    "@storybook/client-logger": "npm:7.4.5"
+    "@storybook/preview-api": "npm:7.4.5"
+  checksum: 10/25dc07c003ca490171e365ba2dbae5760261195e5fe99b1bc62c263c6ffe82b3466ad4acb3896af7e2649205af4bb304a952bc3ced7265fd934f3d52fb087713
   languageName: node
   linkType: hard
 
@@ -7555,8 +8265,8 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/client-logger@npm:7.4.5"
   dependencies:
-    "@storybook/global": ^5.0.0
-  checksum: 044ef572d858a575670cef88d86f1bc85c0ebc77b5cf89ff858f1651c931f90bb9009c11bb627e2e4827aaad28bedd069494727abd6dc622669cea73efe2085b
+    "@storybook/global": "npm:^5.0.0"
+  checksum: 10/76fe3cf60e58760d7c759b8a2a49ca07c577e89d07622aea6ec648b9d3c8a35068a0194a99ce47d99de8dad72bee9f7ef4a2f251275a00e780ac883443dc7e97
   languageName: node
   linkType: hard
 
@@ -7564,21 +8274,21 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/codemod@npm:7.4.5"
   dependencies:
-    "@babel/core": ^7.22.9
-    "@babel/preset-env": ^7.22.9
-    "@babel/types": ^7.22.5
-    "@storybook/csf": ^0.1.0
-    "@storybook/csf-tools": 7.4.5
-    "@storybook/node-logger": 7.4.5
-    "@storybook/types": 7.4.5
-    "@types/cross-spawn": ^6.0.2
-    cross-spawn: ^7.0.3
-    globby: ^11.0.2
-    jscodeshift: ^0.14.0
-    lodash: ^4.17.21
-    prettier: ^2.8.0
-    recast: ^0.23.1
-  checksum: 5f2e9e8a0bdc0e7c2b0bf0517f8f983c2ba8f83ec318fc1b9b7c76c588904a5d1678d01be9b4df545a662e8188759ce2f39450f760d1c2d861fbbb0eb24255e7
+    "@babel/core": "npm:^7.22.9"
+    "@babel/preset-env": "npm:^7.22.9"
+    "@babel/types": "npm:^7.22.5"
+    "@storybook/csf": "npm:^0.1.0"
+    "@storybook/csf-tools": "npm:7.4.5"
+    "@storybook/node-logger": "npm:7.4.5"
+    "@storybook/types": "npm:7.4.5"
+    "@types/cross-spawn": "npm:^6.0.2"
+    cross-spawn: "npm:^7.0.3"
+    globby: "npm:^11.0.2"
+    jscodeshift: "npm:^0.14.0"
+    lodash: "npm:^4.17.21"
+    prettier: "npm:^2.8.0"
+    recast: "npm:^0.23.1"
+  checksum: 10/b879406643c229e58b4f0f1c90b2a1b544d819e44f6f019a30cdafa6ae9710c6ffecf399fa425984cbd05827a5edddb5b5a5775d2eda2ab5a1fb9a46450ef7e1
   languageName: node
   linkType: hard
 
@@ -7586,20 +8296,20 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/components@npm:7.4.5"
   dependencies:
-    "@radix-ui/react-select": ^1.2.2
-    "@radix-ui/react-toolbar": ^1.0.4
-    "@storybook/client-logger": 7.4.5
-    "@storybook/csf": ^0.1.0
-    "@storybook/global": ^5.0.0
-    "@storybook/theming": 7.4.5
-    "@storybook/types": 7.4.5
-    memoizerific: ^1.11.3
-    use-resize-observer: ^9.1.0
-    util-deprecate: ^1.0.2
+    "@radix-ui/react-select": "npm:^1.2.2"
+    "@radix-ui/react-toolbar": "npm:^1.0.4"
+    "@storybook/client-logger": "npm:7.4.5"
+    "@storybook/csf": "npm:^0.1.0"
+    "@storybook/global": "npm:^5.0.0"
+    "@storybook/theming": "npm:7.4.5"
+    "@storybook/types": "npm:7.4.5"
+    memoizerific: "npm:^1.11.3"
+    use-resize-observer: "npm:^9.1.0"
+    util-deprecate: "npm:^1.0.2"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 54977556d81ddc7df608417b43fb362c81b073da6fbb0eca9461b879a46f8427ee62a3e2b299d2d8800522eed4203e3e5834c27d1b6d8750de90f6be0d0a6acf
+  checksum: 10/77a520439794e6ee04b360e29b6147b7c52c17cfd794109e9089322bcbca0f0e77d69a97320c362e7f803d5332be8b0dd1808a61b408c3a7135d6355af6a75d7
   languageName: node
   linkType: hard
 
@@ -7607,9 +8317,9 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/core-client@npm:7.4.5"
   dependencies:
-    "@storybook/client-logger": 7.4.5
-    "@storybook/preview-api": 7.4.5
-  checksum: 4fc5aabad164cad9f5964010169d55ddb669f7c22a5c6a1bd40647e419147507476e88db134dc7ecf19731168374d8e321f21a40d634a94e6c239f74a448e74f
+    "@storybook/client-logger": "npm:7.4.5"
+    "@storybook/preview-api": "npm:7.4.5"
+  checksum: 10/05a9e61ae5e31df7f44f5a401d72d41fea7fc1a2d1b52ce90b8df3a27219284f6a5647b8b52fe1107f16a7a05ff90caf7290330c40ed6f4c44fd717c6bb105ce
   languageName: node
   linkType: hard
 
@@ -7617,30 +8327,30 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/core-common@npm:7.4.5"
   dependencies:
-    "@storybook/core-events": 7.4.5
-    "@storybook/node-logger": 7.4.5
-    "@storybook/types": 7.4.5
-    "@types/find-cache-dir": ^3.2.1
-    "@types/node": ^16.0.0
-    "@types/node-fetch": ^2.6.4
-    "@types/pretty-hrtime": ^1.0.0
-    chalk: ^4.1.0
-    esbuild: ^0.18.0
-    esbuild-register: ^3.4.0
-    file-system-cache: 2.3.0
-    find-cache-dir: ^3.0.0
-    find-up: ^5.0.0
-    fs-extra: ^11.1.0
-    glob: ^10.0.0
-    handlebars: ^4.7.7
-    lazy-universal-dotenv: ^4.0.0
-    node-fetch: ^2.0.0
-    picomatch: ^2.3.0
-    pkg-dir: ^5.0.0
-    pretty-hrtime: ^1.0.3
-    resolve-from: ^5.0.0
-    ts-dedent: ^2.0.0
-  checksum: f8506c2008fcc504a0762f7f126571d634de3b74fa735c64147f43a9db9583c7c292285b18798b010753c88dc9a7fdc63072c2f2516af8f08d7b3af0c6f640f7
+    "@storybook/core-events": "npm:7.4.5"
+    "@storybook/node-logger": "npm:7.4.5"
+    "@storybook/types": "npm:7.4.5"
+    "@types/find-cache-dir": "npm:^3.2.1"
+    "@types/node": "npm:^16.0.0"
+    "@types/node-fetch": "npm:^2.6.4"
+    "@types/pretty-hrtime": "npm:^1.0.0"
+    chalk: "npm:^4.1.0"
+    esbuild: "npm:^0.18.0"
+    esbuild-register: "npm:^3.4.0"
+    file-system-cache: "npm:2.3.0"
+    find-cache-dir: "npm:^3.0.0"
+    find-up: "npm:^5.0.0"
+    fs-extra: "npm:^11.1.0"
+    glob: "npm:^10.0.0"
+    handlebars: "npm:^4.7.7"
+    lazy-universal-dotenv: "npm:^4.0.0"
+    node-fetch: "npm:^2.0.0"
+    picomatch: "npm:^2.3.0"
+    pkg-dir: "npm:^5.0.0"
+    pretty-hrtime: "npm:^1.0.3"
+    resolve-from: "npm:^5.0.0"
+    ts-dedent: "npm:^2.0.0"
+  checksum: 10/2bc8d01a8af488e1d3128a023a29c04a6724c1b67e5e495807851c044560bef954306318be63cf88f4782cfa0ee4e9c8953b731b234e0154a9ad0661a72a929e
   languageName: node
   linkType: hard
 
@@ -7648,8 +8358,8 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/core-events@npm:7.4.5"
   dependencies:
-    ts-dedent: ^2.0.0
-  checksum: b13a5c415e63dcbd2edf569601b30f3f80f8d1c03440fe869371da88bb1f9fb87e3da18670b62aa4acb87bec21433e2dba112d93a8293ab798be3e11f850217e
+    ts-dedent: "npm:^2.0.0"
+  checksum: 10/302bf70fc48b418ab7f58bd27aede1910e7eea8ddb416c46a997144b66b09032f7908523ed6794cd7b6e33624f64d76f19ae91a17d726ae517d82f8f9d9d427a
   languageName: node
   linkType: hard
 
@@ -7657,49 +8367,49 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/core-server@npm:7.4.5"
   dependencies:
-    "@aw-web-design/x-default-browser": 1.4.126
-    "@discoveryjs/json-ext": ^0.5.3
-    "@storybook/builder-manager": 7.4.5
-    "@storybook/channels": 7.4.5
-    "@storybook/core-common": 7.4.5
-    "@storybook/core-events": 7.4.5
-    "@storybook/csf": ^0.1.0
-    "@storybook/csf-tools": 7.4.5
-    "@storybook/docs-mdx": ^0.1.0
-    "@storybook/global": ^5.0.0
-    "@storybook/manager": 7.4.5
-    "@storybook/node-logger": 7.4.5
-    "@storybook/preview-api": 7.4.5
-    "@storybook/telemetry": 7.4.5
-    "@storybook/types": 7.4.5
-    "@types/detect-port": ^1.3.0
-    "@types/node": ^16.0.0
-    "@types/pretty-hrtime": ^1.0.0
-    "@types/semver": ^7.3.4
-    better-opn: ^3.0.2
-    chalk: ^4.1.0
-    cli-table3: ^0.6.1
-    compression: ^1.7.4
-    detect-port: ^1.3.0
-    express: ^4.17.3
-    fs-extra: ^11.1.0
-    globby: ^11.0.2
-    ip: ^2.0.0
-    lodash: ^4.17.21
-    open: ^8.4.0
-    pretty-hrtime: ^1.0.3
-    prompts: ^2.4.0
-    read-pkg-up: ^7.0.1
-    semver: ^7.3.7
-    serve-favicon: ^2.5.0
-    telejson: ^7.2.0
-    tiny-invariant: ^1.3.1
-    ts-dedent: ^2.0.0
-    util: ^0.12.4
-    util-deprecate: ^1.0.2
-    watchpack: ^2.2.0
-    ws: ^8.2.3
-  checksum: f6b1c8c6444a04d57a2f657887d8574b0e6c41002f43083912df434149f0142fbb93fe82244ad802e6b301cf341ac8da78d205f35c30bd28017b6be9f5d70859
+    "@aw-web-design/x-default-browser": "npm:1.4.126"
+    "@discoveryjs/json-ext": "npm:^0.5.3"
+    "@storybook/builder-manager": "npm:7.4.5"
+    "@storybook/channels": "npm:7.4.5"
+    "@storybook/core-common": "npm:7.4.5"
+    "@storybook/core-events": "npm:7.4.5"
+    "@storybook/csf": "npm:^0.1.0"
+    "@storybook/csf-tools": "npm:7.4.5"
+    "@storybook/docs-mdx": "npm:^0.1.0"
+    "@storybook/global": "npm:^5.0.0"
+    "@storybook/manager": "npm:7.4.5"
+    "@storybook/node-logger": "npm:7.4.5"
+    "@storybook/preview-api": "npm:7.4.5"
+    "@storybook/telemetry": "npm:7.4.5"
+    "@storybook/types": "npm:7.4.5"
+    "@types/detect-port": "npm:^1.3.0"
+    "@types/node": "npm:^16.0.0"
+    "@types/pretty-hrtime": "npm:^1.0.0"
+    "@types/semver": "npm:^7.3.4"
+    better-opn: "npm:^3.0.2"
+    chalk: "npm:^4.1.0"
+    cli-table3: "npm:^0.6.1"
+    compression: "npm:^1.7.4"
+    detect-port: "npm:^1.3.0"
+    express: "npm:^4.17.3"
+    fs-extra: "npm:^11.1.0"
+    globby: "npm:^11.0.2"
+    ip: "npm:^2.0.0"
+    lodash: "npm:^4.17.21"
+    open: "npm:^8.4.0"
+    pretty-hrtime: "npm:^1.0.3"
+    prompts: "npm:^2.4.0"
+    read-pkg-up: "npm:^7.0.1"
+    semver: "npm:^7.3.7"
+    serve-favicon: "npm:^2.5.0"
+    telejson: "npm:^7.2.0"
+    tiny-invariant: "npm:^1.3.1"
+    ts-dedent: "npm:^2.0.0"
+    util: "npm:^0.12.4"
+    util-deprecate: "npm:^1.0.2"
+    watchpack: "npm:^2.2.0"
+    ws: "npm:^8.2.3"
+  checksum: 10/fc2f4f13773b231b325187f30e5bd74eb0db6f356b89c833676471675ca1f0e54ea5bf3a2f250e347f0d1346cbdc85faf5daded3eaf19110fb8c6621ebf26a2a
   languageName: node
   linkType: hard
 
@@ -7707,12 +8417,12 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/core-webpack@npm:7.4.5"
   dependencies:
-    "@storybook/core-common": 7.4.5
-    "@storybook/node-logger": 7.4.5
-    "@storybook/types": 7.4.5
-    "@types/node": ^16.0.0
-    ts-dedent: ^2.0.0
-  checksum: bccbc792a81e00a3857d180dcb0bf8eb5902dcb97517a7d02f6120b4ac4884df1c4f385bbce85e96c52674b3ef7b27df510aa356360ef2f86543d0e5e1b2a344
+    "@storybook/core-common": "npm:7.4.5"
+    "@storybook/node-logger": "npm:7.4.5"
+    "@storybook/types": "npm:7.4.5"
+    "@types/node": "npm:^16.0.0"
+    ts-dedent: "npm:^2.0.0"
+  checksum: 10/0aa8255928891e969d4f5e308b5975ee2164f2b68a79b41d09b25298b85f87210aa5869c9cd4eba96a2df69468708f39a0df5062118c6205546f5fdda67b5f24
   languageName: node
   linkType: hard
 
@@ -7720,9 +8430,9 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/csf-plugin@npm:7.4.5"
   dependencies:
-    "@storybook/csf-tools": 7.4.5
-    unplugin: ^1.3.1
-  checksum: a8bda704660bb957dac9fe2bb4cd48dc43d3f04e98dcf3fcddc2a6978a3836e86f8a5ba3050217f10fd9ca5754dbd9365e8b3f1dfd2c2f79d10daabbd019ee8f
+    "@storybook/csf-tools": "npm:7.4.5"
+    unplugin: "npm:^1.3.1"
+  checksum: 10/a8bda704660bb957dac9fe2bb4cd48dc43d3f04e98dcf3fcddc2a6978a3836e86f8a5ba3050217f10fd9ca5754dbd9365e8b3f1dfd2c2f79d10daabbd019ee8f
   languageName: node
   linkType: hard
 
@@ -7730,16 +8440,16 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/csf-tools@npm:7.4.5"
   dependencies:
-    "@babel/generator": ^7.22.9
-    "@babel/parser": ^7.22.7
-    "@babel/traverse": ^7.22.8
-    "@babel/types": ^7.22.5
-    "@storybook/csf": ^0.1.0
-    "@storybook/types": 7.4.5
-    fs-extra: ^11.1.0
-    recast: ^0.23.1
-    ts-dedent: ^2.0.0
-  checksum: ecc662b6810fcb574f05941202d0d8087d31b6e5657a27ea8f88780d101d91ee29378c2714bf66d3580393b879c9ba4bd7a475545be72edb3d80dd579a4e6796
+    "@babel/generator": "npm:^7.22.9"
+    "@babel/parser": "npm:^7.22.7"
+    "@babel/traverse": "npm:^7.22.8"
+    "@babel/types": "npm:^7.22.5"
+    "@storybook/csf": "npm:^0.1.0"
+    "@storybook/types": "npm:7.4.5"
+    fs-extra: "npm:^11.1.0"
+    recast: "npm:^0.23.1"
+    ts-dedent: "npm:^2.0.0"
+  checksum: 10/36400539b833d1429172ff79d299f59033bf692c9c4a17d98a99810e37af020b17c04ab3cd648e2d73193ef55f5771cb5bae2189adb23cf7341663691e13be44
   languageName: node
   linkType: hard
 
@@ -7747,15 +8457,15 @@ __metadata:
   version: 0.1.0
   resolution: "@storybook/csf@npm:0.1.0"
   dependencies:
-    type-fest: ^2.19.0
-  checksum: f1784f2aff27d5c27ab897878b08e3b04a64e7f62da1ea95fd11bfe9f558300e55f0d483d58282e8254a4b4e8935201178e70c264ccc96104c67403215d651f0
+    type-fest: "npm:^2.19.0"
+  checksum: 10/bd93be38b249247830b463a736ab0b279c2a65d355045d708e88f691e8f203346cadb5d3e886c595fe883eb59c942c8990109b0605d26619116e9593695e47fc
   languageName: node
   linkType: hard
 
 "@storybook/docs-mdx@npm:^0.1.0":
   version: 0.1.0
   resolution: "@storybook/docs-mdx@npm:0.1.0"
-  checksum: a7770842c3947a761bcbe776a9c4fd35163d30c3274fca034169f69ff614242eaa4cacaa2c95fd215827081ef9a43f4774d521a6f43a4d063ea5f4ea14b1d69a
+  checksum: 10/f830eda81606a8af86d2bbf9ed6e36c70d9e88442990684139629742f2cc5d7ddddba91338fe2fc5e9b98e74af1940a9899fde471a8bfbfec744deaa990592e7
   languageName: node
   linkType: hard
 
@@ -7763,20 +8473,20 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/docs-tools@npm:7.4.5"
   dependencies:
-    "@storybook/core-common": 7.4.5
-    "@storybook/preview-api": 7.4.5
-    "@storybook/types": 7.4.5
-    "@types/doctrine": ^0.0.3
-    doctrine: ^3.0.0
-    lodash: ^4.17.21
-  checksum: 9f6e1ff558da689e97812fadd1ab36083badb5a7dd6cf60a84574e6ea167321edd606dfe3b8732585dd178c2710a7e628822fc8c1accb2e040bfe8d137f1670f
+    "@storybook/core-common": "npm:7.4.5"
+    "@storybook/preview-api": "npm:7.4.5"
+    "@storybook/types": "npm:7.4.5"
+    "@types/doctrine": "npm:^0.0.3"
+    doctrine: "npm:^3.0.0"
+    lodash: "npm:^4.17.21"
+  checksum: 10/b94af18bfa619f18cfaf3dbdf08b36ac6b518272c023d46d60125d640b51635a770cfae80e5c5c22cf4c3fd35c62108d2235c2750e6abea6d578fd76e878df3e
   languageName: node
   linkType: hard
 
 "@storybook/global@npm:^5.0.0":
   version: 5.0.0
   resolution: "@storybook/global@npm:5.0.0"
-  checksum: ede0ad35ec411fe31c61150dbd118fef344d1d0e72bf5d3502368e35cf68126f6b7ae4a0ab5e2ffe2f0baa3b4286f03ad069ba3e098e1725449ef08b7e154ba8
+  checksum: 10/0e7b495f4fe7f36447e793926f1c0460ec07fd66f0da68e3150da5878f6043c9eeb9b41614a45c5ec0d48d5d383c59ca8f88b6dc7882a2a784ac9b20375d8edb
   languageName: node
   linkType: hard
 
@@ -7784,53 +8494,53 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/manager-api@npm:7.4.5"
   dependencies:
-    "@storybook/channels": 7.4.5
-    "@storybook/client-logger": 7.4.5
-    "@storybook/core-events": 7.4.5
-    "@storybook/csf": ^0.1.0
-    "@storybook/global": ^5.0.0
-    "@storybook/router": 7.4.5
-    "@storybook/theming": 7.4.5
-    "@storybook/types": 7.4.5
-    dequal: ^2.0.2
-    lodash: ^4.17.21
-    memoizerific: ^1.11.3
-    semver: ^7.3.7
-    store2: ^2.14.2
-    telejson: ^7.2.0
-    ts-dedent: ^2.0.0
+    "@storybook/channels": "npm:7.4.5"
+    "@storybook/client-logger": "npm:7.4.5"
+    "@storybook/core-events": "npm:7.4.5"
+    "@storybook/csf": "npm:^0.1.0"
+    "@storybook/global": "npm:^5.0.0"
+    "@storybook/router": "npm:7.4.5"
+    "@storybook/theming": "npm:7.4.5"
+    "@storybook/types": "npm:7.4.5"
+    dequal: "npm:^2.0.2"
+    lodash: "npm:^4.17.21"
+    memoizerific: "npm:^1.11.3"
+    semver: "npm:^7.3.7"
+    store2: "npm:^2.14.2"
+    telejson: "npm:^7.2.0"
+    ts-dedent: "npm:^2.0.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 5b324ea7bcde44defa4a97e18ca8bd48257d9637a2a277f9f07b7f513392fe7e27502dc4677b2806352779668384d174b316ddaad4a757d6eddaaf4a2ef4e2ca
+  checksum: 10/771512ea6699a7477085c3a310eea6f705a70ecf6e4d5adfdb1007d33300665796a4f53246d16835818caad88d391d9ce569f58697fabe95086bd565aeac7642
   languageName: node
   linkType: hard
 
 "@storybook/manager@npm:7.4.5":
   version: 7.4.5
   resolution: "@storybook/manager@npm:7.4.5"
-  checksum: 4ea9bf782d3dbc9b0f2bbef55bd0ce61c539f9f39b574ac281b101c8f61507b8c5b858f67bc8fa3a61009deacbe22bef2db47b56691211d9bd9dc8b5bcb0ebc5
+  checksum: 10/a546cbfdf4cbb1edee14cec150ebf14ce18e734e9c9c89dc1d5ef66c5f2b2b4bb7267ef7e3da85aff58ee792b3b3b62aa3c69f009d0f4c8028fb49b95b59dc4c
   languageName: node
   linkType: hard
 
 "@storybook/mdx2-csf@npm:1.1.0, @storybook/mdx2-csf@npm:^1.0.0":
   version: 1.1.0
   resolution: "@storybook/mdx2-csf@npm:1.1.0"
-  checksum: 5ccdb13f4e59b989499f76e54ffaffb96b5710a696346efe19989b3373f375703adf516780894b270fa64a7e765b55274dc18575fc4a84e7fa92b844a4467c5d
+  checksum: 10/acc368a8c8915e9487aa8e0c59241a39533d83635ddcc37fa4095cc239268a75900ec2bbfff65b573ead6ebcadcb1de0e4d70c9112faf105e0821de0a4803ca2
   languageName: node
   linkType: hard
 
 "@storybook/node-logger@npm:7.4.5":
   version: 7.4.5
   resolution: "@storybook/node-logger@npm:7.4.5"
-  checksum: f492408ae489e145e37bf6b03a49c592eeab1c47fc0b63cc0b7787ea7de330874254af468048acbc8ff3fa287aa8584b4f97b985612d48607a7b07b9f7eba225
+  checksum: 10/172a6c74140b342100d3685af0e2ce939b7d1ffd4c8274d1f33ae5e9500d55d8a03dda8a56f58e6cfcc8432cd364c87237e15dd3c00f814a2c3010bbbbaa4f8c
   languageName: node
   linkType: hard
 
 "@storybook/postinstall@npm:7.4.5":
   version: 7.4.5
   resolution: "@storybook/postinstall@npm:7.4.5"
-  checksum: 061f5190b7a3cb4473fbe455f714c6948ad3c9609199cc4fe804a0db26d3a051da974cdc0954c82e0c524a0b9d8b6a660fca9148e6028b98f90d72bae1d79ccc
+  checksum: 10/428672573e32fa69eec42d4794efec17299c5b55b2de8d1bd4d7addc7292f157599b250b60d72f4ba27a85ac3ef690579db431a228033143920ff0c741df2bcc
   languageName: node
   linkType: hard
 
@@ -7838,22 +8548,22 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/preset-react-webpack@npm:7.4.5"
   dependencies:
-    "@babel/preset-flow": ^7.22.5
-    "@babel/preset-react": ^7.22.5
-    "@pmmmwh/react-refresh-webpack-plugin": ^0.5.5
-    "@storybook/core-webpack": 7.4.5
-    "@storybook/docs-tools": 7.4.5
-    "@storybook/node-logger": 7.4.5
-    "@storybook/react": 7.4.5
-    "@storybook/react-docgen-typescript-plugin": 1.0.6--canary.9.0c3f3b7.0
-    "@types/node": ^16.0.0
-    "@types/semver": ^7.3.4
-    babel-plugin-add-react-displayname: ^0.0.5
-    babel-plugin-react-docgen: ^4.2.1
-    fs-extra: ^11.1.0
-    react-refresh: ^0.11.0
-    semver: ^7.3.7
-    webpack: 5
+    "@babel/preset-flow": "npm:^7.22.5"
+    "@babel/preset-react": "npm:^7.22.5"
+    "@pmmmwh/react-refresh-webpack-plugin": "npm:^0.5.5"
+    "@storybook/core-webpack": "npm:7.4.5"
+    "@storybook/docs-tools": "npm:7.4.5"
+    "@storybook/node-logger": "npm:7.4.5"
+    "@storybook/react": "npm:7.4.5"
+    "@storybook/react-docgen-typescript-plugin": "npm:1.0.6--canary.9.0c3f3b7.0"
+    "@types/node": "npm:^16.0.0"
+    "@types/semver": "npm:^7.3.4"
+    babel-plugin-add-react-displayname: "npm:^0.0.5"
+    babel-plugin-react-docgen: "npm:^4.2.1"
+    fs-extra: "npm:^11.1.0"
+    react-refresh: "npm:^0.11.0"
+    semver: "npm:^7.3.7"
+    webpack: "npm:5"
   peerDependencies:
     "@babel/core": ^7.22.0
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -7863,7 +8573,7 @@ __metadata:
       optional: true
     typescript:
       optional: true
-  checksum: 726a9827219fa7fd2a114dec04999175ccc4aa048029b4e4b1c7cce927de90cb898785ae29c2885d5d6f56978fcc7bfa56ba22b73851dd4d6971297f3e2f3ee4
+  checksum: 10/906aab7383e897a9b26265fd56b4527b055af14de4ae369c0f02780921907a6f8f478e89af7d21d07d35c408bee721e70114babede9723ba7a6ed42dcafd4f18
   languageName: node
   linkType: hard
 
@@ -7874,7 +8584,7 @@ __metadata:
     css-loader: "*"
     sass-loader: "*"
     style-loader: "*"
-  checksum: 4f1cf1f57a4cd277d76afad5fc4f677436dc3ae3753ce549a6395c0aa9f3d9cf58e9d04c7f8b2cccd2e01929ae563764cca03c016c7e3fed4044a6409e8ca8cd
+  checksum: 10/4f1cf1f57a4cd277d76afad5fc4f677436dc3ae3753ce549a6395c0aa9f3d9cf58e9d04c7f8b2cccd2e01929ae563764cca03c016c7e3fed4044a6409e8ca8cd
   languageName: node
   linkType: hard
 
@@ -7882,28 +8592,28 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/preview-api@npm:7.4.5"
   dependencies:
-    "@storybook/channels": 7.4.5
-    "@storybook/client-logger": 7.4.5
-    "@storybook/core-events": 7.4.5
-    "@storybook/csf": ^0.1.0
-    "@storybook/global": ^5.0.0
-    "@storybook/types": 7.4.5
-    "@types/qs": ^6.9.5
-    dequal: ^2.0.2
-    lodash: ^4.17.21
-    memoizerific: ^1.11.3
-    qs: ^6.10.0
-    synchronous-promise: ^2.0.15
-    ts-dedent: ^2.0.0
-    util-deprecate: ^1.0.2
-  checksum: c664fd9e961d8826d6321882622f8b79288e93b781dc3f9e4024c8f0189e231e571c823aff0c4c09602c700dc6ac233b04578783b85baef98ede060474b1ec40
+    "@storybook/channels": "npm:7.4.5"
+    "@storybook/client-logger": "npm:7.4.5"
+    "@storybook/core-events": "npm:7.4.5"
+    "@storybook/csf": "npm:^0.1.0"
+    "@storybook/global": "npm:^5.0.0"
+    "@storybook/types": "npm:7.4.5"
+    "@types/qs": "npm:^6.9.5"
+    dequal: "npm:^2.0.2"
+    lodash: "npm:^4.17.21"
+    memoizerific: "npm:^1.11.3"
+    qs: "npm:^6.10.0"
+    synchronous-promise: "npm:^2.0.15"
+    ts-dedent: "npm:^2.0.0"
+    util-deprecate: "npm:^1.0.2"
+  checksum: 10/9c4852f07bc6a13d593b689caa3426356277e4166778cd8262c5d235dd8f11bd6778b6e0ec49b1cb4d842e0b18607d8cbcd56f06277b92c1284eff389f963540
   languageName: node
   linkType: hard
 
 "@storybook/preview@npm:7.4.5":
   version: 7.4.5
   resolution: "@storybook/preview@npm:7.4.5"
-  checksum: 714b9f4a4e36e09c7b4c8d185b5dc3e0c7ccd71ab2184cf87fc25caa728de6f7d821bfec68e0c85c6399a9301eb655b6037390f73d468a697026b9fda9e85d27
+  checksum: 10/12a3292bbf98b34f69c73af10948d9ad28b536bb28d2f5e66578b24421e319eaf05e6f7a073c8dc1822b3713da9c1d6785c30396742cef21731a0f21d063dc26
   languageName: node
   linkType: hard
 
@@ -7911,17 +8621,17 @@ __metadata:
   version: 1.0.6--canary.9.0c3f3b7.0
   resolution: "@storybook/react-docgen-typescript-plugin@npm:1.0.6--canary.9.0c3f3b7.0"
   dependencies:
-    debug: ^4.1.1
-    endent: ^2.0.1
-    find-cache-dir: ^3.3.1
-    flat-cache: ^3.0.4
-    micromatch: ^4.0.2
-    react-docgen-typescript: ^2.2.2
-    tslib: ^2.0.0
+    debug: "npm:^4.1.1"
+    endent: "npm:^2.0.1"
+    find-cache-dir: "npm:^3.3.1"
+    flat-cache: "npm:^3.0.4"
+    micromatch: "npm:^4.0.2"
+    react-docgen-typescript: "npm:^2.2.2"
+    tslib: "npm:^2.0.0"
   peerDependencies:
     typescript: ">= 4.x"
     webpack: ">= 4"
-  checksum: 38c59c1dd7f9cdf5533e5ffe1991034f563f8d33c59e3cd33fa86719c72f5fe922276fde50315dd24f23f225d1ad5f3a261ecf4c70e82522805d09782272faff
+  checksum: 10/5d3c64b022d10d7316b600a41eec2cf38ba460e11bf9a01ae976e8d0efe6959633423d2a3546a5d3f9f04bcc946e83774e8efdf9ccfedb76a7065ec08e7ec809
   languageName: node
   linkType: hard
 
@@ -7931,7 +8641,7 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 4bdf1bdf5f16dbbdf0f68d181630e0ae9d31f590711baf6f63e19f1e52b6bc771152dab54f070038fe7630841bf15893836b6dad17bafd2a5eaa0de054956573
+  checksum: 10/643b4d156d826c266c46e348d23ce4118279b5fc97b891177d8b8d983a1136b66cc24393a667a375739ebd0387888896f28c0eeecea94ae3776201a9f2712d54
   languageName: node
   linkType: hard
 
@@ -7939,10 +8649,10 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/react-webpack5@npm:7.4.5"
   dependencies:
-    "@storybook/builder-webpack5": 7.4.5
-    "@storybook/preset-react-webpack": 7.4.5
-    "@storybook/react": 7.4.5
-    "@types/node": ^16.0.0
+    "@storybook/builder-webpack5": "npm:7.4.5"
+    "@storybook/preset-react-webpack": "npm:7.4.5"
+    "@storybook/react": "npm:7.4.5"
+    "@types/node": "npm:^16.0.0"
   peerDependencies:
     "@babel/core": ^7.22.0
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -7953,7 +8663,7 @@ __metadata:
       optional: true
     typescript:
       optional: true
-  checksum: f753ff2f6bf24e1cb7a234a918156b0e3e75ce16857239d71ac85427020e8d84afbd937f871de228f07ff8dc89b26c92fb72a03fb18b8c54b42e85f007216abc
+  checksum: 10/f530a68cc5a705557c03e33e0a5ecfaba4f9bc4119a1479633c679bebaa378906241cdb63fc9b4492af537295600b0798f58d81ea27bf670a79c5f42c348ef24
   languageName: node
   linkType: hard
 
@@ -7961,27 +8671,27 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/react@npm:7.4.5"
   dependencies:
-    "@storybook/client-logger": 7.4.5
-    "@storybook/core-client": 7.4.5
-    "@storybook/docs-tools": 7.4.5
-    "@storybook/global": ^5.0.0
-    "@storybook/preview-api": 7.4.5
-    "@storybook/react-dom-shim": 7.4.5
-    "@storybook/types": 7.4.5
-    "@types/escodegen": ^0.0.6
-    "@types/estree": ^0.0.51
-    "@types/node": ^16.0.0
-    acorn: ^7.4.1
-    acorn-jsx: ^5.3.1
-    acorn-walk: ^7.2.0
-    escodegen: ^2.1.0
-    html-tags: ^3.1.0
-    lodash: ^4.17.21
-    prop-types: ^15.7.2
-    react-element-to-jsx-string: ^15.0.0
-    ts-dedent: ^2.0.0
-    type-fest: ~2.19
-    util-deprecate: ^1.0.2
+    "@storybook/client-logger": "npm:7.4.5"
+    "@storybook/core-client": "npm:7.4.5"
+    "@storybook/docs-tools": "npm:7.4.5"
+    "@storybook/global": "npm:^5.0.0"
+    "@storybook/preview-api": "npm:7.4.5"
+    "@storybook/react-dom-shim": "npm:7.4.5"
+    "@storybook/types": "npm:7.4.5"
+    "@types/escodegen": "npm:^0.0.6"
+    "@types/estree": "npm:^0.0.51"
+    "@types/node": "npm:^16.0.0"
+    acorn: "npm:^7.4.1"
+    acorn-jsx: "npm:^5.3.1"
+    acorn-walk: "npm:^7.2.0"
+    escodegen: "npm:^2.1.0"
+    html-tags: "npm:^3.1.0"
+    lodash: "npm:^4.17.21"
+    prop-types: "npm:^15.7.2"
+    react-element-to-jsx-string: "npm:^15.0.0"
+    ts-dedent: "npm:^2.0.0"
+    type-fest: "npm:~2.19"
+    util-deprecate: "npm:^1.0.2"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -7989,7 +8699,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 84c0e31b5c7a9ced05a432932a391c9c0396f3d6162f4506afc08d6df660d4114eed14c92428c06f013e70069f2c18e134f1be0700a1841ecf177f6decd8cc90
+  checksum: 10/eee241bf7aa7f753d9cc5fe32c342152eaa48a77b0aa91c68f7a3686e602de6185c36d713c180a1ee192cd1ceae4b8c2f6a130c69b74dadd5f7aeb4731c525dd
   languageName: node
   linkType: hard
 
@@ -7997,13 +8707,13 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/router@npm:7.4.5"
   dependencies:
-    "@storybook/client-logger": 7.4.5
-    memoizerific: ^1.11.3
-    qs: ^6.10.0
+    "@storybook/client-logger": "npm:7.4.5"
+    memoizerific: "npm:^1.11.3"
+    qs: "npm:^6.10.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: bbbbc0b4e39fe07c5ec9cdb7153ac177361b08131b027e3e7e6f5d0911f7f5323e25b0835c6e85204b66de598b038058612f4888f441fd8b9ff8935a987391ba
+  checksum: 10/0337497fe4972ad60b1b91843d8912003c5102f140a21ba8b082346808b9fcce204f4d6cc1b9f742a94a8d9442f85c109fdb2d166d0fe5b1c86d971561634401
   languageName: node
   linkType: hard
 
@@ -8011,15 +8721,15 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/source-loader@npm:7.4.5"
   dependencies:
-    "@storybook/csf": ^0.1.0
-    "@storybook/types": 7.4.5
-    estraverse: ^5.2.0
-    lodash: ^4.17.21
-    prettier: ^2.8.0
+    "@storybook/csf": "npm:^0.1.0"
+    "@storybook/types": "npm:7.4.5"
+    estraverse: "npm:^5.2.0"
+    lodash: "npm:^4.17.21"
+    prettier: "npm:^2.8.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 53cbf19a4f9626cd28205f9d70815cabb4641143ae634411ec559be07e16d373deaa776423ccbeec81de76782264a62476d9f9848e259f73332fbb39a843d6dc
+  checksum: 10/16c14d3810ba128f50b94682737d02b57ebd26a199cbff7ae5985511589559a11ee67af6e171651be676157c40567b301ee01a8f22cce4746f47e08feb68a993
   languageName: node
   linkType: hard
 
@@ -8027,9 +8737,9 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/store@npm:7.4.5"
   dependencies:
-    "@storybook/client-logger": 7.4.5
-    "@storybook/preview-api": 7.4.5
-  checksum: b5372f42049dda7cd80cc284f6d4609ce344d14c1436e6903862744b8668db0cd7d9445cc19819ebaf1c4ca0142fb908a42572e72ace70629732653632f32d3b
+    "@storybook/client-logger": "npm:7.4.5"
+    "@storybook/preview-api": "npm:7.4.5"
+  checksum: 10/b5372f42049dda7cd80cc284f6d4609ce344d14c1436e6903862744b8668db0cd7d9445cc19819ebaf1c4ca0142fb908a42572e72ace70629732653632f32d3b
   languageName: node
   linkType: hard
 
@@ -8037,15 +8747,15 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/telemetry@npm:7.4.5"
   dependencies:
-    "@storybook/client-logger": 7.4.5
-    "@storybook/core-common": 7.4.5
-    "@storybook/csf-tools": 7.4.5
-    chalk: ^4.1.0
-    detect-package-manager: ^2.0.1
-    fetch-retry: ^5.0.2
-    fs-extra: ^11.1.0
-    read-pkg-up: ^7.0.1
-  checksum: 06c60b61ab3c1f7cec6a55216e7900e5d2dd35fbe668e0ce6a5a05840bae4877d9fa4ff8dbbb51e27fd3ced2ed931db70d0e45458ac51158a01f3ff507228b5a
+    "@storybook/client-logger": "npm:7.4.5"
+    "@storybook/core-common": "npm:7.4.5"
+    "@storybook/csf-tools": "npm:7.4.5"
+    chalk: "npm:^4.1.0"
+    detect-package-manager: "npm:^2.0.1"
+    fetch-retry: "npm:^5.0.2"
+    fs-extra: "npm:^11.1.0"
+    read-pkg-up: "npm:^7.0.1"
+  checksum: 10/ed22619fead32a46e07b859b93bceae5f40bc302450e65f38b3a6899b72b8a2ef10c9d7ca1e3f44f9fa57cae324338d394672167771f8ea932230716be9a6677
   languageName: node
   linkType: hard
 
@@ -8053,14 +8763,14 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/theming@npm:7.4.5"
   dependencies:
-    "@emotion/use-insertion-effect-with-fallbacks": ^1.0.0
-    "@storybook/client-logger": 7.4.5
-    "@storybook/global": ^5.0.0
-    memoizerific: ^1.11.3
+    "@emotion/use-insertion-effect-with-fallbacks": "npm:^1.0.0"
+    "@storybook/client-logger": "npm:7.4.5"
+    "@storybook/global": "npm:^5.0.0"
+    memoizerific: "npm:^1.11.3"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: e2cfacbec35e11fcc7d0b66b85044abbde9d0f97e3150729c480a6b33bf4739ca46f501e6356cf9c961ba6268c0750a6da46bb97d857b1e35f3b123b1b22c9e8
+  checksum: 10/300882982c66f59671db6d25368f86a3666476e48b65531494787be07e6488c96a4a7928894c3b385754f52beb251475db6557f21d602955d67f8c03553f2435
   languageName: node
   linkType: hard
 
@@ -8068,168 +8778,344 @@ __metadata:
   version: 7.4.5
   resolution: "@storybook/types@npm:7.4.5"
   dependencies:
-    "@storybook/channels": 7.4.5
-    "@types/babel__core": ^7.0.0
-    "@types/express": ^4.7.0
-    file-system-cache: 2.3.0
-  checksum: 4739a619bfa74484011574ba3ddfd43fd6b587a35cc2d4c0e24bc5ab5b6202269806ce354be1e2549ee7a19dcc334c439c70a3614d7514ab73ac7588d262e3b3
+    "@storybook/channels": "npm:7.4.5"
+    "@types/babel__core": "npm:^7.0.0"
+    "@types/express": "npm:^4.7.0"
+    file-system-cache: "npm:2.3.0"
+  checksum: 10/d351e51df0d362258811db6d95c353219296f79572c5697bed7b93a561616170adecabbc7c67be3d2a5d3acf4187c0aa75229b8dd2924db44d8d4c09f51a6d4e
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-plugin-add-jsx-attribute@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@svgr/babel-plugin-add-jsx-attribute@npm:8.0.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/3fc8e35d16f5abe0af5efe5851f27581225ac405d6a1ca44cda0df064cddfcc29a428c48c2e4bef6cebf627c9ac2f652a096030edb02cf5a120ce28d3c234710
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-plugin-remove-jsx-attribute@npm:8.0.0, @svgr/babel-plugin-remove-jsx-attribute@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "@svgr/babel-plugin-remove-jsx-attribute@npm:8.0.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/ff992893c6c4ac802713ba3a97c13be34e62e6d981c813af40daabcd676df68a72a61bd1e692bb1eda3587f1b1d700ea462222ae2153bb0f46886632d4f88d08
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-plugin-remove-jsx-empty-expression@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@svgr/babel-plugin-remove-jsx-empty-expression@npm:8.0.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/0fb691b63a21bac00da3aa2dccec50d0d5a5b347ff408d60803b84410d8af168f2656e4ba1ee1f24dab0ae4e4af77901f2928752bb0434c1f6788133ec599ec8
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-plugin-replace-jsx-attribute-value@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@svgr/babel-plugin-replace-jsx-attribute-value@npm:8.0.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/1edda65ef4f4dd8f021143c8ec276a08f6baa6f733b8e8ee2e7775597bf6b97afb47fdeefd579d6ae6c959fe2e634f55cd61d99377631212228c8cfb351b8921
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-plugin-svg-dynamic-title@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@svgr/babel-plugin-svg-dynamic-title@npm:8.0.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/876cec891488992e6a9aebb8155e2bea4ec461b4718c51de36e988e00e271c6d9d01ef6be17b9effd44b2b3d7db0b41c161a5904a46ae6f38b26b387ad7f3709
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-plugin-svg-em-dimensions@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@svgr/babel-plugin-svg-em-dimensions@npm:8.0.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/be0e2d391164428327d9ec469a52cea7d93189c6b0e2c290999e048f597d777852f701c64dca44cd45b31ed14a7f859520326e2e4ad7c3a4545d0aa235bc7e9a
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-plugin-transform-react-native-svg@npm:8.1.0":
+  version: 8.1.0
+  resolution: "@svgr/babel-plugin-transform-react-native-svg@npm:8.1.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/85b434a57572f53bd2b9f0606f253e1fcf57b4a8c554ec3f2d43ed17f50d8cae200cb3aaf1ec9d626e1456e8b135dce530ae047eb0bed6d4bf98a752d6640459
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-plugin-transform-svg-component@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@svgr/babel-plugin-transform-svg-component@npm:8.0.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/86ca139c0be0e7df05f103c5f10874387ada1434ca0286584ba9cd367c259d74bf9c86700b856449f46cf674bd6f0cf18f8f034f6d3f0e2ce5e5435c25dbff4b
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-preset@npm:8.1.0":
+  version: 8.1.0
+  resolution: "@svgr/babel-preset@npm:8.1.0"
+  dependencies:
+    "@svgr/babel-plugin-add-jsx-attribute": "npm:8.0.0"
+    "@svgr/babel-plugin-remove-jsx-attribute": "npm:8.0.0"
+    "@svgr/babel-plugin-remove-jsx-empty-expression": "npm:8.0.0"
+    "@svgr/babel-plugin-replace-jsx-attribute-value": "npm:8.0.0"
+    "@svgr/babel-plugin-svg-dynamic-title": "npm:8.0.0"
+    "@svgr/babel-plugin-svg-em-dimensions": "npm:8.0.0"
+    "@svgr/babel-plugin-transform-react-native-svg": "npm:8.1.0"
+    "@svgr/babel-plugin-transform-svg-component": "npm:8.0.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/3a67930f080b8891e1e8e2595716b879c944d253112bae763dce59807ba23454d162216c8d66a0a0e3d4f38a649ecd6c387e545d1e1261dd69a68e9a3392ee08
+  languageName: node
+  linkType: hard
+
+"@svgr/cli@npm:^8.1.0":
+  version: 8.1.0
+  resolution: "@svgr/cli@npm:8.1.0"
+  dependencies:
+    "@svgr/core": "npm:8.1.0"
+    "@svgr/plugin-jsx": "npm:8.1.0"
+    "@svgr/plugin-prettier": "npm:8.1.0"
+    "@svgr/plugin-svgo": "npm:8.1.0"
+    camelcase: "npm:^6.2.0"
+    chalk: "npm:^4.1.2"
+    commander: "npm:^9.4.1"
+    dashify: "npm:^2.0.0"
+    glob: "npm:^8.0.3"
+    snake-case: "npm:^3.0.4"
+  bin:
+    svgr: bin/svgr
+  checksum: 10/b3478ebcbc3783160b548af5bfe352decdf6255b54d9256b752b2fabc296d743d55805eb596b82110e482b176fc3eab9ad91f979e92a505f224b27c1b9e3dbb1
+  languageName: node
+  linkType: hard
+
+"@svgr/core@npm:8.1.0":
+  version: 8.1.0
+  resolution: "@svgr/core@npm:8.1.0"
+  dependencies:
+    "@babel/core": "npm:^7.21.3"
+    "@svgr/babel-preset": "npm:8.1.0"
+    camelcase: "npm:^6.2.0"
+    cosmiconfig: "npm:^8.1.3"
+    snake-case: "npm:^3.0.4"
+  checksum: 10/bc98cd5fc349ab9dcf0c13c2279164726d45878cdac8999090765379c6e897a1b24aca641c12a3c33f578d06f7a09252fb090962a4695c753fb02b627a56bfe6
+  languageName: node
+  linkType: hard
+
+"@svgr/hast-util-to-babel-ast@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@svgr/hast-util-to-babel-ast@npm:8.0.0"
+  dependencies:
+    "@babel/types": "npm:^7.21.3"
+    entities: "npm:^4.4.0"
+  checksum: 10/243aa9c92d66aa3f1fc82851fe1fa376808a08fcc02719fed38ebfb4e25cf3e3c1282c185300c29953d047c36acb9e3ac588d46b0af55a3b7a5186a6badec8a9
+  languageName: node
+  linkType: hard
+
+"@svgr/plugin-jsx@npm:8.1.0, @svgr/plugin-jsx@npm:^8.1.0":
+  version: 8.1.0
+  resolution: "@svgr/plugin-jsx@npm:8.1.0"
+  dependencies:
+    "@babel/core": "npm:^7.21.3"
+    "@svgr/babel-preset": "npm:8.1.0"
+    "@svgr/hast-util-to-babel-ast": "npm:8.0.0"
+    svg-parser: "npm:^2.0.4"
+  peerDependencies:
+    "@svgr/core": "*"
+  checksum: 10/0418a9780753d3544912ee2dad5d2cf8d12e1ba74df8053651b3886aeda54d5f0f7d2dece0af5e0d838332c4f139a57f0dabaa3ca1afa4d1a765efce6a7656f2
+  languageName: node
+  linkType: hard
+
+"@svgr/plugin-prettier@npm:8.1.0, @svgr/plugin-prettier@npm:^8.1.0":
+  version: 8.1.0
+  resolution: "@svgr/plugin-prettier@npm:8.1.0"
+  dependencies:
+    deepmerge: "npm:^4.3.1"
+    prettier: "npm:^2.8.7"
+  peerDependencies:
+    "@svgr/core": "*"
+  checksum: 10/834373d7d34906cfa67191933153c8c71bb5c13eff71e113730c8642b2abcce136cb0e1869d52642fe305593a84c1d54d39543f24091f6b8a2620c1333691638
+  languageName: node
+  linkType: hard
+
+"@svgr/plugin-svgo@npm:8.1.0, @svgr/plugin-svgo@npm:^8.1.0":
+  version: 8.1.0
+  resolution: "@svgr/plugin-svgo@npm:8.1.0"
+  dependencies:
+    cosmiconfig: "npm:^8.1.3"
+    deepmerge: "npm:^4.3.1"
+    svgo: "npm:^3.0.2"
+  peerDependencies:
+    "@svgr/core": "*"
+  checksum: 10/59d9d214cebaacca9ca71a561f463d8b7e5a68ca9443e4792a42d903acd52259b1790c0680bc6afecc3f00a255a6cbd7ea278a9f625bac443620ea58a590c2d0
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-arm64@npm:1.3.38":
-  version: 1.3.38
-  resolution: "@swc/core-darwin-arm64@npm:1.3.38"
+"@swc/core-darwin-arm64@npm:1.4.2":
+  version: 1.4.2
+  resolution: "@swc/core-darwin-arm64@npm:1.4.2"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-arm64@npm:1.3.90":
-  version: 1.3.90
-  resolution: "@swc/core-darwin-arm64@npm:1.3.90"
+"@swc/core-darwin-arm64@npm:1.4.6":
+  version: 1.4.6
+  resolution: "@swc/core-darwin-arm64@npm:1.4.6"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-x64@npm:1.3.38":
-  version: 1.3.38
-  resolution: "@swc/core-darwin-x64@npm:1.3.38"
+"@swc/core-darwin-x64@npm:1.4.2":
+  version: 1.4.2
+  resolution: "@swc/core-darwin-x64@npm:1.4.2"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-x64@npm:1.3.90":
-  version: 1.3.90
-  resolution: "@swc/core-darwin-x64@npm:1.3.90"
+"@swc/core-darwin-x64@npm:1.4.6":
+  version: 1.4.6
+  resolution: "@swc/core-darwin-x64@npm:1.4.6"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm-gnueabihf@npm:1.3.38":
-  version: 1.3.38
-  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.38"
+"@swc/core-linux-arm-gnueabihf@npm:1.4.2":
+  version: 1.4.2
+  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.4.2"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm-gnueabihf@npm:1.3.90":
-  version: 1.3.90
-  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.90"
+"@swc/core-linux-arm-gnueabihf@npm:1.4.6":
+  version: 1.4.6
+  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.4.6"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-gnu@npm:1.3.38":
-  version: 1.3.38
-  resolution: "@swc/core-linux-arm64-gnu@npm:1.3.38"
+"@swc/core-linux-arm64-gnu@npm:1.4.2":
+  version: 1.4.2
+  resolution: "@swc/core-linux-arm64-gnu@npm:1.4.2"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-gnu@npm:1.3.90":
-  version: 1.3.90
-  resolution: "@swc/core-linux-arm64-gnu@npm:1.3.90"
+"@swc/core-linux-arm64-gnu@npm:1.4.6":
+  version: 1.4.6
+  resolution: "@swc/core-linux-arm64-gnu@npm:1.4.6"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-musl@npm:1.3.38":
-  version: 1.3.38
-  resolution: "@swc/core-linux-arm64-musl@npm:1.3.38"
+"@swc/core-linux-arm64-musl@npm:1.4.2":
+  version: 1.4.2
+  resolution: "@swc/core-linux-arm64-musl@npm:1.4.2"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-musl@npm:1.3.90":
-  version: 1.3.90
-  resolution: "@swc/core-linux-arm64-musl@npm:1.3.90"
+"@swc/core-linux-arm64-musl@npm:1.4.6":
+  version: 1.4.6
+  resolution: "@swc/core-linux-arm64-musl@npm:1.4.6"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-gnu@npm:1.3.38":
-  version: 1.3.38
-  resolution: "@swc/core-linux-x64-gnu@npm:1.3.38"
+"@swc/core-linux-x64-gnu@npm:1.4.2":
+  version: 1.4.2
+  resolution: "@swc/core-linux-x64-gnu@npm:1.4.2"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-gnu@npm:1.3.90":
-  version: 1.3.90
-  resolution: "@swc/core-linux-x64-gnu@npm:1.3.90"
+"@swc/core-linux-x64-gnu@npm:1.4.6":
+  version: 1.4.6
+  resolution: "@swc/core-linux-x64-gnu@npm:1.4.6"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-musl@npm:1.3.38":
-  version: 1.3.38
-  resolution: "@swc/core-linux-x64-musl@npm:1.3.38"
+"@swc/core-linux-x64-musl@npm:1.4.2":
+  version: 1.4.2
+  resolution: "@swc/core-linux-x64-musl@npm:1.4.2"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-musl@npm:1.3.90":
-  version: 1.3.90
-  resolution: "@swc/core-linux-x64-musl@npm:1.3.90"
+"@swc/core-linux-x64-musl@npm:1.4.6":
+  version: 1.4.6
+  resolution: "@swc/core-linux-x64-musl@npm:1.4.6"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-win32-arm64-msvc@npm:1.3.38":
-  version: 1.3.38
-  resolution: "@swc/core-win32-arm64-msvc@npm:1.3.38"
+"@swc/core-win32-arm64-msvc@npm:1.4.2":
+  version: 1.4.2
+  resolution: "@swc/core-win32-arm64-msvc@npm:1.4.2"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-win32-arm64-msvc@npm:1.3.90":
-  version: 1.3.90
-  resolution: "@swc/core-win32-arm64-msvc@npm:1.3.90"
+"@swc/core-win32-arm64-msvc@npm:1.4.6":
+  version: 1.4.6
+  resolution: "@swc/core-win32-arm64-msvc@npm:1.4.6"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-win32-ia32-msvc@npm:1.3.38":
-  version: 1.3.38
-  resolution: "@swc/core-win32-ia32-msvc@npm:1.3.38"
+"@swc/core-win32-ia32-msvc@npm:1.4.2":
+  version: 1.4.2
+  resolution: "@swc/core-win32-ia32-msvc@npm:1.4.2"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@swc/core-win32-ia32-msvc@npm:1.3.90":
-  version: 1.3.90
-  resolution: "@swc/core-win32-ia32-msvc@npm:1.3.90"
+"@swc/core-win32-ia32-msvc@npm:1.4.6":
+  version: 1.4.6
+  resolution: "@swc/core-win32-ia32-msvc@npm:1.4.6"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@swc/core-win32-x64-msvc@npm:1.3.38":
-  version: 1.3.38
-  resolution: "@swc/core-win32-x64-msvc@npm:1.3.38"
+"@swc/core-win32-x64-msvc@npm:1.4.2":
+  version: 1.4.2
+  resolution: "@swc/core-win32-x64-msvc@npm:1.4.2"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core-win32-x64-msvc@npm:1.3.90":
-  version: 1.3.90
-  resolution: "@swc/core-win32-x64-msvc@npm:1.3.90"
+"@swc/core-win32-x64-msvc@npm:1.4.6":
+  version: 1.4.6
+  resolution: "@swc/core-win32-x64-msvc@npm:1.4.6"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core@npm:1.3.38":
-  version: 1.3.38
-  resolution: "@swc/core@npm:1.3.38"
-  dependencies:
-    "@swc/core-darwin-arm64": 1.3.38
-    "@swc/core-darwin-x64": 1.3.38
-    "@swc/core-linux-arm-gnueabihf": 1.3.38
-    "@swc/core-linux-arm64-gnu": 1.3.38
-    "@swc/core-linux-arm64-musl": 1.3.38
-    "@swc/core-linux-x64-gnu": 1.3.38
-    "@swc/core-linux-x64-musl": 1.3.38
-    "@swc/core-win32-arm64-msvc": 1.3.38
-    "@swc/core-win32-ia32-msvc": 1.3.38
-    "@swc/core-win32-x64-msvc": 1.3.38
+"@swc/core@npm:1.4.2":
+  version: 1.4.2
+  resolution: "@swc/core@npm:1.4.2"
+  dependencies:
+    "@swc/core-darwin-arm64": "npm:1.4.2"
+    "@swc/core-darwin-x64": "npm:1.4.2"
+    "@swc/core-linux-arm-gnueabihf": "npm:1.4.2"
+    "@swc/core-linux-arm64-gnu": "npm:1.4.2"
+    "@swc/core-linux-arm64-musl": "npm:1.4.2"
+    "@swc/core-linux-x64-gnu": "npm:1.4.2"
+    "@swc/core-linux-x64-musl": "npm:1.4.2"
+    "@swc/core-win32-arm64-msvc": "npm:1.4.2"
+    "@swc/core-win32-ia32-msvc": "npm:1.4.2"
+    "@swc/core-win32-x64-msvc": "npm:1.4.2"
+    "@swc/counter": "npm:^0.1.2"
+    "@swc/types": "npm:^0.1.5"
+  peerDependencies:
+    "@swc/helpers": ^0.5.0
   dependenciesMeta:
     "@swc/core-darwin-arm64":
       optional: true
@@ -8251,26 +9137,29 @@ __metadata:
       optional: true
     "@swc/core-win32-x64-msvc":
       optional: true
-  checksum: c55d30e57638bcd21f788add8490c3f3e71bfe027aa5a8b153e1b1b9686ecddd6deeaaa6a6b17717c7eab4c1e2a232b465b6755b6c891506fc0d03139badfbf7
+  peerDependenciesMeta:
+    "@swc/helpers":
+      optional: true
+  checksum: 10/750c09e35fb14317b1ff7f8f528eebd732988ce34736c3404805e70ff44e08a19ec6d0c16b9468fab602b596eb39cc6d2771f0483a62efd614768e046323b5f4
   languageName: node
   linkType: hard
 
 "@swc/core@npm:^1.3.49":
-  version: 1.3.90
-  resolution: "@swc/core@npm:1.3.90"
-  dependencies:
-    "@swc/core-darwin-arm64": 1.3.90
-    "@swc/core-darwin-x64": 1.3.90
-    "@swc/core-linux-arm-gnueabihf": 1.3.90
-    "@swc/core-linux-arm64-gnu": 1.3.90
-    "@swc/core-linux-arm64-musl": 1.3.90
-    "@swc/core-linux-x64-gnu": 1.3.90
-    "@swc/core-linux-x64-musl": 1.3.90
-    "@swc/core-win32-arm64-msvc": 1.3.90
-    "@swc/core-win32-ia32-msvc": 1.3.90
-    "@swc/core-win32-x64-msvc": 1.3.90
-    "@swc/counter": ^0.1.1
-    "@swc/types": ^0.1.5
+  version: 1.4.6
+  resolution: "@swc/core@npm:1.4.6"
+  dependencies:
+    "@swc/core-darwin-arm64": "npm:1.4.6"
+    "@swc/core-darwin-x64": "npm:1.4.6"
+    "@swc/core-linux-arm-gnueabihf": "npm:1.4.6"
+    "@swc/core-linux-arm64-gnu": "npm:1.4.6"
+    "@swc/core-linux-arm64-musl": "npm:1.4.6"
+    "@swc/core-linux-x64-gnu": "npm:1.4.6"
+    "@swc/core-linux-x64-musl": "npm:1.4.6"
+    "@swc/core-win32-arm64-msvc": "npm:1.4.6"
+    "@swc/core-win32-ia32-msvc": "npm:1.4.6"
+    "@swc/core-win32-x64-msvc": "npm:1.4.6"
+    "@swc/counter": "npm:^0.1.2"
+    "@swc/types": "npm:^0.1.5"
   peerDependencies:
     "@swc/helpers": ^0.5.0
   dependenciesMeta:
@@ -8297,102 +9186,79 @@ __metadata:
   peerDependenciesMeta:
     "@swc/helpers":
       optional: true
-  checksum: f8ced5187068dc73445c135065c6492f0ac559d0f7720c2482aa9663c87bd015f3d2abef6ee7b2f817280a5e8dd0946c59cce7e1499180644fbc948a9e3823ab
-  languageName: node
-  linkType: hard
-
-"@swc/counter@npm:^0.1.1":
-  version: 0.1.1
-  resolution: "@swc/counter@npm:0.1.1"
-  checksum: bb974babd493ba01c0d4a95ab610c3fc15fbf609c08cb0342798e485f57ecc0950abbf84e07124e63c5fe610b492d9a8dd03701d3b9ef7329d9e8bf3cc44980f
+  checksum: 10/acf826107e5c72d2cf436fb80b4799b5fd2981e4493bcf573cdcc2c6abd02b29942df8f6b15f6c67a1d39bb709ac9e67194879f0dd7d36bdb41782a3ca612841
   languageName: node
   linkType: hard
 
-"@swc/helpers@npm:0.4.14":
-  version: 0.4.14
-  resolution: "@swc/helpers@npm:0.4.14"
-  dependencies:
-    tslib: ^2.4.0
-  checksum: 273fd3f3fc461a92f3790cc551ea054745c6d6959afbe1232e6d7aa1c722bbc114d308aab96bef5c78fc0303c85c7b472ef00e2253251cc89737f3b1af56e5a5
+"@swc/counter@npm:^0.1.2, @swc/counter@npm:^0.1.3":
+  version: 0.1.3
+  resolution: "@swc/counter@npm:0.1.3"
+  checksum: 10/df8f9cfba9904d3d60f511664c70d23bb323b3a0803ec9890f60133954173047ba9bdeabce28cd70ba89ccd3fd6c71c7b0bd58be85f611e1ffbe5d5c18616598
   languageName: node
   linkType: hard
 
-"@swc/helpers@npm:^0.5.0":
-  version: 0.5.1
-  resolution: "@swc/helpers@npm:0.5.1"
+"@swc/helpers@npm:0.5.8, @swc/helpers@npm:^0.5.0":
+  version: 0.5.8
+  resolution: "@swc/helpers@npm:0.5.8"
   dependencies:
-    tslib: ^2.4.0
-  checksum: 71e0e27234590435e4c62b97ef5e796f88e786841a38c7116a5e27a3eafa7b9ead7cdec5249b32165902076de78446945311c973e59bddf77c1e24f33a8f272a
+    tslib: "npm:^2.4.0"
+  checksum: 10/3f4caa7bd4411c134caf833ff13bfeee62bd86654e2122a4f3ed8dfd1247651d3b81e64c0fd7dbb605089e6c68bb7416062341c097c155298bd3c0f7de58dc45
   languageName: node
   linkType: hard
 
 "@swc/types@npm:^0.1.5":
   version: 0.1.5
   resolution: "@swc/types@npm:0.1.5"
-  checksum: 6aee11f62d3d805a64848e0bd5f0e0e615f958e327a9e1260056c368d7d28764d89e38bd8005a536c9bf18afbcd303edd84099d60df34a2975d62540f61df13b
-  languageName: node
-  linkType: hard
-
-"@testing-library/dom@npm:9.3.3, @testing-library/dom@npm:>=7, @testing-library/dom@npm:^9.0.0":
-  version: 9.3.3
-  resolution: "@testing-library/dom@npm:9.3.3"
-  dependencies:
-    "@babel/code-frame": ^7.10.4
-    "@babel/runtime": ^7.12.5
-    "@types/aria-query": ^5.0.1
-    aria-query: 5.1.3
-    chalk: ^4.1.0
-    dom-accessibility-api: ^0.5.9
-    lz-string: ^1.5.0
-    pretty-format: ^27.0.2
-  checksum: 34e0a564da7beb92aa9cc44a9080221e2412b1a132eb37be3d513fe6c58027674868deb9f86195756d98d15ba969a30fe00632a4e26e25df2a5a4f6ac0686e37
+  checksum: 10/5f4de8c60d2623bed607c7fa1e0cee4ffc682af28d5ffe88dc9ed9903a1c2088ccc39f684689d6bb314595c9fbb560beaec773d633be515fb856ffc81d738822
   languageName: node
   linkType: hard
 
-"@testing-library/jest-dom@npm:5.16.5":
-  version: 5.16.5
-  resolution: "@testing-library/jest-dom@npm:5.16.5"
+"@testing-library/dom@npm:9.3.4, @testing-library/dom@npm:>=7, @testing-library/dom@npm:^9.0.0":
+  version: 9.3.4
+  resolution: "@testing-library/dom@npm:9.3.4"
   dependencies:
-    "@adobe/css-tools": ^4.0.1
-    "@babel/runtime": ^7.9.2
-    "@types/testing-library__jest-dom": ^5.9.1
-    aria-query: ^5.0.0
-    chalk: ^3.0.0
-    css.escape: ^1.5.1
-    dom-accessibility-api: ^0.5.6
-    lodash: ^4.17.15
-    redent: ^3.0.0
-  checksum: 94911f901a8031f3e489d04ac057cb5373621230f5d92bed80e514e24b069fb58a3166d1dd86963e55f078a1bd999da595e2ab96ed95f452d477e272937d792a
+    "@babel/code-frame": "npm:^7.10.4"
+    "@babel/runtime": "npm:^7.12.5"
+    "@types/aria-query": "npm:^5.0.1"
+    aria-query: "npm:5.1.3"
+    chalk: "npm:^4.1.0"
+    dom-accessibility-api: "npm:^0.5.9"
+    lz-string: "npm:^1.5.0"
+    pretty-format: "npm:^27.0.2"
+  checksum: 10/510da752ea76f4a10a0a4e3a77917b0302cf03effe576cd3534cab7e796533ee2b0e9fb6fb11b911a1ebd7c70a0bb6f235bf4f816c9b82b95b8fe0cddfd10975
   languageName: node
   linkType: hard
 
-"@testing-library/jest-dom@npm:^6.1.2":
-  version: 6.1.2
-  resolution: "@testing-library/jest-dom@npm:6.1.2"
+"@testing-library/jest-dom@npm:6.4.2, @testing-library/jest-dom@npm:^6.1.2":
+  version: 6.4.2
+  resolution: "@testing-library/jest-dom@npm:6.4.2"
   dependencies:
-    "@adobe/css-tools": ^4.3.0
-    "@babel/runtime": ^7.9.2
-    aria-query: ^5.0.0
-    chalk: ^3.0.0
-    css.escape: ^1.5.1
-    dom-accessibility-api: ^0.5.6
-    lodash: ^4.17.15
-    redent: ^3.0.0
+    "@adobe/css-tools": "npm:^4.3.2"
+    "@babel/runtime": "npm:^7.9.2"
+    aria-query: "npm:^5.0.0"
+    chalk: "npm:^3.0.0"
+    css.escape: "npm:^1.5.1"
+    dom-accessibility-api: "npm:^0.6.3"
+    lodash: "npm:^4.17.15"
+    redent: "npm:^3.0.0"
   peerDependencies:
     "@jest/globals": ">= 28"
+    "@types/bun": "*"
     "@types/jest": ">= 28"
     jest: ">= 28"
     vitest: ">= 0.32"
   peerDependenciesMeta:
     "@jest/globals":
       optional: true
+    "@types/bun":
+      optional: true
     "@types/jest":
       optional: true
     jest:
       optional: true
     vitest:
       optional: true
-  checksum: de6b7f98d1b42887192eb70fd917b2b98d92aab22a86801718de75e0ca4964589335efeb650b0f7b9859609446b20d2bd81bfc5755f1655885d5664d1c093a70
+  checksum: 10/7ee1e51caffad032734a4a43a00bf72d49080cf1bbf53021b443e91c7fa3762a66f55ce68f1c6643590fe66fbc4df92142659b8cf17c92166a3fb22691987e0d
   languageName: node
   linkType: hard
 
@@ -8400,8 +9266,8 @@ __metadata:
   version: 8.0.1
   resolution: "@testing-library/react-hooks@npm:8.0.1"
   dependencies:
-    "@babel/runtime": ^7.12.5
-    react-error-boundary: ^3.1.0
+    "@babel/runtime": "npm:^7.12.5"
+    react-error-boundary: "npm:^3.1.0"
   peerDependencies:
     "@types/react": ^16.9.0 || ^17.0.0
     react: ^16.9.0 || ^17.0.0
@@ -8414,102 +9280,136 @@ __metadata:
       optional: true
     react-test-renderer:
       optional: true
-  checksum: 7fe44352e920deb5cb1876f80d64e48615232072c9d5382f1e0284b3aab46bb1c659a040b774c45cdf084a5257b8fe463f7e08695ad8480d8a15635d4d3d1f6d
+  checksum: 10/f7b69373feebe99bc7d60595822cc5c00a1a5a4801bc4f99b597256a5c1d23c45a51f359051dd8a7bdffcc23b26f324c582e9433c25804934fd351a886812790
   languageName: node
   linkType: hard
 
-"@testing-library/react@npm:14.0.0":
-  version: 14.0.0
-  resolution: "@testing-library/react@npm:14.0.0"
+"@testing-library/react@npm:14.2.2":
+  version: 14.2.2
+  resolution: "@testing-library/react@npm:14.2.2"
   dependencies:
-    "@babel/runtime": ^7.12.5
-    "@testing-library/dom": ^9.0.0
-    "@types/react-dom": ^18.0.0
+    "@babel/runtime": "npm:^7.12.5"
+    "@testing-library/dom": "npm:^9.0.0"
+    "@types/react-dom": "npm:^18.0.0"
   peerDependencies:
     react: ^18.0.0
     react-dom: ^18.0.0
-  checksum: 4a54c8f56cc4a39b50803205f84f06280bb76521d6d5d4b3b36651d760c7c7752ef142d857d52aaf4fad4848ed7a8be49afc793a5dda105955d2f8bef24901ac
+  checksum: 10/3605577fda8d5e27b8919f390f749af91494d03e7ba5ccaf6480ed1184248372c5a4e8fe1c8c3ad4c1a7b3536f37144ba4b4626900ed46dc9811312f280eee31
   languageName: node
   linkType: hard
 
-"@testing-library/user-event@npm:14.5.1":
-  version: 14.5.1
-  resolution: "@testing-library/user-event@npm:14.5.1"
+"@testing-library/user-event@npm:14.5.2":
+  version: 14.5.2
+  resolution: "@testing-library/user-event@npm:14.5.2"
   peerDependencies:
     "@testing-library/dom": ">=7.21.4"
-  checksum: 3e6bc9fd53dfe2f3648190193ed2fd4bca2a1bfb47f68810df3b33f05412526e5fd5c4ef9dc5375635e0f4cdf1859916867b597eed22bda1321e04242ea6c519
+  checksum: 10/49821459d81c6bc435d97128d6386ca24f1e4b3ba8e46cb5a96fe3643efa6e002d88c1b02b7f2ec58da593e805c59b78d7fdf0db565c1f02ba782f63ee984040
   languageName: node
   linkType: hard
 
 "@tootallnate/once@npm:1":
   version: 1.1.2
   resolution: "@tootallnate/once@npm:1.1.2"
-  checksum: e1fb1bbbc12089a0cb9433dc290f97bddd062deadb6178ce9bcb93bb7c1aecde5e60184bc7065aec42fe1663622a213493c48bbd4972d931aae48315f18e1be9
+  checksum: 10/e1fb1bbbc12089a0cb9433dc290f97bddd062deadb6178ce9bcb93bb7c1aecde5e60184bc7065aec42fe1663622a213493c48bbd4972d931aae48315f18e1be9
   languageName: node
   linkType: hard
 
 "@tootallnate/once@npm:2":
   version: 2.0.0
   resolution: "@tootallnate/once@npm:2.0.0"
-  checksum: ad87447820dd3f24825d2d947ebc03072b20a42bfc96cbafec16bff8bbda6c1a81fcb0be56d5b21968560c5359a0af4038a68ba150c3e1694fe4c109a063bed8
+  checksum: 10/ad87447820dd3f24825d2d947ebc03072b20a42bfc96cbafec16bff8bbda6c1a81fcb0be56d5b21968560c5359a0af4038a68ba150c3e1694fe4c109a063bed8
   languageName: node
   linkType: hard
 
 "@trysound/sax@npm:0.2.0":
   version: 0.2.0
   resolution: "@trysound/sax@npm:0.2.0"
-  checksum: 11226c39b52b391719a2a92e10183e4260d9651f86edced166da1d95f39a0a1eaa470e44d14ac685ccd6d3df7e2002433782872c0feeb260d61e80f21250e65c
+  checksum: 10/7379713eca480ac0d9b6c7b063e06b00a7eac57092354556c81027066eb65b61ea141a69d0cc2e15d32e05b2834d4c9c2184793a5e36bbf5daf05ee5676af18c
   languageName: node
   linkType: hard
 
 "@tsconfig/node10@npm:^1.0.7":
   version: 1.0.8
   resolution: "@tsconfig/node10@npm:1.0.8"
-  checksum: b8d5fffbc6b17ef64ef74f7fdbccee02a809a063ade785c3648dae59406bc207f70ea2c4296f92749b33019fa36a5ae716e42e49cc7f1bbf0fd147be0d6b970a
+  checksum: 10/b8d5fffbc6b17ef64ef74f7fdbccee02a809a063ade785c3648dae59406bc207f70ea2c4296f92749b33019fa36a5ae716e42e49cc7f1bbf0fd147be0d6b970a
   languageName: node
   linkType: hard
 
 "@tsconfig/node12@npm:^1.0.7":
   version: 1.0.9
   resolution: "@tsconfig/node12@npm:1.0.9"
-  checksum: a01b2400ab3582b86b589c6d31dcd0c0656f333adecde85d6d7d4086adb059808b82692380bb169546d189bf771ae21d02544a75b57bd6da4a5dd95f8567bec9
+  checksum: 10/a01b2400ab3582b86b589c6d31dcd0c0656f333adecde85d6d7d4086adb059808b82692380bb169546d189bf771ae21d02544a75b57bd6da4a5dd95f8567bec9
   languageName: node
   linkType: hard
 
 "@tsconfig/node14@npm:^1.0.0":
   version: 1.0.1
   resolution: "@tsconfig/node14@npm:1.0.1"
-  checksum: 976345e896c0f059867f94f8d0f6ddb8b1844fb62bf36b727de8a9a68f024857e5db97ed51d3325e23e0616a5e48c034ff51a8d595b3fe7e955f3587540489be
+  checksum: 10/976345e896c0f059867f94f8d0f6ddb8b1844fb62bf36b727de8a9a68f024857e5db97ed51d3325e23e0616a5e48c034ff51a8d595b3fe7e955f3587540489be
   languageName: node
   linkType: hard
 
 "@tsconfig/node16@npm:^1.0.2":
   version: 1.0.2
   resolution: "@tsconfig/node16@npm:1.0.2"
-  checksum: ca94d3639714672bbfd55f03521d3f56bb6a25479bd425da81faf21f13e1e9d15f40f97377dedbbf477a5841c5b0c8f4cd1b391f33553d750b9202c54c2c07aa
+  checksum: 10/ca94d3639714672bbfd55f03521d3f56bb6a25479bd425da81faf21f13e1e9d15f40f97377dedbbf477a5841c5b0c8f4cd1b391f33553d750b9202c54c2c07aa
   languageName: node
   linkType: hard
 
-"@types/angular-route@npm:1.7.3":
-  version: 1.7.3
-  resolution: "@types/angular-route@npm:1.7.3"
+"@tufjs/canonical-json@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@tufjs/canonical-json@npm:1.0.0"
+  checksum: 10/9ff3bcd12988fb23643690da3e009f9130b7b10974f8e7af4bd8ad230a228119de8609aa76d75264fe80f152b50872dea6ea53def69534436a4c24b4fcf6a447
+  languageName: node
+  linkType: hard
+
+"@tufjs/canonical-json@npm:2.0.0":
+  version: 2.0.0
+  resolution: "@tufjs/canonical-json@npm:2.0.0"
+  checksum: 10/cc719a1d0d0ae1aa1ba551a82c87dcbefac088e433c03a3d8a1d547ea721350e47dab4ab5b0fca40d5c7ab1f4882e72edc39c9eae15bf47c45c43bcb6ee39f4f
+  languageName: node
+  linkType: hard
+
+"@tufjs/models@npm:1.0.4":
+  version: 1.0.4
+  resolution: "@tufjs/models@npm:1.0.4"
+  dependencies:
+    "@tufjs/canonical-json": "npm:1.0.0"
+    minimatch: "npm:^9.0.0"
+  checksum: 10/2c63e9cfc04a4ce8888e9cc9668a7207e3047d64c50dccc3d2c30057d8bd6c4e89256b6094d2109549278da72c75e20cd8717bb5f4b544dc2323288a2a96607f
+  languageName: node
+  linkType: hard
+
+"@tufjs/models@npm:2.0.0":
+  version: 2.0.0
+  resolution: "@tufjs/models@npm:2.0.0"
   dependencies:
-    "@types/angular": "*"
-  checksum: f7e551e2e0c510b81003b69b410098349fa067143e03b1d43718de8c826e7c985ef22b7e2be6e691dd006925f4be6188d698edb78ab9a3e86f514aa64bfdf3b9
+    "@tufjs/canonical-json": "npm:2.0.0"
+    minimatch: "npm:^9.0.3"
+  checksum: 10/d89d618c74c4eed3906d9ba5bd1bd9d0fa7a73ad6266b11c74c13102ee00bfdbd8e73fe786bd2e8e3ae347f9a66f044d973a7466dc7c2c2f98a7ff926ff275c4
   languageName: node
   linkType: hard
 
-"@types/angular@npm:*, @types/angular@npm:1.8.5":
-  version: 1.8.5
-  resolution: "@types/angular@npm:1.8.5"
-  checksum: 0de4657a0f38d92389df7f6acea93bea6cbeceb9275c95ce6394ff44761c9350ec5c78b37b3bf66ed3b08d95bc801119246518078279f02008294475a3506010
+"@types/angular-route@npm:1.7.6":
+  version: 1.7.6
+  resolution: "@types/angular-route@npm:1.7.6"
+  dependencies:
+    "@types/angular": "npm:*"
+  checksum: 10/a7b8aede9584b948edefdbedb831aab60ae5b9dba9174f6dc5cbfe4bb75c761ed1fe339e450f4470f9cf6eb63fcd84dd51605da9d7442cf33a4c160c3b9fe5b6
+  languageName: node
+  linkType: hard
+
+"@types/angular@npm:*, @types/angular@npm:1.8.9":
+  version: 1.8.9
+  resolution: "@types/angular@npm:1.8.9"
+  checksum: 10/dc8823c30f4caafbd28333777b9232cb9e67b000c88741a718c911d33254e3affa706d7290851c22e4ee5dac2f675b8e2a93a5f0e3eab5180fa271d2673ffc50
   languageName: node
   linkType: hard
 
 "@types/aria-query@npm:^5.0.1":
   version: 5.0.1
   resolution: "@types/aria-query@npm:5.0.1"
-  checksum: 69fd7cceb6113ed370591aef04b3fd0742e9a1b06dd045c43531448847b85de181495e4566f98e776b37c422a12fd71866e0a1dfd904c5ec3f84d271682901de
+  checksum: 10/0635081bb506576b937899afa8e76e6b8d2faf5662f309d6fdc3fc89c749d63362cd8cb3baa0a6d786fe8664994fbffbb11461fcad62b5394f2663891e722b86
   languageName: node
   linkType: hard
 
@@ -8517,12 +9417,12 @@ __metadata:
   version: 7.20.0
   resolution: "@types/babel__core@npm:7.20.0"
   dependencies:
-    "@babel/parser": ^7.20.7
-    "@babel/types": ^7.20.7
-    "@types/babel__generator": "*"
-    "@types/babel__template": "*"
-    "@types/babel__traverse": "*"
-  checksum: 49b601a0a7637f1f387442c8156bd086cfd10ff4b82b0e1994e73a6396643b5435366fb33d6b604eade8467cca594ef97adcbc412aede90bb112ebe88d0ad6df
+    "@babel/parser": "npm:^7.20.7"
+    "@babel/types": "npm:^7.20.7"
+    "@types/babel__generator": "npm:*"
+    "@types/babel__template": "npm:*"
+    "@types/babel__traverse": "npm:*"
+  checksum: 10/b82e432bfc42075d4f6218e5ed5c4a7cdeb087e0416f969fc65a755c41d129d7e369c93e9a9dc59d43291327aa8d7cd149f3573d1c3b54d0192561d02bb225eb
   languageName: node
   linkType: hard
 
@@ -8530,8 +9430,8 @@ __metadata:
   version: 7.6.3
   resolution: "@types/babel__generator@npm:7.6.3"
   dependencies:
-    "@babel/types": ^7.0.0
-  checksum: 0aa1881c47e3e471cabb9183ae42176591b168a6fe4714d205aec33a7e480d65a8a1ba7fcd9678337aadc34059dc5baa04841e5adfbbe67ae33bad79e7633b8e
+    "@babel/types": "npm:^7.0.0"
+  checksum: 10/11a6fb83c3f9eb6ce19eebfd64e1d558aa445ca7c8c6db3e7760ade517b8734a18cf500e238058ca09ae8486a6350e1071f826f38a5a233ccfc5dd2a009340b3
   languageName: node
   linkType: hard
 
@@ -8539,9 +9439,9 @@ __metadata:
   version: 7.4.1
   resolution: "@types/babel__template@npm:7.4.1"
   dependencies:
-    "@babel/parser": ^7.1.0
-    "@babel/types": ^7.0.0
-  checksum: 649fe8b42c2876be1fd28c6ed9b276f78152d5904ec290b6c861d9ef324206e0a5c242e8305c421ac52ecf6358fa7e32ab7a692f55370484825c1df29b1596ee
+    "@babel/parser": "npm:^7.1.0"
+    "@babel/types": "npm:^7.0.0"
+  checksum: 10/649fe8b42c2876be1fd28c6ed9b276f78152d5904ec290b6c861d9ef324206e0a5c242e8305c421ac52ecf6358fa7e32ab7a692f55370484825c1df29b1596ee
   languageName: node
   linkType: hard
 
@@ -8549,8 +9449,8 @@ __metadata:
   version: 7.14.2
   resolution: "@types/babel__traverse@npm:7.14.2"
   dependencies:
-    "@babel/types": ^7.3.0
-  checksum: a797ea09c72307569e3ee08aa3900ca744ce3091114084f2dc59b67a45ee7d01df7865252790dbfa787a7915ce892cdc820c9b920f3683292765fc656b08dc63
+    "@babel/types": "npm:^7.3.0"
+  checksum: 10/daa949c48570f7ccc1dc0fad6d660244257de7110bae5a151842d4dac6ac90c6e0f476c8d7ac0a5a856fa34cb5f0c3299784da25a07eb79d5a9d75c7e4c68655
   languageName: node
   linkType: hard
 
@@ -8558,25 +9458,25 @@ __metadata:
   version: 1.19.1
   resolution: "@types/body-parser@npm:1.19.1"
   dependencies:
-    "@types/connect": "*"
-    "@types/node": "*"
-  checksum: 2990656ea2de81f3529a3359a79a13b67feb4c627caf7a367fdc0017a178e567b0cc410546bdd219104ad7197c5ee5a90b70193f5253839ea43d9cdb2d2dacee
+    "@types/connect": "npm:*"
+    "@types/node": "npm:*"
+  checksum: 10/2990656ea2de81f3529a3359a79a13b67feb4c627caf7a367fdc0017a178e567b0cc410546bdd219104ad7197c5ee5a90b70193f5253839ea43d9cdb2d2dacee
   languageName: node
   linkType: hard
 
-"@types/bonjour@npm:^3.5.9":
-  version: 3.5.10
-  resolution: "@types/bonjour@npm:3.5.10"
+"@types/bonjour@npm:^3.5.13":
+  version: 3.5.13
+  resolution: "@types/bonjour@npm:3.5.13"
   dependencies:
-    "@types/node": "*"
-  checksum: bfcadb042a41b124c4e3de4925e3be6d35b78f93f27c4535d5ff86980dc0f8bc407ed99b9b54528952dc62834d5a779392f7a12c2947dd19330eb05a6bcae15a
+    "@types/node": "npm:*"
+  checksum: 10/e827570e097bd7d625a673c9c208af2d1a22fa3885c0a1646533cf24394c839c3e5f60ac1bc60c0ddcc69c0615078c9fb2c01b42596c7c582d895d974f2409ee
   languageName: node
   linkType: hard
 
 "@types/chance@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "@types/chance@npm:1.1.3"
-  checksum: df2be43fab359e5fa734fb91aa1c4c15108310be0e4990d00203805a63f9b2182da74eaabc8859b742e150d970decf27a773fcc6cbf28fb5b372c9b1bd7e9b89
+  version: 1.1.6
+  resolution: "@types/chance@npm:1.1.6"
+  checksum: 10/f4366f1b3144d143af3e6f0fad2ed1db7b9bdfa7d82d40944e9619d57fe7e6b60e8c1452f47a8ededa6b2188932879518628ecd9aac81c40384ded39c26338ba
   languageName: node
   linkType: hard
 
@@ -8584,25 +9484,25 @@ __metadata:
   version: 0.31.10
   resolution: "@types/chrome-remote-interface@npm:0.31.10"
   dependencies:
-    devtools-protocol: 0.0.927104
-  checksum: a22195646ab37321864961b4fdd880079af282561a8f22ccbee0007d35b8cbb44b475f9430cfad792481b1c6139fbabba95a76a8a669f533c1d414f449dc1835
+    devtools-protocol: "npm:0.0.927104"
+  checksum: 10/8e5632813c86e295075dc2d590668a6bc5925cae310b56be8f64c4791e550e705330b49dac6dcce5667c7124d222910bbf0bc86b89c843e0261804d6993950cd
   languageName: node
   linkType: hard
 
 "@types/common-tags@npm:^1.8.0":
-  version: 1.8.1
-  resolution: "@types/common-tags@npm:1.8.1"
-  checksum: bec6f68c8c434834380abd1dc057aa6ba26661bb0c65c700b65049e9b104d7be96a987d93dbe8726be68554a23a52514a6967d8903fdb51fb8c78cf909d1e4c1
+  version: 1.8.4
+  resolution: "@types/common-tags@npm:1.8.4"
+  checksum: 10/40c95a2f6388beb1cdeed3c9986ac0d6a3a551fce706e3e364a00ded48ab624b06b1ac8b94679bb2da9653e5eb3e450bad26873f5189993a5d8e8bdace74cbb2
   languageName: node
   linkType: hard
 
-"@types/connect-history-api-fallback@npm:^1.3.5":
-  version: 1.3.5
-  resolution: "@types/connect-history-api-fallback@npm:1.3.5"
+"@types/connect-history-api-fallback@npm:^1.5.4":
+  version: 1.5.4
+  resolution: "@types/connect-history-api-fallback@npm:1.5.4"
   dependencies:
-    "@types/express-serve-static-core": "*"
-    "@types/node": "*"
-  checksum: 464d06e5ab00f113fa89978633d5eb00d225aeb4ebbadc07f6f3bc337aa7cbfcd74957b2a539d6d47f2e128e956a17819973ec7ae62ade2e16e367a6c38b8d3a
+    "@types/express-serve-static-core": "npm:*"
+    "@types/node": "npm:*"
+  checksum: 10/e1dee43b8570ffac02d2d47a2b4ba80d3ca0dd1840632dafb221da199e59dbe3778d3d7303c9e23c6b401f37c076935a5bc2aeae1c4e5feaefe1c371fe2073fd
   languageName: node
   linkType: hard
 
@@ -8610,15 +9510,15 @@ __metadata:
   version: 3.4.35
   resolution: "@types/connect@npm:3.4.35"
   dependencies:
-    "@types/node": "*"
-  checksum: fe81351470f2d3165e8b12ce33542eef89ea893e36dd62e8f7d72566dfb7e448376ae962f9f3ea888547ce8b55a40020ca0e01d637fab5d99567673084542641
+    "@types/node": "npm:*"
+  checksum: 10/fe81351470f2d3165e8b12ce33542eef89ea893e36dd62e8f7d72566dfb7e448376ae962f9f3ea888547ce8b55a40020ca0e01d637fab5d99567673084542641
   languageName: node
   linkType: hard
 
-"@types/cookie@npm:^0.4.1":
-  version: 0.4.1
-  resolution: "@types/cookie@npm:0.4.1"
-  checksum: 3275534ed69a76c68eb1a77d547d75f99fedc80befb75a3d1d03662fb08d697e6f8b1274e12af1a74c6896071b11510631ba891f64d30c78528d0ec45a9c1a18
+"@types/cookie@npm:^0.6.0":
+  version: 0.6.0
+  resolution: "@types/cookie@npm:0.6.0"
+  checksum: 10/b883348d5bf88695fbc2c2276b1c49859267a55cae3cf11ea1dccc1b3be15b466e637ce3242109ba27d616c77c6aa4efe521e3d557110b4fdd9bc332a12445c2
   languageName: node
   linkType: hard
 
@@ -8626,15 +9526,15 @@ __metadata:
   version: 6.0.3
   resolution: "@types/cross-spawn@npm:6.0.3"
   dependencies:
-    "@types/node": "*"
-  checksum: 06d50fa1e1370ef60b9c9085b76adec7d7bc20728fbb02b3c2061d4d922312acf1ba56a7c94d88c27a22fc6241ab6b970c936f3294038a9c97a719fbc8eb8a76
+    "@types/node": "npm:*"
+  checksum: 10/06d50fa1e1370ef60b9c9085b76adec7d7bc20728fbb02b3c2061d4d922312acf1ba56a7c94d88c27a22fc6241ab6b970c936f3294038a9c97a719fbc8eb8a76
   languageName: node
   linkType: hard
 
 "@types/d3-array@npm:*, @types/d3-array@npm:3.0.3":
   version: 3.0.3
   resolution: "@types/d3-array@npm:3.0.3"
-  checksum: 972c8ff009c97c9093883d7597aac7185d4e8c2832d7f25420d8312aa1ebd60182f85fe768615cbc9d73d8819add52eea7ce640e57f5b1668ef389f1dc9569bc
+  checksum: 10/2fee8da651edf772dfa1f1527cc2fd3f39a711de341a93faf4c304dc6a45ae498341481fe0805bfa0c6f7d329453e65cae2f9635503c2cdc8480903ebed67db7
   languageName: node
   linkType: hard
 
@@ -8642,8 +9542,8 @@ __metadata:
   version: 3.0.1
   resolution: "@types/d3-axis@npm:3.0.1"
   dependencies:
-    "@types/d3-selection": "*"
-  checksum: ac3f9f86eee0c3e50876e0c4467200413c7f6904008e3e80ac5e2499ed33f4e328f2ebedd08d0e715c4703ae287f315f5652daae7e630a26e8fd272b7232e02e
+    "@types/d3-selection": "npm:*"
+  checksum: 10/2d321c4f4169d9fdc8a17cca00d1581a2f7e65d7a79f29da055579cc3e9e0809ea28f4578fe2b835d008278ab4e106c694ea4de1da0a35cbe609691537ac2efc
   languageName: node
   linkType: hard
 
@@ -8651,22 +9551,22 @@ __metadata:
   version: 3.0.1
   resolution: "@types/d3-brush@npm:3.0.1"
   dependencies:
-    "@types/d3-selection": "*"
-  checksum: 520e6af41b234cb66d99f3bdab661b7abe2dc024bf8d76332924df7f9d8feb02b34db2dc9430e8f1e315b9b41cba8a5f246e1a0aec46bfe8f84f38c4ff55a4c8
+    "@types/d3-selection": "npm:*"
+  checksum: 10/a77f31cb99d1e00950ab2da9319dad33aea7c0f432ded468070799b24c3839fbb189f2f73562f008b02e5a7c4c5e3f14b4bd1650750223dc6637a6283448ad77
   languageName: node
   linkType: hard
 
 "@types/d3-chord@npm:*":
   version: 3.0.1
   resolution: "@types/d3-chord@npm:3.0.1"
-  checksum: ee15c3fdb0ffbaab356b9cf79e4f2dd4c31ee200fb610f52e102f5f81d70c7c4b56470f2720d1af909b546bebce8b0ca3e3f5d1797daac4f18834b5345cfa4ac
+  checksum: 10/997183bb00d7cc9e64af73bfbbd555230c9463e775a80260e5ced7f3dc6589ea92f27641c4362981ae253c742ddf2aea7f74ef73f312af340ee73c830f4751a8
   languageName: node
   linkType: hard
 
 "@types/d3-color@npm:*, @types/d3-color@npm:3.1.0":
   version: 3.1.0
   resolution: "@types/d3-color@npm:3.1.0"
-  checksum: b1856f17d6366559a68eaba0164f30727e9dc5eaf1b3a6c8844354da228860240423d19fa4de65bff9da26b4ead8843eab14b1566962665412e8fd82c3810554
+  checksum: 10/c5e2129602d5d28bd178632198b158f5d27c958252a9ddf9fdc86ac38b987ae96fdd465be88913914d2ce8a4975358f86ea56362d0ac01365b234a5a8bc31861
   languageName: node
   linkType: hard
 
@@ -8674,23 +9574,23 @@ __metadata:
   version: 3.0.1
   resolution: "@types/d3-contour@npm:3.0.1"
   dependencies:
-    "@types/d3-array": "*"
-    "@types/geojson": "*"
-  checksum: 2f7d7f94913caf529730afed45ad73d057b143ba11d36e1918efc2fd2f52610f48e4510d9b34b606792048c53d405910da1d5014d8dd57f2e064b26ed5578c4c
+    "@types/d3-array": "npm:*"
+    "@types/geojson": "npm:*"
+  checksum: 10/793cdb084db042c0c184f1217d8cddf1dbb504cad313033461b6bff14cee8cc93f27008c4732f43bda19f95f6aae830ed1a68f3d76a732147f74e68dbc10e7bb
   languageName: node
   linkType: hard
 
 "@types/d3-delaunay@npm:*, @types/d3-delaunay@npm:6.0.1":
   version: 6.0.1
   resolution: "@types/d3-delaunay@npm:6.0.1"
-  checksum: c46fd6f399ed604e9f40841851c432c936c4408af9e61b235a7f6030e93faa9b5c4f6c33a62be221e1d33f48a9162e9c4bbfa173746c0e4787483310da9a03b2
+  checksum: 10/a4c62fdc6fe4a579ed84696d0c208b0b43249a7a6789cee8f6d80f75d31d09b02ca9d831a5a724bd7933ff1a56224a9d07a629b31a6602836f9cbd0629faca64
   languageName: node
   linkType: hard
 
 "@types/d3-dispatch@npm:*":
   version: 3.0.1
   resolution: "@types/d3-dispatch@npm:3.0.1"
-  checksum: cd60dfff9077e89b713538ff6df7938e742a872a7371d2b67ccf365ca569edcfe62339f44280ee875b6e690e32c032e377a09eded478f85361088eef0b6dfa3c
+  checksum: 10/cd60dfff9077e89b713538ff6df7938e742a872a7371d2b67ccf365ca569edcfe62339f44280ee875b6e690e32c032e377a09eded478f85361088eef0b6dfa3c
   languageName: node
   linkType: hard
 
@@ -8698,22 +9598,22 @@ __metadata:
   version: 3.0.1
   resolution: "@types/d3-drag@npm:3.0.1"
   dependencies:
-    "@types/d3-selection": "*"
-  checksum: d83b66cd2e0a5c288b32daefdf8b4e611db21f9ad1d6335ae2edc4aed43e03cd9030e4b6aace81195589a4110b44dbe0f44decd413f7aa60626715659a74d4b8
+    "@types/d3-selection": "npm:*"
+  checksum: 10/7bae2779d127fec2d384bab2cbb07c19102a2d51c72093cdd1a815e74448a077822544d3617f3d7fc3b7c0a7a2829693431ba7db03d1ac61662a71b21b2eee5a
   languageName: node
   linkType: hard
 
 "@types/d3-dsv@npm:*":
   version: 3.0.0
   resolution: "@types/d3-dsv@npm:3.0.0"
-  checksum: f145219dae2f899bfd581241ee4eb8b755dc56873f2af4e3b60086e56e1979e844d8d2fd99c08be77ff33e648af13a93edcf6a4b892a56936f4b258d44494b77
+  checksum: 10/520b268f40b1e75aaf776dcab32dd4c766590988350a7ffe022c23ab8e0bd70d0e28592c334d0178128fd05cfd7e4c20c828e20b01af7bca0d2547afe41d6389
   languageName: node
   linkType: hard
 
 "@types/d3-ease@npm:*":
   version: 3.0.0
   resolution: "@types/d3-ease@npm:3.0.0"
-  checksum: 1be7c993643b5a08332e0ee146375a3845545d8deb423db5d152e0b061524385d2345ceccf968f75f605247b940dd3f9a144335fee2e7d935cddaf187afb7095
+  checksum: 10/2c19e583e879ebc510080a245e278c9d31c9f05fb61cc4aa3ee393d4e86a59392d8460ed5651ea7a2e71b4b4eb4d86f71fabfd4f32f2abd0f61c182f0705fcba
   languageName: node
   linkType: hard
 
@@ -8721,89 +9621,98 @@ __metadata:
   version: 3.0.1
   resolution: "@types/d3-fetch@npm:3.0.1"
   dependencies:
-    "@types/d3-dsv": "*"
-  checksum: 5238f007e1749d533dfe80f925c31c3d602134de0229d5b153ebd166a8650c0bf057ef54835e5b6d7cedcdb09cf6eeb0e5615e4f35cb3d455845f4594b23554b
+    "@types/d3-dsv": "npm:*"
+  checksum: 10/4369842d970b06079ff43a4c7384e454776b5fef42b445f78021e078413d0cb5b11408f30cdc4db3e674419d1b7cccd178fd70faf5177f8df5ec89ae39f62f53
   languageName: node
   linkType: hard
 
 "@types/d3-force@npm:*, @types/d3-force@npm:^3.0.0":
-  version: 3.0.4
-  resolution: "@types/d3-force@npm:3.0.4"
-  checksum: 779fb597fb41e7bc6a5e1b8969d500deb95c4a73428c7c268bf0ca6f3ed668dd2ed6aa652de7af14d2f9c192dad4f6e7badf2c5bc330624bd8405ac88440b278
+  version: 3.0.9
+  resolution: "@types/d3-force@npm:3.0.9"
+  checksum: 10/e7f2260b9d57d0623f24b2876a10f6e4f7b9690035a5d9e776513b5f9261d0d1a8c436b0b977445f1753686b88ce1cecf3dd4538907da833c6ddc03cfbf45936
   languageName: node
   linkType: hard
 
 "@types/d3-format@npm:*, @types/d3-format@npm:3.0.1":
   version: 3.0.1
   resolution: "@types/d3-format@npm:3.0.1"
-  checksum: 6819fae7e7c3fce1e44cd56e9b6d8ea5508f708cb7a42793edf82ff914b120bf6cddc35208b1b33ec82615ab82b843c284709f9cea5c3fe1ea5f012106b3d32c
+  checksum: 10/f52886eeec5d471c8fcb83d9731fd8d98a6e119666a7480880513c7cc8654c1e43d0e6d5ae8023d0c22c376ba17c560c9aaca8daea488a2d1fb117366d228f0a
   languageName: node
   linkType: hard
 
-"@types/d3-geo@npm:*":
-  version: 3.0.2
-  resolution: "@types/d3-geo@npm:3.0.2"
+"@types/d3-geo@npm:*, @types/d3-geo@npm:3.1.0":
+  version: 3.1.0
+  resolution: "@types/d3-geo@npm:3.1.0"
   dependencies:
-    "@types/geojson": "*"
-  checksum: 23ecb29d818ef62e8a7a8fd97bcea8b9e36ce52035fe8e102fb567f223b7b530716a4dd6d4e66bb353720b027aba76fea60279ffdeb2d6a7ab89e6e3571bca32
+    "@types/geojson": "npm:*"
+  checksum: 10/e759d98470fe605ff0088247af81c3197cefce72b16eafe8acae606216c3e0a9f908df4e7cd5005ecfe13b8ac8396a51aaa0d282f3ca7d1c3850313a13fac905
   languageName: node
   linkType: hard
 
 "@types/d3-hierarchy@npm:*":
   version: 3.0.2
   resolution: "@types/d3-hierarchy@npm:3.0.2"
-  checksum: d215dd0d2bbd6f3cf0cc15af314a27814e655771658cb3a3a7b00d5fab3de36aa08b396973c6da594f828a716d04019e17c67f8cd661167e40ef91f4abefd260
+  checksum: 10/6edbce03db42e73b7ae311d52a8c030da6cc8e84dab380121b61b1ea6086764fbd1f0f23afea0520ba97f9516da42efdf8ff06ed5b7e0b05642804e6d461202c
+  languageName: node
+  linkType: hard
+
+"@types/d3-interpolate@npm:*, @types/d3-interpolate@npm:^3.0.0":
+  version: 3.0.4
+  resolution: "@types/d3-interpolate@npm:3.0.4"
+  dependencies:
+    "@types/d3-color": "npm:*"
+  checksum: 10/72a883afd52c91132598b02a8cdfced9e783c54ca7e4459f9e29d5f45d11fb33f2cabc844e42fd65ba6e28f2a931dcce1add8607d2f02ef6fb8ea5b83ae84127
   languageName: node
   linkType: hard
 
-"@types/d3-interpolate@npm:*, @types/d3-interpolate@npm:3.0.1, @types/d3-interpolate@npm:^3.0.0":
+"@types/d3-interpolate@npm:3.0.1":
   version: 3.0.1
   resolution: "@types/d3-interpolate@npm:3.0.1"
   dependencies:
-    "@types/d3-color": "*"
-  checksum: 29ce472968b9e6611bdf0eeedaf89e8d6066190b52ced011d16d8183b8b9f8e6dd6516ca2b85242594942896299b42f37504d44e635f8fba3090c2c58594e21b
+    "@types/d3-color": "npm:*"
+  checksum: 10/806642d869366ec1b2caeb47a716654611728d3281ac7e2d9f06e2a5a0482ec6028952abbec394b722da8d50f81b4ce9158c741620ea8fec231226ea3bc4bb18
   languageName: node
   linkType: hard
 
 "@types/d3-path@npm:*":
   version: 3.0.0
   resolution: "@types/d3-path@npm:3.0.0"
-  checksum: af7f45ea912cddd794c03384baba856f11e1f9b57a49d05a66a61968dafaeb86e0e42394883118b9b8ccadce21a5f25b1f9a88ad05235e1dc6d24c3e34a379ff
+  checksum: 10/8c884583a00c28fc562c8aecf452b2cfc8fdf90b824d19d5c968632fe3a50bd886d7f2097d70da01e6352fbe5e35716abab1a40518eb4828d29f4a7043488851
   languageName: node
   linkType: hard
 
 "@types/d3-path@npm:^1, @types/d3-path@npm:^1.0.8":
   version: 1.0.9
   resolution: "@types/d3-path@npm:1.0.9"
-  checksum: acbf7376fd7bef61701bce915bf5a9cb5eaa9741b7919d3e644f841a65faf1aea3cf63ba949c21ddda8c9849221394856a2054805aa698d3bb5ac3fe7d029817
+  checksum: 10/bf98e6638ad621953931f62714d2acf255f7b813cf58154c1b3309993fb70bf831285f46e12cd5757dcad7ef70ec7e5d8384f578cb401e5306cb32cf93886ece
   languageName: node
   linkType: hard
 
 "@types/d3-polygon@npm:*":
   version: 3.0.0
   resolution: "@types/d3-polygon@npm:3.0.0"
-  checksum: 2b4fbd864e6e40c8f63c56c46ed27f63c18d4b9b8c6f03c48bda048bc29e0d77c01763122a3cf85cce89acb12c4a65f3cd7b1d87b53ced8bf6ce341831b30190
+  checksum: 10/2b4fbd864e6e40c8f63c56c46ed27f63c18d4b9b8c6f03c48bda048bc29e0d77c01763122a3cf85cce89acb12c4a65f3cd7b1d87b53ced8bf6ce341831b30190
   languageName: node
   linkType: hard
 
 "@types/d3-quadtree@npm:*":
   version: 3.0.2
   resolution: "@types/d3-quadtree@npm:3.0.2"
-  checksum: 2a831a80590df125b07bc573c081449823e85159bb8fafbfee9f211dbe402840aeb01f4b04b4b47b0f28394daee29c8a10185f9acf17b6a8be649a377aff006b
+  checksum: 10/0ca668204bc32a66f5322b6bd0c745db9437c7cb72b5b2648b889811d706f8ea1315c8894aeaf0933d640dd4ee15cb1bdd95f746165f547ddde97ad7da256512
   languageName: node
   linkType: hard
 
-"@types/d3-random@npm:*":
-  version: 3.0.1
-  resolution: "@types/d3-random@npm:3.0.1"
-  checksum: 7ed9f83ee3c0b02510767bf15551984c229491d694c3c9a45a8eb80b27f7eb5f9096a48011c8cae6787b3e36321a6aaf2fe0efed8685a669481927a3d08e6b8a
+"@types/d3-random@npm:*, @types/d3-random@npm:^3.0.2":
+  version: 3.0.3
+  resolution: "@types/d3-random@npm:3.0.3"
+  checksum: 10/2c126dda6846f6c7e02c9123a30b4cdf27f3655d19b78456bbb330fbac27acceeeb987318055d3964dba8e6450377ff737db91d81f27c81ca6f4522c9b994ef2
   languageName: node
   linkType: hard
 
-"@types/d3-scale-chromatic@npm:*, @types/d3-scale-chromatic@npm:3.0.0":
-  version: 3.0.0
-  resolution: "@types/d3-scale-chromatic@npm:3.0.0"
-  checksum: e06afffd2725570aa90cb3050eb96a94727264948d9256e56807ab582aba379168d84d1d98bcaa275bf38375148b35dfe13697e06fc7565dd17ac7e2acb11980
+"@types/d3-scale-chromatic@npm:*, @types/d3-scale-chromatic@npm:3.0.3":
+  version: 3.0.3
+  resolution: "@types/d3-scale-chromatic@npm:3.0.3"
+  checksum: 10/cc5488af1136c3f9e28aa3c3ee2dc3e5e843c666f64360fb3870f0b8679cd2ee844edaa5a93504a9665deb98cb3c2ae2257d610c338fa8caa4a31ab6fdeb2f15
   languageName: node
   linkType: hard
 
@@ -8811,15 +9720,15 @@ __metadata:
   version: 4.0.2
   resolution: "@types/d3-scale@npm:4.0.2"
   dependencies:
-    "@types/d3-time": "*"
-  checksum: 6b3c0337f38f82b582d9f3190fde82edfce7ffafb371e5b2464c443137c2660bac644099d259f1f5cc829085eb5688bed0bea2b336a957d0845433bd07bf2ddd
+    "@types/d3-time": "npm:*"
+  checksum: 10/09ded5f71b915f512718774c08663f76d6518f5085d7e94ae562f9ffd1fe48ee493a33d4766cb9d324df0144bcf67a36853329c84122653bb2660e024ebf579b
   languageName: node
   linkType: hard
 
 "@types/d3-selection@npm:*":
   version: 3.0.1
   resolution: "@types/d3-selection@npm:3.0.1"
-  checksum: 6733caaf1a579a0c5d5e905867f51eb061a8216244ac749c8a8cb679d6e8661c6e3e78de3d999e1f107224322bd69ff0f71fb834015f9d780d46181adf42273c
+  checksum: 10/88e5d39b109e9621186542b9df713cd41a63cb739a1cb931a5a92fe2f9b5e7d98708a789806695a3be9d9c49a2ec205400433f5d5bb98fe9cb16b5c1becc23b7
   languageName: node
   linkType: hard
 
@@ -8827,8 +9736,8 @@ __metadata:
   version: 3.0.2
   resolution: "@types/d3-shape@npm:3.0.2"
   dependencies:
-    "@types/d3-path": "*"
-  checksum: 61dfec6dc35d88b12765449bdc4a6e3ff02947c63dbdf8a1d90ccce5fe4e0a90a8e8fe87bf29138722be36e220c919858f6fd48bf56061e565078f018fa3ec5d
+    "@types/d3-path": "npm:*"
+  checksum: 10/43a6b73d539679a5c672fb63f4e7063517c39aad74e30b17aacce1802b3c24207a8d824584164a33d7c2ccae84a774dc9f767ec95e4e38afb7d8b11cee9e3c65
   languageName: node
   linkType: hard
 
@@ -8836,36 +9745,36 @@ __metadata:
   version: 1.3.8
   resolution: "@types/d3-shape@npm:1.3.8"
   dependencies:
-    "@types/d3-path": ^1
-  checksum: a7f78a3f0be1215b512efb636ba381768ab4104ef9b72b7fcc2ab9810e7d6fc2ee062f3103ef99236f4462deabac60d2fd96375315ec7ad33278757918c94592
+    "@types/d3-path": "npm:^1"
+  checksum: 10/a534c4fbf1f7c847abd7fae2c66b17b7ca6ba96ec7e01f8cfe3e43971d2bb77626a4444d385843e19e8c451b09b5aa6c38c9f1544c0c03d3424b6a858208494d
   languageName: node
   linkType: hard
 
 "@types/d3-time-format@npm:*":
   version: 4.0.0
   resolution: "@types/d3-time-format@npm:4.0.0"
-  checksum: ac3a841b0cd6e7f4d4c6c2cd09a2662facea6993c16b10f40fdf84f55adf7be59a6d08fd6ac1c42c27c7340f3b5eeafef968b45b052a5476a580c78a991668db
+  checksum: 10/2ec5624d5d34b9aac5f76b8737a322181b4fb8912b1eef11fc84008e464e94bbaec2214ab842c0c9b5a533d18a57bf77dacc081aa758f51e347b1322cc952287
   languageName: node
   linkType: hard
 
 "@types/d3-time-format@npm:2.1.0":
   version: 2.1.0
   resolution: "@types/d3-time-format@npm:2.1.0"
-  checksum: 8493cc4676d7656becf0c1195abb1213827e4cf42a85849c5e0159fa89b1b80c5ff6ad8af54e54d0e8c76815b866adf68a948da9b966405bd12c2070f57a7efe
+  checksum: 10/803931c31f2725606fab35b8d6ae6fa04bda80f35675e57e9e4668988391728284f7993f76798d5dbd9d11f815abae55e9f831e36da80b1c6c354060cdc09f1b
   languageName: node
   linkType: hard
 
 "@types/d3-time@npm:*, @types/d3-time@npm:3.0.0":
   version: 3.0.0
   resolution: "@types/d3-time@npm:3.0.0"
-  checksum: e76adb056daccf80107f4db190ac6deb77e8774f00362bb6c76f178e67f2f217422fe502b654edbc9ac6451f6619045b9f6f5fe0db1ec5520e2ada377af7c72e
+  checksum: 10/7ef819c98eb0254dc5df901c94ec7f435f9becdedff048c89f905403b934a4d8dee7730659549d60e5ce18e0e9010009b1ab1522aadc724751edaecafc54ba53
   languageName: node
   linkType: hard
 
 "@types/d3-timer@npm:*":
   version: 3.0.0
   resolution: "@types/d3-timer@npm:3.0.0"
-  checksum: 1ec86b3808de6ecfa93cfdf34254761069658af0cc1d9540e8353dbcba161cdf1296a0724187bd17433b2ff16563115fd20b85fc89d5e809ff28f9b1ab134b42
+  checksum: 10/1ec86b3808de6ecfa93cfdf34254761069658af0cc1d9540e8353dbcba161cdf1296a0724187bd17433b2ff16563115fd20b85fc89d5e809ff28f9b1ab134b42
   languageName: node
   linkType: hard
 
@@ -8873,8 +9782,8 @@ __metadata:
   version: 3.0.1
   resolution: "@types/d3-transition@npm:3.0.1"
   dependencies:
-    "@types/d3-selection": "*"
-  checksum: 7e9bd99bf54e52c839d229367ec5ffdd84e6fd83544381ad7c69db4b47f23a658f733ea7a6d551bc340d37affce76513dab5f8df80053bd8c1a8101ff58115c7
+    "@types/d3-selection": "npm:*"
+  checksum: 10/2f9d11d40c7560d8cb6163e579bebf5781285589dd9812fb050772ff376250457e715f764f6d3edff0cf91f23df4e23d43cd34b4ca740391d2557628aadfac69
   languageName: node
   linkType: hard
 
@@ -8882,155 +9791,146 @@ __metadata:
   version: 3.0.1
   resolution: "@types/d3-zoom@npm:3.0.1"
   dependencies:
-    "@types/d3-interpolate": "*"
-    "@types/d3-selection": "*"
-  checksum: f813b3e6f27efc8508d6a2d575c21d0b1ba338160e498b901bc103d813c47ce609f691912a4ef73e9678cdbbdebbee81fecaf7432f777e9a8a54bf4087c21eba
-  languageName: node
-  linkType: hard
-
-"@types/d3@npm:7.4.0, @types/d3@npm:^7":
-  version: 7.4.0
-  resolution: "@types/d3@npm:7.4.0"
-  dependencies:
-    "@types/d3-array": "*"
-    "@types/d3-axis": "*"
-    "@types/d3-brush": "*"
-    "@types/d3-chord": "*"
-    "@types/d3-color": "*"
-    "@types/d3-contour": "*"
-    "@types/d3-delaunay": "*"
-    "@types/d3-dispatch": "*"
-    "@types/d3-drag": "*"
-    "@types/d3-dsv": "*"
-    "@types/d3-ease": "*"
-    "@types/d3-fetch": "*"
-    "@types/d3-force": "*"
-    "@types/d3-format": "*"
-    "@types/d3-geo": "*"
-    "@types/d3-hierarchy": "*"
-    "@types/d3-interpolate": "*"
-    "@types/d3-path": "*"
-    "@types/d3-polygon": "*"
-    "@types/d3-quadtree": "*"
-    "@types/d3-random": "*"
-    "@types/d3-scale": "*"
-    "@types/d3-scale-chromatic": "*"
-    "@types/d3-selection": "*"
-    "@types/d3-shape": "*"
-    "@types/d3-time": "*"
-    "@types/d3-time-format": "*"
-    "@types/d3-timer": "*"
-    "@types/d3-transition": "*"
-    "@types/d3-zoom": "*"
-  checksum: d1383f5fca7c4a819d57eb4bccc387dccaa7cb4c24d56388e5247954db6c88f5fb7c74d156165dfe044f1da8d4d510796c8d8487b5956d8270a94a1182a6e00f
-  languageName: node
-  linkType: hard
-
-"@types/debounce-promise@npm:3.1.6":
-  version: 3.1.6
-  resolution: "@types/debounce-promise@npm:3.1.6"
-  checksum: db1e5bf86215dfcdd0b0f94497269b0be5b27e0b9622bbad53c7a24de078229b97927f848549bb661795575d80615fd935f8357d8f23928c0526b158b51fa122
-  languageName: node
-  linkType: hard
-
-"@types/debug@npm:^4.1.7":
-  version: 4.1.7
-  resolution: "@types/debug@npm:4.1.7"
-  dependencies:
-    "@types/ms": "*"
-  checksum: 0a7b89d8ed72526858f0b61c6fd81f477853e8c4415bb97f48b1b5545248d2ae389931680b94b393b993a7cfe893537a200647d93defe6d87159b96812305adc
+    "@types/d3-interpolate": "npm:*"
+    "@types/d3-selection": "npm:*"
+  checksum: 10/89fb6a402e7219474ead4d6d5fc98e4f474eb9de0fef1205d0e3708820ab1a7fb0b5be12561cfcd45ec24b98b4778412d5edf817d1300e79c65b9d65ecc3c8f2
+  languageName: node
+  linkType: hard
+
+"@types/d3@npm:7.4.3, @types/d3@npm:^7":
+  version: 7.4.3
+  resolution: "@types/d3@npm:7.4.3"
+  dependencies:
+    "@types/d3-array": "npm:*"
+    "@types/d3-axis": "npm:*"
+    "@types/d3-brush": "npm:*"
+    "@types/d3-chord": "npm:*"
+    "@types/d3-color": "npm:*"
+    "@types/d3-contour": "npm:*"
+    "@types/d3-delaunay": "npm:*"
+    "@types/d3-dispatch": "npm:*"
+    "@types/d3-drag": "npm:*"
+    "@types/d3-dsv": "npm:*"
+    "@types/d3-ease": "npm:*"
+    "@types/d3-fetch": "npm:*"
+    "@types/d3-force": "npm:*"
+    "@types/d3-format": "npm:*"
+    "@types/d3-geo": "npm:*"
+    "@types/d3-hierarchy": "npm:*"
+    "@types/d3-interpolate": "npm:*"
+    "@types/d3-path": "npm:*"
+    "@types/d3-polygon": "npm:*"
+    "@types/d3-quadtree": "npm:*"
+    "@types/d3-random": "npm:*"
+    "@types/d3-scale": "npm:*"
+    "@types/d3-scale-chromatic": "npm:*"
+    "@types/d3-selection": "npm:*"
+    "@types/d3-shape": "npm:*"
+    "@types/d3-time": "npm:*"
+    "@types/d3-time-format": "npm:*"
+    "@types/d3-timer": "npm:*"
+    "@types/d3-transition": "npm:*"
+    "@types/d3-zoom": "npm:*"
+  checksum: 10/12234aa093c8661546168becdd8956e892b276f525d96f65a7b32fed886fc6a569fe5a1171bff26fef2a5663960635f460c9504a6f2d242ba281a2b6c8c6465c
+  languageName: node
+  linkType: hard
+
+"@types/debounce-promise@npm:3.1.9":
+  version: 3.1.9
+  resolution: "@types/debounce-promise@npm:3.1.9"
+  checksum: 10/ea6c38c8d4b6006aea25fb9891281b0ea908aab7ae32755e85dfda1ae78331dab1884da7143aa4ca5166741884bc9f7665391072ddce800b5d2c1f44d4a11b9d
   languageName: node
   linkType: hard
 
 "@types/detect-port@npm:^1.3.0":
   version: 1.3.2
   resolution: "@types/detect-port@npm:1.3.2"
-  checksum: e4678244fbe8801014798b3efb967c886e6fc0fe94fb771a1be9558b35c68910b23bd30984df4a276b927820ce436b244506fb0972116d1b18506ac96bfd1a50
+  checksum: 10/e4678244fbe8801014798b3efb967c886e6fc0fe94fb771a1be9558b35c68910b23bd30984df4a276b927820ce436b244506fb0972116d1b18506ac96bfd1a50
   languageName: node
   linkType: hard
 
 "@types/diff@npm:^5":
-  version: 5.0.5
-  resolution: "@types/diff@npm:5.0.5"
-  checksum: 5f093341d5488cd33079400d4b2ff463dfd4f589bf0a54fbb25f7c87a7bdc16bd1e6125f252c081fa9a3ad44fc78b156c0a5f38bd8128edceb40ba084e051885
+  version: 5.0.9
+  resolution: "@types/diff@npm:5.0.9"
+  checksum: 10/6924740cb67a49771ea3753ee9b15c676860a6227b2bf0200ed9cef4111ff0f59fec8c51c1170bd30a8c7370b32673b308a9cd2da28525130f842194a822ef42
   languageName: node
   linkType: hard
 
 "@types/doctrine@npm:^0.0.3":
   version: 0.0.3
   resolution: "@types/doctrine@npm:0.0.3"
-  checksum: 7ca9c8ff4d2da437785151c9eef0dd80b8fa12e0ff0fcb988458a78de4b6f0fc92727ba5bbee446e1df615a91f03053c5783b30b7c21ab6ceab6a42557e93e50
+  checksum: 10/398c30efc903a750c71166c7385d763c98605723dfae23f0134d6de4d365a8f0a5585a0fe6f959569ff33646e7f43fa83bacb5f2a4d5929cd0f6163d06e4f6b3
   languageName: node
   linkType: hard
 
-"@types/dompurify@npm:^2":
-  version: 2.4.0
-  resolution: "@types/dompurify@npm:2.4.0"
+"@types/dompurify@npm:^3.0.0":
+  version: 3.0.5
+  resolution: "@types/dompurify@npm:3.0.5"
   dependencies:
-    "@types/trusted-types": "*"
-  checksum: b48cd81e997794ebc390c7c5bef1a67ec14a6f2f0521973e07e06af186c7583abe114d94d24868c0632b9573f5bd77131a4b76f3fffdf089ba99a4e53dd46c39
+    "@types/trusted-types": "npm:*"
+  checksum: 10/e544b3ce53c41215cabff3d89256ff707c7ee8e0c9a1b5034b22014725d288b16e6942cdcdeeb4221c578c3421a6a4721aa0676431f55d7abd18c07368855c5e
   languageName: node
   linkType: hard
 
 "@types/ejs@npm:^3.1.1":
   version: 3.1.2
   resolution: "@types/ejs@npm:3.1.2"
-  checksum: e4f0745b6ed53a63c08bdfdeb019a7d0e0c400896722b44d6732b4ee6bf6061d2dc965206186b8b0ae2ecd71303c29f1af1feddbca2df0acbd7bd234a74ca518
+  checksum: 10/8be94c952dc06525a5fb229a469db66f2240425ce137a1f5108a6a11f500cac9190691e924e6d18df34c5c2be40ef36b537921d2833262467ee1dfb7a7c919ac
   languageName: node
   linkType: hard
 
 "@types/emscripten@npm:^1.39.6":
   version: 1.39.8
   resolution: "@types/emscripten@npm:1.39.8"
-  checksum: adccdfcec3a9829aaeee580259d21653ef15ae638b88c2e310d1d4184cfc83809b463fabdd0050e018c7b6b966166d973d71f3d59601644947d0235e98b77e64
+  checksum: 10/1102c28ba259316b154ea524c2b8da82242839364df930dd305942daf7742da4081aeff437b7c9335ed838d3a42f5338cb4b24c87cd856c1853959c3310ccf10
   languageName: node
   linkType: hard
 
 "@types/escodegen@npm:^0.0.6":
   version: 0.0.6
   resolution: "@types/escodegen@npm:0.0.6"
-  checksum: 7b25aeedd48dbef68345224082c6bc774845cbfc1d9b2ce91a477130fe7ccabf33da126c1d6d55e5dfd838db429a7c80890628a167e5aa55b6a4620974da38d3
+  checksum: 10/2e91554a47eb98076a3ba6e3548640e50b28a0f5b69134f99dd1e0ce5223c0a1726f23d25aafd40e4c7961d7c3c519782949aa606d58d0e7431c7fb1ec011c4c
   languageName: node
   linkType: hard
 
-"@types/eslint-scope@npm:^3.7.3":
-  version: 3.7.3
-  resolution: "@types/eslint-scope@npm:3.7.3"
+"@types/eslint-scope@npm:^3.7.3, @types/eslint-scope@npm:^3.7.7":
+  version: 3.7.7
+  resolution: "@types/eslint-scope@npm:3.7.7"
   dependencies:
-    "@types/eslint": "*"
-    "@types/estree": "*"
-  checksum: 6772b05e1b92003d1f295e81bc847a61f4fbe8ddab77ffa49e84ed3f9552513bdde677eb53ef167753901282857dd1d604d9f82eddb34a233495932b2dc3dc17
+    "@types/eslint": "npm:*"
+    "@types/estree": "npm:*"
+  checksum: 10/e2889a124aaab0b89af1bab5959847c5bec09809209255de0e63b9f54c629a94781daa04adb66bffcdd742f5e25a17614fb933965093c0eea64aacda4309380e
   languageName: node
   linkType: hard
 
-"@types/eslint@npm:*, @types/eslint@npm:8.44.0, @types/eslint@npm:^8.37.0, @types/eslint@npm:^8.4.10":
-  version: 8.44.0
-  resolution: "@types/eslint@npm:8.44.0"
+"@types/eslint@npm:*, @types/eslint@npm:8.56.6, @types/eslint@npm:^8.56.5":
+  version: 8.56.6
+  resolution: "@types/eslint@npm:8.56.6"
   dependencies:
-    "@types/estree": "*"
-    "@types/json-schema": "*"
-  checksum: 2655f409a4ecdd64bb9dd9eb6715e7a2ac30c0e7f902b414e10dbe9d6d497baa5a0f13105e1f7bd5ad7a913338e2ab4bed1faf192a7a0d27d1acd45ba79d3f69
+    "@types/estree": "npm:*"
+    "@types/json-schema": "npm:*"
+  checksum: 10/34ed696547688ef37669493cff3040e4d1e65ffc9b927f7a6c37d27232578dd31a13af23b11f8c4bc2e4230d17bb912005962afe5ff2afeb2f6817b4c64fa44c
   languageName: node
   linkType: hard
 
-"@types/estree@npm:*, @types/estree@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@types/estree@npm:1.0.0"
-  checksum: 910d97fb7092c6738d30a7430ae4786a38542023c6302b95d46f49420b797f21619cdde11fa92b338366268795884111c2eb10356e4bd2c8ad5b92941e9e6443
+"@types/estree@npm:*, @types/estree@npm:^1.0.0, @types/estree@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "@types/estree@npm:1.0.5"
+  checksum: 10/7de6d928dd4010b0e20c6919e1a6c27b61f8d4567befa89252055fad503d587ecb9a1e3eab1b1901f923964d7019796db810b7fd6430acb26c32866d126fd408
   languageName: node
   linkType: hard
 
 "@types/estree@npm:0.0.39":
   version: 0.0.39
   resolution: "@types/estree@npm:0.0.39"
-  checksum: 412fb5b9868f2c418126451821833414189b75cc6bf84361156feed733e3d92ec220b9d74a89e52722e03d5e241b2932732711b7497374a404fad49087adc248
+  checksum: 10/9f0f20990dbf725470564d4d815d3758ac688b790f601ea98654b6e0b9797dc3c80306fb525abdacd9e75e014e3d09ad326098eaa2ed1851e4823a8e278538aa
   languageName: node
   linkType: hard
 
 "@types/estree@npm:^0.0.51":
   version: 0.0.51
   resolution: "@types/estree@npm:0.0.51"
-  checksum: e56a3bcf759fd9185e992e7fdb3c6a5f81e8ff120e871641607581fb3728d16c811702a7d40fa5f869b7f7b4437ab6a87eb8d98ffafeee51e85bbe955932a189
+  checksum: 10/b566c7a3fc8a81ca3d9e00a717e90b8f5d567e2476b4f6d76a20ec6da33ec28165b8f989ed8dd0c9df41405199777ec36a4f85f32a347fbc6c3f696a3128b6e7
   languageName: node
   linkType: hard
 
@@ -9038,36 +9938,36 @@ __metadata:
   version: 4.17.33
   resolution: "@types/express-serve-static-core@npm:4.17.33"
   dependencies:
-    "@types/node": "*"
-    "@types/qs": "*"
-    "@types/range-parser": "*"
-  checksum: dce580d16b85f207445af9d4053d66942b27d0c72e86153089fa00feee3e96ae336b7bedb31ed4eea9e553c99d6dd356ed6e0928f135375d9f862a1a8015adf2
+    "@types/node": "npm:*"
+    "@types/qs": "npm:*"
+    "@types/range-parser": "npm:*"
+  checksum: 10/47ee1b46be710ae6451a2e658e2eab75f4affe874b0d156a31e792db0ddb35184ac7b35be926eb23424cc45f6e0d3dbacc86ac5d63a3c988d8235aedb1143841
   languageName: node
   linkType: hard
 
-"@types/express@npm:*, @types/express@npm:^4.17.13, @types/express@npm:^4.7.0":
-  version: 4.17.17
-  resolution: "@types/express@npm:4.17.17"
+"@types/express@npm:*, @types/express@npm:^4.17.21, @types/express@npm:^4.7.0":
+  version: 4.17.21
+  resolution: "@types/express@npm:4.17.21"
   dependencies:
-    "@types/body-parser": "*"
-    "@types/express-serve-static-core": ^4.17.33
-    "@types/qs": "*"
-    "@types/serve-static": "*"
-  checksum: 0196dacc275ac3ce89d7364885cb08e7fb61f53ca101f65886dbf1daf9b7eb05c0943e2e4bbd01b0cc5e50f37e0eea7e4cbe97d0304094411ac73e1b7998f4da
+    "@types/body-parser": "npm:*"
+    "@types/express-serve-static-core": "npm:^4.17.33"
+    "@types/qs": "npm:*"
+    "@types/serve-static": "npm:*"
+  checksum: 10/7a6d26cf6f43d3151caf4fec66ea11c9d23166e4f3102edfe45a94170654a54ea08cf3103d26b3928d7ebcc24162c90488e33986b7e3a5f8941225edd5eb18c7
   languageName: node
   linkType: hard
 
-"@types/file-saver@npm:2.0.5":
-  version: 2.0.5
-  resolution: "@types/file-saver@npm:2.0.5"
-  checksum: a31d6ee2abf99598647139f8f35b37b6e1bacf6c7ddf05c66651b9b0e6e53381aa0e8ed13f37faa6e496e0eb1da87c97e6c70fd589d5b83b0c95c57cb64ce92a
+"@types/file-saver@npm:2.0.7":
+  version: 2.0.7
+  resolution: "@types/file-saver@npm:2.0.7"
+  checksum: 10/c3d1cd80eab1214767922cabac97681f3fb688e82b74890450d70deaca49537949bbc96d80d363d91e8f0a4752c7164909cc8902d9721c5c4809baafc42a3801
   languageName: node
   linkType: hard
 
 "@types/find-cache-dir@npm:^3.2.1":
   version: 3.2.1
   resolution: "@types/find-cache-dir@npm:3.2.1"
-  checksum: bf5c4e96da40247cd9e6327f54dfccda961a0fb2d70e3c71bd05def94de4c2e6fb310fe8ecb0f04ecf5dbc52214e184b55a2337b0f87250d4ae1e2e7d58321e4
+  checksum: 10/bf5c4e96da40247cd9e6327f54dfccda961a0fb2d70e3c71bd05def94de4c2e6fb310fe8ecb0f04ecf5dbc52214e184b55a2337b0f87250d4ae1e2e7d58321e4
   languageName: node
   linkType: hard
 
@@ -9075,15 +9975,15 @@ __metadata:
   version: 8.1.3
   resolution: "@types/fs-extra@npm:8.1.3"
   dependencies:
-    "@types/node": "*"
-  checksum: e2800ba91fd7978baaa9d75050836b9a7b8aabc0be27ba57c939ba6568e6ac7a5faae614a2f36370cce4d1cd1b86d4c3a8c95e3f1a5bc4db36292f8181b92ac6
+    "@types/node": "npm:*"
+  checksum: 10/41b243e4fd7499f74246d2bab1bacdd6df1bdbc50c5483af1e0ff018dd3fdd89e7fb2a8661406d6b7bc71047d45054c8f7ab1075e8fb94daba643d15d1c4e88a
   languageName: node
   linkType: hard
 
 "@types/geojson@npm:*":
   version: 7946.0.8
   resolution: "@types/geojson@npm:7946.0.8"
-  checksum: 6049a39b025cfe323d5cf87333d87c133ec963cdbd349c49295bee779827ee4b46a3041fd8bd2e7a4b02d6d1e26f3002968875928941bbed08477bfd5f6f9284
+  checksum: 10/6049a39b025cfe323d5cf87333d87c133ec963cdbd349c49295bee779827ee4b46a3041fd8bd2e7a4b02d6d1e26f3002968875928941bbed08477bfd5f6f9284
   languageName: node
   linkType: hard
 
@@ -9091,9 +9991,9 @@ __metadata:
   version: 7.2.0
   resolution: "@types/glob@npm:7.2.0"
   dependencies:
-    "@types/minimatch": "*"
-    "@types/node": "*"
-  checksum: 6ae717fedfdfdad25f3d5a568323926c64f52ef35897bcac8aca8e19bc50c0bd84630bbd063e5d52078b2137d8e7d3c26eabebd1a2f03ff350fff8a91e79fc19
+    "@types/minimatch": "npm:*"
+    "@types/node": "npm:*"
+  checksum: 10/6ae717fedfdfdad25f3d5a568323926c64f52ef35897bcac8aca8e19bc50c0bd84630bbd063e5d52078b2137d8e7d3c26eabebd1a2f03ff350fff8a91e79fc19
   languageName: node
   linkType: hard
 
@@ -9101,16 +10001,16 @@ __metadata:
   version: 8.1.0
   resolution: "@types/glob@npm:8.1.0"
   dependencies:
-    "@types/minimatch": ^5.1.2
-    "@types/node": "*"
-  checksum: 9101f3a9061e40137190f70626aa0e202369b5ec4012c3fabe6f5d229cce04772db9a94fa5a0eb39655e2e4ad105c38afbb4af56a56c0996a8c7d4fc72350e3d
+    "@types/minimatch": "npm:^5.1.2"
+    "@types/node": "npm:*"
+  checksum: 10/9101f3a9061e40137190f70626aa0e202369b5ec4012c3fabe6f5d229cce04772db9a94fa5a0eb39655e2e4ad105c38afbb4af56a56c0996a8c7d4fc72350e3d
   languageName: node
   linkType: hard
 
-"@types/google.analytics@npm:^0.0.42":
-  version: 0.0.42
-  resolution: "@types/google.analytics@npm:0.0.42"
-  checksum: c64b3f7991c4bcb1dfe8db902a2e2ebe821ce53a1ca36e6628b4d08d0c24213aa0d4f49492b3144dd6bfa661f53fb1ecf16e83cca522cddd6d9f8419a4b73fe8
+"@types/google.analytics@npm:^0.0.46":
+  version: 0.0.46
+  resolution: "@types/google.analytics@npm:0.0.46"
+  checksum: 10/b10b289fb948e475a8c4b976fb81ce1f98df52ce92ef0c0b877c3a73b964b6892df00a81d4505ac3b2bb2fba42bd19fceae7a8f8b33ef87e415a1fcc090e2da1
   languageName: node
   linkType: hard
 
@@ -9118,15 +10018,15 @@ __metadata:
   version: 4.1.5
   resolution: "@types/graceful-fs@npm:4.1.5"
   dependencies:
-    "@types/node": "*"
-  checksum: d076bb61f45d0fc42dee496ef8b1c2f8742e15d5e47e90e20d0243386e426c04d4efd408a48875ab432f7960b4ce3414db20ed0fbbfc7bcc89d84e574f6e045a
+    "@types/node": "npm:*"
+  checksum: 10/d076bb61f45d0fc42dee496ef8b1c2f8742e15d5e47e90e20d0243386e426c04d4efd408a48875ab432f7960b4ce3414db20ed0fbbfc7bcc89d84e574f6e045a
   languageName: node
   linkType: hard
 
-"@types/gtag.js@npm:^0.0.12":
-  version: 0.0.12
-  resolution: "@types/gtag.js@npm:0.0.12"
-  checksum: 34efc27fbfd0013255b8bfd4af38ded9d5a6ba761130c76f17fd3a9585d83acc88d8005aab667cfec4bdec0e7c7217f689739799a8f61aed0edb929be58b162e
+"@types/gtag.js@npm:^0.0.19":
+  version: 0.0.19
+  resolution: "@types/gtag.js@npm:0.0.19"
+  checksum: 10/7436cd2163f5072a8720b5dec934dda462bb4c565d521cc70779aecf6de55402c341ed763bdcc3d767dc6c5ef0f332b327a0d1e9a80258893363baf3c8bc1e89
   languageName: node
   linkType: hard
 
@@ -9134,32 +10034,39 @@ __metadata:
   version: 2.3.4
   resolution: "@types/hast@npm:2.3.4"
   dependencies:
-    "@types/unist": "*"
-  checksum: fff47998f4c11e21a7454b58673f70478740ecdafd95aaf50b70a3daa7da9cdc57315545bf9c039613732c40b7b0e9e49d11d03fe9a4304721cdc3b29a88141e
+    "@types/unist": "npm:*"
+  checksum: 10/fff47998f4c11e21a7454b58673f70478740ecdafd95aaf50b70a3daa7da9cdc57315545bf9c039613732c40b7b0e9e49d11d03fe9a4304721cdc3b29a88141e
   languageName: node
   linkType: hard
 
 "@types/history@npm:4.7.11, @types/history@npm:^4.7.11":
   version: 4.7.11
   resolution: "@types/history@npm:4.7.11"
-  checksum: c92e2ba407dcab0581a9afdf98f533aa41b61a71133420a6d92b1ca9839f741ab1f9395b17454ba5b88cb86020b70b22d74a1950ccfbdfd9beeaa5459fdc3464
+  checksum: 10/1da529a3485f3015daf794effa3185493bf7dd2551c26932389c614f5a0aab76ab97645897d1eef9c74ead216a3848fcaa019f165bbd6e4b71da6eff164b4c68
   languageName: node
   linkType: hard
 
-"@types/hoist-non-react-statics@npm:3.3.1, @types/hoist-non-react-statics@npm:^3.3.0":
-  version: 3.3.1
-  resolution: "@types/hoist-non-react-statics@npm:3.3.1"
+"@types/hoist-non-react-statics@npm:3.3.5, @types/hoist-non-react-statics@npm:^3.3.0, @types/hoist-non-react-statics@npm:^3.3.1":
+  version: 3.3.5
+  resolution: "@types/hoist-non-react-statics@npm:3.3.5"
   dependencies:
-    "@types/react": "*"
-    hoist-non-react-statics: ^3.3.0
-  checksum: 2c0778570d9a01d05afabc781b32163f28409bb98f7245c38d5eaf082416fdb73034003f5825eb5e21313044e8d2d9e1f3fe2831e345d3d1b1d20bcd12270719
+    "@types/react": "npm:*"
+    hoist-non-react-statics: "npm:^3.3.0"
+  checksum: 10/b645b062a20cce6ab1245ada8274051d8e2e0b2ee5c6bd58215281d0ec6dae2f26631af4e2e7c8abe238cdcee73fcaededc429eef569e70908f82d0cc0ea31d7
   languageName: node
   linkType: hard
 
 "@types/html-minifier-terser@npm:^6.0.0":
   version: 6.0.0
   resolution: "@types/html-minifier-terser@npm:6.0.0"
-  checksum: 8f602498d726c9fd30d2b895478b4e7cb1f91558d892e44f54533669dbbbfae572c5fb2b04ee4fa5cbe7f8d59982d2067bf5c2931a3aefcf8dac590e4494b103
+  checksum: 10/6680492f2a44e46def7678359650e46601853b7a27af3651160e75b83e55134e0ccc8e493ad3f0721c4dfad0b3fa73443f6e18b5ce536db3f63af54895733dd3
+  languageName: node
+  linkType: hard
+
+"@types/http-errors@npm:*":
+  version: 2.0.4
+  resolution: "@types/http-errors@npm:2.0.4"
+  checksum: 10/1f3d7c3b32c7524811a45690881736b3ef741bf9849ae03d32ad1ab7062608454b150a4e7f1351f83d26a418b2d65af9bdc06198f1c079d75578282884c4e8e3
   languageName: node
   linkType: hard
 
@@ -9167,22 +10074,22 @@ __metadata:
   version: 1.17.8
   resolution: "@types/http-proxy@npm:1.17.8"
   dependencies:
-    "@types/node": "*"
-  checksum: 3b3d683498267096c8aca03652702243b1e087bc20e77a9abe74fdbee1c89c8283ee41c47d245cda2f422483b01980d70a1030b92a8ff24b280e0aa868241a8b
+    "@types/node": "npm:*"
+  checksum: 10/426c910286b7d83d67199ef3d03e9b7e9f9a33e76b362fe4a7008e7d40bb638df7998a2e3b801aaa635a9ba321a161a5f200687a29814b8c53eaa42902d30e45
   languageName: node
   linkType: hard
 
-"@types/is-hotkey@npm:0.1.7":
-  version: 0.1.7
-  resolution: "@types/is-hotkey@npm:0.1.7"
-  checksum: bce7c8874b30f346f20cf6cfcf4a10372962924f0e1b1a925a279004faeb276242ebfbfee47bd48df57e1021f2e3078c34e25837e226960c418d5f78f83dacea
+"@types/is-hotkey@npm:0.1.10":
+  version: 0.1.10
+  resolution: "@types/is-hotkey@npm:0.1.10"
+  checksum: 10/9ecc49fb3822b3cfa8335132d54c6e577d0b14bb52d0bf1f817cdd19c442555b7523945e2ae72f6098e3c7f64b4777390f38afec3e4660343cfb471377e7fd82
   languageName: node
   linkType: hard
 
 "@types/istanbul-lib-coverage@npm:*, @types/istanbul-lib-coverage@npm:^2.0.0, @types/istanbul-lib-coverage@npm:^2.0.1":
   version: 2.0.3
   resolution: "@types/istanbul-lib-coverage@npm:2.0.3"
-  checksum: 0650cba4be8f464bee89b9de0b71a5ea3b5cc676ce24e1196b5d6a51542ce9e613ae4549bf19756bb33dbbbb32b47931040266100062bfb197c597d73e341eb0
+  checksum: 10/0650cba4be8f464bee89b9de0b71a5ea3b5cc676ce24e1196b5d6a51542ce9e613ae4549bf19756bb33dbbbb32b47931040266100062bfb197c597d73e341eb0
   languageName: node
   linkType: hard
 
@@ -9190,8 +10097,8 @@ __metadata:
   version: 3.0.0
   resolution: "@types/istanbul-lib-report@npm:3.0.0"
   dependencies:
-    "@types/istanbul-lib-coverage": "*"
-  checksum: 656398b62dc288e1b5226f8880af98087233cdb90100655c989a09f3052b5775bf98ba58a16c5ae642fb66c61aba402e07a9f2bff1d1569e3b306026c59f3f36
+    "@types/istanbul-lib-coverage": "npm:*"
+  checksum: 10/f121dcac8a6b8184f3cab97286d8d519f1937fa8620ada5dbc43b699d602b8be289e4a4bccbd6ee1aade6869d3c9fb68bf04c6fdca8c5b0c4e7e314c31c7900a
   languageName: node
   linkType: hard
 
@@ -9199,58 +10106,41 @@ __metadata:
   version: 3.0.1
   resolution: "@types/istanbul-reports@npm:3.0.1"
   dependencies:
-    "@types/istanbul-lib-report": "*"
-  checksum: f1ad54bc68f37f60b30c7915886b92f86b847033e597f9b34f2415acdbe5ed742fa559a0a40050d74cdba3b6a63c342cac1f3a64dba5b68b66a6941f4abd7903
-  languageName: node
-  linkType: hard
-
-"@types/jest@npm:*, @types/jest@npm:29.5.4, @types/jest@npm:^29.5.4":
-  version: 29.5.4
-  resolution: "@types/jest@npm:29.5.4"
-  dependencies:
-    expect: ^29.0.0
-    pretty-format: ^29.0.0
-  checksum: 38ed5942f44336452efd0f071eab60aaa57cd8d46530348d0a3aa5a691dcbf1366c4ca8f6ee8364efb45b4413bfefae443e5d4f469246a472a03b21ac11cd4ed
+    "@types/istanbul-lib-report": "npm:*"
+  checksum: 10/f1ad54bc68f37f60b30c7915886b92f86b847033e597f9b34f2415acdbe5ed742fa559a0a40050d74cdba3b6a63c342cac1f3a64dba5b68b66a6941f4abd7903
   languageName: node
   linkType: hard
 
-"@types/jest@npm:26.0.15":
-  version: 26.0.15
-  resolution: "@types/jest@npm:26.0.15"
+"@types/jest@npm:*, @types/jest@npm:29.5.12, @types/jest@npm:^29.5.4":
+  version: 29.5.12
+  resolution: "@types/jest@npm:29.5.12"
   dependencies:
-    jest-diff: ^26.0.0
-    pretty-format: ^26.0.0
-  checksum: 5bbed3d3afa40bcac9eb2e8e76957b40b7cb86228a7a1dd455f7e30cb283a7314f7d7afaf2d46ca52ba5ce62168e0f60c57e0ab7509a6b91eab42460709b6bf1
+    expect: "npm:^29.0.0"
+    pretty-format: "npm:^29.0.0"
+  checksum: 10/312e8dcf92cdd5a5847d6426f0940829bca6fe6b5a917248f3d7f7ef5d85c9ce78ef05e47d2bbabc40d41a930e0e36db2d443d2610a9e3db9062da2d5c904211
   languageName: node
   linkType: hard
 
-"@types/jquery@npm:3.5.16":
-  version: 3.5.16
-  resolution: "@types/jquery@npm:3.5.16"
+"@types/jquery@npm:3.5.29":
+  version: 3.5.29
+  resolution: "@types/jquery@npm:3.5.29"
   dependencies:
-    "@types/sizzle": "*"
-  checksum: 13c995f15d1c2f1d322103dc1cb0a22b95eecc3e7546f00279b8731aea21d7ec04550af40e609ee48e755d4e11bf61c25b4aa9f53df3bcbec4b8fe8e81471732
+    "@types/sizzle": "npm:*"
+  checksum: 10/364facf2cb0bc935cb4b7f4af0b12c8e901b02b08a85af213172485166123b10aad8563f8e51e363f65a778c4105a59a64dedd0b0fd73f96557219d46477af56
   languageName: node
   linkType: hard
 
 "@types/js-cookie@npm:^2.2.6":
   version: 2.2.7
   resolution: "@types/js-cookie@npm:2.2.7"
-  checksum: 851f47e94ca1fc43661d8f51614d67a613e7810c91b876d0a3b311ce72f7df800107fd02a08cb6948184e12c120b4f058edca2f50424d8798bdcffd6627281e3
-  languageName: node
-  linkType: hard
-
-"@types/js-levenshtein@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "@types/js-levenshtein@npm:1.1.1"
-  checksum: 1d1ff1ee2ad551909e47f3ce19fcf85b64dc5146d3b531c8d26fc775492d36e380b32cf5ef68ff301e812c3b00282f37aac579ebb44498b94baff0ace7509769
+  checksum: 10/851f47e94ca1fc43661d8f51614d67a613e7810c91b876d0a3b311ce72f7df800107fd02a08cb6948184e12c120b4f058edca2f50424d8798bdcffd6627281e3
   languageName: node
   linkType: hard
 
 "@types/js-yaml@npm:^4.0.5":
-  version: 4.0.5
-  resolution: "@types/js-yaml@npm:4.0.5"
-  checksum: 7dcac8c50fec31643cc9d6444b5503239a861414cdfaa7ae9a38bc22597c4d850c4b8cec3d82d73b3fbca408348ce223b0408d598b32e094470dfffc6d486b4d
+  version: 4.0.9
+  resolution: "@types/js-yaml@npm:4.0.9"
+  checksum: 10/a0ce595db8a987904badd21fc50f9f444cb73069f4b95a76cc222e0a17b3ff180669059c763ec314bc4c3ce284379177a9da80e83c5f650c6c1310cafbfaa8e6
   languageName: node
   linkType: hard
 
@@ -9258,31 +10148,31 @@ __metadata:
   version: 20.0.1
   resolution: "@types/jsdom@npm:20.0.1"
   dependencies:
-    "@types/node": "*"
-    "@types/tough-cookie": "*"
-    parse5: ^7.0.0
-  checksum: d55402c5256ef451f93a6e3d3881f98339fe73a5ac2030588df056d6835df8367b5a857b48d27528289057e26dcdd3f502edc00cb877c79174cb3a4c7f2198c1
+    "@types/node": "npm:*"
+    "@types/tough-cookie": "npm:*"
+    parse5: "npm:^7.0.0"
+  checksum: 10/15fbb9a0bfb4a5845cf6e795f2fd12400aacfca53b8c7e5bca4a3e5e8fa8629f676327964d64258aefb127d2d8a2be86dad46359efbfca0e8c9c2b790e7f8a88
   languageName: node
   linkType: hard
 
-"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9":
-  version: 7.0.9
-  resolution: "@types/json-schema@npm:7.0.9"
-  checksum: 259d0e25f11a21ba5c708f7ea47196bd396e379fddb79c76f9f4f62c945879dc21657904914313ec2754e443c5018ea8372362f323f30e0792897fdb2098a705
+"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9":
+  version: 7.0.15
+  resolution: "@types/json-schema@npm:7.0.15"
+  checksum: 10/1a3c3e06236e4c4aab89499c428d585527ce50c24fe8259e8b3926d3df4cfbbbcf306cfc73ddfb66cbafc973116efd15967020b0f738f63e09e64c7d260519e7
   languageName: node
   linkType: hard
 
 "@types/json5@npm:^0.0.29":
   version: 0.0.29
   resolution: "@types/json5@npm:0.0.29"
-  checksum: e60b153664572116dfea673c5bda7778dbff150498f44f998e34b5886d8afc47f16799280e4b6e241c0472aef1bc36add771c569c68fc5125fc2ae519a3eb9ac
+  checksum: 10/4e5aed58cabb2bbf6f725da13421aa50a49abb6bc17bfab6c31b8774b073fa7b50d557c61f961a09a85f6056151190f8ac95f13f5b48136ba5841f7d4484ec56
   languageName: node
   linkType: hard
 
 "@types/jsurl@npm:^1.2.28":
   version: 1.2.30
   resolution: "@types/jsurl@npm:1.2.30"
-  checksum: c51ff0d159f9e97ca7069cb5aa934ab4f94b1738250cddd1f3e19d12bdb0f6bca7b7ed2579b5de274778d1c3b26b3a89b21f0c108814383cf32f150ff74ca15a
+  checksum: 10/c51ff0d159f9e97ca7069cb5aa934ab4f94b1738250cddd1f3e19d12bdb0f6bca7b7ed2579b5de274778d1c3b26b3a89b21f0c108814383cf32f150ff74ca15a
   languageName: node
   linkType: hard
 
@@ -9290,101 +10180,110 @@ __metadata:
   version: 4.1.7
   resolution: "@types/lodash.memoize@npm:4.1.7"
   dependencies:
-    "@types/lodash": "*"
-  checksum: 85f128b6606ab0545c11194208cf844536f981859221dff0032b1043dd4e02ee5aa1b96020d1e02a24db31be7493f2e9ff45836d2e3c35cf973fc6488f129eed
+    "@types/lodash": "npm:*"
+  checksum: 10/85f128b6606ab0545c11194208cf844536f981859221dff0032b1043dd4e02ee5aa1b96020d1e02a24db31be7493f2e9ff45836d2e3c35cf973fc6488f129eed
+  languageName: node
+  linkType: hard
+
+"@types/lodash@npm:*, @types/lodash@npm:4.17.0, @types/lodash@npm:^4.14.167, @types/lodash@npm:^4.14.172":
+  version: 4.17.0
+  resolution: "@types/lodash@npm:4.17.0"
+  checksum: 10/2053203292b5af99352d108656ceb15d39da5922fc3fb8186e1552d65c82d6e545372cc97f36c95873aa7186404d59d9305e9d49254d4ae55e77df1e27ab7b5d
   languageName: node
   linkType: hard
 
-"@types/lodash@npm:*, @types/lodash@npm:4.14.195, @types/lodash@npm:^4.14.167, @types/lodash@npm:^4.14.172":
+"@types/lodash@npm:4.14.195":
   version: 4.14.195
   resolution: "@types/lodash@npm:4.14.195"
-  checksum: 39b75ca635b3fa943d17d3d3aabc750babe4c8212485a4df166fe0516e39288e14b0c60afc6e21913cc0e5a84734633c71e617e2bd14eaa1cf51b8d7799c432e
+  checksum: 10/d7c0902684508a3d0fdb60fe939a855f9f244fd4bf828eb75388a39d00b44e955dac16faea6c90c0ae4592a57784e45ceb6d51354af8dfd401de38046c685775
   languageName: node
   linkType: hard
 
 "@types/logfmt@npm:^1.2.3":
-  version: 1.2.3
-  resolution: "@types/logfmt@npm:1.2.3"
+  version: 1.2.6
+  resolution: "@types/logfmt@npm:1.2.6"
   dependencies:
-    "@types/node": "*"
-  checksum: d5872ab0432c687dc95a4c3a1c21c8eca24553415ef6a34f6cbbe0eefc4b7b8fb8b2af80df4a53fcf7cc7b212569df568bed1b17f7c2a976c4416f4a67b285de
+    "@types/node": "npm:*"
+  checksum: 10/ac69ee5c99e074bf3ad31d27f877402b84be59e2c200fc4ecfbf295244505a2b6408db1c377c96f90d0444a18fd253d34f0f0810c162e73f6e82c327022c3008
   languageName: node
   linkType: hard
 
 "@types/lucene@npm:^2":
-  version: 2.1.4
-  resolution: "@types/lucene@npm:2.1.4"
-  checksum: 418057a390752b36745428887ef527121740d54137a2b2da9f10388d2e9d1fe13d1d04b9b2605101bdd99a38ae357d1d5b08f6302f2eca7cead4e28f30ec964d
+  version: 2.1.7
+  resolution: "@types/lucene@npm:2.1.7"
+  checksum: 10/38bf8521a071697612f3629839f5d55558ae40ebba1486300f35b862d1b403758a0c5e9a8370bc1baae11d1779e6b1dae28c82f528ec8064dcee33dca008c910
   languageName: node
   linkType: hard
 
-"@types/marked@npm:5.0.1":
-  version: 5.0.1
-  resolution: "@types/marked@npm:5.0.1"
-  checksum: 84323058e0a5127aeb67d709e1dcb0cc0024b190c337ca68813fcd1f271e7c7351ed14ea83e5e21a7a264fb87ba8767c0a98fb26d05a06181a7edd49299ef437
+"@types/marked@npm:5.0.2":
+  version: 5.0.2
+  resolution: "@types/marked@npm:5.0.2"
+  checksum: 10/a22999454a193243c9ad697859ead622a578bfce48ca6b2958509aacea55601627b02e74caedba06f88fa75004273ed39235d36f94869fec528bb5bc832cdfa2
   languageName: node
   linkType: hard
 
 "@types/mdx@npm:^2.0.0":
   version: 2.0.4
   resolution: "@types/mdx@npm:2.0.4"
-  checksum: 79e011ea17751741f69fa0a8bada8c596ca273c5510d4b37e8fa0dd8b5f93c6b8eb4a351da426454df7b4ddbaa8dfc3aae88562417300b968cc8964afac3a6ca
+  checksum: 10/79e011ea17751741f69fa0a8bada8c596ca273c5510d4b37e8fa0dd8b5f93c6b8eb4a351da426454df7b4ddbaa8dfc3aae88562417300b968cc8964afac3a6ca
   languageName: node
   linkType: hard
 
 "@types/mime-types@npm:^2.1.0":
   version: 2.1.1
   resolution: "@types/mime-types@npm:2.1.1"
-  checksum: 106b5d556add46446a579ad25ff15d6b421851790d887edcad558c90c1e64b1defc72bfbaf4b08f208916e21d9cc45cdb951d77be51268b18221544cfe054a3c
+  checksum: 10/1b9cfea94517790dfe3f3f4b5cfde96d4acde303f1112643a6fa6a6a5901f358be3613cafcec232ee91c3601684cb806ef3254018da3d0e1075e00684f6029ee
   languageName: node
   linkType: hard
 
-"@types/mime@npm:^1":
-  version: 1.3.2
-  resolution: "@types/mime@npm:1.3.2"
-  checksum: 0493368244cced1a69cb791b485a260a422e6fcc857782e1178d1e6f219f1b161793e9f87f5fae1b219af0f50bee24fcbe733a18b4be8fdd07a38a8fb91146fd
+"@types/mime@npm:*":
+  version: 3.0.4
+  resolution: "@types/mime@npm:3.0.4"
+  checksum: 10/a6139c8e1f705ef2b064d072f6edc01f3c099023ad7c4fce2afc6c2bf0231888202adadbdb48643e8e20da0ce409481a49922e737eca52871b3dc08017455843
   languageName: node
   linkType: hard
 
 "@types/minimatch@npm:*, @types/minimatch@npm:^5.1.2":
   version: 5.1.2
   resolution: "@types/minimatch@npm:5.1.2"
-  checksum: 0391a282860c7cb6fe262c12b99564732401bdaa5e395bee9ca323c312c1a0f45efbf34dce974682036e857db59a5c9b1da522f3d6055aeead7097264c8705a8
+  checksum: 10/94db5060d20df2b80d77b74dd384df3115f01889b5b6c40fa2dfa27cfc03a68fb0ff7c1f2a0366070263eb2e9d6bfd8c87111d4bc3ae93c3f291297c1bf56c85
   languageName: node
   linkType: hard
 
 "@types/minimatch@npm:^3.0.3":
   version: 3.0.5
   resolution: "@types/minimatch@npm:3.0.5"
-  checksum: c41d136f67231c3131cf1d4ca0b06687f4a322918a3a5adddc87ce90ed9dbd175a3610adee36b106ae68c0b92c637c35e02b58c8a56c424f71d30993ea220b92
+  checksum: 10/c41d136f67231c3131cf1d4ca0b06687f4a322918a3a5adddc87ce90ed9dbd175a3610adee36b106ae68c0b92c637c35e02b58c8a56c424f71d30993ea220b92
   languageName: node
   linkType: hard
 
-"@types/minimist@npm:^1.2.0, @types/minimist@npm:^1.2.2":
+"@types/minimist@npm:^1.2.0":
   version: 1.2.2
   resolution: "@types/minimist@npm:1.2.2"
-  checksum: b8da83c66eb4aac0440e64674b19564d9d86c80ae273144db9681e5eeff66f238ade9515f5006ffbfa955ceff8b89ad2bd8ec577d7caee74ba101431fb07045d
+  checksum: 10/b8da83c66eb4aac0440e64674b19564d9d86c80ae273144db9681e5eeff66f238ade9515f5006ffbfa955ceff8b89ad2bd8ec577d7caee74ba101431fb07045d
   languageName: node
   linkType: hard
 
-"@types/mock-raf@npm:1.0.3":
-  version: 1.0.3
-  resolution: "@types/mock-raf@npm:1.0.3"
-  checksum: 0c1e4cb40d03e32f27ca78b412b04b317d9f34df42ad4cb3c3fdfa1a9aa9b627a1f709ef1ca5ed47e6fef22d3a8a8d302df922782f4b3052641d70c918859a47
+"@types/mock-raf@npm:1.0.6":
+  version: 1.0.6
+  resolution: "@types/mock-raf@npm:1.0.6"
+  checksum: 10/0389ac9a2f4be5d3c9dc05586c68d0c78f0d6a9dc167c57ee94da0bb1d9ef9a797871bcdf2f0ba43c951a423c05bdeb80807d5ca21a63c50c54ed21054a4aeb8
   languageName: node
   linkType: hard
 
-"@types/mousetrap@npm:1.6.11":
-  version: 1.6.11
-  resolution: "@types/mousetrap@npm:1.6.11"
-  checksum: 4465d16b7c20ab52d2f6b7fe8087e8f16101472f2e8758f01c63591015c1b0a67c9e6c371d978f24d5f37c4b83457515571489284bf7c7c844eb6c8f2527685b
+"@types/mousetrap@npm:1.6.15":
+  version: 1.6.15
+  resolution: "@types/mousetrap@npm:1.6.15"
+  checksum: 10/58ec552218108f8e5f0d40ee81579aafbdb00c3af0ef4b6d3fb193a8a11a2d37aa84c6e20524120b7f218c2a87dac24f426ee3b23e1269d42f8145a1a37c9eca
   languageName: node
   linkType: hard
 
-"@types/ms@npm:*":
-  version: 0.7.31
-  resolution: "@types/ms@npm:0.7.31"
-  checksum: daadd354aedde024cce6f5aa873fefe7b71b22cd0e28632a69e8b677aeb48ae8caa1c60e5919bb781df040d116b01cb4316335167a3fc0ef6a63fa3614c0f6da
+"@types/mute-stream@npm:^0.0.4":
+  version: 0.0.4
+  resolution: "@types/mute-stream@npm:0.0.4"
+  dependencies:
+    "@types/node": "npm:*"
+  checksum: 10/af8d83ad7b68ea05d9357985daf81b6c9b73af4feacb2f5c2693c7fd3e13e5135ef1bd083ce8d5bdc8e97acd28563b61bb32dec4e4508a8067fcd31b8a098632
   languageName: node
   linkType: hard
 
@@ -9392,136 +10291,154 @@ __metadata:
   version: 2.6.4
   resolution: "@types/node-fetch@npm:2.6.4"
   dependencies:
-    "@types/node": "*"
-    form-data: ^3.0.0
-  checksum: f3e1d881bb42269e676ecaf49f0e096ab345e22823a2b2d071d60619414817fe02df48a31a8d05adb23054028a2a65521bdb3906ceb763ab6d3339c8d8775058
+    "@types/node": "npm:*"
+    form-data: "npm:^3.0.0"
+  checksum: 10/e904b5f887099a2728979bce9bbae9cc5f851e97a8dc71fe9a6f900798ef0cab761a3027609e70ca73b0bfbd0a9433acdbc052301762eb2d7695d97975746be6
   languageName: node
   linkType: hard
 
-"@types/node-forge@npm:^1":
-  version: 1.3.2
-  resolution: "@types/node-forge@npm:1.3.2"
+"@types/node-forge@npm:^1, @types/node-forge@npm:^1.3.0":
+  version: 1.3.11
+  resolution: "@types/node-forge@npm:1.3.11"
   dependencies:
-    "@types/node": "*"
-  checksum: f532326a616e946e5f6733d1461e7b8d31911bbdfbc480a6337c422053d79c1e22a0776d114a325439e26ae382a640f939d0abf156e24a3c3ca5079d04aa73f6
+    "@types/node": "npm:*"
+  checksum: 10/670c9b377c48189186ec415e3c8ed371f141ecc1a79ab71b213b20816adeffecba44dae4f8406cc0d09e6349a4db14eb8c5893f643d8e00fa19fc035cf49dee0
   languageName: node
   linkType: hard
 
-"@types/node@npm:*, @types/node@npm:18.18.5, @types/node@npm:>=13.7.0":
-  version: 18.18.5
-  resolution: "@types/node@npm:18.18.5"
-  checksum: fc8c9b2bf226270cf9085a7dac76ce09dd7c3519ec9b687ee2b50385954ab3709c45ca82d002d1536e24286803cd194d7ab7008acebdcd6681b8b19d4277fa5c
+"@types/node@npm:*, @types/node@npm:>=13.7.0, @types/node@npm:^20.11.16":
+  version: 20.12.7
+  resolution: "@types/node@npm:20.12.7"
+  dependencies:
+    undici-types: "npm:~5.26.4"
+  checksum: 10/b4a28a3b593a9bdca5650880b6a9acef46911d58cf7cfa57268f048e9a7157a7c3196421b96cea576850ddb732e3b54bc982c8eb5e1e5ef0635d4424c2fce801
   languageName: node
   linkType: hard
 
 "@types/node@npm:18.18.4":
   version: 18.18.4
   resolution: "@types/node@npm:18.18.4"
-  checksum: 4901e91c4cc479bb58acbcd79236a97a0ad6db4a53cb1f4ba4cf32af15324c61b16faa6e31c1b09bf538a20feb5f5274239157ce5237f5741db0b9ab71e69c52
+  checksum: 10/2f55a7f0c603a3b56f2d24ec173d5f83be6470f638b551bab81821b6adf85d676656ed6ae267f994c029d48d4f1071b083ffdd5c7bbe7ae28533d1b4e1e83f12
+  languageName: node
+  linkType: hard
+
+"@types/node@npm:20.11.30":
+  version: 20.11.30
+  resolution: "@types/node@npm:20.11.30"
+  dependencies:
+    undici-types: "npm:~5.26.4"
+  checksum: 10/78515bc768d2b878e2e06a1c20eb4f5840072b79b8d28ff3dd0a7feaaf48fd3a2ac03cfa5bc7564da82db5906b43e9ba0e5df9f43d870b7aae2942306e208815
   languageName: node
   linkType: hard
 
 "@types/node@npm:^14.14.31":
   version: 14.18.36
   resolution: "@types/node@npm:14.18.36"
-  checksum: da7f479b3fc996d585e60b8329987c6e310ddbf051e14f2d900ce04f7768f42fa7b760f0eb376008d3eca130ce9431018fb5c9e44027dcb7bb139c547e44b9c5
+  checksum: 10/29e4c9fffea88e0b42345f76f93f4b13694dabfab6aab2fa9d05c8bea5731e878704c8bc2e25bc0f251f41e1b3fffe15263f4027a66a3de3504e12751d8ed43f
   languageName: node
   linkType: hard
 
 "@types/node@npm:^16.0.0, @types/node@npm:^16.18.39":
   version: 16.18.50
   resolution: "@types/node@npm:16.18.50"
-  checksum: 8aec1eaf83407197ec2fe947182c238f49b82a7aace867cee1f81f72eb8a76c3c8b2adb1fd356e7443317cffb2546708da8934299a579edd25e3160bf7af30a1
+  checksum: 10/86269db1724621f1a9af9ed37cbb6bc91bfe7a525e99d6aac168fc63371b634d49da15f94db26f593ada226d01fd64aa32a4dd0ee3732c36043056293c586416
   languageName: node
   linkType: hard
 
 "@types/normalize-package-data@npm:^2.4.0":
   version: 2.4.1
   resolution: "@types/normalize-package-data@npm:2.4.1"
-  checksum: e87bccbf11f95035c89a132b52b79ce69a1e3652fe55962363063c9c0dae0fe2477ebc585e03a9652adc6f381d24ba5589cc5e51849df4ced3d3e004a7d40ed5
+  checksum: 10/e87bccbf11f95035c89a132b52b79ce69a1e3652fe55962363063c9c0dae0fe2477ebc585e03a9652adc6f381d24ba5589cc5e51849df4ced3d3e004a7d40ed5
   languageName: node
   linkType: hard
 
-"@types/ol-ext@npm:@siedlerchr/types-ol-ext@3.2.0":
-  version: 3.2.0
-  resolution: "@siedlerchr/types-ol-ext@npm:3.2.0"
+"@types/ol-ext@npm:@siedlerchr/types-ol-ext@3.2.4":
+  version: 3.2.4
+  resolution: "@siedlerchr/types-ol-ext@npm:3.2.4"
   dependencies:
-    jspdf: ^2.5.1
-  checksum: 9025b03479dc08079c16e79a5b60b0ebece121c74cd4483a14b5c0d5a7231319bb4e62510a8f595295ad3b79341a907bec32b2e44e5864a2be7ed8ca3af43545
+    jspdf: "npm:^2.5.1"
+  checksum: 10/28d0f32bd98d54b039e7cdea232435cb658df677ddcc89ad0b73be2493a951524eae34be9eaf5d2877a2c06e4f5fba002c88e28b981150f3038d9b5b4589d568
   languageName: node
   linkType: hard
 
-"@types/papaparse@npm:5.3.7":
-  version: 5.3.7
-  resolution: "@types/papaparse@npm:5.3.7"
+"@types/papaparse@npm:5.3.14":
+  version: 5.3.14
+  resolution: "@types/papaparse@npm:5.3.14"
   dependencies:
-    "@types/node": "*"
-  checksum: 5ffa6fc81c0f41cd18c9c015599b3690f2a19ee553dec85e92c17bd1ef4a045e0ba4973d8bd49aed9f83fcba3b0ec280ebbe0a0def66701c0b4860c691444694
+    "@types/node": "npm:*"
+  checksum: 10/9bd5cc0e6a2c02def6c8903dc4604e499907cb465186ed3532390468082a06f023adbac0216428d0d8e8fe017206780a03d20007041e9fed47c8d391cd69a536
+  languageName: node
+  linkType: hard
+
+"@types/parse-color@npm:^1.0.1":
+  version: 1.0.3
+  resolution: "@types/parse-color@npm:1.0.3"
+  checksum: 10/d9c822f820f277502cc58a4c52f5758980e6972c9a4710df515ec93dc5dde05e8e3da6210ea6514035d49c1bf36a3f720c0e5ec9c214bdc0b8c3fdb9240e36ea
   languageName: node
   linkType: hard
 
 "@types/parse-json@npm:^4.0.0":
   version: 4.0.0
   resolution: "@types/parse-json@npm:4.0.0"
-  checksum: fd6bce2b674b6efc3db4c7c3d336bd70c90838e8439de639b909ce22f3720d21344f52427f1d9e57b265fcb7f6c018699b99e5e0c208a1a4823014269a6bf35b
+  checksum: 10/4df9de98150d2978afc2161482a3a8e6617883effba3223324f079de97ba7eabd7d84b90ced11c3f82b0c08d4a8383f678c9f73e9c41258f769b3fa234a2bb4f
   languageName: node
   linkType: hard
 
-"@types/pluralize@npm:^0.0.30":
-  version: 0.0.30
-  resolution: "@types/pluralize@npm:0.0.30"
-  checksum: 7a9a4a24aac1f74bd63e592a824ebec114486e0635a94496e92aa37fa388fac585be108d3ccfc7b2c490963679ec4900fbf394d22fa6cbf419f22cc499ab5a29
+"@types/pluralize@npm:^0.0.33":
+  version: 0.0.33
+  resolution: "@types/pluralize@npm:0.0.33"
+  checksum: 10/282d42dc0187e5e0912f9f36ee0f5615bfd273a08d40afe5bf5881cb28daf1977abe10564543032aa0f42352ebba739ff3d86bf5562ac4691c6d1761fcc7cf39
   languageName: node
   linkType: hard
 
 "@types/pretty-hrtime@npm:^1.0.0":
   version: 1.0.1
   resolution: "@types/pretty-hrtime@npm:1.0.1"
-  checksum: a6cdee417eea6f7af914e4fcd13e05822864ce10b5d7646525632e86d69b79123eec55a5d3fff0155ba46b61902775e1644bcb80e1e4dffdac28e7febb089083
+  checksum: 10/a6cdee417eea6f7af914e4fcd13e05822864ce10b5d7646525632e86d69b79123eec55a5d3fff0155ba46b61902775e1644bcb80e1e4dffdac28e7febb089083
   languageName: node
   linkType: hard
 
-"@types/prismjs@npm:1.26.0":
-  version: 1.26.0
-  resolution: "@types/prismjs@npm:1.26.0"
-  checksum: cd5e7a6214c1f4213ec512a5fcf6d8fe37a56b813fc57ac95b5ff5ee074742bfdbd2f2730d9fd985205bf4586728e09baa97023f739e5aa1c9735a7c1ecbd11a
+"@types/prismjs@npm:1.26.3":
+  version: 1.26.3
+  resolution: "@types/prismjs@npm:1.26.3"
+  checksum: 10/4bd55230ffc0b2b16f4008be3a7f1d7c6b32dd3bed8006e64d24fb22c44fc7e300dac77b856f732803ccdc9a3472b2c0ee7776cad048843c47d608c41a89b6a6
   languageName: node
   linkType: hard
 
 "@types/prop-types@npm:*":
   version: 15.7.4
   resolution: "@types/prop-types@npm:15.7.4"
-  checksum: ef6e1899e59b876c273811b1bd845022fc66d5a3d11cb38a25b6c566b30514ae38fe20a40f67622f362a4f4f7f9224e22d8da101cff3d6e97e11d7b4c307cfc1
+  checksum: 10/ef6e1899e59b876c273811b1bd845022fc66d5a3d11cb38a25b6c566b30514ae38fe20a40f67622f362a4f4f7f9224e22d8da101cff3d6e97e11d7b4c307cfc1
   languageName: node
   linkType: hard
 
 "@types/qs@npm:*, @types/qs@npm:^6.9.5":
   version: 6.9.7
   resolution: "@types/qs@npm:6.9.7"
-  checksum: 7fd6f9c25053e9b5bb6bc9f9f76c1d89e6c04f7707a7ba0e44cc01f17ef5284adb82f230f542c2d5557d69407c9a40f0f3515e8319afd14e1e16b5543ac6cdba
+  checksum: 10/7fd6f9c25053e9b5bb6bc9f9f76c1d89e6c04f7707a7ba0e44cc01f17ef5284adb82f230f542c2d5557d69407c9a40f0f3515e8319afd14e1e16b5543ac6cdba
   languageName: node
   linkType: hard
 
 "@types/raf@npm:^3.4.0":
   version: 3.4.0
   resolution: "@types/raf@npm:3.4.0"
-  checksum: d93e9b5244a081c64708b8918ef7e56936d6ef0144925b189e67d34127c0cb3a73fcf6866ab312db156554a66c26609dd056da5f7302f6658c049d6a37ed5f56
+  checksum: 10/4b88b4f52790f4d9dd7b27ca56d69d2bf11dee88dea531ea42c0aad7be1a25942398a708468beef987493d3daacc7fe5cc5644eed26a1a02258a0b392434565f
   languageName: node
   linkType: hard
 
 "@types/range-parser@npm:*":
   version: 1.2.4
   resolution: "@types/range-parser@npm:1.2.4"
-  checksum: b7c0dfd5080a989d6c8bb0b6750fc0933d9acabeb476da6fe71d8bdf1ab65e37c136169d84148034802f48378ab94e3c37bb4ef7656b2bec2cb9c0f8d4146a95
+  checksum: 10/b7c0dfd5080a989d6c8bb0b6750fc0933d9acabeb476da6fe71d8bdf1ab65e37c136169d84148034802f48378ab94e3c37bb4ef7656b2bec2cb9c0f8d4146a95
   languageName: node
   linkType: hard
 
-"@types/react-beautiful-dnd@npm:13.1.4":
-  version: 13.1.4
-  resolution: "@types/react-beautiful-dnd@npm:13.1.4"
+"@types/react-beautiful-dnd@npm:13.1.8":
+  version: 13.1.8
+  resolution: "@types/react-beautiful-dnd@npm:13.1.8"
   dependencies:
-    "@types/react": "*"
-  checksum: 76220f1031721e73f712cf0021de6a3cf4049260ec29996cd587876ebd6ed01b9c31d8efb5cf230eb4d2b6259525ffe0f3054667732d30c79df37e49f9398c5e
+    "@types/react": "npm:*"
+  checksum: 10/cb8a182ed0ea6f680c7c343fcb4e54237437ca90dc88c2a70f4a203ec8ad0740e389e3ab7772c8cc1479f05e5a046bccbc33d54055b94e0fe5b22be030ab23d2
   languageName: node
   linkType: hard
 
@@ -9529,66 +10446,75 @@ __metadata:
   version: 3.9.0
   resolution: "@types/react-calendar@npm:3.9.0"
   dependencies:
-    "@types/react": "*"
-  checksum: cddb6951c29c9adf96c38db2631d7b9d157aa65f5e4a45ba5bfc5657413839dfd7045a2e06b98e890b2285013a4777ca1e8317f6ee52c28284f1e47e58e0f8dd
+    "@types/react": "npm:*"
+  checksum: 10/05acec0ec111df7f34db2d5a4b337f9b69b31ee8b8932b3257cc0ea7468973fd851dc22de028ad1a8a12729e299bfb8ee67b32bb67763ce27c33000ab0e92a88
   languageName: node
   linkType: hard
 
-"@types/react-color@npm:3.0.6":
-  version: 3.0.6
-  resolution: "@types/react-color@npm:3.0.6"
+"@types/react-color@npm:3.0.12":
+  version: 3.0.12
+  resolution: "@types/react-color@npm:3.0.12"
   dependencies:
-    "@types/react": "*"
-    "@types/reactcss": "*"
-  checksum: 8cd881d6eb725190be942c1d71f7917d3dd1b418417740f64fa6c03ae3ba16cb91d07c4b3b348cf5bae20071c8ca5d4aaf514c9a5318077d5e50bd782a5e8da2
+    "@types/react": "npm:*"
+    "@types/reactcss": "npm:*"
+  checksum: 10/d8ed71d297d026faded787588720ee5e158edfa45ee23c5e517d8bb1441ccaa25f8a0c88069fd63829f7263bbbdc78a7ae2df5957061847a2d2c6351c46c13dd
   languageName: node
   linkType: hard
 
-"@types/react-dom@npm:*, @types/react-dom@npm:18.2.7, @types/react-dom@npm:^18.0.0":
-  version: 18.2.7
-  resolution: "@types/react-dom@npm:18.2.7"
+"@types/react-dom@npm:*, @types/react-dom@npm:^18.0.0":
+  version: 18.2.25
+  resolution: "@types/react-dom@npm:18.2.25"
   dependencies:
-    "@types/react": "*"
-  checksum: e02ea908289a7ad26053308248d2b87f6aeafd73d0e2de2a3d435947bcea0422599016ffd1c3e38ff36c42f5e1c87c7417f05b0a157e48649e4a02f21727d54f
+    "@types/react": "npm:*"
+  checksum: 10/0e45856a2fdbf09e74632b132b3af773c6b18fc2ab0bd04595c9f2bcc0bb04d5e732ac8156d145b712dedab7484a8fe9dce5cf720a5437b5d26099c7060c7ba4
   languageName: node
   linkType: hard
 
-"@types/react-grid-layout@npm:1.3.2":
-  version: 1.3.2
-  resolution: "@types/react-grid-layout@npm:1.3.2"
+"@types/react-dom@npm:18.2.22":
+  version: 18.2.22
+  resolution: "@types/react-dom@npm:18.2.22"
   dependencies:
-    "@types/react": "*"
-  checksum: 190492acb69186c651bb99f19028dcd4c65129eae7de6efd41f51b6a6711af490e7b99ad7156b8731b11ecf2ec7c22bcf13c782bfe65be4b4e5c3362b97095bf
+    "@types/react": "npm:*"
+  checksum: 10/310da22244c1bb65a7f213f8727bda821dd211cfb2dd62d1f9b28dd50ef1c196d59e908494bd5f25c13a3844343f3a6135f39fb830aca6f79646fa56c1b56c08
   languageName: node
   linkType: hard
 
-"@types/react-highlight-words@npm:0.16.4":
-  version: 0.16.4
-  resolution: "@types/react-highlight-words@npm:0.16.4"
+"@types/react-grid-layout@npm:1.3.5":
+  version: 1.3.5
+  resolution: "@types/react-grid-layout@npm:1.3.5"
   dependencies:
-    "@types/react": "*"
-  checksum: 8b7c1b2b63b8f6d58e181613ba5392755b042bf87c74e65caad7bfc4585566944e9aacda6ee3b1cad222aea6667716c8be8643b39b72ae7b4aaadde063a62d25
+    "@types/react": "npm:*"
+  checksum: 10/21599054dfa977ed8445b1ab3198a842531cb36bd620564c3f8a469688cbea051149eb644a99b2f8f6d02f8d9909a6145668f385781b5647601e9663de216946
+  languageName: node
+  linkType: hard
+
+"@types/react-highlight-words@npm:0.16.7":
+  version: 0.16.7
+  resolution: "@types/react-highlight-words@npm:0.16.7"
+  dependencies:
+    "@types/react": "npm:*"
+  checksum: 10/503e49f396cd9b9d08e5f3ca4817095427d51bfdb094e2458752908e1803d379750aa7b421397fe6e6fe8c842fbe91f5b30f87a56586ae7f2b2f0e6816b69113
   languageName: node
   linkType: hard
 
-"@types/react-redux@npm:7.1.25, @types/react-redux@npm:^7.1.20":
+"@types/react-redux@npm:^7.1.20":
   version: 7.1.25
   resolution: "@types/react-redux@npm:7.1.25"
   dependencies:
-    "@types/hoist-non-react-statics": ^3.3.0
-    "@types/react": "*"
-    hoist-non-react-statics: ^3.3.0
-    redux: ^4.0.0
-  checksum: a61ec25cbf8bb3720850402d3c49493fcff4afb73ad447d161460b5d4c600c984ad48708e8564d2fd32052eaa3c3b3f655c5b300ce813429637cce9e5958329f
+    "@types/hoist-non-react-statics": "npm:^3.3.0"
+    "@types/react": "npm:*"
+    hoist-non-react-statics: "npm:^3.3.0"
+    redux: "npm:^4.0.0"
+  checksum: 10/1c5780ff46b9a2bba3b68b26645ce9704cd3ef387141240c1369fcbef51370a84b8a5fc6ca27966f96f6e5b41618c88f498fedc7056870b207cbafbb4da34e91
   languageName: node
   linkType: hard
 
-"@types/react-resizable@npm:3.0.4":
-  version: 3.0.4
-  resolution: "@types/react-resizable@npm:3.0.4"
+"@types/react-resizable@npm:3.0.7":
+  version: 3.0.7
+  resolution: "@types/react-resizable@npm:3.0.7"
   dependencies:
-    "@types/react": "*"
-  checksum: 8c8ab9ec6481195f1875cbc76c95f26794d1d1ce7fcd833078252d6378e197a5b4483bdf4f8c90ae8f3f6f7a9503c518388bd7d09985e72fff3b4d77153f6ebd
+    "@types/react": "npm:*"
+  checksum: 10/e66dfabcb614f1da1f561d0ecaf1dc384fc0e361d97fa7b219f04f8b85ad9dd2576437117af52ae6bf33644061db2d9452e0a4aadfe457588d93a36d2db8de0b
   languageName: node
   linkType: hard
 
@@ -9596,97 +10522,95 @@ __metadata:
   version: 5.3.3
   resolution: "@types/react-router-dom@npm:5.3.3"
   dependencies:
-    "@types/history": ^4.7.11
-    "@types/react": "*"
-    "@types/react-router": "*"
-  checksum: 28c4ea48909803c414bf5a08502acbb8ba414669b4b43bb51297c05fe5addc4df0b8fd00e0a9d1e3535ec4073ef38aaafac2c4a2b95b787167d113bc059beff3
+    "@types/history": "npm:^4.7.11"
+    "@types/react": "npm:*"
+    "@types/react-router": "npm:*"
+  checksum: 10/28c4ea48909803c414bf5a08502acbb8ba414669b4b43bb51297c05fe5addc4df0b8fd00e0a9d1e3535ec4073ef38aaafac2c4a2b95b787167d113bc059beff3
   languageName: node
   linkType: hard
 
-"@types/react-router@npm:*":
+"@types/react-router@npm:*, @types/react-router@npm:5.1.20":
   version: 5.1.20
   resolution: "@types/react-router@npm:5.1.20"
   dependencies:
-    "@types/history": ^4.7.11
-    "@types/react": "*"
-  checksum: 128764143473a5e9457ddc715436b5d49814b1c214dde48939b9bef23f0e77f52ffcdfa97eb8d3cc27e2c229869c0cdd90f637d887b62f2c9f065a87d6425419
+    "@types/history": "npm:^4.7.11"
+    "@types/react": "npm:*"
+  checksum: 10/72d78d2f4a4752ec40940066b73d7758a0824c4d0cbeb380ae24c8b1cdacc21a6fc835a99d6849b5b295517a3df5466fc28be038f1040bd870f8e39e5ded43a4
   languageName: node
   linkType: hard
 
-"@types/react-table@npm:7.7.14":
-  version: 7.7.14
-  resolution: "@types/react-table@npm:7.7.14"
+"@types/react-table@npm:7.7.20":
+  version: 7.7.20
+  resolution: "@types/react-table@npm:7.7.20"
   dependencies:
-    "@types/react": "*"
-  checksum: 238047beca9abecc4b3e1e377b823b492b1a00d011b8456012bbcbd2682d5a7e0c0b1cca6384ccc41e724156e991d35e5725a5a3c4b01ff7bbaf095643569da9
+    "@types/react": "npm:*"
+  checksum: 10/adf86958dd5b2e044d23fc7896f758b5ec59987891b41e9b02d935d666e999a518b0bdd8ba5bd60d644f20147de0ec3cf5f6a12b75516f1fad43fb3b4fd8361f
   languageName: node
   linkType: hard
 
-"@types/react-test-renderer@npm:18.0.0":
-  version: 18.0.0
-  resolution: "@types/react-test-renderer@npm:18.0.0"
+"@types/react-test-renderer@npm:18.0.7":
+  version: 18.0.7
+  resolution: "@types/react-test-renderer@npm:18.0.7"
   dependencies:
-    "@types/react": "*"
-  checksum: 6afc938a1d7618d88ab8793e251f0bd5981bf3f08c1b600f74df3f8800b92589ea534dc6dcb7c8d683893fcc740bf8d7843a42bf2dae59785cfe88f004bd7b0b
+    "@types/react": "npm:*"
+  checksum: 10/701d7d815fe7b921712ebdb2c4434e99b92403d37c51b33a01ce1b62fed7d1efbf9f749971d9031a5b137c6d5e194249c378106768aa69725a01f150fef0ec7f
   languageName: node
   linkType: hard
 
-"@types/react-transition-group@npm:4.4.6, @types/react-transition-group@npm:^4.4.0":
-  version: 4.4.6
-  resolution: "@types/react-transition-group@npm:4.4.6"
+"@types/react-transition-group@npm:4.4.10, @types/react-transition-group@npm:^4.4.0":
+  version: 4.4.10
+  resolution: "@types/react-transition-group@npm:4.4.10"
   dependencies:
-    "@types/react": "*"
-  checksum: 0872143821d7ee20a1d81e965f8b1e837837f11cd2206973f1f98655751992d9390304d58bac192c9cd923eca95bff107d8c9e3364a180240d5c2a6fd70fd7c3
+    "@types/react": "npm:*"
+  checksum: 10/b429f3bd54d9aea6c0395943ce2dda6b76fb458e902365bd91fd99bf72064fb5d59e2b74e78d10f2871908501d350da63e230d81bda2b616c967cab8dc51bd16
   languageName: node
   linkType: hard
 
-"@types/react-virtualized-auto-sizer@npm:1.0.1":
-  version: 1.0.1
-  resolution: "@types/react-virtualized-auto-sizer@npm:1.0.1"
+"@types/react-virtualized-auto-sizer@npm:1.0.4":
+  version: 1.0.4
+  resolution: "@types/react-virtualized-auto-sizer@npm:1.0.4"
   dependencies:
-    "@types/react": "*"
-  checksum: 67eff0670a1991c2b16992274ada5f0b3f9d5c2d6209ef38e8f8ae2c0218211a3292882f5b7dd6f09519000dc20847629f049c9acc267e000626b7141e5927a6
+    "@types/react": "npm:*"
+  checksum: 10/e0d41ac6cf0f48dfef45c0cd70146578f42ad83dad90911aa0dfe72b0e1ea62ca9ff56d4f43f322ec6dae2e7cb4d025aefe0e85241f7782c249aeface1050512
   languageName: node
   linkType: hard
 
 "@types/react-window-infinite-loader@npm:^1":
-  version: 1.0.6
-  resolution: "@types/react-window-infinite-loader@npm:1.0.6"
+  version: 1.0.9
+  resolution: "@types/react-window-infinite-loader@npm:1.0.9"
   dependencies:
-    "@types/react": "*"
-    "@types/react-window": "*"
-  checksum: d4648dfb44614e4f0137d7b77eb1868b0c5252f451a78edfc4520e508157ce7687d4b7d9efd6df8f01e72e0d92224338b8c8d934220f32a3081b528599a25829
+    "@types/react": "npm:*"
+    "@types/react-window": "npm:*"
+  checksum: 10/9f2c27f24bfa726ceaef6612a4adbda745f3455c877193f68dfa48591274c670a6df4fa6870785cff5f948e289ceb9a247fb7cbf67e3cd555ab16d11866fd63f
   languageName: node
   linkType: hard
 
-"@types/react-window@npm:*, @types/react-window@npm:1.8.5":
-  version: 1.8.5
-  resolution: "@types/react-window@npm:1.8.5"
+"@types/react-window@npm:*, @types/react-window@npm:1.8.8":
+  version: 1.8.8
+  resolution: "@types/react-window@npm:1.8.8"
   dependencies:
-    "@types/react": "*"
-  checksum: 5f519e1402300d11b6e6595223feb6499f3227e38da166cbc565773cd7f71862abcf855b7835d391b5119fcfacdfba79d73a965b45f60a293fc1ff25986319ed
+    "@types/react": "npm:*"
+  checksum: 10/79b70b7c33161efb14bf69115792843de8e038594136a8373cfbbcc4066c49fd611dd2d3592a9a81d19d21c075bf14e5e73a64f4d9ad32e45d4d5493f5f53918
   languageName: node
   linkType: hard
 
-"@types/react@npm:*, @types/react@npm:18.2.15, @types/react@npm:>=16":
-  version: 18.2.15
-  resolution: "@types/react@npm:18.2.15"
+"@types/react@npm:*, @types/react@npm:>=16":
+  version: 18.2.79
+  resolution: "@types/react@npm:18.2.79"
   dependencies:
-    "@types/prop-types": "*"
-    "@types/scheduler": "*"
-    csstype: ^3.0.2
-  checksum: 36989f638201bfe2f4110b06c119180f6df9c0e13d7060481e82e7a745f81745a01ae543c478a25b61e0767cb52e82da2ad5b0dedacabf99339e523d06176705
+    "@types/prop-types": "npm:*"
+    csstype: "npm:^3.0.2"
+  checksum: 10/2ef833e7d0a5c226beddbbe090811582371f6ae5e2f092a3d9f47cc6087c8bce0b96ee33e351de6d1d470f0a0ec5892d971933f841ef31538c1821681fc6569e
   languageName: node
   linkType: hard
 
-"@types/react@npm:18.0.28":
-  version: 18.0.28
-  resolution: "@types/react@npm:18.0.28"
+"@types/react@npm:18.2.73":
+  version: 18.2.73
+  resolution: "@types/react@npm:18.2.73"
   dependencies:
-    "@types/prop-types": "*"
-    "@types/scheduler": "*"
-    csstype: ^3.0.2
-  checksum: e752df961105e5127652460504785897ca6e77259e0da8f233f694f9e8f451cde7fa0709d4456ade0ff600c8ce909cfe29f9b08b9c247fa9b734e126ec53edd7
+    "@types/prop-types": "npm:*"
+    csstype: "npm:^3.0.2"
+  checksum: 10/799e30e73464dff40e04f4eb7499ebc31f99b1711a69263b9af340af738e35c9cdf53084e3dacc3b21c031aaa0cba1b51f4ba60490204b7abb75f115b841583f
   languageName: node
   linkType: hard
 
@@ -9694,96 +10618,81 @@ __metadata:
   version: 1.2.6
   resolution: "@types/reactcss@npm:1.2.6"
   dependencies:
-    "@types/react": "*"
-  checksum: f4711d707a1af653178c8941080e989a945feb0c529d848fed36687ee5e8a462cda183383caadf8848497b5c03bec16e6cdf22fc70462913d8d706cabb597130
+    "@types/react": "npm:*"
+  checksum: 10/f4711d707a1af653178c8941080e989a945feb0c529d848fed36687ee5e8a462cda183383caadf8848497b5c03bec16e6cdf22fc70462913d8d706cabb597130
   languageName: node
   linkType: hard
 
-"@types/redux-mock-store@npm:1.0.3":
-  version: 1.0.3
-  resolution: "@types/redux-mock-store@npm:1.0.3"
+"@types/redux-mock-store@npm:1.0.6":
+  version: 1.0.6
+  resolution: "@types/redux-mock-store@npm:1.0.6"
   dependencies:
-    redux: ^4.0.5
-  checksum: b8c76be560fb06c0b5fc8b8874001f0b0219a7a5d0bbbf8f06ebfc437a1300df49f079b30199a9fa99c738817145895a4f0297b8f614edadd1d9e110e917cd0a
+    redux: "npm:^4.0.5"
+  checksum: 10/5c799d2fc5b3f0f84bfcd6243c56b1ac98be6707057f570b5e51e9d305f446978cc2958c7e0b629ebf73293f15a79765517e6d0a1df0371fd27551f7128325c7
   languageName: node
   linkType: hard
 
 "@types/resolve@npm:1.20.2":
   version: 1.20.2
   resolution: "@types/resolve@npm:1.20.2"
-  checksum: 61c2cad2499ffc8eab36e3b773945d337d848d3ac6b7b0a87c805ba814bc838ef2f262fc0f109bfd8d2e0898ff8bd80ad1025f9ff64f1f71d3d4294c9f14e5f6
-  languageName: node
-  linkType: hard
-
-"@types/retry@npm:^0.12.0":
-  version: 0.12.1
-  resolution: "@types/retry@npm:0.12.1"
-  checksum: 5f46b2556053655f78262bb33040dc58417c900457cc63ff37d6c35349814471453ef511af0cec76a540c601296cd2b22f64bab1ab649c0dacc0223765ba876c
-  languageName: node
-  linkType: hard
-
-"@types/scheduler@npm:*":
-  version: 0.16.2
-  resolution: "@types/scheduler@npm:0.16.2"
-  checksum: b6b4dcfeae6deba2e06a70941860fb1435730576d3689225a421280b7742318d1548b3d22c1f66ab68e414f346a9542f29240bc955b6332c5b11e561077583bc
+  checksum: 10/1bff0d3875e7e1557b6c030c465beca9bf3b1173ebc6937cac547654b0af3bb3ff0f16470e9c4d7c5dc308ad9ac8627c38dbff24ef698b66673ff5bd4ead7f7e
   languageName: node
   linkType: hard
 
-"@types/semver@npm:7.5.0, @types/semver@npm:^7.3.12, @types/semver@npm:^7.3.4":
-  version: 7.5.0
-  resolution: "@types/semver@npm:7.5.0"
-  checksum: 0a64b9b9c7424d9a467658b18dd70d1d781c2d6f033096a6e05762d20ebbad23c1b69b0083b0484722aabf35640b78ccc3de26368bcae1129c87e9df028a22e2
+"@types/retry@npm:0.12.2":
+  version: 0.12.2
+  resolution: "@types/retry@npm:0.12.2"
+  checksum: 10/e5675035717b39ce4f42f339657cae9637cf0c0051cf54314a6a2c44d38d91f6544be9ddc0280587789b6afd056be5d99dbe3e9f4df68c286c36321579b1bf4a
   languageName: node
   linkType: hard
 
-"@types/serve-index@npm:^1.9.1":
-  version: 1.9.1
-  resolution: "@types/serve-index@npm:1.9.1"
-  dependencies:
-    "@types/express": "*"
-  checksum: 026f3995fb500f6df7c3fe5009e53bad6d739e20b84089f58ebfafb2f404bbbb6162bbe33f72d2f2af32d5b8d3799c8e179793f90d9ed5871fb8591190bb6056
+"@types/semver@npm:7.5.8, @types/semver@npm:^7.3.12, @types/semver@npm:^7.3.4, @types/semver@npm:^7.5.0":
+  version: 7.5.8
+  resolution: "@types/semver@npm:7.5.8"
+  checksum: 10/3496808818ddb36deabfe4974fd343a78101fa242c4690044ccdc3b95dcf8785b494f5d628f2f47f38a702f8db9c53c67f47d7818f2be1b79f2efb09692e1178
   languageName: node
   linkType: hard
 
-"@types/serve-static@npm:*, @types/serve-static@npm:^1.13.10":
-  version: 1.13.10
-  resolution: "@types/serve-static@npm:1.13.10"
+"@types/serve-index@npm:^1.9.4":
+  version: 1.9.4
+  resolution: "@types/serve-index@npm:1.9.4"
   dependencies:
-    "@types/mime": ^1
-    "@types/node": "*"
-  checksum: eaca858739483e3ded254cad7d7a679dc2c8b3f52c8bb0cd845b3b7eb1984bde0371fdcb0a5c83aa12e6daf61b6beb762545021f520f08a1fe882a3fa4ea5554
+    "@types/express": "npm:*"
+  checksum: 10/72727c88d54da5b13275ebfb75dcdc4aa12417bbe9da1939e017c4c5f0c906fae843aa4e0fbfe360e7ee9df2f3d388c21abfc488f77ce58693fb57809f8ded92
   languageName: node
   linkType: hard
 
-"@types/set-cookie-parser@npm:^2.4.0":
-  version: 2.4.2
-  resolution: "@types/set-cookie-parser@npm:2.4.2"
+"@types/serve-static@npm:*, @types/serve-static@npm:^1.15.5":
+  version: 1.15.5
+  resolution: "@types/serve-static@npm:1.15.5"
   dependencies:
-    "@types/node": "*"
-  checksum: c31bf04eb9620829dc3c91bced74ac934ad039d20d20893fb5acac0f08769cbd4eef3bf7502a0289c7be59c3e9cfa456147b4e88bff47dd1b9efb4995ba5d5a3
+    "@types/http-errors": "npm:*"
+    "@types/mime": "npm:*"
+    "@types/node": "npm:*"
+  checksum: 10/49aa21c367fffe4588fc8c57ea48af0ea7cbadde7418bc53cde85d8bd57fd2a09a293970d9ea86e79f17a87f8adeb3e20da76aab38e1c4d1567931fa15c8af38
   languageName: node
   linkType: hard
 
 "@types/sinonjs__fake-timers@npm:8.1.1":
   version: 8.1.1
   resolution: "@types/sinonjs__fake-timers@npm:8.1.1"
-  checksum: ca09d54d47091d87020824a73f026300fa06b17cd9f2f9b9387f28b549364b141ef194ee28db762f6588de71d8febcd17f753163cb7ea116b8387c18e80ebd5c
+  checksum: 10/567e01159b07eb19a56aa9a619bda963a3e2c1261b197b83fc664867228ce679e189450f0ae38483a08857155f94d9ae5d88e72c0f44f269103f63c2946a73ed
   languageName: node
   linkType: hard
 
 "@types/sizzle@npm:*, @types/sizzle@npm:^2.3.2":
   version: 2.3.3
   resolution: "@types/sizzle@npm:2.3.3"
-  checksum: 586a9fb1f6ff3e325e0f2cc1596a460615f0bc8a28f6e276ac9b509401039dd242fa8b34496d3a30c52f5b495873922d09a9e76c50c2ab2bcc70ba3fb9c4e160
+  checksum: 10/586a9fb1f6ff3e325e0f2cc1596a460615f0bc8a28f6e276ac9b509401039dd242fa8b34496d3a30c52f5b495873922d09a9e76c50c2ab2bcc70ba3fb9c4e160
   languageName: node
   linkType: hard
 
-"@types/slate-plain-serializer@npm:0.7.2":
-  version: 0.7.2
-  resolution: "@types/slate-plain-serializer@npm:0.7.2"
+"@types/slate-plain-serializer@npm:0.7.5":
+  version: 0.7.5
+  resolution: "@types/slate-plain-serializer@npm:0.7.5"
   dependencies:
-    "@types/slate": "*"
-  checksum: b982c2241012e547eeba18e1104f2baa4ba0dbb674e4dcec9bf78bfe039fbde1599bd7a8c1d398baec67401a0949416c7543c0133ab80f81cddfdaff916c3f59
+    "@types/slate": "npm:*"
+  checksum: 10/8e8e7096f7656c51839a1d93b051cac7e5f106da682ccd5bd2eaba2e5364681471fd97a207261e232704f76ef24891728fbed015a9a801a220576255e9a46202
   languageName: node
   linkType: hard
 
@@ -9791,10 +10700,10 @@ __metadata:
   version: 0.22.9
   resolution: "@types/slate-react@npm:0.22.9"
   dependencies:
-    "@types/react": "*"
-    "@types/slate": "*"
-    immutable: ^3.8.2
-  checksum: d74812f6bf651c508afb2a4fae4ae919cba992ec920ac017d1bf73b1b469959145793a716d5d114b93d1082683ab7378b5cb5b68f0ff01a6d121c8ddbbb8e2e1
+    "@types/react": "npm:*"
+    "@types/slate": "npm:*"
+    immutable: "npm:^3.8.2"
+  checksum: 10/3dbbf2ed2a8836eb34ec9ad46179259aef474ee59af577b03fb10fec1ca15a4e1c2321d8ac3e2019e227ceba2265a2278f7749076a8ad953d759f0360bbf1a7c
   languageName: node
   linkType: hard
 
@@ -9802,147 +10711,168 @@ __metadata:
   version: 0.47.11
   resolution: "@types/slate@npm:0.47.11"
   dependencies:
-    "@types/react": "*"
-    immutable: ^3.8.2
-  checksum: 57efee2f8cc5c90583b256f332e764f7977ade9aff596513d68f44958b3914763ff0a2e4f4fdf1726bebd4815cc2e16a81f052432450cae52373af5582889cb8
+    "@types/react": "npm:*"
+    immutable: "npm:^3.8.2"
+  checksum: 10/ef7b9edd0a96a4730b1933369363e6bd44193b5b26e9cccbcebf63be3ff59a2ca1466f5ee49a7d1a79ea8293c6df1e0ea10d5dfd600899c17d5cc1963574fb02
   languageName: node
   linkType: hard
 
-"@types/sockjs@npm:^0.3.33":
-  version: 0.3.33
-  resolution: "@types/sockjs@npm:0.3.33"
+"@types/sockjs@npm:^0.3.36":
+  version: 0.3.36
+  resolution: "@types/sockjs@npm:0.3.36"
   dependencies:
-    "@types/node": "*"
-  checksum: b9bbb2b5c5ead2fb884bb019f61a014e37410bddd295de28184e1b2e71ee6b04120c5ba7b9954617f0bdf962c13d06249ce65004490889c747c80d3f628ea842
+    "@types/node": "npm:*"
+  checksum: 10/b4b5381122465d80ea8b158537c00bc82317222d3fb31fd7229ff25b31fa89134abfbab969118da55622236bf3d8fee75759f3959908b5688991f492008f29bc
   languageName: node
   linkType: hard
 
 "@types/stack-utils@npm:^2.0.0":
   version: 2.0.1
   resolution: "@types/stack-utils@npm:2.0.1"
-  checksum: 205fdbe3326b7046d7eaf5e494d8084f2659086a266f3f9cf00bccc549c8e36e407f88168ad4383c8b07099957ad669f75f2532ed4bc70be2b037330f7bae019
+  checksum: 10/205fdbe3326b7046d7eaf5e494d8084f2659086a266f3f9cf00bccc549c8e36e407f88168ad4383c8b07099957ad669f75f2532ed4bc70be2b037330f7bae019
   languageName: node
   linkType: hard
 
-"@types/string-hash@npm:1.1.1":
-  version: 1.1.1
-  resolution: "@types/string-hash@npm:1.1.1"
-  checksum: e7cdba66dc1cfd88033d66a0fd301abd1434f8e3fc22826443073e5c33a26e5c53a26ef4e062d0ebf3f8590f506dec2351c4b952df1d04ba188bc0a48f411f17
+"@types/statuses@npm:^2.0.4":
+  version: 2.0.4
+  resolution: "@types/statuses@npm:2.0.4"
+  checksum: 10/3a806c3b96d1845e3e7441fbf0839037e95f717334760ddb7c29223c9a34a7206b68e2998631f89f1a1e3ef5b67b15652f6e8fa14987ebd7f6d38587c1bffd18
   languageName: node
   linkType: hard
 
-"@types/symlink-or-copy@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@types/symlink-or-copy@npm:1.2.0"
-  checksum: 18fb73094b2cf6c84544939bd6344d7a8cd1ccf8496a1cfb1320f38491c8dfbea3248bb6e91495322a51a493e04a767582a214d5261f5c5b007aa6ef65fc8b50
+"@types/string-hash@npm:1.1.3":
+  version: 1.1.3
+  resolution: "@types/string-hash@npm:1.1.3"
+  checksum: 10/39a546088123efb1af9beac3854aa1eb54cf24ab75d99c8dac9ccfa7d46d70ac7c99c10983f7cc623dda1e476b6e21e7acffe6c5b3be894751ae4b9cfd103aaf
   languageName: node
   linkType: hard
 
-"@types/systemjs@npm:6.13.1":
-  version: 6.13.1
-  resolution: "@types/systemjs@npm:6.13.1"
-  checksum: 61fad0cbdbc61e0b6c6fd82d9623d9e68ff587848e0c8198a6bb4a78985b4880962543e02aeb96dfdb4623439ef0d848fde61a82757308dd5067040deee9d1ee
+"@types/symlink-or-copy@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "@types/symlink-or-copy@npm:1.2.0"
+  checksum: 10/554d9255387a9da98b685fe74b70d8b123063cf78b8f3be0de2c768cb0f37515d1edb0334be908585d77c6409e79202faf1a66ee8e78bb06ca168a2028d0c3f3
   languageName: node
   linkType: hard
 
-"@types/testing-library__jest-dom@npm:5.14.8":
-  version: 5.14.8
-  resolution: "@types/testing-library__jest-dom@npm:5.14.8"
-  dependencies:
-    "@types/jest": "*"
-  checksum: 18f5ba7d0db8ebd91667b544537762ce63f11c4fd02b3d57afa92f9457a384d3ecf9bc7b50b6b445af1b3ea38b69862b4f95130720d4dd23621d598ac074d93a
+"@types/systemjs@npm:6.13.5":
+  version: 6.13.5
+  resolution: "@types/systemjs@npm:6.13.5"
+  checksum: 10/f514baebdffa4530f6daf65c07212edc9e8a7130b22df85217f926788ae87ddd77ccd29e8dde126bba7b669ef7a6575e84ddc5757e7e854ca51392200731f245
   languageName: node
   linkType: hard
 
-"@types/testing-library__jest-dom@npm:^5.9.1":
+"@types/testing-library__jest-dom@npm:5.14.9":
   version: 5.14.9
   resolution: "@types/testing-library__jest-dom@npm:5.14.9"
   dependencies:
-    "@types/jest": "*"
-  checksum: d364494fc2545316292e88861146146af1e3818792ca63b62a63758b2f737669b687f4aaddfcfbcb7d0e1ed7890a9bd05de23ff97f277d5e68de574497a9ee72
+    "@types/jest": "npm:*"
+  checksum: 10/e257de95a4a9385cc09ae4ca3396d23ad4b5cfb8e021a1ca3454c424c34636075f6fe151b2f881f79bf9d497aa04fbfae62449b135f293e8d2d614fa899898a8
   languageName: node
   linkType: hard
 
-"@types/tinycolor2@npm:1.4.3":
-  version: 1.4.3
-  resolution: "@types/tinycolor2@npm:1.4.3"
-  checksum: 61984b2825d4ee902016ef24777787bb2fb9e4999ccd4f7e5a709442c00cf90ba4afa510b9c78f18dcc83c03305d597d5fe3825a6aad38354f95c68af70ebc1b
+"@types/tinycolor2@npm:1.4.6":
+  version: 1.4.6
+  resolution: "@types/tinycolor2@npm:1.4.6"
+  checksum: 10/a662fd177135d27779b7ccba39881a85167f969787c71c7bf51903d288a519ad5b9526e0a4af7bde6444df6b7abe88bae893d569c6d804108c03dfec9509bdf6
   languageName: node
   linkType: hard
 
 "@types/tough-cookie@npm:*":
   version: 4.0.2
   resolution: "@types/tough-cookie@npm:4.0.2"
-  checksum: e055556ffdaa39ad85ede0af192c93f93f986f4bd9e9426efdc2948e3e2632db3a4a584d4937dbf6d7620527419bc99e6182d3daf2b08685e710f2eda5291905
+  checksum: 10/8682b4062959c15c0521361825839e10d374344fa84166ee0b731b815ac7b79a942f6e9192fad6383d69df2251021678c86c46748ff69c61609934a3e27472f2
   languageName: node
   linkType: hard
 
-"@types/trusted-types@npm:*, @types/trusted-types@npm:2.0.3":
-  version: 2.0.3
-  resolution: "@types/trusted-types@npm:2.0.3"
-  checksum: 4794804bc4a4a173d589841b6d26cf455ff5dc4f3e704e847de7d65d215f2e7043d8757e4741ce3a823af3f08260a8d04a1a6e9c5ec9b20b7b04586956a6b005
+"@types/trusted-types@npm:*, @types/trusted-types@npm:2.0.7":
+  version: 2.0.7
+  resolution: "@types/trusted-types@npm:2.0.7"
+  checksum: 10/8e4202766a65877efcf5d5a41b7dd458480b36195e580a3b1085ad21e948bc417d55d6f8af1fd2a7ad008015d4117d5fdfe432731157da3c68678487174e4ba3
   languageName: node
   linkType: hard
 
 "@types/unist@npm:*, @types/unist@npm:^2.0.0":
   version: 2.0.6
   resolution: "@types/unist@npm:2.0.6"
-  checksum: 25cb860ff10dde48b54622d58b23e66214211a61c84c0f15f88d38b61aa1b53d4d46e42b557924a93178c501c166aa37e28d7f6d994aba13d24685326272d5db
+  checksum: 10/25cb860ff10dde48b54622d58b23e66214211a61c84c0f15f88d38b61aa1b53d4d46e42b557924a93178c501c166aa37e28d7f6d994aba13d24685326272d5db
+  languageName: node
+  linkType: hard
+
+"@types/use-sync-external-store@npm:^0.0.3":
+  version: 0.0.3
+  resolution: "@types/use-sync-external-store@npm:0.0.3"
+  checksum: 10/161ddb8eec5dbe7279ac971531217e9af6b99f7783213566d2b502e2e2378ea19cf5e5ea4595039d730aa79d3d35c6567d48599f69773a02ffcff1776ec2a44e
   languageName: node
   linkType: hard
 
 "@types/uuid@npm:9.0.2":
   version: 9.0.2
   resolution: "@types/uuid@npm:9.0.2"
-  checksum: 1754bcf3444e1e3aeadd6e774fc328eb53bc956665e2e8fb6ec127aa8e1f43d9a224c3d22a9a6233dca8dd81a12dc7fed4d84b8876dd5ec82d40f574f7ff8b68
+  checksum: 10/1754bcf3444e1e3aeadd6e774fc328eb53bc956665e2e8fb6ec127aa8e1f43d9a224c3d22a9a6233dca8dd81a12dc7fed4d84b8876dd5ec82d40f574f7ff8b68
+  languageName: node
+  linkType: hard
+
+"@types/uuid@npm:9.0.8":
+  version: 9.0.8
+  resolution: "@types/uuid@npm:9.0.8"
+  checksum: 10/b8c60b7ba8250356b5088302583d1704a4e1a13558d143c549c408bf8920535602ffc12394ede77f8a8083511b023704bc66d1345792714002bfa261b17c5275
   languageName: node
   linkType: hard
 
 "@types/uuid@npm:^8.3.3":
   version: 8.3.4
   resolution: "@types/uuid@npm:8.3.4"
-  checksum: 6f11f3ff70f30210edaa8071422d405e9c1d4e53abbe50fdce365150d3c698fe7bbff65c1e71ae080cbfb8fded860dbb5e174da96fdbbdfcaa3fb3daa474d20f
+  checksum: 10/6f11f3ff70f30210edaa8071422d405e9c1d4e53abbe50fdce365150d3c698fe7bbff65c1e71ae080cbfb8fded860dbb5e174da96fdbbdfcaa3fb3daa474d20f
   languageName: node
   linkType: hard
 
-"@types/webpack-env@npm:1.18.1":
-  version: 1.18.1
-  resolution: "@types/webpack-env@npm:1.18.1"
-  checksum: 3173c069763e51a96565d602af7e6dac9d772ae4aa6f26cac187cbf599a7f0b88f790b4b050b9dbdb0485daed3061b4a337863f3b8ce66f8a4e51f75ad387c6a
+"@types/webpack-assets-manifest@npm:^5":
+  version: 5.1.4
+  resolution: "@types/webpack-assets-manifest@npm:5.1.4"
+  dependencies:
+    "@types/node": "npm:*"
+    tapable: "npm:^2.2.0"
+    webpack: "npm:^5"
+  checksum: 10/02aa3a400227693d5cb5db4364caf91df66e9529139999c0686f139138b76d27d200de5ad8d77d4199538d92f31d37df5dcdc6bdd8ccddcabf95bfc96b964c3a
   languageName: node
   linkType: hard
 
-"@types/ws@npm:^8.5.5":
-  version: 8.5.5
-  resolution: "@types/ws@npm:8.5.5"
-  dependencies:
-    "@types/node": "*"
-  checksum: d00bf8070e6938e3ccf933010921c6ce78ac3606696ce37a393b27a9a603f7bd93ea64f3c5fa295a2f743575ba9c9a9fdb904af0f5fe2229bf2adf0630386e4a
+"@types/webpack-env@npm:1.18.4":
+  version: 1.18.4
+  resolution: "@types/webpack-env@npm:1.18.4"
+  checksum: 10/a1c37f8eb93fa86077b2406d3b8dd50c7505cd2b6ec46044786aa9681b0114ad6c3c3cd6402f8ecce9e4de6626c2fd91e5acda62d5d450c1f531533c3812b7c0
   languageName: node
   linkType: hard
 
-"@types/yargs-parser@npm:*":
-  version: 20.2.1
-  resolution: "@types/yargs-parser@npm:20.2.1"
-  checksum: 1d039e64494a7a61ddd278349a3dc60b19f99ff0517425696e796f794e4252452b9d62178e69755ad03f439f9dc0c8c3d7b3a1201b3a24e134bac1a09fa11eaa
+"@types/wrap-ansi@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@types/wrap-ansi@npm:3.0.0"
+  checksum: 10/8aa644946ca4e859668c36b8e2bcf2ac4bdee59dac760414730ea57be8a93ae9166ebd40a088f2ab714843aaea2a2a67f0e6e6ec11cfc9c8701b2466ca1c4089
   languageName: node
   linkType: hard
 
-"@types/yargs@npm:17.0.24, @types/yargs@npm:^17.0.8":
-  version: 17.0.24
-  resolution: "@types/yargs@npm:17.0.24"
+"@types/ws@npm:^8.5.10":
+  version: 8.5.10
+  resolution: "@types/ws@npm:8.5.10"
   dependencies:
-    "@types/yargs-parser": "*"
-  checksum: 5f3ac4dc4f6e211c1627340160fbe2fd247ceba002190da6cf9155af1798450501d628c9165a183f30a224fc68fa5e700490d740ff4c73e2cdef95bc4e8ba7bf
+    "@types/node": "npm:*"
+  checksum: 10/9b414dc5e0b6c6f1ea4b1635b3568c58707357f68076df9e7cd33194747b7d1716d5189c0dbdd68c8d2521b148e88184cf881bac7429eb0e5c989b001539ed31
   languageName: node
   linkType: hard
 
-"@types/yargs@npm:^15.0.0":
-  version: 15.0.14
-  resolution: "@types/yargs@npm:15.0.14"
+"@types/yargs-parser@npm:*":
+  version: 20.2.1
+  resolution: "@types/yargs-parser@npm:20.2.1"
+  checksum: 10/08b67730b36ec5af0b429d8bd7cd2cd7d5586ec9fd7f9f935a64bc4e1235eae63054b40ec648705462d81472b0ffbd67a5854e0d38311d9e4c5b6009dfe3d3fd
+  languageName: node
+  linkType: hard
+
+"@types/yargs@npm:17.0.32, @types/yargs@npm:^17.0.8":
+  version: 17.0.32
+  resolution: "@types/yargs@npm:17.0.32"
   dependencies:
-    "@types/yargs-parser": "*"
-  checksum: 8e358aeb8f0c3758e59e2b8fcfdee5627ab2fe3d92f50f380503d966c7f33287be3322155516a50d27727fde1ad3878f48f60cd6648439126d4b0bbb1a1153ed
+    "@types/yargs-parser": "npm:*"
+  checksum: 10/1e2b2673847011ce43607df690d392f137d95a2d6ea85aa319403eadda2ef4277365efd4982354d8843f2611ef3846c88599660aaeb537fa9ccddae83c2a89de
   languageName: node
   linkType: hard
 
@@ -9950,239 +10880,287 @@ __metadata:
   version: 2.10.0
   resolution: "@types/yauzl@npm:2.10.0"
   dependencies:
-    "@types/node": "*"
-  checksum: 55d27ae5d346ea260e40121675c24e112ef0247649073848e5d4e03182713ae4ec8142b98f61a1c6cbe7d3b72fa99bbadb65d8b01873e5e605cdc30f1ff70ef2
+    "@types/node": "npm:*"
+  checksum: 10/55d27ae5d346ea260e40121675c24e112ef0247649073848e5d4e03182713ae4ec8142b98f61a1c6cbe7d3b72fa99bbadb65d8b01873e5e605cdc30f1ff70ef2
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:5.42.0":
-  version: 5.42.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:5.42.0"
+"@typescript-eslint/eslint-plugin@npm:6.18.1":
+  version: 6.18.1
+  resolution: "@typescript-eslint/eslint-plugin@npm:6.18.1"
   dependencies:
-    "@typescript-eslint/scope-manager": 5.42.0
-    "@typescript-eslint/type-utils": 5.42.0
-    "@typescript-eslint/utils": 5.42.0
-    debug: ^4.3.4
-    ignore: ^5.2.0
-    natural-compare-lite: ^1.4.0
-    regexpp: ^3.2.0
-    semver: ^7.3.7
-    tsutils: ^3.21.0
+    "@eslint-community/regexpp": "npm:^4.5.1"
+    "@typescript-eslint/scope-manager": "npm:6.18.1"
+    "@typescript-eslint/type-utils": "npm:6.18.1"
+    "@typescript-eslint/utils": "npm:6.18.1"
+    "@typescript-eslint/visitor-keys": "npm:6.18.1"
+    debug: "npm:^4.3.4"
+    graphemer: "npm:^1.4.0"
+    ignore: "npm:^5.2.4"
+    natural-compare: "npm:^1.4.0"
+    semver: "npm:^7.5.4"
+    ts-api-utils: "npm:^1.0.1"
   peerDependencies:
-    "@typescript-eslint/parser": ^5.0.0
-    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+    "@typescript-eslint/parser": ^6.0.0 || ^6.0.0-alpha
+    eslint: ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 8dd13c77f5b83a8ba7e37196769b9c8a296c4417ffe7e33cb4d172495e1596ea0a9140dae0f1bbe1317a0cd5d5d92bf76a1799e7b9f8b3a577433b9569f1436d
+  checksum: 10/451abba1f784539ba38cbe40af26c461facd848e90cbf0c440a98ca2a770ff74a794bafe1df7240e52a97e7cd72bade97d5de751dffbac269643460ad65e3b19
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:5.59.9":
-  version: 5.59.9
-  resolution: "@typescript-eslint/eslint-plugin@npm:5.59.9"
-  dependencies:
-    "@eslint-community/regexpp": ^4.4.0
-    "@typescript-eslint/scope-manager": 5.59.9
-    "@typescript-eslint/type-utils": 5.59.9
-    "@typescript-eslint/utils": 5.59.9
-    debug: ^4.3.4
-    grapheme-splitter: ^1.0.4
-    ignore: ^5.2.0
-    natural-compare-lite: ^1.4.0
-    semver: ^7.3.7
-    tsutils: ^3.21.0
-  peerDependencies:
-    "@typescript-eslint/parser": ^5.0.0
-    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+"@typescript-eslint/eslint-plugin@npm:6.21.0":
+  version: 6.21.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:6.21.0"
+  dependencies:
+    "@eslint-community/regexpp": "npm:^4.5.1"
+    "@typescript-eslint/scope-manager": "npm:6.21.0"
+    "@typescript-eslint/type-utils": "npm:6.21.0"
+    "@typescript-eslint/utils": "npm:6.21.0"
+    "@typescript-eslint/visitor-keys": "npm:6.21.0"
+    debug: "npm:^4.3.4"
+    graphemer: "npm:^1.4.0"
+    ignore: "npm:^5.2.4"
+    natural-compare: "npm:^1.4.0"
+    semver: "npm:^7.5.4"
+    ts-api-utils: "npm:^1.0.1"
+  peerDependencies:
+    "@typescript-eslint/parser": ^6.0.0 || ^6.0.0-alpha
+    eslint: ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: bd2428e307085d7fa6699913b6e61d65eb450bbcd26f884390cbf16722b80e1d80dc289c72774be1cdffd022744894204c3242f40ba3ffdfa05d3f210c4130bb
+  checksum: 10/a57de0f630789330204cc1531f86cfc68b391cafb1ba67c8992133f1baa2a09d629df66e71260b040de4c9a3ff1252952037093c4128b0d56c4dbb37720b4c1d
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:5.42.0":
-  version: 5.42.0
-  resolution: "@typescript-eslint/parser@npm:5.42.0"
+"@typescript-eslint/parser@npm:6.18.1":
+  version: 6.18.1
+  resolution: "@typescript-eslint/parser@npm:6.18.1"
   dependencies:
-    "@typescript-eslint/scope-manager": 5.42.0
-    "@typescript-eslint/types": 5.42.0
-    "@typescript-eslint/typescript-estree": 5.42.0
-    debug: ^4.3.4
+    "@typescript-eslint/scope-manager": "npm:6.18.1"
+    "@typescript-eslint/types": "npm:6.18.1"
+    "@typescript-eslint/typescript-estree": "npm:6.18.1"
+    "@typescript-eslint/visitor-keys": "npm:6.18.1"
+    debug: "npm:^4.3.4"
   peerDependencies:
-    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+    eslint: ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 790d5fcc53f02a25628b1d2a06e3b7f26f4fa12e78f51a67e1db0ac6a4b643a34f247991d7b938f45c7f8395fcaf920807c8a29d768913a7a8266162d2244806
+  checksum: 10/b853d39dcf886668f9aa9ea12094e722d35be20855dc7f01c80ee847bf4f7e27aa74693c3a33d4d813705214bda28be1d6c7ca29e590233f894f556203171d29
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:5.59.9":
-  version: 5.59.9
-  resolution: "@typescript-eslint/parser@npm:5.59.9"
+"@typescript-eslint/parser@npm:6.21.0":
+  version: 6.21.0
+  resolution: "@typescript-eslint/parser@npm:6.21.0"
   dependencies:
-    "@typescript-eslint/scope-manager": 5.59.9
-    "@typescript-eslint/types": 5.59.9
-    "@typescript-eslint/typescript-estree": 5.59.9
-    debug: ^4.3.4
+    "@typescript-eslint/scope-manager": "npm:6.21.0"
+    "@typescript-eslint/types": "npm:6.21.0"
+    "@typescript-eslint/typescript-estree": "npm:6.21.0"
+    "@typescript-eslint/visitor-keys": "npm:6.21.0"
+    debug: "npm:^4.3.4"
   peerDependencies:
-    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+    eslint: ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 69b07d0a5bc6e1d24d23916c057ea9f2f53a0e7fb6dabadff92987c299640edee2c013fb93269322c7124e87b5c515529001397eae33006dfb40e1dcdf1902d7
+  checksum: 10/4d51cdbc170e72275efc5ef5fce48a81ec431e4edde8374f4d0213d8d370a06823e1a61ae31d502a5f1b0d1f48fc4d29a1b1b5c2dcf809d66d3872ccf6e46ac7
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:5.42.0":
-  version: 5.42.0
-  resolution: "@typescript-eslint/scope-manager@npm:5.42.0"
+"@typescript-eslint/scope-manager@npm:5.59.9":
+  version: 5.59.9
+  resolution: "@typescript-eslint/scope-manager@npm:5.59.9"
   dependencies:
-    "@typescript-eslint/types": 5.42.0
-    "@typescript-eslint/visitor-keys": 5.42.0
-  checksum: c7dac787c27db640ef8add18e91f84ade36871a50e84f36604fc1b823fc544ad28cea4731c4b7cadec157964f5399e6db2b3a9a115b2a2dd97fbc2bae7b1f9e0
+    "@typescript-eslint/types": "npm:5.59.9"
+    "@typescript-eslint/visitor-keys": "npm:5.59.9"
+  checksum: 10/83b538212fc422cd6a26eee49deab60a29fa6d8bbd0dffca6daa02318959c76ddf1dc00db9ce0236258f26c1f726be78a25d2f6c5603233f591716d6299480e5
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:5.59.9":
-  version: 5.59.9
-  resolution: "@typescript-eslint/scope-manager@npm:5.59.9"
+"@typescript-eslint/scope-manager@npm:6.18.1":
+  version: 6.18.1
+  resolution: "@typescript-eslint/scope-manager@npm:6.18.1"
+  dependencies:
+    "@typescript-eslint/types": "npm:6.18.1"
+    "@typescript-eslint/visitor-keys": "npm:6.18.1"
+  checksum: 10/ab75663cda67a2c95267f240f2e062a0aafab0df6d625043a134c8e1d61e193c0d3cfa49c802bd554b3fd80f4b7df5ea3f86ef2eb6994ba8b5e0790cc9868c84
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/scope-manager@npm:6.21.0":
+  version: 6.21.0
+  resolution: "@typescript-eslint/scope-manager@npm:6.21.0"
   dependencies:
-    "@typescript-eslint/types": 5.59.9
-    "@typescript-eslint/visitor-keys": 5.59.9
-  checksum: 362c22662d844440a7e14223d8cc0722f77ff21ad8f78deb0ee3b3f21de01b8846bf25fbbf527544677e83d8ff48008b3f7d40b39ddec55994ea4a1863e9ec0a
+    "@typescript-eslint/types": "npm:6.21.0"
+    "@typescript-eslint/visitor-keys": "npm:6.21.0"
+  checksum: 10/fe91ac52ca8e09356a71dc1a2f2c326480f3cccfec6b2b6d9154c1a90651ab8ea270b07c67df5678956c3bbf0bbe7113ab68f68f21b20912ea528b1214197395
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:5.42.0":
-  version: 5.42.0
-  resolution: "@typescript-eslint/type-utils@npm:5.42.0"
+"@typescript-eslint/type-utils@npm:6.18.1":
+  version: 6.18.1
+  resolution: "@typescript-eslint/type-utils@npm:6.18.1"
   dependencies:
-    "@typescript-eslint/typescript-estree": 5.42.0
-    "@typescript-eslint/utils": 5.42.0
-    debug: ^4.3.4
-    tsutils: ^3.21.0
+    "@typescript-eslint/typescript-estree": "npm:6.18.1"
+    "@typescript-eslint/utils": "npm:6.18.1"
+    debug: "npm:^4.3.4"
+    ts-api-utils: "npm:^1.0.1"
   peerDependencies:
-    eslint: "*"
+    eslint: ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 5c98bdff38d8ace74f77b792d97572c41e3d0d01506529a32bc1244791a9e933d06dcc516eaad5bf1fc85b2cf1a95642f519f9c4ce4d6a974481e1a3680ed8dd
+  checksum: 10/f775011c35aef10b11e7cffde698fca8b06b313785cd44422c60a40b6643d85a38cbd9a3cbdef011d963680d65383c40988d983e9dfd01258ae50a2f37f6d293
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:5.59.9":
-  version: 5.59.9
-  resolution: "@typescript-eslint/type-utils@npm:5.59.9"
+"@typescript-eslint/type-utils@npm:6.21.0":
+  version: 6.21.0
+  resolution: "@typescript-eslint/type-utils@npm:6.21.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": 5.59.9
-    "@typescript-eslint/utils": 5.59.9
-    debug: ^4.3.4
-    tsutils: ^3.21.0
+    "@typescript-eslint/typescript-estree": "npm:6.21.0"
+    "@typescript-eslint/utils": "npm:6.21.0"
+    debug: "npm:^4.3.4"
+    ts-api-utils: "npm:^1.0.1"
   peerDependencies:
-    eslint: "*"
+    eslint: ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 6bc2619c5024c152b181eff1f44c9b5e7d0fc75ce9403f03b39d59fc1e13191b2fbaf6730f26a1caae22922ac47489f39c2cebccdd713588f6963169ed2a7958
+  checksum: 10/d03fb3ee1caa71f3ce053505f1866268d7ed79ffb7fed18623f4a1253f5b8f2ffc92636d6fd08fcbaf5bd265a6de77bf192c53105131e4724643dfc910d705fc
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:5.42.0":
-  version: 5.42.0
-  resolution: "@typescript-eslint/types@npm:5.42.0"
-  checksum: 7a17ff007972129a1e2105a653d8aa637070b74d4f8b98309aeb83d06076ab40cebfa1c3e9aae3fc614118e730c4539ff13e8299d34530851cb06260483ef14c
+"@typescript-eslint/types@npm:5.59.9":
+  version: 5.59.9
+  resolution: "@typescript-eslint/types@npm:5.59.9"
+  checksum: 10/49226e5384ac801db245fe668b4bd7610a11c5ade9c05ee93767fd188462c4d25755b8592f21210cc9856fae3c5566d4811ed0f7fefe30e48e5823e71ab4623e
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/types@npm:6.18.1":
+  version: 6.18.1
+  resolution: "@typescript-eslint/types@npm:6.18.1"
+  checksum: 10/e304620953257a5af3b323697845d3fb41ffbb7944df2f84559675ef8ad71cc33011be30149efd8d34c5dedcbe92c6abee67cb1b95cb3dd56f15b9393b3435a6
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/types@npm:6.21.0, @typescript-eslint/types@npm:^6.0.0":
+  version: 6.21.0
+  resolution: "@typescript-eslint/types@npm:6.21.0"
+  checksum: 10/e26da86d6f36ca5b6ef6322619f8ec55aabcd7d43c840c977ae13ae2c964c3091fc92eb33730d8be08927c9de38466c5323e78bfb270a9ff1d3611fe821046c5
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:5.59.9, @typescript-eslint/types@npm:^5.46.1":
+"@typescript-eslint/typescript-estree@npm:5.59.9":
   version: 5.59.9
-  resolution: "@typescript-eslint/types@npm:5.59.9"
-  checksum: 283f8fee1ee590eeccc2e0fcd3526c856c4b1e2841af2cdcd09eeac842a42cfb32f6bc8b40385380f3dbc3ee29da30f1819115eedf9e16f69ff5a160aeddd8fa
+  resolution: "@typescript-eslint/typescript-estree@npm:5.59.9"
+  dependencies:
+    "@typescript-eslint/types": "npm:5.59.9"
+    "@typescript-eslint/visitor-keys": "npm:5.59.9"
+    debug: "npm:^4.3.4"
+    globby: "npm:^11.1.0"
+    is-glob: "npm:^4.0.3"
+    semver: "npm:^7.3.7"
+    tsutils: "npm:^3.21.0"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 10/79cf330815244f2ab12762df9296812c20f3ff859f14dc997a79ce09eabd7c8d0d190ed00fcdf380288a2b4035ca40c9f0002dc9c6c2875885ad3b94c2eab58b
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:5.42.0":
-  version: 5.42.0
-  resolution: "@typescript-eslint/typescript-estree@npm:5.42.0"
+"@typescript-eslint/typescript-estree@npm:6.18.1":
+  version: 6.18.1
+  resolution: "@typescript-eslint/typescript-estree@npm:6.18.1"
   dependencies:
-    "@typescript-eslint/types": 5.42.0
-    "@typescript-eslint/visitor-keys": 5.42.0
-    debug: ^4.3.4
-    globby: ^11.1.0
-    is-glob: ^4.0.3
-    semver: ^7.3.7
-    tsutils: ^3.21.0
+    "@typescript-eslint/types": "npm:6.18.1"
+    "@typescript-eslint/visitor-keys": "npm:6.18.1"
+    debug: "npm:^4.3.4"
+    globby: "npm:^11.1.0"
+    is-glob: "npm:^4.0.3"
+    minimatch: "npm:9.0.3"
+    semver: "npm:^7.5.4"
+    ts-api-utils: "npm:^1.0.1"
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: cc8a98815daf6c8bf6f8f5e43c4a7bf7008aa850cecc669de7b8cfdddb0648fd2eae738a185165176a24aed360cb12204cc0808f251e9fcf8e436cd15fff3645
+  checksum: 10/33307bc87c3270f84f149545da79a15afaafacc5671e42f4aa827947f09c35ed114705f108ffa59d6ab175f8b838aa08cf10f9efe5b7793aca0792f879bbc7ca
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:5.59.9":
-  version: 5.59.9
-  resolution: "@typescript-eslint/typescript-estree@npm:5.59.9"
+"@typescript-eslint/typescript-estree@npm:6.21.0":
+  version: 6.21.0
+  resolution: "@typescript-eslint/typescript-estree@npm:6.21.0"
   dependencies:
-    "@typescript-eslint/types": 5.59.9
-    "@typescript-eslint/visitor-keys": 5.59.9
-    debug: ^4.3.4
-    globby: ^11.1.0
-    is-glob: ^4.0.3
-    semver: ^7.3.7
-    tsutils: ^3.21.0
+    "@typescript-eslint/types": "npm:6.21.0"
+    "@typescript-eslint/visitor-keys": "npm:6.21.0"
+    debug: "npm:^4.3.4"
+    globby: "npm:^11.1.0"
+    is-glob: "npm:^4.0.3"
+    minimatch: "npm:9.0.3"
+    semver: "npm:^7.5.4"
+    ts-api-utils: "npm:^1.0.1"
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: c0c9b81f20a2a4337f07bc3ccdc9c1dabd765f59096255ed9a149e91e5c9517b25c2b6655f8f073807cfc13500c7451fbd9bb62e5e572c07cc07945ab042db89
+  checksum: 10/b32fa35fca2a229e0f5f06793e5359ff9269f63e9705e858df95d55ca2cd7fdb5b3e75b284095a992c48c5fc46a1431a1a4b6747ede2dd08929dc1cbacc589b8
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:5.42.0":
-  version: 5.42.0
-  resolution: "@typescript-eslint/utils@npm:5.42.0"
+"@typescript-eslint/utils@npm:6.18.1":
+  version: 6.18.1
+  resolution: "@typescript-eslint/utils@npm:6.18.1"
   dependencies:
-    "@types/json-schema": ^7.0.9
-    "@types/semver": ^7.3.12
-    "@typescript-eslint/scope-manager": 5.42.0
-    "@typescript-eslint/types": 5.42.0
-    "@typescript-eslint/typescript-estree": 5.42.0
-    eslint-scope: ^5.1.1
-    eslint-utils: ^3.0.0
-    semver: ^7.3.7
+    "@eslint-community/eslint-utils": "npm:^4.4.0"
+    "@types/json-schema": "npm:^7.0.12"
+    "@types/semver": "npm:^7.5.0"
+    "@typescript-eslint/scope-manager": "npm:6.18.1"
+    "@typescript-eslint/types": "npm:6.18.1"
+    "@typescript-eslint/typescript-estree": "npm:6.18.1"
+    semver: "npm:^7.5.4"
   peerDependencies:
-    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: cc57ba8bdf1cf18de5c6c264b71be80dc8c4a7630c0d6a34f73ed991cd3684c97a06605f414a8fd439ce2201f7724249b2fc29eac1e54a770ee4e8303cabef52
+    eslint: ^7.0.0 || ^8.0.0
+  checksum: 10/967728f062ec7ef434b9d05af6b45ae59e0f8f314e4aa7cefc8e2c30a277cf269b7913f3e9f8d26a86c3faf8b2c9385ba1221cfcd856e9b228421fc6508b41bc
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:5.59.9, @typescript-eslint/utils@npm:^5.10.0, @typescript-eslint/utils@npm:^5.46.1":
-  version: 5.59.9
-  resolution: "@typescript-eslint/utils@npm:5.59.9"
+"@typescript-eslint/utils@npm:6.21.0, @typescript-eslint/utils@npm:^6.0.0":
+  version: 6.21.0
+  resolution: "@typescript-eslint/utils@npm:6.21.0"
   dependencies:
-    "@eslint-community/eslint-utils": ^4.2.0
-    "@types/json-schema": ^7.0.9
-    "@types/semver": ^7.3.12
-    "@typescript-eslint/scope-manager": 5.59.9
-    "@typescript-eslint/types": 5.59.9
-    "@typescript-eslint/typescript-estree": 5.59.9
-    eslint-scope: ^5.1.1
-    semver: ^7.3.7
+    "@eslint-community/eslint-utils": "npm:^4.4.0"
+    "@types/json-schema": "npm:^7.0.12"
+    "@types/semver": "npm:^7.5.0"
+    "@typescript-eslint/scope-manager": "npm:6.21.0"
+    "@typescript-eslint/types": "npm:6.21.0"
+    "@typescript-eslint/typescript-estree": "npm:6.21.0"
+    semver: "npm:^7.5.4"
   peerDependencies:
-    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: 22ec5962886de7dcf65f99c37aad9fb189a3bef6b2b07c81887fb82a0e8bf137246da58e64fb02141352285708440be13acd7f6db1ca19e96f86724813ac4646
+    eslint: ^7.0.0 || ^8.0.0
+  checksum: 10/b404a2c55a425a79d054346ae123087d30c7ecf7ed7abcf680c47bf70c1de4fabadc63434f3f460b2fa63df76bc9e4a0b9fa2383bb8a9fcd62733fb5c4e4f3e3
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:5.42.0":
-  version: 5.42.0
-  resolution: "@typescript-eslint/visitor-keys@npm:5.42.0"
+"@typescript-eslint/utils@npm:^5.10.0":
+  version: 5.59.9
+  resolution: "@typescript-eslint/utils@npm:5.59.9"
   dependencies:
-    "@typescript-eslint/types": 5.42.0
-    eslint-visitor-keys: ^3.3.0
-  checksum: d198e51ea968555dd44b3ff14587dd82ce43c30ae43d4021d4eacb468e4476102a5b715e15240adcdeec4b4b5280d819087a9c4090360f1e4dcb05829ea8f2dc
+    "@eslint-community/eslint-utils": "npm:^4.2.0"
+    "@types/json-schema": "npm:^7.0.9"
+    "@types/semver": "npm:^7.3.12"
+    "@typescript-eslint/scope-manager": "npm:5.59.9"
+    "@typescript-eslint/types": "npm:5.59.9"
+    "@typescript-eslint/typescript-estree": "npm:5.59.9"
+    eslint-scope: "npm:^5.1.1"
+    semver: "npm:^7.3.7"
+  peerDependencies:
+    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+  checksum: 10/e48429d9dd83d7ae1b95c64b35af790e36cd8c1b2b9b63b2f69b5f804bb58a12918396f2f0540afd413673e1e0d22399a2cd2e2ad6534e50af2990a04e8ca7c4
   languageName: node
   linkType: hard
 
@@ -10190,16 +11168,36 @@ __metadata:
   version: 5.59.9
   resolution: "@typescript-eslint/visitor-keys@npm:5.59.9"
   dependencies:
-    "@typescript-eslint/types": 5.59.9
-    eslint-visitor-keys: ^3.3.0
-  checksum: 2909ce761f7fe546592cd3c43e33263d8a5fa619375fd2fdffbc72ffc33e40d6feacafb28c79f36c638fcc2225048e7cc08c61cbac6ca63723dc68610d80e3e6
+    "@typescript-eslint/types": "npm:5.59.9"
+    eslint-visitor-keys: "npm:^3.3.0"
+  checksum: 10/85761ef0be6910cb4de841b3cd8f39a734f5373ed92f808365882ef357f0a33ad6f75c4b3bf0b408f0399781ac5d14f12033de3e4b53a46b61015444b05854c0
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/visitor-keys@npm:6.18.1":
+  version: 6.18.1
+  resolution: "@typescript-eslint/visitor-keys@npm:6.18.1"
+  dependencies:
+    "@typescript-eslint/types": "npm:6.18.1"
+    eslint-visitor-keys: "npm:^3.4.1"
+  checksum: 10/2d6c5ffa52e89caec0b4958d7079fb4ca9f17c19b5f5d5b8446b4eef0079fd59cd9959f469cc13c4e7d72ef4c47849e561fe323f3cebafa01bc916d43082e57b
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/visitor-keys@npm:6.21.0":
+  version: 6.21.0
+  resolution: "@typescript-eslint/visitor-keys@npm:6.21.0"
+  dependencies:
+    "@typescript-eslint/types": "npm:6.21.0"
+    eslint-visitor-keys: "npm:^3.4.1"
+  checksum: 10/30422cdc1e2ffad203df40351a031254b272f9c6f2b7e02e9bfa39e3fc2c7b1c6130333b0057412968deda17a3a68a578a78929a8139c6acef44d9d841dc72e1
   languageName: node
   linkType: hard
 
 "@ungap/structured-clone@npm:^1.2.0":
   version: 1.2.0
   resolution: "@ungap/structured-clone@npm:1.2.0"
-  checksum: 4f656b7b4672f2ce6e272f2427d8b0824ed11546a601d8d5412b9d7704e83db38a8d9f402ecdf2b9063fc164af842ad0ec4a55819f621ed7e7ea4d1efcc74524
+  checksum: 10/c6fe89a505e513a7592e1438280db1c075764793a2397877ff1351721fe8792a966a5359769e30242b3cd023f2efb9e63ca2ca88019d73b564488cc20e3eab12
   languageName: node
   linkType: hard
 
@@ -10207,13 +11205,13 @@ __metadata:
   version: 3.3.0
   resolution: "@visx/bounds@npm:3.3.0"
   dependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    prop-types: ^15.5.10
+    "@types/react": "npm:*"
+    "@types/react-dom": "npm:*"
+    prop-types: "npm:^15.5.10"
   peerDependencies:
     react: ^16.0.0-0 || ^17.0.0-0 || ^18.0.0-0
     react-dom: ^16.0.0-0 || ^17.0.0-0 || ^18.0.0-0
-  checksum: e682b343735f53d7eed04cc9e4bc40308583724faa0577f752449d59daea57030f05cb72a9711d7e7f46db932691fea6bb7a545b204b4df24b80ffff0ed04e78
+  checksum: 10/e682b343735f53d7eed04cc9e4bc40308583724faa0577f752449d59daea57030f05cb72a9711d7e7f46db932691fea6bb7a545b204b4df24b80ffff0ed04e78
   languageName: node
   linkType: hard
 
@@ -10221,9 +11219,9 @@ __metadata:
   version: 3.3.0
   resolution: "@visx/curve@npm:3.3.0"
   dependencies:
-    "@types/d3-shape": ^1.3.1
-    d3-shape: ^1.0.6
-  checksum: 36db95911c567408de78851eee6d98b60065c9d07b5abc7652cef072eaf5040444d8d84e73255f91bca0cfb50837f3b47db7209183211c20bc4bc1adcf13794d
+    "@types/d3-shape": "npm:^1.3.1"
+    d3-shape: "npm:^1.0.6"
+  checksum: 10/36db95911c567408de78851eee6d98b60065c9d07b5abc7652cef072eaf5040444d8d84e73255f91bca0cfb50837f3b47db7209183211c20bc4bc1adcf13794d
   languageName: node
   linkType: hard
 
@@ -10231,9 +11229,9 @@ __metadata:
   version: 3.3.0
   resolution: "@visx/event@npm:3.3.0"
   dependencies:
-    "@types/react": "*"
-    "@visx/point": 3.3.0
-  checksum: 3cdb86848d9ae7cc8b6a14a0cc4efd7fc2186fca582ee374bb1f2dfe104ec5cd04dbdbbfc41ccb8c94e1885e2b6e6060a488f3a0a0554ad9e831ecc1b28339de
+    "@types/react": "npm:*"
+    "@visx/point": "npm:3.3.0"
+  checksum: 10/3cdb86848d9ae7cc8b6a14a0cc4efd7fc2186fca582ee374bb1f2dfe104ec5cd04dbdbbfc41ccb8c94e1885e2b6e6060a488f3a0a0554ad9e831ecc1b28339de
   languageName: node
   linkType: hard
 
@@ -10241,11 +11239,11 @@ __metadata:
   version: 3.3.0
   resolution: "@visx/gradient@npm:3.3.0"
   dependencies:
-    "@types/react": "*"
-    prop-types: ^15.5.7
+    "@types/react": "npm:*"
+    prop-types: "npm:^15.5.7"
   peerDependencies:
     react: ^16.0.0-0 || ^17.0.0-0 || ^18.0.0-0
-  checksum: 7a371c788a09c8fc53484cfe375444332c5893f3b6fe7a86ed1bb02761deaa92e53208dab140a5a7c8d610af9396a7bcf6794d9b70d6945048fc9aeb0f4757ce
+  checksum: 10/7a371c788a09c8fc53484cfe375444332c5893f3b6fe7a86ed1bb02761deaa92e53208dab140a5a7c8d610af9396a7bcf6794d9b70d6945048fc9aeb0f4757ce
   languageName: node
   linkType: hard
 
@@ -10253,393 +11251,244 @@ __metadata:
   version: 3.3.0
   resolution: "@visx/group@npm:3.3.0"
   dependencies:
-    "@types/react": "*"
-    classnames: ^2.3.1
-    prop-types: ^15.6.2
+    "@types/react": "npm:*"
+    classnames: "npm:^2.3.1"
+    prop-types: "npm:^15.6.2"
   peerDependencies:
     react: ^16.0.0-0 || ^17.0.0-0 || ^18.0.0-0
-  checksum: a2f950664f43f1f1700a329f3a66bc3921ce8be35a93095a9ea28334ae4f9943c1082f21ba0f57f2bda913d2a40da8b7124235c2ae666c0e5d58a900c7148a8b
-  languageName: node
-  linkType: hard
-
-"@visx/point@npm:3.3.0":
-  version: 3.3.0
-  resolution: "@visx/point@npm:3.3.0"
-  checksum: 79950f49828d12c67c856ac0b345292df03a154b50f739aab3dbab37abb73ba40f9cbdaa46d698b50691984e81b94afdafe64dd4fa18c6d2895298cf25f1a450
-  languageName: node
-  linkType: hard
-
-"@visx/scale@npm:3.3.0":
-  version: 3.3.0
-  resolution: "@visx/scale@npm:3.3.0"
-  dependencies:
-    "@visx/vendor": 3.3.0
-  checksum: a6a5589fc86c72df84d8d11bab255fa3bf0481ca13ff15c66228368afae60937bb0553d942202b007a5d50b93dfc62359b06fd53c00da0eeb472db09d662440d
-  languageName: node
-  linkType: hard
-
-"@visx/shape@npm:3.3.0":
-  version: 3.3.0
-  resolution: "@visx/shape@npm:3.3.0"
-  dependencies:
-    "@types/d3-path": ^1.0.8
-    "@types/d3-shape": ^1.3.1
-    "@types/lodash": ^4.14.172
-    "@types/react": "*"
-    "@visx/curve": 3.3.0
-    "@visx/group": 3.3.0
-    "@visx/scale": 3.3.0
-    classnames: ^2.3.1
-    d3-path: ^1.0.5
-    d3-shape: ^1.2.0
-    lodash: ^4.17.21
-    prop-types: ^15.5.10
-  peerDependencies:
-    react: ^16.3.0-0 || ^17.0.0-0 || ^18.0.0-0
-  checksum: ab53910f6a2b5c2a36bfceed92ebafaf3bfa0c20272e3b86e7ec7e782628021fca4fb377edfe86b76d38df4f5ad9b846056ba358f63112988ff7346f23bad739
-  languageName: node
-  linkType: hard
-
-"@visx/tooltip@npm:3.3.0":
-  version: 3.3.0
-  resolution: "@visx/tooltip@npm:3.3.0"
-  dependencies:
-    "@types/react": "*"
-    "@visx/bounds": 3.3.0
-    classnames: ^2.3.1
-    prop-types: ^15.5.10
-    react-use-measure: ^2.0.4
-  peerDependencies:
-    react: ^16.8.0-0 || ^17.0.0-0 || ^18.0.0-0
-    react-dom: ^16.8.0-0 || ^17.0.0-0 || ^18.0.0-0
-  checksum: eb525afd34bf108f9343e7998a8752e0002190afa76d2e9e7f47ec83f89139f611def8fe59ba55af4ab2d15bb7d31b836d372ef338e8aa4ca2e7e4cd68567c7f
-  languageName: node
-  linkType: hard
-
-"@visx/vendor@npm:3.3.0":
-  version: 3.3.0
-  resolution: "@visx/vendor@npm:3.3.0"
-  dependencies:
-    "@types/d3-array": 3.0.3
-    "@types/d3-color": 3.1.0
-    "@types/d3-delaunay": 6.0.1
-    "@types/d3-format": 3.0.1
-    "@types/d3-interpolate": 3.0.1
-    "@types/d3-scale": 4.0.2
-    "@types/d3-time": 3.0.0
-    "@types/d3-time-format": 2.1.0
-    d3-array: 3.2.1
-    d3-color: 3.1.0
-    d3-delaunay: 6.0.2
-    d3-format: 3.1.0
-    d3-interpolate: 3.0.1
-    d3-scale: 4.0.2
-    d3-time: 3.1.0
-    d3-time-format: 4.1.0
-    internmap: 2.0.3
-  checksum: eaab876b3898d44930e75a95ea1f6f1db490822fd9c93f2806f5673875f8b63bde08f41f43ab0c2c291301796b52d612e671d3f81dfaa20c986adc90d95d09cf
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/ast@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/ast@npm:1.11.1"
-  dependencies:
-    "@webassemblyjs/helper-numbers": 1.11.1
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.1
-  checksum: 1eee1534adebeece635362f8e834ae03e389281972611408d64be7895fc49f48f98fddbbb5339bf8a72cb101bcb066e8bca3ca1bf1ef47dadf89def0395a8d87
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/ast@npm:1.11.6, @webassemblyjs/ast@npm:^1.11.5":
-  version: 1.11.6
-  resolution: "@webassemblyjs/ast@npm:1.11.6"
-  dependencies:
-    "@webassemblyjs/helper-numbers": 1.11.6
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.6
-  checksum: 38ef1b526ca47c210f30975b06df2faf1a8170b1636ce239fc5738fc231ce28389dd61ecedd1bacfc03cbe95b16d1af848c805652080cb60982836eb4ed2c6cf
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/floating-point-hex-parser@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.11.1"
-  checksum: b8efc6fa08e4787b7f8e682182d84dfdf8da9d9c77cae5d293818bc4a55c1f419a87fa265ab85252b3e6c1fd323d799efea68d825d341a7c365c64bc14750e97
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/floating-point-hex-parser@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.11.6"
-  checksum: 29b08758841fd8b299c7152eda36b9eb4921e9c584eb4594437b5cd90ed6b920523606eae7316175f89c20628da14326801090167cc7fbffc77af448ac84b7e2
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/helper-api-error@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/helper-api-error@npm:1.11.1"
-  checksum: 0792813f0ed4a0e5ee0750e8b5d0c631f08e927f4bdfdd9fe9105dc410c786850b8c61bff7f9f515fdfb149903bec3c976a1310573a4c6866a94d49bc7271959
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/helper-api-error@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/helper-api-error@npm:1.11.6"
-  checksum: e8563df85161096343008f9161adb138a6e8f3c2cc338d6a36011aa55eabb32f2fd138ffe63bc278d009ada001cc41d263dadd1c0be01be6c2ed99076103689f
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/helper-buffer@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/helper-buffer@npm:1.11.1"
-  checksum: a337ee44b45590c3a30db5a8b7b68a717526cf967ada9f10253995294dbd70a58b2da2165222e0b9830cd4fc6e4c833bf441a721128d1fe2e9a7ab26b36003ce
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/helper-buffer@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/helper-buffer@npm:1.11.6"
-  checksum: b14d0573bf680d22b2522e8a341ec451fddd645d1f9c6bd9012ccb7e587a2973b86ab7b89fe91e1c79939ba96095f503af04369a3b356c8023c13a5893221644
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/helper-numbers@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/helper-numbers@npm:1.11.1"
-  dependencies:
-    "@webassemblyjs/floating-point-hex-parser": 1.11.1
-    "@webassemblyjs/helper-api-error": 1.11.1
-    "@xtuc/long": 4.2.2
-  checksum: 44d2905dac2f14d1e9b5765cf1063a0fa3d57295c6d8930f6c59a36462afecc6e763e8a110b97b342a0f13376166c5d41aa928e6ced92e2f06b071fd0db59d3a
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/helper-numbers@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/helper-numbers@npm:1.11.6"
-  dependencies:
-    "@webassemblyjs/floating-point-hex-parser": 1.11.6
-    "@webassemblyjs/helper-api-error": 1.11.6
-    "@xtuc/long": 4.2.2
-  checksum: f4b562fa219f84368528339e0f8d273ad44e047a07641ffcaaec6f93e5b76fd86490a009aa91a294584e1436d74b0a01fa9fde45e333a4c657b58168b04da424
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/helper-wasm-bytecode@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.11.1"
-  checksum: eac400113127832c88f5826bcc3ad1c0db9b3dbd4c51a723cfdb16af6bfcbceb608170fdaac0ab7731a7e18b291be7af68a47fcdb41cfe0260c10857e7413d97
+  checksum: 10/a2f950664f43f1f1700a329f3a66bc3921ce8be35a93095a9ea28334ae4f9943c1082f21ba0f57f2bda913d2a40da8b7124235c2ae666c0e5d58a900c7148a8b
   languageName: node
   linkType: hard
-
-"@webassemblyjs/helper-wasm-bytecode@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.11.6"
-  checksum: 3535ef4f1fba38de3475e383b3980f4bbf3de72bbb631c2b6584c7df45be4eccd62c6ff48b5edd3f1bcff275cfd605a37679ec199fc91fd0a7705d7f1e3972dc
+
+"@visx/point@npm:3.3.0":
+  version: 3.3.0
+  resolution: "@visx/point@npm:3.3.0"
+  checksum: 10/f00f45b2bdff7c991d206320ad834bb23af90ab8c4727b9c4b9e8417b5c1b3830147bea53ceda1e1ce074571eb5e5eace1ca6bd530b61de3b4b13902668bc88c
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-wasm-section@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/helper-wasm-section@npm:1.11.1"
+"@visx/scale@npm:3.5.0":
+  version: 3.5.0
+  resolution: "@visx/scale@npm:3.5.0"
   dependencies:
-    "@webassemblyjs/ast": 1.11.1
-    "@webassemblyjs/helper-buffer": 1.11.1
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.1
-    "@webassemblyjs/wasm-gen": 1.11.1
-  checksum: 617696cfe8ecaf0532763162aaf748eb69096fb27950219bb87686c6b2e66e11cd0614d95d319d0ab1904bc14ebe4e29068b12c3e7c5e020281379741fe4bedf
+    "@visx/vendor": "npm:3.5.0"
+  checksum: 10/75116fa455f3c5e811094da0072e0ef08105de78a183c8cf7f6ba4fda08ce0b9f85318e089c97ece3e5bb74d6933c423d0ce9570afe33231cab2df01b4c2c7f8
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-wasm-section@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/helper-wasm-section@npm:1.11.6"
-  dependencies:
-    "@webassemblyjs/ast": 1.11.6
-    "@webassemblyjs/helper-buffer": 1.11.6
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.6
-    "@webassemblyjs/wasm-gen": 1.11.6
-  checksum: b2cf751bf4552b5b9999d27bbb7692d0aca75260140195cb58ea6374d7b9c2dc69b61e10b211a0e773f66209c3ddd612137ed66097e3684d7816f854997682e9
+"@visx/shape@npm:3.5.0":
+  version: 3.5.0
+  resolution: "@visx/shape@npm:3.5.0"
+  dependencies:
+    "@types/d3-path": "npm:^1.0.8"
+    "@types/d3-shape": "npm:^1.3.1"
+    "@types/lodash": "npm:^4.14.172"
+    "@types/react": "npm:*"
+    "@visx/curve": "npm:3.3.0"
+    "@visx/group": "npm:3.3.0"
+    "@visx/scale": "npm:3.5.0"
+    classnames: "npm:^2.3.1"
+    d3-path: "npm:^1.0.5"
+    d3-shape: "npm:^1.2.0"
+    lodash: "npm:^4.17.21"
+    prop-types: "npm:^15.5.10"
+  peerDependencies:
+    react: ^16.3.0-0 || ^17.0.0-0 || ^18.0.0-0
+  checksum: 10/f355833125604889285d3cc0c742ef073b56b16196aee436264191b96f849c3ae0ca8665b2185c0762dacfe35a0f27182c9f159d8b1dcddd57feb0ad24d52cdf
   languageName: node
   linkType: hard
 
-"@webassemblyjs/ieee754@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/ieee754@npm:1.11.1"
+"@visx/tooltip@npm:3.3.0":
+  version: 3.3.0
+  resolution: "@visx/tooltip@npm:3.3.0"
   dependencies:
-    "@xtuc/ieee754": ^1.2.0
-  checksum: 23a0ac02a50f244471631802798a816524df17e56b1ef929f0c73e3cde70eaf105a24130105c60aff9d64a24ce3b640dad443d6f86e5967f922943a7115022ec
+    "@types/react": "npm:*"
+    "@visx/bounds": "npm:3.3.0"
+    classnames: "npm:^2.3.1"
+    prop-types: "npm:^15.5.10"
+    react-use-measure: "npm:^2.0.4"
+  peerDependencies:
+    react: ^16.8.0-0 || ^17.0.0-0 || ^18.0.0-0
+    react-dom: ^16.8.0-0 || ^17.0.0-0 || ^18.0.0-0
+  checksum: 10/d45ee4bf450f5109133fbbeb6c1daf6e7bdccba1dd053f77ee92008fb934c7c367ded28e313d02aec2dc34aea289ff9b7e4c1ac686906188602489dd317a570a
   languageName: node
   linkType: hard
 
-"@webassemblyjs/ieee754@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/ieee754@npm:1.11.6"
+"@visx/vendor@npm:3.5.0":
+  version: 3.5.0
+  resolution: "@visx/vendor@npm:3.5.0"
   dependencies:
-    "@xtuc/ieee754": ^1.2.0
-  checksum: 13574b8e41f6ca39b700e292d7edf102577db5650fe8add7066a320aa4b7a7c09a5056feccac7a74eb68c10dea9546d4461412af351f13f6b24b5f32379b49de
+    "@types/d3-array": "npm:3.0.3"
+    "@types/d3-color": "npm:3.1.0"
+    "@types/d3-delaunay": "npm:6.0.1"
+    "@types/d3-format": "npm:3.0.1"
+    "@types/d3-geo": "npm:3.1.0"
+    "@types/d3-interpolate": "npm:3.0.1"
+    "@types/d3-scale": "npm:4.0.2"
+    "@types/d3-time": "npm:3.0.0"
+    "@types/d3-time-format": "npm:2.1.0"
+    d3-array: "npm:3.2.1"
+    d3-color: "npm:3.1.0"
+    d3-delaunay: "npm:6.0.2"
+    d3-format: "npm:3.1.0"
+    d3-geo: "npm:3.1.0"
+    d3-interpolate: "npm:3.0.1"
+    d3-scale: "npm:4.0.2"
+    d3-time: "npm:3.1.0"
+    d3-time-format: "npm:4.1.0"
+    internmap: "npm:2.0.3"
+  checksum: 10/d893aac3d025f522b5e8035e3cc230006bbfbb188af65db8f5b86b8206521acf05e6307d4802562f2f7ace0642a13bf6a8bd518f0fa277ecbbcccb2910fefec4
   languageName: node
   linkType: hard
 
-"@webassemblyjs/leb128@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/leb128@npm:1.11.1"
+"@webassemblyjs/ast@npm:1.12.1, @webassemblyjs/ast@npm:^1.11.5, @webassemblyjs/ast@npm:^1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/ast@npm:1.12.1"
   dependencies:
-    "@xtuc/long": 4.2.2
-  checksum: 33ccc4ade2f24de07bf31690844d0b1ad224304ee2062b0e464a610b0209c79e0b3009ac190efe0e6bd568b0d1578d7c3047fc1f9d0197c92fc061f56224ff4a
+    "@webassemblyjs/helper-numbers": "npm:1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6"
+  checksum: 10/a775b0559437ae122d14fec0cfe59fdcaf5ca2d8ff48254014fd05d6797e20401e0f1518e628f9b06819aa085834a2534234977f9608b3f2e51f94b6e8b0bc43
   languageName: node
   linkType: hard
 
-"@webassemblyjs/leb128@npm:1.11.6":
+"@webassemblyjs/floating-point-hex-parser@npm:1.11.6":
   version: 1.11.6
-  resolution: "@webassemblyjs/leb128@npm:1.11.6"
-  dependencies:
-    "@xtuc/long": 4.2.2
-  checksum: 7ea942dc9777d4b18a5ebfa3a937b30ae9e1d2ce1fee637583ed7f376334dd1d4274f813d2e250056cca803e0952def4b954913f1a3c9068bcd4ab4ee5143bf0
+  resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.11.6"
+  checksum: 10/29b08758841fd8b299c7152eda36b9eb4921e9c584eb4594437b5cd90ed6b920523606eae7316175f89c20628da14326801090167cc7fbffc77af448ac84b7e2
   languageName: node
   linkType: hard
 
-"@webassemblyjs/utf8@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/utf8@npm:1.11.1"
-  checksum: 972c5cfc769d7af79313a6bfb96517253a270a4bf0c33ba486aa43cac43917184fb35e51dfc9e6b5601548cd5931479a42e42c89a13bb591ffabebf30c8a6a0b
+"@webassemblyjs/helper-api-error@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/helper-api-error@npm:1.11.6"
+  checksum: 10/e8563df85161096343008f9161adb138a6e8f3c2cc338d6a36011aa55eabb32f2fd138ffe63bc278d009ada001cc41d263dadd1c0be01be6c2ed99076103689f
   languageName: node
   linkType: hard
 
-"@webassemblyjs/utf8@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/utf8@npm:1.11.6"
-  checksum: 807fe5b5ce10c390cfdd93e0fb92abda8aebabb5199980681e7c3743ee3306a75729bcd1e56a3903980e96c885ee53ef901fcbaac8efdfa480f9c0dae1d08713
+"@webassemblyjs/helper-buffer@npm:1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/helper-buffer@npm:1.12.1"
+  checksum: 10/1d8705daa41f4d22ef7c6d422af4c530b84d69d0c253c6db5adec44d511d7caa66837803db5b1addcea611a1498fd5a67d2cf318b057a916283ae41ffb85ba8a
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-edit@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/wasm-edit@npm:1.11.1"
+"@webassemblyjs/helper-numbers@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/helper-numbers@npm:1.11.6"
   dependencies:
-    "@webassemblyjs/ast": 1.11.1
-    "@webassemblyjs/helper-buffer": 1.11.1
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.1
-    "@webassemblyjs/helper-wasm-section": 1.11.1
-    "@webassemblyjs/wasm-gen": 1.11.1
-    "@webassemblyjs/wasm-opt": 1.11.1
-    "@webassemblyjs/wasm-parser": 1.11.1
-    "@webassemblyjs/wast-printer": 1.11.1
-  checksum: 6d7d9efaec1227e7ef7585a5d7ff0be5f329f7c1c6b6c0e906b18ed2e9a28792a5635e450aca2d136770d0207225f204eff70a4b8fd879d3ac79e1dcc26dbeb9
+    "@webassemblyjs/floating-point-hex-parser": "npm:1.11.6"
+    "@webassemblyjs/helper-api-error": "npm:1.11.6"
+    "@xtuc/long": "npm:4.2.2"
+  checksum: 10/9ffd258ad809402688a490fdef1fd02222f20cdfe191c895ac215a331343292164e5033dbc0347f0f76f2447865c0b5c2d2e3304ee948d44f7aa27857028fd08
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-edit@npm:^1.11.5":
+"@webassemblyjs/helper-wasm-bytecode@npm:1.11.6":
   version: 1.11.6
-  resolution: "@webassemblyjs/wasm-edit@npm:1.11.6"
-  dependencies:
-    "@webassemblyjs/ast": 1.11.6
-    "@webassemblyjs/helper-buffer": 1.11.6
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.6
-    "@webassemblyjs/helper-wasm-section": 1.11.6
-    "@webassemblyjs/wasm-gen": 1.11.6
-    "@webassemblyjs/wasm-opt": 1.11.6
-    "@webassemblyjs/wasm-parser": 1.11.6
-    "@webassemblyjs/wast-printer": 1.11.6
-  checksum: 29ce75870496d6fad864d815ebb072395a8a3a04dc9c3f4e1ffdc63fc5fa58b1f34304a1117296d8240054cfdbc38aca88e71fb51483cf29ffab0a61ef27b481
+  resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.11.6"
+  checksum: 10/4ebf03e9c1941288c10e94e0f813f413f972bfaa1f09be2cc2e5577f300430906b61aa24d52f5ef2f894e8e24e61c6f7c39871d7e3d98bc69460e1b8e00bb20b
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-gen@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/wasm-gen@npm:1.11.1"
+"@webassemblyjs/helper-wasm-section@npm:1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/helper-wasm-section@npm:1.12.1"
   dependencies:
-    "@webassemblyjs/ast": 1.11.1
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.1
-    "@webassemblyjs/ieee754": 1.11.1
-    "@webassemblyjs/leb128": 1.11.1
-    "@webassemblyjs/utf8": 1.11.1
-  checksum: 1f6921e640293bf99fb16b21e09acb59b340a79f986c8f979853a0ae9f0b58557534b81e02ea2b4ef11e929d946708533fd0693c7f3712924128fdafd6465f5b
+    "@webassemblyjs/ast": "npm:1.12.1"
+    "@webassemblyjs/helper-buffer": "npm:1.12.1"
+    "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6"
+    "@webassemblyjs/wasm-gen": "npm:1.12.1"
+  checksum: 10/e91e6b28114e35321934070a2db8973a08a5cd9c30500b817214c683bbf5269ed4324366dd93ad83bf2fba0d671ac8f39df1c142bf58f70c57a827eeba4a3d2f
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-gen@npm:1.11.6":
+"@webassemblyjs/ieee754@npm:1.11.6":
   version: 1.11.6
-  resolution: "@webassemblyjs/wasm-gen@npm:1.11.6"
+  resolution: "@webassemblyjs/ieee754@npm:1.11.6"
   dependencies:
-    "@webassemblyjs/ast": 1.11.6
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.6
-    "@webassemblyjs/ieee754": 1.11.6
-    "@webassemblyjs/leb128": 1.11.6
-    "@webassemblyjs/utf8": 1.11.6
-  checksum: a645a2eecbea24833c3260a249704a7f554ef4a94c6000984728e94bb2bc9140a68dfd6fd21d5e0bbb09f6dfc98e083a45760a83ae0417b41a0196ff6d45a23a
+    "@xtuc/ieee754": "npm:^1.2.0"
+  checksum: 10/13574b8e41f6ca39b700e292d7edf102577db5650fe8add7066a320aa4b7a7c09a5056feccac7a74eb68c10dea9546d4461412af351f13f6b24b5f32379b49de
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-opt@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/wasm-opt@npm:1.11.1"
+"@webassemblyjs/leb128@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/leb128@npm:1.11.6"
   dependencies:
-    "@webassemblyjs/ast": 1.11.1
-    "@webassemblyjs/helper-buffer": 1.11.1
-    "@webassemblyjs/wasm-gen": 1.11.1
-    "@webassemblyjs/wasm-parser": 1.11.1
-  checksum: 21586883a20009e2b20feb67bdc451bbc6942252e038aae4c3a08e6f67b6bae0f5f88f20bfc7bd0452db5000bacaf5ab42b98cf9aa034a6c70e9fc616142e1db
+    "@xtuc/long": "npm:4.2.2"
+  checksum: 10/ec3b72db0e7ce7908fe08ec24395bfc97db486063824c0edc580f0973a4cfbadf30529569d9c7db663a56513e45b94299cca03be9e1992ea3308bb0744164f3d
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-opt@npm:1.11.6":
+"@webassemblyjs/utf8@npm:1.11.6":
   version: 1.11.6
-  resolution: "@webassemblyjs/wasm-opt@npm:1.11.6"
+  resolution: "@webassemblyjs/utf8@npm:1.11.6"
+  checksum: 10/361a537bd604101b320a5604c3c96d1038d83166f1b9fb86cedadc7e81bae54c3785ae5d90bf5b1842f7da08194ccaf0f44a64fcca0cbbd6afe1a166196986d6
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/wasm-edit@npm:^1.11.5, @webassemblyjs/wasm-edit@npm:^1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/wasm-edit@npm:1.12.1"
   dependencies:
-    "@webassemblyjs/ast": 1.11.6
-    "@webassemblyjs/helper-buffer": 1.11.6
-    "@webassemblyjs/wasm-gen": 1.11.6
-    "@webassemblyjs/wasm-parser": 1.11.6
-  checksum: b4557f195487f8e97336ddf79f7bef40d788239169aac707f6eaa2fa5fe243557c2d74e550a8e57f2788e70c7ae4e7d32f7be16101afe183d597b747a3bdd528
+    "@webassemblyjs/ast": "npm:1.12.1"
+    "@webassemblyjs/helper-buffer": "npm:1.12.1"
+    "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6"
+    "@webassemblyjs/helper-wasm-section": "npm:1.12.1"
+    "@webassemblyjs/wasm-gen": "npm:1.12.1"
+    "@webassemblyjs/wasm-opt": "npm:1.12.1"
+    "@webassemblyjs/wasm-parser": "npm:1.12.1"
+    "@webassemblyjs/wast-printer": "npm:1.12.1"
+  checksum: 10/5678ae02dbebba2f3a344e25928ea5a26a0df777166c9be77a467bfde7aca7f4b57ef95587e4bd768a402cdf2fddc4c56f0a599d164cdd9fe313520e39e18137
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-parser@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/wasm-parser@npm:1.11.1"
+"@webassemblyjs/wasm-gen@npm:1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/wasm-gen@npm:1.12.1"
   dependencies:
-    "@webassemblyjs/ast": 1.11.1
-    "@webassemblyjs/helper-api-error": 1.11.1
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.1
-    "@webassemblyjs/ieee754": 1.11.1
-    "@webassemblyjs/leb128": 1.11.1
-    "@webassemblyjs/utf8": 1.11.1
-  checksum: 1521644065c360e7b27fad9f4bb2df1802d134dd62937fa1f601a1975cde56bc31a57b6e26408b9ee0228626ff3ba1131ae6f74ffb7d718415b6528c5a6dbfc2
+    "@webassemblyjs/ast": "npm:1.12.1"
+    "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6"
+    "@webassemblyjs/ieee754": "npm:1.11.6"
+    "@webassemblyjs/leb128": "npm:1.11.6"
+    "@webassemblyjs/utf8": "npm:1.11.6"
+  checksum: 10/ec45bd50e86bc9856f80fe9af4bc1ae5c98fb85f57023d11dff2b670da240c47a7b1b9b6c89755890314212bd167cf3adae7f1157216ddffb739a4ce589fc338
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-parser@npm:1.11.6, @webassemblyjs/wasm-parser@npm:^1.11.5":
-  version: 1.11.6
-  resolution: "@webassemblyjs/wasm-parser@npm:1.11.6"
+"@webassemblyjs/wasm-opt@npm:1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/wasm-opt@npm:1.12.1"
   dependencies:
-    "@webassemblyjs/ast": 1.11.6
-    "@webassemblyjs/helper-api-error": 1.11.6
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.6
-    "@webassemblyjs/ieee754": 1.11.6
-    "@webassemblyjs/leb128": 1.11.6
-    "@webassemblyjs/utf8": 1.11.6
-  checksum: 8200a8d77c15621724a23fdabe58d5571415cda98a7058f542e670ea965dd75499f5e34a48675184947c66f3df23adf55df060312e6d72d57908e3f049620d8a
+    "@webassemblyjs/ast": "npm:1.12.1"
+    "@webassemblyjs/helper-buffer": "npm:1.12.1"
+    "@webassemblyjs/wasm-gen": "npm:1.12.1"
+    "@webassemblyjs/wasm-parser": "npm:1.12.1"
+  checksum: 10/21f25ae109012c49bb084e09f3b67679510429adc3e2408ad3621b2b505379d9cce337799a7919ef44db64e0d136833216914aea16b0d4856f353b9778e0cdb7
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wast-printer@npm:1.11.1":
-  version: 1.11.1
-  resolution: "@webassemblyjs/wast-printer@npm:1.11.1"
+"@webassemblyjs/wasm-parser@npm:1.12.1, @webassemblyjs/wasm-parser@npm:^1.11.5, @webassemblyjs/wasm-parser@npm:^1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/wasm-parser@npm:1.12.1"
   dependencies:
-    "@webassemblyjs/ast": 1.11.1
-    "@xtuc/long": 4.2.2
-  checksum: f15ae4c2441b979a3b4fce78f3d83472fb22350c6dc3fd34bfe7c3da108e0b2360718734d961bba20e7716cb8578e964b870da55b035e209e50ec9db0378a3f7
+    "@webassemblyjs/ast": "npm:1.12.1"
+    "@webassemblyjs/helper-api-error": "npm:1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6"
+    "@webassemblyjs/ieee754": "npm:1.11.6"
+    "@webassemblyjs/leb128": "npm:1.11.6"
+    "@webassemblyjs/utf8": "npm:1.11.6"
+  checksum: 10/f7311685b76c3e1def2abea3488be1e77f06ecd8633143a6c5c943ca289660952b73785231bb76a010055ca64645227a4bc79705c26ab7536216891b6bb36320
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wast-printer@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/wast-printer@npm:1.11.6"
+"@webassemblyjs/wast-printer@npm:1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/wast-printer@npm:1.12.1"
   dependencies:
-    "@webassemblyjs/ast": 1.11.6
-    "@xtuc/long": 4.2.2
-  checksum: d2fa6a4c427325ec81463e9c809aa6572af6d47f619f3091bf4c4a6fc34f1da3df7caddaac50b8e7a457f8784c62cd58c6311b6cb69b0162ccd8d4c072f79cf8
+    "@webassemblyjs/ast": "npm:1.12.1"
+    "@xtuc/long": "npm:4.2.2"
+  checksum: 10/1a6a4b6bc4234f2b5adbab0cb11a24911b03380eb1cab6fb27a2250174a279fdc6aa2f5a9cf62dd1f6d4eb39f778f488e8ff15b9deb0670dee5c5077d46cf572
   languageName: node
   linkType: hard
 
@@ -10649,7 +11498,7 @@ __metadata:
   peerDependencies:
     webpack: 5.x.x
     webpack-cli: 5.x.x
-  checksum: 9f9f9145c2d05471fc83d426db1df85cf49f329836b0c4b9f46b6948bed4b013464c00622b136d2a0a26993ce2306976682592245b08ee717500b1db45009a72
+  checksum: 10/9f9f9145c2d05471fc83d426db1df85cf49f329836b0c4b9f46b6948bed4b013464c00622b136d2a0a26993ce2306976682592245b08ee717500b1db45009a72
   languageName: node
   linkType: hard
 
@@ -10659,7 +11508,7 @@ __metadata:
   peerDependencies:
     webpack: 5.x.x
     webpack-cli: 5.x.x
-  checksum: 8f9a178afca5c82e113aed1efa552d64ee5ae4fdff63fe747c096a981ec74f18a5d07bd6e89bbe6715c3e57d96eea024a410e58977169489fe1df044c10dd94e
+  checksum: 10/8f9a178afca5c82e113aed1efa552d64ee5ae4fdff63fe747c096a981ec74f18a5d07bd6e89bbe6715c3e57d96eea024a410e58977169489fe1df044c10dd94e
   languageName: node
   linkType: hard
 
@@ -10672,72 +11521,46 @@ __metadata:
   peerDependenciesMeta:
     webpack-dev-server:
       optional: true
-  checksum: 75f0e54681796d567a71ac3e2781d2901a8d8cf1cdfc82f261034dddac59a8343e8c3bc5e32b4bb9d6766759ba49fb29a5cd86ef1701d79c506fe886bb63ac75
+  checksum: 10/20424e5c1e664e4d7ab11facee7033bb729f6acd86493138069532934c1299c1426da72942822dedb00caca8fc60cc8aec1626e610ee0e8a9679e3614f555860
   languageName: node
   linkType: hard
 
-"@welldone-software/why-did-you-render@npm:7.0.1":
-  version: 7.0.1
-  resolution: "@welldone-software/why-did-you-render@npm:7.0.1"
+"@welldone-software/why-did-you-render@npm:8.0.1":
+  version: 8.0.1
+  resolution: "@welldone-software/why-did-you-render@npm:8.0.1"
   dependencies:
-    lodash: ^4
+    lodash: "npm:^4"
   peerDependencies:
-    react: ^16 || ^17 || ^18
-  checksum: 0bfc59f1f8613e7dc5fbf189305e88b01c50ee278df2c9b69082ed6abcf8d71758eb468d027235916c6126934a755d6547e9704883007236544763fffad6f48c
+    react: ^18
+  checksum: 10/bfa9ad79bd61d6d003733f21842eb79eda33f19354aed85a6bec860ace51d7276aff52a0947a982c00e992baef94b8c4dc63545713d5df72a7d014adaa74cc99
   languageName: node
   linkType: hard
 
 "@wojtekmaj/date-utils@npm:^1.1.3":
   version: 1.4.1
   resolution: "@wojtekmaj/date-utils@npm:1.4.1"
-  checksum: e1def2f26e2b2e781152b9f2b847f849abfb4ad90d2fddb77dc418ec4c8753dc29775d52205bc47952a71e47abf53bcb6df6306707486b3aa3b69ef9c359d8d6
-  languageName: node
-  linkType: hard
-
-"@xmldom/xmldom@npm:^0.8.3":
-  version: 0.8.6
-  resolution: "@xmldom/xmldom@npm:0.8.6"
-  checksum: f17ac6d99a971a6aeb831fcfc5cfa86f367664e45815046548814b2deb17ccc421fef4e0d5ba29e66179d112b552f6caa5680064f8e7bd8a389b788a60404c8e
+  checksum: 10/4df265f47fb70ab31151ee24e994664bb75ff0b086c2ca1567e06afae63eadde2af3542ccca8776060c7ec46aa0efe001c10a4ab7401a3adf3e7872e9927560a
   languageName: node
   linkType: hard
 
 "@xobotyi/scrollbar-width@npm:^1.9.5":
   version: 1.9.5
   resolution: "@xobotyi/scrollbar-width@npm:1.9.5"
-  checksum: e880c8696bd6c7eedaad4e89cc7bcfcd502c22dc6c061288ffa7f5a4fe5dab4aa2358bdd68e7357bf0334dc8b56724ed9bee05e010b60d83a3bb0d855f3d886f
-  languageName: node
-  linkType: hard
-
-"@xstate/react@npm:^3.2.1":
-  version: 3.2.1
-  resolution: "@xstate/react@npm:3.2.1"
-  dependencies:
-    use-isomorphic-layout-effect: ^1.0.0
-    use-sync-external-store: ^1.0.0
-  peerDependencies:
-    "@xstate/fsm": ^2.0.0
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    xstate: ^4.36.0
-  peerDependenciesMeta:
-    "@xstate/fsm":
-      optional: true
-    xstate:
-      optional: true
-  checksum: f3b4816b1ed7128254d53a0b03cfa53d928a2efda9180364eb22e6b36660fc3b39bcc6d77843a40874551cf9c89fc597d371ad923997d85a66005d340805feef
+  checksum: 10/026ccd174ec3ce032f42794c7e2ee9dab3cfee4f8f9d6ce4f2b4a2fe50cbf8be7406583fb2e203707c699690c5d40a13ee1611f1f67f6ceb01ac2a543acadc30
   languageName: node
   linkType: hard
 
 "@xtuc/ieee754@npm:^1.2.0":
   version: 1.2.0
   resolution: "@xtuc/ieee754@npm:1.2.0"
-  checksum: ac56d4ca6e17790f1b1677f978c0c6808b1900a5b138885d3da21732f62e30e8f0d9120fcf8f6edfff5100ca902b46f8dd7c1e3f903728634523981e80e2885a
+  checksum: 10/ab033b032927d77e2f9fa67accdf31b1ca7440974c21c9cfabc8349e10ca2817646171c4f23be98d0e31896d6c2c3462a074fe37752e523abc3e45c79254259c
   languageName: node
   linkType: hard
 
 "@xtuc/long@npm:4.2.2":
   version: 4.2.2
   resolution: "@xtuc/long@npm:4.2.2"
-  checksum: 8ed0d477ce3bc9c6fe2bf6a6a2cc316bb9c4127c5a7827bae947fa8ec34c7092395c5a283cc300c05b5fa01cbbfa1f938f410a7bf75db7c7846fea41949989ec
+  checksum: 10/7217bae9fe240e0d804969e7b2af11cb04ec608837c78b56ca88831991b287e232a0b7fce8d548beaff42aaf0197ffa471d81be6ac4c4e53b0148025a2c076ec
   languageName: node
   linkType: hard
 
@@ -10745,10 +11568,10 @@ __metadata:
   version: 3.0.0-rc.15
   resolution: "@yarnpkg/esbuild-plugin-pnp@npm:3.0.0-rc.15"
   dependencies:
-    tslib: ^2.4.0
+    tslib: "npm:^2.4.0"
   peerDependencies:
     esbuild: ">=0.10.0"
-  checksum: 04da15355a99773b441742814ba4d0f3453a83df47aa07e215f167e156f109ab8e971489c8b1a4ddf3c79d568d35213f496ad52e97298228597e1aacc22680aa
+  checksum: 10/454f521088c1fa24fda51f83ca4a50ba6e3bd147e5dee8c899e6bf24a7196186532c3abb18480e83395708ffb7238c9cac5b82595c3985ce93593b5afbd0a9f0
   languageName: node
   linkType: hard
 
@@ -10756,9 +11579,9 @@ __metadata:
   version: 2.10.3
   resolution: "@yarnpkg/fslib@npm:2.10.3"
   dependencies:
-    "@yarnpkg/libzip": ^2.3.0
-    tslib: ^1.13.0
-  checksum: 0ca693f61d47bcf165411a121ed9123f512b1b5bfa5e1c6c8f280b4ffdbea9bf2a6db418f99ecfc9624587fdc695b2b64eb0fe7b4028e44095914b25ca99655e
+    "@yarnpkg/libzip": "npm:^2.3.0"
+    tslib: "npm:^1.13.0"
+  checksum: 10/29b38bd2054e3ec14677c16321a20ed69ac41d9d6f2fee7d9d7bc0a5a737e6d94add79cfa5f6ab867b5a98ab6aa2df3b53cb34f81159907cc308576a7bc08c67
   languageName: node
   linkType: hard
 
@@ -10766,26 +11589,26 @@ __metadata:
   version: 2.3.0
   resolution: "@yarnpkg/libzip@npm:2.3.0"
   dependencies:
-    "@types/emscripten": ^1.39.6
-    tslib: ^1.13.0
-  checksum: 533a4883f69bb013f955d80dc19719881697e6849ea5f0cbe6d87ef1d582b05cbae8a453802f92ad0c852f976296cac3ff7834be79a7e415b65cdf213e448110
+    "@types/emscripten": "npm:^1.39.6"
+    tslib: "npm:^1.13.0"
+  checksum: 10/0eb147f39eab2830c29120d17e8bfba5aa15dedb940a7378070c67d4de08e9ba8d34068522e15e6b4db94ecaed4ad520e1e517588a36a348d1aa160bc36156ea
   languageName: node
   linkType: hard
 
 "@yarnpkg/lockfile@npm:^1.1.0":
   version: 1.1.0
   resolution: "@yarnpkg/lockfile@npm:1.1.0"
-  checksum: 05b881b4866a3546861fee756e6d3812776ea47fa6eb7098f983d6d0eefa02e12b66c3fff931574120f196286a7ad4879ce02743c8bb2be36c6a576c7852083a
+  checksum: 10/cd19e1114aaf10a05126aeea8833ef4ca8af8a46e88e12884f8359d19333fd19711036dbc2698dbe937f81f037070cf9a8da45c2e8c6ca19cafd7d15659094ed
   languageName: node
   linkType: hard
 
-"@yarnpkg/parsers@npm:^3.0.0-rc.18":
-  version: 3.0.0-rc.22
-  resolution: "@yarnpkg/parsers@npm:3.0.0-rc.22"
+"@yarnpkg/parsers@npm:3.0.0-rc.46":
+  version: 3.0.0-rc.46
+  resolution: "@yarnpkg/parsers@npm:3.0.0-rc.46"
   dependencies:
-    js-yaml: ^3.10.0
-    tslib: ^2.4.0
-  checksum: 4a31b4faad853b6cb09ff198017dd2f81782cb57ff8aaa2446ab9c8eb51aacaad3fa740e0c156c60c66cdb9cff8939f99b2b09c9890e2b8d015dcbed0150cb8a
+    js-yaml: "npm:^3.10.0"
+    tslib: "npm:^2.4.0"
+  checksum: 10/3b7d55ebd1b90fe2adf05bfaab53031fb9ddb6315f8dfca1b5ba0393c08fc4a7f22c94603eec06dfe0a67e4121e5227b0ae57a70c73d353614650e2b54b6049d
   languageName: node
   linkType: hard
 
@@ -10793,43 +11616,43 @@ __metadata:
   version: 0.0.6
   resolution: "@zkochan/js-yaml@npm:0.0.6"
   dependencies:
-    argparse: ^2.0.1
+    argparse: "npm:^2.0.1"
   bin:
     js-yaml: bin/js-yaml.js
-  checksum: 51b81597a1d1d79c778b8fae48317eaad78d75223d0b7477ad2b35f47cf63b19504da430bb7a03b326e668b282874242cc123e323e57293be038684cb5e755f8
+  checksum: 10/1a079db8bc76dfd200f3d2334c96fd5df6ce072f40b5aa6fe4508e6fd5af0e57cab6fc879ea7f8c376e4c553febd73c4b46c924bd48b838b5b9522936b88517b
   languageName: node
   linkType: hard
 
-"@zxing/text-encoding@npm:0.9.0":
-  version: 0.9.0
-  resolution: "@zxing/text-encoding@npm:0.9.0"
-  checksum: c23b12aee7639382e4949961304a1294776afaffa40f579e09ffecd0e5e68cf26ef3edd75009de46da8a536e571448755ca68b3e2ea707d53793c0edb2e2c34a
-  languageName: node
-  linkType: hard
-
-"JSONStream@npm:^1.0.4":
+"JSONStream@npm:^1.3.5":
   version: 1.3.5
   resolution: "JSONStream@npm:1.3.5"
   dependencies:
-    jsonparse: ^1.2.0
-    through: ">=2.2.7 <3"
+    jsonparse: "npm:^1.2.0"
+    through: "npm:>=2.2.7 <3"
   bin:
     JSONStream: ./bin.js
-  checksum: 2605fa124260c61bad38bb65eba30d2f72216a78e94d0ab19b11b4e0327d572b8d530c0c9cc3b0764f727ad26d39e00bf7ebad57781ca6368394d73169c59e46
+  checksum: 10/e30daf7b9b2da23076181d9a0e4bec33bc1d97e8c0385b949f1b16ba3366a1d241ec6f077850c01fe32379b5ebb8b96b65496984bc1545a93a5150bf4c267439
   languageName: node
   linkType: hard
 
 "abab@npm:^2.0.6":
   version: 2.0.6
   resolution: "abab@npm:2.0.6"
-  checksum: 6ffc1af4ff315066c62600123990d87551ceb0aafa01e6539da77b0f5987ac7019466780bf480f1787576d4385e3690c81ccc37cfda12819bf510b8ab47e5a3e
+  checksum: 10/ebe95d7278999e605823fc515a3b05d689bc72e7f825536e73c95ebf621636874c6de1b749b3c4bf866b96ccd4b3a2802efa313d0e45ad51a413c8c73247db20
   languageName: node
   linkType: hard
 
 "abbrev@npm:1":
   version: 1.1.1
   resolution: "abbrev@npm:1.1.1"
-  checksum: a4a97ec07d7ea112c517036882b2ac22f3109b7b19077dc656316d07d308438aac28e4d9746dc4d84bf6b1e75b4a7b0a5f3cb30592419f128ca9a8cee3bcfa17
+  checksum: 10/2d882941183c66aa665118bafdab82b7a177e9add5eb2776c33e960a4f3c89cff88a1b38aba13a456de01d0dd9d66a8bea7c903268b21ea91dd1097e1e2e8243
+  languageName: node
+  linkType: hard
+
+"abbrev@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "abbrev@npm:2.0.0"
+  checksum: 10/ca0a54e35bea4ece0ecb68a47b312e1a9a6f772408d5bcb9051230aaa94b0460671c5b5c9cb3240eb5b7bc94c52476550eb221f65a0bbd0145bdc9f3113a6707
   languageName: node
   linkType: hard
 
@@ -10837,9 +11660,9 @@ __metadata:
   version: 1.3.8
   resolution: "accepts@npm:1.3.8"
   dependencies:
-    mime-types: ~2.1.34
-    negotiator: 0.6.3
-  checksum: 50c43d32e7b50285ebe84b613ee4a3aa426715a7d131b65b786e2ead0fd76b6b60091b9916d3478a75f11f162628a2139991b6c03ab3f1d9ab7c86075dc8eab4
+    mime-types: "npm:~2.1.34"
+    negotiator: "npm:0.6.3"
+  checksum: 10/67eaaa90e2917c58418e7a9b89392002d2b1ccd69bcca4799135d0c632f3b082f23f4ae4ddeedbced5aa59bcc7bdf4699c69ebed4593696c922462b7bc5744d6
   languageName: node
   linkType: hard
 
@@ -10847,18 +11670,18 @@ __metadata:
   version: 7.0.1
   resolution: "acorn-globals@npm:7.0.1"
   dependencies:
-    acorn: ^8.1.0
-    acorn-walk: ^8.0.2
-  checksum: 2a2998a547af6d0db5f0cdb90acaa7c3cbca6709010e02121fb8b8617c0fbd8bab0b869579903fde358ac78454356a14fadcc1a672ecb97b04b1c2ccba955ce8
+    acorn: "npm:^8.1.0"
+    acorn-walk: "npm:^8.0.2"
+  checksum: 10/2a2998a547af6d0db5f0cdb90acaa7c3cbca6709010e02121fb8b8617c0fbd8bab0b869579903fde358ac78454356a14fadcc1a672ecb97b04b1c2ccba955ce8
   languageName: node
   linkType: hard
 
-"acorn-import-assertions@npm:^1.7.6, acorn-import-assertions@npm:^1.9.0":
+"acorn-import-assertions@npm:^1.9.0":
   version: 1.9.0
   resolution: "acorn-import-assertions@npm:1.9.0"
   peerDependencies:
     acorn: ^8
-  checksum: 944fb2659d0845c467066bdcda2e20c05abe3aaf11972116df457ce2627628a81764d800dd55031ba19de513ee0d43bb771bc679cc0eda66dc8b4fade143bc0c
+  checksum: 10/af8dd58f6b0c6a43e85849744534b99f2133835c6fcdabda9eea27d0a0da625a0d323c4793ba7cb25cf4507609d0f747c210ccc2fc9b5866de04b0e59c9c5617
   languageName: node
   linkType: hard
 
@@ -10867,21 +11690,21 @@ __metadata:
   resolution: "acorn-jsx@npm:5.3.2"
   peerDependencies:
     acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: c3d3b2a89c9a056b205b69530a37b972b404ee46ec8e5b341666f9513d3163e2a4f214a71f4dfc7370f5a9c07472d2fd1c11c91c3f03d093e37637d95da98950
+  checksum: 10/d4371eaef7995530b5b5ca4183ff6f062ca17901a6d3f673c9ac011b01ede37e7a1f7f61f8f5cfe709e88054757bb8f3277dc4061087cdf4f2a1f90ccbcdb977
   languageName: node
   linkType: hard
 
 "acorn-walk@npm:^7.2.0":
   version: 7.2.0
   resolution: "acorn-walk@npm:7.2.0"
-  checksum: 9252158a79b9d92f1bc0dd6acc0fcfb87a67339e84bcc301bb33d6078936d27e35d606b4d35626d2962cd43c256d6f27717e70cbe15c04fff999ab0b2260b21f
+  checksum: 10/4d3e186f729474aed3bc3d0df44692f2010c726582655b20a23347bef650867655521c48ada444cb4fda241ee713dcb792da363ec74c6282fa884fb7144171bb
   languageName: node
   linkType: hard
 
 "acorn-walk@npm:^8.0.0, acorn-walk@npm:^8.0.2, acorn-walk@npm:^8.1.1":
   version: 8.2.0
   resolution: "acorn-walk@npm:8.2.0"
-  checksum: 1715e76c01dd7b2d4ca472f9c58968516a4899378a63ad5b6c2d668bba8da21a71976c14ec5f5b75f887b6317c4ae0b897ab141c831d741dc76024d8745f1ad1
+  checksum: 10/e69f7234f2adfeb16db3671429a7c80894105bd7534cb2032acf01bb26e6a847952d11a062d071420b43f8d82e33d2e57f26fe87d9cce0853e8143d8910ff1de
   languageName: node
   linkType: hard
 
@@ -10890,16 +11713,16 @@ __metadata:
   resolution: "acorn@npm:7.4.1"
   bin:
     acorn: bin/acorn
-  checksum: 1860f23c2107c910c6177b7b7be71be350db9e1080d814493fae143ae37605189504152d1ba8743ba3178d0b37269ce1ffc42b101547fdc1827078f82671e407
+  checksum: 10/8be2a40714756d713dfb62544128adce3b7102c6eb94bc312af196c2cc4af76e5b93079bd66b05e9ca31b35a9b0ce12171d16bc55f366cafdb794fdab9d753ec
   languageName: node
   linkType: hard
 
-"acorn@npm:^8.0.4, acorn@npm:^8.1.0, acorn@npm:^8.10.0, acorn@npm:^8.4.1, acorn@npm:^8.5.0, acorn@npm:^8.7.1, acorn@npm:^8.8.0, acorn@npm:^8.9.0":
-  version: 8.10.0
-  resolution: "acorn@npm:8.10.0"
+"acorn@npm:^8.0.4, acorn@npm:^8.1.0, acorn@npm:^8.10.0, acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.0, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
+  version: 8.11.3
+  resolution: "acorn@npm:8.11.3"
   bin:
     acorn: bin/acorn
-  checksum: 538ba38af0cc9e5ef983aee196c4b8b4d87c0c94532334fa7e065b2c8a1f85863467bb774231aae91613fcda5e68740c15d97b1967ae3394d20faddddd8af61d
+  checksum: 10/b688e7e3c64d9bfb17b596e1b35e4da9d50553713b3b3630cf5690f2b023a84eac90c56851e6912b483fe60e8b4ea28b254c07e92f17ef83d72d78745a8352dd
   languageName: node
   linkType: hard
 
@@ -10907,36 +11730,36 @@ __metadata:
   version: 1.1.0
   resolution: "add-dom-event-listener@npm:1.1.0"
   dependencies:
-    object-assign: 4.x
-  checksum: 7685d32c4a9d78ad7a36641774168d80e195ef0710ae801e7211d849100c0e4499657cf3838bdae5ee9134b5aa9d7f50d68dec73b03e7d0082302804efff6ea6
+    object-assign: "npm:4.x"
+  checksum: 10/dcab339517668e46887b4d5ddf3e299d5b3a1797e027cafe0480da6fb32591bfe04b567dd002d3b2c4d43f3c8addf208f7ae45db847b79daa1d7a7391dc3c076
   languageName: node
   linkType: hard
 
 "add-px-to-style@npm:1.0.0":
   version: 1.0.0
   resolution: "add-px-to-style@npm:1.0.0"
-  checksum: 673831d81d86d717e3a9f4f644059476ca74990dd28310d9bffe6cb35fac8007865351d37a885af168a8613f5cdb054db728a3df19e9ee1457b75a668003c729
+  checksum: 10/2e8c3c2adce84253c4240b83e69574b1799c2bc4fb97998985b6f04520a0c2be3e1ea7fd498c29f38286ca9fbd24f7974faa6ad3a91ef4a2b7abd0404957ded2
   languageName: node
   linkType: hard
 
 "add-stream@npm:^1.0.0":
   version: 1.0.0
   resolution: "add-stream@npm:1.0.0"
-  checksum: 3e9e8b0b8f0170406d7c3a9a39bfbdf419ccccb0fd2a396338c0fda0a339af73bf738ad414fc520741de74517acf0dd92b4a36fd3298a47fd5371eee8f2c5a06
+  checksum: 10/3e9e8b0b8f0170406d7c3a9a39bfbdf419ccccb0fd2a396338c0fda0a339af73bf738ad414fc520741de74517acf0dd92b4a36fd3298a47fd5371eee8f2c5a06
   languageName: node
   linkType: hard
 
 "address@npm:^1.0.1":
   version: 1.1.2
   resolution: "address@npm:1.1.2"
-  checksum: d966deee6ab9a0f96ed1d25dc73e91a248f64479c91f9daeb15237b8e3c39a02faac4e6afe8987ef9e5aea60a1593cef5882b7456ab2e6196fc0229a93ec39c2
+  checksum: 10/be4c16c4874a347c8f6dec28b5b5c891f7c3ca2234bdd734b6e4b0f28310b07a9ae8359937a8d92a4ae682019d375d70de920203d9acc839167674e3a525970a
   languageName: node
   linkType: hard
 
 "agent-base@npm:5":
   version: 5.1.1
   resolution: "agent-base@npm:5.1.1"
-  checksum: 61ae789f3019f1dc10e8cba6d3ae9826949299a4e54aaa1cfa2fa37c95a108e70e95423b963bb987d7891a703fd9a5c383a506f4901819f3ee56f3147c0aa8ab
+  checksum: 10/82954db5dccdccccf52c4b7f548394a696accd259d564bfb325fb02586aaaa9df96f5d50bb19134923fe5ff9c21195e7a88871bf4e086cca9014a549a0ba2a5f
   languageName: node
   linkType: hard
 
@@ -10944,8 +11767,17 @@ __metadata:
   version: 6.0.2
   resolution: "agent-base@npm:6.0.2"
   dependencies:
-    debug: 4
-  checksum: f52b6872cc96fd5f622071b71ef200e01c7c4c454ee68bc9accca90c98cfb39f2810e3e9aa330435835eedc8c23f4f8a15267f67c6e245d2b33757575bdac49d
+    debug: "npm:4"
+  checksum: 10/21fb903e0917e5cb16591b4d0ef6a028a54b83ac30cd1fca58dece3d4e0990512a8723f9f83130d88a41e2af8b1f7be1386fda3ea2d181bb1a62155e75e95e23
+  languageName: node
+  linkType: hard
+
+"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0":
+  version: 7.1.0
+  resolution: "agent-base@npm:7.1.0"
+  dependencies:
+    debug: "npm:^4.3.4"
+  checksum: 10/f7828f991470a0cc22cb579c86a18cbae83d8a3cbed39992ab34fc7217c4d126017f1c74d0ab66be87f71455318a8ea3e757d6a37881b8d0f2a2c6aa55e5418f
   languageName: node
   linkType: hard
 
@@ -10953,10 +11785,10 @@ __metadata:
   version: 4.2.1
   resolution: "agentkeepalive@npm:4.2.1"
   dependencies:
-    debug: ^4.1.0
-    depd: ^1.1.2
-    humanize-ms: ^1.2.1
-  checksum: 39cb49ed8cf217fd6da058a92828a0a84e0b74c35550f82ee0a10e1ee403c4b78ade7948be2279b188b7a7303f5d396ea2738b134731e464bf28de00a4f72a18
+    debug: "npm:^4.1.0"
+    depd: "npm:^1.1.2"
+    humanize-ms: "npm:^1.2.1"
+  checksum: 10/63961cba1afa26d708da94159f3b9428d46fdc137b783fbc399b848e750c5e28c97d96839efa8cb3c2d11ecd12dd411298c00d164600212f660e8c55369c9e55
   languageName: node
   linkType: hard
 
@@ -10964,9 +11796,9 @@ __metadata:
   version: 3.1.0
   resolution: "aggregate-error@npm:3.1.0"
   dependencies:
-    clean-stack: ^2.0.0
-    indent-string: ^4.0.0
-  checksum: 1101a33f21baa27a2fa8e04b698271e64616b886795fd43c31068c07533c7b3facfcaf4e9e0cab3624bd88f729a592f1c901a1a229c9e490eafce411a8644b79
+    clean-stack: "npm:^2.0.0"
+    indent-string: "npm:^4.0.0"
+  checksum: 10/1101a33f21baa27a2fa8e04b698271e64616b886795fd43c31068c07533c7b3facfcaf4e9e0cab3624bd88f729a592f1c901a1a229c9e490eafce411a8644b79
   languageName: node
   linkType: hard
 
@@ -10974,13 +11806,13 @@ __metadata:
   version: 2.1.1
   resolution: "ajv-formats@npm:2.1.1"
   dependencies:
-    ajv: ^8.0.0
+    ajv: "npm:^8.0.0"
   peerDependencies:
     ajv: ^8.0.0
   peerDependenciesMeta:
     ajv:
       optional: true
-  checksum: 4a287d937f1ebaad4683249a4c40c0fa3beed30d9ddc0adba04859026a622da0d317851316ea64b3680dc60f5c3c708105ddd5d5db8fe595d9d0207fd19f90b7
+  checksum: 10/70c263ded219bf277ffd9127f793b625f10a46113b2e901e150da41931fcfd7f5592da6d66862f4449bb157ffe65867c3294a7df1d661cc232c4163d5a1718ed
   languageName: node
   linkType: hard
 
@@ -10989,7 +11821,7 @@ __metadata:
   resolution: "ajv-keywords@npm:3.5.2"
   peerDependencies:
     ajv: ^6.9.1
-  checksum: 7dc5e5931677a680589050f79dcbe1fefbb8fea38a955af03724229139175b433c63c68f7ae5f86cf8f65d55eb7c25f75a046723e2e58296707617ca690feae9
+  checksum: 10/d57c9d5bf8849bddcbd801b79bc3d2ddc736c2adb6b93a6a365429589dd7993ddbd5d37c6025ed6a7f89c27506b80131d5345c5b1fa6a97e40cd10a96bcd228c
   languageName: node
   linkType: hard
 
@@ -10997,22 +11829,22 @@ __metadata:
   version: 5.1.0
   resolution: "ajv-keywords@npm:5.1.0"
   dependencies:
-    fast-deep-equal: ^3.1.3
+    fast-deep-equal: "npm:^3.1.3"
   peerDependencies:
     ajv: ^8.8.2
-  checksum: c35193940b853119242c6757787f09ecf89a2c19bcd36d03ed1a615e710d19d450cb448bfda407b939aba54b002368c8bff30529cc50a0536a8e10bcce300421
+  checksum: 10/5021f96ab7ddd03a4005326bd06f45f448ebfbb0fe7018b1b70b6c28142fa68372bda2057359814b83fd0b2d4c8726c297f0a7557b15377be7b56ce5344533d8
   languageName: node
   linkType: hard
 
-"ajv@npm:^6.10.0, ajv@npm:^6.12.3, ajv@npm:^6.12.4, ajv@npm:^6.12.5":
+"ajv@npm:^6.12.3, ajv@npm:^6.12.4, ajv@npm:^6.12.5":
   version: 6.12.6
   resolution: "ajv@npm:6.12.6"
   dependencies:
-    fast-deep-equal: ^3.1.1
-    fast-json-stable-stringify: ^2.0.0
-    json-schema-traverse: ^0.4.1
-    uri-js: ^4.2.2
-  checksum: 874972efe5c4202ab0a68379481fbd3d1b5d0a7bd6d3cc21d40d3536ebff3352a2a1fabb632d4fd2cc7fe4cbdcd5ed6782084c9bbf7f32a1536d18f9da5007d4
+    fast-deep-equal: "npm:^3.1.1"
+    fast-json-stable-stringify: "npm:^2.0.0"
+    json-schema-traverse: "npm:^0.4.1"
+    uri-js: "npm:^4.2.2"
+  checksum: 10/48d6ad21138d12eb4d16d878d630079a2bda25a04e745c07846a4ad768319533031e28872a9b3c5790fa1ec41aabdf2abed30a56e5a03ebc2cf92184b8ee306c
   languageName: node
   linkType: hard
 
@@ -11020,55 +11852,64 @@ __metadata:
   version: 8.12.0
   resolution: "ajv@npm:8.12.0"
   dependencies:
-    fast-deep-equal: ^3.1.1
-    json-schema-traverse: ^1.0.0
-    require-from-string: ^2.0.2
-    uri-js: ^4.2.2
-  checksum: 4dc13714e316e67537c8b31bc063f99a1d9d9a497eb4bbd55191ac0dcd5e4985bbb71570352ad6f1e76684fb6d790928f96ba3b2d4fd6e10024be9612fe3f001
+    fast-deep-equal: "npm:^3.1.1"
+    json-schema-traverse: "npm:^1.0.0"
+    require-from-string: "npm:^2.0.2"
+    uri-js: "npm:^4.2.2"
+  checksum: 10/b406f3b79b5756ac53bfe2c20852471b08e122bc1ee4cde08ae4d6a800574d9cd78d60c81c69c63ff81e4da7cd0b638fafbb2303ae580d49cf1600b9059efb85
   languageName: node
   linkType: hard
 
 "angular-bindonce@npm:0.3.1":
   version: 0.3.1
   resolution: "angular-bindonce@npm:0.3.1"
-  checksum: 6a9adeb52700be9a3c2f9f14ed8fb93f29151381917381be7e150e65cef0560ef6e833440ccc0c3073bce5655a984ed2be2f0b5b08abb98597eeb6a169eefdfd
+  checksum: 10/c756ded4a920191c953732050095b2ef3f9faf42342a40c1e6f23b08ca730e57c9d30fd7b432bc74a950de162495707540cac865aa4a93a3486fc507d382d006
   languageName: node
   linkType: hard
 
 "angular-route@npm:1.8.3":
   version: 1.8.3
   resolution: "angular-route@npm:1.8.3"
-  checksum: efb1685d03bdf61220eca4eb2f996ebae129a85bc2bbea00c03ea0bb6e581cbd6b4b6378d79e4c695761d4789b7884830094e00858b78faeb10806e04fd49468
+  checksum: 10/c55bcdb75ce0ecb131642aa51a9ebc49638f60e627902af0914b52fc80467ddba514eb96c0f252e4e327699893417fcbf18f5c617b1a69ada5a9dd7a4f7f8878
   languageName: node
   linkType: hard
 
 "angular-sanitize@npm:1.8.3":
   version: 1.8.3
   resolution: "angular-sanitize@npm:1.8.3"
-  checksum: b48d13f6cf3c33e790c7d9ef0694975e29d4cf03535e206ff4227f0ebfe1c5834a19a1a9132b7845f3556291426a1976fb9b9234b60fdb3e6c82f1c8dc35c590
+  checksum: 10/50227cd12259bc12b91d53f23bab9a026831d56f0b4cb74ddb3571c6da602720041e9238857837d014ef2beccf4a9565a19aa01cb2ec8ba2d3111b6c05af93e8
   languageName: node
   linkType: hard
 
 "angular@npm:1.8.3":
   version: 1.8.3
   resolution: "angular@npm:1.8.3"
-  checksum: 1494625fef6252070771bdf622eda43b438841cfc84bc8c47a0e51f7ce7256a8aefaa7f3c605247c09c9558d653751a233443e252d5070e457be3c64b648370d
+  checksum: 10/4a21f1f74790dc2cdceb582386abdc7b55a0463f86aaa59573c940295cb51ed61b8fa610011134280ae0da7f97fbbc660f3a4e4491b24c92b2c32a547073a1c2
   languageName: node
   linkType: hard
 
 "ansi-colors@npm:4.1.1, ansi-colors@npm:^4.1.1":
   version: 4.1.1
   resolution: "ansi-colors@npm:4.1.1"
-  checksum: 138d04a51076cb085da0a7e2d000c5c0bb09f6e772ed5c65c53cb118d37f6c5f1637506d7155fb5f330f0abcf6f12fa2e489ac3f8cdab9da393bf1bb4f9a32b0
+  checksum: 10/e862fddd0a9ca88f1e7c9312ea70674cec3af360c994762309f6323730525e92c77d2715ee5f08aa8f438b7ca18efe378af647f501fc92b15b8e4b3b52d09db4
   languageName: node
   linkType: hard
 
-"ansi-escapes@npm:^4.2.1, ansi-escapes@npm:^4.3.0":
+"ansi-escapes@npm:^4.2.1, ansi-escapes@npm:^4.3.0, ansi-escapes@npm:^4.3.2":
   version: 4.3.2
   resolution: "ansi-escapes@npm:4.3.2"
   dependencies:
-    type-fest: ^0.21.3
-  checksum: 93111c42189c0a6bed9cdb4d7f2829548e943827ee8479c74d6e0b22ee127b2a21d3f8b5ca57723b8ef78ce011fbfc2784350eb2bde3ccfccf2f575fa8489815
+    type-fest: "npm:^0.21.3"
+  checksum: 10/8661034456193ffeda0c15c8c564a9636b0c04094b7f78bd01517929c17c504090a60f7a75f949f5af91289c264d3e1001d91492c1bd58efc8e100500ce04de2
+  languageName: node
+  linkType: hard
+
+"ansi-escapes@npm:^6.0.0":
+  version: 6.2.0
+  resolution: "ansi-escapes@npm:6.2.0"
+  dependencies:
+    type-fest: "npm:^3.0.0"
+  checksum: 10/442f91b04650b35bc4815f47c20412d69ddbba5d4bf22f72ec03be352fca2de6819c7e3f4dfd17816ee4e0c6c965fe85e6f1b3f09683996a8d12fd366afd924e
   languageName: node
   linkType: hard
 
@@ -11077,28 +11918,28 @@ __metadata:
   resolution: "ansi-html-community@npm:0.0.8"
   bin:
     ansi-html: bin/ansi-html
-  checksum: 04c568e8348a636963f915e48eaa3e01218322e1169acafdd79c384f22e5558c003f79bbc480c1563865497482817c7eed025f0653ebc17642fededa5cb42089
+  checksum: 10/08df3696720edacd001a8d53b197bb5728242c55484680117dab9f7633a6320e961a939bddd88ee5c71d4a64f3ddb49444d1c694bd0668adbb3f95ba114f2386
   languageName: node
   linkType: hard
 
 "ansi-regex@npm:^2.0.0":
   version: 2.1.1
   resolution: "ansi-regex@npm:2.1.1"
-  checksum: 190abd03e4ff86794f338a31795d262c1dfe8c91f7e01d04f13f646f1dcb16c5800818f886047876f1272f065570ab86b24b99089f8b68a0e11ff19aed4ca8f1
+  checksum: 10/190abd03e4ff86794f338a31795d262c1dfe8c91f7e01d04f13f646f1dcb16c5800818f886047876f1272f065570ab86b24b99089f8b68a0e11ff19aed4ca8f1
   languageName: node
   linkType: hard
 
-"ansi-regex@npm:^5.0.0, ansi-regex@npm:^5.0.1":
+"ansi-regex@npm:^5.0.1":
   version: 5.0.1
   resolution: "ansi-regex@npm:5.0.1"
-  checksum: 2aa4bb54caf2d622f1afdad09441695af2a83aa3fe8b8afa581d205e57ed4261c183c4d3877cee25794443fde5876417d859c108078ab788d6af7e4fe52eb66b
+  checksum: 10/2aa4bb54caf2d622f1afdad09441695af2a83aa3fe8b8afa581d205e57ed4261c183c4d3877cee25794443fde5876417d859c108078ab788d6af7e4fe52eb66b
   languageName: node
   linkType: hard
 
 "ansi-regex@npm:^6.0.1":
   version: 6.0.1
   resolution: "ansi-regex@npm:6.0.1"
-  checksum: 1ff8b7667cded1de4fa2c9ae283e979fc87036864317da86a2e546725f96406746411d0d85e87a2d12fa5abd715d90006de7fa4fa0477c92321ad3b4c7d4e169
+  checksum: 10/1ff8b7667cded1de4fa2c9ae283e979fc87036864317da86a2e546725f96406746411d0d85e87a2d12fa5abd715d90006de7fa4fa0477c92321ad3b4c7d4e169
   languageName: node
   linkType: hard
 
@@ -11106,8 +11947,8 @@ __metadata:
   version: 3.2.1
   resolution: "ansi-styles@npm:3.2.1"
   dependencies:
-    color-convert: ^1.9.0
-  checksum: d85ade01c10e5dd77b6c89f34ed7531da5830d2cb5882c645f330079975b716438cd7ebb81d0d6e6b4f9c577f19ae41ab55f07f19786b02f9dfd9e0377395665
+    color-convert: "npm:^1.9.0"
+  checksum: 10/d85ade01c10e5dd77b6c89f34ed7531da5830d2cb5882c645f330079975b716438cd7ebb81d0d6e6b4f9c577f19ae41ab55f07f19786b02f9dfd9e0377395665
   languageName: node
   linkType: hard
 
@@ -11115,89 +11956,84 @@ __metadata:
   version: 4.3.0
   resolution: "ansi-styles@npm:4.3.0"
   dependencies:
-    color-convert: ^2.0.1
-  checksum: 513b44c3b2105dd14cc42a19271e80f386466c4be574bccf60b627432f9198571ebf4ab1e4c3ba17347658f4ee1711c163d574248c0c1cdc2d5917a0ad582ec4
+    color-convert: "npm:^2.0.1"
+  checksum: 10/b4494dfbfc7e4591b4711a396bd27e540f8153914123dccb4cdbbcb514015ada63a3809f362b9d8d4f6b17a706f1d7bea3c6f974b15fa5ae76b5b502070889ff
   languageName: node
   linkType: hard
 
 "ansi-styles@npm:^5.0.0":
   version: 5.2.0
   resolution: "ansi-styles@npm:5.2.0"
-  checksum: d7f4e97ce0623aea6bc0d90dcd28881ee04cba06c570b97fd3391bd7a268eedfd9d5e2dd4fdcbdd82b8105df5faf6f24aaedc08eaf3da898e702db5948f63469
+  checksum: 10/d7f4e97ce0623aea6bc0d90dcd28881ee04cba06c570b97fd3391bd7a268eedfd9d5e2dd4fdcbdd82b8105df5faf6f24aaedc08eaf3da898e702db5948f63469
   languageName: node
   linkType: hard
 
 "ansi-styles@npm:^6.1.0":
   version: 6.2.1
   resolution: "ansi-styles@npm:6.2.1"
-  checksum: ef940f2f0ced1a6347398da88a91da7930c33ecac3c77b72c5905f8b8fe402c52e6fde304ff5347f616e27a742da3f1dc76de98f6866c69251ad0b07a66776d9
+  checksum: 10/70fdf883b704d17a5dfc9cde206e698c16bcd74e7f196ab821511651aee4f9f76c9514bdfa6ca3a27b5e49138b89cb222a28caf3afe4567570139577f991df32
   languageName: node
   linkType: hard
 
 "ansicolor@npm:1.1.100":
   version: 1.1.100
   resolution: "ansicolor@npm:1.1.100"
-  checksum: 7e1a2f5ccb10c2a76f274eaeb0de79a94346f1ffc9e419520fe71cca1e33f7f31ba65b8037986fc7731b6c219c6ca4608b14a8008d465a3765016e74668007d6
+  checksum: 10/9420e96f44b578153dfd11e2d829d633ca2699452419aff48314219d66b7b69a9b6d994d2f2350b1d29a9826e33500b87fe85606629a8889cd52ce806908f4a9
   languageName: node
   linkType: hard
 
-"anymatch@npm:^3.0.3, anymatch@npm:~3.1.2":
-  version: 3.1.2
-  resolution: "anymatch@npm:3.1.2"
+"anymatch@npm:^3.0.3, anymatch@npm:^3.1.3, anymatch@npm:~3.1.2":
+  version: 3.1.3
+  resolution: "anymatch@npm:3.1.3"
   dependencies:
-    normalize-path: ^3.0.0
-    picomatch: ^2.0.4
-  checksum: 985163db2292fac9e5a1e072bf99f1b5baccf196e4de25a0b0b81865ebddeb3b3eb4480734ef0a2ac8c002845396b91aa89121f5b84f93981a4658164a9ec6e9
+    normalize-path: "npm:^3.0.0"
+    picomatch: "npm:^2.0.4"
+  checksum: 10/3e044fd6d1d26545f235a9fe4d7a534e2029d8e59fa7fd9f2a6eb21230f6b5380ea1eaf55136e60cbf8e613544b3b766e7a6fa2102e2a3a117505466e3025dc2
   languageName: node
   linkType: hard
 
 "app-root-dir@npm:^1.0.2":
   version: 1.0.2
   resolution: "app-root-dir@npm:1.0.2"
-  checksum: d4b1653fc60b6465b982bf5a88b12051ed2d807d70609386a809306e1c636496f53522d61fa30f9f98c71aaae34f34e1651889cf17d81a44e3dafd2859d495ad
-  languageName: node
-  linkType: hard
-
-"app@link:./public/app::locator=grafana%40workspace%3A.":
-  version: 0.0.0-use.local
-  resolution: "app@link:./public/app::locator=grafana%40workspace%3A."
-  languageName: node
-  linkType: soft
-
-"append-buffer@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "append-buffer@npm:1.0.2"
-  dependencies:
-    buffer-equal: ^1.0.0
-  checksum: e809940b5137c0bfa6f6d4aefcae45b5a15a28938749c0ef50eb39e4d877978fcabf08ceba10d6f214fc15f021681f308fe24865d6557126e2923c58e9c3a134
+  checksum: 10/d4b1653fc60b6465b982bf5a88b12051ed2d807d70609386a809306e1c636496f53522d61fa30f9f98c71aaae34f34e1651889cf17d81a44e3dafd2859d495ad
   languageName: node
   linkType: hard
 
 "aproba@npm:^1.0.3":
   version: 1.2.0
   resolution: "aproba@npm:1.2.0"
-  checksum: 0fca141966559d195072ed047658b6e6c4fe92428c385dd38e288eacfc55807e7b4989322f030faff32c0f46bb0bc10f1e0ac32ec22d25315a1e5bbc0ebb76dc
+  checksum: 10/48def777330afca699880126b555273cd9912525500edc5866b527da6fd6c54badd3ae6cc6039081e5bc22e9b349d8e65fd70f8499beb090f86aa6261e4242dd
   languageName: node
   linkType: hard
 
-"aproba@npm:^1.0.3 || ^2.0.0, aproba@npm:^2.0.0":
+"aproba@npm:^1.0.3 || ^2.0.0":
   version: 2.0.0
   resolution: "aproba@npm:2.0.0"
-  checksum: 5615cadcfb45289eea63f8afd064ab656006361020e1735112e346593856f87435e02d8dcc7ff0d11928bc7d425f27bc7c2a84f6c0b35ab0ff659c814c138a24
+  checksum: 10/c2b9a631298e8d6f3797547e866db642f68493808f5b37cd61da778d5f6ada890d16f668285f7d60bd4fc3b03889bd590ffe62cf81b700e9bb353431238a0a7b
   languageName: node
   linkType: hard
 
 "arch@npm:^2.2.0":
   version: 2.2.0
   resolution: "arch@npm:2.2.0"
-  checksum: e21b7635029fe8e9cdd5a026f9a6c659103e63fff423834323cdf836a1bb240a72d0c39ca8c470f84643385cf581bd8eda2cad8bf493e27e54bd9783abe9101f
+  checksum: 10/e35dbc6d362297000ab90930069576ba165fe63cd52383efcce14bd66c1b16a91ce849e1fd239964ed029d5e0bdfc32f68e9c7331b7df6c84ddebebfdbf242f7
   languageName: node
   linkType: hard
 
 "are-docs-informative@npm:^0.0.2":
   version: 0.0.2
   resolution: "are-docs-informative@npm:0.0.2"
-  checksum: 7a48ca90d66e29afebc4387d7029d86cfe97bad7e796c8e7de01309e02dcfc027250231c02d4ca208d2984170d09026390b946df5d3d02ac638ab35f74501c74
+  checksum: 10/12cdae51a4bb369832ef1a35840604247d4ed0cbc8392f2519988d170f92c3f8c60e465844f41acba1ec3062d0edb2e9133fca38cb9c1214309153d50a25fa29
+  languageName: node
+  linkType: hard
+
+"are-we-there-yet@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "are-we-there-yet@npm:2.0.0"
+  dependencies:
+    delegates: "npm:^1.0.0"
+    readable-stream: "npm:^3.6.0"
+  checksum: 10/ea6f47d14fc33ae9cbea3e686eeca021d9d7b9db83a306010dd04ad5f2c8b7675291b127d3fcbfcbd8fec26e47b3324ad5b469a6cc3733a582f2fe4e12fc6756
   languageName: node
   linkType: hard
 
@@ -11205,9 +12041,9 @@ __metadata:
   version: 3.0.0
   resolution: "are-we-there-yet@npm:3.0.0"
   dependencies:
-    delegates: ^1.0.0
-    readable-stream: ^3.6.0
-  checksum: 348edfdd931b0b50868b55402c01c3f64df1d4c229ab6f063539a5025fd6c5f5bb8a0cab409bbed8d75d34762d22aa91b7c20b4204eb8177063158d9ba792981
+    delegates: "npm:^1.0.0"
+    readable-stream: "npm:^3.6.0"
+  checksum: 10/7266eee19d0be9dd8e58b63cfb1e1ad45945125fac1e75f00237b55960891bf3bb0be291757a8d9dcf1dbfacfb3802d3eb3f9a064084a6a70a61fe0571f9318f
   languageName: node
   linkType: hard
 
@@ -11215,16 +12051,16 @@ __metadata:
   version: 1.1.7
   resolution: "are-we-there-yet@npm:1.1.7"
   dependencies:
-    delegates: ^1.0.0
-    readable-stream: ^2.0.6
-  checksum: 70d251719c969b2745bfe5ddf3ebaefa846a636e90a6d5212573676af5d6670e15457761d4725731e19cbebdce42c4ab0cbedf23ab047f2a08274985aa10a3c7
+    delegates: "npm:^1.0.0"
+    readable-stream: "npm:^2.0.6"
+  checksum: 10/5fc14ea29ed1ae480117c177b31c6e6da6f02c0fd6d5071b7e4a1373adf42539f5d81f178358dab58b10fc929bf7650c5ed0153ae9cc98eff97285189cb6b836
   languageName: node
   linkType: hard
 
 "arg@npm:^4.1.0":
   version: 4.1.3
   resolution: "arg@npm:4.1.3"
-  checksum: 544af8dd3f60546d3e4aff084d451b96961d2267d668670199692f8d054f0415d86fc5497d0e641e91546f0aa920e7c29e5250e99fc89f5552a34b5d93b77f43
+  checksum: 10/969b491082f20cad166649fa4d2073ea9e974a4e5ac36247ca23d2e5a8b3cb12d60e9ff70a8acfe26d76566c71fd351ee5e6a9a6595157eb36f92b1fd64e1599
   languageName: node
   linkType: hard
 
@@ -11232,15 +12068,15 @@ __metadata:
   version: 1.0.10
   resolution: "argparse@npm:1.0.10"
   dependencies:
-    sprintf-js: ~1.0.2
-  checksum: 7ca6e45583a28de7258e39e13d81e925cfa25d7d4aacbf806a382d3c02fcb13403a07fb8aeef949f10a7cfe4a62da0e2e807b348a5980554cc28ee573ef95945
+    sprintf-js: "npm:~1.0.2"
+  checksum: 10/c6a621343a553ff3779390bb5ee9c2263d6643ebcd7843227bdde6cc7adbed796eb5540ca98db19e3fd7b4714e1faa51551f8849b268bb62df27ddb15cbcd91e
   languageName: node
   linkType: hard
 
 "argparse@npm:^2.0.1":
   version: 2.0.1
   resolution: "argparse@npm:2.0.1"
-  checksum: 83644b56493e89a254bae05702abf3a1101b4fa4d0ca31df1c9985275a5a5bd47b3c27b7fa0b71098d41114d8ca000e6ed90cad764b306f8a503665e4d517ced
+  checksum: 10/18640244e641a417ec75a9bd38b0b2b6b95af5199aa241b131d4b2fb206f334d7ecc600bd194861610a5579084978bfcbb02baa399dbe442d56d0ae5e60dbaef
   languageName: node
   linkType: hard
 
@@ -11248,8 +12084,8 @@ __metadata:
   version: 1.2.3
   resolution: "aria-hidden@npm:1.2.3"
   dependencies:
-    tslib: ^2.0.0
-  checksum: 7d7d211629eef315e94ed3b064c6823d13617e609d3f9afab1c2ed86399bb8e90405f9bdd358a85506802766f3ecb468af985c67c846045a34b973bcc0289db9
+    tslib: "npm:^2.0.0"
+  checksum: 10/cd7f8474f1bef2dadce8fc74ef6d0fa8c9a477ee3c9e49fc3698e5e93a62014140c520266ee28969d63b5ab474144fe48b6182d010feb6a223f7a73928e6660a
   languageName: node
   linkType: hard
 
@@ -11257,82 +12093,88 @@ __metadata:
   version: 5.1.3
   resolution: "aria-query@npm:5.1.3"
   dependencies:
-    deep-equal: ^2.0.5
-  checksum: 929ff95f02857b650fb4cbcd2f41072eee2f46159a6605ea03bf63aa572e35ffdff43d69e815ddc462e16e07de8faba3978afc2813650b4448ee18c9895d982b
+    deep-equal: "npm:^2.0.5"
+  checksum: 10/e5da608a7c4954bfece2d879342b6c218b6b207e2d9e5af270b5e38ef8418f02d122afdc948b68e32649b849a38377785252059090d66fa8081da95d1609c0d2
   languageName: node
   linkType: hard
 
-"aria-query@npm:^5.0.0, aria-query@npm:^5.1.3":
+"aria-query@npm:^5.0.0, aria-query@npm:^5.3.0":
   version: 5.3.0
   resolution: "aria-query@npm:5.3.0"
   dependencies:
-    dequal: ^2.0.3
-  checksum: 305bd73c76756117b59aba121d08f413c7ff5e80fa1b98e217a3443fcddb9a232ee790e24e432b59ae7625aebcf4c47cb01c2cac872994f0b426f5bdfcd96ba9
+    dequal: "npm:^2.0.3"
+  checksum: 10/c3e1ed127cc6886fea4732e97dd6d3c3938e64180803acfb9df8955517c4943760746ffaf4020ce8f7ffaa7556a3b5f85c3769a1f5ca74a1288e02d042f9ae4e
   languageName: node
   linkType: hard
 
-"array-buffer-byte-length@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "array-buffer-byte-length@npm:1.0.0"
+"array-buffer-byte-length@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "array-buffer-byte-length@npm:1.0.1"
   dependencies:
-    call-bind: ^1.0.2
-    is-array-buffer: ^3.0.1
-  checksum: 044e101ce150f4804ad19c51d6c4d4cfa505c5b2577bd179256e4aa3f3f6a0a5e9874c78cd428ee566ac574c8a04d7ce21af9fe52e844abfdccb82b33035a7c3
+    call-bind: "npm:^1.0.5"
+    is-array-buffer: "npm:^3.0.4"
+  checksum: 10/53524e08f40867f6a9f35318fafe467c32e45e9c682ba67b11943e167344d2febc0f6977a17e699b05699e805c3e8f073d876f8bbf1b559ed494ad2cd0fae09e
   languageName: node
   linkType: hard
 
 "array-differ@npm:^3.0.0":
   version: 3.0.0
   resolution: "array-differ@npm:3.0.0"
-  checksum: 117edd9df5c1530bd116c6e8eea891d4bd02850fd89b1b36e532b6540e47ca620a373b81feca1c62d1395d9ae601516ba538abe5e8172d41091da2c546b05fb7
+  checksum: 10/117edd9df5c1530bd116c6e8eea891d4bd02850fd89b1b36e532b6540e47ca620a373b81feca1c62d1395d9ae601516ba538abe5e8172d41091da2c546b05fb7
   languageName: node
   linkType: hard
 
 "array-flatten@npm:1.1.1":
   version: 1.1.1
   resolution: "array-flatten@npm:1.1.1"
-  checksum: a9925bf3512d9dce202112965de90c222cd59a4fbfce68a0951d25d965cf44642931f40aac72309c41f12df19afa010ecadceb07cfff9ccc1621e99d89ab5f3b
-  languageName: node
-  linkType: hard
-
-"array-flatten@npm:^2.1.2":
-  version: 2.1.2
-  resolution: "array-flatten@npm:2.1.2"
-  checksum: e8988aac1fbfcdaae343d08c9a06a6fddd2c6141721eeeea45c3cf523bf4431d29a46602929455ed548c7a3e0769928cdc630405427297e7081bd118fdec9262
+  checksum: 10/e13c9d247241be82f8b4ec71d035ed7204baa82fae820d4db6948d30d3c4a9f2b3905eb2eec2b937d4aa3565200bd3a1c500480114cff649fa748747d2a50feb
   languageName: node
   linkType: hard
 
 "array-ify@npm:^1.0.0":
   version: 1.0.0
   resolution: "array-ify@npm:1.0.0"
-  checksum: c0502015b319c93dd4484f18036bcc4b654eb76a4aa1f04afbcef11ac918859bb1f5d71ba1f0f1141770db9eef1a4f40f1761753650873068010bbf7bcdae4a4
+  checksum: 10/c0502015b319c93dd4484f18036bcc4b654eb76a4aa1f04afbcef11ac918859bb1f5d71ba1f0f1141770db9eef1a4f40f1761753650873068010bbf7bcdae4a4
   languageName: node
   linkType: hard
 
-"array-includes@npm:^3.1.5, array-includes@npm:^3.1.6, array-includes@npm:^3.1.7":
+"array-includes@npm:^3.1.6, array-includes@npm:^3.1.7":
   version: 3.1.7
   resolution: "array-includes@npm:3.1.7"
   dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-    get-intrinsic: ^1.2.1
-    is-string: ^1.0.7
-  checksum: 06f9e4598fac12a919f7c59a3f04f010ea07f0b7f0585465ed12ef528a60e45f374e79d1bddbb34cdd4338357d00023ddbd0ac18b0be36964f5e726e8965d7fc
+    call-bind: "npm:^1.0.2"
+    define-properties: "npm:^1.2.0"
+    es-abstract: "npm:^1.22.1"
+    get-intrinsic: "npm:^1.2.1"
+    is-string: "npm:^1.0.7"
+  checksum: 10/856a8be5d118967665936ad33ff3b07adfc50b06753e596e91fb80c3da9b8c022e92e3cc6781156d6ad95db7109b9f603682c7df2d6a529ed01f7f6b39a4a360
   languageName: node
   linkType: hard
 
 "array-tree-filter@npm:^2.1.0":
   version: 2.1.0
   resolution: "array-tree-filter@npm:2.1.0"
-  checksum: ca65dbeb80777eadadfcd4dbd2658d9eb0be66e426a6b6d64f1a71dff5351f2e6f370e0cbcc418e9e6e01d06b337b128441a71c7143abe4d925d027d5aa0100f
+  checksum: 10/ca65dbeb80777eadadfcd4dbd2658d9eb0be66e426a6b6d64f1a71dff5351f2e6f370e0cbcc418e9e6e01d06b337b128441a71c7143abe4d925d027d5aa0100f
   languageName: node
   linkType: hard
 
 "array-union@npm:^2.1.0":
   version: 2.1.0
   resolution: "array-union@npm:2.1.0"
-  checksum: 5bee12395cba82da674931df6d0fea23c4aa4660cb3b338ced9f828782a65caa232573e6bf3968f23e0c5eb301764a382cef2f128b170a9dc59de0e36c39f98d
+  checksum: 10/5bee12395cba82da674931df6d0fea23c4aa4660cb3b338ced9f828782a65caa232573e6bf3968f23e0c5eb301764a382cef2f128b170a9dc59de0e36c39f98d
+  languageName: node
+  linkType: hard
+
+"array.prototype.findlast@npm:^1.2.4":
+  version: 1.2.4
+  resolution: "array.prototype.findlast@npm:1.2.4"
+  dependencies:
+    call-bind: "npm:^1.0.5"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.22.3"
+    es-errors: "npm:^1.3.0"
+    es-shim-unscopables: "npm:^1.0.2"
+  checksum: 10/1711e48058cabbad24cb694fa3721b760e56004758142c439880a19b9b206e3584b94bbad41e5f68e0da8785db1d09250061a46769baa90a0d2e09c05987c82d
   languageName: node
   linkType: hard
 
@@ -11340,24 +12182,24 @@ __metadata:
   version: 1.2.3
   resolution: "array.prototype.findlastindex@npm:1.2.3"
   dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-    es-shim-unscopables: ^1.0.0
-    get-intrinsic: ^1.2.1
-  checksum: 31f35d7b370c84db56484618132041a9af401b338f51899c2e78ef7690fbba5909ee7ca3c59a7192085b328cc0c68c6fd1f6d1553db01a689a589ae510f3966e
+    call-bind: "npm:^1.0.2"
+    define-properties: "npm:^1.2.0"
+    es-abstract: "npm:^1.22.1"
+    es-shim-unscopables: "npm:^1.0.0"
+    get-intrinsic: "npm:^1.2.1"
+  checksum: 10/063cbab8eeac3aa01f3e980eecb9a8c5d87723032b49f7f814ecc6d75c33c03c17e3f43a458127a62e16303cab412f95d6ad9dc7e0ae6d9dc27a9bb76c24df7a
   languageName: node
   linkType: hard
 
-"array.prototype.flat@npm:^1.3.2":
+"array.prototype.flat@npm:^1.3.1, array.prototype.flat@npm:^1.3.2":
   version: 1.3.2
   resolution: "array.prototype.flat@npm:1.3.2"
   dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-    es-shim-unscopables: ^1.0.0
-  checksum: 5d6b4bf102065fb3f43764bfff6feb3295d372ce89591e6005df3d0ce388527a9f03c909af6f2a973969a4d178ab232ffc9236654149173e0e187ec3a1a6b87b
+    call-bind: "npm:^1.0.2"
+    define-properties: "npm:^1.2.0"
+    es-abstract: "npm:^1.22.1"
+    es-shim-unscopables: "npm:^1.0.0"
+  checksum: 10/d9d2f6f27584de92ec7995bc931103e6de722cd2498bdbfc4cba814fc3e52f056050a93be883018811f7c0a35875f5056584a0e940603a5e5934f0279896aebe
   languageName: node
   linkType: hard
 
@@ -11365,67 +12207,73 @@ __metadata:
   version: 1.3.2
   resolution: "array.prototype.flatmap@npm:1.3.2"
   dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-    es-shim-unscopables: ^1.0.0
-  checksum: ce09fe21dc0bcd4f30271f8144083aa8c13d4639074d6c8dc82054b847c7fc9a0c97f857491f4da19d4003e507172a78f4bcd12903098adac8b9cd374f734be3
+    call-bind: "npm:^1.0.2"
+    define-properties: "npm:^1.2.0"
+    es-abstract: "npm:^1.22.1"
+    es-shim-unscopables: "npm:^1.0.0"
+  checksum: 10/33f20006686e0cbe844fde7fd290971e8366c6c5e3380681c2df15738b1df766dd02c7784034aeeb3b037f65c496ee54de665388288edb323a2008bb550f77ea
   languageName: node
   linkType: hard
 
-"array.prototype.tosorted@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "array.prototype.tosorted@npm:1.1.1"
+"array.prototype.toreversed@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "array.prototype.toreversed@npm:1.1.2"
   dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    es-abstract: ^1.20.4
-    es-shim-unscopables: ^1.0.0
-    get-intrinsic: ^1.1.3
-  checksum: 7923324a67e70a2fc0a6e40237405d92395e45ebd76f5cb89c2a5cf1e66b47aca6baacd0cd628ffd88830b90d47fff268071493d09c9ae123645613dac2c2ca3
+    call-bind: "npm:^1.0.2"
+    define-properties: "npm:^1.2.0"
+    es-abstract: "npm:^1.22.1"
+    es-shim-unscopables: "npm:^1.0.0"
+  checksum: 10/b4076d687ddc22c191863ce105d320cc4b0e1435bfda9ffeeff681682fe88fa6fe30e0d2ae94fa4b2d7fad901e1954ea4f75c1cab217db4848da84a2b5889192
   languageName: node
   linkType: hard
 
-"arraybuffer.prototype.slice@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "arraybuffer.prototype.slice@npm:1.0.2"
+"array.prototype.tosorted@npm:^1.1.1, array.prototype.tosorted@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "array.prototype.tosorted@npm:1.1.3"
+  dependencies:
+    call-bind: "npm:^1.0.5"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.22.3"
+    es-errors: "npm:^1.1.0"
+    es-shim-unscopables: "npm:^1.0.2"
+  checksum: 10/9a5b7909a9ddd02a5f5489911766c314a11fb40f8f5106bdbedf6c21898763faeb78ba3af53f7038f288de9161d2605ad10d8b720e07f71a7ed1de49f39c0897
+  languageName: node
+  linkType: hard
+
+"arraybuffer.prototype.slice@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "arraybuffer.prototype.slice@npm:1.0.3"
   dependencies:
-    array-buffer-byte-length: ^1.0.0
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-    get-intrinsic: ^1.2.1
-    is-array-buffer: ^3.0.2
-    is-shared-array-buffer: ^1.0.2
-  checksum: c200faf437786f5b2c80d4564ff5481c886a16dee642ef02abdc7306c7edd523d1f01d1dd12b769c7eb42ac9bc53874510db19a92a2c035c0f6696172aafa5d3
+    array-buffer-byte-length: "npm:^1.0.1"
+    call-bind: "npm:^1.0.5"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.22.3"
+    es-errors: "npm:^1.2.1"
+    get-intrinsic: "npm:^1.2.3"
+    is-array-buffer: "npm:^3.0.4"
+    is-shared-array-buffer: "npm:^1.0.2"
+  checksum: 10/0221f16c1e3ec7b67da870ee0e1f12b825b5f9189835392b59a22990f715827561a4f4cd5330dc7507de272d8df821be6cd4b0cb569babf5ea4be70e365a2f3d
   languageName: node
   linkType: hard
 
 "arrify@npm:^1.0.1":
   version: 1.0.1
   resolution: "arrify@npm:1.0.1"
-  checksum: 745075dd4a4624ff0225c331dacb99be501a515d39bcb7c84d24660314a6ec28e68131b137e6f7e16318170842ce97538cd298fc4cd6b2cc798e0b957f2747e7
+  checksum: 10/745075dd4a4624ff0225c331dacb99be501a515d39bcb7c84d24660314a6ec28e68131b137e6f7e16318170842ce97538cd298fc4cd6b2cc798e0b957f2747e7
   languageName: node
   linkType: hard
 
 "arrify@npm:^2.0.1":
   version: 2.0.1
   resolution: "arrify@npm:2.0.1"
-  checksum: 067c4c1afd182806a82e4c1cb8acee16ab8b5284fbca1ce29408e6e91281c36bb5b612f6ddfbd40a0f7a7e0c75bf2696eb94c027f6e328d6e9c52465c98e4209
-  languageName: node
-  linkType: hard
-
-"asap@npm:^2.0.0":
-  version: 2.0.6
-  resolution: "asap@npm:2.0.6"
-  checksum: b296c92c4b969e973260e47523207cd5769abd27c245a68c26dc7a0fe8053c55bb04360237cb51cab1df52be939da77150ace99ad331fb7fb13b3423ed73ff3d
+  checksum: 10/067c4c1afd182806a82e4c1cb8acee16ab8b5284fbca1ce29408e6e91281c36bb5b612f6ddfbd40a0f7a7e0c75bf2696eb94c027f6e328d6e9c52465c98e4209
   languageName: node
   linkType: hard
 
 "asap@npm:~1.0.0":
   version: 1.0.0
   resolution: "asap@npm:1.0.0"
-  checksum: 5e8fe70a867c0f76f77be6a856eb4bad52113db494c5c1e12ba258bd23dd125030849896b4750a8b0f81531407b74f9694905c535358179ae26ceecfb79aa9ed
+  checksum: 10/2844bc7ea09aa1840d7b415cb5f3b3a2a3ecd35c7b865a94a2ed4f09d2af763001d70951f950e495ee0a54b8284ffc8c01d2f39ecb0ae7d48ce74783d7cf9279
   languageName: node
   linkType: hard
 
@@ -11433,15 +12281,15 @@ __metadata:
   version: 0.2.6
   resolution: "asn1@npm:0.2.6"
   dependencies:
-    safer-buffer: ~2.1.0
-  checksum: 39f2ae343b03c15ad4f238ba561e626602a3de8d94ae536c46a4a93e69578826305366dc09fbb9b56aec39b4982a463682f259c38e59f6fa380cd72cd61e493d
+    safer-buffer: "npm:~2.1.0"
+  checksum: 10/cf629291fee6c1a6f530549939433ebf32200d7849f38b810ff26ee74235e845c0c12b2ed0f1607ac17383d19b219b69cefa009b920dab57924c5c544e495078
   languageName: node
   linkType: hard
 
 "assert-plus@npm:1.0.0, assert-plus@npm:^1.0.0":
   version: 1.0.0
   resolution: "assert-plus@npm:1.0.0"
-  checksum: 19b4340cb8f0e6a981c07225eacac0e9d52c2644c080198765d63398f0075f83bbc0c8e95474d54224e297555ad0d631c1dcd058adb1ddc2437b41a6b424ac64
+  checksum: 10/f4f991ae2df849cc678b1afba52d512a7cbf0d09613ba111e72255409ff9158550c775162a47b12d015d1b82b3c273e8e25df0e4783d3ddb008a293486d00a07
   languageName: node
   linkType: hard
 
@@ -11449,18 +12297,18 @@ __metadata:
   version: 2.0.0
   resolution: "assert@npm:2.0.0"
   dependencies:
-    es6-object-assign: ^1.1.0
-    is-nan: ^1.2.1
-    object-is: ^1.0.1
-    util: ^0.12.0
-  checksum: bb91f181a86d10588ee16c5e09c280f9811373974c29974cbe401987ea34e966699d7989a812b0e19377b511ea0bc627f5905647ce569311824848ede382cae8
+    es6-object-assign: "npm:^1.1.0"
+    is-nan: "npm:^1.2.1"
+    object-is: "npm:^1.0.1"
+    util: "npm:^0.12.0"
+  checksum: 10/5bd5e80a0dc5fce9ac812254ad39bcec8c224878705e5021a1a0ae84e2c30b980f90584ef544a5f6b1cd79edb002e80972367731260dac723c7a6f76e0fcd2ea
   languageName: node
   linkType: hard
 
-"ast-types-flow@npm:^0.0.7":
-  version: 0.0.7
-  resolution: "ast-types-flow@npm:0.0.7"
-  checksum: a26dcc2182ffee111cad7c471759b0bda22d3b7ebacf27c348b22c55f16896b18ab0a4d03b85b4020dce7f3e634b8f00b593888f622915096ea1927fa51866c4
+"ast-types-flow@npm:^0.0.8":
+  version: 0.0.8
+  resolution: "ast-types-flow@npm:0.0.8"
+  checksum: 10/85a1c24af4707871c27cfe456bd2ff7fcbe678f3d1c878ac968c9557735a171a17bdcc8c8f903ceab3fc3c49d5b3da2194e6ab0a6be7fec0e133fa028f21ba1b
   languageName: node
   linkType: hard
 
@@ -11468,8 +12316,8 @@ __metadata:
   version: 0.15.2
   resolution: "ast-types@npm:0.15.2"
   dependencies:
-    tslib: ^2.0.1
-  checksum: 24f0d86bf9e4c8dae16fa24b13c1776f2c2677040bcfbd4eb4f27911db49020be4876885e45e6cfcc548ed4dfea3a0742d77e3346b84fae47379cb0b89e9daa0
+    tslib: "npm:^2.0.1"
+  checksum: 10/81680bd5829cdec33524e9aa3434e23f3919c0c388927068a0ff2e8466f55b0f34eae53e0007b3668742910c289481ab4e1d486a5318f618ae2fc93b5e7e863b
   languageName: node
   linkType: hard
 
@@ -11477,8 +12325,8 @@ __metadata:
   version: 0.14.2
   resolution: "ast-types@npm:0.14.2"
   dependencies:
-    tslib: ^2.0.1
-  checksum: 8674a77307764979f0a0b2006b7223a4b789abffaa7acbf6a1132650a799252155170173a1ff6a7fb6897f59437fc955f2707bdfc391b0797750898876e6c9ed
+    tslib: "npm:^2.0.1"
+  checksum: 10/7c74b3090c90aa600b49a7a8cecc99e329f190600bcaa75ad087472a1a5a7ef23795a17ea00a74c2a8e822b336cd4f874e2e1b815a9877b4dba5e401566b0433
   languageName: node
   linkType: hard
 
@@ -11486,22 +12334,22 @@ __metadata:
   version: 0.16.1
   resolution: "ast-types@npm:0.16.1"
   dependencies:
-    tslib: ^2.0.1
-  checksum: 21c186da9fdb1d8087b1b7dabbc4059f91aa5a1e593a9776b4393cc1eaa857e741b2dda678d20e34b16727b78fef3ab59cf8f0c75ed1ba649c78fe194e5c114b
+    tslib: "npm:^2.0.1"
+  checksum: 10/f569b475eb1c8cb93888cb6e7b7e36dc43fa19a77e4eb132cbff6e3eb1598ca60f850db6e60b070e5a0ee8c1559fca921dac0916e576f2f104e198793b0bdd8d
   languageName: node
   linkType: hard
 
 "astral-regex@npm:^2.0.0":
   version: 2.0.0
   resolution: "astral-regex@npm:2.0.0"
-  checksum: 876231688c66400473ba505731df37ea436e574dd524520294cc3bbc54ea40334865e01fa0d074d74d036ee874ee7e62f486ea38bc421ee8e6a871c06f011766
+  checksum: 10/876231688c66400473ba505731df37ea436e574dd524520294cc3bbc54ea40334865e01fa0d074d74d036ee874ee7e62f486ea38bc421ee8e6a871c06f011766
   languageName: node
   linkType: hard
 
 "async-limiter@npm:~1.0.0":
   version: 1.0.1
   resolution: "async-limiter@npm:1.0.1"
-  checksum: 2b849695b465d93ad44c116220dee29a5aeb63adac16c1088983c339b0de57d76e82533e8e364a93a9f997f28bbfc6a92948cefc120652bd07f3b59f8d75cf2b
+  checksum: 10/2b849695b465d93ad44c116220dee29a5aeb63adac16c1088983c339b0de57d76e82533e8e364a93a9f997f28bbfc6a92948cefc120652bd07f3b59f8d75cf2b
   languageName: node
   linkType: hard
 
@@ -11509,15 +12357,15 @@ __metadata:
   version: 2.6.4
   resolution: "async@npm:2.6.4"
   dependencies:
-    lodash: ^4.17.14
-  checksum: a52083fb32e1ebe1d63e5c5624038bb30be68ff07a6c8d7dfe35e47c93fc144bd8652cbec869e0ac07d57dde387aa5f1386be3559cdee799cb1f789678d88e19
+    lodash: "npm:^4.17.14"
+  checksum: 10/df8e52817d74677ab50c438d618633b9450aff26deb274da6dfedb8014130909482acdc7753bce9b72e6171ce9a9f6a92566c4ced34c3cb3714d57421d58ad27
   languageName: node
   linkType: hard
 
 "async@npm:^3.2.0, async@npm:^3.2.3":
   version: 3.2.4
   resolution: "async@npm:3.2.4"
-  checksum: 43d07459a4e1d09b84a20772414aa684ff4de085cbcaec6eea3c7a8f8150e8c62aa6cd4e699fe8ee93c3a5b324e777d34642531875a0817a35697522c1b02e89
+  checksum: 10/bebb5dc2258c45b83fa1d3be179ae0eb468e1646a62d443c8d60a45e84041b28fccebe1e2d1f234bfc3dcad44e73dcdbf4ba63d98327c9f6556e3dbd47c2ae8b
   languageName: node
   linkType: hard
 
@@ -11525,22 +12373,22 @@ __metadata:
   version: 1.0.0
   resolution: "asynciterator.prototype@npm:1.0.0"
   dependencies:
-    has-symbols: ^1.0.3
-  checksum: e8ebfd9493ac651cf9b4165e9d64030b3da1d17181bb1963627b59e240cdaf021d9b59d44b827dc1dde4e22387ec04c2d0f8720cf58a1c282e34e40cc12721b3
+    has-symbols: "npm:^1.0.3"
+  checksum: 10/e8ebfd9493ac651cf9b4165e9d64030b3da1d17181bb1963627b59e240cdaf021d9b59d44b827dc1dde4e22387ec04c2d0f8720cf58a1c282e34e40cc12721b3
   languageName: node
   linkType: hard
 
 "asynckit@npm:^0.4.0":
   version: 0.4.0
   resolution: "asynckit@npm:0.4.0"
-  checksum: 7b78c451df768adba04e2d02e63e2d0bf3b07adcd6e42b4cf665cb7ce899bedd344c69a1dcbce355b5f972d597b25aaa1c1742b52cffd9caccb22f348114f6be
+  checksum: 10/3ce727cbc78f69d6a4722517a58ee926c8c21083633b1d3fdf66fd688f6c127a53a592141bd4866f9b63240a86e9d8e974b13919450bd17fa33c2d22c4558ad8
   languageName: node
   linkType: hard
 
 "at-least-node@npm:^1.0.0":
   version: 1.0.0
   resolution: "at-least-node@npm:1.0.0"
-  checksum: 463e2f8e43384f1afb54bc68485c436d7622acec08b6fad269b421cb1d29cebb5af751426793d0961ed243146fe4dc983402f6d5a51b720b277818dbf6f2e49e
+  checksum: 10/463e2f8e43384f1afb54bc68485c436d7622acec08b6fad269b421cb1d29cebb5af751426793d0961ed243146fe4dc983402f6d5a51b720b277818dbf6f2e49e
   languageName: node
   linkType: hard
 
@@ -11549,79 +12397,82 @@ __metadata:
   resolution: "atob@npm:2.1.2"
   bin:
     atob: bin/atob.js
-  checksum: dfeeeb70090c5ebea7be4b9f787f866686c645d9f39a0d184c817252d0cf08455ed25267d79c03254d3be1f03ac399992a792edcd5ffb9c91e097ab5ef42833a
+  checksum: 10/0624406cc0295533b38b60ab2e3b028aa7b8225f37e0cde6be3bc5c13a8015c889b192e874fd7660671179cef055f2e258855f372b0e495bd4096cf0b4785c25
   languageName: node
   linkType: hard
 
 "attr-accept@npm:^2.2.2":
   version: 2.2.2
   resolution: "attr-accept@npm:2.2.2"
-  checksum: 496f7249354ab53e522510c1dc8f67a1887382187adde4dc205507d2f014836a247073b05e9d9ea51e2e9c7f71b0d2aa21730af80efa9af2d68303e5f0565c4d
+  checksum: 10/c867ed41ed749988ad2a6fc70eb2498b9c3c2d58aaad2a8d05422a383058f9d29e50c4bca363c5ee7433df738a7920cc95377bbce8678e817fb498299dd82010
   languageName: node
   linkType: hard
 
-"autoprefixer@npm:10.4.14":
-  version: 10.4.14
-  resolution: "autoprefixer@npm:10.4.14"
+"autoprefixer@npm:10.4.19":
+  version: 10.4.19
+  resolution: "autoprefixer@npm:10.4.19"
   dependencies:
-    browserslist: ^4.21.5
-    caniuse-lite: ^1.0.30001464
-    fraction.js: ^4.2.0
-    normalize-range: ^0.1.2
-    picocolors: ^1.0.0
-    postcss-value-parser: ^4.2.0
+    browserslist: "npm:^4.23.0"
+    caniuse-lite: "npm:^1.0.30001599"
+    fraction.js: "npm:^4.3.7"
+    normalize-range: "npm:^0.1.2"
+    picocolors: "npm:^1.0.0"
+    postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.1.0
   bin:
     autoprefixer: bin/autoprefixer
-  checksum: e9f18e664a4e4a54a8f4ec5f6b49ed228ec45afaa76efcae361c93721795dc5ab644f36d2fdfc0dea446b02a8067b9372f91542ea431994399e972781ed46d95
+  checksum: 10/98378eae37b8bf0f1515e4c91b4c9c1ce69ede311d4dea7e934f5afe147d23712c577f112c4019a4c40461c585d82d474d08044f8eb6cb8a063c3d5b7aca52d2
   languageName: node
   linkType: hard
 
-"available-typed-arrays@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "available-typed-arrays@npm:1.0.5"
-  checksum: 20eb47b3cefd7db027b9bbb993c658abd36d4edd3fe1060e83699a03ee275b0c9b216cc076ff3f2db29073225fb70e7613987af14269ac1fe2a19803ccc97f1a
+"available-typed-arrays@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "available-typed-arrays@npm:1.0.7"
+  dependencies:
+    possible-typed-array-names: "npm:^1.0.0"
+  checksum: 10/6c9da3a66caddd83c875010a1ca8ef11eac02ba15fb592dc9418b2b5e7b77b645fa7729380a92d9835c2f05f2ca1b6251f39b993e0feb3f1517c74fa1af02cab
   languageName: node
   linkType: hard
 
 "aws-sign2@npm:~0.7.0":
   version: 0.7.0
   resolution: "aws-sign2@npm:0.7.0"
-  checksum: b148b0bb0778098ad8cf7e5fc619768bcb51236707ca1d3e5b49e41b171166d8be9fdc2ea2ae43d7decf02989d0aaa3a9c4caa6f320af95d684de9b548a71525
+  checksum: 10/2ac497d739f71be3264cf096a33ab256a1fea7fe80b87dc51ec29374505bd5a661279ef1c22989d68528ea61ed634021ca63b31cf1d3c2a3682ffc106f7d0e96
   languageName: node
   linkType: hard
 
 "aws4@npm:^1.8.0":
   version: 1.12.0
   resolution: "aws4@npm:1.12.0"
-  checksum: 68f79708ac7c335992730bf638286a3ee0a645cf12575d557860100767c500c08b30e24726b9f03265d74116417f628af78509e1333575e9f8d52a80edfe8cbc
+  checksum: 10/2b8455fe1eee87f0e7d5f32e81e7fec74dce060c72d03f528c8c631fa74209cef53aab6fede182ea17d0c9520cb1e5e3023c5fedb4f1139ae9f067fc720869a5
   languageName: node
   linkType: hard
 
-"axe-core@npm:^4.2.0, axe-core@npm:^4.6.2":
-  version: 4.6.3
-  resolution: "axe-core@npm:4.6.3"
-  checksum: d0c46be92b9707c48b88a53cd5f471b155a2bfc8bf6beffb514ecd14e30b4863e340b5fc4f496d82a3c562048088c1f3ff5b93b9b3b026cb9c3bfacfd535da10
+"axe-core@npm:=4.7.0, axe-core@npm:^4.2.0":
+  version: 4.7.0
+  resolution: "axe-core@npm:4.7.0"
+  checksum: 10/615c0f7722c3c9fcf353dbd70b00e2ceae234d4c17cbc839dd85c01d16797c4e4da45f8d27c6118e9e6b033fb06efd196106e13651a1b2f3a10e0f11c7b2f660
   languageName: node
   linkType: hard
 
-"axios@npm:^0.27.2":
-  version: 0.27.2
-  resolution: "axios@npm:0.27.2"
+"axios@npm:^1.6.0":
+  version: 1.6.7
+  resolution: "axios@npm:1.6.7"
   dependencies:
-    follow-redirects: ^1.14.9
-    form-data: ^4.0.0
-  checksum: 38cb7540465fe8c4102850c4368053c21683af85c5fdf0ea619f9628abbcb59415d1e22ebc8a6390d2bbc9b58a9806c874f139767389c862ec9b772235f06854
+    follow-redirects: "npm:^1.15.4"
+    form-data: "npm:^4.0.0"
+    proxy-from-env: "npm:^1.1.0"
+  checksum: 10/a1932b089ece759cd261f175d9ebf4d41c8994cf0c0767cda86055c7a19bcfdade8ae3464bf4cec4c8b142f4a657dc664fb77a41855e8376cf38b86d7a86518f
   languageName: node
   linkType: hard
 
-"axobject-query@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "axobject-query@npm:3.1.1"
+"axobject-query@npm:^3.2.1":
+  version: 3.2.1
+  resolution: "axobject-query@npm:3.2.1"
   dependencies:
-    deep-equal: ^2.0.5
-  checksum: c12a5da10dc7bab75e1cda9b6a3b5fcf10eba426ddf1a17b71ef65a434ed707ede7d1c4f013ba1609e970bc8c0cddac01365080d376204314e9b294719acd8a5
+    dequal: "npm:^2.0.3"
+  checksum: 10/675af2548ed4ece75ad6d50cc0473cfdec7579eac77ec9861e7088d03ffb171aa697b70d2877423bee2ce16460ef62c698c6442a105612cc015719e8ea06b0bd
   languageName: node
   linkType: hard
 
@@ -11630,7 +12481,7 @@ __metadata:
   resolution: "babel-core@npm:7.0.0-bridge.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 2a1cb879019dffb08d17bec36e13c3a6d74c94773f41c1fd8b14de13f149cc34b705b0a1e07b42fcf35917b49d78db6ff0c5c3b00b202a5235013d517b5c6bbb
+  checksum: 10/2a1cb879019dffb08d17bec36e13c3a6d74c94773f41c1fd8b14de13f149cc34b705b0a1e07b42fcf35917b49d78db6ff0c5c3b00b202a5235013d517b5c6bbb
   languageName: node
   linkType: hard
 
@@ -11638,16 +12489,16 @@ __metadata:
   version: 29.7.0
   resolution: "babel-jest@npm:29.7.0"
   dependencies:
-    "@jest/transform": ^29.7.0
-    "@types/babel__core": ^7.1.14
-    babel-plugin-istanbul: ^6.1.1
-    babel-preset-jest: ^29.6.3
-    chalk: ^4.0.0
-    graceful-fs: ^4.2.9
-    slash: ^3.0.0
+    "@jest/transform": "npm:^29.7.0"
+    "@types/babel__core": "npm:^7.1.14"
+    babel-plugin-istanbul: "npm:^6.1.1"
+    babel-preset-jest: "npm:^29.6.3"
+    chalk: "npm:^4.0.0"
+    graceful-fs: "npm:^4.2.9"
+    slash: "npm:^3.0.0"
   peerDependencies:
     "@babel/core": ^7.8.0
-  checksum: ee6f8e0495afee07cac5e4ee167be705c711a8cc8a737e05a587a131fdae2b3c8f9aa55dfd4d9c03009ac2d27f2de63d8ba96d3e8460da4d00e8af19ef9a83f7
+  checksum: 10/8a0953bd813b3a8926008f7351611055548869e9a53dd36d6e7e96679001f71e65fd7dbfe253265c3ba6a4e630dc7c845cf3e78b17d758ef1880313ce8fba258
   languageName: node
   linkType: hard
 
@@ -11655,30 +12506,31 @@ __metadata:
   version: 9.1.3
   resolution: "babel-loader@npm:9.1.3"
   dependencies:
-    find-cache-dir: ^4.0.0
-    schema-utils: ^4.0.0
+    find-cache-dir: "npm:^4.0.0"
+    schema-utils: "npm:^4.0.0"
   peerDependencies:
     "@babel/core": ^7.12.0
     webpack: ">=5"
-  checksum: b168dde5b8cf11206513371a79f86bb3faa7c714e6ec9fffd420876b61f3d7f5f4b976431095ef6a14bc4d324505126deb91045fd41e312ba49f4deaa166fe28
+  checksum: 10/7086e678273b5d1261141dca84ed784caab9f7921c8c24d7278c8ee3088235a9a9fd85caac9f0fa687336cb3c27248ca22dbf431469769b1b995d55aec606992
   languageName: node
   linkType: hard
 
-"babel-plugin-add-react-displayname@npm:^0.0.5":
-  version: 0.0.5
-  resolution: "babel-plugin-add-react-displayname@npm:0.0.5"
-  checksum: a5b52aa14327b1fa2949f32140cd1b0b283b2035881453d71dcedc825a7378aa3a578bff5f76d1632875eedb40612dc4e71585852ce5cb3c2869c180643fd001
+"babel-merge@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "babel-merge@npm:3.0.0"
+  dependencies:
+    deepmerge: "npm:^2.2.1"
+    object.omit: "npm:^3.0.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10/f703cd0f497e0be19954679922f6397ea02e3c2dc9d6702bdbdf2646b48e6b2234ca9444c3ae8992739d2fe84c215637d1226ade9a4b735a19e5bd111cdfc048
   languageName: node
   linkType: hard
 
-"babel-plugin-angularjs-annotate@npm:0.10.0":
-  version: 0.10.0
-  resolution: "babel-plugin-angularjs-annotate@npm:0.10.0"
-  dependencies:
-    "@babel/code-frame": ^7.0.0
-    "@babel/types": ^7.2.0
-    simple-is: ~0.2.0
-  checksum: 09a730159e5764a9b5cfa9353387d314784c90355da4ac9edc631a14a7473fcf7622dffba16097a30a8bf4fdb784ed15f0f8a8bcea874c25104e074323724f1a
+"babel-plugin-add-react-displayname@npm:^0.0.5":
+  version: 0.0.5
+  resolution: "babel-plugin-add-react-displayname@npm:0.0.5"
+  checksum: 10/5aa2dfa89da8091f7b372861b2f19a333abd3a321ac60b2b438589f81a5924c3551764526d894438e020e832b5490b0de81af8583b475bed6c70532903026bc3
   languageName: node
   linkType: hard
 
@@ -11686,17 +12538,17 @@ __metadata:
   version: 10.2.2
   resolution: "babel-plugin-emotion@npm:10.2.2"
   dependencies:
-    "@babel/helper-module-imports": ^7.0.0
-    "@emotion/hash": 0.8.0
-    "@emotion/memoize": 0.7.4
-    "@emotion/serialize": ^0.11.16
-    babel-plugin-macros: ^2.0.0
-    babel-plugin-syntax-jsx: ^6.18.0
-    convert-source-map: ^1.5.0
-    escape-string-regexp: ^1.0.5
-    find-root: ^1.1.0
-    source-map: ^0.5.7
-  checksum: 763f38c67ffbe7d091691d68c74686ba478296cc24716699fb5b0feddce1b1b47878a20b0bbe2aa4dea17f41074ead4deae7935d2cf6823638766709812c5b40
+    "@babel/helper-module-imports": "npm:^7.0.0"
+    "@emotion/hash": "npm:0.8.0"
+    "@emotion/memoize": "npm:0.7.4"
+    "@emotion/serialize": "npm:^0.11.16"
+    babel-plugin-macros: "npm:^2.0.0"
+    babel-plugin-syntax-jsx: "npm:^6.18.0"
+    convert-source-map: "npm:^1.5.0"
+    escape-string-regexp: "npm:^1.0.5"
+    find-root: "npm:^1.1.0"
+    source-map: "npm:^0.5.7"
+  checksum: 10/c0f8735dda2bd839bdaa5f87ff3ccabf74f588c1bd61a0ea199ff6d183c21334758efdb10dc331b939dad42c0bfc1b49c938b7d6a1572146c08ef129a1e2284d
   languageName: node
   linkType: hard
 
@@ -11704,12 +12556,12 @@ __metadata:
   version: 6.1.1
   resolution: "babel-plugin-istanbul@npm:6.1.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.0.0
-    "@istanbuljs/load-nyc-config": ^1.0.0
-    "@istanbuljs/schema": ^0.1.2
-    istanbul-lib-instrument: ^5.0.4
-    test-exclude: ^6.0.0
-  checksum: cb4fd95738219f232f0aece1116628cccff16db891713c4ccb501cddbbf9272951a5df81f2f2658dfdf4b3e7b236a9d5cbcf04d5d8c07dd5077297339598061a
+    "@babel/helper-plugin-utils": "npm:^7.0.0"
+    "@istanbuljs/load-nyc-config": "npm:^1.0.0"
+    "@istanbuljs/schema": "npm:^0.1.2"
+    istanbul-lib-instrument: "npm:^5.0.4"
+    test-exclude: "npm:^6.0.0"
+  checksum: 10/ffd436bb2a77bbe1942a33245d770506ab2262d9c1b3c1f1da7f0592f78ee7445a95bc2efafe619dd9c1b6ee52c10033d6c7d29ddefe6f5383568e60f31dfe8d
   languageName: node
   linkType: hard
 
@@ -11717,76 +12569,99 @@ __metadata:
   version: 29.6.3
   resolution: "babel-plugin-jest-hoist@npm:29.6.3"
   dependencies:
-    "@babel/template": ^7.3.3
-    "@babel/types": ^7.3.3
-    "@types/babel__core": ^7.1.14
-    "@types/babel__traverse": ^7.0.6
-  checksum: 51250f22815a7318f17214a9d44650ba89551e6d4f47a2dc259128428324b52f5a73979d010cefd921fd5a720d8c1d55ad74ff601cd94c7bd44d5f6292fde2d1
+    "@babel/template": "npm:^7.3.3"
+    "@babel/types": "npm:^7.3.3"
+    "@types/babel__core": "npm:^7.1.14"
+    "@types/babel__traverse": "npm:^7.0.6"
+  checksum: 10/9bfa86ec4170bd805ab8ca5001ae50d8afcb30554d236ba4a7ffc156c1a92452e220e4acbd98daefc12bf0216fccd092d0a2efed49e7e384ec59e0597a926d65
   languageName: node
   linkType: hard
 
-"babel-plugin-macros@npm:3.1.0, babel-plugin-macros@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "babel-plugin-macros@npm:3.1.0"
+"babel-plugin-macros@npm:^2.0.0":
+  version: 2.8.0
+  resolution: "babel-plugin-macros@npm:2.8.0"
   dependencies:
-    "@babel/runtime": ^7.12.5
-    cosmiconfig: ^7.0.0
-    resolve: ^1.19.0
-  checksum: 765de4abebd3e4688ebdfbff8571ddc8cd8061f839bb6c3e550b0344a4027b04c60491f843296ce3f3379fb356cc873d57a9ee6694262547eb822c14a25be9a6
+    "@babel/runtime": "npm:^7.7.2"
+    cosmiconfig: "npm:^6.0.0"
+    resolve: "npm:^1.12.0"
+  checksum: 10/ef1e7a8870f38ec255b9e85a21fc2f1adc8a8a494c3b715ce01fd34cb36fb58b75fd4701dc01807bd8f0bd475364565eb9d3247b53921e39fedc8511aa647af0
   languageName: node
   linkType: hard
 
-"babel-plugin-macros@npm:^2.0.0":
-  version: 2.8.0
-  resolution: "babel-plugin-macros@npm:2.8.0"
+"babel-plugin-macros@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "babel-plugin-macros@npm:3.1.0"
   dependencies:
-    "@babel/runtime": ^7.7.2
-    cosmiconfig: ^6.0.0
-    resolve: ^1.12.0
-  checksum: 59b09a21cf3ae1e14186c1b021917d004b49b953824b24953a54c6502da79e8051d4ac31cfd4a0ae7f6ea5ddf1f7edd93df4895dd3c3982a5b2431859c2889ac
+    "@babel/runtime": "npm:^7.12.5"
+    cosmiconfig: "npm:^7.0.0"
+    resolve: "npm:^1.19.0"
+  checksum: 10/30be6ca45e9a124c58ca00af9a0753e5410ec0b79a737714fc4722bbbeb693e55d9258f05c437145ef4a867c2d1603e06a1c292d66c243ce1227458c8ea2ca8c
   languageName: node
   linkType: hard
 
 "babel-plugin-named-exports-order@npm:^0.0.2":
   version: 0.0.2
   resolution: "babel-plugin-named-exports-order@npm:0.0.2"
-  checksum: d918390a09c0148893ea93bdc9c4fc6a03447c688eaf40bed0f0682d036e985ecee830b90fec2ab149b8dc0cb3220a2c0ac5054e42626bdfe0b436b505b7ef22
+  checksum: 10/8e7bb1e8109d5f7ef7a579256adc93f9af095537d78b08bed3c439f1d02c3f9332e4cdbaf324e178fdee03a60b9489ce49482e5b75f71d79642e2e382f58bb02
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs2@npm:^0.4.6":
-  version: 0.4.6
-  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.6"
+"babel-plugin-polyfill-corejs2@npm:^0.4.10, babel-plugin-polyfill-corejs2@npm:^0.4.6":
+  version: 0.4.10
+  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.10"
   dependencies:
-    "@babel/compat-data": ^7.22.6
-    "@babel/helper-define-polyfill-provider": ^0.4.3
-    semver: ^6.3.1
+    "@babel/compat-data": "npm:^7.22.6"
+    "@babel/helper-define-polyfill-provider": "npm:^0.6.1"
+    semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 08896811df31530be6a9bcdd630cb9fd4b5ae5181039d18db3796efbc54e38d57a42af460845c10a04434e1bc45c0d47743c7e6c860383cc6b141083cde22030
+  checksum: 10/9fb5e59a3235eba66fb05060b2a3ecd6923084f100df7526ab74b6272347d7adcf99e17366b82df36e592cde4e82fdb7ae24346a990eced76c7d504cac243400
+  languageName: node
+  linkType: hard
+
+"babel-plugin-polyfill-corejs3@npm:^0.10.4":
+  version: 0.10.4
+  resolution: "babel-plugin-polyfill-corejs3@npm:0.10.4"
+  dependencies:
+    "@babel/helper-define-polyfill-provider": "npm:^0.6.1"
+    core-js-compat: "npm:^3.36.1"
+  peerDependencies:
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: 10/a69ed5a95bb55e9b7ea37307d56113f7e24054d479c15de6d50fa61388b5334bed1f9b6414cde6c575fa910a4de4d1ab4f2d22720967d57c4fec9d1b8f61b355
   languageName: node
   linkType: hard
 
 "babel-plugin-polyfill-corejs3@npm:^0.8.5":
-  version: 0.8.5
-  resolution: "babel-plugin-polyfill-corejs3@npm:0.8.5"
+  version: 0.8.7
+  resolution: "babel-plugin-polyfill-corejs3@npm:0.8.7"
   dependencies:
-    "@babel/helper-define-polyfill-provider": ^0.4.3
-    core-js-compat: ^3.32.2
+    "@babel/helper-define-polyfill-provider": "npm:^0.4.4"
+    core-js-compat: "npm:^3.33.1"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 54ff3956c4f88e483d38b27ceec6199b9e73fceac10ebf969469d215e6a62929384e4433f85335c9a6ba809329636e27f9bdae2f54075f833e7a745341c07d84
+  checksum: 10/defbc6de3d309c9639dd31223b5011707fcc0384037ac5959a1aefe16eb314562e1c1e5cfbce0af14a220d639ef92dfe5baf66664e9e6054656aca2841677622
   languageName: node
   linkType: hard
 
 "babel-plugin-polyfill-regenerator@npm:^0.5.3":
-  version: 0.5.3
-  resolution: "babel-plugin-polyfill-regenerator@npm:0.5.3"
+  version: 0.5.5
+  resolution: "babel-plugin-polyfill-regenerator@npm:0.5.5"
   dependencies:
-    "@babel/helper-define-polyfill-provider": ^0.4.3
+    "@babel/helper-define-polyfill-provider": "npm:^0.5.0"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 2bb546582cda1870d19e646a7183baeb2cccd56e0ef3e4eaeabd28e120daf17cb87399194a9ccdcf32506bcaa68d23e73440fc8ab990a7a0f8c5a77c12d5d4bc
+  checksum: 10/3a9b4828673b23cd648dcfb571eadcd9d3fadfca0361d0a7c6feeb5a30474e92faaa49f067a6e1c05e49b6a09812879992028ff3ef3446229ff132d6e1de7eb6
+  languageName: node
+  linkType: hard
+
+"babel-plugin-polyfill-regenerator@npm:^0.6.1":
+  version: 0.6.1
+  resolution: "babel-plugin-polyfill-regenerator@npm:0.6.1"
+  dependencies:
+    "@babel/helper-define-polyfill-provider": "npm:^0.6.1"
+  peerDependencies:
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: 10/9df4a8e9939dd419fed3d9ea26594b4479f2968f37c225e1b2aa463001d7721f5537740e6622909d2a570b61cec23256924a1701404fc9d6fd4474d3e845cedb
   languageName: node
   linkType: hard
 
@@ -11794,17 +12669,17 @@ __metadata:
   version: 4.2.1
   resolution: "babel-plugin-react-docgen@npm:4.2.1"
   dependencies:
-    ast-types: ^0.14.2
-    lodash: ^4.17.15
-    react-docgen: ^5.0.0
-  checksum: 6126d358ac2cb27a9a7f145ab586b7a28cb19ef09ca37c4f08a853246a101328ffe6c87813e95b1b4ba05beb627285199f7d0ba16abfb61b35cc4febb6d5eabd
+    ast-types: "npm:^0.14.2"
+    lodash: "npm:^4.17.15"
+    react-docgen: "npm:^5.0.0"
+  checksum: 10/5de78d0bf984c08e713cbc2244022e4fbbbb0a491d05db31dd89bc8e3940968f4ba03e27837e3cb6f44a9061c83f0287dcafd51885354deb3447e5bbc8763d3d
   languageName: node
   linkType: hard
 
 "babel-plugin-syntax-jsx@npm:^6.18.0":
   version: 6.18.0
   resolution: "babel-plugin-syntax-jsx@npm:6.18.0"
-  checksum: 0c7ce5b81d6cfc01a7dd7a76a9a8f090ee02ba5c890310f51217ef1a7e6163fb7848994bbc14fd560117892e82240df9c7157ad0764da67ca5f2afafb73a7d27
+  checksum: 10/0c7ce5b81d6cfc01a7dd7a76a9a8f090ee02ba5c890310f51217ef1a7e6163fb7848994bbc14fd560117892e82240df9c7157ad0764da67ca5f2afafb73a7d27
   languageName: node
   linkType: hard
 
@@ -11812,21 +12687,21 @@ __metadata:
   version: 1.0.1
   resolution: "babel-preset-current-node-syntax@npm:1.0.1"
   dependencies:
-    "@babel/plugin-syntax-async-generators": ^7.8.4
-    "@babel/plugin-syntax-bigint": ^7.8.3
-    "@babel/plugin-syntax-class-properties": ^7.8.3
-    "@babel/plugin-syntax-import-meta": ^7.8.3
-    "@babel/plugin-syntax-json-strings": ^7.8.3
-    "@babel/plugin-syntax-logical-assignment-operators": ^7.8.3
-    "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
-    "@babel/plugin-syntax-numeric-separator": ^7.8.3
-    "@babel/plugin-syntax-object-rest-spread": ^7.8.3
-    "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
-    "@babel/plugin-syntax-optional-chaining": ^7.8.3
-    "@babel/plugin-syntax-top-level-await": ^7.8.3
+    "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
+    "@babel/plugin-syntax-bigint": "npm:^7.8.3"
+    "@babel/plugin-syntax-class-properties": "npm:^7.8.3"
+    "@babel/plugin-syntax-import-meta": "npm:^7.8.3"
+    "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.8.3"
+    "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
+    "@babel/plugin-syntax-numeric-separator": "npm:^7.8.3"
+    "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3"
+    "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
+    "@babel/plugin-syntax-top-level-await": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: d118c2742498c5492c095bc8541f4076b253e705b5f1ad9a2e7d302d81a84866f0070346662355c8e25fc02caa28dc2da8d69bcd67794a0d60c4d6fab6913cc8
+  checksum: 10/94561959cb12bfa80867c9eeeace7c3d48d61707d33e55b4c3fdbe82fc745913eb2dbfafca62aef297421b38aadcb58550e5943f50fbcebbeefd70ce2bed4b74
   languageName: node
   linkType: hard
 
@@ -11834,11 +12709,11 @@ __metadata:
   version: 29.6.3
   resolution: "babel-preset-jest@npm:29.6.3"
   dependencies:
-    babel-plugin-jest-hoist: ^29.6.3
-    babel-preset-current-node-syntax: ^1.0.0
+    babel-plugin-jest-hoist: "npm:^29.6.3"
+    babel-preset-current-node-syntax: "npm:^1.0.0"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: aa4ff2a8a728d9d698ed521e3461a109a1e66202b13d3494e41eea30729a5e7cc03b3a2d56c594423a135429c37bf63a9fa8b0b9ce275298be3095a88c69f6fb
+  checksum: 10/aa4ff2a8a728d9d698ed521e3461a109a1e66202b13d3494e41eea30729a5e7cc03b3a2d56c594423a135429c37bf63a9fa8b0b9ce275298be3095a88c69f6fb
   languageName: node
   linkType: hard
 
@@ -11846,44 +12721,44 @@ __metadata:
   version: 6.26.0
   resolution: "babel-runtime@npm:6.26.0"
   dependencies:
-    core-js: ^2.4.0
-    regenerator-runtime: ^0.11.0
-  checksum: 8aeade94665e67a73c1ccc10f6fd42ba0c689b980032b70929de7a6d9a12eb87ef51902733f8fefede35afea7a5c3ef7e916a64d503446c1eedc9e3284bd3d50
+    core-js: "npm:^2.4.0"
+    regenerator-runtime: "npm:^0.11.0"
+  checksum: 10/2cdf0f083b9598a43cdb11cbf1e7060584079a9a2230f06aec997ba81e887ef17fdcb5ad813a484ee099e06d2de0cea832bdd3011c06325acb284284c754ee8f
   languageName: node
   linkType: hard
 
 "balanced-match@npm:^1.0.0":
   version: 1.0.2
   resolution: "balanced-match@npm:1.0.2"
-  checksum: 9706c088a283058a8a99e0bf91b0a2f75497f185980d9ffa8b304de1d9e58ebda7c72c07ebf01dadedaac5b2907b2c6f566f660d62bd336c3468e960403b9d65
+  checksum: 10/9706c088a283058a8a99e0bf91b0a2f75497f185980d9ffa8b304de1d9e58ebda7c72c07ebf01dadedaac5b2907b2c6f566f660d62bd336c3468e960403b9d65
   languageName: node
   linkType: hard
 
 "balanced-match@npm:^2.0.0":
   version: 2.0.0
   resolution: "balanced-match@npm:2.0.0"
-  checksum: 9a5caad6a292c5df164cc6d0c38e0eedf9a1413f42e5fece733640949d74d0052cfa9587c1a1681f772147fb79be495121325a649526957fd75b3a216d1fbc68
+  checksum: 10/9a5caad6a292c5df164cc6d0c38e0eedf9a1413f42e5fece733640949d74d0052cfa9587c1a1681f772147fb79be495121325a649526957fd75b3a216d1fbc68
   languageName: node
   linkType: hard
 
 "baron@npm:3.0.3":
   version: 3.0.3
   resolution: "baron@npm:3.0.3"
-  checksum: 5fd57232e29ae2cb9e774cb5c89d22f2da4a63bee9a3d8f389bd9c5dc05b09c879ad00496f5d4d388a40492cb932a21b547c2d9c8961e854e2ac8b7caaab9fb5
+  checksum: 10/da4a65cc2f0bc7de27f9c17beee7616271cf1e62fd68538b5a82152383c68fa3e45df494ed9ad65cf890f1f4442ab45f23c5f5bcaeec71a4e85f50558d904dfd
   languageName: node
   linkType: hard
 
 "base64-arraybuffer@npm:^1.0.2":
   version: 1.0.2
   resolution: "base64-arraybuffer@npm:1.0.2"
-  checksum: 15e6400d2d028bf18be4ed97702b11418f8f8779fb8c743251c863b726638d52f69571d4cc1843224da7838abef0949c670bde46936663c45ad078e89fee5c62
+  checksum: 10/15e6400d2d028bf18be4ed97702b11418f8f8779fb8c743251c863b726638d52f69571d4cc1843224da7838abef0949c670bde46936663c45ad078e89fee5c62
   languageName: node
   linkType: hard
 
 "base64-js@npm:^1.3.1":
   version: 1.5.1
   resolution: "base64-js@npm:1.5.1"
-  checksum: 669632eb3745404c2f822a18fc3a0122d2f9a7a13f7fb8b5823ee19d1d2ff9ee5b52c53367176ea4ad093c332fd5ab4bd0ebae5a8e27917a4105a4cfc86b1005
+  checksum: 10/669632eb3745404c2f822a18fc3a0122d2f9a7a13f7fb8b5823ee19d1d2ff9ee5b52c53367176ea4ad093c332fd5ab4bd0ebae5a8e27917a4105a4cfc86b1005
   languageName: node
   linkType: hard
 
@@ -11891,15 +12766,15 @@ __metadata:
   version: 2.0.1
   resolution: "basic-auth@npm:2.0.1"
   dependencies:
-    safe-buffer: 5.1.2
-  checksum: 3419b805d5dfc518f3a05dcf42aa53aa9ce820e50b6df5097f9e186322e1bc733c36722b624802cd37e791035aa73b828ed814d8362333d42d7f5cd04d7a5e48
+    safe-buffer: "npm:5.1.2"
+  checksum: 10/3419b805d5dfc518f3a05dcf42aa53aa9ce820e50b6df5097f9e186322e1bc733c36722b624802cd37e791035aa73b828ed814d8362333d42d7f5cd04d7a5e48
   languageName: node
   linkType: hard
 
 "batch@npm:0.6.1":
   version: 0.6.1
   resolution: "batch@npm:0.6.1"
-  checksum: 61f9934c7378a51dce61b915586191078ef7f1c3eca707fdd58b96ff2ff56d9e0af2bdab66b1462301a73c73374239e6542d9821c0af787f3209a23365d07e7f
+  checksum: 10/61f9934c7378a51dce61b915586191078ef7f1c3eca707fdd58b96ff2ff56d9e0af2bdab66b1462301a73c73374239e6542d9821c0af787f3209a23365d07e7f
   languageName: node
   linkType: hard
 
@@ -11907,15 +12782,15 @@ __metadata:
   version: 1.0.2
   resolution: "bcrypt-pbkdf@npm:1.0.2"
   dependencies:
-    tweetnacl: ^0.14.3
-  checksum: 4edfc9fe7d07019609ccf797a2af28351736e9d012c8402a07120c4453a3b789a15f2ee1530dc49eee8f7eb9379331a8dd4b3766042b9e502f74a68e7f662291
+    tweetnacl: "npm:^0.14.3"
+  checksum: 10/13a4cde058250dbf1fa77a4f1b9a07d32ae2e3b9e28e88a0c7a1827835bc3482f3e478c4a0cfd4da6ff0c46dae07da1061123a995372b32cc563d9975f975404
   languageName: node
   linkType: hard
 
 "before-after-hook@npm:^2.2.0":
   version: 2.2.2
   resolution: "before-after-hook@npm:2.2.2"
-  checksum: dc2e1ffe389e5afbef2a46790b1b5a50247ed57aba67649cfa9ec2552d248cc9278f222e72fb5a8ff59bbb39d78fbaa97e7234ead0c6b5e8418b67a8644ce207
+  checksum: 10/34c190def503f771f8811db0bd0c62b35301fe6059c8d847664633ce0548e8253e2661104ba66c71a85548746ba87d5ff2ebf5278c1f3ad367d111ffc9a26bb4
   languageName: node
   linkType: hard
 
@@ -11923,43 +12798,29 @@ __metadata:
   version: 3.0.2
   resolution: "better-opn@npm:3.0.2"
   dependencies:
-    open: ^8.0.4
-  checksum: 1471552fa7f733561e7f49e812be074b421153006ca744de985fb6d38939807959fc5fe9cb819cf09f864782e294704fd3b31711ea14c115baf3330a2f1135de
+    open: "npm:^8.0.4"
+  checksum: 10/24668e5a837d0d2c0edf17ad5ebcfeb00a8a5578a5eb09f7a409e1a60617cdfea40b8ebfc95e5f12d9568157930d033e6805788fcf0780413ac982c95d3745d1
   languageName: node
   linkType: hard
 
 "big-integer@npm:^1.6.44":
   version: 1.6.51
   resolution: "big-integer@npm:1.6.51"
-  checksum: 3d444173d1b2e20747e2c175568bedeebd8315b0637ea95d75fd27830d3b8e8ba36c6af40374f36bdaea7b5de376dcada1b07587cb2a79a928fccdb6e6e3c518
+  checksum: 10/c7a12640901906d6f6b6bdb42a4eaba9578397b6d9a0dd090cf001ec813ff2bfcd441e364068ea0416db6175d2615f8ed19cff7d1a795115bf7c92d44993f991
   languageName: node
   linkType: hard
 
 "big.js@npm:^5.2.2":
   version: 5.2.2
   resolution: "big.js@npm:5.2.2"
-  checksum: b89b6e8419b097a8fb4ed2399a1931a68c612bce3cfd5ca8c214b2d017531191070f990598de2fc6f3f993d91c0f08aa82697717f6b3b8732c9731866d233c9e
-  languageName: node
-  linkType: hard
-
-"bin-links@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "bin-links@npm:3.0.1"
-  dependencies:
-    cmd-shim: ^5.0.0
-    mkdirp-infer-owner: ^2.0.0
-    npm-normalize-package-bin: ^1.0.0
-    read-cmd-shim: ^3.0.0
-    rimraf: ^3.0.0
-    write-file-atomic: ^4.0.0
-  checksum: c608f0746c5851f259f7578ae5157d24fb019b00792d246bade6255136e5fbd41df43219a50d53f844c562afb6e41092a5f2b0be1bd890e08ff023d330327380
+  checksum: 10/c04416aeb084f4aa1c5857722439c327cc0ada9bd99ab80b650e3f30e2e4f1b92a04527ed1e7df8ffcd7c0ea311745a04af12d53e2f091bf09a06f1292003827
   languageName: node
   linkType: hard
 
 "binary-extensions@npm:^2.0.0":
   version: 2.2.0
   resolution: "binary-extensions@npm:2.2.0"
-  checksum: ccd267956c58d2315f5d3ea6757cf09863c5fc703e50fbeb13a7dc849b812ef76e3cf9ca8f35a0c48498776a7478d7b4a0418e1e2b8cb9cb9731f2922aaad7f8
+  checksum: 10/ccd267956c58d2315f5d3ea6757cf09863c5fc703e50fbeb13a7dc849b812ef76e3cf9ca8f35a0c48498776a7478d7b4a0418e1e2b8cb9cb9731f2922aaad7f8
   languageName: node
   linkType: hard
 
@@ -11967,10 +12828,21 @@ __metadata:
   version: 4.1.0
   resolution: "bl@npm:4.1.0"
   dependencies:
-    buffer: ^5.5.0
-    inherits: ^2.0.4
-    readable-stream: ^3.4.0
-  checksum: 9e8521fa7e83aa9427c6f8ccdcba6e8167ef30cc9a22df26effcc5ab682ef91d2cbc23a239f945d099289e4bbcfae7a192e9c28c84c6202e710a0dfec3722662
+    buffer: "npm:^5.5.0"
+    inherits: "npm:^2.0.4"
+    readable-stream: "npm:^3.4.0"
+  checksum: 10/b7904e66ed0bdfc813c06ea6c3e35eafecb104369dbf5356d0f416af90c1546de3b74e5b63506f0629acf5e16a6f87c3798f16233dcff086e9129383aa02ab55
+  languageName: node
+  linkType: hard
+
+"bl@npm:^5.0.0":
+  version: 5.1.0
+  resolution: "bl@npm:5.1.0"
+  dependencies:
+    buffer: "npm:^6.0.3"
+    inherits: "npm:^2.0.4"
+    readable-stream: "npm:^3.4.0"
+  checksum: 10/0340d3d70def4213cd9cbcd8592f7c5922d3668e7b231286c354613fac4a8411ad373cff26e06162da7423035bbd5caafce3e140a5f397be72fcd1e9d86f1179
   languageName: node
   linkType: hard
 
@@ -11978,40 +12850,40 @@ __metadata:
   version: 1.0.13
   resolution: "blink-diff@npm:1.0.13"
   dependencies:
-    pngjs-image: ~0.11.5
-    preceptor-core: ~0.10.0
-    promise: 6.0.0
+    pngjs-image: "npm:~0.11.5"
+    preceptor-core: "npm:~0.10.0"
+    promise: "npm:6.0.0"
   bin:
     blink-diff: bin/blink-diff
-  checksum: 2a20cc14c513a4c612fce37077f222ea604526104fde6c3622e53da1ece7a31166379098715709d36b2b2927366f4834aed576001c2eab588cd2b8ab8d0be3c1
+  checksum: 10/fec6001ba4942217545b476031472e18bb2916139be1ed210d285ce04c79408f16223c5efccb37a54e9ef22f52d0c4e6e313ea846dfc00139e2a19124f18f281
   languageName: node
   linkType: hard
 
 "blob-polyfill@npm:7.0.20220408":
   version: 7.0.20220408
   resolution: "blob-polyfill@npm:7.0.20220408"
-  checksum: bbd062e904d851b0e0a733265150d0c189a575f80a98256515d265e265ada6f92a787d43fedaa791c00910c174131f9d7168e8c158e3334c965d045358c177da
+  checksum: 10/e7be8bb3bbb3159c9eadac275883f049c4e982f87d60dff2145805103f4df046427988888d321fd9a1e7d2e5a081d65655d0b35098ac04f97833898f7975d8a6
   languageName: node
   linkType: hard
 
 "blob-util@npm:^2.0.2":
   version: 2.0.2
   resolution: "blob-util@npm:2.0.2"
-  checksum: d543e6b92e4ca715ca33c78e89a07a2290d43e5b2bc897d7ec588c5c7bbf59df93e45225ac0c9258aa6ce4320358990f99c9288f1c48280f8ec5d7a2e088d19b
+  checksum: 10/b2c5a20c677f2a6c3821cf13c5522d64af96e666bc40cce6b43f87d16e89a55e2eab2f6264ec3f36d7f810eba848aa7e2bc611e47c14eb6395136c0b0a8b29ea
   languageName: node
   linkType: hard
 
 "bluebird@npm:3.7.1":
   version: 3.7.1
   resolution: "bluebird@npm:3.7.1"
-  checksum: 58c295399e109925149977ebcb40e42fd109d3e458899e71441bc7e5e0867bbd796fdd20278b425fa29f13377fe335fbfc2a6e68e5ca1da03b1c3afdc439d097
+  checksum: 10/2af420fcd493dea6aa2f53007bc511d44cd1da90e31810b405366956e4d9ca1c56f0c6d725e3444d9c59df7cacc9e3390ab52bd7d86c09852464d8a247f59841
   languageName: node
   linkType: hard
 
 "bluebird@npm:^3.7.2":
   version: 3.7.2
   resolution: "bluebird@npm:3.7.2"
-  checksum: 869417503c722e7dc54ca46715f70e15f4d9c602a423a02c825570862d12935be59ed9c7ba34a9b31f186c017c23cac6b54e35446f8353059c101da73eac22ef
+  checksum: 10/007c7bad22c5d799c8dd49c85b47d012a1fe3045be57447721e6afbd1d5be43237af1db62e26cb9b0d9ba812d2e4ca3bac82f6d7e016b6b88de06ee25ceb96e7
   languageName: node
   linkType: hard
 
@@ -12019,36 +12891,34 @@ __metadata:
   version: 1.19.2
   resolution: "body-parser@npm:1.19.2"
   dependencies:
-    bytes: 3.1.2
-    content-type: ~1.0.4
-    debug: 2.6.9
-    depd: ~1.1.2
-    http-errors: 1.8.1
-    iconv-lite: 0.4.24
-    on-finished: ~2.3.0
-    qs: 6.9.7
-    raw-body: 2.4.3
-    type-is: ~1.6.18
-  checksum: 7f777ea65670e2622ca4a785b5dcb2a68451b3bb8d4d0f41091d307d56b640dba588a9ae04d85dda2cdd5e42788266a783528d5417e5643720fd611fd52522e7
+    bytes: "npm:3.1.2"
+    content-type: "npm:~1.0.4"
+    debug: "npm:2.6.9"
+    depd: "npm:~1.1.2"
+    http-errors: "npm:1.8.1"
+    iconv-lite: "npm:0.4.24"
+    on-finished: "npm:~2.3.0"
+    qs: "npm:6.9.7"
+    raw-body: "npm:2.4.3"
+    type-is: "npm:~1.6.18"
+  checksum: 10/8a5f59d7e51b4000082a5e8bccf548cdbe77140520a55e380fecf5becf87a950b39e157a5c2a13334aa2ad45cc850b98e6c8652a4f033581c552001176dc9fc0
   languageName: node
   linkType: hard
 
-"bonjour-service@npm:^1.0.11":
-  version: 1.0.11
-  resolution: "bonjour-service@npm:1.0.11"
+"bonjour-service@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "bonjour-service@npm:1.2.1"
   dependencies:
-    array-flatten: ^2.1.2
-    dns-equal: ^1.0.0
-    fast-deep-equal: ^3.1.3
-    multicast-dns: ^7.2.4
-  checksum: b6093a856de9bc303551f1639945318e93782d3c40f03e38def3e2f079f478afd5385cf46538ade86f07205ac4b5f059105832b01eb9ce142fc69d27c006982f
+    fast-deep-equal: "npm:^3.1.3"
+    multicast-dns: "npm:^7.2.5"
+  checksum: 10/8350d135ab8dd998a829136984d7f74bfc0667b162ab99ac98bae54d72ff7a6003c6fb7911739dfba7c56a113bd6ab06a4d4fe6719b18e66592c345663e7d923
   languageName: node
   linkType: hard
 
 "boolbase@npm:^1.0.0":
   version: 1.0.0
   resolution: "boolbase@npm:1.0.0"
-  checksum: 3e25c80ef626c3a3487c73dbfc70ac322ec830666c9ad915d11b701142fab25ec1e63eff2c450c74347acfd2de854ccde865cd79ef4db1683f7c7b046ea43bb0
+  checksum: 10/3e25c80ef626c3a3487c73dbfc70ac322ec830666c9ad915d11b701142fab25ec1e63eff2c450c74347acfd2de854ccde865cd79ef4db1683f7c7b046ea43bb0
   languageName: node
   linkType: hard
 
@@ -12056,8 +12926,8 @@ __metadata:
   version: 0.2.0
   resolution: "bplist-parser@npm:0.2.0"
   dependencies:
-    big-integer: ^1.6.44
-  checksum: d5339dd16afc51de6c88f88f58a45b72ed6a06aa31f5557d09877575f220b7c1d3fbe375da0b62e6a10d4b8ed80523567e351f24014f5bc886ad523758142cdd
+    big-integer: "npm:^1.6.44"
+  checksum: 10/15d31c1b0c7e0fb384e96349453879a33609d92d91b55a9ccee04b4be4b0645f1c823253d73326a1a23104521fbc45c2dd97fb05adf61863841b68cbb2ca7a3d
   languageName: node
   linkType: hard
 
@@ -12065,9 +12935,9 @@ __metadata:
   version: 1.1.11
   resolution: "brace-expansion@npm:1.1.11"
   dependencies:
-    balanced-match: ^1.0.0
-    concat-map: 0.0.1
-  checksum: faf34a7bb0c3fcf4b59c7808bc5d2a96a40988addf2e7e09dfbb67a2251800e0d14cd2bfc1aa79174f2f5095c54ff27f46fb1289fe2d77dac755b5eb3434cc07
+    balanced-match: "npm:^1.0.0"
+    concat-map: "npm:0.0.1"
+  checksum: 10/faf34a7bb0c3fcf4b59c7808bc5d2a96a40988addf2e7e09dfbb67a2251800e0d14cd2bfc1aa79174f2f5095c54ff27f46fb1289fe2d77dac755b5eb3434cc07
   languageName: node
   linkType: hard
 
@@ -12075,15 +12945,15 @@ __metadata:
   version: 2.0.1
   resolution: "brace-expansion@npm:2.0.1"
   dependencies:
-    balanced-match: ^1.0.0
-  checksum: a61e7cd2e8a8505e9f0036b3b6108ba5e926b4b55089eeb5550cd04a471fe216c96d4fe7e4c7f995c728c554ae20ddfc4244cad10aef255e72b62930afd233d1
+    balanced-match: "npm:^1.0.0"
+  checksum: 10/a61e7cd2e8a8505e9f0036b3b6108ba5e926b4b55089eeb5550cd04a471fe216c96d4fe7e4c7f995c728c554ae20ddfc4244cad10aef255e72b62930afd233d1
   languageName: node
   linkType: hard
 
 "brace@npm:0.11.1":
   version: 0.11.1
   resolution: "brace@npm:0.11.1"
-  checksum: def78159abccf5ad465efbe217cc31cade9b484dc5142f876e237301b998ea2c17e0006b929b9e3b60da5dd51e844b5aa439198f65eafc312ed91b944addf366
+  checksum: 10/4eca4d27fb32fc34894e8a092753df21c05c1a6c8fe05c60da97bd92571eb03c5cfa27ca79fb93b7d17e6013d78d650db43f42aa6212e02d58e61ee56306fe7e
   languageName: node
   linkType: hard
 
@@ -12091,22 +12961,22 @@ __metadata:
   version: 3.0.2
   resolution: "braces@npm:3.0.2"
   dependencies:
-    fill-range: ^7.0.1
-  checksum: e2a8e769a863f3d4ee887b5fe21f63193a891c68b612ddb4b68d82d1b5f3ff9073af066c343e9867a393fe4c2555dcb33e89b937195feb9c1613d259edfcd459
+    fill-range: "npm:^7.0.1"
+  checksum: 10/966b1fb48d193b9d155f810e5efd1790962f2c4e0829f8440b8ad236ba009222c501f70185ef732fef17a4c490bb33a03b90dab0631feafbdf447da91e8165b1
   languageName: node
   linkType: hard
 
 "broccoli-node-api@npm:^1.7.0":
   version: 1.7.0
   resolution: "broccoli-node-api@npm:1.7.0"
-  checksum: 37b83c81549294d0c843bb4c07ef5330a5493f5e8204e4f7eda716c4f5175f5ccf0f10f0957a18321324b5ff3d4fe2a2cd6cd8e598d6f9e7986c45b8dd200b99
+  checksum: 10/ad6d24f71d9f58ba8a9937ad19b52887f8bc1e431c5387c44e7cba69cf348a7c9f396896d716e8b96e3f309c9733eda6264e07fead77ae4109a83adc28da68ef
   languageName: node
   linkType: hard
 
 "broccoli-node-info@npm:^2.1.0":
   version: 2.2.0
   resolution: "broccoli-node-info@npm:2.2.0"
-  checksum: e5d68ebb35aa4406dc7dd9e90f15f68fb58c2026696bda2a67045f993261e856fbfec35b3d424c835af7873bd7de00f15630a5b2626c8c0929365035ade9cddd
+  checksum: 10/9364e781100c2c9a316b45cd4d342fd97b32713612742326459c411f6d820facbd044e89e4a9d9a03e2274384ecd891125eb52048fde569a56f29f5e755e2f9b
   languageName: node
   linkType: hard
 
@@ -12114,10 +12984,10 @@ __metadata:
   version: 3.2.5
   resolution: "broccoli-output-wrapper@npm:3.2.5"
   dependencies:
-    fs-extra: ^8.1.0
-    heimdalljs-logger: ^0.1.10
-    symlink-or-copy: ^1.2.0
-  checksum: c23d875544bfdd4cf0767fb9080a6a16bf938497a1a6601fe9ea2e0e5cce26f1a4f4ab81f80e50376b0d86b622cef848d0ffba3f5fa4f2e3c4b531539383eddb
+    fs-extra: "npm:^8.1.0"
+    heimdalljs-logger: "npm:^0.1.10"
+    symlink-or-copy: "npm:^1.2.0"
+  checksum: 10/39f4ceeb47926250a19d3f4ab858f11854aa7ffa5c31759b0cd416cf92a70d20a1af0c4b3f1dd8daa59d20bb19613f59b0c22913eaf545d0aaff6f7564889004
   languageName: node
   linkType: hard
 
@@ -12125,28 +12995,28 @@ __metadata:
   version: 4.0.7
   resolution: "broccoli-plugin@npm:4.0.7"
   dependencies:
-    broccoli-node-api: ^1.7.0
-    broccoli-output-wrapper: ^3.2.5
-    fs-merger: ^3.2.1
-    promise-map-series: ^0.3.0
-    quick-temp: ^0.1.8
-    rimraf: ^3.0.2
-    symlink-or-copy: ^1.3.1
-  checksum: 49d6a55ebfe1880e73956dc8bf23104ad81c1272d4a06755823e6e1eec5255583d2913de99427b3e0a620e3b56178fdd8ea03c832b7452f0440c166044aa555c
+    broccoli-node-api: "npm:^1.7.0"
+    broccoli-output-wrapper: "npm:^3.2.5"
+    fs-merger: "npm:^3.2.1"
+    promise-map-series: "npm:^0.3.0"
+    quick-temp: "npm:^0.1.8"
+    rimraf: "npm:^3.0.2"
+    symlink-or-copy: "npm:^1.3.1"
+  checksum: 10/93cb02b1b0211759e2243a3201ee988eeed2dd31f4d6a5cea92f6f4a56a31184421b2798999325df810530d21e120280d34dd8e8f93b16d84877b7307f773046
   languageName: node
   linkType: hard
 
 "browser-assert@npm:^1.2.1":
   version: 1.2.1
   resolution: "browser-assert@npm:1.2.1"
-  checksum: 8b2407cd04c1ed592cf892dec35942b7d72635829221e0788c9a16c4d2afa8b7156bc9705b1c4b32c30d88136c576fda3cbcb8f494d6f865264c706ea8798d92
+  checksum: 10/8b2407cd04c1ed592cf892dec35942b7d72635829221e0788c9a16c4d2afa8b7156bc9705b1c4b32c30d88136c576fda3cbcb8f494d6f865264c706ea8798d92
   languageName: node
   linkType: hard
 
 "browser-stdout@npm:1.3.1":
   version: 1.3.1
   resolution: "browser-stdout@npm:1.3.1"
-  checksum: b717b19b25952dd6af483e368f9bcd6b14b87740c3d226c2977a65e84666ffd67000bddea7d911f111a9b6ddc822b234de42d52ab6507bce4119a4cc003ef7b3
+  checksum: 10/ac70a84e346bb7afc5045ec6f22f6a681b15a4057447d4cc1c48a25c6dedb302a49a46dd4ddfb5cdd9c96e0c905a8539be1b98ae7bc440512152967009ec7015
   languageName: node
   linkType: hard
 
@@ -12154,22 +13024,22 @@ __metadata:
   version: 0.1.4
   resolution: "browserify-zlib@npm:0.1.4"
   dependencies:
-    pako: ~0.2.0
-  checksum: abee4cb4349e8a21391fd874564f41b113fe691372913980e6fa06a777e4ea2aad4e942af14ab99bce190d5ac8f5328201432f4ef0eae48c6d02208bc212976f
+    pako: "npm:~0.2.0"
+  checksum: 10/cd506a1ef9c3280f6537a17ed1352ef7738b66fef0a15a655dc3a43edc34be6ee78c5838427146ae1fcd4801fc06d2ab203614d0f8c4df8b5a091cf0134b9a80
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.0.0, browserslist@npm:^4.14.5, browserslist@npm:^4.21.10, browserslist@npm:^4.21.4, browserslist@npm:^4.21.5, browserslist@npm:^4.21.9":
-  version: 4.22.0
-  resolution: "browserslist@npm:4.22.0"
+"browserslist@npm:^4.0.0, browserslist@npm:^4.14.5, browserslist@npm:^4.21.10, browserslist@npm:^4.21.4, browserslist@npm:^4.22.2, browserslist@npm:^4.23.0":
+  version: 4.23.0
+  resolution: "browserslist@npm:4.23.0"
   dependencies:
-    caniuse-lite: ^1.0.30001539
-    electron-to-chromium: ^1.4.530
-    node-releases: ^2.0.13
-    update-browserslist-db: ^1.0.13
+    caniuse-lite: "npm:^1.0.30001587"
+    electron-to-chromium: "npm:^1.4.668"
+    node-releases: "npm:^2.0.14"
+    update-browserslist-db: "npm:^1.0.13"
   bin:
     browserslist: cli.js
-  checksum: 14fc119bbfb85b65e2ee4a82205fabf9327520d010c4c586f1176ceaf9136cfdb391397045a4eafaa9defe52b6dbdf875916714695826c69091a936d5838f9ec
+  checksum: 10/496c3862df74565dd942b4ae65f502c575cbeba1fa4a3894dad7aa3b16130dc3033bc502d8848147f7b625154a284708253d9598bcdbef5a1e34cf11dc7bad8e
   languageName: node
   linkType: hard
 
@@ -12177,8 +13047,8 @@ __metadata:
   version: 0.2.6
   resolution: "bs-logger@npm:0.2.6"
   dependencies:
-    fast-json-stable-stringify: 2.x
-  checksum: d34bdaf68c64bd099ab97c3ea608c9ae7d3f5faa1178b3f3f345acd94e852e608b2d4f9103fb2e503f5e69780e98293df41691b84be909b41cf5045374d54606
+    fast-json-stable-stringify: "npm:2.x"
+  checksum: 10/e6d3ff82698bb3f20ce64fb85355c5716a3cf267f3977abe93bf9c32a2e46186b253f48a028ae5b96ab42bacd2c826766d9ae8cf6892f9b944656be9113cf212
   languageName: node
   linkType: hard
 
@@ -12186,8 +13056,8 @@ __metadata:
   version: 2.1.1
   resolution: "bser@npm:2.1.1"
   dependencies:
-    node-int64: ^0.4.0
-  checksum: 9ba4dc58ce86300c862bffc3ae91f00b2a03b01ee07f3564beeeaf82aa243b8b03ba53f123b0b842c190d4399b94697970c8e7cf7b1ea44b61aa28c3526a4449
+    node-int64: "npm:^0.4.0"
+  checksum: 10/edba1b65bae682450be4117b695997972bd9a3c4dfee029cab5bcb72ae5393a79a8f909b8bc77957eb0deec1c7168670f18f4d5c556f46cdd3bca5f3b3a8d020
   languageName: node
   linkType: hard
 
@@ -12196,28 +13066,31 @@ __metadata:
   resolution: "btoa@npm:1.2.1"
   bin:
     btoa: bin/btoa.js
-  checksum: afbf004fb1b1d530e053ffa66ef5bd3878b101c59d808ac947fcff96810b4452abba2b54be687adadea2ba9efc7af48b04228742789bf824ef93f103767e690c
+  checksum: 10/29f2ca93837e10427184626bdfd5d00065dff28b604b822aa9849297dac8c8d6ad385cc96eed812ebf153d80c24a4556252afdbb97c7a712938baeaad7547705
   languageName: node
   linkType: hard
 
 "buffer-crc32@npm:~0.2.3":
   version: 0.2.13
   resolution: "buffer-crc32@npm:0.2.13"
-  checksum: 06252347ae6daca3453b94e4b2f1d3754a3b146a111d81c68924c22d91889a40623264e95e67955b1cb4a68cbedf317abeabb5140a9766ed248973096db5ce1c
-  languageName: node
-  linkType: hard
-
-"buffer-equal@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "buffer-equal@npm:1.0.0"
-  checksum: c63a62d25ffc6f3a7064a86dd0d92d93a32d03b14f22d17374790bc10e94bca2312302895fdd28a2b0060999d4385cf90cbf6ad1a6678065156c664016d3be45
+  checksum: 10/06252347ae6daca3453b94e4b2f1d3754a3b146a111d81c68924c22d91889a40623264e95e67955b1cb4a68cbedf317abeabb5140a9766ed248973096db5ce1c
   languageName: node
   linkType: hard
 
 "buffer-from@npm:^1.0.0":
   version: 1.1.2
   resolution: "buffer-from@npm:1.1.2"
-  checksum: 0448524a562b37d4d7ed9efd91685a5b77a50672c556ea254ac9a6d30e3403a517d8981f10e565db24e8339413b43c97ca2951f10e399c6125a0d8911f5679bb
+  checksum: 10/0448524a562b37d4d7ed9efd91685a5b77a50672c556ea254ac9a6d30e3403a517d8981f10e565db24e8339413b43c97ca2951f10e399c6125a0d8911f5679bb
+  languageName: node
+  linkType: hard
+
+"buffer@npm:6.0.3, buffer@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "buffer@npm:6.0.3"
+  dependencies:
+    base64-js: "npm:^1.3.1"
+    ieee754: "npm:^1.2.1"
+  checksum: 10/b6bc68237ebf29bdacae48ce60e5e28fc53ae886301f2ad9496618efac49427ed79096750033e7eab1897a4f26ae374ace49106a5758f38fb70c78c9fda2c3b1
   languageName: node
   linkType: hard
 
@@ -12225,23 +13098,23 @@ __metadata:
   version: 5.7.1
   resolution: "buffer@npm:5.7.1"
   dependencies:
-    base64-js: ^1.3.1
-    ieee754: ^1.1.13
-  checksum: e2cf8429e1c4c7b8cbd30834ac09bd61da46ce35f5c22a78e6c2f04497d6d25541b16881e30a019c6fd3154150650ccee27a308eff3e26229d788bbdeb08ab84
+    base64-js: "npm:^1.3.1"
+    ieee754: "npm:^1.1.13"
+  checksum: 10/997434d3c6e3b39e0be479a80288875f71cd1c07d75a3855e6f08ef848a3c966023f79534e22e415ff3a5112708ce06127277ab20e527146d55c84566405c7c6
   languageName: node
   linkType: hard
 
 "builtin-modules@npm:^3.3.0":
   version: 3.3.0
   resolution: "builtin-modules@npm:3.3.0"
-  checksum: db021755d7ed8be048f25668fe2117620861ef6703ea2c65ed2779c9e3636d5c3b82325bd912244293959ff3ae303afa3471f6a15bf5060c103e4cc3a839749d
+  checksum: 10/62e063ab40c0c1efccbfa9ffa31873e4f9d57408cb396a2649981a0ecbce56aabc93c28feaccbc5658c95aab2703ad1d11980e62ec2e5e72637404e1eb60f39e
   languageName: node
   linkType: hard
 
 "builtins@npm:^1.0.3":
   version: 1.0.3
   resolution: "builtins@npm:1.0.3"
-  checksum: 47ce94f7eee0e644969da1f1a28e5f29bd2e48b25b2bbb61164c345881086e29464ccb1fb88dbc155ea26e8b1f5fc8a923b26c8c1ed0935b67b644d410674513
+  checksum: 10/8f756616bd3d92611bcb5bcc3008308e7cdaadbc4603a5ce6fe709193198bc115351d138524d79e5269339ef7ba5ba73185da541c7b4bc076b00dd0124f938f6
   languageName: node
   linkType: hard
 
@@ -12249,29 +13122,38 @@ __metadata:
   version: 5.0.1
   resolution: "builtins@npm:5.0.1"
   dependencies:
-    semver: ^7.0.0
-  checksum: 66d204657fe36522822a95b288943ad11b58f5eaede235b11d8c4edaa28ce4800087d44a2681524c340494aadb120a0068011acabe99d30e8f11a7d826d83515
+    semver: "npm:^7.0.0"
+  checksum: 10/90136fa0ba98b7a3aea33190b1262a5297164731efb6a323b0231acf60cc2ea0b2b1075dbf107038266b8b77d6045fa9631d1c3f90efc1c594ba61218fbfbb4c
   languageName: node
   linkType: hard
 
-"byte-size@npm:^7.0.0":
-  version: 7.0.1
-  resolution: "byte-size@npm:7.0.1"
-  checksum: 6791663a6d53bf950e896f119d3648fe8d7e8ae677e2ccdae84d0e5b78f21126e25f9d73aa19be2a297cb27abd36b6f5c361c0de36ebb2f3eb8a853f2ac99a4a
+"bundle-name@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "bundle-name@npm:4.1.0"
+  dependencies:
+    run-applescript: "npm:^7.0.0"
+  checksum: 10/1d966c8d2dbf4d9d394e53b724ac756c2414c45c01340b37743621f59cc565a435024b394ddcb62b9b335d1c9a31f4640eb648c3fec7f97ee74dc0694c9beb6c
+  languageName: node
+  linkType: hard
+
+"byte-size@npm:8.1.1":
+  version: 8.1.1
+  resolution: "byte-size@npm:8.1.1"
+  checksum: 10/eacd83b5f39b4b35115160201553150c3c085473ddb1e788d0f4ee22a2f3461470de5732eef8d7874efbbd883b7ae1277190b579128060e616d606ff419fe1e0
   languageName: node
   linkType: hard
 
 "bytes@npm:3.0.0":
   version: 3.0.0
   resolution: "bytes@npm:3.0.0"
-  checksum: a2b386dd8188849a5325f58eef69c3b73c51801c08ffc6963eddc9be244089ba32d19347caf6d145c86f315ae1b1fc7061a32b0c1aa6379e6a719090287ed101
+  checksum: 10/a2b386dd8188849a5325f58eef69c3b73c51801c08ffc6963eddc9be244089ba32d19347caf6d145c86f315ae1b1fc7061a32b0c1aa6379e6a719090287ed101
   languageName: node
   linkType: hard
 
 "bytes@npm:3.1.2":
   version: 3.1.2
   resolution: "bytes@npm:3.1.2"
-  checksum: e4bcd3948d289c5127591fbedf10c0b639ccbf00243504e4e127374a15c3bc8eed0d28d4aaab08ff6f1cf2abc0cce6ba3085ed32f4f90e82a5683ce0014e1b6e
+  checksum: 10/a10abf2ba70c784471d6b4f58778c0beeb2b5d405148e66affa91f23a9f13d07603d0a0354667310ae1d6dc141474ffd44e2a074be0f6e2254edb8fc21445388
   languageName: node
   linkType: hard
 
@@ -12279,21 +13161,21 @@ __metadata:
   version: 7.13.0
   resolution: "c8@npm:7.13.0"
   dependencies:
-    "@bcoe/v8-coverage": ^0.2.3
-    "@istanbuljs/schema": ^0.1.3
-    find-up: ^5.0.0
-    foreground-child: ^2.0.0
-    istanbul-lib-coverage: ^3.2.0
-    istanbul-lib-report: ^3.0.0
-    istanbul-reports: ^3.1.4
-    rimraf: ^3.0.2
-    test-exclude: ^6.0.0
-    v8-to-istanbul: ^9.0.0
-    yargs: ^16.2.0
-    yargs-parser: ^20.2.9
+    "@bcoe/v8-coverage": "npm:^0.2.3"
+    "@istanbuljs/schema": "npm:^0.1.3"
+    find-up: "npm:^5.0.0"
+    foreground-child: "npm:^2.0.0"
+    istanbul-lib-coverage: "npm:^3.2.0"
+    istanbul-lib-report: "npm:^3.0.0"
+    istanbul-reports: "npm:^3.1.4"
+    rimraf: "npm:^3.0.2"
+    test-exclude: "npm:^6.0.0"
+    v8-to-istanbul: "npm:^9.0.0"
+    yargs: "npm:^16.2.0"
+    yargs-parser: "npm:^20.2.9"
   bin:
     c8: bin/c8.js
-  checksum: 491abf4cf3097cdcfd24dbac49162f1383861c22c77fdd9280bcd38240e1e07d2c6a59da5d4df59a61a8204e2fc297d31fd526e495faf8d2f20dcc12a37b144c
+  checksum: 10/0e61506fdc3062334b58febc8d1e4b409d1ec8a26f7c54b6b3a33408c1a36e7f576dd379d6d0100413e0358f8b917e3c909c7768fc0676d24d95aa6a79f89574
   languageName: node
   linkType: hard
 
@@ -12301,89 +13183,106 @@ __metadata:
   version: 15.3.0
   resolution: "cacache@npm:15.3.0"
   dependencies:
-    "@npmcli/fs": ^1.0.0
-    "@npmcli/move-file": ^1.0.1
-    chownr: ^2.0.0
-    fs-minipass: ^2.0.0
-    glob: ^7.1.4
-    infer-owner: ^1.0.4
-    lru-cache: ^6.0.0
-    minipass: ^3.1.1
-    minipass-collect: ^1.0.2
-    minipass-flush: ^1.0.5
-    minipass-pipeline: ^1.2.2
-    mkdirp: ^1.0.3
-    p-map: ^4.0.0
-    promise-inflight: ^1.0.1
-    rimraf: ^3.0.2
-    ssri: ^8.0.1
-    tar: ^6.0.2
-    unique-filename: ^1.1.1
-  checksum: a07327c27a4152c04eb0a831c63c00390d90f94d51bb80624a66f4e14a6b6360bbf02a84421267bd4d00ca73ac9773287d8d7169e8d2eafe378d2ce140579db8
-  languageName: node
-  linkType: hard
-
-"cacache@npm:^16.0.0, cacache@npm:^16.0.6, cacache@npm:^16.1.0":
-  version: 16.1.1
-  resolution: "cacache@npm:16.1.1"
-  dependencies:
-    "@npmcli/fs": ^2.1.0
-    "@npmcli/move-file": ^2.0.0
-    chownr: ^2.0.0
-    fs-minipass: ^2.1.0
-    glob: ^8.0.1
-    infer-owner: ^1.0.4
-    lru-cache: ^7.7.1
-    minipass: ^3.1.6
-    minipass-collect: ^1.0.2
-    minipass-flush: ^1.0.5
-    minipass-pipeline: ^1.2.4
-    mkdirp: ^1.0.4
-    p-map: ^4.0.0
-    promise-inflight: ^1.0.1
-    rimraf: ^3.0.2
-    ssri: ^9.0.0
-    tar: ^6.1.11
-    unique-filename: ^1.1.1
-  checksum: 488524617008b793f0249b0c4ea2c330c710ca997921376e15650cc2415a8054491ae2dee9f01382c2015602c0641f3f977faf2fa7361aa33d2637dcfb03907a
+    "@npmcli/fs": "npm:^1.0.0"
+    "@npmcli/move-file": "npm:^1.0.1"
+    chownr: "npm:^2.0.0"
+    fs-minipass: "npm:^2.0.0"
+    glob: "npm:^7.1.4"
+    infer-owner: "npm:^1.0.4"
+    lru-cache: "npm:^6.0.0"
+    minipass: "npm:^3.1.1"
+    minipass-collect: "npm:^1.0.2"
+    minipass-flush: "npm:^1.0.5"
+    minipass-pipeline: "npm:^1.2.2"
+    mkdirp: "npm:^1.0.3"
+    p-map: "npm:^4.0.0"
+    promise-inflight: "npm:^1.0.1"
+    rimraf: "npm:^3.0.2"
+    ssri: "npm:^8.0.1"
+    tar: "npm:^6.0.2"
+    unique-filename: "npm:^1.1.1"
+  checksum: 10/1432d84f3f4b31421cf47c15e6956e5e736a93c65126b0fd69ae5f70643d29be8996f33d4995204f578850de5d556268540911c04ecc1c026375b18600534f08
+  languageName: node
+  linkType: hard
+
+"cacache@npm:^17.0.0":
+  version: 17.1.4
+  resolution: "cacache@npm:17.1.4"
+  dependencies:
+    "@npmcli/fs": "npm:^3.1.0"
+    fs-minipass: "npm:^3.0.0"
+    glob: "npm:^10.2.2"
+    lru-cache: "npm:^7.7.1"
+    minipass: "npm:^7.0.3"
+    minipass-collect: "npm:^1.0.2"
+    minipass-flush: "npm:^1.0.5"
+    minipass-pipeline: "npm:^1.2.4"
+    p-map: "npm:^4.0.0"
+    ssri: "npm:^10.0.0"
+    tar: "npm:^6.1.11"
+    unique-filename: "npm:^3.0.0"
+  checksum: 10/6e26c788bc6a18ff42f4d4f97db30d5c60a5dfac8e7c10a03b0307a92cf1b647570547cf3cd96463976c051eb9c7258629863f156e224c82018862c1a8ad0e70
+  languageName: node
+  linkType: hard
+
+"cacache@npm:^18.0.0":
+  version: 18.0.2
+  resolution: "cacache@npm:18.0.2"
+  dependencies:
+    "@npmcli/fs": "npm:^3.1.0"
+    fs-minipass: "npm:^3.0.0"
+    glob: "npm:^10.2.2"
+    lru-cache: "npm:^10.0.1"
+    minipass: "npm:^7.0.3"
+    minipass-collect: "npm:^2.0.1"
+    minipass-flush: "npm:^1.0.5"
+    minipass-pipeline: "npm:^1.2.4"
+    p-map: "npm:^4.0.0"
+    ssri: "npm:^10.0.0"
+    tar: "npm:^6.1.11"
+    unique-filename: "npm:^3.0.0"
+  checksum: 10/5ca58464f785d4d64ac2019fcad95451c8c89bea25949f63acd8987fcc3493eaef1beccc0fa39e673506d879d3fc1ab420760f8a14f8ddf46ea2d121805a5e96
   languageName: node
   linkType: hard
 
 "cachedir@npm:^2.3.0":
   version: 2.3.0
   resolution: "cachedir@npm:2.3.0"
-  checksum: ec90cb0f2e6336e266aa748dbadf3da9e0b20e843e43f1591acab7a3f1451337dc2f26cb9dd833ae8cfefeffeeb43ef5b5ff62782a685f4e3c2305dd98482fcb
+  checksum: 10/ec90cb0f2e6336e266aa748dbadf3da9e0b20e843e43f1591acab7a3f1451337dc2f26cb9dd833ae8cfefeffeeb43ef5b5ff62782a685f4e3c2305dd98482fcb
   languageName: node
   linkType: hard
 
 "calculate-size@npm:1.1.1":
   version: 1.1.1
   resolution: "calculate-size@npm:1.1.1"
-  checksum: 8f1bfad7a98f49c9d2dca2191a48fa4d3fe0815397f95eed44cd151d67ded5829e0232259fa0d33ca5fc371a87ffcf530085790a06637e02445e8dab0a6b28c9
+  checksum: 10/8f1bfad7a98f49c9d2dca2191a48fa4d3fe0815397f95eed44cd151d67ded5829e0232259fa0d33ca5fc371a87ffcf530085790a06637e02445e8dab0a6b28c9
   languageName: node
   linkType: hard
 
-"call-bind@npm:^1.0.0, call-bind@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "call-bind@npm:1.0.2"
+"call-bind@npm:^1.0.0, call-bind@npm:^1.0.2, call-bind@npm:^1.0.5, call-bind@npm:^1.0.6, call-bind@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "call-bind@npm:1.0.7"
   dependencies:
-    function-bind: ^1.1.1
-    get-intrinsic: ^1.0.2
-  checksum: f8e31de9d19988a4b80f3e704788c4a2d6b6f3d17cfec4f57dc29ced450c53a49270dc66bf0fbd693329ee948dd33e6c90a329519aef17474a4d961e8d6426b0
+    es-define-property: "npm:^1.0.0"
+    es-errors: "npm:^1.3.0"
+    function-bind: "npm:^1.1.2"
+    get-intrinsic: "npm:^1.2.4"
+    set-function-length: "npm:^1.2.1"
+  checksum: 10/cd6fe658e007af80985da5185bff7b55e12ef4c2b6f41829a26ed1eef254b1f1c12e3dfd5b2b068c6ba8b86aba62390842d81752e67dcbaec4f6f76e7113b6b7
   languageName: node
   linkType: hard
 
 "callsite@npm:^1.0.0":
   version: 1.0.0
   resolution: "callsite@npm:1.0.0"
-  checksum: 569686d622a288a4f0a827466c2f967b6d7a98f2ee1e6ada9dcf5a6802267a5e2a995d40f07113b5f95c7b2b2d5cbff4fdde590195f2a8bed24b829d048688f8
+  checksum: 10/39fc89ef9dbee7d5491bc69034fc16fbb8876a73456f831cc27060b5828e94357bb6705e0127a6d0182d79b03dbdb0ef88223d0b599c26667c871c89b30eb681
   languageName: node
   linkType: hard
 
 "callsites@npm:^3.0.0":
   version: 3.1.0
   resolution: "callsites@npm:3.1.0"
-  checksum: 072d17b6abb459c2ba96598918b55868af677154bec7e73d222ef95a8fdb9bbf7dae96a8421085cdad8cd190d86653b5b6dc55a4484f2e5b2e27d5e0c3fc15b3
+  checksum: 10/072d17b6abb459c2ba96598918b55868af677154bec7e73d222ef95a8fdb9bbf7dae96a8421085cdad8cd190d86653b5b6dc55a4484f2e5b2e27d5e0c3fc15b3
   languageName: node
   linkType: hard
 
@@ -12391,9 +13290,9 @@ __metadata:
   version: 4.1.2
   resolution: "camel-case@npm:4.1.2"
   dependencies:
-    pascal-case: ^3.1.2
-    tslib: ^2.0.3
-  checksum: bcbd25cd253b3cbc69be3f535750137dbf2beb70f093bdc575f73f800acc8443d34fd52ab8f0a2413c34f1e8203139ffc88428d8863e4dfe530cfb257a379ad6
+    pascal-case: "npm:^3.1.2"
+    tslib: "npm:^2.0.3"
+  checksum: 10/bcbd25cd253b3cbc69be3f535750137dbf2beb70f093bdc575f73f800acc8443d34fd52ab8f0a2413c34f1e8203139ffc88428d8863e4dfe530cfb257a379ad6
   languageName: node
   linkType: hard
 
@@ -12401,36 +13300,24 @@ __metadata:
   version: 6.2.2
   resolution: "camelcase-keys@npm:6.2.2"
   dependencies:
-    camelcase: ^5.3.1
-    map-obj: ^4.0.0
-    quick-lru: ^4.0.1
-  checksum: 43c9af1adf840471e54c68ab3e5fe8a62719a6b7dbf4e2e86886b7b0ff96112c945736342b837bd2529ec9d1c7d1934e5653318478d98e0cf22c475c04658e2a
-  languageName: node
-  linkType: hard
-
-"camelcase-keys@npm:^7.0.0":
-  version: 7.0.2
-  resolution: "camelcase-keys@npm:7.0.2"
-  dependencies:
-    camelcase: ^6.3.0
-    map-obj: ^4.1.0
-    quick-lru: ^5.1.1
-    type-fest: ^1.2.1
-  checksum: b5821cc48dd00e8398a30c5d6547f06837ab44de123f1b3a603d0a03399722b2fc67a485a7e47106eb02ef543c3b50c5ebaabc1242cde4b63a267c3258d2365b
+    camelcase: "npm:^5.3.1"
+    map-obj: "npm:^4.0.0"
+    quick-lru: "npm:^4.0.1"
+  checksum: 10/c1999f5b6d03bee7be9a36e48eef3da9e93e51b000677348ec8d15d51fc4418375890fb6c7155e387322d2ebb2a2cdebf9cd96607a6753d1d6c170d9b1e2eed5
   languageName: node
   linkType: hard
 
 "camelcase@npm:^5.3.1":
   version: 5.3.1
   resolution: "camelcase@npm:5.3.1"
-  checksum: e6effce26b9404e3c0f301498184f243811c30dfe6d0b9051863bd8e4034d09c8c2923794f280d6827e5aa055f6c434115ff97864a16a963366fb35fd673024b
+  checksum: 10/e6effce26b9404e3c0f301498184f243811c30dfe6d0b9051863bd8e4034d09c8c2923794f280d6827e5aa055f6c434115ff97864a16a963366fb35fd673024b
   languageName: node
   linkType: hard
 
-"camelcase@npm:^6.0.0, camelcase@npm:^6.2.0, camelcase@npm:^6.3.0":
+"camelcase@npm:^6.0.0, camelcase@npm:^6.2.0":
   version: 6.3.0
   resolution: "camelcase@npm:6.3.0"
-  checksum: 8c96818a9076434998511251dcb2761a94817ea17dbdc37f47ac080bd088fc62c7369429a19e2178b993497132c8cbcf5cc1f44ba963e76782ba469c0474938d
+  checksum: 10/8c96818a9076434998511251dcb2761a94817ea17dbdc37f47ac080bd088fc62c7369429a19e2178b993497132c8cbcf5cc1f44ba963e76782ba469c0474938d
   languageName: node
   linkType: hard
 
@@ -12438,25 +13325,25 @@ __metadata:
   version: 3.0.0
   resolution: "caniuse-api@npm:3.0.0"
   dependencies:
-    browserslist: ^4.0.0
-    caniuse-lite: ^1.0.0
-    lodash.memoize: ^4.1.2
-    lodash.uniq: ^4.5.0
-  checksum: db2a229383b20d0529b6b589dde99d7b6cb56ba371366f58cbbfa2929c9f42c01f873e2b6ef641d4eda9f0b4118de77dbb2805814670bdad4234bf08e720b0b4
+    browserslist: "npm:^4.0.0"
+    caniuse-lite: "npm:^1.0.0"
+    lodash.memoize: "npm:^4.1.2"
+    lodash.uniq: "npm:^4.5.0"
+  checksum: 10/db2a229383b20d0529b6b589dde99d7b6cb56ba371366f58cbbfa2929c9f42c01f873e2b6ef641d4eda9f0b4118de77dbb2805814670bdad4234bf08e720b0b4
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001464, caniuse-lite@npm:^1.0.30001539":
-  version: 1.0.30001541
-  resolution: "caniuse-lite@npm:1.0.30001541"
-  checksum: 972f6c223cf4ea2c6821b817b419249285006bbf67ebe415fe58097cf07551e3bae898586736d92f7c40b9f0ac28638dbf760631c23742b780affd0254f44d17
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001587, caniuse-lite@npm:^1.0.30001599":
+  version: 1.0.30001599
+  resolution: "caniuse-lite@npm:1.0.30001599"
+  checksum: 10/c9a5ad806fc0d446e4f995d551b840d8fdcbe97958b7f83ff7a255a8ef5e40ca12ca1a508c66b3ab147e19eef932d28772d205c046500dd0740ea9dfb602e2e1
   languageName: node
   linkType: hard
 
-"canvas-hypertxt@npm:^0.0.7":
-  version: 0.0.7
-  resolution: "canvas-hypertxt@npm:0.0.7"
-  checksum: 161ee134a4c7f0f75d569c432ee906b19661824cb8b959a7ce932b9cca0eb05cd42937a40ac6b6105f2f591046d714c5f13c1f8bbb0b1d0002eb600ee2dbb9a3
+"canvas-hypertxt@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "canvas-hypertxt@npm:1.0.3"
+  checksum: 10/e460d9c9b826c3820e2f997b25349a344e1f6bebf550837e4eaa057f849c0c5f49254a8315372c619b121fcc5fc3f7dbc57ab41143f264b535e9bd484d3e64e1
   languageName: node
   linkType: hard
 
@@ -12464,39 +13351,39 @@ __metadata:
   version: 3.0.10
   resolution: "canvg@npm:3.0.10"
   dependencies:
-    "@babel/runtime": ^7.12.5
-    "@types/raf": ^3.4.0
-    core-js: ^3.8.3
-    raf: ^3.4.1
-    regenerator-runtime: ^0.13.7
-    rgbcolor: ^1.0.1
-    stackblur-canvas: ^2.0.0
-    svg-pathdata: ^6.0.3
-  checksum: 2cfd86bcb9b56b43a97745cc672e696169b4c09e8850fb4f27bec5ebf173179d16feb594224d643a32f1ce01e47b55d44e0058419114d48d34f12c2452c65927
+    "@babel/runtime": "npm:^7.12.5"
+    "@types/raf": "npm:^3.4.0"
+    core-js: "npm:^3.8.3"
+    raf: "npm:^3.4.1"
+    regenerator-runtime: "npm:^0.13.7"
+    rgbcolor: "npm:^1.0.1"
+    stackblur-canvas: "npm:^2.0.0"
+    svg-pathdata: "npm:^6.0.3"
+  checksum: 10/b8b418483df010e38c6a63597425d5826206e8295467ca6db24a42dacc56b5960dfd484d16fdf3e144fff54777a91e551be227588b76cc9ca71fb0efd3afde0e
   languageName: node
   linkType: hard
 
 "case-sensitive-paths-webpack-plugin@npm:^2.4.0":
   version: 2.4.0
   resolution: "case-sensitive-paths-webpack-plugin@npm:2.4.0"
-  checksum: bcf469446eeee9ac0046e30860074ebb9aa4803aab9140e6bb72b600b23b1d70635690754be4504ce35cd99cdf05226bee8d894ba362a3f5485d5f6310fc6d02
+  checksum: 10/8187f4a6d9c1342a62e76466d4f2ed53e6c0ea73fdbf7779751538f2abe49738bfd16b43592367f00f37fdd593accf92162c1043c016dd6d9ccb55180b6b5fa7
   languageName: node
   linkType: hard
 
 "caseless@npm:~0.12.0":
   version: 0.12.0
   resolution: "caseless@npm:0.12.0"
-  checksum: b43bd4c440aa1e8ee6baefee8063b4850fd0d7b378f6aabc796c9ec8cb26d27fb30b46885350777d9bd079c5256c0e1329ad0dc7c2817e0bb466810ebb353751
+  checksum: 10/ea1efdf430975fdbac3505cdd21007f7ac5aa29b6d4d1c091f965853cd1bf87e4b08ea07b31a6d688b038872b7cdf0589d9262d59c699d199585daad052aeb20
   languageName: node
   linkType: hard
 
-"centrifuge@npm:4.0.1":
-  version: 4.0.1
-  resolution: "centrifuge@npm:4.0.1"
+"centrifuge@npm:5.0.2":
+  version: 5.0.2
+  resolution: "centrifuge@npm:5.0.2"
   dependencies:
-    events: ^3.3.0
-    protobufjs: ^7.2.4
-  checksum: 5cfa25d2688089e5c70e2a894b0f133cfc852828ff84d44a08a0ff2d60c2dceaea50f4ee5b1ffb37b1bab61ef28a25e6d803c63d03fd93566f1466e02b15262f
+    events: "npm:^3.3.0"
+    protobufjs: "npm:^7.2.5"
+  checksum: 10/d11e7448df3da8053102afb2bea0906c6e7335dfcc1a560240f60d93c8fc6a6be02c6c9e7db89e2796d2a1c1fe2b84719e673b627d300926f2f54eff4ae4da26
   languageName: node
   linkType: hard
 
@@ -12504,9 +13391,9 @@ __metadata:
   version: 4.1.0
   resolution: "chalk@npm:4.1.0"
   dependencies:
-    ansi-styles: ^4.1.0
-    supports-color: ^7.1.0
-  checksum: 5561c7b4c063badee3e16d04bce50bd033e1be1bf4c6948639275683ffa7a1993c44639b43c22b1c505f0f813a24b1889037eb182546b48946f9fe7cdd0e7d13
+    ansi-styles: "npm:^4.1.0"
+    supports-color: "npm:^7.1.0"
+  checksum: 10/e8d2b9b9abe5aee78caae44e2fd86ade56e440df5822006d702ce18771c00418b6f2c0eb294093d5486b852c83f021e409205d0ee07095fb14f5c8f9db9e7f80
   languageName: node
   linkType: hard
 
@@ -12514,10 +13401,10 @@ __metadata:
   version: 2.4.2
   resolution: "chalk@npm:2.4.2"
   dependencies:
-    ansi-styles: ^3.2.1
-    escape-string-regexp: ^1.0.5
-    supports-color: ^5.3.0
-  checksum: ec3661d38fe77f681200f878edbd9448821924e0f93a9cefc0e26a33b145f1027a2084bf19967160d11e1f03bfe4eaffcabf5493b89098b2782c3fe0b03d80c2
+    ansi-styles: "npm:^3.2.1"
+    escape-string-regexp: "npm:^1.0.5"
+    supports-color: "npm:^5.3.0"
+  checksum: 10/3d1d103433166f6bfe82ac75724951b33769675252d8417317363ef9d54699b7c3b2d46671b772b893a8e50c3ece70c4b933c73c01e81bc60ea4df9b55afa303
   languageName: node
   linkType: hard
 
@@ -12525,9 +13412,9 @@ __metadata:
   version: 3.0.0
   resolution: "chalk@npm:3.0.0"
   dependencies:
-    ansi-styles: ^4.1.0
-    supports-color: ^7.1.0
-  checksum: 8e3ddf3981c4da405ddbd7d9c8d91944ddf6e33d6837756979f7840a29272a69a5189ecae0ff84006750d6d1e92368d413335eab4db5476db6e6703a1d1e0505
+    ansi-styles: "npm:^4.1.0"
+    supports-color: "npm:^7.1.0"
+  checksum: 10/37f90b31fd655fb49c2bd8e2a68aebefddd64522655d001ef417e6f955def0ed9110a867ffc878a533f2dafea5f2032433a37c8a7614969baa7f8a1cd424ddfc
   languageName: node
   linkType: hard
 
@@ -12535,58 +13422,72 @@ __metadata:
   version: 4.1.2
   resolution: "chalk@npm:4.1.2"
   dependencies:
-    ansi-styles: ^4.1.0
-    supports-color: ^7.1.0
-  checksum: fe75c9d5c76a7a98d45495b91b2172fa3b7a09e0cc9370e5c8feb1c567b85c4288e2b3fded7cfdd7359ac28d6b3844feb8b82b8686842e93d23c827c417e83fc
+    ansi-styles: "npm:^4.1.0"
+    supports-color: "npm:^7.1.0"
+  checksum: 10/cb3f3e594913d63b1814d7ca7c9bafbf895f75fbf93b92991980610dfd7b48500af4e3a5d4e3a8f337990a96b168d7eb84ee55efdce965e2ee8efc20f8c8f139
+  languageName: node
+  linkType: hard
+
+"chalk@npm:^5.2.0":
+  version: 5.3.0
+  resolution: "chalk@npm:5.3.0"
+  checksum: 10/6373caaab21bd64c405bfc4bd9672b145647fc9482657b5ea1d549b3b2765054e9d3d928870cdf764fb4aad67555f5061538ff247b8310f110c5c888d92397ea
   languageName: node
   linkType: hard
 
 "chance@npm:^1.0.10":
   version: 1.1.11
   resolution: "chance@npm:1.1.11"
-  checksum: 2e871fcc76584d274f860f0f25380b6ab547caf0d22d8b043a313be73d5c3db38941373241f83aeba049e7511f752f9746dc722a0f2b0182020d493c4e11da84
+  checksum: 10/d76cc76dbcb837f051e6080d94be8bdcd07559d52077854f614c7081062fee10d4c3b508f6ae4b70303dac000422ea35160b01de165fcd176a01f67ea4b2cef5
   languageName: node
   linkType: hard
 
 "char-regex@npm:^1.0.2":
   version: 1.0.2
   resolution: "char-regex@npm:1.0.2"
-  checksum: b563e4b6039b15213114626621e7a3d12f31008bdce20f9c741d69987f62aeaace7ec30f6018890ad77b2e9b4d95324c9f5acfca58a9441e3b1dcdd1e2525d17
+  checksum: 10/1ec5c2906adb9f84e7f6732a40baef05d7c85401b82ffcbc44b85fbd0f7a2b0c2a96f2eb9cf55cae3235dc12d4023003b88f09bcae8be9ae894f52ed746f4d48
+  languageName: node
+  linkType: hard
+
+"char-regex@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "char-regex@npm:2.0.1"
+  checksum: 10/fadd100b963c160a70192e47e122c654cadf447c2c8f23b0bda4dc9ef1a02c993abbb0f21f50e2e58f90a8453ca019b3c86f001688cb42fb7b54af4e661b1ada
   languageName: node
   linkType: hard
 
 "character-entities-legacy@npm:^1.0.0":
   version: 1.1.4
   resolution: "character-entities-legacy@npm:1.1.4"
-  checksum: fe03a82c154414da3a0c8ab3188e4237ec68006cbcd681cf23c7cfb9502a0e76cd30ab69a2e50857ca10d984d57de3b307680fff5328ccd427f400e559c3a811
+  checksum: 10/fe03a82c154414da3a0c8ab3188e4237ec68006cbcd681cf23c7cfb9502a0e76cd30ab69a2e50857ca10d984d57de3b307680fff5328ccd427f400e559c3a811
   languageName: node
   linkType: hard
 
 "character-entities@npm:^1.0.0":
   version: 1.2.4
   resolution: "character-entities@npm:1.2.4"
-  checksum: e1545716571ead57beac008433c1ff69517cd8ca5b336889321c5b8ff4a99c29b65589a701e9c086cda8a5e346a67295e2684f6c7ea96819fe85cbf49bf8686d
+  checksum: 10/7c11641c48d1891aaba7bc800d4500804d91a28f46d64e88c001c38e6ab2e7eae28873a77ae16e6c55d24cac35ddfbb15efe56c3012b86684a3c4e95c70216b7
   languageName: node
   linkType: hard
 
 "character-reference-invalid@npm:^1.0.0":
   version: 1.1.4
   resolution: "character-reference-invalid@npm:1.1.4"
-  checksum: 20274574c70e05e2f81135f3b93285536bc8ff70f37f0809b0d17791a832838f1e49938382899ed4cb444e5bbd4314ca1415231344ba29f4222ce2ccf24fea0b
+  checksum: 10/812ebc5e6e8d08fd2fa5245ae78c1e1a4bea4692e93749d256a135c4a442daf931ca18e067cc61ff4a58a419eae52677126a0bc4f05a511290427d60d3057805
   languageName: node
   linkType: hard
 
 "chardet@npm:^0.7.0":
   version: 0.7.0
   resolution: "chardet@npm:0.7.0"
-  checksum: 6fd5da1f5d18ff5712c1e0aed41da200d7c51c28f11b36ee3c7b483f3696dabc08927fc6b227735eb8f0e1215c9a8abd8154637f3eff8cada5959df7f58b024d
+  checksum: 10/b0ec668fba5eeec575ed2559a0917ba41a6481f49063c8445400e476754e0957ee09e44dc032310f526182b8f1bf25e9d4ed371f74050af7be1383e06bc44952
   languageName: node
   linkType: hard
 
 "check-more-types@npm:^2.24.0":
   version: 2.24.0
   resolution: "check-more-types@npm:2.24.0"
-  checksum: b09080ec3404d20a4b0ead828994b2e5913236ef44ed3033a27062af0004cf7d2091fbde4b396bf13b7ce02fb018bc9960b48305e6ab2304cd82d73ed7a51ef4
+  checksum: 10/67c5288443bd73a81638e1185f8c5410d0edf6458c086149ef1cda95c07535b5dd5c11c426dc3ee8f0de0f3244aa2d4f2ba1937aaa8a94995589cdcce0bbccb9
   languageName: node
   linkType: hard
 
@@ -12594,13 +13495,13 @@ __metadata:
   version: 2.1.0
   resolution: "cheerio-select@npm:2.1.0"
   dependencies:
-    boolbase: ^1.0.0
-    css-select: ^5.1.0
-    css-what: ^6.1.0
-    domelementtype: ^2.3.0
-    domhandler: ^5.0.3
-    domutils: ^3.0.1
-  checksum: 843d6d479922f28a6c5342c935aff1347491156814de63c585a6eb73baf7bb4185c1b4383a1195dca0f12e3946d737c7763bcef0b9544c515d905c5c44c5308b
+    boolbase: "npm:^1.0.0"
+    css-select: "npm:^5.1.0"
+    css-what: "npm:^6.1.0"
+    domelementtype: "npm:^2.3.0"
+    domhandler: "npm:^5.0.3"
+    domutils: "npm:^3.0.1"
+  checksum: 10/b5d89208c23468c3a32d1e04f88b9e8c6e332e3649650c5cd29255e2cebc215071ae18563f58c3dc3f6ef4c234488fc486035490fceb78755572288245e2931a
   languageName: node
   linkType: hard
 
@@ -12608,47 +13509,73 @@ __metadata:
   version: 1.0.0-rc.12
   resolution: "cheerio@npm:1.0.0-rc.12"
   dependencies:
-    cheerio-select: ^2.1.0
-    dom-serializer: ^2.0.0
-    domhandler: ^5.0.3
-    domutils: ^3.0.1
-    htmlparser2: ^8.0.1
-    parse5: ^7.0.0
-    parse5-htmlparser2-tree-adapter: ^7.0.0
-  checksum: 5d4c1b7a53cf22d3a2eddc0aff70cf23cbb30d01a4c79013e703a012475c02461aa1fcd99127e8d83a02216386ed6942b2c8103845fd0812300dd199e6e7e054
+    cheerio-select: "npm:^2.1.0"
+    dom-serializer: "npm:^2.0.0"
+    domhandler: "npm:^5.0.3"
+    domutils: "npm:^3.0.1"
+    htmlparser2: "npm:^8.0.1"
+    parse5: "npm:^7.0.0"
+    parse5-htmlparser2-tree-adapter: "npm:^7.0.0"
+  checksum: 10/812fed61aa4b669bbbdd057d0d7f73ba4649cabfd4fc3a8f1d5c7499e4613b430636102716369cbd6bbed8f1bdcb06387ae8342289fb908b2743184775f94f18
+  languageName: node
+  linkType: hard
+
+"cheminfo-types@npm:^1.7.2":
+  version: 1.7.2
+  resolution: "cheminfo-types@npm:1.7.2"
+  checksum: 10/26c4db9600c786aff28276c8dbc48779f6c20705c3673558344282340d3b9d14554f306994e627396678475b50728a96134d99a794271b86301f6945fab355de
   languageName: node
   linkType: hard
 
-"chokidar@npm:3.5.3, chokidar@npm:>=3.0.0 <4.0.0, chokidar@npm:^3.3.1, chokidar@npm:^3.4.2, chokidar@npm:^3.5.1, chokidar@npm:^3.5.3":
+"chokidar@npm:3.5.3":
   version: 3.5.3
   resolution: "chokidar@npm:3.5.3"
   dependencies:
-    anymatch: ~3.1.2
-    braces: ~3.0.2
-    fsevents: ~2.3.2
-    glob-parent: ~5.1.2
-    is-binary-path: ~2.1.0
-    is-glob: ~4.0.1
-    normalize-path: ~3.0.0
-    readdirp: ~3.6.0
+    anymatch: "npm:~3.1.2"
+    braces: "npm:~3.0.2"
+    fsevents: "npm:~2.3.2"
+    glob-parent: "npm:~5.1.2"
+    is-binary-path: "npm:~2.1.0"
+    is-glob: "npm:~4.0.1"
+    normalize-path: "npm:~3.0.0"
+    readdirp: "npm:~3.6.0"
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  checksum: 10/863e3ff78ee7a4a24513d2a416856e84c8e4f5e60efbe03e8ab791af1a183f569b62fc6f6b8044e2804966cb81277ddbbc1dc374fba3265bd609ea8efd62f5b3
+  languageName: node
+  linkType: hard
+
+"chokidar@npm:>=3.0.0 <4.0.0, chokidar@npm:^3.3.1, chokidar@npm:^3.5.3, chokidar@npm:^3.6.0":
+  version: 3.6.0
+  resolution: "chokidar@npm:3.6.0"
+  dependencies:
+    anymatch: "npm:~3.1.2"
+    braces: "npm:~3.0.2"
+    fsevents: "npm:~2.3.2"
+    glob-parent: "npm:~5.1.2"
+    is-binary-path: "npm:~2.1.0"
+    is-glob: "npm:~4.0.1"
+    normalize-path: "npm:~3.0.0"
+    readdirp: "npm:~3.6.0"
   dependenciesMeta:
     fsevents:
       optional: true
-  checksum: b49fcde40176ba007ff361b198a2d35df60d9bb2a5aab228279eb810feae9294a6b4649ab15981304447afe1e6ffbf4788ad5db77235dc770ab777c6e771980c
+  checksum: 10/c327fb07704443f8d15f7b4a7ce93b2f0bc0e6cea07ec28a7570aa22cd51fcf0379df589403976ea956c369f25aa82d84561947e227cd925902e1751371658df
   languageName: node
   linkType: hard
 
 "chownr@npm:^1.1.1":
   version: 1.1.4
   resolution: "chownr@npm:1.1.4"
-  checksum: 115648f8eb38bac5e41c3857f3e663f9c39ed6480d1349977c4d96c95a47266fcacc5a5aabf3cb6c481e22d72f41992827db47301851766c4fd77ac21a4f081d
+  checksum: 10/115648f8eb38bac5e41c3857f3e663f9c39ed6480d1349977c4d96c95a47266fcacc5a5aabf3cb6c481e22d72f41992827db47301851766c4fd77ac21a4f081d
   languageName: node
   linkType: hard
 
 "chownr@npm:^2.0.0":
   version: 2.0.0
   resolution: "chownr@npm:2.0.0"
-  checksum: c57cf9dd0791e2f18a5ee9c1a299ae6e801ff58fee96dc8bfd0dcb4738a6ce58dd252a3605b1c93c6418fe4f9d5093b28ffbf4d66648cb2a9c67eaef9679be2f
+  checksum: 10/c57cf9dd0791e2f18a5ee9c1a299ae6e801ff58fee96dc8bfd0dcb4738a6ce58dd252a3605b1c93c6418fe4f9d5093b28ffbf4d66648cb2a9c67eaef9679be2f
   languageName: node
   linkType: hard
 
@@ -12656,71 +13583,55 @@ __metadata:
   version: 0.33.0
   resolution: "chrome-remote-interface@npm:0.33.0"
   dependencies:
-    commander: 2.11.x
-    ws: ^7.2.0
+    commander: "npm:2.11.x"
+    ws: "npm:^7.2.0"
   bin:
     chrome-remote-interface: bin/client.js
-  checksum: 8e874759fe0c2343b9363f3f79aa2f9073668ea7a0c964178887055e3bf9742251060c7d92c07ffa4a5371a0498ec9c120d4899f256cd74bebd67fc1c3383c3f
+  checksum: 10/17165692cfe7766853867b27c663bf8a994058e05f64e7503746dd22a352dc3dd403573212a47ba71a3dff58d83e1c1d6aecb349bab3265d30e647da0e14fbf0
   languageName: node
   linkType: hard
 
 "chrome-trace-event@npm:^1.0.2":
   version: 1.0.3
   resolution: "chrome-trace-event@npm:1.0.3"
-  checksum: cb8b1fc7e881aaef973bd0c4a43cd353c2ad8323fb471a041e64f7c2dd849cde4aad15f8b753331a32dda45c973f032c8a03b8177fc85d60eaa75e91e08bfb97
+  checksum: 10/b5fbdae5bf00c96fa3213de919f2b2617a942bfcb891cdf735fbad2a6f4f3c25d42e3f2b1703328619d352c718b46b9e18999fd3af7ef86c26c91db6fae1f0da
   languageName: node
   linkType: hard
 
-"ci-info@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "ci-info@npm:2.0.0"
-  checksum: 3b374666a85ea3ca43fa49aa3a048d21c9b475c96eb13c133505d2324e7ae5efd6a454f41efe46a152269e9b6a00c9edbe63ec7fa1921957165aae16625acd67
-  languageName: node
-  linkType: hard
-
-"ci-info@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "ci-info@npm:3.2.0"
-  checksum: c68995a94e95ce3f233ff845e62dfc56f2e8ff1e3f5c1361bcdd520cbbc9726d8a54cbc1a685cb9ee19c3c5e71a1dade6dda23eb364b59b8e6c32508a9b761bc
+"ci-info@npm:^3.2.0, ci-info@npm:^3.6.1":
+  version: 3.9.0
+  resolution: "ci-info@npm:3.9.0"
+  checksum: 10/75bc67902b4d1c7b435497adeb91598f6d52a3389398e44294f6601b20cfef32cf2176f7be0eb961d9e085bb333a8a5cae121cb22f81cf238ae7f58eb80e9397
   languageName: node
   linkType: hard
 
 "cjs-module-lexer@npm:^1.0.0":
   version: 1.2.2
   resolution: "cjs-module-lexer@npm:1.2.2"
-  checksum: 977f3f042bd4f08e368c890d91eecfbc4f91da0bc009a3c557bc4dfbf32022ad1141244ac1178d44de70fc9f3dea7add7cd9a658a34b9fae98a55d8f92331ce5
-  languageName: node
-  linkType: hard
-
-"classnames@npm:2.3.2, classnames@npm:2.x, classnames@npm:^2.2.1, classnames@npm:^2.2.5, classnames@npm:^2.2.6, classnames@npm:^2.3.1, classnames@npm:^2.3.2":
-  version: 2.3.2
-  resolution: "classnames@npm:2.3.2"
-  checksum: 2c62199789618d95545c872787137262e741f9db13328e216b093eea91c85ef2bfb152c1f9e63027204e2559a006a92eb74147d46c800a9f96297ae1d9f96f4e
+  checksum: 10/f80f84bfdcc53379cc18e25ea3c0cdb4595c142b8e28df304f5c88f38202e1bccf13e845401593656781f79fb43273e1d402d6187d0eeee8dca5ddecee1dcad4
   languageName: node
   linkType: hard
 
-"clean-css@npm:5.2.0":
-  version: 5.2.0
-  resolution: "clean-css@npm:5.2.0"
-  dependencies:
-    source-map: ~0.6.0
-  checksum: ccb63b244b200abf53a005429b50132845a49b994fb6a2889a7eb775d53fbde7cb0d0b13655e435b0c3a6788d5d0fbcd2f56ccf32da852ef21ae933198dcad24
+"classnames@npm:2.5.1, classnames@npm:2.x, classnames@npm:^2.2.1, classnames@npm:^2.2.5, classnames@npm:^2.2.6, classnames@npm:^2.3.1, classnames@npm:^2.3.2":
+  version: 2.5.1
+  resolution: "classnames@npm:2.5.1"
+  checksum: 10/58eb394e8817021b153bb6e7d782cfb667e4ab390cb2e9dac2fc7c6b979d1cc2b2a733093955fc5c94aa79ef5c8c89f11ab77780894509be6afbb91dddd79d15
   languageName: node
   linkType: hard
 
-"clean-css@npm:^5.1.5":
-  version: 5.2.2
-  resolution: "clean-css@npm:5.2.2"
+"clean-css@npm:^5.1.5, clean-css@npm:~5.3.2":
+  version: 5.3.3
+  resolution: "clean-css@npm:5.3.3"
   dependencies:
-    source-map: ~0.6.0
-  checksum: 10855820829b8b6ea94e462313fdc177b297aca5c7870a969591549d6a766824f912b5e58773bd345b2a7effae863ab492258b5a77a40029fba6d11d861cbee3
+    source-map: "npm:~0.6.0"
+  checksum: 10/2db1ae37b384c8ff0a06a12bfa80f56cc02b4abcaaf340db98c0ae88a61dd67c856653fd8135ace6eb0ec13aeab3089c425d2e4238d2a2ad6b6917e6ccc74729
   languageName: node
   linkType: hard
 
 "clean-stack@npm:^2.0.0":
   version: 2.2.0
   resolution: "clean-stack@npm:2.2.0"
-  checksum: 2ac8cd2b2f5ec986a3c743935ec85b07bc174d5421a5efc8017e1f146a1cf5f781ae962618f416352103b32c9cd7e203276e8c28241bbe946160cab16149fb68
+  checksum: 10/2ac8cd2b2f5ec986a3c743935ec85b07bc174d5421a5efc8017e1f146a1cf5f781ae962618f416352103b32c9cd7e203276e8c28241bbe946160cab16149fb68
   languageName: node
   linkType: hard
 
@@ -12728,15 +13639,22 @@ __metadata:
   version: 3.1.0
   resolution: "cli-cursor@npm:3.1.0"
   dependencies:
-    restore-cursor: ^3.1.0
-  checksum: 2692784c6cd2fd85cfdbd11f53aea73a463a6d64a77c3e098b2b4697a20443f430c220629e1ca3b195ea5ac4a97a74c2ee411f3807abf6df2b66211fec0c0a29
+    restore-cursor: "npm:^3.1.0"
+  checksum: 10/2692784c6cd2fd85cfdbd11f53aea73a463a6d64a77c3e098b2b4697a20443f430c220629e1ca3b195ea5ac4a97a74c2ee411f3807abf6df2b66211fec0c0a29
   languageName: node
   linkType: hard
 
-"cli-spinners@npm:2.6.1, cli-spinners@npm:^2.5.0":
+"cli-spinners@npm:2.6.1":
   version: 2.6.1
   resolution: "cli-spinners@npm:2.6.1"
-  checksum: 423409baaa7a58e5104b46ca1745fbfc5888bbd0b0c5a626e052ae1387060839c8efd512fb127e25769b3dc9562db1dc1b5add6e0b93b7ef64f477feb6416a45
+  checksum: 10/3e2dc5df72cf02120bebe256881fc8e3ec49867e5023d39f1e7340d7da57964f5236f4c75e568aa9dea6460b56f7a6d5870b89453c743c6c15e213cb52be2122
+  languageName: node
+  linkType: hard
+
+"cli-spinners@npm:^2.5.0, cli-spinners@npm:^2.9.2":
+  version: 2.9.2
+  resolution: "cli-spinners@npm:2.9.2"
+  checksum: 10/a0a863f442df35ed7294424f5491fa1756bd8d2e4ff0c8736531d886cec0ece4d85e8663b77a5afaf1d296e3cbbebff92e2e99f52bbea89b667cbe789b994794
   languageName: node
   linkType: hard
 
@@ -12744,12 +13662,12 @@ __metadata:
   version: 0.6.3
   resolution: "cli-table3@npm:0.6.3"
   dependencies:
-    "@colors/colors": 1.5.0
-    string-width: ^4.2.0
+    "@colors/colors": "npm:1.5.0"
+    string-width: "npm:^4.2.0"
   dependenciesMeta:
     "@colors/colors":
       optional: true
-  checksum: 09897f68467973f827c04e7eaadf13b55f8aec49ecd6647cc276386ea660059322e2dd8020a8b6b84d422dbdd619597046fa89cbbbdc95b2cea149a2df7c096c
+  checksum: 10/8d82b75be7edc7febb1283dc49582a521536527cba80af62a2e4522a0ee39c252886a1a2f02d05ae9d753204dbcffeb3a40d1358ee10dccd7fe8d935cfad3f85
   languageName: node
   linkType: hard
 
@@ -12757,23 +13675,23 @@ __metadata:
   version: 2.1.0
   resolution: "cli-truncate@npm:2.1.0"
   dependencies:
-    slice-ansi: ^3.0.0
-    string-width: ^4.2.0
-  checksum: bf1e4e6195392dc718bf9cd71f317b6300dc4a9191d052f31046b8773230ece4fa09458813bf0e3455a5e68c0690d2ea2c197d14a8b85a7b5e01c97f4b5feb5d
+    slice-ansi: "npm:^3.0.0"
+    string-width: "npm:^4.2.0"
+  checksum: 10/976f1887de067a8cd6ec830a7a8508336aebe6cec79b521d98ed13f67ef073b637f7305675b6247dd22f9e9cf045ec55fe746c7bdb288fbe8db0dfdc9fd52e55
   languageName: node
   linkType: hard
 
 "cli-width@npm:^3.0.0":
   version: 3.0.0
   resolution: "cli-width@npm:3.0.0"
-  checksum: 4c94af3769367a70e11ed69aa6095f1c600c0ff510f3921ab4045af961820d57c0233acfa8b6396037391f31b4c397e1f614d234294f979ff61430a6c166c3f6
+  checksum: 10/8730848b04fb189666ab037a35888d191c8f05b630b1d770b0b0e4c920b47bb5cc14bddf6b8ffe5bfc66cee97c8211d4d18e756c1ffcc75d7dbe7e1186cd7826
   languageName: node
   linkType: hard
 
-"client-only@npm:^0.0.1":
-  version: 0.0.1
-  resolution: "client-only@npm:0.0.1"
-  checksum: 0c16bf660dadb90610553c1d8946a7fdfb81d624adea073b8440b7d795d5b5b08beb3c950c6a2cf16279365a3265158a236876d92bce16423c485c322d7dfaf8
+"cli-width@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "cli-width@npm:4.1.0"
+  checksum: 10/b58876fbf0310a8a35c79b72ecfcf579b354e18ad04e6b20588724ea2b522799a758507a37dfe132fafaf93a9922cafd9514d9e1598e6b2cd46694853aed099f
   languageName: node
   linkType: hard
 
@@ -12781,10 +13699,10 @@ __metadata:
   version: 7.0.4
   resolution: "cliui@npm:7.0.4"
   dependencies:
-    string-width: ^4.2.0
-    strip-ansi: ^6.0.0
-    wrap-ansi: ^7.0.0
-  checksum: ce2e8f578a4813806788ac399b9e866297740eecd4ad1823c27fd344d78b22c5f8597d548adbcc46f0573e43e21e751f39446c5a5e804a12aace402b7a315d7f
+    string-width: "npm:^4.2.0"
+    strip-ansi: "npm:^6.0.0"
+    wrap-ansi: "npm:^7.0.0"
+  checksum: 10/db858c49af9d59a32d603987e6fddaca2ce716cd4602ba5a2bb3a5af1351eebe82aba8dff3ef3e1b331f7fa9d40ca66e67bdf8e7c327ce0ea959747ead65c0ef
   languageName: node
   linkType: hard
 
@@ -12792,97 +13710,77 @@ __metadata:
   version: 8.0.1
   resolution: "cliui@npm:8.0.1"
   dependencies:
-    string-width: ^4.2.0
-    strip-ansi: ^6.0.1
-    wrap-ansi: ^7.0.0
-  checksum: 79648b3b0045f2e285b76fb2e24e207c6db44323581e421c3acbd0e86454cba1b37aea976ab50195a49e7384b871e6dfb2247ad7dec53c02454ac6497394cb56
-  languageName: node
-  linkType: hard
-
-"clone-buffer@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "clone-buffer@npm:1.0.0"
-  checksum: a39a35e7fd081e0f362ba8195bd15cbc8205df1fbe4598bb4e09c1f9a13c0320a47ab8a61a8aa83561e4ed34dc07666d73254ee952ddd3985e4286b082fe63b9
+    string-width: "npm:^4.2.0"
+    strip-ansi: "npm:^6.0.1"
+    wrap-ansi: "npm:^7.0.0"
+  checksum: 10/eaa5561aeb3135c2cddf7a3b3f562fc4238ff3b3fc666869ef2adf264be0f372136702f16add9299087fb1907c2e4ec5dbfe83bd24bce815c70a80c6c1a2e950
   languageName: node
   linkType: hard
 
-"clone-deep@npm:^4.0.1":
+"clone-deep@npm:4.0.1, clone-deep@npm:^4.0.1":
   version: 4.0.1
   resolution: "clone-deep@npm:4.0.1"
   dependencies:
-    is-plain-object: ^2.0.4
-    kind-of: ^6.0.2
-    shallow-clone: ^3.0.0
-  checksum: 770f912fe4e6f21873c8e8fbb1e99134db3b93da32df271d00589ea4a29dbe83a9808a322c93f3bcaf8584b8b4fa6fc269fc8032efbaa6728e0c9886c74467d2
+    is-plain-object: "npm:^2.0.4"
+    kind-of: "npm:^6.0.2"
+    shallow-clone: "npm:^3.0.0"
+  checksum: 10/770f912fe4e6f21873c8e8fbb1e99134db3b93da32df271d00589ea4a29dbe83a9808a322c93f3bcaf8584b8b4fa6fc269fc8032efbaa6728e0c9886c74467d2
   languageName: node
   linkType: hard
 
 "clone-stats@npm:^1.0.0":
   version: 1.0.0
   resolution: "clone-stats@npm:1.0.0"
-  checksum: 654c0425afc5c5c55a4d95b2e0c6eccdd55b5247e7a1e7cca9000b13688b96b0a157950c72c5307f9fd61f17333ad796d3cd654778f2d605438012391cc4ada5
+  checksum: 10/654c0425afc5c5c55a4d95b2e0c6eccdd55b5247e7a1e7cca9000b13688b96b0a157950c72c5307f9fd61f17333ad796d3cd654778f2d605438012391cc4ada5
   languageName: node
   linkType: hard
 
 "clone@npm:^1.0.2":
   version: 1.0.4
   resolution: "clone@npm:1.0.4"
-  checksum: d06418b7335897209e77bdd430d04f882189582e67bd1f75a04565f3f07f5b3f119a9d670c943b6697d0afb100f03b866b3b8a1f91d4d02d72c4ecf2bb64b5dd
+  checksum: 10/d06418b7335897209e77bdd430d04f882189582e67bd1f75a04565f3f07f5b3f119a9d670c943b6697d0afb100f03b866b3b8a1f91d4d02d72c4ecf2bb64b5dd
   languageName: node
   linkType: hard
-
-"clone@npm:^2.1.1, clone@npm:^2.1.2":
-  version: 2.1.2
-  resolution: "clone@npm:2.1.2"
-  checksum: aaf106e9bc025b21333e2f4c12da539b568db4925c0501a1bf4070836c9e848c892fa22c35548ce0d1132b08bbbfa17a00144fe58fccdab6fa900fec4250f67d
-  languageName: node
-  linkType: hard
-
-"cloneable-readable@npm:^1.0.0":
-  version: 1.1.3
-  resolution: "cloneable-readable@npm:1.1.3"
-  dependencies:
-    inherits: ^2.0.1
-    process-nextick-args: ^2.0.0
-    readable-stream: ^2.3.5
-  checksum: 23b3741225a80c1760dff58aafb6a45383d5ee2d42de7124e4e674387cfad2404493d685b35ebfca9098f99c296e5c5719e748c9750c13838a2016ea2d2bb83a
+
+"clone@npm:^2.1.2":
+  version: 2.1.2
+  resolution: "clone@npm:2.1.2"
+  checksum: 10/d9c79efba655f0bf601ab299c57eb54cbaa9860fb011aee9d89ed5ac0d12df1660ab7642fddaabb9a26b7eff0e117d4520512cb70798319ff5d30a111b5310c2
   languageName: node
   linkType: hard
 
 "clsx@npm:^1.1.1":
   version: 1.2.1
   resolution: "clsx@npm:1.2.1"
-  checksum: 30befca8019b2eb7dbad38cff6266cf543091dae2825c856a62a8ccf2c3ab9c2907c4d12b288b73101196767f66812365400a227581484a05f968b0307cfaf12
+  checksum: 10/5ded6f61f15f1fa0350e691ccec43a28b12fb8e64c8e94715f2a937bc3722d4c3ed41d6e945c971fc4dcc2a7213a43323beaf2e1c28654af63ba70c9968a8643
   languageName: node
   linkType: hard
 
 "clsx@npm:^2.0.0":
   version: 2.0.0
   resolution: "clsx@npm:2.0.0"
-  checksum: a2cfb2351b254611acf92faa0daf15220f4cd648bdf96ce369d729813b85336993871a4bf6978ddea2b81b5a130478339c20d9d0b5c6fc287e5147f0c059276e
+  checksum: 10/943766d1b02fee3538c871e56638d87f973fbc2d6291ce221215ea436fdecb9be97ad323f411839c2d52c45640c449b1a53fbfe7e8b3d529b4e263308b630c9a
   languageName: node
   linkType: hard
 
-"cmd-shim@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "cmd-shim@npm:5.0.0"
-  dependencies:
-    mkdirp-infer-owner: ^2.0.0
-  checksum: 83d2a46cdf4adbb38d3d3184364b2df0e4c001ac770f5ca94373825d7a48838b4cb8a59534ef48f02b0d556caa047728589ca65c640c17c0b417b3afb34acfbb
+"cmd-shim@npm:6.0.1":
+  version: 6.0.1
+  resolution: "cmd-shim@npm:6.0.1"
+  checksum: 10/d0718e4a49265a9195ced19f662a77569ce5939145451125bdc8bb302781f15564ade92f6c49e231f9d0bb6f3d71db1a2d0a50af940490eb324e152325039541
   languageName: node
   linkType: hard
 
 "co@npm:^4.6.0":
   version: 4.6.0
   resolution: "co@npm:4.6.0"
-  checksum: 5210d9223010eb95b29df06a91116f2cf7c8e0748a9013ed853b53f362ea0e822f1e5bb054fb3cefc645239a4cf966af1f6133a3b43f40d591f3b68ed6cf0510
+  checksum: 10/a5d9f37091c70398a269e625cedff5622f200ed0aa0cff22ee7b55ed74a123834b58711776eb0f1dc58eb6ebbc1185aa7567b57bd5979a948c6e4f85073e2c05
   languageName: node
   linkType: hard
 
 "code-point-at@npm:^1.0.0":
   version: 1.1.0
   resolution: "code-point-at@npm:1.1.0"
-  checksum: 17d5666611f9b16d64fdf48176d9b7fb1c7d1c1607a189f7e600040a11a6616982876af148230336adb7d8fe728a559f743a4e29db3747e3b1a32fa7f4529681
+  checksum: 10/17d5666611f9b16d64fdf48176d9b7fb1c7d1c1607a189f7e600040a11a6616982876af148230336adb7d8fe728a559f743a4e29db3747e3b1a32fa7f4529681
   languageName: node
   linkType: hard
 
@@ -12890,25 +13788,25 @@ __metadata:
   version: 5.1.1
   resolution: "codeowners@npm:5.1.1"
   dependencies:
-    "@nodelib/fs.walk": ^1.2.6
-    commander: ^6.2.1
-    find-up: ^2.1.0
-    ignore: ^3.3.10
-    is-directory: ^0.3.1
-    lodash.intersection: ^4.4.0
-    lodash.maxby: ^4.6.0
-    lodash.padend: ^4.6.1
-    true-case-path: ^1.0.3
+    "@nodelib/fs.walk": "npm:^1.2.6"
+    commander: "npm:^6.2.1"
+    find-up: "npm:^2.1.0"
+    ignore: "npm:^3.3.10"
+    is-directory: "npm:^0.3.1"
+    lodash.intersection: "npm:^4.4.0"
+    lodash.maxby: "npm:^4.6.0"
+    lodash.padend: "npm:^4.6.1"
+    true-case-path: "npm:^1.0.3"
   bin:
     codeowners: index.js
-  checksum: 9ffd67403e9d0defc5b9906dd986734c2c2a02cad758ab95b722558a1817f47925dd2bac58327b860edd66806bf5cd72a24b1f377fe6215cf0576fee3bfbac48
+  checksum: 10/a2dd885d4ed7df95ec1abc6f8cf3810e28220473a84da2f295ee96f5d2c88e9d4f18309949a03eecf019b24ddde6e1a34e3dd1b53bec1d5d528564c12766254f
   languageName: node
   linkType: hard
 
 "collect-v8-coverage@npm:^1.0.0":
   version: 1.0.1
   resolution: "collect-v8-coverage@npm:1.0.1"
-  checksum: 4efe0a1fccd517b65478a2364b33dadd0a43fc92a56f59aaece9b6186fe5177b2de471253587de7c91516f07c7268c2f6770b6cbcffc0e0ece353b766ec87e55
+  checksum: 10/85b26945ab9b8e15077f877a4a5bc91d836480c600bac4cd0a0e8be8515583fdfc393ccff049ff3e9f46cac39e5295af049209f3c484f30a028056cc5dd1fe8a
   languageName: node
   linkType: hard
 
@@ -12916,8 +13814,8 @@ __metadata:
   version: 1.9.3
   resolution: "color-convert@npm:1.9.3"
   dependencies:
-    color-name: 1.1.3
-  checksum: fd7a64a17cde98fb923b1dd05c5f2e6f7aefda1b60d67e8d449f9328b4e53b228a428fd38bfeaeb2db2ff6b6503a776a996150b80cdf224062af08a5c8a3a203
+    color-name: "npm:1.1.3"
+  checksum: 10/ffa319025045f2973919d155f25e7c00d08836b6b33ea2d205418c59bd63a665d713c52d9737a9e0fe467fb194b40fbef1d849bae80d674568ee220a31ef3d10
   languageName: node
   linkType: hard
 
@@ -12925,69 +13823,76 @@ __metadata:
   version: 2.0.1
   resolution: "color-convert@npm:2.0.1"
   dependencies:
-    color-name: ~1.1.4
-  checksum: 79e6bdb9fd479a205c71d89574fccfb22bd9053bd98c6c4d870d65c132e5e904e6034978e55b43d69fcaa7433af2016ee203ce76eeba9cfa554b373e7f7db336
+    color-name: "npm:~1.1.4"
+  checksum: 10/fa00c91b4332b294de06b443923246bccebe9fab1b253f7fe1772d37b06a2269b4039a85e309abe1fe11b267b11c08d1d0473fda3badd6167f57313af2887a64
+  languageName: node
+  linkType: hard
+
+"color-convert@npm:~0.5.0":
+  version: 0.5.3
+  resolution: "color-convert@npm:0.5.3"
+  checksum: 10/00dc4256c07ed8760d7bbba234ff969c139eb964fe165853696852001002695c492e327d83ddb7a8cad8d27b49fa543d001328928c12474ee8ecb335bf5f2eb4
   languageName: node
   linkType: hard
 
 "color-name@npm:1.1.3":
   version: 1.1.3
   resolution: "color-name@npm:1.1.3"
-  checksum: 09c5d3e33d2105850153b14466501f2bfb30324a2f76568a408763a3b7433b0e50e5b4ab1947868e65cb101bb7cb75029553f2c333b6d4b8138a73fcc133d69d
+  checksum: 10/09c5d3e33d2105850153b14466501f2bfb30324a2f76568a408763a3b7433b0e50e5b4ab1947868e65cb101bb7cb75029553f2c333b6d4b8138a73fcc133d69d
   languageName: node
   linkType: hard
 
 "color-name@npm:^1.1.4, color-name@npm:~1.1.4":
   version: 1.1.4
   resolution: "color-name@npm:1.1.4"
-  checksum: b0445859521eb4021cd0fb0cc1a75cecf67fceecae89b63f62b201cca8d345baf8b952c966862a9d9a2632987d4f6581f0ec8d957dfacece86f0a7919316f610
+  checksum: 10/b0445859521eb4021cd0fb0cc1a75cecf67fceecae89b63f62b201cca8d345baf8b952c966862a9d9a2632987d4f6581f0ec8d957dfacece86f0a7919316f610
   languageName: node
   linkType: hard
 
-"color-support@npm:^1.1.3":
+"color-support@npm:^1.1.2, color-support@npm:^1.1.3":
   version: 1.1.3
   resolution: "color-support@npm:1.1.3"
   bin:
     color-support: bin.js
-  checksum: 9b7356817670b9a13a26ca5af1c21615463b500783b739b7634a0c2047c16cef4b2865d7576875c31c3cddf9dd621fa19285e628f20198b233a5cfdda6d0793b
+  checksum: 10/4bcfe30eea1498fe1cabc852bbda6c9770f230ea0e4faf4611c5858b1b9e4dde3730ac485e65f54ca182f4c50b626c1bea7c8441ceda47367a54a818c248aa7a
   languageName: node
   linkType: hard
 
 "colord@npm:^2.9.1, colord@npm:^2.9.3":
   version: 2.9.3
   resolution: "colord@npm:2.9.3"
-  checksum: 95d909bfbcfd8d5605cbb5af56f2d1ce2b323990258fd7c0d2eb0e6d3bb177254d7fb8213758db56bb4ede708964f78c6b992b326615f81a18a6aaf11d64c650
+  checksum: 10/907a4506d7307e2f580b471b581e992181ed75ab0c6925ece9ca46d88161d2fc50ed15891cd0556d0d9321237ca75afc9d462e4c050b939ef88428517f047f30
   languageName: node
   linkType: hard
 
 "colorette@npm:^1.1.0":
   version: 1.4.0
   resolution: "colorette@npm:1.4.0"
-  checksum: 01c3c16058b182a4ab4c126a65a75faa4d38a20fa7c845090b25453acec6c371bb2c5dceb0a2338511f17902b9d1a9af0cadd8509c9403894b79311032c256c3
+  checksum: 10/c8d6c8c3ef5a99acfc3dd9a68f48019f1479ec347551387e4a1762e40f69e98ce19d4dc321ffb4919d1f28a7bdc90c39d4e9a901f4c474fd2124ad93a00c0454
   languageName: node
   linkType: hard
 
 "colorette@npm:^2.0.10, colorette@npm:^2.0.14, colorette@npm:^2.0.16, colorette@npm:^2.0.19":
   version: 2.0.20
   resolution: "colorette@npm:2.0.20"
-  checksum: 0c016fea2b91b733eb9f4bcdb580018f52c0bc0979443dad930e5037a968237ac53d9beb98e218d2e9235834f8eebce7f8e080422d6194e957454255bde71d3d
+  checksum: 10/0b8de48bfa5d10afc160b8eaa2b9938f34a892530b2f7d7897e0458d9535a066e3998b49da9d21161c78225b272df19ae3a64d6df28b4c9734c0e55bbd02406f
   languageName: node
   linkType: hard
 
 "colors@npm:1.4.0":
   version: 1.4.0
   resolution: "colors@npm:1.4.0"
-  checksum: 98aa2c2418ad87dedf25d781be69dc5fc5908e279d9d30c34d8b702e586a0474605b3a189511482b9d5ed0d20c867515d22749537f7bc546256c6014f3ebdcec
+  checksum: 10/90b2d5465159813a3983ea72ca8cff75f784824ad70f2cc2b32c233e95bcfbcda101ebc6d6766bc50f57263792629bfb4f1f8a4dfbd1d240f229fc7f69b785fc
   languageName: node
   linkType: hard
 
-"columnify@npm:^1.6.0":
+"columnify@npm:1.6.0":
   version: 1.6.0
   resolution: "columnify@npm:1.6.0"
   dependencies:
-    strip-ansi: ^6.0.1
-    wcwidth: ^1.0.0
-  checksum: 0d590023616a27bcd2135c0f6ddd6fac94543263f9995538bbe391068976e30545e5534d369737ec7c3e9db4e53e70a277462de46aeb5a36e6997b4c7559c335
+    strip-ansi: "npm:^6.0.1"
+    wcwidth: "npm:^1.0.0"
+  checksum: 10/ab742cc646c07293db603f7a4387ca9d46d32beaaba0a08008c2f31f30042e6e5a940096fb7d2d432495597ed3d5c5fe07a5bacd55e4ac24a768d344a47dd678
   languageName: node
   linkType: hard
 
@@ -12995,134 +13900,127 @@ __metadata:
   version: 1.0.8
   resolution: "combined-stream@npm:1.0.8"
   dependencies:
-    delayed-stream: ~1.0.0
-  checksum: 49fa4aeb4916567e33ea81d088f6584749fc90c7abec76fd516bf1c5aa5c79f3584b5ba3de6b86d26ddd64bae5329c4c7479343250cfe71c75bb366eae53bb7c
+    delayed-stream: "npm:~1.0.0"
+  checksum: 10/2e969e637d05d09fa50b02d74c83a1186f6914aae89e6653b62595cc75a221464f884f55f231b8f4df7a49537fba60bdc0427acd2bf324c09a1dbb84837e36e4
   languageName: node
   linkType: hard
 
 "combokeys@npm:^3.0.0":
   version: 3.0.1
   resolution: "combokeys@npm:3.0.1"
-  checksum: 37ad8d0257476a57cdfd461968351419d3f01b2d73b71e1904d4c924dd13f4a33f7c05d2b2e07ac5c4e280e921fedd0d7308cd3ad549464d15fa5be970c7ce1d
+  checksum: 10/f87e6af9de8096c9cb097024ba27dbd7a190a45c69c4a87a0293b5de019c5d5e00ed4438f8e28eef7d82526e7dfa93fd539b28613b02e91837cba6ba5f4988cd
   languageName: node
   linkType: hard
 
 "comlink@npm:4.4.1, comlink@npm:^4.3.0":
   version: 4.4.1
   resolution: "comlink@npm:4.4.1"
-  checksum: 16d58a8f590087fc45432e31d6c138308dfd4b75b89aec0b7f7bb97ad33d810381bd2b1e608a1fb2cf05979af9cbfcdcaf1715996d5fcf77aeb013b6da3260af
+  checksum: 10/3d953e987874bf0d60c02a3dd96e9f661141e58709eaab82097369c585382935651ce61f004e7bb1a5eb868ca8d8734d1cec885965ae53c56567d91b9539f2d0
   languageName: node
   linkType: hard
 
 "comma-separated-tokens@npm:^1.0.0":
   version: 1.0.8
   resolution: "comma-separated-tokens@npm:1.0.8"
-  checksum: 0adcb07174fa4d08cf0f5c8e3aec40a36b5ff0c2c720e5e23f50fe02e6789d1d00a67036c80e0c1e1539f41d3e7f0101b074039dd833b4e4a59031b659d6ca0d
-  languageName: node
-  linkType: hard
-
-"command-score@npm:^0.1.2":
-  version: 0.1.2
-  resolution: "command-score@npm:0.1.2"
-  checksum: b733fd552d7e569070da3d474b1ed5f54785fdf3dd61670002e0a00b2eff1a547c2b6d3af3683c012f4f39c6455f9e7ee5e9997a79c08048ec37ec2195d3df08
+  checksum: 10/0adcb07174fa4d08cf0f5c8e3aec40a36b5ff0c2c720e5e23f50fe02e6789d1d00a67036c80e0c1e1539f41d3e7f0101b074039dd833b4e4a59031b659d6ca0d
   languageName: node
   linkType: hard
 
 "commander@npm:2.11.x":
   version: 2.11.0
   resolution: "commander@npm:2.11.0"
-  checksum: 0d0c622d129a801699b9bbf6fa518108c7e221e51ae12457119aec52f1142ab759b6cd3348ee253604e934639e200c8f0e1cf8342a2ba4b28b3565a7322ead14
+  checksum: 10/d8940de4ce2886aa32ae27a1533d10ce46da8c6dcd965075462a6b8d17b01f596ec329e1430f84a123e52675403f0c2b11a6a5d144eb46146da9ae974edbc2c0
   languageName: node
   linkType: hard
 
 "commander@npm:7, commander@npm:^7.2.0":
   version: 7.2.0
   resolution: "commander@npm:7.2.0"
-  checksum: 53501cbeee61d5157546c0bef0fedb6cdfc763a882136284bed9a07225f09a14b82d2a84e7637edfd1a679fb35ed9502fd58ef1d091e6287f60d790147f68ddc
+  checksum: 10/9973af10727ad4b44f26703bf3e9fdc323528660a7590efe3aa9ad5042b4584c0deed84ba443f61c9d6f02dade54a5a5d3c95e306a1e1630f8374ae6db16c06d
   languageName: node
   linkType: hard
 
 "commander@npm:8.3.0, commander@npm:^8.1.0, commander@npm:^8.3.0":
   version: 8.3.0
   resolution: "commander@npm:8.3.0"
-  checksum: 0f82321821fc27b83bd409510bb9deeebcfa799ff0bf5d102128b500b7af22872c0c92cb6a0ebc5a4cf19c6b550fba9cedfa7329d18c6442a625f851377bacf0
+  checksum: 10/6b7b5d334483ce24bd73c5dac2eab901a7dbb25fd983ea24a1eeac6e7166bb1967f641546e8abf1920afbde86a45fbfe5812fbc69d0dc451bb45ca416a12a3a3
   languageName: node
   linkType: hard
 
-"commander@npm:^10.0.1":
+"commander@npm:^10.0.0, commander@npm:^10.0.1":
   version: 10.0.1
   resolution: "commander@npm:10.0.1"
-  checksum: 436901d64a818295803c1996cd856621a74f30b9f9e28a588e726b2b1670665bccd7c1a77007ebf328729f0139838a88a19265858a0fa7a8728c4656796db948
+  checksum: 10/8799faa84a30da985802e661cc9856adfaee324d4b138413013ef7f087e8d7924b144c30a1f1405475f0909f467665cd9e1ce13270a2f41b141dab0b7a58f3fb
   languageName: node
   linkType: hard
 
 "commander@npm:^2.19.0, commander@npm:^2.20.0, commander@npm:^2.20.3":
   version: 2.20.3
   resolution: "commander@npm:2.20.3"
-  checksum: ab8c07884e42c3a8dbc5dd9592c606176c7eb5c1ca5ff274bcf907039b2c41de3626f684ea75ccf4d361ba004bbaff1f577d5384c155f3871e456bdf27becf9e
+  checksum: 10/90c5b6898610cd075984c58c4f88418a4fb44af08c1b1415e9854c03171bec31b336b7f3e4cefe33de994b3f12b03c5e2d638da4316df83593b9e82554e7e95b
   languageName: node
   linkType: hard
 
 "commander@npm:^5.1.0":
   version: 5.1.0
   resolution: "commander@npm:5.1.0"
-  checksum: 0b7fec1712fbcc6230fcb161d8d73b4730fa91a21dc089515489402ad78810547683f058e2a9835929c212fead1d6a6ade70db28bbb03edbc2829a9ab7d69447
+  checksum: 10/3e2ef5c003c5179250161e42ce6d48e0e69a54af970c65b7f985c70095240c260fd647453efd4c2c5a31b30ce468f373dc70f769c2f54a2c014abc4792aaca28
   languageName: node
   linkType: hard
 
 "commander@npm:^6.2.1":
   version: 6.2.1
   resolution: "commander@npm:6.2.1"
-  checksum: d7090410c0de6bc5c67d3ca41c41760d6d268f3c799e530aafb73b7437d1826bbf0d2a3edac33f8b57cc9887b4a986dce307fa5557e109be40eadb7c43b21742
+  checksum: 10/25b88c2efd0380c84f7844b39cf18510da7bfc5013692d68cdc65f764a1c34e6c8a36ea6d72b6620e3710a930cf8fab2695bdec2bf7107a0f4fa30a3ef3b7d0e
   languageName: node
   linkType: hard
 
-"commander@npm:^9.4.0, commander@npm:~9.4.1":
-  version: 9.4.1
-  resolution: "commander@npm:9.4.1"
-  checksum: bfb18e325a5bdf772763c2213d5c7d9e77144d944124e988bcd8e5e65fb6d45d5d4e86b09155d0f2556c9a59c31e428720e57968bcd050b2306e910a0bf3cf13
+"commander@npm:^9.4.1":
+  version: 9.5.0
+  resolution: "commander@npm:9.5.0"
+  checksum: 10/41c49b3d0f94a1fbeb0463c85b13f15aa15a9e0b4d5e10a49c0a1d58d4489b549d62262b052ae0aa6cfda53299bee487bfe337825df15e342114dde543f82906
   languageName: node
   linkType: hard
 
-"comment-parser@npm:1.3.1":
-  version: 1.3.1
-  resolution: "comment-parser@npm:1.3.1"
-  checksum: 421e6a113a3afd548500e7174ab46a2049dccf92e82bbaa3b209031b1bdf97552aabfa1ae2a120c0b62df17e1ba70e0d8b05d68504fee78e1ef974c59bcfe718
+"commander@npm:~11.1.0":
+  version: 11.1.0
+  resolution: "commander@npm:11.1.0"
+  checksum: 10/66bd2d8a0547f6cb1d34022efb25f348e433b0e04ad76a65279b1b09da108f59a4d3001ca539c60a7a46ea38bcf399fc17d91adad76a8cf43845d8dcbaf5cda1
   languageName: node
   linkType: hard
 
 "comment-parser@npm:1.4.0":
   version: 1.4.0
   resolution: "comment-parser@npm:1.4.0"
-  checksum: e086da3b14af9455177f1ab801bc54de9139a77fcef55dbfb751ae68d687ac83b0effb83d113ccf8cd217d9d93ce2b472002953cac342092a3fadfb9f5cd8e38
+  checksum: 10/3ce7a975946ebb0d8410b6713a371e25b5a144b633dd7c6e502c18c9a4e4f1f9167ed0eaa90b07cbc18e91ee061b99c2889d6bed88cd7f0dc32ed1bbac89008a
   languageName: node
   linkType: hard
 
-"common-ancestor-path@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "common-ancestor-path@npm:1.0.1"
-  checksum: 1d2e4186067083d8cc413f00fc2908225f04ae4e19417ded67faa6494fb313c4fcd5b28a52326d1a62b466e2b3a4325e92c31133c5fee628cdf8856b3a57c3d7
+"comment-parser@npm:1.4.1":
+  version: 1.4.1
+  resolution: "comment-parser@npm:1.4.1"
+  checksum: 10/16a3260b5e77819ebd9c99b0b65c7d6723b1ff73487bac9ce2d8f016a2847dd689e8663b88e1fad1444bbea89847c42f785708ac86a2c55f614f7095249bbf6b
   languageName: node
   linkType: hard
 
 "common-path-prefix@npm:^3.0.0":
   version: 3.0.0
   resolution: "common-path-prefix@npm:3.0.0"
-  checksum: fdb3c4f54e51e70d417ccd950c07f757582de800c0678ca388aedefefc84982039f346f9fd9a1252d08d2da9e9ef4019f580a1d1d3a10da031e4bb3c924c5818
+  checksum: 10/09c180e8d8495d42990d617f4d4b7522b5da20f6b236afe310192d401d1da8147a7835ae1ea37797ba0c2238ef3d06f3492151591451df34539fdb4b2630f2b3
   languageName: node
   linkType: hard
 
 "common-tags@npm:1.8.2, common-tags@npm:^1.8.0":
   version: 1.8.2
   resolution: "common-tags@npm:1.8.2"
-  checksum: 767a6255a84bbc47df49a60ab583053bb29a7d9687066a18500a516188a062c4e4cd52de341f22de0b07062e699b1b8fe3cfa1cb55b241cb9301aeb4f45b4dff
+  checksum: 10/c665d0f463ee79dda801471ad8da6cb33ff7332ba45609916a508ad3d77ba07ca9deeb452e83f81f24c2b081e2c1315347f23d239210e63d1c5e1a0c7c019fe2
   languageName: node
   linkType: hard
 
 "commondir@npm:^1.0.1":
   version: 1.0.1
   resolution: "commondir@npm:1.0.1"
-  checksum: 59715f2fc456a73f68826285718503340b9f0dd89bfffc42749906c5cf3d4277ef11ef1cca0350d0e79204f00f1f6d83851ececc9095dc88512a697ac0b9bdcb
+  checksum: 10/4620bc4936a4ef12ce7dfcd272bb23a99f2ad68889a4e4ad766c9f8ad21af982511934d6f7050d4a8bde90011b1c15d56e61a1b4576d9913efbf697a20172d6c
   languageName: node
   linkType: hard
 
@@ -13130,9 +14028,9 @@ __metadata:
   version: 2.0.0
   resolution: "compare-func@npm:2.0.0"
   dependencies:
-    array-ify: ^1.0.0
-    dot-prop: ^5.1.0
-  checksum: fb71d70632baa1e93283cf9d80f30ac97f003aabee026e0b4426c9716678079ef5fea7519b84d012cbed938c476493866a38a79760564a9e21ae9433e40e6f0d
+    array-ify: "npm:^1.0.0"
+    dot-prop: "npm:^5.1.0"
+  checksum: 10/fb71d70632baa1e93283cf9d80f30ac97f003aabee026e0b4426c9716678079ef5fea7519b84d012cbed938c476493866a38a79760564a9e21ae9433e40e6f0d
   languageName: node
   linkType: hard
 
@@ -13140,15 +14038,29 @@ __metadata:
   version: 1.2.6
   resolution: "component-classes@npm:1.2.6"
   dependencies:
-    component-indexof: 0.0.3
-  checksum: e488bbd0f67bd1b97934ce4f15c8b1f7294cfb232fac5f61c379ddef559b409340a0c51a438ec6105d9b5c1fa50ce0dfc37064fabf3ad12d92849e84b59ceaaf
+    component-indexof: "npm:0.0.3"
+  checksum: 10/aa70f282b85a19d7a190dabb2c72c9b8a2a5565fc42d72ca0661e8ce47e55e53da29f468467771d7e0bf4ba8c9723e5a21954fc38b942d9d873ee56be856adfc
+  languageName: node
+  linkType: hard
+
+"component-emitter@npm:2.0.0":
+  version: 2.0.0
+  resolution: "component-emitter@npm:2.0.0"
+  checksum: 10/017715272fcf82203932237260451df4c7c27e32a51a4a291faf6f503d6ef9e8583add993850cb5b98cc0c1b0846ff0c68938ad3ef1d544f9b480a290e74fb4f
+  languageName: node
+  linkType: hard
+
+"component-emitter@npm:^1.2.1":
+  version: 1.3.1
+  resolution: "component-emitter@npm:1.3.1"
+  checksum: 10/94550aa462c7bd5a61c1bc480e28554aa306066930152d1b1844a0dd3845d4e5db7e261ddec62ae184913b3e59b55a2ad84093b9d3596a8f17c341514d6c483d
   languageName: node
   linkType: hard
 
 "component-indexof@npm:0.0.3":
   version: 0.0.3
   resolution: "component-indexof@npm:0.0.3"
-  checksum: 1fcf1954c7b39a064181ac013fed7f38bccb585e89075a0b5d83e7c371c2ac55d067c5dd04e62df05b04ca1b59b4fde3470f5be74287c94f6dc6142aa4f9c5fd
+  checksum: 10/34a720e96fc0be1043a4517845b1b7483989736c559089eca285f7ac9ef049eacc8ab12fc31f924dfa2d4ecea0714611a695d087ce11caf30502b5a80646e9e9
   languageName: node
   linkType: hard
 
@@ -13156,8 +14068,8 @@ __metadata:
   version: 2.0.18
   resolution: "compressible@npm:2.0.18"
   dependencies:
-    mime-db: ">= 1.43.0 < 2"
-  checksum: 58321a85b375d39230405654721353f709d0c1442129e9a17081771b816302a012471a9b8f4864c7dbe02eef7f2aaac3c614795197092262e94b409c9be108f0
+    mime-db: "npm:>= 1.43.0 < 2"
+  checksum: 10/58321a85b375d39230405654721353f709d0c1442129e9a17081771b816302a012471a9b8f4864c7dbe02eef7f2aaac3c614795197092262e94b409c9be108f0
   languageName: node
   linkType: hard
 
@@ -13165,21 +14077,21 @@ __metadata:
   version: 1.7.4
   resolution: "compression@npm:1.7.4"
   dependencies:
-    accepts: ~1.3.5
-    bytes: 3.0.0
-    compressible: ~2.0.16
-    debug: 2.6.9
-    on-headers: ~1.0.2
-    safe-buffer: 5.1.2
-    vary: ~1.1.2
-  checksum: 35c0f2eb1f28418978615dc1bc02075b34b1568f7f56c62d60f4214d4b7cc00d0f6d282b5f8a954f59872396bd770b6b15ffd8aa94c67d4bce9b8887b906999b
+    accepts: "npm:~1.3.5"
+    bytes: "npm:3.0.0"
+    compressible: "npm:~2.0.16"
+    debug: "npm:2.6.9"
+    on-headers: "npm:~1.0.2"
+    safe-buffer: "npm:5.1.2"
+    vary: "npm:~1.1.2"
+  checksum: 10/469cd097908fe1d3ff146596d4c24216ad25eabb565c5456660bdcb3a14c82ebc45c23ce56e19fc642746cf407093b55ab9aa1ac30b06883b27c6c736e6383c2
   languageName: node
   linkType: hard
 
 "concat-map@npm:0.0.1":
   version: 0.0.1
   resolution: "concat-map@npm:0.0.1"
-  checksum: 902a9f5d8967a3e2faf138d5cb784b9979bad2e6db5357c5b21c568df4ebe62bcb15108af1b2253744844eb964fc023fbd9afbbbb6ddd0bcc204c6fb5b7bf3af
+  checksum: 10/9680699c8e2b3af0ae22592cb764acaf973f292a7b71b8a06720233011853a58e256c89216a10cbe889727532fd77f8bcd49a760cedfde271b8e006c20e079f2
   languageName: node
   linkType: hard
 
@@ -13187,54 +14099,51 @@ __metadata:
   version: 1.6.2
   resolution: "concat-stream@npm:1.6.2"
   dependencies:
-    buffer-from: ^1.0.0
-    inherits: ^2.0.3
-    readable-stream: ^2.2.2
-    typedarray: ^0.0.6
-  checksum: 1ef77032cb4459dcd5187bd710d6fc962b067b64ec6a505810de3d2b8cc0605638551b42f8ec91edf6fcd26141b32ef19ad749239b58fae3aba99187adc32285
+    buffer-from: "npm:^1.0.0"
+    inherits: "npm:^2.0.3"
+    readable-stream: "npm:^2.2.2"
+    typedarray: "npm:^0.0.6"
+  checksum: 10/71db903c84fc073ca35a274074e8d26c4330713d299f8623e993c448c1f6bf8b967806dd1d1a7b0f8add6f15ab1af7435df21fe79b4fe7efd78420c89e054e28
   languageName: node
   linkType: hard
 
-"concat-stream@npm:^2.0.0, concat-stream@npm:~2.0.0":
+"concat-stream@npm:^2.0.0":
   version: 2.0.0
   resolution: "concat-stream@npm:2.0.0"
   dependencies:
-    buffer-from: ^1.0.0
-    inherits: ^2.0.3
-    readable-stream: ^3.0.2
-    typedarray: ^0.0.6
-  checksum: d7f75d48f0ecd356c1545d87e22f57b488172811b1181d96021c7c4b14ab8855f5313280263dca44bb06e5222f274d047da3e290a38841ef87b59719bde967c7
-  languageName: node
-  linkType: hard
-
-"config-chain@npm:^1.1.12":
-  version: 1.1.13
-  resolution: "config-chain@npm:1.1.13"
-  dependencies:
-    ini: ^1.3.4
-    proto-list: ~1.2.1
-  checksum: 828137a28e7c2fc4b7fb229bd0cd6c1397bcf83434de54347e608154008f411749041ee392cbe42fab6307e02de4c12480260bf769b7d44b778fdea3839eafab
+    buffer-from: "npm:^1.0.0"
+    inherits: "npm:^2.0.3"
+    readable-stream: "npm:^3.0.2"
+    typedarray: "npm:^0.0.6"
+  checksum: 10/250e576d0617e7c58e1c4b2dd6fe69560f316d2c962a409f9f3aac794018499ddb31948b1e4296f217008e124cd5d526432097745157fe504b5d9f3dc469eadb
   languageName: node
   linkType: hard
 
 "connect-history-api-fallback@npm:^2.0.0":
   version: 2.0.0
   resolution: "connect-history-api-fallback@npm:2.0.0"
-  checksum: dc5368690f4a5c413889792f8df70d5941ca9da44523cde3f87af0745faee5ee16afb8195434550f0504726642734f2683d6c07f8b460f828a12c45fbd4c9a68
+  checksum: 10/3b26bf4041fdb33deacdcb3af9ae11e9a0b413fb14c95844d74a460b55e407625b364955dcf965c654605cde9d24ad5dad423c489aa430825aab2035859aba0c
+  languageName: node
+  linkType: hard
+
+"consola@npm:^3.2.3":
+  version: 3.2.3
+  resolution: "consola@npm:3.2.3"
+  checksum: 10/02972dcb048c337357a3628438e5976b8e45bcec22fdcfbe9cd17622992953c4d695d5152f141464a02deac769b1d23028e8ac87f56483838df7a6bbf8e0f5a2
   languageName: node
   linkType: hard
 
 "console-control-strings@npm:^1.0.0, console-control-strings@npm:^1.1.0, console-control-strings@npm:~1.1.0":
   version: 1.1.0
   resolution: "console-control-strings@npm:1.1.0"
-  checksum: 8755d76787f94e6cf79ce4666f0c5519906d7f5b02d4b884cf41e11dcd759ed69c57da0670afd9236d229a46e0f9cf519db0cd829c6dca820bb5a5c3def584ed
+  checksum: 10/27b5fa302bc8e9ae9e98c03c66d76ca289ad0c61ce2fe20ab288d288bee875d217512d2edb2363fc83165e88f1c405180cf3f5413a46e51b4fe1a004840c6cdb
   languageName: node
   linkType: hard
 
 "constants-browserify@npm:^1.0.0":
   version: 1.0.0
   resolution: "constants-browserify@npm:1.0.0"
-  checksum: f7ac8c6d0b6e4e0c77340a1d47a3574e25abd580bfd99ad707b26ff7618596cf1a5e5ce9caf44715e9e01d4a5d12cb3b4edaf1176f34c19adb2874815a56e64f
+  checksum: 10/49ef0babd907616dddde6905b80fe44ad5948e1eaaf6cf65d5f23a8c60c029ff63a1198c364665be1d6b2cb183d7e12921f33049cc126734ade84a3cfdbc83f6
   languageName: node
   linkType: hard
 
@@ -13242,117 +14151,108 @@ __metadata:
   version: 0.5.4
   resolution: "content-disposition@npm:0.5.4"
   dependencies:
-    safe-buffer: 5.2.1
-  checksum: afb9d545e296a5171d7574fcad634b2fdf698875f4006a9dd04a3e1333880c5c0c98d47b560d01216fb6505a54a2ba6a843ee3a02ec86d7e911e8315255f56c3
+    safe-buffer: "npm:5.2.1"
+  checksum: 10/b7f4ce176e324f19324be69b05bf6f6e411160ac94bc523b782248129eb1ef3be006f6cff431aaea5e337fe5d176ce8830b8c2a1b721626ead8933f0cbe78720
   languageName: node
   linkType: hard
 
 "content-type@npm:~1.0.4":
-  version: 1.0.4
-  resolution: "content-type@npm:1.0.4"
-  checksum: 3d93585fda985d1554eca5ebd251994327608d2e200978fdbfba21c0c679914d5faf266d17027de44b34a72c7b0745b18584ecccaa7e1fdfb6a68ac7114f12e0
+  version: 1.0.5
+  resolution: "content-type@npm:1.0.5"
+  checksum: 10/585847d98dc7fb8035c02ae2cb76c7a9bd7b25f84c447e5ed55c45c2175e83617c8813871b4ee22f368126af6b2b167df655829007b21aa10302873ea9c62662
   languageName: node
   linkType: hard
 
-"conventional-changelog-angular@npm:^5.0.12":
-  version: 5.0.13
-  resolution: "conventional-changelog-angular@npm:5.0.13"
+"conventional-changelog-angular@npm:7.0.0":
+  version: 7.0.0
+  resolution: "conventional-changelog-angular@npm:7.0.0"
   dependencies:
-    compare-func: ^2.0.0
-    q: ^1.5.1
-  checksum: 6ed4972fce25a50f9f038c749cc9db501363131b0fb2efc1fccecba14e4b1c80651d0d758d4c350a609f32010c66fa343eefd49c02e79e911884be28f53f3f90
+    compare-func: "npm:^2.0.0"
+  checksum: 10/e7966d2fee5475e76263f30f8b714b2b592b5bf556df225b7091e5090831fc9a20b99598a7d2997e19c2ef8118c0a3150b1eba290786367b0f55a5ccfa804ec9
   languageName: node
   linkType: hard
 
-"conventional-changelog-core@npm:^4.2.4":
-  version: 4.2.4
-  resolution: "conventional-changelog-core@npm:4.2.4"
-  dependencies:
-    add-stream: ^1.0.0
-    conventional-changelog-writer: ^5.0.0
-    conventional-commits-parser: ^3.2.0
-    dateformat: ^3.0.0
-    get-pkg-repo: ^4.0.0
-    git-raw-commits: ^2.0.8
-    git-remote-origin-url: ^2.0.0
-    git-semver-tags: ^4.1.1
-    lodash: ^4.17.15
-    normalize-package-data: ^3.0.0
-    q: ^1.5.1
-    read-pkg: ^3.0.0
-    read-pkg-up: ^3.0.0
-    through2: ^4.0.0
-  checksum: 56d5194040495ea316e53fd64cb3614462c318f0fe54b1bf25aba6fba9b3d51cb9fdf7ac5b766f17e5529a3f90e317257394e00b0a9a5ce42caf3a59f82afb3a
-  languageName: node
-  linkType: hard
-
-"conventional-changelog-preset-loader@npm:^2.3.4":
-  version: 2.3.4
-  resolution: "conventional-changelog-preset-loader@npm:2.3.4"
-  checksum: 23a889b7fcf6fe7653e61f32a048877b2f954dcc1e0daa2848c5422eb908e6f24c78372f8d0d2130b5ed941c02e7010c599dccf44b8552602c6c8db9cb227453
+"conventional-changelog-core@npm:5.0.1":
+  version: 5.0.1
+  resolution: "conventional-changelog-core@npm:5.0.1"
+  dependencies:
+    add-stream: "npm:^1.0.0"
+    conventional-changelog-writer: "npm:^6.0.0"
+    conventional-commits-parser: "npm:^4.0.0"
+    dateformat: "npm:^3.0.3"
+    get-pkg-repo: "npm:^4.2.1"
+    git-raw-commits: "npm:^3.0.0"
+    git-remote-origin-url: "npm:^2.0.0"
+    git-semver-tags: "npm:^5.0.0"
+    normalize-package-data: "npm:^3.0.3"
+    read-pkg: "npm:^3.0.0"
+    read-pkg-up: "npm:^3.0.0"
+  checksum: 10/df716cd61eec26b1379370f7dc87df6eadfb6b42c1c99291fcca1c68cd669643539d619fae3fa0ad9255b4e8c30af3b709e058ba62bc5c3a06dc14190c7ef5cc
   languageName: node
   linkType: hard
 
-"conventional-changelog-writer@npm:^5.0.0":
-  version: 5.0.1
-  resolution: "conventional-changelog-writer@npm:5.0.1"
-  dependencies:
-    conventional-commits-filter: ^2.0.7
-    dateformat: ^3.0.0
-    handlebars: ^4.7.7
-    json-stringify-safe: ^5.0.1
-    lodash: ^4.17.15
-    meow: ^8.0.0
-    semver: ^6.0.0
-    split: ^1.0.0
-    through2: ^4.0.0
+"conventional-changelog-preset-loader@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "conventional-changelog-preset-loader@npm:3.0.0"
+  checksum: 10/199c4730c5151f243d35c24585114900c2a7091eab5832cfeb49067a18a2b77d5c9a86b779e6e18b49278a1ff83c011c1d9bb6da95bd1f78d9e36d4d379216d5
+  languageName: node
+  linkType: hard
+
+"conventional-changelog-writer@npm:^6.0.0":
+  version: 6.0.1
+  resolution: "conventional-changelog-writer@npm:6.0.1"
+  dependencies:
+    conventional-commits-filter: "npm:^3.0.0"
+    dateformat: "npm:^3.0.3"
+    handlebars: "npm:^4.7.7"
+    json-stringify-safe: "npm:^5.0.1"
+    meow: "npm:^8.1.2"
+    semver: "npm:^7.0.0"
+    split: "npm:^1.0.1"
   bin:
     conventional-changelog-writer: cli.js
-  checksum: 5c0129db44577f14b1f8de225b62a392a9927ba7fe3422cb21ad71a771b8472bd03badb7c87cb47419913abc3f2ce3759b69f59550cdc6f7a7b0459015b3b44c
+  checksum: 10/9649d390b91c0621b17ccd7faf046990385da46c53004fcc3f13e5887ece26d134316d466de8c21d0c90672c1fca2b7ec98f28603ee04df8cfe5bcfc1fb70e76
   languageName: node
   linkType: hard
 
-"conventional-commits-filter@npm:^2.0.7":
-  version: 2.0.7
-  resolution: "conventional-commits-filter@npm:2.0.7"
+"conventional-commits-filter@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "conventional-commits-filter@npm:3.0.0"
   dependencies:
-    lodash.ismatch: ^4.4.0
-    modify-values: ^1.0.0
-  checksum: feb567f680a6da1baaa1ef3cff393b3c56a5828f77ab9df5e70626475425d109a6fee0289b4979223c62bbd63bf9c98ef532baa6fcb1b66ee8b5f49077f5d46c
+    lodash.ismatch: "npm:^4.4.0"
+    modify-values: "npm:^1.0.1"
+  checksum: 10/73337f42acff7189e1dfca8d13c9448ce085ac1c09976cb33617cc909949621befb1640b1c6c30a1be4953a1be0deea9e93fa0dc86725b8be8e249a64fbb4632
   languageName: node
   linkType: hard
 
-"conventional-commits-parser@npm:^3.2.0":
-  version: 3.2.4
-  resolution: "conventional-commits-parser@npm:3.2.4"
-  dependencies:
-    JSONStream: ^1.0.4
-    is-text-path: ^1.0.1
-    lodash: ^4.17.15
-    meow: ^8.0.0
-    split2: ^3.0.0
-    through2: ^4.0.0
+"conventional-commits-parser@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "conventional-commits-parser@npm:4.0.0"
+  dependencies:
+    JSONStream: "npm:^1.3.5"
+    is-text-path: "npm:^1.0.1"
+    meow: "npm:^8.1.2"
+    split2: "npm:^3.2.2"
   bin:
     conventional-commits-parser: cli.js
-  checksum: 1627ff203bc9586d89e47a7fe63acecf339aba74903b9114e23d28094f79d4e2d6389bf146ae561461dcba8fc42e7bc228165d2b173f15756c43f1d32bc50bfd
+  checksum: 10/d3b7d947b486d3bb40f961808947ee46487429e050be840030211a80aa2eec170e427207c830f2720d8ab898649a652bbbe1825993b8bf0596517e3603f5a1bd
   languageName: node
   linkType: hard
 
-"conventional-recommended-bump@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "conventional-recommended-bump@npm:6.1.0"
-  dependencies:
-    concat-stream: ^2.0.0
-    conventional-changelog-preset-loader: ^2.3.4
-    conventional-commits-filter: ^2.0.7
-    conventional-commits-parser: ^3.2.0
-    git-raw-commits: ^2.0.8
-    git-semver-tags: ^4.1.1
-    meow: ^8.0.0
-    q: ^1.5.1
+"conventional-recommended-bump@npm:7.0.1":
+  version: 7.0.1
+  resolution: "conventional-recommended-bump@npm:7.0.1"
+  dependencies:
+    concat-stream: "npm:^2.0.0"
+    conventional-changelog-preset-loader: "npm:^3.0.0"
+    conventional-commits-filter: "npm:^3.0.0"
+    conventional-commits-parser: "npm:^4.0.0"
+    git-raw-commits: "npm:^3.0.0"
+    git-semver-tags: "npm:^5.0.0"
+    meow: "npm:^8.1.2"
   bin:
     conventional-recommended-bump: cli.js
-  checksum: da1d7a5f3b9f7706bede685cdcb3db67997fdaa43c310fd5bf340955c84a4b85dbb9427031522ee06dad290b730a54be987b08629d79c73720dbad3a2531146b
+  checksum: 10/8d815e7c6f8083085ce4c784b27b0799de628ad2671d99e23c4b08885fb04c5b2adcb6053898eb1f183ee26489273edcbb110c7cd9f80cb06153be53fef2b174
   languageName: node
   linkType: hard
 
@@ -13360,29 +14260,36 @@ __metadata:
   version: 1.8.0
   resolution: "convert-source-map@npm:1.8.0"
   dependencies:
-    safe-buffer: ~5.1.1
-  checksum: 985d974a2d33e1a2543ada51c93e1ba2f73eaed608dc39f229afc78f71dcc4c8b7d7c684aa647e3c6a3a204027444d69e53e169ce94e8d1fa8d7dee80c9c8fed
+    safe-buffer: "npm:~5.1.1"
+  checksum: 10/985d974a2d33e1a2543ada51c93e1ba2f73eaed608dc39f229afc78f71dcc4c8b7d7c684aa647e3c6a3a204027444d69e53e169ce94e8d1fa8d7dee80c9c8fed
   languageName: node
   linkType: hard
 
 "convert-source-map@npm:^2.0.0":
   version: 2.0.0
   resolution: "convert-source-map@npm:2.0.0"
-  checksum: 63ae9933be5a2b8d4509daca5124e20c14d023c820258e484e32dc324d34c2754e71297c94a05784064ad27615037ef677e3f0c00469fb55f409d2bb21261035
+  checksum: 10/c987be3ec061348cdb3c2bfb924bec86dea1eacad10550a85ca23edb0fe3556c3a61c7399114f3331ccb3499d7fd0285ab24566e5745929412983494c3926e15
   languageName: node
   linkType: hard
 
 "cookie-signature@npm:1.0.6":
   version: 1.0.6
   resolution: "cookie-signature@npm:1.0.6"
-  checksum: f4e1b0a98a27a0e6e66fd7ea4e4e9d8e038f624058371bf4499cfcd8f3980be9a121486995202ba3fca74fbed93a407d6d54d43a43f96fd28d0bd7a06761591a
+  checksum: 10/f4e1b0a98a27a0e6e66fd7ea4e4e9d8e038f624058371bf4499cfcd8f3980be9a121486995202ba3fca74fbed93a407d6d54d43a43f96fd28d0bd7a06761591a
   languageName: node
   linkType: hard
 
-"cookie@npm:0.4.2, cookie@npm:^0.4.2":
+"cookie@npm:0.4.2":
   version: 0.4.2
   resolution: "cookie@npm:0.4.2"
-  checksum: a00833c998bedf8e787b4c342defe5fa419abd96b32f4464f718b91022586b8f1bafbddd499288e75c037642493c83083da426c6a9080d309e3bd90fd11baa9b
+  checksum: 10/2e1de9fdedca54881eab3c0477aeb067f281f3155d9cfee9d28dfb252210d09e85e9d175c0a60689661feb9e35e588515352f2456bc1f8e8db4267e05fd70137
+  languageName: node
+  linkType: hard
+
+"cookie@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "cookie@npm:0.5.0"
+  checksum: 10/aae7911ddc5f444a9025fbd979ad1b5d60191011339bce48e555cb83343d0f98b865ff5c4d71fecdfb8555a5cafdc65632f6fce172f32aaf6936830a883a0380
   languageName: node
   linkType: hard
 
@@ -13390,75 +14297,82 @@ __metadata:
   version: 3.3.1
   resolution: "copy-to-clipboard@npm:3.3.1"
   dependencies:
-    toggle-selection: ^1.0.6
-  checksum: 3c7b1c333dc6a4b2e9905f52e4df6bbd34ff9f9c97ecd3ca55378a6bc1c191bb12a3252e6289c7b436e9188cff0360d393c0161626851d2301607860bbbdcfd5
+    toggle-selection: "npm:^1.0.6"
+  checksum: 10/37800fd81674bb15feea9121b1ef09b41e7dc0da51c48546340ca9a998074adc8bc0fb33afc522497a2c1efc50e9aec0056a3671a848127757d49089ff742d22
   languageName: node
   linkType: hard
 
-"copy-webpack-plugin@npm:11.0.0":
-  version: 11.0.0
-  resolution: "copy-webpack-plugin@npm:11.0.0"
+"copy-webpack-plugin@npm:12.0.2":
+  version: 12.0.2
+  resolution: "copy-webpack-plugin@npm:12.0.2"
   dependencies:
-    fast-glob: ^3.2.11
-    glob-parent: ^6.0.1
-    globby: ^13.1.1
-    normalize-path: ^3.0.0
-    schema-utils: ^4.0.0
-    serialize-javascript: ^6.0.0
+    fast-glob: "npm:^3.3.2"
+    glob-parent: "npm:^6.0.1"
+    globby: "npm:^14.0.0"
+    normalize-path: "npm:^3.0.0"
+    schema-utils: "npm:^4.2.0"
+    serialize-javascript: "npm:^6.0.2"
   peerDependencies:
     webpack: ^5.1.0
-  checksum: df4f8743f003a29ee7dd3d9b1789998a3a99051c92afb2ba2203d3dacfa696f4e757b275560fafb8f206e520a0aa78af34b990324a0e36c2326cefdeef3ca82e
+  checksum: 10/674725d4d9556b7b9a32bb85393532ef2bb75ffce785d942681b3575a86d900751f67cebbb089ddd050757f58c84edc18732e17880f12c45c9775ca94328526c
   languageName: node
   linkType: hard
 
-"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.32.2":
-  version: 3.32.2
-  resolution: "core-js-compat@npm:3.32.2"
+"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.33.1, core-js-compat@npm:^3.36.1":
+  version: 3.36.1
+  resolution: "core-js-compat@npm:3.36.1"
   dependencies:
-    browserslist: ^4.21.10
-  checksum: efca146ad71a542e6f196db5ba5aed617e48c615bdf1fbb065471b3267f833ac545bd5fc5ad0642c3d3974b955f0684ff0863d7471d7050ee0284e0a1313942e
+    browserslist: "npm:^4.23.0"
+  checksum: 10/d86b46805de7f5ba3675ed21532ecc64b6c1f123be7286b9efa7941ec087cd8d2446cb555f03a407dbbbeb6e881d1baf92eaffb7f051b11d9103f39c8731fa62
   languageName: node
   linkType: hard
 
 "core-js-pure@npm:^3.23.3, core-js-pure@npm:^3.30.2":
   version: 3.30.2
   resolution: "core-js-pure@npm:3.30.2"
-  checksum: e0e012fe94e38663d837410baac62efe05d0c7431e3fbaa70c65f51eb980da9c3add225eca04208d576bc0d92cefeca9a4f7671a65fd84fd7dfc92d8618dddfd
+  checksum: 10/52bba8bf4bfdec61c3459244a4f349393dd9890307df698993f0c575abc891c5dda9ff8d2af7fc8d4abdef06e6babe48483ddc44749760557b3015406b8d2acc
   languageName: node
   linkType: hard
 
-"core-js@npm:3.33.0, core-js@npm:^3.6.0, core-js@npm:^3.8.3":
-  version: 3.33.0
-  resolution: "core-js@npm:3.33.0"
-  checksum: dd62217935ac281faf6f833bb306fb891162919fcf9c1f0c975b1b91e82ac09a940f5deb5950bbb582739ceef716e8bd7e4f9eab8328932fb029d3bc2ecb2881
+"core-js@npm:3.36.1":
+  version: 3.36.1
+  resolution: "core-js@npm:3.36.1"
+  checksum: 10/ce1e1bfc1034b6f2ff7c91077319e8abdd650ee606ffe6e80073e64ab9d8aad2d6a6d953461b01f331a6f796ad2fd766a3386b88aa371b45d44fa7c0b9913ce6
   languageName: node
   linkType: hard
 
 "core-js@npm:^2.4.0, core-js@npm:^2.6.5":
   version: 2.6.12
   resolution: "core-js@npm:2.6.12"
-  checksum: 44fa9934a85f8c78d61e0c8b7b22436330471ffe59ec5076fe7f324d6e8cf7f824b14b1c81ca73608b13bdb0fef035bd820989bf059767ad6fa13123bb8bd016
+  checksum: 10/7c624eb00a59c74c769d5d80f751f3bf1fc6201205b6562f27286ad5e00bbca1483f2f7eb0c2854b86f526ef5c7dc958b45f2ff536f8a31b8e9cb1a13a96efca
+  languageName: node
+  linkType: hard
+
+"core-js@npm:^3.6.0, core-js@npm:^3.8.3":
+  version: 3.37.0
+  resolution: "core-js@npm:3.37.0"
+  checksum: 10/97feac0b54b95d928bda6a6e611cf34963a265a5fe8ab46ed35bbc9d32a14221bf6bede5d6cd4b0c0f30e8440cf1eff0c4f0c242d719c561e5dd73d3b005d63c
   languageName: node
   linkType: hard
 
 "core-util-is@npm:1.0.2":
   version: 1.0.2
   resolution: "core-util-is@npm:1.0.2"
-  checksum: 7a4c925b497a2c91421e25bf76d6d8190f0b2359a9200dbeed136e63b2931d6294d3b1893eda378883ed363cd950f44a12a401384c609839ea616befb7927dab
+  checksum: 10/d0f7587346b44a1fe6c269267e037dd34b4787191e473c3e685f507229d88561c40eb18872fabfff02977301815d474300b7bfbd15396c13c5377393f7e87ec3
   languageName: node
   linkType: hard
 
 "core-util-is@npm:~1.0.0":
   version: 1.0.3
   resolution: "core-util-is@npm:1.0.3"
-  checksum: 9de8597363a8e9b9952491ebe18167e3b36e7707569eed0ebf14f8bba773611376466ae34575bca8cfe3c767890c859c74056084738f09d4e4a6f902b2ad7d99
+  checksum: 10/9de8597363a8e9b9952491ebe18167e3b36e7707569eed0ebf14f8bba773611376466ae34575bca8cfe3c767890c859c74056084738f09d4e4a6f902b2ad7d99
   languageName: node
   linkType: hard
 
 "corser@npm:^2.0.1":
   version: 2.0.1
   resolution: "corser@npm:2.0.1"
-  checksum: 9ff6944eda760c8c3118747a636afc3ede53b41e7b9960513a15b88032209a728e630ae4b41e20a941e34da129fe9094d1f5d95123ef64ac2e16cdad8dce9c87
+  checksum: 10/5e520f74e363c33c0235b7ebbaea1939650fb089fa135500b120abde0bb6c4f2f66c40267bdf499dd80216acec1fcea33fd6db0deebc94bf66c825cdabf20b7a
   languageName: node
   linkType: hard
 
@@ -13466,12 +14380,12 @@ __metadata:
   version: 6.0.0
   resolution: "cosmiconfig@npm:6.0.0"
   dependencies:
-    "@types/parse-json": ^4.0.0
-    import-fresh: ^3.1.0
-    parse-json: ^5.0.0
-    path-type: ^4.0.0
-    yaml: ^1.7.2
-  checksum: 8eed7c854b91643ecb820767d0deb038b50780ecc3d53b0b19e03ed8aabed4ae77271198d1ae3d49c3b110867edf679f5faad924820a8d1774144a87cb6f98fc
+    "@types/parse-json": "npm:^4.0.0"
+    import-fresh: "npm:^3.1.0"
+    parse-json: "npm:^5.0.0"
+    path-type: "npm:^4.0.0"
+    yaml: "npm:^1.7.2"
+  checksum: 10/b184d2bfbced9ba6840fd097dbf3455c68b7258249bb9b1277913823d516d8dfdade8c5ccbf79db0ca8ebd4cc9b9be521ccc06a18396bd242d50023c208f1594
   languageName: node
   linkType: hard
 
@@ -13479,24 +14393,46 @@ __metadata:
   version: 7.0.1
   resolution: "cosmiconfig@npm:7.0.1"
   dependencies:
-    "@types/parse-json": ^4.0.0
-    import-fresh: ^3.2.1
-    parse-json: ^5.0.0
-    path-type: ^4.0.0
-    yaml: ^1.10.0
-  checksum: 4be63e7117955fd88333d7460e4c466a90f556df6ef34efd59034d2463484e339666c41f02b523d574a797ec61f4a91918c5b89a316db2ea2f834e0d2d09465b
+    "@types/parse-json": "npm:^4.0.0"
+    import-fresh: "npm:^3.2.1"
+    parse-json: "npm:^5.0.0"
+    path-type: "npm:^4.0.0"
+    yaml: "npm:^1.10.0"
+  checksum: 10/861bf4c2c9e88e6c50f14278b25bb0509c484623de11fadf3788a3d543bc7c45178aeebeb6657293b12dc8bd1b86d926c5f25c803c4dc3821d628a1b24c3d20b
   languageName: node
   linkType: hard
 
-"cosmiconfig@npm:^8.2.0":
-  version: 8.2.0
-  resolution: "cosmiconfig@npm:8.2.0"
+"cosmiconfig@npm:^8.1.3, cosmiconfig@npm:^8.2.0":
+  version: 8.3.6
+  resolution: "cosmiconfig@npm:8.3.6"
   dependencies:
-    import-fresh: ^3.2.1
-    js-yaml: ^4.1.0
-    parse-json: ^5.0.0
-    path-type: ^4.0.0
-  checksum: 836d5d8efa750f3fb17b03d6ca74cd3154ed025dffd045304b3ef59637f662bde1e5dc88f8830080d180ec60841719cf4ea2ce73fb21ec694b16865c478ff297
+    import-fresh: "npm:^3.3.0"
+    js-yaml: "npm:^4.1.0"
+    parse-json: "npm:^5.2.0"
+    path-type: "npm:^4.0.0"
+  peerDependencies:
+    typescript: ">=4.9.5"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 10/91d082baca0f33b1c085bf010f9ded4af43cbedacba8821da0fb5667184d0a848addc52c31fadd080007f904a555319c238cf5f4c03e6d58ece2e4876b2e73d6
+  languageName: node
+  linkType: hard
+
+"cosmiconfig@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "cosmiconfig@npm:9.0.0"
+  dependencies:
+    env-paths: "npm:^2.2.1"
+    import-fresh: "npm:^3.3.0"
+    js-yaml: "npm:^4.1.0"
+    parse-json: "npm:^5.2.0"
+  peerDependencies:
+    typescript: ">=4.9.5"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 10/8bdf1dfbb6fdb3755195b6886dc0649a3c742ec75afa4cb8da7b070936aed22a4f4e5b7359faafe03180358f311dbc300d248fd6586c458203d376a40cc77826
   languageName: node
   linkType: hard
 
@@ -13504,11 +14440,11 @@ __metadata:
   version: 10.0.27
   resolution: "create-emotion@npm:10.0.27"
   dependencies:
-    "@emotion/cache": ^10.0.27
-    "@emotion/serialize": ^0.11.15
-    "@emotion/sheet": 0.9.4
-    "@emotion/utils": 0.11.3
-  checksum: 6838f6fe0a3e8d6a7a354685f1ffed6a23f28e74ce4bcdd045882f8e007715dc61596bddc05937cdfd67581eb66a697621a6d01c1a7357b85a816fddc22203fe
+    "@emotion/cache": "npm:^10.0.27"
+    "@emotion/serialize": "npm:^0.11.15"
+    "@emotion/sheet": "npm:0.9.4"
+    "@emotion/utils": "npm:0.11.3"
+  checksum: 10/6838f6fe0a3e8d6a7a354685f1ffed6a23f28e74ce4bcdd045882f8e007715dc61596bddc05937cdfd67581eb66a697621a6d01c1a7357b85a816fddc22203fe
   languageName: node
   linkType: hard
 
@@ -13516,23 +14452,68 @@ __metadata:
   version: 29.7.0
   resolution: "create-jest@npm:29.7.0"
   dependencies:
-    "@jest/types": ^29.6.3
-    chalk: ^4.0.0
-    exit: ^0.1.2
-    graceful-fs: ^4.2.9
-    jest-config: ^29.7.0
-    jest-util: ^29.7.0
-    prompts: ^2.0.1
+    "@jest/types": "npm:^29.6.3"
+    chalk: "npm:^4.0.0"
+    exit: "npm:^0.1.2"
+    graceful-fs: "npm:^4.2.9"
+    jest-config: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+    prompts: "npm:^2.0.1"
   bin:
     create-jest: bin/create-jest.js
-  checksum: 1427d49458adcd88547ef6fa39041e1fe9033a661293aa8d2c3aa1b4967cb5bf4f0c00436c7a61816558f28ba2ba81a94d5c962e8022ea9a883978fc8e1f2945
+  checksum: 10/847b4764451672b4174be4d5c6d7d63442ec3aa5f3de52af924e4d996d87d7801c18e125504f25232fc75840f6625b3ac85860fac6ce799b5efae7bdcaf4a2b7
   languageName: node
   linkType: hard
 
 "create-require@npm:^1.1.0":
   version: 1.1.1
   resolution: "create-require@npm:1.1.1"
-  checksum: a9a1503d4390d8b59ad86f4607de7870b39cad43d929813599a23714831e81c520bddf61bcdd1f8e30f05fd3a2b71ae8538e946eb2786dc65c2bbc520f692eff
+  checksum: 10/a9a1503d4390d8b59ad86f4607de7870b39cad43d929813599a23714831e81c520bddf61bcdd1f8e30f05fd3a2b71ae8538e946eb2786dc65c2bbc520f692eff
+  languageName: node
+  linkType: hard
+
+"croact-css-styled@npm:^1.1.9":
+  version: 1.1.9
+  resolution: "croact-css-styled@npm:1.1.9"
+  dependencies:
+    "@daybrush/utils": "npm:^1.13.0"
+    css-styled: "npm:~1.0.8"
+    framework-utils: "npm:^1.1.0"
+  checksum: 10/46671b7e7ee407a265318d6433b78825abd0cd882dd56581af2f1564f911bfd84fea4d0e4e94c89417126f7aa545b9e19260fa343df3755fd2c91bc52698cb0e
+  languageName: node
+  linkType: hard
+
+"croact-moveable@npm:~0.9.0":
+  version: 0.9.0
+  resolution: "croact-moveable@npm:0.9.0"
+  dependencies:
+    "@daybrush/utils": "npm:^1.13.0"
+    "@egjs/agent": "npm:^2.2.1"
+    "@egjs/children-differ": "npm:^1.0.1"
+    "@egjs/list-differ": "npm:^1.0.0"
+    "@scena/dragscroll": "npm:^1.4.0"
+    "@scena/event-emitter": "npm:^1.0.5"
+    "@scena/matrix": "npm:^1.1.1"
+    croact-css-styled: "npm:^1.1.9"
+    css-to-mat: "npm:^1.1.1"
+    framework-utils: "npm:^1.1.0"
+    gesto: "npm:^1.19.3"
+    overlap-area: "npm:^1.1.0"
+    react-css-styled: "npm:^1.1.9"
+    react-moveable: "npm:~0.56.0"
+  peerDependencies:
+    croact: ^1.0.4
+  checksum: 10/8b9ad1ad10eea14fe4fd824072b297341bea989c6ee616d41d7f6ca40ef6c6087ed5f4d479200563f1f6534a54eceb039dddecb23deba3d7812b69b332a0fc44
+  languageName: node
+  linkType: hard
+
+"croact@npm:1.0.4, croact@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "croact@npm:1.0.4"
+  dependencies:
+    "@daybrush/utils": "npm:^1.13.0"
+    "@egjs/list-differ": "npm:^1.0.0"
+  checksum: 10/5fd400725a1909b63f4abeea827b2450a021caee9aabee975a4f8a19701855a97735f61b7e2f4bc1eb88bc83b8e95707e0bc70691d3c891b99ebc4732c6269cb
   languageName: node
   linkType: hard
 
@@ -13540,17 +14521,17 @@ __metadata:
   version: 7.0.3
   resolution: "cross-spawn@npm:7.0.3"
   dependencies:
-    path-key: ^3.1.0
-    shebang-command: ^2.0.0
-    which: ^2.0.1
-  checksum: 671cc7c7288c3a8406f3c69a3ae2fc85555c04169e9d611def9a675635472614f1c0ed0ef80955d5b6d4e724f6ced67f0ad1bb006c2ea643488fcfef994d7f52
+    path-key: "npm:^3.1.0"
+    shebang-command: "npm:^2.0.0"
+    which: "npm:^2.0.1"
+  checksum: 10/e1a13869d2f57d974de0d9ef7acbf69dc6937db20b918525a01dacb5032129bd552d290d886d981e99f1b624cb03657084cc87bd40f115c07ecf376821c729ce
   languageName: node
   linkType: hard
 
 "crypto-random-string@npm:^2.0.0":
   version: 2.0.0
   resolution: "crypto-random-string@npm:2.0.0"
-  checksum: 0283879f55e7c16fdceacc181f87a0a65c53bc16ffe1d58b9d19a6277adcd71900d02bb2c4843dd55e78c51e30e89b0fec618a7f170ebcc95b33182c28f05fd6
+  checksum: 10/0283879f55e7c16fdceacc181f87a0a65c53bc16ffe1d58b9d19a6277adcd71900d02bb2c4843dd55e78c51e30e89b0fec618a7f170ebcc95b33182c28f05fd6
   languageName: node
   linkType: hard
 
@@ -13558,9 +14539,9 @@ __metadata:
   version: 1.6.1
   resolution: "css-animation@npm:1.6.1"
   dependencies:
-    babel-runtime: 6.x
-    component-classes: ^1.2.5
-  checksum: 5aea8fd333300c6b15f523ac741dd2ed367489485c7a9a43647f7779fef9e5f338c405e3ad9ed8db338503b4aefea86108112a01bf78651b623f8bd2e146e0e0
+    babel-runtime: "npm:6.x"
+    component-classes: "npm:^1.2.5"
+  checksum: 10/5aea8fd333300c6b15f523ac741dd2ed367489485c7a9a43647f7779fef9e5f338c405e3ad9ed8db338503b4aefea86108112a01bf78651b623f8bd2e146e0e0
   languageName: node
   linkType: hard
 
@@ -13568,34 +14549,33 @@ __metadata:
   version: 1.2.1
   resolution: "css-box-model@npm:1.2.1"
   dependencies:
-    tiny-invariant: ^1.0.6
-  checksum: 4d113f26fed6b9150e2c314502d00dabe06f12ae43a01a7e9b6e57f3de49b4281dbb0dc46a1158a7349618f8f34d9250af57cb43d7337e9485e73e6b821e470e
+    tiny-invariant: "npm:^1.0.6"
+  checksum: 10/54778883733e59058b5de983cf442b9db6c1494543d4d84a3defd05b51b991a1865f59e4ae424e733af2aa1fdb6e0bd905cb73db0e7e548fbd89853859fedc81
   languageName: node
   linkType: hard
 
-"css-declaration-sorter@npm:^6.3.1":
-  version: 6.4.1
-  resolution: "css-declaration-sorter@npm:6.4.1"
+"css-declaration-sorter@npm:^7.1.1":
+  version: 7.1.1
+  resolution: "css-declaration-sorter@npm:7.1.1"
   peerDependencies:
     postcss: ^8.0.9
-  checksum: cbdc9e0d481011b1a28fd5b60d4eb55fe204391d31a0b1b490b2cecf4baa85810f9b8c48adab4df644f4718104ed3ed72c64a9745e3216173767bf4aeca7f9b8
+  checksum: 10/291289eb5ba515affa88f33326d8c197cb00049ea3ea13947ca3c234bf392faca1a6be6f6d4b5bbe6f65cef6e7ad0003da631d60ae02dd9d6d3b22fd580b4748
   languageName: node
   linkType: hard
 
 "css-functions-list@npm:^3.2.1":
   version: 3.2.1
   resolution: "css-functions-list@npm:3.2.1"
-  checksum: 57d7deb3b05e84d95b88ba9b3244cf60d33b40652b3357f084c805b24a9febda5987ade44ef25a56be41e73249a7dcc157abd704d8a0e998b2c1c2e2d5de6461
+  checksum: 10/57d7deb3b05e84d95b88ba9b3244cf60d33b40652b3357f084c805b24a9febda5987ade44ef25a56be41e73249a7dcc157abd704d8a0e998b2c1c2e2d5de6461
   languageName: node
   linkType: hard
 
-"css-in-js-utils@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "css-in-js-utils@npm:2.0.1"
+"css-in-js-utils@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "css-in-js-utils@npm:3.1.0"
   dependencies:
-    hyphenate-style-name: ^1.0.2
-    isobject: ^3.0.1
-  checksum: c9964c4708216954c468b69bbee2d971fd759ada4f40637b8ca4d3f79caba4818d0532a4f190ac560227c08742ad063ffec7a30afddc4d96b66a18c3a008f0d8
+    hyphenate-style-name: "npm:^1.0.3"
+  checksum: 10/bd2f569f1870389004cfacfd7b798c0f40933d34af1f040c391a08322d097790b9a9524affb2ba4d26122e9cb8f4256afb59edb6077dbe607506944a9c673c67
   languageName: node
   linkType: hard
 
@@ -13603,39 +14583,45 @@ __metadata:
   version: 2.1.0
   resolution: "css-line-break@npm:2.1.0"
   dependencies:
-    utrie: ^1.0.2
-  checksum: 37b1fe632b03be7a287cd394cef8b5285666343443125c510df9cfb6a4734a2c71e154ec8f7bbff72d7c339e1e5872989b1c52d86162aed27d6cc114725bb4d0
+    utrie: "npm:^1.0.2"
+  checksum: 10/e75cae40de511026228d4fa69e8d464895714f8899880b8268a446b57f0faa84b490ba1bdda5ed9e7f38f99ab947c6bc941bb505d8119c49072db079c1cacea5
   languageName: node
   linkType: hard
 
-"css-loader@npm:6.8.1, css-loader@npm:^6.7.1":
-  version: 6.8.1
-  resolution: "css-loader@npm:6.8.1"
-  dependencies:
-    icss-utils: ^5.1.0
-    postcss: ^8.4.21
-    postcss-modules-extract-imports: ^3.0.0
-    postcss-modules-local-by-default: ^4.0.3
-    postcss-modules-scope: ^3.0.0
-    postcss-modules-values: ^4.0.0
-    postcss-value-parser: ^4.2.0
-    semver: ^7.3.8
-  peerDependencies:
+"css-loader@npm:6.10.0, css-loader@npm:^6.7.1":
+  version: 6.10.0
+  resolution: "css-loader@npm:6.10.0"
+  dependencies:
+    icss-utils: "npm:^5.1.0"
+    postcss: "npm:^8.4.33"
+    postcss-modules-extract-imports: "npm:^3.0.0"
+    postcss-modules-local-by-default: "npm:^4.0.4"
+    postcss-modules-scope: "npm:^3.1.1"
+    postcss-modules-values: "npm:^4.0.0"
+    postcss-value-parser: "npm:^4.2.0"
+    semver: "npm:^7.5.4"
+  peerDependencies:
+    "@rspack/core": 0.x || 1.x
     webpack: ^5.0.0
-  checksum: 7c1784247bdbe76dc5c55fb1ac84f1d4177a74c47259942c9cfdb7a8e6baef11967a0bc85ac285f26bd26d5059decb848af8154a03fdb4f4894f41212f45eef3
+  peerDependenciesMeta:
+    "@rspack/core":
+      optional: true
+    webpack:
+      optional: true
+  checksum: 10/1abd52e24a72a4c54762330bab2e0e816778db5bc711a8fc1b1ee99470a1728f2aa9b54b9ebbf2278a1730d68b76303094cc855f9119b2ffc0424fe57fea3bc6
   languageName: node
   linkType: hard
 
-"css-minimizer-webpack-plugin@npm:5.0.1":
-  version: 5.0.1
-  resolution: "css-minimizer-webpack-plugin@npm:5.0.1"
+"css-minimizer-webpack-plugin@npm:6.0.0":
+  version: 6.0.0
+  resolution: "css-minimizer-webpack-plugin@npm:6.0.0"
   dependencies:
-    "@jridgewell/trace-mapping": ^0.3.18
-    cssnano: ^6.0.1
-    jest-worker: ^29.4.3
-    postcss: ^8.4.24
-    schema-utils: ^4.0.1
-    serialize-javascript: ^6.0.1
+    "@jridgewell/trace-mapping": "npm:^0.3.21"
+    cssnano: "npm:^6.0.3"
+    jest-worker: "npm:^29.7.0"
+    postcss: "npm:^8.4.33"
+    schema-utils: "npm:^4.2.0"
+    serialize-javascript: "npm:^6.0.2"
   peerDependencies:
     webpack: ^5.0.0
   peerDependenciesMeta:
@@ -13651,7 +14637,7 @@ __metadata:
       optional: true
     lightningcss:
       optional: true
-  checksum: 10055802c61d1ae72584eac03b6bd221ecbefde11d337be44a5459d8de075b38f91b80949f95cd0c3a10295615ee013f82130bfac5fe9b5b3e8e75531f232680
+  checksum: 10/3786695253414b91b00013a7fa0334fc6af344c1ef14981ba6b129d245831799390053e574d86204acd384cfb05b9ac81b2b7f4f41dda676b10f0888d73b64e9
   languageName: node
   linkType: hard
 
@@ -13659,12 +14645,12 @@ __metadata:
   version: 4.1.3
   resolution: "css-select@npm:4.1.3"
   dependencies:
-    boolbase: ^1.0.0
-    css-what: ^5.0.0
-    domhandler: ^4.2.0
-    domutils: ^2.6.0
-    nth-check: ^2.0.0
-  checksum: 40928f1aa6c71faf36430e7f26bcbb8ab51d07b98b754caacb71906400a195df5e6c7020a94f2982f02e52027b9bd57c99419220cf7020968c3415f14e4be5f8
+    boolbase: "npm:^1.0.0"
+    css-what: "npm:^5.0.0"
+    domhandler: "npm:^4.2.0"
+    domutils: "npm:^2.6.0"
+    nth-check: "npm:^2.0.0"
+  checksum: 10/53743b2d08a502939377fc93c69060018cb5716a0ea32600597a34ec92d0346464df93c56eccafec5d3ee0f464b445c4844c9e59a9d69287c2cf85948c689c93
   languageName: node
   linkType: hard
 
@@ -13672,31 +14658,31 @@ __metadata:
   version: 5.1.0
   resolution: "css-select@npm:5.1.0"
   dependencies:
-    boolbase: ^1.0.0
-    css-what: ^6.1.0
-    domhandler: ^5.0.2
-    domutils: ^3.0.1
-    nth-check: ^2.0.1
-  checksum: 2772c049b188d3b8a8159907192e926e11824aea525b8282981f72ba3f349cf9ecd523fdf7734875ee2cb772246c22117fc062da105b6d59afe8dcd5c99c9bda
+    boolbase: "npm:^1.0.0"
+    css-what: "npm:^6.1.0"
+    domhandler: "npm:^5.0.2"
+    domutils: "npm:^3.0.1"
+    nth-check: "npm:^2.0.1"
+  checksum: 10/d486b1e7eb140468218a5ab5af53257e01f937d2173ac46981f6b7de9c5283d55427a36715dc8decfc0c079cf89259ac5b41ef58f6e1a422eee44ab8bfdc78da
   languageName: node
   linkType: hard
 
-"css-styled@npm:^1.0.0, css-styled@npm:^1.0.8, css-styled@npm:~1.0.1":
+"css-styled@npm:^1.0.8, css-styled@npm:~1.0.8":
   version: 1.0.8
   resolution: "css-styled@npm:1.0.8"
   dependencies:
-    "@daybrush/utils": ^1.13.0
-  checksum: ffd99f3403dff34fb682ba8a77fcc8cf0131dd3470efcd81b84c58be241904c0f877b929c54563c00994a01951c5afa45b164a56d8b7b1363c057e284f2b3061
+    "@daybrush/utils": "npm:^1.13.0"
+  checksum: 10/62f3ee73ce808ceeed10fe4d0a98554d3701306f664b8f346967dbbb77d475b77154cbe78d0dcf8cefdd3dacac380d95d05e96daded9325dd9e960e27a027ba3
   languageName: node
   linkType: hard
 
-"css-to-mat@npm:^1.0.3, css-to-mat@npm:^1.1.1":
+"css-to-mat@npm:^1.1.1":
   version: 1.1.1
   resolution: "css-to-mat@npm:1.1.1"
   dependencies:
-    "@daybrush/utils": ^1.13.0
-    "@scena/matrix": ^1.0.0
-  checksum: bc88b044a8b24882e06170ad6d5cedfd220119fa03a55accf54ff0e7f6450d85f9be71408900be595d8bb5c0e07346f79ab7a3de4c820869bced4de25497b3c5
+    "@daybrush/utils": "npm:^1.13.0"
+    "@scena/matrix": "npm:^1.0.0"
+  checksum: 10/9a5704e040c848503502a151a41132cd4fd957bf6a4aa5b5dea23cf7ce27ffcd19174a989ed0097edbc260b42500e70ae6ab56219b24e4447340dbcd7ee5baab
   languageName: node
   linkType: hard
 
@@ -13704,19 +14690,19 @@ __metadata:
   version: 1.1.3
   resolution: "css-tree@npm:1.1.3"
   dependencies:
-    mdn-data: 2.0.14
-    source-map: ^0.6.1
-  checksum: 79f9b81803991b6977b7fcb1588799270438274d89066ce08f117f5cdb5e20019b446d766c61506dd772c839df84caa16042d6076f20c97187f5abe3b50e7d1f
+    mdn-data: "npm:2.0.14"
+    source-map: "npm:^0.6.1"
+  checksum: 10/29710728cc4b136f1e9b23ee1228ec403ec9f3d487bc94a9c5dbec563c1e08c59bc917dd6f82521a35e869ff655c298270f43ca673265005b0cd05b292eb05ab
   languageName: node
   linkType: hard
 
-"css-tree@npm:^2.2.1, css-tree@npm:^2.3.1":
+"css-tree@npm:^2.3.1":
   version: 2.3.1
   resolution: "css-tree@npm:2.3.1"
   dependencies:
-    mdn-data: 2.0.30
-    source-map-js: ^1.0.1
-  checksum: 493cc24b5c22b05ee5314b8a0d72d8a5869491c1458017ae5ed75aeb6c3596637dbe1b11dac2548974624adec9f7a1f3a6cf40593dc1f9185eb0e8279543fbc0
+    mdn-data: "npm:2.0.30"
+    source-map-js: "npm:^1.0.1"
+  checksum: 10/e5e39b82eb4767c664fa5c2cd9968c8c7e6b7fd2c0079b52680a28466d851e2826d5e64699c449d933c0e8ca0554beca43c41a9fcb09fb6a46139d462dbdf0df
   languageName: node
   linkType: hard
 
@@ -13724,37 +14710,37 @@ __metadata:
   version: 2.2.1
   resolution: "css-tree@npm:2.2.1"
   dependencies:
-    mdn-data: 2.0.28
-    source-map-js: ^1.0.1
-  checksum: b94aa8cc2f09e6f66c91548411fcf74badcbad3e150345074715012d16333ce573596ff5dfca03c2a87edf1924716db765120f94247e919d72753628ba3aba27
+    mdn-data: "npm:2.0.28"
+    source-map-js: "npm:^1.0.1"
+  checksum: 10/1959c4b0e268bf8db1b3a1776a5ba9ae3a464ccd1226bfa62799cb0a3d0039006e21fb95cec4dec9d687a9a9b90f692dff2d230b631527ece700f4bfb419aaf3
   languageName: node
   linkType: hard
 
 "css-what@npm:^5.0.0":
   version: 5.1.0
   resolution: "css-what@npm:5.1.0"
-  checksum: 0b75d1bac95c885c168573c85744a6c6843d8c33345f54f717218b37ea6296b0e99bb12105930ea170fd4a921990392a7c790c16c585c1d8960c49e2b7ec39f7
+  checksum: 10/3b1f0abdf104a2e887be45c5b710b063d3fa7468d1d1eea071fbd6e5b3e2e7d4c0cb001edec07ea5a360c06425f351e0356539155b70ea461382c9c7bcaba4d7
   languageName: node
   linkType: hard
 
 "css-what@npm:^6.1.0":
   version: 6.1.0
   resolution: "css-what@npm:6.1.0"
-  checksum: b975e547e1e90b79625918f84e67db5d33d896e6de846c9b584094e529f0c63e2ab85ee33b9daffd05bff3a146a1916bec664e18bb76dd5f66cbff9fc13b2bbe
+  checksum: 10/c67a3a2d0d81843af87f8bf0a4d0845b0f952377714abbb2884e48942409d57a2110eabee003609d02ee487b054614bdfcfc59ee265728ff105bd5aa221c1d0e
   languageName: node
   linkType: hard
 
 "css.escape@npm:^1.5.1":
   version: 1.5.1
   resolution: "css.escape@npm:1.5.1"
-  checksum: f6d38088d870a961794a2580b2b2af1027731bb43261cfdce14f19238a88664b351cc8978abc20f06cc6bbde725699dec8deb6fe9816b139fc3f2af28719e774
+  checksum: 10/f6d38088d870a961794a2580b2b2af1027731bb43261cfdce14f19238a88664b351cc8978abc20f06cc6bbde725699dec8deb6fe9816b139fc3f2af28719e774
   languageName: node
   linkType: hard
 
 "csscolorparser@npm:~1.0.2":
   version: 1.0.3
   resolution: "csscolorparser@npm:1.0.3"
-  checksum: e40f3045ea15c7e7eaa78e110412fe8b820d47b698c1eb1d1e7ecb42703bf447406a24304b891ae9df61e85d947f33fc67bd0120c7f9e3a5183e6e0b9afff92c
+  checksum: 10/b46b9032eaace69e5bb151bb64473547d8e48813b45395c1923cde1c87674bbd030c99536f44373e092de6afdca1a8134933a1503e779aaeb703b7c7897f5eca
   languageName: node
   linkType: hard
 
@@ -13763,81 +14749,81 @@ __metadata:
   resolution: "cssesc@npm:3.0.0"
   bin:
     cssesc: bin/cssesc
-  checksum: f8c4ababffbc5e2ddf2fa9957dda1ee4af6048e22aeda1869d0d00843223c1b13ad3f5d88b51caa46c994225eacb636b764eb807a8883e2fb6f99b4f4e8c48b2
+  checksum: 10/0e161912c1306861d8f46e1883be1cbc8b1b2879f0f509287c0db71796e4ddfb97ac96bdfca38f77f452e2c10554e1bb5678c99b07a5cf947a12778f73e47e12
   languageName: node
   linkType: hard
 
 "cssfilter@npm:0.0.10":
   version: 0.0.10
   resolution: "cssfilter@npm:0.0.10"
-  checksum: bc2c52bbb3426c3f2e4832edb6f8573e6cfa65b40b540932762d1e018f0f0157725e2991b77344bbc8266c6bbf4daa2803b0707cfb1bd0877505bf83a68e4b04
+  checksum: 10/1e45182f42de848f092f50a313113c28a88e4ac98333bf1603ee1c3b200384a3bc83c12e35cd61135e3b0f218295f600d51120ca1f926b7958b2d3262d711214
   languageName: node
   linkType: hard
 
 "cssfontparser@npm:^1.2.1":
   version: 1.2.1
   resolution: "cssfontparser@npm:1.2.1"
-  checksum: 952d487cddab591fb944f2a4c326a7736bc963784a6d92b6ad4051f3bf5ee49a732eff62e29a52ff085197cb07f5bd66525a2245ded7fd356113ac81be9238b9
+  checksum: 10/952d487cddab591fb944f2a4c326a7736bc963784a6d92b6ad4051f3bf5ee49a732eff62e29a52ff085197cb07f5bd66525a2245ded7fd356113ac81be9238b9
   languageName: node
   linkType: hard
 
-"cssnano-preset-default@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "cssnano-preset-default@npm:6.0.1"
-  dependencies:
-    css-declaration-sorter: ^6.3.1
-    cssnano-utils: ^4.0.0
-    postcss-calc: ^9.0.0
-    postcss-colormin: ^6.0.0
-    postcss-convert-values: ^6.0.0
-    postcss-discard-comments: ^6.0.0
-    postcss-discard-duplicates: ^6.0.0
-    postcss-discard-empty: ^6.0.0
-    postcss-discard-overridden: ^6.0.0
-    postcss-merge-longhand: ^6.0.0
-    postcss-merge-rules: ^6.0.1
-    postcss-minify-font-values: ^6.0.0
-    postcss-minify-gradients: ^6.0.0
-    postcss-minify-params: ^6.0.0
-    postcss-minify-selectors: ^6.0.0
-    postcss-normalize-charset: ^6.0.0
-    postcss-normalize-display-values: ^6.0.0
-    postcss-normalize-positions: ^6.0.0
-    postcss-normalize-repeat-style: ^6.0.0
-    postcss-normalize-string: ^6.0.0
-    postcss-normalize-timing-functions: ^6.0.0
-    postcss-normalize-unicode: ^6.0.0
-    postcss-normalize-url: ^6.0.0
-    postcss-normalize-whitespace: ^6.0.0
-    postcss-ordered-values: ^6.0.0
-    postcss-reduce-initial: ^6.0.0
-    postcss-reduce-transforms: ^6.0.0
-    postcss-svgo: ^6.0.0
-    postcss-unique-selectors: ^6.0.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 451080ae47c93e6525c7133c36426968ee758eb9115132ba481e6b12d50775f4d086635bb2f807957e017fc9d253aa876aa64800be6b3d000ada90721b9ea410
-  languageName: node
-  linkType: hard
-
-"cssnano-utils@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "cssnano-utils@npm:4.0.0"
+"cssnano-preset-default@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "cssnano-preset-default@npm:6.0.3"
+  dependencies:
+    css-declaration-sorter: "npm:^7.1.1"
+    cssnano-utils: "npm:^4.0.1"
+    postcss-calc: "npm:^9.0.1"
+    postcss-colormin: "npm:^6.0.2"
+    postcss-convert-values: "npm:^6.0.2"
+    postcss-discard-comments: "npm:^6.0.1"
+    postcss-discard-duplicates: "npm:^6.0.1"
+    postcss-discard-empty: "npm:^6.0.1"
+    postcss-discard-overridden: "npm:^6.0.1"
+    postcss-merge-longhand: "npm:^6.0.2"
+    postcss-merge-rules: "npm:^6.0.3"
+    postcss-minify-font-values: "npm:^6.0.1"
+    postcss-minify-gradients: "npm:^6.0.1"
+    postcss-minify-params: "npm:^6.0.2"
+    postcss-minify-selectors: "npm:^6.0.2"
+    postcss-normalize-charset: "npm:^6.0.1"
+    postcss-normalize-display-values: "npm:^6.0.1"
+    postcss-normalize-positions: "npm:^6.0.1"
+    postcss-normalize-repeat-style: "npm:^6.0.1"
+    postcss-normalize-string: "npm:^6.0.1"
+    postcss-normalize-timing-functions: "npm:^6.0.1"
+    postcss-normalize-unicode: "npm:^6.0.2"
+    postcss-normalize-url: "npm:^6.0.1"
+    postcss-normalize-whitespace: "npm:^6.0.1"
+    postcss-ordered-values: "npm:^6.0.1"
+    postcss-reduce-initial: "npm:^6.0.2"
+    postcss-reduce-transforms: "npm:^6.0.1"
+    postcss-svgo: "npm:^6.0.2"
+    postcss-unique-selectors: "npm:^6.0.2"
+  peerDependencies:
+    postcss: ^8.4.31
+  checksum: 10/95f5f7f6f09abdcc21434c7a624017a450848bd4d97f4899e74bda3c6011c3dfce0b58f499a24f7e78eb218a26af27c5e12ab663f2b272c73448f55d3a9a4a12
+  languageName: node
+  linkType: hard
+
+"cssnano-utils@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "cssnano-utils@npm:4.0.1"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 7db9b3eb4ec7cc7b2d1a3caf8c2d3b6b067bb8404b93dc183907325db3231e396350a50e5388beda02dab03404d5e8d226977b2b87adc11768173e0259e80219
+    postcss: ^8.4.31
+  checksum: 10/6a8f5911e31d9fa8daa6287080a5ff3881c041f691e98cc737d67ddb660bb398f33df6c1649c23d2f6bd0e91ea2cabb6db2f53c0a13e5da12f3cd396f7a7fe61
   languageName: node
   linkType: hard
 
-"cssnano@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "cssnano@npm:6.0.1"
+"cssnano@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "cssnano@npm:6.0.3"
   dependencies:
-    cssnano-preset-default: ^6.0.1
-    lilconfig: ^2.1.0
+    cssnano-preset-default: "npm:^6.0.3"
+    lilconfig: "npm:^3.0.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 15e0777189edf2d4287ed3628f65d78c9934a2c0729e29811e85bd760653a0142477b3c2dde9e0a51438c509b2b926e6482215cd8d4e6704e3eb1ab38d1dba0c
+    postcss: ^8.4.31
+  checksum: 10/2b30ce0d9ba337737f4c6af4b6731dd5031cc4e1414a43b87ddb20fd9903a4f5b41182cc6a4b98cc82ca7975ecaa4b8ac487bd34f698998404c5ed0944914a6b
   languageName: node
   linkType: hard
 
@@ -13845,22 +14831,22 @@ __metadata:
   version: 5.0.5
   resolution: "csso@npm:5.0.5"
   dependencies:
-    css-tree: ~2.2.0
-  checksum: 0ad858d36bf5012ed243e9ec69962a867509061986d2ee07cc040a4b26e4d062c00d4c07e5ba8d430706ceb02dd87edd30a52b5937fd45b1b6f2119c4993d59a
+    css-tree: "npm:~2.2.0"
+  checksum: 10/4036fb2b9f8ed6b948349136b39e0b19ffb5edee934893a37b55e9a116186c4ae2a9d3ba66fbdbc07fa44a853fb478cd2d8733e4743473dcd364e7f21444ff34
   languageName: node
   linkType: hard
 
 "cssom@npm:^0.5.0":
   version: 0.5.0
   resolution: "cssom@npm:0.5.0"
-  checksum: 823471aa30091c59e0a305927c30e7768939b6af70405808f8d2ce1ca778cddcb24722717392438329d1691f9a87cb0183b64b8d779b56a961546d54854fde01
+  checksum: 10/b502a315b1ce020a692036cc38cb36afa44157219b80deadfa040ab800aa9321fcfbecf02fd2e6ec87db169715e27978b4ab3701f916461e9cf7808899f23b54
   languageName: node
   linkType: hard
 
 "cssom@npm:~0.3.6":
   version: 0.3.8
   resolution: "cssom@npm:0.3.8"
-  checksum: 24beb3087c76c0d52dd458be9ee1fbc80ac771478a9baef35dd258cdeb527c68eb43204dd439692bb2b1ae5272fa5f2946d10946edab0d04f1078f85e06bc7f6
+  checksum: 10/49eacc88077555e419646c0ea84ddc73c97e3a346ad7cb95e22f9413a9722d8964b91d781ce21d378bd5ae058af9a745402383fa4e35e9cdfd19654b63f892a9
   languageName: node
   linkType: hard
 
@@ -13868,22 +14854,22 @@ __metadata:
   version: 2.3.0
   resolution: "cssstyle@npm:2.3.0"
   dependencies:
-    cssom: ~0.3.6
-  checksum: 5f05e6fd2e3df0b44695c2f08b9ef38b011862b274e320665176467c0725e44a53e341bc4959a41176e83b66064ab786262e7380fd1cabeae6efee0d255bb4e3
+    cssom: "npm:~0.3.6"
+  checksum: 10/46f7f05a153446c4018b0454ee1464b50f606cb1803c90d203524834b7438eb52f3b173ba0891c618f380ced34ee12020675dc0052a7f1be755fe4ebc27ee977
   languageName: node
   linkType: hard
 
-"csstype@npm:3.1.2, csstype@npm:^3.0.2, csstype@npm:^3.0.6":
-  version: 3.1.2
-  resolution: "csstype@npm:3.1.2"
-  checksum: e1a52e6c25c1314d6beef5168da704ab29c5186b877c07d822bd0806717d9a265e8493a2e35ca7e68d0f5d472d43fac1cdce70fd79fd0853dff81f3028d857b5
+"csstype@npm:3.1.3, csstype@npm:^3.0.2, csstype@npm:^3.1.2":
+  version: 3.1.3
+  resolution: "csstype@npm:3.1.3"
+  checksum: 10/f593cce41ff5ade23f44e77521e3a1bcc2c64107041e1bf6c3c32adc5187d0d60983292fda326154d20b01079e24931aa5b08e4467cc488b60bb1e7f6d478ade
   languageName: node
   linkType: hard
 
 "csstype@npm:^2.5.7":
   version: 2.6.18
   resolution: "csstype@npm:2.6.18"
-  checksum: 1d6d67bc7f55af976d7a9cb153d61867d6c84eb0d69733165d2d4f10c659e7647a1e7a19859acacbf0120552164b8ff1a4ffef45a435aa37a4ff2f09e5b0bcf7
+  checksum: 10/378e718d34fb48b4ed74c4ab4c90db08ee6aa2b1c0b687ac11b6bae655bc9815a410592162abfde250a805b9ef4d7f711cbaa9d985b6610c5e781bcd1409f7aa
   languageName: node
   linkType: hard
 
@@ -13892,7 +14878,7 @@ __metadata:
   resolution: "cypress-file-upload@npm:5.0.8"
   peerDependencies:
     cypress: ">3.0.0"
-  checksum: 9c70ca7e0bb137d0ec0b8d38987219ce15b26ac3a40e3ed4e78e6ad4690392eab905586848eec6ad8edd42ee480e68ccc63007b2ebd0a02f4b3eca116ff017e3
+  checksum: 10/c2f66b6de7572ef1b2c609bf76ad63831ee20d7a8a2f144eccc2a7a1fb21994c2f5524ad4921a731bbd2e362aa6ff932506fa8c93c875bc1c0edda383e1125ba
   languageName: node
   linkType: hard
 
@@ -13900,52 +14886,52 @@ __metadata:
   version: 13.1.0
   resolution: "cypress@npm:13.1.0"
   dependencies:
-    "@cypress/request": ^3.0.0
-    "@cypress/xvfb": ^1.2.4
-    "@types/node": ^16.18.39
-    "@types/sinonjs__fake-timers": 8.1.1
-    "@types/sizzle": ^2.3.2
-    arch: ^2.2.0
-    blob-util: ^2.0.2
-    bluebird: ^3.7.2
-    buffer: ^5.6.0
-    cachedir: ^2.3.0
-    chalk: ^4.1.0
-    check-more-types: ^2.24.0
-    cli-cursor: ^3.1.0
-    cli-table3: ~0.6.1
-    commander: ^6.2.1
-    common-tags: ^1.8.0
-    dayjs: ^1.10.4
-    debug: ^4.3.4
-    enquirer: ^2.3.6
-    eventemitter2: 6.4.7
-    execa: 4.1.0
-    executable: ^4.1.1
-    extract-zip: 2.0.1
-    figures: ^3.2.0
-    fs-extra: ^9.1.0
-    getos: ^3.2.1
-    is-ci: ^3.0.0
-    is-installed-globally: ~0.4.0
-    lazy-ass: ^1.6.0
-    listr2: ^3.8.3
-    lodash: ^4.17.21
-    log-symbols: ^4.0.0
-    minimist: ^1.2.8
-    ospath: ^1.2.2
-    pretty-bytes: ^5.6.0
-    process: ^0.11.10
-    proxy-from-env: 1.0.0
-    request-progress: ^3.0.0
-    semver: ^7.5.3
-    supports-color: ^8.1.1
-    tmp: ~0.2.1
-    untildify: ^4.0.0
-    yauzl: ^2.10.0
+    "@cypress/request": "npm:^3.0.0"
+    "@cypress/xvfb": "npm:^1.2.4"
+    "@types/node": "npm:^16.18.39"
+    "@types/sinonjs__fake-timers": "npm:8.1.1"
+    "@types/sizzle": "npm:^2.3.2"
+    arch: "npm:^2.2.0"
+    blob-util: "npm:^2.0.2"
+    bluebird: "npm:^3.7.2"
+    buffer: "npm:^5.6.0"
+    cachedir: "npm:^2.3.0"
+    chalk: "npm:^4.1.0"
+    check-more-types: "npm:^2.24.0"
+    cli-cursor: "npm:^3.1.0"
+    cli-table3: "npm:~0.6.1"
+    commander: "npm:^6.2.1"
+    common-tags: "npm:^1.8.0"
+    dayjs: "npm:^1.10.4"
+    debug: "npm:^4.3.4"
+    enquirer: "npm:^2.3.6"
+    eventemitter2: "npm:6.4.7"
+    execa: "npm:4.1.0"
+    executable: "npm:^4.1.1"
+    extract-zip: "npm:2.0.1"
+    figures: "npm:^3.2.0"
+    fs-extra: "npm:^9.1.0"
+    getos: "npm:^3.2.1"
+    is-ci: "npm:^3.0.0"
+    is-installed-globally: "npm:~0.4.0"
+    lazy-ass: "npm:^1.6.0"
+    listr2: "npm:^3.8.3"
+    lodash: "npm:^4.17.21"
+    log-symbols: "npm:^4.0.0"
+    minimist: "npm:^1.2.8"
+    ospath: "npm:^1.2.2"
+    pretty-bytes: "npm:^5.6.0"
+    process: "npm:^0.11.10"
+    proxy-from-env: "npm:1.0.0"
+    request-progress: "npm:^3.0.0"
+    semver: "npm:^7.5.3"
+    supports-color: "npm:^8.1.1"
+    tmp: "npm:~0.2.1"
+    untildify: "npm:^4.0.0"
+    yauzl: "npm:^2.10.0"
   bin:
     cypress: bin/cypress
-  checksum: 238057b288f54401ad3fa8693c31ec08eef2d98a7fc93ce7f60bc009fcae18539e84be4c1cd41526816603f642f63444a7adce9d914b1338a53c0bf756bdb762
+  checksum: 10/8e96041503497ca1c1bbcfbd7fa679683ca338fa1b76557fe8f3e4926fc61efd15ccdd0d269146515b6743a1845886aaf1d6cfb72e143a5c57bff6853a18cb92
   languageName: node
   linkType: hard
 
@@ -13953,51 +14939,51 @@ __metadata:
   version: 9.5.1
   resolution: "cypress@npm:9.5.1"
   dependencies:
-    "@cypress/request": ^2.88.10
-    "@cypress/xvfb": ^1.2.4
-    "@types/node": ^14.14.31
-    "@types/sinonjs__fake-timers": 8.1.1
-    "@types/sizzle": ^2.3.2
-    arch: ^2.2.0
-    blob-util: ^2.0.2
-    bluebird: ^3.7.2
-    buffer: ^5.6.0
-    cachedir: ^2.3.0
-    chalk: ^4.1.0
-    check-more-types: ^2.24.0
-    cli-cursor: ^3.1.0
-    cli-table3: ~0.6.1
-    commander: ^5.1.0
-    common-tags: ^1.8.0
-    dayjs: ^1.10.4
-    debug: ^4.3.2
-    enquirer: ^2.3.6
-    eventemitter2: ^6.4.3
-    execa: 4.1.0
-    executable: ^4.1.1
-    extract-zip: 2.0.1
-    figures: ^3.2.0
-    fs-extra: ^9.1.0
-    getos: ^3.2.1
-    is-ci: ^3.0.0
-    is-installed-globally: ~0.4.0
-    lazy-ass: ^1.6.0
-    listr2: ^3.8.3
-    lodash: ^4.17.21
-    log-symbols: ^4.0.0
-    minimist: ^1.2.5
-    ospath: ^1.2.2
-    pretty-bytes: ^5.6.0
-    proxy-from-env: 1.0.0
-    request-progress: ^3.0.0
-    semver: ^7.3.2
-    supports-color: ^8.1.1
-    tmp: ~0.2.1
-    untildify: ^4.0.0
-    yauzl: ^2.10.0
+    "@cypress/request": "npm:^2.88.10"
+    "@cypress/xvfb": "npm:^1.2.4"
+    "@types/node": "npm:^14.14.31"
+    "@types/sinonjs__fake-timers": "npm:8.1.1"
+    "@types/sizzle": "npm:^2.3.2"
+    arch: "npm:^2.2.0"
+    blob-util: "npm:^2.0.2"
+    bluebird: "npm:^3.7.2"
+    buffer: "npm:^5.6.0"
+    cachedir: "npm:^2.3.0"
+    chalk: "npm:^4.1.0"
+    check-more-types: "npm:^2.24.0"
+    cli-cursor: "npm:^3.1.0"
+    cli-table3: "npm:~0.6.1"
+    commander: "npm:^5.1.0"
+    common-tags: "npm:^1.8.0"
+    dayjs: "npm:^1.10.4"
+    debug: "npm:^4.3.2"
+    enquirer: "npm:^2.3.6"
+    eventemitter2: "npm:^6.4.3"
+    execa: "npm:4.1.0"
+    executable: "npm:^4.1.1"
+    extract-zip: "npm:2.0.1"
+    figures: "npm:^3.2.0"
+    fs-extra: "npm:^9.1.0"
+    getos: "npm:^3.2.1"
+    is-ci: "npm:^3.0.0"
+    is-installed-globally: "npm:~0.4.0"
+    lazy-ass: "npm:^1.6.0"
+    listr2: "npm:^3.8.3"
+    lodash: "npm:^4.17.21"
+    log-symbols: "npm:^4.0.0"
+    minimist: "npm:^1.2.5"
+    ospath: "npm:^1.2.2"
+    pretty-bytes: "npm:^5.6.0"
+    proxy-from-env: "npm:1.0.0"
+    request-progress: "npm:^3.0.0"
+    semver: "npm:^7.3.2"
+    supports-color: "npm:^8.1.1"
+    tmp: "npm:~0.2.1"
+    untildify: "npm:^4.0.0"
+    yauzl: "npm:^2.10.0"
   bin:
     cypress: bin/cypress
-  checksum: 96efebb8bfca52f214f793856a7eb40a6eb4a7bc06e5d7c17c7378cec8e3e3975d5777147066d04d95d88b99d4052bbf8749d96b4a25d3f79cc65e88e93f703d
+  checksum: 10/a5c84a1bc40ffa3e540f00b61e03caf977e7119318bebc5ac6fa0689eda4591a54f17d1b5883e016eabd3c9d704faafdf8c5aa8eee50369815606f52aa250bea
   languageName: node
   linkType: hard
 
@@ -14005,8 +14991,8 @@ __metadata:
   version: 3.2.2
   resolution: "d3-array@npm:3.2.2"
   dependencies:
-    internmap: 1 - 2
-  checksum: 98af3db792685ceca5d9c3721efba0c567520da5532b2c7a590fd83627a598ea225d11c2cecbad404dc154120feb5ea6df0ded38f82ddf342c714cfd0c6143d1
+    internmap: "npm:1 - 2"
+  checksum: 10/e940c7b77e5fbb8520a3b914b8121e668d12b58f1fbd15be83d819802b73da43540422fe66d17feec04e3280255b3aa5fac452f12b7f37f2378531a8bbb233bc
   languageName: node
   linkType: hard
 
@@ -14014,15 +15000,15 @@ __metadata:
   version: 3.2.1
   resolution: "d3-array@npm:3.2.1"
   dependencies:
-    internmap: 1 - 2
-  checksum: 0bed33cc33b70f9d48ccef3e7a5956e134862e09179bf14df0bf9c8fc0ec02b8f847d4f5e1d32729cd5e02032af1d0a32bcc968ff1333795028455a749994623
+    internmap: "npm:1 - 2"
+  checksum: 10/5522a1e193f87a6a2e1ee784065b0e9c11b3602a388a1060aac91a6a0374fa2234436bc253312ca7b1517b91b2eea2ea9191b1e37e76c8b2bf4d422f41990dec
   languageName: node
   linkType: hard
 
 "d3-axis@npm:3":
   version: 3.0.0
   resolution: "d3-axis@npm:3.0.0"
-  checksum: 227ddaa6d4bad083539c1ec245e2228b4620cca941997a8a650cb0af239375dc20271993127eedac66f0543f331027aca09385e1e16eed023f93eac937cddf0b
+  checksum: 10/15ec43ecbd4e7b606fcda60f67a522e45576dfd6aa83dff47f3e91ef6c8448841a09cd91f630b492250dcec67c6ea64463510ead5e632ff6b827aeefae1d42ad
   languageName: node
   linkType: hard
 
@@ -14030,12 +15016,12 @@ __metadata:
   version: 3.0.0
   resolution: "d3-brush@npm:3.0.0"
   dependencies:
-    d3-dispatch: 1 - 3
-    d3-drag: 2 - 3
-    d3-interpolate: 1 - 3
-    d3-selection: 3
-    d3-transition: 3
-  checksum: 1d042167769a02ac76271c71e90376d7184206e489552b7022a8ec2860209fe269db55e0a3430f3dcbe13b6fec2ff65b1adeaccba3218991b38e022390df72e3
+    d3-dispatch: "npm:1 - 3"
+    d3-drag: "npm:2 - 3"
+    d3-interpolate: "npm:1 - 3"
+    d3-selection: "npm:3"
+    d3-transition: "npm:3"
+  checksum: 10/fa3a461b62f0f0ee6fe41f5babf45535a0a8f6d4999f675fb1dce932ee02eff72dec14c7296af31ca15998dc0141ccf5d02aa6499363f8bf2941d90688a1d644
   languageName: node
   linkType: hard
 
@@ -14043,15 +15029,15 @@ __metadata:
   version: 3.0.1
   resolution: "d3-chord@npm:3.0.1"
   dependencies:
-    d3-path: 1 - 3
-  checksum: ddf35d41675e0f8738600a8a2f05bf0858def413438c12cba357c5802ecc1014c80a658acbbee63cbad2a8c747912efb2358455d93e59906fe37469f1dc6b78b
+    d3-path: "npm:1 - 3"
+  checksum: 10/4febcdca4fdc8ba91fc4f7545f4b6321c440150dff80c1ebef887db07bb4200395dfebede63b257393259de07f914da10842da5ab3135e1e281e33ad153e0849
   languageName: node
   linkType: hard
 
 "d3-color@npm:1 - 3, d3-color@npm:3, d3-color@npm:3.1.0":
   version: 3.1.0
   resolution: "d3-color@npm:3.1.0"
-  checksum: 4931fbfda5d7c4b5cfa283a13c91a954f86e3b69d75ce588d06cde6c3628cebfc3af2069ccf225e982e8987c612aa7948b3932163ce15eb3c11cd7c003f3ee3b
+  checksum: 10/536ba05bfd9f4fcd6fa289b5974f5c846b21d186875684637e22bf6855e6aba93e24a2eb3712985c6af3f502fbbfa03708edb72f58142f626241a8a17258e545
   languageName: node
   linkType: hard
 
@@ -14059,8 +15045,8 @@ __metadata:
   version: 4.0.2
   resolution: "d3-contour@npm:4.0.2"
   dependencies:
-    d3-array: ^3.2.0
-  checksum: 56aa082c1acf62a45b61c8d29fdd307041785aa17d9a07de7d1d848633769887a33fb6823888afa383f31c460d0f21d24756593e84e334ddb92d774214d32f1b
+    d3-array: "npm:^3.2.0"
+  checksum: 10/0b252267e0c3c5e97d7e0c720bd35654de99f981199f7240d7dd1acfd4e2d5bf1638829f6db486452eff9c38608efa4a6ab5a0d1525131735c011ee7be3cb4ba
   languageName: node
   linkType: hard
 
@@ -14068,15 +15054,15 @@ __metadata:
   version: 6.0.2
   resolution: "d3-delaunay@npm:6.0.2"
   dependencies:
-    delaunator: 5
-  checksum: 80b18686dd7a5919a570000061f1515d106b7c7e3cba9da55706c312fc8f6de58a72674f2ea4eadc6694611f2df59f82c8b9d304845dd8b7903ee1f303aa5865
+    delaunator: "npm:5"
+  checksum: 10/66b25c023eaf3335f1cca2d375954573e583d907aff9d1212cef714bbccb6c84d860ed0bcebaf2bd1fba88c1f0827a3515dd1d43127732a029a83c30ffb4d9f9
   languageName: node
   linkType: hard
 
 "d3-dispatch@npm:1 - 3, d3-dispatch@npm:3":
   version: 3.0.1
   resolution: "d3-dispatch@npm:3.0.1"
-  checksum: fdfd4a230f46463e28e5b22a45dd76d03be9345b605e1b5dc7d18bd7ebf504e6c00ae123fd6d03e23d9e2711e01f0e14ea89cd0632545b9f0c00b924ba4be223
+  checksum: 10/2b82f41bf4ef88c2f9033dfe32815b67e2ef1c5754a74137a74c7d44d6f0d6ecfa934ac56ed8afe358f6c1f06462e8aa42ca0a388397b5b77a42721570e80487
   languageName: node
   linkType: hard
 
@@ -14084,9 +15070,9 @@ __metadata:
   version: 3.0.0
   resolution: "d3-drag@npm:3.0.0"
   dependencies:
-    d3-dispatch: 1 - 3
-    d3-selection: 3
-  checksum: d297231e60ecd633b0d076a63b4052b436ddeb48b5a3a11ff68c7e41a6774565473a6b064c5e9256e88eca6439a917ab9cea76032c52d944ddbf4fd289e31111
+    d3-dispatch: "npm:1 - 3"
+    d3-selection: "npm:3"
+  checksum: 10/80bc689935e5a46ee92b2d7f71e1c792279382affed9fbcf46034bff3ff7d3f50cf61a874da4bdf331037292b9e7dca5c6401a605d4bb699fdcb4e0c87e176ec
   languageName: node
   linkType: hard
 
@@ -14094,9 +15080,9 @@ __metadata:
   version: 3.0.1
   resolution: "d3-dsv@npm:3.0.1"
   dependencies:
-    commander: 7
-    iconv-lite: 0.6
-    rw: 1
+    commander: "npm:7"
+    iconv-lite: "npm:0.6"
+    rw: "npm:1"
   bin:
     csv2json: bin/dsv2json.js
     csv2tsv: bin/dsv2dsv.js
@@ -14107,14 +15093,14 @@ __metadata:
     json2tsv: bin/json2dsv.js
     tsv2csv: bin/dsv2dsv.js
     tsv2json: bin/dsv2json.js
-  checksum: 5fc0723647269d5dccd181d74f2265920ab368a2868b0b4f55ffa2fecdfb7814390ea28622cd61ee5d9594ab262879509059544e9f815c54fe76fbfb4ffa4c8a
+  checksum: 10/a628ac42a272466940f713f310db2e5246690b22035121dc1230077070c9135fb7c9b4d260f093fcadf63b0528202a1953107448a4be3a860c4f42f50d09504d
   languageName: node
   linkType: hard
 
 "d3-ease@npm:1 - 3, d3-ease@npm:3":
   version: 3.0.1
   resolution: "d3-ease@npm:3.0.1"
-  checksum: 06e2ee5326d1e3545eab4e2c0f84046a123dcd3b612e68858219aa034da1160333d9ce3da20a1d3486d98cb5c2a06f7d233eee1bc19ce42d1533458bd85dedcd
+  checksum: 10/985d46e868494e9e6806fedd20bad712a50dcf98f357bf604a843a9f6bc17714a657c83dd762f183173dcde983a3570fa679b2bc40017d40b24163cdc4167796
   languageName: node
   linkType: hard
 
@@ -14122,8 +15108,8 @@ __metadata:
   version: 3.0.1
   resolution: "d3-fetch@npm:3.0.1"
   dependencies:
-    d3-dsv: 1 - 3
-  checksum: 382dcea06549ef82c8d0b719e5dc1d96286352579e3b51b20f71437f5800323315b09cf7dcfd4e1f60a41e1204deb01758470cea257d2285a7abd9dcec806984
+    d3-dsv: "npm:1 - 3"
+  checksum: 10/cd35d55f8fbb1ea1e37be362a575bb0161449957133aa5b45b9891889b2aca1dc0769c240a236736e33cd823e820a0e73fb3744582307a5d26d1df7bed0ccecb
   languageName: node
   linkType: hard
 
@@ -14131,33 +15117,33 @@ __metadata:
   version: 3.0.0
   resolution: "d3-force@npm:3.0.0"
   dependencies:
-    d3-dispatch: 1 - 3
-    d3-quadtree: 1 - 3
-    d3-timer: 1 - 3
-  checksum: 6c7e96438cab62fa32aeadb0ade3297b62b51f81b1b38b0a60a5ec9fd627d74090c1189654d92df2250775f31b06812342f089f1d5947de9960a635ee3581def
+    d3-dispatch: "npm:1 - 3"
+    d3-quadtree: "npm:1 - 3"
+    d3-timer: "npm:1 - 3"
+  checksum: 10/85945f8d444d78567009518f0ab54c0f0c8873eb8eb9a2ff0ab667b0f81b419e101a411415d4a2c752547ec7143f89675e8c33b8f111e55e5579a04cb7f4591c
   languageName: node
   linkType: hard
 
 "d3-format@npm:1 - 3, d3-format@npm:3, d3-format@npm:3.1.0":
   version: 3.1.0
   resolution: "d3-format@npm:3.1.0"
-  checksum: f345ec3b8ad3cab19bff5dead395bd9f5590628eb97a389b1dd89f0b204c7c4fc1d9520f13231c2c7cf14b7c9a8cf10f8ef15bde2befbab41454a569bd706ca2
+  checksum: 10/a0fe23d2575f738027a3db0ce57160e5a473ccf24808c1ed46d45ef4f3211076b34a18b585547d34e365e78dcc26dd4ab15c069731fc4b1c07a26bfced09ea31
   languageName: node
   linkType: hard
 
-"d3-geo@npm:3":
+"d3-geo@npm:3, d3-geo@npm:3.1.0":
   version: 3.1.0
   resolution: "d3-geo@npm:3.1.0"
   dependencies:
-    d3-array: 2.5.0 - 3
-  checksum: adf82b0c105c0c5951ae0a833d4dfc479a563791ad7938579fa14e1cffd623b469d8aa7a37dc413a327fb6ac56880f3da3f6c43d4abe3c923972dd98f34f37d1
+    d3-array: "npm:2.5.0 - 3"
+  checksum: 10/d214c2951c327501699b49f73fcbf417284468f41b31cd8f34c1975137a2544e4bb8080f35fa216659dba91c60f35b7bc857cd6b8297cf4f0fd37343269d9f8a
   languageName: node
   linkType: hard
 
 "d3-hierarchy@npm:3":
   version: 3.1.2
   resolution: "d3-hierarchy@npm:3.1.2"
-  checksum: 0fd946a8c5fd4686d43d3e11bbfc2037a145fda29d2261ccd0e36f70b66af6d7638e2c0c7112124d63fc3d3127197a00a6aecf676bd5bd392a94d7235a214263
+  checksum: 10/497b79dc6c35e28b21e8a7b94db92876abd1d4ec082d9803a07ea8964e55b0e71c511a21489363a36f1456f069adb8ff7d33c633678730d6ae961ed350b27733
   languageName: node
   linkType: hard
 
@@ -14165,53 +15151,53 @@ __metadata:
   version: 3.0.1
   resolution: "d3-interpolate@npm:3.0.1"
   dependencies:
-    d3-color: 1 - 3
-  checksum: a42ba314e295e95e5365eff0f604834e67e4a3b3c7102458781c477bd67e9b24b6bb9d8e41ff5521050a3f2c7c0c4bbbb6e187fd586daa3980943095b267e78b
+    d3-color: "npm:1 - 3"
+  checksum: 10/988d66497ef5c190cf64f8c80cd66e1e9a58c4d1f8932d776a8e3ae59330291795d5a342f5a97602782ccbef21a5df73bc7faf1f0dc46a5145ba6243a82a0f0e
   languageName: node
   linkType: hard
 
 "d3-path@npm:1 - 3, d3-path@npm:3, d3-path@npm:^3.1.0":
   version: 3.1.0
   resolution: "d3-path@npm:3.1.0"
-  checksum: 2306f1bd9191e1eac895ec13e3064f732a85f243d6e627d242a313f9777756838a2215ea11562f0c7630c7c3b16a19ec1fe0948b1c82f3317fac55882f6ee5d8
+  checksum: 10/8e97a9ab4930a05b18adda64cf4929219bac913a5506cf8585631020253b39309549632a5cbeac778c0077994442ddaaee8316ee3f380e7baf7566321b84e76a
   languageName: node
   linkType: hard
 
 "d3-path@npm:1, d3-path@npm:^1.0.5":
   version: 1.0.9
   resolution: "d3-path@npm:1.0.9"
-  checksum: d4382573baf9509a143f40944baeff9fead136926aed6872f7ead5b3555d68925f8a37935841dd51f1d70b65a294fe35c065b0906fb6e42109295f6598fc16d0
+  checksum: 10/6ce1747837ea2a449d9ea32e169a382978ab09a4805eb408feb6bbc12cb5f5f6ce29aefc252dd9a815d420f4813d672f75578b78b3bbaf7811f54d8c7f93fd11
   languageName: node
   linkType: hard
 
 "d3-polygon@npm:3":
   version: 3.0.1
   resolution: "d3-polygon@npm:3.0.1"
-  checksum: 0b85c532517895544683849768a2c377cee3801ef8ccf3fa9693c8871dd21a0c1a2a0fc75ff54192f0ba2c562b0da2bc27f5bf959dfafc7fa23573b574865d2c
+  checksum: 10/c4fa2ed19dcba13fd341815361d27e64597aa0d38d377e401e1353c4acbe8bd73c0afb3e49a1cf4119fadc3651ec8073d06aa6d0e34e664c868d071e58912cd1
   languageName: node
   linkType: hard
 
 "d3-quadtree@npm:1 - 3, d3-quadtree@npm:3":
   version: 3.0.1
   resolution: "d3-quadtree@npm:3.0.1"
-  checksum: 5469d462763811475f34a7294d984f3eb100515b0585ca5b249656f6b1a6e99b20056a2d2e463cc9944b888896d2b1d07859c50f9c0cf23438df9cd2e3146066
+  checksum: 10/1915b6a7b031fc312f9af61947072db9468c5a2b03837f6a90b38fdaebcd0ea17a883bffd94d16b8a6848e81711a06222f7d39f129386ef1850297219b8d32ba
   languageName: node
   linkType: hard
 
-"d3-random@npm:3":
+"d3-random@npm:3, d3-random@npm:^3.0.1":
   version: 3.0.1
   resolution: "d3-random@npm:3.0.1"
-  checksum: a70ad8d1cabe399ebeb2e482703121ac8946a3b336830b518da6848b9fdd48a111990fc041dc716f16885a72176ffa2898f2a250ca3d363ecdba5ef92b18e131
+  checksum: 10/9f41d6ca3a1826cea8d88392917b5039504337d442a4d1357c870fa3031701e60209a2689a6ddae7df8fca824383d038c957eb545bc49a7428c71aaf3b11f56f
   languageName: node
   linkType: hard
 
-"d3-scale-chromatic@npm:3, d3-scale-chromatic@npm:3.0.0":
-  version: 3.0.0
-  resolution: "d3-scale-chromatic@npm:3.0.0"
+"d3-scale-chromatic@npm:3, d3-scale-chromatic@npm:3.1.0":
+  version: 3.1.0
+  resolution: "d3-scale-chromatic@npm:3.1.0"
   dependencies:
-    d3-color: 1 - 3
-    d3-interpolate: 1 - 3
-  checksum: a8ce4cb0267a17b28ebbb929f5e3071d985908a9c13b6fcaa2a198e1e018f275804d691c5794b970df0049725b7944f32297b31603d235af6414004f0c7f82c0
+    d3-color: "npm:1 - 3"
+    d3-interpolate: "npm:1 - 3"
+  checksum: 10/25df6a7c621b9171df8b2225e98e41c0a6bcac4de02deb4807280b31116e8f495c5ac93301796098ee5b698cb690154e8138d90d72fd1fe36744c60e02a3d8c4
   languageName: node
   linkType: hard
 
@@ -14219,19 +15205,19 @@ __metadata:
   version: 4.0.2
   resolution: "d3-scale@npm:4.0.2"
   dependencies:
-    d3-array: 2.10.0 - 3
-    d3-format: 1 - 3
-    d3-interpolate: 1.2.0 - 3
-    d3-time: 2.1.1 - 3
-    d3-time-format: 2 - 4
-  checksum: a9c770d283162c3bd11477c3d9d485d07f8db2071665f1a4ad23eec3e515e2cefbd369059ec677c9ac849877d1a765494e90e92051d4f21111aa56791c98729e
+    d3-array: "npm:2.10.0 - 3"
+    d3-format: "npm:1 - 3"
+    d3-interpolate: "npm:1.2.0 - 3"
+    d3-time: "npm:2.1.1 - 3"
+    d3-time-format: "npm:2 - 4"
+  checksum: 10/e2dc4243586eae2a0fdf91de1df1a90d51dfacb295933f0ca7e9184c31203b01436bef69906ad40f1100173a5e6197ae753cb7b8a1a8fcfda43194ea9cad6493
   languageName: node
   linkType: hard
 
 "d3-selection@npm:2 - 3, d3-selection@npm:3":
   version: 3.0.0
   resolution: "d3-selection@npm:3.0.0"
-  checksum: f4e60e133309115b99f5b36a79ae0a19d71ee6e2d5e3c7216ef3e75ebd2cb1e778c2ed2fa4c01bef35e0dcbd96c5428f5bd6ca2184fe2957ed582fde6841cbc5
+  checksum: 10/0e5acfd305b31628b7be5009ba7303d84bb34817a88ed4dde9c8bd9c23528573fc5272f89fc04e5be03d2cbf5441a248d7274aaf55a8ef3dad46e16333d72298
   languageName: node
   linkType: hard
 
@@ -14239,8 +15225,8 @@ __metadata:
   version: 3.2.0
   resolution: "d3-shape@npm:3.2.0"
   dependencies:
-    d3-path: ^3.1.0
-  checksum: de2af5fc9a93036a7b68581ca0bfc4aca2d5a328aa7ba7064c11aedd44d24f310c20c40157cb654359d4c15c3ef369f95ee53d71221017276e34172c7b719cfa
+    d3-path: "npm:^3.1.0"
+  checksum: 10/2e861f4d4781ee8abd85d2b435f848d667479dcf01a4e0db3a06600a5bdeddedb240f88229ec7b3bf7fa300c2b3526faeaf7e75f9a24dbf4396d3cc5358ff39d
   languageName: node
   linkType: hard
 
@@ -14248,8 +15234,8 @@ __metadata:
   version: 1.3.7
   resolution: "d3-shape@npm:1.3.7"
   dependencies:
-    d3-path: 1
-  checksum: 46566a3ab64a25023653bf59d64e81e9e6c987e95be985d81c5cedabae5838bd55f4a201a6b69069ca862eb63594cd263cac9034afc2b0e5664dfe286c866129
+    d3-path: "npm:1"
+  checksum: 10/1e40fdcfdc8edc9c53a77a6aaea2dbf31bf06df12ebd66cc8d91f76bbde753049ad21dfee0577f7dc5d0a4468554ede4783f6df7d809e291745334dba977c09e
   languageName: node
   linkType: hard
 
@@ -14257,8 +15243,8 @@ __metadata:
   version: 4.1.0
   resolution: "d3-time-format@npm:4.1.0"
   dependencies:
-    d3-time: 1 - 3
-  checksum: 7342bce28355378152bbd4db4e275405439cabba082d9cd01946d40581140481c8328456d91740b0fe513c51ec4a467f4471ffa390c7e0e30ea30e9ec98fcdf4
+    d3-time: "npm:1 - 3"
+  checksum: 10/ffc0959258fbb90e3890bfb31b43b764f51502b575e87d0af2c85b85ac379120d246914d07fca9f533d1bcedc27b2841d308a00fd64848c3e2cad9eff5c9a0aa
   languageName: node
   linkType: hard
 
@@ -14266,15 +15252,15 @@ __metadata:
   version: 3.1.0
   resolution: "d3-time@npm:3.1.0"
   dependencies:
-    d3-array: 2 - 3
-  checksum: 613b435352a78d9f31b7f68540788186d8c331b63feca60ad21c88e9db1989fe888f97f242322ebd6365e45ec3fb206a4324cd4ca0dfffa1d9b5feb856ba00a7
+    d3-array: "npm:2 - 3"
+  checksum: 10/c110bed295ce63e8180e45b82a9b0ba114d5f33ff315871878f209c1a6d821caa505739a2b07f38d1396637155b8e7372632dacc018e11fbe8ceef58f6af806d
   languageName: node
   linkType: hard
 
 "d3-timer@npm:1 - 3, d3-timer@npm:3":
   version: 3.0.1
   resolution: "d3-timer@npm:3.0.1"
-  checksum: 1cfddf86d7bca22f73f2c427f52dfa35c49f50d64e187eb788dcad6e927625c636aa18ae4edd44d084eb9d1f81d8ca4ec305dae7f733c15846a824575b789d73
+  checksum: 10/004128602bb187948d72c7dc153f0f063f38ac7a584171de0b45e3a841ad2e17f1e40ad396a4af9cce5551b6ab4a838d5246d23492553843d9da4a4050a911e2
   languageName: node
   linkType: hard
 
@@ -14282,14 +15268,14 @@ __metadata:
   version: 3.0.1
   resolution: "d3-transition@npm:3.0.1"
   dependencies:
-    d3-color: 1 - 3
-    d3-dispatch: 1 - 3
-    d3-ease: 1 - 3
-    d3-interpolate: 1 - 3
-    d3-timer: 1 - 3
+    d3-color: "npm:1 - 3"
+    d3-dispatch: "npm:1 - 3"
+    d3-ease: "npm:1 - 3"
+    d3-interpolate: "npm:1 - 3"
+    d3-timer: "npm:1 - 3"
   peerDependencies:
     d3-selection: 2 - 3
-  checksum: cb1e6e018c3abf0502fe9ff7b631ad058efb197b5e14b973a410d3935aead6e3c07c67d726cfab258e4936ef2667c2c3d1cd2037feb0765f0b4e1d3b8788c0ea
+  checksum: 10/02571636acb82f5532117928a87fe25de68f088c38ab4a8b16e495f0f2d08a3fd2937eaebdefdfcf7f1461545524927d2632d795839b88d2e4c71e387aaaffac
   languageName: node
   linkType: hard
 
@@ -14297,75 +15283,73 @@ __metadata:
   version: 3.0.0
   resolution: "d3-zoom@npm:3.0.0"
   dependencies:
-    d3-dispatch: 1 - 3
-    d3-drag: 2 - 3
-    d3-interpolate: 1 - 3
-    d3-selection: 2 - 3
-    d3-transition: 2 - 3
-  checksum: 8056e3527281cfd1ccbcbc458408f86973b0583e9dac00e51204026d1d36803ca437f970b5736f02fafed9f2b78f145f72a5dbc66397e02d4d95d4c594b8ff54
-  languageName: node
-  linkType: hard
-
-"d3@npm:7.8.5, d3@npm:^7.8.5":
-  version: 7.8.5
-  resolution: "d3@npm:7.8.5"
-  dependencies:
-    d3-array: 3
-    d3-axis: 3
-    d3-brush: 3
-    d3-chord: 3
-    d3-color: 3
-    d3-contour: 4
-    d3-delaunay: 6
-    d3-dispatch: 3
-    d3-drag: 3
-    d3-dsv: 3
-    d3-ease: 3
-    d3-fetch: 3
-    d3-force: 3
-    d3-format: 3
-    d3-geo: 3
-    d3-hierarchy: 3
-    d3-interpolate: 3
-    d3-path: 3
-    d3-polygon: 3
-    d3-quadtree: 3
-    d3-random: 3
-    d3-scale: 4
-    d3-scale-chromatic: 3
-    d3-selection: 3
-    d3-shape: 3
-    d3-time: 3
-    d3-time-format: 4
-    d3-timer: 3
-    d3-transition: 3
-    d3-zoom: 3
-  checksum: e407e79731f74d946a5eb8dec2f037b5a4ad33c294409b1d3531fdf7094de48adfe364974cb37e2396bdb81e23149d56d0ede716c004d6aebb52b3cc114cd15c
+    d3-dispatch: "npm:1 - 3"
+    d3-drag: "npm:2 - 3"
+    d3-interpolate: "npm:1 - 3"
+    d3-selection: "npm:2 - 3"
+    d3-transition: "npm:2 - 3"
+  checksum: 10/0e6e5c14e33c4ecdff311a900dd037dea407734f2dd2818988ed6eae342c1799e8605824523678bd404f81e37824cc588f62dbde46912444c89acc7888036c6b
+  languageName: node
+  linkType: hard
+
+"d3@npm:7.9.0, d3@npm:^7.8.5":
+  version: 7.9.0
+  resolution: "d3@npm:7.9.0"
+  dependencies:
+    d3-array: "npm:3"
+    d3-axis: "npm:3"
+    d3-brush: "npm:3"
+    d3-chord: "npm:3"
+    d3-color: "npm:3"
+    d3-contour: "npm:4"
+    d3-delaunay: "npm:6"
+    d3-dispatch: "npm:3"
+    d3-drag: "npm:3"
+    d3-dsv: "npm:3"
+    d3-ease: "npm:3"
+    d3-fetch: "npm:3"
+    d3-force: "npm:3"
+    d3-format: "npm:3"
+    d3-geo: "npm:3"
+    d3-hierarchy: "npm:3"
+    d3-interpolate: "npm:3"
+    d3-path: "npm:3"
+    d3-polygon: "npm:3"
+    d3-quadtree: "npm:3"
+    d3-random: "npm:3"
+    d3-scale: "npm:4"
+    d3-scale-chromatic: "npm:3"
+    d3-selection: "npm:3"
+    d3-shape: "npm:3"
+    d3-time: "npm:3"
+    d3-time-format: "npm:4"
+    d3-timer: "npm:3"
+    d3-transition: "npm:3"
+    d3-zoom: "npm:3"
+  checksum: 10/b0b418996bdf279b01f5c7a0117927f9ad3e833c9ce4657550ce6f6ace70b70cf829c4144b01df0be5a0f716d4e5f15ab0cadc5ff1ce1561d7be29ac86493d83
   languageName: node
   linkType: hard
 
 "damerau-levenshtein@npm:^1.0.8":
   version: 1.0.8
   resolution: "damerau-levenshtein@npm:1.0.8"
-  checksum: d240b7757544460ae0586a341a53110ab0a61126570ef2d8c731e3eab3f0cb6e488e2609e6a69b46727635de49be20b071688698744417ff1b6c1d7ccd03e0de
+  checksum: 10/f4eba1c90170f96be25d95fa3857141b5f81e254f7e4d530da929217b19990ea9a0390fc53d3c1cafac9152fda78e722ea4894f765cf6216be413b5af1fbf821
   languageName: node
   linkType: hard
 
-"dangerously-set-html-content@npm:1.0.9":
-  version: 1.0.9
-  resolution: "dangerously-set-html-content@npm:1.0.9"
+"dangerously-set-html-content@npm:1.1.0":
+  version: 1.1.0
+  resolution: "dangerously-set-html-content@npm:1.1.0"
   peerDependencies:
-    prop-types: ^15.5.4
-    react: ^15.0.0 || ^16.0.0 || ^17.0.0
-    react-dom: ^15.0.0 || ^16.0.0 || ^17.0.0
-  checksum: a30c3f1f0f4f7ef3cc723017a57f3503a9b3bf2f813e0f9f1ada69883d54bb706fc42ad0edc714713e5ce862f58403c54d46beb6fd8512144c5264cc574c78d5
+    react: ^18.2.0
+  checksum: 10/6fa055d6e435134d7deeab139d24e61ef05ee8863b1e91f86672f82e7bb3759da7f7d12dbdadf3a4d729ed236c851b2bf93c257fadae07ce285dc008e8a7cd4f
   languageName: node
   linkType: hard
 
 "dargs@npm:^7.0.0":
   version: 7.0.0
   resolution: "dargs@npm:7.0.0"
-  checksum: b8f1e3cba59c42e1f13a114ad4848c3fc1cf7470f633ee9e9f1043762429bc97d91ae31b826fb135eefde203a3fdb20deb0c0a0222ac29d937b8046085d668d1
+  checksum: 10/b8f1e3cba59c42e1f13a114ad4848c3fc1cf7470f633ee9e9f1043762429bc97d91ae31b826fb135eefde203a3fdb20deb0c0a0222ac29d937b8046085d668d1
   languageName: node
   linkType: hard
 
@@ -14373,8 +15357,15 @@ __metadata:
   version: 1.14.1
   resolution: "dashdash@npm:1.14.1"
   dependencies:
-    assert-plus: ^1.0.0
-  checksum: 3634c249570f7f34e3d34f866c93f866c5b417f0dd616275decae08147dcdf8fccfaa5947380ccfb0473998ea3a8057c0b4cd90c875740ee685d0624b2983598
+    assert-plus: "npm:^1.0.0"
+  checksum: 10/137b287fa021201ce100cef772c8eeeaaafdd2aa7282864022acf3b873021e54cb809e9c060fa164840bf54ff72d00d6e2d8da1ee5a86d7200eeefa1123a8f7f
+  languageName: node
+  linkType: hard
+
+"dashify@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "dashify@npm:2.0.0"
+  checksum: 10/f13233f38fc39ea8dabe3a5bef51421906aa8a52e4403fcb56e3e6464428f5c0bdd75562706929a245c698bceccf68a82e30e9e327a0c582469868522a163f8c
   languageName: node
   linkType: hard
 
@@ -14382,61 +15373,92 @@ __metadata:
   version: 3.0.2
   resolution: "data-urls@npm:3.0.2"
   dependencies:
-    abab: ^2.0.6
-    whatwg-mimetype: ^3.0.0
-    whatwg-url: ^11.0.0
-  checksum: 033fc3dd0fba6d24bc9a024ddcf9923691dd24f90a3d26f6545d6a2f71ec6956f93462f2cdf2183cc46f10dc01ed3bcb36731a8208456eb1a08147e571fe2a76
+    abab: "npm:^2.0.6"
+    whatwg-mimetype: "npm:^3.0.0"
+    whatwg-url: "npm:^11.0.0"
+  checksum: 10/033fc3dd0fba6d24bc9a024ddcf9923691dd24f90a3d26f6545d6a2f71ec6956f93462f2cdf2183cc46f10dc01ed3bcb36731a8208456eb1a08147e571fe2a76
+  languageName: node
+  linkType: hard
+
+"data-view-buffer@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "data-view-buffer@npm:1.0.1"
+  dependencies:
+    call-bind: "npm:^1.0.6"
+    es-errors: "npm:^1.3.0"
+    is-data-view: "npm:^1.0.1"
+  checksum: 10/5919a39a18ee919573336158fd162fdf8ada1bc23a139f28543fd45fac48e0ea4a3ad3bfde91de124d4106e65c4a7525f6a84c20ba0797ec890a77a96d13a82a
+  languageName: node
+  linkType: hard
+
+"data-view-byte-length@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "data-view-byte-length@npm:1.0.1"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    es-errors: "npm:^1.3.0"
+    is-data-view: "npm:^1.0.1"
+  checksum: 10/f33c65e58d8d0432ad79761f2e8a579818d724b5dc6dc4e700489b762d963ab30873c0f1c37d8f2ed12ef51c706d1195f64422856d25f067457aeec50cc40aac
   languageName: node
   linkType: hard
 
-"date-fns@npm:2.30.0":
-  version: 2.30.0
-  resolution: "date-fns@npm:2.30.0"
+"data-view-byte-offset@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "data-view-byte-offset@npm:1.0.0"
   dependencies:
-    "@babel/runtime": ^7.21.0
-  checksum: f7be01523282e9bb06c0cd2693d34f245247a29098527d4420628966a2d9aad154bd0e90a6b1cf66d37adcb769cd108cf8a7bd49d76db0fb119af5cdd13644f4
+    call-bind: "npm:^1.0.6"
+    es-errors: "npm:^1.3.0"
+    is-data-view: "npm:^1.0.1"
+  checksum: 10/96f34f151bf02affb7b9f98762fb7aca1dd5f4553cb57b80bce750ca609c15d33ca659568ef1d422f7e35680736cbccb893a3d4b012760c758c1446bbdc4c6db
+  languageName: node
+  linkType: hard
+
+"date-fns@npm:3.6.0":
+  version: 3.6.0
+  resolution: "date-fns@npm:3.6.0"
+  checksum: 10/cac35c58926a3b5d577082ff2b253612ec1c79eb6754fddef46b6a8e826501ea2cb346ecbd211205f1ba382ddd1f9d8c3f00bf433ad63cc3063454d294e3a6b8
   languageName: node
   linkType: hard
 
 "date-format@npm:^0.0.0":
   version: 0.0.0
   resolution: "date-format@npm:0.0.0"
-  checksum: 5521db0145ab6fc16c43f409be0cc08bfc204a9204a442165eda0f45afc89c4c51d8aea3848d7eb68b3c998b208f67e5482ee57e7f3ec394accf21a87e2c7882
+  checksum: 10/5521db0145ab6fc16c43f409be0cc08bfc204a9204a442165eda0f45afc89c4c51d8aea3848d7eb68b3c998b208f67e5482ee57e7f3ec394accf21a87e2c7882
   languageName: node
   linkType: hard
 
-"dateformat@npm:^3.0.0":
+"dateformat@npm:^3.0.3":
   version: 3.0.3
   resolution: "dateformat@npm:3.0.3"
-  checksum: ca4911148abb09887bd9bdcd632c399b06f3ecad709a18eb594d289a1031982f441e08e281db77ffebcb2cbcbfa1ac578a7cbfbf8743f41009aa5adc1846ed34
+  checksum: 10/0504baf50c3777ad333c96c37d1673d67efcb7dd071563832f70b5cbf7f3f4753f18981d44bfd8f665d5e5a511d2fc0af8e0ead8b585b9b3ddaa90067864d3f0
   languageName: node
   linkType: hard
 
 "dayjs@npm:^1.10.4":
   version: 1.11.7
   resolution: "dayjs@npm:1.11.7"
-  checksum: 5003a7c1dd9ed51385beb658231c3548700b82d3548c0cfbe549d85f2d08e90e972510282b7506941452c58d32136d6362f009c77ca55381a09c704e9f177ebb
+  checksum: 10/341d7dc917a4ddc79c836684f7632a769ad8ae3c56506e62b97c27d7bb8a379b52b5589180b80f514eca9beb0b8789303bd32ce3107ba62055078800f9871e38
   languageName: node
   linkType: hard
 
 "de-indent@npm:^1.0.2":
   version: 1.0.2
   resolution: "de-indent@npm:1.0.2"
-  checksum: 8deacc0f4a397a4414a0fc4d0034d2b7782e7cb4eaf34943ea47754e08eccf309a0e71fa6f56cc48de429ede999a42d6b4bca761bf91683be0095422dbf24611
+  checksum: 10/30bf43744dca005f9252dbb34ed95dcb3c30dfe52bfed84973b89c29eccff04e27769f222a34c61a93354acf47457785e9032e6184be390ed1d324fb9ab3f427
   languageName: node
   linkType: hard
 
 "debounce-promise@npm:3.1.2":
   version: 3.1.2
   resolution: "debounce-promise@npm:3.1.2"
-  checksum: 29bac4524c423cc852319d7455363909ea3d933a3b9e3eb1149d963cffc34c475fe37219d0bafc61af566500b5d663cba579bbad7ee4023bef06f8394ed900ad
+  checksum: 10/9a06b4f4674abf92ccda608510ba896f1a6f25c594d6288b787f40e99de836461ad8122f6cd8ce335816b693a678dfb37b7470961888ea4b08863208f3eea348
   languageName: node
   linkType: hard
 
-"debounce@npm:^1.2.0":
+"debounce@npm:^1.2.0, debounce@npm:^1.2.1":
   version: 1.2.1
   resolution: "debounce@npm:1.2.1"
-  checksum: 682a89506d9e54fb109526f4da255c5546102fbb8e3ae75eef3b04effaf5d4853756aee97475cd4650641869794e44f410eeb20ace2b18ea592287ab2038519e
+  checksum: 10/0b95b2a9d80ed69117d890f8dab8c0f2d6066f8d20edd1d810ae51f8f366a6d4c8b1d56e97dcb9304e93d57de4d5db440d34a03def7dad50403fc3f22bf16808
   languageName: node
   linkType: hard
 
@@ -14444,8 +15466,8 @@ __metadata:
   version: 2.6.9
   resolution: "debug@npm:2.6.9"
   dependencies:
-    ms: 2.0.0
-  checksum: d2f51589ca66df60bf36e1fa6e4386b318c3f1e06772280eea5b1ae9fd3d05e9c2b7fd8a7d862457d00853c75b00451aa2d7459b924629ee385287a650f58fe6
+    ms: "npm:2.0.0"
+  checksum: 10/e07005f2b40e04f1bd14a3dd20520e9c4f25f60224cb006ce9d6781732c917964e9ec029fc7f1a151083cd929025ad5133814d4dc624a9aaf020effe4914ed14
   languageName: node
   linkType: hard
 
@@ -14453,18 +15475,11 @@ __metadata:
   version: 4.3.4
   resolution: "debug@npm:4.3.4"
   dependencies:
-    ms: 2.1.2
+    ms: "npm:2.1.2"
   peerDependenciesMeta:
     supports-color:
       optional: true
-  checksum: 3dbad3f94ea64f34431a9cbf0bafb61853eda57bff2880036153438f50fb5a84f27683ba0d8e5426bf41a8c6ff03879488120cf5b3a761e77953169c0600a708
-  languageName: node
-  linkType: hard
-
-"debug@npm:^0.7.2":
-  version: 0.7.4
-  resolution: "debug@npm:0.7.4"
-  checksum: 5646bf2bb349381e1363f1107513270f29092df1a1a7c0f331b23867867c517da5acbd31f828101bef61969fe558b81f044288624dbadaccb2c088329450a74f
+  checksum: 10/0073c3bcbd9cb7d71dd5f6b55be8701af42df3e56e911186dfa46fac3a5b9eb7ce7f377dd1d3be6db8977221f8eb333d945216f645cf56f6b688cd484837d255
   languageName: node
   linkType: hard
 
@@ -14472,15 +15487,8 @@ __metadata:
   version: 3.2.7
   resolution: "debug@npm:3.2.7"
   dependencies:
-    ms: ^2.1.1
-  checksum: b3d8c5940799914d30314b7c3304a43305fd0715581a919dacb8b3176d024a782062368405b47491516d2091d6462d4d11f2f4974a405048094f8bfebfa3071c
-  languageName: node
-  linkType: hard
-
-"debuglog@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "debuglog@npm:1.0.1"
-  checksum: 970679f2eb7a73867e04d45b52583e7ec6dee1f33c058e9147702e72a665a9647f9c3d6e7c2f66f6bf18510b23eb5ded1b617e48ac1db23603809c5ddbbb9763
+    ms: "npm:^2.1.1"
+  checksum: 10/d86fd7be2b85462297ea16f1934dc219335e802f629ca9a69b63ed8ed041dda492389bb2ee039217c02e5b54792b1c51aa96ae954cf28634d363a2360c7a1639
   languageName: node
   linkType: hard
 
@@ -14488,51 +15496,44 @@ __metadata:
   version: 1.1.0
   resolution: "decamelize-keys@npm:1.1.0"
   dependencies:
-    decamelize: ^1.1.0
-    map-obj: ^1.0.0
-  checksum: 8bc5d32e035a072f5dffc1f1f3d26ca7ab1fb44a9cade34c97ab6cd1e62c81a87e718101e96de07d78cecda20a3fdb955df958e46671ccad01bb8dcf0de2e298
+    decamelize: "npm:^1.1.0"
+    map-obj: "npm:^1.0.0"
+  checksum: 10/968813219ec20e167b01294cdc0eb754a8b4dc979fda6989f498d9a483822efd341683aeb09a3f3c50bf974211bc4779c39d792e19cfafc6fc2e6e5d9343850c
   languageName: node
   linkType: hard
 
 "decamelize@npm:^1.1.0":
   version: 1.2.0
   resolution: "decamelize@npm:1.2.0"
-  checksum: ad8c51a7e7e0720c70ec2eeb1163b66da03e7616d7b98c9ef43cce2416395e84c1e9548dd94f5f6ffecfee9f8b94251fc57121a8b021f2ff2469b2bae247b8aa
+  checksum: 10/ad8c51a7e7e0720c70ec2eeb1163b66da03e7616d7b98c9ef43cce2416395e84c1e9548dd94f5f6ffecfee9f8b94251fc57121a8b021f2ff2469b2bae247b8aa
   languageName: node
   linkType: hard
 
 "decamelize@npm:^4.0.0":
   version: 4.0.0
   resolution: "decamelize@npm:4.0.0"
-  checksum: b7d09b82652c39eead4d6678bb578e3bebd848add894b76d0f6b395bc45b2d692fb88d977e7cfb93c4ed6c119b05a1347cef261174916c2e75c0a8ca57da1809
-  languageName: node
-  linkType: hard
-
-"decamelize@npm:^5.0.0":
-  version: 5.0.1
-  resolution: "decamelize@npm:5.0.1"
-  checksum: 7c3b1ed4b3e60e7fbc00a35fb248298527c1cdfe603e41dfcf05e6c4a8cb9efbee60630deb677ed428908fb4e74e322966c687a094d1478ddc9c3a74e9dc7140
+  checksum: 10/b7d09b82652c39eead4d6678bb578e3bebd848add894b76d0f6b395bc45b2d692fb88d977e7cfb93c4ed6c119b05a1347cef261174916c2e75c0a8ca57da1809
   languageName: node
   linkType: hard
 
 "decimal.js@npm:^10.4.1":
   version: 10.4.2
   resolution: "decimal.js@npm:10.4.2"
-  checksum: 536cd6816a3197f2e1aa3da4860856cb5a2db73f6fafe8cb3b924ccc63f9b7d78296acc13dccbd419bd958ccc6357921fb15467f883b37cab04bfba7044cada2
+  checksum: 10/f762ffe7191102584bcaa00eabf24f5ceaba4dafa9aea600dc1d1d73bf88d15d126d40b649449523f71a2439defedfc7788a2bfffe36b2c721c75e24d750c3ba
   languageName: node
   linkType: hard
 
 "decode-uri-component@npm:^0.2.0":
   version: 0.2.2
   resolution: "decode-uri-component@npm:0.2.2"
-  checksum: 95476a7d28f267292ce745eac3524a9079058bbb35767b76e3ee87d42e34cd0275d2eb19d9d08c3e167f97556e8a2872747f5e65cbebcac8b0c98d83e285f139
+  checksum: 10/17a0e5fa400bf9ea84432226e252aa7b5e72793e16bf80b907c99b46a799aeacc139ec20ea57121e50c7bd875a1a4365928f884e92abf02e21a5a13790a0f33e
   languageName: node
   linkType: hard
 
-"dedent@npm:^0.7.0":
+"dedent@npm:0.7.0, dedent@npm:^0.7.0":
   version: 0.7.0
   resolution: "dedent@npm:0.7.0"
-  checksum: 87de191050d9a40dd70cad01159a0bcf05ecb59750951242070b6abf9569088684880d00ba92a955b4058804f16eeaf91d604f283929b4f614d181cd7ae633d2
+  checksum: 10/87de191050d9a40dd70cad01159a0bcf05ecb59750951242070b6abf9569088684880d00ba92a955b4058804f16eeaf91d604f283929b4f614d181cd7ae633d2
   languageName: node
   linkType: hard
 
@@ -14544,7 +15545,7 @@ __metadata:
   peerDependenciesMeta:
     babel-plugin-macros:
       optional: true
-  checksum: c3c300a14edf1bdf5a873f9e4b22e839d62490bc5c8d6169c1f15858a1a76733d06a9a56930e963d677a2ceeca4b6b0894cc5ea2f501aa382ca5b92af3413c2a
+  checksum: 10/fc00a8bc3dfb7c413a778dc40ee8151b6c6ff35159d641f36ecd839c1df5c6e0ec5f4992e658c82624a1a62aaecaffc23b9c965ceb0bbf4d698bfc16469ac27d
   languageName: node
   linkType: hard
 
@@ -14552,38 +15553,45 @@ __metadata:
   version: 2.2.0
   resolution: "deep-equal@npm:2.2.0"
   dependencies:
-    call-bind: ^1.0.2
-    es-get-iterator: ^1.1.2
-    get-intrinsic: ^1.1.3
-    is-arguments: ^1.1.1
-    is-array-buffer: ^3.0.1
-    is-date-object: ^1.0.5
-    is-regex: ^1.1.4
-    is-shared-array-buffer: ^1.0.2
-    isarray: ^2.0.5
-    object-is: ^1.1.5
-    object-keys: ^1.1.1
-    object.assign: ^4.1.4
-    regexp.prototype.flags: ^1.4.3
-    side-channel: ^1.0.4
-    which-boxed-primitive: ^1.0.2
-    which-collection: ^1.0.1
-    which-typed-array: ^1.1.9
-  checksum: 46a34509d2766d6c6dc5aec4756089cf0cc137e46787e91f08f1ee0bb570d874f19f0493146907df0cf18aed4a7b4b50f6f62c899240a76c323f057528b122e3
+    call-bind: "npm:^1.0.2"
+    es-get-iterator: "npm:^1.1.2"
+    get-intrinsic: "npm:^1.1.3"
+    is-arguments: "npm:^1.1.1"
+    is-array-buffer: "npm:^3.0.1"
+    is-date-object: "npm:^1.0.5"
+    is-regex: "npm:^1.1.4"
+    is-shared-array-buffer: "npm:^1.0.2"
+    isarray: "npm:^2.0.5"
+    object-is: "npm:^1.1.5"
+    object-keys: "npm:^1.1.1"
+    object.assign: "npm:^4.1.4"
+    regexp.prototype.flags: "npm:^1.4.3"
+    side-channel: "npm:^1.0.4"
+    which-boxed-primitive: "npm:^1.0.2"
+    which-collection: "npm:^1.0.1"
+    which-typed-array: "npm:^1.1.9"
+  checksum: 10/c59f1ca67546e25b57ee66806b966e605be825ec22f5fbf30663e6b5ce4e1b43519c601f8282e10837d9c71d0136ddee5917dbfd0da1b11654dcfea6f0557ee3
   languageName: node
   linkType: hard
 
 "deep-is@npm:^0.1.3":
   version: 0.1.4
   resolution: "deep-is@npm:0.1.4"
-  checksum: edb65dd0d7d1b9c40b2f50219aef30e116cedd6fc79290e740972c132c09106d2e80aa0bc8826673dd5a00222d4179c84b36a790eef63a4c4bca75a37ef90804
+  checksum: 10/ec12d074aef5ae5e81fa470b9317c313142c9e8e2afe3f8efa124db309720db96d1d222b82b84c834e5f87e7a614b44a4684b6683583118b87c833b3be40d4d8
   languageName: node
   linkType: hard
 
-"deepmerge@npm:^4.2.2":
-  version: 4.2.2
-  resolution: "deepmerge@npm:4.2.2"
-  checksum: a8c43a1ed8d6d1ed2b5bf569fa4c8eb9f0924034baf75d5d406e47e157a451075c4db353efea7b6bcc56ec48116a8ce72fccf867b6e078e7c561904b5897530b
+"deepmerge@npm:^2.2.1":
+  version: 2.2.1
+  resolution: "deepmerge@npm:2.2.1"
+  checksum: 10/a3da411cd3d471a8ae86ff7fd5e19abb648377b3f8c42a9e4c822406c2960a391cb829e4cca53819b73715e68f56b06f53c643ca7bba21cab569fecc9a723de1
+  languageName: node
+  linkType: hard
+
+"deepmerge@npm:^4.2.2, deepmerge@npm:^4.3.1":
+  version: 4.3.1
+  resolution: "deepmerge@npm:4.3.1"
+  checksum: 10/058d9e1b0ff1a154468bf3837aea436abcfea1ba1d165ddaaf48ca93765fdd01a30d33c36173da8fbbed951dd0a267602bc782fe288b0fc4b7e1e7091afc4529
   languageName: node
   linkType: hard
 
@@ -14591,9 +15599,26 @@ __metadata:
   version: 3.0.0
   resolution: "default-browser-id@npm:3.0.0"
   dependencies:
-    bplist-parser: ^0.2.0
-    untildify: ^4.0.0
-  checksum: 279c7ad492542e5556336b6c254a4eaf31b2c63a5433265655ae6e47301197b6cfb15c595a6fdc6463b2ff8e1a1a1ed3cba56038a60e1527ba4ab1628c6b9941
+    bplist-parser: "npm:^0.2.0"
+    untildify: "npm:^4.0.0"
+  checksum: 10/279c7ad492542e5556336b6c254a4eaf31b2c63a5433265655ae6e47301197b6cfb15c595a6fdc6463b2ff8e1a1a1ed3cba56038a60e1527ba4ab1628c6b9941
+  languageName: node
+  linkType: hard
+
+"default-browser-id@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "default-browser-id@npm:5.0.0"
+  checksum: 10/185bfaecec2c75fa423544af722a3469b20704c8d1942794a86e4364fe7d9e8e9f63241a5b769d61c8151993bc65833a5b959026fa1ccea343b3db0a33aa6deb
+  languageName: node
+  linkType: hard
+
+"default-browser@npm:^5.2.1":
+  version: 5.2.1
+  resolution: "default-browser@npm:5.2.1"
+  dependencies:
+    bundle-name: "npm:^4.1.0"
+    default-browser-id: "npm:^5.0.0"
+  checksum: 10/afab7eff7b7f5f7a94d9114d1ec67273d3fbc539edf8c0f80019879d53aa71e867303c6f6d7cffeb10a6f3cfb59d4f963dba3f9c96830b4540cc7339a1bf9840
   languageName: node
   linkType: hard
 
@@ -14601,8 +15626,8 @@ __metadata:
   version: 6.0.3
   resolution: "default-gateway@npm:6.0.3"
   dependencies:
-    execa: ^5.0.0
-  checksum: 126f8273ecac8ee9ff91ea778e8784f6cd732d77c3157e8c5bdd6ed03651b5291f71446d05bc02d04073b1e67583604db5394ea3cf992ede0088c70ea15b7378
+    execa: "npm:^5.0.0"
+  checksum: 10/126f8273ecac8ee9ff91ea778e8784f6cd732d77c3157e8c5bdd6ed03651b5291f71446d05bc02d04073b1e67583604db5394ea3cf992ede0088c70ea15b7378
   languageName: node
   linkType: hard
 
@@ -14610,44 +15635,51 @@ __metadata:
   version: 1.0.3
   resolution: "defaults@npm:1.0.3"
   dependencies:
-    clone: ^1.0.2
-  checksum: 96e2112da6553d376afd5265ea7cbdb2a3b45535965d71ab8bb1da10c8126d168fdd5268799625324b368356d21ba2a7b3d4ec50961f11a47b7feb9de3d4413e
+    clone: "npm:^1.0.2"
+  checksum: 10/96e2112da6553d376afd5265ea7cbdb2a3b45535965d71ab8bb1da10c8126d168fdd5268799625324b368356d21ba2a7b3d4ec50961f11a47b7feb9de3d4413e
   languageName: node
   linkType: hard
 
-"define-data-property@npm:^1.0.1":
-  version: 1.1.1
-  resolution: "define-data-property@npm:1.1.1"
+"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.4":
+  version: 1.1.4
+  resolution: "define-data-property@npm:1.1.4"
   dependencies:
-    get-intrinsic: ^1.2.1
-    gopd: ^1.0.1
-    has-property-descriptors: ^1.0.0
-  checksum: a29855ad3f0630ea82e3c5012c812efa6ca3078d5c2aa8df06b5f597c1cde6f7254692df41945851d903e05a1668607b6d34e778f402b9ff9ffb38111f1a3f0d
+    es-define-property: "npm:^1.0.0"
+    es-errors: "npm:^1.3.0"
+    gopd: "npm:^1.0.1"
+  checksum: 10/abdcb2505d80a53524ba871273e5da75e77e52af9e15b3aa65d8aad82b8a3a424dad7aee2cc0b71470ac7acf501e08defac362e8b6a73cdb4309f028061df4ae
   languageName: node
   linkType: hard
 
 "define-lazy-prop@npm:^2.0.0":
   version: 2.0.0
   resolution: "define-lazy-prop@npm:2.0.0"
-  checksum: 0115fdb065e0490918ba271d7339c42453d209d4cb619dfe635870d906731eff3e1ade8028bb461ea27ce8264ec5e22c6980612d332895977e89c1bbc80fcee2
+  checksum: 10/0115fdb065e0490918ba271d7339c42453d209d4cb619dfe635870d906731eff3e1ade8028bb461ea27ce8264ec5e22c6980612d332895977e89c1bbc80fcee2
   languageName: node
   linkType: hard
 
-"define-properties@npm:^1.1.3, define-properties@npm:^1.1.4, define-properties@npm:^1.2.0, define-properties@npm:^1.2.1":
+"define-lazy-prop@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "define-lazy-prop@npm:3.0.0"
+  checksum: 10/f28421cf9ee86eecaf5f3b8fe875f13d7009c2625e97645bfff7a2a49aca678270b86c39f9c32939e5ca7ab96b551377ed4139558c795e076774287ad3af1aa4
+  languageName: node
+  linkType: hard
+
+"define-properties@npm:^1.1.3, define-properties@npm:^1.2.0, define-properties@npm:^1.2.1":
   version: 1.2.1
   resolution: "define-properties@npm:1.2.1"
   dependencies:
-    define-data-property: ^1.0.1
-    has-property-descriptors: ^1.0.0
-    object-keys: ^1.1.1
-  checksum: b4ccd00597dd46cb2d4a379398f5b19fca84a16f3374e2249201992f36b30f6835949a9429669ee6b41b6e837205a163eadd745e472069e70dfc10f03e5fcc12
+    define-data-property: "npm:^1.0.1"
+    has-property-descriptors: "npm:^1.0.0"
+    object-keys: "npm:^1.1.1"
+  checksum: 10/b4ccd00597dd46cb2d4a379398f5b19fca84a16f3374e2249201992f36b30f6835949a9429669ee6b41b6e837205a163eadd745e472069e70dfc10f03e5fcc12
   languageName: node
   linkType: hard
 
 "defu@npm:^6.1.2":
   version: 6.1.2
   resolution: "defu@npm:6.1.2"
-  checksum: 2ec0ff8414d5a1ab2b8c7e9a79bbad6d97d23ea7ebf5dcf80c3c7ffd9715c30f84a3cc47b917379ea756b3db0dc4701ce6400e493a1ae1688dffcd0f884233b2
+  checksum: 10/5704aa6ea0b503004ee25b2ce909af8e6dc7c472d2d41e293f5a879534a0a7827a37e6692e0ca0c6e8d3ef6b00651d50089be681c814832cbed98f0f206ef25b
   languageName: node
   linkType: hard
 
@@ -14655,15 +15687,15 @@ __metadata:
   version: 6.1.1
   resolution: "del@npm:6.1.1"
   dependencies:
-    globby: ^11.0.1
-    graceful-fs: ^4.2.4
-    is-glob: ^4.0.1
-    is-path-cwd: ^2.2.0
-    is-path-inside: ^3.0.2
-    p-map: ^4.0.0
-    rimraf: ^3.0.2
-    slash: ^3.0.0
-  checksum: 563288b73b8b19a7261c47fd21a330eeab6e2acd7c6208c49790dfd369127120dd7836cdf0c1eca216b77c94782a81507eac6b4734252d3bef2795cb366996b6
+    globby: "npm:^11.0.1"
+    graceful-fs: "npm:^4.2.4"
+    is-glob: "npm:^4.0.1"
+    is-path-cwd: "npm:^2.2.0"
+    is-path-inside: "npm:^3.0.2"
+    p-map: "npm:^4.0.0"
+    rimraf: "npm:^3.0.2"
+    slash: "npm:^3.0.0"
+  checksum: 10/563288b73b8b19a7261c47fd21a330eeab6e2acd7c6208c49790dfd369127120dd7836cdf0c1eca216b77c94782a81507eac6b4734252d3bef2795cb366996b6
   languageName: node
   linkType: hard
 
@@ -14671,85 +15703,92 @@ __metadata:
   version: 5.0.0
   resolution: "delaunator@npm:5.0.0"
   dependencies:
-    robust-predicates: ^3.0.0
-  checksum: d6764188442b7f7c6bcacebd96edc00e35f542a96f1af3ef600e586bfb9849a3682c489c0ab423440c90bc4c7cac77f28761babff76fa29e193e1cf50a95b860
+    robust-predicates: "npm:^3.0.0"
+  checksum: 10/87f9aa5e2378036377ad924418181261ffb58607f303480b4615a5ef6fe2ecefc79f90db217353f2b79e06ee959bba65940429d4484aa36350bd6bde0fbf5010
   languageName: node
   linkType: hard
 
 "delayed-stream@npm:~1.0.0":
   version: 1.0.0
   resolution: "delayed-stream@npm:1.0.0"
-  checksum: 46fe6e83e2cb1d85ba50bd52803c68be9bd953282fa7096f51fc29edd5d67ff84ff753c51966061e5ba7cb5e47ef6d36a91924eddb7f3f3483b1c560f77a0020
+  checksum: 10/46fe6e83e2cb1d85ba50bd52803c68be9bd953282fa7096f51fc29edd5d67ff84ff753c51966061e5ba7cb5e47ef6d36a91924eddb7f3f3483b1c560f77a0020
   languageName: node
   linkType: hard
 
 "delegates@npm:^1.0.0":
   version: 1.0.0
   resolution: "delegates@npm:1.0.0"
-  checksum: a51744d9b53c164ba9c0492471a1a2ffa0b6727451bdc89e31627fdf4adda9d51277cfcbfb20f0a6f08ccb3c436f341df3e92631a3440226d93a8971724771fd
+  checksum: 10/a51744d9b53c164ba9c0492471a1a2ffa0b6727451bdc89e31627fdf4adda9d51277cfcbfb20f0a6f08ccb3c436f341df3e92631a3440226d93a8971724771fd
   languageName: node
   linkType: hard
 
 "depd@npm:^1.1.2, depd@npm:~1.1.2":
   version: 1.1.2
   resolution: "depd@npm:1.1.2"
-  checksum: 6b406620d269619852885ce15965272b829df6f409724415e0002c8632ab6a8c0a08ec1f0bd2add05dc7bd7507606f7e2cc034fa24224ab829580040b835ecd9
+  checksum: 10/2ed6966fc14463a9e85451db330ab8ba041efed0b9a1a472dbfc6fbf2f82bab66491915f996b25d8517dddc36c8c74e24c30879b34877f3c4410733444a51d1d
   languageName: node
   linkType: hard
 
-"deprecation@npm:^2.0.0, deprecation@npm:^2.3.1":
+"deprecation@npm:^2.0.0":
   version: 2.3.1
   resolution: "deprecation@npm:2.3.1"
-  checksum: f56a05e182c2c195071385455956b0c4106fe14e36245b00c689ceef8e8ab639235176a96977ba7c74afb173317fac2e0ec6ec7a1c6d1e6eaa401c586c714132
+  checksum: 10/f56a05e182c2c195071385455956b0c4106fe14e36245b00c689ceef8e8ab639235176a96977ba7c74afb173317fac2e0ec6ec7a1c6d1e6eaa401c586c714132
   languageName: node
   linkType: hard
 
 "dequal@npm:^2.0.2, dequal@npm:^2.0.3":
   version: 2.0.3
   resolution: "dequal@npm:2.0.3"
-  checksum: 8679b850e1a3d0ebbc46ee780d5df7b478c23f335887464023a631d1b9af051ad4a6595a44220f9ff8ff95a8ddccf019b5ad778a976fd7bbf77383d36f412f90
+  checksum: 10/6ff05a7561f33603df87c45e389c9ac0a95e3c056be3da1a0c4702149e3a7f6fe5ffbb294478687ba51a9e95f3a60e8b6b9005993acd79c292c7d15f71964b6b
   languageName: node
   linkType: hard
 
 "destroy@npm:~1.0.4":
   version: 1.0.4
   resolution: "destroy@npm:1.0.4"
-  checksum: da9ab4961dc61677c709da0c25ef01733042614453924d65636a7db37308fef8a24cd1e07172e61173d471ca175371295fbc984b0af5b2b4ff47cd57bd784c03
+  checksum: 10/da9ab4961dc61677c709da0c25ef01733042614453924d65636a7db37308fef8a24cd1e07172e61173d471ca175371295fbc984b0af5b2b4ff47cd57bd784c03
   languageName: node
   linkType: hard
 
 "detect-indent@npm:^5.0.0":
   version: 5.0.0
   resolution: "detect-indent@npm:5.0.0"
-  checksum: 61763211daa498e00eec073aba95d544ae5baed19286a0a655697fa4fffc9f4539c8376e2c7df8fa11d6f8eaa16c1e6a689f403ac41ee78a060278cdadefe2ff
+  checksum: 10/61763211daa498e00eec073aba95d544ae5baed19286a0a655697fa4fffc9f4539c8376e2c7df8fa11d6f8eaa16c1e6a689f403ac41ee78a060278cdadefe2ff
   languageName: node
   linkType: hard
 
-"detect-indent@npm:^6.0.0, detect-indent@npm:^6.1.0":
+"detect-indent@npm:^6.1.0":
   version: 6.1.0
   resolution: "detect-indent@npm:6.1.0"
-  checksum: ab953a73c72dbd4e8fc68e4ed4bfd92c97eb6c43734af3900add963fd3a9316f3bc0578b018b24198d4c31a358571eff5f0656e81a1f3b9ad5c547d58b2d093d
+  checksum: 10/ab953a73c72dbd4e8fc68e4ed4bfd92c97eb6c43734af3900add963fd3a9316f3bc0578b018b24198d4c31a358571eff5f0656e81a1f3b9ad5c547d58b2d093d
+  languageName: node
+  linkType: hard
+
+"detect-libc@npm:^2.0.0":
+  version: 2.0.2
+  resolution: "detect-libc@npm:2.0.2"
+  checksum: 10/6118f30c0c425b1e56b9d2609f29bec50d35a6af0b762b6ad127271478f3bbfda7319ce869230cf1a351f2b219f39332cde290858553336d652c77b970f15de8
   languageName: node
   linkType: hard
 
 "detect-newline@npm:^3.0.0":
   version: 3.1.0
   resolution: "detect-newline@npm:3.1.0"
-  checksum: ae6cd429c41ad01b164c59ea36f264a2c479598e61cba7c99da24175a7ab80ddf066420f2bec9a1c57a6bead411b4655ff15ad7d281c000a89791f48cbe939e7
+  checksum: 10/ae6cd429c41ad01b164c59ea36f264a2c479598e61cba7c99da24175a7ab80ddf066420f2bec9a1c57a6bead411b4655ff15ad7d281c000a89791f48cbe939e7
   languageName: node
   linkType: hard
 
 "detect-node-es@npm:^1.1.0":
   version: 1.1.0
   resolution: "detect-node-es@npm:1.1.0"
-  checksum: e46307d7264644975b71c104b9f028ed1d3d34b83a15b8a22373640ce5ea630e5640b1078b8ea15f202b54641da71e4aa7597093bd4b91f113db520a26a37449
+  checksum: 10/e46307d7264644975b71c104b9f028ed1d3d34b83a15b8a22373640ce5ea630e5640b1078b8ea15f202b54641da71e4aa7597093bd4b91f113db520a26a37449
   languageName: node
   linkType: hard
 
 "detect-node@npm:^2.0.4":
   version: 2.1.0
   resolution: "detect-node@npm:2.1.0"
-  checksum: 832184ec458353e41533ac9c622f16c19f7c02d8b10c303dfd3a756f56be93e903616c0bb2d4226183c9351c15fc0b3dba41a17a2308262afabcfa3776e6ae6e
+  checksum: 10/832184ec458353e41533ac9c622f16c19f7c02d8b10c303dfd3a756f56be93e903616c0bb2d4226183c9351c15fc0b3dba41a17a2308262afabcfa3776e6ae6e
   languageName: node
   linkType: hard
 
@@ -14757,8 +15796,8 @@ __metadata:
   version: 2.0.1
   resolution: "detect-package-manager@npm:2.0.1"
   dependencies:
-    execa: ^5.1.1
-  checksum: e72b910182d5ad479198d4235be206ac64a479257b32201bb06f3c842cc34c65ea851d46f72cc1d4bf535bcc6c4b44b5b86bb29fe1192b8c9c07b46883672f28
+    execa: "npm:^5.1.1"
+  checksum: 10/e72b910182d5ad479198d4235be206ac64a479257b32201bb06f3c842cc34c65ea851d46f72cc1d4bf535bcc6c4b44b5b86bb29fe1192b8c9c07b46883672f28
   languageName: node
   linkType: hard
 
@@ -14766,78 +15805,61 @@ __metadata:
   version: 1.5.1
   resolution: "detect-port@npm:1.5.1"
   dependencies:
-    address: ^1.0.1
-    debug: 4
+    address: "npm:^1.0.1"
+    debug: "npm:4"
   bin:
     detect: bin/detect-port.js
     detect-port: bin/detect-port.js
-  checksum: b48da9340481742547263d5d985e65d078592557863402ecf538511735e83575867e94f91fe74405ea19b61351feb99efccae7e55de9a151d5654e3417cea05b
+  checksum: 10/b48da9340481742547263d5d985e65d078592557863402ecf538511735e83575867e94f91fe74405ea19b61351feb99efccae7e55de9a151d5654e3417cea05b
   languageName: node
   linkType: hard
 
 "devtools-protocol@npm:0.0.1170333":
   version: 0.0.1170333
   resolution: "devtools-protocol@npm:0.0.1170333"
-  checksum: 98e5da007c85ac5050b79cc1698d1630a6f7970214255a8f93ab401d61f1396d441d56a5c88e0ef59fa22c3f7275e2bfd5e130c39d040355d825f1e93c4b885d
+  checksum: 10/ef33b830d27ab7e4c98931559f095987f7cb07295a12b0a7be2ac06d40388f276c0e2de51e86b9e83ba365ad0ea6d683919432d3dea7b3947f8592b369d4b489
   languageName: node
   linkType: hard
 
 "devtools-protocol@npm:0.0.927104":
   version: 0.0.927104
   resolution: "devtools-protocol@npm:0.0.927104"
-  checksum: 13617e735f326b9822e64480060e59068434e937a6141ffe18353d0c7626be890e94d3118e7c262e6fd17eea3a4a2a18c221d0ff1eb31768ebcf0a0b95475d32
-  languageName: node
-  linkType: hard
-
-"dezalgo@npm:^1.0.0":
-  version: 1.0.4
-  resolution: "dezalgo@npm:1.0.4"
-  dependencies:
-    asap: ^2.0.0
-    wrappy: 1
-  checksum: 895389c6aead740d2ab5da4d3466d20fa30f738010a4d3f4dcccc9fc645ca31c9d10b7e1804ae489b1eb02c7986f9f1f34ba132d409b043082a86d9a4e745624
-  languageName: node
-  linkType: hard
-
-"diff-sequences@npm:^26.6.2":
-  version: 26.6.2
-  resolution: "diff-sequences@npm:26.6.2"
-  checksum: 79af871776ef149a7ff3345d6b1bf37fe6e81f68632aa5542787851f6f60fba19b0be22fdd1e06046f56ae7382763ccfe94a982c39ee72bd107aef435ecbc0cf
+  checksum: 10/2f645d5d8f8df8d520c7162264ad37caed40de6c57456febb42e22cc54d527a349d05ab16f4d9f9bbd715ce425b00232b6baa66ad339bb3caa077528684ce8ca
   languageName: node
   linkType: hard
 
 "diff-sequences@npm:^27.5.1":
   version: 27.5.1
   resolution: "diff-sequences@npm:27.5.1"
-  checksum: a00db5554c9da7da225db2d2638d85f8e41124eccbd56cbaefb3b276dcbb1c1c2ad851c32defe2055a54a4806f030656cbf6638105fd6ce97bb87b90b32a33ca
+  checksum: 10/34d852a13eb82735c39944a050613f952038614ce324256e1c3544948fa090f1ca7f329a4f1f57c31fe7ac982c17068d8915b633e300f040b97708c81ceb26cd
   languageName: node
   linkType: hard
 
 "diff-sequences@npm:^29.6.3":
   version: 29.6.3
   resolution: "diff-sequences@npm:29.6.3"
-  checksum: f4914158e1f2276343d98ff5b31fc004e7304f5470bf0f1adb2ac6955d85a531a6458d33e87667f98f6ae52ebd3891bb47d420bb48a5bd8b7a27ee25b20e33aa
+  checksum: 10/179daf9d2f9af5c57ad66d97cb902a538bcf8ed64963fa7aa0c329b3de3665ce2eb6ffdc2f69f29d445fa4af2517e5e55e5b6e00c00a9ae4f43645f97f7078cb
   languageName: node
   linkType: hard
 
 "diff@npm:5.0.0":
   version: 5.0.0
   resolution: "diff@npm:5.0.0"
-  checksum: f19fe29284b633afdb2725c2a8bb7d25761ea54d321d8e67987ac851c5294be4afeab532bd84531e02583a3fe7f4014aa314a3eda84f5590e7a9e6b371ef3b46
+  checksum: 10/4a179a75b17cbb420eb9145be913f9ddb34b47cb2ba4301e80ae745122826a468f02ca8f5e56945958de26ace594899c8381acb6659c88e7803ef078b53d690c
   languageName: node
   linkType: hard
 
 "diff@npm:^4.0.1":
   version: 4.0.2
   resolution: "diff@npm:4.0.2"
-  checksum: f2c09b0ce4e6b301c221addd83bf3f454c0bc00caa3dd837cf6c127d6edf7223aa2bbe3b688feea110b7f262adbfc845b757c44c8a9f8c0c5b15d8fa9ce9d20d
+  checksum: 10/ec09ec2101934ca5966355a229d77afcad5911c92e2a77413efda5455636c4cf2ce84057e2d7715227a2eeeda04255b849bd3ae3a4dd22eb22e86e76456df069
   languageName: node
   linkType: hard
 
 "diff@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "diff@npm:5.1.0"
-  checksum: c7bf0df7c9bfbe1cf8a678fd1b2137c4fb11be117a67bc18a0e03ae75105e8533dbfb1cda6b46beb3586ef5aed22143ef9d70713977d5fb1f9114e21455fba90
+  version: 5.2.0
+  resolution: "diff@npm:5.2.0"
+  checksum: 10/01b7b440f83a997350a988e9d2f558366c0f90f15be19f4aa7f1bb3109a4e153dfc3b9fbf78e14ea725717017407eeaa2271e3896374a0181e8f52445740846d
   languageName: node
   linkType: hard
 
@@ -14845,8 +15867,8 @@ __metadata:
   version: 3.0.1
   resolution: "dir-glob@npm:3.0.1"
   dependencies:
-    path-type: ^4.0.0
-  checksum: fa05e18324510d7283f55862f3161c6759a3f2f8dbce491a2fc14c8324c498286c54282c1f0e933cb930da8419b30679389499b919122952a4f8592362ef4615
+    path-type: "npm:^4.0.0"
+  checksum: 10/fa05e18324510d7283f55862f3161c6759a3f2f8dbce491a2fc14c8324c498286c54282c1f0e933cb930da8419b30679389499b919122952a4f8592362ef4615
   languageName: node
   linkType: hard
 
@@ -14855,21 +15877,14 @@ __metadata:
   resolution: "direction@npm:0.1.5"
   bin:
     direction: cli.js
-  checksum: bf7d6ceca38f1cd4ffd33777207d0d64fe6075a2dee9c2b6c99b18ec9550fe20526a65baf1e0c1c9e683af6f4be27f84d55f753fc0c50df56dbd5551814b70c8
+  checksum: 10/bf7d6ceca38f1cd4ffd33777207d0d64fe6075a2dee9c2b6c99b18ec9550fe20526a65baf1e0c1c9e683af6f4be27f84d55f753fc0c50df56dbd5551814b70c8
   languageName: node
   linkType: hard
 
 "djb2a@npm:^1.2.0":
   version: 1.2.0
   resolution: "djb2a@npm:1.2.0"
-  checksum: 75fe594fad164634b08dc3878551aadf29fc206ba2767244ab9be323de8ffbd9c01b4dcfc1168ffb7dea0bd98a6f211966943a67aa815639fcaffbab7960ade0
-  languageName: node
-  linkType: hard
-
-"dns-equal@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "dns-equal@npm:1.0.0"
-  checksum: a8471ac849c7c13824f053babea1bc26e2f359394dd5a460f8340d8abd13434be01e3327a5c59d212f8c8997817450efd3f3ac77bec709b21979cf0235644524
+  checksum: 10/75fe594fad164634b08dc3878551aadf29fc206ba2767244ab9be323de8ffbd9c01b4dcfc1168ffb7dea0bd98a6f211966943a67aa815639fcaffbab7960ade0
   languageName: node
   linkType: hard
 
@@ -14877,8 +15892,8 @@ __metadata:
   version: 5.4.0
   resolution: "dns-packet@npm:5.4.0"
   dependencies:
-    "@leichtgewicht/ip-codec": ^2.0.1
-  checksum: a169963848e8539dfd8a19058562f9e1c15c0f82cbf76fa98942f11c46f3c74e7e7c82e3a8a5182d4c9e6ff19e21be738dbd098a876dde755d3aedd2cc730880
+    "@leichtgewicht/ip-codec": "npm:^2.0.1"
+  checksum: 10/6a3827d59a7c3b9a8f211d6ba1299bb19e8abed838690d88ed5b47d739c3ac8615a6aa2cbef3a3e87bf21f69a10e78e275bc63b9b411b4263afe4b1ada325574
   languageName: node
   linkType: hard
 
@@ -14886,8 +15901,8 @@ __metadata:
   version: 2.1.0
   resolution: "doctrine@npm:2.1.0"
   dependencies:
-    esutils: ^2.0.2
-  checksum: a45e277f7feaed309fe658ace1ff286c6e2002ac515af0aaf37145b8baa96e49899638c7cd47dccf84c3d32abfc113246625b3ac8f552d1046072adee13b0dc8
+    esutils: "npm:^2.0.2"
+  checksum: 10/555684f77e791b17173ea86e2eea45ef26c22219cb64670669c4f4bebd26dbc95cd90ec1f4159e9349a6bb9eb892ce4dde8cd0139e77bedd8bf4518238618474
   languageName: node
   linkType: hard
 
@@ -14895,22 +15910,29 @@ __metadata:
   version: 3.0.0
   resolution: "doctrine@npm:3.0.0"
   dependencies:
-    esutils: ^2.0.2
-  checksum: fd7673ca77fe26cd5cba38d816bc72d641f500f1f9b25b83e8ce28827fe2da7ad583a8da26ab6af85f834138cf8dae9f69b0cd6ab925f52ddab1754db44d99ce
+    esutils: "npm:^2.0.2"
+  checksum: 10/b4b28f1df5c563f7d876e7461254a4597b8cabe915abe94d7c5d1633fed263fcf9a85e8d3836591fc2d040108e822b0d32758e5ec1fe31c590dc7e08086e3e48
   languageName: node
   linkType: hard
 
-"dom-accessibility-api@npm:^0.5.6, dom-accessibility-api@npm:^0.5.9":
+"dom-accessibility-api@npm:^0.5.9":
   version: 0.5.10
   resolution: "dom-accessibility-api@npm:0.5.10"
-  checksum: c05949889b02f5313d100778e9f736f9bddfb1da47387d351833f0b5d60d6230d4fcb849e124a8a1591706b6200337fa40f0f4f3817dce1459309e075f48371c
+  checksum: 10/3ce183680c598392f89ec13fd04f495f95890c09d3da45909123ff549a10621ca21eee0258f929e4ed16a2cc73255d649174402b5fb7cd790983aa33b5a6fa3f
+  languageName: node
+  linkType: hard
+
+"dom-accessibility-api@npm:^0.6.3":
+  version: 0.6.3
+  resolution: "dom-accessibility-api@npm:0.6.3"
+  checksum: 10/83d3371f8226487fbad36e160d44f1d9017fb26d46faba6a06fcad15f34633fc827b8c3e99d49f71d5f3253d866e2131826866fd0a3c86626f8eccfc361881ff
   languageName: node
   linkType: hard
 
 "dom-align@npm:^1.7.0":
   version: 1.12.2
   resolution: "dom-align@npm:1.12.2"
-  checksum: 0523f4d7c84c7a4e92b0f1d088e7e110f6bd109fc8b6f1f89e14d33bba63d7b54de26d311652e1527ead2c0700f671593af55f216cb8a67a80d9fc5ed7a23b95
+  checksum: 10/4659909b9ab48de2976f0668220289e3835490537b1ce834b7f2dd3189b21e0996011ec8826a2789c9597729bbb457f6e54f07787a00774e3ce04b15fcbfa636
   languageName: node
   linkType: hard
 
@@ -14918,8 +15940,8 @@ __metadata:
   version: 0.2.0
   resolution: "dom-converter@npm:0.2.0"
   dependencies:
-    utila: ~0.4
-  checksum: ea52fe303f5392e48dea563abef0e6fb3a478b8dbe3c599e99bb5d53981c6c38fc4944e56bb92a8ead6bb989d10b7914722ae11febbd2fd0910e33b9fc4aaa77
+    utila: "npm:~0.4"
+  checksum: 10/71b22f56bce6255a963694a72860a99f08763cf500f02ff38ce4c7489f95b07e7a0069f10b04c7d200e21375474abe01232833ca1600f104bdee7173e493a5b9
   languageName: node
   linkType: hard
 
@@ -14927,10 +15949,10 @@ __metadata:
   version: 2.1.0
   resolution: "dom-css@npm:2.1.0"
   dependencies:
-    add-px-to-style: 1.0.0
-    prefix-style: 2.0.1
-    to-camel-case: 1.0.0
-  checksum: f61cc63e88771e1800ff4b7d98b17be2b311de984d94c3d3e0be692794502eb021d28c5c40ba08d4370a6d8bd96caf7a56d15c635451c2db1a2233c94ca0fcc0
+    add-px-to-style: "npm:1.0.0"
+    prefix-style: "npm:2.0.1"
+    to-camel-case: "npm:1.0.0"
+  checksum: 10/6180c872f17a4c026a690e399dd55e41a90f4e98c5af33ca0f16934309b67e762c929d07e38accc4e05ac4d22e8527af0252bf478a2d780b9e593a415b18905a
   languageName: node
   linkType: hard
 
@@ -14938,9 +15960,9 @@ __metadata:
   version: 5.2.1
   resolution: "dom-helpers@npm:5.2.1"
   dependencies:
-    "@babel/runtime": ^7.8.7
-    csstype: ^3.0.2
-  checksum: 863ba9e086f7093df3376b43e74ce4422571d404fc9828bf2c56140963d5edf0e56160f9b2f3bb61b282c07f8fc8134f023c98fd684bddcb12daf7b0f14d951c
+    "@babel/runtime": "npm:^7.8.7"
+    csstype: "npm:^3.0.2"
+  checksum: 10/bed2341adf8864bf932b3289c24f35fdd99930af77df46688abf2d753ff291df49a15850c874d686d9be6ec4e1c6835673906e64dbd8b2839d227f117a11fd41
   languageName: node
   linkType: hard
 
@@ -14948,10 +15970,10 @@ __metadata:
   version: 1.3.2
   resolution: "dom-serializer@npm:1.3.2"
   dependencies:
-    domelementtype: ^2.0.1
-    domhandler: ^4.2.0
-    entities: ^2.0.0
-  checksum: bff48714944d67b160db71ba244fb0f3fe72e77ef2ec8414e2eeb56f2d926e404a13456b8b83a5392e217ba47dec2ec0c368801b31481813e94d185276c3e964
+    domelementtype: "npm:^2.0.1"
+    domhandler: "npm:^4.2.0"
+    entities: "npm:^2.0.0"
+  checksum: 10/102ea83664e4943977a83a76b37a626b81491498d93b64f80cc45abc0e86cc0feec6fbaa98dba0750fd1005712a4449bc3de491a2032ba7befdfd18e42bcb349
   languageName: node
   linkType: hard
 
@@ -14959,17 +15981,17 @@ __metadata:
   version: 2.0.0
   resolution: "dom-serializer@npm:2.0.0"
   dependencies:
-    domelementtype: ^2.3.0
-    domhandler: ^5.0.2
-    entities: ^4.2.0
-  checksum: cd1810544fd8cdfbd51fa2c0c1128ec3a13ba92f14e61b7650b5de421b88205fd2e3f0cc6ace82f13334114addb90ed1c2f23074a51770a8e9c1273acbc7f3e6
+    domelementtype: "npm:^2.3.0"
+    domhandler: "npm:^5.0.2"
+    entities: "npm:^4.2.0"
+  checksum: 10/e3bf9027a64450bca0a72297ecdc1e3abb7a2912268a9f3f5d33a2e29c1e2c3502c6e9f860fc6625940bfe0cfb57a44953262b9e94df76872fdfb8151097eeb3
   languageName: node
   linkType: hard
 
 "domelementtype@npm:^2.0.1, domelementtype@npm:^2.2.0, domelementtype@npm:^2.3.0":
   version: 2.3.0
   resolution: "domelementtype@npm:2.3.0"
-  checksum: ee837a318ff702622f383409d1f5b25dd1024b692ef64d3096ff702e26339f8e345820f29a68bcdcea8cfee3531776b3382651232fbeae95612d6f0a75efb4f6
+  checksum: 10/ee837a318ff702622f383409d1f5b25dd1024b692ef64d3096ff702e26339f8e345820f29a68bcdcea8cfee3531776b3382651232fbeae95612d6f0a75efb4f6
   languageName: node
   linkType: hard
 
@@ -14977,8 +15999,8 @@ __metadata:
   version: 4.0.0
   resolution: "domexception@npm:4.0.0"
   dependencies:
-    webidl-conversions: ^7.0.0
-  checksum: ddbc1268edf33a8ba02ccc596735ede80375ee0cf124b30d2f05df5b464ba78ef4f49889b6391df4a04954e63d42d5631c7fcf8b1c4f12bc531252977a5f13d5
+    webidl-conversions: "npm:^7.0.0"
+  checksum: 10/4ed443227d2871d76c58d852b2e93c68e0443815b2741348f20881bedee8c1ad4f9bfc5d30c7dec433cd026b57da63407c010260b1682fef4c8847e7181ea43f
   languageName: node
   linkType: hard
 
@@ -14986,8 +16008,8 @@ __metadata:
   version: 4.2.2
   resolution: "domhandler@npm:4.2.2"
   dependencies:
-    domelementtype: ^2.2.0
-  checksum: ad782fef984eca5a6fdd4ce70b90c38aff335ae4d6a51223ac82bd371b6674614efdcfff2dbb1126a7395634357906781f179e4ec028c7c578bb7f2beef8a4a5
+    domelementtype: "npm:^2.2.0"
+  checksum: 10/502cb297ba7b5a369c944dd2ecde1acd63992929d3f24b2dbd66a65cd6cfc21c5d2f237b0c68d4ec03d4224b1d70b511f04f4423f9aab42777488ee88c98e7e6
   languageName: node
   linkType: hard
 
@@ -14995,15 +16017,22 @@ __metadata:
   version: 5.0.3
   resolution: "domhandler@npm:5.0.3"
   dependencies:
-    domelementtype: ^2.3.0
-  checksum: 0f58f4a6af63e6f3a4320aa446d28b5790a009018707bce2859dcb1d21144c7876482b5188395a188dfa974238c019e0a1e610d2fc269a12b2c192ea2b0b131c
+    domelementtype: "npm:^2.3.0"
+  checksum: 10/809b805a50a9c6884a29f38aec0a4e1b4537f40e1c861950ed47d10b049febe6b79ab72adaeeebb3cc8fc1cd33f34e97048a72a9265103426d93efafa78d3e96
   languageName: node
   linkType: hard
 
-"dompurify@npm:^2.2.0, dompurify@npm:^2.4.3":
+"dompurify@npm:^2.2.0":
   version: 2.4.5
   resolution: "dompurify@npm:2.4.5"
-  checksum: d6d3c3b320f15cdb5b26aa1902c3275a3ab2c3705a9df4420bb94691d7c4df67959ec7b91e486c308320791b0ee000456f042734c45d76721e61c2768eac706e
+  checksum: 10/d764c2ff126b3749dad35bc34eed40f51141d7dfd620e938c92f08d68c32beeb259d06abadeee91f6e2a8c8737ce670e2124ac9a257ba3bcdc666598cebcde01
+  languageName: node
+  linkType: hard
+
+"dompurify@npm:^3.0.0":
+  version: 3.0.11
+  resolution: "dompurify@npm:3.0.11"
+  checksum: 10/fc7027ef5cc09ad906625e8aa39b3ca50570fd05aec9fd5995349f0be866385122265c7a823c416694c7bb4c3415e9172cce03b92a153a16c7d1d27165b2a0fd
   languageName: node
   linkType: hard
 
@@ -15011,10 +16040,10 @@ __metadata:
   version: 2.8.0
   resolution: "domutils@npm:2.8.0"
   dependencies:
-    dom-serializer: ^1.0.1
-    domelementtype: ^2.2.0
-    domhandler: ^4.2.0
-  checksum: abf7434315283e9aadc2a24bac0e00eab07ae4313b40cc239f89d84d7315ebdfd2fb1b5bf750a96bc1b4403d7237c7b2ebf60459be394d625ead4ca89b934391
+    dom-serializer: "npm:^1.0.1"
+    domelementtype: "npm:^2.2.0"
+    domhandler: "npm:^4.2.0"
+  checksum: 10/1f316a03f00b09a8893d4a25d297d5cbffd02c564509dede28ef72d5ce38d93f6d61f1de88d439f31b14a1d9b42f587ed711b9e8b1b4d3bf6001399832bfc4e0
   languageName: node
   linkType: hard
 
@@ -15022,10 +16051,10 @@ __metadata:
   version: 3.0.1
   resolution: "domutils@npm:3.0.1"
   dependencies:
-    dom-serializer: ^2.0.0
-    domelementtype: ^2.3.0
-    domhandler: ^5.0.1
-  checksum: 23aa7a840572d395220e173cb6263b0d028596e3950100520870a125af33ff819e6f609e1606d6f7d73bd9e7feb03bb404286e57a39063b5384c62b724d987b3
+    dom-serializer: "npm:^2.0.0"
+    domelementtype: "npm:^2.3.0"
+    domhandler: "npm:^5.0.1"
+  checksum: 10/c0031e4bf89bf701c552c6aa7937262351ae863d5bb0395ebae9cdb23eb3de0077343ca0ddfa63861d98c31c02bbabe4c6e0e11be87b04a090a4d5dbb75197dc
   languageName: node
   linkType: hard
 
@@ -15033,9 +16062,9 @@ __metadata:
   version: 3.0.4
   resolution: "dot-case@npm:3.0.4"
   dependencies:
-    no-case: ^3.0.4
-    tslib: ^2.0.3
-  checksum: a65e3519414856df0228b9f645332f974f2bf5433370f544a681122eab59e66038fc3349b4be1cdc47152779dac71a5864f1ccda2f745e767c46e9c6543b1169
+    no-case: "npm:^3.0.4"
+    tslib: "npm:^2.0.3"
+  checksum: 10/a65e3519414856df0228b9f645332f974f2bf5433370f544a681122eab59e66038fc3349b4be1cdc47152779dac71a5864f1ccda2f745e767c46e9c6543b1169
   languageName: node
   linkType: hard
 
@@ -15043,45 +16072,36 @@ __metadata:
   version: 5.3.0
   resolution: "dot-prop@npm:5.3.0"
   dependencies:
-    is-obj: ^2.0.0
-  checksum: d5775790093c234ef4bfd5fbe40884ff7e6c87573e5339432870616331189f7f5d86575c5b5af2dcf0f61172990f4f734d07844b1f23482fff09e3c4bead05ea
-  languageName: node
-  linkType: hard
-
-"dot-prop@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "dot-prop@npm:6.0.1"
-  dependencies:
-    is-obj: ^2.0.0
-  checksum: 0f47600a4b93e1dc37261da4e6909652c008832a5d3684b5bf9a9a0d3f4c67ea949a86dceed9b72f5733ed8e8e6383cc5958df3bbd0799ee317fd181f2ece700
+    is-obj: "npm:^2.0.0"
+  checksum: 10/33b2561617bd5c73cf9305368ba4638871c5dbf9c8100c8335acd2e2d590a81ec0e75c11cfaea5cc3cf8c2f668cad4beddb52c11856d0c9e666348eee1baf57a
   languageName: node
   linkType: hard
 
-"dotenv-expand@npm:^10.0.0":
+"dotenv-expand@npm:^10.0.0, dotenv-expand@npm:~10.0.0":
   version: 10.0.0
   resolution: "dotenv-expand@npm:10.0.0"
-  checksum: 2a38b470efe0abcb1ac8490421a55e1d764dc9440fd220942bce40965074f3fb00b585f4346020cb0f0f219966ee6b4ee5023458b3e2953fe5b3214de1b314ee
+  checksum: 10/b41eb278bc96b92cbf3037ca5f3d21e8845bf165dc06b6f9a0a03d278c2bd5a01c0cfbb3528ae3a60301ba1a8a9cace30e748c54b460753bc00d4c014b675597
   languageName: node
   linkType: hard
 
-"dotenv@npm:^16.0.0":
-  version: 16.0.3
-  resolution: "dotenv@npm:16.0.3"
-  checksum: afcf03f373d7a6d62c7e9afea6328e62851d627a4e73f2e12d0a8deae1cd375892004f3021883f8aec85932cd2834b091f568ced92b4774625b321db83b827f8
+"dotenv@npm:^16.0.0, dotenv@npm:~16.3.1":
+  version: 16.3.1
+  resolution: "dotenv@npm:16.3.1"
+  checksum: 10/dbb778237ef8750e9e3cd1473d3c8eaa9cc3600e33a75c0e36415d0fa0848197f56c3800f77924c70e7828f0b03896818cd52f785b07b9ad4d88dba73fbba83f
   languageName: node
   linkType: hard
 
-"dotenv@npm:~10.0.0":
-  version: 10.0.0
-  resolution: "dotenv@npm:10.0.0"
-  checksum: f412c5fe8c24fbe313d302d2500e247ba8a1946492db405a4de4d30dd0eb186a88a43f13c958c5a7de303938949c4231c56994f97d05c4bc1f22478d631b4005
+"dotparser@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "dotparser@npm:1.1.1"
+  checksum: 10/a66a02f5add34b53356ee18b418589ccf055ef6ffec073e91230f5f34cb5ac9579ce20e843b9a3213f42a26bd89fce9232b9364cc08844dade575095dc40d88a
   languageName: node
   linkType: hard
 
 "duplexer@npm:^0.1.1, duplexer@npm:^0.1.2":
   version: 0.1.2
   resolution: "duplexer@npm:0.1.2"
-  checksum: 62ba61a830c56801db28ff6305c7d289b6dc9f859054e8c982abd8ee0b0a14d2e9a8e7d086ffee12e868d43e2bbe8a964be55ddbd8c8957714c87373c7a4f9b0
+  checksum: 10/62ba61a830c56801db28ff6305c7d289b6dc9f859054e8c982abd8ee0b0a14d2e9a8e7d086ffee12e868d43e2bbe8a964be55ddbd8c8957714c87373c7a4f9b0
   languageName: node
   linkType: hard
 
@@ -15089,25 +16109,25 @@ __metadata:
   version: 3.7.1
   resolution: "duplexify@npm:3.7.1"
   dependencies:
-    end-of-stream: ^1.0.0
-    inherits: ^2.0.1
-    readable-stream: ^2.0.0
-    stream-shift: ^1.0.0
-  checksum: 3c2ed2223d956a5da713dae12ba8295acb61d9acd966ccbba938090d04f4574ca4dca75cca089b5077c2d7e66101f32e6ea9b36a78ca213eff574e7a8b8accf2
+    end-of-stream: "npm:^1.0.0"
+    inherits: "npm:^2.0.1"
+    readable-stream: "npm:^2.0.0"
+    stream-shift: "npm:^1.0.0"
+  checksum: 10/7799984d178fb57e11c43f5f172a10f795322ec85ff664c2a98d2c2de6deeb9d7a30b810f83923dcd7ebe0f1786724b8aee2b62ca4577522141f93d6d48fb31c
   languageName: node
   linkType: hard
 
 "earcut@npm:^2.2.3":
   version: 2.2.4
   resolution: "earcut@npm:2.2.4"
-  checksum: aea0466cb2f24e0c3c57148d8d28ac9846f53c4f43ee66780826474303ac851b305ef988152d0bdeb31e8f7ca939dc0df737e7505cfb1c1bdf2ff9d7f9ea2faa
+  checksum: 10/ca8b24714cc2fa67f98fbca6ddcf64bb42ee8d75d0b4f1a81486b3282b0f7f1bf9ec49ad4d02149985886a0c8a03a173463f2acb1f51fa0bb7ba2e1d4aa1254d
   languageName: node
   linkType: hard
 
 "eastasianwidth@npm:^0.2.0":
   version: 0.2.0
   resolution: "eastasianwidth@npm:0.2.0"
-  checksum: 7d00d7cd8e49b9afa762a813faac332dee781932d6f2c848dc348939c4253f1d4564341b7af1d041853bc3f32c2ef141b58e0a4d9862c17a7f08f68df1e0f1ed
+  checksum: 10/9b1d3e1baefeaf7d70799db8774149cef33b97183a6addceeba0cf6b85ba23ee2686f302f14482006df32df75d32b17c509c143a3689627929e4a8efaf483952
   languageName: node
   linkType: hard
 
@@ -15115,76 +16135,76 @@ __metadata:
   version: 0.1.2
   resolution: "ecc-jsbn@npm:0.1.2"
   dependencies:
-    jsbn: ~0.1.0
-    safer-buffer: ^2.1.0
-  checksum: 22fef4b6203e5f31d425f5b711eb389e4c6c2723402e389af394f8411b76a488fa414d309d866e2b577ce3e8462d344205545c88a8143cc21752a5172818888a
+    jsbn: "npm:~0.1.0"
+    safer-buffer: "npm:^2.1.0"
+  checksum: 10/d43591f2396196266e186e6d6928038cc11c76c3699a912cb9c13757060f7bbc7f17f47c4cb16168cdeacffc7965aef021142577e646fb3cb88810c15173eb57
   languageName: node
   linkType: hard
 
 "ee-first@npm:1.1.1":
   version: 1.1.1
   resolution: "ee-first@npm:1.1.1"
-  checksum: 1b4cac778d64ce3b582a7e26b218afe07e207a0f9bfe13cc7395a6d307849cfe361e65033c3251e00c27dd060cab43014c2d6b2647676135e18b77d2d05b3f4f
+  checksum: 10/1b4cac778d64ce3b582a7e26b218afe07e207a0f9bfe13cc7395a6d307849cfe361e65033c3251e00c27dd060cab43014c2d6b2647676135e18b77d2d05b3f4f
   languageName: node
   linkType: hard
 
-"ejs@npm:^3.1.8":
+"ejs@npm:^3.1.7, ejs@npm:^3.1.8":
   version: 3.1.9
   resolution: "ejs@npm:3.1.9"
   dependencies:
-    jake: ^10.8.5
+    jake: "npm:^10.8.5"
   bin:
     ejs: bin/cli.js
-  checksum: af6f10eb815885ff8a8cfacc42c6b6cf87daf97a4884f87a30e0c3271fedd85d76a3a297d9c33a70e735b97ee632887f85e32854b9cdd3a2d97edf931519a35f
+  checksum: 10/71f56d37540d2c2d71701f0116710c676f75314a3e997ef8b83515d5d4d2b111c5a72725377caeecb928671bacb84a0d38135f345904812e989847057d59f21a
   languageName: node
   linkType: hard
 
-"electron-to-chromium@npm:^1.4.530":
-  version: 1.4.532
-  resolution: "electron-to-chromium@npm:1.4.532"
-  checksum: e9f77b5d6df84aa1f7598359ec2c988c3758e58106e63f2a0a6dc4756a6733b126316e61a79a2a6643aa2a0f9a1cf9ebe66c817dcb970a3fc9d8190342ef070a
+"electron-to-chromium@npm:^1.4.668":
+  version: 1.4.682
+  resolution: "electron-to-chromium@npm:1.4.682"
+  checksum: 10/ae36e6e5c6c1d8e78fbc7f64baa51a8c58bd483e15bde8c65f5b2f62b490769b80644a389132095803bc553aef52581e7dc1d611f43ac64d6987100bcafd2aec
   languageName: node
   linkType: hard
 
 "emitter-component@npm:^1.1.1":
   version: 1.1.1
   resolution: "emitter-component@npm:1.1.1"
-  checksum: 10e907f507a8c16a318e07595119e58b5c3267528d4e3b962ee9b14fd83c97599e7931ccb983ec551a8de8116955c1d6ae7d213c5b0c920b62c02b7cb8d7a4d7
+  checksum: 10/b43814692fb874c1a75c3c417670123ab33961225b73fa680501dbd5d4ab779ef37082570fb64516bf12cedd906842eea0bccbf1d3bc530162e86bafa17d2737
   languageName: node
   linkType: hard
 
 "emittery@npm:^0.13.1":
   version: 0.13.1
   resolution: "emittery@npm:0.13.1"
-  checksum: 2b089ab6306f38feaabf4f6f02792f9ec85fc054fda79f44f6790e61bbf6bc4e1616afb9b232e0c5ec5289a8a452f79bfa6d905a6fd64e94b49981f0934001c6
+  checksum: 10/fbe214171d878b924eedf1757badf58a5dce071cd1fa7f620fa841a0901a80d6da47ff05929d53163105e621ce11a71b9d8acb1148ffe1745e045145f6e69521
   languageName: node
   linkType: hard
 
 "emoji-regex@npm:^8.0.0":
   version: 8.0.0
   resolution: "emoji-regex@npm:8.0.0"
-  checksum: d4c5c39d5a9868b5fa152f00cada8a936868fd3367f33f71be515ecee4c803132d11b31a6222b2571b1e5f7e13890156a94880345594d0ce7e3c9895f560f192
+  checksum: 10/c72d67a6821be15ec11997877c437491c313d924306b8da5d87d2a2bcc2cec9903cb5b04ee1a088460501d8e5b44f10df82fdc93c444101a7610b80c8b6938e1
   languageName: node
   linkType: hard
 
 "emoji-regex@npm:^9.2.2":
   version: 9.2.2
   resolution: "emoji-regex@npm:9.2.2"
-  checksum: 8487182da74aabd810ac6d6f1994111dfc0e331b01271ae01ec1eb0ad7b5ecc2bbbbd2f053c05cb55a1ac30449527d819bbfbf0e3de1023db308cbcb47f86601
+  checksum: 10/915acf859cea7131dac1b2b5c9c8e35c4849e325a1d114c30adb8cd615970f6dca0e27f64f3a4949d7d6ed86ecd79a1c5c63f02e697513cddd7b5835c90948b8
   languageName: node
   linkType: hard
 
 "emojis-list@npm:^3.0.0":
   version: 3.0.0
   resolution: "emojis-list@npm:3.0.0"
-  checksum: ddaaa02542e1e9436c03970eeed445f4ed29a5337dfba0fe0c38dfdd2af5da2429c2a0821304e8a8d1cadf27fdd5b22ff793571fa803ae16852a6975c65e8e70
+  checksum: 10/114f47d6d45612621497d2b1556c8f142c35332a591780a54e863e42d281e72d6c7d7c419f2e419319d4eb7f6ebf1db82d9744905d90f275db20d06a763b5e19
   languageName: node
   linkType: hard
 
 "emotion@npm:11.0.0":
   version: 11.0.0
   resolution: "emotion@npm:11.0.0"
-  checksum: ab160e73785c49216652ba85e33db6d4426fd7cb28bd5341fea42542e4e24dd671e508226bf4f8dbd99b946fff2e1f1441c58169356659e60f89dc2276f97993
+  checksum: 10/ab160e73785c49216652ba85e33db6d4426fd7cb28bd5341fea42542e4e24dd671e508226bf4f8dbd99b946fff2e1f1441c58169356659e60f89dc2276f97993
   languageName: node
   linkType: hard
 
@@ -15192,16 +16212,16 @@ __metadata:
   version: 10.0.27
   resolution: "emotion@npm:10.0.27"
   dependencies:
-    babel-plugin-emotion: ^10.0.27
-    create-emotion: ^10.0.27
-  checksum: e925a6ae323e77df7fd3064004c16d37a150c838d5fbf96b50075e5176315d0e4b8b6d60ca036fa767c0eabecbe941ec79382f4d3a392d9a06f84b6039d0af49
+    babel-plugin-emotion: "npm:^10.0.27"
+    create-emotion: "npm:^10.0.27"
+  checksum: 10/376a43b150753f515b7ebc3fa3ae9a7143be5c6e1161984a19458967363a38112713a4e5c3de91020faffaf499bbe5c6f0ee517707fb7108a41c87efad6b5691
   languageName: node
   linkType: hard
 
 "encodeurl@npm:~1.0.2":
   version: 1.0.2
   resolution: "encodeurl@npm:1.0.2"
-  checksum: e50e3d508cdd9c4565ba72d2012e65038e5d71bdc9198cb125beb6237b5b1ade6c0d343998da9e170fb2eae52c1bed37d4d6d98a46ea423a0cddbed5ac3f780c
+  checksum: 10/e50e3d508cdd9c4565ba72d2012e65038e5d71bdc9198cb125beb6237b5b1ade6c0d343998da9e170fb2eae52c1bed37d4d6d98a46ea423a0cddbed5ac3f780c
   languageName: node
   linkType: hard
 
@@ -15209,8 +16229,8 @@ __metadata:
   version: 0.1.13
   resolution: "encoding@npm:0.1.13"
   dependencies:
-    iconv-lite: ^0.6.2
-  checksum: bb98632f8ffa823996e508ce6a58ffcf5856330fde839ae42c9e1f436cc3b5cc651d4aeae72222916545428e54fd0f6aa8862fd8d25bdbcc4589f1e3f3715e7f
+    iconv-lite: "npm:^0.6.2"
+  checksum: 10/bb98632f8ffa823996e508ce6a58ffcf5856330fde839ae42c9e1f436cc3b5cc651d4aeae72222916545428e54fd0f6aa8862fd8d25bdbcc4589f1e3f3715e7f
   languageName: node
   linkType: hard
 
@@ -15218,8 +16238,8 @@ __metadata:
   version: 1.4.4
   resolution: "end-of-stream@npm:1.4.4"
   dependencies:
-    once: ^1.4.0
-  checksum: 530a5a5a1e517e962854a31693dbb5c0b2fc40b46dad2a56a2deec656ca040631124f4795823acc68238147805f8b021abbe221f4afed5ef3c8e8efc2024908b
+    once: "npm:^1.4.0"
+  checksum: 10/530a5a5a1e517e962854a31693dbb5c0b2fc40b46dad2a56a2deec656ca040631124f4795823acc68238147805f8b021abbe221f4afed5ef3c8e8efc2024908b
   languageName: node
   linkType: hard
 
@@ -15227,10 +16247,10 @@ __metadata:
   version: 2.1.0
   resolution: "endent@npm:2.1.0"
   dependencies:
-    dedent: ^0.7.0
-    fast-json-parse: ^1.0.3
-    objectorarray: ^1.0.5
-  checksum: c352831088fce745a39ddbd5f87a17e073ea6556e7e96e9010d945a3f3020f836b9a84657123fa01e897db9216f4b080d950b5ded9bf3a8227f14a34efaaaf7c
+    dedent: "npm:^0.7.0"
+    fast-json-parse: "npm:^1.0.3"
+    objectorarray: "npm:^1.0.5"
+  checksum: 10/c352831088fce745a39ddbd5f87a17e073ea6556e7e96e9010d945a3f3020f836b9a84657123fa01e897db9216f4b080d950b5ded9bf3a8227f14a34efaaaf7c
   languageName: node
   linkType: hard
 
@@ -15238,20 +16258,20 @@ __metadata:
   version: 4.5.0
   resolution: "enhanced-resolve@npm:4.5.0"
   dependencies:
-    graceful-fs: ^4.1.2
-    memory-fs: ^0.5.0
-    tapable: ^1.0.0
-  checksum: 4d87488584c4d67d356ef4ba04978af4b2d4d18190cb859efac8e8475a34d5d6c069df33faa5a0a22920b0586dbf330f6a08d52bb15a8771a9ce4d70a2da74ba
+    graceful-fs: "npm:^4.1.2"
+    memory-fs: "npm:^0.5.0"
+    tapable: "npm:^1.0.0"
+  checksum: 10/ae19d36c0faf6b3f66033f9e639a4358ff28c0dbb28438b1c5ab2ba04b7158fba27f4adbc4ae4116a2683b3f7063586ba8d9af2e7625fd5184ecdc83a2a0723a
   languageName: node
   linkType: hard
 
-"enhanced-resolve@npm:^5.10.0, enhanced-resolve@npm:^5.15.0":
-  version: 5.15.0
-  resolution: "enhanced-resolve@npm:5.15.0"
+"enhanced-resolve@npm:^5.15.0, enhanced-resolve@npm:^5.16.0":
+  version: 5.16.0
+  resolution: "enhanced-resolve@npm:5.16.0"
   dependencies:
-    graceful-fs: ^4.2.4
-    tapable: ^2.2.0
-  checksum: fbd8cdc9263be71cc737aa8a7d6c57b43d6aa38f6cc75dde6fcd3598a130cc465f979d2f4d01bb3bf475acb43817749c79f8eef9be048683602ca91ab52e4f11
+    graceful-fs: "npm:^4.2.4"
+    tapable: "npm:^2.2.0"
+  checksum: 10/47f123676b9b179b35195769b9d9523f314f6fc3a13d4461a4d95d5beaec9adc26aaa3b60b61f93e21ed1290dff0e9d9e67df343ec47f4480669a8e26ffe52a3
   languageName: node
   linkType: hard
 
@@ -15259,59 +16279,59 @@ __metadata:
   version: 2.3.6
   resolution: "enquirer@npm:2.3.6"
   dependencies:
-    ansi-colors: ^4.1.1
-  checksum: 1c0911e14a6f8d26721c91e01db06092a5f7675159f0261d69c403396a385afd13dd76825e7678f66daffa930cfaa8d45f506fb35f818a2788463d022af1b884
+    ansi-colors: "npm:^4.1.1"
+  checksum: 10/751d14f037eb7683997e696fb8d5fe2675e0b0cde91182c128cf598acf3f5bd9005f35f7c2a9109e291140af496ebec237b6dac86067d59a9b44f3688107f426
   languageName: node
   linkType: hard
 
 "ensure-posix-path@npm:^1.1.0":
   version: 1.1.1
   resolution: "ensure-posix-path@npm:1.1.1"
-  checksum: 90ac69f48a08003abe6f194b75bad78c3320762bd193a063eb76cd8f696be6a34e1524f16435eeee09ccbe3a719a7fb76409dead3ccedd10e32d906ff050457b
+  checksum: 10/90ac69f48a08003abe6f194b75bad78c3320762bd193a063eb76cd8f696be6a34e1524f16435eeee09ccbe3a719a7fb76409dead3ccedd10e32d906ff050457b
   languageName: node
   linkType: hard
 
 "entities@npm:^2.0.0":
   version: 2.2.0
   resolution: "entities@npm:2.2.0"
-  checksum: 19010dacaf0912c895ea262b4f6128574f9ccf8d4b3b65c7e8334ad0079b3706376360e28d8843ff50a78aabcb8f08f0a32dbfacdc77e47ed77ca08b713669b3
+  checksum: 10/2c765221ee324dbe25e1b8ca5d1bf2a4d39e750548f2e85cbf7ca1d167d709689ddf1796623e66666ae747364c11ed512c03b48c5bbe70968d30f2a4009509b7
   languageName: node
   linkType: hard
 
-"entities@npm:^4.2.0, entities@npm:^4.3.0, entities@npm:^4.3.1, entities@npm:^4.4.0":
+"entities@npm:^4.2.0, entities@npm:^4.3.0, entities@npm:^4.4.0":
   version: 4.4.0
   resolution: "entities@npm:4.4.0"
-  checksum: 84d250329f4b56b40fa93ed067b194db21e8815e4eb9b59f43a086f0ecd342814f6bc483de8a77da5d64e0f626033192b1b4f1792232a7ea6b970ebe0f3187c2
+  checksum: 10/b627cb900e901cc7817037b83bf993a1cbf6a64850540f7526af7bcf9c7d09ebc671198e6182cfae4680f733799e2852e6a1c46aa62ff36eb99680057a038df5
   languageName: node
   linkType: hard
 
-"env-paths@npm:^2.2.0":
+"env-paths@npm:^2.2.0, env-paths@npm:^2.2.1":
   version: 2.2.1
   resolution: "env-paths@npm:2.2.1"
-  checksum: 65b5df55a8bab92229ab2b40dad3b387fad24613263d103a97f91c9fe43ceb21965cd3392b1ccb5d77088021e525c4e0481adb309625d0cb94ade1d1fb8dc17e
+  checksum: 10/65b5df55a8bab92229ab2b40dad3b387fad24613263d103a97f91c9fe43ceb21965cd3392b1ccb5d77088021e525c4e0481adb309625d0cb94ade1d1fb8dc17e
   languageName: node
   linkType: hard
 
-"envinfo@npm:^7.7.3, envinfo@npm:^7.7.4":
+"envinfo@npm:7.8.1, envinfo@npm:^7.7.3":
   version: 7.8.1
   resolution: "envinfo@npm:7.8.1"
   bin:
     envinfo: dist/cli.js
-  checksum: de736c98d6311c78523628ff127af138451b162e57af5293c1b984ca821d0aeb9c849537d2fde0434011bed33f6bca5310ca2aab8a51a3f28fc719e89045d648
+  checksum: 10/e7a2d71c7dfe398a4ffda0e844e242d2183ef2627f98e74e4cd71edd2af691c8707a2b34aacef92538c27b3daf9a360d32202f33c0a9f27f767c4e1c6ba8b522
   languageName: node
   linkType: hard
 
 "eol@npm:^0.9.1":
   version: 0.9.1
   resolution: "eol@npm:0.9.1"
-  checksum: ba9fa998bc8148b935dcf85585eacf049eeaf18d2ab6196710d4d1f59e7dfd0e87b18508dc67144ff8ba12f835a4a4989aeea64c98b13cca77b74b9d4b33bce5
+  checksum: 10/9d3fd93bb2bb5c69c7fe8dfb97b62213ed95857a2e90f5db3110415993e8a989d87fb011755ce22fdb92ca36fbe4e111b395a6f4ce00b9b51d3f00f19c2acf52
   languageName: node
   linkType: hard
 
 "err-code@npm:^2.0.2":
   version: 2.0.3
   resolution: "err-code@npm:2.0.3"
-  checksum: 8b7b1be20d2de12d2255c0bc2ca638b7af5171142693299416e6a9339bd7d88fc8d7707d913d78e0993176005405a236b066b45666b27b797252c771156ace54
+  checksum: 10/1d20d825cdcce8d811bfbe86340f4755c02655a7feb2f13f8c880566d9d72a3f6c92c192a6867632e490d6da67b678271f46e01044996a6443e870331100dfdd
   languageName: node
   linkType: hard
 
@@ -15319,10 +16339,10 @@ __metadata:
   version: 0.1.8
   resolution: "errno@npm:0.1.8"
   dependencies:
-    prr: ~1.0.1
+    prr: "npm:~1.0.1"
   bin:
     errno: cli.js
-  checksum: 1271f7b9fbb3bcbec76ffde932485d1e3561856d21d847ec613a9722ee924cdd4e523a62dc71a44174d91e898fe21fdc8d5b50823f4b5e0ce8c35c8271e6ef4a
+  checksum: 10/93076ed11bedb8f0389cbefcbdd3445f66443159439dccbaac89a053428ad92147676736235d275612dc0296d3f9a7e6b7177ed78a566b6cd15dacd4fa0d5888
   languageName: node
   linkType: hard
 
@@ -15330,8 +16350,8 @@ __metadata:
   version: 1.3.2
   resolution: "error-ex@npm:1.3.2"
   dependencies:
-    is-arrayish: ^0.2.1
-  checksum: c1c2b8b65f9c91b0f9d75f0debaa7ec5b35c266c2cac5de412c1a6de86d4cbae04ae44e510378cb14d032d0645a36925d0186f8bb7367bcc629db256b743a001
+    is-arrayish: "npm:^0.2.1"
+  checksum: 10/d547740aa29c34e753fb6fed2c5de81802438529c12b3673bd37b6bb1fe49b9b7abdc3c11e6062fe625d8a296b3cf769a80f878865e25e685f787763eede3ffb
   languageName: node
   linkType: hard
 
@@ -15339,55 +16359,77 @@ __metadata:
   version: 2.0.6
   resolution: "error-stack-parser@npm:2.0.6"
   dependencies:
-    stackframe: ^1.1.1
-  checksum: bd8e048fcb1c0c74ab201271fec3b39c097a7c24bdef1718828d053c0584da5d7ad845253b5e4773803ee8e7450b23b0920e60a3b60dd403c1568c843058cb12
-  languageName: node
-  linkType: hard
-
-"es-abstract@npm:^1.20.4, es-abstract@npm:^1.22.1":
-  version: 1.22.2
-  resolution: "es-abstract@npm:1.22.2"
-  dependencies:
-    array-buffer-byte-length: ^1.0.0
-    arraybuffer.prototype.slice: ^1.0.2
-    available-typed-arrays: ^1.0.5
-    call-bind: ^1.0.2
-    es-set-tostringtag: ^2.0.1
-    es-to-primitive: ^1.2.1
-    function.prototype.name: ^1.1.6
-    get-intrinsic: ^1.2.1
-    get-symbol-description: ^1.0.0
-    globalthis: ^1.0.3
-    gopd: ^1.0.1
-    has: ^1.0.3
-    has-property-descriptors: ^1.0.0
-    has-proto: ^1.0.1
-    has-symbols: ^1.0.3
-    internal-slot: ^1.0.5
-    is-array-buffer: ^3.0.2
-    is-callable: ^1.2.7
-    is-negative-zero: ^2.0.2
-    is-regex: ^1.1.4
-    is-shared-array-buffer: ^1.0.2
-    is-string: ^1.0.7
-    is-typed-array: ^1.1.12
-    is-weakref: ^1.0.2
-    object-inspect: ^1.12.3
-    object-keys: ^1.1.1
-    object.assign: ^4.1.4
-    regexp.prototype.flags: ^1.5.1
-    safe-array-concat: ^1.0.1
-    safe-regex-test: ^1.0.0
-    string.prototype.trim: ^1.2.8
-    string.prototype.trimend: ^1.0.7
-    string.prototype.trimstart: ^1.0.7
-    typed-array-buffer: ^1.0.0
-    typed-array-byte-length: ^1.0.0
-    typed-array-byte-offset: ^1.0.0
-    typed-array-length: ^1.0.4
-    unbox-primitive: ^1.0.2
-    which-typed-array: ^1.1.11
-  checksum: cc70e592d360d7d729859013dee7a610c6b27ed8630df0547c16b0d16d9fe6505a70ee14d1af08d970fdd132b3f88c9ca7815ce72c9011608abf8ab0e55fc515
+    stackframe: "npm:^1.1.1"
+  checksum: 10/c83a0f425b73ed8bae4b05535f76477fdd4421e2cca398a2051719ac7eb5f918622d6313ef24f6ab6f64cbd38ebd1119bcb15cd792befbf2dd472d02062ff6d8
+  languageName: node
+  linkType: hard
+
+"es-abstract@npm:^1.22.1, es-abstract@npm:^1.22.3, es-abstract@npm:^1.22.4":
+  version: 1.23.0
+  resolution: "es-abstract@npm:1.23.0"
+  dependencies:
+    array-buffer-byte-length: "npm:^1.0.1"
+    arraybuffer.prototype.slice: "npm:^1.0.3"
+    available-typed-arrays: "npm:^1.0.7"
+    call-bind: "npm:^1.0.7"
+    data-view-buffer: "npm:^1.0.1"
+    data-view-byte-length: "npm:^1.0.0"
+    data-view-byte-offset: "npm:^1.0.0"
+    es-define-property: "npm:^1.0.0"
+    es-errors: "npm:^1.3.0"
+    es-set-tostringtag: "npm:^2.0.3"
+    es-to-primitive: "npm:^1.2.1"
+    function.prototype.name: "npm:^1.1.6"
+    get-intrinsic: "npm:^1.2.4"
+    get-symbol-description: "npm:^1.0.2"
+    globalthis: "npm:^1.0.3"
+    gopd: "npm:^1.0.1"
+    has-property-descriptors: "npm:^1.0.2"
+    has-proto: "npm:^1.0.3"
+    has-symbols: "npm:^1.0.3"
+    hasown: "npm:^2.0.1"
+    internal-slot: "npm:^1.0.7"
+    is-array-buffer: "npm:^3.0.4"
+    is-callable: "npm:^1.2.7"
+    is-data-view: "npm:^1.0.1"
+    is-negative-zero: "npm:^2.0.3"
+    is-regex: "npm:^1.1.4"
+    is-shared-array-buffer: "npm:^1.0.3"
+    is-string: "npm:^1.0.7"
+    is-typed-array: "npm:^1.1.13"
+    is-weakref: "npm:^1.0.2"
+    object-inspect: "npm:^1.13.1"
+    object-keys: "npm:^1.1.1"
+    object.assign: "npm:^4.1.5"
+    regexp.prototype.flags: "npm:^1.5.2"
+    safe-array-concat: "npm:^1.1.0"
+    safe-regex-test: "npm:^1.0.3"
+    string.prototype.trim: "npm:^1.2.8"
+    string.prototype.trimend: "npm:^1.0.7"
+    string.prototype.trimstart: "npm:^1.0.7"
+    typed-array-buffer: "npm:^1.0.2"
+    typed-array-byte-length: "npm:^1.0.1"
+    typed-array-byte-offset: "npm:^1.0.2"
+    typed-array-length: "npm:^1.0.5"
+    unbox-primitive: "npm:^1.0.2"
+    which-typed-array: "npm:^1.1.14"
+  checksum: 10/b66cec32fcb896c7a3bbb7cb717f3f6bbbb73efe1c6003f0d7a899aecc358feed38ec2cad55e2a1d71a4a95ec7e7cc1dbbca34368deb0b98e36fe02cc5559b31
+  languageName: node
+  linkType: hard
+
+"es-define-property@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "es-define-property@npm:1.0.0"
+  dependencies:
+    get-intrinsic: "npm:^1.2.4"
+  checksum: 10/f66ece0a887b6dca71848fa71f70461357c0e4e7249696f81bad0a1f347eed7b31262af4a29f5d726dc026426f085483b6b90301855e647aa8e21936f07293c6
+  languageName: node
+  linkType: hard
+
+"es-errors@npm:^1.1.0, es-errors@npm:^1.2.1, es-errors@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "es-errors@npm:1.3.0"
+  checksum: 10/96e65d640156f91b707517e8cdc454dd7d47c32833aa3e85d79f24f9eb7ea85f39b63e36216ef0114996581969b59fe609a94e30316b08f5f4df1d44134cf8d5
   languageName: node
   linkType: hard
 
@@ -15395,72 +16437,66 @@ __metadata:
   version: 1.1.3
   resolution: "es-get-iterator@npm:1.1.3"
   dependencies:
-    call-bind: ^1.0.2
-    get-intrinsic: ^1.1.3
-    has-symbols: ^1.0.3
-    is-arguments: ^1.1.1
-    is-map: ^2.0.2
-    is-set: ^2.0.2
-    is-string: ^1.0.7
-    isarray: ^2.0.5
-    stop-iteration-iterator: ^1.0.0
-  checksum: 8fa118da42667a01a7c7529f8a8cca514feeff243feec1ce0bb73baaa3514560bd09d2b3438873cf8a5aaec5d52da248131de153b28e2638a061b6e4df13267d
-  languageName: node
-  linkType: hard
-
-"es-iterator-helpers@npm:^1.0.12":
-  version: 1.0.15
-  resolution: "es-iterator-helpers@npm:1.0.15"
-  dependencies:
-    asynciterator.prototype: ^1.0.0
-    call-bind: ^1.0.2
-    define-properties: ^1.2.1
-    es-abstract: ^1.22.1
-    es-set-tostringtag: ^2.0.1
-    function-bind: ^1.1.1
-    get-intrinsic: ^1.2.1
-    globalthis: ^1.0.3
-    has-property-descriptors: ^1.0.0
-    has-proto: ^1.0.1
-    has-symbols: ^1.0.3
-    internal-slot: ^1.0.5
-    iterator.prototype: ^1.1.2
-    safe-array-concat: ^1.0.1
-  checksum: 50081ae5c549efe62e5c1d244df0194b40b075f7897fc2116b7e1aa437eb3c41f946d2afda18c33f9b31266ec544765932542765af839f76fa6d7b7855d1e0e1
-  languageName: node
-  linkType: hard
-
-"es-module-lexer@npm:^0.9.0":
-  version: 0.9.3
-  resolution: "es-module-lexer@npm:0.9.3"
-  checksum: 84bbab23c396281db2c906c766af58b1ae2a1a2599844a504df10b9e8dc77ec800b3211fdaa133ff700f5703d791198807bba25d9667392d27a5e9feda344da8
+    call-bind: "npm:^1.0.2"
+    get-intrinsic: "npm:^1.1.3"
+    has-symbols: "npm:^1.0.3"
+    is-arguments: "npm:^1.1.1"
+    is-map: "npm:^2.0.2"
+    is-set: "npm:^2.0.2"
+    is-string: "npm:^1.0.7"
+    isarray: "npm:^2.0.5"
+    stop-iteration-iterator: "npm:^1.0.0"
+  checksum: 10/bc2194befbe55725f9489098626479deee3c801eda7e83ce0dff2eb266a28dc808edb9b623ff01d31ebc1328f09d661333d86b601036692c2e3c1a6942319433
+  languageName: node
+  linkType: hard
+
+"es-iterator-helpers@npm:^1.0.12, es-iterator-helpers@npm:^1.0.15, es-iterator-helpers@npm:^1.0.17":
+  version: 1.0.17
+  resolution: "es-iterator-helpers@npm:1.0.17"
+  dependencies:
+    asynciterator.prototype: "npm:^1.0.0"
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.22.4"
+    es-errors: "npm:^1.3.0"
+    es-set-tostringtag: "npm:^2.0.2"
+    function-bind: "npm:^1.1.2"
+    get-intrinsic: "npm:^1.2.4"
+    globalthis: "npm:^1.0.3"
+    has-property-descriptors: "npm:^1.0.2"
+    has-proto: "npm:^1.0.1"
+    has-symbols: "npm:^1.0.3"
+    internal-slot: "npm:^1.0.7"
+    iterator.prototype: "npm:^1.1.2"
+    safe-array-concat: "npm:^1.1.0"
+  checksum: 10/42c6eb65368d34b556dac1cc8d34ba753eb526bc7d4594be3b77799440be78d31fddfd60717af2d9ce6d021de8346e7a573141d789821e38836e60441f93ccfd
   languageName: node
   linkType: hard
 
 "es-module-lexer@npm:^1.0.5, es-module-lexer@npm:^1.2.1":
   version: 1.3.0
   resolution: "es-module-lexer@npm:1.3.0"
-  checksum: 48fd9f504a9d2a894126f75c8b7ccc6273a289983e9b67255f165bfd9ae765d50100218251e94e702ca567826905ea2f7b3b4a0c4d74d3ce99cce3a2a606a238
+  checksum: 10/dee2af09669d05282db987839681ea1917ce31ce4a2364cc9eb598675344c5c709895e7e782db87794065a6f3af054552e2cf42ccadcaec4c9fc0cbc4898f193
   languageName: node
   linkType: hard
 
-"es-set-tostringtag@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "es-set-tostringtag@npm:2.0.1"
+"es-set-tostringtag@npm:^2.0.2, es-set-tostringtag@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "es-set-tostringtag@npm:2.0.3"
   dependencies:
-    get-intrinsic: ^1.1.3
-    has: ^1.0.3
-    has-tostringtag: ^1.0.0
-  checksum: ec416a12948cefb4b2a5932e62093a7cf36ddc3efd58d6c58ca7ae7064475ace556434b869b0bbeb0c365f1032a8ccd577211101234b69837ad83ad204fff884
+    get-intrinsic: "npm:^1.2.4"
+    has-tostringtag: "npm:^1.0.2"
+    hasown: "npm:^2.0.1"
+  checksum: 10/7227fa48a41c0ce83e0377b11130d324ac797390688135b8da5c28994c0165be8b252e15cd1de41e1325e5a5412511586960213e88f9ab4a5e7d028895db5129
   languageName: node
   linkType: hard
 
-"es-shim-unscopables@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "es-shim-unscopables@npm:1.0.0"
+"es-shim-unscopables@npm:^1.0.0, es-shim-unscopables@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "es-shim-unscopables@npm:1.0.2"
   dependencies:
-    has: ^1.0.3
-  checksum: 83e95cadbb6ee44d3644dfad60dcad7929edbc42c85e66c3e99aefd68a3a5c5665f2686885cddb47dfeabfd77bd5ea5a7060f2092a955a729bbd8834f0d86fa1
+    hasown: "npm:^2.0.0"
+  checksum: 10/6d3bf91f658a27cc7217cd32b407a0d714393a84d125ad576319b9e83a893bea165cf41270c29e9ceaa56d3cf41608945d7e2a2c31fd51c0009b0c31402b91c7
   languageName: node
   linkType: hard
 
@@ -15468,51 +16504,65 @@ __metadata:
   version: 1.2.1
   resolution: "es-to-primitive@npm:1.2.1"
   dependencies:
-    is-callable: ^1.1.4
-    is-date-object: ^1.0.1
-    is-symbol: ^1.0.2
-  checksum: 4ead6671a2c1402619bdd77f3503991232ca15e17e46222b0a41a5d81aebc8740a77822f5b3c965008e631153e9ef0580540007744521e72de8e33599fca2eed
+    is-callable: "npm:^1.1.4"
+    is-date-object: "npm:^1.0.1"
+    is-symbol: "npm:^1.0.2"
+  checksum: 10/74aeeefe2714cf99bb40cab7ce3012d74e1e2c1bd60d0a913b467b269edde6e176ca644b5ba03a5b865fb044a29bca05671cd445c85ca2cdc2de155d7fc8fe9b
   languageName: node
   linkType: hard
 
 "es6-object-assign@npm:^1.1.0":
   version: 1.1.0
   resolution: "es6-object-assign@npm:1.1.0"
-  checksum: 8d4fdf63484d78b5c64cacc2c2e1165bc7b6a64b739d2a9db6a4dc8641d99cc9efb433cdd4dc3d3d6b00bfa6ce959694e4665e3255190339945c5f33b692b5d8
+  checksum: 10/396c30376c89e91b5435f177ff83ba0d5ba265e3583cbaaa3bce185df08bf87db58c6d5d84600634280cbf35f8f342569b6ab776d728a12e177e5db82f5b6e2f
+  languageName: node
+  linkType: hard
+
+"esbuild-loader@npm:4.1.0":
+  version: 4.1.0
+  resolution: "esbuild-loader@npm:4.1.0"
+  dependencies:
+    esbuild: "npm:^0.20.0"
+    get-tsconfig: "npm:^4.7.0"
+    loader-utils: "npm:^2.0.4"
+    webpack-sources: "npm:^1.4.3"
+  peerDependencies:
+    webpack: ^4.40.0 || ^5.0.0
+  checksum: 10/30fdf0c5680142680c3227fe492c0b253246b253b83c1c97776782d54438b969dc195da3f5462d9adbee77167ec04aff25276a0dcfddf4fe11805749c4600b45
   languageName: node
   linkType: hard
 
-"esbuild-loader@npm:3.0.1, esbuild-loader@npm:^3.0.0":
+"esbuild-loader@npm:^3.0.0":
   version: 3.0.1
   resolution: "esbuild-loader@npm:3.0.1"
   dependencies:
-    esbuild: ^0.17.6
-    get-tsconfig: ^4.4.0
-    loader-utils: ^2.0.4
-    webpack-sources: ^1.4.3
+    esbuild: "npm:^0.17.6"
+    get-tsconfig: "npm:^4.4.0"
+    loader-utils: "npm:^2.0.4"
+    webpack-sources: "npm:^1.4.3"
   peerDependencies:
     webpack: ^4.40.0 || ^5.0.0
-  checksum: c8925eb3c04f53841bfc387fb6897e52735fbfb3bcfae2401c98aa076907ab85672cda520de1bc5db9c4ec5e0d4effdf12b04fa4c980b51a6af9192b70110697
+  checksum: 10/c51206c16fad8943457d801706089b819c9fb880fbdabac0d2e7fefdfb617c2e4d95939cec0aa9127d44ed18fe740e3d5900072ba7513ca4ac9cfdd86ebc1d08
   languageName: node
   linkType: hard
 
 "esbuild-plugin-alias@npm:^0.2.1":
   version: 0.2.1
   resolution: "esbuild-plugin-alias@npm:0.2.1"
-  checksum: afe2d2c8b5f09d5321cb8d9c0825e8a9f6e03c2d50df92f953a291d4620cc29eddb3da9e33b238f6d8f77738e0277bdcb831f127399449fecf78fb84c04e5da9
+  checksum: 10/afe2d2c8b5f09d5321cb8d9c0825e8a9f6e03c2d50df92f953a291d4620cc29eddb3da9e33b238f6d8f77738e0277bdcb831f127399449fecf78fb84c04e5da9
   languageName: node
   linkType: hard
 
-"esbuild-plugin-browserslist@npm:^0.8.0":
-  version: 0.8.1
-  resolution: "esbuild-plugin-browserslist@npm:0.8.1"
+"esbuild-plugin-browserslist@npm:^0.11.0":
+  version: 0.11.1
+  resolution: "esbuild-plugin-browserslist@npm:0.11.1"
   dependencies:
-    debug: ^4.3.4
-    zod: ^3.21.4
+    debug: "npm:^4.3.4"
+    zod: "npm:^3.21.4"
   peerDependencies:
     browserslist: ^4.21.8
-    esbuild: ~0.18.2
-  checksum: 92e5fbdbeb71155fa6f438286d86217101e456e302f7c32e05c446576dedc5dcf7a9daf1a7317f26e210cd8598a0b4f4f04ef3582788822ba3958eec73a706cd
+    esbuild: ~0.20.0
+  checksum: 10/00862b0bf848c82559be4722a0a37f789b95438271a8047b21ed6590439003ce731e1f0fbc0828b7beae8c21147514c98ad0690470022b1a8477f9f2536cabb2
   languageName: node
   linkType: hard
 
@@ -15520,10 +16570,10 @@ __metadata:
   version: 3.4.2
   resolution: "esbuild-register@npm:3.4.2"
   dependencies:
-    debug: ^4.3.4
+    debug: "npm:^4.3.4"
   peerDependencies:
     esbuild: ">=0.12 <1"
-  checksum: f65d1ccb58b1ccbba376efb1fc023abe22731d9b79eead1b0120e57d4413318f063696257a5af637b527fa1d3f009095aa6edb1bf6ff69d637a9ab281fb727b3
+  checksum: 10/38504907851ec053722d36f331cff800a5f0b1a429871597e44e7e07192ecf13ca6e8171e3ad91feae17d18895359cbaee053cbec3da233ac2217fc71823b167
   languageName: node
   linkType: hard
 
@@ -15531,29 +16581,109 @@ __metadata:
   version: 0.18.12
   resolution: "esbuild@npm:0.18.12"
   dependencies:
-    "@esbuild/android-arm": 0.18.12
-    "@esbuild/android-arm64": 0.18.12
-    "@esbuild/android-x64": 0.18.12
-    "@esbuild/darwin-arm64": 0.18.12
-    "@esbuild/darwin-x64": 0.18.12
-    "@esbuild/freebsd-arm64": 0.18.12
-    "@esbuild/freebsd-x64": 0.18.12
-    "@esbuild/linux-arm": 0.18.12
-    "@esbuild/linux-arm64": 0.18.12
-    "@esbuild/linux-ia32": 0.18.12
-    "@esbuild/linux-loong64": 0.18.12
-    "@esbuild/linux-mips64el": 0.18.12
-    "@esbuild/linux-ppc64": 0.18.12
-    "@esbuild/linux-riscv64": 0.18.12
-    "@esbuild/linux-s390x": 0.18.12
-    "@esbuild/linux-x64": 0.18.12
-    "@esbuild/netbsd-x64": 0.18.12
-    "@esbuild/openbsd-x64": 0.18.12
-    "@esbuild/sunos-x64": 0.18.12
-    "@esbuild/win32-arm64": 0.18.12
-    "@esbuild/win32-ia32": 0.18.12
-    "@esbuild/win32-x64": 0.18.12
+    "@esbuild/android-arm": "npm:0.18.12"
+    "@esbuild/android-arm64": "npm:0.18.12"
+    "@esbuild/android-x64": "npm:0.18.12"
+    "@esbuild/darwin-arm64": "npm:0.18.12"
+    "@esbuild/darwin-x64": "npm:0.18.12"
+    "@esbuild/freebsd-arm64": "npm:0.18.12"
+    "@esbuild/freebsd-x64": "npm:0.18.12"
+    "@esbuild/linux-arm": "npm:0.18.12"
+    "@esbuild/linux-arm64": "npm:0.18.12"
+    "@esbuild/linux-ia32": "npm:0.18.12"
+    "@esbuild/linux-loong64": "npm:0.18.12"
+    "@esbuild/linux-mips64el": "npm:0.18.12"
+    "@esbuild/linux-ppc64": "npm:0.18.12"
+    "@esbuild/linux-riscv64": "npm:0.18.12"
+    "@esbuild/linux-s390x": "npm:0.18.12"
+    "@esbuild/linux-x64": "npm:0.18.12"
+    "@esbuild/netbsd-x64": "npm:0.18.12"
+    "@esbuild/openbsd-x64": "npm:0.18.12"
+    "@esbuild/sunos-x64": "npm:0.18.12"
+    "@esbuild/win32-arm64": "npm:0.18.12"
+    "@esbuild/win32-ia32": "npm:0.18.12"
+    "@esbuild/win32-x64": "npm:0.18.12"
+  dependenciesMeta:
+    "@esbuild/android-arm":
+      optional: true
+    "@esbuild/android-arm64":
+      optional: true
+    "@esbuild/android-x64":
+      optional: true
+    "@esbuild/darwin-arm64":
+      optional: true
+    "@esbuild/darwin-x64":
+      optional: true
+    "@esbuild/freebsd-arm64":
+      optional: true
+    "@esbuild/freebsd-x64":
+      optional: true
+    "@esbuild/linux-arm":
+      optional: true
+    "@esbuild/linux-arm64":
+      optional: true
+    "@esbuild/linux-ia32":
+      optional: true
+    "@esbuild/linux-loong64":
+      optional: true
+    "@esbuild/linux-mips64el":
+      optional: true
+    "@esbuild/linux-ppc64":
+      optional: true
+    "@esbuild/linux-riscv64":
+      optional: true
+    "@esbuild/linux-s390x":
+      optional: true
+    "@esbuild/linux-x64":
+      optional: true
+    "@esbuild/netbsd-x64":
+      optional: true
+    "@esbuild/openbsd-x64":
+      optional: true
+    "@esbuild/sunos-x64":
+      optional: true
+    "@esbuild/win32-arm64":
+      optional: true
+    "@esbuild/win32-ia32":
+      optional: true
+    "@esbuild/win32-x64":
+      optional: true
+  bin:
+    esbuild: bin/esbuild
+  checksum: 10/724411d6dc01ac4ee9a6a7f9f735765f81383c9f2a1cbc35dcccf558cd5bc13f0913ff9a3a3eab0dfe3db20f85991e9f60f59a5d709443ed2179d525722d17e9
+  languageName: node
+  linkType: hard
+
+"esbuild@npm:0.20.1":
+  version: 0.20.1
+  resolution: "esbuild@npm:0.20.1"
+  dependencies:
+    "@esbuild/aix-ppc64": "npm:0.20.1"
+    "@esbuild/android-arm": "npm:0.20.1"
+    "@esbuild/android-arm64": "npm:0.20.1"
+    "@esbuild/android-x64": "npm:0.20.1"
+    "@esbuild/darwin-arm64": "npm:0.20.1"
+    "@esbuild/darwin-x64": "npm:0.20.1"
+    "@esbuild/freebsd-arm64": "npm:0.20.1"
+    "@esbuild/freebsd-x64": "npm:0.20.1"
+    "@esbuild/linux-arm": "npm:0.20.1"
+    "@esbuild/linux-arm64": "npm:0.20.1"
+    "@esbuild/linux-ia32": "npm:0.20.1"
+    "@esbuild/linux-loong64": "npm:0.20.1"
+    "@esbuild/linux-mips64el": "npm:0.20.1"
+    "@esbuild/linux-ppc64": "npm:0.20.1"
+    "@esbuild/linux-riscv64": "npm:0.20.1"
+    "@esbuild/linux-s390x": "npm:0.20.1"
+    "@esbuild/linux-x64": "npm:0.20.1"
+    "@esbuild/netbsd-x64": "npm:0.20.1"
+    "@esbuild/openbsd-x64": "npm:0.20.1"
+    "@esbuild/sunos-x64": "npm:0.20.1"
+    "@esbuild/win32-arm64": "npm:0.20.1"
+    "@esbuild/win32-ia32": "npm:0.20.1"
+    "@esbuild/win32-x64": "npm:0.20.1"
   dependenciesMeta:
+    "@esbuild/aix-ppc64":
+      optional: true
     "@esbuild/android-arm":
       optional: true
     "@esbuild/android-arm64":
@@ -15600,7 +16730,7 @@ __metadata:
       optional: true
   bin:
     esbuild: bin/esbuild
-  checksum: 9d5aac77f637bf69f161dbf900f91cdec38c4bd47562b81302a2f790781fc1430f17790ee934058fa18379673c2987b0310fa61e8ccefb37065b8cc79956f099
+  checksum: 10/b672fd5df28ae917e2b16e77edbbf6b3099c390ab0a9d4cd331f78b4a4567cf33f506a055e1aa272ac90f7f522835b2173abea9bac6c38906acfda68e60a7ab7
   languageName: node
   linkType: hard
 
@@ -15608,28 +16738,28 @@ __metadata:
   version: 0.17.19
   resolution: "esbuild@npm:0.17.19"
   dependencies:
-    "@esbuild/android-arm": 0.17.19
-    "@esbuild/android-arm64": 0.17.19
-    "@esbuild/android-x64": 0.17.19
-    "@esbuild/darwin-arm64": 0.17.19
-    "@esbuild/darwin-x64": 0.17.19
-    "@esbuild/freebsd-arm64": 0.17.19
-    "@esbuild/freebsd-x64": 0.17.19
-    "@esbuild/linux-arm": 0.17.19
-    "@esbuild/linux-arm64": 0.17.19
-    "@esbuild/linux-ia32": 0.17.19
-    "@esbuild/linux-loong64": 0.17.19
-    "@esbuild/linux-mips64el": 0.17.19
-    "@esbuild/linux-ppc64": 0.17.19
-    "@esbuild/linux-riscv64": 0.17.19
-    "@esbuild/linux-s390x": 0.17.19
-    "@esbuild/linux-x64": 0.17.19
-    "@esbuild/netbsd-x64": 0.17.19
-    "@esbuild/openbsd-x64": 0.17.19
-    "@esbuild/sunos-x64": 0.17.19
-    "@esbuild/win32-arm64": 0.17.19
-    "@esbuild/win32-ia32": 0.17.19
-    "@esbuild/win32-x64": 0.17.19
+    "@esbuild/android-arm": "npm:0.17.19"
+    "@esbuild/android-arm64": "npm:0.17.19"
+    "@esbuild/android-x64": "npm:0.17.19"
+    "@esbuild/darwin-arm64": "npm:0.17.19"
+    "@esbuild/darwin-x64": "npm:0.17.19"
+    "@esbuild/freebsd-arm64": "npm:0.17.19"
+    "@esbuild/freebsd-x64": "npm:0.17.19"
+    "@esbuild/linux-arm": "npm:0.17.19"
+    "@esbuild/linux-arm64": "npm:0.17.19"
+    "@esbuild/linux-ia32": "npm:0.17.19"
+    "@esbuild/linux-loong64": "npm:0.17.19"
+    "@esbuild/linux-mips64el": "npm:0.17.19"
+    "@esbuild/linux-ppc64": "npm:0.17.19"
+    "@esbuild/linux-riscv64": "npm:0.17.19"
+    "@esbuild/linux-s390x": "npm:0.17.19"
+    "@esbuild/linux-x64": "npm:0.17.19"
+    "@esbuild/netbsd-x64": "npm:0.17.19"
+    "@esbuild/openbsd-x64": "npm:0.17.19"
+    "@esbuild/sunos-x64": "npm:0.17.19"
+    "@esbuild/win32-arm64": "npm:0.17.19"
+    "@esbuild/win32-ia32": "npm:0.17.19"
+    "@esbuild/win32-x64": "npm:0.17.19"
   dependenciesMeta:
     "@esbuild/android-arm":
       optional: true
@@ -15677,7 +16807,7 @@ __metadata:
       optional: true
   bin:
     esbuild: bin/esbuild
-  checksum: ac11b1a5a6008e4e37ccffbd6c2c054746fc58d0ed4a2f9ee643bd030cfcea9a33a235087bc777def8420f2eaafb3486e76adb7bdb7241a9143b43a69a10afd8
+  checksum: 10/86ada7cad6d37a3445858fee31ca39fc6c0436c7c00b2e07b9ce308235be67f36aefe0dda25da9ab08653fde496d1e759d6ad891ce9479f9e1fb4964c8f2a0fa
   languageName: node
   linkType: hard
 
@@ -15685,29 +16815,109 @@ __metadata:
   version: 0.18.20
   resolution: "esbuild@npm:0.18.20"
   dependencies:
-    "@esbuild/android-arm": 0.18.20
-    "@esbuild/android-arm64": 0.18.20
-    "@esbuild/android-x64": 0.18.20
-    "@esbuild/darwin-arm64": 0.18.20
-    "@esbuild/darwin-x64": 0.18.20
-    "@esbuild/freebsd-arm64": 0.18.20
-    "@esbuild/freebsd-x64": 0.18.20
-    "@esbuild/linux-arm": 0.18.20
-    "@esbuild/linux-arm64": 0.18.20
-    "@esbuild/linux-ia32": 0.18.20
-    "@esbuild/linux-loong64": 0.18.20
-    "@esbuild/linux-mips64el": 0.18.20
-    "@esbuild/linux-ppc64": 0.18.20
-    "@esbuild/linux-riscv64": 0.18.20
-    "@esbuild/linux-s390x": 0.18.20
-    "@esbuild/linux-x64": 0.18.20
-    "@esbuild/netbsd-x64": 0.18.20
-    "@esbuild/openbsd-x64": 0.18.20
-    "@esbuild/sunos-x64": 0.18.20
-    "@esbuild/win32-arm64": 0.18.20
-    "@esbuild/win32-ia32": 0.18.20
-    "@esbuild/win32-x64": 0.18.20
+    "@esbuild/android-arm": "npm:0.18.20"
+    "@esbuild/android-arm64": "npm:0.18.20"
+    "@esbuild/android-x64": "npm:0.18.20"
+    "@esbuild/darwin-arm64": "npm:0.18.20"
+    "@esbuild/darwin-x64": "npm:0.18.20"
+    "@esbuild/freebsd-arm64": "npm:0.18.20"
+    "@esbuild/freebsd-x64": "npm:0.18.20"
+    "@esbuild/linux-arm": "npm:0.18.20"
+    "@esbuild/linux-arm64": "npm:0.18.20"
+    "@esbuild/linux-ia32": "npm:0.18.20"
+    "@esbuild/linux-loong64": "npm:0.18.20"
+    "@esbuild/linux-mips64el": "npm:0.18.20"
+    "@esbuild/linux-ppc64": "npm:0.18.20"
+    "@esbuild/linux-riscv64": "npm:0.18.20"
+    "@esbuild/linux-s390x": "npm:0.18.20"
+    "@esbuild/linux-x64": "npm:0.18.20"
+    "@esbuild/netbsd-x64": "npm:0.18.20"
+    "@esbuild/openbsd-x64": "npm:0.18.20"
+    "@esbuild/sunos-x64": "npm:0.18.20"
+    "@esbuild/win32-arm64": "npm:0.18.20"
+    "@esbuild/win32-ia32": "npm:0.18.20"
+    "@esbuild/win32-x64": "npm:0.18.20"
+  dependenciesMeta:
+    "@esbuild/android-arm":
+      optional: true
+    "@esbuild/android-arm64":
+      optional: true
+    "@esbuild/android-x64":
+      optional: true
+    "@esbuild/darwin-arm64":
+      optional: true
+    "@esbuild/darwin-x64":
+      optional: true
+    "@esbuild/freebsd-arm64":
+      optional: true
+    "@esbuild/freebsd-x64":
+      optional: true
+    "@esbuild/linux-arm":
+      optional: true
+    "@esbuild/linux-arm64":
+      optional: true
+    "@esbuild/linux-ia32":
+      optional: true
+    "@esbuild/linux-loong64":
+      optional: true
+    "@esbuild/linux-mips64el":
+      optional: true
+    "@esbuild/linux-ppc64":
+      optional: true
+    "@esbuild/linux-riscv64":
+      optional: true
+    "@esbuild/linux-s390x":
+      optional: true
+    "@esbuild/linux-x64":
+      optional: true
+    "@esbuild/netbsd-x64":
+      optional: true
+    "@esbuild/openbsd-x64":
+      optional: true
+    "@esbuild/sunos-x64":
+      optional: true
+    "@esbuild/win32-arm64":
+      optional: true
+    "@esbuild/win32-ia32":
+      optional: true
+    "@esbuild/win32-x64":
+      optional: true
+  bin:
+    esbuild: bin/esbuild
+  checksum: 10/1f723ec71c3aa196473bf3298316eedc3f62d523924652dfeb60701b609792f918fc60db84b420d1d8ba9bfa7d69de2fc1d3157ba47c028bdae5d507a26a3c64
+  languageName: node
+  linkType: hard
+
+"esbuild@npm:^0.20.0, esbuild@npm:^0.20.1":
+  version: 0.20.2
+  resolution: "esbuild@npm:0.20.2"
+  dependencies:
+    "@esbuild/aix-ppc64": "npm:0.20.2"
+    "@esbuild/android-arm": "npm:0.20.2"
+    "@esbuild/android-arm64": "npm:0.20.2"
+    "@esbuild/android-x64": "npm:0.20.2"
+    "@esbuild/darwin-arm64": "npm:0.20.2"
+    "@esbuild/darwin-x64": "npm:0.20.2"
+    "@esbuild/freebsd-arm64": "npm:0.20.2"
+    "@esbuild/freebsd-x64": "npm:0.20.2"
+    "@esbuild/linux-arm": "npm:0.20.2"
+    "@esbuild/linux-arm64": "npm:0.20.2"
+    "@esbuild/linux-ia32": "npm:0.20.2"
+    "@esbuild/linux-loong64": "npm:0.20.2"
+    "@esbuild/linux-mips64el": "npm:0.20.2"
+    "@esbuild/linux-ppc64": "npm:0.20.2"
+    "@esbuild/linux-riscv64": "npm:0.20.2"
+    "@esbuild/linux-s390x": "npm:0.20.2"
+    "@esbuild/linux-x64": "npm:0.20.2"
+    "@esbuild/netbsd-x64": "npm:0.20.2"
+    "@esbuild/openbsd-x64": "npm:0.20.2"
+    "@esbuild/sunos-x64": "npm:0.20.2"
+    "@esbuild/win32-arm64": "npm:0.20.2"
+    "@esbuild/win32-ia32": "npm:0.20.2"
+    "@esbuild/win32-x64": "npm:0.20.2"
   dependenciesMeta:
+    "@esbuild/aix-ppc64":
+      optional: true
     "@esbuild/android-arm":
       optional: true
     "@esbuild/android-arm64":
@@ -15754,42 +16964,42 @@ __metadata:
       optional: true
   bin:
     esbuild: bin/esbuild
-  checksum: 5d253614e50cdb6ec22095afd0c414f15688e7278a7eb4f3720a6dd1306b0909cf431e7b9437a90d065a31b1c57be60130f63fe3e8d0083b588571f31ee6ec7b
+  checksum: 10/663215ab7e599651e00d61b528a63136e1f1d397db8b9c3712540af928c9476d61da95aefa81b7a8dfc7a9fdd7616fcf08395c27be68be8c99953fb461863ce4
   languageName: node
   linkType: hard
 
 "escalade@npm:^3.1.1":
   version: 3.1.1
   resolution: "escalade@npm:3.1.1"
-  checksum: a3e2a99f07acb74b3ad4989c48ca0c3140f69f923e56d0cba0526240ee470b91010f9d39001f2a4a313841d237ede70a729e92125191ba5d21e74b106800b133
+  checksum: 10/afa618e73362576b63f6ca83c975456621095a1ed42ff068174e3f5cea48afc422814dda548c96e6ebb5333e7265140c7292abcc81bbd6ccb1757d50d3a4e182
   languageName: node
   linkType: hard
 
 "escape-html@npm:~1.0.3":
   version: 1.0.3
   resolution: "escape-html@npm:1.0.3"
-  checksum: 6213ca9ae00d0ab8bccb6d8d4e0a98e76237b2410302cf7df70aaa6591d509a2a37ce8998008cbecae8fc8ffaadf3fb0229535e6a145f3ce0b211d060decbb24
+  checksum: 10/6213ca9ae00d0ab8bccb6d8d4e0a98e76237b2410302cf7df70aaa6591d509a2a37ce8998008cbecae8fc8ffaadf3fb0229535e6a145f3ce0b211d060decbb24
   languageName: node
   linkType: hard
 
 "escape-string-regexp@npm:4.0.0, escape-string-regexp@npm:^4.0.0":
   version: 4.0.0
   resolution: "escape-string-regexp@npm:4.0.0"
-  checksum: 98b48897d93060f2322108bf29db0feba7dd774be96cd069458d1453347b25ce8682ecc39859d4bca2203cc0ab19c237bcc71755eff49a0f8d90beadeeba5cc5
+  checksum: 10/98b48897d93060f2322108bf29db0feba7dd774be96cd069458d1453347b25ce8682ecc39859d4bca2203cc0ab19c237bcc71755eff49a0f8d90beadeeba5cc5
   languageName: node
   linkType: hard
 
 "escape-string-regexp@npm:^1.0.5":
   version: 1.0.5
   resolution: "escape-string-regexp@npm:1.0.5"
-  checksum: 6092fda75c63b110c706b6a9bfde8a612ad595b628f0bd2147eea1d3406723020810e591effc7db1da91d80a71a737a313567c5abb3813e8d9c71f4aa595b410
+  checksum: 10/6092fda75c63b110c706b6a9bfde8a612ad595b628f0bd2147eea1d3406723020810e591effc7db1da91d80a71a737a313567c5abb3813e8d9c71f4aa595b410
   languageName: node
   linkType: hard
 
 "escape-string-regexp@npm:^2.0.0":
   version: 2.0.0
   resolution: "escape-string-regexp@npm:2.0.0"
-  checksum: 9f8a2d5743677c16e85c810e3024d54f0c8dea6424fad3c79ef6666e81dd0846f7437f5e729dfcdac8981bc9e5294c39b4580814d114076b8d36318f46ae4395
+  checksum: 10/9f8a2d5743677c16e85c810e3024d54f0c8dea6424fad3c79ef6666e81dd0846f7437f5e729dfcdac8981bc9e5294c39b4580814d114076b8d36318f46ae4395
   languageName: node
   linkType: hard
 
@@ -15797,17 +17007,17 @@ __metadata:
   version: 2.1.0
   resolution: "escodegen@npm:2.1.0"
   dependencies:
-    esprima: ^4.0.1
-    estraverse: ^5.2.0
-    esutils: ^2.0.2
-    source-map: ~0.6.1
+    esprima: "npm:^4.0.1"
+    estraverse: "npm:^5.2.0"
+    esutils: "npm:^2.0.2"
+    source-map: "npm:~0.6.1"
   dependenciesMeta:
     source-map:
       optional: true
   bin:
     escodegen: bin/escodegen.js
     esgenerate: bin/esgenerate.js
-  checksum: 096696407e161305cd05aebb95134ad176708bc5cb13d0dcc89a5fcbb959b8ed757e7f2591a5f8036f8f4952d4a724de0df14cd419e29212729fa6df5ce16bf6
+  checksum: 10/47719a65b2888b4586e3fa93769068b275961c13089e90d5d01a96a6e8e95871b1c3893576814c8fbf08a4a31a496f37e7b2c937cf231270f4d81de012832c7c
   languageName: node
   linkType: hard
 
@@ -15818,7 +17028,18 @@ __metadata:
     eslint: ">=7.0.0"
   bin:
     eslint-config-prettier: bin/cli.js
-  checksum: 1e94c3882c4d5e41e1dcfa2c368dbccbfe3134f6ac7d40101644d3bfbe3eb2f2ffac757f3145910b5eacf20c0e85e02b91293d3126d770cbf3dc390b3564681c
+  checksum: 10/3638144cecada897105ff9442bc85aba71c4f44d7d25b576cb34d50a207f6655f7cc55e729aad1a934a9f15e55c88e7adcbd1067d6582325fc89864c879b52f1
+  languageName: node
+  linkType: hard
+
+"eslint-config-prettier@npm:9.1.0":
+  version: 9.1.0
+  resolution: "eslint-config-prettier@npm:9.1.0"
+  peerDependencies:
+    eslint: ">=7.0.0"
+  bin:
+    eslint-config-prettier: bin/cli.js
+  checksum: 10/411e3b3b1c7aa04e3e0f20d561271b3b909014956c4dba51c878bf1a23dbb8c800a3be235c46c4732c70827276e540b6eed4636d9b09b444fd0a8e07f0fcd830
   languageName: node
   linkType: hard
 
@@ -15826,10 +17047,10 @@ __metadata:
   version: 0.3.9
   resolution: "eslint-import-resolver-node@npm:0.3.9"
   dependencies:
-    debug: ^3.2.7
-    is-core-module: ^2.13.0
-    resolve: ^1.22.4
-  checksum: 439b91271236b452d478d0522a44482e8c8540bf9df9bd744062ebb89ab45727a3acd03366a6ba2bdbcde8f9f718bab7fe8db64688aca75acf37e04eafd25e22
+    debug: "npm:^3.2.7"
+    is-core-module: "npm:^2.13.0"
+    resolve: "npm:^1.22.4"
+  checksum: 10/d52e08e1d96cf630957272e4f2644dcfb531e49dcfd1edd2e07e43369eb2ec7a7d4423d417beee613201206ff2efa4eb9a582b5825ee28802fc7c71fcd53ca83
   languageName: node
   linkType: hard
 
@@ -15837,48 +17058,48 @@ __metadata:
   version: 2.8.0
   resolution: "eslint-module-utils@npm:2.8.0"
   dependencies:
-    debug: ^3.2.7
+    debug: "npm:^3.2.7"
   peerDependenciesMeta:
     eslint:
       optional: true
-  checksum: 74c6dfea7641ebcfe174be61168541a11a14aa8d72e515f5f09af55cd0d0862686104b0524aa4b8e0ce66418a44aa38a94d2588743db5fd07a6b49ffd16921d2
+  checksum: 10/a9a7ed93eb858092e3cdc797357d4ead2b3ea06959b0eada31ab13862d46a59eb064b9cb82302214232e547980ce33618c2992f6821138a4934e65710ed9cc29
   languageName: node
   linkType: hard
 
 "eslint-plugin-import@npm:^2.26.0":
-  version: 2.29.0
-  resolution: "eslint-plugin-import@npm:2.29.0"
-  dependencies:
-    array-includes: ^3.1.7
-    array.prototype.findlastindex: ^1.2.3
-    array.prototype.flat: ^1.3.2
-    array.prototype.flatmap: ^1.3.2
-    debug: ^3.2.7
-    doctrine: ^2.1.0
-    eslint-import-resolver-node: ^0.3.9
-    eslint-module-utils: ^2.8.0
-    hasown: ^2.0.0
-    is-core-module: ^2.13.1
-    is-glob: ^4.0.3
-    minimatch: ^3.1.2
-    object.fromentries: ^2.0.7
-    object.groupby: ^1.0.1
-    object.values: ^1.1.7
-    semver: ^6.3.1
-    tsconfig-paths: ^3.14.2
+  version: 2.29.1
+  resolution: "eslint-plugin-import@npm:2.29.1"
+  dependencies:
+    array-includes: "npm:^3.1.7"
+    array.prototype.findlastindex: "npm:^1.2.3"
+    array.prototype.flat: "npm:^1.3.2"
+    array.prototype.flatmap: "npm:^1.3.2"
+    debug: "npm:^3.2.7"
+    doctrine: "npm:^2.1.0"
+    eslint-import-resolver-node: "npm:^0.3.9"
+    eslint-module-utils: "npm:^2.8.0"
+    hasown: "npm:^2.0.0"
+    is-core-module: "npm:^2.13.1"
+    is-glob: "npm:^4.0.3"
+    minimatch: "npm:^3.1.2"
+    object.fromentries: "npm:^2.0.7"
+    object.groupby: "npm:^1.0.1"
+    object.values: "npm:^1.1.7"
+    semver: "npm:^6.3.1"
+    tsconfig-paths: "npm:^3.15.0"
   peerDependencies:
     eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
-  checksum: 19ee541fb95eb7a796f3daebe42387b8d8262bbbcc4fd8a6e92f63a12035f3d2c6cb8bc0b6a70864fa14b1b50ed6b8e6eed5833e625e16cb6bb98b665beff269
+  checksum: 10/5865f05c38552145423c535326ec9a7113ab2305c7614c8b896ff905cfabc859c8805cac21e979c9f6f742afa333e6f62f812eabf891a7e8f5f0b853a32593c1
   languageName: node
   linkType: hard
 
-"eslint-plugin-jest@npm:27.4.2":
-  version: 27.4.2
-  resolution: "eslint-plugin-jest@npm:27.4.2"
+"eslint-plugin-jest@npm:27.9.0":
+  version: 27.9.0
+  resolution: "eslint-plugin-jest@npm:27.9.0"
   dependencies:
-    "@typescript-eslint/utils": ^5.10.0
+    "@typescript-eslint/utils": "npm:^5.10.0"
   peerDependencies:
-    "@typescript-eslint/eslint-plugin": ^5.0.0 || ^6.0.0
+    "@typescript-eslint/eslint-plugin": ^5.0.0 || ^6.0.0 || ^7.0.0
     eslint: ^7.0.0 || ^8.0.0
     jest: "*"
   peerDependenciesMeta:
@@ -15886,26 +17107,7 @@ __metadata:
       optional: true
     jest:
       optional: true
-  checksum: 99a8301ae00c37da97866b8b13c89a077716d2c653b26bc417d242e7300a43237c0017fd488c43966fa38585f19050facdbbc71d03ca36a1ce6f2ba930a9143e
-  languageName: node
-  linkType: hard
-
-"eslint-plugin-jsdoc@npm:46.2.6":
-  version: 46.2.6
-  resolution: "eslint-plugin-jsdoc@npm:46.2.6"
-  dependencies:
-    "@es-joy/jsdoccomment": ~0.39.4
-    are-docs-informative: ^0.0.2
-    comment-parser: 1.3.1
-    debug: ^4.3.4
-    escape-string-regexp: ^4.0.0
-    esquery: ^1.5.0
-    is-builtin-module: ^3.2.1
-    semver: ^7.5.1
-    spdx-expression-parse: ^3.0.1
-  peerDependencies:
-    eslint: ^7.0.0 || ^8.0.0
-  checksum: e082c3e88843521e121cdcad1999407a9c586bd55549b40b72865af8af853b06b7e883f80875930615796be71d79cf9d9a73d0e910b2fb67e9934f05400a34b8
+  checksum: 10/bca54347280c06c56516faea76042134dd74355c2de6c23361ba0e8736ecc01c62b144eea7eda7570ea4f4ee511c583bb8dab00d7153a1bd1740eb77b0038fd4
   languageName: node
   linkType: hard
 
@@ -15913,44 +17115,63 @@ __metadata:
   version: 46.8.2
   resolution: "eslint-plugin-jsdoc@npm:46.8.2"
   dependencies:
-    "@es-joy/jsdoccomment": ~0.40.1
-    are-docs-informative: ^0.0.2
-    comment-parser: 1.4.0
-    debug: ^4.3.4
-    escape-string-regexp: ^4.0.0
-    esquery: ^1.5.0
-    is-builtin-module: ^3.2.1
-    semver: ^7.5.4
-    spdx-expression-parse: ^3.0.1
+    "@es-joy/jsdoccomment": "npm:~0.40.1"
+    are-docs-informative: "npm:^0.0.2"
+    comment-parser: "npm:1.4.0"
+    debug: "npm:^4.3.4"
+    escape-string-regexp: "npm:^4.0.0"
+    esquery: "npm:^1.5.0"
+    is-builtin-module: "npm:^3.2.1"
+    semver: "npm:^7.5.4"
+    spdx-expression-parse: "npm:^3.0.1"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
-  checksum: ec2c435246cd45847b7c3ff3c04cc1713c658e3a6023e55577bda25c7ce1547d022aab0bf3b4920c6f792d52ff473c031d61167308e314183c15b57d23ce59c3
-  languageName: node
-  linkType: hard
-
-"eslint-plugin-jsx-a11y@npm:6.7.1":
-  version: 6.7.1
-  resolution: "eslint-plugin-jsx-a11y@npm:6.7.1"
-  dependencies:
-    "@babel/runtime": ^7.20.7
-    aria-query: ^5.1.3
-    array-includes: ^3.1.6
-    array.prototype.flatmap: ^1.3.1
-    ast-types-flow: ^0.0.7
-    axe-core: ^4.6.2
-    axobject-query: ^3.1.1
-    damerau-levenshtein: ^1.0.8
-    emoji-regex: ^9.2.2
-    has: ^1.0.3
-    jsx-ast-utils: ^3.3.3
-    language-tags: =1.0.5
-    minimatch: ^3.1.2
-    object.entries: ^1.1.6
-    object.fromentries: ^2.0.6
-    semver: ^6.3.0
+  checksum: 10/240c92f4ca3dccabf9606e5df53fe08b1c5ad99a72ec3f9fd4a166bb3ca00505f8989745cca99e95e75e7d040998e94d3100b5b42dc57a69ee9135f7cd54ae55
+  languageName: node
+  linkType: hard
+
+"eslint-plugin-jsdoc@npm:48.2.2":
+  version: 48.2.2
+  resolution: "eslint-plugin-jsdoc@npm:48.2.2"
+  dependencies:
+    "@es-joy/jsdoccomment": "npm:~0.42.0"
+    are-docs-informative: "npm:^0.0.2"
+    comment-parser: "npm:1.4.1"
+    debug: "npm:^4.3.4"
+    escape-string-regexp: "npm:^4.0.0"
+    esquery: "npm:^1.5.0"
+    is-builtin-module: "npm:^3.2.1"
+    semver: "npm:^7.6.0"
+    spdx-expression-parse: "npm:^4.0.0"
+  peerDependencies:
+    eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
+  checksum: 10/337f998b592b2722b6ccf00f5fce9b278419270fe73df9f39df6f06301d1d24cc2aca995e7617880f2d1429f10d816fd1d35a78735f26a99b7a2f1f88091549e
+  languageName: node
+  linkType: hard
+
+"eslint-plugin-jsx-a11y@npm:6.8.0":
+  version: 6.8.0
+  resolution: "eslint-plugin-jsx-a11y@npm:6.8.0"
+  dependencies:
+    "@babel/runtime": "npm:^7.23.2"
+    aria-query: "npm:^5.3.0"
+    array-includes: "npm:^3.1.7"
+    array.prototype.flatmap: "npm:^1.3.2"
+    ast-types-flow: "npm:^0.0.8"
+    axe-core: "npm:=4.7.0"
+    axobject-query: "npm:^3.2.1"
+    damerau-levenshtein: "npm:^1.0.8"
+    emoji-regex: "npm:^9.2.2"
+    es-iterator-helpers: "npm:^1.0.15"
+    hasown: "npm:^2.0.0"
+    jsx-ast-utils: "npm:^3.3.5"
+    language-tags: "npm:^1.0.9"
+    minimatch: "npm:^3.1.2"
+    object.entries: "npm:^1.1.7"
+    object.fromentries: "npm:^2.0.7"
   peerDependencies:
     eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: f166dd5fe7257c7b891c6692e6a3ede6f237a14043ae3d97581daf318fc5833ddc6b4871aa34ab7656187430170500f6d806895747ea17ecdf8231a666c3c2fd
+  checksum: 10/7a8e4498531a43d988ce2f12502a3f5ce96eacfec13f956cf927f24bb041b724fb7fc0f0306ea19d143bfc79e138bf25e25acca0822847206ac6bf5ce095e846
   languageName: node
   linkType: hard
 
@@ -15958,10 +17179,10 @@ __metadata:
   version: 7.4.0
   resolution: "eslint-plugin-lodash@npm:7.4.0"
   dependencies:
-    lodash: ^4.17.21
+    lodash: "npm:^4.17.21"
   peerDependencies:
     eslint: ">=2"
-  checksum: 7557cded64dd0e1042b420214e65ba9d6c5cb6c83c40e471db1f7d33e63584d1260c9ca9a4fded4ca7a2fe2ac2a9cdc303e072105096fa99b583101c6e7ada13
+  checksum: 10/32093e260a7be14f64e8baf86d1dc15771d302a34dc0e7c700c3b4d2c7ea684274056241c99caf86ca34813fa8b6982e09902d26242b6fc346ad3c4719557777
   languageName: node
   linkType: hard
 
@@ -15970,32 +17191,7 @@ __metadata:
   resolution: "eslint-plugin-react-hooks@npm:4.6.0"
   peerDependencies:
     eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
-  checksum: 23001801f14c1d16bf0a837ca7970d9dd94e7b560384b41db378b49b6e32dc43d6e2790de1bd737a652a86f81a08d6a91f402525061b47719328f586a57e86c3
-  languageName: node
-  linkType: hard
-
-"eslint-plugin-react@npm:7.32.2":
-  version: 7.32.2
-  resolution: "eslint-plugin-react@npm:7.32.2"
-  dependencies:
-    array-includes: ^3.1.6
-    array.prototype.flatmap: ^1.3.1
-    array.prototype.tosorted: ^1.1.1
-    doctrine: ^2.1.0
-    estraverse: ^5.3.0
-    jsx-ast-utils: ^2.4.1 || ^3.0.0
-    minimatch: ^3.1.2
-    object.entries: ^1.1.6
-    object.fromentries: ^2.0.6
-    object.hasown: ^1.1.2
-    object.values: ^1.1.6
-    prop-types: ^15.8.1
-    resolve: ^2.0.0-next.4
-    semver: ^6.3.0
-    string.prototype.matchall: ^4.0.8
-  peerDependencies:
-    eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: 2232b3b8945aa50b7773919c15cd96892acf35d2f82503667a79e2f55def90f728ed4f0e496f0f157acbe1bd4397c5615b676ae7428fe84488a544ca53feb944
+  checksum: 10/3c63134e056a6d98d66e2c475c81f904169db817e89316d14e36269919e31f4876a2588aa0e466ec8ef160465169c627fe823bfdaae7e213946584e4a165a3ac
   languageName: node
   linkType: hard
 
@@ -16003,25 +17199,53 @@ __metadata:
   version: 7.33.2
   resolution: "eslint-plugin-react@npm:7.33.2"
   dependencies:
-    array-includes: ^3.1.6
-    array.prototype.flatmap: ^1.3.1
-    array.prototype.tosorted: ^1.1.1
-    doctrine: ^2.1.0
-    es-iterator-helpers: ^1.0.12
-    estraverse: ^5.3.0
-    jsx-ast-utils: ^2.4.1 || ^3.0.0
-    minimatch: ^3.1.2
-    object.entries: ^1.1.6
-    object.fromentries: ^2.0.6
-    object.hasown: ^1.1.2
-    object.values: ^1.1.6
-    prop-types: ^15.8.1
-    resolve: ^2.0.0-next.4
-    semver: ^6.3.1
-    string.prototype.matchall: ^4.0.8
+    array-includes: "npm:^3.1.6"
+    array.prototype.flatmap: "npm:^1.3.1"
+    array.prototype.tosorted: "npm:^1.1.1"
+    doctrine: "npm:^2.1.0"
+    es-iterator-helpers: "npm:^1.0.12"
+    estraverse: "npm:^5.3.0"
+    jsx-ast-utils: "npm:^2.4.1 || ^3.0.0"
+    minimatch: "npm:^3.1.2"
+    object.entries: "npm:^1.1.6"
+    object.fromentries: "npm:^2.0.6"
+    object.hasown: "npm:^1.1.2"
+    object.values: "npm:^1.1.6"
+    prop-types: "npm:^15.8.1"
+    resolve: "npm:^2.0.0-next.4"
+    semver: "npm:^6.3.1"
+    string.prototype.matchall: "npm:^4.0.8"
   peerDependencies:
     eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: b4c3d76390b0ae6b6f9fed78170604cc2c04b48e6778a637db339e8e3911ec9ef22510b0ae77c429698151d0f1b245f282177f384105b6830e7b29b9c9b26610
+  checksum: 10/cb8c5dd5859cace330e24b7d74b9c652c0d93ef1d87957261fe1ac2975c27c918d0d5dc607f25aba4972ce74d04456f4f93883a16ac10cd598680d047fc3495d
+  languageName: node
+  linkType: hard
+
+"eslint-plugin-react@npm:7.34.1":
+  version: 7.34.1
+  resolution: "eslint-plugin-react@npm:7.34.1"
+  dependencies:
+    array-includes: "npm:^3.1.7"
+    array.prototype.findlast: "npm:^1.2.4"
+    array.prototype.flatmap: "npm:^1.3.2"
+    array.prototype.toreversed: "npm:^1.1.2"
+    array.prototype.tosorted: "npm:^1.1.3"
+    doctrine: "npm:^2.1.0"
+    es-iterator-helpers: "npm:^1.0.17"
+    estraverse: "npm:^5.3.0"
+    jsx-ast-utils: "npm:^2.4.1 || ^3.0.0"
+    minimatch: "npm:^3.1.2"
+    object.entries: "npm:^1.1.7"
+    object.fromentries: "npm:^2.0.7"
+    object.hasown: "npm:^1.1.3"
+    object.values: "npm:^1.1.7"
+    prop-types: "npm:^15.8.1"
+    resolve: "npm:^2.0.0-next.5"
+    semver: "npm:^6.3.1"
+    string.prototype.matchall: "npm:^4.0.10"
+  peerDependencies:
+    eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
+  checksum: 10/ee059971065ea7e73ab5d8728774235c7dbf7a5e9f937c3b47e97f8fa9a5a96ab511d2ae6d5ec76a7e705ca666673d454f1e75a94033720819d041827f50f9c8
   languageName: node
   linkType: hard
 
@@ -16029,125 +17253,52 @@ __metadata:
   version: 5.1.1
   resolution: "eslint-scope@npm:5.1.1"
   dependencies:
-    esrecurse: ^4.3.0
-    estraverse: ^4.1.1
-  checksum: 47e4b6a3f0cc29c7feedee6c67b225a2da7e155802c6ea13bbef4ac6b9e10c66cd2dcb987867ef176292bf4e64eccc680a49e35e9e9c669f4a02bac17e86abdb
+    esrecurse: "npm:^4.3.0"
+    estraverse: "npm:^4.1.1"
+  checksum: 10/c541ef384c92eb5c999b7d3443d80195fcafb3da335500946f6db76539b87d5826c8f2e1d23bf6afc3154ba8cd7c8e566f8dc00f1eea25fdf3afc8fb9c87b238
   languageName: node
   linkType: hard
 
-"eslint-scope@npm:^7.2.0, eslint-scope@npm:^7.2.2":
+"eslint-scope@npm:^7.2.2":
   version: 7.2.2
   resolution: "eslint-scope@npm:7.2.2"
   dependencies:
-    esrecurse: ^4.3.0
-    estraverse: ^5.2.0
-  checksum: ec97dbf5fb04b94e8f4c5a91a7f0a6dd3c55e46bfc7bbcd0e3138c3a76977570e02ed89a1810c778dcd72072ff0e9621ba1379b4babe53921d71e2e4486fda3e
+    esrecurse: "npm:^4.3.0"
+    estraverse: "npm:^5.2.0"
+  checksum: 10/5c660fb905d5883ad018a6fea2b49f3cb5b1cbf2cd4bd08e98646e9864f9bc2c74c0839bed2d292e90a4a328833accc197c8f0baed89cbe8d605d6f918465491
   languageName: node
   linkType: hard
 
-"eslint-utils@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "eslint-utils@npm:3.0.0"
+"eslint-scope@npm:^8.0.0":
+  version: 8.0.1
+  resolution: "eslint-scope@npm:8.0.1"
   dependencies:
-    eslint-visitor-keys: ^2.0.0
-  peerDependencies:
-    eslint: ">=5"
-  checksum: 0668fe02f5adab2e5a367eee5089f4c39033af20499df88fe4e6aba2015c20720404d8c3d6349b6f716b08fdf91b9da4e5d5481f265049278099c4c836ccb619
-  languageName: node
-  linkType: hard
-
-"eslint-visitor-keys@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "eslint-visitor-keys@npm:2.1.0"
-  checksum: e3081d7dd2611a35f0388bbdc2f5da60b3a3c5b8b6e928daffff7391146b434d691577aa95064c8b7faad0b8a680266bcda0a42439c18c717b80e6718d7e267d
+    esrecurse: "npm:^4.3.0"
+    estraverse: "npm:^5.2.0"
+  checksum: 10/458513863d3c79005b599f40250437bddba923f18549058ea45820a8d3d4bbc67fe292751d522a0cab69dd01fe211ffde5c1a5fc867e86f2d28727b1d61610da
   languageName: node
   linkType: hard
 
 "eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.3":
   version: 3.4.3
   resolution: "eslint-visitor-keys@npm:3.4.3"
-  checksum: 36e9ef87fca698b6fd7ca5ca35d7b2b6eeaaf106572e2f7fd31c12d3bfdaccdb587bba6d3621067e5aece31c8c3a348b93922ab8f7b2cbc6aaab5e1d89040c60
-  languageName: node
-  linkType: hard
-
-"eslint-webpack-plugin@npm:4.0.0":
-  version: 4.0.0
-  resolution: "eslint-webpack-plugin@npm:4.0.0"
-  dependencies:
-    "@types/eslint": ^8.4.10
-    jest-worker: ^29.4.1
-    micromatch: ^4.0.5
-    normalize-path: ^3.0.0
-    schema-utils: ^4.0.0
-  peerDependencies:
-    eslint: ^8.0.0
-    webpack: ^5.0.0
-  checksum: e57a1e6cd23ff72bfdcb96fbf61b8561eb0ed7793ca7922803c4ce9e2aac717168e674d5b08926e6a115126435494adb1f2c9e7cd646b7b56ab3ddf05f8ceec2
+  checksum: 10/3f357c554a9ea794b094a09bd4187e5eacd1bc0d0653c3adeb87962c548e6a1ab8f982b86963ae1337f5d976004146536dcee5d0e2806665b193fbfbf1a9231b
   languageName: node
   linkType: hard
 
-"eslint-webpack-plugin@npm:4.0.1":
-  version: 4.0.1
-  resolution: "eslint-webpack-plugin@npm:4.0.1"
+"eslint-webpack-plugin@npm:4.1.0":
+  version: 4.1.0
+  resolution: "eslint-webpack-plugin@npm:4.1.0"
   dependencies:
-    "@types/eslint": ^8.37.0
-    jest-worker: ^29.5.0
-    micromatch: ^4.0.5
-    normalize-path: ^3.0.0
-    schema-utils: ^4.0.0
+    "@types/eslint": "npm:^8.56.5"
+    jest-worker: "npm:^29.7.0"
+    micromatch: "npm:^4.0.5"
+    normalize-path: "npm:^3.0.0"
+    schema-utils: "npm:^4.2.0"
   peerDependencies:
     eslint: ^8.0.0
     webpack: ^5.0.0
-  checksum: 94fe0817fc580729dc6edc4a31c9f7dbeb97ad134c6c4192feab66aae711ed5afe35c5bc8d5e99b39626b469300196df72e631f5e53c55723adbf850765924e5
-  languageName: node
-  linkType: hard
-
-"eslint@npm:8.42.0":
-  version: 8.42.0
-  resolution: "eslint@npm:8.42.0"
-  dependencies:
-    "@eslint-community/eslint-utils": ^4.2.0
-    "@eslint-community/regexpp": ^4.4.0
-    "@eslint/eslintrc": ^2.0.3
-    "@eslint/js": 8.42.0
-    "@humanwhocodes/config-array": ^0.11.10
-    "@humanwhocodes/module-importer": ^1.0.1
-    "@nodelib/fs.walk": ^1.2.8
-    ajv: ^6.10.0
-    chalk: ^4.0.0
-    cross-spawn: ^7.0.2
-    debug: ^4.3.2
-    doctrine: ^3.0.0
-    escape-string-regexp: ^4.0.0
-    eslint-scope: ^7.2.0
-    eslint-visitor-keys: ^3.4.1
-    espree: ^9.5.2
-    esquery: ^1.4.2
-    esutils: ^2.0.2
-    fast-deep-equal: ^3.1.3
-    file-entry-cache: ^6.0.1
-    find-up: ^5.0.0
-    glob-parent: ^6.0.2
-    globals: ^13.19.0
-    graphemer: ^1.4.0
-    ignore: ^5.2.0
-    import-fresh: ^3.0.0
-    imurmurhash: ^0.1.4
-    is-glob: ^4.0.0
-    is-path-inside: ^3.0.3
-    js-yaml: ^4.1.0
-    json-stable-stringify-without-jsonify: ^1.0.1
-    levn: ^0.4.1
-    lodash.merge: ^4.6.2
-    minimatch: ^3.1.2
-    natural-compare: ^1.4.0
-    optionator: ^0.9.1
-    strip-ansi: ^6.0.1
-    strip-json-comments: ^3.1.0
-    text-table: ^0.2.0
-  bin:
-    eslint: bin/eslint.js
-  checksum: 07105397b5f2ff4064b983b8971e8c379ec04b1dfcc9d918976b3e00377189000161dac991d82ba14f8759e466091b8c71146f602930ca810c290ee3fcb3faf0
+  checksum: 10/ce887c600cb98602b2a91e8ca55e3eae008a03e9d5b5f0eaf7cebf0019efd87a30ac07d764603a5c4c2c2881b791f2a2bf129025e0ce49855a7bc011b3413e68
   languageName: node
   linkType: hard
 
@@ -16155,58 +17306,106 @@ __metadata:
   version: 8.52.0
   resolution: "eslint@npm:8.52.0"
   dependencies:
-    "@eslint-community/eslint-utils": ^4.2.0
-    "@eslint-community/regexpp": ^4.6.1
-    "@eslint/eslintrc": ^2.1.2
-    "@eslint/js": 8.52.0
-    "@humanwhocodes/config-array": ^0.11.13
-    "@humanwhocodes/module-importer": ^1.0.1
-    "@nodelib/fs.walk": ^1.2.8
-    "@ungap/structured-clone": ^1.2.0
-    ajv: ^6.12.4
-    chalk: ^4.0.0
-    cross-spawn: ^7.0.2
-    debug: ^4.3.2
-    doctrine: ^3.0.0
-    escape-string-regexp: ^4.0.0
-    eslint-scope: ^7.2.2
-    eslint-visitor-keys: ^3.4.3
-    espree: ^9.6.1
-    esquery: ^1.4.2
-    esutils: ^2.0.2
-    fast-deep-equal: ^3.1.3
-    file-entry-cache: ^6.0.1
-    find-up: ^5.0.0
-    glob-parent: ^6.0.2
-    globals: ^13.19.0
-    graphemer: ^1.4.0
-    ignore: ^5.2.0
-    imurmurhash: ^0.1.4
-    is-glob: ^4.0.0
-    is-path-inside: ^3.0.3
-    js-yaml: ^4.1.0
-    json-stable-stringify-without-jsonify: ^1.0.1
-    levn: ^0.4.1
-    lodash.merge: ^4.6.2
-    minimatch: ^3.1.2
-    natural-compare: ^1.4.0
-    optionator: ^0.9.3
-    strip-ansi: ^6.0.1
-    text-table: ^0.2.0
+    "@eslint-community/eslint-utils": "npm:^4.2.0"
+    "@eslint-community/regexpp": "npm:^4.6.1"
+    "@eslint/eslintrc": "npm:^2.1.2"
+    "@eslint/js": "npm:8.52.0"
+    "@humanwhocodes/config-array": "npm:^0.11.13"
+    "@humanwhocodes/module-importer": "npm:^1.0.1"
+    "@nodelib/fs.walk": "npm:^1.2.8"
+    "@ungap/structured-clone": "npm:^1.2.0"
+    ajv: "npm:^6.12.4"
+    chalk: "npm:^4.0.0"
+    cross-spawn: "npm:^7.0.2"
+    debug: "npm:^4.3.2"
+    doctrine: "npm:^3.0.0"
+    escape-string-regexp: "npm:^4.0.0"
+    eslint-scope: "npm:^7.2.2"
+    eslint-visitor-keys: "npm:^3.4.3"
+    espree: "npm:^9.6.1"
+    esquery: "npm:^1.4.2"
+    esutils: "npm:^2.0.2"
+    fast-deep-equal: "npm:^3.1.3"
+    file-entry-cache: "npm:^6.0.1"
+    find-up: "npm:^5.0.0"
+    glob-parent: "npm:^6.0.2"
+    globals: "npm:^13.19.0"
+    graphemer: "npm:^1.4.0"
+    ignore: "npm:^5.2.0"
+    imurmurhash: "npm:^0.1.4"
+    is-glob: "npm:^4.0.0"
+    is-path-inside: "npm:^3.0.3"
+    js-yaml: "npm:^4.1.0"
+    json-stable-stringify-without-jsonify: "npm:^1.0.1"
+    levn: "npm:^0.4.1"
+    lodash.merge: "npm:^4.6.2"
+    minimatch: "npm:^3.1.2"
+    natural-compare: "npm:^1.4.0"
+    optionator: "npm:^0.9.3"
+    strip-ansi: "npm:^6.0.1"
+    text-table: "npm:^0.2.0"
+  bin:
+    eslint: bin/eslint.js
+  checksum: 10/01784ab15351d749bc95446039ed7acd5124f7cc84acdbf98c7199272eae06212a8f3ea4a9b47e7cc54ab17ca094c3a664bbfc3002c7de27936220e278b5028a
+  languageName: node
+  linkType: hard
+
+"eslint@npm:8.57.0":
+  version: 8.57.0
+  resolution: "eslint@npm:8.57.0"
+  dependencies:
+    "@eslint-community/eslint-utils": "npm:^4.2.0"
+    "@eslint-community/regexpp": "npm:^4.6.1"
+    "@eslint/eslintrc": "npm:^2.1.4"
+    "@eslint/js": "npm:8.57.0"
+    "@humanwhocodes/config-array": "npm:^0.11.14"
+    "@humanwhocodes/module-importer": "npm:^1.0.1"
+    "@nodelib/fs.walk": "npm:^1.2.8"
+    "@ungap/structured-clone": "npm:^1.2.0"
+    ajv: "npm:^6.12.4"
+    chalk: "npm:^4.0.0"
+    cross-spawn: "npm:^7.0.2"
+    debug: "npm:^4.3.2"
+    doctrine: "npm:^3.0.0"
+    escape-string-regexp: "npm:^4.0.0"
+    eslint-scope: "npm:^7.2.2"
+    eslint-visitor-keys: "npm:^3.4.3"
+    espree: "npm:^9.6.1"
+    esquery: "npm:^1.4.2"
+    esutils: "npm:^2.0.2"
+    fast-deep-equal: "npm:^3.1.3"
+    file-entry-cache: "npm:^6.0.1"
+    find-up: "npm:^5.0.0"
+    glob-parent: "npm:^6.0.2"
+    globals: "npm:^13.19.0"
+    graphemer: "npm:^1.4.0"
+    ignore: "npm:^5.2.0"
+    imurmurhash: "npm:^0.1.4"
+    is-glob: "npm:^4.0.0"
+    is-path-inside: "npm:^3.0.3"
+    js-yaml: "npm:^4.1.0"
+    json-stable-stringify-without-jsonify: "npm:^1.0.1"
+    levn: "npm:^0.4.1"
+    lodash.merge: "npm:^4.6.2"
+    minimatch: "npm:^3.1.2"
+    natural-compare: "npm:^1.4.0"
+    optionator: "npm:^0.9.3"
+    strip-ansi: "npm:^6.0.1"
+    text-table: "npm:^0.2.0"
   bin:
     eslint: bin/eslint.js
-  checksum: fd22d1e9bd7090e31b00cbc7a3b98f3b76020a4c4641f987ae7d0c8f52e1b88c3b268bdfdabac2e1a93513e5d11339b718ff45cbff48a44c35d7e52feba510ed
+  checksum: 10/00496e218b23747a7a9817bf58b522276d0dc1f2e546dceb4eea49f9871574088f72f1f069a6b560ef537efa3a75261b8ef70e51ef19033da1cc4c86a755ef15
   languageName: node
   linkType: hard
 
-"espree@npm:^9.5.2, espree@npm:^9.6.0, espree@npm:^9.6.1":
+"espree@npm:^9.6.0, espree@npm:^9.6.1":
   version: 9.6.1
   resolution: "espree@npm:9.6.1"
   dependencies:
-    acorn: ^8.9.0
-    acorn-jsx: ^5.3.2
-    eslint-visitor-keys: ^3.4.1
-  checksum: eb8c149c7a2a77b3f33a5af80c10875c3abd65450f60b8af6db1bfcfa8f101e21c1e56a561c6dc13b848e18148d43469e7cd208506238554fb5395a9ea5a1ab9
+    acorn: "npm:^8.9.0"
+    acorn-jsx: "npm:^5.3.2"
+    eslint-visitor-keys: "npm:^3.4.1"
+  checksum: 10/255ab260f0d711a54096bdeda93adff0eadf02a6f9b92f02b323e83a2b7fc258797919437ad331efec3930475feb0142c5ecaaf3cdab4befebd336d47d3f3134
   languageName: node
   linkType: hard
 
@@ -16216,7 +17415,7 @@ __metadata:
   bin:
     esparse: ./bin/esparse.js
     esvalidate: ./bin/esvalidate.js
-  checksum: b45bc805a613dbea2835278c306b91aff6173c8d034223fa81498c77dcbce3b2931bf6006db816f62eacd9fd4ea975dfd85a5b7f3c6402cfd050d4ca3c13a628
+  checksum: 10/f1d3c622ad992421362294f7acf866aa9409fbad4eb2e8fa230bd33944ce371d32279667b242d8b8907ec2b6ad7353a717f3c0e60e748873a34a7905174bc0eb
   languageName: node
   linkType: hard
 
@@ -16224,8 +17423,8 @@ __metadata:
   version: 1.5.0
   resolution: "esquery@npm:1.5.0"
   dependencies:
-    estraverse: ^5.1.0
-  checksum: aefb0d2596c230118656cd4ec7532d447333a410a48834d80ea648b1e7b5c9bc9ed8b5e33a89cb04e487b60d622f44cf5713bf4abed7c97343edefdc84a35900
+    estraverse: "npm:^5.1.0"
+  checksum: 10/e65fcdfc1e0ff5effbf50fb4f31ea20143ae5df92bb2e4953653d8d40aa4bc148e0d06117a592ce4ea53eeab1dafdfded7ea7e22a5be87e82d73757329a1b01d
   languageName: node
   linkType: hard
 
@@ -16233,8 +17432,8 @@ __metadata:
   version: 4.3.0
   resolution: "esrecurse@npm:4.3.0"
   dependencies:
-    estraverse: ^5.2.0
-  checksum: ebc17b1a33c51cef46fdc28b958994b1dc43cd2e86237515cbc3b4e5d2be6a811b2315d0a1a4d9d340b6d2308b15322f5c8291059521cc5f4802f65e7ec32837
+    estraverse: "npm:^5.2.0"
+  checksum: 10/44ffcd89e714ea6b30143e7f119b104fc4d75e77ee913f34d59076b40ef2d21967f84e019f84e1fd0465b42cdbf725db449f232b5e47f29df29ed76194db8e16
   languageName: node
   linkType: hard
 
@@ -16243,21 +17442,21 @@ __metadata:
   resolution: "esrever@npm:0.2.0"
   bin:
     esrever: bin/esrever
-  checksum: 2404ae76ff8f04979c9e2eba4d5b1c03b07bb754f284af1115d1566c27660a3f42bb7c64e3a08deed6e7ce5aea12ffe3cb130955d619d278323ac5482300b144
+  checksum: 10/be83b1d878930bab3227881b96b1b02b534ad48f8761fd1f41c521cfe1804be16b2af0ac9312eb78d1fd80a96f7336e0ef3e8f5d571d86f631e3be4b5e2dec5b
   languageName: node
   linkType: hard
 
 "estraverse@npm:^4.1.1":
   version: 4.3.0
   resolution: "estraverse@npm:4.3.0"
-  checksum: a6299491f9940bb246124a8d44b7b7a413a8336f5436f9837aaa9330209bd9ee8af7e91a654a3545aee9c54b3308e78ee360cef1d777d37cfef77d2fa33b5827
+  checksum: 10/3f67ad02b6dbfaddd9ea459cf2b6ef4ecff9a6082a7af9d22e445b9abc082ad9ca47e1825557b293fcdae477f4714e561123e30bb6a5b2f184fb2bad4a9497eb
   languageName: node
   linkType: hard
 
 "estraverse@npm:^5.1.0, estraverse@npm:^5.2.0, estraverse@npm:^5.3.0":
   version: 5.3.0
   resolution: "estraverse@npm:5.3.0"
-  checksum: 072780882dc8416ad144f8fe199628d2b3e7bbc9989d9ed43795d2c90309a2047e6bc5979d7e2322a341163d22cfad9e21f4110597fe487519697389497e4e2b
+  checksum: 10/37cbe6e9a68014d34dbdc039f90d0baf72436809d02edffcc06ba3c2a12eb298048f877511353b130153e532aac8d68ba78430c0dd2f44806ebc7c014b01585e
   languageName: node
   linkType: hard
 
@@ -16265,73 +17464,73 @@ __metadata:
   version: 3.2.1
   resolution: "estree-to-babel@npm:3.2.1"
   dependencies:
-    "@babel/traverse": ^7.1.6
-    "@babel/types": ^7.2.0
-    c8: ^7.6.0
-  checksum: a4584d0c60b80ce41abe91b11052f5d48635e811c67839942c4ebd51aa33d9f9b156ad615f71ceae2a8260b5e3054f36d73db6d0d2a3b9951483f4b6187495c8
+    "@babel/traverse": "npm:^7.1.6"
+    "@babel/types": "npm:^7.2.0"
+    c8: "npm:^7.6.0"
+  checksum: 10/c3e51bf32606084faa6037bbaa6a69bbe73d21589c187aa70c8703c81c0ab56d2b32ae13a5d8346eb4fd575092415d62222677355acf8259d65f79c7cae5cebf
   languageName: node
   linkType: hard
 
 "estree-walker@npm:^1.0.1":
   version: 1.0.1
   resolution: "estree-walker@npm:1.0.1"
-  checksum: 7e70da539691f6db03a08e7ce94f394ce2eef4180e136d251af299d41f92fb2d28ebcd9a6e393e3728d7970aeb5358705ddf7209d52fbcb2dd4693f95dcf925f
+  checksum: 10/1cf11a0aff7613aa765dc535ed1d83e2a1986207d2353f4795df309a2c55726de3ca4948df635c09969a739dc59e8e2d69f88d3b3d2c6dfc5701257aafd1d11b
   languageName: node
   linkType: hard
 
-"estree-walker@npm:^2.0.2":
+"estree-walker@npm:^2.0.1, estree-walker@npm:^2.0.2":
   version: 2.0.2
   resolution: "estree-walker@npm:2.0.2"
-  checksum: 6151e6f9828abe2259e57f5fd3761335bb0d2ebd76dc1a01048ccee22fabcfef3c0859300f6d83ff0d1927849368775ec5a6d265dde2f6de5a1be1721cd94efc
+  checksum: 10/b02109c5d46bc2ed47de4990eef770f7457b1159a229f0999a09224d2b85ffeed2d7679cffcff90aeb4448e94b0168feb5265b209cdec29aad50a3d6e93d21e2
   languageName: node
   linkType: hard
 
 "esutils@npm:^2.0.2":
   version: 2.0.3
   resolution: "esutils@npm:2.0.3"
-  checksum: 22b5b08f74737379a840b8ed2036a5fb35826c709ab000683b092d9054e5c2a82c27818f12604bfc2a9a76b90b6834ef081edbc1c7ae30d1627012e067c6ec87
+  checksum: 10/b23acd24791db11d8f65be5ea58fd9a6ce2df5120ae2da65c16cfc5331ff59d5ac4ef50af66cd4bde238881503ec839928a0135b99a036a9cdfa22d17fd56cdb
   languageName: node
   linkType: hard
 
 "etag@npm:~1.8.1":
   version: 1.8.1
   resolution: "etag@npm:1.8.1"
-  checksum: 571aeb3dbe0f2bbd4e4fadbdb44f325fc75335cd5f6f6b6a091e6a06a9f25ed5392f0863c5442acb0646787446e816f13cbfc6edce5b07658541dff573cab1ff
+  checksum: 10/571aeb3dbe0f2bbd4e4fadbdb44f325fc75335cd5f6f6b6a091e6a06a9f25ed5392f0863c5442acb0646787446e816f13cbfc6edce5b07658541dff573cab1ff
   languageName: node
   linkType: hard
 
 "eventemitter2@npm:6.4.7":
   version: 6.4.7
   resolution: "eventemitter2@npm:6.4.7"
-  checksum: 1b36a77e139d6965ebf3a36c01fa00c089ae6b80faa1911e52888f40b3a7057b36a2cc45dcd1ad87cda3798fe7b97a0aabcbb8175a8b96092a23bb7d0f039e66
+  checksum: 10/df2a733ee3a7ac6e7f6988cebbaac5b14b46bf82f700f1ec86f9e3f3d095dba20f9aa5c29d9d62a6f50fd943f798f7f2a38c4e1b45148f6f7cec7586a8ac6881
   languageName: node
   linkType: hard
 
 "eventemitter2@npm:^6.4.3":
   version: 6.4.9
   resolution: "eventemitter2@npm:6.4.9"
-  checksum: be59577c1e1c35509c7ba0e2624335c35bbcfd9485b8a977384c6cc6759341ea1a98d3cb9dbaa5cea4fff9b687e504504e3f9c2cc1674cf3bd8a43a7c74ea3eb
+  checksum: 10/b829b1c6b11e15926b635092b5ad62b4463d1c928859831dcae606e988cf41893059e3541f5a8209d21d2f15314422ddd4d84d20830b4bf44978608d15b06b08
   languageName: node
   linkType: hard
 
 "eventemitter3@npm:5.0.1":
   version: 5.0.1
   resolution: "eventemitter3@npm:5.0.1"
-  checksum: 543d6c858ab699303c3c32e0f0f47fc64d360bf73c3daf0ac0b5079710e340d6fe9f15487f94e66c629f5f82cd1a8678d692f3dbb6f6fcd1190e1b97fcad36f8
+  checksum: 10/ac6423ec31124629c84c7077eed1e6987f6d66c31cf43c6fcbf6c87791d56317ce808d9ead483652436df171b526fc7220eccdc9f3225df334e81582c3cf7dd5
   languageName: node
   linkType: hard
 
 "eventemitter3@npm:^4.0.0, eventemitter3@npm:^4.0.4":
   version: 4.0.7
   resolution: "eventemitter3@npm:4.0.7"
-  checksum: 1875311c42fcfe9c707b2712c32664a245629b42bb0a5a84439762dd0fd637fc54d078155ea83c2af9e0323c9ac13687e03cfba79b03af9f40c89b4960099374
+  checksum: 10/8030029382404942c01d0037079f1b1bc8fed524b5849c237b80549b01e2fc49709e1d0c557fa65ca4498fc9e24cff1475ef7b855121fcc15f9d61f93e282346
   languageName: node
   linkType: hard
 
-"events@npm:^3.2.0, events@npm:^3.3.0":
+"events@npm:3.3.0, events@npm:^3.2.0, events@npm:^3.3.0":
   version: 3.3.0
   resolution: "events@npm:3.3.0"
-  checksum: f6f487ad2198aa41d878fa31452f1a3c00958f46e9019286ff4787c84aac329332ab45c9cdc8c445928fc6d7ded294b9e005a7fce9426488518017831b272780
+  checksum: 10/a3d47e285e28d324d7180f1e493961a2bbb4cad6412090e4dec114f4db1f5b560c7696ee8e758f55e23913ede856e3689cd3aa9ae13c56b5d8314cd3b3ddd1be
   languageName: node
   linkType: hard
 
@@ -16339,16 +17538,33 @@ __metadata:
   version: 4.1.0
   resolution: "execa@npm:4.1.0"
   dependencies:
-    cross-spawn: ^7.0.0
-    get-stream: ^5.0.0
-    human-signals: ^1.1.1
-    is-stream: ^2.0.0
-    merge-stream: ^2.0.0
-    npm-run-path: ^4.0.0
-    onetime: ^5.1.0
-    signal-exit: ^3.0.2
-    strip-final-newline: ^2.0.0
-  checksum: e30d298934d9c52f90f3847704fd8224e849a081ab2b517bbc02f5f7732c24e56a21f14cb96a08256deffeb2d12b2b7cb7e2b014a12fb36f8d3357e06417ed55
+    cross-spawn: "npm:^7.0.0"
+    get-stream: "npm:^5.0.0"
+    human-signals: "npm:^1.1.1"
+    is-stream: "npm:^2.0.0"
+    merge-stream: "npm:^2.0.0"
+    npm-run-path: "npm:^4.0.0"
+    onetime: "npm:^5.1.0"
+    signal-exit: "npm:^3.0.2"
+    strip-final-newline: "npm:^2.0.0"
+  checksum: 10/ed58e41fe424797f3d837c8fb622548eeb72fa03324f2676af95f806568904eb55f196127a097f87d4517cab524c169ece13e6c9e201867de57b089584864b8f
+  languageName: node
+  linkType: hard
+
+"execa@npm:5.0.0":
+  version: 5.0.0
+  resolution: "execa@npm:5.0.0"
+  dependencies:
+    cross-spawn: "npm:^7.0.3"
+    get-stream: "npm:^6.0.0"
+    human-signals: "npm:^2.1.0"
+    is-stream: "npm:^2.0.0"
+    merge-stream: "npm:^2.0.0"
+    npm-run-path: "npm:^4.0.1"
+    onetime: "npm:^5.1.2"
+    signal-exit: "npm:^3.0.3"
+    strip-final-newline: "npm:^2.0.0"
+  checksum: 10/9cc45d682725f0c5d22b5846c06be4542c1df1775332e2e62c7a6a51613e2b7f54792044266e3dcffec8b24c55ee5837349f93f489f75ce52446e3c08feaa32e
   languageName: node
   linkType: hard
 
@@ -16356,16 +17572,16 @@ __metadata:
   version: 5.1.1
   resolution: "execa@npm:5.1.1"
   dependencies:
-    cross-spawn: ^7.0.3
-    get-stream: ^6.0.0
-    human-signals: ^2.1.0
-    is-stream: ^2.0.0
-    merge-stream: ^2.0.0
-    npm-run-path: ^4.0.1
-    onetime: ^5.1.2
-    signal-exit: ^3.0.3
-    strip-final-newline: ^2.0.0
-  checksum: fba9022c8c8c15ed862847e94c252b3d946036d7547af310e344a527e59021fd8b6bb0723883ea87044dc4f0201f949046993124a42ccb0855cae5bf8c786343
+    cross-spawn: "npm:^7.0.3"
+    get-stream: "npm:^6.0.0"
+    human-signals: "npm:^2.1.0"
+    is-stream: "npm:^2.0.0"
+    merge-stream: "npm:^2.0.0"
+    npm-run-path: "npm:^4.0.1"
+    onetime: "npm:^5.1.2"
+    signal-exit: "npm:^3.0.3"
+    strip-final-newline: "npm:^2.0.0"
+  checksum: 10/8ada91f2d70f7dff702c861c2c64f21dfdc1525628f3c0454fd6f02fce65f7b958616cbd2b99ca7fa4d474e461a3d363824e91b3eb881705231abbf387470597
   languageName: node
   linkType: hard
 
@@ -16373,22 +17589,22 @@ __metadata:
   version: 4.1.1
   resolution: "executable@npm:4.1.1"
   dependencies:
-    pify: ^2.2.0
-  checksum: f01927ce59bccec804e171bf859a26e362c1f50aa9ebc69f7cafdcce3859d29d4b6267fd47237c18b0a1830614bd3f0ee14b7380d9bad18a4e7af9b5f0b6984f
+    pify: "npm:^2.2.0"
+  checksum: 10/f01927ce59bccec804e171bf859a26e362c1f50aa9ebc69f7cafdcce3859d29d4b6267fd47237c18b0a1830614bd3f0ee14b7380d9bad18a4e7af9b5f0b6984f
   languageName: node
   linkType: hard
 
 "exenv@npm:^1.2.2":
   version: 1.2.2
   resolution: "exenv@npm:1.2.2"
-  checksum: a894f3b60ab8419e0b6eec99c690a009c8276b4c90655ccaf7d28faba2de3a6b93b3d92210f9dc5efd36058d44f04098f6bbccef99859151104bfd49939904dc
+  checksum: 10/6840185e421394bcb143debb866d31d19c3e4a4bca87d2f319d68d61afff353b3c678f2eb389e3b98ab9aecbec19f6bebbdc4193984378af0a3366c498a7efc8
   languageName: node
   linkType: hard
 
 "exit@npm:^0.1.2":
   version: 0.1.2
   resolution: "exit@npm:0.1.2"
-  checksum: abc407f07a875c3961e4781dfcb743b58d6c93de9ab263f4f8c9d23bb6da5f9b7764fc773f86b43dd88030444d5ab8abcb611cb680fba8ca075362b77114bba3
+  checksum: 10/387555050c5b3c10e7a9e8df5f43194e95d7737c74532c409910e585d5554eaff34960c166643f5e23d042196529daad059c292dcf1fb61b8ca878d3677f4b87
   languageName: node
   linkType: hard
 
@@ -16396,21 +17612,28 @@ __metadata:
   version: 29.7.0
   resolution: "expect@npm:29.7.0"
   dependencies:
-    "@jest/expect-utils": ^29.7.0
-    jest-get-type: ^29.6.3
-    jest-matcher-utils: ^29.7.0
-    jest-message-util: ^29.7.0
-    jest-util: ^29.7.0
-  checksum: 9257f10288e149b81254a0fda8ffe8d54a7061cd61d7515779998b012579d2b8c22354b0eb901daf0145f347403da582f75f359f4810c007182ad3fb318b5c0c
+    "@jest/expect-utils": "npm:^29.7.0"
+    jest-get-type: "npm:^29.6.3"
+    jest-matcher-utils: "npm:^29.7.0"
+    jest-message-util: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+  checksum: 10/63f97bc51f56a491950fb525f9ad94f1916e8a014947f8d8445d3847a665b5471b768522d659f5e865db20b6c2033d2ac10f35fcbd881a4d26407a4f6f18451a
   languageName: node
   linkType: hard
 
-"expose-loader@npm:4.1.0":
-  version: 4.1.0
-  resolution: "expose-loader@npm:4.1.0"
+"exponential-backoff@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "exponential-backoff@npm:3.1.1"
+  checksum: 10/2d9bbb6473de7051f96790d5f9a678f32e60ed0aa70741dc7fdc96fec8d631124ec3374ac144387604f05afff9500f31a1d45bd9eee4cdc2e4f9ad2d9b9d5dbd
+  languageName: node
+  linkType: hard
+
+"expose-loader@npm:5.0.0":
+  version: 5.0.0
+  resolution: "expose-loader@npm:5.0.0"
   peerDependencies:
     webpack: ^5.0.0
-  checksum: 2e5f6b85302fdaadeed9c170f2bfa063faa61921f4bd2f1a032e43c5c097e14eea225a59dd7349155ff5c4322193b20d21ed5ec5fc3554f75121b299d2d6f828
+  checksum: 10/6a77c79744e41f81fd4da1eb07c319f13a097be85c4078380361fd6c69ac69576539bdd81a07d50b36b44ff1c2c5c97c1f4d2e75f0a14db391153bfb7035709b
   languageName: node
   linkType: hard
 
@@ -16418,44 +17641,44 @@ __metadata:
   version: 4.17.3
   resolution: "express@npm:4.17.3"
   dependencies:
-    accepts: ~1.3.8
-    array-flatten: 1.1.1
-    body-parser: 1.19.2
-    content-disposition: 0.5.4
-    content-type: ~1.0.4
-    cookie: 0.4.2
-    cookie-signature: 1.0.6
-    debug: 2.6.9
-    depd: ~1.1.2
-    encodeurl: ~1.0.2
-    escape-html: ~1.0.3
-    etag: ~1.8.1
-    finalhandler: ~1.1.2
-    fresh: 0.5.2
-    merge-descriptors: 1.0.1
-    methods: ~1.1.2
-    on-finished: ~2.3.0
-    parseurl: ~1.3.3
-    path-to-regexp: 0.1.7
-    proxy-addr: ~2.0.7
-    qs: 6.9.7
-    range-parser: ~1.2.1
-    safe-buffer: 5.2.1
-    send: 0.17.2
-    serve-static: 1.14.2
-    setprototypeof: 1.2.0
-    statuses: ~1.5.0
-    type-is: ~1.6.18
-    utils-merge: 1.0.1
-    vary: ~1.1.2
-  checksum: 967e53b74a37eafdf9789b9938c8df86102928b4985b1ad5e385c709deeab405a364de95ca744bc2cc5d05b5d9cc1efc69ae2ae17688a462038648d5a924bfad
+    accepts: "npm:~1.3.8"
+    array-flatten: "npm:1.1.1"
+    body-parser: "npm:1.19.2"
+    content-disposition: "npm:0.5.4"
+    content-type: "npm:~1.0.4"
+    cookie: "npm:0.4.2"
+    cookie-signature: "npm:1.0.6"
+    debug: "npm:2.6.9"
+    depd: "npm:~1.1.2"
+    encodeurl: "npm:~1.0.2"
+    escape-html: "npm:~1.0.3"
+    etag: "npm:~1.8.1"
+    finalhandler: "npm:~1.1.2"
+    fresh: "npm:0.5.2"
+    merge-descriptors: "npm:1.0.1"
+    methods: "npm:~1.1.2"
+    on-finished: "npm:~2.3.0"
+    parseurl: "npm:~1.3.3"
+    path-to-regexp: "npm:0.1.7"
+    proxy-addr: "npm:~2.0.7"
+    qs: "npm:6.9.7"
+    range-parser: "npm:~1.2.1"
+    safe-buffer: "npm:5.2.1"
+    send: "npm:0.17.2"
+    serve-static: "npm:1.14.2"
+    setprototypeof: "npm:1.2.0"
+    statuses: "npm:~1.5.0"
+    type-is: "npm:~1.6.18"
+    utils-merge: "npm:1.0.1"
+    vary: "npm:~1.1.2"
+  checksum: 10/e3970a6cccdeec918d249c9dd8b0a83bd64eb5730f33c69f449763d16155c3ff9631a3f5aa6191c7d56a6bb9d8b40fcce69c12563bf593208ec2b4902d7b8475
   languageName: node
   linkType: hard
 
 "extend@npm:^3.0.0, extend@npm:~3.0.2":
   version: 3.0.2
   resolution: "extend@npm:3.0.2"
-  checksum: a50a8309ca65ea5d426382ff09f33586527882cf532931cb08ca786ea3146c0553310bda688710ff61d7668eba9f96b923fe1420cdf56a2c3eaf30fcab87b515
+  checksum: 10/59e89e2dc798ec0f54b36d82f32a27d5f6472c53974f61ca098db5d4648430b725387b53449a34df38fd0392045434426b012f302b3cc049a6500ccf82877e4e
   languageName: node
   linkType: hard
 
@@ -16463,10 +17686,10 @@ __metadata:
   version: 3.1.0
   resolution: "external-editor@npm:3.1.0"
   dependencies:
-    chardet: ^0.7.0
-    iconv-lite: ^0.4.24
-    tmp: ^0.0.33
-  checksum: 1c2a616a73f1b3435ce04030261bed0e22d4737e14b090bb48e58865da92529c9f2b05b893de650738d55e692d071819b45e1669259b2b354bc3154d27a698c7
+    chardet: "npm:^0.7.0"
+    iconv-lite: "npm:^0.4.24"
+    tmp: "npm:^0.0.33"
+  checksum: 10/776dff1d64a1d28f77ff93e9e75421a81c062983fd1544279d0a32f563c0b18c52abbb211f31262e2827e48edef5c9dc8f960d06dd2d42d1654443b88568056b
   languageName: node
   linkType: hard
 
@@ -16474,16 +17697,16 @@ __metadata:
   version: 2.0.1
   resolution: "extract-zip@npm:2.0.1"
   dependencies:
-    "@types/yauzl": ^2.9.1
-    debug: ^4.1.1
-    get-stream: ^5.1.0
-    yauzl: ^2.10.0
+    "@types/yauzl": "npm:^2.9.1"
+    debug: "npm:^4.1.1"
+    get-stream: "npm:^5.1.0"
+    yauzl: "npm:^2.10.0"
   dependenciesMeta:
     "@types/yauzl":
       optional: true
   bin:
     extract-zip: cli.js
-  checksum: 8cbda9debdd6d6980819cc69734d874ddd71051c9fe5bde1ef307ebcedfe949ba57b004894b585f758b7c9eeeea0e3d87f2dda89b7d25320459c2c9643ebb635
+  checksum: 10/8cbda9debdd6d6980819cc69734d874ddd71051c9fe5bde1ef307ebcedfe949ba57b004894b585f758b7c9eeeea0e3d87f2dda89b7d25320459c2c9643ebb635
   languageName: node
   linkType: hard
 
@@ -16491,153 +17714,147 @@ __metadata:
   version: 1.7.0
   resolution: "extract-zip@npm:1.7.0"
   dependencies:
-    concat-stream: ^1.6.2
-    debug: ^2.6.9
-    mkdirp: ^0.5.4
-    yauzl: ^2.10.0
+    concat-stream: "npm:^1.6.2"
+    debug: "npm:^2.6.9"
+    mkdirp: "npm:^0.5.4"
+    yauzl: "npm:^2.10.0"
   bin:
     extract-zip: cli.js
-  checksum: 011bab660d738614555773d381a6ba4815d98c1cfcdcdf027e154ebcc9fc8c9ef637b3ea5c9b2144013100071ee41722ed041fc9aacc60f6198ef747cac0c073
+  checksum: 10/a9a5e2b118cc1d3b780d296f056308a8fda580bb18a26e12d6137321e5d3ef1d09355195ff187e9c7039aab42a253ac1e3996c66d031c44abca5abde6fd51393
   languageName: node
   linkType: hard
 
 "extsprintf@npm:1.3.0":
   version: 1.3.0
   resolution: "extsprintf@npm:1.3.0"
-  checksum: cee7a4a1e34cffeeec18559109de92c27517e5641991ec6bab849aa64e3081022903dd53084f2080d0d2530803aa5ee84f1e9de642c365452f9e67be8f958ce2
+  checksum: 10/26967d6c7ecbfb5bc5b7a6c43503dc5fafd9454802037e9fa1665e41f615da4ff5918bd6cb871a3beabed01a31eca1ccd0bdfb41231f50ad50d405a430f78377
   languageName: node
   linkType: hard
 
 "extsprintf@npm:^1.2.0":
   version: 1.4.1
   resolution: "extsprintf@npm:1.4.1"
-  checksum: a2f29b241914a8d2bad64363de684821b6b1609d06ae68d5b539e4de6b28659715b5bea94a7265201603713b7027d35399d10b0548f09071c5513e65e8323d33
+  checksum: 10/bfd6d55f3c0c04d826fe0213264b383c03f32825af6b1ff777f3f2dc49467e599361993568d75b7b19a8ea1bb08c8e7cd8c3d87d179ced91bb0dcf81ca6938e0
   languageName: node
   linkType: hard
 
 "fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3":
   version: 3.1.3
   resolution: "fast-deep-equal@npm:3.1.3"
-  checksum: e21a9d8d84f53493b6aa15efc9cfd53dd5b714a1f23f67fb5dc8f574af80df889b3bce25dc081887c6d25457cce704e636395333abad896ccdec03abaf1f3f9d
+  checksum: 10/e21a9d8d84f53493b6aa15efc9cfd53dd5b714a1f23f67fb5dc8f574af80df889b3bce25dc081887c6d25457cce704e636395333abad896ccdec03abaf1f3f9d
   languageName: node
   linkType: hard
 
 "fast-equals@npm:^2.0.3":
   version: 2.0.4
   resolution: "fast-equals@npm:2.0.4"
-  checksum: 1aac8a2e16b33e5e402bb5cd46be65f1ca331903c2c44e3bd75324e8472ee04f0acdbc6889e45fc28f9707ca3964f2a86789b32305d4d8b85dc97f61e446ef4b
+  checksum: 10/99b9f66cc14656ae8ad6fb5190a720003d4d623d5f22ebc141b2f75f52a51bb79d0d6034c5fc1d08cec276dcbf8a7c636d351d6a58da50a5c92dc85e555a0e32
   languageName: node
   linkType: hard
 
 "fast-equals@npm:^4.0.3":
   version: 4.0.3
   resolution: "fast-equals@npm:4.0.3"
-  checksum: 3d5935b757f9f2993e59b5164a7a9eeda0de149760495375cde14a4ed725186a7e6c1c0d58f7d42d2f91deb97f3fce1e0aad5591916ef0984278199a85c87c87
-  languageName: node
-  linkType: hard
-
-"fast-fifo@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "fast-fifo@npm:1.1.0"
-  checksum: 895f4c9873a4d5059dfa244aa0dde2b22ee563fd673d85b638869715f92244f9d6469bc0873bcb40554d28c51cbc7590045718462cfda1da503b1c6985815209
+  checksum: 10/04c1ff47b79923314e9b63ec6c81beeaa5e3b9588ec230ee6aff7ece725ff834a72abf627055055127bd0f53ae8a92cc04c3a6e187783fd932dbef743f9b13bf
   languageName: node
   linkType: hard
 
-"fast-glob@npm:3.2.7":
-  version: 3.2.7
-  resolution: "fast-glob@npm:3.2.7"
-  dependencies:
-    "@nodelib/fs.stat": ^2.0.2
-    "@nodelib/fs.walk": ^1.2.3
-    glob-parent: ^5.1.2
-    merge2: ^1.3.0
-    micromatch: ^4.0.4
-  checksum: 2f4708ff112d2b451888129fdd9a0938db88b105b0ddfd043c064e3c4d3e20eed8d7c7615f7565fee660db34ddcf08a2db1bf0ab3c00b87608e4719694642d78
+"fast-fifo@npm:^1.1.0":
+  version: 1.3.2
+  resolution: "fast-fifo@npm:1.3.2"
+  checksum: 10/6bfcba3e4df5af7be3332703b69a7898a8ed7020837ec4395bb341bd96cc3a6d86c3f6071dd98da289618cf2234c70d84b2a6f09a33dd6f988b1ff60d8e54275
   languageName: node
   linkType: hard
 
-"fast-glob@npm:^3.0.3, fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.1":
-  version: 3.3.1
-  resolution: "fast-glob@npm:3.3.1"
+"fast-glob@npm:^3.0.3, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.2":
+  version: 3.3.2
+  resolution: "fast-glob@npm:3.3.2"
   dependencies:
-    "@nodelib/fs.stat": ^2.0.2
-    "@nodelib/fs.walk": ^1.2.3
-    glob-parent: ^5.1.2
-    merge2: ^1.3.0
-    micromatch: ^4.0.4
-  checksum: b6f3add6403e02cf3a798bfbb1183d0f6da2afd368f27456010c0bc1f9640aea308243d4cb2c0ab142f618276e65ecb8be1661d7c62a7b4e5ba774b9ce5432e5
+    "@nodelib/fs.stat": "npm:^2.0.2"
+    "@nodelib/fs.walk": "npm:^1.2.3"
+    glob-parent: "npm:^5.1.2"
+    merge2: "npm:^1.3.0"
+    micromatch: "npm:^4.0.4"
+  checksum: 10/222512e9315a0efca1276af9adb2127f02105d7288fa746145bf45e2716383fb79eb983c89601a72a399a56b7c18d38ce70457c5466218c5f13fad957cee16df
   languageName: node
   linkType: hard
 
 "fast-json-parse@npm:^1.0.3":
   version: 1.0.3
   resolution: "fast-json-parse@npm:1.0.3"
-  checksum: c19117c56ec18a9aa133c8ebf450c99d1037117e47a3cb9aff91b60580ba48d0fd8484b696c26749a1b9cb4914084177b3fa9ebef72063a74dee7d9ead987603
+  checksum: 10/4ae38b50a4641d503995862e3f103ad77b865a5c8c8894923a88eb1839af35fe7d2f1a7b2cabb42481fec781fad9876cc6e37d9bf25d175da35ea47e874dafb5
   languageName: node
   linkType: hard
 
 "fast-json-patch@npm:3.1.1":
   version: 3.1.1
   resolution: "fast-json-patch@npm:3.1.1"
-  checksum: c4525b61b2471df60d4b025b4118b036d99778a93431aa44d1084218182841d82ce93056f0f3bbd731a24e6a8e69820128adf1873eb2199a26c62ef58d137833
+  checksum: 10/3e56304e1c95ad1862a50e5b3f557a74c65c0ff2ba5b15caab983b43e70e86ddbc5bc887e9f7064f0aacfd0f0435a29ab2f000fe463379e72b906486345e6671
   languageName: node
   linkType: hard
 
 "fast-json-stable-stringify@npm:2.x, fast-json-stable-stringify@npm:^2.0.0, fast-json-stable-stringify@npm:^2.1.0":
   version: 2.1.0
   resolution: "fast-json-stable-stringify@npm:2.1.0"
-  checksum: b191531e36c607977e5b1c47811158733c34ccb3bfde92c44798929e9b4154884378536d26ad90dfecd32e1ffc09c545d23535ad91b3161a27ddbb8ebe0cbecb
+  checksum: 10/2c20055c1fa43c922428f16ca8bb29f2807de63e5c851f665f7ac9790176c01c3b40335257736b299764a8d383388dabc73c8083b8e1bc3d99f0a941444ec60e
   languageName: node
   linkType: hard
 
 "fast-levenshtein@npm:^2.0.6":
   version: 2.0.6
   resolution: "fast-levenshtein@npm:2.0.6"
-  checksum: 92cfec0a8dfafd9c7a15fba8f2cc29cd0b62b85f056d99ce448bbcd9f708e18ab2764bda4dd5158364f4145a7c72788538994f0d1787b956ef0d1062b0f7c24c
+  checksum: 10/eb7e220ecf2bab5159d157350b81d01f75726a4382f5a9266f42b9150c4523b9795f7f5d9fbbbeaeac09a441b2369f05ee02db48ea938584205530fe5693cfe1
+  languageName: node
+  linkType: hard
+
+"fast-loops@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "fast-loops@npm:1.1.3"
+  checksum: 10/1bf9f102d8ed48a8c8304e2b27fd32afa65d370498db9b49d5762696ac4aa8c55593d505c142c2b7e25ca79f45207c4b25f778afd80f35df98cb2caaaf9609b7
   languageName: node
   linkType: hard
 
 "fast-memoize@npm:^2.5.2":
   version: 2.5.2
   resolution: "fast-memoize@npm:2.5.2"
-  checksum: 79fa759719ba4eac7e8c22fb3b0eb3f18f4a31e218c00b1eb4a5b53c5781921133a6b84472d59ec5a6ea8f26ad57b43cd99a350c0547ccce51489bc9a5f0b28d
+  checksum: 10/b7e2839d70607c791ffda617bb3cf7d9944bd5483be05cedbc060be1381c79093efc470215f1bc5aa666b8ecc2c9ae49e6f56ab6f45f0c1474f6628651c9959b
   languageName: node
   linkType: hard
 
 "fast-shallow-equal@npm:^1.0.0":
   version: 1.0.0
   resolution: "fast-shallow-equal@npm:1.0.0"
-  checksum: ae89318ce43c0c46410d9511ac31520d59cfe675bad3d0b1cb5f900b2d635943d788b8370437178e91ae0d0412decc394229c03e69925ade929a8c02da241610
+  checksum: 10/ae89318ce43c0c46410d9511ac31520d59cfe675bad3d0b1cb5f900b2d635943d788b8370437178e91ae0d0412decc394229c03e69925ade929a8c02da241610
   languageName: node
   linkType: hard
 
 "fast_array_intersect@npm:1.1.0":
   version: 1.1.0
   resolution: "fast_array_intersect@npm:1.1.0"
-  checksum: 3bd65089e84f3eb2b378d346b741fe333183fdf3c14166ffeafd228e40b035703d82a3a9e645c8714c2f2b399140f6f0991a1c0344b0a8cf05697a48365cbadc
+  checksum: 10/94a6d062cd5564d1614d73b23a0196b0fd1da57f16616721a8c0f2ab5cab7a5fe650b0f260bd4541143c53e9124b17ab7bd020679e69e29f39dc533df66e5e32
   languageName: node
   linkType: hard
 
 "fastest-levenshtein@npm:^1.0.12, fastest-levenshtein@npm:^1.0.16":
   version: 1.0.16
   resolution: "fastest-levenshtein@npm:1.0.16"
-  checksum: a78d44285c9e2ae2c25f3ef0f8a73f332c1247b7ea7fb4a191e6bb51aa6ee1ef0dfb3ed113616dcdc7023e18e35a8db41f61c8d88988e877cf510df8edafbc71
+  checksum: 10/ee85d33b5cef592033f70e1c13ae8624055950b4eb832435099cd56aa313d7f251b873bedbc06a517adfaff7b31756d139535991e2406967438e03a1bf1b008e
   languageName: node
   linkType: hard
 
 "fastest-stable-stringify@npm:^2.0.2":
   version: 2.0.2
   resolution: "fastest-stable-stringify@npm:2.0.2"
-  checksum: 5e2cb166c7bb6f16ac25a1e4be17f6b8d2923234c80739e12c9d21dea376b3128b2c63f90aa2aae7746cfec4dcf188d1d4eb6a964bb484ca133f17c8e9acfacc
+  checksum: 10/41bb381c0eab1419eb353658c0d78cb79a4e99ef8f53ec5d36b131f076e62ff3cdca6d22888640c55ea3382ae2c93d8629a67f5734655442976708448a8c2500
   languageName: node
   linkType: hard
 
-"fastq@npm:^1.6.0":
-  version: 1.13.0
-  resolution: "fastq@npm:1.13.0"
+"fastq@npm:^1.13.0, fastq@npm:^1.6.0":
+  version: 1.17.1
+  resolution: "fastq@npm:1.17.1"
   dependencies:
-    reusify: ^1.0.4
-  checksum: 32cf15c29afe622af187d12fc9cd93e160a0cb7c31a3bb6ace86b7dea3b28e7b72acde89c882663f307b2184e14782c6c664fa315973c03626c7d4bff070bb0b
+    reusify: "npm:^1.0.4"
+  checksum: 10/a443180068b527dd7b3a63dc7f2a47ceca2f3e97b9c00a1efe5538757e6cc4056a3526df94308075d7727561baf09ebaa5b67da8dcbddb913a021c5ae69d1f69
   languageName: node
   linkType: hard
 
@@ -16645,8 +17862,8 @@ __metadata:
   version: 1.0.4
   resolution: "fault@npm:1.0.4"
   dependencies:
-    format: ^0.2.0
-  checksum: 5ac610d8b09424e0f2fa8cf913064372f2ee7140a203a79957f73ed557c0e79b1a3d096064d7f40bde8132a69204c1fe25ec23634c05c6da2da2039cff26c4e7
+    format: "npm:^0.2.0"
+  checksum: 10/5ac610d8b09424e0f2fa8cf913064372f2ee7140a203a79957f73ed557c0e79b1a3d096064d7f40bde8132a69204c1fe25ec23634c05c6da2da2039cff26c4e7
   languageName: node
   linkType: hard
 
@@ -16654,8 +17871,8 @@ __metadata:
   version: 0.11.4
   resolution: "faye-websocket@npm:0.11.4"
   dependencies:
-    websocket-driver: ">=0.5.1"
-  checksum: d49a62caf027f871149fc2b3f3c7104dc6d62744277eb6f9f36e2d5714e847d846b9f7f0d0b7169b25a012e24a594cde11a93034b30732e4c683f20b8a5019fa
+    websocket-driver: "npm:>=0.5.1"
+  checksum: 10/22433c14c60925e424332d2794463a8da1c04848539b5f8db5fced62a7a7c71a25335a4a8b37334e3a32318835e2b87b1733d008561964121c4a0bd55f0878c3
   languageName: node
   linkType: hard
 
@@ -16663,8 +17880,8 @@ __metadata:
   version: 2.0.1
   resolution: "fb-watchman@npm:2.0.1"
   dependencies:
-    bser: 2.1.1
-  checksum: 8510230778ab3a51c27dffb1b76ef2c24fab672a42742d3c0a45c2e9d1e5f20210b1fbca33486088da4a9a3958bde96b5aec0a63aac9894b4e9df65c88b2cbd6
+    bser: "npm:2.1.1"
+  checksum: 10/9a03efc7d41ce3ca3d799d63505a1f7312caddf4e7737d39f2165bfe4872cbd4b87eccc9e6c57229ea08f14b4d7187896da31a7270b8da7a4aaa8fba2d3d1c42
   languageName: node
   linkType: hard
 
@@ -16672,22 +17889,22 @@ __metadata:
   version: 1.1.0
   resolution: "fd-slicer@npm:1.1.0"
   dependencies:
-    pend: ~1.2.0
-  checksum: c8585fd5713f4476eb8261150900d2cb7f6ff2d87f8feb306ccc8a1122efd152f1783bdb2b8dc891395744583436bfd8081d8e63ece0ec8687eeefea394d4ff2
+    pend: "npm:~1.2.0"
+  checksum: 10/db3e34fa483b5873b73f248e818f8a8b59a6427fd8b1436cd439c195fdf11e8659419404826059a642b57d18075c856d06d6a50a1413b714f12f833a9341ead3
   languageName: node
   linkType: hard
 
 "fetch-retry@npm:^5.0.2":
   version: 5.0.4
   resolution: "fetch-retry@npm:5.0.4"
-  checksum: 5c8a87f523223052b1192cc353001ceff8fe9f87926577c7e6532140c0780421cd7f7e0230e3d69f73f308b4071c4e6317b53e1058e31213dac1100c3ff96513
+  checksum: 10/1c9fd7046b5b525e18cabdc34693887f0c410a8564eebf09bb8d8625d33bec4a9fa7f39660076ef99e36a77f152b233d26742be4b3b04583f41640c063152914
   languageName: node
   linkType: hard
 
 "fflate@npm:^0.4.8":
   version: 0.4.8
   resolution: "fflate@npm:0.4.8"
-  checksum: 29d8cbe44d5e7f53e7f5a160ac7f9cc025480c7b3bfd85c5f898cbe20dfa2dad4732daa534982664bf30b35896a90af44ea33ede5d94c5ffd1b8b0c0a0a56ca2
+  checksum: 10/c0c75029bcbefd0b47cede4ad2a3698f571e38d3d93dfbb96d744c655ec3bf5e31111044c2c01fa3965109874f5be8b5a6b3686b958392693689665cbabf3ece
   languageName: node
   linkType: hard
 
@@ -16695,8 +17912,8 @@ __metadata:
   version: 3.2.0
   resolution: "figures@npm:3.2.0"
   dependencies:
-    escape-string-regexp: ^1.0.5
-  checksum: 85a6ad29e9aca80b49b817e7c89ecc4716ff14e3779d9835af554db91bac41c0f289c418923519392a1e582b4d10482ad282021330cd045bb7b80c84152f2a2b
+    escape-string-regexp: "npm:^1.0.5"
+  checksum: 10/a3bf94e001be51d3770500789157f067218d4bc681a65e1f69d482de15120bcac822dceb1a7b3803f32e4e3a61a46df44f7f2c8ba95d6375e7491502e0dd3d97
   languageName: node
   linkType: hard
 
@@ -16704,24 +17921,24 @@ __metadata:
   version: 6.0.1
   resolution: "file-entry-cache@npm:6.0.1"
   dependencies:
-    flat-cache: ^3.0.4
-  checksum: f49701feaa6314c8127c3c2f6173cfefff17612f5ed2daaafc6da13b5c91fd43e3b2a58fd0d63f9f94478a501b167615931e7200e31485e320f74a33885a9c74
+    flat-cache: "npm:^3.0.4"
+  checksum: 10/099bb9d4ab332cb93c48b14807a6918a1da87c45dce91d4b61fd40e6505d56d0697da060cb901c729c90487067d93c9243f5da3dc9c41f0358483bfdebca736b
   languageName: node
   linkType: hard
 
-"file-entry-cache@npm:^7.0.0":
-  version: 7.0.1
-  resolution: "file-entry-cache@npm:7.0.1"
+"file-entry-cache@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "file-entry-cache@npm:8.0.0"
   dependencies:
-    flat-cache: ^3.1.1
-  checksum: 3b5affa175cc246147ca394fa2ed719d306126a9259bef7b29c4024451d6671c82bf505600c37ec1398f80427c1fa91edb973b5d5228fd40590f797ce7a2401c
+    flat-cache: "npm:^4.0.0"
+  checksum: 10/afe55c4de4e0d226a23c1eae62a7219aafb390859122608a89fa4df6addf55c7fd3f1a2da6f5b41e7cdff496e4cf28bbd215d53eab5c817afa96d2b40c81bfb0
   languageName: node
   linkType: hard
 
 "file-saver@npm:2.0.5":
   version: 2.0.5
   resolution: "file-saver@npm:2.0.5"
-  checksum: c62d96e5cebc58b4bdf3ae8a60d5cf9607ad82f75f798c33a4ee63435ac2203002584d5256a2a780eda7feb5e19dc3b6351c2212e58b3f529e63d265a7cc79f7
+  checksum: 10/fbba443d9b682fec0be6676c048a7ac688b9bd33b105c02e8e1a1cb3e354ed441198dc1f15dcbc137fa044bea73f8a7549f2617e3a952fa7d96390356d54a7c3
   languageName: node
   linkType: hard
 
@@ -16729,8 +17946,8 @@ __metadata:
   version: 0.6.0
   resolution: "file-selector@npm:0.6.0"
   dependencies:
-    tslib: ^2.4.0
-  checksum: 7d051b6e5d793f3c6e2ab287ba5e7c2c6a0971bccc9d56e044c8047ba483e18f60fc0b5771c951dc707c0d15f4f36ccb4f1f1aaf385d21ec8f7700dadf8325ba
+    tslib: "npm:^2.4.0"
+  checksum: 10/6add4098ae07fd1e9050b1e8d3fd9f128680c1d6648c0676af54ace4586e6e5bfcb8fdfa45b69e9131ffd8175bf630d54a445a5facf9be244f85b99ce309183e
   languageName: node
   linkType: hard
 
@@ -16738,9 +17955,9 @@ __metadata:
   version: 2.3.0
   resolution: "file-system-cache@npm:2.3.0"
   dependencies:
-    fs-extra: 11.1.1
-    ramda: 0.29.0
-  checksum: 74afa2870a062500643d41e02d1fbd47a3f30100f9e153dec5233d59f05545f4c8ada6085629d624e043479ac28c0cafc31824f7b49a3f997efab8cc5d05bfee
+    fs-extra: "npm:11.1.1"
+    ramda: "npm:0.29.0"
+  checksum: 10/8f0530aaa8bed115ef1b00f69accde8d1311d0eaffc6e37bb0b5057b8be79e6e960823025ea3c980a58147eed0ba690b9906c2229e132f5d96158e9b635a052c
   languageName: node
   linkType: hard
 
@@ -16748,8 +17965,8 @@ __metadata:
   version: 1.0.4
   resolution: "filelist@npm:1.0.4"
   dependencies:
-    minimatch: ^5.0.1
-  checksum: a303573b0821e17f2d5e9783688ab6fbfce5d52aaac842790ae85e704a6f5e4e3538660a63183d6453834dedf1e0f19a9dadcebfa3e926c72397694ea11f5160
+    minimatch: "npm:^5.0.1"
+  checksum: 10/4b436fa944b1508b95cffdfc8176ae6947b92825483639ef1b9a89b27d82f3f8aa22b21eed471993f92709b431670d4e015b39c087d435a61e1bb04564cf51de
   languageName: node
   linkType: hard
 
@@ -16757,8 +17974,8 @@ __metadata:
   version: 7.0.1
   resolution: "fill-range@npm:7.0.1"
   dependencies:
-    to-regex-range: ^5.0.1
-  checksum: cc283f4e65b504259e64fd969bcf4def4eb08d85565e906b7d36516e87819db52029a76b6363d0f02d0d532f0033c9603b9e2d943d56ee3b0d4f7ad3328ff917
+    to-regex-range: "npm:^5.0.1"
+  checksum: 10/e260f7592fd196b4421504d3597cc76f4a1ca7a9488260d533b611fc3cefd61e9a9be1417cb82d3b01ad9f9c0ff2dbf258e1026d2445e26b0cf5148ff4250429
   languageName: node
   linkType: hard
 
@@ -16766,14 +17983,14 @@ __metadata:
   version: 1.1.2
   resolution: "finalhandler@npm:1.1.2"
   dependencies:
-    debug: 2.6.9
-    encodeurl: ~1.0.2
-    escape-html: ~1.0.3
-    on-finished: ~2.3.0
-    parseurl: ~1.3.3
-    statuses: ~1.5.0
-    unpipe: ~1.0.0
-  checksum: 617880460c5138dd7ccfd555cb5dde4d8f170f4b31b8bd51e4b646bb2946c30f7db716428a1f2882d730d2b72afb47d1f67cc487b874cb15426f95753a88965e
+    debug: "npm:2.6.9"
+    encodeurl: "npm:~1.0.2"
+    escape-html: "npm:~1.0.3"
+    on-finished: "npm:~2.3.0"
+    parseurl: "npm:~1.3.3"
+    statuses: "npm:~1.5.0"
+    unpipe: "npm:~1.0.0"
+  checksum: 10/351e99a889abf149eb3edb24568586469feeb3019f5eafb9b31e632a5ad886f12a5595a221508245e6a37da69ae866c9fb411eb541a844238e2c900f63ac1576
   languageName: node
   linkType: hard
 
@@ -16781,10 +17998,10 @@ __metadata:
   version: 2.1.0
   resolution: "find-cache-dir@npm:2.1.0"
   dependencies:
-    commondir: ^1.0.1
-    make-dir: ^2.0.0
-    pkg-dir: ^3.0.0
-  checksum: 60ad475a6da9f257df4e81900f78986ab367d4f65d33cf802c5b91e969c28a8762f098693d7a571b6e4dd4c15166c2da32ae2d18b6766a18e2071079448fdce4
+    commondir: "npm:^1.0.1"
+    make-dir: "npm:^2.0.0"
+    pkg-dir: "npm:^3.0.0"
+  checksum: 10/60ad475a6da9f257df4e81900f78986ab367d4f65d33cf802c5b91e969c28a8762f098693d7a571b6e4dd4c15166c2da32ae2d18b6766a18e2071079448fdce4
   languageName: node
   linkType: hard
 
@@ -16792,10 +18009,10 @@ __metadata:
   version: 3.3.2
   resolution: "find-cache-dir@npm:3.3.2"
   dependencies:
-    commondir: ^1.0.1
-    make-dir: ^3.0.2
-    pkg-dir: ^4.1.0
-  checksum: 1e61c2e64f5c0b1c535bd85939ae73b0e5773142713273818cc0b393ee3555fb0fd44e1a5b161b8b6c3e03e98c2fcc9c227d784850a13a90a8ab576869576817
+    commondir: "npm:^1.0.1"
+    make-dir: "npm:^3.0.2"
+    pkg-dir: "npm:^4.1.0"
+  checksum: 10/3907c2e0b15132704ed67083686cd3e68ab7d9ecc22e50ae9da20678245d488b01fa22c0e34c0544dc6edc4354c766f016c8c186a787be7c17f7cde8c5281e85
   languageName: node
   linkType: hard
 
@@ -16803,23 +18020,23 @@ __metadata:
   version: 4.0.0
   resolution: "find-cache-dir@npm:4.0.0"
   dependencies:
-    common-path-prefix: ^3.0.0
-    pkg-dir: ^7.0.0
-  checksum: 52a456a80deeb27daa3af6e06059b63bdb9cc4af4d845fc6d6229887e505ba913cd56000349caa60bc3aa59dacdb5b4c37903d4ba34c75102d83cab330b70d2f
+    common-path-prefix: "npm:^3.0.0"
+    pkg-dir: "npm:^7.0.0"
+  checksum: 10/52a456a80deeb27daa3af6e06059b63bdb9cc4af4d845fc6d6229887e505ba913cd56000349caa60bc3aa59dacdb5b4c37903d4ba34c75102d83cab330b70d2f
   languageName: node
   linkType: hard
 
 "find-parent-dir@npm:~0.3.0":
   version: 0.3.1
   resolution: "find-parent-dir@npm:0.3.1"
-  checksum: 55e722584760cfbc6611901c7ced5081345cf629e2ecd6a4f6704b13b5a1876c8d9d9db5fd4965ba23e1ecbc24a8b62af40379cfef1ffa0231719b9d924eebdd
+  checksum: 10/da726722ca86463711589820b5dd530eb1023df550bc5e55fb27103d96a54bfced2cae6e1959bd77065384da8716676952848ace76d65323c5afc32d0c3b8363
   languageName: node
   linkType: hard
 
 "find-root@npm:^1.1.0":
   version: 1.1.0
   resolution: "find-root@npm:1.1.0"
-  checksum: b2a59fe4b6c932eef36c45a048ae8f93c85640212ebe8363164814990ee20f154197505965f3f4f102efc33bfb1cbc26fd17c4a2fc739ebc51b886b137cbefaf
+  checksum: 10/caa799c976a14925ba7f31ca1a226fe73d3aa270f4f1b623fcfeb1c6e263111db4beb807d8acd31bd4d48d44c343b93688a9288dfbccca27463c36a0301b0bb9
   languageName: node
   linkType: hard
 
@@ -16827,9 +18044,9 @@ __metadata:
   version: 5.0.0
   resolution: "find-up@npm:5.0.0"
   dependencies:
-    locate-path: ^6.0.0
-    path-exists: ^4.0.0
-  checksum: 07955e357348f34660bde7920783204ff5a26ac2cafcaa28bace494027158a97b9f56faaf2d89a6106211a8174db650dd9f503f9c0d526b1202d5554a00b9095
+    locate-path: "npm:^6.0.0"
+    path-exists: "npm:^4.0.0"
+  checksum: 10/07955e357348f34660bde7920783204ff5a26ac2cafcaa28bace494027158a97b9f56faaf2d89a6106211a8174db650dd9f503f9c0d526b1202d5554a00b9095
   languageName: node
   linkType: hard
 
@@ -16837,8 +18054,8 @@ __metadata:
   version: 2.1.0
   resolution: "find-up@npm:2.1.0"
   dependencies:
-    locate-path: ^2.0.0
-  checksum: 43284fe4da09f89011f08e3c32cd38401e786b19226ea440b75386c1b12a4cb738c94969808d53a84f564ede22f732c8409e3cfc3f7fb5b5c32378ad0bbf28bd
+    locate-path: "npm:^2.0.0"
+  checksum: 10/43284fe4da09f89011f08e3c32cd38401e786b19226ea440b75386c1b12a4cb738c94969808d53a84f564ede22f732c8409e3cfc3f7fb5b5c32378ad0bbf28bd
   languageName: node
   linkType: hard
 
@@ -16846,8 +18063,8 @@ __metadata:
   version: 3.0.0
   resolution: "find-up@npm:3.0.0"
   dependencies:
-    locate-path: ^3.0.0
-  checksum: 38eba3fe7a66e4bc7f0f5a1366dc25508b7cfc349f852640e3678d26ad9a6d7e2c43eff0a472287de4a9753ef58f066a0ea892a256fa3636ad51b3fe1e17fae9
+    locate-path: "npm:^3.0.0"
+  checksum: 10/38eba3fe7a66e4bc7f0f5a1366dc25508b7cfc349f852640e3678d26ad9a6d7e2c43eff0a472287de4a9753ef58f066a0ea892a256fa3636ad51b3fe1e17fae9
   languageName: node
   linkType: hard
 
@@ -16855,9 +18072,9 @@ __metadata:
   version: 4.1.0
   resolution: "find-up@npm:4.1.0"
   dependencies:
-    locate-path: ^5.0.0
-    path-exists: ^4.0.0
-  checksum: 4c172680e8f8c1f78839486e14a43ef82e9decd0e74145f40707cc42e7420506d5ec92d9a11c22bd2c48fb0c384ea05dd30e10dd152fefeec6f2f75282a8b844
+    locate-path: "npm:^5.0.0"
+    path-exists: "npm:^4.0.0"
+  checksum: 10/4c172680e8f8c1f78839486e14a43ef82e9decd0e74145f40707cc42e7420506d5ec92d9a11c22bd2c48fb0c384ea05dd30e10dd152fefeec6f2f75282a8b844
   languageName: node
   linkType: hard
 
@@ -16865,20 +18082,31 @@ __metadata:
   version: 6.3.0
   resolution: "find-up@npm:6.3.0"
   dependencies:
-    locate-path: ^7.1.0
-    path-exists: ^5.0.0
-  checksum: 9a21b7f9244a420e54c6df95b4f6fc3941efd3c3e5476f8274eb452f6a85706e7a6a90de71353ee4f091fcb4593271a6f92810a324ec542650398f928783c280
+    locate-path: "npm:^7.1.0"
+    path-exists: "npm:^5.0.0"
+  checksum: 10/4f3bdc30d41778c647e53f4923e72de5e5fb055157031f34501c5b36c2eb59f77b997edf9cb00165c6060cda7eaa2e3da82cb6be2e61d68ad3e07c4bc4cce67e
   languageName: node
   linkType: hard
 
-"flat-cache@npm:^3.0.4, flat-cache@npm:^3.1.1":
+"flat-cache@npm:^3.0.4":
   version: 3.1.1
   resolution: "flat-cache@npm:3.1.1"
   dependencies:
-    flatted: ^3.2.9
-    keyv: ^4.5.3
-    rimraf: ^3.0.2
-  checksum: 4958cfe0f46acf84953d4e16676ef5f0d38eab3a92d532a1e8d5f88f11eea8b36d5d598070ff2aeae15f1fde18f8d7d089eefaf9db10b5a587cc1c9072325c7a
+    flatted: "npm:^3.2.9"
+    keyv: "npm:^4.5.3"
+    rimraf: "npm:^3.0.2"
+  checksum: 10/04b57c7cb4bd54f1e80a335f037bff467cc7b2479ecc015ff7e78fd41aa12777757d55836e99c7e5faca2271eb204a96bf109b4d98c36c20c3b98cf1372b5592
+  languageName: node
+  linkType: hard
+
+"flat-cache@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "flat-cache@npm:4.0.0"
+  dependencies:
+    flatted: "npm:^3.2.9"
+    keyv: "npm:^4.5.4"
+    rimraf: "npm:^5.0.5"
+  checksum: 10/344c60d397fab339b86b317d5c32dedeb31142b72160d7e17e0fc218c0a5f0aa09a48441ec8f5638e18c723c1d923a3d2a2eb922ae58656963306b42d2f47aec
   languageName: node
   linkType: hard
 
@@ -16887,41 +18115,31 @@ __metadata:
   resolution: "flat@npm:5.0.2"
   bin:
     flat: cli.js
-  checksum: 12a1536ac746db74881316a181499a78ef953632ddd28050b7a3a43c62ef5462e3357c8c29d76072bb635f147f7a9a1f0c02efef6b4be28f8db62ceb3d5c7f5d
+  checksum: 10/72479e651c15eab53e25ce04c31bab18cfaac0556505cac19221dbbe85bbb9686bc76e4d397e89e5bf516ce667dcf818f8b07e585568edba55abc2bf1f698fb5
   languageName: node
   linkType: hard
 
 "flatted@npm:^3.2.9":
   version: 3.2.9
   resolution: "flatted@npm:3.2.9"
-  checksum: f14167fbe26a9d20f6fca8d998e8f1f41df72c8e81f9f2c9d61ed2bea058248f5e1cbd05e7f88c0e5087a6a0b822a1e5e2b446e879f3cfbe0b07ba2d7f80b026
+  checksum: 10/dc2b89e46a2ebde487199de5a4fcb79e8c46f984043fea5c41dbf4661eb881fefac1c939b5bdcd8a09d7f960ec364f516970c7ec44e58ff451239c07fd3d419b
   languageName: node
   linkType: hard
 
 "flow-parser@npm:0.*":
   version: 0.203.1
   resolution: "flow-parser@npm:0.203.1"
-  checksum: ed9beb3d83e352ed646bd9c06fa2a96a0b71cfd6f83d7ccf75a7c16dbe844128bcefefa6c8d0f09ef1337d0e0a9a9c8dadfd25bb149ed657ce91ec63a0a5113b
+  checksum: 10/7e00c89a13500b53b30e0013269f4f5e04a6a03e5f99bc91bb6fe0311fbecce1094b56c05cab35fb767bfb408af262e02e7ad1fbc47161d1709d1204bbb00fee
   languageName: node
   linkType: hard
 
-"flush-write-stream@npm:^1.0.2":
-  version: 1.1.1
-  resolution: "flush-write-stream@npm:1.1.1"
-  dependencies:
-    inherits: ^2.0.3
-    readable-stream: ^2.3.6
-  checksum: 42e07747f83bcd4e799da802e621d6039787749ffd41f5517f8c4f786ee967e31ba32b09f8b28a9c6f67bd4f5346772e604202df350e8d99f4141771bae31279
-  languageName: node
-  linkType: hard
-
-"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.9":
-  version: 1.15.2
-  resolution: "follow-redirects@npm:1.15.2"
+"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.15.4":
+  version: 1.15.6
+  resolution: "follow-redirects@npm:1.15.6"
   peerDependenciesMeta:
     debug:
       optional: true
-  checksum: faa66059b66358ba65c234c2f2a37fcec029dc22775f35d9ad6abac56003268baf41e55f9ee645957b32c7d9f62baf1f0b906e68267276f54ec4b4c597c2b190
+  checksum: 10/70c7612c4cab18e546e36b991bbf8009a1a41cf85354afe04b113d1117569abf760269409cb3eb842d9f7b03d62826687086b081c566ea7b1e6613cf29030bf7
   languageName: node
   linkType: hard
 
@@ -16929,8 +18147,8 @@ __metadata:
   version: 0.3.3
   resolution: "for-each@npm:0.3.3"
   dependencies:
-    is-callable: ^1.1.3
-  checksum: 6c48ff2bc63362319c65e2edca4a8e1e3483a2fabc72fbe7feaf8c73db94fc7861bd53bc02c8a66a0c1dd709da6b04eec42e0abdd6b40ce47305ae92a25e5d28
+    is-callable: "npm:^1.1.3"
+  checksum: 10/fdac0cde1be35610bd635ae958422e8ce0cc1313e8d32ea6d34cfda7b60850940c1fd07c36456ad76bd9c24aef6ff5e03b02beb58c83af5ef6c968a64eada676
   languageName: node
   linkType: hard
 
@@ -16938,9 +18156,9 @@ __metadata:
   version: 2.0.0
   resolution: "foreground-child@npm:2.0.0"
   dependencies:
-    cross-spawn: ^7.0.0
-    signal-exit: ^3.0.2
-  checksum: f77ec9aff621abd6b754cb59e690743e7639328301fbea6ff09df27d2befaf7dd5b77cec51c32323d73a81a7d91caaf9413990d305cbe3d873eec4fe58960956
+    cross-spawn: "npm:^7.0.0"
+    signal-exit: "npm:^3.0.2"
+  checksum: 10/f36574ad8e19d69ce06fceac7d86161b863968e4ba292c14b7b40e5c464e3e9bcd7711250d33427d95cc2bb0d48cf101df9687433dbbc7fd3c7e4f595be8305e
   languageName: node
   linkType: hard
 
@@ -16948,39 +18166,62 @@ __metadata:
   version: 3.1.1
   resolution: "foreground-child@npm:3.1.1"
   dependencies:
-    cross-spawn: ^7.0.0
-    signal-exit: ^4.0.1
-  checksum: 139d270bc82dc9e6f8bc045fe2aae4001dc2472157044fdfad376d0a3457f77857fa883c1c8b21b491c6caade9a926a4bed3d3d2e8d3c9202b151a4cbbd0bcd5
+    cross-spawn: "npm:^7.0.0"
+    signal-exit: "npm:^4.0.1"
+  checksum: 10/087edd44857d258c4f73ad84cb8df980826569656f2550c341b27adf5335354393eec24ea2fabd43a253233fb27cee177ebe46bd0b7ea129c77e87cb1e9936fb
   languageName: node
   linkType: hard
 
 "forever-agent@npm:~0.6.1":
   version: 0.6.1
   resolution: "forever-agent@npm:0.6.1"
-  checksum: 766ae6e220f5fe23676bb4c6a99387cec5b7b62ceb99e10923376e27bfea72f3c3aeec2ba5f45f3f7ba65d6616965aa7c20b15002b6860833bb6e394dea546a8
+  checksum: 10/c1e1644d5e074ac063ecbc3fb8582013ef91fff0e3fa41e76db23d2f62bc6d9677aac86db950917deed4fe1fdd772df780cfaa352075f23deec9c015313afb97
+  languageName: node
+  linkType: hard
+
+"fork-ts-checker-webpack-plugin@npm:9.0.2":
+  version: 9.0.2
+  resolution: "fork-ts-checker-webpack-plugin@npm:9.0.2"
+  dependencies:
+    "@babel/code-frame": "npm:^7.16.7"
+    chalk: "npm:^4.1.2"
+    chokidar: "npm:^3.5.3"
+    cosmiconfig: "npm:^8.2.0"
+    deepmerge: "npm:^4.2.2"
+    fs-extra: "npm:^10.0.0"
+    memfs: "npm:^3.4.1"
+    minimatch: "npm:^3.0.4"
+    node-abort-controller: "npm:^3.0.1"
+    schema-utils: "npm:^3.1.1"
+    semver: "npm:^7.3.5"
+    tapable: "npm:^2.2.1"
+  peerDependencies:
+    typescript: ">3.6.0"
+    webpack: ^5.11.0
+  checksum: 10/3399ea114d9397da5e51baaa1cf2ca704f4616c8255df672889cafc2a823f77e8bf9913133852d29d676657b1d40e4a2fba8eb9fafee09e00faeda924289220e
   languageName: node
   linkType: hard
 
-"fork-ts-checker-webpack-plugin@npm:8.0.0, fork-ts-checker-webpack-plugin@npm:^8.0.0":
+"fork-ts-checker-webpack-plugin@npm:^8.0.0":
   version: 8.0.0
   resolution: "fork-ts-checker-webpack-plugin@npm:8.0.0"
   dependencies:
-    "@babel/code-frame": ^7.16.7
-    chalk: ^4.1.2
-    chokidar: ^3.5.3
-    cosmiconfig: ^7.0.1
-    deepmerge: ^4.2.2
-    fs-extra: ^10.0.0
-    memfs: ^3.4.1
-    minimatch: ^3.0.4
-    node-abort-controller: ^3.0.1
-    schema-utils: ^3.1.1
-    semver: ^7.3.5
-    tapable: ^2.2.1
+    "@babel/code-frame": "npm:^7.16.7"
+    chalk: "npm:^4.1.2"
+    chokidar: "npm:^3.5.3"
+    cosmiconfig: "npm:^7.0.1"
+    deepmerge: "npm:^4.2.2"
+    fs-extra: "npm:^10.0.0"
+    memfs: "npm:^3.4.1"
+    minimatch: "npm:^3.0.4"
+    node-abort-controller: "npm:^3.0.1"
+    schema-utils: "npm:^3.1.1"
+    semver: "npm:^7.3.5"
+    tapable: "npm:^2.2.1"
   peerDependencies:
     typescript: ">3.6.0"
     webpack: ^5.11.0
-  checksum: aad4cbc5b802e6281a2700a379837697c93ad95288468f9595219d91d9c26674736d37852bb4c4341e9122f26181e9e05fc1a362e8d029fdd88e99de7816037b
+  checksum: 10/49be81a780271b0e1f8c230c32ddb54d7e7ca562565b29811a94d5e679607b947850b133c3bb63057a71e67ac717c6c86c6d0390d1ecc885b506ae9158cf9bb5
   languageName: node
   linkType: hard
 
@@ -16988,10 +18229,10 @@ __metadata:
   version: 3.0.1
   resolution: "form-data@npm:3.0.1"
   dependencies:
-    asynckit: ^0.4.0
-    combined-stream: ^1.0.8
-    mime-types: ^2.1.12
-  checksum: b019e8d35c8afc14a2bd8a7a92fa4f525a4726b6d5a9740e8d2623c30e308fbb58dc8469f90415a856698933c8479b01646a9dff33c87cc4e76d72aedbbf860d
+    asynckit: "npm:^0.4.0"
+    combined-stream: "npm:^1.0.8"
+    mime-types: "npm:^2.1.12"
+  checksum: 10/944b40ff63b9cb1ca7a97e70f72104c548e0b0263e3e817e49919015a0d687453086259b93005389896dbffd3777cccea2e67c51f4e827590e5979b14ff91bf7
   languageName: node
   linkType: hard
 
@@ -16999,10 +18240,10 @@ __metadata:
   version: 4.0.0
   resolution: "form-data@npm:4.0.0"
   dependencies:
-    asynckit: ^0.4.0
-    combined-stream: ^1.0.8
-    mime-types: ^2.1.12
-  checksum: 01135bf8675f9d5c61ff18e2e2932f719ca4de964e3be90ef4c36aacfc7b9cb2fceb5eca0b7e0190e3383fe51c5b37f4cb80b62ca06a99aaabfcfd6ac7c9328c
+    asynckit: "npm:^0.4.0"
+    combined-stream: "npm:^1.0.8"
+    mime-types: "npm:^2.1.12"
+  checksum: 10/7264aa760a8cf09482816d8300f1b6e2423de1b02bba612a136857413fdc96d7178298ced106817655facc6b89036c6e12ae31c9eb5bdc16aabf502ae8a5d805
   languageName: node
   linkType: hard
 
@@ -17010,74 +18251,74 @@ __metadata:
   version: 2.3.3
   resolution: "form-data@npm:2.3.3"
   dependencies:
-    asynckit: ^0.4.0
-    combined-stream: ^1.0.6
-    mime-types: ^2.1.12
-  checksum: 10c1780fa13dbe1ff3100114c2ce1f9307f8be10b14bf16e103815356ff567b6be39d70fc4a40f8990b9660012dc24b0f5e1dde1b6426166eb23a445ba068ca3
+    asynckit: "npm:^0.4.0"
+    combined-stream: "npm:^1.0.6"
+    mime-types: "npm:^2.1.12"
+  checksum: 10/1b6f3ccbf4540e535887b42218a2431a3f6cfdea320119c2affa2a7a374ad8fdd1e60166fc865181f45d49b1684c3e90e7b2190d3fe016692957afb9cf0d0d02
   languageName: node
   linkType: hard
 
 "format@npm:^0.2.0":
   version: 0.2.2
   resolution: "format@npm:0.2.2"
-  checksum: 646a60e1336250d802509cf24fb801e43bd4a70a07510c816fa133aa42cdbc9c21e66e9cc0801bb183c5b031c9d68be62e7fbb6877756e52357850f92aa28799
+  checksum: 10/5f878b8fc1a672c8cbefa4f293bdd977c822862577d70d53456a48b4169ec9b51677c0c995bf62c633b4e5cd673624b7c273f57923b28735a6c0c0a72c382a4a
   languageName: node
   linkType: hard
 
 "forwarded@npm:0.2.0":
   version: 0.2.0
   resolution: "forwarded@npm:0.2.0"
-  checksum: fd27e2394d8887ebd16a66ffc889dc983fbbd797d5d3f01087c020283c0f019a7d05ee85669383d8e0d216b116d720fc0cef2f6e9b7eb9f4c90c6e0bc7fd28e6
+  checksum: 10/29ba9fd347117144e97cbb8852baae5e8b2acb7d1b591ef85695ed96f5b933b1804a7fac4a15dd09ca7ac7d0cdc104410e8102aae2dd3faa570a797ba07adb81
   languageName: node
   linkType: hard
 
-"fraction.js@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "fraction.js@npm:4.2.0"
-  checksum: 8c76a6e21dedea87109d6171a0ac77afa14205794a565d71cb10d2925f629a3922da61bf45ea52dbc30bce4d8636dc0a27213a88cbd600eab047d82f9a3a94c5
+"fraction.js@npm:^4.3.7":
+  version: 4.3.7
+  resolution: "fraction.js@npm:4.3.7"
+  checksum: 10/bb5ebcdeeffcdc37b68ead3bdfc244e68de188e0c64e9702197333c72963b95cc798883ad16adc21588088b942bca5b6a6ff4aeb1362d19f6f3b629035dc15f5
   languageName: node
   linkType: hard
 
 "framework-utils@npm:^1.1.0":
   version: 1.1.0
   resolution: "framework-utils@npm:1.1.0"
-  checksum: 01b61ead1756ad9bb0d281d22d35c83ee9df3e5e3d63b2d19eb9ca4ba9e69439b698c623ac8161df3744233331017bfd79d82c44e1e61fbb30f0ea6b48d883f9
+  checksum: 10/01b61ead1756ad9bb0d281d22d35c83ee9df3e5e3d63b2d19eb9ca4ba9e69439b698c623ac8161df3744233331017bfd79d82c44e1e61fbb30f0ea6b48d883f9
   languageName: node
   linkType: hard
 
 "fresh@npm:0.5.2":
   version: 0.5.2
   resolution: "fresh@npm:0.5.2"
-  checksum: 13ea8b08f91e669a64e3ba3a20eb79d7ca5379a81f1ff7f4310d54e2320645503cc0c78daedc93dfb6191287295f6479544a649c64d8e41a1c0fb0c221552346
+  checksum: 10/64c88e489b5d08e2f29664eb3c79c705ff9a8eb15d3e597198ef76546d4ade295897a44abb0abd2700e7ef784b2e3cbf1161e4fbf16f59129193fd1030d16da1
   languageName: node
   linkType: hard
 
 "fs-constants@npm:^1.0.0":
   version: 1.0.0
   resolution: "fs-constants@npm:1.0.0"
-  checksum: 18f5b718371816155849475ac36c7d0b24d39a11d91348cfcb308b4494824413e03572c403c86d3a260e049465518c4f0d5bd00f0371cdfcad6d4f30a85b350d
+  checksum: 10/18f5b718371816155849475ac36c7d0b24d39a11d91348cfcb308b4494824413e03572c403c86d3a260e049465518c4f0d5bd00f0371cdfcad6d4f30a85b350d
   languageName: node
   linkType: hard
 
-"fs-extra@npm:11.1.1, fs-extra@npm:^11.1.0":
+"fs-extra@npm:11.1.1, fs-extra@npm:^11.1.0, fs-extra@npm:^11.1.1":
   version: 11.1.1
   resolution: "fs-extra@npm:11.1.1"
   dependencies:
-    graceful-fs: ^4.2.0
-    jsonfile: ^6.0.1
-    universalify: ^2.0.0
-  checksum: fb883c68245b2d777fbc1f2082c9efb084eaa2bbf9fddaa366130d196c03608eebef7fb490541276429ee1ca99f317e2d73e96f5ca0999eefedf5a624ae1edfd
+    graceful-fs: "npm:^4.2.0"
+    jsonfile: "npm:^6.0.1"
+    universalify: "npm:^2.0.0"
+  checksum: 10/c4e9fabf9762a70d1403316b7faa899f3d3303c8afa765b891c2210fdeba368461e04ae1203920b64ef6a7d066a39ab8cef2160b5ce8d1011bb4368688cd9bb7
   languageName: node
   linkType: hard
 
-"fs-extra@npm:^10.0.0, fs-extra@npm:^10.1.0":
+"fs-extra@npm:^10.0.0":
   version: 10.1.0
   resolution: "fs-extra@npm:10.1.0"
   dependencies:
-    graceful-fs: ^4.2.0
-    jsonfile: ^6.0.1
-    universalify: ^2.0.0
-  checksum: dc94ab37096f813cc3ca12f0f1b5ad6744dfed9ed21e953d72530d103cea193c2f81584a39e9dee1bea36de5ee66805678c0dddc048e8af1427ac19c00fffc50
+    graceful-fs: "npm:^4.2.0"
+    jsonfile: "npm:^6.0.1"
+    universalify: "npm:^2.0.0"
+  checksum: 10/05ce2c3b59049bcb7b52001acd000e44b3c4af4ec1f8839f383ef41ec0048e3cfa7fd8a637b1bddfefad319145db89be91f4b7c1db2908205d38bf91e7d1d3b7
   languageName: node
   linkType: hard
 
@@ -17085,10 +18326,10 @@ __metadata:
   version: 8.1.0
   resolution: "fs-extra@npm:8.1.0"
   dependencies:
-    graceful-fs: ^4.2.0
-    jsonfile: ^4.0.0
-    universalify: ^0.1.0
-  checksum: bf44f0e6cea59d5ce071bba4c43ca76d216f89e402dc6285c128abc0902e9b8525135aa808adad72c9d5d218e9f4bcc63962815529ff2f684ad532172a284880
+    graceful-fs: "npm:^4.2.0"
+    jsonfile: "npm:^4.0.0"
+    universalify: "npm:^0.1.0"
+  checksum: 10/6fb12449f5349be724a138b4a7b45fe6a317d2972054517f5971959c26fbd17c0e145731a11c7324460262baa33e0a799b183ceace98f7a372c95fbb6f20f5de
   languageName: node
   linkType: hard
 
@@ -17096,11 +18337,11 @@ __metadata:
   version: 9.1.0
   resolution: "fs-extra@npm:9.1.0"
   dependencies:
-    at-least-node: ^1.0.0
-    graceful-fs: ^4.2.0
-    jsonfile: ^6.0.1
-    universalify: ^2.0.0
-  checksum: ba71ba32e0faa74ab931b7a0031d1523c66a73e225de7426e275e238e312d07313d2da2d33e34a52aa406c8763ade5712eb3ec9ba4d9edce652bcacdc29e6b20
+    at-least-node: "npm:^1.0.0"
+    graceful-fs: "npm:^4.2.0"
+    jsonfile: "npm:^6.0.1"
+    universalify: "npm:^2.0.0"
+  checksum: 10/08600da1b49552ed23dfac598c8fc909c66776dd130fea54fbcad22e330f7fcc13488bb995f6bc9ce5651aa35b65702faf616fe76370ee56f1aade55da982dca
   languageName: node
   linkType: hard
 
@@ -17108,38 +18349,47 @@ __metadata:
   version: 3.2.1
   resolution: "fs-merger@npm:3.2.1"
   dependencies:
-    broccoli-node-api: ^1.7.0
-    broccoli-node-info: ^2.1.0
-    fs-extra: ^8.0.1
-    fs-tree-diff: ^2.0.1
-    walk-sync: ^2.2.0
-  checksum: bfb93b537919407d947ab89c44f6d85f7cb58d1337aaa9115de0bd38178165b158809ad83c4f5d610d42ce0ee2f81ac7ad0ae5b573a69784b676a8a6ce506500
+    broccoli-node-api: "npm:^1.7.0"
+    broccoli-node-info: "npm:^2.1.0"
+    fs-extra: "npm:^8.0.1"
+    fs-tree-diff: "npm:^2.0.1"
+    walk-sync: "npm:^2.2.0"
+  checksum: 10/67d74fa30f4b9a156f045a25ae991fa376701f2de33e4430c3b250532e090adbe623de0fa9aa578c9beeadf164a5004bd3933e8016e8c1cbcb53a4a43efc7001
   languageName: node
   linkType: hard
 
-"fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0":
+"fs-minipass@npm:^2.0.0":
   version: 2.1.0
   resolution: "fs-minipass@npm:2.1.0"
   dependencies:
-    minipass: ^3.0.0
-  checksum: 1b8d128dae2ac6cc94230cc5ead341ba3e0efaef82dab46a33d171c044caaa6ca001364178d42069b2809c35a1c3c35079a32107c770e9ffab3901b59af8c8b1
+    minipass: "npm:^3.0.0"
+  checksum: 10/03191781e94bc9a54bd376d3146f90fe8e082627c502185dbf7b9b3032f66b0b142c1115f3b2cc5936575fc1b44845ce903dd4c21bec2a8d69f3bd56f9cee9ec
   languageName: node
   linkType: hard
 
-"fs-mkdirp-stream@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "fs-mkdirp-stream@npm:1.0.0"
+"fs-minipass@npm:^3.0.0":
+  version: 3.0.3
+  resolution: "fs-minipass@npm:3.0.3"
+  dependencies:
+    minipass: "npm:^7.0.3"
+  checksum: 10/af143246cf6884fe26fa281621d45cfe111d34b30535a475bfa38dafe343dadb466c047a924ffc7d6b7b18265df4110224ce3803806dbb07173bf2087b648d7f
+  languageName: node
+  linkType: hard
+
+"fs-mkdirp-stream@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "fs-mkdirp-stream@npm:2.0.1"
   dependencies:
-    graceful-fs: ^4.1.11
-    through2: ^2.0.3
-  checksum: 397c6a699a951bbbb9af1b0e173c9e9c0497501650dd55cb54dd6cad81e80601b6dea86c872600b25295a1502df9e240c86457a0af8c9fea46d2a4d772f73110
+    graceful-fs: "npm:^4.2.8"
+    streamx: "npm:^2.12.0"
+  checksum: 10/9fefd9fa3d6985aea0935944288bd20215779f683ec3af3c157cf4d4d4b0c546caae8219219f47a05a1df3b23f6a605fe64bee6ee14e550f1a670db67359ff27
   languageName: node
   linkType: hard
 
 "fs-monkey@npm:^1.0.4":
   version: 1.0.5
   resolution: "fs-monkey@npm:1.0.5"
-  checksum: 424b67f65b37fe66117ae2bb061f790fe6d4b609e1d160487c74b3d69fbf42f262c665ccfba32e8b5f113f96f92e9a58fcdebe42d5f6649bdfc72918093a3119
+  checksum: 10/7fcdf9267006800d61f1722cf9fa92ed8be8b3ed86614f6d43ab6f87a30f13bc784020465e20728ca4ea65ea7377bfcdbde52b54bf8c3cc2f43a6d62270ebf64
   languageName: node
   linkType: hard
 
@@ -17147,45 +18397,45 @@ __metadata:
   version: 2.0.1
   resolution: "fs-tree-diff@npm:2.0.1"
   dependencies:
-    "@types/symlink-or-copy": ^1.2.0
-    heimdalljs-logger: ^0.1.7
-    object-assign: ^4.1.0
-    path-posix: ^1.0.0
-    symlink-or-copy: ^1.1.8
-  checksum: ea7927af283b1db3994b98e4c636ed7f8ecfcfb39dc205b57841b22f8ebf39e97649dca07b16ae2e421b000d81b6d96449f32d4dc78742ccb22dfd19db160a45
+    "@types/symlink-or-copy": "npm:^1.2.0"
+    heimdalljs-logger: "npm:^0.1.7"
+    object-assign: "npm:^4.1.0"
+    path-posix: "npm:^1.0.0"
+    symlink-or-copy: "npm:^1.1.8"
+  checksum: 10/c1e9e77b8ae933771d69b24b91c6cf58547dc4ce4c2805179423a3c4dc1d155459094b2c603f7015e3af138055db31e351424b3ef0af6d85d53b83b3dd49db29
   languageName: node
   linkType: hard
 
 "fs.realpath@npm:^1.0.0":
   version: 1.0.0
   resolution: "fs.realpath@npm:1.0.0"
-  checksum: 99ddea01a7e75aa276c250a04eedeffe5662bce66c65c07164ad6264f9de18fb21be9433ead460e54cff20e31721c811f4fb5d70591799df5f85dce6d6746fd0
+  checksum: 10/e703107c28e362d8d7b910bbcbfd371e640a3bb45ae157a362b5952c0030c0b6d4981140ec319b347bce7adc025dd7813da1ff908a945ac214d64f5402a51b96
   languageName: node
   linkType: hard
 
-"fsevents@npm:^2.3.2, fsevents@npm:~2.3.2":
+"fsevents@npm:2.3.2, fsevents@npm:^2.3.2, fsevents@npm:~2.3.2":
   version: 2.3.2
   resolution: "fsevents@npm:2.3.2"
   dependencies:
-    node-gyp: latest
-  checksum: 97ade64e75091afee5265e6956cb72ba34db7819b4c3e94c431d4be2b19b8bb7a2d4116da417950c3425f17c8fe693d25e20212cac583ac1521ad066b77ae31f
+    node-gyp: "npm:latest"
+  checksum: 10/6b5b6f5692372446ff81cf9501c76e3e0459a4852b3b5f1fc72c103198c125a6b8c72f5f166bdd76ffb2fca261e7f6ee5565daf80dca6e571e55bcc589cc1256
   conditions: os=darwin
   languageName: node
   linkType: hard
 
-"fsevents@patch:fsevents@^2.3.2#~builtin<compat/fsevents>, fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>":
+"fsevents@patch:fsevents@npm%3A2.3.2#optional!builtin<compat/fsevents>, fsevents@patch:fsevents@npm%3A^2.3.2#optional!builtin<compat/fsevents>, fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin<compat/fsevents>":
   version: 2.3.2
-  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=df0bf1"
+  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#optional!builtin<compat/fsevents>::version=2.3.2&hash=df0bf1"
   dependencies:
-    node-gyp: latest
+    node-gyp: "npm:latest"
   conditions: os=darwin
   languageName: node
   linkType: hard
 
-"function-bind@npm:^1.1.1, function-bind@npm:^1.1.2":
+"function-bind@npm:^1.1.2":
   version: 1.1.2
   resolution: "function-bind@npm:1.1.2"
-  checksum: 2b0ff4ce708d99715ad14a6d1f894e2a83242e4a52ccfcefaee5e40050562e5f6dafc1adbb4ce2d4ab47279a45dc736ab91ea5042d843c3c092820dfe032efb1
+  checksum: 10/185e20d20f10c8d661d59aac0f3b63b31132d492e1b11fcc2a93cb2c47257ebaee7407c38513efd2b35cafdf972d9beb2ea4593c1e0f3bf8f2744836928d7454
   languageName: node
   linkType: hard
 
@@ -17193,18 +18443,42 @@ __metadata:
   version: 1.1.6
   resolution: "function.prototype.name@npm:1.1.6"
   dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-    functions-have-names: ^1.2.3
-  checksum: 7a3f9bd98adab09a07f6e1f03da03d3f7c26abbdeaeee15223f6c04a9fb5674792bdf5e689dac19b97ac71de6aad2027ba3048a9b883aa1b3173eed6ab07f479
+    call-bind: "npm:^1.0.2"
+    define-properties: "npm:^1.2.0"
+    es-abstract: "npm:^1.22.1"
+    functions-have-names: "npm:^1.2.3"
+  checksum: 10/4d40be44d4609942e4e90c4fff77a811fa936f4985d92d2abfcf44f673ba344e2962bf223a33101f79c1a056465f36f09b072b9c289d7660ca554a12491cd5a2
   languageName: node
   linkType: hard
 
 "functions-have-names@npm:^1.2.3":
   version: 1.2.3
   resolution: "functions-have-names@npm:1.2.3"
-  checksum: c3f1f5ba20f4e962efb71344ce0a40722163e85bee2101ce25f88214e78182d2d2476aa85ef37950c579eb6cf6ee811c17b3101bb84004bb75655f3e33f3fdb5
+  checksum: 10/0ddfd3ed1066a55984aaecebf5419fbd9344a5c38dd120ffb0739fac4496758dcf371297440528b115e4367fc46e3abc86a2cc0ff44612181b175ae967a11a05
+  languageName: node
+  linkType: hard
+
+"fuse.js@npm:^6.6.2":
+  version: 6.6.2
+  resolution: "fuse.js@npm:6.6.2"
+  checksum: 10/4768725963ee07dacfcb4abb001a12ea5e6e44c95d4e0918fcbfe0469107c5ad3ece2f1930396eb6c210383edf4c14ca083b91a2fc54950c5d021935a63d89de
+  languageName: node
+  linkType: hard
+
+"gauge@npm:^3.0.0":
+  version: 3.0.2
+  resolution: "gauge@npm:3.0.2"
+  dependencies:
+    aproba: "npm:^1.0.3 || ^2.0.0"
+    color-support: "npm:^1.1.2"
+    console-control-strings: "npm:^1.0.0"
+    has-unicode: "npm:^2.0.1"
+    object-assign: "npm:^4.1.1"
+    signal-exit: "npm:^3.0.0"
+    string-width: "npm:^4.2.3"
+    strip-ansi: "npm:^6.0.1"
+    wide-align: "npm:^1.1.2"
+  checksum: 10/46df086451672a5fecd58f7ec86da74542c795f8e00153fbef2884286ce0e86653c3eb23be2d0abb0c4a82b9b2a9dec3b09b6a1cf31c28085fa0376599a26589
   languageName: node
   linkType: hard
 
@@ -17212,15 +18486,15 @@ __metadata:
   version: 4.0.4
   resolution: "gauge@npm:4.0.4"
   dependencies:
-    aproba: ^1.0.3 || ^2.0.0
-    color-support: ^1.1.3
-    console-control-strings: ^1.1.0
-    has-unicode: ^2.0.1
-    signal-exit: ^3.0.7
-    string-width: ^4.2.3
-    strip-ansi: ^6.0.1
-    wide-align: ^1.1.5
-  checksum: 788b6bfe52f1dd8e263cda800c26ac0ca2ff6de0b6eee2fe0d9e3abf15e149b651bd27bf5226be10e6e3edb5c4e5d5985a5a1a98137e7a892f75eff76467ad2d
+    aproba: "npm:^1.0.3 || ^2.0.0"
+    color-support: "npm:^1.1.3"
+    console-control-strings: "npm:^1.1.0"
+    has-unicode: "npm:^2.0.1"
+    signal-exit: "npm:^3.0.7"
+    string-width: "npm:^4.2.3"
+    strip-ansi: "npm:^6.0.1"
+    wide-align: "npm:^1.1.5"
+  checksum: 10/09535dd53b5ced6a34482b1fa9f3929efdeac02f9858569cde73cef3ed95050e0f3d095706c1689614059898924b7a74aa14042f51381a1ccc4ee5c29d2389c4
   languageName: node
   linkType: hard
 
@@ -17228,22 +18502,22 @@ __metadata:
   version: 2.7.4
   resolution: "gauge@npm:2.7.4"
   dependencies:
-    aproba: ^1.0.3
-    console-control-strings: ^1.0.0
-    has-unicode: ^2.0.0
-    object-assign: ^4.1.0
-    signal-exit: ^3.0.0
-    string-width: ^1.0.1
-    strip-ansi: ^3.0.1
-    wide-align: ^1.1.0
-  checksum: a89b53cee65579b46832e050b5f3a79a832cc422c190de79c6b8e2e15296ab92faddde6ddf2d376875cbba2b043efa99b9e1ed8124e7365f61b04e3cee9d40ee
+    aproba: "npm:^1.0.3"
+    console-control-strings: "npm:^1.0.0"
+    has-unicode: "npm:^2.0.0"
+    object-assign: "npm:^4.1.0"
+    signal-exit: "npm:^3.0.0"
+    string-width: "npm:^1.0.1"
+    strip-ansi: "npm:^3.0.1"
+    wide-align: "npm:^1.1.0"
+  checksum: 10/0db20a7def238f0e8eab50226247e1f94f1446ab24700eab0a56e5ccf23ce85ccf8f0c0c462112b89beb964431b1edabd3f7b31f1f6d5f62294c453594523993
   languageName: node
   linkType: hard
 
 "gensync@npm:^1.0.0-beta.2":
   version: 1.0.0-beta.2
   resolution: "gensync@npm:1.0.0-beta.2"
-  checksum: a7437e58c6be12aa6c90f7730eac7fa9833dc78872b4ad2963d2031b00a3367a93f98aec75f9aaac7220848e4026d67a8655e870b24f20a543d103c0d65952ec
+  checksum: 10/17d8333460204fbf1f9160d067e1e77f908a5447febb49424b8ab043026049835c9ef3974445c57dbd39161f4d2b04356d7de12b2eecaa27a7a7ea7d871cbedd
   languageName: node
   linkType: hard
 
@@ -17251,92 +18525,100 @@ __metadata:
   version: 2.0.7
   resolution: "geotiff@npm:2.0.7"
   dependencies:
-    "@petamoriken/float16": ^3.4.7
-    lerc: ^3.0.0
-    pako: ^2.0.4
-    parse-headers: ^2.0.2
-    quick-lru: ^6.1.1
-    web-worker: ^1.2.0
-    xml-utils: ^1.0.2
-  checksum: d64bd3c3cf0342368899fe693059520e003a6610515760e6afe1cb4191397e5fc180591f2aa75729bb0283190eda0574e10e3da0241be2556cbedc5c50222f69
+    "@petamoriken/float16": "npm:^3.4.7"
+    lerc: "npm:^3.0.0"
+    pako: "npm:^2.0.4"
+    parse-headers: "npm:^2.0.2"
+    quick-lru: "npm:^6.1.1"
+    web-worker: "npm:^1.2.0"
+    xml-utils: "npm:^1.0.2"
+  checksum: 10/7d309ef9e7fee0aef39117ef045cf35d30be91621e0df643cd86d363519907706bdc6e0f6f4dc2ebcc0ce085eab18fd5801aca9c162606cdd293c7b616070d1a
   languageName: node
   linkType: hard
 
-"gesto@npm:^1.15.1, gesto@npm:^1.19.1":
-  version: 1.19.1
-  resolution: "gesto@npm:1.19.1"
+"gesto@npm:^1.19.3, gesto@npm:^1.19.4":
+  version: 1.19.4
+  resolution: "gesto@npm:1.19.4"
   dependencies:
-    "@daybrush/utils": ^1.13.0
-    "@scena/event-emitter": ^1.0.2
-  checksum: 3f341539cb529036d96b57855ed255a76902d6c0499fc1b193c5357604a64ef376739b3b44dd6324ab797128c8fe0a7f1ac651b6f3b51712a6fd8579601eab87
+    "@daybrush/utils": "npm:^1.13.0"
+    "@scena/event-emitter": "npm:^1.0.2"
+  checksum: 10/b0d67ea393a7bd5f19afd43537ff64241cc1aad68e5a401426e0cf49253259143471e61d6bdc01d71404370b08ca98e35a9bcbc0d9cccd7e6ddcdd6bbec49d58
   languageName: node
   linkType: hard
 
 "get-caller-file@npm:^2.0.5":
   version: 2.0.5
   resolution: "get-caller-file@npm:2.0.5"
-  checksum: b9769a836d2a98c3ee734a88ba712e62703f1df31b94b784762c433c27a386dd6029ff55c2a920c392e33657d80191edbf18c61487e198844844516f843496b9
+  checksum: 10/b9769a836d2a98c3ee734a88ba712e62703f1df31b94b784762c433c27a386dd6029ff55c2a920c392e33657d80191edbf18c61487e198844844516f843496b9
   languageName: node
   linkType: hard
 
 "get-document@npm:1":
   version: 1.0.0
   resolution: "get-document@npm:1.0.0"
-  checksum: b181cc60e41333c3b509be6daa69ae611e55f6ab1324d876c6df4c0066ff47af05fbb339a8a68d83ee13b12c6f0908e7d38fe84459bb24fee6ae6db7138a6d37
+  checksum: 10/94312db44ea9d070cca8cc14272582d04c7638494d6b5c9c0d6f1d949ef2605b4102ee52f0ded11e571357aba45e9fcc98a5b0467d61e4943a66002167eb6e7a
   languageName: node
   linkType: hard
 
-"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0, get-intrinsic@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "get-intrinsic@npm:1.2.1"
+"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.3, get-intrinsic@npm:^1.2.4":
+  version: 1.2.4
+  resolution: "get-intrinsic@npm:1.2.4"
   dependencies:
-    function-bind: ^1.1.1
-    has: ^1.0.3
-    has-proto: ^1.0.1
-    has-symbols: ^1.0.3
-  checksum: 5b61d88552c24b0cf6fa2d1b3bc5459d7306f699de060d76442cce49a4721f52b8c560a33ab392cf5575b7810277d54ded9d4d39a1ea61855619ebc005aa7e5f
+    es-errors: "npm:^1.3.0"
+    function-bind: "npm:^1.1.2"
+    has-proto: "npm:^1.0.1"
+    has-symbols: "npm:^1.0.3"
+    hasown: "npm:^2.0.0"
+  checksum: 10/85bbf4b234c3940edf8a41f4ecbd4e25ce78e5e6ad4e24ca2f77037d983b9ef943fd72f00f3ee97a49ec622a506b67db49c36246150377efcda1c9eb03e5f06d
   languageName: node
   linkType: hard
 
 "get-nonce@npm:^1.0.0":
   version: 1.0.1
   resolution: "get-nonce@npm:1.0.1"
-  checksum: e2614e43b4694c78277bb61b0f04583d45786881289285c73770b07ded246a98be7e1f78b940c80cbe6f2b07f55f0b724e6db6fd6f1bcbd1e8bdac16521074ed
+  checksum: 10/ad5104871d114a694ecc506a2d406e2331beccb961fe1e110dc25556b38bcdbf399a823a8a375976cd8889668156a9561e12ebe3fa6a4c6ba169c8466c2ff868
   languageName: node
   linkType: hard
 
 "get-npm-tarball-url@npm:^2.0.3":
   version: 2.0.3
   resolution: "get-npm-tarball-url@npm:2.0.3"
-  checksum: 8ad48a6f1126697665e12ebf053e0d1c3b15b3c4f29ea6c458387ac68d044ea1c08f0f2eb5c0fe35447fdd2da4f2fb5c9882feb5a2ea195c773f94e762c9b886
+  checksum: 10/8ad48a6f1126697665e12ebf053e0d1c3b15b3c4f29ea6c458387ac68d044ea1c08f0f2eb5c0fe35447fdd2da4f2fb5c9882feb5a2ea195c773f94e762c9b886
   languageName: node
   linkType: hard
 
 "get-package-type@npm:^0.1.0":
   version: 0.1.0
   resolution: "get-package-type@npm:0.1.0"
-  checksum: bba0811116d11e56d702682ddef7c73ba3481f114590e705fc549f4d868972263896af313c57a25c076e3c0d567e11d919a64ba1b30c879be985fc9d44f96148
+  checksum: 10/bba0811116d11e56d702682ddef7c73ba3481f114590e705fc549f4d868972263896af313c57a25c076e3c0d567e11d919a64ba1b30c879be985fc9d44f96148
   languageName: node
   linkType: hard
 
-"get-pkg-repo@npm:^4.0.0":
+"get-pkg-repo@npm:^4.2.1":
   version: 4.2.1
   resolution: "get-pkg-repo@npm:4.2.1"
   dependencies:
-    "@hutson/parse-repository-url": ^3.0.0
-    hosted-git-info: ^4.0.0
-    through2: ^2.0.0
-    yargs: ^16.2.0
+    "@hutson/parse-repository-url": "npm:^3.0.0"
+    hosted-git-info: "npm:^4.0.0"
+    through2: "npm:^2.0.0"
+    yargs: "npm:^16.2.0"
   bin:
     get-pkg-repo: src/cli.js
-  checksum: 5abf169137665e45b09a857b33ad2fdcf2f4a09f0ecbd0ebdd789a7ce78c39186a21f58621127eb724d2d4a3a7ee8e6bd4ac7715efda01ad5200665afc218e0d
+  checksum: 10/033225cf7cdf3f61885f45c492975f412268cf9f3ec68cc42df9af1bec54cf0b0c5ddb7391a6dc973361e7e10df9d432cca0050892ba8856bc50413e0741804f
   languageName: node
   linkType: hard
 
-"get-port@npm:^5.1.1":
+"get-port@npm:5.1.1, get-port@npm:^5.1.1":
   version: 5.1.1
   resolution: "get-port@npm:5.1.1"
-  checksum: 0162663ffe5c09e748cd79d97b74cd70e5a5c84b760a475ce5767b357fb2a57cb821cee412d646aa8a156ed39b78aab88974eddaa9e5ee926173c036c0713787
+  checksum: 10/0162663ffe5c09e748cd79d97b74cd70e5a5c84b760a475ce5767b357fb2a57cb821cee412d646aa8a156ed39b78aab88974eddaa9e5ee926173c036c0713787
+  languageName: node
+  linkType: hard
+
+"get-stream@npm:6.0.0":
+  version: 6.0.0
+  resolution: "get-stream@npm:6.0.0"
+  checksum: 10/a8bf40227191743149ab5d5d05f9577cb95768b60456553319296ad4e8566aa9cd3611b5f0f3168697f135233b24e47c761b3b225db6f79fb86326d11a3a0c2c
   languageName: node
   linkType: hard
 
@@ -17344,34 +18626,35 @@ __metadata:
   version: 5.2.0
   resolution: "get-stream@npm:5.2.0"
   dependencies:
-    pump: ^3.0.0
-  checksum: 8bc1a23174a06b2b4ce600df38d6c98d2ef6d84e020c1ddad632ad75bac4e092eeb40e4c09e0761c35fc2dbc5e7fff5dab5e763a383582c4a167dd69a905bd12
+    pump: "npm:^3.0.0"
+  checksum: 10/13a73148dca795e41421013da6e3ebff8ccb7fba4d2f023fd0c6da2c166ec4e789bec9774a73a7b49c08daf2cae552f8a3e914042ac23b5f59dd278cc8f9cbfb
   languageName: node
   linkType: hard
 
 "get-stream@npm:^6.0.0":
   version: 6.0.1
   resolution: "get-stream@npm:6.0.1"
-  checksum: e04ecece32c92eebf5b8c940f51468cd53554dcbb0ea725b2748be583c9523d00128137966afce410b9b051eb2ef16d657cd2b120ca8edafcf5a65e81af63cad
+  checksum: 10/781266d29725f35c59f1d214aedc92b0ae855800a980800e2923b3fbc4e56b3cb6e462c42e09a1cf1a00c64e056a78fa407cbe06c7c92b7e5cd49b4b85c2a497
   languageName: node
   linkType: hard
 
-"get-symbol-description@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "get-symbol-description@npm:1.0.0"
+"get-symbol-description@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "get-symbol-description@npm:1.0.2"
   dependencies:
-    call-bind: ^1.0.2
-    get-intrinsic: ^1.1.1
-  checksum: 9ceff8fe968f9270a37a1f73bf3f1f7bda69ca80f4f80850670e0e7b9444ff99323f7ac52f96567f8b5f5fbe7ac717a0d81d3407c7313e82810c6199446a5247
+    call-bind: "npm:^1.0.5"
+    es-errors: "npm:^1.3.0"
+    get-intrinsic: "npm:^1.2.4"
+  checksum: 10/e1cb53bc211f9dbe9691a4f97a46837a553c4e7caadd0488dc24ac694db8a390b93edd412b48dcdd0b4bbb4c595de1709effc75fc87c0839deedc6968f5bd973
   languageName: node
   linkType: hard
 
-"get-tsconfig@npm:^4.4.0":
-  version: 4.6.0
-  resolution: "get-tsconfig@npm:4.6.0"
+"get-tsconfig@npm:^4.4.0, get-tsconfig@npm:^4.7.0":
+  version: 4.7.3
+  resolution: "get-tsconfig@npm:4.7.3"
   dependencies:
-    resolve-pkg-maps: ^1.0.0
-  checksum: fd2589a50e21543cf416285e5c4ac605359f49209b6c2e66bb8698fac907356e060de0a681e40881f00182b6f19771377411a88adcc78fd3954732ff54f4a54d
+    resolve-pkg-maps: "npm:^1.0.0"
+  checksum: 10/7397bb4f8aef936df4d9016555b662dcf5279f3c46428b7c7c1ff5e94ab2b87d018b3dda0f4bc1a28b154d5affd0eac5d014511172c085fd8a9cdff9ea7fe043
   languageName: node
   linkType: hard
 
@@ -17379,9 +18662,9 @@ __metadata:
   version: 2.3.0
   resolution: "get-user-locale@npm:2.3.0"
   dependencies:
-    "@types/lodash.memoize": ^4.1.7
-    lodash.memoize: ^4.1.1
-  checksum: 8a815e7528d1a75d85b25573ecd66890b126cdc6759f06354dd0b59371d88618aad5a4955ccab5c1267a9ca6a6e46b9362e9bad2639ad5949d3e90542a480791
+    "@types/lodash.memoize": "npm:^4.1.7"
+    lodash.memoize: "npm:^4.1.1"
+  checksum: 10/1a0e8a57d89e1bfa2e551d1702caeda754f03a55edec1c63bc826ed081a39fec8ea8f8e1ab8c5a2b86d1690d5c4296be35a7e041b79ede100c4503d1afeb07f6
   languageName: node
   linkType: hard
 
@@ -17389,8 +18672,8 @@ __metadata:
   version: 1.1.2
   resolution: "get-window@npm:1.1.2"
   dependencies:
-    get-document: 1
-  checksum: 2475b4e33811b6ee3b3c3734f7901f30e26da8f436b3396cc9b8e2b0f2081ba3ca6ab08c70a1b393f4023d1a4c2d9a7a39760793e310a1ea42f0847300f57cc0
+    get-document: "npm:1"
+  checksum: 10/728b0be1e5eb3dde5180881e3a6a8810d25bc074e9d321a5fad9a60b7853f9e293e8eb30e57d9a6e98826d921db4c8fecf0700fc4785e3bdc252d9d75f0903c5
   languageName: node
   linkType: hard
 
@@ -17398,8 +18681,8 @@ __metadata:
   version: 3.2.1
   resolution: "getos@npm:3.2.1"
   dependencies:
-    async: ^3.2.0
-  checksum: 42fd78a66d47cebd3e09de5566cc0044e034b08f4a000a310dbd89a77b02c65d8f4002554bfa495ea5bdc4fa9d515f5ac785a7cc474ba45383cc697f865eeaf1
+    async: "npm:^3.2.0"
+  checksum: 10/228bede057f5cbed93dc6a66ce459a0364059faa2869682547663302f612e6295f13d3ad2a54ebbed573a9eb7f8124508b24409df6bcda6e15906c357526d11f
   languageName: node
   linkType: hard
 
@@ -17407,8 +18690,8 @@ __metadata:
   version: 0.1.7
   resolution: "getpass@npm:0.1.7"
   dependencies:
-    assert-plus: ^1.0.0
-  checksum: ab18d55661db264e3eac6012c2d3daeafaab7a501c035ae0ccb193c3c23e9849c6e29b6ac762b9c2adae460266f925d55a3a2a3a3c8b94be2f222df94d70c046
+    assert-plus: "npm:^1.0.0"
+  checksum: 10/ab18d55661db264e3eac6012c2d3daeafaab7a501c035ae0ccb193c3c23e9849c6e29b6ac762b9c2adae460266f925d55a3a2a3a3c8b94be2f222df94d70c046
   languageName: node
   linkType: hard
 
@@ -17416,31 +18699,29 @@ __metadata:
   version: 1.1.2
   resolution: "giget@npm:1.1.2"
   dependencies:
-    colorette: ^2.0.19
-    defu: ^6.1.2
-    https-proxy-agent: ^5.0.1
-    mri: ^1.2.0
-    node-fetch-native: ^1.0.2
-    pathe: ^1.1.0
-    tar: ^6.1.13
+    colorette: "npm:^2.0.19"
+    defu: "npm:^6.1.2"
+    https-proxy-agent: "npm:^5.0.1"
+    mri: "npm:^1.2.0"
+    node-fetch-native: "npm:^1.0.2"
+    pathe: "npm:^1.1.0"
+    tar: "npm:^6.1.13"
   bin:
     giget: dist/cli.mjs
-  checksum: 76ad0f7e792ee95dd6c4e1096697fdcce61a2a3235a6c21761fc3e0d1053342074ce71c80059d6d4363fd34152e5d7b2e58221412f300c852ff7d4a12d0321fe
+  checksum: 10/f5080b18437fcd4cb92eb8bc90f69f57008460416c5a919a5d50e94889c0a5bfec641f203bd32f91b3de3058c8be48f23ab4b4f2d29f785dcb311b5f10c51bf4
   languageName: node
   linkType: hard
 
-"git-raw-commits@npm:^2.0.8":
-  version: 2.0.11
-  resolution: "git-raw-commits@npm:2.0.11"
+"git-raw-commits@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "git-raw-commits@npm:3.0.0"
   dependencies:
-    dargs: ^7.0.0
-    lodash: ^4.17.15
-    meow: ^8.0.0
-    split2: ^3.0.0
-    through2: ^4.0.0
+    dargs: "npm:^7.0.0"
+    meow: "npm:^8.1.2"
+    split2: "npm:^3.2.2"
   bin:
     git-raw-commits: cli.js
-  checksum: c178af43633684106179793b6e3473e1d2bb50bb41d04e2e285ea4eef342ca4090fee6bc8a737552fde879d22346c90de5c49f18c719a0f38d4c934f258a0f79
+  checksum: 10/198892f307829d22fc8ec1c9b4a63876a1fde847763857bb74bd1b04c6f6bc0d7464340c25d0f34fd0fb395759363aa1f8ce324357027320d80523bf234676ab
   languageName: node
   linkType: hard
 
@@ -17448,21 +18729,21 @@ __metadata:
   version: 2.0.0
   resolution: "git-remote-origin-url@npm:2.0.0"
   dependencies:
-    gitconfiglocal: ^1.0.0
-    pify: ^2.3.0
-  checksum: 85263a09c044b5f4fe2acc45cbb3c5331ab2bd4484bb53dfe7f3dd593a4bf90a9786a2e00b9884524331f50b3da18e8c924f01c2944087fc7f342282c4437b73
+    gitconfiglocal: "npm:^1.0.0"
+    pify: "npm:^2.3.0"
+  checksum: 10/85263a09c044b5f4fe2acc45cbb3c5331ab2bd4484bb53dfe7f3dd593a4bf90a9786a2e00b9884524331f50b3da18e8c924f01c2944087fc7f342282c4437b73
   languageName: node
   linkType: hard
 
-"git-semver-tags@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "git-semver-tags@npm:4.1.1"
+"git-semver-tags@npm:^5.0.0":
+  version: 5.0.1
+  resolution: "git-semver-tags@npm:5.0.1"
   dependencies:
-    meow: ^8.0.0
-    semver: ^6.0.0
+    meow: "npm:^8.1.2"
+    semver: "npm:^7.0.0"
   bin:
     git-semver-tags: cli.js
-  checksum: e16d02a515c0f88289a28b5bf59bf42c0dc053765922d3b617ae4b50546bd4f74a25bf3ad53b91cb6c1159319a2e92533b160c573b856c2629125c8b26b3b0e3
+  checksum: 10/056e34a3dd0d91ca737225d360e46a0330c92f1508c38ad93965c3a204e5c7bfe7746f1f7e7d6b456bd61245c770fd0755148823bf852eed71099d094bee6cc2
   languageName: node
   linkType: hard
 
@@ -17470,18 +18751,18 @@ __metadata:
   version: 7.0.0
   resolution: "git-up@npm:7.0.0"
   dependencies:
-    is-ssh: ^1.4.0
-    parse-url: ^8.1.0
-  checksum: 2faadbab51e94d2ffb220e426e950087cc02c15d664e673bd5d1f734cfa8196fed8b19493f7bf28fe216d087d10e22a7fd9b63687e0ba7d24f0ddcfb0a266d6e
+    is-ssh: "npm:^1.4.0"
+    parse-url: "npm:^8.1.0"
+  checksum: 10/003ef38424702ac4cbe6d2817ccfb5811251244c955a8011ca40298d12cf1fb6529529f074d5832b5221e193ec05f4742ecf7806e6c4f41a81a2f2cff65d6bf4
   languageName: node
   linkType: hard
 
-"git-url-parse@npm:^13.1.0":
+"git-url-parse@npm:13.1.0":
   version: 13.1.0
   resolution: "git-url-parse@npm:13.1.0"
   dependencies:
-    git-up: ^7.0.0
-  checksum: 212a9b0343e9199998b6a532efe2014476a7a1283af393663ca49ac28d4768929aad16d3322e2685236065ee394dbc93e7aa63a48956531e984c56d8b5edb54d
+    git-up: "npm:^7.0.0"
+  checksum: 10/a088e9b57235eda6a390a0af31db28c128161861675935d26fca9615c0e5c6078b0adcca00293f25ea5e69a37bed5e8afe8bc5f2a079b286a897738a24ab98a4
   languageName: node
   linkType: hard
 
@@ -17489,34 +18770,24 @@ __metadata:
   version: 1.0.0
   resolution: "gitconfiglocal@npm:1.0.0"
   dependencies:
-    ini: ^1.3.2
-  checksum: e6d2764c15bbab6d1d1000d1181bb907f6b3796bb04f63614dba571b18369e0ecb1beaf27ce8da5b24307ef607e3a5f262a67cb9575510b9446aac697d421beb
+    ini: "npm:^1.3.2"
+  checksum: 10/e6d2764c15bbab6d1d1000d1181bb907f6b3796bb04f63614dba571b18369e0ecb1beaf27ce8da5b24307ef607e3a5f262a67cb9575510b9446aac697d421beb
   languageName: node
   linkType: hard
 
 "github-slugger@npm:^1.0.0":
   version: 1.5.0
   resolution: "github-slugger@npm:1.5.0"
-  checksum: c70988224578b3bdaa25df65973ffc8c24594a77a28550c3636e495e49d17aef5cdb04c04fa3f1744babef98c61eecc6a43299a13ea7f3cc33d680bf9053ffbe
-  languageName: node
-  linkType: hard
-
-"glob-parent@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "glob-parent@npm:3.1.0"
-  dependencies:
-    is-glob: ^3.1.0
-    path-dirname: ^1.0.0
-  checksum: 653d559237e89a11b9934bef3f392ec42335602034c928590544d383ff5ef449f7b12f3cfa539708e74bc0a6c28ab1fe51d663cc07463cdf899ba92afd85a855
+  checksum: 10/c70988224578b3bdaa25df65973ffc8c24594a77a28550c3636e495e49d17aef5cdb04c04fa3f1744babef98c61eecc6a43299a13ea7f3cc33d680bf9053ffbe
   languageName: node
   linkType: hard
 
-"glob-parent@npm:^5.1.1, glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.2":
+"glob-parent@npm:5.1.2, glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.2":
   version: 5.1.2
   resolution: "glob-parent@npm:5.1.2"
   dependencies:
-    is-glob: ^4.0.1
-  checksum: f4f2bfe2425296e8a47e36864e4f42be38a996db40420fe434565e4480e3322f18eb37589617a98640c5dc8fdec1a387007ee18dbb1f3f5553409c34d17f425e
+    is-glob: "npm:^4.0.1"
+  checksum: 10/32cd106ce8c0d83731966d31517adb766d02c3812de49c30cfe0675c7c0ae6630c11214c54a5ae67aca882cf738d27fd7768f21aa19118b9245950554be07247
   languageName: node
   linkType: hard
 
@@ -17524,62 +18795,47 @@ __metadata:
   version: 6.0.2
   resolution: "glob-parent@npm:6.0.2"
   dependencies:
-    is-glob: ^4.0.3
-  checksum: c13ee97978bef4f55106b71e66428eb1512e71a7466ba49025fc2aec59a5bfb0954d5abd58fc5ee6c9b076eef4e1f6d3375c2e964b88466ca390da4419a786a8
+    is-glob: "npm:^4.0.3"
+  checksum: 10/c13ee97978bef4f55106b71e66428eb1512e71a7466ba49025fc2aec59a5bfb0954d5abd58fc5ee6c9b076eef4e1f6d3375c2e964b88466ca390da4419a786a8
   languageName: node
   linkType: hard
 
-"glob-stream@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "glob-stream@npm:6.1.0"
+"glob-stream@npm:^8.0.0":
+  version: 8.0.1
+  resolution: "glob-stream@npm:8.0.1"
   dependencies:
-    extend: ^3.0.0
-    glob: ^7.1.1
-    glob-parent: ^3.1.0
-    is-negated-glob: ^1.0.0
-    ordered-read-streams: ^1.0.0
-    pumpify: ^1.3.5
-    readable-stream: ^2.1.5
-    remove-trailing-separator: ^1.0.1
-    to-absolute-glob: ^2.0.0
-    unique-stream: ^2.0.2
-  checksum: 7c9ec7be266974186b762ad686813025868067f2ea64a0428c0365b4046cb955d328b1e7498124392ec0026c5826ce2cfa4b41614584fb63edd02421e61db556
+    "@gulpjs/to-absolute-glob": "npm:^4.0.0"
+    anymatch: "npm:^3.1.3"
+    fastq: "npm:^1.13.0"
+    glob-parent: "npm:^6.0.2"
+    is-glob: "npm:^4.0.3"
+    is-negated-glob: "npm:^1.0.0"
+    normalize-path: "npm:^3.0.0"
+    now-and-later: "npm:^3.0.0"
+    streamx: "npm:^2.12.5"
+  checksum: 10/a2d09b5e67cf90d85bc90b2f93ec2da1415ac0a5a64c52c9d3bfb781ee72a90b23ec3297bc9ed7be446ab3a86b21ff90523047d811c4ceea67e098479ed226fe
   languageName: node
   linkType: hard
 
 "glob-to-regexp@npm:^0.4.1":
   version: 0.4.1
   resolution: "glob-to-regexp@npm:0.4.1"
-  checksum: e795f4e8f06d2a15e86f76e4d92751cf8bbfcf0157cea5c2f0f35678a8195a750b34096b1256e436f0cebc1883b5ff0888c47348443e69546a5a87f9e1eb1167
+  checksum: 10/9009529195a955c40d7b9690794aeff5ba665cc38f1519e111c58bb54366fd0c106bde80acf97ba4e533208eb53422c83b136611a54c5fefb1edd8dc267cb62e
   languageName: node
   linkType: hard
 
-"glob@npm:10.3.3":
-  version: 10.3.3
-  resolution: "glob@npm:10.3.3"
+"glob@npm:10.3.10":
+  version: 10.3.10
+  resolution: "glob@npm:10.3.10"
   dependencies:
-    foreground-child: ^3.1.0
-    jackspeak: ^2.0.3
-    minimatch: ^9.0.1
-    minipass: ^5.0.0 || ^6.0.2 || ^7.0.0
-    path-scurry: ^1.10.1
+    foreground-child: "npm:^3.1.0"
+    jackspeak: "npm:^2.3.5"
+    minimatch: "npm:^9.0.1"
+    minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0"
+    path-scurry: "npm:^1.10.1"
   bin:
-    glob: dist/cjs/src/bin.js
-  checksum: 29190d3291f422da0cb40b77a72fc8d2c51a36524e99b8bf412548b7676a6627489528b57250429612b6eec2e6fe7826d328451d3e694a9d15e575389308ec53
-  languageName: node
-  linkType: hard
-
-"glob@npm:7.1.4":
-  version: 7.1.4
-  resolution: "glob@npm:7.1.4"
-  dependencies:
-    fs.realpath: ^1.0.0
-    inflight: ^1.0.4
-    inherits: 2
-    minimatch: ^3.0.4
-    once: ^1.3.0
-    path-is-absolute: ^1.0.0
-  checksum: f52480fc82b1e66e52990f0f2e7306447d12294c83fbbee0395e761ad1178172012a7cc0673dbf4810baac400fc09bf34484c08b5778c216403fd823db281716
+    glob: dist/esm/bin.mjs
+  checksum: 10/38bdb2c9ce75eb5ed168f309d4ed05b0798f640b637034800a6bf306f39d35409bf278b0eaaffaec07591085d3acb7184a201eae791468f0f617771c2486a6a8
   languageName: node
   linkType: hard
 
@@ -17587,42 +18843,42 @@ __metadata:
   version: 7.2.0
   resolution: "glob@npm:7.2.0"
   dependencies:
-    fs.realpath: ^1.0.0
-    inflight: ^1.0.4
-    inherits: 2
-    minimatch: ^3.0.4
-    once: ^1.3.0
-    path-is-absolute: ^1.0.0
-  checksum: 78a8ea942331f08ed2e055cb5b9e40fe6f46f579d7fd3d694f3412fe5db23223d29b7fee1575440202e9a7ff9a72ab106a39fee39934c7bedafe5e5f8ae20134
+    fs.realpath: "npm:^1.0.0"
+    inflight: "npm:^1.0.4"
+    inherits: "npm:2"
+    minimatch: "npm:^3.0.4"
+    once: "npm:^1.3.0"
+    path-is-absolute: "npm:^1.0.0"
+  checksum: 10/bc78b6ea0735b6e23d20678aba4ae6a4760e8c9527e3c4683ac25b14e70f55f9531245dcf25959b70cbc4aa3dcce1fc37ab65fd026a4cbd70aa3a44880bd396b
   languageName: node
   linkType: hard
 
-"glob@npm:^10.0.0, glob@npm:^10.2.5, glob@npm:^10.2.7":
-  version: 10.3.10
-  resolution: "glob@npm:10.3.10"
+"glob@npm:^10.0.0, glob@npm:^10.2.2, glob@npm:^10.2.5, glob@npm:^10.2.7, glob@npm:^10.3.10, glob@npm:^10.3.7":
+  version: 10.3.12
+  resolution: "glob@npm:10.3.12"
   dependencies:
-    foreground-child: ^3.1.0
-    jackspeak: ^2.3.5
-    minimatch: ^9.0.1
-    minipass: ^5.0.0 || ^6.0.2 || ^7.0.0
-    path-scurry: ^1.10.1
+    foreground-child: "npm:^3.1.0"
+    jackspeak: "npm:^2.3.6"
+    minimatch: "npm:^9.0.1"
+    minipass: "npm:^7.0.4"
+    path-scurry: "npm:^1.10.2"
   bin:
     glob: dist/esm/bin.mjs
-  checksum: 4f2fe2511e157b5a3f525a54092169a5f92405f24d2aed3142f4411df328baca13059f4182f1db1bf933e2c69c0bd89e57ae87edd8950cba8c7ccbe84f721cf3
+  checksum: 10/9e8186abc22dc824b5dd86cefd8e6b5621a72d1be7f68bacc0fd681e8c162ec5546660a6ec0553d6a74757a585e655956c7f8f1a6d24570e8d865c307323d178
   languageName: node
   linkType: hard
 
-"glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4":
+"glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4":
   version: 7.2.3
   resolution: "glob@npm:7.2.3"
   dependencies:
-    fs.realpath: ^1.0.0
-    inflight: ^1.0.4
-    inherits: 2
-    minimatch: ^3.1.1
-    once: ^1.3.0
-    path-is-absolute: ^1.0.0
-  checksum: 29452e97b38fa704dabb1d1045350fb2467cf0277e155aa9ff7077e90ad81d1ea9d53d3ee63bd37c05b09a065e90f16aec4a65f5b8de401d1dac40bc5605d133
+    fs.realpath: "npm:^1.0.0"
+    inflight: "npm:^1.0.4"
+    inherits: "npm:2"
+    minimatch: "npm:^3.1.1"
+    once: "npm:^1.3.0"
+    path-is-absolute: "npm:^1.0.0"
+  checksum: 10/59452a9202c81d4508a43b8af7082ca5c76452b9fcc4a9ab17655822e6ce9b21d4f8fbadabe4fe3faef448294cec249af305e2cd824b7e9aaf689240e5e96a7b
   languageName: node
   linkType: hard
 
@@ -17630,12 +18886,24 @@ __metadata:
   version: 8.1.0
   resolution: "glob@npm:8.1.0"
   dependencies:
-    fs.realpath: ^1.0.0
-    inflight: ^1.0.4
-    inherits: 2
-    minimatch: ^5.0.1
-    once: ^1.3.0
-  checksum: 92fbea3221a7d12075f26f0227abac435de868dd0736a17170663783296d0dd8d3d532a5672b4488a439bf5d7fb85cdd07c11185d6cd39184f0385cbdfb86a47
+    fs.realpath: "npm:^1.0.0"
+    inflight: "npm:^1.0.4"
+    inherits: "npm:2"
+    minimatch: "npm:^5.0.1"
+    once: "npm:^1.3.0"
+  checksum: 10/9aab1c75eb087c35dbc41d1f742e51d0507aa2b14c910d96fb8287107a10a22f4bbdce26fc0a3da4c69a20f7b26d62f1640b346a4f6e6becfff47f335bb1dc5e
+  languageName: node
+  linkType: hard
+
+"glob@npm:^9.2.0":
+  version: 9.3.5
+  resolution: "glob@npm:9.3.5"
+  dependencies:
+    fs.realpath: "npm:^1.0.0"
+    minimatch: "npm:^8.0.2"
+    minipass: "npm:^4.2.4"
+    path-scurry: "npm:^1.6.1"
+  checksum: 10/e5fa8a58adf53525bca42d82a1fad9e6800032b7e4d372209b80cfdca524dd9a7dbe7d01a92d7ed20d89c572457f12c250092bc8817cb4f1c63efefdf9b658c0
   languageName: node
   linkType: hard
 
@@ -17643,8 +18911,8 @@ __metadata:
   version: 3.0.1
   resolution: "global-dirs@npm:3.0.1"
   dependencies:
-    ini: 2.0.0
-  checksum: 70147b80261601fd40ac02a104581432325c1c47329706acd773f3a6ce99bb36d1d996038c85ccacd482ad22258ec233c586b6a91535b1a116b89663d49d6438
+    ini: "npm:2.0.0"
+  checksum: 10/70147b80261601fd40ac02a104581432325c1c47329706acd773f3a6ce99bb36d1d996038c85ccacd482ad22258ec233c586b6a91535b1a116b89663d49d6438
   languageName: node
   linkType: hard
 
@@ -17652,8 +18920,8 @@ __metadata:
   version: 2.0.0
   resolution: "global-modules@npm:2.0.0"
   dependencies:
-    global-prefix: ^3.0.0
-  checksum: d6197f25856c878c2fb5f038899f2dca7cbb2f7b7cf8999660c0104972d5cfa5c68b5a0a77fa8206bb536c3903a4615665acb9709b4d80846e1bb47eaef65430
+    global-prefix: "npm:^3.0.0"
+  checksum: 10/4aee73adf533fe82ead2ad15c8bfb6ea4fb29e16d2d067521ab39d3b45b8f834d71c47a807e4f8f696e79497c3946d4ccdcd708da6f3a4522d65b087b8852f64
   languageName: node
   linkType: hard
 
@@ -17661,17 +18929,17 @@ __metadata:
   version: 3.0.0
   resolution: "global-prefix@npm:3.0.0"
   dependencies:
-    ini: ^1.3.5
-    kind-of: ^6.0.2
-    which: ^1.3.1
-  checksum: 8a82fc1d6f22c45484a4e34656cc91bf021a03e03213b0035098d605bfc612d7141f1e14a21097e8a0413b4884afd5b260df0b6a25605ce9d722e11f1df2881d
+    ini: "npm:^1.3.5"
+    kind-of: "npm:^6.0.2"
+    which: "npm:^1.3.1"
+  checksum: 10/a405b9f83c7d88a49dc1c1e458d6585e258356810d3d0f41094265152a06a0f393b14d911f45616e35a4ce3894176a73be2984883575e778f55e90bf812d7337
   languageName: node
   linkType: hard
 
 "globals@npm:^11.1.0":
   version: 11.12.0
   resolution: "globals@npm:11.12.0"
-  checksum: 67051a45eca3db904aee189dfc7cd53c20c7d881679c93f6146ddd4c9f4ab2268e68a919df740d39c71f4445d2b38ee360fc234428baea1dbdfe68bbcb46979e
+  checksum: 10/9f054fa38ff8de8fa356502eb9d2dae0c928217b8b5c8de1f09f5c9b6c8a96d8b9bd3afc49acbcd384a98a81fea713c859e1b09e214c60509517bb8fc2bc13c2
   languageName: node
   linkType: hard
 
@@ -17679,8 +18947,8 @@ __metadata:
   version: 13.19.0
   resolution: "globals@npm:13.19.0"
   dependencies:
-    type-fest: ^0.20.2
-  checksum: a000dbd00bcf28f0941d8a29c3522b1c3b8e4bfe4e60e262c477a550c3cbbe8dbe2925a6905f037acd40f9a93c039242e1f7079c76b0fd184bc41dcc3b5c8e2e
+    type-fest: "npm:^0.20.2"
+  checksum: 10/f365fc2a4eb21a264d0f2a6355ddf4ee32983e0817ec48a517a56d7d1944124c763e81cae13ae26fa9a7d6c7ab826b2e796f87b022a674336275da0e6249366e
   languageName: node
   linkType: hard
 
@@ -17688,8 +18956,8 @@ __metadata:
   version: 1.0.3
   resolution: "globalthis@npm:1.0.3"
   dependencies:
-    define-properties: ^1.1.3
-  checksum: fbd7d760dc464c886d0196166d92e5ffb4c84d0730846d6621a39fbbc068aeeb9c8d1421ad330e94b7bca4bb4ea092f5f21f3d36077812af5d098b4dc006c998
+    define-properties: "npm:^1.1.3"
+  checksum: 10/45ae2f3b40a186600d0368f2a880ae257e8278b4c7704f0417d6024105ad7f7a393661c5c2fa1334669cd485ea44bc883a08fdd4516df2428aec40c99f52aa89
   languageName: node
   linkType: hard
 
@@ -17697,49 +18965,50 @@ __metadata:
   version: 10.0.1
   resolution: "globby@npm:10.0.1"
   dependencies:
-    "@types/glob": ^7.1.1
-    array-union: ^2.1.0
-    dir-glob: ^3.0.1
-    fast-glob: ^3.0.3
-    glob: ^7.1.3
-    ignore: ^5.1.1
-    merge2: ^1.2.3
-    slash: ^3.0.0
-  checksum: a16754b93eff58c1070ca9b0a92c69d9d97a184870fbc7dcb1b99a3ff202311ae66dd5662cbec874deaa888d0172024332e14d04d038c23949d5f8e29341dad2
+    "@types/glob": "npm:^7.1.1"
+    array-union: "npm:^2.1.0"
+    dir-glob: "npm:^3.0.1"
+    fast-glob: "npm:^3.0.3"
+    glob: "npm:^7.1.3"
+    ignore: "npm:^5.1.1"
+    merge2: "npm:^1.2.3"
+    slash: "npm:^3.0.0"
+  checksum: 10/ea724a820d7d4eafc5aa3882d667a7ef3505b3018652b2658185d58752f122b75d3370086e4d4a7b1bbcdf8c2e700e5709a48db189a930df37005e1b3c86c256
   languageName: node
   linkType: hard
 
-"globby@npm:^11.0.1, globby@npm:^11.0.2, globby@npm:^11.1.0":
+"globby@npm:11.1.0, globby@npm:^11.0.0, globby@npm:^11.0.1, globby@npm:^11.0.2, globby@npm:^11.1.0":
   version: 11.1.0
   resolution: "globby@npm:11.1.0"
   dependencies:
-    array-union: ^2.1.0
-    dir-glob: ^3.0.1
-    fast-glob: ^3.2.9
-    ignore: ^5.2.0
-    merge2: ^1.4.1
-    slash: ^3.0.0
-  checksum: b4be8885e0cfa018fc783792942d53926c35c50b3aefd3fdcfb9d22c627639dc26bd2327a40a0b74b074100ce95bb7187bfeae2f236856aa3de183af7a02aea6
+    array-union: "npm:^2.1.0"
+    dir-glob: "npm:^3.0.1"
+    fast-glob: "npm:^3.2.9"
+    ignore: "npm:^5.2.0"
+    merge2: "npm:^1.4.1"
+    slash: "npm:^3.0.0"
+  checksum: 10/288e95e310227bbe037076ea81b7c2598ccbc3122d87abc6dab39e1eec309aa14f0e366a98cdc45237ffcfcbad3db597778c0068217dcb1950fef6249104e1b1
   languageName: node
   linkType: hard
 
-"globby@npm:^13.1.1":
-  version: 13.1.3
-  resolution: "globby@npm:13.1.3"
+"globby@npm:^14.0.0":
+  version: 14.0.0
+  resolution: "globby@npm:14.0.0"
   dependencies:
-    dir-glob: ^3.0.1
-    fast-glob: ^3.2.11
-    ignore: ^5.2.0
-    merge2: ^1.4.1
-    slash: ^4.0.0
-  checksum: 93f06e02002cdf368f7e3d55bd59e7b00784c7cc8fe92c7ee5082cc7171ff6109fda45e1c97a80bb48bc811dedaf7843c7c9186f5f84bde4883ab630e13c43df
+    "@sindresorhus/merge-streams": "npm:^1.0.0"
+    fast-glob: "npm:^3.3.2"
+    ignore: "npm:^5.2.4"
+    path-type: "npm:^5.0.0"
+    slash: "npm:^5.1.0"
+    unicorn-magic: "npm:^0.1.0"
+  checksum: 10/6e7d84bbc69d8d21a07507af090998c6546c385702a350ff14f6fb08207f90ed40bd41c7b19c11a23851c3b86666e79503373e0f8b400a91a29b13952b1e960c
   languageName: node
   linkType: hard
 
 "globjoin@npm:^0.1.4":
   version: 0.1.4
   resolution: "globjoin@npm:0.1.4"
-  checksum: 0a47d88d566122d9e42da946453ee38b398e0021515ac6a95d13f980ba8c1e42954e05ee26cfcbffce1ac1ee094d0524b16ce1dd874ca52408d6db5c6d39985b
+  checksum: 10/1e7e0f145f6572134e999b5511767698c8196e891f50db76a25189c897f355aec1b7e62f9eeaa0626db55460353470ac6bec4aa118beb710e4543037e705647a
   languageName: node
   linkType: hard
 
@@ -17747,15 +19016,15 @@ __metadata:
   version: 1.0.1
   resolution: "gopd@npm:1.0.1"
   dependencies:
-    get-intrinsic: ^1.1.3
-  checksum: a5ccfb8806e0917a94e0b3de2af2ea4979c1da920bc381667c260e00e7cafdbe844e2cb9c5bcfef4e5412e8bf73bab837285bc35c7ba73aaaf0134d4583393a6
+    get-intrinsic: "npm:^1.1.3"
+  checksum: 10/5fbc7ad57b368ae4cd2f41214bd947b045c1a4be2f194a7be1778d71f8af9dbf4004221f3b6f23e30820eb0d052b4f819fe6ebe8221e2a3c6f0ee4ef173421ca
   languageName: node
   linkType: hard
 
-"graceful-fs@npm:^4.0.0, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9":
-  version: 4.2.10
-  resolution: "graceful-fs@npm:4.2.10"
-  checksum: 3f109d70ae123951905d85032ebeae3c2a5a7a997430df00ea30df0e3a6c60cf6689b109654d6fdacd28810a053348c4d14642da1d075049e6be1ba5216218da
+"graceful-fs@npm:4.2.11, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.5, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.10, graceful-fs@npm:^4.2.11, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.8, graceful-fs@npm:^4.2.9":
+  version: 4.2.11
+  resolution: "graceful-fs@npm:4.2.11"
+  checksum: 10/bf152d0ed1dc159239db1ba1f74fdbc40cb02f626770dcd5815c427ce0688c2635a06ed69af364396da4636d0408fcf7d4afdf7881724c3307e46aff30ca49e2
   languageName: node
   linkType: hard
 
@@ -17763,390 +19032,373 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "grafana@workspace:."
   dependencies:
-    "@babel/core": 7.23.2
-    "@babel/plugin-proposal-class-properties": 7.18.6
-    "@babel/plugin-proposal-nullish-coalescing-operator": 7.18.6
-    "@babel/plugin-proposal-object-rest-spread": 7.20.7
-    "@babel/plugin-proposal-optional-chaining": 7.21.0
-    "@babel/plugin-syntax-dynamic-import": 7.8.3
-    "@babel/plugin-transform-react-constant-elements": 7.22.5
-    "@babel/plugin-transform-runtime": 7.23.2
-    "@babel/plugin-transform-typescript": 7.22.9
-    "@babel/preset-env": 7.23.2
-    "@babel/preset-react": 7.22.5
-    "@babel/preset-typescript": 7.23.2
-    "@babel/runtime": 7.23.2
-    "@betterer/betterer": 5.4.0
-    "@betterer/cli": 5.4.0
-    "@betterer/eslint": 5.4.0
-    "@betterer/regexp": 5.4.0
-    "@cypress/webpack-preprocessor": 5.17.1
-    "@daybrush/utils": 1.13.0
-    "@emotion/css": 11.11.2
-    "@emotion/eslint-plugin": 11.11.0
-    "@emotion/react": 11.11.1
-    "@fingerprintjs/fingerprintjs": ^3.4.2
-    "@glideapps/glide-data-grid": ^5.2.1
-    "@grafana-plugins/grafana-testdata-datasource": "workspace:*"
-    "@grafana/aws-sdk": 0.2.0
+    "@babel/runtime": "npm:7.24.1"
+    "@betterer/betterer": "npm:5.4.0"
+    "@betterer/cli": "npm:5.4.0"
+    "@betterer/eslint": "npm:5.4.0"
+    "@cypress/webpack-preprocessor": "npm:6.0.1"
+    "@daybrush/utils": "npm:1.13.0"
+    "@emotion/css": "npm:11.11.2"
+    "@emotion/eslint-plugin": "npm:11.11.0"
+    "@emotion/react": "npm:11.11.4"
+    "@fingerprintjs/fingerprintjs": "npm:^3.4.2"
+    "@floating-ui/react": "npm:0.26.10"
+    "@glideapps/glide-data-grid": "npm:^6.0.0"
+    "@grafana/aws-sdk": "npm:0.3.3"
     "@grafana/data": "workspace:*"
     "@grafana/e2e-selectors": "workspace:*"
-    "@grafana/eslint-config": 6.0.1
+    "@grafana/eslint-config": "npm:7.0.0"
     "@grafana/eslint-plugin": "link:./packages/grafana-eslint-rules"
-    "@grafana/experimental": 1.7.4
-    "@grafana/faro-core": 1.2.1
-    "@grafana/faro-web-sdk": 1.2.1
+    "@grafana/experimental": "npm:1.7.10"
+    "@grafana/faro-core": "npm:^1.3.6"
+    "@grafana/faro-web-sdk": "npm:^1.3.6"
     "@grafana/flamegraph": "workspace:*"
-    "@grafana/google-sdk": 0.1.1
-    "@grafana/lezer-logql": 0.2.1
-    "@grafana/lezer-traceql": 0.0.8
-    "@grafana/monaco-logql": ^0.0.7
+    "@grafana/google-sdk": "npm:0.1.2"
+    "@grafana/lezer-logql": "npm:0.2.3"
+    "@grafana/monaco-logql": "npm:^0.0.7"
+    "@grafana/o11y-ds-frontend": "workspace:*"
+    "@grafana/plugin-e2e": "npm:^0.25.0"
+    "@grafana/prometheus": "workspace:*"
     "@grafana/runtime": "workspace:*"
-    "@grafana/scenes": ^1.18.0
+    "@grafana/saga-icons": "workspace:*"
+    "@grafana/scenes": "npm:^4.14.0"
     "@grafana/schema": "workspace:*"
-    "@grafana/tsconfig": ^1.3.0-rc1
+    "@grafana/sql": "workspace:*"
+    "@grafana/tsconfig": "npm:^1.3.0-rc1"
     "@grafana/ui": "workspace:*"
-    "@kusto/monaco-kusto": ^7.4.0
-    "@leeoniya/ufuzzy": 1.0.8
-    "@lezer/common": 1.0.2
-    "@lezer/highlight": 1.1.3
-    "@lezer/lr": 1.3.3
-    "@locker/near-membrane-dom": 0.13.3
-    "@locker/near-membrane-shared": 0.13.3
-    "@locker/near-membrane-shared-dom": 0.13.3
-    "@opentelemetry/api": 1.6.0
-    "@opentelemetry/exporter-collector": 0.25.0
-    "@opentelemetry/semantic-conventions": 1.17.1
-    "@pmmmwh/react-refresh-webpack-plugin": 0.5.10
-    "@popperjs/core": 2.11.8
-    "@prometheus-io/lezer-promql": ^0.37.0-rc.1
-    "@react-aria/button": 3.8.0
-    "@react-aria/dialog": 3.5.3
-    "@react-aria/focus": 3.13.0
-    "@react-aria/interactions": 3.16.0
-    "@react-aria/menu": 3.10.0
-    "@react-aria/overlays": 3.15.0
-    "@react-aria/utils": 3.18.0
-    "@react-awesome-query-builder/core": 6.4.1
-    "@react-awesome-query-builder/ui": 6.4.1
-    "@react-stately/collections": 3.9.0
-    "@react-stately/menu": 3.5.3
-    "@react-stately/tree": 3.7.0
-    "@react-types/button": 3.9.0
-    "@react-types/menu": 3.9.2
-    "@react-types/overlays": 3.8.0
-    "@react-types/shared": 3.21.0
-    "@reduxjs/toolkit": 1.9.5
-    "@remix-run/router": ^1.5.0
-    "@rtsao/plugin-proposal-class-properties": 7.0.1-patch.1
-    "@swc/core": 1.3.38
-    "@swc/helpers": 0.4.14
-    "@testing-library/dom": 9.3.3
-    "@testing-library/jest-dom": 5.16.5
-    "@testing-library/react": 14.0.0
-    "@testing-library/react-hooks": ^8.0.1
-    "@testing-library/user-event": 14.5.1
-    "@types/angular": 1.8.5
-    "@types/angular-route": 1.7.3
-    "@types/chance": ^1.1.3
-    "@types/common-tags": ^1.8.0
-    "@types/d3": 7.4.0
-    "@types/d3-force": ^3.0.0
-    "@types/d3-scale-chromatic": 3.0.0
-    "@types/debounce-promise": 3.1.6
-    "@types/diff": ^5
-    "@types/eslint": 8.44.0
-    "@types/file-saver": 2.0.5
-    "@types/glob": ^8.0.0
-    "@types/google.analytics": ^0.0.42
-    "@types/gtag.js": ^0.0.12
-    "@types/history": 4.7.11
-    "@types/hoist-non-react-statics": 3.3.1
-    "@types/jest": 29.5.4
-    "@types/jquery": 3.5.16
-    "@types/js-yaml": ^4.0.5
-    "@types/jsurl": ^1.2.28
-    "@types/lodash": 4.14.195
-    "@types/logfmt": ^1.2.3
-    "@types/lucene": ^2
-    "@types/marked": 5.0.1
-    "@types/mousetrap": 1.6.11
-    "@types/node": 18.18.4
-    "@types/node-forge": ^1
-    "@types/ol-ext": "npm:@siedlerchr/types-ol-ext@3.2.0"
-    "@types/papaparse": 5.3.7
-    "@types/pluralize": ^0.0.30
-    "@types/prismjs": 1.26.0
-    "@types/react": 18.2.15
-    "@types/react-beautiful-dnd": 13.1.4
-    "@types/react-dom": 18.2.7
-    "@types/react-grid-layout": 1.3.2
-    "@types/react-highlight-words": 0.16.4
-    "@types/react-redux": 7.1.25
-    "@types/react-resizable": 3.0.4
-    "@types/react-router-dom": 5.3.3
-    "@types/react-table": 7.7.14
-    "@types/react-test-renderer": 18.0.0
-    "@types/react-transition-group": 4.4.6
-    "@types/react-virtualized-auto-sizer": 1.0.1
-    "@types/react-window": 1.8.5
-    "@types/react-window-infinite-loader": ^1
-    "@types/redux-mock-store": 1.0.3
-    "@types/semver": 7.5.0
-    "@types/slate": 0.47.11
-    "@types/slate-plain-serializer": 0.7.2
-    "@types/slate-react": 0.22.9
-    "@types/systemjs": 6.13.1
-    "@types/testing-library__jest-dom": 5.14.8
-    "@types/tinycolor2": 1.4.3
-    "@types/trusted-types": 2.0.3
-    "@types/uuid": 9.0.2
-    "@types/webpack-env": 1.18.1
-    "@types/yargs": 17.0.24
-    "@typescript-eslint/eslint-plugin": 5.42.0
-    "@typescript-eslint/parser": 5.42.0
-    "@visx/event": 3.3.0
-    "@visx/gradient": 3.3.0
-    "@visx/group": 3.3.0
-    "@visx/scale": 3.3.0
-    "@visx/shape": 3.3.0
-    "@visx/tooltip": 3.3.0
-    "@welldone-software/why-did-you-render": 7.0.1
-    angular: 1.8.3
-    angular-bindonce: 0.3.1
-    angular-route: 1.8.3
-    angular-sanitize: 1.8.3
-    ansicolor: 1.1.100
-    app: "link:./public/app"
-    autoprefixer: 10.4.14
-    babel-jest: 29.7.0
-    babel-loader: 9.1.3
-    babel-plugin-angularjs-annotate: 0.10.0
-    babel-plugin-macros: 3.1.0
-    baron: 3.0.3
-    blink-diff: 1.0.13
-    blob-polyfill: 7.0.20220408
-    brace: 0.11.1
-    browserslist: ^4.21.4
-    calculate-size: 1.1.1
-    centrifuge: 4.0.1
-    chance: ^1.0.10
-    chrome-remote-interface: 0.33.0
-    classnames: 2.3.2
-    codeowners: ^5.1.1
-    combokeys: ^3.0.0
-    comlink: 4.4.1
-    common-tags: 1.8.2
-    copy-webpack-plugin: 11.0.0
-    core-js: 3.33.0
-    css-loader: 6.8.1
-    css-minimizer-webpack-plugin: 5.0.1
-    cypress: 13.1.0
-    cypress-file-upload: 5.0.8
-    d3: 7.8.5
-    d3-force: 3.0.0
-    d3-scale-chromatic: 3.0.0
-    dangerously-set-html-content: 1.0.9
-    date-fns: 2.30.0
-    debounce-promise: 3.1.2
-    diff: ^5.1.0
-    emotion: 11.0.0
-    esbuild: 0.18.12
-    esbuild-loader: 3.0.1
-    esbuild-plugin-browserslist: ^0.8.0
-    eslint: 8.52.0
-    eslint-config-prettier: 8.8.0
-    eslint-plugin-import: ^2.26.0
-    eslint-plugin-jest: 27.4.2
-    eslint-plugin-jsdoc: 46.8.2
-    eslint-plugin-jsx-a11y: 6.7.1
-    eslint-plugin-lodash: 7.4.0
-    eslint-plugin-react: 7.33.2
-    eslint-plugin-react-hooks: 4.6.0
-    eslint-webpack-plugin: 4.0.1
-    eventemitter3: 5.0.1
-    expose-loader: 4.1.0
-    fast-deep-equal: ^3.1.3
-    fast-json-patch: 3.1.1
-    file-saver: 2.0.5
-    fork-ts-checker-webpack-plugin: 8.0.0
-    framework-utils: ^1.1.0
-    glob: 10.3.3
-    history: 4.10.1
-    hoist-non-react-statics: 3.3.2
-    html-loader: 4.2.0
-    html-webpack-plugin: 5.5.3
-    http-server: 14.1.1
-    i18next: ^22.0.0
-    i18next-browser-languagedetector: ^7.0.2
-    i18next-parser: 6.6.0
-    immer: 10.0.2
-    immutable: 4.3.1
-    jest: 29.7.0
-    jest-canvas-mock: 2.5.2
-    jest-date-mock: 1.0.8
-    jest-environment-jsdom: 29.7.0
-    jest-fail-on-console: 3.1.1
-    jest-junit: 16.0.0
-    jest-matcher-utils: 29.7.0
-    jquery: 3.7.0
-    js-yaml: ^4.1.0
-    json-markup: ^1.1.0
-    json-source-map: 0.6.1
-    jsurl: ^0.1.5
-    kbar: 0.1.0-beta.40
-    lerna: 5.5.4
-    lodash: 4.17.21
-    logfmt: ^1.3.2
-    lru-cache: 10.0.0
-    lru-memoize: ^1.1.0
-    lucene: ^2.1.1
-    marked: 5.1.1
-    marked-mangle: 1.1.0
-    memoize-one: 6.0.0
-    mini-css-extract-plugin: 2.7.6
-    moment: 2.29.4
-    moment-timezone: 0.5.43
-    monaco-editor: 0.34.0
-    monaco-promql: 1.7.4
-    mousetrap: 1.6.5
-    mousetrap-global-bind: 1.1.0
-    moveable: 0.43.1
-    msw: 1.3.2
-    mutationobserver-shim: 0.3.7
-    ngtemplate-loader: 2.1.0
-    node-forge: ^1.3.1
-    node-notifier: 10.0.1
-    ol: 7.4.0
-    ol-ext: 4.0.10
-    papaparse: 5.4.1
-    pluralize: ^8.0.0
-    postcss: 8.4.31
-    postcss-loader: 7.3.3
-    postcss-reporter: 7.0.5
-    postcss-scss: 4.0.6
-    prettier: 3.0.0
-    prismjs: 1.29.0
-    prop-types: 15.8.1
-    pseudoizer: ^0.1.0
-    rc-cascader: 3.19.0
-    rc-drawer: 6.5.2
-    rc-slider: 10.3.1
-    rc-time-picker: 3.7.3
-    rc-tree: 5.8.0
-    re-resizable: 6.9.9
-    react: 18.2.0
-    react-beautiful-dnd: 13.1.1
-    react-diff-viewer: ^3.1.1
-    react-dom: 18.2.0
-    react-draggable: 4.4.5
-    react-dropzone: ^14.2.3
-    react-enable: ^3.1.0
-    react-grid-layout: 1.4.2
-    react-highlight-words: 0.20.0
-    react-hook-form: 7.5.3
-    react-i18next: ^12.0.0
-    react-inlinesvg: 3.0.2
-    react-loading-skeleton: 3.3.1
-    react-moveable: 0.46.1
-    react-popper: 2.3.0
-    react-popper-tooltip: 4.4.2
-    react-redux: 7.2.6
-    react-refresh: 0.14.0
-    react-resizable: 3.0.5
-    react-responsive-carousel: ^3.2.23
-    react-router-dom: 5.3.3
-    react-router-dom-v5-compat: ^6.10.0
-    react-select: 5.7.4
-    react-select-event: 5.5.1
-    react-simple-compat: 1.2.3
-    react-split-pane: 0.1.92
-    react-table: 7.8.0
-    react-test-renderer: 18.2.0
-    react-transition-group: 4.4.5
-    react-use: 17.4.0
-    react-virtual: 2.10.4
-    react-virtualized-auto-sizer: 1.0.7
-    react-window: 1.8.9
-    react-window-infinite-loader: 1.0.9
-    redux: 4.2.1
-    redux-mock-store: 1.5.4
-    redux-thunk: 2.4.2
-    regenerator-runtime: 0.14.0
-    reselect: 4.1.8
-    rimraf: 5.0.1
-    rudder-sdk-js: 2.43.0
-    rxjs: 7.8.1
-    sass: 1.69.4
-    sass-loader: 13.3.2
-    selecto: 1.26.0
-    semver: 7.5.4
-    slate: 0.47.9
-    slate-plain-serializer: 0.7.13
-    slate-react: 0.22.10
-    sql-formatter-plus: ^1.3.6
-    style-loader: 3.3.3
-    stylelint: 15.11.0
-    stylelint-config-prettier: 9.0.5
-    stylelint-config-sass-guidelines: 10.0.0
-    symbol-observable: 4.0.0
-    terser-webpack-plugin: 5.3.9
-    test: "link:./public/test"
-    testing-library-selector: 0.3.1
+    "@kusto/monaco-kusto": "npm:^10.0.0"
+    "@leeoniya/ufuzzy": "npm:1.0.14"
+    "@lezer/common": "npm:1.2.1"
+    "@lezer/highlight": "npm:1.2.0"
+    "@lezer/lr": "npm:1.3.3"
+    "@locker/near-membrane-dom": "npm:0.13.6"
+    "@locker/near-membrane-shared": "npm:0.13.6"
+    "@locker/near-membrane-shared-dom": "npm:0.13.6"
+    "@manypkg/get-packages": "npm:^2.2.0"
+    "@msagl/core": "npm:^1.1.16"
+    "@msagl/parser": "npm:^1.1.16"
+    "@opentelemetry/api": "npm:1.7.0"
+    "@opentelemetry/exporter-collector": "npm:0.25.0"
+    "@opentelemetry/semantic-conventions": "npm:1.21.0"
+    "@playwright/test": "npm:1.42.1"
+    "@pmmmwh/react-refresh-webpack-plugin": "npm:0.5.11"
+    "@popperjs/core": "npm:2.11.8"
+    "@prometheus-io/lezer-promql": "npm:^0.37.0-rc.1"
+    "@react-aria/dialog": "npm:3.5.12"
+    "@react-aria/focus": "npm:3.16.2"
+    "@react-aria/overlays": "npm:3.21.1"
+    "@react-aria/utils": "npm:3.23.2"
+    "@react-awesome-query-builder/core": "npm:6.4.2"
+    "@react-awesome-query-builder/ui": "npm:6.4.2"
+    "@react-types/button": "npm:3.9.2"
+    "@react-types/menu": "npm:3.9.7"
+    "@react-types/overlays": "npm:3.8.5"
+    "@react-types/shared": "npm:3.22.1"
+    "@reduxjs/toolkit": "npm:1.9.5"
+    "@remix-run/router": "npm:^1.5.0"
+    "@rtsao/plugin-proposal-class-properties": "npm:7.0.1-patch.1"
+    "@swc/core": "npm:1.4.2"
+    "@swc/helpers": "npm:0.5.8"
+    "@testing-library/dom": "npm:9.3.4"
+    "@testing-library/jest-dom": "npm:6.4.2"
+    "@testing-library/react": "npm:14.2.2"
+    "@testing-library/react-hooks": "npm:^8.0.1"
+    "@testing-library/user-event": "npm:14.5.2"
+    "@types/angular": "npm:1.8.9"
+    "@types/angular-route": "npm:1.7.6"
+    "@types/chance": "npm:^1.1.3"
+    "@types/common-tags": "npm:^1.8.0"
+    "@types/d3": "npm:7.4.3"
+    "@types/d3-force": "npm:^3.0.0"
+    "@types/d3-scale-chromatic": "npm:3.0.3"
+    "@types/debounce-promise": "npm:3.1.9"
+    "@types/diff": "npm:^5"
+    "@types/eslint": "npm:8.56.6"
+    "@types/eslint-scope": "npm:^3.7.7"
+    "@types/file-saver": "npm:2.0.7"
+    "@types/glob": "npm:^8.0.0"
+    "@types/google.analytics": "npm:^0.0.46"
+    "@types/gtag.js": "npm:^0.0.19"
+    "@types/history": "npm:4.7.11"
+    "@types/hoist-non-react-statics": "npm:3.3.5"
+    "@types/jest": "npm:29.5.12"
+    "@types/jquery": "npm:3.5.29"
+    "@types/js-yaml": "npm:^4.0.5"
+    "@types/jsurl": "npm:^1.2.28"
+    "@types/lodash": "npm:4.17.0"
+    "@types/logfmt": "npm:^1.2.3"
+    "@types/lucene": "npm:^2"
+    "@types/marked": "npm:5.0.2"
+    "@types/mousetrap": "npm:1.6.15"
+    "@types/node": "npm:20.11.30"
+    "@types/node-forge": "npm:^1"
+    "@types/ol-ext": "npm:@siedlerchr/types-ol-ext@3.2.4"
+    "@types/papaparse": "npm:5.3.14"
+    "@types/pluralize": "npm:^0.0.33"
+    "@types/prismjs": "npm:1.26.3"
+    "@types/react": "npm:18.2.73"
+    "@types/react-beautiful-dnd": "npm:13.1.8"
+    "@types/react-dom": "npm:18.2.22"
+    "@types/react-grid-layout": "npm:1.3.5"
+    "@types/react-highlight-words": "npm:0.16.7"
+    "@types/react-resizable": "npm:3.0.7"
+    "@types/react-router": "npm:5.1.20"
+    "@types/react-router-dom": "npm:5.3.3"
+    "@types/react-table": "npm:7.7.20"
+    "@types/react-test-renderer": "npm:18.0.7"
+    "@types/react-transition-group": "npm:4.4.10"
+    "@types/react-virtualized-auto-sizer": "npm:1.0.4"
+    "@types/react-window": "npm:1.8.8"
+    "@types/react-window-infinite-loader": "npm:^1"
+    "@types/redux-mock-store": "npm:1.0.6"
+    "@types/semver": "npm:7.5.8"
+    "@types/slate": "npm:0.47.11"
+    "@types/slate-plain-serializer": "npm:0.7.5"
+    "@types/slate-react": "npm:0.22.9"
+    "@types/systemjs": "npm:6.13.5"
+    "@types/testing-library__jest-dom": "npm:5.14.9"
+    "@types/tinycolor2": "npm:1.4.6"
+    "@types/trusted-types": "npm:2.0.7"
+    "@types/uuid": "npm:9.0.8"
+    "@types/webpack-assets-manifest": "npm:^5"
+    "@types/webpack-env": "npm:1.18.4"
+    "@types/yargs": "npm:17.0.32"
+    "@typescript-eslint/eslint-plugin": "npm:6.21.0"
+    "@typescript-eslint/parser": "npm:6.21.0"
+    "@visx/event": "npm:3.3.0"
+    "@visx/gradient": "npm:3.3.0"
+    "@visx/group": "npm:3.3.0"
+    "@visx/scale": "npm:3.5.0"
+    "@visx/shape": "npm:3.5.0"
+    "@visx/tooltip": "npm:3.3.0"
+    "@welldone-software/why-did-you-render": "npm:8.0.1"
+    angular: "npm:1.8.3"
+    angular-bindonce: "npm:0.3.1"
+    angular-route: "npm:1.8.3"
+    angular-sanitize: "npm:1.8.3"
+    ansicolor: "npm:1.1.100"
+    autoprefixer: "npm:10.4.19"
+    baron: "npm:3.0.3"
+    blob-polyfill: "npm:7.0.20220408"
+    brace: "npm:0.11.1"
+    browserslist: "npm:^4.21.4"
+    calculate-size: "npm:1.1.1"
+    centrifuge: "npm:5.0.2"
+    chance: "npm:^1.0.10"
+    chrome-remote-interface: "npm:0.33.0"
+    classnames: "npm:2.5.1"
+    codeowners: "npm:^5.1.1"
+    combokeys: "npm:^3.0.0"
+    comlink: "npm:4.4.1"
+    common-tags: "npm:1.8.2"
+    copy-webpack-plugin: "npm:12.0.2"
+    core-js: "npm:3.36.1"
+    css-loader: "npm:6.10.0"
+    css-minimizer-webpack-plugin: "npm:6.0.0"
+    cypress: "npm:13.1.0"
+    cypress-file-upload: "npm:5.0.8"
+    d3: "npm:7.9.0"
+    d3-force: "npm:3.0.0"
+    d3-scale-chromatic: "npm:3.1.0"
+    dangerously-set-html-content: "npm:1.1.0"
+    date-fns: "npm:3.6.0"
+    debounce-promise: "npm:3.1.2"
+    diff: "npm:^5.1.0"
+    emotion: "npm:11.0.0"
+    esbuild: "npm:0.20.1"
+    esbuild-loader: "npm:4.1.0"
+    esbuild-plugin-browserslist: "npm:^0.11.0"
+    eslint: "npm:8.57.0"
+    eslint-config-prettier: "npm:9.1.0"
+    eslint-plugin-import: "npm:^2.26.0"
+    eslint-plugin-jest: "npm:27.9.0"
+    eslint-plugin-jsdoc: "npm:48.2.2"
+    eslint-plugin-jsx-a11y: "npm:6.8.0"
+    eslint-plugin-lodash: "npm:7.4.0"
+    eslint-plugin-react: "npm:7.34.1"
+    eslint-plugin-react-hooks: "npm:4.6.0"
+    eslint-scope: "npm:^8.0.0"
+    eslint-webpack-plugin: "npm:4.1.0"
+    eventemitter3: "npm:5.0.1"
+    expose-loader: "npm:5.0.0"
+    fast-deep-equal: "npm:^3.1.3"
+    fast-json-patch: "npm:3.1.1"
+    file-saver: "npm:2.0.5"
+    fork-ts-checker-webpack-plugin: "npm:9.0.2"
+    framework-utils: "npm:^1.1.0"
+    glob: "npm:10.3.10"
+    history: "npm:4.10.1"
+    hoist-non-react-statics: "npm:3.3.2"
+    html-loader: "npm:5.0.0"
+    html-webpack-plugin: "npm:5.6.0"
+    http-server: "npm:14.1.1"
+    i18next: "npm:^23.0.0"
+    i18next-browser-languagedetector: "npm:^7.0.2"
+    i18next-parser: "npm:8.13.0"
+    immer: "npm:10.0.4"
+    immutable: "npm:4.3.5"
+    jest: "npm:29.7.0"
+    jest-canvas-mock: "npm:2.5.2"
+    jest-date-mock: "npm:1.0.9"
+    jest-environment-jsdom: "npm:29.7.0"
+    jest-fail-on-console: "npm:3.1.2"
+    jest-junit: "npm:16.0.0"
+    jest-matcher-utils: "npm:29.7.0"
+    jest-watch-typeahead: "npm:^2.2.2"
+    jquery: "npm:3.7.1"
+    js-yaml: "npm:^4.1.0"
+    json-markup: "npm:^1.1.0"
+    json-source-map: "npm:0.6.1"
+    jsurl: "npm:^0.1.5"
+    kbar: "npm:0.1.0-beta.45"
+    lerna: "npm:8.1.2"
+    leven: "npm:^4.0.0"
+    lodash: "npm:4.17.21"
+    logfmt: "npm:^1.3.2"
+    lru-cache: "npm:10.2.0"
+    lru-memoize: "npm:^1.1.0"
+    lucene: "npm:^2.1.1"
+    marked: "npm:12.0.1"
+    marked-mangle: "npm:1.1.7"
+    memoize-one: "npm:6.0.0"
+    mini-css-extract-plugin: "npm:2.8.1"
+    ml-regression-polynomial: "npm:^3.0.0"
+    ml-regression-simple-linear: "npm:^3.0.0"
+    moment: "npm:2.30.1"
+    moment-timezone: "npm:0.5.45"
+    monaco-editor: "npm:0.34.0"
+    monaco-promql: "npm:1.7.4"
+    mousetrap: "npm:1.6.5"
+    mousetrap-global-bind: "npm:1.1.0"
+    moveable: "npm:0.53.0"
+    msw: "npm:2.2.13"
+    mutationobserver-shim: "npm:0.3.7"
+    nanoid: "npm:^5.0.4"
+    ngtemplate-loader: "npm:2.1.0"
+    node-forge: "npm:^1.3.1"
+    node-notifier: "npm:10.0.1"
+    nx: "npm:18.1.3"
+    ol: "npm:7.4.0"
+    ol-ext: "npm:4.0.17"
+    papaparse: "npm:5.4.1"
+    pluralize: "npm:^8.0.0"
+    postcss: "npm:8.4.38"
+    postcss-loader: "npm:8.1.1"
+    postcss-reporter: "npm:7.1.0"
+    postcss-scss: "npm:4.0.9"
+    prettier: "npm:3.2.5"
+    prismjs: "npm:1.29.0"
+    prop-types: "npm:15.8.1"
+    pseudoizer: "npm:^0.1.0"
+    rc-cascader: "npm:3.24.0"
+    rc-drawer: "npm:7.1.0"
+    rc-slider: "npm:10.5.0"
+    rc-time-picker: "npm:3.7.3"
+    rc-tree: "npm:5.8.5"
+    re-resizable: "npm:6.9.11"
+    react: "npm:18.2.0"
+    react-beautiful-dnd: "npm:13.1.1"
+    react-diff-viewer: "npm:^3.1.1"
+    react-dom: "npm:18.2.0"
+    react-draggable: "npm:4.4.6"
+    react-dropzone: "npm:^14.2.3"
+    react-grid-layout: "npm:1.4.4"
+    react-highlight-words: "npm:0.20.0"
+    react-hook-form: "npm:^7.49.2"
+    react-i18next: "npm:^12.0.0"
+    react-inlinesvg: "npm:3.0.2"
+    react-loading-skeleton: "npm:3.4.0"
+    react-moveable: "npm:0.56.0"
+    react-redux: "npm:8.1.3"
+    react-refresh: "npm:0.14.0"
+    react-resizable: "npm:3.0.5"
+    react-responsive-carousel: "npm:^3.2.23"
+    react-router: "npm:5.3.3"
+    react-router-dom: "npm:5.3.3"
+    react-router-dom-v5-compat: "npm:^6.10.0"
+    react-select: "npm:5.8.0"
+    react-select-event: "npm:5.5.1"
+    react-simple-compat: "npm:1.2.3"
+    react-split-pane: "npm:0.1.92"
+    react-table: "npm:7.8.0"
+    react-test-renderer: "npm:18.2.0"
+    react-transition-group: "npm:4.4.5"
+    react-use: "npm:17.5.0"
+    react-virtual: "npm:2.10.4"
+    react-virtualized-auto-sizer: "npm:1.0.24"
+    react-window: "npm:1.8.10"
+    react-window-infinite-loader: "npm:1.0.9"
+    react-zoom-pan-pinch: "npm:^3.3.0"
+    redux: "npm:4.2.1"
+    redux-mock-store: "npm:1.5.4"
+    redux-thunk: "npm:2.4.2"
+    regenerator-runtime: "npm:0.14.1"
+    reselect: "npm:4.1.8"
+    rimraf: "npm:5.0.5"
+    rudder-sdk-js: "npm:2.48.6"
+    rxjs: "npm:7.8.1"
+    sass: "npm:1.72.0"
+    sass-loader: "npm:14.1.1"
+    selecto: "npm:1.26.3"
+    semver: "npm:7.6.0"
+    slate: "npm:0.47.9"
+    slate-plain-serializer: "npm:0.7.13"
+    slate-react: "npm:0.22.10"
+    style-loader: "npm:3.3.4"
+    stylelint: "npm:16.3.1"
+    stylelint-config-sass-guidelines: "npm:11.1.0"
+    symbol-observable: "npm:4.0.0"
+    systemjs: "npm:6.14.3"
+    systemjs-cjs-extra: "npm:0.2.1"
+    terser-webpack-plugin: "npm:5.3.10"
+    testing-library-selector: "npm:0.3.1"
     tether-drop: "https://github.com/torkelo/drop"
-    tinycolor2: 1.6.0
-    tracelib: 1.0.1
-    ts-jest: 29.1.1
-    ts-node: 10.9.1
-    tslib: 2.6.0
-    tween-functions: ^1.2.0
-    typescript: 4.8.4
-    uplot: 1.6.26
-    uuid: 9.0.0
-    vendor: "link:./public/vendor"
-    visjs-network: 4.25.0
-    wait-on: 7.0.1
-    webpack: 5.89.0
-    webpack-bundle-analyzer: 4.9.0
-    webpack-cli: 5.1.4
-    webpack-dev-server: 4.15.1
-    webpack-manifest-plugin: 5.0.0
-    webpack-merge: 5.10.0
-    whatwg-fetch: 3.6.2
-    xlsx: "https://cdn.sheetjs.com/xlsx-0.19.1/xlsx-0.19.1.tgz"
-    yaml: ^2.0.0
-    yargs: ^17.5.1
+    tinycolor2: "npm:1.6.0"
+    tracelib: "npm:1.0.1"
+    ts-jest: "npm:29.1.2"
+    ts-node: "npm:10.9.2"
+    tslib: "npm:2.6.2"
+    tween-functions: "npm:^1.2.0"
+    typescript: "npm:5.3.3"
+    uplot: "npm:1.6.30"
+    uuid: "npm:9.0.1"
+    visjs-network: "npm:4.25.0"
+    webpack: "npm:5.91.0"
+    webpack-assets-manifest: "npm:^5.1.0"
+    webpack-bundle-analyzer: "npm:4.10.1"
+    webpack-cli: "npm:5.1.4"
+    webpack-dev-server: "npm:5.0.4"
+    webpack-manifest-plugin: "npm:5.0.0"
+    webpack-merge: "npm:5.10.0"
+    webpackbar: "npm:^6.0.0"
+    whatwg-fetch: "npm:3.6.20"
+    xlsx: "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz"
+    yaml: "npm:^2.0.0"
+    yargs: "npm:^17.5.1"
   dependenciesMeta:
-    prettier@3.0.0:
+    prettier@3.2.5:
       unplugged: true
   languageName: unknown
   linkType: soft
 
-"grapheme-splitter@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "grapheme-splitter@npm:1.0.4"
-  checksum: 0c22ec54dee1b05cd480f78cf14f732cb5b108edc073572c4ec205df4cd63f30f8db8025afc5debc8835a8ddeacf648a1c7992fe3dcd6ad38f9a476d84906620
-  languageName: node
-  linkType: hard
-
 "graphemer@npm:^1.4.0":
   version: 1.4.0
   resolution: "graphemer@npm:1.4.0"
-  checksum: bab8f0be9b568857c7bec9fda95a89f87b783546d02951c40c33f84d05bb7da3fd10f863a9beb901463669b6583173a8c8cc6d6b306ea2b9b9d5d3d943c3a673
+  checksum: 10/6dd60dba97007b21e3a829fab3f771803cc1292977fe610e240ea72afd67e5690ac9eeaafc4a99710e78962e5936ab5a460787c2a1180f1cb0ccfac37d29f897
   languageName: node
   linkType: hard
 
 "graphql@npm:^16.8.1":
   version: 16.8.1
   resolution: "graphql@npm:16.8.1"
-  checksum: 8d304b7b6f708c8c5cc164b06e92467dfe36aff6d4f2cf31dd19c4c2905a0e7b89edac4b7e225871131fd24e21460836b369de0c06532644d15b461d55b1ccc0
+  checksum: 10/7a09d3ec5f75061afe2bd2421a2d53cf37273d2ecaad8f34febea1f1ac205dfec2834aec3419fa0a10fcc9fb345863b2f893562fb07ea825da2ae82f6392893c
   languageName: node
   linkType: hard
 
 "growly@npm:^1.3.0":
   version: 1.3.0
   resolution: "growly@npm:1.3.0"
-  checksum: 53cdecd4c16d7d9154a9061a9ccb87d602e957502ca69b529d7d1b2436c2c0b700ec544fc6b3e4cd115d59b81e62e44ce86bd0521403b579d3a2a97d7ce72a44
+  checksum: 10/77f9abc3a854ec628580939f004ba8f05c677f9a6c957be817525f20f68f75368c4879c64d12551f262a9a00de33fbefc4deb24f8f2124429c906ef20ec3c678
   languageName: node
   linkType: hard
 
@@ -18154,8 +19406,8 @@ __metadata:
   version: 2.0.0
   resolution: "gulp-sort@npm:2.0.0"
   dependencies:
-    through2: ^2.0.1
-  checksum: 8645d80b26990290e8623ccf38420e319a4ea67b64ac3e4f2b5de6c20b9006973001fd989dfe0fe3b2560044d3dfbc005685126826536e01718a2628aa45d0c5
+    through2: "npm:^2.0.1"
+  checksum: 10/8645d80b26990290e8623ccf38420e319a4ea67b64ac3e4f2b5de6c20b9006973001fd989dfe0fe3b2560044d3dfbc005685126826536e01718a2628aa45d0c5
   languageName: node
   linkType: hard
 
@@ -18163,15 +19415,15 @@ __metadata:
   version: 1.4.2
   resolution: "gunzip-maybe@npm:1.4.2"
   dependencies:
-    browserify-zlib: ^0.1.4
-    is-deflate: ^1.0.0
-    is-gzip: ^1.0.0
-    peek-stream: ^1.1.0
-    pumpify: ^1.3.3
-    through2: ^2.0.3
+    browserify-zlib: "npm:^0.1.4"
+    is-deflate: "npm:^1.0.0"
+    is-gzip: "npm:^1.0.0"
+    peek-stream: "npm:^1.1.0"
+    pumpify: "npm:^1.3.3"
+    through2: "npm:^2.0.3"
   bin:
     gunzip-maybe: bin.js
-  checksum: bc4d4977c24a2860238df271de75d53dd72a359d19f1248d1c613807dc221d3b8ae09624e3085c8106663e3e1b59db62a85b261d1138c2cc24efad9df577d4e1
+  checksum: 10/82a4eadb617e50ac63cb88b3c1ebef0f85de702c0c2031c5d9c0575837e1eef7c94fa4ad69ca4aec2dc3d939c89054ec07c91c233648433058efa7d44354d456
   languageName: node
   linkType: hard
 
@@ -18179,22 +19431,22 @@ __metadata:
   version: 6.0.0
   resolution: "gzip-size@npm:6.0.0"
   dependencies:
-    duplexer: ^0.1.2
-  checksum: 2df97f359696ad154fc171dcb55bc883fe6e833bca7a65e457b9358f3cb6312405ed70a8da24a77c1baac0639906cd52358dc0ce2ec1a937eaa631b934c94194
+    duplexer: "npm:^0.1.2"
+  checksum: 10/2df97f359696ad154fc171dcb55bc883fe6e833bca7a65e457b9358f3cb6312405ed70a8da24a77c1baac0639906cd52358dc0ce2ec1a937eaa631b934c94194
   languageName: node
   linkType: hard
 
 "hammerjs@npm:^2.0.8":
   version: 2.0.8
   resolution: "hammerjs@npm:2.0.8"
-  checksum: b092da7d1565a165d7edb53ef0ce212837a8b11f897aa3cf81a7818b66686b0ab3f4747fbce8fc8a41d1376594639ce3a054b0fd4889ca8b5b136a29ca500e27
+  checksum: 10/9155d056f252ef35e8ca258dbb5ee2c9d8794f6805d083da7d1d9763d185e3e149459ecc2b36ccce584e3cd5f099fd9fa55056e3bcc7724046390f2e5ae25815
   languageName: node
   linkType: hard
 
 "handle-thing@npm:^2.0.0":
   version: 2.0.1
   resolution: "handle-thing@npm:2.0.1"
-  checksum: 68071f313062315cd9dce55710e9496873945f1dd425107007058fc1629f93002a7649fcc3e464281ce02c7e809a35f5925504ab8105d972cf649f1f47cb7d6c
+  checksum: 10/441ec98b07f26819c70c702f6c874088eebeb551b242fe8fae4eab325746b82bf84ae7a1f6419547698accb3941fa26806c5f5f93c50e19f90e499065a711d61
   languageName: node
   linkType: hard
 
@@ -18202,24 +19454,24 @@ __metadata:
   version: 4.7.7
   resolution: "handlebars@npm:4.7.7"
   dependencies:
-    minimist: ^1.2.5
-    neo-async: ^2.6.0
-    source-map: ^0.6.1
-    uglify-js: ^3.1.4
-    wordwrap: ^1.0.0
+    minimist: "npm:^1.2.5"
+    neo-async: "npm:^2.6.0"
+    source-map: "npm:^0.6.1"
+    uglify-js: "npm:^3.1.4"
+    wordwrap: "npm:^1.0.0"
   dependenciesMeta:
     uglify-js:
       optional: true
   bin:
     handlebars: bin/handlebars
-  checksum: 1e79a43f5e18d15742977cb987923eab3e2a8f44f2d9d340982bcb69e1735ed049226e534d7c1074eaddaf37e4fb4f471a8adb71cddd5bc8cf3f894241df5cee
+  checksum: 10/617b1e689b7577734abc74564bdb8cdaddf8fd48ce72afdb489f426e9c60a7d6ee2a2707c023720c4059070128243c948bded8f2716e4543378033e3971b85ea
   languageName: node
   linkType: hard
 
 "har-schema@npm:^2.0.0":
   version: 2.0.0
   resolution: "har-schema@npm:2.0.0"
-  checksum: d8946348f333fb09e2bf24cc4c67eabb47c8e1d1aa1c14184c7ffec1140a49ec8aa78aa93677ae452d71d5fc0fdeec20f0c8c1237291fc2bcb3f502a5d204f9b
+  checksum: 10/d8946348f333fb09e2bf24cc4c67eabb47c8e1d1aa1c14184c7ffec1140a49ec8aa78aa93677ae452d71d5fc0fdeec20f0c8c1237291fc2bcb3f502a5d204f9b
   languageName: node
   linkType: hard
 
@@ -18227,101 +19479,92 @@ __metadata:
   version: 5.1.5
   resolution: "har-validator@npm:5.1.5"
   dependencies:
-    ajv: ^6.12.3
-    har-schema: ^2.0.0
-  checksum: b998a7269ca560d7f219eedc53e2c664cd87d487e428ae854a6af4573fc94f182fe9d2e3b92ab968249baec7ebaf9ead69cf975c931dc2ab282ec182ee988280
+    ajv: "npm:^6.12.3"
+    har-schema: "npm:^2.0.0"
+  checksum: 10/b998a7269ca560d7f219eedc53e2c664cd87d487e428ae854a6af4573fc94f182fe9d2e3b92ab968249baec7ebaf9ead69cf975c931dc2ab282ec182ee988280
   languageName: node
   linkType: hard
 
 "hard-rejection@npm:^2.1.0":
   version: 2.1.0
   resolution: "hard-rejection@npm:2.1.0"
-  checksum: 7baaf80a0c7fff4ca79687b4060113f1529589852152fa935e6787a2bc96211e784ad4588fb3048136ff8ffc9dfcf3ae385314a5b24db32de20bea0d1597f9dc
+  checksum: 10/7baaf80a0c7fff4ca79687b4060113f1529589852152fa935e6787a2bc96211e784ad4588fb3048136ff8ffc9dfcf3ae385314a5b24db32de20bea0d1597f9dc
   languageName: node
   linkType: hard
 
 "has-bigints@npm:^1.0.1, has-bigints@npm:^1.0.2":
   version: 1.0.2
   resolution: "has-bigints@npm:1.0.2"
-  checksum: 390e31e7be7e5c6fe68b81babb73dfc35d413604d7ee5f56da101417027a4b4ce6a27e46eff97ad040c835b5d228676eae99a9b5c3bc0e23c8e81a49241ff45b
+  checksum: 10/4e0426c900af034d12db14abfece02ce7dbf53f2022d28af1a97913ff4c07adb8799476d57dc44fbca0e07d1dbda2a042c2928b1f33d3f09c15de0640a7fb81b
   languageName: node
   linkType: hard
 
 "has-flag@npm:^3.0.0":
   version: 3.0.0
   resolution: "has-flag@npm:3.0.0"
-  checksum: 4a15638b454bf086c8148979aae044dd6e39d63904cd452d970374fa6a87623423da485dfb814e7be882e05c096a7ccf1ebd48e7e7501d0208d8384ff4dea73b
+  checksum: 10/4a15638b454bf086c8148979aae044dd6e39d63904cd452d970374fa6a87623423da485dfb814e7be882e05c096a7ccf1ebd48e7e7501d0208d8384ff4dea73b
   languageName: node
   linkType: hard
 
 "has-flag@npm:^4.0.0":
   version: 4.0.0
   resolution: "has-flag@npm:4.0.0"
-  checksum: 261a1357037ead75e338156b1f9452c016a37dcd3283a972a30d9e4a87441ba372c8b81f818cd0fbcd9c0354b4ae7e18b9e1afa1971164aef6d18c2b6095a8ad
+  checksum: 10/261a1357037ead75e338156b1f9452c016a37dcd3283a972a30d9e4a87441ba372c8b81f818cd0fbcd9c0354b4ae7e18b9e1afa1971164aef6d18c2b6095a8ad
   languageName: node
   linkType: hard
 
-"has-property-descriptors@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "has-property-descriptors@npm:1.0.0"
+"has-property-descriptors@npm:^1.0.0, has-property-descriptors@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "has-property-descriptors@npm:1.0.2"
   dependencies:
-    get-intrinsic: ^1.1.1
-  checksum: a6d3f0a266d0294d972e354782e872e2fe1b6495b321e6ef678c9b7a06a40408a6891817350c62e752adced73a94ac903c54734fee05bf65b1905ee1368194bb
+    es-define-property: "npm:^1.0.0"
+  checksum: 10/2d8c9ab8cebb572e3362f7d06139a4592105983d4317e68f7adba320fe6ddfc8874581e0971e899e633fd5f72e262830edce36d5a0bc863dad17ad20572484b2
   languageName: node
   linkType: hard
 
-"has-proto@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "has-proto@npm:1.0.1"
-  checksum: febc5b5b531de8022806ad7407935e2135f1cc9e64636c3916c6842bd7995994ca3b29871ecd7954bd35f9e2986c17b3b227880484d22259e2f8e6ce63fd383e
+"has-proto@npm:^1.0.1, has-proto@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "has-proto@npm:1.0.3"
+  checksum: 10/0b67c2c94e3bea37db3e412e3c41f79d59259875e636ba471e94c009cdfb1fa82bf045deeffafc7dbb9c148e36cae6b467055aaa5d9fad4316e11b41e3ba551a
   languageName: node
   linkType: hard
 
 "has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3":
   version: 1.0.3
   resolution: "has-symbols@npm:1.0.3"
-  checksum: a054c40c631c0d5741a8285010a0777ea0c068f99ed43e5d6eb12972da223f8af553a455132fdb0801bdcfa0e0f443c0c03a68d8555aa529b3144b446c3f2410
+  checksum: 10/464f97a8202a7690dadd026e6d73b1ceeddd60fe6acfd06151106f050303eaa75855aaa94969df8015c11ff7c505f196114d22f7386b4a471038da5874cf5e9b
   languageName: node
   linkType: hard
 
-"has-tostringtag@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "has-tostringtag@npm:1.0.0"
+"has-tostringtag@npm:^1.0.0, has-tostringtag@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "has-tostringtag@npm:1.0.2"
   dependencies:
-    has-symbols: ^1.0.2
-  checksum: cc12eb28cb6ae22369ebaad3a8ab0799ed61270991be88f208d508076a1e99abe4198c965935ce85ea90b60c94ddda73693b0920b58e7ead048b4a391b502c1c
+    has-symbols: "npm:^1.0.3"
+  checksum: 10/c74c5f5ceee3c8a5b8bc37719840dc3749f5b0306d818974141dda2471a1a2ca6c8e46b9d6ac222c5345df7a901c9b6f350b1e6d62763fec877e26609a401bfe
   languageName: node
   linkType: hard
 
-"has-unicode@npm:^2.0.0, has-unicode@npm:^2.0.1":
+"has-unicode@npm:2.0.1, has-unicode@npm:^2.0.0, has-unicode@npm:^2.0.1":
   version: 2.0.1
   resolution: "has-unicode@npm:2.0.1"
-  checksum: 1eab07a7436512db0be40a710b29b5dc21fa04880b7f63c9980b706683127e3c1b57cb80ea96d47991bdae2dfe479604f6a1ba410106ee1046a41d1bd0814400
-  languageName: node
-  linkType: hard
-
-"has@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "has@npm:1.0.3"
-  dependencies:
-    function-bind: ^1.1.1
-  checksum: b9ad53d53be4af90ce5d1c38331e712522417d017d5ef1ebd0507e07c2fbad8686fffb8e12ddecd4c39ca9b9b47431afbb975b8abf7f3c3b82c98e9aad052792
+  checksum: 10/041b4293ad6bf391e21c5d85ed03f412506d6623786b801c4ab39e4e6ca54993f13201bceb544d92963f9e0024e6e7fbf0cb1d84c9d6b31cb9c79c8c990d13d8
   languageName: node
   linkType: hard
 
-"hasown@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "hasown@npm:2.0.0"
+"hasown@npm:^2.0.0, hasown@npm:^2.0.1":
+  version: 2.0.2
+  resolution: "hasown@npm:2.0.2"
   dependencies:
-    function-bind: ^1.1.2
-  checksum: 6151c75ca12554565098641c98a40f4cc86b85b0fd5b6fe92360967e4605a4f9610f7757260b4e8098dd1c2ce7f4b095f2006fe72a570e3b6d2d28de0298c176
+    function-bind: "npm:^1.1.2"
+  checksum: 10/7898a9c1788b2862cf0f9c345a6bec77ba4a0c0983c7f19d610c382343d4f98fa260686b225dfb1f88393a66679d2ec58ee310c1d6868c081eda7918f32cc70a
   languageName: node
   linkType: hard
 
 "hast-util-parse-selector@npm:^2.0.0":
   version: 2.2.5
   resolution: "hast-util-parse-selector@npm:2.2.5"
-  checksum: 22ee4afbd11754562144cb3c4f3ec52524dafba4d90ee52512902d17cf11066d83b38f7bdf6ca571bbc2541f07ba30db0d234657b6ecb8ca4631587466459605
+  checksum: 10/22ee4afbd11754562144cb3c4f3ec52524dafba4d90ee52512902d17cf11066d83b38f7bdf6ca571bbc2541f07ba30db0d234657b6ecb8ca4631587466459605
   languageName: node
   linkType: hard
 
@@ -18329,12 +19572,12 @@ __metadata:
   version: 6.0.0
   resolution: "hastscript@npm:6.0.0"
   dependencies:
-    "@types/hast": ^2.0.0
-    comma-separated-tokens: ^1.0.0
-    hast-util-parse-selector: ^2.0.0
-    property-information: ^5.0.0
-    space-separated-tokens: ^1.0.0
-  checksum: 5e50b85af0d2cb7c17979cb1ddca75d6b96b53019dd999b39e7833192c9004201c3cee6445065620ea05d0087d9ae147a4844e582d64868be5bc6b0232dfe52d
+    "@types/hast": "npm:^2.0.0"
+    comma-separated-tokens: "npm:^1.0.0"
+    hast-util-parse-selector: "npm:^2.0.0"
+    property-information: "npm:^5.0.0"
+    space-separated-tokens: "npm:^1.0.0"
+  checksum: 10/78f91b71e50506f7499c8275d67645f9f4f130e6f12b038853261d1fa7393432da4113baf3508c41b79d933f255089d6d593beea9d4cda89dfd34d0a498cf378
   languageName: node
   linkType: hard
 
@@ -18343,14 +19586,14 @@ __metadata:
   resolution: "he@npm:1.2.0"
   bin:
     he: bin/he
-  checksum: 3d4d6babccccd79c5c5a3f929a68af33360d6445587d628087f39a965079d84f18ce9c3d3f917ee1e3978916fc833bb8b29377c3b403f919426f91bc6965e7a7
+  checksum: 10/d09b2243da4e23f53336e8de3093e5c43d2c39f8d0d18817abfa32ce3e9355391b2edb4bb5edc376aea5d4b0b59d6a0482aab4c52bc02ef95751e4b818e847f1
   languageName: node
   linkType: hard
 
-"headers-polyfill@npm:3.2.5":
-  version: 3.2.5
-  resolution: "headers-polyfill@npm:3.2.5"
-  checksum: a3c4bdd661584fd39e40c0f91412abc514616edfbd20d29a75567e591f90ef5c445c8e209b7f3c2b2375d27e95e4690f33417368a168d4832484a93861ab6a3c
+"headers-polyfill@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "headers-polyfill@npm:4.0.2"
+  checksum: 10/70b53abf48a1d50760150624d6c7ca974a0d286ba102e411538f6dad6687ce51ce7cc60197e326df96f844548d6ff77d900e28c3cdbc0ba1fe09a05eae47156a
   languageName: node
   linkType: hard
 
@@ -18358,9 +19601,9 @@ __metadata:
   version: 0.1.10
   resolution: "heimdalljs-logger@npm:0.1.10"
   dependencies:
-    debug: ^2.2.0
-    heimdalljs: ^0.2.6
-  checksum: 40a698843aa4773e3376f4e000c87599460971f4411b402985526a8f82563f5486fc85bfde90ce3e63d25381cf417289e870242321ce92ade32ea3b91585cfad
+    debug: "npm:^2.2.0"
+    heimdalljs: "npm:^0.2.6"
+  checksum: 10/6f0affcaa9f44cc357916059113c8d65087a7047c0e7bff057f9514feb21085749d4529b6bd41ca30b2003e3c0a7548e7291aa7e393e7d71e03928501b257ace
   languageName: node
   linkType: hard
 
@@ -18368,22 +19611,22 @@ __metadata:
   version: 0.2.6
   resolution: "heimdalljs@npm:0.2.6"
   dependencies:
-    rsvp: ~3.2.1
-  checksum: 5b28d3df4e77ea94293b43c29f0a358381aa811079817f780a1dafc9d244c891a0a713691a3c53d0d2dc31a76484fb36d998e7ae5040ef4b52e8c4a00d2173ae
+    rsvp: "npm:~3.2.1"
+  checksum: 10/ae31e21241a30224657c01c05b4c1cba6b370e502e6b9f00de81df7387b2df960b6c526fe7d1e9456b9375bdc64c3178dcae1ad88cd0d68a1ba295935627ac23
   languageName: node
   linkType: hard
 
 "highlight-words-core@npm:^1.2.0":
   version: 1.2.2
   resolution: "highlight-words-core@npm:1.2.2"
-  checksum: 737758a8a572c82919552b031df300016164b7d0db6a819d24bc6c7ca2279d3cd6d03497728930d6402423c7a3fc2f42c628a9b01b025c704a0b56a635377511
+  checksum: 10/6a5364ad8cce0107a387d3f43374f5814fb586cc155b282196bc2b9ce1c25aa9a8b76e8ab04d0c29428403a48225cad8280e00b8adbb6b02e05e3a6ab7ee2ef3
   languageName: node
   linkType: hard
 
 "highlight.js@npm:^10.4.1, highlight.js@npm:~10.7.0":
   version: 10.7.3
   resolution: "highlight.js@npm:10.7.3"
-  checksum: defeafcd546b535d710d8efb8e650af9e3b369ef53e28c3dc7893eacfe263200bba4c5fcf43524ae66d5c0c296b1af0870523ceae3e3104d24b7abf6374a4fea
+  checksum: 10/db8d10a541936b058e221dbde77869664b2b45bca75d660aa98065be2cd29f3924755fbc7348213f17fd931aefb6e6597448ba6fe82afba6d8313747a91983ee
   languageName: node
   linkType: hard
 
@@ -18391,13 +19634,13 @@ __metadata:
   version: 4.10.1
   resolution: "history@npm:4.10.1"
   dependencies:
-    "@babel/runtime": ^7.1.2
-    loose-envify: ^1.2.0
-    resolve-pathname: ^3.0.0
-    tiny-invariant: ^1.0.2
-    tiny-warning: ^1.0.0
-    value-equal: ^1.0.1
-  checksum: addd84bc4683929bae4400419b5af132ff4e4e9b311a0d4e224579ea8e184a6b80d7f72c55927e4fa117f69076a9e47ce082d8d0b422f1a9ddac7991490ca1d0
+    "@babel/runtime": "npm:^7.1.2"
+    loose-envify: "npm:^1.2.0"
+    resolve-pathname: "npm:^3.0.0"
+    tiny-invariant: "npm:^1.0.2"
+    tiny-warning: "npm:^1.0.0"
+    value-equal: "npm:^1.0.1"
+  checksum: 10/042373f69dad6419a4d551b995ef40f449a8854775a1157c4e9f077ee39aea6ca7ed8f45ec3e1762ef1891357a724d17dad11f2fe7d0edeebcbcf9f48ed3e4d4
   languageName: node
   linkType: hard
 
@@ -18405,8 +19648,8 @@ __metadata:
   version: 5.3.0
   resolution: "history@npm:5.3.0"
   dependencies:
-    "@babel/runtime": ^7.7.6
-  checksum: d73c35df49d19ac172f9547d30a21a26793e83f16a78386d99583b5bf1429cc980799fcf1827eb215d31816a6600684fba9686ce78104e23bd89ec239e7c726f
+    "@babel/runtime": "npm:^7.7.6"
+  checksum: 10/52ba685b842ca6438ff11ef459951eb13d413ae715866a8dc5f7c3b1ea0cdeb8db6aabf7254551b85f56abc205e6e2d7e1d5afb36b711b401cdaff4f2cf187e9
   languageName: node
   linkType: hard
 
@@ -18414,13 +19657,13 @@ __metadata:
   version: 4.10.1
   resolution: "history@patch:history@npm%3A4.10.1#./.yarn/patches/history-npm-4.10.1-ee217563ae.patch::version=4.10.1&hash=b8466f&locator=grafana%40workspace%3A."
   dependencies:
-    "@babel/runtime": ^7.1.2
-    loose-envify: ^1.2.0
-    resolve-pathname: ^3.0.0
-    tiny-invariant: ^1.0.2
-    tiny-warning: ^1.0.0
-    value-equal: ^1.0.1
-  checksum: bd33efe9eb241b79658ecea1b622a0eebeba70e280aceb439e988ff1d6859016a35b922f2ebcfca7dc07804e4af54ec2ecad3778d42d465e470d553e49b74e50
+    "@babel/runtime": "npm:^7.1.2"
+    loose-envify: "npm:^1.2.0"
+    resolve-pathname: "npm:^3.0.0"
+    tiny-invariant: "npm:^1.0.2"
+    tiny-warning: "npm:^1.0.0"
+    value-equal: "npm:^1.0.1"
+  checksum: 10/15ef2925dc665d7671308625a03e43b0c2e5b7d7a28c41b04c3ca68c805b6c4b6c6e0c217168ebf356c753ccdce6236ad717b58e6dae92be0501a0bfd44c0423
   languageName: node
   linkType: hard
 
@@ -18428,15 +19671,15 @@ __metadata:
   version: 3.3.2
   resolution: "hoist-non-react-statics@npm:3.3.2"
   dependencies:
-    react-is: ^16.7.0
-  checksum: b1538270429b13901ee586aa44f4cc3ecd8831c061d06cb8322e50ea17b3f5ce4d0e2e66394761e6c8e152cd8c34fb3b4b690116c6ce2bd45b18c746516cb9e8
+    react-is: "npm:^16.7.0"
+  checksum: 10/1acbe85f33e5a39f90c822ad4d28b24daeb60f71c545279431dc98c312cd28a54f8d64788e477fe21dc502b0e3cf58589ebe5c1ad22af27245370391c2d24ea6
   languageName: node
   linkType: hard
 
 "hosted-git-info@npm:^2.1.4":
   version: 2.8.9
   resolution: "hosted-git-info@npm:2.8.9"
-  checksum: c955394bdab888a1e9bb10eb33029e0f7ce5a2ac7b3f158099dc8c486c99e73809dca609f5694b223920ca2174db33d32b12f9a2a47141dc59607c29da5a62dd
+  checksum: 10/96da7d412303704af41c3819207a09ea2cab2de97951db4cf336bb8bce8d8e36b9a6821036ad2e55e67d3be0af8f967a7b57981203fbfb88bc05cd803407b8c3
   languageName: node
   linkType: hard
 
@@ -18444,8 +19687,8 @@ __metadata:
   version: 3.0.8
   resolution: "hosted-git-info@npm:3.0.8"
   dependencies:
-    lru-cache: ^6.0.0
-  checksum: 5af7a69581acb84206a7b8e009f4680c36396814e92c8a83973dfb3b87e44e44d1f7b8eaf3e4a953686482770ecb78406a4ce4666bfdfe447762434127871d8d
+    lru-cache: "npm:^6.0.0"
+  checksum: 10/fac26fe551d87f271b31e80e5a7519cbb50a3c30ea89cad734da8068930f27288a049258e6ed9c39e20ebec9cf4b67c5cb02055bd73230962ef34db0d45da3e7
   languageName: node
   linkType: hard
 
@@ -18453,17 +19696,26 @@ __metadata:
   version: 4.1.0
   resolution: "hosted-git-info@npm:4.1.0"
   dependencies:
-    lru-cache: ^6.0.0
-  checksum: c3f87b3c2f7eb8c2748c8f49c0c2517c9a95f35d26f4bf54b2a8cba05d2e668f3753548b6ea366b18ec8dadb4e12066e19fa382a01496b0ffa0497eb23cbe461
+    lru-cache: "npm:^6.0.0"
+  checksum: 10/4dc67022b7ecb12829966bd731fb9a5f14d351547aafc6520ef3c8e7211f4f0e69452d24e29eae3d9b17df924d660052e53d8ca321cf3008418fb7e6c7c47d6f
   languageName: node
   linkType: hard
 
-"hosted-git-info@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "hosted-git-info@npm:5.0.0"
+"hosted-git-info@npm:^6.0.0":
+  version: 6.1.1
+  resolution: "hosted-git-info@npm:6.1.1"
+  dependencies:
+    lru-cache: "npm:^7.5.1"
+  checksum: 10/2e48e3fac799b52d82277ff5693916bfa33441a2c06d1f11f9e82886bd235514783c2bdffb3abde67b7aeb6af457a48df38e6894740c7fc2e1bb78f5bcfac61e
+  languageName: node
+  linkType: hard
+
+"hosted-git-info@npm:^7.0.0":
+  version: 7.0.1
+  resolution: "hosted-git-info@npm:7.0.1"
   dependencies:
-    lru-cache: ^7.5.1
-  checksum: 515e69463d123635f70d70656c5ec648951ffc1987f92a87cb4a038e1794bfed833cf87569b358b137ebbc75d992c073ed0408d420c9e5b717c2b4f0a291490c
+    lru-cache: "npm:^10.0.1"
+  checksum: 10/5f740ecf3c70838e27446ff433a9a9a583de8747f7b661390b373ad12ca47edb937136e79999a4f953d0953079025a11df173f1fd9f7d52b0277b2fb9433e1c7
   languageName: node
   linkType: hard
 
@@ -18471,11 +19723,18 @@ __metadata:
   version: 2.1.6
   resolution: "hpack.js@npm:2.1.6"
   dependencies:
-    inherits: ^2.0.1
-    obuf: ^1.0.0
-    readable-stream: ^2.0.1
-    wbuf: ^1.1.0
-  checksum: 2de144115197967ad6eeee33faf41096c6ba87078703c5cb011632dcfbffeb45784569e0cf02c317bd79c48375597c8ec88c30fff5bb0b023e8f654fb6e9c06e
+    inherits: "npm:^2.0.1"
+    obuf: "npm:^1.0.0"
+    readable-stream: "npm:^2.0.1"
+    wbuf: "npm:^1.1.0"
+  checksum: 10/6910e4b9d943a78fd8e84ac42729fdab9bd406789d6204ad160af9dc5aa4750fc01f208249bf7116c11dc0678207a387b4ade24e4b628b95385b251ceeeb719c
+  languageName: node
+  linkType: hard
+
+"html-element-attributes@npm:^1.0.0":
+  version: 1.3.1
+  resolution: "html-element-attributes@npm:1.3.1"
+  checksum: 10/dee31e60225ae63f513652c5f88bc78efa2f6d0808f6e227edda57e9dae26f09819d3d1b239b7e6dbb1a8c697a4dc8615ebe21bc0b2630149c294c7eba8f3f27
   languageName: node
   linkType: hard
 
@@ -18483,34 +19742,34 @@ __metadata:
   version: 3.0.0
   resolution: "html-encoding-sniffer@npm:3.0.0"
   dependencies:
-    whatwg-encoding: ^2.0.0
-  checksum: 8d806aa00487e279e5ccb573366a951a9f68f65c90298eac9c3a2b440a7ffe46615aff2995a2f61c6746c639234e6179a97e18ca5ccbbf93d3725ef2099a4502
+    whatwg-encoding: "npm:^2.0.0"
+  checksum: 10/707a812ec2acaf8bb5614c8618dc81e2fb6b4399d03e95ff18b65679989a072f4e919b9bef472039301a1bbfba64063ba4c79ea6e851c653ac9db80dbefe8fe5
   languageName: node
   linkType: hard
 
-"html-entities@npm:^2.1.0, html-entities@npm:^2.3.2":
-  version: 2.3.3
-  resolution: "html-entities@npm:2.3.3"
-  checksum: 92521501da8aa5f66fee27f0f022d6e9ceae62667dae93aa6a2f636afa71ad530b7fb24a18d4d6c124c9885970cac5f8a52dbf1731741161002816ae43f98196
+"html-entities@npm:^2.1.0, html-entities@npm:^2.4.0":
+  version: 2.4.0
+  resolution: "html-entities@npm:2.4.0"
+  checksum: 10/646f2f19214bad751e060ceef4df98520654a1d0cd631b55d45504df2f0aaf8a14d8c0a5a4f92b353be298774d856157ac2d04a031d78889c9011892078ca157
   languageName: node
   linkType: hard
 
-"html-escaper@npm:^2.0.0":
+"html-escaper@npm:^2.0.0, html-escaper@npm:^2.0.2":
   version: 2.0.2
   resolution: "html-escaper@npm:2.0.2"
-  checksum: d2df2da3ad40ca9ee3a39c5cc6475ef67c8f83c234475f24d8e9ce0dc80a2c82df8e1d6fa78ddd1e9022a586ea1bd247a615e80a5cd9273d90111ddda7d9e974
+  checksum: 10/034d74029dcca544a34fb6135e98d427acd73019796ffc17383eaa3ec2fe1c0471dcbbc8f8ed39e46e86d43ccd753a160631615e4048285e313569609b66d5b7
   languageName: node
   linkType: hard
 
-"html-loader@npm:4.2.0":
-  version: 4.2.0
-  resolution: "html-loader@npm:4.2.0"
+"html-loader@npm:5.0.0":
+  version: 5.0.0
+  resolution: "html-loader@npm:5.0.0"
   dependencies:
-    html-minifier-terser: ^7.0.0
-    parse5: ^7.0.0
+    html-minifier-terser: "npm:^7.2.0"
+    parse5: "npm:^7.1.2"
   peerDependencies:
     webpack: ^5.0.0
-  checksum: ae54ecebad2d7be683f9d4e6fda6e7adb05b5d3b35549958bf01ad127bcad8e97d9f41daaaee38a3ae9c24726242de383bf1f2c2681154dfbbad5ac74643cb16
+  checksum: 10/27db0ac562ba9ac3736f095435e08cc7844ed32029662ebabe7045cf8ba473978a8df6198be0166c0abf456cd8914830083c3f6847c828f51dc6fc13bbd85699
   languageName: node
   linkType: hard
 
@@ -18518,33 +19777,33 @@ __metadata:
   version: 6.0.2
   resolution: "html-minifier-terser@npm:6.0.2"
   dependencies:
-    camel-case: ^4.1.2
-    clean-css: ^5.1.5
-    commander: ^8.1.0
-    he: ^1.2.0
-    param-case: ^3.0.4
-    relateurl: ^0.2.7
-    terser: ^5.7.2
+    camel-case: "npm:^4.1.2"
+    clean-css: "npm:^5.1.5"
+    commander: "npm:^8.1.0"
+    he: "npm:^1.2.0"
+    param-case: "npm:^3.0.4"
+    relateurl: "npm:^0.2.7"
+    terser: "npm:^5.7.2"
   bin:
     html-minifier-terser: cli.js
-  checksum: 9c8775ea036f7b04fd5a16607cf4242efdddc64884e84fcc81e27ef56505a12b8a9e1f9ac865ca00a77a3e4c21ef4ffb194dcc6492cdf6cfdfc73bf8de6d7c2d
+  checksum: 10/8362cab367136a727ba1e135e4d261e89a78018028f4bbd890bcf8f90f998fe543787b651ab9d9c904e0caebc427e2b51da96f3f60a4c374455ecd8f98789a8b
   languageName: node
   linkType: hard
 
-"html-minifier-terser@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "html-minifier-terser@npm:7.0.0"
-  dependencies:
-    camel-case: ^4.1.2
-    clean-css: 5.2.0
-    commander: ^9.4.0
-    entities: ^4.3.1
-    param-case: ^3.0.4
-    relateurl: ^0.2.7
-    terser: ^5.14.2
+"html-minifier-terser@npm:^7.2.0":
+  version: 7.2.0
+  resolution: "html-minifier-terser@npm:7.2.0"
+  dependencies:
+    camel-case: "npm:^4.1.2"
+    clean-css: "npm:~5.3.2"
+    commander: "npm:^10.0.0"
+    entities: "npm:^4.4.0"
+    param-case: "npm:^3.0.4"
+    relateurl: "npm:^0.2.7"
+    terser: "npm:^5.15.1"
   bin:
     html-minifier-terser: cli.js
-  checksum: eabd3b4835d9663bf7c30ea0f1c57870b0d8f7dc27b9fa17852ea57bfdd5fdc0ed9b7b83a7f13edd8626ccf98d3082e347764754278a661cab291469fd37dced
+  checksum: 10/7320095dbf08c361b45e855bd840d1d21fe86326afee775503594163532ebaaed9bb1c9dc98232b03c169dc24b56f30c294d559bca0cade59f9c950a1992db82
   languageName: node
   linkType: hard
 
@@ -18552,30 +19811,36 @@ __metadata:
   version: 3.0.1
   resolution: "html-parse-stringify@npm:3.0.1"
   dependencies:
-    void-elements: 3.1.0
-  checksum: 334fdebd4b5c355dba8e95284cead6f62bf865a2359da2759b039db58c805646350016d2017875718bc3c4b9bf81a0d11be5ee0cf4774a3a5a7b97cde21cfd67
+    void-elements: "npm:3.1.0"
+  checksum: 10/8743b76cc50e46d1956c1ad879d18eb9613b0d2d81e24686d633f9f69bb26b84676f64a926973de793cca479997017a63219278476d617b6c42d68246d7c07fe
   languageName: node
   linkType: hard
 
 "html-tags@npm:^3.1.0, html-tags@npm:^3.3.1":
   version: 3.3.1
   resolution: "html-tags@npm:3.3.1"
-  checksum: b4ef1d5a76b678e43cce46e3783d563607b1d550cab30b4f511211564574770aa8c658a400b100e588bc60b8234e59b35ff72c7851cc28f3b5403b13a2c6cbce
+  checksum: 10/d0e808544b92d8b999cbcc86d539577255a2f0f2f4f73110d10749d1d36e6fe6ad706a0355a8477afb6e000ecdc93d8455b3602951f9a2b694ac9e28f1b52878
   languageName: node
   linkType: hard
 
-"html-webpack-plugin@npm:5.5.3, html-webpack-plugin@npm:^5.5.0":
-  version: 5.5.3
-  resolution: "html-webpack-plugin@npm:5.5.3"
+"html-webpack-plugin@npm:5.6.0, html-webpack-plugin@npm:^5.5.0":
+  version: 5.6.0
+  resolution: "html-webpack-plugin@npm:5.6.0"
   dependencies:
-    "@types/html-minifier-terser": ^6.0.0
-    html-minifier-terser: ^6.0.2
-    lodash: ^4.17.21
-    pretty-error: ^4.0.0
-    tapable: ^2.0.0
+    "@types/html-minifier-terser": "npm:^6.0.0"
+    html-minifier-terser: "npm:^6.0.2"
+    lodash: "npm:^4.17.21"
+    pretty-error: "npm:^4.0.0"
+    tapable: "npm:^2.0.0"
   peerDependencies:
+    "@rspack/core": 0.x || 1.x
     webpack: ^5.20.0
-  checksum: ccf685195739c372ad641bbd0c9100a847904f34eedc7aff3ece7856cd6c78fd3746d2d615af1bb71e5727993fe711b89e9b744f033ed3fde646540bf5d5e954
+  peerDependenciesMeta:
+    "@rspack/core":
+      optional: true
+    webpack:
+      optional: true
+  checksum: 10/d651f3a88a7c932c72c6a30f0fdd610b49a864a69f1ddb34562c750f1602ea471e27fd8fc32c01adadd484b38fa6b74f055d1ccce26e5f8fcf814ee0d398a121
   languageName: node
   linkType: hard
 
@@ -18583,9 +19848,9 @@ __metadata:
   version: 1.4.1
   resolution: "html2canvas@npm:1.4.1"
   dependencies:
-    css-line-break: ^2.1.0
-    text-segmentation: ^1.0.3
-  checksum: c134324af57f3262eecf982e436a4843fded3c6cf61954440ffd682527e4dd350e0c2fafd217c0b6f9a455fe345d0c67b4505689796ab160d4ca7c91c3766739
+    css-line-break: "npm:^2.1.0"
+    text-segmentation: "npm:^1.0.3"
+  checksum: 10/595790810557a1d4287f07b6ead49aed4f169f08eb00e20c1f030b93344003e84797d28cd8a220e8ec1b78641d460ca6add11b8531960725526f11a7b9fa9900
   languageName: node
   linkType: hard
 
@@ -18593,11 +19858,11 @@ __metadata:
   version: 6.1.0
   resolution: "htmlparser2@npm:6.1.0"
   dependencies:
-    domelementtype: ^2.0.1
-    domhandler: ^4.0.0
-    domutils: ^2.5.2
-    entities: ^2.0.0
-  checksum: 81a7b3d9c3bb9acb568a02fc9b1b81ffbfa55eae7f1c41ae0bf840006d1dbf54cb3aa245b2553e2c94db674840a9f0fdad7027c9a9d01a062065314039058c4e
+    domelementtype: "npm:^2.0.1"
+    domhandler: "npm:^4.0.0"
+    domutils: "npm:^2.5.2"
+    entities: "npm:^2.0.0"
+  checksum: 10/c9c34b0b722f5923c4ae05e59268aeb768582152969e3338a1cd3342b87f8dd2c0420f4745e46d2fd87f1b677ea2f314c3a93436ed8831905997e6347e081a5d
   languageName: node
   linkType: hard
 
@@ -18605,25 +19870,25 @@ __metadata:
   version: 8.0.1
   resolution: "htmlparser2@npm:8.0.1"
   dependencies:
-    domelementtype: ^2.3.0
-    domhandler: ^5.0.2
-    domutils: ^3.0.1
-    entities: ^4.3.0
-  checksum: 06d5c71e8313597722bc429ae2a7a8333d77bd3ab07ccb916628384b37332027b047f8619448d8f4a3312b6609c6ea3302a4e77435d859e9e686999e6699ca39
+    domelementtype: "npm:^2.3.0"
+    domhandler: "npm:^5.0.2"
+    domutils: "npm:^3.0.1"
+    entities: "npm:^4.3.0"
+  checksum: 10/f891041c331ef7ef300f1e8f0e6756d663cf8096f8a343a1bf474e7a5ce34fe7cd71b9dfb0227277f7de2007e847ef2a447e8b48eab592d6f3631aae18301d22
   languageName: node
   linkType: hard
 
-"http-cache-semantics@npm:^4.1.0":
+"http-cache-semantics@npm:^4.1.0, http-cache-semantics@npm:^4.1.1":
   version: 4.1.1
   resolution: "http-cache-semantics@npm:4.1.1"
-  checksum: 83ac0bc60b17a3a36f9953e7be55e5c8f41acc61b22583060e8dedc9dd5e3607c823a88d0926f9150e571f90946835c7fe150732801010845c72cd8bbff1a236
+  checksum: 10/362d5ed66b12ceb9c0a328fb31200b590ab1b02f4a254a697dc796850cc4385603e75f53ec59f768b2dad3bfa1464bd229f7de278d2899a0e3beffc634b6683f
   languageName: node
   linkType: hard
 
 "http-deceiver@npm:^1.2.7":
   version: 1.2.7
   resolution: "http-deceiver@npm:1.2.7"
-  checksum: 64d7d1ae3a6933eb0e9a94e6f27be4af45a53a96c3c34e84ff57113787105a89fff9d1c3df263ef63add823df019b0e8f52f7121e32393bb5ce9a713bf100b41
+  checksum: 10/9ae293b0acbfad6ed45d52c1f85f58ab062465872fd9079c80d78c6527634002d73c2a9d8c0296cc12d178a0b689bb5291d9979aad3ce71ab17a7517588adbf7
   languageName: node
   linkType: hard
 
@@ -18631,12 +19896,12 @@ __metadata:
   version: 1.8.1
   resolution: "http-errors@npm:1.8.1"
   dependencies:
-    depd: ~1.1.2
-    inherits: 2.0.4
-    setprototypeof: 1.2.0
-    statuses: ">= 1.5.0 < 2"
-    toidentifier: 1.0.1
-  checksum: d3c7e7e776fd51c0a812baff570bdf06fe49a5dc448b700ab6171b1250e4cf7db8b8f4c0b133e4bfe2451022a5790c1ca6c2cae4094dedd6ac8304a1267f91d2
+    depd: "npm:~1.1.2"
+    inherits: "npm:2.0.4"
+    setprototypeof: "npm:1.2.0"
+    statuses: "npm:>= 1.5.0 < 2"
+    toidentifier: "npm:1.0.1"
+  checksum: 10/76fc491bd8df2251e21978e080d5dae20d9736cfb29bb72b5b76ec1bcebb1c14f0f58a3a128dd89288934379d2173cfb0421c571d54103e93dd65ef6243d64d8
   languageName: node
   linkType: hard
 
@@ -18644,18 +19909,18 @@ __metadata:
   version: 1.6.3
   resolution: "http-errors@npm:1.6.3"
   dependencies:
-    depd: ~1.1.2
-    inherits: 2.0.3
-    setprototypeof: 1.1.0
-    statuses: ">= 1.4.0 < 2"
-  checksum: a9654ee027e3d5de305a56db1d1461f25709ac23267c6dc28cdab8323e3f96caa58a9a6a5e93ac15d7285cee0c2f019378c3ada9026e7fe19c872d695f27de7c
+    depd: "npm:~1.1.2"
+    inherits: "npm:2.0.3"
+    setprototypeof: "npm:1.1.0"
+    statuses: "npm:>= 1.4.0 < 2"
+  checksum: 10/e48732657ea0b4a09853d2696a584fa59fa2a8c1ba692af7af3137b5491a997d7f9723f824e7e08eb6a87098532c09ce066966ddf0f9f3dd30905e52301acadb
   languageName: node
   linkType: hard
 
 "http-parser-js@npm:>=0.5.1":
   version: 0.5.6
   resolution: "http-parser-js@npm:0.5.6"
-  checksum: 8a92f6782542211c77936104ea1eca3c86a95420eb286b100f6421630f29d8f94fd4cc7a245df8e078791d86cd9a237091094440ffb0cd1b44a3f85bfbf539fa
+  checksum: 10/701ce58fda3dc60a5afc879cb4ad046a74147f33447d9b39c6fa2e9beb0cf2198cef870cc9bb8231cc89cb368ce93199397cf74b35558b8d360d46f252d118a7
   languageName: node
   linkType: hard
 
@@ -18663,21 +19928,31 @@ __metadata:
   version: 4.0.1
   resolution: "http-proxy-agent@npm:4.0.1"
   dependencies:
-    "@tootallnate/once": 1
-    agent-base: 6
-    debug: 4
-  checksum: c6a5da5a1929416b6bbdf77b1aca13888013fe7eb9d59fc292e25d18e041bb154a8dfada58e223fc7b76b9b2d155a87e92e608235201f77d34aa258707963a82
+    "@tootallnate/once": "npm:1"
+    agent-base: "npm:6"
+    debug: "npm:4"
+  checksum: 10/2e17f5519f2f2740b236d1d14911ea4be170c67419dc15b05ea9a860a22c5d9c6ff4da270972117067cc2cefeba9df5f7cd5e7818fdc6ae52b6acf2a533e5fdd
+  languageName: node
+  linkType: hard
+
+"http-proxy-agent@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "http-proxy-agent@npm:5.0.0"
+  dependencies:
+    "@tootallnate/once": "npm:2"
+    agent-base: "npm:6"
+    debug: "npm:4"
+  checksum: 10/5ee19423bc3e0fd5f23ce991b0755699ad2a46a440ce9cec99e8126bb98448ad3479d2c0ea54be5519db5b19a4ffaa69616bac01540db18506dd4dac3dc418f0
   languageName: node
   linkType: hard
 
-"http-proxy-agent@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "http-proxy-agent@npm:5.0.0"
+"http-proxy-agent@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "http-proxy-agent@npm:7.0.0"
   dependencies:
-    "@tootallnate/once": 2
-    agent-base: 6
-    debug: 4
-  checksum: e2ee1ff1656a131953839b2a19cd1f3a52d97c25ba87bd2559af6ae87114abf60971e498021f9b73f9fd78aea8876d1fb0d4656aac8a03c6caa9fc175f22b786
+    agent-base: "npm:^7.1.0"
+    debug: "npm:^4.3.4"
+  checksum: 10/dbaaf3d9f3fc4df4a5d7ec45d456ec50f575240b557160fa63427b447d1f812dd7fe4a4f17d2e1ba003d231f07edf5a856ea6d91cb32d533062ff20a7803ccac
   languageName: node
   linkType: hard
 
@@ -18685,17 +19960,17 @@ __metadata:
   version: 2.0.4
   resolution: "http-proxy-middleware@npm:2.0.4"
   dependencies:
-    "@types/http-proxy": ^1.17.8
-    http-proxy: ^1.18.1
-    is-glob: ^4.0.1
-    is-plain-obj: ^3.0.0
-    micromatch: ^4.0.2
+    "@types/http-proxy": "npm:^1.17.8"
+    http-proxy: "npm:^1.18.1"
+    is-glob: "npm:^4.0.1"
+    is-plain-obj: "npm:^3.0.0"
+    micromatch: "npm:^4.0.2"
   peerDependencies:
     "@types/express": ^4.17.13
   peerDependenciesMeta:
     "@types/express":
       optional: true
-  checksum: 16d5b398a31f86de8d545b54b484b701429e8e6d7114e63c04591a734e9efaa63f0901ac7b2d7b7d5a15977b9e945cd81cbef68116fe59214a4a82f5ee8e4411
+  checksum: 10/642092bcd98a37375846438e069cea42df6f65df86d516fce388f6bf08e8f1436f52b19cfc557e9d1933dff9b16e53865c5785b930f50c5aa9d46fe0b6e30eb8
   languageName: node
   linkType: hard
 
@@ -18703,10 +19978,10 @@ __metadata:
   version: 1.18.1
   resolution: "http-proxy@npm:1.18.1"
   dependencies:
-    eventemitter3: ^4.0.0
-    follow-redirects: ^1.0.0
-    requires-port: ^1.0.0
-  checksum: f5bd96bf83e0b1e4226633dbb51f8b056c3e6321917df402deacec31dd7fe433914fc7a2c1831cf7ae21e69c90b3a669b8f434723e9e8b71fd68afe30737b6a5
+    eventemitter3: "npm:^4.0.0"
+    follow-redirects: "npm:^1.0.0"
+    requires-port: "npm:^1.0.0"
+  checksum: 10/2489e98aba70adbfd8b9d41ed1ff43528be4598c88616c558b109a09eaffe4bb35e551b6c75ac42ed7d948bb7530a22a2be6ef4f0cecacb5927be139f4274594
   languageName: node
   linkType: hard
 
@@ -18714,22 +19989,22 @@ __metadata:
   version: 14.1.1
   resolution: "http-server@npm:14.1.1"
   dependencies:
-    basic-auth: ^2.0.1
-    chalk: ^4.1.2
-    corser: ^2.0.1
-    he: ^1.2.0
-    html-encoding-sniffer: ^3.0.0
-    http-proxy: ^1.18.1
-    mime: ^1.6.0
-    minimist: ^1.2.6
-    opener: ^1.5.1
-    portfinder: ^1.0.28
-    secure-compare: 3.0.1
-    union: ~0.5.0
-    url-join: ^4.0.1
+    basic-auth: "npm:^2.0.1"
+    chalk: "npm:^4.1.2"
+    corser: "npm:^2.0.1"
+    he: "npm:^1.2.0"
+    html-encoding-sniffer: "npm:^3.0.0"
+    http-proxy: "npm:^1.18.1"
+    mime: "npm:^1.6.0"
+    minimist: "npm:^1.2.6"
+    opener: "npm:^1.5.1"
+    portfinder: "npm:^1.0.28"
+    secure-compare: "npm:3.0.1"
+    union: "npm:~0.5.0"
+    url-join: "npm:^4.0.1"
   bin:
     http-server: bin/http-server
-  checksum: 4f9674289195eaf9f3e408e093d2080b0d4647559a32c9e7868639c327cab62efd0bb8bc9ded9a625d9ce982cbb03517d4472400af5ecf36eeb5b4fa62d113fe
+  checksum: 10/ce3f4606fdd0cc946852f2dcdb11008cb4459e50e3d9cb1e6c6cf65de82022a7eb8b196e0aa77a90a70757b1b7f3df5407e8c0936ece968c5f24274ce87769a8
   languageName: node
   linkType: hard
 
@@ -18737,10 +20012,10 @@ __metadata:
   version: 1.2.0
   resolution: "http-signature@npm:1.2.0"
   dependencies:
-    assert-plus: ^1.0.0
-    jsprim: ^1.2.2
-    sshpk: ^1.7.0
-  checksum: 3324598712266a9683585bb84a75dec4fd550567d5e0dd4a0fff6ff3f74348793404d3eeac4918fa0902c810eeee1a86419e4a2e92a164132dfe6b26743fb47c
+    assert-plus: "npm:^1.0.0"
+    jsprim: "npm:^1.2.2"
+    sshpk: "npm:^1.7.0"
+  checksum: 10/2ff7112e6b0d8f08b382dfe705078c655501f2ddd76cf589d108445a9dd388a0a9be928c37108261519a7f53e6bbd1651048d74057b804807cce1ec49e87a95b
   languageName: node
   linkType: hard
 
@@ -18748,10 +20023,10 @@ __metadata:
   version: 1.3.6
   resolution: "http-signature@npm:1.3.6"
   dependencies:
-    assert-plus: ^1.0.0
-    jsprim: ^2.0.2
-    sshpk: ^1.14.1
-  checksum: 10be2af4764e71fee0281392937050201ee576ac755c543f570d6d87134ce5e858663fe999a7adb3e4e368e1e356d0d7fec6b9542295b875726ff615188e7a0c
+    assert-plus: "npm:^1.0.0"
+    jsprim: "npm:^2.0.2"
+    sshpk: "npm:^1.14.1"
+  checksum: 10/5f08e0c82174999da97114facb0d0d47e268d60b6fc10f92cb87b99d5ccccd36f79b9508c29dda0b4f4e3a1b2f7bcaf847e68ecd5da2f1fc465fcd1d054b7884
   languageName: node
   linkType: hard
 
@@ -18759,9 +20034,9 @@ __metadata:
   version: 4.0.0
   resolution: "https-proxy-agent@npm:4.0.0"
   dependencies:
-    agent-base: 5
-    debug: 4
-  checksum: 19471d5aae3e747b1c98b17556647e2a1362e68220c6b19585a8527498f32e62e03c41d2872d059d8720d56846bd7460a80ac06f876bccfa786468ff40dd5eef
+    agent-base: "npm:5"
+    debug: "npm:4"
+  checksum: 10/e90ca77ec10ef9987ad464853dfee744fb13fb02ad72f31c770ba09fb55675206a1de3c8b7e74d809fc00ed3baa7e01a48c569a419a675bfa3ef1ee975822b70
   languageName: node
   linkType: hard
 
@@ -18769,23 +20044,33 @@ __metadata:
   version: 5.0.1
   resolution: "https-proxy-agent@npm:5.0.1"
   dependencies:
-    agent-base: 6
-    debug: 4
-  checksum: 571fccdf38184f05943e12d37d6ce38197becdd69e58d03f43637f7fa1269cf303a7d228aa27e5b27bbd3af8f09fd938e1c91dcfefff2df7ba77c20ed8dfc765
+    agent-base: "npm:6"
+    debug: "npm:4"
+  checksum: 10/f0dce7bdcac5e8eaa0be3c7368bb8836ed010fb5b6349ffb412b172a203efe8f807d9a6681319105ea1b6901e1972c7b5ea899672a7b9aad58309f766dcbe0df
+  languageName: node
+  linkType: hard
+
+"https-proxy-agent@npm:^7.0.1":
+  version: 7.0.2
+  resolution: "https-proxy-agent@npm:7.0.2"
+  dependencies:
+    agent-base: "npm:^7.0.2"
+    debug: "npm:4"
+  checksum: 10/9ec844f78fd643608239c9c3f6819918631df5cd3e17d104cc507226a39b5d4adda9d790fc9fd63ac0d2bb8a761b2f9f60faa80584a9bf9d7f2e8c5ed0acd330
   languageName: node
   linkType: hard
 
 "human-signals@npm:^1.1.1":
   version: 1.1.1
   resolution: "human-signals@npm:1.1.1"
-  checksum: d587647c9e8ec24e02821b6be7de5a0fc37f591f6c4e319b3054b43fd4c35a70a94c46fc74d8c1a43c47fde157d23acd7421f375e1c1365b09a16835b8300205
+  checksum: 10/6a58224dffcef5588910b1028bda8623c9a7053460a1fe3367e61921a6b5f6b93aba30f323868a958f968d7de3f5f78421f11d4d9f7e9563b1bd2b00ed9a4deb
   languageName: node
   linkType: hard
 
 "human-signals@npm:^2.1.0":
   version: 2.1.0
   resolution: "human-signals@npm:2.1.0"
-  checksum: b87fd89fce72391625271454e70f67fe405277415b48bcc0117ca73d31fa23a4241787afdc8d67f5a116cf37258c052f59ea82daffa72364d61351423848e3b8
+  checksum: 10/df59be9e0af479036798a881d1f136c4a29e0b518d4abb863afbd11bf30efa3eeb1d0425fc65942dcc05ab3bf40205ea436b0ff389f2cd20b75b8643d539bf86
   languageName: node
   linkType: hard
 
@@ -18793,70 +20078,61 @@ __metadata:
   version: 1.2.1
   resolution: "humanize-ms@npm:1.2.1"
   dependencies:
-    ms: ^2.0.0
-  checksum: 9c7a74a2827f9294c009266c82031030eae811ca87b0da3dceb8d6071b9bde22c9f3daef0469c3c533cc67a97d8a167cd9fc0389350e5f415f61a79b171ded16
+    ms: "npm:^2.0.0"
+  checksum: 10/9c7a74a2827f9294c009266c82031030eae811ca87b0da3dceb8d6071b9bde22c9f3daef0469c3c533cc67a97d8a167cd9fc0389350e5f415f61a79b171ded16
   languageName: node
   linkType: hard
 
-"hyphenate-style-name@npm:^1.0.2":
+"hyphenate-style-name@npm:^1.0.3":
   version: 1.0.4
   resolution: "hyphenate-style-name@npm:1.0.4"
-  checksum: 4f5bf4b055089754924babebaa23c17845937bcca6aee95d5d015f8fa1e6814279002bd6a9e541e3fac2cd02519fc76305396727066c57c8e21a7e73e7a12137
+  checksum: 10/d37883e6b7e1be62e1ddae29cac83fa59fb93c068bc8eb1561585439adbad91dcf7e264ee2a82c4378fc58049f7bd853544a4a81bf00d4aff717f641052323e7
   languageName: node
   linkType: hard
 
 "i18next-browser-languagedetector@npm:^7.0.2":
-  version: 7.1.0
-  resolution: "i18next-browser-languagedetector@npm:7.1.0"
-  dependencies:
-    "@babel/runtime": ^7.19.4
-  checksum: 36981b9a9995ed66387f3735cceffe107ed3cdb6ca278d45fa243fabc65669c0eca095ed4a55a93dac046ca1eb23fd986ec0079723be7ebb8505e6ba25f379bb
-  languageName: node
-  linkType: hard
-
-"i18next-parser@npm:6.6.0":
-  version: 6.6.0
-  resolution: "i18next-parser@npm:6.6.0"
-  dependencies:
-    "@babel/runtime": ^7.15.4
-    broccoli-plugin: ^4.0.7
-    cheerio: ^1.0.0-rc.2
-    colors: 1.4.0
-    commander: ~9.4.1
-    concat-stream: ~2.0.0
-    eol: ^0.9.1
-    fs-extra: ^10.0.0
-    gulp-sort: ^2.0.0
-    i18next: ^21.2.0
-    js-yaml: 4.1.0
-    rsvp: ^4.8.2
-    sort-keys: ^5.0.0
-    through2: ~4.0.2
-    typescript: ^4.2.4
-    vinyl: ~3.0.0
-    vinyl-fs: ^3.0.2
-    vue-template-compiler: ^2.6.11
-  bin:
-    i18next: bin/cli.js
-  checksum: d92d1d0c5593ed4be38ec95f7c302064c53306a788ed0a6c31b69b47237b8b9228a29f06480559ae73c3285c21c8140b5bacf23b892d683e8d948629edf4e176
+  version: 7.2.0
+  resolution: "i18next-browser-languagedetector@npm:7.2.0"
+  dependencies:
+    "@babel/runtime": "npm:^7.23.2"
+  checksum: 10/5117b4961e0f32818f0d4587e81767d38c3a8e27305f1734fff2b07fe8c256161e2cdbd453b766b3c097055813fe89c43bce68b1d8f765b5b7f694d9852fe703
   languageName: node
   linkType: hard
 
-"i18next@npm:^21.2.0":
-  version: 21.9.2
-  resolution: "i18next@npm:21.9.2"
-  dependencies:
-    "@babel/runtime": ^7.17.2
-  checksum: e53b3885fa85cab7fcd4f8667b7fc3d37b06f095494703994d49fa0e961ad1f495181621e569dc58e759ff12c63a9c7704c33592ba529b7689ea7f5304be0423
+"i18next-parser@npm:8.13.0":
+  version: 8.13.0
+  resolution: "i18next-parser@npm:8.13.0"
+  dependencies:
+    "@babel/runtime": "npm:^7.23.2"
+    broccoli-plugin: "npm:^4.0.7"
+    cheerio: "npm:^1.0.0-rc.2"
+    colors: "npm:1.4.0"
+    commander: "npm:~11.1.0"
+    eol: "npm:^0.9.1"
+    esbuild: "npm:^0.20.1"
+    fs-extra: "npm:^11.1.0"
+    gulp-sort: "npm:^2.0.0"
+    i18next: "npm:^23.5.1"
+    js-yaml: "npm:4.1.0"
+    lilconfig: "npm:^3.0.0"
+    rsvp: "npm:^4.8.2"
+    sort-keys: "npm:^5.0.0"
+    typescript: "npm:^5.0.4"
+    vinyl: "npm:~3.0.0"
+    vinyl-fs: "npm:^4.0.0"
+    vue-template-compiler: "npm:^2.6.11"
+  bin:
+    i18next: bin/cli.js
+  checksum: 10/dcdb34f0418df7c969162f4c58b1f751e0245769a5748d127dcefd3d0986b45622f6b41d598920cf6fbda6972564fc48c8a5e934dc334ed46651294f98835bda
   languageName: node
   linkType: hard
 
-"i18next@npm:^22.0.0":
-  version: 22.0.4
-  resolution: "i18next@npm:22.0.4"
+"i18next@npm:^23.0.0, i18next@npm:^23.5.1":
+  version: 23.10.1
+  resolution: "i18next@npm:23.10.1"
   dependencies:
-    "@babel/runtime": ^7.17.2
-  checksum: aa49e6e48583833ee673c0dd9568081a5e15fde9549aa3e47a99ad91d3fdb7469f8a315864fc45ec466b1e60caa00d5fc8371e47840068048b4ab79a69dc2b19
+    "@babel/runtime": "npm:^7.23.2"
+  checksum: 10/e4cfb143bdb6fd343f68749a40cf562aa47f11c7af0243c0533868ae097912c3ddd6c384eb4116d1fced024a91279424abd8c2d1f694bbf304c42ebe3968ecca
   languageName: node
   linkType: hard
 
@@ -18864,17 +20140,17 @@ __metadata:
   version: 0.4.24
   resolution: "iconv-lite@npm:0.4.24"
   dependencies:
-    safer-buffer: ">= 2.1.2 < 3"
-  checksum: bd9f120f5a5b306f0bc0b9ae1edeb1577161503f5f8252a20f1a9e56ef8775c9959fd01c55f2d3a39d9a8abaf3e30c1abeb1895f367dcbbe0a8fd1c9ca01c4f6
+    safer-buffer: "npm:>= 2.1.2 < 3"
+  checksum: 10/6d3a2dac6e5d1fb126d25645c25c3a1209f70cceecc68b8ef51ae0da3cdc078c151fade7524a30b12a3094926336831fca09c666ef55b37e2c69638b5d6bd2e3
   languageName: node
   linkType: hard
 
-"iconv-lite@npm:0.6, iconv-lite@npm:0.6.3, iconv-lite@npm:^0.6.2":
+"iconv-lite@npm:0.6, iconv-lite@npm:0.6.3, iconv-lite@npm:^0.6.2, iconv-lite@npm:^0.6.3":
   version: 0.6.3
   resolution: "iconv-lite@npm:0.6.3"
   dependencies:
-    safer-buffer: ">= 2.1.2 < 3.0.0"
-  checksum: 3f60d47a5c8fc3313317edfd29a00a692cc87a19cac0159e2ce711d0ebc9019064108323b5e493625e25594f11c6236647d8e256fbe7a58f4a3b33b89e6d30bf
+    safer-buffer: "npm:>= 2.1.2 < 3.0.0"
+  checksum: 10/24e3292dd3dadaa81d065c6f8c41b274a47098150d444b96e5f53b4638a9a71482921ea6a91a1f59bb71d9796de25e04afd05919fa64c360347ba65d3766f10f
   languageName: node
   linkType: hard
 
@@ -18883,14 +20159,14 @@ __metadata:
   resolution: "icss-utils@npm:5.1.0"
   peerDependencies:
     postcss: ^8.1.0
-  checksum: 5c324d283552b1269cfc13a503aaaa172a280f914e5b81544f3803bc6f06a3b585fb79f66f7c771a2c052db7982c18bf92d001e3b47282e3abbbb4c4cc488d68
+  checksum: 10/5c324d283552b1269cfc13a503aaaa172a280f914e5b81544f3803bc6f06a3b585fb79f66f7c771a2c052db7982c18bf92d001e3b47282e3abbbb4c4cc488d68
   languageName: node
   linkType: hard
 
-"ieee754@npm:^1.1.12, ieee754@npm:^1.1.13":
+"ieee754@npm:^1.1.12, ieee754@npm:^1.1.13, ieee754@npm:^1.2.1":
   version: 1.2.1
   resolution: "ieee754@npm:1.2.1"
-  checksum: 5144c0c9815e54ada181d80a0b810221a253562422e7c6c3a60b1901154184f49326ec239d618c416c1c5945a2e197107aee8d986a3dd836b53dffefd99b5e7e
+  checksum: 10/d9f2557a59036f16c282aaeb107832dc957a93d73397d89bbad4eb1130560560eb695060145e8e6b3b498b15ab95510226649a0b8f52ae06583575419fe10fc4
   languageName: node
   linkType: hard
 
@@ -18898,107 +20174,102 @@ __metadata:
   version: 5.0.1
   resolution: "ignore-walk@npm:5.0.1"
   dependencies:
-    minimatch: ^5.0.1
-  checksum: 1a4ef35174653a1aa6faab3d9f8781269166536aee36a04946f6e2b319b2475c1903a75ed42f04219274128242f49d0a10e20c4354ee60d9548e97031451150b
+    minimatch: "npm:^5.0.1"
+  checksum: 10/a88b3fbda155496363fb3db66c7c7b85cf04d614fb51146f0aa5fc6b35c65370c57f9e6c550cd6048651fc378985b7a2bb9015c9fcb3e0dc798fc0728746703c
+  languageName: node
+  linkType: hard
+
+"ignore-walk@npm:^6.0.4":
+  version: 6.0.4
+  resolution: "ignore-walk@npm:6.0.4"
+  dependencies:
+    minimatch: "npm:^9.0.0"
+  checksum: 10/a56c3f929bb0890ffb6e87dfaca7d5ce97f9e179fd68d49711edea55760aaee367cea3845d7620689b706249053c4b1805e21158f6751c7333f9b2ffb3668272
   languageName: node
   linkType: hard
 
 "ignore@npm:^3.3.10":
   version: 3.3.10
   resolution: "ignore@npm:3.3.10"
-  checksum: 23e8cc776e367b56615ab21b78decf973a35dfca5522b39d9b47643d8168473b0d1f18dd1321a1bab466a12ea11a2411903f3b21644f4d5461ee0711ec8678bd
+  checksum: 10/7cbe87d9ed0e6b710ed76f040733f4d1dbed7aa573b579949d6cc25572a72c69d546acda11c2d4bf202691ddda5db8078d32a50a6623eade424d81e6f1d32133
   languageName: node
   linkType: hard
 
-"ignore@npm:^5.0.4, ignore@npm:^5.1.1, ignore@npm:^5.2.0, ignore@npm:^5.2.4":
-  version: 5.2.4
-  resolution: "ignore@npm:5.2.4"
-  checksum: 3d4c309c6006e2621659311783eaea7ebcd41fe4ca1d78c91c473157ad6666a57a2df790fe0d07a12300d9aac2888204d7be8d59f9aaf665b1c7fcdb432517ef
+"ignore@npm:^5.0.4, ignore@npm:^5.1.1, ignore@npm:^5.2.0, ignore@npm:^5.2.4, ignore@npm:^5.3.1":
+  version: 5.3.1
+  resolution: "ignore@npm:5.3.1"
+  checksum: 10/0a884c2fbc8c316f0b9f92beaf84464253b73230a4d4d286697be45fca081199191ca33e1c2e82d9e5f851f5e9a48a78e25a35c951e7eb41e59f150db3530065
   languageName: node
   linkType: hard
 
-"immer@npm:10.0.2":
-  version: 10.0.2
-  resolution: "immer@npm:10.0.2"
-  checksum: 525a3b14210d02ae420c3b9f6ca14f7e9bcf625611d1356e773e7739f14c7c8de50dac442e6c7de3a6e24a782f7b792b6b8666bc0b3f00269d21a95f8f68ca84
+"immer@npm:10.0.4":
+  version: 10.0.4
+  resolution: "immer@npm:10.0.4"
+  checksum: 10/c1196783cf18e836527f970e45dc88e5472756401831e94d494ca5fd00ab7b39de3156f50505908207e7efe59ac23244d2cde0bd0cff791de7e23709771757e6
   languageName: node
   linkType: hard
 
 "immer@npm:^9.0.21":
   version: 9.0.21
   resolution: "immer@npm:9.0.21"
-  checksum: 70e3c274165995352f6936695f0ef4723c52c92c92dd0e9afdfe008175af39fa28e76aafb3a2ca9d57d1fb8f796efc4dd1e1cc36f18d33fa5b74f3dfb0375432
+  checksum: 10/8455d6b4dc8abfe40f06eeec9bcc944d147c81279424c0f927a4d4905ae34e5af19ab6da60bcc700c14f51c452867d7089b3b9236f5a9a2248e39b4a09ee89de
   languageName: node
   linkType: hard
 
-"immutable@npm:4.3.1, immutable@npm:^4.0.0":
-  version: 4.3.1
-  resolution: "immutable@npm:4.3.1"
-  checksum: a3a5ba29bd43f3f9a2e4d599763d7455d11a0ea57e50bf43f2836672fc80003e90d69f2a4f5b589f1f3d6986faf97f08ce1e253583740dd33c00adebab88b217
+"immutable@npm:4.3.5, immutable@npm:^4.0.0":
+  version: 4.3.5
+  resolution: "immutable@npm:4.3.5"
+  checksum: 10/dbc1b8c808b9aa18bfce2e0c7bc23714a47267bc311f082145cc9220b2005e9b9cd2ae78330f164a19266a2b0f78846c60f4f74893853ac16fd68b5ae57092d2
   languageName: node
   linkType: hard
 
 "immutable@npm:^3.8.2":
   version: 3.8.2
   resolution: "immutable@npm:3.8.2"
-  checksum: 41909b386950ff84ca3cfca77c74cfc87d225a914e98e6c57996fa81a328da61a7c32216d6d5abad40f54747ffdc5c4b02b102e6ad1a504c1752efde8041f964
+  checksum: 10/8a94647c769e97c9685be1b89d5e1b3171e8c1361fb9061fbcf78f630f70bf60e4de0bfca8bdd24a54b1fb814a945a76a30b11b7ee08967f9802a138a54498a2
   languageName: node
   linkType: hard
 
-"import-fresh@npm:^3.0.0, import-fresh@npm:^3.1.0, import-fresh@npm:^3.2.1":
+"import-fresh@npm:^3.1.0, import-fresh@npm:^3.2.1, import-fresh@npm:^3.3.0":
   version: 3.3.0
   resolution: "import-fresh@npm:3.3.0"
   dependencies:
-    parent-module: ^1.0.0
-    resolve-from: ^4.0.0
-  checksum: 2cacfad06e652b1edc50be650f7ec3be08c5e5a6f6d12d035c440a42a8cc028e60a5b99ca08a77ab4d6b1346da7d971915828f33cdab730d3d42f08242d09baa
-  languageName: node
-  linkType: hard
-
-"import-lazy@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "import-lazy@npm:4.0.0"
-  checksum: 22f5e51702134aef78890156738454f620e5fe7044b204ebc057c614888a1dd6fdf2ede0fdcca44d5c173fd64f65c985f19a51775b06967ef58cc3d26898df07
+    parent-module: "npm:^1.0.0"
+    resolve-from: "npm:^4.0.0"
+  checksum: 10/2cacfad06e652b1edc50be650f7ec3be08c5e5a6f6d12d035c440a42a8cc028e60a5b99ca08a77ab4d6b1346da7d971915828f33cdab730d3d42f08242d09baa
   languageName: node
   linkType: hard
 
-"import-local@npm:^3.0.2":
-  version: 3.0.3
-  resolution: "import-local@npm:3.0.3"
+"import-local@npm:3.1.0, import-local@npm:^3.0.2":
+  version: 3.1.0
+  resolution: "import-local@npm:3.1.0"
   dependencies:
-    pkg-dir: ^4.2.0
-    resolve-cwd: ^3.0.0
+    pkg-dir: "npm:^4.2.0"
+    resolve-cwd: "npm:^3.0.0"
   bin:
     import-local-fixture: fixtures/cli.js
-  checksum: 38ae57d35e7fd5f63b55895050c798d4dd590e4e2337e9ffa882fb3ea7a7716f3162c7300e382e0a733ca5d07b389fadff652c00fa7b072d5cb6ea34ca06b179
+  checksum: 10/bfcdb63b5e3c0e245e347f3107564035b128a414c4da1172a20dc67db2504e05ede4ac2eee1252359f78b0bfd7b19ef180aec427c2fce6493ae782d73a04cddd
   languageName: node
   linkType: hard
 
 "imurmurhash@npm:^0.1.4":
   version: 0.1.4
   resolution: "imurmurhash@npm:0.1.4"
-  checksum: 7cae75c8cd9a50f57dadd77482359f659eaebac0319dd9368bcd1714f55e65badd6929ca58569da2b6494ef13fdd5598cd700b1eba23f8b79c5f19d195a3ecf7
+  checksum: 10/2d30b157a91fe1c1d7c6f653cbf263f039be6c5bfa959245a16d4ee191fc0f2af86c08545b6e6beeb041c56b574d2d5b9f95343d378ab49c0f37394d541e7fc8
   languageName: node
   linkType: hard
 
 "indent-string@npm:^4.0.0":
   version: 4.0.0
   resolution: "indent-string@npm:4.0.0"
-  checksum: 824cfb9929d031dabf059bebfe08cf3137365e112019086ed3dcff6a0a7b698cb80cf67ccccde0e25b9e2d7527aa6cc1fed1ac490c752162496caba3e6699612
-  languageName: node
-  linkType: hard
-
-"indent-string@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "indent-string@npm:5.0.0"
-  checksum: e466c27b6373440e6d84fbc19e750219ce25865cb82d578e41a6053d727e5520dc5725217d6eb1cc76005a1bb1696a0f106d84ce7ebda3033b963a38583fb3b3
+  checksum: 10/cd3f5cbc9ca2d624c6a1f53f12e6b341659aba0e2d3254ae2b4464aaea8b4294cdb09616abbc59458f980531f2429784ed6a420d48d245bcad0811980c9efae9
   languageName: node
   linkType: hard
 
 "infer-owner@npm:^1.0.4":
   version: 1.0.4
   resolution: "infer-owner@npm:1.0.4"
-  checksum: 181e732764e4a0611576466b4b87dac338972b839920b2a8cde43642e4ed6bd54dc1fb0b40874728f2a2df9a1b097b8ff83b56d5f8f8e3927f837fdcb47d8a89
+  checksum: 10/181e732764e4a0611576466b4b87dac338972b839920b2a8cde43642e4ed6bd54dc1fb0b40874728f2a2df9a1b097b8ff83b56d5f8f8e3927f837fdcb47d8a89
   languageName: node
   linkType: hard
 
@@ -19006,109 +20277,110 @@ __metadata:
   version: 1.0.6
   resolution: "inflight@npm:1.0.6"
   dependencies:
-    once: ^1.3.0
-    wrappy: 1
-  checksum: f4f76aa072ce19fae87ce1ef7d221e709afb59d445e05d47fba710e85470923a75de35bfae47da6de1b18afc3ce83d70facf44cfb0aff89f0a3f45c0a0244dfd
+    once: "npm:^1.3.0"
+    wrappy: "npm:1"
+  checksum: 10/d2ebd65441a38c8336c223d1b80b921b9fa737e37ea466fd7e253cb000c64ae1f17fa59e68130ef5bda92cfd8d36b83d37dab0eb0a4558bcfec8e8cdfd2dcb67
   languageName: node
   linkType: hard
 
-"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.1, inherits@npm:~2.0.3":
+"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.1, inherits@npm:~2.0.3, inherits@npm:~2.0.4":
   version: 2.0.4
   resolution: "inherits@npm:2.0.4"
-  checksum: 4a48a733847879d6cf6691860a6b1e3f0f4754176e4d71494c41f3475553768b10f84b5ce1d40fbd0e34e6bfbb864ee35858ad4dd2cf31e02fc4a154b724d7f1
+  checksum: 10/cd45e923bee15186c07fa4c89db0aace24824c482fb887b528304694b2aa6ff8a898da8657046a5dcf3e46cd6db6c61629551f9215f208d7c3f157cf9b290521
   languageName: node
   linkType: hard
 
 "inherits@npm:2.0.3":
   version: 2.0.3
   resolution: "inherits@npm:2.0.3"
-  checksum: 78cb8d7d850d20a5e9a7f3620db31483aa00ad5f722ce03a55b110e5a723539b3716a3b463e2b96ce3fe286f33afc7c131fa2f91407528ba80cea98a7545d4c0
+  checksum: 10/8771303d66c51be433b564427c16011a8e3fbc3449f1f11ea50efb30a4369495f1d0e89f0fc12bdec0bd7e49102ced5d137e031d39ea09821cb3c717fcf21e69
   languageName: node
   linkType: hard
 
 "ini@npm:2.0.0":
   version: 2.0.0
   resolution: "ini@npm:2.0.0"
-  checksum: e7aadc5fb2e4aefc666d74ee2160c073995a4061556b1b5b4241ecb19ad609243b9cceafe91bae49c219519394bbd31512516cb22a3b1ca6e66d869e0447e84e
+  checksum: 10/04e24ba05c4f6947e15560824e153b4610bceea2f5a3ab68651d221a4aab3c77d4e3e90a917ebc8bf5ad71a30a8575de56c39d6b4c4b1375a28016b9f3625f9d
   languageName: node
   linkType: hard
 
-"ini@npm:^1.3.2, ini@npm:^1.3.4, ini@npm:^1.3.5":
+"ini@npm:^1.3.2, ini@npm:^1.3.5, ini@npm:^1.3.8":
   version: 1.3.8
   resolution: "ini@npm:1.3.8"
-  checksum: dfd98b0ca3a4fc1e323e38a6c8eb8936e31a97a918d3b377649ea15bdb15d481207a0dda1021efbd86b464cae29a0d33c1d7dcaf6c5672bee17fa849bc50a1b3
+  checksum: 10/314ae176e8d4deb3def56106da8002b462221c174ddb7ce0c49ee72c8cd1f9044f7b10cc555a7d8850982c3b9ca96fc212122749f5234bc2b6fb05fb942ed566
   languageName: node
   linkType: hard
 
-"init-package-json@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "init-package-json@npm:3.0.2"
+"init-package-json@npm:5.0.0":
+  version: 5.0.0
+  resolution: "init-package-json@npm:5.0.0"
   dependencies:
-    npm-package-arg: ^9.0.1
-    promzard: ^0.3.0
-    read: ^1.0.7
-    read-package-json: ^5.0.0
-    semver: ^7.3.5
-    validate-npm-package-license: ^3.0.4
-    validate-npm-package-name: ^4.0.0
-  checksum: e027f60e4a1564809eee790d5a842341c784888fd7c7ace5f9a34ea76224c0adb6f3ab3bf205cf1c9c877a6e1a76c68b00847a984139f60813125d7b42a23a13
+    npm-package-arg: "npm:^10.0.0"
+    promzard: "npm:^1.0.0"
+    read: "npm:^2.0.0"
+    read-package-json: "npm:^6.0.0"
+    semver: "npm:^7.3.5"
+    validate-npm-package-license: "npm:^3.0.4"
+    validate-npm-package-name: "npm:^5.0.0"
+  checksum: 10/2816821b4962ef9c090076de9abe12d4ca4ec210056999f97e5c143a8f67acaad67e4cf7d056f9131a6d859ad45d1d0d9cdb4b8e7347cb275d55a6d61b4389ef
   languageName: node
   linkType: hard
 
-"inline-style-prefixer@npm:^6.0.0":
-  version: 6.0.1
-  resolution: "inline-style-prefixer@npm:6.0.1"
+"inline-style-prefixer@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "inline-style-prefixer@npm:7.0.0"
   dependencies:
-    css-in-js-utils: ^2.0.0
-  checksum: 0bfa6fa89faa21e425c71425910c37c7b35a16ea753586c408fcc9246c84937c1b8184e6ce792139cda5de5cce8e1bc9eb0ba9f30968bdc97e7a06ece21c0737
+    css-in-js-utils: "npm:^3.1.0"
+    fast-loops: "npm:^1.1.3"
+  checksum: 10/38486ce52ffa81649d845ffc4dda421ac24ea02709b8608d61f82cf186bc57749a73e562c2b7236c3946705a0c6e9d5e3872c59280972df73b0a1161fbf51eba
   languageName: node
   linkType: hard
 
-"inquirer@npm:^8.2.0, inquirer@npm:^8.2.4":
+"inquirer@npm:^8.2.4":
   version: 8.2.5
   resolution: "inquirer@npm:8.2.5"
   dependencies:
-    ansi-escapes: ^4.2.1
-    chalk: ^4.1.1
-    cli-cursor: ^3.1.0
-    cli-width: ^3.0.0
-    external-editor: ^3.0.3
-    figures: ^3.0.0
-    lodash: ^4.17.21
-    mute-stream: 0.0.8
-    ora: ^5.4.1
-    run-async: ^2.4.0
-    rxjs: ^7.5.5
-    string-width: ^4.1.0
-    strip-ansi: ^6.0.0
-    through: ^2.3.6
-    wrap-ansi: ^7.0.0
-  checksum: f13ee4c444187786fb393609dedf6b30870115a57b603f2e6424f29a99abc13446fd45ee22461c33c9c40a92a60a8df62d0d6b25d74fc6676fa4cb211de55b55
-  languageName: node
-  linkType: hard
-
-"internal-slot@npm:^1.0.3, internal-slot@npm:^1.0.4, internal-slot@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "internal-slot@npm:1.0.5"
+    ansi-escapes: "npm:^4.2.1"
+    chalk: "npm:^4.1.1"
+    cli-cursor: "npm:^3.1.0"
+    cli-width: "npm:^3.0.0"
+    external-editor: "npm:^3.0.3"
+    figures: "npm:^3.0.0"
+    lodash: "npm:^4.17.21"
+    mute-stream: "npm:0.0.8"
+    ora: "npm:^5.4.1"
+    run-async: "npm:^2.4.0"
+    rxjs: "npm:^7.5.5"
+    string-width: "npm:^4.1.0"
+    strip-ansi: "npm:^6.0.0"
+    through: "npm:^2.3.6"
+    wrap-ansi: "npm:^7.0.0"
+  checksum: 10/50a240dfeaca37a14e6a6d11d7d6f7da947be3a9fe1e34ac41db6a49fc27022e7b3875ebe8ccd739497359808694488f3509792cc986f9ac48c43135f4e14172
+  languageName: node
+  linkType: hard
+
+"internal-slot@npm:^1.0.4, internal-slot@npm:^1.0.5, internal-slot@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "internal-slot@npm:1.0.7"
   dependencies:
-    get-intrinsic: ^1.2.0
-    has: ^1.0.3
-    side-channel: ^1.0.4
-  checksum: 97e84046bf9e7574d0956bd98d7162313ce7057883b6db6c5c7b5e5f05688864b0978ba07610c726d15d66544ffe4b1050107d93f8a39ebc59b15d8b429b497a
+    es-errors: "npm:^1.3.0"
+    hasown: "npm:^2.0.0"
+    side-channel: "npm:^1.0.4"
+  checksum: 10/3e66720508831153ecf37d13def9f6856f9f2960989ec8a0a0476c98f887fca9eff0163127466485cb825c900c2d6fc601aa9117b7783b90ffce23a71ea5d053
   languageName: node
   linkType: hard
 
 "internmap@npm:1 - 2, internmap@npm:2.0.3":
   version: 2.0.3
   resolution: "internmap@npm:2.0.3"
-  checksum: 7ca41ec6aba8f0072fc32fa8a023450a9f44503e2d8e403583c55714b25efd6390c38a87161ec456bf42d7bc83aab62eb28f5aef34876b1ac4e60693d5e1d241
+  checksum: 10/873e0e7fcfe32f999aa0997a0b648b1244508e56e3ea6b8259b5245b50b5eeb3853fba221f96692bd6d1def501da76c32d64a5cb22a0b26cdd9b445664f805e0
   languageName: node
   linkType: hard
 
 "interpret@npm:^3.1.1":
   version: 3.1.1
   resolution: "interpret@npm:3.1.1"
-  checksum: 35cebcf48c7351130437596d9ab8c8fe131ce4038da4561e6d665f25640e0034702a031cf7e3a5cea60ac7ac548bf17465e0571ede126f3d3a6933152171ac82
+  checksum: 10/bc9e11126949c4e6ff49b0b819e923a9adc8e8bf3f9d4f2d782de6d5f592774f6fee4457c10bd08c6a2146b4baee460ccb242c99e5397defa9c846af0d00505a
   languageName: node
   linkType: hard
 
@@ -19116,11 +20388,11 @@ __metadata:
   version: 10.1.4
   resolution: "intl-messageformat@npm:10.1.4"
   dependencies:
-    "@formatjs/ecma402-abstract": 1.12.0
-    "@formatjs/fast-memoize": 1.2.6
-    "@formatjs/icu-messageformat-parser": 2.1.7
-    tslib: 2.4.0
-  checksum: 09c2cba0d64b9b9c99b9630b3f32661dd25886461eea5e8b6e0dac6b13b8ab0eb8bf2646bc73baa8b47501544f6cdb255d888617e22d056cce686849e05e2699
+    "@formatjs/ecma402-abstract": "npm:1.12.0"
+    "@formatjs/fast-memoize": "npm:1.2.6"
+    "@formatjs/icu-messageformat-parser": "npm:2.1.7"
+    tslib: "npm:2.4.0"
+  checksum: 10/79e02f9f9083f5cf290e4524705c892015dc25fe69c6c92f8961d31d51aac56656ba9df26c14593db908a61004fe27cd7ba2a099e227907a8b56a6d91fe2313f
   languageName: node
   linkType: hard
 
@@ -19128,60 +20400,53 @@ __metadata:
   version: 2.2.4
   resolution: "invariant@npm:2.2.4"
   dependencies:
-    loose-envify: ^1.0.0
-  checksum: cc3182d793aad82a8d1f0af697b462939cb46066ec48bbf1707c150ad5fad6406137e91a262022c269702e01621f35ef60269f6c0d7fd178487959809acdfb14
+    loose-envify: "npm:^1.0.0"
+  checksum: 10/cc3182d793aad82a8d1f0af697b462939cb46066ec48bbf1707c150ad5fad6406137e91a262022c269702e01621f35ef60269f6c0d7fd178487959809acdfb14
   languageName: node
   linkType: hard
 
-"ip@npm:^1.1.5":
-  version: 1.1.5
-  resolution: "ip@npm:1.1.5"
-  checksum: 30133981f082a060a32644f6a7746e9ba7ac9e2bc07ecc8bbdda3ee8ca9bec1190724c390e45a1ee7695e7edfd2a8f7dda2c104ec5f7ac5068c00648504c7e5a
+"ip-address@npm:^9.0.5":
+  version: 9.0.5
+  resolution: "ip-address@npm:9.0.5"
+  dependencies:
+    jsbn: "npm:1.1.0"
+    sprintf-js: "npm:^1.1.3"
+  checksum: 10/1ed81e06721af012306329b31f532b5e24e00cb537be18ddc905a84f19fe8f83a09a1699862bf3a1ec4b9dea93c55a3fa5faf8b5ea380431469df540f38b092c
   languageName: node
   linkType: hard
 
 "ip@npm:^2.0.0":
   version: 2.0.0
   resolution: "ip@npm:2.0.0"
-  checksum: cfcfac6b873b701996d71ec82a7dd27ba92450afdb421e356f44044ed688df04567344c36cbacea7d01b1c39a4c732dc012570ebe9bebfb06f27314bca625349
+  checksum: 10/1270b11e534a466fb4cf4426cbcc3a907c429389f7f4e4e3b288b42823562e88d6a509ceda8141a507de147ca506141f745005c0aa144569d94cf24a54eb52bc
   languageName: node
   linkType: hard
 
 "ipaddr.js@npm:1.9.1":
   version: 1.9.1
   resolution: "ipaddr.js@npm:1.9.1"
-  checksum: f88d3825981486f5a1942414c8d77dd6674dd71c065adcfa46f578d677edcb99fda25af42675cb59db492fdf427b34a5abfcde3982da11a8fd83a500b41cfe77
+  checksum: 10/864d0cced0c0832700e9621913a6429ccdc67f37c1bd78fb8c6789fff35c9d167cb329134acad2290497a53336813ab4798d2794fd675d5eb33b5fdf0982b9ca
   languageName: node
   linkType: hard
 
-"ipaddr.js@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "ipaddr.js@npm:2.0.1"
-  checksum: dd194a394a843d470f88d17191b0948f383ed1c8e320813f850c336a0fcb5e9215d97ec26ca35ab4fbbd31392c8b3467f3e8344628029ed3710b2ff6b5d1034e
+"ipaddr.js@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "ipaddr.js@npm:2.1.0"
+  checksum: 10/42c16d95cf451399707c2c46e605b88db1ea2b1477b25774b5a7ee96852b0bb1efdc01adbff01fedbe702ff246e1aca5c5e915a6f5a1f1485233a5f7c2eb73c2
   languageName: node
   linkType: hard
 
 "is-absolute-url@npm:^3.0.0":
   version: 3.0.3
   resolution: "is-absolute-url@npm:3.0.3"
-  checksum: 5159b51d065d9ad29e16a2f78d6c0e41c43227caf90a45e659c54ea6fd50ef0595b1871ce392e84b1df7cfdcad9a8e66eec0813a029112188435abf115accb16
-  languageName: node
-  linkType: hard
-
-"is-absolute@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-absolute@npm:1.0.0"
-  dependencies:
-    is-relative: ^1.0.0
-    is-windows: ^1.0.1
-  checksum: 9d16b2605eda3f3ce755410f1d423e327ad3a898bcb86c9354cf63970ed3f91ba85e9828aa56f5d6a952b9fae43d0477770f78d37409ae8ecc31e59ebc279b27
+  checksum: 10/5159b51d065d9ad29e16a2f78d6c0e41c43227caf90a45e659c54ea6fd50ef0595b1871ce392e84b1df7cfdcad9a8e66eec0813a029112188435abf115accb16
   languageName: node
   linkType: hard
 
 "is-alphabetical@npm:^1.0.0":
   version: 1.0.4
   resolution: "is-alphabetical@npm:1.0.4"
-  checksum: 6508cce44fd348f06705d377b260974f4ce68c74000e7da4045f0d919e568226dc3ce9685c5a2af272195384df6930f748ce9213fc9f399b5d31b362c66312cb
+  checksum: 10/6508cce44fd348f06705d377b260974f4ce68c74000e7da4045f0d919e568226dc3ce9685c5a2af272195384df6930f748ce9213fc9f399b5d31b362c66312cb
   languageName: node
   linkType: hard
 
@@ -19189,9 +20454,16 @@ __metadata:
   version: 1.0.4
   resolution: "is-alphanumerical@npm:1.0.4"
   dependencies:
-    is-alphabetical: ^1.0.0
-    is-decimal: ^1.0.0
-  checksum: e2e491acc16fcf5b363f7c726f666a9538dba0a043665740feb45bba1652457a73441e7c5179c6768a638ed396db3437e9905f403644ec7c468fb41f4813d03f
+    is-alphabetical: "npm:^1.0.0"
+    is-decimal: "npm:^1.0.0"
+  checksum: 10/e2e491acc16fcf5b363f7c726f666a9538dba0a043665740feb45bba1652457a73441e7c5179c6768a638ed396db3437e9905f403644ec7c468fb41f4813d03f
+  languageName: node
+  linkType: hard
+
+"is-any-array@npm:^2.0.0, is-any-array@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "is-any-array@npm:2.0.1"
+  checksum: 10/a2caaec75abb10ccb7e926aed322df5d2f206ae8645313771282702cf47d626832d9dc3318580e0fddbd04772d899263bebccb12c692e97988017ac549654cd4
   languageName: node
   linkType: hard
 
@@ -19199,27 +20471,26 @@ __metadata:
   version: 1.1.1
   resolution: "is-arguments@npm:1.1.1"
   dependencies:
-    call-bind: ^1.0.2
-    has-tostringtag: ^1.0.0
-  checksum: 7f02700ec2171b691ef3e4d0e3e6c0ba408e8434368504bb593d0d7c891c0dbfda6d19d30808b904a6cb1929bca648c061ba438c39f296c2a8ca083229c49f27
+    call-bind: "npm:^1.0.2"
+    has-tostringtag: "npm:^1.0.0"
+  checksum: 10/a170c7e26082e10de9be6e96d32ae3db4d5906194051b792e85fae3393b53cf2cb5b3557863e5c8ccbab55e2fd8f2f75aa643d437613f72052cf0356615c34be
   languageName: node
   linkType: hard
 
-"is-array-buffer@npm:^3.0.1, is-array-buffer@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "is-array-buffer@npm:3.0.2"
+"is-array-buffer@npm:^3.0.1, is-array-buffer@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "is-array-buffer@npm:3.0.4"
   dependencies:
-    call-bind: ^1.0.2
-    get-intrinsic: ^1.2.0
-    is-typed-array: ^1.1.10
-  checksum: dcac9dda66ff17df9cabdc58214172bf41082f956eab30bb0d86bc0fab1e44b690fc8e1f855cf2481245caf4e8a5a006a982a71ddccec84032ed41f9d8da8c14
+    call-bind: "npm:^1.0.2"
+    get-intrinsic: "npm:^1.2.1"
+  checksum: 10/34a26213d981d58b30724ef37a1e0682f4040d580fa9ff58fdfdd3cefcb2287921718c63971c1c404951e7b747c50fdc7caf6e867e951353fa71b369c04c969b
   languageName: node
   linkType: hard
 
 "is-arrayish@npm:^0.2.1":
   version: 0.2.1
   resolution: "is-arrayish@npm:0.2.1"
-  checksum: eef4417e3c10e60e2c810b6084942b3ead455af16c4509959a27e490e7aee87cfb3f38e01bbde92220b528a0ee1a18d52b787e1458ee86174d8c7f0e58cd488f
+  checksum: 10/73ced84fa35e59e2c57da2d01e12cd01479f381d7f122ce41dcbb713f09dbfc651315832cd2bf8accba7681a69e4d6f1e03941d94dd10040d415086360e7005e
   languageName: node
   linkType: hard
 
@@ -19227,8 +20498,8 @@ __metadata:
   version: 2.0.0
   resolution: "is-async-function@npm:2.0.0"
   dependencies:
-    has-tostringtag: ^1.0.0
-  checksum: e3471d95e6c014bf37cad8a93f2f4b6aac962178e0a5041e8903147166964fdc1c5c1d2ef87e86d77322c370ca18f2ea004fa7420581fa747bcaf7c223069dbd
+    has-tostringtag: "npm:^1.0.0"
+  checksum: 10/2cf336fbf8cba3badcf526aa3d10384c30bab32615ac4831b74492eb4e843ccb7d8439a119c27f84bcf217d72024e611b1373f870f433b48f3fa57d3d1b863f1
   languageName: node
   linkType: hard
 
@@ -19236,8 +20507,8 @@ __metadata:
   version: 1.0.4
   resolution: "is-bigint@npm:1.0.4"
   dependencies:
-    has-bigints: ^1.0.1
-  checksum: c56edfe09b1154f8668e53ebe8252b6f185ee852a50f9b41e8d921cb2bed425652049fbe438723f6cb48a63ca1aa051e948e7e401e093477c99c84eba244f666
+    has-bigints: "npm:^1.0.1"
+  checksum: 10/cc981cf0564c503aaccc1e5f39e994ae16ae2d1a8fcd14721f14ad431809071f39ec568cfceef901cff408045f1a6d6bac90d1b43eeb0b8e3bc34c8eb1bdb4c4
   languageName: node
   linkType: hard
 
@@ -19245,8 +20516,8 @@ __metadata:
   version: 2.1.0
   resolution: "is-binary-path@npm:2.1.0"
   dependencies:
-    binary-extensions: ^2.0.0
-  checksum: 84192eb88cff70d320426f35ecd63c3d6d495da9d805b19bc65b518984b7c0760280e57dbf119b7e9be6b161784a5a673ab2c6abe83abb5198a432232ad5b35c
+    binary-extensions: "npm:^2.0.0"
+  checksum: 10/078e51b4f956c2c5fd2b26bb2672c3ccf7e1faff38e0ebdba45612265f4e3d9fc3127a1fa8370bbf09eab61339203c3d3b7af5662cbf8be4030f8fac37745b0e
   languageName: node
   linkType: hard
 
@@ -19254,16 +20525,9 @@ __metadata:
   version: 1.1.2
   resolution: "is-boolean-object@npm:1.1.2"
   dependencies:
-    call-bind: ^1.0.2
-    has-tostringtag: ^1.0.0
-  checksum: c03b23dbaacadc18940defb12c1c0e3aaece7553ef58b162a0f6bba0c2a7e1551b59f365b91e00d2dbac0522392d576ef322628cb1d036a0fe51eb466db67222
-  languageName: node
-  linkType: hard
-
-"is-buffer@npm:^1.1.5":
-  version: 1.1.6
-  resolution: "is-buffer@npm:1.1.6"
-  checksum: 4a186d995d8bbf9153b4bd9ff9fd04ae75068fe695d29025d25e592d9488911eeece84eefbd8fa41b8ddcc0711058a71d4c466dcf6f1f6e1d83830052d8ca707
+    call-bind: "npm:^1.0.2"
+    has-tostringtag: "npm:^1.0.0"
+  checksum: 10/ba794223b56a49a9f185e945eeeb6b7833b8ea52a335cec087d08196cf27b538940001615d3bb976511287cefe94e5907d55f00bb49580533f9ca9b4515fcc2e
   languageName: node
   linkType: hard
 
@@ -19271,46 +20535,44 @@ __metadata:
   version: 3.2.1
   resolution: "is-builtin-module@npm:3.2.1"
   dependencies:
-    builtin-modules: ^3.3.0
-  checksum: e8f0ffc19a98240bda9c7ada84d846486365af88d14616e737d280d378695c8c448a621dcafc8332dbf0fcd0a17b0763b845400709963fa9151ddffece90ae88
+    builtin-modules: "npm:^3.3.0"
+  checksum: 10/e8f0ffc19a98240bda9c7ada84d846486365af88d14616e737d280d378695c8c448a621dcafc8332dbf0fcd0a17b0763b845400709963fa9151ddffece90ae88
   languageName: node
   linkType: hard
 
 "is-callable@npm:^1.1.3, is-callable@npm:^1.1.4, is-callable@npm:^1.2.7":
   version: 1.2.7
   resolution: "is-callable@npm:1.2.7"
-  checksum: 61fd57d03b0d984e2ed3720fb1c7a897827ea174bd44402878e059542ea8c4aeedee0ea0985998aa5cc2736b2fa6e271c08587addb5b3959ac52cf665173d1ac
-  languageName: node
-  linkType: hard
-
-"is-ci@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "is-ci@npm:2.0.0"
-  dependencies:
-    ci-info: ^2.0.0
-  bin:
-    is-ci: bin.js
-  checksum: 77b869057510f3efa439bbb36e9be429d53b3f51abd4776eeea79ab3b221337fe1753d1e50058a9e2c650d38246108beffb15ccfd443929d77748d8c0cc90144
+  checksum: 10/48a9297fb92c99e9df48706241a189da362bff3003354aea4048bd5f7b2eb0d823cd16d0a383cece3d76166ba16d85d9659165ac6fcce1ac12e6c649d66dbdb9
   languageName: node
   linkType: hard
 
-"is-ci@npm:^3.0.0":
+"is-ci@npm:3.0.1, is-ci@npm:^3.0.0":
   version: 3.0.1
   resolution: "is-ci@npm:3.0.1"
   dependencies:
-    ci-info: ^3.2.0
+    ci-info: "npm:^3.2.0"
   bin:
     is-ci: bin.js
-  checksum: 192c66dc7826d58f803ecae624860dccf1899fc1f3ac5505284c0a5cf5f889046ffeb958fa651e5725d5705c5bcb14f055b79150ea5fcad7456a9569de60260e
+  checksum: 10/192c66dc7826d58f803ecae624860dccf1899fc1f3ac5505284c0a5cf5f889046ffeb958fa651e5725d5705c5bcb14f055b79150ea5fcad7456a9569de60260e
   languageName: node
   linkType: hard
 
-"is-core-module@npm:^2.13.0, is-core-module@npm:^2.13.1, is-core-module@npm:^2.5.0, is-core-module@npm:^2.8.1, is-core-module@npm:^2.9.0":
+"is-core-module@npm:^2.13.0, is-core-module@npm:^2.13.1, is-core-module@npm:^2.5.0, is-core-module@npm:^2.8.1":
   version: 2.13.1
   resolution: "is-core-module@npm:2.13.1"
   dependencies:
-    hasown: ^2.0.0
-  checksum: 256559ee8a9488af90e4bad16f5583c6d59e92f0742e9e8bb4331e758521ee86b810b93bae44f390766ffbc518a0488b18d9dab7da9a5ff997d499efc9403f7c
+    hasown: "npm:^2.0.0"
+  checksum: 10/d53bd0cc24b0a0351fb4b206ee3908f71b9bbf1c47e9c9e14e5f06d292af1663704d2abd7e67700d6487b2b7864e0d0f6f10a1edf1892864bdffcb197d1845a2
+  languageName: node
+  linkType: hard
+
+"is-data-view@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-data-view@npm:1.0.1"
+  dependencies:
+    is-typed-array: "npm:^1.1.13"
+  checksum: 10/4ba4562ac2b2ec005fefe48269d6bd0152785458cd253c746154ffb8a8ab506a29d0cfb3b74af87513843776a88e4981ae25c89457bf640a33748eab1a7216b5
   languageName: node
   linkType: hard
 
@@ -19318,29 +20580,29 @@ __metadata:
   version: 1.0.5
   resolution: "is-date-object@npm:1.0.5"
   dependencies:
-    has-tostringtag: ^1.0.0
-  checksum: baa9077cdf15eb7b58c79398604ca57379b2fc4cf9aa7a9b9e295278648f628c9b201400c01c5e0f7afae56507d741185730307cbe7cad3b9f90a77e5ee342fc
+    has-tostringtag: "npm:^1.0.0"
+  checksum: 10/cc80b3a4b42238fa0d358b9a6230dae40548b349e64a477cb7c5eff9b176ba194c11f8321daaf6dd157e44073e9b7fd01f87db1f14952a88d5657acdcd3a56e2
   languageName: node
   linkType: hard
 
 "is-decimal@npm:^1.0.0":
   version: 1.0.4
   resolution: "is-decimal@npm:1.0.4"
-  checksum: ed483a387517856dc395c68403a10201fddcc1b63dc56513fbe2fe86ab38766120090ecdbfed89223d84ca8b1cd28b0641b93cb6597b6e8f4c097a7c24e3fb96
+  checksum: 10/ed483a387517856dc395c68403a10201fddcc1b63dc56513fbe2fe86ab38766120090ecdbfed89223d84ca8b1cd28b0641b93cb6597b6e8f4c097a7c24e3fb96
   languageName: node
   linkType: hard
 
 "is-deflate@npm:^1.0.0":
   version: 1.0.0
   resolution: "is-deflate@npm:1.0.0"
-  checksum: c2f9f2d3db79ac50c5586697d1e69a55282a2b0cc5e437b3c470dd47f24e40b6216dcd7e024511e21381607bf57afa019343e3bd0e08a119032818b596004262
+  checksum: 10/c2f9f2d3db79ac50c5586697d1e69a55282a2b0cc5e437b3c470dd47f24e40b6216dcd7e024511e21381607bf57afa019343e3bd0e08a119032818b596004262
   languageName: node
   linkType: hard
 
 "is-directory@npm:^0.3.1":
   version: 0.3.1
   resolution: "is-directory@npm:0.3.1"
-  checksum: dce9a9d3981e38f2ded2a80848734824c50ee8680cd09aa477bef617949715cfc987197a2ca0176c58a9fb192a1a0d69b535c397140d241996a609d5906ae524
+  checksum: 10/dce9a9d3981e38f2ded2a80848734824c50ee8680cd09aa477bef617949715cfc987197a2ca0176c58a9fb192a1a0d69b535c397140d241996a609d5906ae524
   languageName: node
   linkType: hard
 
@@ -19349,14 +20611,32 @@ __metadata:
   resolution: "is-docker@npm:2.2.1"
   bin:
     is-docker: cli.js
-  checksum: 3fef7ddbf0be25958e8991ad941901bf5922ab2753c46980b60b05c1bf9c9c2402d35e6dc32e4380b980ef5e1970a5d9d5e5aa2e02d77727c3b6b5e918474c56
+  checksum: 10/3fef7ddbf0be25958e8991ad941901bf5922ab2753c46980b60b05c1bf9c9c2402d35e6dc32e4380b980ef5e1970a5d9d5e5aa2e02d77727c3b6b5e918474c56
+  languageName: node
+  linkType: hard
+
+"is-docker@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "is-docker@npm:3.0.0"
+  bin:
+    is-docker: cli.js
+  checksum: 10/b698118f04feb7eaf3338922bd79cba064ea54a1c3db6ec8c0c8d8ee7613e7e5854d802d3ef646812a8a3ace81182a085dfa0a71cc68b06f3fa794b9783b3c90
+  languageName: node
+  linkType: hard
+
+"is-extendable@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "is-extendable@npm:1.0.1"
+  dependencies:
+    is-plain-object: "npm:^2.0.4"
+  checksum: 10/db07bc1e9de6170de70eff7001943691f05b9d1547730b11be01c0ebfe67362912ba743cf4be6fd20a5e03b4180c685dad80b7c509fe717037e3eee30ad8e84f
   languageName: node
   linkType: hard
 
-"is-extglob@npm:^2.1.0, is-extglob@npm:^2.1.1":
+"is-extglob@npm:^2.1.1":
   version: 2.1.1
   resolution: "is-extglob@npm:2.1.1"
-  checksum: df033653d06d0eb567461e58a7a8c9f940bd8c22274b94bf7671ab36df5719791aae15eef6d83bbb5e23283967f2f984b8914559d4449efda578c775c4be6f85
+  checksum: 10/df033653d06d0eb567461e58a7a8c9f940bd8c22274b94bf7671ab36df5719791aae15eef6d83bbb5e23283967f2f984b8914559d4449efda578c775c4be6f85
   languageName: node
   linkType: hard
 
@@ -19364,8 +20644,8 @@ __metadata:
   version: 1.0.2
   resolution: "is-finalizationregistry@npm:1.0.2"
   dependencies:
-    call-bind: ^1.0.2
-  checksum: 4f243a8e06228cd45bdab8608d2cb7abfc20f6f0189c8ac21ea8d603f1f196eabd531ce0bb8e08cbab047e9845ef2c191a3761c9a17ad5cabf8b35499c4ad35d
+    call-bind: "npm:^1.0.2"
+  checksum: 10/1b8e9e1bf2075e862315ef9d38ce6d39c43ca9d81d46f73b34473506992f4b0fbaadb47ec9b420a5e76afe3f564d9f1f0d9b552ef272cc2395e0f21d743c9c29
   languageName: node
   linkType: hard
 
@@ -19373,22 +20653,22 @@ __metadata:
   version: 1.0.0
   resolution: "is-fullwidth-code-point@npm:1.0.0"
   dependencies:
-    number-is-nan: ^1.0.0
-  checksum: 4d46a7465a66a8aebcc5340d3b63a56602133874af576a9ca42c6f0f4bd787a743605771c5f246db77da96605fefeffb65fc1dbe862dcc7328f4b4d03edf5a57
+    number-is-nan: "npm:^1.0.0"
+  checksum: 10/4d46a7465a66a8aebcc5340d3b63a56602133874af576a9ca42c6f0f4bd787a743605771c5f246db77da96605fefeffb65fc1dbe862dcc7328f4b4d03edf5a57
   languageName: node
   linkType: hard
 
 "is-fullwidth-code-point@npm:^3.0.0":
   version: 3.0.0
   resolution: "is-fullwidth-code-point@npm:3.0.0"
-  checksum: 44a30c29457c7fb8f00297bce733f0a64cd22eca270f83e58c105e0d015e45c019491a4ab2faef91ab51d4738c670daff901c799f6a700e27f7314029e99e348
+  checksum: 10/44a30c29457c7fb8f00297bce733f0a64cd22eca270f83e58c105e0d015e45c019491a4ab2faef91ab51d4738c670daff901c799f6a700e27f7314029e99e348
   languageName: node
   linkType: hard
 
 "is-generator-fn@npm:^2.0.0":
   version: 2.1.0
   resolution: "is-generator-fn@npm:2.1.0"
-  checksum: a6ad5492cf9d1746f73b6744e0c43c0020510b59d56ddcb78a91cbc173f09b5e6beff53d75c9c5a29feb618bfef2bf458e025ecf3a57ad2268e2fb2569f56215
+  checksum: 10/a6ad5492cf9d1746f73b6744e0c43c0020510b59d56ddcb78a91cbc173f09b5e6beff53d75c9c5a29feb618bfef2bf458e025ecf3a57ad2268e2fb2569f56215
   languageName: node
   linkType: hard
 
@@ -19396,17 +20676,8 @@ __metadata:
   version: 1.0.10
   resolution: "is-generator-function@npm:1.0.10"
   dependencies:
-    has-tostringtag: ^1.0.0
-  checksum: d54644e7dbaccef15ceb1e5d91d680eb5068c9ee9f9eb0a9e04173eb5542c9b51b5ab52c5537f5703e48d5fddfd376817c1ca07a84a407b7115b769d4bdde72b
-  languageName: node
-  linkType: hard
-
-"is-glob@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "is-glob@npm:3.1.0"
-  dependencies:
-    is-extglob: ^2.1.0
-  checksum: 9d483bca84f16f01230f7c7c8c63735248fe1064346f292e0f6f8c76475fd20c6f50fc19941af5bec35f85d6bf26f4b7768f39a48a5f5fdc72b408dc74e07afc
+    has-tostringtag: "npm:^1.0.0"
+  checksum: 10/499a3ce6361064c3bd27fbff5c8000212d48506ebe1977842bbd7b3e708832d0deb1f4cc69186ece3640770e8c4f1287b24d99588a0b8058b2dbdd344bc1f47f
   languageName: node
   linkType: hard
 
@@ -19414,43 +20685,54 @@ __metadata:
   version: 4.0.3
   resolution: "is-glob@npm:4.0.3"
   dependencies:
-    is-extglob: ^2.1.1
-  checksum: d381c1319fcb69d341cc6e6c7cd588e17cd94722d9a32dbd60660b993c4fb7d0f19438674e68dfec686d09b7c73139c9166b47597f846af387450224a8101ab4
+    is-extglob: "npm:^2.1.1"
+  checksum: 10/3ed74f2b0cdf4f401f38edb0442ddfde3092d79d7d35c9919c86641efdbcbb32e45aa3c0f70ce5eecc946896cd5a0f26e4188b9f2b881876f7cb6c505b82da11
   languageName: node
   linkType: hard
 
 "is-gzip@npm:^1.0.0":
   version: 1.0.0
   resolution: "is-gzip@npm:1.0.0"
-  checksum: 0d28931c1f445fa29c900cf9f48e06e9d1d477a3bf7bd7332e7ce68f1333ccd8cb381de2f0f62a9a262d9c0912608a9a71b4a40e788e201b3dbd67072bb20d86
+  checksum: 10/0d28931c1f445fa29c900cf9f48e06e9d1d477a3bf7bd7332e7ce68f1333ccd8cb381de2f0f62a9a262d9c0912608a9a71b4a40e788e201b3dbd67072bb20d86
   languageName: node
   linkType: hard
 
 "is-hexadecimal@npm:^1.0.0":
   version: 1.0.4
   resolution: "is-hexadecimal@npm:1.0.4"
-  checksum: a452e047587b6069332d83130f54d30da4faf2f2ebaa2ce6d073c27b5703d030d58ed9e0b729c8e4e5b52c6f1dab26781bb77b7bc6c7805f14f320e328ff8cd5
+  checksum: 10/a452e047587b6069332d83130f54d30da4faf2f2ebaa2ce6d073c27b5703d030d58ed9e0b729c8e4e5b52c6f1dab26781bb77b7bc6c7805f14f320e328ff8cd5
   languageName: node
   linkType: hard
 
 "is-hotkey@npm:0.1.4":
   version: 0.1.4
   resolution: "is-hotkey@npm:0.1.4"
-  checksum: d02af3f4840fd7bebf2e890f32e5e889e391f856bae4aab1085632b5bbdd4929e879008db4ee223bd8192b2d20fbac799cca2b6e912c3a10d5f2e03ebdbf5e47
+  checksum: 10/c718add99354cf448d5875f2f58e4770d8993f480a4cbd48585ab13eb590422474b1bf320246152a94b938dc9d88ce79353bac882887a64b1f47c3ecda536c00
   languageName: node
   linkType: hard
 
 "is-hotkey@npm:0.2.0":
   version: 0.2.0
   resolution: "is-hotkey@npm:0.2.0"
-  checksum: 97d295cfd8c3eb2c9b218daee5bff0ddaf47210930e3eb1eff36d2e6ad74854028203c640f35ea2d183d0cba94ac4c4bcd291925bc3a343d8a4c7d2c5ab3e2a6
+  checksum: 10/d3d42026e70ea796fb9af8345e511de4b90eed55765eb67db8695f83e60bac8566ace16b191c08c7f6fab36c9318133a9f1c19eb9e5f8ce528d8a433e4b41190
   languageName: node
   linkType: hard
 
 "is-in-browser@npm:^1.1.3":
   version: 1.1.3
   resolution: "is-in-browser@npm:1.1.3"
-  checksum: 178491f97f6663c0574565701b76f41633dbe065e4bd8d518ce017a8fa25e5109ecb6a3bd8bd55c0aba11b208f86b9f0f9c91f3664e148ebf618b74a74fcaf09
+  checksum: 10/f7411dbea0875ac609a794e28a545d654331e2a51f42a8c1629abbedf21ecb642ca726a4a9c8be28f9854990a764693483652b65612ccf7b5bc68aa4657e9a26
+  languageName: node
+  linkType: hard
+
+"is-inside-container@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "is-inside-container@npm:1.0.0"
+  dependencies:
+    is-docker: "npm:^3.0.0"
+  bin:
+    is-inside-container: cli.js
+  checksum: 10/c50b75a2ab66ab3e8b92b3bc534e1ea72ca25766832c0623ac22d134116a98bcf012197d1caabe1d1c4bd5f84363d4aa5c36bb4b585fbcaf57be172cd10a1a03
   languageName: node
   linkType: hard
 
@@ -19458,37 +20740,37 @@ __metadata:
   version: 0.4.0
   resolution: "is-installed-globally@npm:0.4.0"
   dependencies:
-    global-dirs: ^3.0.0
-    is-path-inside: ^3.0.2
-  checksum: 3359840d5982d22e9b350034237b2cda2a12bac1b48a721912e1ab8e0631dd07d45a2797a120b7b87552759a65ba03e819f1bd63f2d7ab8657ec0b44ee0bf399
+    global-dirs: "npm:^3.0.0"
+    is-path-inside: "npm:^3.0.2"
+  checksum: 10/5294d21c82cb9beedd693ce1dfb12117c4db36d6e35edc9dc6bf06cb300d23c96520d1bfb063386b054268ae3d7255c3f09393b52218cc26ace99b217bf37c93
   languageName: node
   linkType: hard
 
 "is-interactive@npm:^1.0.0":
   version: 1.0.0
   resolution: "is-interactive@npm:1.0.0"
-  checksum: 824808776e2d468b2916cdd6c16acacebce060d844c35ca6d82267da692e92c3a16fdba624c50b54a63f38bdc4016055b6f443ce57d7147240de4f8cdabaf6f9
+  checksum: 10/824808776e2d468b2916cdd6c16acacebce060d844c35ca6d82267da692e92c3a16fdba624c50b54a63f38bdc4016055b6f443ce57d7147240de4f8cdabaf6f9
   languageName: node
   linkType: hard
 
 "is-lambda@npm:^1.0.1":
   version: 1.0.1
   resolution: "is-lambda@npm:1.0.1"
-  checksum: 93a32f01940220532e5948538699ad610d5924ac86093fcee83022252b363eb0cc99ba53ab084a04e4fb62bf7b5731f55496257a4c38adf87af9c4d352c71c35
+  checksum: 10/93a32f01940220532e5948538699ad610d5924ac86093fcee83022252b363eb0cc99ba53ab084a04e4fb62bf7b5731f55496257a4c38adf87af9c4d352c71c35
   languageName: node
   linkType: hard
 
 "is-map@npm:^2.0.1, is-map@npm:^2.0.2":
   version: 2.0.2
   resolution: "is-map@npm:2.0.2"
-  checksum: ace3d0ecd667bbdefdb1852de601268f67f2db725624b1958f279316e13fecb8fa7df91fd60f690d7417b4ec180712f5a7ee967008e27c65cfd475cc84337728
+  checksum: 10/60ba910f835f2eacb1fdf5b5a6c60fe1c702d012a7673e6546992bcc0c873f62ada6e13d327f9e48f1720d49c152d6cdecae1fa47a261ef3d247c3ce6f0e1d39
   languageName: node
   linkType: hard
 
 "is-module@npm:^1.0.0":
   version: 1.0.0
   resolution: "is-module@npm:1.0.0"
-  checksum: 8cd5390730c7976fb4e8546dd0b38865ee6f7bacfa08dfbb2cc07219606755f0b01709d9361e01f13009bbbd8099fa2927a8ed665118a6105d66e40f1b838c3f
+  checksum: 10/8cd5390730c7976fb4e8546dd0b38865ee6f7bacfa08dfbb2cc07219606755f0b01709d9361e01f13009bbbd8099fa2927a8ed665118a6105d66e40f1b838c3f
   languageName: node
   linkType: hard
 
@@ -19496,30 +20778,37 @@ __metadata:
   version: 1.3.2
   resolution: "is-nan@npm:1.3.2"
   dependencies:
-    call-bind: ^1.0.0
-    define-properties: ^1.1.3
-  checksum: 5dfadcef6ad12d3029d43643d9800adbba21cf3ce2ec849f734b0e14ee8da4070d82b15fdb35138716d02587c6578225b9a22779cab34888a139cc43e4e3610a
+    call-bind: "npm:^1.0.0"
+    define-properties: "npm:^1.1.3"
+  checksum: 10/1f784d3472c09bc2e47acba7ffd4f6c93b0394479aa613311dc1d70f1bfa72eb0846c81350967722c959ba65811bae222204d6c65856fdce68f31986140c7b0e
   languageName: node
   linkType: hard
 
 "is-negated-glob@npm:^1.0.0":
   version: 1.0.0
   resolution: "is-negated-glob@npm:1.0.0"
-  checksum: 2a767da06435b492daa98d3049480f0b7032abd5bfd3930ac01dbe9d6fcae04f2b3d883c6dca6b9c0c3f8a703952643c78540151c3eb1a2fe90fec543d61d241
+  checksum: 10/752cb846d71403d0a26389d1f56f8e2ffdb110e994dffe41ebacd1ff4953ee1dc8e71438a00a4e398355113a755f05fc91c73da15541a11d2f080f6b39030d91
   languageName: node
   linkType: hard
 
-"is-negative-zero@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "is-negative-zero@npm:2.0.2"
-  checksum: f3232194c47a549da60c3d509c9a09be442507616b69454716692e37ae9f37c4dea264fb208ad0c9f3efd15a796a46b79df07c7e53c6227c32170608b809149a
+"is-negative-zero@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "is-negative-zero@npm:2.0.3"
+  checksum: 10/8fe5cffd8d4fb2ec7b49d657e1691889778d037494c6f40f4d1a524cadd658b4b53ad7b6b73a59bcb4b143ae9a3d15829af864b2c0f9d65ac1e678c4c80f17e5
+  languageName: node
+  linkType: hard
+
+"is-network-error@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "is-network-error@npm:1.0.1"
+  checksum: 10/165d61500c4186c62db5a3a693d6bfa14ca40fe9b471ef4cd4f27b20ef6760880faf5386dc01ca9867531631782941fedaa94521d09959edf71f046e393c7b91
   languageName: node
   linkType: hard
 
 "is-node-process@npm:^1.2.0":
   version: 1.2.0
   resolution: "is-node-process@npm:1.2.0"
-  checksum: 930765cdc6d81ab8f1bbecbea4a8d35c7c6d88a3ff61f3630e0fc7f22d624d7661c1df05c58547d0eb6a639dfa9304682c8e342c4113a6ed51472b704cee2928
+  checksum: 10/930765cdc6d81ab8f1bbecbea4a8d35c7c6d88a3ff61f3630e0fc7f22d624d7661c1df05c58547d0eb6a639dfa9304682c8e342c4113a6ed51472b704cee2928
   languageName: node
   linkType: hard
 
@@ -19527,71 +20816,71 @@ __metadata:
   version: 1.0.6
   resolution: "is-number-object@npm:1.0.6"
   dependencies:
-    has-tostringtag: ^1.0.0
-  checksum: c697704e8fc2027fc41cb81d29805de4e8b6dc9c3efee93741dbf126a8ecc8443fef85adbc581415ae7e55d325e51d0a942324ae35c829131748cce39cba55f3
+    has-tostringtag: "npm:^1.0.0"
+  checksum: 10/d848fdc0fc69e30866b87fcaae17a3e68a8be669073ab3bf9a578c29106a2d5084089a2e7bc40819ec55eac94a52d9e20d735e7bfd3a46202b17199e555f91fa
   languageName: node
   linkType: hard
 
 "is-number@npm:^7.0.0":
   version: 7.0.0
   resolution: "is-number@npm:7.0.0"
-  checksum: 456ac6f8e0f3111ed34668a624e45315201dff921e5ac181f8ec24923b99e9f32ca1a194912dc79d539c97d33dba17dc635202ff0b2cf98326f608323276d27a
+  checksum: 10/6a6c3383f68afa1e05b286af866017c78f1226d43ac8cb064e115ff9ed85eb33f5c4f7216c96a71e4dfea289ef52c5da3aef5bbfade8ffe47a0465d70c0c8e86
   languageName: node
   linkType: hard
 
 "is-obj@npm:^2.0.0":
   version: 2.0.0
   resolution: "is-obj@npm:2.0.0"
-  checksum: c9916ac8f4621962a42f5e80e7ffdb1d79a3fab7456ceaeea394cd9e0858d04f985a9ace45be44433bf605673c8be8810540fe4cc7f4266fc7526ced95af5a08
+  checksum: 10/c9916ac8f4621962a42f5e80e7ffdb1d79a3fab7456ceaeea394cd9e0858d04f985a9ace45be44433bf605673c8be8810540fe4cc7f4266fc7526ced95af5a08
   languageName: node
   linkType: hard
 
 "is-path-cwd@npm:^2.2.0":
   version: 2.2.0
   resolution: "is-path-cwd@npm:2.2.0"
-  checksum: 46a840921bb8cc0dc7b5b423a14220e7db338072a4495743a8230533ce78812dc152548c86f4b828411fe98c5451959f07cf841c6a19f611e46600bd699e8048
+  checksum: 10/46a840921bb8cc0dc7b5b423a14220e7db338072a4495743a8230533ce78812dc152548c86f4b828411fe98c5451959f07cf841c6a19f611e46600bd699e8048
   languageName: node
   linkType: hard
 
 "is-path-inside@npm:^3.0.2, is-path-inside@npm:^3.0.3":
   version: 3.0.3
   resolution: "is-path-inside@npm:3.0.3"
-  checksum: abd50f06186a052b349c15e55b182326f1936c89a78bf6c8f2b707412517c097ce04bc49a0ca221787bc44e1049f51f09a2ffb63d22899051988d3a618ba13e9
+  checksum: 10/abd50f06186a052b349c15e55b182326f1936c89a78bf6c8f2b707412517c097ce04bc49a0ca221787bc44e1049f51f09a2ffb63d22899051988d3a618ba13e9
   languageName: node
   linkType: hard
 
 "is-plain-obj@npm:^1.0.0, is-plain-obj@npm:^1.1.0":
   version: 1.1.0
   resolution: "is-plain-obj@npm:1.1.0"
-  checksum: 0ee04807797aad50859652a7467481816cbb57e5cc97d813a7dcd8915da8195dc68c436010bf39d195226cde6a2d352f4b815f16f26b7bf486a5754290629931
+  checksum: 10/0ee04807797aad50859652a7467481816cbb57e5cc97d813a7dcd8915da8195dc68c436010bf39d195226cde6a2d352f4b815f16f26b7bf486a5754290629931
   languageName: node
   linkType: hard
 
-"is-plain-obj@npm:^2.0.0, is-plain-obj@npm:^2.1.0":
+"is-plain-obj@npm:^2.1.0":
   version: 2.1.0
   resolution: "is-plain-obj@npm:2.1.0"
-  checksum: cec9100678b0a9fe0248a81743041ed990c2d4c99f893d935545cfbc42876cbe86d207f3b895700c690ad2fa520e568c44afc1605044b535a7820c1d40e38daa
+  checksum: 10/cec9100678b0a9fe0248a81743041ed990c2d4c99f893d935545cfbc42876cbe86d207f3b895700c690ad2fa520e568c44afc1605044b535a7820c1d40e38daa
   languageName: node
   linkType: hard
 
 "is-plain-obj@npm:^3.0.0":
   version: 3.0.0
   resolution: "is-plain-obj@npm:3.0.0"
-  checksum: a6ebdf8e12ab73f33530641972a72a4b8aed6df04f762070d823808303e4f76d87d5ea5bd76f96a7bbe83d93f04ac7764429c29413bd9049853a69cb630fb21c
+  checksum: 10/a6ebdf8e12ab73f33530641972a72a4b8aed6df04f762070d823808303e4f76d87d5ea5bd76f96a7bbe83d93f04ac7764429c29413bd9049853a69cb630fb21c
   languageName: node
   linkType: hard
 
 "is-plain-obj@npm:^4.0.0":
   version: 4.1.0
   resolution: "is-plain-obj@npm:4.1.0"
-  checksum: 6dc45da70d04a81f35c9310971e78a6a3c7a63547ef782e3a07ee3674695081b6ca4e977fbb8efc48dae3375e0b34558d2bcd722aec9bddfa2d7db5b041be8ce
+  checksum: 10/6dc45da70d04a81f35c9310971e78a6a3c7a63547ef782e3a07ee3674695081b6ca4e977fbb8efc48dae3375e0b34558d2bcd722aec9bddfa2d7db5b041be8ce
   languageName: node
   linkType: hard
 
 "is-plain-object@npm:5.0.0, is-plain-object@npm:^5.0.0":
   version: 5.0.0
   resolution: "is-plain-object@npm:5.0.0"
-  checksum: e32d27061eef62c0847d303125440a38660517e586f2f3db7c9d179ae5b6674ab0f469d519b2e25c147a1a3bc87156d0d5f4d8821e0ce4a9ee7fe1fcf11ce45c
+  checksum: 10/e32d27061eef62c0847d303125440a38660517e586f2f3db7c9d179ae5b6674ab0f469d519b2e25c147a1a3bc87156d0d5f4d8821e0ce4a9ee7fe1fcf11ce45c
   languageName: node
   linkType: hard
 
@@ -19599,31 +20888,22 @@ __metadata:
   version: 2.0.4
   resolution: "is-plain-object@npm:2.0.4"
   dependencies:
-    isobject: ^3.0.1
-  checksum: 2a401140cfd86cabe25214956ae2cfee6fbd8186809555cd0e84574f88de7b17abacb2e477a6a658fa54c6083ecbda1e6ae404c7720244cd198903848fca70ca
+    isobject: "npm:^3.0.1"
+  checksum: 10/2a401140cfd86cabe25214956ae2cfee6fbd8186809555cd0e84574f88de7b17abacb2e477a6a658fa54c6083ecbda1e6ae404c7720244cd198903848fca70ca
   languageName: node
   linkType: hard
 
 "is-plain-object@npm:^3.0.0":
   version: 3.0.1
   resolution: "is-plain-object@npm:3.0.1"
-  checksum: d13fe75db350d4ac669595cdfe0242ae87fcecddf2bca858d2dd443a6ed6eb1f69951fac8c2fa85b16106c6b0d7738fea86c2aca2ecee7fd61de15c1574f2cc5
+  checksum: 10/d13fe75db350d4ac669595cdfe0242ae87fcecddf2bca858d2dd443a6ed6eb1f69951fac8c2fa85b16106c6b0d7738fea86c2aca2ecee7fd61de15c1574f2cc5
   languageName: node
   linkType: hard
 
 "is-potential-custom-element-name@npm:^1.0.1":
   version: 1.0.1
   resolution: "is-potential-custom-element-name@npm:1.0.1"
-  checksum: ced7bbbb6433a5b684af581872afe0e1767e2d1146b2207ca0068a648fb5cab9d898495d1ac0583524faaf24ca98176a7d9876363097c2d14fee6dd324f3a1ab
-  languageName: node
-  linkType: hard
-
-"is-reference@npm:1.2.1":
-  version: 1.2.1
-  resolution: "is-reference@npm:1.2.1"
-  dependencies:
-    "@types/estree": "*"
-  checksum: e7b48149f8abda2c10849ea51965904d6a714193d68942ad74e30522231045acf06cbfae5a4be2702fede5d232e61bf50b3183acdc056e6e3afe07fcf4f4b2bc
+  checksum: 10/ced7bbbb6433a5b684af581872afe0e1767e2d1146b2207ca0068a648fb5cab9d898495d1ac0583524faaf24ca98176a7d9876363097c2d14fee6dd324f3a1ab
   languageName: node
   linkType: hard
 
@@ -19631,34 +20911,25 @@ __metadata:
   version: 1.1.4
   resolution: "is-regex@npm:1.1.4"
   dependencies:
-    call-bind: ^1.0.2
-    has-tostringtag: ^1.0.0
-  checksum: 362399b33535bc8f386d96c45c9feb04cf7f8b41c182f54174c1a45c9abbbe5e31290bbad09a458583ff6bf3b2048672cdb1881b13289569a7c548370856a652
-  languageName: node
-  linkType: hard
-
-"is-relative@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-relative@npm:1.0.0"
-  dependencies:
-    is-unc-path: ^1.0.0
-  checksum: 3271a0df109302ef5e14a29dcd5d23d9788e15ade91a40b942b035827ffbb59f7ce9ff82d036ea798541a52913cbf9d2d0b66456340887b51f3542d57b5a4c05
+    call-bind: "npm:^1.0.2"
+    has-tostringtag: "npm:^1.0.0"
+  checksum: 10/36d9174d16d520b489a5e9001d7d8d8624103b387be300c50f860d9414556d0485d74a612fdafc6ebbd5c89213d947dcc6b6bff6b2312093f71ea03cbb19e564
   languageName: node
   linkType: hard
 
 "is-set@npm:^2.0.1, is-set@npm:^2.0.2":
   version: 2.0.2
   resolution: "is-set@npm:2.0.2"
-  checksum: b64343faf45e9387b97a6fd32be632ee7b269bd8183701f3b3f5b71a7cf00d04450ed8669d0bd08753e08b968beda96fca73a10fd0ff56a32603f64deba55a57
+  checksum: 10/d89e82acdc7760993474f529e043f9c4a1d63ed4774d21cc2e331d0e401e5c91c27743cd7c889137028f6a742234759a4bd602368fbdbf0b0321994aefd5603f
   languageName: node
   linkType: hard
 
-"is-shared-array-buffer@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "is-shared-array-buffer@npm:1.0.2"
+"is-shared-array-buffer@npm:^1.0.2, is-shared-array-buffer@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "is-shared-array-buffer@npm:1.0.3"
   dependencies:
-    call-bind: ^1.0.2
-  checksum: 9508929cf14fdc1afc9d61d723c6e8d34f5e117f0bffda4d97e7a5d88c3a8681f633a74f8e3ad1fe92d5113f9b921dc5ca44356492079612f9a247efbce7032a
+    call-bind: "npm:^1.0.7"
+  checksum: 10/bc5402900dc62b96ebb2548bf5b0a0bcfacc2db122236fe3ab3b3e3c884293a0d5eb777e73f059bcbf8dc8563bb65eae972fee0fb97e38a9ae27c8678f62bcfe
   languageName: node
   linkType: hard
 
@@ -19666,15 +20937,22 @@ __metadata:
   version: 1.4.0
   resolution: "is-ssh@npm:1.4.0"
   dependencies:
-    protocols: ^2.0.1
-  checksum: 75eaa17b538bee24b661fbeb0f140226ac77e904a6039f787bea418431e2162f1f9c4c4ccad3bd169e036cd701cc631406e8c505d9fa7e20164e74b47f86f40f
+    protocols: "npm:^2.0.1"
+  checksum: 10/e2d17d74a19b4368cc06ce5c76d4f625952442da337098d670a9840e1db5334c646aa0a6ed3a01e9d396901e22c755174ce64e74c3139bb10e5df03d5a6fb3fa
+  languageName: node
+  linkType: hard
+
+"is-stream@npm:2.0.0":
+  version: 2.0.0
+  resolution: "is-stream@npm:2.0.0"
+  checksum: 10/4dc47738e26bc4f1b3be9070b6b9e39631144f204fc6f87db56961220add87c10a999ba26cf81699f9ef9610426f69cb08a4713feff8deb7d8cadac907826935
   languageName: node
   linkType: hard
 
 "is-stream@npm:^2.0.0":
   version: 2.0.1
   resolution: "is-stream@npm:2.0.1"
-  checksum: b8e05ccdf96ac330ea83c12450304d4a591f9958c11fd17bed240af8d5ffe08aedafa4c0f4cfccd4d28dc9d4d129daca1023633d5c11601a6cbc77521f6fae66
+  checksum: 10/b8e05ccdf96ac330ea83c12450304d4a591f9958c11fd17bed240af8d5ffe08aedafa4c0f4cfccd4d28dc9d4d129daca1023633d5c11601a6cbc77521f6fae66
   languageName: node
   linkType: hard
 
@@ -19682,8 +20960,8 @@ __metadata:
   version: 1.0.7
   resolution: "is-string@npm:1.0.7"
   dependencies:
-    has-tostringtag: ^1.0.0
-  checksum: 323b3d04622f78d45077cf89aab783b2f49d24dc641aa89b5ad1a72114cfeff2585efc8c12ef42466dff32bde93d839ad321b26884cf75e5a7892a938b089989
+    has-tostringtag: "npm:^1.0.0"
+  checksum: 10/2bc292fe927493fb6dfc3338c099c3efdc41f635727c6ebccf704aeb2a27bca7acb9ce6fd34d103db78692b10b22111a8891de26e12bfa1c5e11e263c99d1fef
   languageName: node
   linkType: hard
 
@@ -19691,8 +20969,8 @@ __metadata:
   version: 1.0.4
   resolution: "is-symbol@npm:1.0.4"
   dependencies:
-    has-symbols: ^1.0.2
-  checksum: 92805812ef590738d9de49d677cd17dfd486794773fb6fa0032d16452af46e9b91bb43ffe82c983570f015b37136f4b53b28b8523bfb10b0ece7a66c31a54510
+    has-symbols: "npm:^1.0.2"
+  checksum: 10/a47dd899a84322528b71318a89db25c7ecdec73197182dad291df15ffea501e17e3c92c8de0bfb50e63402747399981a687b31c519971b1fa1a27413612be929
   languageName: node
   linkType: hard
 
@@ -19700,61 +20978,45 @@ __metadata:
   version: 1.0.1
   resolution: "is-text-path@npm:1.0.1"
   dependencies:
-    text-extensions: ^1.0.0
-  checksum: fb5d78752c22b3f73a7c9540768f765ffcfa38c9e421e2b9af869565307fa1ae5e3d3a2ba016a43549742856846566d327da406e94a5846ec838a288b1704fd2
+    text-extensions: "npm:^1.0.0"
+  checksum: 10/fb5d78752c22b3f73a7c9540768f765ffcfa38c9e421e2b9af869565307fa1ae5e3d3a2ba016a43549742856846566d327da406e94a5846ec838a288b1704fd2
   languageName: node
   linkType: hard
 
-"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.12, is-typed-array@npm:^1.1.3, is-typed-array@npm:^1.1.9":
-  version: 1.1.12
-  resolution: "is-typed-array@npm:1.1.12"
+"is-typed-array@npm:^1.1.13, is-typed-array@npm:^1.1.3":
+  version: 1.1.13
+  resolution: "is-typed-array@npm:1.1.13"
   dependencies:
-    which-typed-array: ^1.1.11
-  checksum: 4c89c4a3be07186caddadf92197b17fda663a9d259ea0d44a85f171558270d36059d1c386d34a12cba22dfade5aba497ce22778e866adc9406098c8fc4771796
+    which-typed-array: "npm:^1.1.14"
+  checksum: 10/f850ba08286358b9a11aee6d93d371a45e3c59b5953549ee1c1a9a55ba5c1dd1bd9952488ae194ad8f32a9cf5e79c8fa5f0cc4d78c00720aa0bbcf238b38062d
   languageName: node
   linkType: hard
 
-"is-typedarray@npm:^1.0.0, is-typedarray@npm:~1.0.0":
+"is-typedarray@npm:~1.0.0":
   version: 1.0.0
   resolution: "is-typedarray@npm:1.0.0"
-  checksum: 3508c6cd0a9ee2e0df2fa2e9baabcdc89e911c7bd5cf64604586697212feec525aa21050e48affb5ffc3df20f0f5d2e2cf79b08caa64e1ccc9578e251763aef7
-  languageName: node
-  linkType: hard
-
-"is-unc-path@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-unc-path@npm:1.0.0"
-  dependencies:
-    unc-path-regex: ^0.1.2
-  checksum: e8abfde203f7409f5b03a5f1f8636e3a41e78b983702ef49d9343eb608cdfe691429398e8815157519b987b739bcfbc73ae7cf4c8582b0ab66add5171088eab6
+  checksum: 10/4b433bfb0f9026f079f4eb3fbaa4ed2de17c9995c3a0b5c800bec40799b4b2a8b4e051b1ada77749deb9ded4ae52fe2096973f3a93ff83df1a5a7184a669478c
   languageName: node
   linkType: hard
 
 "is-unicode-supported@npm:^0.1.0":
   version: 0.1.0
   resolution: "is-unicode-supported@npm:0.1.0"
-  checksum: a2aab86ee7712f5c2f999180daaba5f361bdad1efadc9610ff5b8ab5495b86e4f627839d085c6530363c6d6d4ecbde340fb8e54bdb83da4ba8e0865ed5513c52
-  languageName: node
-  linkType: hard
-
-"is-utf8@npm:^0.2.1":
-  version: 0.2.1
-  resolution: "is-utf8@npm:0.2.1"
-  checksum: 167ccd2be869fc228cc62c1a28df4b78c6b5485d15a29027d3b5dceb09b383e86a3522008b56dcac14b592b22f0a224388718c2505027a994fd8471465de54b3
+  checksum: 10/a2aab86ee7712f5c2f999180daaba5f361bdad1efadc9610ff5b8ab5495b86e4f627839d085c6530363c6d6d4ecbde340fb8e54bdb83da4ba8e0865ed5513c52
   languageName: node
   linkType: hard
 
 "is-valid-glob@npm:^1.0.0":
   version: 1.0.0
   resolution: "is-valid-glob@npm:1.0.0"
-  checksum: 0155951e89291d405cbb2ff4e25a38ee7a88bc70b05f246c25d31a1d09f13d4207377e5860f67443bbda8e3e353da37047b60e586bd9c97a39c9301c30b67acb
+  checksum: 10/0155951e89291d405cbb2ff4e25a38ee7a88bc70b05f246c25d31a1d09f13d4207377e5860f67443bbda8e3e353da37047b60e586bd9c97a39c9301c30b67acb
   languageName: node
   linkType: hard
 
 "is-weakmap@npm:^2.0.1":
   version: 2.0.1
   resolution: "is-weakmap@npm:2.0.1"
-  checksum: 1222bb7e90c32bdb949226e66d26cb7bce12e1e28e3e1b40bfa6b390ba3e08192a8664a703dff2a00a84825f4e022f9cd58c4599ff9981ab72b1d69479f4f7f6
+  checksum: 10/289fa4e8ba1bdda40ca78481266f6925b7c46a85599e6a41a77010bf91e5a24dfb660db96863bbf655ecdbda0ab517204d6a4e0c151dbec9d022c556321f3776
   languageName: node
   linkType: hard
 
@@ -19762,8 +21024,8 @@ __metadata:
   version: 1.0.2
   resolution: "is-weakref@npm:1.0.2"
   dependencies:
-    call-bind: ^1.0.2
-  checksum: 95bd9a57cdcb58c63b1c401c60a474b0f45b94719c30f548c891860f051bc2231575c290a6b420c6bc6e7ed99459d424c652bd5bf9a1d5259505dc35b4bf83de
+    call-bind: "npm:^1.0.2"
+  checksum: 10/0023fd0e4bdf9c338438ffbe1eed7ebbbff7e7e18fb7cdc227caaf9d4bd024a2dcdf6a8c9f40c92192022eac8391243bb9e66cccebecbf6fe1d8a366108f8513
   languageName: node
   linkType: hard
 
@@ -19771,23 +21033,16 @@ __metadata:
   version: 2.0.2
   resolution: "is-weakset@npm:2.0.2"
   dependencies:
-    call-bind: ^1.0.2
-    get-intrinsic: ^1.1.1
-  checksum: 5d8698d1fa599a0635d7ca85be9c26d547b317ed8fd83fc75f03efbe75d50001b5eececb1e9971de85fcde84f69ae6f8346bc92d20d55d46201d328e4c74a367
+    call-bind: "npm:^1.0.2"
+    get-intrinsic: "npm:^1.1.1"
+  checksum: 10/8f2ddb9639716fd7936784e175ea1183c5c4c05274c34f34f6a53175313cb1c9c35a8b795623306995e2f7cc8f25aa46302f15a2113e51c5052d447be427195c
   languageName: node
   linkType: hard
 
 "is-window@npm:^1.0.2":
   version: 1.0.2
   resolution: "is-window@npm:1.0.2"
-  checksum: aeaacd2ca816d38d4e2fba4670158fba2190061f28a61c5d84df7c479abf8897b8cb634d22cb76cdf7805035e95bebd430faaab6231ac2ebc814eae02d2c8fd4
-  languageName: node
-  linkType: hard
-
-"is-windows@npm:^1.0.1":
-  version: 1.0.2
-  resolution: "is-windows@npm:1.0.2"
-  checksum: 438b7e52656fe3b9b293b180defb4e448088e7023a523ec21a91a80b9ff8cdb3377ddb5b6e60f7c7de4fa8b63ab56e121b6705fe081b3cf1b828b0a380009ad7
+  checksum: 10/aeaacd2ca816d38d4e2fba4670158fba2190061f28a61c5d84df7c479abf8897b8cb634d22cb76cdf7805035e95bebd430faaab6231ac2ebc814eae02d2c8fd4
   languageName: node
   linkType: hard
 
@@ -19795,64 +21050,80 @@ __metadata:
   version: 2.2.0
   resolution: "is-wsl@npm:2.2.0"
   dependencies:
-    is-docker: ^2.0.0
-  checksum: 20849846ae414997d290b75e16868e5261e86ff5047f104027026fd61d8b5a9b0b3ade16239f35e1a067b3c7cc02f70183cb661010ed16f4b6c7c93dad1b19d8
+    is-docker: "npm:^2.0.0"
+  checksum: 10/20849846ae414997d290b75e16868e5261e86ff5047f104027026fd61d8b5a9b0b3ade16239f35e1a067b3c7cc02f70183cb661010ed16f4b6c7c93dad1b19d8
+  languageName: node
+  linkType: hard
+
+"is-wsl@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "is-wsl@npm:3.1.0"
+  dependencies:
+    is-inside-container: "npm:^1.0.0"
+  checksum: 10/f9734c81f2f9cf9877c5db8356bfe1ff61680f1f4c1011e91278a9c0564b395ae796addb4bf33956871041476ec82c3e5260ed57b22ac91794d4ae70a1d2f0a9
   languageName: node
   linkType: hard
 
 "isarray@npm:0.0.1":
   version: 0.0.1
   resolution: "isarray@npm:0.0.1"
-  checksum: 49191f1425681df4a18c2f0f93db3adb85573bcdd6a4482539d98eac9e705d8961317b01175627e860516a2fc45f8f9302db26e5a380a97a520e272e2a40a8d4
+  checksum: 10/49191f1425681df4a18c2f0f93db3adb85573bcdd6a4482539d98eac9e705d8961317b01175627e860516a2fc45f8f9302db26e5a380a97a520e272e2a40a8d4
   languageName: node
   linkType: hard
 
 "isarray@npm:^2.0.5":
   version: 2.0.5
   resolution: "isarray@npm:2.0.5"
-  checksum: bd5bbe4104438c4196ba58a54650116007fa0262eccef13a4c55b2e09a5b36b59f1e75b9fcc49883dd9d4953892e6fc007eef9e9155648ceea036e184b0f930a
+  checksum: 10/1d8bc7911e13bb9f105b1b3e0b396c787a9e63046af0b8fe0ab1414488ab06b2b099b87a2d8a9e31d21c9a6fad773c7fc8b257c4880f2d957274479d28ca3414
   languageName: node
   linkType: hard
 
 "isarray@npm:~1.0.0":
   version: 1.0.0
   resolution: "isarray@npm:1.0.0"
-  checksum: f032df8e02dce8ec565cf2eb605ea939bdccea528dbcf565cdf92bfa2da9110461159d86a537388ef1acef8815a330642d7885b29010e8f7eac967c9993b65ab
+  checksum: 10/f032df8e02dce8ec565cf2eb605ea939bdccea528dbcf565cdf92bfa2da9110461159d86a537388ef1acef8815a330642d7885b29010e8f7eac967c9993b65ab
   languageName: node
   linkType: hard
 
 "isexe@npm:^2.0.0":
   version: 2.0.0
   resolution: "isexe@npm:2.0.0"
-  checksum: 26bf6c5480dda5161c820c5b5c751ae1e766c587b1f951ea3fcfc973bafb7831ae5b54a31a69bd670220e42e99ec154475025a468eae58ea262f813fdc8d1c62
+  checksum: 10/7c9f715c03aff08f35e98b1fadae1b9267b38f0615d501824f9743f3aab99ef10e303ce7db3f186763a0b70a19de5791ebfc854ff884d5a8c4d92211f642ec92
+  languageName: node
+  linkType: hard
+
+"isexe@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "isexe@npm:3.1.1"
+  checksum: 10/7fe1931ee4e88eb5aa524cd3ceb8c882537bc3a81b02e438b240e47012eef49c86904d0f0e593ea7c3a9996d18d0f1f3be8d3eaa92333977b0c3a9d353d5563e
   languageName: node
   linkType: hard
 
 "isobject@npm:^3.0.1":
   version: 3.0.1
   resolution: "isobject@npm:3.0.1"
-  checksum: db85c4c970ce30693676487cca0e61da2ca34e8d4967c2e1309143ff910c207133a969f9e4ddb2dc6aba670aabce4e0e307146c310350b298e74a31f7d464703
+  checksum: 10/db85c4c970ce30693676487cca0e61da2ca34e8d4967c2e1309143ff910c207133a969f9e4ddb2dc6aba670aabce4e0e307146c310350b298e74a31f7d464703
   languageName: node
   linkType: hard
 
 "isomorphic-base64@npm:^1.0.2":
   version: 1.0.2
   resolution: "isomorphic-base64@npm:1.0.2"
-  checksum: 68780627db2382bffa847990fab4f0c1aee8a89dae4acd69aa423c9de46f51ca04a1ed216eb656b33c676eb4696b177fe4379f2cbe05ccb6e6699c01db83dfa5
+  checksum: 10/68780627db2382bffa847990fab4f0c1aee8a89dae4acd69aa423c9de46f51ca04a1ed216eb656b33c676eb4696b177fe4379f2cbe05ccb6e6699c01db83dfa5
   languageName: node
   linkType: hard
 
 "isstream@npm:~0.1.2":
   version: 0.1.2
   resolution: "isstream@npm:0.1.2"
-  checksum: 1eb2fe63a729f7bdd8a559ab552c69055f4f48eb5c2f03724430587c6f450783c8f1cd936c1c952d0a927925180fcc892ebd5b174236cf1065d4bd5bdb37e963
+  checksum: 10/22d9c181015226d4534a227539256897bbbcb7edd1066ca4fc4d3a06dbd976325dfdd16b3983c7d236a89f256805c1a685a772e0364e98873d3819b064ad35a1
   languageName: node
   linkType: hard
 
 "istanbul-lib-coverage@npm:^3.0.0, istanbul-lib-coverage@npm:^3.2.0":
   version: 3.2.0
   resolution: "istanbul-lib-coverage@npm:3.2.0"
-  checksum: a2a545033b9d56da04a8571ed05c8120bf10e9bce01cf8633a3a2b0d1d83dff4ac4fe78d6d5673c27fc29b7f21a41d75f83a36be09f82a61c367b56aa73c1ff9
+  checksum: 10/31621b84ad29339242b63d454243f558a7958ee0b5177749bacf1f74be7d95d3fd93853738ef7eebcddfaf3eab014716e51392a8dbd5aa1bdc1b15c2ebc53c24
   languageName: node
   linkType: hard
 
@@ -19860,12 +21131,12 @@ __metadata:
   version: 5.1.0
   resolution: "istanbul-lib-instrument@npm:5.1.0"
   dependencies:
-    "@babel/core": ^7.12.3
-    "@babel/parser": ^7.14.7
-    "@istanbuljs/schema": ^0.1.2
-    istanbul-lib-coverage: ^3.2.0
-    semver: ^6.3.0
-  checksum: 8b82e733c69fe9f94d2e21f3e5760c9bedb110329aa75df4bd40df95f1cac3bf38767e43f35b125cc547ceca7376b72ce7d95cc5238b7e9088345c7b589233d3
+    "@babel/core": "npm:^7.12.3"
+    "@babel/parser": "npm:^7.14.7"
+    "@istanbuljs/schema": "npm:^0.1.2"
+    istanbul-lib-coverage: "npm:^3.2.0"
+    semver: "npm:^6.3.0"
+  checksum: 10/7447ba3f8049f331d5b4a1c450183e88c2fdad044149ad0d9830f71bc8da90d841c393b830bc33237ae75122c3b0e03ca845701873d6c51690bc25caa1f13a94
   languageName: node
   linkType: hard
 
@@ -19873,12 +21144,12 @@ __metadata:
   version: 6.0.0
   resolution: "istanbul-lib-instrument@npm:6.0.0"
   dependencies:
-    "@babel/core": ^7.12.3
-    "@babel/parser": ^7.14.7
-    "@istanbuljs/schema": ^0.1.2
-    istanbul-lib-coverage: ^3.2.0
-    semver: ^7.5.4
-  checksum: b9dc3723a769e65dbe1b912f935088ffc07cf393fa78a3ce79022c91aabb0ad01405ffd56083cdd822e514798e9daae3ea7bfe85633b094ecb335d28eb0a3f97
+    "@babel/core": "npm:^7.12.3"
+    "@babel/parser": "npm:^7.14.7"
+    "@istanbuljs/schema": "npm:^0.1.2"
+    istanbul-lib-coverage: "npm:^3.2.0"
+    semver: "npm:^7.5.4"
+  checksum: 10/a52efe2170ac2deeaaacc84d10fe8de41d97264a86e57df77e05c1e72227a333280f640836137b28fda802a2c71b2affb00a703979e6f7a462cc80047a6aff21
   languageName: node
   linkType: hard
 
@@ -19886,10 +21157,10 @@ __metadata:
   version: 3.0.0
   resolution: "istanbul-lib-report@npm:3.0.0"
   dependencies:
-    istanbul-lib-coverage: ^3.0.0
-    make-dir: ^3.0.0
-    supports-color: ^7.1.0
-  checksum: 3f29eb3f53c59b987386e07fe772d24c7f58c6897f34c9d7a296f4000de7ae3de9eb95c3de3df91dc65b134c84dee35c54eee572a56243e8907c48064e34ff1b
+    istanbul-lib-coverage: "npm:^3.0.0"
+    make-dir: "npm:^3.0.0"
+    supports-color: "npm:^7.1.0"
+  checksum: 10/06b37952e9cb0fe419a37c7f3d74612a098167a9eb0e5264228036e78b42ca5226501e8130738b5306d94bae2ea068ca674080d4af959992523d84aacff67728
   languageName: node
   linkType: hard
 
@@ -19897,10 +21168,10 @@ __metadata:
   version: 4.0.1
   resolution: "istanbul-lib-source-maps@npm:4.0.1"
   dependencies:
-    debug: ^4.1.1
-    istanbul-lib-coverage: ^3.0.0
-    source-map: ^0.6.1
-  checksum: 21ad3df45db4b81852b662b8d4161f6446cd250c1ddc70ef96a585e2e85c26ed7cd9c2a396a71533cfb981d1a645508bc9618cae431e55d01a0628e7dec62ef2
+    debug: "npm:^4.1.1"
+    istanbul-lib-coverage: "npm:^3.0.0"
+    source-map: "npm:^0.6.1"
+  checksum: 10/5526983462799aced011d776af166e350191b816821ea7bcf71cab3e5272657b062c47dc30697a22a43656e3ced78893a42de677f9ccf276a28c913190953b82
   languageName: node
   linkType: hard
 
@@ -19908,9 +21179,9 @@ __metadata:
   version: 3.1.5
   resolution: "istanbul-reports@npm:3.1.5"
   dependencies:
-    html-escaper: ^2.0.0
-    istanbul-lib-report: ^3.0.0
-  checksum: 7867228f83ed39477b188ea07e7ccb9b4f5320b6f73d1db93a0981b7414fa4ef72d3f80c4692c442f90fc250d9406e71d8d7ab65bb615cb334e6292b73192b89
+    html-escaper: "npm:^2.0.0"
+    istanbul-lib-report: "npm:^3.0.0"
+  checksum: 10/1fc20a133f6dbd846e7bf3dc6d85edf2b3c047c47142cd796c38717aef976195d2c0fb0399dd609c3ffac2ca43244dc15ce4ac34064d21e2d34d387df747dafb
   languageName: node
   linkType: hard
 
@@ -19918,25 +21189,25 @@ __metadata:
   version: 1.1.2
   resolution: "iterator.prototype@npm:1.1.2"
   dependencies:
-    define-properties: ^1.2.1
-    get-intrinsic: ^1.2.1
-    has-symbols: ^1.0.3
-    reflect.getprototypeof: ^1.0.4
-    set-function-name: ^2.0.1
-  checksum: d8a507e2ccdc2ce762e8a1d3f4438c5669160ac72b88b648e59a688eec6bc4e64b22338e74000518418d9e693faf2a092d2af21b9ec7dbf7763b037a54701168
+    define-properties: "npm:^1.2.1"
+    get-intrinsic: "npm:^1.2.1"
+    has-symbols: "npm:^1.0.3"
+    reflect.getprototypeof: "npm:^1.0.4"
+    set-function-name: "npm:^2.0.1"
+  checksum: 10/b5013967ad8f28c9ca1be8e159eb10f591b8e46deae87476fe39d668c04374fe9158c815e8b6d2f45885b0a3fd842a8ba13f497ec762b3a0eff49bec278670b1
   languageName: node
   linkType: hard
 
-"jackspeak@npm:^2.0.3, jackspeak@npm:^2.3.5":
+"jackspeak@npm:^2.3.5, jackspeak@npm:^2.3.6":
   version: 2.3.6
   resolution: "jackspeak@npm:2.3.6"
   dependencies:
-    "@isaacs/cliui": ^8.0.2
-    "@pkgjs/parseargs": ^0.11.0
+    "@isaacs/cliui": "npm:^8.0.2"
+    "@pkgjs/parseargs": "npm:^0.11.0"
   dependenciesMeta:
     "@pkgjs/parseargs":
       optional: true
-  checksum: 57d43ad11eadc98cdfe7496612f6bbb5255ea69fe51ea431162db302c2a11011642f50cfad57288bd0aea78384a0612b16e131944ad8ecd09d619041c8531b54
+  checksum: 10/6e6490d676af8c94a7b5b29b8fd5629f21346911ebe2e32931c2a54210134408171c24cee1a109df2ec19894ad04a429402a8438cbf5cc2794585d35428ace76
   languageName: node
   linkType: hard
 
@@ -19944,13 +21215,13 @@ __metadata:
   version: 10.8.5
   resolution: "jake@npm:10.8.5"
   dependencies:
-    async: ^3.2.3
-    chalk: ^4.0.2
-    filelist: ^1.0.1
-    minimatch: ^3.0.4
+    async: "npm:^3.2.3"
+    chalk: "npm:^4.0.2"
+    filelist: "npm:^1.0.1"
+    minimatch: "npm:^3.0.4"
   bin:
     jake: ./bin/cli.js
-  checksum: 56c913ecf5a8d74325d0af9bc17a233bad50977438d44864d925bb6c45c946e0fee8c4c1f5fe2225471ef40df5222e943047982717ebff0d624770564d3c46ba
+  checksum: 10/6eaf1cd7fe78b92fa52d7258fb0f16f9bef856a18dc6e2f4da8e610264d293210d6e6e09a89d4e4ce1fc83d07c82963bd00bdcbb88e7a09aa62cc4cdf6e3bdf2
   languageName: node
   linkType: hard
 
@@ -19958,9 +21229,9 @@ __metadata:
   version: 2.5.2
   resolution: "jest-canvas-mock@npm:2.5.2"
   dependencies:
-    cssfontparser: ^1.2.1
-    moo-color: ^1.0.2
-  checksum: a3004d2e96473049045e49dcf98e5ea6011494048ab42b5422b3089d9ff406aaca8353e79587055d840fa145541668eb8f78613765f252ad5901a8217e91ea5d
+    cssfontparser: "npm:^1.2.1"
+    moo-color: "npm:^1.0.2"
+  checksum: 10/094e2e1c773c658fab7e91e9279027fc38a55060865b5b6a3c9acc47fc912fb9d3451ab4fdf544d016578f77b975626707c3a62e396575aa878f46d939c7ca5e
   languageName: node
   linkType: hard
 
@@ -19968,10 +21239,10 @@ __metadata:
   version: 29.7.0
   resolution: "jest-changed-files@npm:29.7.0"
   dependencies:
-    execa: ^5.0.0
-    jest-util: ^29.7.0
-    p-limit: ^3.1.0
-  checksum: 963e203893c396c5dfc75e00a49426688efea7361b0f0e040035809cecd2d46b3c01c02be2d9e8d38b1138357d2de7719ea5b5be21f66c10f2e9685a5a73bb99
+    execa: "npm:^5.0.0"
+    jest-util: "npm:^29.7.0"
+    p-limit: "npm:^3.1.0"
+  checksum: 10/3d93742e56b1a73a145d55b66e96711fbf87ef89b96c2fab7cfdfba8ec06612591a982111ca2b712bb853dbc16831ec8b43585a2a96b83862d6767de59cbf83d
   languageName: node
   linkType: hard
 
@@ -19979,45 +21250,45 @@ __metadata:
   version: 29.7.0
   resolution: "jest-circus@npm:29.7.0"
   dependencies:
-    "@jest/environment": ^29.7.0
-    "@jest/expect": ^29.7.0
-    "@jest/test-result": ^29.7.0
-    "@jest/types": ^29.6.3
-    "@types/node": "*"
-    chalk: ^4.0.0
-    co: ^4.6.0
-    dedent: ^1.0.0
-    is-generator-fn: ^2.0.0
-    jest-each: ^29.7.0
-    jest-matcher-utils: ^29.7.0
-    jest-message-util: ^29.7.0
-    jest-runtime: ^29.7.0
-    jest-snapshot: ^29.7.0
-    jest-util: ^29.7.0
-    p-limit: ^3.1.0
-    pretty-format: ^29.7.0
-    pure-rand: ^6.0.0
-    slash: ^3.0.0
-    stack-utils: ^2.0.3
-  checksum: 349437148924a5a109c9b8aad6d393a9591b4dac1918fc97d81b7fc515bc905af9918495055071404af1fab4e48e4b04ac3593477b1d5dcf48c4e71b527c70a7
-  languageName: node
-  linkType: hard
-
-"jest-cli@npm:^29.3.1, jest-cli@npm:^29.7.0":
+    "@jest/environment": "npm:^29.7.0"
+    "@jest/expect": "npm:^29.7.0"
+    "@jest/test-result": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    "@types/node": "npm:*"
+    chalk: "npm:^4.0.0"
+    co: "npm:^4.6.0"
+    dedent: "npm:^1.0.0"
+    is-generator-fn: "npm:^2.0.0"
+    jest-each: "npm:^29.7.0"
+    jest-matcher-utils: "npm:^29.7.0"
+    jest-message-util: "npm:^29.7.0"
+    jest-runtime: "npm:^29.7.0"
+    jest-snapshot: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+    p-limit: "npm:^3.1.0"
+    pretty-format: "npm:^29.7.0"
+    pure-rand: "npm:^6.0.0"
+    slash: "npm:^3.0.0"
+    stack-utils: "npm:^2.0.3"
+  checksum: 10/716a8e3f40572fd0213bcfc1da90274bf30d856e5133af58089a6ce45089b63f4d679bd44e6be9d320e8390483ebc3ae9921981993986d21639d9019b523123d
+  languageName: node
+  linkType: hard
+
+"jest-cli@npm:^29.7.0":
   version: 29.7.0
   resolution: "jest-cli@npm:29.7.0"
   dependencies:
-    "@jest/core": ^29.7.0
-    "@jest/test-result": ^29.7.0
-    "@jest/types": ^29.6.3
-    chalk: ^4.0.0
-    create-jest: ^29.7.0
-    exit: ^0.1.2
-    import-local: ^3.0.2
-    jest-config: ^29.7.0
-    jest-util: ^29.7.0
-    jest-validate: ^29.7.0
-    yargs: ^17.3.1
+    "@jest/core": "npm:^29.7.0"
+    "@jest/test-result": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    chalk: "npm:^4.0.0"
+    create-jest: "npm:^29.7.0"
+    exit: "npm:^0.1.2"
+    import-local: "npm:^3.0.2"
+    jest-config: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+    jest-validate: "npm:^29.7.0"
+    yargs: "npm:^17.3.1"
   peerDependencies:
     node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
   peerDependenciesMeta:
@@ -20025,7 +21296,7 @@ __metadata:
       optional: true
   bin:
     jest: bin/jest.js
-  checksum: 664901277a3f5007ea4870632ed6e7889db9da35b2434e7cb488443e6bf5513889b344b7fddf15112135495b9875892b156faeb2d7391ddb9e2a849dcb7b6c36
+  checksum: 10/6cc62b34d002c034203065a31e5e9a19e7c76d9e8ef447a6f70f759c0714cb212c6245f75e270ba458620f9c7b26063cd8cf6cd1f7e3afd659a7cc08add17307
   languageName: node
   linkType: hard
 
@@ -20033,28 +21304,28 @@ __metadata:
   version: 29.7.0
   resolution: "jest-config@npm:29.7.0"
   dependencies:
-    "@babel/core": ^7.11.6
-    "@jest/test-sequencer": ^29.7.0
-    "@jest/types": ^29.6.3
-    babel-jest: ^29.7.0
-    chalk: ^4.0.0
-    ci-info: ^3.2.0
-    deepmerge: ^4.2.2
-    glob: ^7.1.3
-    graceful-fs: ^4.2.9
-    jest-circus: ^29.7.0
-    jest-environment-node: ^29.7.0
-    jest-get-type: ^29.6.3
-    jest-regex-util: ^29.6.3
-    jest-resolve: ^29.7.0
-    jest-runner: ^29.7.0
-    jest-util: ^29.7.0
-    jest-validate: ^29.7.0
-    micromatch: ^4.0.4
-    parse-json: ^5.2.0
-    pretty-format: ^29.7.0
-    slash: ^3.0.0
-    strip-json-comments: ^3.1.1
+    "@babel/core": "npm:^7.11.6"
+    "@jest/test-sequencer": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    babel-jest: "npm:^29.7.0"
+    chalk: "npm:^4.0.0"
+    ci-info: "npm:^3.2.0"
+    deepmerge: "npm:^4.2.2"
+    glob: "npm:^7.1.3"
+    graceful-fs: "npm:^4.2.9"
+    jest-circus: "npm:^29.7.0"
+    jest-environment-node: "npm:^29.7.0"
+    jest-get-type: "npm:^29.6.3"
+    jest-regex-util: "npm:^29.6.3"
+    jest-resolve: "npm:^29.7.0"
+    jest-runner: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+    jest-validate: "npm:^29.7.0"
+    micromatch: "npm:^4.0.4"
+    parse-json: "npm:^5.2.0"
+    pretty-format: "npm:^29.7.0"
+    slash: "npm:^3.0.0"
+    strip-json-comments: "npm:^3.1.1"
   peerDependencies:
     "@types/node": "*"
     ts-node: ">=9.0.0"
@@ -20063,26 +21334,26 @@ __metadata:
       optional: true
     ts-node:
       optional: true
-  checksum: 4cabf8f894c180cac80b7df1038912a3fc88f96f2622de33832f4b3314f83e22b08fb751da570c0ab2b7988f21604bdabade95e3c0c041068ac578c085cf7dff
+  checksum: 10/6bdf570e9592e7d7dd5124fc0e21f5fe92bd15033513632431b211797e3ab57eaa312f83cc6481b3094b72324e369e876f163579d60016677c117ec4853cf02b
   languageName: node
   linkType: hard
 
-"jest-date-mock@npm:1.0.8":
-  version: 1.0.8
-  resolution: "jest-date-mock@npm:1.0.8"
-  checksum: 7b012870440b0df742d0b651435b91625dbbf02d916633a0c70c7deb5d5087f9aadc59847602312368826325909e70e95cd412896a0c9ee1d5ac382000bf5ef9
+"jest-date-mock@npm:1.0.9":
+  version: 1.0.9
+  resolution: "jest-date-mock@npm:1.0.9"
+  checksum: 10/9812a7a2500fd4ab129cc95cce24b202821ba790ca58b8982026ccf9a087dcbb7e776bf83ab6661c2b1767419211fd1b0c8d4c10f42af1a6762dcee455690017
   languageName: node
   linkType: hard
 
-"jest-diff@npm:^26.0.0":
-  version: 26.6.2
-  resolution: "jest-diff@npm:26.6.2"
+"jest-diff@npm:>=29.4.3 < 30, jest-diff@npm:^29.4.1, jest-diff@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-diff@npm:29.7.0"
   dependencies:
-    chalk: ^4.0.0
-    diff-sequences: ^26.6.2
-    jest-get-type: ^26.3.0
-    pretty-format: ^26.6.2
-  checksum: d00d297f31e1ac0252127089892432caa7a11c69bde29cf3bb6c7a839c8afdb95cf1fd401f9df16a4422745da2e6a5d94b428b30666a2540c38e1c5699915c2d
+    chalk: "npm:^4.0.0"
+    diff-sequences: "npm:^29.6.3"
+    jest-get-type: "npm:^29.6.3"
+    pretty-format: "npm:^29.7.0"
+  checksum: 10/6f3a7eb9cd9de5ea9e5aa94aed535631fa6f80221832952839b3cb59dd419b91c20b73887deb0b62230d06d02d6b6cf34ebb810b88d904bb4fe1e2e4f0905c98
   languageName: node
   linkType: hard
 
@@ -20090,23 +21361,11 @@ __metadata:
   version: 27.5.1
   resolution: "jest-diff@npm:27.5.1"
   dependencies:
-    chalk: ^4.0.0
-    diff-sequences: ^27.5.1
-    jest-get-type: ^27.5.1
-    pretty-format: ^27.5.1
-  checksum: 8be27c1e1ee57b2bb2bef9c0b233c19621b4c43d53a3c26e2c00a4e805eb4ea11fe1694a06a9fb0e80ffdcfdc0d2b1cb0b85920b3f5c892327ecd1e7bd96b865
-  languageName: node
-  linkType: hard
-
-"jest-diff@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-diff@npm:29.7.0"
-  dependencies:
-    chalk: ^4.0.0
-    diff-sequences: ^29.6.3
-    jest-get-type: ^29.6.3
-    pretty-format: ^29.7.0
-  checksum: 08e24a9dd43bfba1ef07a6374e5af138f53137b79ec3d5cc71a2303515335898888fa5409959172e1e05de966c9e714368d15e8994b0af7441f0721ee8e1bb77
+    chalk: "npm:^4.0.0"
+    diff-sequences: "npm:^27.5.1"
+    jest-get-type: "npm:^27.5.1"
+    pretty-format: "npm:^27.5.1"
+  checksum: 10/af454f30f33af625832bdb02614e188a41e33ce79086b43f95dbcc515274dd36bf8443b8d0299e22c2416e7591da4321e6bc7f2b0aef56471d1133c6b6833221
   languageName: node
   linkType: hard
 
@@ -20114,8 +21373,8 @@ __metadata:
   version: 29.7.0
   resolution: "jest-docblock@npm:29.7.0"
   dependencies:
-    detect-newline: ^3.0.0
-  checksum: 66390c3e9451f8d96c5da62f577a1dad701180cfa9b071c5025acab2f94d7a3efc2515cfa1654ebe707213241541ce9c5530232cdc8017c91ed64eea1bd3b192
+    detect-newline: "npm:^3.0.0"
+  checksum: 10/8d48818055bc96c9e4ec2e217a5a375623c0d0bfae8d22c26e011074940c202aa2534a3362294c81d981046885c05d304376afba9f2874143025981148f3e96d
   languageName: node
   linkType: hard
 
@@ -20123,33 +21382,12 @@ __metadata:
   version: 29.7.0
   resolution: "jest-each@npm:29.7.0"
   dependencies:
-    "@jest/types": ^29.6.3
-    chalk: ^4.0.0
-    jest-get-type: ^29.6.3
-    jest-util: ^29.7.0
-    pretty-format: ^29.7.0
-  checksum: e88f99f0184000fc8813f2a0aa79e29deeb63700a3b9b7928b8a418d7d93cd24933608591dbbdea732b473eb2021c72991b5cc51a17966842841c6e28e6f691c
-  languageName: node
-  linkType: hard
-
-"jest-environment-jsdom@npm:29.3.1":
-  version: 29.3.1
-  resolution: "jest-environment-jsdom@npm:29.3.1"
-  dependencies:
-    "@jest/environment": ^29.3.1
-    "@jest/fake-timers": ^29.3.1
-    "@jest/types": ^29.3.1
-    "@types/jsdom": ^20.0.0
-    "@types/node": "*"
-    jest-mock: ^29.3.1
-    jest-util: ^29.3.1
-    jsdom: ^20.0.0
-  peerDependencies:
-    canvas: ^2.5.0
-  peerDependenciesMeta:
-    canvas:
-      optional: true
-  checksum: 91b04ed02b2275c3a47740e20c2691f67c4295e17174c8ccd3a71fe77707239e487506bd157279b4257ce1be0a8c2be377817ee85689966a9e604bb6ef1199f0
+    "@jest/types": "npm:^29.6.3"
+    chalk: "npm:^4.0.0"
+    jest-get-type: "npm:^29.6.3"
+    jest-util: "npm:^29.7.0"
+    pretty-format: "npm:^29.7.0"
+  checksum: 10/bd1a077654bdaa013b590deb5f7e7ade68f2e3289180a8c8f53bc8a49f3b40740c0ec2d3a3c1aee906f682775be2bebbac37491d80b634d15276b0aa0f2e3fda
   languageName: node
   linkType: hard
 
@@ -20157,20 +21395,20 @@ __metadata:
   version: 29.7.0
   resolution: "jest-environment-jsdom@npm:29.7.0"
   dependencies:
-    "@jest/environment": ^29.7.0
-    "@jest/fake-timers": ^29.7.0
-    "@jest/types": ^29.6.3
-    "@types/jsdom": ^20.0.0
-    "@types/node": "*"
-    jest-mock: ^29.7.0
-    jest-util: ^29.7.0
-    jsdom: ^20.0.0
+    "@jest/environment": "npm:^29.7.0"
+    "@jest/fake-timers": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    "@types/jsdom": "npm:^20.0.0"
+    "@types/node": "npm:*"
+    jest-mock: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+    jsdom: "npm:^20.0.0"
   peerDependencies:
     canvas: ^2.5.0
   peerDependenciesMeta:
     canvas:
       optional: true
-  checksum: 559aac134c196fccc1dfc794d8fc87377e9f78e894bb13012b0831d88dec0abd7ece99abec69da564b8073803be4f04a9eb4f4d1bb80e29eec0cb252c254deb8
+  checksum: 10/23bbfc9bca914baef4b654f7983175a4d49b0f515a5094ebcb8f819f28ec186f53c0ba06af1855eac04bab1457f4ea79dae05f70052cf899863e8096daa6e0f5
   languageName: node
   linkType: hard
 
@@ -20178,43 +21416,34 @@ __metadata:
   version: 29.7.0
   resolution: "jest-environment-node@npm:29.7.0"
   dependencies:
-    "@jest/environment": ^29.7.0
-    "@jest/fake-timers": ^29.7.0
-    "@jest/types": ^29.6.3
-    "@types/node": "*"
-    jest-mock: ^29.7.0
-    jest-util: ^29.7.0
-  checksum: 501a9966292cbe0ca3f40057a37587cb6def25e1e0c5e39ac6c650fe78d3c70a2428304341d084ac0cced5041483acef41c477abac47e9a290d5545fd2f15646
-  languageName: node
-  linkType: hard
-
-"jest-fail-on-console@npm:3.1.1":
-  version: 3.1.1
-  resolution: "jest-fail-on-console@npm:3.1.1"
-  dependencies:
-    chalk: ^4.1.0
-  checksum: dbc244766fb78525b2d4a7e879678b91032acefa04694e17edb5917e325abf8ee356bdf728bc1c89058d67b9c8b3da4cd45515232eb9ab1b973a6b4f57bfb7af
+    "@jest/environment": "npm:^29.7.0"
+    "@jest/fake-timers": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    "@types/node": "npm:*"
+    jest-mock: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+  checksum: 10/9cf7045adf2307cc93aed2f8488942e39388bff47ec1df149a997c6f714bfc66b2056768973770d3f8b1bf47396c19aa564877eb10ec978b952c6018ed1bd637
   languageName: node
   linkType: hard
 
-"jest-get-type@npm:^26.3.0":
-  version: 26.3.0
-  resolution: "jest-get-type@npm:26.3.0"
-  checksum: 1cc6465ae4f5e880be22ba52fd270fa64c21994915f81b41f8f7553a7957dd8e077cc8d03035de9412e2d739f8bad6a032ebb5dab5805692a5fb9e20dd4ea666
+"jest-fail-on-console@npm:3.1.2":
+  version: 3.1.2
+  resolution: "jest-fail-on-console@npm:3.1.2"
+  checksum: 10/6f47a36cd9481121302660dbf29a6ce2443d0c2ad6ad872ee509fc538d674cdaa217f9bd041ce3771c1d8fda081ddcd85221027bbe6c9d2681cdae9d0922d329
   languageName: node
   linkType: hard
 
 "jest-get-type@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-get-type@npm:27.5.1"
-  checksum: 63064ab70195c21007d897c1157bf88ff94a790824a10f8c890392e7d17eda9c3900513cb291ca1c8d5722cad79169764e9a1279f7c8a9c4cd6e9109ff04bbc0
+  checksum: 10/63064ab70195c21007d897c1157bf88ff94a790824a10f8c890392e7d17eda9c3900513cb291ca1c8d5722cad79169764e9a1279f7c8a9c4cd6e9109ff04bbc0
   languageName: node
   linkType: hard
 
 "jest-get-type@npm:^29.6.3":
   version: 29.6.3
   resolution: "jest-get-type@npm:29.6.3"
-  checksum: 88ac9102d4679d768accae29f1e75f592b760b44277df288ad76ce5bf038c3f5ce3719dea8aa0f035dac30e9eb034b848ce716b9183ad7cc222d029f03e92205
+  checksum: 10/88ac9102d4679d768accae29f1e75f592b760b44277df288ad76ce5bf038c3f5ce3719dea8aa0f035dac30e9eb034b848ce716b9183ad7cc222d029f03e92205
   languageName: node
   linkType: hard
 
@@ -20222,22 +21451,22 @@ __metadata:
   version: 29.7.0
   resolution: "jest-haste-map@npm:29.7.0"
   dependencies:
-    "@jest/types": ^29.6.3
-    "@types/graceful-fs": ^4.1.3
-    "@types/node": "*"
-    anymatch: ^3.0.3
-    fb-watchman: ^2.0.0
-    fsevents: ^2.3.2
-    graceful-fs: ^4.2.9
-    jest-regex-util: ^29.6.3
-    jest-util: ^29.7.0
-    jest-worker: ^29.7.0
-    micromatch: ^4.0.4
-    walker: ^1.0.8
+    "@jest/types": "npm:^29.6.3"
+    "@types/graceful-fs": "npm:^4.1.3"
+    "@types/node": "npm:*"
+    anymatch: "npm:^3.0.3"
+    fb-watchman: "npm:^2.0.0"
+    fsevents: "npm:^2.3.2"
+    graceful-fs: "npm:^4.2.9"
+    jest-regex-util: "npm:^29.6.3"
+    jest-util: "npm:^29.7.0"
+    jest-worker: "npm:^29.7.0"
+    micromatch: "npm:^4.0.4"
+    walker: "npm:^1.0.8"
   dependenciesMeta:
     fsevents:
       optional: true
-  checksum: c2c8f2d3e792a963940fbdfa563ce14ef9e14d4d86da645b96d3cd346b8d35c5ce0b992ee08593939b5f718cf0a1f5a90011a056548a1dbf58397d4356786f01
+  checksum: 10/8531b42003581cb18a69a2774e68c456fb5a5c3280b1b9b77475af9e346b6a457250f9d756bfeeae2fe6cbc9ef28434c205edab9390ee970a919baddfa08bb85
   languageName: node
   linkType: hard
 
@@ -20245,11 +21474,11 @@ __metadata:
   version: 16.0.0
   resolution: "jest-junit@npm:16.0.0"
   dependencies:
-    mkdirp: ^1.0.4
-    strip-ansi: ^6.0.1
-    uuid: ^8.3.2
-    xml: ^1.0.1
-  checksum: 412aa4bfeec4254a9b34f417fda79107c7cbd295e56ffeb299ac9c977545910fbabe57c91c6cd1f12b700d4a1f60f79872b0075003f02da87d463e30fc2d9d78
+    mkdirp: "npm:^1.0.4"
+    strip-ansi: "npm:^6.0.1"
+    uuid: "npm:^8.3.2"
+    xml: "npm:^1.0.1"
+  checksum: 10/2c33ee8bfd0c83b9aa1f8ba5905084890d5f519d294ccc2829d778ac860d5adffffec75d930f44f1d498aa8370c783e0aa6a632d947fb7e81205f0e7b926669d
   languageName: node
   linkType: hard
 
@@ -20257,9 +21486,9 @@ __metadata:
   version: 29.7.0
   resolution: "jest-leak-detector@npm:29.7.0"
   dependencies:
-    jest-get-type: ^29.6.3
-    pretty-format: ^29.7.0
-  checksum: e3950e3ddd71e1d0c22924c51a300a1c2db6cf69ec1e51f95ccf424bcc070f78664813bef7aed4b16b96dfbdeea53fe358f8aeaaea84346ae15c3735758f1605
+    jest-get-type: "npm:^29.6.3"
+    pretty-format: "npm:^29.7.0"
+  checksum: 10/e3950e3ddd71e1d0c22924c51a300a1c2db6cf69ec1e51f95ccf424bcc070f78664813bef7aed4b16b96dfbdeea53fe358f8aeaaea84346ae15c3735758f1605
   languageName: node
   linkType: hard
 
@@ -20267,11 +21496,11 @@ __metadata:
   version: 29.7.0
   resolution: "jest-matcher-utils@npm:29.7.0"
   dependencies:
-    chalk: ^4.0.0
-    jest-diff: ^29.7.0
-    jest-get-type: ^29.6.3
-    pretty-format: ^29.7.0
-  checksum: d7259e5f995d915e8a37a8fd494cb7d6af24cd2a287b200f831717ba0d015190375f9f5dc35393b8ba2aae9b2ebd60984635269c7f8cff7d85b077543b7744cd
+    chalk: "npm:^4.0.0"
+    jest-diff: "npm:^29.7.0"
+    jest-get-type: "npm:^29.6.3"
+    pretty-format: "npm:^29.7.0"
+  checksum: 10/981904a494299cf1e3baed352f8a3bd8b50a8c13a662c509b6a53c31461f94ea3bfeffa9d5efcfeb248e384e318c87de7e3baa6af0f79674e987482aa189af40
   languageName: node
   linkType: hard
 
@@ -20279,27 +21508,27 @@ __metadata:
   version: 29.7.0
   resolution: "jest-message-util@npm:29.7.0"
   dependencies:
-    "@babel/code-frame": ^7.12.13
-    "@jest/types": ^29.6.3
-    "@types/stack-utils": ^2.0.0
-    chalk: ^4.0.0
-    graceful-fs: ^4.2.9
-    micromatch: ^4.0.4
-    pretty-format: ^29.7.0
-    slash: ^3.0.0
-    stack-utils: ^2.0.3
-  checksum: a9d025b1c6726a2ff17d54cc694de088b0489456c69106be6b615db7a51b7beb66788bea7a59991a019d924fbf20f67d085a445aedb9a4d6760363f4d7d09930
+    "@babel/code-frame": "npm:^7.12.13"
+    "@jest/types": "npm:^29.6.3"
+    "@types/stack-utils": "npm:^2.0.0"
+    chalk: "npm:^4.0.0"
+    graceful-fs: "npm:^4.2.9"
+    micromatch: "npm:^4.0.4"
+    pretty-format: "npm:^29.7.0"
+    slash: "npm:^3.0.0"
+    stack-utils: "npm:^2.0.3"
+  checksum: 10/31d53c6ed22095d86bab9d14c0fa70c4a92c749ea6ceece82cf30c22c9c0e26407acdfbdb0231435dc85a98d6d65ca0d9cbcd25cd1abb377fe945e843fb770b9
   languageName: node
   linkType: hard
 
-"jest-mock@npm:^29.3.1, jest-mock@npm:^29.7.0":
+"jest-mock@npm:^29.7.0":
   version: 29.7.0
   resolution: "jest-mock@npm:29.7.0"
   dependencies:
-    "@jest/types": ^29.6.3
-    "@types/node": "*"
-    jest-util: ^29.7.0
-  checksum: 81ba9b68689a60be1482212878973700347cb72833c5e5af09895882b9eb5c4e02843a1bbdf23f94c52d42708bab53a30c45a3482952c9eec173d1eaac5b86c5
+    "@jest/types": "npm:^29.6.3"
+    "@types/node": "npm:*"
+    jest-util: "npm:^29.7.0"
+  checksum: 10/ae51d1b4f898724be5e0e52b2268a68fcd876d9b20633c864a6dd6b1994cbc48d62402b0f40f3a1b669b30ebd648821f086c26c08ffde192ced951ff4670d51c
   languageName: node
   linkType: hard
 
@@ -20311,14 +21540,14 @@ __metadata:
   peerDependenciesMeta:
     jest-resolve:
       optional: true
-  checksum: bd85dcc0e76e0eb0c3d56382ec140f08d25ff4068cda9d0e360bb78fb176cb726d0beab82dc0e8694cafd09f55fee7622b8bcb240afa5fad301f4ed3eebb4f47
+  checksum: 10/bd85dcc0e76e0eb0c3d56382ec140f08d25ff4068cda9d0e360bb78fb176cb726d0beab82dc0e8694cafd09f55fee7622b8bcb240afa5fad301f4ed3eebb4f47
   languageName: node
   linkType: hard
 
-"jest-regex-util@npm:^29.6.3":
+"jest-regex-util@npm:^29.0.0, jest-regex-util@npm:^29.6.3":
   version: 29.6.3
   resolution: "jest-regex-util@npm:29.6.3"
-  checksum: 0518beeb9bf1228261695e54f0feaad3606df26a19764bc19541e0fc6e2a3737191904607fb72f3f2ce85d9c16b28df79b7b1ec9443aa08c3ef0e9efda6f8f2a
+  checksum: 10/0518beeb9bf1228261695e54f0feaad3606df26a19764bc19541e0fc6e2a3737191904607fb72f3f2ce85d9c16b28df79b7b1ec9443aa08c3ef0e9efda6f8f2a
   languageName: node
   linkType: hard
 
@@ -20326,9 +21555,9 @@ __metadata:
   version: 29.7.0
   resolution: "jest-resolve-dependencies@npm:29.7.0"
   dependencies:
-    jest-regex-util: ^29.6.3
-    jest-snapshot: ^29.7.0
-  checksum: aeb75d8150aaae60ca2bb345a0d198f23496494677cd6aefa26fc005faf354061f073982175daaf32b4b9d86b26ca928586344516e3e6969aa614cb13b883984
+    jest-regex-util: "npm:^29.6.3"
+    jest-snapshot: "npm:^29.7.0"
+  checksum: 10/1e206f94a660d81e977bcfb1baae6450cb4a81c92e06fad376cc5ea16b8e8c6ea78c383f39e95591a9eb7f925b6a1021086c38941aa7c1b8a6a813c2f6e93675
   languageName: node
   linkType: hard
 
@@ -20336,16 +21565,16 @@ __metadata:
   version: 29.7.0
   resolution: "jest-resolve@npm:29.7.0"
   dependencies:
-    chalk: ^4.0.0
-    graceful-fs: ^4.2.9
-    jest-haste-map: ^29.7.0
-    jest-pnp-resolver: ^1.2.2
-    jest-util: ^29.7.0
-    jest-validate: ^29.7.0
-    resolve: ^1.20.0
-    resolve.exports: ^2.0.0
-    slash: ^3.0.0
-  checksum: 0ca218e10731aa17920526ec39deaec59ab9b966237905ffc4545444481112cd422f01581230eceb7e82d86f44a543d520a71391ec66e1b4ef1a578bd5c73487
+    chalk: "npm:^4.0.0"
+    graceful-fs: "npm:^4.2.9"
+    jest-haste-map: "npm:^29.7.0"
+    jest-pnp-resolver: "npm:^1.2.2"
+    jest-util: "npm:^29.7.0"
+    jest-validate: "npm:^29.7.0"
+    resolve: "npm:^1.20.0"
+    resolve.exports: "npm:^2.0.0"
+    slash: "npm:^3.0.0"
+  checksum: 10/faa466fd9bc69ea6c37a545a7c6e808e073c66f46ab7d3d8a6ef084f8708f201b85d5fe1799789578b8b47fa1de47b9ee47b414d1863bc117a49e032ba77b7c7
   languageName: node
   linkType: hard
 
@@ -20353,28 +21582,28 @@ __metadata:
   version: 29.7.0
   resolution: "jest-runner@npm:29.7.0"
   dependencies:
-    "@jest/console": ^29.7.0
-    "@jest/environment": ^29.7.0
-    "@jest/test-result": ^29.7.0
-    "@jest/transform": ^29.7.0
-    "@jest/types": ^29.6.3
-    "@types/node": "*"
-    chalk: ^4.0.0
-    emittery: ^0.13.1
-    graceful-fs: ^4.2.9
-    jest-docblock: ^29.7.0
-    jest-environment-node: ^29.7.0
-    jest-haste-map: ^29.7.0
-    jest-leak-detector: ^29.7.0
-    jest-message-util: ^29.7.0
-    jest-resolve: ^29.7.0
-    jest-runtime: ^29.7.0
-    jest-util: ^29.7.0
-    jest-watcher: ^29.7.0
-    jest-worker: ^29.7.0
-    p-limit: ^3.1.0
-    source-map-support: 0.5.13
-  checksum: f0405778ea64812bf9b5c50b598850d94ccf95d7ba21f090c64827b41decd680ee19fcbb494007cdd7f5d0d8906bfc9eceddd8fa583e753e736ecd462d4682fb
+    "@jest/console": "npm:^29.7.0"
+    "@jest/environment": "npm:^29.7.0"
+    "@jest/test-result": "npm:^29.7.0"
+    "@jest/transform": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    "@types/node": "npm:*"
+    chalk: "npm:^4.0.0"
+    emittery: "npm:^0.13.1"
+    graceful-fs: "npm:^4.2.9"
+    jest-docblock: "npm:^29.7.0"
+    jest-environment-node: "npm:^29.7.0"
+    jest-haste-map: "npm:^29.7.0"
+    jest-leak-detector: "npm:^29.7.0"
+    jest-message-util: "npm:^29.7.0"
+    jest-resolve: "npm:^29.7.0"
+    jest-runtime: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+    jest-watcher: "npm:^29.7.0"
+    jest-worker: "npm:^29.7.0"
+    p-limit: "npm:^3.1.0"
+    source-map-support: "npm:0.5.13"
+  checksum: 10/9d8748a494bd90f5c82acea99be9e99f21358263ce6feae44d3f1b0cd90991b5df5d18d607e73c07be95861ee86d1cbab2a3fc6ca4b21805f07ac29d47c1da1e
   languageName: node
   linkType: hard
 
@@ -20382,29 +21611,29 @@ __metadata:
   version: 29.7.0
   resolution: "jest-runtime@npm:29.7.0"
   dependencies:
-    "@jest/environment": ^29.7.0
-    "@jest/fake-timers": ^29.7.0
-    "@jest/globals": ^29.7.0
-    "@jest/source-map": ^29.6.3
-    "@jest/test-result": ^29.7.0
-    "@jest/transform": ^29.7.0
-    "@jest/types": ^29.6.3
-    "@types/node": "*"
-    chalk: ^4.0.0
-    cjs-module-lexer: ^1.0.0
-    collect-v8-coverage: ^1.0.0
-    glob: ^7.1.3
-    graceful-fs: ^4.2.9
-    jest-haste-map: ^29.7.0
-    jest-message-util: ^29.7.0
-    jest-mock: ^29.7.0
-    jest-regex-util: ^29.6.3
-    jest-resolve: ^29.7.0
-    jest-snapshot: ^29.7.0
-    jest-util: ^29.7.0
-    slash: ^3.0.0
-    strip-bom: ^4.0.0
-  checksum: d19f113d013e80691e07047f68e1e3448ef024ff2c6b586ce4f90cd7d4c62a2cd1d460110491019719f3c59bfebe16f0e201ed005ef9f80e2cf798c374eed54e
+    "@jest/environment": "npm:^29.7.0"
+    "@jest/fake-timers": "npm:^29.7.0"
+    "@jest/globals": "npm:^29.7.0"
+    "@jest/source-map": "npm:^29.6.3"
+    "@jest/test-result": "npm:^29.7.0"
+    "@jest/transform": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    "@types/node": "npm:*"
+    chalk: "npm:^4.0.0"
+    cjs-module-lexer: "npm:^1.0.0"
+    collect-v8-coverage: "npm:^1.0.0"
+    glob: "npm:^7.1.3"
+    graceful-fs: "npm:^4.2.9"
+    jest-haste-map: "npm:^29.7.0"
+    jest-message-util: "npm:^29.7.0"
+    jest-mock: "npm:^29.7.0"
+    jest-regex-util: "npm:^29.6.3"
+    jest-resolve: "npm:^29.7.0"
+    jest-snapshot: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+    slash: "npm:^3.0.0"
+    strip-bom: "npm:^4.0.0"
+  checksum: 10/59eb58eb7e150e0834a2d0c0d94f2a0b963ae7182cfa6c63f2b49b9c6ef794e5193ef1634e01db41420c36a94cefc512cdd67a055cd3e6fa2f41eaf0f82f5a20
   languageName: node
   linkType: hard
 
@@ -20412,41 +21641,41 @@ __metadata:
   version: 29.7.0
   resolution: "jest-snapshot@npm:29.7.0"
   dependencies:
-    "@babel/core": ^7.11.6
-    "@babel/generator": ^7.7.2
-    "@babel/plugin-syntax-jsx": ^7.7.2
-    "@babel/plugin-syntax-typescript": ^7.7.2
-    "@babel/types": ^7.3.3
-    "@jest/expect-utils": ^29.7.0
-    "@jest/transform": ^29.7.0
-    "@jest/types": ^29.6.3
-    babel-preset-current-node-syntax: ^1.0.0
-    chalk: ^4.0.0
-    expect: ^29.7.0
-    graceful-fs: ^4.2.9
-    jest-diff: ^29.7.0
-    jest-get-type: ^29.6.3
-    jest-matcher-utils: ^29.7.0
-    jest-message-util: ^29.7.0
-    jest-util: ^29.7.0
-    natural-compare: ^1.4.0
-    pretty-format: ^29.7.0
-    semver: ^7.5.3
-  checksum: 86821c3ad0b6899521ce75ee1ae7b01b17e6dfeff9166f2cf17f012e0c5d8c798f30f9e4f8f7f5bed01ea7b55a6bc159f5eda778311162cbfa48785447c237ad
-  languageName: node
-  linkType: hard
-
-"jest-util@npm:^29.0.0, jest-util@npm:^29.3.1, jest-util@npm:^29.7.0":
+    "@babel/core": "npm:^7.11.6"
+    "@babel/generator": "npm:^7.7.2"
+    "@babel/plugin-syntax-jsx": "npm:^7.7.2"
+    "@babel/plugin-syntax-typescript": "npm:^7.7.2"
+    "@babel/types": "npm:^7.3.3"
+    "@jest/expect-utils": "npm:^29.7.0"
+    "@jest/transform": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    babel-preset-current-node-syntax: "npm:^1.0.0"
+    chalk: "npm:^4.0.0"
+    expect: "npm:^29.7.0"
+    graceful-fs: "npm:^4.2.9"
+    jest-diff: "npm:^29.7.0"
+    jest-get-type: "npm:^29.6.3"
+    jest-matcher-utils: "npm:^29.7.0"
+    jest-message-util: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+    natural-compare: "npm:^1.4.0"
+    pretty-format: "npm:^29.7.0"
+    semver: "npm:^7.5.3"
+  checksum: 10/cb19a3948256de5f922d52f251821f99657339969bf86843bd26cf3332eae94883e8260e3d2fba46129a27c3971c1aa522490e460e16c7fad516e82d10bbf9f8
+  languageName: node
+  linkType: hard
+
+"jest-util@npm:^29.0.0, jest-util@npm:^29.7.0":
   version: 29.7.0
   resolution: "jest-util@npm:29.7.0"
   dependencies:
-    "@jest/types": ^29.6.3
-    "@types/node": "*"
-    chalk: ^4.0.0
-    ci-info: ^3.2.0
-    graceful-fs: ^4.2.9
-    picomatch: ^2.2.3
-  checksum: 042ab4980f4ccd4d50226e01e5c7376a8556b472442ca6091a8f102488c0f22e6e8b89ea874111d2328a2080083bf3225c86f3788c52af0bd0345a00eb57a3ca
+    "@jest/types": "npm:^29.6.3"
+    "@types/node": "npm:*"
+    chalk: "npm:^4.0.0"
+    ci-info: "npm:^3.2.0"
+    graceful-fs: "npm:^4.2.9"
+    picomatch: "npm:^2.2.3"
+  checksum: 10/30d58af6967e7d42bd903ccc098f3b4d3859ed46238fbc88d4add6a3f10bea00c226b93660285f058bc7a65f6f9529cf4eb80f8d4707f79f9e3a23686b4ab8f3
   languageName: node
   linkType: hard
 
@@ -20454,40 +21683,46 @@ __metadata:
   version: 29.7.0
   resolution: "jest-validate@npm:29.7.0"
   dependencies:
-    "@jest/types": ^29.6.3
-    camelcase: ^6.2.0
-    chalk: ^4.0.0
-    jest-get-type: ^29.6.3
-    leven: ^3.1.0
-    pretty-format: ^29.7.0
-  checksum: 191fcdc980f8a0de4dbdd879fa276435d00eb157a48683af7b3b1b98b0f7d9de7ffe12689b617779097ff1ed77601b9f7126b0871bba4f776e222c40f62e9dae
+    "@jest/types": "npm:^29.6.3"
+    camelcase: "npm:^6.2.0"
+    chalk: "npm:^4.0.0"
+    jest-get-type: "npm:^29.6.3"
+    leven: "npm:^3.1.0"
+    pretty-format: "npm:^29.7.0"
+  checksum: 10/8ee1163666d8eaa16d90a989edba2b4a3c8ab0ffaa95ad91b08ca42b015bfb70e164b247a5b17f9de32d096987cada63ed8491ab82761bfb9a28bc34b27ae161
   languageName: node
   linkType: hard
 
-"jest-watcher@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-watcher@npm:29.7.0"
+"jest-watch-typeahead@npm:^2.2.2":
+  version: 2.2.2
+  resolution: "jest-watch-typeahead@npm:2.2.2"
   dependencies:
-    "@jest/test-result": ^29.7.0
-    "@jest/types": ^29.6.3
-    "@types/node": "*"
-    ansi-escapes: ^4.2.1
-    chalk: ^4.0.0
-    emittery: ^0.13.1
-    jest-util: ^29.7.0
-    string-length: ^4.0.1
-  checksum: 67e6e7fe695416deff96b93a14a561a6db69389a0667e9489f24485bb85e5b54e12f3b2ba511ec0b777eca1e727235b073e3ebcdd473d68888650489f88df92f
+    ansi-escapes: "npm:^6.0.0"
+    chalk: "npm:^5.2.0"
+    jest-regex-util: "npm:^29.0.0"
+    jest-watcher: "npm:^29.0.0"
+    slash: "npm:^5.0.0"
+    string-length: "npm:^5.0.1"
+    strip-ansi: "npm:^7.0.1"
+  peerDependencies:
+    jest: ^27.0.0 || ^28.0.0 || ^29.0.0
+  checksum: 10/8685277ce1b96ec775882111ec55ce90a862cc57acb21ce94f8ac44a25f6fb34c7a7ce119e07b2d8ff5353a8d9e4f981cf96fa35532f71ddba6ca8fedc05bd8e
   languageName: node
   linkType: hard
 
-"jest-worker@npm:^26.2.1":
-  version: 26.6.2
-  resolution: "jest-worker@npm:26.6.2"
+"jest-watcher@npm:^29.0.0, jest-watcher@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-watcher@npm:29.7.0"
   dependencies:
-    "@types/node": "*"
-    merge-stream: ^2.0.0
-    supports-color: ^7.0.0
-  checksum: f9afa3b88e3f12027901e4964ba3ff048285b5783b5225cab28fac25b4058cea8ad54001e9a1577ee2bed125fac3ccf5c80dc507b120300cc1bbcb368796533e
+    "@jest/test-result": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    "@types/node": "npm:*"
+    ansi-escapes: "npm:^4.2.1"
+    chalk: "npm:^4.0.0"
+    emittery: "npm:^0.13.1"
+    jest-util: "npm:^29.7.0"
+    string-length: "npm:^4.0.1"
+  checksum: 10/4f616e0345676631a7034b1d94971aaa719f0cd4a6041be2aa299be437ea047afd4fe05c48873b7963f5687a2f6c7cbf51244be8b14e313b97bfe32b1e127e55
   languageName: node
   linkType: hard
 
@@ -20495,41 +21730,22 @@ __metadata:
   version: 27.5.0
   resolution: "jest-worker@npm:27.5.0"
   dependencies:
-    "@types/node": "*"
-    merge-stream: ^2.0.0
-    supports-color: ^8.0.0
-  checksum: bfd41bef36d3c217819278d8e53b7b9e02c32d90f54149ab4ec87595e389f5caca84237cc4c84050c93a435d458150876ce1812d68cd50a5a4cbb7d80286212f
+    "@types/node": "npm:*"
+    merge-stream: "npm:^2.0.0"
+    supports-color: "npm:^8.0.0"
+  checksum: 10/9f36e929b1f1b13c93d76263b031e636df6005a11d0a54957b0f5197ad4101f3184b951b609fc4f75a5a70d9ff38e1d1ac1e31507154bc47b122f69d2c230cc1
   languageName: node
   linkType: hard
 
-"jest-worker@npm:^29.4.1, jest-worker@npm:^29.4.3, jest-worker@npm:^29.5.0, jest-worker@npm:^29.7.0":
+"jest-worker@npm:^29.7.0":
   version: 29.7.0
   resolution: "jest-worker@npm:29.7.0"
   dependencies:
-    "@types/node": "*"
-    jest-util: ^29.7.0
-    merge-stream: ^2.0.0
-    supports-color: ^8.0.0
-  checksum: 30fff60af49675273644d408b650fc2eb4b5dcafc5a0a455f238322a8f9d8a98d847baca9d51ff197b6747f54c7901daa2287799230b856a0f48287d131f8c13
-  languageName: node
-  linkType: hard
-
-"jest@npm:29.3.1":
-  version: 29.3.1
-  resolution: "jest@npm:29.3.1"
-  dependencies:
-    "@jest/core": ^29.3.1
-    "@jest/types": ^29.3.1
-    import-local: ^3.0.2
-    jest-cli: ^29.3.1
-  peerDependencies:
-    node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-  peerDependenciesMeta:
-    node-notifier:
-      optional: true
-  bin:
-    jest: bin/jest.js
-  checksum: 613f4ec657b14dd84c0056b2fef1468502927fd551bef0b19d4a91576a609678fb316c6a5b5fc6120dd30dd4ff4569070ffef3cb507db9bb0260b28ddaa18d7a
+    "@types/node": "npm:*"
+    jest-util: "npm:^29.7.0"
+    merge-stream: "npm:^2.0.0"
+    supports-color: "npm:^8.0.0"
+  checksum: 10/364cbaef00d8a2729fc760227ad34b5e60829e0869bd84976bdfbd8c0d0f9c2f22677b3e6dd8afa76ed174765351cd12bae3d4530c62eefb3791055127ca9745
   languageName: node
   linkType: hard
 
@@ -20537,10 +21753,10 @@ __metadata:
   version: 29.7.0
   resolution: "jest@npm:29.7.0"
   dependencies:
-    "@jest/core": ^29.7.0
-    "@jest/types": ^29.6.3
-    import-local: ^3.0.2
-    jest-cli: ^29.7.0
+    "@jest/core": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    import-local: "npm:^3.0.2"
+    jest-cli: "npm:^29.7.0"
   peerDependencies:
     node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
   peerDependenciesMeta:
@@ -20548,64 +21764,51 @@ __metadata:
       optional: true
   bin:
     jest: bin/jest.js
-  checksum: 17ca8d67504a7dbb1998cf3c3077ec9031ba3eb512da8d71cb91bcabb2b8995c4e4b292b740cb9bf1cbff5ce3e110b3f7c777b0cefb6f41ab05445f248d0ee0b
+  checksum: 10/97023d78446098c586faaa467fbf2c6b07ff06e2c85a19e3926adb5b0effe9ac60c4913ae03e2719f9c01ae8ffd8d92f6b262cedb9555ceeb5d19263d8c6362a
   languageName: node
   linkType: hard
 
-"jiti@npm:^1.18.2":
-  version: 1.19.1
-  resolution: "jiti@npm:1.19.1"
+"jiti@npm:^1.20.0":
+  version: 1.21.0
+  resolution: "jiti@npm:1.21.0"
   bin:
     jiti: bin/jiti.js
-  checksum: fdf55e315f9e81c04ae902416642062851d92c6cdcc17a59d5d1d35e1a0842e4e79be38da86613c5776fa18c579954542a441b93d1c347a50137dee2e558cbd0
+  checksum: 10/005a0239e50381b5c9919f59dbab86128367bd64872f3376dbbde54b6523f41bd134bf22909e2a509e38fd87e1c22125ca255b9b6b53e7df0fedd23f737334cc
   languageName: node
   linkType: hard
 
-"joi@npm:^17.7.0":
-  version: 17.8.3
-  resolution: "joi@npm:17.8.3"
-  dependencies:
-    "@hapi/hoek": ^9.0.0
-    "@hapi/topo": ^5.0.0
-    "@sideway/address": ^4.1.3
-    "@sideway/formula": ^3.0.1
-    "@sideway/pinpoint": ^2.0.0
-  checksum: d93ea768740fc447d19a3340734af8062a53616bfe61d117992632f5064c0abe7ca495a29747317a4f6cd655839507a0e3c9daa90f4f14a7e57a5ad653c43714
+"jju@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "jju@npm:1.4.0"
+  checksum: 10/1067ff8ce02221faac5a842116ed0ec79a53312a111d0bf8342a80bd02c0a3fdf0b8449694a65947db0a3e8420e8b326dffb489c7dd5866efc380c0d1708a707
   languageName: node
   linkType: hard
 
 "joycon@npm:^3.1.1":
   version: 3.1.1
   resolution: "joycon@npm:3.1.1"
-  checksum: 8003c9c3fc79c5c7602b1c7e9f7a2df2e9916f046b0dbad862aa589be78c15734d11beb9fe846f5e06138df22cb2ad29961b6a986ba81c4920ce2b15a7f11067
+  checksum: 10/4b36e3479144ec196425f46b3618f8a96ce7e1b658f091a309cd4906215f5b7a402d7df331a3e0a09681381a658d0c5f039cb3cf6907e0a1e17ed847f5d37775
   languageName: node
   linkType: hard
 
-"jquery@npm:3.7.0":
-  version: 3.7.0
-  resolution: "jquery@npm:3.7.0"
-  checksum: 907785e133afc427650a131af5fccef66a404885037513b3d4d7d63aee6409bcc32a39836868c60e59b05aa0fb8ace8961c18b2ee3ffdf6ffdb571d6d7cd88ff
+"jquery@npm:3.7.1":
+  version: 3.7.1
+  resolution: "jquery@npm:3.7.1"
+  checksum: 10/17be9929f5fa37697d9848284f0d108c543318ef79ec794e130cd0c49f6c050d60c803a69e8cfa16fa19f5ff7cdb814a6905cceab0831186560c65ed113cd579
   languageName: node
   linkType: hard
 
 "js-cookie@npm:^2.2.1":
   version: 2.2.1
   resolution: "js-cookie@npm:2.2.1"
-  checksum: 9b1fb980a1c5e624fd4b28ea4867bb30c71e04c4484bb3a42766344c533faa684de9498e443425479ec68609e96e27b60614bfe354877c449c631529b6d932f2
-  languageName: node
-  linkType: hard
-
-"js-levenshtein@npm:^1.1.6":
-  version: 1.1.6
-  resolution: "js-levenshtein@npm:1.1.6"
-  checksum: 409f052a7f1141be4058d97da7860e08efd97fc588b7a4c5cfa0548bc04f6d576644dae65ab630266dff685d56fb90d494e03d4d79cb484c287746b4f1bf0694
+  checksum: 10/4387f5f5691cb96ca9ff8852c589d3012b53f484fda68630a39e20cabc6c5b740f09225e23233ba56cd9de6ebe300a23d20b2c7315f10c309ad5a89fd8c4990b
   languageName: node
   linkType: hard
 
 "js-tokens@npm:^3.0.0 || ^4.0.0, js-tokens@npm:^4.0.0":
   version: 4.0.0
   resolution: "js-tokens@npm:4.0.0"
-  checksum: 8a95213a5a77deb6cbe94d86340e8d9ace2b93bc367790b260101d2f36a2eaf4e4e22d9fa9cf459b38af3a32fb4190e638024cf82ec95ef708680e405ea7cc78
+  checksum: 10/af37d0d913fb56aec6dc0074c163cc71cd23c0b8aad5c2350747b6721d37ba118af35abdd8b33c47ec2800de07dedb16a527ca9c530ee004093e04958bd0cbf2
   languageName: node
   linkType: hard
 
@@ -20613,29 +21816,36 @@ __metadata:
   version: 4.1.0
   resolution: "js-yaml@npm:4.1.0"
   dependencies:
-    argparse: ^2.0.1
+    argparse: "npm:^2.0.1"
   bin:
     js-yaml: bin/js-yaml.js
-  checksum: c7830dfd456c3ef2c6e355cc5a92e6700ceafa1d14bba54497b34a99f0376cecbb3e9ac14d3e5849b426d5a5140709a66237a8c991c675431271c4ce5504151a
+  checksum: 10/c138a34a3fd0d08ebaf71273ad4465569a483b8a639e0b118ff65698d257c2791d3199e3f303631f2cb98213fa7b5f5d6a4621fd0fff819421b990d30d967140
   languageName: node
   linkType: hard
 
-"js-yaml@npm:^3.10.0, js-yaml@npm:^3.13.1":
+"js-yaml@npm:^3.10.0, js-yaml@npm:^3.13.1, js-yaml@npm:^3.6.1":
   version: 3.14.1
   resolution: "js-yaml@npm:3.14.1"
   dependencies:
-    argparse: ^1.0.7
-    esprima: ^4.0.0
+    argparse: "npm:^1.0.7"
+    esprima: "npm:^4.0.0"
   bin:
     js-yaml: bin/js-yaml.js
-  checksum: bef146085f472d44dee30ec34e5cf36bf89164f5d585435a3d3da89e52622dff0b188a580e4ad091c3341889e14cb88cac6e4deb16dc5b1e9623bb0601fc255c
+  checksum: 10/9e22d80b4d0105b9899135365f746d47466ed53ef4223c529b3c0f7a39907743fdbd3c4379f94f1106f02755b5e90b2faaf84801a891135544e1ea475d1a1379
+  languageName: node
+  linkType: hard
+
+"jsbn@npm:1.1.0":
+  version: 1.1.0
+  resolution: "jsbn@npm:1.1.0"
+  checksum: 10/bebe7ae829bbd586ce8cbe83501dd8cb8c282c8902a8aeeed0a073a89dc37e8103b1244f3c6acd60278bcbfe12d93a3f83c9ac396868a3b3bbc3c5e5e3b648ef
   languageName: node
   linkType: hard
 
 "jsbn@npm:~0.1.0":
   version: 0.1.1
   resolution: "jsbn@npm:0.1.1"
-  checksum: e5ff29c1b8d965017ef3f9c219dacd6e40ad355c664e277d31246c90545a02e6047018c16c60a00f36d561b3647215c41894f5d869ada6908a2e0ce4200c88f2
+  checksum: 10/5450133242845100e694f0ef9175f44c012691a9b770b2571e677314e6f70600abb10777cdfc9a0c6a9f2ac6d134577403633de73e2fcd0f97875a67744e2d14
   languageName: node
   linkType: hard
 
@@ -20643,37 +21853,37 @@ __metadata:
   version: 0.14.0
   resolution: "jscodeshift@npm:0.14.0"
   dependencies:
-    "@babel/core": ^7.13.16
-    "@babel/parser": ^7.13.16
-    "@babel/plugin-proposal-class-properties": ^7.13.0
-    "@babel/plugin-proposal-nullish-coalescing-operator": ^7.13.8
-    "@babel/plugin-proposal-optional-chaining": ^7.13.12
-    "@babel/plugin-transform-modules-commonjs": ^7.13.8
-    "@babel/preset-flow": ^7.13.13
-    "@babel/preset-typescript": ^7.13.0
-    "@babel/register": ^7.13.16
-    babel-core: ^7.0.0-bridge.0
-    chalk: ^4.1.2
-    flow-parser: 0.*
-    graceful-fs: ^4.2.4
-    micromatch: ^4.0.4
-    neo-async: ^2.5.0
-    node-dir: ^0.1.17
-    recast: ^0.21.0
-    temp: ^0.8.4
-    write-file-atomic: ^2.3.0
+    "@babel/core": "npm:^7.13.16"
+    "@babel/parser": "npm:^7.13.16"
+    "@babel/plugin-proposal-class-properties": "npm:^7.13.0"
+    "@babel/plugin-proposal-nullish-coalescing-operator": "npm:^7.13.8"
+    "@babel/plugin-proposal-optional-chaining": "npm:^7.13.12"
+    "@babel/plugin-transform-modules-commonjs": "npm:^7.13.8"
+    "@babel/preset-flow": "npm:^7.13.13"
+    "@babel/preset-typescript": "npm:^7.13.0"
+    "@babel/register": "npm:^7.13.16"
+    babel-core: "npm:^7.0.0-bridge.0"
+    chalk: "npm:^4.1.2"
+    flow-parser: "npm:0.*"
+    graceful-fs: "npm:^4.2.4"
+    micromatch: "npm:^4.0.4"
+    neo-async: "npm:^2.5.0"
+    node-dir: "npm:^0.1.17"
+    recast: "npm:^0.21.0"
+    temp: "npm:^0.8.4"
+    write-file-atomic: "npm:^2.3.0"
   peerDependencies:
     "@babel/preset-env": ^7.1.6
   bin:
     jscodeshift: bin/jscodeshift.js
-  checksum: 54ea6d639455883336f80b38a70648821c88b7942315dc0fbab01bc34a9ad0f0f78e3bd69304b5ab167e4262d6ed7e6284c6d32525ab01c89d9118df89b3e2a0
+  checksum: 10/fc355dde2287c026a682e8b38df5d8d1ff5c9ca044dfd558f2b6d17bb28f9257063bd0e47690814612e572804caa5383733c9d8ca8bc18e70bcee43e0458df59
   languageName: node
   linkType: hard
 
 "jsdoc-type-pratt-parser@npm:~4.0.0":
   version: 4.0.0
   resolution: "jsdoc-type-pratt-parser@npm:4.0.0"
-  checksum: af0629c9517e484be778d8564440fec8de5b7610e0c9c88a3ba4554321364faf72b46689c8d8845faa12c0718437a9ed97e231977efc0f2d50e8a2dbad807eb3
+  checksum: 10/a225ab874e56612730dd6c0466ce9f09e8a0e7d85896e9e5f0fa53cfb2e897128a7ec702fd99ed3854b3fbf5a89ad6dce72ca4f4f6149da69f130c2874f06b75
   languageName: node
   linkType: hard
 
@@ -20681,38 +21891,38 @@ __metadata:
   version: 20.0.2
   resolution: "jsdom@npm:20.0.2"
   dependencies:
-    abab: ^2.0.6
-    acorn: ^8.8.0
-    acorn-globals: ^7.0.0
-    cssom: ^0.5.0
-    cssstyle: ^2.3.0
-    data-urls: ^3.0.2
-    decimal.js: ^10.4.1
-    domexception: ^4.0.0
-    escodegen: ^2.0.0
-    form-data: ^4.0.0
-    html-encoding-sniffer: ^3.0.0
-    http-proxy-agent: ^5.0.0
-    https-proxy-agent: ^5.0.1
-    is-potential-custom-element-name: ^1.0.1
-    nwsapi: ^2.2.2
-    parse5: ^7.1.1
-    saxes: ^6.0.0
-    symbol-tree: ^3.2.4
-    tough-cookie: ^4.1.2
-    w3c-xmlserializer: ^3.0.0
-    webidl-conversions: ^7.0.0
-    whatwg-encoding: ^2.0.0
-    whatwg-mimetype: ^3.0.0
-    whatwg-url: ^11.0.0
-    ws: ^8.9.0
-    xml-name-validator: ^4.0.0
+    abab: "npm:^2.0.6"
+    acorn: "npm:^8.8.0"
+    acorn-globals: "npm:^7.0.0"
+    cssom: "npm:^0.5.0"
+    cssstyle: "npm:^2.3.0"
+    data-urls: "npm:^3.0.2"
+    decimal.js: "npm:^10.4.1"
+    domexception: "npm:^4.0.0"
+    escodegen: "npm:^2.0.0"
+    form-data: "npm:^4.0.0"
+    html-encoding-sniffer: "npm:^3.0.0"
+    http-proxy-agent: "npm:^5.0.0"
+    https-proxy-agent: "npm:^5.0.1"
+    is-potential-custom-element-name: "npm:^1.0.1"
+    nwsapi: "npm:^2.2.2"
+    parse5: "npm:^7.1.1"
+    saxes: "npm:^6.0.0"
+    symbol-tree: "npm:^3.2.4"
+    tough-cookie: "npm:^4.1.2"
+    w3c-xmlserializer: "npm:^3.0.0"
+    webidl-conversions: "npm:^7.0.0"
+    whatwg-encoding: "npm:^2.0.0"
+    whatwg-mimetype: "npm:^3.0.0"
+    whatwg-url: "npm:^11.0.0"
+    ws: "npm:^8.9.0"
+    xml-name-validator: "npm:^4.0.0"
   peerDependencies:
     canvas: ^2.5.0
   peerDependenciesMeta:
     canvas:
       optional: true
-  checksum: 1912e73ecbc7cb1e458b63c4976a1f1dd40c1cdb9f91559cfeccb08c68ad1b9918c6260bd021559ecb1a7c233fae0d0c3fdcbd2ce82df597ef9373d67c8934c0
+  checksum: 10/3bd8d4ee84a1b8ba4882aee9ec15b4b72576b9e4be43462a3301a10fad020a7ee1a59cfe5e270ae49311c162920f65ebac766a105e1dfe09b5533a671b5e2336
   languageName: node
   linkType: hard
 
@@ -20721,7 +21931,7 @@ __metadata:
   resolution: "jsesc@npm:0.5.0"
   bin:
     jsesc: bin/jsesc
-  checksum: b8b44cbfc92f198ad972fba706ee6a1dfa7485321ee8c0b25f5cedd538dcb20cde3197de16a7265430fce8277a12db066219369e3d51055038946039f6e20e17
+  checksum: 10/fab949f585c71e169c5cbe00f049f20de74f067081bbd64a55443bad1c71e1b5a5b448f2359bf2fe06f5ed7c07e2e4a9101843b01c823c30b6afc11f5bfaf724
   languageName: node
   linkType: hard
 
@@ -20730,98 +21940,98 @@ __metadata:
   resolution: "jsesc@npm:2.5.2"
   bin:
     jsesc: bin/jsesc
-  checksum: 4dc190771129e12023f729ce20e1e0bfceac84d73a85bc3119f7f938843fe25a4aeccb54b6494dce26fcf263d815f5f31acdefac7cc9329efb8422a4f4d9fa9d
+  checksum: 10/d2096abdcdec56969764b40ffc91d4a23408aa2f351b4d1c13f736f25476643238c43fdbaf38a191c26b1b78fd856d965f5d4d0dde7b89459cd94025190cdf13
   languageName: node
   linkType: hard
 
 "json-buffer@npm:3.0.1":
   version: 3.0.1
   resolution: "json-buffer@npm:3.0.1"
-  checksum: 9026b03edc2847eefa2e37646c579300a1f3a4586cfb62bf857832b60c852042d0d6ae55d1afb8926163fa54c2b01d83ae24705f34990348bdac6273a29d4581
+  checksum: 10/82876154521b7b68ba71c4f969b91572d1beabadd87bd3a6b236f85fbc7dc4695089191ed60bb59f9340993c51b33d479f45b6ba9f3548beb519705281c32c3c
   languageName: node
   linkType: hard
 
 "json-logic-js@npm:^2.0.2":
   version: 2.0.2
   resolution: "json-logic-js@npm:2.0.2"
-  checksum: 34846500b76a25a86de65560afe358e844b384f0f61c1832fed6a9dfc8f45d884be0b0c8ab033d1a2df7c92b33910d8cee1b3d28e0f461cc55c715d2761219ef
+  checksum: 10/2a25d0b951b90bfbccf4f638fbf17cc733518d54c029d7e38e71544d1f4c53efc7c445e888a6c804374e177b384d77b59762cb02bcf6d85b102598a9d8443345
   languageName: node
   linkType: hard
 
 "json-markup@npm:^1.1.0":
   version: 1.1.4
   resolution: "json-markup@npm:1.1.4"
-  checksum: e61ce3b07fbda3cade56baf19482c56dd8b64ba9a24a4057761c28d8a2c332ec710b2f7e8db2a0adda148e0b72196e7d85f22dd33b4abc87a227e194a6caab66
+  checksum: 10/e61ce3b07fbda3cade56baf19482c56dd8b64ba9a24a4057761c28d8a2c332ec710b2f7e8db2a0adda148e0b72196e7d85f22dd33b4abc87a227e194a6caab66
   languageName: node
   linkType: hard
 
 "json-parse-better-errors@npm:^1.0.1":
   version: 1.0.2
   resolution: "json-parse-better-errors@npm:1.0.2"
-  checksum: ff2b5ba2a70e88fd97a3cb28c1840144c5ce8fae9cbeeddba15afa333a5c407cf0e42300cd0a2885dbb055227fe68d405070faad941beeffbfde9cf3b2c78c5d
+  checksum: 10/5553232045359b767b0f2039a6777fede1a8d7dca1a0ffb1f9ef73a7519489ae7f566b2e040f2b4c38edb8e35e37ae07af7f0a52420902f869ee0dbf5dc6c784
   languageName: node
   linkType: hard
 
 "json-parse-even-better-errors@npm:^2.3.0, json-parse-even-better-errors@npm:^2.3.1":
   version: 2.3.1
   resolution: "json-parse-even-better-errors@npm:2.3.1"
-  checksum: 798ed4cf3354a2d9ccd78e86d2169515a0097a5c133337807cdf7f1fc32e1391d207ccfc276518cc1d7d8d4db93288b8a50ba4293d212ad1336e52a8ec0a941f
+  checksum: 10/5f3a99009ed5f2a5a67d06e2f298cc97bc86d462034173308156f15b43a6e850be8511dc204b9b94566305da2947f7d90289657237d210351a39059ff9d666cf
+  languageName: node
+  linkType: hard
+
+"json-parse-even-better-errors@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "json-parse-even-better-errors@npm:3.0.0"
+  checksum: 10/f1970b5220c7fa23d888565510752c3d5e863f93668a202fcaa719739fa41485dfc6a1db212f702ebd3c873851cc067aebc2917e3f79763cae2fdb95046f38f3
   languageName: node
   linkType: hard
 
 "json-schema-traverse@npm:^0.4.1":
   version: 0.4.1
   resolution: "json-schema-traverse@npm:0.4.1"
-  checksum: 7486074d3ba247769fda17d5181b345c9fb7d12e0da98b22d1d71a5db9698d8b4bd900a3ec1a4ffdd60846fc2556274a5c894d0c48795f14cb03aeae7b55260b
+  checksum: 10/7486074d3ba247769fda17d5181b345c9fb7d12e0da98b22d1d71a5db9698d8b4bd900a3ec1a4ffdd60846fc2556274a5c894d0c48795f14cb03aeae7b55260b
   languageName: node
   linkType: hard
 
 "json-schema-traverse@npm:^1.0.0":
   version: 1.0.0
   resolution: "json-schema-traverse@npm:1.0.0"
-  checksum: 02f2f466cdb0362558b2f1fd5e15cce82ef55d60cd7f8fa828cf35ba74330f8d767fcae5c5c2adb7851fa811766c694b9405810879bc4e1ddd78a7c0e03658ad
+  checksum: 10/02f2f466cdb0362558b2f1fd5e15cce82ef55d60cd7f8fa828cf35ba74330f8d767fcae5c5c2adb7851fa811766c694b9405810879bc4e1ddd78a7c0e03658ad
   languageName: node
   linkType: hard
 
 "json-schema@npm:0.4.0":
   version: 0.4.0
   resolution: "json-schema@npm:0.4.0"
-  checksum: 66389434c3469e698da0df2e7ac5a3281bcff75e797a5c127db7c5b56270e01ae13d9afa3c03344f76e32e81678337a8c912bdbb75101c62e487dc3778461d72
+  checksum: 10/8b3b64eff4a807dc2a3045b104ed1b9335cd8d57aa74c58718f07f0f48b8baa3293b00af4dcfbdc9144c3aafea1e97982cc27cc8e150fc5d93c540649507a458
   languageName: node
   linkType: hard
 
 "json-source-map@npm:0.6.1":
   version: 0.6.1
   resolution: "json-source-map@npm:0.6.1"
-  checksum: 61b24b97824d538df796621d02519260a99024e0e366a6dc702089603f0a80d32e814734392fb6004a06b1a669b3c9fa337d46f5cda014b65afcd127a2882ebc
+  checksum: 10/211a330bc2819b5c4061ce5c091c787595084d9ee31f3bc5369acf04d017612cc1306e84727c31182fd06bbc1aa619d45dcd979062f6796df49d015673dd32b2
   languageName: node
   linkType: hard
 
 "json-stable-stringify-without-jsonify@npm:^1.0.1":
   version: 1.0.1
   resolution: "json-stable-stringify-without-jsonify@npm:1.0.1"
-  checksum: cff44156ddce9c67c44386ad5cddf91925fe06b1d217f2da9c4910d01f358c6e3989c4d5a02683c7a5667f9727ff05831f7aa8ae66c8ff691c556f0884d49215
-  languageName: node
-  linkType: hard
-
-"json-stringify-nice@npm:^1.1.4":
-  version: 1.1.4
-  resolution: "json-stringify-nice@npm:1.1.4"
-  checksum: 6ddf781148b46857ab04e97f47be05f14c4304b86eb5478369edbeacd070c21c697269964b982fc977e8989d4c59091103b1d9dc291aba40096d6cbb9a392b72
+  checksum: 10/12786c2e2f22c27439e6db0532ba321f1d0617c27ad8cb1c352a0e9249a50182fd1ba8b52a18899291604b0c32eafa8afd09e51203f19109a0537f68db2b652d
   languageName: node
   linkType: hard
 
 "json-stringify-pretty-compact@npm:^2.0.0":
   version: 2.0.0
   resolution: "json-stringify-pretty-compact@npm:2.0.0"
-  checksum: b476aa4ce2728cc7d89bffc4e99433015efc7065313cb90b7a6450cfd934aa3a61846ee9040c79ce00c44ca046cdd6ec0113157c9b895c85b7529c3056d6a1ea
+  checksum: 10/08f2725eef0a37bfd554aaa1ce551bc973e13f2c3dc86dd40b10ae6c08b3851b84946db672877e994e1fd1d904a578941c176609864e4f1a48b6d8f51fc2ac5f
   languageName: node
   linkType: hard
 
 "json-stringify-safe@npm:^5.0.1, json-stringify-safe@npm:~5.0.1":
   version: 5.0.1
   resolution: "json-stringify-safe@npm:5.0.1"
-  checksum: 48ec0adad5280b8a96bb93f4563aa1667fd7a36334f79149abd42446d0989f2ddc58274b479f4819f1f00617957e6344c886c55d05a4e15ebb4ab931e4a6a8ee
+  checksum: 10/59169a081e4eeb6f9559ae1f938f656191c000e0512aa6df9f3c8b2437a4ab1823819c6b9fd1818a4e39593ccfd72e9a051fdd3e2d1e340ed913679e888ded8c
   languageName: node
   linkType: hard
 
@@ -20829,26 +22039,26 @@ __metadata:
   version: 1.0.2
   resolution: "json5@npm:1.0.2"
   dependencies:
-    minimist: ^1.2.0
+    minimist: "npm:^1.2.0"
   bin:
     json5: lib/cli.js
-  checksum: 866458a8c58a95a49bef3adba929c625e82532bcff1fe93f01d29cb02cac7c3fe1f4b79951b7792c2da9de0b32871a8401a6e3c5b36778ad852bf5b8a61165d7
+  checksum: 10/a78d812dbbd5642c4f637dd130954acfd231b074965871c3e28a5bbd571f099d623ecf9161f1960c4ddf68e0cc98dee8bebfdb94a71ad4551f85a1afc94b63f6
   languageName: node
   linkType: hard
 
-"json5@npm:^2.1.2, json5@npm:^2.2.3":
+"json5@npm:^2.1.2, json5@npm:^2.2.2, json5@npm:^2.2.3":
   version: 2.2.3
   resolution: "json5@npm:2.2.3"
   bin:
     json5: lib/cli.js
-  checksum: 2a7436a93393830bce797d4626275152e37e877b265e94ca69c99e3d20c2b9dab021279146a39cdb700e71b2dd32a4cebd1514cd57cee102b1af906ce5040349
+  checksum: 10/1db67b853ff0de3534085d630691d3247de53a2ed1390ba0ddff681ea43e9b3e30ecbdb65c5e9aab49435e44059c23dbd6fee8ee619419ba37465bb0dd7135da
   languageName: node
   linkType: hard
 
 "jsonc-parser@npm:3.2.0, jsonc-parser@npm:^3.2.0":
   version: 3.2.0
   resolution: "jsonc-parser@npm:3.2.0"
-  checksum: 946dd9a5f326b745aa326d48a7257e3f4a4b62c5e98ec8e49fa2bdd8d96cef7e6febf1399f5c7016114fd1f68a1c62c6138826d5d90bc650448e3cf0951c53c7
+  checksum: 10/bd68b902e5f9394f01da97921f49c5084b2dc03a0c5b4fdb2a429f8d6f292686c1bf87badaeb0a8148d024192a88f5ad2e57b2918ba43fe25cf15f3371db64d4
   languageName: node
   linkType: hard
 
@@ -20856,11 +22066,11 @@ __metadata:
   version: 4.0.0
   resolution: "jsonfile@npm:4.0.0"
   dependencies:
-    graceful-fs: ^4.1.6
+    graceful-fs: "npm:^4.1.6"
   dependenciesMeta:
     graceful-fs:
       optional: true
-  checksum: 6447d6224f0d31623eef9b51185af03ac328a7553efcee30fa423d98a9e276ca08db87d71e17f2310b0263fd3ffa6c2a90a6308367f661dc21580f9469897c9e
+  checksum: 10/17796f0ab1be8479827d3683433f97ebe0a1c6932c3360fa40348eac36904d69269aab26f8b16da311882d94b42e9208e8b28e490bf926364f3ac9bff134c226
   languageName: node
   linkType: hard
 
@@ -20868,19 +22078,19 @@ __metadata:
   version: 6.1.0
   resolution: "jsonfile@npm:6.1.0"
   dependencies:
-    graceful-fs: ^4.1.6
-    universalify: ^2.0.0
+    graceful-fs: "npm:^4.1.6"
+    universalify: "npm:^2.0.0"
   dependenciesMeta:
     graceful-fs:
       optional: true
-  checksum: 7af3b8e1ac8fe7f1eccc6263c6ca14e1966fcbc74b618d3c78a0a2075579487547b94f72b7a1114e844a1e15bb00d440e5d1720bfc4612d790a6f285d5ea8354
+  checksum: 10/03014769e7dc77d4cf05fa0b534907270b60890085dd5e4d60a382ff09328580651da0b8b4cdf44d91e4c8ae64d91791d965f05707beff000ed494a38b6fec85
   languageName: node
   linkType: hard
 
 "jsonparse@npm:^1.2.0, jsonparse@npm:^1.3.1":
   version: 1.3.1
   resolution: "jsonparse@npm:1.3.1"
-  checksum: 6514a7be4674ebf407afca0eda3ba284b69b07f9958a8d3113ef1005f7ec610860c312be067e450c569aab8b89635e332cee3696789c750692bb60daba627f4d
+  checksum: 10/24531e956f0f19d79e22c157cebd81b37af3486ae22f9bc1028f8c2a4d1b70df48b168ff86f8568d9c2248182de9b6da9f50f685d5e4b9d1d2d339d2a29d15bc
   languageName: node
   linkType: hard
 
@@ -20888,14 +22098,14 @@ __metadata:
   version: 2.5.1
   resolution: "jspdf@npm:2.5.1"
   dependencies:
-    "@babel/runtime": ^7.14.0
-    atob: ^2.1.2
-    btoa: ^1.2.1
-    canvg: ^3.0.6
-    core-js: ^3.6.0
-    dompurify: ^2.2.0
-    fflate: ^0.4.8
-    html2canvas: ^1.0.0-rc.5
+    "@babel/runtime": "npm:^7.14.0"
+    atob: "npm:^2.1.2"
+    btoa: "npm:^1.2.1"
+    canvg: "npm:^3.0.6"
+    core-js: "npm:^3.6.0"
+    dompurify: "npm:^2.2.0"
+    fflate: "npm:^0.4.8"
+    html2canvas: "npm:^1.0.0-rc.5"
   dependenciesMeta:
     canvg:
       optional: true
@@ -20905,7 +22115,7 @@ __metadata:
       optional: true
     html2canvas:
       optional: true
-  checksum: 9ecdccc50678cd780f0995157618630ca0da65576835983232d48001aab0b29e51af765e078808526d5e5e2e1ebf3cee460e03eaf590f875d160f2e0cb614a1e
+  checksum: 10/3a1efc6205c7fcf0e84697dc90277a8aee28274f0ea39c12af38d3302985c359acfe6ee9419ed1cfc7fbb7a59547e3d4cad8dedf6248fc4af7e2087d4a8bb448
   languageName: node
   linkType: hard
 
@@ -20913,11 +22123,11 @@ __metadata:
   version: 1.4.2
   resolution: "jsprim@npm:1.4.2"
   dependencies:
-    assert-plus: 1.0.0
-    extsprintf: 1.3.0
-    json-schema: 0.4.0
-    verror: 1.10.0
-  checksum: 2ad1b9fdcccae8b3d580fa6ced25de930eaa1ad154db21bbf8478a4d30bbbec7925b5f5ff29b933fba9412b16a17bd484a8da4fdb3663b5e27af95dd693bab2a
+    assert-plus: "npm:1.0.0"
+    extsprintf: "npm:1.3.0"
+    json-schema: "npm:0.4.0"
+    verror: "npm:1.10.0"
+  checksum: 10/df2bf234eab1b5078d01bcbff3553d50a243f7b5c10a169745efeda6344d62798bd1d85bcca6a8446f3b5d0495e989db45f9de8dae219f0f9796e70e0c776089
   languageName: node
   linkType: hard
 
@@ -20925,72 +22135,60 @@ __metadata:
   version: 2.0.2
   resolution: "jsprim@npm:2.0.2"
   dependencies:
-    assert-plus: 1.0.0
-    extsprintf: 1.3.0
-    json-schema: 0.4.0
-    verror: 1.10.0
-  checksum: d175f6b1991e160cb0aa39bc857da780e035611986b5492f32395411879fdaf4e513d98677f08f7352dac93a16b66b8361c674b86a3fa406e2e7af6b26321838
+    assert-plus: "npm:1.0.0"
+    extsprintf: "npm:1.3.0"
+    json-schema: "npm:0.4.0"
+    verror: "npm:1.10.0"
+  checksum: 10/fcfca5b55f83e1b8be5f932c71754bd37afd2611f81685abd05689e8ce718a91155ff7bd5b94c65ce483a787b5c43c6d0c18c1d2259fca5bb61a3f8ea2e29c0a
   languageName: node
   linkType: hard
 
 "jsurl@npm:^0.1.5":
   version: 0.1.5
   resolution: "jsurl@npm:0.1.5"
-  checksum: 50b614908d6bdf7800a257d0ecbaf2b8129fbb538db44dc991518034e48b594eca5d7593bdd887a59e48baaa258279aae89f80ac5af200a6c789eb23d45b186f
+  checksum: 10/00065413460c5d4f85b775cb6a37ff30e733af66f546c3cb376e2268ba02874c5d53166011c9490cf275f11ee53c7c072d5055507bdf3de8dc7507f2c90f7e03
   languageName: node
   linkType: hard
 
-"jsx-ast-utils@npm:^2.4.1 || ^3.0.0, jsx-ast-utils@npm:^3.3.3":
-  version: 3.3.3
-  resolution: "jsx-ast-utils@npm:3.3.3"
+"jsx-ast-utils@npm:^2.4.1 || ^3.0.0, jsx-ast-utils@npm:^3.3.5":
+  version: 3.3.5
+  resolution: "jsx-ast-utils@npm:3.3.5"
   dependencies:
-    array-includes: ^3.1.5
-    object.assign: ^4.1.3
-  checksum: a2ed78cac49a0f0c4be8b1eafe3c5257a1411341d8e7f1ac740debae003de04e5f6372bfcfbd9d082e954ffd99aac85bcda85b7c6bc11609992483f4cdc0f745
-  languageName: node
-  linkType: hard
-
-"just-diff-apply@npm:^5.2.0":
-  version: 5.3.1
-  resolution: "just-diff-apply@npm:5.3.1"
-  checksum: c864606096f2506f043f90c58196bf47344b4c60e97171ea6ec3430e4664aa2eddc6722ff87c66fef4d6d6b47364b053f90a10d59319135a6c06ba5dd424b58e
-  languageName: node
-  linkType: hard
-
-"just-diff@npm:^5.0.1":
-  version: 5.0.3
-  resolution: "just-diff@npm:5.0.3"
-  checksum: 89e5c3deb0525e8d5f651a0775ca62807d8924e386c3ab58d81ac7392ac10f6c98c677ea6e5578618e483fc88139e7ebde1c4130296e83d802ac3103f7e210cd
+    array-includes: "npm:^3.1.6"
+    array.prototype.flat: "npm:^1.3.1"
+    object.assign: "npm:^4.1.4"
+    object.values: "npm:^1.1.6"
+  checksum: 10/b61d44613687dfe4cc8ad4b4fbf3711bf26c60b8d5ed1f494d723e0808415c59b24a7c0ed8ab10736a40ff84eef38cbbfb68b395e05d31117b44ffc59d31edfc
   languageName: node
   linkType: hard
 
-"kbar@npm:0.1.0-beta.40":
-  version: 0.1.0-beta.40
-  resolution: "kbar@npm:0.1.0-beta.40"
+"kbar@npm:0.1.0-beta.45":
+  version: 0.1.0-beta.45
+  resolution: "kbar@npm:0.1.0-beta.45"
   dependencies:
-    "@radix-ui/react-portal": ^1.0.1
-    command-score: ^0.1.2
-    fast-equals: ^2.0.3
-    react-virtual: ^2.8.2
-    tiny-invariant: ^1.2.0
+    "@radix-ui/react-portal": "npm:^1.0.1"
+    fast-equals: "npm:^2.0.3"
+    fuse.js: "npm:^6.6.2"
+    react-virtual: "npm:^2.8.2"
+    tiny-invariant: "npm:^1.2.0"
   peerDependencies:
     react: ^16.0.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.0.0 || ^17.0.0 || ^18.0.0
-  checksum: 0c2cbe520e48ba210cbcfd04529178a772c112ea8e674953bbb6343f74109bf3fd3cb8d23bb4235093f04018b28e8e2e485852d23c39dfe96eab6189cc82c361
+  checksum: 10/16d161b8563400cc5bff15cf1ba881eb7a00e7bb8b5bd8b67c878fdb60a3db7380ee36f2ac29f15361ece0b214c7d5322d02c954381036d3f72a5227d8d3eb47
   languageName: node
   linkType: hard
 
 "keycharm@npm:^0.2.0":
   version: 0.2.0
   resolution: "keycharm@npm:0.2.0"
-  checksum: 079ddecc700c7a3dd82601822a840e56d6cfffc837b26718c00de4a00634984fb19bdf79ee053b260af7d2516f281e4d75378c731da7bf9e2ccd7476c3913f0e
+  checksum: 10/9c0f227fddfb8f82dbe6ff6450c1d3110d10715eaab2034ef656ce1be4900a979ce7994ecef0ef8bfc190c9f11c1a82e5f454052fa92142c44e6843bcff1249f
   languageName: node
   linkType: hard
 
 "keycode@npm:^2.2.0":
   version: 2.2.0
   resolution: "keycode@npm:2.2.0"
-  checksum: cb91c2940a892f1444a41fc08339b8831445a6b095af9103e3061ea7d4bdbfc420135dcb5d9257020e35c374468bb7d4495ea9fcea54e5760196daff3c874fa4
+  checksum: 10/fd2c723141d335c605d800c49322fd339589af32a803dd171a25e5ff74b9e7c8532d4ea819d9250f0407ed10a1bdbeb2458b2d58606339ad96ab718414417b5c
   languageName: node
   linkType: hard
 
@@ -20998,73 +22196,80 @@ __metadata:
   version: 1.2.2
   resolution: "keycon@npm:1.2.2"
   dependencies:
-    "@daybrush/utils": ^1.7.1
-    "@scena/event-emitter": ^1.0.2
-    keycode: ^2.2.0
-  checksum: 81cd5a5e70640212165ba743b4451628b3c30b1773b7f26eb9d2fb5ba5c6529d2c8fecc2499bbf01fa899206356e14960dd42db6b983e5a6c27669718b23c8a8
+    "@daybrush/utils": "npm:^1.7.1"
+    "@scena/event-emitter": "npm:^1.0.2"
+    keycode: "npm:^2.2.0"
+  checksum: 10/d4ce0551f59eecbb64964723b16af4c7bd7ca64403bdb781e64acc11929377c5f4383131af80e6388872f594aba9a759c575a66364b868c67cad0a97c34fa375
   languageName: node
   linkType: hard
 
-"keyv@npm:^4.5.3":
+"keyv@npm:^4.5.3, keyv@npm:^4.5.4":
   version: 4.5.4
   resolution: "keyv@npm:4.5.4"
   dependencies:
-    json-buffer: 3.0.1
-  checksum: 74a24395b1c34bd44ad5cb2b49140d087553e170625240b86755a6604cd65aa16efdbdeae5cdb17ba1284a0fbb25ad06263755dbc71b8d8b06f74232ce3cdd72
+    json-buffer: "npm:3.0.1"
+  checksum: 10/167eb6ef64cc84b6fa0780ee50c9de456b422a1e18802209234f7c2cf7eae648c7741f32e50d7e24ccb22b24c13154070b01563d642755b156c357431a191e75
   languageName: node
   linkType: hard
 
 "kind-of@npm:^6.0.2, kind-of@npm:^6.0.3":
   version: 6.0.3
   resolution: "kind-of@npm:6.0.3"
-  checksum: 3ab01e7b1d440b22fe4c31f23d8d38b4d9b91d9f291df683476576493d5dfd2e03848a8b05813dd0c3f0e835bc63f433007ddeceb71f05cb25c45ae1b19c6d3b
+  checksum: 10/5873d303fb36aad875b7538798867da2ae5c9e328d67194b0162a3659a627d22f742fc9c4ae95cd1704132a24b00cae5041fc00c0f6ef937dc17080dc4dbb962
   languageName: node
   linkType: hard
 
 "kleur@npm:^3.0.3":
   version: 3.0.3
   resolution: "kleur@npm:3.0.3"
-  checksum: df82cd1e172f957bae9c536286265a5cdbd5eeca487cb0a3b2a7b41ef959fc61f8e7c0e9aeea9c114ccf2c166b6a8dd45a46fd619c1c569d210ecd2765ad5169
+  checksum: 10/0c0ecaf00a5c6173d25059c7db2113850b5457016dfa1d0e3ef26da4704fbb186b4938d7611246d86f0ddf1bccf26828daa5877b1f232a65e7373d0122a83e7f
   languageName: node
   linkType: hard
 
 "known-css-properties@npm:^0.29.0":
   version: 0.29.0
   resolution: "known-css-properties@npm:0.29.0"
-  checksum: daa6562e907f856cbfd58a00c42f532c9bba283388984da6a3bffb494e56612e5f23c52f30b0d9885f0ea07ad5d88bfa0470ee65017a6ce6c565289a1afd78af
+  checksum: 10/ab4e1d6bad10fe4ba15183e640dab8eec52aaa5a69899382de5843699f145e49c67e6a3ca5c8426ccd31577d3eec4459004ed317a550c3523b863a251280ddd4
+  languageName: node
+  linkType: hard
+
+"known-css-properties@npm:^0.30.0":
+  version: 0.30.0
+  resolution: "known-css-properties@npm:0.30.0"
+  checksum: 10/baed51f1c6baf0a904d0c5a041ebdc3a33a22af65a8dcdf7c2ecc22f80360ee44d2992737b745ed2e16a74f37cbb668a27d1e469d776286688921d0b8f0d3c04
   languageName: node
   linkType: hard
 
-"language-subtag-registry@npm:~0.3.2":
+"language-subtag-registry@npm:^0.3.20":
   version: 0.3.22
   resolution: "language-subtag-registry@npm:0.3.22"
-  checksum: 8ab70a7e0e055fe977ac16ea4c261faec7205ac43db5e806f72e5b59606939a3b972c4bd1e10e323b35d6ffa97c3e1c4c99f6553069dad2dfdd22020fa3eb56a
+  checksum: 10/5591f4abd775d1ab5945355a5ba894327d2d94c900607bdb69aac1bc5bb921dbeeeb5f616df95e8c0ae875501d19c1cfa0e852ece822121e95048deb34f2b4d2
   languageName: node
   linkType: hard
 
-"language-tags@npm:=1.0.5":
-  version: 1.0.5
-  resolution: "language-tags@npm:1.0.5"
+"language-tags@npm:^1.0.9":
+  version: 1.0.9
+  resolution: "language-tags@npm:1.0.9"
   dependencies:
-    language-subtag-registry: ~0.3.2
-  checksum: c81b5d8b9f5f9cfd06ee71ada6ddfe1cf83044dd5eeefcd1e420ad491944da8957688db4a0a9bc562df4afdc2783425cbbdfd152c01d93179cf86888903123cf
+    language-subtag-registry: "npm:^0.3.20"
+  checksum: 10/d3a7c14b694e67f519153d6df6cb200681648d38d623c3bfa9d6a66a5ec5493628acb88e9df5aceef3cf1902ab263a205e7d59ee4cf1d6bb67e707b83538bd6d
   languageName: node
   linkType: hard
 
-"launch-editor@npm:^2.6.0":
-  version: 2.6.0
-  resolution: "launch-editor@npm:2.6.0"
+"launch-editor@npm:^2.6.1":
+  version: 2.6.1
+  resolution: "launch-editor@npm:2.6.1"
   dependencies:
-    picocolors: ^1.0.0
-    shell-quote: ^1.7.3
-  checksum: 48e4230643e8fdb5c14c11314706d58d9f3fbafe2606be3d6e37da1918ad8bfe39dd87875c726a1b59b9f4da99d87ec3e36d4c528464f0b820f9e91e5cb1c02d
+    picocolors: "npm:^1.0.0"
+    shell-quote: "npm:^1.8.1"
+  checksum: 10/e06d193075ac09f7f8109f10cabe464a211bf7ed4cbe75f83348d6f67bf4d9f162f06e7a1ab3e1cd7fc250b5342c3b57080618aff2e646dc34248fe499227601
   languageName: node
   linkType: hard
 
 "lazy-ass@npm:^1.6.0":
   version: 1.6.0
   resolution: "lazy-ass@npm:1.6.0"
-  checksum: 5a3ebb17915b03452320804466345382a6c25ac782ec4874fecdb2385793896cd459be2f187dc7def8899180c32ee0ab9a1aa7fe52193ac3ff3fe29bb0591729
+  checksum: 10/3969ebef060b6f665fc78310ec769f7d2945db2d5af2b6663eda1bc9ec45c845deba9c4a3f75f124ce2c76fedf56514a063ee5c2affc8bc94963fbbddb442a88
   languageName: node
   linkType: hard
 
@@ -21072,72 +22277,122 @@ __metadata:
   version: 4.0.0
   resolution: "lazy-universal-dotenv@npm:4.0.0"
   dependencies:
-    app-root-dir: ^1.0.2
-    dotenv: ^16.0.0
-    dotenv-expand: ^10.0.0
-  checksum: 196e0d701100144fbfe078d604a477573413ebf38dfe8d543748605e6a7074978508a3bb9f8135acd319db4fa947eef78836497163617d15a22163c59a00996b
-  languageName: node
-  linkType: hard
-
-"lazystream@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "lazystream@npm:1.0.1"
-  dependencies:
-    readable-stream: ^2.0.5
-  checksum: 822c54c6b87701a6491c70d4fabc4cafcf0f87d6b656af168ee7bb3c45de9128a801cb612e6eeeefc64d298a7524a698dd49b13b0121ae50c2ae305f0dcc5310
+    app-root-dir: "npm:^1.0.2"
+    dotenv: "npm:^16.0.0"
+    dotenv-expand: "npm:^10.0.0"
+  checksum: 10/5aa4d1a01d108d1f4a565576b58e728be949ceccecef894d6a9de56cb2b8e2e033abd47424190d0a546cb22b4b4a3ab553346b9710c3294870660d4a3555dd34
   languageName: node
   linkType: hard
 
-"lead@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "lead@npm:1.0.0"
-  dependencies:
-    flush-write-stream: ^1.0.2
-  checksum: f08a9f45ac39b8d1fecf31de4d97a8fa2aa7e233e99bb61fd443414fc8055331224490698e186cb614aa3ea2f2695d71c42afc85415fa680b078d640efadab50
+"lead@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "lead@npm:4.0.0"
+  checksum: 10/7117297c29b94e4846822e5ae0a25780af834586c0862b89ff899e44547f4f742d67801f19838b34611d36eec44868604c55525e12d2a1fb0c9496a9792ca396
   languageName: node
   linkType: hard
 
 "lerc@npm:^3.0.0":
   version: 3.0.0
   resolution: "lerc@npm:3.0.0"
-  checksum: 637699a1359cd80e581bac4bd66dd7ac09e6681fe97346c97939abdbc0170deac1b79ea00a17e334ef5d9d510973ca382abb43c39c8294788dd8391daeb75c32
-  languageName: node
-  linkType: hard
-
-"lerna@npm:5.5.4":
-  version: 5.5.4
-  resolution: "lerna@npm:5.5.4"
-  dependencies:
-    "@lerna/add": 5.5.4
-    "@lerna/bootstrap": 5.5.4
-    "@lerna/changed": 5.5.4
-    "@lerna/clean": 5.5.4
-    "@lerna/cli": 5.5.4
-    "@lerna/create": 5.5.4
-    "@lerna/diff": 5.5.4
-    "@lerna/exec": 5.5.4
-    "@lerna/import": 5.5.4
-    "@lerna/info": 5.5.4
-    "@lerna/init": 5.5.4
-    "@lerna/link": 5.5.4
-    "@lerna/list": 5.5.4
-    "@lerna/publish": 5.5.4
-    "@lerna/run": 5.5.4
-    "@lerna/version": 5.5.4
-    import-local: ^3.0.2
-    npmlog: ^6.0.2
-    nx: ">=14.6.1 < 16"
-    typescript: ^3 || ^4
+  checksum: 10/25c9c259b2211ac252910bacd2a85310755d0291644c37ffcdbf96725465bf5fd22e61946172e7fb214ac4aafcbc2885e1016686079a5acddda97dcd000526ad
+  languageName: node
+  linkType: hard
+
+"lerna@npm:8.1.2":
+  version: 8.1.2
+  resolution: "lerna@npm:8.1.2"
+  dependencies:
+    "@lerna/create": "npm:8.1.2"
+    "@npmcli/run-script": "npm:7.0.2"
+    "@nx/devkit": "npm:>=17.1.2 < 19"
+    "@octokit/plugin-enterprise-rest": "npm:6.0.1"
+    "@octokit/rest": "npm:19.0.11"
+    byte-size: "npm:8.1.1"
+    chalk: "npm:4.1.0"
+    clone-deep: "npm:4.0.1"
+    cmd-shim: "npm:6.0.1"
+    columnify: "npm:1.6.0"
+    conventional-changelog-angular: "npm:7.0.0"
+    conventional-changelog-core: "npm:5.0.1"
+    conventional-recommended-bump: "npm:7.0.1"
+    cosmiconfig: "npm:^8.2.0"
+    dedent: "npm:0.7.0"
+    envinfo: "npm:7.8.1"
+    execa: "npm:5.0.0"
+    fs-extra: "npm:^11.1.1"
+    get-port: "npm:5.1.1"
+    get-stream: "npm:6.0.0"
+    git-url-parse: "npm:13.1.0"
+    glob-parent: "npm:5.1.2"
+    globby: "npm:11.1.0"
+    graceful-fs: "npm:4.2.11"
+    has-unicode: "npm:2.0.1"
+    import-local: "npm:3.1.0"
+    ini: "npm:^1.3.8"
+    init-package-json: "npm:5.0.0"
+    inquirer: "npm:^8.2.4"
+    is-ci: "npm:3.0.1"
+    is-stream: "npm:2.0.0"
+    jest-diff: "npm:>=29.4.3 < 30"
+    js-yaml: "npm:4.1.0"
+    libnpmaccess: "npm:7.0.2"
+    libnpmpublish: "npm:7.3.0"
+    load-json-file: "npm:6.2.0"
+    lodash: "npm:^4.17.21"
+    make-dir: "npm:4.0.0"
+    minimatch: "npm:3.0.5"
+    multimatch: "npm:5.0.0"
+    node-fetch: "npm:2.6.7"
+    npm-package-arg: "npm:8.1.1"
+    npm-packlist: "npm:5.1.1"
+    npm-registry-fetch: "npm:^14.0.5"
+    npmlog: "npm:^6.0.2"
+    nx: "npm:>=17.1.2 < 19"
+    p-map: "npm:4.0.0"
+    p-map-series: "npm:2.1.0"
+    p-pipe: "npm:3.1.0"
+    p-queue: "npm:6.6.2"
+    p-reduce: "npm:2.1.0"
+    p-waterfall: "npm:2.1.1"
+    pacote: "npm:^17.0.5"
+    pify: "npm:5.0.0"
+    read-cmd-shim: "npm:4.0.0"
+    read-package-json: "npm:6.0.4"
+    resolve-from: "npm:5.0.0"
+    rimraf: "npm:^4.4.1"
+    semver: "npm:^7.3.8"
+    signal-exit: "npm:3.0.7"
+    slash: "npm:3.0.0"
+    ssri: "npm:^9.0.1"
+    strong-log-transformer: "npm:2.1.0"
+    tar: "npm:6.1.11"
+    temp-dir: "npm:1.0.0"
+    typescript: "npm:>=3 < 6"
+    upath: "npm:2.0.1"
+    uuid: "npm:^9.0.0"
+    validate-npm-package-license: "npm:3.0.4"
+    validate-npm-package-name: "npm:5.0.0"
+    write-file-atomic: "npm:5.0.1"
+    write-pkg: "npm:4.0.0"
+    yargs: "npm:17.7.2"
+    yargs-parser: "npm:21.1.1"
   bin:
-    lerna: cli.js
-  checksum: 3107df46a5ce9d5bc4c5587767ac7b27d62b9732991853c48a58c88bdbc8ad972df7928e5cf98fbcb4d87ba5e47116cec5326cb9438f235e7a6686bc4e1c9ada
+    lerna: dist/cli.js
+  checksum: 10/5f4267bb059e00b294985e5cc4e783155e5be58ecd73c1791be0c24ff77561f2699550cdad4faee8a3a5d2866ae18bd6d7c4bba4b0dae1b26056d1187616c8a6
   languageName: node
   linkType: hard
 
 "leven@npm:^3.1.0":
   version: 3.1.0
   resolution: "leven@npm:3.1.0"
-  checksum: 638401d534585261b6003db9d99afd244dfe82d75ddb6db5c0df412842d5ab30b2ef18de471aaec70fe69a46f17b4ae3c7f01d8a4e6580ef7adb9f4273ad1e55
+  checksum: 10/638401d534585261b6003db9d99afd244dfe82d75ddb6db5c0df412842d5ab30b2ef18de471aaec70fe69a46f17b4ae3c7f01d8a4e6580ef7adb9f4273ad1e55
+  languageName: node
+  linkType: hard
+
+"leven@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "leven@npm:4.0.0"
+  checksum: 10/d70b9fef4cca487a38021bb173a5cae98d39b1c7f4a5b2439763bd89df8e389f178a3c941b6fc3fab1582f5052b5e8c91353d9607799a2ad3841e7ea22f9720f
   languageName: node
   linkType: hard
 
@@ -21145,55 +22400,63 @@ __metadata:
   version: 0.4.1
   resolution: "levn@npm:0.4.1"
   dependencies:
-    prelude-ls: ^1.2.1
-    type-check: ~0.4.0
-  checksum: 12c5021c859bd0f5248561bf139121f0358285ec545ebf48bb3d346820d5c61a4309535c7f387ed7d84361cf821e124ce346c6b7cef8ee09a67c1473b46d0fc4
+    prelude-ls: "npm:^1.2.1"
+    type-check: "npm:~0.4.0"
+  checksum: 10/2e4720ff79f21ae08d42374b0a5c2f664c5be8b6c8f565bb4e1315c96ed3a8acaa9de788ffed82d7f2378cf36958573de07ef92336cb5255ed74d08b8318c9ee
   languageName: node
   linkType: hard
 
-"libnpmaccess@npm:^6.0.3":
-  version: 6.0.4
-  resolution: "libnpmaccess@npm:6.0.4"
+"libnpmaccess@npm:7.0.2":
+  version: 7.0.2
+  resolution: "libnpmaccess@npm:7.0.2"
   dependencies:
-    aproba: ^2.0.0
-    minipass: ^3.1.1
-    npm-package-arg: ^9.0.1
-    npm-registry-fetch: ^13.0.0
-  checksum: 86130b435c67a03254489c3b3684d435260b609164f76bcc69adbee78652c36a64551228b2c5ddc2b16851e9e367ee0ba173a641406768397716faa006042322
+    npm-package-arg: "npm:^10.1.0"
+    npm-registry-fetch: "npm:^14.0.3"
+  checksum: 10/73d49f39391173276c46c12e32f503709338efd867d255d062ae9bc9e9f464d61240747f42bdd6dc6003a5dc275a27352ebfc11ed4cb424091463f302d823f23
   languageName: node
   linkType: hard
 
-"libnpmpublish@npm:^6.0.4":
-  version: 6.0.5
-  resolution: "libnpmpublish@npm:6.0.5"
+"libnpmpublish@npm:7.3.0":
+  version: 7.3.0
+  resolution: "libnpmpublish@npm:7.3.0"
   dependencies:
-    normalize-package-data: ^4.0.0
-    npm-package-arg: ^9.0.1
-    npm-registry-fetch: ^13.0.0
-    semver: ^7.3.7
-    ssri: ^9.0.0
-  checksum: d2f2434517038438be44db2e90e1c8c524df05f7c3b1458617177c2f9ca008dde8a72a4f739b34aee4df0352f71c9289788da86aa38a4709e05c6db33eed570a
+    ci-info: "npm:^3.6.1"
+    normalize-package-data: "npm:^5.0.0"
+    npm-package-arg: "npm:^10.1.0"
+    npm-registry-fetch: "npm:^14.0.3"
+    proc-log: "npm:^3.0.0"
+    semver: "npm:^7.3.7"
+    sigstore: "npm:^1.4.0"
+    ssri: "npm:^10.0.1"
+  checksum: 10/89c8b8810897f9bb584ab9c7b4aa5438636590ddfe482989b3440a4ea47f95969e395f7fe5af1a7a0364faf70a2b1680fa1d8a37002597f33acd9f3bcd6d555a
   languageName: node
   linkType: hard
 
-"lilconfig@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "lilconfig@npm:2.1.0"
-  checksum: 8549bb352b8192375fed4a74694cd61ad293904eee33f9d4866c2192865c44c4eb35d10782966242634e0cbc1e91fe62b1247f148dc5514918e3a966da7ea117
+"lilconfig@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "lilconfig@npm:3.0.0"
+  checksum: 10/55f60f4f9f7b41358cc33875e3696919412683a35aec30c6c60c4f6ecb16fb6d11f7ac856b8458b9b82b21d5f4629649fbfca1de034e8d5b0cc7a70836266db6
   languageName: node
   linkType: hard
 
 "lines-and-columns@npm:^1.1.6":
   version: 1.1.6
   resolution: "lines-and-columns@npm:1.1.6"
-  checksum: 198a5436b1fa5cf703bae719c01c686b076f0ad7e1aafd95a58d626cabff302dc0414822126f2f80b58a8c3d66cda8a7b6da064f27130f87e1d3506d6dfd0d68
+  checksum: 10/198a5436b1fa5cf703bae719c01c686b076f0ad7e1aafd95a58d626cabff302dc0414822126f2f80b58a8c3d66cda8a7b6da064f27130f87e1d3506d6dfd0d68
   languageName: node
   linkType: hard
 
-"lines-and-columns@npm:^2.0.3":
+"lines-and-columns@npm:^2.0.3, lines-and-columns@npm:~2.0.3":
   version: 2.0.3
   resolution: "lines-and-columns@npm:2.0.3"
-  checksum: 5955363dfd7d3d7c476d002eb47944dbe0310d57959e2112dce004c0dc76cecfd479cf8c098fd479ff344acdf04ee0e82b455462a26492231ac152f6c48d17a1
+  checksum: 10/b5bb0d6ee2f82ae834ceddc9251af2060c30db476673e9c817c34c00bed58e0c5d90a6866b64afe7bdcb2c5eb1b418a5b1ee631d2592dc8ff381540901fa4da6
+  languageName: node
+  linkType: hard
+
+"linked-list-typescript@npm:^1.0.11":
+  version: 1.0.15
+  resolution: "linked-list-typescript@npm:1.0.15"
+  checksum: 10/91c87ab00fe4bb9850f169adc62b811ae7e91a743bac1a9fc969a815f20ddd0fb285f84a4d31e98900512234f59297f7beef6b076dd382cf879a319c7a14c68b
   languageName: node
   linkType: hard
 
@@ -21201,51 +22464,51 @@ __metadata:
   version: 3.14.0
   resolution: "listr2@npm:3.14.0"
   dependencies:
-    cli-truncate: ^2.1.0
-    colorette: ^2.0.16
-    log-update: ^4.0.0
-    p-map: ^4.0.0
-    rfdc: ^1.3.0
-    rxjs: ^7.5.1
-    through: ^2.3.8
-    wrap-ansi: ^7.0.0
+    cli-truncate: "npm:^2.1.0"
+    colorette: "npm:^2.0.16"
+    log-update: "npm:^4.0.0"
+    p-map: "npm:^4.0.0"
+    rfdc: "npm:^1.3.0"
+    rxjs: "npm:^7.5.1"
+    through: "npm:^2.3.8"
+    wrap-ansi: "npm:^7.0.0"
   peerDependencies:
     enquirer: ">= 2.3.0 < 3"
   peerDependenciesMeta:
     enquirer:
       optional: true
-  checksum: fdb8b2d6bdf5df9371ebd5082bee46c6d0ca3d1e5f2b11fbb5a127839855d5f3da9d4968fce94f0a5ec67cac2459766abbb1faeef621065ebb1829b11ef9476d
+  checksum: 10/cebbd692330279ea82f05468cbb0a16f5b40015a6163e0a2fb04ef168da8e2d6c54e129148e90112d92e7f9ecb85a56e6b88d867a58a8ebdf36e0c98df49ae5c
   languageName: node
   linkType: hard
 
-"load-json-file@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "load-json-file@npm:4.0.0"
+"load-json-file@npm:6.2.0":
+  version: 6.2.0
+  resolution: "load-json-file@npm:6.2.0"
   dependencies:
-    graceful-fs: ^4.1.2
-    parse-json: ^4.0.0
-    pify: ^3.0.0
-    strip-bom: ^3.0.0
-  checksum: 8f5d6d93ba64a9620445ee9bde4d98b1eac32cf6c8c2d20d44abfa41a6945e7969456ab5f1ca2fb06ee32e206c9769a20eec7002fe290de462e8c884b6b8b356
+    graceful-fs: "npm:^4.1.15"
+    parse-json: "npm:^5.0.0"
+    strip-bom: "npm:^4.0.0"
+    type-fest: "npm:^0.6.0"
+  checksum: 10/4429e430ebb99375fc7cd936348e4f7ba729486080ced4272091c1e386a7f5f738ea3337d8ffd4b01c2f5bc3ddde92f2c780045b66838fe98bdb79f901884643
   languageName: node
   linkType: hard
 
-"load-json-file@npm:^6.2.0":
-  version: 6.2.0
-  resolution: "load-json-file@npm:6.2.0"
+"load-json-file@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "load-json-file@npm:4.0.0"
   dependencies:
-    graceful-fs: ^4.1.15
-    parse-json: ^5.0.0
-    strip-bom: ^4.0.0
-    type-fest: ^0.6.0
-  checksum: 4429e430ebb99375fc7cd936348e4f7ba729486080ced4272091c1e386a7f5f738ea3337d8ffd4b01c2f5bc3ddde92f2c780045b66838fe98bdb79f901884643
+    graceful-fs: "npm:^4.1.2"
+    parse-json: "npm:^4.0.0"
+    pify: "npm:^3.0.0"
+    strip-bom: "npm:^3.0.0"
+  checksum: 10/8f5d6d93ba64a9620445ee9bde4d98b1eac32cf6c8c2d20d44abfa41a6945e7969456ab5f1ca2fb06ee32e206c9769a20eec7002fe290de462e8c884b6b8b356
   languageName: node
   linkType: hard
 
 "loader-runner@npm:^4.2.0":
   version: 4.2.0
   resolution: "loader-runner@npm:4.2.0"
-  checksum: e61aea8b6904b8af53d9de6f0484da86c462c0001f4511bedc837cec63deb9475cea813db62f702cd7930420ccb0e75c78112270ca5c8b61b374294f53c0cb3a
+  checksum: 10/89a648e0418f23edf2f310bf74a8adb0710548e8d8d47040def081e1b822bdc27b664b796ce43ceb7921fa56485e1f5046417e425714730dc6ea4242e7a176fa
   languageName: node
   linkType: hard
 
@@ -21253,10 +22516,10 @@ __metadata:
   version: 2.0.4
   resolution: "loader-utils@npm:2.0.4"
   dependencies:
-    big.js: ^5.2.2
-    emojis-list: ^3.0.0
-    json5: ^2.1.2
-  checksum: a5281f5fff1eaa310ad5e1164095689443630f3411e927f95031ab4fb83b4a98f388185bb1fe949e8ab8d4247004336a625e9255c22122b815bb9a4c5d8fc3b7
+    big.js: "npm:^5.2.2"
+    emojis-list: "npm:^3.0.0"
+    json5: "npm:^2.1.2"
+  checksum: 10/28bd9af2025b0cb2fc6c9c2d8140a75a3ab61016e5a86edf18f63732216e985a50bf2479a662555beb472a54d12292e380423705741bfd2b54cab883aa067f18
   languageName: node
   linkType: hard
 
@@ -21264,9 +22527,9 @@ __metadata:
   version: 2.0.0
   resolution: "locate-path@npm:2.0.0"
   dependencies:
-    p-locate: ^2.0.0
-    path-exists: ^3.0.0
-  checksum: 02d581edbbbb0fa292e28d96b7de36b5b62c2fa8b5a7e82638ebb33afa74284acf022d3b1e9ae10e3ffb7658fbc49163fcd5e76e7d1baaa7801c3e05a81da755
+    p-locate: "npm:^2.0.0"
+    path-exists: "npm:^3.0.0"
+  checksum: 10/02d581edbbbb0fa292e28d96b7de36b5b62c2fa8b5a7e82638ebb33afa74284acf022d3b1e9ae10e3ffb7658fbc49163fcd5e76e7d1baaa7801c3e05a81da755
   languageName: node
   linkType: hard
 
@@ -21274,9 +22537,9 @@ __metadata:
   version: 3.0.0
   resolution: "locate-path@npm:3.0.0"
   dependencies:
-    p-locate: ^3.0.0
-    path-exists: ^3.0.0
-  checksum: 53db3996672f21f8b0bf2a2c645ae2c13ffdae1eeecfcd399a583bce8516c0b88dcb4222ca6efbbbeb6949df7e46860895be2c02e8d3219abd373ace3bfb4e11
+    p-locate: "npm:^3.0.0"
+    path-exists: "npm:^3.0.0"
+  checksum: 10/53db3996672f21f8b0bf2a2c645ae2c13ffdae1eeecfcd399a583bce8516c0b88dcb4222ca6efbbbeb6949df7e46860895be2c02e8d3219abd373ace3bfb4e11
   languageName: node
   linkType: hard
 
@@ -21284,8 +22547,8 @@ __metadata:
   version: 5.0.0
   resolution: "locate-path@npm:5.0.0"
   dependencies:
-    p-locate: ^4.1.0
-  checksum: 83e51725e67517287d73e1ded92b28602e3ae5580b301fe54bfb76c0c723e3f285b19252e375712316774cf52006cb236aed5704692c32db0d5d089b69696e30
+    p-locate: "npm:^4.1.0"
+  checksum: 10/83e51725e67517287d73e1ded92b28602e3ae5580b301fe54bfb76c0c723e3f285b19252e375712316774cf52006cb236aed5704692c32db0d5d089b69696e30
   languageName: node
   linkType: hard
 
@@ -21293,8 +22556,8 @@ __metadata:
   version: 6.0.0
   resolution: "locate-path@npm:6.0.0"
   dependencies:
-    p-locate: ^5.0.0
-  checksum: 72eb661788a0368c099a184c59d2fee760b3831c9c1c33955e8a19ae4a21b4116e53fa736dc086cdeb9fce9f7cc508f2f92d2d3aae516f133e16a2bb59a39f5a
+    p-locate: "npm:^5.0.0"
+  checksum: 10/72eb661788a0368c099a184c59d2fee760b3831c9c1c33955e8a19ae4a21b4116e53fa736dc086cdeb9fce9f7cc508f2f92d2d3aae516f133e16a2bb59a39f5a
   languageName: node
   linkType: hard
 
@@ -21302,106 +22565,129 @@ __metadata:
   version: 7.2.0
   resolution: "locate-path@npm:7.2.0"
   dependencies:
-    p-locate: ^6.0.0
-  checksum: c1b653bdf29beaecb3d307dfb7c44d98a2a98a02ebe353c9ad055d1ac45d6ed4e1142563d222df9b9efebc2bcb7d4c792b507fad9e7150a04c29530b7db570f8
+    p-locate: "npm:^6.0.0"
+  checksum: 10/1c6d269d4efec555937081be964e8a9b4a136319c79ca1d45ac6382212a8466113c75bd89e44521ca8ecd1c47fb08523b56eee5c0712bc7d14fec5f729deeb42
+  languageName: node
+  linkType: hard
+
+"lockfile@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "lockfile@npm:1.0.4"
+  dependencies:
+    signal-exit: "npm:^3.0.2"
+  checksum: 10/2fe86f932c106fabd15f56ffde2a87c99b02e4ca173b5fb64886349d3d0d82417e22a2be2b413006a55f4efbeac7beb679e8a7ac7f767d91981059c25be4dc15
   languageName: node
   linkType: hard
 
 "lodash-es@npm:^4.17.21":
   version: 4.17.21
   resolution: "lodash-es@npm:4.17.21"
-  checksum: 05cbffad6e2adbb331a4e16fbd826e7faee403a1a04873b82b42c0f22090f280839f85b95393f487c1303c8a3d2a010048bf06151a6cbe03eee4d388fb0a12d2
+  checksum: 10/03f39878ea1e42b3199bd3f478150ab723f93cc8730ad86fec1f2804f4a07c6e30deaac73cad53a88e9c3db33348bb8ceeb274552390e7a75d7849021c02df43
   languageName: node
   linkType: hard
 
 "lodash.debounce@npm:^4.0.8":
   version: 4.0.8
   resolution: "lodash.debounce@npm:4.0.8"
-  checksum: a3f527d22c548f43ae31c861ada88b2637eb48ac6aa3eb56e82d44917971b8aa96fbb37aa60efea674dc4ee8c42074f90f7b1f772e9db375435f6c83a19b3bc6
+  checksum: 10/cd0b2819786e6e80cb9f5cda26b1a8fc073daaf04e48d4cb462fa4663ec9adb3a5387aa22d7129e48eed1afa05b482e2a6b79bfc99b86886364449500cbb00fd
+  languageName: node
+  linkType: hard
+
+"lodash.get@npm:^4.4.2":
+  version: 4.4.2
+  resolution: "lodash.get@npm:4.4.2"
+  checksum: 10/2a4925f6e89bc2c010a77a802d1ba357e17ed1ea03c2ddf6a146429f2856a216663e694a6aa3549a318cbbba3fd8b7decb392db457e6ac0b83dc745ed0a17380
+  languageName: node
+  linkType: hard
+
+"lodash.has@npm:^4.5.2":
+  version: 4.5.2
+  resolution: "lodash.has@npm:4.5.2"
+  checksum: 10/35c0862e715bc22528dd3cd34f1e66d25d58f0ecef9a43aa409fb7ddebaf6495cb357ae242f141e4b2325258f4a6bafdd8928255d51f1c0a741ae9b93951c743
   languageName: node
   linkType: hard
 
 "lodash.intersection@npm:^4.4.0":
   version: 4.4.0
   resolution: "lodash.intersection@npm:4.4.0"
-  checksum: 98935dcba1bbb981c3927e3822f6f6f344736c881df4b622e4e40ca4a125490425449e23179f46294a1b4c351de4e9a7bb60207cc6ddd65ecfd45ef727d35123
+  checksum: 10/fdd227a84eb2b52b0592121d5b8b7ceaa1d62405f1bd30d76f9f1ccfc58599423ffd28b82800b4ee539ee429d73a9850e1dfc7194bfe6227eb6028c91beac769
   languageName: node
   linkType: hard
 
 "lodash.isequal@npm:^4.0.0":
   version: 4.5.0
   resolution: "lodash.isequal@npm:4.5.0"
-  checksum: da27515dc5230eb1140ba65ff8de3613649620e8656b19a6270afe4866b7bd461d9ba2ac8a48dcc57f7adac4ee80e1de9f965d89d4d81a0ad52bb3eec2609644
+  checksum: 10/82fc58a83a1555f8df34ca9a2cd300995ff94018ac12cc47c349655f0ae1d4d92ba346db4c19bbfc90510764e0c00ddcc985a358bdcd4b3b965abf8f2a48a214
   languageName: node
   linkType: hard
 
 "lodash.ismatch@npm:^4.4.0":
   version: 4.4.0
   resolution: "lodash.ismatch@npm:4.4.0"
-  checksum: a393917578842705c7fc1a30fb80613d1ac42d20b67eb26a2a6004d6d61ee90b419f9eb320508ddcd608e328d91eeaa2651411727eaa9a12534ed6ccb02fc705
+  checksum: 10/946a7176cdf4048f7b624378defda00dc0d01a2dad9933c54dad11fbecc253716df4210fbbfcd7d042e6fdb7603463cfe48e0ef576e20bf60d43f7deb1a2fe04
   languageName: node
   linkType: hard
 
 "lodash.isplainobject@npm:^4.0.6":
   version: 4.0.6
   resolution: "lodash.isplainobject@npm:4.0.6"
-  checksum: 29c6351f281e0d9a1d58f1a4c8f4400924b4c79f18dfc4613624d7d54784df07efaff97c1ff2659f3e085ecf4fff493300adc4837553104cef2634110b0d5337
+  checksum: 10/29c6351f281e0d9a1d58f1a4c8f4400924b4c79f18dfc4613624d7d54784df07efaff97c1ff2659f3e085ecf4fff493300adc4837553104cef2634110b0d5337
   languageName: node
   linkType: hard
 
 "lodash.maxby@npm:^4.6.0":
   version: 4.6.0
   resolution: "lodash.maxby@npm:4.6.0"
-  checksum: 2f508383545bd9450e6509f1e5f3a3f737aac25a54225fe981b1a3c80faacc6d48d047695d799f5a7db80e8fc3c600e4736573cb2e6d0365c8f929bba5e5a1dd
+  checksum: 10/0fce6143fa6a6941effae0151d6f92eede95116a96497ad3c29a96cb97e6d8f48112eb56ded526990b83bf58f7dbc7ea61c531f8aacfecd288be427f06861aef
   languageName: node
   linkType: hard
 
 "lodash.memoize@npm:4.x, lodash.memoize@npm:^4.1.1, lodash.memoize@npm:^4.1.2":
   version: 4.1.2
   resolution: "lodash.memoize@npm:4.1.2"
-  checksum: 9ff3942feeccffa4f1fafa88d32f0d24fdc62fd15ded5a74a5f950ff5f0c6f61916157246744c620173dddf38d37095a92327d5fd3861e2063e736a5c207d089
+  checksum: 10/192b2168f310c86f303580b53acf81ab029761b9bd9caa9506a019ffea5f3363ea98d7e39e7e11e6b9917066c9d36a09a11f6fe16f812326390d8f3a54a1a6da
   languageName: node
   linkType: hard
 
 "lodash.merge@npm:^4.6.2":
   version: 4.6.2
   resolution: "lodash.merge@npm:4.6.2"
-  checksum: ad580b4bdbb7ca1f7abf7e1bce63a9a0b98e370cf40194b03380a46b4ed799c9573029599caebc1b14e3f24b111aef72b96674a56cfa105e0f5ac70546cdc005
+  checksum: 10/d0ea2dd0097e6201be083865d50c3fb54fbfbdb247d9cc5950e086c991f448b7ab0cdab0d57eacccb43473d3f2acd21e134db39f22dac2d6c9ba6bf26978e3d6
   languageName: node
   linkType: hard
 
 "lodash.once@npm:^4.1.1":
   version: 4.1.1
   resolution: "lodash.once@npm:4.1.1"
-  checksum: d768fa9f9b4e1dc6453be99b753906f58990e0c45e7b2ca5a3b40a33111e5d17f6edf2f768786e2716af90a8e78f8f91431ab8435f761fef00f9b0c256f6d245
+  checksum: 10/202f2c8c3d45e401b148a96de228e50ea6951ee5a9315ca5e15733d5a07a6b1a02d9da1e7fdf6950679e17e8ca8f7190ec33cae47beb249b0c50019d753f38f3
   languageName: node
   linkType: hard
 
 "lodash.padend@npm:^4.6.1":
   version: 4.6.1
   resolution: "lodash.padend@npm:4.6.1"
-  checksum: c2e6e789debf83b98f5c085305cdcfff1067e7a31bda2a110fd765d3c11a99edfbeef570d9ef737ab3212006bdb8114e77622e518c18c1fce52b8fdfd9dab685
+  checksum: 10/9553cdc2ca89c8ea2904757cbbc2aff8eae65b6712486e68251090c8ac118729c0bb8572bc19bcbb70805866e4350f5560662f634132d479b487a3ed7db4a536
   languageName: node
   linkType: hard
 
 "lodash.truncate@npm:^4.4.2":
   version: 4.4.2
   resolution: "lodash.truncate@npm:4.4.2"
-  checksum: b463d8a382cfb5f0e71c504dcb6f807a7bd379ff1ea216669aa42c52fc28c54e404bfbd96791aa09e6df0de2c1d7b8f1b7f4b1a61f324d38fe98bc535aeee4f5
+  checksum: 10/7a495616121449e5d2288c606b1025d42ab9979e8c93ba885e5c5802ffd4f1ebad4428c793ccc12f73e73237e85a9f5b67dd6415757546fbd5a4653ba83e25ac
   languageName: node
   linkType: hard
 
 "lodash.uniq@npm:^4.5.0":
   version: 4.5.0
   resolution: "lodash.uniq@npm:4.5.0"
-  checksum: a4779b57a8d0f3c441af13d9afe7ecff22dd1b8ce1129849f71d9bbc8e8ee4e46dfb4b7c28f7ad3d67481edd6e51126e4e2a6ee276e25906d10f7140187c392d
+  checksum: 10/86246ca64ac0755c612e5df6d93cfe92f9ecac2e5ff054b965efbbb1d9a647b6310969e78545006f70f52760554b03233ad0103324121ae31474c20d5f7a2812
   languageName: node
   linkType: hard
 
 "lodash@npm:4.17.21, lodash@npm:^4, lodash@npm:^4.1.1, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.4":
   version: 4.17.21
   resolution: "lodash@npm:4.17.21"
-  checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7
+  checksum: 10/c08619c038846ea6ac754abd6dd29d2568aa705feb69339e836dfa8d8b09abbb2f859371e86863eda41848221f9af43714491467b5b0299122431e202bb0c532
   languageName: node
   linkType: hard
 
@@ -21409,9 +22695,9 @@ __metadata:
   version: 4.1.0
   resolution: "log-symbols@npm:4.1.0"
   dependencies:
-    chalk: ^4.1.0
-    is-unicode-supported: ^0.1.0
-  checksum: fce1497b3135a0198803f9f07464165e9eb83ed02ceb2273930a6f8a508951178d8cf4f0378e9d28300a2ed2bc49050995d2bd5f53ab716bb15ac84d58c6ef74
+    chalk: "npm:^4.1.0"
+    is-unicode-supported: "npm:^0.1.0"
+  checksum: 10/fce1497b3135a0198803f9f07464165e9eb83ed02ceb2273930a6f8a508951178d8cf4f0378e9d28300a2ed2bc49050995d2bd5f53ab716bb15ac84d58c6ef74
   languageName: node
   linkType: hard
 
@@ -21419,11 +22705,11 @@ __metadata:
   version: 4.0.0
   resolution: "log-update@npm:4.0.0"
   dependencies:
-    ansi-escapes: ^4.3.0
-    cli-cursor: ^3.1.0
-    slice-ansi: ^4.0.0
-    wrap-ansi: ^6.2.0
-  checksum: ae2f85bbabc1906034154fb7d4c4477c79b3e703d22d78adee8b3862fa913942772e7fa11713e3d96fb46de4e3cabefbf5d0a544344f03b58d3c4bff52aa9eb2
+    ansi-escapes: "npm:^4.3.0"
+    cli-cursor: "npm:^3.1.0"
+    slice-ansi: "npm:^4.0.0"
+    wrap-ansi: "npm:^6.2.0"
+  checksum: 10/ae2f85bbabc1906034154fb7d4c4477c79b3e703d22d78adee8b3862fa913942772e7fa11713e3d96fb46de4e3cabefbf5d0a544344f03b58d3c4bff52aa9eb2
   languageName: node
   linkType: hard
 
@@ -21431,29 +22717,29 @@ __metadata:
   version: 1.1.1
   resolution: "log4js@npm:1.1.1"
   dependencies:
-    debug: ^2.2.0
-    semver: ^5.3.0
-    streamroller: ^0.4.0
-  checksum: 95d0d9fa58a98b6a80ee6935e2bbad584a2ff45e32e3a489483f00b3176b60312d75884beb10299a9468016d87b31ab3a3ebbc1f0403becbd2c4287d49d94292
+    debug: "npm:^2.2.0"
+    semver: "npm:^5.3.0"
+    streamroller: "npm:^0.4.0"
+  checksum: 10/d7912f2a9718882a94297741b9770aabd1a2c12936191244312e211a94cbf44d46ffcc63ac874c096d9e3e69756077e4a0a55f7f3740e22056eddeceb0b6b1a4
   languageName: node
   linkType: hard
 
 "logfmt@npm:^1.3.2":
-  version: 1.3.2
-  resolution: "logfmt@npm:1.3.2"
+  version: 1.4.0
+  resolution: "logfmt@npm:1.4.0"
   dependencies:
-    split: 0.2.x
-    through: 2.3.x
+    split: "npm:0.2.x"
+    through: "npm:2.3.x"
   bin:
-    logfmt: ./bin/logfmt
-  checksum: 639d327c1ec5c9b4078278c13f2dd4ea6be0c1057a8735e2b066b7c506532d6b7c267bc4b1c9a6ed7e5d2017abaa69dbe8b4bf9eec4c0b69069a2a53d50f24cb
+    logfmt: bin/logfmt
+  checksum: 10/4576cc77faa5596c62bdbb4aec9efeba8e6758495b395a48ab2c7ee49e0673c85c2498ed792740b21607e011c4d94e4fc7449034ba7ba67f8a9ae14a2fb1e801
   languageName: node
   linkType: hard
 
 "long@npm:^5.0.0":
   version: 5.2.3
   resolution: "long@npm:5.2.3"
-  checksum: 885ede7c3de4facccbd2cacc6168bae3a02c3e836159ea4252c87b6e34d40af819824b2d4edce330bfb5c4d6e8ce3ec5864bdcf9473fa1f53a4f8225860e5897
+  checksum: 10/9167ec6947a825b827c30da169a7384eec6c0c9ec2f0b9c74da2e93d81159bbe39fb09c3f13dae9721d4b807ccfa09797a7dd1012f5d478e3e33ca3c78b608e6
   languageName: node
   linkType: hard
 
@@ -21461,10 +22747,10 @@ __metadata:
   version: 1.4.0
   resolution: "loose-envify@npm:1.4.0"
   dependencies:
-    js-tokens: ^3.0.0 || ^4.0.0
+    js-tokens: "npm:^3.0.0 || ^4.0.0"
   bin:
     loose-envify: cli.js
-  checksum: 6517e24e0cad87ec9888f500c5b5947032cdfe6ef65e1c1936a0c48a524b81e65542c9c3edc91c97d5bddc806ee2a985dbc79be89215d613b1de5db6d1cfe6f4
+  checksum: 10/6517e24e0cad87ec9888f500c5b5947032cdfe6ef65e1c1936a0c48a524b81e65542c9c3edc91c97d5bddc806ee2a985dbc79be89215d613b1de5db6d1cfe6f4
   languageName: node
   linkType: hard
 
@@ -21472,8 +22758,8 @@ __metadata:
   version: 2.0.2
   resolution: "lower-case@npm:2.0.2"
   dependencies:
-    tslib: ^2.0.3
-  checksum: 83a0a5f159ad7614bee8bf976b96275f3954335a84fad2696927f609ddae902802c4f3312d86668722e668bef41400254807e1d3a7f2e8c3eede79691aa1f010
+    tslib: "npm:^2.0.3"
+  checksum: 10/83a0a5f159ad7614bee8bf976b96275f3954335a84fad2696927f609ddae902802c4f3312d86668722e668bef41400254807e1d3a7f2e8c3eede79691aa1f010
   languageName: node
   linkType: hard
 
@@ -21481,16 +22767,16 @@ __metadata:
   version: 1.20.0
   resolution: "lowlight@npm:1.20.0"
   dependencies:
-    fault: ^1.0.0
-    highlight.js: ~10.7.0
-  checksum: 14a1815d6bae202ddee313fc60f06d46e5235c02fa483a77950b401d85b4c1e12290145ccd17a716b07f9328bd5864aa2d402b6a819ff3be7c833d9748ff8ba7
+    fault: "npm:^1.0.0"
+    highlight.js: "npm:~10.7.0"
+  checksum: 10/3294677be15bbc256556f097d9b675f23f14309aceeada7880473c57bdbdd7761f200d903fe26d8fa5e82259f70a39465d1d40754c4c049ad2bbd33d77e2c06f
   languageName: node
   linkType: hard
 
-"lru-cache@npm:10.0.0, lru-cache@npm:^9.1.1 || ^10.0.0":
-  version: 10.0.0
-  resolution: "lru-cache@npm:10.0.0"
-  checksum: 18f101675fe283bc09cda0ef1e3cc83781aeb8373b439f086f758d1d91b28730950db785999cd060d3c825a8571c03073e8c14512b6655af2188d623031baf50
+"lru-cache@npm:10.2.0, lru-cache@npm:^10.0.1, lru-cache@npm:^10.2.0, lru-cache@npm:^9.1.1 || ^10.0.0":
+  version: 10.2.0
+  resolution: "lru-cache@npm:10.2.0"
+  checksum: 10/502ec42c3309c0eae1ce41afca471f831c278566d45a5273a0c51102dee31e0e250a62fa9029c3370988df33a14188a38e682c16143b794de78668de3643e302
   languageName: node
   linkType: hard
 
@@ -21498,8 +22784,8 @@ __metadata:
   version: 5.1.1
   resolution: "lru-cache@npm:5.1.1"
   dependencies:
-    yallist: ^3.0.2
-  checksum: c154ae1cbb0c2206d1501a0e94df349653c92c8cbb25236d7e85190bcaf4567a03ac6eb43166fabfa36fd35623694da7233e88d9601fbf411a9a481d85dbd2cb
+    yallist: "npm:^3.0.2"
+  checksum: 10/951d2673dcc64a7fb888bf3d13bc2fdf923faca97d89cdb405ba3dfff77e2b26e5798d405e78fcd7094c9e7b8b4dab2ddc5a4f8a11928af24a207b7c738ca3f8
   languageName: node
   linkType: hard
 
@@ -21507,29 +22793,29 @@ __metadata:
   version: 6.0.0
   resolution: "lru-cache@npm:6.0.0"
   dependencies:
-    yallist: ^4.0.0
-  checksum: f97f499f898f23e4585742138a22f22526254fdba6d75d41a1c2526b3b6cc5747ef59c5612ba7375f42aca4f8461950e925ba08c991ead0651b4918b7c978297
+    yallist: "npm:^4.0.0"
+  checksum: 10/fc1fe2ee205f7c8855fa0f34c1ab0bcf14b6229e35579ec1fd1079f31d6fc8ef8eb6fd17f2f4d99788d7e339f50e047555551ebd5e434dda503696e7c6591825
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^7.4.4, lru-cache@npm:^7.5.1, lru-cache@npm:^7.7.1":
+"lru-cache@npm:^7.5.1, lru-cache@npm:^7.7.1":
   version: 7.12.0
   resolution: "lru-cache@npm:7.12.0"
-  checksum: fdb62262978393df7a4bd46a072bc5c3808c50ca5a347a82bb9459410efd841b7bae50655c3cf9004c70d12c756cf6d018f6bff155a16cdde9eba9a82899b5eb
+  checksum: 10/ac4e78bb5a04174389db377d325c9baecb5d5c5cf619894aa237891b3f5605e51426823b118753229b0bf4073db7091cc7593c096181e2ba20b4b5e2e59c9c9d
   languageName: node
   linkType: hard
 
 "lru-memoize@npm:^1.1.0":
   version: 1.1.0
   resolution: "lru-memoize@npm:1.1.0"
-  checksum: cc0c8f8427ae08da572bdcf3a904764024f6b396dd744d223c6448407fcf1546705f178f8887f0b4f20d9fda3c3a383b63c83f98a578a76e3bfb744d69e9125a
+  checksum: 10/566f2760348281e080d74e25e64ba9ae8d3c6496b7f2bf15444a6186852272c02c19125aa2821db87d87a8902ee9d98872e87eec1a8b395117b1c3e1e34345aa
   languageName: node
   linkType: hard
 
 "lucene@npm:^2.1.1":
   version: 2.1.1
   resolution: "lucene@npm:2.1.1"
-  checksum: 29bbbddfc0b31b3b5f24b2ee19bc134bb5ca9db0f948b7506df96215e2c24631ed7031cc31a0dddc71024c640ce6eb05c92722bf57bf0e6a4f387ca796cc8df7
+  checksum: 10/9e5b922bb4aa35a22534b186c924a498deaf153813c0c2ed2dd7a4a27806ec25feea2e0b3691f3ae7b39826522af3c411aa24645646e0175ac18f4537add289e
   languageName: node
   linkType: hard
 
@@ -21538,25 +22824,25 @@ __metadata:
   resolution: "lz-string@npm:1.5.0"
   bin:
     lz-string: bin/bin.js
-  checksum: 1ee98b4580246fd90dd54da6e346fb1caefcf05f677c686d9af237a157fdea3fd7c83a4bc58f858cd5b10a34d27afe0fdcbd0505a47e0590726a873dc8b8f65d
+  checksum: 10/e86f0280e99a8d8cd4eef24d8601ddae15ce54e43ac9990dfcb79e1e081c255ad24424a30d78d2ad8e51a8ce82a66a930047fed4b4aa38c6f0b392ff9300edfc
   languageName: node
   linkType: hard
 
-"magic-string@npm:^0.27.0":
-  version: 0.27.0
-  resolution: "magic-string@npm:0.27.0"
+"magic-string@npm:^0.30.0, magic-string@npm:^0.30.4":
+  version: 0.30.8
+  resolution: "magic-string@npm:0.30.8"
   dependencies:
-    "@jridgewell/sourcemap-codec": ^1.4.13
-  checksum: 273faaa50baadb7a2df6e442eac34ad611304fc08fe16e24fe2e472fd944bfcb73ffb50d2dc972dc04e92784222002af46868cb9698b1be181c81830fd95a13e
+    "@jridgewell/sourcemap-codec": "npm:^1.4.15"
+  checksum: 10/72ab63817af600e92c19dc8489c1aa4a9599da00cfd59b2319709bd48fb0cf533fdf354bf140ac86e598dbd63e6b2cc83647fe8448f864a3eb6061c62c94e784
   languageName: node
   linkType: hard
 
-"magic-string@npm:^0.30.0":
-  version: 0.30.1
-  resolution: "magic-string@npm:0.30.1"
+"make-dir@npm:4.0.0":
+  version: 4.0.0
+  resolution: "make-dir@npm:4.0.0"
   dependencies:
-    "@jridgewell/sourcemap-codec": ^1.4.15
-  checksum: 7bc7e4493e32a77068f3753bf8652d4ab44142122eb7fb9fa871af83bef2cd2c57518a6769701cd5d0379bd624a13bc8c72ca25ac5655b27e5a61adf1fd38db2
+    semver: "npm:^7.5.3"
+  checksum: 10/bf0731a2dd3aab4db6f3de1585cea0b746bb73eb5a02e3d8d72757e376e64e6ada190b1eddcde5b2f24a81b688a9897efd5018737d05e02e2a671dda9cff8a8a
   languageName: node
   linkType: hard
 
@@ -21564,49 +22850,67 @@ __metadata:
   version: 2.1.0
   resolution: "make-dir@npm:2.1.0"
   dependencies:
-    pify: ^4.0.1
-    semver: ^5.6.0
-  checksum: 043548886bfaf1820323c6a2997e6d2fa51ccc2586ac14e6f14634f7458b4db2daf15f8c310e2a0abd3e0cddc64df1890d8fc7263033602c47bb12cbfcf86aab
+    pify: "npm:^4.0.1"
+    semver: "npm:^5.6.0"
+  checksum: 10/043548886bfaf1820323c6a2997e6d2fa51ccc2586ac14e6f14634f7458b4db2daf15f8c310e2a0abd3e0cddc64df1890d8fc7263033602c47bb12cbfcf86aab
   languageName: node
   linkType: hard
 
-"make-dir@npm:^3.0.0, make-dir@npm:^3.0.2":
+"make-dir@npm:^3.0.0, make-dir@npm:^3.0.2, make-dir@npm:^3.1.0":
   version: 3.1.0
   resolution: "make-dir@npm:3.1.0"
   dependencies:
-    semver: ^6.0.0
-  checksum: 484200020ab5a1fdf12f393fe5f385fc8e4378824c940fba1729dcd198ae4ff24867bc7a5646331e50cead8abff5d9270c456314386e629acec6dff4b8016b78
+    semver: "npm:^6.0.0"
+  checksum: 10/484200020ab5a1fdf12f393fe5f385fc8e4378824c940fba1729dcd198ae4ff24867bc7a5646331e50cead8abff5d9270c456314386e629acec6dff4b8016b78
   languageName: node
   linkType: hard
 
 "make-error@npm:1.x, make-error@npm:^1.1.1":
   version: 1.3.6
   resolution: "make-error@npm:1.3.6"
-  checksum: b86e5e0e25f7f777b77fabd8e2cbf15737972869d852a22b7e73c17623928fccb826d8e46b9951501d3f20e51ad74ba8c59ed584f610526a48f8ccf88aaec402
+  checksum: 10/b86e5e0e25f7f777b77fabd8e2cbf15737972869d852a22b7e73c17623928fccb826d8e46b9951501d3f20e51ad74ba8c59ed584f610526a48f8ccf88aaec402
   languageName: node
   linkType: hard
 
-"make-fetch-happen@npm:^10.0.3, make-fetch-happen@npm:^10.0.6":
-  version: 10.1.8
-  resolution: "make-fetch-happen@npm:10.1.8"
-  dependencies:
-    agentkeepalive: ^4.2.1
-    cacache: ^16.1.0
-    http-cache-semantics: ^4.1.0
-    http-proxy-agent: ^5.0.0
-    https-proxy-agent: ^5.0.0
-    is-lambda: ^1.0.1
-    lru-cache: ^7.7.1
-    minipass: ^3.1.6
-    minipass-collect: ^1.0.2
-    minipass-fetch: ^2.0.3
-    minipass-flush: ^1.0.5
-    minipass-pipeline: ^1.2.4
-    negotiator: ^0.6.3
-    promise-retry: ^2.0.1
-    socks-proxy-agent: ^7.0.0
-    ssri: ^9.0.0
-  checksum: 5fe9fd9da5368a8a4fe9a3ea5b9aa15f1e91c9ab703cd9027a6b33840ecc8a57c182fbe1c767c139330a88c46a448b1f00da5e32065cec373aff2450b3da54ee
+"make-fetch-happen@npm:^11.0.0, make-fetch-happen@npm:^11.0.1, make-fetch-happen@npm:^11.1.1":
+  version: 11.1.1
+  resolution: "make-fetch-happen@npm:11.1.1"
+  dependencies:
+    agentkeepalive: "npm:^4.2.1"
+    cacache: "npm:^17.0.0"
+    http-cache-semantics: "npm:^4.1.1"
+    http-proxy-agent: "npm:^5.0.0"
+    https-proxy-agent: "npm:^5.0.0"
+    is-lambda: "npm:^1.0.1"
+    lru-cache: "npm:^7.7.1"
+    minipass: "npm:^5.0.0"
+    minipass-fetch: "npm:^3.0.0"
+    minipass-flush: "npm:^1.0.5"
+    minipass-pipeline: "npm:^1.2.4"
+    negotiator: "npm:^0.6.3"
+    promise-retry: "npm:^2.0.1"
+    socks-proxy-agent: "npm:^7.0.0"
+    ssri: "npm:^10.0.0"
+  checksum: 10/b4b442cfaaec81db159f752a5f2e3ee3d7aa682782868fa399200824ec6298502e01bdc456e443dc219bcd5546c8e4471644d54109c8599841dc961d17a805fa
+  languageName: node
+  linkType: hard
+
+"make-fetch-happen@npm:^13.0.0":
+  version: 13.0.0
+  resolution: "make-fetch-happen@npm:13.0.0"
+  dependencies:
+    "@npmcli/agent": "npm:^2.0.0"
+    cacache: "npm:^18.0.0"
+    http-cache-semantics: "npm:^4.1.1"
+    is-lambda: "npm:^1.0.1"
+    minipass: "npm:^7.0.2"
+    minipass-fetch: "npm:^3.0.0"
+    minipass-flush: "npm:^1.0.5"
+    minipass-pipeline: "npm:^1.2.4"
+    negotiator: "npm:^0.6.3"
+    promise-retry: "npm:^2.0.1"
+    ssri: "npm:^10.0.0"
+  checksum: 10/ded5a91a02b76381b06a4ec4d5c1d23ebbde15d402b3c3e4533b371dac7e2f7ca071ae71ae6dae72aa261182557b7b1b3fd3a705b39252dc17f74fa509d3e76f
   languageName: node
   linkType: hard
 
@@ -21614,23 +22918,23 @@ __metadata:
   version: 9.1.0
   resolution: "make-fetch-happen@npm:9.1.0"
   dependencies:
-    agentkeepalive: ^4.1.3
-    cacache: ^15.2.0
-    http-cache-semantics: ^4.1.0
-    http-proxy-agent: ^4.0.1
-    https-proxy-agent: ^5.0.0
-    is-lambda: ^1.0.1
-    lru-cache: ^6.0.0
-    minipass: ^3.1.3
-    minipass-collect: ^1.0.2
-    minipass-fetch: ^1.3.2
-    minipass-flush: ^1.0.5
-    minipass-pipeline: ^1.2.4
-    negotiator: ^0.6.2
-    promise-retry: ^2.0.1
-    socks-proxy-agent: ^6.0.0
-    ssri: ^8.0.0
-  checksum: 0eb371c85fdd0b1584fcfdf3dc3c62395761b3c14658be02620c310305a9a7ecf1617a5e6fb30c1d081c5c8aaf177fa133ee225024313afabb7aa6a10f1e3d04
+    agentkeepalive: "npm:^4.1.3"
+    cacache: "npm:^15.2.0"
+    http-cache-semantics: "npm:^4.1.0"
+    http-proxy-agent: "npm:^4.0.1"
+    https-proxy-agent: "npm:^5.0.0"
+    is-lambda: "npm:^1.0.1"
+    lru-cache: "npm:^6.0.0"
+    minipass: "npm:^3.1.3"
+    minipass-collect: "npm:^1.0.2"
+    minipass-fetch: "npm:^1.3.2"
+    minipass-flush: "npm:^1.0.5"
+    minipass-pipeline: "npm:^1.2.4"
+    negotiator: "npm:^0.6.2"
+    promise-retry: "npm:^2.0.1"
+    socks-proxy-agent: "npm:^6.0.0"
+    ssri: "npm:^8.0.0"
+  checksum: 10/a868e74fc223a78afb7a1f8115133befdffae84f07a5f5dd9317cbf9f784a8373f28829a73ae3f31060e1b0cb4944e73257733c3b10c314354060fab412b6028
   languageName: node
   linkType: hard
 
@@ -21638,36 +22942,45 @@ __metadata:
   version: 1.0.12
   resolution: "makeerror@npm:1.0.12"
   dependencies:
-    tmpl: 1.0.5
-  checksum: b38a025a12c8146d6eeea5a7f2bf27d51d8ad6064da8ca9405fcf7bf9b54acd43e3b30ddd7abb9b1bfa4ddb266019133313482570ddb207de568f71ecfcf6060
+    tmpl: "npm:1.0.5"
+  checksum: 10/4c66ddfc654537333da952c084f507fa4c30c707b1635344eb35be894d797ba44c901a9cebe914aa29a7f61357543ba09b09dddbd7f65b4aee756b450f169f40
   languageName: node
   linkType: hard
 
 "map-obj@npm:^1.0.0":
   version: 1.0.1
   resolution: "map-obj@npm:1.0.1"
-  checksum: 9949e7baec2a336e63b8d4dc71018c117c3ce6e39d2451ccbfd3b8350c547c4f6af331a4cbe1c83193d7c6b786082b6256bde843db90cb7da2a21e8fcc28afed
+  checksum: 10/f8e6fc7f6137329c376c4524f6d25b3c243c17019bc8f621d15a2dcb855919e482a9298a78ae58b00dbd0e76b640bf6533aa343a9e993cfc16e0346a2507e7f8
   languageName: node
   linkType: hard
 
-"map-obj@npm:^4.0.0, map-obj@npm:^4.1.0":
+"map-obj@npm:^4.0.0":
   version: 4.3.0
   resolution: "map-obj@npm:4.3.0"
-  checksum: fbc554934d1a27a1910e842bc87b177b1a556609dd803747c85ece420692380827c6ae94a95cce4407c054fa0964be3bf8226f7f2cb2e9eeee432c7c1985684e
+  checksum: 10/fbc554934d1a27a1910e842bc87b177b1a556609dd803747c85ece420692380827c6ae94a95cce4407c054fa0964be3bf8226f7f2cb2e9eeee432c7c1985684e
   languageName: node
   linkType: hard
 
 "map-or-similar@npm:^1.5.0":
   version: 1.5.0
   resolution: "map-or-similar@npm:1.5.0"
-  checksum: f65c0d420e272d0fce4e24db35f6a08109218480bca1d61eaa442cbe6cf46270b840218d3b5e94e4bfcc2595f1d0a1fa5885df750b52aac9ab1d437b29dcce38
+  checksum: 10/3cf43bcd0e7af41d7bade5f8b5be6bb9d021cc47e6008ad545d071cf3a709ba782884002f9eec6ccd51f572fc17841e07bf74628e0bc3694c33f4622b03e4b4c
   languageName: node
   linkType: hard
 
 "mapbox-to-css-font@npm:^2.4.1":
   version: 2.4.1
   resolution: "mapbox-to-css-font@npm:2.4.1"
-  checksum: db9e9003d8514286f58793a746bb2477d4f29547ccce17a7bdef34d3ed73f1d670cbb2956cb899e5bcda90564b508de485f7bcbbded908a22ab70482dfe49ed0
+  checksum: 10/224fc0f39a2f546bbe5b69a67a4e8c54928606cac44490650ee711723747edb393b4936c0005bcc72cb12f70b31fab50078a65e3e27e0f3e7d65f1ab8a3a253b
+  languageName: node
+  linkType: hard
+
+"markdown-table@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "markdown-table@npm:2.0.0"
+  dependencies:
+    repeat-string: "npm:^1.0.0"
+  checksum: 10/8018cd1a1733ffda916a0548438e50f3d21b6c6b71fb23696b33c0b5922a8cc46035eb4b204a59c6054f063076f934461ae094599656a63f87c1c3a80bd3c229
   languageName: node
   linkType: hard
 
@@ -21676,25 +22989,25 @@ __metadata:
   resolution: "markdown-to-jsx@npm:7.2.0"
   peerDependencies:
     react: ">= 0.14.0"
-  checksum: ea417e684d7eec9f1beebc9423aba377116ef77c3cd83a2d622df1b9030ffef99aa9b3f431192b94f3237943a33560e6dda9be8a4c1d25187518d09986dad22f
+  checksum: 10/99616b7d83434c1fcb5c7d12e320c06a14111e8c26ca691e330b5200f88f166601c7027ed480de56af20ea5628d1864f3702887cdc7081b3cf327fac4611a968
   languageName: node
   linkType: hard
 
-"marked-mangle@npm:1.1.0":
-  version: 1.1.0
-  resolution: "marked-mangle@npm:1.1.0"
+"marked-mangle@npm:1.1.7":
+  version: 1.1.7
+  resolution: "marked-mangle@npm:1.1.7"
   peerDependencies:
-    marked: ^4 || ^5
-  checksum: 3897cb6b0ed580e9be029bf78f8b3b22534ca3e0c061fd9e45d0f256263c01f9667122d68235c767583c7109347bd1cc823dca5f428b95460123ba4b212cdb11
+    marked: ">=4 <13"
+  checksum: 10/95b64d0801bef50d655474cb9c776ee118d2e5dd18f379d5b96b9d4f444d5e81704cd98833aae57151aba281b0265be2f26c31506485e713736a709e586b6f42
   languageName: node
   linkType: hard
 
-"marked@npm:5.1.1":
-  version: 5.1.1
-  resolution: "marked@npm:5.1.1"
+"marked@npm:12.0.1":
+  version: 12.0.1
+  resolution: "marked@npm:12.0.1"
   bin:
     marked: bin/marked.js
-  checksum: e0c6d3a63d01c3b47f7758c3add02abdb3747701b6fce60c4b5602cc3b33122439c5c0a95ac1e8b5fcbb0f7d3aa7af2126aa56074c3d41e207bf9a9ed9948026
+  checksum: 10/34fd0044ebeda28b3f3f94f340e2388666408315557f125d561b59b49baec4c6e6777f54b6fb12aa5c2bf3b75a4aa9f1809679bfb6502da73053d0461c1a232d
   languageName: node
   linkType: hard
 
@@ -21702,16 +23015,16 @@ __metadata:
   version: 2.0.1
   resolution: "matcher-collection@npm:2.0.1"
   dependencies:
-    "@types/minimatch": ^3.0.3
-    minimatch: ^3.0.2
-  checksum: f6d4f94bdcf773f9cbd4b7b10199a7632c434833a4c01bfb29c373e118647bb3b748aa3f20c70d6c3a715915fcc44ad4a77a9f8d5f059f3a0d15c984c0acc83d
+    "@types/minimatch": "npm:^3.0.3"
+    minimatch: "npm:^3.0.2"
+  checksum: 10/f6d4f94bdcf773f9cbd4b7b10199a7632c434833a4c01bfb29c373e118647bb3b748aa3f20c70d6c3a715915fcc44ad4a77a9f8d5f059f3a0d15c984c0acc83d
   languageName: node
   linkType: hard
 
 "mathml-tag-names@npm:^2.1.3":
   version: 2.1.3
   resolution: "mathml-tag-names@npm:2.1.3"
-  checksum: 1201a25a137d6b9e328facd67912058b8b45b19a6c4cc62641c9476195da28a275ca6e0eca070af5378b905c2b11abc1114676ba703411db0b9ce007de921ad0
+  checksum: 10/1201a25a137d6b9e328facd67912058b8b45b19a6c4cc62641c9476195da28a275ca6e0eca070af5378b905c2b11abc1114676ba703411db0b9ce007de921ad0
   languageName: node
   linkType: hard
 
@@ -21719,43 +23032,43 @@ __metadata:
   version: 4.0.0
   resolution: "mdast-util-definitions@npm:4.0.0"
   dependencies:
-    unist-util-visit: ^2.0.0
-  checksum: 2325f20b82b3fb8cb5fda77038ee0bbdd44f82cfca7c48a854724b58bc1fe5919630a3ce7c45e210726df59d46c881d020b2da7a493bfd1ee36eb2bbfef5d78e
+    unist-util-visit: "npm:^2.0.0"
+  checksum: 10/c76da4b4f1e28f8e7c85bf664ab65060f5aa7e0fd0392a24482980984d4ba878b7635a08bcaccca060d6602f478ac6cadaffbbe65f910f75ce332fd67d0ade69
   languageName: node
   linkType: hard
 
 "mdast-util-to-string@npm:^1.0.0":
   version: 1.1.0
   resolution: "mdast-util-to-string@npm:1.1.0"
-  checksum: eec1eb283f3341376c8398b67ce512a11ab3e3191e3dbd5644d32a26784eac8d5f6d0b0fb81193af00d75a2c545cde765c8b03e966bd890076efb5d357fb4fe2
+  checksum: 10/eec1eb283f3341376c8398b67ce512a11ab3e3191e3dbd5644d32a26784eac8d5f6d0b0fb81193af00d75a2c545cde765c8b03e966bd890076efb5d357fb4fe2
   languageName: node
   linkType: hard
 
 "mdn-data@npm:2.0.14":
   version: 2.0.14
   resolution: "mdn-data@npm:2.0.14"
-  checksum: 9d0128ed425a89f4cba8f787dca27ad9408b5cb1b220af2d938e2a0629d17d879a34d2cb19318bdb26c3f14c77dd5dfbae67211f5caaf07b61b1f2c5c8c7dc16
+  checksum: 10/64c629fcf14807e30d6dc79f97cbcafa16db066f53a294299f3932b3beb0eb0d1386d3a7fe408fc67348c449a4e0999360c894ba4c81eb209d7be4e36503de0e
   languageName: node
   linkType: hard
 
 "mdn-data@npm:2.0.28":
   version: 2.0.28
   resolution: "mdn-data@npm:2.0.28"
-  checksum: f51d587a6ebe8e426c3376c74ea6df3e19ec8241ed8e2466c9c8a3904d5d04397199ea4f15b8d34d14524b5de926d8724ae85207984be47e165817c26e49e0aa
+  checksum: 10/aec475e0c078af00498ce2f9434d96a1fdebba9814d14b8f72cd6d5475293f4b3972d0538af2d5c5053d35e1b964af08b7d162b98e9846e9343990b75e4baef1
   languageName: node
   linkType: hard
 
 "mdn-data@npm:2.0.30":
   version: 2.0.30
   resolution: "mdn-data@npm:2.0.30"
-  checksum: d6ac5ac7439a1607df44b22738ecf83f48e66a0874e4482d6424a61c52da5cde5750f1d1229b6f5fa1b80a492be89465390da685b11f97d62b8adcc6e88189aa
+  checksum: 10/e4944322bf3e0461a2daa2aee7e14e208960a036289531e4ef009e53d32bd41528350c070c4a33be867980443fe4c0523518d99318423cffa7c825fe7b1154e2
   languageName: node
   linkType: hard
 
 "media-typer@npm:0.3.0":
   version: 0.3.0
   resolution: "media-typer@npm:0.3.0"
-  checksum: af1b38516c28ec95d6b0826f6c8f276c58aec391f76be42aa07646b4e39d317723e869700933ca6995b056db4b09a78c92d5440dc23657e6764be5d28874bba1
+  checksum: 10/38e0984db39139604756903a01397e29e17dcb04207bb3e081412ce725ab17338ecc47220c1b186b6bbe79a658aad1b0d41142884f5a481f36290cdefbe6aa46
   languageName: node
   linkType: hard
 
@@ -21763,29 +23076,38 @@ __metadata:
   version: 3.5.3
   resolution: "memfs@npm:3.5.3"
   dependencies:
-    fs-monkey: ^1.0.4
-  checksum: 18dfdeacad7c8047b976a6ccd58bc98ba76e122ad3ca0e50a21837fe2075fc0d9aafc58ab9cf2576c2b6889da1dd2503083f2364191b695273f40969db2ecc44
+    fs-monkey: "npm:^1.0.4"
+  checksum: 10/7c9cdb453a6b06e87f11e2dbe6c518fd3c1c1581b370ffa24f42f3fd5b1db8c2203f596e43321a0032963f3e9b66400f2c3cf043904ac496d6ae33eafd0878fe
+  languageName: node
+  linkType: hard
+
+"memfs@npm:^4.6.0":
+  version: 4.7.7
+  resolution: "memfs@npm:4.7.7"
+  dependencies:
+    tslib: "npm:^2.0.0"
+  checksum: 10/311633e5857c91f41021b43f00eda8d540fed2c2d9e02c780fe78de720cfb55d15ab2d5b5ce9f2576637589b82e84488f1b9ff503563e817ed65200ad24617fb
   languageName: node
   linkType: hard
 
 "memoize-one@npm:6.0.0, memoize-one@npm:^6.0.0":
   version: 6.0.0
   resolution: "memoize-one@npm:6.0.0"
-  checksum: f185ea69f7cceae5d1cb596266dcffccf545e8e7b4106ec6aa93b71ab9d16460dd118ac8b12982c55f6d6322fcc1485de139df07eacffaae94888b9b3ad7675f
+  checksum: 10/28feaf7e9a870efef1187df110b876ce42deaf86c955f4111d72d23b96e44eed573469316e6ad0d2cc7fa3b1526978215617b126158015f957242c7493babca9
   languageName: node
   linkType: hard
 
 "memoize-one@npm:>=3.1.1 <6, memoize-one@npm:^5.0.4, memoize-one@npm:^5.1.1":
   version: 5.2.1
   resolution: "memoize-one@npm:5.2.1"
-  checksum: a3cba7b824ebcf24cdfcd234aa7f86f3ad6394b8d9be4c96ff756dafb8b51c7f71320785fbc2304f1af48a0467cbbd2a409efc9333025700ed523f254cb52e3d
+  checksum: 10/b7141dc148b5c6fdd51e77ecf0421fd2581681eb8756e0b3dfbd4fe765b5e2b5a6bc90214bb6f19a96b6aed44de17eda3407142a7be9e24ccd0774bbd9874d1b
   languageName: node
   linkType: hard
 
 "memoize-one@npm:^4.0.0":
   version: 4.0.3
   resolution: "memoize-one@npm:4.0.3"
-  checksum: addd18c046542f57440ba70bf8ebd48663d17626cade681f777522ef70900a87ec72c5041bed8ece4f6d40a2cb58803bae388b50a4b740d64f36bcda20c147b7
+  checksum: 10/6aee6da4d5305b0876c47166522f417440ad0a11483b5199bfae5896c72f4f5b13a5993b8842178a9f0501e0ab501775b54b6eff09af54cc992fc8f607e72338
   languageName: node
   linkType: hard
 
@@ -21793,8 +23115,8 @@ __metadata:
   version: 1.11.3
   resolution: "memoizerific@npm:1.11.3"
   dependencies:
-    map-or-similar: ^1.5.0
-  checksum: d51bdc3ed8c39b4b73845c90eb62d243ddf21899914352d0c303f5e1d477abcb192f4c605e008caa4a31d823225eeb22a99ba5ee825fb88d0c33382db3aee95a
+    map-or-similar: "npm:^1.5.0"
+  checksum: 10/72b6b80699777d000f03db6e15fdabcd4afe77feb45be51fe195cb230c64a368fcfcfbb976375eac3283bd8193d6b1a67ac3081cae07f64fca73f1aa568d59e3
   languageName: node
   linkType: hard
 
@@ -21802,83 +23124,70 @@ __metadata:
   version: 0.5.0
   resolution: "memory-fs@npm:0.5.0"
   dependencies:
-    errno: ^0.1.3
-    readable-stream: ^2.0.1
-  checksum: a9f25b0a8ecfb7324277393f19ef68e6ba53b9e6e4b526bbf2ba23055c5440fbf61acc7bf66bfd980e9eb4951a4790f6f777a9a3abd36603f22c87e8a64d3d6b
+    errno: "npm:^0.1.3"
+    readable-stream: "npm:^2.0.1"
+  checksum: 10/5f146821d02406d031785b23e0ce4e76e751b039dbd8875e38496498dfb8bb6c0cb4b210e8d67a97af14da4c8b275c5b1a3fffdf930ec4ea35a01622e0301ecc
   languageName: node
   linkType: hard
 
-"meow@npm:^10.1.5":
-  version: 10.1.5
-  resolution: "meow@npm:10.1.5"
-  dependencies:
-    "@types/minimist": ^1.2.2
-    camelcase-keys: ^7.0.0
-    decamelize: ^5.0.0
-    decamelize-keys: ^1.1.0
-    hard-rejection: ^2.1.0
-    minimist-options: 4.1.0
-    normalize-package-data: ^3.0.2
-    read-pkg-up: ^8.0.0
-    redent: ^4.0.0
-    trim-newlines: ^4.0.2
-    type-fest: ^1.2.2
-    yargs-parser: ^20.2.9
-  checksum: dd5f0caa4af18517813547dc66741dcbf52c4c23def5062578d39b11189fd9457aee5c1f2263a5cd6592a465023df8357e8ac876b685b64dbcf545e3f66c23a7
+"meow@npm:^13.2.0":
+  version: 13.2.0
+  resolution: "meow@npm:13.2.0"
+  checksum: 10/4eff5bc921fed0b8a471ad79069d741a0210036d717547d0c7f36fdaf84ef7a3036225f38b6a53830d84dc9cbf8b944b097fde62381b8b5b215119e735ce1063
   languageName: node
   linkType: hard
 
-"meow@npm:^8.0.0":
+"meow@npm:^8.1.2":
   version: 8.1.2
   resolution: "meow@npm:8.1.2"
   dependencies:
-    "@types/minimist": ^1.2.0
-    camelcase-keys: ^6.2.2
-    decamelize-keys: ^1.1.0
-    hard-rejection: ^2.1.0
-    minimist-options: 4.1.0
-    normalize-package-data: ^3.0.0
-    read-pkg-up: ^7.0.1
-    redent: ^3.0.0
-    trim-newlines: ^3.0.0
-    type-fest: ^0.18.0
-    yargs-parser: ^20.2.3
-  checksum: bc23bf1b4423ef6a821dff9734406bce4b91ea257e7f10a8b7f896f45b59649f07adc0926e2917eacd8cf1df9e4cd89c77623cf63dfd0f8bf54de07a32ee5a85
+    "@types/minimist": "npm:^1.2.0"
+    camelcase-keys: "npm:^6.2.2"
+    decamelize-keys: "npm:^1.1.0"
+    hard-rejection: "npm:^2.1.0"
+    minimist-options: "npm:4.1.0"
+    normalize-package-data: "npm:^3.0.0"
+    read-pkg-up: "npm:^7.0.1"
+    redent: "npm:^3.0.0"
+    trim-newlines: "npm:^3.0.0"
+    type-fest: "npm:^0.18.0"
+    yargs-parser: "npm:^20.2.3"
+  checksum: 10/d4770f90135c0ef4d0f4fa4f4310a18c07bbbe408221fa79a68fda93944134001ffc24ed605e7668f61e920dd8db30936548e927d2331b0e30699d56247f9873
   languageName: node
   linkType: hard
 
 "merge-descriptors@npm:1.0.1":
   version: 1.0.1
   resolution: "merge-descriptors@npm:1.0.1"
-  checksum: 5abc259d2ae25bb06d19ce2b94a21632583c74e2a9109ee1ba7fd147aa7362b380d971e0251069f8b3eb7d48c21ac839e21fa177b335e82c76ec172e30c31a26
+  checksum: 10/5abc259d2ae25bb06d19ce2b94a21632583c74e2a9109ee1ba7fd147aa7362b380d971e0251069f8b3eb7d48c21ac839e21fa177b335e82c76ec172e30c31a26
   languageName: node
   linkType: hard
 
 "merge-stream@npm:^2.0.0":
   version: 2.0.0
   resolution: "merge-stream@npm:2.0.0"
-  checksum: 6fa4dcc8d86629705cea944a4b88ef4cb0e07656ebf223fa287443256414283dd25d91c1cd84c77987f2aec5927af1a9db6085757cb43d90eb170ebf4b47f4f4
+  checksum: 10/6fa4dcc8d86629705cea944a4b88ef4cb0e07656ebf223fa287443256414283dd25d91c1cd84c77987f2aec5927af1a9db6085757cb43d90eb170ebf4b47f4f4
   languageName: node
   linkType: hard
 
 "merge2@npm:^1.2.3, merge2@npm:^1.3.0, merge2@npm:^1.4.1":
   version: 1.4.1
   resolution: "merge2@npm:1.4.1"
-  checksum: 7268db63ed5169466540b6fb947aec313200bcf6d40c5ab722c22e242f651994619bcd85601602972d3c85bd2cc45a358a4c61937e9f11a061919a1da569b0c2
+  checksum: 10/7268db63ed5169466540b6fb947aec313200bcf6d40c5ab722c22e242f651994619bcd85601602972d3c85bd2cc45a358a4c61937e9f11a061919a1da569b0c2
   languageName: node
   linkType: hard
 
 "methods@npm:~1.1.2":
   version: 1.1.2
   resolution: "methods@npm:1.1.2"
-  checksum: 0917ff4041fa8e2f2fda5425a955fe16ca411591fbd123c0d722fcf02b73971ed6f764d85f0a6f547ce49ee0221ce2c19a5fa692157931cecb422984f1dcd13a
+  checksum: 10/a385dd974faa34b5dd021b2bbf78c722881bf6f003bfe6d391d7da3ea1ed625d1ff10ddd13c57531f628b3e785be38d3eed10ad03cebd90b76932413df9a1820
   languageName: node
   linkType: hard
 
 "micro-memoize@npm:^4.1.2":
   version: 4.1.2
   resolution: "micro-memoize@npm:4.1.2"
-  checksum: 4b02750622d44b5ab31573c629b5d91927dd0c2727743ff75e790c223ab6cd02c48cc3bddea69da0dffb688091a0a71a17944947dd165f8ba9e03728bc30a76d
+  checksum: 10/027e90c3147c97c07224440ea50ede27eb7d888149e4925820397b466d16efc525f5ec3981e4cadec3258a8d36dfd5e7e7c8e660879fbe2e47106785be9bc570
   languageName: node
   linkType: hard
 
@@ -21886,16 +23195,16 @@ __metadata:
   version: 4.0.5
   resolution: "micromatch@npm:4.0.5"
   dependencies:
-    braces: ^3.0.2
-    picomatch: ^2.3.1
-  checksum: 02a17b671c06e8fefeeb6ef996119c1e597c942e632a21ef589154f23898c9c6a9858526246abb14f8bca6e77734aa9dcf65476fca47cedfb80d9577d52843fc
+    braces: "npm:^3.0.2"
+    picomatch: "npm:^2.3.1"
+  checksum: 10/a749888789fc15cac0e03273844dbd749f9f8e8d64e70c564bcf06a033129554c789bb9e30d7566d7ff6596611a08e58ac12cf2a05f6e3c9c47c50c4c7e12fa2
   languageName: node
   linkType: hard
 
 "mime-db@npm:1.52.0, mime-db@npm:>= 1.43.0 < 2":
   version: 1.52.0
   resolution: "mime-db@npm:1.52.0"
-  checksum: 0d99a03585f8b39d68182803b12ac601d9c01abfa28ec56204fa330bc9f3d1c5e14beb049bafadb3dbdf646dfb94b87e24d4ec7b31b7279ef906a8ea9b6a513f
+  checksum: 10/54bb60bf39e6f8689f6622784e668a3d7f8bed6b0d886f5c3c446cb3284be28b30bf707ed05d0fe44a036f8469976b2629bbea182684977b084de9da274694d7
   languageName: node
   linkType: hard
 
@@ -21903,8 +23212,8 @@ __metadata:
   version: 2.1.35
   resolution: "mime-types@npm:2.1.35"
   dependencies:
-    mime-db: 1.52.0
-  checksum: 89a5b7f1def9f3af5dad6496c5ed50191ae4331cc5389d7c521c8ad28d5fdad2d06fd81baf38fed813dc4e46bb55c8145bb0ff406330818c9cf712fb2e9b3836
+    mime-db: "npm:1.52.0"
+  checksum: 10/89aa9651b67644035de2784a6e665fc685d79aba61857e02b9c8758da874a754aed4a9aced9265f5ed1171fd934331e5516b84a7f0218031b6fa0270eca1e51a
   languageName: node
   linkType: hard
 
@@ -21913,30 +23222,30 @@ __metadata:
   resolution: "mime@npm:1.6.0"
   bin:
     mime: cli.js
-  checksum: fef25e39263e6d207580bdc629f8872a3f9772c923c7f8c7e793175cee22777bbe8bba95e5d509a40aaa292d8974514ce634ae35769faa45f22d17edda5e8557
+  checksum: 10/b7d98bb1e006c0e63e2c91b590fe1163b872abf8f7ef224d53dd31499c2197278a6d3d0864c45239b1a93d22feaf6f9477e9fc847eef945838150b8c02d03170
   languageName: node
   linkType: hard
 
-"mime@npm:^2.0.3, mime@npm:^2.3.1":
+"mime@npm:^2.0.3":
   version: 2.6.0
   resolution: "mime@npm:2.6.0"
   bin:
     mime: cli.js
-  checksum: 1497ba7b9f6960694268a557eae24b743fd2923da46ec392b042469f4b901721ba0adcf8b0d3c2677839d0e243b209d76e5edcbd09cfdeffa2dfb6bb4df4b862
+  checksum: 10/7da117808b5cd0203bb1b5e33445c330fe213f4d8ee2402a84d62adbde9716ca4fb90dd6d9ab4e77a4128c6c5c24a9c4c9f6a4d720b095b1b342132d02dba58d
   languageName: node
   linkType: hard
 
 "mimic-fn@npm:^2.1.0":
   version: 2.1.0
   resolution: "mimic-fn@npm:2.1.0"
-  checksum: d2421a3444848ce7f84bd49115ddacff29c15745db73f54041edc906c14b131a38d05298dae3081667627a59b2eb1ca4b436ff2e1b80f69679522410418b478a
+  checksum: 10/d2421a3444848ce7f84bd49115ddacff29c15745db73f54041edc906c14b131a38d05298dae3081667627a59b2eb1ca4b436ff2e1b80f69679522410418b478a
   languageName: node
   linkType: hard
 
-"min-indent@npm:^1.0.0, min-indent@npm:^1.0.1":
+"min-indent@npm:^1.0.0":
   version: 1.0.1
   resolution: "min-indent@npm:1.0.1"
-  checksum: bfc6dd03c5eaf623a4963ebd94d087f6f4bbbfd8c41329a7f09706b0cb66969c4ddd336abeb587bc44bc6f08e13bf90f0b374f9d71f9f01e04adc2cd6f083ef1
+  checksum: 10/bfc6dd03c5eaf623a4963ebd94d087f6f4bbbfd8c41329a7f09706b0cb66969c4ddd336abeb587bc44bc6f08e13bf90f0b374f9d71f9f01e04adc2cd6f083ef1
   languageName: node
   linkType: hard
 
@@ -21944,30 +23253,40 @@ __metadata:
   version: 0.4.1
   resolution: "mini-create-react-context@npm:0.4.1"
   dependencies:
-    "@babel/runtime": ^7.12.1
-    tiny-warning: ^1.0.3
+    "@babel/runtime": "npm:^7.12.1"
+    tiny-warning: "npm:^1.0.3"
   peerDependencies:
     prop-types: ^15.0.0
     react: ^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-  checksum: f8cb2c7738aac355fe9ce7e8425f371b7fa90daddd5133edda4ccfdc18c49043b2ec04be6f3abf09b60a0f52549d54f158d5bfd81cdfb1a658531e5b9fe7bc6a
+  checksum: 10/c816c785b7dccd67fdfa6a5edc673363b11845b6abca8a9d9f3ffa74520266d979b56f5db0dfc62ed912a90553c15be28c816311fc9c7856ab66a81d461d50e6
   languageName: node
   linkType: hard
 
-"mini-css-extract-plugin@npm:2.7.6":
-  version: 2.7.6
-  resolution: "mini-css-extract-plugin@npm:2.7.6"
+"mini-css-extract-plugin@npm:2.8.1":
+  version: 2.8.1
+  resolution: "mini-css-extract-plugin@npm:2.8.1"
   dependencies:
-    schema-utils: ^4.0.0
+    schema-utils: "npm:^4.0.0"
+    tapable: "npm:^2.2.1"
   peerDependencies:
     webpack: ^5.0.0
-  checksum: be6f7cefc6275168eb0a6b8fe977083a18c743c9612c9f00e6c1a62c3393ca7960e93fba1a7ebb09b75f36a0204ad087d772c1ef574bc29c90c0e8175a3c0b83
+  checksum: 10/e00f6d19ad1be94701db8e5f126bdf8a9f4739cd8e8eb68690254aac4699c49c872a1ca761461d7d0c37a933f823df5f87674688fe0d568e00e7c0e9d6e5c798
+  languageName: node
+  linkType: hard
+
+"mini-svg-data-uri@npm:^1.4.4":
+  version: 1.4.4
+  resolution: "mini-svg-data-uri@npm:1.4.4"
+  bin:
+    mini-svg-data-uri: cli.js
+  checksum: 10/1336c2b00b6a72b0ce3cf942f7ab074faf463b941042fbe51d7a70be119c5d4223880aaa29584d5a804496ca1dda9b6fff7dd5aa284721907519b646192d8aaa
   languageName: node
   linkType: hard
 
 "minimalistic-assert@npm:^1.0.0":
   version: 1.0.1
   resolution: "minimalistic-assert@npm:1.0.1"
-  checksum: cc7974a9268fbf130fb055aff76700d7e2d8be5f761fb5c60318d0ed010d839ab3661a533ad29a5d37653133385204c503bfac995aaa4236f4e847461ea32ba7
+  checksum: 10/cc7974a9268fbf130fb055aff76700d7e2d8be5f761fb5c60318d0ed010d839ab3661a533ad29a5d37653133385204c503bfac995aaa4236f4e847461ea32ba7
   languageName: node
   linkType: hard
 
@@ -21975,8 +23294,8 @@ __metadata:
   version: 3.0.5
   resolution: "minimatch@npm:3.0.5"
   dependencies:
-    brace-expansion: ^1.1.7
-  checksum: a3b84b426eafca947741b864502cee02860c4e7b145de11ad98775cfcf3066fef422583bc0ffce0952ddf4750c1ccf4220b1556430d4ce10139f66247d87d69e
+    brace-expansion: "npm:^1.1.7"
+  checksum: 10/8f9707491183a07a9542b8cf45aacb3745ba9fe6c611173fb225d7bf191e55416779aee31e17673a516a178af02d8d3d71ddd36ae3d5cc2495f627977ad1a012
   languageName: node
   linkType: hard
 
@@ -21984,8 +23303,17 @@ __metadata:
   version: 5.0.1
   resolution: "minimatch@npm:5.0.1"
   dependencies:
-    brace-expansion: ^2.0.1
-  checksum: b34b98463da4754bc526b244d680c69d4d6089451ebe512edaf6dd9eeed0279399cfa3edb19233513b8f830bf4bfcad911dddcdf125e75074100d52f724774f0
+    brace-expansion: "npm:^2.0.1"
+  checksum: 10/2656580f18d9f38ada186196fcc72dc9076d70f7227adc664e72614d464e075dc4ae3936e6742519e09e336996ef33c6035e606888b12f65ca7fda792ddd2085
+  languageName: node
+  linkType: hard
+
+"minimatch@npm:9.0.3, minimatch@npm:^9.0.0, minimatch@npm:^9.0.1, minimatch@npm:^9.0.3":
+  version: 9.0.3
+  resolution: "minimatch@npm:9.0.3"
+  dependencies:
+    brace-expansion: "npm:^2.0.1"
+  checksum: 10/c81b47d28153e77521877649f4bab48348d10938df9e8147a58111fe00ef89559a2938de9f6632910c4f7bf7bb5cd81191a546167e58d357f0cfb1e18cecc1c5
   languageName: node
   linkType: hard
 
@@ -21993,17 +23321,17 @@ __metadata:
   version: 3.1.2
   resolution: "minimatch@npm:3.1.2"
   dependencies:
-    brace-expansion: ^1.1.7
-  checksum: c154e566406683e7bcb746e000b84d74465b3a832c45d59912b9b55cd50dee66e5c4b1e5566dba26154040e51672f9aa450a9aef0c97cfc7336b78b7afb9540a
+    brace-expansion: "npm:^1.1.7"
+  checksum: 10/e0b25b04cd4ec6732830344e5739b13f8690f8a012d73445a4a19fbc623f5dd481ef7a5827fde25954cd6026fede7574cc54dc4643c99d6c6b653d6203f94634
   languageName: node
   linkType: hard
 
-"minimatch@npm:^9.0.1":
-  version: 9.0.1
-  resolution: "minimatch@npm:9.0.1"
+"minimatch@npm:^8.0.2":
+  version: 8.0.4
+  resolution: "minimatch@npm:8.0.4"
   dependencies:
-    brace-expansion: ^2.0.1
-  checksum: 97f5f5284bb57dc65b9415dec7f17a0f6531a33572193991c60ff18450dcfad5c2dad24ffeaf60b5261dccd63aae58cc3306e2209d57e7f88c51295a532d8ec3
+    brace-expansion: "npm:^2.0.1"
+  checksum: 10/aef05598ee565e1013bc8a10f53410ac681561f901c1a084b8ecfd016c9ed919f58f4bbd5b63e05643189dfb26e8106a84f0e1ff12e4a263aa37e1cae7ce9828
   languageName: node
   linkType: hard
 
@@ -22011,17 +23339,17 @@ __metadata:
   version: 4.1.0
   resolution: "minimist-options@npm:4.1.0"
   dependencies:
-    arrify: ^1.0.1
-    is-plain-obj: ^1.1.0
-    kind-of: ^6.0.3
-  checksum: 8c040b3068811e79de1140ca2b708d3e203c8003eb9a414c1ab3cd467fc5f17c9ca02a5aef23bedc51a7f8bfbe77f87e9a7e31ec81fba304cda675b019496f4e
+    arrify: "npm:^1.0.1"
+    is-plain-obj: "npm:^1.1.0"
+    kind-of: "npm:^6.0.3"
+  checksum: 10/8c040b3068811e79de1140ca2b708d3e203c8003eb9a414c1ab3cd467fc5f17c9ca02a5aef23bedc51a7f8bfbe77f87e9a7e31ec81fba304cda675b019496f4e
   languageName: node
   linkType: hard
 
-"minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.7, minimist@npm:^1.2.8":
+"minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.8":
   version: 1.2.8
   resolution: "minimist@npm:1.2.8"
-  checksum: 75a6d645fb122dad29c06a7597bddea977258957ed88d7a6df59b5cd3fe4a527e253e9bbf2e783e4b73657f9098b96a5fe96ab8a113655d4109108577ecf85b0
+  checksum: 10/908491b6cc15a6c440ba5b22780a0ba89b9810e1aea684e253e43c4e3b8d56ec1dcdd7ea96dde119c29df59c936cde16062159eae4225c691e19c70b432b6e6f
   languageName: node
   linkType: hard
 
@@ -22029,8 +23357,17 @@ __metadata:
   version: 1.0.2
   resolution: "minipass-collect@npm:1.0.2"
   dependencies:
-    minipass: ^3.0.0
-  checksum: 14df761028f3e47293aee72888f2657695ec66bd7d09cae7ad558da30415fdc4752bbfee66287dcc6fd5e6a2fa3466d6c484dc1cbd986525d9393b9523d97f10
+    minipass: "npm:^3.0.0"
+  checksum: 10/14df761028f3e47293aee72888f2657695ec66bd7d09cae7ad558da30415fdc4752bbfee66287dcc6fd5e6a2fa3466d6c484dc1cbd986525d9393b9523d97f10
+  languageName: node
+  linkType: hard
+
+"minipass-collect@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "minipass-collect@npm:2.0.1"
+  dependencies:
+    minipass: "npm:^7.0.3"
+  checksum: 10/b251bceea62090f67a6cced7a446a36f4cd61ee2d5cea9aee7fff79ba8030e416327a1c5aa2908dc22629d06214b46d88fdab8c51ac76bacbf5703851b5ad342
   languageName: node
   linkType: hard
 
@@ -22038,29 +23375,29 @@ __metadata:
   version: 1.4.1
   resolution: "minipass-fetch@npm:1.4.1"
   dependencies:
-    encoding: ^0.1.12
-    minipass: ^3.1.0
-    minipass-sized: ^1.0.3
-    minizlib: ^2.0.0
+    encoding: "npm:^0.1.12"
+    minipass: "npm:^3.1.0"
+    minipass-sized: "npm:^1.0.3"
+    minizlib: "npm:^2.0.0"
   dependenciesMeta:
     encoding:
       optional: true
-  checksum: ec93697bdb62129c4e6c0104138e681e30efef8c15d9429dd172f776f83898471bc76521b539ff913248cc2aa6d2b37b652c993504a51cc53282563640f29216
+  checksum: 10/4c6f678d2c976c275ba35735aa18e341401d1fb94bbf38a36bb2c2d01835ac699f15b7ab1adaf4ee40a751361527d312a18853feaf9c0121f4904f811656575a
   languageName: node
   linkType: hard
 
-"minipass-fetch@npm:^2.0.3":
-  version: 2.1.0
-  resolution: "minipass-fetch@npm:2.1.0"
+"minipass-fetch@npm:^3.0.0":
+  version: 3.0.4
+  resolution: "minipass-fetch@npm:3.0.4"
   dependencies:
-    encoding: ^0.1.13
-    minipass: ^3.1.6
-    minipass-sized: ^1.0.3
-    minizlib: ^2.1.2
+    encoding: "npm:^0.1.13"
+    minipass: "npm:^7.0.3"
+    minipass-sized: "npm:^1.0.3"
+    minizlib: "npm:^2.1.2"
   dependenciesMeta:
     encoding:
       optional: true
-  checksum: 1334732859a3f7959ed22589bafd9c40384b885aebb5932328071c33f86b3eb181d54c86919675d1825ab5f1c8e4f328878c863873258d113c29d79a4b0c9c9f
+  checksum: 10/3edf72b900e30598567eafe96c30374432a8709e61bb06b87198fa3192d466777e2ec21c52985a0999044fa6567bd6f04651585983a1cbb27e2c1770a07ed2a2
   languageName: node
   linkType: hard
 
@@ -22068,8 +23405,8 @@ __metadata:
   version: 1.0.5
   resolution: "minipass-flush@npm:1.0.5"
   dependencies:
-    minipass: ^3.0.0
-  checksum: 56269a0b22bad756a08a94b1ffc36b7c9c5de0735a4dd1ab2b06c066d795cfd1f0ac44a0fcae13eece5589b908ecddc867f04c745c7009be0b566421ea0944cf
+    minipass: "npm:^3.0.0"
+  checksum: 10/56269a0b22bad756a08a94b1ffc36b7c9c5de0735a4dd1ab2b06c066d795cfd1f0ac44a0fcae13eece5589b908ecddc867f04c745c7009be0b566421ea0944cf
   languageName: node
   linkType: hard
 
@@ -22077,9 +23414,9 @@ __metadata:
   version: 1.0.1
   resolution: "minipass-json-stream@npm:1.0.1"
   dependencies:
-    jsonparse: ^1.3.1
-    minipass: ^3.0.0
-  checksum: 791b696a27d1074c4c08dab1bf5a9f3201145c2933e428f45d880467bce12c60de4703203d2928de4b162d0ae77b0bb4b55f96cb846645800aa0eb4919b3e796
+    jsonparse: "npm:^1.3.1"
+    minipass: "npm:^3.0.0"
+  checksum: 10/3c65482c630b063c3fa86c853f324a50d9484f2eb6c3034f9c86c0b22f44181668848088f2c869cc764f8a9b8adc8f617f93762cd9d11521f563b8a71c5b815d
   languageName: node
   linkType: hard
 
@@ -22087,8 +23424,8 @@ __metadata:
   version: 1.2.4
   resolution: "minipass-pipeline@npm:1.2.4"
   dependencies:
-    minipass: ^3.0.0
-  checksum: b14240dac0d29823c3d5911c286069e36d0b81173d7bdf07a7e4a91ecdef92cdff4baaf31ea3746f1c61e0957f652e641223970870e2353593f382112257971b
+    minipass: "npm:^3.0.0"
+  checksum: 10/b14240dac0d29823c3d5911c286069e36d0b81173d7bdf07a7e4a91ecdef92cdff4baaf31ea3746f1c61e0957f652e641223970870e2353593f382112257971b
   languageName: node
   linkType: hard
 
@@ -22096,31 +23433,38 @@ __metadata:
   version: 1.0.3
   resolution: "minipass-sized@npm:1.0.3"
   dependencies:
-    minipass: ^3.0.0
-  checksum: 79076749fcacf21b5d16dd596d32c3b6bf4d6e62abb43868fac21674078505c8b15eaca4e47ed844985a4514854f917d78f588fcd029693709417d8f98b2bd60
+    minipass: "npm:^3.0.0"
+  checksum: 10/40982d8d836a52b0f37049a0a7e5d0f089637298e6d9b45df9c115d4f0520682a78258905e5c8b180fb41b593b0a82cc1361d2c74b45f7ada66334f84d1ecfdd
   languageName: node
   linkType: hard
 
-"minipass@npm:^3.0.0, minipass@npm:^3.1.0, minipass@npm:^3.1.1, minipass@npm:^3.1.3, minipass@npm:^3.1.6":
+"minipass@npm:^3.0.0, minipass@npm:^3.1.0, minipass@npm:^3.1.1, minipass@npm:^3.1.3":
   version: 3.3.4
   resolution: "minipass@npm:3.3.4"
   dependencies:
-    yallist: ^4.0.0
-  checksum: 5d95a7738c54852ba78d484141e850c792e062666a2d0c681a5ac1021275beb7e1acb077e59f9523ff1defb80901aea4e30fac10ded9a20a25d819a42916ef1b
+    yallist: "npm:^4.0.0"
+  checksum: 10/70a12e3d3e6b8bd1c25bce2604a754cb30cadca34b32ed3e9721e83ccb3854744d2cee674afdc96e8e0df90201aa56ab39dce319f2adf28159271d5587c10377
   languageName: node
   linkType: hard
 
-"minipass@npm:^4.0.0":
-  version: 4.2.5
-  resolution: "minipass@npm:4.2.5"
-  checksum: 4f9c19af23a5d4a9e7156feefc9110634b178a8cff8f8271af16ec5ebf7e221725a97429952c856f5b17b30c2065ebd24c81722d90c93d2122611d75b952b48f
+"minipass@npm:^4.0.0, minipass@npm:^4.2.4":
+  version: 4.2.8
+  resolution: "minipass@npm:4.2.8"
+  checksum: 10/e148eb6dcb85c980234cad889139ef8ddf9d5bdac534f4f0268446c8792dd4c74f4502479be48de3c1cce2f6450f6da4d0d4a86405a8a12be04c1c36b339569a
   languageName: node
   linkType: hard
 
-"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0":
-  version: 7.0.2
-  resolution: "minipass@npm:7.0.2"
-  checksum: 46776de732eb7cef2c7404a15fb28c41f5c54a22be50d47b03c605bf21f5c18d61a173c0a20b49a97e7a65f78d887245066410642551e45fffe04e9ac9e325bc
+"minipass@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "minipass@npm:5.0.0"
+  checksum: 10/61682162d29f45d3152b78b08bab7fb32ca10899bc5991ffe98afc18c9e9543bd1e3be94f8b8373ba6262497db63607079dc242ea62e43e7b2270837b7347c93
+  languageName: node
+  linkType: hard
+
+"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.0.4":
+  version: 7.0.4
+  resolution: "minipass@npm:7.0.4"
+  checksum: 10/e864bd02ceb5e0707696d58f7ce3a0b89233f0d686ef0d447a66db705c0846a8dc6f34865cd85256c1472ff623665f616b90b8ff58058b2ad996c5de747d2d18
   languageName: node
   linkType: hard
 
@@ -22128,27 +23472,16 @@ __metadata:
   version: 2.1.2
   resolution: "minizlib@npm:2.1.2"
   dependencies:
-    minipass: ^3.0.0
-    yallist: ^4.0.0
-  checksum: f1fdeac0b07cf8f30fcf12f4b586795b97be856edea22b5e9072707be51fc95d41487faec3f265b42973a304fe3a64acd91a44a3826a963e37b37bafde0212c3
+    minipass: "npm:^3.0.0"
+    yallist: "npm:^4.0.0"
+  checksum: 10/ae0f45436fb51344dcb87938446a32fbebb540d0e191d63b35e1c773d47512e17307bf54aa88326cc6d176594d00e4423563a091f7266c2f9a6872cdc1e234d1
   languageName: node
   linkType: hard
 
 "mkdirp-classic@npm:^0.5.2":
   version: 0.5.3
   resolution: "mkdirp-classic@npm:0.5.3"
-  checksum: 3f4e088208270bbcc148d53b73e9a5bd9eef05ad2cbf3b3d0ff8795278d50dd1d11a8ef1875ff5aea3fa888931f95bfcb2ad5b7c1061cfefd6284d199e6776ac
-  languageName: node
-  linkType: hard
-
-"mkdirp-infer-owner@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "mkdirp-infer-owner@npm:2.0.0"
-  dependencies:
-    chownr: ^2.0.0
-    infer-owner: ^1.0.4
-    mkdirp: ^1.0.3
-  checksum: d8f4ecd32f6762459d6b5714eae6487c67ae9734ab14e26d14377ddd9b2a1bf868d8baa18c0f3e73d3d513f53ec7a698e0f81a9367102c870a55bef7833880f7
+  checksum: 10/3f4e088208270bbcc148d53b73e9a5bd9eef05ad2cbf3b3d0ff8795278d50dd1d11a8ef1875ff5aea3fa888931f95bfcb2ad5b7c1061cfefd6284d199e6776ac
   languageName: node
   linkType: hard
 
@@ -22156,10 +23489,10 @@ __metadata:
   version: 0.5.6
   resolution: "mkdirp@npm:0.5.6"
   dependencies:
-    minimist: ^1.2.6
+    minimist: "npm:^1.2.6"
   bin:
     mkdirp: bin/cmd.js
-  checksum: 0c91b721bb12c3f9af4b77ebf73604baf350e64d80df91754dc509491ae93bf238581e59c7188360cec7cb62fc4100959245a42cfe01834efedc5e9d068376c2
+  checksum: 10/0c91b721bb12c3f9af4b77ebf73604baf350e64d80df91754dc509491ae93bf238581e59c7188360cec7cb62fc4100959245a42cfe01834efedc5e9d068376c2
   languageName: node
   linkType: hard
 
@@ -22168,14 +23501,84 @@ __metadata:
   resolution: "mkdirp@npm:1.0.4"
   bin:
     mkdirp: bin/cmd.js
-  checksum: a96865108c6c3b1b8e1d5e9f11843de1e077e57737602de1b82030815f311be11f96f09cce59bd5b903d0b29834733e5313f9301e3ed6d6f6fba2eae0df4298f
+  checksum: 10/d71b8dcd4b5af2fe13ecf3bd24070263489404fe216488c5ba7e38ece1f54daf219e72a833a3a2dc404331e870e9f44963a33399589490956bff003a3404d3b2
   languageName: node
   linkType: hard
 
 "mktemp@npm:~0.4.0":
   version: 0.4.0
   resolution: "mktemp@npm:0.4.0"
-  checksum: f67d8b1ed599807a4ec154efc6a50d61b28f4183fa740c4fe3bd75ce8442d84a3b8fca382fb3cb4e20bb883cb14478a7fe549c4eab6135cd213163ca5083f0fe
+  checksum: 10/0d7d4f20befa690bf7ba2f702f81f98b23b4124f19183048752a6ad33a07b5a16e69346245b8e683c70778e8135161ef14e5720b17fdf0b4b4ebd242a6bf2798
+  languageName: node
+  linkType: hard
+
+"ml-array-max@npm:^1.2.4":
+  version: 1.2.4
+  resolution: "ml-array-max@npm:1.2.4"
+  dependencies:
+    is-any-array: "npm:^2.0.0"
+  checksum: 10/d62689d349c825a36dae212ee109a7f81f2a3c1136cb79f50a90e6c48ae5acc78dacb1334864bfd9abf6f09b78ce6a68e2455b1259b775b3b05556362fbf8470
+  languageName: node
+  linkType: hard
+
+"ml-array-min@npm:^1.2.3":
+  version: 1.2.3
+  resolution: "ml-array-min@npm:1.2.3"
+  dependencies:
+    is-any-array: "npm:^2.0.0"
+  checksum: 10/bc6e0c69f20eb2b35c2c8d3a59f8c6289462683084e8fa50344ae4db3214b8b30854f96a8eaf22df510752c3065d3337cd996f98a80a95b47a88b38369beeb5b
+  languageName: node
+  linkType: hard
+
+"ml-array-rescale@npm:^1.3.7":
+  version: 1.3.7
+  resolution: "ml-array-rescale@npm:1.3.7"
+  dependencies:
+    is-any-array: "npm:^2.0.0"
+    ml-array-max: "npm:^1.2.4"
+    ml-array-min: "npm:^1.2.3"
+  checksum: 10/2f9883388ebb6c921c648a1cdcf1d853a35dff5f30e7204e142511abcafe05f40c1c1543232503aeff4ecdb3f57e958e7de8d070b973af3be7bfd27381b30528
+  languageName: node
+  linkType: hard
+
+"ml-matrix@npm:^6.10.5":
+  version: 6.10.8
+  resolution: "ml-matrix@npm:6.10.8"
+  dependencies:
+    is-any-array: "npm:^2.0.1"
+    ml-array-rescale: "npm:^1.3.7"
+  checksum: 10/a13909330f119dffb5538b08036a635895f87e12b25e3a23b0662e7333cfbb50425cea8fca55b03cd3eb8eeaa2509a2c84e0c26a0ca89c718f97f4234e2008b4
+  languageName: node
+  linkType: hard
+
+"ml-regression-base@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "ml-regression-base@npm:3.0.0"
+  dependencies:
+    cheminfo-types: "npm:^1.7.2"
+    is-any-array: "npm:^2.0.1"
+  checksum: 10/b737d4f70d6058efee607ab36a56cc92199111f6ea021e6290158792ee3f410c12b77d5dabfe6ccd55d02f5b6b072b83066a6e5cba909d4c91b85050ac15b491
+  languageName: node
+  linkType: hard
+
+"ml-regression-polynomial@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "ml-regression-polynomial@npm:3.0.0"
+  dependencies:
+    cheminfo-types: "npm:^1.7.2"
+    ml-matrix: "npm:^6.10.5"
+    ml-regression-base: "npm:^3.0.0"
+  checksum: 10/e5d3ee187d6f35e4e3b2191f52d7dc63a61f0b975cf2012ed20403420d6a65ae2ad7d51f80896daf778b39bdbd56d7fa9d4c17aac96a1669acea3fbd2a0a31d7
+  languageName: node
+  linkType: hard
+
+"ml-regression-simple-linear@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "ml-regression-simple-linear@npm:3.0.0"
+  dependencies:
+    cheminfo-types: "npm:^1.7.2"
+    ml-regression-base: "npm:^3.0.0"
+  checksum: 10/2e4650026bb793455788f31de79bd25f5325e97580f20af848c4c8af4d1f1e1d3b04fbdb0f1677071727da3ffe4a34c5d0e4a0533ad81050441b5e0d745bdc57
   languageName: node
   linkType: hard
 
@@ -22183,31 +23586,31 @@ __metadata:
   version: 10.2.0
   resolution: "mocha@npm:10.2.0"
   dependencies:
-    ansi-colors: 4.1.1
-    browser-stdout: 1.3.1
-    chokidar: 3.5.3
-    debug: 4.3.4
-    diff: 5.0.0
-    escape-string-regexp: 4.0.0
-    find-up: 5.0.0
-    glob: 7.2.0
-    he: 1.2.0
-    js-yaml: 4.1.0
-    log-symbols: 4.1.0
-    minimatch: 5.0.1
-    ms: 2.1.3
-    nanoid: 3.3.3
-    serialize-javascript: 6.0.0
-    strip-json-comments: 3.1.1
-    supports-color: 8.1.1
-    workerpool: 6.2.1
-    yargs: 16.2.0
-    yargs-parser: 20.2.4
-    yargs-unparser: 2.0.0
+    ansi-colors: "npm:4.1.1"
+    browser-stdout: "npm:1.3.1"
+    chokidar: "npm:3.5.3"
+    debug: "npm:4.3.4"
+    diff: "npm:5.0.0"
+    escape-string-regexp: "npm:4.0.0"
+    find-up: "npm:5.0.0"
+    glob: "npm:7.2.0"
+    he: "npm:1.2.0"
+    js-yaml: "npm:4.1.0"
+    log-symbols: "npm:4.1.0"
+    minimatch: "npm:5.0.1"
+    ms: "npm:2.1.3"
+    nanoid: "npm:3.3.3"
+    serialize-javascript: "npm:6.0.0"
+    strip-json-comments: "npm:3.1.1"
+    supports-color: "npm:8.1.1"
+    workerpool: "npm:6.2.1"
+    yargs: "npm:16.2.0"
+    yargs-parser: "npm:20.2.4"
+    yargs-unparser: "npm:2.0.0"
   bin:
     _mocha: bin/_mocha
     mocha: bin/mocha.js
-  checksum: 406c45eab122ffd6ea2003c2f108b2bc35ba036225eee78e0c784b6fa2c7f34e2b13f1dbacef55a4fdf523255d76e4f22d1b5aacda2394bd11666febec17c719
+  checksum: 10/f7362898ae65e8fe716cfe62fd014b432d100c9611aaf5abe85ed14efcbfdd82f3bdf32c44bccf00c9059a264c7e8d93a69dd5b830652109052a92beffb7ea35
   languageName: node
   linkType: hard
 
@@ -22215,45 +23618,45 @@ __metadata:
   version: 1.0.1
   resolution: "mock-raf@npm:1.0.1"
   dependencies:
-    object-assign: ^3.0.0
-  checksum: f57ae86151520ef4a86171a437f9e9a9a7a7f6f463ab2beae91ebfe31aa17b97357d9f0a867240a7fb35603af9a08c01351e4ec4bcc6c7d3900c3423e8d7f0c9
+    object-assign: "npm:^3.0.0"
+  checksum: 10/d7db37842fc2f29b1483f1bbc5c62b60819bbca0c44360ab7ecead2334e7bc1f24dcf122ed61eac7ddff1d5eaeb20e08f1841bbc042fc16f177685c884993407
   languageName: node
   linkType: hard
 
-"modify-values@npm:^1.0.0":
+"modify-values@npm:^1.0.1":
   version: 1.0.1
   resolution: "modify-values@npm:1.0.1"
-  checksum: 8296610c608bc97b03c2cf889c6cdf4517e32fa2d836440096374c2209f6b7b3e256c209493a0b32584b9cb32d528e99d0dd19dcd9a14d2d915a312d391cc7e9
+  checksum: 10/16fa93f7ddb2540a8e82c99738ae4ed0e8e8cae57c96e13a0db9d68dfad074fd2eec542929b62ebbb18b357bbb3e4680b92d3a4099baa7aeb32360cb1c8f0247
   languageName: node
   linkType: hard
 
-"moment-timezone@npm:0.5.43":
-  version: 0.5.43
-  resolution: "moment-timezone@npm:0.5.43"
+"moment-timezone@npm:0.5.45":
+  version: 0.5.45
+  resolution: "moment-timezone@npm:0.5.45"
   dependencies:
-    moment: ^2.29.4
-  checksum: 8075c897ed8a044f992ef26fe8cdbcad80caf974251db424cae157473cca03be2830de8c74d99341b76edae59f148c9d9d19c1c1d9363259085688ec1cf508d0
+    moment: "npm:^2.29.4"
+  checksum: 10/45e3793d44bea8e826c934a335ebf0b92c6d6dae562fdb59d8c45a16d5c11de4d6692b5fa7eebca969881f06b81b55f8535883bfbc727b597d601709fa5a2bb2
   languageName: node
   linkType: hard
 
-"moment@npm:2.29.4, moment@npm:2.x, moment@npm:^2.20.1, moment@npm:^2.29.4":
-  version: 2.29.4
-  resolution: "moment@npm:2.29.4"
-  checksum: 0ec3f9c2bcba38dc2451b1daed5daded747f17610b92427bebe1d08d48d8b7bdd8d9197500b072d14e326dd0ccf3e326b9e3d07c5895d3d49e39b6803b76e80e
+"moment@npm:2.30.1, moment@npm:2.x, moment@npm:^2.20.1, moment@npm:^2.29.4":
+  version: 2.30.1
+  resolution: "moment@npm:2.30.1"
+  checksum: 10/ae42d876d4ec831ef66110bdc302c0657c664991e45cf2afffc4b0f6cd6d251dde11375c982a5c0564ccc0fa593fc564576ddceb8c8845e87c15f58aa6baca69
   languageName: node
   linkType: hard
 
 "monaco-editor@npm:0.34.0":
   version: 0.34.0
   resolution: "monaco-editor@npm:0.34.0"
-  checksum: 10a28c1fe07268a23106ec9b743339af603e00c3ce646de72bf74f77e3d44065536f1a11f1a86ed459dfd9cb891261e6c7974377fc511eb65f354d6ddc89275b
+  checksum: 10/c7c2c88bc8f83817e67ab55d84a4469af7f5f566cc3df1c27bdd00ad2071b88688b23847608e8c948a445afa543929b7bcd9b5ff5b7b53da15f6f2b628eb76ac
   languageName: node
   linkType: hard
 
 "monaco-promql@npm:1.7.4":
   version: 1.7.4
   resolution: "monaco-promql@npm:1.7.4"
-  checksum: 9fe2708be5ad7df32603cddbc86be96643ed7de341031c4c822386d8013d5747c87928eb5f124160ad9a26216cf9f12b40c61cb4b6ff5a5f9a6fc8e1729c16aa
+  checksum: 10/5bafbc3c1f00da27fd637ebc5ff106e96951ebf688b99b8ad7c447fee1d3298c3873369914c599aec836fa019ea3b8b93ce3b02157d0666d394b06b8a55e728c
   languageName: node
   linkType: hard
 
@@ -22261,8 +23664,8 @@ __metadata:
   version: 1.0.2
   resolution: "moo-color@npm:1.0.2"
   dependencies:
-    color-name: ^1.1.4
-  checksum: 9425438cf14314ff8847fa911b3c6936cbe8550644c380733c4803719c3980a0de9324c70c3bc21c36b4aab3c181745774cc0efc4d3f5bfce009382eeeb89572
+    color-name: "npm:^1.1.4"
+  checksum: 10/6dced73bfb3048d2a60e4c7e2a5c414c4e7877dac54283168715a891525819109141b40bd9a7fd28f878802b4e166bd0452be926bfb6c0ab95bf9ee2b84e1b3d
   languageName: node
   linkType: hard
 
@@ -22271,160 +23674,166 @@ __metadata:
   resolution: "mousetrap-global-bind@npm:1.1.0"
   peerDependencies:
     mousetrap: ^1.6.0
-  checksum: 41573d7bc2011801b90500b8c3f28cda7e0509e47959f1467933021314c16628aa734f29ac020695f996df89f1e410b58cf95203bb976e3a04e21f06d47f4016
+  checksum: 10/e7ca7cdfe8f5b4dab357ec7f28361b7e686bd43b97e69ab302e65ad53c4864f3e4c7856651f64539fd352a36d63b5863d715d756c3eea68c9c70e2433221f6b3
   languageName: node
   linkType: hard
 
 "mousetrap@npm:1.6.5":
   version: 1.6.5
   resolution: "mousetrap@npm:1.6.5"
-  checksum: 1ce36af5ac57e1fab687e3da004cc18914275f8ceef33f16d01110edc5126a5dbaace578b1e61179f93a506e71a88fe886f305db537a3673cf9f73affd1dffa6
+  checksum: 10/2f55e715c8e106fa96135f8f3bc7fe71a3c497e803a451f357ae70598c3994a88c2907780f7abf51df4268c26cfb23f94db8687cd37154d65a0cc74cb530d438
   languageName: node
   linkType: hard
 
-"moveable@npm:0.43.1":
-  version: 0.43.1
-  resolution: "moveable@npm:0.43.1"
+"moveable@npm:0.53.0":
+  version: 0.53.0
+  resolution: "moveable@npm:0.53.0"
   dependencies:
-    "@scena/event-emitter": ^1.0.5
-    react-compat-moveable: ~0.31.1
-    react-moveable: ~0.46.1
-    react-simple-compat: ^1.2.3
-  checksum: af1ccdfade5d03fe44fad1083dc3575082172af457e7dd5f23319dccc783dce74119279c65cf7415205ee0a39a5277064d4aec1238bf697d65fddf127a5d96ae
+    "@daybrush/utils": "npm:^1.13.0"
+    "@scena/event-emitter": "npm:^1.0.5"
+    croact: "npm:^1.0.4"
+    croact-moveable: "npm:~0.9.0"
+    react-moveable: "npm:~0.56.0"
+  checksum: 10/30b647aacbf2a99c7864ffc8f76e844eaad887cdc626069b9cf4ad54ec50366526b305c37e4884e0bbe05b6b4f30925b0eb24d2cde18d37d08a2fb143b44ccd2
   languageName: node
   linkType: hard
 
 "mri@npm:^1.2.0":
   version: 1.2.0
   resolution: "mri@npm:1.2.0"
-  checksum: 83f515abbcff60150873e424894a2f65d68037e5a7fcde8a9e2b285ee9c13ac581b63cfc1e6826c4732de3aeb84902f7c1e16b7aff46cd3f897a0f757a894e85
+  checksum: 10/6775a1d2228bb9d191ead4efc220bd6be64f943ad3afd4dcb3b3ac8fc7b87034443f666e38805df38e8d047b29f910c3cc7810da0109af83e42c82c73bd3f6bc
+  languageName: node
+  linkType: hard
+
+"mrmime@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "mrmime@npm:2.0.0"
+  checksum: 10/8d95f714ea200c6cf3e3777cbc6168be04b05ac510090a9b41eef5ec081efeb1d1de3e535ffb9c9689fffcc42f59864fd52a500e84a677274f070adeea615c45
   languageName: node
   linkType: hard
 
 "ms@npm:2.0.0":
   version: 2.0.0
   resolution: "ms@npm:2.0.0"
-  checksum: 0e6a22b8b746d2e0b65a430519934fefd41b6db0682e3477c10f60c76e947c4c0ad06f63ffdf1d78d335f83edee8c0aa928aa66a36c7cd95b69b26f468d527f4
+  checksum: 10/0e6a22b8b746d2e0b65a430519934fefd41b6db0682e3477c10f60c76e947c4c0ad06f63ffdf1d78d335f83edee8c0aa928aa66a36c7cd95b69b26f468d527f4
   languageName: node
   linkType: hard
 
 "ms@npm:2.1.1":
   version: 2.1.1
   resolution: "ms@npm:2.1.1"
-  checksum: 0078a23cd916a9a7435c413caa14c57d4b4f6e2470e0ab554b6964163c8a4436448ac7ae020e883685475da6b6796cc396b670f579cb275db288a21e3e57721e
+  checksum: 10/0078a23cd916a9a7435c413caa14c57d4b4f6e2470e0ab554b6964163c8a4436448ac7ae020e883685475da6b6796cc396b670f579cb275db288a21e3e57721e
   languageName: node
   linkType: hard
 
 "ms@npm:2.1.2":
   version: 2.1.2
   resolution: "ms@npm:2.1.2"
-  checksum: 673cdb2c3133eb050c745908d8ce632ed2c02d85640e2edb3ace856a2266a813b30c613569bf3354fdf4ea7d1a1494add3bfa95e2713baa27d0c2c71fc44f58f
+  checksum: 10/673cdb2c3133eb050c745908d8ce632ed2c02d85640e2edb3ace856a2266a813b30c613569bf3354fdf4ea7d1a1494add3bfa95e2713baa27d0c2c71fc44f58f
   languageName: node
   linkType: hard
 
 "ms@npm:2.1.3, ms@npm:^2.0.0, ms@npm:^2.1.1":
   version: 2.1.3
   resolution: "ms@npm:2.1.3"
-  checksum: aa92de608021b242401676e35cfa5aa42dd70cbdc082b916da7fb925c542173e36bce97ea3e804923fe92c0ad991434e4a38327e15a1b5b5f945d66df615ae6d
-  languageName: node
-  linkType: hard
-
-"msw@npm:1.3.2":
-  version: 1.3.2
-  resolution: "msw@npm:1.3.2"
-  dependencies:
-    "@mswjs/cookies": ^0.2.2
-    "@mswjs/interceptors": ^0.17.10
-    "@open-draft/until": ^1.0.3
-    "@types/cookie": ^0.4.1
-    "@types/js-levenshtein": ^1.1.1
-    chalk: ^4.1.1
-    chokidar: ^3.4.2
-    cookie: ^0.4.2
-    graphql: ^16.8.1
-    headers-polyfill: 3.2.5
-    inquirer: ^8.2.0
-    is-node-process: ^1.2.0
-    js-levenshtein: ^1.1.6
-    node-fetch: ^2.6.7
-    outvariant: ^1.4.0
-    path-to-regexp: ^6.2.0
-    strict-event-emitter: ^0.4.3
-    type-fest: ^2.19.0
-    yargs: ^17.3.1
-  peerDependencies:
-    typescript: ">= 4.4.x <= 5.2.x"
+  checksum: 10/aa92de608021b242401676e35cfa5aa42dd70cbdc082b916da7fb925c542173e36bce97ea3e804923fe92c0ad991434e4a38327e15a1b5b5f945d66df615ae6d
+  languageName: node
+  linkType: hard
+
+"msw@npm:2.2.13":
+  version: 2.2.13
+  resolution: "msw@npm:2.2.13"
+  dependencies:
+    "@bundled-es-modules/cookie": "npm:^2.0.0"
+    "@bundled-es-modules/statuses": "npm:^1.0.1"
+    "@inquirer/confirm": "npm:^3.0.0"
+    "@mswjs/cookies": "npm:^1.1.0"
+    "@mswjs/interceptors": "npm:^0.26.14"
+    "@open-draft/until": "npm:^2.1.0"
+    "@types/cookie": "npm:^0.6.0"
+    "@types/statuses": "npm:^2.0.4"
+    chalk: "npm:^4.1.2"
+    graphql: "npm:^16.8.1"
+    headers-polyfill: "npm:^4.0.2"
+    is-node-process: "npm:^1.2.0"
+    outvariant: "npm:^1.4.2"
+    path-to-regexp: "npm:^6.2.0"
+    strict-event-emitter: "npm:^0.5.1"
+    type-fest: "npm:^4.9.0"
+    yargs: "npm:^17.7.2"
+  peerDependencies:
+    typescript: ">= 4.7.x"
   peerDependenciesMeta:
     typescript:
       optional: true
   bin:
     msw: cli/index.js
-  checksum: c2d4f7747f5806f0fd8d8cc3ca250ee1c2a7a6cd608de43f95bd072ba1fb13cdce0b52932ce9bf8f4a21b194d2815db535501e224ec8f7052593447fe1c0cb70
+  checksum: 10/3cd7f361294d7b9218a83f3a50b07d942924fb4da41ec1f30fcaa83896d30102f63bd8769212d985e0d9d20071550b54f22136710da43f3000f3d8fca18a3578
   languageName: node
   linkType: hard
 
-"multicast-dns@npm:^7.2.4":
-  version: 7.2.4
-  resolution: "multicast-dns@npm:7.2.4"
+"multicast-dns@npm:^7.2.5":
+  version: 7.2.5
+  resolution: "multicast-dns@npm:7.2.5"
   dependencies:
-    dns-packet: ^5.2.2
-    thunky: ^1.0.2
+    dns-packet: "npm:^5.2.2"
+    thunky: "npm:^1.0.2"
   bin:
     multicast-dns: cli.js
-  checksum: 45a78628a8f26479c4018122d689a8b22aff034699a1913dac0b9891e4111162b3222c85bba642d624270a90e51129607f1e41aa701e0108cc974246bc9fe828
+  checksum: 10/e9add8035fb7049ccbc87b1b069f05bb3b31e04fe057bf7d0116739d81295165afc2568291a4a962bee01a5074e475996816eed0f50c8110d652af5abb74f95a
   languageName: node
   linkType: hard
 
-"multimatch@npm:^5.0.0":
+"multimatch@npm:5.0.0":
   version: 5.0.0
   resolution: "multimatch@npm:5.0.0"
   dependencies:
-    "@types/minimatch": ^3.0.3
-    array-differ: ^3.0.0
-    array-union: ^2.1.0
-    arrify: ^2.0.1
-    minimatch: ^3.0.4
-  checksum: 82c8030a53af965cab48da22f1b0f894ef99e16ee680dabdfbd38d2dfacc3c8208c475203d747afd9e26db44118ed0221d5a0d65268c864f06d6efc7ac6df812
-  languageName: node
-  linkType: hard
-
-"murmurhash-js@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "murmurhash-js@npm:1.0.0"
-  checksum: 083cea92a11bc9eb25be1446fc92eded3f49731bc1ad34fa8023afd68c234d1dd59458d70eb20e667b1383bedeeb8dfb1a16c89913b6ffe3584fd22fb598739d
+    "@types/minimatch": "npm:^3.0.3"
+    array-differ: "npm:^3.0.0"
+    array-union: "npm:^2.1.0"
+    arrify: "npm:^2.0.1"
+    minimatch: "npm:^3.0.4"
+  checksum: 10/82c8030a53af965cab48da22f1b0f894ef99e16ee680dabdfbd38d2dfacc3c8208c475203d747afd9e26db44118ed0221d5a0d65268c864f06d6efc7ac6df812
   languageName: node
   linkType: hard
 
 "mutationobserver-shim@npm:0.3.7":
   version: 0.3.7
   resolution: "mutationobserver-shim@npm:0.3.7"
-  checksum: ea60a17f90ff7fa5dfd2b382fdc710835366abe54392c0005f360f47eb2d8c1b6bd9bd7eaae08d798c74287356ccb48377c57ce0951a52dd4dda45e8916c04ae
+  checksum: 10/0506a28bd106eb972a33317a6c6414c06f185b0cfb806285d5f1a6e40f9e8b7b796a06f53a815b97b056d076c086a9238f481d3da1ee2a3b5543b938c5c2ab26
   languageName: node
   linkType: hard
 
-"mute-stream@npm:0.0.8, mute-stream@npm:~0.0.4":
+"mute-stream@npm:0.0.8":
   version: 0.0.8
   resolution: "mute-stream@npm:0.0.8"
-  checksum: ff48d251fc3f827e5b1206cda0ffdaec885e56057ee86a3155e1951bc940fd5f33531774b1cc8414d7668c10a8907f863f6561875ee6e8768931a62121a531a1
+  checksum: 10/a2d2e79dde87e3424ffc8c334472c7f3d17b072137734ca46e6f221131f1b014201cc593b69a38062e974fb2394d3d1cb4349f80f012bbf8b8ac1b28033e515f
   languageName: node
   linkType: hard
 
-"nano-css@npm:^5.3.1":
-  version: 5.3.4
-  resolution: "nano-css@npm:5.3.4"
+"mute-stream@npm:^1.0.0, mute-stream@npm:~1.0.0":
+  version: 1.0.0
+  resolution: "mute-stream@npm:1.0.0"
+  checksum: 10/36fc968b0e9c9c63029d4f9dc63911950a3bdf55c9a87f58d3a266289b67180201cade911e7699f8b2fa596b34c9db43dad37649e3f7fdd13c3bb9edb0017ee7
+  languageName: node
+  linkType: hard
+
+"nano-css@npm:^5.3.1, nano-css@npm:^5.6.1":
+  version: 5.6.1
+  resolution: "nano-css@npm:5.6.1"
   dependencies:
-    css-tree: ^1.1.2
-    csstype: ^3.0.6
-    fastest-stable-stringify: ^2.0.2
-    inline-style-prefixer: ^6.0.0
-    rtl-css-js: ^1.14.0
-    sourcemap-codec: ^1.4.8
-    stacktrace-js: ^2.0.2
-    stylis: ^4.0.6
+    "@jridgewell/sourcemap-codec": "npm:^1.4.15"
+    css-tree: "npm:^1.1.2"
+    csstype: "npm:^3.1.2"
+    fastest-stable-stringify: "npm:^2.0.2"
+    inline-style-prefixer: "npm:^7.0.0"
+    rtl-css-js: "npm:^1.16.1"
+    stacktrace-js: "npm:^2.0.2"
+    stylis: "npm:^4.3.0"
   peerDependencies:
     react: "*"
     react-dom: "*"
-  checksum: 96fdaa67b800f659ca449e29a45bee198f530f45455d3aad02f0d0b6525aae9e0a53701822103a9d98237a4f7e405f1eaa68f642e824908a0014e145c1c18f07
+  checksum: 10/d4e5e3c9fdfc09f494852c75ae5320373dfa84e24f82b7d6ff45928205763ec7780446e3e10af98398409bd4bf1acebc1f987570592b2bc68b9c0997ad089f73
   languageName: node
   linkType: hard
 
@@ -22433,44 +23842,46 @@ __metadata:
   resolution: "nanoid@npm:3.3.3"
   bin:
     nanoid: bin/nanoid.cjs
-  checksum: ada019402a07464a694553c61d2dca8a4353645a7d92f2830f0d487fedff403678a0bee5323a46522752b2eab95a0bc3da98b6cccaa7c0c55cd9975130e6d6f0
+  checksum: 10/c703ed58a234b68245a8a4826dd25c1453a9017d34fa28bc58e7aa8247de87d854582fa2209d7aee04084cff9ce150be8fd30300abe567dc615d4e8e735f2d99
   languageName: node
   linkType: hard
 
-"nanoid@npm:^3.3.6":
-  version: 3.3.6
-  resolution: "nanoid@npm:3.3.6"
+"nanoid@npm:^3.3.7":
+  version: 3.3.7
+  resolution: "nanoid@npm:3.3.7"
   bin:
     nanoid: bin/nanoid.cjs
-  checksum: 7d0eda657002738aa5206107bd0580aead6c95c460ef1bdd0b1a87a9c7ae6277ac2e9b945306aaa5b32c6dcb7feaf462d0f552e7f8b5718abfc6ead5c94a71b3
+  checksum: 10/ac1eb60f615b272bccb0e2b9cd933720dad30bf9708424f691b8113826bb91aca7e9d14ef5d9415a6ba15c266b37817256f58d8ce980c82b0ba3185352565679
   languageName: node
   linkType: hard
 
-"natural-compare-lite@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "natural-compare-lite@npm:1.4.0"
-  checksum: 5222ac3986a2b78dd6069ac62cbb52a7bf8ffc90d972ab76dfe7b01892485d229530ed20d0c62e79a6b363a663b273db3bde195a1358ce9e5f779d4453887225
+"nanoid@npm:^5.0.4":
+  version: 5.0.6
+  resolution: "nanoid@npm:5.0.6"
+  bin:
+    nanoid: bin/nanoid.js
+  checksum: 10/cd5d3eebd3b148b68b4b0238d94b1d8b4d955cc1a74b8e5217c1daecaed584d4b3701f41ce0f5e909ba4cd214592aff41fb53ac1955d77ea85d58df936726f29
   languageName: node
   linkType: hard
 
 "natural-compare@npm:^1.4.0":
   version: 1.4.0
   resolution: "natural-compare@npm:1.4.0"
-  checksum: 23ad088b08f898fc9b53011d7bb78ec48e79de7627e01ab5518e806033861bef68d5b0cd0e2205c2f36690ac9571ff6bcb05eb777ced2eeda8d4ac5b44592c3d
+  checksum: 10/23ad088b08f898fc9b53011d7bb78ec48e79de7627e01ab5518e806033861bef68d5b0cd0e2205c2f36690ac9571ff6bcb05eb777ced2eeda8d4ac5b44592c3d
   languageName: node
   linkType: hard
 
 "negotiator@npm:0.6.3, negotiator@npm:^0.6.2, negotiator@npm:^0.6.3":
   version: 0.6.3
   resolution: "negotiator@npm:0.6.3"
-  checksum: b8ffeb1e262eff7968fc90a2b6767b04cfd9842582a9d0ece0af7049537266e7b2506dfb1d107a32f06dd849ab2aea834d5830f7f4d0e5cb7d36e1ae55d021d9
+  checksum: 10/2723fb822a17ad55c93a588a4bc44d53b22855bf4be5499916ca0cab1e7165409d0b288ba2577d7b029f10ce18cf2ed8e703e5af31c984e1e2304277ef979837
   languageName: node
   linkType: hard
 
 "neo-async@npm:^2.5.0, neo-async@npm:^2.6.0, neo-async@npm:^2.6.1, neo-async@npm:^2.6.2":
   version: 2.6.2
   resolution: "neo-async@npm:2.6.2"
-  checksum: deac9f8d00eda7b2e5cd1b2549e26e10a0faa70adaa6fdadca701cc55f49ee9018e427f424bac0c790b7c7e2d3068db97f3093f1093975f2acb8f8818b936ed9
+  checksum: 10/1a7948fea86f2b33ec766bc899c88796a51ba76a4afc9026764aedc6e7cde692a09067031e4a1bf6db4f978ccd99e7f5b6c03fe47ad9865c3d4f99050d67e002
   languageName: node
   linkType: hard
 
@@ -22478,9 +23889,9 @@ __metadata:
   version: 2.1.0
   resolution: "ngtemplate-loader@npm:2.1.0"
   dependencies:
-    jsesc: ^0.5.0
-    loader-utils: ^1.0.2
-  checksum: 84ce24512867a469e6f87af20e1abac19afa9a462c011f15d9c1cc2dcef1f5100521f4e90954f65f1b81d6e4286e0141d57f0260cc538e94cf802fb5932581ab
+    jsesc: "npm:^0.5.0"
+    loader-utils: "npm:^1.0.2"
+  checksum: 10/6020fcabc13ac355b93ceec03e6df2e62bd90cf285ab11cefd345861ee2ca12d3e5475d94bbacc6b31c379aea85464410bb7ed8dc0612780aa33aa3712be45b8
   languageName: node
   linkType: hard
 
@@ -22488,25 +23899,16 @@ __metadata:
   version: 3.0.4
   resolution: "no-case@npm:3.0.4"
   dependencies:
-    lower-case: ^2.0.2
-    tslib: ^2.0.3
-  checksum: 0b2ebc113dfcf737d48dde49cfebf3ad2d82a8c3188e7100c6f375e30eafbef9e9124aadc3becef237b042fd5eb0aad2fd78669c20972d045bbe7fea8ba0be5c
+    lower-case: "npm:^2.0.2"
+    tslib: "npm:^2.0.3"
+  checksum: 10/0b2ebc113dfcf737d48dde49cfebf3ad2d82a8c3188e7100c6f375e30eafbef9e9124aadc3becef237b042fd5eb0aad2fd78669c20972d045bbe7fea8ba0be5c
   languageName: node
   linkType: hard
 
 "node-abort-controller@npm:^3.0.1":
   version: 3.0.1
   resolution: "node-abort-controller@npm:3.0.1"
-  checksum: 2b3d75c65249fea99e8ba22da3a8bc553f034f44dd12f5f4b38b520f718b01c88718c978f0c24c2a460fc01de9a80b567028f547b94440cb47adeacfeb82c2ee
-  languageName: node
-  linkType: hard
-
-"node-addon-api@npm:^3.2.1":
-  version: 3.2.1
-  resolution: "node-addon-api@npm:3.2.1"
-  dependencies:
-    node-gyp: latest
-  checksum: 2369986bb0881ccd9ef6bacdf39550e07e089a9c8ede1cbc5fc7712d8e2faa4d50da0e487e333d4125f8c7a616c730131d1091676c9d499af1d74560756b4a18
+  checksum: 10/7437b015830a2f714692fd372c01ce5c8c66f332a205455f58ddc8b3228314e588a20abd34a2b037c9cc438ced74e75492c7fc04f4dc0cf7bf0c0ac4160175e3
   languageName: node
   linkType: hard
 
@@ -22514,67 +23916,70 @@ __metadata:
   version: 0.1.17
   resolution: "node-dir@npm:0.1.17"
   dependencies:
-    minimatch: ^3.0.2
-  checksum: 29de9560e52cdac8d3f794d38d782f6799e13d4d11aaf96d3da8c28458e1c5e33bb5f8edfb42dc34172ec5516c50c5b8850c9e1526542616757a969267263328
+    minimatch: "npm:^3.0.2"
+  checksum: 10/281fdea12d9c080a7250e5b5afefa3ab39426d40753ec8126a2d1e67f189b8824723abfed74f5d8549c5d78352d8c489fe08d0b067d7684c87c07283d38374a5
   languageName: node
   linkType: hard
 
 "node-fetch-native@npm:^1.0.2":
   version: 1.0.2
   resolution: "node-fetch-native@npm:1.0.2"
-  checksum: cd1f031bb3fd5b467bdc5a515f0042923821b91be5f01f47a0f17dd97b7de0921bd965a2caf9b2e64d13dc6d65dd195387b43cdc2127a7a2b1db84c8659fb1c7
+  checksum: 10/50bf4732d8c1115f626b663d7ce066a8ef7b22786813c45e38fde1594cdc2f61a3e1f3b457d1c5a576ac5beb9369912b671002ba273493841a33b8a57b553e81
+  languageName: node
+  linkType: hard
+
+"node-fetch@npm:2.6.7":
+  version: 2.6.7
+  resolution: "node-fetch@npm:2.6.7"
+  dependencies:
+    whatwg-url: "npm:^5.0.0"
+  peerDependencies:
+    encoding: ^0.1.0
+  peerDependenciesMeta:
+    encoding:
+      optional: true
+  checksum: 10/4bc9245383db92c35601a798c9a992fdf38d99920ceac11e0e6512ef3014d188b3807ccb060bc6c4bdb57a145030c73f5b5fd6730f665979f9264bc43ca3afea
   languageName: node
   linkType: hard
 
-"node-fetch@npm:^2.0.0, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.7":
+"node-fetch@npm:^2.0.0, node-fetch@npm:^2.6.7":
   version: 2.6.12
   resolution: "node-fetch@npm:2.6.12"
   dependencies:
-    whatwg-url: ^5.0.0
+    whatwg-url: "npm:^5.0.0"
   peerDependencies:
     encoding: ^0.1.0
   peerDependenciesMeta:
     encoding:
       optional: true
-  checksum: 3bc1655203d47ee8e313c0d96664b9673a3d4dd8002740318e9d27d14ef306693a4b2ef8d6525775056fd912a19e23f3ac0d7111ad8925877b7567b29a625592
+  checksum: 10/370ed4d906edad9709a81b54a0141d37d2973a27dc80c723d8ac14afcec6dc67bc6c70986a96992b64ec75d08159cc4b65ce6aa9063941168ea5ac73b24df9f8
   languageName: node
   linkType: hard
 
 "node-forge@npm:^1, node-forge@npm:^1.3.1":
   version: 1.3.1
   resolution: "node-forge@npm:1.3.1"
-  checksum: 08fb072d3d670599c89a1704b3e9c649ff1b998256737f0e06fbd1a5bf41cae4457ccaee32d95052d80bbafd9ffe01284e078c8071f0267dc9744e51c5ed42a9
-  languageName: node
-  linkType: hard
-
-"node-gyp-build@npm:^4.3.0":
-  version: 4.5.0
-  resolution: "node-gyp-build@npm:4.5.0"
-  bin:
-    node-gyp-build: bin.js
-    node-gyp-build-optional: optional.js
-    node-gyp-build-test: build-test.js
-  checksum: d888bae0fb88335f69af1b57a2294a931c5042f36e413d8d364c992c9ebfa0b96ffe773179a5a2c8f04b73856e8634e09cce108dbb9804396d3cc8c5455ff2db
+  checksum: 10/05bab6868633bf9ad4c3b1dd50ec501c22ffd69f556cdf169a00998ca1d03e8107a6032ba013852f202035372021b845603aeccd7dfcb58cdb7430013b3daa8d
   languageName: node
   linkType: hard
 
-"node-gyp@npm:^9.0.0":
-  version: 9.0.0
-  resolution: "node-gyp@npm:9.0.0"
-  dependencies:
-    env-paths: ^2.2.0
-    glob: ^7.1.4
-    graceful-fs: ^4.2.6
-    make-fetch-happen: ^10.0.3
-    nopt: ^5.0.0
-    npmlog: ^6.0.0
-    rimraf: ^3.0.2
-    semver: ^7.3.5
-    tar: ^6.1.2
-    which: ^2.0.2
+"node-gyp@npm:^10.0.0":
+  version: 10.0.1
+  resolution: "node-gyp@npm:10.0.1"
+  dependencies:
+    env-paths: "npm:^2.2.0"
+    exponential-backoff: "npm:^3.1.1"
+    glob: "npm:^10.3.10"
+    graceful-fs: "npm:^4.2.6"
+    make-fetch-happen: "npm:^13.0.0"
+    nopt: "npm:^7.0.0"
+    proc-log: "npm:^3.0.0"
+    semver: "npm:^7.3.5"
+    tar: "npm:^6.1.2"
+    which: "npm:^4.0.0"
   bin:
     node-gyp: bin/node-gyp.js
-  checksum: 4d8ef8860f7e4f4d86c91db3f519d26ed5cc23b48fe54543e2afd86162b4acbd14f21de42a5db344525efb69a991e021b96a68c70c6e2d5f4a5cb770793da6d3
+  checksum: 10/578cf0c821f258ce4b6ebce4461eca4c991a4df2dee163c0624f2fe09c7d6d37240be4942285a0048d307230248ee0b18382d6623b9a0136ce9533486deddfa8
   languageName: node
   linkType: hard
 
@@ -22582,26 +23987,33 @@ __metadata:
   version: 8.3.0
   resolution: "node-gyp@npm:8.3.0"
   dependencies:
-    env-paths: ^2.2.0
-    glob: ^7.1.4
-    graceful-fs: ^4.2.6
-    make-fetch-happen: ^9.1.0
-    nopt: ^5.0.0
-    npmlog: ^4.1.2
-    rimraf: ^3.0.2
-    semver: ^7.3.5
-    tar: ^6.1.2
-    which: ^2.0.2
+    env-paths: "npm:^2.2.0"
+    glob: "npm:^7.1.4"
+    graceful-fs: "npm:^4.2.6"
+    make-fetch-happen: "npm:^9.1.0"
+    nopt: "npm:^5.0.0"
+    npmlog: "npm:^4.1.2"
+    rimraf: "npm:^3.0.2"
+    semver: "npm:^7.3.5"
+    tar: "npm:^6.1.2"
+    which: "npm:^2.0.2"
   bin:
     node-gyp: bin/node-gyp.js
-  checksum: a0304728eb56c99ce61b3210b934d247b72bba81658d1d92fc0f125bbdd252bbcdedcd949a09ead9e52d6fa742301945ead06d0e2d67f614f4426b5fc6d30996
+  checksum: 10/8d1c0d8f80e2b81b2d2b394efb28ea4956c89e5f598025de28f6ee778f0d10a3f1d4c5b011fec3c7901f2384bb1b6952bd894e41cb43f9b968b0fbb6e34a9adf
   languageName: node
   linkType: hard
 
 "node-int64@npm:^0.4.0":
   version: 0.4.0
   resolution: "node-int64@npm:0.4.0"
-  checksum: d0b30b1ee6d961851c60d5eaa745d30b5c95d94bc0e74b81e5292f7c42a49e3af87f1eb9e89f59456f80645d679202537de751b7d72e9e40ceea40c5e449057e
+  checksum: 10/b7afc2b65e56f7035b1a2eec57ae0fbdee7d742b1cdcd0f4387562b6527a011ab1cbe9f64cc8b3cca61e3297c9637c8bf61cec2e6b8d3a711d4b5267dfafbe02
+  languageName: node
+  linkType: hard
+
+"node-machine-id@npm:1.1.12":
+  version: 1.1.12
+  resolution: "node-machine-id@npm:1.1.12"
+  checksum: 10/46bf3d4fab8d0e63b24c42bcec2b6975c7ec5bc16e53d7a589d095668d0fdf0bfcbcdc28246dd1ef74cf95a37fbd774cd4b17b41f518d79dfad7fdc99f995903
   languageName: node
   linkType: hard
 
@@ -22609,20 +24021,20 @@ __metadata:
   version: 10.0.1
   resolution: "node-notifier@npm:10.0.1"
   dependencies:
-    growly: ^1.3.0
-    is-wsl: ^2.2.0
-    semver: ^7.3.5
-    shellwords: ^0.1.1
-    uuid: ^8.3.2
-    which: ^2.0.2
-  checksum: ac09456152e433462dd3ca277048de7a60c6d63fc657e00ac72805841baf9bb2573e8d3f64c4b64af73546d1ed39733af6b0036c38b57a83c883aa33fff35a2e
+    growly: "npm:^1.3.0"
+    is-wsl: "npm:^2.2.0"
+    semver: "npm:^7.3.5"
+    shellwords: "npm:^0.1.1"
+    uuid: "npm:^8.3.2"
+    which: "npm:^2.0.2"
+  checksum: 10/b238ffe16fd3b14df4c021e7d2a64483a3ac549b22d93e3c0bcfd9557a12d1c370ce6d8889308bc9c31c7464d99b224e7056dbd8cf4fb37b0f6296185972774a
   languageName: node
   linkType: hard
 
-"node-releases@npm:^2.0.13":
-  version: 2.0.13
-  resolution: "node-releases@npm:2.0.13"
-  checksum: 17ec8f315dba62710cae71a8dad3cd0288ba943d2ece43504b3b1aa8625bf138637798ab470b1d9035b0545996f63000a8a926e0f6d35d0996424f8b6d36dda3
+"node-releases@npm:^2.0.14":
+  version: 2.0.14
+  resolution: "node-releases@npm:2.0.14"
+  checksum: 10/0f7607ec7db5ef1dc616899a5f24ae90c869b6a54c2d4f36ff6d84a282ab9343c7ff3ca3670fe4669171bb1e8a9b3e286e1ef1c131f09a83d70554f855d54f24
   languageName: node
   linkType: hard
 
@@ -22630,10 +24042,21 @@ __metadata:
   version: 5.0.0
   resolution: "nopt@npm:5.0.0"
   dependencies:
-    abbrev: 1
+    abbrev: "npm:1"
+  bin:
+    nopt: bin/nopt.js
+  checksum: 10/00f9bb2d16449469ba8ffcf9b8f0eae6bae285ec74b135fec533e5883563d2400c0cd70902d0a7759e47ac031ccf206ace4e86556da08ed3f1c66dda206e9ccd
+  languageName: node
+  linkType: hard
+
+"nopt@npm:^7.0.0":
+  version: 7.2.0
+  resolution: "nopt@npm:7.2.0"
+  dependencies:
+    abbrev: "npm:^2.0.0"
   bin:
     nopt: bin/nopt.js
-  checksum: d35fdec187269503843924e0114c0c6533fb54bbf1620d0f28b4b60ba01712d6687f62565c55cc20a504eff0fbe5c63e22340c3fad549ad40469ffb611b04f2f
+  checksum: 10/1e7489f17cbda452c8acaf596a8defb4ae477d2a9953b76eb96f4ec3f62c6b421cd5174eaa742f88279871fde9586d8a1d38fb3f53fa0c405585453be31dff4c
   languageName: node
   linkType: hard
 
@@ -22641,99 +24064,111 @@ __metadata:
   version: 2.5.0
   resolution: "normalize-package-data@npm:2.5.0"
   dependencies:
-    hosted-git-info: ^2.1.4
-    resolve: ^1.10.0
-    semver: 2 || 3 || 4 || 5
-    validate-npm-package-license: ^3.0.1
-  checksum: 7999112efc35a6259bc22db460540cae06564aa65d0271e3bdfa86876d08b0e578b7b5b0028ee61b23f1cae9fc0e7847e4edc0948d3068a39a2a82853efc8499
+    hosted-git-info: "npm:^2.1.4"
+    resolve: "npm:^1.10.0"
+    semver: "npm:2 || 3 || 4 || 5"
+    validate-npm-package-license: "npm:^3.0.1"
+  checksum: 10/644f830a8bb9b7cc9bf2f6150618727659ee27cdd0840d1c1f97e8e6cab0803a098a2c19f31c6247ad9d3a0792e61521a13a6e8cd87cc6bb676e3150612c03d4
   languageName: node
   linkType: hard
 
-"normalize-package-data@npm:^3.0.0, normalize-package-data@npm:^3.0.2":
+"normalize-package-data@npm:^3.0.0, normalize-package-data@npm:^3.0.3":
   version: 3.0.3
   resolution: "normalize-package-data@npm:3.0.3"
   dependencies:
-    hosted-git-info: ^4.0.1
-    is-core-module: ^2.5.0
-    semver: ^7.3.4
-    validate-npm-package-license: ^3.0.1
-  checksum: bbcee00339e7c26fdbc760f9b66d429258e2ceca41a5df41f5df06cc7652de8d82e8679ff188ca095cad8eff2b6118d7d866af2b68400f74602fbcbce39c160a
+    hosted-git-info: "npm:^4.0.1"
+    is-core-module: "npm:^2.5.0"
+    semver: "npm:^7.3.4"
+    validate-npm-package-license: "npm:^3.0.1"
+  checksum: 10/3cd3b438c9c7b15d72ed2d1bbf0f8cc2d07bfe27702fc9e95d039f0af4e069dc75c0646e75068f9f9255a8aae64b59aa4fe2177e65787145fb996c3d38d48acb
   languageName: node
   linkType: hard
 
-"normalize-package-data@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "normalize-package-data@npm:4.0.0"
+"normalize-package-data@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "normalize-package-data@npm:5.0.0"
   dependencies:
-    hosted-git-info: ^5.0.0
-    is-core-module: ^2.8.1
-    semver: ^7.3.5
-    validate-npm-package-license: ^3.0.4
-  checksum: b0f47de4295a0f8499bd478e84b9f9592a29f65227c2b4446ae80f7dff6e7a5ec6ef25ea8f06f3dcb9b7b7d945c2daa274385925b3d85e77e34eaffa0b42e316
+    hosted-git-info: "npm:^6.0.0"
+    is-core-module: "npm:^2.8.1"
+    semver: "npm:^7.3.5"
+    validate-npm-package-license: "npm:^3.0.4"
+  checksum: 10/477344ee99c6c81afbc4359f9dc7a3a219cc29a37fe0220a4595bbdb7e1e5fa9e3c195e99900228b72d8676edf99eb99fd3b66aa94b4b8ab74d516f2ff60e510
   languageName: node
   linkType: hard
 
-"normalize-path@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "normalize-path@npm:2.1.1"
+"normalize-package-data@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "normalize-package-data@npm:6.0.0"
   dependencies:
-    remove-trailing-separator: ^1.0.1
-  checksum: 7e9cbdcf7f5b8da7aa191fbfe33daf290cdcd8c038f422faf1b8a83c972bf7a6d94c5be34c4326cb00fb63bc0fd97d9fbcfaf2e5d6142332c2cd36d2e1b86cea
+    hosted-git-info: "npm:^7.0.0"
+    is-core-module: "npm:^2.8.1"
+    semver: "npm:^7.3.5"
+    validate-npm-package-license: "npm:^3.0.4"
+  checksum: 10/e31e31a2ebaef93ef107feb9408f105044eeae9cb7d0d4619544ab2323cd4b15ca648b0d558ac29db2fece161c7b8658206bb27ebe9340df723f7174b3e2759d
   languageName: node
   linkType: hard
 
-"normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0":
+"normalize-path@npm:3.0.0, normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0":
   version: 3.0.0
   resolution: "normalize-path@npm:3.0.0"
-  checksum: 88eeb4da891e10b1318c4b2476b6e2ecbeb5ff97d946815ffea7794c31a89017c70d7f34b3c2ebf23ef4e9fc9fb99f7dffe36da22011b5b5c6ffa34f4873ec20
+  checksum: 10/88eeb4da891e10b1318c4b2476b6e2ecbeb5ff97d946815ffea7794c31a89017c70d7f34b3c2ebf23ef4e9fc9fb99f7dffe36da22011b5b5c6ffa34f4873ec20
   languageName: node
   linkType: hard
 
 "normalize-range@npm:^0.1.2":
   version: 0.1.2
   resolution: "normalize-range@npm:0.1.2"
-  checksum: 9b2f14f093593f367a7a0834267c24f3cb3e887a2d9809c77d8a7e5fd08738bcd15af46f0ab01cc3a3d660386f015816b5c922cea8bf2ee79777f40874063184
+  checksum: 10/9b2f14f093593f367a7a0834267c24f3cb3e887a2d9809c77d8a7e5fd08738bcd15af46f0ab01cc3a3d660386f015816b5c922cea8bf2ee79777f40874063184
   languageName: node
   linkType: hard
 
-"now-and-later@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "now-and-later@npm:2.0.1"
+"now-and-later@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "now-and-later@npm:3.0.0"
   dependencies:
-    once: ^1.3.2
-  checksum: a6715b9504b96f2603020e048f5ef7adc0693a1be1fbb46589d359d95f16df77207339d7bccf76295675f0f152f4ef145914b8775fa179c294833abef05b475f
+    once: "npm:^1.4.0"
+  checksum: 10/5300d42932bac5d4f8d19bf90ebb53c3474ba615eab912770d1b8de896baea6dc7ef3b95158aaf601acfb0cd6b573bceb5fe30cf0224cb06ea227ef3e8fc7f3d
   languageName: node
   linkType: hard
 
-"npm-bundled@npm:^1.1.1, npm-bundled@npm:^1.1.2":
+"npm-bundled@npm:^1.1.2":
   version: 1.1.2
   resolution: "npm-bundled@npm:1.1.2"
   dependencies:
-    npm-normalize-package-bin: ^1.0.1
-  checksum: 6e599155ef28d0b498622f47f1ba189dfbae05095a1ed17cb3a5babf961e965dd5eab621f0ec6f0a98de774e5836b8f5a5ee639010d64f42850a74acec3d4d09
+    npm-normalize-package-bin: "npm:^1.0.1"
+  checksum: 10/722154cb5e9792abc2aa0112f8a5ac62885224f2e01f010d4e1a32233522a8b7849a716a9184bbf7d6ba865177da337fafeaf41bd32800785067093133a380e3
   languageName: node
   linkType: hard
 
-"npm-install-checks@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "npm-install-checks@npm:5.0.0"
+"npm-bundled@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "npm-bundled@npm:3.0.0"
+  dependencies:
+    npm-normalize-package-bin: "npm:^3.0.0"
+  checksum: 10/704fce20114d36d665c20edc56d3f9f7778c52ca1cd48731ec31f65af9e65805f9308ca7ed9e5a6bd9fe22327a63aa5d83a8c5aaee0c715e5047de1fa659e8bf
+  languageName: node
+  linkType: hard
+
+"npm-install-checks@npm:^6.0.0":
+  version: 6.3.0
+  resolution: "npm-install-checks@npm:6.3.0"
   dependencies:
-    semver: ^7.1.1
-  checksum: 0e7d1aae52b1fe9d3a0fd4a008850c7047931722dd49ee908afd13fd0297ac5ddb10964d9c59afcdaaa2ca04b51d75af2788f668c729ae71fec0e4cdac590ffc
+    semver: "npm:^7.1.1"
+  checksum: 10/6c20dadb878a0d2f1f777405217b6b63af1299d0b43e556af9363ee6eefaa98a17dfb7b612a473a473e96faf7e789c58b221e0d8ffdc1d34903c4f71618df3b4
   languageName: node
   linkType: hard
 
-"npm-normalize-package-bin@npm:^1.0.0, npm-normalize-package-bin@npm:^1.0.1":
+"npm-normalize-package-bin@npm:^1.0.1":
   version: 1.0.1
   resolution: "npm-normalize-package-bin@npm:1.0.1"
-  checksum: ae7f15155a1e3ace2653f12ddd1ee8eaa3c84452fdfbf2f1943e1de264e4b079c86645e2c55931a51a0a498cba31f70022a5219d5665fbcb221e99e58bc70122
+  checksum: 10/b61593d1afc2b05258afe791043d1b665376ec91ae56dfcf6c67bb802acfc2c249136d3fb600f356562ef013f9e46a009c5e4769693bf13bcabf99fb5e806e6a
   languageName: node
   linkType: hard
 
-"npm-normalize-package-bin@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "npm-normalize-package-bin@npm:2.0.0"
-  checksum: 7c5379f9b188b564c4332c97bdd9a5d6b7b15f02b5823b00989d6a0e6fb31eb0280f02b0a924f930e1fcaf00e60fae333aec8923d2a4c7747613c7d629d8aa25
+"npm-normalize-package-bin@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "npm-normalize-package-bin@npm:3.0.1"
+  checksum: 10/de416d720ab22137a36292ff8a333af499ea0933ef2320a8c6f56a73b0f0448227fec4db5c890d702e26d21d04f271415eab6580b5546456861cc0c19498a4bf
   languageName: node
   linkType: hard
 
@@ -22741,63 +24176,99 @@ __metadata:
   version: 8.1.1
   resolution: "npm-package-arg@npm:8.1.1"
   dependencies:
-    hosted-git-info: ^3.0.6
-    semver: ^7.0.0
-    validate-npm-package-name: ^3.0.0
-  checksum: 406c59f92d8fac5acbd1df62f4af8075e925af51131b6bc66245641ea71ddb0e60b3e2c56fafebd4e8ffc3ba0453e700a221a36a44740dc9f7488cec97ae4c55
+    hosted-git-info: "npm:^3.0.6"
+    semver: "npm:^7.0.0"
+    validate-npm-package-name: "npm:^3.0.0"
+  checksum: 10/b50b130680997f37c97fd6a4b100e447739eb5615a7f06e8c8010c2cc6ba61ba91e370d481cea06a90febc89816197a900189a9f91dab7b860171dda2334b320
   languageName: node
   linkType: hard
 
-"npm-package-arg@npm:^9.0.0, npm-package-arg@npm:^9.0.1":
-  version: 9.1.0
-  resolution: "npm-package-arg@npm:9.1.0"
+"npm-package-arg@npm:^10.0.0, npm-package-arg@npm:^10.1.0":
+  version: 10.1.0
+  resolution: "npm-package-arg@npm:10.1.0"
+  dependencies:
+    hosted-git-info: "npm:^6.0.0"
+    proc-log: "npm:^3.0.0"
+    semver: "npm:^7.3.5"
+    validate-npm-package-name: "npm:^5.0.0"
+  checksum: 10/3bbb5f081099f73e852b4d3a3a10f78d495bdf21e050ca5c78dc134921c99ec856d1555ff6ba9c1c15b7475ad976ce803ef53fdda34abec622fe8f5d76421319
+  languageName: node
+  linkType: hard
+
+"npm-package-arg@npm:^11.0.0":
+  version: 11.0.1
+  resolution: "npm-package-arg@npm:11.0.1"
   dependencies:
-    hosted-git-info: ^5.0.0
-    proc-log: ^2.0.1
-    semver: ^7.3.5
-    validate-npm-package-name: ^4.0.0
-  checksum: 277c21477731a4f1e31bde36f0db5f5470deb2a008db2aaf1b015d588b23cb225c75f90291ea241235e86682a03de972bbe69fc805c921a786ea9616955990b9
+    hosted-git-info: "npm:^7.0.0"
+    proc-log: "npm:^3.0.0"
+    semver: "npm:^7.3.5"
+    validate-npm-package-name: "npm:^5.0.0"
+  checksum: 10/a16e632703e106b3e9a6b4902d14a3493c8371745bcf8ba8f4ea9f152e12d5ed927487931e9adf817d05ba97b04941b33fec1d140dbd7da09181b546fde35b3c
   languageName: node
   linkType: hard
 
-"npm-packlist@npm:^5.1.0, npm-packlist@npm:^5.1.1":
+"npm-packlist@npm:5.1.1":
   version: 5.1.1
   resolution: "npm-packlist@npm:5.1.1"
   dependencies:
-    glob: ^8.0.1
-    ignore-walk: ^5.0.1
-    npm-bundled: ^1.1.2
-    npm-normalize-package-bin: ^1.0.1
+    glob: "npm:^8.0.1"
+    ignore-walk: "npm:^5.0.1"
+    npm-bundled: "npm:^1.1.2"
+    npm-normalize-package-bin: "npm:^1.0.1"
   bin:
     npm-packlist: bin/index.js
-  checksum: 28dab153744ceb4695b82a9032d14aa2bfb855d38344a09052673d07860a4d8725f808ed23996e6f2792c48e11f5d147632c159f798d2c24dac92b51a884f0c6
+  checksum: 10/938299a48c7d2435199c8245f3ed79ad38c26f2256fe223d8654702d5e84d91a4193ee552333cf66d1716a94bc19a03b8ba43e1c5cd0535323de958b8dc7049e
   languageName: node
   linkType: hard
 
-"npm-pick-manifest@npm:^7.0.0":
-  version: 7.0.1
-  resolution: "npm-pick-manifest@npm:7.0.1"
+"npm-packlist@npm:^8.0.0":
+  version: 8.0.2
+  resolution: "npm-packlist@npm:8.0.2"
+  dependencies:
+    ignore-walk: "npm:^6.0.4"
+  checksum: 10/707206e5c09a1b8aa04e590592715ba5ab8732add1bbb5eeaff54b9c6b2740764c9e94c99e390c13245970b51c2cc92b8d44594c2784fcd96f255c7109622322
+  languageName: node
+  linkType: hard
+
+"npm-pick-manifest@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "npm-pick-manifest@npm:9.0.0"
+  dependencies:
+    npm-install-checks: "npm:^6.0.0"
+    npm-normalize-package-bin: "npm:^3.0.0"
+    npm-package-arg: "npm:^11.0.0"
+    semver: "npm:^7.3.5"
+  checksum: 10/29dca2a838ed35c714df1a76f76616df2df51ce31bc3ca5943a0668b2eca2a5aab448f9f89cadf7a77eb5e3831c554cebaf7802f3e432838acb34c1a74fa2786
+  languageName: node
+  linkType: hard
+
+"npm-registry-fetch@npm:^14.0.3, npm-registry-fetch@npm:^14.0.5":
+  version: 14.0.5
+  resolution: "npm-registry-fetch@npm:14.0.5"
   dependencies:
-    npm-install-checks: ^5.0.0
-    npm-normalize-package-bin: ^1.0.1
-    npm-package-arg: ^9.0.0
-    semver: ^7.3.5
-  checksum: 9a4a8e64d2214783b2b74a361845000f5d91bb40c7858e2a30af2ac7876d9296efc37f8cacf60335e96a45effee2035b033d9bdefb4889757cc60d85959accbb
+    make-fetch-happen: "npm:^11.0.0"
+    minipass: "npm:^5.0.0"
+    minipass-fetch: "npm:^3.0.0"
+    minipass-json-stream: "npm:^1.0.1"
+    minizlib: "npm:^2.1.2"
+    npm-package-arg: "npm:^10.0.0"
+    proc-log: "npm:^3.0.0"
+  checksum: 10/63026b22d6a6afe5cb3a02dca96db783b88d3acc68be94f3485f25a5e4932800fdeff08145a77b35b8f61987033346462d4b3e710c0729a9735357ff97596062
   languageName: node
   linkType: hard
 
-"npm-registry-fetch@npm:^13.0.0, npm-registry-fetch@npm:^13.0.1, npm-registry-fetch@npm:^13.3.0":
-  version: 13.3.1
-  resolution: "npm-registry-fetch@npm:13.3.1"
+"npm-registry-fetch@npm:^16.0.0":
+  version: 16.1.0
+  resolution: "npm-registry-fetch@npm:16.1.0"
   dependencies:
-    make-fetch-happen: ^10.0.6
-    minipass: ^3.1.6
-    minipass-fetch: ^2.0.3
-    minipass-json-stream: ^1.0.1
-    minizlib: ^2.1.2
-    npm-package-arg: ^9.0.1
-    proc-log: ^2.0.0
-  checksum: 5a941c2c799568e0dbccfc15f280444da398dadf2eede1b1921f08ddd5cb5f32c7cb4d16be96401f95a33073aeec13a3fd928c753790d3c412c2e64e7f7c6ee4
+    make-fetch-happen: "npm:^13.0.0"
+    minipass: "npm:^7.0.2"
+    minipass-fetch: "npm:^3.0.0"
+    minipass-json-stream: "npm:^1.0.1"
+    minizlib: "npm:^2.1.2"
+    npm-package-arg: "npm:^11.0.0"
+    proc-log: "npm:^3.0.0"
+  checksum: 10/ba760c9cdacb1219ac5d8fecc26b1c55d502b55d45ab85ad556353b9bc5ba664c226fda54284c06df8c7eecfdcacb1aa065838ea7d1b0189d24c4d3f186309d2
   languageName: node
   linkType: hard
 
@@ -22805,8 +24276,8 @@ __metadata:
   version: 4.0.1
   resolution: "npm-run-path@npm:4.0.1"
   dependencies:
-    path-key: ^3.0.0
-  checksum: 5374c0cea4b0bbfdfae62da7bbdf1e1558d338335f4cacf2515c282ff358ff27b2ecb91ffa5330a8b14390ac66a1e146e10700440c1ab868208430f56b5f4d23
+    path-key: "npm:^3.0.0"
+  checksum: 10/5374c0cea4b0bbfdfae62da7bbdf1e1558d338335f4cacf2515c282ff358ff27b2ecb91ffa5330a8b14390ac66a1e146e10700440c1ab868208430f56b5f4d23
   languageName: node
   linkType: hard
 
@@ -22814,23 +24285,35 @@ __metadata:
   version: 4.1.2
   resolution: "npmlog@npm:4.1.2"
   dependencies:
-    are-we-there-yet: ~1.1.2
-    console-control-strings: ~1.1.0
-    gauge: ~2.7.3
-    set-blocking: ~2.0.0
-  checksum: edbda9f95ec20957a892de1839afc6fb735054c3accf6fbefe767bac9a639fd5cea2baeac6bd2bcd50a85cb54924d57d9886c81c7fbc2332c2ddd19227504192
+    are-we-there-yet: "npm:~1.1.2"
+    console-control-strings: "npm:~1.1.0"
+    gauge: "npm:~2.7.3"
+    set-blocking: "npm:~2.0.0"
+  checksum: 10/b6b85c9f33da8f600f72564b6ec71136b1641b8b235fca7cc543d1041acb74c2d989d97fe443a0e65754f438d9a974a2fe1b4ff8723c78ef3f9b7a6d74b02079
+  languageName: node
+  linkType: hard
+
+"npmlog@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "npmlog@npm:5.0.1"
+  dependencies:
+    are-we-there-yet: "npm:^2.0.0"
+    console-control-strings: "npm:^1.1.0"
+    gauge: "npm:^3.0.0"
+    set-blocking: "npm:^2.0.0"
+  checksum: 10/f42c7b9584cdd26a13c41a21930b6f5912896b6419ab15be88cc5721fc792f1c3dd30eb602b26ae08575694628ba70afdcf3675d86e4f450fc544757e52726ec
   languageName: node
   linkType: hard
 
-"npmlog@npm:^6.0.0, npmlog@npm:^6.0.2":
+"npmlog@npm:^6.0.2":
   version: 6.0.2
   resolution: "npmlog@npm:6.0.2"
   dependencies:
-    are-we-there-yet: ^3.0.0
-    console-control-strings: ^1.1.0
-    gauge: ^4.0.3
-    set-blocking: ^2.0.0
-  checksum: ae238cd264a1c3f22091cdd9e2b106f684297d3c184f1146984ecbe18aaa86343953f26b9520dedd1b1372bc0316905b736c1932d778dbeb1fcf5a1001390e2a
+    are-we-there-yet: "npm:^3.0.0"
+    console-control-strings: "npm:^1.1.0"
+    gauge: "npm:^4.0.3"
+    set-blocking: "npm:^2.0.0"
+  checksum: 10/82b123677e62deb9e7472e27b92386c09e6e254ee6c8bcd720b3011013e4168bc7088e984f4fbd53cb6e12f8b4690e23e4fa6132689313e0d0dc4feea45489bb
   languageName: node
   linkType: hard
 
@@ -22838,66 +24321,97 @@ __metadata:
   version: 2.1.1
   resolution: "nth-check@npm:2.1.1"
   dependencies:
-    boolbase: ^1.0.0
-  checksum: 5afc3dafcd1573b08877ca8e6148c52abd565f1d06b1eb08caf982e3fa289a82f2cae697ffb55b5021e146d60443f1590a5d6b944844e944714a5b549675bcd3
+    boolbase: "npm:^1.0.0"
+  checksum: 10/5afc3dafcd1573b08877ca8e6148c52abd565f1d06b1eb08caf982e3fa289a82f2cae697ffb55b5021e146d60443f1590a5d6b944844e944714a5b549675bcd3
   languageName: node
   linkType: hard
 
 "number-is-nan@npm:^1.0.0":
   version: 1.0.1
   resolution: "number-is-nan@npm:1.0.1"
-  checksum: 13656bc9aa771b96cef209ffca31c31a03b507ca6862ba7c3f638a283560620d723d52e626d57892c7fff475f4c36ac07f0600f14544692ff595abff214b9ffb
+  checksum: 10/13656bc9aa771b96cef209ffca31c31a03b507ca6862ba7c3f638a283560620d723d52e626d57892c7fff475f4c36ac07f0600f14544692ff595abff214b9ffb
   languageName: node
   linkType: hard
 
 "nwsapi@npm:^2.2.2":
   version: 2.2.2
   resolution: "nwsapi@npm:2.2.2"
-  checksum: 43769106292bc95f776756ca2f3513dab7b4d506a97c67baec32406447841a35f65f29c1f95ab5d42785210fd41668beed33ca16fa058780be43b101ad73e205
-  languageName: node
-  linkType: hard
-
-"nx@npm:14.8.2, nx@npm:>=14.6.1 < 16":
-  version: 14.8.2
-  resolution: "nx@npm:14.8.2"
-  dependencies:
-    "@nrwl/cli": 14.8.2
-    "@nrwl/tao": 14.8.2
-    "@parcel/watcher": 2.0.4
-    "@yarnpkg/lockfile": ^1.1.0
-    "@yarnpkg/parsers": ^3.0.0-rc.18
-    "@zkochan/js-yaml": 0.0.6
-    chalk: 4.1.0
-    chokidar: ^3.5.1
-    cli-cursor: 3.1.0
-    cli-spinners: 2.6.1
-    cliui: ^7.0.2
-    dotenv: ~10.0.0
-    enquirer: ~2.3.6
-    fast-glob: 3.2.7
-    figures: 3.2.0
-    flat: ^5.0.2
-    fs-extra: ^10.1.0
-    glob: 7.1.4
-    ignore: ^5.0.4
-    js-yaml: 4.1.0
-    jsonc-parser: 3.2.0
-    minimatch: 3.0.5
-    npm-run-path: ^4.0.1
-    open: ^8.4.0
-    semver: 7.3.4
-    string-width: ^4.2.3
-    strong-log-transformer: ^2.1.0
-    tar-stream: ~2.2.0
-    tmp: ~0.2.1
-    tsconfig-paths: ^3.9.0
-    tslib: ^2.3.0
-    v8-compile-cache: 2.3.0
-    yargs: ^17.4.0
-    yargs-parser: 21.0.1
-  peerDependencies:
-    "@swc-node/register": ^1.4.2
-    "@swc/core": ^1.2.173
+  checksum: 10/b3d6e6dec645796696fc90f119e9e2f81023bdf144d3c6f9c9f8cec3b810c4cde941add251d7ead060261a2b2f391ad963d105a00cfb1b3ed3ec3d2a8d340fd6
+  languageName: node
+  linkType: hard
+
+"nx@npm:18.1.3, nx@npm:>=17.1.2 < 19":
+  version: 18.1.3
+  resolution: "nx@npm:18.1.3"
+  dependencies:
+    "@nrwl/tao": "npm:18.1.3"
+    "@nx/nx-darwin-arm64": "npm:18.1.3"
+    "@nx/nx-darwin-x64": "npm:18.1.3"
+    "@nx/nx-freebsd-x64": "npm:18.1.3"
+    "@nx/nx-linux-arm-gnueabihf": "npm:18.1.3"
+    "@nx/nx-linux-arm64-gnu": "npm:18.1.3"
+    "@nx/nx-linux-arm64-musl": "npm:18.1.3"
+    "@nx/nx-linux-x64-gnu": "npm:18.1.3"
+    "@nx/nx-linux-x64-musl": "npm:18.1.3"
+    "@nx/nx-win32-arm64-msvc": "npm:18.1.3"
+    "@nx/nx-win32-x64-msvc": "npm:18.1.3"
+    "@yarnpkg/lockfile": "npm:^1.1.0"
+    "@yarnpkg/parsers": "npm:3.0.0-rc.46"
+    "@zkochan/js-yaml": "npm:0.0.6"
+    axios: "npm:^1.6.0"
+    chalk: "npm:^4.1.0"
+    cli-cursor: "npm:3.1.0"
+    cli-spinners: "npm:2.6.1"
+    cliui: "npm:^8.0.1"
+    dotenv: "npm:~16.3.1"
+    dotenv-expand: "npm:~10.0.0"
+    enquirer: "npm:~2.3.6"
+    figures: "npm:3.2.0"
+    flat: "npm:^5.0.2"
+    fs-extra: "npm:^11.1.0"
+    ignore: "npm:^5.0.4"
+    jest-diff: "npm:^29.4.1"
+    js-yaml: "npm:4.1.0"
+    jsonc-parser: "npm:3.2.0"
+    lines-and-columns: "npm:~2.0.3"
+    minimatch: "npm:9.0.3"
+    node-machine-id: "npm:1.1.12"
+    npm-run-path: "npm:^4.0.1"
+    open: "npm:^8.4.0"
+    ora: "npm:5.3.0"
+    semver: "npm:^7.5.3"
+    string-width: "npm:^4.2.3"
+    strong-log-transformer: "npm:^2.1.0"
+    tar-stream: "npm:~2.2.0"
+    tmp: "npm:~0.2.1"
+    tsconfig-paths: "npm:^4.1.2"
+    tslib: "npm:^2.3.0"
+    yargs: "npm:^17.6.2"
+    yargs-parser: "npm:21.1.1"
+  peerDependencies:
+    "@swc-node/register": ^1.8.0
+    "@swc/core": ^1.3.85
+  dependenciesMeta:
+    "@nx/nx-darwin-arm64":
+      optional: true
+    "@nx/nx-darwin-x64":
+      optional: true
+    "@nx/nx-freebsd-x64":
+      optional: true
+    "@nx/nx-linux-arm-gnueabihf":
+      optional: true
+    "@nx/nx-linux-arm64-gnu":
+      optional: true
+    "@nx/nx-linux-arm64-musl":
+      optional: true
+    "@nx/nx-linux-x64-gnu":
+      optional: true
+    "@nx/nx-linux-x64-musl":
+      optional: true
+    "@nx/nx-win32-arm64-msvc":
+      optional: true
+    "@nx/nx-win32-x64-msvc":
+      optional: true
   peerDependenciesMeta:
     "@swc-node/register":
       optional: true
@@ -22905,35 +24419,36 @@ __metadata:
       optional: true
   bin:
     nx: bin/nx.js
-  checksum: b0c0428366f867e20d5f89d8e9bf2f8c8b6f9c0a60a7b8bebc3617d652b0e33109bc8bce352b9e7218db69eb181b0bacb3378c3d0f5b063acfd986ed0b35f7df
+    nx-cloud: bin/nx-cloud.js
+  checksum: 10/216b91cda546c949fb4cc64ee036d1510482ceb6668f6f157d5c25c47dae179e26792867b163a68ca735f90559dfb04f7c811c791ef4d26cdd8799c498fec880
   languageName: node
   linkType: hard
 
 "oauth-sign@npm:~0.9.0":
   version: 0.9.0
   resolution: "oauth-sign@npm:0.9.0"
-  checksum: 8f5497a127967866a3c67094c21efd295e46013a94e6e828573c62220e9af568cc1d2d04b16865ba583e430510fa168baf821ea78f355146d8ed7e350fc44c64
+  checksum: 10/1809a366d258f41fdf4ab5310cff3d1e15f96b187503bc7333cef4351de7bd0f52cb269bc95800f1fae5fb04dd886287df1471985fd67e8484729fdbcf857119
   languageName: node
   linkType: hard
 
 "object-assign@npm:4.x, object-assign@npm:^4.1.0, object-assign@npm:^4.1.1":
   version: 4.1.1
   resolution: "object-assign@npm:4.1.1"
-  checksum: fcc6e4ea8c7fe48abfbb552578b1c53e0d194086e2e6bbbf59e0a536381a292f39943c6e9628af05b5528aa5e3318bb30d6b2e53cadaf5b8fe9e12c4b69af23f
+  checksum: 10/fcc6e4ea8c7fe48abfbb552578b1c53e0d194086e2e6bbbf59e0a536381a292f39943c6e9628af05b5528aa5e3318bb30d6b2e53cadaf5b8fe9e12c4b69af23f
   languageName: node
   linkType: hard
 
 "object-assign@npm:^3.0.0":
   version: 3.0.0
   resolution: "object-assign@npm:3.0.0"
-  checksum: 56c66a77318aea95b11bd16a65c313e98786cea1db673a7fdd3bc92aced671b35f62a9819ad9cf7846921c773818329636cda5cd1b7c4fa0ce9908440e091dac
+  checksum: 10/56c66a77318aea95b11bd16a65c313e98786cea1db673a7fdd3bc92aced671b35f62a9819ad9cf7846921c773818329636cda5cd1b7c4fa0ce9908440e091dac
   languageName: node
   linkType: hard
 
-"object-inspect@npm:^1.12.3, object-inspect@npm:^1.9.0":
-  version: 1.12.3
-  resolution: "object-inspect@npm:1.12.3"
-  checksum: dabfd824d97a5f407e6d5d24810d888859f6be394d8b733a77442b277e0808860555176719c5905e765e3743a7cada6b8b0a3b85e5331c530fd418cc8ae991db
+"object-inspect@npm:^1.13.1, object-inspect@npm:^1.9.0":
+  version: 1.13.1
+  resolution: "object-inspect@npm:1.13.1"
+  checksum: 10/92f4989ed83422d56431bc39656d4c780348eb15d397ce352ade6b7fec08f973b53744bd41b94af021901e61acaf78fcc19e65bf464ecc0df958586a672700f0
   languageName: node
   linkType: hard
 
@@ -22941,39 +24456,39 @@ __metadata:
   version: 1.1.5
   resolution: "object-is@npm:1.1.5"
   dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.1.3
-  checksum: 989b18c4cba258a6b74dc1d74a41805c1a1425bce29f6cabb50dcb1a6a651ea9104a1b07046739a49a5bb1bc49727bcb00efd5c55f932f6ea04ec8927a7901fe
+    call-bind: "npm:^1.0.2"
+    define-properties: "npm:^1.1.3"
+  checksum: 10/75365aff5da4bebad5d20efd9f9a7a13597e603f5eb03d89da8f578c3f3937fe01c6cb5fce86c0611c48795c0841401fd37c943821db0de703c7b30a290576ad
   languageName: node
   linkType: hard
 
 "object-keys@npm:^1.1.1":
   version: 1.1.1
   resolution: "object-keys@npm:1.1.1"
-  checksum: b363c5e7644b1e1b04aa507e88dcb8e3a2f52b6ffd0ea801e4c7a62d5aa559affe21c55a07fd4b1fd55fc03a33c610d73426664b20032405d7b92a1414c34d6a
+  checksum: 10/3d81d02674115973df0b7117628ea4110d56042e5326413e4b4313f0bcdf7dd78d4a3acef2c831463fa3796a66762c49daef306f4a0ea1af44877d7086d73bde
   languageName: node
   linkType: hard
 
-"object.assign@npm:^4.0.4, object.assign@npm:^4.1.3, object.assign@npm:^4.1.4":
-  version: 4.1.4
-  resolution: "object.assign@npm:4.1.4"
+"object.assign@npm:^4.1.4, object.assign@npm:^4.1.5":
+  version: 4.1.5
+  resolution: "object.assign@npm:4.1.5"
   dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    has-symbols: ^1.0.3
-    object-keys: ^1.1.1
-  checksum: 76cab513a5999acbfe0ff355f15a6a125e71805fcf53de4e9d4e082e1989bdb81d1e329291e1e4e0ae7719f0e4ef80e88fb2d367ae60500d79d25a6224ac8864
+    call-bind: "npm:^1.0.5"
+    define-properties: "npm:^1.2.1"
+    has-symbols: "npm:^1.0.3"
+    object-keys: "npm:^1.1.1"
+  checksum: 10/dbb22da4cda82e1658349ea62b80815f587b47131b3dd7a4ab7f84190ab31d206bbd8fe7e26ae3220c55b65725ac4529825f6142154211220302aa6b1518045d
   languageName: node
   linkType: hard
 
-"object.entries@npm:^1.1.6":
-  version: 1.1.6
-  resolution: "object.entries@npm:1.1.6"
+"object.entries@npm:^1.1.6, object.entries@npm:^1.1.7":
+  version: 1.1.7
+  resolution: "object.entries@npm:1.1.7"
   dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    es-abstract: ^1.20.4
-  checksum: 0f8c47517e6a9a980241eafe3b73de11e59511883173c2b93d67424a008e47e11b77c80e431ad1d8a806f6108b225a1cab9223e53e555776c612a24297117d28
+    call-bind: "npm:^1.0.2"
+    define-properties: "npm:^1.2.0"
+    es-abstract: "npm:^1.22.1"
+  checksum: 10/03f0bd0f23a8626c94429d15abf26ccda7723f08cd26be2c09c72d436765f8c7468605b5476ca58d4a7cec1ec7eca5be496dbd938fd4236b77ed6d05a8680048
   languageName: node
   linkType: hard
 
@@ -22981,10 +24496,10 @@ __metadata:
   version: 2.0.7
   resolution: "object.fromentries@npm:2.0.7"
   dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-  checksum: 7341ce246e248b39a431b87a9ddd331ff52a454deb79afebc95609f94b1f8238966cf21f52188f2a353f0fdf83294f32f1ebf1f7826aae915ebad21fd0678065
+    call-bind: "npm:^1.0.2"
+    define-properties: "npm:^1.2.0"
+    es-abstract: "npm:^1.22.1"
+  checksum: 10/1bfbe42a51f8d84e417d193fae78e4b8eebb134514cdd44406480f8e8a0e075071e0717635d8e3eccd50fec08c1d555fe505c38804cbac0808397187653edd59
   languageName: node
   linkType: hard
 
@@ -22992,21 +24507,30 @@ __metadata:
   version: 1.0.1
   resolution: "object.groupby@npm:1.0.1"
   dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-    get-intrinsic: ^1.2.1
-  checksum: d7959d6eaaba358b1608066fc67ac97f23ce6f573dc8fc661f68c52be165266fcb02937076aedb0e42722fdda0bdc0bbf74778196ac04868178888e9fd3b78b5
+    call-bind: "npm:^1.0.2"
+    define-properties: "npm:^1.2.0"
+    es-abstract: "npm:^1.22.1"
+    get-intrinsic: "npm:^1.2.1"
+  checksum: 10/b7123d91403f95d63978513b23a6079c30f503311f64035fafc863c291c787f287b58df3b21ef002ce1d0b820958c9009dd5a8ab696e0eca325639d345e41524
   languageName: node
   linkType: hard
 
-"object.hasown@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "object.hasown@npm:1.1.2"
+"object.hasown@npm:^1.1.2, object.hasown@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "object.hasown@npm:1.1.3"
+  dependencies:
+    define-properties: "npm:^1.2.0"
+    es-abstract: "npm:^1.22.1"
+  checksum: 10/735679729c25a4e0d3713adf5df9861d862f0453e87ada4d991b75cd4225365dec61a08435e1127f42c9cc1adfc8e952fa5dca75364ebda6539dadf4721dc9c4
+  languageName: node
+  linkType: hard
+
+"object.omit@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "object.omit@npm:3.0.0"
   dependencies:
-    define-properties: ^1.1.4
-    es-abstract: ^1.20.4
-  checksum: b936572536db0cdf38eb30afd2f1026a8b6f2cc5d2c4497c9d9bbb01eaf3e980dead4fd07580cfdd098e6383e5a9db8212d3ea0c6bdd2b5e68c60aa7e3b45566
+    is-extendable: "npm:^1.0.0"
+  checksum: 10/1feb3a5891e3892451e34d3b460caae06f2a8a829854eced577cd30654a2ed37750e3d7f0d462e692b3b6623ad74777457c0ad32a9e622136b8171209d356890
   languageName: node
   linkType: hard
 
@@ -23014,33 +24538,33 @@ __metadata:
   version: 1.1.7
   resolution: "object.values@npm:1.1.7"
   dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-  checksum: f3e4ae4f21eb1cc7cebb6ce036d4c67b36e1c750428d7b7623c56a0db90edced63d08af8a316d81dfb7c41a3a5fa81b05b7cc9426e98d7da986b1682460f0777
+    call-bind: "npm:^1.0.2"
+    define-properties: "npm:^1.2.0"
+    es-abstract: "npm:^1.22.1"
+  checksum: 10/20ab42c0bbf984405c80e060114b18cf5d629a40a132c7eac4fb79c5d06deb97496311c19297dcf9c61f45c2539cd4c7f7c5d6230e51db360ff297bbc9910162
   languageName: node
   linkType: hard
 
 "objectorarray@npm:^1.0.5":
   version: 1.0.5
   resolution: "objectorarray@npm:1.0.5"
-  checksum: 8fd776aa495d113e217837f4adc1d53e63f656498237094d25f84c3e2c038b34b71d6fd85c4b60c7ae5f558790e5042426a400fae3eac35f297e11be12643a78
+  checksum: 10/8fd776aa495d113e217837f4adc1d53e63f656498237094d25f84c3e2c038b34b71d6fd85c4b60c7ae5f558790e5042426a400fae3eac35f297e11be12643a78
   languageName: node
   linkType: hard
 
 "obuf@npm:^1.0.0, obuf@npm:^1.1.2":
   version: 1.1.2
   resolution: "obuf@npm:1.1.2"
-  checksum: 41a2ba310e7b6f6c3b905af82c275bf8854896e2e4c5752966d64cbcd2f599cfffd5932006bcf3b8b419dfdacebb3a3912d5d94e10f1d0acab59876c8757f27f
+  checksum: 10/53ff4ab3a13cc33ba6c856cf281f2965c0aec9720967af450e8fd06cfd50aceeefc791986a16bcefa14e7898b3ca9acdfcf15b9d9a1b9c7e1366581a8ad6e65e
   languageName: node
   linkType: hard
 
-"ol-ext@npm:4.0.10":
-  version: 4.0.10
-  resolution: "ol-ext@npm:4.0.10"
+"ol-ext@npm:4.0.17":
+  version: 4.0.17
+  resolution: "ol-ext@npm:4.0.17"
   peerDependencies:
     ol: ">= 5.3.0"
-  checksum: dbc384b046cca5a5f862b1ee2148971194e1e890bf28763c93c7b3e489f5e141a222d5d21502a588940f796b55daf197069454bfbcc95a301d70f538597ccfe5
+  checksum: 10/38bb78706914adccf622d0fa06c5d25bfca2375faa8d1bb36598bfc52699b92a39167e29a8250637971e5d255afd6ab6c4dcca0d713741889b33b6485d7f73bc
   languageName: node
   linkType: hard
 
@@ -23048,10 +24572,10 @@ __metadata:
   version: 10.6.0
   resolution: "ol-mapbox-style@npm:10.6.0"
   dependencies:
-    "@mapbox/mapbox-gl-style-spec": ^13.23.1
-    mapbox-to-css-font: ^2.4.1
-    ol: ^7.3.0
-  checksum: 41ed5cc4c3a65fb141471ba69876e459dae196667bc3d62b39974a4b3684c72d6f815a5e97cb42221d82f9f2bf90946b968c68ac5761b35ac9a97ed7da7f5561
+    "@mapbox/mapbox-gl-style-spec": "npm:^13.23.1"
+    mapbox-to-css-font: "npm:^2.4.1"
+    ol: "npm:^7.3.0"
+  checksum: 10/069421f5260b6d7b02e6f753eef5e9e10d3a86df8fe425aab1317b5e3d75684709b4b506e4c47e9840abeb503066c64a73dd29ec4a1cf65a8cbc484e91c70bfb
   languageName: node
   linkType: hard
 
@@ -23059,12 +24583,21 @@ __metadata:
   version: 7.4.0
   resolution: "ol@npm:7.4.0"
   dependencies:
-    earcut: ^2.2.3
-    geotiff: ^2.0.7
-    ol-mapbox-style: ^10.1.0
-    pbf: 3.2.1
-    rbush: ^3.0.1
-  checksum: 0cc8cfbbb0fb2f2d6037e53e56cfbe24eabce647eefc73e03b3ee285973ee39f6ec45276fb2b3ef877878b3f28b75914cac054e036ea3b82e1314d5eeb28e723
+    earcut: "npm:^2.2.3"
+    geotiff: "npm:^2.0.7"
+    ol-mapbox-style: "npm:^10.1.0"
+    pbf: "npm:3.2.1"
+    rbush: "npm:^3.0.1"
+  checksum: 10/c83698fddd02fdd497e92bffee7ca7d4059f64d28a0be7a7781981f129b6636cacbee894aed331a572f066fe1e56a4cf22861c51e1efddb7fbb58c4bf5606ece
+  languageName: node
+  linkType: hard
+
+"on-finished@npm:^2.4.1":
+  version: 2.4.1
+  resolution: "on-finished@npm:2.4.1"
+  dependencies:
+    ee-first: "npm:1.1.1"
+  checksum: 10/8e81472c5028125c8c39044ac4ab8ba51a7cdc19a9fbd4710f5d524a74c6d8c9ded4dd0eed83f28d3d33ac1d7a6a439ba948ccb765ac6ce87f30450a26bfe2ea
   languageName: node
   linkType: hard
 
@@ -23072,24 +24605,24 @@ __metadata:
   version: 2.3.0
   resolution: "on-finished@npm:2.3.0"
   dependencies:
-    ee-first: 1.1.1
-  checksum: 1db595bd963b0124d6fa261d18320422407b8f01dc65863840f3ddaaf7bcad5b28ff6847286703ca53f4ec19595bd67a2f1253db79fc4094911ec6aa8df1671b
+    ee-first: "npm:1.1.1"
+  checksum: 10/1db595bd963b0124d6fa261d18320422407b8f01dc65863840f3ddaaf7bcad5b28ff6847286703ca53f4ec19595bd67a2f1253db79fc4094911ec6aa8df1671b
   languageName: node
   linkType: hard
 
 "on-headers@npm:~1.0.2":
   version: 1.0.2
   resolution: "on-headers@npm:1.0.2"
-  checksum: 2bf13467215d1e540a62a75021e8b318a6cfc5d4fc53af8e8f84ad98dbcea02d506c6d24180cd62e1d769c44721ba542f3154effc1f7579a8288c9f7873ed8e5
+  checksum: 10/870766c16345855e2012e9422ba1ab110c7e44ad5891a67790f84610bd70a72b67fdd71baf497295f1d1bf38dd4c92248f825d48729c53c0eae5262fb69fa171
   languageName: node
   linkType: hard
 
-"once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.3.2, once@npm:^1.4.0":
+"once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.4.0":
   version: 1.4.0
   resolution: "once@npm:1.4.0"
   dependencies:
-    wrappy: 1
-  checksum: cd0a88501333edd640d95f0d2700fbde6bff20b3d4d9bdc521bdd31af0656b5706570d6c6afe532045a20bb8dc0849f8332d6f2a416e0ba6d3d3b98806c7db68
+    wrappy: "npm:1"
+  checksum: 10/cd0a88501333edd640d95f0d2700fbde6bff20b3d4d9bdc521bdd31af0656b5706570d6c6afe532045a20bb8dc0849f8332d6f2a416e0ba6d3d3b98806c7db68
   languageName: node
   linkType: hard
 
@@ -23097,19 +24630,31 @@ __metadata:
   version: 5.1.2
   resolution: "onetime@npm:5.1.2"
   dependencies:
-    mimic-fn: ^2.1.0
-  checksum: 2478859ef817fc5d4e9c2f9e5728512ddd1dbc9fb7829ad263765bb6d3b91ce699d6e2332eef6b7dff183c2f490bd3349f1666427eaba4469fba0ac38dfd0d34
+    mimic-fn: "npm:^2.1.0"
+  checksum: 10/e9fd0695a01cf226652f0385bf16b7a24153dbbb2039f764c8ba6d2306a8506b0e4ce570de6ad99c7a6eb49520743afdb66edd95ee979c1a342554ed49a9aadd
+  languageName: node
+  linkType: hard
+
+"open@npm:^10.0.3":
+  version: 10.0.3
+  resolution: "open@npm:10.0.3"
+  dependencies:
+    default-browser: "npm:^5.2.1"
+    define-lazy-prop: "npm:^3.0.0"
+    is-inside-container: "npm:^1.0.0"
+    is-wsl: "npm:^3.1.0"
+  checksum: 10/4dc757ad1d3d63490822f991e9cbe3a7c05b7249fca2eaa571cb7d191e5cec88bc37e15d8ef4fd740d8989a288b661d8da253caa8d98e8c97430ddbbb0ae4ed1
   languageName: node
   linkType: hard
 
-"open@npm:^8.0.4, open@npm:^8.0.9, open@npm:^8.4.0":
+"open@npm:^8.0.4, open@npm:^8.4.0":
   version: 8.4.2
   resolution: "open@npm:8.4.2"
   dependencies:
-    define-lazy-prop: ^2.0.0
-    is-docker: ^2.1.1
-    is-wsl: ^2.2.0
-  checksum: 6388bfff21b40cb9bd8f913f9130d107f2ed4724ea81a8fd29798ee322b361ca31fa2cdfb491a5c31e43a3996cfe9566741238c7a741ada8d7af1cb78d85cf26
+    define-lazy-prop: "npm:^2.0.0"
+    is-docker: "npm:^2.1.1"
+    is-wsl: "npm:^2.2.0"
+  checksum: 10/acd81a1d19879c818acb3af2d2e8e9d81d17b5367561e623248133deb7dd3aefaed527531df2677d3e6aaf0199f84df57b6b2262babff8bf46ea0029aac536c9
   languageName: node
   linkType: hard
 
@@ -23118,68 +24663,75 @@ __metadata:
   resolution: "opener@npm:1.5.2"
   bin:
     opener: bin/opener-bin.js
-  checksum: 33b620c0d53d5b883f2abc6687dd1c5fd394d270dbe33a6356f2d71e0a2ec85b100d5bac94694198ccf5c30d592da863b2292c5539009c715a9c80c697b4f6cc
+  checksum: 10/0504efcd6546e14c016a261f58a68acf9f2e5c23d84865d7d5470d5169788327ceaa5386253682f533b3fba4821748aa37ecb395f3dae7acb3261b9b22e36814
   languageName: node
   linkType: hard
 
-"optionator@npm:^0.9.1, optionator@npm:^0.9.3":
+"optionator@npm:^0.9.3":
   version: 0.9.3
   resolution: "optionator@npm:0.9.3"
   dependencies:
-    "@aashutoshrathi/word-wrap": ^1.2.3
-    deep-is: ^0.1.3
-    fast-levenshtein: ^2.0.6
-    levn: ^0.4.1
-    prelude-ls: ^1.2.1
-    type-check: ^0.4.0
-  checksum: 09281999441f2fe9c33a5eeab76700795365a061563d66b098923eb719251a42bdbe432790d35064d0816ead9296dbeb1ad51a733edf4167c96bd5d0882e428a
+    "@aashutoshrathi/word-wrap": "npm:^1.2.3"
+    deep-is: "npm:^0.1.3"
+    fast-levenshtein: "npm:^2.0.6"
+    levn: "npm:^0.4.1"
+    prelude-ls: "npm:^1.2.1"
+    type-check: "npm:^0.4.0"
+  checksum: 10/fa28d3016395974f7fc087d6bbf0ac7f58ac3489f4f202a377e9c194969f329a7b88c75f8152b33fb08794a30dcd5c079db6bb465c28151357f113d80bbf67da
   languageName: node
   linkType: hard
 
-"ora@npm:^5.4.1":
-  version: 5.4.1
-  resolution: "ora@npm:5.4.1"
+"ora@npm:5.3.0":
+  version: 5.3.0
+  resolution: "ora@npm:5.3.0"
   dependencies:
-    bl: ^4.1.0
-    chalk: ^4.1.0
-    cli-cursor: ^3.1.0
-    cli-spinners: ^2.5.0
-    is-interactive: ^1.0.0
-    is-unicode-supported: ^0.1.0
-    log-symbols: ^4.1.0
-    strip-ansi: ^6.0.0
-    wcwidth: ^1.0.1
-  checksum: 28d476ee6c1049d68368c0dc922e7225e3b5600c3ede88fade8052837f9ed342625fdaa84a6209302587c8ddd9b664f71f0759833cbdb3a4cf81344057e63c63
+    bl: "npm:^4.0.3"
+    chalk: "npm:^4.1.0"
+    cli-cursor: "npm:^3.1.0"
+    cli-spinners: "npm:^2.5.0"
+    is-interactive: "npm:^1.0.0"
+    log-symbols: "npm:^4.0.0"
+    strip-ansi: "npm:^6.0.0"
+    wcwidth: "npm:^1.0.1"
+  checksum: 10/989a075b596c297acfee647010e555709bd657dedd9eee9ff99d923cbc65c68b6189c2c9ea58167675b101433509f87d1674a84047c7b766babab15d9220f1d5
   languageName: node
   linkType: hard
 
-"ordered-read-streams@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "ordered-read-streams@npm:1.0.1"
+"ora@npm:^5.4.1":
+  version: 5.4.1
+  resolution: "ora@npm:5.4.1"
   dependencies:
-    readable-stream: ^2.0.1
-  checksum: 7558ac1acd649164524be715d25e38a1aba0f34df9dfb8ce281f9d14589ac3506bfe66e6609fa8c9cf0d7835e11da33f3f5445336cf3eb783f81da09a1bc5fe8
+    bl: "npm:^4.1.0"
+    chalk: "npm:^4.1.0"
+    cli-cursor: "npm:^3.1.0"
+    cli-spinners: "npm:^2.5.0"
+    is-interactive: "npm:^1.0.0"
+    is-unicode-supported: "npm:^0.1.0"
+    log-symbols: "npm:^4.1.0"
+    strip-ansi: "npm:^6.0.0"
+    wcwidth: "npm:^1.0.1"
+  checksum: 10/8d071828f40090a8e1c6e8f350c6eb065808e9ab2b3e57fa37e0d5ae78cb46dac00117c8f12c3c8b8da2923454afbd8265e08c10b69881170c5b269f451e7fef
   languageName: node
   linkType: hard
 
 "os-tmpdir@npm:~1.0.2":
   version: 1.0.2
   resolution: "os-tmpdir@npm:1.0.2"
-  checksum: 5666560f7b9f10182548bf7013883265be33620b1c1b4a4d405c25be2636f970c5488ff3e6c48de75b55d02bde037249fe5dbfbb4c0fb7714953d56aed062e6d
+  checksum: 10/5666560f7b9f10182548bf7013883265be33620b1c1b4a4d405c25be2636f970c5488ff3e6c48de75b55d02bde037249fe5dbfbb4c0fb7714953d56aed062e6d
   languageName: node
   linkType: hard
 
 "ospath@npm:^1.2.2":
   version: 1.2.2
   resolution: "ospath@npm:1.2.2"
-  checksum: 505f48a4f4f1c557d6c656ec985707726e3714721680139be037613e903aa8c8fa4ddd8d1342006f9b2dc0065e6e20f8b7bea2ee05354f31257044790367b347
+  checksum: 10/505f48a4f4f1c557d6c656ec985707726e3714721680139be037613e903aa8c8fa4ddd8d1342006f9b2dc0065e6e20f8b7bea2ee05354f31257044790367b347
   languageName: node
   linkType: hard
 
-"outvariant@npm:^1.2.1, outvariant@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "outvariant@npm:1.4.0"
-  checksum: ec32dfc315c464bb6e4906b2f450d259ce0b86caf70b70b249054359d9af21a7fccf53a8b6aa232f8d718449e31c1cfa594e6ebffaafe7bf908b502495256d7b
+"outvariant@npm:^1.2.1, outvariant@npm:^1.4.0, outvariant@npm:^1.4.2":
+  version: 1.4.2
+  resolution: "outvariant@npm:1.4.2"
+  checksum: 10/f16ba035fb65d1cbe7d2e06693dd42183c46bc8456713d9ddb5182d067defa7d78217edab0a2d3e173d3bacd627b2bd692195c7087c225b82548fbf52c677b38
   languageName: node
   linkType: hard
 
@@ -23187,15 +24739,15 @@ __metadata:
   version: 1.1.0
   resolution: "overlap-area@npm:1.1.0"
   dependencies:
-    "@daybrush/utils": ^1.7.1
-  checksum: 718e48a54e11e02ec461f2ad3bc05f396e249a609325ee94ae3bffa568816cf16b3053f512ad549a27e4d644f4194c3e47e4c9c4af02826ae063df67026cbf58
+    "@daybrush/utils": "npm:^1.7.1"
+  checksum: 10/98cafefd51e6abece7c15c6ce58266ca72cff43e73db2e36408a0686f21337a99ec12a5ba3021f826f1981d6039b83fe42412906d3764f91b08f29d6b71f8d48
   languageName: node
   linkType: hard
 
 "p-finally@npm:^1.0.0":
   version: 1.0.0
   resolution: "p-finally@npm:1.0.0"
-  checksum: 93a654c53dc805dd5b5891bab16eb0ea46db8f66c4bfd99336ae929323b1af2b70a8b0654f8f1eae924b2b73d037031366d645f1fd18b3d30cbd15950cc4b1d4
+  checksum: 10/93a654c53dc805dd5b5891bab16eb0ea46db8f66c4bfd99336ae929323b1af2b70a8b0654f8f1eae924b2b73d037031366d645f1fd18b3d30cbd15950cc4b1d4
   languageName: node
   linkType: hard
 
@@ -23203,8 +24755,8 @@ __metadata:
   version: 1.3.0
   resolution: "p-limit@npm:1.3.0"
   dependencies:
-    p-try: ^1.0.0
-  checksum: 281c1c0b8c82e1ac9f81acd72a2e35d402bf572e09721ce5520164e9de07d8274451378a3470707179ad13240535558f4b277f02405ad752e08c7d5b0d54fbfd
+    p-try: "npm:^1.0.0"
+  checksum: 10/eb9d9bc378d48ab1998d2a2b2962a99eddd3e3726c82d3258ecc1a475f22907968edea4fec2736586d100366a001c6bb449a2abe6cd65e252e9597394f01e789
   languageName: node
   linkType: hard
 
@@ -23212,8 +24764,8 @@ __metadata:
   version: 2.3.0
   resolution: "p-limit@npm:2.3.0"
   dependencies:
-    p-try: ^2.0.0
-  checksum: 84ff17f1a38126c3314e91ecfe56aecbf36430940e2873dadaa773ffe072dc23b7af8e46d4b6485d302a11673fe94c6b67ca2cfbb60c989848b02100d0594ac1
+    p-try: "npm:^2.0.0"
+  checksum: 10/84ff17f1a38126c3314e91ecfe56aecbf36430940e2873dadaa773ffe072dc23b7af8e46d4b6485d302a11673fe94c6b67ca2cfbb60c989848b02100d0594ac1
   languageName: node
   linkType: hard
 
@@ -23221,8 +24773,8 @@ __metadata:
   version: 3.1.0
   resolution: "p-limit@npm:3.1.0"
   dependencies:
-    yocto-queue: ^0.1.0
-  checksum: 7c3690c4dbf62ef625671e20b7bdf1cbc9534e83352a2780f165b0d3ceba21907e77ad63401708145ca4e25bfc51636588d89a8c0aeb715e6c37d1c066430360
+    yocto-queue: "npm:^0.1.0"
+  checksum: 10/7c3690c4dbf62ef625671e20b7bdf1cbc9534e83352a2780f165b0d3ceba21907e77ad63401708145ca4e25bfc51636588d89a8c0aeb715e6c37d1c066430360
   languageName: node
   linkType: hard
 
@@ -23230,8 +24782,8 @@ __metadata:
   version: 4.0.0
   resolution: "p-limit@npm:4.0.0"
   dependencies:
-    yocto-queue: ^1.0.0
-  checksum: 01d9d70695187788f984226e16c903475ec6a947ee7b21948d6f597bed788e3112cc7ec2e171c1d37125057a5f45f3da21d8653e04a3a793589e12e9e80e756b
+    yocto-queue: "npm:^1.0.0"
+  checksum: 10/01d9d70695187788f984226e16c903475ec6a947ee7b21948d6f597bed788e3112cc7ec2e171c1d37125057a5f45f3da21d8653e04a3a793589e12e9e80e756b
   languageName: node
   linkType: hard
 
@@ -23239,8 +24791,8 @@ __metadata:
   version: 2.0.0
   resolution: "p-locate@npm:2.0.0"
   dependencies:
-    p-limit: ^1.1.0
-  checksum: e2dceb9b49b96d5513d90f715780f6f4972f46987dc32a0e18bc6c3fc74a1a5d73ec5f81b1398af5e58b99ea1ad03fd41e9181c01fa81b4af2833958696e3081
+    p-limit: "npm:^1.1.0"
+  checksum: 10/e2dceb9b49b96d5513d90f715780f6f4972f46987dc32a0e18bc6c3fc74a1a5d73ec5f81b1398af5e58b99ea1ad03fd41e9181c01fa81b4af2833958696e3081
   languageName: node
   linkType: hard
 
@@ -23248,8 +24800,8 @@ __metadata:
   version: 3.0.0
   resolution: "p-locate@npm:3.0.0"
   dependencies:
-    p-limit: ^2.0.0
-  checksum: 83991734a9854a05fe9dbb29f707ea8a0599391f52daac32b86f08e21415e857ffa60f0e120bfe7ce0cc4faf9274a50239c7895fc0d0579d08411e513b83a4ae
+    p-limit: "npm:^2.0.0"
+  checksum: 10/83991734a9854a05fe9dbb29f707ea8a0599391f52daac32b86f08e21415e857ffa60f0e120bfe7ce0cc4faf9274a50239c7895fc0d0579d08411e513b83a4ae
   languageName: node
   linkType: hard
 
@@ -23257,8 +24809,8 @@ __metadata:
   version: 4.1.0
   resolution: "p-locate@npm:4.1.0"
   dependencies:
-    p-limit: ^2.2.0
-  checksum: 513bd14a455f5da4ebfcb819ef706c54adb09097703de6aeaa5d26fe5ea16df92b48d1ac45e01e3944ce1e6aa2a66f7f8894742b8c9d6e276e16cd2049a2b870
+    p-limit: "npm:^2.2.0"
+  checksum: 10/513bd14a455f5da4ebfcb819ef706c54adb09097703de6aeaa5d26fe5ea16df92b48d1ac45e01e3944ce1e6aa2a66f7f8894742b8c9d6e276e16cd2049a2b870
   languageName: node
   linkType: hard
 
@@ -23266,8 +24818,8 @@ __metadata:
   version: 5.0.0
   resolution: "p-locate@npm:5.0.0"
   dependencies:
-    p-limit: ^3.0.2
-  checksum: 1623088f36cf1cbca58e9b61c4e62bf0c60a07af5ae1ca99a720837356b5b6c5ba3eb1b2127e47a06865fee59dd0453cad7cc844cda9d5a62ac1a5a51b7c86d3
+    p-limit: "npm:^3.0.2"
+  checksum: 10/1623088f36cf1cbca58e9b61c4e62bf0c60a07af5ae1ca99a720837356b5b6c5ba3eb1b2127e47a06865fee59dd0453cad7cc844cda9d5a62ac1a5a51b7c86d3
   languageName: node
   linkType: hard
 
@@ -23275,58 +24827,59 @@ __metadata:
   version: 6.0.0
   resolution: "p-locate@npm:6.0.0"
   dependencies:
-    p-limit: ^4.0.0
-  checksum: 2bfe5234efa5e7a4e74b30a5479a193fdd9236f8f6b4d2f3f69e3d286d9a7d7ab0c118a2a50142efcf4e41625def635bd9332d6cbf9cc65d85eb0718c579ab38
+    p-limit: "npm:^4.0.0"
+  checksum: 10/2bfe5234efa5e7a4e74b30a5479a193fdd9236f8f6b4d2f3f69e3d286d9a7d7ab0c118a2a50142efcf4e41625def635bd9332d6cbf9cc65d85eb0718c579ab38
   languageName: node
   linkType: hard
 
-"p-map-series@npm:^2.1.0":
+"p-map-series@npm:2.1.0":
   version: 2.1.0
   resolution: "p-map-series@npm:2.1.0"
-  checksum: 69d4efbb6951c0dd62591d5a18c3af0af78496eae8b55791e049da239d70011aa3af727dece3fc9943e0bb3fd4fa64d24177cfbecc46efaf193179f0feeac486
+  checksum: 10/69d4efbb6951c0dd62591d5a18c3af0af78496eae8b55791e049da239d70011aa3af727dece3fc9943e0bb3fd4fa64d24177cfbecc46efaf193179f0feeac486
   languageName: node
   linkType: hard
 
-"p-map@npm:^4.0.0":
+"p-map@npm:4.0.0, p-map@npm:^4.0.0":
   version: 4.0.0
   resolution: "p-map@npm:4.0.0"
   dependencies:
-    aggregate-error: ^3.0.0
-  checksum: cb0ab21ec0f32ddffd31dfc250e3afa61e103ef43d957cc45497afe37513634589316de4eb88abdfd969fe6410c22c0b93ab24328833b8eb1ccc087fc0442a1c
+    aggregate-error: "npm:^3.0.0"
+  checksum: 10/7ba4a2b1e24c05e1fc14bbaea0fc6d85cf005ae7e9c9425d4575550f37e2e584b1af97bcde78eacd7559208f20995988d52881334db16cf77bc1bcf68e48ed7c
   languageName: node
   linkType: hard
 
-"p-pipe@npm:^3.1.0":
+"p-pipe@npm:3.1.0":
   version: 3.1.0
   resolution: "p-pipe@npm:3.1.0"
-  checksum: ee9a2609685f742c6ceb3122281ec4453bbbcc80179b13e66fd139dcf19b1c327cf6c2fdfc815b548d6667e7eaefe5396323f6d49c4f7933e4cef47939e3d65c
+  checksum: 10/d4ef73801a99bd6ca6f1bd0f46c7992c4d006421d653de387893b72d91373ab93fca75ffaacba6199b1ce5bb5ff51d715f1c669541186afbb0a11b4aebb032b3
   languageName: node
   linkType: hard
 
-"p-queue@npm:^6.6.2":
+"p-queue@npm:6.6.2":
   version: 6.6.2
   resolution: "p-queue@npm:6.6.2"
   dependencies:
-    eventemitter3: ^4.0.4
-    p-timeout: ^3.2.0
-  checksum: 832642fcc4ab6477b43e6d7c30209ab10952969ed211c6d6f2931be8a4f9935e3578c72e8cce053dc34f2eb6941a408a2c516a54904e989851a1a209cf19761c
+    eventemitter3: "npm:^4.0.4"
+    p-timeout: "npm:^3.2.0"
+  checksum: 10/60fe227ffce59fbc5b1b081305b61a2f283ff145005853702b7d4d3f99a0176bd21bb126c99a962e51fe1e01cb8aa10f0488b7bbe73b5dc2e84b5cc650b8ffd2
   languageName: node
   linkType: hard
 
-"p-reduce@npm:^2.0.0, p-reduce@npm:^2.1.0":
+"p-reduce@npm:2.1.0, p-reduce@npm:^2.0.0, p-reduce@npm:^2.1.0":
   version: 2.1.0
   resolution: "p-reduce@npm:2.1.0"
-  checksum: 99b26d36066a921982f25c575e78355824da0787c486e3dd9fc867460e8bf17d5fb3ce98d006b41bdc81ffc0aa99edf5faee53d11fe282a20291fb721b0cb1c7
+  checksum: 10/99b26d36066a921982f25c575e78355824da0787c486e3dd9fc867460e8bf17d5fb3ce98d006b41bdc81ffc0aa99edf5faee53d11fe282a20291fb721b0cb1c7
   languageName: node
   linkType: hard
 
-"p-retry@npm:^4.5.0":
-  version: 4.6.1
-  resolution: "p-retry@npm:4.6.1"
+"p-retry@npm:^6.2.0":
+  version: 6.2.0
+  resolution: "p-retry@npm:6.2.0"
   dependencies:
-    "@types/retry": ^0.12.0
-    retry: ^0.13.1
-  checksum: e6d540413bb3d0b96e0db44f74a7af1dce41f5005e6e84d617960110b148348c86a3987be07797749e3ddd55817dd3a8ffd6eae3428758bc2994d987e48c3a70
+    "@types/retry": "npm:0.12.2"
+    is-network-error: "npm:^1.0.0"
+    retry: "npm:^0.13.1"
+  checksum: 10/1a5ac16828c96c03c354f78d643dfc7aa8f8b998e1b60e27533da2c75e5cabfb1c7f88ce312e813e09a80b056011fbb372d384132e9c92d27d052bd7c282a978
   languageName: node
   linkType: hard
 
@@ -23334,83 +24887,80 @@ __metadata:
   version: 3.2.0
   resolution: "p-timeout@npm:3.2.0"
   dependencies:
-    p-finally: ^1.0.0
-  checksum: 3dd0eaa048780a6f23e5855df3dd45c7beacff1f820476c1d0d1bcd6648e3298752ba2c877aa1c92f6453c7dd23faaf13d9f5149fc14c0598a142e2c5e8d649c
+    p-finally: "npm:^1.0.0"
+  checksum: 10/3dd0eaa048780a6f23e5855df3dd45c7beacff1f820476c1d0d1bcd6648e3298752ba2c877aa1c92f6453c7dd23faaf13d9f5149fc14c0598a142e2c5e8d649c
   languageName: node
   linkType: hard
 
 "p-try@npm:^1.0.0":
   version: 1.0.0
   resolution: "p-try@npm:1.0.0"
-  checksum: 3b5303f77eb7722144154288bfd96f799f8ff3e2b2b39330efe38db5dd359e4fb27012464cd85cb0a76e9b7edd1b443568cb3192c22e7cffc34989df0bafd605
+  checksum: 10/20d9735f57258158df50249f172c77fe800d31e80f11a3413ac9e68ccbe6b11798acb3f48f2df8cea7ba2b56b753ce695a4fe2a2987c3c7691c44226b6d82b6f
   languageName: node
   linkType: hard
 
 "p-try@npm:^2.0.0":
   version: 2.2.0
   resolution: "p-try@npm:2.2.0"
-  checksum: f8a8e9a7693659383f06aec604ad5ead237c7a261c18048a6e1b5b85a5f8a067e469aa24f5bc009b991ea3b058a87f5065ef4176793a200d4917349881216cae
+  checksum: 10/f8a8e9a7693659383f06aec604ad5ead237c7a261c18048a6e1b5b85a5f8a067e469aa24f5bc009b991ea3b058a87f5065ef4176793a200d4917349881216cae
   languageName: node
   linkType: hard
 
-"p-waterfall@npm:^2.1.1":
+"p-waterfall@npm:2.1.1":
   version: 2.1.1
   resolution: "p-waterfall@npm:2.1.1"
   dependencies:
-    p-reduce: ^2.0.0
-  checksum: 8588bb8b004ee37e559c7e940a480c1742c42725d477b0776ff30b894920a3e48bddf8f60aa0ae82773e500a8fc99d75e947c450e0c2ce187aff72cc1b248f6d
-  languageName: node
-  linkType: hard
-
-"pacote@npm:^13.0.3, pacote@npm:^13.6.1":
-  version: 13.6.1
-  resolution: "pacote@npm:13.6.1"
-  dependencies:
-    "@npmcli/git": ^3.0.0
-    "@npmcli/installed-package-contents": ^1.0.7
-    "@npmcli/promise-spawn": ^3.0.0
-    "@npmcli/run-script": ^4.1.0
-    cacache: ^16.0.0
-    chownr: ^2.0.0
-    fs-minipass: ^2.1.0
-    infer-owner: ^1.0.4
-    minipass: ^3.1.6
-    mkdirp: ^1.0.4
-    npm-package-arg: ^9.0.0
-    npm-packlist: ^5.1.0
-    npm-pick-manifest: ^7.0.0
-    npm-registry-fetch: ^13.0.1
-    proc-log: ^2.0.0
-    promise-retry: ^2.0.1
-    read-package-json: ^5.0.0
-    read-package-json-fast: ^2.0.3
-    rimraf: ^3.0.2
-    ssri: ^9.0.0
-    tar: ^6.1.11
+    p-reduce: "npm:^2.0.0"
+  checksum: 10/3ab6762f3cf913eb0462e0016b242df679e4ace946cdfaab48999288c5b6fed9c6c6c5e050e08e777aa658f94e02fbab72349c59135d5a608d887293c5b16299
+  languageName: node
+  linkType: hard
+
+"pacote@npm:^17.0.5":
+  version: 17.0.6
+  resolution: "pacote@npm:17.0.6"
+  dependencies:
+    "@npmcli/git": "npm:^5.0.0"
+    "@npmcli/installed-package-contents": "npm:^2.0.1"
+    "@npmcli/promise-spawn": "npm:^7.0.0"
+    "@npmcli/run-script": "npm:^7.0.0"
+    cacache: "npm:^18.0.0"
+    fs-minipass: "npm:^3.0.0"
+    minipass: "npm:^7.0.2"
+    npm-package-arg: "npm:^11.0.0"
+    npm-packlist: "npm:^8.0.0"
+    npm-pick-manifest: "npm:^9.0.0"
+    npm-registry-fetch: "npm:^16.0.0"
+    proc-log: "npm:^3.0.0"
+    promise-retry: "npm:^2.0.1"
+    read-package-json: "npm:^7.0.0"
+    read-package-json-fast: "npm:^3.0.0"
+    sigstore: "npm:^2.2.0"
+    ssri: "npm:^10.0.0"
+    tar: "npm:^6.1.11"
   bin:
     pacote: lib/bin.js
-  checksum: 26cebb59aea93d03ad051d82c4f2300beb333ded0f16ba92cfe976b5600157bd1ee034afe1c86406bbe5eacd51d413797939b08aa58adcf73f7680aead9e667f
+  checksum: 10/fe96b362623128c67b4974bc2d0e8721515927c3546f04e9f3b0df0fe93ab74a8ed59c2896dec3ad1ed5395a8e439b3b64007b32d31b4b86796b50c75dffc924
   languageName: node
   linkType: hard
 
 "pako@npm:^0.2.6, pako@npm:~0.2.0":
   version: 0.2.9
   resolution: "pako@npm:0.2.9"
-  checksum: 055f9487cd57fbb78df84315873bbdd089ba286f3499daed47d2effdc6253e981f5db6898c23486de76d4a781559f890d643bd3a49f70f1b4a18019c98aa5125
+  checksum: 10/627c6842e90af0b3a9ee47345bd66485a589aff9514266f4fa9318557ad819c46fedf97510f2cef9b6224c57913777966a05cb46caf6a9b31177a5401a06fe15
   languageName: node
   linkType: hard
 
 "pako@npm:^2.0.4":
   version: 2.0.4
   resolution: "pako@npm:2.0.4"
-  checksum: 82b9b0b99dd830c9103856a6dbd10f0cb2c8c32b9768184727ea381a99666de9a47a069d2e6efe6acf09336f363956b50835c196ef9311b34b7274d420eb0d88
+  checksum: 10/b1383742061dbbf2d6e5eb0bb5de827fa5cdd74fc18e157478632443f049a62e47c29b761fb5f1268e6f6979b5b8cff2864f63c2b8156d555065c39c43992505
   languageName: node
   linkType: hard
 
 "papaparse@npm:5.4.1":
   version: 5.4.1
   resolution: "papaparse@npm:5.4.1"
-  checksum: fc9e52f7158dca3517c229e3309065b1ab5da6c7194572fba4f31ff138bc43e3c91182cc40365cc828f97fe10d0aca416068fd731661058bea0f69ddb84a411a
+  checksum: 10/5e6dc978187182ad2efa1d264ffe73d2042cd23b8fb1dcb0b0f5c8c7c772c11e3eb4e166fb0893880ed24529a96abe9065d704cc5b4cb96abf037413cfe43788
   languageName: node
   linkType: hard
 
@@ -23418,9 +24968,9 @@ __metadata:
   version: 3.0.4
   resolution: "param-case@npm:3.0.4"
   dependencies:
-    dot-case: ^3.0.4
-    tslib: ^2.0.3
-  checksum: b34227fd0f794e078776eb3aa6247442056cb47761e9cd2c4c881c86d84c64205f6a56ef0d70b41ee7d77da02c3f4ed2f88e3896a8fefe08bdfb4deca037c687
+    dot-case: "npm:^3.0.4"
+    tslib: "npm:^2.0.3"
+  checksum: 10/b34227fd0f794e078776eb3aa6247442056cb47761e9cd2c4c881c86d84c64205f6a56ef0d70b41ee7d77da02c3f4ed2f88e3896a8fefe08bdfb4deca037c687
   languageName: node
   linkType: hard
 
@@ -23428,19 +24978,17 @@ __metadata:
   version: 1.0.1
   resolution: "parent-module@npm:1.0.1"
   dependencies:
-    callsites: ^3.0.0
-  checksum: 6ba8b255145cae9470cf5551eb74be2d22281587af787a2626683a6c20fbb464978784661478dd2a3f1dad74d1e802d403e1b03c1a31fab310259eec8ac560ff
+    callsites: "npm:^3.0.0"
+  checksum: 10/6ba8b255145cae9470cf5551eb74be2d22281587af787a2626683a6c20fbb464978784661478dd2a3f1dad74d1e802d403e1b03c1a31fab310259eec8ac560ff
   languageName: node
   linkType: hard
 
-"parse-conflict-json@npm:^2.0.1":
-  version: 2.0.2
-  resolution: "parse-conflict-json@npm:2.0.2"
+"parse-color@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "parse-color@npm:1.0.0"
   dependencies:
-    json-parse-even-better-errors: ^2.3.1
-    just-diff: ^5.0.1
-    just-diff-apply: ^5.2.0
-  checksum: 076f65c958696586daefb153f59d575dfb59648be43116a21b74d5ff69ec63dd56f585a27cc2da56d8e64ca5abf0373d6619b8330c035131f8d1e990c8406378
+    color-convert: "npm:~0.5.0"
+  checksum: 10/9f988462af30929acbbce135286ce20dc2fb8efe48fd0693ed8bfd7da3a60e2465cffff6d35047fe94fd7863b43159bf41b377a9982939b7c65fdba1e30af24a
   languageName: node
   linkType: hard
 
@@ -23448,20 +24996,20 @@ __metadata:
   version: 2.0.0
   resolution: "parse-entities@npm:2.0.0"
   dependencies:
-    character-entities: ^1.0.0
-    character-entities-legacy: ^1.0.0
-    character-reference-invalid: ^1.0.0
-    is-alphanumerical: ^1.0.0
-    is-decimal: ^1.0.0
-    is-hexadecimal: ^1.0.0
-  checksum: 7addfd3e7d747521afac33c8121a5f23043c6973809756920d37e806639b4898385d386fcf4b3c8e2ecf1bc28aac5ae97df0b112d5042034efbe80f44081ebce
+    character-entities: "npm:^1.0.0"
+    character-entities-legacy: "npm:^1.0.0"
+    character-reference-invalid: "npm:^1.0.0"
+    is-alphanumerical: "npm:^1.0.0"
+    is-decimal: "npm:^1.0.0"
+    is-hexadecimal: "npm:^1.0.0"
+  checksum: 10/feb46b516722474797d72331421f3e62856750cfb4f70ba098b36447bf0b169e819cc4fdee53e022874d5f0c81b605d86e1912b9842a70e59a54de2fee81589d
   languageName: node
   linkType: hard
 
 "parse-headers@npm:^2.0.2":
   version: 2.0.4
   resolution: "parse-headers@npm:2.0.4"
-  checksum: 29519ac013e100c11a67d0fc64eb33ae86523abf547f71dba36d484dcd16a2835dd11f31303f4ded27c40133dca5a5fe4d15b77f49091e470a6f74a023c59c4a
+  checksum: 10/d3d49061992dad48dcca07f4e9f0f6e76e790e744874fdd800afba3eca6aa6e0496af587201133af2503ca733e00eab463029998191f3e12ef23b4186a146ca2
   languageName: node
   linkType: hard
 
@@ -23469,9 +25017,9 @@ __metadata:
   version: 4.0.0
   resolution: "parse-json@npm:4.0.0"
   dependencies:
-    error-ex: ^1.3.1
-    json-parse-better-errors: ^1.0.1
-  checksum: 0fe227d410a61090c247e34fa210552b834613c006c2c64d9a05cfe9e89cf8b4246d1246b1a99524b53b313e9ac024438d0680f67e33eaed7e6f38db64cfe7b5
+    error-ex: "npm:^1.3.1"
+    json-parse-better-errors: "npm:^1.0.1"
+  checksum: 10/0fe227d410a61090c247e34fa210552b834613c006c2c64d9a05cfe9e89cf8b4246d1246b1a99524b53b313e9ac024438d0680f67e33eaed7e6f38db64cfe7b5
   languageName: node
   linkType: hard
 
@@ -23479,11 +25027,11 @@ __metadata:
   version: 5.2.0
   resolution: "parse-json@npm:5.2.0"
   dependencies:
-    "@babel/code-frame": ^7.0.0
-    error-ex: ^1.3.1
-    json-parse-even-better-errors: ^2.3.0
-    lines-and-columns: ^1.1.6
-  checksum: 62085b17d64da57f40f6afc2ac1f4d95def18c4323577e1eced571db75d9ab59b297d1d10582920f84b15985cbfc6b6d450ccbf317644cfa176f3ed982ad87e2
+    "@babel/code-frame": "npm:^7.0.0"
+    error-ex: "npm:^1.3.1"
+    json-parse-even-better-errors: "npm:^2.3.0"
+    lines-and-columns: "npm:^1.1.6"
+  checksum: 10/62085b17d64da57f40f6afc2ac1f4d95def18c4323577e1eced571db75d9ab59b297d1d10582920f84b15985cbfc6b6d450ccbf317644cfa176f3ed982ad87e2
   languageName: node
   linkType: hard
 
@@ -23491,8 +25039,8 @@ __metadata:
   version: 7.0.0
   resolution: "parse-path@npm:7.0.0"
   dependencies:
-    protocols: ^2.0.0
-  checksum: 244b46523a58181d251dda9b888efde35d8afb957436598d948852f416d8c76ddb4f2010f9fc94218b4be3e5c0f716aa0d2026194a781e3b8981924142009302
+    protocols: "npm:^2.0.0"
+  checksum: 10/2e6eadae5aff97a8b6373c1c08440bfeed814f65452674a139dc606c7c410e8e48b7983fe451aedc59802a2814121b40415ca00675c1546ff75cb73ad0c1df5a
   languageName: node
   linkType: hard
 
@@ -23500,8 +25048,8 @@ __metadata:
   version: 8.1.0
   resolution: "parse-url@npm:8.1.0"
   dependencies:
-    parse-path: ^7.0.0
-  checksum: b93e21ab4c93c7d7317df23507b41be7697694d4c94f49ed5c8d6288b01cba328fcef5ba388e147948eac20453dee0df9a67ab2012415189fff85973bdffe8d9
+    parse-path: "npm:^7.0.0"
+  checksum: 10/ceb51dc474568092a50d6d936036dfe438a87aa45bcf20947c8fcdf1544ee9c50255608abae604644e718e91e0b83cfbea4675e8b2fd90bc197432f6d9be263c
   languageName: node
   linkType: hard
 
@@ -23509,25 +25057,25 @@ __metadata:
   version: 7.0.0
   resolution: "parse5-htmlparser2-tree-adapter@npm:7.0.0"
   dependencies:
-    domhandler: ^5.0.2
-    parse5: ^7.0.0
-  checksum: fc5d01e07733142a1baf81de5c2a9c41426c04b7ab29dd218acb80cd34a63177c90aff4a4aee66cf9f1d0aeecff1389adb7452ad6f8af0a5888e3e9ad6ef733d
+    domhandler: "npm:^5.0.2"
+    parse5: "npm:^7.0.0"
+  checksum: 10/23dbe45fdd338fe726cf5c55b236e1f403aeb0c1b926e18ab8ef0aa580980a25f8492d160fe2ed0ec906c3c8e38b51e68ef5620a3b9460d9458ea78946a3f7c0
   languageName: node
   linkType: hard
 
-"parse5@npm:^7.0.0, parse5@npm:^7.1.1":
-  version: 7.1.1
-  resolution: "parse5@npm:7.1.1"
+"parse5@npm:^7.0.0, parse5@npm:^7.1.1, parse5@npm:^7.1.2":
+  version: 7.1.2
+  resolution: "parse5@npm:7.1.2"
   dependencies:
-    entities: ^4.4.0
-  checksum: 8f72fbfa6df83a3f29f58e1818f7bd46b47ff3e26d79c74e10b8fc7ef7ee76163f205113f1b2f6a5b8dc4e31e726f490444f04890cead6e974dbcbe8172b1321
+    entities: "npm:^4.4.0"
+  checksum: 10/3c86806bb0fb1e9a999ff3a4c883b1ca243d99f45a619a0898dbf021a95a0189ed955c31b07fe49d342b54e814f33f2c9d7489198e8630dacd5477d413ec5782
   languageName: node
   linkType: hard
 
 "parseurl@npm:~1.3.2, parseurl@npm:~1.3.3":
   version: 1.3.3
   resolution: "parseurl@npm:1.3.3"
-  checksum: 407cee8e0a3a4c5cd472559bca8b6a45b82c124e9a4703302326e9ab60fc1081442ada4e02628efef1eb16197ddc7f8822f5a91fd7d7c86b51f530aedb17dfa2
+  checksum: 10/407cee8e0a3a4c5cd472559bca8b6a45b82c124e9a4703302326e9ab60fc1081442ada4e02628efef1eb16197ddc7f8822f5a91fd7d7c86b51f530aedb17dfa2
   languageName: node
   linkType: hard
 
@@ -23535,89 +25083,92 @@ __metadata:
   version: 3.1.2
   resolution: "pascal-case@npm:3.1.2"
   dependencies:
-    no-case: ^3.0.4
-    tslib: ^2.0.3
-  checksum: ba98bfd595fc91ef3d30f4243b1aee2f6ec41c53b4546bfa3039487c367abaa182471dcfc830a1f9e1a0df00c14a370514fa2b3a1aacc68b15a460c31116873e
+    no-case: "npm:^3.0.4"
+    tslib: "npm:^2.0.3"
+  checksum: 10/ba98bfd595fc91ef3d30f4243b1aee2f6ec41c53b4546bfa3039487c367abaa182471dcfc830a1f9e1a0df00c14a370514fa2b3a1aacc68b15a460c31116873e
   languageName: node
   linkType: hard
 
 "path-browserify@npm:^1.0.1":
   version: 1.0.1
   resolution: "path-browserify@npm:1.0.1"
-  checksum: c6d7fa376423fe35b95b2d67990060c3ee304fc815ff0a2dc1c6c3cfaff2bd0d572ee67e18f19d0ea3bbe32e8add2a05021132ac40509416459fffee35200699
-  languageName: node
-  linkType: hard
-
-"path-dirname@npm:^1.0.0":
-  version: 1.0.2
-  resolution: "path-dirname@npm:1.0.2"
-  checksum: 0d2f6604ae05a252a0025318685f290e2764ecf9c5436f203cdacfc8c0b17c24cdedaa449d766beb94ab88cc7fc70a09ec21e7933f31abc2b719180883e5e33f
+  checksum: 10/7e7368a5207e7c6b9051ef045711d0dc3c2b6203e96057e408e6e74d09f383061010d2be95cb8593fe6258a767c3e9fc6b2bfc7ce8d48ae8c3d9f6994cca9ad8
   languageName: node
   linkType: hard
 
 "path-exists@npm:^3.0.0":
   version: 3.0.0
   resolution: "path-exists@npm:3.0.0"
-  checksum: 96e92643aa34b4b28d0de1cd2eba52a1c5313a90c6542d03f62750d82480e20bfa62bc865d5cfc6165f5fcd5aeb0851043c40a39be5989646f223300021bae0a
+  checksum: 10/96e92643aa34b4b28d0de1cd2eba52a1c5313a90c6542d03f62750d82480e20bfa62bc865d5cfc6165f5fcd5aeb0851043c40a39be5989646f223300021bae0a
   languageName: node
   linkType: hard
 
 "path-exists@npm:^4.0.0":
   version: 4.0.0
   resolution: "path-exists@npm:4.0.0"
-  checksum: 505807199dfb7c50737b057dd8d351b82c033029ab94cb10a657609e00c1bc53b951cfdbccab8de04c5584d5eff31128ce6afd3db79281874a5ef2adbba55ed1
+  checksum: 10/505807199dfb7c50737b057dd8d351b82c033029ab94cb10a657609e00c1bc53b951cfdbccab8de04c5584d5eff31128ce6afd3db79281874a5ef2adbba55ed1
   languageName: node
   linkType: hard
 
 "path-exists@npm:^5.0.0":
   version: 5.0.0
   resolution: "path-exists@npm:5.0.0"
-  checksum: 8ca842868cab09423994596eb2c5ec2a971c17d1a3cb36dbf060592c730c725cd524b9067d7d2a1e031fef9ba7bd2ac6dc5ec9fb92aa693265f7be3987045254
+  checksum: 10/8ca842868cab09423994596eb2c5ec2a971c17d1a3cb36dbf060592c730c725cd524b9067d7d2a1e031fef9ba7bd2ac6dc5ec9fb92aa693265f7be3987045254
   languageName: node
   linkType: hard
 
 "path-is-absolute@npm:^1.0.0":
   version: 1.0.1
   resolution: "path-is-absolute@npm:1.0.1"
-  checksum: 060840f92cf8effa293bcc1bea81281bd7d363731d214cbe5c227df207c34cd727430f70c6037b5159c8a870b9157cba65e775446b0ab06fd5ecc7e54615a3b8
+  checksum: 10/060840f92cf8effa293bcc1bea81281bd7d363731d214cbe5c227df207c34cd727430f70c6037b5159c8a870b9157cba65e775446b0ab06fd5ecc7e54615a3b8
   languageName: node
   linkType: hard
 
 "path-key@npm:^3.0.0, path-key@npm:^3.1.0":
   version: 3.1.1
   resolution: "path-key@npm:3.1.1"
-  checksum: 55cd7a9dd4b343412a8386a743f9c746ef196e57c823d90ca3ab917f90ab9f13dd0ded27252ba49dbdfcab2b091d998bc446f6220cd3cea65db407502a740020
+  checksum: 10/55cd7a9dd4b343412a8386a743f9c746ef196e57c823d90ca3ab917f90ab9f13dd0ded27252ba49dbdfcab2b091d998bc446f6220cd3cea65db407502a740020
   languageName: node
   linkType: hard
 
 "path-parse@npm:^1.0.7":
   version: 1.0.7
   resolution: "path-parse@npm:1.0.7"
-  checksum: 49abf3d81115642938a8700ec580da6e830dde670be21893c62f4e10bd7dd4c3742ddc603fe24f898cba7eb0c6bc1777f8d9ac14185d34540c6d4d80cd9cae8a
+  checksum: 10/49abf3d81115642938a8700ec580da6e830dde670be21893c62f4e10bd7dd4c3742ddc603fe24f898cba7eb0c6bc1777f8d9ac14185d34540c6d4d80cd9cae8a
   languageName: node
   linkType: hard
 
 "path-posix@npm:^1.0.0":
   version: 1.0.0
   resolution: "path-posix@npm:1.0.0"
-  checksum: 4f64ad212de6ad8d0dbfa440cac8b924303c25c30301769ad0501e29e83a5b9d469e8133753f999ad37482c9c8d3511129e4d83db55d2e4b1555b183c9749ae8
+  checksum: 10/b4eae5cd4b7c943719c2f8679c53d02988bf1701583065cc5b301bb671e6ec13d6e4257257fe92a5c7b34c35e215b322a8976ce89d29dcf8801c0ee2cc75ca18
+  languageName: node
+  linkType: hard
+
+"path-scurry@npm:^1.10.1":
+  version: 1.10.1
+  resolution: "path-scurry@npm:1.10.1"
+  dependencies:
+    lru-cache: "npm:^9.1.1 || ^10.0.0"
+    minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0"
+  checksum: 10/eebfb8304fef1d4f7e1486df987e4fd77413de4fce16508dea69fcf8eb318c09a6b15a7a2f4c22877cec1cb7ecbd3071d18ca9de79eeece0df874a00f1f0bdc8
   languageName: node
   linkType: hard
 
-"path-scurry@npm:^1.10.1":
-  version: 1.10.1
-  resolution: "path-scurry@npm:1.10.1"
+"path-scurry@npm:^1.10.2, path-scurry@npm:^1.6.1":
+  version: 1.10.2
+  resolution: "path-scurry@npm:1.10.2"
   dependencies:
-    lru-cache: ^9.1.1 || ^10.0.0
-    minipass: ^5.0.0 || ^6.0.2 || ^7.0.0
-  checksum: e2557cff3a8fb8bc07afdd6ab163a92587884f9969b05bbbaf6fe7379348bfb09af9ed292af12ed32398b15fb443e81692047b786d1eeb6d898a51eb17ed7d90
+    lru-cache: "npm:^10.2.0"
+    minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0"
+  checksum: 10/a2bbbe8dc284c49dd9be78ca25f3a8b89300e0acc24a77e6c74824d353ef50efbf163e64a69f4330b301afca42d0e2229be0560d6d616ac4e99d48b4062016b1
   languageName: node
   linkType: hard
 
 "path-to-regexp@npm:0.1.7":
   version: 0.1.7
   resolution: "path-to-regexp@npm:0.1.7"
-  checksum: 69a14ea24db543e8b0f4353305c5eac6907917031340e5a8b37df688e52accd09e3cebfe1660b70d76b6bd89152f52183f28c74813dbf454ba1a01c82a38abce
+  checksum: 10/701c99e1f08e3400bea4d701cf6f03517474bb1b608da71c78b1eb261415b645c5670dfae49808c89e12cea2dccd113b069f040a80de012da0400191c6dbd1c8
   languageName: node
   linkType: hard
 
@@ -23625,15 +25176,15 @@ __metadata:
   version: 1.8.0
   resolution: "path-to-regexp@npm:1.8.0"
   dependencies:
-    isarray: 0.0.1
-  checksum: 709f6f083c0552514ef4780cb2e7e4cf49b0cc89a97439f2b7cc69a608982b7690fb5d1720a7473a59806508fc2dae0be751ba49f495ecf89fd8fbc62abccbcd
+    isarray: "npm:0.0.1"
+  checksum: 10/45a01690f72919163cf89714e31a285937b14ad54c53734c826363fcf7beba9d9d0f2de802b4986b1264374562d6a3398a2e5289753a764e3a256494f1e52add
   languageName: node
   linkType: hard
 
 "path-to-regexp@npm:^6.2.0":
   version: 6.2.1
   resolution: "path-to-regexp@npm:6.2.1"
-  checksum: f0227af8284ea13300f4293ba111e3635142f976d4197f14d5ad1f124aebd9118783dd2e5f1fe16f7273743cc3dbeddfb7493f237bb27c10fdae07020cc9b698
+  checksum: 10/1e266be712d1a08086ee77beab12a1804842ec635dfed44f9ee1ba960a0e01cec8063fb8c92561115cdc0ce73158cdc7766e353ffa039340b4a85b370084c4d4
   languageName: node
   linkType: hard
 
@@ -23641,22 +25192,29 @@ __metadata:
   version: 3.0.0
   resolution: "path-type@npm:3.0.0"
   dependencies:
-    pify: ^3.0.0
-  checksum: 735b35e256bad181f38fa021033b1c33cfbe62ead42bb2222b56c210e42938eecb272ae1949f3b6db4ac39597a61b44edd8384623ec4d79bfdc9a9c0f12537a6
+    pify: "npm:^3.0.0"
+  checksum: 10/735b35e256bad181f38fa021033b1c33cfbe62ead42bb2222b56c210e42938eecb272ae1949f3b6db4ac39597a61b44edd8384623ec4d79bfdc9a9c0f12537a6
   languageName: node
   linkType: hard
 
 "path-type@npm:^4.0.0":
   version: 4.0.0
   resolution: "path-type@npm:4.0.0"
-  checksum: 5b1e2daa247062061325b8fdbfd1fb56dde0a448fb1455453276ea18c60685bdad23a445dc148cf87bc216be1573357509b7d4060494a6fd768c7efad833ee45
+  checksum: 10/5b1e2daa247062061325b8fdbfd1fb56dde0a448fb1455453276ea18c60685bdad23a445dc148cf87bc216be1573357509b7d4060494a6fd768c7efad833ee45
+  languageName: node
+  linkType: hard
+
+"path-type@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "path-type@npm:5.0.0"
+  checksum: 10/15ec24050e8932c2c98d085b72cfa0d6b4eeb4cbde151a0a05726d8afae85784fc5544f733d8dfc68536587d5143d29c0bd793623fad03d7e61cc00067291cd5
   languageName: node
   linkType: hard
 
 "pathe@npm:^1.1.0":
   version: 1.1.0
   resolution: "pathe@npm:1.1.0"
-  checksum: 6b9be9968ea08a90c0824934799707a1c6a1ad22ac1f22080f377e3f75856d5e53a331b01d327329bfce538a14590587cfb250e8e7947f64408797c84c252056
+  checksum: 10/7cd4e00d9991a2454cccc575fd0ebdd0fe0caf257e5a6690af542d41c63e4d7033e580677395c54e0e4addbd9e297c0ef4e5de02906decc93b48c1a58a1acb0c
   languageName: node
   linkType: hard
 
@@ -23664,11 +25222,11 @@ __metadata:
   version: 3.2.1
   resolution: "pbf@npm:3.2.1"
   dependencies:
-    ieee754: ^1.1.12
-    resolve-protobuf-schema: ^2.1.0
+    ieee754: "npm:^1.1.12"
+    resolve-protobuf-schema: "npm:^2.1.0"
   bin:
     pbf: bin/pbf
-  checksum: 8033f5e21fffdc485e85d50bbff07ab3313c6841c3630a4ba9bc9e82d2e9005ab92000a1a90cb911223caa44316293e367bab607dd8110d5c771e6c8aaad63e1
+  checksum: 10/566a64424063b07f46d3e2cb2288094a60b0a45efea48fd4030f527143b0e9c611399ebd3a6fd56db51908f2006defef5e09a1b2a027db9481a59a41156a540c
   languageName: node
   linkType: hard
 
@@ -23676,73 +25234,73 @@ __metadata:
   version: 1.1.3
   resolution: "peek-stream@npm:1.1.3"
   dependencies:
-    buffer-from: ^1.0.0
-    duplexify: ^3.5.0
-    through2: ^2.0.3
-  checksum: a0e09d6d1a8a01158a3334f20d6b1cdd91747eba24eb06a1d742eefb620385593121a76d4378cc81f77cdce6a66df0575a41041b1189c510254aec91878afc99
+    buffer-from: "npm:^1.0.0"
+    duplexify: "npm:^3.5.0"
+    through2: "npm:^2.0.3"
+  checksum: 10/a0e09d6d1a8a01158a3334f20d6b1cdd91747eba24eb06a1d742eefb620385593121a76d4378cc81f77cdce6a66df0575a41041b1189c510254aec91878afc99
   languageName: node
   linkType: hard
 
 "pend@npm:~1.2.0":
   version: 1.2.0
   resolution: "pend@npm:1.2.0"
-  checksum: 6c72f5243303d9c60bd98e6446ba7d30ae29e3d56fdb6fae8767e8ba6386f33ee284c97efe3230a0d0217e2b1723b8ab490b1bbf34fcbb2180dbc8a9de47850d
+  checksum: 10/6c72f5243303d9c60bd98e6446ba7d30ae29e3d56fdb6fae8767e8ba6386f33ee284c97efe3230a0d0217e2b1723b8ab490b1bbf34fcbb2180dbc8a9de47850d
   languageName: node
   linkType: hard
 
 "performance-now@npm:^2.1.0":
   version: 2.1.0
   resolution: "performance-now@npm:2.1.0"
-  checksum: 534e641aa8f7cba160f0afec0599b6cecefbb516a2e837b512be0adbe6c1da5550e89c78059c7fabc5c9ffdf6627edabe23eb7c518c4500067a898fa65c2b550
+  checksum: 10/534e641aa8f7cba160f0afec0599b6cecefbb516a2e837b512be0adbe6c1da5550e89c78059c7fabc5c9ffdf6627edabe23eb7c518c4500067a898fa65c2b550
   languageName: node
   linkType: hard
 
 "picocolors@npm:^1.0.0":
   version: 1.0.0
   resolution: "picocolors@npm:1.0.0"
-  checksum: a2e8092dd86c8396bdba9f2b5481032848525b3dc295ce9b57896f931e63fc16f79805144321f72976383fc249584672a75cc18d6777c6b757603f372f745981
+  checksum: 10/a2e8092dd86c8396bdba9f2b5481032848525b3dc295ce9b57896f931e63fc16f79805144321f72976383fc249584672a75cc18d6777c6b757603f372f745981
   languageName: node
   linkType: hard
 
 "picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.2, picomatch@npm:^2.2.3, picomatch@npm:^2.3.0, picomatch@npm:^2.3.1":
   version: 2.3.1
   resolution: "picomatch@npm:2.3.1"
-  checksum: 050c865ce81119c4822c45d3c84f1ced46f93a0126febae20737bd05ca20589c564d6e9226977df859ed5e03dc73f02584a2b0faad36e896936238238b0446cf
+  checksum: 10/60c2595003b05e4535394d1da94850f5372c9427ca4413b71210f437f7b2ca091dbd611c45e8b37d10036fa8eade25c1b8951654f9d3973bfa66a2ff4d3b08bc
+  languageName: node
+  linkType: hard
+
+"pify@npm:5.0.0":
+  version: 5.0.0
+  resolution: "pify@npm:5.0.0"
+  checksum: 10/443e3e198ad6bfa8c0c533764cf75c9d5bc976387a163792fb553ffe6ce923887cf14eebf5aea9b7caa8eab930da8c33612990ae85bd8c2bc18bedb9eae94ecb
   languageName: node
   linkType: hard
 
 "pify@npm:^2.2.0, pify@npm:^2.3.0":
   version: 2.3.0
   resolution: "pify@npm:2.3.0"
-  checksum: 9503aaeaf4577acc58642ad1d25c45c6d90288596238fb68f82811c08104c800e5a7870398e9f015d82b44ecbcbef3dc3d4251a1cbb582f6e5959fe09884b2ba
+  checksum: 10/9503aaeaf4577acc58642ad1d25c45c6d90288596238fb68f82811c08104c800e5a7870398e9f015d82b44ecbcbef3dc3d4251a1cbb582f6e5959fe09884b2ba
   languageName: node
   linkType: hard
 
 "pify@npm:^3.0.0":
   version: 3.0.0
   resolution: "pify@npm:3.0.0"
-  checksum: 6cdcbc3567d5c412450c53261a3f10991665d660961e06605decf4544a61a97a54fefe70a68d5c37080ff9d6f4cf51444c90198d1ba9f9309a6c0d6e9f5c4fde
+  checksum: 10/668c1dc8d9fc1b34b9ce3b16ba59deb39d4dc743527bf2ed908d2b914cb8ba40aa5ba6960b27c417c241531c5aafd0598feeac2d50cb15278cf9863fa6b02a77
   languageName: node
   linkType: hard
 
 "pify@npm:^4.0.1":
   version: 4.0.1
   resolution: "pify@npm:4.0.1"
-  checksum: 9c4e34278cb09987685fa5ef81499c82546c033713518f6441778fbec623fc708777fe8ac633097c72d88470d5963094076c7305cafc7ad340aae27cfacd856b
-  languageName: node
-  linkType: hard
-
-"pify@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "pify@npm:5.0.0"
-  checksum: 443e3e198ad6bfa8c0c533764cf75c9d5bc976387a163792fb553ffe6ce923887cf14eebf5aea9b7caa8eab930da8c33612990ae85bd8c2bc18bedb9eae94ecb
+  checksum: 10/8b97cbf9dc6d4c1320cc238a2db0fc67547f9dc77011729ff353faf34f1936ea1a4d7f3c63b2f4980b253be77bcc72ea1e9e76ee3fd53cce2aafb6a8854d07ec
   languageName: node
   linkType: hard
 
 "pirates@npm:^4.0.4, pirates@npm:^4.0.5":
   version: 4.0.5
   resolution: "pirates@npm:4.0.5"
-  checksum: c9994e61b85260bec6c4fc0307016340d9b0c4f4b6550a957afaaff0c9b1ad58fbbea5cfcf083860a25cb27a375442e2b0edf52e2e1e40e69934e08dcc52d227
+  checksum: 10/3728bae0cf6c18c3d25f5449ee8c5bc1a6a83bca688abe0e1654ce8c069bfd408170397cef133ed9ec8b0faeb4093c5c728d0e72ab7b3385256cd87008c40364
   languageName: node
   linkType: hard
 
@@ -23750,8 +25308,8 @@ __metadata:
   version: 3.0.0
   resolution: "pkg-dir@npm:3.0.0"
   dependencies:
-    find-up: ^3.0.0
-  checksum: 70c9476ffefc77552cc6b1880176b71ad70bfac4f367604b2b04efd19337309a4eec985e94823271c7c0e83946fa5aeb18cd360d15d10a5d7533e19344bfa808
+    find-up: "npm:^3.0.0"
+  checksum: 10/70c9476ffefc77552cc6b1880176b71ad70bfac4f367604b2b04efd19337309a4eec985e94823271c7c0e83946fa5aeb18cd360d15d10a5d7533e19344bfa808
   languageName: node
   linkType: hard
 
@@ -23759,8 +25317,8 @@ __metadata:
   version: 4.2.0
   resolution: "pkg-dir@npm:4.2.0"
   dependencies:
-    find-up: ^4.0.0
-  checksum: 9863e3f35132bf99ae1636d31ff1e1e3501251d480336edb1c211133c8d58906bed80f154a1d723652df1fda91e01c7442c2eeaf9dc83157c7ae89087e43c8d6
+    find-up: "npm:^4.0.0"
+  checksum: 10/9863e3f35132bf99ae1636d31ff1e1e3501251d480336edb1c211133c8d58906bed80f154a1d723652df1fda91e01c7442c2eeaf9dc83157c7ae89087e43c8d6
   languageName: node
   linkType: hard
 
@@ -23768,8 +25326,8 @@ __metadata:
   version: 5.0.0
   resolution: "pkg-dir@npm:5.0.0"
   dependencies:
-    find-up: ^5.0.0
-  checksum: b167bb8dac7bbf22b1d5e30ec223e6b064b84b63010c9d49384619a36734caf95ed23ad23d4f9bd975e8e8082b60a83395f43a89bb192df53a7c25a38ecb57d9
+    find-up: "npm:^5.0.0"
+  checksum: 10/b167bb8dac7bbf22b1d5e30ec223e6b064b84b63010c9d49384619a36734caf95ed23ad23d4f9bd975e8e8082b60a83395f43a89bb192df53a7c25a38ecb57d9
   languageName: node
   linkType: hard
 
@@ -23777,15 +25335,39 @@ __metadata:
   version: 7.0.0
   resolution: "pkg-dir@npm:7.0.0"
   dependencies:
-    find-up: ^6.3.0
-  checksum: 94298b20a446bfbbd66604474de8a0cdd3b8d251225170970f15d9646f633e056c80520dd5b4c1d1050c9fed8f6a9e5054b141c93806439452efe72e57562c03
+    find-up: "npm:^6.3.0"
+  checksum: 10/94298b20a446bfbbd66604474de8a0cdd3b8d251225170970f15d9646f633e056c80520dd5b4c1d1050c9fed8f6a9e5054b141c93806439452efe72e57562c03
+  languageName: node
+  linkType: hard
+
+"playwright-core@npm:1.42.1":
+  version: 1.42.1
+  resolution: "playwright-core@npm:1.42.1"
+  bin:
+    playwright-core: cli.js
+  checksum: 10/6a71d2e2aa5b054d6e83836f09e139a0ff4de3aa9b6aebe0e03de3ab828c735d23a20a60fafcee91c1658da490cc390f05af463325ac842beaff58a173f7ad9e
+  languageName: node
+  linkType: hard
+
+"playwright@npm:1.42.1":
+  version: 1.42.1
+  resolution: "playwright@npm:1.42.1"
+  dependencies:
+    fsevents: "npm:2.3.2"
+    playwright-core: "npm:1.42.1"
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  bin:
+    playwright: cli.js
+  checksum: 10/1f866a6820e19feaaeb12cd87bfa93299d6d72e1287413098c5ae0349c7e7953eb0a303bdfbb99c12173a3493e6fdb642f89a166cfcfd8295254a520abf6eb7f
   languageName: node
   linkType: hard
 
-"pluralize@npm:^8.0.0":
+"pluralize@npm:8.0.0, pluralize@npm:^8.0.0":
   version: 8.0.0
   resolution: "pluralize@npm:8.0.0"
-  checksum: 08931d4a6a4a5561a7f94f67a31c17e6632cb21e459ab3ff4f6f629d9a822984cf8afef2311d2005fbea5d7ef26016ebb090db008e2d8bce39d0a9a9d218736e
+  checksum: 10/17877fdfdb7ddb3639ce257ad73a7c51a30a966091e40f56ea9f2f545b5727ce548d4928f8cb3ce38e7dc0c5150407d318af6a4ed0ea5265d378473b4c2c61ec
   languageName: node
   linkType: hard
 
@@ -23793,20 +25375,20 @@ __metadata:
   version: 0.11.7
   resolution: "pngjs-image@npm:0.11.7"
   dependencies:
-    iconv-lite: ^0.4.8
-    pako: ^0.2.6
-    pngjs: 2.3.1
-    request: ^2.55.0
-    stream-buffers: 1.0.1
-    underscore: 1.7.0
-  checksum: d0ea36161bcb37d58e8648b9c279c5848cfa9fd0db3318b248e054f0bbcdd67d0f93758701a69f0123b1b52b7ec57fef97bf95f10c7673e057772d68cd414a78
+    iconv-lite: "npm:^0.4.8"
+    pako: "npm:^0.2.6"
+    pngjs: "npm:2.3.1"
+    request: "npm:^2.55.0"
+    stream-buffers: "npm:1.0.1"
+    underscore: "npm:1.7.0"
+  checksum: 10/314554f989187e6fbb376c0a5217088a91686d972a0f1932ca31b8dd3817a5d2aff2a9cd5f73135fe282bbc190032fc52fa027638b34b21e96cbbf7cbd641a90
   languageName: node
   linkType: hard
 
 "pngjs@npm:2.3.1":
   version: 2.3.1
   resolution: "pngjs@npm:2.3.1"
-  checksum: 27bc09e6a58e2c57ea4aed6ae4a487d482616eaf87f853b38421a141bb281e323105527eca0c6d5303d3efdc81a78c56ed58222633cf9d75c2e15c8203990c53
+  checksum: 10/f53b492c9c5a0586de34f8df501381013c175be0f2c04a659aca30dce08105b59d20927f2209c3fb563908180dee73082be3f5bbbfa760eee98c064baa51fe7c
   languageName: node
   linkType: hard
 
@@ -23814,8 +25396,8 @@ __metadata:
   version: 4.2.2
   resolution: "polished@npm:4.2.2"
   dependencies:
-    "@babel/runtime": ^7.17.8
-  checksum: 97fb927dc55cd34aeb11b31ae2a3332463f114351c86e8aa6580d7755864a0120164fdc3770e6160c8b1775052f0eda14db9a6e34402cd4b08ab2d658a593725
+    "@babel/runtime": "npm:^7.17.8"
+  checksum: 10/da71b15c1e1d98b7f55e143bbf9ebb1b0934286c74c333522e571e52f89e42a61d7d44c5b4f941dc927355c7ae09780877aeb8f23707376fa9f006ab861e758b
   languageName: node
   linkType: hard
 
@@ -23823,212 +25405,225 @@ __metadata:
   version: 1.0.32
   resolution: "portfinder@npm:1.0.32"
   dependencies:
-    async: ^2.6.4
-    debug: ^3.2.7
-    mkdirp: ^0.5.6
-  checksum: 116b4aed1b9e16f6d5503823d966d9ffd41b1c2339e27f54c06cd2f3015a9d8ef53e2a53b57bc0a25af0885977b692007353aa28f9a0a98a44335cb50487240d
+    async: "npm:^2.6.4"
+    debug: "npm:^3.2.7"
+    mkdirp: "npm:^0.5.6"
+  checksum: 10/842058052fb3c3da829589f3f44b13369cf504b16f6ab72fedec78a9438ac3fc53047f5c88a771511b17d6a94f50f83a94cef5fa625027b675d8f7241f7f2185
+  languageName: node
+  linkType: hard
+
+"possible-typed-array-names@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "possible-typed-array-names@npm:1.0.0"
+  checksum: 10/8ed3e96dfeea1c5880c1f4c9cb707e5fb26e8be22f14f82ef92df20fd2004e635c62ba47fbe8f2bb63bfd80dac1474be2fb39798da8c2feba2815435d1f749af
   languageName: node
   linkType: hard
 
-"postcss-calc@npm:^9.0.0":
+"postcss-calc@npm:^9.0.1":
   version: 9.0.1
   resolution: "postcss-calc@npm:9.0.1"
   dependencies:
-    postcss-selector-parser: ^6.0.11
-    postcss-value-parser: ^4.2.0
+    postcss-selector-parser: "npm:^6.0.11"
+    postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.2.2
-  checksum: 7327ed83bfec544ab8b3e38353baa72ff6d04378b856db4ad82dbd68ce0b73668867ef182b5d4025f9dd9aa9c64aacc50cd1bd9db8d8b51ccc4cb97866b9d72b
+  checksum: 10/a0a3e71a28e7f81f07fb9438362d95df3e3e671b34a38a4070d80a9762040c721b830e0b70f28bbe7fea2a5ba2da43637d7594be5835bbe828c0c493f0c5f052
   languageName: node
   linkType: hard
 
-"postcss-colormin@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-colormin@npm:6.0.0"
+"postcss-colormin@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-colormin@npm:6.0.2"
   dependencies:
-    browserslist: ^4.21.4
-    caniuse-api: ^3.0.0
-    colord: ^2.9.1
-    postcss-value-parser: ^4.2.0
+    browserslist: "npm:^4.22.2"
+    caniuse-api: "npm:^3.0.0"
+    colord: "npm:^2.9.1"
+    postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: f7113758df45a198f4cf310b317e5bc49fcbd2648064245a5cddcb46e892593950592d4040136bf3b0c8fd64973b0dda3b4b0865b72b5bd94af244cf52418c67
+    postcss: ^8.4.31
+  checksum: 10/494af1c59389fa7370695326ca484b90f52c6d881922b770308cb8bc5a2fb6d36f51eb9bda197a020744246ad9e8e4532035fcc4dada487d90cfc893bc442e17
   languageName: node
   linkType: hard
 
-"postcss-convert-values@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-convert-values@npm:6.0.0"
+"postcss-convert-values@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-convert-values@npm:6.0.2"
   dependencies:
-    browserslist: ^4.21.4
-    postcss-value-parser: ^4.2.0
+    browserslist: "npm:^4.22.2"
+    postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 511ca9358148fc336808d0f58f1e6ad330b73c1a87f32581f3d541ffa66cb61f2a36c8e76d1defb7c54c577c83f11d9bf2eb0d27a83c963c315b8eb149935bd7
+    postcss: ^8.4.31
+  checksum: 10/07fcb993490c3533a55d7145fbf40b6d32dd4867ca7491c0b61e9c1301693b378cb734505a41d13d33836140ee9cf0e05f97cbfc40a2c01058bdcb17ea474d9a
   languageName: node
   linkType: hard
 
-"postcss-discard-comments@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-discard-comments@npm:6.0.0"
+"postcss-discard-comments@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-discard-comments@npm:6.0.1"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 9be073707b5ef781c616ddd32ffd98faf14bf8b40027f341d5a4fb7989fa7b017087ad54146a370fe38295b1f2568b9f5522f4e4c1a1d09fe0e01abd9f5ae00d
+    postcss: ^8.4.31
+  checksum: 10/0723b18d80d50bcc65c07c973d4640c3fdd437c226a7178ce6ab5ed74ea50fbf9e08b3f7b8d9495c0d47c6832d49169733fd74a57403e002fc871cd5516ee2ea
   languageName: node
   linkType: hard
 
-"postcss-discard-duplicates@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-discard-duplicates@npm:6.0.0"
+"postcss-discard-duplicates@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-discard-duplicates@npm:6.0.1"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 999dfc652a60c96f782cc37fbe0d04a89bec88b5ed943f06555166eebf03c6ee47cd56947f1373d84c8161687d1ca23ff6badd1278b5482c506614cf617bc21d
+    postcss: ^8.4.31
+  checksum: 10/5102e845630578b71fc9a2c6ed9941e6b96025b0decb7da2026318c3144ed562bdccdb33b6f687424caba389c84a525bf205d4020ff2d8fdcacef25b292bed84
   languageName: node
   linkType: hard
 
-"postcss-discard-empty@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-discard-empty@npm:6.0.0"
+"postcss-discard-empty@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-discard-empty@npm:6.0.1"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 0d6cc604719d4a70569db77de75e60b3b7e9b99a4521879f6047d71325556e9f46d6bd13aecbbd857c35f075c503c1f8b1be442329fb8e9653c24cbf2fb42f3e
+    postcss: ^8.4.31
+  checksum: 10/d60fdecd84af6254d87e8947522c8a82e72c28084e4e3bc7d5e1157926e31abee16af08d61716545370dc34e034dfd226468e96579b8aab51b6911f4cc21288e
   languageName: node
   linkType: hard
 
-"postcss-discard-overridden@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-discard-overridden@npm:6.0.0"
+"postcss-discard-overridden@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-discard-overridden@npm:6.0.1"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: f2d244bb574cf2c0974c56a1af7131f3833e14515be99c68e6fa6fe82df47cb2c9befa413b9ec92f5f067567c682dc253980a0dede3cc697f6cc9135dfc17ec7
+    postcss: ^8.4.31
+  checksum: 10/e8c1f893a8ba00c05ac1ce592f3eeafacf5e077dcaf65348887f2b42d971802d884bfd3d4e862c95a51b80e9db7b3bcc095db64219fa441cdbf549f5812235c0
   languageName: node
   linkType: hard
 
-"postcss-loader@npm:7.3.3":
-  version: 7.3.3
-  resolution: "postcss-loader@npm:7.3.3"
+"postcss-loader@npm:8.1.1":
+  version: 8.1.1
+  resolution: "postcss-loader@npm:8.1.1"
   dependencies:
-    cosmiconfig: ^8.2.0
-    jiti: ^1.18.2
-    semver: ^7.3.8
+    cosmiconfig: "npm:^9.0.0"
+    jiti: "npm:^1.20.0"
+    semver: "npm:^7.5.4"
   peerDependencies:
+    "@rspack/core": 0.x || 1.x
     postcss: ^7.0.0 || ^8.0.1
     webpack: ^5.0.0
-  checksum: c724044d6ae56334535c26bb4efc9c151431d44d60bc8300157c760747281a242757d8dab32db72738434531175b38a408cb0b270bb96207c07584dcfcd899ff
+  peerDependenciesMeta:
+    "@rspack/core":
+      optional: true
+    webpack:
+      optional: true
+  checksum: 10/7ae38e635119a808ec05e25a5d1327afd40f5f07e1ae40827e4be5e9d1d0adf0e8e277252c13ddbc8909a1bc53fecb15741db340b98966c2bd9cab867cfe5f10
   languageName: node
   linkType: hard
 
 "postcss-media-query-parser@npm:^0.2.3":
   version: 0.2.3
   resolution: "postcss-media-query-parser@npm:0.2.3"
-  checksum: 8000d4d95b912994928ff86137f5ab0ed4c4ee1498af2336e93d708ae8827a690cd7acbaed55d14684cf44d82c8d44b031c1c69ae6bcd2f9620ea67573888090
+  checksum: 10/39f9e9c383ec98d85103c5f3d1eb5a9088a47357ed26d3c7501aeba1302840521cffa1b851bc2d8146f1ccdef263fe3088f4d435bda1c0dc0b6f9387865574c8
   languageName: node
   linkType: hard
 
-"postcss-merge-longhand@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-merge-longhand@npm:6.0.0"
+"postcss-merge-longhand@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-merge-longhand@npm:6.0.2"
   dependencies:
-    postcss-value-parser: ^4.2.0
-    stylehacks: ^6.0.0
+    postcss-value-parser: "npm:^4.2.0"
+    stylehacks: "npm:^6.0.2"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 86d1eda1b845cc7bc781a18db714d8e3ed639f673a7a9f416ecae8b8822235a87724e32d06477c707b40bc2ef96a16e87d831b89188354921791fce0de50103b
+    postcss: ^8.4.31
+  checksum: 10/6d3fc01fd42da04f4c129969712a815a9b308057f46687ee0d306f308acc5ac1f4d36bb21dd5166a754d23a9f9ed189107ad0a035afdd1135350c1e0504ace6e
   languageName: node
   linkType: hard
 
-"postcss-merge-rules@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-merge-rules@npm:6.0.1"
+"postcss-merge-rules@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "postcss-merge-rules@npm:6.0.3"
   dependencies:
-    browserslist: ^4.21.4
-    caniuse-api: ^3.0.0
-    cssnano-utils: ^4.0.0
-    postcss-selector-parser: ^6.0.5
+    browserslist: "npm:^4.22.2"
+    caniuse-api: "npm:^3.0.0"
+    cssnano-utils: "npm:^4.0.1"
+    postcss-selector-parser: "npm:^6.0.15"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: db003c820319181647806f087ead22598faffee745713026b5c8ea637936dc737a55fdc8d7631731879f49ba675a880dda174f21ae62c8f5aa4b0fda1a81f19a
+    postcss: ^8.4.31
+  checksum: 10/9d0512417f78766d52c5c55638bb17ebfb7809e4f9154ddfa4775efaf513153a3f7d5d264a1a07b8de17365974f4495f7c0c747613ba4a4ea628b18d9d69ec7e
   languageName: node
   linkType: hard
 
-"postcss-minify-font-values@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-minify-font-values@npm:6.0.0"
+"postcss-minify-font-values@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-minify-font-values@npm:6.0.1"
   dependencies:
-    postcss-value-parser: ^4.2.0
+    postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 60de1e405a8849387714980d85f30c8e3df4b7b3083850086656ef50cdaf41605426373f28c0c43dcadfd1d78816b8e425571f12a024120dced1c7e8facb5073
+    postcss: ^8.4.31
+  checksum: 10/3a8b0a1ce59994a36ada65ba5cee387c0820e7a6e5b7583e2a6639f76c88339a0aa243884f27f72841ded4d63840b6096853d4310de5c4029e4927bc506ef8f5
   languageName: node
   linkType: hard
 
-"postcss-minify-gradients@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-minify-gradients@npm:6.0.0"
+"postcss-minify-gradients@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-minify-gradients@npm:6.0.1"
   dependencies:
-    colord: ^2.9.1
-    cssnano-utils: ^4.0.0
-    postcss-value-parser: ^4.2.0
+    colord: "npm:^2.9.1"
+    cssnano-utils: "npm:^4.0.1"
+    postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: f2399211f78b88d122f4c7248cb2cc887b49304eb3315c7332c6216aec361113aca6fe0dac43289f70f0c3f25c97fb10cd74417aab5c2f5f51b64b1ef2c5af13
+    postcss: ^8.4.31
+  checksum: 10/6245fc4dc4ca25f780245266d9aa2d4125453ef52a751ddac01f06672cfae625f07898dd434e0abe63810e642c14bcf1660130969e03d13888094413909cc670
   languageName: node
   linkType: hard
 
-"postcss-minify-params@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-minify-params@npm:6.0.0"
+"postcss-minify-params@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-minify-params@npm:6.0.2"
   dependencies:
-    browserslist: ^4.21.4
-    cssnano-utils: ^4.0.0
-    postcss-value-parser: ^4.2.0
+    browserslist: "npm:^4.22.2"
+    cssnano-utils: "npm:^4.0.1"
+    postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 1cd9e372cfa27a9849f6994b03cc031534b519299bd1e392062b524405ba76906d23261ab5c0bb505289343c8ffb6a44414265f96a3e04a28181493eb032af01
+    postcss: ^8.4.31
+  checksum: 10/e2d0e91263e7595d9dd87a7825b598f5948a384a446c18f44001963fae643fcf7f1b575cba8ae52cfadd3f04348209bad9d07b8046b15ccb5070171d2b4ce6f1
   languageName: node
   linkType: hard
 
-"postcss-minify-selectors@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-minify-selectors@npm:6.0.0"
+"postcss-minify-selectors@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-minify-selectors@npm:6.0.2"
   dependencies:
-    postcss-selector-parser: ^6.0.5
+    postcss-selector-parser: "npm:^6.0.15"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 13ce0a1055fdc4571df8d289c4e5dac983e22ac9b449af2c1418ea536b9176a5354d1a487cc0047789f0981053263675d50c7db7cba99588ecb7ff0045fba818
+    postcss: ^8.4.31
+  checksum: 10/5331e6db4ebc07f781a2f5b9eab03f4ec3650d2e472370fe2124886545eba5d7687372a1359ba86686e414ee90efd4f83a00c1da1b88c788f0c19efbb107cef4
   languageName: node
   linkType: hard
 
 "postcss-modules-extract-imports@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "postcss-modules-extract-imports@npm:3.0.0"
+  version: 3.1.0
+  resolution: "postcss-modules-extract-imports@npm:3.1.0"
   peerDependencies:
     postcss: ^8.1.0
-  checksum: 4b65f2f1382d89c4bc3c0a1bdc5942f52f3cb19c110c57bd591ffab3a5fee03fcf831604168205b0c1b631a3dce2255c70b61aaae3ef39d69cd7eb450c2552d2
+  checksum: 10/00bfd3aff045fc13ded8e3bbfd8dfc73eff9a9708db1b2a132266aef6544c8d2aee7a5d7e021885f6f9bbd5565a9a9ab52990316e21ad9468a2534f87df8e849
   languageName: node
   linkType: hard
 
-"postcss-modules-local-by-default@npm:^4.0.3":
-  version: 4.0.3
-  resolution: "postcss-modules-local-by-default@npm:4.0.3"
+"postcss-modules-local-by-default@npm:^4.0.4":
+  version: 4.0.5
+  resolution: "postcss-modules-local-by-default@npm:4.0.5"
   dependencies:
-    icss-utils: ^5.0.0
-    postcss-selector-parser: ^6.0.2
-    postcss-value-parser: ^4.1.0
+    icss-utils: "npm:^5.0.0"
+    postcss-selector-parser: "npm:^6.0.2"
+    postcss-value-parser: "npm:^4.1.0"
   peerDependencies:
     postcss: ^8.1.0
-  checksum: 2f8083687f3d6067885f8863dd32dbbb4f779cfcc7e52c17abede9311d84faf6d3ed8760e7c54c6380281732ae1f78e5e56a28baf3c271b33f450a11c9e30485
+  checksum: 10/b08b01aa7f3d1a80bb1a5508ba3a208578fdd2fb6e54e5613fac244a4e014aa7ca639a614859fec93b399e5a6f86938f7690ca60f7e57c4e35b75621d3c07734
   languageName: node
   linkType: hard
 
-"postcss-modules-scope@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "postcss-modules-scope@npm:3.0.0"
+"postcss-modules-scope@npm:^3.1.1":
+  version: 3.2.0
+  resolution: "postcss-modules-scope@npm:3.2.0"
   dependencies:
-    postcss-selector-parser: ^6.0.4
+    postcss-selector-parser: "npm:^6.0.4"
   peerDependencies:
     postcss: ^8.1.0
-  checksum: 330b9398dbd44c992c92b0dc612c0626135e2cc840fee41841eb61247a6cfed95af2bd6f67ead9dd9d0bb41f5b0367129d93c6e434fa3e9c58ade391d9a5a138
+  checksum: 10/17c293ad13355ba456498aa5815ddb7a4a736f7b781d89b294e1602a53b8d0e336131175f82460e290a0d672642f9039540042edc361d9000b682c44e766925b
   languageName: node
   linkType: hard
 
@@ -24036,231 +25631,231 @@ __metadata:
   version: 4.0.0
   resolution: "postcss-modules-values@npm:4.0.0"
   dependencies:
-    icss-utils: ^5.0.0
+    icss-utils: "npm:^5.0.0"
   peerDependencies:
     postcss: ^8.1.0
-  checksum: f7f2cdf14a575b60e919ad5ea52fed48da46fe80db2733318d71d523fc87db66c835814940d7d05b5746b0426e44661c707f09bdb83592c16aea06e859409db6
+  checksum: 10/18021961a494e69e65da9e42b4436144c9ecee65845c9bfeff2b7a26ea73d60762f69e288be8bb645447965b8fd6b26a264771136810dc0172bd31b940aee4f2
   languageName: node
   linkType: hard
 
-"postcss-normalize-charset@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-normalize-charset@npm:6.0.0"
+"postcss-normalize-charset@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-normalize-charset@npm:6.0.1"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 186a94083f6d41dbda884bf915ff7fe9d9d19828c50dbf02a7e00c90673bec52e5962afd648220598c40940fb1ed5b93bc25697c395cd38ef30b6fd04e48580e
+    postcss: ^8.4.31
+  checksum: 10/7198a7bcc92c9bb971aeb7e6d4a00defc1d5ec99f7c97af217a34942972b9c9e587478d44afb8a8a6d8c7afe63835da233957ad9c9e172f7d3b74e14763f01de
   languageName: node
   linkType: hard
 
-"postcss-normalize-display-values@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-normalize-display-values@npm:6.0.0"
+"postcss-normalize-display-values@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-normalize-display-values@npm:6.0.1"
   dependencies:
-    postcss-value-parser: ^4.2.0
+    postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 4f8da7cf817e4c66004d3b2d88603aeadc7f9b55caca1bbba27f45e81ae8c65db8ff252488c8fd9ebb3e5c62f85e475131dcee9754346320453bc2b40865afd9
+    postcss: ^8.4.31
+  checksum: 10/4201fde08d28cd54d45f800d130c202f76da448c15179e997c96c4cc88cf959f82c04ceac4f21bd7e0be3db8ea7166b4a3a9e2eb0639aea0fdd84bcf349f8413
   languageName: node
   linkType: hard
 
-"postcss-normalize-positions@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-normalize-positions@npm:6.0.0"
+"postcss-normalize-positions@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-normalize-positions@npm:6.0.1"
   dependencies:
-    postcss-value-parser: ^4.2.0
+    postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 34dedb07f906b28eb77c57be34899c5c694b81b91c6bfff1e6e9a251aa8f28fea0fdb35a7cdda0fc83e4248b078343a2d76e4485c3ef87f469b24332fa1788cd
+    postcss: ^8.4.31
+  checksum: 10/8a08ab0105efdd4ef69545e414daccb40cefa09f73df4813a4c708082a75aabd695519bfeeac2edecb4ee35c9e3771565aeb29e8fdc6df5dec0916e5f2da7e48
   languageName: node
   linkType: hard
 
-"postcss-normalize-repeat-style@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-normalize-repeat-style@npm:6.0.0"
+"postcss-normalize-repeat-style@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-normalize-repeat-style@npm:6.0.1"
   dependencies:
-    postcss-value-parser: ^4.2.0
+    postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: a53b994bb6594f5c48bd7083a46e6a47c1cf02843bcb864d37e7919c08a6f1d7dbbfee8a6abc2afb5d15554b667abc69d696b90d43066ceb97f835e6c8272098
+    postcss: ^8.4.31
+  checksum: 10/d4985a3379ca79bb7e992c4ee1681c344dc8761b1f6ef7b44c377dad56210c1e400b0321eeed48babe3e57f87dd974570749b5f4483481de903feedbf94ec31c
   languageName: node
   linkType: hard
 
-"postcss-normalize-string@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-normalize-string@npm:6.0.0"
+"postcss-normalize-string@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-normalize-string@npm:6.0.1"
   dependencies:
-    postcss-value-parser: ^4.2.0
+    postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 3d55f31ec0d008e7c8e8db0dc03e6e4f2cf8365f6578a0929b7098753c9db3c7de56a134d011fb3c9d8af8b004f0776169194cdfa25654af4919634cdb6ba7b0
+    postcss: ^8.4.31
+  checksum: 10/bef1337c20fffe8ea651cfc34ade83b71a9415e31551e8d4e1dca0a0de767c99f9bedf100d5d9c30afd82d3ee87d563f864e9d78439ff1718a785e6af175cc83
   languageName: node
   linkType: hard
 
-"postcss-normalize-timing-functions@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-normalize-timing-functions@npm:6.0.0"
+"postcss-normalize-timing-functions@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-normalize-timing-functions@npm:6.0.1"
   dependencies:
-    postcss-value-parser: ^4.2.0
+    postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 67021374f8f18474788d8bc99d31af6a13efc5baf961c1e9f0c6b1e265fb21ac1ad56c489d988fcde9e0d049e9b62c8b0b350cc1e79d7d3bff9f00f7c97d6221
+    postcss: ^8.4.31
+  checksum: 10/60ab18b7e785b64920d6e9db637734332bb161bc2a5d2002449121b353c32e6d85a90cbf6c56667dc93ab5622ce985f8dd3295ff507d38b7231797a2a4a26e75
   languageName: node
   linkType: hard
 
-"postcss-normalize-unicode@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-normalize-unicode@npm:6.0.0"
+"postcss-normalize-unicode@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-normalize-unicode@npm:6.0.2"
   dependencies:
-    browserslist: ^4.21.4
-    postcss-value-parser: ^4.2.0
+    browserslist: "npm:^4.22.2"
+    postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 0f246bf5511ae2294d8ec0decda6abee58c62e301a3a8f6542fa090bb426359caee156b96cc1e7f4b3a3f2cd9f62b410a446cf101e710d8fa71c704cfb057a5d
+    postcss: ^8.4.31
+  checksum: 10/63e41ec27af5c93b6a4172e2406ed930451d5638b2f354bb0e3c7a441b4f40d6ab96e474aabb06c681a0ebc71d11a1fbfeca50493d02d2a1eb094cf5bae7d853
   languageName: node
   linkType: hard
 
-"postcss-normalize-url@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-normalize-url@npm:6.0.0"
+"postcss-normalize-url@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-normalize-url@npm:6.0.1"
   dependencies:
-    postcss-value-parser: ^4.2.0
+    postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 93160c02e54c45cbe8ade7122bf34e25c41ac39656b2ddb15d342ce557efc17873fc6dd1439dd8d814152ebdfbba3ee2c16601d41b085ecaad73e6f2d037cd43
+    postcss: ^8.4.31
+  checksum: 10/a4adcadcbde44b71f2996c23c6671826a7655ab1008413e32cd068a57b60e33950d918e7409ce210e8ee761a33523b5a1879d42927d104b5aee85c27f8bd7dc5
   languageName: node
   linkType: hard
 
-"postcss-normalize-whitespace@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-normalize-whitespace@npm:6.0.0"
+"postcss-normalize-whitespace@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-normalize-whitespace@npm:6.0.1"
   dependencies:
-    postcss-value-parser: ^4.2.0
+    postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 77940955fb0b47b46468a3e17bb9b86eb2f2c572649271a4db600b981f68c9c1ed71197b58d7a351c1b2d1aee2eb79b1e11b3021eb28604fd1a8d0ded21dfb2a
+    postcss: ^8.4.31
+  checksum: 10/cc1c253cb8e66e9b24ce285eace7bca241af0c6f74b027193f41f7c265ef196ad80f9373e4399dd42b63a1d78ffb68d5a22e0530db217bbb5efe7cc031a509bb
   languageName: node
   linkType: hard
 
-"postcss-ordered-values@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-ordered-values@npm:6.0.0"
+"postcss-ordered-values@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-ordered-values@npm:6.0.1"
   dependencies:
-    cssnano-utils: ^4.0.0
-    postcss-value-parser: ^4.2.0
+    cssnano-utils: "npm:^4.0.1"
+    postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 162d60e9fd7d6717457194e943ba63ed6d149ae3b4f150324e65b485312be5d1c99ae140e47698e9f8943967c1575b65c922081263a8fa22a2489ed705eb0202
+    postcss: ^8.4.31
+  checksum: 10/43734feaed392a37f0bc7fb1ba3abf8b6df458781e2e2fc20f38c3709500c80ef5c460bd4581ca2affa7c151287dd0392b57d946bf1917ae91b039308b1ae264
   languageName: node
   linkType: hard
 
-"postcss-reduce-initial@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-reduce-initial@npm:6.0.0"
+"postcss-reduce-initial@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-reduce-initial@npm:6.0.2"
   dependencies:
-    browserslist: ^4.21.4
-    caniuse-api: ^3.0.0
+    browserslist: "npm:^4.22.2"
+    caniuse-api: "npm:^3.0.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 988001da75b969733756d9cec9bb37cfae9a667c888c0394d8aa84af7fa6fe134cdd997b63d657900f72541310c5a396db3436367bf91908bc4c7f7ce965c511
+    postcss: ^8.4.31
+  checksum: 10/d6574e317fd03c3c75f26814a3cc9056c12b16e99988aef9797f656b56462b0d6ad20536f23e734d358b6cc0b88b25dc35aa901cc8c822aeccccabe7f426b427
   languageName: node
   linkType: hard
 
-"postcss-reduce-transforms@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-reduce-transforms@npm:6.0.0"
+"postcss-reduce-transforms@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-reduce-transforms@npm:6.0.1"
   dependencies:
-    postcss-value-parser: ^4.2.0
+    postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 17c27b1858897ee37a4f80af0d76c5ce895466392acac1ead75cbb71ac290ab57b209f47d5d205f6ea60c1697109f09531de005ef17d8826d545bbc02891351a
+    postcss: ^8.4.31
+  checksum: 10/10bbe19852609eb888cbe35cd8eb7f57d08c122292b31980096d0c16982362ebce4e76b212d056e89c78d4cb6aeac5af2fe6d96f3a940662ea80a4c9535d8a82
   languageName: node
   linkType: hard
 
-"postcss-reporter@npm:7.0.5":
-  version: 7.0.5
-  resolution: "postcss-reporter@npm:7.0.5"
+"postcss-reporter@npm:7.1.0":
+  version: 7.1.0
+  resolution: "postcss-reporter@npm:7.1.0"
   dependencies:
-    picocolors: ^1.0.0
-    thenby: ^1.3.4
+    picocolors: "npm:^1.0.0"
+    thenby: "npm:^1.3.4"
   peerDependencies:
     postcss: ^8.1.0
-  checksum: ed450a6fbf03c42d43ceec1d6ff3e1671441a00abf1f81b919c8d23761250d6809bac42e5ade06c8e4ca137cb1e27e3cb3f74ded3d4b79d332807f6abe4ee57c
+  checksum: 10/fc5dea0edf689d1cc68e83d761e7cee7b65dc264025e4ce249a817861a840c415a2cb841c3754a8b98966d89025dba10e73657b88827455010250aa7c5ed0bd8
   languageName: node
   linkType: hard
 
 "postcss-resolve-nested-selector@npm:^0.1.1":
   version: 0.1.1
   resolution: "postcss-resolve-nested-selector@npm:0.1.1"
-  checksum: b08fb76ab092a09ee01328bad620a01dcb445ac5eb02dd0ed9ed75217c2f779ecb3bf99a361c46e695689309c08c09f1a1ad7354c8d58c2c2c40d364657fcb08
+  checksum: 10/b08fb76ab092a09ee01328bad620a01dcb445ac5eb02dd0ed9ed75217c2f779ecb3bf99a361c46e695689309c08c09f1a1ad7354c8d58c2c2c40d364657fcb08
   languageName: node
   linkType: hard
 
-"postcss-safe-parser@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-safe-parser@npm:6.0.0"
+"postcss-safe-parser@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-safe-parser@npm:7.0.0"
   peerDependencies:
-    postcss: ^8.3.3
-  checksum: 06c733eaad83a3954367e7ee02ddfe3796e7a44d4299ccf9239f40964a4daac153c7d77613f32964b5a86c0c6c2f6167738f31d578b73b17cb69d0c4446f0ebe
+    postcss: ^8.4.31
+  checksum: 10/dba4d782393e6f07339c24bdb8b41166e483d5e7b8f34174c35c64065aef36aadef94b53e0501d7a630d42f51bbd824671e8fb1c2b417333b08b71c9b0066c76
   languageName: node
   linkType: hard
 
-"postcss-scss@npm:4.0.6, postcss-scss@npm:^4.0.6":
-  version: 4.0.6
-  resolution: "postcss-scss@npm:4.0.6"
+"postcss-scss@npm:4.0.9, postcss-scss@npm:^4.0.9":
+  version: 4.0.9
+  resolution: "postcss-scss@npm:4.0.9"
   peerDependencies:
-    postcss: ^8.4.19
-  checksum: 133a1cba31e2e167f4e841e66ec6a798eaf44c7911f9182ade0b5b1e71a8198814aa390b8c9d5db6b01358115232e5b15b1a4f8c5198acfccfb1f3fdbd328cdf
+    postcss: ^8.4.29
+  checksum: 10/d191c771344357a28995a2f53041ec699070331b8238e076001cedde97215bd3ebf596d0a9882b22c566977c4b72816dafc00028dc09153c6f97f71cd28a70f7
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.0.5":
-  version: 6.0.13
-  resolution: "postcss-selector-parser@npm:6.0.13"
+"postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.15, postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
+  version: 6.0.16
+  resolution: "postcss-selector-parser@npm:6.0.16"
   dependencies:
-    cssesc: ^3.0.0
-    util-deprecate: ^1.0.2
-  checksum: f89163338a1ce3b8ece8e9055cd5a3165e79a15e1c408e18de5ad8f87796b61ec2d48a2902d179ae0c4b5de10fccd3a325a4e660596549b040bc5ad1b465f096
+    cssesc: "npm:^3.0.0"
+    util-deprecate: "npm:^1.0.2"
+  checksum: 10/9324f63992c6564d392f9f6b16c56c05f157256e3be2d55d1234f7728252257dfd6b870a65a5d04ee3ceb9d9e7b78c043f630a58c9869b4b0481d6e064edc2cf
   languageName: node
   linkType: hard
 
-"postcss-svgo@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-svgo@npm:6.0.0"
+"postcss-svgo@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-svgo@npm:6.0.2"
   dependencies:
-    postcss-value-parser: ^4.2.0
-    svgo: ^3.0.2
+    postcss-value-parser: "npm:^4.2.0"
+    svgo: "npm:^3.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 14c68b7c275dbbbbf1f954e313ff812dacea88970165d7859c1683e2530ea51cd333372b8c0d440d4e9525768f34a8dab5f0846d3445bbb478a87a99f69e9abb
+    postcss: ^8.4.31
+  checksum: 10/223255d31e815e6aa2fd1ae0a4ccab6f83590fcbf0cabb39d1a922e577990b4ad9f73989430cb2e2b974b3395d82e9eadcaa13c669fc333aaf2c110483569b97
   languageName: node
   linkType: hard
 
-"postcss-unique-selectors@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-unique-selectors@npm:6.0.0"
+"postcss-unique-selectors@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-unique-selectors@npm:6.0.2"
   dependencies:
-    postcss-selector-parser: ^6.0.5
+    postcss-selector-parser: "npm:^6.0.15"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 5fbfeaf796c6442853ce3afd03ae8c306fcb83b0b7ee59cbdc9aad57a1e601e65a2a5efd1e25edaa5c7c62e05d3795f357fe95933de0868a78a5d1d1f541be34
+    postcss: ^8.4.31
+  checksum: 10/ab4bb9f0e9117057b63364d79af3f7b6b0b9177c91fc4ff804ec011a0978b7972dd9d10a9bc0ece97ee5fde10c86fd39c51c160ea8425fc0e0414dceb87ef968
   languageName: node
   linkType: hard
 
 "postcss-value-parser@npm:^4.1.0, postcss-value-parser@npm:^4.2.0":
   version: 4.2.0
   resolution: "postcss-value-parser@npm:4.2.0"
-  checksum: 819ffab0c9d51cf0acbabf8996dffbfafbafa57afc0e4c98db88b67f2094cb44488758f06e5da95d7036f19556a4a732525e84289a425f4f6fd8e412a9d7442f
+  checksum: 10/e4e4486f33b3163a606a6ed94f9c196ab49a37a7a7163abfcd469e5f113210120d70b8dd5e33d64636f41ad52316a3725655421eb9a1094f1bcab1db2f555c62
   languageName: node
   linkType: hard
 
-"postcss@npm:8.4.31, postcss@npm:^8.4.21, postcss@npm:^8.4.24, postcss@npm:^8.4.28":
-  version: 8.4.31
-  resolution: "postcss@npm:8.4.31"
+"postcss@npm:8.4.38, postcss@npm:^8.4.33, postcss@npm:^8.4.38":
+  version: 8.4.38
+  resolution: "postcss@npm:8.4.38"
   dependencies:
-    nanoid: ^3.3.6
-    picocolors: ^1.0.0
-    source-map-js: ^1.0.2
-  checksum: 1d8611341b073143ad90486fcdfeab49edd243377b1f51834dc4f6d028e82ce5190e4f11bb2633276864503654fb7cab28e67abdc0fbf9d1f88cad4a0ff0beea
+    nanoid: "npm:^3.3.7"
+    picocolors: "npm:^1.0.0"
+    source-map-js: "npm:^1.2.0"
+  checksum: 10/6e44a7ed835ffa9a2b096e8d3e5dfc6bcf331a25c48aeb862dd54e3aaecadf814fa22be224fd308f87d08adf2299164f88c5fd5ab1c4ef6cbd693ceb295377f4
   languageName: node
   linkType: hard
 
@@ -24268,48 +25863,48 @@ __metadata:
   version: 0.10.1
   resolution: "preceptor-core@npm:0.10.1"
   dependencies:
-    log4js: 1.1.1
-    underscore: 1.7.0
-  checksum: 314420d880ca6b690644b7c24957cb4a2c3778e25751bbfdea3d88df404e0d408259bf2d264fb4eb2fe197861643d43d5385647ceb06bbc4b3a6eaeb75a00b83
+    log4js: "npm:1.1.1"
+    underscore: "npm:1.7.0"
+  checksum: 10/0ae2ab8b79104cf78f798d151aba995be2ccab77a0ab1b4df9a9c653fb782166ab62c4069f4a9f639a31c395ca2c8356aaee9f78725b160093e11cf8c757d806
   languageName: node
   linkType: hard
 
 "prefix-style@npm:2.0.1":
   version: 2.0.1
   resolution: "prefix-style@npm:2.0.1"
-  checksum: 79c3559b74417a1552a91d2008d64cc7f326ff4fe8ed2053519663677238f28455bfda0dd935cb1d6690ac7281aff14361e15cfcf83ec263a8183827df7b2a90
+  checksum: 10/26503ee6629e8a5d6b1de75e4a6529bdcd17767d35afb4763c4985034d15a625def95831c94cb063bf4bfa7f6be430c9b41f7af8e0625017365a52510a6e25fc
   languageName: node
   linkType: hard
 
 "prelude-ls@npm:^1.2.1":
   version: 1.2.1
   resolution: "prelude-ls@npm:1.2.1"
-  checksum: cd192ec0d0a8e4c6da3bb80e4f62afe336df3f76271ac6deb0e6a36187133b6073a19e9727a1ff108cd8b9982e4768850d413baa71214dd80c7979617dca827a
+  checksum: 10/0b9d2c76801ca652a7f64892dd37b7e3fab149a37d2424920099bf894acccc62abb4424af2155ab36dea8744843060a2d8ddc983518d0b1e22265a22324b72ed
   languageName: node
   linkType: hard
 
-"prettier@npm:3.0.0":
-  version: 3.0.0
-  resolution: "prettier@npm:3.0.0"
+"prettier@npm:3.2.5":
+  version: 3.2.5
+  resolution: "prettier@npm:3.2.5"
   bin:
     prettier: bin/prettier.cjs
-  checksum: 6a832876a1552dc58330d2467874e5a0b46b9ccbfc5d3531eb69d15684743e7f83dc9fbd202db6270446deba9c82b79d24383d09924c462b457136a759425e33
+  checksum: 10/d509f9da0b70e8cacc561a1911c0d99ec75117faed27b95cc8534cb2349667dee6351b0ca83fa9d5703f14127faa52b798de40f5705f02d843da133fc3aa416a
   languageName: node
   linkType: hard
 
-"prettier@npm:^2.3.2, prettier@npm:^2.8.0":
-  version: 2.8.7
-  resolution: "prettier@npm:2.8.7"
+"prettier@npm:^2.3.2, prettier@npm:^2.8.0, prettier@npm:^2.8.7":
+  version: 2.8.8
+  resolution: "prettier@npm:2.8.8"
   bin:
     prettier: bin-prettier.js
-  checksum: fdc8f2616f099f5f0d685907f4449a70595a0fc1d081a88919604375989e0d5e9168d6121d8cc6861f21990b31665828e00472544d785d5940ea08a17660c3a6
+  checksum: 10/00cdb6ab0281f98306cd1847425c24cbaaa48a5ff03633945ab4c701901b8e96ad558eb0777364ffc312f437af9b5a07d0f45346266e8245beaf6247b9c62b24
   languageName: node
   linkType: hard
 
 "pretty-bytes@npm:^5.6.0":
   version: 5.6.0
   resolution: "pretty-bytes@npm:5.6.0"
-  checksum: 9c082500d1e93434b5b291bd651662936b8bd6204ec9fa17d563116a192d6d86b98f6d328526b4e8d783c07d5499e2614a807520249692da9ec81564b2f439cd
+  checksum: 10/9c082500d1e93434b5b291bd651662936b8bd6204ec9fa17d563116a192d6d86b98f6d328526b4e8d783c07d5499e2614a807520249692da9ec81564b2f439cd
   languageName: node
   linkType: hard
 
@@ -24317,21 +25912,9 @@ __metadata:
   version: 4.0.0
   resolution: "pretty-error@npm:4.0.0"
   dependencies:
-    lodash: ^4.17.20
-    renderkid: ^3.0.0
-  checksum: a5b9137365690104ded6947dca2e33360bf55e62a4acd91b1b0d7baa3970e43754c628cc9e16eafbdd4e8f8bcb260a5865475d4fc17c3106ff2d61db4e72cdf3
-  languageName: node
-  linkType: hard
-
-"pretty-format@npm:^26.0.0, pretty-format@npm:^26.6.2":
-  version: 26.6.2
-  resolution: "pretty-format@npm:26.6.2"
-  dependencies:
-    "@jest/types": ^26.6.2
-    ansi-regex: ^5.0.0
-    ansi-styles: ^4.0.0
-    react-is: ^17.0.1
-  checksum: e3b808404d7e1519f0df1aa1f25cee0054ab475775c6b2b8c5568ff23194a92d54bf93274139b6f584ca70fd773be4eaa754b0e03f12bb0a8d1426b07f079976
+    lodash: "npm:^4.17.20"
+    renderkid: "npm:^3.0.0"
+  checksum: 10/0212ad8742f8bb6f412f95b07d7f6874c55514ac4384f4f7de0defe77e767cca99f667c2316529f62a041fa654194a99c1ee7e321e1b7f794b5cc700777634d6
   languageName: node
   linkType: hard
 
@@ -24339,10 +25922,10 @@ __metadata:
   version: 27.5.1
   resolution: "pretty-format@npm:27.5.1"
   dependencies:
-    ansi-regex: ^5.0.1
-    ansi-styles: ^5.0.0
-    react-is: ^17.0.1
-  checksum: cf610cffcb793885d16f184a62162f2dd0df31642d9a18edf4ca298e909a8fe80bdbf556d5c9573992c102ce8bf948691da91bf9739bee0ffb6e79c8a8a6e088
+    ansi-regex: "npm:^5.0.1"
+    ansi-styles: "npm:^5.0.0"
+    react-is: "npm:^17.0.1"
+  checksum: 10/248990cbef9e96fb36a3e1ae6b903c551ca4ddd733f8d0912b9cc5141d3d0b3f9f8dfb4d799fb1c6723382c9c2083ffbfa4ad43ff9a0e7535d32d41fd5f01da6
   languageName: node
   linkType: hard
 
@@ -24350,87 +25933,80 @@ __metadata:
   version: 29.7.0
   resolution: "pretty-format@npm:29.7.0"
   dependencies:
-    "@jest/schemas": ^29.6.3
-    ansi-styles: ^5.0.0
-    react-is: ^18.0.0
-  checksum: 032c1602383e71e9c0c02a01bbd25d6759d60e9c7cf21937dde8357aa753da348fcec5def5d1002c9678a8524d5fe099ad98861286550ef44de8808cc61e43b6
+    "@jest/schemas": "npm:^29.6.3"
+    ansi-styles: "npm:^5.0.0"
+    react-is: "npm:^18.0.0"
+  checksum: 10/dea96bc83c83cd91b2bfc55757b6b2747edcaac45b568e46de29deee80742f17bc76fe8898135a70d904f4928eafd8bb693cd1da4896e8bdd3c5e82cadf1d2bb
   languageName: node
   linkType: hard
 
 "pretty-hrtime@npm:^1.0.3":
   version: 1.0.3
   resolution: "pretty-hrtime@npm:1.0.3"
-  checksum: bae0e6832fe13c3de43d1a3d43df52bf6090499d74dc65a17f5552cb1a94f1f8019a23284ddf988c3c408a09678d743901e1d8f5b7a71bec31eeeac445bef371
+  checksum: 10/0a462e88a0a3fd3320288fd8307f488974326ae8e13eea8c27f590f8ee767ccb59cf35bcae1cadff241cd8b72f3e373fc76ff1be95243649899bf8c816874af9
+  languageName: node
+  linkType: hard
+
+"pretty-time@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "pretty-time@npm:1.1.0"
+  checksum: 10/ed5783ea5225680672c53ff104343256037a0e2296387d2f71afecce9e10e83f9131291e6809d4405c0dc25c53f2949dce0233349589762ca499e380d3df2f8a
   languageName: node
   linkType: hard
 
-"prismjs@npm:1.29.0, prismjs@npm:^1.27.0":
+"prismjs@npm:1.29.0, prismjs@npm:^1.27.0, prismjs@npm:^1.29.0":
   version: 1.29.0
   resolution: "prismjs@npm:1.29.0"
-  checksum: 007a8869d4456ff8049dc59404e32d5666a07d99c3b0e30a18bd3b7676dfa07d1daae9d0f407f20983865fd8da56de91d09cb08e6aa61f5bc420a27c0beeaf93
+  checksum: 10/2080db382c2dde0cfc7693769e89b501ef1bfc8ff4f8d25c07fd4c37ca31bc443f6133d5b7c145a73309dc396e829ddb7cc18560026d862a887ae08864ef6b07
   languageName: node
   linkType: hard
 
 "prismjs@npm:~1.27.0":
   version: 1.27.0
   resolution: "prismjs@npm:1.27.0"
-  checksum: 85c7f4a3e999073502cc9e1882af01e3709706369ec254b60bff1149eda701f40d02512acab956012dc7e61cfd61743a3a34c1bd0737e8dbacd79141e5698bbc
+  checksum: 10/dc83e2e09170b53526182f5435fae056fc200b109cac39faa88eb48d992311c7f59b94990318962fa93299190a9b33a404920ed150e5b364ce48c897f2ba1e8e
   languageName: node
   linkType: hard
 
-"proc-log@npm:^2.0.0, proc-log@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "proc-log@npm:2.0.1"
-  checksum: f6f23564ff759097db37443e6e2765af84979a703d2c52c1b9df506ee9f87caa101ba49d8fdc115c1a313ec78e37e8134704e9069e6a870f3499d98bb24c436f
+"proc-log@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "proc-log@npm:3.0.0"
+  checksum: 10/02b64e1b3919e63df06f836b98d3af002b5cd92655cab18b5746e37374bfb73e03b84fe305454614b34c25b485cc687a9eebdccf0242cda8fda2475dd2c97e02
   languageName: node
   linkType: hard
 
-"process-nextick-args@npm:^2.0.0, process-nextick-args@npm:~2.0.0":
+"process-nextick-args@npm:~2.0.0":
   version: 2.0.1
   resolution: "process-nextick-args@npm:2.0.1"
-  checksum: 1d38588e520dab7cea67cbbe2efdd86a10cc7a074c09657635e34f035277b59fbb57d09d8638346bf7090f8e8ebc070c96fa5fd183b777fff4f5edff5e9466cf
+  checksum: 10/1d38588e520dab7cea67cbbe2efdd86a10cc7a074c09657635e34f035277b59fbb57d09d8638346bf7090f8e8ebc070c96fa5fd183b777fff4f5edff5e9466cf
   languageName: node
   linkType: hard
 
 "process@npm:^0.11.10":
   version: 0.11.10
   resolution: "process@npm:0.11.10"
-  checksum: bfcce49814f7d172a6e6a14d5fa3ac92cc3d0c3b9feb1279774708a719e19acd673995226351a082a9ae99978254e320ccda4240ddc474ba31a76c79491ca7c3
+  checksum: 10/dbaa7e8d1d5cf375c36963ff43116772a989ef2bb47c9bdee20f38fd8fc061119cf38140631cf90c781aca4d3f0f0d2c834711952b728953f04fd7d238f59f5b
   languageName: node
   linkType: hard
 
 "progress@npm:^2.0.1":
   version: 2.0.3
   resolution: "progress@npm:2.0.3"
-  checksum: f67403fe7b34912148d9252cb7481266a354bd99ce82c835f79070643bb3c6583d10dbcfda4d41e04bbc1d8437e9af0fb1e1f2135727878f5308682a579429b7
-  languageName: node
-  linkType: hard
-
-"promise-all-reject-late@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "promise-all-reject-late@npm:1.0.1"
-  checksum: d7d61ac412352e2c8c3463caa5b1c3ca0f0cc3db15a09f180a3da1446e33d544c4261fc716f772b95e4c27d559cfd2388540f44104feb356584f9c73cfb9ffcb
-  languageName: node
-  linkType: hard
-
-"promise-call-limit@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "promise-call-limit@npm:1.0.1"
-  checksum: e69aed17f5f34bbd7aecff28faedb456e3500a08af31ee759ef75f2d8c2219d7c0e59f153f4d8c339056de8c304e0dd4acc500c339e7ea1e9c0e7bb1444367c8
+  checksum: 10/e6f0bcb71f716eee9dfac0fe8a2606e3704d6a64dd93baaf49fbadbc8499989a610fe14cf1bc6f61b6d6653c49408d94f4a94e124538084efd8e4cf525e0293d
   languageName: node
   linkType: hard
 
 "promise-inflight@npm:^1.0.1":
   version: 1.0.1
   resolution: "promise-inflight@npm:1.0.1"
-  checksum: 22749483091d2c594261517f4f80e05226d4d5ecc1fc917e1886929da56e22b5718b7f2a75f3807e7a7d471bc3be2907fe92e6e8f373ddf5c64bae35b5af3981
+  checksum: 10/1560d413ea20c5a74f3631d39ba8cbd1972b9228072a755d01e1f5ca5110382d9af76a1582d889445adc6e75bb5ac4886b56dc4b6eae51b30145d7bb1ac7505b
   languageName: node
   linkType: hard
 
 "promise-map-series@npm:^0.3.0":
   version: 0.3.0
   resolution: "promise-map-series@npm:0.3.0"
-  checksum: a1c992562e68a3e14c39d010bd6335166e4a0469763fd161a8b1e15f972033fce5207722edb9c16ecc9324b44ef45e42674f7015e6a8922972f45a85849bbeef
+  checksum: 10/0fc757b54a3b884c10c17854d5360e1c81b65762cbed43f8c4d380f673f30ef490a4c657b8b39552fc9e9fc783109d6beddf6eace849db2f28dffc73b72578ff
   languageName: node
   linkType: hard
 
@@ -24438,9 +26014,9 @@ __metadata:
   version: 2.0.1
   resolution: "promise-retry@npm:2.0.1"
   dependencies:
-    err-code: ^2.0.2
-    retry: ^0.12.0
-  checksum: f96a3f6d90b92b568a26f71e966cbbc0f63ab85ea6ff6c81284dc869b41510e6cdef99b6b65f9030f0db422bf7c96652a3fff9f2e8fb4a0f069d8f4430359429
+    err-code: "npm:^2.0.2"
+    retry: "npm:^0.12.0"
+  checksum: 10/96e1a82453c6c96eef53a37a1d6134c9f2482f94068f98a59145d0986ca4e497bf110a410adf73857e588165eab3899f0ebcf7b3890c1b3ce802abc0d65967d4
   languageName: node
   linkType: hard
 
@@ -24448,8 +26024,8 @@ __metadata:
   version: 6.0.0
   resolution: "promise@npm:6.0.0"
   dependencies:
-    asap: ~1.0.0
-  checksum: 9414ac902a7412e5ac278f70d7dd94cb7e2f956bb75174f75eff17d2bb97495bf27aa1f1fa2c70b305098838fd8529de130369d39a17595a3cff49c9b46aa3ec
+    asap: "npm:~1.0.0"
+  checksum: 10/0801d3d23ddc6f98936fc52a220379b9c27b9c0c56361cb10f1de8ce9927a28b71581f137228ddbf9b6fbaeebefc267a1b9166ac99318a33cc660e9cabc37a7a
   languageName: node
   linkType: hard
 
@@ -24457,18 +26033,18 @@ __metadata:
   version: 2.4.2
   resolution: "prompts@npm:2.4.2"
   dependencies:
-    kleur: ^3.0.3
-    sisteransi: ^1.0.5
-  checksum: d8fd1fe63820be2412c13bfc5d0a01909acc1f0367e32396962e737cb2fc52d004f3302475d5ce7d18a1e8a79985f93ff04ee03007d091029c3f9104bffc007d
+    kleur: "npm:^3.0.3"
+    sisteransi: "npm:^1.0.5"
+  checksum: 10/c52536521a4d21eff4f2f2aa4572446cad227464066365a7167e52ccf8d9839c099f9afec1aba0eed3d5a2514b3e79e0b3e7a1dc326b9acde6b75d27ed74b1a9
   languageName: node
   linkType: hard
 
-"promzard@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "promzard@npm:0.3.0"
+"promzard@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "promzard@npm:1.0.0"
   dependencies:
-    read: 1
-  checksum: 443a3b39ac916099988ee0161ab4e22edd1fa27e3d39a38d60e48c11ca6df3f5a90bfe44d95af06ed8659c4050b789ffe64c3f9f8e49a4bea1ea19105c98445a
+    read: "npm:^2.0.0"
+  checksum: 10/c06948827171612faae321ebaf23ff8bd9ebb3e1e0f37616990bc4b81c663b192e447b3fe3b424211beb0062cec0cfe6ba3ce70c8b448b4aa59752b765dbb302
   languageName: node
   linkType: hard
 
@@ -24476,10 +26052,10 @@ __metadata:
   version: 15.8.1
   resolution: "prop-types@npm:15.8.1"
   dependencies:
-    loose-envify: ^1.4.0
-    object-assign: ^4.1.1
-    react-is: ^16.13.1
-  checksum: c056d3f1c057cb7ff8344c645450e14f088a915d078dcda795041765047fa080d38e5d626560ccaac94a4e16e3aa15f3557c1a9a8d1174530955e992c675e459
+    loose-envify: "npm:^1.4.0"
+    object-assign: "npm:^4.1.1"
+    react-is: "npm:^16.13.1"
+  checksum: 10/7d959caec002bc964c86cdc461ec93108b27337dabe6192fb97d69e16a0c799a03462713868b40749bfc1caf5f57ef80ac3e4ffad3effa636ee667582a75e2c0
   languageName: node
   linkType: hard
 
@@ -24487,8 +26063,8 @@ __metadata:
   version: 1.5.0
   resolution: "propagating-hammerjs@npm:1.5.0"
   dependencies:
-    hammerjs: ^2.0.8
-  checksum: fa67e632e8a33fc4d125a8a70affd720fbb9313c2782d64ab2463c1cd7faec584fb3de620c3e381ab1d4861398e0a21e17b845d1da3aa2840a3b305ec5da6a65
+    hammerjs: "npm:^2.0.8"
+  checksum: 10/ff83ae333e69942af80af5ce53d240a63a8d63c96cbee1771bbe194ef70ee2977b31f909ea952c13a0d155ffc059e6f71253f04f40299842354b2b8ffc081d48
   languageName: node
   linkType: hard
 
@@ -24496,49 +26072,42 @@ __metadata:
   version: 5.6.0
   resolution: "property-information@npm:5.6.0"
   dependencies:
-    xtend: ^4.0.0
-  checksum: fcf87c6542e59a8bbe31ca0b3255a4a63ac1059b01b04469680288998bcfa97f341ca989566adbb63975f4d85339030b82320c324a511532d390910d1c583893
-  languageName: node
-  linkType: hard
-
-"proto-list@npm:~1.2.1":
-  version: 1.2.4
-  resolution: "proto-list@npm:1.2.4"
-  checksum: 4d4826e1713cbfa0f15124ab0ae494c91b597a3c458670c9714c36e8baddf5a6aad22842776f2f5b137f259c8533e741771445eb8df82e861eea37a6eaba03f7
+    xtend: "npm:^4.0.0"
+  checksum: 10/e4f45b100fec5968126b08102f9567f1b5fc3442aecbb5b4cdeca401f1f447672e7638a08c81c05dd3979c62d084e0cc6acbe2d8b053c05280ac5abaaf666a68
   languageName: node
   linkType: hard
 
-"protobufjs@npm:^7.2.4":
-  version: 7.2.4
-  resolution: "protobufjs@npm:7.2.4"
+"protobufjs@npm:^7.2.5":
+  version: 7.2.6
+  resolution: "protobufjs@npm:7.2.6"
   dependencies:
-    "@protobufjs/aspromise": ^1.1.2
-    "@protobufjs/base64": ^1.1.2
-    "@protobufjs/codegen": ^2.0.4
-    "@protobufjs/eventemitter": ^1.1.0
-    "@protobufjs/fetch": ^1.1.0
-    "@protobufjs/float": ^1.0.2
-    "@protobufjs/inquire": ^1.1.0
-    "@protobufjs/path": ^1.1.2
-    "@protobufjs/pool": ^1.1.0
-    "@protobufjs/utf8": ^1.1.0
-    "@types/node": ">=13.7.0"
-    long: ^5.0.0
-  checksum: a952cdf2a5e5250c16ae651b570849b6f5b20a5475c3eef63ffb290ad239aa2916adfc1cc676f7fc93c69f48113df268761c0c246f7f023118c85bdd1a170044
+    "@protobufjs/aspromise": "npm:^1.1.2"
+    "@protobufjs/base64": "npm:^1.1.2"
+    "@protobufjs/codegen": "npm:^2.0.4"
+    "@protobufjs/eventemitter": "npm:^1.1.0"
+    "@protobufjs/fetch": "npm:^1.1.0"
+    "@protobufjs/float": "npm:^1.0.2"
+    "@protobufjs/inquire": "npm:^1.1.0"
+    "@protobufjs/path": "npm:^1.1.2"
+    "@protobufjs/pool": "npm:^1.1.0"
+    "@protobufjs/utf8": "npm:^1.1.0"
+    "@types/node": "npm:>=13.7.0"
+    long: "npm:^5.0.0"
+  checksum: 10/81ab853d28c71998d056d6b34f83c4bc5be40cb0b416585f99ed618aed833d64b2cf89359bad7474d345302f2b5e236c4519165f8483d7ece7fd5b0d9ac13f8b
   languageName: node
   linkType: hard
 
 "protocol-buffers-schema@npm:^3.3.1":
   version: 3.6.0
   resolution: "protocol-buffers-schema@npm:3.6.0"
-  checksum: 8713b5770f6745ddbcdf3bbd03ee020624d506233bb567927a6615a6f69a5bd620a5f49597f34f4115792b853a4c9cb9e2d5d6b930a1c04bf198023e45c1c349
+  checksum: 10/55a1caed123fb2385eae5ea4770dc36b3017d1fe2005ffb1ef20c97dadf43a91876238ebc23bc240ef1f8501d054bdd9d12992796e9abed18ddf958e4f942eea
   languageName: node
   linkType: hard
 
 "protocols@npm:^2.0.0, protocols@npm:^2.0.1":
   version: 2.0.1
   resolution: "protocols@npm:2.0.1"
-  checksum: 4a9bef6aa0449a0245ded319ac3cbfd032c3e76ebb562777037a3a832c99253d0e8bc2847f7be350236df620a11f7d4fe683ea7f59a2cc14c69f746b6259eda4
+  checksum: 10/0cd08a55b9cb7cc96fed7a528255320428a7c86fd5f3f35965845285436433b7836178893168f80584efdf86391cd7c0a837b6f6bc5ddac3029c76be61118ba5
   languageName: node
   linkType: hard
 
@@ -24546,44 +26115,44 @@ __metadata:
   version: 2.0.7
   resolution: "proxy-addr@npm:2.0.7"
   dependencies:
-    forwarded: 0.2.0
-    ipaddr.js: 1.9.1
-  checksum: 29c6990ce9364648255454842f06f8c46fcd124d3e6d7c5066df44662de63cdc0bad032e9bf5a3d653ff72141cc7b6019873d685708ac8210c30458ad99f2b74
+    forwarded: "npm:0.2.0"
+    ipaddr.js: "npm:1.9.1"
+  checksum: 10/f24a0c80af0e75d31e3451398670d73406ec642914da11a2965b80b1898ca6f66a0e3e091a11a4327079b2b268795f6fa06691923fef91887215c3d0e8ea3f68
   languageName: node
   linkType: hard
 
 "proxy-from-env@npm:1.0.0":
   version: 1.0.0
   resolution: "proxy-from-env@npm:1.0.0"
-  checksum: 292e28d1de0c315958d71d8315eb546dd3cd8c8cbc2dab7c54eeb9f5c17f421771964ad0b5e1f77011bab2305bdae42e1757ce33bdb1ccc3e87732322a8efcf1
+  checksum: 10/f26b59c0f21dd118c23a0eb1f5250848a23b5029ec5c9f2b4011b6439b19fa83da50858d84e9261da94aa4e67778c1bac5483afce884b7770a96895a4e6b9a19
   languageName: node
   linkType: hard
 
-"proxy-from-env@npm:^1.0.0":
+"proxy-from-env@npm:^1.0.0, proxy-from-env@npm:^1.1.0":
   version: 1.1.0
   resolution: "proxy-from-env@npm:1.1.0"
-  checksum: ed7fcc2ba0a33404958e34d95d18638249a68c430e30fcb6c478497d72739ba64ce9810a24f53a7d921d0c065e5b78e3822759800698167256b04659366ca4d4
+  checksum: 10/f0bb4a87cfd18f77bc2fba23ae49c3b378fb35143af16cc478171c623eebe181678f09439707ad80081d340d1593cd54a33a0113f3ccb3f4bc9451488780ee23
   languageName: node
   linkType: hard
 
 "prr@npm:~1.0.1":
   version: 1.0.1
   resolution: "prr@npm:1.0.1"
-  checksum: 3bca2db0479fd38f8c4c9439139b0c42dcaadcc2fbb7bb8e0e6afaa1383457f1d19aea9e5f961d5b080f1cfc05bfa1fe9e45c97a1d3fd6d421950a73d3108381
+  checksum: 10/3bca2db0479fd38f8c4c9439139b0c42dcaadcc2fbb7bb8e0e6afaa1383457f1d19aea9e5f961d5b080f1cfc05bfa1fe9e45c97a1d3fd6d421950a73d3108381
   languageName: node
   linkType: hard
 
 "pseudoizer@npm:^0.1.0":
   version: 0.1.0
   resolution: "pseudoizer@npm:0.1.0"
-  checksum: fd3fa95ea4f330f268cad2388f3829e4c29249e7ffea970467b9123f1ef2a81334e92425c5cad0c72ab04c320203501b65ae86aa8d88320b63e0e75e944c6e76
+  checksum: 10/fd3fa95ea4f330f268cad2388f3829e4c29249e7ffea970467b9123f1ef2a81334e92425c5cad0c72ab04c320203501b65ae86aa8d88320b63e0e75e944c6e76
   languageName: node
   linkType: hard
 
 "psl@npm:^1.1.28, psl@npm:^1.1.33":
   version: 1.9.0
   resolution: "psl@npm:1.9.0"
-  checksum: 20c4277f640c93d393130673f392618e9a8044c6c7bf61c53917a0fddb4952790f5f362c6c730a9c32b124813e173733f9895add8d26f566ed0ea0654b2e711d
+  checksum: 10/d07879d4bfd0ac74796306a8e5a36a93cfb9c4f4e8ee8e63fbb909066c192fe1008cd8f12abd8ba2f62ca28247949a20c8fb32e1d18831d9e71285a1569720f9
   languageName: node
   linkType: hard
 
@@ -24591,9 +26160,9 @@ __metadata:
   version: 2.0.1
   resolution: "pump@npm:2.0.1"
   dependencies:
-    end-of-stream: ^1.1.0
-    once: ^1.3.1
-  checksum: e9f26a17be00810bff37ad0171edb35f58b242487b0444f92fb7d78bc7d61442fa9b9c5bd93a43fd8fd8ddd3cc75f1221f5e04c790f42907e5baab7cf5e2b931
+    end-of-stream: "npm:^1.1.0"
+    once: "npm:^1.3.1"
+  checksum: 10/e9f26a17be00810bff37ad0171edb35f58b242487b0444f92fb7d78bc7d61442fa9b9c5bd93a43fd8fd8ddd3cc75f1221f5e04c790f42907e5baab7cf5e2b931
   languageName: node
   linkType: hard
 
@@ -24601,34 +26170,34 @@ __metadata:
   version: 3.0.0
   resolution: "pump@npm:3.0.0"
   dependencies:
-    end-of-stream: ^1.1.0
-    once: ^1.3.1
-  checksum: e42e9229fba14732593a718b04cb5e1cfef8254544870997e0ecd9732b189a48e1256e4e5478148ecb47c8511dca2b09eae56b4d0aad8009e6fac8072923cfc9
+    end-of-stream: "npm:^1.1.0"
+    once: "npm:^1.3.1"
+  checksum: 10/e42e9229fba14732593a718b04cb5e1cfef8254544870997e0ecd9732b189a48e1256e4e5478148ecb47c8511dca2b09eae56b4d0aad8009e6fac8072923cfc9
   languageName: node
   linkType: hard
 
-"pumpify@npm:^1.3.3, pumpify@npm:^1.3.5":
+"pumpify@npm:^1.3.3":
   version: 1.5.1
   resolution: "pumpify@npm:1.5.1"
   dependencies:
-    duplexify: ^3.6.0
-    inherits: ^2.0.3
-    pump: ^2.0.0
-  checksum: 26ca412ec8d665bd0d5e185c1b8f627728eff603440d75d22a58e421e3c66eaf86ec6fc6a6efc54808ecef65979279fa8e99b109a23ec1fa8d79f37e6978c9bd
+    duplexify: "npm:^3.6.0"
+    inherits: "npm:^2.0.3"
+    pump: "npm:^2.0.0"
+  checksum: 10/5d11a99f320dc2a052610399bac6d03db0a23bc23b23aa2a7d0adf879da3065a55134b975db66dc46bc79f54af3dd575d8119113a0a5b311a00580e1f053896b
   languageName: node
   linkType: hard
 
 "punycode@npm:^1.4.1":
   version: 1.4.1
   resolution: "punycode@npm:1.4.1"
-  checksum: fa6e698cb53db45e4628559e557ddaf554103d2a96a1d62892c8f4032cd3bc8871796cae9eabc1bc700e2b6677611521ce5bb1d9a27700086039965d0cf34518
+  checksum: 10/af2700dde1a116791ff8301348ff344c47d6c224e875057237d1b5112035655fb07a6175cfdb8bf0e3a8cdfd2dc82b3a622e0aefd605566c0e949a6d0d1256a4
   languageName: node
   linkType: hard
 
 "punycode@npm:^2.1.0, punycode@npm:^2.1.1":
   version: 2.1.1
   resolution: "punycode@npm:2.1.1"
-  checksum: 823bf443c6dd14f669984dea25757b37993f67e8d94698996064035edd43bed8a5a17a9f12e439c2b35df1078c6bec05a6c86e336209eb1061e8025c481168e8
+  checksum: 10/939daa010c2cacebdb060c40ecb52fef0a739324a66f7fffe0f94353a1ee83e3b455e9032054c4a0c4977b0a28e27086f2171c392832b59a01bd948fd8e20914
   languageName: node
   linkType: hard
 
@@ -24636,31 +26205,24 @@ __metadata:
   version: 2.1.1
   resolution: "puppeteer-core@npm:2.1.1"
   dependencies:
-    "@types/mime-types": ^2.1.0
-    debug: ^4.1.0
-    extract-zip: ^1.6.6
-    https-proxy-agent: ^4.0.0
-    mime: ^2.0.3
-    mime-types: ^2.1.25
-    progress: ^2.0.1
-    proxy-from-env: ^1.0.0
-    rimraf: ^2.6.1
-    ws: ^6.1.0
-  checksum: 2ddb597ef1b2d162b4aa49833b977734129edf7c8fa558fc38c59d273e79aa1bd079481c642de87f7163665f7f37aa52683da2716bafb7d3cab68c262c36ec28
+    "@types/mime-types": "npm:^2.1.0"
+    debug: "npm:^4.1.0"
+    extract-zip: "npm:^1.6.6"
+    https-proxy-agent: "npm:^4.0.0"
+    mime: "npm:^2.0.3"
+    mime-types: "npm:^2.1.25"
+    progress: "npm:^2.0.1"
+    proxy-from-env: "npm:^1.0.0"
+    rimraf: "npm:^2.6.1"
+    ws: "npm:^6.1.0"
+  checksum: 10/fcbf80c954f9562f88b53886dc377595bf478abbb47c005f9131a56b6704cdd0a26b60f2646d2340866ed9f5059aae2b9f06a0f04310f5f14520ec94a687fbe6
   languageName: node
   linkType: hard
 
 "pure-rand@npm:^6.0.0":
   version: 6.0.3
   resolution: "pure-rand@npm:6.0.3"
-  checksum: d08701cfd1528c5f9cdca996776c498c92767722561f9b8f9e62645d5025c8a3bf60b90f76f262aaab124e6bb1d58e1b0850722dbca2846a19b708801956e56b
-  languageName: node
-  linkType: hard
-
-"q@npm:^1.5.1":
-  version: 1.5.1
-  resolution: "q@npm:1.5.1"
-  checksum: 147baa93c805bc1200ed698bdf9c72e9e42c05f96d007e33a558b5fdfd63e5ea130e99313f28efc1783e90e6bdb4e48b67a36fcc026b7b09202437ae88a1fb12
+  checksum: 10/68e6ebbc918d0022870cc436c26fd07b8ae6a71acc9aa83145d6e2ec0022e764926cbffc70c606fd25213c3b7234357d10458939182fb6568c2a364d1098cf34
   languageName: node
   linkType: hard
 
@@ -24668,15 +26230,15 @@ __metadata:
   version: 6.10.4
   resolution: "qs@npm:6.10.4"
   dependencies:
-    side-channel: ^1.0.4
-  checksum: 31e4fedd759d01eae52dde6692abab175f9af3e639993c5caaa513a2a3607b34d8058d3ae52ceeccf37c3025f22ed5e90e9ddd6c2537e19c0562ddd10dc5b1eb
+    side-channel: "npm:^1.0.4"
+  checksum: 10/8887a53f63180e0e0291deafef581e550bc3656f2453adc8d3ca34b49c04354d31079962f7faf90ab8f5fd6e3d70ee6645042b27814a757a3a5d5708ae3f58e0
   languageName: node
   linkType: hard
 
 "qs@npm:6.9.7":
   version: 6.9.7
   resolution: "qs@npm:6.9.7"
-  checksum: 5bbd263332ccf320a1f36d04a2019a5834dc20bcb736431eaccde2a39dcba03fb26d2fd00174f5d7bc26aaad1cad86124b18440883ac042ea2a0fca6170c1bf1
+  checksum: 10/fb364b54bf4f092a095554968f5abf06036cfe359c9aba258a81b0c0366f625a46098fe1224b2a71ee2f88642470af391c7a8a1496508eca29c37093293f91a9
   languageName: node
   linkType: hard
 
@@ -24684,57 +26246,59 @@ __metadata:
   version: 6.11.2
   resolution: "qs@npm:6.11.2"
   dependencies:
-    side-channel: ^1.0.4
-  checksum: e812f3c590b2262548647d62f1637b6989cc56656dc960b893fe2098d96e1bd633f36576f4cd7564dfbff9db42e17775884db96d846bebe4f37420d073ecdc0b
+    side-channel: "npm:^1.0.4"
+  checksum: 10/f2321d0796664d0f94e92447ccd3bdfd6b6f3a50b6b762aa79d7f5b1ea3a7a9f94063ba896b82bc2a877ed6a7426d4081e4f16568fdb04f0ee188cca9d8505b4
   languageName: node
   linkType: hard
 
 "qs@npm:~6.5.2":
   version: 6.5.3
   resolution: "qs@npm:6.5.3"
-  checksum: 6f20bf08cabd90c458e50855559539a28d00b2f2e7dddcb66082b16a43188418cb3cb77cbd09268bcef6022935650f0534357b8af9eeb29bf0f27ccb17655692
+  checksum: 10/485c990fba7ad17671e16c92715fb064c1600337738f5d140024eb33a49fbc1ed31890d3db850117c760caeb9c9cc9f4ba22a15c20dd119968e41e3d3fe60b28
   languageName: node
   linkType: hard
 
 "querystringify@npm:^2.1.1":
   version: 2.2.0
   resolution: "querystringify@npm:2.2.0"
-  checksum: 5641ea231bad7ef6d64d9998faca95611ed4b11c2591a8cae741e178a974f6a8e0ebde008475259abe1621cb15e692404e6b6626e927f7b849d5c09392604b15
+  checksum: 10/46ab16f252fd892fc29d6af60966d338cdfeea68a231e9457631ffd22d67cec1e00141e0a5236a2eb16c0d7d74175d9ec1d6f963660c6f2b1c2fc85b194c5680
   languageName: node
   linkType: hard
 
 "queue-microtask@npm:^1.2.2":
   version: 1.2.3
   resolution: "queue-microtask@npm:1.2.3"
-  checksum: b676f8c040cdc5b12723ad2f91414d267605b26419d5c821ff03befa817ddd10e238d22b25d604920340fd73efd8ba795465a0377c4adf45a4a41e4234e42dc4
+  checksum: 10/72900df0616e473e824202113c3df6abae59150dfb73ed13273503127235320e9c8ca4aaaaccfd58cf417c6ca92a6e68ee9a5c3182886ae949a768639b388a7b
   languageName: node
   linkType: hard
 
-"queue-tick@npm:^1.0.0":
+"queue-tick@npm:^1.0.1":
   version: 1.0.1
   resolution: "queue-tick@npm:1.0.1"
-  checksum: 57c3292814b297f87f792fbeb99ce982813e4e54d7a8bdff65cf53d5c084113913289d4a48ec8bbc964927a74b847554f9f4579df43c969a6c8e0f026457ad01
+  checksum: 10/f447926c513b64a857906f017a3b350f7d11277e3c8d2a21a42b7998fa1a613d7a829091e12d142bb668905c8f68d8103416c7197856efb0c72fa835b8e254b5
   languageName: node
   linkType: hard
 
-"quick-lru@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "quick-lru@npm:4.0.1"
-  checksum: bea46e1abfaa07023e047d3cf1716a06172c4947886c053ede5c50321893711577cb6119360f810cc3ffcd70c4d7db4069c3cee876b358ceff8596e062bd1154
+"queue-typescript@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "queue-typescript@npm:1.0.1"
+  dependencies:
+    linked-list-typescript: "npm:^1.0.11"
+  checksum: 10/403e38579902af1ac533911876c31dd1fd62e94d352263b9ed9786db3677494b15236ad43182178e5103915605a8b07da5780d84b6cc075d7f54cfb056091489
   languageName: node
   linkType: hard
 
-"quick-lru@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "quick-lru@npm:5.1.1"
-  checksum: a516faa25574be7947969883e6068dbe4aa19e8ef8e8e0fd96cddd6d36485e9106d85c0041a27153286b0770b381328f4072aa40d3b18a19f5f7d2b78b94b5ed
+"quick-lru@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "quick-lru@npm:4.0.1"
+  checksum: 10/5c7c75f1c696750f619b165cc9957382f919e4207dabf04597a64f0298861391cdc5ee91a1dde1a5d460ecf7ee1af7fc36fef6d155bef2be66f05d43fd63d4f0
   languageName: node
   linkType: hard
 
 "quick-lru@npm:^6.1.1":
   version: 6.1.1
   resolution: "quick-lru@npm:6.1.1"
-  checksum: a9c75bf1d208c1d207590e10403a75d037f9faf7857f2e0d38c294d92b40d8b400776bcb5d4dd516baa84e6f5e3baf2a16cf405e6fedc18107922f46aeae83ee
+  checksum: 10/3e9e61bd8fece00da09bacff29e7b33e69088eb6d2c956a140e4264d32ebd8b4e0cc040c9ff2c1ccea52442ae9655561f28b3879f5deeb792ed8a0ffa3ec5014
   languageName: node
   linkType: hard
 
@@ -24742,24 +26306,24 @@ __metadata:
   version: 0.1.8
   resolution: "quick-temp@npm:0.1.8"
   dependencies:
-    mktemp: ~0.4.0
-    rimraf: ^2.5.4
-    underscore.string: ~3.3.4
-  checksum: b9a60934301afd5cb67a10946f8124e63ccb0cd305d35e2d8e5fe7be80df4d29b8414605ee1e55a714c3b87468856fa92526737569fc5e4a11e056ee192b72c8
+    mktemp: "npm:~0.4.0"
+    rimraf: "npm:^2.5.4"
+    underscore.string: "npm:~3.3.4"
+  checksum: 10/ef11755b9c79917390ab8d292f4cc67e2d4c594ced7853b5f6281fb491a4f507dc10cf9b6a57c62fd394502b91a5ca3287d28e793c6ebf930afc6246efe4658b
   languageName: node
   linkType: hard
 
 "quickselect@npm:^2.0.0":
   version: 2.0.0
   resolution: "quickselect@npm:2.0.0"
-  checksum: ed2e78431050d223fb75da20ee98011aef1a03f7cb04e1a32ee893402e640be3cfb76d72e9dbe01edf3bb457ff6a62e5c2d85748424d1aa531f6ba50daef098c
+  checksum: 10/ed2e78431050d223fb75da20ee98011aef1a03f7cb04e1a32ee893402e640be3cfb76d72e9dbe01edf3bb457ff6a62e5c2d85748424d1aa531f6ba50daef098c
   languageName: node
   linkType: hard
 
 "raf-schd@npm:^4.0.2":
   version: 4.0.3
   resolution: "raf-schd@npm:4.0.3"
-  checksum: 45514041c5ad31fa96aef3bb3c572a843b92da2f2cd1cb4a47c9ad58e48761d3a4126e18daa32b2bfa0bc2551a42d8f324a0e40e536cb656969929602b4e8b58
+  checksum: 10/45514041c5ad31fa96aef3bb3c572a843b92da2f2cd1cb4a47c9ad58e48761d3a4126e18daa32b2bfa0bc2551a42d8f324a0e40e536cb656969929602b4e8b58
   languageName: node
   linkType: hard
 
@@ -24767,15 +26331,15 @@ __metadata:
   version: 3.4.1
   resolution: "raf@npm:3.4.1"
   dependencies:
-    performance-now: ^2.1.0
-  checksum: 50ba284e481c8185dbcf45fc4618ba3aec580bb50c9121385d5698cb6012fe516d2015b1df6dd407a7b7c58d44be8086108236affbce1861edd6b44637c8cd52
+    performance-now: "npm:^2.1.0"
+  checksum: 10/4c4b4c826b09d2aec6ca809f1a3c3c12136e7ec8d13fbb91f495dd2c99cd43345240e003da3bfd16036a432e635049fc6d9f69f9187f5f22ea88bb146ec75881
   languageName: node
   linkType: hard
 
 "ramda@npm:0.29.0":
   version: 0.29.0
   resolution: "ramda@npm:0.29.0"
-  checksum: 9ab26c06eb7545cbb7eebcf75526d6ee2fcaae19e338f165b2bf32772121e7b28192d6664d1ba222ff76188ba26ab307342d66e805dbb02c860560adc4d5dd57
+  checksum: 10/b156660f2c58b4a13bcc4f1a0eabc1145d8db11d33d26a2fb03cd6adf3983a1c1f2bbaaf708c421029e9b09684262d056752623f7e62b79a503fb9217dec69d4
   languageName: node
   linkType: hard
 
@@ -24783,15 +26347,15 @@ __metadata:
   version: 2.1.0
   resolution: "randombytes@npm:2.1.0"
   dependencies:
-    safe-buffer: ^5.1.0
-  checksum: d779499376bd4cbb435ef3ab9a957006c8682f343f14089ed5f27764e4645114196e75b7f6abf1cbd84fd247c0cb0651698444df8c9bf30e62120fbbc52269d6
+    safe-buffer: "npm:^5.1.0"
+  checksum: 10/4efd1ad3d88db77c2d16588dc54c2b52fd2461e70fe5724611f38d283857094fe09040fa2c9776366803c3152cf133171b452ef717592b65631ce5dc3a2bdafc
   languageName: node
   linkType: hard
 
 "range-parser@npm:^1.2.1, range-parser@npm:~1.2.1":
   version: 1.2.1
   resolution: "range-parser@npm:1.2.1"
-  checksum: 0a268d4fea508661cf5743dfe3d5f47ce214fd6b7dec1de0da4d669dd4ef3d2144468ebe4179049eff253d9d27e719c88dae55be64f954e80135a0cada804ec9
+  checksum: 10/ce21ef2a2dd40506893157970dc76e835c78cf56437e26e19189c48d5291e7279314477b06ac38abd6a401b661a6840f7b03bd0b1249da9b691deeaa15872c26
   languageName: node
   linkType: hard
 
@@ -24799,11 +26363,11 @@ __metadata:
   version: 2.4.3
   resolution: "raw-body@npm:2.4.3"
   dependencies:
-    bytes: 3.1.2
-    http-errors: 1.8.1
-    iconv-lite: 0.4.24
-    unpipe: 1.0.0
-  checksum: d2961fa3c71c9c22dc2c3fd60ff377bf36dfed7d7a748f2b25d585934a3e9df565bb9aa5bc2e3a716ea941f4bc2a6ddc795c8b0cf7219fb071029b59b1985394
+    bytes: "npm:3.1.2"
+    http-errors: "npm:1.8.1"
+    iconv-lite: "npm:0.4.24"
+    unpipe: "npm:1.0.0"
+  checksum: 10/b3a7cfacfa00778abce59fe1c698bd44edfdbea9ddd39e22c553dcd50a0376f4c3ad0e650f1ba9d20495bab81251844e14448292071487bd372e506faf0a1a2e
   languageName: node
   linkType: hard
 
@@ -24811,8 +26375,8 @@ __metadata:
   version: 3.0.1
   resolution: "rbush@npm:3.0.1"
   dependencies:
-    quickselect: ^2.0.0
-  checksum: b7def5ba762ca01b6c7c032098ef61b86bd4fef4afb82e4a1d70a07a929b39e779290446c2d4730f577e8a1c8fd0dfd349605b5ea0229258d5f013debdffa65a
+    quickselect: "npm:^2.0.0"
+  checksum: 10/489e2e7d9889888ad533518f194e3ab7cc19b1f1365a38ee99fbdda542a47f41cda7dc89870180050f4d04ea402e9ff294e1d767d03c0f1694e0028b7609eec9
   languageName: node
   linkType: hard
 
@@ -24820,11 +26384,11 @@ __metadata:
   version: 2.4.5
   resolution: "rc-align@npm:2.4.5"
   dependencies:
-    babel-runtime: ^6.26.0
-    dom-align: ^1.7.0
-    prop-types: ^15.5.8
-    rc-util: ^4.0.4
-  checksum: ae11babbdd6e2d964ad588db0b34077bb1c2b837096161ccd2f5b3a6338234117639d5354e2d66d1dd6e1dbc78eea87b0b248ee7024b1f6fdc08a7d0c69f390a
+    babel-runtime: "npm:^6.26.0"
+    dom-align: "npm:^1.7.0"
+    prop-types: "npm:^15.5.8"
+    rc-util: "npm:^4.0.4"
+  checksum: 10/6a82f7b47dda397b90c7b6d41e5500b9e3e427891d15a54f95708abf31a8aba19d882bd9e5ab42f4979b455aa2236b96cf6403152507bcd1fd7663be08a0ceb5
   languageName: node
   linkType: hard
 
@@ -24832,47 +26396,47 @@ __metadata:
   version: 2.11.1
   resolution: "rc-animate@npm:2.11.1"
   dependencies:
-    babel-runtime: 6.x
-    classnames: ^2.2.6
-    css-animation: ^1.3.2
-    prop-types: 15.x
-    raf: ^3.4.0
-    rc-util: ^4.15.3
-    react-lifecycles-compat: ^3.0.4
-  checksum: e8148483d9e87046b3f047a345de6ef3c93e5ec425413a7c5055d41430bf036276c032894381afa2eadee5eb2cd8c48bb5132f35e0974da957d5a2aa12978aaa
+    babel-runtime: "npm:6.x"
+    classnames: "npm:^2.2.6"
+    css-animation: "npm:^1.3.2"
+    prop-types: "npm:15.x"
+    raf: "npm:^3.4.0"
+    rc-util: "npm:^4.15.3"
+    react-lifecycles-compat: "npm:^3.0.4"
+  checksum: 10/afb54ad896c9d50af212ae7a56a216b47b38238a4e8e187437fe965c2cf100f1ca82668ed90d38dcd3b0e3ced53f54383e417af09c6dc09f6db0f78cba2aa9e4
   languageName: node
   linkType: hard
 
-"rc-cascader@npm:3.19.0":
-  version: 3.19.0
-  resolution: "rc-cascader@npm:3.19.0"
+"rc-cascader@npm:3.24.0":
+  version: 3.24.0
+  resolution: "rc-cascader@npm:3.24.0"
   dependencies:
-    "@babel/runtime": ^7.12.5
-    array-tree-filter: ^2.1.0
-    classnames: ^2.3.1
-    rc-select: ~14.9.0
-    rc-tree: ~5.8.0
-    rc-util: ^5.37.0
+    "@babel/runtime": "npm:^7.12.5"
+    array-tree-filter: "npm:^2.1.0"
+    classnames: "npm:^2.3.1"
+    rc-select: "npm:~14.13.0"
+    rc-tree: "npm:~5.8.1"
+    rc-util: "npm:^5.37.0"
   peerDependencies:
     react: ">=16.9.0"
     react-dom: ">=16.9.0"
-  checksum: d4afadd601f652a9ce1679ea0f069eb53bed608ba8b89dab7d815faee65cbb47f45325378f36941e3d30424ea407dd48d79db6b06ca8f1f258856b0471e0bcec
+  checksum: 10/a4e1acc855c7145df83451519d86b22efd4fadc10507a5d2b17d9351aaf18d1c687c8605fd44c4d54379b295ba1770875bf5bc8d000dce63336a6bd2f1e8af58
   languageName: node
   linkType: hard
 
-"rc-drawer@npm:6.5.2":
-  version: 6.5.2
-  resolution: "rc-drawer@npm:6.5.2"
+"rc-drawer@npm:7.1.0":
+  version: 7.1.0
+  resolution: "rc-drawer@npm:7.1.0"
   dependencies:
-    "@babel/runtime": ^7.10.1
-    "@rc-component/portal": ^1.1.1
-    classnames: ^2.2.6
-    rc-motion: ^2.6.1
-    rc-util: ^5.36.0
+    "@babel/runtime": "npm:^7.23.9"
+    "@rc-component/portal": "npm:^1.1.1"
+    classnames: "npm:^2.2.6"
+    rc-motion: "npm:^2.6.1"
+    rc-util: "npm:^5.38.1"
   peerDependencies:
     react: ">=16.9.0"
     react-dom: ">=16.9.0"
-  checksum: e96908f641ea0a4b26e7142a932cefe60ee34c03c6c569a6070af770b0be8a883e89521217d8391957254b0ed88b4ac1735129c9e062528db0751bfd0222a0c1
+  checksum: 10/6d37b35e3a9abd0e105f91f388c818dcd7d6e9a5805a9bb0909b01e96e47437af2010e29c05648d15ece37e0768ff752e15f498ced69a476c20b9ea06c5e636f
   languageName: node
   linkType: hard
 
@@ -24880,13 +26444,13 @@ __metadata:
   version: 2.6.2
   resolution: "rc-motion@npm:2.6.2"
   dependencies:
-    "@babel/runtime": ^7.11.1
-    classnames: ^2.2.1
-    rc-util: ^5.21.0
+    "@babel/runtime": "npm:^7.11.1"
+    classnames: "npm:^2.2.1"
+    rc-util: "npm:^5.21.0"
   peerDependencies:
     react: ">=16.9.0"
     react-dom: ">=16.9.0"
-  checksum: e91ec8a9f8748ae34d6f9c0380d4587729453c7c8afe23c026ff096905b5a24672b050e04789061c833994e05ed18fec02919bc0e27c1e05b06fe7a0c0b75532
+  checksum: 10/a0266569aab9fe3b72e7c17a0b838afe62fe90a0bea5dbea2a667a0a33025dc3c24bd252a720154148f2424d96de0f51e0334d09f9429df2466f31542dacb061
   languageName: node
   linkType: hard
 
@@ -24894,14 +26458,14 @@ __metadata:
   version: 1.3.2
   resolution: "rc-overflow@npm:1.3.2"
   dependencies:
-    "@babel/runtime": ^7.11.1
-    classnames: ^2.2.1
-    rc-resize-observer: ^1.0.0
-    rc-util: ^5.37.0
+    "@babel/runtime": "npm:^7.11.1"
+    classnames: "npm:^2.2.1"
+    rc-resize-observer: "npm:^1.0.0"
+    rc-util: "npm:^5.37.0"
   peerDependencies:
     react: ">=16.9.0"
     react-dom: ">=16.9.0"
-  checksum: 7041f72e881ead9a484bddb6b6b6eb94455911f6b1cb06b16979ffe7d79e81058d5c77d0ca3f14faa0d1e43c81b966e65ed11678d09c2344cfd84dcfd803e620
+  checksum: 10/a35d6f035de9e5b71f5762ddaf9757770fadab7d5f5e6bf0451346cffb06027e9de75a8104ca782c71e381f55552588a350905a61083cd23d2fb6f24e2807007
   languageName: node
   linkType: hard
 
@@ -24909,46 +26473,46 @@ __metadata:
   version: 1.3.1
   resolution: "rc-resize-observer@npm:1.3.1"
   dependencies:
-    "@babel/runtime": ^7.20.7
-    classnames: ^2.2.1
-    rc-util: ^5.27.0
-    resize-observer-polyfill: ^1.5.1
+    "@babel/runtime": "npm:^7.20.7"
+    classnames: "npm:^2.2.1"
+    rc-util: "npm:^5.27.0"
+    resize-observer-polyfill: "npm:^1.5.1"
   peerDependencies:
     react: ">=16.9.0"
     react-dom: ">=16.9.0"
-  checksum: cc952e5d3071543e990103ea64b20310e3a09c950a473bf89a3a7e6063bd060c6c041f0333085640676d176c7edd58676a3b3d64dfa17461ea6f3a62f79c4d65
+  checksum: 10/71add2ac032464b8ef62a044559396728249fc01cffcd5084c4d9e3b69b22f4ad85308f90e2dea6fce8e23d6a72325f8ba9a2c96697e82d31d6c16453fb2642c
   languageName: node
   linkType: hard
 
-"rc-select@npm:~14.9.0":
-  version: 14.9.1
-  resolution: "rc-select@npm:14.9.1"
+"rc-select@npm:~14.13.0":
+  version: 14.13.0
+  resolution: "rc-select@npm:14.13.0"
   dependencies:
-    "@babel/runtime": ^7.10.1
-    "@rc-component/trigger": ^1.5.0
-    classnames: 2.x
-    rc-motion: ^2.0.1
-    rc-overflow: ^1.3.1
-    rc-util: ^5.16.1
-    rc-virtual-list: ^3.5.2
+    "@babel/runtime": "npm:^7.10.1"
+    "@rc-component/trigger": "npm:^2.0.0"
+    classnames: "npm:2.x"
+    rc-motion: "npm:^2.0.1"
+    rc-overflow: "npm:^1.3.1"
+    rc-util: "npm:^5.16.1"
+    rc-virtual-list: "npm:^3.5.2"
   peerDependencies:
     react: "*"
     react-dom: "*"
-  checksum: 914e6ae273c6916e321710e6eaa69d3a5a50ce2a36fc91c22bd1c42d95cd8083d6f10fe0c2324f07829c60b9ad30b481910703d11638885e6ee29429d4c4f8e5
+  checksum: 10/8b4b56e205d0a5c7111f6c547177ab06a39f9bf4a9dec1dbd71870d0d92642686de283d4f662540acc8f9a1541fd1a10c72f50ef54fa1e2821b5a45bb46d8894
   languageName: node
   linkType: hard
 
-"rc-slider@npm:10.3.1":
-  version: 10.3.1
-  resolution: "rc-slider@npm:10.3.1"
+"rc-slider@npm:10.5.0":
+  version: 10.5.0
+  resolution: "rc-slider@npm:10.5.0"
   dependencies:
-    "@babel/runtime": ^7.10.1
-    classnames: ^2.2.5
-    rc-util: ^5.27.0
+    "@babel/runtime": "npm:^7.10.1"
+    classnames: "npm:^2.2.5"
+    rc-util: "npm:^5.27.0"
   peerDependencies:
     react: ">=16.9.0"
     react-dom: ">=16.9.0"
-  checksum: 67998137031ab0551538ba7aa038863ccd07c876d268f2ab05e408298105ab4e6136a532c97296231e91c6791442c2f7a495d9a604440bddaa094e73336705f2
+  checksum: 10/9fe5b45a0e199311d665312e9940a59e007b81bfdd868cfecb70f4f95299b5447ee2a7c5a4c90a0ee7bbffad9dfa73cc01c779946adc4ca4fe22d2cf02bac046
   languageName: node
   linkType: hard
 
@@ -24956,43 +26520,43 @@ __metadata:
   version: 3.7.3
   resolution: "rc-time-picker@npm:3.7.3"
   dependencies:
-    classnames: 2.x
-    moment: 2.x
-    prop-types: ^15.5.8
-    raf: ^3.4.1
-    rc-trigger: ^2.2.0
-    react-lifecycles-compat: ^3.0.4
-  checksum: 9069ae590fd001073c069a8674b889ea1926fea4f4636613b80616be4344cd9d4cc3fadce188556c05f1b7c71088f507b6a8a4ba64d02a199483a11cfa5d59db
+    classnames: "npm:2.x"
+    moment: "npm:2.x"
+    prop-types: "npm:^15.5.8"
+    raf: "npm:^3.4.1"
+    rc-trigger: "npm:^2.2.0"
+    react-lifecycles-compat: "npm:^3.0.4"
+  checksum: 10/236ba0dd1b1cee4dd398d2542c251a7e0da21b31d3390a23c45cc7f2ea266cfddd1f0b7f681fe205f2d92edaa72771cb087505790b5124eb0ca31668feb74da5
   languageName: node
   linkType: hard
 
-"rc-tooltip@npm:6.1.1":
-  version: 6.1.1
-  resolution: "rc-tooltip@npm:6.1.1"
+"rc-tooltip@npm:6.2.0":
+  version: 6.2.0
+  resolution: "rc-tooltip@npm:6.2.0"
   dependencies:
-    "@babel/runtime": ^7.11.2
-    "@rc-component/trigger": ^1.17.0
-    classnames: ^2.3.1
+    "@babel/runtime": "npm:^7.11.2"
+    "@rc-component/trigger": "npm:^2.0.0"
+    classnames: "npm:^2.3.1"
   peerDependencies:
     react: ">=16.9.0"
     react-dom: ">=16.9.0"
-  checksum: f3681cae6603973268cb0fd6db7c55efc99bf51f5387b7f41a05c4cc0ce1a00b7dbf4d0b2173fe6e77490674390e8283714324bdd705f1a3c4e89af72457c589
+  checksum: 10/2be8fd3da8666df1d83485e5532e11eacf4dd3686efed9b4f0bc78caeb647196cac62104e54b9ce5dbc3051a9df70e07e54557f3273b632bb474a73c8bca0a2d
   languageName: node
   linkType: hard
 
-"rc-tree@npm:5.8.0, rc-tree@npm:~5.8.0":
-  version: 5.8.0
-  resolution: "rc-tree@npm:5.8.0"
+"rc-tree@npm:5.8.5, rc-tree@npm:~5.8.1":
+  version: 5.8.5
+  resolution: "rc-tree@npm:5.8.5"
   dependencies:
-    "@babel/runtime": ^7.10.1
-    classnames: 2.x
-    rc-motion: ^2.0.1
-    rc-util: ^5.16.1
-    rc-virtual-list: ^3.5.1
+    "@babel/runtime": "npm:^7.10.1"
+    classnames: "npm:2.x"
+    rc-motion: "npm:^2.0.1"
+    rc-util: "npm:^5.16.1"
+    rc-virtual-list: "npm:^3.5.1"
   peerDependencies:
     react: "*"
     react-dom: "*"
-  checksum: 69ed9f2adc2271b2789ec95159c6cfb5435e57ff1554f729934297512bfa73f2158054c7d80e2daa426ed3987d42b13a02ff2e3c882f6336d8458442053897ee
+  checksum: 10/4115fe6efaf25dc5f7e51eb1ddcd93d37b74358bfd1730d5146bc9187330c9fc01c6e1492f64a79f250aae14051a23fa49fcae494376f451064e199e351b0d84
   languageName: node
   linkType: hard
 
@@ -25000,14 +26564,14 @@ __metadata:
   version: 2.6.5
   resolution: "rc-trigger@npm:2.6.5"
   dependencies:
-    babel-runtime: 6.x
-    classnames: ^2.2.6
-    prop-types: 15.x
-    rc-align: ^2.4.0
-    rc-animate: 2.x
-    rc-util: ^4.4.0
-    react-lifecycles-compat: ^3.0.4
-  checksum: 749145ae9246c0ca208d9d46f5e215e3832ea54f1e51ad2f55a16b8130f0f057fda387d923f582d8630bc1cb96b17415b74a4dd9b4b502ae9bf06daf07df0434
+    babel-runtime: "npm:6.x"
+    classnames: "npm:^2.2.6"
+    prop-types: "npm:15.x"
+    rc-align: "npm:^2.4.0"
+    rc-animate: "npm:2.x"
+    rc-util: "npm:^4.4.0"
+    react-lifecycles-compat: "npm:^3.0.4"
+  checksum: 10/a3ed5f0c453a37ab00fce302e9f40daa64870eb001576a3409a94550802af1e01cbd7b050b3adf7225af03e82e2070d095477957fcd07209ee32602a2f3fba31
   languageName: node
   linkType: hard
 
@@ -25015,25 +26579,25 @@ __metadata:
   version: 4.21.1
   resolution: "rc-util@npm:4.21.1"
   dependencies:
-    add-dom-event-listener: ^1.1.0
-    prop-types: ^15.5.10
-    react-is: ^16.12.0
-    react-lifecycles-compat: ^3.0.4
-    shallowequal: ^1.1.0
-  checksum: f87d321ad2088171eef990f179fe8b34db648cd5ad37439de381093891189e429ad8c791077205c56de9e26e37749fb3f4ecfceba8c35f983f540650c7ed4fb0
+    add-dom-event-listener: "npm:^1.1.0"
+    prop-types: "npm:^15.5.10"
+    react-is: "npm:^16.12.0"
+    react-lifecycles-compat: "npm:^3.0.4"
+    shallowequal: "npm:^1.1.0"
+  checksum: 10/aa68990486c6e45d4a37446ef6ec0ad4d6829ec01975a009494ba36b2d3c2d4eda8a64c75ee8d6984cdc30450b83e975dcefb6781bff9297f4b5c0fa56567629
   languageName: node
   linkType: hard
 
-"rc-util@npm:^5.15.0, rc-util@npm:^5.16.1, rc-util@npm:^5.21.0, rc-util@npm:^5.24.4, rc-util@npm:^5.27.0, rc-util@npm:^5.36.0, rc-util@npm:^5.37.0, rc-util@npm:^5.38.0":
-  version: 5.38.0
-  resolution: "rc-util@npm:5.38.0"
+"rc-util@npm:^5.15.0, rc-util@npm:^5.16.1, rc-util@npm:^5.21.0, rc-util@npm:^5.24.4, rc-util@npm:^5.27.0, rc-util@npm:^5.37.0, rc-util@npm:^5.38.0, rc-util@npm:^5.38.1":
+  version: 5.38.2
+  resolution: "rc-util@npm:5.38.2"
   dependencies:
-    "@babel/runtime": ^7.18.3
-    react-is: ^18.2.0
+    "@babel/runtime": "npm:^7.18.3"
+    react-is: "npm:^18.2.0"
   peerDependencies:
     react: ">=16.9.0"
     react-dom: ">=16.9.0"
-  checksum: 97a3e1dd94e199c12e69eed1f69e9a9be39b383f2b0d9e1d52d6fcdf676e91e6499fa7be4c48f37b08b6500747f2dc41014f9be54351a39f23b3b5087360690c
+  checksum: 10/f8d8b21d0ed09de6fcf6c24dc19bf82f8f1fd089a625d35fd399626280ed33e73b9a703aa78f1a09ccd40b83f50e73bbc993adf892355a01857d3a1bb83e0958
   languageName: node
   linkType: hard
 
@@ -25041,54 +26605,54 @@ __metadata:
   version: 3.5.3
   resolution: "rc-virtual-list@npm:3.5.3"
   dependencies:
-    "@babel/runtime": ^7.20.0
-    classnames: ^2.2.6
-    rc-resize-observer: ^1.0.0
-    rc-util: ^5.15.0
+    "@babel/runtime": "npm:^7.20.0"
+    classnames: "npm:^2.2.6"
+    rc-resize-observer: "npm:^1.0.0"
+    rc-util: "npm:^5.15.0"
   peerDependencies:
     react: "*"
     react-dom: "*"
-  checksum: 670ee4fbaa413706666f5ed6133a14e14ad2c3433acd1f95c24b8586a68b021b8bca4de81cf630973577adb28c58329da7bd005728cc3189facb8927c6be5632
+  checksum: 10/592a4dc3ca0678c512c96ba4829b9bed945c1a0eb9e83fdfe57bb5fe2133c8adefeca38477edd88e79cb720fbfbe256a2000c4d631f7124b63c6cf7afd7bee60
   languageName: node
   linkType: hard
 
-"re-resizable@npm:6.9.9":
-  version: 6.9.9
-  resolution: "re-resizable@npm:6.9.9"
+"re-resizable@npm:6.9.11":
+  version: 6.9.11
+  resolution: "re-resizable@npm:6.9.11"
   peerDependencies:
     react: ^16.13.1 || ^17.0.0 || ^18.0.0
     react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
-  checksum: a2c8bfe86646fb02d5c9c624b1da26f9e6a5e2f552cd96ce4db690588bee6b21177065ce8e98646c6ca0b1a9c4ce233824b75eb346800d8248ac8a87b40f1b28
+  checksum: 10/3f2590374d03a6b5f7ebc26f273bdb461ceecb1322adf3b7925c695b1c6fa0841225feb79cf63d19c3c2451a9a8ed4f4a82fa119f3a22565ce78e0619d2b624c
   languageName: node
   linkType: hard
 
-"react-beautiful-dnd@npm:13.1.1":
+"react-beautiful-dnd@npm:13.1.1, react-beautiful-dnd@npm:^13.1.1":
   version: 13.1.1
   resolution: "react-beautiful-dnd@npm:13.1.1"
   dependencies:
-    "@babel/runtime": ^7.9.2
-    css-box-model: ^1.2.0
-    memoize-one: ^5.1.1
-    raf-schd: ^4.0.2
-    react-redux: ^7.2.0
-    redux: ^4.0.4
-    use-memo-one: ^1.1.1
+    "@babel/runtime": "npm:^7.9.2"
+    css-box-model: "npm:^1.2.0"
+    memoize-one: "npm:^5.1.1"
+    raf-schd: "npm:^4.0.2"
+    react-redux: "npm:^7.2.0"
+    redux: "npm:^4.0.4"
+    use-memo-one: "npm:^1.1.1"
   peerDependencies:
     react: ^16.8.5 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.5 || ^17.0.0 || ^18.0.0
-  checksum: 5f90f7c0ab77a14dfcd496cbd94bbde457612f380c6fc815f3bba7b52effd75132948fcaa661a902a184bb1e6ae5896dcf5b0c77c4ddf809a2c65288f3eed5a7
+  checksum: 10/2de8162a74f7fc78294e5a928b92d3fff02c579d137a25d53b1ab4313abeb108709bb7281512f7f94d18257de3122b8c85cb5a8375113cb8657088b1a9bda65b
   languageName: node
   linkType: hard
 
-"react-calendar@npm:4.6.0":
-  version: 4.6.0
-  resolution: "react-calendar@npm:4.6.0"
+"react-calendar@npm:4.8.0":
+  version: 4.8.0
+  resolution: "react-calendar@npm:4.8.0"
   dependencies:
-    "@wojtekmaj/date-utils": ^1.1.3
-    clsx: ^2.0.0
-    get-user-locale: ^2.2.1
-    prop-types: ^15.6.0
-    tiny-warning: ^1.0.0
+    "@wojtekmaj/date-utils": "npm:^1.1.3"
+    clsx: "npm:^2.0.0"
+    get-user-locale: "npm:^2.2.1"
+    prop-types: "npm:^15.6.0"
+    warning: "npm:^4.0.0"
   peerDependencies:
     "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -25096,7 +26660,7 @@ __metadata:
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 2832d2a468a8f3a533e9f59a969774c6d608e9a2c60afa9fa599b3bbbbd23d5bc9fa1ca6dca4ac8809a4524bdb6095d8c743977a6d6a132e43f9cbbd460d1c62
+  checksum: 10/26a58d9bbe9b1bbe1201612628d0f6bdeec0355ed3730013d066b9e87adbbee4b6f3f1c83352978c0e2f317d8d32ac31ac2cbb3c6f83833bef0ba047c5bb6907
   languageName: node
   linkType: hard
 
@@ -25106,51 +26670,17 @@ __metadata:
   peerDependencies:
     react: ">=16.8.0"
     react-dom: ">=16.8.0"
-  checksum: e432b7cb0df57e8f0bcdc3b012d2e93fcbcb6092c9e0f85654788d5ebfc4442536d8cc35b2418061ba3c4afb8b7788cc101c606d86a1732407921de7a9244c8d
-  languageName: node
-  linkType: hard
-
-"react-compat-css-styled@npm:^1.0.9":
-  version: 1.0.9
-  resolution: "react-compat-css-styled@npm:1.0.9"
-  dependencies:
-    "@daybrush/utils": ^1.0.0
-    css-styled: ^1.0.0
-    framework-utils: ^1.1.0
-    react-css-styled: ~1.0.4
-  checksum: efe09d37e813b4af0a1423b238e7b0ec78057b5623bdc683ab892e1dbed10fa3eea72c7ffb6c842f03c0d7ff7dfc284c3c540af02984d24ef23c2edc24fca7f4
-  languageName: node
-  linkType: hard
-
-"react-compat-moveable@npm:~0.31.1":
-  version: 0.31.1
-  resolution: "react-compat-moveable@npm:0.31.1"
-  dependencies:
-    "@daybrush/utils": ^1.10.0
-    "@egjs/agent": ^2.2.1
-    "@egjs/children-differ": ^1.0.1
-    "@egjs/list-differ": ^1.0.0
-    "@scena/dragscroll": ^1.4.0
-    "@scena/event-emitter": ^1.0.5
-    "@scena/matrix": ^1.1.1
-    css-to-mat: ^1.0.3
-    framework-utils: ^1.1.0
-    gesto: ^1.15.1
-    overlap-area: ^1.1.0
-    react-compat-css-styled: ^1.0.9
-    react-css-styled: ^1.0.4
-    react-moveable: ~0.46.1
-  checksum: 301cc657065f99b2ee1b316f72582b157df49a42f61172274dde389d1943923cfbe659ba4acec162ca7a4af25262d5bad753bad1857a8e283f572b8254e22cb8
+  checksum: 10/3e02ba013454818d0c323949bd961fb2c19ac18130dfc67a4032aa5b03787c5ffe7ff159c4b97dc3475072d576828ca0c4b8e8ce85b55eaf484180596cdf0403
   languageName: node
   linkType: hard
 
-"react-css-styled@npm:^1.0.4, react-css-styled@npm:~1.0.4":
-  version: 1.0.4
-  resolution: "react-css-styled@npm:1.0.4"
+"react-css-styled@npm:^1.1.9":
+  version: 1.1.9
+  resolution: "react-css-styled@npm:1.1.9"
   dependencies:
-    css-styled: ~1.0.1
-    framework-utils: ^1.1.0
-  checksum: f75a2283713d7cee06e721db5c76b420db55650dbf83cae33b2424acebe96e698f5f522fff834f289bf823aa9c0f3249f40358d72ec460497a8a74d8194a0b68
+    css-styled: "npm:~1.0.8"
+    framework-utils: "npm:^1.1.0"
+  checksum: 10/2862a866af3c09c5eff906d3a4e310ddda33497ad72883b38d5713d890a26529300f2433f940b668fa250ea72af17668e302c34e0690dd9cd1cacd4af98de640
   languageName: node
   linkType: hard
 
@@ -25158,13 +26688,13 @@ __metadata:
   version: 4.5.0
   resolution: "react-custom-scrollbars-2@npm:4.5.0"
   dependencies:
-    dom-css: ^2.0.0
-    prop-types: ^15.5.10
-    raf: ^3.1.0
+    dom-css: "npm:^2.0.0"
+    prop-types: "npm:^15.5.10"
+    raf: "npm:^3.1.0"
   peerDependencies:
     react: ^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
     react-dom: ^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
-  checksum: b264629c0bfcc292106540f802e4d4281fb4acfab93ab259dcde096b72f135a1be6f2fcf636478f9e9bce6e15a9c6eb624c799184bb478073bb7ace86588a1de
+  checksum: 10/4e5e67032a254c6fbfc2157c8c9b28b4285a41372d458a41fa6756777e224f692ae842488e51cb089b55b83625809aed0eb403026b8a8122a7dcf667637b21fd
   languageName: node
   linkType: hard
 
@@ -25172,16 +26702,16 @@ __metadata:
   version: 3.1.1
   resolution: "react-diff-viewer@npm:3.1.1"
   dependencies:
-    classnames: ^2.2.6
-    create-emotion: ^10.0.14
-    diff: ^4.0.1
-    emotion: ^10.0.14
-    memoize-one: ^5.0.4
-    prop-types: ^15.6.2
+    classnames: "npm:^2.2.6"
+    create-emotion: "npm:^10.0.14"
+    diff: "npm:^4.0.1"
+    emotion: "npm:^10.0.14"
+    memoize-one: "npm:^5.0.4"
+    prop-types: "npm:^15.6.2"
   peerDependencies:
     react: ^15.3.0 || ^16.0.0
     react-dom: ^15.3.0 || ^16.0.0
-  checksum: 073445730ecc617768107ca6ccdd0cc93a1b42fa472d4d20aee13de9ddcf1bbcae00b64a350fb07ad1da619ca04ed1c5111d9b170b325e40e44920145170c7c1
+  checksum: 10/b3a4da48aceb41ab128786291bd94d8becbdf507dd364848f958f3f9cba07249256d5189feb2ee2104782a80f25353e6adf83dc076518e79b10ed7feeb4b7c9d
   languageName: node
   linkType: hard
 
@@ -25190,7 +26720,7 @@ __metadata:
   resolution: "react-docgen-typescript@npm:2.2.2"
   peerDependencies:
     typescript: ">= 4.3.x"
-  checksum: a9826459ea44e818f21402728dd47f5cae60bd936574cefd4f90ad101ff3eebacd67b6e017b793309734ce62c037aa3072dbc855d2b0e29bad1a38cbf5bac115
+  checksum: 10/081fc3a876f53b9eeffcff357e5b6c190db799d50edcf11b187857d8cb8cce28000ed777ed16dd52a1c955f332612ef6b1f02cf8adcbcb084b8da9ff1ae5fd13
   languageName: node
   linkType: hard
 
@@ -25198,19 +26728,19 @@ __metadata:
   version: 5.4.3
   resolution: "react-docgen@npm:5.4.3"
   dependencies:
-    "@babel/core": ^7.7.5
-    "@babel/generator": ^7.12.11
-    "@babel/runtime": ^7.7.6
-    ast-types: ^0.14.2
-    commander: ^2.19.0
-    doctrine: ^3.0.0
-    estree-to-babel: ^3.1.0
-    neo-async: ^2.6.1
-    node-dir: ^0.1.10
-    strip-indent: ^3.0.0
+    "@babel/core": "npm:^7.7.5"
+    "@babel/generator": "npm:^7.12.11"
+    "@babel/runtime": "npm:^7.7.6"
+    ast-types: "npm:^0.14.2"
+    commander: "npm:^2.19.0"
+    doctrine: "npm:^3.0.0"
+    estree-to-babel: "npm:^3.1.0"
+    neo-async: "npm:^2.6.1"
+    node-dir: "npm:^0.1.10"
+    strip-indent: "npm:^3.0.0"
   bin:
     react-docgen: bin/react-docgen.js
-  checksum: cef935ba948195eaeec9126c62f53bc015b9a5ad3a7eeb4a4604668d5b12bd5d0c9058c279eaf33ee6b47f2a24ccf01818b67af64d7f61265c4d3a5aa4ff0a3a
+  checksum: 10/111f558e0891982c1a708fe912887a8681d04e230711f0f95a9d4a60b6179cf5efa7e1727995020c06bac97a310bb66e5805b53ca32d3998d0b166482ea95baa
   languageName: node
   linkType: hard
 
@@ -25218,37 +26748,24 @@ __metadata:
   version: 18.2.0
   resolution: "react-dom@npm:18.2.0"
   dependencies:
-    loose-envify: ^1.1.0
-    scheduler: ^0.23.0
+    loose-envify: "npm:^1.1.0"
+    scheduler: "npm:^0.23.0"
   peerDependencies:
     react: ^18.2.0
-  checksum: 7d323310bea3a91be2965f9468d552f201b1c27891e45ddc2d6b8f717680c95a75ae0bc1e3f5cf41472446a2589a75aed4483aee8169287909fcd59ad149e8cc
-  languageName: node
-  linkType: hard
-
-"react-draggable@npm:4.4.5":
-  version: 4.4.5
-  resolution: "react-draggable@npm:4.4.5"
-  dependencies:
-    clsx: ^1.1.1
-    prop-types: ^15.8.1
-  peerDependencies:
-    react: ">= 16.3.0"
-    react-dom: ">= 16.3.0"
-  checksum: 21c3775db086e13020967627c20acd41d1ddbc7c7d7fca51491a5bbb54a0aa7e1730a4bc9af17141eb50a4954e547a5e25b2368f5f54b70db6f2686a897bacf2
+  checksum: 10/ca5e7762ec8c17a472a3605b6f111895c9f87ac7d43a610ab7024f68cd833d08eda0625ce02ec7178cc1f3c957cf0b9273cdc17aa2cd02da87544331c43b1d21
   languageName: node
   linkType: hard
 
-"react-draggable@npm:^4.0.0, react-draggable@npm:^4.0.3, react-draggable@npm:^4.4.5":
+"react-draggable@npm:4.4.6, react-draggable@npm:^4.0.0, react-draggable@npm:^4.0.3, react-draggable@npm:^4.4.5":
   version: 4.4.6
   resolution: "react-draggable@npm:4.4.6"
   dependencies:
-    clsx: ^1.1.1
-    prop-types: ^15.8.1
+    clsx: "npm:^1.1.1"
+    prop-types: "npm:^15.8.1"
   peerDependencies:
     react: ">= 16.3.0"
     react-dom: ">= 16.3.0"
-  checksum: 9b15aac59244873ac4561c5a2bead43a56e18d406e0a5f242bd4f9d151c074530c02b99387983104bf43417292f9cf8d063e554ed08d88792235e3fbc965f1b8
+  checksum: 10/51b9ac7f913797fc1cebc30ae383f346883033c45eb91e9b0b92e9ebd224bb1545b4ae2391825b649b798cc711a38351a5f41be24d949c64c6703ebc24eba661
   languageName: node
   linkType: hard
 
@@ -25256,12 +26773,12 @@ __metadata:
   version: 14.2.3
   resolution: "react-dropzone@npm:14.2.3"
   dependencies:
-    attr-accept: ^2.2.2
-    file-selector: ^0.6.0
-    prop-types: ^15.8.1
+    attr-accept: "npm:^2.2.2"
+    file-selector: "npm:^0.6.0"
+    prop-types: "npm:^15.8.1"
   peerDependencies:
     react: ">= 16.8 || 18.0.0"
-  checksum: 174b744d5ca898cf3d84ec1aeb6cef5211c446697e45dc8ece8287a03d291f8d07253206d5a1247ef156fd385d65e7de666d4d5c2986020b8543b8f2434e8b40
+  checksum: 10/34cf1758a896795b579adab5f9cdc144330577ab1826a0b66ff9daa8c60a80ed6b31b8f989647664f2548cfe00b336e9c31a2f3dd8de43111c8318fcc89b279c
   languageName: node
   linkType: hard
 
@@ -25269,8 +26786,8 @@ __metadata:
   version: 0.0.21
   resolution: "react-easy-swipe@npm:0.0.21"
   dependencies:
-    prop-types: ^15.5.8
-  checksum: 225f12a9dd410db1c790220867ab1eb58e2ef0a2bdae8541330805fc5b9905e242ab307b019f9aaed76473849a753f363baff03fa8a77e7a1860d7b41dc83ec0
+    prop-types: "npm:^15.5.8"
+  checksum: 10/69bb2d366d412441b024c802f03b524f63d494d7b72632380ecce485aa1c08eb87cc9a5ffffa23c7e8dcd190834d15b76458f59ca91c8710d12aa27c084a111d
   languageName: node
   linkType: hard
 
@@ -25278,28 +26795,13 @@ __metadata:
   version: 15.0.0
   resolution: "react-element-to-jsx-string@npm:15.0.0"
   dependencies:
-    "@base2/pretty-print-object": 1.0.1
-    is-plain-object: 5.0.0
-    react-is: 18.1.0
+    "@base2/pretty-print-object": "npm:1.0.1"
+    is-plain-object: "npm:5.0.0"
+    react-is: "npm:18.1.0"
   peerDependencies:
     react: ^0.14.8 || ^15.0.1 || ^16.0.0 || ^17.0.1 || ^18.0.0
     react-dom: ^0.14.8 || ^15.0.1 || ^16.0.0 || ^17.0.1 || ^18.0.0
-  checksum: c3907cc4c1d3e9ecc8ca7727058ebcba6ec89848d9e07bfd2c77ee8f28f1ad99bf55e38359dec8a1125de83d41ac09a2874f53c41415edc86ffa9840fa1b7856
-  languageName: node
-  linkType: hard
-
-"react-enable@npm:^3.1.0":
-  version: 3.1.1
-  resolution: "react-enable@npm:3.1.1"
-  dependencies:
-    "@headlessui/react": ^1.5.0
-    "@xstate/react": ^3.2.1
-    tslib: ^1.14.1
-    xstate: ^4.37.0
-  peerDependencies:
-    react: ^17 || ^18
-    react-dom: ^17 || ^18
-  checksum: 707bc14818e518675ed8661757676a15fb20e6abd6b0eb4e98c18bfd73b1380557f6b90c48808f3a90aa291f2987d66fa5018d6166784e4ac6e262c7fa7e0ef3
+  checksum: 10/9a874b2f16b4624a72c4b766b096d693a382b9dc7f2264f802395852ae3435ccde8e9e47bbe45cf5f30eba70f8126af6aca832190e285b0096af3ecade994df1
   languageName: node
   linkType: hard
 
@@ -25307,17 +26809,17 @@ __metadata:
   version: 3.1.4
   resolution: "react-error-boundary@npm:3.1.4"
   dependencies:
-    "@babel/runtime": ^7.12.5
+    "@babel/runtime": "npm:^7.12.5"
   peerDependencies:
     react: ">=16.13.1"
-  checksum: f36270a5d775a25c8920f854c0d91649ceea417b15b5bc51e270a959b0476647bb79abb4da3be7dd9a4597b029214e8fe43ea914a7f16fa7543c91f784977f1b
+  checksum: 10/7418637bf352b88f35ff3798e6faa094ee046df9d422fc08f54c017892c3c0738dac661ba3d64d97209464e7a60e7fbbeffdbeaee5edc38f3aaf5f1f4a8bf610
   languageName: node
   linkType: hard
 
 "react-fast-compare@npm:^3.0.1":
   version: 3.2.0
   resolution: "react-fast-compare@npm:3.2.0"
-  checksum: 8ef272c825ae329f61633ce4ce7f15aa5b84e5214d88bc0823880236e03e985a13195befa2c7a4eda7db3b017dc7985729152d88445823f652403cf36c2b86aa
+  checksum: 10/26ed35d425f197f04c85d572eac943d901a2713335b79483d4f3f94ee5caf97f20678f89bedd385ace9b1637890c88fc5442d732bad0871135643d9703312cd7
   languageName: node
   linkType: hard
 
@@ -25326,7 +26828,7 @@ __metadata:
   resolution: "react-from-dom@npm:0.6.2"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 5d66b0c1eb591247a73bed9487a04e390abb4ad6c65e6cea7bfdd35070685b90a5da720de30915b963aba3f4628135d6db4c93da40cd5114c8bbe34a9725a83e
+  checksum: 10/f3954737c2677e82f72ecedcdcf5f187d2a1b86a6c5b915f7300796ac153437581ee0111c9f524e7c18124d25d0d31391d54cdee318ea390722ca57e66813ed7
   languageName: node
   linkType: hard
 
@@ -25334,32 +26836,32 @@ __metadata:
   version: 1.3.4
   resolution: "react-grid-layout@npm:1.3.4"
   dependencies:
-    clsx: ^1.1.1
-    lodash.isequal: ^4.0.0
-    prop-types: ^15.8.1
-    react-draggable: ^4.0.0
-    react-resizable: ^3.0.4
+    clsx: "npm:^1.1.1"
+    lodash.isequal: "npm:^4.0.0"
+    prop-types: "npm:^15.8.1"
+    react-draggable: "npm:^4.0.0"
+    react-resizable: "npm:^3.0.4"
   peerDependencies:
     react: ">= 16.3.0"
     react-dom: ">= 16.3.0"
-  checksum: f56c8c452acd9588edf1dc6996a4ea14d9f669d77f6b2ebd50146eaeeb9325c83f5ca44b66bac2b8c24f9cb2ec7ed49396350435991255c3b31e21b8a2e3d243
+  checksum: 10/944ab133e59bfaa5633625f57be9f69133b5cec2de0232d9581e2c988e257ebafe010ee9bbbff6c2754f9d7d8bb0053072bac103f20fc232be2a58e15d14fc64
   languageName: node
   linkType: hard
 
-"react-grid-layout@npm:1.4.2":
-  version: 1.4.2
-  resolution: "react-grid-layout@npm:1.4.2"
+"react-grid-layout@npm:1.4.4":
+  version: 1.4.4
+  resolution: "react-grid-layout@npm:1.4.4"
   dependencies:
-    clsx: ^2.0.0
-    fast-equals: ^4.0.3
-    prop-types: ^15.8.1
-    react-draggable: ^4.4.5
-    react-resizable: ^3.0.5
-    resize-observer-polyfill: ^1.5.1
+    clsx: "npm:^2.0.0"
+    fast-equals: "npm:^4.0.3"
+    prop-types: "npm:^15.8.1"
+    react-draggable: "npm:^4.4.5"
+    react-resizable: "npm:^3.0.5"
+    resize-observer-polyfill: "npm:^1.5.1"
   peerDependencies:
     react: ">= 16.3.0"
     react-dom: ">= 16.3.0"
-  checksum: a052d38c290b18e1c513a3b939757c239887009b7f175814b472d007708962870960d3b20d4a15dbdeb955ac55434ce6c5e5e5f8c850cfbdcc90f75c318f1d58
+  checksum: 10/43c9bc7e8ce5a902720ebe559b1551724615c617391b040a0a275597748e1927b293c5ddcb73053b1925909e1c293948b4969a35799d541bf9d8886e07ac0085
   languageName: node
   linkType: hard
 
@@ -25367,21 +26869,30 @@ __metadata:
   version: 0.20.0
   resolution: "react-highlight-words@npm:0.20.0"
   dependencies:
-    highlight-words-core: ^1.2.0
-    memoize-one: ^4.0.0
-    prop-types: ^15.5.8
+    highlight-words-core: "npm:^1.2.0"
+    memoize-one: "npm:^4.0.0"
+    prop-types: "npm:^15.5.8"
   peerDependencies:
     react: ^0.14.0 || ^15.0.0 || ^16.0.0-0 || ^17.0.0-0 || ^18.0.0-0
-  checksum: 6794b6fe409ee81390e342ccdb951696e06354d8591b4cac050a6d64dbc77dfc7bb636fee0aabcfda841e57778aa5108fe351e7c1dc27b28abedd36aec8141e7
+  checksum: 10/5adf2cfb1f325ae51ea4dd2cb7522eb433b25534355868d1a3f4556b2b9f7a774c2a1aaa143abebb63a1b3a5590e70ba3d765942a47ff754a1a513cdc5b2f58b
   languageName: node
   linkType: hard
 
-"react-hook-form@npm:7.5.3":
-  version: 7.5.3
-  resolution: "react-hook-form@npm:7.5.3"
+"react-hook-form@npm:^7.49.2":
+  version: 7.51.2
+  resolution: "react-hook-form@npm:7.51.2"
   peerDependencies:
-    react: ^16.8.0 || ^17
-  checksum: fbfaa3b664437247e59bc97057815bbc7d9e6a3b95649f14b6976f46a4ef9508450c99a638d48402014d3db7a0ae9c36e04edac0f2e0811ce6d2fe07dadbb5ff
+    react: ^16.8.0 || ^17 || ^18
+  checksum: 10/30a6d7dec2d8bcdfd9ad92508d0a19e0fb6b344034a5dfb74ff419b54ef29f70e381bbf11bf57ddb808d37748f86581f1679fecac33860944b1baf3217a10f7a
+  languageName: node
+  linkType: hard
+
+"react-html-attributes@npm:^1.4.6":
+  version: 1.4.6
+  resolution: "react-html-attributes@npm:1.4.6"
+  dependencies:
+    html-element-attributes: "npm:^1.0.0"
+  checksum: 10/339fb802fb0f3d7855d31684c1840f2fc86b8ef8deab05b838ee60506979c44be7988563648304cedfcab91ef3619af68041a68818782714f00a3068fbfa48a2
   languageName: node
   linkType: hard
 
@@ -25389,8 +26900,8 @@ __metadata:
   version: 12.0.0
   resolution: "react-i18next@npm:12.0.0"
   dependencies:
-    "@babel/runtime": ^7.14.5
-    html-parse-stringify: ^3.0.1
+    "@babel/runtime": "npm:^7.14.5"
+    html-parse-stringify: "npm:^3.0.1"
   peerDependencies:
     i18next: ">= 19.0.0"
     react: ">= 16.8.0"
@@ -25399,7 +26910,7 @@ __metadata:
       optional: true
     react-native:
       optional: true
-  checksum: f523d7ec5dcb7f5fd36efc9385639d01160071f4dadbbc5a3f1daa64b0f332f709347bdd3bc68f5aefbd72c8742233aa715b308b1ca87179ad501acc19c72068
+  checksum: 10/91da29572d0059783277b468999092d1d2a96efacdc29b0ab143e9b7ac22e293925c972b713ac08b57e65618b75f2848416e64751e210148f94bc87d86589e0f
   languageName: node
   linkType: hard
 
@@ -25407,10 +26918,10 @@ __metadata:
   version: 2.2.0
   resolution: "react-immutable-proptypes@npm:2.2.0"
   dependencies:
-    invariant: ^2.2.2
+    invariant: "npm:^2.2.2"
   peerDependencies:
     immutable: ">=3.6.2"
-  checksum: 7e2a6cae621d213140102923fa305d6621444a37572cbf684a5ff5743746ba4dbacb30d60e6d8278702f3cbbc48805e716f69e2bf8c9953fd570f86254c1a2b1
+  checksum: 10/f7ec15a16f35f97edefe93655fd360ad9da58362c1e83553b19ac0796c3677a22923782894d5408edee9a1c1eaa5408ac69585d08041249d43a1a5fcc3b764d3
   languageName: node
   linkType: hard
 
@@ -25418,11 +26929,11 @@ __metadata:
   version: 3.0.2
   resolution: "react-inlinesvg@npm:3.0.2"
   dependencies:
-    exenv: ^1.2.2
-    react-from-dom: ^0.6.2
+    exenv: "npm:^1.2.2"
+    react-from-dom: "npm:^0.6.2"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 05e31af59d19742b63ef91741e3b8974716eae69935420baf3d03c9cdfd234f9b290bb151248d135d70ef54e13fefd66ce45c2d749ca2e319625c0b1c0a0890a
+  checksum: 10/740fa33c7a09012bb96509f9003dc26e4e412eed2fc861ca40bfee9a3dddcf7c4d86fd20f824d4c017e44526aa9d747d6c9543ef3f2215bc0ace72754e025316
   languageName: node
   linkType: hard
 
@@ -25431,71 +26942,72 @@ __metadata:
   resolution: "react-inspector@npm:6.0.1"
   peerDependencies:
     react: ^16.8.4 || ^17.0.0 || ^18.0.0
-  checksum: 877cbccf36fdc6213abb9611fb9279c4bb76ef7ecb4ec554b3935419a99d55e6d30a80799a054d468d43cc59a9777f21d22d6219a4597bfbd27f3f08a4cdfdc6
+  checksum: 10/1b5b2d49b50498ee978b2b8bae2a8a4847f1e4aff5184fce3dfeaacf107a008a246c35d7ea9017e5b97462e78bb2d99ff2e8e2c0926df319beca495f8e1d6c7e
   languageName: node
   linkType: hard
 
 "react-is@npm:18.1.0":
   version: 18.1.0
   resolution: "react-is@npm:18.1.0"
-  checksum: d206a0fe6790851bff168727bfb896de02c5591695afb0c441163e8630136a3e13ee1a7ddd59fdccddcc93968b4721ae112c10f790b194b03b35a3dc13a355ef
+  checksum: 10/fe09c86d5e12a8531bf3e748660f3dffbe900a6da0b488c7efaf0a866e16b74ecc1b0011b0960b13594f8719f39f87a987c0c85edff0b2d3e2f14b87e7230ad2
   languageName: node
   linkType: hard
 
 "react-is@npm:^16.12.0 || ^17.0.0 || ^18.0.0, react-is@npm:^18.0.0, react-is@npm:^18.2.0":
   version: 18.2.0
   resolution: "react-is@npm:18.2.0"
-  checksum: e72d0ba81b5922759e4aff17e0252bd29988f9642ed817f56b25a3e217e13eea8a7f2322af99a06edb779da12d5d636e9fda473d620df9a3da0df2a74141d53e
+  checksum: 10/200cd65bf2e0be7ba6055f647091b725a45dd2a6abef03bf2380ce701fd5edccee40b49b9d15edab7ac08a762bf83cb4081e31ec2673a5bfb549a36ba21570df
   languageName: node
   linkType: hard
 
 "react-is@npm:^16.12.0, react-is@npm:^16.13.1, react-is@npm:^16.6.0, react-is@npm:^16.7.0":
   version: 16.13.1
   resolution: "react-is@npm:16.13.1"
-  checksum: f7a19ac3496de32ca9ae12aa030f00f14a3d45374f1ceca0af707c831b2a6098ef0d6bdae51bd437b0a306d7f01d4677fcc8de7c0d331eb47ad0f46130e53c5f
+  checksum: 10/5aa564a1cde7d391ac980bedee21202fc90bdea3b399952117f54fb71a932af1e5902020144fb354b4690b2414a0c7aafe798eb617b76a3d441d956db7726fdf
   languageName: node
   linkType: hard
 
 "react-is@npm:^17.0.1, react-is@npm:^17.0.2":
   version: 17.0.2
   resolution: "react-is@npm:17.0.2"
-  checksum: 9d6d111d8990dc98bc5402c1266a808b0459b5d54830bbea24c12d908b536df7883f268a7868cfaedde3dd9d4e0d574db456f84d2e6df9c4526f99bb4b5344d8
+  checksum: 10/73b36281e58eeb27c9cc6031301b6ae19ecdc9f18ae2d518bdb39b0ac564e65c5779405d623f1df9abf378a13858b79442480244bd579968afc1faf9a2ce5e05
   languageName: node
   linkType: hard
 
 "react-lifecycles-compat@npm:^3.0.4":
   version: 3.0.4
   resolution: "react-lifecycles-compat@npm:3.0.4"
-  checksum: a904b0fc0a8eeb15a148c9feb7bc17cec7ef96e71188280061fc340043fd6d8ee3ff233381f0e8f95c1cf926210b2c4a31f38182c8f35ac55057e453d6df204f
+  checksum: 10/c66b9c98c15cd6b0d0a4402df5f665e8cc7562fb7033c34508865bea51fd7b623f7139b5b7e708515d3cd665f264a6a9403e1fa7e6d61a05759066f5e9f07783
   languageName: node
   linkType: hard
 
-"react-loading-skeleton@npm:3.3.1":
-  version: 3.3.1
-  resolution: "react-loading-skeleton@npm:3.3.1"
+"react-loading-skeleton@npm:3.4.0":
+  version: 3.4.0
+  resolution: "react-loading-skeleton@npm:3.4.0"
   peerDependencies:
     react: ">=16.8.0"
-  checksum: 0de3437a5da8b7133bf86043e4e002e5422b50cd71b9a650f2947a89ace39be8b7c61a098f1d7dd0be559dc3ac293d60697fdae23cb09c3905b2952e1a68693d
+  checksum: 10/f504c55f2b448e05abfe480950d89a4a7301773590e3c9fc42025370bcfd1c177466bb0a9cee6291d975772218c63c83656ac8b158a75de7a2e9ad75d440925b
   languageName: node
   linkType: hard
 
-"react-moveable@npm:0.46.1, react-moveable@npm:~0.46.1":
-  version: 0.46.1
-  resolution: "react-moveable@npm:0.46.1"
+"react-moveable@npm:0.56.0, react-moveable@npm:~0.56.0":
+  version: 0.56.0
+  resolution: "react-moveable@npm:0.56.0"
   dependencies:
-    "@daybrush/utils": ^1.10.0
-    "@egjs/agent": ^2.2.1
-    "@egjs/children-differ": ^1.0.1
-    "@egjs/list-differ": ^1.0.0
-    "@scena/dragscroll": ^1.4.0
-    "@scena/event-emitter": ^1.0.5
-    "@scena/matrix": ^1.1.1
-    css-to-mat: ^1.0.3
-    framework-utils: ^1.1.0
-    gesto: ^1.15.1
-    overlap-area: ^1.1.0
-    react-css-styled: ^1.0.4
-  checksum: 521623cd3e91363c6a239f3a6d022039af20565472b6832902ff73e66494369808d0252d5112e034917f70146ae2954ff996c25293c6a3961c6b5c85668ebd07
+    "@daybrush/utils": "npm:^1.13.0"
+    "@egjs/agent": "npm:^2.2.1"
+    "@egjs/children-differ": "npm:^1.0.1"
+    "@egjs/list-differ": "npm:^1.0.0"
+    "@scena/dragscroll": "npm:^1.4.0"
+    "@scena/event-emitter": "npm:^1.0.5"
+    "@scena/matrix": "npm:^1.1.1"
+    css-to-mat: "npm:^1.1.1"
+    framework-utils: "npm:^1.1.0"
+    gesto: "npm:^1.19.3"
+    overlap-area: "npm:^1.1.0"
+    react-css-styled: "npm:^1.1.9"
+    react-selecto: "npm:^1.25.0"
+  checksum: 10/0b1d2b8da8b22d00b434687fd8a2bf1a02007fdfb6d78fcf619cee962573e1d3b785ad01b698c5d11ecb45a2b4679b96c27a4b0a29035875431807744ee05cea
   languageName: node
   linkType: hard
 
@@ -25503,60 +27015,71 @@ __metadata:
   version: 5.1.4
   resolution: "react-number-format@npm:5.1.4"
   dependencies:
-    prop-types: ^15.7.2
+    prop-types: "npm:^15.7.2"
   peerDependencies:
     react: ^0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
     react-dom: ^0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
-  checksum: 770a1e86cd05d9df28aa5e6a12c5731351dd4a301464edd0ac5dcbc68d2f07eae37781ff14f6153566cbb7cccb28f13f0826d1844600d25ae6e12da060814282
+  checksum: 10/7348333071aae3ffc6bd5d1ce1b193e6ab17aec024e751495b4ff1b386875cf7527d97e86bc3b21d29f6002449f05e97f5d1b958afae2d9a1191486c0961ee57
   languageName: node
   linkType: hard
 
-"react-popper-tooltip@npm:4.4.2":
+"react-popper-tooltip@npm:^4.4.2":
   version: 4.4.2
   resolution: "react-popper-tooltip@npm:4.4.2"
   dependencies:
-    "@babel/runtime": ^7.18.3
-    "@popperjs/core": ^2.11.5
-    react-popper: ^2.3.0
+    "@babel/runtime": "npm:^7.18.3"
+    "@popperjs/core": "npm:^2.11.5"
+    react-popper: "npm:^2.3.0"
   peerDependencies:
     react: ">=16.6.0"
     react-dom: ">=16.6.0"
-  checksum: 516988b9258f05fe8f48d702654d70c3701d9a730c10a07c2b5229193322b985478fad7033092c8f0449d83e77aa536d2993747609206208ed6f6b014b98acb0
+  checksum: 10/87192cd6a42f2d04826da82b4a55130a0bc50ef5fbf83328e0560b47a27e363dbe5538a66b835fb0309e2f2c011e20b09029c36c8a241fb790605638f212e6aa
   languageName: node
   linkType: hard
 
-"react-popper@npm:2.3.0, react-popper@npm:^2.3.0":
+"react-popper@npm:^2.3.0":
   version: 2.3.0
   resolution: "react-popper@npm:2.3.0"
   dependencies:
-    react-fast-compare: ^3.0.1
-    warning: ^4.0.2
+    react-fast-compare: "npm:^3.0.1"
+    warning: "npm:^4.0.2"
   peerDependencies:
     "@popperjs/core": ^2.0.0
     react: ^16.8.0 || ^17 || ^18
     react-dom: ^16.8.0 || ^17 || ^18
-  checksum: 837111c98738011c69b3069a464ea5bdcbf487105b6148e8faf90cb7337e134edb1b98b8824322941c378756cca30a15c18c25f558e53b85ed5762fa0dc8e6b2
+  checksum: 10/2afc495479ae4b9e67f9a1642debd7121947fe71a00c5b326301adb8288a18dca53ebd836fe9c3b7a4e2feb838df0abe8e044eb278e89b1c5d50978b0b93d0ac
   languageName: node
   linkType: hard
 
-"react-redux@npm:7.2.6":
-  version: 7.2.6
-  resolution: "react-redux@npm:7.2.6"
+"react-redux@npm:8.1.3":
+  version: 8.1.3
+  resolution: "react-redux@npm:8.1.3"
   dependencies:
-    "@babel/runtime": ^7.15.4
-    "@types/react-redux": ^7.1.20
-    hoist-non-react-statics: ^3.3.2
-    loose-envify: ^1.4.0
-    prop-types: ^15.7.2
-    react-is: ^17.0.2
+    "@babel/runtime": "npm:^7.12.1"
+    "@types/hoist-non-react-statics": "npm:^3.3.1"
+    "@types/use-sync-external-store": "npm:^0.0.3"
+    hoist-non-react-statics: "npm:^3.3.2"
+    react-is: "npm:^18.0.0"
+    use-sync-external-store: "npm:^1.0.0"
   peerDependencies:
-    react: ^16.8.3 || ^17
+    "@types/react": ^16.8 || ^17.0 || ^18.0
+    "@types/react-dom": ^16.8 || ^17.0 || ^18.0
+    react: ^16.8 || ^17.0 || ^18.0
+    react-dom: ^16.8 || ^17.0 || ^18.0
+    react-native: ">=0.59"
+    redux: ^4 || ^5.0.0-beta.0
   peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    "@types/react-dom":
+      optional: true
     react-dom:
       optional: true
     react-native:
       optional: true
-  checksum: 0bf142ce0d0b80aef955650fd5e9489fca32d94f19ee23893b332f1b01ceee7bd3623337c942cbda642667d1dc9de5ac869c3c1946afa6cf2046407b57d24741
+    redux:
+      optional: true
+  checksum: 10/c4c7586cff3abeb784e73598d330f5301116a4e9942fd36895f2bccd8990001709c6c3ea1817edb75ee477470d6c67c9113e05a7f86b2b68a3950c9c29fe20cb
   languageName: node
   linkType: hard
 
@@ -25564,12 +27087,12 @@ __metadata:
   version: 7.2.8
   resolution: "react-redux@npm:7.2.8"
   dependencies:
-    "@babel/runtime": ^7.15.4
-    "@types/react-redux": ^7.1.20
-    hoist-non-react-statics: ^3.3.2
-    loose-envify: ^1.4.0
-    prop-types: ^15.7.2
-    react-is: ^17.0.2
+    "@babel/runtime": "npm:^7.15.4"
+    "@types/react-redux": "npm:^7.1.20"
+    hoist-non-react-statics: "npm:^3.3.2"
+    loose-envify: "npm:^1.4.0"
+    prop-types: "npm:^15.7.2"
+    react-is: "npm:^17.0.2"
   peerDependencies:
     react: ^16.8.3 || ^17 || ^18
   peerDependenciesMeta:
@@ -25577,21 +27100,21 @@ __metadata:
       optional: true
     react-native:
       optional: true
-  checksum: ecf1933e91013f2d41bfc781515b536bf81eb1f70ff228607841094c8330fe77d522372b359687e51c0b52b9888dba73db9ac0486aace1896ab9eb9daec102d5
+  checksum: 10/65b8529154d6f72c0a2c0348058c2884d9866253430b9667747c2e5f406a97d1f51f5f2d50e619884d54699dc10d311098e2eec2d82c104151ff59b26089c83a
   languageName: node
   linkType: hard
 
 "react-refresh@npm:0.14.0":
   version: 0.14.0
   resolution: "react-refresh@npm:0.14.0"
-  checksum: dc69fa8c993df512f42dd0f1b604978ae89bd747c0ed5ec595c0cc50d535fb2696619ccd98ae28775cc01d0a7c146a532f0f7fb81dc22e1977c242a4912312f4
+  checksum: 10/75941262ce3ed4fc79b52492943fd59692f29b84f30f3822713b7e920f28e85c62a4386f85cbfbaea95ed62d3e74209f0a0bb065904b7ab2f166a74ac3812e2a
   languageName: node
   linkType: hard
 
 "react-refresh@npm:^0.11.0":
   version: 0.11.0
   resolution: "react-refresh@npm:0.11.0"
-  checksum: 112178a05b1e0ffeaf5d9fb4e56b4410a34a73adeb04dbf13abdc50d9ac9df2ada83e81485156cca0b3fa296aa3612751b3d6cd13be4464642a43679b819cbc7
+  checksum: 10/1275699e2edc39dbced9bdb00e2e167e3a2868e0c8ae117ba9551556368cfe70453068e5209240d827122aad5504a64c59a24b9b9a2a0ab932472c8750203ea3
   languageName: node
   linkType: hard
 
@@ -25599,15 +27122,15 @@ __metadata:
   version: 2.3.4
   resolution: "react-remove-scroll-bar@npm:2.3.4"
   dependencies:
-    react-style-singleton: ^2.2.1
-    tslib: ^2.0.0
+    react-style-singleton: "npm:^2.2.1"
+    tslib: "npm:^2.0.0"
   peerDependencies:
     "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: b5ce5f2f98d65c97a3e975823ae4043a4ba2a3b63b5ba284b887e7853f051b5cd6afb74abde6d57b421931c52f2e1fdbb625dc858b1cb5a32c27c14ab85649d4
+  checksum: 10/ac028b3ed12e66972cab8656747736729b219dff5a600178d1650300a2a750ace37f7ec82146147d37b092b19874f45cf7a45edceff68ac1f59607a828ca089f
   languageName: node
   linkType: hard
 
@@ -25615,18 +27138,18 @@ __metadata:
   version: 2.5.5
   resolution: "react-remove-scroll@npm:2.5.5"
   dependencies:
-    react-remove-scroll-bar: ^2.3.3
-    react-style-singleton: ^2.2.1
-    tslib: ^2.1.0
-    use-callback-ref: ^1.3.0
-    use-sidecar: ^1.1.2
+    react-remove-scroll-bar: "npm:^2.3.3"
+    react-style-singleton: "npm:^2.2.1"
+    tslib: "npm:^2.1.0"
+    use-callback-ref: "npm:^1.3.0"
+    use-sidecar: "npm:^1.1.2"
   peerDependencies:
     "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 2c7fe9cbd766f5e54beb4bec2e2efb2de3583037b23fef8fa511ab426ed7f1ae992382db5acd8ab5bfb030a4b93a06a2ebca41377d6eeaf0e6791bb0a59616a4
+  checksum: 10/f0646ac384ce3852d1f41e30a9f9e251b11cf3b430d1d114c937c8fa7f90a895c06378d0d6b6ff0b2d00cbccf15e845921944fd6074ae67a0fb347a718106d88
   languageName: node
   linkType: hard
 
@@ -25634,11 +27157,11 @@ __metadata:
   version: 3.0.5
   resolution: "react-resizable@npm:3.0.5"
   dependencies:
-    prop-types: 15.x
-    react-draggable: ^4.0.3
+    prop-types: "npm:15.x"
+    react-draggable: "npm:^4.0.3"
   peerDependencies:
     react: ">= 16.3"
-  checksum: 616a10205acfaf8cc3aa0824b60f6d037eef87143d8f338cf826deb74a353db9b9baad67a65dc8535fe90840bfc3e1b8a901f9c247033ffeec2f30405ac7528e
+  checksum: 10/745fad6ac827857b3a80d1d648b8d6723aa72fc17d5410a01707073f3d37b4adf6e0354dfe3cc33dee34d6e546a3fbd5603ef73e385dfc5218a425a39bf96275
   languageName: node
   linkType: hard
 
@@ -25646,11 +27169,11 @@ __metadata:
   version: 7.1.2
   resolution: "react-resize-detector@npm:7.1.2"
   dependencies:
-    lodash: ^4.17.21
+    lodash: "npm:^4.17.21"
   peerDependencies:
     react: ^16.0.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.0.0 || ^17.0.0 || ^18.0.0
-  checksum: 55f4abad7f7523d16b081b5ab20f75c539a54a08253ce7e9df473d48386f42ceca6c31584ba9fa26e3528b498ef6685ec77fb9a22cffc97df05fb326d0bf1b26
+  checksum: 10/a8a564577f41622a3c98a2abef84b703de1ae20197819598aa738062162e2660a370fb7b0bc1598d5bcb0f8cb8b69337ea199e7c56fc507d32f6d0cd48a386df
   languageName: node
   linkType: hard
 
@@ -25658,24 +27181,24 @@ __metadata:
   version: 3.2.23
   resolution: "react-responsive-carousel@npm:3.2.23"
   dependencies:
-    classnames: ^2.2.5
-    prop-types: ^15.5.8
-    react-easy-swipe: ^0.0.21
-  checksum: 8a5b915f140a05425554a0c108c60a0b103dae49808486d39147df09c832ad712c7d7f4a66f0d0c39529ca095b4a327f0cc440d91b5f7a39ab13076931f74bd0
+    classnames: "npm:^2.2.5"
+    prop-types: "npm:^15.5.8"
+    react-easy-swipe: "npm:^0.0.21"
+  checksum: 10/1c4883e3085af3a6c242f3f4375f9532bd7ba2b0dde17b2abc6954e80cbcbf074721f61c28781403139eb0453a2a0d0213bdd3d9cb999206309ef05e141ce961
   languageName: node
   linkType: hard
 
 "react-router-dom-v5-compat@npm:^6.10.0":
-  version: 6.10.0
-  resolution: "react-router-dom-v5-compat@npm:6.10.0"
+  version: 6.21.3
+  resolution: "react-router-dom-v5-compat@npm:6.21.3"
   dependencies:
-    history: ^5.3.0
-    react-router: 6.10.0
+    history: "npm:^5.3.0"
+    react-router: "npm:6.21.3"
   peerDependencies:
     react: ">=16.8"
     react-dom: ">=16.8"
     react-router-dom: 4 || 5
-  checksum: 550c91cd5e70b8b115e965c7816694d6df19e9ac7d6c12ab4d3c805f9110d1143c8a335ba89f492d5e7e8b726309f5f907b9501b4df0f17ada3bda40a42a0800
+  checksum: 10/ed40e3e241a8c2a85aa0a95b52b77b9b9667e3f1a48a8a60e0b33e3c615c3b490b6c3a645ea92efc5783251111d039a5c809b779e1a93b9da23de6e97e4e1bd0
   languageName: node
   linkType: hard
 
@@ -25683,16 +27206,16 @@ __metadata:
   version: 5.3.3
   resolution: "react-router-dom@npm:5.3.3"
   dependencies:
-    "@babel/runtime": ^7.12.13
-    history: ^4.9.0
-    loose-envify: ^1.3.1
-    prop-types: ^15.6.2
-    react-router: 5.3.3
-    tiny-invariant: ^1.0.2
-    tiny-warning: ^1.0.0
+    "@babel/runtime": "npm:^7.12.13"
+    history: "npm:^4.9.0"
+    loose-envify: "npm:^1.3.1"
+    prop-types: "npm:^15.6.2"
+    react-router: "npm:5.3.3"
+    tiny-invariant: "npm:^1.0.2"
+    tiny-warning: "npm:^1.0.0"
   peerDependencies:
     react: ">=15"
-  checksum: e1998918e391611f09b967bce0cb88bc9794aa3d8dc5f86453467a1226ae2ace648a1f401f5282f19c84a3a61fa6a3207e2a6fdfe8c8efae0b255244631febeb
+  checksum: 10/49552596f1a4c753b99324a5f4345b3ee91fbb780aa65851a7113f053044ef96c083d2ded12937e593b23a0fcdf58b9e49780df6bf6e27d9eeb348b3c85ae611
   languageName: node
   linkType: hard
 
@@ -25700,30 +27223,30 @@ __metadata:
   version: 5.3.3
   resolution: "react-router@npm:5.3.3"
   dependencies:
-    "@babel/runtime": ^7.12.13
-    history: ^4.9.0
-    hoist-non-react-statics: ^3.1.0
-    loose-envify: ^1.3.1
-    mini-create-react-context: ^0.4.0
-    path-to-regexp: ^1.7.0
-    prop-types: ^15.6.2
-    react-is: ^16.6.0
-    tiny-invariant: ^1.0.2
-    tiny-warning: ^1.0.0
+    "@babel/runtime": "npm:^7.12.13"
+    history: "npm:^4.9.0"
+    hoist-non-react-statics: "npm:^3.1.0"
+    loose-envify: "npm:^1.3.1"
+    mini-create-react-context: "npm:^0.4.0"
+    path-to-regexp: "npm:^1.7.0"
+    prop-types: "npm:^15.6.2"
+    react-is: "npm:^16.6.0"
+    tiny-invariant: "npm:^1.0.2"
+    tiny-warning: "npm:^1.0.0"
   peerDependencies:
     react: ">=15"
-  checksum: 52a9f28fa97577fda18a8ed2922b658704eafe873e444fe07202640d55d9e81e67c03efd2b2a5b80e3a80e8be8352df826a227ce5f42b33b91bef853c74d4841
+  checksum: 10/4631eed91020c73950804c7c7454e74b2eb495f803c5ca60c8b5572ca72cc06e336f3b08d9ee3fa730128a52c4d9e16d1aa7e8b7f85560629117e16d99a01cef
   languageName: node
   linkType: hard
 
-"react-router@npm:6.10.0":
-  version: 6.10.0
-  resolution: "react-router@npm:6.10.0"
+"react-router@npm:6.21.3":
+  version: 6.21.3
+  resolution: "react-router@npm:6.21.3"
   dependencies:
-    "@remix-run/router": 1.5.0
+    "@remix-run/router": "npm:1.14.2"
   peerDependencies:
     react: ">=16.8"
-  checksum: c9fce46147c04257d7d6fa1f5bbfac96c5fdd0b15f26918bd12b2e5fe9143977c5a4452272f9b85795a22e29ec105a60d0bbe036118efc52b383d163cd8829ab
+  checksum: 10/3d5107cfdb440519d84e6ad6d95454e3bf41ec97677b95f7b2a7f281f8ddf191b765cf1b599ead951f3cd33ed4429f140590d74a01cfdf835dc2f812023a978a
   languageName: node
   linkType: hard
 
@@ -25731,28 +27254,37 @@ __metadata:
   version: 5.5.1
   resolution: "react-select-event@npm:5.5.1"
   dependencies:
-    "@testing-library/dom": ">=7"
-  checksum: af0e43927eab54545b699c817480cb38cebb0432ea743c869d06e426bc5ccc8788d4e2da4741b63022c20282b87a1620cd1dcc79051c442ff291e41b604e02ca
+    "@testing-library/dom": "npm:>=7"
+  checksum: 10/b0917707ff9aa6eb887178107879403e483aeaacb14f2d74fef25a805538299be88adfc87709decc1b9f9280679a5ddf0d2c6f92178b7bbd416ea7c7a9149757
   languageName: node
   linkType: hard
 
-"react-select@npm:5.7.4":
-  version: 5.7.4
-  resolution: "react-select@npm:5.7.4"
-  dependencies:
-    "@babel/runtime": ^7.12.0
-    "@emotion/cache": ^11.4.0
-    "@emotion/react": ^11.8.1
-    "@floating-ui/dom": ^1.0.1
-    "@types/react-transition-group": ^4.4.0
-    memoize-one: ^6.0.0
-    prop-types: ^15.6.0
-    react-transition-group: ^4.3.0
-    use-isomorphic-layout-effect: ^1.1.2
+"react-select@npm:5.8.0":
+  version: 5.8.0
+  resolution: "react-select@npm:5.8.0"
+  dependencies:
+    "@babel/runtime": "npm:^7.12.0"
+    "@emotion/cache": "npm:^11.4.0"
+    "@emotion/react": "npm:^11.8.1"
+    "@floating-ui/dom": "npm:^1.0.1"
+    "@types/react-transition-group": "npm:^4.4.0"
+    memoize-one: "npm:^6.0.0"
+    prop-types: "npm:^15.6.0"
+    react-transition-group: "npm:^4.3.0"
+    use-isomorphic-layout-effect: "npm:^1.1.2"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: ca72941ad1d2c578ec04c09ed3deb7e373f987e589f403fadedc6fcc3e29935b5425ec4d2628f0fe58c21319bcaf153c0d0172432e09fc6423da869d848de757
+  checksum: 10/04d3639ea1872a9e4d9080ece1947432fc595403c0a740f671a1b7f7dd2639288cb133ec7a2b1ac20fad69fd303d696c2f924763405e0e1d93b847e54df9e966
+  languageName: node
+  linkType: hard
+
+"react-selecto@npm:^1.25.0":
+  version: 1.26.3
+  resolution: "react-selecto@npm:1.26.3"
+  dependencies:
+    selecto: "npm:~1.26.3"
+  checksum: 10/7e1e7ee7242c70027f3616e49e426fdf8aff3cdf01574203506001c5d6436c457e9ee04f7bec312294380f42b39682ed48eb7eb7e906f665f3361a5a38527976
   languageName: node
   linkType: hard
 
@@ -25760,21 +27292,21 @@ __metadata:
   version: 16.15.0
   resolution: "react-shallow-renderer@npm:16.15.0"
   dependencies:
-    object-assign: ^4.1.1
-    react-is: ^16.12.0 || ^17.0.0 || ^18.0.0
+    object-assign: "npm:^4.1.1"
+    react-is: "npm:^16.12.0 || ^17.0.0 || ^18.0.0"
   peerDependencies:
     react: ^16.0.0 || ^17.0.0 || ^18.0.0
-  checksum: 6052c7e3e9627485120ebd8257f128aad8f56386fe8d42374b7743eac1be457c33506d153c7886b4e32923c0c352d402ab805ef9ca02dbcd8393b2bdeb6e5af8
+  checksum: 10/06457fe5bcaa44aeca998905b6849304742ea1cc2d3841e4a0964c745ff392bc4dec07f8c779f317faacce3a0bf6f84e15020ac0fa81adb931067dbb0baf707b
   languageName: node
   linkType: hard
 
-"react-simple-compat@npm:1.2.3, react-simple-compat@npm:^1.2.3":
+"react-simple-compat@npm:1.2.3":
   version: 1.2.3
   resolution: "react-simple-compat@npm:1.2.3"
   dependencies:
-    "@daybrush/utils": ^1.0.0
-    "@egjs/list-differ": ^1.0.0
-  checksum: 8db9eb7e0a983dfded6b47850b3d06e1f87a4b9982433935996ef0f55c79fa39843e2384e078b75635a8bb07341a1a622accb703851a7eaf931a4d9973686289
+    "@daybrush/utils": "npm:^1.0.0"
+    "@egjs/list-differ": "npm:^1.0.0"
+  checksum: 10/779aaffe2fa90dec58b93b2787726ef9f8604cb0085121293ef6143a33790af3c6941b0f73344764ceb9b3415a27e29f18998732829df953e3692c385ffc388e
   languageName: node
   linkType: hard
 
@@ -25782,13 +27314,13 @@ __metadata:
   version: 0.1.92
   resolution: "react-split-pane@npm:0.1.92"
   dependencies:
-    prop-types: ^15.7.2
-    react-lifecycles-compat: ^3.0.4
-    react-style-proptype: ^3.2.2
+    prop-types: "npm:^15.7.2"
+    react-lifecycles-compat: "npm:^3.0.4"
+    react-style-proptype: "npm:^3.2.2"
   peerDependencies:
     react: ^16.0.0-0
     react-dom: ^16.0.0-0
-  checksum: 4890f172636baeb4bb197195e8d896297ef8eec3c9887331e4a3854da6cf66b2f7758132c3e05f4b38eed595710f678ae1399cb0ca82e9811db06ad95410eee6
+  checksum: 10/d19e841dd494f44b814a1b47832dc7acac0a6d99eb127779209ff2c153a5db4e3fad8cb306284c7db96831b5e482cf11d791fac7e68bf0fd1e35bd567eadcd6a
   languageName: node
   linkType: hard
 
@@ -25796,13 +27328,13 @@ __metadata:
   version: 0.1.92
   resolution: "react-split-pane@patch:react-split-pane@npm%3A0.1.92#.yarn/patches/react-split-pane-npm-0.1.92-93dbf51dff.patch::version=0.1.92&hash=23e19a&locator=grafana%40workspace%3A."
   dependencies:
-    prop-types: ^15.7.2
-    react-lifecycles-compat: ^3.0.4
-    react-style-proptype: ^3.2.2
+    prop-types: "npm:^15.7.2"
+    react-lifecycles-compat: "npm:^3.0.4"
+    react-style-proptype: "npm:^3.2.2"
   peerDependencies:
     react: ^16.0.0-0
     react-dom: ^16.0.0-0
-  checksum: 4cdcc9e5a03ee1534100ddd6d5a5cce9e083ffe1a0acf7adf085d71d003d0ac475192964e0d63b2887392871dd687ec5340e2122eb588b5685de0a219cb00b11
+  checksum: 10/3559a23048a87a696617b2edb4f9c9dc8c72554d4a5bff8279bb2fd439cea32a8728e5565008b5c9ac817c31dee3c1b7f734331fe5c4c41367800b2a48165db7
   languageName: node
   linkType: hard
 
@@ -25810,8 +27342,8 @@ __metadata:
   version: 3.2.2
   resolution: "react-style-proptype@npm:3.2.2"
   dependencies:
-    prop-types: ^15.5.4
-  checksum: f0e646e1488a18849a2a0fcff459a3769869d62be5729ff578dc6d37d0c0617706075efe09a15ff9372ba35419e31af5b0df154bc9487d1381cdc80d3dab6d7c
+    prop-types: "npm:^15.5.4"
+  checksum: 10/c068f10a639f743b311b3a6dd8bdd1b87436ab8d30a10ff4f30840a89decdd2e2eea33a2cefb504274ff58b624680d27f29daefece0f7435cfc8efae070d4e8d
   languageName: node
   linkType: hard
 
@@ -25819,16 +27351,16 @@ __metadata:
   version: 2.2.1
   resolution: "react-style-singleton@npm:2.2.1"
   dependencies:
-    get-nonce: ^1.0.0
-    invariant: ^2.2.4
-    tslib: ^2.0.0
+    get-nonce: "npm:^1.0.0"
+    invariant: "npm:^2.2.4"
+    tslib: "npm:^2.0.0"
   peerDependencies:
     "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 7ee8ef3aab74c7ae1d70ff34a27643d11ba1a8d62d072c767827d9ff9a520905223e567002e0bf6c772929d8ea1c781a3ba0cc4a563e92b1e3dc2eaa817ecbe8
+  checksum: 10/80c58fd6aac3594e351e2e7b048d8a5b09508adb21031a38b3c40911fe58295572eddc640d4b20a7be364842c8ed1120fe30097e22ea055316b375b88d4ff02a
   languageName: node
   linkType: hard
 
@@ -25836,14 +27368,14 @@ __metadata:
   version: 15.5.0
   resolution: "react-syntax-highlighter@npm:15.5.0"
   dependencies:
-    "@babel/runtime": ^7.3.1
-    highlight.js: ^10.4.1
-    lowlight: ^1.17.0
-    prismjs: ^1.27.0
-    refractor: ^3.6.0
+    "@babel/runtime": "npm:^7.3.1"
+    highlight.js: "npm:^10.4.1"
+    lowlight: "npm:^1.17.0"
+    prismjs: "npm:^1.27.0"
+    refractor: "npm:^3.6.0"
   peerDependencies:
     react: ">= 0.14.0"
-  checksum: c082b48f30f8ba8d0c55ed1d761910630860077c7ff5793c4c912adcb5760df06436ed0ad62be0de28113aac9ad2af55eccd995f8eee98df53382e4ced2072fb
+  checksum: 10/14291a92672a79cf167e6cf2dba2547b920c24573729a95ae24035bece43f7e00e3429477be7b87455e8ce018682c8992545c405a915421eb772c5cd07c00576
   languageName: node
   linkType: hard
 
@@ -25852,7 +27384,7 @@ __metadata:
   resolution: "react-table@npm:7.8.0"
   peerDependencies:
     react: ^16.8.3 || ^17.0.0-0 || ^18.0.0
-  checksum: 44ca0fb848c6869cd793cede8dc33072b38ebb8f8d2833565afe7cf3eac5d1fa455ac5fb9d06838b16fab0523d5d03e3e82f7645032f71245096e67b892313b9
+  checksum: 10/0c87db8f8823f8eca7a5521d406fa0c75d79972d47768f0c8347af3fa51f9856eea449186a0e2db2effc54d1d74a4e3477855cdbe9adf836d7dfac3a6ec5cdbf
   languageName: node
   linkType: hard
 
@@ -25860,12 +27392,12 @@ __metadata:
   version: 18.2.0
   resolution: "react-test-renderer@npm:18.2.0"
   dependencies:
-    react-is: ^18.2.0
-    react-shallow-renderer: ^16.15.0
-    scheduler: ^0.23.0
+    react-is: "npm:^18.2.0"
+    react-shallow-renderer: "npm:^16.15.0"
+    scheduler: "npm:^0.23.0"
   peerDependencies:
     react: ^18.2.0
-  checksum: 6b6980ced93fa2b72662d5e4ab3b4896833586940047ce52ca9aca801e5432adf05fcbe28289b0af3ce6a2a7c590974e25dcc8aa43d0de658bfe8bbcd686f958
+  checksum: 10/39473e43f64eec92da35db9d4411f3887b368038670787d49dd23172eb3a29953eb13767d1bfa34cbe2665b6e25632cad146e362e8910ce33755d343537763ae
   languageName: node
   linkType: hard
 
@@ -25873,14 +27405,14 @@ __metadata:
   version: 4.4.5
   resolution: "react-transition-group@npm:4.4.5"
   dependencies:
-    "@babel/runtime": ^7.5.5
-    dom-helpers: ^5.0.1
-    loose-envify: ^1.4.0
-    prop-types: ^15.6.2
+    "@babel/runtime": "npm:^7.5.5"
+    dom-helpers: "npm:^5.0.1"
+    loose-envify: "npm:^1.4.0"
+    prop-types: "npm:^15.6.2"
   peerDependencies:
     react: ">=16.6.0"
     react-dom: ">=16.6.0"
-  checksum: 75602840106aa9c6545149d6d7ae1502fb7b7abadcce70a6954c4b64a438ff1cd16fc77a0a1e5197cdd72da398f39eb929ea06f9005c45b132ed34e056ebdeb1
+  checksum: 10/ca32d3fd2168c976c5d90a317f25d5f5cd723608b415fb3b9006f9d793c8965c619562d0884503a3e44e4b06efbca4fdd1520f30e58ca3e00a0890e637d55419
   languageName: node
   linkType: hard
 
@@ -25890,7 +27422,7 @@ __metadata:
   peerDependencies:
     react: "*"
     tslib: "*"
-  checksum: 070a7e9e3cdd8b0ec91a2ac9ac0a8df6bcb3fd183d2775bf0f439b9870fc1faf5b4fa9fe9741abd5187f0a35be645cb4004e1c9ebda9ada7e5d0a624f94910cb
+  checksum: 10/bded7a34f5e44223495a095b6c29fa3ea6c8338a166d0f307d21443c20c9fa54a95bdae11d05ab3e6f61a7fa1eaa027f6fbe7ca064a2fb2af46539653ebcb308
   languageName: node
   linkType: hard
 
@@ -25898,11 +27430,11 @@ __metadata:
   version: 2.0.4
   resolution: "react-use-measure@npm:2.0.4"
   dependencies:
-    debounce: ^1.2.0
+    debounce: "npm:^1.2.0"
   peerDependencies:
     react: ">=16.13"
     react-dom: ">=16.13"
-  checksum: cbaf8896f14bb4b3259a39181b8cd26bf8291cda5f02729f6f977169145acfa1b727d9a99710f20329eb717bad189f599a1616e735053ff07f9ae0a0bd7fd206
+  checksum: 10/0da4fcec48b640e25b9189ebc43612c58652cd2ebea67a755e097ebfff19f6cfd9b0a19b47498e957fa5faf34ab7b77852a063b286f28925afaa24e573a7903d
   languageName: node
   linkType: hard
 
@@ -25910,24 +27442,49 @@ __metadata:
   version: 17.4.0
   resolution: "react-use@npm:17.4.0"
   dependencies:
-    "@types/js-cookie": ^2.2.6
-    "@xobotyi/scrollbar-width": ^1.9.5
-    copy-to-clipboard: ^3.3.1
-    fast-deep-equal: ^3.1.3
-    fast-shallow-equal: ^1.0.0
-    js-cookie: ^2.2.1
-    nano-css: ^5.3.1
-    react-universal-interface: ^0.6.2
-    resize-observer-polyfill: ^1.5.1
-    screenfull: ^5.1.0
-    set-harmonic-interval: ^1.0.1
-    throttle-debounce: ^3.0.1
-    ts-easing: ^0.2.0
-    tslib: ^2.1.0
+    "@types/js-cookie": "npm:^2.2.6"
+    "@xobotyi/scrollbar-width": "npm:^1.9.5"
+    copy-to-clipboard: "npm:^3.3.1"
+    fast-deep-equal: "npm:^3.1.3"
+    fast-shallow-equal: "npm:^1.0.0"
+    js-cookie: "npm:^2.2.1"
+    nano-css: "npm:^5.3.1"
+    react-universal-interface: "npm:^0.6.2"
+    resize-observer-polyfill: "npm:^1.5.1"
+    screenfull: "npm:^5.1.0"
+    set-harmonic-interval: "npm:^1.0.1"
+    throttle-debounce: "npm:^3.0.1"
+    ts-easing: "npm:^0.2.0"
+    tslib: "npm:^2.1.0"
   peerDependencies:
     react: ^16.8.0  || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0  || ^17.0.0 || ^18.0.0
-  checksum: 0889da919b49a186de375ec15d2778b954ae981c523acd17dd496e4a4da7b6190efe7993491e1b85fdd6de3e745d08a4eaba4caa35408d570b5f1de550f35d11
+  checksum: 10/98566c4817b00251107824743ea9dff41f167b548bd5f249f6eb9e2ec09388a2de1e89988e4432cead3f8aa83cf706e0255db8a20c0615768c670751973d2761
+  languageName: node
+  linkType: hard
+
+"react-use@npm:17.5.0, react-use@npm:^17.4.2":
+  version: 17.5.0
+  resolution: "react-use@npm:17.5.0"
+  dependencies:
+    "@types/js-cookie": "npm:^2.2.6"
+    "@xobotyi/scrollbar-width": "npm:^1.9.5"
+    copy-to-clipboard: "npm:^3.3.1"
+    fast-deep-equal: "npm:^3.1.3"
+    fast-shallow-equal: "npm:^1.0.0"
+    js-cookie: "npm:^2.2.1"
+    nano-css: "npm:^5.6.1"
+    react-universal-interface: "npm:^0.6.2"
+    resize-observer-polyfill: "npm:^1.5.1"
+    screenfull: "npm:^5.1.0"
+    set-harmonic-interval: "npm:^1.0.1"
+    throttle-debounce: "npm:^3.0.1"
+    ts-easing: "npm:^0.2.0"
+    tslib: "npm:^2.1.0"
+  peerDependencies:
+    react: "*"
+    react-dom: "*"
+  checksum: 10/5d81fe0902303d3ed7810cdd56c6cae12b08124a3d4fcbfa3924327105b81447b039ea9d6aff20aac3c13999f949000870a7a2fa29fe20ed844ac26606462fa0
   languageName: node
   linkType: hard
 
@@ -25935,10 +27492,20 @@ __metadata:
   version: 2.10.4
   resolution: "react-virtual@npm:2.10.4"
   dependencies:
-    "@reach/observe-rect": ^1.1.0
+    "@reach/observe-rect": "npm:^1.1.0"
   peerDependencies:
     react: ^16.6.3 || ^17.0.0
-  checksum: 1bebc741b01057829a7d7f29256114caecf0597d41b187cb41e75af77f24a87c780bc1a81ec11205b78ee2e9c801fc5e36b20a9e1ab7ddc70a18dd95417795f8
+  checksum: 10/44629ff867110007dd527eee3a60fd35363946a55d5fa3d5f690ae3acf587a4492d9acb96f36105b675db48df64e7caf2d1375ccc53a6ae1c41be42530887c83
+  languageName: node
+  linkType: hard
+
+"react-virtualized-auto-sizer@npm:1.0.24":
+  version: 1.0.24
+  resolution: "react-virtualized-auto-sizer@npm:1.0.24"
+  peerDependencies:
+    react: ^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0
+    react-dom: ^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0
+  checksum: 10/02101a340bdbe3e40c49dbc52e524eb7ca18832690e91f045a25675600d7adc0a63e800a4ace6a014132adcdcce0e12a8137971de408427a5a3112d7c87c9f3e
   languageName: node
   linkType: hard
 
@@ -25948,7 +27515,7 @@ __metadata:
   peerDependencies:
     react: ^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0-rc
     react-dom: ^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0-rc
-  checksum: 7f2f013c422771828c6613c7890f792aa90a033ea2b41c489c67ca2c6793eefa94d25232c1050fdf69cdd626fad9e3821c5003d45fa6fc831184cd09232023c2
+  checksum: 10/a16d8ac11a0efa20d44f36a5cf3854027895b806363a409f2ddc07ff92bfc92aaf5b8eee21f3e1b153cee2273db5e5383b6334d4b530d934ed08808ecfb45b9f
   languageName: node
   linkType: hard
 
@@ -25958,20 +27525,30 @@ __metadata:
   peerDependencies:
     react: ^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0
     react-dom: ^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0
-  checksum: 9ba451e827ddf1605ae12d26fe8eab1e70928e528b16c0a3443a98dcf7df93a362b0c2a0f64e6e4465b136fee6ccdfda3b1f7fa6748a441cb76a03f926559336
+  checksum: 10/4a11ad949443cd76f9304d0558516c53474f53ca370e54bc29c2c362657b43545c89aec3e7df42d8e8511df379aed79b6fdd2c8fc52e25a9559b64e41ac7aefe
   languageName: node
   linkType: hard
 
-"react-window@npm:1.8.9":
-  version: 1.8.9
-  resolution: "react-window@npm:1.8.9"
+"react-window@npm:1.8.10":
+  version: 1.8.10
+  resolution: "react-window@npm:1.8.10"
   dependencies:
-    "@babel/runtime": ^7.0.0
-    memoize-one: ">=3.1.1 <6"
+    "@babel/runtime": "npm:^7.0.0"
+    memoize-one: "npm:>=3.1.1 <6"
   peerDependencies:
     react: ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
     react-dom: ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
-  checksum: cefa232f4f37269d292529ef15780fb108123d6bb5beee19eeac657e75cf8d4664be66f2da04baf0cb1bc64c5ab3d83a88199c3358f023b78940acd37b0673b2
+  checksum: 10/6f4a713a2012d605370ef4c7026a45ddd6801e428faa4cad558b12b05ba54c00de72de9a360db109db9666f972a3d955b63af9e5a4cd5fbc52411a382273107b
+  languageName: node
+  linkType: hard
+
+"react-zoom-pan-pinch@npm:^3.3.0":
+  version: 3.4.3
+  resolution: "react-zoom-pan-pinch@npm:3.4.3"
+  peerDependencies:
+    react: "*"
+    react-dom: "*"
+  checksum: 10/4849aed08b8a5918eea10d16524927bbd3ff8aaece948d3d11ed650c75f0b8527f8de253388390fe689c7e9df2c84f3eda8222215f1880daf1f6f54416f08b9a
   languageName: node
   linkType: hard
 
@@ -25979,37 +27556,49 @@ __metadata:
   version: 18.2.0
   resolution: "react@npm:18.2.0"
   dependencies:
-    loose-envify: ^1.1.0
-  checksum: 88e38092da8839b830cda6feef2e8505dec8ace60579e46aa5490fc3dc9bba0bd50336507dc166f43e3afc1c42939c09fe33b25fae889d6f402721dcd78fca1b
+    loose-envify: "npm:^1.1.0"
+  checksum: 10/b9214a9bd79e99d08de55f8bef2b7fc8c39630be97c4e29d7be173d14a9a10670b5325e94485f74cd8bff4966ef3c78ee53c79a7b0b9b70cba20aa8973acc694
   languageName: node
   linkType: hard
 
-"read-cmd-shim@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "read-cmd-shim@npm:3.0.0"
-  checksum: b518c6026f3320e30b692044f6ff5c4dc80f9c71261296da8994101b569b26b12b8e5df397bba2d4691dd3a3a2f770a1eca7be18a69ec202fac6dcfadc5016fd
+"read-cmd-shim@npm:4.0.0":
+  version: 4.0.0
+  resolution: "read-cmd-shim@npm:4.0.0"
+  checksum: 10/69a83acf0a3e2357762d5944a6f4a3f3c5527d0f9fe8a5c9362225aaf702ccfa580ff3bc0b84809c99e88861a5e5be147629717f02ff9befdac68fca1ccc7664
   languageName: node
   linkType: hard
 
-"read-package-json-fast@npm:^2.0.2, read-package-json-fast@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "read-package-json-fast@npm:2.0.3"
+"read-package-json-fast@npm:^3.0.0":
+  version: 3.0.2
+  resolution: "read-package-json-fast@npm:3.0.2"
   dependencies:
-    json-parse-even-better-errors: ^2.3.0
-    npm-normalize-package-bin: ^1.0.1
-  checksum: fca37b3b2160b9dda7c5588b767f6a2b8ce68d03a044000e568208e20bea0cf6dd2de17b90740ce8da8b42ea79c0b3859649dadf29510bbe77224ea65326a903
+    json-parse-even-better-errors: "npm:^3.0.0"
+    npm-normalize-package-bin: "npm:^3.0.0"
+  checksum: 10/8d406869f045f1d76e2a99865a8fd1c1af9c1dc06200b94d2b07eef87ed734b22703a8d72e1cd36ea36cc48e22020bdd187f88243c7dd0563f72114d38c17072
   languageName: node
   linkType: hard
 
-"read-package-json@npm:^5.0.0, read-package-json@npm:^5.0.1":
-  version: 5.0.2
-  resolution: "read-package-json@npm:5.0.2"
+"read-package-json@npm:6.0.4, read-package-json@npm:^6.0.0":
+  version: 6.0.4
+  resolution: "read-package-json@npm:6.0.4"
+  dependencies:
+    glob: "npm:^10.2.2"
+    json-parse-even-better-errors: "npm:^3.0.0"
+    normalize-package-data: "npm:^5.0.0"
+    npm-normalize-package-bin: "npm:^3.0.0"
+  checksum: 10/2c72fc86745ffd303177ec1490a809fb916d36720cec145900ec92ca5dd159d6f096dd7842ad92dfa01eeea5509e076960a5395e8d5ce31984a4e9070018915a
+  languageName: node
+  linkType: hard
+
+"read-package-json@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "read-package-json@npm:7.0.0"
   dependencies:
-    glob: ^8.0.1
-    json-parse-even-better-errors: ^2.3.1
-    normalize-package-data: ^4.0.0
-    npm-normalize-package-bin: ^2.0.0
-  checksum: 0882ac9cec1bc92fb5515e9727611fb2909351e1e5c840dce3503cbb25b4cd48eb44b61071986e0fc51043208161f07d364a7336206c8609770186818753b51a
+    glob: "npm:^10.2.2"
+    json-parse-even-better-errors: "npm:^3.0.0"
+    normalize-package-data: "npm:^6.0.0"
+    npm-normalize-package-bin: "npm:^3.0.0"
+  checksum: 10/b395d5330e9096cb533553e51c6dd123284a744e65c771fbd4d868ca600d2a61b867a4f10723e360608e839101fbe805448dd0079267b3232637ec8bb62bb080
   languageName: node
   linkType: hard
 
@@ -26017,9 +27606,9 @@ __metadata:
   version: 3.0.0
   resolution: "read-pkg-up@npm:3.0.0"
   dependencies:
-    find-up: ^2.0.0
-    read-pkg: ^3.0.0
-  checksum: 16175573f2914ab9788897bcbe2a62b5728d0075e62285b3680cebe97059e2911e0134a062cf6e51ebe3e3775312bc788ac2039ed6af38ec68d2c10c6f2b30fb
+    find-up: "npm:^2.0.0"
+    read-pkg: "npm:^3.0.0"
+  checksum: 10/16175573f2914ab9788897bcbe2a62b5728d0075e62285b3680cebe97059e2911e0134a062cf6e51ebe3e3775312bc788ac2039ed6af38ec68d2c10c6f2b30fb
   languageName: node
   linkType: hard
 
@@ -26027,21 +27616,10 @@ __metadata:
   version: 7.0.1
   resolution: "read-pkg-up@npm:7.0.1"
   dependencies:
-    find-up: ^4.1.0
-    read-pkg: ^5.2.0
-    type-fest: ^0.8.1
-  checksum: e4e93ce70e5905b490ca8f883eb9e48b5d3cebc6cd4527c25a0d8f3ae2903bd4121c5ab9c5a3e217ada0141098eeb661313c86fa008524b089b8ed0b7f165e44
-  languageName: node
-  linkType: hard
-
-"read-pkg-up@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "read-pkg-up@npm:8.0.0"
-  dependencies:
-    find-up: ^5.0.0
-    read-pkg: ^6.0.0
-    type-fest: ^1.0.1
-  checksum: fe4c80401656b40b408884457fffb5a8015c03b1018cfd8e48f8d82a5e9023e24963603aeb2755608d964593e046c15b34d29b07d35af9c7aa478be81805209c
+    find-up: "npm:^4.1.0"
+    read-pkg: "npm:^5.2.0"
+    type-fest: "npm:^0.8.1"
+  checksum: 10/e4e93ce70e5905b490ca8f883eb9e48b5d3cebc6cd4527c25a0d8f3ae2903bd4121c5ab9c5a3e217ada0141098eeb661313c86fa008524b089b8ed0b7f165e44
   languageName: node
   linkType: hard
 
@@ -26049,10 +27627,10 @@ __metadata:
   version: 3.0.0
   resolution: "read-pkg@npm:3.0.0"
   dependencies:
-    load-json-file: ^4.0.0
-    normalize-package-data: ^2.3.2
-    path-type: ^3.0.0
-  checksum: 398903ebae6c7e9965419a1062924436cc0b6f516c42c4679a90290d2f87448ed8f977e7aa2dbba4aa1ac09248628c43e493ac25b2bc76640e946035200e34c6
+    load-json-file: "npm:^4.0.0"
+    normalize-package-data: "npm:^2.3.2"
+    path-type: "npm:^3.0.0"
+  checksum: 10/398903ebae6c7e9965419a1062924436cc0b6f516c42c4679a90290d2f87448ed8f977e7aa2dbba4aa1ac09248628c43e493ac25b2bc76640e946035200e34c6
   languageName: node
   linkType: hard
 
@@ -26060,43 +27638,32 @@ __metadata:
   version: 5.2.0
   resolution: "read-pkg@npm:5.2.0"
   dependencies:
-    "@types/normalize-package-data": ^2.4.0
-    normalize-package-data: ^2.5.0
-    parse-json: ^5.0.0
-    type-fest: ^0.6.0
-  checksum: eb696e60528b29aebe10e499ba93f44991908c57d70f2d26f369e46b8b9afc208ef11b4ba64f67630f31df8b6872129e0a8933c8c53b7b4daf0eace536901222
-  languageName: node
-  linkType: hard
-
-"read-pkg@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "read-pkg@npm:6.0.0"
-  dependencies:
-    "@types/normalize-package-data": ^2.4.0
-    normalize-package-data: ^3.0.2
-    parse-json: ^5.2.0
-    type-fest: ^1.0.1
-  checksum: 0cebdff381128e923815c643074a87011070e5fc352bee575d327d6485da3317fab6d802a7b03deeb0be7be8d3ad1640397b3d5d2f044452caf4e8d1736bf94f
+    "@types/normalize-package-data": "npm:^2.4.0"
+    normalize-package-data: "npm:^2.5.0"
+    parse-json: "npm:^5.0.0"
+    type-fest: "npm:^0.6.0"
+  checksum: 10/eb696e60528b29aebe10e499ba93f44991908c57d70f2d26f369e46b8b9afc208ef11b4ba64f67630f31df8b6872129e0a8933c8c53b7b4daf0eace536901222
   languageName: node
   linkType: hard
 
-"read@npm:1, read@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "read@npm:1.0.7"
+"read-yaml-file@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "read-yaml-file@npm:1.1.0"
   dependencies:
-    mute-stream: ~0.0.4
-  checksum: 2777c254e5732cac96f5d0a1c0f6b836c89ae23d8febd405b206f6f24d5de1873420f1a0795e0e3721066650d19adf802c7882c4027143ee0acf942a4f34f97b
+    graceful-fs: "npm:^4.1.5"
+    js-yaml: "npm:^3.6.1"
+    pify: "npm:^4.0.1"
+    strip-bom: "npm:^3.0.0"
+  checksum: 10/41ee5f075507ef0403328dd54e225a61c3149f915675ce7fd0fd791ddcce2e6c30a9fe0f76ffa7a465c1c157b9b4ad8ded1dcf47dc3b396103eeb013490bbc2e
   languageName: node
   linkType: hard
 
-"readable-stream@npm:3, readable-stream@npm:^3.0.0, readable-stream@npm:^3.0.2, readable-stream@npm:^3.0.6, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0":
-  version: 3.6.0
-  resolution: "readable-stream@npm:3.6.0"
+"read@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "read@npm:2.1.0"
   dependencies:
-    inherits: ^2.0.3
-    string_decoder: ^1.1.1
-    util-deprecate: ^1.0.1
-  checksum: d4ea81502d3799439bb955a3a5d1d808592cf3133350ed352aeaa499647858b27b1c4013984900238b0873ec8d0d8defce72469fb7a83e61d53f5ad61cb80dc8
+    mute-stream: "npm:~1.0.0"
+  checksum: 10/90a525c7612ca2fc21b44a0c0e39840541f208b5907112d9db00697559396c0fb682321594fb802eaf1d501ec294d810f88b4f76477e082552ee306dc6d4ba0e
   languageName: node
   linkType: hard
 
@@ -26104,38 +27671,37 @@ __metadata:
   version: 1.1.14
   resolution: "readable-stream@npm:1.1.14"
   dependencies:
-    core-util-is: ~1.0.0
-    inherits: ~2.0.1
-    isarray: 0.0.1
-    string_decoder: ~0.10.x
-  checksum: 17dfeae3e909945a4a1abc5613ea92d03269ef54c49288599507fc98ff4615988a1c39a999dcf9aacba70233d9b7040bc11a5f2bfc947e262dedcc0a8b32b5a0
+    core-util-is: "npm:~1.0.0"
+    inherits: "npm:~2.0.1"
+    isarray: "npm:0.0.1"
+    string_decoder: "npm:~0.10.x"
+  checksum: 10/1aa2cf4bd02f9ab3e1d57842a43a413b52be5300aa089ad1f2e3cea00684532d73edc6a2ba52b0c3210d8b57eb20a695a6d2b96d1c6085ee979c6021ad48ad20
   languageName: node
   linkType: hard
 
-"readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.5, readable-stream@npm:^2.0.6, readable-stream@npm:^2.1.5, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.3, readable-stream@npm:^2.3.5, readable-stream@npm:^2.3.6, readable-stream@npm:~2.3.6":
+"readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.6, readable-stream@npm:^2.2.2, readable-stream@npm:~2.3.6":
   version: 2.3.8
   resolution: "readable-stream@npm:2.3.8"
   dependencies:
-    core-util-is: ~1.0.0
-    inherits: ~2.0.3
-    isarray: ~1.0.0
-    process-nextick-args: ~2.0.0
-    safe-buffer: ~5.1.1
-    string_decoder: ~1.1.1
-    util-deprecate: ~1.0.1
-  checksum: 65645467038704f0c8aaf026a72fbb588a9e2ef7a75cd57a01702ee9db1c4a1e4b03aaad36861a6a0926546a74d174149c8c207527963e0c2d3eee2f37678a42
+    core-util-is: "npm:~1.0.0"
+    inherits: "npm:~2.0.3"
+    isarray: "npm:~1.0.0"
+    process-nextick-args: "npm:~2.0.0"
+    safe-buffer: "npm:~5.1.1"
+    string_decoder: "npm:~1.1.1"
+    util-deprecate: "npm:~1.0.1"
+  checksum: 10/8500dd3a90e391d6c5d889256d50ec6026c059fadee98ae9aa9b86757d60ac46fff24fafb7a39fa41d54cb39d8be56cc77be202ebd4cd8ffcf4cb226cbaa40d4
   languageName: node
   linkType: hard
 
-"readdir-scoped-modules@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "readdir-scoped-modules@npm:1.1.0"
+"readable-stream@npm:^3.0.0, readable-stream@npm:^3.0.2, readable-stream@npm:^3.0.6, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.5.0, readable-stream@npm:^3.6.0":
+  version: 3.6.2
+  resolution: "readable-stream@npm:3.6.2"
   dependencies:
-    debuglog: ^1.0.1
-    dezalgo: ^1.0.0
-    graceful-fs: ^4.1.2
-    once: ^1.3.0
-  checksum: 6d9f334e40dfd0f5e4a8aab5e67eb460c95c85083c690431f87ab2c9135191170e70c2db6d71afcafb78e073d23eb95dcb3fc33ef91308f6ebfe3197be35e608
+    inherits: "npm:^2.0.3"
+    string_decoder: "npm:^1.1.1"
+    util-deprecate: "npm:^1.0.1"
+  checksum: 10/d9e3e53193adcdb79d8f10f2a1f6989bd4389f5936c6f8b870e77570853561c362bee69feca2bbb7b32368ce96a85504aa4cedf7cf80f36e6a9de30d64244048
   languageName: node
   linkType: hard
 
@@ -26143,8 +27709,8 @@ __metadata:
   version: 3.6.0
   resolution: "readdirp@npm:3.6.0"
   dependencies:
-    picomatch: ^2.2.1
-  checksum: 1ced032e6e45670b6d7352d71d21ce7edf7b9b928494dcaba6f11fba63180d9da6cd7061ebc34175ffda6ff529f481818c962952004d273178acd70f7059b320
+    picomatch: "npm:^2.2.1"
+  checksum: 10/196b30ef6ccf9b6e18c4e1724b7334f72a093d011a99f3b5920470f0b3406a51770867b3e1ae9711f227ef7a7065982f6ee2ce316746b2cb42c88efe44297fe7
   languageName: node
   linkType: hard
 
@@ -26152,11 +27718,11 @@ __metadata:
   version: 0.21.5
   resolution: "recast@npm:0.21.5"
   dependencies:
-    ast-types: 0.15.2
-    esprima: ~4.0.0
-    source-map: ~0.6.1
-    tslib: ^2.0.1
-  checksum: 03cc7f57562238ba258d468be67bf7446ce7a707bc87a087891dad15afead46c36e9aaeedf2130e2ab5a465244a9c62bfd4127849761cf8f4085abe2f3e5f485
+    ast-types: "npm:0.15.2"
+    esprima: "npm:~4.0.0"
+    source-map: "npm:~0.6.1"
+    tslib: "npm:^2.0.1"
+  checksum: 10/b41da2bcf7e705511db2f27d17420ace027de8dd167de9f19190d4988a1f80d112f60c095101ac2f145c8657ddde0c5133eb71df20504efaf3fd9d76ad07e15d
   languageName: node
   linkType: hard
 
@@ -26164,12 +27730,12 @@ __metadata:
   version: 0.23.1
   resolution: "recast@npm:0.23.1"
   dependencies:
-    assert: ^2.0.0
-    ast-types: ^0.16.1
-    esprima: ~4.0.0
-    source-map: ~0.6.1
-    tslib: ^2.0.1
-  checksum: 6e9cdf127df94ffb2cd2f666b8cf990992b8543b07d6117799410fa41bf3ff408cbbf30f38149a89a3db7ed2e4b3584ea4744414f8869367f7a888c644677a80
+    assert: "npm:^2.0.0"
+    ast-types: "npm:^0.16.1"
+    esprima: "npm:~4.0.0"
+    source-map: "npm:~0.6.1"
+    tslib: "npm:^2.0.1"
+  checksum: 10/e0fb866d8fd9c521ee829bc5240af71b87fa8dee4fba0ea3a4bf7f3e2602435d8d45378e34ce1bf5a238073593eaf682091e4212973ad43b035cd9e1a6386daa
   languageName: node
   linkType: hard
 
@@ -26177,8 +27743,8 @@ __metadata:
   version: 0.8.0
   resolution: "rechoir@npm:0.8.0"
   dependencies:
-    resolve: ^1.20.0
-  checksum: ad3caed8afdefbc33fbc30e6d22b86c35b3d51c2005546f4e79bcc03c074df804b3640ad18945e6bef9ed12caedc035655ec1082f64a5e94c849ff939dc0a788
+    resolve: "npm:^1.20.0"
+  checksum: 10/ad3caed8afdefbc33fbc30e6d22b86c35b3d51c2005546f4e79bcc03c074df804b3640ad18945e6bef9ed12caedc035655ec1082f64a5e94c849ff939dc0a788
   languageName: node
   linkType: hard
 
@@ -26186,19 +27752,9 @@ __metadata:
   version: 3.0.0
   resolution: "redent@npm:3.0.0"
   dependencies:
-    indent-string: ^4.0.0
-    strip-indent: ^3.0.0
-  checksum: fa1ef20404a2d399235e83cc80bd55a956642e37dd197b4b612ba7327bf87fa32745aeb4a1634b2bab25467164ab4ed9c15be2c307923dd08b0fe7c52431ae6b
-  languageName: node
-  linkType: hard
-
-"redent@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "redent@npm:4.0.0"
-  dependencies:
-    indent-string: ^5.0.0
-    strip-indent: ^4.0.0
-  checksum: 6944e7b1d8f3fd28c2515f5c605b9f7f0ea0f4edddf41890bbbdd4d9ee35abb7540c3b278f03ff827bd278bb6ff4a5bd8692ca406b748c5c1c3ce7355e9fbf8f
+    indent-string: "npm:^4.0.0"
+    strip-indent: "npm:^3.0.0"
+  checksum: 10/fa1ef20404a2d399235e83cc80bd55a956642e37dd197b4b612ba7327bf87fa32745aeb4a1634b2bab25467164ab4ed9c15be2c307923dd08b0fe7c52431ae6b
   languageName: node
   linkType: hard
 
@@ -26206,8 +27762,8 @@ __metadata:
   version: 1.5.4
   resolution: "redux-mock-store@npm:1.5.4"
   dependencies:
-    lodash.isplainobject: ^4.0.6
-  checksum: 571eab2cca3e46321969025af865ddd780804c811be9db277fddf772d86e3ea67b4ef1b19ea3866417d41eb1b73605103020321f68cf68f379a52679a6823d12
+    lodash.isplainobject: "npm:^4.0.6"
+  checksum: 10/7790554114c81db4eecfaf1596233374f57919b8a925dba9f2cdbaa27b5200c4969ee476fd0d5fe806748d06378a38a9c9e79f37a363c7ba64e11f71cae27c2c
   languageName: node
   linkType: hard
 
@@ -26216,7 +27772,7 @@ __metadata:
   resolution: "redux-thunk@npm:2.4.2"
   peerDependencies:
     redux: ^4
-  checksum: c7f757f6c383b8ec26152c113e20087818d18ed3edf438aaad43539e9a6b77b427ade755c9595c4a163b6ad3063adf3497e5fe6a36c68884eb1f1cfb6f049a5c
+  checksum: 10/9bcb1193835128ecebf1e1a1b1a37bc15e8dfbdf6b6ee1b5566dd4c8e4ca05a81175f0c6dda34ab47f87053cd13b74d9f881d59446691d7b192831852b5d7a72
   languageName: node
   linkType: hard
 
@@ -26224,8 +27780,8 @@ __metadata:
   version: 4.2.1
   resolution: "redux@npm:4.2.1"
   dependencies:
-    "@babel/runtime": ^7.9.2
-  checksum: f63b9060c3a1d930ae775252bb6e579b42415aee7a23c4114e21a0b4ba7ec12f0ec76936c00f546893f06e139819f0e2855e0d55ebfce34ca9c026241a6950dd
+    "@babel/runtime": "npm:^7.9.2"
+  checksum: 10/371e4833b671193303a7dea7803c8fdc8e0d566740c78f580e0a3b77b4161da25037626900a2205a5d616117fa6ad09a4232e5a110bd437186b5c6355a041750
   languageName: node
   linkType: hard
 
@@ -26233,13 +27789,13 @@ __metadata:
   version: 1.0.4
   resolution: "reflect.getprototypeof@npm:1.0.4"
   dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-    get-intrinsic: ^1.2.1
-    globalthis: ^1.0.3
-    which-builtin-type: ^1.1.3
-  checksum: 16e2361988dbdd23274b53fb2b1b9cefeab876c3941a2543b4cadac6f989e3db3957b07a44aac46cfceb3e06e2871785ec2aac992d824f76292f3b5ee87f66f2
+    call-bind: "npm:^1.0.2"
+    define-properties: "npm:^1.2.0"
+    es-abstract: "npm:^1.22.1"
+    get-intrinsic: "npm:^1.2.1"
+    globalthis: "npm:^1.0.3"
+    which-builtin-type: "npm:^1.1.3"
+  checksum: 10/52ff881f62a9cb4acdd7f9a8f4ac88234056c4a6b1ed570c249cc085de5c313249b90251d16eb8e58302b82ae697eec19dde16ff62949f6b87f035a3a26dc5df
   languageName: node
   linkType: hard
 
@@ -26247,10 +27803,10 @@ __metadata:
   version: 3.6.0
   resolution: "refractor@npm:3.6.0"
   dependencies:
-    hastscript: ^6.0.0
-    parse-entities: ^2.0.0
-    prismjs: ~1.27.0
-  checksum: 39b01c4168c77c5c8486f9bf8907bbb05f257f15026057ba5728535815a2d90eed620468a4bfbb2b8ceefbb3ce3931a1be8b17152dbdbc8b0eef92450ff750a2
+    hastscript: "npm:^6.0.0"
+    parse-entities: "npm:^2.0.0"
+    prismjs: "npm:~1.27.0"
+  checksum: 10/671bbcf5ae1b4e207f98b9a3dc2cbae215be30effe9f3bdcfd10f565f45fecfe97334cf38c8e4f52d6cc012ff2ec7fb627d3d5678efc388751c8b1e1f7ca2a6c
   languageName: node
   linkType: hard
 
@@ -26258,36 +27814,36 @@ __metadata:
   version: 10.1.0
   resolution: "regenerate-unicode-properties@npm:10.1.0"
   dependencies:
-    regenerate: ^1.4.2
-  checksum: b1a8929588433ab8b9dc1a34cf3665b3b472f79f2af6ceae00d905fc496b332b9af09c6718fb28c730918f19a00dc1d7310adbaa9b72a2ec7ad2f435da8ace17
+    regenerate: "npm:^1.4.2"
+  checksum: 10/25b268659898955ad105267b4efba20e361e27b233670694b683728a2800314bec3053918d3bf71b0604376fd76fe9bc9c6f80379cfb6d1e209a58de44101aac
   languageName: node
   linkType: hard
 
 "regenerate@npm:^1.4.2":
   version: 1.4.2
   resolution: "regenerate@npm:1.4.2"
-  checksum: 3317a09b2f802da8db09aa276e469b57a6c0dd818347e05b8862959c6193408242f150db5de83c12c3fa99091ad95fb42a6db2c3329bfaa12a0ea4cbbeb30cb0
+  checksum: 10/dc6c95ae4b3ba6adbd7687cafac260eee4640318c7a95239d5ce847d9b9263979758389e862fe9c93d633b5792ea4ada5708df75885dc5aa05a309fa18140a87
   languageName: node
   linkType: hard
 
-"regenerator-runtime@npm:0.14.0, regenerator-runtime@npm:^0.14.0":
-  version: 0.14.0
-  resolution: "regenerator-runtime@npm:0.14.0"
-  checksum: 1c977ad82a82a4412e4f639d65d22be376d3ebdd30da2c003eeafdaaacd03fc00c2320f18120007ee700900979284fc78a9f00da7fb593f6e6eeebc673fba9a3
+"regenerator-runtime@npm:0.14.1, regenerator-runtime@npm:^0.14.0":
+  version: 0.14.1
+  resolution: "regenerator-runtime@npm:0.14.1"
+  checksum: 10/5db3161abb311eef8c45bcf6565f4f378f785900ed3945acf740a9888c792f75b98ecb77f0775f3bf95502ff423529d23e94f41d80c8256e8fa05ed4b07cf471
   languageName: node
   linkType: hard
 
 "regenerator-runtime@npm:^0.11.0":
   version: 0.11.1
   resolution: "regenerator-runtime@npm:0.11.1"
-  checksum: 3c97bd2c7b2b3247e6f8e2147a002eb78c995323732dad5dc70fac8d8d0b758d0295e7015b90d3d444446ae77cbd24b9f9123ec3a77018e81d8999818301b4f4
+  checksum: 10/64e62d78594c227e7d5269811bca9e4aa6451332adaae8c79a30cab0fa98733b1ad90bdb9d038095c340c6fad3b414a49a8d9e0b6b424ab7ff8f94f35704f8a2
   languageName: node
   linkType: hard
 
 "regenerator-runtime@npm:^0.13.11, regenerator-runtime@npm:^0.13.4, regenerator-runtime@npm:^0.13.7":
   version: 0.13.11
   resolution: "regenerator-runtime@npm:0.13.11"
-  checksum: 27481628d22a1c4e3ff551096a683b424242a216fee44685467307f14d58020af1e19660bf2e26064de946bad7eff28950eae9f8209d55723e2d9351e632bbb4
+  checksum: 10/d493e9e118abef5b099c78170834f18540c4933cedf9bfabc32d3af94abfb59a7907bd7950259cbab0a929ebca7db77301e8024e5121e6482a82f78283dfd20c
   languageName: node
   linkType: hard
 
@@ -26295,26 +27851,20 @@ __metadata:
   version: 0.15.2
   resolution: "regenerator-transform@npm:0.15.2"
   dependencies:
-    "@babel/runtime": ^7.8.4
-  checksum: 20b6f9377d65954980fe044cfdd160de98df415b4bff38fbade67b3337efaf078308c4fed943067cd759827cc8cfeca9cb28ccda1f08333b85d6a2acbd022c27
+    "@babel/runtime": "npm:^7.8.4"
+  checksum: 10/c4fdcb46d11bbe32605b4b9ed76b21b8d3f241a45153e9dc6f5542fed4c7744fed459f42701f650d5d5956786bf7de57547329d1c05a9df2ed9e367b9d903302
   languageName: node
   linkType: hard
 
-"regexp.prototype.flags@npm:^1.4.3, regexp.prototype.flags@npm:^1.5.1":
-  version: 1.5.1
-  resolution: "regexp.prototype.flags@npm:1.5.1"
+"regexp.prototype.flags@npm:^1.4.3, regexp.prototype.flags@npm:^1.5.0, regexp.prototype.flags@npm:^1.5.2":
+  version: 1.5.2
+  resolution: "regexp.prototype.flags@npm:1.5.2"
   dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    set-function-name: ^2.0.0
-  checksum: 869edff00288442f8d7fa4c9327f91d85f3b3acf8cbbef9ea7a220345cf23e9241b6def9263d2c1ebcf3a316b0aa52ad26a43a84aa02baca3381717b3e307f47
-  languageName: node
-  linkType: hard
-
-"regexpp@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "regexpp@npm:3.2.0"
-  checksum: a78dc5c7158ad9ddcfe01aa9144f46e192ddbfa7b263895a70a5c6c73edd9ce85faf7c0430e59ac38839e1734e275b9c3de5c57ee3ab6edc0e0b1bdebefccef8
+    call-bind: "npm:^1.0.6"
+    define-properties: "npm:^1.2.1"
+    es-errors: "npm:^1.3.0"
+    set-function-name: "npm:^2.0.1"
+  checksum: 10/9fffc01da9c4e12670ff95bc5204364615fcc12d86fc30642765af908675678ebb0780883c874b2dbd184505fb52fa603d80073ecf69f461ce7f56b15d10be9c
   languageName: node
   linkType: hard
 
@@ -26322,13 +27872,13 @@ __metadata:
   version: 5.3.2
   resolution: "regexpu-core@npm:5.3.2"
   dependencies:
-    "@babel/regjsgen": ^0.8.0
-    regenerate: ^1.4.2
-    regenerate-unicode-properties: ^10.1.0
-    regjsparser: ^0.9.1
-    unicode-match-property-ecmascript: ^2.0.0
-    unicode-match-property-value-ecmascript: ^2.1.0
-  checksum: 95bb97088419f5396e07769b7de96f995f58137ad75fac5811fb5fe53737766dfff35d66a0ee66babb1eb55386ef981feaef392f9df6d671f3c124812ba24da2
+    "@babel/regjsgen": "npm:^0.8.0"
+    regenerate: "npm:^1.4.2"
+    regenerate-unicode-properties: "npm:^10.1.0"
+    regjsparser: "npm:^0.9.1"
+    unicode-match-property-ecmascript: "npm:^2.0.0"
+    unicode-match-property-value-ecmascript: "npm:^2.1.0"
+  checksum: 10/ed0d7c66d84c633fbe8db4939d084c780190eca11f6920807dfb8ebac59e2676952cd8f2008d9c86ae8cf0463ea5fd12c5cff09ef2ce7d51ee6b420a5eb4d177
   languageName: node
   linkType: hard
 
@@ -26336,17 +27886,24 @@ __metadata:
   version: 0.9.1
   resolution: "regjsparser@npm:0.9.1"
   dependencies:
-    jsesc: ~0.5.0
+    jsesc: "npm:~0.5.0"
   bin:
     regjsparser: bin/parser
-  checksum: 5e1b76afe8f1d03c3beaf9e0d935dd467589c3625f6d65fb8ffa14f224d783a0fed4bf49c2c1b8211043ef92b6117313419edf055a098ed8342e340586741afc
+  checksum: 10/be7757ef76e1db10bf6996001d1021048b5fb12f5cb470a99b8cf7f3ff943f0f0e2291c0dcdbb418b458ddc4ac10e48680a822b69ef487a0284c8b6b77beddc3
   languageName: node
   linkType: hard
 
 "relateurl@npm:^0.2.7":
   version: 0.2.7
   resolution: "relateurl@npm:0.2.7"
-  checksum: 5891e792eae1dfc3da91c6fda76d6c3de0333a60aa5ad848982ebb6dccaa06e86385fb1235a1582c680a3d445d31be01c6bfc0804ebbcab5aaf53fa856fde6b6
+  checksum: 10/f5d6ba58f2a5d5076389090600c243a0ba7072bcf347490a09e4241e2427ccdb260b4e22cea7be4f1fcd3c2bf05908b1e0d0bc9605e3199d4ecf37af1d5681fa
+  languageName: node
+  linkType: hard
+
+"reliable-random@npm:^0.0.1":
+  version: 0.0.1
+  resolution: "reliable-random@npm:0.0.1"
+  checksum: 10/dbd1fe95dcea9004a0b64540a29c72832c605957a06d26eb762e6600835981ee4949ce7e15b303dcc5c44e9a976357d560f4b6f625fdfaf17f611c65a0150975
   languageName: node
   linkType: hard
 
@@ -26354,12 +27911,12 @@ __metadata:
   version: 8.0.0
   resolution: "remark-external-links@npm:8.0.0"
   dependencies:
-    extend: ^3.0.0
-    is-absolute-url: ^3.0.0
-    mdast-util-definitions: ^4.0.0
-    space-separated-tokens: ^1.0.0
-    unist-util-visit: ^2.0.0
-  checksum: 48c4a41fe38916f79febb390b0c4deefe82b554dd36dc534262d851860d17fb6d15d78d515f29194e5fa48db5f01f4405a6f6dd077aaf32812a2efffb01700d7
+    extend: "npm:^3.0.0"
+    is-absolute-url: "npm:^3.0.0"
+    mdast-util-definitions: "npm:^4.0.0"
+    space-separated-tokens: "npm:^1.0.0"
+    unist-util-visit: "npm:^2.0.0"
+  checksum: 10/48c4a41fe38916f79febb390b0c4deefe82b554dd36dc534262d851860d17fb6d15d78d515f29194e5fa48db5f01f4405a6f6dd077aaf32812a2efffb01700d7
   languageName: node
   linkType: hard
 
@@ -26367,38 +27924,17 @@ __metadata:
   version: 6.1.0
   resolution: "remark-slug@npm:6.1.0"
   dependencies:
-    github-slugger: ^1.0.0
-    mdast-util-to-string: ^1.0.0
-    unist-util-visit: ^2.0.0
-  checksum: 81fff0dcfaf6d6117ef1293bb1d26c3e25483d99c65c22434298eed93583a89ea5d7b94063d9a7f47c0647a708ce84f00ff62d274503f248feec03c344cabb20
-  languageName: node
-  linkType: hard
-
-"remove-bom-buffer@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "remove-bom-buffer@npm:3.0.0"
-  dependencies:
-    is-buffer: ^1.1.5
-    is-utf8: ^0.2.1
-  checksum: e508fd92e5c7b210123485a366b00bb46fe15ef2c23ae90b05cd365bbfeede429ae70f32bce150fc6467e53c921bc0d9a5c7e33d865009c99603f9fbf7c8b7ae
-  languageName: node
-  linkType: hard
-
-"remove-bom-stream@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "remove-bom-stream@npm:1.2.0"
-  dependencies:
-    remove-bom-buffer: ^3.0.0
-    safe-buffer: ^5.1.0
-    through2: ^2.0.3
-  checksum: 32533fa1925a753cfeb352efe7f01c4171de992275e39f66672752669a457d6cdaaa1c9fd41a25b0e54cd6c0db4987a01a2593c01680a6d5e7b5076d27540786
+    github-slugger: "npm:^1.0.0"
+    mdast-util-to-string: "npm:^1.0.0"
+    unist-util-visit: "npm:^2.0.0"
+  checksum: 10/8c90815a0f1f0568450e923391de0183205e18befb7a7e19e111c75ad08cabf7daebe62fccc82b6fbf9f54148dd311b87463632299dbf9fdfe412f6a0a9ab3ea
   languageName: node
   linkType: hard
 
-"remove-trailing-separator@npm:^1.0.1, remove-trailing-separator@npm:^1.1.0":
+"remove-trailing-separator@npm:^1.1.0":
   version: 1.1.0
   resolution: "remove-trailing-separator@npm:1.1.0"
-  checksum: d3c20b5a2d987db13e1cca9385d56ecfa1641bae143b620835ac02a6b70ab88f68f117a0021838db826c57b31373d609d52e4f31aca75fc490c862732d595419
+  checksum: 10/d3c20b5a2d987db13e1cca9385d56ecfa1641bae143b620835ac02a6b70ab88f68f117a0021838db826c57b31373d609d52e4f31aca75fc490c862732d595419
   languageName: node
   linkType: hard
 
@@ -26406,33 +27942,33 @@ __metadata:
   version: 3.0.0
   resolution: "renderkid@npm:3.0.0"
   dependencies:
-    css-select: ^4.1.3
-    dom-converter: ^0.2.0
-    htmlparser2: ^6.1.0
-    lodash: ^4.17.21
-    strip-ansi: ^6.0.1
-  checksum: 77162b62d6f33ab81f337c39efce0439ff0d1f6d441e29c35183151f83041c7850774fb904da163d6c844264d440d10557714e6daa0b19e4561a5cd4ef305d41
+    css-select: "npm:^4.1.3"
+    dom-converter: "npm:^0.2.0"
+    htmlparser2: "npm:^6.1.0"
+    lodash: "npm:^4.17.21"
+    strip-ansi: "npm:^6.0.1"
+  checksum: 10/434bd56d9930dd344bcba3ef7683f3dd893396b6bc7e8caa551a4cacbe75a9466dc6cf3d75bc324a5979278a73ef968d7854f8f660dbf1a52c38a73f1fb59b20
   languageName: node
   linkType: hard
 
-"replace-ext@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "replace-ext@npm:1.0.1"
-  checksum: 4994ea1aaa3d32d152a8d98ff638988812c4fa35ba55485630008fe6f49e3384a8a710878e6fd7304b42b38d1b64c1cd070e78ece411f327735581a79dd88571
+"repeat-string@npm:^1.0.0":
+  version: 1.6.1
+  resolution: "repeat-string@npm:1.6.1"
+  checksum: 10/1b809fc6db97decdc68f5b12c4d1a671c8e3f65ec4a40c238bc5200e44e85bcc52a54f78268ab9c29fcf5fe4f1343e805420056d1f30fa9a9ee4c2d93e3cc6c0
   languageName: node
   linkType: hard
 
 "replace-ext@npm:^2.0.0":
   version: 2.0.0
   resolution: "replace-ext@npm:2.0.0"
-  checksum: ed640ac90d24cce4be977642847d138908d430049cc097633be33b072143515cc7d29699675a0c35f6dc3c3c73cb529ed352d59649cf15931740eb31ae083c1e
+  checksum: 10/ed640ac90d24cce4be977642847d138908d430049cc097633be33b072143515cc7d29699675a0c35f6dc3c3c73cb529ed352d59649cf15931740eb31ae083c1e
   languageName: node
   linkType: hard
 
 "replace-in-file-webpack-plugin@npm:1.0.6":
   version: 1.0.6
   resolution: "replace-in-file-webpack-plugin@npm:1.0.6"
-  checksum: 0c00a074e544ebe1aef0615e594f6daad47427950a2454e88f94dcb185839d68ce07854b83bbcb5f9b2336f8e8ae24017db4eca085135a9be84e43585163301a
+  checksum: 10/0c00a074e544ebe1aef0615e594f6daad47427950a2454e88f94dcb185839d68ce07854b83bbcb5f9b2336f8e8ae24017db4eca085135a9be84e43585163301a
   languageName: node
   linkType: hard
 
@@ -26440,8 +27976,8 @@ __metadata:
   version: 3.0.0
   resolution: "request-progress@npm:3.0.0"
   dependencies:
-    throttleit: ^1.0.0
-  checksum: 6ea1761dcc8a8b7b5894afd478c0286aa31bd69438d7050294bd4fd0d0b3e09b5cde417d38deef9c49809039c337d8744e4bb49d8632b0c3e4ffa5e8a687e0fd
+    throttleit: "npm:^1.0.0"
+  checksum: 10/c25b1c75fb0a0c3b38874abd7ebd58e320c55bc17a48e76772b26828d9e0f688741e144d31b678af9cf447cba32ae153efad05f8a2db225eb07135a613d3162b
   languageName: node
   linkType: hard
 
@@ -26449,62 +27985,62 @@ __metadata:
   version: 2.88.2
   resolution: "request@npm:2.88.2"
   dependencies:
-    aws-sign2: ~0.7.0
-    aws4: ^1.8.0
-    caseless: ~0.12.0
-    combined-stream: ~1.0.6
-    extend: ~3.0.2
-    forever-agent: ~0.6.1
-    form-data: ~2.3.2
-    har-validator: ~5.1.3
-    http-signature: ~1.2.0
-    is-typedarray: ~1.0.0
-    isstream: ~0.1.2
-    json-stringify-safe: ~5.0.1
-    mime-types: ~2.1.19
-    oauth-sign: ~0.9.0
-    performance-now: ^2.1.0
-    qs: ~6.5.2
-    safe-buffer: ^5.1.2
-    tough-cookie: ~2.5.0
-    tunnel-agent: ^0.6.0
-    uuid: ^3.3.2
-  checksum: 4e112c087f6eabe7327869da2417e9d28fcd0910419edd2eb17b6acfc4bfa1dad61954525949c228705805882d8a98a86a0ea12d7f739c01ee92af7062996983
+    aws-sign2: "npm:~0.7.0"
+    aws4: "npm:^1.8.0"
+    caseless: "npm:~0.12.0"
+    combined-stream: "npm:~1.0.6"
+    extend: "npm:~3.0.2"
+    forever-agent: "npm:~0.6.1"
+    form-data: "npm:~2.3.2"
+    har-validator: "npm:~5.1.3"
+    http-signature: "npm:~1.2.0"
+    is-typedarray: "npm:~1.0.0"
+    isstream: "npm:~0.1.2"
+    json-stringify-safe: "npm:~5.0.1"
+    mime-types: "npm:~2.1.19"
+    oauth-sign: "npm:~0.9.0"
+    performance-now: "npm:^2.1.0"
+    qs: "npm:~6.5.2"
+    safe-buffer: "npm:^5.1.2"
+    tough-cookie: "npm:~2.5.0"
+    tunnel-agent: "npm:^0.6.0"
+    uuid: "npm:^3.3.2"
+  checksum: 10/005b8b237b56f1571cfd4ecc09772adaa2e82dcb884fc14ea2bb25e23dbf7c2009f9929e0b6d3fd5802e33ed8ee705a3b594c8f9467c1458cd973872bf89db8e
   languageName: node
   linkType: hard
 
 "require-directory@npm:^2.1.1":
   version: 2.1.1
   resolution: "require-directory@npm:2.1.1"
-  checksum: fb47e70bf0001fdeabdc0429d431863e9475e7e43ea5f94ad86503d918423c1543361cc5166d713eaa7029dd7a3d34775af04764bebff99ef413111a5af18c80
+  checksum: 10/a72468e2589270d91f06c7d36ec97a88db53ae5d6fe3787fadc943f0b0276b10347f89b363b2a82285f650bdcc135ad4a257c61bdd4d00d6df1fa24875b0ddaf
   languageName: node
   linkType: hard
 
 "require-from-string@npm:^2.0.2":
   version: 2.0.2
   resolution: "require-from-string@npm:2.0.2"
-  checksum: a03ef6895445f33a4015300c426699bc66b2b044ba7b670aa238610381b56d3f07c686251740d575e22f4c87531ba662d06937508f0f3c0f1ddc04db3130560b
+  checksum: 10/839a3a890102a658f4cb3e7b2aa13a1f80a3a976b512020c3d1efc418491c48a886b6e481ea56afc6c4cb5eef678f23b2a4e70575e7534eccadf5e30ed2e56eb
   languageName: node
   linkType: hard
 
 "requires-port@npm:^1.0.0":
   version: 1.0.0
   resolution: "requires-port@npm:1.0.0"
-  checksum: eee0e303adffb69be55d1a214e415cf42b7441ae858c76dfc5353148644f6fd6e698926fc4643f510d5c126d12a705e7c8ed7e38061113bdf37547ab356797ff
+  checksum: 10/878880ee78ccdce372784f62f52a272048e2d0827c29ae31e7f99da18b62a2b9463ea03a75f277352f4697c100183debb0532371ad515a2d49d4bfe596dd4c20
   languageName: node
   linkType: hard
 
 "reselect@npm:4.1.8, reselect@npm:^4.1.8":
   version: 4.1.8
   resolution: "reselect@npm:4.1.8"
-  checksum: a4ac87cedab198769a29be92bc221c32da76cfdad6911eda67b4d3e7136dca86208c3b210e31632eae31ebd2cded18596f0dd230d3ccc9e978df22f233b5583e
+  checksum: 10/199984d9872f71cd207f4aa6e6fd2bd48d95154f7aa9b3aee3398335f39f5491059e732f28c12e9031d5d434adab2c458dc8af5afb6564d0ad37e1644445e09c
   languageName: node
   linkType: hard
 
 "resize-observer-polyfill@npm:^1.5.1":
   version: 1.5.1
   resolution: "resize-observer-polyfill@npm:1.5.1"
-  checksum: 57e7f79489867b00ba43c9c051524a5c8f162a61d5547e99333549afc23e15c44fd43f2f318ea0261ea98c0eb3158cca261e6f48d66e1ed1cd1f340a43977094
+  checksum: 10/e10ee50cd6cf558001de5c6fb03fee15debd011c2f694564b71f81742eef03fb30d6c2596d1d5bf946d9991cb692fcef529b7bd2e4057041377ecc9636c753ce
   languageName: node
   linkType: hard
 
@@ -26512,8 +28048,8 @@ __metadata:
   version: 1.0.1
   resolution: "resolve-bin@npm:1.0.1"
   dependencies:
-    find-parent-dir: ~0.3.0
-  checksum: 439678433138cbea49b848be68ae24aa2afa1b3bb82c30fa763ebbc5615e8c340debfe635ee902cdbb4be72528e4139e2adb0503370ee755ad3702d03976af4c
+    find-parent-dir: "npm:~0.3.0"
+  checksum: 10/439678433138cbea49b848be68ae24aa2afa1b3bb82c30fa763ebbc5615e8c340debfe635ee902cdbb4be72528e4139e2adb0503370ee755ad3702d03976af4c
   languageName: node
   linkType: hard
 
@@ -26521,45 +28057,45 @@ __metadata:
   version: 3.0.0
   resolution: "resolve-cwd@npm:3.0.0"
   dependencies:
-    resolve-from: ^5.0.0
-  checksum: 546e0816012d65778e580ad62b29e975a642989108d9a3c5beabfb2304192fa3c9f9146fbdfe213563c6ff51975ae41bac1d3c6e047dd9572c94863a057b4d81
+    resolve-from: "npm:^5.0.0"
+  checksum: 10/546e0816012d65778e580ad62b29e975a642989108d9a3c5beabfb2304192fa3c9f9146fbdfe213563c6ff51975ae41bac1d3c6e047dd9572c94863a057b4d81
   languageName: node
   linkType: hard
 
-"resolve-from@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "resolve-from@npm:4.0.0"
-  checksum: f4ba0b8494846a5066328ad33ef8ac173801a51739eb4d63408c847da9a2e1c1de1e6cbbf72699211f3d13f8fc1325648b169bd15eb7da35688e30a5fb0e4a7f
+"resolve-from@npm:5.0.0, resolve-from@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "resolve-from@npm:5.0.0"
+  checksum: 10/be18a5e4d76dd711778664829841cde690971d02b6cbae277735a09c1c28f407b99ef6ef3cd585a1e6546d4097b28df40ed32c4a287b9699dcf6d7f208495e23
   languageName: node
   linkType: hard
 
-"resolve-from@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "resolve-from@npm:5.0.0"
-  checksum: 4ceeb9113e1b1372d0cd969f3468fa042daa1dd9527b1b6bb88acb6ab55d8b9cd65dbf18819f9f9ddf0db804990901dcdaade80a215e7b2c23daae38e64f5bdf
+"resolve-from@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "resolve-from@npm:4.0.0"
+  checksum: 10/91eb76ce83621eea7bbdd9b55121a5c1c4a39e54a9ce04a9ad4517f102f8b5131c2cf07622c738a6683991bf54f2ce178f5a42803ecbd527ddc5105f362cc9e3
   languageName: node
   linkType: hard
 
-"resolve-options@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "resolve-options@npm:1.1.0"
+"resolve-options@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "resolve-options@npm:2.0.0"
   dependencies:
-    value-or-function: ^3.0.0
-  checksum: 437813d9418b49e52c367b980b6b48b3ea1ea39105aac97c39f104724abb6cda224ed92ebf12499cf00993589d38c8195eb2be730d0ba8b45df9bdf7cec65b33
+    value-or-function: "npm:^4.0.0"
+  checksum: 10/b28584cc089099af42e36292c32bd9af8bc9e28e3ca73c172c0a172d7ed5afb01c75cc2275268c327dceba77a5555b33fbd55617be138874040279fe6ff02fbf
   languageName: node
   linkType: hard
 
 "resolve-pathname@npm:^3.0.0":
   version: 3.0.0
   resolution: "resolve-pathname@npm:3.0.0"
-  checksum: 6147241ba42c423dbe83cb067a2b4af4f60908c3af57e1ea567729cc71416c089737fe2a73e9e79e7a60f00f66c91e4b45ad0d37cd4be2d43fec44963ef14368
+  checksum: 10/6147241ba42c423dbe83cb067a2b4af4f60908c3af57e1ea567729cc71416c089737fe2a73e9e79e7a60f00f66c91e4b45ad0d37cd4be2d43fec44963ef14368
   languageName: node
   linkType: hard
 
 "resolve-pkg-maps@npm:^1.0.0":
   version: 1.0.0
   resolution: "resolve-pkg-maps@npm:1.0.0"
-  checksum: 1012afc566b3fdb190a6309cc37ef3b2dcc35dff5fa6683a9d00cd25c3247edfbc4691b91078c97adc82a29b77a2660c30d791d65dab4fc78bfc473f60289977
+  checksum: 10/0763150adf303040c304009231314d1e84c6e5ebfa2d82b7d94e96a6e82bacd1dcc0b58ae257315f3c8adb89a91d8d0f12928241cba2df1680fbe6f60bf99b0e
   languageName: node
   linkType: hard
 
@@ -26567,15 +28103,15 @@ __metadata:
   version: 2.1.0
   resolution: "resolve-protobuf-schema@npm:2.1.0"
   dependencies:
-    protocol-buffers-schema: ^3.3.1
-  checksum: 88fffab2a3757888884a36f9aa4e24be5186b01820a8c26297dc1ce406b9daf776594926bdf524c2c8e8e5b0aba8ac48362b6584cdecc9a7083215ebca01c599
+    protocol-buffers-schema: "npm:^3.3.1"
+  checksum: 10/88fffab2a3757888884a36f9aa4e24be5186b01820a8c26297dc1ce406b9daf776594926bdf524c2c8e8e5b0aba8ac48362b6584cdecc9a7083215ebca01c599
   languageName: node
   linkType: hard
 
 "resolve.exports@npm:^2.0.0":
   version: 2.0.2
   resolution: "resolve.exports@npm:2.0.2"
-  checksum: 1c7778ca1b86a94f8ab4055d196c7d87d1874b96df4d7c3e67bbf793140f0717fd506dcafd62785b079cd6086b9264424ad634fb904409764c3509c3df1653f2
+  checksum: 10/f1cc0b6680f9a7e0345d783e0547f2a5110d8336b3c2a4227231dd007271ffd331fd722df934f017af90bae0373920ca0d4005da6f76cb3176c8ae426370f893
   languageName: node
   linkType: hard
 
@@ -26583,51 +28119,51 @@ __metadata:
   version: 1.22.8
   resolution: "resolve@npm:1.22.8"
   dependencies:
-    is-core-module: ^2.13.0
-    path-parse: ^1.0.7
-    supports-preserve-symlinks-flag: ^1.0.0
+    is-core-module: "npm:^2.13.0"
+    path-parse: "npm:^1.0.7"
+    supports-preserve-symlinks-flag: "npm:^1.0.0"
   bin:
     resolve: bin/resolve
-  checksum: f8a26958aa572c9b064562750b52131a37c29d072478ea32e129063e2da7f83e31f7f11e7087a18225a8561cfe8d2f0df9dbea7c9d331a897571c0a2527dbb4c
+  checksum: 10/c473506ee01eb45cbcfefb68652ae5759e092e6b0fb64547feadf9736a6394f258fbc6f88e00c5ca36d5477fbb65388b272432a3600fa223062e54333c156753
   languageName: node
   linkType: hard
 
-"resolve@npm:^2.0.0-next.4":
-  version: 2.0.0-next.4
-  resolution: "resolve@npm:2.0.0-next.4"
+"resolve@npm:^2.0.0-next.4, resolve@npm:^2.0.0-next.5":
+  version: 2.0.0-next.5
+  resolution: "resolve@npm:2.0.0-next.5"
   dependencies:
-    is-core-module: ^2.9.0
-    path-parse: ^1.0.7
-    supports-preserve-symlinks-flag: ^1.0.0
+    is-core-module: "npm:^2.13.0"
+    path-parse: "npm:^1.0.7"
+    supports-preserve-symlinks-flag: "npm:^1.0.0"
   bin:
     resolve: bin/resolve
-  checksum: c438ac9a650f2030fd074219d7f12ceb983b475da2d89ad3d6dd05fbf6b7a0a8cd37d4d10b43cb1f632bc19f22246ab7f36ebda54d84a29bfb2910a0680906d3
+  checksum: 10/2d6fd28699f901744368e6f2032b4268b4c7b9185fd8beb64f68c93ac6b22e52ae13560ceefc96241a665b985edf9ffd393ae26d2946a7d3a07b7007b7d51e79
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.12.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.4#~builtin<compat/resolve>":
+"resolve@patch:resolve@npm%3A^1.10.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.12.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin<compat/resolve>":
   version: 1.22.8
-  resolution: "resolve@patch:resolve@npm%3A1.22.8#~builtin<compat/resolve>::version=1.22.8&hash=c3c19d"
+  resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin<compat/resolve>::version=1.22.8&hash=c3c19d"
   dependencies:
-    is-core-module: ^2.13.0
-    path-parse: ^1.0.7
-    supports-preserve-symlinks-flag: ^1.0.0
+    is-core-module: "npm:^2.13.0"
+    path-parse: "npm:^1.0.7"
+    supports-preserve-symlinks-flag: "npm:^1.0.0"
   bin:
     resolve: bin/resolve
-  checksum: 5479b7d431cacd5185f8db64bfcb7286ae5e31eb299f4c4f404ad8aa6098b77599563ac4257cb2c37a42f59dfc06a1bec2bcf283bb448f319e37f0feb9a09847
+  checksum: 10/f345cd37f56a2c0275e3fe062517c650bb673815d885e7507566df589375d165bbbf4bdb6aa95600a9bc55f4744b81f452b5a63f95b9f10a72787dba3c90890a
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@^2.0.0-next.4#~builtin<compat/resolve>":
-  version: 2.0.0-next.4
-  resolution: "resolve@patch:resolve@npm%3A2.0.0-next.4#~builtin<compat/resolve>::version=2.0.0-next.4&hash=c3c19d"
+"resolve@patch:resolve@npm%3A^2.0.0-next.4#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^2.0.0-next.5#optional!builtin<compat/resolve>":
+  version: 2.0.0-next.5
+  resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#optional!builtin<compat/resolve>::version=2.0.0-next.5&hash=c3c19d"
   dependencies:
-    is-core-module: ^2.9.0
-    path-parse: ^1.0.7
-    supports-preserve-symlinks-flag: ^1.0.0
+    is-core-module: "npm:^2.13.0"
+    path-parse: "npm:^1.0.7"
+    supports-preserve-symlinks-flag: "npm:^1.0.0"
   bin:
     resolve: bin/resolve
-  checksum: 4bf9f4f8a458607af90518ff73c67a4bc1a38b5a23fef2bb0ccbd45e8be89820a1639b637b0ba377eb2be9eedfb1739a84cde24fe4cd670c8207d8fea922b011
+  checksum: 10/05fa778de9d0347c8b889eb7a18f1f06bf0f801b0eb4610b4871a4b2f22e220900cf0ad525e94f990bb8d8921c07754ab2122c0c225ab4cdcea98f36e64fa4c2
   languageName: node
   linkType: hard
 
@@ -26635,44 +28171,44 @@ __metadata:
   version: 3.1.0
   resolution: "restore-cursor@npm:3.1.0"
   dependencies:
-    onetime: ^5.1.0
-    signal-exit: ^3.0.2
-  checksum: f877dd8741796b909f2a82454ec111afb84eb45890eb49ac947d87991379406b3b83ff9673a46012fca0d7844bb989f45cc5b788254cf1a39b6b5a9659de0630
+    onetime: "npm:^5.1.0"
+    signal-exit: "npm:^3.0.2"
+  checksum: 10/f877dd8741796b909f2a82454ec111afb84eb45890eb49ac947d87991379406b3b83ff9673a46012fca0d7844bb989f45cc5b788254cf1a39b6b5a9659de0630
   languageName: node
   linkType: hard
 
 "retry@npm:^0.12.0":
   version: 0.12.0
   resolution: "retry@npm:0.12.0"
-  checksum: 623bd7d2e5119467ba66202d733ec3c2e2e26568074923bc0585b6b99db14f357e79bdedb63cab56cec47491c4a0da7e6021a7465ca6dc4f481d3898fdd3158c
+  checksum: 10/1f914879f97e7ee931ad05fe3afa629bd55270fc6cf1c1e589b6a99fab96d15daad0fa1a52a00c729ec0078045fe3e399bd4fd0c93bcc906957bdc17f89cb8e6
   languageName: node
   linkType: hard
 
 "retry@npm:^0.13.1":
   version: 0.13.1
   resolution: "retry@npm:0.13.1"
-  checksum: 47c4d5be674f7c13eee4cfe927345023972197dbbdfba5d3af7e461d13b44de1bfd663bfc80d2f601f8ef3fc8164c16dd99655a221921954a65d044a2fc1233b
+  checksum: 10/6125ec2e06d6e47e9201539c887defba4e47f63471db304c59e4b82fc63c8e89ca06a77e9d34939a9a42a76f00774b2f46c0d4a4cbb3e287268bd018ed69426d
   languageName: node
   linkType: hard
 
 "reusify@npm:^1.0.4":
   version: 1.0.4
   resolution: "reusify@npm:1.0.4"
-  checksum: c3076ebcc22a6bc252cb0b9c77561795256c22b757f40c0d8110b1300723f15ec0fc8685e8d4ea6d7666f36c79ccc793b1939c748bf36f18f542744a4e379fcc
+  checksum: 10/14222c9e1d3f9ae01480c50d96057228a8524706db79cdeb5a2ce5bb7070dd9f409a6f84a02cbef8cdc80d39aef86f2dd03d155188a1300c599b05437dcd2ffb
   languageName: node
   linkType: hard
 
 "rfdc@npm:^1.3.0":
   version: 1.3.0
   resolution: "rfdc@npm:1.3.0"
-  checksum: fb2ba8512e43519983b4c61bd3fa77c0f410eff6bae68b08614437bc3f35f91362215f7b4a73cbda6f67330b5746ce07db5dd9850ad3edc91271ad6deea0df32
+  checksum: 10/76dedd9700cdf132947fde7ce1a8838c9cbb7f3e8f9188af0aaf97194cce745f42094dd2cf547426934cc83252ee2c0e432b2e0222a4415ab0db32de82665c69
   languageName: node
   linkType: hard
 
 "rgbcolor@npm:^1.0.1":
   version: 1.0.1
   resolution: "rgbcolor@npm:1.0.1"
-  checksum: bd062ac007a3e979e2f83dc69feb3cc4f9bca7d8631899548394160e30c47e4f7e52b31aa3f66a69061ad56e899e812ec52f5c33686c085d72c9b3d22faed1c8
+  checksum: 10/afa76637181017e13dfc39debcc41f2f994a1b7c807cc863ba53bc03268ed7a28411094c1008185446b60a9d87131abae392acbe851c96f6dcf9994497019938
   languageName: node
   linkType: hard
 
@@ -26680,10 +28216,21 @@ __metadata:
   version: 5.0.1
   resolution: "rimraf@npm:5.0.1"
   dependencies:
-    glob: ^10.2.5
+    glob: "npm:^10.2.5"
   bin:
     rimraf: dist/cjs/src/bin.js
-  checksum: bafce85391349a2d960847980bf9b5caa2a8887f481af630f1ea27e08288217293cec72d75e9a2ba35495c212789f66a7f3d23366ba6197026ab71c535126857
+  checksum: 10/0691e4d7482f2de2af8628976413e146cd6b204f52ab88be91a3bb69cb9c8669ee795ef7c1e964e8ec6bfeaec0212326287d53ec3eef26dac406c8f19c97f0c4
+  languageName: node
+  linkType: hard
+
+"rimraf@npm:5.0.5, rimraf@npm:^5.0.5":
+  version: 5.0.5
+  resolution: "rimraf@npm:5.0.5"
+  dependencies:
+    glob: "npm:^10.3.7"
+  bin:
+    rimraf: dist/esm/bin.mjs
+  checksum: 10/a612c7184f96258b7d1328c486b12ca7b60aa30e04229a08bbfa7e964486deb1e9a1b52d917809311bdc39a808a4055c0f950c0280fba194ba0a09e6f0d404f6
   languageName: node
   linkType: hard
 
@@ -26691,10 +28238,10 @@ __metadata:
   version: 2.7.1
   resolution: "rimraf@npm:2.7.1"
   dependencies:
-    glob: ^7.1.3
+    glob: "npm:^7.1.3"
   bin:
     rimraf: ./bin.js
-  checksum: cdc7f6eacb17927f2a075117a823e1c5951792c6498ebcce81ca8203454a811d4cf8900314154d3259bb8f0b42ab17f67396a8694a54cae3283326e57ad250cd
+  checksum: 10/4586c296c736483e297da7cffd19475e4a3e41d07b1ae124aad5d687c79e4ffa716bdac8732ed1db942caf65271cee9dd39f8b639611de161a2753e2112ffe1d
   languageName: node
   linkType: hard
 
@@ -26702,10 +28249,21 @@ __metadata:
   version: 3.0.2
   resolution: "rimraf@npm:3.0.2"
   dependencies:
-    glob: ^7.1.3
+    glob: "npm:^7.1.3"
   bin:
     rimraf: bin.js
-  checksum: 87f4164e396f0171b0a3386cc1877a817f572148ee13a7e113b238e48e8a9f2f31d009a92ec38a591ff1567d9662c6b67fd8818a2dbbaed74bc26a87a2a4a9a0
+  checksum: 10/063ffaccaaaca2cfd0ef3beafb12d6a03dd7ff1260d752d62a6077b5dfff6ae81bea571f655bb6b589d366930ec1bdd285d40d560c0dae9b12f125e54eb743d5
+  languageName: node
+  linkType: hard
+
+"rimraf@npm:^4.4.1":
+  version: 4.4.1
+  resolution: "rimraf@npm:4.4.1"
+  dependencies:
+    glob: "npm:^9.2.0"
+  bin:
+    rimraf: dist/cjs/src/bin.js
+  checksum: 10/218ef9122145ccce9d0a71124d36a3894537de46600b37fae7dba26ccff973251eaa98aa63c2c5855a05fa04bca7cbbd7a92d4b29f2875d2203e72530ecf6ede
   languageName: node
   linkType: hard
 
@@ -26713,17 +28271,17 @@ __metadata:
   version: 2.6.3
   resolution: "rimraf@npm:2.6.3"
   dependencies:
-    glob: ^7.1.3
+    glob: "npm:^7.1.3"
   bin:
     rimraf: ./bin.js
-  checksum: 3ea587b981a19016297edb96d1ffe48af7e6af69660e3b371dbfc73722a73a0b0e9be5c88089fbeeb866c389c1098e07f64929c7414290504b855f54f901ab10
+  checksum: 10/756419f2fa99aa119c46a9fc03e09d84ecf5421a80a72d1944c5088c9e4671e77128527a900a313ed9d3fdbdd37e2ae05486cd7e9116d5812d8c31f2399d7c86
   languageName: node
   linkType: hard
 
 "robust-predicates@npm:^3.0.0":
   version: 3.0.1
   resolution: "robust-predicates@npm:3.0.1"
-  checksum: 45e9de2df4380da84a2a561d4fd54ea92194e878b93ed19d5e4bc90f4e834a13755e846c8516bab8360190309696f0564a0150386c52ef01f70f2b388449dac5
+  checksum: 10/99a3feb54a195f88c8118114cf4a535e915d2eafd259bcb517e161e8d2af4cf84730313c7e70ac98b9a04e23d7e789bfe50a703b2874745ffe1c0e09e4e4f22d
   languageName: node
   linkType: hard
 
@@ -26731,12 +28289,12 @@ __metadata:
   version: 3.5.0
   resolution: "rollup-plugin-copy@npm:3.5.0"
   dependencies:
-    "@types/fs-extra": ^8.0.1
-    colorette: ^1.1.0
-    fs-extra: ^8.1.0
-    globby: 10.0.1
-    is-plain-object: ^3.0.0
-  checksum: 706ba6bd2052b95d1037f12963ff4b50749730f18aefad10544f9574aff7c035c88c5dd9ae1f0c0408cf09862e595a0ea4d68e13c2717addaea2bda3ade0d0e0
+    "@types/fs-extra": "npm:^8.0.1"
+    colorette: "npm:^1.1.0"
+    fs-extra: "npm:^8.1.0"
+    globby: "npm:10.0.1"
+    is-plain-object: "npm:^3.0.0"
+  checksum: 10/706ba6bd2052b95d1037f12963ff4b50749730f18aefad10544f9574aff7c035c88c5dd9ae1f0c0408cf09862e595a0ea4d68e13c2717addaea2bda3ade0d0e0
   languageName: node
   linkType: hard
 
@@ -26744,15 +28302,31 @@ __metadata:
   version: 5.3.0
   resolution: "rollup-plugin-dts@npm:5.3.0"
   dependencies:
-    "@babel/code-frame": ^7.18.6
-    magic-string: ^0.30.0
+    "@babel/code-frame": "npm:^7.18.6"
+    magic-string: "npm:^0.30.0"
   peerDependencies:
     rollup: ^3.0.0
     typescript: ^4.1 || ^5.0
   dependenciesMeta:
     "@babel/code-frame":
       optional: true
-  checksum: ba3a6065598586c52af60211877a234b8c829b8a7ecd6e6b426e52ec4dc2c8c8ac6e1fb9f47db6afd91858be0dcb09fd3d312c865e972fb72ae8c9ee00eb1d36
+  checksum: 10/7ecb7bf37dcb4d6a277da1dbf3f473c8807741e156dda75dd3d2f835df0cbc9621108cf6af94b363b5205713e268dee4ddb24e9c139163a49292cabd44ab0949
+  languageName: node
+  linkType: hard
+
+"rollup-plugin-dts@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "rollup-plugin-dts@npm:6.1.0"
+  dependencies:
+    "@babel/code-frame": "npm:^7.22.13"
+    magic-string: "npm:^0.30.4"
+  peerDependencies:
+    rollup: ^3.29.4 || ^4
+    typescript: ^4.5 || ^5.0
+  dependenciesMeta:
+    "@babel/code-frame":
+      optional: true
+  checksum: 10/2ecbda8eb0644ce98ee3a795bf5b99368d80e357972c227b07c382c4af34e03fe681c0f6674e1967330b69e79f2ddf288a672f8964441d5f98e9998c50f41a01
   languageName: node
   linkType: hard
 
@@ -26760,15 +28334,24 @@ __metadata:
   version: 5.0.0
   resolution: "rollup-plugin-esbuild@npm:5.0.0"
   dependencies:
-    "@rollup/pluginutils": ^5.0.1
-    debug: ^4.3.4
-    es-module-lexer: ^1.0.5
-    joycon: ^3.1.1
-    jsonc-parser: ^3.2.0
+    "@rollup/pluginutils": "npm:^5.0.1"
+    debug: "npm:^4.3.4"
+    es-module-lexer: "npm:^1.0.5"
+    joycon: "npm:^3.1.1"
+    jsonc-parser: "npm:^3.2.0"
   peerDependencies:
     esbuild: ">=0.10.1"
     rollup: ^1.20.0 || ^2.0.0 || ^3.0.0
-  checksum: 59b2922db370918ca97ac3862bce9a37e530a8e6332c670803b211e827de6b0efb8e06d1b4eba60af7dab42a1fd38c6aaa039c6cea321f61fb363a3abdedc28a
+  checksum: 10/94b8dcad27eada7a7422aa8dbee4784452d2598fccc60555a3639d86e8872e9d440b5debcd26883389695cf03d61891ba8b076a7a35c6bf4beddbdd0be404642
+  languageName: node
+  linkType: hard
+
+"rollup-plugin-node-externals@npm:5.0.0":
+  version: 5.0.0
+  resolution: "rollup-plugin-node-externals@npm:5.0.0"
+  peerDependencies:
+    rollup: ^2.60.0
+  checksum: 10/745df84e554dc8b779ade79d88e1e21b30780653b9e454f8591163d87d55519bc71219a7f7a994ed32a3f2d5f9eb498be0649a78b42992806c272597bf49f207
   languageName: node
   linkType: hard
 
@@ -26777,7 +28360,7 @@ __metadata:
   resolution: "rollup-plugin-node-externals@npm:5.0.2"
   peerDependencies:
     rollup: ^2.60.0 || ^3.0.0
-  checksum: 5afefcccb37a2c54e836d7b5b97e0b9ab47a187cf9341fda22e580f84d2f87de2b1938c8005a8d38794cab6acfcf49c9121b30431641ac53928139ad020e3160
+  checksum: 10/65d24e6f174d170b855912f230e2dbb9debee4c81d2819e88391f324cc190a84f2c1ab4b421688145786df822434e40b6203524be497832b2f1201dc3728ef77
   languageName: node
   linkType: hard
 
@@ -26785,29 +28368,26 @@ __metadata:
   version: 0.6.3
   resolution: "rollup-plugin-sourcemaps@npm:0.6.3"
   dependencies:
-    "@rollup/pluginutils": ^3.0.9
-    source-map-resolve: ^0.6.0
+    "@rollup/pluginutils": "npm:^3.0.9"
+    source-map-resolve: "npm:^0.6.0"
   peerDependencies:
     "@types/node": ">=10.0.0"
     rollup: ">=0.31.2"
   peerDependenciesMeta:
     "@types/node":
       optional: true
-  checksum: bb4909a90f2e824717a67ad146b2cccc40411ee54709ffa548c47c4dfe485bd55039a5850d7640ecb2691de9dc30e3fd57287e4d74331f36fed9c263d86dd4dc
+  checksum: 10/bb4909a90f2e824717a67ad146b2cccc40411ee54709ffa548c47c4dfe485bd55039a5850d7640ecb2691de9dc30e3fd57287e4d74331f36fed9c263d86dd4dc
   languageName: node
   linkType: hard
 
-"rollup-plugin-terser@npm:7.0.2":
-  version: 7.0.2
-  resolution: "rollup-plugin-terser@npm:7.0.2"
+"rollup-plugin-svg-import@npm:1.6.0":
+  version: 1.6.0
+  resolution: "rollup-plugin-svg-import@npm:1.6.0"
   dependencies:
-    "@babel/code-frame": ^7.10.4
-    jest-worker: ^26.2.1
-    serialize-javascript: ^4.0.0
-    terser: ^5.0.0
+    "@rollup/pluginutils": "npm:^4.1.1"
   peerDependencies:
-    rollup: ^2.0.0
-  checksum: af84bb7a7a894cd00852b6486528dfb8653cf94df4c126f95f389a346f401d054b08c46bee519a2ab6a22b33804d1d6ac6d8c90b1b2bf8fffb097eed73fc3c72
+    rollup: ">=1.29.0 <3.0.0"
+  checksum: 10/453862c39d2301563d9d07f6647c295377ff66cf3174d2a0612389fda4bfd9fa72718d90279feb782d3525f1d6f9710e1dc78641cd9d4044360a0179f88054b0
   languageName: node
   linkType: hard
 
@@ -26815,50 +28395,67 @@ __metadata:
   version: 2.79.1
   resolution: "rollup@npm:2.79.1"
   dependencies:
-    fsevents: ~2.3.2
+    fsevents: "npm:~2.3.2"
   dependenciesMeta:
     fsevents:
       optional: true
   bin:
     rollup: dist/bin/rollup
-  checksum: 6a2bf167b3587d4df709b37d149ad0300692cc5deb510f89ac7bdc77c8738c9546ae3de9322b0968e1ed2b0e984571f5f55aae28fa7de4cfcb1bc5402a4e2be6
+  checksum: 10/df087b701304432f30922bbee5f534ab189aa6938bd383b5686c03147e0d00cd1789ea10a462361326ce6b6ebe448ce272ad3f3cc40b82eeb3157df12f33663c
   languageName: node
   linkType: hard
 
 "rsvp@npm:^4.8.2":
   version: 4.8.5
   resolution: "rsvp@npm:4.8.5"
-  checksum: 2d8ef30d8febdf05bdf856ccca38001ae3647e41835ca196bc1225333f79b94ae44def733121ca549ccc36209c9b689f6586905e2a043873262609744da8efc1
+  checksum: 10/3c81905a0c235125cb00e855580ed8fb63d302d69ea6cadb506cea214892665f71c0998350875a6117ccce68d9afca5d996c5c74a5c36ca134cfe141bec4ce1c
   languageName: node
   linkType: hard
 
 "rsvp@npm:~3.2.1":
   version: 3.2.1
   resolution: "rsvp@npm:3.2.1"
-  checksum: e2ac49cbe35b8c2701b07698066d7cd8004115b070f3352d45759dfcd820fa57e687230331ba41f5a40e1871789cbf122de6e73559598777a0b18b66953dc09b
+  checksum: 10/c85d086bfd92b8997846221b447e41612edb6e5e7566725058af82d7e67a002e7338da8e44de98d0ebaca1519d049a6b620e0078d9ab1c8d1403131fe48e7f42
   languageName: node
   linkType: hard
 
-"rtl-css-js@npm:^1.14.0":
-  version: 1.14.2
-  resolution: "rtl-css-js@npm:1.14.2"
+"rtl-css-js@npm:^1.16.1":
+  version: 1.16.1
+  resolution: "rtl-css-js@npm:1.16.1"
+  dependencies:
+    "@babel/runtime": "npm:^7.1.2"
+  checksum: 10/fa6a3e1f73e65bf5763b8a051942477a0852ee072d29ebad0999f02556a73715e72374d9a31ddec3fe023b09702b56f8be3a5a0404816e795ab86ea879183e02
+  languageName: node
+  linkType: hard
+
+"rudder-sdk-js@npm:2.48.6":
+  version: 2.48.6
+  resolution: "rudder-sdk-js@npm:2.48.6"
   dependencies:
-    "@babel/runtime": ^7.1.2
-  checksum: 8fd4956df234610bab11299adc7e12f82fc6f9770474f66e0c00bfa3c23bce9e4908476f802ad6d704c9158f503d8d17634af4221f941a3d613ee6d8995208ed
+    "@segment/localstorage-retry": "npm:1.3.0"
+    component-emitter: "npm:2.0.0"
+  checksum: 10/972030e22265c469b122ede4dc275bd0e4c9be3f6e520125252bf83504e4215143a23a633bcaedddcb9b615f7c13813ee02e23a22b85bdb4e6b4ff7984c85737
   languageName: node
   linkType: hard
 
-"rudder-sdk-js@npm:2.43.0":
-  version: 2.43.0
-  resolution: "rudder-sdk-js@npm:2.43.0"
-  checksum: 242dfbbd40d27c3872847584bda0aaa1fa025c6ab41d654458134cf682a7efa96b2f0aa821105dca0a781992e6f0d133e83cda36dacfaf00d56d0afcd333c08c
+"run-applescript@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "run-applescript@npm:7.0.0"
+  checksum: 10/b02462454d8b182ad4117e5d4626e9e6782eb2072925c9fac582170b0627ae3c1ea92ee9b2df7daf84b5e9ffe14eb1cf5fb70bc44b15c8a0bfcdb47987e2410c
   languageName: node
   linkType: hard
 
 "run-async@npm:^2.4.0":
   version: 2.4.1
   resolution: "run-async@npm:2.4.1"
-  checksum: a2c88aa15df176f091a2878eb840e68d0bdee319d8d97bbb89112223259cebecb94bc0defd735662b83c2f7a30bed8cddb7d1674eb48ae7322dc602b22d03797
+  checksum: 10/c79551224dafa26ecc281cb1efad3510c82c79116aaf681f8a931ce70fdf4ca880d58f97d3b930a38992c7aad7955a08e065b32ec194e1dd49d7790c874ece50
+  languageName: node
+  linkType: hard
+
+"run-async@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "run-async@npm:3.0.0"
+  checksum: 10/97fb8747f7765b77ebcd311d3a33548099336f04c6434e0763039b98c1de0f1b4421000695aff8751f309c0b995d8dfd620c1f1e4c35572da38c101488165305
   languageName: node
   linkType: hard
 
@@ -26866,91 +28463,91 @@ __metadata:
   version: 1.2.0
   resolution: "run-parallel@npm:1.2.0"
   dependencies:
-    queue-microtask: ^1.2.2
-  checksum: cb4f97ad25a75ebc11a8ef4e33bb962f8af8516bb2001082ceabd8902e15b98f4b84b4f8a9b222e5d57fc3bd1379c483886ed4619367a7680dad65316993021d
+    queue-microtask: "npm:^1.2.2"
+  checksum: 10/cb4f97ad25a75ebc11a8ef4e33bb962f8af8516bb2001082ceabd8902e15b98f4b84b4f8a9b222e5d57fc3bd1379c483886ed4619367a7680dad65316993021d
   languageName: node
   linkType: hard
 
 "rw@npm:1, rw@npm:^1.3.3":
   version: 1.3.3
   resolution: "rw@npm:1.3.3"
-  checksum: c20d82421f5a71c86a13f76121b751553a99cd4a70ea27db86f9b23f33db941f3f06019c30f60d50c356d0bd674c8e74764ac146ea55e217c091bde6fba82aa3
+  checksum: 10/e90985d64777a00f4ab5f8c0bfea2fb5645c6bda5238840afa339c8a4f86f776e8ce83731155643a7425a0b27ce89077dab27b2f57519996ba4d2fe54cac1941
   languageName: node
   linkType: hard
 
-"rxjs@npm:7.8.1, rxjs@npm:^7.5.1, rxjs@npm:^7.5.5, rxjs@npm:^7.8.0":
+"rxjs@npm:7.8.1, rxjs@npm:^7.5.1, rxjs@npm:^7.5.5":
   version: 7.8.1
   resolution: "rxjs@npm:7.8.1"
   dependencies:
-    tslib: ^2.1.0
-  checksum: de4b53db1063e618ec2eca0f7965d9137cabe98cf6be9272efe6c86b47c17b987383df8574861bcced18ebd590764125a901d5506082be84a8b8e364bf05f119
+    tslib: "npm:^2.1.0"
+  checksum: 10/b10cac1a5258f885e9dd1b70d23c34daeb21b61222ee735d2ec40a8685bdca40429000703a44f0e638c27a684ac139e1c37e835d2a0dc16f6fc061a138ae3abb
   languageName: node
   linkType: hard
 
-"safe-array-concat@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "safe-array-concat@npm:1.0.1"
+"safe-array-concat@npm:^1.1.0":
+  version: 1.1.2
+  resolution: "safe-array-concat@npm:1.1.2"
   dependencies:
-    call-bind: ^1.0.2
-    get-intrinsic: ^1.2.1
-    has-symbols: ^1.0.3
-    isarray: ^2.0.5
-  checksum: 001ecf1d8af398251cbfabaf30ed66e3855127fbceee178179524b24160b49d15442f94ed6c0db0b2e796da76bb05b73bf3cc241490ec9c2b741b41d33058581
+    call-bind: "npm:^1.0.7"
+    get-intrinsic: "npm:^1.2.4"
+    has-symbols: "npm:^1.0.3"
+    isarray: "npm:^2.0.5"
+  checksum: 10/a54f8040d7cb696a1ee38d19cc71ab3cfb654b9b81bae00c6459618cfad8214ece7e6666592f9c925aafef43d0a20c5e6fbb3413a2b618e1ce9d516a2e6dcfc5
   languageName: node
   linkType: hard
 
 "safe-buffer@npm:5.1.1":
   version: 5.1.1
   resolution: "safe-buffer@npm:5.1.1"
-  checksum: 7f117b604554c9daca713be76cecc6c52932ed1dd6303638274f21319038bfd760fbfd353e526cc83f11894935bc4beb71f5b7b9478c11bf9718c0e0d94c51cb
+  checksum: 10/e8acac337b7d7e108fcfe2b8b2cb20952abb1ed11dc60968b7adffb19b9477893d44136987a420f90ff4d7a0a1a932f147b3a222f73001f59fb4822097a1616d
   languageName: node
   linkType: hard
 
 "safe-buffer@npm:5.1.2, safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1":
   version: 5.1.2
   resolution: "safe-buffer@npm:5.1.2"
-  checksum: f2f1f7943ca44a594893a852894055cf619c1fbcb611237fc39e461ae751187e7baf4dc391a72125e0ac4fb2d8c5c0b3c71529622e6a58f46b960211e704903c
+  checksum: 10/7eb5b48f2ed9a594a4795677d5a150faa7eb54483b2318b568dc0c4fc94092a6cce5be02c7288a0500a156282f5276d5688bce7259299568d1053b2150ef374a
   languageName: node
   linkType: hard
 
 "safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.2, safe-buffer@npm:~5.2.0":
   version: 5.2.1
   resolution: "safe-buffer@npm:5.2.1"
-  checksum: b99c4b41fdd67a6aaf280fcd05e9ffb0813654894223afb78a31f14a19ad220bba8aba1cb14eddce1fcfb037155fe6de4e861784eb434f7d11ed58d1e70dd491
+  checksum: 10/32872cd0ff68a3ddade7a7617b8f4c2ae8764d8b7d884c651b74457967a9e0e886267d3ecc781220629c44a865167b61c375d2da6c720c840ecd73f45d5d9451
   languageName: node
   linkType: hard
 
-"safe-regex-test@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "safe-regex-test@npm:1.0.0"
+"safe-regex-test@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "safe-regex-test@npm:1.0.3"
   dependencies:
-    call-bind: ^1.0.2
-    get-intrinsic: ^1.1.3
-    is-regex: ^1.1.4
-  checksum: bc566d8beb8b43c01b94e67de3f070fd2781685e835959bbbaaec91cc53381145ca91f69bd837ce6ec244817afa0a5e974fc4e40a2957f0aca68ac3add1ddd34
+    call-bind: "npm:^1.0.6"
+    es-errors: "npm:^1.3.0"
+    is-regex: "npm:^1.1.4"
+  checksum: 10/b04de61114b10274d92e25b6de7ccb5de07f11ea15637ff636de4b5190c0f5cd8823fe586dde718504cf78055437d70fd8804976894df502fcf5a210c970afb3
   languageName: node
   linkType: hard
 
 "safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0, safer-buffer@npm:^2.0.2, safer-buffer@npm:^2.1.0, safer-buffer@npm:~2.1.0":
   version: 2.1.2
   resolution: "safer-buffer@npm:2.1.2"
-  checksum: cab8f25ae6f1434abee8d80023d7e72b598cf1327164ddab31003c51215526801e40b66c5e65d658a0af1e9d6478cadcb4c745f4bd6751f97d8644786c0978b0
+  checksum: 10/7eaf7a0cf37cc27b42fb3ef6a9b1df6e93a1c6d98c6c6702b02fe262d5fcbd89db63320793b99b21cb5348097d0a53de81bd5f4e8b86e20cc9412e3f1cfb4e83
   languageName: node
   linkType: hard
 
-"sass-loader@npm:13.3.2":
-  version: 13.3.2
-  resolution: "sass-loader@npm:13.3.2"
+"sass-loader@npm:14.1.1":
+  version: 14.1.1
+  resolution: "sass-loader@npm:14.1.1"
   dependencies:
-    neo-async: ^2.6.2
+    neo-async: "npm:^2.6.2"
   peerDependencies:
-    fibers: ">= 3.1.0"
+    "@rspack/core": 0.x || 1.x
     node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
     sass: ^1.3.0
     sass-embedded: "*"
     webpack: ^5.0.0
   peerDependenciesMeta:
-    fibers:
+    "@rspack/core":
       optional: true
     node-sass:
       optional: true
@@ -26958,20 +28555,22 @@ __metadata:
       optional: true
     sass-embedded:
       optional: true
-  checksum: 7394a8d1b818a289b9caabd979543c907b83e28ae08bc80ccb836e0ccabc4ae574c077ab2fa520ba5fb8abb2ec3e7c9822a1cbd8c58a28ff30018be9d1dc6c27
+    webpack:
+      optional: true
+  checksum: 10/6cc0cb8143d04cb462c10efffbab86e9c4ea971bbdbc22d8c01f4ebf774fcf9b4fed775aaec6af23aeb7d440b37dce76cf6f2746ae36421d16ad4182f2220bc8
   languageName: node
   linkType: hard
 
-"sass@npm:1.69.4":
-  version: 1.69.4
-  resolution: "sass@npm:1.69.4"
+"sass@npm:1.72.0":
+  version: 1.72.0
+  resolution: "sass@npm:1.72.0"
   dependencies:
-    chokidar: ">=3.0.0 <4.0.0"
-    immutable: ^4.0.0
-    source-map-js: ">=0.6.2 <2.0.0"
+    chokidar: "npm:>=3.0.0 <4.0.0"
+    immutable: "npm:^4.0.0"
+    source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: ed5558445b59dfa711e094f804e4a360544dd916c069ee211e1c687446146721d91d4304f33fe5df3966a10de96eba43369beb2e14f0881c285424e5e44cf360
+  checksum: 10/637b002f9ca7888c4535a51819a3983a4638dd0a1f31aab817ae276b7fc2c3a7ab2a268d8249131810fbbd6d2cb9bd25d045008b01eda53c3ff8aa843850348d
   languageName: node
   linkType: hard
 
@@ -26979,8 +28578,8 @@ __metadata:
   version: 6.0.0
   resolution: "saxes@npm:6.0.0"
   dependencies:
-    xmlchars: ^2.2.0
-  checksum: d3fa3e2aaf6c65ed52ee993aff1891fc47d5e47d515164b5449cbf5da2cbdc396137e55590472e64c5c436c14ae64a8a03c29b9e7389fc6f14035cf4e982ef3b
+    xmlchars: "npm:^2.2.0"
+  checksum: 10/97b50daf6ca3a153e89842efa18a862e446248296622b7473c169c84c823ee8a16e4a43bac2f73f11fc8cb9168c73fbb0d73340f26552bac17970e9052367aa9
   languageName: node
   linkType: hard
 
@@ -26988,86 +28587,87 @@ __metadata:
   version: 0.23.0
   resolution: "scheduler@npm:0.23.0"
   dependencies:
-    loose-envify: ^1.1.0
-  checksum: d79192eeaa12abef860c195ea45d37cbf2bbf5f66e3c4dcd16f54a7da53b17788a70d109ee3d3dde1a0fd50e6a8fc171f4300356c5aee4fc0171de526bf35f8a
+    loose-envify: "npm:^1.1.0"
+  checksum: 10/0c4557aa37bafca44ff21dc0ea7c92e2dbcb298bc62eae92b29a39b029134f02fb23917d6ebc8b1fa536b4184934314c20d8864d156a9f6357f3398aaf7bfda8
   languageName: node
   linkType: hard
 
-"schema-utils@npm:^3.0.0, schema-utils@npm:^3.1.0, schema-utils@npm:^3.1.1, schema-utils@npm:^3.2.0":
+"schema-utils@npm:^3.0.0, schema-utils@npm:^3.1.1, schema-utils@npm:^3.2.0, schema-utils@npm:^3.3.0":
   version: 3.3.0
   resolution: "schema-utils@npm:3.3.0"
   dependencies:
-    "@types/json-schema": ^7.0.8
-    ajv: ^6.12.5
-    ajv-keywords: ^3.5.2
-  checksum: ea56971926fac2487f0757da939a871388891bc87c6a82220d125d587b388f1704788f3706e7f63a7b70e49fc2db974c41343528caea60444afd5ce0fe4b85c0
+    "@types/json-schema": "npm:^7.0.8"
+    ajv: "npm:^6.12.5"
+    ajv-keywords: "npm:^3.5.2"
+  checksum: 10/2c7bbb1da967fdfd320e6cea538949006ec6e8c13ea560a4f94ff2c56809a8486fa5ec419e023452501a6befe1ca381e409c2798c24f4993c7c4094d97fdb258
   languageName: node
   linkType: hard
 
-"schema-utils@npm:^4.0.0, schema-utils@npm:^4.0.1":
+"schema-utils@npm:^4.0.0, schema-utils@npm:^4.2.0":
   version: 4.2.0
   resolution: "schema-utils@npm:4.2.0"
   dependencies:
-    "@types/json-schema": ^7.0.9
-    ajv: ^8.9.0
-    ajv-formats: ^2.1.1
-    ajv-keywords: ^5.1.0
-  checksum: 26a0463d47683258106e6652e9aeb0823bf0b85843039e068b57da1892f7ae6b6b1094d48e9ed5ba5cbe9f7166469d880858b9d91abe8bd249421eb813850cde
+    "@types/json-schema": "npm:^7.0.9"
+    ajv: "npm:^8.9.0"
+    ajv-formats: "npm:^2.1.1"
+    ajv-keywords: "npm:^5.1.0"
+  checksum: 10/808784735eeb153ab7f3f787f840aa3bc63f423d2a5a7e96c9e70a0e53d0bc62d7b37ea396fc598ce19196e4fb86a72f897154b7c6ce2358bbc426166f205e14
   languageName: node
   linkType: hard
 
 "screenfull@npm:^5.1.0":
   version: 5.1.0
   resolution: "screenfull@npm:5.1.0"
-  checksum: e8ab486ba2310055aeabd84d8f76f1c9e729669942a4b1bdd675131333076ac9ee6655fb41c2507de3be93865e120cf3641e5ff636090f9e2458170827e650c7
+  checksum: 10/dc07fc03c346657a349ca14cf9420d74d44911288195a9d16054651337088602a4da662ecd5ffbd28926a5157063008fbbece38609c08e7c2d7399cc1384458e
   languageName: node
   linkType: hard
 
 "secure-compare@npm:3.0.1":
   version: 3.0.1
   resolution: "secure-compare@npm:3.0.1"
-  checksum: 0a8d8d3e54d5772d2cf1c02325f01fc7366d0bd33f964a08a84fe3ee5f34d46435a6ae729c1d239c750e160ef9b58c764d3efb945a1d07faf47978a8e4161594
+  checksum: 10/0a8d8d3e54d5772d2cf1c02325f01fc7366d0bd33f964a08a84fe3ee5f34d46435a6ae729c1d239c750e160ef9b58c764d3efb945a1d07faf47978a8e4161594
   languageName: node
   linkType: hard
 
 "select-hose@npm:^2.0.0":
   version: 2.0.0
   resolution: "select-hose@npm:2.0.0"
-  checksum: d7e5fcc695a4804209d232a1b18624a5134be334d4e1114b0721f7a5e72bd73da483dcf41528c1af4f4f4892ad7cfd6a1e55c8ffb83f9c9fe723b738db609dbb
+  checksum: 10/08cdd629a394d20e9005e7956f0624307c702cf950cc0458953e9b87ea961d3b1b72ac02266bdb93ac1eec4fcf42b41db9cabe93aa2b7683d71513d133c44fb5
   languageName: node
   linkType: hard
 
 "selection-is-backward@npm:^1.0.0":
   version: 1.0.0
   resolution: "selection-is-backward@npm:1.0.0"
-  checksum: 93b540811393816979d4798b4706433a15d64f892f59524e66473b5b239bfffd629a7bca490be32c6773c47286c513b74e97fb68a7bb5d98f3eac998b505e85a
+  checksum: 10/93b540811393816979d4798b4706433a15d64f892f59524e66473b5b239bfffd629a7bca490be32c6773c47286c513b74e97fb68a7bb5d98f3eac998b505e85a
   languageName: node
   linkType: hard
 
-"selecto@npm:1.26.0":
-  version: 1.26.0
-  resolution: "selecto@npm:1.26.0"
+"selecto@npm:1.26.3, selecto@npm:~1.26.3":
+  version: 1.26.3
+  resolution: "selecto@npm:1.26.3"
   dependencies:
-    "@daybrush/utils": ^1.13.0
-    "@egjs/children-differ": ^1.0.1
-    "@scena/dragscroll": ^1.4.0
-    "@scena/event-emitter": ^1.0.5
-    css-styled: ^1.0.8
-    css-to-mat: ^1.1.1
-    framework-utils: ^1.1.0
-    gesto: ^1.19.1
-    keycon: ^1.2.0
-    overlap-area: ^1.1.0
-  checksum: 401e1c2b47aa96ad2c7e9878278b70dfd4a71861fc4616f345088d3e1e20a3b33f6cb731e0015a8b9e85581c4edf896785e5cb9217802262c5a2d179d78e003d
+    "@daybrush/utils": "npm:^1.13.0"
+    "@egjs/children-differ": "npm:^1.0.1"
+    "@scena/dragscroll": "npm:^1.4.0"
+    "@scena/event-emitter": "npm:^1.0.5"
+    css-styled: "npm:^1.0.8"
+    css-to-mat: "npm:^1.1.1"
+    framework-utils: "npm:^1.1.0"
+    gesto: "npm:^1.19.4"
+    keycon: "npm:^1.2.0"
+    overlap-area: "npm:^1.1.0"
+  checksum: 10/05cb64c82af1d2c05e3b7c790a90a20a5393e5c5e69088e5e20377402b20efd7303c99ee45d9b2afefe33c71bc05f77b01ca4f987eb5d4bab9fcf9505efb25fc
   languageName: node
   linkType: hard
 
-"selfsigned@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "selfsigned@npm:2.1.1"
+"selfsigned@npm:^2.4.1":
+  version: 2.4.1
+  resolution: "selfsigned@npm:2.4.1"
   dependencies:
-    node-forge: ^1
-  checksum: aa9ce2150a54838978d5c0aee54d7ebe77649a32e4e690eb91775f71fdff773874a4fbafd0ac73d8ec3b702ff8a395c604df4f8e8868528f36fd6c15076fb43a
+    "@types/node-forge": "npm:^1.3.0"
+    node-forge: "npm:^1"
+  checksum: 10/52536623f1cfdeb2f8b9198377f2ce7931c677ea69421238d1dc1ea2983bbe258e56c19e7d1af87035cad7270f19b7e996eaab1212e724d887722502f68e17f2
   languageName: node
   linkType: hard
 
@@ -27076,18 +28676,18 @@ __metadata:
   resolution: "semver@npm:5.7.2"
   bin:
     semver: bin/semver
-  checksum: fb4ab5e0dd1c22ce0c937ea390b4a822147a9c53dbd2a9a0132f12fe382902beef4fbf12cf51bb955248d8d15874ce8cd89532569756384f994309825f10b686
+  checksum: 10/fca14418a174d4b4ef1fecb32c5941e3412d52a4d3d85165924ce3a47fbc7073372c26faf7484ceb4bbc2bde25880c6b97e492473dc7e9708fdfb1c6a02d546e
   languageName: node
   linkType: hard
 
-"semver@npm:7.5.4, semver@npm:7.x, semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.1, semver@npm:^7.5.3, semver@npm:^7.5.4":
-  version: 7.5.4
-  resolution: "semver@npm:7.5.4"
+"semver@npm:7.6.0, semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0":
+  version: 7.6.0
+  resolution: "semver@npm:7.6.0"
   dependencies:
-    lru-cache: ^6.0.0
+    lru-cache: "npm:^6.0.0"
   bin:
     semver: bin/semver.js
-  checksum: 12d8ad952fa353b0995bf180cdac205a4068b759a140e5d3c608317098b3575ac2f1e09182206bf2eb26120e1c0ed8fb92c48c592f6099680de56bb071423ca3
+  checksum: 10/1b41018df2d8aca5a1db4729985e8e20428c650daea60fcd16e926e9383217d00f574fab92d79612771884a98d2ee2a1973f49d630829a8d54d6570defe62535
   languageName: node
   linkType: hard
 
@@ -27096,7 +28696,7 @@ __metadata:
   resolution: "semver@npm:6.3.1"
   bin:
     semver: bin/semver.js
-  checksum: ae47d06de28836adb9d3e25f22a92943477371292d9b665fb023fae278d345d508ca1958232af086d85e0155aee22e313e100971898bbb8d5d89b8b1d4054ca2
+  checksum: 10/1ef3a85bd02a760c6ef76a45b8c1ce18226de40831e02a00bad78485390b98b6ccaa31046245fc63bba4a47a6a592b6c7eedc65cc47126e60489f9cc1ce3ed7e
   languageName: node
   linkType: hard
 
@@ -27104,20 +28704,20 @@ __metadata:
   version: 0.17.2
   resolution: "send@npm:0.17.2"
   dependencies:
-    debug: 2.6.9
-    depd: ~1.1.2
-    destroy: ~1.0.4
-    encodeurl: ~1.0.2
-    escape-html: ~1.0.3
-    etag: ~1.8.1
-    fresh: 0.5.2
-    http-errors: 1.8.1
-    mime: 1.6.0
-    ms: 2.1.3
-    on-finished: ~2.3.0
-    range-parser: ~1.2.1
-    statuses: ~1.5.0
-  checksum: c28f36deb4ccba9b8d6e6a1e472b8e7c40a1f51575bdf8f67303568cc9e71131faa3adc36fdb72611616ccad1584358bbe4c3ebf419e663ecc5de868ad3d3f03
+    debug: "npm:2.6.9"
+    depd: "npm:~1.1.2"
+    destroy: "npm:~1.0.4"
+    encodeurl: "npm:~1.0.2"
+    escape-html: "npm:~1.0.3"
+    etag: "npm:~1.8.1"
+    fresh: "npm:0.5.2"
+    http-errors: "npm:1.8.1"
+    mime: "npm:1.6.0"
+    ms: "npm:2.1.3"
+    on-finished: "npm:~2.3.0"
+    range-parser: "npm:~1.2.1"
+    statuses: "npm:~1.5.0"
+  checksum: 10/b1e4f9b99a5571626dad1d4401363f6107e245c84e91ccae221ab55fea4d1f12be1b9ef657235381e2b9d3a5840b8ceb4d20c9c322e85535b587b12676bc340c
   languageName: node
   linkType: hard
 
@@ -27125,26 +28725,17 @@ __metadata:
   version: 6.0.0
   resolution: "serialize-javascript@npm:6.0.0"
   dependencies:
-    randombytes: ^2.1.0
-  checksum: 56f90b562a1bdc92e55afb3e657c6397c01a902c588c0fe3d4c490efdcc97dcd2a3074ba12df9e94630f33a5ce5b76a74784a7041294628a6f4306e0ec84bf93
-  languageName: node
-  linkType: hard
-
-"serialize-javascript@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "serialize-javascript@npm:4.0.0"
-  dependencies:
-    randombytes: ^2.1.0
-  checksum: 3273b3394b951671fcf388726e9577021870dfbf85e742a1183fb2e91273e6101bdccea81ff230724f6659a7ee4cef924b0ff9baca32b79d9384ec37caf07302
+    randombytes: "npm:^2.1.0"
+  checksum: 10/ed3dabfbb565c48c9eb1ca8fe58f0d256902ab70a8a605be634ddd68388d5f728bb0bd1268e94fab628748ba8ad8392f01b05f3cbe1e4878b5c58c669fd3d1b4
   languageName: node
   linkType: hard
 
-"serialize-javascript@npm:^6.0.0, serialize-javascript@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "serialize-javascript@npm:6.0.1"
+"serialize-javascript@npm:^6.0.1, serialize-javascript@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "serialize-javascript@npm:6.0.2"
   dependencies:
-    randombytes: ^2.1.0
-  checksum: 3c4f4cb61d0893b988415bdb67243637333f3f574e9e9cc9a006a2ced0b390b0b3b44aef8d51c951272a9002ec50885eefdc0298891bc27eb2fe7510ea87dc4f
+    randombytes: "npm:^2.1.0"
+  checksum: 10/445a420a6fa2eaee4b70cbd884d538e259ab278200a2ededd73253ada17d5d48e91fb1f4cd224a236ab62ea7ba0a70c6af29fc93b4f3d3078bf7da1c031fde58
   languageName: node
   linkType: hard
 
@@ -27152,12 +28743,12 @@ __metadata:
   version: 2.5.0
   resolution: "serve-favicon@npm:2.5.0"
   dependencies:
-    etag: ~1.8.1
-    fresh: 0.5.2
-    ms: 2.1.1
-    parseurl: ~1.3.2
-    safe-buffer: 5.1.1
-  checksum: f4dd0fbee3b7e18d0a27ba6ba01d2f585f23f533010c9e8c74aad74615b19b12d8fbe714f14cb3579803f0bacecd67cdc858714cb56c6e28f8dd07ccc997aea4
+    etag: "npm:~1.8.1"
+    fresh: "npm:0.5.2"
+    ms: "npm:2.1.1"
+    parseurl: "npm:~1.3.2"
+    safe-buffer: "npm:5.1.1"
+  checksum: 10/dcb2734bf977a949a0a3bd50f2faf2893314101bdaa034c56baa4fba9bee2ab7f91a013d806b858c793fa50809170e907ced53c4e8ed1797fe0b472b5c6d9936
   languageName: node
   linkType: hard
 
@@ -27165,14 +28756,14 @@ __metadata:
   version: 1.9.1
   resolution: "serve-index@npm:1.9.1"
   dependencies:
-    accepts: ~1.3.4
-    batch: 0.6.1
-    debug: 2.6.9
-    escape-html: ~1.0.3
-    http-errors: ~1.6.2
-    mime-types: ~2.1.17
-    parseurl: ~1.3.2
-  checksum: e2647ce13379485b98a53ba2ea3fbad4d44b57540d00663b02b976e426e6194d62ac465c0d862cb7057f65e0de8ab8a684aa095427a4b8612412eca0d300d22f
+    accepts: "npm:~1.3.4"
+    batch: "npm:0.6.1"
+    debug: "npm:2.6.9"
+    escape-html: "npm:~1.0.3"
+    http-errors: "npm:~1.6.2"
+    mime-types: "npm:~2.1.17"
+    parseurl: "npm:~1.3.2"
+  checksum: 10/2adce2878d7e30f197e66f30e39f4a404d9ae39295c0c13849bb25e7cf976b93e883204739efd1510559588bed56f8101e32191cbe75f374c6e1e803852194cb
   languageName: node
   linkType: hard
 
@@ -27180,25 +28771,32 @@ __metadata:
   version: 1.14.2
   resolution: "serve-static@npm:1.14.2"
   dependencies:
-    encodeurl: ~1.0.2
-    escape-html: ~1.0.3
-    parseurl: ~1.3.3
-    send: 0.17.2
-  checksum: d97f3183b1dfcd8ce9c0e37e18e87fd31147ed6c8ee0b2c3a089d795e44ee851ca5061db01574f806d54f4e4b70bc694d9ca64578653514e04a28cbc97a1de05
+    encodeurl: "npm:~1.0.2"
+    escape-html: "npm:~1.0.3"
+    parseurl: "npm:~1.3.3"
+    send: "npm:0.17.2"
+  checksum: 10/b84f9d58b07db2e4d6b1f60e60a27839f5247331b9bbfa1a90eda3523d8bc58585c914e069e785bb2645668e0b9cdd1a305bc1aa81c4284f5ead103741bb705c
   languageName: node
   linkType: hard
 
 "set-blocking@npm:^2.0.0, set-blocking@npm:~2.0.0":
   version: 2.0.0
   resolution: "set-blocking@npm:2.0.0"
-  checksum: 6e65a05f7cf7ebdf8b7c75b101e18c0b7e3dff4940d480efed8aad3a36a4005140b660fa1d804cb8bce911cac290441dc728084a30504d3516ac2ff7ad607b02
+  checksum: 10/8980ebf7ae9eb945bb036b6e283c547ee783a1ad557a82babf758a065e2fb6ea337fd82cac30dd565c1e606e423f30024a19fff7afbf4977d784720c4026a8ef
   languageName: node
   linkType: hard
 
-"set-cookie-parser@npm:^2.4.6":
-  version: 2.5.1
-  resolution: "set-cookie-parser@npm:2.5.1"
-  checksum: b99c37f976e68ae6eb7c758bf2bbce1e60bb54e3eccedaa25f2da45b77b9cab58d90674cf9edd7aead6fbeac6308f2eb48713320a47ca120d0e838d0194513b6
+"set-function-length@npm:^1.2.1":
+  version: 1.2.2
+  resolution: "set-function-length@npm:1.2.2"
+  dependencies:
+    define-data-property: "npm:^1.1.4"
+    es-errors: "npm:^1.3.0"
+    function-bind: "npm:^1.1.2"
+    get-intrinsic: "npm:^1.2.4"
+    gopd: "npm:^1.0.1"
+    has-property-descriptors: "npm:^1.0.2"
+  checksum: 10/505d62b8e088468917ca4e3f8f39d0e29f9a563b97dbebf92f4bd2c3172ccfb3c5b8e4566d5fcd00784a00433900e7cb8fbc404e2dbd8c3818ba05bb9d4a8a6d
   languageName: node
   linkType: hard
 
@@ -27206,31 +28804,31 @@ __metadata:
   version: 2.0.1
   resolution: "set-function-name@npm:2.0.1"
   dependencies:
-    define-data-property: ^1.0.1
-    functions-have-names: ^1.2.3
-    has-property-descriptors: ^1.0.0
-  checksum: 4975d17d90c40168eee2c7c9c59d023429f0a1690a89d75656306481ece0c3c1fb1ebcc0150ea546d1913e35fbd037bace91372c69e543e51fc5d1f31a9fa126
+    define-data-property: "npm:^1.0.1"
+    functions-have-names: "npm:^1.2.3"
+    has-property-descriptors: "npm:^1.0.0"
+  checksum: 10/4975d17d90c40168eee2c7c9c59d023429f0a1690a89d75656306481ece0c3c1fb1ebcc0150ea546d1913e35fbd037bace91372c69e543e51fc5d1f31a9fa126
   languageName: node
   linkType: hard
 
 "set-harmonic-interval@npm:^1.0.1":
   version: 1.0.1
   resolution: "set-harmonic-interval@npm:1.0.1"
-  checksum: c122b831c2e0b1fb812e5e9d065094b9d174bd0576f9a779ab7a7d8881c8f6dd7d5fcab9a2553da15eea670eb598f9dd4d5162b626d45cc9c529706aa1444a84
+  checksum: 10/14b9ce98625af9e0d80165a5c8ceb76ce1206df641197e020780e570f268f5427961138d3f47591962e2626b498a051a4488eaa646e5473373f843d7e9e468d4
   languageName: node
   linkType: hard
 
 "setprototypeof@npm:1.1.0":
   version: 1.1.0
   resolution: "setprototypeof@npm:1.1.0"
-  checksum: 27cb44304d6c9e1a23bc6c706af4acaae1a7aa1054d4ec13c05f01a99fd4887109a83a8042b67ad90dbfcd100d43efc171ee036eb080667172079213242ca36e
+  checksum: 10/02d2564e02a260551bab3ec95358dcfde775fe61272b1b7c488de3676a4bb79f280b5668a324aebe0ec73f0d8ba408bc2d816a609ee5d93b1a7936b9d4ba1208
   languageName: node
   linkType: hard
 
 "setprototypeof@npm:1.2.0":
   version: 1.2.0
   resolution: "setprototypeof@npm:1.2.0"
-  checksum: be18cbbf70e7d8097c97f713a2e76edf84e87299b40d085c6bf8b65314e994cc15e2e317727342fa6996e38e1f52c59720b53fe621e2eb593a6847bf0356db89
+  checksum: 10/fde1630422502fbbc19e6844346778f99d449986b2f9cdcceb8326730d2f3d9964dbcb03c02aaadaefffecd0f2c063315ebea8b3ad895914bf1afc1747fc172e
   languageName: node
   linkType: hard
 
@@ -27238,15 +28836,15 @@ __metadata:
   version: 3.0.1
   resolution: "shallow-clone@npm:3.0.1"
   dependencies:
-    kind-of: ^6.0.2
-  checksum: 39b3dd9630a774aba288a680e7d2901f5c0eae7b8387fc5c8ea559918b29b3da144b7bdb990d7ccd9e11be05508ac9e459ce51d01fd65e583282f6ffafcba2e7
+    kind-of: "npm:^6.0.2"
+  checksum: 10/e066bd540cfec5e1b0f78134853e0d892d1c8945fb9a926a579946052e7cb0c70ca4fc34f875a8083aa7910d751805d36ae64af250a6de6f3d28f9fa7be6c21b
   languageName: node
   linkType: hard
 
 "shallowequal@npm:^1.1.0":
   version: 1.1.0
   resolution: "shallowequal@npm:1.1.0"
-  checksum: f4c1de0837f106d2dbbfd5d0720a5d059d1c66b42b580965c8f06bb1db684be8783538b684092648c981294bf817869f743a066538771dbecb293df78f765e00
+  checksum: 10/f4c1de0837f106d2dbbfd5d0720a5d059d1c66b42b580965c8f06bb1db684be8783538b684092648c981294bf817869f743a066538771dbecb293df78f765e00
   languageName: node
   linkType: hard
 
@@ -27254,29 +28852,29 @@ __metadata:
   version: 2.0.0
   resolution: "shebang-command@npm:2.0.0"
   dependencies:
-    shebang-regex: ^3.0.0
-  checksum: 6b52fe87271c12968f6a054e60f6bde5f0f3d2db483a1e5c3e12d657c488a15474121a1d55cd958f6df026a54374ec38a4a963988c213b7570e1d51575cea7fa
+    shebang-regex: "npm:^3.0.0"
+  checksum: 10/6b52fe87271c12968f6a054e60f6bde5f0f3d2db483a1e5c3e12d657c488a15474121a1d55cd958f6df026a54374ec38a4a963988c213b7570e1d51575cea7fa
   languageName: node
   linkType: hard
 
 "shebang-regex@npm:^3.0.0":
   version: 3.0.0
   resolution: "shebang-regex@npm:3.0.0"
-  checksum: 1a2bcae50de99034fcd92ad4212d8e01eedf52c7ec7830eedcf886622804fe36884278f2be8be0ea5fde3fd1c23911643a4e0f726c8685b61871c8908af01222
+  checksum: 10/1a2bcae50de99034fcd92ad4212d8e01eedf52c7ec7830eedcf886622804fe36884278f2be8be0ea5fde3fd1c23911643a4e0f726c8685b61871c8908af01222
   languageName: node
   linkType: hard
 
-"shell-quote@npm:^1.7.3":
+"shell-quote@npm:^1.8.1":
   version: 1.8.1
   resolution: "shell-quote@npm:1.8.1"
-  checksum: 5f01201f4ef504d4c6a9d0d283fa17075f6770bfbe4c5850b074974c68062f37929ca61700d95ad2ac8822e14e8c4b990ca0e6e9272e64befd74ce5e19f0736b
+  checksum: 10/af19ab5a1ec30cb4b2f91fd6df49a7442d5c4825a2e269b3712eded10eedd7f9efeaab96d57829880733fc55bcdd8e9b1d8589b4befb06667c731d08145e274d
   languageName: node
   linkType: hard
 
 "shellwords@npm:^0.1.1":
   version: 0.1.1
   resolution: "shellwords@npm:0.1.1"
-  checksum: 8d73a5e9861f5e5f1068e2cfc39bc0002400fe58558ab5e5fa75630d2c3adf44ca1fac81957609c8320d5533e093802fcafc72904bf1a32b95de3c19a0b1c0d4
+  checksum: 10/c122808ca53c828747ee69503755a5d35d8c1493e943d15ebfd6fe028517ec1af6f8a4c2dc9d995b0df75bd4246382c0dd2dc792a82ce5a6448307a643fc5a38
   languageName: node
   linkType: hard
 
@@ -27284,42 +28882,64 @@ __metadata:
   version: 1.0.4
   resolution: "side-channel@npm:1.0.4"
   dependencies:
-    call-bind: ^1.0.0
-    get-intrinsic: ^1.0.2
-    object-inspect: ^1.9.0
-  checksum: 351e41b947079c10bd0858364f32bb3a7379514c399edb64ab3dce683933483fc63fb5e4efe0a15a2e8a7e3c436b6a91736ddb8d8c6591b0460a24bb4a1ee245
+    call-bind: "npm:^1.0.0"
+    get-intrinsic: "npm:^1.0.2"
+    object-inspect: "npm:^1.9.0"
+  checksum: 10/c4998d9fc530b0e75a7fd791ad868fdc42846f072734f9080ff55cc8dc7d3899abcda24fd896aa6648c3ab7021b4bb478073eb4f44dfd55bce9714bc1a7c5d45
   languageName: node
   linkType: hard
 
-"signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7":
+"signal-exit@npm:3.0.7, signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7":
   version: 3.0.7
   resolution: "signal-exit@npm:3.0.7"
-  checksum: a2f098f247adc367dffc27845853e9959b9e88b01cb301658cfe4194352d8d2bb32e18467c786a7fe15f1d44b233ea35633d076d5e737870b7139949d1ab6318
+  checksum: 10/a2f098f247adc367dffc27845853e9959b9e88b01cb301658cfe4194352d8d2bb32e18467c786a7fe15f1d44b233ea35633d076d5e737870b7139949d1ab6318
   languageName: node
   linkType: hard
 
-"signal-exit@npm:^4.0.1":
-  version: 4.0.2
-  resolution: "signal-exit@npm:4.0.2"
-  checksum: 41f5928431cc6e91087bf0343db786a6313dd7c6fd7e551dbc141c95bb5fb26663444fd9df8ea47c5d7fc202f60aa7468c3162a9365cbb0615fc5e1b1328fe31
+"signal-exit@npm:^4.0.1, signal-exit@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "signal-exit@npm:4.1.0"
+  checksum: 10/c9fa63bbbd7431066174a48ba2dd9986dfd930c3a8b59de9c29d7b6854ec1c12a80d15310869ea5166d413b99f041bfa3dd80a7947bcd44ea8e6eb3ffeabfa1f
   languageName: node
   linkType: hard
 
-"simple-git@npm:^3.6.0":
-  version: 3.16.0
-  resolution: "simple-git@npm:3.16.0"
+"sigstore@npm:^1.4.0":
+  version: 1.9.0
+  resolution: "sigstore@npm:1.9.0"
   dependencies:
-    "@kwsites/file-exists": ^1.1.1
-    "@kwsites/promise-deferred": ^1.1.1
-    debug: ^4.3.4
-  checksum: fd28eb43be39d158d2c321cd34eb00f61c365513478ff2bb31f4da06315dcd018e03c6ece9f99558f3fd8834171072850aed1376bf50f8d922b0e2dadede0c2d
+    "@sigstore/bundle": "npm:^1.1.0"
+    "@sigstore/protobuf-specs": "npm:^0.2.0"
+    "@sigstore/sign": "npm:^1.0.0"
+    "@sigstore/tuf": "npm:^1.0.3"
+    make-fetch-happen: "npm:^11.0.1"
+  bin:
+    sigstore: bin/sigstore.js
+  checksum: 10/7ff59f6bbc6fbf4e11f99df36562cdfd8f27f74650e1794942b0f9b567c6facdd0a6c245375111c464a0c367e617793a1c1787ec1dea9784ad2fb698932b9fb9
   languageName: node
   linkType: hard
 
-"simple-is@npm:~0.2.0":
-  version: 0.2.0
-  resolution: "simple-is@npm:0.2.0"
-  checksum: 9ab19289a1da9551f91715f4ae838790c13752ccf7e8b7dce69e4b056f4ab7c2b13486fe987ab00c01294cb33a63bb08fd66a1a4170c70fcc6d3a310bf406e8c
+"sigstore@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "sigstore@npm:2.2.0"
+  dependencies:
+    "@sigstore/bundle": "npm:^2.1.1"
+    "@sigstore/core": "npm:^0.2.0"
+    "@sigstore/protobuf-specs": "npm:^0.2.1"
+    "@sigstore/sign": "npm:^2.2.1"
+    "@sigstore/tuf": "npm:^2.3.0"
+    "@sigstore/verify": "npm:^0.1.0"
+  checksum: 10/d8e1fda202d2572b3bfa3eded15c9b826429187f52a287549074645670778cbdb78111cb8e3d0274f051838ee500db382be6124c45068985d095df54a3a0bd74
+  languageName: node
+  linkType: hard
+
+"simple-git@npm:^3.6.0":
+  version: 3.16.0
+  resolution: "simple-git@npm:3.16.0"
+  dependencies:
+    "@kwsites/file-exists": "npm:^1.1.1"
+    "@kwsites/promise-deferred": "npm:^1.1.1"
+    debug: "npm:^4.3.4"
+  checksum: 10/b1c4b187bff2964bab47fd1b683ece275a599e9a466f7e2689ee1fea0360f7d13228e934d66095c911e7e8b57ab5f2526e3deeeb6e4d0c03e4d5f12f7ef03cd9
   languageName: node
   linkType: hard
 
@@ -27327,40 +28947,40 @@ __metadata:
   version: 2.0.0
   resolution: "simple-update-notifier@npm:2.0.0"
   dependencies:
-    semver: ^7.5.3
-  checksum: 9ba00d38ce6a29682f64a46213834e4eb01634c2f52c813a9a7b8873ca49cdbb703696f3290f3b27dc067de6d9418b0b84bef22c3eb074acf352529b2d6c27fd
+    semver: "npm:^7.5.3"
+  checksum: 10/40bd4f96aa89aedbf717ae9f4ab8fca70e8f7511e8b766feb15471cca3f6fe4fe673743309b08b4ba8abfe0965c9cd927e1de46550a757b819b70fc7430cc85d
   languageName: node
   linkType: hard
 
-"sirv@npm:^1.0.7":
-  version: 1.0.18
-  resolution: "sirv@npm:1.0.18"
+"sirv@npm:^2.0.3":
+  version: 2.0.4
+  resolution: "sirv@npm:2.0.4"
   dependencies:
-    "@polka/url": ^1.0.0-next.20
-    mime: ^2.3.1
-    totalist: ^1.0.0
-  checksum: 0839036255d121a6396f9496fb7d285628e4986f3c1febca7b7c6d675fc15305050e3278ab249213c5af332be6178f992aaf42573d9d583ef3ae203b6d1fff2a
+    "@polka/url": "npm:^1.0.0-next.24"
+    mrmime: "npm:^2.0.0"
+    totalist: "npm:^3.0.0"
+  checksum: 10/24f42cf06895017e589c9d16fc3f1c6c07fe8b0dbafce8a8b46322cfba67b7f2498610183954cb0e9d089c8cb60002a7ee7e8bca6a91a0d7042bfbc3473c95c3
   languageName: node
   linkType: hard
 
 "sisteransi@npm:^1.0.5":
   version: 1.0.5
   resolution: "sisteransi@npm:1.0.5"
-  checksum: aba6438f46d2bfcef94cf112c835ab395172c75f67453fe05c340c770d3c402363018ae1ab4172a1026a90c47eaccf3af7b6ff6fa749a680c2929bd7fa2b37a4
+  checksum: 10/aba6438f46d2bfcef94cf112c835ab395172c75f67453fe05c340c770d3c402363018ae1ab4172a1026a90c47eaccf3af7b6ff6fa749a680c2929bd7fa2b37a4
   languageName: node
   linkType: hard
 
-"slash@npm:^3.0.0":
+"slash@npm:3.0.0, slash@npm:^3.0.0":
   version: 3.0.0
   resolution: "slash@npm:3.0.0"
-  checksum: 94a93fff615f25a999ad4b83c9d5e257a7280c90a32a7cb8b4a87996e4babf322e469c42b7f649fd5796edd8687652f3fb452a86dc97a816f01113183393f11c
+  checksum: 10/94a93fff615f25a999ad4b83c9d5e257a7280c90a32a7cb8b4a87996e4babf322e469c42b7f649fd5796edd8687652f3fb452a86dc97a816f01113183393f11c
   languageName: node
   linkType: hard
 
-"slash@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "slash@npm:4.0.0"
-  checksum: da8e4af73712253acd21b7853b7e0dbba776b786e82b010a5bfc8b5051a1db38ed8aba8e1e8f400dd2c9f373be91eb1c42b66e91abb407ff42b10feece5e1d2d
+"slash@npm:^5.0.0, slash@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "slash@npm:5.1.0"
+  checksum: 10/2c41ec6fb1414cd9bba0fa6b1dd00e8be739e3fe85d079c69d4b09ca5f2f86eafd18d9ce611c0c0f686428638a36c272a6ac14799146a8295f259c10cc45cde4
   languageName: node
   linkType: hard
 
@@ -27368,10 +28988,10 @@ __metadata:
   version: 0.2.115
   resolution: "slate-base64-serializer@npm:0.2.115"
   dependencies:
-    isomorphic-base64: ^1.0.2
+    isomorphic-base64: "npm:^1.0.2"
   peerDependencies:
     slate: ">=0.32.0 <0.50.0"
-  checksum: 5bccd52d71a6f8ff877c12a4d6d6ed4b3e65de1c1bed828fcd24dbaec46c7caac2ab5dc559d64ed66c8943780ca40e444c26aaf0f3cea55725a92187bc2ea689
+  checksum: 10/5bccd52d71a6f8ff877c12a4d6d6ed4b3e65de1c1bed828fcd24dbaec46c7caac2ab5dc559d64ed66c8943780ca40e444c26aaf0f3cea55725a92187bc2ea689
   languageName: node
   linkType: hard
 
@@ -27379,8 +28999,8 @@ __metadata:
   version: 0.2.5
   resolution: "slate-dev-environment@npm:0.2.5"
   dependencies:
-    is-in-browser: ^1.1.3
-  checksum: 3a94d855a5c50f650f38c93741700d1e840eb923c79a3b1e01a5e7ca347944662099dc5773521c84ee939cb156ccc27af7e39ecb79d3d9e2ddfcfe3ead312073
+    is-in-browser: "npm:^1.1.3"
+  checksum: 10/dce57027a1f2a41262096c48fecb83e27f7f4f98c0b889376f5d67e1ad141a0a1663b18928191e9663919b477e70fdbaa28a7736741f07bb257d06dfce77bbc8
   languageName: node
   linkType: hard
 
@@ -27388,8 +29008,8 @@ __metadata:
   version: 0.2.5
   resolution: "slate-dev-environment@patch:slate-dev-environment@npm%3A0.2.5#.yarn/patches/slate-dev-environment-npm-0.2.5-9aeb7da7b5.patch::version=0.2.5&hash=18ffc0&locator=grafana%40workspace%3A."
   dependencies:
-    is-in-browser: ^1.1.3
-  checksum: 1be7514ac0b10b0232f3c19e02bf5f9211850e119a235743fd46ab2f182c8b892dc58edf40130308d85d14f755b348b86ab2daea757e8ee0beb74746f653fc03
+    is-in-browser: "npm:^1.1.3"
+  checksum: 10/ec235f5513ca5a76db86ec71ba3b8f11dfc1ac06d9a466c9b0f7f5da893d0a64dac556cd1e17feb3d381222aac3b4acc3e4d06cbb81bafbdb1063a7c30370bf7
   languageName: node
   linkType: hard
 
@@ -27397,9 +29017,9 @@ __metadata:
   version: 0.2.11
   resolution: "slate-hotkeys@npm:0.2.11"
   dependencies:
-    is-hotkey: 0.1.4
-    slate-dev-environment: ^0.2.2
-  checksum: e8c77e46924289be71d12745f0cf4b6f0f995f524f408a9830decaba5bde9fad107b803176f7b8ea0236008c3e06d28c2ec475a5e443c1315a32bcf980dea6b2
+    is-hotkey: "npm:0.1.4"
+    slate-dev-environment: "npm:^0.2.2"
+  checksum: 10/302c0186b4483fe33fd6d7001f9526c9a3a9706ff5ceaa0dcd0a74bea08a27d29a612b03512a7dcf29a5693d417515bf021d8b75788b4147c6d2cb7850c3c0ac
   languageName: node
   linkType: hard
 
@@ -27409,7 +29029,7 @@ __metadata:
   peerDependencies:
     immutable: ">=3.8.1"
     slate: ">=0.46.0 <0.50.0"
-  checksum: 835a8c2a09cb3c091f9b900c2c2728731496c953d6183194d47a8ea62dfd45107dbde18f974070502182139f4ffc2a289b5e95a9d32654d2386cc64adbf985ee
+  checksum: 10/835a8c2a09cb3c091f9b900c2c2728731496c953d6183194d47a8ea62dfd45107dbde18f974070502182139f4ffc2a289b5e95a9d32654d2386cc64adbf985ee
   languageName: node
   linkType: hard
 
@@ -27419,7 +29039,7 @@ __metadata:
   peerDependencies:
     immutable: ">=3.8.1"
     slate: ">=0.32.0 <0.50.0"
-  checksum: 6ef3632255383ef3a8a13e0f52c191a7b1d23064bf5f14f8f316555f2d63ac32dc9e8d429fa742ce7219caa32e69a9163d24f36d5c6789d1c9b14a4158eea339
+  checksum: 10/6ef3632255383ef3a8a13e0f52c191a7b1d23064bf5f14f8f316555f2d63ac32dc9e8d429fa742ce7219caa32e69a9163d24f36d5c6789d1c9b14a4158eea339
   languageName: node
   linkType: hard
 
@@ -27430,7 +29050,7 @@ __metadata:
     react: ">=16.0.0"
     slate: ">=0.47.0"
     slate-react: ">=0.22.0"
-  checksum: 34b9cd299bda66031ad6d88e63748439e4ad47a4dfddef04ebf47d8e3afbf3be9fb5e8ca923ef719e7c9f8627af4d3faf764c858b68761e376c0f3daeab705f8
+  checksum: 10/34b9cd299bda66031ad6d88e63748439e4ad47a4dfddef04ebf47d8e3afbf3be9fb5e8ca923ef719e7c9f8627af4d3faf764c858b68761e376c0f3daeab705f8
   languageName: node
   linkType: hard
 
@@ -27438,28 +29058,28 @@ __metadata:
   version: 0.22.10
   resolution: "slate-react@npm:0.22.10"
   dependencies:
-    debug: ^3.1.0
-    get-window: ^1.1.1
-    is-window: ^1.0.2
-    lodash: ^4.1.1
-    memoize-one: ^4.0.0
-    prop-types: ^15.5.8
-    react-immutable-proptypes: ^2.1.0
-    selection-is-backward: ^1.0.0
-    slate-base64-serializer: ^0.2.112
-    slate-dev-environment: ^0.2.2
-    slate-hotkeys: ^0.2.9
-    slate-plain-serializer: ^0.7.11
-    slate-prop-types: ^0.5.42
-    slate-react-placeholder: ^0.2.9
-    tiny-invariant: ^1.0.1
-    tiny-warning: ^0.0.3
+    debug: "npm:^3.1.0"
+    get-window: "npm:^1.1.1"
+    is-window: "npm:^1.0.2"
+    lodash: "npm:^4.1.1"
+    memoize-one: "npm:^4.0.0"
+    prop-types: "npm:^15.5.8"
+    react-immutable-proptypes: "npm:^2.1.0"
+    selection-is-backward: "npm:^1.0.0"
+    slate-base64-serializer: "npm:^0.2.112"
+    slate-dev-environment: "npm:^0.2.2"
+    slate-hotkeys: "npm:^0.2.9"
+    slate-plain-serializer: "npm:^0.7.11"
+    slate-prop-types: "npm:^0.5.42"
+    slate-react-placeholder: "npm:^0.2.9"
+    tiny-invariant: "npm:^1.0.1"
+    tiny-warning: "npm:^0.0.3"
   peerDependencies:
     immutable: ">=3.8.1 || >4.0.0-rc"
     react: ">=16.6.0"
     react-dom: ">=16.6.0"
     slate: ">=0.47.0"
-  checksum: 1ecddaf0f635205249680961d7e772cf25a60179b39ca69a34f874b2797e3c122ef405921fa2787ea0c559af48d1d79f10d7e169749f0f084c6bf366aeffdfc8
+  checksum: 10/f2567ff451a0064d44bd5153f30f24e70bdeea5ad5345f48d82ba58a4b9db2d8c55a6f269aa1e6358831f514fd782b1337c2c6258f1055b51788c27bff3dd22e
   languageName: node
   linkType: hard
 
@@ -27467,17 +29087,17 @@ __metadata:
   version: 0.47.9
   resolution: "slate@npm:0.47.9"
   dependencies:
-    debug: ^3.1.0
-    direction: ^0.1.5
-    esrever: ^0.2.0
-    is-plain-object: ^2.0.4
-    lodash: ^4.17.4
-    tiny-invariant: ^1.0.1
-    tiny-warning: ^0.0.3
-    type-of: ^2.0.1
+    debug: "npm:^3.1.0"
+    direction: "npm:^0.1.5"
+    esrever: "npm:^0.2.0"
+    is-plain-object: "npm:^2.0.4"
+    lodash: "npm:^4.17.4"
+    tiny-invariant: "npm:^1.0.1"
+    tiny-warning: "npm:^0.0.3"
+    type-of: "npm:^2.0.1"
   peerDependencies:
     immutable: ">=3.8.1 || >4.0.0-rc"
-  checksum: a128d1eaa4c203dbb13d197d69758341df485e42e52aea1739d05939b16df42633949f116ae9b75b95b647ec39b18867ca5c8a05dbe97eeb15cf31bc8d2edc7f
+  checksum: 10/d1c66218d8c562f2ee17d9c79a7b985423855e4529252ebdf85f570ad46783f7a133c0ee274fb2fda1a7164571fd49d8bfd5fda0e0d89dbb49d3510b2b385c45
   languageName: node
   linkType: hard
 
@@ -27485,10 +29105,10 @@ __metadata:
   version: 3.0.0
   resolution: "slice-ansi@npm:3.0.0"
   dependencies:
-    ansi-styles: ^4.0.0
-    astral-regex: ^2.0.0
-    is-fullwidth-code-point: ^3.0.0
-  checksum: 5ec6d022d12e016347e9e3e98a7eb2a592213a43a65f1b61b74d2c78288da0aded781f665807a9f3876b9daa9ad94f64f77d7633a0458876c3a4fdc4eb223f24
+    ansi-styles: "npm:^4.0.0"
+    astral-regex: "npm:^2.0.0"
+    is-fullwidth-code-point: "npm:^3.0.0"
+  checksum: 10/5ec6d022d12e016347e9e3e98a7eb2a592213a43a65f1b61b74d2c78288da0aded781f665807a9f3876b9daa9ad94f64f77d7633a0458876c3a4fdc4eb223f24
   languageName: node
   linkType: hard
 
@@ -27496,17 +29116,34 @@ __metadata:
   version: 4.0.0
   resolution: "slice-ansi@npm:4.0.0"
   dependencies:
-    ansi-styles: ^4.0.0
-    astral-regex: ^2.0.0
-    is-fullwidth-code-point: ^3.0.0
-  checksum: 4a82d7f085b0e1b070e004941ada3c40d3818563ac44766cca4ceadd2080427d337554f9f99a13aaeb3b4a94d9964d9466c807b3d7b7541d1ec37ee32d308756
+    ansi-styles: "npm:^4.0.0"
+    astral-regex: "npm:^2.0.0"
+    is-fullwidth-code-point: "npm:^3.0.0"
+  checksum: 10/4a82d7f085b0e1b070e004941ada3c40d3818563ac44766cca4ceadd2080427d337554f9f99a13aaeb3b4a94d9964d9466c807b3d7b7541d1ec37ee32d308756
   languageName: node
   linkType: hard
 
 "smart-buffer@npm:^4.2.0":
   version: 4.2.0
   resolution: "smart-buffer@npm:4.2.0"
-  checksum: b5167a7142c1da704c0e3af85c402002b597081dd9575031a90b4f229ca5678e9a36e8a374f1814c8156a725d17008ae3bde63b92f9cfd132526379e580bec8b
+  checksum: 10/927484aa0b1640fd9473cee3e0a0bcad6fce93fd7bbc18bac9ad0c33686f5d2e2c422fba24b5899c184524af01e11dd2bd051c2bf2b07e47aff8ca72cbfc60d2
+  languageName: node
+  linkType: hard
+
+"smob@npm:^1.0.0":
+  version: 1.4.1
+  resolution: "smob@npm:1.4.1"
+  checksum: 10/bc6ffcb9a1c3c875f9354cf814487d44cd925e2917683e2bf6f66a267eedf895f4989079541b73dc0ddc163cb0fa26078fa95067f1503707758437e9308afc2f
+  languageName: node
+  linkType: hard
+
+"snake-case@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "snake-case@npm:3.0.4"
+  dependencies:
+    dot-case: "npm:^3.0.4"
+    tslib: "npm:^2.0.3"
+  checksum: 10/0a7a79900bbb36f8aaa922cf111702a3647ac6165736d5dc96d3ef367efc50465cac70c53cd172c382b022dac72ec91710608e5393de71f76d7142e6fd80e8a3
   languageName: node
   linkType: hard
 
@@ -27514,10 +29151,10 @@ __metadata:
   version: 0.3.24
   resolution: "sockjs@npm:0.3.24"
   dependencies:
-    faye-websocket: ^0.11.3
-    uuid: ^8.3.2
-    websocket-driver: ^0.7.4
-  checksum: 355309b48d2c4e9755349daa29cea1c0d9ee23e49b983841c6bf7a20276b00d3c02343f9f33f26d2ee8b261a5a02961b52a25c8da88b2538c5b68d3071b4934c
+    faye-websocket: "npm:^0.11.3"
+    uuid: "npm:^8.3.2"
+    websocket-driver: "npm:^0.7.4"
+  checksum: 10/36312ec9772a0e536b69b72e9d1c76bd3d6ecf885c5d8fd6e59811485c916b8ce75f46ec57532f436975815ee14aa9a0e22ae3d9e5c0b18ea37b56d0aaaf439c
   languageName: node
   linkType: hard
 
@@ -27525,10 +29162,10 @@ __metadata:
   version: 6.1.0
   resolution: "socks-proxy-agent@npm:6.1.0"
   dependencies:
-    agent-base: ^6.0.2
-    debug: ^4.3.1
-    socks: ^2.6.1
-  checksum: 32ea0d62c848b5c246955e8d6c34832fe6cd8c5f3b66f5ace3a9bd7387bafae3e67d96474d41291723ba7135e2da46d65e008a8a35a793dfa5cb0f4ac05429df
+    agent-base: "npm:^6.0.2"
+    debug: "npm:^4.3.1"
+    socks: "npm:^2.6.1"
+  checksum: 10/7e7116590c70c1f39362f644f5b752e304e526cda7e56d92ce901520e4eddfe21a560af530b51d71c422c24bdb8c3b8c132245fd8720c725d934ead56a793158
   languageName: node
   linkType: hard
 
@@ -27536,34 +29173,45 @@ __metadata:
   version: 7.0.0
   resolution: "socks-proxy-agent@npm:7.0.0"
   dependencies:
-    agent-base: ^6.0.2
-    debug: ^4.3.3
-    socks: ^2.6.2
-  checksum: 720554370154cbc979e2e9ce6a6ec6ced205d02757d8f5d93fe95adae454fc187a5cbfc6b022afab850a5ce9b4c7d73e0f98e381879cf45f66317a4895953846
+    agent-base: "npm:^6.0.2"
+    debug: "npm:^4.3.3"
+    socks: "npm:^2.6.2"
+  checksum: 10/26c75d9c62a9ed3fd494df60e65e88da442f78e0d4bc19bfd85ac37bd2c67470d6d4bba5202e804561cda6674db52864c9e2a2266775f879bc8d89c1445a5f4c
   languageName: node
   linkType: hard
 
-"socks@npm:^2.6.1, socks@npm:^2.6.2":
-  version: 2.6.2
-  resolution: "socks@npm:2.6.2"
+"socks-proxy-agent@npm:^8.0.1":
+  version: 8.0.2
+  resolution: "socks-proxy-agent@npm:8.0.2"
+  dependencies:
+    agent-base: "npm:^7.0.2"
+    debug: "npm:^4.3.4"
+    socks: "npm:^2.7.1"
+  checksum: 10/ea727734bd5b2567597aa0eda14149b3b9674bb44df5937bbb9815280c1586994de734d965e61f1dd45661183d7b41f115fb9e432d631287c9063864cfcc2ecc
+  languageName: node
+  linkType: hard
+
+"socks@npm:^2.6.1, socks@npm:^2.6.2, socks@npm:^2.7.1":
+  version: 2.8.0
+  resolution: "socks@npm:2.8.0"
   dependencies:
-    ip: ^1.1.5
-    smart-buffer: ^4.2.0
-  checksum: dd9194293059d737759d5c69273850ad4149f448426249325c4bea0e340d1cf3d266c3b022694b0dcf5d31f759de23657244c481fc1e8322add80b7985c36b5e
+    ip-address: "npm:^9.0.5"
+    smart-buffer: "npm:^4.2.0"
+  checksum: 10/ed0224ce2c7daaa7690cb87cf53d9703ffc4e983aca221f6f5b46767b232658df49494fd86acd0bf97ada6de05248ea8ea625c2343d48155d8463fc40d4a340f
   languageName: node
   linkType: hard
 
 "sort-asc@npm:^0.1.0":
   version: 0.1.0
   resolution: "sort-asc@npm:0.1.0"
-  checksum: c130223336a9431edd4c12cf0a4893eb9327591f8c9d9ccd1b27a42f7657b4bb84807d7150d79fc52ab7d1e9691684897de7ef2a6a3516d32349af68d2705d57
+  checksum: 10/c130223336a9431edd4c12cf0a4893eb9327591f8c9d9ccd1b27a42f7657b4bb84807d7150d79fc52ab7d1e9691684897de7ef2a6a3516d32349af68d2705d57
   languageName: node
   linkType: hard
 
 "sort-desc@npm:^0.1.1":
   version: 0.1.1
   resolution: "sort-desc@npm:0.1.1"
-  checksum: f2a2568f4eaf9a7315700ae9e46e74ae7b395f24323bf807f07b20269a7c162b549b0bac6d5bb8e26f7ee15af72a74fdaf09d47257227dbe31c4ac8f13b19e1d
+  checksum: 10/f2a2568f4eaf9a7315700ae9e46e74ae7b395f24323bf807f07b20269a7c162b549b0bac6d5bb8e26f7ee15af72a74fdaf09d47257227dbe31c4ac8f13b19e1d
   languageName: node
   linkType: hard
 
@@ -27571,17 +29219,8 @@ __metadata:
   version: 2.0.0
   resolution: "sort-keys@npm:2.0.0"
   dependencies:
-    is-plain-obj: ^1.0.0
-  checksum: f0fd827fa9f8f866e98588d2a38c35209afbf1e9a05bb0e4ceeeb8bbf31d923c8902b0a7e0f561590ddb65e58eba6a74f74b991c85360bcc52e83a3f0d1cffd7
-  languageName: node
-  linkType: hard
-
-"sort-keys@npm:^4.0.0":
-  version: 4.2.0
-  resolution: "sort-keys@npm:4.2.0"
-  dependencies:
-    is-plain-obj: ^2.0.0
-  checksum: 1535ffd5a789259fc55107d5c3cec09b3e47803a9407fcaae37e1b9e0b813762c47dfee35b6e71e20ca7a69798d0a4791b2058a07f6cab5ef17b2dae83cedbda
+    is-plain-obj: "npm:^1.0.0"
+  checksum: 10/255f9fb393ef60a3db508e0cc5b18ef401127dbb2376b205ae27d168e245fc0d6b35267dde98fab6410dde684c9321f7fc8bf71f2b051761973231617753380d
   languageName: node
   linkType: hard
 
@@ -27589,8 +29228,8 @@ __metadata:
   version: 5.0.0
   resolution: "sort-keys@npm:5.0.0"
   dependencies:
-    is-plain-obj: ^4.0.0
-  checksum: 9c0b7a468312075be03770b260b2cc0e5d55149025e564edaed41c9ff619199698aad6712a6fe4bbc75c541efb081276ac6bbd4cf2723d742f272f7a8fe354f5
+    is-plain-obj: "npm:^4.0.0"
+  checksum: 10/9c0b7a468312075be03770b260b2cc0e5d55149025e564edaed41c9ff619199698aad6712a6fe4bbc75c541efb081276ac6bbd4cf2723d742f272f7a8fe354f5
   languageName: node
   linkType: hard
 
@@ -27598,23 +29237,23 @@ __metadata:
   version: 0.3.2
   resolution: "sort-object@npm:0.3.2"
   dependencies:
-    sort-asc: ^0.1.0
-    sort-desc: ^0.1.1
-  checksum: 701fac8b49e9c720f4e5f4b70e995a795771dbecab2368b2e362c5c02cc269418a061f3303c47137d22fc3fe1ded03b4fd4215edec0960c4721274d320dae2b4
+    sort-asc: "npm:^0.1.0"
+    sort-desc: "npm:^0.1.1"
+  checksum: 10/701fac8b49e9c720f4e5f4b70e995a795771dbecab2368b2e362c5c02cc269418a061f3303c47137d22fc3fe1ded03b4fd4215edec0960c4721274d320dae2b4
   languageName: node
   linkType: hard
 
 "source-list-map@npm:^2.0.0, source-list-map@npm:^2.0.1":
   version: 2.0.1
   resolution: "source-list-map@npm:2.0.1"
-  checksum: 806efc6f75e7cd31e4815e7a3aaf75a45c704871ea4075cb2eb49882c6fca28998f44fc5ac91adb6de03b2882ee6fb02f951fdc85e6a22b338c32bfe19557938
+  checksum: 10/3918ffba5fe8447bc816800026fe707aab233d9d05a3487225d880e23b7e37ed455b4e1b844e05644f6ecc7c9b837c0cc32da54dd37f77c993370ebcdb049246
   languageName: node
   linkType: hard
 
-"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.1, source-map-js@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "source-map-js@npm:1.0.2"
-  checksum: c049a7fc4deb9a7e9b481ae3d424cc793cb4845daa690bc5a05d428bf41bf231ced49b4cf0c9e77f9d42fdb3d20d6187619fc586605f5eabe995a316da8d377c
+"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.1, source-map-js@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "source-map-js@npm:1.2.0"
+  checksum: 10/74f331cfd2d121c50790c8dd6d3c9de6be21926de80583b23b37029b0f37aefc3e019fa91f9a10a5e120c08135297e1ecf312d561459c45908cb1e0e365f49e5
   languageName: node
   linkType: hard
 
@@ -27622,9 +29261,9 @@ __metadata:
   version: 0.6.0
   resolution: "source-map-resolve@npm:0.6.0"
   dependencies:
-    atob: ^2.1.2
-    decode-uri-component: ^0.2.0
-  checksum: fe503b9e5dac1c54be835282fcfec10879434e7b3ee08a9774f230299c724a8d403484d9531276d1670c87390e0e4d1d3f92b14cca6e4a2445ea3016b786ecd4
+    atob: "npm:^2.1.2"
+    decode-uri-component: "npm:^0.2.0"
+  checksum: 10/df31fd4410e11ce328b084778ea6c8d24aec6dca22637275fd68a5bbbd86afad494945054d7f97af0c208a290d597a2ffecf7dc4f68736619a333ca909502081
   languageName: node
   linkType: hard
 
@@ -27632,9 +29271,9 @@ __metadata:
   version: 0.5.13
   resolution: "source-map-support@npm:0.5.13"
   dependencies:
-    buffer-from: ^1.0.0
-    source-map: ^0.6.0
-  checksum: 933550047b6c1a2328599a21d8b7666507427c0f5ef5eaadd56b5da0fd9505e239053c66fe181bf1df469a3b7af9d775778eee283cbb7ae16b902ddc09e93a97
+    buffer-from: "npm:^1.0.0"
+    source-map: "npm:^0.6.0"
+  checksum: 10/d1514a922ac9c7e4786037eeff6c3322f461cd25da34bb9fefb15387b3490531774e6e31d95ab6d5b84a3e139af9c3a570ccaee6b47bd7ea262691ed3a8bc34e
   languageName: node
   linkType: hard
 
@@ -27642,51 +29281,44 @@ __metadata:
   version: 0.5.21
   resolution: "source-map-support@npm:0.5.21"
   dependencies:
-    buffer-from: ^1.0.0
-    source-map: ^0.6.0
-  checksum: 43e98d700d79af1d36f859bdb7318e601dfc918c7ba2e98456118ebc4c4872b327773e5a1df09b0524e9e5063bb18f0934538eace60cca2710d1fa687645d137
+    buffer-from: "npm:^1.0.0"
+    source-map: "npm:^0.6.0"
+  checksum: 10/8317e12d84019b31e34b86d483dd41d6f832f389f7417faf8fc5c75a66a12d9686e47f589a0554a868b8482f037e23df9d040d29387eb16fa14cb85f091ba207
   languageName: node
   linkType: hard
 
 "source-map@npm:0.5.6":
   version: 0.5.6
   resolution: "source-map@npm:0.5.6"
-  checksum: 390b3f5165c9631a74fb6fb55ba61e62a7f9b7d4026ae0e2bfc2899c241d71c1bccb8731c496dc7f7cb79a5f523406eb03d8c5bebe8448ee3fc38168e2d209c8
+  checksum: 10/c62fe98e106c762307eea3a982242c1a76a31bc762da10fe2dda12252d423c163e0cd45d313330c8bd040cc5121702511138252308f72b8a9273825e81e4db30
   languageName: node
   linkType: hard
 
 "source-map@npm:^0.5.7":
   version: 0.5.7
   resolution: "source-map@npm:0.5.7"
-  checksum: 5dc2043b93d2f194142c7f38f74a24670cd7a0063acdaf4bf01d2964b402257ae843c2a8fa822ad5b71013b5fcafa55af7421383da919752f22ff488bc553f4d
+  checksum: 10/9b4ac749ec5b5831cad1f8cc4c19c4298ebc7474b24a0acf293e2f040f03f8eeccb3d01f12aa0f90cf46d555c887e03912b83a042c627f419bda5152d89c5269
   languageName: node
   linkType: hard
 
 "source-map@npm:^0.6.0, source-map@npm:^0.6.1, source-map@npm:~0.6.0, source-map@npm:~0.6.1":
   version: 0.6.1
   resolution: "source-map@npm:0.6.1"
-  checksum: 59ce8640cf3f3124f64ac289012c2b8bd377c238e316fb323ea22fbfe83da07d81e000071d7242cad7a23cd91c7de98e4df8830ec3f133cb6133a5f6e9f67bc2
+  checksum: 10/59ef7462f1c29d502b3057e822cdbdae0b0e565302c4dd1a95e11e793d8d9d62006cdc10e0fd99163ca33ff2071360cf50ee13f90440806e7ed57d81cba2f7ff
   languageName: node
   linkType: hard
 
 "source-map@npm:^0.7.3":
   version: 0.7.3
   resolution: "source-map@npm:0.7.3"
-  checksum: cd24efb3b8fa69b64bf28e3c1b1a500de77e84260c5b7f2b873f88284df17974157cc88d386ee9b6d081f08fdd8242f3fc05c953685a6ad81aad94c7393dedea
-  languageName: node
-  linkType: hard
-
-"sourcemap-codec@npm:^1.4.8":
-  version: 1.4.8
-  resolution: "sourcemap-codec@npm:1.4.8"
-  checksum: b57981c05611afef31605732b598ccf65124a9fcb03b833532659ac4d29ac0f7bfacbc0d6c5a28a03e84c7510e7e556d758d0bb57786e214660016fb94279316
+  checksum: 10/89c388902a1d94c897c3343b70d161a7f3cd86997512ad563274b8e25c8fd9d8633d9ed320ee89a435cdd77066fe460241b5aa45417b25d1baeb8205cefd4fa2
   languageName: node
   linkType: hard
 
 "space-separated-tokens@npm:^1.0.0":
   version: 1.1.5
   resolution: "space-separated-tokens@npm:1.1.5"
-  checksum: 8ef68f1cfa8ccad316b7f8d0df0919d0f1f6d32101e8faeee34ea3a923ce8509c1ad562f57388585ee4951e92d27afa211ed0a077d3d5995b5ba9180331be708
+  checksum: 10/8ef68f1cfa8ccad316b7f8d0df0919d0f1f6d32101e8faeee34ea3a923ce8509c1ad562f57388585ee4951e92d27afa211ed0a077d3d5995b5ba9180331be708
   languageName: node
   linkType: hard
 
@@ -27694,16 +29326,16 @@ __metadata:
   version: 3.1.1
   resolution: "spdx-correct@npm:3.1.1"
   dependencies:
-    spdx-expression-parse: ^3.0.0
-    spdx-license-ids: ^3.0.0
-  checksum: 77ce438344a34f9930feffa61be0eddcda5b55fc592906ef75621d4b52c07400a97084d8701557b13f7d2aae0cb64f808431f469e566ef3fe0a3a131dcb775a6
+    spdx-expression-parse: "npm:^3.0.0"
+    spdx-license-ids: "npm:^3.0.0"
+  checksum: 10/688e028c3ca6090d1b516272a2dd60b30f163cbf166295ac4b8078fd74f524365cd996e2b18cabdaa41647aa806e117604aa3b3216f69076a554999913d09d47
   languageName: node
   linkType: hard
 
 "spdx-exceptions@npm:^2.1.0":
   version: 2.3.0
   resolution: "spdx-exceptions@npm:2.3.0"
-  checksum: cb69a26fa3b46305637123cd37c85f75610e8c477b6476fa7354eb67c08128d159f1d36715f19be6f9daf4b680337deb8c65acdcae7f2608ba51931540687ac0
+  checksum: 10/cb69a26fa3b46305637123cd37c85f75610e8c477b6476fa7354eb67c08128d159f1d36715f19be6f9daf4b680337deb8c65acdcae7f2608ba51931540687ac0
   languageName: node
   linkType: hard
 
@@ -27711,16 +29343,26 @@ __metadata:
   version: 3.0.1
   resolution: "spdx-expression-parse@npm:3.0.1"
   dependencies:
-    spdx-exceptions: ^2.1.0
-    spdx-license-ids: ^3.0.0
-  checksum: a1c6e104a2cbada7a593eaa9f430bd5e148ef5290d4c0409899855ce8b1c39652bcc88a725259491a82601159d6dc790bedefc9016c7472f7de8de7361f8ccde
+    spdx-exceptions: "npm:^2.1.0"
+    spdx-license-ids: "npm:^3.0.0"
+  checksum: 10/a1c6e104a2cbada7a593eaa9f430bd5e148ef5290d4c0409899855ce8b1c39652bcc88a725259491a82601159d6dc790bedefc9016c7472f7de8de7361f8ccde
+  languageName: node
+  linkType: hard
+
+"spdx-expression-parse@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "spdx-expression-parse@npm:4.0.0"
+  dependencies:
+    spdx-exceptions: "npm:^2.1.0"
+    spdx-license-ids: "npm:^3.0.0"
+  checksum: 10/936be681fbf5edeec3a79c023136479f70d6edb3fd3875089ac86cd324c6c8c81add47399edead296d1d0af17ae5ce88c7f88885eb150b62c2ff6e535841ca6a
   languageName: node
   linkType: hard
 
 "spdx-license-ids@npm:^3.0.0":
   version: 3.0.10
   resolution: "spdx-license-ids@npm:3.0.10"
-  checksum: 94fde6f558941f82c737433000e20678eccad448fe5e87cbb98ba1d811a120ddf7fbc4a7a3ebfcd2f49c8c4541ba6537af07750ca5cb54900a064d53f68b888d
+  checksum: 10/acfc31057a045946deb1fdf44af907a42ef7d3ff2630c6964efa63a23e343bf0d2994699526e1c7612937bb497ade438f211bc112d54bf24c47b4b7ff8032451
   languageName: node
   linkType: hard
 
@@ -27728,13 +29370,13 @@ __metadata:
   version: 3.0.0
   resolution: "spdy-transport@npm:3.0.0"
   dependencies:
-    debug: ^4.1.0
-    detect-node: ^2.0.4
-    hpack.js: ^2.1.6
-    obuf: ^1.1.2
-    readable-stream: ^3.0.6
-    wbuf: ^1.7.3
-  checksum: 0fcaad3b836fb1ec0bdd39fa7008b9a7a84a553f12be6b736a2512613b323207ffc924b9551cef0378f7233c85916cff1118652e03a730bdb97c0e042243d56c
+    debug: "npm:^4.1.0"
+    detect-node: "npm:^2.0.4"
+    hpack.js: "npm:^2.1.6"
+    obuf: "npm:^1.1.2"
+    readable-stream: "npm:^3.0.6"
+    wbuf: "npm:^1.7.3"
+  checksum: 10/b93b606b209ca785456bd850b8925f21a76522ee5b46701235ecff3eba17686560c27575f91863842dc843a39772f6d2f5a8755df9eaff0924d20598df18828d
   languageName: node
   linkType: hard
 
@@ -27742,28 +29384,28 @@ __metadata:
   version: 4.0.2
   resolution: "spdy@npm:4.0.2"
   dependencies:
-    debug: ^4.1.0
-    handle-thing: ^2.0.0
-    http-deceiver: ^1.2.7
-    select-hose: ^2.0.0
-    spdy-transport: ^3.0.0
-  checksum: 2c739d0ff6f56ad36d2d754d0261d5ec358457bea7cbf77b1b05b0c6464f2ce65b85f196305f50b7bd9120723eb94bae9933466f28e67e5cd8cde4e27f1d75f8
+    debug: "npm:^4.1.0"
+    handle-thing: "npm:^2.0.0"
+    http-deceiver: "npm:^1.2.7"
+    select-hose: "npm:^2.0.0"
+    spdy-transport: "npm:^3.0.0"
+  checksum: 10/d29b89e48e7d762e505a2f83b1bc2c92268bd518f1b411864ab42a9e032e387d10467bbce0d8dbf8647bf4914a063aa1d303dff85e248f7a57f81a7b18ac34ef
   languageName: node
   linkType: hard
 
 "spel2js@npm:^0.2.8":
   version: 0.2.8
   resolution: "spel2js@npm:0.2.8"
-  checksum: a81f30b90438c6fef27627d8f91e2ce9040cc3743918846e535e44bdbf76be4d404d281e83b1be8287f36c1566a22e20d711532b941838f9ca7673e5caebf75f
+  checksum: 10/6300ee76ee264f0a868f5215b219fdc01bbd0071d2d113a3520832087483d15a712839dcf9e434990857a26e22853517440ac866f76770ff62dc38b9b5c8660f
   languageName: node
   linkType: hard
 
-"split2@npm:^3.0.0":
+"split2@npm:^3.2.2":
   version: 3.2.2
   resolution: "split2@npm:3.2.2"
   dependencies:
-    readable-stream: ^3.0.0
-  checksum: 8127ddbedd0faf31f232c0e9192fede469913aa8982aa380752e0463b2e31c2359ef6962eb2d24c125bac59eeec76873678d723b1c7ff696216a1cd071e3994a
+    readable-stream: "npm:^3.0.0"
+  checksum: 10/a426e1e6718e2f7e50f102d5ec3525063d885e3d9cec021a81175fd3497fdb8b867a89c99e70bef4daeef4f2f5e544f7b92df8c1a30b4254e10a9cfdcc3dae87
   languageName: node
   linkType: hard
 
@@ -27771,31 +29413,31 @@ __metadata:
   version: 0.2.10
   resolution: "split@npm:0.2.10"
   dependencies:
-    through: 2
-  checksum: 9eb11956085125cfdce524dd671e436f3c52ee1745ec32902e7b290d3809ad9e4fbf5da58b9bd1e20a033ba9050a4e453bf6f49d50362bd98f60bf9b0d5986b4
+    through: "npm:2"
+  checksum: 10/781fad347ebd0c135c2fe71d9cc5c392f7d0d6ac36f772bb55d0ba47df9b24e3229d2e13c25af19e1e56ec4ce06cac9bb53612cfae96c6015a49d9dafa11af6f
   languageName: node
   linkType: hard
 
-"split@npm:^1.0.0":
+"split@npm:^1.0.1":
   version: 1.0.1
   resolution: "split@npm:1.0.1"
   dependencies:
-    through: 2
-  checksum: 12f4554a5792c7e98bb3e22b53c63bfa5ef89aa704353e1db608a55b51f5b12afaad6e4a8ecf7843c15f273f43cdadd67b3705cc43d48a75c2cf4641d51f7e7a
+    through: "npm:2"
+  checksum: 10/12f4554a5792c7e98bb3e22b53c63bfa5ef89aa704353e1db608a55b51f5b12afaad6e4a8ecf7843c15f273f43cdadd67b3705cc43d48a75c2cf4641d51f7e7a
   languageName: node
   linkType: hard
 
-"sprintf-js@npm:^1.1.1":
-  version: 1.1.2
-  resolution: "sprintf-js@npm:1.1.2"
-  checksum: d4bb46464632b335e5faed381bd331157e0af64915a98ede833452663bc672823db49d7531c32d58798e85236581fb7342fd0270531ffc8f914e186187bf1c90
+"sprintf-js@npm:^1.1.1, sprintf-js@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "sprintf-js@npm:1.1.3"
+  checksum: 10/e7587128c423f7e43cc625fe2f87e6affdf5ca51c1cc468e910d8aaca46bb44a7fbcfa552f787b1d3987f7043aeb4527d1b99559e6621e01b42b3f45e5a24cbb
   languageName: node
   linkType: hard
 
 "sprintf-js@npm:~1.0.2":
   version: 1.0.3
   resolution: "sprintf-js@npm:1.0.3"
-  checksum: 19d79aec211f09b99ec3099b5b2ae2f6e9cdefe50bc91ac4c69144b6d3928a640bb6ae5b3def70c2e85a2c3d9f5ec2719921e3a59d3ca3ef4b2fd1a4656a0df3
+  checksum: 10/c34828732ab8509c2741e5fd1af6b767c3daf2c642f267788f933a65b1614943c282e74c4284f4fa749c264b18ee016a0d37a3e5b73aee446da46277d3a85daa
   languageName: node
   linkType: hard
 
@@ -27803,16 +29445,16 @@ __metadata:
   version: 1.3.6
   resolution: "sql-formatter-plus@npm:1.3.6"
   dependencies:
-    "@babel/polyfill": ^7.6.0
-    lodash: ^4.17.15
-  checksum: 5c215f85936b3465d6778af868f0a8a2d3dd4b714ab95025c3b17b9748fe420ae2e128c523d50be0a43667bf8329a974f3248828971299146786e28d9714e752
+    "@babel/polyfill": "npm:^7.6.0"
+    lodash: "npm:^4.17.15"
+  checksum: 10/79e6bfb47e1ae6e24ee8bca94bf032089081517b35c2c99c6f2b706c9e19ed627b8ce272899b19ad8259f6bb606f7895e3ef93a0a7a12ce58824c702416eb0cc
   languageName: node
   linkType: hard
 
 "sqlstring@npm:^2.3.3":
   version: 2.3.3
   resolution: "sqlstring@npm:2.3.3"
-  checksum: 1e7e2d51c38a0cf7372e875408ca100b6e0c9a941ab7773975ea41fb36e5528e404dc787689be855780cf6d0a829ff71027964ae3a05a7446e91dce26672fda7
+  checksum: 10/4e5a25af2d77a031fe00694034bf9fd822ddc3a483c9383124b120aa6b9ae9ab71e173cd29fba9c653998ebfef9e97be668957839960b9b3dc1afcb45f1ddb64
   languageName: node
   linkType: hard
 
@@ -27820,20 +29462,29 @@ __metadata:
   version: 1.17.0
   resolution: "sshpk@npm:1.17.0"
   dependencies:
-    asn1: ~0.2.3
-    assert-plus: ^1.0.0
-    bcrypt-pbkdf: ^1.0.0
-    dashdash: ^1.12.0
-    ecc-jsbn: ~0.1.1
-    getpass: ^0.1.1
-    jsbn: ~0.1.0
-    safer-buffer: ^2.0.2
-    tweetnacl: ~0.14.0
+    asn1: "npm:~0.2.3"
+    assert-plus: "npm:^1.0.0"
+    bcrypt-pbkdf: "npm:^1.0.0"
+    dashdash: "npm:^1.12.0"
+    ecc-jsbn: "npm:~0.1.1"
+    getpass: "npm:^0.1.1"
+    jsbn: "npm:~0.1.0"
+    safer-buffer: "npm:^2.0.2"
+    tweetnacl: "npm:~0.14.0"
   bin:
     sshpk-conv: bin/sshpk-conv
     sshpk-sign: bin/sshpk-sign
     sshpk-verify: bin/sshpk-verify
-  checksum: ba109f65c8e6c35133b8e6ed5576abeff8aa8d614824b7275ec3ca308f081fef483607c28d97780c1e235818b0f93ed8c8b56d0a5968d5a23fd6af57718c7597
+  checksum: 10/668c2a279a6ce66fd739ce5684e37927dd75427cc020c828a208f85890a4c400705d4ba09f32fa44efca894339dc6931941664f6f6ba36dfa543de6d006cbe9c
+  languageName: node
+  linkType: hard
+
+"ssri@npm:^10.0.0, ssri@npm:^10.0.1":
+  version: 10.0.5
+  resolution: "ssri@npm:10.0.5"
+  dependencies:
+    minipass: "npm:^7.0.3"
+  checksum: 10/453f9a1c241c13f5dfceca2ab7b4687bcff354c3ccbc932f35452687b9ef0ccf8983fd13b8a3baa5844c1a4882d6e3ddff48b0e7fd21d743809ef33b80616d79
   languageName: node
   linkType: hard
 
@@ -27841,17 +29492,17 @@ __metadata:
   version: 8.0.1
   resolution: "ssri@npm:8.0.1"
   dependencies:
-    minipass: ^3.1.1
-  checksum: bc447f5af814fa9713aa201ec2522208ae0f4d8f3bda7a1f445a797c7b929a02720436ff7c478fb5edc4045adb02b1b88d2341b436a80798734e2494f1067b36
+    minipass: "npm:^3.1.1"
+  checksum: 10/fde247b7107674d9a424a20f9c1a6e3ad88a139c2636b9d9ffa7df59e85e11a894cdae48fadd0ad6be41eb0d5b847fe094736513d333615c7eebc3d111abe0d2
   languageName: node
   linkType: hard
 
-"ssri@npm:^9.0.0, ssri@npm:^9.0.1":
+"ssri@npm:^9.0.1":
   version: 9.0.1
   resolution: "ssri@npm:9.0.1"
   dependencies:
-    minipass: ^3.1.1
-  checksum: fb58f5e46b6923ae67b87ad5ef1c5ab6d427a17db0bead84570c2df3cd50b4ceb880ebdba2d60726588272890bae842a744e1ecce5bd2a2a582fccd5068309eb
+    minipass: "npm:^3.1.1"
+  checksum: 10/7638a61e91432510718e9265d48d0438a17d53065e5184f1336f234ef6aa3479663942e41e97df56cda06bb24d9d0b5ef342c10685add3cac7267a82d7fa6718
   languageName: node
   linkType: hard
 
@@ -27859,8 +29510,17 @@ __metadata:
   version: 2.0.5
   resolution: "stack-generator@npm:2.0.5"
   dependencies:
-    stackframe: ^1.1.1
-  checksum: a85c45a6f166319b31e9298da1e05b778b768553c2126eeeccfa5c4402fc810de1c541ec0b92db63238d68b3e08f4f57544adc27255e52f25f8edcabcc9caf63
+    stackframe: "npm:^1.1.1"
+  checksum: 10/3c7b925c34b93f1528e334f1ed5fe4d7a5d4874589cb63ce539f569e9c76649037b7848be953b24f3c46865584425281fc51925e42c87b7fec128ad646ccae97
+  languageName: node
+  linkType: hard
+
+"stack-typescript@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "stack-typescript@npm:1.0.4"
+  dependencies:
+    linked-list-typescript: "npm:^1.0.11"
+  checksum: 10/a3211a70b01ab4ece788a9c0c4612a132be4019427dc1d9daa7f289b5ab495d4a30cdc947888858eb9225b4c55428530ae60526c56b141f843047db1d878114e
   languageName: node
   linkType: hard
 
@@ -27868,22 +29528,22 @@ __metadata:
   version: 2.0.5
   resolution: "stack-utils@npm:2.0.5"
   dependencies:
-    escape-string-regexp: ^2.0.0
-  checksum: 76b69da0f5b48a34a0f93c98ee2a96544d2c4ca2557f7eef5ddb961d3bdc33870b46f498a84a7c4f4ffb781df639840e7ebf6639164ed4da5e1aeb659615b9c7
+    escape-string-regexp: "npm:^2.0.0"
+  checksum: 10/a6d64e5dd24d321289ebefdff2e210ece75fdf20dbcdb702b86da1f7b730743fae3e9337adae4a5cc00d4970d748ff758387df3ea7c71c45b466c43c7359bc00
   languageName: node
   linkType: hard
 
 "stackblur-canvas@npm:^2.0.0":
   version: 2.5.0
   resolution: "stackblur-canvas@npm:2.5.0"
-  checksum: 52b0dc595d3dbed94c8563d8fe34e0c8ff65b85eaf8fcfe7b0cd8893e93ae42c28b688f71d792fbaedf2a9b677dc474a2e721d8245165a3a0c0d794c0f6f8bba
+  checksum: 10/0094645f0a29039a9c3c750243f56b17af89e3cfc0d0554ac728da5548bcb58a46ef52e8d2503ac1382e728f6a64a6e76319c0e4c7baf172bb4ef21e96e3e25c
   languageName: node
   linkType: hard
 
 "stackframe@npm:^1.1.1":
   version: 1.2.0
   resolution: "stackframe@npm:1.2.0"
-  checksum: 37d659bdd574e118a48c445a9a054a2b8dee6d6ad54eb16c51c7dae622c0f4994b9ff4e47d744aa6cfd14c00b477e145f34db3df78771f3e783ce8f357616d00
+  checksum: 10/159c520470aeba7c9b889adcd1615d708fbceae64f6afabba9d1ecdf4ff2ee248bd5d612f778ffd15502a50d237c8a6638690f834d596499462d0c29970cac5e
   languageName: node
   linkType: hard
 
@@ -27891,9 +29551,9 @@ __metadata:
   version: 3.0.4
   resolution: "stacktrace-gps@npm:3.0.4"
   dependencies:
-    source-map: 0.5.6
-    stackframe: ^1.1.1
-  checksum: b98cb77632d38e6cbc243da4c47ca5f4bef918985c233bb4cfe8bfdc60fde92b53ce0630b16cf24d81560f1442e2ff92ccf6e2fe19031c90fb775d8e86037d9b
+    source-map: "npm:0.5.6"
+    stackframe: "npm:^1.1.1"
+  checksum: 10/9b9d27173c973a96a89c0852c7ab68637d9446356ae59e6dbe47c68f48ea3d7ac030e06964f5d34195972debe2795eeb284a486f7306ca11c938e62f60cd871b
   languageName: node
   linkType: hard
 
@@ -27901,24 +29561,38 @@ __metadata:
   version: 2.0.2
   resolution: "stacktrace-js@npm:2.0.2"
   dependencies:
-    error-stack-parser: ^2.0.6
-    stack-generator: ^2.0.5
-    stacktrace-gps: ^3.0.4
-  checksum: 081e786d56188ac04ac6604c09cd863b3ca2b4300ec061366cf68c3e4ad9edaa34fb40deea03cc23a05f442aa341e9171f47313f19bd588f9bec6c505a396286
+    error-stack-parser: "npm:^2.0.6"
+    stack-generator: "npm:^2.0.5"
+    stacktrace-gps: "npm:^3.0.4"
+  checksum: 10/e5f60a09852687e4a9206927fe1078e24d63e00a71a2dcddd67940e9504a54931a3454439d5b4e3e0e62aeb979be810573e8d3332fbef0dbfa335a8781b4b57c
   languageName: node
   linkType: hard
 
 "state-local@npm:^1.0.6":
   version: 1.0.7
   resolution: "state-local@npm:1.0.7"
-  checksum: d1afcf1429e7e6eb08685b3a94be8797db847369316d4776fd51f3962b15b984dacc7f8e401ad20968e5798c9565b4b377afedf4e4c4d60fe7495e1cbe14a251
+  checksum: 10/1d956043e270861d40a639ff3457938cf61dbc7e25209d21b55060d8dfaf74742b8a1e525ed6fcb0c2d89b7d3e305bb8589bf27392012889456b3ad82a4b7d0a
   languageName: node
   linkType: hard
 
 "statuses@npm:>= 1.4.0 < 2, statuses@npm:>= 1.5.0 < 2, statuses@npm:~1.5.0":
   version: 1.5.0
   resolution: "statuses@npm:1.5.0"
-  checksum: c469b9519de16a4bb19600205cffb39ee471a5f17b82589757ca7bd40a8d92ebb6ed9f98b5a540c5d302ccbc78f15dc03cc0280dd6e00df1335568a5d5758a5c
+  checksum: 10/c469b9519de16a4bb19600205cffb39ee471a5f17b82589757ca7bd40a8d92ebb6ed9f98b5a540c5d302ccbc78f15dc03cc0280dd6e00df1335568a5d5758a5c
+  languageName: node
+  linkType: hard
+
+"statuses@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "statuses@npm:2.0.1"
+  checksum: 10/18c7623fdb8f646fb213ca4051be4df7efb3484d4ab662937ca6fbef7ced9b9e12842709872eb3020cc3504b93bde88935c9f6417489627a7786f24f8031cbcb
+  languageName: node
+  linkType: hard
+
+"std-env@npm:^3.7.0":
+  version: 3.7.0
+  resolution: "std-env@npm:3.7.0"
+  checksum: 10/6ee0cca1add3fd84656b0002cfbc5bfa20340389d9ba4720569840f1caa34bce74322aef4c93f046391583e50649d0cf81a5f8fe1d411e50b659571690a45f12
   languageName: node
   linkType: hard
 
@@ -27926,15 +29600,15 @@ __metadata:
   version: 1.0.0
   resolution: "stop-iteration-iterator@npm:1.0.0"
   dependencies:
-    internal-slot: ^1.0.4
-  checksum: d04173690b2efa40e24ab70e5e51a3ff31d56d699550cfad084104ab3381390daccb36652b25755e420245f3b0737de66c1879eaa2a8d4fc0a78f9bf892fcb42
+    internal-slot: "npm:^1.0.4"
+  checksum: 10/2a23a36f4f6bfa63f46ae2d53a3f80fe8276110b95a55345d8ed3d92125413494033bc8697eb774e8f7aeb5725f70e3d69753caa2ecacdac6258c16fa8aa8b0f
   languageName: node
   linkType: hard
 
 "store2@npm:^2.14.2":
   version: 2.14.2
   resolution: "store2@npm:2.14.2"
-  checksum: 6f270fc5bab99b63f45fcc7bd8b99c2714b4adf880f557ed7ffb5ed3987131251165bccde425a00928aaf044870aee79ddeef548576d093c68703ed2edec45d7
+  checksum: 10/896cb4c75b94b630206e0ef414f78d656a5d2498127094d9d0852e1e7b88509b3a7972c92cad3e74ee34ef6b06d25083ad2ac38880254ccb2d40b7930dc0ed01
   languageName: node
   linkType: hard
 
@@ -27942,8 +29616,8 @@ __metadata:
   version: 2.0.1
   resolution: "storybook-addon-turbo-build@npm:2.0.1"
   dependencies:
-    esbuild-loader: ^3.0.0
-  checksum: c6a38d7e8064a5dc6f8868c027d28ab294d581fb338245bb170cbc031f5fadcade1659ea55e8eff6fffee77693de0b35423eef9fc775da499f763c4a380504a8
+    esbuild-loader: "npm:^3.0.0"
+  checksum: 10/db378100d71b077620ef9c5a22d67cbd65a0b365de50ec2282848e61a7b11c87304d0c743bbe6fcc400b7fe3929d450c8001b2922916da01ad7e08b32bc9811a
   languageName: node
   linkType: hard
 
@@ -27951,14 +29625,14 @@ __metadata:
   version: 3.0.1
   resolution: "storybook-dark-mode@npm:3.0.1"
   dependencies:
-    "@storybook/addons": ^7.0.0
-    "@storybook/api": ^7.0.0
-    "@storybook/components": ^7.0.0
-    "@storybook/core-events": ^7.0.0
-    "@storybook/global": ^5.0.0
-    "@storybook/theming": ^7.0.0
-    fast-deep-equal: ^3.1.3
-    memoizerific: ^1.11.3
+    "@storybook/addons": "npm:^7.0.0"
+    "@storybook/api": "npm:^7.0.0"
+    "@storybook/components": "npm:^7.0.0"
+    "@storybook/core-events": "npm:^7.0.0"
+    "@storybook/global": "npm:^5.0.0"
+    "@storybook/theming": "npm:^7.0.0"
+    fast-deep-equal: "npm:^3.1.3"
+    memoizerific: "npm:^1.11.3"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -27967,7 +29641,7 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-  checksum: d04213c92e8a4af0035e80eb02b75b8da725ba7b1ecbfe050eb04cb4018d91394f08c8fe7c1b106c971b2047ef5a1ba776e78050ae1f6d7563cdfdba5e701a29
+  checksum: 10/3566a7e65a42825c840e44f66f0a2a3458393e15b4afaf4400c7906d7ce17a55bdb0530005614c9398802c29461d48b74bdf9702440d3b3c9214cecbe41baac4
   languageName: node
   linkType: hard
 
@@ -27975,25 +29649,44 @@ __metadata:
   version: 7.4.5
   resolution: "storybook@npm:7.4.5"
   dependencies:
-    "@storybook/cli": 7.4.5
+    "@storybook/cli": "npm:7.4.5"
   bin:
     sb: ./index.js
     storybook: ./index.js
-  checksum: a028c479fd27eb1b887e0d1d9297ea3f30d436d644a6c3a699ab7834c1ed89de31f473ba1d0bab6c0fdf4c4e4544eb2575a0881f2de8d2c0c11421ec3d688631
+  checksum: 10/a028c479fd27eb1b887e0d1d9297ea3f30d436d644a6c3a699ab7834c1ed89de31f473ba1d0bab6c0fdf4c4e4544eb2575a0881f2de8d2c0c11421ec3d688631
+  languageName: node
+  linkType: hard
+
+"stream-browserify@npm:3.0.0":
+  version: 3.0.0
+  resolution: "stream-browserify@npm:3.0.0"
+  dependencies:
+    inherits: "npm:~2.0.4"
+    readable-stream: "npm:^3.5.0"
+  checksum: 10/05a3cd0a0ce2d568dbdeb69914557c26a1b0a9d871839666b692eae42b96189756a3ed685affc90dab64ff588a8524c8aec6d85072c07905a1f0d941ea68f956
   languageName: node
   linkType: hard
 
 "stream-buffers@npm:1.0.1":
   version: 1.0.1
   resolution: "stream-buffers@npm:1.0.1"
-  checksum: ed48f73991d02d00c28e049837b8c8f807c258ccc35f1ba860876f7a1646490076b891da61987f786c89132781d442e682d02e5dd51dc21e24f84556efaa1b48
+  checksum: 10/df6e4f5004ccae2ec52bec81ec910204508e5cc4830d3aaac2979e481ee0bba2fda13636d9b63ce594a35f3d9b66d97eeb84214a25f217bb31d651664835d130
+  languageName: node
+  linkType: hard
+
+"stream-composer@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "stream-composer@npm:1.0.2"
+  dependencies:
+    streamx: "npm:^2.13.2"
+  checksum: 10/338b8e088f2eb2c91b0e06907db436525da3620991b13499e57441548e62d3585be185505901b0380cad425889572794e5fe178dd326f5efde654b3ab26df3d3
   languageName: node
   linkType: hard
 
 "stream-shift@npm:^1.0.0":
   version: 1.0.1
   resolution: "stream-shift@npm:1.0.1"
-  checksum: 59b82b44b29ec3699b5519a49b3cedcc6db58c72fb40c04e005525dfdcab1c75c4e0c180b923c380f204bed78211b9bad8faecc7b93dece4d004c3f6ec75737b
+  checksum: 10/59b82b44b29ec3699b5519a49b3cedcc6db58c72fb40c04e005525dfdcab1c75c4e0c180b923c380f204bed78211b9bad8faecc7b93dece4d004c3f6ec75737b
   languageName: node
   linkType: hard
 
@@ -28001,44 +29694,35 @@ __metadata:
   version: 0.4.1
   resolution: "streamroller@npm:0.4.1"
   dependencies:
-    date-format: ^0.0.0
-    debug: ^0.7.2
-    mkdirp: ^0.5.1
-    readable-stream: ^1.1.7
-  checksum: e14db5369487d30197da8d2607cf55977ff1e1a990e9ced99e8b28786b5282dcbb75667806b10836ae14a36c360ac431dccabb6e2707bd53325dde756888dd1b
-  languageName: node
-  linkType: hard
-
-"streamx@npm:^2.12.5":
-  version: 2.12.5
-  resolution: "streamx@npm:2.12.5"
-  dependencies:
-    fast-fifo: ^1.0.0
-    queue-tick: ^1.0.0
-  checksum: 4e54d0ba3fca9b81b403b6b36184eb21fa0bb6fa8eae913b806c9f6046399ac9e082192c9b2c594e7d66cd3ea8230655ddf53dd8f26bc8cc2cc332b9a7b1bf85
+    date-format: "npm:^0.0.0"
+    debug: "npm:^0.7.2"
+    mkdirp: "npm:^0.5.1"
+    readable-stream: "npm:^1.1.7"
+  checksum: 10/a546d4905478c6aa32edffa970a485b641358e1a4b26b99a3caee05ca8054dd90eefdc0eac19f3a35a1984f9747dc35cd26f346cba084d2ee80c8844f9d7090b
   languageName: node
   linkType: hard
 
-"strict-event-emitter@npm:^0.2.4":
-  version: 0.2.8
-  resolution: "strict-event-emitter@npm:0.2.8"
+"streamx@npm:^2.12.0, streamx@npm:^2.12.5, streamx@npm:^2.13.2, streamx@npm:^2.14.0":
+  version: 2.15.7
+  resolution: "streamx@npm:2.15.7"
   dependencies:
-    events: ^3.3.0
-  checksum: 6ac06fe72a6ee6ae64d20f1dd42838ea67342f1b5f32b03b3050d73ee6ecee44b4d5c4ed2965a7154b47991e215f373d4e789e2b2be2769cd80e356126c2ca53
+    fast-fifo: "npm:^1.1.0"
+    queue-tick: "npm:^1.0.1"
+  checksum: 10/5f59f49383b41546e87b15ba54970cca262d1eb0826c5b88c4dc5329d18821fed06f92f849da68c764ad91ea05f394518510957371cb0abd3617bdabed465cdb
   languageName: node
   linkType: hard
 
-"strict-event-emitter@npm:^0.4.3":
-  version: 0.4.6
-  resolution: "strict-event-emitter@npm:0.4.6"
-  checksum: 4f4f2909613e7811de789991c06bfb770d6d6987e2ec5c66fa7485d0f07cc4e7e32eba0dcf26cee6d86af6c92946d7f4acdfaff57d0c4114df2cfa1bf0e3c091
+"strict-event-emitter@npm:^0.5.1":
+  version: 0.5.1
+  resolution: "strict-event-emitter@npm:0.5.1"
+  checksum: 10/25c84d88be85940d3547db665b871bfecea4ea0bedfeb22aae8db48126820cfb2b0bc2fba695392592a09b1aa36b686d6eede499e1ecd151593c03fe5a50d512
   languageName: node
   linkType: hard
 
 "string-hash@npm:^1.1.3":
   version: 1.1.3
   resolution: "string-hash@npm:1.1.3"
-  checksum: 104b8667a5e0dc71bfcd29fee09cb88c6102e27bfb07c55f95535d90587d016731d52299380052e514266f4028a7a5172e0d9ac58e2f8f5001be61dc77c0754d
+  checksum: 10/104b8667a5e0dc71bfcd29fee09cb88c6102e27bfb07c55f95535d90587d016731d52299380052e514266f4028a7a5172e0d9ac58e2f8f5001be61dc77c0754d
   languageName: node
   linkType: hard
 
@@ -28046,9 +29730,19 @@ __metadata:
   version: 4.0.2
   resolution: "string-length@npm:4.0.2"
   dependencies:
-    char-regex: ^1.0.2
-    strip-ansi: ^6.0.0
-  checksum: ce85533ef5113fcb7e522bcf9e62cb33871aa99b3729cec5595f4447f660b0cefd542ca6df4150c97a677d58b0cb727a3fe09ac1de94071d05526c73579bf505
+    char-regex: "npm:^1.0.2"
+    strip-ansi: "npm:^6.0.0"
+  checksum: 10/ce85533ef5113fcb7e522bcf9e62cb33871aa99b3729cec5595f4447f660b0cefd542ca6df4150c97a677d58b0cb727a3fe09ac1de94071d05526c73579bf505
+  languageName: node
+  linkType: hard
+
+"string-length@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "string-length@npm:5.0.1"
+  dependencies:
+    char-regex: "npm:^2.0.0"
+    strip-ansi: "npm:^7.0.1"
+  checksum: 10/71f73b8c8a743e01dcd001bcf1b197db78d5e5e53b12bd898cddaf0961be09f947dfd8c429783db3694b55b05cb5a51de6406c5085ff1aaa10c4771440c8396d
   languageName: node
   linkType: hard
 
@@ -28056,10 +29750,10 @@ __metadata:
   version: 4.2.3
   resolution: "string-width@npm:4.2.3"
   dependencies:
-    emoji-regex: ^8.0.0
-    is-fullwidth-code-point: ^3.0.0
-    strip-ansi: ^6.0.1
-  checksum: e52c10dc3fbfcd6c3a15f159f54a90024241d0f149cf8aed2982a2d801d2e64df0bf1dc351cf8e95c3319323f9f220c16e740b06faecd53e2462df1d2b5443fb
+    emoji-regex: "npm:^8.0.0"
+    is-fullwidth-code-point: "npm:^3.0.0"
+    strip-ansi: "npm:^6.0.1"
+  checksum: 10/e52c10dc3fbfcd6c3a15f159f54a90024241d0f149cf8aed2982a2d801d2e64df0bf1dc351cf8e95c3319323f9f220c16e740b06faecd53e2462df1d2b5443fb
   languageName: node
   linkType: hard
 
@@ -28067,10 +29761,10 @@ __metadata:
   version: 1.0.2
   resolution: "string-width@npm:1.0.2"
   dependencies:
-    code-point-at: ^1.0.0
-    is-fullwidth-code-point: ^1.0.0
-    strip-ansi: ^3.0.0
-  checksum: 5c79439e95bc3bd7233a332c5f5926ab2ee90b23816ed4faa380ce3b2576d7800b0a5bb15ae88ed28737acc7ea06a518c2eef39142dd727adad0e45c776cd37e
+    code-point-at: "npm:^1.0.0"
+    is-fullwidth-code-point: "npm:^1.0.0"
+    strip-ansi: "npm:^3.0.0"
+  checksum: 10/5c79439e95bc3bd7233a332c5f5926ab2ee90b23816ed4faa380ce3b2576d7800b0a5bb15ae88ed28737acc7ea06a518c2eef39142dd727adad0e45c776cd37e
   languageName: node
   linkType: hard
 
@@ -28078,26 +29772,27 @@ __metadata:
   version: 5.1.2
   resolution: "string-width@npm:5.1.2"
   dependencies:
-    eastasianwidth: ^0.2.0
-    emoji-regex: ^9.2.2
-    strip-ansi: ^7.0.1
-  checksum: 7369deaa29f21dda9a438686154b62c2c5f661f8dda60449088f9f980196f7908fc39fdd1803e3e01541970287cf5deae336798337e9319a7055af89dafa7193
+    eastasianwidth: "npm:^0.2.0"
+    emoji-regex: "npm:^9.2.2"
+    strip-ansi: "npm:^7.0.1"
+  checksum: 10/7369deaa29f21dda9a438686154b62c2c5f661f8dda60449088f9f980196f7908fc39fdd1803e3e01541970287cf5deae336798337e9319a7055af89dafa7193
   languageName: node
   linkType: hard
 
-"string.prototype.matchall@npm:^4.0.8":
-  version: 4.0.8
-  resolution: "string.prototype.matchall@npm:4.0.8"
+"string.prototype.matchall@npm:^4.0.10, string.prototype.matchall@npm:^4.0.8":
+  version: 4.0.10
+  resolution: "string.prototype.matchall@npm:4.0.10"
   dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    es-abstract: ^1.20.4
-    get-intrinsic: ^1.1.3
-    has-symbols: ^1.0.3
-    internal-slot: ^1.0.3
-    regexp.prototype.flags: ^1.4.3
-    side-channel: ^1.0.4
-  checksum: 952da3a818de42ad1c10b576140a5e05b4de7b34b8d9dbf00c3ac8c1293e9c0f533613a39c5cda53e0a8221f2e710bc2150e730b1c2278d60004a8a35726efb6
+    call-bind: "npm:^1.0.2"
+    define-properties: "npm:^1.2.0"
+    es-abstract: "npm:^1.22.1"
+    get-intrinsic: "npm:^1.2.1"
+    has-symbols: "npm:^1.0.3"
+    internal-slot: "npm:^1.0.5"
+    regexp.prototype.flags: "npm:^1.5.0"
+    set-function-name: "npm:^2.0.0"
+    side-channel: "npm:^1.0.4"
+  checksum: 10/0f7a1a7f91790cd45f804039a16bc6389c8f4f25903e648caa3eea080b019a5c7b0cac2ca83976646140c2332b159042140bf389f23675609d869dd52450cddc
   languageName: node
   linkType: hard
 
@@ -28105,10 +29800,10 @@ __metadata:
   version: 1.2.8
   resolution: "string.prototype.trim@npm:1.2.8"
   dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-  checksum: 49eb1a862a53aba73c3fb6c2a53f5463173cb1f4512374b623bcd6b43ad49dd559a06fb5789bdec771a40fc4d2a564411c0a75d35fb27e76bbe738c211ecff07
+    call-bind: "npm:^1.0.2"
+    define-properties: "npm:^1.2.0"
+    es-abstract: "npm:^1.22.1"
+  checksum: 10/9301f6cb2b6c44f069adde1b50f4048915985170a20a1d64cf7cb2dc53c5cd6b9525b92431f1257f894f94892d6c4ae19b5aa7f577c3589e7e51772dffc9d5a4
   languageName: node
   linkType: hard
 
@@ -28116,10 +29811,10 @@ __metadata:
   version: 1.0.7
   resolution: "string.prototype.trimend@npm:1.0.7"
   dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-  checksum: 2375516272fd1ba75992f4c4aa88a7b5f3c7a9ca308d963bcd5645adf689eba6f8a04ebab80c33e30ec0aefc6554181a3a8416015c38da0aa118e60ec896310c
+    call-bind: "npm:^1.0.2"
+    define-properties: "npm:^1.2.0"
+    es-abstract: "npm:^1.22.1"
+  checksum: 10/3f0d3397ab9bd95cd98ae2fe0943bd3e7b63d333c2ab88f1875cf2e7c958c75dc3355f6fe19ee7c8fca28de6f39f2475e955e103821feb41299a2764a7463ffa
   languageName: node
   linkType: hard
 
@@ -28127,26 +29822,26 @@ __metadata:
   version: 1.0.7
   resolution: "string.prototype.trimstart@npm:1.0.7"
   dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-  checksum: 13d0c2cb0d5ff9e926fa0bec559158b062eed2b68cd5be777ffba782c96b2b492944e47057274e064549b94dd27cf81f48b27a31fee8af5b574cff253e7eb613
+    call-bind: "npm:^1.0.2"
+    define-properties: "npm:^1.2.0"
+    es-abstract: "npm:^1.22.1"
+  checksum: 10/6e594d3a61b127d243b8be1312e9f78683abe452cfe0bcafa3e0dc62ad6f030ccfb64d87ed3086fb7cb540fda62442c164d237cc5cc4d53c6e3eb659c29a0aeb
   languageName: node
   linkType: hard
 
-"string_decoder@npm:^1.1.1":
+"string_decoder@npm:1.3.0, string_decoder@npm:^1.1.1":
   version: 1.3.0
   resolution: "string_decoder@npm:1.3.0"
   dependencies:
-    safe-buffer: ~5.2.0
-  checksum: 8417646695a66e73aefc4420eb3b84cc9ffd89572861fe004e6aeb13c7bc00e2f616247505d2dbbef24247c372f70268f594af7126f43548565c68c117bdeb56
+    safe-buffer: "npm:~5.2.0"
+  checksum: 10/54d23f4a6acae0e93f999a585e673be9e561b65cd4cca37714af1e893ab8cd8dfa52a9e4f58f48f87b4a44918d3a9254326cb80ed194bf2e4c226e2b21767e56
   languageName: node
   linkType: hard
 
 "string_decoder@npm:~0.10.x":
   version: 0.10.31
   resolution: "string_decoder@npm:0.10.31"
-  checksum: fe00f8e303647e5db919948ccb5ce0da7dea209ab54702894dd0c664edd98e5d4df4b80d6fabf7b9e92b237359d21136c95bf068b2f7760b772ca974ba970202
+  checksum: 10/cc43e6b1340d4c7843da0e37d4c87a4084c2342fc99dcf6563c3ec273bb082f0cbd4ebf25d5da19b04fb16400d393885fda830be5128e1c416c73b5a6165f175
   languageName: node
   linkType: hard
 
@@ -28154,8 +29849,8 @@ __metadata:
   version: 1.1.1
   resolution: "string_decoder@npm:1.1.1"
   dependencies:
-    safe-buffer: ~5.1.0
-  checksum: 9ab7e56f9d60a28f2be697419917c50cac19f3e8e6c28ef26ed5f4852289fe0de5d6997d29becf59028556f2c62983790c1d9ba1e2a3cc401768ca12d5183a5b
+    safe-buffer: "npm:~5.1.0"
+  checksum: 10/7c41c17ed4dea105231f6df208002ebddd732e8e9e2d619d133cecd8e0087ddfd9587d2feb3c8caf3213cbd841ada6d057f5142cae68a4e62d3540778d9819b4
   languageName: node
   linkType: hard
 
@@ -28163,8 +29858,8 @@ __metadata:
   version: 6.0.1
   resolution: "strip-ansi@npm:6.0.1"
   dependencies:
-    ansi-regex: ^5.0.1
-  checksum: f3cd25890aef3ba6e1a74e20896c21a46f482e93df4a06567cebf2b57edabb15133f1f94e57434e0a958d61186087b1008e89c94875d019910a213181a14fc8c
+    ansi-regex: "npm:^5.0.1"
+  checksum: 10/ae3b5436d34fadeb6096367626ce987057713c566e1e7768818797e00ac5d62023d0f198c4e681eae9e20701721980b26a64a8f5b91238869592a9c6800719a2
   languageName: node
   linkType: hard
 
@@ -28172,38 +29867,38 @@ __metadata:
   version: 3.0.1
   resolution: "strip-ansi@npm:3.0.1"
   dependencies:
-    ansi-regex: ^2.0.0
-  checksum: 9b974de611ce5075c70629c00fa98c46144043db92ae17748fb780f706f7a789e9989fd10597b7c2053ae8d1513fd707816a91f1879b2f71e6ac0b6a863db465
+    ansi-regex: "npm:^2.0.0"
+  checksum: 10/9b974de611ce5075c70629c00fa98c46144043db92ae17748fb780f706f7a789e9989fd10597b7c2053ae8d1513fd707816a91f1879b2f71e6ac0b6a863db465
   languageName: node
   linkType: hard
 
-"strip-ansi@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "strip-ansi@npm:7.0.1"
+"strip-ansi@npm:^7.0.1, strip-ansi@npm:^7.1.0":
+  version: 7.1.0
+  resolution: "strip-ansi@npm:7.1.0"
   dependencies:
-    ansi-regex: ^6.0.1
-  checksum: 257f78fa433520e7f9897722731d78599cb3fce29ff26a20a5e12ba4957463b50a01136f37c43707f4951817a75e90820174853d6ccc240997adc5df8f966039
+    ansi-regex: "npm:^6.0.1"
+  checksum: 10/475f53e9c44375d6e72807284024ac5d668ee1d06010740dec0b9744f2ddf47de8d7151f80e5f6190fc8f384e802fdf9504b76a7e9020c9faee7103623338be2
   languageName: node
   linkType: hard
 
 "strip-bom@npm:^3.0.0":
   version: 3.0.0
   resolution: "strip-bom@npm:3.0.0"
-  checksum: 8d50ff27b7ebe5ecc78f1fe1e00fcdff7af014e73cf724b46fb81ef889eeb1015fc5184b64e81a2efe002180f3ba431bdd77e300da5c6685d702780fbf0c8d5b
+  checksum: 10/8d50ff27b7ebe5ecc78f1fe1e00fcdff7af014e73cf724b46fb81ef889eeb1015fc5184b64e81a2efe002180f3ba431bdd77e300da5c6685d702780fbf0c8d5b
   languageName: node
   linkType: hard
 
 "strip-bom@npm:^4.0.0":
   version: 4.0.0
   resolution: "strip-bom@npm:4.0.0"
-  checksum: 9dbcfbaf503c57c06af15fe2c8176fb1bf3af5ff65003851a102749f875a6dbe0ab3b30115eccf6e805e9d756830d3e40ec508b62b3f1ddf3761a20ebe29d3f3
+  checksum: 10/9dbcfbaf503c57c06af15fe2c8176fb1bf3af5ff65003851a102749f875a6dbe0ab3b30115eccf6e805e9d756830d3e40ec508b62b3f1ddf3761a20ebe29d3f3
   languageName: node
   linkType: hard
 
 "strip-final-newline@npm:^2.0.0":
   version: 2.0.0
   resolution: "strip-final-newline@npm:2.0.0"
-  checksum: 69412b5e25731e1938184b5d489c32e340605bb611d6140344abc3421b7f3c6f9984b21dff296dfcf056681b82caa3bb4cc996a965ce37bcfad663e92eae9c64
+  checksum: 10/69412b5e25731e1938184b5d489c32e340605bb611d6140344abc3421b7f3c6f9984b21dff296dfcf056681b82caa3bb4cc996a965ce37bcfad663e92eae9c64
   languageName: node
   linkType: hard
 
@@ -28211,161 +29906,140 @@ __metadata:
   version: 3.0.0
   resolution: "strip-indent@npm:3.0.0"
   dependencies:
-    min-indent: ^1.0.0
-  checksum: 18f045d57d9d0d90cd16f72b2313d6364fd2cb4bf85b9f593523ad431c8720011a4d5f08b6591c9d580f446e78855c5334a30fb91aa1560f5d9f95ed1b4a0530
-  languageName: node
-  linkType: hard
-
-"strip-indent@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "strip-indent@npm:4.0.0"
-  dependencies:
-    min-indent: ^1.0.1
-  checksum: 06cbcd93da721c46bc13caeb1c00af93a9b18146a1c95927672d2decab6a25ad83662772417cea9317a2507fb143253ecc23c4415b64f5828cef9b638a744598
+    min-indent: "npm:^1.0.0"
+  checksum: 10/18f045d57d9d0d90cd16f72b2313d6364fd2cb4bf85b9f593523ad431c8720011a4d5f08b6591c9d580f446e78855c5334a30fb91aa1560f5d9f95ed1b4a0530
   languageName: node
   linkType: hard
 
-"strip-json-comments@npm:3.1.1, strip-json-comments@npm:^3.0.1, strip-json-comments@npm:^3.1.0, strip-json-comments@npm:^3.1.1":
+"strip-json-comments@npm:3.1.1, strip-json-comments@npm:^3.0.1, strip-json-comments@npm:^3.1.1":
   version: 3.1.1
   resolution: "strip-json-comments@npm:3.1.1"
-  checksum: 492f73e27268f9b1c122733f28ecb0e7e8d8a531a6662efbd08e22cccb3f9475e90a1b82cab06a392f6afae6d2de636f977e231296400d0ec5304ba70f166443
+  checksum: 10/492f73e27268f9b1c122733f28ecb0e7e8d8a531a6662efbd08e22cccb3f9475e90a1b82cab06a392f6afae6d2de636f977e231296400d0ec5304ba70f166443
   languageName: node
   linkType: hard
 
-"strong-log-transformer@npm:^2.1.0":
+"strong-log-transformer@npm:2.1.0, strong-log-transformer@npm:^2.1.0":
   version: 2.1.0
   resolution: "strong-log-transformer@npm:2.1.0"
   dependencies:
-    duplexer: ^0.1.1
-    minimist: ^1.2.0
-    through: ^2.3.4
+    duplexer: "npm:^0.1.1"
+    minimist: "npm:^1.2.0"
+    through: "npm:^2.3.4"
   bin:
     sl-log-transformer: bin/sl-log-transformer.js
-  checksum: abf9a4ac143118f26c3a0771b204b02f5cf4fa80384ae158f25e02bfbff761038accc44a7f65869ccd5a5995a7f2c16b1466b83149644ba6cecd3072a8927297
+  checksum: 10/2fd14eb0a68893fdadefd89f964df404e3d637729c48aca015eb12d1c47455dee28b2522ad7150de23f7a57cce503656585e7644c9cd8532023ea572f8cc5a80
   languageName: node
   linkType: hard
 
-"style-loader@npm:3.3.3, style-loader@npm:^3.3.1":
-  version: 3.3.3
-  resolution: "style-loader@npm:3.3.3"
+"style-loader@npm:3.3.4, style-loader@npm:^3.3.1":
+  version: 3.3.4
+  resolution: "style-loader@npm:3.3.4"
   peerDependencies:
     webpack: ^5.0.0
-  checksum: f59c953f56f6a935bd6a1dfa409f1128fed2b66b48ce4a7a75b85862a7156e5e90ab163878962762f528ec4d510903d828da645e143fbffd26f055dc1c094078
-  languageName: node
-  linkType: hard
-
-"style-search@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "style-search@npm:0.1.0"
-  checksum: 3cfefe335033aad6d47da0725cb48f5db91a73935954c77eab77d9e415e6668cdb406da4a4f7ef9f1aca77853cf5ba7952c45e869caa5bd6439691d88098d468
+  checksum: 10/2dd2a77d4fc689e1f73836ed7653830cb4e628af0b2979dcf6f31524c72bf44fca4bac8aebe62df95a5f9be19bea18f952a2cfcaaeff32c524c4402226d9c58f
   languageName: node
   linkType: hard
 
-"stylehacks@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "stylehacks@npm:6.0.0"
+"stylehacks@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "stylehacks@npm:6.0.2"
   dependencies:
-    browserslist: ^4.21.4
-    postcss-selector-parser: ^6.0.4
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: b6071ab5f4451576e3a445f7304b41c43329f84d7a7987a91442febaabc1de51e62f1e37c4f37fad21990d3f573a8110bd31e09f9df7b8628465e19b1cdc702b
-  languageName: node
-  linkType: hard
-
-"stylelint-config-prettier@npm:9.0.5":
-  version: 9.0.5
-  resolution: "stylelint-config-prettier@npm:9.0.5"
+    browserslist: "npm:^4.22.2"
+    postcss-selector-parser: "npm:^6.0.15"
   peerDependencies:
-    stylelint: ">= 11.x < 15"
-  bin:
-    stylelint-config-prettier: bin/check.js
-    stylelint-config-prettier-check: bin/check.js
-  checksum: 3d04e463e0bb7e42a5ddec49eea6ef4ea07705d887e8a3ff1fcb82278a5e2bec1a36b8498ea7ed2d24878de29d7c94ac75b1d3ac4f8b19c3a84970595b29261f
+    postcss: ^8.4.31
+  checksum: 10/8073a89b9fd6f6070161b20c2e62eb7c2ec7bcfb9fcfb2a30f43b39664b8700171e0d0deb2a7f44ed271f8f72451d0d4ed0068236d0552d27f42f75dddb6d30a
   languageName: node
   linkType: hard
 
-"stylelint-config-sass-guidelines@npm:10.0.0":
-  version: 10.0.0
-  resolution: "stylelint-config-sass-guidelines@npm:10.0.0"
+"stylelint-config-sass-guidelines@npm:11.1.0":
+  version: 11.1.0
+  resolution: "stylelint-config-sass-guidelines@npm:11.1.0"
   dependencies:
-    postcss-scss: ^4.0.6
-    stylelint-scss: ^4.4.0
+    postcss-scss: "npm:^4.0.9"
+    stylelint-scss: "npm:^6.2.1"
   peerDependencies:
     postcss: ^8.4.21
-    stylelint: ^15.2.0
-  checksum: 1fbd55d780bc60c46ee9bdd9f2bb8097ff890791704faaaaecf6a0542250006a94d6726fd781d7fee68c831cd33093953d1f441c73b27471e76828d100446597
+    stylelint: ^16.1.0
+  checksum: 10/2585e83932ffa1fa5b2895f8e3edbec1d3a39bc1f9737b8eb8c055ff4fc9a1d62950287d9525e0b98ad653c5777eb4bfdfe066804440938c170c263117351ba3
   languageName: node
   linkType: hard
 
-"stylelint-scss@npm:^4.4.0":
-  version: 4.7.0
-  resolution: "stylelint-scss@npm:4.7.0"
-  dependencies:
-    postcss-media-query-parser: ^0.2.3
-    postcss-resolve-nested-selector: ^0.1.1
-    postcss-selector-parser: ^6.0.11
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    stylelint: ^14.5.1 || ^15.0.0
-  checksum: 7818e7dd402864ae27dda9ea28213e0b25454f3dbe1524abf894050e677686614f7ca26437d45db1af9a352cc78466320741e91cc8694f9271a672db609319d9
-  languageName: node
-  linkType: hard
-
-"stylelint@npm:15.11.0":
-  version: 15.11.0
-  resolution: "stylelint@npm:15.11.0"
-  dependencies:
-    "@csstools/css-parser-algorithms": ^2.3.1
-    "@csstools/css-tokenizer": ^2.2.0
-    "@csstools/media-query-list-parser": ^2.1.4
-    "@csstools/selector-specificity": ^3.0.0
-    balanced-match: ^2.0.0
-    colord: ^2.9.3
-    cosmiconfig: ^8.2.0
-    css-functions-list: ^3.2.1
-    css-tree: ^2.3.1
-    debug: ^4.3.4
-    fast-glob: ^3.3.1
-    fastest-levenshtein: ^1.0.16
-    file-entry-cache: ^7.0.0
-    global-modules: ^2.0.0
-    globby: ^11.1.0
-    globjoin: ^0.1.4
-    html-tags: ^3.3.1
-    ignore: ^5.2.4
-    import-lazy: ^4.0.0
-    imurmurhash: ^0.1.4
-    is-plain-object: ^5.0.0
-    known-css-properties: ^0.29.0
-    mathml-tag-names: ^2.1.3
-    meow: ^10.1.5
-    micromatch: ^4.0.5
-    normalize-path: ^3.0.0
-    picocolors: ^1.0.0
-    postcss: ^8.4.28
-    postcss-resolve-nested-selector: ^0.1.1
-    postcss-safe-parser: ^6.0.0
-    postcss-selector-parser: ^6.0.13
-    postcss-value-parser: ^4.2.0
-    resolve-from: ^5.0.0
-    string-width: ^4.2.3
-    strip-ansi: ^6.0.1
-    style-search: ^0.1.0
-    supports-hyperlinks: ^3.0.0
-    svg-tags: ^1.0.0
-    table: ^6.8.1
-    write-file-atomic: ^5.0.1
+"stylelint-scss@npm:^6.2.1":
+  version: 6.2.1
+  resolution: "stylelint-scss@npm:6.2.1"
+  dependencies:
+    known-css-properties: "npm:^0.29.0"
+    postcss-media-query-parser: "npm:^0.2.3"
+    postcss-resolve-nested-selector: "npm:^0.1.1"
+    postcss-selector-parser: "npm:^6.0.15"
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    stylelint: ^16.0.2
+  checksum: 10/87a7af5775cb7b361b3ac143c5fe1dd59c25466f3255b501dd1bff3084d3af25cc7c6e00ec4a0bda18c30be481c885ff13255fdaa8245576aa44f38bfcfe4f70
+  languageName: node
+  linkType: hard
+
+"stylelint@npm:16.3.1":
+  version: 16.3.1
+  resolution: "stylelint@npm:16.3.1"
+  dependencies:
+    "@csstools/css-parser-algorithms": "npm:^2.6.1"
+    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/media-query-list-parser": "npm:^2.1.9"
+    "@csstools/selector-specificity": "npm:^3.0.2"
+    "@dual-bundle/import-meta-resolve": "npm:^4.0.0"
+    balanced-match: "npm:^2.0.0"
+    colord: "npm:^2.9.3"
+    cosmiconfig: "npm:^9.0.0"
+    css-functions-list: "npm:^3.2.1"
+    css-tree: "npm:^2.3.1"
+    debug: "npm:^4.3.4"
+    fast-glob: "npm:^3.3.2"
+    fastest-levenshtein: "npm:^1.0.16"
+    file-entry-cache: "npm:^8.0.0"
+    global-modules: "npm:^2.0.0"
+    globby: "npm:^11.1.0"
+    globjoin: "npm:^0.1.4"
+    html-tags: "npm:^3.3.1"
+    ignore: "npm:^5.3.1"
+    imurmurhash: "npm:^0.1.4"
+    is-plain-object: "npm:^5.0.0"
+    known-css-properties: "npm:^0.30.0"
+    mathml-tag-names: "npm:^2.1.3"
+    meow: "npm:^13.2.0"
+    micromatch: "npm:^4.0.5"
+    normalize-path: "npm:^3.0.0"
+    picocolors: "npm:^1.0.0"
+    postcss: "npm:^8.4.38"
+    postcss-resolve-nested-selector: "npm:^0.1.1"
+    postcss-safe-parser: "npm:^7.0.0"
+    postcss-selector-parser: "npm:^6.0.16"
+    postcss-value-parser: "npm:^4.2.0"
+    resolve-from: "npm:^5.0.0"
+    string-width: "npm:^4.2.3"
+    strip-ansi: "npm:^7.1.0"
+    supports-hyperlinks: "npm:^3.0.0"
+    svg-tags: "npm:^1.0.0"
+    table: "npm:^6.8.1"
+    write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 9835f8a3e3976a3b81a35569d08f5f4a9c3b5cff415f1345a505870afc0c3231acff27f119d937c5bb11fdbc98d554af564c2a648a52604280a59a11974fcbfc
+  checksum: 10/2dbc040512a7a97d4565de7af3289e7ecdf2a56d9174c253ad18c6aef55cd221731240e89c9b8c52bb9894205fe3929e06a6d8c8269e130e8947952210db4e68
   languageName: node
   linkType: hard
 
-"stylis@npm:4.2.0, stylis@npm:^4.0.6":
+"stylis@npm:4.2.0":
   version: 4.2.0
   resolution: "stylis@npm:4.2.0"
-  checksum: 0eb6cc1b866dc17a6037d0a82ac7fa877eba6a757443e79e7c4f35bacedbf6421fadcab4363b39667b43355cbaaa570a3cde850f776498e5450f32ed2f9b7584
+  checksum: 10/58359185275ef1f39c339ae94e598168aa6bb789f6cf0d52e726c1e7087a94e9c17f0385a28d34483dec1ffc2c75670ec714dc5603d99c3124ec83bc2b0a0f42
+  languageName: node
+  linkType: hard
+
+"stylis@npm:^4.3.0":
+  version: 4.3.1
+  resolution: "stylis@npm:4.3.1"
+  checksum: 10/20b04044397c5c69e4b9f00b037159ba82b602c61d45f26d8def08577fd6ddc4b2853d86818548c1b404d29194a99b6495cca1733880afc845533ced843cb266
   languageName: node
   linkType: hard
 
@@ -28373,8 +30047,8 @@ __metadata:
   version: 8.1.1
   resolution: "supports-color@npm:8.1.1"
   dependencies:
-    has-flag: ^4.0.0
-  checksum: c052193a7e43c6cdc741eb7f378df605636e01ad434badf7324f17fb60c69a880d8d8fcdcb562cf94c2350e57b937d7425ab5b8326c67c2adc48f7c87c1db406
+    has-flag: "npm:^4.0.0"
+  checksum: 10/157b534df88e39c5518c5e78c35580c1eca848d7dbaf31bbe06cdfc048e22c7ff1a9d046ae17b25691128f631a51d9ec373c1b740c12ae4f0de6e292037e4282
   languageName: node
   linkType: hard
 
@@ -28382,8 +30056,8 @@ __metadata:
   version: 5.5.0
   resolution: "supports-color@npm:5.5.0"
   dependencies:
-    has-flag: ^3.0.0
-  checksum: 95f6f4ba5afdf92f495b5a912d4abee8dcba766ae719b975c56c084f5004845f6f5a5f7769f52d53f40e21952a6d87411bafe34af4a01e65f9926002e38e1dac
+    has-flag: "npm:^3.0.0"
+  checksum: 10/5f505c6fa3c6e05873b43af096ddeb22159831597649881aeb8572d6fe3b81e798cc10840d0c9735e0026b250368851b7f77b65e84f4e4daa820a4f69947f55b
   languageName: node
   linkType: hard
 
@@ -28391,8 +30065,8 @@ __metadata:
   version: 7.2.0
   resolution: "supports-color@npm:7.2.0"
   dependencies:
-    has-flag: ^4.0.0
-  checksum: 3dda818de06ebbe5b9653e07842d9479f3555ebc77e9a0280caf5a14fb877ffee9ed57007c3b78f5a6324b8dbeec648d9e97a24e2ed9fdb81ddc69ea07100f4a
+    has-flag: "npm:^4.0.0"
+  checksum: 10/c8bb7afd564e3b26b50ca6ee47572c217526a1389fe018d00345856d4a9b08ffbd61fadaf283a87368d94c3dcdb8f5ffe2650a5a65863e21ad2730ca0f05210a
   languageName: node
   linkType: hard
 
@@ -28400,98 +30074,115 @@ __metadata:
   version: 3.0.0
   resolution: "supports-hyperlinks@npm:3.0.0"
   dependencies:
-    has-flag: ^4.0.0
-    supports-color: ^7.0.0
-  checksum: 41021305de5255b10d821bf93c7a781f783e1693d0faec293d7fc7ccf17011b90bde84b0295fa92ba75c6c390351fe84fdd18848cad4bf656e464a958243c3e7
+    has-flag: "npm:^4.0.0"
+    supports-color: "npm:^7.0.0"
+  checksum: 10/911075a412d8bcfbbca413e8963d56ed0975e35ff98d599ef85301aed4221428653145263828b6c58cb4cb6ff24596be83ead3cca221a88a70428af93d5e2a73
   languageName: node
   linkType: hard
 
 "supports-preserve-symlinks-flag@npm:^1.0.0":
   version: 1.0.0
   resolution: "supports-preserve-symlinks-flag@npm:1.0.0"
-  checksum: 53b1e247e68e05db7b3808b99b892bd36fb096e6fba213a06da7fab22045e97597db425c724f2bbd6c99a3c295e1e73f3e4de78592289f38431049e1277ca0ae
+  checksum: 10/a9dc19ae2220c952bd2231d08ddeecb1b0328b61e72071ff4000c8384e145cc07c1c0bdb3b5a1cb06e186a7b2790f1dee793418b332f6ddf320de25d9125be7e
+  languageName: node
+  linkType: hard
+
+"svg-parser@npm:^2.0.4":
+  version: 2.0.4
+  resolution: "svg-parser@npm:2.0.4"
+  checksum: 10/ec196da6ea21481868ab26911970e35488361c39ead1c6cdd977ba16c885c21a91ddcbfd113bfb01f79a822e2a751ef85b2f7f95e2cb9245558ebce12c34af1f
   languageName: node
   linkType: hard
 
 "svg-pathdata@npm:^6.0.3":
   version: 6.0.3
   resolution: "svg-pathdata@npm:6.0.3"
-  checksum: f0e55be50c654be5d259d70945ed7e5354bf78e51c6039b4045d9f7c49d703a0c33dda36751815aec2824d046c417c35226e7491246ffff3e9164735ea428446
+  checksum: 10/ed20b3fd20fd2f9dfa519fee2a690ec6bff84be00882c04b1461d6e5a250da3e37236c1f3abe2dae9c8dae841cc33f2700396186f894e1953dc6c0149201ac21
   languageName: node
   linkType: hard
 
 "svg-tags@npm:^1.0.0":
   version: 1.0.0
   resolution: "svg-tags@npm:1.0.0"
-  checksum: 407e5ef87cfa2fb81c61d738081c2decd022ce13b922d035b214b49810630bf5d1409255a4beb3a940b77b32f6957806deff16f1bf0ce1ab11c7a184115a0b7f
+  checksum: 10/407e5ef87cfa2fb81c61d738081c2decd022ce13b922d035b214b49810630bf5d1409255a4beb3a940b77b32f6957806deff16f1bf0ce1ab11c7a184115a0b7f
   languageName: node
   linkType: hard
 
-"svgo@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "svgo@npm:3.0.2"
-  dependencies:
-    "@trysound/sax": 0.2.0
-    commander: ^7.2.0
-    css-select: ^5.1.0
-    css-tree: ^2.2.1
-    csso: ^5.0.5
-    picocolors: ^1.0.0
+"svgo@npm:^3.0.2, svgo@npm:^3.2.0":
+  version: 3.2.0
+  resolution: "svgo@npm:3.2.0"
+  dependencies:
+    "@trysound/sax": "npm:0.2.0"
+    commander: "npm:^7.2.0"
+    css-select: "npm:^5.1.0"
+    css-tree: "npm:^2.3.1"
+    css-what: "npm:^6.1.0"
+    csso: "npm:^5.0.5"
+    picocolors: "npm:^1.0.0"
   bin:
-    svgo: bin/svgo
-  checksum: 381ba14aa782e71ab7033227634a3041c11fa3e2769aeaf0df43a08a615de61925108e34f55af6e7c5146f4a3109e78deabb4fa9d687e36d45d1f848b4e23d17
+    svgo: ./bin/svgo
+  checksum: 10/2fdf3f2090e17b3c309e60f69c78a2afd5a9771247adb540bae3fce467243f7a601a2a5497ef40998292da41ad828b3eabf3c18b75bf449c2d2cbf6d7f6e96d9
   languageName: node
   linkType: hard
 
-"swc-loader@npm:0.2.3, swc-loader@npm:^0.2.3":
-  version: 0.2.3
-  resolution: "swc-loader@npm:0.2.3"
+"swc-loader@npm:0.2.6, swc-loader@npm:^0.2.3":
+  version: 0.2.6
+  resolution: "swc-loader@npm:0.2.6"
+  dependencies:
+    "@swc/counter": "npm:^0.1.3"
   peerDependencies:
     "@swc/core": ^1.2.147
     webpack: ">=2"
-  checksum: 010d84d399525c0185d36d62c86c55ae017e7a90046bc8a39be4b7e07526924037868049f6037bc966da98151cb2600934b96a66279b742d3c413a718b427251
+  checksum: 10/fe90948c02a51bb8ffcff1ce3590e01dc12860b0bb7c9e22052b14fa846ed437781ae265614a5e14344bea22001108780f00a6e350e28c0b3499bc4cd11335fb
   languageName: node
   linkType: hard
 
 "symbol-observable@npm:4.0.0":
   version: 4.0.0
   resolution: "symbol-observable@npm:4.0.0"
-  checksum: 212c7edce6186634d671336a88c0e0bbd626c2ab51ed57498dc90698cce541839a261b969c2a1e8dd43762133d47672e8b62e0b1ce9cf4157934ba45fd172ba8
+  checksum: 10/983aef3912ad080fc834b9ad115d44bc2994074c57cea4fb008e9f7ab9bb4118b908c63d9edc861f51257bc0595025510bdf7263bb09d8953a6929f240165c24
   languageName: node
   linkType: hard
 
 "symbol-tree@npm:^3.2.4":
   version: 3.2.4
   resolution: "symbol-tree@npm:3.2.4"
-  checksum: 6e8fc7e1486b8b54bea91199d9535bb72f10842e40c79e882fc94fb7b14b89866adf2fd79efa5ebb5b658bc07fb459ccce5ac0e99ef3d72f474e74aaf284029d
+  checksum: 10/c09a00aadf279d47d0c5c46ca3b6b2fbaeb45f0a184976d599637d412d3a70bbdc043ff33effe1206dea0e36e0ad226cb957112e7ce9a4bf2daedf7fa4f85c53
   languageName: node
   linkType: hard
 
 "symlink-or-copy@npm:^1.1.8, symlink-or-copy@npm:^1.2.0, symlink-or-copy@npm:^1.3.1":
   version: 1.3.1
   resolution: "symlink-or-copy@npm:1.3.1"
-  checksum: 430c32ab5606f7b7c946a5a29ea17ce6cb0b34d8cb8394234b7abe710c8c029bf41030df79406cf49c4fc1e49aa979ca950b836767e3b8702acf9efe922a2f74
+  checksum: 10/ef6ad5fba2f423bfbd875fc61831521193483ce58f4280cf145e6ffa9d9f9e19f80bcbcbc87612e4c88b5a0a64871168e734b8a85dc04eab90a2201771f07790
   languageName: node
   linkType: hard
 
 "synchronous-promise@npm:^2.0.15":
   version: 2.0.17
   resolution: "synchronous-promise@npm:2.0.17"
-  checksum: 7b1342c93741f3f92ebde1edf5d6ce8dde2278de948d84e9bd85e232c16c0d77c90c4940f9975be3effcb20f047cfb0f16fa311c3b4e092c22f3bf2889fb0fb4
+  checksum: 10/dd74b1c05caab8ea34e26c8b52a0966efd70b0229ad39447ce066501dd6931d4d97a3f88b0f306880a699660cd334180a24d9738b385aed0bd0104a5be207ec1
   languageName: node
   linkType: hard
 
-"systemjs-cjs-extra@npm:0.2.0":
-  version: 0.2.0
-  resolution: "systemjs-cjs-extra@npm:0.2.0"
-  checksum: c00ea3dba63cbfb6629543cdd4fe5bcf61501cf395d08ca49b622de07fdd5a2c9a4c2c6c3a84ab73648e2da5cc690bdbdf7d5701868b654816ee8df28bd5a891
+"systemjs-cjs-extra@npm:0.2.1":
+  version: 0.2.1
+  resolution: "systemjs-cjs-extra@npm:0.2.1"
+  checksum: 10/b620af840b1f01f3facc0f9c6895d086fd207f1a55619183b5d4e787596963edc56250acbb3b597df02fbfac38fa8cc1b537d2dbb204ba7f56a2659f56d7a02f
   languageName: node
   linkType: hard
 
-"systemjs@npm:6.14.2":
-  version: 6.14.2
-  resolution: "systemjs@npm:6.14.2"
-  checksum: 1f58c7da8f7deb8e4a3eb357e67f5363eb97e44a456f8f81ece391f2e1ae54ac70fb62135043d4cf96c11c6b76d7963c295ea844ca25bcb3b55193f6727fd0b2
+"systemjs@npm:6.14.3":
+  version: 6.14.3
+  resolution: "systemjs@npm:6.14.3"
+  checksum: 10/5d79c3b7dbd68b246fba6a9fe2372b88765c61cb1dbbd550beaaae0a4b38a1f19de302e203f2106845f959d00c1e7f9976bccf9b0527e907d5f3d8b5c6c5f61a
+  languageName: node
+  linkType: hard
+
+"tabbable@npm:^6.0.0":
+  version: 6.2.0
+  resolution: "tabbable@npm:6.2.0"
+  checksum: 10/980fa73476026e99dcacfc0d6e000d41d42c8e670faf4682496d30c625495e412c4369694f2a15cf1e5252d22de3c396f2b62edbe8d60b5dadc40d09e3f2dde3
   languageName: node
   linkType: hard
 
@@ -28499,26 +30190,26 @@ __metadata:
   version: 6.8.1
   resolution: "table@npm:6.8.1"
   dependencies:
-    ajv: ^8.0.1
-    lodash.truncate: ^4.4.2
-    slice-ansi: ^4.0.0
-    string-width: ^4.2.3
-    strip-ansi: ^6.0.1
-  checksum: 08249c7046125d9d0a944a6e96cfe9ec66908d6b8a9db125531be6eb05fa0de047fd5542e9d43b4f987057f00a093b276b8d3e19af162a9c40db2681058fd306
+    ajv: "npm:^8.0.1"
+    lodash.truncate: "npm:^4.4.2"
+    slice-ansi: "npm:^4.0.0"
+    string-width: "npm:^4.2.3"
+    strip-ansi: "npm:^6.0.1"
+  checksum: 10/512c4f2bfb6f46f4d5ced19943ae5db1a5163eac1f23ce752625eb49715f84217c1c62bc2d017eb8985b37e0f85731108f654df809c0b34cca1678a672e7ea20
   languageName: node
   linkType: hard
 
 "tapable@npm:^1.0.0":
   version: 1.1.3
   resolution: "tapable@npm:1.1.3"
-  checksum: 53ff4e7c3900051c38cc4faab428ebfd7e6ad0841af5a7ac6d5f3045c5b50e88497bfa8295b4b3fbcadd94993c9e358868b78b9fb249a76cb8b018ac8dccafd7
+  checksum: 10/1cec71f00f9a6cb1d88961b5d4f2dead4e185508b18b1bf1e688c8135039a391dd3e12b0887232b682ef28f1ef6f0c5e9a48794f6f5ef68f35d05de7e7a0a578
   languageName: node
   linkType: hard
 
 "tapable@npm:^2.0.0, tapable@npm:^2.1.1, tapable@npm:^2.2.0, tapable@npm:^2.2.1":
   version: 2.2.1
   resolution: "tapable@npm:2.2.1"
-  checksum: 3b7a1b4d86fa940aad46d9e73d1e8739335efd4c48322cb37d073eb6f80f5281889bf0320c6d8ffcfa1a0dd5bfdbd0f9d037e252ef972aca595330538aac4d51
+  checksum: 10/1769336dd21481ae6347611ca5fca47add0962fd8e80466515032125eca0084a4f0ede11e65341b9c0018ef4e1cf1ad820adbb0fba7cc99865c6005734000b0a
   languageName: node
   linkType: hard
 
@@ -28526,11 +30217,11 @@ __metadata:
   version: 2.1.1
   resolution: "tar-fs@npm:2.1.1"
   dependencies:
-    chownr: ^1.1.1
-    mkdirp-classic: ^0.5.2
-    pump: ^3.0.0
-    tar-stream: ^2.1.4
-  checksum: f5b9a70059f5b2969e65f037b4e4da2daf0fa762d3d232ffd96e819e3f94665dbbbe62f76f084f1acb4dbdcce16c6e4dac08d12ffc6d24b8d76720f4d9cf032d
+    chownr: "npm:^1.1.1"
+    mkdirp-classic: "npm:^0.5.2"
+    pump: "npm:^3.0.0"
+    tar-stream: "npm:^2.1.4"
+  checksum: 10/526deae025453e825f87650808969662fbb12eb0461d033e9b447de60ec951c6c4607d0afe7ce057defe9d4e45cf80399dd74bc15f9d9e0773d5e990a78ce4ac
   languageName: node
   linkType: hard
 
@@ -28538,26 +30229,40 @@ __metadata:
   version: 2.2.0
   resolution: "tar-stream@npm:2.2.0"
   dependencies:
-    bl: ^4.0.3
-    end-of-stream: ^1.4.1
-    fs-constants: ^1.0.0
-    inherits: ^2.0.3
-    readable-stream: ^3.1.1
-  checksum: 699831a8b97666ef50021c767f84924cfee21c142c2eb0e79c63254e140e6408d6d55a065a2992548e72b06de39237ef2b802b99e3ece93ca3904a37622a66f3
+    bl: "npm:^4.0.3"
+    end-of-stream: "npm:^1.4.1"
+    fs-constants: "npm:^1.0.0"
+    inherits: "npm:^2.0.3"
+    readable-stream: "npm:^3.1.1"
+  checksum: 10/1a52a51d240c118cbcd30f7368ea5e5baef1eac3e6b793fb1a41e6cd7319296c79c0264ccc5859f5294aa80f8f00b9239d519e627b9aade80038de6f966fec6a
   languageName: node
   linkType: hard
 
-"tar@npm:^6.0.2, tar@npm:^6.1.0, tar@npm:^6.1.11, tar@npm:^6.1.13, tar@npm:^6.1.2":
+"tar@npm:6.1.11":
+  version: 6.1.11
+  resolution: "tar@npm:6.1.11"
+  dependencies:
+    chownr: "npm:^2.0.0"
+    fs-minipass: "npm:^2.0.0"
+    minipass: "npm:^3.0.0"
+    minizlib: "npm:^2.1.1"
+    mkdirp: "npm:^1.0.3"
+    yallist: "npm:^4.0.0"
+  checksum: 10/0e6789e66475922b8e0d1ee648cb26e0ede9a0635284269ca71b2d8acd507bc59ad5557032f0192f8ff22680b50cb66792b56f0240f484fe0d7d8cef81c1b959
+  languageName: node
+  linkType: hard
+
+"tar@npm:^6.0.2, tar@npm:^6.1.11, tar@npm:^6.1.13, tar@npm:^6.1.2":
   version: 6.1.13
   resolution: "tar@npm:6.1.13"
   dependencies:
-    chownr: ^2.0.0
-    fs-minipass: ^2.0.0
-    minipass: ^4.0.0
-    minizlib: ^2.1.1
-    mkdirp: ^1.0.3
-    yallist: ^4.0.0
-  checksum: 8a278bed123aa9f53549b256a36b719e317c8b96fe86a63406f3c62887f78267cea9b22dc6f7007009738509800d4a4dccc444abd71d762287c90f35b002eb1c
+    chownr: "npm:^2.0.0"
+    fs-minipass: "npm:^2.0.0"
+    minipass: "npm:^4.0.0"
+    minizlib: "npm:^2.1.1"
+    mkdirp: "npm:^1.0.3"
+    yallist: "npm:^4.0.0"
+  checksum: 10/add2c3c6d0d71192186ec118d265b92d94be5cd57a0b8fdf0d29ee46dc846574925a5fc57170eefffd78201eda4c45d7604070b5a4b0648e4d6e1d65918b5a82
   languageName: node
   linkType: hard
 
@@ -28565,8 +30270,8 @@ __metadata:
   version: 1.0.1
   resolution: "teex@npm:1.0.1"
   dependencies:
-    streamx: ^2.12.5
-  checksum: 36bf7ce8bb5eb428ad7b14b695ee7fb0a02f09c1a9d8181cc42531208543a920b299d711bf78dad4ff9bcf36ac437ae8e138053734746076e3e0e7d6d76eef64
+    streamx: "npm:^2.12.5"
+  checksum: 10/36bf7ce8bb5eb428ad7b14b695ee7fb0a02f09c1a9d8181cc42531208543a920b299d711bf78dad4ff9bcf36ac437ae8e138053734746076e3e0e7d6d76eef64
   languageName: node
   linkType: hard
 
@@ -28574,22 +30279,22 @@ __metadata:
   version: 7.2.0
   resolution: "telejson@npm:7.2.0"
   dependencies:
-    memoizerific: ^1.11.3
-  checksum: 55a3380c9ff3c5ad84581bb6bda28fc33c6b7c4a0c466894637da687639b8db0d21b0ff4c1bc1a7a92ae6b70662549d09e7b9e8b1ec334b2ef93078762ecdfb9
+    memoizerific: "npm:^1.11.3"
+  checksum: 10/6e89b3d3c45b5a2aced9132f6a968fcdf758c00be4c3acb115d7d81e95c9e04083a7a4a9b43057fcf48b101156c1607a38f5491615956acb28d4d1f78a4bda20
   languageName: node
   linkType: hard
 
-"temp-dir@npm:^1.0.0":
+"temp-dir@npm:1.0.0":
   version: 1.0.0
   resolution: "temp-dir@npm:1.0.0"
-  checksum: cb2b58ddfb12efa83e939091386ad73b425c9a8487ea0095fe4653192a40d49184a771a1beba99045fbd011e389fd563122d79f54f82be86a55620667e08a6b2
+  checksum: 10/cb2b58ddfb12efa83e939091386ad73b425c9a8487ea0095fe4653192a40d49184a771a1beba99045fbd011e389fd563122d79f54f82be86a55620667e08a6b2
   languageName: node
   linkType: hard
 
 "temp-dir@npm:^2.0.0":
   version: 2.0.0
   resolution: "temp-dir@npm:2.0.0"
-  checksum: cc4f0404bf8d6ae1a166e0e64f3f409b423f4d1274d8c02814a59a5529f07db6cd070a749664141b992b2c1af337fa9bb451a460a43bb9bcddc49f235d3115aa
+  checksum: 10/cc4f0404bf8d6ae1a166e0e64f3f409b423f4d1274d8c02814a59a5529f07db6cd070a749664141b992b2c1af337fa9bb451a460a43bb9bcddc49f235d3115aa
   languageName: node
   linkType: hard
 
@@ -28597,8 +30302,8 @@ __metadata:
   version: 0.8.4
   resolution: "temp@npm:0.8.4"
   dependencies:
-    rimraf: ~2.6.2
-  checksum: f35bed78565355dfdf95f730b7b489728bd6b7e35071bcc6497af7c827fb6c111fbe9063afc7b8cbc19522a072c278679f9a0ee81e684aa2c8617cc0f2e9c191
+    rimraf: "npm:~2.6.2"
+  checksum: 10/0a7f76b49637415bc391c3f6e69377cc4c38afac95132b4158fa711e77b70b082fe56fd886f9d11ffab9d148df181a105a93c8b618fb72266eeaa5e5ddbfe37f
   languageName: node
   linkType: hard
 
@@ -28606,24 +30311,24 @@ __metadata:
   version: 1.0.1
   resolution: "tempy@npm:1.0.1"
   dependencies:
-    del: ^6.0.0
-    is-stream: ^2.0.0
-    temp-dir: ^2.0.0
-    type-fest: ^0.16.0
-    unique-string: ^2.0.0
-  checksum: e77ca4440af18e42dc64d8903b7ed0be673455b76680ff94a7d7c6ee7c16f7604bdcdee3c39436342b1082c23eda010dbe48f6094e836e0bd53c8b1aa63e5b95
+    del: "npm:^6.0.0"
+    is-stream: "npm:^2.0.0"
+    temp-dir: "npm:^2.0.0"
+    type-fest: "npm:^0.16.0"
+    unique-string: "npm:^2.0.0"
+  checksum: 10/e3a3857cd102db84c484b8e878203b496f0e927025b7c60dd118c0c9a0962f4589321c6b3093185d529576af5c58be65d755e72c2a6ad009ff340ab8cbbe4d33
   languageName: node
   linkType: hard
 
-"terser-webpack-plugin@npm:5.3.9, terser-webpack-plugin@npm:^5.1.3, terser-webpack-plugin@npm:^5.3.1, terser-webpack-plugin@npm:^5.3.7":
-  version: 5.3.9
-  resolution: "terser-webpack-plugin@npm:5.3.9"
+"terser-webpack-plugin@npm:5.3.10, terser-webpack-plugin@npm:^5.3.1, terser-webpack-plugin@npm:^5.3.10, terser-webpack-plugin@npm:^5.3.7":
+  version: 5.3.10
+  resolution: "terser-webpack-plugin@npm:5.3.10"
   dependencies:
-    "@jridgewell/trace-mapping": ^0.3.17
-    jest-worker: ^27.4.5
-    schema-utils: ^3.1.1
-    serialize-javascript: ^6.0.1
-    terser: ^5.16.8
+    "@jridgewell/trace-mapping": "npm:^0.3.20"
+    jest-worker: "npm:^27.4.5"
+    schema-utils: "npm:^3.1.1"
+    serialize-javascript: "npm:^6.0.1"
+    terser: "npm:^5.26.0"
   peerDependencies:
     webpack: ^5.1.0
   peerDependenciesMeta:
@@ -28633,21 +30338,21 @@ __metadata:
       optional: true
     uglify-js:
       optional: true
-  checksum: 41705713d6f9cb83287936b21e27c658891c78c4392159f5148b5623f0e8c48559869779619b058382a4c9758e7820ea034695e57dc7c474b4962b79f553bc5f
+  checksum: 10/fb1c2436ae1b4e983be043fa0a3d355c047b16b68f102437d08c736d7960c001e7420e2f722b9d99ce0dc70ca26a68cc63c0b82bc45f5b48671142b352a9d938
   languageName: node
   linkType: hard
 
-"terser@npm:^5.0.0, terser@npm:^5.14.2, terser@npm:^5.16.8, terser@npm:^5.7.2":
-  version: 5.17.2
-  resolution: "terser@npm:5.17.2"
+"terser@npm:^5.15.1, terser@npm:^5.17.4, terser@npm:^5.26.0, terser@npm:^5.7.2":
+  version: 5.29.2
+  resolution: "terser@npm:5.29.2"
   dependencies:
-    "@jridgewell/source-map": ^0.3.2
-    acorn: ^8.5.0
-    commander: ^2.20.0
-    source-map-support: ~0.5.20
+    "@jridgewell/source-map": "npm:^0.3.3"
+    acorn: "npm:^8.8.2"
+    commander: "npm:^2.20.0"
+    source-map-support: "npm:~0.5.20"
   bin:
     terser: bin/terser
-  checksum: 20153b0887065ff7d026bbbd9d0df065871406f9b66b0fa83786400c32c10b93b2309bff0df48f42473e7c3559bfd22d3ce593b82797bac9c882a243d008f5b9
+  checksum: 10/062df6a8f99ea2635d1b3ce41cfd4180dea6e1c83db9b2cf4b525170b2446d10e069d2877d8dcb59fbf6045870efa17b56462b67045ef2d2b420870f9d144690
   languageName: node
   linkType: hard
 
@@ -28655,25 +30360,19 @@ __metadata:
   version: 6.0.0
   resolution: "test-exclude@npm:6.0.0"
   dependencies:
-    "@istanbuljs/schema": ^0.1.2
-    glob: ^7.1.4
-    minimatch: ^3.0.4
-  checksum: 3b34a3d77165a2cb82b34014b3aba93b1c4637a5011807557dc2f3da826c59975a5ccad765721c4648b39817e3472789f9b0fa98fc854c5c1c7a1e632aacdc28
+    "@istanbuljs/schema": "npm:^0.1.2"
+    glob: "npm:^7.1.4"
+    minimatch: "npm:^3.0.4"
+  checksum: 10/8fccb2cb6c8fcb6bb4115394feb833f8b6cf4b9503ec2485c2c90febf435cac62abe882a0c5c51a37b9bbe70640cdd05acf5f45e486ac4583389f4b0855f69e5
   languageName: node
   linkType: hard
 
-"test@link:./public/test::locator=grafana%40workspace%3A.":
-  version: 0.0.0-use.local
-  resolution: "test@link:./public/test::locator=grafana%40workspace%3A."
-  languageName: node
-  linkType: soft
-
 "testing-library-selector@npm:0.3.1":
   version: 0.3.1
   resolution: "testing-library-selector@npm:0.3.1"
   peerDependencies:
     "@testing-library/dom": ^9.3.3
-  checksum: ee0b4ed2e266ba8d7d86a625e7326a20177b6492c611eca5696ab7c4ab03c34bf967358cca1593c9b584aea28b8f0b7a2a071868d0b821817026b892c1e84310
+  checksum: 10/979dc68c506688fa2e0d7f974c7213e423e082bf676b2a5d076984596316b6c9b065a98fadcda468e1a2dec2e3ab658b96a93a059976e2dedc62e9e6d439617d
   languageName: node
   linkType: hard
 
@@ -28681,22 +30380,22 @@ __metadata:
   version: 1.5.0
   resolution: "tether-drop@https://github.com/torkelo/drop.git#commit=fc83ca88db0076fbf6359cbe1743a9ef0f1ee6e1"
   dependencies:
-    tether: ^1.1.0
-  checksum: a10a7337d57cd9daf2ddc9bfd0f1d2aefc0fbd7ec6aad03c900adcaf55803250e7fbecec679ceb9766987a95eac5e55f073be1f8074a4b100771d9188ec6c8aa
+    tether: "npm:^1.1.0"
+  checksum: 10/178c3afb889ee6dc860f767ffd7a959774adce200148e067aff631888b98fd046123f887ca40152581a13c430ad1fa72e2a9dba9de4e79e3f7634e224c229188
   languageName: node
   linkType: hard
 
 "tether@npm:^1.1.0":
   version: 1.4.7
   resolution: "tether@npm:1.4.7"
-  checksum: 766ac802654064b05e5785584a109101fc184266a0df99581a3ac45d33706c39d9fed314bd28daddf3532bfa0c41f81ebc133ce2c51995101ac922d3fb0477b8
+  checksum: 10/4185215f28392733f6248ea5d1734cd411d921ba3d5ae92df977bc1d11bd88dcf469ed6ceb9195accd8facc136ddd87d286f18cab2544300412e3f2d073d8e68
   languageName: node
   linkType: hard
 
 "text-extensions@npm:^1.0.0":
   version: 1.9.0
   resolution: "text-extensions@npm:1.9.0"
-  checksum: 56a9962c1b62d39b2bcb369b7558ca85c1b55e554b38dfd725edcc0a1babe5815782a60c17ff6b839093b163dfebb92b804208aaaea616ec7571c8059ae0cf44
+  checksum: 10/56a9962c1b62d39b2bcb369b7558ca85c1b55e554b38dfd725edcc0a1babe5815782a60c17ff6b839093b163dfebb92b804208aaaea616ec7571c8059ae0cf44
   languageName: node
   linkType: hard
 
@@ -28704,114 +30403,95 @@ __metadata:
   version: 1.0.3
   resolution: "text-segmentation@npm:1.0.3"
   dependencies:
-    utrie: ^1.0.2
-  checksum: 2e24632d59567c55ab49ac324815e2f7a8043e63e26b109636322ac3e30692cee8679a448fd5d0f0598a345f407afd0e34ba612e22524cf576d382d84058c013
+    utrie: "npm:^1.0.2"
+  checksum: 10/86191de83f09b96f356628c3dbaf6d281eda46a4dd4c94c3827495428871b9dd44ead4ef4cdf06a188b08a3b83e3943c5911841422b55286b121ba9e04c846dd
   languageName: node
   linkType: hard
 
 "text-table@npm:^0.2.0":
   version: 0.2.0
   resolution: "text-table@npm:0.2.0"
-  checksum: b6937a38c80c7f84d9c11dd75e49d5c44f71d95e810a3250bd1f1797fc7117c57698204adf676b71497acc205d769d65c16ae8fa10afad832ae1322630aef10a
+  checksum: 10/4383b5baaeffa9bb4cda2ac33a4aa2e6d1f8aaf811848bf73513a9b88fd76372dc461f6fd6d2e9cb5100f48b473be32c6f95bd983509b7d92bb4d92c10747452
   languageName: node
   linkType: hard
 
 "thenby@npm:^1.3.4":
   version: 1.3.4
   resolution: "thenby@npm:1.3.4"
-  checksum: 2d2ef3d67fa851467f328f1373da75a760d6a469d45f667570703894656057a666a1fb488398ce7830606253dba24eb55a063d6ce939e9e872a2b9d2cdd68c2c
+  checksum: 10/4422e71677adb8215a34e2096845f51114dd285faf730915e7171e6d2a778a29c6df75523c731eee3b7feddf57436ef7764ff526dbb1686af390a064ee15a14f
   languageName: node
   linkType: hard
 
 "throttle-debounce@npm:^3.0.1":
   version: 3.0.1
   resolution: "throttle-debounce@npm:3.0.1"
-  checksum: e34ef638e8df3a9154249101b68afcbf2652a139c803415ef8a2f6a8bc577bcd4d79e4bb914ad3cd206523ac78b9fb7e80885bfa049f64fbb1927f99d98b5736
+  checksum: 10/c2b591bc881c595d44d5ee82cc607747569a84cd9652e7d9613d92759d84ffd61eab1ca56c6a294316b8c9978ff6d46c2c94ed95de5847f3de4b6c30342cb947
   languageName: node
   linkType: hard
 
 "throttleit@npm:^1.0.0":
   version: 1.0.0
   resolution: "throttleit@npm:1.0.0"
-  checksum: 1b2db4d2454202d589e8236c07a69d2fab838876d370030ebea237c34c0a7d1d9cf11c29f994531ebb00efd31e9728291042b7754f2798a8352ec4463455b659
+  checksum: 10/cfc5b156143a6c4c3a2265a9926fa4964ac3c71c746245cef00afb92359aba8ba3fd905afd97e3ff6403f57971f5e2cdf01cad631799448773ae81d8de5cade6
   languageName: node
   linkType: hard
 
-"through2-filter@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "through2-filter@npm:3.0.0"
-  dependencies:
-    through2: ~2.0.0
-    xtend: ~4.0.0
-  checksum: 2fa0f042290749824b973c27ae006f9dfe7c9bcee570504ab066998e3bd7d43bea28b642eef8a4434dbfd0a7cd18c8823ac81927614234fd477ccd5ea38fab18
-  languageName: node
-  linkType: hard
-
-"through2@npm:^2.0.0, through2@npm:^2.0.1, through2@npm:^2.0.3, through2@npm:~2.0.0":
+"through2@npm:^2.0.0, through2@npm:^2.0.1, through2@npm:^2.0.3":
   version: 2.0.5
   resolution: "through2@npm:2.0.5"
   dependencies:
-    readable-stream: ~2.3.6
-    xtend: ~4.0.1
-  checksum: beb0f338aa2931e5660ec7bf3ad949e6d2e068c31f4737b9525e5201b824ac40cac6a337224856b56bd1ddd866334bbfb92a9f57cd6f66bc3f18d3d86fc0fe50
-  languageName: node
-  linkType: hard
-
-"through2@npm:^4.0.0, through2@npm:~4.0.2":
-  version: 4.0.2
-  resolution: "through2@npm:4.0.2"
-  dependencies:
-    readable-stream: 3
-  checksum: ac7430bd54ccb7920fd094b1c7ff3e1ad6edd94202e5528331253e5fde0cc56ceaa690e8df9895de2e073148c52dfbe6c4db74cacae812477a35660090960cc0
+    readable-stream: "npm:~2.3.6"
+    xtend: "npm:~4.0.1"
+  checksum: 10/cd71f7dcdc7a8204fea003a14a433ef99384b7d4e31f5497e1f9f622b3cf3be3691f908455f98723bdc80922a53af7fa10c3b7abbe51c6fd3d536dbc7850e2c4
   languageName: node
   linkType: hard
 
 "through@npm:2, through@npm:2.3.x, through@npm:>=2.2.7 <3, through@npm:^2.3.4, through@npm:^2.3.6, through@npm:^2.3.8":
   version: 2.3.8
   resolution: "through@npm:2.3.8"
-  checksum: a38c3e059853c494af95d50c072b83f8b676a9ba2818dcc5b108ef252230735c54e0185437618596c790bbba8fcdaef5b290405981ffa09dce67b1f1bf190cbd
+  checksum: 10/5da78346f70139a7d213b65a0106f3c398d6bc5301f9248b5275f420abc2c4b1e77c2abc72d218dedc28c41efb2e7c312cb76a7730d04f9c2d37d247da3f4198
   languageName: node
   linkType: hard
 
 "thunky@npm:^1.0.2":
   version: 1.1.0
   resolution: "thunky@npm:1.1.0"
-  checksum: 993096c472b6b8f30e29dc777a8d17720e4cab448375041f20c0cb802a09a7fb2217f2a3e8cdc11851faa71c957e2db309357367fc9d7af3cb7a4d00f4b66034
+  checksum: 10/825e3bd07ab3c9fd6f753c457a60957c628cacba5dd0656fd93b037c445e2828b43cf0805a9f2b16b0c5f5a10fd561206271acddb568df4f867f0aea0eb2772f
   languageName: node
   linkType: hard
 
 "timsort@npm:^0.3.0":
   version: 0.3.0
   resolution: "timsort@npm:0.3.0"
-  checksum: 1a66cb897dacabd7dd7c91b7e2301498ca9e224de2edb9e42d19f5b17c4b6dc62a8d4cbc64f28be82aaf1541cb5a78ab49aa818f42a2989ebe049a64af731e2a
+  checksum: 10/f4b8e0afa770440660b98034d7170333033b96fb6cb32d2fdfab65f78ba7741b9e271e2351631daacfa78a471d33f8ea1f5a29f94e960621f25045bfada46f3f
   languageName: node
   linkType: hard
 
 "tiny-invariant@npm:^1.0.1, tiny-invariant@npm:^1.0.2, tiny-invariant@npm:^1.0.6, tiny-invariant@npm:^1.2.0, tiny-invariant@npm:^1.3.1":
   version: 1.3.1
   resolution: "tiny-invariant@npm:1.3.1"
-  checksum: 872dbd1ff20a21303a2fd20ce3a15602cfa7fcf9b228bd694a52e2938224313b5385a1078cb667ed7375d1612194feaca81c4ecbe93121ca1baebe344de4f84c
+  checksum: 10/872dbd1ff20a21303a2fd20ce3a15602cfa7fcf9b228bd694a52e2938224313b5385a1078cb667ed7375d1612194feaca81c4ecbe93121ca1baebe344de4f84c
   languageName: node
   linkType: hard
 
 "tiny-warning@npm:^0.0.3":
   version: 0.0.3
   resolution: "tiny-warning@npm:0.0.3"
-  checksum: edc25b4cfd50f55cdfde932b172b94f8581f6f1b1e5a9ec15c4978f7719baf523e71e26549dde714787868d41aa6b9bc1dacff2300cc0d180f8c44d040f7b1a5
+  checksum: 10/edc25b4cfd50f55cdfde932b172b94f8581f6f1b1e5a9ec15c4978f7719baf523e71e26549dde714787868d41aa6b9bc1dacff2300cc0d180f8c44d040f7b1a5
   languageName: node
   linkType: hard
 
 "tiny-warning@npm:^1.0.0, tiny-warning@npm:^1.0.3":
   version: 1.0.3
   resolution: "tiny-warning@npm:1.0.3"
-  checksum: da62c4acac565902f0624b123eed6dd3509bc9a8d30c06e017104bedcf5d35810da8ff72864400ad19c5c7806fc0a8323c68baf3e326af7cb7d969f846100d71
+  checksum: 10/da62c4acac565902f0624b123eed6dd3509bc9a8d30c06e017104bedcf5d35810da8ff72864400ad19c5c7806fc0a8323c68baf3e326af7cb7d969f846100d71
   languageName: node
   linkType: hard
 
 "tinycolor2@npm:1.6.0":
   version: 1.6.0
   resolution: "tinycolor2@npm:1.6.0"
-  checksum: 6df4d07fceeedc0a878d7bac47e2cd47c1ceeb1078340a9eb8a295bc0651e17c750f73d47b3028d829f30b85c15e0572c0fd4142083e4c21a30a597e47f47230
+  checksum: 10/066c3acf4f82b81c58a0d3ab85f49407efe95ba87afc3c7a16b1d77625193dfbe10dd46c26d0a263c1137361dd5a6a68bff2fb71def5fb9b9aec940fb030bcd4
   languageName: node
   linkType: hard
 
@@ -28819,8 +30499,8 @@ __metadata:
   version: 0.0.33
   resolution: "tmp@npm:0.0.33"
   dependencies:
-    os-tmpdir: ~1.0.2
-  checksum: 902d7aceb74453ea02abbf58c203f4a8fc1cead89b60b31e354f74ed5b3fb09ea817f94fb310f884a5d16987dd9fa5a735412a7c2dd088dd3d415aa819ae3a28
+    os-tmpdir: "npm:~1.0.2"
+  checksum: 10/09c0abfd165cff29b32be42bc35e80b8c64727d97dedde6550022e88fa9fd39a084660415ed8e3ebaa2aca1ee142f86df8b31d4196d4f81c774a3a20fd4b6abf
   languageName: node
   linkType: hard
 
@@ -28828,25 +30508,15 @@ __metadata:
   version: 0.2.1
   resolution: "tmp@npm:0.2.1"
   dependencies:
-    rimraf: ^3.0.0
-  checksum: 8b1214654182575124498c87ca986ac53dc76ff36e8f0e0b67139a8d221eaecfdec108c0e6ec54d76f49f1f72ab9325500b246f562b926f85bcdfca8bf35df9e
+    rimraf: "npm:^3.0.0"
+  checksum: 10/445148d72df3ce99356bc89a7857a0c5c3b32958697a14e50952c6f7cf0a8016e746ababe9a74c1aa52f04c526661992f14659eba34d3c6701d49ba2f3cf781b
   languageName: node
   linkType: hard
 
 "tmpl@npm:1.0.5":
   version: 1.0.5
   resolution: "tmpl@npm:1.0.5"
-  checksum: cd922d9b853c00fe414c5a774817be65b058d54a2d01ebb415840960406c669a0fc632f66df885e24cb022ec812739199ccbdb8d1164c3e513f85bfca5ab2873
-  languageName: node
-  linkType: hard
-
-"to-absolute-glob@npm:^2.0.0":
-  version: 2.0.2
-  resolution: "to-absolute-glob@npm:2.0.2"
-  dependencies:
-    is-absolute: ^1.0.0
-    is-negated-glob: ^1.0.0
-  checksum: 0a8bef172909e43d711bfd33792643f2eec35b9109bde927dabfd231e6ad643b7a657f306c93c6e7b89f71d3de74ac94060fe9637bca8c37b036523993664323
+  checksum: 10/cd922d9b853c00fe414c5a774817be65b058d54a2d01ebb415840960406c669a0fc632f66df885e24cb022ec812739199ccbdb8d1164c3e513f85bfca5ab2873
   languageName: node
   linkType: hard
 
@@ -28854,22 +30524,22 @@ __metadata:
   version: 1.0.0
   resolution: "to-camel-case@npm:1.0.0"
   dependencies:
-    to-space-case: ^1.0.0
-  checksum: 2f74cfcffa58e8ddede7e01a03eda2cc3f0ab50efdad1d0f1092d55b4e499be43846d1f9087c458fa9efde4958e407738197d65858272c56c915b649b9ca1e62
+    to-space-case: "npm:^1.0.0"
+  checksum: 10/2f74cfcffa58e8ddede7e01a03eda2cc3f0ab50efdad1d0f1092d55b4e499be43846d1f9087c458fa9efde4958e407738197d65858272c56c915b649b9ca1e62
   languageName: node
   linkType: hard
 
 "to-fast-properties@npm:^2.0.0":
   version: 2.0.0
   resolution: "to-fast-properties@npm:2.0.0"
-  checksum: be2de62fe58ead94e3e592680052683b1ec986c72d589e7b21e5697f8744cdbf48c266fa72f6c15932894c10187b5f54573a3bcf7da0bfd964d5caf23d436168
+  checksum: 10/be2de62fe58ead94e3e592680052683b1ec986c72d589e7b21e5697f8744cdbf48c266fa72f6c15932894c10187b5f54573a3bcf7da0bfd964d5caf23d436168
   languageName: node
   linkType: hard
 
 "to-no-case@npm:^1.0.0":
   version: 1.0.2
   resolution: "to-no-case@npm:1.0.2"
-  checksum: 1d85326eeb89f9f3a805bf5b395bcabb8556e882350164c1faa10846076732f4cec02ac95b016e7d6bb2f55e448ce5dd227c7699ec43e387c705a5b2b1ee2963
+  checksum: 10/80671e9cb9695ceea2fff23f4678caa6d7a579a2077ecb8f9a0745d90a6435b505bd299688041328f702836289b6ac6a32abba76c5c3922639c0d0224df3dffa
   languageName: node
   linkType: hard
 
@@ -28877,8 +30547,8 @@ __metadata:
   version: 5.0.1
   resolution: "to-regex-range@npm:5.0.1"
   dependencies:
-    is-number: ^7.0.0
-  checksum: f76fa01b3d5be85db6a2a143e24df9f60dd047d151062d0ba3df62953f2f697b16fe5dad9b0ac6191c7efc7b1d9dcaa4b768174b7b29da89d4428e64bc0a20ed
+    is-number: "npm:^7.0.0"
+  checksum: 10/10dda13571e1f5ad37546827e9b6d4252d2e0bc176c24a101252153ef435d83696e2557fe128c4678e4e78f5f01e83711c703eef9814eb12dab028580d45980a
   languageName: node
   linkType: hard
 
@@ -28886,45 +30556,45 @@ __metadata:
   version: 1.0.0
   resolution: "to-space-case@npm:1.0.0"
   dependencies:
-    to-no-case: ^1.0.0
-  checksum: 157cebe3e98e7cb465fe1978cf26450cc8ea8e637a01039854fac7ed60ad074e5e18b32333cc5f30df81b81ca374d63df768cd4c1fa0fe672605f965376227f4
+    to-no-case: "npm:^1.0.0"
+  checksum: 10/157cebe3e98e7cb465fe1978cf26450cc8ea8e637a01039854fac7ed60ad074e5e18b32333cc5f30df81b81ca374d63df768cd4c1fa0fe672605f965376227f4
   languageName: node
   linkType: hard
 
-"to-through@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "to-through@npm:2.0.0"
+"to-through@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "to-through@npm:3.0.0"
   dependencies:
-    through2: ^2.0.3
-  checksum: 5834a69d68cbe0d74115373bbe219dbe60c1950021f5ec9dd4af179ffbb307bce3d45fde9dacec05a8f4f79b86734433eb9b42946ccb81d2d4d4f8828628b7e6
+    streamx: "npm:^2.12.5"
+  checksum: 10/404ad1a346babab53d75d3b4deb779916760fc9e605f4e64ec789366edf08e75ad592a262ca566e7864f77c03375151dcfac4744ff7fd52417cb2a2e9fc60795
   languageName: node
   linkType: hard
 
 "tocbot@npm:^4.20.1":
   version: 4.21.1
   resolution: "tocbot@npm:4.21.1"
-  checksum: c1cdccae0139a731ab007b7537b7cc71229beb0a7ad9b20bd277db2915808855720d256bfa76a868fbd608e8aab02d9fcc38a93a7beebd869cb7816a66acc148
+  checksum: 10/96ea72a9a36719595aebbfc79c6976c7f0e9a83ee8dfa2f0ce9f0a5ad744ee9a913d1d68d1e1c896e49ee771c21fe2c13b3275c26e545d100214178f0b110a49
   languageName: node
   linkType: hard
 
 "toggle-selection@npm:^1.0.6":
   version: 1.0.6
   resolution: "toggle-selection@npm:1.0.6"
-  checksum: a90dc80ed1e7b18db8f4e16e86a5574f87632dc729cfc07d9ea3ced50021ad42bb4e08f22c0913e0b98e3837b0b717e0a51613c65f30418e21eb99da6556a74c
+  checksum: 10/9a0ed0ecbaac72b4944888dacd79fe0a55eeea76120a4c7e46b3bb3d85b24f086e90560bb22f5a965654a25ab43d79ec47dfdb3f1850ba740b14c5a50abc7040
   languageName: node
   linkType: hard
 
 "toidentifier@npm:1.0.1":
   version: 1.0.1
   resolution: "toidentifier@npm:1.0.1"
-  checksum: 952c29e2a85d7123239b5cfdd889a0dde47ab0497f0913d70588f19c53f7e0b5327c95f4651e413c74b785147f9637b17410ac8c846d5d4a20a5a33eb6dc3a45
+  checksum: 10/952c29e2a85d7123239b5cfdd889a0dde47ab0497f0913d70588f19c53f7e0b5327c95f4651e413c74b785147f9637b17410ac8c846d5d4a20a5a33eb6dc3a45
   languageName: node
   linkType: hard
 
-"totalist@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "totalist@npm:1.1.0"
-  checksum: dfab80c7104a1d170adc8c18782d6c04b7df08352dec452191208c66395f7ef2af7537ddfa2cf1decbdcfab1a47afbbf0dec6543ea191da98c1c6e1599f86adc
+"totalist@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "totalist@npm:3.0.1"
+  checksum: 10/5132d562cf88ff93fd710770a92f31dbe67cc19b5c6ccae2efc0da327f0954d211bbfd9456389655d726c624f284b4a23112f56d1da931ca7cfabbe1f45e778a
   languageName: node
   linkType: hard
 
@@ -28932,11 +30602,11 @@ __metadata:
   version: 4.1.3
   resolution: "tough-cookie@npm:4.1.3"
   dependencies:
-    psl: ^1.1.33
-    punycode: ^2.1.1
-    universalify: ^0.2.0
-    url-parse: ^1.5.3
-  checksum: c9226afff36492a52118432611af083d1d8493a53ff41ec4ea48e5b583aec744b989e4280bcf476c910ec1525a89a4a0f1cae81c08b18fb2ec3a9b3a72b91dcc
+    psl: "npm:^1.1.33"
+    punycode: "npm:^2.1.1"
+    universalify: "npm:^0.2.0"
+    url-parse: "npm:^1.5.3"
+  checksum: 10/cf148c359b638a7069fc3ba9a5257bdc9616a6948a98736b92c3570b3f8401cf9237a42bf716878b656f372a1fb65b74dd13a46ccff8eceba14ffd053d33f72a
   languageName: node
   linkType: hard
 
@@ -28944,9 +30614,9 @@ __metadata:
   version: 2.5.0
   resolution: "tough-cookie@npm:2.5.0"
   dependencies:
-    psl: ^1.1.28
-    punycode: ^2.1.1
-  checksum: 16a8cd090224dd176eee23837cbe7573ca0fa297d7e468ab5e1c02d49a4e9a97bb05fef11320605eac516f91d54c57838a25864e8680e27b069a5231d8264977
+    psl: "npm:^1.1.28"
+    punycode: "npm:^2.1.1"
+  checksum: 10/024cb13a4d1fe9af57f4323dff765dd9b217cc2a69be77e3b8a1ca45600aa33a097b6ad949f225d885e904f4bd3ceccef104741ef202d8378e6ca78e850ff82f
   languageName: node
   linkType: hard
 
@@ -28954,43 +30624,29 @@ __metadata:
   version: 3.0.0
   resolution: "tr46@npm:3.0.0"
   dependencies:
-    punycode: ^2.1.1
-  checksum: 44c3cc6767fb800490e6e9fd64fd49041aa4e49e1f6a012b34a75de739cc9ed3a6405296072c1df8b6389ae139c5e7c6496f659cfe13a04a4bff3a1422981270
+    punycode: "npm:^2.1.1"
+  checksum: 10/b09a15886cbfaee419a3469081223489051ce9dca3374dd9500d2378adedbee84a3c73f83bfdd6bb13d53657753fc0d4e20a46bfcd3f1b9057ef528426ad7ce4
   languageName: node
   linkType: hard
 
 "tr46@npm:~0.0.3":
   version: 0.0.3
   resolution: "tr46@npm:0.0.3"
-  checksum: 726321c5eaf41b5002e17ffbd1fb7245999a073e8979085dacd47c4b4e8068ff5777142fc6726d6ca1fd2ff16921b48788b87225cbc57c72636f6efa8efbffe3
+  checksum: 10/8f1f5aa6cb232f9e1bdc86f485f916b7aa38caee8a778b378ffec0b70d9307873f253f5cbadbe2955ece2ac5c83d0dc14a77513166ccd0a0c7fe197e21396695
   languageName: node
   linkType: hard
 
 "tracelib@npm:1.0.1":
   version: 1.0.1
-  resolution: "tracelib@npm:1.0.1"
-  checksum: b4b7899491b6a2279e297d3fffca60ae330992a18af5a9cc85436159b8e313f42bc54794d61f504619b271531feea74bcd5b99950a1bed3a51378c23c3fa2e4a
-  languageName: node
-  linkType: hard
-
-"treeverse@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "treeverse@npm:2.0.0"
-  checksum: 3c6b2b890975a4d42c86b9a0f1eb932b4450db3fa874be5c301c4f5e306fd76330c6a490cf334b0937b3a44b049787ba5d98c88bc7b140f34fdb3ab1f83e5269
+  resolution: "tracelib@npm:1.0.1"
+  checksum: 10/4d7f5e6e38611d3920744c71bd33b29e24c84bde1d750a6735e95a45be041e9ceef0de595ec60a337dc9c0abbacc852268619af99d35843458a2ee5233d64b60
   languageName: node
   linkType: hard
 
 "trim-newlines@npm:^3.0.0":
   version: 3.0.1
   resolution: "trim-newlines@npm:3.0.1"
-  checksum: b530f3fadf78e570cf3c761fb74fef655beff6b0f84b29209bac6c9622db75ad1417f4a7b5d54c96605dcd72734ad44526fef9f396807b90839449eb543c6206
-  languageName: node
-  linkType: hard
-
-"trim-newlines@npm:^4.0.2":
-  version: 4.1.1
-  resolution: "trim-newlines@npm:4.1.1"
-  checksum: 5b09f8e329e8f33c1111ef26906332ba7ba7248cde3e26fc054bb3d69f2858bf5feedca9559c572ff91f33e52977c28e0d41c387df6a02a633cbb8c2d8238627
+  checksum: 10/b530f3fadf78e570cf3c761fb74fef655beff6b0f84b29209bac6c9622db75ad1417f4a7b5d54c96605dcd72734ad44526fef9f396807b90839449eb543c6206
   languageName: node
   linkType: hard
 
@@ -28998,70 +30654,55 @@ __metadata:
   version: 1.0.3
   resolution: "true-case-path@npm:1.0.3"
   dependencies:
-    glob: ^7.1.2
-  checksum: 2e2e3bf37b4b05db2e2a1d60329960a4aa697ad7a89bd97c66f5f4da83977897c29c704276e62bca62d055d8078065bc08a1c7a01f409de11c6592af8b442cbe
+    glob: "npm:^7.1.2"
+  checksum: 10/07827757dcf4aeef215f242492bff16cb0c8e791f447dc7d12276c9f8850d8c30f5f5f2b770fddaa8d38a9a91a5a9ca5d4b24cdd1b474ca6adf1b64cda390a56
+  languageName: node
+  linkType: hard
+
+"ts-api-utils@npm:^1.0.1":
+  version: 1.0.3
+  resolution: "ts-api-utils@npm:1.0.3"
+  peerDependencies:
+    typescript: ">=4.2.0"
+  checksum: 10/1350a5110eb1e534e9a6178f4081fb8a4fcc439749e19f4ad699baec9090fcb90fe532d5e191d91a062dc6e454a14a8d7eb2ad202f57135a30c4a44a3024f039
   languageName: node
   linkType: hard
 
 "ts-dedent@npm:^2.0.0":
   version: 2.2.0
   resolution: "ts-dedent@npm:2.2.0"
-  checksum: 93ed8f7878b6d5ed3c08d99b740010eede6bccfe64bce61c5a4da06a2c17d6ddbb80a8c49c2d15251de7594a4f93ffa21dd10e7be75ef66a4dc9951b4a94e2af
+  checksum: 10/93ed8f7878b6d5ed3c08d99b740010eede6bccfe64bce61c5a4da06a2c17d6ddbb80a8c49c2d15251de7594a4f93ffa21dd10e7be75ef66a4dc9951b4a94e2af
   languageName: node
   linkType: hard
 
 "ts-easing@npm:^0.2.0":
   version: 0.2.0
   resolution: "ts-easing@npm:0.2.0"
-  checksum: e67ee862acca3b2e2718e736f31999adcef862d0df76d76a0e138588728d8a87dfec9978556044640bd0e90203590ad88ac2fe8746d0e9959b8d399132315150
+  checksum: 10/e67ee862acca3b2e2718e736f31999adcef862d0df76d76a0e138588728d8a87dfec9978556044640bd0e90203590ad88ac2fe8746d0e9959b8d399132315150
   languageName: node
   linkType: hard
 
-"ts-jest@npm:29.0.5":
-  version: 29.0.5
-  resolution: "ts-jest@npm:29.0.5"
+"ts-invariant@npm:^0.10.3":
+  version: 0.10.3
+  resolution: "ts-invariant@npm:0.10.3"
   dependencies:
-    bs-logger: 0.x
-    fast-json-stable-stringify: 2.x
-    jest-util: ^29.0.0
-    json5: ^2.2.3
-    lodash.memoize: 4.x
-    make-error: 1.x
-    semver: 7.x
-    yargs-parser: ^21.0.1
-  peerDependencies:
-    "@babel/core": ">=7.0.0-beta.0 <8"
-    "@jest/types": ^29.0.0
-    babel-jest: ^29.0.0
-    jest: ^29.0.0
-    typescript: ">=4.3"
-  peerDependenciesMeta:
-    "@babel/core":
-      optional: true
-    "@jest/types":
-      optional: true
-    babel-jest:
-      optional: true
-    esbuild:
-      optional: true
-  bin:
-    ts-jest: cli.js
-  checksum: f60f129c2287f4c963d9ee2677132496c5c5a5d39c27ad234199a1140c26318a7d5bda34890ab0e30636ec42a8de28f84487c09e9dcec639c9c67812b3a38373
+    tslib: "npm:^2.1.0"
+  checksum: 10/bb07d56fe4aae69d8860e0301dfdee2d375281159054bc24bf1e49e513fb0835bf7f70a11351344d213a79199c5e695f37ebbf5a447188a377ce0cd81d91ddb5
   languageName: node
   linkType: hard
 
-"ts-jest@npm:29.1.1":
-  version: 29.1.1
-  resolution: "ts-jest@npm:29.1.1"
+"ts-jest@npm:29.1.2":
+  version: 29.1.2
+  resolution: "ts-jest@npm:29.1.2"
   dependencies:
-    bs-logger: 0.x
-    fast-json-stable-stringify: 2.x
-    jest-util: ^29.0.0
-    json5: ^2.2.3
-    lodash.memoize: 4.x
-    make-error: 1.x
-    semver: ^7.5.3
-    yargs-parser: ^21.0.1
+    bs-logger: "npm:0.x"
+    fast-json-stable-stringify: "npm:2.x"
+    jest-util: "npm:^29.0.0"
+    json5: "npm:^2.2.3"
+    lodash.memoize: "npm:4.x"
+    make-error: "npm:1.x"
+    semver: "npm:^7.5.3"
+    yargs-parser: "npm:^21.0.1"
   peerDependencies:
     "@babel/core": ">=7.0.0-beta.0 <8"
     "@jest/types": ^29.0.0
@@ -29079,7 +30720,7 @@ __metadata:
       optional: true
   bin:
     ts-jest: cli.js
-  checksum: a8c9e284ed4f819526749f6e4dc6421ec666f20ab44d31b0f02b4ed979975f7580b18aea4813172d43e39b29464a71899f8893dd29b06b4a351a3af8ba47b402
+  checksum: 10/5e40e7b933a1f3aa0d304d3c53913d1a7125fc79cd44e22b332f6e25dfe13008ddc7ac647066bb4f914d76083f7e8949f0bc156d793c30f3419f4ffd8180968b
   languageName: node
   linkType: hard
 
@@ -29087,35 +30728,35 @@ __metadata:
   version: 8.4.0
   resolution: "ts-loader@npm:8.4.0"
   dependencies:
-    chalk: ^4.1.0
-    enhanced-resolve: ^4.0.0
-    loader-utils: ^2.0.0
-    micromatch: ^4.0.0
-    semver: ^7.3.4
+    chalk: "npm:^4.1.0"
+    enhanced-resolve: "npm:^4.0.0"
+    loader-utils: "npm:^2.0.0"
+    micromatch: "npm:^4.0.0"
+    semver: "npm:^7.3.4"
   peerDependencies:
     typescript: "*"
     webpack: "*"
-  checksum: 79da0f364c013231bff28baede3f4f4081b1cca30b24df2d9f31a0517e0524eca2c8e4d438b853b1566a3a8eb9ff51ab0b36743346f0b3d5daa7001c98e5c738
+  checksum: 10/d5cd87c1070840e0502ca8f348c385980a159efbe2d2d24cc259a4063b562c9e1c3e38c7b150f8aabeee3097132aca20a60eced335037631cb25e3f3f906ea0c
   languageName: node
   linkType: hard
 
-"ts-node@npm:10.9.1, ts-node@npm:^10.2.1":
-  version: 10.9.1
-  resolution: "ts-node@npm:10.9.1"
+"ts-node@npm:10.9.2, ts-node@npm:^10.2.1":
+  version: 10.9.2
+  resolution: "ts-node@npm:10.9.2"
   dependencies:
-    "@cspotcode/source-map-support": ^0.8.0
-    "@tsconfig/node10": ^1.0.7
-    "@tsconfig/node12": ^1.0.7
-    "@tsconfig/node14": ^1.0.0
-    "@tsconfig/node16": ^1.0.2
-    acorn: ^8.4.1
-    acorn-walk: ^8.1.1
-    arg: ^4.1.0
-    create-require: ^1.1.0
-    diff: ^4.0.1
-    make-error: ^1.1.1
-    v8-compile-cache-lib: ^3.0.1
-    yn: 3.1.1
+    "@cspotcode/source-map-support": "npm:^0.8.0"
+    "@tsconfig/node10": "npm:^1.0.7"
+    "@tsconfig/node12": "npm:^1.0.7"
+    "@tsconfig/node14": "npm:^1.0.0"
+    "@tsconfig/node16": "npm:^1.0.2"
+    acorn: "npm:^8.4.1"
+    acorn-walk: "npm:^8.1.1"
+    arg: "npm:^4.1.0"
+    create-require: "npm:^1.1.0"
+    diff: "npm:^4.0.1"
+    make-error: "npm:^1.1.1"
+    v8-compile-cache-lib: "npm:^3.0.1"
+    yn: "npm:3.1.1"
   peerDependencies:
     "@swc/core": ">=1.2.50"
     "@swc/wasm": ">=1.2.50"
@@ -29133,47 +30774,58 @@ __metadata:
     ts-node-script: dist/bin-script.js
     ts-node-transpile-only: dist/bin-transpile.js
     ts-script: dist/bin-script-deprecated.js
-  checksum: 090adff1302ab20bd3486e6b4799e90f97726ed39e02b39e566f8ab674fd5bd5f727f43615debbfc580d33c6d9d1c6b1b3ce7d8e3cca3e20530a145ffa232c35
+  checksum: 10/a91a15b3c9f76ac462f006fa88b6bfa528130dcfb849dd7ef7f9d640832ab681e235b8a2bc58ecde42f72851cc1d5d4e22c901b0c11aa51001ea1d395074b794
   languageName: node
   linkType: hard
 
-"tsconfig-paths@npm:^3.14.2, tsconfig-paths@npm:^3.9.0":
-  version: 3.14.2
-  resolution: "tsconfig-paths@npm:3.14.2"
+"tsconfig-paths@npm:^3.15.0":
+  version: 3.15.0
+  resolution: "tsconfig-paths@npm:3.15.0"
+  dependencies:
+    "@types/json5": "npm:^0.0.29"
+    json5: "npm:^1.0.2"
+    minimist: "npm:^1.2.6"
+    strip-bom: "npm:^3.0.0"
+  checksum: 10/2041beaedc6c271fc3bedd12e0da0cc553e65d030d4ff26044b771fac5752d0460944c0b5e680f670c2868c95c664a256cec960ae528888db6ded83524e33a14
+  languageName: node
+  linkType: hard
+
+"tsconfig-paths@npm:^4.1.2":
+  version: 4.2.0
+  resolution: "tsconfig-paths@npm:4.2.0"
   dependencies:
-    "@types/json5": ^0.0.29
-    json5: ^1.0.2
-    minimist: ^1.2.6
-    strip-bom: ^3.0.0
-  checksum: a6162eaa1aed680537f93621b82399c7856afd10ec299867b13a0675e981acac4e0ec00896860480efc59fc10fd0b16fdc928c0b885865b52be62cadac692447
+    json5: "npm:^2.2.2"
+    minimist: "npm:^1.2.6"
+    strip-bom: "npm:^3.0.0"
+  checksum: 10/5e55cc2fb6b800eb72011522e10edefccb45b1f9af055681a51354c9b597d1390c6fa9cc356b8c7529f195ac8a90a78190d563159f3a1eed10e01bbd4d01a8ab
   languageName: node
   linkType: hard
 
 "tslib@npm:2.4.0":
   version: 2.4.0
   resolution: "tslib@npm:2.4.0"
-  checksum: 8c4aa6a3c5a754bf76aefc38026134180c053b7bd2f81338cb5e5ebf96fefa0f417bff221592bf801077f5bf990562f6264fecbc42cd3309b33872cb6fc3b113
+  checksum: 10/d8379e68b36caf082c1905ec25d17df8261e1d68ddc1abfd6c91158a064f6e4402039ae7c02cf4c81d12e3a2a2c7cd8ea2f57b233eb80136a2e3e7279daf2911
   languageName: node
   linkType: hard
 
-"tslib@npm:2.5.0":
-  version: 2.5.0
-  resolution: "tslib@npm:2.5.0"
-  checksum: ae3ed5f9ce29932d049908ebfdf21b3a003a85653a9a140d614da6b767a93ef94f460e52c3d787f0e4f383546981713f165037dc2274df212ea9f8a4541004e1
+"tslib@npm:2.6.0":
+  version: 2.6.0
+  resolution: "tslib@npm:2.6.0"
+  checksum: 10/52360693c62761f902e1946b350188be6505de297068b33421cb26bedd99591203a74cb2a49e1f43f0922d59b1fb3499fe5cfe61a61ca65a1743d5c92c69720a
   languageName: node
   linkType: hard
 
-"tslib@npm:2.6.0, tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.4.1":
-  version: 2.6.0
-  resolution: "tslib@npm:2.6.0"
-  checksum: c01066038f950016a18106ddeca4649b4d76caa76ec5a31e2a26e10586a59fceb4ee45e96719bf6c715648e7c14085a81fee5c62f7e9ebee68e77a5396e5538f
+"tslib@npm:2.6.2, tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.4.1":
+  version: 2.6.2
+  resolution: "tslib@npm:2.6.2"
+  checksum: 10/bd26c22d36736513980091a1e356378e8b662ded04204453d353a7f34a4c21ed0afc59b5f90719d4ba756e581a162ecbf93118dc9c6be5acf70aa309188166ca
   languageName: node
   linkType: hard
 
-"tslib@npm:^1.10.0, tslib@npm:^1.13.0, tslib@npm:^1.14.1, tslib@npm:^1.8.1":
+"tslib@npm:^1.10.0, tslib@npm:^1.13.0, tslib@npm:^1.8.1":
   version: 1.14.1
   resolution: "tslib@npm:1.14.1"
-  checksum: dbe628ef87f66691d5d2959b3e41b9ca0045c3ee3c7c7b906cc1e328b39f199bb1ad9e671c39025bd56122ac57dfbf7385a94843b1cc07c60a4db74795829acd
+  checksum: 10/7dbf34e6f55c6492637adb81b555af5e3b4f9cc6b998fb440dac82d3b42bdc91560a35a5fb75e20e24a076c651438234da6743d139e4feabf0783f3cdfe1dddb
   languageName: node
   linkType: hard
 
@@ -29181,10 +30833,32 @@ __metadata:
   version: 3.21.0
   resolution: "tsutils@npm:3.21.0"
   dependencies:
-    tslib: ^1.8.1
+    tslib: "npm:^1.8.1"
   peerDependencies:
     typescript: ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
-  checksum: 1843f4c1b2e0f975e08c4c21caa4af4f7f65a12ac1b81b3b8489366826259323feb3fc7a243123453d2d1a02314205a7634e048d4a8009921da19f99755cdc48
+  checksum: 10/ea036bec1dd024e309939ffd49fda7a351c0e87a1b8eb049570dd119d447250e2c56e0e6c00554e8205760e7417793fdebff752a46e573fbe07d4f375502a5b2
+  languageName: node
+  linkType: hard
+
+"tuf-js@npm:^1.1.7":
+  version: 1.1.7
+  resolution: "tuf-js@npm:1.1.7"
+  dependencies:
+    "@tufjs/models": "npm:1.0.4"
+    debug: "npm:^4.3.4"
+    make-fetch-happen: "npm:^11.1.1"
+  checksum: 10/8ce0061b76a9dc89fc6e53bc1870afeb8e70083a751910273f959c5d0d574ba9b037a22d944ff97623e58eefa16b051f0ac678bd2da973d2f6b57359604fee31
+  languageName: node
+  linkType: hard
+
+"tuf-js@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "tuf-js@npm:2.2.0"
+  dependencies:
+    "@tufjs/models": "npm:2.0.0"
+    debug: "npm:^4.3.4"
+    make-fetch-happen: "npm:^13.0.0"
+  checksum: 10/a513ce533c06390b7d8767fe68250adac2535bc63c460e9ab8cbae8253da5ccd6fd204448a460536a6e77f7cf5fcf5a3b104971610f9f319a9b8f95b3b574b95
   languageName: node
   linkType: hard
 
@@ -29192,22 +30866,22 @@ __metadata:
   version: 0.6.0
   resolution: "tunnel-agent@npm:0.6.0"
   dependencies:
-    safe-buffer: ^5.0.1
-  checksum: 05f6510358f8afc62a057b8b692f05d70c1782b70db86d6a1e0d5e28a32389e52fa6e7707b6c5ecccacc031462e4bc35af85ecfe4bbc341767917b7cf6965711
+    safe-buffer: "npm:^5.0.1"
+  checksum: 10/7f0d9ed5c22404072b2ae8edc45c071772affd2ed14a74f03b4e71b4dd1a14c3714d85aed64abcaaee5fec2efc79002ba81155c708f4df65821b444abb0cfade
   languageName: node
   linkType: hard
 
 "tween-functions@npm:^1.2.0":
   version: 1.2.0
   resolution: "tween-functions@npm:1.2.0"
-  checksum: 880708d680eff5c347ddcb9f922ad121703a91c78ce308ed309073e73a794b633eb0b80589a839365803f150515ad34c9646809ae8a0e90f09e62686eefb1ab6
+  checksum: 10/f145f39187aacfe6e3c6bfe8452be4061a569b8e1e75c28169c55b7cdf519daa1877c79a8a2cdc902b68f49b67b8478f34818ff02529d27ae5aa0545e7fbdc06
   languageName: node
   linkType: hard
 
 "tweetnacl@npm:^0.14.3, tweetnacl@npm:~0.14.0":
   version: 0.14.5
   resolution: "tweetnacl@npm:0.14.5"
-  checksum: 6061daba1724f59473d99a7bb82e13f211cdf6e31315510ae9656fefd4779851cb927adad90f3b488c8ed77c106adc0421ea8055f6f976ff21b27c5c4e918487
+  checksum: 10/04ee27901cde46c1c0a64b9584e04c96c5fe45b38c0d74930710751ea991408b405747d01dfae72f80fc158137018aea94f9c38c651cb9c318f0861a310c3679
   languageName: node
   linkType: hard
 
@@ -29215,78 +30889,85 @@ __metadata:
   version: 0.4.0
   resolution: "type-check@npm:0.4.0"
   dependencies:
-    prelude-ls: ^1.2.1
-  checksum: ec688ebfc9c45d0c30412e41ca9c0cdbd704580eb3a9ccf07b9b576094d7b86a012baebc95681999dd38f4f444afd28504cb3a89f2ef16b31d4ab61a0739025a
+    prelude-ls: "npm:^1.2.1"
+  checksum: 10/14687776479d048e3c1dbfe58a2409e00367810d6960c0f619b33793271ff2a27f81b52461f14a162f1f89a9b1d8da1b237fc7c99b0e1fdcec28ec63a86b1fec
   languageName: node
   linkType: hard
 
 "type-detect@npm:4.0.8":
   version: 4.0.8
   resolution: "type-detect@npm:4.0.8"
-  checksum: 62b5628bff67c0eb0b66afa371bd73e230399a8d2ad30d852716efcc4656a7516904570cd8631a49a3ce57c10225adf5d0cbdcb47f6b0255fe6557c453925a15
+  checksum: 10/5179e3b8ebc51fce1b13efb75fdea4595484433f9683bbc2dca6d99789dba4e602ab7922d2656f2ce8383987467f7770131d4a7f06a26287db0615d2f4c4ce7d
   languageName: node
   linkType: hard
 
 "type-fest@npm:^0.16.0":
   version: 0.16.0
   resolution: "type-fest@npm:0.16.0"
-  checksum: 1a4102c06dc109db00418c753062e206cab65befd469d000ece4452ee649bf2a9cf57686d96fb42326bc9d918d9a194d4452897b486dcc41989e5c99e4e87094
+  checksum: 10/fd8c47ccb90e9fe7bae8bfc0e116e200e096120200c1ab1737bf0bc9334b344dd4925f876ed698174ffd58cd179bb56a55467be96aedc22d5d72748eac428bc8
   languageName: node
   linkType: hard
 
 "type-fest@npm:^0.18.0":
   version: 0.18.1
   resolution: "type-fest@npm:0.18.1"
-  checksum: e96dcee18abe50ec82dab6cbc4751b3a82046da54c52e3b2d035b3c519732c0b3dd7a2fa9df24efd1a38d953d8d4813c50985f215f1957ee5e4f26b0fe0da395
+  checksum: 10/08844377058435c2b0e633ba01bab6102dba0ed63d85417d8e18feff265eed6f5c9f8f9a25d405ea9db88a41a569be73a3c4c0d4e29150bf89fb145bb23114a2
   languageName: node
   linkType: hard
 
 "type-fest@npm:^0.20.2":
   version: 0.20.2
   resolution: "type-fest@npm:0.20.2"
-  checksum: 4fb3272df21ad1c552486f8a2f8e115c09a521ad7a8db3d56d53718d0c907b62c6e9141ba5f584af3f6830d0872c521357e512381f24f7c44acae583ad517d73
+  checksum: 10/8907e16284b2d6cfa4f4817e93520121941baba36b39219ea36acfe64c86b9dbc10c9941af450bd60832c8f43464974d51c0957f9858bc66b952b66b6914cbb9
   languageName: node
   linkType: hard
 
 "type-fest@npm:^0.21.3":
   version: 0.21.3
   resolution: "type-fest@npm:0.21.3"
-  checksum: e6b32a3b3877f04339bae01c193b273c62ba7bfc9e325b8703c4ee1b32dc8fe4ef5dfa54bf78265e069f7667d058e360ae0f37be5af9f153b22382cd55a9afe0
+  checksum: 10/f4254070d9c3d83a6e573bcb95173008d73474ceadbbf620dd32d273940ca18734dff39c2b2480282df9afe5d1675ebed5499a00d791758748ea81f61a38961f
   languageName: node
   linkType: hard
 
 "type-fest@npm:^0.4.1":
   version: 0.4.1
   resolution: "type-fest@npm:0.4.1"
-  checksum: 25f882d9cc2f24af7a0a529157f96dead157894c456bfbad16d48f990c43b470dfb79848e8d9c03fe1be72a7d169e44f6f3135b54628393c66a6189c5dc077f7
+  checksum: 10/ee6c77378ab0e5b1cb5a408671b03e3edda52bbba6976dc10daf966e5919adbf9553eb597dd23ff3cdfbed7370e9641441a579369d9de94fe9cc12b14b29ccaf
   languageName: node
   linkType: hard
 
 "type-fest@npm:^0.6.0":
   version: 0.6.0
   resolution: "type-fest@npm:0.6.0"
-  checksum: b2188e6e4b21557f6e92960ec496d28a51d68658018cba8b597bd3ef757721d1db309f120ae987abeeda874511d14b776157ff809f23c6d1ce8f83b9b2b7d60f
+  checksum: 10/9ecbf4ba279402b14c1a0614b6761bbe95626fab11377291fecd7e32b196109551e0350dcec6af74d97ced1b000ba8060a23eca33157091e642b409c2054ba82
   languageName: node
   linkType: hard
 
 "type-fest@npm:^0.8.1":
   version: 0.8.1
   resolution: "type-fest@npm:0.8.1"
-  checksum: d61c4b2eba24009033ae4500d7d818a94fd6d1b481a8111612ee141400d5f1db46f199c014766b9fa9b31a6a7374d96fc748c6d688a78a3ce5a33123839becb7
-  languageName: node
-  linkType: hard
-
-"type-fest@npm:^1.0.1, type-fest@npm:^1.2.1, type-fest@npm:^1.2.2":
-  version: 1.4.0
-  resolution: "type-fest@npm:1.4.0"
-  checksum: b011c3388665b097ae6a109a437a04d6f61d81b7357f74cbcb02246f2f5bd72b888ae33631b99871388122ba0a87f4ff1c94078e7119ff22c70e52c0ff828201
+  checksum: 10/fd4a91bfb706aeeb0d326ebd2e9a8ea5263979e5dec8d16c3e469a5bd3a946e014a062ef76c02e3086d3d1c7209a56a20a4caafd0e9f9a5c2ab975084ea3d388
   languageName: node
   linkType: hard
 
 "type-fest@npm:^2.19.0, type-fest@npm:~2.19":
   version: 2.19.0
   resolution: "type-fest@npm:2.19.0"
-  checksum: a4ef07ece297c9fba78fc1bd6d85dff4472fe043ede98bd4710d2615d15776902b595abf62bd78339ed6278f021235fb28a96361f8be86ed754f778973a0d278
+  checksum: 10/7bf9e8fdf34f92c8bb364c0af14ca875fac7e0183f2985498b77be129dc1b3b1ad0a6b3281580f19e48c6105c037fb966ad9934520c69c6434d17fd0af4eed78
+  languageName: node
+  linkType: hard
+
+"type-fest@npm:^3.0.0":
+  version: 3.13.1
+  resolution: "type-fest@npm:3.13.1"
+  checksum: 10/9a8a2359ada34c9b3affcaf3a8f73ee14c52779e89950db337ce66fb74c3399776c697c99f2532e9b16e10e61cfdba3b1c19daffb93b338b742f0acd0117ce12
+  languageName: node
+  linkType: hard
+
+"type-fest@npm:^4.9.0":
+  version: 4.10.2
+  resolution: "type-fest@npm:4.10.2"
+  checksum: 10/2b1ad1270d9fabeeb506ba831d513caeb05bfc852e5e012511d785ce9dc68d773fe0a42bddf857a362c7f3406244809c5b8a698b743bb7617d4a8c470672087f
   languageName: node
   linkType: hard
 
@@ -29294,106 +30975,149 @@ __metadata:
   version: 1.6.18
   resolution: "type-is@npm:1.6.18"
   dependencies:
-    media-typer: 0.3.0
-    mime-types: ~2.1.24
-  checksum: 2c8e47675d55f8b4e404bcf529abdf5036c537a04c2b20177bcf78c9e3c1da69da3942b1346e6edb09e823228c0ee656ef0e033765ec39a70d496ef601a0c657
+    media-typer: "npm:0.3.0"
+    mime-types: "npm:~2.1.24"
+  checksum: 10/0bd9eeae5efd27d98fd63519f999908c009e148039d8e7179a074f105362d4fcc214c38b24f6cda79c87e563cbd12083a4691381ed28559220d4a10c2047bed4
   languageName: node
   linkType: hard
 
 "type-of@npm:^2.0.1":
   version: 2.0.1
   resolution: "type-of@npm:2.0.1"
-  checksum: 51e889c9b09644ce4ec343ae24cfaa73399f6416c68532d46df1f068bd1773f639bb9dbf5d4bf0078825d0767810e6c7940489c17bd94998ad4e3770488956fe
-  languageName: node
-  linkType: hard
-
-"typed-array-buffer@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "typed-array-buffer@npm:1.0.0"
-  dependencies:
-    call-bind: ^1.0.2
-    get-intrinsic: ^1.2.1
-    is-typed-array: ^1.1.10
-  checksum: 3e0281c79b2a40cd97fe715db803884301993f4e8c18e8d79d75fd18f796e8cd203310fec8c7fdb5e6c09bedf0af4f6ab8b75eb3d3a85da69328f28a80456bd3
+  checksum: 10/5da0273c61ae3eaeb4cb2580a823d2a5d593b572f994b92c2bebf124dc25b6a6cc9d55a2a7e709bae3b392c6b71ef62a93030c53417e859b0f9db942586ff2cd
   languageName: node
   linkType: hard
 
-"typed-array-byte-length@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "typed-array-byte-length@npm:1.0.0"
+"typed-array-buffer@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "typed-array-buffer@npm:1.0.2"
   dependencies:
-    call-bind: ^1.0.2
-    for-each: ^0.3.3
-    has-proto: ^1.0.1
-    is-typed-array: ^1.1.10
-  checksum: b03db16458322b263d87a702ff25388293f1356326c8a678d7515767ef563ef80e1e67ce648b821ec13178dd628eb2afdc19f97001ceae7a31acf674c849af94
+    call-bind: "npm:^1.0.7"
+    es-errors: "npm:^1.3.0"
+    is-typed-array: "npm:^1.1.13"
+  checksum: 10/02ffc185d29c6df07968272b15d5319a1610817916ec8d4cd670ded5d1efe72901541ff2202fcc622730d8a549c76e198a2f74e312eabbfb712ed907d45cbb0b
   languageName: node
   linkType: hard
 
-"typed-array-byte-offset@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "typed-array-byte-offset@npm:1.0.0"
+"typed-array-byte-length@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "typed-array-byte-length@npm:1.0.1"
   dependencies:
-    available-typed-arrays: ^1.0.5
-    call-bind: ^1.0.2
-    for-each: ^0.3.3
-    has-proto: ^1.0.1
-    is-typed-array: ^1.1.10
-  checksum: 04f6f02d0e9a948a95fbfe0d5a70b002191fae0b8fe0fe3130a9b2336f043daf7a3dda56a31333c35a067a97e13f539949ab261ca0f3692c41603a46a94e960b
+    call-bind: "npm:^1.0.7"
+    for-each: "npm:^0.3.3"
+    gopd: "npm:^1.0.1"
+    has-proto: "npm:^1.0.3"
+    is-typed-array: "npm:^1.1.13"
+  checksum: 10/e4a38329736fe6a73b52a09222d4a9e8de14caaa4ff6ad8e55217f6705b017d9815b7284c85065b3b8a7704e226ccff1372a72b78c2a5b6b71b7bf662308c903
   languageName: node
   linkType: hard
 
-"typed-array-length@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "typed-array-length@npm:1.0.4"
+"typed-array-byte-offset@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "typed-array-byte-offset@npm:1.0.2"
   dependencies:
-    call-bind: ^1.0.2
-    for-each: ^0.3.3
-    is-typed-array: ^1.1.9
-  checksum: 2228febc93c7feff142b8c96a58d4a0d7623ecde6c7a24b2b98eb3170e99f7c7eff8c114f9b283085cd59dcd2bd43aadf20e25bba4b034a53c5bb292f71f8956
+    available-typed-arrays: "npm:^1.0.7"
+    call-bind: "npm:^1.0.7"
+    for-each: "npm:^0.3.3"
+    gopd: "npm:^1.0.1"
+    has-proto: "npm:^1.0.3"
+    is-typed-array: "npm:^1.1.13"
+  checksum: 10/ac26d720ebb2aacbc45e231347c359e6649f52e0cfe0e76e62005912f8030d68e4cb7b725b1754e8fdd48e433cb68df5a8620a3e420ad1457d666e8b29bf9150
   languageName: node
   linkType: hard
 
-"typedarray-to-buffer@npm:^3.1.5":
-  version: 3.1.5
-  resolution: "typedarray-to-buffer@npm:3.1.5"
+"typed-array-length@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "typed-array-length@npm:1.0.5"
   dependencies:
-    is-typedarray: ^1.0.0
-  checksum: 99c11aaa8f45189fcfba6b8a4825fd684a321caa9bd7a76a27cf0c7732c174d198b99f449c52c3818107430b5f41c0ccbbfb75cb2ee3ca4a9451710986d61a60
+    call-bind: "npm:^1.0.7"
+    for-each: "npm:^0.3.3"
+    gopd: "npm:^1.0.1"
+    has-proto: "npm:^1.0.3"
+    is-typed-array: "npm:^1.1.13"
+    possible-typed-array-names: "npm:^1.0.0"
+  checksum: 10/f9a0da99c41880b44e2c5e5d0d01515c2a6e0f54b10c594151804f013272d837df3b67ea84d7304ecfbab2c10d99c3372168bf3a4bd295abf13ac5a72f93054a
   languageName: node
   linkType: hard
 
 "typedarray@npm:^0.0.6":
   version: 0.0.6
   resolution: "typedarray@npm:0.0.6"
-  checksum: 33b39f3d0e8463985eeaeeacc3cb2e28bc3dfaf2a5ed219628c0b629d5d7b810b0eb2165f9f607c34871d5daa92ba1dc69f49051cf7d578b4cbd26c340b9d1b1
+  checksum: 10/2cc1bcf7d8c1237f6a16c04efc06637b2c5f2d74e58e84665445cf87668b85a21ab18dd751fa49eee6ae024b70326635d7b79ad37b1c370ed2fec6aeeeb52714
+  languageName: node
+  linkType: hard
+
+"typescript-string-operations@npm:^1.4.1":
+  version: 1.5.0
+  resolution: "typescript-string-operations@npm:1.5.0"
+  checksum: 10/a884c4241fc45b9cceb2744c20fb229e6dfcb48f96afd68ef2d67fda1e4586c96d20fd0343b57c14ac33b2ebe000aa7524a4932424aea3077fe9e692555384f2
+  languageName: node
+  linkType: hard
+
+"typescript@npm:5.2.2":
+  version: 5.2.2
+  resolution: "typescript@npm:5.2.2"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 10/d65e50eb849bd21ff8677e5b9447f9c6e74777e346afd67754934264dcbf4bd59e7d2473f6062d9a015d66bd573311166357e3eb07fea0b52859cf9bb2b58555
+  languageName: node
+  linkType: hard
+
+"typescript@npm:5.3.3":
+  version: 5.3.3
+  resolution: "typescript@npm:5.3.3"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 10/6e4e6a14a50c222b3d14d4ea2f729e79f972fa536ac1522b91202a9a65af3605c2928c4a790a4a50aa13694d461c479ba92cedaeb1e7b190aadaa4e4b96b8e18
+  languageName: node
+  linkType: hard
+
+"typescript@npm:>=2.7, typescript@npm:>=3 < 6, typescript@npm:^5.0.4":
+  version: 5.4.5
+  resolution: "typescript@npm:5.4.5"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 10/d04a9e27e6d83861f2126665aa8d84847e8ebabcea9125b9ebc30370b98cb38b5dff2508d74e2326a744938191a83a69aa9fddab41f193ffa43eabfdf3f190a5
   languageName: node
   linkType: hard
 
-"typescript@npm:4.8.4, typescript@npm:>=2.7, typescript@npm:^3 || ^4, typescript@npm:^4.2.4":
-  version: 4.8.4
-  resolution: "typescript@npm:4.8.4"
+"typescript@patch:typescript@npm%3A5.2.2#optional!builtin<compat/typescript>":
+  version: 5.2.2
+  resolution: "typescript@patch:typescript@npm%3A5.2.2#optional!builtin<compat/typescript>::version=5.2.2&hash=f3b441"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 10/f79cc2ba802c94c2b78dbb00d767a10adb67368ae764709737dc277273ec148aa4558033a03ce901406b35fddf4eac46dabc94a1e1d12d2587e2b9cfe5707b4a
+  languageName: node
+  linkType: hard
+
+"typescript@patch:typescript@npm%3A5.3.3#optional!builtin<compat/typescript>":
+  version: 5.3.3
+  resolution: "typescript@patch:typescript@npm%3A5.3.3#optional!builtin<compat/typescript>::version=5.3.3&hash=e012d7"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 3e4f061658e0c8f36c820802fa809e0fd812b85687a9a2f5430bc3d0368e37d1c9605c3ce9b39df9a05af2ece67b1d844f9f6ea8ff42819f13bcb80f85629af0
+  checksum: 10/c93786fcc9a70718ba1e3819bab56064ead5817004d1b8186f8ca66165f3a2d0100fee91fa64c840dcd45f994ca5d615d8e1f566d39a7470fc1e014dbb4cf15d
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@4.8.4#~builtin<compat/typescript>, typescript@patch:typescript@>=2.7#~builtin<compat/typescript>, typescript@patch:typescript@^3 || ^4#~builtin<compat/typescript>, typescript@patch:typescript@^4.2.4#~builtin<compat/typescript>":
-  version: 4.8.4
-  resolution: "typescript@patch:typescript@npm%3A4.8.4#~builtin<compat/typescript>::version=4.8.4&hash=1a91c8"
+"typescript@patch:typescript@npm%3A>=2.7#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A>=3 < 6#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.0.4#optional!builtin<compat/typescript>":
+  version: 5.4.5
+  resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin<compat/typescript>::version=5.4.5&hash=d69c25"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: c981e82b77a5acdcc4e69af9c56cdecf5b934a87a08e7b52120596701e389a878b8e3f860e73ffb287bf649cc47a8c741262ce058148f71de4cdd88bb9c75153
+  checksum: 10/584be8bac7112ad49a9eb9992f71d542b1ff2fafb5bb315e1c196145e8feab589f1d7223cfb2d5df6770789582e6918f8287d1f2f89911b38eb80e29c560ad00
   languageName: node
   linkType: hard
 
 "ua-parser-js@npm:^1.0.32":
   version: 1.0.33
   resolution: "ua-parser-js@npm:1.0.33"
-  checksum: 460adef51235267345b221842979b6b167543725d03f7c9c4f9ca6af4da835a71d016390da139d2b32828063c4730dcfae6e53b9dce815f4000be4e1fe1c7737
+  checksum: 10/26455b1bbc165eea24b92283034e1e941ca5e272fcbb0a81ce2d064da369353182a1f6eb7472a6d2e738dd89b0cd008de9f1f17946f9b8f5ddfcf4e8a5949c1a
   languageName: node
   linkType: hard
 
@@ -29402,7 +31126,7 @@ __metadata:
   resolution: "uglify-js@npm:3.14.2"
   bin:
     uglifyjs: bin/uglifyjs
-  checksum: 4d8e5c63b2c0455b598cc09ade538cd4fe6d68cb46a9bc563464d749650047592d96aff5a283c1c29a0c27a6ce8f9eb0b3a33525b3e7555b841a53b2b32d6219
+  checksum: 10/ce6deba0b60d41af2c857647414f566214ab1a65dbffdc5c5b056474e08ecf855f25db7cfca24756e22b6e066ee0273a35f2a47e14dfb0a029da36d1e9e3d60e
   languageName: node
   linkType: hard
 
@@ -29410,18 +31134,11 @@ __metadata:
   version: 1.0.2
   resolution: "unbox-primitive@npm:1.0.2"
   dependencies:
-    call-bind: ^1.0.2
-    has-bigints: ^1.0.2
-    has-symbols: ^1.0.3
-    which-boxed-primitive: ^1.0.2
-  checksum: b7a1cf5862b5e4b5deb091672ffa579aa274f648410009c81cca63fed3b62b610c4f3b773f912ce545bb4e31edc3138975b5bc777fc6e4817dca51affb6380e9
-  languageName: node
-  linkType: hard
-
-"unc-path-regex@npm:^0.1.2":
-  version: 0.1.2
-  resolution: "unc-path-regex@npm:0.1.2"
-  checksum: a05fa2006bf4606051c10fc7968f08ce7b28fa646befafa282813aeb1ac1a56f65cb1b577ca7851af2726198d59475bb49b11776036257b843eaacee2860a4ec
+    call-bind: "npm:^1.0.2"
+    has-bigints: "npm:^1.0.2"
+    has-symbols: "npm:^1.0.3"
+    which-boxed-primitive: "npm:^1.0.2"
+  checksum: 10/06e1ee41c1095e37281cb71a975cb3350f7cb470a0665d2576f02cc9564f623bd90cfc0183693b8a7fdf2d242963dcc3010b509fa3ac683f540c765c0f3e7e43
   languageName: node
   linkType: hard
 
@@ -29429,23 +31146,30 @@ __metadata:
   version: 3.3.6
   resolution: "underscore.string@npm:3.3.6"
   dependencies:
-    sprintf-js: ^1.1.1
-    util-deprecate: ^1.0.2
-  checksum: b7719c30e5d1fdda4ee9379e8d80dca2b0668942420ba365ae3410120e08225fe36707a7981ce0f921812dee6a2290b713cdce1e75e770b98e67a45d8a378d35
+    sprintf-js: "npm:^1.1.1"
+    util-deprecate: "npm:^1.0.2"
+  checksum: 10/4de7b855ef9890e4db61f3451a86193f4ba398c9615aa78bfb663d24670c3c0614aa02ffa7bd71ec2b1bddb58f41e3f2c074e9b1599722b27d5b5d1895237bfb
   languageName: node
   linkType: hard
 
 "underscore@npm:1.13.6":
   version: 1.13.6
   resolution: "underscore@npm:1.13.6"
-  checksum: d5cedd14a9d0d91dd38c1ce6169e4455bb931f0aaf354108e47bd46d3f2da7464d49b2171a5cf786d61963204a42d01ea1332a903b7342ad428deaafaf70ec36
+  checksum: 10/58cf5dc42cb0ac99c146ae4064792c0a2cc84f3a3c4ad88f5082e79057dfdff3371d896d1ec20379e9ece2450d94fa78f2ef5bfefc199ba320653e32c009bd66
+  languageName: node
+  linkType: hard
+
+"undici-types@npm:~5.26.4":
+  version: 5.26.5
+  resolution: "undici-types@npm:5.26.5"
+  checksum: 10/0097779d94bc0fd26f0418b3a05472410408877279141ded2bd449167be1aed7ea5b76f756562cb3586a07f251b90799bab22d9019ceba49c037c76445f7cddd
   languageName: node
   linkType: hard
 
 "unicode-canonical-property-names-ecmascript@npm:^2.0.0":
   version: 2.0.0
   resolution: "unicode-canonical-property-names-ecmascript@npm:2.0.0"
-  checksum: 39be078afd014c14dcd957a7a46a60061bc37c4508ba146517f85f60361acf4c7539552645ece25de840e17e293baa5556268d091ca6762747fdd0c705001a45
+  checksum: 10/39be078afd014c14dcd957a7a46a60061bc37c4508ba146517f85f60361acf4c7539552645ece25de840e17e293baa5556268d091ca6762747fdd0c705001a45
   languageName: node
   linkType: hard
 
@@ -29453,23 +31177,30 @@ __metadata:
   version: 2.0.0
   resolution: "unicode-match-property-ecmascript@npm:2.0.0"
   dependencies:
-    unicode-canonical-property-names-ecmascript: ^2.0.0
-    unicode-property-aliases-ecmascript: ^2.0.0
-  checksum: 1f34a7434a23df4885b5890ac36c5b2161a809887000be560f56ad4b11126d433c0c1c39baf1016bdabed4ec54829a6190ee37aa24919aa116dc1a5a8a62965a
+    unicode-canonical-property-names-ecmascript: "npm:^2.0.0"
+    unicode-property-aliases-ecmascript: "npm:^2.0.0"
+  checksum: 10/1f34a7434a23df4885b5890ac36c5b2161a809887000be560f56ad4b11126d433c0c1c39baf1016bdabed4ec54829a6190ee37aa24919aa116dc1a5a8a62965a
   languageName: node
   linkType: hard
 
 "unicode-match-property-value-ecmascript@npm:^2.1.0":
   version: 2.1.0
   resolution: "unicode-match-property-value-ecmascript@npm:2.1.0"
-  checksum: 8d6f5f586b9ce1ed0e84a37df6b42fdba1317a05b5df0c249962bd5da89528771e2d149837cad11aa26bcb84c35355cb9f58a10c3d41fa3b899181ece6c85220
+  checksum: 10/06661bc8aba2a60c7733a7044f3e13085808939ad17924ffd4f5222a650f88009eb7c09481dc9c15cfc593d4ad99bd1cde8d54042733b335672591a81c52601c
   languageName: node
   linkType: hard
 
 "unicode-property-aliases-ecmascript@npm:^2.0.0":
   version: 2.0.0
   resolution: "unicode-property-aliases-ecmascript@npm:2.0.0"
-  checksum: dda4d39128cbbede2ac60fbb85493d979ec65913b8a486bf7cb7a375a2346fa48cbf9dc6f1ae23376e7e8e684c2b411434891e151e865a661b40a85407db51d0
+  checksum: 10/dda4d39128cbbede2ac60fbb85493d979ec65913b8a486bf7cb7a375a2346fa48cbf9dc6f1ae23376e7e8e684c2b411434891e151e865a661b40a85407db51d0
+  languageName: node
+  linkType: hard
+
+"unicorn-magic@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "unicorn-magic@npm:0.1.0"
+  checksum: 10/9b4d0e9809807823dc91d0920a4a4c0cff2de3ebc54ee87ac1ee9bc75eafd609b09d1f14495e0173aef26e01118706196b6ab06a75fe0841028b3983a8af313f
   languageName: node
   linkType: hard
 
@@ -29477,8 +31208,8 @@ __metadata:
   version: 0.5.0
   resolution: "union@npm:0.5.0"
   dependencies:
-    qs: ^6.4.0
-  checksum: 021530d02363fb7470ce45d4cb06ae28a97d5a245666e6d0fca6bab0673bea8c7988e7d2f8046acfbab120908cedcb099ca216b357d4483bcd96518b39101be0
+    qs: "npm:^6.4.0"
+  checksum: 10/f5ef4ca75b4aeab2717546247fb51459050d4b4fefb0db30d46752a63144768abb1a3e4338faaa15860cc2d32ad6939b8e9d48551aaaf476172ea48c74c5b85c
   languageName: node
   linkType: hard
 
@@ -29486,8 +31217,17 @@ __metadata:
   version: 1.1.1
   resolution: "unique-filename@npm:1.1.1"
   dependencies:
-    unique-slug: ^2.0.0
-  checksum: cf4998c9228cc7647ba7814e255dec51be43673903897b1786eff2ac2d670f54d4d733357eb08dea969aa5e6875d0e1bd391d668fbdb5a179744e7c7551a6f80
+    unique-slug: "npm:^2.0.0"
+  checksum: 10/9b6969d649a2096755f19f793315465c6427453b66d67c2a1bee8f36ca7e1fc40725be2c028e974dec110d365bd30a4248e89b1044dc1dfe29663b6867d071ef
+  languageName: node
+  linkType: hard
+
+"unique-filename@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "unique-filename@npm:3.0.0"
+  dependencies:
+    unique-slug: "npm:^4.0.0"
+  checksum: 10/8e2f59b356cb2e54aab14ff98a51ac6c45781d15ceaab6d4f1c2228b780193dc70fae4463ce9e1df4479cb9d3304d7c2043a3fb905bdeca71cc7e8ce27e063df
   languageName: node
   linkType: hard
 
@@ -29495,18 +31235,17 @@ __metadata:
   version: 2.0.2
   resolution: "unique-slug@npm:2.0.2"
   dependencies:
-    imurmurhash: ^0.1.4
-  checksum: 5b6876a645da08d505dedb970d1571f6cebdf87044cb6b740c8dbb24f0d6e1dc8bdbf46825fd09f994d7cf50760e6f6e063cfa197d51c5902c00a861702eb75a
+    imurmurhash: "npm:^0.1.4"
+  checksum: 10/6cfaf91976acc9c125fd0686c561ee9ca0784bb4b2b408972e6cd30e747b4ff0ca50264c01bcf5e711b463535ea611ffb84199e9f73088cd79ac9ddee8154042
   languageName: node
   linkType: hard
 
-"unique-stream@npm:^2.0.2":
-  version: 2.3.1
-  resolution: "unique-stream@npm:2.3.1"
+"unique-slug@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "unique-slug@npm:4.0.0"
   dependencies:
-    json-stable-stringify-without-jsonify: ^1.0.1
-    through2-filter: ^3.0.0
-  checksum: 65e433e68e46640e9283dbb022493c8d79ed1dac47807fe751dfe3bd50586927f63ad880ce9e01c2f85911f3caca48d04731aff6f07869434d5f76ecfe478559
+    imurmurhash: "npm:^0.1.4"
+  checksum: 10/40912a8963fc02fb8b600cf50197df4a275c602c60de4cac4f75879d3c48558cfac48de08a25cc10df8112161f7180b3bbb4d662aadb711568602f9eddee54f0
   languageName: node
   linkType: hard
 
@@ -29514,15 +31253,15 @@ __metadata:
   version: 2.0.0
   resolution: "unique-string@npm:2.0.0"
   dependencies:
-    crypto-random-string: ^2.0.0
-  checksum: ef68f639136bcfe040cf7e3cd7a8dff076a665288122855148a6f7134092e6ed33bf83a7f3a9185e46c98dddc445a0da6ac25612afa1a7c38b8b654d6c02498e
+    crypto-random-string: "npm:^2.0.0"
+  checksum: 10/107cae65b0b618296c2c663b8e52e4d1df129e9af04ab38d53b4f2189e96da93f599c85f4589b7ffaf1a11c9327cbb8a34f04c71b8d4950d3e385c2da2a93828
   languageName: node
   linkType: hard
 
 "unist-util-is@npm:^4.0.0":
   version: 4.1.0
   resolution: "unist-util-is@npm:4.1.0"
-  checksum: 726484cd2adc9be75a939aeedd48720f88294899c2e4a3143da413ae593f2b28037570730d5cf5fd910ff41f3bc1501e3d636b6814c478d71126581ef695f7ea
+  checksum: 10/c046cc87c0a4f797b2afce76d917218e6a9af946a56cb5a88cb7f82be34f16c11050a10ddc4c66a3297dbb2782ca7d72a358cd77900b439ea9c683ba003ffe90
   languageName: node
   linkType: hard
 
@@ -29530,9 +31269,9 @@ __metadata:
   version: 3.1.1
   resolution: "unist-util-visit-parents@npm:3.1.1"
   dependencies:
-    "@types/unist": ^2.0.0
-    unist-util-is: ^4.0.0
-  checksum: 1170e397dff88fab01e76d5154981666eb0291019d2462cff7a2961a3e76d3533b42eaa16b5b7e2d41ad42a5ea7d112301458283d255993e660511387bf67bc3
+    "@types/unist": "npm:^2.0.0"
+    unist-util-is: "npm:^4.0.0"
+  checksum: 10/1b18343d88a0ad9cafaf8164ff8a1d3e3903328b3936b1565d61731f0b5778b9b9f400c455d3ad5284eeebcfdd7558ce24eb15c303a9cc0bd9218d01b2116923
   languageName: node
   linkType: hard
 
@@ -29540,45 +31279,45 @@ __metadata:
   version: 2.0.3
   resolution: "unist-util-visit@npm:2.0.3"
   dependencies:
-    "@types/unist": ^2.0.0
-    unist-util-is: ^4.0.0
-    unist-util-visit-parents: ^3.0.0
-  checksum: 1fe19d500e212128f96d8c3cfa3312846e586b797748a1fd195fe6479f06bc90a6f6904deb08eefc00dd58e83a1c8a32fb8677252d2273ad7a5e624525b69b8f
+    "@types/unist": "npm:^2.0.0"
+    unist-util-is: "npm:^4.0.0"
+    unist-util-visit-parents: "npm:^3.0.0"
+  checksum: 10/1fe19d500e212128f96d8c3cfa3312846e586b797748a1fd195fe6479f06bc90a6f6904deb08eefc00dd58e83a1c8a32fb8677252d2273ad7a5e624525b69b8f
   languageName: node
   linkType: hard
 
 "universal-user-agent@npm:^6.0.0":
   version: 6.0.0
   resolution: "universal-user-agent@npm:6.0.0"
-  checksum: 5092bbc80dd0d583cef0b62c17df0043193b74f425112ea6c1f69bc5eda21eeec7a08d8c4f793a277eb2202ffe9b44bec852fa3faff971234cd209874d1b79ef
+  checksum: 10/5092bbc80dd0d583cef0b62c17df0043193b74f425112ea6c1f69bc5eda21eeec7a08d8c4f793a277eb2202ffe9b44bec852fa3faff971234cd209874d1b79ef
   languageName: node
   linkType: hard
 
 "universalify@npm:^0.1.0":
   version: 0.1.2
   resolution: "universalify@npm:0.1.2"
-  checksum: 40cdc60f6e61070fe658ca36016a8f4ec216b29bf04a55dce14e3710cc84c7448538ef4dad3728d0bfe29975ccd7bfb5f414c45e7b78883567fb31b246f02dff
+  checksum: 10/40cdc60f6e61070fe658ca36016a8f4ec216b29bf04a55dce14e3710cc84c7448538ef4dad3728d0bfe29975ccd7bfb5f414c45e7b78883567fb31b246f02dff
   languageName: node
   linkType: hard
 
 "universalify@npm:^0.2.0":
   version: 0.2.0
   resolution: "universalify@npm:0.2.0"
-  checksum: e86134cb12919d177c2353196a4cc09981524ee87abf621f7bc8d249dbbbebaec5e7d1314b96061497981350df786e4c5128dbf442eba104d6e765bc260678b5
+  checksum: 10/e86134cb12919d177c2353196a4cc09981524ee87abf621f7bc8d249dbbbebaec5e7d1314b96061497981350df786e4c5128dbf442eba104d6e765bc260678b5
   languageName: node
   linkType: hard
 
 "universalify@npm:^2.0.0":
   version: 2.0.0
   resolution: "universalify@npm:2.0.0"
-  checksum: 2406a4edf4a8830aa6813278bab1f953a8e40f2f63a37873ffa9a3bc8f9745d06cc8e88f3572cb899b7e509013f7f6fcc3e37e8a6d914167a5381d8440518c44
+  checksum: 10/2406a4edf4a8830aa6813278bab1f953a8e40f2f63a37873ffa9a3bc8f9745d06cc8e88f3572cb899b7e509013f7f6fcc3e37e8a6d914167a5381d8440518c44
   languageName: node
   linkType: hard
 
 "unpipe@npm:1.0.0, unpipe@npm:~1.0.0":
   version: 1.0.0
   resolution: "unpipe@npm:1.0.0"
-  checksum: 4fa18d8d8d977c55cb09715385c203197105e10a6d220087ec819f50cb68870f02942244f1017565484237f1f8c5d3cd413631b1ae104d3096f24fdfde1b4aa2
+  checksum: 10/4fa18d8d8d977c55cb09715385c203197105e10a6d220087ec819f50cb68870f02942244f1017565484237f1f8c5d3cd413631b1ae104d3096f24fdfde1b4aa2
   languageName: node
   linkType: hard
 
@@ -29586,25 +31325,25 @@ __metadata:
   version: 1.5.0
   resolution: "unplugin@npm:1.5.0"
   dependencies:
-    acorn: ^8.10.0
-    chokidar: ^3.5.3
-    webpack-sources: ^3.2.3
-    webpack-virtual-modules: ^0.5.0
-  checksum: fd3675aef99098741c2f0c4a33726d88230b60962fe9ceeb665e5596eb65e540e1e2d7a6e09132d821093e3d6918296c64311f73a947a9374f1b826017d05f63
+    acorn: "npm:^8.10.0"
+    chokidar: "npm:^3.5.3"
+    webpack-sources: "npm:^3.2.3"
+    webpack-virtual-modules: "npm:^0.5.0"
+  checksum: 10/4a867f2630b932c34983a4b7c741624789752677ea1a6e3e73ca68a716e7214d50d7855fb4d0e02b4a58f81aaee2def021d54365929be03a57c4b25911ae89c1
   languageName: node
   linkType: hard
 
 "untildify@npm:^4.0.0":
   version: 4.0.0
   resolution: "untildify@npm:4.0.0"
-  checksum: 39ced9c418a74f73f0a56e1ba4634b4d959422dff61f4c72a8e39f60b99380c1b45ed776fbaa0a4101b157e4310d873ad7d114e8534ca02609b4916bb4187fb9
+  checksum: 10/39ced9c418a74f73f0a56e1ba4634b4d959422dff61f4c72a8e39f60b99380c1b45ed776fbaa0a4101b157e4310d873ad7d114e8534ca02609b4916bb4187fb9
   languageName: node
   linkType: hard
 
-"upath@npm:^2.0.1":
+"upath@npm:2.0.1":
   version: 2.0.1
   resolution: "upath@npm:2.0.1"
-  checksum: 2db04f24a03ef72204c7b969d6991abec9e2cb06fb4c13a1fd1c59bc33b46526b16c3325e55930a11ff86a77a8cbbcda8f6399bf914087028c5beae21ecdb33c
+  checksum: 10/7b98a83559a295d59f87f7a8d615c7549d19e4aec4dd9d52be2bf1ba93e1d6ee7d8f2188cdecbf303a22cea3768abff4268b960350152a0264125f577d9ed79e
   languageName: node
   linkType: hard
 
@@ -29612,20 +31351,20 @@ __metadata:
   version: 1.0.13
   resolution: "update-browserslist-db@npm:1.0.13"
   dependencies:
-    escalade: ^3.1.1
-    picocolors: ^1.0.0
+    escalade: "npm:^3.1.1"
+    picocolors: "npm:^1.0.0"
   peerDependencies:
     browserslist: ">= 4.21.0"
   bin:
     update-browserslist-db: cli.js
-  checksum: 1e47d80182ab6e4ad35396ad8b61008ae2a1330221175d0abd37689658bdb61af9b705bfc41057fd16682474d79944fb2d86767c5ed5ae34b6276b9bed353322
+  checksum: 10/9074b4ef34d2ed931f27d390aafdd391ee7c45ad83c508e8fed6aaae1eb68f81999a768ed8525c6f88d4001a4fbf1b8c0268f099d0e8e72088ec5945ac796acf
   languageName: node
   linkType: hard
 
-"uplot@npm:1.6.26":
-  version: 1.6.26
-  resolution: "uplot@npm:1.6.26"
-  checksum: 873b5b049b0b2e00534e4a02bfcab7df6972099a2cedec0cd8b1ba949b318628a7d59b988e0f45fd3f8ed4eb6cc5a84d59f83a15b702c21f7396c664dc41a124
+"uplot@npm:1.6.30":
+  version: 1.6.30
+  resolution: "uplot@npm:1.6.30"
+  checksum: 10/08ad2f9441b8cfa26d9219362cdbb6f2dc6e5ec9403382df71798ed3e9d3666e7712c8a245e652ebb4a25c5d911cbdc614b52dfd891c0f7ce8705320d2eff81f
   languageName: node
   linkType: hard
 
@@ -29633,15 +31372,15 @@ __metadata:
   version: 4.4.1
   resolution: "uri-js@npm:4.4.1"
   dependencies:
-    punycode: ^2.1.0
-  checksum: 7167432de6817fe8e9e0c9684f1d2de2bb688c94388f7569f7dbdb1587c9f4ca2a77962f134ec90be0cc4d004c939ff0d05acc9f34a0db39a3c797dada262633
+    punycode: "npm:^2.1.0"
+  checksum: 10/b271ca7e3d46b7160222e3afa3e531505161c9a4e097febae9664e4b59912f4cbe94861361a4175edac3a03fee99d91e44b6a58c17a634bc5a664b19fc76fbcb
   languageName: node
   linkType: hard
 
 "url-join@npm:^4.0.1":
   version: 4.0.1
   resolution: "url-join@npm:4.0.1"
-  checksum: f74e868bf25dbc8be6a8d7237d4c36bb5b6c62c72e594d5ab1347fe91d6af7ccd9eb5d621e30152e4da45c2e9a26bec21390e911ab54a62d4d82e76028374ee5
+  checksum: 10/b53b256a9a36ed6b0f6768101e78ca97f32d7b935283fd29ce19d0bbfb6f88aa80aa6c03fd87f2f8978ab463a6539f597a63051e7086f3379685319a7495f709
   languageName: node
   linkType: hard
 
@@ -29649,9 +31388,9 @@ __metadata:
   version: 1.5.10
   resolution: "url-parse@npm:1.5.10"
   dependencies:
-    querystringify: ^2.1.1
-    requires-port: ^1.0.0
-  checksum: fbdba6b1d83336aca2216bbdc38ba658d9cfb8fc7f665eb8b17852de638ff7d1a162c198a8e4ed66001ddbf6c9888d41e4798912c62b4fd777a31657989f7bdf
+    querystringify: "npm:^2.1.1"
+    requires-port: "npm:^1.0.0"
+  checksum: 10/c9e96bc8c5b34e9f05ddfeffc12f6aadecbb0d971b3cc26015b58d5b44676a99f50d5aeb1e5c9e61fa4d49961ae3ab1ae997369ed44da51b2f5ac010d188e6ad
   languageName: node
   linkType: hard
 
@@ -29659,9 +31398,9 @@ __metadata:
   version: 0.11.3
   resolution: "url@npm:0.11.3"
   dependencies:
-    punycode: ^1.4.1
-    qs: ^6.11.2
-  checksum: f9e7886f46a16f96d2e42fbcc5d682c231c55ef5442c1ff66150c0f6556f6e3a97d094a84f51be15ec2432711d212eb60426659ce418f5fcadeaa3f601532c4e
+    punycode: "npm:^1.4.1"
+    qs: "npm:^6.11.2"
+  checksum: 10/a3a5ba64d8afb4dda111355d94073a9754b88b1de4035554c398b75f3e4d4244d5e7ae9e4554f0d91be72efd416aedbb646fbb1f3dd4cacecca45ed6c9b75145
   languageName: node
   linkType: hard
 
@@ -29669,18 +31408,18 @@ __metadata:
   version: 1.3.0
   resolution: "use-callback-ref@npm:1.3.0"
   dependencies:
-    tslib: ^2.0.0
+    tslib: "npm:^2.0.0"
   peerDependencies:
     "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 7913df383a5a6fcb399212eedefaac2e0c6f843555202d4e3010bac3848afe38ecaa3d0d6500ad1d936fbeffd637e6c517e68edb024af5e6beca7f27f3ce7b21
+  checksum: 10/f9f1b217db60419b033228ba17cee5c521123e7c7f35577258a1abdce6d9623e5880f0bed3a0504eff35fdf6c761a2b2e020337a34218fb86229b8641772654a
   languageName: node
   linkType: hard
 
-"use-isomorphic-layout-effect@npm:^1.0.0, use-isomorphic-layout-effect@npm:^1.1.2":
+"use-isomorphic-layout-effect@npm:^1.1.2":
   version: 1.1.2
   resolution: "use-isomorphic-layout-effect@npm:1.1.2"
   peerDependencies:
@@ -29688,7 +31427,7 @@ __metadata:
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: a6532f7fc9ae222c3725ff0308aaf1f1ddbd3c00d685ef9eee6714fd0684de5cb9741b432fbf51e61a784e2955424864f7ea9f99734a02f237b17ad3e18ea5cb
+  checksum: 10/fd3787ed19f6cfbf70e2c5822d01bebbf96b00968195840d5ad61082b8e6ca7a8e2e46270c4096537d18a38ea57f4e4e9668cce5eec36fa4697ddba2ef1203fd
   languageName: node
   linkType: hard
 
@@ -29697,7 +31436,7 @@ __metadata:
   resolution: "use-memo-one@npm:1.1.2"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0
-  checksum: 71f4598ce422b64a971dc93f45dc245158977f8882f56be82d4629c21577c22244959ac3aa99bd9559d64007b632d58aa43b256981afe56603c77ce3fdee165f
+  checksum: 10/71f4598ce422b64a971dc93f45dc245158977f8882f56be82d4629c21577c22244959ac3aa99bd9559d64007b632d58aa43b256981afe56603c77ce3fdee165f
   languageName: node
   linkType: hard
 
@@ -29705,11 +31444,11 @@ __metadata:
   version: 9.1.0
   resolution: "use-resize-observer@npm:9.1.0"
   dependencies:
-    "@juggle/resize-observer": ^3.3.1
+    "@juggle/resize-observer": "npm:^3.3.1"
   peerDependencies:
     react: 16.8.0 - 18
     react-dom: 16.8.0 - 18
-  checksum: 92be0ac34a3b3cf884cd55847c90792b5b44833dc258e96d650152815ad246afe45825aa223332203004d836535a927ab74f18dc0313229e2c7c69510eddf382
+  checksum: 10/821d3f783090e36c694ef0ae3e366b364a691a8254d04337700ea79757e01e2d79f307ee517487c9246db7e8bc9625b474dd6ac7dad18d777004dee817826080
   languageName: node
   linkType: hard
 
@@ -29717,15 +31456,15 @@ __metadata:
   version: 1.1.2
   resolution: "use-sidecar@npm:1.1.2"
   dependencies:
-    detect-node-es: ^1.1.0
-    tslib: ^2.0.0
+    detect-node-es: "npm:^1.1.0"
+    tslib: "npm:^2.0.0"
   peerDependencies:
     "@types/react": ^16.9.0 || ^17.0.0 || ^18.0.0
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 925d1922f9853e516eaad526b6fed1be38008073067274f0ecc3f56b17bb8ab63480140dd7c271f94150027c996cea4efe83d3e3525e8f3eda22055f6a39220b
+  checksum: 10/ec99e31aefeb880f6dc4d02cb19a01d123364954f857811470ece32872f70d6c3eadbe4d073770706a9b7db6136f2a9fbf1bb803e07fbb21e936a47479281690
   languageName: node
   linkType: hard
 
@@ -29734,41 +31473,41 @@ __metadata:
   resolution: "use-sync-external-store@npm:1.2.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 5c639e0f8da3521d605f59ce5be9e094ca772bd44a4ce7322b055a6f58eeed8dda3c94cabd90c7a41fb6fa852210092008afe48f7038792fd47501f33299116a
+  checksum: 10/a676216affc203876bd47981103f201f28c2731361bb186367e12d287a7566763213a8816910c6eb88265eccd4c230426eb783d64c373c4a180905be8820ed8e
   languageName: node
   linkType: hard
 
 "util-deprecate@npm:^1.0.1, util-deprecate@npm:^1.0.2, util-deprecate@npm:~1.0.1":
   version: 1.0.2
   resolution: "util-deprecate@npm:1.0.2"
-  checksum: 474acf1146cb2701fe3b074892217553dfcf9a031280919ba1b8d651a068c9b15d863b7303cb15bd00a862b498e6cf4ad7b4a08fb134edd5a6f7641681cb54a2
+  checksum: 10/474acf1146cb2701fe3b074892217553dfcf9a031280919ba1b8d651a068c9b15d863b7303cb15bd00a862b498e6cf4ad7b4a08fb134edd5a6f7641681cb54a2
   languageName: node
   linkType: hard
 
-"util@npm:^0.12.0, util@npm:^0.12.3, util@npm:^0.12.4":
+"util@npm:^0.12.0, util@npm:^0.12.4":
   version: 0.12.5
   resolution: "util@npm:0.12.5"
   dependencies:
-    inherits: ^2.0.3
-    is-arguments: ^1.0.4
-    is-generator-function: ^1.0.7
-    is-typed-array: ^1.1.3
-    which-typed-array: ^1.1.2
-  checksum: 705e51f0de5b446f4edec10739752ac25856541e0254ea1e7e45e5b9f9b0cb105bc4bd415736a6210edc68245a7f903bf085ffb08dd7deb8a0e847f60538a38a
+    inherits: "npm:^2.0.3"
+    is-arguments: "npm:^1.0.4"
+    is-generator-function: "npm:^1.0.7"
+    is-typed-array: "npm:^1.1.3"
+    which-typed-array: "npm:^1.1.2"
+  checksum: 10/61a10de7753353dd4d744c917f74cdd7d21b8b46379c1e48e1c4fd8e83f8190e6bd9978fc4e5102ab6a10ebda6019d1b36572fa4a325e175ec8b789a121f6147
   languageName: node
   linkType: hard
 
 "utila@npm:~0.4":
   version: 0.4.0
   resolution: "utila@npm:0.4.0"
-  checksum: 97ffd3bd2bb80c773429d3fb8396469115cd190dded1e733f190d8b602bd0a1bcd6216b7ce3c4395ee3c79e3c879c19d268dbaae3093564cb169ad1212d436f4
+  checksum: 10/b068d8cb140588da0d0c80ee3c14c6b75d3f68760d8a1c6c3908d0270e9e4056454ff16189586481b7382926c44674f6929d08e06eaf9ec8f62736cd900169c5
   languageName: node
   linkType: hard
 
 "utils-merge@npm:1.0.1":
   version: 1.0.1
   resolution: "utils-merge@npm:1.0.1"
-  checksum: c81095493225ecfc28add49c106ca4f09cdf56bc66731aa8dabc2edbbccb1e1bfe2de6a115e5c6a380d3ea166d1636410b62ef216bb07b3feb1cfde1d95d5080
+  checksum: 10/5d6949693d58cb2e636a84f3ee1c6e7b2f9c16cb1d42d0ecb386d8c025c69e327205aa1c69e2868cc06a01e5e20681fbba55a4e0ed0cce913d60334024eae798
   languageName: node
   linkType: hard
 
@@ -29776,17 +31515,26 @@ __metadata:
   version: 1.0.2
   resolution: "utrie@npm:1.0.2"
   dependencies:
-    base64-arraybuffer: ^1.0.2
-  checksum: c96fbb7d4d8855a154327da0b18e39b7511cc70a7e4bcc3658e24f424bb884312d72b5ba777500b8858e34d365dc6b1a921dc5ca2f0d341182519c6b78e280a5
+    base64-arraybuffer: "npm:^1.0.2"
+  checksum: 10/0c9458380bf3113f425a268e3d605aef163bfbaea62bf24de517b62b6e6744394d8ef1cdd9b07423359aec5ed402baab4bb2c5beec64f674ec635dc2f8dbd4bf
   languageName: node
   linkType: hard
 
-"uuid@npm:9.0.0, uuid@npm:^9.0.0":
+"uuid@npm:9.0.0":
   version: 9.0.0
   resolution: "uuid@npm:9.0.0"
   bin:
     uuid: dist/bin/uuid
-  checksum: 8dd2c83c43ddc7e1c71e36b60aea40030a6505139af6bee0f382ebcd1a56f6cd3028f7f06ffb07f8cf6ced320b76aea275284b224b002b289f89fe89c389b028
+  checksum: 10/23857699a616d1b48224bc2b8440eae6e57d25463c3a0200e514ba8279dfa3bde7e92ea056122237839cfa32045e57d8f8f4a30e581d720fd72935572853ae2e
+  languageName: node
+  linkType: hard
+
+"uuid@npm:9.0.1, uuid@npm:^9.0.0, uuid@npm:^9.0.1":
+  version: 9.0.1
+  resolution: "uuid@npm:9.0.1"
+  bin:
+    uuid: dist/bin/uuid
+  checksum: 10/9d0b6adb72b736e36f2b1b53da0d559125ba3e39d913b6072f6f033e0c87835b414f0836b45bcfaf2bdf698f92297fea1c3cc19b0b258bc182c9c43cc0fab9f2
   languageName: node
   linkType: hard
 
@@ -29795,7 +31543,7 @@ __metadata:
   resolution: "uuid@npm:3.4.0"
   bin:
     uuid: ./bin/uuid
-  checksum: 58de2feed61c59060b40f8203c0e4ed7fd6f99d42534a499f1741218a1dd0c129f4aa1de797bcf822c8ea5da7e4137aa3673431a96dae729047f7aca7b27866f
+  checksum: 10/4f2b86432b04cc7c73a0dd1bcf11f1fc18349d65d2e4e32dd0fc658909329a1e0cc9244aa93f34c0cccfdd5ae1af60a149251a5f420ec3ac4223a3dab198fb2e
   languageName: node
   linkType: hard
 
@@ -29804,21 +31552,14 @@ __metadata:
   resolution: "uuid@npm:8.3.2"
   bin:
     uuid: dist/bin/uuid
-  checksum: 5575a8a75c13120e2f10e6ddc801b2c7ed7d8f3c8ac22c7ed0c7b2ba6383ec0abda88c905085d630e251719e0777045ae3236f04c812184b7c765f63a70e58df
+  checksum: 10/9a5f7aa1d6f56dd1e8d5f2478f855f25c645e64e26e347a98e98d95781d5ed20062d6cca2eecb58ba7c84bc3910be95c0451ef4161906abaab44f9cb68ffbdd1
   languageName: node
   linkType: hard
 
 "v8-compile-cache-lib@npm:^3.0.1":
   version: 3.0.1
   resolution: "v8-compile-cache-lib@npm:3.0.1"
-  checksum: 78089ad549e21bcdbfca10c08850022b22024cdcc2da9b168bcf5a73a6ed7bf01a9cebb9eac28e03cd23a684d81e0502797e88f3ccd27a32aeab1cfc44c39da0
-  languageName: node
-  linkType: hard
-
-"v8-compile-cache@npm:2.3.0":
-  version: 2.3.0
-  resolution: "v8-compile-cache@npm:2.3.0"
-  checksum: adb0a271eaa2297f2f4c536acbfee872d0dd26ec2d76f66921aa7fc437319132773483344207bdbeee169225f4739016d8d2dbf0553913a52bb34da6d0334f8e
+  checksum: 10/88d3423a52b6aaf1836be779cab12f7016d47ad8430dffba6edf766695e6d90ad4adaa3d8eeb512cc05924f3e246c4a4ca51e089dccf4402caa536b5e5be8961
   languageName: node
   linkType: hard
 
@@ -29826,143 +31567,129 @@ __metadata:
   version: 9.1.0
   resolution: "v8-to-istanbul@npm:9.1.0"
   dependencies:
-    "@jridgewell/trace-mapping": ^0.3.12
-    "@types/istanbul-lib-coverage": ^2.0.1
-    convert-source-map: ^1.6.0
-  checksum: 2069d59ee46cf8d83b4adfd8a5c1a90834caffa9f675e4360f1157ffc8578ef0f763c8f32d128334424159bb6b01f3876acd39cd13297b2769405a9da241f8d1
+    "@jridgewell/trace-mapping": "npm:^0.3.12"
+    "@types/istanbul-lib-coverage": "npm:^2.0.1"
+    convert-source-map: "npm:^1.6.0"
+  checksum: 10/95811ff2f17a31432c3fc7b3027b7e8c2c6ca5e60a7811c5050ce51920ab2b80df29feb04c52235bbfdaa9a6809acd5a5dd9668292e98c708617c19e087c3f68
   languageName: node
   linkType: hard
 
-"validate-npm-package-license@npm:^3.0.1, validate-npm-package-license@npm:^3.0.4":
+"validate-npm-package-license@npm:3.0.4, validate-npm-package-license@npm:^3.0.1, validate-npm-package-license@npm:^3.0.4":
   version: 3.0.4
   resolution: "validate-npm-package-license@npm:3.0.4"
   dependencies:
-    spdx-correct: ^3.0.0
-    spdx-expression-parse: ^3.0.0
-  checksum: 35703ac889d419cf2aceef63daeadbe4e77227c39ab6287eeb6c1b36a746b364f50ba22e88591f5d017bc54685d8137bc2d328d0a896e4d3fd22093c0f32a9ad
+    spdx-correct: "npm:^3.0.0"
+    spdx-expression-parse: "npm:^3.0.0"
+  checksum: 10/86242519b2538bb8aeb12330edebb61b4eb37fd35ef65220ab0b03a26c0592c1c8a7300d32da3cde5abd08d18d95e8dabfad684b5116336f6de9e6f207eec224
   languageName: node
   linkType: hard
 
-"validate-npm-package-name@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "validate-npm-package-name@npm:3.0.0"
+"validate-npm-package-name@npm:5.0.0, validate-npm-package-name@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "validate-npm-package-name@npm:5.0.0"
   dependencies:
-    builtins: ^1.0.3
-  checksum: ce4c68207abfb22c05eedb09ff97adbcedc80304a235a0844f5344f1fd5086aa80e4dbec5684d6094e26e35065277b765c1caef68bcea66b9056761eddb22967
+    builtins: "npm:^5.0.0"
+  checksum: 10/5342a994986199b3c28e53a8452a14b2bb5085727691ea7aa0d284a6606b127c371e0925ae99b3f1ef7cc7d2c9de75f52eb61a3d1cc45e39bca1e3a9444cbb4e
   languageName: node
   linkType: hard
 
-"validate-npm-package-name@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "validate-npm-package-name@npm:4.0.0"
+"validate-npm-package-name@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "validate-npm-package-name@npm:3.0.0"
   dependencies:
-    builtins: ^5.0.0
-  checksum: a32fd537bad17fcb59cfd58ae95a414d443866020d448ec3b22e8d40550cb585026582a57efbe1f132b882eea4da8ac38ee35f7be0dd72988a3cb55d305a20c1
+    builtins: "npm:^1.0.3"
+  checksum: 10/6f89bcc91bb0d46e3c756eec2fd33887eeb76c85d20e5d3e452b69fe3ffbd37062704a4e8422735ea82d69fd963451b4f85501a4dc856f384138411ec42608fa
   languageName: node
   linkType: hard
 
 "value-equal@npm:^1.0.1":
   version: 1.0.1
   resolution: "value-equal@npm:1.0.1"
-  checksum: bb7ae1facc76b5cf8071aeb6c13d284d023fdb370478d10a5d64508e0e6e53bb459c4bbe34258df29d82e6f561f874f0105eba38de0e61fe9edd0bdce07a77a2
+  checksum: 10/bb7ae1facc76b5cf8071aeb6c13d284d023fdb370478d10a5d64508e0e6e53bb459c4bbe34258df29d82e6f561f874f0105eba38de0e61fe9edd0bdce07a77a2
   languageName: node
   linkType: hard
 
-"value-or-function@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "value-or-function@npm:3.0.0"
-  checksum: 2b901d05b82deb8565d4edeba02e0737be73e7fb2c640b79fa64152aae8b450f790a46c86bf7039f91938c1b69d2cc0908cd18c4695b120293bb442179061fac
+"value-or-function@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "value-or-function@npm:4.0.0"
+  checksum: 10/16b6aed84b8f9732a7eb7a5035a1480be3689d097a73b1154fb827caf021d5f2b6f60c0dfe694bfc8c9605f06cfc093dc428efdc3d24cb2768fbe202ffd42ae1
   languageName: node
   linkType: hard
 
 "vary@npm:~1.1.2":
   version: 1.1.2
   resolution: "vary@npm:1.1.2"
-  checksum: ae0123222c6df65b437669d63dfa8c36cee20a504101b2fcd97b8bf76f91259c17f9f2b4d70a1e3c6bbcee7f51b28392833adb6b2770b23b01abec84e369660b
+  checksum: 10/31389debef15a480849b8331b220782230b9815a8e0dbb7b9a8369559aed2e9a7800cd904d4371ea74f4c3527db456dc8e7ac5befce5f0d289014dbdf47b2242
   languageName: node
   linkType: hard
 
-"vendor@link:./public/vendor::locator=grafana%40workspace%3A.":
-  version: 0.0.0-use.local
-  resolution: "vendor@link:./public/vendor::locator=grafana%40workspace%3A."
-  languageName: node
-  linkType: soft
-
 "verror@npm:1.10.0":
   version: 1.10.0
   resolution: "verror@npm:1.10.0"
   dependencies:
-    assert-plus: ^1.0.0
-    core-util-is: 1.0.2
-    extsprintf: ^1.2.0
-  checksum: c431df0bedf2088b227a4e051e0ff4ca54df2c114096b0c01e1cbaadb021c30a04d7dd5b41ab277bcd51246ca135bf931d4c4c796ecae7a4fef6d744ecef36ea
+    assert-plus: "npm:^1.0.0"
+    core-util-is: "npm:1.0.2"
+    extsprintf: "npm:^1.2.0"
+  checksum: 10/da548149dd9c130a8a2587c9ee71ea30128d1526925707e2d01ed9c5c45c9e9f86733c66a328247cdd5f7c1516fb25b0f959ba754bfbe15072aa99ff96468a29
   languageName: node
   linkType: hard
 
-"vinyl-fs@npm:^3.0.2":
-  version: 3.0.3
-  resolution: "vinyl-fs@npm:3.0.3"
-  dependencies:
-    fs-mkdirp-stream: ^1.0.0
-    glob-stream: ^6.1.0
-    graceful-fs: ^4.0.0
-    is-valid-glob: ^1.0.0
-    lazystream: ^1.0.0
-    lead: ^1.0.0
-    object.assign: ^4.0.4
-    pumpify: ^1.3.5
-    readable-stream: ^2.3.3
-    remove-bom-buffer: ^3.0.0
-    remove-bom-stream: ^1.2.0
-    resolve-options: ^1.1.0
-    through2: ^2.0.0
-    to-through: ^2.0.0
-    value-or-function: ^3.0.0
-    vinyl: ^2.0.0
-    vinyl-sourcemap: ^1.1.0
-  checksum: 948366325994e13e331bc559ac38d10bff9469eeb227e627cc903cb7580c73779158c7b25dd7ac416df2fc261cdd5341896e680c086de693de71420ccbdb9cd5
-  languageName: node
-  linkType: hard
-
-"vinyl-sourcemap@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "vinyl-sourcemap@npm:1.1.0"
+"vinyl-contents@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "vinyl-contents@npm:2.0.0"
   dependencies:
-    append-buffer: ^1.0.2
-    convert-source-map: ^1.5.0
-    graceful-fs: ^4.1.6
-    normalize-path: ^2.1.1
-    now-and-later: ^2.0.0
-    remove-bom-buffer: ^3.0.0
-    vinyl: ^2.0.0
-  checksum: e7174851faff44ffd0f91d4d7234a0c153cad7da9c142e5ef46b4a24fe5ab0c98c997db7c719919cbab28edb4b9cf9ec3d7fed8460f047b3d640740a613ec944
+    bl: "npm:^5.0.0"
+    vinyl: "npm:^3.0.0"
+  checksum: 10/10d72a032e6317bf89713565d616df8726ee41601a41c48c7d778e61ab557c0a5fdee883ceecbfb33da4a5e11ea80e76e5ae63c1d13fda61edbb5ef50445c8b2
   languageName: node
   linkType: hard
 
-"vinyl@npm:^2.0.0":
-  version: 2.2.1
-  resolution: "vinyl@npm:2.2.1"
+"vinyl-fs@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "vinyl-fs@npm:4.0.0"
+  dependencies:
+    fs-mkdirp-stream: "npm:^2.0.1"
+    glob-stream: "npm:^8.0.0"
+    graceful-fs: "npm:^4.2.11"
+    iconv-lite: "npm:^0.6.3"
+    is-valid-glob: "npm:^1.0.0"
+    lead: "npm:^4.0.0"
+    normalize-path: "npm:3.0.0"
+    resolve-options: "npm:^2.0.0"
+    stream-composer: "npm:^1.0.2"
+    streamx: "npm:^2.14.0"
+    to-through: "npm:^3.0.0"
+    value-or-function: "npm:^4.0.0"
+    vinyl: "npm:^3.0.0"
+    vinyl-sourcemap: "npm:^2.0.0"
+  checksum: 10/22ae47c018600e6973b8a0a0c098927b09f60c4963cc5f717be04e774215774aa15ea97400803483d3dadafc5cff1a6744c3a2ab0322528234dc4e93ae1a55aa
+  languageName: node
+  linkType: hard
+
+"vinyl-sourcemap@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "vinyl-sourcemap@npm:2.0.0"
   dependencies:
-    clone: ^2.1.1
-    clone-buffer: ^1.0.0
-    clone-stats: ^1.0.0
-    cloneable-readable: ^1.0.0
-    remove-trailing-separator: ^1.0.1
-    replace-ext: ^1.0.0
-  checksum: 1f663973f1362f2d074b554f79ff7673187667082373b3d3e628beb1fc2a7ff33024f10b492fbd8db421a09ea3b7b22c3d3de4a0f0e73ead7b4685af570b906f
+    convert-source-map: "npm:^2.0.0"
+    graceful-fs: "npm:^4.2.10"
+    now-and-later: "npm:^3.0.0"
+    streamx: "npm:^2.12.5"
+    vinyl: "npm:^3.0.0"
+    vinyl-contents: "npm:^2.0.0"
+  checksum: 10/f23fc251a3eb72100690e5e93685ef776d8fee20e076f29655536a31b5235426b9404eea76b6b268fa00648437acc98aad54a7e76661b97305706c487a54afdb
   languageName: node
   linkType: hard
 
-"vinyl@npm:~3.0.0":
+"vinyl@npm:^3.0.0, vinyl@npm:~3.0.0":
   version: 3.0.0
   resolution: "vinyl@npm:3.0.0"
   dependencies:
-    clone: ^2.1.2
-    clone-stats: ^1.0.0
-    remove-trailing-separator: ^1.1.0
-    replace-ext: ^2.0.0
-    teex: ^1.0.1
-  checksum: 29c563d6a027d49ec216bc8259b494bd048d1f9df39103aea6877e02af1d0a6956b11ad977206b5a807b331ef5431bed9f6b8890de5e55188389d31cf7af7fbe
+    clone: "npm:^2.1.2"
+    clone-stats: "npm:^1.0.0"
+    remove-trailing-separator: "npm:^1.1.0"
+    replace-ext: "npm:^2.0.0"
+    teex: "npm:^1.0.1"
+  checksum: 10/3371947a92c4b65c7adb944b22586480ffc723ec62347d09b64e593193cb523ce5f472d52549f0e0bbfa82db6c320cae46739461594b0602bba0419d0d7800fb
   languageName: node
   linkType: hard
 
@@ -29970,27 +31697,27 @@ __metadata:
   version: 4.25.0
   resolution: "visjs-network@npm:4.25.0"
   dependencies:
-    emitter-component: ^1.1.1
-    hammerjs: ^2.0.8
-    keycharm: ^0.2.0
-    moment: ^2.20.1
-    propagating-hammerjs: ^1.4.6
-    timsort: ^0.3.0
-  checksum: 40bfcbbf2bee928d18f4811790c8d2f4b0d2019cf7139e3fffe5c3ffd992eb4a156cb6d119227b0afc62682337dfb1e69945fcafb28be841614c532fc41bc4df
+    emitter-component: "npm:^1.1.1"
+    hammerjs: "npm:^2.0.8"
+    keycharm: "npm:^0.2.0"
+    moment: "npm:^2.20.1"
+    propagating-hammerjs: "npm:^1.4.6"
+    timsort: "npm:^0.3.0"
+  checksum: 10/9914c6df0e56c22bebf43ed4a3799ecc84bc2430de776cb0b3b3b51e02454b3fe7093bb8017b6ac43717aa1458a839a4ffcf30feae2fae31b4d88358f3e6d34a
   languageName: node
   linkType: hard
 
 "void-elements@npm:3.1.0":
   version: 3.1.0
   resolution: "void-elements@npm:3.1.0"
-  checksum: 0390f818107fa8fce55bb0a5c3f661056001c1d5a2a48c28d582d4d847347c2ab5b7f8272314cac58acf62345126b6b09bea623a185935f6b1c3bbce0dfd7f7f
+  checksum: 10/0390f818107fa8fce55bb0a5c3f661056001c1d5a2a48c28d582d4d847347c2ab5b7f8272314cac58acf62345126b6b09bea623a185935f6b1c3bbce0dfd7f7f
   languageName: node
   linkType: hard
 
-"vscode-languageserver-types@npm:3.16.0":
-  version: 3.16.0
-  resolution: "vscode-languageserver-types@npm:3.16.0"
-  checksum: 7a44fb10b9fbeb9529f832337b7f0430fc6275d62945b86851d425a950e22da3917ef5f6c552688191769dd1eae047c6ee9ec3d9f2280498353007c2dfe0725c
+"vscode-languageserver-types@npm:^3.17.4":
+  version: 3.17.5
+  resolution: "vscode-languageserver-types@npm:3.17.5"
+  checksum: 10/900d0b81df5bef8d90933e75be089142f6989cc70fdb2d5a3a5f11fa20feb396aaea23ccffc8fbcc83a2f0e1b13c6ee48ff8151f236cbd6e61a4f856efac1a58
   languageName: node
   linkType: hard
 
@@ -29998,9 +31725,9 @@ __metadata:
   version: 2.7.10
   resolution: "vue-template-compiler@npm:2.7.10"
   dependencies:
-    de-indent: ^1.0.2
-    he: ^1.2.0
-  checksum: 52e4324d93ea5ecf6875c94eae99d3d4197cfb13538b6c2f5020df1776fb277e329325091c41da596b3cf1c7dabd56f50e2a538e2fc3d5ae23438d08471fdc8d
+    de-indent: "npm:^1.0.2"
+    he: "npm:^1.2.0"
+  checksum: 10/9990ea1ae1f46648e366dcca6f4f164748f131ebf0588378c7427318eac02e8993780b9e0b03a510236287b02028759cc75e5bd655cb8f3cd86b4ea705f97122
   languageName: node
   linkType: hard
 
@@ -30008,23 +31735,8 @@ __metadata:
   version: 3.0.0
   resolution: "w3c-xmlserializer@npm:3.0.0"
   dependencies:
-    xml-name-validator: ^4.0.0
-  checksum: 0af8589942eeb11c9fe29eb31a1a09f3d5dd136aea53a9848dfbabff79ac0dd26fe13eb54d330d5555fe27bb50b28dca0715e09f9cc2bfa7670ccc8b7f919ca2
-  languageName: node
-  linkType: hard
-
-"wait-on@npm:7.0.1":
-  version: 7.0.1
-  resolution: "wait-on@npm:7.0.1"
-  dependencies:
-    axios: ^0.27.2
-    joi: ^17.7.0
-    lodash: ^4.17.21
-    minimist: ^1.2.7
-    rxjs: ^7.8.0
-  bin:
-    wait-on: bin/wait-on
-  checksum: 1e8a17d8ee6436f71d3ab82781ce31267481fcd7bbccde49b0f8124871e6e40a1acac3401f04f775ba6203853a5813352fa131620fc139914351f3b2894d573f
+    xml-name-validator: "npm:^4.0.0"
+  checksum: 10/b4d73e20be283cc9975573a88979d15c08daa9c00911f8c777ef2af74eea11ba635fec18647ff0374ce880ec32ae573d17bd0f787053fc3085a530345b2feab6
   languageName: node
   linkType: hard
 
@@ -30032,18 +31744,11 @@ __metadata:
   version: 2.2.0
   resolution: "walk-sync@npm:2.2.0"
   dependencies:
-    "@types/minimatch": ^3.0.3
-    ensure-posix-path: ^1.1.0
-    matcher-collection: ^2.0.0
-    minimatch: ^3.0.4
-  checksum: e579b574f769977a739607d4feba40ded8931ff641f26964ea5a10a280d648d1c1aca260e9ab60288f16d69500ff33687d3ba5fa4dbd427090123189f0f0c9b6
-  languageName: node
-  linkType: hard
-
-"walk-up-path@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "walk-up-path@npm:1.0.0"
-  checksum: b8019ac4fb9ba1576839ec66d2217f62ab773c1cc4c704bfd1c79b1359fef5366f1382d3ab230a66a14c3adb1bf0fe102d1fdaa3437881e69154dfd1432abd32
+    "@types/minimatch": "npm:^3.0.3"
+    ensure-posix-path: "npm:^1.1.0"
+    matcher-collection: "npm:^2.0.0"
+    minimatch: "npm:^3.0.4"
+  checksum: 10/e579b574f769977a739607d4feba40ded8931ff641f26964ea5a10a280d648d1c1aca260e9ab60288f16d69500ff33687d3ba5fa4dbd427090123189f0f0c9b6
   languageName: node
   linkType: hard
 
@@ -30051,27 +31756,27 @@ __metadata:
   version: 1.0.8
   resolution: "walker@npm:1.0.8"
   dependencies:
-    makeerror: 1.0.12
-  checksum: ad7a257ea1e662e57ef2e018f97b3c02a7240ad5093c392186ce0bcf1f1a60bbadd520d073b9beb921ed99f64f065efb63dfc8eec689a80e569f93c1c5d5e16c
+    makeerror: "npm:1.0.12"
+  checksum: 10/ad7a257ea1e662e57ef2e018f97b3c02a7240ad5093c392186ce0bcf1f1a60bbadd520d073b9beb921ed99f64f065efb63dfc8eec689a80e569f93c1c5d5e16c
   languageName: node
   linkType: hard
 
-"warning@npm:^4.0.2":
+"warning@npm:^4.0.0, warning@npm:^4.0.2":
   version: 4.0.3
   resolution: "warning@npm:4.0.3"
   dependencies:
-    loose-envify: ^1.0.0
-  checksum: 4f2cb6a9575e4faf71ddad9ad1ae7a00d0a75d24521c193fa464f30e6b04027bd97aa5d9546b0e13d3a150ab402eda216d59c1d0f2d6ca60124d96cd40dfa35c
+    loose-envify: "npm:^1.0.0"
+  checksum: 10/e7842aff036e2e07ce7a6cc3225e707775b969fe3d0577ad64bd24660e3a9ce3017f0b8c22a136566dcd3a151f37b8ed1ccee103b3bd82bd8a571bf80b247bc4
   languageName: node
   linkType: hard
 
-"watchpack@npm:^2.2.0, watchpack@npm:^2.4.0":
-  version: 2.4.0
-  resolution: "watchpack@npm:2.4.0"
+"watchpack@npm:^2.2.0, watchpack@npm:^2.4.0, watchpack@npm:^2.4.1":
+  version: 2.4.1
+  resolution: "watchpack@npm:2.4.1"
   dependencies:
-    glob-to-regexp: ^0.4.1
-    graceful-fs: ^4.1.2
-  checksum: 23d4bc58634dbe13b86093e01c6a68d8096028b664ab7139d58f0c37d962d549a940e98f2f201cecdabd6f9c340338dc73ef8bf094a2249ef582f35183d1a131
+    glob-to-regexp: "npm:^0.4.1"
+    graceful-fs: "npm:^4.1.2"
+  checksum: 10/0736ebd20b75d3931f9b6175c819a66dee29297c1b389b2e178bc53396a6f867ecc2fd5d87a713ae92dcb73e487daec4905beee20ca00a9e27f1184a7c2bca5e
   languageName: node
   linkType: hard
 
@@ -30079,8 +31784,8 @@ __metadata:
   version: 1.7.3
   resolution: "wbuf@npm:1.7.3"
   dependencies:
-    minimalistic-assert: ^1.0.0
-  checksum: 2abc306c96930b757972a1c4650eb6b25b5d99f24088714957f88629e137db569368c5de0e57986c89ea70db2f1df9bba11a87cb6d0c8694b6f53a0159fab3bf
+    minimalistic-assert: "npm:^1.0.0"
+  checksum: 10/c18b51c4e1fb19705c94b93c0cf093ba014606abceee949399d56074ef1863bf4897a8d884be24e8d224d18c9ce411cf6924006d0a5430492729af51256e067a
   languageName: node
   linkType: hard
 
@@ -30088,69 +31793,76 @@ __metadata:
   version: 1.0.1
   resolution: "wcwidth@npm:1.0.1"
   dependencies:
-    defaults: ^1.0.3
-  checksum: 814e9d1ddcc9798f7377ffa448a5a3892232b9275ebb30a41b529607691c0491de47cba426e917a4d08ded3ee7e9ba2f3fe32e62ee3cd9c7d3bafb7754bd553c
-  languageName: node
-  linkType: hard
-
-"web-encoding@npm:^1.1.5":
-  version: 1.1.5
-  resolution: "web-encoding@npm:1.1.5"
-  dependencies:
-    "@zxing/text-encoding": 0.9.0
-    util: ^0.12.3
-  dependenciesMeta:
-    "@zxing/text-encoding":
-      optional: true
-  checksum: 2234a2b122f41006ce07859b3c0bf2e18f46144fda2907d5db0b571b76aa5c26977c646100ad9c00d2f8a4f6f2b848bc02147845d8c447ab365ec4eff376338d
+    defaults: "npm:^1.0.3"
+  checksum: 10/182ebac8ca0b96845fae6ef44afd4619df6987fe5cf552fdee8396d3daa1fb9b8ec5c6c69855acb7b3c1231571393bd1f0a4cdc4028d421575348f64bb0a8817
   languageName: node
   linkType: hard
 
 "web-vitals@npm:^3.1.1":
   version: 3.1.1
   resolution: "web-vitals@npm:3.1.1"
-  checksum: 26d552d7e0bba470e1426bbf55c3c1a701c683bbde4553791a2c7e1bc3a7b7b29bf66ccf67c74872af3aa39e5668728736b90f8b3fee2910c0c566e7eb1b6096
+  checksum: 10/4ccf63501e06fcd7cff063f1355195b5755afcc0b7c18991d89398fab5626ebc4331b71dcdb2ae525a5940f4e7c9c7f859e3bd3c27476dab1d1c7d8f5e472029
   languageName: node
   linkType: hard
 
 "web-worker@npm:^1.2.0":
   version: 1.2.0
   resolution: "web-worker@npm:1.2.0"
-  checksum: 1bb28348ddcf9b2e7c62c5fd02e49a84098795856cd905456de957271bba288e9618941cf69d8960f0a7ae81f5dfb74b427c0634be47ec69e3e955c4ec5213be
+  checksum: 10/61a9d046504891ea25754eae08053a4f62a52798a5612039da9df92aca6c52c47eb0e2e35dbbe4c7ba1ba9622ad5783479ddd2e391ae6aed1f99c9b278309c53
   languageName: node
   linkType: hard
 
 "webidl-conversions@npm:^3.0.0":
   version: 3.0.1
   resolution: "webidl-conversions@npm:3.0.1"
-  checksum: c92a0a6ab95314bde9c32e1d0a6dfac83b578f8fa5f21e675bc2706ed6981bc26b7eb7e6a1fab158e5ce4adf9caa4a0aee49a52505d4d13c7be545f15021b17c
+  checksum: 10/b65b9f8d6854572a84a5c69615152b63371395f0c5dcd6729c45789052296df54314db2bc3e977df41705eacb8bc79c247cee139a63fa695192f95816ed528ad
   languageName: node
   linkType: hard
 
 "webidl-conversions@npm:^7.0.0":
   version: 7.0.0
   resolution: "webidl-conversions@npm:7.0.0"
-  checksum: f05588567a2a76428515333eff87200fae6c83c3948a7482ebb109562971e77ef6dc49749afa58abb993391227c5697b3ecca52018793e0cb4620a48f10bd21b
+  checksum: 10/4c4f65472c010eddbe648c11b977d048dd96956a625f7f8b9d64e1b30c3c1f23ea1acfd654648426ce5c743c2108a5a757c0592f02902cf7367adb7d14e67721
   languageName: node
   linkType: hard
 
-"webpack-bundle-analyzer@npm:4.9.0":
-  version: 4.9.0
-  resolution: "webpack-bundle-analyzer@npm:4.9.0"
+"webpack-assets-manifest@npm:^5.1.0":
+  version: 5.2.1
+  resolution: "webpack-assets-manifest@npm:5.2.1"
   dependencies:
-    "@discoveryjs/json-ext": 0.5.7
-    acorn: ^8.0.4
-    acorn-walk: ^8.0.0
-    chalk: ^4.1.0
-    commander: ^7.2.0
-    gzip-size: ^6.0.0
-    lodash: ^4.17.20
-    opener: ^1.5.2
-    sirv: ^1.0.7
-    ws: ^7.3.1
+    chalk: "npm:^4.1.2"
+    deepmerge: "npm:^4.3.1"
+    lockfile: "npm:^1.0.4"
+    lodash.get: "npm:^4.4.2"
+    lodash.has: "npm:^4.5.2"
+    schema-utils: "npm:^3.3.0"
+    tapable: "npm:^2.2.1"
+  peerDependencies:
+    webpack: ^5.2.0
+  checksum: 10/ff4394e825d3bd28ba3ad34e320dd9584d556cdcbda082547491a4b8bc319f8d7699d7e965342372ccaeaea27b226acdd0ec634347400e1bda6d022896b84b37
+  languageName: node
+  linkType: hard
+
+"webpack-bundle-analyzer@npm:4.10.1":
+  version: 4.10.1
+  resolution: "webpack-bundle-analyzer@npm:4.10.1"
+  dependencies:
+    "@discoveryjs/json-ext": "npm:0.5.7"
+    acorn: "npm:^8.0.4"
+    acorn-walk: "npm:^8.0.0"
+    commander: "npm:^7.2.0"
+    debounce: "npm:^1.2.1"
+    escape-string-regexp: "npm:^4.0.0"
+    gzip-size: "npm:^6.0.0"
+    html-escaper: "npm:^2.0.2"
+    is-plain-object: "npm:^5.0.0"
+    opener: "npm:^1.5.2"
+    picocolors: "npm:^1.0.0"
+    sirv: "npm:^2.0.3"
+    ws: "npm:^7.3.1"
   bin:
     webpack-bundle-analyzer: lib/bin/analyzer.js
-  checksum: e439aea4e88e18bfdc16eb69782c1bb17b2e581905a5cfa8d34058dc6677f6e202f896189268e58b49fa14ae12f5ef4c25cdca9f98f3de7e6699ac62def2f0af
+  checksum: 10/bc7bc2c014ba36dfb3f28ef75e3bb4be17ebff092ae713a30392a1d578a73b5d83ed0940b9d12eca6b06e514218d8a1e7cb0610f0b4d74b53425be3f0cc3aea8
   languageName: node
   linkType: hard
 
@@ -30158,19 +31870,19 @@ __metadata:
   version: 5.1.4
   resolution: "webpack-cli@npm:5.1.4"
   dependencies:
-    "@discoveryjs/json-ext": ^0.5.0
-    "@webpack-cli/configtest": ^2.1.1
-    "@webpack-cli/info": ^2.0.2
-    "@webpack-cli/serve": ^2.0.5
-    colorette: ^2.0.14
-    commander: ^10.0.1
-    cross-spawn: ^7.0.3
-    envinfo: ^7.7.3
-    fastest-levenshtein: ^1.0.12
-    import-local: ^3.0.2
-    interpret: ^3.1.1
-    rechoir: ^0.8.0
-    webpack-merge: ^5.7.3
+    "@discoveryjs/json-ext": "npm:^0.5.0"
+    "@webpack-cli/configtest": "npm:^2.1.1"
+    "@webpack-cli/info": "npm:^2.0.2"
+    "@webpack-cli/serve": "npm:^2.0.5"
+    colorette: "npm:^2.0.14"
+    commander: "npm:^10.0.1"
+    cross-spawn: "npm:^7.0.3"
+    envinfo: "npm:^7.7.3"
+    fastest-levenshtein: "npm:^1.0.12"
+    import-local: "npm:^3.0.2"
+    interpret: "npm:^3.1.1"
+    rechoir: "npm:^0.8.0"
+    webpack-merge: "npm:^5.7.3"
   peerDependencies:
     webpack: 5.x.x
   peerDependenciesMeta:
@@ -30182,79 +31894,83 @@ __metadata:
       optional: true
   bin:
     webpack-cli: bin/cli.js
-  checksum: 3a4ad0d0342a6815c850ee4633cc2a8a5dae04f918e7847f180bf24ab400803cf8a8943707ffbed03eb20fe6ce647f996f60a2aade87b0b4a9954da3da172ce0
+  checksum: 10/9ac3ae7c43b032051de2803d751bd3b44e1f226b931dcd56066a8e01b12734d49730903df9235e1eb1b67b2ee7451faf24a219c8f4a229c4f42c42e827eac44c
   languageName: node
   linkType: hard
 
-"webpack-dev-middleware@npm:^5.3.1":
-  version: 5.3.1
-  resolution: "webpack-dev-middleware@npm:5.3.1"
+"webpack-dev-middleware@npm:^6.1.1":
+  version: 6.1.1
+  resolution: "webpack-dev-middleware@npm:6.1.1"
   dependencies:
-    colorette: ^2.0.10
-    memfs: ^3.4.1
-    mime-types: ^2.1.31
-    range-parser: ^1.2.1
-    schema-utils: ^4.0.0
+    colorette: "npm:^2.0.10"
+    memfs: "npm:^3.4.12"
+    mime-types: "npm:^2.1.31"
+    range-parser: "npm:^1.2.1"
+    schema-utils: "npm:^4.0.0"
   peerDependencies:
-    webpack: ^4.0.0 || ^5.0.0
-  checksum: 32e36b5893dde4107e5bb758afdc7fc61fd238a62635cb2964ed6b61e363793275a40870479daeae3fa3b87678c1311f44ba7492f6ebf30fe9360f2aab30bae1
+    webpack: ^5.0.0
+  peerDependenciesMeta:
+    webpack:
+      optional: true
+  checksum: 10/b0637584f18b02174fd7fc2e6278efb8e2fb5308abe4ffe73658e59ff53a62c05686f161b06bd5c41d42611aa395b8c8f087d7ff8cf2304232c097a694a5b94e
   languageName: node
   linkType: hard
 
-"webpack-dev-middleware@npm:^6.1.1":
-  version: 6.1.1
-  resolution: "webpack-dev-middleware@npm:6.1.1"
+"webpack-dev-middleware@npm:^7.1.0":
+  version: 7.1.0
+  resolution: "webpack-dev-middleware@npm:7.1.0"
   dependencies:
-    colorette: ^2.0.10
-    memfs: ^3.4.12
-    mime-types: ^2.1.31
-    range-parser: ^1.2.1
-    schema-utils: ^4.0.0
+    colorette: "npm:^2.0.10"
+    memfs: "npm:^4.6.0"
+    mime-types: "npm:^2.1.31"
+    on-finished: "npm:^2.4.1"
+    range-parser: "npm:^1.2.1"
+    schema-utils: "npm:^4.0.0"
   peerDependencies:
     webpack: ^5.0.0
   peerDependenciesMeta:
     webpack:
       optional: true
-  checksum: 3bced6ef644b20f2e76df9db1c5209f4a73761d7d307fe29ae20bc00397d4f9727af2607f98794c6c7c57d5c1a48bfa12690168b08f5d46820b07aab2c63640c
+  checksum: 10/9be007cad293051995c7a6a0a385a43a8e1a38c9d23954249add76c3beb9279993375b7af2d52c989c88a57a049e2971803feea835726a850e94e978dc6eac79
   languageName: node
   linkType: hard
 
-"webpack-dev-server@npm:4.15.1":
-  version: 4.15.1
-  resolution: "webpack-dev-server@npm:4.15.1"
-  dependencies:
-    "@types/bonjour": ^3.5.9
-    "@types/connect-history-api-fallback": ^1.3.5
-    "@types/express": ^4.17.13
-    "@types/serve-index": ^1.9.1
-    "@types/serve-static": ^1.13.10
-    "@types/sockjs": ^0.3.33
-    "@types/ws": ^8.5.5
-    ansi-html-community: ^0.0.8
-    bonjour-service: ^1.0.11
-    chokidar: ^3.5.3
-    colorette: ^2.0.10
-    compression: ^1.7.4
-    connect-history-api-fallback: ^2.0.0
-    default-gateway: ^6.0.3
-    express: ^4.17.3
-    graceful-fs: ^4.2.6
-    html-entities: ^2.3.2
-    http-proxy-middleware: ^2.0.3
-    ipaddr.js: ^2.0.1
-    launch-editor: ^2.6.0
-    open: ^8.0.9
-    p-retry: ^4.5.0
-    rimraf: ^3.0.2
-    schema-utils: ^4.0.0
-    selfsigned: ^2.1.1
-    serve-index: ^1.9.1
-    sockjs: ^0.3.24
-    spdy: ^4.0.2
-    webpack-dev-middleware: ^5.3.1
-    ws: ^8.13.0
-  peerDependencies:
-    webpack: ^4.37.0 || ^5.0.0
+"webpack-dev-server@npm:5.0.4":
+  version: 5.0.4
+  resolution: "webpack-dev-server@npm:5.0.4"
+  dependencies:
+    "@types/bonjour": "npm:^3.5.13"
+    "@types/connect-history-api-fallback": "npm:^1.5.4"
+    "@types/express": "npm:^4.17.21"
+    "@types/serve-index": "npm:^1.9.4"
+    "@types/serve-static": "npm:^1.15.5"
+    "@types/sockjs": "npm:^0.3.36"
+    "@types/ws": "npm:^8.5.10"
+    ansi-html-community: "npm:^0.0.8"
+    bonjour-service: "npm:^1.2.1"
+    chokidar: "npm:^3.6.0"
+    colorette: "npm:^2.0.10"
+    compression: "npm:^1.7.4"
+    connect-history-api-fallback: "npm:^2.0.0"
+    default-gateway: "npm:^6.0.3"
+    express: "npm:^4.17.3"
+    graceful-fs: "npm:^4.2.6"
+    html-entities: "npm:^2.4.0"
+    http-proxy-middleware: "npm:^2.0.3"
+    ipaddr.js: "npm:^2.1.0"
+    launch-editor: "npm:^2.6.1"
+    open: "npm:^10.0.3"
+    p-retry: "npm:^6.2.0"
+    rimraf: "npm:^5.0.5"
+    schema-utils: "npm:^4.2.0"
+    selfsigned: "npm:^2.4.1"
+    serve-index: "npm:^1.9.1"
+    sockjs: "npm:^0.3.24"
+    spdy: "npm:^4.0.2"
+    webpack-dev-middleware: "npm:^7.1.0"
+    ws: "npm:^8.16.0"
+  peerDependencies:
+    webpack: ^5.0.0
   peerDependenciesMeta:
     webpack:
       optional: true
@@ -30262,7 +31978,7 @@ __metadata:
       optional: true
   bin:
     webpack-dev-server: bin/webpack-dev-server.js
-  checksum: cd0063b068d2b938fd76c412d555374186ac2fa84bbae098265212ed50a5c15d6f03aa12a5a310c544a242943eb58c0bfde4c296d5c36765c182f53799e1bc71
+  checksum: 10/3896866abf15a1d5cc31ab4fc9c36aacf3431356837ad6debe25cde29289a70c58dcbe40914bbb275ff455463d37437532093d0e8d7744e7643ce1364491fdb4
   languageName: node
   linkType: hard
 
@@ -30270,10 +31986,10 @@ __metadata:
   version: 2.25.3
   resolution: "webpack-hot-middleware@npm:2.25.3"
   dependencies:
-    ansi-html-community: 0.0.8
-    html-entities: ^2.1.0
-    strip-ansi: ^6.0.0
-  checksum: 74fe5d15f3120742cf0f88a4af7e72f3678f2d05905676e37ab4e85c559f2c21d8aa72b0efe7c262993370bfc83fbe5a8d42561bcd10b370fac88640f87c463a
+    ansi-html-community: "npm:0.0.8"
+    html-entities: "npm:^2.1.0"
+    strip-ansi: "npm:^6.0.0"
+  checksum: 10/0d83ad60b36a9d28b484ad069161d90a5fb2c30ef42f11093c95151ae0c2e73345c0ea864c6a9af47e3ebf25bb1745bf6f39a94c8f033d07ec8e6c876501634b
   languageName: node
   linkType: hard
 
@@ -30281,11 +31997,11 @@ __metadata:
   version: 5.0.0
   resolution: "webpack-manifest-plugin@npm:5.0.0"
   dependencies:
-    tapable: ^2.0.0
-    webpack-sources: ^2.2.0
+    tapable: "npm:^2.0.0"
+    webpack-sources: "npm:^2.2.0"
   peerDependencies:
     webpack: ^5.47.0
-  checksum: 864d68f90870e194074756e71caf3df36b777d687a50286ba27eb1958480642b125c2cf47a2787beac52eba4b1ccf1fe8141f017c81f1e87e953481f852a7c48
+  checksum: 10/466ade444c23d4a8ec3d1a108ec2142468cb260570533acf2cf68806065ccdef649dbac0fa6b0700f4c6d2497535ae950a20e83b26edb25ccfa9bb51538fa607
   languageName: node
   linkType: hard
 
@@ -30293,10 +32009,10 @@ __metadata:
   version: 5.10.0
   resolution: "webpack-merge@npm:5.10.0"
   dependencies:
-    clone-deep: ^4.0.1
-    flat: ^5.0.2
-    wildcard: ^2.0.0
-  checksum: 1fe8bf5309add7298e1ac72fb3f2090e1dfa80c48c7e79fa48aa60b5961332c7d0d61efa8851acb805e6b91a4584537a347bc106e05e9aec87fa4f7088c62f2f
+    clone-deep: "npm:^4.0.1"
+    flat: "npm:^5.0.2"
+    wildcard: "npm:^2.0.0"
+  checksum: 10/fa46ab200f17d06c7cb49fc37ad91f15769753953c9724adac1061fa305a2a223cb37c3ed25a5f501580c91f11a0800990fe3814c70a77bf1aa5b3fca45a2ac6
   languageName: node
   linkType: hard
 
@@ -30304,9 +32020,9 @@ __metadata:
   version: 1.4.3
   resolution: "webpack-sources@npm:1.4.3"
   dependencies:
-    source-list-map: ^2.0.0
-    source-map: ~0.6.1
-  checksum: 37463dad8d08114930f4bc4882a9602941f07c9f0efa9b6bc78738cd936275b990a596d801ef450d022bb005b109b9f451dd087db2f3c9baf53e8e22cf388f79
+    source-list-map: "npm:^2.0.0"
+    source-map: "npm:~0.6.1"
+  checksum: 10/6237c5d1ba639a5d67bd1135c9bba487eadbd04c5e75a2849508013f13cb4b57387e689e0991c19a14a87085be7cc0b8dd1515422ae351f6e3f813ed100ccbb8
   languageName: node
   linkType: hard
 
@@ -30314,97 +32030,115 @@ __metadata:
   version: 2.3.1
   resolution: "webpack-sources@npm:2.3.1"
   dependencies:
-    source-list-map: ^2.0.1
-    source-map: ^0.6.1
-  checksum: 6fd67f2274a84c5f51ad89767112ec8b47727134bf0f2ba0cff458c970f18966939a24128bdbddba621cd66eeb2bef0552642a9333cd8e54514f7b2a71776346
+    source-list-map: "npm:^2.0.1"
+    source-map: "npm:^0.6.1"
+  checksum: 10/0c4bb91f2899205648da25b68edf4495a360692af2c426cde98b188367478c93d5e33e2b08665e070ac0ece59ade8d52175da656a212b44701ce4a271ca66695
   languageName: node
   linkType: hard
 
 "webpack-sources@npm:^3.2.3":
   version: 3.2.3
   resolution: "webpack-sources@npm:3.2.3"
-  checksum: 989e401b9fe3536529e2a99dac8c1bdc50e3a0a2c8669cbafad31271eadd994bc9405f88a3039cd2e29db5e6d9d0926ceb7a1a4e7409ece021fe79c37d9c4607
+  checksum: 10/a661f41795d678b7526ae8a88cd1b3d8ce71a7d19b6503da8149b2e667fc7a12f9b899041c1665d39e38245ed3a59ab68de648ea31040c3829aa695a5a45211d
   languageName: node
   linkType: hard
 
 "webpack-virtual-modules@npm:^0.5.0":
   version: 0.5.0
   resolution: "webpack-virtual-modules@npm:0.5.0"
-  checksum: 22b59257b55c89d11ae295b588b683ee9fdf3aeb591bc7b6f88ac1d69cb63f4fcb507666ea986866dfae161a1fa534ad6fb4e2ea91bbcd0a6d454368d7d4c64b
+  checksum: 10/65a8f90c7e6609ba1c4ad2697bb83ae662485893fb545f6aa9a74e3a5d7485bbc50ef057c5bc3feca25d3153ebf9c097c233cbe4d67b52418bc84348dfb20c1a
+  languageName: node
+  linkType: hard
+
+"webpack@npm:5, webpack@npm:5.91.0, webpack@npm:^5":
+  version: 5.91.0
+  resolution: "webpack@npm:5.91.0"
+  dependencies:
+    "@types/eslint-scope": "npm:^3.7.3"
+    "@types/estree": "npm:^1.0.5"
+    "@webassemblyjs/ast": "npm:^1.12.1"
+    "@webassemblyjs/wasm-edit": "npm:^1.12.1"
+    "@webassemblyjs/wasm-parser": "npm:^1.12.1"
+    acorn: "npm:^8.7.1"
+    acorn-import-assertions: "npm:^1.9.0"
+    browserslist: "npm:^4.21.10"
+    chrome-trace-event: "npm:^1.0.2"
+    enhanced-resolve: "npm:^5.16.0"
+    es-module-lexer: "npm:^1.2.1"
+    eslint-scope: "npm:5.1.1"
+    events: "npm:^3.2.0"
+    glob-to-regexp: "npm:^0.4.1"
+    graceful-fs: "npm:^4.2.11"
+    json-parse-even-better-errors: "npm:^2.3.1"
+    loader-runner: "npm:^4.2.0"
+    mime-types: "npm:^2.1.27"
+    neo-async: "npm:^2.6.2"
+    schema-utils: "npm:^3.2.0"
+    tapable: "npm:^2.1.1"
+    terser-webpack-plugin: "npm:^5.3.10"
+    watchpack: "npm:^2.4.1"
+    webpack-sources: "npm:^3.2.3"
+  peerDependenciesMeta:
+    webpack-cli:
+      optional: true
+  bin:
+    webpack: bin/webpack.js
+  checksum: 10/647ca53c15fe0fa1af4396a7257d7a93cbea648d2685e565a11cc822a9e3ea9316345250987d75f02c0b45dae118814f094ec81908d1032e77a33cd6470b289e
   languageName: node
   linkType: hard
 
-"webpack@npm:5, webpack@npm:5.89.0":
+"webpack@npm:5.89.0":
   version: 5.89.0
   resolution: "webpack@npm:5.89.0"
   dependencies:
-    "@types/eslint-scope": ^3.7.3
-    "@types/estree": ^1.0.0
-    "@webassemblyjs/ast": ^1.11.5
-    "@webassemblyjs/wasm-edit": ^1.11.5
-    "@webassemblyjs/wasm-parser": ^1.11.5
-    acorn: ^8.7.1
-    acorn-import-assertions: ^1.9.0
-    browserslist: ^4.14.5
-    chrome-trace-event: ^1.0.2
-    enhanced-resolve: ^5.15.0
-    es-module-lexer: ^1.2.1
-    eslint-scope: 5.1.1
-    events: ^3.2.0
-    glob-to-regexp: ^0.4.1
-    graceful-fs: ^4.2.9
-    json-parse-even-better-errors: ^2.3.1
-    loader-runner: ^4.2.0
-    mime-types: ^2.1.27
-    neo-async: ^2.6.2
-    schema-utils: ^3.2.0
-    tapable: ^2.1.1
-    terser-webpack-plugin: ^5.3.7
-    watchpack: ^2.4.0
-    webpack-sources: ^3.2.3
+    "@types/eslint-scope": "npm:^3.7.3"
+    "@types/estree": "npm:^1.0.0"
+    "@webassemblyjs/ast": "npm:^1.11.5"
+    "@webassemblyjs/wasm-edit": "npm:^1.11.5"
+    "@webassemblyjs/wasm-parser": "npm:^1.11.5"
+    acorn: "npm:^8.7.1"
+    acorn-import-assertions: "npm:^1.9.0"
+    browserslist: "npm:^4.14.5"
+    chrome-trace-event: "npm:^1.0.2"
+    enhanced-resolve: "npm:^5.15.0"
+    es-module-lexer: "npm:^1.2.1"
+    eslint-scope: "npm:5.1.1"
+    events: "npm:^3.2.0"
+    glob-to-regexp: "npm:^0.4.1"
+    graceful-fs: "npm:^4.2.9"
+    json-parse-even-better-errors: "npm:^2.3.1"
+    loader-runner: "npm:^4.2.0"
+    mime-types: "npm:^2.1.27"
+    neo-async: "npm:^2.6.2"
+    schema-utils: "npm:^3.2.0"
+    tapable: "npm:^2.1.1"
+    terser-webpack-plugin: "npm:^5.3.7"
+    watchpack: "npm:^2.4.0"
+    webpack-sources: "npm:^3.2.3"
   peerDependenciesMeta:
     webpack-cli:
       optional: true
   bin:
     webpack: bin/webpack.js
-  checksum: 43fe0dbc30e168a685ef5a86759d5016a705f6563b39a240aa00826a80637d4a3deeb8062e709d6a4b05c63e796278244c84b04174704dc4a37bedb0f565c5ed
-  languageName: node
-  linkType: hard
-
-"webpack@npm:5.76.0":
-  version: 5.76.0
-  resolution: "webpack@npm:5.76.0"
-  dependencies:
-    "@types/eslint-scope": ^3.7.3
-    "@types/estree": ^0.0.51
-    "@webassemblyjs/ast": 1.11.1
-    "@webassemblyjs/wasm-edit": 1.11.1
-    "@webassemblyjs/wasm-parser": 1.11.1
-    acorn: ^8.7.1
-    acorn-import-assertions: ^1.7.6
-    browserslist: ^4.14.5
-    chrome-trace-event: ^1.0.2
-    enhanced-resolve: ^5.10.0
-    es-module-lexer: ^0.9.0
-    eslint-scope: 5.1.1
-    events: ^3.2.0
-    glob-to-regexp: ^0.4.1
-    graceful-fs: ^4.2.9
-    json-parse-even-better-errors: ^2.3.1
-    loader-runner: ^4.2.0
-    mime-types: ^2.1.27
-    neo-async: ^2.6.2
-    schema-utils: ^3.1.0
-    tapable: ^2.1.1
-    terser-webpack-plugin: ^5.1.3
-    watchpack: ^2.4.0
-    webpack-sources: ^3.2.3
-  peerDependenciesMeta:
-    webpack-cli:
-      optional: true
-  bin:
-    webpack: bin/webpack.js
-  checksum: e897b3b34068222fe910d8894837cbf39f5e66b4772fe8d24dfc0090cd13e19337a3a757a97bc185be6c64d9d5a7b1ae372821b65a6079ce8c7ceba606edb409
+  checksum: 10/ee19b070279c9bc3bf21eeaac3ea08e6583c1b8da334e595b3c9badedbd7f9fad071b9f785076081af661ef247bb72441e86e8b903bf253ae9300007a048ea6e
+  languageName: node
+  linkType: hard
+
+"webpackbar@npm:^6.0.0":
+  version: 6.0.1
+  resolution: "webpackbar@npm:6.0.1"
+  dependencies:
+    ansi-escapes: "npm:^4.3.2"
+    chalk: "npm:^4.1.2"
+    consola: "npm:^3.2.3"
+    figures: "npm:^3.2.0"
+    markdown-table: "npm:^2.0.0"
+    pretty-time: "npm:^1.1.0"
+    std-env: "npm:^3.7.0"
+    wrap-ansi: "npm:^7.0.0"
+  peerDependencies:
+    webpack: 3 || 4 || 5
+  checksum: 10/9da47f8dcbc9173b19e41e3e1049fa451b0c02095ffa003e8c09c56aa2cc544334d1c6fff0797162a807b29090db9cf9a269cd5ec453196142543f9275cbbf70
   languageName: node
   linkType: hard
 
@@ -30412,17 +32146,17 @@ __metadata:
   version: 0.7.4
   resolution: "websocket-driver@npm:0.7.4"
   dependencies:
-    http-parser-js: ">=0.5.1"
-    safe-buffer: ">=5.1.0"
-    websocket-extensions: ">=0.1.1"
-  checksum: fffe5a33fe8eceafd21d2a065661d09e38b93877eae1de6ab5d7d2734c6ed243973beae10ae48c6613cfd675f200e5a058d1e3531bc9e6c5d4f1396ff1f0bfb9
+    http-parser-js: "npm:>=0.5.1"
+    safe-buffer: "npm:>=5.1.0"
+    websocket-extensions: "npm:>=0.1.1"
+  checksum: 10/17197d265d5812b96c728e70fd6fe7d067471e121669768fe0c7100c939d997ddfc807d371a728556e24fc7238aa9d58e630ea4ff5fd4cfbb40f3d0a240ef32d
   languageName: node
   linkType: hard
 
 "websocket-extensions@npm:>=0.1.1":
   version: 0.1.4
   resolution: "websocket-extensions@npm:0.1.4"
-  checksum: 5976835e68a86afcd64c7a9762ed85f2f27d48c488c707e67ba85e717b90fa066b98ab33c744d64255c9622d349eedecf728e65a5f921da71b58d0e9591b9038
+  checksum: 10/b5399b487d277c78cdd2aef63764b67764aa9899431e3a2fa272c6ad7236a0fb4549b411d89afa76d5afd664c39d62fc19118582dc937e5bb17deb694f42a0d1
   languageName: node
   linkType: hard
 
@@ -30430,22 +32164,22 @@ __metadata:
   version: 2.0.0
   resolution: "whatwg-encoding@npm:2.0.0"
   dependencies:
-    iconv-lite: 0.6.3
-  checksum: 7087810c410aa9b689cbd6af8773341a53cdc1f3aae2a882c163bd5522ec8ca4cdfc269aef417a5792f411807d5d77d50df4c24e3abb00bb60192858a40cc675
+    iconv-lite: "npm:0.6.3"
+  checksum: 10/162d712d88fd134a4fe587e53302da812eb4215a1baa4c394dfd86eff31d0a079ff932c05233857997de07481093358d6e7587997358f49b8a580a777be22089
   languageName: node
   linkType: hard
 
-"whatwg-fetch@npm:3.6.2":
-  version: 3.6.2
-  resolution: "whatwg-fetch@npm:3.6.2"
-  checksum: ee976b7249e7791edb0d0a62cd806b29006ad7ec3a3d89145921ad8c00a3a67e4be8f3fb3ec6bc7b58498724fd568d11aeeeea1f7827e7e1e5eae6c8a275afed
+"whatwg-fetch@npm:3.6.20":
+  version: 3.6.20
+  resolution: "whatwg-fetch@npm:3.6.20"
+  checksum: 10/2b4ed92acd6a7ad4f626a6cb18b14ec982bbcaf1093e6fe903b131a9c6decd14d7f9c9ca3532663c2759d1bdf01d004c77a0adfb2716a5105465c20755a8c57c
   languageName: node
   linkType: hard
 
 "whatwg-mimetype@npm:^3.0.0":
   version: 3.0.0
   resolution: "whatwg-mimetype@npm:3.0.0"
-  checksum: ce08bbb36b6aaf64f3a84da89707e3e6a31e5ab1c1a2379fd68df79ba712a4ab090904f0b50e6693b0dafc8e6343a6157e40bf18fdffd26e513cf95ee2a59824
+  checksum: 10/96f9f628c663c2ae05412c185ca81b3df54bcb921ab52fe9ebc0081c1720f25d770665401eb2338ab7f48c71568133845638e18a81ed52ab5d4dcef7d22b40ef
   languageName: node
   linkType: hard
 
@@ -30453,9 +32187,9 @@ __metadata:
   version: 11.0.0
   resolution: "whatwg-url@npm:11.0.0"
   dependencies:
-    tr46: ^3.0.0
-    webidl-conversions: ^7.0.0
-  checksum: ed4826aaa57e66bb3488a4b25c9cd476c46ba96052747388b5801f137dd740b73fde91ad207d96baf9f17fbcc80fc1a477ad65181b5eb5fa718d27c69501d7af
+    tr46: "npm:^3.0.0"
+    webidl-conversions: "npm:^7.0.0"
+  checksum: 10/dfcd51c6f4bfb54685528fb10927f3fd3d7c809b5671beef4a8cdd7b1408a7abf3343a35bc71dab83a1424f1c1e92cc2700d7930d95d231df0fac361de0c7648
   languageName: node
   linkType: hard
 
@@ -30463,9 +32197,9 @@ __metadata:
   version: 5.0.0
   resolution: "whatwg-url@npm:5.0.0"
   dependencies:
-    tr46: ~0.0.3
-    webidl-conversions: ^3.0.0
-  checksum: b8daed4ad3356cc4899048a15b2c143a9aed0dfae1f611ebd55073310c7b910f522ad75d727346ad64203d7e6c79ef25eafd465f4d12775ca44b90fa82ed9e2c
+    tr46: "npm:~0.0.3"
+    webidl-conversions: "npm:^3.0.0"
+  checksum: 10/f95adbc1e80820828b45cc671d97da7cd5e4ef9deb426c31bcd5ab00dc7103042291613b3ef3caec0a2335ed09e0d5ed026c940755dbb6d404e2b27f940fdf07
   languageName: node
   linkType: hard
 
@@ -30473,12 +32207,12 @@ __metadata:
   version: 1.0.2
   resolution: "which-boxed-primitive@npm:1.0.2"
   dependencies:
-    is-bigint: ^1.0.1
-    is-boolean-object: ^1.1.0
-    is-number-object: ^1.0.4
-    is-string: ^1.0.5
-    is-symbol: ^1.0.3
-  checksum: 53ce774c7379071729533922adcca47220228405e1895f26673bbd71bdf7fb09bee38c1d6399395927c6289476b5ae0629863427fd151491b71c4b6cb04f3a5e
+    is-bigint: "npm:^1.0.1"
+    is-boolean-object: "npm:^1.1.0"
+    is-number-object: "npm:^1.0.4"
+    is-string: "npm:^1.0.5"
+    is-symbol: "npm:^1.0.3"
+  checksum: 10/9c7ca7855255f25ac47f4ce8b59c4cc33629e713fd7a165c9d77a2bb47bf3d9655a5664660c70337a3221cf96742f3589fae15a3a33639908d33e29aa2941efb
   languageName: node
   linkType: hard
 
@@ -30486,19 +32220,19 @@ __metadata:
   version: 1.1.3
   resolution: "which-builtin-type@npm:1.1.3"
   dependencies:
-    function.prototype.name: ^1.1.5
-    has-tostringtag: ^1.0.0
-    is-async-function: ^2.0.0
-    is-date-object: ^1.0.5
-    is-finalizationregistry: ^1.0.2
-    is-generator-function: ^1.0.10
-    is-regex: ^1.1.4
-    is-weakref: ^1.0.2
-    isarray: ^2.0.5
-    which-boxed-primitive: ^1.0.2
-    which-collection: ^1.0.1
-    which-typed-array: ^1.1.9
-  checksum: 43730f7d8660ff9e33d1d3f9f9451c4784265ee7bf222babc35e61674a11a08e1c2925019d6c03154fcaaca4541df43abe35d2720843b9b4cbcebdcc31408f36
+    function.prototype.name: "npm:^1.1.5"
+    has-tostringtag: "npm:^1.0.0"
+    is-async-function: "npm:^2.0.0"
+    is-date-object: "npm:^1.0.5"
+    is-finalizationregistry: "npm:^1.0.2"
+    is-generator-function: "npm:^1.0.10"
+    is-regex: "npm:^1.1.4"
+    is-weakref: "npm:^1.0.2"
+    isarray: "npm:^2.0.5"
+    which-boxed-primitive: "npm:^1.0.2"
+    which-collection: "npm:^1.0.1"
+    which-typed-array: "npm:^1.1.9"
+  checksum: 10/d7823c4a6aa4fc8183eb572edd9f9ee2751e5f3ba2ccd5b298cc163f720df0f02ee1a5291d18ca8a41d48144ef40007ff6a64e6f5e7c506527086c7513a5f673
   languageName: node
   linkType: hard
 
@@ -30506,24 +32240,24 @@ __metadata:
   version: 1.0.1
   resolution: "which-collection@npm:1.0.1"
   dependencies:
-    is-map: ^2.0.1
-    is-set: ^2.0.1
-    is-weakmap: ^2.0.1
-    is-weakset: ^2.0.1
-  checksum: c815bbd163107ef9cb84f135e6f34453eaf4cca994e7ba85ddb0d27cea724c623fae2a473ceccfd5549c53cc65a5d82692de418166df3f858e1e5dc60818581c
+    is-map: "npm:^2.0.1"
+    is-set: "npm:^2.0.1"
+    is-weakmap: "npm:^2.0.1"
+    is-weakset: "npm:^2.0.1"
+  checksum: 10/85c95fcf92df7972ce66bed879e53d9dc752a30ef08e1ca4696df56bcf1c302e3b9965a39b04a20fa280a997fad6c170eb0b4d62435569b7f6c0bc7be910572b
   languageName: node
   linkType: hard
 
-"which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.2, which-typed-array@npm:^1.1.9":
-  version: 1.1.11
-  resolution: "which-typed-array@npm:1.1.11"
+"which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.2, which-typed-array@npm:^1.1.9":
+  version: 1.1.15
+  resolution: "which-typed-array@npm:1.1.15"
   dependencies:
-    available-typed-arrays: ^1.0.5
-    call-bind: ^1.0.2
-    for-each: ^0.3.3
-    gopd: ^1.0.1
-    has-tostringtag: ^1.0.0
-  checksum: 711ffc8ef891ca6597b19539075ec3e08bb9b4c2ca1f78887e3c07a977ab91ac1421940505a197758fb5939aa9524976d0a5bbcac34d07ed6faa75cedbb17206
+    available-typed-arrays: "npm:^1.0.7"
+    call-bind: "npm:^1.0.7"
+    for-each: "npm:^0.3.3"
+    gopd: "npm:^1.0.1"
+    has-tostringtag: "npm:^1.0.2"
+  checksum: 10/c3b6a99beadc971baa53c3ee5b749f2b9bdfa3b3b9a70650dd8511a48b61d877288b498d424712e9991d16019633086bd8b5923369460d93463c5825fa36c448
   languageName: node
   linkType: hard
 
@@ -30531,10 +32265,10 @@ __metadata:
   version: 1.3.1
   resolution: "which@npm:1.3.1"
   dependencies:
-    isexe: ^2.0.0
+    isexe: "npm:^2.0.0"
   bin:
     which: ./bin/which
-  checksum: f2e185c6242244b8426c9df1510e86629192d93c1a986a7d2a591f2c24869e7ffd03d6dac07ca863b2e4c06f59a4cc9916c585b72ee9fa1aa609d0124df15e04
+  checksum: 10/549dcf1752f3ee7fbb64f5af2eead4b9a2f482108b7de3e85c781d6c26d8cf6a52d37cfbe0642a155fa6470483fe892661a859c03157f24c669cf115f3bbab5e
   languageName: node
   linkType: hard
 
@@ -30542,40 +32276,51 @@ __metadata:
   version: 2.0.2
   resolution: "which@npm:2.0.2"
   dependencies:
-    isexe: ^2.0.0
+    isexe: "npm:^2.0.0"
   bin:
     node-which: ./bin/node-which
-  checksum: 1a5c563d3c1b52d5f893c8b61afe11abc3bab4afac492e8da5bde69d550de701cf9806235f20a47b5c8fa8a1d6a9135841de2596535e998027a54589000e66d1
+  checksum: 10/4782f8a1d6b8fc12c65e968fea49f59752bf6302dc43036c3bf87da718a80710f61a062516e9764c70008b487929a73546125570acea95c5b5dcc8ac3052c70f
+  languageName: node
+  linkType: hard
+
+"which@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "which@npm:4.0.0"
+  dependencies:
+    isexe: "npm:^3.1.1"
+  bin:
+    node-which: bin/which.js
+  checksum: 10/f17e84c042592c21e23c8195108cff18c64050b9efb8459589116999ea9da6dd1509e6a1bac3aeebefd137be00fabbb61b5c2bc0aa0f8526f32b58ee2f545651
   languageName: node
   linkType: hard
 
-"wide-align@npm:^1.1.0, wide-align@npm:^1.1.5":
+"wide-align@npm:^1.1.0, wide-align@npm:^1.1.2, wide-align@npm:^1.1.5":
   version: 1.1.5
   resolution: "wide-align@npm:1.1.5"
   dependencies:
-    string-width: ^1.0.2 || 2 || 3 || 4
-  checksum: d5fc37cd561f9daee3c80e03b92ed3e84d80dde3365a8767263d03dacfc8fa06b065ffe1df00d8c2a09f731482fcacae745abfbb478d4af36d0a891fad4834d3
+    string-width: "npm:^1.0.2 || 2 || 3 || 4"
+  checksum: 10/d5f8027b9a8255a493a94e4ec1b74a27bff6679d5ffe29316a3215e4712945c84ef73ca4045c7e20ae7d0c72f5f57f296e04a4928e773d4276a2f1222e4c2e99
   languageName: node
   linkType: hard
 
 "wildcard@npm:^2.0.0":
   version: 2.0.0
   resolution: "wildcard@npm:2.0.0"
-  checksum: 1f4fe4c03dfc492777c60f795bbba597ac78794f1b650d68f398fbee9adb765367c516ebd4220889b6a81e9626e7228bbe0d66237abb311573c2ee1f4902a5ad
+  checksum: 10/56d4f8be540918ab3a676f0e57c9cac1d13009dc9974dbdc751a073bf71ec080376697eded083e8a8f86fcb3479135bfa9d4489e25e6c748666d3a53ee096d24
   languageName: node
   linkType: hard
 
 "wordwrap@npm:^1.0.0":
   version: 1.0.0
   resolution: "wordwrap@npm:1.0.0"
-  checksum: 2a44b2788165d0a3de71fd517d4880a8e20ea3a82c080ce46e294f0b68b69a2e49cff5f99c600e275c698a90d12c5ea32aff06c311f0db2eb3f1201f3e7b2a04
+  checksum: 10/497d40beb2bdb08e6d38754faa17ce20b0bf1306327f80cb777927edb23f461ee1f6bc659b3c3c93f26b08e1cf4b46acc5bae8fda1f0be3b5ab9a1a0211034cd
   languageName: node
   linkType: hard
 
 "workerpool@npm:6.2.1":
   version: 6.2.1
   resolution: "workerpool@npm:6.2.1"
-  checksum: c2c6eebbc5225f10f758d599a5c016fa04798bcc44e4c1dffb34050cd361d7be2e97891aa44419e7afe647b1f767b1dc0b85a5e046c409d890163f655028b09d
+  checksum: 10/3e637f76320cab92eaeffa4fbefb351db02e20aa29245d8ee05fa7c088780ef7b4446bfafff2668a22fd94b7d9d97c7020117036ac77a76370ecea278b9a9b91
   languageName: node
   linkType: hard
 
@@ -30583,10 +32328,10 @@ __metadata:
   version: 7.0.0
   resolution: "wrap-ansi@npm:7.0.0"
   dependencies:
-    ansi-styles: ^4.0.0
-    string-width: ^4.1.0
-    strip-ansi: ^6.0.0
-  checksum: a790b846fd4505de962ba728a21aaeda189b8ee1c7568ca5e817d85930e06ef8d1689d49dbf0e881e8ef84436af3a88bc49115c2e2788d841ff1b8b5b51a608b
+    ansi-styles: "npm:^4.0.0"
+    string-width: "npm:^4.1.0"
+    strip-ansi: "npm:^6.0.0"
+  checksum: 10/cebdaeca3a6880da410f75209e68cd05428580de5ad24535f22696d7d9cab134d1f8498599f344c3cf0fb37c1715807a183778d8c648d6cc0cb5ff2bb4236540
   languageName: node
   linkType: hard
 
@@ -30594,10 +32339,10 @@ __metadata:
   version: 6.2.0
   resolution: "wrap-ansi@npm:6.2.0"
   dependencies:
-    ansi-styles: ^4.0.0
-    string-width: ^4.1.0
-    strip-ansi: ^6.0.0
-  checksum: 6cd96a410161ff617b63581a08376f0cb9162375adeb7956e10c8cd397821f7eb2a6de24eb22a0b28401300bf228c86e50617cd568209b5f6775b93c97d2fe3a
+    ansi-styles: "npm:^4.0.0"
+    string-width: "npm:^4.1.0"
+    strip-ansi: "npm:^6.0.0"
+  checksum: 10/0d64f2d438e0b555e693b95aee7b2689a12c3be5ac458192a1ce28f542a6e9e59ddfecc37520910c2c88eb1f82a5411260566dba5064e8f9895e76e169e76187
   languageName: node
   linkType: hard
 
@@ -30605,60 +32350,48 @@ __metadata:
   version: 8.1.0
   resolution: "wrap-ansi@npm:8.1.0"
   dependencies:
-    ansi-styles: ^6.1.0
-    string-width: ^5.0.1
-    strip-ansi: ^7.0.1
-  checksum: 371733296dc2d616900ce15a0049dca0ef67597d6394c57347ba334393599e800bab03c41d4d45221b6bc967b8c453ec3ae4749eff3894202d16800fdfe0e238
+    ansi-styles: "npm:^6.1.0"
+    string-width: "npm:^5.0.1"
+    strip-ansi: "npm:^7.0.1"
+  checksum: 10/7b1e4b35e9bb2312d2ee9ee7dc95b8cb5f8b4b5a89f7dde5543fe66c1e3715663094defa50d75454ac900bd210f702d575f15f3f17fa9ec0291806d2578d1ddf
   languageName: node
   linkType: hard
 
 "wrappy@npm:1":
   version: 1.0.2
   resolution: "wrappy@npm:1.0.2"
-  checksum: 159da4805f7e84a3d003d8841557196034155008f817172d4e986bd591f74aa82aa7db55929a54222309e01079a65a92a9e6414da5a6aa4b01ee44a511ac3ee5
+  checksum: 10/159da4805f7e84a3d003d8841557196034155008f817172d4e986bd591f74aa82aa7db55929a54222309e01079a65a92a9e6414da5a6aa4b01ee44a511ac3ee5
   languageName: node
   linkType: hard
 
-"write-file-atomic@npm:^2.3.0, write-file-atomic@npm:^2.4.2":
-  version: 2.4.3
-  resolution: "write-file-atomic@npm:2.4.3"
+"write-file-atomic@npm:5.0.1, write-file-atomic@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "write-file-atomic@npm:5.0.1"
   dependencies:
-    graceful-fs: ^4.1.11
-    imurmurhash: ^0.1.4
-    signal-exit: ^3.0.2
-  checksum: 2db81f92ae974fd87ab4a5e7932feacaca626679a7c98fcc73ad8fcea5a1950eab32fa831f79e9391ac99b562ca091ad49be37a79045bd65f595efbb8f4596ae
+    imurmurhash: "npm:^0.1.4"
+    signal-exit: "npm:^4.0.1"
+  checksum: 10/648efddba54d478d0e4330ab6f239976df3b9752b123db5dc9405d9b5af768fa9d70ce60c52fdbe61d1200d24350bc4fbcbaf09288496c2be050de126bd95b7e
   languageName: node
   linkType: hard
 
-"write-file-atomic@npm:^3.0.0":
-  version: 3.0.3
-  resolution: "write-file-atomic@npm:3.0.3"
+"write-file-atomic@npm:^2.3.0, write-file-atomic@npm:^2.4.2":
+  version: 2.4.3
+  resolution: "write-file-atomic@npm:2.4.3"
   dependencies:
-    imurmurhash: ^0.1.4
-    is-typedarray: ^1.0.0
-    signal-exit: ^3.0.2
-    typedarray-to-buffer: ^3.1.5
-  checksum: c55b24617cc61c3a4379f425fc62a386cc51916a9b9d993f39734d005a09d5a4bb748bc251f1304e7abd71d0a26d339996c275955f527a131b1dcded67878280
+    graceful-fs: "npm:^4.1.11"
+    imurmurhash: "npm:^0.1.4"
+    signal-exit: "npm:^3.0.2"
+  checksum: 10/15ce863dce07075d0decedd7c9094f4461e46139d28a758c53162f24c0791c16cd2e7a76baa5b47b1a851fbb51e16f2fab739afb156929b22628f3225437135c
   languageName: node
   linkType: hard
 
-"write-file-atomic@npm:^4.0.0, write-file-atomic@npm:^4.0.1, write-file-atomic@npm:^4.0.2":
+"write-file-atomic@npm:^4.0.2":
   version: 4.0.2
   resolution: "write-file-atomic@npm:4.0.2"
   dependencies:
-    imurmurhash: ^0.1.4
-    signal-exit: ^3.0.7
-  checksum: 5da60bd4eeeb935eec97ead3df6e28e5917a6bd317478e4a85a5285e8480b8ed96032bbcc6ecd07b236142a24f3ca871c924ec4a6575e623ec1b11bf8c1c253c
-  languageName: node
-  linkType: hard
-
-"write-file-atomic@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "write-file-atomic@npm:5.0.1"
-  dependencies:
-    imurmurhash: ^0.1.4
-    signal-exit: ^4.0.1
-  checksum: 8dbb0e2512c2f72ccc20ccedab9986c7d02d04039ed6e8780c987dc4940b793339c50172a1008eed7747001bfacc0ca47562668a069a7506c46c77d7ba3926a9
+    imurmurhash: "npm:^0.1.4"
+    signal-exit: "npm:^3.0.7"
+  checksum: 10/3be1f5508a46c190619d5386b1ac8f3af3dbe951ed0f7b0b4a0961eed6fc626bd84b50cf4be768dabc0a05b672f5d0c5ee7f42daa557b14415d18c3a13c7d246
   languageName: node
   linkType: hard
 
@@ -30666,38 +32399,24 @@ __metadata:
   version: 3.2.0
   resolution: "write-json-file@npm:3.2.0"
   dependencies:
-    detect-indent: ^5.0.0
-    graceful-fs: ^4.1.15
-    make-dir: ^2.1.0
-    pify: ^4.0.1
-    sort-keys: ^2.0.0
-    write-file-atomic: ^2.4.2
-  checksum: 2b97ce2027d53c28a33e4a8e7b0d565faf785988b3776f9e0c68d36477c1fb12639fd0d70877d92a861820707966c62ea9c5f7a36a165d615fd47ca8e24c8371
-  languageName: node
-  linkType: hard
-
-"write-json-file@npm:^4.3.0":
-  version: 4.3.0
-  resolution: "write-json-file@npm:4.3.0"
-  dependencies:
-    detect-indent: ^6.0.0
-    graceful-fs: ^4.1.15
-    is-plain-obj: ^2.0.0
-    make-dir: ^3.0.0
-    sort-keys: ^4.0.0
-    write-file-atomic: ^3.0.0
-  checksum: 33908c591923dc273e6574e7c0e2df157acfcf498e3a87c5615ced006a465c4058877df6abce6fc1acd2844fa3cf4518ace4a34d5d82ab28bcf896317ba1db6f
+    detect-indent: "npm:^5.0.0"
+    graceful-fs: "npm:^4.1.15"
+    make-dir: "npm:^2.1.0"
+    pify: "npm:^4.0.1"
+    sort-keys: "npm:^2.0.0"
+    write-file-atomic: "npm:^2.4.2"
+  checksum: 10/2b97ce2027d53c28a33e4a8e7b0d565faf785988b3776f9e0c68d36477c1fb12639fd0d70877d92a861820707966c62ea9c5f7a36a165d615fd47ca8e24c8371
   languageName: node
   linkType: hard
 
-"write-pkg@npm:^4.0.0":
+"write-pkg@npm:4.0.0":
   version: 4.0.0
   resolution: "write-pkg@npm:4.0.0"
   dependencies:
-    sort-keys: ^2.0.0
-    type-fest: ^0.4.1
-    write-json-file: ^3.2.0
-  checksum: 7864d44370f42a6761f6898d07ee2818c7a2faad45116580cf779f3adaf94e4bea5557612533a6c421c32323253ecb63b50615094960a637aeaef5df0fd2d6cd
+    sort-keys: "npm:^2.0.0"
+    type-fest: "npm:^0.4.1"
+    write-json-file: "npm:^3.2.0"
+  checksum: 10/7864d44370f42a6761f6898d07ee2818c7a2faad45116580cf779f3adaf94e4bea5557612533a6c421c32323253ecb63b50615094960a637aeaef5df0fd2d6cd
   languageName: node
   linkType: hard
 
@@ -30705,8 +32424,8 @@ __metadata:
   version: 6.2.2
   resolution: "ws@npm:6.2.2"
   dependencies:
-    async-limiter: ~1.0.0
-  checksum: aec3154ec51477c094ac2cb5946a156e17561a581fa27005cbf22c53ac57f8d4e5f791dd4bbba6a488602cb28778c8ab7df06251d590507c3c550fd8ebeee949
+    async-limiter: "npm:~1.0.0"
+  checksum: 10/bb791ac02ad7e59fd4208cc6dd3a5bf7a67dff4611a128ed33365996f9fc24fa0d699043559f1798b4bc8045639fd21a1fd3ceca81de560124444abd8e321afc
   languageName: node
   linkType: hard
 
@@ -30721,13 +32440,13 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 0c2ffc9a539dd61dd2b00ff6cc5c98a3371e2521011fe23da4b3578bb7ac26cbdf7ca8a68e8e08023c122ae247013216dde2a20c908de415a6bcc87bdef68c87
+  checksum: 10/745fc1a1cdac7e91f2c7340f7006aea06454b6ca4f24615a1e81124f46d99a7200839895c088a30c1d8d92dd1a9d349046bd4bc3475447aaf13b1f5cb48a18b7
   languageName: node
   linkType: hard
 
-"ws@npm:^8.13.0, ws@npm:^8.2.3, ws@npm:^8.9.0":
-  version: 8.13.0
-  resolution: "ws@npm:8.13.0"
+"ws@npm:^8.16.0, ws@npm:^8.2.3, ws@npm:^8.9.0":
+  version: 8.16.0
+  resolution: "ws@npm:8.16.0"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ">=5.0.2"
@@ -30736,44 +32455,44 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 53e991bbf928faf5dc6efac9b8eb9ab6497c69feeb94f963d648b7a3530a720b19ec2e0ec037344257e05a4f35bd9ad04d9de6f289615ffb133282031b18c61c
+  checksum: 10/7c511c59e979bd37b63c3aea4a8e4d4163204f00bd5633c053b05ed67835481995f61a523b0ad2b603566f9a89b34cb4965cb9fab9649fbfebd8f740cea57f17
   languageName: node
   linkType: hard
 
-"xlsx@https://cdn.sheetjs.com/xlsx-0.19.1/xlsx-0.19.1.tgz":
-  version: 0.19.1
-  resolution: "xlsx@https://cdn.sheetjs.com/xlsx-0.19.1/xlsx-0.19.1.tgz"
+"xlsx@https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz":
+  version: 0.20.2
+  resolution: "xlsx@https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz"
   bin:
     xlsx: ./bin/xlsx.njs
-  checksum: a7fa1b95dfc9a6923458e19f0dcd0c64d70ce49a5959c8f38c219fd232a4fdfd48d70115dbe01b0e58e80f336ce872495dcc3d12943c4d19b041c87f8eeb69c8
+  checksum: 10/2d8e0644888f90fa9145ea74ed90b844154ce89c4f0e4f92fcce3f224fa71654da99aa48d99d65ba86eb0632a4858ba2dea7eef8b54fd8bd23954a09d1884aa1
   languageName: node
   linkType: hard
 
 "xml-name-validator@npm:^4.0.0":
   version: 4.0.0
   resolution: "xml-name-validator@npm:4.0.0"
-  checksum: af100b79c29804f05fa35aa3683e29a321db9b9685d5e5febda3fa1e40f13f85abc40f45a6b2bf7bee33f68a1dc5e8eaef4cec100a304a9db565e6061d4cb5ad
+  checksum: 10/f9582a3f281f790344a471c207516e29e293c6041b2c20d84dd6e58832cd7c19796c47e108fd4fd4b164a5e72ad94f2268f8ace8231cde4a2c6428d6aa220f92
   languageName: node
   linkType: hard
 
 "xml-utils@npm:^1.0.2":
   version: 1.0.2
   resolution: "xml-utils@npm:1.0.2"
-  checksum: 8eece2bf83bd53ab9bed71b6fc9bdb53e4a4034c75ee132726a5c4da93612edd8bcc8fb6810f643528251074c74b4d060385e764d4b7f644237a19f14ae08d97
+  checksum: 10/321e8f7d2ab7a7f4369259ae7a9f787343c925b9b3f04f25df88a98229cb8a7023fa1dd12e4b34d66963da130baaf651296e90abc82f6b3162c0c8f21dd87f23
   languageName: node
   linkType: hard
 
 "xml@npm:^1.0.1":
   version: 1.0.1
   resolution: "xml@npm:1.0.1"
-  checksum: 11b5545ef3f8fec3fa29ce251f50ad7b6c97c103ed4d851306ec23366f5fa4699dd6a942262df52313a0cd1840ab26256da253c023bad3309d8ce46fe6020ca0
+  checksum: 10/6c4c31a1308e45732e5ac6b50edbca0e8f7abe5cb5de10215d8e3c688819fe7c7706e056f6fb59b1a23fdf1000c2d7a8bba0a89e94aa1796cd2376d9a5ba401e
   languageName: node
   linkType: hard
 
 "xmlchars@npm:^2.2.0":
   version: 2.2.0
   resolution: "xmlchars@npm:2.2.0"
-  checksum: 8c70ac94070ccca03f47a81fcce3b271bd1f37a591bf5424e787ae313fcb9c212f5f6786e1fa82076a2c632c0141552babcd85698c437506dfa6ae2d58723062
+  checksum: 10/4ad5924974efd004a47cce6acf5c0269aee0e62f9a805a426db3337af7bcbd331099df174b024ace4fb18971b8a56de386d2e73a1c4b020e3abd63a4a9b917f1
   languageName: node
   linkType: hard
 
@@ -30781,97 +32500,85 @@ __metadata:
   version: 5.1.1
   resolution: "xregexp@npm:5.1.1"
   dependencies:
-    "@babel/runtime-corejs3": ^7.16.5
-  checksum: b7fee45db0daacc68d8f747c9d3865af6b1135866c6dbd72980fc7d61138310018c397effdc0ec1f50ced71b9437ccb70c27818f4470e28e48dc59ea6e3900a0
+    "@babel/runtime-corejs3": "npm:^7.16.5"
+  checksum: 10/1f868050d9e03a9d0e8aabc7db9858918d7178e0a8e0f3df6356cb710aa231661ac7ff4c90ac53a07dbce80b8f3c22878bb44ca5f5449ec5dda3b2ee6cea8fa2
   languageName: node
   linkType: hard
 
 "xss@npm:^1.0.14":
-  version: 1.0.14
-  resolution: "xss@npm:1.0.14"
+  version: 1.0.15
+  resolution: "xss@npm:1.0.15"
   dependencies:
-    commander: ^2.20.3
-    cssfilter: 0.0.10
+    commander: "npm:^2.20.3"
+    cssfilter: "npm:0.0.10"
   bin:
     xss: bin/xss
-  checksum: 77c6a60a5f96490098ef837c3b49321c0f31963f323c748cb0a01bc02fc6e465a6accbe4c54cad62f8d6ffe647d984be173879433af861883f6213d9416d3f53
-  languageName: node
-  linkType: hard
-
-"xstate@npm:^4.37.0":
-  version: 4.37.0
-  resolution: "xstate@npm:4.37.0"
-  checksum: 8eba107721c91ba08934b68a2881f01dd9ab6f23cc2ebcdd91145ce5999db8f690b38cf1570b928c058755150fc5024bed1cafe731ff7e6750d4e64752a7ab5b
+  checksum: 10/074ad54babac9dd5107466dbf30d3b871dbedae1f8e7b8f4e3b76d60da8b92bd0f66f18ccd26b8524545444ef784b78c526cee089a907aa904f83c8b8d7958f6
   languageName: node
   linkType: hard
 
-"xtend@npm:^4.0.0, xtend@npm:~4.0.0, xtend@npm:~4.0.1":
+"xtend@npm:^4.0.0, xtend@npm:~4.0.1":
   version: 4.0.2
   resolution: "xtend@npm:4.0.2"
-  checksum: ac5dfa738b21f6e7f0dd6e65e1b3155036d68104e67e5d5d1bde74892e327d7e5636a076f625599dc394330a731861e87343ff184b0047fef1360a7ec0a5a36a
+  checksum: 10/ac5dfa738b21f6e7f0dd6e65e1b3155036d68104e67e5d5d1bde74892e327d7e5636a076f625599dc394330a731861e87343ff184b0047fef1360a7ec0a5a36a
   languageName: node
   linkType: hard
 
 "y18n@npm:^5.0.5":
   version: 5.0.8
   resolution: "y18n@npm:5.0.8"
-  checksum: 54f0fb95621ee60898a38c572c515659e51cc9d9f787fb109cef6fde4befbe1c4602dc999d30110feee37456ad0f1660fa2edcfde6a9a740f86a290999550d30
+  checksum: 10/5f1b5f95e3775de4514edbb142398a2c37849ccfaf04a015be5d75521e9629d3be29bd4432d23c57f37e5b61ade592fb0197022e9993f81a06a5afbdcda9346d
   languageName: node
   linkType: hard
 
 "yallist@npm:^3.0.2":
   version: 3.1.1
   resolution: "yallist@npm:3.1.1"
-  checksum: 48f7bb00dc19fc635a13a39fe547f527b10c9290e7b3e836b9a8f1ca04d4d342e85714416b3c2ab74949c9c66f9cebb0473e6bc353b79035356103b47641285d
+  checksum: 10/9af0a4329c3c6b779ac4736c69fae4190ac03029fa27c1aef4e6bcc92119b73dea6fe5db5fe881fb0ce2a0e9539a42cdf60c7c21eda04d1a0b8c082e38509efb
   languageName: node
   linkType: hard
 
 "yallist@npm:^4.0.0":
   version: 4.0.0
   resolution: "yallist@npm:4.0.0"
-  checksum: 343617202af32df2a15a3be36a5a8c0c8545208f3d3dfbc6bb7c3e3b7e8c6f8e7485432e4f3b88da3031a6e20afa7c711eded32ddfb122896ac5d914e75848d5
+  checksum: 10/4cb02b42b8a93b5cf50caf5d8e9beb409400a8a4d85e83bb0685c1457e9ac0b7a00819e9f5991ac25ffabb56a78e2f017c1acc010b3a1babfe6de690ba531abd
   languageName: node
   linkType: hard
 
 "yaml@npm:^1.10.0, yaml@npm:^1.7.2":
   version: 1.10.2
   resolution: "yaml@npm:1.10.2"
-  checksum: ce4ada136e8a78a0b08dc10b4b900936912d15de59905b2bf415b4d33c63df1d555d23acb2a41b23cf9fb5da41c256441afca3d6509de7247daa062fd2c5ea5f
+  checksum: 10/e088b37b4d4885b70b50c9fa1b7e54bd2e27f5c87205f9deaffd1fb293ab263d9c964feadb9817a7b129a5bf30a06582cb08750f810568ecc14f3cdbabb79cb3
   languageName: node
   linkType: hard
 
-"yaml@npm:^2.0.0":
-  version: 2.3.1
-  resolution: "yaml@npm:2.3.1"
-  checksum: 2c7bc9a7cd4c9f40d3b0b0a98e370781b68b8b7c4515720869aced2b00d92f5da1762b4ffa947f9e795d6cd6b19f410bd4d15fdd38aca7bd96df59bd9486fb54
+"yaml@npm:^2.0.0, yaml@npm:^2.3.4":
+  version: 2.4.1
+  resolution: "yaml@npm:2.4.1"
+  bin:
+    yaml: bin.mjs
+  checksum: 10/2c54fd69ef59126758ae710f9756405a7d41abcbb61aca894250d0e81e76057c14dc9bb00a9528f72f99b8f24077f694a6f7fd09cdd6711fcec2eebfbb5df409
   languageName: node
   linkType: hard
 
 "yargs-parser@npm:20.2.4":
   version: 20.2.4
   resolution: "yargs-parser@npm:20.2.4"
-  checksum: d251998a374b2743a20271c2fd752b9fbef24eb881d53a3b99a7caa5e8227fcafd9abf1f345ac5de46435821be25ec12189a11030c12ee6481fef6863ed8b924
+  checksum: 10/db8f251ae40e24782d5c089ed86883ba3c0ce7f3c174002a67ec500802f928df9d505fea5d04829769221ce20b0f69f6fb1138fbb2e2fb102e3e9d426d20edab
   languageName: node
   linkType: hard
 
-"yargs-parser@npm:21.0.1":
-  version: 21.0.1
-  resolution: "yargs-parser@npm:21.0.1"
-  checksum: c3ea2ed12cad0377ce3096b3f138df8267edf7b1aa7d710cd502fe16af417bafe4443dd71b28158c22fcd1be5dfd0e86319597e47badf42ff83815485887323a
+"yargs-parser@npm:21.1.1, yargs-parser@npm:^21.0.1, yargs-parser@npm:^21.1.1":
+  version: 21.1.1
+  resolution: "yargs-parser@npm:21.1.1"
+  checksum: 10/9dc2c217ea3bf8d858041252d43e074f7166b53f3d010a8c711275e09cd3d62a002969a39858b92bbda2a6a63a585c7127014534a560b9c69ed2d923d113406e
   languageName: node
   linkType: hard
 
 "yargs-parser@npm:^20.2.2, yargs-parser@npm:^20.2.3, yargs-parser@npm:^20.2.9":
   version: 20.2.9
   resolution: "yargs-parser@npm:20.2.9"
-  checksum: 8bb69015f2b0ff9e17b2c8e6bfe224ab463dd00ca211eece72a4cd8a906224d2703fb8a326d36fdd0e68701e201b2a60ed7cf81ce0fd9b3799f9fe7745977ae3
-  languageName: node
-  linkType: hard
-
-"yargs-parser@npm:^21.0.1, yargs-parser@npm:^21.1.1":
-  version: 21.1.1
-  resolution: "yargs-parser@npm:21.1.1"
-  checksum: ed2d96a616a9e3e1cc7d204c62ecc61f7aaab633dcbfab2c6df50f7f87b393993fe6640d017759fe112d0cb1e0119f2b4150a87305cc873fd90831c6a58ccf1c
+  checksum: 10/0188f430a0f496551d09df6719a9132a3469e47fe2747208b1dd0ab2bb0c512a95d0b081628bbca5400fb20dbf2fabe63d22badb346cecadffdd948b049f3fcc
   languageName: node
   linkType: hard
 
@@ -30879,11 +32586,11 @@ __metadata:
   version: 2.0.0
   resolution: "yargs-unparser@npm:2.0.0"
   dependencies:
-    camelcase: ^6.0.0
-    decamelize: ^4.0.0
-    flat: ^5.0.2
-    is-plain-obj: ^2.1.0
-  checksum: 68f9a542c6927c3768c2f16c28f71b19008710abd6b8f8efbac6dcce26bbb68ab6503bed1d5994bdbc2df9a5c87c161110c1dfe04c6a3fe5c6ad1b0e15d9a8a3
+    camelcase: "npm:^6.0.0"
+    decamelize: "npm:^4.0.0"
+    flat: "npm:^5.0.2"
+    is-plain-obj: "npm:^2.1.0"
+  checksum: 10/68f9a542c6927c3768c2f16c28f71b19008710abd6b8f8efbac6dcce26bbb68ab6503bed1d5994bdbc2df9a5c87c161110c1dfe04c6a3fe5c6ad1b0e15d9a8a3
   languageName: node
   linkType: hard
 
@@ -30891,29 +32598,29 @@ __metadata:
   version: 16.2.0
   resolution: "yargs@npm:16.2.0"
   dependencies:
-    cliui: ^7.0.2
-    escalade: ^3.1.1
-    get-caller-file: ^2.0.5
-    require-directory: ^2.1.1
-    string-width: ^4.2.0
-    y18n: ^5.0.5
-    yargs-parser: ^20.2.2
-  checksum: b14afbb51e3251a204d81937c86a7e9d4bdbf9a2bcee38226c900d00f522969ab675703bee2a6f99f8e20103f608382936034e64d921b74df82b63c07c5e8f59
+    cliui: "npm:^7.0.2"
+    escalade: "npm:^3.1.1"
+    get-caller-file: "npm:^2.0.5"
+    require-directory: "npm:^2.1.1"
+    string-width: "npm:^4.2.0"
+    y18n: "npm:^5.0.5"
+    yargs-parser: "npm:^20.2.2"
+  checksum: 10/807fa21211d2117135d557f95fcd3c3d390530cda2eca0c840f1d95f0f40209dcfeb5ec18c785a1f3425896e623e3b2681e8bb7b6600060eda1c3f4804e7957e
   languageName: node
   linkType: hard
 
-"yargs@npm:^17.3.1, yargs@npm:^17.4.0, yargs@npm:^17.5.1":
+"yargs@npm:17.7.2, yargs@npm:^17.3.1, yargs@npm:^17.5.1, yargs@npm:^17.6.2, yargs@npm:^17.7.2":
   version: 17.7.2
   resolution: "yargs@npm:17.7.2"
   dependencies:
-    cliui: ^8.0.1
-    escalade: ^3.1.1
-    get-caller-file: ^2.0.5
-    require-directory: ^2.1.1
-    string-width: ^4.2.3
-    y18n: ^5.0.5
-    yargs-parser: ^21.1.1
-  checksum: 73b572e863aa4a8cbef323dd911d79d193b772defd5a51aab0aca2d446655216f5002c42c5306033968193bdbf892a7a4c110b0d77954a7fdf563e653967b56a
+    cliui: "npm:^8.0.1"
+    escalade: "npm:^3.1.1"
+    get-caller-file: "npm:^2.0.5"
+    require-directory: "npm:^2.1.1"
+    string-width: "npm:^4.2.3"
+    y18n: "npm:^5.0.5"
+    yargs-parser: "npm:^21.1.1"
+  checksum: 10/abb3e37678d6e38ea85485ed86ebe0d1e3464c640d7d9069805ea0da12f69d5a32df8e5625e370f9c96dd1c2dc088ab2d0a4dd32af18222ef3c4224a19471576
   languageName: node
   linkType: hard
 
@@ -30921,36 +32628,36 @@ __metadata:
   version: 2.10.0
   resolution: "yauzl@npm:2.10.0"
   dependencies:
-    buffer-crc32: ~0.2.3
-    fd-slicer: ~1.1.0
-  checksum: 7f21fe0bbad6e2cb130044a5d1d0d5a0e5bf3d8d4f8c4e6ee12163ce798fee3de7388d22a7a0907f563ac5f9d40f8699a223d3d5c1718da90b0156da6904022b
+    buffer-crc32: "npm:~0.2.3"
+    fd-slicer: "npm:~1.1.0"
+  checksum: 10/1e4c311050dc0cf2ee3dbe8854fe0a6cde50e420b3e561a8d97042526b4cf7a0718d6c8d89e9e526a152f4a9cec55bcea9c3617264115f48bd6704cf12a04445
   languageName: node
   linkType: hard
 
 "yn@npm:3.1.1":
   version: 3.1.1
   resolution: "yn@npm:3.1.1"
-  checksum: 2c487b0e149e746ef48cda9f8bad10fc83693cd69d7f9dcd8be4214e985de33a29c9e24f3c0d6bcf2288427040a8947406ab27f7af67ee9456e6b84854f02dd6
+  checksum: 10/2c487b0e149e746ef48cda9f8bad10fc83693cd69d7f9dcd8be4214e985de33a29c9e24f3c0d6bcf2288427040a8947406ab27f7af67ee9456e6b84854f02dd6
   languageName: node
   linkType: hard
 
 "yocto-queue@npm:^0.1.0":
   version: 0.1.0
   resolution: "yocto-queue@npm:0.1.0"
-  checksum: f77b3d8d00310def622123df93d4ee654fc6a0096182af8bd60679ddcdfb3474c56c6c7190817c84a2785648cdee9d721c0154eb45698c62176c322fb46fc700
+  checksum: 10/f77b3d8d00310def622123df93d4ee654fc6a0096182af8bd60679ddcdfb3474c56c6c7190817c84a2785648cdee9d721c0154eb45698c62176c322fb46fc700
   languageName: node
   linkType: hard
 
 "yocto-queue@npm:^1.0.0":
   version: 1.0.0
   resolution: "yocto-queue@npm:1.0.0"
-  checksum: 2cac84540f65c64ccc1683c267edce396b26b1e931aa429660aefac8fbe0188167b7aee815a3c22fa59a28a58d898d1a2b1825048f834d8d629f4c2a5d443801
+  checksum: 10/2cac84540f65c64ccc1683c267edce396b26b1e931aa429660aefac8fbe0188167b7aee815a3c22fa59a28a58d898d1a2b1825048f834d8d629f4c2a5d443801
   languageName: node
   linkType: hard
 
 "zod@npm:^3.21.4":
   version: 3.22.3
   resolution: "zod@npm:3.22.3"
-  checksum: 65b05139be337078a70700b05942ab7f2ef5f11abe194df14ef257fac4e5c383476a4dc290731842996bd57fc8d5bf38e5a4c907fe8cdf8b15477f8da5bfcc00
+  checksum: 10/3aad6e6b61ddceaeb887dccc5f747903e619b09dfd208f6dc30eef15edf3942b8e6cd97a08e080c9c8723575446941edb823a8881c512e00e8dd3085f20659cc
   languageName: node
   linkType: hard